From 982a174dd0dc4b6f56d3008fa45835dfcdd6869a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Mar 1998 07:46:02 +0000
Subject: Initial revision

---
 GPL                                  | 339 +++++++++++++++++++++++++++++++++++
 INSTALL                              |   1 +
 etc/acp_logfile-parse                | 197 ++++++++++++++++++++
 etc/example-direct-cardin            |  67 +++++++
 htdocs/edit/cust_credit.cgi          |  97 ++++++++++
 htdocs/edit/cust_pay.cgi             |  76 ++++++++
 htdocs/images/sisd.jpg               | Bin 0 -> 22122 bytes
 htdocs/search/cust_bill.html         |  21 +++
 htdocs/search/cust_main-payinfo.html |  21 +++
 htdocs/search/cust_main.html         |  36 ++++
 htdocs/search/svc_acct.html          |  21 +++
 htdocs/search/svc_acct_sm.html       |  23 +++
 htdocs/search/svc_domain.html        |  22 +++
 site_perl/table_template-svc.pm      | 107 +++++++++++
 site_perl/table_template-unique.pm   |  66 +++++++
 site_perl/table_template.pm          |  66 +++++++
 16 files changed, 1160 insertions(+)
 create mode 100644 GPL
 create mode 100644 INSTALL
 create mode 100755 etc/acp_logfile-parse
 create mode 100755 etc/example-direct-cardin
 create mode 100755 htdocs/edit/cust_credit.cgi
 create mode 100755 htdocs/edit/cust_pay.cgi
 create mode 100755 htdocs/images/sisd.jpg
 create mode 100755 htdocs/search/cust_bill.html
 create mode 100755 htdocs/search/cust_main-payinfo.html
 create mode 100755 htdocs/search/cust_main.html
 create mode 100755 htdocs/search/svc_acct.html
 create mode 100755 htdocs/search/svc_acct_sm.html
 create mode 100755 htdocs/search/svc_domain.html
 create mode 100644 site_perl/table_template-svc.pm
 create mode 100644 site_perl/table_template-unique.pm
 create mode 100644 site_perl/table_template.pm

diff --git a/GPL b/GPL
new file mode 100644
index 000000000..e77696ae8
--- /dev/null
+++ b/GPL
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    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., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 000000000..ff2e43f4e
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1 @@
+See htdocs/docs/index.html
diff --git a/etc/acp_logfile-parse b/etc/acp_logfile-parse
new file mode 100755
index 000000000..5e258991b
--- /dev/null
+++ b/etc/acp_logfile-parse
@@ -0,0 +1,197 @@
+#!/usr/bin/perl
+
+###
+# WHO WROTE THIS???
+###
+
+#require "perldb.pl";
+
+#    Compute SLIP/PPP log times
+#     Arguments    -a   Process entire file with totals
+#                  -t   Process only totals
+#                  -f   File to be processed if not current
+#                  -d   processing start date (default is entire file)
+#                  -l   to return all totals for dayuse
+#                  -w   name of tmp work file for dayuse
+#                  user names
+
+require "time.pl";
+
+$space='        ';
+
+unless (@ARGV[0]) {
+       print "Missing Arguments\n";
+       print    "-a - entire file\n";
+       print    "-t - totals only\n";
+       print    "-f - file name to be processed\n";
+       print    "-d - processing start date (yymmdd)\n";
+       print    "-l - return totals for dayuse\n";
+       print    "-w - tmp work file for dayuse\n";
+       exit;
+}     # end if test for missing arguments
+
+$infile = "/usr/annex/acp_logfile";
+$tmpfile = "/tmp/ppp";
+$n = $#ARGV;
+$start_yymmdd = "";
+for ($i = 0; $i <= $n; $i++) {
+    if ($ARGV[$i] eq "-a") {
+             $allflag = "true";
+        }
+       elsif ($ARGV[$i] eq "-t") {
+                      $totalflag = "true";
+             }
+       elsif ($ARGV[$i] eq "-f") {
+        $i++;
+          $infile = $ARGV[$i];
+             }
+        elsif ($ARGV[$i] eq "-d") {
+          $i++;
+          $start_yymmdd = $ARGV[$i];
+          }   #end start yymmdd
+        elsif ($ARGV[$i] eq "-l") {
+           $logflag = "true";
+           $totalflag = "true";
+         }  #  end log 
+       elsif ($ARGV[$i] eq "-w") {
+        $i++;
+          $tmpfile = $ARGV[$i];
+             } #  end tmp file 
+        else    {
+            ($arg_user,$arg_yymmdd) = split (/:/, $ARGV[$i]);
+                 $ip_user_date {$arg_user} = $ARGV[$i];
+             $userflag = "true";
+                }   # end else
+ } # end for 1 = 1 to n
+
+open (IN,$infile)
+        || die "Can't open acp_logfile";
+
+NEXTUSER: while (<IN>) {        
+        chop;
+        ($add,$ether,$port,$date,$time,$type,$action,$user) = split(/:/);
+
+        if ($logflag) {
+          $start_yymmdd = '';
+          if ($ip_user_date{$user}) {
+             ($ip_user, $start_yymmdd) = 
+                      split (/:/, $ip_user_date{$user});
+           }  # end get date
+        }   #  end log flag
+        if ($start_yymmdd) {
+           if ($date < $start_yymmdd) {
+               next NEXTUSER;
+           }  #end date compare
+        }  #end if date
+        if ($userflag){
+          if (!$ip_user_date{$user}) {
+               next NEXTUSER;
+          }  #  end user test
+        }  #   end by user or all
+        if (($totalflag) ||
+           ($allflag) ||
+           ($ip_user_date{$user})) {
+         if (($type eq 'ppp') || ($type eq 'slip'))  {
+
+            if ($action eq 'login') {
+                        $login{$user} = "$time:$date";
+
+                }
+                  elsif ($action eq 'logout') {
+                     if (!$login{$user}) {
+                          $login{$user} = "010101:$date";
+                      } #end pad user if carry over
+                        ($stime,$sdate) = split(':',$login{$user});
+                        $start = &annex2sec($stime);
+                        $end = &annex2sec($time);
+                        
+                        #If we went through midnight, add a day;
+                        if ($end < $start) {$end += 86400;}
+                        $timeon = $end - $start;
+
+                        $elapsed{$user} += $timeon;
+                        
+                      if (!$totalflag) {
+                        print (&fmt_user($user),
+                              '  ', &fmt_date($sdate), '  In: ', 
+                                &fmt_time($stime),'  Out: ',
+                                &fmt_time($time),
+                       '  Elapsed: ', &fmt_sec($timeon), "\n");
+                      }  # end total test
+                }  #end elsif action
+        }  #  type = ppp of slip
+    }  #  check arguments
+} 
+close IN;
+
+if ($logflag) {
+    open (TMPPPP, ">$tmpfile")
+               || die "Can't open ppp tmp file";
+    foreach $user ( sort((keys(%elapsed))) ) {
+        $log_time = &fmt_sec($elapsed{$user});
+        $tmp = join (':',
+                    $user, 
+                    $log_time);
+        print (TMPPPP "$tmp\n");
+    }
+    close (TMPPPP);
+}
+    else {
+        print "\n\nTotal Time On For Period:\n";
+        print     "-------------------------\n";
+
+        foreach $user ( sort((keys(%elapsed))) ) {
+           print (&fmt_user($user), "  ",&fmt_sec($elapsed{$user}), "\n");
+        }
+    }
+exit(0);
+
+#-------------------------------------------------------
+#--------------- Subroutines Start Here ----------------
+#-------------------------------------------------------
+
+sub annex2sec {
+        local($time) = @_;
+        return( &time2sec( &break_annex($time) ) );
+}
+
+sub fmt_date {
+        local($date) = @_;
+
+        return( substr($date,2,2).'/'.substr($date,4,2).'/'.substr($date,0,2) );
+}
+
+sub fmt_time {
+        local($time) = @_;
+        local($s,$m,$h) = &break_annex($time);
+        return ("$h:$m:$s");
+}
+
+
+sub break_annex {
+        local($time) = @_;
+        local($h,$m,$s);
+
+        $h=substr($time,0,2);
+        $m=substr($time,2,2);
+        $s=substr($time,4,2);
+
+        return ($s,$m,$h);
+}       
+
+sub fmt_sec {
+        local(@t) = &sec2time(@_);
+        @t[2] += (@t[3]*24);
+
+        foreach $a (@t) {
+                if ($a < 10) {$a = "0$a";}
+        }
+
+        return ("@t[2]:@t[1]:@t[0]");
+}
+
+sub fmt_user {
+        local($user) = @_;
+        return( $user.substr($space,0,8 - length($user) ).'  ' );
+}
+
diff --git a/etc/example-direct-cardin b/etc/example-direct-cardin
new file mode 100755
index 000000000..1a4097221
--- /dev/null
+++ b/etc/example-direct-cardin
@@ -0,0 +1,67 @@
+#!/usr/local/bin/perl
+
+###
+# THIS IS FROM CYBERCASH (is there a newer version?)
+###
+
+$paymentserverhost = 'localhost';
+$paymentserverport = 8000;
+$paymentserversecret = 'two-turntables';
+use CCLib qw(sendmserver);
+
+# first lets fake up some data 
+# use time of day and pid to give me my pretend
+# order number
+# you obviously need to get real data from somewhere...
+
+$oid = "test$$"; #fake order number.
+$amount = 'usd 42.42';
+$ramount = 'usd 24.24';
+$pan = '4111111111111111';
+$name = 'John Q. Doe';
+$addr = '17 Richard Rd.';
+$city = 'Ivyland';
+$state = 'PA';
+$zip = '18974';
+$country = 'USA';
+$exp = '7/97';
+
+
+%result = &sendmserver('mauthcapture', 
+                       'Order-ID', $oid,
+		       'Amount', $amount,
+		       'Card-Number', $pan,
+		       'Card-Name', $name,
+		       'Card-Address', $addr,
+		       'Card-City', $city,
+		       'Card-State', $state,
+		       'Card-Zip', $zip,
+		       'Card-Country', $country,
+		       'Card-Exp', $exp);
+
+#
+# just dump results to stdout.
+# you should process them...
+# to allow results to affect operation of your fulfillment...
+#
+foreach (keys(%result)) {
+   print " $_ ==> $result{$_}\n";
+}
+
+print "\n";
+
+exit;
+
+$trans=$result{'MTransactionNumber'};
+$code=$result{'MRetrievalCode'};
+
+%result = &sendmserver('return',
+                        'Order-ID', $oid,
+			'Return-Amount',$ramount,
+			'Amount',$amount,
+			);
+
+foreach (keys(%result)) {
+   print " $_ ==> $result{$_}\n";
+}
+
diff --git a/htdocs/edit/cust_credit.cgi b/htdocs/edit/cust_credit.cgi
new file mode 100755
index 000000000..75ef21208
--- /dev/null
+++ b/htdocs/edit/cust_credit.cgi
@@ -0,0 +1,97 @@
+#!/usr/bin/perl -Tw
+#
+# cust_credit.cgi: Add a credit (output form)
+#
+# Usage: cust_credit.cgi custnum [ -paybatch ]
+#        http://server.name/path/cust_credit?custnum [ -paybatch ]
+#
+# Note: Should be run setuid root as user nobody.
+#
+# some hooks in here for modifications as well as additions, but needs (lots) more work.
+# also see process/cust_credit.cgi, the script that processes the form.
+#
+# ivan@voicenet.com 96-dec-05
+#
+# paybatch field, differentiates between credits & credits+refunds by commandline
+# ivan@voicenet.com 96-dec-08
+#
+# added (but commented out) sprintf("%.2f" in amount field.  Hmm.
+# ivan@voicenet.com 97-jan-3
+#
+# paybatch stuff thrown out - has checkbox now instead.  
+# (well, sort of.  still passed around for backward compatability and possible editing hook)
+# ivan@voicenet.com 97-apr-21
+#
+# rewrite ivan@sisd.com 98-mar-16
+
+use strict;
+use Date::Format;
+use CGI::Base qw(:DEFAULT :CGI); #CGI module
+use FS::UID qw(cgisuidsetup getotaker);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+cgisuidsetup($cgi);
+
+#untaint custnum
+$QUERY_STRING =~ /^(\d+)$/;
+my($custnum)=$1;
+
+#untaint otaker
+my($otaker)=getotaker;
+
+SendHeaders(); # one guess.
+print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Post Credit</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H1>Post Credit</H1>
+    </CENTER>
+    <FORM ACTION="process/cust_credit.cgi" METHOD=POST>
+    <HR><PRE>
+END
+
+#crednum
+my($crednum)="";
+print qq!Credit #<B>!, $crednum ? $crednum : " <I>(NEW)</I>", qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
+
+#custnum
+print qq!\nCustomer #<B>$custnum</B><INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
+
+#paybatch
+print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
+
+#date
+my($date)=time;
+print qq!\nDate: <B>!, time2str("%D",$date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="$date">!;
+
+#amount
+my($amount)='';
+print qq!\nAmount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
+
+#refund?
+#print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="yes">Also post refund!;
+
+#otaker (hidden)
+print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!;
+
+#reason
+my($reason)='';
+print qq!\nReason <INPUT TYPE="text" NAME="reason" VALUE="$reason" SIZE=72>!;
+
+print <<END;
+</PRE>
+<BR>
+<CENTER><INPUT TYPE="submit" VALUE="Post"></CENTER>
+END
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+
diff --git a/htdocs/edit/cust_pay.cgi b/htdocs/edit/cust_pay.cgi
new file mode 100755
index 000000000..a6cb204d1
--- /dev/null
+++ b/htdocs/edit/cust_pay.cgi
@@ -0,0 +1,76 @@
+#!/usr/bin/perl -Tw
+#
+# cust_pay.cgi: Add a payment (output form)
+#
+# Usage: cust_pay.cgi invnum
+#        http://server.name/path/cust_pay.cgi?invnum
+#
+# Note: Should be run setuid as user nobody.
+#
+# some hooks for modifications as well as additions, but needs work.
+#
+# ivan@voicenet.com 96-dec-11
+#
+# rewrite ivan@sisd.com 98-mar-16
+
+use strict;
+use Date::Format;
+use CGI::Base qw(:DEFAULT :CGI);
+use FS::UID qw(cgisuidsetup);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+cgisuidsetup($cgi);
+
+#untaint invnum
+$QUERY_STRING =~ /^(\d+)$/;
+my($invnum)=$1;
+
+SendHeaders(); # one guess.
+print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Enter payment</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H1>Enter payment</H1>
+    </CENTER>
+    <FORM ACTION="process/cust_pay.cgi" METHOD=POST>
+    <HR><PRE>
+END
+
+#invnum
+print qq!Invoice #<B>$invnum</B><INPUT TYPE="hidden" NAME="invnum" VALUE="$invnum">!;
+
+#date
+my($date)=time;
+print qq!<BR>Date: <B>!, time2str("%D",$date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="$date">!;
+
+#paid
+print qq!<BR>Amount \$<INPUT TYPE="text" NAME="paid" VALUE="" SIZE=8 MAXLENGTH=8>!;
+
+#payby
+my($payby)="BILL";
+print qq!<BR>Payby: <B>$payby</B><INPUT TYPE="hidden" NAME="payby" VALUE="$payby">!;
+
+#payinfo (check # now as payby="BILL" hardcoded.. what to do later?)
+my($payinfo)="";
+print qq!<BR>Check #<INPUT TYPE="text" NAME="payinfo" VALUE="$payinfo">!;
+
+#paybatch
+print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
+
+print <<END;
+</PRE>
+<BR>
+<CENTER><INPUT TYPE="submit" VALUE="Post"></CENTER>
+END
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+
diff --git a/htdocs/images/sisd.jpg b/htdocs/images/sisd.jpg
new file mode 100755
index 000000000..908a5eaff
Binary files /dev/null and b/htdocs/images/sisd.jpg differ
diff --git a/htdocs/search/cust_bill.html b/htdocs/search/cust_bill.html
new file mode 100755
index 000000000..4adb40e4a
--- /dev/null
+++ b/htdocs/search/cust_bill.html
@@ -0,0 +1,21 @@
+<HTML>
+  <HEAD>
+    <TITLE>Invoice Search</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+      <H1>Invoice Search</H1>
+    </CENTER>
+    <HR>
+    <FORM ACTION="cust_bill.cgi" METHOD="post">
+      Search for <B>invoice #</B>: 
+      <INPUT TYPE="text" NAME="invnum">
+
+      <P><INPUT TYPE="submit" VALUE="Search">
+
+    </FORM>
+
+  <HR>
+  </BODY>
+</HTML>
+
diff --git a/htdocs/search/cust_main-payinfo.html b/htdocs/search/cust_main-payinfo.html
new file mode 100755
index 000000000..92341ad13
--- /dev/null
+++ b/htdocs/search/cust_main-payinfo.html
@@ -0,0 +1,21 @@
+<HTML>
+  <HEAD>
+    <TITLE>Customer Search</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+      <H1>Customer Search</H1>
+    </CENTER>
+    <HR>
+    <FORM ACTION="cust_main.cgi" METHOD="post">
+      Search for <B>Credit card #</B>: 
+      <INPUT TYPE="hidden" NAME="card_on" VALUE="TRUE">
+      <INPUT TYPE="text" NAME="card">
+
+      <P><INPUT TYPE="submit" VALUE="Search">
+
+    </FORM>
+    <HR>
+  </BODY>
+</HTML>
+
diff --git a/htdocs/search/cust_main.html b/htdocs/search/cust_main.html
new file mode 100755
index 000000000..656943f9c
--- /dev/null
+++ b/htdocs/search/cust_main.html
@@ -0,0 +1,36 @@
+<HTML>
+  <HEAD>
+    <TITLE>Customer Search</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+      <H1>Customer Search</H1>
+    </CENTER>
+    <HR>
+    <FORM ACTION="cust_main.cgi" METHOD="post">
+      <INPUT TYPE="checkbox" NAME="last_on"> Search for <B>last name</B>: 
+      <INPUT TYPE="text" NAME="last_text">
+      using search method(s): <SELECT NAME="last_type" MULTIPLE>
+        <OPTION SELECTED>Fuzzy
+        <OPTION>Exact
+      </SELECT>
+
+      <P><INPUT TYPE="checkbox" NAME="company_on"> Search for <B>company</B>: 
+      <INPUT TYPE="text" NAME="company_text">
+      using search methods(s): <SELECT NAME="company_type" MULTIPLE>
+        <OPTION SELECTED>Fuzzy
+        <OPTION>Exact
+      </SELECT>
+
+      <P><INPUT TYPE="submit" VALUE="Search"> Note: Fuzzy searching can take a while.  Please be patient.
+
+    </FORM>
+
+  <HR>Explanation of search methods:
+  <UL>
+    <LI><B>Fuzzy</B> - Searches for matches that are close to your text.
+    <LI><B>Exact</B> - Finds exact matches only, but much faster than the other search methods.
+  </UL>
+  </BODY>
+</HTML>
+
diff --git a/htdocs/search/svc_acct.html b/htdocs/search/svc_acct.html
new file mode 100755
index 000000000..91291be99
--- /dev/null
+++ b/htdocs/search/svc_acct.html
@@ -0,0 +1,21 @@
+<HTML>
+  <HEAD>
+    <TITLE>Account Search</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+      <H1>Account Search</H1>
+    </CENTER>
+    <HR>
+    <FORM ACTION="svc_acct.cgi" METHOD="post">
+      Search for <B>username</B>: 
+      <INPUT TYPE="text" NAME="username">
+
+      <P><INPUT TYPE="submit" VALUE="Search">
+
+    </FORM>
+
+  <HR>
+  </BODY>
+</HTML>
+
diff --git a/htdocs/search/svc_acct_sm.html b/htdocs/search/svc_acct_sm.html
new file mode 100755
index 000000000..0719856db
--- /dev/null
+++ b/htdocs/search/svc_acct_sm.html
@@ -0,0 +1,23 @@
+<HTML>
+  <HEAD>
+    <TITLE>Mail Alias Search</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+      <H1>Mail Alias Search</H1>
+    </CENTER>
+    <HR>
+    <FORM ACTION="svc_acct_sm.cgi" METHOD="post">
+      Search for <B>mail alias</B>: 
+      <INPUT TYPE="text" NAME="domuser"><FONT SIZE=-1>(opt.)</FONT> @
+      <INPUT TYPE="text" NAME="domain"><FONT SIZE=-1>(req.)</FONT>
+
+      <P><INPUT TYPE="submit" VALUE="Search">
+
+    </FORM>
+
+  <HR>
+
+  </BODY>
+</HTML>
+
diff --git a/htdocs/search/svc_domain.html b/htdocs/search/svc_domain.html
new file mode 100755
index 000000000..533743ba2
--- /dev/null
+++ b/htdocs/search/svc_domain.html
@@ -0,0 +1,22 @@
+<HTML>
+  <HEAD>
+    <TITLE>Domain Search</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+      <H1>Domain Search</H1>
+    </CENTER>
+    <HR>
+    <FORM ACTION="svc_domain.cgi" METHOD="post">
+      Search for <B>domain</B>: 
+      <INPUT TYPE="text" NAME="domain">
+
+      <P><INPUT TYPE="submit" VALUE="Search">
+
+    </FORM>
+
+  <HR>
+
+  </BODY>
+</HTML>
+
diff --git a/site_perl/table_template-svc.pm b/site_perl/table_template-svc.pm
new file mode 100644
index 000000000..a8cbaed5e
--- /dev/null
+++ b/site_perl/table_template-svc.pm
@@ -0,0 +1,107 @@
+#!/usr/local/bin/perl -Tw
+#
+# ivan@voicenet.com 97-jul-21
+
+package FS::svc_table;
+
+use strict;
+use Exporter;
+use FS::Record qw(fields qsearchs);
+
+@FS::svc_table::ISA = qw(FS::Record Exporter);
+
+# Usage: $record = create FS::svc_table ( \%hash );
+#        $record = create FS::svc_table ( { field=>value, ... } );
+sub create {
+  my($proto,$hashref)=@_;
+
+  my($field);
+  foreach $field (fields('svc_table')) {
+    $hashref->{$field}='' unless defined $hashref->{$field};
+  }
+
+  $proto->new('svc_table',$hashref);
+
+}
+
+# Usage: $error = $record -> insert;
+sub insert {
+  my($self)=@_;
+  my($error);
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  $error=$self->check;
+  return $error if $error;
+
+  $error = $self->add;
+  return $error if $error;
+
+  ''; #no error
+}
+
+# Usage: $error = $record -> delete;
+sub delete {
+  my($self)=@_;
+  my($error);
+
+  $error = $self->del;
+  return $error if $error;
+
+}
+
+# Usage: $error = $newrecord -> replace($oldrecord)
+sub replace {
+  my($new,$old)=@_;
+  my($error);
+
+  return "(Old) Not a svc_table record!" unless $old->table eq "svc_table";
+  return "Can't change svcnum!"
+    unless $old->getfield('svcnum') eq $new->getfield('svcnum');
+
+  $error=$new->check;
+  return $error if $error;
+
+  $error = $new->rep($old);
+  return $error if $error;
+
+  ''; #no error
+}
+
+# Usage: $error = $record -> suspend;
+sub suspend {
+  ''; #no error (stub)
+}
+
+# Usage: $error = $record -> unsuspend;
+sub unsuspend {
+  ''; #no error (stub)
+}
+
+# Usage: $error = $record -> cancel;
+sub cancel {
+  ''; #no error (stub)
+}
+
+# Usage: $error = $record -> check;
+sub check {
+  my($self)=@_;
+  return "Not a svc_table record!" unless $self->table eq "svc_table";
+  my($recref) = $self->hashref;
+
+  $recref->{svcnum} =~ /^(\d+)$/ or return "Illegal svcnum";
+  $recref->{svcnum} = $1;
+  return "Unknown svcnum" unless
+    qsearchs('cust_svc',{'svcnum'=> $recref->{svcnum} } );
+
+  #DATA CHECKS GO HERE!
+
+  ''; #no error
+}
+
+1;
+
diff --git a/site_perl/table_template-unique.pm b/site_perl/table_template-unique.pm
new file mode 100644
index 000000000..32b7e6911
--- /dev/null
+++ b/site_perl/table_template-unique.pm
@@ -0,0 +1,66 @@
+#!/usr/local/bin/perl -Tw
+#
+# ivan@voicenet.com 97-jul-1
+# 
+# added hfields
+# ivan@sisd.com 97-nov-13
+
+package FS::table_name;
+
+use strict;
+use Exporter;
+#use FS::UID qw(getotaker);
+use FS::Record qw(fields hfields qsearch qsearchs);
+
+@FS::table_name::ISA = qw(FS::Record Exporter);
+@FS::table_name::EXPORT_OK = qw(hfields);
+
+# Usage: $record = create FS::table_name ( \%hash );
+#        $record = create FS::table_name ( { field=>value, ... } );
+sub create {
+  my($proto,$hashref)=@_;
+
+  my($field);
+  foreach $field (fields('table_name')) {
+    $hashref->{$field}='' unless defined $hashref->{$field};
+  }
+
+  $proto->new('table_name',$hashref);
+}
+
+# Usage: $error = $record -> insert;
+sub insert {
+  my($self)=@_;
+
+  $self->check or
+  $self->add;
+}
+
+# Usage: $error = $record -> delete;
+sub delete {
+  my($self)=@_;
+
+  $self->del;
+}
+
+# Usage: $error = $newrecord -> replace($oldrecord)
+sub replace {
+  my($new,$old)=@_;
+  return "(Old) Not a table_name record!" unless $old->table eq "table_name";
+  return "Can't change keyfield!"
+    unless $old->getfield('keyfield') eq $new->getfield('keyfield');
+  $new->check or
+  $new->rep($old);
+}
+
+# Usage: $error = $record -> check;
+sub check {
+  my($self)=@_;
+  return "Not a table_name record!" unless $self->table eq "table_name";
+  my($recref) = $self->hashref;
+
+  ''; #no error
+}
+
+1;
+
diff --git a/site_perl/table_template.pm b/site_perl/table_template.pm
new file mode 100644
index 000000000..cef2d92e8
--- /dev/null
+++ b/site_perl/table_template.pm
@@ -0,0 +1,66 @@
+#!/usr/local/bin/perl -Tw
+#
+# ivan@voicenet.com 97-jul-1
+# 
+# added hfields
+# ivan@sisd.com 97-nov-13
+
+package FS::table_name;
+
+use strict;
+use Exporter;
+#use FS::UID qw(getotaker);
+use FS::Record qw(hfields qsearch qsearchs);
+
+@FS::table_name::ISA = qw(FS::Record Exporter);
+@FS::table_name::EXPORT_OK = qw(hfields);
+
+# Usage: $record = create FS::table_name ( \%hash );
+#        $record = create FS::table_name ( { field=>value, ... } );
+sub create {
+  my($proto,$hashref)=@_;
+
+  my($field);
+  foreach $field (fields('table_name')) {
+    $hashref->{$field}='' unless defined $hashref->{$field};
+  }
+
+  $proto->new('table_name',$hashref);
+
+}
+
+# Usage: $error = $record -> insert;
+sub insert {
+  my($self)=@_;
+
+  $self->check or
+  $self->add;
+}
+
+# Usage: $error = $record -> delete;
+sub delete {
+  my($self)=@_;
+
+  $self->del;
+}
+
+# Usage: $error = $newrecord -> replace($oldrecord)
+sub replace {
+  my($new,$old)=@_;
+  return "(Old) Not a table_name record!" unless $old->table eq "table_name";
+
+  $new->check or
+  $new->rep($old);
+}
+
+# Usage: $error = $record -> check;
+sub check {
+  my($self)=@_;
+  return "Not a table_name record!" unless $self->table eq "table_name";
+  my($recref) = $self->hashref;
+
+  ''; #no error
+}
+
+1;
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 8ac6789273cc3884d586a790311585776abd9129 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Mar 1998 07:46:04 +0000
Subject: Initial import into CVS

---
 etc/countries.txt | 239 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 239 insertions(+)
 create mode 100644 etc/countries.txt

diff --git a/etc/countries.txt b/etc/countries.txt
new file mode 100644
index 000000000..73c3975ed
--- /dev/null
+++ b/etc/countries.txt
@@ -0,0 +1,239 @@
+AFGHANISTAN                                     AF      AFG     004
+ALBANIA                                         AL      ALB     008
+ALGERIA                                         DZ      DZA     012
+AMERICAN SAMOA                                  AS      ASM     016
+ANDORRA                                         AD      AND     020
+ANGOLA                                          AO      AGO     024
+ANGUILLA                                        AI      AIA     660
+ANTARCTICA                                      AQ      ATA     010
+ANTIGUA AND BARBUDA                             AG      ATG     028
+ARGENTINA                                       AR      ARG     032
+ARMENIA                                         AM      ARM     051
+ARUBA                                           AW      ABW     533
+AUSTRALIA                                       AU      AUS     036
+AUSTRIA                                         AT      AUT     040
+AZERBAIJAN                                      AZ      AZE     031
+BAHAMAS                                         BS      BHS     044
+BAHRAIN                                         BH      BHR     048
+BANGLADESH                                      BD      BGD     050
+BARBADOS                                        BB      BRB     052
+BELARUS                                         BY      BLR     112
+BELGIUM                                         BE      BEL     056
+BELIZE                                          BZ      BLZ     084
+BENIN                                           BJ      BEN     204
+BERMUDA                                         BM      BMU     060
+BHUTAN                                          BT      BTN     064
+BOLIVIA                                         BO      BOL     068
+BOSNIA AND HERZEGOWINA                          BA      BIH     070
+BOTSWANA                                        BW      BWA     072
+BOUVET ISLAND                                   BV      BVT     074
+BRAZIL                                          BR      BRA     076
+BRITISH INDIAN OCEAN TERRITORY                  IO      IOT     086
+BRUNEI DARUSSALAM                               BN      BRN     096
+BULGARIA                                        BG      BGR     100
+BURKINA FASO                                    BF      BFA     854
+BURUNDI                                         BI      BDI     108
+CAMBODIA                                        KH      KHM     116
+CAMEROON                                        CM      CMR     120
+CANADA                                          CA      CAN     124
+CAPE VERDE                                      CV      CPV     132
+CAYMAN ISLANDS                                  KY      CYM     136
+CENTRAL AFRICAN REPUBLIC                        CF      CAF     140
+CHAD                                            TD      TCD     148
+CHILE                                           CL      CHL     152
+CHINA                                           CN      CHN     156
+CHRISTMAS ISLAND                                CX      CXR     162
+COCOS (KEELING) ISLANDS                         CC      CCK     166
+COLOMBIA                                        CO      COL     170
+COMOROS                                         KM      COM     174
+CONGO                                           CG      COG     178
+COOK ISLANDS                                    CK      COK     184
+COSTA RICA                                      CR      CRI     188
+COTE D'IVOIRE                                   CI      CIV     384
+CROATIA (local name: Hrvatska)                  HR      HRV     191
+CUBA                                            CU      CUB     192
+CYPRUS                                          CY      CYP     196
+CZECH REPUBLIC                                  CZ      CZE     203
+DENMARK                                         DK      DNK     208
+DJIBOUTI                                        DJ      DJI     262
+DOMINICA                                        DM      DMA     212
+DOMINICAN REPUBLIC                              DO      DOM     214
+EAST TIMOR                                      TP      TMP     626
+ECUADOR                                         EC      ECU     218
+EGYPT                                           EG      EGY     818
+EL SALVADOR                                     SV      SLV     222
+EQUATORIAL GUINEA                               GQ      GNQ     226
+ERITREA                                         ER      ERI     232
+ESTONIA                                         EE      EST     233
+ETHIOPIA                                        ET      ETH     231
+FALKLAND ISLANDS (MALVINAS)                     FK      FLK     238
+FAROE ISLANDS                                   FO      FRO     234
+FIJI                                            FJ      FJI     242
+FINLAND                                         FI      FIN     246
+FRANCE                                          FR      FRA     250
+FRANCE, METROPOLITAN                            FX      FXX     249
+FRENCH GUIANA                                   GF      GUF     254
+FRENCH POLYNESIA                                PF      PYF     258
+FRENCH SOUTHERN TERRITORIES                     TF      ATF     260
+GABON                                           GA      GAB     266
+GAMBIA                                          GM      GMB     270
+GEORGIA                                         GE      GEO     268
+GERMANY                                         DE      DEU     276
+GHANA                                           GH      GHA     288
+GIBRALTAR                                       GI      GIB     292
+GREECE                                          GR      GRC     300
+GREENLAND                                       GL      GRL     304
+GRENADA                                         GD      GRD     308
+GUADELOUPE                                      GP      GLP     312
+GUAM                                            GU      GUM     316
+GUATEMALA                                       GT      GTM     320
+GUINEA                                          GN      GIN     324
+GUINEA-BISSAU                                   GW      GNB     624
+GUYANA                                          GY      GUY     328
+HAITI                                           HT      HTI     332
+HEARD AND MC DONALD ISLANDS                     HM      HMD     334
+HONDURAS                                        HN      HND     340
+HONG KONG                                       HK      HKG     344
+HUNGARY                                         HU      HUN     348
+ICELAND                                         IS      ISL     352
+INDIA                                           IN      IND     356
+INDONESIA                                       ID      IDN     360
+IRAN (ISLAMIC REPUBLIC OF)                      IR      IRN     364
+IRAQ                                            IQ      IRQ     368
+IRELAND                                         IE      IRL     372
+ISRAEL                                          IL      ISR     376
+ITALY                                           IT      ITA     380
+JAMAICA                                         JM      JAM     388
+JAPAN                                           JP      JPN     392
+JORDAN                                          JO      JOR     400
+KAZAKHSTAN                                      KZ      KAZ     398
+KENYA                                           KE      KEN     404
+KIRIBATI                                        KI      KIR     296
+KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF          KP      PRK     408
+KOREA, REPUBLIC OF                              KR      KOR     410
+KUWAIT                                          KW      KWT     414
+KYRGYZSTAN                                      KG      KGZ     417
+LAO PEOPLE'S DEMOCRATIC REPUBLIC                LA      LAO     418
+LATVIA                                          LV      LVA     428
+LEBANON                                         LB      LBN     422
+LESOTHO                                         LS      LSO     426
+LIBERIA                                         LR      LBR     430
+LIBYAN ARAB JAMAHIRIYA                          LY      LBY     434
+LIECHTENSTEIN                                   LI      LIE     438
+LITHUANIA                                       LT      LTU     440
+LUXEMBOURG                                      LU      LUX     442
+MACAU                                           MO      MAC     446
+MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF      MK      MKD     807
+MADAGASCAR                                      MG      MDG     450
+MALAWI                                          MW      MWI     454
+MALAYSIA                                        MY      MYS     458
+MALDIVES                                        MV      MDV     462
+MALI                                            ML      MLI     466
+MALTA                                           MT      MLT     470
+MARSHALL ISLANDS                                MH      MHL     584
+MARTINIQUE                                      MQ      MTQ     474
+MAURITANIA                                      MR      MRT     478
+MAURITIUS                                       MU      MUS     480
+MAYOTTE                                         YT      MYT     175
+MEXICO                                          MX      MEX     484
+MICRONESIA, FEDERATED STATES OF                 FM      FSM     583
+MOLDOVA, REPUBLIC OF                            MD      MDA     498
+MONACO                                          MC      MCO     492
+MONGOLIA                                        MN      MNG     496
+MONTSERRAT                                      MS      MSR     500
+MOROCCO                                         MA      MAR     504
+MOZAMBIQUE                                      MZ      MOZ     508
+MYANMAR                                         MM      MMR     104
+NAMIBIA                                         NA      NAM     516
+NAURU                                           NR      NRU     520
+NEPAL                                           NP      NPL     524
+NETHERLANDS                                     NL      NLD     528
+NETHERLANDS ANTILLES                            AN      ANT     530
+NEW CALEDONIA                                   NC      NCL     540
+NEW ZEALAND                                     NZ      NZL     554
+NICARAGUA                                       NI      NIC     558
+NIGER                                           NE      NER     562
+NIGERIA                                         NG      NGA     566
+NIUE                                            NU      NIU     570
+NORFOLK ISLAND                                  NF      NFK     574
+NORTHERN MARIANA ISLANDS                        MP      MNP     580
+NORWAY                                          NO      NOR     578
+OMAN                                            OM      OMN     512
+PAKISTAN                                        PK      PAK     586
+PALAU                                           PW      PLW     585
+PANAMA                                          PA      PAN     591
+PAPUA NEW GUINEA                                PG      PNG     598
+PARAGUAY                                        PY      PRY     600
+PERU                                            PE      PER     604
+PHILIPPINES                                     PH      PHL     608
+PITCAIRN                                        PN      PCN     612
+POLAND                                          PL      POL     616
+PORTUGAL                                        PT      PRT     620
+PUERTO RICO                                     PR      PRI     630
+QATAR                                           QA      QAT     634
+REUNION                                         RE      REU     638
+ROMANIA                                         RO      ROM     642
+RUSSIAN FEDERATION                              RU      RUS     643
+RWANDA                                          RW      RWA     646
+SAINT KITTS AND NEVIS                           KN      KNA     659
+SAINT LUCIA                                     LC      LCA     662
+SAINT VINCENT AND THE GRENADINES                VC      VCT     670
+SAMOA                                           WS      WSM     882
+SAN MARINO                                      SM      SMR     674
+SAO TOME AND PRINCIPE                           ST      STP     678
+SAUDI ARABIA                                    SA      SAU     682
+SENEGAL                                         SN      SEN     686
+SEYCHELLES                                      SC      SYC     690
+SIERRA LEONE                                    SL      SLE     694
+SINGAPORE                                       SG      SGP     702
+SLOVAKIA (Slovak Republic)                      SK      SVK     703
+SLOVENIA                                        SI      SVN     705
+SOLOMON ISLANDS                                 SB      SLB     090
+SOMALIA                                         SO      SOM     706
+SOUTH AFRICA                                    ZA      ZAF     710
+SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS    GS      SGS     239
+SPAIN                                           ES      ESP     724
+SRI LANKA                                       LK      LKA     144
+ST. HELENA                                      SH      SHN     654
+ST. PIERRE AND MIQUELON                         PM      SPM     666
+SUDAN                                           SD      SDN     736
+SURINAME                                        SR      SUR     740
+SVALBARD AND JAN MAYEN ISLANDS                  SJ      SJM     744
+SWAZILAND                                       SZ      SWZ     748
+SWEDEN                                          SE      SWE     752
+SWITZERLAND                                     CH      CHE     756
+SYRIAN ARAB REPUBLIC                            SY      SYR     760
+TAIWAN, PROVINCE OF CHINA                       TW      TWN     158
+TAJIKISTAN                                      TJ      TJK     762
+TANZANIA, UNITED REPUBLIC OF                    TZ      TZA     834
+THAILAND                                        TH      THA     764
+TOGO                                            TG      TGO     768
+TOKELAU                                         TK      TKL     772
+TONGA                                           TO      TON     776
+TRINIDAD AND TOBAGO                             TT      TTO     780
+TUNISIA                                         TN      TUN     788
+TURKEY                                          TR      TUR     792
+TURKMENISTAN                                    TM      TKM     795
+TURKS AND CAICOS ISLANDS                        TC      TCA     796
+TUVALU                                          TV      TUV     798
+UGANDA                                          UG      UGA     800
+UKRAINE                                         UA      UKR     804
+UNITED ARAB EMIRATES                            AE      ARE     784
+UNITED KINGDOM                                  GB      GBR     826
+UNITED STATES                                   US      USA     840
+UNITED STATES MINOR OUTLYING ISLANDS            UM      UMI     581
+URUGUAY                                         UY      URY     858
+UZBEKISTAN                                      UZ      UZB     860
+VANUATU                                         VU      VUT     548
+VATICAN CITY STATE (HOLY SEE)                   VA      VAT     336
+VENEZUELA                                       VE      VEN     862
+VIET NAM                                        VN      VNM     704
+VIRGIN ISLANDS (BRITISH)                        VG      VGB     092
+VIRGIN ISLANDS (U.S.)                           VI      VIR     850
+WALLIS AND FUTUNA ISLANDS                       WF      WLF     876
+WESTERN SAHARA                                  EH      ESH     732
+YEMEN                                           YE      YEM     887
+YUGOSLAVIA                                      YU      YUG     891
+ZAIRE                                           ZR      ZAR     180
+ZAMBIA                                          ZM      ZMB     894
+ZIMBABWE                                        ZW      ZWE     716
-- 
cgit v1.2.1


From 0b5b85344c8cb7d94ba895fbd56f483dee756de7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Mar 1998 08:20:25 +0000
Subject: Initial revision

---
 fs_passwd/fs_passwdd | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100755 fs_passwd/fs_passwdd

diff --git a/fs_passwd/fs_passwdd b/fs_passwd/fs_passwdd
new file mode 100755
index 000000000..582e13ccd
--- /dev/null
+++ b/fs_passwd/fs_passwdd
@@ -0,0 +1,49 @@
+#!/usr/bin/perl -Tw
+#
+# fs_passwdd
+#
+# This is run REMOTELY over ssh by fs_passwd_server.
+#
+# ivan@sisd.com 98-mar-9
+
+use strict;
+use Socket;
+
+my($fs_passwdd_socket)="/usr/local/freeside/fs_passwdd_socket";
+
+$ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin';
+$ENV{'SHELL'} = '/bin/sh';
+$ENV{'IFS'} = " \t\n";
+$ENV{'CDPATH'} = '';
+$ENV{'ENV'} = '';
+$ENV{'BASH_ENV'} = '';
+
+$|=1;
+
+my $uaddr = sockaddr_un($fs_passwdd_socket);
+my $proto = getprotobyname('tcp');
+
+socket(Server,PF_UNIX,SOCK_STREAM,0) or die "socket: $!";
+unlink($fs_passwdd_socket);
+bind(Server, $uaddr) or die "bind: $!";
+listen(Server,SOMAXCONN) or die "listen: $!";
+
+my($paddr);
+for ( ; $paddr = accept(Client,Server); close Client) {
+  my($me,$old_password,$new_password,$new_gecos,$new_shell);
+
+  $me=<Client>;
+  $old_password=<Client>;
+  $new_password=<Client>;
+  $new_gecos=<Client>;
+  $new_shell=<Client>;
+
+  print $me,$old_password,$new_password,$new_gecos,$new_shell;
+  my($error);
+
+  $error=<STDIN>;
+  
+  print Client $error;
+  close Client;
+}
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 9307a5317a1dcf9fafd8b6bac8ffc70c505f9e2b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 16 Apr 1998 20:34:09 +0000
Subject: Initial revision

---
 fs_radlog/fs_radlogd | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100755 fs_radlog/fs_radlogd

diff --git a/fs_radlog/fs_radlogd b/fs_radlog/fs_radlogd
new file mode 100755
index 000000000..74c2af361
--- /dev/null
+++ b/fs_radlog/fs_radlogd
@@ -0,0 +1,51 @@
+#!/usr/bin/perl -Tw
+#
+# ivan@sisd.com 98-mar-23
+
+use strict;
+use Date::Parse; #but hopefully not
+
+$|=1;
+
+my($file,$pos)=@_;
+open(FILE,"<$file") or die "Can't open $file: $!";
+seek(FILE,$pos,0) or die "Can't seek: $!";
+
+my($datestr);
+my(%param);
+
+$SIG{'HUP'} = sub { print "EOF\n"; exit; };
+
+while (1) {
+
+  while (<FILE>) {
+    next if /^$/;
+    if ( /^\S/ ) {
+      chop($datestr=$_);
+      undef %param;
+    } else {
+      warn "Unexpected line: $_";
+    }
+    while (<FILE>) {
+      if ( /^$/ ) {
+        #if ( $param{'Acct-Status-Type'} eq 'Stop' ) {
+          print join("\t",
+            tell FILE,
+            %param,
+          ),"\n";
+        #}
+        last;
+      } elsif ( /^\s+([\w\-]+)\s\=\s\"?([\w\.\-]+)\"?\s*$/ ) {
+        $param{$1}=$2;
+      } else { 
+        warn "Unexpected line: $_";
+      }
+
+    }  
+
+  }
+  sleep 1;
+  seek(FILE,0,1);
+}
+
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From dd013679940cb0a4425eeff4df263e390d9c42e4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Apr 1998 05:37:07 +0000
Subject: Initial revision

---
 htdocs/edit/process/cust_credit.cgi |  70 ++++++++++++++
 htdocs/edit/process/cust_main.cgi   | 102 ++++++++++++++++++++
 htdocs/edit/process/cust_pay.cgi    |  57 ++++++++++++
 htdocs/edit/process/cust_pkg.cgi    |  73 +++++++++++++++
 htdocs/edit/process/svc_acct.cgi    |  87 +++++++++++++++++
 htdocs/misc/bill.cgi                |  66 +++++++++++++
 htdocs/misc/cancel-unaudited.cgi    |  85 +++++++++++++++++
 htdocs/misc/expire_pkg.cgi          |  71 ++++++++++++++
 htdocs/misc/susp_pkg.cgi            |  68 ++++++++++++++
 htdocs/misc/unsusp_pkg.cgi          |  68 ++++++++++++++
 htdocs/search/cust_bill.cgi         |  46 +++++++++
 htdocs/view/cust_pkg.cgi            | 181 ++++++++++++++++++++++++++++++++++++
 htdocs/view/svc_domain.cgi          |  76 +++++++++++++++
 13 files changed, 1050 insertions(+)
 create mode 100755 htdocs/edit/process/cust_credit.cgi
 create mode 100755 htdocs/edit/process/cust_main.cgi
 create mode 100755 htdocs/edit/process/cust_pay.cgi
 create mode 100755 htdocs/edit/process/cust_pkg.cgi
 create mode 100755 htdocs/edit/process/svc_acct.cgi
 create mode 100755 htdocs/misc/bill.cgi
 create mode 100755 htdocs/misc/cancel-unaudited.cgi
 create mode 100755 htdocs/misc/expire_pkg.cgi
 create mode 100755 htdocs/misc/susp_pkg.cgi
 create mode 100755 htdocs/misc/unsusp_pkg.cgi
 create mode 100755 htdocs/search/cust_bill.cgi
 create mode 100755 htdocs/view/cust_pkg.cgi
 create mode 100755 htdocs/view/svc_domain.cgi

diff --git a/htdocs/edit/process/cust_credit.cgi b/htdocs/edit/process/cust_credit.cgi
new file mode 100755
index 000000000..e660b4c78
--- /dev/null
+++ b/htdocs/edit/process/cust_credit.cgi
@@ -0,0 +1,70 @@
+#!/usr/bin/perl -Tw
+#
+# process/cust_credit.cgi: Add a credit (process form)
+#
+# Usage: post form to:
+#        http://server.name/path/cust_credit.cgi
+#
+# Note: Should be run setuid root as user nobody.
+#
+# ivan@voicenet.com 96-dec-05 -> 96-dec-08
+#
+# post a refund if $new_paybatch
+# ivan@voicenet.com 96-dec-08
+#
+# refunds are no longer applied against a specific payment (paybatch)
+# paybatch field removed
+# ivan@voicenet.com 97-apr-22
+#
+# rewrite ivan@sisd.com 98-mar-16
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+
+use strict;
+use CGI::Request;
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::cust_credit;
+
+my($req)=new CGI::Request; # create form object
+cgisuidsetup($req->cgi);
+
+$req->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
+my($custnum)=$1;
+
+$req->param('otaker',getotaker);
+
+my($new) = create FS::cust_credit ( {
+  map {
+    $_, $req->param($_);
+  } qw(custnum _date amount otaker reason)
+} );
+
+my($error);
+$error=$new->insert;
+&idiot($error) if $error;
+
+#no errors, no refund, so view our credit.
+$req->cgi->redirect("../../view/cust_main.cgi?$custnum#history");
+
+sub idiot {
+  my($error)=@_;
+  CGI::Base::SendHeaders(); # one guess
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Error posting credit/refund</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H4>Error posting credit/refund</H4>
+    </CENTER>
+    Your update did not occur because of the following error:
+    <P><B>$error</B>
+    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and press the <I>Post</I> button again.
+  </BODY>
+</HTML>
+END
+
+}
+
diff --git a/htdocs/edit/process/cust_main.cgi b/htdocs/edit/process/cust_main.cgi
new file mode 100755
index 000000000..7664dfcb8
--- /dev/null
+++ b/htdocs/edit/process/cust_main.cgi
@@ -0,0 +1,102 @@
+#!/usr/bin/perl -Tw
+#
+# process/cust_main.cgi: Edit a customer (process form)
+#
+# Usage: post form to:
+#        http://server.name/path/cust_main.cgi
+#
+# Note: Should be run setuid root as user nobody.
+#
+# ivan@voicenet.com 96-dec-04
+#
+# added referral check
+# ivan@voicenet.com 97-jun-4
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-28
+#
+# same as above (again) and clean up some stuff ivan@sisd.com 98-feb-23
+#
+# Changes to allow page to work at a relative position in server
+# Changed 'day' to 'daytime' because Pg6.3 reserves the day word
+#       bmccane@maxbaud.net     98-apr-3
+
+use strict;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+use FS::cust_main;
+
+my($req)=new CGI::Request; # create form object
+
+&cgisuidsetup($req->cgi);
+
+#create new record object
+
+#unmunge agentnum
+$req->param('agentnum', 
+  (split(/:/, ($req->param('agentnum'))[0] ))[0]
+);
+
+#unmunge tax
+$req->param('tax','') unless defined($req->param('tax'));
+
+#unmunge refnum
+$req->param('refnum',
+  (split(/:/, ($req->param('refnum'))[0] ))[0]
+);
+
+#unmunge state/county
+$req->param('state') =~ /^(\w+)( \((\w+)\))?$/;
+$req->param('state', $1);
+$req->param('county', $3 || '');
+
+my($new) = create FS::cust_main ( {
+  map {
+    $_, $req->param("$_") || ''
+  } qw(custnum agentnum last first ss company address1 address2 city county
+       state zip country daytime night fax payby payinfo paydate payname tax
+       otaker refnum)
+} );
+
+if ( $new->custnum eq '' ) {
+
+  my($error)=$new->insert;
+  &idiot($error) if $error;
+
+} else { #create old record object
+
+  my($old) = qsearchs( 'cust_main', { 'custnum', $new->custnum } ); 
+  &idiot("Old record not found!") unless $old;
+  my($error)=$new->replace($old);
+  &idiot($error) if $error;
+
+}
+
+my($custnum)=$new->custnum;
+$req->cgi->redirect("../../view/cust_main.cgi?$custnum#cust_main");
+
+sub idiot {
+  my($error)=@_;
+  CGI::Base::SendHeaders(); # one guess
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Error updating customer information</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H4>Error updating customer information</H4>
+    </CENTER>
+    Your update did not occur because of the following error:
+    <P><B>$error</B>
+    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and submit the form again.
+  </BODY>
+</HTML>
+END
+
+  exit;
+
+}
+
diff --git a/htdocs/edit/process/cust_pay.cgi b/htdocs/edit/process/cust_pay.cgi
new file mode 100755
index 000000000..9ec97532b
--- /dev/null
+++ b/htdocs/edit/process/cust_pay.cgi
@@ -0,0 +1,57 @@
+#!/usr/bin/perl -Tw
+#
+# process/cust_pay.cgi: Add a payment (process form)
+#
+# Usage: post form to:
+#        http://server.name/path/cust_pay.cgi
+#
+# Note: Should be run setuid root as user nobody.
+#
+# ivan@voicenet.com 96-dec-11
+#
+# rewrite ivan@sisd.com 98-mar-16
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+
+use strict;
+use CGI::Request;
+use FS::UID qw(cgisuidsetup);
+use FS::cust_pay qw(fields);
+
+my($req)=new CGI::Request;
+&cgisuidsetup($req->cgi);
+
+$req->param('invnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+my($invnum)=$1;
+
+my($new) = create FS::cust_pay ( {
+  map {
+    $_, $req->param($_);
+  } qw(invnum paid _date payby payinfo paybatch)
+} );
+
+my($error);
+$error=$new->insert;
+
+if ($error) { #error!
+  CGI::Base::SendHeaders(); # one guess
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Error posting payment</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H4>Error posting payment</H4>
+    </CENTER>
+    Your update did not occur because of the following error:
+    <P><B>$error</B>
+    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and press the <I>Post</I> button again.
+  </BODY>
+</HTML>
+END
+} else { #no errors!
+  $req->cgi->redirect("../../view/cust_bill.cgi?$invnum");
+}
+
diff --git a/htdocs/edit/process/cust_pkg.cgi b/htdocs/edit/process/cust_pkg.cgi
new file mode 100755
index 000000000..6f5bc875a
--- /dev/null
+++ b/htdocs/edit/process/cust_pkg.cgi
@@ -0,0 +1,73 @@
+#!/usr/bin/perl -Tw
+#
+# process/cust_pkg.cgi: Add/edit packages (process form)
+#
+# this is for changing packages around, not for editing things within the
+# package
+#
+# Usage: post form to:
+#        http://server.name/path/cust_pkg.cgi
+#
+# Note: Should be run setuid root as user nobody.
+#
+# ivan@voicenet.com 97-mar-21 - 97-mar-24
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-7 - 15
+#
+# &cgisuidsetup($cgi) ivan@sisd.com 98-mar-7
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+
+use strict;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::cust_pkg;
+
+my($req)=new CGI::Request; # create form object
+
+&cgisuidsetup($req->cgi);
+
+#untaint custnum
+$req->param('new_custnum') =~ /^(\d+)$/;
+my($custnum)=$1;
+
+my(@remove_pkgnums) = map {
+  /^(\d+)$/ or die "Illegal remove_pkg value!";
+  $1;
+} $req->param('remove_pkg');
+
+my(@pkgparts);
+my($pkgpart);
+foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $req->params ) {
+  my($num_pkgs)=$req->param("pkg$pkgpart");
+  while ( $num_pkgs-- ) {
+    push @pkgparts,$pkgpart;
+  }
+}
+
+my($error) = FS::cust_pkg::order($custnum,\@pkgparts,\@remove_pkgnums);
+
+if ($error) {
+  CGI::Base::SendHeaders();
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Error updating packages</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H4>Error updating packages</H4>
+    </CENTER>
+    Your update did not occur because of the following error:
+    <P><B>$error</B>
+    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and submit the form again.
+  </BODY>
+</HTML>
+END
+} else {
+  $req->cgi->redirect("../../view/cust_main.cgi?$custnum#cust_pkg");
+}
+
diff --git a/htdocs/edit/process/svc_acct.cgi b/htdocs/edit/process/svc_acct.cgi
new file mode 100755
index 000000000..8d77ba703
--- /dev/null
+++ b/htdocs/edit/process/svc_acct.cgi
@@ -0,0 +1,87 @@
+#!/usr/bin/perl -Tw
+#
+# process/svc_acct.cgi: Add/edit a customer (process form)
+#
+# Usage: post form to:
+#        http://server.name/path/svc_acct.cgi
+#
+# Note: Should br run setuid root as user nobody.
+#
+# ivan@voicenet.com 96-dec-18
+#
+# Changed /u to /u2
+# ivan@voicenet.com 97-may-6
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-17 - 21
+#
+# no FS::Search, FS::svc_acct creates FS::cust_svc record, used for adding
+# and editing ivan@sisd.com 98-mar-8
+#
+# Changes to allow page to work at a relative position in server
+# Changed 'password' to '_password' because Pg6.3 reserves the password word
+#       bmccane@maxbaud.net     98-apr-3
+
+use strict;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+use FS::svc_acct;
+
+my($req) = new CGI::Request; # create form object
+&cgisuidsetup($req->cgi);
+
+$req->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+my($svcnum)=$1;
+
+my($old)=qsearchs('svc_acct',{'svcnum'=>$svcnum}) if $svcnum;
+
+#unmunge popnum
+$req->param('popnum', (split(/:/, $req->param('popnum') ))[0] );
+
+#unmunge passwd
+if ( $req->param('_password') eq '*HIDDEN*' ) {
+  $req->param('_password',$old->getfield('_password'));
+}
+
+my($new) = create FS::svc_acct ( {
+  map {
+    $_, $req->param($_);
+  } qw(svcnum pkgnum svcpart username _password popnum uid gid finger dir
+    shell quota slipip)
+} );
+
+if ( $svcnum ) {
+  my($error) = $new->replace($old);
+  &idiot($error) if $error;
+} else {
+  my($error) = $new->insert;
+  &idiot($error) if $error;
+  $svcnum = $new->getfield('svcnum');
+}
+
+#no errors, view account
+$req->cgi->redirect("../../view/svc_acct.cgi?" . $svcnum );
+
+sub idiot {
+  my($error)=@_;
+  CGI::Base::SendHeaders(); # one guess
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Error adding/updating account</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H4>Error adding/updating account</H4>
+    </CENTER>
+    Your update did not occur because of the following error:
+    <P><B>$error</B>
+    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and submit the form again.
+  </BODY>
+</HTML>
+END
+  exit;
+}
+
diff --git a/htdocs/misc/bill.cgi b/htdocs/misc/bill.cgi
new file mode 100755
index 000000000..d41f6d1c9
--- /dev/null
+++ b/htdocs/misc/bill.cgi
@@ -0,0 +1,66 @@
+#!/usr/bin/perl -Tw
+#
+# s/FS:Search/FS::Record/ and cgisuidsetup($cgi) ivan@sisd.com 98-mar-13
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+
+use strict;
+use CGI::Base qw(:DEFAULT :CGI);
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+use FS::Bill;
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+&cgisuidsetup($cgi);
+
+#untaint custnum
+$QUERY_STRING =~ /^(\d*)$/;
+my($custnum)=$1;
+my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
+die "Can't find customer!\n" unless $cust_main;
+
+# ? 
+bless($cust_main,"FS::Bill");
+
+my($error);
+
+$error = $cust_main->bill(
+#                          'time'=>$time
+                         );
+&idiot($error) if $error;
+
+$error = $cust_main->collect(
+#                             'invoice-time'=>$time,
+#                             'batch_card'=> 'yes',
+                             'batch_card'=> 'no',
+                             'report_badcard'=> 'yes',
+                            );
+&idiot($error) if $error;
+
+$cgi->redirect("../view/cust_main.cgi?$custnum#history");
+
+sub idiot {
+  my($error)=@_;
+  CGI::Base::SendHeaders(); # one guess
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Error billing customer</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H4>Error billing customer</H4>
+    </CENTER>
+    Your update did not occur because of the following error:
+    <P><B>$error</B>
+  </BODY>
+</HTML>
+END
+
+  exit;
+
+}
+
diff --git a/htdocs/misc/cancel-unaudited.cgi b/htdocs/misc/cancel-unaudited.cgi
new file mode 100755
index 000000000..929274f38
--- /dev/null
+++ b/htdocs/misc/cancel-unaudited.cgi
@@ -0,0 +1,85 @@
+#!/usr/bin/perl -Tw
+#
+# cancel-unaudited.cgi: Cancel an unaudited account
+#
+# Usage: cancel-unaudited.cgi svcnum
+#        http://server.name/path/cancel-unaudited.cgi pkgnum
+#
+# Note: Should be run setuid freeside as user nobody
+#
+# ivan@voicenet.com 97-apr-23
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-21
+#
+# Search->Record, cgisuidsetup($cgi) ivan@sids.com 98-mar-19
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+
+use strict;
+use CGI::Base qw(:DEFAULT :CGI); # CGI module
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+use FS::cust_svc;
+use FS::svc_acct;
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+&cgisuidsetup($cgi);
+ 
+#untaint svcnum
+$QUERY_STRING =~ /^(\d+)$/;
+my($svcnum)=$1;
+
+my($svc_acct) = qsearchs('svc_acct',{'svcnum'=>$svcnum});
+&idiot("Unknown svcnum!") unless $svc_acct;
+
+my($cust_svc) = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+&idiot(qq!This account has already been audited.  Cancel the 
+    <A HREF="../view/cust_pkg.cgi?! . $cust_svc->getfield('pkgnum') .
+    qq!pkgnum"> package</A> instead.!) 
+  if $cust_svc->getfield('pkgnum') ne '';
+
+local $SIG{HUP} = 'IGNORE';
+local $SIG{INT} = 'IGNORE';
+local $SIG{QUIT} = 'IGNORE';
+local $SIG{TERM} = 'IGNORE';
+local $SIG{TSTP} = 'IGNORE';
+
+my($error);
+
+bless($svc_acct,"FS::svc_acct");
+$error = $svc_acct->cancel;
+&idiot($error) if $error;
+$error = $svc_acct->delete;
+&idiot($error) if $error;
+
+bless($cust_svc,"FS::cust_svc");
+$error = $cust_svc->delete;
+&idiot($error) if $error;
+
+$cgi->redirect("../");
+
+sub idiot {
+  my($error)=@_;
+  SendHeaders();
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Error cancelling account</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H1>Error cancelling account</H1>
+    </CENTER>
+    <HR>
+    There has been an error cancelling this acocunt:  $error
+  </BODY>
+  </HEAD>
+</HTML>
+END
+  exit;
+}
+
diff --git a/htdocs/misc/expire_pkg.cgi b/htdocs/misc/expire_pkg.cgi
new file mode 100755
index 000000000..163516627
--- /dev/null
+++ b/htdocs/misc/expire_pkg.cgi
@@ -0,0 +1,71 @@
+#!/usr/bin/perl -Tw
+#
+# expire_pkg.cgi: Expire a package
+#
+# Usage: post form to:
+#        http://server.name/path/expire_pkg.cgi
+#
+# Note: Should be run setuid freeside as user nobody
+#
+# based on susp_pkg
+# ivan@voicenet.com 97-jul-29
+#
+# ivan@sisd.com 98-mar-17 FS::Search->FS::Record
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+
+use strict;
+use Date::Parse;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+use FS::cust_pkg;
+
+my($req) = new CGI::Request;
+&cgisuidsetup($req->cgi);
+
+#untaint date & pkgnum
+
+my($date);
+if ( $req->param('date') ) {
+  str2time($req->param('date')) =~ /^(\d+)$/ or die "Illegal date";
+  $date=$1;
+} else {
+  $date='';
+}
+
+$req->param('pkgnum') =~ /^(\d+)$/ or die "Illegal pkgnum";
+my($pkgnum)=$1;
+
+my($cust_pkg) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+my(%hash)=$cust_pkg->hash;
+$hash{expire}=$date;
+my($new)=create FS::cust_pkg ( \%hash );
+my($error) = $new->replace($cust_pkg);
+&idiot($error) if $error;
+
+$req->cgi->redirect("../view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
+
+sub idiot {
+  my($error)=@_;
+  SendHeaders();
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Error expiring package</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H1>Error expiring package</H1>
+    </CENTER>
+    <HR>
+    There has been an error expiring this package:  $error
+  </BODY>
+  </HEAD>
+</HTML>
+END
+  exit;
+}
+
diff --git a/htdocs/misc/susp_pkg.cgi b/htdocs/misc/susp_pkg.cgi
new file mode 100755
index 000000000..7b23caeb2
--- /dev/null
+++ b/htdocs/misc/susp_pkg.cgi
@@ -0,0 +1,68 @@
+#!/usr/bin/perl -Tw
+#
+# susp_pkg.cgi: Suspend a package
+#
+# Usage: susp_pkg.cgi pkgnum
+#        http://server.name/path/susp_pkg.cgi pkgnum
+#
+# Note: Should be run setuid freeside as user nobody
+#
+# probably should generalize this to do cancels, suspensions, unsuspensions, etc.
+#
+# ivan@voicenet.com 97-feb-27
+#
+# now redirects to enter comments
+# ivan@voicenet.com 97-may-8
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-21
+#
+# FS::Search -> FS::Record ivan@sisd.com 98-mar-17
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+
+use strict;
+use CGI::Base qw(:DEFAULT :CGI); # CGI module
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+use FS::cust_pkg;
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+&cgisuidsetup($cgi);
+ 
+#untaint pkgnum
+$QUERY_STRING =~ /^(\d+)$/ || die "Illegal pkgnum";
+my($pkgnum)=$1;
+
+my($cust_pkg) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+
+bless($cust_pkg,'FS::cust_pkg');
+my($error)=$cust_pkg->suspend;
+&idiot($error) if $error;
+
+$cgi->redirect("../view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
+
+sub idiot {
+  my($error)=@_;
+  SendHeaders();
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Error suspending package</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H1>Error suspending package</H1>
+    </CENTER>
+    <HR>
+    There has been an error suspending this package:  $error
+  </BODY>
+  </HEAD>
+</HTML>
+END
+  exit;
+}
+
diff --git a/htdocs/misc/unsusp_pkg.cgi b/htdocs/misc/unsusp_pkg.cgi
new file mode 100755
index 000000000..2f340c6fa
--- /dev/null
+++ b/htdocs/misc/unsusp_pkg.cgi
@@ -0,0 +1,68 @@
+#!/usr/bin/perl -Tw
+#
+# susp_pkg.cgi: Unsuspend a package
+#
+# Usage: susp_pkg.cgi pkgnum
+#        http://server.name/path/susp_pkg.cgi pkgnum
+#
+# Note: Should be run setuid freeside as user nobody
+#
+# probably should generalize this to do cancels, suspensions, unsuspensions, etc.
+#
+# ivan@voicenet.com 97-feb-27
+#
+# now redirects to enter comments
+# ivan@voicenet.com 97-may-8
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-21
+#
+# FS::Search -> FS::Record ivan@sisd.com 98-mar-17
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+
+use strict;
+use CGI::Base qw(:DEFAULT :CGI); # CGI module
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+use FS::cust_pkg;
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+&cgisuidsetup($cgi);
+ 
+#untaint pkgnum
+$QUERY_STRING =~ /^(\d+)$/ || die "Illegal pkgnum";
+my($pkgnum)=$1;
+
+my($cust_pkg) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+
+bless($cust_pkg,'FS::cust_pkg');
+my($error)=$cust_pkg->unsuspend;
+&idiot($error) if $error;
+
+$cgi->redirect("../view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
+
+sub idiot {
+  my($error)=@_;
+  SendHeaders();
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Error unsuspending package</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H1>Error unsuspending package</H1>
+    </CENTER>
+    <HR>
+    There has been an error unsuspending this package:  $error
+  </BODY>
+  </HEAD>
+</HTML>
+END
+  exit;
+}
+
diff --git a/htdocs/search/cust_bill.cgi b/htdocs/search/cust_bill.cgi
new file mode 100755
index 000000000..5be84b79e
--- /dev/null
+++ b/htdocs/search/cust_bill.cgi
@@ -0,0 +1,46 @@
+#!/usr/bin/perl -Tw
+#
+# cust_bill.cgi: Search for invoices (process form)
+#
+# Usage: post form to:
+#        http://server.name/path/cust_bill.cgi
+#
+# Note: Should be run setuid freeside as user nobody.
+#
+# ivan@voicenet.com 97-apr-4
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+
+use strict;
+use CGI::Request;
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+
+my($req)=new CGI::Request;
+cgisuidsetup($req->cgi);
+
+$req->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
+my($invnum)=$2;
+
+if ( qsearchs('cust_bill',{'invnum'=>$invnum}) ) {
+  $req->cgi->redirect("../view/cust_bill.cgi?$invnum");  #redirect
+} else { #error
+  CGI::Base::SendHeaders(); # one guess
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Invoice Search Error</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H3>Invoice Search Error</H3>
+    <HR>
+    Invoice not found.
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
+}
+
diff --git a/htdocs/view/cust_pkg.cgi b/htdocs/view/cust_pkg.cgi
new file mode 100755
index 000000000..04e38326a
--- /dev/null
+++ b/htdocs/view/cust_pkg.cgi
@@ -0,0 +1,181 @@
+#!/usr/bin/perl -Tw
+#
+# cust_pkg.cgi: View a package
+#
+# Usage: cust_pkg.cgi pkgnum
+#        http://server.name/path/cust_pkg.cgi?pkgnum
+#
+# Note: Should be run setuid freeside as user nobody.
+#
+# ivan@voicenet.com 96-dec-15
+#
+# services section needs to be cleaned up, needs to display extraneous
+# entries in cust_pkg!
+# ivan@voicenet.com 96-dec-31
+#
+# added navigation bar
+# ivan@voicenet.com 97-jan-30
+#
+# changed and fixed up suspension and cancel stuff, now you can't add
+# services to a cancelled package
+# ivan@voicenet.com 97-feb-27
+#
+# rewrote for new API, still needs to be cleaned up!
+# ivan@voicenet.com 97-jul-29
+#
+# no FS::Search ivan@sisd.com 98-mar-7
+
+use strict;
+use Date::Format;
+use CGI::Base qw(:DEFAULT :CGI); # CGI module
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+&cgisuidsetup($cgi);
+
+my(%uiview,%uiadd);
+my($part_svc);
+foreach $part_svc ( qsearch('part_svc',{}) ) {
+  $uiview{$part_svc->svcpart}="../view/". $part_svc->svcdb . ".cgi";
+  $uiadd{$part_svc->svcpart}="../edit/". $part_svc->svcdb . ".cgi";
+}
+
+SendHeaders(); # one guess.
+print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Package View</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H1>Package View</H1>
+    </CENTER>
+    <BASEFONT SIZE=3>
+END
+
+#untaint pkgnum
+$QUERY_STRING =~ /^(\d+)$/;
+my($pkgnum)=$1;
+
+#get package record
+my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+die "No package!" unless $cust_pkg;
+my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
+
+#nav bar
+my($custnum)=$cust_pkg->getfield('custnum');
+print qq!<CENTER><A HREF="../view/cust_main.cgi?$custnum">View this customer!,
+      qq! (#$custnum)</A> | <A HREF="../">Main menu</A></CENTER><BR>!;
+
+#print info
+my($susp,$cancel,$expire)=(
+  $cust_pkg->getfield('susp'),
+  $cust_pkg->getfield('cancel'),
+  $cust_pkg->getfield('expire'),
+);
+print "<FONT SIZE=+1><CENTER>Package #<B>$pkgnum</B></FONT>";
+print qq!<BR><A HREF="#package">Package Information</A>!;
+print qq! | <A HREF="#services">Service Information</A>! unless $cancel;
+print qq!</CENTER><HR>\n!;
+
+my($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment'));
+print qq!<A NAME="package"><CENTER><FONT SIZE=+1>Package Information!,
+      qq!</FONT></A>!;
+print qq!<BR><A HREF="../unimp.html">Edit this information</A></CENTER>!;
+print "<P>Package: <B>$pkg - $comment</B>";
+
+my($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
+print "<BR>Setup: <B>", $setup ? time2str("%D",$setup) : "(Not setup)" ,"</B>";
+print "<BR>Next bill: <B>", $bill ? time2str("%D",$bill) : "" ,"</B>";
+
+if ($susp) {
+  print "<BR>Suspended: <B>", time2str("%D",$susp), "</B>";
+  print qq! <A HREF="../misc/unsusp_pkg.cgi?$pkgnum">Unsuspend</A>! unless $cancel;
+} else {
+  print qq!<BR><A HREF="../misc/susp_pkg.cgi?$pkgnum">Suspend</A>! unless $cancel;
+}
+
+if ($expire) {
+  print "<BR>Expire: <B>", time2str("%D",$expire), "</B>";
+}
+  print <<END;
+<FORM ACTION="../misc/expire_pkg.cgi" METHOD="post">
+<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
+Expire (date): <INPUT TYPE="text" NAME="date" VALUE="" >
+<INPUT TYPE="submit" VALUE="Cancel later">
+END
+
+if ($cancel) {
+  print "<BR>Cancelled: <B>", time2str("%D",$cancel), "</B>";
+} else {
+  print qq!<BR><A HREF="../misc/cancel_pkg.cgi?$pkgnum">Cancel now</A>!;
+}
+
+#otaker
+my($otaker)=$cust_pkg->getfield('otaker');
+print "<P>Order taken by <B>$otaker</B>";
+
+unless ($cancel) {
+
+  #services
+  print <<END;
+<HR><A NAME="services"><CENTER><FONT SIZE=+1>Service Information</FONT></A>
+<BR>Click on service to view/edit/add service.</CENTER><BR>
+<CENTER><B>Do NOT pick the "Link to existing" option unless you are auditing!!!</B></CENTER>
+<CENTER><TABLE BORDER=4>
+<TR><TH>Service</TH>
+END
+
+  #list of services this pkgpart includes
+  my($pkg_svc,%pkg_svc);
+  foreach $pkg_svc ( qsearch('pkg_svc',{'pkgpart'=> $cust_pkg->pkgpart }) ) {
+    $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity if $pkg_svc->quantity;
+  }
+
+  #list of records from cust_svc
+  my($svcpart);
+  foreach $svcpart (sort {$a <=> $b} keys %pkg_svc) {
+
+    my($svc)=qsearchs('part_svc',{'svcpart'=>$svcpart})->getfield('svc');
+
+    my(@cust_svc)=qsearch('cust_svc',{'pkgnum'=>$pkgnum, 
+                                      'svcpart'=>$svcpart,
+                                     });
+
+    my($enum);
+    for $enum ( 1 .. $pkg_svc{$svcpart} ) {
+
+      my($cust_svc);
+      if ( $cust_svc=shift @cust_svc ) {
+        my($svcnum)=$cust_svc->svcnum;
+        print <<END;
+<TR><TD><A HREF="$uiview{$svcpart}?$svcnum">(View) $svc<A></TD></TR>
+END
+      } else {
+        print <<END;
+<TR>
+  <TD><A HREF="$uiadd{$svcpart}?pkgnum$pkgnum-svcpart$svcpart">
+      (Add) $svc</A>
+   or <A HREF="../misc/link.cgi?pkgnum$pkgnum-svcpart$svcpart">
+      (Link to existing) $svc</A>
+  </TD>
+</TR>
+END
+      }
+
+    }
+    warn "WARNING: Leftover services pkgnum $pkgnum!" if @cust_svc;; 
+  }
+
+  print "</TABLE></CENTER>";
+
+}
+
+#formatting
+print <<END;
+  </BODY>
+</HTML>
+END
+
diff --git a/htdocs/view/svc_domain.cgi b/htdocs/view/svc_domain.cgi
new file mode 100755
index 000000000..78ff6ac0b
--- /dev/null
+++ b/htdocs/view/svc_domain.cgi
@@ -0,0 +1,76 @@
+#!/usr/bin/perl -Tw
+#
+# View svc_domain records
+#
+# Usage: svc_domain svcnum
+#        http://server.name/path/svc_domain.cgi?svcnum
+#
+# Note: Should be run setuid freeside as user nobody.
+#
+# ivan@voicenet.com 97-jan-6
+#
+# rewrite ivan@sisd.com 98-mar-14
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+
+use strict;
+use CGI::Base qw(:DEFAULT :CGI);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+cgisuidsetup($cgi);
+
+#untaint svcnum
+$QUERY_STRING =~ /^(\d+)$/;
+my($svcnum)=$1;
+my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$svcnum});
+die "Unknown svcnum" unless $svc_domain;
+my($domain)=$svc_domain->domain;
+
+my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
+my($pkgnum)=$cust_svc->getfield('pkgnum');
+my($cust_pkg,$custnum);
+if ($pkgnum) {
+  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+  $custnum=$cust_pkg->getfield('custnum');
+}
+
+my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+die "Unkonwn svcpart" unless $part_svc;
+
+SendHeaders(); # one guess.
+print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Domain View</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER><H1>Domain View</H1>
+    <BASEFONT SIZE=3>
+<CENTER>
+<A HREF="../view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> | 
+<A HREF="../view/cust_main.cgi?$custnum">View this customer (#$custnum)</A> | 
+<A HREF="../">Main menu</A></CENTER><BR>
+    <FONT SIZE=+1>Service #$svcnum</FONT>
+    </CENTER>
+END
+
+print "<HR>";
+print "Service: <B>", $part_svc->svc, "</B>";
+print "<HR>";
+
+print qq!Domain name <B>$domain</B>.!;
+print qq!<P><A HREF="http://rs.internic.net/cgi-bin/whois?do+$domain">View whois information.</A>!;
+
+print "<HR>";
+
+	#formatting
+	print <<END;
+
+  </BODY>
+</HTML>
+END
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From c86ea4bb46792a5f175e9887c2e60d9bd3612056 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jun 1998 07:22:52 +0000
Subject: Initial revision

---
 bin/dbdef-create | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100755 bin/dbdef-create

diff --git a/bin/dbdef-create b/bin/dbdef-create
new file mode 100755
index 000000000..eb62c77e3
--- /dev/null
+++ b/bin/dbdef-create
@@ -0,0 +1,85 @@
+#!/usr/bin/perl -Tw
+#
+# create dbdef file for existing mySQL database (needs SHOW|DESCRIBE command
+# not in Pg) based on fs-setup
+#
+# ivan@sisd.com 98-jun-2
+
+use strict;
+use DBI;
+use FS::dbdef;
+use FS::UID qw(adminsuidsetup datasrc);
+
+#needs to match FS::Record
+my($dbdef_file) = "/var/spool/freeside/dbdef.". datasrc;
+
+my($dbh)=adminsuidsetup;
+
+my($tables_sth)=$dbh->prepare("SHOW TABLES");
+my($tables_rv)=$tables_sth->execute;
+
+my(@tables);
+foreach ( @{$tables_sth->fetchall_arrayref} ) {
+  my($table)=${$_}[0]; 
+  #print "TABLE\t$table\n";
+
+  my($index_sth)=$dbh->prepare("SHOW INDEX FROM $table");
+  my($primary_key)='';
+  my(%index,%unique);
+  for ( 1 .. $index_sth->execute ) {
+    my($row)=$index_sth->fetchrow_hashref;
+    if ( ${$row}{'Key_name'} eq "PRIMARY" ) {
+      $primary_key=${$row}{'Column_name'};
+      next;
+    }
+    if ( ${$row}{'Non_unique'} ) { #index
+      push @{$index{${$row}{'Key_name'}}}, ${$row}{'Column_name'};
+    } else { #unique
+      push @{$unique{${$row}{'Key_name'}}}, ${$row}{'Column_name'};
+    }
+  }
+
+  my(@index)=values %index;
+  my(@unique)=values %unique;
+  #print "\tPRIMARY KEY $primary_key\n";
+  foreach (@index) {
+    #print "\tINDEX\t", join(', ', @{$_}), "\n";
+  }
+  foreach (@unique) {
+    #print "\tUNIQUE\t", join(', ', @{$_}), "\n";
+  }
+
+  my($columns_sth)=$dbh->prepare("SHOW COLUMNS FROM $table");
+  my(@columns);
+  for ( 1 .. $columns_sth->execute ) {
+    my($row)=$columns_sth->fetchrow_hashref;
+    #print "\t", ${$row}{'Field'}, "\n";
+    ${$row}{'Type'} =~ /^(\w+)\(?([\d\,]+)?\)?( unsigned)?$/
+      or die "Illegal type ${$row}{'Type'}\n";
+    my($type,$length)=($1,$2);
+    my($null)=${$row}{'Null'};
+    $null =~ s/YES/NULL/;
+    push @columns, new FS::dbdef_column (
+      ${$row}{'Field'},
+      $type,
+      $null,
+      $length,
+    );
+  }
+
+  #print "\n";
+  push @tables, new FS::dbdef_table (
+    $table,
+    $primary_key,
+    new FS::dbdef_unique (\@unique),
+    new FS::dbdef_index (\@index),
+    @columns,
+  );
+
+}
+
+my($dbdef) = new FS::dbdef ( @tables );
+
+#important
+$dbdef->save($dbdef_file);
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From c0215076a2f35c05af6194e9b8ad5600ccc83002 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Jun 1998 02:03:08 +0000
Subject: Initial revision

---
 htdocs/misc/print-invoice.cgi | 57 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100755 htdocs/misc/print-invoice.cgi

diff --git a/htdocs/misc/print-invoice.cgi b/htdocs/misc/print-invoice.cgi
new file mode 100755
index 000000000..084dcc1c4
--- /dev/null
+++ b/htdocs/misc/print-invoice.cgi
@@ -0,0 +1,57 @@
+#!/usr/bin/perl -Tw
+#
+# just a kludge for now, since this duplicates in a way it shouldn't stuff from
+# Bill.pm (like $lpr) ivan@sisd.com 98-jun-16
+
+use strict;
+use CGI::Base qw(:DEFAULT :CGI);
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+use FS::Invoice;
+
+my($lpr) = "|lpr -h";
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+&cgisuidsetup($cgi);
+
+#untaint invnum
+$QUERY_STRING =~ /^(\d*)$/;
+my($invnum)=$1;
+my($cust_bill)=qsearchs('cust_bill',{'invnum'=>$invnum});
+die "Can't find invoice!\n" unless $cust_bill;
+
+        bless($cust_bill,"FS::Invoice");
+        open(LPR,$lpr) or die "Can't open $lpr: $!";
+        print LPR $cust_bill->print_text; #( date )
+        close LPR
+          or die $! ? "Error closing $lpr: $!"
+                       : "Exit status $? from $lpr";
+
+my($custnum)=$cust_bill->getfield('custnum');
+
+$cgi->redirect("../view/cust_main.cgi?$custnum#history");
+
+sub idiot {
+  my($error)=@_;
+  CGI::Base::SendHeaders(); # one guess
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Error printing invoice</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H4>Error printing invoice</H4>
+    </CENTER>
+    Your update did not occur because of the following error:
+    <P><B>$error</B>
+  </BODY>
+</HTML>
+END
+
+  exit;
+
+}
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From addf9a15d0a2ade26f22b0157c390fe3f779d6dd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Jun 1998 06:59:16 +0000
Subject: Initial revision

---
 htdocs/misc/process/link.cgi | 73 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100755 htdocs/misc/process/link.cgi

diff --git a/htdocs/misc/process/link.cgi b/htdocs/misc/process/link.cgi
new file mode 100755
index 000000000..23fb05386
--- /dev/null
+++ b/htdocs/misc/process/link.cgi
@@ -0,0 +1,73 @@
+#!/usr/bin/perl -Tw
+#
+# process/link.cgi: link to existing customer (process form)
+#
+# ivan@voicenet.com 97-feb-5
+#
+# rewrite ivan@sisd.com 98-mar-18
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
+
+use strict;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::CGI qw(idiot);
+use FS::UID qw(cgisuidsetup);
+use FS::cust_svc;
+use FS::Record qw(qsearchs);
+
+my($req)=new CGI::Request; # create form object
+cgisuidsetup($req->cgi);
+
+#$req->import_names('R'); #import CGI variables into package 'R';
+
+$req->param('pkgnum') =~ /^(\d+)$/; my($pkgnum)=$1;
+$req->param('svcpart') =~ /^(\d+)$/; my($svcpart)=$1;
+
+$req->param('svcnum') =~ /^(\d*)$/; my($svcnum)=$1;
+unless ( $svcnum ) {
+  my($part_svc) = qsearchs('part_svc',{'svcpart'=>$svcpart});
+  my($svcdb) = $part_svc->getfield('svcdb');
+  $req->param('link_field') =~ /^(\w+)$/; my($link_field)=$1;
+  my($svc_acct)=qsearchs($svcdb,{$link_field => $req->param('link_value') });
+  idiot("$link_field not found!") unless $svc_acct;
+  $svcnum=$svc_acct->svcnum;
+}
+
+my($old)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
+die "svcnum not found!" unless $old;
+my($new)=create FS::cust_svc ({
+  'svcnum' => $svcnum,
+  'pkgnum' => $pkgnum,
+  'svcpart' => $svcpart,
+});
+
+my($error);
+$error = $new->replace($old);
+
+unless ($error) {
+  #no errors, so let's view this customer.
+  $req->cgi->redirect("../../view/cust_pkg.cgi?$pkgnum");
+} else {
+  CGI::Base::SendHeaders(); # one guess
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Error</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H4>Error</H4>
+    </CENTER>
+    Your update did not occur because of the following error:
+    <P><B>$error</B>
+    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and submit the form again.
+  </BODY>
+</HTML>
+END
+ 
+}
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 5987e58401569636f78af5125d0d2acab1ed6d2a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Jun 1998 07:27:58 +0000
Subject: Initial revision

---
 htdocs/misc/link.cgi | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100755 htdocs/misc/link.cgi

diff --git a/htdocs/misc/link.cgi b/htdocs/misc/link.cgi
new file mode 100755
index 000000000..d1db000ec
--- /dev/null
+++ b/htdocs/misc/link.cgi
@@ -0,0 +1,72 @@
+#!/usr/bin/perl -Tw
+#
+# link: instead of adding a new account, link to an existing. (output form)
+#
+# Note: Should be run setuid freeside as user nobody
+#
+# ivan@voicenet.com 97-feb-5
+#
+# rewrite ivan@sisd.com 98-mar-17
+#
+# can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
+
+use strict;
+use CGI::Base qw(:DEFAULT :CGI);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+
+my(%link_field)=(
+  'svc_acct'    => 'username',
+  'svc_domain'  => 'domain',
+  'svc_acct_sm' => '',
+  'svc_charge'  => '',
+  'svc_wo'      => '',
+);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+cgisuidsetup($cgi);
+
+my($pkgnum,$svcpart);
+foreach $_ (split(/-/,$QUERY_STRING)) { #get & untaint pkgnum & svcpart
+  $pkgnum=$1 if /^pkgnum(\d+)$/;
+  $svcpart=$1 if /^svcpart(\d+)$/;
+}
+
+my($part_svc) = qsearchs('part_svc',{'svcpart'=>$svcpart});
+my($svc) = $part_svc->getfield('svc');
+my($svcdb) = $part_svc->getfield('svcdb');
+my($link_field) = $link_field{$svcdb};
+
+CGI::Base::SendHeaders();
+print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Link to existing $svc account</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H1>Link to existing $svc account</H1>
+    </CENTER><HR>
+    <FORM ACTION="process/link.cgi" METHOD=POST>
+END
+
+if ( $link_field ) { 
+  print <<END;
+  <INPUT TYPE="hidden" NAME="svcnum" VALUE="">
+  <INPUT TYPE="hidden" NAME="link_field" VALUE="$link_field">
+  $link_field of existing service: <INPUT TYPE="text" NAME="link_value">
+END
+} else {
+  print qq!Service # of existing service: <INPUT TYPE="text" NAME="svcnum" VALUE="">!;
+}
+
+print <<END;
+<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
+<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
+<P><CENTER><INPUT TYPE="submit" VALUE="Link"></CENTER>
+    </FORM>
+  </BODY>
+</HTML>
+END
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From baba75d8568c152ee52ef5bab3c514c78468cf00 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 2 Jul 1998 09:31:09 +0000
Subject: Initial revision

---
 htdocs/edit/cust_pkg.cgi | 137 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100755 htdocs/edit/cust_pkg.cgi

diff --git a/htdocs/edit/cust_pkg.cgi b/htdocs/edit/cust_pkg.cgi
new file mode 100755
index 000000000..d7f143db4
--- /dev/null
+++ b/htdocs/edit/cust_pkg.cgi
@@ -0,0 +1,137 @@
+#!/usr/bin/perl -Tw
+#
+# cust_pkg.cgi: Add/edit packages (output form)
+#
+# this is for changing packages around, not editing things within the package
+#
+# Usage: cust_pkg.cgi custnum
+#        http://server.name/path/cust_pkg.cgi?custnum
+#
+# Note: Should be run setuid freeside as user nobody
+#
+# started with /sales/add/cust_pkg.cgi, which added packages
+# ivan@voicenet.com 97-jan-5, 97-mar-21
+#
+# Rewrote for new API
+# ivan@voicenet.com 97-jul-7
+#
+# FS::Search is no more, &cgisuidsetup needs $cgi, ivan@sisd.com 98-mar-7 
+#
+# Changes to allow page to work at a relative position in server
+# Changed to display packages 2-wide in a table
+#       bmccane@maxbaud.net     98-apr-3
+#
+# fixed a pretty cool bug from above which caused a visual glitch ivan@sisd.com
+# 98-jun-1
+
+use strict;
+use CGI::Base qw(:DEFAULT :CGI); # CGI module
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::Record qw(qsearch qsearchs);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+&cgisuidsetup($cgi);
+
+my(%pkg,%comment);
+foreach (qsearch('part_pkg', {})) {
+  $pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
+  $comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
+}
+
+#untaint custnum
+$QUERY_STRING =~ /^(\d+)$/;
+my($custnum)=$1;
+
+my($otaker)=&getotaker;
+
+SendHeaders();
+print <<END;
+<HTML>   
+  <HEAD>
+    <TITLE>Add/Edit Packages</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H1>Add/Edit Packages</H1>
+    </CENTER>
+    <FORM ACTION="process/cust_pkg.cgi" METHOD=POST>
+    <HR>
+END
+
+#custnum
+print qq!<INPUT TYPE="hidden" NAME="new_custnum" VALUE="$custnum">!;
+
+#current packages (except cancelled packages)
+my(@cust_pkg) = grep ! $_->getfield('cancel'),
+  qsearch('cust_pkg',{'custnum'=>$custnum});
+
+if (@cust_pkg) {
+  print <<END;
+<CENTER><FONT SIZE="+2">Current packages</FONT></CENTER>
+These are packages the customer currently has.  Select those packages you
+wish to remove (if any).<BR><BR>
+END
+
+  my ($count) = 0 ;
+  print qq!<CENTER><TABLE>! ;
+  foreach (@cust_pkg) {
+    print qq!<TR>! if ($count ==0) ;
+    my($pkgnum,$pkgpart)=( $_->getfield('pkgnum'), $_->getfield('pkgpart') );
+    print qq!<TD><INPUT TYPE="checkbox" NAME="remove_pkg" VALUE="$pkgnum">!,
+          #qq!$pkgnum: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n!,
+          #now you've got to admit this bug was pretty cool
+          qq!$pkgnum: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n!;
+    $count ++ ;
+    if ($count == 2)
+    {
+      $count = 0 ;
+      print qq!</TR>\n! ;
+    }
+  }
+  print qq!</TABLE></CENTER>! ;
+
+  print "<HR>";
+}
+
+print <<END;
+<CENTER><FONT SIZE="+2">New packages</FONT></CENTER>
+These are packages the customer can purchase.  Specify the quantity to add
+of each package.<BR><BR>
+END
+
+my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
+my($agent)=qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
+
+my($type_pkgs);
+my ($count) = 0 ;
+print qq!<CENTER><TABLE>! ;
+foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
+  my($pkgpart)=$type_pkgs->pkgpart;
+  print qq!<TR>! if ($count == 0) ;
+  print <<END;
+  <TD>
+  <INPUT TYPE="text" NAME="pkg$pkgpart" VALUE="0" SIZE="2" MAXLENGTH="2">
+  $pkgpart: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n
+END
+  $count ++ ;
+  if ($count == 2)
+  {
+    print qq!</TR>\n! ;
+    $count = 0 ;
+  }
+}
+print qq!</TABLE></CENTER>! ;
+
+#otaker
+print qq!<INPUT TYPE="hidden" NAME="new_otaker" VALUE="$otaker">\n!;
+
+#submit
+print qq!<P><CENTER><INPUT TYPE="submit" VALUE="Order"></CENTER>\n!;
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 2f057aa80e429a549fb9fd9449eae8475c994796 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Jul 1998 03:49:08 +0000
Subject: Initial revision

---
 htdocs/view/cust_bill.cgi | 79 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100755 htdocs/view/cust_bill.cgi

diff --git a/htdocs/view/cust_bill.cgi b/htdocs/view/cust_bill.cgi
new file mode 100755
index 000000000..96101d004
--- /dev/null
+++ b/htdocs/view/cust_bill.cgi
@@ -0,0 +1,79 @@
+#!/usr/bin/perl -Tw
+#
+# Usage: cust_bill.cgi invnum
+#        http://server.name/path/cust_bill.cgi?invnum
+#
+# Note: Should be run setuid freeside as user nobody.
+#
+# this is a quick & ugly hack which does little more than add some formatting to the ascii output from /dbin/print-invoice
+#
+# ivan@voicenet.com 96-dec-05
+#
+# added navigation bar
+# ivan@voicenet.com 97-jan-30
+#
+# now uses Invoice.pm
+# ivan@voicenet.com 97-jun-30
+#
+# what to do if cust_bill search errors?
+# ivan@voicenet.com 97-jul-7
+#
+# s/FS::Search/FS::Record/; $cgisuidsetup($cgi); ivan@sisd.com 98-mar-14
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# also print 'printed' field ivan@sisd.com 98-jul-10
+
+use strict;
+use IO::File;
+use CGI::Base qw(:DEFAULT :CGI); # CGI module
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+use FS::Invoice;
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+&cgisuidsetup($cgi);
+
+#untaint invnum
+$QUERY_STRING =~ /^(\d+)$/;
+my($invnum)=$1;
+
+my($cust_bill) = qsearchs('cust_bill',{'invnum'=>$invnum});
+die "Invoice #$invnum not found!" unless $cust_bill;
+my($custnum) = $cust_bill->getfield('custnum');
+
+my($printed) = $cust_bill->printed;
+
+SendHeaders(); # one guess.
+print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Invoice View</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H1>Invoice View</H1>
+    <A HREF="../view/cust_main.cgi?$custnum">View this customer (#$custnum)</A> | <A HREF="../">Main menu</A>
+    </CENTER><HR>
+    <BASEFONT SIZE=3>
+    <CENTER>
+      <A HREF="../edit/cust_pay.cgi?$invnum">Enter payments (check/cash) against this invoice</A>
+      <BR><A HREF="../misc/print-invoice.cgi?$invnum">Reprint this invoice</A>
+      <BR><BR>(Printed $printed times)
+    </CENTER>
+    <FONT SIZE=-1><PRE>
+END
+
+bless($cust_bill,"FS::Invoice");
+print $cust_bill->print_text;
+
+	#formatting
+	print <<END;
+    </PRE></FONT>
+  </BODY>
+</HTML>
+END
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 0cb9437cdf8f2de4f6e459ccfd83dc37e56e1f91 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 12 Jul 1998 19:51:42 +0000
Subject: Initial revision

---
 htdocs/edit/part_svc.cgi | 148 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 148 insertions(+)
 create mode 100755 htdocs/edit/part_svc.cgi

diff --git a/htdocs/edit/part_svc.cgi b/htdocs/edit/part_svc.cgi
new file mode 100755
index 000000000..491c013fe
--- /dev/null
+++ b/htdocs/edit/part_svc.cgi
@@ -0,0 +1,148 @@
+#!/usr/bin/perl -Tw
+#
+# part_svc.cgi: Add/Edit service (output form)
+#
+# ivan@sisd.com 97-nov-14
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
+
+use strict;
+use CGI::Base;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+use FS::part_svc qw(fields);
+use FS::CGI qw(header menubar);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+
+&cgisuidsetup($cgi);
+
+SendHeaders(); # one guess.
+
+my($part_svc,$action);
+if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$1});
+  $action='Edit';
+} else { #adding
+  $part_svc=create FS::part_svc {};
+  $action='Add';
+}
+my($hashref)=$part_svc->hashref;
+
+print header("$action Service Definition", menubar(
+  'Main Menu' => '../',
+  'View all services' => '../browse/part_svc.cgi',
+)), '<FORM ACTION="process/part_svc.cgi" METHOD=POST>';
+
+
+
+print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$hashref->{svcpart}">!,
+      "Service Part #", $hashref->{svcpart} ? $hashref->{svcpart} : "(NEW)";
+
+print <<END;
+<PRE>
+Service  <INPUT TYPE="text" NAME="svc" VALUE="$hashref->{svc}">
+Table    <SELECT NAME="svcdb" SIZE=1>
+END
+
+print map '<OPTION'. ' SELECTED'x($_ eq $hashref->{svcdb}). ">$_\n", qw(
+  svc_acct svc_domain svc_acct_sm svc_charge svc_wo
+);
+
+print <<END;
+</SELECT></PRE>
+Services are items you offer to your customers.
+<UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
+    <LI>svc_domain - Virtual domains
+    <LI>svc_acct_sm - Virtual domain mail aliasing
+    <LI>svc_charge - One-time charges (Partially unimplemented)
+    <LI>svc_wo - Work orders (Partially unimplemented)
+</UL>
+For the columns in the table selected above, you can set default or fixed 
+values.  For example, a SLIP/PPP account may have a default (or perhaps fixed)
+<B>slipip</B> of <B>0.0.0.0</B>, while a POP mailbox will probably have a fixed
+blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
+<B>/usr/bin/passwd</B>.
+<BR><BR>
+<TABLE BORDER CELLPADDING=4><TR><TH>Table</TH><TH>Field</TH>
+<TH COLSPAN=2>Modifier</TH></TR>
+END
+
+#these might belong somewhere else for other user interfaces 
+#pry need to eventually create stuff that's shared amount UIs
+my(%defs)=(
+  'svc_acct' => {
+    'dir'       => 'Home directory',
+    'uid'       => 'UID (set to fixed and blank for dial-only)',
+    'slipip'    => 'IP address',
+    'popnum'    => '<A HREF="../browse/svc_acct_pop.cgi/">POP number</A>',
+    'username'  => 'Username',
+    'quota'     => '(unimplemented)',
+    '_password' => 'Password',
+    'gid'       => 'GID (when blank, defaults to UID)',
+    'shell'     => 'Shell',
+    'finger'    => 'GECOS',
+  },
+  'svc_domain' => {
+    'domain'    => 'Domain',
+  },
+  'svc_acct_sm' => {
+    'domuser'   => 'domuser@virtualdomain.com',
+    'domuid'    => 'UID where domuser@virtualdomain.com mail is forwarded',
+    'domsvc'    => 'svcnum from svc_domain for virtualdomain.com',
+  },
+  'svc_charge' => {
+    'amount'    => 'amount',
+  },
+  'svc_wo' => {
+    'worker'    => 'Worker',
+    '_date'      => 'Date',
+  },
+);
+
+my($svcdb);
+foreach $svcdb ( qw(
+  svc_acct svc_domain svc_acct_sm svc_charge svc_wo
+) ) {
+
+  my(@rows)=map { /^${svcdb}__(.*)$/; $1 }
+    grep ! /_flag$/,
+      grep /^${svcdb}__/,
+        fields('part_svc');
+  my($rowspan)=scalar(@rows);
+
+  my($ptmp)="<TD ROWSPAN=$rowspan>$svcdb</TD>";
+  my($row);
+  foreach $row (@rows) {
+    my($value)=$part_svc->getfield($svcdb.'__'.$row);
+    my($flag)=$part_svc->getfield($svcdb.'__'.$row.'_flag');
+    print "<TR>$ptmp<TD>$row - <FONT SIZE=-1>$defs{$svcdb}{$row}</FONT></TD>";
+    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE=""!.
+      ' CHECKED'x($flag eq ''). "><BR>Off</TD>";
+    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE="D"!.
+      ' CHECKED'x($flag eq 'D'). ">Default ";
+    print qq!<INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE="F"!.
+      ' CHECKED'x($flag eq 'F'). ">Fixed ";
+    print qq!<BR><INPUT TYPE="text" NAME="${svcdb}__${row}" VALUE="$value">!,
+      "</TD></TR>";
+    $ptmp='';
+  }
+}
+print "</TABLE>";
+
+print qq!\n<CENTER><BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{svcpart} ? "Apply changes" : "Add service",
+      qq!"></CENTER>!;
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From a0b0799f373f1af90d0472ff6a2055cb0aa1bc79 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 12 Jul 1998 20:18:52 +0000
Subject: Initial revision

---
 htdocs/edit/part_pkg.cgi | 102 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100755 htdocs/edit/part_pkg.cgi

diff --git a/htdocs/edit/part_pkg.cgi b/htdocs/edit/part_pkg.cgi
new file mode 100755
index 000000000..9fe739bb7
--- /dev/null
+++ b/htdocs/edit/part_pkg.cgi
@@ -0,0 +1,102 @@
+#!/usr/bin/perl -Tw
+#
+# part_pkg.cgi: Add/Edit package (output form)
+#
+# ivan@sisd.com 97-dec-10
+#
+# Changes to allow page to work at a relative position in server
+# Changed to display services 2-wide in table
+#       bmccane@maxbaud.net     98-apr-3
+#
+# use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
+
+use strict;
+use CGI::Base;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::part_pkg;
+use FS::pkg_svc;
+use FS::CGI qw(header menubar);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+
+&cgisuidsetup($cgi);
+
+SendHeaders(); # one guess.
+
+my($part_pkg,$action);
+if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
+  $part_pkg=qsearchs('part_pkg',{'pkgpart'=>$1});
+  $action='Edit';
+} else { #adding
+  $part_pkg=create FS::part_pkg {};
+  $action='Add';
+}
+my($hashref)=$part_pkg->hashref;
+
+print header("$action Package Definition", menubar(
+  'Main Menu' => '../',
+  'View all packages' => '../browse/part_pkg.cgi',
+)), '<FORM ACTION="process/part_pkg.cgi" METHOD=POST>';
+
+print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
+      "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
+
+print <<END;
+<PRE>
+Package (customer-visable)          <INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}">
+Comment (customer-hidden)           <INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}">
+Setup fee for this package          <INPUT TYPE="text" NAME="setup" VALUE="$hashref->{setup}">
+Recurring fee for this package      <INPUT TYPE="text" NAME="recur" VALUE="$hashref->{recur}">
+Frequency (months) of recurring fee <INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}">
+
+</PRE>
+
+Enter the quantity of each service this package includes.<BR><BR>
+<TABLE BORDER><TR><TH><FONT SIZE=-1>Quan.</FONT></TH><TH>Service</TH>
+		  <TH><FONT SIZE=-1>Quan.</FONT></TH><TH>Service</TH></TR>
+END
+
+my($part_svc);
+my($count) = 0 ;
+foreach $part_svc ( qsearch('part_svc',{}) ) {
+
+  my($svcpart)=$part_svc->getfield('svcpart');
+  my($pkg_svc)=qsearchs('pkg_svc',{
+    'pkgpart'  => $part_pkg->getfield('pkgpart'),
+    'svcpart'  => $svcpart,
+  })  || create FS::pkg_svc({
+    'pkgpart'  => $part_pkg->getfield('pkgpart'),
+    'svcpart'  => $svcpart,
+    'quantity' => 0,
+  });
+  next unless $pkg_svc;
+
+  print qq!<TR>! if $count == 0 ;
+  print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=3 VALUE="!,
+        $pkg_svc->getfield('quantity') || 0,qq!"></TD>!,
+        qq!<TD><A HREF="part_svc.cgi?!,$part_svc->getfield('svcpart'),
+        qq!">!, $part_svc->getfield('svc'), "</A></TD>";
+  $count ++ ;
+  if ($count == 2)
+  {
+    print qq!</TR>! ;
+    $count = 0 ;
+  }
+}
+print qq!</TR>! if ($count != 0) ;
+
+print "</TABLE>";
+
+print qq!<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{pkgpart} ? "Apply changes" : "Add package",
+      qq!">!;
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From f647714b103eb35a53419d170aac40660c851e0c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 12 Jul 1998 20:29:24 +0000
Subject: Initial revision

---
 htdocs/edit/agent.cgi      | 77 ++++++++++++++++++++++++++++++++++++++++++++++
 htdocs/edit/agent_type.cgi | 75 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 152 insertions(+)
 create mode 100755 htdocs/edit/agent.cgi
 create mode 100755 htdocs/edit/agent_type.cgi

diff --git a/htdocs/edit/agent.cgi b/htdocs/edit/agent.cgi
new file mode 100755
index 000000000..5bd116528
--- /dev/null
+++ b/htdocs/edit/agent.cgi
@@ -0,0 +1,77 @@
+#!/usr/bin/perl -Tw
+#
+# agent.cgi: Add/Edit agent (output form)
+#
+# ivan@sisd.com 97-dec-12
+#
+# Changes to allow page to work at a relative position in server
+# Changed 'type' to 'atype' because Pg6.3 reserves the type word
+#	bmccane@maxbaud.net	98-apr-3
+#
+# use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
+
+use strict;
+use CGI::Base;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::agent;
+use FS::CGI qw(header menubar);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+
+&cgisuidsetup($cgi);
+
+SendHeaders(); # one guess.
+
+my($agent,$action);
+if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
+  $agent=qsearchs('agent',{'agentnum'=>$1});
+  $action='Edit';
+} else { #adding
+  $agent=create FS::agent {};
+  $action='Add';
+}
+my($hashref)=$agent->hashref;
+
+print header("$action Agent", menubar(
+  'Main Menu' => '../',
+  'View all agents' => '../browse/agent.cgi',
+)), '<FORM ACTION="process/agent.cgi" METHOD=POST>';
+
+print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$hashref->{agentnum}">!,
+      "Agent #", $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)";
+
+print <<END;
+<PRE>
+Agent                     <INPUT TYPE="text" NAME="agent" SIZE=32 VALUE="$hashref->{agent}">
+Agent type                <SELECT NAME="typenum" SIZE=1>
+END
+
+my($agent_type);
+foreach $agent_type (qsearch('agent_type',{})) {
+  print "<OPTION";
+  print " SELECTED"
+    if $hashref->{typenum} == $agent_type->getfield('typenum');
+  print ">", $agent_type->getfield('typenum'), ": ",
+        $agent_type->getfield('atype'),"\n";
+}
+
+print <<END;
+</SELECT>
+Frequency (unimplemented) <INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}">
+Program (unimplemented)   <INPUT TYPE="text" NAME="prog" VALUE="$hashref->{prog}">
+</PRE>
+END
+
+print qq!<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{agentnum} ? "Apply changes" : "Add agent",
+      qq!">!;
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
+
diff --git a/htdocs/edit/agent_type.cgi b/htdocs/edit/agent_type.cgi
new file mode 100755
index 000000000..b9fff4530
--- /dev/null
+++ b/htdocs/edit/agent_type.cgi
@@ -0,0 +1,75 @@
+#!/usr/bin/perl -Tw
+#
+# agent_type.cgi: Add/Edit agent type (output form)
+#
+# ivan@sisd.com 97-dec-10
+#
+# Changes to allow page to work at a relative position in server
+# Changed 'type' to 'atype' because Pg6.3 reserves the type word
+#	bmccane@maxbaud.net	98-apr-3
+#
+# use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
+
+use strict;
+use CGI::Base;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::agent_type;
+use FS::CGI qw(header menubar);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+
+&cgisuidsetup($cgi);
+
+SendHeaders(); # one guess.
+
+my($agent_type,$action);
+if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
+  $agent_type=qsearchs('agent_type',{'typenum'=>$1});
+  $action='Edit';
+} else { #adding
+  $agent_type=create FS::agent_type {};
+  $action='Add';
+}
+my($hashref)=$agent_type->hashref;
+
+print header("$action Agent Type", menubar(
+  'Main Menu' => '../',
+  'View all agent types' => '../browse/agent_type.cgi',
+)), '<FORM ACTION="process/agent_type.cgi" METHOD=POST>';
+
+print qq!<INPUT TYPE="hidden" NAME="typenum" VALUE="$hashref->{typenum}">!,
+      "Agent Type #", $hashref->{typenum} ? $hashref->{typenum} : "(NEW)";
+
+print <<END;
+<BR>Type <INPUT TYPE="text" NAME="atype" SIZE=32 VALUE="$hashref->{atype}">
+<P>Select which packages agents of this type may sell to customers</P>
+END
+
+my($part_pkg);
+foreach $part_pkg ( qsearch('part_pkg',{}) ) {
+  print qq!<BR><INPUT TYPE="checkbox" NAME="pkgpart!,
+        $part_pkg->getfield('pkgpart'), qq!" !,
+       # ( 'CHECKED 'x scalar(
+        qsearchs('type_pkgs',{
+          'typenum' => $agent_type->getfield('typenum'),
+          'pkgpart'  => $part_pkg->getfield('pkgpart'),
+        })
+          ? 'CHECKED '
+          : '',
+        qq!"VALUE="ON"> !,$part_pkg->getfield('pkg')
+  ;
+}
+
+print qq!<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{typenum} ? "Apply changes" : "Add agent type",
+      qq!">!;
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 8ae047bd7c16f16ace5acfa1098392b56835d24c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 13 Jul 1998 17:52:51 +0000
Subject: Initial revision

---
 htdocs/edit/cust_main.cgi | 214 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 214 insertions(+)
 create mode 100755 htdocs/edit/cust_main.cgi

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
new file mode 100755
index 000000000..14556010c
--- /dev/null
+++ b/htdocs/edit/cust_main.cgi
@@ -0,0 +1,214 @@
+#!/usr/bin/perl -Tw
+#
+# cust_main.cgi: Edit a customer (output form)
+#
+# Usage: cust_main.cgi custnum
+#        http://server.name/path/cust_main.cgi?custnum
+#
+# Note: Should be run setuid freeside as user nobody.
+#
+# ivan@voicenet.com 96-nov-29 -> 96-dec-04
+#
+# Blank custnum for new customer.
+# ivan@voicenet.com 96-dec-16
+#
+# referral defaults to blank, to force people to pick something
+# ivan@voicenet.com 97-jun-4
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-28
+#
+# new customer is null, not '#'
+# otaker gotten from &getotaker instead of $ENV{REMOTE_USER}
+# ivan@sisd.com 97-nov-12
+#
+# cgisuidsetup($cgi);
+# no need for old_ fields.
+# now state+county is a select field (took out PA hack)
+# used autoloaded $cust_main->field methods
+# ivan@sisd.com 97-dec-17
+#
+# fixed quoting problems ivan@sisd.com 98-feb-23
+#
+# paydate sql update ivan@sisd.com 98-mar-5
+#
+# Changes to allow page to work at a relative position in server
+# Changed 'day' to 'daytime' because Pg6.3 reserves the day word
+# Added test for paydate in mm-dd-yyyy format for Pg6.3 default format
+#	bmccane@maxbaud.net	98-apr-3
+#
+# fixed one missed day->daytime ivan@sisd.com 98-jul-13
+
+use strict;
+use CGI::Base;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::Record qw(qsearch qsearchs);
+use FS::cust_main;
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+
+cgisuidsetup($cgi);
+
+SendHeaders(); # one guess.
+
+#get record
+my($custnum,$action,$cust_main);
+if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
+  $custnum=$1;
+  $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
+  $action='Edit';
+} else {
+  $custnum='';
+  $cust_main = create FS::cust_main ( {} );
+  $cust_main->setfield('otaker',&getotaker);
+  $cust_main->setfield('country','US');
+  $action='Add';
+}
+
+print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Customer $action</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H1>Customer $action</H1>
+    </CENTER>
+    <FORM ACTION="process/cust_main.cgi" METHOD=POST>
+    <PRE>
+END
+
+print qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!,
+      qq!Customer #<FONT SIZE="+1"><B>!;
+print $custnum ? $custnum : " (NEW)" , "</B></FONT>";
+
+#agentnum
+my($agentnum)=$cust_main->agentnum || 1; #set to first agent by default
+my(@agents) = qsearch('agent',{});
+print qq!\n\nAgent # <SELECT NAME="agentnum" SIZE="1">!;
+my($agent);
+foreach $agent (sort {
+  $a->agent cmp $b->agent;
+} @agents) {
+    print "<OPTION" . " SELECTED"x($agent->agentnum==$agentnum),
+    ">", $agent->agentnum,": ", $agent->agent, "\n";
+}
+print "</SELECT>";
+
+#referral
+#unless ($custnum) {
+  my($refnum)=$cust_main->refnum || 0; #to avoid "arguement not numeric" error
+  my(@referrals) = qsearch('part_referral',{});
+  print qq!\nReferral <SELECT NAME="refnum" SIZE="1">!;
+  print "<OPTION> \n";
+  my($referral);
+  foreach $referral (sort {
+    $a->refnum <=> $b->refnum;
+  } @referrals) {
+    print "<OPTION" . " SELECTED"x($referral->refnum==$refnum),
+    ">", $referral->refnum, ": ", $referral->referral,"\n";
+  }
+  print "</SELECT>";
+#}
+
+my($last,$first,$ss,$company,$address1,$address2,$city)=(
+  $cust_main->last,
+  $cust_main->first,
+  $cust_main->ss,
+  $cust_main->company,
+  $cust_main->address1,
+  $cust_main->address2,
+  $cust_main->city,
+);
+
+print <<END;
+
+
+Name (last)<INPUT TYPE="text" NAME="last" VALUE="$last"> (first)<INPUT TYPE="text" NAME="first" VALUE="$first">  SS# <INPUT TYPE="text" NAME="ss" VALUE="$ss" SIZE=11 MAXLENGTH=11>
+Company <INPUT TYPE="text" NAME="company" VALUE="$company">
+Address <INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=40 MAXLENGTH=40>
+        <INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=40 MAXLENGTH=40>
+City <INPUT TYPE="text" NAME="city" VALUE="$city">  State (county) <SELECT NAME="state" SIZE="1">
+END
+
+foreach ( qsearch('cust_main_county',{}) ) {
+  print "<OPTION";
+  print " SELECTED" if ( $cust_main->state eq $_->state
+                      && $cust_main->county eq $_->county );
+  print ">",$_->state;
+  print " (",$_->county,")" if $_->county;
+}
+print "</SELECT>";
+
+my($zip,$country,$daytime,$night,$fax)=(
+  $cust_main->zip,
+  $cust_main->country,
+  $cust_main->daytime,
+  $cust_main->night,
+  $cust_main->fax,
+);
+
+print <<END;
+  Zip <INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10 MAXLENGTH=10>
+Country: <FONT SIZE="+1"><B>$country</B></FONT><INPUT TYPE="hidden" NAME="country" VALUE="$country">
+
+Phone (daytime)<INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18 MAXLENGTH=20>  (night)<INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18 MAXLENGTH=20>  (fax)<INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12 MAXLENGTH=12>
+
+END
+
+my(%payby)=(
+  'CARD' => "Credit card    ",
+  'BILL' => "Billing    ",
+  'COMP' => "Complimentary",
+);
+for (qw(CARD BILL COMP)) {
+  print qq!<INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
+  print qq! CHECKED! if ($cust_main->payby eq "$_");
+  print qq!>$payby{$_}!;
+}
+
+
+my($payinfo,$payname,$otaker)=(
+  $cust_main->payinfo,
+  $cust_main->payname,
+  $cust_main->otaker,
+);
+
+my($paydate);
+if ( $cust_main->paydate =~ /^(\d{4})-(\d{2})-\d{2}$/ ) {
+  $paydate="$2/$1"
+} elsif ( $cust_main->paydate =~ /^(\d{2})-\d{2}-(\d{4}$)/ ) {
+  $paydate="$1/$2"
+}
+else {
+  $paydate='';
+}
+
+print <<END;
+
+  Card number ,   P.O. #   or   Authorization    <INPUT TYPE="text" NAME="payinfo" VALUE="$payinfo" SIZE=19 MAXLENGTH=19>
+END
+
+print qq!Exp. date (MM/YY or MM/YYYY)<INPUT TYPE="text" NAME="paydate" VALUE="$paydate" SIZE=8 MAXLENGTH=7>    Billing name <INPUT TYPE="text" NAME="payname" VALUE="$payname">\n<INPUT TYPE="checkbox" NAME="tax" VALUE="Y"!;
+print qq! CHECKED! if $cust_main->tax eq "Y";
+print qq!> Tax Exempt!;
+
+print <<END;
+
+
+Order taken by: <FONT SIZE="+1"><B>$otaker</B></FONT><INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">
+</PRE>
+END
+
+print qq!<CENTER><INPUT TYPE="submit" VALUE="!,
+      $custnum ?  "Apply Changes" : "Add Customer", qq!"></CENTER>!;
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 0adf9a70939b9999f7a871557e621aa22a714ea9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 13 Jul 1998 19:32:18 +0000
Subject: Initial revision

---
 htdocs/edit/svc_acct.cgi | 191 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 191 insertions(+)
 create mode 100755 htdocs/edit/svc_acct.cgi

diff --git a/htdocs/edit/svc_acct.cgi b/htdocs/edit/svc_acct.cgi
new file mode 100755
index 000000000..61d0fdc28
--- /dev/null
+++ b/htdocs/edit/svc_acct.cgi
@@ -0,0 +1,191 @@
+#!/usr/bin/perl -Tw
+#
+# svc_acct.cgi: Add/edit account (output form)
+#
+# Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
+#        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
+#
+# Note: Should be run setuid freeside as user nobody
+#
+# ivan@voicenet.com 96-dec-18
+#
+# rewrite ivan@sisd.com 98-mar-8
+#
+# Changes to allow page to work at a relative position in server
+# Changed 'password' to '_password' because Pg6.3 reserves the password word
+#       bmccane@maxbaud.net     98-apr-3
+#
+# use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
+
+use strict;
+use CGI::Base qw(:DEFAULT :CGI);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::Record qw(qsearch qsearchs);
+use FS::svc_acct qw(fields);
+
+my($shells)="/var/spool/freeside/conf/shells";
+open(SHELLS,$shells) or die "Can't open $shells: $!";
+my(@shells)=map {
+  /^([\/\w]*)$/ or die "Illegal shell in conf/shells!";
+  $1;
+} grep $_ !~ /^#/, <SHELLS>;
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+&cgisuidsetup($cgi);
+
+my($action,$svcnum,$svc_acct,$pkgnum,$svcpart,$part_svc);
+
+if ( $QUERY_STRING =~ /^(\d+)$/ ) { #editing
+
+  $svcnum=$1;
+  $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svcnum})
+    or die "Unknown (svc_acct) svcnum!";
+
+  my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+    or die "Unknown (cust_svc) svcnum!";
+
+  $pkgnum=$cust_svc->pkgnum;
+  $svcpart=$cust_svc->svcpart;
+
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+
+  $action="Edit";
+
+} else { #adding
+
+  $svc_acct=create FS::svc_acct({}); 
+
+  foreach $_ (split(/-/,$QUERY_STRING)) {
+    $pkgnum=$1 if /^pkgnum(\d+)$/;
+    $svcpart=$1 if /^svcpart(\d+)$/;
+  }
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+
+  $svcnum='';
+
+  #set gecos
+  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+  if ($cust_pkg) {
+    my($cust_main)=qsearchs('cust_main',{'custnum'=> $cust_pkg->custnum } );
+    $svc_acct->setfield('finger',
+      $cust_main->getfield('first') . " " . $cust_main->getfield('last')
+    ) ;
+  }
+
+  #set fixed and default fields from part_svc
+  my($field);
+  foreach $field ( fields('svc_acct') ) {
+    if ( $part_svc->getfield('svc_acct__'. $field. '_flag') ne '' ) {
+      $svc_acct->setfield($field,$part_svc->getfield('svc_acct__'. $field) );
+    }
+  }
+
+  $action="Add";
+
+}
+
+my($svc)=$part_svc->getfield('svc');
+
+my($otaker)=getotaker;
+
+my($username,$password)=(
+  $svc_acct->username,
+  $svc_acct->_password ? "*HIDDEN*" : '',
+);
+
+my($ulen)=$svc_acct->dbdef_table->column('username')->length;
+my($ulen2)=$ulen+2;
+
+SendHeaders();
+print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>$action $svc account</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H1>$action $svc account</H1>
+    </CENTER><HR>
+    <FORM ACTION="process/svc_acct.cgi" METHOD=POST>
+      <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
+      <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
+      <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
+Username: 
+<INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen>
+<BR>Password: 
+<INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8> 
+(blank to generate)
+END
+
+#pop
+my($popnum)=$svc_acct->popnum || 0;
+if ( $part_svc->svc_acct__popnum_flag eq "F" ) {
+  print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$popnum">!;
+} else { 
+  print qq!<BR>POP: <SELECT NAME="popnum" SIZE=1><OPTION>\n!;
+  my($svc_acct_pop);
+  foreach $svc_acct_pop ( qsearch ('svc_acct_pop',{} ) ) {
+  print "<OPTION", $svc_acct_pop->popnum == $popnum ? ' SELECTED' : '', ">", 
+        $svc_acct_pop->popnum, ": ", 
+        $svc_acct_pop->city, ", ",
+        $svc_acct_pop->state,
+        "(", $svc_acct_pop->ac, ")/",
+        $svc_acct_pop->exch, "\n"
+      ;
+  }
+  print "</SELECT>";
+}
+
+my($uid,$gid,$finger,$dir)=(
+  $svc_acct->uid,
+  $svc_acct->gid,
+  $svc_acct->finger,
+  $svc_acct->dir,
+);
+
+print <<END;
+<INPUT TYPE="hidden" NAME="uid" VALUE="$uid">
+<INPUT TYPE="hidden" NAME="gid" VALUE="$gid">
+<BR>GECOS: <INPUT TYPE="text" NAME="finger" VALUE="$finger">
+<INPUT TYPE="hidden" NAME="dir" VALUE="$dir">
+END
+
+my($shell)=$svc_acct->shell;
+if ( $part_svc->svc_acct__shell_flag eq "F" ) {
+  print qq!<INPUT TYPE="hidden" NAME="shell" VALUE="$shell">!;
+} else {
+  print qq!<BR>Shell: <SELECT NAME="shell" SIZE=1>!;
+  my($etc_shell);
+  foreach $etc_shell (@shells) {
+    print "<OPTION", $etc_shell eq $shell ? ' SELECTED' : '', ">",
+          $etc_shell, "\n";
+  }
+  print "</SELECT>";
+}
+
+my($quota,$slipip)=(
+  $svc_acct->quota,
+  $svc_acct->slipip,
+);
+
+print qq!<INPUT TYPE="hidden" NAME="quota" VALUE="$quota">!;
+
+if ( $part_svc->svc_acct__slipip_flag eq "F" ) {
+  print qq!<INPUT TYPE="hidden" NAME="slipip" VALUE="$slipip">!;
+} else {
+  print qq!<BR>IP: <INPUT TYPE="text" NAME="slipip" VALUE="$slipip">!;
+}
+
+#submit
+print qq!<P><CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>!; 
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 127b2e52cd2d6a9fd918be8ca7202b560d669e0a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Jul 1998 07:43:57 +0000
Subject: Initial revision

---
 bin/svc_acct_sm.import | 252 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 252 insertions(+)
 create mode 100755 bin/svc_acct_sm.import

diff --git a/bin/svc_acct_sm.import b/bin/svc_acct_sm.import
new file mode 100755
index 000000000..10d7e4c20
--- /dev/null
+++ b/bin/svc_acct_sm.import
@@ -0,0 +1,252 @@
+#!/usr/bin/perl -Tw
+#
+# ivan@sisd.com 98-mar-9
+#
+# generalized svcparts ivan@sisd.com 98-mar-23
+
+# You really need to enable ssh into a shell machine as this needs to rename
+# .qmail-extension files.
+#
+# now an interactive script ivan@sisd.com 98-jun-30
+#
+# has an (untested) section for sendmail, s/warn/die/g and generates a program
+# to run on your mail machine _later_ instead of ssh'ing for each user
+# ivan@sisd.com 98-jul-13
+
+use strict;
+use vars qw(%d_part_svc %m_part_svc);
+use FS::SSH qw(iscp);
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::svc_acct_sm;
+use FS::svc_domain;
+
+adminsuidsetup;
+
+#my($spooldir)="/var/spool/freeside/export";
+my($spooldir)="unix";
+
+my(%mta) = (
+  1 => "qmail",
+  2 => "sendmail",
+);
+
+###
+
+%d_part_svc =
+  map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_domain'});
+%m_part_svc =
+  map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_acct_sm'});
+
+print "\n\n", 
+      ( join "\n", map "$_: ".$d_part_svc{$_}->svc, sort keys %d_part_svc ),
+      "\n\nEnter part number for domains: ";
+my($domain_svcpart)=&getvalue;
+
+print "\n\n", 
+      ( join "\n", map "$_: ".$m_part_svc{$_}->svc, sort keys %m_part_svc ),
+      "\n\nEnter part number for mail aliases: ";
+my($mailalias_svcpart)=&getvalue;
+
+print "\n\n", <<END;
+Select your MTA from the following list.
+END
+print join "\n", map "$_: $mta{$_}", sort keys %mta;
+print "\n\n:";
+my($mta)=&getvalue;
+
+if ( $mta{$mta} eq "qmail" ) {
+
+  print "\n\n", <<END;
+Enter the location and name of your qmail control directory, for example
+"mail.isp.com:/var/qmail/control"
+END
+  print ":";
+  my($control)=&getvalue;
+  iscp("root\@$control/rcpthosts","$spooldir/rcpthosts.import");
+#  iscp("root\@$control/recipientmap","$spooldir/recipientmap.import");
+  iscp("root\@$control/virtualdomains","$spooldir/virtualdomains.import");
+
+#  print "\n\n", <<END;
+#Enter the name of the machine with your user .qmail files, for example
+#"mail.isp.com"
+#END
+#  print ":";
+#  my($shellmachine)=&getvalue;
+
+} elsif ( $mta{$mta} eq "sendmail" ) {
+
+  print "\n\n", <<END;
+Enter the location and name of your sendmail virtual user table, for example
+"mail.isp.com:/etc/virtusertable"
+END
+  print ":";
+  my($virtusertable)=&getvalue;
+  iscp("root\@$virtusertable","$spooldir/virtusertable.import");
+
+  print "\n\n", <<END;
+Enter the location and name of your sendmail.cw file, for example
+"mail.isp.com:/etc/sendmail.cw"
+END
+  print ":";
+  my($sendmail_cw)=&getvalue;
+  iscp("root\@$sendmail_cw","$spooldir/sendmail.cw.import");
+
+} else {
+  die "Unknown MTA!\n";
+}
+
+sub getvalue {
+  my($x)=scalar(<STDIN>);
+  chop $x;
+  $x;
+}
+
+print "\n\n";
+
+###
+
+$FS::svc_domain::whois_hack=1;
+$FS::svc_acct_sm::nossh_hack=1;
+
+if ( $mta{$mta} eq "qmail" ) {
+  open(RCPTHOSTS,"<$spooldir/rcpthosts.import")
+    or die "Can't open $spooldir/rcpthosts.import: $!";
+} elsif ( $mta{$mta} eq "sendmail" ) {
+  open(RCPTHOSTS,"<$spooldir/sendmail.cw.import")
+    or die "Can't open $spooldir/sendmail.cw.import: $!";
+} else {
+  die "Unknown MTA!\n";
+}
+
+my(%svcnum);
+
+while (<RCPTHOSTS>) {
+  next if /^(#|$)/;
+  /^\.?([\w\-\.]+)$/
+    #or do { warn "Strange rcpthosts/sendmail.cw line: $_"; next; };
+    or die "Strange rcpthosts/sendmail.cw line: $_";
+  my $domain = $1;
+  my($svc_domain);
+  unless ( $svc_domain = qsearchs('svc_domain', {'domain'=>$domain} ) ) {
+    $svc_domain = create FS::svc_domain ({
+      'domain'  => $domain,
+      'svcpart' => $domain_svcpart,
+      'action'  => 'N',
+    });
+    my $error = $svc_domain->insert;
+    #warn $error if $error;
+    die $error if $error;
+  }
+  $svcnum{$domain}=$svc_domain->svcnum;
+}
+close RCPTHOSTS; 
+
+#these two loops have enough similar parts they should probably be merged
+if ( $mta{$mta} eq "qmail" ) {
+
+  open(VD_FIX,">$spooldir/virtualdomains.FIX");
+  print VD_FIX "#!/usr/bin/perl\n";
+
+  open(VIRTUALDOMAINS,"<$spooldir/virtualdomains.import")
+    or die "Can't open $spooldir/virtualdomains.import: $!";
+  while (<VIRTUALDOMAINS>) {
+    next if /^#/;
+    /^\.?([\w\-\.]+):(\w+)(\-([\w\-\.]+))?$/
+      #or do { warn "Strange virtualdomains line: $_"; next; };
+      or die "Strange virtualdomains line: $_";
+    my($domain,$username,$dash_ext,$extension)=($1,$2,$3,$4);
+    $dash_ext ||= '';
+    $extension ||= '';
+    my($svc_acct)=qsearchs('svc_acct',{'username'=>$username});
+    unless ( $svc_acct ) {
+      #warn "Unknown user $username in virtualdomains; skipping\n";
+      #die "Unknown user $username in virtualdomains; skipping\n";
+      next;
+    }
+    if ( $domain ne $extension ) {
+      #warn "virtualdomains line $domain:$username$dash_ext changed to $domain:$username-$domain\n";
+      my($dir)=$svc_acct->dir;
+      my($qdomain)=$domain;
+      $qdomain =~ s/\./:/g; #see manpage for 'dot-qmail': EXTENSION ADDRESSES
+      #example to move .qmail files for virtual domains to their new location 
+      #dry run
+      #issh("root\@$shellmachine",'perl -e \'foreach $a (<'. $dir. '/.qmail'. $dash_ext. '-*>) { $old=$a; $a =~ s/\\.qmail'. $dash_ext. '\\-/\\.qmail\\-'. $qdomain. '\\-/; print " $old -> $a\n"; }\'');
+      #the real thing
+      #issh("root\@$shellmachine",'perl -e \'foreach $a (<'. $dir. '/.qmail'. $dash_ext. '-*>) { $old=$a; $a =~ s/\\.qmail'. $dash_ext. '\\-/\\.qmail\\-'. $qdomain. '\\-/; rename $old, $a; }\'');
+      print VD_FIX <<END;
+foreach \$file (<$dir/.qmail$dash_ext-*>) {
+  \$old = \$file;
+  \$file =~ s/\.qmail$dash_ext\-/\.qmail\-$qdomain\-/;
+  rename \$old, \$file;
+}
+END
+    }
+
+    unless ( exists $svcnum{$domain} ) {
+      my($svc_domain) = create FS::svc_domain ({
+        'domain'  => $domain,
+        'svcpart' => $domain_svcpart,
+        'action'  => 'N',
+      });
+      my $error = $svc_domain->insert;
+      #warn $error if $error;
+      die $error if $error;
+      $svcnum{$domain}=$svc_domain->svcnum;
+    }
+
+    my($svc_acct_sm)=create FS::svc_acct_sm ({
+      'domsvc'  => $svcnum{$domain},
+      'domuid'  => $svc_acct->uid,
+      'domuser' => '*',
+      'svcpart' => $mailalias_svcpart,
+    });
+    my($error)='';
+    $error=$svc_acct_sm->insert;
+    #warn $error if $error;
+    die $error, ", domain $domain" if $error;
+  }
+  close VIRTUALDOMAINS;
+  close VD_FIX;
+
+} elsif ( $mta{$mta} eq "sendmail" ) {
+
+  open(VIRTUSERTABLE,"<$spooldir/virtusertable.import")
+    or die "Can't open $spooldir/virtusertable.import: $!";
+  while (<VIRTUSERTABLE>) {
+    next if /^#/; #comments?
+    /^([\w\-\.]+)?\@([\w\-\.]+)\t([\w\-\.]+)$/
+      #or do { warn "Strange virtusertable line: $_"; next; };
+      or die "Strange virtusertable line: $_";
+    my($domuser,$domain,$username)=($1,$2,$3);
+    my($svc_acct)=qsearchs('svc_acct',{'username'=>$username});
+    unless ( $svc_acct ) {
+      #warn "Unknown user $username in virtusertable";
+      die "Unknown user $username in virtusertable";
+      next;
+    }
+    my($svc_acct_sm)=create FS::svc_acct_sm ({
+      'domsvc'  => $svcnum{$domain},
+      'domuid'  => $svc_acct->uid,
+      'domuser' => $domuser || '*',
+      'svcpart' => $mailalias_svcpart,
+    });
+    my($error)='';
+    $error=$svc_acct_sm->insert;
+    #warn $error if $error;
+    die $error if $error;
+  }
+  close VIRTUSERTABLE;
+
+} else {
+  die "Unknown MTA!\n";
+}
+
+#open(RECIPIENTMAP,"<$spooldir/recipientmap.import");
+#close RECIPIENTMAP;
+
+print "\n\n", <<END if $mta{$mta} eq "qmail";
+Don\'t forget to run $spooldir/virtualdomains.FIX before using
+$spooldir/virtualdomains !
+END
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 923026c5b05d9715523a6d9e28586c0fea53070d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Jul 1998 08:52:05 +0000
Subject: Initial revision

---
 htdocs/search/cust_pkg.cgi | 122 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100755 htdocs/search/cust_pkg.cgi

diff --git a/htdocs/search/cust_pkg.cgi b/htdocs/search/cust_pkg.cgi
new file mode 100755
index 000000000..967068f5e
--- /dev/null
+++ b/htdocs/search/cust_pkg.cgi
@@ -0,0 +1,122 @@
+#!/usr/bin/perl -Tw
+#
+# cust_pkg.cgi: search/browse for packages
+#
+# based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
+
+use strict;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header idiot);
+
+my($req)=new CGI::Request;
+&cgisuidsetup($req->cgi);
+
+my(@cust_pkg,$sortby);
+
+my($query)=$req->cgi->var('QUERY_STRING');
+#this tree is a little bit redundant
+if ( $query eq 'pkgnum' ) {
+  $sortby=\*pkgnum_sort;
+  @cust_pkg=qsearch('cust_pkg',{});
+} elsif ( $query eq 'APKG_pkgnum' ) {
+  $sortby=\*pkgnum_sort;
+
+  #perhaps this should go in cust_pkg as a qsearch-like constructor?
+  my($cust_pkg);
+  foreach $cust_pkg (qsearch('cust_pkg',{})) {
+    my($flag)=0;
+    my($pkg_svc);
+    PKG_SVC: 
+    foreach $pkg_svc (qsearch('pkg_svc',{ 'pkgpart' => $cust_pkg->pkgpart })) {
+      if ( $pkg_svc->quantity 
+           > scalar(qsearch('cust_svc',{
+               'pkgnum' => $cust_pkg->pkgnum,
+               'svcpart' => $pkg_svc->svcpart,
+             }))
+         )
+      {
+        $flag=1;
+        last PKG_SVC;
+      }
+    }
+    push @cust_pkg, $cust_pkg if $flag;
+  }
+} else {
+  die "Empty QUERY_STRING!";
+}
+
+if ( scalar(@cust_pkg) == 1 ) {
+  my($pkgnum)=$cust_pkg[0]->pkgnum;
+  $req->cgi->redirect("../view/cust_pkg.cgi?$pkgnum");
+  exit;
+} elsif ( scalar(@cust_pkg) == 0 ) { #error
+  &idiot("No packages found");
+  exit;
+} else {
+  my($total)=scalar(@cust_pkg);
+  CGI::Base::SendHeaders(); # one guess
+  print header('Package Search Results',''), <<END;
+    $total matching packages found
+    <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
+      <TR>
+        <TH>Package #</TH>
+        <TH>Customer #</TH>
+        <TH>Name</TH>
+        <TH>Company</TH>
+      </TR>
+END
+
+  my($lines)=16;
+  my($lcount)=$lines;
+  my(%saw,$cust_pkg);
+  foreach $cust_pkg (
+    sort $sortby grep(!$saw{$_->pkgnum}++, @cust_pkg)
+  ) {
+    my($cust_main)=qsearchs('cust_main',{'custnum'=>$cust_pkg->custnum});
+    my($pkgnum,$custnum,$name,$company)=(
+      $cust_pkg->pkgnum,
+      $cust_main->custnum,
+      $cust_main->last. ', '. $cust_main->first,
+      $cust_main->company,
+    );
+    print <<END;
+    <TR>
+      <TD><A HREF="../view/cust_pkg.cgi?$pkgnum"><FONT SIZE=-1>$pkgnum</FONT></A></TD>
+      <TD><FONT SIZE=-1>$custnum</FONT></TD>
+      <TD><FONT SIZE=-1>$name</FONT></TD>
+      <TD><FONT SIZE=-1>$company</FONT></TD>
+    </TR>
+END
+    if ($lcount-- == 0) { # lots of little tables instead of one big one
+      $lcount=$lines;
+      print <<END;   
+  </TABLE>
+  <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
+    <TR>
+        <TH>Package #</TH>
+        <TH>Customer #</TH>
+        <TH>Name</TH>
+        <TH>Company</TH>
+      <TH>
+    </TR>
+END
+    }
+  }
+ 
+  print <<END;
+    </TABLE>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+  exit;
+
+}
+
+sub pkgnum_sort {
+  $a->getfield('pkgnum') <=> $b->getfield('pkgnum');
+}
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 50f9de542e60bafe915546a05414d00a3ff1d583 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 18 Jul 1998 05:42:55 +0000
Subject: Initial revision

---
 htdocs/search/svc_domain.cgi | 139 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100755 htdocs/search/svc_domain.cgi

diff --git a/htdocs/search/svc_domain.cgi b/htdocs/search/svc_domain.cgi
new file mode 100755
index 000000000..d5277037b
--- /dev/null
+++ b/htdocs/search/svc_domain.cgi
@@ -0,0 +1,139 @@
+#!/usr/bin/perl -Tw
+#
+# svc_domain.cgi: Search for domains (process form)
+#
+# Usage: post form to:
+#        http://server.name/path/svc_domain.cgi
+#
+# Note: Should be run setuid freeside as user nobody.
+#
+# ivan@voicenet.com 97-mar-5
+#
+# rewrite ivan@sisd.com 98-mar-14
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# display total, use FS::CGI now does browsing too ivan@sisd.com 98-jul-17
+
+use strict;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header idiot);
+
+my($req)=new CGI::Request;
+&cgisuidsetup($req->cgi);
+
+my(@svc_domain);
+my($sortby);
+
+my($query)=$req->cgi->var('QUERY_STRING');
+if ( $query eq 'svcnum' ) {
+  $sortby=\*svcnum_sort;
+  @svc_domain=qsearch('svc_domain',{});
+} elsif ( $query eq 'domain' ) {
+  $sortby=\*domain_sort;
+  @svc_domain=qsearch('svc_domain',{});
+} elsif ( $query eq 'UN_svcnum' ) {
+  $sortby=\*svcnum_sort;
+  @svc_domain = grep qsearchs('cust_svc',{
+      'svcnum' => $_->svcnum,
+      'pkgnum' => '',
+    }), qsearch('svc_domain',{});
+} elsif ( $query eq 'UN_domain' ) {
+  $sortby=\*domain_sort;
+  @svc_domain = grep qsearchs('cust_svc',{
+      'svcnum' => $_->svcnum,
+      'pkgnum' => '',
+    }), qsearch('svc_domain',{});
+} else {
+  $req->param('domain') =~ /^([\w\-\.]+)$/; 
+  my($domain)=$1;
+  push @svc_domain, qsearchs('svc_domain',{'domain'=>$domain});
+}
+
+if ( scalar(@svc_domain) == 1 ) {
+  $req->cgi->redirect("../view/svc_domain.cgi?". $svc_domain[0]->svcnum);
+  exit;
+} elsif ( scalar(@svc_domain) == 0 ) {
+  idiot "No matching domains found!\n";
+  exit;
+} else {
+  CGI::Base::SendHeaders(); # one guess
+
+  my($total)=scalar(@svc_domain);
+  CGI::Base::SendHeaders(); # one guess
+  print header("Domain Search Results",''), <<END;
+
+    $total matching domains found
+    <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
+      <TR>
+        <TH>Service #</TH>
+        <TH>Domain</TH>
+        <TH></TH>
+      </TR>
+END
+
+  my($lines)=16;
+  my($lcount)=$lines;
+  my(%saw,$svc_domain);
+  foreach $svc_domain (
+    sort $sortby grep(!$saw{$_->svcnum}++, @svc_domain)
+  ) {
+    my($svcnum,$domain)=(
+      $svc_domain->svcnum,
+      $svc_domain->domain,
+    );
+    my($malias);
+    if ( qsearch('svc_acct_sm',{'domsvc'=>$svcnum}) ) {
+      $malias=(
+        qq|<FORM ACTION="svc_acct_sm.cgi" METHOD="post">|.
+          qq|<INPUT TYPE="hidden" NAME="domuser" VALUE="">|.
+          qq|<INPUT TYPE="hidden" NAME="domain" VALUE="$domain">|.
+          qq|<INPUT TYPE="submit" VALUE="(mail aliases)">|.
+          qq|</FORM>|
+      );
+    } else {
+      $malias='';
+    }
+    print <<END;
+    <TR>
+      <TD><A HREF="../view/svc_domain.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
+      <TD><FONT SIZE=-1>$domain</FONT></TD>
+      <TD><FONT SIZE=-1>$malias</FONT></TD>
+    </TR>
+END
+    if ($lcount-- == 0) { # lots of little tables instead of one big one
+      $lcount=$lines;
+      print <<END;   
+  </TABLE>
+  <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
+    <TR>
+      <TH>Service #</TH>
+      <TH>Domain</TH>
+      <TH></TH>
+    </TR>
+END
+    }
+  }
+ 
+  print <<END;
+    </TABLE>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
+}
+
+sub svcnum_sort {
+  $a->getfield('svcnum') <=> $b->getfield('svcnum');
+}
+
+sub domain_sort {
+  $a->getfield('domain') cmp $b->getfield('doimain');
+}
+
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From a376998b570ac32a2b77b271cdb4946f18ebd4ac Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 18 Jul 1998 07:11:08 +0000
Subject: Initial import into CVS

---
 etc/domain-template.txt | 231 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 231 insertions(+)
 create mode 100644 etc/domain-template.txt

diff --git a/etc/domain-template.txt b/etc/domain-template.txt
new file mode 100644
index 000000000..8e4983ce2
--- /dev/null
+++ b/etc/domain-template.txt
@@ -0,0 +1,231 @@
+[ URL ftp://rs.internic.net/templates/domain-template.txt ] [ 03/98 ] 
+
+******* Please DO NOT REMOVE Version Number or Sections A-Q ********
+
+Domain Version Number: 4.0
+
+******* Email completed agreement to hostmaster@internic.net *******
+
+	NETWORK SOLUTIONS, INC.
+
+	DOMAIN NAME REGISTRATION AGREEMENT
+
+
+A.	Introduction. This domain name registration agreement
+("Registration Agreement") is submitted to NETWORK SOLUTIONS, INC.
+("NSI") for the purpose of applying for and registering a domain name
+on the Internet. If this Registration Agreement is accepted by NSI,
+and a domain name is registered in NSI's domain name database and
+assigned to the Registrant, Registrant ("Registrant") agrees to be
+bound by the terms of this Registration Agreement and the terms of
+NSI's Domain Name Dispute Policy ("Dispute Policy") which is
+incorporated herein by reference and made a part of this Registration
+Agreement. This Registration Agreement shall be accepted at the
+offices of NSI. 
+
+B. Fees and Payments.
+
+1) Registration or renewal (re-registration) date through March 31, 1998:
+Registrant agrees to pay a registration fee of One Hundred United States
+Dollars (US$100) as consideration for the registration of each new domain
+name or Fifty United States Dollars (US$50) to renew (re-register) an
+existing registration.
+2) Registration or renewal date on and after April 1, 1998:  Registrant
+agrees to pay a registration fee of Seventy United States Dollars (US$70) 
+as consideration for the registration of each new domain name or the 
+applicable renewal (re-registration) fee (currently Thirty-Five United 
+States Dollars (US$35)) at the time of renewal (re-registration).
+3) Period of Service:  The non-refundable fee covers a period of two (2)
+years for each new registration, and one (1) year for each renewal, 
+and includes any permitted modification(s) to the domain name record
+during the covered period.
+4) Payment:  Payment is due to Network Solutions within thirty (30) 
+days from the date of the invoice.
+
+C.	Dispute Policy. Registrant agrees, as a condition to
+submitting this Registration Agreement, and if the Registration
+Agreement is accepted by NSI, that the Registrant shall be bound by
+NSI's current Dispute Policy. The current version of the Dispute
+Policy may be found at the InterNIC Registration Services web site:
+"http://www.netsol.com/rs/dispute-policy.html". 
+
+D.	Dispute Policy Changes or Modifications. Registrant agrees
+that NSI, in its sole discretion, may change or modify the Dispute
+Policy, incorporated by reference herein, at any time. Registrant
+agrees that Registrant's maintaining the registration of a domain name
+after changes or modifications to the Dispute Policy become effective
+constitutes Registrant's continued acceptance of these changes or
+modifications. Registrant agrees that if Registrant considers any such
+changes or modifications to be unacceptable, Registrant may request
+that the domain name be deleted from the domain name database. 
+
+E.	Disputes. Registrant agrees that, if the registration of its
+domain name is challenged by any third party, the Registrant will be
+subject to the provisions specified in the Dispute Policy. 
+
+F.	Agents. Registrant agrees that if this Registration Agreement
+is completed by an agent for the Registrant, such as an ISP or
+Administrative Contact/Agent, the Registrant is nonetheless bound as a
+principal by all terms and conditions herein, including the Dispute
+Policy. 
+
+G.	Limitation of Liability. Registrant agrees that NSI shall have
+no liability to the Registrant for any loss Registrant may incur in
+connection with NSI's processing of this Registration Agreement, in
+connection with NSI's processing of any authorized modification to the
+domain name's record during the covered period, as a result of the
+Registrant's ISP's failure to pay either the initial registration fee
+or renewal fee, or as a result of the application of the provisions of
+the Dispute Policy. Registrant agrees that in no event shall the
+maximum liability of NSI under this Agreement for any matter exceed
+Five Hundred United States Dollars (US$500). 
+
+H.	Indemnity. Registrant agrees, in the event the Registration
+Agreement is accepted by NSI and a subsequent dispute arises with any
+third party, to indemnify and hold NSI harmless pursuant to the terms
+and conditions contained in the Dispute Policy. 
+
+I.	Breach. Registrant agrees that failure to abide by any
+provision of this Registration Agreement or the Dispute Policy may be
+considered by NSI to be a material breach and that NSI may provide a
+written notice, describing the breach, to the Registrant. If, within
+thirty (30) days of the date of mailing such notice, the Registrant
+fails to provide evidence, which is reasonably satisfactory to NSI,
+that it has not breached its obligations, then NSI may delete
+Registrant's registration of the domain name. Any such breach by a
+Registrant shall not be deemed to be excused simply because NSI did
+not act earlier in response to that, or any other, breach by the
+Registrant. 
+
+J.	No Guaranty. Registrant agrees that, by registration of a
+domain name, such registration does not confer immunity from objection
+to either the registration or use of the domain name. 
+
+K.	Warranty. Registrant warrants by submitting this Registration
+Agreement that, to the best of Registrant's knowledge and belief, the
+information submitted herein is true and correct, and that any future
+changes to this information will be provided to NSI in a timely manner
+according to the domain name modification procedures in place at that
+time. Breach of this warranty will constitute a material breach. 
+
+L.	Revocation. Registrant agrees that NSI may delete a
+Registrant's domain name if this Registration Agreement, or subsequent
+modification(s) thereto, contains false or misleading information, or
+conceals or omits any information NSI would likely consider material
+to its decision to approve this Registration Agreement. 
+
+M.	Right of Refusal. NSI, in its sole discretion, reserves the
+right to refuse to approve the Registration Agreement for any
+Registrant. Registrant agrees that the submission of this Registration
+Agreement does not obligate NSI to accept this Registration Agreement.
+Registrant agrees that NSI shall not be liable for loss or damages
+that may result from NSI's refusal to accept this Registration
+Agreement. 
+
+N.	Severability. Registrant agrees that the terms of this
+Registration Agreement are severable. If any term or provision is
+declared invalid, it shall not affect the remaining terms or
+provisions which shall continue to be binding. 
+
+O.	Entirety. Registrant agrees that this Registration Agreement
+and the Dispute Policy is the complete and exclusive agreement between
+Registrant and NSI regarding the registration of Registrant's domain
+name. This Registration Agreement and the Dispute Policy supersede all
+prior agreements and understandings, whether established by custom,
+practice, policy, or precedent. 
+
+P.	Governing Law. Registrant agrees that this Registration
+Agreement shall be governed in all respects by and construed in
+accordance with the laws of the Commonwealth of Virginia, United
+States of America. By submitting this Registration Agreement,
+Registrant consents to the exclusive jurisdiction and venue of the
+United States District Court for the Eastern District of Virginia,
+Alexandria Division. If there is no jurisdiction in the United States
+District Court for the Eastern District of Virginia, Alexandria
+Division, then jurisdiction shall be in the Circuit Court of Fairfax
+County, Fairfax, Virginia. 
+
+Q.	This is Domain Name Registration Agreement Version
+Number 4.0. This Registration Agreement is only for registrations
+under top-level domains: COM, ORG, NET, and EDU. By completing
+and submitting this Registration Agreement for consideration and
+acceptance by NSI, the Registrant agrees that he/she has read and
+agrees to be bound by A through P above. 
+
+
+Authorization
+0a.  (N)ew (M)odify (D)elete....:###action###
+0b.  Auth Scheme................: 
+0c.  Auth Info..................: 
+
+1.   Comments...................:###purpose###
+
+2.   Complete Domain Name.......:###domain###
+
+Organization Using Domain Name
+
+3a.  Organization Name..........:###company###
+###LOOP###
+3b.  Street Address.............:###address###
+###ENDLOOP###
+3c.  City.......................:###city###
+3d.  State......................:###state###
+3e.  Postal Code................:###zip###
+3f.  Country....................:###country###
+
+Administrative Contact
+4a.  NIC Handle (if known)......: 
+4b.  (I)ndividual (R)ole........:I
+4c.  Name (Last, First).........:###last###, ###first###
+4d.  Organization Name..........:###company###
+###LOOP###
+4e.  Street Address.............:###address###
+###ENDLOOP###
+4f.  City.......................:###city###
+4g.  State......................:###state###
+4h.  Postal Code................:###zip### 
+4i.  Country....................:###country###
+4j.  Phone Number...............:###daytime###
+4k.  Fax Number.................:###fax###
+4l.  E-Mailbox..................:###email###
+
+Technical Contact
+5a.  NIC Handle (if known)......:###tech_contact###
+5b.  (I)ndividual (R)ole........: 
+5c.  Name (Last, First).........: 
+5d.  Organization Name..........: 
+5e.  Street Address.............: 
+5f.  City.......................: 
+5g.  State......................: 
+5h.  Postal Code................: 
+5i.  Country....................: 
+5j.  Phone Number...............: 
+5k.  Fax Number.................: 
+5l.  E-Mailbox..................: 
+
+Billing Contact
+6a.  NIC Handle (if known)......: 
+6b.  (I)ndividual (R)ole........: 
+6c.  Name (Last, First).........: 
+6d.  Organization Name..........: 
+6e.  Street Address.............: 
+6f.  City.......................: 
+6g.  State......................:
+6h.  Postal Code................:
+6i.  Country....................:
+6j.  Phone Number...............:
+6k.  Fax Number.................: 
+6l.  E-Mailbox..................: 
+
+Prime Name Server
+7a.  Primary Server Hostname....:###primary###
+7b.  Primary Server Netaddress..:###primary_ip###
+
+Secondary Name Server(s)
+###LOOP###
+8a.  Secondary Server Hostname..:###secondary###
+8b.  Secondary Server Netaddress:###secondary_ip###
+###ENDLOOP###
+
+END OF AGREEMENT
+
-- 
cgit v1.2.1


From f0a04c17c324219c6edb893821b4bd7f3dcbfd77 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 18 Jul 1998 07:24:10 +0000
Subject: Initial revision

---
 htdocs/edit/svc_domain.cgi | 120 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 120 insertions(+)
 create mode 100755 htdocs/edit/svc_domain.cgi

diff --git a/htdocs/edit/svc_domain.cgi b/htdocs/edit/svc_domain.cgi
new file mode 100755
index 000000000..0717a2c09
--- /dev/null
+++ b/htdocs/edit/svc_domain.cgi
@@ -0,0 +1,120 @@
+#!/usr/bin/perl -Tw
+#
+# svc_domain.cgi: Add domain (output form)
+#
+# Usage: svc_domain.cgi pkgnum{pkgnum}-svcpart{svcpart}
+#        http://server.name/path/svc_domain.cgi?pkgnum{pkgnum}-svcpart{svcpart}
+#
+# Note: Should be run setuid freeside as user nobody
+#
+# ivan@voicenet.com 97-jan-5 -> 97-jan-6
+#
+# changes for domain template 3.5
+# ivan@voicenet.com 97-jul-24
+#
+# rewrite ivan@sisd.com 98-mar-14
+#
+# no GOV in instructions ivan@sisd.com 98-jul-17
+
+use strict;
+use CGI::Base qw(:DEFAULT :CGI);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::Record qw(qsearch qsearchs);
+use FS::svc_domain qw(fields);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+&cgisuidsetup($cgi);
+
+my($action,$svcnum,$svc_domain,$pkgnum,$svcpart,$part_svc);
+
+if ( $QUERY_STRING =~ /^(\d+)$/ ) { #editing
+
+  $svcnum=$1;
+  $svc_domain=qsearchs('svc_domain',{'svcnum'=>$svcnum})
+    or die "Unknown (svc_domain) svcnum!";
+
+  my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+    or die "Unknown (cust_svc) svcnum!";
+
+  $pkgnum=$cust_svc->pkgnum;
+  $svcpart=$cust_svc->svcpart;
+
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+
+  $action="Edit";
+
+} else { #adding
+
+  $svc_domain=create FS::svc_domain({});
+  
+  foreach $_ (split(/-/,$QUERY_STRING)) {
+    $pkgnum=$1 if /^pkgnum(\d+)$/;
+    $svcpart=$1 if /^svcpart(\d+)$/;
+  }
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+
+  $svcnum='';
+
+  #set fixed and default fields from part_svc
+  my($field);
+  foreach $field ( fields('svc_domain') ) {
+    if ( $part_svc->getfield('svc_domain__'. $field. '_flag') ne '' ) {
+      $svc_domain->setfield($field,$part_svc->getfield('svc_domain__'. $field) );
+    }
+  }
+
+  $action="Add";
+
+}
+
+my($svc)=$part_svc->getfield('svc');
+
+my($otaker)=getotaker;
+
+my($domain)=(
+  $svc_domain->domain,
+);
+
+SendHeaders();
+print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>$action $svc</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H1>$action $svc</H1>
+    </CENTER><HR>
+    <FORM ACTION="process/svc_domain.cgi" METHOD=POST>
+      <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
+      <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
+      <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
+      <INPUT TYPE="radio" NAME="action" VALUE="N">New
+      <BR><INPUT TYPE="radio" NAME="action" VALUE="M">Transfer
+
+<P>Customer agrees to be bound by NSI's
+<A HREF="http://rs.internic.net/help/agreement.txt">
+Domain Name Registration Agreement</A>
+<SELECT NAME="legal" SIZE=1><OPTION SELECTED>No<OPTION>Yes</SELECT>
+<P>Domain <INPUT TYPE="text" NAME="domain" VALUE="$domain" SIZE=28 MAXLENGTH=26>
+<BR>Purpose/Description: <INPUT TYPE="text" NAME="purpose" VALUE="" SIZE=64>
+<P><CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>
+<UL>
+  <LI>COM is for commercial, for-profit organziations
+  <LI>ORG is for miscellaneous, usually, non-profit organizations
+  <LI>NET is for network infrastructure machines and organizations
+  <LI>EDU is for 4-year, degree granting institutions
+<!--  <LI>GOV is for United States federal government agencies
+!-->
+</UL>
+US state and local government agencies, schools, libraries, museums, and individuals should register under the US domain.  See RFC 1480 for a complete description of the US domain
+and registration procedures.
+<P>GOV registrations are limited to top-level US Federal Government agencies (see RFC 1816).
+    </FORM>
+  </BODY>
+</HTML>
+END
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 70446cf4e4403a5984d86ef03f08881074aea101 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 18 Jul 1998 23:39:02 +0000
Subject: Initial revision

---
 htdocs/misc/cancel_pkg.cgi | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100755 htdocs/misc/cancel_pkg.cgi

diff --git a/htdocs/misc/cancel_pkg.cgi b/htdocs/misc/cancel_pkg.cgi
new file mode 100755
index 000000000..6702a0351
--- /dev/null
+++ b/htdocs/misc/cancel_pkg.cgi
@@ -0,0 +1,54 @@
+#!/usr/bin/perl -Tw
+#
+# cancel_pkg.cgi: Cancel a package
+#
+# Usage: cancel_pkg.cgi pkgnum
+#        http://server.name/path/cancel_pkg.cgi pkgnum
+#
+# Note: Should be run setuid freeside as user nobody
+#
+# IT DOESN'T RUN THE APPROPRIATE PROGRAMS YET!!!!
+#
+# probably should generalize this to do cancels, suspensions, unsuspensions, etc.
+#
+# ivan@voicenet.com 97-jan-2
+#
+# still kludgy, but now runs /dbin/cancel $pkgnum
+# ivan@voicenet.com 97-feb-27
+#
+# doesn't run if pkgnum doesn't match regex
+# ivan@voicenet.com 97-mar-6
+#
+# now redirects to enter comments
+# ivan@voicenet.com 97-may-8
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-21
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+
+use strict;
+use CGI::Base qw(:DEFAULT :CGI); # CGI module
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+use FS::cust_pkg;
+use FS::CGI qw(idiot);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+&cgisuidsetup($cgi);
+ 
+#untaint pkgnum
+$QUERY_STRING =~ /^(\d+)$/ || die "Illegal pkgnum";
+my($pkgnum)=$1;
+
+my($cust_pkg) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+
+bless($cust_pkg,'FS::cust_pkg');
+my($error)=$cust_pkg->cancel;
+idiot($error) if $error;
+
+$cgi->redirect("../view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 1f363bffdb0f28d8c93ba8ca736129c149caa880 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 19 Jul 1998 00:13:49 +0000
Subject: Initial revision

---
 htdocs/search/cust_main.cgi | 235 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 235 insertions(+)
 create mode 100755 htdocs/search/cust_main.cgi

diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
new file mode 100755
index 000000000..70ce991f7
--- /dev/null
+++ b/htdocs/search/cust_main.cgi
@@ -0,0 +1,235 @@
+#!/usr/bin/perl -Tw
+#
+# process/cust_main.cgi: Search for customers (process form)
+#
+# Usage: post form to:
+#        http://server.name/path/cust_main.cgi
+#
+# Note: Should be run setuid freeside as user nobody.
+#
+# ivan@voicenet.com 96-dec-12
+#
+# rewrite ivan@sisd.com 98-mar-4
+#
+# now does browsing too ivan@sisd.com 98-mar-6
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# display total, use FS::CGI ivan@sisd.com 98-jul-17
+
+use strict;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use IO::Handle;
+use IPC::Open2;
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header idiot);
+
+my($fuzziness)=2; #fuzziness for fuzzy searches, see man agrep
+                  #0-4: 0=no fuzz, 4=very fuzzy (too much fuzz!)
+
+my($req)=new CGI::Request;
+&cgisuidsetup($req->cgi);
+
+my(@cust_main);
+my($sortby);
+
+my($query)=$req->cgi->var('QUERY_STRING');
+if ( $query eq 'custnum' ) {
+  $sortby=\*custnum_sort;
+  @cust_main=qsearch('cust_main',{});  
+} elsif ( $query eq 'last' ) {
+  $sortby=\*last_sort;
+  @cust_main=qsearch('cust_main',{});  
+} elsif ( $query eq 'company' ) {
+  $sortby=\*company_sort;
+  @cust_main=qsearch('cust_main',{});  
+} else {
+  &cardsearch if ($req->param('card_on') );
+  &lastsearch if ($req->param('last_on') );
+  &companysearch if ($req->param('company_on') );
+}
+
+if ( scalar(@cust_main) == 1 ) {
+  $req->cgi->redirect("../view/cust_main.cgi?". $cust_main[0]->custnum);
+  exit;
+} elsif ( scalar(@cust_main) == 0 ) {
+  idiot "No matching customers found!\n";
+  exit;
+} else { 
+
+  my($total)=scalar(@cust_main);
+  CGI::Base::SendHeaders(); # one guess
+  print header("Customer Search Results",''), <<END;
+
+    $total matching customers found
+    <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
+      <TR>
+        <TH>Cust. #</TH>
+        <TH>Contact name</TH>
+        <TH>Company</TH>
+      </TR>
+END
+
+  my($lines)=16;
+  my($lcount)=$lines;
+  my(%saw,$cust_main);
+  foreach $cust_main (
+    sort $sortby grep(!$saw{$_->custnum}++, @cust_main)
+  ) {
+    my($custnum,$last,$first,$company)=(
+      $cust_main->custnum,
+      $cust_main->getfield('last'),
+      $cust_main->getfield('first'),
+      $cust_main->company,
+    );
+    print <<END;
+    <TR>
+      <TD><A HREF="../view/cust_main.cgi?$custnum"><FONT SIZE=-1>$custnum</FONT></A></TD>
+      <TD><FONT SIZE=-1>$last, $first</FONT></TD>
+      <TD><FONT SIZE=-1>$company</FONT></TD>
+    </TR>
+END
+    if ($lcount-- == 0) { # lots of little tables instead of one big one
+      $lcount=$lines;
+      print <<END;   
+  </TABLE>
+  <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
+    <TR>
+      <TH>Cust. #</TH>
+      <TH>Contact name</TH>
+      <TH>Company<TH>
+    </TR>
+END
+    }
+  }
+ 
+  print <<END;
+    </TABLE>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
+}
+
+#
+
+sub last_sort {
+  $a->getfield('last') cmp $b->getfield('last');
+}
+
+sub company_sort {
+  $a->getfield('company') cmp $b->getfield('company');
+}
+
+sub custnum_sort {
+  $a->getfield('custnum') <=> $b->getfield('custnum');
+}
+
+sub cardsearch {
+
+  my($card)=$req->param('card');
+  $card =~ s/\D//g;
+  $card =~ /^(\d{13,16})$/ or do { idiot "Illegal card number\n"; exit; };
+  my($payinfo)=$1;
+
+  push @cust_main, qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'CARD'});
+
+}
+
+sub lastsearch {
+  my(%last_type);
+  foreach ( $req->param('last_type') ) {
+    $last_type{$_}++;
+  }
+
+  $req->param('last_text') =~ /^([\w \,\.\-\']*)$/
+    or do { idiot "Illegal last name"; exit; };
+  my($last)=$1;
+
+  if ( $last_type{'Exact'}
+       && ! $last_type{'Fuzzy'} 
+     #  && ! $last_type{'Sound-alike'}
+  ) {
+
+    push @cust_main, qsearch('cust_main',{'last'=>$last});
+
+  } else {
+
+    my(%last);
+
+    my(@all_last)=map $_->getfield('last'), qsearch('cust_main',{});
+    if ($last_type{'Fuzzy'}) { 
+      my($reader,$writer) = ( new IO::Handle, new IO::Handle );
+      open2($reader,$writer,'agrep',"-$fuzziness",'-i','-k',
+            substr($last,0,30));
+      print $writer join("\n",@all_last),"\n";
+      close $writer;
+      while (<$reader>) {
+        chop;
+        $last{$_}++;
+      } 
+      close $reader;
+    }
+
+    #if ($last_type{'Sound-alike'}) {
+    #}
+
+    foreach ( keys %last ) {
+      push @cust_main, qsearch('cust_main',{'last'=>$_});
+    }
+
+  }
+  $sortby=\*last_sort;
+}
+
+sub companysearch {
+
+  my(%company_type);
+  foreach ( $req->param('company_type') ) {
+    $company_type{$_}++ 
+  };
+
+  $req->param('company_text') =~ /^([\w \,\.\-\']*)$/
+    or do { idiot "Illegal company"; exit; };
+  my($company)=$1;
+
+  if ( $company_type{'Exact'}
+       && ! $company_type{'Fuzzy'} 
+     #  && ! $company_type{'Sound-alike'}
+  ) {
+
+    push @cust_main, qsearch('cust_main',{'company'=>$company});
+
+  } else {
+
+    my(%company);
+    my(@all_company)=map $_->company, qsearch('cust_main',{});
+
+    if ($company_type{'Fuzzy'}) { 
+      my($reader,$writer) = ( new IO::Handle, new IO::Handle );
+      open2($reader,$writer,'agrep',"-$fuzziness",'-i','-k',
+            substr($company,0,30));
+      print $writer join("\n",@all_company),"\n";
+      close $writer;
+      while (<$reader>) {
+        chop;
+        $company{$_}++;
+      }
+      close $reader;
+    }
+
+    #if ($company_type{'Sound-alike'}) {
+    #}
+
+    foreach ( keys %company ) {
+      push @cust_main, qsearch('cust_main',{'company'=>$_});
+    }
+
+  }
+  $sortby=\*company_sort;
+
+}
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From e3e7472ec21f570c58e6bc7351019a371924c8a8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 19 Jul 1998 00:37:57 +0000
Subject: Initial revision

---
 htdocs/edit/process/svc_acct_sm.cgi | 80 +++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100755 htdocs/edit/process/svc_acct_sm.cgi

diff --git a/htdocs/edit/process/svc_acct_sm.cgi b/htdocs/edit/process/svc_acct_sm.cgi
new file mode 100755
index 000000000..9ad546bf4
--- /dev/null
+++ b/htdocs/edit/process/svc_acct_sm.cgi
@@ -0,0 +1,80 @@
+#!/usr/bin/perl -Tw
+#
+# process/svc_acct_sm.cgi: Add/edit a mail alias (process form)
+#
+# Usage: post form to:
+#        http://server.name/path/svc_acct_sm.cgi
+#
+# Note: Should br run setuid root as user nobody.
+#
+# lots of crufty stuff from svc_acct still in here, and modifications are (unelegantly) disabled.
+#
+# ivan@voicenet.com 97-jan-6
+#
+# enabled modifications
+# 
+# ivan@voicenet.com 97-may-7
+#
+# fixed removal of cust_svc record on modifications!
+# ivan@voicenet.com 97-jun-5
+#
+# rewrite ivan@sisd.com 98-mar-15
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+
+use strict;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+use FS::svc_acct_sm;
+
+my($req)=new CGI::Request; # create form object
+cgisuidsetup($req->cgi);
+
+$req->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+my($svcnum)=$1;
+
+my($old)=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
+
+#unmunge domsvc and domuid
+$req->param('domsvc',(split(/:/, $req->param('domsvc') ))[0] );
+$req->param('domuid',(split(/:/, $req->param('domuid') ))[0] );
+
+my($new) = create FS::svc_acct_sm ( {
+  map {
+    ($_, scalar($req->param($_)));
+  } qw(svcnum pkgnum svcpart domuser domuid domsvc)
+} );
+
+my($error);
+if ( $svcnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $svcnum = $new->getfield('svcnum');
+} 
+
+unless ($error) {
+  $req->cgi->redirect("../../view/svc_acct_sm.cgi?$svcnum");
+} else {
+  CGI::Base::SendHeaders(); # one guess
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Error adding/editing mail alias</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H4>Error adding/editing mail alias</H4>
+    </CENTER>
+    Your update did not occur because of the following error:
+    <P><B>$error</B>
+    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and submit the form again.
+  </BODY>
+</HTML>
+END
+
+}
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 3a60a97c305ee65b6a3c61c4b7f4bc35f8163356 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 26 Jul 1998 21:25:09 +0000
Subject: Initial revision

---
 htdocs/edit/svc_acct_sm.cgi | 219 ++++++++++++++++++++++++++++++++++++++++++++
 htdocs/view/svc_acct_sm.cgi | 114 +++++++++++++++++++++++
 2 files changed, 333 insertions(+)
 create mode 100755 htdocs/edit/svc_acct_sm.cgi
 create mode 100755 htdocs/view/svc_acct_sm.cgi

diff --git a/htdocs/edit/svc_acct_sm.cgi b/htdocs/edit/svc_acct_sm.cgi
new file mode 100755
index 000000000..45a8eb8fc
--- /dev/null
+++ b/htdocs/edit/svc_acct_sm.cgi
@@ -0,0 +1,219 @@
+#!/usr/bin/perl -Tw
+#
+# svc_acct_sm.cgi: Add/edit a mail alias (output form)
+#
+# Usage: svc_acct_sm.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
+#        http://server.name/path/svc_acct_sm.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
+#
+# use {svcnum} for edit, pkgnum{pkgnum}-svcpart{svcpart} for add
+#
+# Note: Should be run setuid freeside as user nobody.
+#
+# should error out in a more CGI-friendly way, and should have more error checking (sigh).
+#
+# ivan@voicenet.com 97-jan-5
+#
+# added debugging code; fixed CPU-sucking problem with trying to edit an (unaudited) mail alias (no pkgnum)
+#
+# ivan@voicenet.com 97-may-7
+#
+# fixed uid selection
+# ivan@voicenet.com 97-jun-4
+#
+# uid selection across _CUSTOMER_, not just _PACKAGE_
+#
+# ( i need to be rewritten with fast searches)
+#
+# ivan@voicenet.com 97-oct-3
+#
+# added fast searches in some of the places where it is sorely needed...
+# I see DBI::mysql in your future...
+# ivan@voicenet.com 97-oct-23
+#
+# rewrite ivan@sisd.com 98-mar-15
+#
+# /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-26
+
+use strict;
+use CGI::Base qw(:DEFAULT :CGI);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::svc_acct_sm qw(fields);
+
+my($conf_domain)="/var/spool/freeside/conf/domain";
+open(DOMAIN,$conf_domain) or die "Can't open $conf_domain: $!";
+my($mydomain)=map {
+  /^(.*)$/ or die "Illegal line in $conf_domain!"; #yes, we trust the file
+  $1
+} grep $_ !~ /^(#|$)/, <DOMAIN>;
+close DOMAIN;
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+&cgisuidsetup($cgi);
+
+SendHeaders(); # one guess.
+
+my($action,$svcnum,$svc_acct_sm,$pkgnum,$svcpart,$part_svc);
+if ( $QUERY_STRING =~ /^(\d+)$/ ) { #editing
+
+  $svcnum=$1;
+  $svc_acct_sm=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum})
+    or die "Unknown (svc_acct_sm) svcnum!";
+
+  my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+    or die "Unknown (cust_svc) svcnum!";
+
+  $pkgnum=$cust_svc->pkgnum;
+  $svcpart=$cust_svc->svcpart;
+  
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+
+  $action="Edit";
+
+} else { #adding
+
+  $svc_acct_sm=create FS::svc_acct_sm({});
+
+  foreach $_ (split(/-/,$QUERY_STRING)) { #get & untaint pkgnum & svcpart
+    $pkgnum=$1 if /^pkgnum(\d+)$/;
+    $svcpart=$1 if /^svcpart(\d+)$/;
+  }
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+
+  $svcnum='';
+
+  #set fixed and default fields from part_svc
+  my($field);
+  foreach $field ( fields('svc_acct_sm') ) {
+    if ( $part_svc->getfield('svc_acct_sm__'. $field. '_flag') ne '' ) {
+      $svc_acct_sm->setfield($field,$part_svc->getfield('svc_acct_sm__'. $field) );
+    }
+  }
+
+  $action='Add';
+
+}
+
+my(%username,%domain);
+if ($pkgnum) {
+
+  #find all possible uids (and usernames)
+
+  my($u_part_svc,@u_acct_svcparts);
+  foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
+    push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
+  }
+
+  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+  my($custnum)=$cust_pkg->getfield('custnum');
+  my($i_cust_pkg);
+  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
+    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
+    my($acct_svcpart);
+    foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
+                                              #record(s) in cust_svc ( for this
+                                              #pkgnum ! )
+      my($i_cust_svc);
+      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
+        my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
+        $username{$svc_acct->getfield('uid')}=$svc_acct->getfield('username');
+      }  
+    }
+  }
+
+  #find all possible domains (and domsvc's)
+
+  my($d_part_svc,@d_acct_svcparts);
+  foreach $d_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_domain'}) ) {
+    push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
+  }
+
+  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
+    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
+    my($acct_svcpart);
+    foreach $acct_svcpart (@d_acct_svcparts) {
+      my($i_cust_svc);
+      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
+        my($svc_domain)=qsearch('svc_domain',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
+        $domain{$svc_domain->getfield('svcnum')}=$svc_domain->getfield('domain');
+      }
+    }
+  }
+
+} elsif ( $action eq 'Edit' ) {
+
+  my($svc_acct)=qsearchs('svc_acct',{'uid'=>$svc_acct_sm->domuid});
+  $username{$svc_acct_sm->uid} = $svc_acct->username;
+
+  my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$svc_acct_sm->domsvc});
+  $domain{$svc_acct_sm->domsvc} = $svc_domain->domain;
+
+} else {
+  die "\$action eq Add, but \$pkgnum is null!\n";
+}
+
+print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Mail Alias $action</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H1>Mail Alias $action</H1>
+    </CENTER>
+    <FORM ACTION="process/svc_acct_sm.cgi" METHOD=POST>
+END
+
+#display
+
+	#formatting
+	print "<PRE>";
+
+#svcnum
+print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
+print qq!Service #<FONT SIZE=+1><B>!, $svcnum ? $svcnum : " (NEW)", "</B></FONT>";
+
+#pkgnum
+print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
+ 
+#svcpart
+print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
+
+my($domuser,$domsvc,$domuid)=(
+  $svc_acct_sm->domuser,
+  $svc_acct_sm->domsvc,
+  $svc_acct_sm->domuid,
+);
+
+#domuser
+print qq!\n\nMail to <INPUT TYPE="text" NAME="domuser" VALUE="$domuser"> <I>( * for anything )</I>!;
+
+#domsvc
+print qq! \@ <SELECT NAME="domsvc" SIZE=1>!;
+foreach $_ (keys %domain) {
+  print "<OPTION", $_ eq $domsvc ? " SELECTED" : "", ">$_: $domain{$_}";
+}
+print "</SELECT>";
+
+#uid
+print qq!\nforwards to <SELECT NAME="domuid" SIZE=1>!;
+foreach $_ (keys %username) {
+  print "<OPTION", ($_ eq $domuid) ? " SELECTED" : "", ">$_: $username{$_}";
+}
+print "</SELECT>\@$mydomain mailbox.";
+
+	#formatting
+	print "</PRE>\n";
+
+print qq!<CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>!;
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+
diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi
new file mode 100755
index 000000000..42623eefd
--- /dev/null
+++ b/htdocs/view/svc_acct_sm.cgi
@@ -0,0 +1,114 @@
+#!/usr/bin/perl -Tw
+#
+# View svc_acct_sm records
+#
+# Usage: svc_acct_sm.cgi svcnum
+#        http://server.name/path/svc_acct_sm.cgi?svcnum
+#
+# Note: Should be run setuid freeside as user nobody.
+#
+# based on view/svc_acct.cgi
+# 
+# ivan@voicenet.com 97-jan-5
+#
+# added navigation bar
+# ivan@voicenet.com 97-jan-30
+# 
+# rewrite ivan@sisd.com 98-mar-15
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
+
+use strict;
+use CGI::Base qw(:DEFAULT :CGI);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+
+my($conf_domain)="/var/spool/freeside/conf/domain";
+open(DOMAIN,$conf_domain) or die "Can't open $conf_domain: $!";
+my($mydomain)=map {
+  /^(.*)$/ or die "Illegal line in $conf_domain!"; #yes, we trust the file
+  $1
+} grep $_ !~ /^(#|$)/, <DOMAIN>;
+close DOMAIN;
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+cgisuidsetup($cgi);
+
+#untaint svcnum
+$QUERY_STRING =~ /^(\d+)$/;
+my($svcnum)=$1;
+my($svc_acct_sm)=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum});
+die "Unknown svcnum" unless $svc_acct_sm;
+
+my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
+my($pkgnum)=$cust_svc->getfield('pkgnum');
+my($cust_pkg,$custnum);
+if ($pkgnum) {
+  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+  $custnum=$cust_pkg->getfield('custnum');
+}
+
+my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+die "Unkonwn svcpart" unless $part_svc;
+
+SendHeaders(); # one guess.
+print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Mail Alias View</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER><H1>Mail Alias View</H1>
+END
+if ($pkgnum || $custnum) {
+  print <<END;
+<A HREF="../view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> | 
+<A HREF="../view/cust_main.cgi?$custnum">View this customer (#$custnum)</A> | 
+END
+} else {
+  print <<END;
+<A HREF="../misc/cancel-unaudited.cgi?$svcnum">Cancel this (unaudited)account</A> |
+END
+}
+
+print <<END;
+    <A HREF="../">Main menu</A></CENTER><BR<
+    <FONT SIZE=+1>Service #$svcnum</FONT>
+    <P><A HREF="../edit/svc_acct_sm.cgi?$svcnum">Edit this information</A>
+    <BASEFONT SIZE=3>
+END
+
+my($domsvc,$domuid,$domuser)=(
+  $svc_acct_sm->domsvc,
+  $svc_acct_sm->domuid,
+  $svc_acct_sm->domuser,
+);
+my($svc) = $part_svc->svc;
+my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$domsvc});
+my($domain)=$svc_domain->domain;
+my($svc_acct)=qsearchs('svc_acct',{'uid'=>$domuid});
+my($username)=$svc_acct->username;
+
+#formatting
+print qq!<HR>!;
+
+#svc
+print "Service: <B>$svc</B>";
+
+print "<HR>";
+
+print qq!Mail to <B>!, ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ) , qq!</B>\@<B>$domain</B> forwards to <B>$username</B>\@$mydomain mailbox.!;
+
+print "<HR>";
+
+	#formatting
+	print <<END;
+
+  </BODY>
+</HTML>
+END
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 6feb45e3147c6b045d68cdfaf13b3466e94b2bc5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 26 Jul 1998 21:32:39 +0000
Subject: Initial revision

---
 htdocs/search/svc_acct_sm.cgi | 128 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100755 htdocs/search/svc_acct_sm.cgi

diff --git a/htdocs/search/svc_acct_sm.cgi b/htdocs/search/svc_acct_sm.cgi
new file mode 100755
index 000000000..3b1a4cf4e
--- /dev/null
+++ b/htdocs/search/svc_acct_sm.cgi
@@ -0,0 +1,128 @@
+#!/usr/bin/perl -Tw
+#
+# svc_acct_sm.cgi: Search for domains (process form)
+#
+# Usage: post form to:
+#        http://server.name/path/svc_domain.cgi
+#
+# Note: Should be run setuid freeside as user nobody.
+#
+# ivan@voicenet.com 96-mar-5
+#
+# need to look at table in results to make it more readable
+#
+# ivan@voicenet.com
+#
+# rewrite ivan@sisd.com 98-mar-15
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+
+use strict;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+
+my($conf_domain)="/var/spool/freeside/conf/domain";
+open(DOMAIN,$conf_domain) or die "Can't open $conf_domain: $!";
+my($mydomain)=map {
+  /^(.*)$/ or die "Illegal line in $conf_domain!"; #yes, we trust the file
+  $1
+} grep $_ !~ /^(#|$)/, <DOMAIN>;
+close DOMAIN;
+
+my($req)=new CGI::Request; # create form object
+&cgisuidsetup($req->cgi);
+
+$req->param('domuser') =~ /^([a-z0-9_\-]{0,32})$/;
+my($domuser)=$1;
+
+$req->param('domain') =~ /^([\w\-\.]+)$/ or die "Illegal domain";
+my($svc_domain)=qsearchs('svc_domain',{'domain'=>$1})
+  or die "Unknown domain";
+my($domsvc)=$svc_domain->svcnum;
+
+my(@svc_acct_sm);
+if ($domuser) {
+  @svc_acct_sm=qsearch('svc_acct_sm',{
+    'domuser' => $domuser,
+    'domsvc'  => $domsvc,
+  });
+} else {
+  @svc_acct_sm=qsearch('svc_acct_sm',{'domsvc' => $domsvc});
+}
+
+if ( scalar(@svc_acct_sm) == 1 ) {
+  my($svcnum)=$svc_acct_sm[0]->svcnum;
+  $req->cgi->redirect("../view/svc_acct_sm.cgi?$svcnum");  #redirect
+} elsif ( scalar(@svc_acct_sm) > 1 ) {
+  CGI::Base::SendHeaders();
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Mail Alias Search Results</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H4>Mail Alias Search Results</H4>
+    <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
+      <TR>
+        <TH>Mail to<BR><FONT SIZE=-2>(click here to view mail alias)</FONT></TH>
+        <TH>Forwards to<BR><FONT SIZE=-2>(click here to view account)</FONT></TH>
+      </TR>
+END
+
+  my($svc_acct_sm);
+  foreach $svc_acct_sm (@svc_acct_sm) {
+    my($svcnum,$domuser,$domuid,$domsvc)=(
+      $svc_acct_sm->svcnum,
+      $svc_acct_sm->domuser,
+      $svc_acct_sm->domuid,
+      $svc_acct_sm->domsvc,
+    );
+    my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$domsvc});
+    my($domain)=$svc_domain->domain;
+    my($svc_acct)=qsearchs('svc_acct',{'uid'=>$domuid});
+    my($username)=$svc_acct->username;
+    my($svc_acct_svcnum)=$svc_acct->svcnum;
+
+    print <<END;
+<TR>\n        <TD> <A HREF="../view/svc_acct_sm.cgi?$svcnum">
+END
+
+    print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
+
+    print <<END;
+\@$domain</A> </TD>\n
+<TD> <A HREF="../view/svc_acct.cgi?$svc_acct_svcnum">$username\@$mydomain</A> </TD>\n      </TR>\n
+END
+
+  }
+
+  print <<END;
+      </TABLE>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
+} else { #error
+  CGI::Base::SendHeaders(); # one guess
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Mail Alias Search Error</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H3>Mail Alias Search Error</H3>
+    <HR>
+    Mail Alias not found.
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
+}
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 91eaf0c699150b81a1347e02826b5fa61ef27494 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 13 Aug 1998 01:04:57 +0000
Subject: Initial revision

---
 htdocs/docs/CGI-modules-2.76-patch.txt | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100755 htdocs/docs/CGI-modules-2.76-patch.txt

diff --git a/htdocs/docs/CGI-modules-2.76-patch.txt b/htdocs/docs/CGI-modules-2.76-patch.txt
new file mode 100755
index 000000000..55b50bbbe
--- /dev/null
+++ b/htdocs/docs/CGI-modules-2.76-patch.txt
@@ -0,0 +1,23 @@
+ivan@rootwood:~/src/CGI-modules-2.76/CGI$ diff -c Base.pm Base.pm.orig 
+*** Base.pm     Sat Jul 18 00:33:21 1998
+--- Base.pm.orig        Sat Jul 18 00:06:12 1998
+***************
+*** 938,945 ****
+      my $orig_uri = $self->get_uri;
+      $self->log("Redirecting $CGI::Base::REQUEST_METHOD $orig_uri to $to_uri")
+        if $Debug;
+!     my $msg =   ($perm) ? StatusHdr(301,"Moved Permanently")
+!                       : StatusHdr(302,"Moved Temporarily");
+      my $hdrs = SendHeaders($msg, LocationHdr($to_uri));
+      $self->log($hdrs);
+  }
+--- 938,945 ----
+      my $orig_uri = $self->get_uri;
+      $self->log("Redirecting $CGI::Base::REQUEST_METHOD $orig_uri to $to_uri")
+        if $Debug;
+!     my $msg =   ($perm) ? ServerHdr(301,"Moved Permanently")
+!                       : ServerHdr(302,"Moved Temporarily");
+      my $hdrs = SendHeaders($msg, LocationHdr($to_uri));
+      $self->log($hdrs);
+  }
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 9e5d78000590c1d114bf833ed20c6c7def4a8767 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 13 Aug 1998 03:55:36 +0000
Subject: Initial revision

---
 Artistic | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)
 create mode 100644 Artistic

diff --git a/Artistic b/Artistic
new file mode 100644
index 000000000..4ffc78e97
--- /dev/null
+++ b/Artistic
@@ -0,0 +1,125 @@
+                      The "Artistic License"
+
+                             Preamble
+
+The intent of this document is to state the conditions under which a
+Package may be copied, such that the Copyright Holder maintains some
+semblance of artistic control over the development of the Package,
+while giving the users of the package the right to use and distribute
+the Package in a more-or-less customary fashion, plus the right to make
+reasonable modifications.
+
+It also grants you the rights to reuse parts of a Package in your own
+programs without transferring this License to those programs, provided
+that you meet some reasonable requirements.
+
+Definitions:
+
+        "Package" refers to the collection of files distributed by the
+        Copyright Holder, and derivatives of that collection of files
+        created through textual modification.
+
+        "Standard Version" refers to such a Package if it has not been
+        modified, or has been modified in accordance with the wishes
+        of the Copyright Holder as specified below.
+
+        "Copyright Holder" is whoever is named in the copyright or
+        copyrights for the package.
+
+        "You" is you, if you're thinking about copying or distributing
+        this Package.
+
+        "Reasonable copying fee" is whatever you can justify on the
+        basis of media cost, duplication charges, time of people involved,
+        and so on.  (You will not be required to justify it to the
+        Copyright Holder, but only to the computing community at large
+        as a market that must bear the fee.)
+
+        "Freely Available" means that no fee is charged for the item
+        itself, though there may be fees involved in handling the item.
+        It also means that recipients of the item may redistribute it
+        under the same conditions they received it.
+
+1. You may make and give away verbatim copies of the source form of the
+Standard Version of this Package without restriction, provided that you
+duplicate all of the original copyright notices and associated disclaimers.
+
+2. You may apply bug fixes, portability fixes and other modifications
+derived from the Public Domain or from the Copyright Holder.  A Package
+modified in such a way shall still be considered the Standard Version.
+
+3. You may otherwise modify your copy of this Package in any way, provided
+that you insert a prominent notice in each changed file stating how and
+when you changed that file, and provided that you do at least ONE of the
+following:
+
+    a) place your modifications in the Public Domain or otherwise make them
+    Freely Available, such as by posting said modifications to Usenet or
+    an equivalent medium, or placing the modifications on a major archive
+    site such as uunet.uu.net, or by allowing the Copyright Holder to include
+    your modifications in the Standard Version of the Package.
+
+    b) use the modified Package only within your corporation or organization.
+
+    c) rename any non-standard executables so the names do not conflict
+    with standard executables, which must also be provided, and provide
+    a separate manual page for each non-standard executable that clearly
+    documents how it differs from the Standard Version.
+
+    d) make other distribution arrangements with the Copyright Holder.
+
+4. You may distribute the programs of this Package in object code or
+executable form, provided that you do at least ONE of the following:
+
+    a) distribute a Standard Version of the executables and library files,
+    together with instructions (in the manual page or equivalent) on where
+    to get the Standard Version.
+
+    b) accompany the distribution with the machine-readable source of
+    the Package with your modifications.
+
+    c) give non-standard executables non-standard names, and clearly
+    document the differences in manual pages (or equivalent), together
+    with instructions on where to get the Standard Version.
+
+    d) make other distribution arrangements with the Copyright Holder.
+
+5. You may charge a reasonable copying fee for any distribution of this
+Package.  You may charge any fee you choose for support of this
+Package.  You may not charge a fee for this Package itself.  However,
+you may distribute this Package in aggregate with other (possibly
+commercial) programs as part of a larger (possibly commercial) software
+distribution provided that you do not advertise this Package as a
+product of your own.
+
+6. The scripts and library files supplied as input to or produced as
+output from the programs of this Package do not automatically fall
+under the copyright of this Package, but belong to whomever generated
+them, and may be sold commercially, and may be aggregated with this
+Package.  If such scripts or library files are aggregated with this
+Package via the so-called "undump" or "unexec" methods of producing a
+binary executable image, then distribution of such an image shall
+neither be construed as a distribution of this Package nor shall it
+fall under the restrictions of Paragraphs 3 and 4, provided that you do
+not represent such an executable image as a Standard Version of this
+Package.
+
+7. You may reuse parts of this Package in your own programs, provided that
+you explicitly state where you got them from, in the source code (and, left
+to your courtesy, in the documentation), duplicating all the associated
+copyright notices and disclaimers. Besides your changes, if any, must be
+clearly marked as such. Parts reused that way will no longer fall under this
+license if, and only if, the name of your program(s) have no immediate
+connection with the name of the Package itself or its associated programs.
+You may then apply whatever restrictions you wish on the reused parts or
+choose to place them in the Public Domain--this will apply only within the
+context of your package.
+
+8. The name of the Copyright Holder may not be used to endorse or promote
+products derived from this software without specific prior written permission.
+
+9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+                                The End
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From c3d0d65a26090cf6d7a5bd90abc5c7d256b19d37 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 13 Aug 1998 04:15:02 +0000
Subject: Initial revision

---
 htdocs/docs/upgrade.html | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 htdocs/docs/upgrade.html

diff --git a/htdocs/docs/upgrade.html b/htdocs/docs/upgrade.html
new file mode 100644
index 000000000..d2201f601
--- /dev/null
+++ b/htdocs/docs/upgrade.html
@@ -0,0 +1,24 @@
+<head>
+  <title>Upgrading to 1.1.x</title>
+</head>
+<body>
+<h1>Upgrading to 1.1.x</h1>
+<ul>
+  <li>Back up your data and current Freeside installation.
+  <li>Unpack a copy of the 1.0.0 distribution in a separate location.
+  <li>Diff your current installation against the 1.0.0 distribution.
+  <li>Apply all the diffs you found above, if applicable.
+  <li>Apply (at least) the following changes to your database:
+<pre>
+ALTER TABLE cust_main CHANGE ss ss char(11) NULL;
+ALTER TABLE cust_main CHANGE day daytime varchar(20) NULL;
+ALTER TABLE svc_acct CHANGE password _password varchar(25) NOT NULL;
+ALTER TABLE part_svc CHANGE svc_acct__password svc_acct___password varchar(25) NULL;
+ALTER TABLE part_svc CHANGE svc_acct__password_flag svc_acct___password_flag char(1) NULL;
+ALTER TABLE agent_type CHANGE type atype varchar(80) NOT NULL;
+</pre>
+  <li>Optionally change the field lengths and types to match a 1.1.x install; see `bin/fs-setup'.
+  <li>Create the necessary <a href="config.html">configuration files</a>,
+  <li>Copy or symlink htdocs and site_perl to the new 1.1.x copies.
+  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
+</body>
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 662e0b57defc3d9a3611e804687a3d56514b6151 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Aug 1998 22:11:55 +0000
Subject: Initial revision

---
 bin/svc_acct_sm.export | 221 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 221 insertions(+)
 create mode 100755 bin/svc_acct_sm.export

diff --git a/bin/svc_acct_sm.export b/bin/svc_acct_sm.export
new file mode 100755
index 000000000..c2ec1e53f
--- /dev/null
+++ b/bin/svc_acct_sm.export
@@ -0,0 +1,221 @@
+#!/usr/bin/perl -Tw
+#
+# Create and export VoiceNet_quasar.m4
+#
+# ivan@voicenet.com late oct 96
+#
+# change priority (after copies) to 19, not 10
+# ivan@voicenet.com 97-feb-5
+#
+# put file in different place and run different script, as per matt and
+# mohamed
+# ivan@voicenet.com 97-mar-10
+#
+# added exit if stuff is already locked ivan@voicenet.com 97-apr-15
+#
+# removed mail2
+# ivan@voicenet.com 97-jul-10
+#
+# rewrote lots of the bits, now exports qmail "virtualdomain",
+# "recipientmap" and "rcpthosts" files as well
+#
+# ivan@voicenet.com 97-sep-4
+#
+# adds ".extra" files
+#
+# ivan@voicenet.com 97-sep-29
+#
+# added ".pp" files, ugh.
+#
+# ivan@voicenet.com 97-oct-1
+#
+# rewrite ivan@sisd.com 98-mar-9
+#
+# now can create .qmail-default files ivan@sisd.com 98-mar-10
+#
+# put example $my_domain declaration in ivan@sisd.com 98-mar-23
+#
+# /var/spool/freeside/conf and sendmail updates ivan@sisd.com 98-aug-14
+
+use strict;
+use Fcntl qw(:flock);
+use FS::SSH qw(ssh scp);
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch qsearchs);
+
+my($conf_shellm)="/var/spool/freeside/conf/shellmachine";
+my($fqmailmachines)="/var/spool/freeside/conf/qmailmachines";
+my($shellmachine);
+my(@qmailmachines);
+if ( -e $fqmailmachines ) {
+  open(SHELLMACHINE,$conf_shellm) or die "Can't open $conf_shellm: $!";
+  <SHELLMACHINE> =~ /^([\w\.\-]+)$/ or die "Illegal $conf_shellm";
+  $shellmachine = $1;
+  close SHELLMACHINE;
+  open(QMAILMACHINES,$fqmailmachines);
+  @qmailmachines=map {
+    /^(.*)$/ or die "Illegal line in conf/qmailmachines"; #we trust the file
+    $1;
+  } grep $_ !~ /^(#|$)/, <QMAILMACHINES>;
+  close QMAILMACHINES;
+}
+
+my($fsendmailmachines)="/var/spool/freeside/conf/sendmailmachines";
+my(@sendmailmachines);
+if ( -e $fsendmailmachines ) {
+  open(SENDMAILMACHINES,$fsendmailmachines);
+  @sendmailmachines=map {
+    /^(.*)$/ or die "Illegal line in conf/sendmailmachines"; #we trust the file
+    $1;
+  } grep $_ !~ /^(#|$)/, <SENDMAILMACHINES>;
+  close SENDMAILMACHINES;
+}
+
+my($conf_domain)="/var/spool/freeside/conf/domain";
+open(DOMAIN,$conf_domain) or die "Can't open $conf_domain: $!";
+my($mydomain)=map {
+  /^(.*)$/ or die "Illegal line in $conf_domain!"; #yes, we trust the file
+  $1
+} grep $_ !~ /^(#|$)/, <DOMAIN>;
+close DOMAIN;
+
+my($spooldir)="/var/spool/freeside/export";
+my($spoollock)="/var/spool/freeside/svc_acct_sm.export.lock";
+
+adminsuidsetup;
+umask 066;
+
+open(EXPORT,"+>>$spoollock") or die "Can't open $spoollock: $!";
+select(EXPORT); $|=1; select(STDOUT);
+unless ( flock(EXPORT,LOCK_EX|LOCK_NB) ) {
+  seek(EXPORT,0,0);
+  my($pid)=<EXPORT>;
+  chop($pid);
+  #no reason to start locks of blocking processes
+  die "Is another export process running under pid $pid?\n";
+}
+seek(EXPORT,0,0);
+print EXPORT $$,"\n";
+
+my(@svc_acct_sm)=qsearch('svc_acct_sm',{});
+
+( open(RCPTHOSTS,">$spooldir/rcpthosts")
+  and flock(RCPTHOSTS,LOCK_EX|LOCK_NB) 
+) or die "Can't open $spooldir/rcpthosts: $!";
+( open(RECIPIENTMAP,">$spooldir/recipientmap") 
+  and flock(RECIPIENTMAP,LOCK_EX|LOCK_NB) 
+) or die "Can't open $spooldir/recipientmap: $!";
+( open(VIRTUALDOMAINS,">$spooldir/virtualdomains") 
+  and flock(VIRTUALDOMAINS,LOCK_EX|LOCK_NB)
+) or die "Can't open $spooldir/virtualdomains: $!";
+( open(VIRTUSERTABLE,">$spooldir/virtusertable")
+  and flock(VIRTUSERTABLE,LOCK_EX|LOCK_NB)
+) or die "Can't open $spooldir/virtusertable: $!";
+( open(SENDMAIL_CW,">$spooldir/sendmail.cw")
+  and flock(SENDMAIL_CW,LOCK_EX|LOCK_NB)
+) or die "Can't open $spooldir/sendmail.cw: $!";
+
+setpriority(0,0,10);
+
+my($svc_domain,%domain);
+foreach $svc_domain ( qsearch('svc_domain',{}) ) {
+  my($domain)=$svc_domain->domain;
+  $domain{$svc_domain->svcnum}=$domain;
+  print RCPTHOSTS "$domain\n.$domain\n";
+  print SENDMAIL_CW "$domain\n";
+}
+
+my(@sendmail);
+
+my($svc_acct_sm);
+foreach $svc_acct_sm ( qsearch('svc_acct_sm') ) { 
+  my($domsvc,$domuid,$domuser)=(
+    $svc_acct_sm->domsvc,
+    $svc_acct_sm->domuid,
+    $svc_acct_sm->domuser,
+  );
+  my($domain)=$domain{$domsvc};
+  my($svc_acct)=qsearchs('svc_acct',{'uid'=>$domuid});
+  my($username,$dir,$uid,$gid)=(
+    $svc_acct->username,
+    $svc_acct->dir,
+    $svc_acct->uid,
+    $svc_acct->gid,
+  );
+  next unless $username && $domain && $domuser;
+
+  if ($domuser eq '*') {
+    push @sendmail, "\@$domain\t$username\n";
+    print VIRTUALDOMAINS "$domain:$username-$domain\n",
+                         ".$domain:$username-$domain\n",
+    ;
+    ###
+    # qmail
+    ssh("root\@$shellmachine",
+      "[ -e $dir/.qmail-default ] || { touch $dir/.qmail-default; chown $uid:$gid $dir/.qmail-default; }"
+    ) if ( $shellmachine && $dir && $uid );
+
+  } else {
+    print VIRTUSERTABLE "$domuser\@$domain\t$username\n";
+    print RECIPIENTMAP "$domuser\@$domain:$username\@$mydomain\n";
+  }
+
+  print VIRTUSERTABLE @sendmail;
+
+}
+
+chmod 0644, "$spooldir/sendmail.cw",
+            "$spooldir/virtusertable",
+            "$spooldir/rcpthosts",
+            "$spooldir/recipientmap",
+            "$spooldir/virtualdomains",
+;
+
+flock(SENDMAIL_CW,LOCK_UN);
+flock(VIRTUSERTABLE,LOCK_UN);
+flock(RCPTHOSTS,LOCK_UN);
+flock(RECIPIENTMAP,LOCK_UN);
+flock(VIRTUALDOMAINS,LOCK_UN);
+
+close SENDMAIL_CW;
+close VIRTUSERTABLE;
+close RCPTHOSTS;
+close RECIPIENTMAP;
+close VIRTUALDOMAINS;
+
+###
+# export stuff
+#
+
+my($sendmailmachine);
+foreach $sendmailmachine (@sendmailmachines) {
+  scp("$spooldir/sendmail.cw","root\@$sendmailmachine:/etc/sendmail.cw.new")
+    == 0 or die "scp error: $!";
+  scp("$spooldir/virtusertable","root\@$sendmailmachine:/etc/virtusertable.new")
+    == 0 or die "scp error: $!";
+  ssh("root\@$sendmailmachine",
+    "( ".
+      "mv /etc/sendmail.cw.new /etc/sendmail.cw; ".
+      "mv /etc/virtusertable.new /etc/virtusertable; ".
+      #"/etc/init.d/sendmail restart; ".
+    " )"
+  )
+    == 0 or die "ssh error: $!";
+}
+
+my($qmailmachine);
+foreach $qmailmachine (@qmailmachines) {
+  scp("$spooldir/recipientmap","root\@$qmailmachine:/var/qmail/control/recipientmap")
+    == 0 or die "scp error: $!";
+  scp("$spooldir/virtualdomains","root\@$qmailmachine:/var/qmail/control/virtualdomains")
+    == 0 or die "scp error: $!";
+  scp("$spooldir/rcpthosts","root\@$qmailmachine:/var/qmail/control/rcpthosts")
+    == 0 or die "scp error: $!";
+  #ssh("root\@$qmailmachine","/etc/init.d/qmail restart")
+  #  == 0 or die "ssh error: $!";
+}
+
+unlink $spoollock;
+flock(EXPORT,LOCK_UN);
+close EXPORT;
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From e08286e81d6b3fd588c71103138e6f3218e21bc4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 16 Aug 1998 21:02:44 +0000
Subject: Initial revision

---
 bin/svc_acct.import | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 227 insertions(+)
 create mode 100755 bin/svc_acct.import

diff --git a/bin/svc_acct.import b/bin/svc_acct.import
new file mode 100755
index 000000000..c4b8c5ec5
--- /dev/null
+++ b/bin/svc_acct.import
@@ -0,0 +1,227 @@
+#!/usr/bin/perl -Tw
+#
+# ivan@sisd.com 98-mar-9
+#
+# changed 'password' field to '_password' because PgSQL 6.3 reserves this word
+#	bmccane@maxbaud.net  98-Apr-3
+#
+# generalized svcparts (still needs radius import) ivan@sisd.com 98-mar-23
+#
+# radius import, now an interactive script.  still needs erpcd import?
+# ivan@sisd.com 98-jun-24
+#
+# arbitrary radius attributes ivan@sisd.com 98-aug-9
+#
+# don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
+
+use strict;
+use vars qw(%part_svc);
+use Date::Parse;
+use FS::SSH qw(iscp);
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch);
+use FS::svc_acct;
+
+adminsuidsetup;
+
+#my($spooldir)="/var/spool/freeside/export";
+my($spooldir)="unix/";
+
+$FS::svc_acct::nossh_hack = 1;
+
+###
+
+%part_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_acct'});
+
+print "\n\n", &menu_svc, "\n", <<END;
+Most accounts probably have entries in passwd and users (with Port-Limit
+nonexistant or 1).
+END
+my($ppp_svcpart)=&getpart;
+
+print "\n\n", &menu_svc, "\n", <<END;
+Some accounts have entries in passwd and users, but with Port-Limit 2 (or
+more).
+END
+my($isdn_svcpart)=&getpart;
+
+print "\n\n", &menu_svc, "\n", <<END;
+Some accounts might have entries in users only (Port-Limit 1)
+END
+my($oppp_svcpart)=&getpart;
+
+print "\n\n", &menu_svc, "\n", <<END;
+Some accounts might have entries in users only (Port-Limit >= 2)
+END
+my($oisdn_svcpart)=&getpart;
+
+print "\n\n", &menu_svc, "\n", <<END;
+POP mail accounts have entries in passwd only, and have a particular shell.
+END
+print "Enter that shell: ";
+my($pop_shell)=&getvalue;
+my($popmail_svcpart)=&getpart;
+
+print "\n\n", &menu_svc, "\n", <<END;
+Everything else in passwd is a shell account.
+END
+my($shell_svcpart)=&getpart;
+
+print "\n\n", <<END;
+Enter the location and name of your _user_ passwd file, for example
+"mail.isp.com:/etc/passwd" or "nis.isp.com:/etc/global/passwd"
+END
+print ":";
+my($loc_passwd)=&getvalue;
+iscp("root\@$loc_passwd", "$spooldir/passwd.import");
+
+print "\n\n", <<END;
+Enter the location and name of your _user_ shadow file, for example
+"mail.isp.com:/etc/shadow" or "bsd.isp.com:/etc/master.passwd"
+END
+print ":";
+my($loc_shadow)=&getvalue;
+iscp("root\@$loc_shadow", "$spooldir/shadow.import");
+
+print "\n\n", <<END;
+Enter the location and name of your radius "users" file, for example
+"radius.isp.com:/etc/raddb/users"
+END
+print ":";
+my($loc_users)=&getvalue;
+iscp("root\@$loc_users", "$spooldir/users.import");
+
+sub menu_svc {
+  ( join "\n", map "$_: ".$part_svc{$_}->svc, sort keys %part_svc ). "\n";
+}
+sub getpart {
+  print "Enter part number, or 0 for none: ";
+  &getvalue;
+}
+sub getvalue {
+  my($x)=scalar(<STDIN>);
+  chop $x;
+  $x;
+}
+
+print "\n\n";
+
+###
+
+open(PASSWD,"<$spooldir/passwd.import");
+open(SHADOW,"<$spooldir/shadow.import");
+open(USERS,"<$spooldir/users.import");
+
+my(%upassword,%ip,%allparam);
+my(%param,$username);
+while (<USERS>) {
+  chop;
+  next if /^$/;
+  if ( /^\S/ ) {
+    /^(\w+)\s+Password\s+=\s+"([^"]+)"(,\s+Expiration\s+=\s+"([^"]*")\s*)?$/
+      or die "1Unexpected line in users.import: $_";
+    my($password,$expiration);
+    ($username,$password,$expiration)=(lc($1),$2,$4);
+    $upassword{$username}=$password;
+    undef %param;
+  } else {
+    die "2Unexpected line in users.import: $_";
+  }
+  while (<USERS>) {
+    chop;
+    if ( /^\s*$/ ) {
+      $ip{$username}=$param{'radius_Framed_IP_Address'}||'0e0';
+      delete $param{'radius_Framed_IP_Address'};
+      $allparam{$username}={ %param };
+      last;
+    } elsif ( /^\s+([\w\-]+)\s=\s"?([\w\.\-\s]+)"?,?\s*$/ ) {
+      my($attribute,$value)=($1,$2);
+      $attribute =~ s/\-/_/g;
+      $param{'radius_'.$attribute}=$value;
+    } else {
+      die "3Unexpected line in users.import: $_";
+    }
+  }
+}
+#? incase there isn't a terminating blank line ?
+$ip{$username}=$param{'radius_Framed_IP_Address'}||'0e0';
+delete $param{'radius_Framed_IP_Address'};
+$allparam{$username}={ %param };
+
+my(%password);
+while (<SHADOW>) {
+  chop;
+  my($username,$password)=split(/:/);
+  $password{$username}=$password;
+}
+
+while (<PASSWD>) {
+  chop;
+  my($username,$x,$uid,$gid,$finger,$dir,$shell)=split(/:/);
+  my($password)=$upassword{$username} || $password{$username};
+
+  my($maxb)=${$allparam{$username}}{'radius_Port_Limit'};
+  my($svcpart);
+  if ( exists $upassword{$username} ) {
+    if ( $maxb >= 2 ) {
+      $svcpart = $isdn_svcpart
+    } elsif ( ! $maxb || $maxb == 1 ) {
+      $svcpart = $ppp_svcpart
+    } else {
+      die "Illegal Port-Limit in users ($username)!\n";
+    }
+  } elsif ( $shell eq $pop_shell ) {
+    $svcpart = $popmail_svcpart;
+  } else {
+    $svcpart = $shell_svcpart;
+  }
+
+  my($svc_acct) = create FS::svc_acct ({
+    'svcpart'  => $svcpart,
+    'username' => $username,
+    'password' => $password,
+    'uid'      => $uid,
+    'gid'      => $gid,
+    'finger'   => $finger,
+    'dir'      => $dir,
+    'shell'    => $shell,
+    'slipip'   => $ip{$username},
+    %{$allparam{$username}},
+  });
+  my($error);
+  $error=$svc_acct->insert;
+  die $error if $error;
+
+  delete $allparam{$username};
+  delete $upassword{$username};
+}
+
+#my($username);
+foreach $username ( keys %upassword ) {
+  my($password)=$upassword{$username};
+
+  my($maxb)=${$allparam{$username}}{'radius_Port_Limit'} || 0;
+  my($svcpart);
+  if ( $maxb == 2 ) {
+    $svcpart = $oisdn_svcpart
+  } elsif ( ! $maxb || $maxb == 1 ) {
+    $svcpart = $oppp_svcpart
+  } else {
+    die "Illegal Port-Limit in users!\n";
+  }
+
+  my($svc_acct) = create FS::svc_acct ({
+    'svcpart'  => $svcpart,
+    'username' => $username,
+    'password' => $password,
+    'slipip'   => $ip{$username},
+    %{$allparam{$username}},
+  });
+  my($error);
+  $error=$svc_acct->insert;
+  die $error, if $error;
+
+  delete $allparam{$username};
+  delete $upassword{$username};
+}
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From aec30c2e0ac37df10fe026d506593565a77d1c9d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 16 Aug 1998 21:41:13 +0000
Subject: Initial revision

---
 htdocs/search/svc_acct.cgi | 186 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 186 insertions(+)
 create mode 100755 htdocs/search/svc_acct.cgi

diff --git a/htdocs/search/svc_acct.cgi b/htdocs/search/svc_acct.cgi
new file mode 100755
index 000000000..250a741db
--- /dev/null
+++ b/htdocs/search/svc_acct.cgi
@@ -0,0 +1,186 @@
+#!/usr/bin/perl -Tw
+#
+# svc_acct.cgi: Search for customers (process form)
+#
+# Usage: post form to:
+#        http://server.name/path/svc_acct.cgi
+#
+# Note: Should be run setuid freeside as user nobody.
+#
+# loosely (sp?) based on search/cust_main.cgi
+#
+# ivan@voicenet.com 96-jan-3 -> 96-jan-4
+#
+# rewrite (now does browsing too) ivan@sisd.com 98-mar-9
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# show unlinked accounts ivan@sisd.com 98-jun-22
+#
+# use FS::CGI, show total ivan@sisd.com 98-jul-17
+#
+# give service and customer info too ivan@sisd.com 98-aug-16
+
+use strict;
+use CGI::Request; # form processing module
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header idiot);
+
+my($req)=new CGI::Request; # create form object
+&cgisuidsetup($req->cgi);
+
+my(@svc_acct,$sortby);
+
+my($query)=$req->cgi->var('QUERY_STRING');
+#this tree is a little bit redundant
+if ( $query eq 'svcnum' ) {
+  $sortby=\*svcnum_sort;
+  @svc_acct=qsearch('svc_acct',{});
+} elsif ( $query eq 'username' ) {
+  $sortby=\*username_sort;
+  @svc_acct=qsearch('svc_acct',{});
+} elsif ( $query eq 'uid' ) {
+  $sortby=\*uid_sort;
+  @svc_acct=grep $_->uid ne '', qsearch('svc_acct',{});
+} elsif ( $query eq 'UN_svcnum' ) {
+  $sortby=\*svcnum_sort;
+  @svc_acct = grep qsearchs('cust_svc',{
+      'svcnum' => $_->svcnum,
+      'pkgnum' => '',
+    }), qsearch('svc_acct',{});
+} elsif ( $query eq 'UN_username' ) {
+  $sortby=\*username_sort;
+  @svc_acct = grep qsearchs('cust_svc',{
+      'svcnum' => $_->svcnum,
+      'pkgnum' => '',
+    }), qsearch('svc_acct',{});
+} elsif ( $query eq 'UN_uid' ) {
+  $sortby=\*uid_sort;
+  @svc_acct = grep qsearchs('cust_svc',{
+      'svcnum' => $_->svcnum,
+      'pkgnum' => '',
+    }), qsearch('svc_acct',{});
+} else {
+  &usernamesearch;
+}
+
+if ( scalar(@svc_acct) == 1 ) {
+  my($svcnum)=$svc_acct[0]->svcnum;
+  $req->cgi->redirect("../view/svc_acct.cgi?$svcnum");  #redirect
+  exit;
+} elsif ( scalar(@svc_acct) == 0 ) { #error
+  idiot("Account not found");
+  exit;
+} else {
+  my($total)=scalar(@svc_acct);
+  CGI::Base::SendHeaders(); # one guess
+  print header("Account Search Results",''), <<END;
+    $total matching accounts found
+    <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
+      <TR>
+        <TH>Service #</TH>
+        <TH>Username</TH>
+        <TH>UID</TH>
+        <TH>Service</TH>
+        <TH>Customer #</TH>
+        <TH>Contact name</TH>
+        <TH>Company</TH>
+      </TR>
+END
+
+  my($lines)=16;
+  my($lcount)=$lines;
+  my(%saw,$svc_acct);
+  foreach $svc_acct (
+    sort $sortby grep(!$saw{$_->svcnum}++, @svc_acct)
+  ) {
+    my $cust_svc = qsearchs('cust_svc', { 'svcnum' => $svc_acct->svcnum })
+      or die "No cust_svc record for svcnum ". $svc_acct->svcnum;
+    my $part_svc = qsearchs('part_svc', { 'svcpart' => $cust_svc->svcpart })
+      or die "No part_svc record for svcpart ". $cust_svc->svcpart;
+    my($cust_pkg,$cust_main);
+    if ( $cust_svc->pkgnum ) {
+      $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_svc->pkgnum })
+        or die "No cust_pkg record for pkgnum ". $cust_svc->pkgnum;
+      $cust_main = qsearchs('cust_main', { 'custnum' => $cust_pkg->custnum })
+        or die "No cust_main record for custnum ". $cust_pkg->custnum;
+    }
+    my($svcnum,$username,$uid,$svc,$custnum,$last,$first,$company)=(
+      $svc_acct->svcnum,
+      $svc_acct->getfield('username'),
+      $svc_acct->getfield('uid'),
+      $part_svc->svc,
+      $cust_svc->pkgnum ? $cust_main->custnum : '',
+      $cust_svc->pkgnum ? $cust_main->getfield('last') : '',
+      $cust_svc->pkgnum ? $cust_main->getfield('first') : '',
+      $cust_svc->pkgnum ? $cust_main->company : '',
+    );
+    my($pcustnum) = $custnum
+      ? "<A HREF=\"../view/cust_main.cgi?$custnum\"><FONT SIZE=-1>$custnum</FONT></A>"
+      : "<I>(unlinked)</I>"
+    ;
+    my($pname) = $custnum ? "$last, $first" : '';
+    print <<END;
+    <TR>
+      <TD><A HREF="../view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
+      <TD><FONT SIZE=-1>$username</FONT></TD>
+      <TD><FONT SIZE=-1>$uid</FONT></TD>
+      <TD><FONT SIZE=-1>$svc</FONT></TH>
+      <TD><FONT SIZE=-1>$pcustnum</FONT></TH>
+      <TD><FONT SIZE=-1>$pname<FONT></TH>
+      <TD><FONT SIZE=-1>$company</FONT></TH>
+    </TR>
+END
+    if ($lcount-- == 0) { # lots of little tables instead of one big one
+      $lcount=$lines;
+      print <<END;   
+  </TABLE>
+  <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
+    <TR>
+      <TH>Service #</TH>
+      <TH>Userame</TH>
+      <TH>UID</TH>
+        <TH>Service</TH>
+        <TH>Customer #</TH>
+        <TH>Contact name</TH>
+        <TH>Company</TH>
+    </TR>
+END
+    }
+  }
+ 
+  print <<END;
+    </TABLE>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+  exit;
+
+}
+
+sub svcnum_sort {
+  $a->getfield('svcnum') <=> $b->getfield('svcnum');
+}
+
+sub username_sort {
+  $a->getfield('username') cmp $b->getfield('username');
+}
+
+sub uid_sort {
+  $a->getfield('uid') <=> $b->getfield('uid');
+}
+
+sub usernamesearch {
+
+  $req->param('username') =~ /^([\w\d\-]{2,8})$/; #untaint username_text
+  my($username)=$1;
+
+  @svc_acct=qsearch('svc_acct',{'username'=>$username});
+
+}
+
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 09a1086ecc936117027e8fb6f015dbc038449316 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Aug 1998 04:42:04 +0000
Subject: Initial revision

---
 eg/TEMPLATE_cust_main.import | 189 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 189 insertions(+)
 create mode 100755 eg/TEMPLATE_cust_main.import

diff --git a/eg/TEMPLATE_cust_main.import b/eg/TEMPLATE_cust_main.import
new file mode 100755
index 000000000..39a5785db
--- /dev/null
+++ b/eg/TEMPLATE_cust_main.import
@@ -0,0 +1,189 @@
+#!/usr/bin/perl -w
+
+# Template for importing legacy customer data
+#
+# ivan@sisd.com 98-aug-17 - 20
+
+use strict;
+use FS::UID qw(adminsuidsetup datasrc);
+use FS::Record qw(fields qsearch qsearchs);
+use FS::cust_main;
+use FS::cust_pkg;
+use Date::Parse;
+
+adminsuidsetup;
+
+# use these for the imported cust_main records (unless you have these in legacy
+# data)
+my($agentnum)=4;
+my($refnum)=5;
+
+# map from legacy billing data to pkgpart, maps imported field
+# LegacyBillingData to pkgpart.  your names and pkgparts will be different
+my(%pkgpart)=(
+  'Employee'          => 10,
+  'Business'          => 11,
+  'Individual'        => 12,
+  'Basic PPP'         => 13,
+  'Slave'             => 14,
+  'Co-Located Server' => 15,
+  'Virtual Web'       => 16,
+  'Perk Mail'         => 17,
+  'Credit Hold'       => 18,
+);
+
+my($file)="legacy_file";
+
+open(CLIENT,$file) 
+  or die "Can't open $file: $!"; 
+
+# put a tab-separated header atop the file, or define @fields
+#   (use these names or change them below)
+#
+# for cust_main
+#   custnum - unique
+#   last - (name)
+#   first - (name)
+#   company
+#   address1
+#   address2
+#   city
+#   state
+#   zip
+#   country
+#   daytime - (phone)
+#   night - (phone)
+#   fax
+#   payby - CARD, BILL or COMP
+#   payinfo - Credit card #, P.O. # or COMP authorization
+#   paydate - Expiration
+#   tax - 'Y' for tax exempt
+# for cust_pkg
+#   LegacyBillingData - maps via %pkgpart above to a pkgpart
+# for svc_acct
+#   username
+
+my($header);
+$header=<CLIENT>;
+chop $header;
+my(@fields)=map { /^\s*(.*[^\s]+)\s*$/; $1 } split(/\t/,$header);
+#print join("\n",@fields);
+
+my($error);
+my($link,$line)=(0,0);
+while (<CLIENT>) {
+  chop; 
+  next if /^[\s\t]*$/; #skip any blank lines
+
+  #define %svc hash for this record
+  my(@record)=split(/\t/);
+  my(%svc);
+  foreach (@fields) {
+    $svc{$_}=shift @record;   
+  }
+
+  # might need to massage some data like this
+  $svc{'payby'} =~ s/^Credit Card$/CARD/io;
+  $svc{'payby'} =~ s/^Check$/BILL/io;
+  $svc{'payby'} =~ s/^Cash$/BILL/io;
+  $svc{'payby'} =~ s/^$/BILL/o;
+  $svc{'First'} =~ s/&/and/go; 
+  $svc{'Zip'} =~ s/\s+$//go;
+
+  my($cust_main) = create FS::cust_main ( {
+    'custnum'  => $svc{'custnum'},
+    'agentnum' => $agentnum,
+    'last'     => $svc{'last'},
+    'first'    => $svc{'first'},
+    'company'  => $svc{'company'},
+    'address1' => $svc{'address1'},
+    'address2' => $svc{'address2'},
+    'city'     => $svc{'city'},
+    'state'    => $svc{'state'},
+    'zip'      => $svc{'zip'},
+    'country'  => $svc{'country'},
+    'daytime'  => $svc{'daytime'},
+    'night'    => $svc{'night'},
+    'fax'      => $svc{'fax'},
+    'payby'    => $svc{'payby'},
+    'payinfo'  => $svc{'payinfo'},
+    'paydate'  => $svc{'paydate'},
+    'payname'  => $svc{'payname'},
+    'tax'      => $svc{'tax'},
+    'refnum'   => $refnum,
+  } );
+
+  $error=$cust_main->insert;
+
+  if ( $error ) {
+    warn $cust_main->_dump;
+    warn map "$_: ". $svc{$_}. "|\n", keys %svc;
+    die $error;
+  }
+
+  my($cust_pkg)=create FS::cust_pkg ( {
+    'custnum' => $svc{'custnum'},
+    'pkgpart' => $pkgpart{$svc{'LegacyBillingData'}},
+    'setup'   => '', 
+    'bill'    => '',
+    'susp'    => '',
+    'expire'  => '',
+    'cancel'  => '',
+  } );
+
+  $error=$cust_pkg->insert;
+  if ( $error ) {
+    warn $svc{'LegacyBillingData'};
+    die $error;
+  }
+
+  unless ( $svc{'username'} ) {
+    warn "Empty login";
+  } else {
+    #find svc_acct record (imported with bin/svc_acct.import) for this username
+    my($svc_acct)=qsearchs('svc_acct',{'username'=>$svc{'username'}});
+    unless ( $svc_acct ) {
+      warn "username ", $svc{'username'}, " not found\n";
+    } else {
+      #link to the cust_pkg record we created above
+
+      #find cust_svc record for this svc_acct record
+      my($o_cust_svc)=qsearchs('cust_svc',{
+        'svcnum' => $svc_acct->svcnum,
+        'pkgnum' => '',
+      } );
+      unless ( $o_cust_svc ) {
+        warn "No unlinked cust_svc for svcnum ", $svc_acct->svcnum;
+      } else {
+
+        #make sure this svcpart is in pkgpart
+        my($pkg_svc)=qsearchs('pkg_svc',{
+          'pkgpart'  => $pkgpart{$svc{'LegacyBillingData'}},
+          'svcpart'  => $o_cust_svc->svcpart,
+          'quantity' => 1,
+        });
+        unless ( $pkg_svc ) {
+          warn "login ", $svc{'username'}, ": No svcpart ", $o_cust_svc->svcpart,
+               " for pkgpart ", $pkgpart{$svc{'Acct. Type'}}, "\n" ;
+        } else {
+
+          #create new cust_svc record linked to cust_pkg record 
+          my($n_cust_svc) = create FS::cust_svc ({
+            'svcnum'  => $o_cust_svc->svcnum,
+            'pkgnum'  => $cust_pkg->pkgnum,
+            'svcpart' => $pkg_svc->svcpart,
+          });
+          my($error) = $n_cust_svc->replace($o_cust_svc);
+          die $error if $error;
+          $link++;
+        }
+      }
+    }
+  }
+
+  $line++;
+
+}
+
+warn "\n$link of $line lines linked\n";
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From c37abb6f18dc66836dfcafe8e3eb106747f84038 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 23 Aug 1998 23:19:48 +0000
Subject: Initial revision

---
 htdocs/docs/admin.html | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 htdocs/docs/admin.html

diff --git a/htdocs/docs/admin.html b/htdocs/docs/admin.html
new file mode 100644
index 000000000..8adddbe92
--- /dev/null
+++ b/htdocs/docs/admin.html
@@ -0,0 +1,6 @@
+<head>
+  <title>Administration</title>
+</head>
+<body>
+  <h1>Administration</h1>
+</body>
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From f5f9cb7c8d93868cb18a4ff00be8587ee9758af5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 23 Aug 1998 23:39:56 +0000
Subject: Initial revision

---
 htdocs/docs/legacy.html | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 htdocs/docs/legacy.html

diff --git a/htdocs/docs/legacy.html b/htdocs/docs/legacy.html
new file mode 100644
index 000000000..40e09cb3c
--- /dev/null
+++ b/htdocs/docs/legacy.html
@@ -0,0 +1,34 @@
+<head>
+  <title>Importing legacy data</title>
+</head>
+<body>
+  <h1>Importing legacy data</h1>
+<ul>
+  <li><a name="svc_acct">bin/svc_acct.import</a> - Import `passwd', ( `shadow' or `master.passwd' ) and RADIUS `users'.  Before running bin/svc_acct.import, you need <a href="http://rootwood.sisd.com/freeside/browse/part_svc.cgi">services</a> (with table svc_acct) as follows:
+    <ul>
+      <li>Most accounts probably have entries in passwd and users (with Port-Limit nonexistant or 1)
+      <li>Some accounts have entries in passwd and users, but with Port-Limit 2 (or more)
+      <li>Some accounts might have entries in users only (Port-Limit 1)
+      <li>Some accounts might have entries in users only (Port-Limit >= 2)
+      <li>POP mail accounts have entries in passwd only, and have a particular shell.
+      <li>Everything else in passwd is a shell account.
+    </ul>
+  <li><a name="svc_acct_sm">bin/svc_acct_sm.import</a> - Import qmail ( `virtualdomains' and `rcpthosts' ), or sendmail ( `virtusertable' and `sendmail.cw' ) files.  Before running bin/svc_acct_sm.import, you need <a href="http://rootwood.sisd.com/freeside/browse/part_svc.cgi">services</a> as follows:
+    <ul>
+      <li>Domain (table svc_acct)
+      <li>Mail alias (table svc_acct_sm)
+    </ul>
+  <li><a name="cust_main">Importing customer data</a>
+    <ul>
+      <li>Manually
+        <ul>
+          <li>Add a <a href="../edit/cust_main.cgi">new customer</a>
+          <li>Add one or more packages for this customer
+          <li>Enter a package by clicking on the package number
+          <li>Pick the `Link to existing' option
+        </ul>
+      <li>Batch - You will need to write a script to import your particular legacy data.  You can use eg/TEMPLATE_cust_main.import as a starting point.
+    </ul>
+</ul>
+</body>
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From cc60ec75f2f7ddbe0dca9292126adfc53e7b4e37 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 24 Aug 1998 02:01:19 +0000
Subject: Initial revision

---
 bin/bill | 188 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 188 insertions(+)
 create mode 100755 bin/bill

diff --git a/bin/bill b/bin/bill
new file mode 100755
index 000000000..5c5be703d
--- /dev/null
+++ b/bin/bill
@@ -0,0 +1,188 @@
+#!/usr/local/bin/perl -Tw
+#
+# bill: Bill customer(s)
+#
+# Usage: bill [ -c [ i ] ] [ -d 'date' ] [ -b ]
+#
+# Bills all customers.
+#
+# Adds record to /dbin/cust_bill and /dbin/cust_pay (if payment made -
+# CARD & COMP), prints invoice / charges card etc.
+#
+# -c: Turn on collecting (you probably want this).
+#
+# -i: real-time billing (as opposed to batch billing).  only relevant
+#     for credit cards.
+#
+# -d: Pretent it's 'date'.  Date is in any format Date::Parse is happy with,
+#     but be careful.
+#
+# ## n/a ## -b: send batch when done billing
+#
+# ivan@voicenet.com sep/oct 96
+#
+# separated billing and collections, cleaned up code.
+# ivan@voicenet.com 96-nov-11
+#
+# added -d option
+# ivan@voicenet.com 96-nov-13
+#
+# added -v option and started to implement it, added 'd:' to getopts call
+#  (oops!)
+# ivan@voicenet.com 97-jan-2
+#
+# added more debug messages, moved some searches to fssearch.pl library (for 
+# speed)
+# rewrote "all customer" finder to know about bill dates, for speed.
+# ivan@voicenet.com 97-jan-8
+#
+# thought about it a while, and removed passing of the -d option to collect...?
+# ivan@voicenet.com 97-jan-14
+#
+# make all -v stuff STDERR 
+# ivan@voicenet.com 97-feb-4
+#
+# added pkgnum as argument to program from /db/part_pkg, with kludge for the
+# "/bin/echo XX" 's already there.
+# ivan@voicenet.com 97-feb-23
+#
+# - general cleanup
+# - customers who are suspended can still be billed for the setup fee
+# - cust_pkg record is re-read after the package setup fee program is run.
+#   this way,
+#   that program can modify the record (for example, to start accounts off
+#   suspended)
+#   (best to think four or five times before modifying anything else!)
+# ivan@voicenet.com 97-feb-26
+#
+# don't bill recurring fee if its not time! (was removed)
+# ivan@voicenet.com 97-mar-6
+#
+# added -b option, send batch when done billing.
+# ivan@voicenet.com 97-apr-4
+#
+#insecure dependency on line 179ish below needs to be fixed before bill is
+#used setuid
+# ivan@voicenet.com 97-jun-2
+#
+# removed running of setup program (depriciated)
+# ivan@voicenet.com 97-jul-21
+#
+# rewrote for new API, removed option to specify custnums (use FS::Bill 
+# instead), removed -v option (?)
+# ivan@voicenet.com 97-jul-22 - 23 - 25 -28
+# (need to add back in email stuff, look in /home/ivan/old/dbin/collect)
+#
+# s/suidsetup/adminsuidsetup/, s/FS::Search/FS::Record/, added some batch
+# exporting stuff (which still needs to be generalized) and removed &idiot
+# ivan@sisd.com 98-may-27
+
+# setup
+
+use strict;
+use Fcntl qw(:flock);
+use Date::Parse;
+use Getopt::Std;
+use FS::UID qw(adminsuidsetup swapuid);
+use FS::Record qw(qsearch qsearchs);
+use FS::Bill;
+
+my($batchfile)="/var/spool/freeside/batch";
+my($batchlock)="/var/spool/freeside/batch.lock";
+
+adminsuidsetup;
+
+&untaint_argv;	#what it sounds like  (eww)
+use vars qw($opt_b $opt_c $opt_i $opt_d);
+getopts("bcid:");	#switches
+
+#we're at now now (and later).
+my($time)= $main::opt_d ? str2time($main::opt_d) : $^T;
+
+# find packages w/ bill < time && cancel != '', and create corresponding
+# customer objects
+
+my($cust_main,%saw);
+foreach $cust_main (
+  map {
+    if ( ( $_->getfield('bill') || 0 ) <= $time &&
+         !$saw{ $_->getfield('custnum') }++ ) {
+      qsearchs('cust_main',{'custnum'=> $_->getfield('custnum') } );
+    } else {
+      ();
+    }
+  } qsearch('cust_pkg',{'cancel'=>''})
+) {
+
+  # and bill them
+
+  print "Billing customer #" . $cust_main->getfield('custnum') . "\n";
+
+  bless($cust_main,"FS::Bill");
+
+  my($error);
+
+  $error=$cust_main->bill('time'=>$time);
+  warn "Error billing,  customer #" . $cust_main->getfield('custnum') . 
+    ":" . $error if $error;
+
+  if ($main::opt_c) {
+    $error=$cust_main->collect('invoice_time'=>$time,
+                               'batch_card' => $main::opt_i ? 'no' : 'yes',
+                              );
+    warn "Error collecting customer #" . $cust_main->getfield('custnum') .
+      ":" . $error if $error;
+
+  #sleep 1;
+
+  }
+
+}
+
+#if ($main::opt_b) {
+#
+#  die "Batch still waiting for reply? ($batchlock exists)\n" if -e $batchlock;
+#  open(BATCHLOCK,"+>>$batchlock") or die "Can't open $batchlock: $!";
+#  select(BATCHLOCK); $|=1; select(STDOUT);
+#  unless ( flock(BATCHLOCK,,LOCK_EX|LOCK_NB) ) {
+#    seek(BATCHLOCK,0,0);
+#    my($pid)=<BATCHLOCK>;
+#    chop($pid);
+#    die "Is a batch running? (pid $pid)\n";
+#  }
+#  seek(BATCHLOCK,0,0);
+#  print BATCHLOCK $$,"\n";
+#
+#  ( open(BATCH,">$batchfile")
+#    and flock(BATCH,LOCK_EX|LOCK_NB)
+#  ) or die "Can't open $batchfile: $!";
+#
+#  my($cust_pay_batch);
+#  foreach $cust_pay_batch (qsearch('cust_pay_batch',{})) {
+#    print BATCH join(':',
+#      $_->getfield('cardnum'),
+#      $_->getfield('exp'),
+#      $_->getfield('amount'),
+#      $_->getfield('payname')
+#        || $_->getfield('first'). ' '. $_->getfield('last'),
+#      "Description",
+#      $_->getfield('zip'),
+#    ),"\n";
+#  }
+#
+#  flock(BATCH,LOCK_UN);
+#  close BATCH;
+#
+#  flock(BATCHLOCK,LOCK_UN);
+#  close BATCHLOCK;
+#}
+
+# subroutines
+
+sub untaint_argv {
+  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
+    $ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
+    $ARGV[$_]=$1;
+  }
+}
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From a7ef58103f100935a0ed6a922183d6b26e0df437 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 24 Aug 1998 03:04:37 +0000
Subject: Initial revision

---
 fs_passwd/fs_passwd | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100755 fs_passwd/fs_passwd

diff --git a/fs_passwd/fs_passwd b/fs_passwd/fs_passwd
new file mode 100755
index 000000000..bcf09f1fe
--- /dev/null
+++ b/fs_passwd/fs_passwd
@@ -0,0 +1,129 @@
+#!/usr/bin/perl -Tw
+#
+# fs_passwd
+#
+# portions of this script are copied from the `passwd' script in the original
+# (perl 4) camel book, now archived at 
+# http://www.perl.com/CPAN/scripts/nutshell/ch6/passwd
+#
+# ivan@sisd.com 98-mar-8
+#
+# password lengths 0,255 instead of 6,8 - we'll let the server process
+# check the data ivan@sisd.com 98-jul-17
+
+use strict;
+use Getopt::Std;
+use Socket;
+use IO::Handle;
+use vars qw($opt_f $opt_s);
+
+my($fs_passwdd_socket)="/usr/local/freeside/fs_passwdd_socket";
+my($freeside_uid)=scalar(getpwnam('freeside'));
+
+$ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin';
+$ENV{'SHELL'} = '/bin/sh';
+$ENV{'IFS'} = " \t\n";
+$ENV{'CDPATH'} = '';
+$ENV{'ENV'} = '';
+$ENV{'BASH_ENV'} = '';
+
+$SIG{__DIE__}= sub { system '/bin/stty', 'echo'; };
+
+die "passwd program isn't running setuid to freeside\n" if $> != $freeside_uid;
+
+unshift @ARGV, "-f" if $0 =~ /chfn$/;
+unshift @ARGV, "-s" if $0 =~ /chsh$/;
+
+getopts('fs');
+
+my($me)='';
+if ( $_ = shift(@ARGV) ) {
+  /^(\w{2,8})$/;
+  $me = $1; 
+}
+die "You can't change the password for $me." if $me && $<;
+$me = (getpwuid($<))[0] unless $me;
+
+my($name,$passwd,$uid,$gid,$quota,$comment,$gcos,$dir,$shell)=
+  getpwnam $me;
+
+my($old_password,$new_password,$new_gecos,$new_shell);
+
+if ( $opt_f || $opt_s ) {
+  system '/bin/stty', '-echo';
+  print "Password:";
+  $old_password=<STDIN>;
+  system '/bin/stty', 'echo'; 
+  chop($old_password);
+  #$old_password =~ /^(.{6,8})$/ or die "\nIllegal password.\n";
+  $old_password =~ /^(.{0,255})$/ or die "\nIllegal password.\n";
+  $old_password = $1;
+
+  $new_password = '';
+
+  if ( $opt_f ) {
+    print "\nChanging gecos for $me.\n";
+    print "Gecos [", $gcos, "]: ";
+    $new_gecos=<STDIN>;
+    chop($new_gecos);
+    $new_gecos ||= $gcos;
+    $new_gecos =~ /^(.{0,255})$/ or die "\nIllegal gecos.\n";
+  } else {
+    $new_gecos = '';
+  } 
+
+  if ( $opt_s ) {
+    print "\nChanging shell for $me.\n";
+    print "Shell [", $shell, "]: ";
+    $new_shell=<STDIN>;
+    chop($new_shell);
+    $new_shell ||= $shell;
+    $new_shell =~ /^(.{0,255})$/ or die "\nIllegal shell.\n";
+  } else {
+    $new_shell = '';
+  }
+
+} else {
+
+  print "Changing password for $me.\n";
+  print "Old password:";
+  system '/bin/stty', '-echo';
+  $old_password=<STDIN>;
+  chop $old_password;
+  #$old_password =~ /^(.{6,8})$/ or die "\nIllegal password.\n";
+  $old_password =~ /^(.{0,255})$/ or die "\nIllegal password.\n";
+  $old_password = $1;
+  print "\nEnter the new password (minimum of 6, maximum of 8 characters)\n";
+  print "Please use a combination of upper and lowercase letters and numbers.\n";
+  print "New password:";
+  $new_password=<STDIN>;
+  chop($new_password);
+  #$new_password =~ /^(.{6,8})$/ or die "\nIllegal password.\n";
+  $new_password =~ /^(.{0,255})$/ or die "\nIllegal password.\n";
+  $new_password = $1;
+  print "\nRe-enter new password:";
+  my($check_new_password);
+  $check_new_password=<STDIN>;
+  chop($check_new_password);
+  die "\nThey don't match; try again.\n" unless $check_new_password eq $new_password;
+
+  $new_gecos='';
+  $new_shell='';
+}
+print "\n";
+
+system '/bin/stty', 'echo'; 
+
+socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+connect(SOCK, sockaddr_un($fs_passwdd_socket)) or die "connect: $!";
+print SOCK join("\n",$me,$old_password,$new_password,$new_gecos,$new_shell),"\n";
+SOCK->flush;
+my($error);
+$error = <SOCK>;
+chop $error;
+
+if ($error) {
+  print "\nUpdate error: $error\n";
+} else {
+  print "\nUpdate sucessful.\n";
+}
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 3875e36d98f803893af051b0f7e310bb2bb12320 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 24 Aug 1998 03:12:16 +0000
Subject: Initial revision

---
 fs_passwd/fs_passwd_server | 73 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100755 fs_passwd/fs_passwd_server

diff --git a/fs_passwd/fs_passwd_server b/fs_passwd/fs_passwd_server
new file mode 100755
index 000000000..99e7c4351
--- /dev/null
+++ b/fs_passwd/fs_passwd_server
@@ -0,0 +1,73 @@
+#!/usr/bin/perl -Tw
+#
+# fs_passwd_server
+#
+# portions of this script are copied from the `passwd' script in the original
+# (perl 4) camel book, now archived at 
+# http://www.perl.com/CPAN/scripts/nutshell/ch6/passwd
+#
+# ivan@sisd.com 98-mar-9
+#
+# crypt-aware, s/password/_password/; ivan@sisd.com 98-aug-23
+
+use strict;
+use IO::Handle;
+use FS::SSH qw(sshopen2);
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearchs);
+use FS::svc_acct;
+
+$SIG{CHLD} = sub { wait() };
+
+&adminsuidsetup; 
+
+my($fs_passwdd)="/usr/local/sbin/fs_passwdd";
+
+my($shellmachine)=shift;
+die "Usage: fs_passwd_server shellmachine\n" unless $shellmachine;
+
+while (1) {
+  my($reader,$writer)=(new IO::Handle, new IO::Handle);
+  $writer->autoflush(1);
+  sshopen2($shellmachine,$reader,$writer,$fs_passwdd);
+  while (1) {
+    my($username,$old_password,$new_password,$new_gecos,$new_shell);
+    defined($username=<$reader>) or last;
+    defined($old_password=<$reader>) or last; 
+    defined($new_password=<$reader>) or last; 
+    defined($new_gecos=<$reader>) or last; 
+    defined($new_shell=<$reader>) or last; 
+    chop($username);
+    chop($old_password);
+    chop($new_password);
+    chop($new_gecos);
+    chop($new_shell);
+    my($svc_acct);
+
+    #need to try both $old_password and encrypted $old_password
+    #maybe the crypt function in svc_acct.export needs to be a library?
+    my $salt = substr($old_password,0,2);
+    my $cold_password = crypt($old_password,$salt);
+    $svc_acct=qsearchs('svc_acct',{'username'=>$username,
+                                   '_password'=>$old_password,
+    } )
+           || qsearchs('svc_acct',{'username'=>$username,
+                                   '_password'=>$cold_password,
+    } );
+    unless ( $svc_acct ) { print $writer "Incorrect password.\n"; next; }
+
+    my(%hash)=$svc_acct->hash;
+    my($new_svc_acct) = create FS::svc_acct ( \%hash );
+    $new_svc_acct->setfield('_password',$new_password) 
+      if $new_password && $new_password ne $old_password;
+    $new_svc_acct->setfield('finger',$new_gecos) if $new_gecos;
+    $new_svc_acct->setfield('shell',$new_shell) if $new_shell;
+    my($error)=$new_svc_acct->replace($svc_acct);
+    print $writer $error,"\n";
+  }
+  close $writer;
+  close $reader;
+  sleep 60;
+  warn "Connection to $shellmachine lost!  Reconnecting...\n";
+}
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From f8e16874cdfff61799b77a69992d1204628f57cf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 24 Aug 1998 03:28:01 +0000
Subject: Initial revision

---
 htdocs/docs/passwd.html | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 htdocs/docs/passwd.html

diff --git a/htdocs/docs/passwd.html b/htdocs/docs/passwd.html
new file mode 100644
index 000000000..a8f8151e2
--- /dev/null
+++ b/htdocs/docs/passwd.html
@@ -0,0 +1,16 @@
+<head>
+  <title>fs_passwd</title>
+</head>
+<body>
+  <h1>fs_passwd</h1>
+You may use fs_passwd/fs_passwd as a "passwd", "chfn" and "chsh" replacement on your shell machine(s) to cause password, gecos and shell changes to update your freeside machine.  This can pose a security risk if not configured correctly.  <b>Do not use this feature unless you understand what you are doing!</b>
+<br><br>Currently it is assumed that the the crypt(3) function in the C library is the same on the Freeside machine as on the target machine.
+<ul>
+  <li>Create a freeside account on the shell machine(s).
+  <li>Append the identity.pub from the freeside user on your freeside machine to the authorized_keys file of the newly created freeside user on the shell machine(s).
+  <li>Copy fs_passwd/fs_passwd to /usr/local/bin on the shell machine(s).  (chown freeside, chmod 4755).  You may link it to passwd, chfn and chsh as well.
+  <li>Copy fs_passwd/fs_passwdd to /usr/local/sbin on the shell machine(s).  (chown freeside, chmod 500)
+  <li>Create /usr/local/freeside on the shell machine(s). (chown freeside, chmod 700)
+  <li>Run an iteration of "fs_passwd/fs_passwd_server shell.machine" as the freeside user for each shell machine (this is a daemon process).
+</ul>
+</body>
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From c2f38666a7aa746c560efcf64f72261ff8a1d2f2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 25 Aug 1998 21:51:05 +0000
Subject: Initial revision

---
 htdocs/docs/export.html | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 htdocs/docs/export.html

diff --git a/htdocs/docs/export.html b/htdocs/docs/export.html
new file mode 100644
index 000000000..f760b97dd
--- /dev/null
+++ b/htdocs/docs/export.html
@@ -0,0 +1,39 @@
+<head>
+  <title>File exporting</title>
+</head>
+<body>
+  <h1>File exporting</h1>
+  <ul>
+    <li>bin/svc_acct.export will create UNIX `passwd', `shadow' and `master.passwd' files, ERPCD `acp_passwd' and `acp_dialup' files and a RADIUS `users' file in the `/var/spool/freeside/export' directory.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattended; see below.
+      <ul>
+        <li>shellmachines - passwd and shadow are copied to the remote machine as /etc/passwd.new and /etc/shadow.net and then moved to /etc/passwd and /etc/shadow if no errors occur.
+        <li>bsdshellmachines - passwd and master.passwd are copied to the remote machine as /etc/passwd.new and /etc/master.passwd.new and moved to /etc/passwd and /etc/master.passwd if no errors occur.
+        <li>nismachines - passwd and shadow are copied to the `/etc/global' directory on the remote machine.  If no errors occur, the command `( cd /var/yp; make; )' is executed on the remote machine.
+        <li>erpcdmachines - acp_passwd and acp_dialup are copied to the `/usr/annex' directory on the remote machine.  If no errors occur, the command `( kill -USR1 `cat /usr/annex/erpcd.pid` )' is executed on the remote machine. 
+        <li>radiusmachines - users is copied to the `/etc/raddb' directory on the remote machine.  If no errors occur, the command `( builddbm )' is executed on the remote machine.
+      </ul>
+    <li>site_perl/svc_acct.pm - If a shellmachine is defined, users can be created, modified and deleted remotely; see below.
+      <ul>
+        <li>The command `useradd -d <i>homedir</i> -s <i>shell</i> -u <i>uid</i> <i>username</i>' is executed when a user is added.
+        <li>The command `userdel <i>username</i>' is executed with a user is deleted.
+        <li>If a user's home directory changes, the command `[ -d <i>old_homedir</i> &amp;&amp; ( chmod u+t <i>old_homedir</i>; umask 022; mkdir <i>new_homedir</i>; cd <i>old_homedir</i>; find . -depth -print | cpio -pdm <i>new_homedir</i>; chmod u-t <i>new_homedir</i>; chown -R <i>uid</i>.<i>gid</i> <i>new_homedir</i>; rm -rf <i>old_homedir</i> )' is executed.
+      </ul>
+    <li>bin/svc_acct_sm.export will create <a href="http://www.qmail.org">Qmail</a> `rcpthosts', `recipientmap' and `virtualdomains' files and <a href="http://www.sendmail.org">Sendmail</a> `virtusertable' and `sendmail.cw' files in the `/var/spool/freeside/export' directory.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattemded; see below.
+      <ul>
+        <li>qmailmachines - recipientmap, virtualdomains and rcpthosts are copied to the `/var/qmail/control' directory on the remote machine.  Note: If you <a href="legacy.html#svc_acct_sm">imported</a> qmail configuration files, run the generated `/var/spool/freeside/export/virtualdomains.FIX' on a machine with your user home directories before exporting qmail configuration files.
+        <li>shellmachine - The command `[ -e <i>homedir</i>/.qmail-default ] || { touch <i>homedir</i>/.qmail-default; chown <i>uid</i>.<i>gid</i> <i>homedir</i>/.qmail-default; }' will be run on this machine for users in the virtualdomains file.
+        <li>sendmailmachines - sendmail.cw and virtusertable are copied to the remote machine as /etc/sendmail.cw.new and /etc/virtusertable.new and moved to /etc/sendmail.cw and /etc/virtusertable if no errors occur.
+      </ul>
+    <li>site_perl/svc_acct_sm.pm - If the qmailmachines configuration file exists and a shellmachine is defined, user `.qmail-' files can be updated.
+      <ul>
+        <li>The command `[ -e <i>homedir</i>/.qmail-<i>domain</i>-default ] || { touch <i>homedir</i>/.qmail-<i>domain</i>-default; chown <i>uid</i>.<i>gid</i> <i>homedir</i>/.qmail-<i>domain</i>-default; }' is run.
+      </ul>
+  </ul>
+  <br><a name=ssh>Unattended remote login</a> - Freeside can login to remote machines unattended using SSH.  This can pose a security risk if not configured correctly, and will allow an intruder who breaks into your freeside machine full access to your remote machines.  <b>Do not use this feature unless you understand what you are doing!</b>
+    <ul>
+      <li>As the freeside user (on your freeside machine), generate an authentication key using <a href="http://www.tac.nyc.ny.us/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>.  Since this is for unattended operation, you need to use a blank passphrase.
+      <li>Append the newly-created identity.pub file to root's authorized_keys on the remote machine(s).
+    </ul>
+
+</body>
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 3c86cf59beb26bd3f8269a93ae1f641d88be53d1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 3 Sep 1998 02:00:49 +0000
Subject: Initial revision

---
 htdocs/browse/agent.cgi                         |  72 +++++
 htdocs/browse/agent_type.cgi                    |  81 ++++++
 htdocs/browse/cust_main_county.cgi              |  65 +++++
 htdocs/browse/part_pkg.cgi                      |  81 ++++++
 htdocs/browse/part_referral.cgi                 |  57 ++++
 htdocs/browse/part_svc.cgi                      |  81 ++++++
 htdocs/browse/svc_acct_pop.cgi                  |  63 +++++
 htdocs/edit/cust_main_county-expand.cgi         |  49 ++++
 htdocs/edit/cust_main_county.cgi                |  66 +++++
 htdocs/edit/part_referral.cgi                   |  66 +++++
 htdocs/edit/process/agent.cgi                   |  53 ++++
 htdocs/edit/process/agent_type.cgi              |  83 ++++++
 htdocs/edit/process/cust_main_county-expand.cgi |  71 +++++
 htdocs/edit/process/cust_main_county.cgi        |  38 +++
 htdocs/edit/process/part_pkg.cgi                |  79 ++++++
 htdocs/edit/process/part_referral.cgi           |  45 ++++
 htdocs/edit/process/part_svc.cgi                |  47 ++++
 htdocs/edit/process/svc_acct_pop.cgi            |  43 +++
 htdocs/edit/svc_acct_pop.cgi                    |  67 +++++
 htdocs/view/cust_main.cgi                       | 336 ++++++++++++++++++++++++
 20 files changed, 1543 insertions(+)
 create mode 100755 htdocs/browse/agent.cgi
 create mode 100755 htdocs/browse/agent_type.cgi
 create mode 100755 htdocs/browse/cust_main_county.cgi
 create mode 100755 htdocs/browse/part_pkg.cgi
 create mode 100755 htdocs/browse/part_referral.cgi
 create mode 100755 htdocs/browse/part_svc.cgi
 create mode 100755 htdocs/browse/svc_acct_pop.cgi
 create mode 100755 htdocs/edit/cust_main_county-expand.cgi
 create mode 100755 htdocs/edit/cust_main_county.cgi
 create mode 100755 htdocs/edit/part_referral.cgi
 create mode 100755 htdocs/edit/process/agent.cgi
 create mode 100755 htdocs/edit/process/agent_type.cgi
 create mode 100755 htdocs/edit/process/cust_main_county-expand.cgi
 create mode 100755 htdocs/edit/process/cust_main_county.cgi
 create mode 100755 htdocs/edit/process/part_pkg.cgi
 create mode 100755 htdocs/edit/process/part_referral.cgi
 create mode 100755 htdocs/edit/process/part_svc.cgi
 create mode 100755 htdocs/edit/process/svc_acct_pop.cgi
 create mode 100755 htdocs/edit/svc_acct_pop.cgi
 create mode 100755 htdocs/view/cust_main.cgi

diff --git a/htdocs/browse/agent.cgi b/htdocs/browse/agent.cgi
new file mode 100755
index 000000000..cf5f2281f
--- /dev/null
+++ b/htdocs/browse/agent.cgi
@@ -0,0 +1,72 @@
+#!/usr/bin/perl -Tw
+#
+# agent.cgi: browse agent
+#
+# ivan@sisd.com 97-dec-12
+#
+# changes to allow pages to load from a relative location in the web tree.
+#	bmccane@maxbaud.net	98-mar-25
+#
+# changed 'type' to 'atype' because type is reserved word in Pg6.3
+#	bmccane@maxbaud.net	98-apr-3
+#
+# agent type was linking to wrong cgi ivan@sisd.com 98-jul-18
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Base;
+use FS::UID qw(cgisuidsetup swapuid);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header menubar);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+
+&cgisuidsetup($cgi);
+
+SendHeaders(); # one guess.
+print header('Agent Listing', menubar(
+  'Main Menu' => '../',
+  'Add new agent' => '../edit/agent.cgi'
+)), <<END;
+    <BR>
+    Click on agent number to edit.
+    <TABLE BORDER>
+      <TR>
+        <TH><FONT SIZE=-1>Agent #</FONT></TH>
+        <TH>Agent</TH>
+        <TH>Type</TH>
+        <TH><FONT SIZE=-1>Freq. (unimp.)</FONT></TH>
+        <TH><FONT SIZE=-1>Prog. (unimp.)</FONT></TH>
+      </TR>
+END
+
+my($agent);
+foreach $agent ( sort { 
+  $a->getfield('agentnum') <=> $b->getfield('agentnum')
+} qsearch('agent',{}) ) {
+  my($hashref)=$agent->hashref;
+  my($typenum)=$hashref->{typenum};
+  my($agent_type)=qsearchs('agent_type',{'typenum'=>$typenum});
+  my($atype)=$agent_type->getfield('atype');
+  print <<END;
+      <TR>
+        <TD><A HREF="../edit/agent.cgi?$hashref->{agentnum}">
+          $hashref->{agentnum}</A></TD>
+        <TD>$hashref->{agent}</TD>
+        <TD><A HREF="../edit/agent_type.cgi?$typenum">$atype</A></TD>
+        <TD>$hashref->{freq}</TD>
+        <TD>$hashref->{prog}</TD>
+      </TR>
+END
+
+}
+
+print <<END;
+    </TABLE>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
diff --git a/htdocs/browse/agent_type.cgi b/htdocs/browse/agent_type.cgi
new file mode 100755
index 000000000..5f05bd514
--- /dev/null
+++ b/htdocs/browse/agent_type.cgi
@@ -0,0 +1,81 @@
+#!/usr/bin/perl -Tw
+#
+# agent_type.cgi: browse agent_type
+#
+# ivan@sisd.com 97-dec-10
+#
+# Changes to allow page to work at a relative position in server
+# Changes to make "Packages" display 2-wide in table (old way was too vertical)
+#	bmccane@maxbaud.net 98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Base;
+use FS::UID qw(cgisuidsetup swapuid);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header menubar);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+
+&cgisuidsetup($cgi);
+
+SendHeaders(); # one guess.
+
+print header("Agent Type Listing", menubar(
+  'Main Menu' => '../',
+  'Add new agent type' => "../edit/agent_type.cgi",
+)), <<END;
+    <BR>Click on agent type number to edit.
+    <TABLE BORDER>
+      <TR>
+        <TH><FONT SIZE=-1>Type #</FONT></TH>
+        <TH>Type</TH>
+        <TH colspan="2">Packages</TH>
+      </TR>
+END
+
+my($agent_type);
+foreach $agent_type ( sort { 
+  $a->getfield('typenum') <=> $b->getfield('typenum')
+} qsearch('agent_type',{}) ) {
+  my($hashref)=$agent_type->hashref;
+  my(@type_pkgs)=qsearch('type_pkgs',{'typenum'=> $hashref->{typenum} });
+  my($rowspan)=scalar(@type_pkgs);
+  $rowspan = int($rowspan/2+0.5) ;
+  print <<END;
+      <TR>
+        <TD ROWSPAN=$rowspan><A HREF="../edit/agent_type.cgi?$hashref->{typenum}">
+          $hashref->{typenum}
+        </A></TD>
+        <TD ROWSPAN=$rowspan>$hashref->{atype}</TD>
+END
+
+  my($type_pkgs);
+  my($tdcount) = -1 ;
+  foreach $type_pkgs ( @type_pkgs ) {
+    my($pkgpart)=$type_pkgs->getfield('pkgpart');
+    my($part_pkg) = qsearchs('part_pkg',{'pkgpart'=> $pkgpart });
+    print qq!<TR>! if ($tdcount == 0) ;
+    $tdcount = 0 if ($tdcount == -1) ;
+    print qq!<TD><A HREF="../edit/part_pkg.cgi?$pkgpart">!,
+          $part_pkg->getfield('pkg'),"</A></TD>";
+    $tdcount ++ ;
+    if ($tdcount == 2)
+    {
+	print qq!</TR>\n! ;
+	$tdcount = 0 ;
+    }
+  }
+
+  print "</TR>";
+}
+
+print <<END;
+    </TR></TABLE>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
diff --git a/htdocs/browse/cust_main_county.cgi b/htdocs/browse/cust_main_county.cgi
new file mode 100755
index 000000000..d615198c9
--- /dev/null
+++ b/htdocs/browse/cust_main_county.cgi
@@ -0,0 +1,65 @@
+#!/usr/bin/perl -Tw
+#
+# cust_main_county.cgi: browse cust_main_county
+#
+# ivan@sisd.com 97-dec-13
+#
+# Changes to allow page to work at a relative position in server
+#	bmccane@maxbaud.net	98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Base;
+use FS::UID qw(cgisuidsetup swapuid);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header menubar);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+
+&cgisuidsetup($cgi);
+
+SendHeaders(); # one guess.
+print header("Tax Rate Listing", menubar(
+  'Main Menu' => '../',
+  'Edit tax rates' => "../edit/cust_main_county.cgi",
+)),<<END;
+    <BR>Click on <u>expand</u> to specify tax rates by county.
+    <P><TABLE BORDER>
+      <TR>
+        <TH><FONT SIZE=-1>State</FONT></TH>
+        <TH>County</TH>
+        <TH><FONT SIZE=-1>Tax</FONT></TH>
+      </TR>
+END
+
+my($cust_main_county);
+foreach $cust_main_county ( qsearch('cust_main_county',{}) ) {
+  my($hashref)=$cust_main_county->hashref;
+  print <<END;
+      <TR>
+        <TD>$hashref->{state}</TD>
+END
+
+  print "<TD>", $hashref->{county}
+      ? $hashref->{county}
+      : qq!(ALL) <FONT SIZE=-1>!.
+        qq!<A HREF="../edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
+        qq!">expand</A></FONT>!
+    , "</TD>";
+
+  print <<END;
+        <TD>$hashref->{tax}%</TD>
+      </TR>
+END
+
+}
+
+print <<END;
+    </TABLE>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
diff --git a/htdocs/browse/part_pkg.cgi b/htdocs/browse/part_pkg.cgi
new file mode 100755
index 000000000..e5ff31e9e
--- /dev/null
+++ b/htdocs/browse/part_pkg.cgi
@@ -0,0 +1,81 @@
+#!/usr/bin/perl -Tw
+#
+# part_svc.cgi: browse part_pkg
+#
+# ivan@sisd.com 97-dec-5,9
+#
+# Changes to allow page to work at a relative position in server
+#	bmccane@maxbaud.net	98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Base;
+use FS::UID qw(cgisuidsetup swapuid);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header menubar);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+
+&cgisuidsetup($cgi);
+
+SendHeaders(); # one guess.
+
+print header("Package Part Listing",menubar(
+  'Main Menu' => '../',
+  'Add new package' => "../edit/part_pkg.cgi",
+)), <<END;
+    <BR>Click on package part number to edit.
+    <TABLE BORDER>
+      <TR>
+        <TH><FONT SIZE=-1>Part #</FONT></TH>
+        <TH>Package</TH>
+        <TH>Comment</TH>
+        <TH><FONT SIZE=-1>Setup Fee</FONT></TH>
+        <TH><FONT SIZE=-1>Freq.</FONT></TH>
+        <TH><FONT SIZE=-1>Recur. Fee</FONT></TH>
+        <TH>Service</TH>
+        <TH><FONT SIZE=-1>Quan.</FONT></TH>
+      </TR>
+END
+
+my($part_pkg);
+foreach $part_pkg ( sort { 
+  $a->getfield('pkgpart') <=> $b->getfield('pkgpart')
+} qsearch('part_pkg',{}) ) {
+  my($hashref)=$part_pkg->hashref;
+  my(@pkg_svc)=grep $_->getfield('quantity'),
+    qsearch('pkg_svc',{'pkgpart'=> $hashref->{pkgpart} });
+  my($rowspan)=scalar(@pkg_svc);
+  print <<END;
+      <TR>
+        <TD ROWSPAN=$rowspan><A HREF="../edit/part_pkg.cgi?$hashref->{pkgpart}">
+          $hashref->{pkgpart}
+        </A></TD>
+        <TD ROWSPAN=$rowspan>$hashref->{pkg}</TD>
+        <TD ROWSPAN=$rowspan>$hashref->{comment}</TD>
+        <TD ROWSPAN=$rowspan>$hashref->{setup}</TD>
+        <TD ROWSPAN=$rowspan>$hashref->{freq}</TD>
+        <TD ROWSPAN=$rowspan>$hashref->{recur}</TD>
+END
+
+  my($pkg_svc);
+  foreach $pkg_svc ( @pkg_svc ) {
+    my($svcpart)=$pkg_svc->getfield('svcpart');
+    my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart });
+    print qq!<TD><A HREF="../edit/part_svc.cgi?$svcpart">!,
+          $part_svc->getfield('svc'),"</A></TD><TD>",
+          $pkg_svc->getfield('quantity'),"</TD></TR><TR>\n";
+  }
+
+  print "</TR>";
+}
+
+print <<END;
+    </TR></TABLE>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
diff --git a/htdocs/browse/part_referral.cgi b/htdocs/browse/part_referral.cgi
new file mode 100755
index 000000000..b16fa896d
--- /dev/null
+++ b/htdocs/browse/part_referral.cgi
@@ -0,0 +1,57 @@
+#!/usr/bin/perl -Tw
+#
+# part_referral.cgi: Browse part_referral
+#
+# ivan@sisd.com 98-feb-23 
+#
+# Changes to allow page to work at a relative position in server
+#	bmccane@maxbaud.net	98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Base;
+use FS::UID qw(cgisuidsetup swapuid);
+use FS::Record qw(qsearch);
+use FS::CGI qw(header menubar);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+
+&cgisuidsetup($cgi);
+
+SendHeaders(); # one guess.
+print header("Referral Listing", menubar(
+  'Main Menu' => '../',
+  'Add new referral' => "../edit/part_referral.cgi",
+)), <<END;
+    <BR>Click on referral number to edit.
+    <TABLE BORDER>
+      <TR>
+        <TH><FONT SIZE=-1>Referral #</FONT></TH>
+        <TH>Referral</TH>
+      </TR>
+END
+
+my($part_referral);
+foreach $part_referral ( sort { 
+  $a->getfield('refnum') <=> $b->getfield('refnum')
+} qsearch('part_referral',{}) ) {
+  my($hashref)=$part_referral->hashref;
+  print <<END;
+      <TR>
+        <TD><A HREF="../edit/part_referral.cgi?$hashref->{refnum}">
+          $hashref->{refnum}</A></TD>
+        <TD>$hashref->{referral}</TD>
+      </TR>
+END
+
+}
+
+print <<END;
+    </TABLE>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
diff --git a/htdocs/browse/part_svc.cgi b/htdocs/browse/part_svc.cgi
new file mode 100755
index 000000000..71a556421
--- /dev/null
+++ b/htdocs/browse/part_svc.cgi
@@ -0,0 +1,81 @@
+#!/usr/bin/perl -Tw
+#
+# part_svc.cgi: browse part_svc
+#
+# ivan@sisd.com 97-nov-14, 97-dec-9
+#
+# Changes to allow page to work at a relative position in server
+#	bmccane@maxbaud.net	98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Base;
+use FS::UID qw(cgisuidsetup swapuid);
+use FS::Record qw(qsearch);
+use FS::part_svc qw(fields);
+use FS::CGI qw(header menubar);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+
+&cgisuidsetup($cgi);
+
+SendHeaders(); # one guess.
+print header('Service Part Listing', menubar(
+  'Main Menu' => '../',
+  'Add new service' => "../edit/part_svc.cgi",
+)),<<END;
+    <BR>Click on service part number to edit.
+    <TABLE BORDER>
+      <TR>
+        <TH>Part #</TH>
+        <TH>Service</TH>
+        <TH>Table</TH>
+        <TH>Field</TH>
+        <TH>Action</TH>
+        <TH>Value</TH>
+      </TR>
+END
+
+my($part_svc);
+foreach $part_svc ( sort {
+  $a->getfield('svcpart') <=> $b->getfield('svcpart')
+} qsearch('part_svc',{}) ) {
+  my($hashref)=$part_svc->hashref;
+  my($svcdb)=$hashref->{svcdb};
+  my(@rows)=
+    grep $hashref->{${svcdb}.'__'.$_.'_flag'},
+      map { /^${svcdb}__(.*)$/; $1 }
+        grep ! /_flag$/,
+          grep /^${svcdb}__/,
+            fields('part_svc')
+  ;
+  my($rowspan)=scalar(@rows);
+  print <<END;
+      <TR>
+        <TD ROWSPAN=$rowspan><A HREF="../edit/part_svc.cgi?$hashref->{svcpart}">
+          $hashref->{svcpart}
+        </A></TD>
+        <TD ROWSPAN=$rowspan>$hashref->{svc}</TD>
+        <TD ROWSPAN=$rowspan>$hashref->{svcdb}</TD>
+END
+  my($row);
+  foreach $row ( @rows ) {
+    my($flag)=$part_svc->getfield($svcdb.'__'.$row.'_flag');
+    print "<TD>$row</TD><TD>";
+    if ( $flag eq "D" ) { print "Default"; }
+      elsif ( $flag eq "F" ) { print "Fixed"; }
+      else { print "(Unknown!)"; }
+    print "</TD><TD>",$part_svc->getfield($svcdb."__".$row),"</TD></TR><TR>";
+  }
+print "</TR>";
+}
+
+print <<END;
+    </TABLE>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
diff --git a/htdocs/browse/svc_acct_pop.cgi b/htdocs/browse/svc_acct_pop.cgi
new file mode 100755
index 000000000..a8a3a9224
--- /dev/null
+++ b/htdocs/browse/svc_acct_pop.cgi
@@ -0,0 +1,63 @@
+#!/usr/bin/perl -Tw
+#
+# svc_acct_pop.cgi: browse pops 
+#
+# ivan@sisd.com 98-mar-8
+#
+# Changes to allow page to work at a relative position in server
+#	bmccane@maxbaud.net	98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Base;
+use FS::UID qw(cgisuidsetup swapuid);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header menubar);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+
+&cgisuidsetup($cgi);
+
+SendHeaders(); # one guess.
+print header('POP Listing', menubar(
+  'Main Menu' => '../',
+  'Add new POP' => "../edit/svc_acct_pop.cgi",
+)), <<END;
+    <BR>Click on pop number to edit.
+    <TABLE BORDER>
+      <TR>
+        <TH><FONT SIZE=-1>POP #</FONT></TH>
+        <TH>City</TH>
+        <TH>State</TH>
+        <TH>Area code</TH>
+        <TH>Exchange</TH>
+      </TR>
+END
+
+my($svc_acct_pop);
+foreach $svc_acct_pop ( sort { 
+  $a->getfield('popnum') <=> $b->getfield('popnum')
+} qsearch('svc_acct_pop',{}) ) {
+  my($hashref)=$svc_acct_pop->hashref;
+  print <<END;
+      <TR>
+        <TD><A HREF="../edit/svc_acct_pop.cgi?$hashref->{popnum}">
+          $hashref->{popnum}</A></TD>
+        <TD>$hashref->{city}</TD>
+        <TD>$hashref->{state}</TD>
+        <TD>$hashref->{ac}</TD>
+        <TD>$hashref->{exch}</TD>
+      </TR>
+END
+
+}
+
+print <<END;
+    </TABLE>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
diff --git a/htdocs/edit/cust_main_county-expand.cgi b/htdocs/edit/cust_main_county-expand.cgi
new file mode 100755
index 000000000..59ff7043a
--- /dev/null
+++ b/htdocs/edit/cust_main_county-expand.cgi
@@ -0,0 +1,49 @@
+#!/usr/bin/perl -Tw
+#
+# cust_main_county-expand.cgi: Expand a state into counties (output form)
+#
+# ivan@sisd.com 97-dec-16
+#
+# Changes to allow page to work at a relative position in server
+#	bmccane@maxbaud.net	98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Base;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header menubar);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+
+&cgisuidsetup($cgi);
+
+SendHeaders(); # one guess.
+
+$cgi->var('QUERY_STRING') =~ /^(\d+)$/
+  or die "Illegal taxnum!";
+my($taxnum)=$1;
+
+my($cust_main_county)=qsearchs('cust_main_county',{'taxnum'=>$taxnum});
+die "Can't expand entry!" if $cust_main_county->getfield('county');
+
+print header("Tax Rate (expand state)", menubar(
+  'Main Menu' => '../',
+)), <<END;
+    <FORM ACTION="process/cust_main_county-expand.cgi" METHOD=POST>
+      <INPUT TYPE="hidden" NAME="taxnum" VALUE="$taxnum">
+      Separate counties by
+      <INPUT TYPE="radio" NAME="delim" VALUE="n" CHECKED>line
+      (rumor has it broken on some browsers) or
+      <INPUT TYPE="radio" NAME="delim" VALUE="s">whitespace.
+      <BR><INPUT TYPE="submit" VALUE="Submit">
+      <BR><TEXTAREA NAME="counties" ROWS=100></TEXTAREA>
+    </FORM>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
diff --git a/htdocs/edit/cust_main_county.cgi b/htdocs/edit/cust_main_county.cgi
new file mode 100755
index 000000000..904d58346
--- /dev/null
+++ b/htdocs/edit/cust_main_county.cgi
@@ -0,0 +1,66 @@
+#!/usr/bin/perl -Tw
+#
+# cust_main_county.cgi: Edit tax rates (output form)
+#
+# ivan@sisd.com 97-dec-13-16
+#
+# Changes to allow page to work at a relative position in server
+# Changed tax field to accept 6 chars (MO uses 6.1%)
+#	bmccane@maxbaud.net	98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Base;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header menubar);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+
+&cgisuidsetup($cgi);
+
+SendHeaders(); # one guess.
+
+print header("Edit tax rates", menubar(
+  'Main Menu' => '../',
+)),<<END;
+    <FORM ACTION="process/cust_main_county.cgi" METHOD=POST>
+    <TABLE BORDER>
+      <TR>
+        <TH><FONT SIZE=-1>State</FONT></TH>
+        <TH>County</TH>
+        <TH><FONT SIZE=-1>Tax</FONT></TH>
+      </TR>
+END
+
+my($cust_main_county);
+foreach $cust_main_county ( qsearch('cust_main_county',{}) ) {
+  my($hashref)=$cust_main_county->hashref;
+  print <<END;
+      <TR>
+        <TD>$hashref->{state}</TD>
+END
+
+  print "<TD>", $hashref->{county}
+      ? $hashref->{county}
+      : '(ALL)'
+    , "</TD>";
+
+  print qq!<TD><INPUT TYPE="text" NAME="tax!, $hashref->{taxnum},
+        qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6>%</TD></TR>!;
+END
+
+}
+
+print <<END;
+    </TABLE>
+    <INPUT TYPE="submit" VALUE="Apply changes">
+    </FORM>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
diff --git a/htdocs/edit/part_referral.cgi b/htdocs/edit/part_referral.cgi
new file mode 100755
index 000000000..f29802239
--- /dev/null
+++ b/htdocs/edit/part_referral.cgi
@@ -0,0 +1,66 @@
+#!/usr/bin/perl -Tw
+#
+# agent.cgi: Add/Edit referral (output form)
+#
+# ivan@sisd.com 98-feb-23
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# confisuing typo on submit button ivan@sisd.com 98-jun-14
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Base;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::part_referral;
+use FS::CGI qw(header menubar);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+
+&cgisuidsetup($cgi);
+
+SendHeaders(); # one guess.
+
+my($part_referral,$action);
+if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
+  $part_referral=qsearchs('part_referral',{'refnum'=>$1});
+  $action='Edit';
+} else { #adding
+  $part_referral=create FS::part_referral {};
+  $action='Add';
+}
+my($hashref)=$part_referral->hashref;
+
+print header("$action Referral", menubar(
+  'Main Menu' => '../',
+  'View all referrals' => "../browse/part_referral.cgi",
+)), <<END;
+    <FORM ACTION="process/part_referral.cgi" METHOD=POST>
+END
+
+#display
+
+print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$hashref->{refnum}">!,
+      "Referral #", $hashref->{refnum} ? $hashref->{refnum} : "(NEW)";
+
+print <<END;
+<PRE>
+Referral   <INPUT TYPE="text" NAME="referral" SIZE=32 VALUE="$hashref->{referral}">
+</PRE>
+END
+
+print qq!<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{refnum} ? "Apply changes" : "Add referral",
+      qq!">!;
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
+
diff --git a/htdocs/edit/process/agent.cgi b/htdocs/edit/process/agent.cgi
new file mode 100755
index 000000000..5d1ce3232
--- /dev/null
+++ b/htdocs/edit/process/agent.cgi
@@ -0,0 +1,53 @@
+#!/usr/bin/perl -Tw
+#
+# process/agent.cgi: Edit agent (process form)
+#
+# ivan@sisd.com 97-dec-12
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::agent qw(fields);
+use FS::CGI qw(idiot);
+
+my($req)=new CGI::Request; # create form object
+
+&cgisuidsetup($req->cgi);
+
+my($agentnum)=$req->param('agentnum');
+
+my($old)=qsearchs('agent',{'agentnum'=>$agentnum}) if $agentnum;
+
+#unmunge typenum
+$req->param('typenum') =~ /^(\d+)(:.*)?$/;
+$req->param('typenum',$1);
+
+my($new)=create FS::agent ( {
+  map {
+    $_, $req->param($_);
+  } fields('agent')
+} );
+
+my($error);
+if ( $agentnum ) {
+  $error=$new->replace($old);
+} else {
+  $error=$new->insert;
+  $agentnum=$new->getfield('agentnum');
+}
+
+if ( $error ) {
+  &idiot($error);
+} else { 
+  #$req->cgi->redirect("../../view/agent.cgi?$agentnum");
+  #$req->cgi->redirect("../../edit/agent.cgi?$agentnum");
+  $req->cgi->redirect("../../browse/agent.cgi");
+}
+
diff --git a/htdocs/edit/process/agent_type.cgi b/htdocs/edit/process/agent_type.cgi
new file mode 100755
index 000000000..43f129fd5
--- /dev/null
+++ b/htdocs/edit/process/agent_type.cgi
@@ -0,0 +1,83 @@
+#!/usr/bin/perl -Tw
+#
+# process/agent_type.cgi: Edit agent type (process form)
+#
+# ivan@sisd.com 97-dec-11
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::agent_type qw(fields);
+use FS::type_pkgs;
+use FS::CGI qw(idiot);
+
+my($req)=new CGI::Request;
+&cgisuidsetup($req->cgi);
+
+my($typenum)=$req->param('typenum');
+my($old)=qsearchs('agent_type',{'typenum'=>$typenum}) if $typenum;
+
+my($new)=create FS::agent_type ( {
+  map {
+    $_, $req->param($_);
+  } fields('agent_type')
+} );
+
+my($error);
+if ( $typenum ) {
+  $error=$new->replace($old);
+} else {
+  $error=$new->insert;
+  $typenum=$new->getfield('typenum');
+}
+
+if ( $error ) {
+  idiot($error);
+  exit;
+}
+
+my($part_pkg);
+foreach $part_pkg (qsearch('part_pkg',{})) {
+  my($pkgpart)=$part_pkg->getfield('pkgpart');
+
+  my($type_pkgs)=qsearchs('type_pkgs',{
+      'typenum' => $typenum,
+      'pkgpart' => $pkgpart,
+  });
+  if ( $type_pkgs && ! $req->param("pkgpart$pkgpart") ) {
+    my($d_type_pkgs)=$type_pkgs; #need to save $type_pkgs for below.
+    $error=$d_type_pkgs->del; #FS::Record not FS::type_pkgs,
+                                  #so ->del not ->delete.  hmm.  hmm.
+    if ( $error ) {
+      idiot($error);
+      exit;
+    }
+
+  } elsif ( $req->param("pkgpart$pkgpart")
+            && ! $type_pkgs
+  ) {
+    #ok to clobber it now (but bad form nonetheless?)
+    $type_pkgs=create FS::type_pkgs ({
+      'typenum' => $typenum,
+      'pkgpart' => $pkgpart,
+    });
+    $error= $type_pkgs->insert;
+    if ( $error ) {
+      idiot($error);
+      exit;
+    }
+  }
+
+}
+
+#$req->cgi->redirect("../../view/agent_type.cgi?$typenum");
+#$req->cgi->redirect("../../edit/agent_type.cgi?$typenum");
+$req->cgi->redirect("../../browse/agent_type.cgi");
+
diff --git a/htdocs/edit/process/cust_main_county-expand.cgi b/htdocs/edit/process/cust_main_county-expand.cgi
new file mode 100755
index 000000000..a821560c6
--- /dev/null
+++ b/htdocs/edit/process/cust_main_county-expand.cgi
@@ -0,0 +1,71 @@
+#!/usr/bin/perl -Tw
+#
+# process/cust_main_county-expand.cgi: Expand counties (process form)
+#
+# ivan@sisd.com 97-dec-16
+#
+# Changes to allow page to work at a relative position in server
+# Added import of datasrc from UID.pm for Pg6.3
+# Default tax to 0.0 if using Pg6.3
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI
+# undo default tax to 0.0 if using Pg6.3: comes from pre-expanded record
+# for that state
+#ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup datasrc);
+use FS::Record qw(qsearch qsearchs);
+use FS::cust_main_county;
+use FS::CGI qw(eidiot);
+
+my($req)=new CGI::Request; # create form object
+
+&cgisuidsetup($req->cgi);
+
+$req->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
+my($taxnum)=$1;
+my($cust_main_county)=qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+  or die ("Unknown taxnum!");
+
+my(@counties);
+if ( $req->param('delim') eq 'n' ) {
+  @counties=split(/\n/,$req->param('counties'));
+} elsif ( $req->param('delim') eq 's' ) {
+  @counties=split(/\s+/,$req->param('counties'));
+} else {
+  die "Illegal delim!";
+}
+
+@counties=map {
+  /^\s*([\w\- ]+)\s*$/ or eidiot("Illegal county");
+  $1;
+} @counties;
+
+my($county);
+foreach ( @counties) {
+  my(%hash)=$cust_main_county->hash;
+  my($new)=create FS::cust_main_county \%hash;
+  $new->setfield('taxnum','');
+  $new->setfield('county',$_);
+  #if (datasrc =~ m/Pg/)
+  #{
+  #    $new->setfield('tax',0.0);
+  #}
+  my($error)=$new->insert;
+  die $error if $error;
+}
+
+unless ( qsearch('cust_main',{
+  'state'  => $cust_main_county->getfield('state'),
+  'county' => $cust_main_county->getfield('county'),
+} ) ) {
+  my($error)=($cust_main_county->delete);
+  die $error if $error;
+}
+
+$req->cgi->redirect("../../edit/cust_main_county.cgi");
+
diff --git a/htdocs/edit/process/cust_main_county.cgi b/htdocs/edit/process/cust_main_county.cgi
new file mode 100755
index 000000000..58eaa63ce
--- /dev/null
+++ b/htdocs/edit/process/cust_main_county.cgi
@@ -0,0 +1,38 @@
+#!/usr/bin/perl -Tw
+#
+# process/agent.cgi: Edit cust_main_county (process form)
+#
+# ivan@sisd.com 97-dec-16
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::cust_main_county;
+use FS::CGI qw(eidiot);
+
+my($req)=new CGI::Request; # create form object
+
+&cgisuidsetup($req->cgi);
+
+foreach ( $req->params ) {
+  /^tax(\d+)$/ or die "Illegal form $_!";
+  my($taxnum)=$1;
+  my($old)=qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+    or die "Couldn't find taxnum $taxnum!";
+  next unless $old->getfield('tax') ne $req->param("tax$taxnum");
+  my(%hash)=$old->hash;
+  $hash{tax}=$req->param("tax$taxnum");
+  my($new)=create FS::cust_main_county \%hash;
+  my($error)=$new->replace($old);
+  eidiot($error) if $error;
+}
+
+$req->cgi->redirect("../../browse/cust_main_county.cgi");
+
diff --git a/htdocs/edit/process/part_pkg.cgi b/htdocs/edit/process/part_pkg.cgi
new file mode 100755
index 000000000..7d787819a
--- /dev/null
+++ b/htdocs/edit/process/part_pkg.cgi
@@ -0,0 +1,79 @@
+#!/usr/bin/perl -Tw
+#
+# process/part_pkg.cgi: Edit package definitions (process form)
+#
+# ivan@sisd.com 97-dec-10
+#
+# don't update non-changing records in part_svc (causing harmless but annoying
+# "Records identical" errors). ivan@sisd.com 98-feb-19
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# Added `|| 0 ' when getting quantity off web page ivan@sisd.com 98-jun-4
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::part_pkg qw(fields);
+use FS::pkg_svc;
+use FS::CGI qw(eidiot);
+
+my($req)=new CGI::Request; # create form object
+
+&cgisuidsetup($req->cgi);
+
+my($pkgpart)=$req->param('pkgpart');
+
+my($old)=qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
+
+my($new)=create FS::part_pkg ( {
+  map {
+    $_, $req->param($_);
+  } fields('part_pkg')
+} );
+
+if ( $pkgpart ) {
+  my($error)=$new->replace($old);
+  eidiot($error) if $error;
+} else {
+  my($error)=$new->insert;
+  eidiot($error) if $error;
+  $pkgpart=$new->getfield('pkgpart');
+}
+
+my($part_svc);
+foreach $part_svc (qsearch('part_svc',{})) {
+# don't update non-changing records in part_svc (causing harmless but annoying
+# "Records identical" errors). ivan@sisd.com 98-jan-19
+  #my($quantity)=$req->param('pkg_svc'. $part_svc->getfield('svcpart')),
+  my($quantity)=$req->param('pkg_svc'. $part_svc->svcpart) || 0,
+  my($old_pkg_svc)=qsearchs('pkg_svc',{
+    'pkgpart'  => $pkgpart,
+    'svcpart'  => $part_svc->getfield('svcpart'),
+  });
+  my($old_quantity)=$old_pkg_svc ? $old_pkg_svc->quantity : 0;
+  next unless $old_quantity != $quantity; #!here
+  my($new_pkg_svc)=create FS::pkg_svc({
+    'pkgpart'  => $pkgpart,
+    'svcpart'  => $part_svc->getfield('svcpart'),
+    #'quantity' => $req->param('pkg_svc'. $part_svc->getfield('svcpart')),
+    'quantity' => $quantity, 
+  });
+  if ($old_pkg_svc) {
+    my($error)=$new_pkg_svc->replace($old_pkg_svc);
+    eidiot($error) if $error;
+  } else {
+    my($error)=$new_pkg_svc->insert;
+    eidiot($error) if $error;
+  }
+}
+
+#$req->cgi->redirect("../../view/part_pkg.cgi?$pkgpart");
+#$req->cgi->redirect("../../edit/part_pkg.cgi?$pkgpart");
+$req->cgi->redirect("../../browse/part_pkg.cgi");
+
diff --git a/htdocs/edit/process/part_referral.cgi b/htdocs/edit/process/part_referral.cgi
new file mode 100755
index 000000000..08a4c01d0
--- /dev/null
+++ b/htdocs/edit/process/part_referral.cgi
@@ -0,0 +1,45 @@
+#!/usr/bin/perl -Tw
+#
+# process/part_referral.cgi: Edit referrals (process form)
+#
+# ivan@sisd.com 98-feb-23
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+use FS::part_referral qw(fields);
+use FS::CGI qw(eidiot);
+use FS::CGI qw(eidiot);
+
+my($req)=new CGI::Request; # create form object
+
+&cgisuidsetup($req->cgi);
+
+my($refnum)=$req->param('refnum');
+
+my($new)=create FS::part_referral ( {
+  map {
+    $_, $req->param($_);
+  } fields('part_referral')
+} );
+
+if ( $refnum ) {
+  my($old)=qsearchs('part_referral',{'refnum'=>$refnum});
+  eidiot("(Old) Record not found!") unless $old;
+  my($error)=$new->replace($old);
+  eidiot($error) if $error;
+} else {
+  my($error)=$new->insert;
+  eidiot($error) if $error;
+}
+
+$refnum=$new->getfield('refnum');
+$req->cgi->redirect("../../browse/part_referral.cgi");
+
diff --git a/htdocs/edit/process/part_svc.cgi b/htdocs/edit/process/part_svc.cgi
new file mode 100755
index 000000000..0f0fbc6e8
--- /dev/null
+++ b/htdocs/edit/process/part_svc.cgi
@@ -0,0 +1,47 @@
+#!/usr/bin/perl -Tw
+#
+# process/part_svc.cgi: Edit service definitions (process form)
+#
+# ivan@sisd.com 97-nov-14
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+use FS::part_svc qw(fields);
+use FS::CGI qw(eidiot);
+
+my($req)=new CGI::Request; # create form object
+
+&cgisuidsetup($req->cgi);
+
+my($svcpart)=$req->param('svcpart');
+
+my($old)=qsearchs('part_svc',{'svcpart'=>$svcpart}) if $svcpart;
+
+my($new)=create FS::part_svc ( {
+  map {
+    $_, $req->param($_);
+#  } qw(svcpart svc svcdb)
+  } fields('part_svc')
+} );
+
+if ( $svcpart ) {
+  my($error)=$new->replace($old);
+  eidiot($error) if $error;
+} else {
+  my($error)=$new->insert;
+  eidiot($error) if $error;
+  $svcpart=$new->getfield('svcpart');
+}
+
+#$req->cgi->redirect("../../view/part_svc.cgi?$svcpart");
+#$req->cgi->redirect("../../edit/part_svc.cgi?$svcpart");
+$req->cgi->redirect("../../browse/part_svc.cgi");
+
diff --git a/htdocs/edit/process/svc_acct_pop.cgi b/htdocs/edit/process/svc_acct_pop.cgi
new file mode 100755
index 000000000..18d7940b4
--- /dev/null
+++ b/htdocs/edit/process/svc_acct_pop.cgi
@@ -0,0 +1,43 @@
+#!/usr/bin/perl -Tw
+#
+# process/svc_acct_pop.cgi: Edit POP (process form)
+#
+# ivan@sisd.com 98-mar-8
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::svc_acct_pop qw(fields);
+use FS::CGI qw(eidiot);
+
+my($req)=new CGI::Request; # create form object
+
+&cgisuidsetup($req->cgi);
+
+my($popnum)=$req->param('popnum');
+
+my($old)=qsearchs('svc_acct_pop',{'popnum'=>$popnum}) if $popnum;
+
+my($new)=create FS::svc_acct_pop ( {
+  map {
+    $_, $req->param($_);
+  } fields('svc_acct_pop')
+} );
+
+if ( $popnum ) {
+  my($error)=$new->replace($old);
+  eidiot($error) if $error;
+} else {
+  my($error)=$new->insert;
+  eidiot($error) if $error;
+  $popnum=$new->getfield('popnum');
+}
+$req->cgi->redirect("../../browse/svc_acct_pop.cgi");
+
diff --git a/htdocs/edit/svc_acct_pop.cgi b/htdocs/edit/svc_acct_pop.cgi
new file mode 100755
index 000000000..46d803f07
--- /dev/null
+++ b/htdocs/edit/svc_acct_pop.cgi
@@ -0,0 +1,67 @@
+#!/usr/bin/perl -Tw
+#
+# svc_acct_pop.cgi: Add/Edit pop (output form)
+#
+# ivan@sisd.com 98-mar-8 
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Base;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::svc_acct_pop;
+use FS::CGI qw(header menubar);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+
+&cgisuidsetup($cgi);
+
+SendHeaders(); # one guess.
+
+my($svc_acct_pop,$action);
+if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
+  $svc_acct_pop=qsearchs('svc_acct_pop',{'popnum'=>$1});
+  $action='Edit';
+} else { #adding
+  $svc_acct_pop=create FS::svc_acct_pop {};
+  $action='Add';
+}
+my($hashref)=$svc_acct_pop->hashref;
+
+print header("$action POP", menubar(
+  'Main Menu' => '../',
+  'View all POPs' => "../browse/svc_acct_pop.cgi",
+)), <<END;
+    <FORM ACTION="process/svc_acct_pop.cgi" METHOD=POST>
+END
+
+#display
+
+print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$hashref->{popnum}">!,
+      "POP #", $hashref->{popnum} ? $hashref->{popnum} : "(NEW)";
+
+print <<END;
+<PRE>
+City      <INPUT TYPE="text" NAME="city" SIZE=32 VALUE="$hashref->{city}">
+State     <INPUT TYPE="text" NAME="state" SIZE=3 MAXLENGTH=2 VALUE="$hashref->{state}">
+Area Code <INPUT TYPE="text" NAME="ac" SIZE=4 MAXLENGTH=3 VALUE="$hashref->{ac}">
+Exchange  <INPUT TYPE="text" NAME="exch" SIZE=4 MAXLENGTH=3 VALUE="$hashref->{exch}">
+</PRE>
+END
+
+print qq!<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{popnum} ? "Apply changes" : "Add POP",
+      qq!">!;
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
+
diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
new file mode 100755
index 000000000..ca5fcd94f
--- /dev/null
+++ b/htdocs/view/cust_main.cgi
@@ -0,0 +1,336 @@
+#!/usr/bin/perl -Tw
+#
+# cust_main.cgi: View a customer
+#
+# Usage: cust_main.cgi custnum
+#        http://server.name/path/cust_main.cgi?custnum
+#
+# Note: Should be run setuid freeside as user nobody.
+#
+# the payment history section could use some work, see below
+# 
+# ivan@voicenet.com 96-nov-29 -> 96-dec-11
+#
+# added navigation bar (go to main menu ;)
+# ivan@voicenet.com 97-jan-30
+#
+# changes to the way credits/payments are applied (the links are here).
+# ivan@voicenet.com 97-apr-21
+#
+# added debugging code to diagnose CPU sucking problem.
+# ivan@voicenet.com 97-may-19
+#
+# CPU sucking problem was in comment code?  fixed?
+# ivan@voicenet.com 97-may-22
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-22
+#
+# Changes to allow page to work at a relative position in server
+# Changed 'day' to 'daytime' because Pg6.3 reserves the day word
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+
+use strict;
+use CGI::Base qw(:DEFAULT :CGI); # CGI module
+use CGI::Carp qw(fatalsToBrowser);
+use Date::Format;
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs qsearch);
+use FS::CGI qw(header menubar);
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+&cgisuidsetup($cgi);
+
+SendHeaders(); # one guess.
+print header("Customer View", menubar(
+  'Main Menu' => '../',
+)),<<END;
+    <BASEFONT SIZE=3>
+END
+
+#untaint custnum & get customer record
+$QUERY_STRING =~ /^(\d+)$/;
+my($custnum)=$1;
+my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
+die "Customer not found!" unless $cust_main;
+my($hashref)=$cust_main->hashref;
+
+#custnum
+print "<FONT SIZE=+1><CENTER>Customer #<B>$custnum</B></CENTER></FONT>",
+      qq!<CENTER><A HREF="#cust_main">Customer Information</A> | !,
+      qq!<A HREF="#cust_comments">Comments</A> | !,
+      qq!<A HREF="#cust_pkg">Packages</A> | !,
+      qq!<A HREF="#history">Payment History</A> </CENTER>!;
+
+#bill now linke
+print qq!<HR><CENTER><A HREF="../misc/bill.cgi?$custnum">!,
+      qq!Bill this customer now</A></CENTER>!;
+
+#formatting
+print qq!<HR><A NAME="cust_main"><CENTER><FONT SIZE=+1>Customer Information!,
+      qq!</FONT>!,
+      qq!<BR><A HREF="../edit/cust_main.cgi?$custnum!,
+      qq!">Edit this information</A></CENTER><FONT SIZE=-1>!;
+
+#agentnum
+my($agent)=qsearchs('agent',{
+  'agentnum' => $cust_main->getfield('agentnum')
+} );
+die "Agent not found!" unless $agent;
+print "<BR>Agent #<B>" , $agent->getfield('agentnum') , ": " ,
+                         $agent->getfield('agent') , "</B>";
+
+#refnum
+my($referral)=qsearchs('part_referral',{'refnum' => $cust_main->refnum});
+die "Referral not found!" unless $referral;
+print "<BR>Referral #<B>", $referral->refnum, ": ",
+      $referral->referral, "<\B>"; 
+
+#last, first
+print "<P><B>", $hashref->{'last'}, ", ", $hashref->{first}, "</B>";
+
+#ss
+print " (SS# <B>", $hashref->{ss}, "</B>)" if $hashref->{ss};
+
+#company
+print "<BR><B>", $hashref->{company}, "</B>" if $hashref->{company};
+
+#address1
+print "<BR><B>", $hashref->{address1}, "</B>";
+
+#address2
+print "<BR><B>", $hashref->{address2}, "</B>" if $hashref->{address2};
+
+#city
+print "<BR><B>", $hashref->{city}, "</B>";
+
+#county
+print " (<B>", $hashref->{county}, "</B> county)" if $hashref->{county};
+
+#state
+print ",<B>", $hashref->{state}, "</B>";
+
+#zip
+print "  <B>", $hashref->{zip}, "</B>";
+
+#country
+print "<BR><B>", $hashref->{country}, "</B>"
+  unless $hashref->{country} eq "US";
+
+#daytime
+print "<P><B>", $hashref->{daytime}, "</B>" if $hashref->{daytime};
+print " (Day)" if $hashref->{daytime} && $hashref->{night};
+
+#night
+print "<BR><B>", $hashref->{night}, "</B>" if $hashref->{night};
+print " (Night)" if $hashref->{daytime} && $hashref->{night};
+
+#fax
+print "<BR><B>", $hashref->{fax}, "</B> (Fax)" if $hashref->{fax};
+
+#payby/payinfo/paydate/payname
+if ($hashref->{payby} eq "CARD") {
+  print "<P>Card #<B>", $hashref->{payinfo}, "</B> Exp. <B>",
+    $hashref->{paydate}, "</B>";
+  print " (<B>", $hashref->{payname}, "</B>)" if $hashref->{payname};
+} elsif ($hashref->{payby} eq "BILL") {
+  print "<P>Bill";
+  print " on P.O. #<B>", $hashref->{payinfo}, "</B>"
+    if $hashref->{payinfo};
+  print " until <B>", $hashref->{paydate}, "</B>"
+    if $hashref->{paydate};
+  print " to <B>", $hashref->{payname}, "</B> at above address"
+    if $hashref->{payname};
+} elsif ($hashref->{payby} eq "COMP") {
+  print "<P>Access complimentary";
+  print " courtesy of <B>", $hashref->{payinfo}, "</B>"
+    if $hashref->{payinfo};
+  print " until <B>", $hashref->{paydate}, "</B>"
+    if $hashref->{paydate};
+} else {
+  print "Unknown payment type ", $hashref->{payby}, "!";
+}
+
+#tax
+print "<BR>(Tax exempt)" if $hashref->{tax};
+
+#otaker
+print "<P>Order taken by <B>", $hashref->{otaker}, "</B>";
+
+#formatting	
+print qq!<HR><FONT SIZE=+1><A NAME="cust_pkg"><CENTER>Packages</A></FONT>!,
+      qq!<BR>Click on package number to view/edit package.!,
+      qq!<BR><A HREF="../edit/cust_pkg.cgi?$custnum">Add/Edit packages</A>!,
+      qq!</CENTER><BR>!;
+
+#display packages
+
+#formatting
+print qq!<CENTER><TABLE BORDER=4>\n!,
+      qq!<TR><TH ROWSPAN=2>#</TH><TH ROWSPAN=2>Package</TH><TH COLSPAN=5>!,
+      qq!Dates</TH></TR>\n!,
+      qq!<TR><TH><FONT SIZE=-1>Setup</FONT></TH><TH>!,
+      qq!<FONT SIZE=-1>Next bill</FONT>!,
+      qq!</TH><TH><FONT SIZE=-1>Susp.</FONT></TH><TH><FONT SIZE=-1>Expire!,
+      qq!</FONT></TH>!,
+      qq!<TH><FONT SIZE=-1>Cancel</FONT></TH>!,
+      qq!</TR>\n!;
+
+#get package info
+my(@packages)=qsearch('cust_pkg',{'custnum'=>$custnum});
+my($package);
+foreach $package (@packages) {
+  my($pref)=$package->hashref;
+  my($part_pkg)=qsearchs('part_pkg',{
+    'pkgpart' => $pref->{pkgpart}
+  } );
+  print qq!<TR><TD><FONT SIZE=-1><A HREF="../view/cust_pkg.cgi?!,
+        $pref->{pkgnum}, qq!">!, 
+        $pref->{pkgnum}, qq!</A></FONT></TD>!,
+        "<TD><FONT SIZE=-1>", $part_pkg->getfield('pkg'), " - ",
+        $part_pkg->getfield('comment'), "</FONT></TD>",
+        "<TD><FONT SIZE=-1>", 
+        $pref->{setup} ? time2str("%D",$pref->{setup} ) : "" ,
+        "</FONT></TD>",
+        "<TD><FONT SIZE=-1>", 
+        $pref->{bill} ? time2str("%D",$pref->{bill} ) : "" ,
+        "</FONT></TD>",
+        "<TD><FONT SIZE=-1>",
+        $pref->{susp} ? time2str("%D",$pref->{susp} ) : "" ,
+        "</FONT></TD>",
+        "<TD><FONT SIZE=-1>",
+        $pref->{expire} ? time2str("%D",$pref->{expire} ) : "" ,
+        "</FONT></TD>",
+        "<TD><FONT SIZE=-1>",
+        $pref->{cancel} ? time2str("%D",$pref->{cancel} ) : "" ,
+        "</FONT></TD>",
+        "</TR>";
+}
+
+#formatting
+print "</TABLE></CENTER>";
+
+#formatting
+print qq!<CENTER><HR><A NAME="history"><FONT SIZE=+1>Payment History!,
+      qq!</FONT></A><BR>!,
+      qq!Click on invoice to view invoice/enter payment.<BR>!,
+      qq!<A HREF="../edit/cust_credit.cgi?$custnum">!,
+      qq!Post Credit / Refund</A></CENTER><BR>!;
+
+#get payment history
+#
+# major problem: this whole thing is way too sloppy.
+# minor problem: the description lines need better formatting.
+
+my(@history);
+
+my(@bills)=qsearch('cust_bill',{'custnum'=>$custnum});
+my($bill);
+foreach $bill (@bills) {
+  my($bref)=$bill->hashref;
+  push @history,
+    $bref->{_date} . qq!\t<A HREF="../view/cust_bill.cgi?! .
+    $bref->{invnum} . qq!">Invoice #! . $bref->{invnum} .
+    qq! (Balance \$! . $bref->{owed} . qq!)</A>\t! .
+    $bref->{charged} . qq!\t\t\t!;
+
+  my(@payments)=qsearch('cust_pay',{'invnum'=> $bref->{invnum} } );
+  my($payment);
+  foreach $payment (@payments) {
+#    my($pref)=$payment->hashref;
+    my($date,$invnum,$payby,$payinfo,$paid)=($payment->getfield('_date'),
+                                             $payment->getfield('invnum'),
+                                             $payment->getfield('payby'),
+                                             $payment->getfield('payinfo'),
+                                             $payment->getfield('paid'),
+                      );
+    push @history,
+      "$date\tPayment, Invoice #$invnum ($payby $payinfo)\t\t$paid\t\t";
+  }
+}
+
+my(@credits)=qsearch('cust_credit',{'custnum'=>$custnum});
+my($credit);
+foreach $credit (@credits) {
+  my($cref)=$credit->hashref;
+  push @history,
+    $cref->{_date} . "\tCredit #" . $cref->{crednum} . ", (Balance \$" .
+    $cref->{credited} . ") by " . $cref->{otaker} . " - " .
+    $cref->{reason} . "\t\t\t" . $cref->{amount} . "\t";
+
+  my(@refunds)=qsearch('cust_refund',{'crednum'=> $cref->{crednum} } );
+  my($refund);
+  foreach $refund (@refunds) {
+    my($rref)=$refund->hashref;
+    push @history,
+      $rref->{_date} . "\tRefund, Credit #" . $rref->{crednum} . " (" .
+      $rref->{payby} . " " . $rref->{payinfo} . ") by " .
+      $rref->{otaker} . " - ". $rref->{reason} . "\t\t\t\t" .
+      $rref->{refund};
+  }
+}
+
+        #formatting
+        print <<END;
+<CENTER><TABLE BORDER=4>
+<TR>
+  <TH>Date</TH>
+  <TH>Description</TH>
+  <TH><FONT SIZE=-1>Charge</FONT></TH>
+  <TH><FONT SIZE=-1>Payment</FONT></TH>
+  <TH><FONT SIZE=-1>In-house<BR>Credit</FONT></TH>
+  <TH><FONT SIZE=-1>Refund</FONT></TH>
+  <TH><FONT SIZE=-1>Balance</FONT></TH>
+</TR>
+END
+
+#display payment history
+
+my($balance)=0;
+my($item);
+foreach $item (sort keyfield_numerically @history) {
+  my($date,$desc,$charge,$payment,$credit,$refund)=split(/\t/,$item);
+  $charge ||= 0;
+  $payment ||= 0;
+  $credit ||= 0;
+  $refund ||= 0;
+  $balance += $charge - $payment;
+  $balance -= $credit - $refund;
+
+  print "<TR><TD><FONT SIZE=-1>",time2str("%D",$date),"</FONT></TD>",
+	"<TD><FONT SIZE=-1>$desc</FONT></TD>",
+	"<TD><FONT SIZE=-1>",
+        ( $charge ? "\$".sprintf("%.2f",$charge) : '' ),
+        "</FONT></TD>",
+	"<TD><FONT SIZE=-1>",
+        ( $payment ? "- \$".sprintf("%.2f",$payment) : '' ),
+        "</FONT></TD>",
+	"<TD><FONT SIZE=-1>",
+        ( $credit ? "- \$".sprintf("%.2f",$credit) : '' ),
+        "</FONT></TD>",
+	"<TD><FONT SIZE=-1>",
+        ( $refund ? "\$".sprintf("%.2f",$refund) : '' ),
+        "</FONT></TD>",
+	"<TD><FONT SIZE=-1>\$" . sprintf("%.2f",$balance),
+        "</FONT></TD>",
+        "\n";
+}
+
+#formatting
+print "</TABLE></CENTER>";
+
+#end
+
+#formatting
+print <<END;
+
+  </BODY>
+</HTML>
+END
+
+#subroutiens
+sub keyfield_numerically { (split(/\t/,$a))[0] <=> (split(/\t/,$b))[0] ; }
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 13836fa8df9d3849f089d47342b25162327c28f7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 3 Sep 1998 04:09:09 +0000
Subject: Initial revision

---
 htdocs/docs/billing.html | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 htdocs/docs/billing.html

diff --git a/htdocs/docs/billing.html b/htdocs/docs/billing.html
new file mode 100644
index 000000000..02bfbd783
--- /dev/null
+++ b/htdocs/docs/billing.html
@@ -0,0 +1,40 @@
+<head>
+  <title>Billing</title>
+</head>
+<body>
+  <h1>Billing</h1>
+  The bin/bill script can be run daily to bill all customers.  Usage: bill [ -c [ i ] ] [ -d <i>date</i> ] [ -b ]
+  <ul>
+    <li>-c: Turn on collecting (you probably want this).
+    <li>-i: Real-time billing (as opposed to bacth billing).  Only relevant for credit cards.  Not available without modifying site_perl/Bill.pm
+    <li>-d: Pretend it is <i>date</i> (parsed by Date::Parse)
+    <li>-b: N/A
+  </ul>
+  Printing should be configured on your freeside machine to print invoices.
+  <br><br>Batch credit card processing
+  <ul>
+    <li>After this script is run, a credit card batch will be in the <a href="schema.html#cust_pay_batch">cust_pay_batch</a> table.  Export this table to your credit card batching.
+    <li>When your batch completes, erase the cust_pay_batch records in that batch and add any necessary paymants to the <a href="schema.html#cust_pay">cust_pay</a> table.  Example code to add payments is:
+    <pre>use FS::cust_pay;
+
+# loop over all records in batch
+
+my $payment=create FS::cust_pay (
+  'invnum' => $invnum,
+  'paid' => $paid,
+  '_date' => $_date,
+  'payby' => $payby,
+  'payinfo' => $payinfo,
+  'paybatch' => $paybatch,
+);
+
+my $error=$payment->insert;
+if ( $error ) {
+  #process error
+}
+
+# end loop
+</pre>
+All fields except paybatch are contained in the cust_pay_batch table.  You can use paybatch field to track particular batches and/or particular transactions within a batch.
+  </ul>
+</body>
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 75764c551a19084d32cf424bdedb23c154973204 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 3 Sep 1998 04:50:13 +0000
Subject: Initial revision

---
 CREDITS | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 CREDITS

diff --git a/CREDITS b/CREDITS
new file mode 100644
index 000000000..87c79a779
--- /dev/null
+++ b/CREDITS
@@ -0,0 +1,14 @@
+Thanks to Matt Simerson <matt@michweb.net> of MichWeb Inc. for documentation
+and pre-release testing.  Without his help the documentation in the first
+release would have consisted of a single screenfull of text.
+
+# Steve Cleff <cleff@yahoo.com> did the default background image and is also
+# the creator of Freeside's mascot, Snakeman.
+
+Jerry St. Pierre <jstpi@city.timmins.on.ca> did the "SISD" graphic.
+
+Brian McCane? <bmccane@maxbaud.net> contributed PostgreSQL support, HTML
+style enhancements and many, many bugfixes.
+
+Everything else is my (Ivan Kohler <ivan@sisd.com>) fault.
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From ea7438fdd7db7793dbb2e4413daf525210749153 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Sep 1998 21:33:34 +0000
Subject: Initial revision

---
 htdocs/docs/trouble.html | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 htdocs/docs/trouble.html

diff --git a/htdocs/docs/trouble.html b/htdocs/docs/trouble.html
new file mode 100644
index 000000000..2cf6d4e71
--- /dev/null
+++ b/htdocs/docs/trouble.html
@@ -0,0 +1,41 @@
+<head>
+  <title>Troubleshooting</title>
+</head>
+<body>
+  <h1>Troubleshooting</h1>
+  <ul>
+    <li>When troubleshooting the web interface, helpful information is often in your web server's error log.
+    <li>Internet Explorer will not work with Freeside's HTML interface. 
+<a HREF="http://www.netscape.com">Netscape</a>,                                 
+<a HREF="http://lynx.browser.org">Lynx</a>, and                                 
+<a HREF="http://www.cs.indiana.edu/elisp/w3/docs.html">Emacs/W3</a>,            
+among others, should work fine.
+    <li>If bin/svc_acct.import fails with an "Out of memory!" error using MySQL, upgrede MySQL and recompile the Perl DBD.  There was a memory leak in some older versions of MySQL.
+    <li>If you get tons of errors in your web server's error log like this:
+<pre>
+Ambiguous use of value => resolved to "value" =>
+at /usr/lib/perl5/site_perl/File/CounterFile.pm line 132.
+</pre>
+        This clutters up your log files but is otherwise harmless.  Upgrade to the latest File::CounterFile. 
+    <li>If you get an Internal Server Error when adding or editing, but find that the update has occured, and you get something like the following in your web server's error log:
+<pre>
+access to <i>/your/path</i>/edit/process/<i>some_table</i>.cgi failed for
+<i>machine.domain.tld</i>, reason: malformed header from script.
+Bad header=HTTP/1.0 302 Moved Temporarily
+</pre>
+        Then you forgot to apply this <a href="CGI-modules-2.76-patch.txt">patch</a> as mentioned in the <a href="install.html">New Installation</a> section of the documentation.
+    <li>If you get errors like this:
+<pre>
+UID.pm: Can't open /var/spool/freeside/conf/secrets: Permission denied 
+at <i>/your/path</i>/site_perl/FS/UID.pm line 26.
+BEGIN failed--compilation aborted at
+<i>/your/path</i>/edit/process/part_svc.cgi line 15.
+</pre>
+        Then the scripts are not running setuid freeside.  If you were editing
+the files, it is possible you inadvertantly removed the setuid bit.
+As mentioned in the <a href="install.html">New Installation</a> section of the documentation, set ownership and permissions for the web interface.  Your system should support secure setuid scripts or Perl's emulation, see <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">perlsec: Security Bugs</a> for information and workarounds.
+<pre>cd /usr/local/apache/htdocs/freeside
+chown -R freeside .
+chmod 4755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.cgi search/*.cgi view/*.cgi</pre>
+  </ul>
+</body>
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 361f95491952b2d968152ca50a94c7eec56610b1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Sep 1998 02:07:23 +0000
Subject: Initial revision

---
 htdocs/docs/install.html | 56 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 htdocs/docs/install.html

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
new file mode 100644
index 000000000..c4784ebf6
--- /dev/null
+++ b/htdocs/docs/install.html
@@ -0,0 +1,56 @@
+<head>
+  <title>Installation</title>
+</head>
+<body>
+<h1>Installation</h1>
+Before installing, you need:
+<ul>
+  <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
+  <li><a href="ftp://ftp.cs.hut.fi/pub/ssh/">SSH</a>
+  <li>agrep from the <a href="http://glimpse.cs.arizona.edu">Glimpse</a> distribution, if you want fuzzy searching capability
+  <li><a href="http://www.perl.com/CPANl/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_04)
+  <li>A database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>, such as <a href="http://www.tcx.se/">MySQL</a> or <a href="http://www.postgresql.org/">PostgreSQL</a>
+  <li>Perl modules
+    <ul>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/MIME/">MIME-Base64</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/Data">Data-Dumper</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/MD5">MD5</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/Net">libnet</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/LWP/">libwww-perl</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/CGI/">CGI-modules</a> (<b>NOT</b> CGI.pm) with this <a href="CGI-modules-2.76-patch.txt">patch</a> applied
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/Business/">Business-CreditCard</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/Data/">Data-ShowTable</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/Mail/">MailTools</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/Time/">TimeDate</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/Date/">DateManip</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/File/">File-CounterFile</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/FreezeThaw/">FreezeThaw</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/DBI/">DBI
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/DBD/">DBD for your database engine</a>
+    </ul>
+</ul>
+Install the Freeside distribution:
+<ul>
+  <li>Add the user `freeside' to your system.
+  <li>Add the freeside database to your database engine.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Syntax.html#Create database">MySQL</a>) (with <a href="http://www.postgresql.org/docs/admin/manage-ag.htm#AEN854">PostgreSQL</a>)
+  <li>Allow the freeside user full access to the freeside database.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Privilege_system.html#Privilege system">MySQL</a>) (with <a href="http://www.postgresql.org/docs/admin/newuser.htm">PostgreSQL</a>)
+  <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>
+  <li>Copy or link fs-x.y.z/site_perl to FS in your site_perl directory.  (try `<code>perl -V</code>' if unsure) <pre>mkdir /usr/local/lib/site_perl/FS
+cp fs-x.y.z/site_perl/* /usr/local/lib/site_perl/FS</pre> or <pre>ln -s /full/path/to/fs-x.y.z/site_perl /usr/local/lib/site_perl/FS</pre>
+  <li>Copy or link fs-x.y.z/htdocs to your web server's document space.  <pre>mkdir /usr/local/apache/htdocs/freeside
+cp -r fs-x.y.z/htdocs/* /usr/local/apache/htdocs/freeside</pre> or <pre>ln -s /full/path/to/fs-x.y.z/htdocs /usr/local/apache/htdocs/freeside</pre>
+  <li>Restrict access to this web interface.  (with <a href="http://www.apache.org/docs/misc/FAQ.html#user-authentication">Apache</a>)
+  <li>Enable CGI execution for files with the `.cgi' extension.  (with <a href="http://www.apache.org/docs/mod/mod_mime.html#addhandler">Apache</a>)
+  <li>Set ownership and permissions for the web interface.  Your system should support secure setuid scripts or Perl's emulation, see <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">perlsec: Security Bugs</a> for information and workarounds.
+<pre>cd /usr/local/apache/htdocs/freeside
+chown -R freeside .
+chmod 4755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.cgi search/*.cgi view/*.cgi</pre>
+<li>Create the base Freeside directory `/var/spool/freeside', and the subdirectories `conf', `counters', and `export'.  <pre>mkdir /var/spool/freeside
+mkdir /var/spool/freeside/conf
+mkdir /var/spool/freeside/counters
+mkdir /var/spool/freeside/export
+chown -R freeside /var/spool/freeside</pre>
+  <li>Create the necessary <a href="config.html">configuration files</a>.
+  <li>Run bin/fs-setup to create the database tables.
+</ul>
+</body>
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From ab21af64cd80035d8f713e4704919f3b9733a936 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Sep 1998 05:43:42 +0000
Subject: Initial revision

---
 bin/svc_acct.export | 351 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 351 insertions(+)
 create mode 100755 bin/svc_acct.export

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
new file mode 100755
index 000000000..3f65a08ba
--- /dev/null
+++ b/bin/svc_acct.export
@@ -0,0 +1,351 @@
+#!/usr/bin/perl -Tw
+#
+# Create and export password files: passwd, passwd.adjunct, shadow,
+# acp_passwd, acp_userinfo, acp_dialup, users
+#
+# ivan@voicenet.com late august/september 96
+# (the password encryption bits were from melody)
+#
+# use a temporary copy of svc_acct to minimize lock time on the real file,
+# and skip blank entries.
+#
+# ivan@voicenet.com 96-Oct-6
+#
+# change users / acp_dialup file formats
+# ivan@voicenet.com 97-jan-28-31
+#
+# change priority (after copies) to 19, not 10
+# ivan@voicenet.com 97-feb-5
+#
+# added exit if stuff is already locked 97-apr-15
+#
+# rewrite ivan@sisd.com 98-mar-9
+#
+# Changed 'password' to '_password' because Pg6.3 reserves this word
+# Added code to create a FreeBSD style master.passwd file
+#   bmccane@maxbaud.net 98-Apr-3
+#
+# don't export non-root 0 UID's, even if they get put in the database
+# ivan@sisd.com 98-jul-14
+#
+# Uses Idle_Timeout, Port_Limit, Framed_Netmask and Framed_Route if they
+# exist; need some way to support arbitrary radius fields.  also 
+# /var/spool/freeside/conf/ ivan@sisd.com 98-jul-26, aug-9
+#
+# OOPS!  added arbitrary radius fields (pry 98-aug-16) but forgot to say so.
+# ivan@sisd.com 98-sep-18
+
+use strict;
+use Fcntl qw(:flock);
+use FS::SSH qw(scp ssh);
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch fields);
+
+my($fshellmachines)="/var/spool/freeside/conf/shellmachines";
+my(@shellmachines);
+if ( -e $fshellmachines ) {
+  open(SHELLMACHINES,$fshellmachines);
+  @shellmachines=map {
+    /^(.*)$/ or die "Illegal line in conf/shellmachines"; #we trust the file
+    $1;
+  } grep $_ !~ /^(#|$)/, <SHELLMACHINES>;
+  close SHELLMACHINES;
+}
+
+my($fbsdshellmachines)="/var/spool/freeside/conf/bsdshellmachines";
+my(@bsdshellmachines);
+if ( -e $fbsdshellmachines ) {
+  open(BSDSHELLMACHINES,$fbsdshellmachines);
+  @bsdshellmachines=map {
+    /^(.*)$/ or die "Illegal line in conf/bsdshellmachines"; #we trust the file
+    $1;
+  } grep $_ !~ /^(#|$)/, <BSDSHELLMACHINES>;
+  close BSDSHELLMACHINES;
+}
+
+my($fnismachines)="/var/spool/freeside/conf/nismachines";
+my(@nismachines);
+if ( -e $fnismachines ) {
+  open(NISMACHINES,$fnismachines);
+  @nismachines=map {
+    /^(.*)$/ or die "Illegal line in conf/nismachines"; #we trust the file
+    $1;
+  } grep $_ !~ /^(#|$)/, <NISMACHINES>;
+  close NISMACHINES;
+}
+
+my($ferpcdmachines)="/var/spool/freeside/conf/erpcdmachines";
+my(@erpcdmachines);
+if ( -e $ferpcdmachines ) {
+  open(ERPCDMACHINES,$ferpcdmachines);
+  @erpcdmachines=map {
+    /^(.*)$/ or die "Illegal line in conf/erpcdmachines"; #we trust the file
+    $1;
+  } grep $_ !~ /^(#|$)/, <ERPCDMACHINES>;
+  close ERPCDMACHINES;
+}
+
+my($fradiusmachines)="/var/spool/freeside/conf/radiusmachines";
+my(@radiusmachines);
+if ( -e $fradiusmachines ) {
+  open(RADIUSMACHINES,$fradiusmachines);
+  @radiusmachines=map {
+    /^(.*)$/ or die "Illegal line in conf/radiusmachines"; #we trust the file
+    $1;
+  } grep $_ !~ /^(#|$)/, <RADIUSMACHINES>;
+  close RADIUSMACHINES;
+}
+
+my($spooldir)="/var/spool/freeside/export";
+my($spoollock)="/var/spool/freeside/svc_acct.export.lock";
+
+adminsuidsetup;
+
+my(@saltset)= ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+srand(time|$$);
+
+open(EXPORT,"+>>$spoollock") or die "Can't open $spoollock: $!";
+select(EXPORT); $|=1; select(STDOUT);
+unless ( flock(EXPORT,LOCK_EX|LOCK_NB) ) {
+  seek(EXPORT,0,0);
+  my($pid)=<EXPORT>;
+  chop($pid);
+  #no reason to start loct of blocking processes
+  die "Is another export process running under pid $pid?\n";
+}
+seek(EXPORT,0,0);
+print EXPORT $$,"\n";
+
+my(@svc_acct)=qsearch('svc_acct',{});
+
+( open(MASTER,">$spooldir/master.passwd")
+  and flock(MASTER,LOCK_EX|LOCK_NB)
+) or die "Can't open $spooldir/master.passwd: $!";
+( open(PASSWD,">$spooldir/passwd")
+  and flock(PASSWD,LOCK_EX|LOCK_NB)  
+) or die "Can't open $spooldir/passwd: $!";
+( open(SHADOW,">$spooldir/shadow")
+  and flock(SHADOW,LOCK_EX|LOCK_NB) 
+) or die "Can't open $spooldir/shadow: $!";
+( open(ACP_PASSWD,">$spooldir/acp_passwd") 
+  and flock (ACP_PASSWD,LOCK_EX|LOCK_NB)
+) or die "Can't open $spooldir/acp_passwd: $!";
+( open (ACP_DIALUP,">$spooldir/acp_dialup")
+  and flock(ACP_DIALUP,LOCK_EX|LOCK_NB)
+) or die "Can't open $spooldir/acp_dialup: $!";
+( open (USERS,">$spooldir/users")
+  and flock(USERS,LOCK_EX|LOCK_NB)
+) or die "Can't open $spooldir/users: $!";
+
+chmod 0644, "$spooldir/passwd",
+            "$spooldir/acp_dialup",
+;
+chmod 0600, "$spooldir/master.passwd",
+	    "$spooldir/acp_passwd",
+            "$spooldir/shadow",
+            "$spooldir/users",
+;
+
+setpriority(0,0,10);
+
+my($svc_acct);
+foreach $svc_acct (@svc_acct) {
+
+  my($password)=$svc_acct->getfield('_password');
+  my($cpassword,$rpassword);
+  if ( ( length($password) <= 8 )
+       && ( $password ne '*' )
+       && ( $password ne '' )
+     ) {
+    $cpassword=crypt($password,
+                     $saltset[int(rand(64))].$saltset[int(rand(64))]
+    );
+    $rpassword=$password;
+  } else {
+    $cpassword=$password;
+    $rpassword='UNIX';
+  }
+
+  if ( $svc_acct->uid  =~ /^(\d+)$/ ) {
+
+    die "Non-root user ". $svc_acct->username. " has 0 UID!"
+      if $svc_acct->uid == 0 && $svc_acct->username ne 'root';
+
+    ###
+    # FORMAT OF FreeBSD MASTER PASSWD FILE HERE
+    print MASTER join(":",
+      $svc_acct->username,		# User name
+      $cpassword,			# Encrypted password
+      $svc_acct->uid,			# User ID
+      $svc_acct->gid,			# Group ID
+      "",				# Login Class
+      "0",				# Password Change Time
+      "0",				# Password Expiration Time
+      $svc_acct->finger,		# Users name
+      $svc_acct->dir,			# Users home directory
+      $svc_acct->shell,			# shell
+    ), "\n" ;
+
+    ###
+    # FORMAT OF THE PASSWD FILE HERE
+    print PASSWD join(":",
+      $svc_acct->username,
+      'x', # "##". $svc_acct->$username,
+      $svc_acct->uid,
+      $svc_acct->gid,
+      $svc_acct->finger,
+      $svc_acct->dir,
+      $svc_acct->shell,
+    ), "\n";
+
+    ###
+    # FORMAT OF THE SHADOW FILE HERE
+    print SHADOW join(":",
+      $svc_acct->username,
+      $cpassword,
+      '',
+      '',
+      '',
+      '',
+      '',
+      '',
+      '',
+    ), "\n";
+
+  }
+
+  if ( $svc_acct->slipip ne '' ) {
+
+    ###
+    # FORMAT OF THE ACP_* FILES HERE
+    print ACP_PASSWD join(":",
+      $svc_acct->username,
+      $cpassword,
+      "0",
+      "0",
+      "",
+      "",
+      "",
+    ), "\n";
+
+    my($ip)=$svc_acct->slipip;
+
+    unless ( $ip eq '0.0.0.0' || $svc_acct->slipip eq '0e0' ) {
+      print ACP_DIALUP $svc_acct->username, "\t*\t", $svc_acct->slipip, "\n";
+    }
+
+    ###
+    # FORMAT OF THE USERS FILE HERE
+    print USERS
+      $svc_acct->username, qq(\tPassword = "$rpassword"\n\t),
+
+      join ",\n\t",
+        map  {
+          /^(radius_(.*))$/;
+          my($field,$attrib)=($1,$2);
+          $attrib =~ s/_/\-/g;
+          "$attrib = \"". $svc_acct->getfield($field). "\"";
+        } grep /^radius_/ && $svc_acct->getfield($_), fields('svc_acct') 
+    ;
+    if ( $ip && $ip ne '0e0' ) {
+      print USERS qq(,\n\tFramed-Address = "$ip"\n\n);
+    } else {
+      print USERS qq(\n\n);
+    }
+
+  }
+
+}
+
+flock(MASTER,LOCK_UN);
+flock(PASSWD,LOCK_UN);
+flock(SHADOW,LOCK_UN);
+flock(ACP_DIALUP,LOCK_UN);
+flock(ACP_PASSWD,LOCK_UN);
+flock(USERS,LOCK_UN);
+
+close MASTER;
+close PASSWD;
+close SHADOW;
+close ACP_DIALUP;
+close ACP_PASSWD;
+close USERS;
+
+###
+# export stuff
+#
+
+my($shellmachine);
+foreach $shellmachine (@shellmachines) {
+  scp("$spooldir/passwd","root\@$shellmachine:/etc/passwd.new")
+    == 0 or die "scp error: $!";
+  scp("$spooldir/shadow","root\@$shellmachine:/etc/shadow.new")
+    == 0 or die "scp error: $!";
+  ssh("root\@$shellmachine",
+    "( ".
+      "mv /etc/passwd.new /etc/passwd; ".
+      "mv /etc/shadow.new /etc/shadow; ".
+    " )"
+  )
+    == 0 or die "ssh error: $!";
+}
+
+my($bsdshellmachine);
+foreach $bsdshellmachine (@bsdshellmachines) {
+  scp("$spooldir/passwd","root\@$bsdshellmachine:/etc/passwd.new")
+    == 0 or die "scp error: $!";
+  scp("$spooldir/master.passwd","root\@$bsdshellmachine:/etc/master.passwd.new")
+    == 0 or die "scp error: $!";
+  ssh("root\@$bsdshellmachine",
+    "( ".
+      "mv /etc/passwd.new /etc/passwd; ".
+      "mv /etc/master.passwd.new /etc/master.passwd; ".
+    " )"
+  )
+    == 0 or die "ssh error: $!";
+}
+
+my($nismachine);
+foreach $nismachine (@nismachines) {
+  scp("$spooldir/passwd","root\@$nismachine:/etc/global/passwd")
+    == 0 or die "scp error: $!";
+  scp("$spooldir/shadow","root\@$nismachine:/etc/global/shadow")
+    == 0 or die "scp error: $!";
+  ssh("root\@$nismachine",
+    "( ".
+      "cd /var/yp; make; ".
+    " )"
+  )
+    == 0 or die "ssh error: $!";
+}
+
+my($erpcdmachine);
+foreach $erpcdmachine (@erpcdmachines) {
+  scp("$spooldir/acp_passwd","root\@$erpcdmachine:/usr/annex/acp_passwd")
+    == 0 or die "scp error: $!";
+  scp("$spooldir/acp_dialup","root\@$erpcdmachine:/usr/annex/acp_dialup")
+    == 0 or die "scp error: $!";
+  ssh("root\@$erpcdmachine",
+    "( ".
+      "kill -USR1 \`cat /usr/annex/erpcd.pid\'".
+    " )"
+  )
+    == 0 or die "ssh error: $!";
+}
+
+my($radiusmachine);
+foreach $radiusmachine (@radiusmachines) {
+  scp("$spooldir/users","root\@$radiusmachine:/etc/raddb/users")
+    == 0 or die "scp error: $!";
+  ssh("root\@$erpcdmachine",
+    "( ".
+      "builddbm".
+    " )"
+  )
+    == 0 or die "ssh error: $!";
+}
+
+unlink $spoollock;
+flock(EXPORT,LOCK_UN);
+close EXPORT;
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From c0af1d666cd655dcece6f263890123851631c0fd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Sep 1998 22:14:43 +0000
Subject: Initial revision

---
 htdocs/docs/schema.html | 205 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 205 insertions(+)
 create mode 100644 htdocs/docs/schema.html

diff --git a/htdocs/docs/schema.html b/htdocs/docs/schema.html
new file mode 100644
index 000000000..5a296ec83
--- /dev/null
+++ b/htdocs/docs/schema.html
@@ -0,0 +1,205 @@
+<head>
+  <title>Schema reference</title>
+</head>
+<body>
+  <h1>Schema reference</h1>
+  <ul>
+    <li><a name="agent">agent</a> - Agents are resellers of your service.  Agents may be limited to a subset of your full offerings (via their agent type).
+      <ul>
+        <li>agentnum - primary key
+        <li>agent - name of this agent
+        <li>typenum - <a href="#agent_type">agent type</a>
+        <li>prog - (unimplemented)
+        <li>freq - (unimplemented)
+      </ul>
+    <li><a name="agent_type">agent_type</a> - Agent types define groups of packages that you can then assign to particular agents.
+      <ul>
+        <li>typenum - primary key
+        <li>atype - name of this agent type
+      </ul>
+    <li><a name="cust_bill">cust_bill</a> - Invoices
+      <ul>
+        <li>invnum - primary key
+        <li>custnum - <a href="#cust_main">customer</a>
+        <li>_date
+        <li>charged - amount of this invoice
+        <li>owed - amount still outstanding on this invoice
+        <li>printed - how many times this invoice has been printed automatically
+      </ul>
+    <li><a name="cust_bill_pkg">cust_bill_pkg</a> - Invoice line items
+      <ul>
+        <li>invnum - (multiple) key
+        <li>pkgnum - <a href="#cust_pkg">package</a>
+        <li>setup - setup fee 
+        <li>recur - recurring fee
+        <li>sdate - starting date
+        <li>edate - ending date
+      </ul>
+    <li><a name="cust_credit">cust_credit</a> - Credits
+      <ul>
+        <li>crednum - primary key
+        <li>custnum - <a href="#cust_main">customer</a>
+        <li>amount - amount credited
+        <li>credited - amount still outstanding (not yet refunded) on this credit
+        <li>_date
+        <li>otaker - order taker
+        <li>reason
+      </ul>
+    <li><a name="cust_main">cust_main</a> - Customers
+      <ul>
+        <li>custnum - primary key
+        <li>agentnum - <a href="#agent">agent</a>
+        <li>refnum - <a href="#part_referral">referral</a>
+        <li>first - name
+        <li>last - name
+        <li>ss - social security number
+        <li>company
+        <li>address1
+        <li>address2
+        <li>city
+        <li>county
+        <li>state
+        <li>zip
+        <li>country
+        <li>daytime - phone
+        <li>night - phone
+        <li>payby - CARD, BILL, or COMP
+        <li>payinfo - card number, P.O.#, or comp issuer
+        <li>paydate - expiration date
+        <li>payname - billing name (name on card)
+        <li>tax - tax exempt, Y or null
+        <li>otaker - order taker
+      </ul>
+    <li><a name="cust_main_county">cust_main_county</a> - Tax rates
+      <ul>
+        <li>taxnum - primary key
+        <li>state
+        <li>county
+        <li>tax - % rate
+      </ul>
+    <li><a name="cust_pay">cust_pay</a> - Payments
+      <ul>
+        <li>paynum - primary key
+        <li>invnum - <a href="#cust_bill">invoice</a>
+        <li>paid - amount
+        <li>_date
+        <li>payby - CARD, BILL, or COMP
+        <li>payinfo - card number, P.O.#, or comp issuer
+        <li>paybatch - text field for tracking card processor batches
+      </ul>
+    <li><a name="cust_pay_batch">cust_pay_batch</a> - Pending batch
+      <ul>
+        <li>trancode - 77 for charges
+        <li>cardnum
+        <li>exp - card expiration
+        <li>amount
+        <li>invnum - <a href="#cust_bill">invoice</a>
+        <li>custnum - <a href="#cust_main">customer</a>
+        <li>payname - name on card
+        <li>first - name
+        <li>last - name
+        <li>address1
+        <li>address2
+        <li>city
+        <li>state
+        <li>zip
+        <li>country
+      </ul>
+    <li><a name="cust_pkg">cust_pkg</a> - Customer billing items
+      <ul>
+        <li>pkgnum - primary key
+        <li>custnum - <a href="#cust_main">customer</a>
+        <li>pkgpart - <a href="#part_pkg">Package definition</a>
+        <li>setup - date
+        <li>bill - next bill date
+        <li>susp - (past) suspension date
+        <li>expire - (future) cancellation date
+        <li>cancel - (past) cancellation date
+        <li>otaker - order taker
+      </ul>
+    <li><a name="cust_refund">cust_refund</a> - Refunds
+      <ul>
+        <li>refundnum - primary key
+        <li>crednum - <a href="#cust_credit">credit</a>
+        <li>refund - amount
+        <li>_date
+        <li>payby - CARD, BILL or COMP
+        <li>payinfo - card number, P.O.#, or comp issuer
+        <li>otaker - order taker
+      </ul>
+    <li><a name="cust_svc">cust_svc</a> - Customer services
+      <ul>
+        <li>svcnum - primary key
+        <li>pkgnum - <a href="#cust_pkg">package</a>
+        <li>svcpart - <a href="#part_svc">Service definition</a>
+      </ul>
+    <li><a name="part_pkg">part_pkg</a> - Package definitions
+      <ul>
+        <li>pkgpart - primary key
+        <li>pkg - package name
+        <li>comment - non-customer visable package comment
+        <li>setup - setup fee
+        <li>freq - recurring frequency (months)
+        <li>recur - recurring fee
+      </ul>
+    <li><a name="part_referral">part_referral</a> - Referral listing
+      <ul>
+        <li>refnum</li> - primary key
+        <li>referral</li> - referral
+      </ul>
+    <li><a name="part_svc">part_svc</a> - Service definitions
+      <ul>
+        <li>svcpart - primary key
+        <li>svc - name of this service
+        <li>svcdb - table used for this service: svc_acct, svc_acct_sm, svc_domain, svc_charge or svc_wo
+        <li><i>table</i>__<i>field</i> - Default or fixed value for <i>field</i> in <i>table</i>
+        <li><i>table</i>__<i>field</i>_flag - null, D or F
+      </ul>
+    <li><a name="pkg_svc">pkg_svc</a>
+      <ul>
+        <li>pkgpart - <a href="#part_pkg">Package definition</a>
+        <li>svcpart - <a href="#part_svc">Service definition</a>
+        <li>quantity - quantity of this service that this package includes
+      </ul>
+    <li><a name="svc_acct">svc_acct</a> - Accounts
+      <ul>
+        <li>svcnum - <a href="#cust_svc">primary key</a>
+        <li>username
+        <li>_password
+        <li>popnum - <a href="#svc_acct_pop">Point of Presence</a>
+        <li>uid
+        <li>gid
+        <li>finger - GECOS
+        <li>dir
+        <li>shell
+        <li>quota - (unimplementd)
+        <li>slipip - IP address
+        <li>radius_<i>Radius_Attribute</i> - Radius-Attribute
+      </ul>
+    <li><a name="svc_acct_pop">svc_acct_pop</a> - Points of Presence
+      <ul>
+        <li>popnum - primary key
+        <li>city
+        <li>state
+        <li>ac - area code
+        <li>exch - exchange
+      </ul>
+    <li><a name="svc_acct_sm">svc_acct_sm</a> - Domain mail aliases
+      <ul>
+        <li>svcnum - <a href="#cust_svc">primary key</a>
+        <li>domsvc - <a href="#svc_domain">Domain</a> (by svcnum)
+        <li>domuid - <a href="#svc_acct">Account</a> (by uid)
+        <li>domuser - domuser @ <a href="#svc_domain">Domain</a> forwards to <a href="#svc_acct">Account</a>
+      </ul>
+    <li><a name="svc_domain">svc_domain</a> - Domains
+      <ul>
+        <li>svcnum - <a href="#cust_svc">primary key</a>
+        <li>domain
+      </ul>
+    <li><a name="type_pkgs">type_pkgs</a>
+      <ul>
+        <li>typenum - <a href="#agent_type">agent type</a>
+        <li>pkgpart - <a href="#part_pkg">Package definition</a>
+      </ul>
+  </ul>
+</body>
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 193a5aaa811933f68cfcb0f32a26b4769c640a4b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 20 Sep 1998 19:53:32 +0000
Subject: Initial revision

---
 site_perl/Bill.pm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 site_perl/Bill.pm

diff --git a/site_perl/Bill.pm b/site_perl/Bill.pm
new file mode 100644
index 000000000..4d7e059ed
--- /dev/null
+++ b/site_perl/Bill.pm
@@ -0,0 +1,44 @@
+package FS::Bill;
+
+use strict;
+use vars qw(@ISA);
+use FS::cust_main;
+
+@ISA = qw(FS::cust_main);
+
+warn "FS::Bill depriciated\n";
+
+=head1 NAME
+
+FS::Bill - Legacy stub
+
+=head1 SYNOPSIS
+
+The functionality of FS::Bill has been integrated into FS::cust_main.
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jul-24 - 25 - 28
+
+use Safe; evaluate all fees with perl (still on TODO list until I write
+some examples & test opmask to see if we can read db)
+%hash=$obj->hash later ivan@sisd.com 98-mar-13
+
+packages with no next bill date start at $time not time, this should
+eliminate the last of the problems with billing at a past date
+also rewrite the invoice priting logic not to print invoices for things
+that haven't happended yet and update $cust_bill->printed when we print
+so PAST DUE notices work, and s/date/_date/ 
+ivan@sisd.com 98-jun-4
+
+more logic for past due stuff - packages with no next bill date start
+at $cust_pkg->setup || $time ivan@sisd.com 98-jul-13
+
+moved a few things in collection logic; negative charges should work
+ivan@sisd.com 98-aug-6
+
+pod, moved everything to FS::cust_main ivan@sisd.com 98-sep-19
+
+=cut
+
+1;
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 45373022fa23a4e9cea0e15346c9e834c209be03 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Sep 1998 23:01:49 +0000
Subject: Initial revision

---
 htdocs/docs/config.html | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 htdocs/docs/config.html

diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
new file mode 100644
index 000000000..9b8002601
--- /dev/null
+++ b/htdocs/docs/config.html
@@ -0,0 +1,38 @@
+<head>
+  <title>Configuration files</title>
+</head>
+<body>
+  <h1>Configuration files</h1>
+Configuration files and directories are located in `/var/spool/freeside/conf'.
+<ul>
+  <li>address - Your company name and address, four lines.
+  <li>bsdshellmachines - Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/master.passwd'.
+  <li>cybercash2 - <a href="http://www.cybercash.com/cybercash/services/cashreg214.html">CyberCash v2</a> support, four lines: paymentserverhost, paymentserverport, paymentserversecret, and transaction type (`mauthonly' or `mauthcapture').  CCLib.pm is required.
+  <li>cybercash3.2 - <a href="http://www.cybercash.com/cybercash/services/technology.html">CyberCash v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly' or `mauthcapture').  CCMckLib3_2.pm, CCMckDirectLib3_2.pm and CCMckErrno3_2 are required.
+  <li>domain - Your domain name.
+  <li>erpcdmachines - Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd' and `/usr/annex/acp_dialup'.
+  <li>home - For new users, prefixed to usrename to create a directory name.  Should have a leading but not a trailing slash.
+  <li>lpr - Print command for paper invoices, for example `lpr -h'.
+  <li>nismachines - Your NIS master (not slave master) machines, one per line.  This enables export of `/etc/global/passwd' and `/etc/global/shadow'.
+  <li>qmailmachines - Your qmail machines, one per line.  This enables export of `/var/qmail/control/virtualdomains', `/var/qmail/control/recipientmap', and `/var/qmail/control/rcpthosts'.  The existance of this file (even if empty) also turns on user `.qmail-extension' file maintenance in conjunction with `shellmachine'.
+  <li>radiusmachines - Your RADIUS authentication machines, one per line.  This enables export of `/etc/raddb/users'.
+  <li>registries - Directory which contains domain registry information.  Each registry is a directory.
+    <ul>
+      <li>registries/internic - Currently the only supported registry
+        <ul>
+          <li>registries/internic/from - Email address from which InterNIC domain registrations are sent.
+          <li>regestries/internic/nameservers - The nameservers for InterNIC domain registrations, one per line.  Each line contains an IP address and hostname, separated by whitespace.
+          <li>registries/internic/tech_contact - Technical contact NIC handle for domain registrations.
+          <li>registries/internic/template - Template for InterNIC domain registrations with special markup.  A suitable copy of the InterNIC domain template v4.0 is in `fs-x.y.z/etc/domain-template.txt'.
+          <li>registries/internic/to - Email address to which InterNIC domain registrations are sent.
+        </ul>
+    </ul>
+  <li>secrets - Three lines: Database engine datasource (for example, `DBI:mysql:freeside' or `DBI:Pg:dbname=freeside'), username, and password.  This file should not be world readable.
+  <li>sendmailmachines - Your sendmail machines, one per line.  This enables export of `/etc/virtusertable' and `/etc/sendmail.cw'.
+  <li>shellmachine - A single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines', it also enables `.qmail-extension' file maintenance.
+  <li>shellmachines - Your Linux and System V flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/shadow' files.
+  <li>shells - Legal shells (think /etc/shells).  You probably want to `cut -d: -f7 /etc/passwd | sort | uniq' initially so that importing doesn't fail with `Illegal shell' errors, then remove any special entries afterwords.  A blank line specifies that an empty shell is permitted.
+  <li>smtpmachine - SMTP relay for Freeside's outgoing mail.
+</ul>
+</body>
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 29c26d9aa05185d7cd887d1d7c48e70f82fa27d2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Sep 1998 23:49:23 +0000
Subject: Initial revision

---
 site_perl/CGI.pm | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100644 site_perl/CGI.pm

diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
new file mode 100644
index 000000000..d2ed52122
--- /dev/null
+++ b/site_perl/CGI.pm
@@ -0,0 +1,143 @@
+package FS::CGI;
+
+use strict;
+use vars qw(@EXPORT_OK @ISA);
+use Exporter;
+use CGI::Base;
+use CGI::Carp qw(fatalsToBrowser);
+
+@ISA = qw(Exporter);
+@EXPORT_OK = qw(header menubar idiot eidiot);
+
+=head1 NAME
+
+FS::CGI - Subroutines for the web interface
+
+=head1 SYNOPSIS
+
+  use FS::CGI qw(header menubar idiot eidiot);
+
+  print header( 'Title', '' );
+  print header( 'Title', menubar('item', 'URL', ... ) );
+
+  idiot "error message"; 
+  eidiot "error message";
+
+=head1 DESCRIPTION
+
+Provides a few common subroutines for the web interface.
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item header TITLE, MENUBAR
+
+Returns an HTML header.
+
+=cut
+
+sub header {
+  my($title,$menubar)=@_;
+
+  <<END;
+    <HTML>
+      <HEAD>
+        <TITLE>
+          $title
+        </TITLE>
+      </HEAD>
+      <BODY>
+        <CENTER>
+          <H1>
+            $title
+          </H1>
+          $menubar
+        </CENTER>
+      <HR>
+END
+}
+
+=item menubar ITEM, URL, ...
+
+Returns an HTML menubar.
+
+=cut
+
+sub menubar { #$menubar=menubar('Main Menu', '../', 'Item', 'url', ... );
+  my($item,$url,@html);
+  while (@_) {
+    ($item,$url)=splice(@_,0,2);
+    push @html, qq!<A HREF="$url">$item</A>!;
+  }
+  join(' | ',@html);
+}
+
+=item idiot ERROR
+
+Sends headers and an HTML error message.
+
+=cut
+
+sub idiot {
+  my($error)=@_;
+  CGI::Base::SendHeaders();
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Error processing your request</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H4>Error processing your request</H4>
+    </CENTER>
+    Your request could not be processed because of the following error:
+    <P><B>$error</B>
+    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and try again.
+  </BODY>
+</HTML>
+END
+
+}
+
+=item eidiot ERROR
+
+Sends headers and an HTML error message, then exits.
+
+=cut
+
+sub eidiot {
+  idiot(@_);
+  exit;
+}
+
+=back
+
+=head1 BUGS
+
+Not OO.
+
+Not complete.
+
+Uses CGI-modules instead of CGI.pm
+
+=head1 SEE ALSO
+
+L<CGI::Base>
+
+=head1 HISTORY
+
+subroutines for the HTML/CGI GUI, not properly OO. :(
+
+ivan@sisd.com 98-apr-16
+ivan@sisd.com 98-jun-22
+
+lose the background, eidiot ivan@sisd.com 98-sep-2
+
+pod ivan@sisd.com 98-sep-12
+
+=cut
+
+1;
+
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 2d294f8309b99f02d895b2110c73f1295dab9138 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Sep 1998 23:58:53 +0000
Subject: Initial revision

---
 site_perl/SSH.pm | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 157 insertions(+)
 create mode 100644 site_perl/SSH.pm

diff --git a/site_perl/SSH.pm b/site_perl/SSH.pm
new file mode 100644
index 000000000..d5a0df654
--- /dev/null
+++ b/site_perl/SSH.pm
@@ -0,0 +1,157 @@
+package FS::SSH;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK $ssh $scp);
+use Exporter;
+use IPC::Open2;
+use IPC::Open3;
+
+@ISA = qw(Exporter);
+@EXPORT_OK = qw(ssh scp issh iscp sshopen2 sshopen3);
+
+$ssh="ssh";
+$scp="scp";
+
+=head1 NAME
+
+FS::SSH - Subroutines to call ssh and scp
+
+=head1 SYNOPSIS
+
+  use FS::SSH qw(ssh scp issh iscp sshopen2 sshopen3);
+
+  ssh($host, $command);
+
+  issh($host, $command);
+
+  scp($source, $destination);
+
+  iscp($source, $destination);
+
+  sshopen2($host, $reader, $writer, $command);
+
+  sshopen3($host, $reader, $writer, $error, $command);
+
+=head1 DESCRIPTION
+
+  Simple wrappers around ssh and scp commands.
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item ssh HOST, COMMAND 
+
+Calls ssh in batch mode.
+
+=cut
+
+sub ssh {
+  my($host,$command)=@_;
+  my(@cmd)=($ssh, "-o", "BatchMode yes", $host, $command);
+#  	print join(' ',@cmd),"\n";
+#0;
+  system(@cmd);
+}
+
+=item issh HOST, COMMAND
+
+Prints the ssh command to be executed, waits for the user to confirm, and
+(optionally) executes the command.
+
+=cut
+
+sub issh {
+  my($host,$command)=@_;
+  my(@cmd)=($ssh, $host, $command);
+  print join(' ',@cmd),"\n";
+  if ( &_yesno ) {
+    	###print join(' ',@cmd),"\n";
+    system(@cmd);
+  }
+}
+
+=item scp SOURCE, DESTINATION
+
+Calls scp in batch mode.
+
+=cut
+
+sub scp {
+  my($src,$dest)=@_;
+  my(@cmd)=($scp,"-Bprq",$src,$dest);
+#  	print join(' ',@cmd),"\n";
+#0;
+  system(@cmd);
+}
+
+=item iscp SOURCE, DESTINATION
+
+Prints the scp command to be executed, waits for the user to confirm, and
+(optionally) executes the command.
+
+=cut
+
+sub iscp {
+  my($src,$dest)=@_;
+  my(@cmd)=($scp,"-pr",$src,$dest);
+  print join(' ',@cmd),"\n";
+  if ( &_yesno ) {
+    	###print join(' ',@cmd),"\n";
+    system(@cmd);
+  }
+}
+
+=item sshopen2 HOST, READER, WRITER, COMMAND
+
+Connects the supplied filehandles to the ssh process (in batch mode).
+
+=cut
+
+sub sshopen2 {
+  my($host,$reader,$writer,$command)=@_;
+  open2($reader,$writer,$ssh,'-o','Batchmode yes',$host,$command);
+}
+
+=item sshopen3 HOST, WRITER, READER, ERROR, COMMAND
+
+Connects the supplied filehandles to the ssh process (in batch mode).
+
+=cut
+
+sub sshopen3 {
+  my($host,$writer,$reader,$error,$command)=@_;
+  open3($writer,$reader,$error,$ssh,'-o','Batchmode yes',$host,$command);
+}
+
+sub _yesno {
+  print "Proceed [y/N]:";
+  my($x)=scalar(<STDIN>);
+  $x =~ /^y/i;
+}
+
+=head1 BUGS
+
+Not OO.
+
+scp stuff should transparantly use rsync-over-ssh instead.
+
+=head1 SEE ALSO
+
+L<ssh>, L<scp>, L<IPC::Open2>, L<IPC::Open3>
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jul-17
+
+added sshopen2 and sshopen3 ivan@sisd.com 98-mar-9
+
+added iscp ivan@sisd.com 98-jul-25
+now iscp asks y/n, issh and took out path ivan@sisd.com 98-jul-30
+
+pod ivan@sisd.com 98-sep-21
+
+=cut
+
+1;
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 4478d24bd8f66aaff7e2f304d3c2fe2cc1d3bf04 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Sep 1998 02:57:14 +0000
Subject: Initial revision

---
 site_perl/agent.pm     | 166 +++++++++++++++++
 site_perl/cust_bill.pm | 495 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 661 insertions(+)
 create mode 100644 site_perl/agent.pm
 create mode 100644 site_perl/cust_bill.pm

diff --git a/site_perl/agent.pm b/site_perl/agent.pm
new file mode 100644
index 000000000..7fc370ed0
--- /dev/null
+++ b/site_perl/agent.pm
@@ -0,0 +1,166 @@
+package FS::agent;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK);
+use Exporter;
+use FS::Record qw(fields qsearch qsearchs);
+
+@ISA = qw(FS::Record Exporter);
+@EXPORT_OK = qw(fields);
+
+=head1 NAME
+
+FS::agent - Object methods for agent records
+
+=head1 SYNOPSIS
+
+  use FS::agent;
+
+  $record = create FS::agent \%hash;
+  $record = create FS::agent { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::agent object represents an agent.  Every customer has an agent.  Agents
+can be used to track things like resellers or salespeople.  FS::agent inherits
+from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item agemtnum - primary key (assigned automatically for new agents)
+
+=item agent - Text name of this agent
+
+=item typenum - Agent type.  See L<FS::agent_type>
+
+=item prog - For future use.
+
+=item freq - For future use.
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new agent.  To add the agent to the database, see L<"insert">.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('agent')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('agent',$hashref);
+}
+
+=item insert
+
+Adds this agent to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  $self->check or
+  $self->add;
+}
+
+=item delete
+
+Deletes this agent from the database.  Only agents with no customers can be
+deleted.  If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub delete {
+  my($self)=@_;
+  return "Can't delete an agent with customers!"
+    if qsearch('cust_main',{'agentnum' => $self->agentnum});
+  $self->del;
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  return "(Old) Not an agent record!" unless $old->table eq "agent";
+  return "Can't change agentnum!"
+    unless $old->getfield('agentnum') eq $new->getfield('agentnum');
+  $new->check or
+  $new->rep($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid agent.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a agent record!" unless $self->table eq "agent";
+
+  my($error)=
+    $self->ut_numbern('agentnum')
+      or $self->ut_text('agent')
+      or $self->ut_number('typenum')
+      or $self->ut_numbern('freq')
+      or $self->ut_textn('prog')
+  ;
+  return $error if $error;
+
+  return "Unknown typenum!"
+    unless qsearchs('agent_type',{'typenum'=> $self->getfield('typenum') });
+
+  '';
+
+}
+
+=back
+
+=head1 BUGS
+
+It doesn't properly override FS::Record yet.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::agent_type>, L<FS::cust_main>, schema.html from the base
+documentation.
+
+=head1 HISTORY
+
+Class dealing with agent (resellers)
+
+ivan@sisd.com 97-nov-13, 97-dec-10
+
+pod, added check in ->delete ivan@sisd.com 98-sep-22
+
+=cut
+
+1;
+
diff --git a/site_perl/cust_bill.pm b/site_perl/cust_bill.pm
new file mode 100644
index 000000000..00234519a
--- /dev/null
+++ b/site_perl/cust_bill.pm
@@ -0,0 +1,495 @@
+package FS::cust_bill;
+
+use strict;
+use vars qw(@ISA $conf $add1 $add2 $add3 $add4);
+use Exporter;
+use Date::Format;
+use FS::Record qw(fields qsearch qsearchs);
+
+@ISA = qw(FS::Record Exporter);
+
+$conf = new FS::Conf;
+
+($add1,$add2,$add3,$add4) = $conf->config('address');
+
+=head1 NAME
+
+FS::cust_bill - Object methods for cust_bill records
+
+=head1 SYNOPSIS
+
+  use FS::cust_bill;
+
+  $record = create FS::cust_bill \%hash;
+  $record = create FS::cust_bill { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  ( $total_previous_balance, @previous_cust_bill ) = $record->previous;
+
+  @cust_bill_pkg_objects = $cust_bill->cust_bill_pkg;
+
+  ( $total_previous_credits, @previous_cust_credit ) = $record->cust_credit;
+
+  @cust_pay_objects = $cust_bill->cust_pay;
+
+  @lines = $cust_bill->print_text;
+  @lines = $cust_bill->print_text $time;
+
+=head1 DESCRIPTION
+
+An FS::cust_bill object represents an invoice.  FS::cust_bill inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item invnum - primary key (assigned automatically for new invoices)
+
+=item custnum - customer (see L<FS::cust_main>)
+
+=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=item charged - amount of this invoice
+
+=item owed - amount still outstanding on this invoice, which is charged minus
+all payments (see L<FS::cust_pay>).
+
+=item printed - how many times this invoice has been printed automatically
+(see L<FS::cust_main/"collect">).
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new invoice.  To add the invoice to the database, see L<"insert">.
+Invoices are normally created by calling the bill method of a customer object
+(see L<FS::cust_main>).
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('cust_bill')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('cust_bill',$hashref);
+}
+
+=item insert
+
+Adds this invoice to the database ("Posts" the invoice).  If there is an error,
+returns the error, otherwise returns false.
+
+When adding new invoices, owed must be charged (or null, in which case it is
+automatically set to charged).
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  $self->setfield('owed',$self->charged) if $self->owed eq '';
+  return "owed != charged!"
+    unless $self->owed == $self->charged;
+
+  $self->check or
+  $self->add;
+}
+
+=item delete
+
+Currently unimplemented.  I don't remove invoices because there would then be
+no record you ever posted this invoice (which is bad, no?)
+
+=cut
+
+sub delete {
+  return "Can't remove invoice!"
+  #my($self)=@_;
+  #$self->del;
+}
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+Only owed and printed may be changed.  Owed is normally updated by creating and
+inserting a payment (see L<FS::cust_pay>).  Printed is normally updated by
+calling the collect method of a customer object (see L<FS::cust_main>).
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  return "(Old) Not a cust_bill record!" unless $old->table eq "cust_bill";
+  return "Can't change invnum!"
+    unless $old->getfield('invnum') eq $new->getfield('invnum');
+  return "Can't change custnum!"
+    unless $old->getfield('custnum') eq $new->getfield('custnum');
+  return "Can't change _date!"
+    unless $old->getfield('_date') eq $new->getfield('_date');
+  return "Can't change charged!"
+    unless $old->getfield('charged') eq $new->getfield('charged');
+  return "(New) owed can't be > (new) charged!"
+    if $new->getfield('owed') > $new->getfield('charged');
+
+  $new->check or
+  $new->rep($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid invoice.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a cust_bill record!" unless $self->table eq "cust_bill";
+  my($recref) = $self->hashref;
+
+  $recref->{invnum} =~ /^(\d*)$/ or return "Illegal invnum";
+  $recref->{invnum} = $1;
+
+  $recref->{custnum} =~ /^(\d+)$/ or return "Illegal custnum";
+  $recref->{custnum} = $1;
+  return "Unknown customer"
+    unless qsearchs('cust_main',{'custnum'=>$recref->{custnum}});
+
+  $recref->{_date} =~ /^(\d*)$/ or return "Illegal date";
+  $recref->{_date} = $recref->{_date} ? $1 : time;
+
+  #$recref->{charged} =~ /^(\d+(\.\d\d)?)$/ or return "Illegal charged";
+  $recref->{charged} =~ /^(\-?\d+(\.\d\d)?)$/ or return "Illegal charged";
+  $recref->{charged} = $1;
+
+  $recref->{owed} =~ /^(\-?\d+(\.\d\d)?)$/ or return "Illegal owed";
+  $recref->{owed} = $1;
+
+  $recref->{printed} =~ /^(\d*)$/ or return "Illegal printed";
+  $recref->{printed} = $1 || '0';
+
+  ''; #no error
+}
+
+=item previous
+
+Returns a list consisting of the total previous balance for this customer, 
+followed by the previous outstanding invoices (as FS::cust_bill objects also).
+
+=cut
+
+sub previous {
+  my($self)=@_;
+  my($total)=0;
+  my(@cust_bill) = sort { $a->_date <=> $b->_date }
+    grep { $_->owed != 0 && $_->_date < $self->_date }
+      qsearch('cust_bill',{ 'custnum' => $self->custnum } ) 
+  ;
+  foreach (@cust_bill) { $total += $_->owed; }
+  $total, @cust_bill;
+}
+
+=item cust_bill_pkg
+
+Returns the line items (see L<FS::cust_bill_pkg>) for this invoice.
+
+=cut
+
+sub cust_bill_pkg {
+  my($self)=@_;
+  qsearch( 'cust_bill_pkg', { 'invnum' => $self->invnum } );
+}
+
+=item cust_credit
+
+Returns a list consisting of the total previous credited (see
+L<FS::cust_credit>) for this customer, followed by the previous outstanding
+credits (FS::cust_credit objects).
+
+=cut
+
+sub cust_credit {
+  my($self)=@_;
+  my($total)=0;
+  my(@cust_credit) = sort { $a->_date <=> $b->date }
+    grep { $_->credited != 0 && $_->_date < $self->_date }
+      qsearch('cust_credit', { 'custnum' => $self->custnum } )
+  ;
+  foreach (@cust_credit) { $total += $_->credited; }
+  $total, @cust_credit;
+}
+
+=item cust_pay
+
+Returns all payments (see L<FS::cust_pay>) for this invoice.
+
+=cut
+
+sub cust_pay {
+  my($self)=@_;
+  sort { $a->_date <=> $b->date }
+    qsearch( 'cust_pay', { 'invnum' => $self->invnum } )
+  ;
+}
+
+=item print_text [TIME];
+
+Returns an ASCII invoice, as a list of lines.
+
+TIME an optional value used to control the printing of overdue messages.  The
+default is now.  It isn't the date of the invoice; that's the `_date' field.
+It is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=cut
+
+sub print_text {
+
+  my($self,$today)=@_;
+  $today ||= time;
+  my($invnum)=$self->invnum;
+  my($cust_main) = qsearchs('cust_main', 
+                            { 'custnum', $self->custnum } );
+  $cust_main->setfield('payname',
+    $cust_main->first. ' '. $cust_main->getfield('last')
+  ) unless $cust_main->payname;
+
+  my($pr_total,@pr_cust_bill) = $self->previous; #previous balance
+  my($cr_total,@cr_cust_credit) = $self->cust_credit; #credits
+  my($balance_due) = $self->owed + $pr_total - $cr_total;
+
+  #overdue?
+  my($overdue) = ( 
+    $balance_due > 0
+    && $today > $self->_date 
+    && $self->printed > 1
+  );
+
+  #printing bits here
+
+  local($SIG{CHLD}) = sub { wait() };
+  $|=1;
+  my($pid)=open(CHILD,"-|");
+  die "Can't fork: $!" unless defined($pid); 
+
+  if ($pid) { #parent
+    my(@collect)=<CHILD>;
+    close CHILD;
+    return @collect;
+  } else { #child
+
+    my($description,$amount);
+    my(@buf);
+
+    #define format stuff
+    $%=0;
+    $= = 35;
+    local($^L) = <<END;
+
+
+
+
+
+
+
+END
+
+    #format address
+    my($l,@address)=(0,'','','','','');
+    $address[$l++]=$cust_main->company if $cust_main->company;
+    $address[$l++]=$cust_main->address1;
+    $address[$l++]=$cust_main->address2 if $cust_main->address2;
+    $address[$l++]=$cust_main->city. ", ". $cust_main->state. "  ".
+                   $cust_main->zip;
+    $address[$l++]=$cust_main->country unless $cust_main->country eq 'US';
+
+    #previous balance
+    foreach ( @pr_cust_bill ) {
+      push @buf, (
+        "Previous Balance, Invoice #". $_->invnum. 
+                   " (". time2str("%x",$_->_date). ")",
+        '$'. sprintf("%10.2f",$_->owed)
+      );
+    }
+    if (@pr_cust_bill) {
+      push @buf,('','-----------');
+      push @buf,('Total Previous Balance','$' . sprintf("%10.2f",$pr_total ) );
+      push @buf,('','');
+    }
+
+    #new charges
+    foreach ( $self->cust_bill_pkg ) {
+
+      if ( $_->pkgnum ) {
+
+        my($cust_pkg)=qsearchs('cust_pkg', { 'pkgnum', $_->pkgnum } );
+        my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->pkgpart});
+        my($pkg)=$part_pkg->pkg;
+
+        push @buf, ( "$pkg Setup",'$' . sprintf("%10.2f",$_->setup) )
+          if $_->setup != 0;
+        push @buf, (
+          "$pkg (" . time2str("%x",$_->sdate) . " - " .
+                                time2str("%x",$_->edate) . ")",
+          '$' . sprintf("%10.2f",$_->recur)
+        ) if $_->recur != 0;
+
+      } else { #pkgnum Tax
+        push @buf,("Tax",'$' . sprintf("%10.2f",$_->setup) ) 
+          if $_->setup != 0;
+      }
+    }
+
+    push @buf,('','-----------');
+    push @buf,('Total New Charges',
+               '$' . sprintf("%10.2f",$self->charged) );
+    push @buf,('','');
+
+    push @buf,('','-----------');
+    push @buf,('Total Charges',
+               '$' . sprintf("%10.2f",$self->charged + $pr_total) );
+    push @buf,('','');
+
+    #credits
+    foreach ( @cr_cust_credit ) {
+      push @buf,(
+        "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
+        '$' . sprintf("%10.2f",$_->credited)
+      );
+    }
+
+    #get & print payments
+    foreach ( $self->cust_pay ) {
+      push @buf,(
+        "Payment received ". time2str("%x",$_->_date ),
+        '$' . sprintf("%10.2f",$_->paid )
+      );
+    }
+
+    #balance due
+    push @buf,('','-----------');
+    push @buf,('Balance Due','$' . 
+      sprintf("%10.2f",$self->owed + $pr_total - $cr_total ) );
+
+    #now print
+
+    my($tot_pages)=int(scalar(@buf)/30); #15 lines, 2 values per line
+    $tot_pages++ if scalar(@buf) % 30;
+
+    while (@buf) {
+      $description=shift(@buf);
+      $amount=shift(@buf);
+      write;
+    }
+      ($description,$amount)=('','');
+      write while ( $- );
+      print $^L;
+
+      exit; #kid
+
+    format STDOUT_TOP =
+
+                                      @|||||||||||||||||||
+                                     "Invoice"
+                                      @||||||||||||||||||| @<<<<<<< @<<<<<<<<<<<
+{
+              ( $tot_pages != 1 ) ? "Page $% of $tot_pages" : '',
+  time2str("%x",( $self->_date )), "FS-$invnum"
+}
+
+
+@>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+$add1
+@>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+$add2
+@>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+$add3
+@>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+$add4
+
+  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<             @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+{ $cust_main->payname,
+  ( ( $cust_main->payby eq 'BILL' ) && $cust_main->payinfo )
+  ? "P.O. #". $cust_main->payinfo : ''
+}
+  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<             @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+$address[0],''
+  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<             @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+$address[1],$overdue ? "* This invoice is now PAST DUE! *" : ''
+  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<             @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+$address[2],$overdue ? " Please forward payment promptly " : ''
+  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<             @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+$address[3],$overdue ? "to avoid interruption of service." : ''
+  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<             @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+$address[4],''
+
+
+
+.
+
+    format STDOUT =
+  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<
+  $description,$amount
+.
+
+  } #endchild
+
+}
+
+=back
+
+=head1 BUGS
+
+The delete method.
+
+It doesn't properly override FS::Record yet.
+
+print_text formatting (and some logic :/) is in source as a format declaration,
+which needs to be slurped in from a file.  the fork is rather kludgy as well.
+It could be cleaned with swrite from man perlform, and the picture could be
+put in a /var/spool/freeside/conf file.  Also number of lines ($=).
+
+missing print_ps for a nice postscript copy (maybe HylaFAX-cover-page-style
+or something similar so the look can be completely customized?)
+
+There is an off-by-one error in print_text which causes a visual error: "Page 1
+of 2" printed on some single-page invoices?
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_main>, L<FS::cust_pay>, L<FS::cust_bill_pkg>,
+L<FS::cust_credit>, schema.html from the base documentation.
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jul-1
+
+small fix for new API ivan@sisd.com 98-mar-14
+
+charges can be negative ivan@sisd.com 98-jul-13
+
+pod, ingegrate with FS::Invoice ivan@sisd.com 98-sep-20
+
+=cut
+
+1;
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 2255eb267a486f9b6e6dea7b0a3bc5ce6a1d22d1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Sep 1998 03:40:58 +0000
Subject: Initial revision

---
 site_perl/cust_bill_pkg.pm | 177 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 177 insertions(+)
 create mode 100644 site_perl/cust_bill_pkg.pm

diff --git a/site_perl/cust_bill_pkg.pm b/site_perl/cust_bill_pkg.pm
new file mode 100644
index 000000000..e41d7c12c
--- /dev/null
+++ b/site_perl/cust_bill_pkg.pm
@@ -0,0 +1,177 @@
+package FS::cust_bill_pkg;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK);
+use Exporter;
+use FS::Record qw(fields qsearchs);
+
+@ISA = qw(FS::Record Exporter);
+@EXPORT_OK = qw(fields);
+
+=head1 NAME
+
+FS::cust_bill_pkg - Object methods for cust_bill_pkg records
+
+=head1 SYNOPSIS
+
+  use FS::cust_bill_pkg;
+
+  $record = create FS::cust_bill_pkg \%hash;
+  $record = create FS::cust_bill_pkg { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_bill_pkg object represents an invoice line item.
+FS::cust_bill_pkg inherits from FS::Record.  The following fields are currently
+supported:
+
+=over 4
+
+=item invnum - invoice (see L<FS::cust_bill>)
+
+=item pkgnum - package (see L<FS::cust_pkg>)
+
+=item setup - setup fee
+
+=item recur - recurring fee
+
+=item sdate - starting date of recurring fee
+
+=item edate - ending date of recurring fee
+
+=back
+
+sdate and edate are specified as UNIX timestamps; see L<perlfunc/"time">.  Also
+see L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new line item.  To add the line item to the database, see
+L<"insert">.  Line items are normally created by calling the bill method of a
+customer object (see L<FS::cust_main>).
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('cust_bill_pkg')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('cust_bill_pkg',$hashref);
+
+}
+
+=item insert
+
+Adds this line item to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  $self->check or
+  $self->add;
+}
+
+=item delete
+
+Currently unimplemented.  I don't remove line items because there would then be
+no record the items ever existed (which is bad, no?)
+
+=cut
+
+sub delete {
+  return "Can't delete cust_bill_pkg records!";
+  #my($self)=@_;
+  #$self->del;
+}
+
+=item replace OLD_RECORD
+
+Currently unimplemented.  This would be even more of an accounting nightmare
+than deleteing the items.  Just don't do it.
+
+=cut
+
+sub replace {
+  return "Can't modify cust_bill_pkg records!";
+  #my($new,$old)=@_;
+  #return "(Old) Not a cust_bill_pkg record!" 
+  #  unless $old->table eq "cust_bill_pkg";
+  #
+  #$new->check or
+  #$new->rep($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid line item.  If there is an
+error, returns the error, otherwise returns false.  Called by the insert
+method.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a cust_bill_pkg record!" unless $self->table eq "cust_bill_pkg";
+
+  my($error)=
+    $self->ut_number('pkgnum')
+      or $self->ut_number('invnum')
+      or $self->ut_money('setup')
+      or $self->ut_money('recur')
+      or $self->ut_numbern('sdate')
+      or $self->ut_numbern('edate')
+  ;
+  return $error if $error;
+
+  if ( $self->pkgnum != 0 ) { #allow unchecked pkgnum 0 for tax! (add to part_pkg?)
+    return "Unknown pkgnum ".$self->pkgnum
+    unless qsearchs('cust_pkg',{'pkgnum'=> $self->pkgnum });
+  }
+
+  return "Unknown invnum"
+    unless qsearchs('cust_bill',{'invnum'=> $self->invnum });
+
+  ''; #no error
+}
+
+=back
+
+=head1 BUGS
+
+It doesn't properly override FS::Record yet.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_bill>, L<FS::cust_pkg>, L<FS::cust_main>, schema.html
+from the base documentation.
+
+=head1 HISTORY
+
+ivan@sisd.com 98-mar-13
+
+pod ivan@sisd.com 98-sep-21
+
+=cut
+
+1;
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 57ec0f19ef5202f425f9ad2c459069fb3b88e28a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Sep 1998 06:08:28 +0000
Subject: Initial revision

---
 site_perl/cust_main.pm | 868 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 868 insertions(+)
 create mode 100644 site_perl/cust_main.pm

diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
new file mode 100644
index 000000000..ec282731e
--- /dev/null
+++ b/site_perl/cust_main.pm
@@ -0,0 +1,868 @@
+#this is so kludgy i'd be embarassed if it wasn't cybercash's fault
+package main;
+use vars qw($paymentserversecret $paymentserverport $paymentserverhost);
+
+package FS::cust_main;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK $conf $lpr $processor $xaction $E_NoErr);
+use Safe;
+use Exporter;
+use Carp;
+use Time::Local;
+use Date::Format;
+use Date::Manip;
+use Business::CreditCard;
+use FS::UID qw(getotaker);
+use FS::Record qw(fields hfields qsearchs qsearch);
+use FS::cust_pkg;
+use FS::cust_bill;
+use FS::cust_bill_pkg;
+use FS::cust_pay;
+#use FS::cust_pay_batch;
+
+@ISA = qw(FS::Record Exporter);
+@EXPORT_OK = qw(hfields);
+
+$conf = new FS::Conf;
+$lpr = $conf->config('lpr');
+
+if ( $conf->exists('cybercash3.2') ) {
+  require CCMckLib3_2;
+    #qw($MCKversion %Config InitConfig CCError CCDebug CCDebug2);
+  require CCMckDirectLib3_2;
+    #qw(SendCC2_1Server);
+  require CCMckErrno3_2;
+    #qw(MCKGetErrorMessage $E_NoErr);
+  import CCMckErrno3_2 qw($E_NoErr);
+  my $merchant_conf;
+  ($merchant_conf,$xaction)= $conf->config('cybercash3.2');
+  my $status = &CCMckLib3_2::InitConfig($merchant_conf);
+  if ( $status != $E_NoErr ) {
+    warn "CCMckLib3_2::InitConfig error:\n";
+    foreach my $key (keys %CCMckLib3_2::Config) {
+      warn "  $key => $CCMckLib3_2::Config{$key}\n"
+    }
+    my($errmsg) = &CCMckErrno3_2::MCKGetErrorMessage($status);
+    die "CCMckLib3_2::InitConfig fatal error: $errmsg\n";
+  }
+  $processor='cybercash3.2';
+} elsif ( $conf->exists('cybercash2') ) {
+  require CCLib;
+    #qw(sendmserver);
+  ( $main::paymentserverhost, 
+    $main::paymentserverport, 
+    $main::paymentserversecret,
+    $xaction,
+  ) = $conf->config('cybercash2');
+  $processor='cybercash2';
+}
+
+=head1 NAME
+
+FS::cust_main - Object methods for cust_main records
+
+=head1 SYNOPSIS
+
+  use FS::cust_main;
+
+  $record = create FS::cust_main \%hash;
+  $record = create FS::cust_main { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  @cust_pkg = $record->all_pkgs;
+
+  @cust_pkg = $record->ncancelled_pkgs;
+
+  $error = $record->bill;
+  $error = $record->bill %options;
+  $error = $record->bill 'time' => $time;
+
+  $error = $record->collect;
+  $error = $record->collect %options;
+  $error = $record->collect 'invoice_time'   => $time,
+                            'batch_card'     => 'yes',
+                            'report_badcard' => 'yes',
+                          ;
+
+=head1 DESCRIPTION
+
+An FS::cust_main object represents a customer.  FS::cust_main inherits from 
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item custnum - primary key (assigned automatically for new customers)
+
+=item agentnum - agent (see L<FS::agent>)
+
+=item refnum - referral (see L<FS::part_referral>)
+
+=item first - name
+
+=item last - name
+
+=item ss - social security number (optional)
+
+=item company - (optional)
+
+=item address1
+
+=item address2 - (optional)
+
+=item city
+
+=item county - (optional, see L<FS::cust_main_county>)
+
+=item state - (see L<FS::cust_main_county>)
+
+=item zip
+
+=item country - (see L<FS::cust_main_county>)
+
+=item daytime - phone (optional)
+
+=item night - phone (optional)
+
+=item payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
+
+=item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
+
+=item paydate - expiration date, mm/yyyy, m/yyyy, mm/yy or m/yy
+
+=item payname - name on card or billing name
+
+=item tax - tax exempt, empty or `Y'
+
+=item otaker - order taker (assigned automatically, see L<FS::UID>)
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new customer.  To add the customer to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my $field;
+  #foreach $field (fields('cust_main')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('cust_main',$hashref);
+}
+
+=item insert
+
+Adds this customer to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  #no callbacks in check, only data checks
+  #local $SIG{HUP} = 'IGNORE';
+  #local $SIG{INT} = 'IGNORE';
+  #local $SIG{QUIT} = 'IGNORE';
+  #local $SIG{TERM} = 'IGNORE';
+  #local $SIG{TSTP} = 'IGNORE';
+
+  $self->check or
+  $self->add;
+}
+
+=item delete
+
+Currently unimplemented.  Maybe cancel all of this customer's
+packages (cust_pkg)?
+
+I don't remove the customer record in the database because there would then
+be no record the customer ever existed (which is bad, no?)
+
+=cut
+
+# Usage: $error = $record -> delete;
+sub delete {
+   return "Can't (yet?) delete customers.";
+#  my($self)=@_;
+#
+#  $self->del;
+}
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  return "(Old) Not a cust_main record!" unless $old->table eq "cust_main";
+  return "Can't change custnum!"
+    unless $old->getfield('custnum') eq $new->getfield('custnum');
+  $new->check or
+  $new->rep($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid customer record.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+
+=cut
+
+sub check {
+  my($self)=@_;
+
+  return "Not a cust_main record!" unless $self->table eq "cust_main";
+
+  my $error =
+    $self->ut_number('agentnum')
+    || $self->ut_number('refnum')
+    || $self->ut_textn('company')
+    || $self->ut_text('address1')
+    || $self->ut_textn('address2')
+    || $self->ut_text('city')
+    || $self->ut_textn('county')
+    || $self->ut_text('state')
+    || $self->ut_phonen('daytime')
+    || $self->ut_phonen('night')
+    || $self->ut_phonen('fax')
+  ;
+  return $error if $error;
+
+  return "Unknown agent"
+    unless qsearchs('agent',{'agentnum'=>$self->agentnum});
+
+  return "Unknown referral"
+    unless qsearchs('part_referral',{'refnum'=>$self->refnum});
+
+  $self->getfield('last') =~ /^([\w \,\.\-\']+)$/ or return "Illegal last name";
+  $self->setfield('last',$1);
+
+  $self->first =~ /^([\w \,\.\-\']+)$/ or return "Illegal first name";
+  $self->first($1);
+
+  if ( $self->ss eq '' ) {
+    $self->ss('');
+  } else {
+    my $ss = $self->ss;
+    $ss =~ s/\D//g;
+    $ss =~ /^(\d{3})(\d{2})(\d{4})$/
+      or return "Illegal social security number";
+    $self->ss("$1-$2-$3");
+  }
+
+  return "Unknown state/county/country"
+    unless qsearchs('cust_main_county',{
+      'state'  => $self->state,
+      'county' => $self->county,
+    } );
+
+  #int'l zips?
+  $self->zip =~ /^(\d{5}(-\d{4})?)$/ or return "Illegal zip";
+  $self->zip($1);
+
+  #int'l countries!
+  $self->country =~ /^(US)$/ or return "Illegal country";
+  $self->country($1);
+
+  $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
+  $self->payby($1);
+
+  if ( $self->payby eq 'CARD' ) {
+
+    my $payinfo = $self->payinfo;
+    $payinfo =~ s/\D//g;
+    $payinfo =~ /^(\d{13,16})$/
+      or return "Illegal credit card number";
+    $payinfo = $1;
+    $self->payinfo($payinfo);
+    validate($payinfo) or return "Illegal credit card number";
+    my $type = cardtype($payinfo);
+    return "Unknown credit card type"
+      unless ( $type =~ /^VISA/ ||
+               $type =~ /^MasterCard/ ||
+               $type =~ /^American Express/ ||
+               $type =~ /^Discover/ );
+
+  } elsif ( $self->payby eq 'BILL' ) {
+
+    $self->payinfo =~ /^([\w \-]*)$/ or return "Illegal P.O. number";
+    $self->payinfo($1);
+
+  } elsif ( $self->payby eq 'COMP' ) {
+
+    $self->payinfo =~ /^(\w{2,8})$/ or return "Illegal comp account issuer";
+    $self->payinfo($1);
+
+  }
+
+  if ( $self->paydate eq '' ) {
+    return "Expriation date required" unless $self->payby eq 'BILL';
+    $self->paydate('');
+  } else {
+    $self->paydate =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/
+      or return "Illegal expiration date";
+    if ( length($2) == 4 ) {
+      $self->paydate("$2-$1-01");
+    } elsif ( $2 > 97 ) { #should pry change to check for "this year"
+      $self->paydate("19$2-$1-01");
+    } else {
+      $self->paydate("20$2-$1-01");
+    }
+  }
+
+  if ( $self->payname eq '' ) {
+    $self->payname( $self->first. " ". $self->getfield('last') );
+  } else {
+    $self->payname =~ /^([\w \,\.\-\']+)$/
+      or return "Illegal billing name";
+    $self->payname($1);
+  }
+
+  $self->tax =~ /^(Y?)$/ or return "Illegal tax";
+  $self->tax($1);
+
+  $self->otaker(getotaker);
+
+  ''; #no error
+}
+
+=item all_pkgs
+
+Returns all packages (see L<FS::cust_pkg>) for this customer.
+
+=cut
+
+sub all_pkgs {
+  my($self)=@_;
+  qsearch( 'cust_pkg', { 'custnum' => $self->custnum });
+}
+
+=item ncancelled_pkgs
+
+Returns all non-cancelled packages (see L<FS::cust_pkg>) for this customer.
+
+=cut
+
+sub ncancelled_pkgs {
+  my($self)=@_;
+  qsearch( 'cust_pkg', {
+    'custnum' => $self->custnum,
+    'cancel'  => '',
+  });
+}
+
+=item bill OPTIONS
+
+Generates invoices (see L<FS::cust_bill>) for this customer.  Usually used in
+conjunction with the collect method.
+
+The only currently available option is `time', which bills the customer as if
+it were that time.  It is specified as a UNIX timestamp; see
+L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse> for conversion
+functions.
+
+If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub bill {
+  my($self,%options)=@_;
+  my($time) = $options{'time'} || $^T;
+
+  my($error);
+
+  #put below somehow?
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  # find the packages which are due for billing, find out how much they are
+  # & generate invoice database.
+ 
+  my($total_setup,$total_recur)=(0,0);
+
+  my(@cust_bill_pkg);
+
+  my($cust_pkg);
+  foreach $cust_pkg (
+    qsearch('cust_pkg',{'custnum'=> $self->getfield('custnum') } )
+  ) {
+
+    bless($cust_pkg,"FS::cust_pkg");
+ 
+    next if ( $cust_pkg->getfield('cancel') );  
+
+    #? to avoid use of uninitialized value errors... ?
+    $cust_pkg->setfield('bill', '')
+      unless defined($cust_pkg->bill);
+ 
+    my($part_pkg)=
+      qsearchs('part_pkg',{'pkgpart'=> $cust_pkg->pkgpart } );
+
+    #so we don't modify cust_pkg record unnecessarily
+    my($cust_pkg_mod_flag)=0;
+    my(%hash)=$cust_pkg->hash;
+    my($old_cust_pkg)=create FS::cust_pkg(\%hash);
+
+    # bill setup
+    my($setup)=0;
+    unless ( $cust_pkg->setup ) {
+      my($setup_prog)=$part_pkg->getfield('setup');
+      my($cpt) = new Safe;
+      #$cpt->permit(); #what is necessary?
+      $cpt->share(qw($cust_pkg)); #can $cpt now use $cust_pkg methods?
+      $setup = $cpt->reval($setup_prog);
+      unless ( defined($setup) ) {
+        warn "Error reval-ing part_pkg->setup pkgpart ", 
+             $part_pkg->pkgpart, ": $@";
+      } else {
+        $cust_pkg->setfield('setup',$time);
+        $cust_pkg_mod_flag=1; 
+      }
+    }
+
+    #bill recurring fee
+    my($recur)=0;
+    my($sdate);
+    if ( $part_pkg->getfield('freq') > 0 &&
+         ! $cust_pkg->getfield('susp') &&
+         ( $cust_pkg->getfield('bill') || 0 ) < $time
+    ) {
+      my($recur_prog)=$part_pkg->getfield('recur');
+      my($cpt) = new Safe;
+      #$cpt->permit(); #what is necessary?
+      $cpt->share(qw($cust_pkg)); #can $cpt now use $cust_pkg methods?
+      $recur = $cpt->reval($recur_prog);
+      unless ( defined($recur) ) {
+        warn "Error reval-ing part_pkg->recur pkgpart ",
+             $part_pkg->pkgpart, ": $@";
+      } else {
+        #change this bit to use Date::Manip?
+        #$sdate=$cust_pkg->bill || time;
+        #$sdate=$cust_pkg->bill || $time;
+        $sdate=$cust_pkg->bill || $cust_pkg->setup || $time;
+        my($sec,$min,$hour,$mday,$mon,$year)=
+          (localtime($sdate) )[0,1,2,3,4,5];
+        $mon += $part_pkg->getfield('freq');
+        until ( $mon < 12 ) { $mon -= 12; $year++; }
+        $cust_pkg->setfield('bill',timelocal($sec,$min,$hour,$mday,$mon,$year));
+        $cust_pkg_mod_flag=1; 
+      }
+    }
+
+    warn "setup is undefinded" unless defined($setup);
+    warn "recur is undefinded" unless defined($recur);
+    warn "cust_pkg bill is undefinded" unless defined($cust_pkg->bill);
+
+    if ($cust_pkg_mod_flag) {
+      $error=$cust_pkg->replace($old_cust_pkg);
+      if ( $error ) {
+        warn "Error modifying pkgnum ", $cust_pkg->pkgnum, ": $error";
+      } else {
+        #just in case
+        $setup=sprintf("%.2f",$setup);
+        $recur=sprintf("%.2f",$recur);
+        my($cust_bill_pkg)=create FS::cust_bill_pkg ({
+          'pkgnum' => $cust_pkg->pkgnum,
+          'setup'  => $setup,
+          'recur'  => $recur,
+          'sdate'  => $sdate,
+          'edate'  => $cust_pkg->bill,
+        });
+        push @cust_bill_pkg, $cust_bill_pkg;
+        $total_setup += $setup;
+        $total_recur += $recur;
+      }
+    }
+
+  }
+
+  my($charged)=sprintf("%.2f",$total_setup + $total_recur);
+
+  return '' if scalar(@cust_bill_pkg) == 0;
+
+  unless ( $self->getfield('tax') eq 'Y' ||
+           $self->getfield('tax') eq 'y' ||
+           $self->getfield('payby') eq 'COMP'
+  ) {
+    my($cust_main_county) = qsearchs('cust_main_county',{
+      'county' => $self->getfield('county'),
+      'state'  => $self->getfield('state'),
+    } );
+    my($tax) = sprintf("%.2f",
+      $charged * ( $cust_main_county->getfield('tax') / 100 )
+    );
+    $charged = sprintf("%.2f",$charged+$tax);
+
+    my($cust_bill_pkg)=create FS::cust_bill_pkg ({
+      'pkgnum' => 0,
+      'setup'  => $tax,
+      'recur'  => 0,
+      'sdate'  => '',
+      'edate'  => '',
+    });
+    push @cust_bill_pkg, $cust_bill_pkg;
+  }
+
+  my($cust_bill) = create FS::cust_bill ( {
+    'custnum' => $self->getfield('custnum'),
+    '_date' => $time,
+    'charged' => $charged,
+  } );
+  $error=$cust_bill->insert;
+  #shouldn't happen, but how else to handle this? (wrap me in eval, to catch 
+  # fatal errors)
+  die "Error creating cust_bill record: $error!\n",
+      "Check updated but unbilled packages for customer", $self->custnum, "\n"
+    if $error;
+
+  my($invnum)=$cust_bill->invnum;
+  my($cust_bill_pkg);
+  foreach $cust_bill_pkg ( @cust_bill_pkg ) {
+    $cust_bill_pkg->setfield('invnum',$invnum);
+    $error=$cust_bill_pkg->insert;
+    #shouldn't happen, but how else tohandle this?
+    die "Error creating cust_bill_pkg record: $error!\n",
+        "Check incomplete invoice ", $invnum, "\n"
+      if $error;
+  }
+  
+  ''; #no error
+}
+
+=item collect OPTIONS
+
+(Attempt to) collect money for this customer's outstanding invoices (see
+L<FS::cust_bill>).  Usually used after the bill method.
+
+Depending on the value of `payby', this may print an invoice (`BILL'), charge
+a credit card (`CARD'), or just add any necessary (pseudo-)payment (`COMP').
+
+If there is an error, returns the error, otherwise returns false.
+
+Currently available options are:
+
+invoice_time - Use this time when deciding when to print invoices and
+late notices on those invoices.  The default is now.  It is specified as a UNIX timestamp; see L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse>
+for conversion functions.
+
+batch_card - Set this true to batch cards (see L<cust_pay_batch>).  By
+default, cards are processed immediately, which will generate an error if
+CyberCash is not installed.
+
+report_badcard - Set this true if you want bad card transactions to
+return an error.  By default, they don't.
+
+=cut
+
+sub collect {
+  my($self,%options)=@_;
+  my($invoice_time) = $options{'invoice_time'} || $^T;
+
+  my($total_owed) = $self->balance;
+  return '' unless $total_owed > 0; #redundant?????
+
+  #put below somehow?
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  foreach my $cust_bill ( qsearch('cust_bill', {
+    'custnum' => $self->getfield('custnum'),
+  } ) ) {
+
+    #this has to be before next's
+    my($amount) = sprintf("%.2f", $total_owed < $cust_bill->owed
+                                  ? $total_owed
+                                  : $cust_bill->owed
+    );
+    $total_owed = sprintf("%.2f",$total_owed-$amount);
+
+    next unless $cust_bill->owed > 0;
+
+    next if qsearchs('cust_pay_batch',{'invnum'=> $cust_bill->invnum });
+
+    #warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ", amount $amount, total_owed $total_owed)";
+
+    next unless $amount > 0;
+
+    if ( $self->getfield('payby') eq 'BILL' ) {
+
+      #30 days 2592000
+      my($since)=$invoice_time - ( $cust_bill->_date || 0 );
+      #warn "$invoice_time ", $cust_bill->_date, " $since";
+      if ( $since >= 0 #don't print future invoices
+           && ( $cust_bill->printed * 2592000 ) <= $since
+      ) {
+
+        open(LPR,$lpr) or die "Can't open $lpr: $!";
+        print LPR $cust_bill->print_text; #( date )
+        close LPR
+          or die $! ? "Error closing $lpr: $!"
+                       : "Exit status $? from $lpr";
+
+        my(%hash)=$cust_bill->hash;
+        $hash{'printed'}++;
+        my($new_cust_bill)=create FS::cust_bill(\%hash);
+        my($error)=$new_cust_bill->replace($cust_bill);
+        if ( $error ) {
+          warn "Error updating $cust_bill->printed: $error";
+        }
+
+      }
+
+    } elsif ( $self->getfield('payby') eq 'COMP' ) {
+      my($cust_pay) = create FS::cust_pay ( {
+         'invnum' => $cust_bill->getfield('invnum'),
+         'paid' => $amount,
+         '_date' => '',
+         'payby' => 'COMP',
+         'payinfo' => $self->getfield('payinfo'),
+         'paybatch' => ''
+      } );
+      my($error)=$cust_pay->insert;
+      return 'Error COMPing invnum #' . $cust_bill->getfield('invnum') .
+             ':' . $error if $error;
+    } elsif ( $self->getfield('payby') eq 'CARD' ) {
+
+      if ( $options{'batch_card'} ne 'yes' ) {
+
+        return "Real time card processing not enabled!" unless $processor;
+
+        if ( $processor =~ /cybercash/ ) {
+
+          #fix exp. date for cybercash
+          $self->getfield('paydate') =~ /^(\d+)\/\d*(\d{2})$/;
+          my($exp)="$1/$2";
+
+          my($paybatch)= $cust_bill->getfield('invnum') . 
+                         '-' . time2str("%y%m%d%H%M%S",time);
+
+          my($payname)= $self->getfield('payname') ||
+                        $self->getfield('first') . ' ' .$self->getfield('last');
+
+          my($address)= $self->getfield('address1');
+          $address .= ", " . $self->getfield('address2')
+            if $self->getfield('address2');
+
+          my($country) = $self->getfield('country') eq 'US' ?
+                         'USA' : $self->getfield('country');
+
+          my(@full_xaction)=($xaction,
+            'Order-ID'     => $paybatch,
+            'Amount'       => "usd $amount",
+            'Card-Number'  => $self->getfield('payinfo'),
+            'Card-Name'    => $payname,
+            'Card-Address' => $address,
+            'Card-City'    => $self->getfield('city'),
+            'Card-State'   => $self->getfield('state'),
+            'Card-Zip'     => $self->getfield('zip'),
+            'Card-Country' => $country,
+            'Card-Exp'     => $exp,
+          );
+
+          my(%result);
+          if ( $processor eq 'cybercash2' ) {
+            $^W=0; #CCLib isn't -w safe, ugh!
+            %result = &CCLib::sendmserver(@full_xaction);
+            $^W=1;
+          } elsif ( $processor eq 'cybercash3.2' ) {
+            %result = &CCMckDirectLib3_2::SendCC2_1Server(@full_xaction);
+          } else {
+            return "Unkonwn real-time processor $processor\n";
+          }
+         
+          #if ( $result{'MActionCode'} == 7 ) { #cybercash smps v.1.1.3
+          #if ( $result{'action-code'} == 7 ) { #cybercash smps v.2.1
+          if ( $result{'MStatus'} eq 'success' ) { #cybercash smps v.2 or 3
+            my($cust_pay) = create FS::cust_pay ( {
+               'invnum'   => $cust_bill->getfield('invnum'),
+               'paid'     => $amount,
+               '_date'     => '',
+               'payby'    => 'CARD',
+               'payinfo'  => $self->getfield('payinfo'),
+               'paybatch' => "$processor:$paybatch",
+            } );
+            my($error)=$cust_pay->insert;
+            return 'Error applying payment, invnum #' . 
+              $cust_bill->getfield('invnum') . ':' . $error if $error;
+          } elsif ( $result{'Mstatus'} ne 'failure-bad-money'
+                 || $options{'report_badcard'} ) {
+             return 'Cybercash error, invnum #' . 
+               $cust_bill->getfield('invnum') . ':' . $result{'MErrMsg'};
+          } else {
+            return '';
+          }
+
+        } else {
+          return "Unkonwn real-time processor $processor\n";
+        }
+
+      } else { #batch card
+
+#       my($cust_pay_batch) = create FS::cust_pay_batch ( {
+       my($cust_pay_batch) = new FS::Record ('cust_pay_batch', {
+         'invnum'   => $cust_bill->getfield('invnum'),
+         'custnum'  => $self->getfield('custnum'),
+         'last'     => $self->getfield('last'),
+         'first'    => $self->getfield('first'),
+         'address1' => $self->getfield('address1'),
+         'address2' => $self->getfield('address2'),
+         'city'     => $self->getfield('city'),
+         'state'    => $self->getfield('state'),
+         'zip'      => $self->getfield('zip'),
+         'country'  => $self->getfield('country'),
+         'trancode' => 77,
+         'cardnum'  => $self->getfield('payinfo'),
+         'exp'      => $self->getfield('paydate'),
+         'payname'  => $self->getfield('payname'),
+         'amount'   => $amount,
+       } );
+#       my($error)=$cust_pay_batch->insert;
+       my($error)=$cust_pay_batch->add;
+       return "Error adding to cust_pay_batch: $error" if $error;
+
+      }
+
+    } else {
+      return "Unknown payment type ".$self->getfield('payby');
+    }
+
+  }
+  '';
+
+}
+
+=item total_owed
+
+Returns the total owed for this customer on all invoices
+(see L<FS::cust_bill>).
+
+=cut
+
+sub total_owed {
+  my($self) = @_;
+  my($total_bill) = 0;
+  my($cust_bill);
+  foreach $cust_bill ( qsearch('cust_bill', {
+    'custnum' => $self->getfield('custnum'),
+  } ) ) {
+    $total_bill += $cust_bill->getfield('owed');
+  }
+  sprintf("%.2f",$total_bill);
+}
+
+=item total_credited
+
+Returns the total credits (see L<FS::cust_credit>) for this customer.
+
+=cut
+
+sub total_credited {
+  my($self) = @_;
+  my($total_credit) = 0;
+  my($cust_credit);
+  foreach $cust_credit ( qsearch('cust_credit', {
+    'custnum' => $self->getfield('custnum'),
+  } ) ) {
+    $total_credit += $cust_credit->getfield('credited');
+  }
+  sprintf("%.2f",$total_credit);
+}
+
+=item balance
+
+Returns the balance for this customer (total owed minus total credited).
+
+=cut
+
+sub balance {
+  my($self) = @_;
+  sprintf("%.2f",$self->total_bill - $self->total_credit);
+}
+
+=back
+
+=head1 BUGS
+
+The delete method.
+
+It doesn't properly override FS::Record yet.
+
+hfields should be removed.
+
+Bill and collect options should probably be passed as references instead of a
+list.
+
+CyberCash v2 forces us to define some variables in package main.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_pkg>, L<FS::cust_bill>, L<FS::cust_credit>
+L<FS::cust_pay_batch>, L<FS::agent>, L<FS::part_referral>,
+L<FS::cust_main_county>, L<FS::UID>, schema.html from the base documentation.
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jul-28
+
+Changed to standard Business::CreditCard
+no more TableUtil
+EXPORT_OK FS::Record's hfields
+removed unique calls and locking (not needed here now)
+wrapped the (now) optional fields in if statements in sub check (notyetdone!)
+ivan@sisd.com 97-nov-12
+
+updated paydate with SQL-type date info ivan@sisd.com 98-mar-5
+
+Added export of datasrc from UID.pm for Pg6.3
+changed 'day' to 'daytime' because Pg6.3 reserves the day word
+	bmccane@maxbaud.net	98-apr-3
+
+in ->create, s/svc_acct/cust_main/, now it should actually eliminate the
+warnings it was meant to ivan@sisd.com 98-jul-16
+
+don't require a phone number and allow '/' in company names
+ivan@sisd.com 98-jul-18
+
+use ut_ and rewrite &check, &*_pkgs ivan@sisd.com 98-sep-5
+
+pod, merge with FS::Bill (about time!), total_owed, total_credited and balance
+methods, cleaned collect method, source modifications no longer necessary to
+enable cybercash, cybercash v3 support, don't need to import
+FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
+
+=cut
+
+1;
+
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 762e8ec0ead5dc8c8978d93695adbcc1265ca83a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Sep 1998 07:27:04 +0000
Subject: Initial revision

---
 site_perl/agent_type.pm       | 161 +++++++++++++++++++++++++++++
 site_perl/cust_credit.pm      | 199 +++++++++++++++++++++++++++++++++++
 site_perl/cust_main_county.pm | 161 +++++++++++++++++++++++++++++
 site_perl/cust_pay.pm         | 235 ++++++++++++++++++++++++++++++++++++++++++
 site_perl/cust_svc.pm         | 168 ++++++++++++++++++++++++++++++
 site_perl/part_pkg.pm         | 168 ++++++++++++++++++++++++++++++
 site_perl/part_referral.pm    | 155 ++++++++++++++++++++++++++++
 site_perl/pkg_svc.pm          | 168 ++++++++++++++++++++++++++++++
 8 files changed, 1415 insertions(+)
 create mode 100644 site_perl/agent_type.pm
 create mode 100644 site_perl/cust_credit.pm
 create mode 100644 site_perl/cust_main_county.pm
 create mode 100644 site_perl/cust_pay.pm
 create mode 100644 site_perl/cust_svc.pm
 create mode 100644 site_perl/part_pkg.pm
 create mode 100644 site_perl/part_referral.pm
 create mode 100644 site_perl/pkg_svc.pm

diff --git a/site_perl/agent_type.pm b/site_perl/agent_type.pm
new file mode 100644
index 000000000..002c36f54
--- /dev/null
+++ b/site_perl/agent_type.pm
@@ -0,0 +1,161 @@
+package FS::agent_type;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK);
+use Exporter;
+use FS::Record qw(qsearch fields);
+
+@ISA = qw(FS::Record Exporter);
+@EXPORT_OK = qw(fields);
+
+=head1 NAME
+
+FS::agent_type - Object methods for agent_type records
+
+=head1 SYNOPSIS
+
+  use FS::agent_type;
+
+  $record = create FS::agent_type \%hash;
+  $record = create FS::agent_type { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::agent_type object represents an agent type.  Every agent (see
+L<FS::agent>) has an agent type.  Agent types define which packages (see
+L<FS::part_pkg>) may be purchased by customers (see L<FS::cust_main>), via 
+FS::type_pkgs records (see L<FS::type_pkgs>).  FS::agent_type inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item typenum - primary key (assigned automatically for new agent types)
+
+=item atype - Text name of this agent type
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new agent type.  To add the agent type to the database, see
+L<"insert">.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('agent_type')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('agent_type',$hashref);
+
+}
+
+=item insert
+
+Adds this agent type to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  $self->check or
+  $self->add;
+}
+
+=item delete
+
+Deletes this agent type from the database.  Only agent types with no agents
+can be deleted.  If there is an error, returns the error, otherwise returns
+false.
+
+=cut
+
+sub delete {
+  my($self)=@_;
+  return "Can't delete an agent_type with agents!"
+    if qsearch('agent',{'typenum' => $self->typenum});
+  $self->del;
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  return "(Old) Not a agent_type record!" unless $old->table eq "agent_type";
+  return "Can't change typenum!"   
+    unless $old->getfield('typenum') eq $new->getfield('typenum');
+  $new->check or
+  $new->rep($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid agent type.  If there is an
+error, returns the error, otherwise returns false.  Called by the insert and
+replace methods.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a agent_type record!" unless $self->table eq "agent_type";
+
+  $self->ut_numbern('typenum')
+  or $self->ut_text('atype');
+
+}
+
+=back
+
+=head1 BUGS
+
+It doesn't properly override FS::Record yet.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::agent>, L<FS::type_pkgs>, L<FS::cust_main>,
+L<FS::part_pkg>, schema.html from the base documentation.
+
+=head1 HISTORY
+
+Class for the different sets of allowable packages you can assign to an
+agent.
+
+ivan@sisd.com 97-nov-13
+
+ut_ FS::Record methods
+ivan@sisd.com 97-dec-10
+
+Changed 'type' to 'atype' because Pg6.3 reserves the type word
+	bmccane@maxbaud.net	98-apr-3
+
+pod, added check in delete ivan@sisd.com 98-sep-21
+
+=cut
+
+1;
+
diff --git a/site_perl/cust_credit.pm b/site_perl/cust_credit.pm
new file mode 100644
index 000000000..b1a5e1649
--- /dev/null
+++ b/site_perl/cust_credit.pm
@@ -0,0 +1,199 @@
+package FS::cust_credit;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK);
+use Exporter;
+use FS::UID qw(getotaker);
+use FS::Record qw(fields qsearchs);
+
+@ISA = qw(FS::Record Exporter);
+@EXPORT_OK = qw(fields);
+
+=head1 NAME
+
+FS::cust_credit - Object methods for cust_credit records
+
+=head1 SYNOPSIS
+
+  use FS::cust_credit;
+
+  $record = create FS::cust_credit \%hash;
+  $record = create FS::cust_credit { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_credit object represents a credit.  FS::cust_credit inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item crednum - primary key (assigned automatically for new credits)
+
+=item custnum - customer (see L<FS::cust_main>)
+
+=item amount - amount of the credit
+
+=item credited - how much of this credit that is still outstanding, which is
+amount minus all refunds (see L<FS::cust_refund>).
+
+=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=item otaker - order taker (assigned automatically, see L<FS::UID>)
+
+=item reason - text
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new credit.  To add the credit to the database, see L<"insert">.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('cust_credit')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('cust_credit',$hashref);
+}
+
+=item insert
+
+Adds this credit to the database ("Posts" the credit).  If there is an error,
+returns the error, otherwise returns false.
+
+When adding new invoices, credited must be amount (or null, in which case it is
+automatically set to amount).
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  $self->setfield('credited',$self->amount) if $self->credited eq '';
+  return "credited != amount!"
+    unless $self->credited == $self->amount;
+
+  $self->check or
+  $self->add;
+}
+
+=item delete
+
+Currently unimplemented.
+
+=cut
+
+sub delete {
+  return "Can't remove credit!"
+  #my($self)=@_;
+  #$self->del;
+}
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+Only credited may be changed.  Credited is normally updated by creating and
+inserting a refund (see L<FS::cust_refund>).
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  return "(Old) Not a cust_credit record!" unless $old->table eq "cust_credit";
+  return "Can't change crednum!"
+    unless $old->getfield('crednum') eq $new->getfield('crednum');
+  return "Can't change custnum!"
+    unless $old->getfield('custnum') eq $new->getfield('custnum');
+  return "Can't change date!"
+    unless $old->getfield('_date') eq $new->getfield('_date');
+  return "Can't change amount!"
+    unless $old->getfield('amount') eq $new->getfield('amount');
+  return "(New) credited can't be > (new) amount!"
+    if $new->getfield('credited') > $new->getfield('amount');
+
+  $new->check or
+  $new->rep($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid credit.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a cust_credit record!" unless $self->table eq "cust_credit";
+  my($recref) = $self->hashref;
+
+  $recref->{crednum} =~ /^(\d*)$/ or return "Illegal crednum";
+  $recref->{crednum} = $1;
+
+  $recref->{custnum} =~ /^(\d+)$/ or return "Illegal custnum";
+  $recref->{custnum} = $1;
+  return "Unknown customer"
+    unless qsearchs('cust_main',{'custnum'=>$recref->{custnum}});
+
+  $recref->{_date} =~ /^(\d*)$/ or return "Illegal date";
+  $recref->{_date} = $recref->{_date} ? $1 : time;
+
+  $recref->{amount} =~ /^(\d+(\.\d\d)?)$/ or return "Illegal amount";
+  $recref->{amount} = $1;
+
+  $recref->{credited} =~ /^(\-?\d+(\.\d\d)?)$/ or return "Illegal credited";
+  $recref->{credited} = $1;
+
+  #$recref->{otaker} =~ /^(\w+)$/ or return "Illegal otaker";
+  #$recref->{otaker} = $1;
+  $self->otaker(getotaker);
+
+  $self->ut_textn('reason');
+
+}
+
+=back
+
+=head1 BUGS
+
+The delete method.
+
+It doesn't properly override FS::Record yet.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_refund>, L<FS::cust_bill>, schema.html from the base
+documentation.
+
+=head1 HISTORY
+
+ivan@sisd.com 98-mar-17
+
+pod, otaker from FS::UID ivan@sisd.com 98-sep-21
+
+=cut
+
+1;
+
diff --git a/site_perl/cust_main_county.pm b/site_perl/cust_main_county.pm
new file mode 100644
index 000000000..f4b4595ae
--- /dev/null
+++ b/site_perl/cust_main_county.pm
@@ -0,0 +1,161 @@
+package FS::cust_main_county;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK);
+use Exporter;
+use FS::Record qw(fields hfields qsearch qsearchs);
+
+@ISA = qw(FS::Record Exporter);
+@EXPORT_OK = qw(hfields);
+
+=head1 NAME
+
+FS::cust_main_county - Object methods for cust_main_county objects
+
+=head1 SYNOPSIS
+
+  use FS::cust_main_county;
+
+  $record = create FS::cust_main_county \%hash;
+  $record = create FS::cust_main_county { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_main_county object represents a tax rate, defined by locale.
+FS::cust_main_county inherits from FS::Record.  The following fields are
+currently supported:
+
+=over 4
+
+=item taxnum - primary key (assigned automatically for new tax rates)
+
+=item state
+
+=item county
+
+=item tax - percentage
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new tax rate.  To add the tax rate to the database, see L<"insert">.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('cust_main_county')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('cust_main_county',$hashref);
+}
+
+=item insert
+
+Adds this tax rate to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  $self->check or
+  $self->add;
+}
+
+=item delete
+
+Deletes this tax rate from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=cut
+
+sub delete {
+  my($self)=@_;
+
+  $self->del;
+}
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  return "(Old) Not a cust_main_county record!"
+    unless $old->table eq "cust_main_county";
+  return "Can't change taxnum!"
+    unless $old->getfield('taxnum') eq $new->getfield('taxnum');
+  $new->check or
+  $new->rep($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid tax rate.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a cust_main_county record!"
+    unless $self->table eq "cust_main_county";
+  my($recref) = $self->hashref;
+
+  $self->ut_numbern('taxnum')
+    or $self->ut_text('state')
+    or $self->ut_textn('county')
+    or $self->ut_float('tax')
+  ;
+
+}
+
+=back
+
+=head1 BUGS
+
+It doesn't properly override FS::Record yet.
+
+A country field (and possibly a currency field) should be added.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_main>, L<FS::cust_bill>, schema.html from the base
+documentation.
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-dec-16
+
+Changed check for 'tax' to use the new ut_float subroutine
+	bmccane@maxbaud.net	98-apr-3
+
+pod ivan@sisd.com 98-sep-21
+
+=cut
+
+1;
+
diff --git a/site_perl/cust_pay.pm b/site_perl/cust_pay.pm
new file mode 100644
index 000000000..6e30c595b
--- /dev/null
+++ b/site_perl/cust_pay.pm
@@ -0,0 +1,235 @@
+package FS::cust_pay;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK);
+use Exporter;
+use Business::CreditCard;
+use FS::Record qw(fields qsearchs);
+use FS::cust_bill;
+
+@ISA = qw(FS::Record Exporter);
+@EXPORT_OK = qw(fields);
+
+=head1 NAME
+
+FS::cust_pay - Object methods for cust_pay objects
+
+=head1 SYNOPSIS
+
+  use FS::cust_pay;
+
+  $record = create FS::cust_pay \%hash;
+  $record = create FS::cust_pay { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_pay object represents a payment.  FS::cust_pay inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item paynum - primary key (assigned automatically for new payments)
+
+=item invnum - Invoice (see L<FS::cust_bill>)
+
+=item paid - Amount of this payment
+
+=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=item payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
+
+=item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
+
+=item paybatch - text field for tracking card processing
+
+=back
+
+=head1 METHODS
+
+=over 4 
+
+=item create HASHREF
+
+Creates a new payment.  To add the payment to the databse, see L<"insert">.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('cust_pay')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('cust_pay',$hashref);
+
+}
+
+=item insert
+
+Adds this payment to the databse, and updates the invoice (see
+L<FS::cust_bill>).
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  my($error);
+
+  $error=$self->check;
+  return $error if $error;
+
+  my($old_cust_bill) = qsearchs('cust_bill', {
+                                'invnum' => $self->getfield('invnum')
+                               } );
+  return "Unknown invnum" unless $old_cust_bill;
+  my(%hash)=$old_cust_bill->hash;
+  $hash{owed} = sprintf("%.2f",$hash{owed} - $self->getfield('paid') );
+  my($new_cust_bill) = create FS::cust_bill ( \%hash );
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  $error=$new_cust_bill -> replace($old_cust_bill);
+  return "Error modifying cust_bill: $error" if $error;
+
+  $self->add;
+}
+
+=item delete
+
+Currently unimplemented (accounting reasons).
+
+=cut
+
+sub delete {
+  return "Can't (yet?) delete cust_pay records!";
+#template code below
+#  my($self)=@_;
+#
+#  $self->del;
+}
+
+=item replace OLD_RECORD
+
+Currently unimplemented (accounting reasons).
+
+=cut
+
+sub replace {
+   return "Can't (yet?) modify cust_pay records!";
+#template code below
+#  my($new,$old)=@_;
+#  return "(Old) Not a cust_pay record!" unless $old->table eq "cust_pay";
+#
+#  $new->check or
+#  $new->rep($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid payment.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert method.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a cust_pay record!" unless $self->table eq "cust_pay";
+  my($recref) = $self->hashref;
+
+  $recref->{paynum} =~ /^(\d*)$/ or return "Illegal paynum";
+  $recref->{paynum} = $1;
+
+  $recref->{invnum} =~ /^(\d+)$/ or return "Illegal invnum";
+  $recref->{invnum} = $1;
+
+  $recref->{paid} =~ /^(\d+(\.\d\d)?)$/ or return "Illegal paid";
+  $recref->{paid} = $1;
+
+  $recref->{_date} =~ /^(\d*)$/ or return "Illegal date";
+  $recref->{_date} = $recref->{_date} ? $1 : time;
+
+  $recref->{payby} =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
+  $recref->{payby} = $1;
+
+  if ( $recref->{payby} eq 'CARD' ) {
+
+    $recref->{payinfo} =~ s/\D//g;
+    if ( $recref->{payinfo} ) {
+      $recref->{payinfo} =~ /^(\d{13,16})$/
+        or return "Illegal (mistyped?) credit card number (payinfo)";
+      $recref->{payinfo} = $1;
+      #validate($recref->{payinfo})
+      #  or return "Illegal credit card number";
+      my($type)=cardtype($recref->{payinfo});
+      return "Unknown credit card type"
+        unless ( $type =~ /^VISA/ ||
+                 $type =~ /^MasterCard/ ||
+                 $type =~ /^American Express/ ||
+                 $type =~ /^Discover/ );
+    } else {
+      $recref->{payinfo}='N/A';
+    }
+
+  } elsif ( $recref->{payby} eq 'BILL' ) {
+
+    $recref->{payinfo} =~ /^([\w \-]*)$/
+      or return "Illegal P.O. number (payinfo)";
+    $recref->{payinfo} = $1;
+
+  } elsif ( $recref->{payby} eq 'COMP' ) {
+
+    $recref->{payinfo} =~ /^([\w]{2,8})$/
+      or return "Illegal comp account issuer (payinfo)";
+    $recref->{payinfo} = $1;
+
+  }
+
+  $recref->{paybatch} =~ /^([\w\-\:]*)$/
+    or return "Illegal paybatch";
+  $recref->{paybatch} = $1;
+
+  ''; #no error
+
+}
+
+=back
+
+=head1 BUGS
+
+It doesn't properly override FS::Record yet.
+
+Delete and replace methods.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_bill>, schema.html from the base documentation.
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jul-1 - 25 - 29
+
+new api ivan@sisd.com 98-mar-13
+
+pod ivan@sisd.com 98-sep-21
+
+=cut
+
+1;
+
diff --git a/site_perl/cust_svc.pm b/site_perl/cust_svc.pm
new file mode 100644
index 000000000..1d5051b1f
--- /dev/null
+++ b/site_perl/cust_svc.pm
@@ -0,0 +1,168 @@
+package FS::cust_svc;
+
+use strict;
+use vars qw(@ISA);
+use Exporter;
+use FS::Record qw(fields qsearchs);
+
+@ISA = qw(FS::Record Exporter);
+
+=head1 NAME
+
+FS::cust_svc - Object method for cust_svc objects
+
+=head1 SYNOPSIS
+
+  use FS::cust_svc;
+
+  $record = create FS::cust_svc \%hash
+  $record = create FS::cust_svc { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_svc represents a service.  FS::cust_svc inherits from FS::Record.
+The following fields are currently supported:
+
+=over 4
+
+=item svcnum - primary key (assigned automatically for new services)
+
+=item pkgnum - Package (see L<FS::cust_pkg>)
+
+=item svcpart - Service definition (see L<FS::part_svc>)
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new service.  To add the refund to the database, see L<"insert">.
+Services are normally created by creating FS::svc_ objects (see
+L<FS::svc_acct>, L<FS::svc_domain>, and L<FS::svc_acct_sm>, among others).
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_; 
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('cust_svc')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('cust_svc',$hashref);
+}
+
+=item insert
+
+Adds this service to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  $self->check or
+  $self->add;
+}
+
+=item delete
+
+Deletes this service from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+Called by the cancel method of the package (see L<FS::cust_pkg>).
+
+=cut
+
+sub delete {
+  my($self)=@_;
+  # anything else here?
+  $self->del;
+}
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  return "(Old) Not a cust_svc record!" unless $old->table eq "cust_svc";
+  return "Can't change svcnum!"
+    unless $old->getfield('svcnum') eq $new->getfield('svcnum');
+  $new->check or
+  $new->rep($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid service.  If there is an error,
+returns the error, otehrwise returns false.  Called by the insert and
+replace methods.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a cust_svc record!" unless $self->table eq "cust_svc";
+  my($recref) = $self->hashref;
+
+  $recref->{svcnum} =~ /^(\d*)$/ or return "Illegal svcnum";
+  $recref->{svcnum}=$1;
+
+  $recref->{pkgnum} =~ /^(\d*)$/ or return "Illegal pkgnum";
+  $recref->{pkgnum}=$1;
+  return "Unknown pkgnum" unless
+    ! $recref->{pkgnum} ||
+    qsearchs('cust_pkg',{'pkgnum'=>$recref->{pkgnum}});
+
+  $recref->{svcpart} =~ /^(\d+)$/ or return "Illegal svcpart";
+  $recref->{svcpart}=$1;
+  return "Unknown svcpart" unless
+    qsearchs('part_svc',{'svcpart'=>$recref->{svcpart}});
+
+  ''; #no error
+}
+
+=back
+
+=head1 BUGS
+
+Behaviour of changing the svcpart of cust_svc records is undefined and should
+possibly be prohibited, and pkg_svc records are not checked.
+
+pkg_svc records are not checket in general (here).
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_pkg>, L<FS::part_svc>, L<FS::pkg_svc>, 
+schema.html from the base documentation
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jul-10,14
+
+no TableUtil, no FS::Lock ivan@sisd.com 98-mar-7
+
+pod ivan@sisd.com 98-sep-21
+
+=cut
+
+1;
+
diff --git a/site_perl/part_pkg.pm b/site_perl/part_pkg.pm
new file mode 100644
index 000000000..d1c12e47e
--- /dev/null
+++ b/site_perl/part_pkg.pm
@@ -0,0 +1,168 @@
+package FS::part_pkg;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK);
+use Exporter;
+use FS::Record qw(fields hfields);
+
+@ISA = qw(FS::Record Exporter);
+@EXPORT_OK = qw(hfields fields);
+
+=head1 NAME
+
+FS::part_pkg - Object methods for part_pkg objects
+
+=head1 SYNOPSIS
+
+  use FS::part_pkg;
+
+  $record = create FS::part_pkg \%hash
+  $record = create FS::part_pkg { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::part_pkg represents a billing item definition.  FS::part_pkg inherits
+from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item pkgpart - primary key (assigned automatically for new billing item definitions)
+
+=item pkg - Text name of this billing item definition (customer-viewable)
+
+=item comment - Text name of this billing item definition (non-customer-viewable)
+
+=item setup - Setup fee
+
+=item freq - Frequency of recurring fee
+
+=item recur - Recurring fee
+
+=back
+
+setup and recur are evaluated as Safe perl expressions.  You can use numbers
+just as you would normally.  More advanced semantics are not yet defined.
+
+=head1 METHODS
+
+=over 4 
+
+=item create HASHREF
+
+Creates a new billing item definition.  To add the billing item definition to
+the database, see L<"insert">.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('part_pkg')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('part_pkg',$hashref);
+}
+
+=item insert
+
+Adds this billing item definition to the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  $self->check or
+  $self->add;
+}
+
+=item delete
+
+Currently unimplemented.
+
+=cut
+
+sub delete {
+  return "Can't (yet?) delete package definitions.";
+# maybe check & make sure the pkgpart isn't in cust_pkg or type_pkgs?
+#  my($self)=@_;
+#
+#  $self->del;
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  return "(Old) Not a part_pkg record!" unless $old->table eq "part_pkg";
+  return "Can't change pkgpart!"
+    unless $old->getfield('pkgpart') eq $new->getfield('pkgpart');
+  $new->check or
+  $new->rep($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid billing item definition.  If
+there is an error, returns the error, otherwise returns false.  Called by the
+insert and replace methods.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a part_pkg record!" unless $self->table eq "part_pkg";
+
+  $self->ut_numbern('pkgpart')
+    or $self->ut_text('pkg')
+    or $self->ut_text('comment')
+    or $self->ut_anything('setup')
+    or $self->ut_number('freq')
+    or $self->ut_anything('recur')
+  ;
+
+}
+
+=back
+
+=head1 BUGS
+
+It doesn't properly override FS::Record yet.
+
+The delete method is unimplemented.
+
+setup and recur semantics are not yet defined (and are implemented in
+FS::cust_bill.  hmm.).
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_pkg>, L<FS::type_pkgs>, L<FS::pkg_svc>, L<Safe>.
+schema.html from the base documentation.
+
+=head1 HISTORY
+
+ivan@sisd.com 97-dec-5
+
+pod ivan@sisd.com 98-sep-21
+
+=cut
+
+1;
+
diff --git a/site_perl/part_referral.pm b/site_perl/part_referral.pm
new file mode 100644
index 000000000..1b4a1b65a
--- /dev/null
+++ b/site_perl/part_referral.pm
@@ -0,0 +1,155 @@
+package FS::part_referral;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK);
+use Exporter;
+use FS::Record qw(fields qsearchs);
+
+@ISA = qw(FS::Record Exporter);
+@EXPORT_OK = qw(fields);
+
+=head1 NAME
+
+FS::part_referral - Object methods for part_referral objects
+
+=head1 SYNOPSIS
+
+  use FS::part_referral;
+
+  $record = create FS::part_referral \%hash
+  $record = create FS::part_referral { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::part_referral represents a referral - where a customer heard of your
+services.  This can be used to track the effectiveness of a particular piece of
+advertising, for example.  FS::part_referral inherits from FS::Record.  The
+following fields are currently supported:
+
+=over 4
+
+=item refnum - primary key (assigned automatically for new referrals)
+
+=item referral - Text name of this referral
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new referral.  To add the referral to the database, see L<"insert">.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('part_referral')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('part_referral',$hashref);
+}
+
+=item insert
+
+Adds this referral to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  $self->check or
+  $self->add;
+}
+
+=item delete
+
+Currently unimplemented.
+
+=cut
+
+sub delete {
+  my($self)=@_;
+  return "Can't (yet?) delete part_referral records";
+  #$self->del;
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  return "(Old) Not an part_referral record!" 
+    unless $old->table eq "part_referral";
+  return "Can't change refnum!"
+    unless $old->getfield('refnum') eq $new->getfield('refnum');
+  $new->check or
+  $new->rep($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid referral.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a part_referral record!" unless $self->table eq "part_referral";
+
+  my($error)=
+    $self->ut_numbern('refnum')
+      or $self->ut_text('referral')
+  ;
+  return $error if $error;
+
+  '';
+
+}
+
+=back
+
+=head1 BUGS
+
+It doesn't properly override FS::Record yet.
+
+The delete method is unimplemented.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_main>, schema.html from the base documentation.
+
+=head1 HISTORY
+
+Class dealing with referrals
+
+ivan@sisd.com 98-feb-23
+
+pod ivan@sisd.com 98-sep-21
+
+=cut
+
+1;
+
diff --git a/site_perl/pkg_svc.pm b/site_perl/pkg_svc.pm
new file mode 100644
index 000000000..517125c01
--- /dev/null
+++ b/site_perl/pkg_svc.pm
@@ -0,0 +1,168 @@
+package FS::pkg_svc;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK);
+use Exporter;
+use FS::Record qw(fields hfields qsearchs);
+
+@ISA = qw(FS::Record Exporter);
+@EXPORT_OK = qw(hfields);
+
+=head1 NAME
+
+FS::pkg_svc - Object methods for pkg_svc records
+
+=head1 SYNOPSIS
+
+  use FS::pkg_svc;
+
+  $record = create FS::pkg_svc \%hash;
+  $record = create FS::pkg_svc { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::pkg_svc record links a billing item definition (see L<FS::part_pkg>) to
+a service definition (see L<FS::part_svc>).  FS::pkg_svc inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item pkgpart - Billing item definition (see L<FS::part_pkg>)
+
+=item svcpart - Service definition (see L<FS::part_svc>)
+
+=item quantity - Quantity of this service definition that this billing item
+definition includes
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Create a new record.  To add the record to the database, see L<"insert">.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('pkg_svc')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('pkg_svc',$hashref);
+
+}
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  $self->check or
+  $self->add;
+}
+
+=item delete
+
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=cut
+
+sub delete {
+  my($self)=@_;
+
+  $self->del;
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  return "(Old) Not a pkg_svc record!" unless $old->table eq "pkg_svc";
+  return "Can't change pkgpart!"
+    if $old->getfield('pkgpart') ne $new->getfield('pkgpart');
+  return "Can't change svcpart!"
+    if $old->getfield('svcpart') ne $new->getfield('svcpart');
+
+  $new->check or
+  $new->rep($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a pkg_svc record!" unless $self->table eq "pkg_svc";
+  my($recref) = $self->hashref;
+
+  my($error);
+  return $error if $error =
+    $self->ut_number('pkgpart')
+    || $self->ut_number('svcpart')
+    || $self->ut_number('quantity')
+  ;
+
+  return "Unknown pkgpart!"
+    unless qsearchs('part_pkg',{'pkgpart'=> $self->getfield('pkgpart')});
+
+  return "Unknown svcpart!"
+    unless qsearchs('part_svc',{'svcpart'=> $self->getfield('svcpart')});
+
+  ''; #no error
+}
+
+=back
+
+=head1 BUGS
+
+It doesn't properly override FS::Record yet.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::part_pkg>, L<FS::part_svc>, schema.html from the base
+documentation.
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jul-1
+ 
+added hfields
+ivan@sisd.com 97-nov-13
+
+pod ivan@sisd.com 98-sep-22
+
+=cut
+
+1;
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 8de52f38c97e11bb5b5995e57f446461fdc8ba6c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Sep 1998 05:15:09 +0000
Subject: Initial revision

---
 site_perl/part_svc.pm | 199 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 199 insertions(+)
 create mode 100644 site_perl/part_svc.pm

diff --git a/site_perl/part_svc.pm b/site_perl/part_svc.pm
new file mode 100644
index 000000000..0fd8ee47d
--- /dev/null
+++ b/site_perl/part_svc.pm
@@ -0,0 +1,199 @@
+package FS::part_svc;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK);
+use Exporter;
+use FS::Record qw(fields hfields);
+
+@ISA = qw(FS::Record Exporter);
+@EXPORT_OK = qw(hfields fields);
+
+=head1 NAME
+
+FS::part_svc - Object methods for part_svc objects
+
+=head1 SYNOPSIS
+
+  use FS::part_svc;
+
+  $record = create FS::part_referral \%hash
+  $record = create FS::part_referral { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::part_svc represents a service definition.  FS::part_svc inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item svcpart - primary key (assigned automatically for new service definitions)
+
+=item svc - text name of this service definition
+
+=item svcdb - table used for this service.  See L<FS::svc_acct>,
+L<FS::svc_domain>, and L<FS::svc_acct_sm>, among others.
+
+=item I<svcdb>__I<field> - Default or fixed value for I<field> in I<svcdb>.
+
+=item I<svcdb>__I<field>_flag - defines I<svcdb>__I<field> action: null, `D' for default, or `F' for fixed
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new service definition.  To add the service definition to the
+database, see L<"insert">.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('part_svc')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('part_svc',$hashref);
+}
+
+=item insert
+
+Adds this service definition to the database.  If there is an error, returns
+the error, otherwise returns false.
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  $self->check or
+  $self->add;
+}
+
+=item delete
+
+Currently unimplemented.
+
+=cut
+
+sub delete {
+  return "Can't (yet?) delete service definitions.";
+# maybe check & make sure the svcpart isn't in cust_svc or (in any packages)?
+#  my($self)=@_;
+#
+#  $self->del;
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  return "(Old) Not a part_svc record!" unless $old->table eq "part_svc";
+  return "Can't change svcpart!"
+    unless $old->getfield('svcpart') eq $new->getfield('svcpart');
+  return "Can't change svcdb!"
+    unless $old->getfield('svcdb') eq $new->getfield('svcdb');
+  $new->check or
+  $new->rep($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid service definition.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a part_svc record!" unless $self->table eq "part_svc";
+  my($recref) = $self->hashref;
+
+  my($error);
+  return $error if $error=
+    $self->ut_numbern('svcpart')
+    || $self->ut_text('svc')
+    || $self->ut_alpha('svcdb')
+  ;
+
+  my(@fields) = eval { fields($recref->{svcdb}) }; #might die
+  return "Unknown svcdb!" unless @fields;
+
+  my($svcdb);
+  foreach $svcdb ( qw(
+    svc_acct svc_acct_sm svc_charge svc_domain svc_wo
+  ) ) {
+    my(@rows)=map { /^${svcdb}__(.*)$/; $1 }
+      grep ! /_flag$/,
+        grep /^${svcdb}__/,
+          fields('part_svc');
+    my($row);
+    foreach $row (@rows) {
+      unless ( $svcdb eq $recref->{svcdb} ) {
+        $recref->{$svcdb.'__'.$row}='';
+        $recref->{$svcdb.'__'.$row.'_flag'}='';
+        next;
+      }
+      $recref->{$svcdb.'__'.$row.'_flag'} =~ /^([DF]?)$/
+        or return "Illegal flag for $svcdb $row";
+      $recref->{$svcdb.'__'.$row.'_flag'} = $1;
+
+#      $recref->{$svcdb.'__'.$row} =~ /^(.*)$/ #not restrictive enough?
+#        or return "Illegal value for $svcdb $row";
+#      $recref->{$svcdb.'__'.$row} = $1;
+      my($error);
+      return $error if $error=$self->ut_anything($svcdb.'__'.$row);
+
+    }
+  }
+
+  ''; #no error
+}
+
+=back
+
+=head1 BUGS
+
+It doesn't properly override FS::Record yet.
+
+Delete is unimplemented.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::part_pkg>, L<FS::pkg_svc>, L<FS::cust_svc>,
+L<FS::svc_acct>, L<FS::svc_acct_sm>, L<FS::svc_domain>, schema.html from the
+base documentation.
+
+=head1 HISTORY
+
+ivan@sisd.com 97-nov-14
+
+data checking/untainting calls into FS::Record added
+ivan@sisd.com 97-dec-6
+
+pod ivan@sisd.com 98-sep-21
+
+=cut
+
+1;
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 4fe44937087247a57a952b292b50b1e63531b8ed Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Sep 1998 06:20:57 +0000
Subject: Initial revision

---
 site_perl/svc_acct_pop.pm | 163 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 163 insertions(+)
 create mode 100644 site_perl/svc_acct_pop.pm

diff --git a/site_perl/svc_acct_pop.pm b/site_perl/svc_acct_pop.pm
new file mode 100644
index 000000000..a6f801f22
--- /dev/null
+++ b/site_perl/svc_acct_pop.pm
@@ -0,0 +1,163 @@
+package FS::svc_acct_pop;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK);
+use Exporter;
+use FS::Record qw(fields qsearchs);
+
+@ISA = qw(FS::Record Exporter);
+@EXPORT_OK = qw(fields);
+
+=head1 NAME
+
+FS::svc_acct_pop - Object methods for svc_acct_pop records
+
+=head1 SYNOPSIS
+
+  use FS::svc_acct_pop;
+
+  $record = create FS::svc_acct_pop \%hash;
+  $record = create FS::svc_acct_pop { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::svc_acct object represents an point of presence.  FS::svc_acct_pop
+inherits from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item popnum - primary key (assigned automatically for new accounts)
+
+=item city
+
+=item state
+
+=item ac - area code
+
+=item exch - exchange
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new point of presence (if only it were that easy!).  To add the 
+point of presence to the database, see L<"insert">.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('svc_acct_pop')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('svc_acct_pop',$hashref);
+}
+
+=item insert
+
+Adds this point of presence to the databaes.  If there is an error, returns the
+error, otherwise returns false.
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  $self->check or
+  $self->add;
+}
+
+=item delete
+
+Currently unimplemented.
+
+=cut
+
+sub delete {
+  my($self)=@_;
+  return "Can't (yet) delete POPs!";
+  #$self->del;
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  return "(Old) Not an svc_acct_pop record!"
+    unless $old->table eq "svc_acct_pop";
+  return "Can't change popnum!"
+    unless $old->getfield('popnum') eq $new->getfield('popnum');
+  $new->check or
+  $new->rep($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid point of presence.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a svc_acct_pop record!" unless $self->table eq "svc_acct_pop";
+
+  my($error)=
+    $self->ut_numbern('popnum')
+      or $self->ut_text('city')
+      or $self->ut_text('state')
+      or $self->ut_number('ac')
+      or $self->ut_number('exch')
+  ;
+  return $error if $error;
+
+  '';
+
+}
+
+=back
+
+=head1 BUGS
+
+It doesn't properly override FS::Record yet.
+
+It should be renamed to part_pop.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<svc_acct>, schema.html from the base documentation.
+
+=head1 HISTORY
+
+Class dealing with pops 
+
+ivan@sisd.com 98-mar-8 
+
+pod ivan@sisd.com 98-sep-23
+
+=cut
+
+1;
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 4c686015cf196f09d5870712f7a64afaa1d1c9be Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Sep 1998 08:18:53 +0000
Subject: Initial revision

---
 site_perl/svc_acct_sm.pm | 350 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 350 insertions(+)
 create mode 100644 site_perl/svc_acct_sm.pm

diff --git a/site_perl/svc_acct_sm.pm b/site_perl/svc_acct_sm.pm
new file mode 100644
index 000000000..c87ed2c54
--- /dev/null
+++ b/site_perl/svc_acct_sm.pm
@@ -0,0 +1,350 @@
+package FS::svc_acct_sm;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK $nossh_hack $conf $shellmachine @qmailmachines);
+use Exporter;
+use FS::Record qw(fields qsearch qsearchs);
+use FS::cust_svc;
+use FS::SSH qw(ssh);
+use FS::Conf;
+
+@ISA = qw(FS::Record Exporter);
+@EXPORT_OK = qw(fields);
+
+$conf = new FS::Conf;
+
+$shellmachine = $conf->exists('qmailmachines')
+                ? $conf->config('shellmachine')
+                : '';
+
+=head1 NAME
+
+FS::svc_acct_sm - Object methods for svc_acct_sm records
+
+=head1 SYNOPSIS
+
+  use FS::svc_acct_sm;
+
+  $record = create FS::svc_acct_sm \%hash;
+  $record = create FS::svc_acct_sm { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $error = $record->suspend;
+
+  $error = $record->unsuspend;
+
+  $error = $record->cancel;
+
+=head1 DESCRIPTION
+
+An FS::svc_acct object represents a virtual mail alias.  FS::svc_acct inherits
+from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item svcnum - primary key (assigned automatcially for new accounts)
+
+=item domsvc - svcnum of the virtual domain (see L<FS::svc_domain>)
+
+=item domuid - uid of the target account (see L<FS::svc_acct>)
+
+=item domuser - virtual username
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new virtual mail alias.  To add the virtual mail alias to the
+database, see L<"insert">.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('svc_acct_sm')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('svc_acct_sm',$hashref);
+
+}
+
+=item insert
+
+Adds this virtual mail alias to the database.  If there is an error, returns
+the error, otherwise returns false.
+
+The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
+defined.  An FS::cust_svc record will be created and inserted.
+
+If the configuration values (see L<FS::Conf>) shellmachine and qmailmachines
+exist, and domuser is `*' (meaning a catch-all mailbox), the command:
+
+  [ -e $dir/.qmail-$qdomain-default ] || {
+    touch $dir/.qmail-$qdomain-default;
+    chown $uid:$gid $dir/.qmail-$qdomain-default;
+  }
+
+is executed on shellmachine via ssh (see L<dot-qmail/"EXTENSION ADDRESSES">).
+This behaviour can be surpressed by setting $FS::svc_acct_sm::nossh_hack true.
+
+=cut
+
+sub insert {
+  my($self)=@_;
+  my($error);
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  $error=$self->check;
+  return $error if $error;
+
+  return "Domain username (domuser) in use for this domain (domsvc)"
+    if qsearchs('svc_acct_sm',{ 'domuser'=> $self->domuser,
+                                'domsvc' => $self->domsvc,
+                              } );
+
+  return "First domain username (domuser) for domain (domsvc) must be " .
+         qq='*' (catch-all)!=
+    if $self->domuser ne '*' &&
+       ! qsearch('svc_acct_sm',{ 'domsvc' => $self->domsvc } );
+
+  my($svcnum)=$self->getfield('svcnum');
+  my($cust_svc);
+  unless ( $svcnum ) {
+    $cust_svc=create FS::cust_svc ( {
+      'svcnum'  => $svcnum,
+      'pkgnum'  => $self->getfield('pkgnum'),
+      'svcpart' => $self->getfield('svcpart'),
+    } );
+    my($error) = $cust_svc->insert;
+    return $error if $error;
+    $svcnum = $self->setfield('svcnum',$cust_svc->getfield('svcnum'));
+  }
+
+  $error = $self->add;
+  if ($error) {
+    $cust_svc->del if $cust_svc;
+    return $error;
+  }
+
+  my $svc_domain = qsearchs('svc_domain',{'svcnum'=> $self->domsvc } );
+  my $svc_acct = qsearchs('svc_acct',{'uid'=> $self->domuid } );
+  my($uid,$gid,$dir,$domain)=(
+    $svc_acct->getfield('uid'),
+    $svc_acct->getfield('gid'),
+    $svc_acct->getfield('dir'),
+    $svc_domain->getfield('domain')
+  );
+  my($qdomain)=$domain;
+  $qdomain =~ s/\./:/g; #see manpage for 'dot-qmail': EXTENSION ADDRESSES
+  ssh("root\@$shellmachine","[ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }")  
+    if ( ! $nossh_hack && $shellmachine && $dir && $self->domuser eq '*' );
+
+  ''; #no error
+
+}
+
+=item delete
+
+Deletes this virtual mail alias from the database.  If there is an error,
+returns the error, otherwise returns false.
+
+The corresponding FS::cust_svc record will be deleted as well.
+
+=cut
+
+sub delete {
+  my($self)=@_;
+  my($error);
+
+  my($svcnum)=$self->getfield('svcnum');
+
+  $error = $self->del;
+  return $error if $error;
+
+  my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
+  $error = $cust_svc->del;
+  return $error if $error;
+
+  '';
+  
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  my($error);
+
+  return "(Old) Not a svc_acct_sm record!" unless $old->table eq "svc_acct_sm";
+  return "Can't change svcnum!"
+    unless $old->getfield('svcnum') eq $new->getfield('svcnum');
+
+  return "Domain username (domuser) in use for this domain (domsvc)"
+    if ( $old->domuser ne $new->domuser
+         || $old->domsvc  ne $new->domsvc
+       )  && qsearchs('svc_acct_sm',{
+         'domuser'=> $new->domuser,
+         'domsvc' => $new->domsvc,
+       } )
+     ;
+
+  $error=$new->check;
+  return $error if $error;
+
+  $error = $new->rep($old);
+  return $error if $error;
+
+  ''; #no error
+}
+
+=item suspend
+
+Just returns false (no error) for now.
+
+Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=cut
+
+sub suspend {
+  ''; #no error (stub)
+}
+
+=item unsuspend
+
+Just returns false (no error) for now.
+
+Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=cut
+
+sub unsuspend {
+  ''; #no error (stub)
+}
+
+=item cancel
+
+Just returns false (no error) for now.
+
+Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=cut
+
+sub cancel {
+  ''; #no error (stub)
+}
+
+=item check
+
+Checks all fields to make sure this is a valid virtual mail alias.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert and
+replace methods.
+
+Sets any fixed values; see L<FS::part_svc>.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a svc_acct_sm record!" unless $self->table eq "svc_acct_sm";
+  my($recref) = $self->hashref;
+
+  $recref->{svcnum} =~ /^(\d*)$/ or return "Illegal svcnum";
+  $recref->{svcnum} = $1;
+
+  #get part_svc
+  my($svcpart);
+  my($svcnum)=$self->getfield('svcnum');
+  if ($svcnum) {
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
+    return "Unknown svcnum" unless $cust_svc; 
+    $svcpart=$cust_svc->svcpart;
+  } else {
+    $svcpart=$self->getfield('svcpart');
+  }
+  my($part_svc)=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  return "Unkonwn svcpart" unless $part_svc;
+
+  #set fixed fields from part_svc
+  my($field);
+  foreach $field ( fields('svc_acct_sm') ) {
+    if ( $part_svc->getfield('svc_acct_sm__'. $field. '_flag') eq 'F' ) {
+      $self->setfield($field,$part_svc->getfield('svc_acct_sm__'. $field) );
+    }
+  }
+
+  $recref->{domuser} =~ /^(\*|[a-z0-9_\-]{2,32})$/
+    or return "Illegal domain username (domuser)";
+  $recref->{domuser} = $1;
+
+  $recref->{domsvc} =~ /^(\d+)$/ or return "Illegal domsvc";
+  $recref->{domsvc} = $1;
+  my($svc_domain);
+  return "Unknown domsvc" unless
+    $svc_domain=qsearchs('svc_domain',{'svcnum'=> $recref->{domsvc} } );
+
+  $recref->{domuid} =~ /^(\d+)$/ or return "Illegal uid";
+  $recref->{domuid} = $1;
+  my($svc_acct);
+  return "Unknown uid" unless
+    $svc_acct=qsearchs('svc_acct',{'uid'=> $recref->{domuid} } );
+
+  ''; #no error
+}
+
+=back
+
+=head1 BUGS
+
+It doesn't properly override FS::Record yet.
+
+The remote commands should be configurable.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
+L<FS::svc_acct>, L<FS::svc_domain>, L<FS::SSH>, L<ssh>, L<dot-qmail>,
+schema.html from the base documentation.
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jul-16 - 21
+
+rewrite ivan@sisd.com 98-mar-10
+
+s/qsearchs/qsearch/ to eliminate warning ivan@sisd.com 98-apr-19
+
+uses conf/shellmachine and has an nossh_hack ivan@sisd.com 98-jul-14
+
+s/\./:/g in .qmail-domain:com ivan@sisd.com 98-aug-13 
+
+pod, FS::Conf, moved .qmail file from check to insert 98-sep-23
+
+=cut
+
+1;
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 1e97e6bad3ee2bd47a56253d2c30fcfab87c43d4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Sep 1998 08:59:01 +0000
Subject: Initial revision

---
 site_perl/svc_acct.pm   | 557 ++++++++++++++++++++++++++++++++++++++++++++++++
 site_perl/svc_domain.pm | 539 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1096 insertions(+)
 create mode 100644 site_perl/svc_acct.pm
 create mode 100644 site_perl/svc_domain.pm

diff --git a/site_perl/svc_acct.pm b/site_perl/svc_acct.pm
new file mode 100644
index 000000000..a43af6b1a
--- /dev/null
+++ b/site_perl/svc_acct.pm
@@ -0,0 +1,557 @@
+package FS::svc_acct;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK $nossh_hack $conf $dir_prefix @shells
+            $shellmachine @saltset @pw_set);
+use Exporter;
+use FS::Conf;
+use FS::Record qw(fields qsearchs);
+use FS::SSH qw(ssh);
+use FS::cust_svc;
+
+@ISA = qw(FS::Record Exporter);
+@EXPORT_OK = qw(fields);
+
+$conf = new FS::Conf;
+$dir_prefix = $conf->config('home');
+@shells = $conf->config('shells');
+$shellmachine = $conf->config('shellmachine');
+
+@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+@pw_set = ( 'a'..'z', 'A'..'Z', '0'..'9', '(', ')', '#', '!', '.', ',' );
+
+#not needed in 5.004 #srand($$|time);
+
+=head1 NAME
+
+FS::svc_acct - Object methods for svc_acct records
+
+=head1 SYNOPSIS
+
+  use FS::svc_acct;
+
+  $record = create FS::svc_acct \%hash;
+  $record = create FS::svc_acct { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $error = $record->suspend;
+
+  $error = $record->unsuspend;
+
+  $error = $record->cancel;
+
+=head1 DESCRIPTION
+
+An FS::svc_acct object represents an account.  FS::svc_acct inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item svcnum - primary key (assigned automatcially for new accounts)
+
+=item username
+
+=item _password - generated if blank
+
+=item popnum - Point of presence (see L<FS::svc_acct_pop>)
+
+=item uid
+
+=item gid
+
+=item finger - GECOS
+
+=item dir - set automatically if blank (and uid is not)
+
+=item shell
+
+=item quota - (unimplementd)
+
+=item slipip - IP address
+
+=item radius_I<Radius_Attribute> - I<Radius-Attribute>
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new account.  To add the account to the database, see L<"insert">.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('svc_acct')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('svc_acct',$hashref);
+
+}
+
+=item insert
+
+Adds this account to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
+defined.  An FS::cust_svc record will be created and inserted.
+
+If the configuration value (see L<FS::Conf>) shellmachine exists, and the 
+username, uid, and dir fields are defined, the command
+
+  useradd -d $dir -m -s $shell -u $uid $username
+
+is executed on shellmachine via ssh.  This behaviour can be surpressed by
+setting $FS::svc_acct::nossh_hack true.
+
+=cut
+
+sub insert {
+  my($self)=@_;
+  my($error);
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  $error=$self->check;
+  return $error if $error;
+
+  return "Username ". $self->username. " in use"
+    if qsearchs('svc_acct',{'username'=> $self->username } );
+
+  my($part_svc) = qsearchs('part_svc',{ 'svcpart' => $self->svcpart });
+  return "Unkonwn svcpart" unless $part_svc;
+  return "uid in use"
+    if $part_svc->svc_acct__uid_flag ne 'F'
+      && qsearchs('svc_acct',{'uid'=> $self->uid } )
+      && $self->username !~ /^(hyla)?fax$/
+    ;
+
+  my($svcnum)=$self->svcnum;
+  my($cust_svc);
+  unless ( $svcnum ) {
+    $cust_svc=create FS::cust_svc ( {
+      'svcnum'  => $svcnum,
+      'pkgnum'  => $self->pkgnum,
+      'svcpart' => $self->svcpart,
+    } );
+    my($error) = $cust_svc->insert;
+    return $error if $error;
+    $svcnum = $self->svcnum($cust_svc->svcnum);
+  }
+
+  $error = $self->add;
+  if ($error) {
+    #$cust_svc->del if $cust_svc;
+    $cust_svc->delete if $cust_svc;
+    return $error;
+  }
+
+  my($username,$uid,$dir,$shell) = (
+    $self->username,
+    $self->uid,
+    $self->dir,
+    $self->shell,
+  );
+  if ( $username 
+       && $uid
+       && $dir
+       && $shellmachine
+       && ! $nossh_hack ) {
+    #one way
+    ssh("root\@$shellmachine",
+        "useradd -d $dir -m -s $shell -u $uid $username"
+    );
+    #another way
+    #ssh("root\@$shellmachine","/bin/mkdir $dir; /bin/chmod 711 $dir; ".
+    #  "/bin/cp -p /etc/skel/.* $dir 2>/dev/null; ".
+    #  "/bin/cp -pR /etc/skel/Maildir $dir 2>/dev/null; ".
+    #  "/bin/chown -R $uid $dir") unless $nossh_hack;
+  }
+
+  ''; #no error
+}
+
+=item delete
+
+Deletes this account from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+The corresponding FS::cust_svc record will be deleted as well.
+
+If the configuration value (see L<FS::Conf>) shellmachine exists, the command:
+
+  userdel $username
+
+is executed on shellmachine via ssh.  This behaviour can be surpressed by
+setting $FS::svc_acct::nossh_hack true.
+
+=cut
+
+sub delete {
+  my($self)=@_;
+  my($error);
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  my($svcnum)=$self->getfield('svcnum');
+
+  $error = $self->del;
+  return $error if $error;
+
+  my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});  
+  $error = $cust_svc->del;
+  return $error if $error;
+
+  my($username) = $self->getfield('username');
+  if ( $username && $shellmachine && ! $nossh_hack ) {
+    ssh("root\@$shellmachine","userdel $username");
+  }
+
+  '';
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+If the configuration value (see L<FS::Conf>) shellmachine exists, and the 
+dir field has changed, the command:
+
+  [ -d $old_dir ] && (
+    chmod u+t $old_dir;
+    umask 022;
+    mkdir $new_dir;
+    cd $old_dir;
+    find . -depth -print | cpio -pdm $new_dir;
+    chmod u-t $new_dir;
+    chown -R $uid.$gid $new_dir;
+    rm -rf $old_dir
+  )
+
+is executed on shellmachine via ssh.  This behaviour can be surpressed by
+setting $FS::svc_acct::nossh_hack true.
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  my($error);
+
+  return "(Old) Not a svc_acct record!" unless $old->table eq "svc_acct";
+  return "Can't change svcnum!"
+    unless $old->getfield('svcnum') eq $new->getfield('svcnum');
+
+  return "Username in use"
+    if $old->getfield('username') ne $new->getfield('username') &&
+      qsearchs('svc_acct',{'username'=> $new->getfield('username') } );
+
+  return "Can't change uid!"
+    if $old->getfield('uid') ne $new->getfield('uid');
+
+  #change homdir when we change username
+  if ( $old->getfield('username') ne $new->getfield('username') ) {
+    $new->setfield('dir','');
+  }
+
+  $error=$new->check;
+  return $error if $error;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  $error = $new->rep($old);
+  return $error if $error;
+
+  my($old_dir,$new_dir)=( $old->getfield('dir'),$new->getfield('dir') );
+  my($uid,$gid)=( $new->getfield('uid'), $new->getfield('gid') );
+  if ( $old_dir
+       && $new_dir
+       && $old_dir ne $new_dir
+       && ! $nossh_hack
+  ) {
+    ssh("root\@$shellmachine","[ -d $old_dir ] && ".
+                 "( chmod u+t $old_dir; ". #turn off qmail delivery
+                 "umask 022; mkdir $new_dir; cd $old_dir; ".
+                 "find . -depth -print | cpio -pdm $new_dir; ".
+                 "chmod u-t $new_dir; chown -R $uid.$gid $new_dir; ".
+                 "rm -rf $old_dir". 
+                 ")"
+    );
+  }
+
+  ''; #no error
+}
+
+=item suspend
+
+Suspends this account by prefixing *SUSPENDED* to the password.  If there is an
+error, returns the error, otherwise returns false.
+
+Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=cut
+
+sub suspend {
+  my($old) = @_;
+  my(%hash) = $old->hash;
+  unless ( $hash{_password} =~ /^\*SUSPENDED\* / ) {
+    $hash{_password} = '*SUSPENDED* '.$hash{_password};
+    my($new) = create FS::svc_acct ( \%hash );
+#    $new->replace($old);
+    $new->rep($old); #to avoid password checking :)
+  } else {
+    ''; #no error (already suspended)
+  }
+
+}
+
+=item unsuspend
+
+Unsuspends this account by removing *SUSPENDED* from the password.  If there is
+an error, returns the error, otherwise returns false.
+
+Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=cut
+
+sub unsuspend {
+  my($old) = @_;
+  my(%hash) = $old->hash;
+  if ( $hash{_password} =~ /^\*SUSPENDED\* (.*)$/ ) {
+    $hash{_password} = $1;
+    my($new) = create FS::svc_acct ( \%hash );
+#    $new->replace($old);
+    $new->rep($old); #to avoid password checking :)
+  } else {
+    ''; #no error (already unsuspended)
+  }
+}
+
+=item cancel
+
+Just returns false (no error) for now.
+
+Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=cut
+
+# Usage: $error = $record -> cancel;
+sub cancel {
+  ''; #stub (no error) - taken care of in delete
+}
+
+=item check
+
+Checks all fields to make sure this is a valid service.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+Sets any fixed values; see L<FS::part_svc>.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a svc_acct record!" unless $self->table eq "svc_acct";
+  my($recref) = $self->hashref;
+
+  $recref->{svcnum} =~ /^(\d*)$/ or return "Illegal svcnum";
+  $recref->{svcnum} = $1;
+
+  #get part_svc
+  my($svcpart);
+  my($svcnum)=$self->getfield('svcnum');
+  if ($svcnum) {
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
+    return "Unknown svcnum" unless $cust_svc; 
+    $svcpart=$cust_svc->svcpart;
+  } else {
+    $svcpart=$self->getfield('svcpart');
+  }
+  my($part_svc)=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  return "Unkonwn svcpart" unless $part_svc;
+
+  #set fixed fields from part_svc
+  my($field);
+  foreach $field ( fields('svc_acct') ) {
+    if ( $part_svc->getfield('svc_acct__'. $field. '_flag') eq 'F' ) {
+      $self->setfield($field,$part_svc->getfield('svc_acct__'. $field) );
+    }
+  }
+
+  my($ulen)=$self->dbdef_table->column('username')->length;
+  $recref->{username} =~ /^([a-z0-9_\-]{2,$ulen})$/
+    or return "Illegal username";
+  $recref->{username} = $1;
+  $recref->{username} =~ /[a-z]/ or return "Illegal username";
+
+  $recref->{popnum} =~ /^(\d*)$/ or return "Illegal popnum";
+  $recref->{popnum} = $1;
+  return "Unkonwn popnum" unless
+    ! $recref->{popnum} ||
+    qsearchs('svc_acct_pop',{'popnum'=> $recref->{popnum} } );
+
+  unless ( $part_svc->getfield('svc_acct__uid_flag') eq 'F' ) {
+
+    $recref->{uid} =~ /^(\d*)$/ or return "Illegal uid";
+    $recref->{uid} = $1 eq '' ? $self->unique('uid') : $1;
+
+    $recref->{gid} =~ /^(\d*)$/ or return "Illegal gid";
+    $recref->{gid} = $1 eq '' ? $recref->{uid} : $1;
+    #not all systems use gid=uid
+    #you can set a fixed gid in part_svc
+
+    return "Only root can have uid 0"
+      if $recref->{uid} == 0 && $recref->{username} ne 'root';
+
+    my($error);
+    return $error if $error=$self->ut_textn('finger');
+
+    $recref->{dir} =~ /^([\/\w\-]*)$/
+      or return "Illegal directory";
+    $recref->{dir} = $1 || 
+      $dir_prefix . '/' . $recref->{username}
+      #$dir_prefix . '/' . substr($recref->{username},0,1). '/' . $recref->{username}
+    ;
+
+    unless ( $recref->{username} eq 'sync' ) {
+      my($shell);
+      if ( $shell = (grep $_ eq $recref->{shell}, @shells)[0] ) {
+        $recref->{shell} = $shell;
+      } else {
+        return "Illegal shell ". $self->shell;
+      }
+    } else {
+      $recref->{shell} = '/bin/sync';
+    }
+
+    $recref->{quota} =~ /^(\d*)$/ or return "Illegal quota (unimplemented)";
+    $recref->{quota} = $1;
+
+  } else {
+    $recref->{gid} ne '' ? 
+      return "Can't have gid without uid" : ( $recref->{gid}='' );
+    $recref->{finger} ne '' ? 
+      return "Can't have finger-name without uid" : ( $recref->{finger}='' );
+    $recref->{dir} ne '' ? 
+      return "Can't have directory without uid" : ( $recref->{dir}='' );
+    $recref->{shell} ne '' ? 
+      return "Can't have shell without uid" : ( $recref->{shell}='' );
+    $recref->{quota} ne '' ? 
+      return "Can't have quota without uid" : ( $recref->{quota}='' );
+  }
+
+  unless ( $part_svc->getfield('svc_acct__slipip_flag') eq 'F' ) {
+    unless ( $recref->{slipip} eq '0e0' ) {
+      $recref->{slipip} =~ /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/
+        or return "Illegal slipip". $self->slipip;
+      $recref->{slipip} = $1;
+    } else {
+      $recref->{slipip} = '0e0';
+    }
+
+  }
+
+  #arbitrary RADIUS stuff; allow ut_textn for now
+  foreach ( grep /^radius_/, fields('svc_acct') ) {
+    $self->ut_textn($_);
+  }
+
+  #generate a password if it is blank
+  $recref->{_password} = join('',map($pw_set[ int(rand $#pw_set) ], (0..7) ) )
+    unless ( $recref->{_password} );
+
+  #if ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([^\t\n]{4,16})$/ ) {
+  if ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([^\t\n]{4,8})$/ ) {
+    $recref->{_password} = $1.$3;
+    #uncomment this to encrypt password immediately upon entry, or run
+    #bin/crypt_pw in cron to give new users a window during which their
+    #password is available to techs, for faxing, etc.  (also be aware of 
+    #radius issues!)
+    #$recref->{password} = $1.
+    #  crypt($3,$saltset[int(rand(64))].$saltset[int(rand(64))]
+    #;
+  } elsif ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([\w\.\/]{13,24})$/ ) {
+    $recref->{_password} = $1.$3;
+  } elsif ( $recref->{_password} eq '*' ) {
+    $recref->{_password} = '*';
+  } else {
+    return "Illegal password";
+  }
+
+  ''; #no error
+}
+
+=back
+
+=head1 BUGS
+
+It doesn't properly override FS::Record yet.
+
+The remote commands should be configurable.
+
+The create method should set defaults from part_svc (like the check method
+sets fixed values).
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
+L<FS::SSH>, L<ssh>, L<FS::svc_acct_pop>, schema.html from the base
+documentation.
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jul-16 - 21
+
+rewrite (among other things, now know about part_svc) ivan@sisd.com 98-mar-8
+
+Changed 'password' to '_password' because Pg6.3 reserves the password word
+	bmccane@maxbaud.net	98-apr-3
+
+username length and shell no longer hardcoded ivan@sisd.com 98-jun-28
+
+eww but needed: ignore uid duplicates for 'fax' and 'hylafax'
+ivan@sisd.com 98-jun-29
+
+$nossh_hack ivan@sisd.com 98-jul-13
+
+protections against UID/GID of 0 for incorrectly-setup RDBMSs (also
+in bin/svc_acct.export) ivan@sisd.com 98-jul-13
+
+arbitrary radius attributes ivan@sisd.com 98-aug-13
+
+/var/spool/freeside/conf/shellmachine ivan@sisd.com 98-aug-13
+
+pod and FS::conf ivan@sisd.com 98-sep-22
+
+=cut
+
+1;
+
diff --git a/site_perl/svc_domain.pm b/site_perl/svc_domain.pm
new file mode 100644
index 000000000..1ddd5b290
--- /dev/null
+++ b/site_perl/svc_domain.pm
@@ -0,0 +1,539 @@
+package FS::svc_domain;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK $whois_hack $conf $mydomain $smtpmachine);
+use Exporter;
+use Carp;
+use Mail::Internet;
+use Mail::Header;
+use Date::Format;
+use FS::Record qw(fields qsearch qsearchs);
+use FS::cust_svc;
+use FS::Conf;
+
+@ISA = qw(FS::Record Exporter);
+@EXPORT_OK = qw(fields);
+
+$conf = new FS::Conf;
+
+$mydomain = $conf->config('domain');
+$smtpmachine = $conf->config('smtpmachine');
+
+my($internic)="/var/spool/freeside/conf/registries/internic";
+my($conf_tech)="$internic/tech_contact";
+my($conf_from)="$internic/from";
+my($conf_to)="$internic/to";
+my($nameservers)="$internic/nameservers";
+my($template)="$internic/template";
+
+open(TECH_CONTACT,$conf_tech) or die "Can't open $conf_tech: $!";
+my($tech_contact)=map {
+  /^(.*)$/ or die "Illegal line in $conf_tech!"; #yes, we trust the file
+  $1;
+} grep $_ !~ /^(#|$)/, <TECH_CONTACT>;
+close TECH_CONTACT;
+
+open(FROM,$conf_from) or die "Can't open $conf_from: $!";
+my($from)=map {
+  /^(.*)$/ or die "Illegal line in $conf_from!"; #yes, we trust the file
+  $1;
+} grep $_ !~ /^(#|$)/, <FROM>;
+close FROM;
+
+open(TO,$conf_to) or die "Can't open $conf_to: $!";
+my($to)=map {
+  /^(.*)$/ or die "Illegal line in $conf_to!"; #yes, we trust the file
+  $1;
+} grep $_ !~ /^(#|$)/, <TO>;
+close TO;
+
+open(NAMESERVERS,$nameservers) or die "Can't open $nameservers: $!";
+my(@nameservers)=map {
+  /^\s*\d+\.\d+\.\d+\.\d+\s+([^\s]+)\s*$/
+    or die "Illegal line in $nameservers!"; #yes, we trust the file
+  $1;
+} grep $_ !~ /^(#|$)/, <NAMESERVERS>;
+close NAMESERVERS;
+open(NAMESERVERS,$nameservers) or die "Can't open $nameservers: $!";
+my(@nameserver_ips)=map {
+  /^\s*(\d+\.\d+\.\d+\.\d+)\s+([^\s]+)\s*$/
+    or die "Illegal line in $nameservers!"; #yes, we trust the file
+  $1;
+} grep $_ !~ /^(#|$)/, <NAMESERVERS>;
+close NAMESERVERS;
+
+open(TEMPLATE,$template) or die "Can't open $template: $!";
+my(@template)=map {
+  /^(.*)$/ or die "Illegal line in $to!"; #yes, we trust the file
+  $1. "\n";
+} <TEMPLATE>;
+close TEMPLATE;
+
+=head1 NAME
+
+FS::svc_domain - Object methods for svc_domain records
+
+=head1 SYNOPSIS
+
+  use FS::svc_domain;
+
+  $record = create FS::svc_domain \%hash;
+  $record = create FS::svc_domain { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $error = $record->suspend;
+
+  $error = $record->unsuspend;
+
+  $error = $record->cancel;
+
+=head1 DESCRIPTION
+
+An FS::svc_domain object represents a domain.  FS::svc_domain inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item svcnum - primary key (assigned automatically for new accounts)
+
+=item domain
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new domain.  To add the domain to the database, see L<"insert">.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('svc_domain')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('svc_domain',$hashref);
+
+}
+
+=item insert
+
+Adds this domain to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+The additional fields I<pkgnum> and I<svcpart> (see L<FS::cust_svc>) should be 
+defined.  An FS::cust_svc record will be created and inserted.
+
+The additional field I<action> should be set to I<N> for new domains or I<M>
+for transfers.
+
+A registration or transfer email will be submitted unless
+$FS::svc_domain::whois_hack is true.
+
+=cut
+
+sub insert {
+  my($self)=@_;
+  my($error);
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  $error=$self->check;
+  return $error if $error;
+
+  return "Domain in use (here)"
+    if qsearchs('svc_domain',{'domain'=> $self->domain } );
+
+  my($whois)=(($self->_whois)[0]);
+  return "Domain in use (see whois)"
+    if ( $self->action eq "N" && $whois !~ /^No match for/ );
+  return "Domain not found (see whois)"
+    if ( $self->action eq "M" && $whois =~ /^No match for/ );
+
+  my($svcnum)=$self->getfield('svcnum');
+  my($cust_svc);
+  unless ( $svcnum ) {
+    $cust_svc=create FS::cust_svc ( {
+      'svcnum'  => $svcnum,
+      'pkgnum'  => $self->getfield('pkgnum'),
+      'svcpart' => $self->getfield('svcpart'),
+    } );
+    my($error) = $cust_svc->insert;
+    return $error if $error;
+    $svcnum = $self->setfield('svcnum',$cust_svc->getfield('svcnum'));
+  }
+
+  $error = $self->add;
+  if ($error) {
+    $cust_svc->del if $cust_svc;
+    return $error;
+  }
+
+  $self->submit_internic unless $whois_hack;
+
+  ''; #no error
+}
+
+=item delete
+
+Deletes this domain from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+The corresponding FS::cust_svc record will be deleted as well.
+
+=cut
+
+sub delete {
+  my($self)=@_;
+  my($error);
+
+  my($svcnum)=$self->getfield('svcnum');
+  
+  $error = $self->del;
+  return $error if $error;
+
+  my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});  
+  $error = $cust_svc->del;
+  return $error if $error;
+
+  '';
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  my($error);
+
+  return "(Old) Not a svc_domain record!" unless $old->table eq "svc_domain";
+  return "Can't change svcnum!"
+    unless $old->getfield('svcnum') eq $new->getfield('svcnum');
+
+  return "Can't change domain - reorder."
+    if $old->getfield('domain') ne $new->getfield('domain'); 
+
+  $error=$new->check;
+  return $error if $error;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  $error = $new->rep($old);
+  return $error if $error;
+
+  '';
+
+}
+
+=item suspend
+
+Just returns false (no error) for now.
+
+Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=cut
+
+sub suspend {
+  ''; #no error (stub)
+}
+
+=item unsuspend
+
+Just returns false (no error) for now.
+
+Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=cut
+
+sub unsuspend {
+  ''; #no error (stub)
+}
+
+=item cancel
+
+Just returns false (no error) for now.
+
+Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=cut
+
+sub cancel {
+  ''; #no error (stub)
+}
+
+=item check
+
+Checks all fields to make sure this is a valid domain.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+Sets any fixed values; see L<FS::part_svc>.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a svc_domain record!" unless $self->table eq "svc_domain";
+  my($recref) = $self->hashref;
+
+  $recref->{svcnum} =~ /^(\d*)$/ or return "Illegal svcnum";
+  $recref->{svcnum} = $1;
+
+  #get part_svc (and pkgnum)
+  my($svcpart,$pkgnum);
+  my($svcnum)=$self->getfield('svcnum');
+  if ($svcnum) {
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
+    return "Unknown svcnum" unless $cust_svc; 
+    $svcpart=$cust_svc->svcpart;
+    $pkgnum=$cust_svc->pkgnum;
+  } else {
+    $svcpart=$self->svcpart;
+    $pkgnum=$self->pkgnum;
+  }
+  my($part_svc)=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  return "Unkonwn svcpart" unless $part_svc;
+
+  #set fixed fields from part_svc
+  my($field);
+  foreach $field ( fields('svc_acct') ) {
+    if ( $part_svc->getfield('svc_domain__'. $field. '_flag') eq 'F' ) {
+      $self->setfield($field,$part_svc->getfield('svc_domain__'. $field) );
+    }
+  }
+
+  unless ( $whois_hack ) {
+    unless ( $self->email ) { #find out an email address
+      my(@svc_acct);
+      foreach ( qsearch('cust_svc',{'pkgnum'=>$pkgnum}) ) {
+        my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$_->svcnum});
+        push @svc_acct, $svc_acct if $svc_acct;
+      }
+
+      if ( scalar(@svc_acct) == 0 ) {
+        return "Must order an account first";
+      } elsif ( scalar(@svc_acct) > 1 ) {
+        return "More than one account in package ". $pkgnum. ": specify admin contact email";
+      } else {
+        $self->email($svc_acct[0]->username. '@'. $mydomain);
+      }
+    }
+  }
+
+  #if ( $recref->{domain} =~ /^([\w\-\.]{1,22})\.(com|net|org|edu)$/ ) {
+  if ( $recref->{domain} =~ /^([\w\-]{1,22})\.(com|net|org|edu)$/ ) {
+    $recref->{domain} = "$1.$2";
+  # hmmmmmmmm.
+  } elsif ( $whois_hack && $recref->{domain} =~ /^([\w\-\.]+)$/ ) {
+    $recref->{domain} = $1;
+  } else {
+    return "Illegal domain ". $recref->{domain}.
+           " (or unknown registry - try \$whois_hack)";
+  }
+
+  $recref->{action} =~ /^(M|N)$/ or return "Illegal action";
+  $recref->{action} = $1;
+
+  $self->ut_textn('purpose');
+
+}
+
+=item _whois
+
+Executes the command:
+
+  whois do $domain
+
+and returns the output.
+
+(Always returns I<No match for domian "$domain".> if
+$FS::svc_domain::whois_hack is set true.)
+
+=cut
+
+sub _whois {
+  my($self)=@_;
+  my($domain)=$self->domain;
+  return ( "No match for domain \"$domain\"." ) if $whois_hack;
+  open(WHOIS,"whois do $domain |");
+  return <WHOIS>;
+}
+
+=item submit_internic
+
+Submits a registration email for this domain.
+
+=cut
+
+sub submit_internic {
+  my($self)=@_;
+
+  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$self->pkgnum});
+  return unless $cust_pkg;
+  my($cust_main)=qsearchs('cust_main',{'custnum'=>$cust_pkg->custnum});
+  return unless $cust_main;
+
+  my(%subs)=(
+    'action'       => $self->action,
+    'purpose'      => $self->purpose,
+    'domain'       => $self->domain,
+    'company'      => $cust_main->company 
+                        || $cust_main->getfield('first'). ' '.
+                           $cust_main->getfield('last')
+                      ,
+    'city'         => $cust_main->city,
+    'state'        => $cust_main->state,
+    'zip'          => $cust_main->zip,
+    'country'      => $cust_main->country,
+    'last'         => $cust_main->getfield('last'),
+    'first'        => $cust_main->getfield('first'),
+    'daytime'      => $cust_main->daytime,
+    'fax'          => $cust_main->fax,
+    'email'        => $self->email,
+    'tech_contact' => $tech_contact,
+    'primary'      => shift @nameservers,
+    'primary_ip'   => shift @nameserver_ips,
+  );
+
+  #yuck
+  my(@xtemplate)=@template;
+  my(@body);
+  my($line);
+  OLOOP: while ( defined($line = shift @xtemplate) ) {
+
+    if ( $line =~ /^###LOOP###$/ ) {
+      my(@buffer);
+      LOADBUF: while ( defined($line = shift @xtemplate) ) {
+        last LOADBUF if ( $line =~ /^###ENDLOOP###$/ );
+        push @buffer, $line;
+      }
+      my(%lubs)=(
+        'address'      => $cust_main->address2 
+                            ? [ $cust_main->address1, $cust_main->address2 ]
+                            : [ $cust_main->address1 ]
+                          ,
+        'secondary'    => [ @nameservers ],
+        'secondary_ip' => [ @nameserver_ips ],
+      );
+      LOOP: while (1) {
+        my(@xbuffer)=@buffer;
+        SUBLOOP: while ( defined($line = shift @xbuffer) ) {
+          if ( $line =~ /###(\w+)###/ ) {
+            #last LOOP unless my($lub)=shift@{$lubs{$1}};
+            next OLOOP unless my $lub = shift @{$lubs{$1}};
+            $line =~ s/###(\w+)###/$lub/e;
+            redo SUBLOOP;
+          } else {
+            push @body, $line;
+          }
+        } #SUBLOOP
+      } #LOOP
+
+    }
+
+    if ( $line =~ /###(\w+)###/ ) {
+      #$line =~ s/###(\w+)###/$subs{$1}/eg;
+      $line =~ s/###(\w+)###/$subs{$1}/e;
+      redo OLOOP;
+    } else {
+      push @body, $line;
+    }
+
+  } #OLOOP
+
+  my($subject);
+  if ( $self->action eq "M" ) {
+    $subject = "MODIFY DOMAIN ". $self->domain;
+  } elsif ($self->action eq "N" ) { 
+    $subject = "NEW DOMAIN ". $self->domain;
+  } else {
+    croak "submit_internic called with action ". $self->action;
+  }
+
+  $ENV{SMTPHOSTS}=$smtpmachine;
+  $ENV{MAILADDRESS}=$from;
+  my($header)=Mail::Header->new( [
+    "From: $from",
+    "To: $to",
+    "Sender: $from",
+    "Reply-To: $from",
+    "Date: ". time2str("%a, %d %b %Y %X %z",time),
+    "Subject: $subject",
+  ] );
+
+  my($msg)=Mail::Internet->new(
+    'Header' => $header,
+    'Body' => \@body,
+  );
+
+  $msg->smtpsend or die "Can't send registration email"; #die? warn?
+
+}
+
+=back
+
+=head1 BUGS
+
+It doesn't properly override FS::Record yet.
+
+All BIND/DNS fields should be included (and exported).
+
+All registries should be supported.
+
+Not all configuration access is through FS::Conf!
+
+Should change action to a real field.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
+L<FS::SSH>, L<ssh>, L<dot-qmail>, schema.html from the base documentation,
+config.html from the base documentation.
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jul-21
+
+rewrite ivan@sisd.com 98-mar-10
+
+add internic bits ivan@sisd.com 98-mar-14
+
+Changed 'day' to 'daytime' because Pg6.3 reserves the day word
+	bmccane@maxbaud.net	98-apr-3
+
+/var/spool/freeside/conf/registries/internic/, Mail::Internet, etc.
+ivan@sisd.com 98-jul-17-19
+
+pod, some FS::Conf (not complete) ivan@sisd.com 98-sep-23
+
+=cut
+
+1;
+
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From ffaa3cdbec09f8ec07317211c4b2d67aded43012 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Sep 1998 09:27:07 +0000
Subject: Initial revision

---
 site_perl/type_pkgs.pm | 150 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 150 insertions(+)
 create mode 100644 site_perl/type_pkgs.pm

diff --git a/site_perl/type_pkgs.pm b/site_perl/type_pkgs.pm
new file mode 100644
index 000000000..a71579603
--- /dev/null
+++ b/site_perl/type_pkgs.pm
@@ -0,0 +1,150 @@
+package FS::type_pkgs;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK);
+use Exporter;
+use FS::Record qw(fields qsearchs);
+
+@ISA = qw(FS::Record Exporter);
+@EXPORT_OK = qw(fields);
+
+=head1 NAME
+
+FS::type_pkgs - Object methods for type_pkgs records
+
+=head1 SYNOPSIS
+
+  use FS::type_pkgs;
+
+  $record = create FS::type_pkgs \%hash;
+  $record = create FS::type_pkgs { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::type_pkgs record links an agent type (see L<FS::agent_type>) to a
+billing item definition (see L<FS::part_pkg>).  FS::type_pkgs inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item typenum - Agent type, see L<FS::agent_type>
+
+=item pkgpart - Billing item definition, see L<FS::part_pkg>
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Create a new record.  To add the record to the database, see L<"insert">.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('type_pkgs')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('type_pkgs',$hashref);
+
+}
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  $self->check or
+  $self->add;
+}
+
+=item delete
+
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=cut
+
+sub delete {
+  my($self)=@_;
+
+  $self->del;
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  return "(Old) Not a type_pkgs record!" unless $old->table eq "type_pkgs";
+
+  $new->check or
+  $new->rep($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a type_pkgs record!" unless $self->table eq "type_pkgs";
+  my($recref) = $self->hashref;
+
+  $recref->{typenum} =~ /^(\d+)$/ or return "Illegal typenum";
+  $recref->{typenum} = $1;
+  return "Unknown typenum"
+    unless qsearchs('agent_type',{'typenum'=>$recref->{typenum}});
+
+  $recref->{pkgpart} =~ /^(\d+)$/ or return "Illegal pkgpart";
+  $recref->{pkgpart} = $1;
+  return "Unknown pkgpart"
+    unless qsearchs('part_pkg',{'pkgpart'=>$recref->{pkgpart}});
+
+  ''; #no error
+}
+
+=back
+
+=head1 HISTORY
+
+Defines the relation between agent types and pkgparts
+(Which pkgparts can the different [types of] agents sell?)
+
+ivan@sisd.com 97-nov-13
+
+change to ut_ FS::Record, fixed bugs
+ivan@sisd.com 97-dec-10
+
+=cut
+
+1;
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 208d3a27d3bf6128735b76ca91b941007e911fd6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Sep 1998 10:18:06 +0000
Subject: Initial revision

---
 site_perl/UID.pm | 209 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 209 insertions(+)
 create mode 100644 site_perl/UID.pm

diff --git a/site_perl/UID.pm b/site_perl/UID.pm
new file mode 100644
index 000000000..16f03a0ec
--- /dev/null
+++ b/site_perl/UID.pm
@@ -0,0 +1,209 @@
+package FS::UID;
+
+use strict;
+use vars qw(
+  @ISA @EXPORT_OK $cgi $dbh $freeside_uid $conf $datasrc $db_user $db_pass
+);
+use Exporter;
+use Carp;
+use DBI;
+use FS::Conf;
+
+@ISA = qw(Exporter);
+@EXPORT_OK = qw(checkeuid checkruid swapuid cgisuidsetup
+                adminsuidsetup getotaker dbh datasrc);
+
+$freeside_uid = scalar(getpwnam('freeside'));
+
+my $conf = new FS::Conf;
+($datasrc, $db_user, $db_pass) = $conf->config('secrets')
+  or die "Can't get secrets: $!";
+
+=head1 NAME
+
+FS::UID - Subroutines for database login and assorted other stuff
+
+=head1 SYNOPSIS
+
+  use FS::UID qw(adminsuidsetup cgisuidsetup dbh datasrc getotaker
+  checkeuid checkruid swapuid);
+
+  adminsuidsetup;
+
+  $cgi = new CGI::Base;
+  $cgi->get;
+  $dbh = cgisuidsetup($cgi);
+
+  $dbh = dbh;
+
+  $datasrc = datasrc;
+
+=head1 DESCRIPTION
+
+Provides a hodgepodge of subroutines. 
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item adminsuidsetup
+
+Cleans the environment.
+Make sure the script is running as freeside, or setuid freeside.
+Opens a connection to the database.
+Swaps real and effective UIDs.
+Returns the DBI database handle (usually you don't need this).
+
+=cut
+
+sub adminsuidsetup {
+
+  $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
+  $ENV{'SHELL'} = '/bin/sh';
+  $ENV{'IFS'} = " \t\n";
+  $ENV{'CDPATH'} = '';
+  $ENV{'ENV'} = '';
+  $ENV{'BASH_ENV'} = '';
+
+  croak "Not running uid freeside!" unless checkeuid();
+  $dbh = DBI->connect($datasrc,$db_user,$db_pass, {
+	# hack for web demo
+	#  my($user)=getotaker();
+	#  $dbh = DBI->connect("$datasrc:$user",$db_user,$db_pass, {
+                          'AutoCommit' => 'true',
+                          'ChopBlanks' => 'true',
+  } ) or die "DBI->connect error: $DBI::errstr\n";;
+
+  swapuid(); #go to non-privledged user if running setuid freeside
+
+  $dbh;
+}
+=item cgisuidsetup CGI::Base_OBJECT
+
+Stores the CGI::Base_OBJECT for later use.
+Runs adminsuidsetup.
+
+=cut
+
+sub cgisuidsetup {
+  $cgi=$_[0];
+  adminsuidsetup;
+}
+
+=item dbh
+
+Returns the DBI database handle.
+
+=cut
+
+sub dbh {
+  $dbh;
+}
+
+=item datasrc
+
+Returns the DBI data source.
+
+=cut
+
+sub datasrc {
+  $datasrc;
+}
+
+#hack for web demo
+#sub setdbh {
+#  $dbh=$_[0];
+#}
+
+sub suidsetup {
+  croak "suidsetup depriciated";
+}
+
+=item getotaker
+
+Returns the current Freeside user.  Currently that means the CGI REMOTE_USER,
+or 'freeside'.
+
+=cut
+
+sub getotaker {
+  if ($cgi && defined $cgi->var('REMOTE_USER')) {
+    return $cgi->var('REMOTE_USER'); #for now
+  } else {
+    'freeside';
+  }
+}
+
+=item checkeuid
+
+Returns true if effective UID is that of the freeside user.
+
+=cut
+
+sub checkeuid {
+  ( $> == $freeside_uid );
+}
+
+=item checkruid
+
+Returns true if the real UID is that of the freeside user.
+
+=cut
+
+sub checkruid {
+  ( $< == $freeside_uid );
+}
+
+=item swapuid
+
+Swaps real and effective UIDs.
+
+=cut
+
+sub swapuid {
+  ($<,$>) = ($>,$<);
+}
+
+=back
+
+=head1 BUGS
+
+Not OO.
+
+No capabilities yet.  When mod_perl and Authen::DBI are implemented, 
+cgisuidsetup will go away as well.
+
+=head1 SEE ALSO
+
+L<FS::Record>,  L<CGI::Base>, L<DBI>
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jun-4 - 9
+ 
+untaint otaker ivan@voicenet.com 97-jul-7
+
+generalize and auto-get uid (getotaker still needs to be db'ed)
+ivan@sisd.com 97-nov-10
+
+&cgisuidsetup logs into database.  other cleaning.
+ivan@sisd.com 97-nov-22,23
+
+&adminsuidsetup logs into database with otaker='freeside' (for
+automated tasks like billing)
+ivan@sisd.com 97-dec-13
+
+added sub datasrc for fs-setup ivan@sisd.com 98-feb-21
+
+datasrc, user and pass now come from conf/secrets ivan@sisd.com 98-jun-28
+
+added ChopBlanks to DBI call (see man DBI) ivan@sisd.com 98-aug-16
+
+pod, use FS::Conf, implemented cgisuidsetup as adminsuidsetup,
+inlined suidsetup
+ivan@sisd.com 98-sep-12
+
+=cut
+
+1;
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 0b8ec7c8252356d54ef6156b339960eb0f101754 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 25 Sep 1998 07:47:27 +0000
Subject: Initial revision

---
 site_perl/dbdef.pm          | 174 ++++++++++++++++++++++++++++++++++++++++++++
 site_perl/dbdef_colgroup.pm | 107 +++++++++++++++++++++++++++
 2 files changed, 281 insertions(+)
 create mode 100644 site_perl/dbdef.pm
 create mode 100644 site_perl/dbdef_colgroup.pm

diff --git a/site_perl/dbdef.pm b/site_perl/dbdef.pm
new file mode 100644
index 000000000..ac31bff0b
--- /dev/null
+++ b/site_perl/dbdef.pm
@@ -0,0 +1,174 @@
+package FS::dbdef;
+
+use strict;
+use vars qw(@ISA);
+use Exporter;
+use Carp;
+use FreezeThaw qw(freeze thaw cmpStr);
+use FS::dbdef_table;
+use FS::dbdef_unique;
+use FS::dbdef_index;
+use FS::dbdef_column;
+
+@ISA = qw(Exporter);
+
+=head1 NAME
+
+FS::dbdef - Database objects
+
+=head1 SYNOPSIS
+
+  use FS::dbdef;
+
+  $dbdef = new FS::dbdef (@dbdef_table_objects);
+  $dbdef = load FS::dbdef "filename";
+
+  $dbdef->save("filename");
+
+  $dbdef->addtable($dbdef_table_object);
+
+  @table_names = $dbdef->tables;
+
+  $FS_dbdef_table_object = $dbdef->table;
+
+=head1 DESCRIPTION
+
+FS::dbdef objects are collections of FS::dbdef_table objects and represnt
+a database (a collection of tables).
+
+=head1 METHODS
+
+=over 4
+
+=item new TABLE, TABLE, ...
+
+Creates a new FS::dbdef object
+
+=cut
+
+sub new {
+  my($proto,@tables)=@_;
+  my(%tables)=map  { $_->name, $_ } @tables; #check for duplicates?
+
+  my($class) = ref($proto) || $proto;
+  my($self) = {
+    'tables' => \%tables,
+  };
+
+  bless ($self, $class);
+
+}
+
+=item load FILENAME
+
+Loads an FS::dbdef object from a file.
+
+=cut
+
+sub load {
+  my($proto,$file)=@_; #use $proto ?
+  open(FILE,"<$file") or die "Can't open $file: $!";
+  my($string)=join('',<FILE>); #can $string have newlines?  pry not?
+  close FILE or die "Can't close $file: $!";
+  my($self)=thaw $string;
+  #no bless needed?
+  $self;
+}
+
+=item save FILENAME
+
+Saves an FS::dbdef object to a file.
+
+=cut
+
+sub save {
+  my($self,$file)=@_;
+  my($string)=freeze $self;
+  open(FILE,">$file") or die "Can't open $file: $!";
+  print FILE $string;
+  close FILE or die "Can't close file: $!";
+  my($check_self)=thaw $string;
+  die "Verify error: Can't freeze and thaw dbdef $self"
+    if (cmpStr($self,$check_self));
+}
+
+=item addtable TABLE
+
+Adds this FS::dbdef_table object.
+
+=cut
+
+sub addtable {
+  my($self,$table)=@_;
+  ${$self->{'tables'}}{$table->name}=$table; #check for dupliates?
+}
+
+=item tables 
+
+Returns the names of all tables.
+
+=cut
+
+sub tables {
+  my($self)=@_;
+  keys %{$self->{'tables'}};
+}
+
+=item table TABLENAME
+
+Returns the named FS::dbdef_table object.
+
+=cut
+
+sub table {
+  my($self,$table)=@_;
+  $self->{'tables'}->{$table};
+}
+
+=head1 BUGS
+
+Each FS::dbdef object should have a name which corresponds to its name within
+the SQL database engine.
+
+=head1 SEE ALSO
+
+L<FS::dbdef_table>, L<FS::Record>,
+
+=head1 HISTORY
+
+beginning of abstraction into a class (not really)
+
+ivan@sisd.com 97-dec-4
+
+added primary_key
+ivan@sisd.com 98-jan-20
+
+added datatype (very kludgy and needs to be cleaned)
+ivan@sisd.com 98-feb-21
+
+perltrap (sigh) masked by mysql 3.20->3,21 ivan@sisd.com 98-mar-2
+
+Change 'type' to 'atype' in agent_type
+Changed attributes to special words which are changed in fs-setup
+	ie. double(10,2) <=> MONEYTYPE
+Changed order of some of the field definitions because Pg6.3 is picky
+Changed 'day' to 'daytime' in cust_main
+Changed type of tax from tinyint to real
+Change 'password' to '_password' in svc_acct
+Pg6.3 does not allow 'field char(x) NULL'
+	bmccane@maxbaud.net	98-apr-3
+
+rewrite: now properly OO.  See also FS::dbdef_{table,column,unique,index}
+
+ivan@sisd.com 98-apr-17
+
+gained some extra functions ivan@sisd.com 98-may-11
+
+now knows how to Freeze and Thaw itself ivan@sisd.com 98-jun-2
+
+pod ivan@sisd.com 98-sep-23
+
+=cut
+
+1;
+
diff --git a/site_perl/dbdef_colgroup.pm b/site_perl/dbdef_colgroup.pm
new file mode 100644
index 000000000..64f2e3082
--- /dev/null
+++ b/site_perl/dbdef_colgroup.pm
@@ -0,0 +1,107 @@
+package FS::dbdef_colgroup;
+
+use strict;
+use vars qw(@ISA);
+
+@ISA = qw(Exporter);
+
+=head1 NAME
+
+FS::dbdef_colgroup - Column group objects
+
+=head1 SYNOPSIS
+
+  use FS::dbdef_colgroup;
+
+  $colgroup = new FS::dbdef_colgroup ( $lol );
+  $colgroup = new FS::dbdef_colgroup (
+    [
+      [ 'single_column' ],
+      [ 'multiple_columns', 'another_column', ],
+    ]
+  );
+
+  @sql_lists = $colgroup->sql_list;
+
+  @singles = $colgroup->singles;
+
+=head1 DESCRIPTION
+
+FS::dbdef_colgroup objects represent sets of sets of columns.
+
+=head1 METHODS
+
+=over 4
+
+=item new
+
+Creates a new FS::dbdef_colgroup object.
+
+=cut
+
+sub new {
+  my($proto, $lol) = @_;
+
+  my $class = ref($proto) || $proto;
+  my $self = {
+    'lol' => $lol,
+  };
+
+  bless ($self, $class);
+
+}
+
+=item sql_list
+
+Returns a flat list of comma-separated values, for SQL statements.
+
+=cut
+
+sub sql_list { #returns a flat list of comman-separates lists (for sql)
+  my($self)=@_;
+   grep $_ ne '', map join(', ', @{$_}), @{$self->{'lol'}};
+}
+
+=item singles
+
+Returns a flat list of all single item lists.
+
+=cut
+
+sub singles { #returns single-field groups as a flat list
+  my($self)=@_;
+  #map ${$_}[0], grep scalar(@{$_}) == 1, @{$self->{'lol'}};
+  map { 
+    ${$_}[0] =~ /^(\w+)$/
+      #aah!
+      or die "Illegal column ", ${$_}[0], " in colgroup!";
+    $1;
+  } grep scalar(@{$_}) == 1, @{$self->{'lol'}};
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::dbdef_table>, L<FS::dbdef_unique>, L<FS::dbdef_index>,
+L<FS::dbdef_column>, L<FS::dbdef>, L<perldsc>
+
+=head1 HISTORY
+
+class for dealing with groups of groups of columns (used as a base class by
+FS::dbdef_{unique,index} )
+
+ivan@sisd.com 98-apr-19
+
+added singles, fixed sql_list to skip empty lists ivan@sisd.com 98-jun-2
+
+untaint things we're returning in sub singels ivan@sisd.com 98-jun-4
+
+pod ivan@sisd.com 98-sep-24
+
+=cut
+
+1;
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From f769c7fcf268ac0cfd0d73fb02105ea48877041b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 25 Sep 1998 07:53:55 +0000
Subject: Initial revision

---
 site_perl/dbdef_index.pm  | 43 +++++++++++++++++++++++++++++++++++++++++++
 site_perl/dbdef_unique.pm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100644 site_perl/dbdef_index.pm
 create mode 100644 site_perl/dbdef_unique.pm

diff --git a/site_perl/dbdef_index.pm b/site_perl/dbdef_index.pm
new file mode 100644
index 000000000..2097db1ea
--- /dev/null
+++ b/site_perl/dbdef_index.pm
@@ -0,0 +1,43 @@
+package FS::dbdef_index;
+
+use strict;
+use vars qw(@ISA);
+use FS::dbdef_colgroup;
+
+@ISA=qw(FS::dbdef_colgroup);
+
+=head1 NAME
+
+FS::dbdef_unique.pm - Index object
+
+=head1 SYNOPSIS
+
+  use FS::dbdef_index;
+
+    # see FS::dbdef_colgroup methods
+
+=head1 DESCRIPTION
+
+FS::dbdef_unique objects represent the (non-unique) indices of a table
+(L<FS::dbdef_table>).  FS::dbdef_unique inherits from FS::dbdef_colgroup.
+
+=head1 BUGS
+
+Is this empty subclass needed?
+
+=head1 SEE ALSO
+
+L<FS::dbdef_colgroup>, L<FS::dbdef_record>, L<FS::Record>
+
+=head1 HISTORY
+
+class for dealing with index definitions
+
+ivan@sisd.com 98-apr-19
+
+pod ivan@sisd.com 98-sep-24
+
+=cut
+
+1;
+
diff --git a/site_perl/dbdef_unique.pm b/site_perl/dbdef_unique.pm
new file mode 100644
index 000000000..4ec40de60
--- /dev/null
+++ b/site_perl/dbdef_unique.pm
@@ -0,0 +1,44 @@
+package FS::dbdef_unique;
+
+use strict;
+use vars qw(@ISA);
+use FS::dbdef_colgroup;
+
+@ISA=qw(FS::dbdef_colgroup);
+
+=head1 NAME
+
+FS::dbdef_unique.pm - Unique object
+
+=head1 SYNOPSIS
+
+  use FS::dbdef_unique;
+
+  # see FS::dbdef_colgroup methods
+
+=head1 DESCRIPTION
+
+FS::dbdef_unique objects represent the unique indices of a database table
+(L<FS::dbdef_table>).  FS::dbdef_unique inherits from FS::dbdef_colgroup.
+
+=head1 BUGS
+
+Is this empty subclass needed?
+
+=head1 SEE ALSO
+
+L<FS::dbdef_colgroup>, L<FS::dbdef_record>, L<FS::Record>
+
+=head1 HISTORY
+
+class for dealing with unique definitions
+
+ivan@sisd.com 98-apr-19
+
+pod ivan@sisd.com 98-sep-24
+
+=cut
+
+1;
+
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 6efdacd3625e93d043e406aaef4f04b92b527527 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 25 Sep 1998 08:03:40 +0000
Subject: Initial revision

---
 site_perl/dbdef_column.pm | 175 ++++++++++++++++++++++++++++++++
 site_perl/dbdef_table.pm  | 249 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 424 insertions(+)
 create mode 100644 site_perl/dbdef_column.pm
 create mode 100644 site_perl/dbdef_table.pm

diff --git a/site_perl/dbdef_column.pm b/site_perl/dbdef_column.pm
new file mode 100644
index 000000000..023b57d1f
--- /dev/null
+++ b/site_perl/dbdef_column.pm
@@ -0,0 +1,175 @@
+package FS::dbdef_column;
+
+use strict;
+#use Carp;
+use Exporter;
+use vars qw(@ISA);
+
+@ISA = qw(Exporter);
+
+=head1 NAME
+
+FS::dbdef_column - Column object
+
+=head1 SYNOPSIS
+
+  use FS::dbdef_column;
+
+  $column_object = new FS::dbdef_column ( $name, $sql_type, '' );
+  $column_object = new FS::dbdef_column ( $name, $sql_type, 'NULL' );
+  $column_object = new FS::dbdef_column ( $name, $sql_type, '', $length );
+  $column_object = new FS::dbdef_column ( $name, $sql_type, 'NULL', $length );
+
+  $name = $column_object->name;
+  $column_object->name ( 'name' );
+
+  $name = $column_object->type;
+  $column_object->name ( 'sql_type' );
+
+  $name = $column_object->null;
+  $column_object->name ( 'NOT NULL' );
+
+  $name = $column_object->length;
+  $column_object->name ( $length );
+
+  $sql_line = $column->line;
+  $sql_line = $column->line $datasrc;
+
+=head1 DESCRIPTION
+
+FS::dbdef::column objects represend columns in tables (see L<FS::dbdef_table>).
+
+=head1 METHODS
+
+=over 4
+
+=item new
+
+Creates a new FS::dbdef_column object.
+
+=cut
+
+sub new {
+  my($proto,$name,$type,$null,$length)=@_;
+
+  #croak "Illegal name: $name" if grep $name eq $_, @reserved_words;
+
+  $null =~ s/^NOT NULL$//i;
+
+  my $class = ref($proto) || $proto;
+  my $self = {
+    'name'   => $name,
+    'type'   => $type,
+    'null'   => $null,
+    'length' => $length,
+  };
+
+  bless ($self, $class);
+
+}
+
+=item name
+
+Returns or sets the column name.
+
+=cut
+
+sub name {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+  #croak "Illegal name: $name" if grep $name eq $_, @reserved_words;
+    $self->{'name'} = $value;
+  } else {
+    $self->{'name'};
+  }
+}
+
+=item type
+
+Returns or sets the column type.
+
+=cut
+
+sub type {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{'type'} = $value;
+  } else {
+    $self->{'type'};
+  }
+}
+
+=item null
+
+Returns or sets the column null flag.
+
+=cut
+
+sub null {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $value =~ s/^NOT NULL$//i;
+    $self->{'null'} = $value;
+  } else {
+    $self->{'null'};
+  }
+}
+
+=item type
+
+Returns or sets the column length.
+
+=cut
+
+sub length {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{'length'} = $value;
+  } else {
+    $self->{'length'};
+  }
+}
+
+=item line [ $datasrc ]
+
+Returns an SQL column definition.
+
+If passed a DBI $datasrc specifying L<DBD::mysql>, will use MySQL-specific
+syntax.  Non-standard syntax for other engines (if applicable) may also be
+supported in the future.
+
+=cut
+
+sub line {
+  my($self,$datasrc)=@_;
+  my($null)=$self->null;
+  $null ||= "NOT NULL" if $datasrc =~ /mysql/; #yucky mysql hack
+  join(' ',
+    $self->name,
+    $self->type. ( $self->length ? '('.$self->length.')' : '' ),
+    $null,
+  );
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::dbdef_table>, L<FS::dbdef>, L<DBI>
+
+=head1 HISTORY
+
+class for dealing with column definitions
+
+ivan@sisd.com 98-apr-17
+
+now methods can be used to get or set data ivan@sisd.com 98-may-11
+
+mySQL-specific hack for null (what should be default?) ivan@sisd.com 98-jun-2
+
+=cut
+
+1;
+
diff --git a/site_perl/dbdef_table.pm b/site_perl/dbdef_table.pm
new file mode 100644
index 000000000..bc1454d9e
--- /dev/null
+++ b/site_perl/dbdef_table.pm
@@ -0,0 +1,249 @@
+package FS::dbdef_table;
+
+use strict;
+#use Carp;
+use Exporter;
+use vars qw(@ISA);
+use FS::dbdef_column;
+
+@ISA = qw(Exporter);
+
+=head1 NAME
+
+FS::dbdef_table - Table objects
+
+=head1 SYNOPSIS
+
+  use FS::dbdef_table;
+
+  $dbdef_table = new FS::dbdef_table (
+    "table_name",
+    "primary_key",
+    $FS_dbdef_unique_object,
+    $FS_dbdef_index_object,
+    @FS_dbdef_column_objects,
+  );
+
+  $dbdef_table->addcolumn ( $FS_dbdef_column_object );
+
+  $table_name = $dbdef_table->name;
+  $dbdef_table->name ("table_name");
+
+  $table_name = $dbdef_table->primary_keye;
+  $dbdef_table->primary_key ("primary_key");
+
+  $FS_dbdef_unique_object = $dbdef_table->unique;
+  $dbdef_table->unique ( $FS_dbdef_unique_object );
+
+  $FS_dbdef_index_object = $dbdef_table->index;
+  $dbdef_table->index ( $FS_dbdef_index_object );
+
+  @column_names = $dbdef->columns;
+
+  $FS_dbdef_column_object = $dbdef->column;
+
+  @sql_statements = $dbdef->sql_create_table;
+  @sql_statements = $dbdef->sql_create_table $datasrc;
+
+=head1 DESCRIPTION
+
+FS::dbdef_table objects represent a single database table.
+
+=head1 METHODS
+
+=over 4
+
+=item new
+
+Creates a new FS::dbdef_table object.
+
+=cut
+
+sub new {
+  my($proto,$name,$primary_key,$unique,$index,@columns)=@_;
+
+  my(%columns) = map { $_->name, $_ } @columns;
+
+  #check $primary_key, $unique and $index to make sure they are $columns ?
+  # (and sanity check?)
+
+  my $class = ref($proto) || $proto;
+  my $self = {
+    'name'        => $name,
+    'primary_key' => $primary_key,
+    'unique'      => $unique,
+    'index'       => $index,
+    'columns'     => \%columns,
+  };
+
+  bless ($self, $class);
+
+}
+
+=item addcolumn
+
+Adds this FS::dbdef_column object. 
+
+=cut
+
+sub addcolumn {
+  my($self,$column)=@_;
+  ${$self->{'columns'}}{$column->name}=$column; #sanity check?
+}
+
+=item name
+
+Returns or sets the table name.
+
+=cut
+
+sub name {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{name} = $value;
+  } else {
+    $self->{name};
+  }
+}
+
+=item primary_key
+
+Returns or sets the primary key.
+
+=cut
+
+sub primary_key {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{primary_key} = $value;
+  } else {
+    #$self->{primary_key};
+    #hmm.  maybe should untaint the entire structure when it comes off disk 
+    # cause if you don't trust that, ?
+    $self->{primary_key} =~ /^(\w*)$/ 
+      #aah!
+      or die "Illegal primary key ", $self->{primary_key}, " in dbdef!\n";
+    $1;
+  }
+}
+
+=item unique
+
+Returns or sets the FS::dbdef_unique object.
+
+=cut
+
+sub unique { 
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{unique} = $value;
+  } else {
+    $self->{unique};
+  }
+}
+
+=item index
+
+Returns or sets the FS::dbdef_index object.
+
+=cut
+
+sub index { 
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{'index'} = $value;
+  } else {
+    $self->{'index'};
+  }
+}
+
+=item columns
+
+Returns a list consisting of the names of all columns.
+
+=cut
+
+sub columns {
+  my($self)=@_;
+  keys %{$self->{'columns'}};
+}
+
+=item column "column"
+
+Returns the column object (see L<FS::dbdef_column>) for "column".
+
+=cut
+
+sub column {
+  my($self,$column)=@_;
+  $self->{'columns'}->{$column};
+}
+
+=item sql_create_table [ $datasrc ]
+
+Returns an array of SQL statments to create this table.
+
+If passed a DBI $datasrc specifying L<DBD::mysql>, will use MySQL-specific
+syntax.  Non-standard syntax for other engines (if applicable) may also be
+supported in the future.
+
+=cut
+
+sub sql_create_table { 
+  my($self,$datasrc)=@_;
+
+  my(@columns)=map { $self->column($_)->line($datasrc) } $self->columns;
+  push @columns, "PRIMARY KEY (". $self->primary_key. ")"
+    if $self->primary_key;
+  if ( $datasrc =~ /mysql/ ) { #yucky mysql hack
+    push @columns, map "UNIQUE ($_)", $self->unique->sql_list;
+    push @columns, map "INDEX ($_)", $self->index->sql_list;
+  }
+
+  "CREATE TABLE ". $self->name. " ( ". join(", ", @columns). " )",
+  ( map {
+    my($index) = $_ . "_index";
+    $index =~ s/,\s*/_/g;
+    "CREATE UNIQUE INDEX $index ON ". $self->name. " ($_)"
+  } $self->unique->sql_list ),
+  ( map {
+    my($index) = $_ . "_index";
+    $index =~ s/,\s*/_/g;
+    "CREATE INDEX $index ON ". $self->name. " ($_)"
+  } $self->index->sql_list ),
+  ;  
+
+
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::dbdef>, L<FS::dbdef_unique>, L<FS::dbdef_index>, L<FS::dbdef_unique>,
+L<DBI>
+
+=head1 HISTORY
+
+class for dealing with table definitions
+
+ivan@sisd.com 98-apr-18
+
+gained extra functions (should %columns be an IxHash?)
+ivan@sisd.com 98-may-11
+
+sql_create_table returns a list of statments, not just one, and now it
+does indices (plus mysql hack) ivan@sisd.com 98-jun-2
+
+untaint primary_key... hmm.  is this a hack around a bigger problem?
+looks like, did the same thing singles in colgroup!
+ivan@sisd.com 98-jun-4
+
+pod ivan@sisd.com 98-sep-24
+
+=cut
+
+1;
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 693939e7879f77a52b9e482a0f6bf2e80f8f7020 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 25 Sep 1998 08:30:42 +0000
Subject: Initial revision

---
 site_perl/cust_pkg.pm    | 507 +++++++++++++++++++++++++++++++++++++++++++++++
 site_perl/cust_refund.pm | 233 ++++++++++++++++++++++
 2 files changed, 740 insertions(+)
 create mode 100644 site_perl/cust_pkg.pm
 create mode 100644 site_perl/cust_refund.pm

diff --git a/site_perl/cust_pkg.pm b/site_perl/cust_pkg.pm
new file mode 100644
index 000000000..7dc5aa7ec
--- /dev/null
+++ b/site_perl/cust_pkg.pm
@@ -0,0 +1,507 @@
+package FS::cust_pkg;
+
+use strict;
+use vars qw(@ISA);
+use Exporter;
+use FS::UID qw(getotaker);
+use FS::Record qw(fields qsearch qsearchs);
+use FS::cust_svc;
+
+@ISA = qw(FS::Record Exporter);
+
+=head1 NAME
+
+FS::cust_pkg - Object methods for cust_pkg objects
+
+=head1 SYNOPSIS
+
+  use FS::cust_pkg;
+
+  $record = create FS::cust_pkg \%hash;
+  $record = create FS::cust_pkg { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $error = $record->cancel;
+
+  $error = $record->suspend;
+
+  $error = $record->unsuspend;
+
+  $error = FS::cust_pkg::order( $custnum, \@pkgparts );
+  $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );
+
+=head1 DESCRIPTION
+
+An FS::cust_pkg object represents a customer billing item.  FS::cust_pkg
+inherits from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item pkgnum - primary key (assigned automatically for new billing items)
+
+=item custnum - Customer (see L<FS::cust_main>)
+
+=item pkgpart - Billing item definition (see L<FS::part_pkg>)
+
+=item setup - date
+
+=item bill - date
+
+=item susp - date
+
+=item expire - date
+
+=item cancel - date
+
+=item otaker - order taker (assigned automatically if null, see L<FS::UID>)
+
+=back
+
+Note: setup, bill, susp, expire and cancel are specified as UNIX timestamps;
+see L<perlfunc/"time">.  Also see L<Time::Local> and L<Date::Parse> for
+conversion functions.
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Create a new billing item.  To add the item to the database, see L<"insert">.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('cust_pkg')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('cust_pkg',$hashref);
+}
+
+=item insert
+
+Adds this billing item to the database ("Orders" the item).  If there is an
+error, returns the error, otherwise returns false.
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  $self->check or
+  $self->add;
+}
+
+=item delete
+
+Currently unimplemented.  You don't want to delete billing items, because there
+would then be no record the customer ever purchased the item.  Instead, see
+the cancel method.
+
+sub delete {
+  return "Can't delete cust_pkg records!";
+}
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+Currently, custnum, setup, bill, susp, expire, and cancel may be changed.
+
+pkgpart may not be changed, but see the order subroutine.
+
+setup and bill are normally updated by calling the bill method of a customer
+object (see L<FS::cust_main>).
+
+suspend is normally updated by the suspend and unsuspend methods.
+
+cancel is normally updated by the cancel method (and also the order subroutine
+in some cases).
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  return "(Old) Not a cust_pkg record!" if $old->table ne "cust_pkg";
+  return "Can't change pkgnum!"
+    if $old->getfield('pkgnum') ne $new->getfield('pkgnum');
+  return "Can't (yet?) change pkgpart!"
+    if $old->getfield('pkgpart') ne $new->getfield('pkgpart');
+  return "Can't change otaker!"
+    if $old->getfield('otaker') ne $new->getfield('otaker');
+  return "Can't change setup once it exists!"
+    if $old->getfield('setup') &&
+       $old->getfield('setup') != $new->getfield('setup');
+  #some logic for bill, susp, cancel?
+
+  $new->check or
+  $new->rep($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid billing item.  If there is an
+error, returns the error, otherwise returns false.  Called by the insert and
+replace methods.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a cust_pkg record!" if $self->table ne "cust_pkg";
+  my($recref) = $self->hashref;
+
+  $recref->{pkgnum} =~ /^(\d*)$/ or return "Illegal pkgnum";
+  $recref->{pkgnum}=$1;
+
+  $recref->{custnum} =~ /^(\d+)$/ or return "Illegal custnum";
+  $recref->{custnum}=$1;
+  return "Unknown customer"
+    unless qsearchs('cust_main',{'custnum'=>$recref->{custnum}});
+
+  $recref->{pkgpart} =~ /^(\d+)$/ or return "Illegal pkgpart";
+  $recref->{pkgpart}=$1;
+  return "Unknown pkgpart"
+    unless qsearchs('part_pkg',{'pkgpart'=>$recref->{pkgpart}});
+
+  $recref->{otaker} ||= &getotaker;
+  $recref->{otaker} =~ /^(\w{0,8})$/ or return "Illegal otaker";
+  $recref->{otaker}=$1;
+
+  $recref->{setup} =~ /^(\d*)$/ or return "Illegal setup date";
+  $recref->{setup}=$1;
+
+  $recref->{bill} =~ /^(\d*)$/ or return "Illegal bill date";
+  $recref->{bill}=$1;
+
+  $recref->{susp} =~ /^(\d*)$/ or return "Illegal susp date";
+  $recref->{susp}=$1;
+
+  $recref->{cancel} =~ /^(\d*)$/ or return "Illegal cancel date";
+  $recref->{cancel}=$1;
+
+  ''; #no error
+}
+
+=item cancel
+
+Cancels and removes all services (see L<FS::cust_svc> and L<FS::part_svc>)
+in this package, then cancels the package itself (sets the cancel field to
+now).
+
+If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub cancel {
+  my($self)=@_;
+  my($error);
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE'; 
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  my($cust_svc);
+  foreach $cust_svc (
+    qsearch('cust_svc',{'pkgnum'=> $self->pkgnum } )
+  ) {
+    my($part_svc)=
+      qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+
+    $part_svc->getfield('svcdb') =~ /^([\w\-]+)$/
+      or return "Illegal svcdb value in part_svc!";
+    my($svcdb) = $1;
+    require "FS/$svcdb.pm";
+
+    my($svc) = qsearchs($svcdb,{'svcnum' => $cust_svc->svcnum } );
+    if ($svc) {
+      bless($svc,"FS::$svcdb");
+      $error = $svc->cancel;
+      return "Error cancelling service: $error" if $error;
+      $error = $svc->delete;
+      return "Error deleting service: $error" if $error;
+    }
+
+    bless($cust_svc,"FS::cust_svc");
+    $error = $cust_svc->delete;
+    return "Error deleting cust_svc: $error" if $error;
+
+  }
+
+  unless ( $self->getfield('cancel') ) {
+    my(%hash) = $self->hash;
+    $hash{'cancel'}=$^T;
+    my($new) = create FS::cust_pkg ( \%hash );
+    $error=$new->replace($self);
+    return $error if $error;
+  }
+
+  ''; #no errors
+}
+
+=item suspend
+
+Suspends all services (see L<FS::cust_svc> and L<FS::part_svc>) in this
+package, then suspends the package itself (sets the susp field to now).
+
+If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub suspend {
+  my($self)=@_;
+  my($error);
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE'; 
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  my($cust_svc);
+  foreach $cust_svc (
+    qsearch('cust_svc',{'pkgnum'=> $self->getfield('pkgnum') } )
+  ) {
+    my($part_svc)=
+      qsearchs('part_svc',{'svcpart'=> $cust_svc->getfield('svcpart') } );
+
+    $part_svc->getfield('svcdb') =~ /^([\w\-]+)$/
+      or return "Illegal svcdb value in part_svc!";
+    my($svcdb) = $1;
+    require "FS/$svcdb.pm";
+
+    my($svc) = qsearchs($svcdb,{'svcnum' => $cust_svc->getfield('svcnum') } );
+
+    if ($svc) {
+      bless($svc,"FS::$svcdb");
+      $error = $svc->suspend;
+      return $error if $error;
+    }
+
+  }
+
+  unless ( $self->getfield('susp') ) {
+    my(%hash) = $self->hash;
+    $hash{'susp'}=$^T;
+    my($new) = create FS::cust_pkg ( \%hash );
+    $error=$new->replace($self);
+    return $error if $error;
+  }
+
+  ''; #no errors
+}
+
+=item unsuspend
+
+Unsuspends all services (see L<FS::cust_svc> and L<FS::part_svc>) in this
+package, then unsuspends the package itself (clears the susp field).
+
+If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub unsuspend {
+  my($self)=@_;
+  my($error);
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE'; 
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  my($cust_svc);
+  foreach $cust_svc (
+    qsearch('cust_svc',{'pkgnum'=> $self->getfield('pkgnum') } )
+  ) {
+    my($part_svc)=
+      qsearchs('part_svc',{'svcpart'=> $cust_svc->getfield('svcpart') } );
+
+    $part_svc->getfield('svcdb') =~ /^([\w\-]+)$/
+      or return "Illegal svcdb value in part_svc!";
+    my($svcdb) = $1;
+    require "FS/$svcdb.pm";
+
+    my($svc) = qsearchs($svcdb,{'svcnum' => $cust_svc->getfield('svcnum') } );
+    if ($svc) {
+      bless($svc,"FS::$svcdb");
+      $error = $svc->unsuspend;
+      return $error if $error;
+    }
+
+  }
+
+  unless ( ! $self->getfield('susp') ) {
+    my(%hash) = $self->hash;
+    $hash{'susp'}='';
+    my($new) = create FS::cust_pkg ( \%hash );
+    $error=$new->replace($self);
+    return $error if $error;
+  }
+
+  ''; #no errors
+}
+
+=back
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item order CUSTNUM, PKGPARTS_ARYREF, [ REMOVE_PKGNUMS_ARYREF ]
+
+CUSTNUM is a customer (see L<FS::cust_main>)
+
+PKGPARTS is a list of pkgparts specifying the the billing item definitions (see
+L<FS::part_pkg>) to order for this customer.  Duplicates are of course
+permitted.
+
+REMOVE_PKGNUMS is an optional list of pkgnums specifying the billing items to
+remove for this customer.  The services (see L<FS::cust_svc>) are moved to the
+new billing items.  An error is returned if this is not possible (see
+L<FS::pkg_svc>).
+
+=cut
+
+sub order {
+  my($custnum,$pkgparts,$remove_pkgnums)=@_;
+
+  my(%part_pkg);
+  # generate %part_pkg
+  # $part_pkg{$pkgpart} is true iff $custnum may purchase $pkgpart
+    my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
+    my($agent)=qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
+
+    my($type_pkgs);
+    foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
+      my($pkgpart)=$type_pkgs->pkgpart;
+      $part_pkg{$pkgpart}++;
+    }
+  #
+
+  my(%svcnum);
+  # generate %svcnum
+  # for those packages being removed:
+  #@{ $svcnum{$svcpart} } goes from a svcpart to a list of FS::Record
+  # objects (table eq 'cust_svc')
+  my($pkgnum);
+  foreach $pkgnum ( @{$remove_pkgnums} ) {
+    my($cust_svc);
+    foreach $cust_svc (qsearch('cust_svc',{'pkgnum'=>$pkgnum})) {
+      push @{ $svcnum{$cust_svc->getfield('svcpart')} }, $cust_svc;
+    }
+  }
+  
+  my(@cust_svc);
+  #generate @cust_svc
+  # for those packages the customer is purchasing:
+  # @{$pkgparts} is a list of said packages, by pkgpart
+  # @cust_svc is a corresponding list of lists of FS::Record objects
+  my($pkgpart);
+  foreach $pkgpart ( @{$pkgparts} ) {
+    return "Customer not permitted to purchase pkgpart $pkgpart!"
+      unless $part_pkg{$pkgpart};
+    push @cust_svc, [
+      map {
+        ( $svcnum{$_} && @{ $svcnum{$_} } ) ? shift @{ $svcnum{$_} } : ();
+      } (split(/,/,
+       qsearchs('part_pkg',{'pkgpart'=>$pkgpart})->getfield('services')
+      ))
+    ];
+  }
+
+  #check for leftover services
+  foreach (keys %svcnum) {
+    next unless @{ $svcnum{$_} };
+    return "Leftover services!";
+  }
+
+  #no leftover services, let's make changes.
+ 
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE'; 
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE'; 
+
+  #first cancel old packages
+#  my($pkgnum);
+  foreach $pkgnum ( @{$remove_pkgnums} ) {
+    my($old) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+    return "Package $pkgnum not found to remove!" unless $old;
+    my(%hash) = $old->hash;
+    $hash{'cancel'}=$^T;   
+    my($new) = create FS::cust_pkg ( \%hash );
+    my($error)=$new->replace($old);
+    return $error if $error;
+  }
+
+  #now add new packages, changing cust_svc records if necessary
+#  my($pkgpart);
+  while ($pkgpart=shift @{$pkgparts} ) {
+ 
+    my($new) = create FS::cust_pkg ( {
+                                       'custnum' => $custnum,
+                                       'pkgpart' => $pkgpart,
+                                    } );
+    my($error) = $new->insert;
+    return $error if $error; 
+    my($pkgnum)=$new->getfield('pkgnum');
+ 
+    my($cust_svc);
+    foreach $cust_svc ( @{ shift @cust_svc } ) {
+      my(%hash) = $cust_svc->hash;
+      $hash{'pkgnum'}=$pkgnum;
+      my($new) = create FS::cust_svc ( \%hash );
+      my($error)=$new->replace($cust_svc);
+      return $error if $error;
+    }
+  }  
+
+  ''; #no errors
+}
+
+=back
+
+=head1 BUGS
+
+It doesn't properly override FS::Record yet.
+
+sub order is not OO.  Perhaps it should be moved to FS::cust_main and made so?
+
+In sub order, the @pkgparts array (passed by reference) is clobbered.
+
+Also in sub order, no money is adjusted.  Once FS::part_pkg defines a standard
+method to pass dates to the recur_prog expression, it should do so.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_main>, L<FS::part_pkg>, L<FS::cust_svc>
+, L<FS::pkg_svc>, schema.html from the base documentation
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jul-1 - 21
+
+fixed for new agent->agent_type->type_pkgs in &order ivan@sisd.com 98-mar-7
+
+pod ivan@sisd.com 98-sep-21
+
+=cut
+
+1;
+
diff --git a/site_perl/cust_refund.pm b/site_perl/cust_refund.pm
new file mode 100644
index 000000000..a30f21716
--- /dev/null
+++ b/site_perl/cust_refund.pm
@@ -0,0 +1,233 @@
+package FS::cust_refund;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK);
+use Exporter;
+use Business::CreditCard;
+use FS::Record qw(fields qsearchs);
+use FS::UID qw(getotaker);
+use FS::cust_credit;
+
+@ISA = qw(FS::Record Exporter);
+@EXPORT_OK = qw(fields);
+
+=head1 NAME
+
+FS::cust_refund - Object method for cust_refund objects
+
+=head1 SYNOPSIS
+
+  use FS::cust_refund;
+
+  $record = create FS::cust_refund \%hash;
+  $record = create FS::cust_refund { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_refund represents a refund.  FS::cust_refund inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item refundnum - primary key (assigned automatically for new refunds)
+
+=item crednum - Credit (see L<FS::cust_credit>)
+
+=item refund - Amount of the refund
+
+=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=item payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
+
+=item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
+
+=item otaker - order taker (assigned automatically, see L<FS::UID>)
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new refund.  To add the refund to the database, see L<"insert">.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  #now in FS::Record::new
+  #my($field);
+  #foreach $field (fields('cust_refund')) {
+  #  $hashref->{$field}='' unless defined $hashref->{$field};
+  #}
+
+  $proto->new('cust_refund',$hashref);
+
+}
+
+=item insert
+
+Adds this refund to the database, and updates the credit (see
+L<FS::cust_credit>).
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  my($error);
+
+  $error=$self->check;
+  return $error if $error;
+
+  my($old_cust_credit) = qsearchs('cust_credit', {
+                                'crednum' => $self->getfield('crednum')
+                               } );
+  return "Unknown crednum" unless $old_cust_credit;
+  my(%hash)=$old_cust_credit->hash;
+  $hash{credited} = sprintf("%.2f",$hash{credited} - $self->getfield('refund') );
+  my($new_cust_credit) = create FS::cust_credit ( \%hash );
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  $error=$new_cust_credit -> replace($old_cust_credit);
+  return "Error modifying cust_credit: $error" if $error;
+
+  $self->add;
+}
+
+=item delete
+
+Currently unimplemented (accounting reasons).
+
+=cut
+
+sub delete {
+  return "Can't (yet?) delete cust_refund records!";
+#template code below
+#  my($self)=@_;
+#
+#  $self->del;
+}
+
+=item replace OLD_RECORD
+
+Currently unimplemented (accounting reasons).
+
+=cut
+
+sub replace {
+   return "Can't (yet?) modify cust_refund records!";
+#template code below
+#  my($new,$old)=@_;
+#  return "(Old) Not a cust_refund record!" unless $old->table eq "cust_refund";
+#
+#  $new->check or
+#  $new->rep($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid refund.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert method.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a cust_refund record!" unless $self->table eq "cust_refund";
+
+  my $error =
+    $self->ut_number('refundnum')
+    || $self->ut_number('crednum')
+    || $self->ut_money('amount')
+    || $self->ut_numbern('_date')
+  ;
+  return $error if $error;
+
+  my($recref) = $self->hashref;
+
+  $recref->{_date} ||= time;
+
+  $recref->{payby} =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
+  $recref->{payby} = $1;
+
+  if ( $recref->{payby} eq 'CARD' ) {
+
+    $recref->{payinfo} =~ s/\D//g;
+    if ( $recref->{payinfo} ) {
+      $recref->{payinfo} =~ /^(\d{13,16})$/
+        or return "Illegal (mistyped?) credit card number (payinfo)";
+      $recref->{payinfo} = $1;
+      #validate($recref->{payinfo})
+      #  or return "Illegal (checksum) credit card number (payinfo)";
+      my($type)=cardtype($recref->{payinfo});
+      return "Unknown credit card type"
+        unless ( $type =~ /^VISA/ ||
+                 $type =~ /^MasterCard/ ||
+                 $type =~ /^American Express/ ||
+                 $type =~ /^Discover/ );
+    } else {
+      $recref->{payinfo}='N/A';
+    }
+
+  } elsif ( $recref->{payby} eq 'BILL' ) {
+
+    $recref->{payinfo} =~ /^([\w \-]*)$/
+      or return "Illegal P.O. number (payinfo)";
+    $recref->{payinfo} = $1;
+
+  } elsif ( $recref->{payby} eq 'COMP' ) {
+
+    $recref->{payinfo} =~ /^([\w]{2,8})$/
+      or return "Illegal comp account issuer (payinfo)";
+    $recref->{payinfo} = $1;
+
+  }
+
+  $self->otaker(getotaker);
+
+  ''; #no error
+}
+
+=back
+
+=head1 BUGS
+
+It doesn't properly override FS::Record yet.
+
+Delete and replace methods.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_credit>, schema.html from the base documentation.
+
+=head1 HISTORY
+
+ivan@sisd.com 98-mar-18
+
+->create had wrong tablename ivan@sisd.com 98-jun-16
+(finish me!)
+
+pod and finish up ivan@sisd.com 98-sep-21
+
+=cut
+
+1;
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 08f52e31c5f777963d565085d077c9d8d9734e17 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 25 Sep 1998 08:52:48 +0000
Subject: Initial revision

---
 bin/pod2x                            |  23 +++
 htdocs/docs/man/Bill.txt             |  29 +++
 htdocs/docs/man/CGI.txt              |  47 +++++
 htdocs/docs/man/Conf.txt             |  47 +++++
 htdocs/docs/man/Invoice.txt          |  23 +++
 htdocs/docs/man/Record.txt           | 332 +++++++++++++++++++++++++++++++++++
 htdocs/docs/man/SSH.txt              |  63 +++++++
 htdocs/docs/man/UID.txt              |  79 +++++++++
 htdocs/docs/man/agent.txt            |  65 +++++++
 htdocs/docs/man/agent_type.txt       |  72 ++++++++
 htdocs/docs/man/cust_bill.txt        | 140 +++++++++++++++
 htdocs/docs/man/cust_bill_pkg.txt    |  72 ++++++++
 htdocs/docs/man/cust_credit.txt      |  75 ++++++++
 htdocs/docs/man/cust_main.txt        | 200 +++++++++++++++++++++
 htdocs/docs/man/cust_main_county.txt |  67 +++++++
 htdocs/docs/man/cust_pay.txt         |  66 +++++++
 htdocs/docs/man/cust_pkg.txt         | 150 ++++++++++++++++
 htdocs/docs/man/cust_refund.txt      |  66 +++++++
 htdocs/docs/man/cust_svc.txt         |  72 ++++++++
 htdocs/docs/man/dbdef.txt            |  80 +++++++++
 htdocs/docs/man/dbdef_colgroup.txt   |  51 ++++++
 htdocs/docs/man/dbdef_column.txt     |  69 ++++++++
 htdocs/docs/man/dbdef_index.txt      |  27 +++
 htdocs/docs/man/dbdef_table.txt      |  94 ++++++++++
 htdocs/docs/man/dbdef_unique.txt     |  27 +++
 htdocs/docs/man/index.html           |  48 +++++
 htdocs/docs/man/part_pkg.txt         |  73 ++++++++
 htdocs/docs/man/part_referral.txt    |  63 +++++++
 htdocs/docs/man/part_svc.txt         |  69 ++++++++
 htdocs/docs/man/pkg_svc.txt          |  61 +++++++
 htdocs/docs/man/svc_acct.txt         | 168 ++++++++++++++++++
 htdocs/docs/man/svc_acct_pop.txt     |  65 +++++++
 htdocs/docs/man/svc_acct_sm.txt      | 121 +++++++++++++
 htdocs/docs/man/svc_domain.txt       | 131 ++++++++++++++
 htdocs/docs/man/type_pkgs.txt        |  55 ++++++
 35 files changed, 2890 insertions(+)
 create mode 100755 bin/pod2x
 create mode 100644 htdocs/docs/man/Bill.txt
 create mode 100644 htdocs/docs/man/CGI.txt
 create mode 100644 htdocs/docs/man/Conf.txt
 create mode 100644 htdocs/docs/man/Invoice.txt
 create mode 100644 htdocs/docs/man/Record.txt
 create mode 100644 htdocs/docs/man/SSH.txt
 create mode 100644 htdocs/docs/man/UID.txt
 create mode 100644 htdocs/docs/man/agent.txt
 create mode 100644 htdocs/docs/man/agent_type.txt
 create mode 100644 htdocs/docs/man/cust_bill.txt
 create mode 100644 htdocs/docs/man/cust_bill_pkg.txt
 create mode 100644 htdocs/docs/man/cust_credit.txt
 create mode 100644 htdocs/docs/man/cust_main.txt
 create mode 100644 htdocs/docs/man/cust_main_county.txt
 create mode 100644 htdocs/docs/man/cust_pay.txt
 create mode 100644 htdocs/docs/man/cust_pkg.txt
 create mode 100644 htdocs/docs/man/cust_refund.txt
 create mode 100644 htdocs/docs/man/cust_svc.txt
 create mode 100644 htdocs/docs/man/dbdef.txt
 create mode 100644 htdocs/docs/man/dbdef_colgroup.txt
 create mode 100644 htdocs/docs/man/dbdef_column.txt
 create mode 100644 htdocs/docs/man/dbdef_index.txt
 create mode 100644 htdocs/docs/man/dbdef_table.txt
 create mode 100644 htdocs/docs/man/dbdef_unique.txt
 create mode 100644 htdocs/docs/man/index.html
 create mode 100644 htdocs/docs/man/part_pkg.txt
 create mode 100644 htdocs/docs/man/part_referral.txt
 create mode 100644 htdocs/docs/man/part_svc.txt
 create mode 100644 htdocs/docs/man/pkg_svc.txt
 create mode 100644 htdocs/docs/man/svc_acct.txt
 create mode 100644 htdocs/docs/man/svc_acct_pop.txt
 create mode 100644 htdocs/docs/man/svc_acct_sm.txt
 create mode 100644 htdocs/docs/man/svc_domain.txt
 create mode 100644 htdocs/docs/man/type_pkgs.txt

diff --git a/bin/pod2x b/bin/pod2x
new file mode 100755
index 000000000..1edb1c41e
--- /dev/null
+++ b/bin/pod2x
@@ -0,0 +1,23 @@
+#!/usr/bin/perl
+
+#use Pod::Text;
+#$Pod::Text::termcap=1;
+
+my $site_perl = "./site_perl";
+#my $catman = "./catman";
+my $catman = "./htdocs/docs/man";
+#my $html = "./htdocs/docs/man";
+
+$|=1;
+
+die "Can't find $site_perl and $catman"
+  unless [ -d $site_perl ] && [ -d $catman ] && [ -d $html ];
+
+foreach my $file (glob("$site_perl/*.pm")) {
+  $file =~ /\/([\w\-]+)\.pm$/ or die "oops file $file";
+  my $name = $1;
+  print "$name\n"; 
+  system "pod2text $file >$catman/$name.txt"; 
+#  system "pod2html --podpath=$site_perl $file >$html/$name.html";
+#  system "pod2html $file >$html/$name.html";
+}
diff --git a/htdocs/docs/man/Bill.txt b/htdocs/docs/man/Bill.txt
new file mode 100644
index 000000000..545dd1a4c
--- /dev/null
+++ b/htdocs/docs/man/Bill.txt
@@ -0,0 +1,29 @@
+NAME
+    FS::Bill - Legacy stub
+
+SYNOPSIS
+    The functionality of FS::Bill has been integrated into
+    FS::cust_main.
+
+HISTORY
+    ivan@voicenet.com 97-jul-24 - 25 - 28
+
+    use Safe; evaluate all fees with perl (still on TODO list until
+    I write some examples & test opmask to see if we can read db)
+    %hash=$obj->hash later ivan@sisd.com 98-mar-13
+
+    packages with no next bill date start at $time not time, this
+    should eliminate the last of the problems with billing at a past
+    date also rewrite the invoice priting logic not to print
+    invoices for things that haven't happended yet and update
+    $cust_bill->printed when we print so PAST DUE notices work, and
+    s/date/_date/ ivan@sisd.com 98-jun-4
+
+    more logic for past due stuff - packages with no next bill date
+    start at $cust_pkg->setup || $time ivan@sisd.com 98-jul-13
+
+    moved a few things in collection logic; negative charges should
+    work ivan@sisd.com 98-aug-6
+
+    pod, moved everything to FS::cust_main ivan@sisd.com 98-sep-19
+
diff --git a/htdocs/docs/man/CGI.txt b/htdocs/docs/man/CGI.txt
new file mode 100644
index 000000000..54f9b8a6a
--- /dev/null
+++ b/htdocs/docs/man/CGI.txt
@@ -0,0 +1,47 @@
+NAME
+    FS::CGI - Subroutines for the web interface
+
+SYNOPSIS
+      use FS::CGI qw(header menubar idiot eidiot);
+
+      print header( 'Title', '' );
+      print header( 'Title', menubar('item', 'URL', ... ) );
+
+      idiot "error message"; 
+      eidiot "error message";
+
+DESCRIPTION
+    Provides a few common subroutines for the web interface.
+
+SUBROUTINES
+    header TITLE, MENUBAR
+        Returns an HTML header.
+
+    menubar ITEM, URL, ...
+        Returns an HTML menubar.
+
+    idiot ERROR
+        Sends headers and an HTML error message.
+
+    eidiot ERROR
+        Sends headers and an HTML error message, then exits.
+
+BUGS
+    Not OO.
+
+    Not complete.
+
+    Uses CGI-modules instead of CGI.pm
+
+SEE ALSO
+    the CGI::Base manpage
+
+HISTORY
+    subroutines for the HTML/CGI GUI, not properly OO. :(
+
+    ivan@sisd.com 98-apr-16 ivan@sisd.com 98-jun-22
+
+    lose the background, eidiot ivan@sisd.com 98-sep-2
+
+    pod ivan@sisd.com 98-sep-12
+
diff --git a/htdocs/docs/man/Conf.txt b/htdocs/docs/man/Conf.txt
new file mode 100644
index 000000000..c46c9ee6a
--- /dev/null
+++ b/htdocs/docs/man/Conf.txt
@@ -0,0 +1,47 @@
+NAME
+    FS::Conf - Read access to Freeside configuration values
+
+SYNOPSIS
+      use FS::Conf;
+
+      $conf = new FS::Conf;
+      $conf = new FS::Conf "/non/standard/config/directory";
+
+      $dir = $conf->dir;
+
+      $value = $conf->config('key');
+      @list  = $conf->config('key');
+      $bool  = $conf->exists('key');
+
+DESCRIPTION
+    Read access to Freeside configuration values. Keys currently map
+    to filenames, but this may change in the future.
+
+METHODS
+    new [ DIRECTORY ]
+        Create a new configuration object. Optionally, a non-default
+        directory may be specified.
+
+    dir Returns the directory.
+
+    config
+        Returns the configuration value or values (depending on
+        context) for key.
+
+    exists
+        Returns true if the specified key exists, even if the
+        corresponding value is undefined.
+
+BUGS
+    The option to specify a non-default directory should probably be
+    removed.
+
+    Write access (with locking) should be implemented.
+
+SEE ALSO
+    config.html from the base documentation contains a list of
+    configuration files.
+
+HISTORY
+    Ivan Kohler <ivan@sisd.com> 98-sep-6
+
diff --git a/htdocs/docs/man/Invoice.txt b/htdocs/docs/man/Invoice.txt
new file mode 100644
index 000000000..17953d51d
--- /dev/null
+++ b/htdocs/docs/man/Invoice.txt
@@ -0,0 +1,23 @@
+NAME
+    FS::Invoice - Legacy stub
+
+SYNOPSIS
+    The functioanlity of FS::invoice has been integrated in
+    FS::cust_bill.
+
+HISTORY
+    ivan@voicenet.com 97-jun-25 - 27
+
+    maybe should be changed to be OO-functions on $cust_bill
+    objects? (instead of passing invnum, ugh).
+
+    ISA cust_bill and return inovice instead of passing filehandle
+    ivan@sisd.com 98-mar-13 (add postscript output!)
+
+    close our kid when we're done ivan@sisd.com 98-jun-4
+
+    separated code which shuffled data from code which formatted.
+    (so i could) fixed past due notices showing up when balance due
+    =< 0 return address comes from /var/spool/freeside/conf/address
+    ivan@sisd.com 98-jul-2
+
diff --git a/htdocs/docs/man/Record.txt b/htdocs/docs/man/Record.txt
new file mode 100644
index 000000000..0accb65d1
--- /dev/null
+++ b/htdocs/docs/man/Record.txt
@@ -0,0 +1,332 @@
+NAME
+    FS::Record - Database record objects
+
+SYNOPSIS
+        use FS::Record;
+        use FS::Record qw(dbh fields hfields qsearch qsearchs dbdef);
+
+        $record = new FS::Record 'table', \%hash;
+        $record = new FS::Record 'table', { 'column' => 'value', ... };
+
+        $record  = qsearchs FS::Record 'table', \%hash;
+        $record  = qsearchs FS::Record 'table', { 'column' => 'value', ... };
+        @records = qsearch  FS::Record 'table', \%hash; 
+        @records = qsearch  FS::Record 'table', { 'column' => 'value', ... };
+
+        $table = $record->table;
+        $dbdef_table = $record->dbdef_table;
+
+        $value = $record->get('column');
+        $value = $record->getfield('column');
+        $value = $record->column;
+
+        $record->set( 'column' => 'value' );
+        $record->setfield( 'column' => 'value' );
+        $record->column('value');
+
+        %hash = $record->hash;
+
+        $hashref = $record->hashref;
+
+        $error = $record->add;
+
+        $error = $record->del;
+
+        $error = $new_record->rep($old_record);
+
+        $value = $record->unique('column');
+
+        $value = $record->ut_float('column');
+        $value = $record->ut_number('column');
+        $value = $record->ut_numbern('column');
+        $value = $record->ut_money('column');
+        $value = $record->ut_text('column');
+        $value = $record->ut_textn('column');
+        $value = $record->ut_alpha('column');
+        $value = $record->ut_alphan('column');
+        $value = $record->ut_phonen('column');
+        $value = $record->ut_anythingn('column');
+
+        $dbdef = reload_dbdef;
+        $dbdef = reload_dbdef "/non/standard/filename";
+        $dbdef = dbdef;
+
+        $quoted_value = _quote($value,'table','field');
+
+        #depriciated
+        $fields = hfields('table');
+        if ( $fields->{Field} ) { # etc.
+
+        @fields = fields 'table';
+
+DESCRIPTION
+    (Mostly) object-oriented interface to database records. Records
+    are currently implemented on top of DBI. FS::Record is intended
+    as a base class for table-specific classes to inherit from, i.e.
+    FS::cust_main.
+
+METHODS
+    new TABLE, HASHREF
+        Creates a new record. It doesn't store it in the database,
+        though. See the section on "add" for that.
+
+        Note that the object stores this hash reference, not a
+        distinct copy of the hash it points to. You can ask the
+        object for a copy with the *hash* method.
+
+    qsearch TABLE, HASHREF
+        Searches the database for all records matching (at least)
+        the key/value pairs in HASHREF. Returns all the records
+        found as FS::Record objects.
+
+    qsearchs TABLE, HASHREF
+        Searches the database for a record matching (at least) the
+        key/value pairs in HASHREF, and returns the record found as
+        an FS::Record object. If more than one record matches, it
+        carps but returns the first. If this happens, you either
+        made a logic error in asking for a single item, or your data
+        is corrupted.
+
+    table
+        Returns the table name.
+
+    dbdef_table
+        Returns the FS::dbdef_table object for the table.
+
+    get, getfield COLUMN
+        Returns the value of the column/field/key COLUMN.
+
+    set, setfield COLUMN, VALUE
+        Sets the value of the column/field/key COLUMN to VALUE.
+        Returns VALUE.
+
+    AUTLOADED METHODS
+        $record->column is a synonym for $record->get('column');
+
+        $record->column('value') is a synonym for $record-
+        >set('column','value');
+
+    hash
+        Returns a list of the column/value pairs, usually for
+        assigning to a new hash.
+
+        To make a distinct duplicate of an FS::Record object, you
+        can do:
+
+            $new = new FS::Record ( $old->table, { $old->hash } );
+
+    hashref
+        Returns a reference to the column/value hash.
+
+    add Adds this record to the database. If there is an error, returns
+        the error, otherwise returns false.
+
+    del Delete this record from the database. If there is an error,
+        returns the error, otherwise returns false.
+
+    rep OLD_RECORD
+        Replace the OLD_RECORD with this one in the database. If
+        there is an error, returns the error, otherwise returns
+        false.
+
+    unique COLUMN
+        Replaces COLUMN in record with a unique number. Called by
+        the add method on primary keys and single-field unique
+        columns (see the FS::dbdef_table manpage). Returns the new
+        value.
+
+    ut_float COLUMN
+        Check/untaint floating point numeric data: 1.1, 1, 1.1e10,
+        1e10. May not be null. If there is an error, returns the
+        error, otherwise returns false.
+
+    ut_number COLUMN
+        Check/untaint simple numeric data (whole numbers). May not
+        be null. If there is an error, returns the error, otherwise
+        returns false.
+
+    ut_numbern COLUMN
+        Check/untaint simple numeric data (whole numbers). May be
+        null. If there is an error, returns the error, otherwise
+        returns false.
+
+    ut_money COLUMN
+        Check/untaint monetary numbers. May be negative. Set to 0 if
+        null. If there is an error, returns the error, otherwise
+        returns false.
+
+    ut_text COLUMN
+        Check/untaint text. Alphanumerics, spaces, and the following
+        punctuation symbols are currently permitted: ! @ # $ % & ( )
+        - + ; : ' " , . ? / May not be null. If there is an error,
+        returns the error, otherwise returns false.
+
+    ut_textn COLUMN
+        Check/untaint text. Alphanumerics, spaces, and the following
+        punctuation symbols are currently permitted: ! @ # $ % & ( )
+        - + ; : ' " , . ? / May be null. If there is an error,
+        returns the error, otherwise returns false.
+
+    ut_alpha COLUMN
+        Check/untaint alphanumeric strings (no spaces). May not be
+        null. If there is an error, returns the error, otherwise
+        returns false.
+
+    ut_alpha COLUMN
+        Check/untaint alphanumeric strings (no spaces). May be null.
+        If there is an error, returns the error, otherwise returns
+        false.
+
+    ut_phonen COLUMN
+        Check/untaint phone numbers. May be null. If there is an
+        error, returns the error, otherwise returns false.
+
+    ut_anything COLUMN
+        Untaints arbitrary data. Be careful.
+
+SUBROUTINES
+    reload_dbdef([FILENAME])
+            Load a database definition (see the FS::dbdef manpage),
+            optionally from a non-default filename. This command is
+            executed at startup unless *$FS::Record::setup_hack* is
+            true. Returns a FS::dbdef object.
+
+    dbdef   Returns the current database definition. See the FS::dbdef
+            manpage.
+
+    _quote VALUE, TABLE, COLUMN
+            This is an internal function used to construct SQL
+            statements. It returns VALUE DBI-quoted (see the section
+            on "quote" in the DBI manpage) unless VALUE is a number
+            and the column type (see the dbdef_column manpage) does
+            not end in `char' or `binary'.
+
+    hfields TABLE
+            This is depriciated. Don't use it.
+
+            It returns a hash-type list with the fields of this
+            record's table set true.
+
+    fields TABLE
+            This returns a list of the columns in this record's
+            table (See the dbdef_table manpage).
+
+BUGS
+        This module should probably be renamed, since much of the
+        functionality is of general use. It is not completely unlike
+        Adapter::DBI (see below).
+
+        Exported qsearch and qsearchs should be depriciated in favor
+        of method calls (against an FS::Record object like the old
+        search and searchs that qsearch and qsearchs were on top
+        of.)
+
+        The whole fields / hfields mess should be removed.
+
+        The various WHERE clauses should be subroutined.
+
+        table string should be depriciated in favor of
+        FS::dbdef_table.
+
+        No doubt we could benefit from a Tied hash. Documenting how
+        exists / defined true maps to the database (and WHERE
+        clauses) would also help.
+
+        The ut_ methods should ask the dbdef for a default length.
+
+        ut_sqltype (like ut_varchar) should all be defined
+
+        A fallback check method should be provided with uses the
+        dbdef.
+
+        The ut_money method assumes money has two decimal digits.
+
+        The Pg money kludge in the new method only strips `$'.
+
+        The ut_phonen method assumes US-style phone numbers.
+
+        The _quote function should probably use ut_float instead of
+        a regex.
+
+        All the subroutines probably should be methods, here or
+        elsewhere.
+
+SEE ALSO
+        the FS::dbdef manpage, the FS::UID manpage, the DBI manpage
+
+        Adapter::DBI from Ch. 11 of Advanced Perl Programming by
+        Sriram Srinivasan.
+
+HISTORY
+        ivan@voicenet.com 97-jun-2 - 9, 19, 25, 27, 30
+
+        DBI version ivan@sisd.com 97-nov-8 - 12
+
+        cleaned up, added autoloaded $self->any_field calls, moved
+        DBI login stuff to FS::UID ivan@sisd.com 97-nov-21-23
+
+        since AUTO_INCREMENT is MySQL specific, use my own unique
+        number generator (again) ivan@sisd.com 97-dec-4
+
+        untaint $user in unique (web demo hack...bah) make unique
+        skip multiple-field unique's from dbdef ivan@sisd.com 97-
+        dec-11
+
+        merge with FS::Search, which after all was just alternate
+        constructors for FS::Record objects. Makes lots of things
+        cleaner. :) ivan@sisd.com 97-dec-13
+
+        use FS::dbdef::primary key in replace searches, hopefully
+        for all practical purposes the string/number problem in SQL
+        statements should be gone? (SQL bites) ivan@sisd.com 98-jan-
+        20
+
+        Put all SQL statments in $statment before we $sth=$dbh-
+        >prepare( them, for debugging reasons (warn $statement)
+        ivan@sisd.com 98-feb-19
+
+        (sigh)... use dbdef type (char, etc.) instead of a regex to
+        decide what to quote in _quote (more sillines...) SQL bites.
+        ivan@sisd.com 98-feb-20
+
+        more friendly error messages ivan@sisd.com 98-mar-13
+
+        Added import of datasrc from FS::UID to allow Pg6.3 to work
+        Added code to right-trim strings read from Pg6.3 databases
+        Modified 'add' to only insert fields that actually have data
+        Added ut_float to handle floating point numbers (for sales
+        tax). Pg6.3 does not have a "SHOW FIELDS" statement, so I
+        faked it 8). bmccane@maxbaud.net 98-apr-3
+
+        commented out Pg wrapper around `` Modified 'add' to only
+        insert fields that actually have data '' ivan@sisd.com 98-
+        apr-16
+
+        dbdef usage changes ivan@sisd.com 98-jun-1
+
+        sub fields now asks dbdef, not database ivan@sisd.com 98-
+        jun-2
+
+        added debugging method ->_dump ivan@sisd.com 98-jun-16
+
+        use FS::dbdef::primary key in delete searches as well as
+        replace searches (SQL still bites) ivan@sisd.com 98-jun-22
+
+        sub dbdef_table ivan@sisd.com 98-jun-28
+
+        removed Pg wrapper around `` Modified 'add' to only insert
+        fields that actually have data '' ivan@sisd.com 98-jul-14
+
+        sub fields croaks on errors ivan@sisd.com 98-jul-17
+
+        $rc eq '0E0' doesn't mean we couldn't delete for all rdbmss
+        ivan@sisd.com 98-jul-18
+
+        commented out code to right-trim strings read from Pg6.3
+        databases; ChopBlanks is in UID.pm ivan@sisd.com 98-aug-16
+
+        added code (with Pg wrapper) to deal with Pg money fields
+        ivan@sisd.com 98-aug-18
+
+        added pod documentation ivan@sisd.com 98-sep-6
+
diff --git a/htdocs/docs/man/SSH.txt b/htdocs/docs/man/SSH.txt
new file mode 100644
index 000000000..b6d205b55
--- /dev/null
+++ b/htdocs/docs/man/SSH.txt
@@ -0,0 +1,63 @@
+NAME
+    FS::SSH - Subroutines to call ssh and scp
+
+SYNOPSIS
+      use FS::SSH qw(ssh scp issh iscp sshopen2 sshopen3);
+
+      ssh($host, $command);
+
+      issh($host, $command);
+
+      scp($source, $destination);
+
+      iscp($source, $destination);
+
+      sshopen2($host, $reader, $writer, $command);
+
+      sshopen3($host, $reader, $writer, $error, $command);
+
+DESCRIPTION
+      Simple wrappers around ssh and scp commands.
+
+SUBROUTINES
+    ssh HOST, COMMAND
+        Calls ssh in batch mode.
+
+    issh HOST, COMMAND
+        Prints the ssh command to be executed, waits for the user to
+        confirm, and (optionally) executes the command.
+
+    scp SOURCE, DESTINATION
+        Calls scp in batch mode.
+
+    iscp SOURCE, DESTINATION
+        Prints the scp command to be executed, waits for the user to
+        confirm, and (optionally) executes the command.
+
+    sshopen2 HOST, READER, WRITER, COMMAND
+        Connects the supplied filehandles to the ssh process (in
+        batch mode).
+
+    sshopen3 HOST, WRITER, READER, ERROR, COMMAND
+        Connects the supplied filehandles to the ssh process (in
+        batch mode).
+
+BUGS
+        Not OO.
+
+        scp stuff should transparantly use rsync-over-ssh instead.
+
+SEE ALSO
+        the ssh manpage, the scp manpage, the IPC::Open2 manpage,
+        the IPC::Open3 manpage
+
+HISTORY
+        ivan@voicenet.com 97-jul-17
+
+        added sshopen2 and sshopen3 ivan@sisd.com 98-mar-9
+
+        added iscp ivan@sisd.com 98-jul-25 now iscp asks y/n, issh
+        and took out path ivan@sisd.com 98-jul-30
+
+        pod ivan@sisd.com 98-sep-21
+
diff --git a/htdocs/docs/man/UID.txt b/htdocs/docs/man/UID.txt
new file mode 100644
index 000000000..bf9f6b4bd
--- /dev/null
+++ b/htdocs/docs/man/UID.txt
@@ -0,0 +1,79 @@
+NAME
+    FS::UID - Subroutines for database login and assorted other
+    stuff
+
+SYNOPSIS
+      use FS::UID qw(adminsuidsetup cgisuidsetup dbh datasrc getotaker
+      checkeuid checkruid swapuid);
+
+      adminsuidsetup;
+
+      $cgi = new CGI::Base;
+      $cgi->get;
+      $dbh = cgisuidsetup($cgi);
+
+      $dbh = dbh;
+
+      $datasrc = datasrc;
+
+DESCRIPTION
+    Provides a hodgepodge of subroutines.
+
+SUBROUTINES
+    adminsuidsetup
+        Cleans the environment. Make sure the script is running as
+        freeside, or setuid freeside. Opens a connection to the
+        database. Swaps real and effective UIDs. Returns the DBI
+        database handle (usually you don't need this).
+
+    dbh Returns the DBI database handle.
+
+    datasrc
+        Returns the DBI data source.
+
+    getotaker
+        Returns the current Freeside user. Currently that means the
+        CGI REMOTE_USER, or 'freeside'.
+
+    checkeuid
+        Returns true if effective UID is that of the freeside user.
+
+    checkruid
+        Returns true if the real UID is that of the freeside user.
+
+    swapuid
+        Swaps real and effective UIDs.
+
+BUGS
+    Not OO.
+
+    No capabilities yet. When mod_perl and Authen::DBI are
+    implemented, cgisuidsetup will go away as well.
+
+SEE ALSO
+    the FS::Record manpage, the CGI::Base manpage, the DBI manpage
+
+HISTORY
+    ivan@voicenet.com 97-jun-4 - 9 untaint otaker ivan@voicenet.com
+    97-jul-7
+
+    generalize and auto-get uid (getotaker still needs to be db'ed)
+    ivan@sisd.com 97-nov-10
+
+    &cgisuidsetup logs into database. other cleaning. ivan@sisd.com
+    97-nov-22,23
+
+    &adminsuidsetup logs into database with otaker='freeside' (for
+    automated tasks like billing) ivan@sisd.com 97-dec-13
+
+    added sub datasrc for fs-setup ivan@sisd.com 98-feb-21
+
+    datasrc, user and pass now come from conf/secrets ivan@sisd.com
+    98-jun-28
+
+    added ChopBlanks to DBI call (see man DBI) ivan@sisd.com 98-aug-
+    16
+
+    pod, use FS::Conf, implemented cgisuidsetup as adminsuidsetup,
+    inlined suidsetup ivan@sisd.com 98-sep-12
+
diff --git a/htdocs/docs/man/agent.txt b/htdocs/docs/man/agent.txt
new file mode 100644
index 000000000..b0317f6f7
--- /dev/null
+++ b/htdocs/docs/man/agent.txt
@@ -0,0 +1,65 @@
+NAME
+    FS::agent - Object methods for agent records
+
+SYNOPSIS
+      use FS::agent;
+
+      $record = create FS::agent \%hash;
+      $record = create FS::agent { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+DESCRIPTION
+    An FS::agent object represents an agent. Every customer has an
+    agent. Agents can be used to track things like resellers or
+    salespeople. FS::agent inherits from FS::Record. The following
+    fields are currently supported:
+
+    agemtnum - primary key (assigned automatically for new agents)
+    agent - Text name of this agent
+    typenum - Agent type.  See the FS::agent_type manpage
+    prog - For future use.
+    freq - For future use.
+METHODS
+    create HASHREF
+        Creates a new agent. To add the agent to the database, see
+        the section on "insert".
+
+    insert
+        Adds this agent to the database. If there is an error,
+        returns the error, otherwise returns false.
+
+    delete
+        Deletes this agent from the database. Only agents with no
+        customers can be deleted. If there is an error, returns the
+        error, otherwise returns false.
+
+    replace OLD_RECORD
+        Replaces OLD_RECORD with this one in the database. If there
+        is an error, returns the error, otherwise returns false.
+
+    check
+        Checks all fields to make sure this is a valid agent. If
+        there is an error, returns the error, otherwise returns
+        false. Called by the insert and replace methods.
+
+BUGS
+    It doesn't properly override FS::Record yet.
+
+SEE ALSO
+    the FS::Record manpage, the FS::agent_type manpage, the
+    FS::cust_main manpage, schema.html from the base documentation.
+
+HISTORY
+    Class dealing with agent (resellers)
+
+    ivan@sisd.com 97-nov-13, 97-dec-10
+
+    pod, added check in ->delete ivan@sisd.com 98-sep-22
+
diff --git a/htdocs/docs/man/agent_type.txt b/htdocs/docs/man/agent_type.txt
new file mode 100644
index 000000000..ea1edec0c
--- /dev/null
+++ b/htdocs/docs/man/agent_type.txt
@@ -0,0 +1,72 @@
+NAME
+    FS::agent_type - Object methods for agent_type records
+
+SYNOPSIS
+      use FS::agent_type;
+
+      $record = create FS::agent_type \%hash;
+      $record = create FS::agent_type { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+DESCRIPTION
+    An FS::agent_type object represents an agent type. Every agent
+    (see the FS::agent manpage) has an agent type. Agent types
+    define which packages (see the FS::part_pkg manpage) may be
+    purchased by customers (see the FS::cust_main manpage), via
+    FS::type_pkgs records (see the FS::type_pkgs manpage).
+    FS::agent_type inherits from FS::Record. The following fields
+    are currently supported:
+
+    typenum - primary key (assigned automatically for new agent types)
+    atype - Text name of this agent type
+METHODS
+    create HASHREF
+        Creates a new agent type. To add the agent type to the
+        database, see the section on "insert".
+
+    insert
+        Adds this agent type to the database. If there is an error,
+        returns the error, otherwise returns false.
+
+    delete
+        Deletes this agent type from the database. Only agent types
+        with no agents can be deleted. If there is an error, returns
+        the error, otherwise returns false.
+
+    replace OLD_RECORD
+        Replaces OLD_RECORD with this one in the database. If there
+        is an error, returns the error, otherwise returns false.
+
+    check
+        Checks all fields to make sure this is a valid agent type.
+        If there is an error, returns the error, otherwise returns
+        false. Called by the insert and replace methods.
+
+BUGS
+    It doesn't properly override FS::Record yet.
+
+SEE ALSO
+    the FS::Record manpage, the FS::agent manpage, the FS::type_pkgs
+    manpage, the FS::cust_main manpage, the FS::part_pkg manpage,
+    schema.html from the base documentation.
+
+HISTORY
+    Class for the different sets of allowable packages you can
+    assign to an agent.
+
+    ivan@sisd.com 97-nov-13
+
+    ut_ FS::Record methods ivan@sisd.com 97-dec-10
+
+    Changed 'type' to 'atype' because Pg6.3 reserves the type word
+    bmccane@maxbaud.net 98-apr-3
+
+    pod, added check in delete ivan@sisd.com 98-sep-21
+
diff --git a/htdocs/docs/man/cust_bill.txt b/htdocs/docs/man/cust_bill.txt
new file mode 100644
index 000000000..9762dd3ca
--- /dev/null
+++ b/htdocs/docs/man/cust_bill.txt
@@ -0,0 +1,140 @@
+NAME
+    FS::cust_bill - Object methods for cust_bill records
+
+SYNOPSIS
+      use FS::cust_bill;
+
+      $record = create FS::cust_bill \%hash;
+      $record = create FS::cust_bill { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+      ( $total_previous_balance, @previous_cust_bill ) = $record->previous;
+
+      @cust_bill_pkg_objects = $cust_bill->cust_bill_pkg;
+
+      ( $total_previous_credits, @previous_cust_credit ) = $record->cust_credit;
+
+      @cust_pay_objects = $cust_bill->cust_pay;
+
+      @lines = $cust_bill->print_text;
+      @lines = $cust_bill->print_text $time;
+
+DESCRIPTION
+    An FS::cust_bill object represents an invoice. FS::cust_bill
+    inherits from FS::Record. The following fields are currently
+    supported:
+
+    invnum - primary key (assigned automatically for new invoices)
+    custnum - customer (see the FS::cust_main manpage)
+    _date - specified as a UNIX timestamp; see the section on "time" in the perlfunc manpage.  Also see
+    the Time::Local manpage and the Date::Parse manpage for conversion functions.
+    charged - amount of this invoice
+    owed - amount still outstanding on this invoice, which is charged minus
+    all payments (see the FS::cust_pay manpage).
+    printed - how many times this invoice has been printed automatically
+    (see the section on "collect" in the FS::cust_main manpage).
+METHODS
+    create HASHREF
+        Creates a new invoice. To add the invoice to the database,
+        see the section on "insert". Invoices are normally created
+        by calling the bill method of a customer object (see the
+        FS::cust_main manpage).
+
+    insert
+        Adds this invoice to the database ("Posts" the invoice). If
+        there is an error, returns the error, otherwise returns
+        false.
+
+        When adding new invoices, owed must be charged (or null, in
+        which case it is automatically set to charged).
+
+    delete
+        Currently unimplemented. I don't remove invoices because
+        there would then be no record you ever posted this invoice
+        (which is bad, no?)
+
+    replace OLD_RECORD
+        Replaces the OLD_RECORD with this one in the database. If
+        there is an error, returns the error, otherwise returns
+        false.
+
+        Only owed and printed may be changed. Owed is normally
+        updated by creating and inserting a payment (see the
+        FS::cust_pay manpage). Printed is normally updated by
+        calling the collect method of a customer object (see the
+        FS::cust_main manpage).
+
+    check
+        Checks all fields to make sure this is a valid invoice. If
+        there is an error, returns the error, otherwise returns
+        false. Called by the insert and replace methods.
+
+    previous
+        Returns a list consisting of the total previous balance for
+        this customer, followed by the previous outstanding invoices
+        (as FS::cust_bill objects also).
+
+    cust_bill_pkg
+        Returns the line items (see the FS::cust_bill_pkg manpage)
+        for this invoice.
+
+    cust_credit
+        Returns a list consisting of the total previous credited
+        (see the FS::cust_credit manpage) for this customer,
+        followed by the previous outstanding credits
+        (FS::cust_credit objects).
+
+    cust_pay
+        Returns all payments (see the FS::cust_pay manpage) for this
+        invoice.
+
+    print_text [TIME];
+        Returns an ASCII invoice, as a list of lines.
+
+        TIME an optional value used to control the printing of
+        overdue messages. The default is now. It isn't the date of
+        the invoice; that's the `_date' field. It is specified as a
+        UNIX timestamp; see the section on "time" in the perlfunc
+        manpage. Also see the Time::Local manpage and the
+        Date::Parse manpage for conversion functions.
+
+BUGS
+    The delete method.
+
+    It doesn't properly override FS::Record yet.
+
+    print_text formatting (and some logic :/) is in source as a
+    format declaration, which needs to be slurped in from a file.
+    the fork is rather kludgy as well. It could be cleaned with
+    swrite from man perlform, and the picture could be put in a
+    /var/spool/freeside/conf file. Also number of lines ($=).
+
+    missing print_ps for a nice postscript copy (maybe HylaFAX-
+    cover-page-style or something similar so the look can be
+    completely customized?)
+
+    There is an off-by-one error in print_text which causes a visual
+    error: "Page 1 of 2" printed on some single-page invoices?
+
+SEE ALSO
+    the FS::Record manpage, the FS::cust_main manpage, the
+    FS::cust_pay manpage, the FS::cust_bill_pkg manpage, the
+    FS::cust_credit manpage, schema.html from the base
+    documentation.
+
+HISTORY
+    ivan@voicenet.com 97-jul-1
+
+    small fix for new API ivan@sisd.com 98-mar-14
+
+    charges can be negative ivan@sisd.com 98-jul-13
+
+    pod, ingegrate with FS::Invoice ivan@sisd.com 98-sep-20
+
diff --git a/htdocs/docs/man/cust_bill_pkg.txt b/htdocs/docs/man/cust_bill_pkg.txt
new file mode 100644
index 000000000..1ca4b8cca
--- /dev/null
+++ b/htdocs/docs/man/cust_bill_pkg.txt
@@ -0,0 +1,72 @@
+NAME
+    FS::cust_bill_pkg - Object methods for cust_bill_pkg records
+
+SYNOPSIS
+      use FS::cust_bill_pkg;
+
+      $record = create FS::cust_bill_pkg \%hash;
+      $record = create FS::cust_bill_pkg { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+DESCRIPTION
+    An FS::cust_bill_pkg object represents an invoice line item.
+    FS::cust_bill_pkg inherits from FS::Record. The following fields
+    are currently supported:
+
+    invnum - invoice (see the FS::cust_bill manpage)
+    pkgnum - package (see the FS::cust_pkg manpage)
+    setup - setup fee
+    recur - recurring fee
+    sdate - starting date of recurring fee
+    edate - ending date of recurring fee
+    sdate and edate are specified as UNIX timestamps; see the
+    section on "time" in the perlfunc manpage. Also see the
+    Time::Local manpage and the Date::Parse manpage for conversion
+    functions.
+
+METHODS
+    create HASHREF
+        Creates a new line item. To add the line item to the
+        database, see the section on "insert". Line items are
+        normally created by calling the bill method of a customer
+        object (see the FS::cust_main manpage).
+
+    insert
+        Adds this line item to the database. If there is an error,
+        returns the error, otherwise returns false.
+
+    delete
+        Currently unimplemented. I don't remove line items because
+        there would then be no record the items ever existed (which
+        is bad, no?)
+
+    replace OLD_RECORD
+        Currently unimplemented. This would be even more of an
+        accounting nightmare than deleteing the items. Just don't do
+        it.
+
+    check
+        Checks all fields to make sure this is a valid line item. If
+        there is an error, returns the error, otherwise returns
+        false. Called by the insert method.
+
+BUGS
+    It doesn't properly override FS::Record yet.
+
+SEE ALSO
+    the FS::Record manpage, the FS::cust_bill manpage, the
+    FS::cust_pkg manpage, the FS::cust_main manpage, schema.html
+    from the base documentation.
+
+HISTORY
+    ivan@sisd.com 98-mar-13
+
+    pod ivan@sisd.com 98-sep-21
+
diff --git a/htdocs/docs/man/cust_credit.txt b/htdocs/docs/man/cust_credit.txt
new file mode 100644
index 000000000..84591ee81
--- /dev/null
+++ b/htdocs/docs/man/cust_credit.txt
@@ -0,0 +1,75 @@
+NAME
+    FS::cust_credit - Object methods for cust_credit records
+
+SYNOPSIS
+      use FS::cust_credit;
+
+      $record = create FS::cust_credit \%hash;
+      $record = create FS::cust_credit { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+DESCRIPTION
+    An FS::cust_credit object represents a credit. FS::cust_credit
+    inherits from FS::Record. The following fields are currently
+    supported:
+
+    crednum - primary key (assigned automatically for new credits)
+    custnum - customer (see the FS::cust_main manpage)
+    amount - amount of the credit
+    credited - how much of this credit that is still outstanding, which is
+    amount minus all refunds (see the FS::cust_refund manpage).
+    _date - specified as a UNIX timestamp; see the section on "time" in the perlfunc manpage.  Also see
+    the Time::Local manpage and the Date::Parse manpage for conversion functions.
+    otaker - order taker (assigned automatically, see the FS::UID manpage)
+    reason - text
+METHODS
+    create HASHREF
+        Creates a new credit. To add the credit to the database, see
+        the section on "insert".
+
+    insert
+        Adds this credit to the database ("Posts" the credit). If
+        there is an error, returns the error, otherwise returns
+        false.
+
+        When adding new invoices, credited must be amount (or null,
+        in which case it is automatically set to amount).
+
+    delete
+        Currently unimplemented.
+
+    replace OLD_RECORD
+        Replaces the OLD_RECORD with this one in the database. If
+        there is an error, returns the error, otherwise returns
+        false.
+
+        Only credited may be changed. Credited is normally updated
+        by creating and inserting a refund (see the FS::cust_refund
+        manpage).
+
+    check
+        Checks all fields to make sure this is a valid credit. If
+        there is an error, returns the error, otherwise returns
+        false. Called by the insert and replace methods.
+
+BUGS
+    The delete method.
+
+    It doesn't properly override FS::Record yet.
+
+SEE ALSO
+    the FS::Record manpage, the FS::cust_refund manpage, the
+    FS::cust_bill manpage, schema.html from the base documentation.
+
+HISTORY
+    ivan@sisd.com 98-mar-17
+
+    pod, otaker from FS::UID ivan@sisd.com 98-sep-21
+
diff --git a/htdocs/docs/man/cust_main.txt b/htdocs/docs/man/cust_main.txt
new file mode 100644
index 000000000..df7848744
--- /dev/null
+++ b/htdocs/docs/man/cust_main.txt
@@ -0,0 +1,200 @@
+NAME
+    FS::cust_main - Object methods for cust_main records
+
+SYNOPSIS
+      use FS::cust_main;
+
+      $record = create FS::cust_main \%hash;
+      $record = create FS::cust_main { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+      @cust_pkg = $record->all_pkgs;
+
+      @cust_pkg = $record->ncancelled_pkgs;
+
+      $error = $record->bill;
+      $error = $record->bill %options;
+      $error = $record->bill 'time' => $time;
+
+      $error = $record->collect;
+      $error = $record->collect %options;
+      $error = $record->collect 'invoice_time'   => $time,
+                                'batch_card'     => 'yes',
+                                'report_badcard' => 'yes',
+                              ;
+
+DESCRIPTION
+    An FS::cust_main object represents a customer. FS::cust_main
+    inherits from FS::Record. The following fields are currently
+    supported:
+
+    custnum - primary key (assigned automatically for new customers)
+    agentnum - agent (see the FS::agent manpage)
+    refnum - referral (see the FS::part_referral manpage)
+    first - name
+    last - name
+    ss - social security number (optional)
+    company - (optional)
+    address1
+    address2 - (optional)
+    city
+    county - (optional, see the FS::cust_main_county manpage)
+    state - (see the FS::cust_main_county manpage)
+    zip
+    country - (see the FS::cust_main_county manpage)
+    daytime - phone (optional)
+    night - phone (optional)
+    payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
+    payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
+    paydate - expiration date, mm/yyyy, m/yyyy, mm/yy or m/yy
+    payname - name on card or billing name
+    tax - tax exempt, empty or `Y'
+    otaker - order taker (assigned automatically, see the FS::UID manpage)
+METHODS
+    create HASHREF
+        Creates a new customer. To add the customer to the database,
+        see the section on "insert".
+
+        Note that this stores the hash reference, not a distinct
+        copy of the hash it points to. You can ask the object for a
+        copy with the *hash* method.
+
+    insert
+        Adds this customer to the database. If there is an error,
+        returns the error, otherwise returns false.
+
+    delete
+        Currently unimplemented. Maybe cancel all of this customer's
+        packages (cust_pkg)?
+
+        I don't remove the customer record in the database because
+        there would then be no record the customer ever existed
+        (which is bad, no?)
+
+    replace OLD_RECORD
+        Replaces the OLD_RECORD with this one in the database. If
+        there is an error, returns the error, otherwise returns
+        false.
+
+    check
+        Checks all fields to make sure this is a valid customer
+        record. If there is an error, returns the error, otherwise
+        returns false. Called by the insert and repalce methods.
+
+    all_pkgs
+        Returns all packages (see the FS::cust_pkg manpage) for this
+        customer.
+
+    ncancelled_pkgs
+        Returns all non-cancelled packages (see the FS::cust_pkg
+        manpage) for this customer.
+
+    bill OPTIONS
+        Generates invoices (see the FS::cust_bill manpage) for this
+        customer. Usually used in conjunction with the collect
+        method.
+
+        The only currently available option is `time', which bills
+        the customer as if it were that time. It is specified as a
+        UNIX timestamp; see the section on "time" in the perlfunc
+        manpage). Also see the Time::Local manpage and the
+        Date::Parse manpage for conversion functions.
+
+        If there is an error, returns the error, otherwise returns
+        false.
+
+    collect OPTIONS
+        (Attempt to) collect money for this customer's outstanding
+        invoices (see the FS::cust_bill manpage). Usually used after
+        the bill method.
+
+        Depending on the value of `payby', this may print an invoice
+        (`BILL'), charge a credit card (`CARD'), or just add any
+        necessary (pseudo-)payment (`COMP').
+
+        If there is an error, returns the error, otherwise returns
+        false.
+
+        Currently available options are:
+
+        invoice_time - Use this time when deciding when to print
+        invoices and late notices on those invoices. The default is
+        now. It is specified as a UNIX timestamp; see the section on
+        "time" in the perlfunc manpage). Also see the Time::Local
+        manpage and the Date::Parse manpage for conversion
+        functions.
+
+        batch_card - Set this true to batch cards (see the
+        cust_pay_batch manpage). By default, cards are processed
+        immediately, which will generate an error if CyberCash is
+        not installed.
+
+        report_badcard - Set this true if you want bad card
+        transactions to return an error. By default, they don't.
+
+    total_owed
+        Returns the total owed for this customer on all invoices
+        (see the FS::cust_bill manpage).
+
+    total_credited
+        Returns the total credits (see the FS::cust_credit manpage)
+        for this customer.
+
+    balance
+        Returns the balance for this customer (total owed minus
+        total credited).
+
+BUGS
+    The delete method.
+
+    It doesn't properly override FS::Record yet.
+
+    hfields should be removed.
+
+    Bill and collect options should probably be passed as references
+    instead of a list.
+
+    CyberCash v2 forces us to define some variables in package main.
+
+SEE ALSO
+    the FS::Record manpage, the FS::cust_pkg manpage, the
+    FS::cust_bill manpage, the FS::cust_credit manpage the
+    FS::cust_pay_batch manpage, the FS::agent manpage, the
+    FS::part_referral manpage, the FS::cust_main_county manpage, the
+    FS::UID manpage, schema.html from the base documentation.
+
+HISTORY
+    ivan@voicenet.com 97-jul-28
+
+    Changed to standard Business::CreditCard no more TableUtil
+    EXPORT_OK FS::Record's hfields removed unique calls and locking
+    (not needed here now) wrapped the (now) optional fields in if
+    statements in sub check (notyetdone!) ivan@sisd.com 97-nov-12
+
+    updated paydate with SQL-type date info ivan@sisd.com 98-mar-5
+
+    Added export of datasrc from UID.pm for Pg6.3 changed 'day' to
+    'daytime' because Pg6.3 reserves the day word
+    bmccane@maxbaud.net 98-apr-3
+
+    in ->create, s/svc_acct/cust_main/, now it should actually
+    eliminate the warnings it was meant to ivan@sisd.com 98-jul-16
+
+    don't require a phone number and allow '/' in company names
+    ivan@sisd.com 98-jul-18
+
+    use ut_ and rewrite &check, &*_pkgs ivan@sisd.com 98-sep-5
+
+    pod, merge with FS::Bill (about time!), total_owed,
+    total_credited and balance methods, cleaned collect method,
+    source modifications no longer necessary to enable cybercash,
+    cybercash v3 support, don't need to import
+    FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
+
diff --git a/htdocs/docs/man/cust_main_county.txt b/htdocs/docs/man/cust_main_county.txt
new file mode 100644
index 000000000..8e99397cc
--- /dev/null
+++ b/htdocs/docs/man/cust_main_county.txt
@@ -0,0 +1,67 @@
+NAME
+    FS::cust_main_county - Object methods for cust_main_county
+    objects
+
+SYNOPSIS
+      use FS::cust_main_county;
+
+      $record = create FS::cust_main_county \%hash;
+      $record = create FS::cust_main_county { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+DESCRIPTION
+    An FS::cust_main_county object represents a tax rate, defined by
+    locale. FS::cust_main_county inherits from FS::Record. The
+    following fields are currently supported:
+
+    taxnum - primary key (assigned automatically for new tax rates)
+    state
+    county
+    tax - percentage
+METHODS
+    create HASHREF
+        Creates a new tax rate. To add the tax rate to the database,
+        see the section on "insert".
+
+    insert
+        Adds this tax rate to the database. If there is an error,
+        returns the error, otherwise returns false.
+
+    delete
+        Deletes this tax rate from the database. If there is an
+        error, returns the error, otherwise returns false.
+
+    replace OLD_RECORD
+        Replaces the OLD_RECORD with this one in the database. If
+        there is an error, returns the error, otherwise returns
+        false.
+
+    check
+        Checks all fields to make sure this is a valid tax rate. If
+        there is an error, returns the error, otherwise returns
+        false. Called by the insert and replace methods.
+
+BUGS
+    It doesn't properly override FS::Record yet.
+
+    A country field (and possibly a currency field) should be added.
+
+SEE ALSO
+    the FS::Record manpage, the FS::cust_main manpage, the
+    FS::cust_bill manpage, schema.html from the base documentation.
+
+HISTORY
+    ivan@voicenet.com 97-dec-16
+
+    Changed check for 'tax' to use the new ut_float subroutine
+    bmccane@maxbaud.net 98-apr-3
+
+    pod ivan@sisd.com 98-sep-21
+
diff --git a/htdocs/docs/man/cust_pay.txt b/htdocs/docs/man/cust_pay.txt
new file mode 100644
index 000000000..9f28d0822
--- /dev/null
+++ b/htdocs/docs/man/cust_pay.txt
@@ -0,0 +1,66 @@
+NAME
+    FS::cust_pay - Object methods for cust_pay objects
+
+SYNOPSIS
+      use FS::cust_pay;
+
+      $record = create FS::cust_pay \%hash;
+      $record = create FS::cust_pay { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+DESCRIPTION
+    An FS::cust_pay object represents a payment. FS::cust_pay
+    inherits from FS::Record. The following fields are currently
+    supported:
+
+    paynum - primary key (assigned automatically for new payments)
+    invnum - Invoice (see the FS::cust_bill manpage)
+    paid - Amount of this payment
+    _date - specified as a UNIX timestamp; see the section on "time" in the perlfunc manpage.  Also see
+    the Time::Local manpage and the Date::Parse manpage for conversion functions.
+    payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
+    payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
+    paybatch - text field for tracking card processing
+METHODS
+    create HASHREF
+        Creates a new payment. To add the payment to the databse,
+        see the section on "insert".
+
+    insert
+        Adds this payment to the databse, and updates the invoice
+        (see the FS::cust_bill manpage).
+
+    delete
+        Currently unimplemented (accounting reasons).
+
+    replace OLD_RECORD
+        Currently unimplemented (accounting reasons).
+
+    check
+        Checks all fields to make sure this is a valid payment. If
+        there is an error, returns the error, otherwise returns
+        false. Called by the insert method.
+
+BUGS
+    It doesn't properly override FS::Record yet.
+
+    Delete and replace methods.
+
+SEE ALSO
+    the FS::Record manpage, the FS::cust_bill manpage, schema.html
+    from the base documentation.
+
+HISTORY
+    ivan@voicenet.com 97-jul-1 - 25 - 29
+
+    new api ivan@sisd.com 98-mar-13
+
+    pod ivan@sisd.com 98-sep-21
+
diff --git a/htdocs/docs/man/cust_pkg.txt b/htdocs/docs/man/cust_pkg.txt
new file mode 100644
index 000000000..5409083d8
--- /dev/null
+++ b/htdocs/docs/man/cust_pkg.txt
@@ -0,0 +1,150 @@
+NAME
+    FS::cust_pkg - Object methods for cust_pkg objects
+
+SYNOPSIS
+      use FS::cust_pkg;
+
+      $record = create FS::cust_pkg \%hash;
+      $record = create FS::cust_pkg { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+      $error = $record->cancel;
+
+      $error = $record->suspend;
+
+      $error = $record->unsuspend;
+
+      $error = FS::cust_pkg::order( $custnum, \@pkgparts );
+      $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );
+
+DESCRIPTION
+    An FS::cust_pkg object represents a customer billing item.
+    FS::cust_pkg inherits from FS::Record. The following fields are
+    currently supported:
+
+    pkgnum - primary key (assigned automatically for new billing items)
+    custnum - Customer (see the FS::cust_main manpage)
+    pkgpart - Billing item definition (see the FS::part_pkg manpage)
+    setup - date
+    bill - date
+    susp - date
+    expire - date
+    cancel - date
+    otaker - order taker (assigned automatically if null, see the FS::UID manpage)
+    Note: setup, bill, susp, expire and cancel are specified as UNIX
+    timestamps; see the section on "time" in the perlfunc manpage.
+    Also see the Time::Local manpage and the Date::Parse manpage for
+    conversion functions.
+
+METHODS
+    create HASHREF
+        Create a new billing item. To add the item to the database,
+        see the section on "insert".
+
+    insert
+        Adds this billing item to the database ("Orders" the item).
+        If there is an error, returns the error, otherwise returns
+        false.
+
+    delete
+        Currently unimplemented. You don't want to delete billing
+        items, because there would then be no record the customer
+        ever purchased the item. Instead, see the cancel method.
+
+        sub delete { return "Can't delete cust_pkg records!"; }
+
+    replace OLD_RECORD
+        Replaces the OLD_RECORD with this one in the database. If
+        there is an error, returns the error, otherwise returns
+        false.
+
+        Currently, custnum, setup, bill, susp, expire, and cancel
+        may be changed.
+
+        pkgpart may not be changed, but see the order subroutine.
+
+        setup and bill are normally updated by calling the bill
+        method of a customer object (see the FS::cust_main manpage).
+
+        suspend is normally updated by the suspend and unsuspend
+        methods.
+
+        cancel is normally updated by the cancel method (and also
+        the order subroutine in some cases).
+
+    check
+        Checks all fields to make sure this is a valid billing item.
+        If there is an error, returns the error, otherwise returns
+        false. Called by the insert and replace methods.
+
+    cancel
+        Cancels and removes all services (see the FS::cust_svc
+        manpage and the FS::part_svc manpage) in this package, then
+        cancels the package itself (sets the cancel field to now).
+
+        If there is an error, returns the error, otherwise returns
+        false.
+
+    suspend
+        Suspends all services (see the FS::cust_svc manpage and the
+        FS::part_svc manpage) in this package, then suspends the
+        package itself (sets the susp field to now).
+
+        If there is an error, returns the error, otherwise returns
+        false.
+
+    unsuspend
+        Unsuspends all services (see the FS::cust_svc manpage and
+        the FS::part_svc manpage) in this package, then unsuspends
+        the package itself (clears the susp field).
+
+        If there is an error, returns the error, otherwise returns
+        false.
+
+SUBROUTINES
+    order CUSTNUM, PKGPARTS_ARYREF, [ REMOVE_PKGNUMS_ARYREF ]
+        CUSTNUM is a customer (see the FS::cust_main manpage)
+
+        PKGPARTS is a list of pkgparts specifying the the billing
+        item definitions (see the FS::part_pkg manpage) to order for
+        this customer. Duplicates are of course permitted.
+
+        REMOVE_PKGNUMS is an optional list of pkgnums specifying the
+        billing items to remove for this customer. The services (see
+        the FS::cust_svc manpage) are moved to the new billing
+        items. An error is returned if this is not possible (see the
+        FS::pkg_svc manpage).
+
+BUGS
+    It doesn't properly override FS::Record yet.
+
+    sub order is not OO. Perhaps it should be moved to FS::cust_main
+    and made so?
+
+    In sub order, the @pkgparts array (passed by reference) is
+    clobbered.
+
+    Also in sub order, no money is adjusted. Once FS::part_pkg
+    defines a standard method to pass dates to the recur_prog
+    expression, it should do so.
+
+SEE ALSO
+    the FS::Record manpage, the FS::cust_main manpage, the
+    FS::part_pkg manpage, the FS::cust_svc manpage , the FS::pkg_svc
+    manpage, schema.html from the base documentation
+
+HISTORY
+    ivan@voicenet.com 97-jul-1 - 21
+
+    fixed for new agent->agent_type->type_pkgs in &order
+    ivan@sisd.com 98-mar-7
+
+    pod ivan@sisd.com 98-sep-21
+
diff --git a/htdocs/docs/man/cust_refund.txt b/htdocs/docs/man/cust_refund.txt
new file mode 100644
index 000000000..392a0b57a
--- /dev/null
+++ b/htdocs/docs/man/cust_refund.txt
@@ -0,0 +1,66 @@
+NAME
+    FS::cust_refund - Object method for cust_refund objects
+
+SYNOPSIS
+      use FS::cust_refund;
+
+      $record = create FS::cust_refund \%hash;
+      $record = create FS::cust_refund { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+DESCRIPTION
+    An FS::cust_refund represents a refund. FS::cust_refund inherits
+    from FS::Record. The following fields are currently supported:
+
+    refundnum - primary key (assigned automatically for new refunds)
+    crednum - Credit (see the FS::cust_credit manpage)
+    refund - Amount of the refund
+    _date - specified as a UNIX timestamp; see the section on "time" in the perlfunc manpage.  Also see
+    the Time::Local manpage and the Date::Parse manpage for conversion functions.
+    payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
+    payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
+    otaker - order taker (assigned automatically, see the FS::UID manpage)
+METHODS
+    create HASHREF
+        Creates a new refund. To add the refund to the database, see
+        the section on "insert".
+
+    insert
+        Adds this refund to the database, and updates the credit
+        (see the FS::cust_credit manpage).
+
+    delete
+        Currently unimplemented (accounting reasons).
+
+    replace OLD_RECORD
+        Currently unimplemented (accounting reasons).
+
+    check
+        Checks all fields to make sure this is a valid refund. If
+        there is an error, returns the error, otherwise returns
+        false. Called by the insert method.
+
+BUGS
+    It doesn't properly override FS::Record yet.
+
+    Delete and replace methods.
+
+SEE ALSO
+    the FS::Record manpage, the FS::cust_credit manpage, schema.html
+    from the base documentation.
+
+HISTORY
+    ivan@sisd.com 98-mar-18
+
+    ->create had wrong tablename ivan@sisd.com 98-jun-16 (finish
+    me!)
+
+    pod and finish up ivan@sisd.com 98-sep-21
+
diff --git a/htdocs/docs/man/cust_svc.txt b/htdocs/docs/man/cust_svc.txt
new file mode 100644
index 000000000..d863ea852
--- /dev/null
+++ b/htdocs/docs/man/cust_svc.txt
@@ -0,0 +1,72 @@
+NAME
+    FS::cust_svc - Object method for cust_svc objects
+
+SYNOPSIS
+      use FS::cust_svc;
+
+      $record = create FS::cust_svc \%hash
+      $record = create FS::cust_svc { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+DESCRIPTION
+    An FS::cust_svc represents a service. FS::cust_svc inherits from
+    FS::Record. The following fields are currently supported:
+
+    svcnum - primary key (assigned automatically for new services)
+    pkgnum - Package (see the FS::cust_pkg manpage)
+    svcpart - Service definition (see the FS::part_svc manpage)
+METHODS
+    create HASHREF
+        Creates a new service. To add the refund to the database,
+        see the section on "insert". Services are normally created
+        by creating FS::svc_ objects (see the FS::svc_acct manpage,
+        the FS::svc_domain manpage, and the FS::svc_acct_sm manpage,
+        among others).
+
+    insert
+        Adds this service to the database. If there is an error,
+        returns the error, otherwise returns false.
+
+    delete
+        Deletes this service from the database. If there is an
+        error, returns the error, otherwise returns false.
+
+        Called by the cancel method of the package (see the
+        FS::cust_pkg manpage).
+
+    replace OLD_RECORD
+        Replaces the OLD_RECORD with this one in the database. If
+        there is an error, returns the error, otherwise returns
+        false.
+
+    check
+        Checks all fields to make sure this is a valid service. If
+        there is an error, returns the error, otehrwise returns
+        false. Called by the insert and replace methods.
+
+BUGS
+    Behaviour of changing the svcpart of cust_svc records is
+    undefined and should possibly be prohibited, and pkg_svc records
+    are not checked.
+
+    pkg_svc records are not checket in general (here).
+
+SEE ALSO
+    the FS::Record manpage, the FS::cust_pkg manpage, the
+    FS::part_svc manpage, the FS::pkg_svc manpage, schema.html from
+    the base documentation
+
+HISTORY
+    ivan@voicenet.com 97-jul-10,14
+
+    no TableUtil, no FS::Lock ivan@sisd.com 98-mar-7
+
+    pod ivan@sisd.com 98-sep-21
+
diff --git a/htdocs/docs/man/dbdef.txt b/htdocs/docs/man/dbdef.txt
new file mode 100644
index 000000000..6f1215a84
--- /dev/null
+++ b/htdocs/docs/man/dbdef.txt
@@ -0,0 +1,80 @@
+NAME
+    FS::dbdef - Database objects
+
+SYNOPSIS
+      use FS::dbdef;
+
+      $dbdef = new FS::dbdef (@dbdef_table_objects);
+      $dbdef = load FS::dbdef "filename";
+
+      $dbdef->save("filename");
+
+      $dbdef->addtable($dbdef_table_object);
+
+      @table_names = $dbdef->tables;
+
+      $FS_dbdef_table_object = $dbdef->table;
+
+DESCRIPTION
+    FS::dbdef objects are collections of FS::dbdef_table objects and
+    represnt a database (a collection of tables).
+
+METHODS
+    new TABLE, TABLE, ...
+        Creates a new FS::dbdef object
+
+    load FILENAME
+        Loads an FS::dbdef object from a file.
+
+    save FILENAME
+        Saves an FS::dbdef object to a file.
+
+    addtable TABLE
+        Adds this FS::dbdef_table object.
+
+    tables
+        Returns the names of all tables.
+
+    table TABLENAME
+        Returns the named FS::dbdef_table object.
+
+BUGS
+        Each FS::dbdef object should have a name which corresponds
+        to its name within the SQL database engine.
+
+SEE ALSO
+        the FS::dbdef_table manpage, the FS::Record manpage,
+
+HISTORY
+        beginning of abstraction into a class (not really)
+
+        ivan@sisd.com 97-dec-4
+
+        added primary_key ivan@sisd.com 98-jan-20
+
+        added datatype (very kludgy and needs to be cleaned)
+        ivan@sisd.com 98-feb-21
+
+        perltrap (sigh) masked by mysql 3.20->3,21 ivan@sisd.com 98-
+        mar-2
+
+        Change 'type' to 'atype' in agent_type Changed attributes to
+        special words which are changed in fs-setup ie. double(10,2)
+        <=> MONEYTYPE Changed order of some of the field definitions
+        because Pg6.3 is picky Changed 'day' to 'daytime' in
+        cust_main Changed type of tax from tinyint to real Change
+        'password' to '_password' in svc_acct Pg6.3 does not allow
+        'field char(x) NULL' bmccane@maxbaud.net 98-apr-3
+
+        rewrite: now properly OO. See also
+        FS::dbdef_{table,column,unique,index}
+
+        ivan@sisd.com 98-apr-17
+
+        gained some extra functions ivan@sisd.com 98-may-11
+
+        now knows how to Freeze and Thaw itself ivan@sisd.com 98-
+        jun-2
+
+        pod ivan@sisd.com 98-sep-23
+
diff --git a/htdocs/docs/man/dbdef_colgroup.txt b/htdocs/docs/man/dbdef_colgroup.txt
new file mode 100644
index 000000000..a7eebc6c7
--- /dev/null
+++ b/htdocs/docs/man/dbdef_colgroup.txt
@@ -0,0 +1,51 @@
+NAME
+    FS::dbdef_colgroup - Column group objects
+
+SYNOPSIS
+      use FS::dbdef_colgroup;
+
+      $colgroup = new FS::dbdef_colgroup ( $lol );
+      $colgroup = new FS::dbdef_colgroup (
+        [
+          [ 'single_column' ],
+          [ 'multiple_columns', 'another_column', ],
+        ]
+      );
+
+      @sql_lists = $colgroup->sql_list;
+
+      @singles = $colgroup->singles;
+
+DESCRIPTION
+    FS::dbdef_colgroup objects represent sets of sets of columns.
+
+METHODS
+    new Creates a new FS::dbdef_colgroup object.
+
+    sql_list
+        Returns a flat list of comma-separated values, for SQL
+        statements.
+
+    singles
+        Returns a flat list of all single item lists.
+
+BUGS
+SEE ALSO
+    the FS::dbdef_table manpage, the FS::dbdef_unique manpage, the
+    FS::dbdef_index manpage, the FS::dbdef_column manpage, the
+    FS::dbdef manpage, the perldsc manpage
+
+HISTORY
+    class for dealing with groups of groups of columns (used as a
+    base class by FS::dbdef_{unique,index} )
+
+    ivan@sisd.com 98-apr-19
+
+    added singles, fixed sql_list to skip empty lists ivan@sisd.com
+    98-jun-2
+
+    untaint things we're returning in sub singels ivan@sisd.com 98-
+    jun-4
+
+    pod ivan@sisd.com 98-sep-24
+
diff --git a/htdocs/docs/man/dbdef_column.txt b/htdocs/docs/man/dbdef_column.txt
new file mode 100644
index 000000000..93e239517
--- /dev/null
+++ b/htdocs/docs/man/dbdef_column.txt
@@ -0,0 +1,69 @@
+NAME
+    FS::dbdef_column - Column object
+
+SYNOPSIS
+      use FS::dbdef_column;
+
+      $column_object = new FS::dbdef_column ( $name, $sql_type, '' );
+      $column_object = new FS::dbdef_column ( $name, $sql_type, 'NULL' );
+      $column_object = new FS::dbdef_column ( $name, $sql_type, '', $length );
+      $column_object = new FS::dbdef_column ( $name, $sql_type, 'NULL', $length );
+
+      $name = $column_object->name;
+      $column_object->name ( 'name' );
+
+      $name = $column_object->type;
+      $column_object->name ( 'sql_type' );
+
+      $name = $column_object->null;
+      $column_object->name ( 'NOT NULL' );
+
+      $name = $column_object->length;
+      $column_object->name ( $length );
+
+      $sql_line = $column->line;
+      $sql_line = $column->line $datasrc;
+
+DESCRIPTION
+    FS::dbdef::column objects represend columns in tables (see the
+    FS::dbdef_table manpage).
+
+METHODS
+    new Creates a new FS::dbdef_column object.
+
+    name
+        Returns or sets the column name.
+
+    type
+        Returns or sets the column type.
+
+    null
+        Returns or sets the column null flag.
+
+    type
+        Returns or sets the column length.
+
+    line [ $datasrc ]
+        Returns an SQL column definition.
+
+        If passed a DBI $datasrc specifying the DBD::mysql manpage,
+        will use MySQL-specific syntax. Non-standard syntax for
+        other engines (if applicable) may also be supported in the
+        future.
+
+BUGS
+SEE ALSO
+    the FS::dbdef_table manpage, the FS::dbdef manpage, the DBI
+    manpage
+
+HISTORY
+    class for dealing with column definitions
+
+    ivan@sisd.com 98-apr-17
+
+    now methods can be used to get or set data ivan@sisd.com 98-may-
+    11
+
+    mySQL-specific hack for null (what should be default?)
+    ivan@sisd.com 98-jun-2
+
diff --git a/htdocs/docs/man/dbdef_index.txt b/htdocs/docs/man/dbdef_index.txt
new file mode 100644
index 000000000..8cf339b84
--- /dev/null
+++ b/htdocs/docs/man/dbdef_index.txt
@@ -0,0 +1,27 @@
+NAME
+    FS::dbdef_unique.pm - Index object
+
+SYNOPSIS
+      use FS::dbdef_index;
+
+        # see FS::dbdef_colgroup methods
+
+DESCRIPTION
+    FS::dbdef_unique objects represent the (non-unique) indices of a
+    table (the FS::dbdef_table manpage). FS::dbdef_unique inherits
+    from FS::dbdef_colgroup.
+
+BUGS
+    Is this empty subclass needed?
+
+SEE ALSO
+    the FS::dbdef_colgroup manpage, the FS::dbdef_record manpage,
+    the FS::Record manpage
+
+HISTORY
+    class for dealing with index definitions
+
+    ivan@sisd.com 98-apr-19
+
+    pod ivan@sisd.com 98-sep-24
+
diff --git a/htdocs/docs/man/dbdef_table.txt b/htdocs/docs/man/dbdef_table.txt
new file mode 100644
index 000000000..25e010d8b
--- /dev/null
+++ b/htdocs/docs/man/dbdef_table.txt
@@ -0,0 +1,94 @@
+NAME
+    FS::dbdef_table - Table objects
+
+SYNOPSIS
+      use FS::dbdef_table;
+
+      $dbdef_table = new FS::dbdef_table (
+        "table_name",
+        "primary_key",
+        $FS_dbdef_unique_object,
+        $FS_dbdef_index_object,
+        @FS_dbdef_column_objects,
+      );
+
+      $dbdef_table->addcolumn ( $FS_dbdef_column_object );
+
+      $table_name = $dbdef_table->name;
+      $dbdef_table->name ("table_name");
+
+      $table_name = $dbdef_table->primary_keye;
+      $dbdef_table->primary_key ("primary_key");
+
+      $FS_dbdef_unique_object = $dbdef_table->unique;
+      $dbdef_table->unique ( $FS_dbdef_unique_object );
+
+      $FS_dbdef_index_object = $dbdef_table->index;
+      $dbdef_table->index ( $FS_dbdef_index_object );
+
+      @column_names = $dbdef->columns;
+
+      $FS_dbdef_column_object = $dbdef->column;
+
+      @sql_statements = $dbdef->sql_create_table;
+      @sql_statements = $dbdef->sql_create_table $datasrc;
+
+DESCRIPTION
+    FS::dbdef_table objects represent a single database table.
+
+METHODS
+    new Creates a new FS::dbdef_table object.
+
+    addcolumn
+        Adds this FS::dbdef_column object.
+
+    name
+        Returns or sets the table name.
+
+    primary_key
+        Returns or sets the primary key.
+
+    unique
+        Returns or sets the FS::dbdef_unique object.
+
+    index
+        Returns or sets the FS::dbdef_index object.
+
+    columns
+        Returns a list consisting of the names of all columns.
+
+    column "column"
+        Returns the column object (see the FS::dbdef_column manpage)
+        for "column".
+
+    sql_create_table [ $datasrc ]
+        Returns an array of SQL statments to create this table.
+
+        If passed a DBI $datasrc specifying the DBD::mysql manpage,
+        will use MySQL-specific syntax. Non-standard syntax for
+        other engines (if applicable) may also be supported in the
+        future.
+
+BUGS
+SEE ALSO
+    the FS::dbdef manpage, the FS::dbdef_unique manpage, the
+    FS::dbdef_index manpage, the FS::dbdef_unique manpage, the DBI
+    manpage
+
+HISTORY
+    class for dealing with table definitions
+
+    ivan@sisd.com 98-apr-18
+
+    gained extra functions (should %columns be an IxHash?)
+    ivan@sisd.com 98-may-11
+
+    sql_create_table returns a list of statments, not just one, and
+    now it does indices (plus mysql hack) ivan@sisd.com 98-jun-2
+
+    untaint primary_key... hmm. is this a hack around a bigger
+    problem? looks like, did the same thing singles in colgroup!
+    ivan@sisd.com 98-jun-4
+
+    pod ivan@sisd.com 98-sep-24
+
diff --git a/htdocs/docs/man/dbdef_unique.txt b/htdocs/docs/man/dbdef_unique.txt
new file mode 100644
index 000000000..0e4f0150b
--- /dev/null
+++ b/htdocs/docs/man/dbdef_unique.txt
@@ -0,0 +1,27 @@
+NAME
+    FS::dbdef_unique.pm - Unique object
+
+SYNOPSIS
+      use FS::dbdef_unique;
+
+      # see FS::dbdef_colgroup methods
+
+DESCRIPTION
+    FS::dbdef_unique objects represent the unique indices of a
+    database table (the FS::dbdef_table manpage). FS::dbdef_unique
+    inherits from FS::dbdef_colgroup.
+
+BUGS
+    Is this empty subclass needed?
+
+SEE ALSO
+    the FS::dbdef_colgroup manpage, the FS::dbdef_record manpage,
+    the FS::Record manpage
+
+HISTORY
+    class for dealing with unique definitions
+
+    ivan@sisd.com 98-apr-19
+
+    pod ivan@sisd.com 98-sep-24
+
diff --git a/htdocs/docs/man/index.html b/htdocs/docs/man/index.html
new file mode 100644
index 000000000..4f33dd485
--- /dev/null
+++ b/htdocs/docs/man/index.html
@@ -0,0 +1,48 @@
+<head>
+  <title>Perl API</title>
+</head>
+<body>
+  <h1>Perl API</h1>
+  <ul>
+<li><a href="agent.txt">FS::agent</a>
+<li><a href="agent_type.txt">FS::agent_type</a>
+<li><a href="cust_bill.txt">FS::cust_bill</a>
+<li><a href="cust_bill_pkg.txt">FS::cust_bill_pkg</a>
+<li><a href="cust_credit.txt">FS::cust_credit</a>
+<li><a href="cust_main.txt">FS::cust_main</a>
+<li><a href="cust_main_county.txt">FS::cust_main_county</a>
+<li><a href="cust_pay.txt">FS::cust_pay</a>
+<li><a href="cust_pkg.txt">FS::cust_pkg</a>
+<li><a href="cust_refund.txt">FS::cust_refund</a>
+<li><a href="cust_svc.txt">FS::cust_svc</a>
+<li><a href="part_pkg.txt">FS::part_pkg</a>
+<li><a href="part_referral.txt">FS::part_referral</a>
+<li><a href="part_svc.txt">FS::part_svc</a>
+<li><a href="pkg_svc.txt">FS::pkg_svc</a>
+<li><a href="svc_acct.txt">FS::svc_acct</a>
+<li><a href="svc_acct_pop.txt">FS::svc_acct_pop</a>
+<li><a href="svc_acct_sm.txt">FS::svc_acct_sm</a>
+<li><a href="svc_domain.txt">FS::svc_domain</a>
+<li><a href="type_pkgs.txt">FS::type_pkgs</a>
+</ul>
+<br>
+<ul>
+<li><a href="Bill.txt">FS::Bill</a>
+<li><a href="CGI.txt">FS::CGI</a>
+<li><a href="Conf.txt">FS::Conf</a>
+<li><a href="Invoice.txt">FS::Invoice</a>
+<li><a href="Record.txt">FS::Record</a>
+<li><a href="SSH.txt">FS::SSH</a>
+<li><a href="UID.txt">FS::UID</a>
+</ul>
+<br>
+<ul>
+<li><a href="dbdef.txt">FS::dbdef</a>
+<li><a href="dbdef_colgroup.txt">FS::dbdef_colgroup</a>
+<li><a href="dbdef_column.txt">FS::dbdef_column</a>
+<li><a href="dbdef_index.txt">FS::dbdef_index</a>
+<li><a href="dbdef_table.txt">FS::dbdef_table</a>
+<li><a href="dbdef_unique.txt">FS::dbdef_unique</a>
+
+<ul>
+</body>
diff --git a/htdocs/docs/man/part_pkg.txt b/htdocs/docs/man/part_pkg.txt
new file mode 100644
index 000000000..dc1bce423
--- /dev/null
+++ b/htdocs/docs/man/part_pkg.txt
@@ -0,0 +1,73 @@
+NAME
+    FS::part_pkg - Object methods for part_pkg objects
+
+SYNOPSIS
+      use FS::part_pkg;
+
+      $record = create FS::part_pkg \%hash
+      $record = create FS::part_pkg { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+DESCRIPTION
+    An FS::part_pkg represents a billing item definition.
+    FS::part_pkg inherits from FS::Record. The following fields are
+    currently supported:
+
+    pkgpart - primary key (assigned automatically for new billing item definitions)
+    pkg - Text name of this billing item definition (customer-viewable)
+    comment - Text name of this billing item definition (non-customer-viewable)
+    setup - Setup fee
+    freq - Frequency of recurring fee
+    recur - Recurring fee
+    setup and recur are evaluated as Safe perl expressions. You can
+    use numbers just as you would normally. More advanced semantics
+    are not yet defined.
+
+METHODS
+    create HASHREF
+        Creates a new billing item definition. To add the billing
+        item definition to the database, see the section on
+        "insert".
+
+    insert
+        Adds this billing item definition to the database. If there
+        is an error, returns the error, otherwise returns false.
+
+    delete
+        Currently unimplemented.
+
+    replace OLD_RECORD
+        Replaces OLD_RECORD with this one in the database. If there
+        is an error, returns the error, otherwise returns false.
+
+    check
+        Checks all fields to make sure this is a valid billing item
+        definition. If there is an error, returns the error,
+        otherwise returns false. Called by the insert and replace
+        methods.
+
+BUGS
+    It doesn't properly override FS::Record yet.
+
+    The delete method is unimplemented.
+
+    setup and recur semantics are not yet defined (and are
+    implemented in FS::cust_bill. hmm.).
+
+SEE ALSO
+    the FS::Record manpage, the FS::cust_pkg manpage, the
+    FS::type_pkgs manpage, the FS::pkg_svc manpage, the Safe
+    manpage. schema.html from the base documentation.
+
+HISTORY
+    ivan@sisd.com 97-dec-5
+
+    pod ivan@sisd.com 98-sep-21
+
diff --git a/htdocs/docs/man/part_referral.txt b/htdocs/docs/man/part_referral.txt
new file mode 100644
index 000000000..534996323
--- /dev/null
+++ b/htdocs/docs/man/part_referral.txt
@@ -0,0 +1,63 @@
+NAME
+    FS::part_referral - Object methods for part_referral objects
+
+SYNOPSIS
+      use FS::part_referral;
+
+      $record = create FS::part_referral \%hash
+      $record = create FS::part_referral { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+DESCRIPTION
+    An FS::part_referral represents a referral - where a customer
+    heard of your services. This can be used to track the
+    effectiveness of a particular piece of advertising, for example.
+    FS::part_referral inherits from FS::Record. The following fields
+    are currently supported:
+
+    refnum - primary key (assigned automatically for new referrals)
+    referral - Text name of this referral
+METHODS
+    create HASHREF
+        Creates a new referral. To add the referral to the database,
+        see the section on "insert".
+
+    insert
+        Adds this referral to the database. If there is an error,
+        returns the error, otherwise returns false.
+
+    delete
+        Currently unimplemented.
+
+    replace OLD_RECORD
+        Replaces OLD_RECORD with this one in the database. If there
+        is an error, returns the error, otherwise returns false.
+
+    check
+        Checks all fields to make sure this is a valid referral. If
+        there is an error, returns the error, otherwise returns
+        false. Called by the insert and replace methods.
+
+BUGS
+    It doesn't properly override FS::Record yet.
+
+    The delete method is unimplemented.
+
+SEE ALSO
+    the FS::Record manpage, the FS::cust_main manpage, schema.html
+    from the base documentation.
+
+HISTORY
+    Class dealing with referrals
+
+    ivan@sisd.com 98-feb-23
+
+    pod ivan@sisd.com 98-sep-21
+
diff --git a/htdocs/docs/man/part_svc.txt b/htdocs/docs/man/part_svc.txt
new file mode 100644
index 000000000..680944e2f
--- /dev/null
+++ b/htdocs/docs/man/part_svc.txt
@@ -0,0 +1,69 @@
+NAME
+    FS::part_svc - Object methods for part_svc objects
+
+SYNOPSIS
+      use FS::part_svc;
+
+      $record = create FS::part_referral \%hash
+      $record = create FS::part_referral { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+DESCRIPTION
+    An FS::part_svc represents a service definition. FS::part_svc
+    inherits from FS::Record. The following fields are currently
+    supported:
+
+    svcpart - primary key (assigned automatically for new service definitions)
+    svc - text name of this service definition
+    svcdb - table used for this service.  See the FS::svc_acct manpage,
+    the FS::svc_domain manpage, and the FS::svc_acct_sm manpage, among others.
+    *svcdb*__*field* - Default or fixed value for *field* in *svcdb*.
+    *svcdb*__*field*_flag - defines *svcdb*__*field* action: null, `D' for default, or `F' for fixed
+METHODS
+    create HASHREF
+        Creates a new service definition. To add the service
+        definition to the database, see the section on "insert".
+
+    insert
+        Adds this service definition to the database. If there is an
+        error, returns the error, otherwise returns false.
+
+    delete
+        Currently unimplemented.
+
+    replace OLD_RECORD
+        Replaces OLD_RECORD with this one in the database. If there
+        is an error, returns the error, otherwise returns false.
+
+    check
+        Checks all fields to make sure this is a valid service
+        definition. If there is an error, returns the error,
+        otherwise returns false. Called by the insert and replace
+        methods.
+
+BUGS
+    It doesn't properly override FS::Record yet.
+
+    Delete is unimplemented.
+
+SEE ALSO
+    the FS::Record manpage, the FS::part_pkg manpage, the
+    FS::pkg_svc manpage, the FS::cust_svc manpage, the FS::svc_acct
+    manpage, the FS::svc_acct_sm manpage, the FS::svc_domain
+    manpage, schema.html from the base documentation.
+
+HISTORY
+    ivan@sisd.com 97-nov-14
+
+    data checking/untainting calls into FS::Record added
+    ivan@sisd.com 97-dec-6
+
+    pod ivan@sisd.com 98-sep-21
+
diff --git a/htdocs/docs/man/pkg_svc.txt b/htdocs/docs/man/pkg_svc.txt
new file mode 100644
index 000000000..bde0043f1
--- /dev/null
+++ b/htdocs/docs/man/pkg_svc.txt
@@ -0,0 +1,61 @@
+NAME
+    FS::pkg_svc - Object methods for pkg_svc records
+
+SYNOPSIS
+      use FS::pkg_svc;
+
+      $record = create FS::pkg_svc \%hash;
+      $record = create FS::pkg_svc { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+DESCRIPTION
+    An FS::pkg_svc record links a billing item definition (see the
+    FS::part_pkg manpage) to a service definition (see the
+    FS::part_svc manpage). FS::pkg_svc inherits from FS::Record. The
+    following fields are currently supported:
+
+    pkgpart - Billing item definition (see the FS::part_pkg manpage)
+    svcpart - Service definition (see the FS::part_svc manpage)
+    quantity - Quantity of this service definition that this billing item
+    definition includes
+METHODS
+    create HASHREF
+        Create a new record. To add the record to the database, see
+        the section on "insert".
+
+    insert
+        Adds this record to the database. If there is an error,
+        returns the error, otherwise returns false.
+
+    delete
+        Deletes this record from the database. If there is an error,
+        returns the error, otherwise returns false.
+
+    replace OLD_RECORD
+        Replaces OLD_RECORD with this one in the database. If there
+        is an error, returns the error, otherwise returns false.
+
+    check
+        Checks all fields to make sure this is a valid record. If
+        there is an error, returns the error, otherwise returns
+        false. Called by the insert and replace methods.
+
+BUGS
+    It doesn't properly override FS::Record yet.
+
+SEE ALSO
+    the FS::Record manpage, the FS::part_pkg manpage, the
+    FS::part_svc manpage, schema.html from the base documentation.
+
+HISTORY
+    ivan@voicenet.com 97-jul-1 added hfields ivan@sisd.com 97-nov-13
+
+    pod ivan@sisd.com 98-sep-22
+
diff --git a/htdocs/docs/man/svc_acct.txt b/htdocs/docs/man/svc_acct.txt
new file mode 100644
index 000000000..1c9caf5fb
--- /dev/null
+++ b/htdocs/docs/man/svc_acct.txt
@@ -0,0 +1,168 @@
+NAME
+    FS::svc_acct - Object methods for svc_acct records
+
+SYNOPSIS
+      use FS::svc_acct;
+
+      $record = create FS::svc_acct \%hash;
+      $record = create FS::svc_acct { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+      $error = $record->suspend;
+
+      $error = $record->unsuspend;
+
+      $error = $record->cancel;
+
+DESCRIPTION
+    An FS::svc_acct object represents an account. FS::svc_acct
+    inherits from FS::Record. The following fields are currently
+    supported:
+
+    svcnum - primary key (assigned automatcially for new accounts)
+    username
+    _password - generated if blank
+    popnum - Point of presence (see the FS::svc_acct_pop manpage)
+    uid
+    gid
+    finger - GECOS
+    dir - set automatically if blank (and uid is not)
+    shell
+    quota - (unimplementd)
+    slipip - IP address
+    radius_*Radius_Attribute* - *Radius-Attribute*
+METHODS
+    create HASHREF
+        Creates a new account. To add the account to the database,
+        see the section on "insert".
+
+    insert
+        Adds this account to the database. If there is an error,
+        returns the error, otherwise returns false.
+
+        The additional fields pkgnum and svcpart (see the
+        FS::cust_svc manpage) should be defined. An FS::cust_svc
+        record will be created and inserted.
+
+        If the configuration value (see the FS::Conf manpage)
+        shellmachine exists, and the username, uid, and dir fields
+        are defined, the command
+
+          useradd -d $dir -m -s $shell -u $uid $username
+
+        is executed on shellmachine via ssh. This behaviour can be
+        surpressed by setting $FS::svc_acct::nossh_hack true.
+
+    delete
+        Deletes this account from the database. If there is an
+        error, returns the error, otherwise returns false.
+
+        The corresponding FS::cust_svc record will be deleted as
+        well.
+
+        If the configuration value (see the FS::Conf manpage)
+        shellmachine exists, the command:
+
+          userdel $username
+
+        is executed on shellmachine via ssh. This behaviour can be
+        surpressed by setting $FS::svc_acct::nossh_hack true.
+
+    replace OLD_RECORD
+        Replaces OLD_RECORD with this one in the database. If there
+        is an error, returns the error, otherwise returns false.
+
+        If the configuration value (see the FS::Conf manpage)
+        shellmachine exists, and the dir field has changed, the
+        command:
+
+          [ -d $old_dir ] && (
+            chmod u+t $old_dir;
+            umask 022;
+            mkdir $new_dir;
+            cd $old_dir;
+            find . -depth -print | cpio -pdm $new_dir;
+            chmod u-t $new_dir;
+            chown -R $uid.$gid $new_dir;
+            rm -rf $old_dir
+          )
+
+        is executed on shellmachine via ssh. This behaviour can be
+        surpressed by setting $FS::svc_acct::nossh_hack true.
+
+    suspend
+        Suspends this account by prefixing *SUSPENDED* to the
+        password. If there is an error, returns the error, otherwise
+        returns false.
+
+        Called by the suspend method of FS::cust_pkg (see the
+        FS::cust_pkg manpage).
+
+    unsuspend
+        Unsuspends this account by removing *SUSPENDED* from the
+        password. If there is an error, returns the error, otherwise
+        returns false.
+
+        Called by the unsuspend method of FS::cust_pkg (see the
+        FS::cust_pkg manpage).
+
+    cancel
+        Just returns false (no error) for now.
+
+        Called by the cancel method of FS::cust_pkg (see the
+        FS::cust_pkg manpage).
+
+    check
+        Checks all fields to make sure this is a valid service. If
+        there is an error, returns the error, otherwise returns
+        false. Called by the insert and replace methods.
+
+        Sets any fixed values; see the FS::part_svc manpage.
+
+BUGS
+    It doesn't properly override FS::Record yet.
+
+    The remote commands should be configurable.
+
+    The create method should set defaults from part_svc (like the
+    check method sets fixed values).
+
+SEE ALSO
+    the FS::Record manpage, the FS::Conf manpage, the FS::cust_svc
+    manpage, the FS::part_svc manpage, the FS::cust_pkg manpage, the
+    FS::SSH manpage, the ssh manpage, the FS::svc_acct_pop manpage,
+    schema.html from the base documentation.
+
+HISTORY
+    ivan@voicenet.com 97-jul-16 - 21
+
+    rewrite (among other things, now know about part_svc)
+    ivan@sisd.com 98-mar-8
+
+    Changed 'password' to '_password' because Pg6.3 reserves the
+    password word bmccane@maxbaud.net 98-apr-3
+
+    username length and shell no longer hardcoded ivan@sisd.com 98-
+    jun-28
+
+    eww but needed: ignore uid duplicates for 'fax' and 'hylafax'
+    ivan@sisd.com 98-jun-29
+
+    $nossh_hack ivan@sisd.com 98-jul-13
+
+    protections against UID/GID of 0 for incorrectly-setup RDBMSs
+    (also in bin/svc_acct.export) ivan@sisd.com 98-jul-13
+
+    arbitrary radius attributes ivan@sisd.com 98-aug-13
+
+    /var/spool/freeside/conf/shellmachine ivan@sisd.com 98-aug-13
+
+    pod and FS::conf ivan@sisd.com 98-sep-22
+
diff --git a/htdocs/docs/man/svc_acct_pop.txt b/htdocs/docs/man/svc_acct_pop.txt
new file mode 100644
index 000000000..ac0965413
--- /dev/null
+++ b/htdocs/docs/man/svc_acct_pop.txt
@@ -0,0 +1,65 @@
+NAME
+    FS::svc_acct_pop - Object methods for svc_acct_pop records
+
+SYNOPSIS
+      use FS::svc_acct_pop;
+
+      $record = create FS::svc_acct_pop \%hash;
+      $record = create FS::svc_acct_pop { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+DESCRIPTION
+    An FS::svc_acct object represents an point of presence.
+    FS::svc_acct_pop inherits from FS::Record. The following fields
+    are currently supported:
+
+    popnum - primary key (assigned automatically for new accounts)
+    city
+    state
+    ac - area code
+    exch - exchange
+METHODS
+    create HASHREF
+        Creates a new point of presence (if only it were that
+        easy!). To add the point of presence to the database, see
+        the section on "insert".
+
+    insert
+        Adds this point of presence to the databaes. If there is an
+        error, returns the error, otherwise returns false.
+
+    delete
+        Currently unimplemented.
+
+    replace OLD_RECORD
+        Replaces OLD_RECORD with this one in the database. If there
+        is an error, returns the error, otherwise returns false.
+
+    check
+        Checks all fields to make sure this is a valid point of
+        presence. If there is an error, returns the error, otherwise
+        returns false. Called by the insert and replace methods.
+
+BUGS
+    It doesn't properly override FS::Record yet.
+
+    It should be renamed to part_pop.
+
+SEE ALSO
+    the FS::Record manpage, the svc_acct manpage, schema.html from
+    the base documentation.
+
+HISTORY
+    Class dealing with pops
+
+    ivan@sisd.com 98-mar-8
+
+    pod ivan@sisd.com 98-sep-23
+
diff --git a/htdocs/docs/man/svc_acct_sm.txt b/htdocs/docs/man/svc_acct_sm.txt
new file mode 100644
index 000000000..e9940af9a
--- /dev/null
+++ b/htdocs/docs/man/svc_acct_sm.txt
@@ -0,0 +1,121 @@
+NAME
+    FS::svc_acct_sm - Object methods for svc_acct_sm records
+
+SYNOPSIS
+      use FS::svc_acct_sm;
+
+      $record = create FS::svc_acct_sm \%hash;
+      $record = create FS::svc_acct_sm { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+      $error = $record->suspend;
+
+      $error = $record->unsuspend;
+
+      $error = $record->cancel;
+
+DESCRIPTION
+    An FS::svc_acct object represents a virtual mail alias.
+    FS::svc_acct inherits from FS::Record. The following fields are
+    currently supported:
+
+    svcnum - primary key (assigned automatcially for new accounts)
+    domsvc - svcnum of the virtual domain (see the FS::svc_domain manpage)
+    domuid - uid of the target account (see the FS::svc_acct manpage)
+    domuser - virtual username
+METHODS
+    create HASHREF
+        Creates a new virtual mail alias. To add the virtual mail
+        alias to the database, see the section on "insert".
+
+    insert
+        Adds this virtual mail alias to the database. If there is an
+        error, returns the error, otherwise returns false.
+
+        The additional fields pkgnum and svcpart (see the
+        FS::cust_svc manpage) should be defined. An FS::cust_svc
+        record will be created and inserted.
+
+        If the configuration values (see the FS::Conf manpage)
+        shellmachine and qmailmachines exist, and domuser is `*'
+        (meaning a catch-all mailbox), the command:
+
+          [ -e $dir/.qmail-$qdomain-default ] || {
+            touch $dir/.qmail-$qdomain-default;
+            chown $uid:$gid $dir/.qmail-$qdomain-default;
+          }
+
+        is executed on shellmachine via ssh (see the section on
+        "EXTENSION ADDRESSES" in the dot-qmail manpage). This
+        behaviour can be surpressed by setting
+        $FS::svc_acct_sm::nossh_hack true.
+
+    delete
+        Deletes this virtual mail alias from the database. If there
+        is an error, returns the error, otherwise returns false.
+
+        The corresponding FS::cust_svc record will be deleted as
+        well.
+
+    replace OLD_RECORD
+        Replaces OLD_RECORD with this one in the database. If there
+        is an error, returns the error, otherwise returns false.
+
+    suspend
+        Just returns false (no error) for now.
+
+        Called by the suspend method of FS::cust_pkg (see the
+        FS::cust_pkg manpage).
+
+    unsuspend
+        Just returns false (no error) for now.
+
+        Called by the unsuspend method of FS::cust_pkg (see the
+        FS::cust_pkg manpage).
+
+    cancel
+        Just returns false (no error) for now.
+
+        Called by the cancel method of FS::cust_pkg (see the
+        FS::cust_pkg manpage).
+
+    check
+        Checks all fields to make sure this is a valid virtual mail
+        alias. If there is an error, returns the error, otherwise
+        returns false. Called by the insert and replace methods.
+
+        Sets any fixed values; see the FS::part_svc manpage.
+
+BUGS
+    It doesn't properly override FS::Record yet.
+
+    The remote commands should be configurable.
+
+SEE ALSO
+    the FS::Record manpage, the FS::Conf manpage, the FS::cust_svc
+    manpage, the FS::part_svc manpage, the FS::cust_pkg manpage, the
+    FS::svc_acct manpage, the FS::svc_domain manpage, the FS::SSH
+    manpage, the ssh manpage, the dot-qmail manpage, schema.html
+    from the base documentation.
+
+HISTORY
+    ivan@voicenet.com 97-jul-16 - 21
+
+    rewrite ivan@sisd.com 98-mar-10
+
+    s/qsearchs/qsearch/ to eliminate warning ivan@sisd.com 98-apr-19
+
+    uses conf/shellmachine and has an nossh_hack ivan@sisd.com 98-
+    jul-14
+
+    s/\./:/g in .qmail-domain:com ivan@sisd.com 98-aug-13
+
+    pod, FS::Conf, moved .qmail file from check to insert 98-sep-23
+
diff --git a/htdocs/docs/man/svc_domain.txt b/htdocs/docs/man/svc_domain.txt
new file mode 100644
index 000000000..03d3dbc27
--- /dev/null
+++ b/htdocs/docs/man/svc_domain.txt
@@ -0,0 +1,131 @@
+NAME
+    FS::svc_domain - Object methods for svc_domain records
+
+SYNOPSIS
+      use FS::svc_domain;
+
+      $record = create FS::svc_domain \%hash;
+      $record = create FS::svc_domain { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+      $error = $record->suspend;
+
+      $error = $record->unsuspend;
+
+      $error = $record->cancel;
+
+DESCRIPTION
+    An FS::svc_domain object represents a domain. FS::svc_domain
+    inherits from FS::Record. The following fields are currently
+    supported:
+
+    svcnum - primary key (assigned automatically for new accounts)
+    domain
+METHODS
+    create HASHREF
+        Creates a new domain. To add the domain to the database, see
+        the section on "insert".
+
+    insert
+        Adds this domain to the database. If there is an error,
+        returns the error, otherwise returns false.
+
+        The additional fields *pkgnum* and *svcpart* (see the
+        FS::cust_svc manpage) should be defined. An FS::cust_svc
+        record will be created and inserted.
+
+        The additional field *action* should be set to *N* for new
+        domains or *M* for transfers.
+
+        A registration or transfer email will be submitted unless
+        $FS::svc_domain::whois_hack is true.
+
+    delete
+        Deletes this domain from the database. If there is an error,
+        returns the error, otherwise returns false.
+
+        The corresponding FS::cust_svc record will be deleted as
+        well.
+
+    replace OLD_RECORD
+        Replaces OLD_RECORD with this one in the database. If there
+        is an error, returns the error, otherwise returns false.
+
+    suspend
+        Just returns false (no error) for now.
+
+        Called by the suspend method of FS::cust_pkg (see the
+        FS::cust_pkg manpage).
+
+    unsuspend
+        Just returns false (no error) for now.
+
+        Called by the unsuspend method of FS::cust_pkg (see the
+        FS::cust_pkg manpage).
+
+    cancel
+        Just returns false (no error) for now.
+
+        Called by the cancel method of FS::cust_pkg (see the
+        FS::cust_pkg manpage).
+
+    check
+        Checks all fields to make sure this is a valid domain. If
+        there is an error, returns the error, otherwise returns
+        false. Called by the insert and replace methods.
+
+        Sets any fixed values; see the FS::part_svc manpage.
+
+    _whois
+        Executes the command:
+
+          whois do $domain
+
+        and returns the output.
+
+        (Always returns *No match for domian "$domain".* if
+        $FS::svc_domain::whois_hack is set true.)
+
+    submit_internic
+        Submits a registration email for this domain.
+
+BUGS
+    It doesn't properly override FS::Record yet.
+
+    All BIND/DNS fields should be included (and exported).
+
+    All registries should be supported.
+
+    Not all configuration access is through FS::Conf!
+
+    Should change action to a real field.
+
+SEE ALSO
+    the FS::Record manpage, the FS::Conf manpage, the FS::cust_svc
+    manpage, the FS::part_svc manpage, the FS::cust_pkg manpage, the
+    FS::SSH manpage, the ssh manpage, the dot-qmail manpage,
+    schema.html from the base documentation, config.html from the
+    base documentation.
+
+HISTORY
+    ivan@voicenet.com 97-jul-21
+
+    rewrite ivan@sisd.com 98-mar-10
+
+    add internic bits ivan@sisd.com 98-mar-14
+
+    Changed 'day' to 'daytime' because Pg6.3 reserves the day word
+    bmccane@maxbaud.net 98-apr-3
+
+    /var/spool/freeside/conf/registries/internic/, Mail::Internet,
+    etc. ivan@sisd.com 98-jul-17-19
+
+    pod, some FS::Conf (not complete) ivan@sisd.com 98-sep-23
+
diff --git a/htdocs/docs/man/type_pkgs.txt b/htdocs/docs/man/type_pkgs.txt
new file mode 100644
index 000000000..9822b4802
--- /dev/null
+++ b/htdocs/docs/man/type_pkgs.txt
@@ -0,0 +1,55 @@
+NAME
+    FS::type_pkgs - Object methods for type_pkgs records
+
+SYNOPSIS
+      use FS::type_pkgs;
+
+      $record = create FS::type_pkgs \%hash;
+      $record = create FS::type_pkgs { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+DESCRIPTION
+    An FS::type_pkgs record links an agent type (see the
+    FS::agent_type manpage) to a billing item definition (see the
+    FS::part_pkg manpage). FS::type_pkgs inherits from FS::Record.
+    The following fields are currently supported:
+
+    typenum - Agent type, see the FS::agent_type manpage
+    pkgpart - Billing item definition, see the FS::part_pkg manpage
+METHODS
+    create HASHREF
+        Create a new record. To add the record to the database, see
+        the section on "insert".
+
+    insert
+        Adds this record to the database. If there is an error,
+        returns the error, otherwise returns false.
+
+    delete
+        Deletes this record from the database. If there is an error,
+        returns the error, otherwise returns false.
+
+    replace OLD_RECORD
+        Replaces OLD_RECORD with this one in the database. If there
+        is an error, returns the error, otherwise returns false.
+
+    check
+        Checks all fields to make sure this is a valid record. If
+        there is an error, returns the error, otherwise returns
+        false. Called by the insert and replace methods.
+
+HISTORY
+    Defines the relation between agent types and pkgparts (Which
+    pkgparts can the different [types of] agents sell?)
+
+    ivan@sisd.com 97-nov-13
+
+    change to ut_ FS::Record, fixed bugs ivan@sisd.com 97-dec-10
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 56bfd033d7a891a0368f1c4c00532eebe52b9a8d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 27 Sep 1998 23:52:34 +0000
Subject: Initial revision

---
 htdocs/images/mid-logo.gif | Bin 0 -> 10606 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 htdocs/images/mid-logo.gif

diff --git a/htdocs/images/mid-logo.gif b/htdocs/images/mid-logo.gif
new file mode 100644
index 000000000..4ceb3add5
Binary files /dev/null and b/htdocs/images/mid-logo.gif differ
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 5101fe90d4eb25433637f20498b5a59a502f76d8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 27 Sep 1998 23:59:07 +0000
Subject: Initial revision

---
 htdocs/images/small-logo.gif | Bin 0 -> 5426 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 htdocs/images/small-logo.gif

diff --git a/htdocs/images/small-logo.gif b/htdocs/images/small-logo.gif
new file mode 100644
index 000000000..a8e9c5763
Binary files /dev/null and b/htdocs/images/small-logo.gif differ
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From b94fd887a173a3f96cf860f9a2031baa6934576d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 28 Sep 1998 05:16:12 +0000
Subject: Initial revision

---
 htdocs/edit/process/svc_domain.cgi | 78 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100755 htdocs/edit/process/svc_domain.cgi

diff --git a/htdocs/edit/process/svc_domain.cgi b/htdocs/edit/process/svc_domain.cgi
new file mode 100755
index 000000000..0782772dd
--- /dev/null
+++ b/htdocs/edit/process/svc_domain.cgi
@@ -0,0 +1,78 @@
+#!/usr/bin/perl -Tw
+#
+# process/svc_domain.cgi: Add a domain (process form)
+#
+# Usage: post form to:
+#        http://server.name/path/svc_domain.cgi
+#
+# Note: Should br run setuid root as user nobody.
+#
+# lots of yucky stuff in this one... bleachlkjhui!
+#
+# ivan@voicenet.com 97-jan-6
+#
+# kludged for new domain template 3.5
+# ivan@voicenet.com 97-jul-24
+#
+# moved internic bits to svc_domain.pm ivan@sisd.com 98-mar-14
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+
+use strict;
+use CGI::Request;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+use FS::svc_domain;
+
+#remove this to actually test the domains!
+$FS::svc_domain::whois_hack = 1;
+
+my($req) = new CGI::Request;
+&cgisuidsetup($req->cgi);
+
+$req->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+my($svcnum)=$1;
+
+my($new) = create FS::svc_domain ( {
+  map {
+    $_, $req->param($_);
+  } qw(svcnum pkgnum svcpart domain action purpose)
+} );
+
+my($error);
+if ($req->param('legal') ne "Yes") {
+  $error = "Customer did not agree to be bound by NSI's ".
+    qq!<A HREF="http://rs.internic.net/help/agreement.txt">!.
+    "Domain Name Resgistration Agreement</A>";
+} elsif ($req->param('svcnum')) {
+  $error="Can't modify a domain!";
+} else {
+  $error=$new->insert;
+  $svcnum=$new->svcnum;
+}
+
+unless ($error) {
+  $req->cgi->redirect("../../view/svc_domain.cgi?$svcnum");
+} else {
+  CGI::Base::SendHeaders(); # one guess
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Error adding domain</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H4>Error adding domain</H4>
+    </CENTER>
+    Your update did not occur because of the following error:
+    <P><B>$error</B>
+    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and submit the form again.
+  </BODY>
+</HTML>
+END
+
+}
+
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 656c7d55b5f3bdd12b142d05707ceed4eaef17b5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 29 Sep 1998 18:55:21 +0000
Subject: Initial revision

---
 htdocs/view/svc_acct.cgi | 172 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 172 insertions(+)
 create mode 100755 htdocs/view/svc_acct.cgi

diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi
new file mode 100755
index 000000000..7096c2fb1
--- /dev/null
+++ b/htdocs/view/svc_acct.cgi
@@ -0,0 +1,172 @@
+#!/usr/bin/perl -Tw
+#
+# View svc_acct records
+#
+# Usage: svc_acct.cgi svcnum
+#        http://server.name/path/svc_acct.cgi?svcnum
+#
+# Note: Should be run setuid freeside as user nobody.
+#
+# ivan@voicenet.com 96-dec-17
+#
+# added link to send info
+# ivan@voicenet.com 97-jan-4
+#
+# added navigation bar and ability to change username, etc.
+# ivan@voicenet.com 97-jan-30
+#
+# activate 800 service
+# ivan@voicenet.com 97-feb-10
+#
+# modified navbar code (should be a subroutine?), added link to cancel account (only if not audited)
+# ivan@voicenet.com 97-apr-16
+#
+# INCOMPLETELY rewrote some things for new API
+# ivan@voicenet.com 97-jul-29
+#
+# FS::Search became FS::Record, use strict, etc. ivan@sisd.com 98-mar-9
+#
+# Changes to allow page to work at a relative position in server
+# Changed 'password' to '_password' because Pg6.3 reserves the password word
+#       bmccane@maxbaud.net     98-apr-3
+#
+# /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
+#
+# displays arbitrary radius attributes ivan@sisd.com 98-aug-16
+
+use strict;
+use CGI::Base qw(:DEFAULT :CGI);
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs fields);
+
+my($conf_domain)="/var/spool/freeside/conf/domain";
+open(DOMAIN,$conf_domain) or die "Can't open $conf_domain: $!";
+my($mydomain)=map {
+  /^(.*)$/ or die "Illegal line in $conf_domain!"; #yes, we trust the file
+  $1;
+} grep $_ !~ /^(#|$)/, <DOMAIN>;
+
+my($cgi) = new CGI::Base;
+$cgi->get;
+&cgisuidsetup($cgi);
+
+#untaint svcnum
+$QUERY_STRING =~ /^(\d+)$/;
+my($svcnum)=$1;
+my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svcnum});
+die "Unkonwn svcnum" unless $svc_acct;
+
+my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
+my($pkgnum)=$cust_svc->getfield('pkgnum');
+my($cust_pkg,$custnum);
+if ($pkgnum) {
+  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+  $custnum=$cust_pkg->getfield('custnum');
+}
+
+my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+die "Unkonwn svcpart" unless $part_svc;
+
+SendHeaders(); # one guess.
+print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Account View</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER><H1>Account View</H1>
+    <BASEFONT SIZE=3>
+<CENTER>
+END
+
+if ($pkgnum || $custnum) {
+  print <<END;
+<A HREF="../view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> | 
+<A HREF="../view/cust_main.cgi?$custnum">View this customer (#$custnum)</A> | 
+END
+} else {
+  print <<END;
+<A HREF="../misc/cancel-unaudited.cgi?$svcnum">Cancel this (unaudited)account</A> |
+END
+}
+
+print <<END;
+<A HREF="../">Main menu</A></CENTER><BR>
+<FONT SIZE=+1>Service #$svcnum</FONT>
+END
+
+print qq!<BR><A HREF="../edit/svc_acct.cgi?$svcnum">Edit this information</A>!;
+#print qq!<BR><A HREF="../misc/sendconfig.cgi?$svcnum">Send account information</A>!;
+print qq!<BR><BR><A HREF="#general">General</A> | <A HREF="#shell">Shell account</A> | !;
+print qq!<A HREF="#slip">SLIP/PPP account</A></CENTER>!;
+
+#formatting
+print qq!<HR><CENTER><FONT SIZE=+1><A NAME="general">General</A></FONT></CENTER>!;
+
+#svc
+print "Service: <B>", $part_svc->svc, "</B>";
+
+#username
+print "<BR>Username: <B>", $svc_acct->username, "</B>";
+
+#password
+if (substr($svc_acct->_password,0,1) eq "*") {
+  print "<BR>Password: <I>(Login disabled)</I><BR>";
+} else {
+  print "<BR>Password: <I>(hidden)</I><BR>";
+}
+
+# popnum -> svc_acct_pop record
+my($svc_acct_pop)=qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
+
+#pop
+print "POP: <B>", $svc_acct_pop->city, ", ", $svc_acct_pop->state,
+      " (", $svc_acct_pop->ac, ")/", $svc_acct_pop->exch, "<\B>"
+  if $svc_acct_pop;
+
+#shell account
+print qq!<HR><CENTER><FONT SIZE=+1><A NAME="shell">!;
+if ($svc_acct->uid ne '') {
+  print "Shell account";
+  print "</A></FONT></CENTER>";
+  print "Uid: <B>", $svc_acct->uid, "</B>";
+  print "<BR>Gid: <B>", $svc_acct->gid, "</B>";
+
+  print qq!<BR>Finger name: <B>!, $svc_acct->finger, qq!</B><BR>!;
+
+  print "Home directory: <B>", $svc_acct->dir, "</B><BR>";
+
+  print "Shell: <B>", $svc_acct->shell, "</B><BR>";
+
+  print "Quota: <B>", $svc_acct->quota, "</B> <I>(unimplemented)</I>";
+} else {
+  print "No shell account.</A></FONT></CENTER>";
+}
+
+# SLIP/PPP
+print qq!<HR><CENTER><FONT SIZE=+1><A NAME="slip">!;
+if ($svc_acct->slipip) {
+  print "SLIP/PPP account</A></FONT></CENTER>";
+  print "IP address: <B>", ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' ) ? "<I>(Dynamic)</I>" : $svc_acct->slipip ,"</B>";
+  my($attribute);
+  foreach $attribute ( grep /^radius_/, fields('svc_acct') ) {
+    #warn $attribute;
+    $attribute =~ /^radius_(.*)$/;
+    my($pattribute) = ($1);
+    $pattribute =~ s/_/-/g;
+    print "<BR>Radius $pattribute: <B>". $svc_acct->getfield($attribute), "</B>";
+  }
+} else {
+  print "No SLIP/PPP account</A></FONT></CENTER>"
+}
+
+print "<HR>";
+
+	#formatting
+	print <<END;
+
+  </BODY>
+</HTML>
+END
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 3175087f33550fd68e8a4dcf2e33c45f41034eaa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Oct 1998 02:17:39 +0000
Subject: Initial revision

---
 htdocs/docs/index.html    | 23 ++++++++++++
 htdocs/docs/upgrade2.html | 11 ++++++
 htdocs/index.html         | 96 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 130 insertions(+)
 create mode 100644 htdocs/docs/index.html
 create mode 100644 htdocs/docs/upgrade2.html
 create mode 100755 htdocs/index.html

diff --git a/htdocs/docs/index.html b/htdocs/docs/index.html
new file mode 100644
index 000000000..20051ca4d
--- /dev/null
+++ b/htdocs/docs/index.html
@@ -0,0 +1,23 @@
+<head>
+  <title>Documentation</title>
+</head>
+<body>
+  <h1>Documentation</h1>
+<ul>
+  <li><a href="install.html">New Installation</a>
+  <li><a href="upgrade.html">Upgrading from 1.0.x to 1.1.x</a>
+  <li><a href="upgrade2.html">Upgrading from 1.1.x to 1.1.3</a>
+  <li><a href="config.html">Configuration files</a>
+<!--
+  <li><a href="admin.html">Administration</a>
+!-->
+  <li><a href="../index.html#admin">Administration</a>
+  <li><a href="legacy.html">Importing legacy data</a>
+  <li><a href="export.html">File exporting and remote setup</a>
+  <li><a href="passwd.html">fs_passwd</a>
+  <li><a href="billing.html">Billing</a>
+  <li><a href="trouble.html">Troubleshooting</a>
+  <li><a href="schema.html">Schema reference</a>
+  <li><a href="man/">Perl API</a>
+</ul>
+</body>
diff --git a/htdocs/docs/upgrade2.html b/htdocs/docs/upgrade2.html
new file mode 100644
index 000000000..4bf7ea45a
--- /dev/null
+++ b/htdocs/docs/upgrade2.html
@@ -0,0 +1,11 @@
+<head>
+  <title>Upgrading to 1.1.3</title>
+</head>
+<body>
+<h1>Upgrading to 1.1.3 from 1.1.x</h1>
+<ul>
+  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
+  <li>Back up your data and current Freeside installation.
+  <li>If applicable, create the new <a href="config.html">configuration files</a>: lpr, cybercash2, cybercash3.2
+  <li>Copy or symlink htdocs and site_perl to the new copies.
+</body>
diff --git a/htdocs/index.html b/htdocs/index.html
new file mode 100755
index 000000000..de0667e59
--- /dev/null
+++ b/htdocs/index.html
@@ -0,0 +1,96 @@
+<HTML>
+  <HEAD>
+    <TITLE>
+      Freeside Main Menu
+    </TITLE>
+  </HEAD>
+  <BODY BGCOLOR="#FFFFFF">
+  <table>
+    <tr><td>
+    <P ALIGN=CENTER>
+        <IMG BORDER=0 ALT="Silicon Interactive Software Design" SRC="images/small-logo.gif">
+    </td><td>
+      <center><font color="#ff0000" size=7>freeside main menu</font></center>
+    </td></tr>
+  </table>
+      <A HREF="http://www.sisd.com/freeside">
+        Information
+      </A>
+      <BR><A HREF="docs/">
+        Documentation
+      </A>
+    </P>
+    <HR>
+      <H3><A HREF="edit/cust_main.cgi">New Customer</A></H3>
+        <A NAME="search"><H3>Search</H3></A>
+        <MENU>
+        <LI><A HREF="search/cust_main.html">
+            customers (by last name and/or company)
+        </A>
+        <LI><A HREF="search/cust_main-payinfo.html">customers (by credit card number)</A>
+        <LI><A HREF="search/svc_acct.html">accounts (by username)</A>
+        <LI><A HREF="search/svc_domain.html">domains (by domain)</A>
+        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>
+        <LI><A HREF="search/cust_bill.html">invoices (by invoice number)</A>
+        </MENU>
+        <A NAME="browse"><H3>Browse</H3></A>
+        <MENU>
+          <LI><A HREF="search/cust_main.cgi?custnum">customers (by customer number)</A>
+          <LI><A HREF="search/cust_main.cgi?last">customers (by last name)</A>
+          <LI><A HREF="search/cust_main.cgi?company">customers (by company)</A>
+          <LI><A HREF="search/cust_pkg.cgi?pkgnum">packages (by package number)</A>
+          <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
+        <LI><A HREF="search/svc_acct.cgi?svcnum">accounts (by service number)</A>
+          <LI><A HREF="search/svc_acct.cgi?username">accounts (by username)</A>
+          <LI><A HREF="search/svc_acct.cgi?uid">accounts (by uid)</A>
+          <LI><A HREF="search/svc_acct.cgi?UN_svcnum">unlinked accounts (by service number)</A>
+          <LI><A HREF="search/svc_acct.cgi?UN_username">unlinked accounts (by username)</A>
+          <LI><A HREF="search/svc_acct.cgi?UN_uid">unlinked accounts (by uid)</A>
+          <LI><A HREF="search/svc_domain.cgi?svcnum">domains (by service number)</A>
+          <LI><A HREF="search/svc_domain.cgi?domain">domains (by domain)</A>
+          <LI><A HREF="search/svc_domain.cgi?UN_svcnum">unlinked domains (by service number)</A>
+          <LI><A HREF="search/svc_domain.cgi?UN_domain">unlinked domains (by domain)</A>
+      </MENU>
+          <A NAME="admin"><H3>Administration</H3></a>
+        <MENU>
+          <LI><A HREF="browse/part_svc.cgi">
+            View/Edit services
+          </A>
+            - Services are items you offer to your customers.
+          <LI><A HREF="browse/part_pkg.cgi">
+            View/Edit packages
+          </A>
+            - One or more services are grouped together into a package and
+              given pricing information.  Customers purchase packages, not
+              services.
+          <LI><A HREF="browse/agent_type.cgi">
+            View/Edit agent types
+          </A>
+            - Agent types define groups of packages that you can then assign
+              to particular agents.
+          <LI><A HREF="browse/agent.cgi">
+            View/Edit agents
+          </A>
+            - Agents are resellers of your service.  Agents may be limited
+              to a subset of your full offerings (via their agent type).
+          <BR>
+          <LI><A HREF="browse/part_referral.cgi">
+            View/Edit referrals
+          </A>
+            - Where a customer heard about your service.  Tracked for
+              informational purposes.
+          <BR>
+          <LI><A HREF="browse/cust_main_county.cgi">
+            View/Edit locales and tax rates
+          </A>
+            - Change tax rates by state, or break down a state into counties
+              and assign different tax rates to each county.
+          <BR>
+          <LI><A HREF="browse/svc_acct_pop.cgi">
+            View/Edit POPs 
+          </A>
+            - Points of Presence 
+    </MENU>
+    </FONT>
+  </BODY>
+</HTML>
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From cad4eadf964cb65841d7cb6f0bcf804f1d39ae2c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Oct 1998 07:03:09 +0000
Subject: Initial revision

---
 README               |  43 +++
 bin/fs-setup         | 542 ++++++++++++++++++++++++++++++++
 site_perl/Conf.pm    | 113 +++++++
 site_perl/Invoice.pm |  45 +++
 site_perl/Record.pm  | 868 +++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 1611 insertions(+)
 create mode 100644 README
 create mode 100755 bin/fs-setup
 create mode 100644 site_perl/Conf.pm
 create mode 100644 site_perl/Invoice.pm
 create mode 100644 site_perl/Record.pm

diff --git a/README b/README
new file mode 100644
index 000000000..14234df5a
--- /dev/null
+++ b/README
@@ -0,0 +1,43 @@
+Freeside, (pre) 1.1.4
+
+Copyright (C) 1998 Silicon Interactive Software Design.  All rights reserved.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of either:
+
+        a) the GNU General Public License as published by the Free
+        Software Foundation; either version 2, or (at your option) any
+        later version, or
+
+        b) the "Artistic 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 either the
+    GNU General Public License or the Artistic License for more details.
+  
+    You should have received a copy of the GNU General Public
+    License along with this program, in the file `GPL'; if not,
+    write to the Free Software Foundation, Inc., 59 Temple Place - Suite
+    330, Boston, MA 02111-1307, USA.
+
+    You should have received a copy of the Artistic License along with
+    this program, in the file `Artistic'; if not, download it from
+    http://www.perl.com/CPAN/doc/misc/license/Artistic
+
+Freeside is a billing and administration package for Internet Service 
+Providers.
+
+The Freeside home page is at `http://www.sisd.com/freeside'.
+
+The documentation is in `htdocs/docs'.
+
+A mailing list for users and developers is available.  Send a blank message to
+<ivan-freeside-subscribe@sisd.com> to subscribe.
+
+Commercial support is available from Ivan Kohler <ivan@sisd.com>.  Please
+subscribe to the the mailing list to request free support!
+
+Ivan Kohler
+ivan@sisd.com
+
diff --git a/bin/fs-setup b/bin/fs-setup
new file mode 100755
index 000000000..45332d85c
--- /dev/null
+++ b/bin/fs-setup
@@ -0,0 +1,542 @@
+#!/usr/bin/perl -Tw
+#
+# create database and necessary tables, etc.  DBI version.
+#
+# ivan@sisd.com 97-nov-8,9
+#
+# agent_type and type_pkgs added.
+# (index need to be declared, & primary keys shoudln't have mysql syntax)
+# ivan@sisd.com 97-nov-13
+#
+# pulled modified version back out of register.cgi ivan@sisd.com 98-feb-21
+#
+# removed extraneous sample data ivan@sisd.com 98-mar-23
+#
+# gained the big hash from dbdef.pm, dbdef.pm usage rewrite ivan@sisd.com
+# 98-apr-19 - 98-may-11 plus
+#
+# finished up ivan@sisd.com 98-jun-1
+#
+# part_svc fields are all forced NULL, not the opposite
+# hmm: also are forced varchar($char_d) as fixed '0' for things like
+# uid is Not Good.  will this break anything else?
+# ivan@sisd.com 98-jun-29
+#
+# ss is 11 chars ivan@sisd.com 98-jul-20
+#
+# setup of arbitrary radius fields ivan@sisd.com 98-aug-9
+#
+# ouch, removed index on company name that wasn't supposed to be there
+# ivan@sisd.com 98-sep-4
+#
+# fix radius attributes ivan@sisd.com 98-sep-27
+
+#to delay loading dbdef until we're ready
+BEGIN { $FS::Record::setup_hack = 1; }
+
+use strict;
+use DBI;
+use FS::dbdef;
+use FS::UID qw(adminsuidsetup datasrc);
+use FS::Record;
+use FS::cust_main_county;
+
+#needs to match FS::Record
+my($dbdef_file) = "/var/spool/freeside/dbdef.". datasrc;
+
+###
+
+print "\nEnter the maximum username length: ";
+my($username_len)=&getvalue;
+
+print "\n\n", <<END, ":";
+Freeside tracks the RADIUS attributes User-Name, Password and Framed-IP-Address
+for each user.  Enter any additional RADIUS attributes you need to track for
+each user, separated by whitespace.
+END
+my @attributes = map { s/\-/_/g; $_; } split(" ",&getvalue);
+
+sub getvalue {
+  my($x)=scalar(<STDIN>);
+  chop $x;
+  $x;
+}
+
+###
+
+my($char_d) = 80; #default maxlength for text fields
+
+#my(@date_type)  = ( 'timestamp', '', ''     );
+my(@date_type)  = ( 'int', 'NULL', ''     );
+my(@perl_type) = ( 'long varchar', 'NULL', ''   ); 
+my(@money_type);
+if (datasrc =~ m/Pg/) { #Pg can't do decimal(10,2)
+  @money_type = ( 'money',   '', '' );
+} else {
+  @money_type = ( 'decimal',   '', '10,2' );
+}
+
+###
+# create a dbdef object from the old data structure
+###
+
+my(%tables)=&tables_hash_hack;
+
+#turn it into objects
+my($dbdef) = new FS::dbdef ( map {  
+  my(@columns);
+  while (@{$tables{$_}{'columns'}}) {
+    my($name,$type,$null,$length)=splice @{$tables{$_}{'columns'}}, 0, 4;
+    push @columns, new FS::dbdef_column ( $name,$type,$null,$length );
+  }
+  FS::dbdef_table->new(
+    $_,
+    $tables{$_}{'primary_key'},
+    #FS::dbdef_unique->new(@{$tables{$_}{'unique'}}),
+    #FS::dbdef_index->new(@{$tables{$_}{'index'}}),
+    FS::dbdef_unique->new($tables{$_}{'unique'}),
+    FS::dbdef_index->new($tables{$_}{'index'}),
+    @columns,
+  );
+} (keys %tables) );
+
+#add radius attributes to svc_acct
+
+my($svc_acct)=$dbdef->table('svc_acct');
+
+my($attribute);
+foreach $attribute (@attributes) {
+  $svc_acct->addcolumn ( new FS::dbdef_column (
+    'radius_'. $attribute,
+    'varchar',
+    'NULL',
+    $char_d,
+  ));
+}
+
+#make part_svc table (but now as object)
+
+my($part_svc)=$dbdef->table('part_svc');
+
+#because of svc_acct_pop
+#foreach (grep /^svc_/, $dbdef->tables) { 
+#foreach (qw(svc_acct svc_acct_sm svc_charge svc_domain svc_wo)) {
+foreach (qw(svc_acct svc_acct_sm svc_domain)) {
+  my($table)=$dbdef->table($_);
+  my($col);
+  foreach $col ( $table->columns ) {
+    next if $col =~ /^svcnum$/;
+    $part_svc->addcolumn( new FS::dbdef_column (
+      $table->name. '__' . $table->column($col)->name,
+      'varchar', #$table->column($col)->type, 
+      'NULL',
+      $char_d, #$table->column($col)->length,
+    ));
+    $part_svc->addcolumn ( new FS::dbdef_column (
+      $table->name. '__'. $table->column($col)->name . "_flag",
+      'char',
+      'NULL',
+      1,
+    ));
+  }
+}
+
+#important
+$dbdef->save($dbdef_file);
+FS::Record::reload_dbdef;
+
+###
+# create 'em
+###
+
+my($dbh)=adminsuidsetup;
+
+#create tables
+$|=1;
+
+my($table);
+foreach  ($dbdef->tables) {
+  my($table)=$dbdef->table($_);
+  print "Creating $_...";
+
+  my($statement);
+
+  #create table
+  foreach $statement ($table->sql_create_table(datasrc)) {
+    #print $statement, "\n"; 
+    $dbh->do( $statement )
+      or die "CREATE error: ",$dbh->errstr, "\ndoing statement: $statement";
+  }
+
+  print "\n";
+}
+
+#not really sample data (and shouldn't default to US)
+
+#cust_main_county
+foreach ( qw(
+AL AK AS AZ AR CA CO CT DC DE FM FL GA GU HI ID IL IN IA KS KY LA
+ME MH MD MA MI MN MS MO MT NC ND NE NH NJ NM NV NY MP OH OK OR PA PW PR RI 
+SC SD TN TX TT UT VT VI VA WA WV WI WY AE AA AP
+) ) {
+  my($cust_main_county)=create FS::cust_main_county({
+    'state' => $_,
+    'tax'   => 0,
+  });  
+  my($error);
+  $error=$cust_main_county->insert;
+  die $error if $error;
+}
+
+$dbh->disconnect or die $dbh->errstr;
+
+###
+# Now it becomes an object.  much better.
+###
+sub tables_hash_hack {
+
+  #note that s/(date|change)/_$1/; to avoid keyword conflict.
+  #put a kludge in FS::Record to catch this or? (pry need some date-handling
+  #stuff anyway also)
+
+  my(%tables)=( #yech.}
+
+    'agent' => {
+      'columns' => [
+        'agentnum', 'int',            '',     '',
+        'agent',    'varchar',           '',     $char_d,
+        'typenum',  'int',            '',     '',
+        'freq',     'smallint',       'NULL', '',
+        'prog',     @perl_type,
+      ],
+      'primary_key' => 'agentnum',
+      'unique' => [ [] ],
+      'index' => [ ['typenum'] ],
+    },
+
+    'agent_type' => {
+      'columns' => [
+        'typenum',   'int',  '', '',
+        'atype',     'varchar', '', $char_d,
+      ],
+      'primary_key' => 'typenum',
+      'unique' => [ [] ],
+      'index' => [ [] ],
+    },
+
+    'type_pkgs' => {
+      'columns' => [
+        'typenum',   'int',  '', '',
+        'pkgpart',   'int',  '', '',
+      ],
+      'primary_key' => '',
+      'unique' => [ ['typenum', 'pkgpart'] ],
+      'index' => [ ['typenum'] ],
+    },
+
+    'cust_bill' => {
+      'columns' => [
+        'invnum',    'int',  '', '',
+        'custnum',   'int',  '', '',
+        '_date',     @date_type,
+        'charged',   @money_type,
+        'owed',      @money_type,
+        'printed',   'int',  '', '',
+      ],
+      'primary_key' => 'invnum',
+      'unique' => [ [] ],
+      'index' => [ ['custnum'] ],
+    },
+
+    'cust_bill_pkg' => {
+      'columns' => [
+        'pkgnum',  'int', '', '',
+        'invnum',  'int', '', '',
+        'setup',   @money_type,
+        'recur',   @money_type,
+        'sdate',   @date_type,
+        'edate',   @date_type,
+      ],
+      'primary_key' => '',
+      'unique' => [ ['pkgnum', 'invnum'] ],
+      'index' => [ ['invnum'] ],
+    },
+
+    'cust_credit' => {
+      'columns' => [
+        'crednum',  'int', '', '',
+        'custnum',  'int', '', '',
+        '_date',    @date_type,
+        'amount',   @money_type,
+        'credited', @money_type,
+        'otaker',   'varchar', '', 8,
+        'reason',   'varchar', '', 255,
+      ],
+      'primary_key' => 'crednum',
+      'unique' => [ [] ],
+      'index' => [ ['custnum'] ],
+    },
+
+    'cust_main' => {
+      'columns' => [
+        'custnum',  'int',  '',     '',
+        'agentnum', 'int',  '',     '',
+        'last',     'varchar', '',     $char_d,
+        'first',    'varchar', '',     $char_d,
+        'ss',       'char', 'NULL', 11,
+        'company',  'varchar', 'NULL', $char_d,
+        'address1', 'varchar', '',     $char_d,
+        'address2', 'varchar', 'NULL', $char_d,
+        'city',     'varchar', '',     $char_d,
+        'county',   'varchar', 'NULL', $char_d,
+        'state',    'char', '',     2,
+        'zip',      'varchar', '',     10,
+        'country',  'char', '',     2,
+        'daytime',  'varchar', 'NULL', 20,
+        'night',    'varchar', 'NULL', 20,
+        'fax',      'varchar', 'NULL', 12,
+        'payby',    'char', '',     4,
+        'payinfo',  'varchar', 'NULL', 16,
+        'paydate',  @date_type,
+        'payname',  'varchar', 'NULL', $char_d,
+        'tax',      'char', 'NULL', 1,
+        'otaker',   'varchar', '',     8,
+        'refnum',   'int',  '',     '',
+      ],
+      'primary_key' => 'custnum',
+      'unique' => [ [] ],
+      #'index' => [ ['last'], ['company'] ],
+      'index' => [ ['last'], ],
+    },
+
+    'cust_main_county' => { #county+state are checked off the cust_main_county
+                            #table for validation and to provide a tax rate.
+                            #add country?
+      'columns' => [
+        'taxnum',   'int',   '',    '',
+        'state',    'char',  '',    2,  #two letters max in US... elsewhere?
+        'county',   'varchar',  '',    $char_d,
+        'tax',      'real',  '',    '', #tax %
+      ],
+      'primary_key' => 'taxnum',
+      'unique' => [ [] ],
+  #    'unique' => [ ['taxnum'], ['state', 'county'] ],
+      'index' => [ [] ],
+    },
+
+    'cust_pay' => {
+      'columns' => [
+        'paynum',   'int',    '',   '',
+        'invnum',   'int',    '',   '',
+        'paid',     @money_type,
+        '_date',    @date_type,
+        'payby',    'char',   '',     4, # CARD/BILL/COMP, should be index into
+                                         # payment type table.
+        'payinfo',  'varchar',   'NULL', 16,  #see cust_main above
+        'paybatch', 'varchar',   'NULL', $char_d, #for auditing purposes.
+      ],
+      'primary_key' => 'paynum',
+      'unique' => [ [] ],
+      'index' => [ ['invnum'] ],
+    },
+
+    'cust_pay_batch' => { #what's this used for again?  list of customers
+                          #in current CARD batch? (necessarily CARD?)
+      'columns' => [
+        'invnum',   'int',    '',   '',
+        'custnum',   'int',    '',   '',
+        'last',     'varchar', '',     $char_d,
+        'first',    'varchar', '',     $char_d,
+        'address1', 'varchar', '',     $char_d,
+        'address2', 'varchar', 'NULL', $char_d,
+        'city',     'varchar', '',     $char_d,
+        'state',    'char', '',     2,
+        'zip',      'varchar', '',     10,
+        'country',  'char', '',     2,
+        'trancode', 'TINYINT', '', '',
+        'cardnum',  'varchar', '',     16,
+        'exp',      @date_type,
+        'payname',  'varchar', 'NULL', $char_d,
+        'amount',   @money_type,
+      ],
+      'primary_key' => '',
+      'unique' => [ [] ],
+      'index' => [ ['invnum'], ['custnum'] ],
+    },
+
+    'cust_pkg' => {
+      'columns' => [
+        'pkgnum',    'int',    '',   '',
+        'custnum',   'int',    '',   '',
+        'pkgpart',   'int',    '',   '',
+        'otaker',    'varchar', '', 8,
+        'setup',     @date_type,
+        'bill',      @date_type,
+        'susp',      @date_type,
+        'cancel',    @date_type,
+        'expire',    @date_type,
+      ],
+      'primary_key' => 'pkgnum',
+      'unique' => [ [] ],
+      'index' => [ ['custnum'] ],
+    },
+
+    'cust_refund' => {
+      'columns' => [
+        'refundnum',    'int',    '',   '',
+        'crednum',      'int',    '',   '',
+        '_date',        @date_type,
+        'refund',       @money_type,
+        'otaker',       'varchar',   '',   8,
+        'reason',       'varchar',   '',   $char_d,
+        'payby',        'char',   '',     4, # CARD/BILL/COMP, should be index
+                                             # into payment type table.
+        'payinfo',      'varchar',   'NULL', 16,  #see cust_main above
+      ],
+      'primary_key' => 'refundnum',
+      'unique' => [ [] ],
+      'index' => [ ['crednum'] ],
+    },
+
+    'cust_svc' => {
+      'columns' => [
+        'svcnum',    'int',    '',   '',
+        'pkgnum',    'int',    '',   '',
+        'svcpart',   'int',    '',   '',
+      ],
+      'primary_key' => 'svcnum',
+      'unique' => [ [] ],
+      'index' => [ ['svcnum'], ['pkgnum'], ['svcpart'] ],
+    },
+
+    'part_pkg' => {
+      'columns' => [
+        'pkgpart',    'int',    '',   '',
+        'pkg',        'varchar',   '',   $char_d,
+        'comment',    'varchar',   '',   $char_d,
+        'setup',      @perl_type,
+        'freq',       'smallint', '', '',  #billing frequency (months)
+        'recur',      @perl_type,
+      ],
+      'primary_key' => 'pkgpart',
+      'unique' => [ [] ],
+      'index' => [ [] ],
+    },
+
+    'pkg_svc' => {
+      'columns' => [
+        'pkgpart',    'int',    '',   '',
+        'svcpart',    'int',    '',   '',
+        'quantity',   'int',    '',   '',
+      ],
+      'primary_key' => '',
+      'unique' => [ ['pkgpart', 'svcpart'] ],
+      'index' => [ ['pkgpart'] ],
+    },
+
+    'part_referral' => {
+      'columns' => [
+        'refnum',   'int',    '',   '',
+        'referral', 'varchar',   '',   $char_d,
+      ],
+      'primary_key' => 'refnum',
+      'unique' => [ [] ],
+      'index' => [ [] ],
+    },
+
+    'part_svc' => {
+      'columns' => [
+        'svcpart',    'int',    '',   '',
+        'svc',        'varchar',   '',   $char_d,
+        'svcdb',      'varchar',   '',   $char_d,
+      ],
+      'primary_key' => 'svcpart',
+      'unique' => [ [] ],
+      'index' => [ [] ],
+    },
+
+    #(this should be renamed to part_pop)
+    'svc_acct_pop' => {
+      'columns' => [
+        'popnum',    'int',    '',   '',
+        'city',      'varchar',   '',   $char_d,
+        'state',     'char',   '',   2,
+        'ac',        'char',   '',   3,
+        'exch',      'char',   '',   3,
+        #rest o' number?
+      ],
+      'primary_key' => 'popnum',
+      'unique' => [ [] ],
+      'index' => [ [] ],
+    },
+
+    'svc_acct' => {
+      'columns' => [
+        'svcnum',    'int',    '',   '',
+        'username',  'varchar',   '',   $username_len, #unique (& remove dup code)
+        '_password', 'varchar',   '',   25, #13 for encryped pw's plus ' *SUSPENDED*
+        'popnum',    'int',    'NULL',   '',
+        'uid',       'bigint', 'NULL',   '',
+        'gid',       'bigint', 'NULL',   '',
+        'finger',    'varchar',   'NULL',   $char_d,
+        'dir',       'varchar',   'NULL',   $char_d,
+        'shell',     'varchar',   'NULL',   $char_d,
+        'quota',     'varchar',   'NULL',   $char_d,
+        'slipip',    'varchar',   'NULL',   15, #four TINYINTs, bah.
+      ],
+      'primary_key' => 'svcnum',
+      'unique' => [ [] ],
+      'index' => [ ['username'] ],
+    },
+
+    'svc_acct_sm' => {
+      'columns' => [
+        'svcnum',    'int',    '',   '',
+        'domsvc',    'int',    '',   '',
+        'domuid',    'bigint', '',   '',
+        'domuser',   'varchar',   '',   $char_d,
+      ],
+      'primary_key' => 'svcnum',
+      'unique' => [ [] ],
+      'index' => [ ['domsvc'], ['domuid'] ], 
+    },
+
+    #'svc_charge' => {
+    #  'columns' => [
+    #    'svcnum',    'int',    '',   '',
+    #    'amount',    @money_type,
+    #  ],
+    #  'primary_key' => 'svcnum',
+    #  'unique' => [ [] ],
+    #  'index' => [ [] ],
+    #},
+
+    'svc_domain' => {
+      'columns' => [
+        'svcnum',    'int',    '',   '',
+        'domain',    'varchar',    '',   $char_d,
+      ],
+      'primary_key' => 'svcnum',
+      'unique' => [ ['domain'] ],
+      'index' => [ [] ],
+    },
+
+    #'svc_wo' => {
+    #  'columns' => [
+    #    'svcnum',    'int',    '',   '',
+    #    'svcnum',    'int',    '',   '',
+    #    'svcnum',    'int',    '',   '',
+    #    'worker',    'varchar',   '',   $char_d,
+    #    '_date',     @date_type,
+    #  ],
+    #  'primary_key' => 'svcnum',
+    #  'unique' => [ [] ],
+    #  'index' => [ [] ],
+    #},
+
+  );
+
+  %tables;
+
+}
+
diff --git a/site_perl/Conf.pm b/site_perl/Conf.pm
new file mode 100644
index 000000000..d3ef307c0
--- /dev/null
+++ b/site_perl/Conf.pm
@@ -0,0 +1,113 @@
+package FS::Conf;
+
+use vars qw($default_dir);
+use IO::File;
+
+$default_dir='/var/spool/freeside/conf';
+
+=head1 NAME
+
+FS::Conf - Read access to Freeside configuration values
+
+=head1 SYNOPSIS
+
+  use FS::Conf;
+
+  $conf = new FS::Conf;
+  $conf = new FS::Conf "/non/standard/config/directory";
+
+  $dir = $conf->dir;
+
+  $value = $conf->config('key');
+  @list  = $conf->config('key');
+  $bool  = $conf->exists('key');
+
+=head1 DESCRIPTION
+
+Read access to Freeside configuration values.  Keys currently map to filenames,
+but this may change in the future.
+
+=head1 METHODS
+
+=over 4
+
+=item new [ DIRECTORY ]
+
+Create a new configuration object.  Optionally, a non-default directory may
+be specified.
+
+=cut
+
+sub new {
+  my($proto,$dir) = @_;
+  my($class) = ref($proto) || $proto;
+  my($self) = { 'dir' => $dir || $default_dir } ;
+  bless ($self, $class);
+}
+
+=item dir
+
+Returns the directory.
+
+=cut
+
+sub dir {
+  my($self) = @_;
+  $self->{dir};
+}
+
+=item config 
+
+Returns the configuration value or values (depending on context) for key.
+
+=cut
+
+sub config {
+  my($self,$file)=@_;
+  my($dir)=$self->dir;
+  my $fh = new IO::File "<$dir/$file" or return;
+  if ( wantarray ) {
+    map {
+      /^(.*)$/ or die "Illegal line in $dir/$file:\n$_\n";
+      $1;
+    } <$fh>;
+  } else {
+    <$fh> =~ /^(.*)$/ or die "Illegal line in $dir/$file:\n$_\n";
+    $1;
+  }
+}
+
+=item exists
+
+Returns true if the specified key exists, even if the corresponding value
+is undefined.
+
+=cut
+
+sub exists {
+  my($self,$file)=@_;
+  my($dir) = $self->dir;
+  -e "$dir/$file";
+}
+
+=back
+
+=head1 BUGS
+
+The option to specify a non-default directory should probably be removed.
+
+Write access (with locking) should be implemented.
+
+=head1 SEE ALSO
+
+config.html from the base documentation contains a list of configuration files.
+
+=head1 HISTORY
+
+Ivan Kohler <ivan@sisd.com> 98-sep-6
+
+sub exists forgot to fetch $dir ivan@sisd.com 98-sep-27
+
+=cut
+
+1;
diff --git a/site_perl/Invoice.pm b/site_perl/Invoice.pm
new file mode 100644
index 000000000..5eb596fad
--- /dev/null
+++ b/site_perl/Invoice.pm
@@ -0,0 +1,45 @@
+package FS::Invoice;
+
+use strict;
+use vars qw(@ISA);
+use FS::cust_bill;
+
+@ISA = qw(FS::cust_bill);
+
+#warn "FS::Invoice depriciated\n";
+
+=head1 NAME
+
+FS::Invoice - Legacy stub
+
+=head1 SYNOPSIS
+
+The functioanlity of FS::invoice has been integrated in FS::cust_bill.
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jun-25 - 27
+
+maybe should be changed to be OO-functions on $cust_bill objects?
+(instead of passing invnum, ugh).
+
+ISA cust_bill and return inovice instead of passing filehandle
+ivan@sisd.com 98-mar-13
+ 
+(add postscript output!)
+
+close our kid when we're done ivan@sisd.com 98-jun-4
+
+separated code which shuffled data from code which formatted.
+(so i could) fixed past due notices showing up when balance due =< 0
+return address comes from /var/spool/freeside/conf/address
+ivan@sisd.com 98-jul-2
+
+pod ivan@sisd.com 98-sep-20something
+
+s/ISA/@ISA/ in use vars ivan@sisd.com 98-sep-27
+
+=cut
+
+1;
+
diff --git a/site_perl/Record.pm b/site_perl/Record.pm
new file mode 100644
index 000000000..9b308508a
--- /dev/null
+++ b/site_perl/Record.pm
@@ -0,0 +1,868 @@
+package FS::Record;
+
+use strict;
+use vars qw($dbdef_file $dbdef $setup_hack $AUTOLOAD @ISA @EXPORT_OK);
+use subs qw(reload_dbdef);
+use Exporter;
+use Carp;
+use File::CounterFile;
+use FS::UID qw(dbh checkruid swapuid getotaker datasrc);
+use FS::dbdef;
+
+@ISA = qw(Exporter);
+@EXPORT_OK = qw(dbh fields hfields qsearch qsearchs dbdef);
+
+$File::CounterFile::DEFAULT_DIR = "/var/spool/freeside/counters" ;
+
+$dbdef_file = "/var/spool/freeside/dbdef.". datasrc;
+
+reload_dbdef unless $setup_hack;
+
+=head1 NAME
+
+FS::Record - Database record objects
+
+=head1 SYNOPSIS
+
+    use FS::Record;
+    use FS::Record qw(dbh fields hfields qsearch qsearchs dbdef);
+
+    $record = new FS::Record 'table', \%hash;
+    $record = new FS::Record 'table', { 'column' => 'value', ... };
+
+    $record  = qsearchs FS::Record 'table', \%hash;
+    $record  = qsearchs FS::Record 'table', { 'column' => 'value', ... };
+    @records = qsearch  FS::Record 'table', \%hash; 
+    @records = qsearch  FS::Record 'table', { 'column' => 'value', ... };
+
+    $table = $record->table;
+    $dbdef_table = $record->dbdef_table;
+
+    $value = $record->get('column');
+    $value = $record->getfield('column');
+    $value = $record->column;
+
+    $record->set( 'column' => 'value' );
+    $record->setfield( 'column' => 'value' );
+    $record->column('value');
+
+    %hash = $record->hash;
+
+    $hashref = $record->hashref;
+
+    $error = $record->add;
+
+    $error = $record->del;
+
+    $error = $new_record->rep($old_record);
+
+    $value = $record->unique('column');
+
+    $value = $record->ut_float('column');
+    $value = $record->ut_number('column');
+    $value = $record->ut_numbern('column');
+    $value = $record->ut_money('column');
+    $value = $record->ut_text('column');
+    $value = $record->ut_textn('column');
+    $value = $record->ut_alpha('column');
+    $value = $record->ut_alphan('column');
+    $value = $record->ut_phonen('column');
+    $value = $record->ut_anythingn('column');
+
+    $dbdef = reload_dbdef;
+    $dbdef = reload_dbdef "/non/standard/filename";
+    $dbdef = dbdef;
+
+    $quoted_value = _quote($value,'table','field');
+
+    #depriciated
+    $fields = hfields('table');
+    if ( $fields->{Field} ) { # etc.
+
+    @fields = fields 'table';
+
+
+=head1 DESCRIPTION
+
+(Mostly) object-oriented interface to database records.  Records are currently
+implemented on top of DBI.  FS::Record is intended as a base class for
+table-specific classes to inherit from, i.e. FS::cust_main.
+
+=head1 METHODS
+
+=over 4
+
+=item new TABLE, HASHREF
+
+Creates a new record.  It doesn't store it in the database, though.  See
+L<"add"> for that.
+
+Note that the object stores this hash reference, not a distinct copy of the
+hash it points to.  You can ask the object for a copy with the I<hash> 
+method.
+
+=cut
+
+sub new { 
+  my($proto,$table,$hashref) = @_;
+  confess "Second arguement to FS::Record->new is not a HASH ref: ",
+          ref($hashref), " ", $hashref, "\n"
+    unless ref($hashref) eq 'HASH'; #bad practice?
+
+  #check to make sure $table exists? (ask dbdef)
+
+  foreach my $field ( FS::Record::fields $table ) { 
+     $hashref->{$field}='' unless defined $hashref->{$field};
+  }
+
+  # mySQL must rtrim the inbound text strings or store them z-terminated
+  # I simulate this for Postgres below
+  # Turned off in favor of ChopBlanks in UID.pm (see man DBI)
+  #if (datasrc =~ m/Pg/)
+  #{
+  #  foreach my $index (keys %$hashref)
+  #  {
+  #    $$hashref{$index} = unpack("A255", $$hashref{$index})
+  #	if ($$hashref{$index} =~ m/ $/) ;
+  #  }
+  #}
+
+  foreach my $column (keys %{$hashref}) {
+    #trim the '$' from money fields for Pg (beong HERE?)
+    #(what about Pg i18n?)
+    if ( datasrc =~ m/Pg/ 
+         && $dbdef->table($table)->column($column)->type eq 'money' ) {
+      ${$hashref}{$column} =~ s/^\$//;
+    }
+    #foreach my $column ( grep $dbdef->table($table)->column($_)->type eq 'money', keys %{$hashref} ) {
+    #  ${$hashref}{$column} =~ s/^\$//;
+    #}
+  }
+
+  my $class = ref($proto) || $proto;
+  my $self = { 'Table' => $table,
+               'Hash' => $hashref,
+             };
+
+  bless ($self, $class);
+
+}
+
+=item qsearch TABLE, HASHREF
+
+Searches the database for all records matching (at least) the key/value pairs
+in HASHREF.  Returns all the records found as FS::Record objects.
+
+=cut
+
+# Usage: @records = &FS::Search::qsearch($table,\%hash);
+# Each element of @records is a FS::Record object.
+sub qsearch {
+  my($table,$record) = @_;
+  my($dbh) = dbh;
+
+  my(@fields)=grep exists($record->{$_}), fields($table);
+
+  my($sth);
+  my($statement) = "SELECT * FROM $table". ( @fields
+    ? " WHERE ". join(' AND ',
+        map("$_ = ". _quote($record->{$_},$table,$_), @fields)
+      )
+    : ''
+  );
+  $sth=$dbh->prepare($statement)
+    or croak $dbh->errstr; #is that a little too harsh?  hmm.
+
+  map {
+    new FS::Record ($table,$sth->fetchrow_hashref);
+  } ( 1 .. $sth->execute );
+
+}
+
+=item qsearchs TABLE, HASHREF
+
+Searches the database for a record matching (at least) the key/value pairs
+in HASHREF, and returns the record found as an FS::Record object.  If more than
+one record matches, it B<carp>s but returns the first.  If this happens, you
+either made a logic error in asking for a single item, or your data is
+corrupted.
+
+=cut
+
+sub qsearchs { # $result_record = &FS::Record:qsearchs('table',\%hash);
+  my(@result) = qsearch(@_);
+  carp "Multiple records in scalar search!" if scalar(@result) > 1;
+    #should warn more vehemently if the search was on a primary key?
+  $result[0];
+}
+
+=item table
+
+Returns the table name.
+
+=cut
+
+sub table {
+  my($self) = @_;
+  $self -> {'Table'};
+}
+
+=item dbdef_table
+
+Returns the FS::dbdef_table object for the table.
+
+=cut
+
+sub dbdef_table {
+  my($self)=@_;
+  my($table)=$self->table;
+  $dbdef->table($table);
+}
+
+=item get, getfield COLUMN
+
+Returns the value of the column/field/key COLUMN.
+
+=cut
+
+sub get {
+  my($self,$field) = @_;
+  # to avoid "Use of unitialized value" errors
+  if ( defined ( $self->{Hash}->{$field} ) ) {
+    $self->{Hash}->{$field};
+  } else { 
+    '';
+  }
+}
+sub getfield {
+  get(@_);
+}
+
+=item set, setfield COLUMN, VALUE
+
+Sets the value of the column/field/key COLUMN to VALUE.  Returns VALUE.
+
+=cut
+
+sub set { 
+  my($self,$field,$value) = @_;
+  $self->{'Hash'}->{$field} = $value;
+}
+sub setfield {
+  set(@_);
+}
+
+=item AUTLOADED METHODS
+
+$record->column is a synonym for $record->get('column');
+
+$record->column('value') is a synonym for $record->set('column','value');
+
+=cut
+
+sub AUTOLOAD {
+  my($self,$value)=@_;
+  my($field)=$AUTOLOAD;
+  $field =~ s/.*://;
+  if ( defined($value) ) {
+    $self->setfield($field,$value);
+  } else {
+    $self->getfield($field);
+  }    
+}
+
+=item hash
+
+Returns a list of the column/value pairs, usually for assigning to a new hash.
+
+To make a distinct duplicate of an FS::Record object, you can do:
+
+    $new = new FS::Record ( $old->table, { $old->hash } );
+
+=cut
+
+sub hash {
+  my($self) = @_;
+  %{ $self->{'Hash'} }; 
+}
+
+=item hashref
+
+Returns a reference to the column/value hash.
+
+=cut
+
+sub hashref {
+  my($self) = @_;
+  $self->{'Hash'};
+}
+
+=item add
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub add {
+  my($self) = @_;
+  my($dbh)=dbh;
+  my($table)=$self->table;
+
+  #single-field unique keys are given a value if false
+  #(like MySQL's AUTO_INCREMENT)
+  foreach ( $dbdef->table($table)->unique->singles ) {
+    $self->unique($_) unless $self->getfield($_);
+  }
+  #and also the primary key
+  my($primary_key)=$dbdef->table($table)->primary_key;
+  $self->unique($primary_key) 
+    if $primary_key && ! $self->getfield($primary_key);
+
+  my (@fields) =
+    grep defined($self->getfield($_)) && $self->getfield($_) ne "",
+    fields($table)
+  ;
+
+  my($sth);
+  my($statement)="INSERT INTO $table ( ".
+      join(', ',@fields ).
+    ") VALUES (".
+      join(', ',map(_quote($self->getfield($_),$table,$_), @fields)).
+    ")"
+  ;
+  $sth = $dbh->prepare($statement) or return $dbh->errstr;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE'; 
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  $sth->execute or return $sth->errstr;
+
+  '';
+}
+
+=item del
+
+Delete this record from the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub del {
+  my($self) = @_;
+  my($dbh)=dbh;
+  my($table)=$self->table;
+
+  my($sth);
+  my($statement)="DELETE FROM $table WHERE ". join(' AND ',
+    map {
+      $self->getfield($_) eq ''
+        ? "$_ IS NULL"
+        : "$_ = ". _quote($self->getfield($_),$table,$_)
+    } ( $dbdef->table($table)->primary_key )
+          ? ($dbdef->table($table)->primary_key)
+          : fields($table)
+  );
+  $sth = $dbh->prepare($statement) or return $dbh->errstr;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE'; 
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  my($rc);
+  $rc=$sth->execute or return $sth->errstr;
+  #not portable #return "Record not found, statement:\n$statement" if $rc eq "0E0";
+
+  undef $self; #no need to keep object!
+
+  '';
+}
+
+=item rep OLD_RECORD
+
+Replace the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub rep {
+  my($new,$old)=@_;
+  my($dbh)=dbh;
+  my($table)=$old->table;
+  my(@fields)=fields($table);
+  my(@diff)=grep $new->getfield($_) ne $old->getfield($_), @fields;
+
+  if ( scalar(@diff) == 0 ) {
+    carp "Records identical";
+    return '';
+  }
+
+  return "Records not in same table!" unless $new->table eq $table;
+
+  my($sth);
+  my($statement)="UPDATE $table SET ". join(', ',
+    map {
+      "$_ = ". _quote($new->getfield($_),$table,$_) 
+    } @diff
+  ). ' WHERE '.
+    join(' AND ',
+      map {
+        $old->getfield($_) eq ''
+          ? "$_ IS NULL"
+          : "$_ = ". _quote($old->getfield($_),$table,$_)
+#      } @fields
+#      } ( primary_key($table) ? (primary_key($table)) : @fields )
+      } ( $dbdef->table($table)->primary_key 
+            ? ($dbdef->table($table)->primary_key)
+            : @fields
+        )
+    )
+  ;
+  #warn $statement;
+  $sth = $dbh->prepare($statement) or return $dbh->errstr;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE'; 
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  my($rc);
+  $rc=$sth->execute or return $sth->errstr;
+  #not portable #return "Record not found (or records identical)." if $rc eq "0E0";
+
+  '';
+
+}
+
+=item unique COLUMN
+
+Replaces COLUMN in record with a unique number.  Called by the B<add> method
+on primary keys and single-field unique columns (see L<FS::dbdef_table>).
+Returns the new value.
+
+=cut
+
+sub unique {
+  my($self,$field) = @_;
+  my($table)=$self->table;
+
+  croak("&FS::UID::checkruid failed") unless &checkruid;
+
+  croak "Unique called on field $field, but it is ",
+        $self->getfield($field),
+        ", not null!"
+    if $self->getfield($field);
+
+  #warn "table $table is tainted" if is_tainted($table);
+  #warn "field $field is tainted" if is_tainted($field);
+
+  &swapuid;
+  my($counter) = new File::CounterFile "$table.$field",0;
+# hack for web demo
+#  getotaker() =~ /^([\w\-]{1,16})$/ or die "Illegal CGI REMOTE_USER!";
+#  my($user)=$1;
+#  my($counter) = new File::CounterFile "$user/$table.$field",0;
+# endhack
+
+  my($index)=$counter->inc;
+  $index=$counter->inc
+    while qsearchs($table,{$field=>$index}); #just in case
+  &swapuid;
+
+  $index =~ /^(\d*)$/;
+  $index=$1;
+
+  $self->setfield($field,$index);
+
+}
+
+=item ut_float COLUMN
+
+Check/untaint floating point numeric data: 1.1, 1, 1.1e10, 1e10.  May not be
+null.  If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub ut_float {
+  my($self,$field)=@_ ;
+  ($self->getfield($field) =~ /^(\d+\.\d+)$/ ||
+   $self->getfield($field) =~ /^(\d+)$/ ||
+   $self->getfield($field) =~ /^(\d+\.\d+e\d+)$/ ||
+   $self->getfield($field) =~ /^(\d+e\d+)$/)
+    or return "Illegal or empty (float) $field!";
+  $self->setfield($field,$1);
+  '';
+}
+
+=item ut_number COLUMN
+
+Check/untaint simple numeric data (whole numbers).  May not be null.  If there
+is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub ut_number {
+  my($self,$field)=@_;
+  $self->getfield($field) =~ /^(\d+)$/
+    or return "Illegal or empty (numeric) $field!";
+  $self->setfield($field,$1);
+  '';
+}
+
+=item ut_numbern COLUMN
+
+Check/untaint simple numeric data (whole numbers).  May be null.  If there is
+an error, returns the error, otherwise returns false.
+
+=cut
+
+sub ut_numbern {
+  my($self,$field)=@_;
+  $self->getfield($field) =~ /^(\d*)$/
+    or return "Illegal (numeric) $field!";
+  $self->setfield($field,$1);
+  '';
+}
+
+=item ut_money COLUMN
+
+Check/untaint monetary numbers.  May be negative.  Set to 0 if null.  If there
+is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub ut_money {
+  my($self,$field)=@_;
+  $self->getfield($field) =~ /^(\-)? ?(\d*)(\.\d{2})?$/
+    or return "Illegal (money) $field!";
+  $self->setfield($field,"$1$2$3" || 0);
+  '';
+}
+
+=item ut_text COLUMN
+
+Check/untaint text.  Alphanumerics, spaces, and the following punctuation
+symbols are currently permitted: ! @ # $ % & ( ) - + ; : ' " , . ? /
+May not be null.  If there is an error, returns the error, otherwise returns
+false.
+
+=cut
+
+sub ut_text {
+  my($self,$field)=@_;
+  $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/]+)$/
+    or return "Illegal or empty (text) $field";
+  $self->setfield($field,$1);
+  '';
+}
+
+=item ut_textn COLUMN
+
+Check/untaint text.  Alphanumerics, spaces, and the following punctuation
+symbols are currently permitted: ! @ # $ % & ( ) - + ; : ' " , . ? /
+May be null.  If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub ut_textn {
+  my($self,$field)=@_;
+  $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/]*)$/
+    or return "Illegal (text) $field";
+  $self->setfield($field,$1);
+  '';
+}
+
+=item ut_alpha COLUMN
+
+Check/untaint alphanumeric strings (no spaces).  May not be null.  If there is
+an error, returns the error, otherwise returns false.
+
+=cut
+
+sub ut_alpha {
+  my($self,$field)=@_;
+  $self->getfield($field) =~ /^(\w+)$/
+    or return "Illegal or empty (alphanumeric) $field!";
+  $self->setfield($field,$1);
+  '';
+}
+
+=item ut_alpha COLUMN
+
+Check/untaint alphanumeric strings (no spaces).  May be null.  If there is an
+error, returns the error, otherwise returns false.
+
+=cut
+
+sub ut_alphan {
+  my($self,$field)=@_;
+  $self->getfield($field) =~ /^(\w*)$/ 
+    or return "Illegal (alphanumeric) $field!";
+  $self->setfield($field,$1);
+  '';
+}
+
+=item ut_phonen COLUMN
+
+Check/untaint phone numbers.  May be null.  If there is an error, returns
+the error, otherwise returns false.
+
+=cut
+
+sub ut_phonen {
+  my($self,$field)=@_;
+  my $phonen = $self->getfield($field);
+  if ( $phonen eq '' ) {
+    $self->setfield($field,'');
+  } else {
+    $phonen =~ s/\D//g;
+    $phonen =~ /^(\d{3})(\d{3})(\d{4})(\d*)$/
+      or return "Illegal (phone) $field!";
+    $phonen = "$1-$2-$3";
+    $phonen .= " x$4" if $4;
+    $self->setfield($field,$phonen);
+  }
+  '';
+}
+
+=item ut_anything COLUMN
+
+Untaints arbitrary data.  Be careful.
+
+=cut
+
+sub ut_anything {
+  my($self,$field)=@_;
+  $self->getfield($field) =~ /^(.*)$/ or return "Illegal $field!";
+  $self->setfield($field,$1);
+  '';
+}
+
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item reload_dbdef([FILENAME])
+
+Load a database definition (see L<FS::dbdef>), optionally from a non-default
+filename.  This command is executed at startup unless
+I<$FS::Record::setup_hack> is true.  Returns a FS::dbdef object.
+
+=cut
+
+sub reload_dbdef {
+  my $file = shift || $dbdef_file;
+  $dbdef = load FS::dbdef ($file);
+}
+
+=item dbdef
+
+Returns the current database definition.  See L<FS::dbdef>.
+
+=cut
+
+sub dbdef { $dbdef; }
+
+=item _quote VALUE, TABLE, COLUMN
+
+This is an internal function used to construct SQL statements.  It returns
+VALUE DBI-quoted (see L<DBI/"quote">) unless VALUE is a number and the column
+type (see L<dbdef_column>) does not end in `char' or `binary'.
+
+=cut
+
+sub _quote {
+  my($value,$table,$field)=@_;
+  my($dbh)=dbh;
+  if ( $value =~ /^\d+(\.\d+)?$/ && 
+#       ! ( datatype($table,$field) =~ /^char/ ) 
+       ! ( $dbdef->table($table)->column($field)->type =~ /(char|binary)$/i ) 
+  ) {
+    $value;
+  } else {
+    $dbh->quote($value);
+  }
+}
+
+=item hfields TABLE
+
+This is depriciated.  Don't use it.
+
+It returns a hash-type list with the fields of this record's table set true.
+
+=cut
+
+sub hfields {
+  carp "hfields is depriciated";
+  my($table)=@_;
+  my(%hash);
+  foreach (fields($table)) {
+    $hash{$_}=1;
+  }
+  \%hash;
+}
+
+=item fields TABLE
+
+This returns a list of the columns in this record's table
+(See L<dbdef_table>).
+
+=cut
+
+# Usage: @fields = fields($table);
+sub fields {
+  my($table) = @_;
+  #my(@fields) = $dbdef->table($table)->columns;
+  croak "Usage: \@fields = fields(\$table)" unless $table;
+  my($table_obj) = $dbdef->table($table);
+  croak "Unknown table $table" unless $table_obj;
+  $table_obj->columns;
+}
+
+#sub _dump {
+#  my($self)=@_;
+#  join("\n", map {
+#    "$_: ". $self->getfield($_). "|"
+#  } (fields($self->table)) );
+#}
+
+#sub DESTROY {
+#  my $self = shift;
+#  #use Carp qw(cluck);
+#  #cluck "DESTROYING $self";
+#  warn "DESTROYING $self";
+#}
+
+#sub is_tainted {
+#             return ! eval { join('',@_), kill 0; 1; };
+#         }
+
+=back
+
+=head1 BUGS
+
+This module should probably be renamed, since much of the functionality is
+of general use.  It is not completely unlike Adapter::DBI (see below).
+
+Exported qsearch and qsearchs should be depriciated in favor of method calls
+(against an FS::Record object like the old search and searchs that qsearch
+and qsearchs were on top of.)
+
+The whole fields / hfields mess should be removed.
+
+The various WHERE clauses should be subroutined.
+
+table string should be depriciated in favor of FS::dbdef_table.
+
+No doubt we could benefit from a Tied hash.  Documenting how exists / defined
+true maps to the database (and WHERE clauses) would also help.
+
+The ut_ methods should ask the dbdef for a default length.
+
+ut_sqltype (like ut_varchar) should all be defined
+
+A fallback check method should be provided with uses the dbdef.
+
+The ut_money method assumes money has two decimal digits.
+
+The Pg money kludge in the new method only strips `$'.
+
+The ut_phonen method assumes US-style phone numbers.
+
+The _quote function should probably use ut_float instead of a regex.
+
+All the subroutines probably should be methods, here or elsewhere.
+
+=head1 SEE ALSO
+
+L<FS::dbdef>, L<FS::UID>, L<DBI>
+
+Adapter::DBI from Ch. 11 of Advanced Perl Programming by Sriram Srinivasan.
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jun-2 - 9, 19, 25, 27, 30
+
+DBI version
+ivan@sisd.com 97-nov-8 - 12
+
+cleaned up, added autoloaded $self->any_field calls, moved DBI login stuff
+to FS::UID
+ivan@sisd.com 97-nov-21-23
+
+since AUTO_INCREMENT is MySQL specific, use my own unique number generator
+(again)
+ivan@sisd.com 97-dec-4
+
+untaint $user in unique (web demo hack...bah)
+make unique skip multiple-field unique's from dbdef
+ivan@sisd.com 97-dec-11
+
+merge with FS::Search, which after all was just alternate constructors for
+FS::Record objects.  Makes lots of things cleaner.  :)
+ivan@sisd.com 97-dec-13
+
+use FS::dbdef::primary key in replace searches, hopefully for all practical 
+purposes the string/number problem in SQL statements should be gone?
+(SQL bites)
+ivan@sisd.com 98-jan-20
+
+Put all SQL statments in $statment before we $sth=$dbh->prepare( them,
+for debugging reasons (warn $statement) ivan@sisd.com 98-feb-19
+
+(sigh)... use dbdef type (char, etc.) instead of a regex to decide
+what to quote in _quote (more sillines...)  SQL bites.
+ivan@sisd.com 98-feb-20
+
+more friendly error messages ivan@sisd.com 98-mar-13
+
+Added import of datasrc from FS::UID to allow Pg6.3 to work
+Added code to right-trim strings read from Pg6.3 databases
+Modified 'add' to only insert fields that actually have data
+Added ut_float to handle floating point numbers (for sales tax).
+Pg6.3 does not have a "SHOW FIELDS" statement, so I faked it 8).
+	bmccane@maxbaud.net	98-apr-3
+
+commented out Pg wrapper around `` Modified 'add' to only insert fields that
+actually have data '' ivan@sisd.com 98-apr-16
+
+dbdef usage changes ivan@sisd.com 98-jun-1
+
+sub fields now asks dbdef, not database ivan@sisd.com 98-jun-2
+
+added debugging method ->_dump ivan@sisd.com 98-jun-16
+
+use FS::dbdef::primary key in delete searches as well as replace
+searches (SQL still bites) ivan@sisd.com 98-jun-22
+
+sub dbdef_table ivan@sisd.com 98-jun-28
+
+removed Pg wrapper around `` Modified 'add' to only insert fields that
+actually have data '' ivan@sisd.com 98-jul-14
+
+sub fields croaks on errors ivan@sisd.com 98-jul-17
+
+$rc eq '0E0' doesn't mean we couldn't delete for all rdbmss 
+ivan@sisd.com 98-jul-18
+
+commented out code to right-trim strings read from Pg6.3 databases;
+ChopBlanks is in UID.pm ivan@sisd.com 98-aug-16
+
+added code (with Pg wrapper) to deal with Pg money fields
+ivan@sisd.com 98-aug-18
+
+added pod documentation ivan@sisd.com 98-sep-6
+
+ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
+
+=cut
+
+1;
+
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From 9f922ba5ae0ac34d4aa2d2fcbca77d80d1618c11 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Oct 1998 07:19:11 +0000
Subject: Initial revision

---
 TODO                                  | 530 ++++++++++++++++++++++++++++++++++
 conf/address                          |   4 +
 conf/domain                           |   1 +
 conf/registries/internic/from         |   1 +
 conf/registries/internic/nameservers  |   3 +
 conf/registries/internic/tech_contact |   1 +
 conf/registries/internic/template     | 231 +++++++++++++++
 conf/registries/internic/to           |   1 +
 conf/secrets                          |   3 +
 conf/shells                           |   2 +
 conf/smtpmachine                      |   1 +
 11 files changed, 778 insertions(+)
 create mode 100644 TODO
 create mode 100644 conf/address
 create mode 100644 conf/domain
 create mode 100644 conf/registries/internic/from
 create mode 100644 conf/registries/internic/nameservers
 create mode 100644 conf/registries/internic/tech_contact
 create mode 100644 conf/registries/internic/template
 create mode 100644 conf/registries/internic/to
 create mode 100644 conf/secrets
 create mode 100644 conf/shells
 create mode 100644 conf/smtpmachine

diff --git a/TODO b/TODO
new file mode 100644
index 000000000..0171c3230
--- /dev/null
+++ b/TODO
@@ -0,0 +1,530 @@
+If you are interested in helping with any of these, please join the mailing
+list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
+duplication of effort.
+
+-- 1.1.x --
+
+postgres can't deal with NULL!
+
+svc_acct.import should recognize "UNIX" in the RADIUS password file as null.
+
+radius logfile parsing and perl expression check.
+
+mailing list archive, faq, cvs
+
+(test cust_main.pm with cybercash v2 and v3)
+
+Fix in cust_bill BUGS: 
+There is an off-by-one error in print_text which causes a visual error (Page 1
+of 2 printed on some single-page invoices).
+
+FIX It doesn't properly inherit/override FS::Record yet, so no more replace vs
+rep silliness!
+
+fields should be a method against a FS::Record or derived object, as well as
+being something you can call as FS::Record::fields('tablename').  Might
+even be able to handle both in the same routine (that would be neato).
+Get rid of hfields and other assorted silliness.
+Clean up hfields/sfields/fields crap.  yuck.
+
+$lpr in cust_main.pm (from Bill.pm) should become /var/spool/freeside/conf/lpr
+
+Override FS::Record new, add, rep and del (create, insert, replace and
+delete) in all derived classes.
+IE create, insert, delete and replace from derived classes should override new, 
+add, del and rep (respectively) from FS::Record.  Depriciate old names.
+
+Allow a cancelled/suspended/active status from packages to bubble up to
+the customer lists.  Put active, then suspended, then cancelled accounts.
+Similar ordering on the package listing inside a single customer.
+
+Add the ability for services to filter information up to the package level
+for invoices and web screens, so you can select a particlar package based
+on username or domain name, etc.
+
+You can't delete the stuff under administration yet.  Add this,
+_including_ making sure the thing you are deleting is not in use!
+
+Immediate removal of incorrectly entered check payments (can't take too
+long to do this, or accounting is fubared).
+
+Add code to move from one service to another (POP to SLIP/PPP, etc.).
+This _should_ be possible by working off the rules in part_svc rather than
+hardcoding anything in.  The rules in part_svc may need some elaboration,
+perhaps.
+
+Use ut_ FS::Record methods in all derived classes (possibly some from dbdef?... eventually all from dbdef??? - but then `dbdef-create' would be impossible as there would be metadata we couldn't ask the backend for.  hmm.)
+
+(bring back from fsold, ) Generalize config-sending stuff and make more configurable.
+Expand the HylaFAX interface (also possibly generalize for other fax
+softwar ie .comfaxe); allow things like arbitrary faxes of sales
+literature, specific troubleshooting documents and so on.  Maybe even
+allow users to do this (though that might not belong in Freeside).
+misc/sendconfig.cgi
+misc/process/sendconfig.cgi
+Configure fax recipients via a separate box rather than using the finger
+name or first+last from cust_main.
+
+move all phone number logic out of Freeside - let HylaFAX or whatever
+handle it.
+
+soundex searches for customer name and company?  where are free soundex tools? (standard Text::Soundex duh)
+
+should be able to link on (username, domain name, some field in email alias) instead of svcnum only. (username done, what else?)
+
+(done but clean up) change svc_domain.pm mail sending from a pipe to "/usr/lib/sendmail" to Mail::Mailer or Net::SMTP or something.  also is the complete text of the registration agreement needed in there (it used to be)?
+
+generalize and make configurable new invoice printing scheme in FS::Bill::collect (past due)
+
+deleting an svc_domain should delete all associated svc_acct_sm records.
+same with a svc_acct.
+
+periodic password encrypter
+
+Automated, configurable notification, suspension and cancellation of
+defunct accounts.
+...
+expire cron job
+...
+Allow for a future setup date on accounts.
+
+one-time/per-customer/? changes in rates and descriptions ('remembered
+invoices'): implement by creating a new package on the fly... but it isn't 
+associated with any agent types so it won't show up for other customers to buy.
+
+if CGI::Base will not have redirect fixed (cgifix.html), should migrate to
+CGI.pm insetead?  It is >1 year newer.
+
+library repetitve stuff from Bill.pm Invoice.pm and friends (calculating
+previous balances etc etc)
+
+
+sub AUTOLOAD in FS::Record should warn? die? if used with a non-existant column
+name?
+
+edit (not just import, export and allow default/fixed) arbitrary radius stuff
+in svc_acct
+
+edit/svc_acct.cgi and edit/process/svc_acct.cgi should deal with arbitrary radius stuff
+
+radius import should take DEFAULT entry and put it in /var/spool/freeside/conf/radius-default ; svc_acct.export should use it (and doc)
+
+FS::Invoice and FS::Bill should merge with the classes they're derived from
+
+in UI, s/State/State\/Provence/go and s/County/County\/Locality/go
+
+.us domains and others!
+
+what else (besides l10n) for i18n?
+
+audit htdocs/* for things that should be libraried and things that should be
+new methods on the objects (need to do this before implementing a new UI)
+all the big things are done
+
+some places we die() where we should &FS::CGI::idiot (and perhaps vice-versa).
+Decide based on whether or not the "error" should show up in logs.
+
+all .cgi's should use standard header/footer and idiot() subroutines.  maybe HTML:: perl modules
+for HTML creation.  CGI.pm instead.
+
+library the conf reading stuff; bin/svc_acct.export version with missing-filename checking is good
+library conf stuff -> check all the conf stuff to make sure they close filehandles.
+
+When running bin/bill, Fix this (Annoying but harmless):
+Use of uninitialized value at /usr/local/lib/site_perl/FS/cust_pkg.pm line 99, <ADDRESS> chunk 4.
+Use of uninitialized value at /usr/local/lib/site_perl/FS/cust_pkg.pm line 102, <ADDRESS> chunk 4.
+Use of uninitialized value at /usr/local/lib/site_perl/FS/cust_pkg.pm line 105, <ADDRESS> chunk 4.
+
+all cgi (but internal to the isp) places where package names are listed should also have
+comment (like agent_type)
+
+clean up $recref and other silliness and use -> calls where possible, or
+one other alternative.  clean up everything else.
+should FS::Record use Tie::Hash?  That would be very clean, but where do we
+store the other information?  Maybe you could ask any FS::Record object for a
+tied hash?
+
+change all htdocs/edit/process/* loops to look like: (library this sort of thing!!!!)
+
+my($new) = create FS::svc_acct_sm ( {
+  map {
+    ($_, scalar($req->param($_)));
+  } qw(svcnum pkgnum svcpart domuser domuid domsvc)
+} );
+
+to avoid form errors causing too much silliness
+
+add this code to all svc_*.pm (already in acct and acct_sm and domain): (library!)
+
+  #get part_svc
+  my($svcpart);
+  my($svcnum)=$self->getfield('svcnum');
+  if ($svcnum) {
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
+    return "Unknown svcnum" unless $cust_svc; 
+    $svcpart=$cust_svc->svcpart;
+  } else {
+    $svcpart=$self->getfield('svcpart');
+  }
+  my($part_svc)=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  return "Unkonwn svcpart" unless $part_svc;
+
+  #set fixed fields from part_svc
+  my($field);
+  foreach $field ( fields('svc_acct') ) {
+    if ( $part_svc->getfield('svc_acct__'. $field. '_flag') eq 'F' ) {
+      $self->setfield($field,$part_svc->getfield('svc_acct__'. $field) );
+    }
+  }
+
+change all file access from regular open(FILE,) stuff to OO, because of 
+problems scoping and passing filehandles like that.
+
+svc_domain.pm mail sending uses Date::Format which doesn't seem to pick up 
+correct timezone.
+
+view/svc_domain.cgi needs to know the domain might be unaudited (cosmetic)
+
+Check everything into CVS.
+
+--- 1.1.x or 1.2 or later
+
+the web interface should create a new object and use it instead of a blank
+form for new records.  the create method of svc_ objects should set defaults
+(from part_svc).
+
+sub check in man FS::table_name should be rewriteen.  Get rid of $recref
+stuff.  Make sure all fields that refer to other database are checked.
+
+Integration with signup disks (are there any free ones?  Netscape?).
+
+One-button cancel (+refund) for lusers who can't get online.
+
+Keep information on virtual web servers (hostname, IP, host machine,
+directory, etc.) and export this information for importation into the ISPs
+web farm. 
+
+Remove requirement that the first mail alias be the catchall?  Still make
+sure only one catchall per domain is defined in any case, of course. 
+
+Ability to move cust_pkg records from one customer to another? (proably
+will need to cancel the old and create a new like when we move services
+between packages). 
+
+Auto-increment expired cards one year, and try again?
+
+Lay out the forms a bit better.
+
+More non-US stuff - zip codes, country codes, foreign currencies, etc.
+
+cust_refund.{cgi.pm} need to do cards xaxtions.  (now we only have cust_credit)
+
+Nicer set of integrated reporting possibilities, like weekly sales totals
+by customer, package, agent, referral, etc., aging reports sorted by lots
+of different things, and so on.
+
+Client/server setup for users to modify their own passwords, shells, etc,
+via passwd or secure web interface (prelminary passwd/chfn/chsh
+replacement done).  Complicated by the fact that we don't want to allow
+incoming connections to the machine running Freeside, so we probably need
+to have a daemon on each external shell or web machine that is contacted
+by the Freeside machine.  Be very very careful for both traditional
+security issues and DoS problems. 
+
+An extension of the above to allow users to modify selected parts of their
+own information, order and cancel services.  A web interface for new
+customers.
+
+Expand domain name stuff to house all domain information.  Export
+named.boot/named.conf (primary and secondary) and named.{domain} files.
+Add more registries (not just InterNIC's com org net edu)
+
+Nice postscript paper invoices, rather than current ASCII invoices.
+
+
+think about race-condititions in FS::Record and derived ->check ->insert
+and so on, uid and username checks in svc_acct, etc.
+
+Move to rsync over ssh file exportation rather than scp.
+
+check 'n fix the proactive password checker. (cracklib?)
+
+refunds of "BILL" payments: generate pseudo-check.
+
+write batch senders and batch parsers for the different credit card processors
+people use/
+More CC processors/methods.
+
+In FS::Record, the counter dir should have .datasrc appended to it like the 
+dbdef does, which should place all the (most of) the DB metadata in unique 
+files and let me run concurrent .datasrc's.  Maybe do something similar for 
+user, password and datasrc itself? (or something to get the out of the source
+files) and then we're set. (secrets file also needs .datasrc appended, or maybe
+"/var/spool/freeside".datasrc
+
+you should be able to fiddle the setup date in cust_pkg. (at least initially)
+
+cych v3 and v2 support
+
+delete options in administration section
+
+write a generic batch senders and batch parsers.
+
+need a way to override svc_acct export on a per-machine basis; just use config files based on machine name i suppose; document that.
+
+you should be able to get column types as a method against an FS::Record object
+as well as dbdef->table($table)->column($column)->type
+
+move to perl module for fuzzy and soundex searching.
+
+make fs-setup option to add sample data so you can click on "New Customer" right away?  so people understand what this stuff is?
+
+package view needs to list extraneous services; we need to prevent the
+creation of them so this never happens (and mark it as such in the source)
+(the creation problem should be fixed - though they will still happen if people
+fsck around in the data manually, so list them anyway)
+
+add attribute dictionary to fs-setup as a menu, plus analyze users file to
+decide automatically
+
+Check for and report on duplicate billing accounts (cust_main, though many
+will have a need for these so probably don't disable them outright.)
+
+create a ->warn as well as a ->check method for all FS::table classes?
+(see above)
+
+something to automate making a release and updating the web demo
+
+export a debian-style (also redhat and?) /etc/group file aswell!
+
+seems to be an off-by-one error in the ascii invoice formatting which is saying
+"1 of 2" pages when there is only one.
+
+get rid of agrep?  needs the (non-free) glimpse distribution.  agrep used to
+be free?  what else can do fuzzy searching?
+
+site_perl/svc_domain.cgi (hmm... or maybe should have a button?  or maybe svc_domain.pm should handle this) should set $whois_hack for non-internic domains, so you can add them...
+
+svc_acct_sm.import qmail import should pull in recipientmap people too.
+
+.pm's like svc_acct.pm which need to do time-consuming things like ssh remotely
+should fork and do them in a child.
+
+i18n/l10n: take ALL messages and catalog them in english.txt or in database or something, so we can eventually go int'l.  int'l currency support would be a help aswell.
+
+get some of { city, county, state, zip } from the missing bits if
+possible (where can i get the data to do this?  usps.gov?)
+
+additional interfaces (perltk?  java?)
+
+Put the GPL notice in all files.
+
+-- 1.2 or later --
+
+$cust_bill->owed database field to be eliminated, replaced by a method call
+that calculates on the fly.  make sure to grep for ->(get|set)field('owed') 
+same for cust_credit->credited
+
+Export quota information.
+
+move all configuration to a central place.  maybe in blob's in the
+database.  maybe even things like the code to execute when a username is
+changed can be in there, so less of the distributed scripts change between
+different sites.
+
+Implement setup and recurring fees as Safe perl expressions rather than
+numbers, to allow for variable-rate services.  Backwards compatibility is
+obtained because { 43 } in perl is still 43.  :)  Define API to pass
+starting and ending dates and any other necessary data to expression
+(fees are currently evaluated as Safe expressions but more work needs to
+be done to define an opmask for various needs, write examples
+(usage-based billing, etc.) and so on).
+...
+Add the ability to modify the next billing date in cust_pkg, and take
+appropriate action.  This will allow the implementation of pro-rate/1st of
+the month billing as well as the ability to manually fiddle with
+anniversary dates in cust_pkg, so you can sync a customer's anniversary
+date even if you're using anniversary billing (manually or automatically).
+(now with above, we need to have a way to automatically pro-rate /^(\d+)$/
+charges - anything more complicated should figure it out itself given
+starting and ending dates [document that!])
+...
+Daily Radius log parsing into database; other logfile formats?
+...
+Callbacks to enforce hourly limits on accounts (suspend until the end of
+the billing period?), for those who limit customers rather than tack on
+extra charges.
+
+Flag packages (part_pkg) as taxable or non/taxable as some ISPs (for
+example) need to charge tax on equipment but not service (separate flags
+for setup and recurring fee... or perhaps a setup_tax, setup_notax,
+recur_tax and recur_notax fees, and possibly something more flexible if
+there is need).
+
+Allow for a variable number of invoices for customers who need multiple
+copies.
+
+Add a mail alias service with table svc_acct (not domain mail aliasing
+which is domain with svc_acct_sm)
+
+(bring back from fsold) Change customer comment field from its current kludge to something more
+workable.
+
+Better work orders with more information.  Should eventually open a ticket
+when we have such a thing.
+edit/svc_wo.cgi
+edit/process/svc_wo.cgi
+Call tracking and trouble tickets.
+
+use mod_perl and Apache::AuthDBI instead of mod_auth_mysql when we do local 
+users
+More accoutability for complimentary accounts: approval, expiration, term
+(no more than x months in advance) and notification.
+Flag particular users (or all users, for that matter) as having their
+passwords hidden and/or locked from users of Freeside (maybe need Freeside
+security levels first?). 
+...
+Better Freeside-level configurable access, for those ISP's who have
+employees they can't trust.  Right now you're "stuck" with setting up
+.htaccess stuff yourself.  This should really just be integrated. 
+
+update site_perl/table_template* (pry out of date)
+
+/var/spool/freeside/conf (and whatever else /var/spool/freeside we can)
+in database (except secrets), then web interface, 
+make /var/spool/freeside a configurable directory (probably as part of 
+some automated installation process?)
+
+add a table with column of export services (passwd, shadow, master.passwd, .qmail file update, dns update, etc.) and rows machine groups and whether or not to export that (and any necessary parameters).  wasn't matt (vunderkid, not matt@michweb) working on this?  find him?  each machine goes in a group of its own as well as a group based on function.  add a table with only svcpart and machine group.  now, when you import from each machine, it can get its own accounts with one svcpart and universal accounts with another svcpart.  (though that does make the username duplicate checking more interesting)
+
+password and slipip stuff in svc_acct.pm store need to be split into two fields or something, so the silliness in svc_acct.pm and svc_acct.export with looking at the data to decide what to do with it can be fixed (1.2)
+
+This requires some serious magic in FS::Record:
+ok, if date_type in fs-setup is to be something besides int,
+now we need to create wrappers
+for them so they behave identically across RDBMS's, ie date pops out as as
+UNIX timestamp (or an object of some sort? maybe even a blessed $obj which
+is a string not a hashref for backwards compatibility?) and so on. (remember
+to treat '0' as Not a Date instead of 1/1/70.
+
+Add Freeside-level transactions for RDBMS's which don't support
+transcations?  (Currently we assume a minimal RDBMS which has no rollback,
+transactions or atomic updates).  Or just require a RDBMS that supports
+rollback and/or atomic updates and get rid of the work-arounds?  The /rdb
+interface had this kludge on top of it but is a technical dead-end in most
+other ways, unless it can gain an SQL parser and DBD interface.
+
+Better automated comparison of our CC records with processors (CyberCash,
+at least, has not always had 100% accuracy, though recent versions are
+much better) 
+
+Expect or other pty based login check, where we actually connect to a
+terminal server or shell machine and test logging in as the user (if we
+are keeping a cleartext password for that user)  (This is something tech
+support often needs for new customers)
+
+Use cust_main table for pre-sales tracking as well?
+
+Automatic commision report and check generation via freq and prog (to
+become a Safe perl expression) fields in agent table, and possibly others.
+
+Database and add a mailed-out date and method for disk/CD mailing, so a
+customer can call and you can say, "sent on xx/xx/xx via {US Mail, Fedex,
+UPS, etc}" 
+
+Inventory tracking for physical items such as routers (for sale or
+lease... probably doesn't make a difference in the ordering... but if you
+cancel a router lease the inventory should come back.  hmm.)
+
+-- Matt's wishlist ---
+
+From matt@michweb.net Fri Feb 20 16:39:53 1998
+Date: Thu, 19 Feb 1998 23:20:11 -0500
+From: Matt Simerson <matt@michweb.net>
+Reply-To: quadran-developer@netgoth.com
+To: quadran-developer@netgoth.com
+Subject: Re: Welcome to quadran-developer
+
+>Whats it based on and what is it supposed to do?  I'm interested, but
+>unfortunatly, I don't have that much time to help on the project (I'm busily
+>working on one of my own based around MySQL and Qt right now -- don't know
+>if it will be GPL'ed or not yet -- we'll probably just use it in house since
+>it is designed around our system)...
+
+That's what I set out to find, but didn't find anything on the web site.
+I'm looking for something that will do the following:
+
+Single point of entry for users on a secure system:
+	Creates account on user (public) systems
+		update /etc/passwd/master.passwd file
+		update radius database (if necessary)
+	Set up up disk quotas (although I hacked adduser to do this)
+	Option for adding user to a mailing list(s)
+	Export of new user info to customizable report (for automated entry
+into
+		accounting software, etc...)
+
+Automated billing:
+	Export credit card info for batch processing and have hooks built
+		in for other forms of electronic processing.
+	Batch-Payment (apply payments from formatted text file).
+	Customizable reports for manual entry/importing into Accounting
+software
+	Email or laser print invoices
+	Sanity checks credit card numbers before processing (code available)
+
+Simple method for disabling an account.
+	Arbitrary Expiration Dates (on a given day, in x days)
+	Remove from radius.
+	Changing password to '*'
+	Virtual customers disabling dns, http server, log processing, etc..
+
+Billing for different account types:
+	Dialup monthly flat rate. Prorates for partial months.
+	Dialup monthly flat rate for x hours + hourly usage.
+	Dialup email only
+	Email only accounts
+	Virtual Web accounts - w/multiple mailboxes
+	Leased line accounts
+	Disk space used over quota.
+	Tech support minimum + hourly charges
+	Other for misc stuff (modem, RAM, etc...)
+
+Per user definable RADIUS attributes (ties in with above)
+	Fixed IP
+	Simultaneous Use
+	IP filters (for dialup email only)
+
+Keep logs of modem usage generated daily from radius accounting logs stored
+on multiple radius servers.
+
+Keep logs of disk usage generated from quota.
+
+Method of adding virtual domains to your system:
+	Automatically grabs an IP address from a preassigned pool.
+	Creates a domain.com database file from database fields
+	Updates /etc/named.conf or /etc/named.boot and reloads named.
+	Add's virtual.com to /etc/sendmail.cw or qmail control files.
+	Edits your web servers httpd.conf file and restarts http server.
+	An optional section for adding vif's can be added if the users OS
+		supports adding them on the fly. Otherwise it's up to the end
+		user. Make a hook that can run a custom script that the user
+		tweaks for his system.
+	Update or create the config file your web stats analyzer needs. I've
+		done this for analog (free) and http-analyze. Probably
+		should only officially support analog and let users hack
+		it to their hearts desire.
+I've already written scripts that do most of the virtual web stuff on my
+system...in bash. Shouldn't be hard for a perlmeister to convert. In fact,
+as long as all the info was stored in the database (username, domain name,
+and ip pool) this could easily just be run as an external script that the
+user tweaks to match his system.
+
+We use a great accounting software (M.Y.O.B) that does all the AP, AR,
+Payroll, Tax stuff, and most everything else we could need. It's already
+set up for the type of checks we have, etc, etc... I just need something to
+do the billing part. I can import/export sales and payments directly once
+the billing part is done. You can't write accounting software as good as
+M.Y.O.B. for $120.
+
+
diff --git a/conf/address b/conf/address
new file mode 100644
index 000000000..b8b6610a7
--- /dev/null
+++ b/conf/address
@@ -0,0 +1,4 @@
+Silicon Interactive Software Design
+119 Signal Hill Road
+Holland, PA  18966-2924
+
diff --git a/conf/domain b/conf/domain
new file mode 100644
index 000000000..b3cefaf74
--- /dev/null
+++ b/conf/domain
@@ -0,0 +1 @@
+domain.tld
diff --git a/conf/registries/internic/from b/conf/registries/internic/from
new file mode 100644
index 000000000..dc36ae760
--- /dev/null
+++ b/conf/registries/internic/from
@@ -0,0 +1 @@
+domreg@domain.tld
diff --git a/conf/registries/internic/nameservers b/conf/registries/internic/nameservers
new file mode 100644
index 000000000..e1aa999f5
--- /dev/null
+++ b/conf/registries/internic/nameservers
@@ -0,0 +1,3 @@
+192.168.1.1     ns1.domain.tld
+192.168.1.2     ns2.domain.tld
+192.168.1.3     ns3.domain.tld
diff --git a/conf/registries/internic/tech_contact b/conf/registries/internic/tech_contact
new file mode 100644
index 000000000..1e6fea0be
--- /dev/null
+++ b/conf/registries/internic/tech_contact
@@ -0,0 +1 @@
+A1
diff --git a/conf/registries/internic/template b/conf/registries/internic/template
new file mode 100644
index 000000000..8e4983ce2
--- /dev/null
+++ b/conf/registries/internic/template
@@ -0,0 +1,231 @@
+[ URL ftp://rs.internic.net/templates/domain-template.txt ] [ 03/98 ] 
+
+******* Please DO NOT REMOVE Version Number or Sections A-Q ********
+
+Domain Version Number: 4.0
+
+******* Email completed agreement to hostmaster@internic.net *******
+
+	NETWORK SOLUTIONS, INC.
+
+	DOMAIN NAME REGISTRATION AGREEMENT
+
+
+A.	Introduction. This domain name registration agreement
+("Registration Agreement") is submitted to NETWORK SOLUTIONS, INC.
+("NSI") for the purpose of applying for and registering a domain name
+on the Internet. If this Registration Agreement is accepted by NSI,
+and a domain name is registered in NSI's domain name database and
+assigned to the Registrant, Registrant ("Registrant") agrees to be
+bound by the terms of this Registration Agreement and the terms of
+NSI's Domain Name Dispute Policy ("Dispute Policy") which is
+incorporated herein by reference and made a part of this Registration
+Agreement. This Registration Agreement shall be accepted at the
+offices of NSI. 
+
+B. Fees and Payments.
+
+1) Registration or renewal (re-registration) date through March 31, 1998:
+Registrant agrees to pay a registration fee of One Hundred United States
+Dollars (US$100) as consideration for the registration of each new domain
+name or Fifty United States Dollars (US$50) to renew (re-register) an
+existing registration.
+2) Registration or renewal date on and after April 1, 1998:  Registrant
+agrees to pay a registration fee of Seventy United States Dollars (US$70) 
+as consideration for the registration of each new domain name or the 
+applicable renewal (re-registration) fee (currently Thirty-Five United 
+States Dollars (US$35)) at the time of renewal (re-registration).
+3) Period of Service:  The non-refundable fee covers a period of two (2)
+years for each new registration, and one (1) year for each renewal, 
+and includes any permitted modification(s) to the domain name record
+during the covered period.
+4) Payment:  Payment is due to Network Solutions within thirty (30) 
+days from the date of the invoice.
+
+C.	Dispute Policy. Registrant agrees, as a condition to
+submitting this Registration Agreement, and if the Registration
+Agreement is accepted by NSI, that the Registrant shall be bound by
+NSI's current Dispute Policy. The current version of the Dispute
+Policy may be found at the InterNIC Registration Services web site:
+"http://www.netsol.com/rs/dispute-policy.html". 
+
+D.	Dispute Policy Changes or Modifications. Registrant agrees
+that NSI, in its sole discretion, may change or modify the Dispute
+Policy, incorporated by reference herein, at any time. Registrant
+agrees that Registrant's maintaining the registration of a domain name
+after changes or modifications to the Dispute Policy become effective
+constitutes Registrant's continued acceptance of these changes or
+modifications. Registrant agrees that if Registrant considers any such
+changes or modifications to be unacceptable, Registrant may request
+that the domain name be deleted from the domain name database. 
+
+E.	Disputes. Registrant agrees that, if the registration of its
+domain name is challenged by any third party, the Registrant will be
+subject to the provisions specified in the Dispute Policy. 
+
+F.	Agents. Registrant agrees that if this Registration Agreement
+is completed by an agent for the Registrant, such as an ISP or
+Administrative Contact/Agent, the Registrant is nonetheless bound as a
+principal by all terms and conditions herein, including the Dispute
+Policy. 
+
+G.	Limitation of Liability. Registrant agrees that NSI shall have
+no liability to the Registrant for any loss Registrant may incur in
+connection with NSI's processing of this Registration Agreement, in
+connection with NSI's processing of any authorized modification to the
+domain name's record during the covered period, as a result of the
+Registrant's ISP's failure to pay either the initial registration fee
+or renewal fee, or as a result of the application of the provisions of
+the Dispute Policy. Registrant agrees that in no event shall the
+maximum liability of NSI under this Agreement for any matter exceed
+Five Hundred United States Dollars (US$500). 
+
+H.	Indemnity. Registrant agrees, in the event the Registration
+Agreement is accepted by NSI and a subsequent dispute arises with any
+third party, to indemnify and hold NSI harmless pursuant to the terms
+and conditions contained in the Dispute Policy. 
+
+I.	Breach. Registrant agrees that failure to abide by any
+provision of this Registration Agreement or the Dispute Policy may be
+considered by NSI to be a material breach and that NSI may provide a
+written notice, describing the breach, to the Registrant. If, within
+thirty (30) days of the date of mailing such notice, the Registrant
+fails to provide evidence, which is reasonably satisfactory to NSI,
+that it has not breached its obligations, then NSI may delete
+Registrant's registration of the domain name. Any such breach by a
+Registrant shall not be deemed to be excused simply because NSI did
+not act earlier in response to that, or any other, breach by the
+Registrant. 
+
+J.	No Guaranty. Registrant agrees that, by registration of a
+domain name, such registration does not confer immunity from objection
+to either the registration or use of the domain name. 
+
+K.	Warranty. Registrant warrants by submitting this Registration
+Agreement that, to the best of Registrant's knowledge and belief, the
+information submitted herein is true and correct, and that any future
+changes to this information will be provided to NSI in a timely manner
+according to the domain name modification procedures in place at that
+time. Breach of this warranty will constitute a material breach. 
+
+L.	Revocation. Registrant agrees that NSI may delete a
+Registrant's domain name if this Registration Agreement, or subsequent
+modification(s) thereto, contains false or misleading information, or
+conceals or omits any information NSI would likely consider material
+to its decision to approve this Registration Agreement. 
+
+M.	Right of Refusal. NSI, in its sole discretion, reserves the
+right to refuse to approve the Registration Agreement for any
+Registrant. Registrant agrees that the submission of this Registration
+Agreement does not obligate NSI to accept this Registration Agreement.
+Registrant agrees that NSI shall not be liable for loss or damages
+that may result from NSI's refusal to accept this Registration
+Agreement. 
+
+N.	Severability. Registrant agrees that the terms of this
+Registration Agreement are severable. If any term or provision is
+declared invalid, it shall not affect the remaining terms or
+provisions which shall continue to be binding. 
+
+O.	Entirety. Registrant agrees that this Registration Agreement
+and the Dispute Policy is the complete and exclusive agreement between
+Registrant and NSI regarding the registration of Registrant's domain
+name. This Registration Agreement and the Dispute Policy supersede all
+prior agreements and understandings, whether established by custom,
+practice, policy, or precedent. 
+
+P.	Governing Law. Registrant agrees that this Registration
+Agreement shall be governed in all respects by and construed in
+accordance with the laws of the Commonwealth of Virginia, United
+States of America. By submitting this Registration Agreement,
+Registrant consents to the exclusive jurisdiction and venue of the
+United States District Court for the Eastern District of Virginia,
+Alexandria Division. If there is no jurisdiction in the United States
+District Court for the Eastern District of Virginia, Alexandria
+Division, then jurisdiction shall be in the Circuit Court of Fairfax
+County, Fairfax, Virginia. 
+
+Q.	This is Domain Name Registration Agreement Version
+Number 4.0. This Registration Agreement is only for registrations
+under top-level domains: COM, ORG, NET, and EDU. By completing
+and submitting this Registration Agreement for consideration and
+acceptance by NSI, the Registrant agrees that he/she has read and
+agrees to be bound by A through P above. 
+
+
+Authorization
+0a.  (N)ew (M)odify (D)elete....:###action###
+0b.  Auth Scheme................: 
+0c.  Auth Info..................: 
+
+1.   Comments...................:###purpose###
+
+2.   Complete Domain Name.......:###domain###
+
+Organization Using Domain Name
+
+3a.  Organization Name..........:###company###
+###LOOP###
+3b.  Street Address.............:###address###
+###ENDLOOP###
+3c.  City.......................:###city###
+3d.  State......................:###state###
+3e.  Postal Code................:###zip###
+3f.  Country....................:###country###
+
+Administrative Contact
+4a.  NIC Handle (if known)......: 
+4b.  (I)ndividual (R)ole........:I
+4c.  Name (Last, First).........:###last###, ###first###
+4d.  Organization Name..........:###company###
+###LOOP###
+4e.  Street Address.............:###address###
+###ENDLOOP###
+4f.  City.......................:###city###
+4g.  State......................:###state###
+4h.  Postal Code................:###zip### 
+4i.  Country....................:###country###
+4j.  Phone Number...............:###daytime###
+4k.  Fax Number.................:###fax###
+4l.  E-Mailbox..................:###email###
+
+Technical Contact
+5a.  NIC Handle (if known)......:###tech_contact###
+5b.  (I)ndividual (R)ole........: 
+5c.  Name (Last, First).........: 
+5d.  Organization Name..........: 
+5e.  Street Address.............: 
+5f.  City.......................: 
+5g.  State......................: 
+5h.  Postal Code................: 
+5i.  Country....................: 
+5j.  Phone Number...............: 
+5k.  Fax Number.................: 
+5l.  E-Mailbox..................: 
+
+Billing Contact
+6a.  NIC Handle (if known)......: 
+6b.  (I)ndividual (R)ole........: 
+6c.  Name (Last, First).........: 
+6d.  Organization Name..........: 
+6e.  Street Address.............: 
+6f.  City.......................: 
+6g.  State......................:
+6h.  Postal Code................:
+6i.  Country....................:
+6j.  Phone Number...............:
+6k.  Fax Number.................: 
+6l.  E-Mailbox..................: 
+
+Prime Name Server
+7a.  Primary Server Hostname....:###primary###
+7b.  Primary Server Netaddress..:###primary_ip###
+
+Secondary Name Server(s)
+###LOOP###
+8a.  Secondary Server Hostname..:###secondary###
+8b.  Secondary Server Netaddress:###secondary_ip###
+###ENDLOOP###
+
+END OF AGREEMENT
+
diff --git a/conf/registries/internic/to b/conf/registries/internic/to
new file mode 100644
index 000000000..c80f93c57
--- /dev/null
+++ b/conf/registries/internic/to
@@ -0,0 +1 @@
+hostmaster@internic.net
diff --git a/conf/secrets b/conf/secrets
new file mode 100644
index 000000000..5843943ac
--- /dev/null
+++ b/conf/secrets
@@ -0,0 +1,3 @@
+DBI:mysql:freeside
+freeside
+put_your_password_here
diff --git a/conf/shells b/conf/shells
new file mode 100644
index 000000000..02d74f7fc
--- /dev/null
+++ b/conf/shells
@@ -0,0 +1,2 @@
+/bin/csh
+/bin/sh
diff --git a/conf/smtpmachine b/conf/smtpmachine
new file mode 100644
index 000000000..fa7963cc9
--- /dev/null
+++ b/conf/smtpmachine
@@ -0,0 +1 @@
+mail
-- 
cgit v1.2.1


From 80ba0c074354875c288c143721af08a0a5d02e42 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Oct 1998 07:19:13 +0000
Subject: Initial import into CVS

---
 conf/home | 1 +
 conf/lpr  | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 conf/home
 create mode 100644 conf/lpr

diff --git a/conf/home b/conf/home
new file mode 100644
index 000000000..05280cb02
--- /dev/null
+++ b/conf/home
@@ -0,0 +1 @@
+/home
diff --git a/conf/lpr b/conf/lpr
new file mode 100644
index 000000000..fa1c31315
--- /dev/null
+++ b/conf/lpr
@@ -0,0 +1 @@
+lpr -h
-- 
cgit v1.2.1


From 3d2b831027b88b277e1bf23f6621a98214723d06 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Oct 1998 08:59:22 +0000
Subject: Commiting sample change.

---
 TODO | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/TODO b/TODO
index 0171c3230..3b6dfa39a 100644
--- a/TODO
+++ b/TODO
@@ -4,6 +4,8 @@ duplication of effort.
 
 -- 1.1.x --
 
+figure out this cvs thing.  :)
+
 postgres can't deal with NULL!
 
 svc_acct.import should recognize "UNIX" in the RADIUS password file as null.
-- 
cgit v1.2.1


From f9debbc3e19cf0ba48461a2d99b38b8ac6a0b845 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Oct 1998 09:07:30 +0000
Subject: Test keyword substitution

---
 TODO | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/TODO b/TODO
index 3b6dfa39a..d44b17c68 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,5 @@
+$Id: TODO,v 1.3 1998-10-12 09:07:30 ivan Exp $
+
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
 duplication of effort.
-- 
cgit v1.2.1


From 005d5e42579ed3214489353fdd480177811da516 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Oct 1998 09:09:00 +0000
Subject: Id to Header

---
 TODO | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TODO b/TODO
index d44b17c68..79c903574 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.3 1998-10-12 09:07:30 ivan Exp $
+$Header: /home/cvs/cvsroot/freeside/Attic/TODO,v 1.4 1998-10-12 09:09:00 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
-- 
cgit v1.2.1


From 467b7543da64e11752070cbbbad387e34b46ea64 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Oct 1998 09:09:32 +0000
Subject: *** empty log message ***

---
 TODO | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 79c903574..8aa01cfe0 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Header: /home/cvs/cvsroot/freeside/Attic/TODO,v 1.4 1998-10-12 09:09:00 ivan Exp $
+$Id: TODO,v 1.5 1998-10-12 09:09:32 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
-- 
cgit v1.2.1


From b5e836b011ce996df3edb3efca3e3f197dc49092 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Oct 1998 09:12:29 +0000
Subject: remove adding cvs from the todo

---
 TODO | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/TODO b/TODO
index 8aa01cfe0..07f6b5e50 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.5 1998-10-12 09:09:32 ivan Exp $
+$Id: TODO,v 1.6 1998-10-12 09:12:29 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,15 +6,13 @@ duplication of effort.
 
 -- 1.1.x --
 
-figure out this cvs thing.  :)
-
 postgres can't deal with NULL!
 
 svc_acct.import should recognize "UNIX" in the RADIUS password file as null.
 
 radius logfile parsing and perl expression check.
 
-mailing list archive, faq, cvs
+mailing list archive, faq
 
 (test cust_main.pm with cybercash v2 and v3)
 
@@ -189,8 +187,6 @@ correct timezone.
 
 view/svc_domain.cgi needs to know the domain might be unaudited (cosmetic)
 
-Check everything into CVS.
-
 --- 1.1.x or 1.2 or later
 
 the web interface should create a new object and use it instead of a blank
-- 
cgit v1.2.1


From f0600c721e4f33ae9aa97453e71fba8aaa076d31 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Oct 1998 21:15:28 +0000
Subject: *** empty log message ***

---
 TODO | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 07f6b5e50..63dae2b48 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.6 1998-10-12 09:12:29 ivan Exp $
+$Id: TODO,v 1.7 1998-10-12 21:15:28 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,8 @@ duplication of effort.
 
 -- 1.1.x --
 
+one-off package edits!
+
 postgres can't deal with NULL!
 
 svc_acct.import should recognize "UNIX" in the RADIUS password file as null.
-- 
cgit v1.2.1


From 0e0e1020a163c280eb0471532e77663cbca83e9f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Oct 1998 21:22:59 +0000
Subject: *** empty log message ***

---
 TODO | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/TODO b/TODO
index 63dae2b48..9222c821c 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.7 1998-10-12 21:15:28 ivan Exp $
+$Id: TODO,v 1.8 1998-10-12 21:22:59 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,8 +6,6 @@ duplication of effort.
 
 -- 1.1.x --
 
-one-off package edits!
-
 postgres can't deal with NULL!
 
 svc_acct.import should recognize "UNIX" in the RADIUS password file as null.
@@ -323,6 +321,9 @@ Put the GPL notice in all files.
 
 -- 1.2 or later --
 
+one-off package edits! : need a cust_pkgs or cust_part_pkgs or something table,
+with custnum and partpkg (like type_pkgs)
+
 $cust_bill->owed database field to be eliminated, replaced by a method call
 that calculates on the fly.  make sure to grep for ->(get|set)field('owed') 
 same for cust_credit->credited
-- 
cgit v1.2.1


From 985d84813a195f343abaf7e33f08057efcb5cb10 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Oct 1998 23:40:28 +0000
Subject: added Pg-specific behaviour in sub line

---
 site_perl/dbdef_column.pm | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/site_perl/dbdef_column.pm b/site_perl/dbdef_column.pm
index 023b57d1f..06388c691 100644
--- a/site_perl/dbdef_column.pm
+++ b/site_perl/dbdef_column.pm
@@ -143,7 +143,13 @@ supported in the future.
 sub line {
   my($self,$datasrc)=@_;
   my($null)=$self->null;
-  $null ||= "NOT NULL" if $datasrc =~ /mysql/; #yucky mysql hack
+  if ( $datasrc =~ /mysql/ ) { #yucky mysql hack
+    $null ||= "NOT NULL"
+  }
+  if ( $datasrc =~ /Pg/ ) { #yucky Pg hack
+    $null ||= "NOT NULL";
+    $null =~ s/^NULL$//;
+  }
   join(' ',
     $self->name,
     $self->type. ( $self->length ? '('.$self->length.')' : '' ),
@@ -159,6 +165,10 @@ sub line {
 
 L<FS::dbdef_table>, L<FS::dbdef>, L<DBI>
 
+=head1 VERSION
+
+$Id: dbdef_column.pm,v 1.2 1998-10-12 23:40:28 ivan Exp $
+
 =head1 HISTORY
 
 class for dealing with column definitions
@@ -169,6 +179,11 @@ now methods can be used to get or set data ivan@sisd.com 98-may-11
 
 mySQL-specific hack for null (what should be default?) ivan@sisd.com 98-jun-2
 
+$Log: dbdef_column.pm,v $
+Revision 1.2  1998-10-12 23:40:28  ivan
+added Pg-specific behaviour in sub line
+
+
 =cut
 
 1;
-- 
cgit v1.2.1


From 123a59969f1c66c9f923a480badf9634d5349996 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 13 Oct 1998 09:17:20 +0000
Subject: *** empty log message ***

---
 TODO | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/TODO b/TODO
index 9222c821c..c82d5cb4e 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.8 1998-10-12 21:22:59 ivan Exp $
+$Id: TODO,v 1.9 1998-10-13 09:17:20 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,8 +6,6 @@ duplication of effort.
 
 -- 1.1.x --
 
-postgres can't deal with NULL!
-
 svc_acct.import should recognize "UNIX" in the RADIUS password file as null.
 
 radius logfile parsing and perl expression check.
-- 
cgit v1.2.1


From d4e9b3b0b80a25992fa7194464efa06deb484185 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 13 Oct 1998 12:07:51 +0000
Subject: Assigns password from the shadow file for RADIUS password "UNIX"

---
 TODO                | 4 +---
 bin/svc_acct.import | 8 ++++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/TODO b/TODO
index c82d5cb4e..56e78c270 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.9 1998-10-13 09:17:20 ivan Exp $
+$Id: TODO,v 1.10 1998-10-13 12:07:49 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,8 +6,6 @@ duplication of effort.
 
 -- 1.1.x --
 
-svc_acct.import should recognize "UNIX" in the RADIUS password file as null.
-
 radius logfile parsing and perl expression check.
 
 mailing list archive, faq
diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index c4b8c5ec5..60deac539 100755
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,5 +1,7 @@
 #!/usr/bin/perl -Tw
 #
+# $Id: svc_acct.import,v 1.2 1998-10-13 12:07:51 ivan Exp $
+#
 # ivan@sisd.com 98-mar-9
 #
 # changed 'password' field to '_password' because PgSQL 6.3 reserves this word
@@ -13,6 +15,11 @@
 # arbitrary radius attributes ivan@sisd.com 98-aug-9
 #
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
+#
+# $Log: svc_acct.import,v $
+# Revision 1.2  1998-10-13 12:07:51  ivan
+# Assigns password from the shadow file for RADIUS password "UNIX"
+#
 
 use strict;
 use vars qw(%part_svc);
@@ -122,6 +129,7 @@ while (<USERS>) {
       or die "1Unexpected line in users.import: $_";
     my($password,$expiration);
     ($username,$password,$expiration)=(lc($1),$2,$4);
+    $password = '' if $password eq 'UNIX';
     $upassword{$username}=$password;
     undef %param;
   } else {
-- 
cgit v1.2.1


From 11586a5995866292b90c669e4aaa2e68ef202a8e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 13 Oct 1998 12:49:50 +0000
Subject: *** empty log message ***

---
 TODO | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/TODO b/TODO
index 56e78c270..9e6f40130 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.10 1998-10-13 12:07:49 ivan Exp $
+$Id: TODO,v 1.11 1998-10-13 12:49:50 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -25,8 +25,6 @@ even be able to handle both in the same routine (that would be neato).
 Get rid of hfields and other assorted silliness.
 Clean up hfields/sfields/fields crap.  yuck.
 
-$lpr in cust_main.pm (from Bill.pm) should become /var/spool/freeside/conf/lpr
-
 Override FS::Record new, add, rep and del (create, insert, replace and
 delete) in all derived classes.
 IE create, insert, delete and replace from derived classes should override new, 
-- 
cgit v1.2.1


From 3232d3f822612b1c78db57a9fd1494cc6bc7494c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 13 Oct 1998 13:04:17 +0000
Subject: fixed doc to indicate Pg specific syntax too

---
 site_perl/dbdef_column.pm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/site_perl/dbdef_column.pm b/site_perl/dbdef_column.pm
index 06388c691..dc07305b8 100644
--- a/site_perl/dbdef_column.pm
+++ b/site_perl/dbdef_column.pm
@@ -134,9 +134,8 @@ sub length {
 
 Returns an SQL column definition.
 
-If passed a DBI $datasrc specifying L<DBD::mysql>, will use MySQL-specific
-syntax.  Non-standard syntax for other engines (if applicable) may also be
-supported in the future.
+If passed a DBI $datasrc specifying L<DBD::mysql> or L<DBD::Pg>, will use
+engine-specific syntax.
 
 =cut
 
@@ -167,7 +166,7 @@ L<FS::dbdef_table>, L<FS::dbdef>, L<DBI>
 
 =head1 VERSION
 
-$Id: dbdef_column.pm,v 1.2 1998-10-12 23:40:28 ivan Exp $
+$Id: dbdef_column.pm,v 1.3 1998-10-13 13:04:17 ivan Exp $
 
 =head1 HISTORY
 
@@ -180,7 +179,10 @@ now methods can be used to get or set data ivan@sisd.com 98-may-11
 mySQL-specific hack for null (what should be default?) ivan@sisd.com 98-jun-2
 
 $Log: dbdef_column.pm,v $
-Revision 1.2  1998-10-12 23:40:28  ivan
+Revision 1.3  1998-10-13 13:04:17  ivan
+fixed doc to indicate Pg specific syntax too
+
+Revision 1.2  1998/10/12 23:40:28  ivan
 added Pg-specific behaviour in sub line
 
 
-- 
cgit v1.2.1


From c3e5e50c521e8ed1afab6e86c572462032e540aa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 13 Oct 1998 13:11:01 +0000
Subject: So new installs have some protection (WDWWC).

---
 htdocs/.htaccess | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 htdocs/.htaccess

diff --git a/htdocs/.htaccess b/htdocs/.htaccess
new file mode 100644
index 000000000..f8c6b9c0c
--- /dev/null
+++ b/htdocs/.htaccess
@@ -0,0 +1,3 @@
+AuthName        Freeside
+AuthType        Basic
+require valid-user
-- 
cgit v1.2.1


From ecff5bc54b3e6be7a963af807ff39786bd3103f6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 Oct 1998 06:52:48 +0000
Subject: 1,1,4 release, fix postgresql quirks.

---
 htdocs/docs/index.html           |  2 +-
 htdocs/docs/man/Conf.txt         |  2 ++
 htdocs/docs/man/Invoice.txt      |  4 ++++
 htdocs/docs/man/Record.txt       |  2 ++
 htdocs/docs/man/dbdef_column.txt | 18 ++++++++++++++----
 htdocs/docs/man/dbdef_table.txt  |  8 ++++++++
 htdocs/docs/upgrade2.html        |  4 ++--
 7 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/htdocs/docs/index.html b/htdocs/docs/index.html
index 20051ca4d..83c58f321 100644
--- a/htdocs/docs/index.html
+++ b/htdocs/docs/index.html
@@ -6,7 +6,7 @@
 <ul>
   <li><a href="install.html">New Installation</a>
   <li><a href="upgrade.html">Upgrading from 1.0.x to 1.1.x</a>
-  <li><a href="upgrade2.html">Upgrading from 1.1.x to 1.1.3</a>
+  <li><a href="upgrade2.html">Upgrading from 1.1.x to 1.1.4</a>
   <li><a href="config.html">Configuration files</a>
 <!--
   <li><a href="admin.html">Administration</a>
diff --git a/htdocs/docs/man/Conf.txt b/htdocs/docs/man/Conf.txt
index c46c9ee6a..5e7be7f2d 100644
--- a/htdocs/docs/man/Conf.txt
+++ b/htdocs/docs/man/Conf.txt
@@ -45,3 +45,5 @@ SEE ALSO
 HISTORY
     Ivan Kohler <ivan@sisd.com> 98-sep-6
 
+    sub exists forgot to fetch $dir ivan@sisd.com 98-sep-27
+
diff --git a/htdocs/docs/man/Invoice.txt b/htdocs/docs/man/Invoice.txt
index 17953d51d..426359f94 100644
--- a/htdocs/docs/man/Invoice.txt
+++ b/htdocs/docs/man/Invoice.txt
@@ -21,3 +21,7 @@ HISTORY
     =< 0 return address comes from /var/spool/freeside/conf/address
     ivan@sisd.com 98-jul-2
 
+    pod ivan@sisd.com 98-sep-20something
+
+    s/ISA/@ISA/ in use vars ivan@sisd.com 98-sep-27
+
diff --git a/htdocs/docs/man/Record.txt b/htdocs/docs/man/Record.txt
index 0accb65d1..757013286 100644
--- a/htdocs/docs/man/Record.txt
+++ b/htdocs/docs/man/Record.txt
@@ -330,3 +330,5 @@ HISTORY
 
         added pod documentation ivan@sisd.com 98-sep-6
 
+        ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
+
diff --git a/htdocs/docs/man/dbdef_column.txt b/htdocs/docs/man/dbdef_column.txt
index 93e239517..6747a328c 100644
--- a/htdocs/docs/man/dbdef_column.txt
+++ b/htdocs/docs/man/dbdef_column.txt
@@ -46,16 +46,17 @@ METHODS
     line [ $datasrc ]
         Returns an SQL column definition.
 
-        If passed a DBI $datasrc specifying the DBD::mysql manpage,
-        will use MySQL-specific syntax. Non-standard syntax for
-        other engines (if applicable) may also be supported in the
-        future.
+        If passed a DBI $datasrc specifying the DBD::mysql manpage
+        or the DBD::Pg manpage, will use engine-specific syntax.
 
 BUGS
 SEE ALSO
     the FS::dbdef_table manpage, the FS::dbdef manpage, the DBI
     manpage
 
+VERSION
+    $Id: dbdef_column.txt,v 1.5 1999-04-08 13:39:32 ivan Exp $
+
 HISTORY
     class for dealing with column definitions
 
@@ -67,3 +68,12 @@ HISTORY
     mySQL-specific hack for null (what should be default?)
     ivan@sisd.com 98-jun-2
 
+    $Log: dbdef_column.txt,v $
+    Revision 1.5  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.3 1998/10/13 13:04:17 ivan
+    fixed doc to indicate Pg specific syntax too
+
+    Revision 1.2 1998/10/12 23:40:28 ivan added Pg-specific
+    behaviour in sub line
+
diff --git a/htdocs/docs/man/dbdef_table.txt b/htdocs/docs/man/dbdef_table.txt
index 25e010d8b..4fcb0935c 100644
--- a/htdocs/docs/man/dbdef_table.txt
+++ b/htdocs/docs/man/dbdef_table.txt
@@ -75,6 +75,9 @@ SEE ALSO
     FS::dbdef_index manpage, the FS::dbdef_unique manpage, the DBI
     manpage
 
+VERSION
+    $Id: dbdef_table.txt,v 1.2 1998-10-14 06:52:48 ivan Exp $
+
 HISTORY
     class for dealing with table definitions
 
@@ -92,3 +95,8 @@ HISTORY
 
     pod ivan@sisd.com 98-sep-24
 
+    $Log: dbdef_table.txt,v $
+    Revision 1.2  1998-10-14 06:52:48  ivan
+    1,1,4 release, fix postgresql quirks.
+
+
diff --git a/htdocs/docs/upgrade2.html b/htdocs/docs/upgrade2.html
index 4bf7ea45a..7acae48f7 100644
--- a/htdocs/docs/upgrade2.html
+++ b/htdocs/docs/upgrade2.html
@@ -1,8 +1,8 @@
 <head>
-  <title>Upgrading to 1.1.3</title>
+  <title>Upgrading to 1.1.4</title>
 </head>
 <body>
-<h1>Upgrading to 1.1.3 from 1.1.x</h1>
+<h1>Upgrading to 1.1.4 from 1.1.x</h1>
 <ul>
   <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
   <li>Back up your data and current Freeside installation.
-- 
cgit v1.2.1


From d914c9c9f2e73f58c3bd9b70738747d2c7e6c05b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 Oct 1998 07:05:06 +0000
Subject: 1.1.4 release, fix postgresql

---
 README                   |  2 +-
 bin/fs-setup             | 12 ++++++------
 site_perl/dbdef_table.pm | 13 +++++++++++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/README b/README
index 14234df5a..286cf03bb 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Freeside, (pre) 1.1.4
+Freeside, 1.1.4
 
 Copyright (C) 1998 Silicon Interactive Software Design.  All rights reserved.
 
diff --git a/bin/fs-setup b/bin/fs-setup
index 45332d85c..22891ec0f 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -68,7 +68,7 @@ my($char_d) = 80; #default maxlength for text fields
 
 #my(@date_type)  = ( 'timestamp', '', ''     );
 my(@date_type)  = ( 'int', 'NULL', ''     );
-my(@perl_type) = ( 'long varchar', 'NULL', ''   ); 
+my(@perl_type) = ( 'varchar', 'NULL', ''   ); 
 my(@money_type);
 if (datasrc =~ m/Pg/) { #Pg can't do decimal(10,2)
   @money_type = ( 'money',   '', '' );
@@ -315,7 +315,7 @@ sub tables_hash_hack {
       'columns' => [
         'taxnum',   'int',   '',    '',
         'state',    'char',  '',    2,  #two letters max in US... elsewhere?
-        'county',   'varchar',  '',    $char_d,
+        'county',   'varchar',  'NULL',    $char_d,
         'tax',      'real',  '',    '', #tax %
       ],
       'primary_key' => 'taxnum',
@@ -353,7 +353,7 @@ sub tables_hash_hack {
         'state',    'char', '',     2,
         'zip',      'varchar', '',     10,
         'country',  'char', '',     2,
-        'trancode', 'TINYINT', '', '',
+        'trancode', 'int', '', '',
         'cardnum',  'varchar', '',     16,
         'exp',      @date_type,
         'payname',  'varchar', 'NULL', $char_d,
@@ -476,8 +476,8 @@ sub tables_hash_hack {
         'username',  'varchar',   '',   $username_len, #unique (& remove dup code)
         '_password', 'varchar',   '',   25, #13 for encryped pw's plus ' *SUSPENDED*
         'popnum',    'int',    'NULL',   '',
-        'uid',       'bigint', 'NULL',   '',
-        'gid',       'bigint', 'NULL',   '',
+        'uid',       'int', 'NULL',   '',
+        'gid',       'int', 'NULL',   '',
         'finger',    'varchar',   'NULL',   $char_d,
         'dir',       'varchar',   'NULL',   $char_d,
         'shell',     'varchar',   'NULL',   $char_d,
@@ -493,7 +493,7 @@ sub tables_hash_hack {
       'columns' => [
         'svcnum',    'int',    '',   '',
         'domsvc',    'int',    '',   '',
-        'domuid',    'bigint', '',   '',
+        'domuid',    'int', '',   '',
         'domuser',   'varchar',   '',   $char_d,
       ],
       'primary_key' => 'svcnum',
diff --git a/site_perl/dbdef_table.pm b/site_perl/dbdef_table.pm
index bc1454d9e..8c5bcfe77 100644
--- a/site_perl/dbdef_table.pm
+++ b/site_perl/dbdef_table.pm
@@ -202,12 +202,12 @@ sub sql_create_table {
 
   "CREATE TABLE ". $self->name. " ( ". join(", ", @columns). " )",
   ( map {
-    my($index) = $_ . "_index";
+    my($index) = $self->name. "__". $_ . "_index";
     $index =~ s/,\s*/_/g;
     "CREATE UNIQUE INDEX $index ON ". $self->name. " ($_)"
   } $self->unique->sql_list ),
   ( map {
-    my($index) = $_ . "_index";
+    my($index) = $self->name. "__". $_ . "_index";
     $index =~ s/,\s*/_/g;
     "CREATE INDEX $index ON ". $self->name. " ($_)"
   } $self->index->sql_list ),
@@ -225,6 +225,10 @@ sub sql_create_table {
 L<FS::dbdef>, L<FS::dbdef_unique>, L<FS::dbdef_index>, L<FS::dbdef_unique>,
 L<DBI>
 
+=head1 VERSION
+
+$Id: dbdef_table.pm,v 1.2 1998-10-14 07:05:06 ivan Exp $
+
 =head1 HISTORY
 
 class for dealing with table definitions
@@ -243,6 +247,11 @@ ivan@sisd.com 98-jun-4
 
 pod ivan@sisd.com 98-sep-24
 
+$Log: dbdef_table.pm,v $
+Revision 1.2  1998-10-14 07:05:06  ivan
+1.1.4 release, fix postgresql
+
+
 =cut
 
 1;
-- 
cgit v1.2.1


From 4ff8b54af3e5e5a1713873cc21d5bb095d16a554 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 Oct 1998 08:18:21 +0000
Subject: More informative error messages and better doc for admin contact
 email stuff

---
 site_perl/svc_domain.pm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/site_perl/svc_domain.pm b/site_perl/svc_domain.pm
index 1ddd5b290..c12819ec3 100644
--- a/site_perl/svc_domain.pm
+++ b/site_perl/svc_domain.pm
@@ -144,6 +144,11 @@ for transfers.
 A registration or transfer email will be submitted unless
 $FS::svc_domain::whois_hack is true.
 
+The additional field I<email> can be used to manually set the admin contact
+email address on this email.  Otherwise, the svc_acct records for this package 
+(see L<FS::cust_pkg>) are searched.  If there is exactly one svc_acct record
+in the same package, it is automatically used.  Otherwise an error is returned.
+
 =cut
 
 sub insert {
@@ -337,7 +342,7 @@ sub check {
       }
 
       if ( scalar(@svc_acct) == 0 ) {
-        return "Must order an account first";
+        return "Must order an account in package ". $pkgnum. " first";
       } elsif ( scalar(@svc_acct) > 1 ) {
         return "More than one account in package ". $pkgnum. ": specify admin contact email";
       } else {
@@ -516,6 +521,10 @@ L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
 L<FS::SSH>, L<ssh>, L<dot-qmail>, schema.html from the base documentation,
 config.html from the base documentation.
 
+=head1 VERSION
+
+$Id: svc_domain.pm,v 1.2 1998-10-14 08:18:21 ivan Exp $
+
 =head1 HISTORY
 
 ivan@voicenet.com 97-jul-21
@@ -532,6 +541,11 @@ ivan@sisd.com 98-jul-17-19
 
 pod, some FS::Conf (not complete) ivan@sisd.com 98-sep-23
 
+$Log: svc_domain.pm,v $
+Revision 1.2  1998-10-14 08:18:21  ivan
+More informative error messages and better doc for admin contact email stuff
+
+
 =cut
 
 1;
-- 
cgit v1.2.1


From b8f8d9c3a07d4cb18ab6ec49fcd5ee0620c04a24 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 22 Oct 1998 15:46:28 +0000
Subject: now smallint is illegal, so remove that too.

---
 bin/fs-setup | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 22891ec0f..dc732e5ed 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -30,6 +30,11 @@
 # ivan@sisd.com 98-sep-4
 #
 # fix radius attributes ivan@sisd.com 98-sep-27
+#
+# $Log: fs-setup,v $
+# Revision 1.3  1998-10-22 15:46:28  ivan
+# now smallint is illegal, so remove that too.
+#
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -206,7 +211,7 @@ sub tables_hash_hack {
         'agentnum', 'int',            '',     '',
         'agent',    'varchar',           '',     $char_d,
         'typenum',  'int',            '',     '',
-        'freq',     'smallint',       'NULL', '',
+        'freq',     'int',       'NULL', '',
         'prog',     @perl_type,
       ],
       'primary_key' => 'agentnum',
@@ -415,7 +420,7 @@ sub tables_hash_hack {
         'pkg',        'varchar',   '',   $char_d,
         'comment',    'varchar',   '',   $char_d,
         'setup',      @perl_type,
-        'freq',       'smallint', '', '',  #billing frequency (months)
+        'freq',       'int', '', '',  #billing frequency (months)
         'recur',      @perl_type,
       ],
       'primary_key' => 'pkgpart',
-- 
cgit v1.2.1


From 9061feef2e36c8a58a612be0e4e80853715bacb2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 22 Oct 1998 15:51:23 +0000
Subject: also varchar with no length specified - postgresql fix broke mysql.

---
 bin/fs-setup | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index dc732e5ed..98e754261 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.3  1998-10-22 15:46:28  ivan
+# Revision 1.4  1998-10-22 15:51:23  ivan
+# also varchar with no length specified - postgresql fix broke mysql.
+#
+# Revision 1.3  1998/10/22 15:46:28  ivan
 # now smallint is illegal, so remove that too.
 #
 
@@ -73,7 +76,7 @@ my($char_d) = 80; #default maxlength for text fields
 
 #my(@date_type)  = ( 'timestamp', '', ''     );
 my(@date_type)  = ( 'int', 'NULL', ''     );
-my(@perl_type) = ( 'varchar', 'NULL', ''   ); 
+my(@perl_type) = ( 'varchar', 'NULL', 255  ); 
 my(@money_type);
 if (datasrc =~ m/Pg/) { #Pg can't do decimal(10,2)
   @money_type = ( 'money',   '', '' );
-- 
cgit v1.2.1


From 0d81e88f59457053bdeb549c38ffbfb32441cc5a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Nov 1998 02:45:54 +0000
Subject: generated patch with makepatch

---
 htdocs/docs/CGI-modules-2.76-patch.txt | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/htdocs/docs/CGI-modules-2.76-patch.txt b/htdocs/docs/CGI-modules-2.76-patch.txt
index 55b50bbbe..9729623fa 100755
--- a/htdocs/docs/CGI-modules-2.76-patch.txt
+++ b/htdocs/docs/CGI-modules-2.76-patch.txt
@@ -1,23 +1,39 @@
-ivan@rootwood:~/src/CGI-modules-2.76/CGI$ diff -c Base.pm Base.pm.orig 
-*** Base.pm     Sat Jul 18 00:33:21 1998
---- Base.pm.orig        Sat Jul 18 00:06:12 1998
+# This is a patch for Base.pm.old to update it to Base.pm.
+# It was generated by makepatch 1.93 (2.0BETA) on Tue Nov  3 21:44:39 1998.
+#
+# To apply this patch, chdir to source directory Base.pm.old and enter
+#
+#     patch -p1 -N < <this-file>
+
+exit
+# End of preamble.
+
+# Patch input follows.
+__DATA__
+Index: Base.pm
+Prereq:  2.76 
+#######  => 
+*** Base.pm.old	Wed Oct 14 00:24:12 1998
+--- Base.pm	Tue Nov  3 21:38:49 1998
 ***************
 *** 938,945 ****
       my $orig_uri = $self->get_uri;
       $self->log("Redirecting $CGI::Base::REQUEST_METHOD $orig_uri to $to_uri")
-        if $Debug;
-!     my $msg =   ($perm) ? StatusHdr(301,"Moved Permanently")
-!                       : StatusHdr(302,"Moved Temporarily");
+  	if $Debug;
+!     my $msg =   ($perm) ? ServerHdr(301,"Moved Permanently")
+! 			: ServerHdr(302,"Moved Temporarily");
       my $hdrs = SendHeaders($msg, LocationHdr($to_uri));
       $self->log($hdrs);
   }
 --- 938,945 ----
       my $orig_uri = $self->get_uri;
       $self->log("Redirecting $CGI::Base::REQUEST_METHOD $orig_uri to $to_uri")
-        if $Debug;
-!     my $msg =   ($perm) ? ServerHdr(301,"Moved Permanently")
-!                       : ServerHdr(302,"Moved Temporarily");
+  	if $Debug;
+!     my $msg =   ($perm) ? StatusHdr(301,"Moved Permanently")
+! 			: StatusHdr(302,"Moved Temporarily");
       my $hdrs = SendHeaders($msg, LocationHdr($to_uri));
       $self->log($hdrs);
   }
 
+
+End of Patch.
-- 
cgit v1.2.1


From f408cf19344c7d128bf98ffd9667810ca9bebc1b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 7 Nov 1998 05:17:18 +0000
Subject: In sub new, Pg wrapper for money fields from dbdef
 (FS::Record::fields $table), not keys of supplied hashref.

---
 site_perl/Record.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/site_perl/Record.pm b/site_perl/Record.pm
index 9b308508a..87de48cc4 100644
--- a/site_perl/Record.pm
+++ b/site_perl/Record.pm
@@ -127,7 +127,7 @@ sub new {
   #  }
   #}
 
-  foreach my $column (keys %{$hashref}) {
+  foreach my $column ( FS::Record::fields $table ) { 
     #trim the '$' from money fields for Pg (beong HERE?)
     #(what about Pg i18n?)
     if ( datasrc =~ m/Pg/ 
@@ -862,6 +862,12 @@ added pod documentation ivan@sisd.com 98-sep-6
 
 ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
+$Log: Record.pm,v $
+Revision 1.2  1998-11-07 05:17:18  ivan
+In sub new, Pg wrapper for money fields from dbdef (FS::Record::fields $table),
+not keys of supplied hashref.
+
+
 =cut
 
 1;
-- 
cgit v1.2.1


From 79556e1cfa147d8c9b2fc8142ed03ff067360030 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 7 Nov 1998 08:08:12 +0000
Subject: Removed depriciated FS::Bill (now in FS::cust_main)

---
 bin/bill | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/bill b/bin/bill
index 5c5be703d..ef321002b 100755
--- a/bin/bill
+++ b/bin/bill
@@ -76,6 +76,12 @@
 # s/suidsetup/adminsuidsetup/, s/FS::Search/FS::Record/, added some batch
 # exporting stuff (which still needs to be generalized) and removed &idiot
 # ivan@sisd.com 98-may-27
+#
+# $Log: bill,v $
+# Revision 1.2  1998-11-07 08:08:12  ivan
+#
+# Removed depriciated FS::Bill (now in FS::cust_main)
+#
 
 # setup
 
@@ -85,7 +91,6 @@ use Date::Parse;
 use Getopt::Std;
 use FS::UID qw(adminsuidsetup swapuid);
 use FS::Record qw(qsearch qsearchs);
-use FS::Bill;
 
 my($batchfile)="/var/spool/freeside/batch";
 my($batchlock)="/var/spool/freeside/batch.lock";
@@ -118,8 +123,6 @@ foreach $cust_main (
 
   print "Billing customer #" . $cust_main->getfield('custnum') . "\n";
 
-  bless($cust_main,"FS::Bill");
-
   my($error);
 
   $error=$cust_main->bill('time'=>$time);
-- 
cgit v1.2.1


From e4ad777a6ffa5b2cc28bf26681bcfa56f83df7e9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 7 Nov 1998 08:19:21 +0000
Subject: still need to bless into FS::cust_main (for now)

---
 bin/bill | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/bill b/bin/bill
index ef321002b..7b1e162c2 100755
--- a/bin/bill
+++ b/bin/bill
@@ -78,9 +78,9 @@
 # ivan@sisd.com 98-may-27
 #
 # $Log: bill,v $
-# Revision 1.2  1998-11-07 08:08:12  ivan
+# Revision 1.3  1998-11-07 08:19:21  ivan
 #
-# Removed depriciated FS::Bill (now in FS::cust_main)
+# still need to bless into FS::cust_main (for now)
 #
 
 # setup
@@ -123,6 +123,8 @@ foreach $cust_main (
 
   print "Billing customer #" . $cust_main->getfield('custnum') . "\n";
 
+  bless($cust_main,"FS::cust_main");
+
   my($error);
 
   $error=$cust_main->bill('time'=>$time);
-- 
cgit v1.2.1


From de5bd53fdf4d115a26c1b51fefa83a114735f9bc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 7 Nov 1998 08:21:26 +0000
Subject: missing use

---
 bin/bill | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/bill b/bin/bill
index 7b1e162c2..3bc995d35 100755
--- a/bin/bill
+++ b/bin/bill
@@ -78,9 +78,8 @@
 # ivan@sisd.com 98-may-27
 #
 # $Log: bill,v $
-# Revision 1.3  1998-11-07 08:19:21  ivan
-#
-# still need to bless into FS::cust_main (for now)
+# Revision 1.4  1998-11-07 08:21:26  ivan
+# missing use
 #
 
 # setup
@@ -91,6 +90,7 @@ use Date::Parse;
 use Getopt::Std;
 use FS::UID qw(adminsuidsetup swapuid);
 use FS::Record qw(qsearch qsearchs);
+use FS::cust_main;
 
 my($batchfile)="/var/spool/freeside/batch";
 my($batchlock)="/var/spool/freeside/batch.lock";
-- 
cgit v1.2.1


From 0ac8d86e9f241bbca5c87826e56756157b7a432b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 7 Nov 1998 08:25:10 +0000
Subject: *** empty log message ***

---
 TODO | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 9e6f40130..71535acc9 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.11 1998-10-13 12:49:50 ivan Exp $
+$Id: TODO,v 1.12 1998-11-07 08:25:10 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,9 @@ duplication of effort.
 
 -- 1.1.x --
 
+qsearch[s] (or just put in new?) in FS::Record should bless the object
+into the appropriate derived class automagically, if possible?
+
 radius logfile parsing and perl expression check.
 
 mailing list archive, faq
-- 
cgit v1.2.1


From 4c9347994ca4e1aefdb622d9f51ac8687e6a177b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 7 Nov 1998 10:24:25 +0000
Subject: don't use depriciated FS::Bill and FS::Invoice, other miscellania

---
 README                  |  2 +-
 htdocs/browse/agent.cgi | 28 ++++++++++++++++++++--------
 htdocs/index.html       |  2 +-
 site_perl/CGI.pm        | 16 ++++++++++------
 site_perl/cust_bill.pm  |  5 +++++
 site_perl/cust_main.pm  | 11 +++++++++--
 6 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/README b/README
index 286cf03bb..2e094b156 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Freeside, 1.1.4
+Freeside, 1.1.5
 
 Copyright (C) 1998 Silicon Interactive Software Design.  All rights reserved.
 
diff --git a/htdocs/browse/agent.cgi b/htdocs/browse/agent.cgi
index cf5f2281f..2bf4ef9d3 100755
--- a/htdocs/browse/agent.cgi
+++ b/htdocs/browse/agent.cgi
@@ -13,6 +13,11 @@
 # agent type was linking to wrong cgi ivan@sisd.com 98-jul-18
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: agent.cgi,v $
+# Revision 1.2  1998-11-07 10:24:22  ivan
+# don't use depriciated FS::Bill and FS::Invoice, other miscellania
+#
 
 use strict;
 use CGI::Base;
@@ -27,20 +32,22 @@ $cgi->get;
 
 SendHeaders(); # one guess.
 print header('Agent Listing', menubar(
-  'Main Menu' => '../',
-  'Add new agent' => '../edit/agent.cgi'
+  'Main Menu'   => '../',
+  'Agent Types' => 'agent_type.cgi',
+#  'Add new agent' => '../edit/agent.cgi'
 )), <<END;
-    <BR>
-    Click on agent number to edit.
+Agents are resellers of your service. Agents may be limited to a subset of your
+full offerings (via their type).<BR><BR>
     <TABLE BORDER>
       <TR>
-        <TH><FONT SIZE=-1>Agent #</FONT></TH>
-        <TH>Agent</TH>
+        <TH COLSPAN=2>Agent</TH>
         <TH>Type</TH>
         <TH><FONT SIZE=-1>Freq. (unimp.)</FONT></TH>
         <TH><FONT SIZE=-1>Prog. (unimp.)</FONT></TH>
       </TR>
 END
+#        <TH><FONT SIZE=-1>Agent #</FONT></TH>
+#        <TH>Agent</TH>
 
 my($agent);
 foreach $agent ( sort { 
@@ -54,7 +61,8 @@ foreach $agent ( sort {
       <TR>
         <TD><A HREF="../edit/agent.cgi?$hashref->{agentnum}">
           $hashref->{agentnum}</A></TD>
-        <TD>$hashref->{agent}</TD>
+        <TD><A HREF="../edit/agent.cgi?$hashref->{agentnum}">
+          $hashref->{agent}</A></TD>
         <TD><A HREF="../edit/agent_type.cgi?$typenum">$atype</A></TD>
         <TD>$hashref->{freq}</TD>
         <TD>$hashref->{prog}</TD>
@@ -64,8 +72,12 @@ END
 }
 
 print <<END;
+      <TR>
+        <TD COLSPAN=2><A HREF="../edit/agent.cgi"><I>Add new agent</I></A></TD>
+        <TD><A HREF="../edit/agent_type.cgi"><I>Add new agent type</I></A></TD>
+      </TR>
     </TABLE>
-    </CENTER>
+
   </BODY>
 </HTML>
 END
diff --git a/htdocs/index.html b/htdocs/index.html
index de0667e59..d2b5a1e93 100755
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -72,7 +72,7 @@
             View/Edit agents
           </A>
             - Agents are resellers of your service.  Agents may be limited
-              to a subset of your full offerings (via their agent type).
+              to a subset of your full offerings (via their type).
           <BR>
           <LI><A HREF="browse/part_referral.cgi">
             View/Edit referrals
diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index d2ed52122..b72a09a6b 100644
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -47,14 +47,13 @@ sub header {
           $title
         </TITLE>
       </HEAD>
-      <BODY>
-        <CENTER>
-          <H1>
+      <BODY BGCOLOR="#ffffff">
+          <FONT COLOR="#FF0000" SIZE=7>
             $title
-          </H1>
+          </FONT>
+          <BR><BR>
           $menubar
-        </CENTER>
-      <HR>
+      <BR><BR>
 END
 }
 
@@ -136,6 +135,11 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 
 pod ivan@sisd.com 98-sep-12
 
+$Log: CGI.pm,v $
+Revision 1.2  1998-11-07 10:24:23  ivan
+don't use depriciated FS::Bill and FS::Invoice, other miscellania
+
+
 =cut
 
 1;
diff --git a/site_perl/cust_bill.pm b/site_perl/cust_bill.pm
index 00234519a..bc9424233 100644
--- a/site_perl/cust_bill.pm
+++ b/site_perl/cust_bill.pm
@@ -489,6 +489,11 @@ charges can be negative ivan@sisd.com 98-jul-13
 
 pod, ingegrate with FS::Invoice ivan@sisd.com 98-sep-20
 
+$Log: cust_bill.pm,v $
+Revision 1.2  1998-11-07 10:24:24  ivan
+don't use depriciated FS::Bill and FS::Invoice, other miscellania
+
+
 =cut
 
 1;
diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index ec282731e..0ef69cba4 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -600,6 +600,8 @@ sub collect {
     'custnum' => $self->getfield('custnum'),
   } ) ) {
 
+    bless($cust_bill,"FS::cust_bill");
+
     #this has to be before next's
     my($amount) = sprintf("%.2f", $total_owed < $cust_bill->owed
                                   ? $total_owed
@@ -624,7 +626,7 @@ sub collect {
            && ( $cust_bill->printed * 2592000 ) <= $since
       ) {
 
-        open(LPR,$lpr) or die "Can't open $lpr: $!";
+        open(LPR,"|$lpr") or die "Can't open $lpr: $!";
         print LPR $cust_bill->print_text; #( date )
         close LPR
           or die $! ? "Error closing $lpr: $!"
@@ -807,7 +809,7 @@ Returns the balance for this customer (total owed minus total credited).
 
 sub balance {
   my($self) = @_;
-  sprintf("%.2f",$self->total_bill - $self->total_credit);
+  sprintf("%.2f",$self->total_owed - $self->total_credited);
 }
 
 =back
@@ -861,6 +863,11 @@ methods, cleaned collect method, source modifications no longer necessary to
 enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
+$Log: cust_main.pm,v $
+Revision 1.2  1998-11-07 10:24:25  ivan
+don't use depriciated FS::Bill and FS::Invoice, other miscellania
+
+
 =cut
 
 1;
-- 
cgit v1.2.1


From 82f754263303530f98eaf788ebb65302d97dc3b9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 8 Nov 1998 01:09:23 +0000
Subject: 1.1.6 release

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 2e094b156..e758447af 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Freeside, 1.1.5
+Freeside, 1.1.6
 
 Copyright (C) 1998 Silicon Interactive Software Design.  All rights reserved.
 
-- 
cgit v1.2.1


From b90fadef7ea6b802a46a4f826ec5052ffd9e5556 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 8 Nov 1998 09:38:43 +0000
Subject: cgisuidsetup complains if you pass it a isa CGI::Base instead of an
 isa CGI (first step in migrating from CGI-modules to CGI.pm)

---
 site_perl/UID.pm | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/site_perl/UID.pm b/site_perl/UID.pm
index 16f03a0ec..00adfc0c5 100644
--- a/site_perl/UID.pm
+++ b/site_perl/UID.pm
@@ -30,8 +30,7 @@ FS::UID - Subroutines for database login and assorted other stuff
 
   adminsuidsetup;
 
-  $cgi = new CGI::Base;
-  $cgi->get;
+  $cgi = new CGI;
   $dbh = cgisuidsetup($cgi);
 
   $dbh = dbh;
@@ -78,15 +77,21 @@ sub adminsuidsetup {
 
   $dbh;
 }
-=item cgisuidsetup CGI::Base_OBJECT
 
-Stores the CGI::Base_OBJECT for later use.
+=item cgisuidsetup CGI_object
+
+Stores the CGI (see L<CGI>) object for later use. (CGI::Base is depriciated)
 Runs adminsuidsetup.
 
 =cut
 
 sub cgisuidsetup {
   $cgi=$_[0];
+  if ( $cgi->isa('CGI::Base') ) {
+    carp "Use of CGI::Base is depriciated";
+  } elsif ( ! $cgi->isa('CGI') ) {
+    croak "Pass a CGI object to cgisuidsetup!";
+  }
   adminsuidsetup;
 }
 
@@ -127,10 +132,13 @@ or 'freeside'.
 =cut
 
 sub getotaker {
-  if ($cgi && defined $cgi->var('REMOTE_USER')) {
+  if ( $cgi && $cgi->can('var') && defined $cgi->var('REMOTE_USER')) {
+    carp "Use of CGI::Base is depriciated";
     return $cgi->var('REMOTE_USER'); #for now
+  } elsif ( $cgi && $cgi->can('remote_user') && defined $cgi->remote_user ) {
+    return $cgi->remote_user;
   } else {
-    'freeside';
+    return 'freeside';
   }
 }
 
@@ -175,7 +183,7 @@ cgisuidsetup will go away as well.
 
 =head1 SEE ALSO
 
-L<FS::Record>,  L<CGI::Base>, L<DBI>
+L<FS::Record>, L<CGI>, L<DBI>
 
 =head1 HISTORY
 
@@ -203,6 +211,12 @@ pod, use FS::Conf, implemented cgisuidsetup as adminsuidsetup,
 inlined suidsetup
 ivan@sisd.com 98-sep-12
 
+$Log: UID.pm,v $
+Revision 1.2  1998-11-08 09:38:43  ivan
+cgisuidsetup complains if you pass it a isa CGI::Base instead of an isa CGI
+(first step in migrating from CGI-modules to CGI.pm)
+
+
 =cut
 
 1;
-- 
cgit v1.2.1


From 1b1dd72e3722189a339898d20eabeb1f1bdafce1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 8 Nov 1998 10:11:02 +0000
Subject: CGI.pm

---
 htdocs/browse/agent.cgi | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/browse/agent.cgi b/htdocs/browse/agent.cgi
index 2bf4ef9d3..2c67e837c 100755
--- a/htdocs/browse/agent.cgi
+++ b/htdocs/browse/agent.cgi
@@ -15,23 +15,24 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent.cgi,v $
-# Revision 1.2  1998-11-07 10:24:22  ivan
+# Revision 1.3  1998-11-08 10:11:02  ivan
+# CGI.pm
+#
+# Revision 1.2  1998/11/07 10:24:22  ivan
 # don't use depriciated FS::Bill and FS::Invoice, other miscellania
 #
 
 use strict;
-use CGI::Base;
+use CGI;
 use FS::UID qw(cgisuidsetup swapuid);
 use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header menubar);
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
-print header('Agent Listing', menubar(
+print $cgi->header, header('Agent Listing', menubar(
   'Main Menu'   => '../',
   'Agent Types' => 'agent_type.cgi',
 #  'Add new agent' => '../edit/agent.cgi'
-- 
cgit v1.2.1


From 44ea6c1538ce923c333796b0784aded5f64be761 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 8 Nov 1998 10:45:42 +0000
Subject: got sub cgi for FS::CGI

---
 site_perl/UID.pm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/site_perl/UID.pm b/site_perl/UID.pm
index 00adfc0c5..7959343e0 100644
--- a/site_perl/UID.pm
+++ b/site_perl/UID.pm
@@ -95,6 +95,16 @@ sub cgisuidsetup {
   adminsuidsetup;
 }
 
+=item cgi
+
+Returns the CGI (see L<CGI>) object.
+
+=cut
+
+sub cgi {
+  $cgi;
+}
+
 =item dbh
 
 Returns the DBI database handle.
@@ -212,7 +222,10 @@ inlined suidsetup
 ivan@sisd.com 98-sep-12
 
 $Log: UID.pm,v $
-Revision 1.2  1998-11-08 09:38:43  ivan
+Revision 1.3  1998-11-08 10:45:42  ivan
+got sub cgi for FS::CGI
+
+Revision 1.2  1998/11/08 09:38:43  ivan
 cgisuidsetup complains if you pass it a isa CGI::Base instead of an isa CGI
 (first step in migrating from CGI-modules to CGI.pm)
 
-- 
cgit v1.2.1


From e6f96a8435359ef6d24d16ec69650172c7e6b5ce Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 8 Nov 1998 10:50:19 +0000
Subject: s/CGI::Base/CGI/; etc.

---
 site_perl/CGI.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index b72a09a6b..0e6daeebc 100644
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -3,8 +3,9 @@ package FS::CGI;
 use strict;
 use vars qw(@EXPORT_OK @ISA);
 use Exporter;
-use CGI::Base;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
+use FS::UID;
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(header menubar idiot eidiot);
@@ -80,8 +81,8 @@ Sends headers and an HTML error message.
 
 sub idiot {
   my($error)=@_;
-  CGI::Base::SendHeaders();
-  print <<END;
+  my($cgi)=FS::UID::cgi;
+  print $cgi->header, <<END;
 <HTML>
   <HEAD>
     <TITLE>Error processing your request</TITLE>
@@ -136,8 +137,8 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 pod ivan@sisd.com 98-sep-12
 
 $Log: CGI.pm,v $
-Revision 1.2  1998-11-07 10:24:23  ivan
-don't use depriciated FS::Bill and FS::Invoice, other miscellania
+Revision 1.3  1998-11-08 10:50:19  ivan
+s/CGI::Base/CGI/; etc.
 
 
 =cut
-- 
cgit v1.2.1


From 56e72de1b164208a7de037c0acba3fd2552176cb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Nov 1998 04:55:42 +0000
Subject: support depriciated CGI::Base as well as CGI.pm (for now)

---
 site_perl/CGI.pm | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index 0e6daeebc..f9fbdaebd 100644
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -82,7 +82,12 @@ Sends headers and an HTML error message.
 sub idiot {
   my($error)=@_;
   my($cgi)=FS::UID::cgi;
-  print $cgi->header, <<END;
+  if ( $cgi->isa('CGI::Base') ) {
+    CGI::Base::SendHeaders;
+  } else {
+    print $cgi->header;
+  }
+  print <<END;
 <HTML>
   <HEAD>
     <TITLE>Error processing your request</TITLE>
@@ -119,11 +124,9 @@ Not OO.
 
 Not complete.
 
-Uses CGI-modules instead of CGI.pm
-
 =head1 SEE ALSO
 
-L<CGI::Base>
+L<CGI>, L<CGI::Base>
 
 =head1 HISTORY
 
@@ -137,7 +140,10 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 pod ivan@sisd.com 98-sep-12
 
 $Log: CGI.pm,v $
-Revision 1.3  1998-11-08 10:50:19  ivan
+Revision 1.4  1998-11-09 04:55:42  ivan
+support depriciated CGI::Base as well as CGI.pm (for now)
+
+Revision 1.3  1998/11/08 10:50:19  ivan
 s/CGI::Base/CGI/; etc.
 
 
-- 
cgit v1.2.1


From ef142bc2988526f275ade645e3ea33d461f90cf5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Nov 1998 05:23:55 +0000
Subject: *** empty log message ***

---
 site_perl/CGI.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index f9fbdaebd..459c6fd49 100644
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -83,6 +83,7 @@ sub idiot {
   my($error)=@_;
   my($cgi)=FS::UID::cgi;
   if ( $cgi->isa('CGI::Base') ) {
+    no strict 'subs';
     CGI::Base::SendHeaders;
   } else {
     print $cgi->header;
@@ -140,7 +141,10 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 pod ivan@sisd.com 98-sep-12
 
 $Log: CGI.pm,v $
-Revision 1.4  1998-11-09 04:55:42  ivan
+Revision 1.5  1998-11-09 05:23:55  ivan
+*** empty log message ***
+
+Revision 1.4  1998/11/09 04:55:42  ivan
 support depriciated CGI::Base as well as CGI.pm (for now)
 
 Revision 1.3  1998/11/08 10:50:19  ivan
-- 
cgit v1.2.1


From 88c566b47401bdac655cf0714f434f01c812f053 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Nov 1998 05:44:20 +0000
Subject: *** empty log message ***

---
 site_perl/CGI.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index 459c6fd49..a5053a617 100644
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -84,7 +84,7 @@ sub idiot {
   my($cgi)=FS::UID::cgi;
   if ( $cgi->isa('CGI::Base') ) {
     no strict 'subs';
-    CGI::Base::SendHeaders;
+    &CGI::Base::SendHeaders;
   } else {
     print $cgi->header;
   }
@@ -141,7 +141,7 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 pod ivan@sisd.com 98-sep-12
 
 $Log: CGI.pm,v $
-Revision 1.5  1998-11-09 05:23:55  ivan
+Revision 1.6  1998-11-09 05:44:20  ivan
 *** empty log message ***
 
 Revision 1.4  1998/11/09 04:55:42  ivan
-- 
cgit v1.2.1


From 51e93bcc017e9355408ff25f232dd9183b62b196 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Nov 1998 06:10:59 +0000
Subject: added sub url

---
 site_perl/CGI.pm | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index a5053a617..8970b301c 100644
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -4,11 +4,12 @@ use strict;
 use vars qw(@EXPORT_OK @ISA);
 use Exporter;
 use CGI;
+use URI::URL;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID;
 
 @ISA = qw(Exporter);
-@EXPORT_OK = qw(header menubar idiot eidiot);
+@EXPORT_OK = qw(header menubar idiot eidiot url);
 
 =head1 NAME
 
@@ -16,7 +17,7 @@ FS::CGI - Subroutines for the web interface
 
 =head1 SYNOPSIS
 
-  use FS::CGI qw(header menubar idiot eidiot);
+  use FS::CGI qw(header menubar idiot eidiot url);
 
   print header( 'Title', '' );
   print header( 'Title', menubar('item', 'URL', ... ) );
@@ -24,6 +25,9 @@ FS::CGI - Subroutines for the web interface
   idiot "error message"; 
   eidiot "error message";
 
+  $url = url; #returns current url
+  $url = url (3); #three levels up
+
 =head1 DESCRIPTION
 
 Provides a few common subroutines for the web interface.
@@ -117,6 +121,22 @@ sub eidiot {
   exit;
 }
 
+=item url LEVEL
+
+Returns current URL with LEVEL levels of path removed from the end (default 0).
+
+=cut
+
+=item url {
+  my($up)=@_;
+  my($cgi)=FS::UID::cgi;
+  my($url)=new URI::URL $cgi;
+  my(@path)=$url->path_components;
+  pop @path foreach ( 1.. $up );
+  $url->path_components(@path);
+  $url->as_string;
+}
+
 =back
 
 =head1 BUGS
@@ -141,7 +161,10 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 pod ivan@sisd.com 98-sep-12
 
 $Log: CGI.pm,v $
-Revision 1.6  1998-11-09 05:44:20  ivan
+Revision 1.7  1998-11-09 06:10:59  ivan
+added sub url
+
+Revision 1.6  1998/11/09 05:44:20  ivan
 *** empty log message ***
 
 Revision 1.4  1998/11/09 04:55:42  ivan
-- 
cgit v1.2.1


From 4f87febc191d608982458d4f1098dcb41eb59663 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Nov 1998 08:18:38 +0000
Subject: s/agrep/String::Approx/

---
 htdocs/docs/install.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index c4784ebf6..da80a5a6c 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -7,8 +7,7 @@ Before installing, you need:
 <ul>
   <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
   <li><a href="ftp://ftp.cs.hut.fi/pub/ssh/">SSH</a>
-  <li>agrep from the <a href="http://glimpse.cs.arizona.edu">Glimpse</a> distribution, if you want fuzzy searching capability
-  <li><a href="http://www.perl.com/CPANl/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_04)
+  <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_04)
   <li>A database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>, such as <a href="http://www.tcx.se/">MySQL</a> or <a href="http://www.postgresql.org/">PostgreSQL</a>
   <li>Perl modules
     <ul>
@@ -17,7 +16,6 @@ Before installing, you need:
       <li><a href="http://www.perl.com/CPAN/modules/by-module/MD5">MD5</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Net">libnet</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/LWP/">libwww-perl</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/CGI/">CGI-modules</a> (<b>NOT</b> CGI.pm) with this <a href="CGI-modules-2.76-patch.txt">patch</a> applied
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Business/">Business-CreditCard</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Data/">Data-ShowTable</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Mail/">MailTools</a>
@@ -25,6 +23,7 @@ Before installing, you need:
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Date/">DateManip</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/File/">File-CounterFile</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/FreezeThaw/">FreezeThaw</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/String/">String-Approx</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/DBI/">DBI
       <li><a href="http://www.perl.com/CPAN/modules/by-module/DBD/">DBD for your database engine</a>
     </ul>
-- 
cgit v1.2.1


From edc843524bf4f564ba037acbfe077e8d3930aab1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Nov 1998 08:25:19 +0000
Subject: upgrade to 1.2.x section

---
 htdocs/docs/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/docs/index.html b/htdocs/docs/index.html
index 83c58f321..d593a5e3b 100644
--- a/htdocs/docs/index.html
+++ b/htdocs/docs/index.html
@@ -7,6 +7,7 @@
   <li><a href="install.html">New Installation</a>
   <li><a href="upgrade.html">Upgrading from 1.0.x to 1.1.x</a>
   <li><a href="upgrade2.html">Upgrading from 1.1.x to 1.1.4</a>
+  <li><a href="upgrade3.html">Upgrading from 1.1.x to 1.2.x</a>
   <li><a href="config.html">Configuration files</a>
 <!--
   <li><a href="admin.html">Administration</a>
-- 
cgit v1.2.1


From 7dc264ba036fe5398a2fa1b643bae3187e92cf39 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Nov 1998 08:29:01 +0000
Subject: 1.2.x

---
 htdocs/docs/upgrade3.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 htdocs/docs/upgrade3.html

diff --git a/htdocs/docs/upgrade3.html b/htdocs/docs/upgrade3.html
new file mode 100644
index 000000000..37eead3ef
--- /dev/null
+++ b/htdocs/docs/upgrade3.html
@@ -0,0 +1,12 @@
+<head>
+  <title>Upgrading to 1.2.x</title>
+</head>
+<body>
+<h1>Upgrading to 1.1.x from 1.2.x</h1>
+<ul>
+  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
+  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
+  <li>Back up your data and current Freeside installation.
+  <li>Install the Perl module <li><a href="http://www.perl.com/CPAN/modules/by-module/String/">String-Approx</a>
+  <li>Copy or symlink htdocs and site_perl to the new copies.
+</body>
-- 
cgit v1.2.1


From df964ba058f8727b1818aa90e522a3b201338ab5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Nov 1998 08:36:05 +0000
Subject: haha

---
 site_perl/CGI.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index 8970b301c..611103bc9 100644
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -127,7 +127,7 @@ Returns current URL with LEVEL levels of path removed from the end (default 0).
 
 =cut
 
-=item url {
+sub url {
   my($up)=@_;
   my($cgi)=FS::UID::cgi;
   my($url)=new URI::URL $cgi;
@@ -161,7 +161,10 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 pod ivan@sisd.com 98-sep-12
 
 $Log: CGI.pm,v $
-Revision 1.7  1998-11-09 06:10:59  ivan
+Revision 1.8  1998-11-09 08:36:05  ivan
+haha
+
+Revision 1.7  1998/11/09 06:10:59  ivan
 added sub url
 
 Revision 1.6  1998/11/09 05:44:20  ivan
-- 
cgit v1.2.1


From 2deaee13bb208dc802dd140700db4c881e8a2834 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Nov 1998 08:51:49 +0000
Subject: bug squash

---
 site_perl/CGI.pm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index 611103bc9..780f54123 100644
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -9,7 +9,7 @@ use CGI::Carp qw(fatalsToBrowser);
 use FS::UID;
 
 @ISA = qw(Exporter);
-@EXPORT_OK = qw(header menubar idiot eidiot url);
+@EXPORT_OK = qw(header menubar idiot eidiot popurl);
 
 =head1 NAME
 
@@ -17,7 +17,7 @@ FS::CGI - Subroutines for the web interface
 
 =head1 SYNOPSIS
 
-  use FS::CGI qw(header menubar idiot eidiot url);
+  use FS::CGI qw(header menubar idiot eidiot popurl);
 
   print header( 'Title', '' );
   print header( 'Title', menubar('item', 'URL', ... ) );
@@ -25,8 +25,8 @@ FS::CGI - Subroutines for the web interface
   idiot "error message"; 
   eidiot "error message";
 
-  $url = url; #returns current url
-  $url = url (3); #three levels up
+  $url = popurl; #returns current url
+  $url = popurl(3); #three levels up
 
 =head1 DESCRIPTION
 
@@ -121,18 +121,18 @@ sub eidiot {
   exit;
 }
 
-=item url LEVEL
+=item popurl LEVEL
 
 Returns current URL with LEVEL levels of path removed from the end (default 0).
 
 =cut
 
-sub url {
+sub popurl {
   my($up)=@_;
-  my($cgi)=FS::UID::cgi;
-  my($url)=new URI::URL $cgi;
+  my($cgi)=&FS::UID::cgi;
+  my($url)=new URI::URL $cgi->url;
   my(@path)=$url->path_components;
-  pop @path foreach ( 1.. $up );
+  splice @path, 0-$up;
   $url->path_components(@path);
   $url->as_string;
 }
@@ -161,8 +161,8 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 pod ivan@sisd.com 98-sep-12
 
 $Log: CGI.pm,v $
-Revision 1.8  1998-11-09 08:36:05  ivan
-haha
+Revision 1.9  1998-11-09 08:51:49  ivan
+bug squash
 
 Revision 1.7  1998/11/09 06:10:59  ivan
 added sub url
-- 
cgit v1.2.1


From 2fd13f43241bd70747acd2e854f55c01f8811a51 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Nov 1998 22:24:03 +0000
Subject: default company_on and last_on CHECKED

---
 htdocs/search/cust_main.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/search/cust_main.html b/htdocs/search/cust_main.html
index 656943f9c..ebe9d21c4 100755
--- a/htdocs/search/cust_main.html
+++ b/htdocs/search/cust_main.html
@@ -2,22 +2,22 @@
   <HEAD>
     <TITLE>Customer Search</TITLE>
   </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Customer Search</H1>
-    </CENTER>
-    <HR>
+  <BODY BGCOLOR="#ffffff">
+    <FONT COLOR="#ff0000" SIZE=7>
+      Customer Search</H1>
+    </FONT>
+    <BR>
     <FORM ACTION="cust_main.cgi" METHOD="post">
-      <INPUT TYPE="checkbox" NAME="last_on"> Search for <B>last name</B>: 
+      <INPUT TYPE="checkbox" NAME="last_on" CHECKED> Search for <B>last name</B>: 
       <INPUT TYPE="text" NAME="last_text">
-      using search method(s): <SELECT NAME="last_type" MULTIPLE>
+      using search method: <SELECT NAME="last_type">
         <OPTION SELECTED>Fuzzy
         <OPTION>Exact
       </SELECT>
 
-      <P><INPUT TYPE="checkbox" NAME="company_on"> Search for <B>company</B>: 
+      <P><INPUT TYPE="checkbox" NAME="company_on" CHECKED> Search for <B>company</B>: 
       <INPUT TYPE="text" NAME="company_text">
-      using search methods(s): <SELECT NAME="company_type" MULTIPLE>
+      using search methods: <SELECT NAME="company_type">
         <OPTION SELECTED>Fuzzy
         <OPTION>Exact
       </SELECT>
-- 
cgit v1.2.1


From 7b4c86d9d13a25ad740a3e30112b114c72be1bc0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 10 Nov 1998 02:24:26 +0000
Subject: *** empty log message ***

---
 htdocs/search/cust_main-payinfo.html | 11 +++++------
 htdocs/search/cust_main.html         |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/search/cust_main-payinfo.html b/htdocs/search/cust_main-payinfo.html
index 92341ad13..47bb83cbd 100755
--- a/htdocs/search/cust_main-payinfo.html
+++ b/htdocs/search/cust_main-payinfo.html
@@ -2,11 +2,11 @@
   <HEAD>
     <TITLE>Customer Search</TITLE>
   </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Customer Search</H1>
-    </CENTER>
-    <HR>
+  <BODY BGCOLOR="#ffffff">
+    <FONT COLOR="#ff0000" SIZE=7>
+      Customer Search
+    </FONT>
+    <BR>
     <FORM ACTION="cust_main.cgi" METHOD="post">
       Search for <B>Credit card #</B>: 
       <INPUT TYPE="hidden" NAME="card_on" VALUE="TRUE">
@@ -15,7 +15,6 @@
       <P><INPUT TYPE="submit" VALUE="Search">
 
     </FORM>
-    <HR>
   </BODY>
 </HTML>
 
diff --git a/htdocs/search/cust_main.html b/htdocs/search/cust_main.html
index ebe9d21c4..3184698b4 100755
--- a/htdocs/search/cust_main.html
+++ b/htdocs/search/cust_main.html
@@ -4,7 +4,7 @@
   </HEAD>
   <BODY BGCOLOR="#ffffff">
     <FONT COLOR="#ff0000" SIZE=7>
-      Customer Search</H1>
+      Customer Search
     </FONT>
     <BR>
     <FORM ACTION="cust_main.cgi" METHOD="post">
-- 
cgit v1.2.1


From 3fe0d21e75cc7f4d25f0df35c0c2723526007c22 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 10 Nov 1998 07:44:08 +0000
Subject: qsearch returns `FS::TABLE' objects if that module is loaded (i.e.
 via `use FS::cust_main;') instead of always an FS::Record object

---
 site_perl/Record.pm | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/site_perl/Record.pm b/site_perl/Record.pm
index 87de48cc4..10cc8da11 100644
--- a/site_perl/Record.pm
+++ b/site_perl/Record.pm
@@ -151,7 +151,9 @@ sub new {
 =item qsearch TABLE, HASHREF
 
 Searches the database for all records matching (at least) the key/value pairs
-in HASHREF.  Returns all the records found as FS::Record objects.
+in HASHREF.  Returns all the records found as objects blessed into 
+`FS::TABLE' if that module is loaded (i.e. via `use FS::cust_main;'), otherwise
+returns an FS::Record object;
 
 =cut
 
@@ -173,19 +175,24 @@ sub qsearch {
   $sth=$dbh->prepare($statement)
     or croak $dbh->errstr; #is that a little too harsh?  hmm.
 
-  map {
-    new FS::Record ($table,$sth->fetchrow_hashref);
-  } ( 1 .. $sth->execute );
+  if ( eval ' scalar(@FS::'. $table. '::ISA);' ) {
+    map {
+      eval 'create FS::'. $table. ' ( $sth->fetchrow_hashref );';
+    } ( 1 .. $sth->execute );
+  } else {
+    carp "qsearch: warning: FS::$table not loaded; returning generic FS::Record objects";
+    map {
+      new FS::Record ($table,$sth->fetchrow_hashref);
+    } ( 1 .. $sth->execute );
+  }
 
 }
 
 =item qsearchs TABLE, HASHREF
 
-Searches the database for a record matching (at least) the key/value pairs
-in HASHREF, and returns the record found as an FS::Record object.  If more than
-one record matches, it B<carp>s but returns the first.  If this happens, you
-either made a logic error in asking for a single item, or your data is
-corrupted.
+Same as qsearch, except that if more than one record matches, it B<carp>s but
+returns the first.  If this happens, you either made a logic error in asking
+for a single item, or your data is corrupted.
 
 =cut
 
@@ -768,7 +775,7 @@ The ut_ methods should ask the dbdef for a default length.
 
 ut_sqltype (like ut_varchar) should all be defined
 
-A fallback check method should be provided with uses the dbdef.
+A fallback check method should be provided whith uses the dbdef.
 
 The ut_money method assumes money has two decimal digits.
 
@@ -863,7 +870,11 @@ added pod documentation ivan@sisd.com 98-sep-6
 ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
 $Log: Record.pm,v $
-Revision 1.2  1998-11-07 05:17:18  ivan
+Revision 1.3  1998-11-10 07:44:08  ivan
+qsearch returns `FS::TABLE' objects if that module is loaded (i.e. via
+`use FS::cust_main;') instead of always an FS::Record object
+
+Revision 1.2  1998/11/07 05:17:18  ivan
 In sub new, Pg wrapper for money fields from dbdef (FS::Record::fields $table),
 not keys of supplied hashref.
 
-- 
cgit v1.2.1


From 4f16a1997d44c4440bdf2f60d6a9dc4d1c7818c8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 10 Nov 1998 07:45:25 +0000
Subject: doc clarification

---
 site_perl/Record.pm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/site_perl/Record.pm b/site_perl/Record.pm
index 10cc8da11..a90e76b1e 100644
--- a/site_perl/Record.pm
+++ b/site_perl/Record.pm
@@ -151,9 +151,9 @@ sub new {
 =item qsearch TABLE, HASHREF
 
 Searches the database for all records matching (at least) the key/value pairs
-in HASHREF.  Returns all the records found as objects blessed into 
-`FS::TABLE' if that module is loaded (i.e. via `use FS::cust_main;'), otherwise
-returns an FS::Record object;
+in HASHREF.  Returns all the records found as `FS::TABLE' objects if that
+module is loaded (i.e. via `use FS::cust_main;'), otherwise returns FS::Record
+objects.
 
 =cut
 
@@ -870,9 +870,8 @@ added pod documentation ivan@sisd.com 98-sep-6
 ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
 $Log: Record.pm,v $
-Revision 1.3  1998-11-10 07:44:08  ivan
-qsearch returns `FS::TABLE' objects if that module is loaded (i.e. via
-`use FS::cust_main;') instead of always an FS::Record object
+Revision 1.4  1998-11-10 07:45:25  ivan
+doc clarification
 
 Revision 1.2  1998/11/07 05:17:18  ivan
 In sub new, Pg wrapper for money fields from dbdef (FS::Record::fields $table),
-- 
cgit v1.2.1


From 8299d91d82411736a782df35df2f30ad2efe2b0d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Nov 1998 01:53:47 +0000
Subject: added table command

---
 site_perl/CGI.pm | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index 780f54123..a51066eae 100644
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -9,7 +9,7 @@ use CGI::Carp qw(fatalsToBrowser);
 use FS::UID;
 
 @ISA = qw(Exporter);
-@EXPORT_OK = qw(header menubar idiot eidiot popurl);
+@EXPORT_OK = qw(header menubar idiot eidiot popurl table);
 
 =head1 NAME
 
@@ -137,6 +137,16 @@ sub popurl {
   $url->as_string;
 }
 
+=item table
+
+Returns HTML tag for beginning a table.
+
+=cut
+
+sub table {
+  "<TABLE BORDER>";
+}
+
 =back
 
 =head1 BUGS
@@ -161,7 +171,10 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 pod ivan@sisd.com 98-sep-12
 
 $Log: CGI.pm,v $
-Revision 1.9  1998-11-09 08:51:49  ivan
+Revision 1.10  1998-11-12 01:53:47  ivan
+added table command
+
+Revision 1.9  1998/11/09 08:51:49  ivan
 bug squash
 
 Revision 1.7  1998/11/09 06:10:59  ivan
-- 
cgit v1.2.1


From 8f056c54e593bcc77c07bd89ec83155e14e0687c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Nov 1998 03:32:46 +0000
Subject: added label method

---
 site_perl/cust_svc.pm | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/site_perl/cust_svc.pm b/site_perl/cust_svc.pm
index 1d5051b1f..2207eddba 100644
--- a/site_perl/cust_svc.pm
+++ b/site_perl/cust_svc.pm
@@ -2,6 +2,7 @@ package FS::cust_svc;
 
 use strict;
 use vars qw(@ISA);
+use Carp;
 use Exporter;
 use FS::Record qw(fields qsearchs);
 
@@ -26,6 +27,8 @@ FS::cust_svc - Object method for cust_svc objects
 
   $error = $record->check;
 
+  ($label, $value) = $record->label;
+
 =head1 DESCRIPTION
 
 An FS::cust_svc represents a service.  FS::cust_svc inherits from FS::Record.
@@ -140,6 +143,34 @@ sub check {
   ''; #no error
 }
 
+=item label
+
+Returns a pretty-printed label and value for this service, i.e. `username' and
+`foobar' or `domain' and `foo.bar'.
+
+=cut
+
+sub label {
+  my($self)=@_;
+  my($part_svc) = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
+  my($svcdb) = $part_svc->svcdb;
+  my($svc) = qsearchs( $svcdb, { 'svcnum' => $self->svcnum } );
+  if ( $svcdb eq 'svc_acct' ) {
+    return 'username', $svc->getfield('username');
+  } elsif ( $svcdb eq 'svc_acct_sm' ) {
+    my $domuser = $svc->domuser eq '*' ? '(anything)' : $svc->domuser;
+    my $svc_domain = qsearchs ( 'svc_domain', { 'svcnum' => $svc->domsvc } );
+    my $domain = $svc_domain->domain;
+    return 'email', "$domuser\@$domain";
+  } elsif ( $svcdb eq 'svc_domain' ) {
+    return 'domain', $svc->getfield('domain');
+  } else {
+    carp "warning: asked for label of unsupported svcdb; using svcnum";
+    return 'svcnum', $svc->getfield('svcnum');
+  }
+
+}
+
 =back
 
 =head1 BUGS
@@ -147,7 +178,7 @@ sub check {
 Behaviour of changing the svcpart of cust_svc records is undefined and should
 possibly be prohibited, and pkg_svc records are not checked.
 
-pkg_svc records are not checket in general (here).
+pkg_svc records are not checked in general (here).
 
 =head1 SEE ALSO
 
@@ -162,6 +193,11 @@ no TableUtil, no FS::Lock ivan@sisd.com 98-mar-7
 
 pod ivan@sisd.com 98-sep-21
 
+$Log: cust_svc.pm,v $
+Revision 1.2  1998-11-12 03:32:46  ivan
+added label method
+
+
 =cut
 
 1;
-- 
cgit v1.2.1


From 150fc6e8f81825c8db41267e1a990eb93ab33955 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Nov 1998 03:42:45 +0000
Subject: added label method

---
 site_perl/cust_pkg.pm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/site_perl/cust_pkg.pm b/site_perl/cust_pkg.pm
index 7dc5aa7ec..249e1b77c 100644
--- a/site_perl/cust_pkg.pm
+++ b/site_perl/cust_pkg.pm
@@ -6,6 +6,7 @@ use Exporter;
 use FS::UID qw(getotaker);
 use FS::Record qw(fields qsearch qsearchs);
 use FS::cust_svc;
+use FS::part_pkg;
 
 @ISA = qw(FS::Record Exporter);
 
@@ -34,6 +35,8 @@ FS::cust_pkg - Object methods for cust_pkg objects
 
   $error = $record->unsuspend;
 
+  $part_pkg = $record->part_pkg;
+
   $error = FS::cust_pkg::order( $custnum, \@pkgparts );
   $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );
 
@@ -356,6 +359,18 @@ sub unsuspend {
   ''; #no errors
 }
 
+=item part_pkg
+
+Returns the definition for this billing item, as an FS::part_pkg object (see
+L<FS::part_pkg).
+
+=cut
+
+sub part_pkg {
+  my($self)=@_;
+  qsearchs('part_pkg', { 'pkgpart' => $self->pkgpart });
+}
+
 =back
 
 =head1 SUBROUTINES
@@ -501,6 +516,11 @@ fixed for new agent->agent_type->type_pkgs in &order ivan@sisd.com 98-mar-7
 
 pod ivan@sisd.com 98-sep-21
 
+$Log: cust_pkg.pm,v $
+Revision 1.2  1998-11-12 03:42:45  ivan
+added label method
+
+
 =cut
 
 1;
-- 
cgit v1.2.1


From 982671e7e45dae36861152f1c320017c08dd15f9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Nov 1998 03:45:38 +0000
Subject: use FS::table_name for all tables qsearch()'ed

---
 site_perl/cust_svc.pm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/site_perl/cust_svc.pm b/site_perl/cust_svc.pm
index 2207eddba..6f5b276a0 100644
--- a/site_perl/cust_svc.pm
+++ b/site_perl/cust_svc.pm
@@ -5,6 +5,12 @@ use vars qw(@ISA);
 use Carp;
 use Exporter;
 use FS::Record qw(fields qsearchs);
+use FS::cust_pkg;
+use FS::part_pkg;
+use FS::part_svc;
+use FS::svc_acct;
+use FS::svc_acct_sm;
+use FS::svc_domain;
 
 @ISA = qw(FS::Record Exporter);
 
@@ -194,7 +200,10 @@ no TableUtil, no FS::Lock ivan@sisd.com 98-mar-7
 pod ivan@sisd.com 98-sep-21
 
 $Log: cust_svc.pm,v $
-Revision 1.2  1998-11-12 03:32:46  ivan
+Revision 1.3  1998-11-12 03:45:38  ivan
+use FS::table_name for all tables qsearch()'ed
+
+Revision 1.2  1998/11/12 03:32:46  ivan
 added label method
 
 
-- 
cgit v1.2.1


From 6a8c326781cd4f3dc7d02f512a5fe4ff85274ac1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Nov 1998 07:43:54 +0000
Subject: *** empty log message ***

---
 site_perl/CGI.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index a51066eae..65bf2012d 100644
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -144,7 +144,7 @@ Returns HTML tag for beginning a table.
 =cut
 
 sub table {
-  "<TABLE BORDER>";
+  "<TABLE BORDER=1>";
 }
 
 =back
@@ -171,7 +171,10 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 pod ivan@sisd.com 98-sep-12
 
 $Log: CGI.pm,v $
-Revision 1.10  1998-11-12 01:53:47  ivan
+Revision 1.11  1998-11-12 07:43:54  ivan
+*** empty log message ***
+
+Revision 1.10  1998/11/12 01:53:47  ivan
 added table command
 
 Revision 1.9  1998/11/09 08:51:49  ivan
-- 
cgit v1.2.1


From b9b5997d1cf1ec8e945613756c645b8f00389da1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Nov 1998 07:58:15 +0000
Subject: added svcdb to label

---
 site_perl/cust_svc.pm | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/site_perl/cust_svc.pm b/site_perl/cust_svc.pm
index 6f5b276a0..ef93f86da 100644
--- a/site_perl/cust_svc.pm
+++ b/site_perl/cust_svc.pm
@@ -151,8 +151,10 @@ sub check {
 
 =item label
 
-Returns a pretty-printed label and value for this service, i.e. `username' and
-`foobar' or `domain' and `foo.bar'.
+Returns a list consisting of:
+- The name of this service (from part_svc)
+- A meaningful identifier (username, domain, or mail alias)
+- The table name (i.e. svc_domain) for this service
 
 =cut
 
@@ -160,21 +162,23 @@ sub label {
   my($self)=@_;
   my($part_svc) = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
   my($svcdb) = $part_svc->svcdb;
-  my($svc) = qsearchs( $svcdb, { 'svcnum' => $self->svcnum } );
+  my($svc_x) = qsearchs( $svcdb, { 'svcnum' => $self->svcnum } );
+  my($svc) = $part_svc->svc;
+  my($tag);
   if ( $svcdb eq 'svc_acct' ) {
-    return 'username', $svc->getfield('username');
+    $tag = $svc_x->getfield('username');
   } elsif ( $svcdb eq 'svc_acct_sm' ) {
-    my $domuser = $svc->domuser eq '*' ? '(anything)' : $svc->domuser;
-    my $svc_domain = qsearchs ( 'svc_domain', { 'svcnum' => $svc->domsvc } );
+    my $domuser = $svc_x->domuser eq '*' ? '(anything)' : $svc_x->domuser;
+    my $svc_domain = qsearchs ( 'svc_domain', { 'svcnum' => $svc_x->domsvc } );
     my $domain = $svc_domain->domain;
-    return 'email', "$domuser\@$domain";
+    $tag = "$domuser\@$domain";
   } elsif ( $svcdb eq 'svc_domain' ) {
-    return 'domain', $svc->getfield('domain');
+    return $svc, $svc_x->getfield('domain');
   } else {
     carp "warning: asked for label of unsupported svcdb; using svcnum";
-    return 'svcnum', $svc->getfield('svcnum');
+    $tag = $svc_x->getfield('svcnum');
   }
-
+  $svc, $tag, $svcdb;
 }
 
 =back
@@ -200,7 +204,10 @@ no TableUtil, no FS::Lock ivan@sisd.com 98-mar-7
 pod ivan@sisd.com 98-sep-21
 
 $Log: cust_svc.pm,v $
-Revision 1.3  1998-11-12 03:45:38  ivan
+Revision 1.4  1998-11-12 07:58:15  ivan
+added svcdb to label
+
+Revision 1.3  1998/11/12 03:45:38  ivan
 use FS::table_name for all tables qsearch()'ed
 
 Revision 1.2  1998/11/12 03:32:46  ivan
-- 
cgit v1.2.1


From eff723e08a60715418e03a3fe1f88b4233087cd9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Nov 1998 08:10:22 +0000
Subject: CGI.pm instead of CGI-modules relative URLs using popurl got rid of
 lots of little tables s/agrep/String::Approx/; bubble up packages and
 services and link (slow)

---
 htdocs/search/cust_main.cgi | 159 +++++++++++++++++++++++++-------------------
 1 file changed, 91 insertions(+), 68 deletions(-)

diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index 70ce991f7..c228c9a24 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -17,43 +17,58 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
+#
+# $Log: cust_main.cgi,v $
+# Revision 1.2  1998-11-12 08:10:22  ivan
+# CGI.pm instead of CGI-modules
+# relative URLs using popurl
+# got rid of lots of little tables
+# s/agrep/String::Approx/;
+# bubble up packages and services and link (slow)
+#
 
 use strict;
-use CGI::Request;
+use vars qw(%ncancelled_pkgs %all_pkgs);
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use IO::Handle;
-use IPC::Open2;
+use String::Approx qw(amatch);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header idiot);
+use FS::CGI qw(header menubar idiot popurl table);
+use FS::cust_main;
 
-my($fuzziness)=2; #fuzziness for fuzzy searches, see man agrep
-                  #0-4: 0=no fuzz, 4=very fuzzy (too much fuzz!)
-
-my($req)=new CGI::Request;
-&cgisuidsetup($req->cgi);
+my($cgi)=new CGI;
+cgisuidsetup($cgi);
 
 my(@cust_main);
 my($sortby);
 
-my($query)=$req->cgi->var('QUERY_STRING');
-if ( $query eq 'custnum' ) {
-  $sortby=\*custnum_sort;
-  @cust_main=qsearch('cust_main',{});  
-} elsif ( $query eq 'last' ) {
-  $sortby=\*last_sort;
-  @cust_main=qsearch('cust_main',{});  
-} elsif ( $query eq 'company' ) {
-  $sortby=\*company_sort;
-  @cust_main=qsearch('cust_main',{});  
+if ( $cgi->keywords ) {
+  my($query)=$cgi->keywords;
+  if ( $query eq 'custnum' ) {
+    $sortby=\*custnum_sort;
+    @cust_main=qsearch('cust_main',{});  
+  } elsif ( $query eq 'last' ) {
+    $sortby=\*last_sort;
+    @cust_main=qsearch('cust_main',{});  
+  } elsif ( $query eq 'company' ) {
+    $sortby=\*company_sort;
+    @cust_main=qsearch('cust_main',{});
+  }
 } else {
-  &cardsearch if ($req->param('card_on') );
-  &lastsearch if ($req->param('last_on') );
-  &companysearch if ($req->param('company_on') );
+  &cardsearch if ( $cgi->param('card_on') && $cgi->param('card') );
+  &lastsearch if ( $cgi->param('last_on') && $cgi->param('last_text') );
+  &companysearch if ( $cgi->param('company_on') && $cgi->param('company_text') );
 }
 
+my(%ncancelled_pkgs) =
+  map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
+my(%all_pkgs) = 
+  map { $_->custnum => [ $_->all_pkgs ] } @cust_main;
+
 if ( scalar(@cust_main) == 1 ) {
-  $req->cgi->redirect("../view/cust_main.cgi?". $cust_main[0]->custnum);
+  print $cgi->redirect(popurl(2). "/view/cust_main.cgi?". $cust_main[0]->custnum);
   exit;
 } elsif ( scalar(@cust_main) == 0 ) {
   idiot "No matching customers found!\n";
@@ -61,20 +76,18 @@ if ( scalar(@cust_main) == 1 ) {
 } else { 
 
   my($total)=scalar(@cust_main);
-  CGI::Base::SendHeaders(); # one guess
-  print header("Customer Search Results",''), <<END;
-
-    $total matching customers found
-    <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
+  print $cgi->header, header("Customer Search Results",menubar(
+    'Main Menu', popurl(2)
+  )), "$total matching customers found<BR>", table, <<END;
       <TR>
-        <TH>Cust. #</TH>
+        <TH></TH>
         <TH>Contact name</TH>
         <TH>Company</TH>
+        <TH>Packages</TH>
+        <TH COLSPAN=2>Services</TH>
       </TR>
 END
 
-  my($lines)=16;
-  my($lcount)=$lines;
   my(%saw,$cust_main);
   foreach $cust_main (
     sort $sortby grep(!$saw{$_->custnum}++, @cust_main)
@@ -85,25 +98,47 @@ END
       $cust_main->getfield('first'),
       $cust_main->company,
     );
+
+    my(@lol_cust_svc);
+    my($rowspan)=0;#scalar( @{$all_pkgs{$custnum}} );
+    foreach ( @{$all_pkgs{$custnum}} ) {
+      my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
+      push @lol_cust_svc, \@cust_svc;
+      $rowspan += scalar(@cust_svc) || 1;
+    }
+
+    #my($rowspan) = scalar(@{$all_pkgs{$custnum}});
+    my($view) = popurl(2). "/view/cust_main.cgi?$custnum";
     print <<END;
     <TR>
-      <TD><A HREF="../view/cust_main.cgi?$custnum"><FONT SIZE=-1>$custnum</FONT></A></TD>
-      <TD><FONT SIZE=-1>$last, $first</FONT></TD>
-      <TD><FONT SIZE=-1>$company</FONT></TD>
-    </TR>
-END
-    if ($lcount-- == 0) { # lots of little tables instead of one big one
-      $lcount=$lines;
-      print <<END;   
-  </TABLE>
-  <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
-    <TR>
-      <TH>Cust. #</TH>
-      <TH>Contact name</TH>
-      <TH>Company<TH>
-    </TR>
+      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$custnum</FONT></A></TD>
+      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$last, $first</FONT></A></TD>
+      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$company</FONT></A></TD>
 END
+
+    my($n1)='';
+    foreach ( @{$all_pkgs{$custnum}} ) {
+      my($pkgnum) = ($_->pkgnum);
+      my($pkg) = $_->part_pkg->pkg;
+      my($pkgview) = popurl(2). "/view/cust_pkg.cgi?$pkgnum";
+      #my(@cust_svc) = shift @lol_cust_svc;
+      my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
+      my($rowspan) = scalar(@cust_svc) || 1;
+
+      print $n1, qq!<TD ROWSPAN=$rowspan><A HREF="$pkgview"><FONT SIZE=-1>$pkg</FONT></A></TD>!;
+      my($n2)='';
+      foreach my $cust_svc ( @cust_svc ) {
+         my($label, $value, $svcdb) = $cust_svc->label;
+         my($svcnum) = $cust_svc->svcnum;
+         my($sview) = popurl(2). "/view";
+         print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
+               qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
+         $n2="</TR><TR>";
+      }
+      #print qq!</TR><TR>\n!;
+      $n1="</TR><TR>";
     }
+    print "<\TR>";
   }
  
   print <<END;
@@ -122,6 +157,8 @@ sub last_sort {
 }
 
 sub company_sort {
+  return -1 if $a->company && ! $b->company;
+  return 1 if ! $a->company && $b->company;
   $a->getfield('company') cmp $b->getfield('company');
 }
 
@@ -131,7 +168,7 @@ sub custnum_sort {
 
 sub cardsearch {
 
-  my($card)=$req->param('card');
+  my($card)=$cgi->param('card');
   $card =~ s/\D//g;
   $card =~ /^(\d{13,16})$/ or do { idiot "Illegal card number\n"; exit; };
   my($payinfo)=$1;
@@ -142,11 +179,11 @@ sub cardsearch {
 
 sub lastsearch {
   my(%last_type);
-  foreach ( $req->param('last_type') ) {
+  foreach ( $cgi->param('last_type') ) {
     $last_type{$_}++;
   }
 
-  $req->param('last_text') =~ /^([\w \,\.\-\']*)$/
+  $cgi->param('last_text') =~ /^([\w \,\.\-\']*)$/
     or do { idiot "Illegal last name"; exit; };
   my($last)=$1;
 
@@ -163,16 +200,9 @@ sub lastsearch {
 
     my(@all_last)=map $_->getfield('last'), qsearch('cust_main',{});
     if ($last_type{'Fuzzy'}) { 
-      my($reader,$writer) = ( new IO::Handle, new IO::Handle );
-      open2($reader,$writer,'agrep',"-$fuzziness",'-i','-k',
-            substr($last,0,30));
-      print $writer join("\n",@all_last),"\n";
-      close $writer;
-      while (<$reader>) {
-        chop;
-        $last{$_}++;
-      } 
-      close $reader;
+      foreach ( amatch($last, [ qw(i) ], @all_last) ) {
+        $last{$_}++; 
+      }
     }
 
     #if ($last_type{'Sound-alike'}) {
@@ -189,11 +219,11 @@ sub lastsearch {
 sub companysearch {
 
   my(%company_type);
-  foreach ( $req->param('company_type') ) {
+  foreach ( $cgi->param('company_type') ) {
     $company_type{$_}++ 
   };
 
-  $req->param('company_text') =~ /^([\w \,\.\-\']*)$/
+  $cgi->param('company_text') =~ /^([\w \,\.\-\']*)$/
     or do { idiot "Illegal company"; exit; };
   my($company)=$1;
 
@@ -210,16 +240,9 @@ sub companysearch {
     my(@all_company)=map $_->company, qsearch('cust_main',{});
 
     if ($company_type{'Fuzzy'}) { 
-      my($reader,$writer) = ( new IO::Handle, new IO::Handle );
-      open2($reader,$writer,'agrep',"-$fuzziness",'-i','-k',
-            substr($company,0,30));
-      print $writer join("\n",@all_company),"\n";
-      close $writer;
-      while (<$reader>) {
-        chop;
+      foreach ( amatch($company, [ qw(i) ], @all_company ) ) {
         $company{$_}++;
       }
-      close $reader;
     }
 
     #if ($company_type{'Sound-alike'}) {
-- 
cgit v1.2.1


From d8bb43c4735c6faab56eba98459d8732eb45fa68 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Nov 1998 02:43:32 +0000
Subject: update documentation for new config file format

---
 htdocs/docs/config.html   | 16 ++++++++++++++--
 htdocs/docs/upgrade3.html |  3 ++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index 9b8002601..9bd924f8f 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -3,7 +3,20 @@
 </head>
 <body>
   <h1>Configuration files</h1>
-Configuration files and directories are located in `/var/spool/freeside/conf'.
+Configuration file layout has changed in 1.2.x.
+<ul>
+  <li>First, the file `/usr/local/etc/freeside/mapsecrets' is read.  Each line
+in this file contains a username and filename, separated by whitespace.  Note
+that these are not local usernames - they are passed from Apache (you _did_
+setup <a href="http://www.apache.org/docs/misc/FAQ.html#user-authentication">
+user authetication</a>, correct?).  The default path for the filename is
+`/usr/local/etc/freeside/'.  The specified filename is parsed exactly
+the same as the pre-1.2.x `secrets' file:
+  <li>Three lines: Database engine datasource (for example, `DBI:mysql:freeside' or `DBI:Pg:dbname=freeside'), username, and password.  This file should not be world readable.
+</ul>
+All further configuration files and directories are located in
+`/usr/local/freeside/conf.<i>datasource</i>', for example, 
+`/usr/local/freeside/conf.DBI:Pg:dbname=freeside'
 <ul>
   <li>address - Your company name and address, four lines.
   <li>bsdshellmachines - Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/master.passwd'.
@@ -27,7 +40,6 @@ Configuration files and directories are located in `/var/spool/freeside/conf'.
           <li>registries/internic/to - Email address to which InterNIC domain registrations are sent.
         </ul>
     </ul>
-  <li>secrets - Three lines: Database engine datasource (for example, `DBI:mysql:freeside' or `DBI:Pg:dbname=freeside'), username, and password.  This file should not be world readable.
   <li>sendmailmachines - Your sendmail machines, one per line.  This enables export of `/etc/virtusertable' and `/etc/sendmail.cw'.
   <li>shellmachine - A single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines', it also enables `.qmail-extension' file maintenance.
   <li>shellmachines - Your Linux and System V flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/shadow' files.
diff --git a/htdocs/docs/upgrade3.html b/htdocs/docs/upgrade3.html
index 37eead3ef..181cf2a42 100644
--- a/htdocs/docs/upgrade3.html
+++ b/htdocs/docs/upgrade3.html
@@ -7,6 +7,7 @@
   <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
   <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
   <li>Back up your data and current Freeside installation.
-  <li>Install the Perl module <li><a href="http://www.perl.com/CPAN/modules/by-module/String/">String-Approx</a>
+  <li>Install the Perl module <a href="http://www.perl.com/CPAN/modules/by-module/String/">String-Approx</a>
+  <li><a href="config.html">Configuration file</a> location has changed!
   <li>Copy or symlink htdocs and site_perl to the new copies.
 </body>
-- 
cgit v1.2.1


From dbc31295b1b0b442e6e5cfc6cf64123ef1141c31 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Nov 1998 04:08:44 +0000
Subject: no default default_dir (ironic)

---
 site_perl/Conf.pm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/site_perl/Conf.pm b/site_perl/Conf.pm
index d3ef307c0..96a284f78 100644
--- a/site_perl/Conf.pm
+++ b/site_perl/Conf.pm
@@ -3,8 +3,6 @@ package FS::Conf;
 use vars qw($default_dir);
 use IO::File;
 
-$default_dir='/var/spool/freeside/conf';
-
 =head1 NAME
 
 FS::Conf - Read access to Freeside configuration values
@@ -13,8 +11,10 @@ FS::Conf - Read access to Freeside configuration values
 
   use FS::Conf;
 
+  $conf = new FS::Conf "/config/directory";
+
+  $FS::Conf::default_dir = "/config/directory";
   $conf = new FS::Conf;
-  $conf = new FS::Conf "/non/standard/config/directory";
 
   $dir = $conf->dir;
 
@@ -33,8 +33,8 @@ but this may change in the future.
 
 =item new [ DIRECTORY ]
 
-Create a new configuration object.  Optionally, a non-default directory may
-be specified.
+Create a new configuration object.  A directory arguement is required if
+$FS::Conf::default_dir has not been set.
 
 =cut
 
@@ -94,8 +94,6 @@ sub exists {
 
 =head1 BUGS
 
-The option to specify a non-default directory should probably be removed.
-
 Write access (with locking) should be implemented.
 
 =head1 SEE ALSO
@@ -108,6 +106,11 @@ Ivan Kohler <ivan@sisd.com> 98-sep-6
 
 sub exists forgot to fetch $dir ivan@sisd.com 98-sep-27
 
+$Log: Conf.pm,v $
+Revision 1.2  1998-11-13 04:08:44  ivan
+no default default_dir (ironic)
+
+
 =cut
 
 1;
-- 
cgit v1.2.1


From ace29ec6f4cdcbe3c76f5d874ba58083575e9fec Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Nov 1998 04:45:54 +0000
Subject: secrets files are located in /usr/local/etc/freeside, not just
 default.

---
 htdocs/docs/config.html | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index 9bd924f8f..848456cad 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -9,14 +9,17 @@ Configuration file layout has changed in 1.2.x.
 in this file contains a username and filename, separated by whitespace.  Note
 that these are not local usernames - they are passed from Apache (you _did_
 setup <a href="http://www.apache.org/docs/misc/FAQ.html#user-authentication">
-user authetication</a>, correct?).  The default path for the filename is
+user authetication</a>, correct?).  Filenames are located in 
 `/usr/local/etc/freeside/'.  The specified filename is parsed exactly
 the same as the pre-1.2.x `secrets' file:
-  <li>Three lines: Database engine datasource (for example, `DBI:mysql:freeside' or `DBI:Pg:dbname=freeside'), username, and password.  This file should not be world readable.
+  <li>Three lines: Database engine datasource (for example,
+  `DBI:mysql:freeside' or `DBI:Pg:dbname=freeside'), username, and password.
+  This file should not be world readable.  See the DBI manpage and the manpage
+  for your DBD for the exact syntax.
 </ul>
 All further configuration files and directories are located in
-`/usr/local/freeside/conf.<i>datasource</i>', for example, 
-`/usr/local/freeside/conf.DBI:Pg:dbname=freeside'
+`/usr/local/etc/freeside/conf.<i>datasource</i>', for example, 
+`/usr/local/etc/freeside/conf.DBI:Pg:dbname=freeside'
 <ul>
   <li>address - Your company name and address, four lines.
   <li>bsdshellmachines - Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/master.passwd'.
-- 
cgit v1.2.1


From f6ef3dec7840be2e7ac7c39bed32a7ea68425b2d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Nov 1998 05:15:04 +0000
Subject: more documentation updates for new config location

---
 htdocs/docs/install.html  | 9 +++------
 htdocs/docs/upgrade3.html | 3 +++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index da80a5a6c..8cead6d09 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -44,12 +44,9 @@ cp -r fs-x.y.z/htdocs/* /usr/local/apache/htdocs/freeside</pre> or <pre>ln -s /f
 <pre>cd /usr/local/apache/htdocs/freeside
 chown -R freeside .
 chmod 4755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.cgi search/*.cgi view/*.cgi</pre>
-<li>Create the base Freeside directory `/var/spool/freeside', and the subdirectories `conf', `counters', and `export'.  <pre>mkdir /var/spool/freeside
-mkdir /var/spool/freeside/conf
-mkdir /var/spool/freeside/counters
-mkdir /var/spool/freeside/export
-chown -R freeside /var/spool/freeside</pre>
-  <li>Create the necessary <a href="config.html">configuration files</a>.
+<li>Create the necessary <a href="config.html">configuration files</a>.
+<li>Create the `/usr/local/etc/freeside/counters.<i>datasrc</i>', and 
+  `/usr/local/etc/freeside/export.<i>datasrc</i>' directories for each <i>datasrc</i>.
   <li>Run bin/fs-setup to create the database tables.
 </ul>
 </body>
diff --git a/htdocs/docs/upgrade3.html b/htdocs/docs/upgrade3.html
index 181cf2a42..bfb717cfa 100644
--- a/htdocs/docs/upgrade3.html
+++ b/htdocs/docs/upgrade3.html
@@ -9,5 +9,8 @@
   <li>Back up your data and current Freeside installation.
   <li>Install the Perl module <a href="http://www.perl.com/CPAN/modules/by-module/String/">String-Approx</a>
   <li><a href="config.html">Configuration file</a> location has changed!
+  <li>Move /var/spool/freeside/dbdef.<i>datasrc</i> to /usr/local/etc/freeside/dbdef.<i>datasrc</i>.
+  <li>Move /var/spool/freeside/counters to /usr/local/etc/freeside/counters.<i>datasrc</i>.
+  <li>Move /var/spool/freeside/export to /usr/local/etc/freeside/export.<i>datasrc</i>.
   <li>Copy or symlink htdocs and site_perl to the new copies.
 </body>
-- 
cgit v1.2.1


From 0bf5ad9ff0a65195db88ed0bac3aa11c33ec1ad3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Nov 1998 09:56:57 +0000
Subject: change configuration file layout to support multiple distinct
 databases (with own set of config files, export, etc.)

---
 TODO                            |  19 ++++---
 htdocs/docs/man/CGI.txt         |  36 ++++++++++++--
 htdocs/docs/man/Conf.txt        |  17 ++++---
 htdocs/docs/man/Record.txt      |  27 +++++++---
 htdocs/docs/man/UID.txt         |  64 ++++++++++++++++++++----
 htdocs/docs/man/cust_bill.txt   |   8 +++
 htdocs/docs/man/cust_main.txt   |   8 +++
 htdocs/docs/man/cust_pkg.txt    |  13 +++++
 htdocs/docs/man/cust_svc.txt    |  22 ++++++++-
 htdocs/docs/man/dbdef_table.txt |   9 ++--
 htdocs/docs/man/svc_acct.txt    |   6 +++
 htdocs/docs/man/svc_domain.txt  |  18 +++++++
 htdocs/edit/agent_type.cgi      |  15 +++---
 htdocs/edit/svc_acct_pop.cgi    |  17 ++++---
 htdocs/edit/svc_domain.cgi      |  22 ++++++---
 htdocs/view/cust_pkg.cgi        |  19 ++++---
 htdocs/view/svc_domain.cgi      |  16 +++---
 site_perl/Record.pm             |  17 ++++---
 site_perl/UID.pm                | 106 ++++++++++++++++++++++++++++++++--------
 site_perl/cust_bill.pm          |  14 ++++--
 site_perl/cust_main.pm          |  72 +++++++++++++++------------
 site_perl/svc_acct.pm           |  17 +++++--
 site_perl/svc_acct_sm.pm        |  12 +++--
 site_perl/svc_domain.pm         |  91 +++++++++++++---------------------
 24 files changed, 460 insertions(+), 205 deletions(-)

diff --git a/TODO b/TODO
index 71535acc9..1d21d81ad 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.12 1998-11-07 08:25:10 ivan Exp $
+$Id: TODO,v 1.13 1998-11-13 09:56:33 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,14 +6,18 @@ duplication of effort.
 
 -- 1.1.x --
 
-qsearch[s] (or just put in new?) in FS::Record should bless the object
-into the appropriate derived class automagically, if possible?
+remove whois_hack set to 1 for svc_domain.pm?  add all known registries and
+whois accordingly.
+
+get rid of all relative URL's (have to make them on the fly) - see doc for
+->redirect in CGI.pm
 
 radius logfile parsing and perl expression check.
 
-mailing list archive, faq
+faq
 
-(test cust_main.pm with cybercash v2 and v3)
+(test cust_main.pm with cybercash v2 and v3, especially with the callback
+ stuff)
 
 Fix in cust_bill BUGS: 
 There is an off-by-one error in print_text which causes a visual error (Page 1
@@ -25,8 +29,6 @@ rep silliness!
 fields should be a method against a FS::Record or derived object, as well as
 being something you can call as FS::Record::fields('tablename').  Might
 even be able to handle both in the same routine (that would be neato).
-Get rid of hfields and other assorted silliness.
-Clean up hfields/sfields/fields crap.  yuck.
 
 Override FS::Record new, add, rep and del (create, insert, replace and
 delete) in all derived classes.
@@ -297,9 +299,6 @@ export a debian-style (also redhat and?) /etc/group file aswell!
 seems to be an off-by-one error in the ascii invoice formatting which is saying
 "1 of 2" pages when there is only one.
 
-get rid of agrep?  needs the (non-free) glimpse distribution.  agrep used to
-be free?  what else can do fuzzy searching?
-
 site_perl/svc_domain.cgi (hmm... or maybe should have a button?  or maybe svc_domain.pm should handle this) should set $whois_hack for non-internic domains, so you can add them...
 
 svc_acct_sm.import qmail import should pull in recipientmap people too.
diff --git a/htdocs/docs/man/CGI.txt b/htdocs/docs/man/CGI.txt
index 54f9b8a6a..15a5ca17d 100644
--- a/htdocs/docs/man/CGI.txt
+++ b/htdocs/docs/man/CGI.txt
@@ -2,7 +2,7 @@ NAME
     FS::CGI - Subroutines for the web interface
 
 SYNOPSIS
-      use FS::CGI qw(header menubar idiot eidiot);
+      use FS::CGI qw(header menubar idiot eidiot popurl);
 
       print header( 'Title', '' );
       print header( 'Title', menubar('item', 'URL', ... ) );
@@ -10,6 +10,9 @@ SYNOPSIS
       idiot "error message"; 
       eidiot "error message";
 
+      $url = popurl; #returns current url
+      $url = popurl(3); #three levels up
+
 DESCRIPTION
     Provides a few common subroutines for the web interface.
 
@@ -26,15 +29,20 @@ SUBROUTINES
     eidiot ERROR
         Sends headers and an HTML error message, then exits.
 
+    popurl LEVEL
+        Returns current URL with LEVEL levels of path removed from
+        the end (default 0).
+
+    table
+        Returns HTML tag for beginning a table.
+
 BUGS
     Not OO.
 
     Not complete.
 
-    Uses CGI-modules instead of CGI.pm
-
 SEE ALSO
-    the CGI::Base manpage
+    the CGI manpage, the CGI::Base manpage
 
 HISTORY
     subroutines for the HTML/CGI GUI, not properly OO. :(
@@ -45,3 +53,23 @@ HISTORY
 
     pod ivan@sisd.com 98-sep-12
 
+    $Log: CGI.txt,v $
+    Revision 1.2  1998-11-13 09:56:34  ivan
+    change configuration file layout to support multiple distinct databases (with
+    own set of config files, export, etc.)
+ Revision 1.11 1998/11/12 07:43:54 ivan ***
+    empty log message ***
+
+    Revision 1.10 1998/11/12 01:53:47 ivan added table command
+
+    Revision 1.9 1998/11/09 08:51:49 ivan bug squash
+
+    Revision 1.7 1998/11/09 06:10:59 ivan added sub url
+
+    Revision 1.6 1998/11/09 05:44:20 ivan *** empty log message ***
+
+    Revision 1.4 1998/11/09 04:55:42 ivan support depriciated
+    CGI::Base as well as CGI.pm (for now)
+
+    Revision 1.3 1998/11/08 10:50:19 ivan s/CGI::Base/CGI/; etc.
+
diff --git a/htdocs/docs/man/Conf.txt b/htdocs/docs/man/Conf.txt
index 5e7be7f2d..816df7995 100644
--- a/htdocs/docs/man/Conf.txt
+++ b/htdocs/docs/man/Conf.txt
@@ -4,8 +4,10 @@ NAME
 SYNOPSIS
       use FS::Conf;
 
+      $conf = new FS::Conf "/config/directory";
+
+      $FS::Conf::default_dir = "/config/directory";
       $conf = new FS::Conf;
-      $conf = new FS::Conf "/non/standard/config/directory";
 
       $dir = $conf->dir;
 
@@ -19,8 +21,8 @@ DESCRIPTION
 
 METHODS
     new [ DIRECTORY ]
-        Create a new configuration object. Optionally, a non-default
-        directory may be specified.
+        Create a new configuration object. A directory arguement is
+        required if $FS::Conf::default_dir has not been set.
 
     dir Returns the directory.
 
@@ -33,9 +35,6 @@ METHODS
         corresponding value is undefined.
 
 BUGS
-    The option to specify a non-default directory should probably be
-    removed.
-
     Write access (with locking) should be implemented.
 
 SEE ALSO
@@ -47,3 +46,9 @@ HISTORY
 
     sub exists forgot to fetch $dir ivan@sisd.com 98-sep-27
 
+    $Log: Conf.txt,v $
+    Revision 1.4  1999-02-09 09:37:48  ivan
+    regenerated perl api docs from embedded pod
+ Revision 1.2 1998/11/13 04:08:44 ivan no
+    default default_dir (ironic)
+
diff --git a/htdocs/docs/man/Record.txt b/htdocs/docs/man/Record.txt
index 757013286..8409c2ecc 100644
--- a/htdocs/docs/man/Record.txt
+++ b/htdocs/docs/man/Record.txt
@@ -77,15 +77,15 @@ METHODS
     qsearch TABLE, HASHREF
         Searches the database for all records matching (at least)
         the key/value pairs in HASHREF. Returns all the records
-        found as FS::Record objects.
+        found as `FS::TABLE' objects if that module is loaded (i.e.
+        via `use FS::cust_main;'), otherwise returns FS::Record
+        objects.
 
     qsearchs TABLE, HASHREF
-        Searches the database for a record matching (at least) the
-        key/value pairs in HASHREF, and returns the record found as
-        an FS::Record object. If more than one record matches, it
-        carps but returns the first. If this happens, you either
-        made a logic error in asking for a single item, or your data
-        is corrupted.
+        Same as qsearch, except that if more than one record
+        matches, it carps but returns the first. If this happens,
+        you either made a logic error in asking for a single item,
+        or your data is corrupted.
 
     table
         Returns the table name.
@@ -236,7 +236,7 @@ BUGS
 
         ut_sqltype (like ut_varchar) should all be defined
 
-        A fallback check method should be provided with uses the
+        A fallback check method should be provided whith uses the
         dbdef.
 
         The ut_money method assumes money has two decimal digits.
@@ -332,3 +332,14 @@ HISTORY
 
         ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
+        $Log: Record.txt,v $
+        Revision 1.3  1998-11-13 09:56:36  ivan
+        change configuration file layout to support multiple distinct databases (with
+        own set of config files, export, etc.)
+ Revision 1.4 1998/11/10 07:45:25 ivan
+        doc clarification
+
+        Revision 1.2 1998/11/07 05:17:18 ivan In sub new, Pg wrapper
+        for money fields from dbdef (FS::Record::fields $table), not
+        keys of supplied hashref.
+
diff --git a/htdocs/docs/man/UID.txt b/htdocs/docs/man/UID.txt
index bf9f6b4bd..e24636487 100644
--- a/htdocs/docs/man/UID.txt
+++ b/htdocs/docs/man/UID.txt
@@ -6,10 +6,9 @@ SYNOPSIS
       use FS::UID qw(adminsuidsetup cgisuidsetup dbh datasrc getotaker
       checkeuid checkruid swapuid);
 
-      adminsuidsetup;
+      adminsuidsetup $user;
 
-      $cgi = new CGI::Base;
-      $cgi->get;
+      $cgi = new CGI;
       $dbh = cgisuidsetup($cgi);
 
       $dbh = dbh;
@@ -20,20 +19,32 @@ DESCRIPTION
     Provides a hodgepodge of subroutines.
 
 SUBROUTINES
-    adminsuidsetup
-        Cleans the environment. Make sure the script is running as
-        freeside, or setuid freeside. Opens a connection to the
-        database. Swaps real and effective UIDs. Returns the DBI
+    adminsuidsetup USER
+        Sets the user to USER (see config.html from the base
+        documentation). Cleans the environment. Make sure the script
+        is running as freeside, or setuid freeside. Opens a
+        connection to the database. Swaps real and effective UIDs.
+        Runs any defined callbacks (see below). Returns the DBI
         database handle (usually you don't need this).
 
+    cgisuidsetup CGI_object
+        Stores the CGI (see the CGI manpage) object for later use.
+        (CGI::Base is depriciated) Runs adminsuidsetup.
+
+    cgi Returns the CGI (see the CGI manpage) object.
+
     dbh Returns the DBI database handle.
 
     datasrc
         Returns the DBI data source.
 
     getotaker
-        Returns the current Freeside user. Currently that means the
-        CGI REMOTE_USER, or 'freeside'.
+        Returns the current Freeside user.
+
+    cgisetotaker
+        Sets and returns the CGI REMOTE_USER. $cgi should be defined
+        as a CGI.pm object. Support for CGI::Base and derived
+        classes is depriciated.
 
     checkeuid
         Returns true if effective UID is that of the freeside user.
@@ -44,14 +55,36 @@ SUBROUTINES
     swapuid
         Swaps real and effective UIDs.
 
+    getsecrets [ USER ]
+        Sets the user to USER, if supplied. Sets and returns the DBI
+        datasource, username and password for this user from the
+        `/usr/local/etc/freeside/mapsecrets' file.
+
+CALLBACKS
+    Warning: this interface is likely to change in future releases.
+
+    A package can install a callback to be run in adminsuidsetup by
+    putting a coderef into the hash %FS::UID::callback :
+
+        $coderef = sub { warn "Hi, I'm returning your call!" };
+        $FS::UID::callback{'Package::Name'};
+
 BUGS
+    Too many package-global variables.
+
     Not OO.
 
     No capabilities yet. When mod_perl and Authen::DBI are
     implemented, cgisuidsetup will go away as well.
 
+    Goes through contortions to support non-OO syntax with multiple
+    datasrc's.
+
+    Callbacks are inelegant.
+
 SEE ALSO
-    the FS::Record manpage, the CGI::Base manpage, the DBI manpage
+    the FS::Record manpage, the CGI manpage, the DBI manpage,
+    config.html from the base documentation.
 
 HISTORY
     ivan@voicenet.com 97-jun-4 - 9 untaint otaker ivan@voicenet.com
@@ -77,3 +110,14 @@ HISTORY
     pod, use FS::Conf, implemented cgisuidsetup as adminsuidsetup,
     inlined suidsetup ivan@sisd.com 98-sep-12
 
+    $Log: UID.txt,v $
+    Revision 1.2  1998-11-13 09:56:37  ivan
+    change configuration file layout to support multiple distinct databases (with
+    own set of config files, export, etc.)
+ Revision 1.3 1998/11/08 10:45:42 ivan got sub
+    cgi for FS::CGI
+
+    Revision 1.2 1998/11/08 09:38:43 ivan cgisuidsetup complains if
+    you pass it a isa CGI::Base instead of an isa CGI (first step in
+    migrating from CGI-modules to CGI.pm)
+
diff --git a/htdocs/docs/man/cust_bill.txt b/htdocs/docs/man/cust_bill.txt
index 9762dd3ca..bc0b64da3 100644
--- a/htdocs/docs/man/cust_bill.txt
+++ b/htdocs/docs/man/cust_bill.txt
@@ -138,3 +138,11 @@ HISTORY
 
     pod, ingegrate with FS::Invoice ivan@sisd.com 98-sep-20
 
+    $Log: cust_bill.txt,v $
+    Revision 1.2  1998-11-13 09:56:38  ivan
+    change configuration file layout to support multiple distinct databases (with
+    own set of config files, export, etc.)
+ Revision 1.2 1998/11/07 10:24:24 ivan
+    don't use depriciated FS::Bill and FS::Invoice, other
+    miscellania
+
diff --git a/htdocs/docs/man/cust_main.txt b/htdocs/docs/man/cust_main.txt
index df7848744..f0625c173 100644
--- a/htdocs/docs/man/cust_main.txt
+++ b/htdocs/docs/man/cust_main.txt
@@ -198,3 +198,11 @@ HISTORY
     cybercash v3 support, don't need to import
     FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
+    $Log: cust_main.txt,v $
+    Revision 1.2  1998-11-13 09:56:39  ivan
+    change configuration file layout to support multiple distinct databases (with
+    own set of config files, export, etc.)
+ Revision 1.2 1998/11/07 10:24:25 ivan
+    don't use depriciated FS::Bill and FS::Invoice, other
+    miscellania
+
diff --git a/htdocs/docs/man/cust_pkg.txt b/htdocs/docs/man/cust_pkg.txt
index 5409083d8..c5d143dbe 100644
--- a/htdocs/docs/man/cust_pkg.txt
+++ b/htdocs/docs/man/cust_pkg.txt
@@ -21,6 +21,8 @@ SYNOPSIS
 
       $error = $record->unsuspend;
 
+      $part_pkg = $record->part_pkg;
+
       $error = FS::cust_pkg::order( $custnum, \@pkgparts );
       $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );
 
@@ -108,6 +110,10 @@ METHODS
         If there is an error, returns the error, otherwise returns
         false.
 
+    part_pkg
+        Returns the definition for this billing item, as an
+        FS::part_pkg object (see L<FS::part_pkg).
+
 SUBROUTINES
     order CUSTNUM, PKGPARTS_ARYREF, [ REMOVE_PKGNUMS_ARYREF ]
         CUSTNUM is a customer (see the FS::cust_main manpage)
@@ -148,3 +154,10 @@ HISTORY
 
     pod ivan@sisd.com 98-sep-21
 
+    $Log: cust_pkg.txt,v $
+    Revision 1.2  1998-11-13 09:56:40  ivan
+    change configuration file layout to support multiple distinct databases (with
+    own set of config files, export, etc.)
+ Revision 1.2 1998/11/12 03:42:45 ivan
+    added label method
+
diff --git a/htdocs/docs/man/cust_svc.txt b/htdocs/docs/man/cust_svc.txt
index d863ea852..adc1ca23f 100644
--- a/htdocs/docs/man/cust_svc.txt
+++ b/htdocs/docs/man/cust_svc.txt
@@ -15,6 +15,8 @@ SYNOPSIS
 
       $error = $record->check;
 
+      ($label, $value) = $record->label;
+
 DESCRIPTION
     An FS::cust_svc represents a service. FS::cust_svc inherits from
     FS::Record. The following fields are currently supported:
@@ -51,12 +53,18 @@ METHODS
         there is an error, returns the error, otehrwise returns
         false. Called by the insert and replace methods.
 
+    label
+        Returns a list consisting of: - The name of this service
+        (from part_svc) - A meaningful identifier (username, domain,
+        or mail alias) - The table name (i.e. svc_domain) for this
+        service
+
 BUGS
     Behaviour of changing the svcpart of cust_svc records is
     undefined and should possibly be prohibited, and pkg_svc records
     are not checked.
 
-    pkg_svc records are not checket in general (here).
+    pkg_svc records are not checked in general (here).
 
 SEE ALSO
     the FS::Record manpage, the FS::cust_pkg manpage, the
@@ -70,3 +78,15 @@ HISTORY
 
     pod ivan@sisd.com 98-sep-21
 
+    $Log: cust_svc.txt,v $
+    Revision 1.2  1998-11-13 09:56:41  ivan
+    change configuration file layout to support multiple distinct databases (with
+    own set of config files, export, etc.)
+ Revision 1.4 1998/11/12 07:58:15 ivan
+    added svcdb to label
+
+    Revision 1.3 1998/11/12 03:45:38 ivan use FS::table_name for all
+    tables qsearch()'ed
+
+    Revision 1.2 1998/11/12 03:32:46 ivan added label method
+
diff --git a/htdocs/docs/man/dbdef_table.txt b/htdocs/docs/man/dbdef_table.txt
index 4fcb0935c..1a1887156 100644
--- a/htdocs/docs/man/dbdef_table.txt
+++ b/htdocs/docs/man/dbdef_table.txt
@@ -76,7 +76,7 @@ SEE ALSO
     manpage
 
 VERSION
-    $Id: dbdef_table.txt,v 1.2 1998-10-14 06:52:48 ivan Exp $
+    $Id: dbdef_table.txt,v 1.5 1999-04-08 13:39:32 ivan Exp $
 
 HISTORY
     class for dealing with table definitions
@@ -96,7 +96,8 @@ HISTORY
     pod ivan@sisd.com 98-sep-24
 
     $Log: dbdef_table.txt,v $
-    Revision 1.2  1998-10-14 06:52:48  ivan
-    1,1,4 release, fix postgresql quirks.
-
+    Revision 1.5  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.2 1998/10/14 07:05:06 ivan
+    1.1.4 release, fix postgresql
 
diff --git a/htdocs/docs/man/svc_acct.txt b/htdocs/docs/man/svc_acct.txt
index 1c9caf5fb..4c4e8e2c4 100644
--- a/htdocs/docs/man/svc_acct.txt
+++ b/htdocs/docs/man/svc_acct.txt
@@ -166,3 +166,9 @@ HISTORY
 
     pod and FS::conf ivan@sisd.com 98-sep-22
 
+    $Log: svc_acct.txt,v $
+    Revision 1.2  1998-11-13 09:56:44  ivan
+    change configuration file layout to support multiple distinct databases (with
+    own set of config files, export, etc.)
+
+
diff --git a/htdocs/docs/man/svc_domain.txt b/htdocs/docs/man/svc_domain.txt
index 03d3dbc27..da8c06015 100644
--- a/htdocs/docs/man/svc_domain.txt
+++ b/htdocs/docs/man/svc_domain.txt
@@ -47,6 +47,13 @@ METHODS
         A registration or transfer email will be submitted unless
         $FS::svc_domain::whois_hack is true.
 
+        The additional field *email* can be used to manually set the
+        admin contact email address on this email. Otherwise, the
+        svc_acct records for this package (see the FS::cust_pkg
+        manpage) are searched. If there is exactly one svc_acct
+        record in the same package, it is automatically used.
+        Otherwise an error is returned.
+
     delete
         Deletes this domain from the database. If there is an error,
         returns the error, otherwise returns false.
@@ -114,6 +121,9 @@ SEE ALSO
     schema.html from the base documentation, config.html from the
     base documentation.
 
+VERSION
+    $Id: svc_domain.txt,v 1.2 1998-11-13 09:56:45 ivan Exp $
+
 HISTORY
     ivan@voicenet.com 97-jul-21
 
@@ -129,3 +139,11 @@ HISTORY
 
     pod, some FS::Conf (not complete) ivan@sisd.com 98-sep-23
 
+    $Log: svc_domain.txt,v $
+    Revision 1.2  1998-11-13 09:56:45  ivan
+    change configuration file layout to support multiple distinct databases (with
+    own set of config files, export, etc.)
+ Revision 1.2 1998/10/14 08:18:21 ivan
+    More informative error messages and better doc for admin contact
+    email stuff
+
diff --git a/htdocs/edit/agent_type.cgi b/htdocs/edit/agent_type.cgi
index b9fff4530..9f3748d3d 100755
--- a/htdocs/edit/agent_type.cgi
+++ b/htdocs/edit/agent_type.cgi
@@ -9,22 +9,25 @@
 #	bmccane@maxbaud.net	98-apr-3
 #
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
+#
+# $Log: agent_type.cgi,v $
+# Revision 1.2  1998-11-13 09:56:46  ivan
+# change configuration file layout to support multiple distinct databases (with
+# own set of config files, export, etc.)
+#
 
 use strict;
-use CGI::Base;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::agent_type;
 use FS::CGI qw(header menubar);
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
-
 my($agent_type,$action);
 if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
   $agent_type=qsearchs('agent_type',{'typenum'=>$1});
@@ -35,7 +38,7 @@ if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
 }
 my($hashref)=$agent_type->hashref;
 
-print header("$action Agent Type", menubar(
+print $cgi->header, header("$action Agent Type", menubar(
   'Main Menu' => '../',
   'View all agent types' => '../browse/agent_type.cgi',
 )), '<FORM ACTION="process/agent_type.cgi" METHOD=POST>';
diff --git a/htdocs/edit/svc_acct_pop.cgi b/htdocs/edit/svc_acct_pop.cgi
index 46d803f07..58e8b7ee6 100755
--- a/htdocs/edit/svc_acct_pop.cgi
+++ b/htdocs/edit/svc_acct_pop.cgi
@@ -8,24 +8,27 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: svc_acct_pop.cgi,v $
+# Revision 1.2  1998-11-13 09:56:47  ivan
+# change configuration file layout to support multiple distinct databases (with
+# own set of config files, export, etc.)
+#
 
 use strict;
-use CGI::Base;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::svc_acct_pop;
 use FS::CGI qw(header menubar);
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
-
 my($svc_acct_pop,$action);
-if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
+if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
   $svc_acct_pop=qsearchs('svc_acct_pop',{'popnum'=>$1});
   $action='Edit';
 } else { #adding
@@ -34,7 +37,7 @@ if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
 }
 my($hashref)=$svc_acct_pop->hashref;
 
-print header("$action POP", menubar(
+print $cgi->header, header("$action POP", menubar(
   'Main Menu' => '../',
   'View all POPs' => "../browse/svc_acct_pop.cgi",
 )), <<END;
diff --git a/htdocs/edit/svc_domain.cgi b/htdocs/edit/svc_domain.cgi
index 0717a2c09..dd436334c 100755
--- a/htdocs/edit/svc_domain.cgi
+++ b/htdocs/edit/svc_domain.cgi
@@ -15,20 +15,26 @@
 # rewrite ivan@sisd.com 98-mar-14
 #
 # no GOV in instructions ivan@sisd.com 98-jul-17
+#
+# $Log: svc_domain.cgi,v $
+# Revision 1.2  1998-11-13 09:56:48  ivan
+# change configuration file layout to support multiple distinct databases (with
+# own set of config files, export, etc.)
+#
 
 use strict;
-use CGI::Base qw(:DEFAULT :CGI);
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
 use FS::Record qw(qsearch qsearchs);
 use FS::svc_domain qw(fields);
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
 my($action,$svcnum,$svc_domain,$pkgnum,$svcpart,$part_svc);
 
-if ( $QUERY_STRING =~ /^(\d+)$/ ) { #editing
+if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
 
   $svcnum=$1;
   $svc_domain=qsearchs('svc_domain',{'svcnum'=>$svcnum})
@@ -49,7 +55,7 @@ if ( $QUERY_STRING =~ /^(\d+)$/ ) { #editing
 
   $svc_domain=create FS::svc_domain({});
   
-  foreach $_ (split(/-/,$QUERY_STRING)) {
+  foreach $_ (split(/-/,$cgi->query_string)) {
     $pkgnum=$1 if /^pkgnum(\d+)$/;
     $svcpart=$1 if /^svcpart(\d+)$/;
   }
@@ -78,8 +84,7 @@ my($domain)=(
   $svc_domain->domain,
 );
 
-SendHeaders();
-print <<END;
+print $cgi->header, <<END;
 <HTML>
   <HEAD>
     <TITLE>$action $svc</TITLE>
@@ -112,7 +117,8 @@ Domain Name Registration Agreement</A>
 </UL>
 US state and local government agencies, schools, libraries, museums, and individuals should register under the US domain.  See RFC 1480 for a complete description of the US domain
 and registration procedures.
-<P>GOV registrations are limited to top-level US Federal Government agencies (see RFC 1816).
+<!--  <P>GOV registrations are limited to top-level US Federal Government agencies (see RFC 1816).
+!-->
     </FORM>
   </BODY>
 </HTML>
diff --git a/htdocs/view/cust_pkg.cgi b/htdocs/view/cust_pkg.cgi
index 04e38326a..d7269281f 100755
--- a/htdocs/view/cust_pkg.cgi
+++ b/htdocs/view/cust_pkg.cgi
@@ -24,22 +24,29 @@
 # ivan@voicenet.com 97-jul-29
 #
 # no FS::Search ivan@sisd.com 98-mar-7
+# 
+# $Log: cust_pkg.cgi,v $
+# Revision 1.2  1998-11-13 09:56:49  ivan
+# change configuration file layout to support multiple distinct databases (with
+# own set of config files, export, etc.)
+#
 
 use strict;
 use Date::Format;
-use CGI::Base qw(:DEFAULT :CGI); # CGI module
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(url);
 use FS::Record qw(qsearch qsearchs);
 
-my($cgi) = new CGI::Base;
-$cgi->get;
-&cgisuidsetup($cgi);
+my($cgi) = new CGI;
+cgisuidsetup($cgi);
 
 my(%uiview,%uiadd);
 my($part_svc);
 foreach $part_svc ( qsearch('part_svc',{}) ) {
-  $uiview{$part_svc->svcpart}="../view/". $part_svc->svcdb . ".cgi";
-  $uiadd{$part_svc->svcpart}="../edit/". $part_svc->svcdb . ".cgi";
+  $uiview{$part_svc->svcpart} = url(1). "/view/". $part_svc->svcdb . ".cgi";
+  $uiadd{$part_svc->svcpart}= url(1). "/edit/". $part_svc->svcdb . ".cgi";
 }
 
 SendHeaders(); # one guess.
diff --git a/htdocs/view/svc_domain.cgi b/htdocs/view/svc_domain.cgi
index 78ff6ac0b..fa35a8cd5 100755
--- a/htdocs/view/svc_domain.cgi
+++ b/htdocs/view/svc_domain.cgi
@@ -13,18 +13,23 @@
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: svc_domain.cgi,v $
+# Revision 1.2  1998-11-13 09:56:50  ivan
+# change configuration file layout to support multiple distinct databases (with
+# own set of config files, export, etc.)
+#
 
 use strict;
-use CGI::Base qw(:DEFAULT :CGI);
+use CGI;
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs);
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 cgisuidsetup($cgi);
 
 #untaint svcnum
-$QUERY_STRING =~ /^(\d+)$/;
+$cgi->query_string =~ /^(\d+)$/;
 my($svcnum)=$1;
 my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$svcnum});
 die "Unknown svcnum" unless $svc_domain;
@@ -41,8 +46,7 @@ if ($pkgnum) {
 my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unkonwn svcpart" unless $part_svc;
 
-SendHeaders(); # one guess.
-print <<END;
+print $cgi->header, <<END;
 <HTML>
   <HEAD>
     <TITLE>Domain View</TITLE>
diff --git a/site_perl/Record.pm b/site_perl/Record.pm
index a90e76b1e..111bb82a2 100644
--- a/site_perl/Record.pm
+++ b/site_perl/Record.pm
@@ -12,11 +12,12 @@ use FS::dbdef;
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(dbh fields hfields qsearch qsearchs dbdef);
 
-$File::CounterFile::DEFAULT_DIR = "/var/spool/freeside/counters" ;
-
-$dbdef_file = "/var/spool/freeside/dbdef.". datasrc;
-
-reload_dbdef unless $setup_hack;
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::Record'} = sub { 
+  $File::CounterFile::DEFAULT_DIR = "/usr/local/etc/freeside/counters". datasrc;
+  $dbdef_file = "/usr/local/etc/freeside/dbdef.". datasrc;
+  &reload_dbdef unless $setup_hack; #$setup_hack needed now?
+};
 
 =head1 NAME
 
@@ -870,7 +871,11 @@ added pod documentation ivan@sisd.com 98-sep-6
 ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
 $Log: Record.pm,v $
-Revision 1.4  1998-11-10 07:45:25  ivan
+Revision 1.5  1998-11-13 09:56:51  ivan
+change configuration file layout to support multiple distinct databases (with
+own set of config files, export, etc.)
+
+Revision 1.4  1998/11/10 07:45:25  ivan
 doc clarification
 
 Revision 1.2  1998/11/07 05:17:18  ivan
diff --git a/site_perl/UID.pm b/site_perl/UID.pm
index 7959343e0..77c40aad5 100644
--- a/site_perl/UID.pm
+++ b/site_perl/UID.pm
@@ -2,7 +2,11 @@ package FS::UID;
 
 use strict;
 use vars qw(
-  @ISA @EXPORT_OK $cgi $dbh $freeside_uid $conf $datasrc $db_user $db_pass
+  @ISA @EXPORT_OK $cgi $dbh $freeside_uid $user 
+  $conf_dir $secrets $datasrc $db_user $db_pass %callback
+);
+use subs qw(
+  getsecrets cgisetotaker
 );
 use Exporter;
 use Carp;
@@ -15,9 +19,7 @@ use FS::Conf;
 
 $freeside_uid = scalar(getpwnam('freeside'));
 
-my $conf = new FS::Conf;
-($datasrc, $db_user, $db_pass) = $conf->config('secrets')
-  or die "Can't get secrets: $!";
+$conf_dir = "/usr/local/etc/freeside/";
 
 =head1 NAME
 
@@ -28,7 +30,7 @@ FS::UID - Subroutines for database login and assorted other stuff
   use FS::UID qw(adminsuidsetup cgisuidsetup dbh datasrc getotaker
   checkeuid checkruid swapuid);
 
-  adminsuidsetup;
+  adminsuidsetup $user;
 
   $cgi = new CGI;
   $dbh = cgisuidsetup($cgi);
@@ -45,18 +47,23 @@ Provides a hodgepodge of subroutines.
 
 =over 4
 
-=item adminsuidsetup
+=item adminsuidsetup USER
 
+Sets the user to USER (see config.html from the base documentation).
 Cleans the environment.
 Make sure the script is running as freeside, or setuid freeside.
 Opens a connection to the database.
 Swaps real and effective UIDs.
+Runs any defined callbacks (see below).
 Returns the DBI database handle (usually you don't need this).
 
 =cut
 
 sub adminsuidsetup {
 
+  $user = shift;
+  croak "fatal: adminsuidsetup called without arguements" unless $user;
+
   $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
   $ENV{'SHELL'} = '/bin/sh';
   $ENV{'IFS'} = " \t\n";
@@ -65,16 +72,18 @@ sub adminsuidsetup {
   $ENV{'BASH_ENV'} = '';
 
   croak "Not running uid freeside!" unless checkeuid();
+  getsecrets;
   $dbh = DBI->connect($datasrc,$db_user,$db_pass, {
-	# hack for web demo
-	#  my($user)=getotaker();
-	#  $dbh = DBI->connect("$datasrc:$user",$db_user,$db_pass, {
                           'AutoCommit' => 'true',
                           'ChopBlanks' => 'true',
-  } ) or die "DBI->connect error: $DBI::errstr\n";;
+  } ) or die "DBI->connect error: $DBI::errstr\n";
 
   swapuid(); #go to non-privledged user if running setuid freeside
 
+  foreach ( keys %callback ) {
+    &{$callback{$_}};
+  }
+
   $dbh;
 }
 
@@ -86,13 +95,14 @@ Runs adminsuidsetup.
 =cut
 
 sub cgisuidsetup {
-  $cgi=$_[0];
+  $cgi=shift;
   if ( $cgi->isa('CGI::Base') ) {
     carp "Use of CGI::Base is depriciated";
   } elsif ( ! $cgi->isa('CGI') ) {
     croak "Pass a CGI object to cgisuidsetup!";
   }
-  adminsuidsetup;
+  cgisetotaker; 
+  adminsuidsetup($user);
 }
 
 =item cgi
@@ -136,20 +146,31 @@ sub suidsetup {
 
 =item getotaker
 
-Returns the current Freeside user.  Currently that means the CGI REMOTE_USER,
-or 'freeside'.
+Returns the current Freeside user.
 
 =cut
 
 sub getotaker {
-  if ( $cgi && $cgi->can('var') && defined $cgi->var('REMOTE_USER')) {
+  $user;
+}
+
+=item cgisetotaker
+
+Sets and returns the CGI REMOTE_USER.  $cgi should be defined as a CGI.pm
+object.  Support for CGI::Base and derived classes is depriciated.
+
+=cut
+
+sub cgisetotaker {
+  if ( $cgi && $cgi->isa('CGI::Base') && defined $cgi->var('REMOTE_USER')) {
     carp "Use of CGI::Base is depriciated";
-    return $cgi->var('REMOTE_USER'); #for now
-  } elsif ( $cgi && $cgi->can('remote_user') && defined $cgi->remote_user ) {
-    return $cgi->remote_user;
+    $user = $cgi->var('REMOTE_USER');
+  } elsif ( $cgi && $cgi->isa('CGI') && defined $cgi->remote_user ) {
+    $user = $cgi->remote_user;
   } else {
-    return 'freeside';
+    die "fatal: Can't get REMOTE_USER!";
   }
+  return $user;
 }
 
 =item checkeuid
@@ -182,18 +203,57 @@ sub swapuid {
   ($<,$>) = ($>,$<);
 }
 
+=item getsecrets [ USER ]
+
+Sets the user to USER, if supplied.
+Sets and returns the DBI datasource, username and password for this user from
+the `/usr/local/etc/freeside/mapsecrets' file.
+
+=cut
+
+sub getsecrets {
+  my($setuser) = shift;
+  $user = $setuser if $setuser;
+  die "No user!" unless $user;
+  my($conf) = new FS::Conf $conf_dir;
+  my($line) = grep /^\s*$user\s/, $conf->config('mapsecrets');
+  $line =~ /^\s*$user\s+(.*)$/;
+  $secrets = $1;
+  die "User not found in mapsecrets file!" unless $secrets;
+  ($datasrc, $db_user, $db_pass) = $conf->config($secrets)
+    or die "Can't get secrets: $!";
+  $FS::Conf::default_dir .= "/conf.$datasrc";
+  ($datasrc, $db_user, $db_pass);
+}
+
 =back
 
+=head1 CALLBACKS
+
+Warning: this interface is likely to change in future releases.
+
+A package can install a callback to be run in adminsuidsetup by putting a
+coderef into the hash %FS::UID::callback :
+
+    $coderef = sub { warn "Hi, I'm returning your call!" };
+    $FS::UID::callback{'Package::Name'};
+
 =head1 BUGS
 
+Too many package-global variables.
+
 Not OO.
 
 No capabilities yet.  When mod_perl and Authen::DBI are implemented, 
 cgisuidsetup will go away as well.
 
+Goes through contortions to support non-OO syntax with multiple datasrc's.
+
+Callbacks are inelegant.
+
 =head1 SEE ALSO
 
-L<FS::Record>, L<CGI>, L<DBI>
+L<FS::Record>, L<CGI>, L<DBI>, config.html from the base documentation.
 
 =head1 HISTORY
 
@@ -222,7 +282,11 @@ inlined suidsetup
 ivan@sisd.com 98-sep-12
 
 $Log: UID.pm,v $
-Revision 1.3  1998-11-08 10:45:42  ivan
+Revision 1.4  1998-11-13 09:56:52  ivan
+change configuration file layout to support multiple distinct databases (with
+own set of config files, export, etc.)
+
+Revision 1.3  1998/11/08 10:45:42  ivan
 got sub cgi for FS::CGI
 
 Revision 1.2  1998/11/08 09:38:43  ivan
diff --git a/site_perl/cust_bill.pm b/site_perl/cust_bill.pm
index bc9424233..455fc2d4f 100644
--- a/site_perl/cust_bill.pm
+++ b/site_perl/cust_bill.pm
@@ -8,9 +8,11 @@ use FS::Record qw(fields qsearch qsearchs);
 
 @ISA = qw(FS::Record Exporter);
 
-$conf = new FS::Conf;
-
-($add1,$add2,$add3,$add4) = $conf->config('address');
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::cust_bill'} = sub { 
+  $conf = new FS::Conf;
+  ( $add1, $add2, $add3, $add4 ) = $conf->config('address');
+};
 
 =head1 NAME
 
@@ -490,7 +492,11 @@ charges can be negative ivan@sisd.com 98-jul-13
 pod, ingegrate with FS::Invoice ivan@sisd.com 98-sep-20
 
 $Log: cust_bill.pm,v $
-Revision 1.2  1998-11-07 10:24:24  ivan
+Revision 1.3  1998-11-13 09:56:53  ivan
+change configuration file layout to support multiple distinct databases (with
+own set of config files, export, etc.)
+
+Revision 1.2  1998/11/07 10:24:24  ivan
 don't use depriciated FS::Bill and FS::Invoice, other miscellania
 
 
diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index 0ef69cba4..83a7d786d 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -24,39 +24,43 @@ use FS::cust_pay;
 @ISA = qw(FS::Record Exporter);
 @EXPORT_OK = qw(hfields);
 
-$conf = new FS::Conf;
-$lpr = $conf->config('lpr');
-
-if ( $conf->exists('cybercash3.2') ) {
-  require CCMckLib3_2;
-    #qw($MCKversion %Config InitConfig CCError CCDebug CCDebug2);
-  require CCMckDirectLib3_2;
-    #qw(SendCC2_1Server);
-  require CCMckErrno3_2;
-    #qw(MCKGetErrorMessage $E_NoErr);
-  import CCMckErrno3_2 qw($E_NoErr);
-  my $merchant_conf;
-  ($merchant_conf,$xaction)= $conf->config('cybercash3.2');
-  my $status = &CCMckLib3_2::InitConfig($merchant_conf);
-  if ( $status != $E_NoErr ) {
-    warn "CCMckLib3_2::InitConfig error:\n";
-    foreach my $key (keys %CCMckLib3_2::Config) {
-      warn "  $key => $CCMckLib3_2::Config{$key}\n"
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::cust_main'} = sub { 
+  $conf = new FS::Conf;
+  $lpr = $conf->config('lpr');
+
+  if ( $conf->exists('cybercash3.2') ) {
+    require CCMckLib3_2;
+      #qw($MCKversion %Config InitConfig CCError CCDebug CCDebug2);
+    require CCMckDirectLib3_2;
+      #qw(SendCC2_1Server);
+    require CCMckErrno3_2;
+      #qw(MCKGetErrorMessage $E_NoErr);
+    import CCMckErrno3_2 qw($E_NoErr);
+
+    my $merchant_conf;
+    ($merchant_conf,$xaction)= $conf->config('cybercash3.2');
+    my $status = &CCMckLib3_2::InitConfig($merchant_conf);
+    if ( $status != $E_NoErr ) {
+      warn "CCMckLib3_2::InitConfig error:\n";
+      foreach my $key (keys %CCMckLib3_2::Config) {
+        warn "  $key => $CCMckLib3_2::Config{$key}\n"
+      }
+      my($errmsg) = &CCMckErrno3_2::MCKGetErrorMessage($status);
+      die "CCMckLib3_2::InitConfig fatal error: $errmsg\n";
     }
-    my($errmsg) = &CCMckErrno3_2::MCKGetErrorMessage($status);
-    die "CCMckLib3_2::InitConfig fatal error: $errmsg\n";
+    $processor='cybercash3.2';
+  } elsif ( $conf->exists('cybercash2') ) {
+    require CCLib;
+      #qw(sendmserver);
+    ( $main::paymentserverhost, 
+      $main::paymentserverport, 
+      $main::paymentserversecret,
+      $xaction,
+    ) = $conf->config('cybercash2');
+    $processor='cybercash2';
   }
-  $processor='cybercash3.2';
-} elsif ( $conf->exists('cybercash2') ) {
-  require CCLib;
-    #qw(sendmserver);
-  ( $main::paymentserverhost, 
-    $main::paymentserverport, 
-    $main::paymentserversecret,
-    $xaction,
-  ) = $conf->config('cybercash2');
-  $processor='cybercash2';
-}
+};
 
 =head1 NAME
 
@@ -864,7 +868,11 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.2  1998-11-07 10:24:25  ivan
+Revision 1.3  1998-11-13 09:56:54  ivan
+change configuration file layout to support multiple distinct databases (with
+own set of config files, export, etc.)
+
+Revision 1.2  1998/11/07 10:24:25  ivan
 don't use depriciated FS::Bill and FS::Invoice, other miscellania
 
 
diff --git a/site_perl/svc_acct.pm b/site_perl/svc_acct.pm
index a43af6b1a..fdc9f0bc1 100644
--- a/site_perl/svc_acct.pm
+++ b/site_perl/svc_acct.pm
@@ -12,10 +12,13 @@ use FS::cust_svc;
 @ISA = qw(FS::Record Exporter);
 @EXPORT_OK = qw(fields);
 
-$conf = new FS::Conf;
-$dir_prefix = $conf->config('home');
-@shells = $conf->config('shells');
-$shellmachine = $conf->config('shellmachine');
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::svc_acct'} = sub { 
+  $conf = new FS::Conf;
+  $dir_prefix = $conf->config('home');
+  @shells = $conf->config('shells');
+  $shellmachine = $conf->config('shellmachine');
+};
 
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
 @pw_set = ( 'a'..'z', 'A'..'Z', '0'..'9', '(', ')', '#', '!', '.', ',' );
@@ -551,6 +554,12 @@ arbitrary radius attributes ivan@sisd.com 98-aug-13
 
 pod and FS::conf ivan@sisd.com 98-sep-22
 
+$Log: svc_acct.pm,v $
+Revision 1.2  1998-11-13 09:56:55  ivan
+change configuration file layout to support multiple distinct databases (with
+own set of config files, export, etc.)
+
+
 =cut
 
 1;
diff --git a/site_perl/svc_acct_sm.pm b/site_perl/svc_acct_sm.pm
index c87ed2c54..4293e0365 100644
--- a/site_perl/svc_acct_sm.pm
+++ b/site_perl/svc_acct_sm.pm
@@ -11,11 +11,13 @@ use FS::Conf;
 @ISA = qw(FS::Record Exporter);
 @EXPORT_OK = qw(fields);
 
-$conf = new FS::Conf;
-
-$shellmachine = $conf->exists('qmailmachines')
-                ? $conf->config('shellmachine')
-                : '';
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::svc_acct_sm'} = sub { 
+  $conf = new FS::Conf;
+  $shellmachine = $conf->exists('qmailmachines')
+                  ? $conf->config('shellmachine')
+                  : '';
+};
 
 =head1 NAME
 
diff --git a/site_perl/svc_domain.pm b/site_perl/svc_domain.pm
index c12819ec3..69b225eb5 100644
--- a/site_perl/svc_domain.pm
+++ b/site_perl/svc_domain.pm
@@ -1,7 +1,9 @@
 package FS::svc_domain;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK $whois_hack $conf $mydomain $smtpmachine);
+use vars qw(@ISA @EXPORT_OK $whois_hack $conf $mydomain $smtpmachine
+  $tech_contact $from $to @nameservers @nameserver_ips @template
+);
 use Exporter;
 use Carp;
 use Mail::Internet;
@@ -14,60 +16,31 @@ use FS::Conf;
 @ISA = qw(FS::Record Exporter);
 @EXPORT_OK = qw(fields);
 
-$conf = new FS::Conf;
-
-$mydomain = $conf->config('domain');
-$smtpmachine = $conf->config('smtpmachine');
-
-my($internic)="/var/spool/freeside/conf/registries/internic";
-my($conf_tech)="$internic/tech_contact";
-my($conf_from)="$internic/from";
-my($conf_to)="$internic/to";
-my($nameservers)="$internic/nameservers";
-my($template)="$internic/template";
-
-open(TECH_CONTACT,$conf_tech) or die "Can't open $conf_tech: $!";
-my($tech_contact)=map {
-  /^(.*)$/ or die "Illegal line in $conf_tech!"; #yes, we trust the file
-  $1;
-} grep $_ !~ /^(#|$)/, <TECH_CONTACT>;
-close TECH_CONTACT;
-
-open(FROM,$conf_from) or die "Can't open $conf_from: $!";
-my($from)=map {
-  /^(.*)$/ or die "Illegal line in $conf_from!"; #yes, we trust the file
-  $1;
-} grep $_ !~ /^(#|$)/, <FROM>;
-close FROM;
-
-open(TO,$conf_to) or die "Can't open $conf_to: $!";
-my($to)=map {
-  /^(.*)$/ or die "Illegal line in $conf_to!"; #yes, we trust the file
-  $1;
-} grep $_ !~ /^(#|$)/, <TO>;
-close TO;
-
-open(NAMESERVERS,$nameservers) or die "Can't open $nameservers: $!";
-my(@nameservers)=map {
-  /^\s*\d+\.\d+\.\d+\.\d+\s+([^\s]+)\s*$/
-    or die "Illegal line in $nameservers!"; #yes, we trust the file
-  $1;
-} grep $_ !~ /^(#|$)/, <NAMESERVERS>;
-close NAMESERVERS;
-open(NAMESERVERS,$nameservers) or die "Can't open $nameservers: $!";
-my(@nameserver_ips)=map {
-  /^\s*(\d+\.\d+\.\d+\.\d+)\s+([^\s]+)\s*$/
-    or die "Illegal line in $nameservers!"; #yes, we trust the file
-  $1;
-} grep $_ !~ /^(#|$)/, <NAMESERVERS>;
-close NAMESERVERS;
-
-open(TEMPLATE,$template) or die "Can't open $template: $!";
-my(@template)=map {
-  /^(.*)$/ or die "Illegal line in $to!"; #yes, we trust the file
-  $1. "\n";
-} <TEMPLATE>;
-close TEMPLATE;
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::domain'} = sub { 
+  $conf = new FS::Conf;
+
+  $mydomain = $conf->config('domain');
+  $smtpmachine = $conf->config('smtpmachine');
+
+  my($internic)="/registries/internic";
+  $tech_contact = $conf->config("$internic/tech_contact");
+  $from = $conf->config("$internic/from");
+  $to = $conf->config("$internic/to");
+  my(@ns) = $conf->config("$internic/nameservers");
+  @nameservers=map {
+    /^\s*\d+\.\d+\.\d+\.\d+\s+([^\s]+)\s*$/
+      or die "Illegal line in $internic/nameservers";
+    $1;
+  } @ns;
+  @nameserver_ips=map {
+    /^\s*(\d+\.\d+\.\d+\.\d+)\s+([^\s]+)\s*$/
+      or die "Illegal line in $internic/nameservers!";
+    $1;
+  } @ns;
+  @template = map { $_. "\n" } $conf->config("$internic/template");
+
+};
 
 =head1 NAME
 
@@ -523,7 +496,7 @@ config.html from the base documentation.
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.2 1998-10-14 08:18:21 ivan Exp $
+$Id: svc_domain.pm,v 1.3 1998-11-13 09:56:57 ivan Exp $
 
 =head1 HISTORY
 
@@ -542,7 +515,11 @@ ivan@sisd.com 98-jul-17-19
 pod, some FS::Conf (not complete) ivan@sisd.com 98-sep-23
 
 $Log: svc_domain.pm,v $
-Revision 1.2  1998-10-14 08:18:21  ivan
+Revision 1.3  1998-11-13 09:56:57  ivan
+change configuration file layout to support multiple distinct databases (with
+own set of config files, export, etc.)
+
+Revision 1.2  1998/10/14 08:18:21  ivan
 More informative error messages and better doc for admin contact email stuff
 
 
-- 
cgit v1.2.1


From ccd7283a67eb7372e7dd93578c24c12a9b08de63 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Nov 1998 11:28:08 +0000
Subject: s/CGI-modules/CGI.pm/;, relative URL's with popurl

---
 htdocs/view/cust_main.cgi | 49 +++++++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index ca5fcd94f..5a660f23b 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -31,28 +31,40 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: cust_main.cgi,v $
+# Revision 1.2  1998-11-13 11:28:08  ivan
+# s/CGI-modules/CGI.pm/;, relative URL's with popurl
+#
 
 use strict;
-use CGI::Base qw(:DEFAULT :CGI); # CGI module
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use Date::Format;
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs qsearch);
-use FS::CGI qw(header menubar);
-
-my($cgi) = new CGI::Base;
-$cgi->get;
+use FS::CGI qw(header menubar popurl table);
+use FS::cust_credit;
+use FS::cust_pay;
+use FS::cust_bill;
+use FS::part_pkg;
+use FS::cust_pkg;
+use FS::part_referral;
+use FS::agent;
+use FS::cust_main;
+
+my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
-print header("Customer View", menubar(
-  'Main Menu' => '../',
+print $cgi->header, header("Customer View", menubar(
+  'Main Menu' => popurl(2)
 )),<<END;
     <BASEFONT SIZE=3>
 END
 
-#untaint custnum & get customer record
-$QUERY_STRING =~ /^(\d+)$/;
+die "No customer specified (bad URL)!" unless $cgi->keywords;
+my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
+$query =~ /^(\d+)$/;
 my($custnum)=$1;
 my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
 die "Customer not found!" unless $cust_main;
@@ -66,13 +78,13 @@ print "<FONT SIZE=+1><CENTER>Customer #<B>$custnum</B></CENTER></FONT>",
       qq!<A HREF="#history">Payment History</A> </CENTER>!;
 
 #bill now linke
-print qq!<HR><CENTER><A HREF="../misc/bill.cgi?$custnum">!,
+print qq!<HR><CENTER><A HREF="!, popurl(2), qq!/misc/bill.cgi?$custnum">!,
       qq!Bill this customer now</A></CENTER>!;
 
 #formatting
 print qq!<HR><A NAME="cust_main"><CENTER><FONT SIZE=+1>Customer Information!,
       qq!</FONT>!,
-      qq!<BR><A HREF="../edit/cust_main.cgi?$custnum!,
+      qq!<BR><A HREF="!, popurl(2), qq!/edit/cust_main.cgi?$custnum!,
       qq!">Edit this information</A></CENTER><FONT SIZE=-1>!;
 
 #agentnum
@@ -163,13 +175,13 @@ print "<P>Order taken by <B>", $hashref->{otaker}, "</B>";
 #formatting	
 print qq!<HR><FONT SIZE=+1><A NAME="cust_pkg"><CENTER>Packages</A></FONT>!,
       qq!<BR>Click on package number to view/edit package.!,
-      qq!<BR><A HREF="../edit/cust_pkg.cgi?$custnum">Add/Edit packages</A>!,
+      qq!<BR><A HREF="!, popurl(2), qq!/edit/cust_pkg.cgi?$custnum">Add/Edit packages</A>!,
       qq!</CENTER><BR>!;
 
 #display packages
 
 #formatting
-print qq!<CENTER><TABLE BORDER=4>\n!,
+print qq!<CENTER>!, table, "\n",
       qq!<TR><TH ROWSPAN=2>#</TH><TH ROWSPAN=2>Package</TH><TH COLSPAN=5>!,
       qq!Dates</TH></TR>\n!,
       qq!<TR><TH><FONT SIZE=-1>Setup</FONT></TH><TH>!,
@@ -187,7 +199,7 @@ foreach $package (@packages) {
   my($part_pkg)=qsearchs('part_pkg',{
     'pkgpart' => $pref->{pkgpart}
   } );
-  print qq!<TR><TD><FONT SIZE=-1><A HREF="../view/cust_pkg.cgi?!,
+  print qq!<TR><TD><FONT SIZE=-1><A HREF="!, popurl(2), qq!/view/cust_pkg.cgi?!,
         $pref->{pkgnum}, qq!">!, 
         $pref->{pkgnum}, qq!</A></FONT></TD>!,
         "<TD><FONT SIZE=-1>", $part_pkg->getfield('pkg'), " - ",
@@ -217,7 +229,7 @@ print "</TABLE></CENTER>";
 print qq!<CENTER><HR><A NAME="history"><FONT SIZE=+1>Payment History!,
       qq!</FONT></A><BR>!,
       qq!Click on invoice to view invoice/enter payment.<BR>!,
-      qq!<A HREF="../edit/cust_credit.cgi?$custnum">!,
+      qq!<A HREF="!, popurl(2), qq!/edit/cust_credit.cgi?$custnum">!,
       qq!Post Credit / Refund</A></CENTER><BR>!;
 
 #get payment history
@@ -232,7 +244,7 @@ my($bill);
 foreach $bill (@bills) {
   my($bref)=$bill->hashref;
   push @history,
-    $bref->{_date} . qq!\t<A HREF="../view/cust_bill.cgi?! .
+    $bref->{_date} . qq!\t<A HREF="!. popurl(2). qq!/view/cust_bill.cgi?! .
     $bref->{invnum} . qq!">Invoice #! . $bref->{invnum} .
     qq! (Balance \$! . $bref->{owed} . qq!)</A>\t! .
     $bref->{charged} . qq!\t\t\t!;
@@ -274,8 +286,7 @@ foreach $credit (@credits) {
 }
 
         #formatting
-        print <<END;
-<CENTER><TABLE BORDER=4>
+        print "<CENTER>", table, <<END;
 <TR>
   <TH>Date</TH>
   <TH>Description</TH>
-- 
cgit v1.2.1


From 0ec706c23e1ea66d4ca5ca8791bcf41710422049 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 00:51:51 +0000
Subject: eliminated some warnings on certain fatal errors (well, it is less
 confusing)

---
 site_perl/UID.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/site_perl/UID.pm b/site_perl/UID.pm
index 77c40aad5..c9ecd8fc9 100644
--- a/site_perl/UID.pm
+++ b/site_perl/UID.pm
@@ -217,9 +217,10 @@ sub getsecrets {
   die "No user!" unless $user;
   my($conf) = new FS::Conf $conf_dir;
   my($line) = grep /^\s*$user\s/, $conf->config('mapsecrets');
+  die "User not found in mapsecrets!" unless $line;
   $line =~ /^\s*$user\s+(.*)$/;
   $secrets = $1;
-  die "User not found in mapsecrets file!" unless $secrets;
+  die "Illegal mapsecrets line for user?!" unless $secrets;
   ($datasrc, $db_user, $db_pass) = $conf->config($secrets)
     or die "Can't get secrets: $!";
   $FS::Conf::default_dir .= "/conf.$datasrc";
@@ -282,7 +283,10 @@ inlined suidsetup
 ivan@sisd.com 98-sep-12
 
 $Log: UID.pm,v $
-Revision 1.4  1998-11-13 09:56:52  ivan
+Revision 1.5  1998-11-15 00:51:51  ivan
+eliminated some warnings on certain fatal errors (well, it is less confusing)
+
+Revision 1.4  1998/11/13 09:56:52  ivan
 change configuration file layout to support multiple distinct databases (with
 own set of config files, export, etc.)
 
-- 
cgit v1.2.1


From 99296e2d2de4162acdd6d607fdbb2e8f6688930e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 02:51:21 +0000
Subject: adminsuidsetup needs user, pod, cleanup

---
 bin/bill | 237 ++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 107 insertions(+), 130 deletions(-)

diff --git a/bin/bill b/bin/bill
index 3bc995d35..b74f26abd 100755
--- a/bin/bill
+++ b/bin/bill
@@ -1,88 +1,4 @@
-#!/usr/local/bin/perl -Tw
-#
-# bill: Bill customer(s)
-#
-# Usage: bill [ -c [ i ] ] [ -d 'date' ] [ -b ]
-#
-# Bills all customers.
-#
-# Adds record to /dbin/cust_bill and /dbin/cust_pay (if payment made -
-# CARD & COMP), prints invoice / charges card etc.
-#
-# -c: Turn on collecting (you probably want this).
-#
-# -i: real-time billing (as opposed to batch billing).  only relevant
-#     for credit cards.
-#
-# -d: Pretent it's 'date'.  Date is in any format Date::Parse is happy with,
-#     but be careful.
-#
-# ## n/a ## -b: send batch when done billing
-#
-# ivan@voicenet.com sep/oct 96
-#
-# separated billing and collections, cleaned up code.
-# ivan@voicenet.com 96-nov-11
-#
-# added -d option
-# ivan@voicenet.com 96-nov-13
-#
-# added -v option and started to implement it, added 'd:' to getopts call
-#  (oops!)
-# ivan@voicenet.com 97-jan-2
-#
-# added more debug messages, moved some searches to fssearch.pl library (for 
-# speed)
-# rewrote "all customer" finder to know about bill dates, for speed.
-# ivan@voicenet.com 97-jan-8
-#
-# thought about it a while, and removed passing of the -d option to collect...?
-# ivan@voicenet.com 97-jan-14
-#
-# make all -v stuff STDERR 
-# ivan@voicenet.com 97-feb-4
-#
-# added pkgnum as argument to program from /db/part_pkg, with kludge for the
-# "/bin/echo XX" 's already there.
-# ivan@voicenet.com 97-feb-23
-#
-# - general cleanup
-# - customers who are suspended can still be billed for the setup fee
-# - cust_pkg record is re-read after the package setup fee program is run.
-#   this way,
-#   that program can modify the record (for example, to start accounts off
-#   suspended)
-#   (best to think four or five times before modifying anything else!)
-# ivan@voicenet.com 97-feb-26
-#
-# don't bill recurring fee if its not time! (was removed)
-# ivan@voicenet.com 97-mar-6
-#
-# added -b option, send batch when done billing.
-# ivan@voicenet.com 97-apr-4
-#
-#insecure dependency on line 179ish below needs to be fixed before bill is
-#used setuid
-# ivan@voicenet.com 97-jun-2
-#
-# removed running of setup program (depriciated)
-# ivan@voicenet.com 97-jul-21
-#
-# rewrote for new API, removed option to specify custnums (use FS::Bill 
-# instead), removed -v option (?)
-# ivan@voicenet.com 97-jul-22 - 23 - 25 -28
-# (need to add back in email stuff, look in /home/ivan/old/dbin/collect)
-#
-# s/suidsetup/adminsuidsetup/, s/FS::Search/FS::Record/, added some batch
-# exporting stuff (which still needs to be generalized) and removed &idiot
-# ivan@sisd.com 98-may-27
-#
-# $Log: bill,v $
-# Revision 1.4  1998-11-07 08:21:26  ivan
-# missing use
-#
-
-# setup
+#!/usr/bin/perl -Tw
 
 use strict;
 use Fcntl qw(:flock);
@@ -92,14 +8,12 @@ use FS::UID qw(adminsuidsetup swapuid);
 use FS::Record qw(qsearch qsearchs);
 use FS::cust_main;
 
-my($batchfile)="/var/spool/freeside/batch";
-my($batchlock)="/var/spool/freeside/batch.lock";
-
-adminsuidsetup;
-
 &untaint_argv;	#what it sounds like  (eww)
 use vars qw($opt_b $opt_c $opt_i $opt_d);
 getopts("bcid:");	#switches
+my $user = shift or die &usage;
+
+adminsuidsetup $user;
 
 #we're at now now (and later).
 my($time)= $main::opt_d ? str2time($main::opt_d) : $^T;
@@ -123,8 +37,6 @@ foreach $cust_main (
 
   print "Billing customer #" . $cust_main->getfield('custnum') . "\n";
 
-  bless($cust_main,"FS::cust_main");
-
   my($error);
 
   $error=$cust_main->bill('time'=>$time);
@@ -144,44 +56,6 @@ foreach $cust_main (
 
 }
 
-#if ($main::opt_b) {
-#
-#  die "Batch still waiting for reply? ($batchlock exists)\n" if -e $batchlock;
-#  open(BATCHLOCK,"+>>$batchlock") or die "Can't open $batchlock: $!";
-#  select(BATCHLOCK); $|=1; select(STDOUT);
-#  unless ( flock(BATCHLOCK,,LOCK_EX|LOCK_NB) ) {
-#    seek(BATCHLOCK,0,0);
-#    my($pid)=<BATCHLOCK>;
-#    chop($pid);
-#    die "Is a batch running? (pid $pid)\n";
-#  }
-#  seek(BATCHLOCK,0,0);
-#  print BATCHLOCK $$,"\n";
-#
-#  ( open(BATCH,">$batchfile")
-#    and flock(BATCH,LOCK_EX|LOCK_NB)
-#  ) or die "Can't open $batchfile: $!";
-#
-#  my($cust_pay_batch);
-#  foreach $cust_pay_batch (qsearch('cust_pay_batch',{})) {
-#    print BATCH join(':',
-#      $_->getfield('cardnum'),
-#      $_->getfield('exp'),
-#      $_->getfield('amount'),
-#      $_->getfield('payname')
-#        || $_->getfield('first'). ' '. $_->getfield('last'),
-#      "Description",
-#      $_->getfield('zip'),
-#    ),"\n";
-#  }
-#
-#  flock(BATCH,LOCK_UN);
-#  close BATCH;
-#
-#  flock(BATCHLOCK,LOCK_UN);
-#  close BATCHLOCK;
-#}
-
 # subroutines
 
 sub untaint_argv {
@@ -191,3 +65,106 @@ sub untaint_argv {
   }
 }
 
+sub usage {
+  die "Usage:\n\n  bill [ -c [ i ] ] [ -d 'date' ] [ -b ] user\n";
+}
+
+=head1 NAME
+
+bill - Command line (crontab, script) interface to customer billing.
+
+=head1 SYNOPSIS
+
+  bill [ -c [ i ] ] [ -d 'date' ] user
+
+=head1 DESCRIPTION
+
+Bills all customers.  Searches for customers who are due for billing and calls
+the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
+
+-c: Turn on collecting (you probably want this).
+
+-i: real-time billing (as opposed to batch billing).  only relevant
+    for credit cards.
+
+-d: Pretent it's 'date'.  Date is in any format Date::Parse is happy with,
+    but be careful.
+
+user: From the mapsecrets file - see config.html from the base documentation
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::cust_main>, config.html from the base documentation
+
+=head1 HISTORY
+
+ivan@voicenet.com sep/oct 96
+
+separated billing and collections, cleaned up code.
+ivan@voicenet.com 96-nov-11
+
+added -d option
+ivan@voicenet.com 96-nov-13
+
+added -v option and started to implement it, added 'd:' to getopts call
+  (oops!)
+ivan@voicenet.com 97-jan-2
+
+added more debug messages, moved some searches to fssearch.pl library (for 
+speed)
+rewrote "all customer" finder to know about bill dates, for speed.
+ivan@voicenet.com 97-jan-8
+
+thought about it a while, and removed passing of the -d option to collect...?
+ivan@voicenet.com 97-jan-14
+
+make all -v stuff STDERR 
+ivan@voicenet.com 97-feb-4
+
+added pkgnum as argument to program from /db/part_pkg, with kludge for the
+"/bin/echo XX" 's already there.
+ivan@voicenet.com 97-feb-23
+
+- general cleanup
+- customers who are suspended can still be billed for the setup fee
+- cust_pkg record is re-read after the package setup fee program is run.
+  this way,
+  that program can modify the record (for example, to start accounts off
+  suspended)
+  (best to think four or five times before modifying anything else!)
+ivan@voicenet.com 97-feb-26
+
+don't bill recurring fee if its not time! (was removed)
+ivan@voicenet.com 97-mar-6
+
+added -b option, send batch when done billing.
+ivan@voicenet.com 97-apr-4
+
+insecure dependency on line 179ish below needs to be fixed before bill is
+used setuid
+ivan@voicenet.com 97-jun-2
+
+removed running of setup program (depriciated)
+ivan@voicenet.com 97-jul-21
+
+rewrote for new API, removed option to specify custnums (use FS::Bill 
+instead), removed -v option (?)
+ivan@voicenet.com 97-jul-22 - 23 - 25 -28
+(need to add back in email stuff, look in /home/ivan/old/dbin/collect)
+
+s/suidsetup/adminsuidsetup/, s/FS::Search/FS::Record/, added some batch
+exporting stuff (which still needs to be generalized) and removed &idiot
+ivan@sisd.com 98-may-27
+
+$Log: bill,v $
+Revision 1.5  1998-11-15 02:51:21  ivan
+adminsuidsetup needs user, pod, cleanup
+
+Revision 1.4  1998/11/07 08:21:26  ivan
+missing use
+
+=cut
+
+
-- 
cgit v1.2.1


From 1dad506b145956736a8f200ee35786b640b40e3f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 02:53:00 +0000
Subject: afterthought

---
 bin/bill | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/bin/bill b/bin/bill
index b74f26abd..9553af966 100755
--- a/bin/bill
+++ b/bin/bill
@@ -30,7 +30,9 @@ foreach $cust_main (
     } else {
       ();
     }
-  } qsearch('cust_pkg',{'cancel'=>''})
+  } ( qsearch('cust_pkg', { 'cancel' => '' }),
+      qsearch('cust_pkg', { 'cancel' => 0  }),
+    )
 ) {
 
   # and bill them
@@ -92,6 +94,10 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
 user: From the mapsecrets file - see config.html from the base documentation
 
+=head1 VERSION
+
+$Id: bill,v 1.6 1998-11-15 02:53:00 ivan Exp $
+
 =head1 BUGS
 
 =head1 SEE ALSO
@@ -159,8 +165,8 @@ exporting stuff (which still needs to be generalized) and removed &idiot
 ivan@sisd.com 98-may-27
 
 $Log: bill,v $
-Revision 1.5  1998-11-15 02:51:21  ivan
-adminsuidsetup needs user, pod, cleanup
+Revision 1.6  1998-11-15 02:53:00  ivan
+afterthought
 
 Revision 1.4  1998/11/07 08:21:26  ivan
 missing use
-- 
cgit v1.2.1


From 026cc33e1f8e6096edd1234e23e677391bcf99c6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 03:46:16 +0000
Subject: *** empty log message ***

---
 site_perl/table_template-unique.pm | 66 --------------------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 site_perl/table_template-unique.pm

diff --git a/site_perl/table_template-unique.pm b/site_perl/table_template-unique.pm
deleted file mode 100644
index 32b7e6911..000000000
--- a/site_perl/table_template-unique.pm
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/local/bin/perl -Tw
-#
-# ivan@voicenet.com 97-jul-1
-# 
-# added hfields
-# ivan@sisd.com 97-nov-13
-
-package FS::table_name;
-
-use strict;
-use Exporter;
-#use FS::UID qw(getotaker);
-use FS::Record qw(fields hfields qsearch qsearchs);
-
-@FS::table_name::ISA = qw(FS::Record Exporter);
-@FS::table_name::EXPORT_OK = qw(hfields);
-
-# Usage: $record = create FS::table_name ( \%hash );
-#        $record = create FS::table_name ( { field=>value, ... } );
-sub create {
-  my($proto,$hashref)=@_;
-
-  my($field);
-  foreach $field (fields('table_name')) {
-    $hashref->{$field}='' unless defined $hashref->{$field};
-  }
-
-  $proto->new('table_name',$hashref);
-}
-
-# Usage: $error = $record -> insert;
-sub insert {
-  my($self)=@_;
-
-  $self->check or
-  $self->add;
-}
-
-# Usage: $error = $record -> delete;
-sub delete {
-  my($self)=@_;
-
-  $self->del;
-}
-
-# Usage: $error = $newrecord -> replace($oldrecord)
-sub replace {
-  my($new,$old)=@_;
-  return "(Old) Not a table_name record!" unless $old->table eq "table_name";
-  return "Can't change keyfield!"
-    unless $old->getfield('keyfield') eq $new->getfield('keyfield');
-  $new->check or
-  $new->rep($old);
-}
-
-# Usage: $error = $record -> check;
-sub check {
-  my($self)=@_;
-  return "Not a table_name record!" unless $self->table eq "table_name";
-  my($recref) = $self->hashref;
-
-  ''; #no error
-}
-
-1;
-
-- 
cgit v1.2.1


From 71825c330729668bfa658a0203b0e3cb8362a4f9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 03:48:49 +0000
Subject: update for current version

---
 site_perl/table_template.pm | 128 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 107 insertions(+), 21 deletions(-)

diff --git a/site_perl/table_template.pm b/site_perl/table_template.pm
index cef2d92e8..5b560a2e7 100644
--- a/site_perl/table_template.pm
+++ b/site_perl/table_template.pm
@@ -1,66 +1,152 @@
-#!/usr/local/bin/perl -Tw
-#
-# ivan@voicenet.com 97-jul-1
-# 
-# added hfields
-# ivan@sisd.com 97-nov-13
-
 package FS::table_name;
 
 use strict;
+use vars qw (@ISA);
 use Exporter;
 #use FS::UID qw(getotaker);
 use FS::Record qw(hfields qsearch qsearchs);
 
-@FS::table_name::ISA = qw(FS::Record Exporter);
-@FS::table_name::EXPORT_OK = qw(hfields);
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::table_name - Object methods for table_name records
+
+=head1 SYNOPSIS
+
+  use FS::table_name;
+
+  $record = create FS::table_name \%hash;
+  $record = create FS::table_name { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::table_name object represents an example.  FS::table_name inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item field - description
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new example.  To add the example to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
 
-# Usage: $record = create FS::table_name ( \%hash );
-#        $record = create FS::table_name ( { field=>value, ... } );
 sub create {
   my($proto,$hashref)=@_;
 
-  my($field);
-  foreach $field (fields('table_name')) {
-    $hashref->{$field}='' unless defined $hashref->{$field};
-  }
-
   $proto->new('table_name',$hashref);
 
 }
 
-# Usage: $error = $record -> insert;
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
 sub insert {
   my($self)=@_;
 
+  #local $SIG{HUP} = 'IGNORE';
+  #local $SIG{INT} = 'IGNORE';
+  #local $SIG{QUIT} = 'IGNORE';
+  #local $SIG{TERM} = 'IGNORE';
+  #local $SIG{TSTP} = 'IGNORE';
+
   $self->check or
   $self->add;
 }
 
-# Usage: $error = $record -> delete;
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
 sub delete {
   my($self)=@_;
 
   $self->del;
 }
 
-# Usage: $error = $newrecord -> replace($oldrecord)
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
 sub replace {
   my($new,$old)=@_;
   return "(Old) Not a table_name record!" unless $old->table eq "table_name";
 
+  return "Can't change keyfield!"
+     unless $old->getfield('keyfield') eq $new->getfield('keyfield');
+
   $new->check or
   $new->rep($old);
 }
 
-# Usage: $error = $record -> check;
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+
+=cut
+
 sub check {
   my($self)=@_;
   return "Not a table_name record!" unless $self->table eq "table_name";
-  my($recref) = $self->hashref;
+
 
   ''; #no error
 }
 
+=head1 BUGS
+
+The author forgot to customize this manpage.
+
+=head1 SEE ALSO
+
+L<FS::Record>
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jul-1
+
+added hfields
+ivan@sisd.com 97-nov-13
+
+$Log: table_template.pm,v $
+Revision 1.2  1998-11-15 03:48:49  ivan
+update for current version
+
+
+=cut
+
 1;
 
-- 
cgit v1.2.1


From 433014f617eebd32a381514529180b4fb6d45d53 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 04:33:01 +0000
Subject: updates for newest versoin

---
 site_perl/table_template-svc.pm | 193 +++++++++++++++++++++++++++++++++++-----
 site_perl/table_template.pm     |  12 ++-
 2 files changed, 179 insertions(+), 26 deletions(-)

diff --git a/site_perl/table_template-svc.pm b/site_perl/table_template-svc.pm
index a8cbaed5e..d4536e5f6 100644
--- a/site_perl/table_template-svc.pm
+++ b/site_perl/table_template-svc.pm
@@ -1,30 +1,79 @@
-#!/usr/local/bin/perl -Tw
-#
-# ivan@voicenet.com 97-jul-21
-
 package FS::svc_table;
 
 use strict;
+use vars qw(@ISA);
 use Exporter;
-use FS::Record qw(fields qsearchs);
+use FS::Record qw(fields qsearch qsearchs);
+use FS::cust_svc;
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::table_name - Object methods for table_name records
+
+=head1 SYNOPSIS
+
+  use FS::table_name;
+
+  $record = create FS::table_name \%hash;
+  $record = create FS::table_name { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $error = $record->suspend;
+
+  $error = $record->unsuspend;
+
+  $error = $record->cancel;
+
+=head1 DESCRIPTION
+
+An FS::table_name object represents an example.  FS::table_name inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item field - description
 
-@FS::svc_table::ISA = qw(FS::Record Exporter);
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new example.  To add the example to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
 
-# Usage: $record = create FS::svc_table ( \%hash );
-#        $record = create FS::svc_table ( { field=>value, ... } );
 sub create {
   my($proto,$hashref)=@_;
 
-  my($field);
-  foreach $field (fields('svc_table')) {
-    $hashref->{$field}='' unless defined $hashref->{$field};
-  }
-
   $proto->new('svc_table',$hashref);
 
 }
 
-# Usage: $error = $record -> insert;
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
+defined.  An FS::cust_svc record will be created and inserted.
+
+=cut
+
 sub insert {
   my($self)=@_;
   my($error);
@@ -38,13 +87,34 @@ sub insert {
   $error=$self->check;
   return $error if $error;
 
+  my($svcnum)=$self->svcnum;
+  my($cust_svc);
+  unless ( $svcnum ) {
+    $cust_svc=create FS::cust_svc ( {
+      'svcnum'  => $svcnum,
+      'pkgnum'  => $self->pkgnum,
+      'svcpart' => $self->svcpart,
+    } );
+    my($error) = $cust_svc->insert;
+    return $error if $error;
+    $svcnum = $self->svcnum($cust_svc->svcnum);
+  }
+
   $error = $self->add;
-  return $error if $error;
+  if ($error) {
+    #$cust_svc->del if $cust_svc;
+    $cust_svc->delete if $cust_svc;
+    return $error;
 
   ''; #no error
 }
 
-# Usage: $error = $record -> delete;
+=item delete
+
+Delete this record from the database.
+
+=cut
+
 sub delete {
   my($self)=@_;
   my($error);
@@ -54,7 +124,14 @@ sub delete {
 
 }
 
-# Usage: $error = $newrecord -> replace($oldrecord)
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
 sub replace {
   my($new,$old)=@_;
   my($error);
@@ -72,22 +149,47 @@ sub replace {
   ''; #no error
 }
 
-# Usage: $error = $record -> suspend;
+=item suspend
+
+Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=cut
+
 sub suspend {
   ''; #no error (stub)
 }
 
-# Usage: $error = $record -> unsuspend;
+=item unsuspend
+
+Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=cut
+
 sub unsuspend {
   ''; #no error (stub)
 }
 
-# Usage: $error = $record -> cancel;
+
+=item cancel
+
+Just returns false (no error) for now.
+
+Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=cut
+
 sub cancel {
   ''; #no error (stub)
 }
 
-# Usage: $error = $record -> check;
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+
+=cut
+
 sub check {
   my($self)=@_;
   return "Not a svc_table record!" unless $self->table eq "svc_table";
@@ -95,13 +197,56 @@ sub check {
 
   $recref->{svcnum} =~ /^(\d+)$/ or return "Illegal svcnum";
   $recref->{svcnum} = $1;
-  return "Unknown svcnum" unless
-    qsearchs('cust_svc',{'svcnum'=> $recref->{svcnum} } );
 
-  #DATA CHECKS GO HERE!
+  #get part_svc
+  my($svcpart);
+  my($svcnum)=$self->getfield('svcnum');
+  if ($svcnum) {
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
+    return "Unknown svcnum" unless $cust_svc; 
+    $svcpart=$cust_svc->svcpart;
+  } else {
+    $svcpart=$self->getfield('svcpart');
+  }
+  my($part_svc)=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  return "Unkonwn svcpart" unless $part_svc;
+
+  #set fixed fields from part_svc
+  my($field);
+  foreach $field ( fields('svc_acct') ) {
+    if ( $part_svc->getfield('svc_acct__'. $field. '_flag') eq 'F' ) {
+      $self->setfield($field,$part_svc->getfield('svc_acct__'. $field) );
+    }
+  }
 
   ''; #no error
 }
 
+=back
+
+=head1 VERSION
+
+$Id: table_template-svc.pm,v 1.2 1998-11-15 04:33:01 ivan Exp $
+
+=head1 BUGS
+
+The author forgot to customize this manpage.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>, schema.html
+froom the base documentation.
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jul-21
+
+$Log: table_template-svc.pm,v $
+Revision 1.2  1998-11-15 04:33:01  ivan
+updates for newest versoin
+
+
+=cut
+
 1;
 
diff --git a/site_perl/table_template.pm b/site_perl/table_template.pm
index 5b560a2e7..8945a39d7 100644
--- a/site_perl/table_template.pm
+++ b/site_perl/table_template.pm
@@ -78,7 +78,6 @@ sub insert {
   $self->add;
 }
 
-
 =item delete
 
 Delete this record from the database.
@@ -126,6 +125,12 @@ sub check {
   ''; #no error
 }
 
+=back
+
+=head1 VERSION
+
+$Id: table_template.pm,v 1.3 1998-11-15 04:33:00 ivan Exp $
+
 =head1 BUGS
 
 The author forgot to customize this manpage.
@@ -142,7 +147,10 @@ added hfields
 ivan@sisd.com 97-nov-13
 
 $Log: table_template.pm,v $
-Revision 1.2  1998-11-15 03:48:49  ivan
+Revision 1.3  1998-11-15 04:33:00  ivan
+updates for newest versoin
+
+Revision 1.2  1998/11/15 03:48:49  ivan
 update for current version
 
 
-- 
cgit v1.2.1


From e87d3cbbe4bc0737003a24647d431f72fc25f225 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 05:19:58 +0000
Subject: long overdue

---
 site_perl/cust_pay_batch.pm | 267 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 267 insertions(+)
 create mode 100644 site_perl/cust_pay_batch.pm

diff --git a/site_perl/cust_pay_batch.pm b/site_perl/cust_pay_batch.pm
new file mode 100644
index 000000000..186b4c154
--- /dev/null
+++ b/site_perl/cust_pay_batch.pm
@@ -0,0 +1,267 @@
+package FS::cust_pay_batch;
+
+use strict;
+use vars qw (@ISA);
+use Exporter;
+#use FS::UID qw(getotaker);
+use FS::Record qw(hfields qsearch qsearchs);
+use Business::CreditCard;
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::cust_pay_batdh - Object methods for batch cards
+
+=head1 SYNOPSIS
+
+  use FS::cust_pay_batch;
+
+  $record = create FS::cust_pay_batch \%hash;
+  $record = create FS::cust_pay_batch { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_pay_batch object represents a credit card transaction ready to be
+batched (sent to a processor).  FS::cust_pay_batch inherits from FS::Record.  
+Typically called by the collect method of an FS::cust_main object.  The
+following fields are currently supported:
+
+=over 4
+
+=item trancode - 77 for charges
+
+=item cardnum
+
+=item exp - card expiration 
+
+=item amount 
+
+=item invnum - invoice
+
+=item custnum - customer 
+
+=item payname - name on card 
+
+=item first - name 
+
+=item last - name 
+
+=item address1 
+
+=item address2 
+
+=item city 
+
+=item state 
+
+=item zip 
+
+=item country 
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new record.  To add the record to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  $proto->new('cust_pay_batch',$hashref);
+
+}
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  #local $SIG{HUP} = 'IGNORE';
+  #local $SIG{INT} = 'IGNORE';
+  #local $SIG{QUIT} = 'IGNORE';
+  #local $SIG{TERM} = 'IGNORE';
+  #local $SIG{TSTP} = 'IGNORE';
+
+  $self->check or
+  $self->add;
+}
+
+=item delete
+
+#inactive
+#
+#Delete this record from the database.
+
+=cut
+
+sub delete {
+  my($self)=@_;
+
+  #$self->del;
+
+  return "Can't (yet?) delete batched transactions!";
+}
+
+=item replace OLD_RECORD
+
+#inactive
+#
+#Replaces the OLD_RECORD with this one in the database.  If there is an error,
+#returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  #return "(Old) Not a table_name record!" unless $old->table eq "table_name";
+  #
+  #return "Can't change keyfield!"
+  #   unless $old->getfield('keyfield') eq $new->getfield('keyfield');
+  #
+  #$new->check or
+  #$new->rep($old);
+
+  return "Can't (yet?) replace batched transactions!";
+}
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a cust_pay_batch record!" unless $self->table eq "cust_pay_batch";
+
+  my $error = 
+      $self->ut_numbern('trancode')
+    or $self->ut_number('cardnum') 
+    or $self->ut_money('amount')
+    or $self->ut_number('invnum')
+    or $self->ut_number('custnum')
+    or $self->ut_text('address1')
+    or $self->ut_textn('address2')
+    or $self->ut_text('city')
+    or $self->ut_text('state')
+  ;
+
+  return $error if $error;
+
+  $self->getfield('last') =~ /^([\w \,\.\-\']+)$/ or return "Illegal last name";
+  $self->setfield('last',$1);
+
+  $self->first =~ /^([\w \,\.\-\']+)$/ or return "Illegal first name";
+  $self->first($1);
+
+  my $cardnum = $self->cardnum;
+  $cardnum =~ s/\D//g;
+  $cardnum =~ /^(\d{13,16})$/
+    or return "Illegal credit card number";
+  $cardnum = $1;
+  $self->cardnum($cardnum);
+  validate($cardnum) or return "Illegal credit card number";
+  my $type = cardtype($cardnum);
+  return "Unknown credit card type"
+    unless ( $type =~ /^VISA/ ||
+             $type =~ /^MasterCard/ ||
+             $type =~ /^American Express/ ||
+             $type =~ /^Discover/ );
+
+  if ( $self->exp eq '' ) {
+    return "Expriation date required";
+    $self->exp('');
+  } else {
+    $self->exp =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/
+      or return "Illegal expiration date";
+    if ( length($2) == 4 ) {
+      $self->exp("$2-$1-01");
+    } elsif ( $2 > 98 ) { #should pry change to check for "this year"
+      $self->exp("19$2-$1-01");
+    } else {
+      $self->exp("20$2-$1-01");
+    }
+  }
+
+  if ( $self->payname eq '' ) {
+    $self->payname( $self->first. " ". $self->getfield('last') );
+  } else {
+    $self->payname =~ /^([\w \,\.\-\']+)$/
+      or return "Illegal billing name";
+    $self->payname($1);
+  }
+
+  #int'l zips?
+  $self->zip =~ /^(\d{5}(-\d{4})?)$/ or return "Illegal zip";
+  $self->zip($1);
+
+  #int'l countries!
+  $self->country =~ /^(US)$/ or return "Illegal country";
+  $self->country($1);
+
+  #check invnum, custnum, ?
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: cust_pay_batch.pm,v 1.1 1998-11-15 05:19:58 ivan Exp $
+
+=head1 BUGS
+
+The author forgot to customize this manpage.
+
+=head1 SEE ALSO
+
+L<FS::cust_main>, L<FS::Record>
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jul-1
+
+added hfields
+ivan@sisd.com 97-nov-13
+
+$Log: cust_pay_batch.pm,v $
+Revision 1.1  1998-11-15 05:19:58  ivan
+long overdue
+
+Revision 1.3  1998/11/15 04:33:00  ivan
+updates for newest versoin
+
+Revision 1.2  1998/11/15 03:48:49  ivan
+update for current version
+
+
+=cut
+
+1;
+
-- 
cgit v1.2.1


From 57c5b4de544c1609597e568da88195290eeef4c3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 05:27:48 +0000
Subject: bugfix for new configuration layout

---
 site_perl/UID.pm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/site_perl/UID.pm b/site_perl/UID.pm
index c9ecd8fc9..156bd3024 100644
--- a/site_perl/UID.pm
+++ b/site_perl/UID.pm
@@ -223,7 +223,7 @@ sub getsecrets {
   die "Illegal mapsecrets line for user?!" unless $secrets;
   ($datasrc, $db_user, $db_pass) = $conf->config($secrets)
     or die "Can't get secrets: $!";
-  $FS::Conf::default_dir .= "/conf.$datasrc";
+  $FS::Conf::default_dir = $conf_dir. "/conf.$datasrc";
   ($datasrc, $db_user, $db_pass);
 }
 
@@ -239,6 +239,10 @@ coderef into the hash %FS::UID::callback :
     $coderef = sub { warn "Hi, I'm returning your call!" };
     $FS::UID::callback{'Package::Name'};
 
+=head1 VERSION
+
+$Id: UID.pm,v 1.6 1998-11-15 05:27:48 ivan Exp $
+
 =head1 BUGS
 
 Too many package-global variables.
@@ -283,7 +287,10 @@ inlined suidsetup
 ivan@sisd.com 98-sep-12
 
 $Log: UID.pm,v $
-Revision 1.5  1998-11-15 00:51:51  ivan
+Revision 1.6  1998-11-15 05:27:48  ivan
+bugfix for new configuration layout
+
+Revision 1.5  1998/11/15 00:51:51  ivan
 eliminated some warnings on certain fatal errors (well, it is less confusing)
 
 Revision 1.4  1998/11/13 09:56:52  ivan
-- 
cgit v1.2.1


From 8fc1c5f0c2225a5d7a6a2316a9f0b77710cb5a70 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 05:31:03 +0000
Subject: bugfix for new config layout

---
 site_perl/Record.pm    | 11 +++++++----
 site_perl/cust_main.pm |  8 ++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/site_perl/Record.pm b/site_perl/Record.pm
index 111bb82a2..dbfae95ec 100644
--- a/site_perl/Record.pm
+++ b/site_perl/Record.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw($dbdef_file $dbdef $setup_hack $AUTOLOAD @ISA @EXPORT_OK);
 use subs qw(reload_dbdef);
 use Exporter;
-use Carp;
+use Carp qw(carp cluck croak confess);
 use File::CounterFile;
 use FS::UID qw(dbh checkruid swapuid getotaker datasrc);
 use FS::dbdef;
@@ -14,7 +14,7 @@ use FS::dbdef;
 
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::Record'} = sub { 
-  $File::CounterFile::DEFAULT_DIR = "/usr/local/etc/freeside/counters". datasrc;
+  $File::CounterFile::DEFAULT_DIR = "/usr/local/etc/freeside/counters.". datasrc;
   $dbdef_file = "/usr/local/etc/freeside/dbdef.". datasrc;
   &reload_dbdef unless $setup_hack; #$setup_hack needed now?
 };
@@ -181,7 +181,7 @@ sub qsearch {
       eval 'create FS::'. $table. ' ( $sth->fetchrow_hashref );';
     } ( 1 .. $sth->execute );
   } else {
-    carp "qsearch: warning: FS::$table not loaded; returning generic FS::Record objects";
+    cluck "qsearch: warning: FS::$table not loaded; returning generic FS::Record objects";
     map {
       new FS::Record ($table,$sth->fetchrow_hashref);
     } ( 1 .. $sth->execute );
@@ -871,7 +871,10 @@ added pod documentation ivan@sisd.com 98-sep-6
 ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
 $Log: Record.pm,v $
-Revision 1.5  1998-11-13 09:56:51  ivan
+Revision 1.6  1998-11-15 05:31:03  ivan
+bugfix for new config layout
+
+Revision 1.5  1998/11/13 09:56:51  ivan
 change configuration file layout to support multiple distinct databases (with
 own set of config files, export, etc.)
 
diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index 83a7d786d..496efd908 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -19,7 +19,8 @@ use FS::cust_pkg;
 use FS::cust_bill;
 use FS::cust_bill_pkg;
 use FS::cust_pay;
-#use FS::cust_pay_batch;
+use FS::cust_credit;
+use FS::cust_pay_batch;
 
 @ISA = qw(FS::Record Exporter);
 @EXPORT_OK = qw(hfields);
@@ -868,7 +869,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.3  1998-11-13 09:56:54  ivan
+Revision 1.4  1998-11-15 05:30:48  ivan
+bugfix for new config layout
+
+Revision 1.3  1998/11/13 09:56:54  ivan
 change configuration file layout to support multiple distinct databases (with
 own set of config files, export, etc.)
 
-- 
cgit v1.2.1


From 1a354432763a3e699999b81402c42a12a347c10e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 09:08:15 +0000
Subject: added clone method to support per-customer pricing

---
 site_perl/part_pkg.pm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/site_perl/part_pkg.pm b/site_perl/part_pkg.pm
index d1c12e47e..7434a9b24 100644
--- a/site_perl/part_pkg.pm
+++ b/site_perl/part_pkg.pm
@@ -19,6 +19,8 @@ FS::part_pkg - Object methods for part_pkg objects
   $record = create FS::part_pkg \%hash
   $record = create FS::part_pkg { 'column' => 'value' };
 
+  $custom_record = $template_record->clone;
+
   $error = $record->insert;
 
   $error = $new_record->replace($old_record);
@@ -74,6 +76,21 @@ sub create {
   $proto->new('part_pkg',$hashref);
 }
 
+=item clone
+
+Creates a new billing item definition by duplicating an existing definition.
+A new pkgpart is assigned and "(CUSTOM) " is prepended to the comment field.
+
+=cut
+
+sub clone {
+  my $self = shift;
+  my %hash = $self->hash;
+  $hash{'comment'} = "(CUSTOM) ". $hash{'comment'}
+    unless $hash{'comment'} =~ /^\(CUSTOM\) /;
+  create ( { $self->hash } );
+}
+
 =item insert
 
 Adds this billing item definition to the database.  If there is an error,
@@ -142,6 +159,10 @@ sub check {
 
 =back
 
+=head1 VERSION
+
+$Id: part_pkg.pm,v 1.2 1998-11-15 09:08:15 ivan Exp $
+
 =head1 BUGS
 
 It doesn't properly override FS::Record yet.
@@ -162,6 +183,11 @@ ivan@sisd.com 97-dec-5
 
 pod ivan@sisd.com 98-sep-21
 
+$Log: part_pkg.pm,v $
+Revision 1.2  1998-11-15 09:08:15  ivan
+added clone method to support per-customer pricing
+
+
 =cut
 
 1;
-- 
cgit v1.2.1


From 60b5717194d18401d8532ca8b09376edeea535d7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 09:43:03 +0000
Subject: update for new config file syntax, new adminsuidsetup

---
 bin/fs-setup | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 98e754261..4e64f1bdf 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.4  1998-10-22 15:51:23  ivan
+# Revision 1.5  1998-11-15 09:43:03  ivan
+# update for new config file syntax, new adminsuidsetup
+#
+# Revision 1.4  1998/10/22 15:51:23  ivan
 # also varchar with no length specified - postgresql fix broke mysql.
 #
 # Revision 1.3  1998/10/22 15:46:28  ivan
@@ -49,8 +52,11 @@ use FS::UID qw(adminsuidsetup datasrc);
 use FS::Record;
 use FS::cust_main_county;
 
+my $user = shift or die &usage;
+FS::UID::getsecrets $user;
+
 #needs to match FS::Record
-my($dbdef_file) = "/var/spool/freeside/dbdef.". datasrc;
+my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;
 
 ###
 
@@ -151,13 +157,14 @@ foreach (qw(svc_acct svc_acct_sm svc_domain)) {
 
 #important
 $dbdef->save($dbdef_file);
-FS::Record::reload_dbdef;
+FS::Record::reload_dbdef($dbdef_file);
 
 ###
 # create 'em
 ###
 
-my($dbh)=adminsuidsetup;
+my($dbh)=adminsuidsetup $user;
+warn $dbh;
 
 #create tables
 $|=1;
@@ -198,6 +205,10 @@ SC SD TN TX TT UT VT VI VA WA WV WI WY AE AA AP
 
 $dbh->disconnect or die $dbh->errstr;
 
+sub usage {
+  die "Usage:\n  fs-setup user\n"; 
+}
+
 ###
 # Now it becomes an object.  much better.
 ###
-- 
cgit v1.2.1


From 1e8ee4ebfca24ef9039b565f26893d655ffa42f3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 10:56:31 +0000
Subject: qsearch gets sames "IS NULL" semantics as other WHERE clauses

---
 site_perl/Record.pm | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/site_perl/Record.pm b/site_perl/Record.pm
index dbfae95ec..7c2980b9f 100644
--- a/site_perl/Record.pm
+++ b/site_perl/Record.pm
@@ -169,9 +169,12 @@ sub qsearch {
   my($sth);
   my($statement) = "SELECT * FROM $table". ( @fields
     ? " WHERE ". join(' AND ',
-        map("$_ = ". _quote($record->{$_},$table,$_), @fields)
-      )
-    : ''
+      map {
+        $self->getfield($_) eq ''
+          ? "$_ IS NULL"
+          : "$_ = ". _quote($self->getfield($_),$table,$_)
+      } @fields)
+    ) : ''
   );
   $sth=$dbh->prepare($statement)
     or croak $dbh->errstr; #is that a little too harsh?  hmm.
@@ -754,6 +757,10 @@ sub fields {
 
 =back
 
+=head1 VERSION
+
+$Id: Record.pm,v 1.7 1998-11-15 10:56:31 ivan Exp $
+
 =head1 BUGS
 
 This module should probably be renamed, since much of the functionality is
@@ -871,7 +878,10 @@ added pod documentation ivan@sisd.com 98-sep-6
 ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
 $Log: Record.pm,v $
-Revision 1.6  1998-11-15 05:31:03  ivan
+Revision 1.7  1998-11-15 10:56:31  ivan
+qsearch gets sames "IS NULL" semantics as other WHERE clauses
+
+Revision 1.6  1998/11/15 05:31:03  ivan
 bugfix for new config layout
 
 Revision 1.5  1998/11/13 09:56:51  ivan
-- 
cgit v1.2.1


From 99ea62e8f3e4d612b187372badbacf447f83704c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 11:02:04 +0000
Subject: bugsquash

---
 site_perl/Record.pm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/site_perl/Record.pm b/site_perl/Record.pm
index 7c2980b9f..89793d2ad 100644
--- a/site_perl/Record.pm
+++ b/site_perl/Record.pm
@@ -170,10 +170,10 @@ sub qsearch {
   my($statement) = "SELECT * FROM $table". ( @fields
     ? " WHERE ". join(' AND ',
       map {
-        $self->getfield($_) eq ''
+        $record->{$_} eq ''
           ? "$_ IS NULL"
-          : "$_ = ". _quote($self->getfield($_),$table,$_)
-      } @fields)
+          : "$_ = ". _quote($record->{$_},$table,$_)
+      } @fields
     ) : ''
   );
   $sth=$dbh->prepare($statement)
@@ -759,7 +759,7 @@ sub fields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.7 1998-11-15 10:56:31 ivan Exp $
+$Id: Record.pm,v 1.8 1998-11-15 11:02:04 ivan Exp $
 
 =head1 BUGS
 
@@ -878,7 +878,10 @@ added pod documentation ivan@sisd.com 98-sep-6
 ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
 $Log: Record.pm,v $
-Revision 1.7  1998-11-15 10:56:31  ivan
+Revision 1.8  1998-11-15 11:02:04  ivan
+bugsquash
+
+Revision 1.7  1998/11/15 10:56:31  ivan
 qsearch gets sames "IS NULL" semantics as other WHERE clauses
 
 Revision 1.6  1998/11/15 05:31:03  ivan
-- 
cgit v1.2.1


From 142e4e186f3cf2f33688ccfe3e6444e3ddc3f025 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 11:20:12 +0000
Subject: s/CGI-Base/CGI.pm/ causes s/QUERY_STRING/keywords/;

---
 htdocs/edit/agent_type.cgi | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/edit/agent_type.cgi b/htdocs/edit/agent_type.cgi
index 9f3748d3d..b6b45eead 100755
--- a/htdocs/edit/agent_type.cgi
+++ b/htdocs/edit/agent_type.cgi
@@ -1,5 +1,7 @@
 #!/usr/bin/perl -Tw
 #
+# $Id: agent_type.cgi,v 1.3 1998-11-15 11:20:12 ivan Exp $
+#
 # agent_type.cgi: Add/Edit agent type (output form)
 #
 # ivan@sisd.com 97-dec-10
@@ -11,7 +13,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.2  1998-11-13 09:56:46  ivan
+# Revision 1.3  1998-11-15 11:20:12  ivan
+# s/CGI-Base/CGI.pm/ causes s/QUERY_STRING/keywords/;
+#
+# Revision 1.2  1998/11/13 09:56:46  ivan
 # change configuration file layout to support multiple distinct databases (with
 # own set of config files, export, etc.)
 #
@@ -29,7 +34,7 @@ my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
 my($agent_type,$action);
-if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
+if ( $cgi->keywords =~ /^(\d+)$/ ) { #editing
   $agent_type=qsearchs('agent_type',{'typenum'=>$1});
   $action='Edit';
 } else { #adding
-- 
cgit v1.2.1


From 342c64a16e9b3e0a88dece9d6d2c88a281e8bf41 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 11:23:14 +0000
Subject: use FS::table_name for all searches to eliminate warnings, emit
 state/county when they don't match

---
 site_perl/cust_main.pm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index 496efd908..51c9519c5 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -21,6 +21,9 @@ use FS::cust_bill_pkg;
 use FS::cust_pay;
 use FS::cust_credit;
 use FS::cust_pay_batch;
+use FS::part_referral;
+use FS::cust_main_county;
+use FS::agent;
 
 @ISA = qw(FS::Record Exporter);
 @EXPORT_OK = qw(hfields);
@@ -280,7 +283,8 @@ sub check {
     $self->ss("$1-$2-$3");
   }
 
-  return "Unknown state/county/country"
+  return "Unknown state/county/country, state ".
+      "\"". $self->state. "\" county \"". $self->county. "\""
     unless qsearchs('cust_main_county',{
       'state'  => $self->state,
       'county' => $self->county,
@@ -869,7 +873,11 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.4  1998-11-15 05:30:48  ivan
+Revision 1.5  1998-11-15 11:23:14  ivan
+use FS::table_name for all searches to eliminate warnings,
+emit state/county when they don't match
+
+Revision 1.4  1998/11/15 05:30:48  ivan
 bugfix for new config layout
 
 Revision 1.3  1998/11/13 09:56:54  ivan
-- 
cgit v1.2.1


From d0339801aec275e994c62ef4a12de4ec2eb294e1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 13:00:15 +0000
Subject: bugfix in clone method, clone method doc clarification

---
 site_perl/part_pkg.pm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/site_perl/part_pkg.pm b/site_perl/part_pkg.pm
index 7434a9b24..4643b9f15 100644
--- a/site_perl/part_pkg.pm
+++ b/site_perl/part_pkg.pm
@@ -80,15 +80,17 @@ sub create {
 
 Creates a new billing item definition by duplicating an existing definition.
 A new pkgpart is assigned and "(CUSTOM) " is prepended to the comment field.
+To add the billing item definition to the database, see L<"insert">.
 
 =cut
 
 sub clone {
   my $self = shift;
   my %hash = $self->hash;
+  $hash{'pkgpart'} = '';
   $hash{'comment'} = "(CUSTOM) ". $hash{'comment'}
     unless $hash{'comment'} =~ /^\(CUSTOM\) /;
-  create ( { $self->hash } );
+  create FS::part_pkg ( \%hash ); # ?
 }
 
 =item insert
@@ -161,7 +163,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.2 1998-11-15 09:08:15 ivan Exp $
+$Id: part_pkg.pm,v 1.3 1998-11-15 13:00:15 ivan Exp $
 
 =head1 BUGS
 
@@ -184,8 +186,8 @@ ivan@sisd.com 97-dec-5
 pod ivan@sisd.com 98-sep-21
 
 $Log: part_pkg.pm,v $
-Revision 1.2  1998-11-15 09:08:15  ivan
-added clone method to support per-customer pricing
+Revision 1.3  1998-11-15 13:00:15  ivan
+bugfix in clone method, clone method doc clarification
 
 
 =cut
-- 
cgit v1.2.1


From d02ed4f82fa0394ee74ec92954524655ad605c8f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 13:01:35 +0000
Subject: allow pkgpart changing (for per-customer custom pricing).  warn about
 it in doc

---
 site_perl/cust_pkg.pm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/site_perl/cust_pkg.pm b/site_perl/cust_pkg.pm
index 249e1b77c..5640e24b6 100644
--- a/site_perl/cust_pkg.pm
+++ b/site_perl/cust_pkg.pm
@@ -7,6 +7,7 @@ use FS::UID qw(getotaker);
 use FS::Record qw(fields qsearch qsearchs);
 use FS::cust_svc;
 use FS::part_pkg;
+use FS::cust_main;
 
 @ISA = qw(FS::Record Exporter);
 
@@ -124,7 +125,7 @@ returns the error, otherwise returns false.
 
 Currently, custnum, setup, bill, susp, expire, and cancel may be changed.
 
-pkgpart may not be changed, but see the order subroutine.
+Changing pkgpart may have disasterous effects.  See the order subroutine.
 
 setup and bill are normally updated by calling the bill method of a customer
 object (see L<FS::cust_main>).
@@ -141,8 +142,8 @@ sub replace {
   return "(Old) Not a cust_pkg record!" if $old->table ne "cust_pkg";
   return "Can't change pkgnum!"
     if $old->getfield('pkgnum') ne $new->getfield('pkgnum');
-  return "Can't (yet?) change pkgpart!"
-    if $old->getfield('pkgpart') ne $new->getfield('pkgpart');
+  #return "Can't (yet?) change pkgpart!"
+  #  if $old->getfield('pkgpart') ne $new->getfield('pkgpart');
   return "Can't change otaker!"
     if $old->getfield('otaker') ne $new->getfield('otaker');
   return "Can't change setup once it exists!"
@@ -492,6 +493,10 @@ sub order {
 
 =back
 
+=head1 VERSION
+
+$Id: cust_pkg.pm,v 1.3 1998-11-15 13:01:35 ivan Exp $
+
 =head1 BUGS
 
 It doesn't properly override FS::Record yet.
@@ -517,7 +522,10 @@ fixed for new agent->agent_type->type_pkgs in &order ivan@sisd.com 98-mar-7
 pod ivan@sisd.com 98-sep-21
 
 $Log: cust_pkg.pm,v $
-Revision 1.2  1998-11-12 03:42:45  ivan
+Revision 1.3  1998-11-15 13:01:35  ivan
+allow pkgpart changing (for per-customer custom pricing).  warn about it in doc
+
+Revision 1.2  1998/11/12 03:42:45  ivan
 added label method
 
 
-- 
cgit v1.2.1


From 2a7d9b79f305a57d84c49ee556242777bd739f74 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 13:14:20 +0000
Subject: first pass as per-customer custom pricing

---
 htdocs/view/cust_main.cgi | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index 5a660f23b..c39643d70 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -33,7 +33,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.2  1998-11-13 11:28:08  ivan
+# Revision 1.3  1998-11-15 13:14:20  ivan
+# first pass as per-customer custom pricing
+#
+# Revision 1.2  1998/11/13 11:28:08  ivan
 # s/CGI-modules/CGI.pm/;, relative URL's with popurl
 #
 
@@ -203,7 +206,12 @@ foreach $package (@packages) {
         $pref->{pkgnum}, qq!">!, 
         $pref->{pkgnum}, qq!</A></FONT></TD>!,
         "<TD><FONT SIZE=-1>", $part_pkg->getfield('pkg'), " - ",
-        $part_pkg->getfield('comment'), "</FONT></TD>",
+        $part_pkg->getfield('comment'), 
+          qq!<FORM ACTION="!, popurl(2), qq!/edit/part_pkg.cgi" METHOD=POST>!,
+          qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $part_pkg->pkgpart, qq!">!,
+          qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $package->pkgnum, qq!">!,
+          qq!<INPUT TYPE="submit" VALUE="Customize Pricing">!,
+          "</FORM></FONT></TD>",
         "<TD><FONT SIZE=-1>", 
         $pref->{setup} ? time2str("%D",$pref->{setup} ) : "" ,
         "</FONT></TD>",
-- 
cgit v1.2.1


From 61f2610ee6b8660a206a05675899ed72a5e59296 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 13:16:15 +0000
Subject: first pass as per-user custom pricing

---
 htdocs/edit/part_pkg.cgi         | 84 +++++++++++++++++++++++++++++-----------
 htdocs/edit/process/part_pkg.cgi | 50 +++++++++++++++++-------
 2 files changed, 99 insertions(+), 35 deletions(-)

diff --git a/htdocs/edit/part_pkg.cgi b/htdocs/edit/part_pkg.cgi
index 9fe739bb7..ed309128d 100755
--- a/htdocs/edit/part_pkg.cgi
+++ b/htdocs/edit/part_pkg.cgi
@@ -1,5 +1,7 @@
 #!/usr/bin/perl -Tw
 #
+# $Id: part_pkg.cgi,v 1.2 1998-11-15 13:14:55 ivan Exp $
+#
 # part_pkg.cgi: Add/Edit package (output form)
 #
 # ivan@sisd.com 97-dec-10
@@ -9,38 +11,64 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
+#
+# $Log: part_pkg.cgi,v $
+# Revision 1.2  1998-11-15 13:14:55  ivan
+# first pass as per-user custom pricing
+#
 
 use strict;
-use CGI::Base;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::part_pkg;
+use FS::part_svc;
 use FS::pkg_svc;
 use FS::CGI qw(header menubar);
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
+if ( $cgi->param('clone') =~ /^(\d+)$/ ) {
+  $cgi->param('clone', $1);
+} else {
+  $cgi->param('clone', '');
+}
+if ( $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
+  $cgi->param('pkgnum', $1);
+} else {
+  $cgi->param('pkgnum', '');
+}
 
 my($part_pkg,$action);
-if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
-  $part_pkg=qsearchs('part_pkg',{'pkgpart'=>$1});
+if ( $cgi->param('clone') ) {
+  $action='Custom Pricing';
+  my $old_part_pkg =
+    qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
+  $part_pkg = $old_part_pkg->clone;
+} elsif ( $cgi->keywords =~ /^(\d+)$/ ) {
   $action='Edit';
-} else { #adding
-  $part_pkg=create FS::part_pkg {};
+  $part_pkg=qsearchs('part_pkg',{'pkgpart'=>$1});
+} else {
   $action='Add';
+  $part_pkg=create FS::part_pkg {};
 }
 my($hashref)=$part_pkg->hashref;
 
-print header("$action Package Definition", menubar(
+print $cgi->header, header("$action Package Definition", menubar(
   'Main Menu' => '../',
   'View all packages' => '../browse/part_pkg.cgi',
 )), '<FORM ACTION="process/part_pkg.cgi" METHOD=POST>';
 
+if ( $cgi->param('clone') ) {
+  print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
+}
+if ( $cgi->param('pkgnum') ) {
+  print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $cgi->param('pkgnum'), qq!">!;
+}
+
 print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
       "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
 
@@ -54,10 +82,15 @@ Frequency (months) of recurring fee <INPUT TYPE="text" NAME="freq" VALUE="$hashr
 
 </PRE>
 
+END
+
+unless ( $cgi->param('clone') ) {
+  print <<END;
 Enter the quantity of each service this package includes.<BR><BR>
 <TABLE BORDER><TR><TH><FONT SIZE=-1>Quan.</FONT></TH><TH>Service</TH>
 		  <TH><FONT SIZE=-1>Quan.</FONT></TH><TH>Service</TH></TR>
 END
+}
 
 my($part_svc);
 my($count) = 0 ;
@@ -65,7 +98,7 @@ foreach $part_svc ( qsearch('part_svc',{}) ) {
 
   my($svcpart)=$part_svc->getfield('svcpart');
   my($pkg_svc)=qsearchs('pkg_svc',{
-    'pkgpart'  => $part_pkg->getfield('pkgpart'),
+    'pkgpart'  => $cgi->param('clone') || $part_pkg->getfield('pkgpart'),
     'svcpart'  => $svcpart,
   })  || create FS::pkg_svc({
     'pkgpart'  => $part_pkg->getfield('pkgpart'),
@@ -74,21 +107,28 @@ foreach $part_svc ( qsearch('part_svc',{}) ) {
   });
   next unless $pkg_svc;
 
-  print qq!<TR>! if $count == 0 ;
-  print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=3 VALUE="!,
-        $pkg_svc->getfield('quantity') || 0,qq!"></TD>!,
-        qq!<TD><A HREF="part_svc.cgi?!,$part_svc->getfield('svcpart'),
-        qq!">!, $part_svc->getfield('svc'), "</A></TD>";
-  $count ++ ;
-  if ($count == 2)
-  {
-    print qq!</TR>! ;
-    $count = 0 ;
+  unless ( $cgi->param('clone') ) {
+    print qq!<TR>! if $count == 0 ;
+    print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=3 VALUE="!,
+          $pkg_svc->getfield('quantity') || 0,qq!"></TD>!,
+          qq!<TD><A HREF="part_svc.cgi?!,$part_svc->getfield('svcpart'),
+          qq!">!, $part_svc->getfield('svc'), "</A></TD>";
+    $count ++ ;
+    if ($count == 2)
+    {
+      print qq!</TR>! ;
+      $count = 0 ;
+    }
+  } else {
+    print qq!<INPUT TYPE="hidden" NAME="pkg_svc$svcpart" VALUE="!,
+          $pkg_svc->getfield('quantity') || 0, qq!">\n!;
   }
 }
-print qq!</TR>! if ($count != 0) ;
 
-print "</TABLE>";
+unless ( $cgi->param('clone') ) {
+  print qq!</TR>! if ($count != 0) ;
+  print "</TABLE>";
+}
 
 print qq!<BR><INPUT TYPE="submit" VALUE="!,
       $hashref->{pkgpart} ? "Apply changes" : "Add package",
diff --git a/htdocs/edit/process/part_pkg.cgi b/htdocs/edit/process/part_pkg.cgi
index 7d787819a..78ed69613 100755
--- a/htdocs/edit/process/part_pkg.cgi
+++ b/htdocs/edit/process/part_pkg.cgi
@@ -1,5 +1,7 @@
 #!/usr/bin/perl -Tw
 #
+# $Id: part_pkg.cgi,v 1.2 1998-11-15 13:16:15 ivan Exp $
+#
 # process/part_pkg.cgi: Edit package definitions (process form)
 #
 # ivan@sisd.com 97-dec-10
@@ -13,30 +15,41 @@
 # Added `|| 0 ' when getting quantity off web page ivan@sisd.com 98-jun-4
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: part_pkg.cgi,v $
+# Revision 1.2  1998-11-15 13:16:15  ivan
+# first pass as per-user custom pricing
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(eidiot popurl);
 use FS::Record qw(qsearch qsearchs);
 use FS::part_pkg qw(fields);
 use FS::pkg_svc;
-use FS::CGI qw(eidiot);
-
-my($req)=new CGI::Request; # create form object
+use FS::cust_pkg;
 
-&cgisuidsetup($req->cgi);
+my($cgi)=new CGI;
+&cgisuidsetup($cgi);
 
-my($pkgpart)=$req->param('pkgpart');
+my($pkgpart)=$cgi->param('pkgpart');
 
 my($old)=qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
 
 my($new)=create FS::part_pkg ( {
   map {
-    $_, $req->param($_);
+    $_, $cgi->param($_);
   } fields('part_pkg')
 } );
 
+local $SIG{HUP} = 'IGNORE';
+local $SIG{INT} = 'IGNORE';
+local $SIG{QUIT} = 'IGNORE';
+local $SIG{TERM} = 'IGNORE';
+local $SIG{TSTP} = 'IGNORE';
+
 if ( $pkgpart ) {
   my($error)=$new->replace($old);
   eidiot($error) if $error;
@@ -50,8 +63,8 @@ my($part_svc);
 foreach $part_svc (qsearch('part_svc',{})) {
 # don't update non-changing records in part_svc (causing harmless but annoying
 # "Records identical" errors). ivan@sisd.com 98-jan-19
-  #my($quantity)=$req->param('pkg_svc'. $part_svc->getfield('svcpart')),
-  my($quantity)=$req->param('pkg_svc'. $part_svc->svcpart) || 0,
+  #my($quantity)=$cgi->param('pkg_svc'. $part_svc->getfield('svcpart')),
+  my($quantity)=$cgi->param('pkg_svc'. $part_svc->svcpart) || 0,
   my($old_pkg_svc)=qsearchs('pkg_svc',{
     'pkgpart'  => $pkgpart,
     'svcpart'  => $part_svc->getfield('svcpart'),
@@ -61,7 +74,7 @@ foreach $part_svc (qsearch('part_svc',{})) {
   my($new_pkg_svc)=create FS::pkg_svc({
     'pkgpart'  => $pkgpart,
     'svcpart'  => $part_svc->getfield('svcpart'),
-    #'quantity' => $req->param('pkg_svc'. $part_svc->getfield('svcpart')),
+    #'quantity' => $cgi->param('pkg_svc'. $part_svc->getfield('svcpart')),
     'quantity' => $quantity, 
   });
   if ($old_pkg_svc) {
@@ -73,7 +86,18 @@ foreach $part_svc (qsearch('part_svc',{})) {
   }
 }
 
-#$req->cgi->redirect("../../view/part_pkg.cgi?$pkgpart");
-#$req->cgi->redirect("../../edit/part_pkg.cgi?$pkgpart");
-$req->cgi->redirect("../../browse/part_pkg.cgi");
+unless ( $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
+  #$req->cgi->redirect("../../view/part_pkg.cgi?$pkgpart");
+  #$req->cgi->redirect("../../edit/part_pkg.cgi?$pkgpart");
+  $cgi->redirect("../../browse/part_pkg.cgi");
+} else {
+  my($old_cust_pkg) = qsearchs( 'cust_pkg', { 'pkgnum' => $1 } );
+  my %hash = $old_cust_pkg->hash;
+  $hash{'pkgpart'} = $pkgpart;
+  my($new_cust_pkg) = create FS::cust_pkg \%hash;
+  my $error = $new_cust_pkg->replace($old_cust_pkg);
+  eidiot "Error modifying cust_pkg record: $error\n" if $error;
+  print $cgi->redirect(popurl(3). "/view/cust_main.cgi?". $new_cust_pkg->custnum);
+}
+
 
-- 
cgit v1.2.1


From c48cfd422976aa77e9f10b5324bfbd71952e5333 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Nov 1998 13:18:02 +0000
Subject: remove debugging

---
 bin/fs-setup | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 4e64f1bdf..aab24b7e1 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.5  1998-11-15 09:43:03  ivan
+# Revision 1.6  1998-11-15 13:18:02  ivan
+# remove debugging
+#
+# Revision 1.5  1998/11/15 09:43:03  ivan
 # update for new config file syntax, new adminsuidsetup
 #
 # Revision 1.4  1998/10/22 15:51:23  ivan
@@ -164,7 +167,6 @@ FS::Record::reload_dbdef($dbdef_file);
 ###
 
 my($dbh)=adminsuidsetup $user;
-warn $dbh;
 
 #create tables
 $|=1;
-- 
cgit v1.2.1


From 69eff6e55baea5f6d99f8f797fa2eac6f761838b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 18 Nov 1998 08:57:36 +0000
Subject: i18n, s/CGI-modules/CGI.pm/, FS::CGI::idiot instead of inline,
 FS::CGI::popurl

---
 htdocs/edit/process/cust_main.cgi | 68 +++++++++++++++------------------------
 1 file changed, 26 insertions(+), 42 deletions(-)

diff --git a/htdocs/edit/process/cust_main.cgi b/htdocs/edit/process/cust_main.cgi
index 7664dfcb8..5f13a9301 100755
--- a/htdocs/edit/process/cust_main.cgi
+++ b/htdocs/edit/process/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/cust_main.cgi: Edit a customer (process form)
+# $Id: cust_main.cgi,v 1.2 1998-11-18 08:57:36 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -20,83 +20,67 @@
 # Changes to allow page to work at a relative position in server
 # Changed 'day' to 'daytime' because Pg6.3 reserves the day word
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cust_main.cgi,v $
+# Revision 1.2  1998-11-18 08:57:36  ivan
+# i18n, s/CGI-modules/CGI.pm/, FS::CGI::idiot instead of inline, FS::CGI::popurl
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(eidiot popurl);
 use FS::Record qw(qsearchs);
 use FS::cust_main;
 
-my($req)=new CGI::Request; # create form object
+my($req)=new CGI;
 
-&cgisuidsetup($req->cgi);
+&cgisuidsetup($cgi);
 
 #create new record object
 
 #unmunge agentnum
-$req->param('agentnum', 
-  (split(/:/, ($req->param('agentnum'))[0] ))[0]
+$cgi->param('agentnum', 
+  (split(/:/, ($cgi->param('agentnum'))[0] ))[0]
 );
 
 #unmunge tax
-$req->param('tax','') unless defined($req->param('tax'));
+$cgi->param('tax','') unless defined($cgi->param('tax'));
 
 #unmunge refnum
-$req->param('refnum',
-  (split(/:/, ($req->param('refnum'))[0] ))[0]
+$cgi->param('refnum',
+  (split(/:/, ($cgi->param('refnum'))[0] ))[0]
 );
 
-#unmunge state/county
-$req->param('state') =~ /^(\w+)( \((\w+)\))?$/;
-$req->param('state', $1);
-$req->param('county', $3 || '');
+#unmunge state/county/country
+$cgi->param('state') =~ /^(\w+)( \((\w+)\))? \/ (\w+)$/;
+$cgi->param('state', $1);
+$cgi->param('county', $3 || '');
+$cgi->param('country', $4);
 
 my($new) = create FS::cust_main ( {
   map {
-    $_, $req->param("$_") || ''
+    $_, $cgi->param("$_") || ''
   } qw(custnum agentnum last first ss company address1 address2 city county
-       state zip country daytime night fax payby payinfo paydate payname tax
+       state zip daytime night fax payby payinfo paydate payname tax
        otaker refnum)
 } );
 
 if ( $new->custnum eq '' ) {
 
   my($error)=$new->insert;
-  &idiot($error) if $error;
+  &eidiot($error) if $error;
 
 } else { #create old record object
 
   my($old) = qsearchs( 'cust_main', { 'custnum', $new->custnum } ); 
-  &idiot("Old record not found!") unless $old;
+  &eidiot("Old record not found!") unless $old;
   my($error)=$new->replace($old);
-  &idiot($error) if $error;
+  &eidiot($error) if $error;
 
 }
 
 my($custnum)=$new->custnum;
-$req->cgi->redirect("../../view/cust_main.cgi?$custnum#cust_main");
-
-sub idiot {
-  my($error)=@_;
-  CGI::Base::SendHeaders(); # one guess
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error updating customer information</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Error updating customer information</H4>
-    </CENTER>
-    Your update did not occur because of the following error:
-    <P><B>$error</B>
-    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and submit the form again.
-  </BODY>
-</HTML>
-END
-
-  exit;
-
-}
+print $cgi->redirect(popurl(3). "/view/cust_main.cgi?$custnum#cust_main");
 
-- 
cgit v1.2.1


From ef834d58bfd2ce38c8bea73262c8091a5d88388f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 18 Nov 1998 09:01:44 +0000
Subject: i18n! i18n!

---
 CREDITS                                         | 15 +++++--
 TODO                                            | 16 +++-----
 bin/fs-setup                                    | 53 +++++++++++++++++++++---
 htdocs/browse/cust_main_county.cgi              | 54 +++++++++++++++++--------
 htdocs/docs/schema.html                         |  8 ++++
 htdocs/docs/upgrade3.html                       | 16 ++++++++
 htdocs/edit/cust_main.cgi                       | 12 +++---
 htdocs/edit/cust_main_county-expand.cgi         | 28 +++++++------
 htdocs/edit/cust_main_county.cgi                | 34 ++++++++++------
 htdocs/edit/process/cust_main_county-expand.cgi | 49 +++++++++++++---------
 htdocs/edit/process/cust_main_county.cgi        | 24 ++++++-----
 htdocs/index.html                               |  4 +-
 site_perl/cust_main.pm                          | 32 +++++++++------
 site_perl/cust_main_county.pm                   | 15 +++++--
 site_perl/cust_pay_batch.pm                     | 15 ++++---
 15 files changed, 251 insertions(+), 124 deletions(-)

diff --git a/CREDITS b/CREDITS
index 87c79a779..4e13c72ed 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,14 +1,21 @@
 Thanks to Matt Simerson <matt@michweb.net> of MichWeb Inc. for documentation
-and pre-release testing.  Without his help the documentation in the first
+and pre-release testing.  Without his help the documentation in 1.0.0
 release would have consisted of a single screenfull of text.
 
-# Steve Cleff <cleff@yahoo.com> did the default background image and is also
-# the creator of Freeside's mascot, Snakeman.
+Steve Cleff <cleff@yahoo.com> did the default background image in 1.0.x and
+is also the creator of Freeside's elusive mascot, Snakeman.
 
-Jerry St. Pierre <jstpi@city.timmins.on.ca> did the "SISD" graphic.
+Jerry St. Pierre <jstpi@city.timmins.on.ca> did the "SISD" graphic used in
+1.0.x and most of 1.1.x.
 
 Brian McCane? <bmccane@maxbaud.net> contributed PostgreSQL support, HTML
 style enhancements and many, many bugfixes.
 
+CompleteHOST, Inc. (http://www.completehost.com) funded the development of the
+following Freeside features:
+  - Multiple, separate databases and configurations on one box.
+  - Per-customer pricing (packages)
+  - Integration with Radiator, http://www.open.com.au/radiator
+  - Integration with NetSurfer NetKit ISP, http://www.netsurfer.com/
 Everything else is my (Ivan Kohler <ivan@sisd.com>) fault.
 
diff --git a/TODO b/TODO
index 1d21d81ad..0e70ba453 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.13 1998-11-13 09:56:33 ivan Exp $
+$Id: TODO,v 1.14 1998-11-18 09:01:30 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,8 @@ duplication of effort.
 
 -- 1.1.x --
 
+test and document libapache-dbi-logger (woo!)
+
 remove whois_hack set to 1 for svc_domain.pm?  add all known registries and
 whois accordingly.
 
@@ -254,22 +256,14 @@ write batch senders and batch parsers for the different credit card processors
 people use/
 More CC processors/methods.
 
-In FS::Record, the counter dir should have .datasrc appended to it like the 
-dbdef does, which should place all the (most of) the DB metadata in unique 
-files and let me run concurrent .datasrc's.  Maybe do something similar for 
-user, password and datasrc itself? (or something to get the out of the source
-files) and then we're set. (secrets file also needs .datasrc appended, or maybe
-"/var/spool/freeside".datasrc
-
 you should be able to fiddle the setup date in cust_pkg. (at least initially)
 
-cych v3 and v2 support
-
 delete options in administration section
 
 write a generic batch senders and batch parsers.
 
-need a way to override svc_acct export on a per-machine basis; just use config files based on machine name i suppose; document that.
+need a way to override svc_acct export on a per-machine basis; just use config files based on machine name i suppose; document that. (no, import desync_hosts
+type stuff from cerkit)
 
 you should be able to get column types as a method against an FS::Record object
 as well as dbdef->table($table)->column($column)->type
diff --git a/bin/fs-setup b/bin/fs-setup
index aab24b7e1..b3fc5c5a0 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.6  1998-11-15 13:18:02  ivan
+# Revision 1.7  1998-11-18 09:01:31  ivan
+# i18n! i18n!
+#
+# Revision 1.6  1998/11/15 13:18:02  ivan
 # remove debugging
 #
 # Revision 1.5  1998/11/15 09:43:03  ivan
@@ -191,6 +194,8 @@ foreach  ($dbdef->tables) {
 #not really sample data (and shouldn't default to US)
 
 #cust_main_county
+
+#USPS state codes
 foreach ( qw(
 AL AK AS AZ AR CA CO CT DC DE FM FL GA GU HI ID IL IN IA KS KY LA
 ME MH MD MA MI MN MS MO MT NC ND NE NH NJ NM NV NY MP OH OK OR PA PW PR RI 
@@ -199,6 +204,29 @@ SC SD TN TX TT UT VT VI VA WA WV WI WY AE AA AP
   my($cust_main_county)=create FS::cust_main_county({
     'state' => $_,
     'tax'   => 0,
+    'country' => 'US',
+  });  
+  my($error);
+  $error=$cust_main_county->insert;
+  die $error if $error;
+}
+
+#ISO 2-letter country codes (same as country TLDs) except US
+foreach ( qw(
+AF AL DZ AS AD AO AI AQ AG AR AM AW AU AT AZ BS BH BD BB BY BE BZ BJ BM BT BO
+BA BW BV BR IO BN BG BF BI KH CM CA CV KY CF TD CL CN CX CC CO KM CG CK CR CI
+HR CU CY CZ DK DJ DM DO TP EC EG SV GQ ER EE ET FK FO FJ FI FR FX GF PF TF GA
+GM GE DE GH GI GR GL GD GP GU GT GN GW GY HT HM HN HK HU IS IN ID IR IQ IE IL
+IT JM JP JO KZ KE KI KP KR KW KG LA LV LB LS LR LY LI LT LU MO MK MG MW MY MV
+ML MT MH MQ MR MU YT MX FM MD MC MN MS MA MZ MM NA NR NP NL AN NC NZ NI NE NG
+NU NF MP NO OM PK PW PA PG PY PE PH PN PL PT PR QA RE RO RU RW KN LC VC WS SM
+ST SA SN SC SL SG SK SI SB SO ZA GS ES LK SH PM SD SR SJ SZ SE CH SY TW TJ TZ
+TH TG TK TO TT TN TR TM TC TV UG UA AE GB UM UY UZ VU VA VE VN VG VI WF EH
+YE YU ZR ZM ZW
+) ) {
+  my($cust_main_county)=create FS::cust_main_county({
+    'tax'   => 0,
+    'country' => $_,
   });  
   my($error);
   $error=$cust_main_county->insert;
@@ -302,7 +330,9 @@ sub tables_hash_hack {
       'columns' => [
         'custnum',  'int',  '',     '',
         'agentnum', 'int',  '',     '',
+        'titlenum', 'int',  'NULL',   '',
         'last',     'varchar', '',     $char_d,
+        'middle',   'varchar', 'NULL', $char_d,
         'first',    'varchar', '',     $char_d,
         'ss',       'char', 'NULL', 11,
         'company',  'varchar', 'NULL', $char_d,
@@ -310,7 +340,7 @@ sub tables_hash_hack {
         'address2', 'varchar', 'NULL', $char_d,
         'city',     'varchar', '',     $char_d,
         'county',   'varchar', 'NULL', $char_d,
-        'state',    'char', '',     2,
+        'state',    'varchar', '',     $char_d,
         'zip',      'varchar', '',     10,
         'country',  'char', '',     2,
         'daytime',  'varchar', 'NULL', 20,
@@ -330,13 +360,14 @@ sub tables_hash_hack {
       'index' => [ ['last'], ],
     },
 
-    'cust_main_county' => { #county+state are checked off the cust_main_county
-                            #table for validation and to provide a tax rate.
-                            #add country?
+    'cust_main_county' => { #county+state+country are checked off the
+                            #cust_main_county for validation and to provide
+                            # a tax rate.
       'columns' => [
         'taxnum',   'int',   '',    '',
-        'state',    'char',  '',    2,  #two letters max in US... elsewhere?
+        'state',    'char',  'NULL',    $char_d,
         'county',   'varchar',  'NULL',    $char_d,
+        'country',  'char',  '', 2, 
         'tax',      'real',  '',    '', #tax %
       ],
       'primary_key' => 'taxnum',
@@ -444,6 +475,16 @@ sub tables_hash_hack {
       'index' => [ [] ],
     },
 
+    'part_title' => {
+      'columns' => [
+        'titlenum',   'int',    '',   '',
+        'title',      'varchar',   '',   $char_d,
+      ],
+      'primary_key' => 'titlenum',
+      'unique' => [ [] ],
+      'index' => [ [] ],
+    },
+
     'pkg_svc' => {
       'columns' => [
         'pkgpart',    'int',    '',   '',
diff --git a/htdocs/browse/cust_main_county.cgi b/htdocs/browse/cust_main_county.cgi
index d615198c9..4defa574d 100755
--- a/htdocs/browse/cust_main_county.cgi
+++ b/htdocs/browse/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# cust_main_county.cgi: browse cust_main_county
+# $Id: cust_main_county.cgi,v 1.2 1998-11-18 09:01:34 ivan Exp $
 #
 # ivan@sisd.com 97-dec-13
 #
@@ -8,26 +8,35 @@
 #	bmccane@maxbaud.net	98-apr-3
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: cust_main_county.cgi,v $
+# Revision 1.2  1998-11-18 09:01:34  ivan
+# i18n! i18n!
+#
 
 use strict;
-use CGI::Base;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup swapuid);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar);
+use FS::CGI qw(header menubar popurl table);
+use FS::cust_main_county;
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
-print header("Tax Rate Listing", menubar(
-  'Main Menu' => '../',
-  'Edit tax rates' => "../edit/cust_main_county.cgi",
+print $cgi->header, header("Tax Rate Listing", menubar(
+  'Main Menu' => popurl(2),
+  'Edit tax rates' => popurl(2). "/edit/cust_main_county.cgi",
 )),<<END;
-    <BR>Click on <u>expand</u> to specify tax rates by county.
-    <P><TABLE BORDER>
+    Click on <u>expand country</u> to specify a country's tax rates by state.
+    <BR>Click on <u>expand state</u> to specify a state's tax rates by county.
+    <BR><BR>
+END
+print table, <<END;
       <TR>
+        <TH><FONT SIZE=-1>Country</FONT></TH>
         <TH><FONT SIZE=-1>State</FONT></TH>
         <TH>County</TH>
         <TH><FONT SIZE=-1>Tax</FONT></TH>
@@ -39,15 +48,26 @@ foreach $cust_main_county ( qsearch('cust_main_county',{}) ) {
   my($hashref)=$cust_main_county->hashref;
   print <<END;
       <TR>
-        <TD>$hashref->{state}</TD>
+        <TD>$hashref->{country}</TD>
 END
-
-  print "<TD>", $hashref->{county}
-      ? $hashref->{county}
+  print "<TD>", $hashref->{state}
+      ? $hashref->{state}
       : qq!(ALL) <FONT SIZE=-1>!.
-        qq!<A HREF="../edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
-        qq!">expand</A></FONT>!
+        qq!<A HREF="!. popurl(2). qq!/edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
+        qq!">expand country</A></FONT>!
     , "</TD>";
+  print "<TD>";
+  if ( $hashref->{county} ) {
+    print $hashref->{county};
+  } else {
+    print "(ALL)";
+    if ( $hashref->{state} ) {
+      print qq!<FONT SIZE=-1>!.
+          qq!<A HREF="!. popurl(2). qq!/edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
+          qq!">expand state</A></FONT>!;
+    }
+  }
+  print "</TD>";
 
   print <<END;
         <TD>$hashref->{tax}%</TD>
diff --git a/htdocs/docs/schema.html b/htdocs/docs/schema.html
index 5a296ec83..f7a9bc101 100644
--- a/htdocs/docs/schema.html
+++ b/htdocs/docs/schema.html
@@ -50,7 +50,9 @@
         <li>custnum - primary key
         <li>agentnum - <a href="#agent">agent</a>
         <li>refnum - <a href="#part_referral">referral</a>
+        <li>titlenum - <a href="#part_title">title</a>
         <li>first - name
+        <li>middle - name
         <li>last - name
         <li>ss - social security number
         <li>company
@@ -75,6 +77,7 @@
         <li>taxnum - primary key
         <li>state
         <li>county
+        <li>country
         <li>tax - % rate
       </ul>
     <li><a name="cust_pay">cust_pay</a> - Payments
@@ -155,6 +158,11 @@
         <li><i>table</i>__<i>field</i> - Default or fixed value for <i>field</i> in <i>table</i>
         <li><i>table</i>__<i>field</i>_flag - null, D or F
       </ul>
+    <li><a name="part_title">part_title</a> - Personal titles
+      <ul>
+        <li>titlenum - primary key
+        <li>title - personal title (`Dr.' or `Mr.')
+      </ul>
     <li><a name="pkg_svc">pkg_svc</a>
       <ul>
         <li>pkgpart - <a href="#part_pkg">Package definition</a>
diff --git a/htdocs/docs/upgrade3.html b/htdocs/docs/upgrade3.html
index bfb717cfa..15066423e 100644
--- a/htdocs/docs/upgrade3.html
+++ b/htdocs/docs/upgrade3.html
@@ -12,5 +12,21 @@
   <li>Move /var/spool/freeside/dbdef.<i>datasrc</i> to /usr/local/etc/freeside/dbdef.<i>datasrc</i>.
   <li>Move /var/spool/freeside/counters to /usr/local/etc/freeside/counters.<i>datasrc</i>.
   <li>Move /var/spool/freeside/export to /usr/local/etc/freeside/export.<i>datasrc</i>.
+  <li>Apply the following changes to your database:
+<pre>
+ALTER TABLE cust_main ADD middle varchar(80) NULL;
+ALTER TABLE cust_main ADD titlenum int NULL;
+ALTER TABLE cust_main CHANGE state state varchar(80) NULL;
+ALTER TABLE cust_main_county CHANGE state state varchar(80) NULL;
+ALTER TABLE cust_main_county ADD country char(2);
+UPDATE cust_main_county SET country = "US" where country IS NULL;
+CREATE TABLE part_title (
+   titlenum int NOT NULL,
+   title varchar(80),
+   PRIMARY KEY (titlenum)
+);
+</pre>
+  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are r
+unning a different database engine you will need to modify it slightly.
   <li>Copy or symlink htdocs and site_perl to the new copies.
 </body>
diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 14556010c..fd36ab7d4 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -63,7 +63,6 @@ if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
   $custnum='';
   $cust_main = create FS::cust_main ( {} );
   $cust_main->setfield('otaker',&getotaker);
-  $cust_main->setfield('country','US');
   $action='Add';
 }
 
@@ -130,21 +129,23 @@ Name (last)<INPUT TYPE="text" NAME="last" VALUE="$last"> (first)<INPUT TYPE="tex
 Company <INPUT TYPE="text" NAME="company" VALUE="$company">
 Address <INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=40 MAXLENGTH=40>
         <INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=40 MAXLENGTH=40>
-City <INPUT TYPE="text" NAME="city" VALUE="$city">  State (county) <SELECT NAME="state" SIZE="1">
+City <INPUT TYPE="text" NAME="city" VALUE="$city">  State (county) / Country<SELECT NAME="state" SIZE="1">
 END
 
 foreach ( qsearch('cust_main_county',{}) ) {
   print "<OPTION";
   print " SELECTED" if ( $cust_main->state eq $_->state
-                      && $cust_main->county eq $_->county );
+                         && $cust_main->county eq $_->county 
+                         && $cust_main->country eq $_->country
+                       );
   print ">",$_->state;
   print " (",$_->county,")" if $_->county;
+  print " / ", $_->country;
 }
 print "</SELECT>";
 
-my($zip,$country,$daytime,$night,$fax)=(
+my($zip,$daytime,$night,$fax)=(
   $cust_main->zip,
-  $cust_main->country,
   $cust_main->daytime,
   $cust_main->night,
   $cust_main->fax,
@@ -152,7 +153,6 @@ my($zip,$country,$daytime,$night,$fax)=(
 
 print <<END;
   Zip <INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10 MAXLENGTH=10>
-Country: <FONT SIZE="+1"><B>$country</B></FONT><INPUT TYPE="hidden" NAME="country" VALUE="$country">
 
 Phone (daytime)<INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18 MAXLENGTH=20>  (night)<INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18 MAXLENGTH=20>  (fax)<INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12 MAXLENGTH=12>
 
diff --git a/htdocs/edit/cust_main_county-expand.cgi b/htdocs/edit/cust_main_county-expand.cgi
index 59ff7043a..9b687993f 100755
--- a/htdocs/edit/cust_main_county-expand.cgi
+++ b/htdocs/edit/cust_main_county-expand.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# cust_main_county-expand.cgi: Expand a state into counties (output form)
+# $Id: cust_main_county-expand.cgi,v 1.2 1998-11-18 09:01:38 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -8,39 +8,43 @@
 #	bmccane@maxbaud.net	98-apr-3
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: cust_main_county-expand.cgi,v $
+# Revision 1.2  1998-11-18 09:01:38  ivan
+# i18n! i18n!
+#
 
 use strict;
-use CGI::Base;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar);
+use FS::CGI qw(header menubar popurl);
+use FS::cust_main_county;
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
-
-$cgi->var('QUERY_STRING') =~ /^(\d+)$/
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/
   or die "Illegal taxnum!";
 my($taxnum)=$1;
 
 my($cust_main_county)=qsearchs('cust_main_county',{'taxnum'=>$taxnum});
 die "Can't expand entry!" if $cust_main_county->getfield('county');
 
-print header("Tax Rate (expand state)", menubar(
-  'Main Menu' => '../',
+print $cgi->header, header("Tax Rate (expand)", menubar(
+  'Main Menu' => popurl(2),
 )), <<END;
     <FORM ACTION="process/cust_main_county-expand.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="taxnum" VALUE="$taxnum">
-      Separate counties by
+      Separate by
       <INPUT TYPE="radio" NAME="delim" VALUE="n" CHECKED>line
       (rumor has it broken on some browsers) or
       <INPUT TYPE="radio" NAME="delim" VALUE="s">whitespace.
       <BR><INPUT TYPE="submit" VALUE="Submit">
-      <BR><TEXTAREA NAME="counties" ROWS=100></TEXTAREA>
+      <BR><TEXTAREA NAME="expansion" ROWS=100></TEXTAREA>
     </FORM>
     </CENTER>
   </BODY>
diff --git a/htdocs/edit/cust_main_county.cgi b/htdocs/edit/cust_main_county.cgi
index 904d58346..96574f0ef 100755
--- a/htdocs/edit/cust_main_county.cgi
+++ b/htdocs/edit/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# cust_main_county.cgi: Edit tax rates (output form)
+# $Id: cust_main_county.cgi,v 1.2 1998-11-18 09:01:39 ivan Exp $
 #
 # ivan@sisd.com 97-dec-13-16
 #
@@ -9,27 +9,30 @@
 #	bmccane@maxbaud.net	98-apr-3
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+# 
+# $Log: cust_main_county.cgi,v $
+# Revision 1.2  1998-11-18 09:01:39  ivan
+# i18n! i18n!
+#
 
 use strict;
-use CGI::Base;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar);
+use FS::CGI qw(header menubar popurl table);
+use FS::cust_main_county;
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
-
-print header("Edit tax rates", menubar(
-  'Main Menu' => '../',
-)),<<END;
-    <FORM ACTION="process/cust_main_county.cgi" METHOD=POST>
-    <TABLE BORDER>
+print $cgi->header, header("Edit tax rates", menubar(
+  'Main Menu' => popurl(2),
+)), qq!<FORM ACTION="!, popurl(1),
+    qq!/process/cust_main_county.cgi" METHOD=POST>!, table, <<END;
       <TR>
+        <TH><FONT SIZE=-1>Country</FONT></TH>
         <TH><FONT SIZE=-1>State</FONT></TH>
         <TH>County</TH>
         <TH><FONT SIZE=-1>Tax</FONT></TH>
@@ -41,9 +44,14 @@ foreach $cust_main_county ( qsearch('cust_main_county',{}) ) {
   my($hashref)=$cust_main_county->hashref;
   print <<END;
       <TR>
-        <TD>$hashref->{state}</TD>
+        <TD>$hashref->{country}</TD>
 END
 
+  print "<TD>", $hashref->{state}
+      ? $hashref->{state}
+      : '(ALL)'
+    , "</TD>";
+
   print "<TD>", $hashref->{county}
       ? $hashref->{county}
       : '(ALL)'
diff --git a/htdocs/edit/process/cust_main_county-expand.cgi b/htdocs/edit/process/cust_main_county-expand.cgi
index a821560c6..c70d5b9d7 100755
--- a/htdocs/edit/process/cust_main_county-expand.cgi
+++ b/htdocs/edit/process/cust_main_county-expand.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/cust_main_county-expand.cgi: Expand counties (process form)
+# $Id: cust_main_county-expand.cgi,v 1.2 1998-11-18 09:01:40 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -12,45 +12,55 @@
 # lose background, FS::CGI
 # undo default tax to 0.0 if using Pg6.3: comes from pre-expanded record
 # for that state
-#ivan@sisd.com 98-sep-2
+# ivan@sisd.com 98-sep-2
+#
+# $Log: cust_main_county-expand.cgi,v $
+# Revision 1.2  1998-11-18 09:01:40  ivan
+# i18n! i18n!
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup datasrc);
 use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(eidiot popurl);
 use FS::cust_main_county;
-use FS::CGI qw(eidiot);
+use FS::cust_main;
 
-my($req)=new CGI::Request; # create form object
+my($cgi)=new CGI;
 
-&cgisuidsetup($req->cgi);
+&cgisuidsetup($cgi);
 
-$req->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
+$cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
 my($taxnum)=$1;
 my($cust_main_county)=qsearchs('cust_main_county',{'taxnum'=>$taxnum})
   or die ("Unknown taxnum!");
 
-my(@counties);
-if ( $req->param('delim') eq 'n' ) {
-  @counties=split(/\n/,$req->param('counties'));
-} elsif ( $req->param('delim') eq 's' ) {
-  @counties=split(/\s+/,$req->param('counties'));
+my(@expansion);
+if ( $cgi->param('delim') eq 'n' ) {
+  @expansion=split(/\n/,$cgi->param('expansion'));
+} elsif ( $cgi->param('delim') eq 's' ) {
+  @expansion=split(/\s+/,$cgi->param('expansion'));
 } else {
   die "Illegal delim!";
 }
 
-@counties=map {
-  /^\s*([\w\- ]+)\s*$/ or eidiot("Illegal county");
+@expansion=map {
+  /^\s*([\w\- ]+)\s*$/ or eidiot("Illegal expansion");
   $1;
-} @counties;
+} @expansion;
 
-my($county);
-foreach ( @counties) {
+my($expansion);
+foreach ( @expansion) {
   my(%hash)=$cust_main_county->hash;
   my($new)=create FS::cust_main_county \%hash;
   $new->setfield('taxnum','');
-  $new->setfield('county',$_);
+  if ( ! $cust_main_county->state ) {
+    $new->setfield('state',$_);
+  } else {
+    $new->setfield('county',$_);
+  }
   #if (datasrc =~ m/Pg/)
   #{
   #    $new->setfield('tax',0.0);
@@ -62,10 +72,11 @@ foreach ( @counties) {
 unless ( qsearch('cust_main',{
   'state'  => $cust_main_county->getfield('state'),
   'county' => $cust_main_county->getfield('county'),
+  'country' =>  $cust_main_county->getfield('country'),
 } ) ) {
   my($error)=($cust_main_county->delete);
   die $error if $error;
 }
 
-$req->cgi->redirect("../../edit/cust_main_county.cgi");
+print $cgi->redirect(popurl(3). "/edit/cust_main_county.cgi");
 
diff --git a/htdocs/edit/process/cust_main_county.cgi b/htdocs/edit/process/cust_main_county.cgi
index 58eaa63ce..ce5a4f671 100755
--- a/htdocs/edit/process/cust_main_county.cgi
+++ b/htdocs/edit/process/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/agent.cgi: Edit cust_main_county (process form)
+# $Id: cust_main_county.cgi,v 1.2 1998-11-18 09:01:41 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -8,31 +8,35 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: cust_main_county.cgi,v $
+# Revision 1.2  1998-11-18 09:01:41  ivan
+# i18n! i18n!
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(eidiot);
 use FS::Record qw(qsearch qsearchs);
 use FS::cust_main_county;
-use FS::CGI qw(eidiot);
-
-my($req)=new CGI::Request; # create form object
 
-&cgisuidsetup($req->cgi);
+my($req)=new CGI;
+&cgisuidsetup($cgi);
 
-foreach ( $req->params ) {
+foreach ( $cgi->param ) {
   /^tax(\d+)$/ or die "Illegal form $_!";
   my($taxnum)=$1;
   my($old)=qsearchs('cust_main_county',{'taxnum'=>$taxnum})
     or die "Couldn't find taxnum $taxnum!";
-  next unless $old->getfield('tax') ne $req->param("tax$taxnum");
+  next unless $old->getfield('tax') ne $cgi->param("tax$taxnum");
   my(%hash)=$old->hash;
-  $hash{tax}=$req->param("tax$taxnum");
+  $hash{tax}=$cgi->param("tax$taxnum");
   my($new)=create FS::cust_main_county \%hash;
   my($error)=$new->replace($old);
   eidiot($error) if $error;
 }
 
-$req->cgi->redirect("../../browse/cust_main_county.cgi");
+$cgi->redirect(popurl(3). "/browse/cust_main_county.cgi");
 
diff --git a/htdocs/index.html b/htdocs/index.html
index d2b5a1e93..316ac5e7b 100755
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -83,8 +83,8 @@
           <LI><A HREF="browse/cust_main_county.cgi">
             View/Edit locales and tax rates
           </A>
-            - Change tax rates by state, or break down a state into counties
-              and assign different tax rates to each county.
+            - Change tax rates, or break down a country into states, or a state
+              into counties and assign different tax rates to each.
           <BR>
           <LI><A HREF="browse/svc_acct_pop.cgi">
             View/Edit POPs 
diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index 51c9519c5..57e76ba42 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -283,21 +283,24 @@ sub check {
     $self->ss("$1-$2-$3");
   }
 
-  return "Unknown state/county/country, state ".
-      "\"". $self->state. "\" county \"". $self->county. "\""
-    unless qsearchs('cust_main_county',{
-      'state'  => $self->state,
-      'county' => $self->county,
-    } );
+  $self->country =~ /^(\w\w)$/ or return "Illegal country";
+  $self->country($1);
+  unless ( qsearchs('cust_main_county', {
+    'country' => $self->country,
+    'state'   => '',
+   } ) ) {
+    return "Unknown state/county/country"
+      #" state ". $self->state. " county ". $self->county. " country ". $self->country
+      unless qsearchs('cust_main_county',{
+        'state'   => $self->state,
+        'county'  => $self->county,
+        'country' => $self->country,
+      } );
+  }
 
-  #int'l zips?
-  $self->zip =~ /^(\d{5}(-\d{4})?)$/ or return "Illegal zip";
+  $self->zip =~ /^([\w\-]{10})$/ or return "Illegal zip";
   $self->zip($1);
 
-  #int'l countries!
-  $self->country =~ /^(US)$/ or return "Illegal country";
-  $self->country($1);
-
   $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
   $self->payby($1);
 
@@ -873,7 +876,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.5  1998-11-15 11:23:14  ivan
+Revision 1.6  1998-11-18 09:01:42  ivan
+i18n! i18n!
+
+Revision 1.5  1998/11/15 11:23:14  ivan
 use FS::table_name for all searches to eliminate warnings,
 emit state/county when they don't match
 
diff --git a/site_perl/cust_main_county.pm b/site_perl/cust_main_county.pm
index f4b4595ae..9c81406ae 100644
--- a/site_perl/cust_main_county.pm
+++ b/site_perl/cust_main_county.pm
@@ -41,6 +41,8 @@ currently supported:
 
 =item county
 
+=item country
+
 =item tax - percentage
 
 =back
@@ -126,7 +128,7 @@ sub check {
   my($recref) = $self->hashref;
 
   $self->ut_numbern('taxnum')
-    or $self->ut_text('state')
+    or $self->ut_textn('state')
     or $self->ut_textn('county')
     or $self->ut_float('tax')
   ;
@@ -135,12 +137,14 @@ sub check {
 
 =back
 
+=head1 VERSION
+
+$Id: cust_main_county.pm,v 1.2 1998-11-18 09:01:43 ivan Exp $
+
 =head1 BUGS
 
 It doesn't properly override FS::Record yet.
 
-A country field (and possibly a currency field) should be added.
-
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::cust_main>, L<FS::cust_bill>, schema.html from the base
@@ -155,6 +159,11 @@ Changed check for 'tax' to use the new ut_float subroutine
 
 pod ivan@sisd.com 98-sep-21
 
+$Log: cust_main_county.pm,v $
+Revision 1.2  1998-11-18 09:01:43  ivan
+i18n! i18n!
+
+
 =cut
 
 1;
diff --git a/site_perl/cust_pay_batch.pm b/site_perl/cust_pay_batch.pm
index 186b4c154..f40a04970 100644
--- a/site_perl/cust_pay_batch.pm
+++ b/site_perl/cust_pay_batch.pm
@@ -216,12 +216,10 @@ sub check {
     $self->payname($1);
   }
 
-  #int'l zips?
-  $self->zip =~ /^(\d{5}(-\d{4})?)$/ or return "Illegal zip";
+  $self->zip =~ /^([\w\-]{10})$/ or return "Illegal zip";
   $self->zip($1);
 
-  #int'l countries!
-  $self->country =~ /^(US)$/ or return "Illegal country";
+  $self->country =~ /^(\w\w)$/ or return "Illegal \w\wy";
   $self->country($1);
 
   #check invnum, custnum, ?
@@ -233,12 +231,10 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_pay_batch.pm,v 1.1 1998-11-15 05:19:58 ivan Exp $
+$Id: cust_pay_batch.pm,v 1.2 1998-11-18 09:01:44 ivan Exp $
 
 =head1 BUGS
 
-The author forgot to customize this manpage.
-
 =head1 SEE ALSO
 
 L<FS::cust_main>, L<FS::Record>
@@ -251,7 +247,10 @@ added hfields
 ivan@sisd.com 97-nov-13
 
 $Log: cust_pay_batch.pm,v $
-Revision 1.1  1998-11-15 05:19:58  ivan
+Revision 1.2  1998-11-18 09:01:44  ivan
+i18n! i18n!
+
+Revision 1.1  1998/11/15 05:19:58  ivan
 long overdue
 
 Revision 1.3  1998/11/15 04:33:00  ivan
-- 
cgit v1.2.1


From 8935cf3566726a2757c3b8f988acfcc0b7ac9352 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 19 Nov 1998 11:17:44 +0000
Subject: adminsuidsetup requires argument

---
 bin/dbdef-create | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/bin/dbdef-create b/bin/dbdef-create
index eb62c77e3..fe7475bec 100755
--- a/bin/dbdef-create
+++ b/bin/dbdef-create
@@ -1,19 +1,28 @@
 #!/usr/bin/perl -Tw
 #
+# $Id: dbdef-create,v 1.2 1998-11-19 11:17:44 ivan Exp $
+#
 # create dbdef file for existing mySQL database (needs SHOW|DESCRIBE command
 # not in Pg) based on fs-setup
 #
 # ivan@sisd.com 98-jun-2
+#
+# $Log: dbdef-create,v $
+# Revision 1.2  1998-11-19 11:17:44  ivan
+# adminsuidsetup requires argument
+#
 
 use strict;
 use DBI;
 use FS::dbdef;
 use FS::UID qw(adminsuidsetup datasrc);
 
-#needs to match FS::Record
-my($dbdef_file) = "/var/spool/freeside/dbdef.". datasrc;
+my $user = shift or die &usage;
 
-my($dbh)=adminsuidsetup;
+my($dbh)=adminsuidsetup $user;
+
+#needs to match FS::Record
+my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;
 
 my($tables_sth)=$dbh->prepare("SHOW TABLES");
 my($tables_rv)=$tables_sth->execute;
@@ -83,3 +92,6 @@ my($dbdef) = new FS::dbdef ( @tables );
 #important
 $dbdef->save($dbdef_file);
 
+sub usage {
+  die "Usage:\n  dbdef-create user\n";
+}
-- 
cgit v1.2.1


From 6054e914fea75e2adee12b17167706c7a78e03db Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 20 Nov 1998 08:50:37 +0000
Subject: s/CGI::Base/CGI.pm, visual fixes

---
 htdocs/browse/agent.cgi    | 26 ++++++++++++++++----------
 htdocs/browse/part_svc.cgi | 42 ++++++++++++++++++++++++------------------
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/htdocs/browse/agent.cgi b/htdocs/browse/agent.cgi
index 2c67e837c..fe4e84abb 100755
--- a/htdocs/browse/agent.cgi
+++ b/htdocs/browse/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# agent.cgi: browse agent
+# $Id: agent.cgi,v 1.4 1998-11-20 08:50:36 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -15,7 +15,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent.cgi,v $
-# Revision 1.3  1998-11-08 10:11:02  ivan
+# Revision 1.4  1998-11-20 08:50:36  ivan
+# s/CGI::Base/CGI.pm, visual fixes
+#
+# Revision 1.3  1998/11/08 10:11:02  ivan
 # CGI.pm
 #
 # Revision 1.2  1998/11/07 10:24:22  ivan
@@ -26,20 +29,22 @@ use strict;
 use CGI;
 use FS::UID qw(cgisuidsetup swapuid);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar);
+use FS::CGI qw(header menubar table popurl);
+use FS::agent;
 
 my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
 print $cgi->header, header('Agent Listing', menubar(
-  'Main Menu'   => '../',
+  'Main Menu'   => popurl(2),
   'Agent Types' => 'agent_type.cgi',
 #  'Add new agent' => '../edit/agent.cgi'
 )), <<END;
 Agents are resellers of your service. Agents may be limited to a subset of your
 full offerings (via their type).<BR><BR>
-    <TABLE BORDER>
+END
+print table, <<END;
       <TR>
         <TH COLSPAN=2>Agent</TH>
         <TH>Type</TH>
@@ -51,6 +56,7 @@ END
 #        <TH>Agent</TH>
 
 my($agent);
+my($p)=popurl(2);
 foreach $agent ( sort { 
   $a->getfield('agentnum') <=> $b->getfield('agentnum')
 } qsearch('agent',{}) ) {
@@ -60,11 +66,11 @@ foreach $agent ( sort {
   my($atype)=$agent_type->getfield('atype');
   print <<END;
       <TR>
-        <TD><A HREF="../edit/agent.cgi?$hashref->{agentnum}">
+        <TD><A HREF="$p/edit/agent.cgi?$hashref->{agentnum}">
           $hashref->{agentnum}</A></TD>
-        <TD><A HREF="../edit/agent.cgi?$hashref->{agentnum}">
+        <TD><A HREF="$p/edit/agent.cgi?$hashref->{agentnum}">
           $hashref->{agent}</A></TD>
-        <TD><A HREF="../edit/agent_type.cgi?$typenum">$atype</A></TD>
+        <TD><A HREF="$p/edit/agent_type.cgi?$typenum">$atype</A></TD>
         <TD>$hashref->{freq}</TD>
         <TD>$hashref->{prog}</TD>
       </TR>
@@ -74,8 +80,8 @@ END
 
 print <<END;
       <TR>
-        <TD COLSPAN=2><A HREF="../edit/agent.cgi"><I>Add new agent</I></A></TD>
-        <TD><A HREF="../edit/agent_type.cgi"><I>Add new agent type</I></A></TD>
+        <TD COLSPAN=2><A HREF="$p/edit/agent.cgi"><I>Add new agent</I></A></TD>
+        <TD><A HREF="$p/edit/agent_type.cgi"><I>Add new agent type</I></A></TD>
       </TR>
     </TABLE>
 
diff --git a/htdocs/browse/part_svc.cgi b/htdocs/browse/part_svc.cgi
index 71a556421..189d649b6 100755
--- a/htdocs/browse/part_svc.cgi
+++ b/htdocs/browse/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# part_svc.cgi: browse part_svc
+# $Id: part_svc.cgi,v 1.2 1998-11-20 08:50:37 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14, 97-dec-9
 #
@@ -8,29 +8,32 @@
 #	bmccane@maxbaud.net	98-apr-3
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: part_svc.cgi,v $
+# Revision 1.2  1998-11-20 08:50:37  ivan
+# s/CGI::Base/CGI.pm, visual fixes
+#
 
 use strict;
-use CGI::Base;
-use FS::UID qw(cgisuidsetup swapuid);
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch);
 use FS::part_svc qw(fields);
-use FS::CGI qw(header menubar);
+use FS::CGI qw(header menubar popurl table);
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
-print header('Service Part Listing', menubar(
-  'Main Menu' => '../',
-  'Add new service' => "../edit/part_svc.cgi",
+print $cgi->header, header('Service Part Listing', menubar(
+  'Main Menu' => popurl(2),
 )),<<END;
-    <BR>Click on service part number to edit.
-    <TABLE BORDER>
+    Services are items you offer to your customers.<BR><BR>
+END
+print table, <<END;
       <TR>
-        <TH>Part #</TH>
-        <TH>Service</TH>
+        <TH COLSPAN=2>Service</TH>
         <TH>Table</TH>
         <TH>Field</TH>
         <TH>Action</TH>
@@ -39,6 +42,7 @@ print header('Service Part Listing', menubar(
 END
 
 my($part_svc);
+my($p)=popurl(2);
 foreach $part_svc ( sort {
   $a->getfield('svcpart') <=> $b->getfield('svcpart')
 } qsearch('part_svc',{}) ) {
@@ -54,10 +58,9 @@ foreach $part_svc ( sort {
   my($rowspan)=scalar(@rows);
   print <<END;
       <TR>
-        <TD ROWSPAN=$rowspan><A HREF="../edit/part_svc.cgi?$hashref->{svcpart}">
-          $hashref->{svcpart}
-        </A></TD>
-        <TD ROWSPAN=$rowspan>$hashref->{svc}</TD>
+        <TD ROWSPAN=$rowspan><A HREF="$p/edit/part_svc.cgi?$hashref->{svcpart}">
+          $hashref->{svcpart}</A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$p/edit/part_svc.cgi?$hashref->{svcpart}">          $hashref->{svc}</A></TD>
         <TD ROWSPAN=$rowspan>$hashref->{svcdb}</TD>
 END
   my($row);
@@ -73,6 +76,9 @@ print "</TR>";
 }
 
 print <<END;
+      <TR>
+        <TD COLSPAN=2><A HREF="$p/edit/part_svc.cgi"><I>Add new service</I></A></TD>
+      </TR>
     </TABLE>
     </CENTER>
   </BODY>
-- 
cgit v1.2.1


From e99770f38ed6b464d7216365160e6203ae46ef97 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 20 Nov 1998 23:10:57 +0000
Subject: visual

---
 htdocs/browse/part_svc.cgi | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/browse/part_svc.cgi b/htdocs/browse/part_svc.cgi
index 189d649b6..53de101c6 100755
--- a/htdocs/browse/part_svc.cgi
+++ b/htdocs/browse/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.2 1998-11-20 08:50:37 ivan Exp $
+# $Id: part_svc.cgi,v 1.3 1998-11-20 23:10:57 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14, 97-dec-9
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.2  1998-11-20 08:50:37  ivan
+# Revision 1.3  1998-11-20 23:10:57  ivan
+# visual
+#
+# Revision 1.2  1998/11/20 08:50:37  ivan
 # s/CGI::Base/CGI.pm, visual fixes
 #
 
@@ -36,8 +39,7 @@ print table, <<END;
         <TH COLSPAN=2>Service</TH>
         <TH>Table</TH>
         <TH>Field</TH>
-        <TH>Action</TH>
-        <TH>Value</TH>
+        <TH COLSPAN=2>Modifier</TH>
       </TR>
 END
 
-- 
cgit v1.2.1


From dfac88e24ba3c362fadd3010c62881cc659edf67 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Nov 1998 02:26:22 +0000
Subject: visual

---
 htdocs/browse/part_svc.cgi | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/htdocs/browse/part_svc.cgi b/htdocs/browse/part_svc.cgi
index 53de101c6..c9f0d3da1 100755
--- a/htdocs/browse/part_svc.cgi
+++ b/htdocs/browse/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.3 1998-11-20 23:10:57 ivan Exp $
+# $Id: part_svc.cgi,v 1.4 1998-11-21 02:26:22 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14, 97-dec-9
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.3  1998-11-20 23:10:57  ivan
+# Revision 1.4  1998-11-21 02:26:22  ivan
+# visual
+#
+# Revision 1.3  1998/11/20 23:10:57  ivan
 # visual
 #
 # Revision 1.2  1998/11/20 08:50:37  ivan
@@ -57,7 +60,7 @@ foreach $part_svc ( sort {
           grep /^${svcdb}__/,
             fields('part_svc')
   ;
-  my($rowspan)=scalar(@rows);
+  my($rowspan)=scalar(@rows) || 1;
   print <<END;
       <TR>
         <TD ROWSPAN=$rowspan><A HREF="$p/edit/part_svc.cgi?$hashref->{svcpart}">
@@ -65,14 +68,17 @@ foreach $part_svc ( sort {
         <TD ROWSPAN=$rowspan><A HREF="$p/edit/part_svc.cgi?$hashref->{svcpart}">          $hashref->{svc}</A></TD>
         <TD ROWSPAN=$rowspan>$hashref->{svcdb}</TD>
 END
+
+  my($n1)='';
   my($row);
   foreach $row ( @rows ) {
     my($flag)=$part_svc->getfield($svcdb.'__'.$row.'_flag');
-    print "<TD>$row</TD><TD>";
+    print $n1,"<TD>$row</TD><TD>";
     if ( $flag eq "D" ) { print "Default"; }
       elsif ( $flag eq "F" ) { print "Fixed"; }
       else { print "(Unknown!)"; }
-    print "</TD><TD>",$part_svc->getfield($svcdb."__".$row),"</TD></TR><TR>";
+    print "</TD><TD>",$part_svc->getfield($svcdb."__".$row),"</TD>";
+    $n1="</TR><TR>";
   }
 print "</TR>";
 }
@@ -82,7 +88,6 @@ print <<END;
         <TD COLSPAN=2><A HREF="$p/edit/part_svc.cgi"><I>Add new service</I></A></TD>
       </TR>
     </TABLE>
-    </CENTER>
   </BODY>
 </HTML>
 END
-- 
cgit v1.2.1


From dbb8c185411a252d7df9362b3aa88edfb92dfbfa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Nov 1998 03:00:26 +0000
Subject: visual

---
 htdocs/index.html | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index 316ac5e7b..92d3ed1c2 100755
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -21,9 +21,10 @@
       </A>
     </P>
     <HR>
-      <H3><A HREF="edit/cust_main.cgi">New Customer</A></H3>
-        <A NAME="search"><H3>Search</H3></A>
-        <MENU>
+    <ul>
+      <li><A HREF="edit/cust_main.cgi">New Customer</A>
+      <li><A NAME="search">Search</A>
+        <ul>
         <LI><A HREF="search/cust_main.html">
             customers (by last name and/or company)
         </A>
@@ -32,9 +33,9 @@
         <LI><A HREF="search/svc_domain.html">domains (by domain)</A>
         <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>
         <LI><A HREF="search/cust_bill.html">invoices (by invoice number)</A>
-        </MENU>
-        <A NAME="browse"><H3>Browse</H3></A>
-        <MENU>
+        </ul>
+      <li><A NAME="browse">Browse</A>
+        <ul>
           <LI><A HREF="search/cust_main.cgi?custnum">customers (by customer number)</A>
           <LI><A HREF="search/cust_main.cgi?last">customers (by last name)</A>
           <LI><A HREF="search/cust_main.cgi?company">customers (by company)</A>
@@ -50,9 +51,9 @@
           <LI><A HREF="search/svc_domain.cgi?domain">domains (by domain)</A>
           <LI><A HREF="search/svc_domain.cgi?UN_svcnum">unlinked domains (by service number)</A>
           <LI><A HREF="search/svc_domain.cgi?UN_domain">unlinked domains (by domain)</A>
-      </MENU>
-          <A NAME="admin"><H3>Administration</H3></a>
-        <MENU>
+        </ul>
+      <li><A NAME="admin">Administration</a>
+        <ul>
           <LI><A HREF="browse/part_svc.cgi">
             View/Edit services
           </A>
@@ -73,24 +74,21 @@
           </A>
             - Agents are resellers of your service.  Agents may be limited
               to a subset of your full offerings (via their type).
-          <BR>
           <LI><A HREF="browse/part_referral.cgi">
             View/Edit referrals
           </A>
             - Where a customer heard about your service.  Tracked for
               informational purposes.
-          <BR>
           <LI><A HREF="browse/cust_main_county.cgi">
             View/Edit locales and tax rates
           </A>
             - Change tax rates, or break down a country into states, or a state
               into counties and assign different tax rates to each.
-          <BR>
           <LI><A HREF="browse/svc_acct_pop.cgi">
             View/Edit POPs 
           </A>
             - Points of Presence 
-    </MENU>
-    </FONT>
+        </ul>
+      </ul>
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From 2312a7bf316e4f58efb31e4fc72311fedaecd242 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Nov 1998 03:16:40 +0000
Subject: visual

---
 htdocs/edit/part_svc.cgi | 74 ++++++++++++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 34 deletions(-)

diff --git a/htdocs/edit/part_svc.cgi b/htdocs/edit/part_svc.cgi
index 491c013fe..e1897b2e6 100755
--- a/htdocs/edit/part_svc.cgi
+++ b/htdocs/edit/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# part_svc.cgi: Add/Edit service (output form)
+# $Id: part_svc.cgi,v 1.2 1998-11-21 03:16:40 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -8,24 +8,27 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
+#
+# $Log: part_svc.cgi,v $
+# Revision 1.2  1998-11-21 03:16:40  ivan
+# visual
+#
 
 use strict;
-use CGI::Base;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs);
 use FS::part_svc qw(fields);
-use FS::CGI qw(header menubar);
+use FS::CGI qw(header menubar popurl table);
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
-
 my($part_svc,$action);
-if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
+my($query) = $cgi->keywords;
+if ( $query && $query =~ /^(\d+)$/ ) { #editing
   $part_svc=qsearchs('part_svc',{'svcpart'=>$1});
   $action='Edit';
 } else { #adding
@@ -34,12 +37,11 @@ if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
 }
 my($hashref)=$part_svc->hashref;
 
-print header("$action Service Definition", menubar(
-  'Main Menu' => '../',
-  'View all services' => '../browse/part_svc.cgi',
-)), '<FORM ACTION="process/part_svc.cgi" METHOD=POST>';
-
-
+my $p = popurl(2);
+print $cgi->header, header("$action Service Definition", menubar(
+  'Main Menu' => $p,
+  'View all services' => '$p/browse/part_svc.cgi',
+)), '<FORM ACTION="', popurl(1), 'process/part_svc.cgi" METHOD=POST>';
 
 print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$hashref->{svcpart}">!,
       "Service Part #", $hashref->{svcpart} ? $hashref->{svcpart} : "(NEW)";
@@ -47,29 +49,32 @@ print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$hashref->{svcpart}">!,
 print <<END;
 <PRE>
 Service  <INPUT TYPE="text" NAME="svc" VALUE="$hashref->{svc}">
-Table    <SELECT NAME="svcdb" SIZE=1>
-END
-
-print map '<OPTION'. ' SELECTED'x($_ eq $hashref->{svcdb}). ">$_\n", qw(
-  svc_acct svc_domain svc_acct_sm svc_charge svc_wo
-);
-
-print <<END;
-</SELECT></PRE>
+</PRE>
 Services are items you offer to your customers.
 <UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
     <LI>svc_domain - Virtual domains
     <LI>svc_acct_sm - Virtual domain mail aliasing
-    <LI>svc_charge - One-time charges (Partially unimplemented)
-    <LI>svc_wo - Work orders (Partially unimplemented)
+END
+#    <LI>svc_charge - One-time charges (Partially unimplemented)
+#    <LI>svc_wo - Work orders (Partially unimplemented)
+print <<END;
 </UL>
-For the columns in the table selected above, you can set default or fixed 
+For the selected table, you can give fields default or fixed (unchangable)
 values.  For example, a SLIP/PPP account may have a default (or perhaps fixed)
 <B>slipip</B> of <B>0.0.0.0</B>, while a POP mailbox will probably have a fixed
 blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
 <B>/usr/bin/passwd</B>.
 <BR><BR>
-<TABLE BORDER CELLPADDING=4><TR><TH>Table</TH><TH>Field</TH>
+END
+print table, '<TR><TH>Table<SELECT NAME="svcdb" SIZE=1>',
+      map '<OPTION'. ' SELECTED'x($_ eq $hashref->{svcdb}). ">$_\n", qw(
+        svc_acct svc_domain svc_acct_sm
+      );
+      print "</SELECT>";
+#  svc_acct svc_domain svc_acct_sm svc_charge svc_wo
+
+print <<END;
+</TH><TH>Field</TH>
 <TH COLSPAN=2>Modifier</TH></TR>
 END
 
@@ -80,7 +85,7 @@ my(%defs)=(
     'dir'       => 'Home directory',
     'uid'       => 'UID (set to fixed and blank for dial-only)',
     'slipip'    => 'IP address',
-    'popnum'    => '<A HREF="../browse/svc_acct_pop.cgi/">POP number</A>',
+    'popnum'    => '<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>',
     'username'  => 'Username',
     'quota'     => '(unimplemented)',
     '_password' => 'Password',
@@ -106,8 +111,9 @@ my(%defs)=(
 );
 
 my($svcdb);
+#  svc_acct svc_domain svc_acct_sm svc_charge svc_wo
 foreach $svcdb ( qw(
-  svc_acct svc_domain svc_acct_sm svc_charge svc_wo
+  svc_acct svc_domain svc_acct_sm
 ) ) {
 
   my(@rows)=map { /^${svcdb}__(.*)$/; $1 }
@@ -123,21 +129,21 @@ foreach $svcdb ( qw(
     my($flag)=$part_svc->getfield($svcdb.'__'.$row.'_flag');
     print "<TR>$ptmp<TD>$row - <FONT SIZE=-1>$defs{$svcdb}{$row}</FONT></TD>";
     print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE=""!.
-      ' CHECKED'x($flag eq ''). "><BR>Off</TD>";
+      ' CHECKED'x($flag eq ''). ">Off</TD>";
     print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE="D"!.
       ' CHECKED'x($flag eq 'D'). ">Default ";
     print qq!<INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE="F"!.
       ' CHECKED'x($flag eq 'F'). ">Fixed ";
-    print qq!<BR><INPUT TYPE="text" NAME="${svcdb}__${row}" VALUE="$value">!,
-      "</TD></TR>";
+    print qq!<INPUT TYPE="text" NAME="${svcdb}__${row}" VALUE="$value">!,
+      "</TD></TR>\n";
     $ptmp='';
   }
 }
 print "</TABLE>";
 
-print qq!\n<CENTER><BR><INPUT TYPE="submit" VALUE="!,
+print qq!\n<BR><INPUT TYPE="submit" VALUE="!,
       $hashref->{svcpart} ? "Apply changes" : "Add service",
-      qq!"></CENTER>!;
+      qq!">!;
 
 print <<END;
 
-- 
cgit v1.2.1


From 2dacf920a13436813b6f7e51c2ba2ef465b8a4ba Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Nov 1998 06:43:08 +0000
Subject: s/CGI::Request/CGI.pm/

---
 htdocs/edit/process/part_svc.cgi | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/htdocs/edit/process/part_svc.cgi b/htdocs/edit/process/part_svc.cgi
index 0f0fbc6e8..48cc7fec3 100755
--- a/htdocs/edit/process/part_svc.cgi
+++ b/htdocs/edit/process/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/part_svc.cgi: Edit service definitions (process form)
+# $Id: part_svc.cgi,v 1.2 1998-11-21 06:43:08 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -8,26 +8,31 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: part_svc.cgi,v $
+# Revision 1.2  1998-11-21 06:43:08  ivan
+# s/CGI::Request/CGI.pm/
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs);
 use FS::part_svc qw(fields);
-use FS::CGI qw(eidiot);
+use FS::CGI qw(eidiot popurl);
 
-my($req)=new CGI::Request; # create form object
+my($cgi)=new CGI; # create form object
 
-&cgisuidsetup($req->cgi);
+&cgisuidsetup($cgi);
 
-my($svcpart)=$req->param('svcpart');
+my($svcpart)=$cgi->param('svcpart');
 
 my($old)=qsearchs('part_svc',{'svcpart'=>$svcpart}) if $svcpart;
 
 my($new)=create FS::part_svc ( {
   map {
-    $_, $req->param($_);
+    $_, scalar($cgi->param($_));
 #  } qw(svcpart svc svcdb)
   } fields('part_svc')
 } );
@@ -43,5 +48,5 @@ if ( $svcpart ) {
 
 #$req->cgi->redirect("../../view/part_svc.cgi?$svcpart");
 #$req->cgi->redirect("../../edit/part_svc.cgi?$svcpart");
-$req->cgi->redirect("../../browse/part_svc.cgi");
+print $cgi->redirect(popurl(3)."/browse/part_svc.cgi");
 
-- 
cgit v1.2.1


From 78a74fecb785f7976a8a00fc38500d05c69c66a3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Nov 1998 06:43:26 +0000
Subject: visual

---
 htdocs/edit/part_svc.cgi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/edit/part_svc.cgi b/htdocs/edit/part_svc.cgi
index e1897b2e6..6f0a322b5 100755
--- a/htdocs/edit/part_svc.cgi
+++ b/htdocs/edit/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.2 1998-11-21 03:16:40 ivan Exp $
+# $Id: part_svc.cgi,v 1.3 1998-11-21 06:43:26 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,7 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.2  1998-11-21 03:16:40  ivan
+# Revision 1.3  1998-11-21 06:43:26  ivan
 # visual
 #
 
@@ -40,8 +40,8 @@ my($hashref)=$part_svc->hashref;
 my $p = popurl(2);
 print $cgi->header, header("$action Service Definition", menubar(
   'Main Menu' => $p,
-  'View all services' => '$p/browse/part_svc.cgi',
-)), '<FORM ACTION="', popurl(1), 'process/part_svc.cgi" METHOD=POST>';
+  'View all services' => "$p/browse/part_svc.cgi",
+)), '<FORM ACTION="', popurl(1), '/process/part_svc.cgi" METHOD=POST>';
 
 print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$hashref->{svcpart}">!,
       "Service Part #", $hashref->{svcpart} ? $hashref->{svcpart} : "(NEW)";
@@ -85,7 +85,7 @@ my(%defs)=(
     'dir'       => 'Home directory',
     'uid'       => 'UID (set to fixed and blank for dial-only)',
     'slipip'    => 'IP address',
-    'popnum'    => '<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>',
+    'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
     'username'  => 'Username',
     'quota'     => '(unimplemented)',
     '_password' => 'Password',
-- 
cgit v1.2.1


From 6b95d380233ca8eb73084864628d589de6985c4b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Nov 1998 07:00:32 +0000
Subject: visual

---
 htdocs/browse/part_pkg.cgi | 45 ++++++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/htdocs/browse/part_pkg.cgi b/htdocs/browse/part_pkg.cgi
index e5ff31e9e..885ac67b3 100755
--- a/htdocs/browse/part_pkg.cgi
+++ b/htdocs/browse/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# part_svc.cgi: browse part_pkg
+# $Id: part_pkg.cgi,v 1.2 1998-11-21 07:00:32 ivan Exp $
 #
 # ivan@sisd.com 97-dec-5,9
 #
@@ -8,29 +8,34 @@
 #	bmccane@maxbaud.net	98-apr-3
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: part_pkg.cgi,v $
+# Revision 1.2  1998-11-21 07:00:32  ivan
+# visual
+#
 
 use strict;
-use CGI::Base;
+use CGI;
 use FS::UID qw(cgisuidsetup swapuid);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar);
+use FS::CGI qw(header menubar popurl table);
+use FS::part_pkg;
+use FS::pkg_svc;
+use FS::part_svc;
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
-
-print header("Package Part Listing",menubar(
-  'Main Menu' => '../',
-  'Add new package' => "../edit/part_pkg.cgi",
-)), <<END;
-    <BR>Click on package part number to edit.
+print $cgi->header, header("Package Part Listing",menubar(
+  'Main Menu' => popurl(2),
+  'Add new package' => popurl(2). "/edit/part_pkg.cgi",
+)), "One or more services are grouped together into a package and given",
+  " pricing information. Customers purchase packages, not services.<BR><BR>", 
+  table, <<END;
     <TABLE BORDER>
       <TR>
-        <TH><FONT SIZE=-1>Part #</FONT></TH>
-        <TH>Package</TH>
+        <TH COLSPAN=2>Package</TH>
         <TH>Comment</TH>
         <TH><FONT SIZE=-1>Setup Fee</FONT></TH>
         <TH><FONT SIZE=-1>Freq.</FONT></TH>
@@ -41,6 +46,7 @@ print header("Package Part Listing",menubar(
 END
 
 my($part_pkg);
+my($p)=popurl(2);
 foreach $part_pkg ( sort { 
   $a->getfield('pkgpart') <=> $b->getfield('pkgpart')
 } qsearch('part_pkg',{}) ) {
@@ -50,10 +56,10 @@ foreach $part_pkg ( sort {
   my($rowspan)=scalar(@pkg_svc);
   print <<END;
       <TR>
-        <TD ROWSPAN=$rowspan><A HREF="../edit/part_pkg.cgi?$hashref->{pkgpart}">
+        <TD ROWSPAN=$rowspan><A HREF="$p/edit/part_pkg.cgi?$hashref->{pkgpart}">
           $hashref->{pkgpart}
         </A></TD>
-        <TD ROWSPAN=$rowspan>$hashref->{pkg}</TD>
+        <TD ROWSPAN=$rowspan><A HREF="$p/edit/part_pkg.cgi?$hashref->{pkgpart}">$hashref->{pkg}</A></TD>
         <TD ROWSPAN=$rowspan>$hashref->{comment}</TD>
         <TD ROWSPAN=$rowspan>$hashref->{setup}</TD>
         <TD ROWSPAN=$rowspan>$hashref->{freq}</TD>
@@ -61,12 +67,14 @@ foreach $part_pkg ( sort {
 END
 
   my($pkg_svc);
+  my($n)="";
   foreach $pkg_svc ( @pkg_svc ) {
     my($svcpart)=$pkg_svc->getfield('svcpart');
     my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart });
-    print qq!<TD><A HREF="../edit/part_svc.cgi?$svcpart">!,
+    print $n,qq!<TD><A HREF="../edit/part_svc.cgi?$svcpart">!,
           $part_svc->getfield('svc'),"</A></TD><TD>",
-          $pkg_svc->getfield('quantity'),"</TD></TR><TR>\n";
+          $pkg_svc->getfield('quantity'),"</TD></TR>\n";
+    $n="<TR>";
   }
 
   print "</TR>";
@@ -74,7 +82,6 @@ END
 
 print <<END;
     </TR></TABLE>
-    </CENTER>
   </BODY>
 </HTML>
 END
-- 
cgit v1.2.1


From 32c170c702f411cb630051bce8791fb0fd0e4dfb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Nov 1998 07:07:40 +0000
Subject: popurl, bugfix

---
 htdocs/edit/part_pkg.cgi | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/htdocs/edit/part_pkg.cgi b/htdocs/edit/part_pkg.cgi
index ed309128d..cb5ea06d8 100755
--- a/htdocs/edit/part_pkg.cgi
+++ b/htdocs/edit/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.2 1998-11-15 13:14:55 ivan Exp $
+# $Id: part_pkg.cgi,v 1.3 1998-11-21 07:07:40 ivan Exp $
 #
 # part_pkg.cgi: Add/Edit package (output form)
 #
@@ -13,7 +13,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.2  1998-11-15 13:14:55  ivan
+# Revision 1.3  1998-11-21 07:07:40  ivan
+# popurl, bugfix
+#
+# Revision 1.2  1998/11/15 13:14:55  ivan
 # first pass as per-user custom pricing
 #
 
@@ -31,24 +34,25 @@ my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
-if ( $cgi->param('clone') =~ /^(\d+)$/ ) {
+if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
   $cgi->param('clone', $1);
 } else {
   $cgi->param('clone', '');
 }
-if ( $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
+if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
   $cgi->param('pkgnum', $1);
 } else {
   $cgi->param('pkgnum', '');
 }
 
 my($part_pkg,$action);
+my($query) = $cgi->keywords;
 if ( $cgi->param('clone') ) {
   $action='Custom Pricing';
   my $old_part_pkg =
     qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
   $part_pkg = $old_part_pkg->clone;
-} elsif ( $cgi->keywords =~ /^(\d+)$/ ) {
+} elsif ( $query =~ /^(\d+)$/ ) {
   $action='Edit';
   $part_pkg=qsearchs('part_pkg',{'pkgpart'=>$1});
 } else {
@@ -58,9 +62,9 @@ if ( $cgi->param('clone') ) {
 my($hashref)=$part_pkg->hashref;
 
 print $cgi->header, header("$action Package Definition", menubar(
-  'Main Menu' => '../',
-  'View all packages' => '../browse/part_pkg.cgi',
-)), '<FORM ACTION="process/part_pkg.cgi" METHOD=POST>';
+  'Main Menu' => popurl(2),
+  'View all packages' => popurl(2). '/browse/part_pkg.cgi',
+)), '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>';
 
 if ( $cgi->param('clone') ) {
   print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
-- 
cgit v1.2.1


From a67a7db7639773372f10b5d831f15a81b945d4c5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Nov 1998 07:11:08 +0000
Subject: *** empty log message ***

---
 htdocs/edit/part_pkg.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/edit/part_pkg.cgi b/htdocs/edit/part_pkg.cgi
index cb5ea06d8..a77ea168e 100755
--- a/htdocs/edit/part_pkg.cgi
+++ b/htdocs/edit/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.3 1998-11-21 07:07:40 ivan Exp $
+# $Id: part_pkg.cgi,v 1.4 1998-11-21 07:11:08 ivan Exp $
 #
 # part_pkg.cgi: Add/Edit package (output form)
 #
@@ -13,7 +13,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.3  1998-11-21 07:07:40  ivan
+# Revision 1.4  1998-11-21 07:11:08  ivan
+# *** empty log message ***
+#
+# Revision 1.3  1998/11/21 07:07:40  ivan
 # popurl, bugfix
 #
 # Revision 1.2  1998/11/15 13:14:55  ivan
@@ -28,7 +31,7 @@ use FS::Record qw(qsearch qsearchs);
 use FS::part_pkg;
 use FS::part_svc;
 use FS::pkg_svc;
-use FS::CGI qw(header menubar);
+use FS::CGI qw(header menubar popurl);
 
 my($cgi) = new CGI;
 
-- 
cgit v1.2.1


From 8e3b1af0e9651fd02ebd10562f17f5e0c787d434 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Nov 1998 07:12:26 +0000
Subject: *** empty log message ***

---
 htdocs/edit/part_pkg.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/edit/part_pkg.cgi b/htdocs/edit/part_pkg.cgi
index a77ea168e..7fd029b03 100755
--- a/htdocs/edit/part_pkg.cgi
+++ b/htdocs/edit/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.4 1998-11-21 07:11:08 ivan Exp $
+# $Id: part_pkg.cgi,v 1.5 1998-11-21 07:12:26 ivan Exp $
 #
 # part_pkg.cgi: Add/Edit package (output form)
 #
@@ -13,7 +13,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.4  1998-11-21 07:11:08  ivan
+# Revision 1.5  1998-11-21 07:12:26  ivan
+# *** empty log message ***
+#
+# Revision 1.4  1998/11/21 07:11:08  ivan
 # *** empty log message ***
 #
 # Revision 1.3  1998/11/21 07:07:40  ivan
@@ -67,7 +70,7 @@ my($hashref)=$part_pkg->hashref;
 print $cgi->header, header("$action Package Definition", menubar(
   'Main Menu' => popurl(2),
   'View all packages' => popurl(2). '/browse/part_pkg.cgi',
-)), '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>';
+)), '<FORM ACTION="', popurl(1), '/process/part_pkg.cgi" METHOD=POST>';
 
 if ( $cgi->param('clone') ) {
   print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
-- 
cgit v1.2.1


From 89393334e46b9608bf3a1ab9e205a83260bc96cf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Nov 1998 07:17:58 +0000
Subject: bugfix to work for regular aswell as custom pricing

---
 htdocs/edit/process/part_pkg.cgi | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/edit/process/part_pkg.cgi b/htdocs/edit/process/part_pkg.cgi
index 78ed69613..5c58752c8 100755
--- a/htdocs/edit/process/part_pkg.cgi
+++ b/htdocs/edit/process/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.2 1998-11-15 13:16:15 ivan Exp $
+# $Id: part_pkg.cgi,v 1.3 1998-11-21 07:17:58 ivan Exp $
 #
 # process/part_pkg.cgi: Edit package definitions (process form)
 #
@@ -17,7 +17,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.2  1998-11-15 13:16:15  ivan
+# Revision 1.3  1998-11-21 07:17:58  ivan
+# bugfix to work for regular aswell as custom pricing
+#
+# Revision 1.2  1998/11/15 13:16:15  ivan
 # first pass as per-user custom pricing
 #
 
@@ -86,10 +89,10 @@ foreach $part_svc (qsearch('part_svc',{})) {
   }
 }
 
-unless ( $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
+unless ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
   #$req->cgi->redirect("../../view/part_pkg.cgi?$pkgpart");
   #$req->cgi->redirect("../../edit/part_pkg.cgi?$pkgpart");
-  $cgi->redirect("../../browse/part_pkg.cgi");
+  print $cgi->redirect(popurl(3). "/browse/part_pkg.cgi");
 } else {
   my($old_cust_pkg) = qsearchs( 'cust_pkg', { 'pkgnum' => $1 } );
   my %hash = $old_cust_pkg->hash;
-- 
cgit v1.2.1


From a61af2c1c9245629ebf5077d8322dba054900dd2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Nov 1998 07:23:45 +0000
Subject: visual

---
 htdocs/browse/part_pkg.cgi | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/htdocs/browse/part_pkg.cgi b/htdocs/browse/part_pkg.cgi
index 885ac67b3..1a7b2cb48 100755
--- a/htdocs/browse/part_pkg.cgi
+++ b/htdocs/browse/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.2 1998-11-21 07:00:32 ivan Exp $
+# $Id: part_pkg.cgi,v 1.3 1998-11-21 07:23:45 ivan Exp $
 #
 # ivan@sisd.com 97-dec-5,9
 #
@@ -10,12 +10,16 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.2  1998-11-21 07:00:32  ivan
+# Revision 1.3  1998-11-21 07:23:45  ivan
+# visual
+#
+# Revision 1.2  1998/11/21 07:00:32  ivan
 # visual
 #
 
 use strict;
 use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup swapuid);
 use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header menubar popurl table);
@@ -29,7 +33,6 @@ my($cgi) = new CGI;
 
 print $cgi->header, header("Package Part Listing",menubar(
   'Main Menu' => popurl(2),
-  'Add new package' => popurl(2). "/edit/part_pkg.cgi",
 )), "One or more services are grouped together into a package and given",
   " pricing information. Customers purchase packages, not services.<BR><BR>", 
   table, <<END;
@@ -71,7 +74,7 @@ END
   foreach $pkg_svc ( @pkg_svc ) {
     my($svcpart)=$pkg_svc->getfield('svcpart');
     my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart });
-    print $n,qq!<TD><A HREF="../edit/part_svc.cgi?$svcpart">!,
+    print $n,qq!<TD><A HREF="$p/edit/part_svc.cgi?$svcpart">!,
           $part_svc->getfield('svc'),"</A></TD><TD>",
           $pkg_svc->getfield('quantity'),"</TD></TR>\n";
     $n="<TR>";
@@ -81,7 +84,8 @@ END
 }
 
 print <<END;
-    </TR></TABLE>
+   <TR><TD COLSPAN=2><I><A HREF="$p/edit/part_pkg.cgi">Add new package</A></I></TD></TR>
+    </TABLE>
   </BODY>
 </HTML>
 END
-- 
cgit v1.2.1


From 4173fc50a031252c5d8b12350b7f0f4ae472f975 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Nov 1998 07:26:45 +0000
Subject: "Records identical" carp tells us it is just a warning.

---
 site_perl/Record.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/site_perl/Record.pm b/site_perl/Record.pm
index 89793d2ad..b8d565cd9 100644
--- a/site_perl/Record.pm
+++ b/site_perl/Record.pm
@@ -409,7 +409,7 @@ sub rep {
   my(@diff)=grep $new->getfield($_) ne $old->getfield($_), @fields;
 
   if ( scalar(@diff) == 0 ) {
-    carp "Records identical";
+    carp "warning: records identical";
     return '';
   }
 
@@ -759,7 +759,7 @@ sub fields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.8 1998-11-15 11:02:04 ivan Exp $
+$Id: Record.pm,v 1.9 1998-11-21 07:26:45 ivan Exp $
 
 =head1 BUGS
 
@@ -878,7 +878,10 @@ added pod documentation ivan@sisd.com 98-sep-6
 ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
 $Log: Record.pm,v $
-Revision 1.8  1998-11-15 11:02:04  ivan
+Revision 1.9  1998-11-21 07:26:45  ivan
+"Records identical" carp tells us it is just a warning.
+
+Revision 1.8  1998/11/15 11:02:04  ivan
 bugsquash
 
 Revision 1.7  1998/11/15 10:56:31  ivan
-- 
cgit v1.2.1


From 55805737cd5b4ce554fa30f4a0ec250af6d298b1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Nov 1998 07:39:52 +0000
Subject: visual

---
 htdocs/browse/agent_type.cgi | 46 ++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/htdocs/browse/agent_type.cgi b/htdocs/browse/agent_type.cgi
index 5f05bd514..cb6ee8d16 100755
--- a/htdocs/browse/agent_type.cgi
+++ b/htdocs/browse/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# agent_type.cgi: browse agent_type
+# $Id: agent_type.cgi,v 1.2 1998-11-21 07:39:52 ivan Exp $
 #
 # ivan@sisd.com 97-dec-10
 #
@@ -9,30 +9,34 @@
 #	bmccane@maxbaud.net 98-apr-3
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: agent_type.cgi,v $
+# Revision 1.2  1998-11-21 07:39:52  ivan
+# visual
+#
 
 use strict;
-use CGI::Base;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup swapuid);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar);
+use FS::CGI qw(header menubar popurl table);
+use FS::agent_type;
+use FS::type_pkgs;
+use FS::part_pkg;
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
-
-print header("Agent Type Listing", menubar(
-  'Main Menu' => '../',
-  'Add new agent type' => "../edit/agent_type.cgi",
-)), <<END;
-    <BR>Click on agent type number to edit.
-    <TABLE BORDER>
+my($p)=popurl(2);
+print $cgi->header, header("Agent Type Listing", menubar(
+  'Main Menu' => $p,
+)), "Agent types define groups of packages that you can then assign to".
+    " particular agents.<BR><BR>", table, <<END;
       <TR>
-        <TH><FONT SIZE=-1>Type #</FONT></TH>
-        <TH>Type</TH>
-        <TH colspan="2">Packages</TH>
+        <TH COLSPAN=2>Agent Type</TH>
+        <TH COLSPAN="2">Packages</TH>
       </TR>
 END
 
@@ -46,10 +50,10 @@ foreach $agent_type ( sort {
   $rowspan = int($rowspan/2+0.5) ;
   print <<END;
       <TR>
-        <TD ROWSPAN=$rowspan><A HREF="../edit/agent_type.cgi?$hashref->{typenum}">
+        <TD ROWSPAN=$rowspan><A HREF="$p/edit/agent_type.cgi?$hashref->{typenum}">
           $hashref->{typenum}
         </A></TD>
-        <TD ROWSPAN=$rowspan>$hashref->{atype}</TD>
+        <TD ROWSPAN=$rowspan><A HREF="$p/edit/agent_type.cgi?$hashref->{typenum}">$hashref->{atype}</A></TD>
 END
 
   my($type_pkgs);
@@ -59,7 +63,7 @@ END
     my($part_pkg) = qsearchs('part_pkg',{'pkgpart'=> $pkgpart });
     print qq!<TR>! if ($tdcount == 0) ;
     $tdcount = 0 if ($tdcount == -1) ;
-    print qq!<TD><A HREF="../edit/part_pkg.cgi?$pkgpart">!,
+    print qq!<TD><A HREF="$p/edit/part_pkg.cgi?$pkgpart">!,
           $part_pkg->getfield('pkg'),"</A></TD>";
     $tdcount ++ ;
     if ($tdcount == 2)
@@ -73,8 +77,8 @@ END
 }
 
 print <<END;
-    </TR></TABLE>
-    </CENTER>
+  <TR><TD COLSPAN=2><I><A HREF="$p/edit/agent_type.cgi">Add new agent type</A></I></TD></TR>
+    </TABLE>
   </BODY>
 </HTML>
 END
-- 
cgit v1.2.1


From fd5545133c13146fdf8c6d8b5818e538808018fe Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Nov 1998 07:45:19 +0000
Subject: visual, use FS::table_name when doing qsearch('table_name')

---
 htdocs/edit/agent_type.cgi | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/htdocs/edit/agent_type.cgi b/htdocs/edit/agent_type.cgi
index b6b45eead..f3fd20a44 100755
--- a/htdocs/edit/agent_type.cgi
+++ b/htdocs/edit/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.3 1998-11-15 11:20:12 ivan Exp $
+# $Id: agent_type.cgi,v 1.4 1998-11-21 07:45:19 ivan Exp $
 #
 # agent_type.cgi: Add/Edit agent type (output form)
 #
@@ -13,7 +13,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.3  1998-11-15 11:20:12  ivan
+# Revision 1.4  1998-11-21 07:45:19  ivan
+# visual, use FS::table_name when doing qsearch('table_name')
+#
+# Revision 1.3  1998/11/15 11:20:12  ivan
 # s/CGI-Base/CGI.pm/ causes s/QUERY_STRING/keywords/;
 #
 # Revision 1.2  1998/11/13 09:56:46  ivan
@@ -27,7 +30,10 @@ use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::agent_type;
-use FS::CGI qw(header menubar);
+use FS::CGI qw(header menubar popurl);
+use FS::agent_type;
+use FS::part_pkg;
+use FS::type_pkgs;
 
 my($cgi) = new CGI;
 
@@ -43,17 +49,18 @@ if ( $cgi->keywords =~ /^(\d+)$/ ) { #editing
 }
 my($hashref)=$agent_type->hashref;
 
+my($p)=popurl(2);
 print $cgi->header, header("$action Agent Type", menubar(
-  'Main Menu' => '../',
-  'View all agent types' => '../browse/agent_type.cgi',
-)), '<FORM ACTION="process/agent_type.cgi" METHOD=POST>';
+  'Main Menu' => "$p/",
+  'View all agent types' => "$p/browse/agent_type.cgi",
+)), '<FORM ACTION="', popurl(1), '/process/agent_type.cgi" METHOD=POST>';
 
 print qq!<INPUT TYPE="hidden" NAME="typenum" VALUE="$hashref->{typenum}">!,
       "Agent Type #", $hashref->{typenum} ? $hashref->{typenum} : "(NEW)";
 
 print <<END;
-<BR>Type <INPUT TYPE="text" NAME="atype" SIZE=32 VALUE="$hashref->{atype}">
-<P>Select which packages agents of this type may sell to customers</P>
+<BR><BR>Agent Type <INPUT TYPE="text" NAME="atype" SIZE=32 VALUE="$hashref->{atype}">
+<BR><BR>Select which packages agents of this type may sell to customers<BR>
 END
 
 my($part_pkg);
-- 
cgit v1.2.1


From fbfd0b39e80af0fe637125a4ef9f666be39a5f32 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Nov 1998 07:49:20 +0000
Subject: s/CGI::Request/CGI.pm/

---
 htdocs/edit/process/agent_type.cgi | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/htdocs/edit/process/agent_type.cgi b/htdocs/edit/process/agent_type.cgi
index 43f129fd5..7a70198f8 100755
--- a/htdocs/edit/process/agent_type.cgi
+++ b/htdocs/edit/process/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/agent_type.cgi: Edit agent type (process form)
+# $Id: agent_type.cgi,v 1.2 1998-11-21 07:49:20 ivan Exp $
 #
 # ivan@sisd.com 97-dec-11
 #
@@ -8,25 +8,31 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: agent_type.cgi,v $
+# Revision 1.2  1998-11-21 07:49:20  ivan
+# s/CGI::Request/CGI.pm/
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
+use FS::CGI qw(idiot popurl);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::agent_type qw(fields);
 use FS::type_pkgs;
-use FS::CGI qw(idiot);
+use FS::part_pkg;
 
-my($req)=new CGI::Request;
-&cgisuidsetup($req->cgi);
+my($cgi)=new CGI;
+&cgisuidsetup($cgi);
 
-my($typenum)=$req->param('typenum');
+my($typenum)=$cgi->param('typenum');
 my($old)=qsearchs('agent_type',{'typenum'=>$typenum}) if $typenum;
 
 my($new)=create FS::agent_type ( {
   map {
-    $_, $req->param($_);
+    $_, scalar($cgi->param($_));
   } fields('agent_type')
 } );
 
@@ -51,7 +57,7 @@ foreach $part_pkg (qsearch('part_pkg',{})) {
       'typenum' => $typenum,
       'pkgpart' => $pkgpart,
   });
-  if ( $type_pkgs && ! $req->param("pkgpart$pkgpart") ) {
+  if ( $type_pkgs && ! $cgi->param("pkgpart$pkgpart") ) {
     my($d_type_pkgs)=$type_pkgs; #need to save $type_pkgs for below.
     $error=$d_type_pkgs->del; #FS::Record not FS::type_pkgs,
                                   #so ->del not ->delete.  hmm.  hmm.
@@ -60,7 +66,7 @@ foreach $part_pkg (qsearch('part_pkg',{})) {
       exit;
     }
 
-  } elsif ( $req->param("pkgpart$pkgpart")
+  } elsif ( $cgi->param("pkgpart$pkgpart")
             && ! $type_pkgs
   ) {
     #ok to clobber it now (but bad form nonetheless?)
@@ -79,5 +85,5 @@ foreach $part_pkg (qsearch('part_pkg',{})) {
 
 #$req->cgi->redirect("../../view/agent_type.cgi?$typenum");
 #$req->cgi->redirect("../../edit/agent_type.cgi?$typenum");
-$req->cgi->redirect("../../browse/agent_type.cgi");
+print $cgi->redirect(popurl(3). "/browse/agent_type.cgi");
 
-- 
cgit v1.2.1


From 7ec03959f07dcbab6717d4edadca92c43fa26607 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Nov 1998 07:58:27 +0000
Subject: package names link to them

---
 htdocs/edit/agent_type.cgi | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/edit/agent_type.cgi b/htdocs/edit/agent_type.cgi
index f3fd20a44..021ff6cf3 100755
--- a/htdocs/edit/agent_type.cgi
+++ b/htdocs/edit/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.4 1998-11-21 07:45:19 ivan Exp $
+# $Id: agent_type.cgi,v 1.5 1998-11-21 07:58:27 ivan Exp $
 #
 # agent_type.cgi: Add/Edit agent type (output form)
 #
@@ -13,7 +13,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.4  1998-11-21 07:45:19  ivan
+# Revision 1.5  1998-11-21 07:58:27  ivan
+# package names link to them
+#
+# Revision 1.4  1998/11/21 07:45:19  ivan
 # visual, use FS::table_name when doing qsearch('table_name')
 #
 # Revision 1.3  1998/11/15 11:20:12  ivan
@@ -74,7 +77,9 @@ foreach $part_pkg ( qsearch('part_pkg',{}) ) {
         })
           ? 'CHECKED '
           : '',
-        qq!"VALUE="ON"> !,$part_pkg->getfield('pkg')
+        qq!"VALUE="ON"> !,
+    qq!<A HREF="$p/edit/part_pkg.cgi?!, $part_pkg->pkgpart, 
+    '">', $part_pkg->getfield('pkg'), '</A>',
   ;
 }
 
-- 
cgit v1.2.1


From 77765df2a5a917be9c444fb831b6a49a83c4f503 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Nov 1998 05:27:31 +0000
Subject: to eliminate warnings

---
 htdocs/browse/agent.cgi | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/browse/agent.cgi b/htdocs/browse/agent.cgi
index fe4e84abb..1756877f5 100755
--- a/htdocs/browse/agent.cgi
+++ b/htdocs/browse/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.4 1998-11-20 08:50:36 ivan Exp $
+# $Id: agent.cgi,v 1.5 1998-11-23 05:27:31 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -15,7 +15,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent.cgi,v $
-# Revision 1.4  1998-11-20 08:50:36  ivan
+# Revision 1.5  1998-11-23 05:27:31  ivan
+# to eliminate warnings
+#
+# Revision 1.4  1998/11/20 08:50:36  ivan
 # s/CGI::Base/CGI.pm, visual fixes
 #
 # Revision 1.3  1998/11/08 10:11:02  ivan
@@ -31,6 +34,7 @@ use FS::UID qw(cgisuidsetup swapuid);
 use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header menubar table popurl);
 use FS::agent;
+use FS::agent_type;
 
 my($cgi) = new CGI;
 
-- 
cgit v1.2.1


From 4edb82151a6bc207d1cefb26e57c1641aa045a42 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Nov 1998 05:29:46 +0000
Subject: use CGI::Carp

---
 htdocs/browse/agent.cgi | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/browse/agent.cgi b/htdocs/browse/agent.cgi
index 1756877f5..6e5e09fb7 100755
--- a/htdocs/browse/agent.cgi
+++ b/htdocs/browse/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.5 1998-11-23 05:27:31 ivan Exp $
+# $Id: agent.cgi,v 1.6 1998-11-23 05:29:46 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -15,7 +15,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent.cgi,v $
-# Revision 1.5  1998-11-23 05:27:31  ivan
+# Revision 1.6  1998-11-23 05:29:46  ivan
+# use CGI::Carp
+#
+# Revision 1.5  1998/11/23 05:27:31  ivan
 # to eliminate warnings
 #
 # Revision 1.4  1998/11/20 08:50:36  ivan
@@ -30,6 +33,7 @@
 
 use strict;
 use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup swapuid);
 use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header menubar table popurl);
-- 
cgit v1.2.1


From 6959720691f8c2e8960171a08df25d211f39a38c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Nov 1998 05:42:18 +0000
Subject: use FS::cust_main and FS::agent_type to eliminate warnings

---
 site_perl/agent.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/site_perl/agent.pm b/site_perl/agent.pm
index 7fc370ed0..ab06f6798 100644
--- a/site_perl/agent.pm
+++ b/site_perl/agent.pm
@@ -4,6 +4,8 @@ use strict;
 use vars qw(@ISA @EXPORT_OK);
 use Exporter;
 use FS::Record qw(fields qsearch qsearchs);
+use FS::cust_main;
+use FS::agent_type;
 
 @ISA = qw(FS::Record Exporter);
 @EXPORT_OK = qw(fields);
-- 
cgit v1.2.1


From 87ecabc795496becf9f0e5d94e304dd76e2dcf23 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Nov 1998 07:52:29 +0000
Subject: *** empty log message ***

---
 htdocs/edit/agent.cgi         | 28 ++++++++++++++++------------
 htdocs/edit/process/agent.cgi | 25 +++++++++++++++----------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/htdocs/edit/agent.cgi b/htdocs/edit/agent.cgi
index 5bd116528..fecfc54c9 100755
--- a/htdocs/edit/agent.cgi
+++ b/htdocs/edit/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# agent.cgi: Add/Edit agent (output form)
+# $Id: agent.cgi,v 1.2 1998-11-23 07:52:08 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -9,24 +9,28 @@
 #	bmccane@maxbaud.net	98-apr-3
 #
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
+#
+# $Log: agent.cgi,v $
+# Revision 1.2  1998-11-23 07:52:08  ivan
+# *** empty log message ***
+#
 
 use strict;
-use CGI::Base;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header menubar popurl);
 use FS::Record qw(qsearch qsearchs);
 use FS::agent;
-use FS::CGI qw(header menubar);
+use FS::agent_type;
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
-
 my($agent,$action);
-if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
+my($query) = $cgi->keywords;
+if ( $query =~ /^(\d+)$/ ) { #editing
   $agent=qsearchs('agent',{'agentnum'=>$1});
   $action='Edit';
 } else { #adding
@@ -35,10 +39,10 @@ if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
 }
 my($hashref)=$agent->hashref;
 
-print header("$action Agent", menubar(
-  'Main Menu' => '../',
-  'View all agents' => '../browse/agent.cgi',
-)), '<FORM ACTION="process/agent.cgi" METHOD=POST>';
+print $cgi->header, header("$action Agent", menubar(
+  'Main Menu' => popurl(2),
+  'View all agents' => popurl(2). '/browse/agent.cgi',
+)), '<FORM ACTION="', popurl(1), '/process/agent.cgi" METHOD=POST>';
 
 print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$hashref->{agentnum}">!,
       "Agent #", $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)";
diff --git a/htdocs/edit/process/agent.cgi b/htdocs/edit/process/agent.cgi
index 5d1ce3232..423926d0f 100755
--- a/htdocs/edit/process/agent.cgi
+++ b/htdocs/edit/process/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/agent.cgi: Edit agent (process form)
+# $Id: agent.cgi,v 1.2 1998-11-23 07:52:29 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -8,30 +8,35 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: agent.cgi,v $
+# Revision 1.2  1998-11-23 07:52:29  ivan
+# *** empty log message ***
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::agent qw(fields);
-use FS::CGI qw(idiot);
+use FS::CGI qw(idiot popurl);
 
-my($req)=new CGI::Request; # create form object
+my($cgi)=new CGI;
 
-&cgisuidsetup($req->cgi);
+&cgisuidsetup($cgi);
 
-my($agentnum)=$req->param('agentnum');
+my($agentnum)=$cgi->param('agentnum');
 
 my($old)=qsearchs('agent',{'agentnum'=>$agentnum}) if $agentnum;
 
 #unmunge typenum
-$req->param('typenum') =~ /^(\d+)(:.*)?$/;
-$req->param('typenum',$1);
+$cgi->param('typenum') =~ /^(\d+)(:.*)?$/;
+$cgi->param('typenum',$1);
 
 my($new)=create FS::agent ( {
   map {
-    $_, $req->param($_);
+    $_, scalar($cgi->param($_));
   } fields('agent')
 } );
 
@@ -48,6 +53,6 @@ if ( $error ) {
 } else { 
   #$req->cgi->redirect("../../view/agent.cgi?$agentnum");
   #$req->cgi->redirect("../../edit/agent.cgi?$agentnum");
-  $req->cgi->redirect("../../browse/agent.cgi");
+  print $cgi->redirect(popurl(3). "/browse/agent.cgi");
 }
 
-- 
cgit v1.2.1


From bb3073b629d2b5bf1903cc34a06bab8bed068965 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 28 Nov 1998 23:59:30 +0000
Subject: run fs-setup as user freeside

---
 htdocs/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 8cead6d09..058a60a1e 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -47,6 +47,6 @@ chmod 4755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.
 <li>Create the necessary <a href="config.html">configuration files</a>.
 <li>Create the `/usr/local/etc/freeside/counters.<i>datasrc</i>', and 
   `/usr/local/etc/freeside/export.<i>datasrc</i>' directories for each <i>datasrc</i>.
-  <li>Run bin/fs-setup to create the database tables.
+  <li>As the freeside user, run bin/fs-setup to create the database tables.
 </ul>
 </body>
-- 
cgit v1.2.1


From 320d43cc303284435bd94b5b283471609c4a8eac Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 2 Dec 1998 01:23:48 +0000
Subject: *** empty log message ***

---
 CREDITS | 12 ++++++++++--
 TODO    |  7 ++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CREDITS b/CREDITS
index 4e13c72ed..602e0788b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -11,11 +11,19 @@ Jerry St. Pierre <jstpi@city.timmins.on.ca> did the "SISD" graphic used in
 Brian McCane? <bmccane@maxbaud.net> contributed PostgreSQL support, HTML
 style enhancements and many, many bugfixes.
 
+Cerkit <cerkit@alfheim.net> contributed 
+
 CompleteHOST, Inc. (http://www.completehost.com) funded the development of the
-following Freeside features:
+following Freeside features by contracting me for a custom billing system
+based on Freeside:
   - Multiple, separate databases and configurations on one box.
-  - Per-customer pricing (packages)
+  - Per-customer pricing (custom packages)
+  - Optional customer titles, middle initials and EIN numbers
+  - Internationalization wrt addresses (cust_main, cust_main_county)
+
   - Integration with Radiator, http://www.open.com.au/radiator
   - Integration with NetSurfer NetKit ISP, http://www.netsurfer.com/
+Thanks!
+
 Everything else is my (Ivan Kohler <ivan@sisd.com>) fault.
 
diff --git a/TODO b/TODO
index 0e70ba453..a4e4710e0 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.14 1998-11-18 09:01:30 ivan Exp $
+$Id: TODO,v 1.15 1998-12-02 01:23:47 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,11 @@ duplication of effort.
 
 -- 1.1.x --
 
+int'l stuff in web interface (not on david's time)
+
+admin web interface for titles (Dr., Mrs.) and default in fs-setup
+(not on david's time)
+
 test and document libapache-dbi-logger (woo!)
 
 remove whois_hack set to 1 for svc_domain.pm?  add all known registries and
-- 
cgit v1.2.1


From 7559cc8cb8e2ad57806462d22eedb1fb101816f0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 10 Dec 1998 07:23:18 +0000
Subject: use FS::Conf, need user (for datasrc)

---
 bin/svc_acct.export    | 89 +++++++++++++++++++-------------------------------
 bin/svc_acct.import    | 22 +++++++++----
 bin/svc_acct_sm.export | 69 +++++++++++++++++++-------------------
 bin/svc_acct_sm.import | 23 ++++++++++---
 4 files changed, 103 insertions(+), 100 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 3f65a08ba..d4ebe6bdc 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,5 +1,7 @@
 #!/usr/bin/perl -Tw
 #
+# $Id: svc_acct.export,v 1.2 1998-12-10 07:23:15 ivan Exp $
+#
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
 #
@@ -34,75 +36,46 @@
 #
 # OOPS!  added arbitrary radius fields (pry 98-aug-16) but forgot to say so.
 # ivan@sisd.com 98-sep-18
+# 
+# $Log: svc_acct.export,v $
+# Revision 1.2  1998-12-10 07:23:15  ivan
+# use FS::Conf, need user (for datasrc)
+#
 
 use strict;
+use vars qw($conf);
 use Fcntl qw(:flock);
+use FS::Conf;
 use FS::SSH qw(scp ssh);
-use FS::UID qw(adminsuidsetup);
+use FS::UID qw(adminsuidsetup datasrc);
 use FS::Record qw(qsearch fields);
+use FS::svc_acct;
 
-my($fshellmachines)="/var/spool/freeside/conf/shellmachines";
-my(@shellmachines);
-if ( -e $fshellmachines ) {
-  open(SHELLMACHINES,$fshellmachines);
-  @shellmachines=map {
-    /^(.*)$/ or die "Illegal line in conf/shellmachines"; #we trust the file
-    $1;
-  } grep $_ !~ /^(#|$)/, <SHELLMACHINES>;
-  close SHELLMACHINES;
-}
+my $user = shift or die &usage;
+adminsuidsetup $user;
 
-my($fbsdshellmachines)="/var/spool/freeside/conf/bsdshellmachines";
-my(@bsdshellmachines);
-if ( -e $fbsdshellmachines ) {
-  open(BSDSHELLMACHINES,$fbsdshellmachines);
-  @bsdshellmachines=map {
-    /^(.*)$/ or die "Illegal line in conf/bsdshellmachines"; #we trust the file
-    $1;
-  } grep $_ !~ /^(#|$)/, <BSDSHELLMACHINES>;
-  close BSDSHELLMACHINES;
-}
+$conf = new FS::Conf;
 
-my($fnismachines)="/var/spool/freeside/conf/nismachines";
-my(@nismachines);
-if ( -e $fnismachines ) {
-  open(NISMACHINES,$fnismachines);
-  @nismachines=map {
-    /^(.*)$/ or die "Illegal line in conf/nismachines"; #we trust the file
-    $1;
-  } grep $_ !~ /^(#|$)/, <NISMACHINES>;
-  close NISMACHINES;
-}
+my @shellmachines = $conf->config('shellmachines')
+  if $conf->exists('shellmachines');
 
-my($ferpcdmachines)="/var/spool/freeside/conf/erpcdmachines";
-my(@erpcdmachines);
-if ( -e $ferpcdmachines ) {
-  open(ERPCDMACHINES,$ferpcdmachines);
-  @erpcdmachines=map {
-    /^(.*)$/ or die "Illegal line in conf/erpcdmachines"; #we trust the file
-    $1;
-  } grep $_ !~ /^(#|$)/, <ERPCDMACHINES>;
-  close ERPCDMACHINES;
-}
+my @bsdshellmachines = $conf->config('bsdshellmachines')
+  if $conf->exists('bsdshellmachines');
 
-my($fradiusmachines)="/var/spool/freeside/conf/radiusmachines";
-my(@radiusmachines);
-if ( -e $fradiusmachines ) {
-  open(RADIUSMACHINES,$fradiusmachines);
-  @radiusmachines=map {
-    /^(.*)$/ or die "Illegal line in conf/radiusmachines"; #we trust the file
-    $1;
-  } grep $_ !~ /^(#|$)/, <RADIUSMACHINES>;
-  close RADIUSMACHINES;
-}
+my @nismachines = $conf->config('nismachines')
+  if $conf->exists('nismachines');
 
-my($spooldir)="/var/spool/freeside/export";
-my($spoollock)="/var/spool/freeside/svc_acct.export.lock";
+my @erpcdmachines = $conf->config('erpcdmachines')
+  if $conf->exists('erpcdmachines');
 
-adminsuidsetup;
+my @radiusmachines = $conf->config('radiusmachines')
+  if $conf->exists('radiusmachines');
 
 my(@saltset)= ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
-srand(time|$$);
+require 5.004; #srand(time|$$);
+
+my $spooldir = "/usr/local/etc/freeside/export.". datasrc;
+my $spoollock = "/usr/local/etc/freeside/svc_acct.export.lock.". datasrc;
 
 open(EXPORT,"+>>$spoollock") or die "Can't open $spoollock: $!";
 select(EXPORT); $|=1; select(STDOUT);
@@ -349,3 +322,9 @@ unlink $spoollock;
 flock(EXPORT,LOCK_UN);
 close EXPORT;
 
+#
+
+sub usage {
+  die "Usage:\n\n  svc_acct.export user\n";
+}
+
diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index 60deac539..8343ce867 100755
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.import,v 1.2 1998-10-13 12:07:51 ivan Exp $
+# $Id: svc_acct.import,v 1.3 1998-12-10 07:23:16 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -17,7 +17,10 @@
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 #
 # $Log: svc_acct.import,v $
-# Revision 1.2  1998-10-13 12:07:51  ivan
+# Revision 1.3  1998-12-10 07:23:16  ivan
+# use FS::Conf, need user (for datasrc)
+#
+# Revision 1.2  1998/10/13 12:07:51  ivan
 # Assigns password from the shadow file for RADIUS password "UNIX"
 #
 
@@ -25,14 +28,15 @@ use strict;
 use vars qw(%part_svc);
 use Date::Parse;
 use FS::SSH qw(iscp);
-use FS::UID qw(adminsuidsetup);
+use FS::UID qw(adminsuidsetup datasrc);
 use FS::Record qw(qsearch);
 use FS::svc_acct;
+use FS::part_svc;
 
-adminsuidsetup;
+my $user = shift or die &usage;
+adminsuidsetup $user;
 
-#my($spooldir)="/var/spool/freeside/export";
-my($spooldir)="unix/";
+my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
 
 $FS::svc_acct::nossh_hack = 1;
 
@@ -233,3 +237,9 @@ foreach $username ( keys %upassword ) {
   delete $upassword{$username};
 }
 
+#
+
+sub usage {
+  die "Usage:\n\n  svc_acct.export user\n";
+}
+
diff --git a/bin/svc_acct_sm.export b/bin/svc_acct_sm.export
index c2ec1e53f..ce4900733 100755
--- a/bin/svc_acct_sm.export
+++ b/bin/svc_acct_sm.export
@@ -1,6 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# Create and export VoiceNet_quasar.m4
+# $Id: svc_acct_sm.export,v 1.2 1998-12-10 07:23:17 ivan Exp $
+# 
+# Create and export config files for sendmail, qmail
+#
+# (used to) Create and export VoiceNet_quasar.m4
 #
 # ivan@voicenet.com late oct 96
 #
@@ -36,53 +40,42 @@
 # put example $my_domain declaration in ivan@sisd.com 98-mar-23
 #
 # /var/spool/freeside/conf and sendmail updates ivan@sisd.com 98-aug-14
+#
+# $Log: svc_acct_sm.export,v $
+# Revision 1.2  1998-12-10 07:23:17  ivan
+# use FS::Conf, need user (for datasrc)
+#
 
 use strict;
+use vars qw($conf);
 use Fcntl qw(:flock);
 use FS::SSH qw(ssh scp);
-use FS::UID qw(adminsuidsetup);
+use FS::UID qw(adminsuidsetup datasrc);
 use FS::Record qw(qsearch qsearchs);
+use FS::svc_acct;
+use FS::svc_acct_sm;
+use FS::svc_domain;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+$conf = new FS::Conf;
 
-my($conf_shellm)="/var/spool/freeside/conf/shellmachine";
-my($fqmailmachines)="/var/spool/freeside/conf/qmailmachines";
 my($shellmachine);
 my(@qmailmachines);
-if ( -e $fqmailmachines ) {
-  open(SHELLMACHINE,$conf_shellm) or die "Can't open $conf_shellm: $!";
-  <SHELLMACHINE> =~ /^([\w\.\-]+)$/ or die "Illegal $conf_shellm";
-  $shellmachine = $1;
-  close SHELLMACHINE;
-  open(QMAILMACHINES,$fqmailmachines);
-  @qmailmachines=map {
-    /^(.*)$/ or die "Illegal line in conf/qmailmachines"; #we trust the file
-    $1;
-  } grep $_ !~ /^(#|$)/, <QMAILMACHINES>;
-  close QMAILMACHINES;
+if ( $conf->exists('qmailmachines') ) {
+  $shellmachine = $conf->config('shellmachine');
+  @qmailmachines = $conf->config('qmailmachines');
 }
 
-my($fsendmailmachines)="/var/spool/freeside/conf/sendmailmachines";
-my(@sendmailmachines);
-if ( -e $fsendmailmachines ) {
-  open(SENDMAILMACHINES,$fsendmailmachines);
-  @sendmailmachines=map {
-    /^(.*)$/ or die "Illegal line in conf/sendmailmachines"; #we trust the file
-    $1;
-  } grep $_ !~ /^(#|$)/, <SENDMAILMACHINES>;
-  close SENDMAILMACHINES;
-}
+my @sendmailmachines = $conf->config('sendmailmachines')
+  if $conf->exists('sendmailmachines');
 
-my($conf_domain)="/var/spool/freeside/conf/domain";
-open(DOMAIN,$conf_domain) or die "Can't open $conf_domain: $!";
-my($mydomain)=map {
-  /^(.*)$/ or die "Illegal line in $conf_domain!"; #yes, we trust the file
-  $1
-} grep $_ !~ /^(#|$)/, <DOMAIN>;
-close DOMAIN;
+my $mydomain = $conf->config('domain');
 
-my($spooldir)="/var/spool/freeside/export";
-my($spoollock)="/var/spool/freeside/svc_acct_sm.export.lock";
+my $spooldir = "/usr/local/etc/freeside/export.". datasrc;
+my $spoollock = "/usr/local/etc/freeside/svc_acct_sm.export.lock.". datasrc;
 
-adminsuidsetup;
 umask 066;
 
 open(EXPORT,"+>>$spoollock") or die "Can't open $spoollock: $!";
@@ -219,3 +212,9 @@ unlink $spoollock;
 flock(EXPORT,LOCK_UN);
 close EXPORT;
 
+#
+
+sub usage {
+  die "Usage:\n\n  svc_acct.export user\n";
+}
+
diff --git a/bin/svc_acct_sm.import b/bin/svc_acct_sm.import
index 10d7e4c20..f94bda637 100755
--- a/bin/svc_acct_sm.import
+++ b/bin/svc_acct_sm.import
@@ -1,5 +1,7 @@
 #!/usr/bin/perl -Tw
 #
+# $Id: svc_acct_sm.import,v 1.2 1998-12-10 07:23:18 ivan Exp $
+#
 # ivan@sisd.com 98-mar-9
 #
 # generalized svcparts ivan@sisd.com 98-mar-23
@@ -12,19 +14,26 @@
 # has an (untested) section for sendmail, s/warn/die/g and generates a program
 # to run on your mail machine _later_ instead of ssh'ing for each user
 # ivan@sisd.com 98-jul-13
+#
+# $Log: svc_acct_sm.import,v $
+# Revision 1.2  1998-12-10 07:23:18  ivan
+# use FS::Conf, need user (for datasrc)
+#
 
 use strict;
 use vars qw(%d_part_svc %m_part_svc);
 use FS::SSH qw(iscp);
-use FS::UID qw(adminsuidsetup);
+use FS::UID qw(adminsuidsetup datasrc);
 use FS::Record qw(qsearch qsearchs);
 use FS::svc_acct_sm;
 use FS::svc_domain;
+use FS::svc_acct;
+use FS::part_svc;
 
-adminsuidsetup;
+my $user = shift or die &usage;
+adminsuidsetup $user;
 
-#my($spooldir)="/var/spool/freeside/export";
-my($spooldir)="unix";
+my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
 
 my(%mta) = (
   1 => "qmail",
@@ -250,3 +259,9 @@ Don\'t forget to run $spooldir/virtualdomains.FIX before using
 $spooldir/virtualdomains !
 END
 
+#
+
+sub usage {
+  die "Usage:\n\n  svc_acct_sm.export user\n";
+}
+
-- 
cgit v1.2.1


From 69ebc28d6bb1e3925f5c909e00c97f44215684a9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Dec 1998 06:36:17 +0000
Subject: hint for mysql systems w/o native threading

---
 htdocs/docs/trouble.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/docs/trouble.html b/htdocs/docs/trouble.html
index 2cf6d4e71..2c5b92fd5 100644
--- a/htdocs/docs/trouble.html
+++ b/htdocs/docs/trouble.html
@@ -37,5 +37,6 @@ As mentioned in the <a href="install.html">New Installation</a> section of the d
 <pre>cd /usr/local/apache/htdocs/freeside
 chown -R freeside .
 chmod 4755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.cgi search/*.cgi view/*.cgi</pre>
+  <li>If you receive `can not connect to server' errors using MySQL on a system that doesn't support native threading, you may need to specify the full hostname in your DBI datasource.  See the <a href="http://www.mysql.com/Manual_chapter/manual_Problems.html#Can_not_connect_to_server">MySQL documentation</a>, DBI manpage and the DBD::mysql manpage for details.
   </ul>
 </body>
-- 
cgit v1.2.1


From 0057d8bd24476fc9a50c82a94f39b168f46b0a28 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 15 Dec 1998 04:33:27 +0000
Subject: dies if it isn't running as the freeside user

---
 bin/fs-setup | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index b3fc5c5a0..621c426c4 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# create database and necessary tables, etc.  DBI version.
+# $Id: fs-setup,v 1.8 1998-12-15 04:33:27 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.7  1998-11-18 09:01:31  ivan
+# Revision 1.8  1998-12-15 04:33:27  ivan
+# dies if it isn't running as the freeside user
+#
+# Revision 1.7  1998/11/18 09:01:31  ivan
 # i18n! i18n!
 #
 # Revision 1.6  1998/11/15 13:18:02  ivan
@@ -54,10 +57,12 @@ BEGIN { $FS::Record::setup_hack = 1; }
 use strict;
 use DBI;
 use FS::dbdef;
-use FS::UID qw(adminsuidsetup datasrc);
+use FS::UID qw(adminsuidsetup datasrc checkeuid);
 use FS::Record;
 use FS::cust_main_county;
 
+croak "Not running uid freeside!" unless checkeuid();
+
 my $user = shift or die &usage;
 FS::UID::getsecrets $user;
 
-- 
cgit v1.2.1


From 5633a7534d0319ce016092523d4ad7ff453a9726 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 15 Dec 1998 04:36:29 +0000
Subject: s/croak/die/; #oops

---
 bin/fs-setup | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 621c426c4..19ac53377 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.8 1998-12-15 04:33:27 ivan Exp $
+# $Id: fs-setup,v 1.9 1998-12-15 04:36:29 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.8  1998-12-15 04:33:27  ivan
+# Revision 1.9  1998-12-15 04:36:29  ivan
+# s/croak/die/; #oops
+#
+# Revision 1.8  1998/12/15 04:33:27  ivan
 # dies if it isn't running as the freeside user
 #
 # Revision 1.7  1998/11/18 09:01:31  ivan
@@ -61,7 +64,7 @@ use FS::UID qw(adminsuidsetup datasrc checkeuid);
 use FS::Record;
 use FS::cust_main_county;
 
-croak "Not running uid freeside!" unless checkeuid();
+die "Not running uid freeside!" unless checkeuid();
 
 my $user = shift or die &usage;
 FS::UID::getsecrets $user;
-- 
cgit v1.2.1


From 502b6214321a4abe19366da5137a3bd3de6edf8e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Dec 1998 04:32:50 +0000
Subject: oops, removed explicit links to my development machine!

---
 htdocs/docs/legacy.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/docs/legacy.html b/htdocs/docs/legacy.html
index 40e09cb3c..3ab21dab2 100644
--- a/htdocs/docs/legacy.html
+++ b/htdocs/docs/legacy.html
@@ -4,7 +4,7 @@
 <body>
   <h1>Importing legacy data</h1>
 <ul>
-  <li><a name="svc_acct">bin/svc_acct.import</a> - Import `passwd', ( `shadow' or `master.passwd' ) and RADIUS `users'.  Before running bin/svc_acct.import, you need <a href="http://rootwood.sisd.com/freeside/browse/part_svc.cgi">services</a> (with table svc_acct) as follows:
+  <li><a name="svc_acct">bin/svc_acct.import</a> - Import `passwd', ( `shadow' or `master.passwd' ) and RADIUS `users'.  Before running bin/svc_acct.import, you need <a href="../browse/part_svc.cgi">services</a> (with table svc_acct) as follows:
     <ul>
       <li>Most accounts probably have entries in passwd and users (with Port-Limit nonexistant or 1)
       <li>Some accounts have entries in passwd and users, but with Port-Limit 2 (or more)
@@ -13,7 +13,7 @@
       <li>POP mail accounts have entries in passwd only, and have a particular shell.
       <li>Everything else in passwd is a shell account.
     </ul>
-  <li><a name="svc_acct_sm">bin/svc_acct_sm.import</a> - Import qmail ( `virtualdomains' and `rcpthosts' ), or sendmail ( `virtusertable' and `sendmail.cw' ) files.  Before running bin/svc_acct_sm.import, you need <a href="http://rootwood.sisd.com/freeside/browse/part_svc.cgi">services</a> as follows:
+  <li><a name="svc_acct_sm">bin/svc_acct_sm.import</a> - Import qmail ( `virtualdomains' and `rcpthosts' ), or sendmail ( `virtusertable' and `sendmail.cw' ) files.  Before running bin/svc_acct_sm.import, you need <a href="../browse/part_svc.cgi">services</a> as follows:
     <ul>
       <li>Domain (table svc_acct)
       <li>Mail alias (table svc_acct_sm)
-- 
cgit v1.2.1


From ea3a48ef84388ac35c3fd19d80e7ff1d3aee8c29 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Dec 1998 05:13:17 +0000
Subject: visual changes, new config file dir

---
 htdocs/docs/export.html | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/docs/export.html b/htdocs/docs/export.html
index f760b97dd..d8022ae45 100644
--- a/htdocs/docs/export.html
+++ b/htdocs/docs/export.html
@@ -4,29 +4,29 @@
 <body>
   <h1>File exporting</h1>
   <ul>
-    <li>bin/svc_acct.export will create UNIX `passwd', `shadow' and `master.passwd' files, ERPCD `acp_passwd' and `acp_dialup' files and a RADIUS `users' file in the `/var/spool/freeside/export' directory.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattended; see below.
+    <li>bin/svc_acct.export will create UNIX <b>passwd</b>, <b>shadow</b> and <b>master.passwd</b> files, ERPCD <b>acp_passwd</b> and <b>acp_dialup</b> files and a RADIUS <b>users</b> file in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattended; see below.
       <ul>
-        <li>shellmachines - passwd and shadow are copied to the remote machine as /etc/passwd.new and /etc/shadow.net and then moved to /etc/passwd and /etc/shadow if no errors occur.
-        <li>bsdshellmachines - passwd and master.passwd are copied to the remote machine as /etc/passwd.new and /etc/master.passwd.new and moved to /etc/passwd and /etc/master.passwd if no errors occur.
-        <li>nismachines - passwd and shadow are copied to the `/etc/global' directory on the remote machine.  If no errors occur, the command `( cd /var/yp; make; )' is executed on the remote machine.
-        <li>erpcdmachines - acp_passwd and acp_dialup are copied to the `/usr/annex' directory on the remote machine.  If no errors occur, the command `( kill -USR1 `cat /usr/annex/erpcd.pid` )' is executed on the remote machine. 
-        <li>radiusmachines - users is copied to the `/etc/raddb' directory on the remote machine.  If no errors occur, the command `( builddbm )' is executed on the remote machine.
+        <li>shellmachines - <b>passwd</b> and <b>shadow</b> are copied to the remote machine as <b>/etc/passwd.new</b> and <b>/etc/shadow.new</b> and then moved to <b>/etc/passwd</b> and <b>/etc/shadow</b> if no errors occur.
+        <li>bsdshellmachines - <b>passwd</b> and <b>master.passwd</b> are copied to the remote machine as <b>/etc/passwd.new</b> and <b>/etc/master.passwd.new</b> and moved to <b>/etc/passwd</b> and <b>/etc/master.passwd</b> if no errors occur.
+        <li>nismachines - <b>passwd</b> and <b>shadow</b> are copied to the <b>/etc/global</b> directory on the remote machine.  If no errors occur, the command <b>( cd /var/yp; make; )</b> is executed on the remote machine.
+        <li>erpcdmachines - <b>acp_passwd</b> and <b>acp_dialup</b> are copied to the <b>/usr/annex</b> directory on the remote machine.  If no errors occur, the command <b>( kill -USR1 `cat /usr/annex/erpcd.pid` )</b> is executed on the remote machine. 
+        <li>radiusmachines - <b>users</b> is copied to the <b>/etc/raddb</b> directory on the remote machine.  If no errors occur, the command <b>( builddbm )</b> is executed on the remote machine.
       </ul>
     <li>site_perl/svc_acct.pm - If a shellmachine is defined, users can be created, modified and deleted remotely; see below.
       <ul>
-        <li>The command `useradd -d <i>homedir</i> -s <i>shell</i> -u <i>uid</i> <i>username</i>' is executed when a user is added.
-        <li>The command `userdel <i>username</i>' is executed with a user is deleted.
-        <li>If a user's home directory changes, the command `[ -d <i>old_homedir</i> &amp;&amp; ( chmod u+t <i>old_homedir</i>; umask 022; mkdir <i>new_homedir</i>; cd <i>old_homedir</i>; find . -depth -print | cpio -pdm <i>new_homedir</i>; chmod u-t <i>new_homedir</i>; chown -R <i>uid</i>.<i>gid</i> <i>new_homedir</i>; rm -rf <i>old_homedir</i> )' is executed.
+        <li>The command <b>useradd -d <i>homedir</i> -s <i>shell</i> -u <i>uid</i> <i>username</i></b> is executed when a user is added.
+        <li>The command <b>userdel <i>username</i></b> is executed with a user is deleted.
+        <li>If a user's home directory changes, the command <b>[ -d <i>old_homedir</i> &amp;&amp; ( chmod u+t <i>old_homedir</i>; umask 022; mkdir <i>new_homedir</i>; cd <i>old_homedir</i>; find . -depth -print | cpio -pdm <i>new_homedir</i>; chmod u-t <i>new_homedir</i>; chown -R <i>uid</i>.<i>gid</i> <i>new_homedir</i>; rm -rf <i>old_homedir</i> )</b> is executed.
       </ul>
-    <li>bin/svc_acct_sm.export will create <a href="http://www.qmail.org">Qmail</a> `rcpthosts', `recipientmap' and `virtualdomains' files and <a href="http://www.sendmail.org">Sendmail</a> `virtusertable' and `sendmail.cw' files in the `/var/spool/freeside/export' directory.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattemded; see below.
+    <li>bin/svc_acct_sm.export will create <a href="http://www.qmail.org">Qmail</a> <b>rcpthosts</b>, <b>recipientmap</b> and <b>virtualdomains</b> files and <a href="http://www.sendmail.org">Sendmail</a> <b>virtusertable</b> and <b>sendmail.cw</b> files in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattemded; see below.
       <ul>
-        <li>qmailmachines - recipientmap, virtualdomains and rcpthosts are copied to the `/var/qmail/control' directory on the remote machine.  Note: If you <a href="legacy.html#svc_acct_sm">imported</a> qmail configuration files, run the generated `/var/spool/freeside/export/virtualdomains.FIX' on a machine with your user home directories before exporting qmail configuration files.
-        <li>shellmachine - The command `[ -e <i>homedir</i>/.qmail-default ] || { touch <i>homedir</i>/.qmail-default; chown <i>uid</i>.<i>gid</i> <i>homedir</i>/.qmail-default; }' will be run on this machine for users in the virtualdomains file.
-        <li>sendmailmachines - sendmail.cw and virtusertable are copied to the remote machine as /etc/sendmail.cw.new and /etc/virtusertable.new and moved to /etc/sendmail.cw and /etc/virtusertable if no errors occur.
+        <li>qmailmachines - <b>recipientmap</b>, <b>virtualdomains</b> and <b>rcpthosts</b> are copied to the <b>/var/qmail/control</b> directory on the remote machine.  Note: If you <a href="legacy.html#svc_acct_sm">imported</a> qmail configuration files, run the generated <b>/usr/local/etc/freeside/export.<i>datasrc</i>/virtualdomains.FIX</b> on a machine with your user home directories before exporting qmail configuration files.
+        <li>shellmachine - The command <b>[ -e <i>homedir</i>/.qmail-default ] || { touch <i>homedir</i>/.qmail-default; chown <i>uid</i>.<i>gid</i> <i>homedir</i>/.qmail-default; }</b> will be run on this machine for users in the virtualdomains file.
+        <li>sendmailmachines - <b>sendmail.cw</b> and <b>virtusertable</b> are copied to the remote machine as <b>/etc/sendmail.cw.new</b> and <b>/etc/virtusertable.new</b> and moved to <b>/etc/sendmail.cw</b> and <b>/etc/virtusertable</b> if no errors occur.
       </ul>
-    <li>site_perl/svc_acct_sm.pm - If the qmailmachines configuration file exists and a shellmachine is defined, user `.qmail-' files can be updated.
+    <li>site_perl/svc_acct_sm.pm - If the qmailmachines configuration file exists and a shellmachine is defined, user <b>.qmail-</b> files can be updated.
       <ul>
-        <li>The command `[ -e <i>homedir</i>/.qmail-<i>domain</i>-default ] || { touch <i>homedir</i>/.qmail-<i>domain</i>-default; chown <i>uid</i>.<i>gid</i> <i>homedir</i>/.qmail-<i>domain</i>-default; }' is run.
+        <li>The command <b>[ -e <i>homedir</i>/.qmail-<i>domain</i>-default ] || { touch <i>homedir</i>/.qmail-<i>domain</i>-default; chown <i>uid</i>.<i>gid</i> <i>homedir</i>/.qmail-<i>domain</i>-default; }</b> is run.
       </ul>
   </ul>
   <br><a name=ssh>Unattended remote login</a> - Freeside can login to remote machines unattended using SSH.  This can pose a security risk if not configured correctly, and will allow an intruder who breaks into your freeside machine full access to your remote machines.  <b>Do not use this feature unless you understand what you are doing!</b>
-- 
cgit v1.2.1


From 1b285551148a65b55f0904ef992a738dc6ae8383 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Dec 1998 05:19:15 +0000
Subject: use FS::Conf

---
 htdocs/edit/svc_acct.cgi    | 12 +++++-------
 htdocs/edit/svc_acct_sm.cgi | 18 ++++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/edit/svc_acct.cgi b/htdocs/edit/svc_acct.cgi
index 61d0fdc28..93af2eb73 100755
--- a/htdocs/edit/svc_acct.cgi
+++ b/htdocs/edit/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# svc_acct.cgi: Add/edit account (output form)
+# $Id: svc_acct.cgi,v 1.2 1998-12-16 05:17:28 ivan Exp $
 #
 # Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -18,17 +18,15 @@
 # use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
 
 use strict;
+use vars qw($conf);
 use CGI::Base qw(:DEFAULT :CGI);
 use FS::UID qw(cgisuidsetup getotaker);
 use FS::Record qw(qsearch qsearchs);
 use FS::svc_acct qw(fields);
+use FS::Conf;
 
-my($shells)="/var/spool/freeside/conf/shells";
-open(SHELLS,$shells) or die "Can't open $shells: $!";
-my(@shells)=map {
-  /^([\/\w]*)$/ or die "Illegal shell in conf/shells!";
-  $1;
-} grep $_ !~ /^#/, <SHELLS>;
+$conf = new FS::Conf;
+my @shells = $conf->config('shells');
 
 my($cgi) = new CGI::Base;
 $cgi->get;
diff --git a/htdocs/edit/svc_acct_sm.cgi b/htdocs/edit/svc_acct_sm.cgi
index 45a8eb8fc..5493215a1 100755
--- a/htdocs/edit/svc_acct_sm.cgi
+++ b/htdocs/edit/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# svc_acct_sm.cgi: Add/edit a mail alias (output form)
+# $Id: svc_acct_sm.cgi,v 1.2 1998-12-16 05:19:15 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct_sm.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -33,20 +33,22 @@
 # rewrite ivan@sisd.com 98-mar-15
 #
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-26
+#
+# $Log: svc_acct_sm.cgi,v $
+# Revision 1.2  1998-12-16 05:19:15  ivan
+# use FS::Conf
+#
 
 use strict;
+use vars qw($conf);
 use CGI::Base qw(:DEFAULT :CGI);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::svc_acct_sm qw(fields);
+use FS::Conf;
 
-my($conf_domain)="/var/spool/freeside/conf/domain";
-open(DOMAIN,$conf_domain) or die "Can't open $conf_domain: $!";
-my($mydomain)=map {
-  /^(.*)$/ or die "Illegal line in $conf_domain!"; #yes, we trust the file
-  $1
-} grep $_ !~ /^(#|$)/, <DOMAIN>;
-close DOMAIN;
+$conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
 
 my($cgi) = new CGI::Base;
 $cgi->get;
-- 
cgit v1.2.1


From 7678d3ee6ea69741060539ab79946555228a07e5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Dec 1998 05:24:30 +0000
Subject: use FS::Conf;

---
 htdocs/search/svc_acct_sm.cgi | 11 ++++-------
 htdocs/view/svc_acct.cgi      | 17 ++++++++++-------
 htdocs/view/svc_acct_sm.cgi   | 18 ++++++++++--------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/htdocs/search/svc_acct_sm.cgi b/htdocs/search/svc_acct_sm.cgi
index 3b1a4cf4e..38656ea53 100755
--- a/htdocs/search/svc_acct_sm.cgi
+++ b/htdocs/search/svc_acct_sm.cgi
@@ -19,18 +19,15 @@
 #       bmccane@maxbaud.net     98-apr-3
 
 use strict;
+use vars qw($conf);
 use CGI::Request;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
+use FS::Conf;
 
-my($conf_domain)="/var/spool/freeside/conf/domain";
-open(DOMAIN,$conf_domain) or die "Can't open $conf_domain: $!";
-my($mydomain)=map {
-  /^(.*)$/ or die "Illegal line in $conf_domain!"; #yes, we trust the file
-  $1
-} grep $_ !~ /^(#|$)/, <DOMAIN>;
-close DOMAIN;
+$conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
 
 my($req)=new CGI::Request; # create form object
 &cgisuidsetup($req->cgi);
diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi
index 7096c2fb1..e48878c42 100755
--- a/htdocs/view/svc_acct.cgi
+++ b/htdocs/view/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# View svc_acct records
+# $Id: svc_acct.cgi,v 1.2 1998-12-16 05:24:29 ivan Exp $
 #
 # Usage: svc_acct.cgi svcnum
 #        http://server.name/path/svc_acct.cgi?svcnum
@@ -33,19 +33,22 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
 #
 # displays arbitrary radius attributes ivan@sisd.com 98-aug-16
+#
+# $Log: svc_acct.cgi,v $
+# Revision 1.2  1998-12-16 05:24:29  ivan
+# use FS::Conf;
+#
 
 use strict;
+use vars qw($conf);
 use CGI::Base qw(:DEFAULT :CGI);
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs fields);
+use FS::Conf;
 
-my($conf_domain)="/var/spool/freeside/conf/domain";
-open(DOMAIN,$conf_domain) or die "Can't open $conf_domain: $!";
-my($mydomain)=map {
-  /^(.*)$/ or die "Illegal line in $conf_domain!"; #yes, we trust the file
-  $1;
-} grep $_ !~ /^(#|$)/, <DOMAIN>;
+$conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
 
 my($cgi) = new CGI::Base;
 $cgi->get;
diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi
index 42623eefd..00aa5551a 100755
--- a/htdocs/view/svc_acct_sm.cgi
+++ b/htdocs/view/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# View svc_acct_sm records
+# $Id: svc_acct_sm.cgi,v 1.2 1998-12-16 05:24:30 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi svcnum
 #        http://server.name/path/svc_acct_sm.cgi?svcnum
@@ -20,19 +20,21 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
+#
+# $Log: svc_acct_sm.cgi,v $
+# Revision 1.2  1998-12-16 05:24:30  ivan
+# use FS::Conf;
+#
 
 use strict;
+use vars qw($conf);
 use CGI::Base qw(:DEFAULT :CGI);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs);
+use FS::Conf;
 
-my($conf_domain)="/var/spool/freeside/conf/domain";
-open(DOMAIN,$conf_domain) or die "Can't open $conf_domain: $!";
-my($mydomain)=map {
-  /^(.*)$/ or die "Illegal line in $conf_domain!"; #yes, we trust the file
-  $1
-} grep $_ !~ /^(#|$)/, <DOMAIN>;
-close DOMAIN;
+$conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
 
 my($cgi) = new CGI::Base;
 $cgi->get;
-- 
cgit v1.2.1


From c0552e0f27038eb05002e224fa3c88afeadbc39f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Dec 1998 05:29:45 +0000
Subject: adminsuidsetup now need user

---
 eg/TEMPLATE_cust_main.import | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/eg/TEMPLATE_cust_main.import b/eg/TEMPLATE_cust_main.import
index 39a5785db..4ac7efdc7 100755
--- a/eg/TEMPLATE_cust_main.import
+++ b/eg/TEMPLATE_cust_main.import
@@ -2,7 +2,14 @@
 
 # Template for importing legacy customer data
 #
+# $Id: TEMPLATE_cust_main.import,v 1.2 1998-12-16 05:29:45 ivan Exp $
+#
 # ivan@sisd.com 98-aug-17 - 20
+#
+# $Log: TEMPLATE_cust_main.import,v $
+# Revision 1.2  1998-12-16 05:29:45  ivan
+# adminsuidsetup now need user
+#
 
 use strict;
 use FS::UID qw(adminsuidsetup datasrc);
@@ -11,7 +18,8 @@ use FS::cust_main;
 use FS::cust_pkg;
 use Date::Parse;
 
-adminsuidsetup;
+my $user = shift or die &usage;
+adminsuidsetup $user;
 
 # use these for the imported cust_main records (unless you have these in legacy
 # data)
@@ -187,3 +195,8 @@ while (<CLIENT>) {
 
 warn "\n$link of $line lines linked\n";
 
+# ---
+
+sub usage {
+  die "Usage:\n\n  cust_main.import user\n";
+}
-- 
cgit v1.2.1


From 9d0bb3df7e808506ee1bb758973a9fba66b6b448 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Dec 1998 05:32:50 +0000
Subject: adminsuidsetup now requires user

---
 fs_passwd/fs_passwd_server | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/fs_passwd/fs_passwd_server b/fs_passwd/fs_passwd_server
index 99e7c4351..42f930e6d 100755
--- a/fs_passwd/fs_passwd_server
+++ b/fs_passwd/fs_passwd_server
@@ -17,14 +17,14 @@ use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearchs);
 use FS::svc_acct;
 
-$SIG{CHLD} = sub { wait() };
+my $user = shift or die &usage;
+adminsuidsetup $user; 
 
-&adminsuidsetup; 
+my($shellmachine)=shift or die &usage;
 
-my($fs_passwdd)="/usr/local/sbin/fs_passwdd";
+$SIG{CHLD} = sub { wait() };
 
-my($shellmachine)=shift;
-die "Usage: fs_passwd_server shellmachine\n" unless $shellmachine;
+my($fs_passwdd)="/usr/local/sbin/fs_passwdd";
 
 while (1) {
   my($reader,$writer)=(new IO::Handle, new IO::Handle);
@@ -71,3 +71,7 @@ while (1) {
   warn "Connection to $shellmachine lost!  Reconnecting...\n";
 }
 
+sub usage {
+  die "Usage:\n\n  fs_passwd_server user shellmachine\n";
+}
+
-- 
cgit v1.2.1


From 21e5d64e7b583db49895a03ae7f485fcde3bcf88 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Dec 1998 05:38:39 +0000
Subject: *** empty log message ***

---
 TODO | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index a4e4710e0..24461b621 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.15 1998-12-02 01:23:47 ivan Exp $
+$Id: TODO,v 1.16 1998-12-16 05:38:39 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -316,6 +316,8 @@ Put the GPL notice in all files.
 
 -- 1.2 or later --
 
+integrate w/IDEA's signup server
+
 one-off package edits! : need a cust_pkgs or cust_part_pkgs or something table,
 with custnum and partpkg (like type_pkgs)
 
-- 
cgit v1.2.1


From 56b98dd1587282585a92a93dbac5781da58154f1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Dec 1998 06:05:40 +0000
Subject: add table cust_main_invoice

---
 bin/fs-setup              | 18 ++++++++++++++++--
 htdocs/docs/schema.html   |  5 +++++
 htdocs/docs/upgrade3.html |  9 ++++++++-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 19ac53377..9f8740093 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.9 1998-12-15 04:36:29 ivan Exp $
+# $Id: fs-setup,v 1.10 1998-12-16 06:05:38 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.9  1998-12-15 04:36:29  ivan
+# Revision 1.10  1998-12-16 06:05:38  ivan
+# add table cust_main_invoice
+#
+# Revision 1.9  1998/12/15 04:36:29  ivan
 # s/croak/die/; #oops
 #
 # Revision 1.8  1998/12/15 04:33:27  ivan
@@ -368,6 +371,17 @@ sub tables_hash_hack {
       'index' => [ ['last'], ],
     },
 
+    'cust_main_invoice' => {
+      'columns' => [
+        'destnum',  'int',  '',     '',
+        'custnum',  'int',  '',     '',
+        'dest',     'varchar', '',  $char_d,
+      ],
+      'primary_key' => 'destnum',
+      'unique' => [ [] ],
+      'index' => [ ['custnum'], ],
+    },
+
     'cust_main_county' => { #county+state+country are checked off the
                             #cust_main_county for validation and to provide
                             # a tax rate.
diff --git a/htdocs/docs/schema.html b/htdocs/docs/schema.html
index f7a9bc101..c561a5ab3 100644
--- a/htdocs/docs/schema.html
+++ b/htdocs/docs/schema.html
@@ -72,6 +72,11 @@
         <li>tax - tax exempt, Y or null
         <li>otaker - order taker
       </ul>
+    <li><a name="cust_main_invoice">cust_main_invoice</a> - Invoice destinations for email invoices
+      <ul>
+        <li>destnum - primary key
+        <li>custnum - <a href="#cust_main">customer</a>
+        <li>dest - Invoice destination: <a href="#svc_acct">svcnum</a> if numeric, literal email address if string
     <li><a name="cust_main_county">cust_main_county</a> - Tax rates
       <ul>
         <li>taxnum - primary key
diff --git a/htdocs/docs/upgrade3.html b/htdocs/docs/upgrade3.html
index 15066423e..87f551d26 100644
--- a/htdocs/docs/upgrade3.html
+++ b/htdocs/docs/upgrade3.html
@@ -22,9 +22,16 @@ ALTER TABLE cust_main_county ADD country char(2);
 UPDATE cust_main_county SET country = "US" where country IS NULL;
 CREATE TABLE part_title (
    titlenum int NOT NULL,
-   title varchar(80),
+   title varchar(80) NOT NULL,
    PRIMARY KEY (titlenum)
 );
+CREATE TABLE cust_main_invoice (
+   destnum int NOT NULL,
+   custnum int NOT NULL,
+   dest varchar(80) NOT NULL,
+   PRIMARY KEY (destnum),
+   INDEX ( custnum )
+);
 </pre>
   <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are r
 unning a different database engine you will need to modify it slightly.
-- 
cgit v1.2.1


From 0c9ef98c0194200190b3e2f0b8032def8bf647fc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Dec 1998 07:40:02 +0000
Subject: new table

---
 site_perl/cust_main_invoice.pm | 195 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 195 insertions(+)
 create mode 100644 site_perl/cust_main_invoice.pm

diff --git a/site_perl/cust_main_invoice.pm b/site_perl/cust_main_invoice.pm
new file mode 100644
index 000000000..67e112a75
--- /dev/null
+++ b/site_perl/cust_main_invoice.pm
@@ -0,0 +1,195 @@
+package FS::cust_main_invoice;
+
+use strict;
+use vars qw(@ISA $conf);
+use Exporter;
+use FS::Record; # qw(qsearch qsearchs);
+use FS::Conf;
+
+@ISA = qw(FS::Record);
+
+$conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
+
+=head1 NAME
+
+FS::cust_main_invoice - Object methods for cust_main_invoice records
+
+=head1 SYNOPSIS
+
+  use FS::cust_main_invoice;
+
+  $record = create FS::cust_main_invoice \%hash;
+  $record = create FS::cust_main_invoice { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_main_invoice object represents an invoice destination.  FS::cust_main_invoice inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item destnum - primary key
+
+=item custnum - customer (see L<FS::cust_main>)
+
+=item dest - Invoice destination: If numeric, a <a href="#svc_acct">svcnum</a>, if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item create HASHREF
+
+Creates a new invoice destination.  To add the invoice destination to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub create {
+  my($proto,$hashref)=@_;
+
+  $proto->new('cust_main_invoice',$hashref);
+
+}
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub insert {
+  my($self)=@_;
+
+  #local $SIG{HUP} = 'IGNORE';
+  #local $SIG{INT} = 'IGNORE';
+  #local $SIG{QUIT} = 'IGNORE';
+  #local $SIG{TERM} = 'IGNORE';
+  #local $SIG{TSTP} = 'IGNORE';
+
+  $self->check or
+  $self->add;
+}
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+sub delete {
+  my($self)=@_;
+
+  $self->del;
+}
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my($new,$old)=@_;
+  return "(Old) Not a cust_main_invoice record!" unless $old->table eq "cust_main_invoice";
+
+  return "Can't change destnum!"
+     unless $old->getfield('destnum') eq $new->getfield('destnum');
+  return "Can't change custnum!"
+     unless $old->getfield('custnum') eq $new->getfield('custnum');
+
+  $new->check or
+  $new->rep($old);
+}
+
+
+=item check
+
+Checks all fields to make sure this is a valid invoice destination.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+
+=cut
+
+sub check {
+  my($self)=@_;
+  return "Not a cust_main_invoice record!" unless $self->table eq "cust_main_invoice";
+
+  my $error = $self->ut_number('destnum')
+        or $self->ut_number('custnum')
+        or $self->ut_text('dest')
+  ;
+  return $error if $error;
+
+  return "Unknown customer"
+    unless qsearchs('cust_main',{ 'custnum' => $self->custnum });
+
+  if ( $self->dest eq 'POST' ) {
+    #contemplate our navel
+  } elsif ( $self->dest =~ /^(\d+)$/ ) {
+    return "Unknown local account (specified by svcnum)"
+      unless qsearchs('svc_acct', { 'svcnum' => $self->dest } );
+  } elsif ( $self->dest =~ /^([\w\.\-]+)\@(([\w\.\-]\.)+\w+)$/ ) {
+    my($user, $domain) = ($1, $2);
+    if ( $domain eq $mydomain ) {
+      my $svc_acct = qsearchs('svc_acct', { 'username' => $user } );
+      return "Unknown local account (specified literally)" unless $svc_acct;
+      $svc_acct->svcnum =~ /^(\d+)$/ or die "Non-numeric svcnum?!";
+      $self->dest($1);
+    }
+  } else {
+    return "Illegal destination!";
+  }
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: cust_main_invoice.pm,v 1.1 1998-12-16 07:40:02 ivan Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_main>
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jul-1
+
+added hfields
+ivan@sisd.com 97-nov-13
+
+$Log: cust_main_invoice.pm,v $
+Revision 1.1  1998-12-16 07:40:02  ivan
+new table
+
+Revision 1.3  1998/11/15 04:33:00  ivan
+updates for newest versoin
+
+Revision 1.2  1998/11/15 03:48:49  ivan
+update for current version
+
+
+=cut
+
+1;
+
-- 
cgit v1.2.1


From 819a983adc011bdc6eb2f3aaabd4ef1da1d4a8d8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Dec 1998 09:58:53 +0000
Subject: library support for editing email invoice destinations (not in sub
 collect yet)

---
 site_perl/cust_main.pm         | 66 ++++++++++++++++++++++++++++++++++++++++--
 site_perl/cust_main_invoice.pm | 34 ++++++++++++++++++----
 2 files changed, 93 insertions(+), 7 deletions(-)

diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index 57e76ba42..6c9c0b109 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -24,6 +24,7 @@ use FS::cust_pay_batch;
 use FS::part_referral;
 use FS::cust_main_county;
 use FS::agent;
+use FS::cust_main_invoice;
 
 @ISA = qw(FS::Record Exporter);
 @EXPORT_OK = qw(hfields);
@@ -824,6 +825,63 @@ sub balance {
   sprintf("%.2f",$self->total_owed - $self->total_credited);
 }
 
+=item invoicing_list [ ITEM, ITEM, ... ]
+
+If arguements are given, sets these email addresses as invoice recipients
+(see L<FS::cust_main_invoice>).  Errors are not fatal and are not reported
+(except as warnings), so use check_invoicing_list first.
+
+Returns a list of email addresses (with svcnum entries expanded).
+
+=cut
+
+sub invoicing_list {
+  my($self, @addresses) = @_;
+  if ( @addresses ) {
+    my @cust_main_invoice = 
+      qsearch('cust_main_invoice', { 'custnum' => $self->custnum } );
+    foreach my $cust_main_invoice ( @cust_main_invoice ) {
+      unless ( grep { $cust_main_invoice->address eq $_ } @addresses ) {
+        $cust_main_invoice->delete;
+      }
+    }
+    @cust_main_invoice =
+      qsearch('cust_main_invoice', { 'custnum' => $self->custnum } );
+    foreach my $address ( @addresses ) {
+      unless ( grep { $address eq $_->address } @cust_main_invoice ) {
+        my $cust_main_invoice = create FS::cust_main_invoice (
+          'custnum' => $self->custnum,
+          'dest'    => $address,
+        );
+        my $error = $cust_main_invoice->insert;
+        warn $error if $error;
+      } 
+    }
+  }
+  map { $_->address }
+    qsearch('cust_main_invoice', { 'custnum' => $self->custnum } );
+}
+
+=item check_invoicing_list ITEM, ITEM
+
+Checks these arguements as valid input for the invoicing_list method.  If there
+is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub check_invoicing_list {
+  my($self, @addresses) = @_;
+  foreach my $address ( @addresses ) {
+    my $cust_main_invoice = create FS::cust_main_invoice (
+      'custnum' => $self->custnum,
+      'dest'    => $address,
+    );
+    my $error = $cust_main_invoice->check;
+    return $error if $error;
+  }
+  '';
+}
+
 =back
 
 =head1 BUGS
@@ -843,7 +901,8 @@ CyberCash v2 forces us to define some variables in package main.
 
 L<FS::Record>, L<FS::cust_pkg>, L<FS::cust_bill>, L<FS::cust_credit>
 L<FS::cust_pay_batch>, L<FS::agent>, L<FS::part_referral>,
-L<FS::cust_main_county>, L<FS::UID>, schema.html from the base documentation.
+L<FS::cust_main_county>, L<FS::cust_main_invoice>,
+L<FS::UID>, schema.html from the base documentation.
 
 =head1 HISTORY
 
@@ -876,7 +935,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.6  1998-11-18 09:01:42  ivan
+Revision 1.7  1998-12-16 09:58:52  ivan
+library support for editing email invoice destinations (not in sub collect yet)
+
+Revision 1.6  1998/11/18 09:01:42  ivan
 i18n! i18n!
 
 Revision 1.5  1998/11/15 11:23:14  ivan
diff --git a/site_perl/cust_main_invoice.pm b/site_perl/cust_main_invoice.pm
index 67e112a75..90d653a4a 100644
--- a/site_perl/cust_main_invoice.pm
+++ b/site_perl/cust_main_invoice.pm
@@ -1,15 +1,18 @@
 package FS::cust_main_invoice;
 
 use strict;
-use vars qw(@ISA $conf);
+use vars qw(@ISA $conf $mydomain);
 use Exporter;
 use FS::Record; # qw(qsearch qsearchs);
 use FS::Conf;
 
 @ISA = qw(FS::Record);
 
-$conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::cust_main_invoice'} = sub { 
+  $conf = new FS::Conf;
+  $mydomain = $conf->config('domain');
+};
 
 =head1 NAME
 
@@ -30,6 +33,8 @@ FS::cust_main_invoice - Object methods for cust_main_invoice records
 
   $error = $record->check;
 
+  $email_address = $record->address;
+
 =head1 DESCRIPTION
 
 An FS::cust_main_invoice object represents an invoice destination.  FS::cust_main_invoice inherits from
@@ -159,11 +164,27 @@ sub check {
   ''; #no error
 }
 
+=item address
+
+Returns the literal email address for this record (or `POST').
+
+=cut
+
+sub address {
+  my $self = shift;
+  if ( $self->dest =~ /(\d+)$/ ) {
+    my $svc_acct = qsearchs('svc_acct', { 'svcnum' => $1 } );
+    $svc_acct->username . '@' . $mydomain;
+  } else {
+    $self->dest;
+  }
+}
+
 =back
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.1 1998-12-16 07:40:02 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.2 1998-12-16 09:58:53 ivan Exp $
 
 =head1 BUGS
 
@@ -179,7 +200,10 @@ added hfields
 ivan@sisd.com 97-nov-13
 
 $Log: cust_main_invoice.pm,v $
-Revision 1.1  1998-12-16 07:40:02  ivan
+Revision 1.2  1998-12-16 09:58:53  ivan
+library support for editing email invoice destinations (not in sub collect yet)
+
+Revision 1.1  1998/12/16 07:40:02  ivan
 new table
 
 Revision 1.3  1998/11/15 04:33:00  ivan
-- 
cgit v1.2.1


From d8a27601d0ef74bd05c2355361ed5b7766f15208 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Dec 1998 04:26:04 +0000
Subject: use CGI; no relative URLs

---
 htdocs/browse/part_referral.cgi | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/htdocs/browse/part_referral.cgi b/htdocs/browse/part_referral.cgi
index b16fa896d..5472a6e66 100755
--- a/htdocs/browse/part_referral.cgi
+++ b/htdocs/browse/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# part_referral.cgi: Browse part_referral
+# $Id: part_referral.cgi,v 1.2 1998-12-17 04:26:04 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23 
 #
@@ -8,47 +8,53 @@
 #	bmccane@maxbaud.net	98-apr-3
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: part_referral.cgi,v $
+# Revision 1.2  1998-12-17 04:26:04  ivan
+# use CGI; no relative URLs
+#
 
 use strict;
-use CGI::Base;
+use CGI;
 use FS::UID qw(cgisuidsetup swapuid);
 use FS::Record qw(qsearch);
-use FS::CGI qw(header menubar);
+use FS::CGI qw(header menubar popurl table);
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my $cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
 SendHeaders(); # one guess.
 print header("Referral Listing", menubar(
-  'Main Menu' => '../',
-  'Add new referral' => "../edit/part_referral.cgi",
-)), <<END;
-    <BR>Click on referral number to edit.
-    <TABLE BORDER>
+  'Main Menu' => popurl(2),
+#  'Add new referral' => "../edit/part_referral.cgi",
+)), table, <<END;
       <TR>
-        <TH><FONT SIZE=-1>Referral #</FONT></TH>
-        <TH>Referral</TH>
+        <TH COLSPAN=2>Referral</TH>
       </TR>
 END
 
 my($part_referral);
+my($p)=popurl(2);
 foreach $part_referral ( sort { 
   $a->getfield('refnum') <=> $b->getfield('refnum')
 } qsearch('part_referral',{}) ) {
   my($hashref)=$part_referral->hashref;
   print <<END;
       <TR>
-        <TD><A HREF="../edit/part_referral.cgi?$hashref->{refnum}">
+        <TD><A HREF="$p/edit/part_referral.cgi?$hashref->{refnum}">
           $hashref->{refnum}</A></TD>
-        <TD>$hashref->{referral}</TD>
+        <TD><A HREF="$p/edit/part_referral.cgi?$hashref->{refnum}">
+          $hashref->{referral}</A></TD>
       </TR>
 END
 
 }
 
 print <<END;
+      <TR>
+        <TD COLSPAN=2><A HREF="$p/edit/part_referral.cgi"><I>Add new referral</I></A></TD>
+      </TR>
     </TABLE>
     </CENTER>
   </BODY>
-- 
cgit v1.2.1


From 3a1b78381a08cbcd5b0e5ba58046082fd4d78811 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Dec 1998 04:31:36 +0000
Subject: use CGI::Carp

---
 htdocs/browse/part_referral.cgi | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/browse/part_referral.cgi b/htdocs/browse/part_referral.cgi
index 5472a6e66..51f213135 100755
--- a/htdocs/browse/part_referral.cgi
+++ b/htdocs/browse/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_referral.cgi,v 1.2 1998-12-17 04:26:04 ivan Exp $
+# $Id: part_referral.cgi,v 1.3 1998-12-17 04:31:36 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23 
 #
@@ -10,12 +10,16 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_referral.cgi,v $
-# Revision 1.2  1998-12-17 04:26:04  ivan
+# Revision 1.3  1998-12-17 04:31:36  ivan
+# use CGI::Carp
+#
+# Revision 1.2  1998/12/17 04:26:04  ivan
 # use CGI; no relative URLs
 #
 
 use strict;
 use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup swapuid);
 use FS::Record qw(qsearch);
 use FS::CGI qw(header menubar popurl table);
-- 
cgit v1.2.1


From 9870a7af8859d7e7b8c562a96a193e5992688885 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Dec 1998 04:32:55 +0000
Subject: print $cgi->header

---
 htdocs/browse/part_referral.cgi | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/browse/part_referral.cgi b/htdocs/browse/part_referral.cgi
index 51f213135..3357ec841 100755
--- a/htdocs/browse/part_referral.cgi
+++ b/htdocs/browse/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_referral.cgi,v 1.3 1998-12-17 04:31:36 ivan Exp $
+# $Id: part_referral.cgi,v 1.4 1998-12-17 04:32:55 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23 
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_referral.cgi,v $
-# Revision 1.3  1998-12-17 04:31:36  ivan
+# Revision 1.4  1998-12-17 04:32:55  ivan
+# print $cgi->header
+#
+# Revision 1.3  1998/12/17 04:31:36  ivan
 # use CGI::Carp
 #
 # Revision 1.2  1998/12/17 04:26:04  ivan
@@ -28,8 +31,7 @@ my $cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
-print header("Referral Listing", menubar(
+print $cgi->header, header("Referral Listing", menubar(
   'Main Menu' => popurl(2),
 #  'Add new referral' => "../edit/part_referral.cgi",
 )), table, <<END;
-- 
cgit v1.2.1


From f1073fbef03471ec5ad4ed76347a4368cb0be586 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Dec 1998 04:36:59 +0000
Subject: use CGI;, use CGI::Carp, visual changes, relative URLs

---
 htdocs/browse/svc_acct_pop.cgi | 45 +++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/htdocs/browse/svc_acct_pop.cgi b/htdocs/browse/svc_acct_pop.cgi
index a8a3a9224..f7627c1ef 100755
--- a/htdocs/browse/svc_acct_pop.cgi
+++ b/htdocs/browse/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# svc_acct_pop.cgi: browse pops 
+# $Id: svc_acct_pop.cgi,v 1.2 1998-12-17 04:36:59 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8
 #
@@ -8,27 +8,28 @@
 #	bmccane@maxbaud.net	98-apr-3
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: svc_acct_pop.cgi,v $
+# Revision 1.2  1998-12-17 04:36:59  ivan
+# use CGI;, use CGI::Carp, visual changes, relative URLs
+#
 
 use strict;
-use CGI::Base;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup swapuid);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar);
+use FS::CGI qw(header menubar table popurl);
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
-print header('POP Listing', menubar(
-  'Main Menu' => '../',
-  'Add new POP' => "../edit/svc_acct_pop.cgi",
-)), <<END;
-    <BR>Click on pop number to edit.
-    <TABLE BORDER>
+print $cgi->header, header('POP Listing', menubar(
+  'Main Menu' => popurl(2),
+)), table, <<END;
       <TR>
-        <TH><FONT SIZE=-1>POP #</FONT></TH>
+        <TH></TH>
         <TH>City</TH>
         <TH>State</TH>
         <TH>Area code</TH>
@@ -37,24 +38,32 @@ print header('POP Listing', menubar(
 END
 
 my($svc_acct_pop);
+my($p)=popurl(2);
 foreach $svc_acct_pop ( sort { 
   $a->getfield('popnum') <=> $b->getfield('popnum')
 } qsearch('svc_acct_pop',{}) ) {
   my($hashref)=$svc_acct_pop->hashref;
   print <<END;
       <TR>
-        <TD><A HREF="../edit/svc_acct_pop.cgi?$hashref->{popnum}">
+        <TD><A HREF="$p/edit/svc_acct_pop.cgi?$hashref->{popnum}">
           $hashref->{popnum}</A></TD>
-        <TD>$hashref->{city}</TD>
-        <TD>$hashref->{state}</TD>
-        <TD>$hashref->{ac}</TD>
-        <TD>$hashref->{exch}</TD>
+        <TD><A HREF="$p/edit/svc_acct_pop.cgi?$hashref->{popnum}">
+          $hashref->{city}</A></TD>
+        <TD><A HREF="$p/edit/svc_acct_pop.cgi?$hashref->{popnum}">
+          $hashref->{state}</A></TD>
+        <TD><A HREF="$p/edit/svc_acct_pop.cgi?$hashref->{popnum}">
+          $hashref->{ac}</A></TD>
+        <TD><A HREF="$p/edit/svc_acct_pop.cgi?$hashref->{popnum}">
+          $hashref->{exch}</A></TD>
       </TR>
 END
 
 }
 
 print <<END;
+      <TR>
+        <TD COLSPAN=5><A HREF="$p/edit/svc_acct_pop.cgi"><I>Add new POP</I></A></TD>
+      </TR>
     </TABLE>
     </CENTER>
   </BODY>
-- 
cgit v1.2.1


From e3396e918b215523ed715c2287e78d6c660a1754 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Dec 1998 04:47:41 +0000
Subject: switch to new logo, no reason to take up space

---
 htdocs/images/sisd.jpg | Bin 22122 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100755 htdocs/images/sisd.jpg

diff --git a/htdocs/images/sisd.jpg b/htdocs/images/sisd.jpg
deleted file mode 100755
index 908a5eaff..000000000
Binary files a/htdocs/images/sisd.jpg and /dev/null differ
-- 
cgit v1.2.1


From d1407e95ff695055c3609eeee7599b32f3b54c54 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Dec 1998 04:54:17 +0000
Subject: *** empty log message ***

---
 htdocs/docs/schema.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/schema.html b/htdocs/docs/schema.html
index c561a5ab3..6f4d99937 100644
--- a/htdocs/docs/schema.html
+++ b/htdocs/docs/schema.html
@@ -76,7 +76,7 @@
       <ul>
         <li>destnum - primary key
         <li>custnum - <a href="#cust_main">customer</a>
-        <li>dest - Invoice destination: <a href="#svc_acct">svcnum</a> if numeric, literal email address if string
+        <li>dest - Invoice destination: If numeric, a <a href="#svc_acct">svcnum</a>, if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)
     <li><a name="cust_main_county">cust_main_county</a> - Tax rates
       <ul>
         <li>taxnum - primary key
-- 
cgit v1.2.1


From 19a2ec12e14b0fba549e6b31a1fd92eedcc5c350 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Dec 1998 05:25:22 +0000
Subject: fix visual and other bugs

---
 htdocs/browse/agent.cgi            | 24 ++++++++++++++----------
 htdocs/browse/agent_type.cgi       | 15 +++++++++------
 htdocs/browse/cust_main_county.cgi | 17 +++++++++++------
 htdocs/browse/part_pkg.cgi         | 20 ++++++++++++--------
 htdocs/browse/part_referral.cgi    | 21 +++++++++++++--------
 htdocs/browse/part_svc.cgi         | 18 +++++++++++-------
 htdocs/browse/svc_acct_pop.cgi     | 27 ++++++++++++++++-----------
 7 files changed, 86 insertions(+), 56 deletions(-)

diff --git a/htdocs/browse/agent.cgi b/htdocs/browse/agent.cgi
index 6e5e09fb7..1241ced03 100755
--- a/htdocs/browse/agent.cgi
+++ b/htdocs/browse/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.6 1998-11-23 05:29:46 ivan Exp $
+# $Id: agent.cgi,v 1.7 1998-12-17 05:25:16 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -15,7 +15,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent.cgi,v $
-# Revision 1.6  1998-11-23 05:29:46  ivan
+# Revision 1.7  1998-12-17 05:25:16  ivan
+# fix visual and other bugs
+#
+# Revision 1.6  1998/11/23 05:29:46  ivan
 # use CGI::Carp
 #
 # Revision 1.5  1998/11/23 05:27:31  ivan
@@ -44,9 +47,11 @@ my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
+my($p)=popurl(2);
+
 print $cgi->header, header('Agent Listing', menubar(
-  'Main Menu'   => popurl(2),
-  'Agent Types' => 'agent_type.cgi',
+  'Main Menu'   => $p,
+  'Agent Types' => $p. 'browse/agent_type.cgi',
 #  'Add new agent' => '../edit/agent.cgi'
 )), <<END;
 Agents are resellers of your service. Agents may be limited to a subset of your
@@ -64,7 +69,6 @@ END
 #        <TH>Agent</TH>
 
 my($agent);
-my($p)=popurl(2);
 foreach $agent ( sort { 
   $a->getfield('agentnum') <=> $b->getfield('agentnum')
 } qsearch('agent',{}) ) {
@@ -74,11 +78,11 @@ foreach $agent ( sort {
   my($atype)=$agent_type->getfield('atype');
   print <<END;
       <TR>
-        <TD><A HREF="$p/edit/agent.cgi?$hashref->{agentnum}">
+        <TD><A HREF="${p}edit/agent.cgi?$hashref->{agentnum}">
           $hashref->{agentnum}</A></TD>
-        <TD><A HREF="$p/edit/agent.cgi?$hashref->{agentnum}">
+        <TD><A HREF="${p}edit/agent.cgi?$hashref->{agentnum}">
           $hashref->{agent}</A></TD>
-        <TD><A HREF="$p/edit/agent_type.cgi?$typenum">$atype</A></TD>
+        <TD><A HREF="${p}edit/agent_type.cgi?$typenum">$atype</A></TD>
         <TD>$hashref->{freq}</TD>
         <TD>$hashref->{prog}</TD>
       </TR>
@@ -88,8 +92,8 @@ END
 
 print <<END;
       <TR>
-        <TD COLSPAN=2><A HREF="$p/edit/agent.cgi"><I>Add new agent</I></A></TD>
-        <TD><A HREF="$p/edit/agent_type.cgi"><I>Add new agent type</I></A></TD>
+        <TD COLSPAN=2><A HREF="${p}edit/agent.cgi"><I>Add new agent</I></A></TD>
+        <TD><A HREF="${p}edit/agent_type.cgi"><I>Add new agent type</I></A></TD>
       </TR>
     </TABLE>
 
diff --git a/htdocs/browse/agent_type.cgi b/htdocs/browse/agent_type.cgi
index cb6ee8d16..a1fa3b28e 100755
--- a/htdocs/browse/agent_type.cgi
+++ b/htdocs/browse/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.2 1998-11-21 07:39:52 ivan Exp $
+# $Id: agent_type.cgi,v 1.3 1998-12-17 05:25:17 ivan Exp $
 #
 # ivan@sisd.com 97-dec-10
 #
@@ -11,7 +11,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.2  1998-11-21 07:39:52  ivan
+# Revision 1.3  1998-12-17 05:25:17  ivan
+# fix visual and other bugs
+#
+# Revision 1.2  1998/11/21 07:39:52  ivan
 # visual
 #
 
@@ -50,10 +53,10 @@ foreach $agent_type ( sort {
   $rowspan = int($rowspan/2+0.5) ;
   print <<END;
       <TR>
-        <TD ROWSPAN=$rowspan><A HREF="$p/edit/agent_type.cgi?$hashref->{typenum}">
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/agent_type.cgi?$hashref->{typenum}">
           $hashref->{typenum}
         </A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$p/edit/agent_type.cgi?$hashref->{typenum}">$hashref->{atype}</A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="${p}/edit/agent_type.cgi?$hashref->{typenum}">$hashref->{atype}</A></TD>
 END
 
   my($type_pkgs);
@@ -63,7 +66,7 @@ END
     my($part_pkg) = qsearchs('part_pkg',{'pkgpart'=> $pkgpart });
     print qq!<TR>! if ($tdcount == 0) ;
     $tdcount = 0 if ($tdcount == -1) ;
-    print qq!<TD><A HREF="$p/edit/part_pkg.cgi?$pkgpart">!,
+    print qq!<TD><A HREF="${p}edit/part_pkg.cgi?$pkgpart">!,
           $part_pkg->getfield('pkg'),"</A></TD>";
     $tdcount ++ ;
     if ($tdcount == 2)
@@ -77,7 +80,7 @@ END
 }
 
 print <<END;
-  <TR><TD COLSPAN=2><I><A HREF="$p/edit/agent_type.cgi">Add new agent type</A></I></TD></TR>
+  <TR><TD COLSPAN=2><I><A HREF="${p}edit/agent_type.cgi">Add new agent type</A></I></TD></TR>
     </TABLE>
   </BODY>
 </HTML>
diff --git a/htdocs/browse/cust_main_county.cgi b/htdocs/browse/cust_main_county.cgi
index 4defa574d..fc0935515 100755
--- a/htdocs/browse/cust_main_county.cgi
+++ b/htdocs/browse/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.2 1998-11-18 09:01:34 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.3 1998-12-17 05:25:18 ivan Exp $
 #
 # ivan@sisd.com 97-dec-13
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county.cgi,v $
-# Revision 1.2  1998-11-18 09:01:34  ivan
+# Revision 1.3  1998-12-17 05:25:18  ivan
+# fix visual and other bugs
+#
+# Revision 1.2  1998/11/18 09:01:34  ivan
 # i18n! i18n!
 #
 
@@ -26,9 +29,11 @@ my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
+my($p) = popurl(2);
+
 print $cgi->header, header("Tax Rate Listing", menubar(
-  'Main Menu' => popurl(2),
-  'Edit tax rates' => popurl(2). "/edit/cust_main_county.cgi",
+  'Main Menu' => $p,
+  'Edit tax rates' => $p. "edit/cust_main_county.cgi",
 )),<<END;
     Click on <u>expand country</u> to specify a country's tax rates by state.
     <BR>Click on <u>expand state</u> to specify a state's tax rates by county.
@@ -53,7 +58,7 @@ END
   print "<TD>", $hashref->{state}
       ? $hashref->{state}
       : qq!(ALL) <FONT SIZE=-1>!.
-        qq!<A HREF="!. popurl(2). qq!/edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
+        qq!<A HREF="${p}edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
         qq!">expand country</A></FONT>!
     , "</TD>";
   print "<TD>";
@@ -63,7 +68,7 @@ END
     print "(ALL)";
     if ( $hashref->{state} ) {
       print qq!<FONT SIZE=-1>!.
-          qq!<A HREF="!. popurl(2). qq!/edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
+          qq!<A HREF="${p}edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
           qq!">expand state</A></FONT>!;
     }
   }
diff --git a/htdocs/browse/part_pkg.cgi b/htdocs/browse/part_pkg.cgi
index 1a7b2cb48..5d4aaa11f 100755
--- a/htdocs/browse/part_pkg.cgi
+++ b/htdocs/browse/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.3 1998-11-21 07:23:45 ivan Exp $
+# $Id: part_pkg.cgi,v 1.4 1998-12-17 05:25:19 ivan Exp $
 #
 # ivan@sisd.com 97-dec-5,9
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.3  1998-11-21 07:23:45  ivan
+# Revision 1.4  1998-12-17 05:25:19  ivan
+# fix visual and other bugs
+#
+# Revision 1.3  1998/11/21 07:23:45  ivan
 # visual
 #
 # Revision 1.2  1998/11/21 07:00:32  ivan
@@ -31,8 +34,10 @@ my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
+my $p = popurl(2);
+
 print $cgi->header, header("Package Part Listing",menubar(
-  'Main Menu' => popurl(2),
+  'Main Menu' => $p,
 )), "One or more services are grouped together into a package and given",
   " pricing information. Customers purchase packages, not services.<BR><BR>", 
   table, <<END;
@@ -49,7 +54,6 @@ print $cgi->header, header("Package Part Listing",menubar(
 END
 
 my($part_pkg);
-my($p)=popurl(2);
 foreach $part_pkg ( sort { 
   $a->getfield('pkgpart') <=> $b->getfield('pkgpart')
 } qsearch('part_pkg',{}) ) {
@@ -59,10 +63,10 @@ foreach $part_pkg ( sort {
   my($rowspan)=scalar(@pkg_svc);
   print <<END;
       <TR>
-        <TD ROWSPAN=$rowspan><A HREF="$p/edit/part_pkg.cgi?$hashref->{pkgpart}">
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">
           $hashref->{pkgpart}
         </A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$p/edit/part_pkg.cgi?$hashref->{pkgpart}">$hashref->{pkg}</A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">$hashref->{pkg}</A></TD>
         <TD ROWSPAN=$rowspan>$hashref->{comment}</TD>
         <TD ROWSPAN=$rowspan>$hashref->{setup}</TD>
         <TD ROWSPAN=$rowspan>$hashref->{freq}</TD>
@@ -74,7 +78,7 @@ END
   foreach $pkg_svc ( @pkg_svc ) {
     my($svcpart)=$pkg_svc->getfield('svcpart');
     my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart });
-    print $n,qq!<TD><A HREF="$p/edit/part_svc.cgi?$svcpart">!,
+    print $n,qq!<TD><A HREF="${p}edit/part_svc.cgi?$svcpart">!,
           $part_svc->getfield('svc'),"</A></TD><TD>",
           $pkg_svc->getfield('quantity'),"</TD></TR>\n";
     $n="<TR>";
@@ -84,7 +88,7 @@ END
 }
 
 print <<END;
-   <TR><TD COLSPAN=2><I><A HREF="$p/edit/part_pkg.cgi">Add new package</A></I></TD></TR>
+   <TR><TD COLSPAN=2><I><A HREF="${p}edit/part_pkg.cgi">Add new package</A></I></TD></TR>
     </TABLE>
   </BODY>
 </HTML>
diff --git a/htdocs/browse/part_referral.cgi b/htdocs/browse/part_referral.cgi
index 3357ec841..b08efdbbc 100755
--- a/htdocs/browse/part_referral.cgi
+++ b/htdocs/browse/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_referral.cgi,v 1.4 1998-12-17 04:32:55 ivan Exp $
+# $Id: part_referral.cgi,v 1.5 1998-12-17 05:25:20 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23 
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_referral.cgi,v $
-# Revision 1.4  1998-12-17 04:32:55  ivan
+# Revision 1.5  1998-12-17 05:25:20  ivan
+# fix visual and other bugs
+#
+# Revision 1.4  1998/12/17 04:32:55  ivan
 # print $cgi->header
 #
 # Revision 1.3  1998/12/17 04:31:36  ivan
@@ -26,31 +29,33 @@ use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup swapuid);
 use FS::Record qw(qsearch);
 use FS::CGI qw(header menubar popurl table);
+use FS::part_referral;
 
 my $cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
+my $p = popurl(2);
+
 print $cgi->header, header("Referral Listing", menubar(
-  'Main Menu' => popurl(2),
+  'Main Menu' => $p,
 #  'Add new referral' => "../edit/part_referral.cgi",
-)), table, <<END;
+)), "Where a customer heard about your service. Tracked for informational purposes.<BR><BR>", table, <<END;
       <TR>
         <TH COLSPAN=2>Referral</TH>
       </TR>
 END
 
 my($part_referral);
-my($p)=popurl(2);
 foreach $part_referral ( sort { 
   $a->getfield('refnum') <=> $b->getfield('refnum')
 } qsearch('part_referral',{}) ) {
   my($hashref)=$part_referral->hashref;
   print <<END;
       <TR>
-        <TD><A HREF="$p/edit/part_referral.cgi?$hashref->{refnum}">
+        <TD><A HREF="${p}edit/part_referral.cgi?$hashref->{refnum}">
           $hashref->{refnum}</A></TD>
-        <TD><A HREF="$p/edit/part_referral.cgi?$hashref->{refnum}">
+        <TD><A HREF="${p}edit/part_referral.cgi?$hashref->{refnum}">
           $hashref->{referral}</A></TD>
       </TR>
 END
@@ -59,7 +64,7 @@ END
 
 print <<END;
       <TR>
-        <TD COLSPAN=2><A HREF="$p/edit/part_referral.cgi"><I>Add new referral</I></A></TD>
+        <TD COLSPAN=2><A HREF="${p}edit/part_referral.cgi"><I>Add new referral</I></A></TD>
       </TR>
     </TABLE>
     </CENTER>
diff --git a/htdocs/browse/part_svc.cgi b/htdocs/browse/part_svc.cgi
index c9f0d3da1..983849f69 100755
--- a/htdocs/browse/part_svc.cgi
+++ b/htdocs/browse/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.4 1998-11-21 02:26:22 ivan Exp $
+# $Id: part_svc.cgi,v 1.5 1998-12-17 05:25:21 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14, 97-dec-9
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.4  1998-11-21 02:26:22  ivan
+# Revision 1.5  1998-12-17 05:25:21  ivan
+# fix visual and other bugs
+#
+# Revision 1.4  1998/11/21 02:26:22  ivan
 # visual
 #
 # Revision 1.3  1998/11/20 23:10:57  ivan
@@ -32,8 +35,10 @@ my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
+my $p = popurl(2);
+
 print $cgi->header, header('Service Part Listing', menubar(
-  'Main Menu' => popurl(2),
+  'Main Menu' => $p,
 )),<<END;
     Services are items you offer to your customers.<BR><BR>
 END
@@ -47,7 +52,6 @@ print table, <<END;
 END
 
 my($part_svc);
-my($p)=popurl(2);
 foreach $part_svc ( sort {
   $a->getfield('svcpart') <=> $b->getfield('svcpart')
 } qsearch('part_svc',{}) ) {
@@ -63,9 +67,9 @@ foreach $part_svc ( sort {
   my($rowspan)=scalar(@rows) || 1;
   print <<END;
       <TR>
-        <TD ROWSPAN=$rowspan><A HREF="$p/edit/part_svc.cgi?$hashref->{svcpart}">
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_svc.cgi?$hashref->{svcpart}">
           $hashref->{svcpart}</A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$p/edit/part_svc.cgi?$hashref->{svcpart}">          $hashref->{svc}</A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_svc.cgi?$hashref->{svcpart}">          $hashref->{svc}</A></TD>
         <TD ROWSPAN=$rowspan>$hashref->{svcdb}</TD>
 END
 
@@ -85,7 +89,7 @@ print "</TR>";
 
 print <<END;
       <TR>
-        <TD COLSPAN=2><A HREF="$p/edit/part_svc.cgi"><I>Add new service</I></A></TD>
+        <TD COLSPAN=2><A HREF="${p}edit/part_svc.cgi"><I>Add new service</I></A></TD>
       </TR>
     </TABLE>
   </BODY>
diff --git a/htdocs/browse/svc_acct_pop.cgi b/htdocs/browse/svc_acct_pop.cgi
index f7627c1ef..2231aefe2 100755
--- a/htdocs/browse/svc_acct_pop.cgi
+++ b/htdocs/browse/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.2 1998-12-17 04:36:59 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.3 1998-12-17 05:25:22 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.2  1998-12-17 04:36:59  ivan
+# Revision 1.3  1998-12-17 05:25:22  ivan
+# fix visual and other bugs
+#
+# Revision 1.2  1998/12/17 04:36:59  ivan
 # use CGI;, use CGI::Carp, visual changes, relative URLs
 #
 
@@ -20,14 +23,17 @@ use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup swapuid);
 use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header menubar table popurl);
+use FS::svc_acct_pop;
 
 my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
+my $p = popurl(2);
+
 print $cgi->header, header('POP Listing', menubar(
-  'Main Menu' => popurl(2),
-)), table, <<END;
+  'Main Menu' => $p,
+)), "Points of Presence<BR><BR>", table, <<END;
       <TR>
         <TH></TH>
         <TH>City</TH>
@@ -38,22 +44,21 @@ print $cgi->header, header('POP Listing', menubar(
 END
 
 my($svc_acct_pop);
-my($p)=popurl(2);
 foreach $svc_acct_pop ( sort { 
   $a->getfield('popnum') <=> $b->getfield('popnum')
 } qsearch('svc_acct_pop',{}) ) {
   my($hashref)=$svc_acct_pop->hashref;
   print <<END;
       <TR>
-        <TD><A HREF="$p/edit/svc_acct_pop.cgi?$hashref->{popnum}">
+        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
           $hashref->{popnum}</A></TD>
-        <TD><A HREF="$p/edit/svc_acct_pop.cgi?$hashref->{popnum}">
+        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
           $hashref->{city}</A></TD>
-        <TD><A HREF="$p/edit/svc_acct_pop.cgi?$hashref->{popnum}">
+        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
           $hashref->{state}</A></TD>
-        <TD><A HREF="$p/edit/svc_acct_pop.cgi?$hashref->{popnum}">
+        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
           $hashref->{ac}</A></TD>
-        <TD><A HREF="$p/edit/svc_acct_pop.cgi?$hashref->{popnum}">
+        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
           $hashref->{exch}</A></TD>
       </TR>
 END
@@ -62,7 +67,7 @@ END
 
 print <<END;
       <TR>
-        <TD COLSPAN=5><A HREF="$p/edit/svc_acct_pop.cgi"><I>Add new POP</I></A></TD>
+        <TD COLSPAN=5><A HREF="${p}edit/svc_acct_pop.cgi"><I>Add new POP</I></A></TD>
       </TR>
     </TABLE>
     </CENTER>
-- 
cgit v1.2.1


From b6869885e52ea0e18009350bf59d4eca8aafb0eb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Dec 1998 06:17:12 +0000
Subject: fix double // in relative URLs, s/CGI::Base/CGI/;

---
 htdocs/edit/agent.cgi                   | 15 ++++++++-----
 htdocs/edit/agent_type.cgi              | 15 +++++++------
 htdocs/edit/cust_credit.cgi             | 37 ++++++++++++++++-----------------
 htdocs/edit/cust_main.cgi               | 31 +++++++++++++--------------
 htdocs/edit/cust_main_county-expand.cgi | 10 ++++++---
 htdocs/edit/cust_main_county.cgi        |  9 +++++---
 htdocs/edit/cust_pay.cgi                | 32 +++++++++++++---------------
 htdocs/edit/cust_pkg.cgi                | 32 ++++++++++++++--------------
 htdocs/edit/part_pkg.cgi                | 11 ++++++----
 htdocs/edit/part_referral.cgi           | 23 +++++++++++---------
 htdocs/edit/part_svc.cgi                | 11 ++++++----
 htdocs/edit/svc_acct.cgi                | 37 ++++++++++++++++-----------------
 htdocs/edit/svc_acct_pop.cgi            | 14 ++++++++-----
 htdocs/edit/svc_acct_sm.cgi             | 37 ++++++++++++++-------------------
 htdocs/edit/svc_domain.cgi              | 21 ++++++++-----------
 15 files changed, 174 insertions(+), 161 deletions(-)

diff --git a/htdocs/edit/agent.cgi b/htdocs/edit/agent.cgi
index fecfc54c9..44c1676b2 100755
--- a/htdocs/edit/agent.cgi
+++ b/htdocs/edit/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.2 1998-11-23 07:52:08 ivan Exp $
+# $Id: agent.cgi,v 1.3 1998-12-17 06:16:57 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -11,7 +11,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: agent.cgi,v $
-# Revision 1.2  1998-11-23 07:52:08  ivan
+# Revision 1.3  1998-12-17 06:16:57  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/11/23 07:52:08  ivan
 # *** empty log message ***
 #
 
@@ -39,10 +42,12 @@ if ( $query =~ /^(\d+)$/ ) { #editing
 }
 my($hashref)=$agent->hashref;
 
+my $p = popurl(2);
+
 print $cgi->header, header("$action Agent", menubar(
-  'Main Menu' => popurl(2),
-  'View all agents' => popurl(2). '/browse/agent.cgi',
-)), '<FORM ACTION="', popurl(1), '/process/agent.cgi" METHOD=POST>';
+  'Main Menu' => $p,
+  'View all agents' => $p. 'browse/agent.cgi',
+)), '<FORM ACTION="', popurl(1), 'process/agent.cgi" METHOD=POST>';
 
 print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$hashref->{agentnum}">!,
       "Agent #", $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)";
diff --git a/htdocs/edit/agent_type.cgi b/htdocs/edit/agent_type.cgi
index 021ff6cf3..d9c0851aa 100755
--- a/htdocs/edit/agent_type.cgi
+++ b/htdocs/edit/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.5 1998-11-21 07:58:27 ivan Exp $
+# $Id: agent_type.cgi,v 1.6 1998-12-17 06:16:58 ivan Exp $
 #
 # agent_type.cgi: Add/Edit agent type (output form)
 #
@@ -13,7 +13,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.5  1998-11-21 07:58:27  ivan
+# Revision 1.6  1998-12-17 06:16:58  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.5  1998/11/21 07:58:27  ivan
 # package names link to them
 #
 # Revision 1.4  1998/11/21 07:45:19  ivan
@@ -54,9 +57,9 @@ my($hashref)=$agent_type->hashref;
 
 my($p)=popurl(2);
 print $cgi->header, header("$action Agent Type", menubar(
-  'Main Menu' => "$p/",
-  'View all agent types' => "$p/browse/agent_type.cgi",
-)), '<FORM ACTION="', popurl(1), '/process/agent_type.cgi" METHOD=POST>';
+  'Main Menu' => "$p",
+  'View all agent types' => "${p}browse/agent_type.cgi",
+)), '<FORM ACTION="', popurl(1), 'process/agent_type.cgi" METHOD=POST>';
 
 print qq!<INPUT TYPE="hidden" NAME="typenum" VALUE="$hashref->{typenum}">!,
       "Agent Type #", $hashref->{typenum} ? $hashref->{typenum} : "(NEW)";
@@ -78,7 +81,7 @@ foreach $part_pkg ( qsearch('part_pkg',{}) ) {
           ? 'CHECKED '
           : '',
         qq!"VALUE="ON"> !,
-    qq!<A HREF="$p/edit/part_pkg.cgi?!, $part_pkg->pkgpart, 
+    qq!<A HREF="${p}edit/part_pkg.cgi?!, $part_pkg->pkgpart, 
     '">', $part_pkg->getfield('pkg'), '</A>',
   ;
 }
diff --git a/htdocs/edit/cust_credit.cgi b/htdocs/edit/cust_credit.cgi
index 75ef21208..793a451e6 100755
--- a/htdocs/edit/cust_credit.cgi
+++ b/htdocs/edit/cust_credit.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# cust_credit.cgi: Add a credit (output form)
+# $Id: cust_credit.cgi,v 1.2 1998-12-17 06:16:59 ivan Exp $
 #
 # Usage: cust_credit.cgi custnum [ -paybatch ]
 #        http://server.name/path/cust_credit?custnum [ -paybatch ]
@@ -23,34 +23,33 @@
 # ivan@voicenet.com 97-apr-21
 #
 # rewrite ivan@sisd.com 98-mar-16
+#
+# $Log: cust_credit.cgi,v $
+# Revision 1.2  1998-12-17 06:16:59  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
 
 use strict;
 use Date::Format;
-use CGI::Base qw(:DEFAULT :CGI); #CGI module
-use FS::UID qw(cgisuidsetup getotaker);
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker popurl);
+use FS::CGI qw(header popurl);
+
+my $cgi = new CGI;
 
-my($cgi) = new CGI::Base;
-$cgi->get;
 cgisuidsetup($cgi);
 
-#untaint custnum
-$QUERY_STRING =~ /^(\d+)$/;
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
 my($custnum)=$1;
 
-#untaint otaker
 my($otaker)=getotaker;
 
-SendHeaders(); # one guess.
-print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Post Credit</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>Post Credit</H1>
-    </CENTER>
-    <FORM ACTION="process/cust_credit.cgi" METHOD=POST>
+my $p1 = popurl(1);
+
+print $cgi->header, header("Post Credit", ''), <<END;
+    <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>
     <HR><PRE>
 END
 
diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index fd36ab7d4..1a91f3dd8 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# cust_main.cgi: Edit a customer (output form)
+# $Id: cust_main.cgi,v 1.3 1998-12-17 06:17:00 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,24 +38,28 @@
 #	bmccane@maxbaud.net	98-apr-3
 #
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
+#
+# $Log: cust_main.cgi,v $
+# Revision 1.3  1998-12-17 06:17:00  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
 
 use strict;
-use CGI::Base;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
 use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header popurl);
 use FS::cust_main;
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 
 cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
-
 #get record
 my($custnum,$action,$cust_main);
-if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
+my($query) = $cgi->keywords;
+if ( $query =~ /^(\d+)$/ ) { #editing
   $custnum=$1;
   $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
   $action='Edit';
@@ -66,16 +70,9 @@ if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
   $action='Add';
 }
 
-print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Customer $action</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>Customer $action</H1>
-    </CENTER>
-    <FORM ACTION="process/cust_main.cgi" METHOD=POST>
+my $p1 = popurl(1);'
+print $cgi->header, header("Customer $action", ''), <<END;
+    <FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST>
     <PRE>
 END
 
diff --git a/htdocs/edit/cust_main_county-expand.cgi b/htdocs/edit/cust_main_county-expand.cgi
index 9b687993f..eccb1d934 100755
--- a/htdocs/edit/cust_main_county-expand.cgi
+++ b/htdocs/edit/cust_main_county-expand.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county-expand.cgi,v 1.2 1998-11-18 09:01:38 ivan Exp $
+# $Id: cust_main_county-expand.cgi,v 1.3 1998-12-17 06:17:01 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county-expand.cgi,v $
-# Revision 1.2  1998-11-18 09:01:38  ivan
+# Revision 1.3  1998-12-17 06:17:01  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/11/18 09:01:38  ivan
 # i18n! i18n!
 #
 
@@ -34,10 +37,11 @@ my($taxnum)=$1;
 my($cust_main_county)=qsearchs('cust_main_county',{'taxnum'=>$taxnum});
 die "Can't expand entry!" if $cust_main_county->getfield('county');
 
+my $p1 = popurl(1);
 print $cgi->header, header("Tax Rate (expand)", menubar(
   'Main Menu' => popurl(2),
 )), <<END;
-    <FORM ACTION="process/cust_main_county-expand.cgi" METHOD=POST>
+    <FORM ACTION="${p1}process/cust_main_county-expand.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="taxnum" VALUE="$taxnum">
       Separate by
       <INPUT TYPE="radio" NAME="delim" VALUE="n" CHECKED>line
diff --git a/htdocs/edit/cust_main_county.cgi b/htdocs/edit/cust_main_county.cgi
index 96574f0ef..537d5740a 100755
--- a/htdocs/edit/cust_main_county.cgi
+++ b/htdocs/edit/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.2 1998-11-18 09:01:39 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.3 1998-12-17 06:17:02 ivan Exp $
 #
 # ivan@sisd.com 97-dec-13-16
 #
@@ -11,7 +11,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 # 
 # $Log: cust_main_county.cgi,v $
-# Revision 1.2  1998-11-18 09:01:39  ivan
+# Revision 1.3  1998-12-17 06:17:02  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/11/18 09:01:39  ivan
 # i18n! i18n!
 #
 
@@ -30,7 +33,7 @@ my($cgi) = new CGI;
 print $cgi->header, header("Edit tax rates", menubar(
   'Main Menu' => popurl(2),
 )), qq!<FORM ACTION="!, popurl(1),
-    qq!/process/cust_main_county.cgi" METHOD=POST>!, table, <<END;
+    qq!process/cust_main_county.cgi" METHOD=POST>!, table, <<END;
       <TR>
         <TH><FONT SIZE=-1>Country</FONT></TH>
         <TH><FONT SIZE=-1>State</FONT></TH>
diff --git a/htdocs/edit/cust_pay.cgi b/htdocs/edit/cust_pay.cgi
index a6cb204d1..a3a308803 100755
--- a/htdocs/edit/cust_pay.cgi
+++ b/htdocs/edit/cust_pay.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# cust_pay.cgi: Add a payment (output form)
+# $Id: cust_pay.cgi,v 1.2 1998-12-17 06:17:03 ivan Exp $
 #
 # Usage: cust_pay.cgi invnum
 #        http://server.name/path/cust_pay.cgi?invnum
@@ -12,31 +12,29 @@
 # ivan@voicenet.com 96-dec-11
 #
 # rewrite ivan@sisd.com 98-mar-16
+#
+# $Log: cust_pay.cgi,v $
+# Revision 1.2  1998-12-17 06:17:03  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
 
 use strict;
 use Date::Format;
-use CGI::Base qw(:DEFAULT :CGI);
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl);
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 cgisuidsetup($cgi);
 
-#untaint invnum
-$QUERY_STRING =~ /^(\d+)$/;
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
 my($invnum)=$1;
 
-SendHeaders(); # one guess.
-print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Enter payment</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>Enter payment</H1>
-    </CENTER>
-    <FORM ACTION="process/cust_pay.cgi" METHOD=POST>
+my $p1 = popurl(1);
+print $cgi->header, header("Enter payment", ''), <<END;
+    <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
     <HR><PRE>
 END
 
diff --git a/htdocs/edit/cust_pkg.cgi b/htdocs/edit/cust_pkg.cgi
index d7f143db4..68abf9698 100755
--- a/htdocs/edit/cust_pkg.cgi
+++ b/htdocs/edit/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# cust_pkg.cgi: Add/edit packages (output form)
+# $Id: cust_pkg.cgi,v 1.2 1998-12-17 06:17:04 ivan Exp $
 #
 # this is for changing packages around, not editing things within the package
 #
@@ -23,15 +23,21 @@
 #
 # fixed a pretty cool bug from above which caused a visual glitch ivan@sisd.com
 # 98-jun-1
+#
+# $Log: cust_pkg.cgi,v $
+# Revision 1.2  1998-12-17 06:17:04  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
 
 use strict;
-use CGI::Base qw(:DEFAULT :CGI); # CGI module
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
 use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header popurl);
+use FS::part_pkg;
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
 my(%pkg,%comment);
@@ -41,22 +47,16 @@ foreach (qsearch('part_pkg', {})) {
 }
 
 #untaint custnum
-$QUERY_STRING =~ /^(\d+)$/;
+
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
 my($custnum)=$1;
 
 my($otaker)=&getotaker;
 
-SendHeaders();
-print <<END;
-<HTML>   
-  <HEAD>
-    <TITLE>Add/Edit Packages</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>Add/Edit Packages</H1>
-    </CENTER>
-    <FORM ACTION="process/cust_pkg.cgi" METHOD=POST>
+my $p1 = popurl(1);
+print $cgi->header, header("Add/Edit Packages", ''), <<END;
+    <FORM ACTION="${p1}process/cust_pkg.cgi" METHOD=POST>
     <HR>
 END
 
diff --git a/htdocs/edit/part_pkg.cgi b/htdocs/edit/part_pkg.cgi
index 7fd029b03..c30a85965 100755
--- a/htdocs/edit/part_pkg.cgi
+++ b/htdocs/edit/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.5 1998-11-21 07:12:26 ivan Exp $
+# $Id: part_pkg.cgi,v 1.6 1998-12-17 06:17:05 ivan Exp $
 #
 # part_pkg.cgi: Add/Edit package (output form)
 #
@@ -13,7 +13,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.5  1998-11-21 07:12:26  ivan
+# Revision 1.6  1998-12-17 06:17:05  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.5  1998/11/21 07:12:26  ivan
 # *** empty log message ***
 #
 # Revision 1.4  1998/11/21 07:11:08  ivan
@@ -69,8 +72,8 @@ my($hashref)=$part_pkg->hashref;
 
 print $cgi->header, header("$action Package Definition", menubar(
   'Main Menu' => popurl(2),
-  'View all packages' => popurl(2). '/browse/part_pkg.cgi',
-)), '<FORM ACTION="', popurl(1), '/process/part_pkg.cgi" METHOD=POST>';
+  'View all packages' => popurl(2). 'browse/part_pkg.cgi',
+)), '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>';
 
 if ( $cgi->param('clone') ) {
   print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
diff --git a/htdocs/edit/part_referral.cgi b/htdocs/edit/part_referral.cgi
index f29802239..4eeec9982 100755
--- a/htdocs/edit/part_referral.cgi
+++ b/htdocs/edit/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# agent.cgi: Add/Edit referral (output form)
+# $Id: part_referral.cgi,v 1.2 1998-12-17 06:17:06 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23
 #
@@ -10,22 +10,24 @@
 # confisuing typo on submit button ivan@sisd.com 98-jun-14
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: part_referral.cgi,v $
+# Revision 1.2  1998-12-17 06:17:06  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
 
 use strict;
-use CGI::Base;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::part_referral;
 use FS::CGI qw(header menubar);
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
-
 my($part_referral,$action);
 if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
   $part_referral=qsearchs('part_referral',{'refnum'=>$1});
@@ -36,11 +38,12 @@ if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
 }
 my($hashref)=$part_referral->hashref;
 
-print header("$action Referral", menubar(
-  'Main Menu' => '../',
-  'View all referrals' => "../browse/part_referral.cgi",
+my $p1 = popurl(1);
+print $cgi->header, header("$action Referral", menubar(
+  'Main Menu' => popurl(2),
+  'View all referrals' => popurl(2). "browse/part_referral.cgi",
 )), <<END;
-    <FORM ACTION="process/part_referral.cgi" METHOD=POST>
+    <FORM ACTION="${p1}process/part_referral.cgi" METHOD=POST>
 END
 
 #display
diff --git a/htdocs/edit/part_svc.cgi b/htdocs/edit/part_svc.cgi
index 6f0a322b5..6fbe19428 100755
--- a/htdocs/edit/part_svc.cgi
+++ b/htdocs/edit/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.3 1998-11-21 06:43:26 ivan Exp $
+# $Id: part_svc.cgi,v 1.4 1998-12-17 06:17:07 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.3  1998-11-21 06:43:26  ivan
+# Revision 1.4  1998-12-17 06:17:07  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.3  1998/11/21 06:43:26  ivan
 # visual
 #
 
@@ -40,8 +43,8 @@ my($hashref)=$part_svc->hashref;
 my $p = popurl(2);
 print $cgi->header, header("$action Service Definition", menubar(
   'Main Menu' => $p,
-  'View all services' => "$p/browse/part_svc.cgi",
-)), '<FORM ACTION="', popurl(1), '/process/part_svc.cgi" METHOD=POST>';
+  'View all services' => "${p}browse/part_svc.cgi",
+)), '<FORM ACTION="', popurl(1), 'process/part_svc.cgi" METHOD=POST>';
 
 print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$hashref->{svcpart}">!,
       "Service Part #", $hashref->{svcpart} ? $hashref->{svcpart} : "(NEW)";
diff --git a/htdocs/edit/svc_acct.cgi b/htdocs/edit/svc_acct.cgi
index 93af2eb73..dc9f6e91a 100755
--- a/htdocs/edit/svc_acct.cgi
+++ b/htdocs/edit/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.2 1998-12-16 05:17:28 ivan Exp $
+# $Id: svc_acct.cgi,v 1.3 1998-12-17 06:17:08 ivan Exp $
 #
 # Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -16,25 +16,32 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
+#
+# $Log: svc_acct.cgi,v $
+# Revision 1.3  1998-12-17 06:17:08  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
 
 use strict;
 use vars qw($conf);
-use CGI::Base qw(:DEFAULT :CGI);
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(header popurl);
 use FS::Record qw(qsearch qsearchs);
 use FS::svc_acct qw(fields);
 use FS::Conf;
 
+my($cgi) = new CGI;
+&cgisuidsetup($cgi);
+
 $conf = new FS::Conf;
 my @shells = $conf->config('shells');
 
-my($cgi) = new CGI::Base;
-$cgi->get;
-&cgisuidsetup($cgi);
-
 my($action,$svcnum,$svc_acct,$pkgnum,$svcpart,$part_svc);
 
-if ( $QUERY_STRING =~ /^(\d+)$/ ) { #editing
+my($query) = $cgi->keywords;
+if ( $query =~ /^(\d+)$/ ) { #editing
 
   $svcnum=$1;
   $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svcnum})
@@ -55,7 +62,7 @@ if ( $QUERY_STRING =~ /^(\d+)$/ ) { #editing
 
   $svc_acct=create FS::svc_acct({}); 
 
-  foreach $_ (split(/-/,$QUERY_STRING)) {
+  foreach $_ (split(/-/,$query)) {
     $pkgnum=$1 if /^pkgnum(\d+)$/;
     $svcpart=$1 if /^svcpart(\d+)$/;
   }
@@ -97,17 +104,9 @@ my($username,$password)=(
 my($ulen)=$svc_acct->dbdef_table->column('username')->length;
 my($ulen2)=$ulen+2;
 
-SendHeaders();
-print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>$action $svc account</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>$action $svc account</H1>
-    </CENTER><HR>
-    <FORM ACTION="process/svc_acct.cgi" METHOD=POST>
+my $p1 = popurl(1);
+print $cgi->header, header("$action $svc account"), <<END;
+    <FORM ACTION="${p1}process/svc_acct.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
       <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
       <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
diff --git a/htdocs/edit/svc_acct_pop.cgi b/htdocs/edit/svc_acct_pop.cgi
index 58e8b7ee6..9695d9398 100755
--- a/htdocs/edit/svc_acct_pop.cgi
+++ b/htdocs/edit/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# svc_acct_pop.cgi: Add/Edit pop (output form)
+# $Id: svc_acct_pop.cgi,v 1.3 1998-12-17 06:17:10 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8 
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.2  1998-11-13 09:56:47  ivan
+# Revision 1.3  1998-12-17 06:17:10  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/11/13 09:56:47  ivan
 # change configuration file layout to support multiple distinct databases (with
 # own set of config files, export, etc.)
 #
@@ -37,11 +40,12 @@ if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
 }
 my($hashref)=$svc_acct_pop->hashref;
 
+my $p1 = popurl(1);
 print $cgi->header, header("$action POP", menubar(
-  'Main Menu' => '../',
-  'View all POPs' => "../browse/svc_acct_pop.cgi",
+  'Main Menu' => popurl(2),
+  'View all POPs' => popurl(2). "browse/svc_acct_pop.cgi",
 )), <<END;
-    <FORM ACTION="process/svc_acct_pop.cgi" METHOD=POST>
+    <FORM ACTION="${p1}process/svc_acct_pop.cgi" METHOD=POST>
 END
 
 #display
diff --git a/htdocs/edit/svc_acct_sm.cgi b/htdocs/edit/svc_acct_sm.cgi
index 5493215a1..3f96efc4e 100755
--- a/htdocs/edit/svc_acct_sm.cgi
+++ b/htdocs/edit/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.2 1998-12-16 05:19:15 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.3 1998-12-17 06:17:11 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct_sm.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -35,29 +35,31 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-26
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.2  1998-12-16 05:19:15  ivan
+# Revision 1.3  1998-12-17 06:17:11  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/12/16 05:19:15  ivan
 # use FS::Conf
 #
 
 use strict;
 use vars qw($conf);
-use CGI::Base qw(:DEFAULT :CGI);
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl);
 use FS::Record qw(qsearch qsearchs);
 use FS::svc_acct_sm qw(fields);
 use FS::Conf;
 
-$conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
-
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
+$conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
 
 my($action,$svcnum,$svc_acct_sm,$pkgnum,$svcpart,$part_svc);
-if ( $QUERY_STRING =~ /^(\d+)$/ ) { #editing
+if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
 
   $svcnum=$1;
   $svc_acct_sm=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum})
@@ -78,7 +80,7 @@ if ( $QUERY_STRING =~ /^(\d+)$/ ) { #editing
 
   $svc_acct_sm=create FS::svc_acct_sm({});
 
-  foreach $_ (split(/-/,$QUERY_STRING)) { #get & untaint pkgnum & svcpart
+  foreach $_ (split(/-/,$cgi->query_string)) { #get & untaint pkgnum & svcpart
     $pkgnum=$1 if /^pkgnum(\d+)$/;
     $svcpart=$1 if /^svcpart(\d+)$/;
   }
@@ -157,16 +159,9 @@ if ($pkgnum) {
   die "\$action eq Add, but \$pkgnum is null!\n";
 }
 
-print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Mail Alias $action</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>Mail Alias $action</H1>
-    </CENTER>
-    <FORM ACTION="process/svc_acct_sm.cgi" METHOD=POST>
+my $p1 = popurl(1);
+print $cgi->header, header("Mail Alias $action", ''), <<END;
+    <FORM ACTION="${p1}process/svc_acct_sm.cgi" METHOD=POST>
 END
 
 #display
diff --git a/htdocs/edit/svc_domain.cgi b/htdocs/edit/svc_domain.cgi
index dd436334c..3d0a2e723 100755
--- a/htdocs/edit/svc_domain.cgi
+++ b/htdocs/edit/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# svc_domain.cgi: Add domain (output form)
+# $Id: svc_domain.cgi,v 1.3 1998-12-17 06:17:12 ivan Exp $
 #
 # Usage: svc_domain.cgi pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_domain.cgi?pkgnum{pkgnum}-svcpart{svcpart}
@@ -17,7 +17,10 @@
 # no GOV in instructions ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.2  1998-11-13 09:56:48  ivan
+# Revision 1.3  1998-12-17 06:17:12  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/11/13 09:56:48  ivan
 # change configuration file layout to support multiple distinct databases (with
 # own set of config files, export, etc.)
 #
@@ -26,6 +29,7 @@ use strict;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(header popurl);
 use FS::Record qw(qsearch qsearchs);
 use FS::svc_domain qw(fields);
 
@@ -84,16 +88,9 @@ my($domain)=(
   $svc_domain->domain,
 );
 
-print $cgi->header, <<END;
-<HTML>
-  <HEAD>
-    <TITLE>$action $svc</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>$action $svc</H1>
-    </CENTER><HR>
-    <FORM ACTION="process/svc_domain.cgi" METHOD=POST>
+my $p1 = popurl(1);
+print $cgi->header, header("$action $svc", ''), <<END;
+    <FORM ACTION="${p1}process/svc_domain.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
       <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
       <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
-- 
cgit v1.2.1


From 9839e6383a3ff00a352c8386a9bbe48e630a6a89 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Dec 1998 08:40:30 +0000
Subject: s/CGI::Request/CGI.pm/; etc

---
 htdocs/edit/process/agent.cgi                   | 11 +++---
 htdocs/edit/process/agent_type.cgi              | 14 +++----
 htdocs/edit/process/cust_credit.cgi             | 46 ++++++++---------------
 htdocs/edit/process/cust_main.cgi               | 13 ++++---
 htdocs/edit/process/cust_main_county-expand.cgi |  9 +++--
 htdocs/edit/process/cust_main_county.cgi        | 11 ++++--
 htdocs/edit/process/cust_pay.cgi                | 38 ++++++++-----------
 htdocs/edit/process/cust_pkg.cgi                | 41 ++++++++------------
 htdocs/edit/process/part_pkg.cgi                | 15 ++++----
 htdocs/edit/process/part_referral.cgi           | 22 ++++++-----
 htdocs/edit/process/part_svc.cgi                | 11 +++---
 htdocs/edit/process/svc_acct.cgi                | 50 +++++++++----------------
 htdocs/edit/process/svc_acct_pop.cgi            | 21 +++++++----
 htdocs/edit/process/svc_acct_sm.cgi             | 41 ++++++++------------
 htdocs/edit/process/svc_domain.cgi              | 42 ++++++++-------------
 15 files changed, 169 insertions(+), 216 deletions(-)

diff --git a/htdocs/edit/process/agent.cgi b/htdocs/edit/process/agent.cgi
index 423926d0f..1bb5bbaae 100755
--- a/htdocs/edit/process/agent.cgi
+++ b/htdocs/edit/process/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.2 1998-11-23 07:52:29 ivan Exp $
+# $Id: agent.cgi,v 1.3 1998-12-17 08:40:16 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent.cgi,v $
-# Revision 1.2  1998-11-23 07:52:29  ivan
+# Revision 1.3  1998-12-17 08:40:16  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/23 07:52:29  ivan
 # *** empty log message ***
 #
 
@@ -51,8 +54,6 @@ if ( $agentnum ) {
 if ( $error ) {
   &idiot($error);
 } else { 
-  #$req->cgi->redirect("../../view/agent.cgi?$agentnum");
-  #$req->cgi->redirect("../../edit/agent.cgi?$agentnum");
-  print $cgi->redirect(popurl(3). "/browse/agent.cgi");
+  print $cgi->redirect(popurl(3). "browse/agent.cgi");
 }
 
diff --git a/htdocs/edit/process/agent_type.cgi b/htdocs/edit/process/agent_type.cgi
index 7a70198f8..c6f607d42 100755
--- a/htdocs/edit/process/agent_type.cgi
+++ b/htdocs/edit/process/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.2 1998-11-21 07:49:20 ivan Exp $
+# $Id: agent_type.cgi,v 1.3 1998-12-17 08:40:17 ivan Exp $
 #
 # ivan@sisd.com 97-dec-11
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.2  1998-11-21 07:49:20  ivan
+# Revision 1.3  1998-12-17 08:40:17  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/21 07:49:20  ivan
 # s/CGI::Request/CGI.pm/
 #
 
@@ -59,8 +62,7 @@ foreach $part_pkg (qsearch('part_pkg',{})) {
   });
   if ( $type_pkgs && ! $cgi->param("pkgpart$pkgpart") ) {
     my($d_type_pkgs)=$type_pkgs; #need to save $type_pkgs for below.
-    $error=$d_type_pkgs->del; #FS::Record not FS::type_pkgs,
-                                  #so ->del not ->delete.  hmm.  hmm.
+    $error=$d_type_pkgs->delete;
     if ( $error ) {
       idiot($error);
       exit;
@@ -83,7 +85,5 @@ foreach $part_pkg (qsearch('part_pkg',{})) {
 
 }
 
-#$req->cgi->redirect("../../view/agent_type.cgi?$typenum");
-#$req->cgi->redirect("../../edit/agent_type.cgi?$typenum");
-print $cgi->redirect(popurl(3). "/browse/agent_type.cgi");
+print $cgi->redirect(popurl(3). "browse/agent_type.cgi");
 
diff --git a/htdocs/edit/process/cust_credit.cgi b/htdocs/edit/process/cust_credit.cgi
index e660b4c78..e87d588d3 100755
--- a/htdocs/edit/process/cust_credit.cgi
+++ b/htdocs/edit/process/cust_credit.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/cust_credit.cgi: Add a credit (process form)
+# $Id: cust_credit.cgi,v 1.2 1998-12-17 08:40:18 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_credit.cgi
@@ -20,51 +20,37 @@
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cust_credit.cgi,v $
+# Revision 1.2  1998-12-17 08:40:18  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
 
 use strict;
-use CGI::Request;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(popurl eidiot);
 use FS::cust_credit;
 
-my($req)=new CGI::Request; # create form object
-cgisuidsetup($req->cgi);
+my($cgi)=new CGI; # create form object
+cgisuidsetup($cgi);
 
-$req->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
+$cgi->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
 my($custnum)=$1;
 
-$req->param('otaker',getotaker);
+$cgi->param('otaker',getotaker);
 
 my($new) = create FS::cust_credit ( {
   map {
-    $_, $req->param($_);
+    $_, scalar($cgi->param($_));
   } qw(custnum _date amount otaker reason)
 } );
 
 my($error);
 $error=$new->insert;
-&idiot($error) if $error;
+&eidiot($error) if $error;
 
 #no errors, no refund, so view our credit.
-$req->cgi->redirect("../../view/cust_main.cgi?$custnum#history");
-
-sub idiot {
-  my($error)=@_;
-  CGI::Base::SendHeaders(); # one guess
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error posting credit/refund</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Error posting credit/refund</H4>
-    </CENTER>
-    Your update did not occur because of the following error:
-    <P><B>$error</B>
-    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and press the <I>Post</I> button again.
-  </BODY>
-</HTML>
-END
-
-}
+print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#history");
 
diff --git a/htdocs/edit/process/cust_main.cgi b/htdocs/edit/process/cust_main.cgi
index 5f13a9301..8404ba894 100755
--- a/htdocs/edit/process/cust_main.cgi
+++ b/htdocs/edit/process/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.2 1998-11-18 08:57:36 ivan Exp $
+# $Id: cust_main.cgi,v 1.3 1998-12-17 08:40:19 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -22,7 +22,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.2  1998-11-18 08:57:36  ivan
+# Revision 1.3  1998-12-17 08:40:19  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/18 08:57:36  ivan
 # i18n, s/CGI-modules/CGI.pm/, FS::CGI::idiot instead of inline, FS::CGI::popurl
 #
 
@@ -34,7 +37,7 @@ use FS::CGI qw(eidiot popurl);
 use FS::Record qw(qsearchs);
 use FS::cust_main;
 
-my($req)=new CGI;
+my($cgi)=new CGI;
 
 &cgisuidsetup($cgi);
 
@@ -61,7 +64,7 @@ $cgi->param('country', $4);
 
 my($new) = create FS::cust_main ( {
   map {
-    $_, $cgi->param("$_") || ''
+    $_, scalar($cgi->param($_))
   } qw(custnum agentnum last first ss company address1 address2 city county
        state zip daytime night fax payby payinfo paydate payname tax
        otaker refnum)
@@ -82,5 +85,5 @@ if ( $new->custnum eq '' ) {
 }
 
 my($custnum)=$new->custnum;
-print $cgi->redirect(popurl(3). "/view/cust_main.cgi?$custnum#cust_main");
+print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#cust_main");
 
diff --git a/htdocs/edit/process/cust_main_county-expand.cgi b/htdocs/edit/process/cust_main_county-expand.cgi
index c70d5b9d7..368949e50 100755
--- a/htdocs/edit/process/cust_main_county-expand.cgi
+++ b/htdocs/edit/process/cust_main_county-expand.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county-expand.cgi,v 1.2 1998-11-18 09:01:40 ivan Exp $
+# $Id: cust_main_county-expand.cgi,v 1.3 1998-12-17 08:40:20 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -15,7 +15,10 @@
 # ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county-expand.cgi,v $
-# Revision 1.2  1998-11-18 09:01:40  ivan
+# Revision 1.3  1998-12-17 08:40:20  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/18 09:01:40  ivan
 # i18n! i18n!
 #
 
@@ -78,5 +81,5 @@ unless ( qsearch('cust_main',{
   die $error if $error;
 }
 
-print $cgi->redirect(popurl(3). "/edit/cust_main_county.cgi");
+print $cgi->redirect(popurl(3). "edit/cust_main_county.cgi");
 
diff --git a/htdocs/edit/process/cust_main_county.cgi b/htdocs/edit/process/cust_main_county.cgi
index ce5a4f671..11f55f236 100755
--- a/htdocs/edit/process/cust_main_county.cgi
+++ b/htdocs/edit/process/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.2 1998-11-18 09:01:41 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.3 1998-12-17 08:40:21 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county.cgi,v $
-# Revision 1.2  1998-11-18 09:01:41  ivan
+# Revision 1.3  1998-12-17 08:40:21  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/18 09:01:41  ivan
 # i18n! i18n!
 #
 
@@ -22,7 +25,7 @@ use FS::CGI qw(eidiot);
 use FS::Record qw(qsearch qsearchs);
 use FS::cust_main_county;
 
-my($req)=new CGI;
+my($cgi)=new CGI;
 &cgisuidsetup($cgi);
 
 foreach ( $cgi->param ) {
@@ -38,5 +41,5 @@ foreach ( $cgi->param ) {
   eidiot($error) if $error;
 }
 
-$cgi->redirect(popurl(3). "/browse/cust_main_county.cgi");
+print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi");
 
diff --git a/htdocs/edit/process/cust_pay.cgi b/htdocs/edit/process/cust_pay.cgi
index 9ec97532b..619a93a2a 100755
--- a/htdocs/edit/process/cust_pay.cgi
+++ b/htdocs/edit/process/cust_pay.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/cust_pay.cgi: Add a payment (process form)
+# $Id: cust_pay.cgi,v 1.2 1998-12-17 08:40:22 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_pay.cgi
@@ -13,21 +13,28 @@
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cust_pay.cgi,v $
+# Revision 1.2  1998-12-17 08:40:22  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
 
 use strict;
-use CGI::Request;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(idiot popurl);
 use FS::cust_pay qw(fields);
 
-my($req)=new CGI::Request;
-&cgisuidsetup($req->cgi);
+my($cgi)=new CGI;
+&cgisuidsetup($cgi);
 
-$req->param('invnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$cgi->param('invnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 my($invnum)=$1;
 
 my($new) = create FS::cust_pay ( {
   map {
-    $_, $req->param($_);
+    $_, scalar($cgi->param($_));
   } qw(invnum paid _date payby payinfo paybatch)
 } );
 
@@ -35,23 +42,8 @@ my($error);
 $error=$new->insert;
 
 if ($error) { #error!
-  CGI::Base::SendHeaders(); # one guess
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error posting payment</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Error posting payment</H4>
-    </CENTER>
-    Your update did not occur because of the following error:
-    <P><B>$error</B>
-    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and press the <I>Post</I> button again.
-  </BODY>
-</HTML>
-END
+  idiot($error);
 } else { #no errors!
-  $req->cgi->redirect("../../view/cust_bill.cgi?$invnum");
+  print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$invnum");
 }
 
diff --git a/htdocs/edit/process/cust_pkg.cgi b/htdocs/edit/process/cust_pkg.cgi
index 6f5bc875a..9cd9e02f1 100755
--- a/htdocs/edit/process/cust_pkg.cgi
+++ b/htdocs/edit/process/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/cust_pkg.cgi: Add/edit packages (process form)
+# $Id: cust_pkg.cgi,v 1.2 1998-12-17 08:40:23 ivan Exp $
 #
 # this is for changing packages around, not for editing things within the
 # package
@@ -19,30 +19,36 @@
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cust_pkg.cgi,v $
+# Revision 1.2  1998-12-17 08:40:23  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(idiot popurl);
 use FS::cust_pkg;
 
-my($req)=new CGI::Request; # create form object
+my($cgi)=new CGI; # create form object
 
-&cgisuidsetup($req->cgi);
+&cgisuidsetup($cgi);
 
 #untaint custnum
-$req->param('new_custnum') =~ /^(\d+)$/;
+$cgi->param('new_custnum') =~ /^(\d+)$/;
 my($custnum)=$1;
 
 my(@remove_pkgnums) = map {
   /^(\d+)$/ or die "Illegal remove_pkg value!";
   $1;
-} $req->param('remove_pkg');
+} $cgi->param('remove_pkg');
 
 my(@pkgparts);
 my($pkgpart);
-foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $req->params ) {
-  my($num_pkgs)=$req->param("pkg$pkgpart");
+foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
+  my($num_pkgs)=$cgi->param("pkg$pkgpart");
   while ( $num_pkgs-- ) {
     push @pkgparts,$pkgpart;
   }
@@ -51,23 +57,8 @@ foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $req->params ) {
 my($error) = FS::cust_pkg::order($custnum,\@pkgparts,\@remove_pkgnums);
 
 if ($error) {
-  CGI::Base::SendHeaders();
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error updating packages</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Error updating packages</H4>
-    </CENTER>
-    Your update did not occur because of the following error:
-    <P><B>$error</B>
-    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and submit the form again.
-  </BODY>
-</HTML>
-END
+  idiot($error);
 } else {
-  $req->cgi->redirect("../../view/cust_main.cgi?$custnum#cust_pkg");
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#cust_pkg");
 }
 
diff --git a/htdocs/edit/process/part_pkg.cgi b/htdocs/edit/process/part_pkg.cgi
index 5c58752c8..dca8f1374 100755
--- a/htdocs/edit/process/part_pkg.cgi
+++ b/htdocs/edit/process/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.3 1998-11-21 07:17:58 ivan Exp $
+# $Id: part_pkg.cgi,v 1.4 1998-12-17 08:40:24 ivan Exp $
 #
 # process/part_pkg.cgi: Edit package definitions (process form)
 #
@@ -17,7 +17,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.3  1998-11-21 07:17:58  ivan
+# Revision 1.4  1998-12-17 08:40:24  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.3  1998/11/21 07:17:58  ivan
 # bugfix to work for regular aswell as custom pricing
 #
 # Revision 1.2  1998/11/15 13:16:15  ivan
@@ -43,7 +46,7 @@ my($old)=qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
 
 my($new)=create FS::part_pkg ( {
   map {
-    $_, $cgi->param($_);
+    $_, scalar($cgi->param($_));
   } fields('part_pkg')
 } );
 
@@ -90,9 +93,7 @@ foreach $part_svc (qsearch('part_svc',{})) {
 }
 
 unless ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
-  #$req->cgi->redirect("../../view/part_pkg.cgi?$pkgpart");
-  #$req->cgi->redirect("../../edit/part_pkg.cgi?$pkgpart");
-  print $cgi->redirect(popurl(3). "/browse/part_pkg.cgi");
+  print $cgi->redirect(popurl(3). "browse/part_pkg.cgi");
 } else {
   my($old_cust_pkg) = qsearchs( 'cust_pkg', { 'pkgnum' => $1 } );
   my %hash = $old_cust_pkg->hash;
@@ -100,7 +101,7 @@ unless ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
   my($new_cust_pkg) = create FS::cust_pkg \%hash;
   my $error = $new_cust_pkg->replace($old_cust_pkg);
   eidiot "Error modifying cust_pkg record: $error\n" if $error;
-  print $cgi->redirect(popurl(3). "/view/cust_main.cgi?". $new_cust_pkg->custnum);
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new_cust_pkg->custnum);
 }
 
 
diff --git a/htdocs/edit/process/part_referral.cgi b/htdocs/edit/process/part_referral.cgi
index 08a4c01d0..94d29c40e 100755
--- a/htdocs/edit/process/part_referral.cgi
+++ b/htdocs/edit/process/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/part_referral.cgi: Edit referrals (process form)
+# $Id: part_referral.cgi,v 1.2 1998-12-17 08:40:25 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23
 #
@@ -8,25 +8,29 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: part_referral.cgi,v $
+# Revision 1.2  1998-12-17 08:40:25  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs);
 use FS::part_referral qw(fields);
-use FS::CGI qw(eidiot);
-use FS::CGI qw(eidiot);
+use FS::CGI qw(popurl eidiot);
 
-my($req)=new CGI::Request; # create form object
+my($cgi)=new CGI; # create form object
 
-&cgisuidsetup($req->cgi);
+&cgisuidsetup($cgi);
 
-my($refnum)=$req->param('refnum');
+my($refnum)=$cgi->param('refnum');
 
 my($new)=create FS::part_referral ( {
   map {
-    $_, $req->param($_);
+    $_, scalar($cgi->param($_));
   } fields('part_referral')
 } );
 
@@ -41,5 +45,5 @@ if ( $refnum ) {
 }
 
 $refnum=$new->getfield('refnum');
-$req->cgi->redirect("../../browse/part_referral.cgi");
+print $cgi->redirect(popurl(3). "browse/part_referral.cgi");
 
diff --git a/htdocs/edit/process/part_svc.cgi b/htdocs/edit/process/part_svc.cgi
index 48cc7fec3..0f67410ee 100755
--- a/htdocs/edit/process/part_svc.cgi
+++ b/htdocs/edit/process/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.2 1998-11-21 06:43:08 ivan Exp $
+# $Id: part_svc.cgi,v 1.3 1998-12-17 08:40:26 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.2  1998-11-21 06:43:08  ivan
+# Revision 1.3  1998-12-17 08:40:26  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/21 06:43:08  ivan
 # s/CGI::Request/CGI.pm/
 #
 
@@ -46,7 +49,5 @@ if ( $svcpart ) {
   $svcpart=$new->getfield('svcpart');
 }
 
-#$req->cgi->redirect("../../view/part_svc.cgi?$svcpart");
-#$req->cgi->redirect("../../edit/part_svc.cgi?$svcpart");
-print $cgi->redirect(popurl(3)."/browse/part_svc.cgi");
+print $cgi->redirect(popurl(3)."browse/part_svc.cgi");
 
diff --git a/htdocs/edit/process/svc_acct.cgi b/htdocs/edit/process/svc_acct.cgi
index 8d77ba703..644a0444e 100755
--- a/htdocs/edit/process/svc_acct.cgi
+++ b/htdocs/edit/process/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/svc_acct.cgi: Add/edit a customer (process form)
+# $Id: svc_acct.cgi,v 1.2 1998-12-17 08:40:27 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
@@ -21,67 +21,53 @@
 # Changes to allow page to work at a relative position in server
 # Changed 'password' to '_password' because Pg6.3 reserves the password word
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: svc_acct.cgi,v $
+# Revision 1.2  1998-12-17 08:40:27  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(eidiot popurl);
 use FS::Record qw(qsearchs);
 use FS::svc_acct;
 
-my($req) = new CGI::Request; # create form object
-&cgisuidsetup($req->cgi);
+my($cgi) = new CGI;
+&cgisuidsetup($cgi);
 
-$req->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 my($svcnum)=$1;
 
 my($old)=qsearchs('svc_acct',{'svcnum'=>$svcnum}) if $svcnum;
 
 #unmunge popnum
-$req->param('popnum', (split(/:/, $req->param('popnum') ))[0] );
+$cgi->param('popnum', (split(/:/, $cgi->param('popnum') ))[0] );
 
 #unmunge passwd
-if ( $req->param('_password') eq '*HIDDEN*' ) {
-  $req->param('_password',$old->getfield('_password'));
+if ( $cgi->param('_password') eq '*HIDDEN*' ) {
+  $cgi->param('_password',$old->getfield('_password'));
 }
 
 my($new) = create FS::svc_acct ( {
   map {
-    $_, $req->param($_);
+    $_, scalar($cgi->param($_));
   } qw(svcnum pkgnum svcpart username _password popnum uid gid finger dir
     shell quota slipip)
 } );
 
 if ( $svcnum ) {
   my($error) = $new->replace($old);
-  &idiot($error) if $error;
+  &eidiot($error) if $error;
 } else {
   my($error) = $new->insert;
-  &idiot($error) if $error;
+  &eidiot($error) if $error;
   $svcnum = $new->getfield('svcnum');
 }
 
 #no errors, view account
-$req->cgi->redirect("../../view/svc_acct.cgi?" . $svcnum );
+print $cgi->redirect(popurl(3). "view/svc_acct.cgi?" . $svcnum );
 
-sub idiot {
-  my($error)=@_;
-  CGI::Base::SendHeaders(); # one guess
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error adding/updating account</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Error adding/updating account</H4>
-    </CENTER>
-    Your update did not occur because of the following error:
-    <P><B>$error</B>
-    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and submit the form again.
-  </BODY>
-</HTML>
-END
-  exit;
-}
 
diff --git a/htdocs/edit/process/svc_acct_pop.cgi b/htdocs/edit/process/svc_acct_pop.cgi
index 18d7940b4..89cc75c35 100755
--- a/htdocs/edit/process/svc_acct_pop.cgi
+++ b/htdocs/edit/process/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/svc_acct_pop.cgi: Edit POP (process form)
+# $Id: svc_acct_pop.cgi,v 1.2 1998-12-17 08:40:28 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8
 #
@@ -8,26 +8,31 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: svc_acct_pop.cgi,v $
+# Revision 1.2  1998-12-17 08:40:28  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::svc_acct_pop qw(fields);
-use FS::CGI qw(eidiot);
+use FS::CGI qw(popurl eidiot);
 
-my($req)=new CGI::Request; # create form object
+my($cgi)=new CGI; # create form object
 
-&cgisuidsetup($req->cgi);
+&cgisuidsetup($cgi);
 
-my($popnum)=$req->param('popnum');
+my($popnum)=$cgi->param('popnum');
 
 my($old)=qsearchs('svc_acct_pop',{'popnum'=>$popnum}) if $popnum;
 
 my($new)=create FS::svc_acct_pop ( {
   map {
-    $_, $req->param($_);
+    $_, scalar($cgi->param($_));
   } fields('svc_acct_pop')
 } );
 
@@ -39,5 +44,5 @@ if ( $popnum ) {
   eidiot($error) if $error;
   $popnum=$new->getfield('popnum');
 }
-$req->cgi->redirect("../../browse/svc_acct_pop.cgi");
+print $cgi->redirect(popurl(3). "browse/svc_acct_pop.cgi");
 
diff --git a/htdocs/edit/process/svc_acct_sm.cgi b/htdocs/edit/process/svc_acct_sm.cgi
index 9ad546bf4..74ddc1a18 100755
--- a/htdocs/edit/process/svc_acct_sm.cgi
+++ b/htdocs/edit/process/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/svc_acct_sm.cgi: Add/edit a mail alias (process form)
+# $Id: svc_acct_sm.cgi,v 1.2 1998-12-17 08:40:29 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct_sm.cgi
@@ -22,29 +22,34 @@
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: svc_acct_sm.cgi,v $
+# Revision 1.2  1998-12-17 08:40:29  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs);
 use FS::svc_acct_sm;
 
-my($req)=new CGI::Request; # create form object
-cgisuidsetup($req->cgi);
+my($cgi)=new CGI; # create form object
+cgisuidsetup($cgi);
 
-$req->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 my($svcnum)=$1;
 
 my($old)=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
 
 #unmunge domsvc and domuid
-$req->param('domsvc',(split(/:/, $req->param('domsvc') ))[0] );
-$req->param('domuid',(split(/:/, $req->param('domuid') ))[0] );
+$cgi->param('domsvc',(split(/:/, $cgi->param('domsvc') ))[0] );
+$cgi->param('domuid',(split(/:/, $cgi->param('domuid') ))[0] );
 
 my($new) = create FS::svc_acct_sm ( {
   map {
-    ($_, scalar($req->param($_)));
+    ($_, scalar($cgi->param($_)));
   } qw(svcnum pkgnum svcpart domuser domuid domsvc)
 } );
 
@@ -57,24 +62,8 @@ if ( $svcnum ) {
 } 
 
 unless ($error) {
-  $req->cgi->redirect("../../view/svc_acct_sm.cgi?$svcnum");
+  print $cgi->redirect(popurl(3). "view/svc_acct_sm.cgi?$svcnum");
 } else {
-  CGI::Base::SendHeaders(); # one guess
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error adding/editing mail alias</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Error adding/editing mail alias</H4>
-    </CENTER>
-    Your update did not occur because of the following error:
-    <P><B>$error</B>
-    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and submit the form again.
-  </BODY>
-</HTML>
-END
-
+  idiot($error);
 }
 
diff --git a/htdocs/edit/process/svc_domain.cgi b/htdocs/edit/process/svc_domain.cgi
index 0782772dd..e4b751dbb 100755
--- a/htdocs/edit/process/svc_domain.cgi
+++ b/htdocs/edit/process/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/svc_domain.cgi: Add a domain (process form)
+# $Id: svc_domain.cgi,v 1.2 1998-12-17 08:40:30 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -18,9 +18,14 @@
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: svc_domain.cgi,v $
+# Revision 1.2  1998-12-17 08:40:30  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs);
@@ -29,24 +34,24 @@ use FS::svc_domain;
 #remove this to actually test the domains!
 $FS::svc_domain::whois_hack = 1;
 
-my($req) = new CGI::Request;
-&cgisuidsetup($req->cgi);
+my($cgi) = new CGI;
+&cgisuidsetup($cgi);
 
-$req->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 my($svcnum)=$1;
 
 my($new) = create FS::svc_domain ( {
   map {
-    $_, $req->param($_);
+    $_, scalar($cgi->param($_));
   } qw(svcnum pkgnum svcpart domain action purpose)
 } );
 
 my($error);
-if ($req->param('legal') ne "Yes") {
+if ($cgi->param('legal') ne "Yes") {
   $error = "Customer did not agree to be bound by NSI's ".
     qq!<A HREF="http://rs.internic.net/help/agreement.txt">!.
     "Domain Name Resgistration Agreement</A>";
-} elsif ($req->param('svcnum')) {
+} elsif ($cgi->param('svcnum')) {
   $error="Can't modify a domain!";
 } else {
   $error=$new->insert;
@@ -54,25 +59,8 @@ if ($req->param('legal') ne "Yes") {
 }
 
 unless ($error) {
-  $req->cgi->redirect("../../view/svc_domain.cgi?$svcnum");
+  print $cgi->redirect(popurl(3). "view/svc_domain.cgi?$svcnum");
 } else {
-  CGI::Base::SendHeaders(); # one guess
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error adding domain</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Error adding domain</H4>
-    </CENTER>
-    Your update did not occur because of the following error:
-    <P><B>$error</B>
-    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and submit the form again.
-  </BODY>
-</HTML>
-END
-
+  idiot($error);
 }
 
-
-- 
cgit v1.2.1


From 7d61d061817c90f10e02296e47fdd587ac76173f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Dec 1998 09:12:49 +0000
Subject: s/CGI::(Request|Base)/CGI.pm/;

---
 htdocs/misc/bill.cgi             | 48 ++++++++++++-------------------------
 htdocs/misc/cancel-unaudited.cgi | 52 +++++++++++++---------------------------
 htdocs/misc/cancel_pkg.cgi       | 21 +++++++++-------
 htdocs/misc/expire_pkg.cgi       | 45 ++++++++++++----------------------
 htdocs/misc/link.cgi             | 30 ++++++++++-------------
 htdocs/misc/print-invoice.cgi    | 50 ++++++++++++++------------------------
 htdocs/misc/susp_pkg.cgi         | 40 +++++++++----------------------
 htdocs/misc/unsusp_pkg.cgi       | 41 ++++++++++---------------------
 8 files changed, 113 insertions(+), 214 deletions(-)

diff --git a/htdocs/misc/bill.cgi b/htdocs/misc/bill.cgi
index d41f6d1c9..76f160289 100755
--- a/htdocs/misc/bill.cgi
+++ b/htdocs/misc/bill.cgi
@@ -1,36 +1,40 @@
 #!/usr/bin/perl -Tw
 #
+# $Id: bill.cgi,v 1.2 1998-12-17 09:12:41 ivan Exp $
+#
 # s/FS:Search/FS::Record/ and cgisuidsetup($cgi) ivan@sisd.com 98-mar-13
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: bill.cgi,v $
+# Revision 1.2  1998-12-17 09:12:41  ivan
+# s/CGI::(Request|Base)/CGI.pm/;
+#
 
 use strict;
-use CGI::Base qw(:DEFAULT :CGI);
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl eidiot);
 use FS::Record qw(qsearchs);
-use FS::Bill;
+use FS::cust_main;
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
 #untaint custnum
-$QUERY_STRING =~ /^(\d*)$/;
+$cgi->query_string =~ /^(\d*)$/;
 my($custnum)=$1;
 my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
 die "Can't find customer!\n" unless $cust_main;
 
-# ? 
-bless($cust_main,"FS::Bill");
-
 my($error);
 
 $error = $cust_main->bill(
 #                          'time'=>$time
                          );
-&idiot($error) if $error;
+&eidiot($error) if $error;
 
 $error = $cust_main->collect(
 #                             'invoice-time'=>$time,
@@ -38,29 +42,7 @@ $error = $cust_main->collect(
                              'batch_card'=> 'no',
                              'report_badcard'=> 'yes',
                             );
-&idiot($error) if $error;
-
-$cgi->redirect("../view/cust_main.cgi?$custnum#history");
-
-sub idiot {
-  my($error)=@_;
-  CGI::Base::SendHeaders(); # one guess
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error billing customer</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Error billing customer</H4>
-    </CENTER>
-    Your update did not occur because of the following error:
-    <P><B>$error</B>
-  </BODY>
-</HTML>
-END
-
-  exit;
+&eidiot($error) if $error;
 
-}
+print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum#history");
 
diff --git a/htdocs/misc/cancel-unaudited.cgi b/htdocs/misc/cancel-unaudited.cgi
index 929274f38..93edef372 100755
--- a/htdocs/misc/cancel-unaudited.cgi
+++ b/htdocs/misc/cancel-unaudited.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# cancel-unaudited.cgi: Cancel an unaudited account
+# $Id: cancel-unaudited.cgi,v 1.2 1998-12-17 09:12:42 ivan Exp $
 #
 # Usage: cancel-unaudited.cgi svcnum
 #        http://server.name/path/cancel-unaudited.cgi pkgnum
@@ -16,29 +16,34 @@
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cancel-unaudited.cgi,v $
+# Revision 1.2  1998-12-17 09:12:42  ivan
+# s/CGI::(Request|Base)/CGI.pm/;
+#
 
 use strict;
-use CGI::Base qw(:DEFAULT :CGI); # CGI module
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl eidiot);
 use FS::Record qw(qsearchs);
 use FS::cust_svc;
 use FS::svc_acct;
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 &cgisuidsetup($cgi);
  
 #untaint svcnum
-$QUERY_STRING =~ /^(\d+)$/;
+$cgi->query_string =~ /^(\d+)$/;
 my($svcnum)=$1;
 
 my($svc_acct) = qsearchs('svc_acct',{'svcnum'=>$svcnum});
-&idiot("Unknown svcnum!") unless $svc_acct;
+&eidiot("Unknown svcnum!") unless $svc_acct;
 
 my($cust_svc) = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-&idiot(qq!This account has already been audited.  Cancel the 
-    <A HREF="../view/cust_pkg.cgi?! . $cust_svc->getfield('pkgnum') .
+&eidiot(qq!This account has already been audited.  Cancel the 
+    <A HREF="!. popurl(2). qq!view/cust_pkg.cgi?! . $cust_svc->getfield('pkgnum') .
     qq!pkgnum"> package</A> instead.!) 
   if $cust_svc->getfield('pkgnum') ne '';
 
@@ -50,36 +55,13 @@ local $SIG{TSTP} = 'IGNORE';
 
 my($error);
 
-bless($svc_acct,"FS::svc_acct");
 $error = $svc_acct->cancel;
-&idiot($error) if $error;
+&eidiot($error) if $error;
 $error = $svc_acct->delete;
-&idiot($error) if $error;
+&eidiot($error) if $error;
 
-bless($cust_svc,"FS::cust_svc");
 $error = $cust_svc->delete;
-&idiot($error) if $error;
-
-$cgi->redirect("../");
+&eidiot($error) if $error;
 
-sub idiot {
-  my($error)=@_;
-  SendHeaders();
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error cancelling account</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>Error cancelling account</H1>
-    </CENTER>
-    <HR>
-    There has been an error cancelling this acocunt:  $error
-  </BODY>
-  </HEAD>
-</HTML>
-END
-  exit;
-}
+$cgi->redirect(popurl(2));
 
diff --git a/htdocs/misc/cancel_pkg.cgi b/htdocs/misc/cancel_pkg.cgi
index 6702a0351..a9aea3f2a 100755
--- a/htdocs/misc/cancel_pkg.cgi
+++ b/htdocs/misc/cancel_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# cancel_pkg.cgi: Cancel a package
+# $Id: cancel_pkg.cgi,v 1.2 1998-12-17 09:12:43 ivan Exp $
 #
 # Usage: cancel_pkg.cgi pkgnum
 #        http://server.name/path/cancel_pkg.cgi pkgnum
@@ -27,28 +27,31 @@
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cancel_pkg.cgi,v $
+# Revision 1.2  1998-12-17 09:12:43  ivan
+# s/CGI::(Request|Base)/CGI.pm/;
+#
 
 use strict;
-use CGI::Base qw(:DEFAULT :CGI); # CGI module
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(eidiot popurl);
 use FS::Record qw(qsearchs);
 use FS::cust_pkg;
-use FS::CGI qw(idiot);
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 &cgisuidsetup($cgi);
  
 #untaint pkgnum
-$QUERY_STRING =~ /^(\d+)$/ || die "Illegal pkgnum";
+$cgi->query_string =~ /^(\d+)$/ || die "Illegal pkgnum";
 my($pkgnum)=$1;
 
 my($cust_pkg) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
 
-bless($cust_pkg,'FS::cust_pkg');
 my($error)=$cust_pkg->cancel;
-idiot($error) if $error;
+eidiot($error) if $error;
 
-$cgi->redirect("../view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
+print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
 
diff --git a/htdocs/misc/expire_pkg.cgi b/htdocs/misc/expire_pkg.cgi
index 163516627..e921c7218 100755
--- a/htdocs/misc/expire_pkg.cgi
+++ b/htdocs/misc/expire_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# expire_pkg.cgi: Expire a package
+# $Id: expire_pkg.cgi,v 1.2 1998-12-17 09:12:44 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/expire_pkg.cgi
@@ -14,29 +14,35 @@
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+# 
+# $Log: expire_pkg.cgi,v $
+# Revision 1.2  1998-12-17 09:12:44  ivan
+# s/CGI::(Request|Base)/CGI.pm/;
+#
 
 use strict;
 use Date::Parse;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl eidiot);
 use FS::Record qw(qsearchs);
 use FS::cust_pkg;
 
-my($req) = new CGI::Request;
-&cgisuidsetup($req->cgi);
+my($cgi) = new CGI;
+&cgisuidsetup($cgi);
 
 #untaint date & pkgnum
 
 my($date);
-if ( $req->param('date') ) {
-  str2time($req->param('date')) =~ /^(\d+)$/ or die "Illegal date";
+if ( $cgi->param('date') ) {
+  str2time($cgi->param('date')) =~ /^(\d+)$/ or die "Illegal date";
   $date=$1;
 } else {
   $date='';
 }
 
-$req->param('pkgnum') =~ /^(\d+)$/ or die "Illegal pkgnum";
+$cgi->param('pkgnum') =~ /^(\d+)$/ or die "Illegal pkgnum";
 my($pkgnum)=$1;
 
 my($cust_pkg) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
@@ -44,28 +50,7 @@ my(%hash)=$cust_pkg->hash;
 $hash{expire}=$date;
 my($new)=create FS::cust_pkg ( \%hash );
 my($error) = $new->replace($cust_pkg);
-&idiot($error) if $error;
-
-$req->cgi->redirect("../view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
+&eidiot($error) if $error;
 
-sub idiot {
-  my($error)=@_;
-  SendHeaders();
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error expiring package</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>Error expiring package</H1>
-    </CENTER>
-    <HR>
-    There has been an error expiring this package:  $error
-  </BODY>
-  </HEAD>
-</HTML>
-END
-  exit;
-}
+print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
 
diff --git a/htdocs/misc/link.cgi b/htdocs/misc/link.cgi
index d1db000ec..7c7fd6688 100755
--- a/htdocs/misc/link.cgi
+++ b/htdocs/misc/link.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# link: instead of adding a new account, link to an existing. (output form)
+# $Id: link.cgi,v 1.2 1998-12-17 09:12:45 ivan Exp $
 #
 # Note: Should be run setuid freeside as user nobody
 #
@@ -9,10 +9,17 @@
 # rewrite ivan@sisd.com 98-mar-17
 #
 # can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
+#
+# $Log: link.cgi,v $
+# Revision 1.2  1998-12-17 09:12:45  ivan
+# s/CGI::(Request|Base)/CGI.pm/;
+#
 
 use strict;
-use CGI::Base qw(:DEFAULT :CGI);
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl);
 use FS::Record qw(qsearchs);
 
 my(%link_field)=(
@@ -23,12 +30,11 @@ my(%link_field)=(
   'svc_wo'      => '',
 );
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 cgisuidsetup($cgi);
 
 my($pkgnum,$svcpart);
-foreach $_ (split(/-/,$QUERY_STRING)) { #get & untaint pkgnum & svcpart
+foreach $_ (split(/-/,$cgi->query_string)) { #get & untaint pkgnum & svcpart
   $pkgnum=$1 if /^pkgnum(\d+)$/;
   $svcpart=$1 if /^svcpart(\d+)$/;
 }
@@ -38,18 +44,8 @@ my($svc) = $part_svc->getfield('svc');
 my($svcdb) = $part_svc->getfield('svcdb');
 my($link_field) = $link_field{$svcdb};
 
-CGI::Base::SendHeaders();
-print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Link to existing $svc account</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>Link to existing $svc account</H1>
-    </CENTER><HR>
-    <FORM ACTION="process/link.cgi" METHOD=POST>
-END
+print $cgi->header, header("Link to existing $svc account"),
+      qq!<FORM ACTION="!, popurl(1), qq!process/link.cgi" METHOD=POST>!;
 
 if ( $link_field ) { 
   print <<END;
diff --git a/htdocs/misc/print-invoice.cgi b/htdocs/misc/print-invoice.cgi
index 084dcc1c4..546b93ed6 100755
--- a/htdocs/misc/print-invoice.cgi
+++ b/htdocs/misc/print-invoice.cgi
@@ -1,29 +1,37 @@
 #!/usr/bin/perl -Tw
 #
+# $Id: print-invoice.cgi,v 1.2 1998-12-17 09:12:47 ivan Exp $
+#
 # just a kludge for now, since this duplicates in a way it shouldn't stuff from
 # Bill.pm (like $lpr) ivan@sisd.com 98-jun-16
+#
+# $Log: print-invoice.cgi,v $
+# Revision 1.2  1998-12-17 09:12:47  ivan
+# s/CGI::(Request|Base)/CGI.pm/;
+#
 
 use strict;
-use CGI::Base qw(:DEFAULT :CGI);
+use vars qw($conf);
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl);
 use FS::Record qw(qsearchs);
-use FS::Invoice;
+use FS::cust_bill;
 
-my($lpr) = "|lpr -h";
-
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
+$conf = new FS::Conf;
+my $lpr = $conf->config('lpr');
+
 #untaint invnum
-$QUERY_STRING =~ /^(\d*)$/;
+$cgi->query_string =~ /^(\d*)$/;
 my($invnum)=$1;
 my($cust_bill)=qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Can't find invoice!\n" unless $cust_bill;
 
-        bless($cust_bill,"FS::Invoice");
-        open(LPR,$lpr) or die "Can't open $lpr: $!";
+        open(LPR,"|$lpr") or die "Can't open $lpr: $!";
         print LPR $cust_bill->print_text; #( date )
         close LPR
           or die $! ? "Error closing $lpr: $!"
@@ -31,27 +39,5 @@ die "Can't find invoice!\n" unless $cust_bill;
 
 my($custnum)=$cust_bill->getfield('custnum');
 
-$cgi->redirect("../view/cust_main.cgi?$custnum#history");
-
-sub idiot {
-  my($error)=@_;
-  CGI::Base::SendHeaders(); # one guess
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error printing invoice</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Error printing invoice</H4>
-    </CENTER>
-    Your update did not occur because of the following error:
-    <P><B>$error</B>
-  </BODY>
-</HTML>
-END
-
-  exit;
-
-}
+print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum#history");
 
diff --git a/htdocs/misc/susp_pkg.cgi b/htdocs/misc/susp_pkg.cgi
index 7b23caeb2..cb20f82b2 100755
--- a/htdocs/misc/susp_pkg.cgi
+++ b/htdocs/misc/susp_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# susp_pkg.cgi: Suspend a package
+# $Id: susp_pkg.cgi,v 1.2 1998-12-17 09:12:48 ivan Exp $
 #
 # Usage: susp_pkg.cgi pkgnum
 #        http://server.name/path/susp_pkg.cgi pkgnum
@@ -21,48 +21,30 @@
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: susp_pkg.cgi,v $
+# Revision 1.2  1998-12-17 09:12:48  ivan
+# s/CGI::(Request|Base)/CGI.pm/;
+#
 
 use strict;
-use CGI::Base qw(:DEFAULT :CGI); # CGI module
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs);
 use FS::cust_pkg;
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 &cgisuidsetup($cgi);
  
 #untaint pkgnum
-$QUERY_STRING =~ /^(\d+)$/ || die "Illegal pkgnum";
+$cgi->query_string =~ /^(\d+)$/ || die "Illegal pkgnum";
 my($pkgnum)=$1;
 
 my($cust_pkg) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
 
-bless($cust_pkg,'FS::cust_pkg');
 my($error)=$cust_pkg->suspend;
-&idiot($error) if $error;
-
-$cgi->redirect("../view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
+&eidiot($error) if $error;
 
-sub idiot {
-  my($error)=@_;
-  SendHeaders();
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error suspending package</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>Error suspending package</H1>
-    </CENTER>
-    <HR>
-    There has been an error suspending this package:  $error
-  </BODY>
-  </HEAD>
-</HTML>
-END
-  exit;
-}
+print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
 
diff --git a/htdocs/misc/unsusp_pkg.cgi b/htdocs/misc/unsusp_pkg.cgi
index 2f340c6fa..82ecb748e 100755
--- a/htdocs/misc/unsusp_pkg.cgi
+++ b/htdocs/misc/unsusp_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# susp_pkg.cgi: Unsuspend a package
+# $Id: unsusp_pkg.cgi,v 1.2 1998-12-17 09:12:49 ivan Exp $
 #
 # Usage: susp_pkg.cgi pkgnum
 #        http://server.name/path/susp_pkg.cgi pkgnum
@@ -21,48 +21,31 @@
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: unsusp_pkg.cgi,v $
+# Revision 1.2  1998-12-17 09:12:49  ivan
+# s/CGI::(Request|Base)/CGI.pm/;
+#
 
 use strict;
-use CGI::Base qw(:DEFAULT :CGI); # CGI module
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl eidiot);
 use FS::Record qw(qsearchs);
 use FS::cust_pkg;
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 &cgisuidsetup($cgi);
  
 #untaint pkgnum
-$QUERY_STRING =~ /^(\d+)$/ || die "Illegal pkgnum";
+$cgi->query_string =~ /^(\d+)$/ || die "Illegal pkgnum";
 my($pkgnum)=$1;
 
 my($cust_pkg) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
 
-bless($cust_pkg,'FS::cust_pkg');
 my($error)=$cust_pkg->unsuspend;
-&idiot($error) if $error;
-
-$cgi->redirect("../view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
+&eidiot($error) if $error;
 
-sub idiot {
-  my($error)=@_;
-  SendHeaders();
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error unsuspending package</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>Error unsuspending package</H1>
-    </CENTER>
-    <HR>
-    There has been an error unsuspending this package:  $error
-  </BODY>
-  </HEAD>
-</HTML>
-END
-  exit;
-}
+print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
 
-- 
cgit v1.2.1


From 3242132c9ee04a3a3b00c0b35582bc07ed46d736 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Dec 1998 09:15:00 +0000
Subject: s/CGI::Request/CGI.pm/;

---
 htdocs/misc/process/link.cgi | 47 ++++++++++++++++----------------------------
 1 file changed, 17 insertions(+), 30 deletions(-)

diff --git a/htdocs/misc/process/link.cgi b/htdocs/misc/process/link.cgi
index 23fb05386..aab26411d 100755
--- a/htdocs/misc/process/link.cgi
+++ b/htdocs/misc/process/link.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/link.cgi: link to existing customer (process form)
+# $Id: link.cgi,v 1.2 1998-12-17 09:15:00 ivan Exp $
 #
 # ivan@voicenet.com 97-feb-5
 #
@@ -10,29 +10,32 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
+#
+# $Log: link.cgi,v $
+# Revision 1.2  1998-12-17 09:15:00  ivan
+# s/CGI::Request/CGI.pm/;
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
-use FS::CGI qw(idiot);
+use FS::CGI qw(popurlidiot);
 use FS::UID qw(cgisuidsetup);
 use FS::cust_svc;
 use FS::Record qw(qsearchs);
 
-my($req)=new CGI::Request; # create form object
-cgisuidsetup($req->cgi);
-
-#$req->import_names('R'); #import CGI variables into package 'R';
+my($cgi)=new CGI;
+cgisuidsetup($cgi);
 
-$req->param('pkgnum') =~ /^(\d+)$/; my($pkgnum)=$1;
-$req->param('svcpart') =~ /^(\d+)$/; my($svcpart)=$1;
+$cgi->param('pkgnum') =~ /^(\d+)$/; my($pkgnum)=$1;
+$cgi->param('svcpart') =~ /^(\d+)$/; my($svcpart)=$1;
 
-$req->param('svcnum') =~ /^(\d*)$/; my($svcnum)=$1;
+$cgi->param('svcnum') =~ /^(\d*)$/; my($svcnum)=$1;
 unless ( $svcnum ) {
   my($part_svc) = qsearchs('part_svc',{'svcpart'=>$svcpart});
   my($svcdb) = $part_svc->getfield('svcdb');
-  $req->param('link_field') =~ /^(\w+)$/; my($link_field)=$1;
-  my($svc_acct)=qsearchs($svcdb,{$link_field => $req->param('link_value') });
+  $cgi->param('link_field') =~ /^(\w+)$/; my($link_field)=$1;
+  my($svc_acct)=qsearchs($svcdb,{$link_field => $cgi->param('link_value') });
   idiot("$link_field not found!") unless $svc_acct;
   $svcnum=$svc_acct->svcnum;
 }
@@ -50,24 +53,8 @@ $error = $new->replace($old);
 
 unless ($error) {
   #no errors, so let's view this customer.
-  $req->cgi->redirect("../../view/cust_pkg.cgi?$pkgnum");
+  print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?$pkgnum");
 } else {
-  CGI::Base::SendHeaders(); # one guess
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Error</H4>
-    </CENTER>
-    Your update did not occur because of the following error:
-    <P><B>$error</B>
-    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and submit the form again.
-  </BODY>
-</HTML>
-END
- 
+  idiot($error);
 }
 
-- 
cgit v1.2.1


From ccc7d08bc89b58e1143a1c54de24385495e90be3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Dec 1998 09:41:12 +0000
Subject: s/CGI::(Base|Request)/CGI.pm/;

---
 htdocs/search/cust_bill.cgi   | 36 ++++++++++++------------------
 htdocs/search/cust_main.cgi   |  9 +++++---
 htdocs/search/cust_pkg.cgi    | 19 ++++++++++------
 htdocs/search/svc_acct.cgi    | 48 +++++++++++++++-------------------------
 htdocs/search/svc_acct_sm.cgi | 51 ++++++++++++++-----------------------------
 htdocs/search/svc_domain.cgi  | 38 +++++++++++++-------------------
 6 files changed, 81 insertions(+), 120 deletions(-)

diff --git a/htdocs/search/cust_bill.cgi b/htdocs/search/cust_bill.cgi
index 5be84b79e..29ff78107 100755
--- a/htdocs/search/cust_bill.cgi
+++ b/htdocs/search/cust_bill.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# cust_bill.cgi: Search for invoices (process form)
+# $Id: cust_bill.cgi,v 1.2 1998-12-17 09:41:07 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_bill.cgi
@@ -11,36 +11,28 @@
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cust_bill.cgi,v $
+# Revision 1.2  1998-12-17 09:41:07  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
 
 use strict;
-use CGI::Request;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl idiot);
 use FS::Record qw(qsearchs);
 
-my($req)=new CGI::Request;
-cgisuidsetup($req->cgi);
+my($cgi)=new CGI;
+cgisuidsetup($cgi);
 
-$req->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
+$cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
 my($invnum)=$2;
 
 if ( qsearchs('cust_bill',{'invnum'=>$invnum}) ) {
-  $req->cgi->redirect("../view/cust_bill.cgi?$invnum");  #redirect
+  print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
 } else { #error
-  CGI::Base::SendHeaders(); # one guess
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Invoice Search Error</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H3>Invoice Search Error</H3>
-    <HR>
-    Invoice not found.
-    </CENTER>
-  </BODY>
-</HTML>
-END
-
+  idiot("Invoice not found.");
 }
 
diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index c228c9a24..6241f3310 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/cust_main.cgi: Search for customers (process form)
+# $Id: cust_main.cgi,v 1.3 1998-12-17 09:41:08 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -19,7 +19,10 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.2  1998-11-12 08:10:22  ivan
+# Revision 1.3  1998-12-17 09:41:08  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+# Revision 1.2  1998/11/12 08:10:22  ivan
 # CGI.pm instead of CGI-modules
 # relative URLs using popurl
 # got rid of lots of little tables
@@ -68,7 +71,7 @@ my(%all_pkgs) =
   map { $_->custnum => [ $_->all_pkgs ] } @cust_main;
 
 if ( scalar(@cust_main) == 1 ) {
-  print $cgi->redirect(popurl(2). "/view/cust_main.cgi?". $cust_main[0]->custnum);
+  print $cgi->redirect(popurl(2). "view/cust_main.cgi?". $cust_main[0]->custnum);
   exit;
 } elsif ( scalar(@cust_main) == 0 ) {
   idiot "No matching customers found!\n";
diff --git a/htdocs/search/cust_pkg.cgi b/htdocs/search/cust_pkg.cgi
index 967068f5e..12d601a01 100755
--- a/htdocs/search/cust_pkg.cgi
+++ b/htdocs/search/cust_pkg.cgi
@@ -1,22 +1,27 @@
 #!/usr/bin/perl -Tw
 #
-# cust_pkg.cgi: search/browse for packages
+# $Id: cust_pkg.cgi,v 1.2 1998-12-17 09:41:09 ivan Exp $
 #
 # based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
+#
+# $Log: cust_pkg.cgi,v $
+# Revision 1.2  1998-12-17 09:41:09  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header idiot);
+use FS::CGI qw(header idiot popurl);
 
-my($req)=new CGI::Request;
-&cgisuidsetup($req->cgi);
+my($cgi)=new CGI;
+&cgisuidsetup($cgi);
 
 my(@cust_pkg,$sortby);
 
-my($query)=$req->cgi->var('QUERY_STRING');
+my($query)=$cgi->query_string;
 #this tree is a little bit redundant
 if ( $query eq 'pkgnum' ) {
   $sortby=\*pkgnum_sort;
@@ -50,7 +55,7 @@ if ( $query eq 'pkgnum' ) {
 
 if ( scalar(@cust_pkg) == 1 ) {
   my($pkgnum)=$cust_pkg[0]->pkgnum;
-  $req->cgi->redirect("../view/cust_pkg.cgi?$pkgnum");
+  print $cgi->redirect(popurl(2). "view/cust_pkg.cgi?$pkgnum");
   exit;
 } elsif ( scalar(@cust_pkg) == 0 ) { #error
   &idiot("No packages found");
diff --git a/htdocs/search/svc_acct.cgi b/htdocs/search/svc_acct.cgi
index 250a741db..2b6c1ee4e 100755
--- a/htdocs/search/svc_acct.cgi
+++ b/htdocs/search/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# svc_acct.cgi: Search for customers (process form)
+# $Id: svc_acct.cgi,v 1.2 1998-12-17 09:41:10 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
@@ -21,20 +21,25 @@
 # use FS::CGI, show total ivan@sisd.com 98-jul-17
 #
 # give service and customer info too ivan@sisd.com 98-aug-16
+#
+# $Log: svc_acct.cgi,v $
+# Revision 1.2  1998-12-17 09:41:10  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
 
 use strict;
-use CGI::Request; # form processing module
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header idiot);
+use FS::CGI qw(header idiot popurl);
 
-my($req)=new CGI::Request; # create form object
-&cgisuidsetup($req->cgi);
+my($cgi)=new CGI;
+&cgisuidsetup($cgi);
 
 my(@svc_acct,$sortby);
 
-my($query)=$req->cgi->var('QUERY_STRING');
+my($query)=$cgi->query_string;
 #this tree is a little bit redundant
 if ( $query eq 'svcnum' ) {
   $sortby=\*svcnum_sort;
@@ -69,15 +74,14 @@ if ( $query eq 'svcnum' ) {
 
 if ( scalar(@svc_acct) == 1 ) {
   my($svcnum)=$svc_acct[0]->svcnum;
-  $req->cgi->redirect("../view/svc_acct.cgi?$svcnum");  #redirect
+  print $cgi->redirect(popurl(2). "view/svc_acct.cgi?$svcnum");  #redirect
   exit;
 } elsif ( scalar(@svc_acct) == 0 ) { #error
   idiot("Account not found");
   exit;
 } else {
   my($total)=scalar(@svc_acct);
-  CGI::Base::SendHeaders(); # one guess
-  print header("Account Search Results",''), <<END;
+  print $cgi->header("Account Search Results",''), <<END;
     $total matching accounts found
     <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
       <TR>
@@ -91,9 +95,8 @@ if ( scalar(@svc_acct) == 1 ) {
       </TR>
 END
 
-  my($lines)=16;
-  my($lcount)=$lines;
   my(%saw,$svc_acct);
+  my $p = popurl(2);
   foreach $svc_acct (
     sort $sortby grep(!$saw{$_->svcnum}++, @svc_acct)
   ) {
@@ -119,13 +122,13 @@ END
       $cust_svc->pkgnum ? $cust_main->company : '',
     );
     my($pcustnum) = $custnum
-      ? "<A HREF=\"../view/cust_main.cgi?$custnum\"><FONT SIZE=-1>$custnum</FONT></A>"
+      ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\"><FONT SIZE=-1>$custnum</FONT></A>"
       : "<I>(unlinked)</I>"
     ;
     my($pname) = $custnum ? "$last, $first" : '';
     print <<END;
     <TR>
-      <TD><A HREF="../view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
+      <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
       <TD><FONT SIZE=-1>$username</FONT></TD>
       <TD><FONT SIZE=-1>$uid</FONT></TD>
       <TD><FONT SIZE=-1>$svc</FONT></TH>
@@ -134,22 +137,7 @@ END
       <TD><FONT SIZE=-1>$company</FONT></TH>
     </TR>
 END
-    if ($lcount-- == 0) { # lots of little tables instead of one big one
-      $lcount=$lines;
-      print <<END;   
-  </TABLE>
-  <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
-    <TR>
-      <TH>Service #</TH>
-      <TH>Userame</TH>
-      <TH>UID</TH>
-        <TH>Service</TH>
-        <TH>Customer #</TH>
-        <TH>Contact name</TH>
-        <TH>Company</TH>
-    </TR>
-END
-    }
+
   }
  
   print <<END;
@@ -176,7 +164,7 @@ sub uid_sort {
 
 sub usernamesearch {
 
-  $req->param('username') =~ /^([\w\d\-]{2,8})$/; #untaint username_text
+  $cgi->param('username') =~ /^([\w\d\-]{2,8})$/; #untaint username_text
   my($username)=$1;
 
   @svc_acct=qsearch('svc_acct',{'username'=>$username});
diff --git a/htdocs/search/svc_acct_sm.cgi b/htdocs/search/svc_acct_sm.cgi
index 38656ea53..824a551c7 100755
--- a/htdocs/search/svc_acct_sm.cgi
+++ b/htdocs/search/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# svc_acct_sm.cgi: Search for domains (process form)
+# $Id: svc_acct_sm.cgi,v 1.3 1998-12-17 09:41:11 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -17,25 +17,31 @@
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: svc_acct_sm.cgi,v $
+# Revision 1.3  1998-12-17 09:41:11  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
 
 use strict;
 use vars qw($conf);
 use CGI::Request;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl idiot header table);
 use FS::Record qw(qsearch qsearchs);
 use FS::Conf;
 
+my($cgi)=new CGI;
+&cgisuidsetup($cgi);
+
 $conf = new FS::Conf;
 my $mydomain = $conf->config('domain');
 
-my($req)=new CGI::Request; # create form object
-&cgisuidsetup($req->cgi);
-
-$req->param('domuser') =~ /^([a-z0-9_\-]{0,32})$/;
+$cgi->param('domuser') =~ /^([a-z0-9_\-]{0,32})$/;
 my($domuser)=$1;
 
-$req->param('domain') =~ /^([\w\-\.]+)$/ or die "Illegal domain";
+$cgi->param('domain') =~ /^([\w\-\.]+)$/ or die "Illegal domain";
 my($svc_domain)=qsearchs('svc_domain',{'domain'=>$1})
   or die "Unknown domain";
 my($domsvc)=$svc_domain->svcnum;
@@ -52,18 +58,10 @@ if ($domuser) {
 
 if ( scalar(@svc_acct_sm) == 1 ) {
   my($svcnum)=$svc_acct_sm[0]->svcnum;
-  $req->cgi->redirect("../view/svc_acct_sm.cgi?$svcnum");  #redirect
+  print $cgi->redirect(popurl(2). "view/svc_acct_sm.cgi?$svcnum");  #redirect
 } elsif ( scalar(@svc_acct_sm) > 1 ) {
   CGI::Base::SendHeaders();
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Mail Alias Search Results</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Mail Alias Search Results</H4>
-    <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
+  print $cgi->header, header('Mail Alias Search Results'), table, <<END;
       <TR>
         <TH>Mail to<BR><FONT SIZE=-2>(click here to view mail alias)</FONT></TH>
         <TH>Forwards to<BR><FONT SIZE=-2>(click here to view account)</FONT></TH>
@@ -84,9 +82,7 @@ END
     my($username)=$svc_acct->username;
     my($svc_acct_svcnum)=$svc_acct->svcnum;
 
-    print <<END;
-<TR>\n        <TD> <A HREF="../view/svc_acct_sm.cgi?$svcnum">
-END
+    print qq!<TR>\n        <TD> <A HREF="!. popurl(2). qq!view/svc_acct_sm.cgi?$svcnum">!;
 
     print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
 
@@ -105,21 +101,6 @@ END
 END
 
 } else { #error
-  CGI::Base::SendHeaders(); # one guess
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Mail Alias Search Error</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H3>Mail Alias Search Error</H3>
-    <HR>
-    Mail Alias not found.
-    </CENTER>
-  </BODY>
-</HTML>
-END
-
+  idiot("Mail Alias not found");
 }
 
diff --git a/htdocs/search/svc_domain.cgi b/htdocs/search/svc_domain.cgi
index d5277037b..1fd6a515b 100755
--- a/htdocs/search/svc_domain.cgi
+++ b/htdocs/search/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# svc_domain.cgi: Search for domains (process form)
+# $Id: svc_domain.cgi,v 1.2 1998-12-17 09:41:12 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -15,21 +15,26 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # display total, use FS::CGI now does browsing too ivan@sisd.com 98-jul-17
+#
+# $Log: svc_domain.cgi,v $
+# Revision 1.2  1998-12-17 09:41:12  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header idiot);
+use FS::CGI qw(header idiot popurl);
 
-my($req)=new CGI::Request;
-&cgisuidsetup($req->cgi);
+my($cgi)=new CGI;
+&cgisuidsetup($cgi);
 
 my(@svc_domain);
 my($sortby);
 
-my($query)=$req->cgi->var('QUERY_STRING');
+my($query)=$cgi->query_string;
 if ( $query eq 'svcnum' ) {
   $sortby=\*svcnum_sort;
   @svc_domain=qsearch('svc_domain',{});
@@ -49,13 +54,13 @@ if ( $query eq 'svcnum' ) {
       'pkgnum' => '',
     }), qsearch('svc_domain',{});
 } else {
-  $req->param('domain') =~ /^([\w\-\.]+)$/; 
+  $cgi->param('domain') =~ /^([\w\-\.]+)$/; 
   my($domain)=$1;
   push @svc_domain, qsearchs('svc_domain',{'domain'=>$domain});
 }
 
 if ( scalar(@svc_domain) == 1 ) {
-  $req->cgi->redirect("../view/svc_domain.cgi?". $svc_domain[0]->svcnum);
+  print $cgi->redirect(popurl(2). "view/svc_domain.cgi?". $svc_domain[0]->svcnum);
   exit;
 } elsif ( scalar(@svc_domain) == 0 ) {
   idiot "No matching domains found!\n";
@@ -76,9 +81,8 @@ if ( scalar(@svc_domain) == 1 ) {
       </TR>
 END
 
-  my($lines)=16;
-  my($lcount)=$lines;
   my(%saw,$svc_domain);
+  my $p = popurl(2);
   foreach $svc_domain (
     sort $sortby grep(!$saw{$_->svcnum}++, @svc_domain)
   ) {
@@ -100,23 +104,11 @@ END
     }
     print <<END;
     <TR>
-      <TD><A HREF="../view/svc_domain.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
+      <TD><A HREF="${p}view/svc_domain.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
       <TD><FONT SIZE=-1>$domain</FONT></TD>
       <TD><FONT SIZE=-1>$malias</FONT></TD>
     </TR>
 END
-    if ($lcount-- == 0) { # lots of little tables instead of one big one
-      $lcount=$lines;
-      print <<END;   
-  </TABLE>
-  <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
-    <TR>
-      <TH>Service #</TH>
-      <TH>Domain</TH>
-      <TH></TH>
-    </TR>
-END
-    }
   }
  
   print <<END;
-- 
cgit v1.2.1


From e03778f753c3458e669fb261a013e6c2931c2dd7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Dec 1998 09:57:25 +0000
Subject: s/CGI::(Base|Request)/CGI.pm/;

---
 htdocs/view/cust_bill.cgi   | 42 ++++++++++++++++++------------------------
 htdocs/view/cust_main.cgi   |  7 +++++--
 htdocs/view/cust_pkg.cgi    | 29 ++++++++++-------------------
 htdocs/view/svc_acct.cgi    | 41 +++++++++++++++++------------------------
 htdocs/view/svc_acct_sm.cgi | 41 +++++++++++++++++++----------------------
 htdocs/view/svc_domain.cgi  | 28 +++++++++++++---------------
 6 files changed, 82 insertions(+), 106 deletions(-)

diff --git a/htdocs/view/cust_bill.cgi b/htdocs/view/cust_bill.cgi
index 96101d004..e77f13d9b 100755
--- a/htdocs/view/cust_bill.cgi
+++ b/htdocs/view/cust_bill.cgi
@@ -1,7 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# Usage: cust_bill.cgi invnum
-#        http://server.name/path/cust_bill.cgi?invnum
+# $Id: cust_bill.cgi,v 1.2 1998-12-17 09:57:20 ivan Exp $
 #
 # Note: Should be run setuid freeside as user nobody.
 #
@@ -24,21 +23,26 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # also print 'printed' field ivan@sisd.com 98-jul-10
+#
+# $Log: cust_bill.cgi,v $
+# Revision 1.2  1998-12-17 09:57:20  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
 
 use strict;
 use IO::File;
-use CGI::Base qw(:DEFAULT :CGI); # CGI module
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl);
 use FS::Record qw(qsearchs);
-use FS::Invoice;
+use FS::cust_bill;
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
 #untaint invnum
-$QUERY_STRING =~ /^(\d+)$/;
+$cgi->query_string =~ /^(\d+)$/;
 my($invnum)=$1;
 
 my($cust_bill) = qsearchs('cust_bill',{'invnum'=>$invnum});
@@ -47,27 +51,17 @@ my($custnum) = $cust_bill->getfield('custnum');
 
 my($printed) = $cust_bill->printed;
 
-SendHeaders(); # one guess.
-print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Invoice View</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>Invoice View</H1>
-    <A HREF="../view/cust_main.cgi?$custnum">View this customer (#$custnum)</A> | <A HREF="../">Main menu</A>
-    </CENTER><HR>
-    <BASEFONT SIZE=3>
-    <CENTER>
-      <A HREF="../edit/cust_pay.cgi?$invnum">Enter payments (check/cash) against this invoice</A>
-      <BR><A HREF="../misc/print-invoice.cgi?$invnum">Reprint this invoice</A>
+my $p = popurl(2);
+print $cgi->header, header('Invoice View', menubar(
+  "Main Menu" => $p,
+  "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+)), <<END;
+      <A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) against this invoice</A>
+      <BR><A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>
       <BR><BR>(Printed $printed times)
-    </CENTER>
     <FONT SIZE=-1><PRE>
 END
 
-bless($cust_bill,"FS::Invoice");
 print $cust_bill->print_text;
 
 	#formatting
diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index c39643d70..b1c0bbb01 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# cust_main.cgi: View a customer
+# $Id: cust_main.cgi,v 1.4 1998-12-17 09:57:21 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -33,7 +33,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.3  1998-11-15 13:14:20  ivan
+# Revision 1.4  1998-12-17 09:57:21  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+# Revision 1.3  1998/11/15 13:14:20  ivan
 # first pass as per-customer custom pricing
 #
 # Revision 1.2  1998/11/13 11:28:08  ivan
diff --git a/htdocs/view/cust_pkg.cgi b/htdocs/view/cust_pkg.cgi
index d7269281f..bbe3db53d 100755
--- a/htdocs/view/cust_pkg.cgi
+++ b/htdocs/view/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# cust_pkg.cgi: View a package
+# $Id: cust_pkg.cgi,v 1.3 1998-12-17 09:57:22 ivan Exp $
 #
 # Usage: cust_pkg.cgi pkgnum
 #        http://server.name/path/cust_pkg.cgi?pkgnum
@@ -26,7 +26,10 @@
 # no FS::Search ivan@sisd.com 98-mar-7
 # 
 # $Log: cust_pkg.cgi,v $
-# Revision 1.2  1998-11-13 09:56:49  ivan
+# Revision 1.3  1998-12-17 09:57:22  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+# Revision 1.2  1998/11/13 09:56:49  ivan
 # change configuration file layout to support multiple distinct databases (with
 # own set of config files, export, etc.)
 #
@@ -36,7 +39,7 @@ use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(url);
+use FS::CGI qw(popurl header);
 use FS::Record qw(qsearch qsearchs);
 
 my($cgi) = new CGI;
@@ -45,25 +48,13 @@ cgisuidsetup($cgi);
 my(%uiview,%uiadd);
 my($part_svc);
 foreach $part_svc ( qsearch('part_svc',{}) ) {
-  $uiview{$part_svc->svcpart} = url(1). "/view/". $part_svc->svcdb . ".cgi";
-  $uiadd{$part_svc->svcpart}= url(1). "/edit/". $part_svc->svcdb . ".cgi";
+  $uiview{$part_svc->svcpart} = popurl(2). "view/". $part_svc->svcdb . ".cgi";
+  $uiadd{$part_svc->svcpart}= popurl(2). "edit/". $part_svc->svcdb . ".cgi";
 }
 
-SendHeaders(); # one guess.
-print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Package View</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>Package View</H1>
-    </CENTER>
-    <BASEFONT SIZE=3>
-END
+print $cgi->header, header('Package View', '');
 
-#untaint pkgnum
-$QUERY_STRING =~ /^(\d+)$/;
+$cgi->query_string =~ /^(\d+)$/;
 my($pkgnum)=$1;
 
 #get package record
diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi
index e48878c42..9fcc4c57c 100755
--- a/htdocs/view/svc_acct.cgi
+++ b/htdocs/view/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.2 1998-12-16 05:24:29 ivan Exp $
+# $Id: svc_acct.cgi,v 1.3 1998-12-17 09:57:23 ivan Exp $
 #
 # Usage: svc_acct.cgi svcnum
 #        http://server.name/path/svc_acct.cgi?svcnum
@@ -35,27 +35,29 @@
 # displays arbitrary radius attributes ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.2  1998-12-16 05:24:29  ivan
+# Revision 1.3  1998-12-17 09:57:23  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+# Revision 1.2  1998/12/16 05:24:29  ivan
 # use FS::Conf;
 #
 
 use strict;
 use vars qw($conf);
-use CGI::Base qw(:DEFAULT :CGI);
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs fields);
 use FS::Conf;
 
+my($cgi) = new CGI;
+&cgisuidsetup($cgi);
+
 $conf = new FS::Conf;
 my $mydomain = $conf->config('domain');
 
-my($cgi) = new CGI::Base;
-$cgi->get;
-&cgisuidsetup($cgi);
-
 #untaint svcnum
-$QUERY_STRING =~ /^(\d+)$/;
+$cgi->query_string =~ /^(\d+)$/;
 my($svcnum)=$1;
 my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svcnum});
 die "Unkonwn svcnum" unless $svc_acct;
@@ -71,35 +73,26 @@ if ($pkgnum) {
 my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unkonwn svcpart" unless $part_svc;
 
-SendHeaders(); # one guess.
-print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Account View</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER><H1>Account View</H1>
-    <BASEFONT SIZE=3>
-<CENTER>
-END
+print $cgi->header, header('Account View', '');
 
+my $p = popurl(2);
 if ($pkgnum || $custnum) {
   print <<END;
-<A HREF="../view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> | 
-<A HREF="../view/cust_main.cgi?$custnum">View this customer (#$custnum)</A> | 
+<A HREF="${p}view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> | 
+<A HREF="${p}view/cust_main.cgi?$custnum">View this customer (#$custnum)</A> | 
 END
 } else {
   print <<END;
-<A HREF="../misc/cancel-unaudited.cgi?$svcnum">Cancel this (unaudited)account</A> |
+<A HREF="${p}misc/cancel-unaudited.cgi?$svcnum">Cancel this (unaudited)account</A> |
 END
 }
 
 print <<END;
-<A HREF="../">Main menu</A></CENTER><BR>
+<A HREF="${p}">Main menu</A></CENTER><BR>
 <FONT SIZE=+1>Service #$svcnum</FONT>
 END
 
-print qq!<BR><A HREF="../edit/svc_acct.cgi?$svcnum">Edit this information</A>!;
+print qq!<BR><A HREF="${p}edit/svc_acct.cgi?$svcnum">Edit this information</A>!;
 #print qq!<BR><A HREF="../misc/sendconfig.cgi?$svcnum">Send account information</A>!;
 print qq!<BR><BR><A HREF="#general">General</A> | <A HREF="#shell">Shell account</A> | !;
 print qq!<A HREF="#slip">SLIP/PPP account</A></CENTER>!;
diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi
index 00aa5551a..a80e36845 100755
--- a/htdocs/view/svc_acct_sm.cgi
+++ b/htdocs/view/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.2 1998-12-16 05:24:30 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.3 1998-12-17 09:57:24 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi svcnum
 #        http://server.name/path/svc_acct_sm.cgi?svcnum
@@ -22,26 +22,29 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.2  1998-12-16 05:24:30  ivan
+# Revision 1.3  1998-12-17 09:57:24  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+# Revision 1.2  1998/12/16 05:24:30  ivan
 # use FS::Conf;
 #
 
 use strict;
 use vars qw($conf);
-use CGI::Base qw(:DEFAULT :CGI);
+use CGI;
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl);
 use FS::Record qw(qsearchs);
 use FS::Conf;
 
+my($cgi) = new CGI;
+cgisuidsetup($cgi);
+
 $conf = new FS::Conf;
 my $mydomain = $conf->config('domain');
 
-my($cgi) = new CGI::Base;
-$cgi->get;
-cgisuidsetup($cgi);
-
 #untaint svcnum
-$QUERY_STRING =~ /^(\d+)$/;
+$cgi->query_string =~ /^(\d+)$/;
 my($svcnum)=$1;
 my($svc_acct_sm)=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum});
 die "Unknown svcnum" unless $svc_acct_sm;
@@ -57,30 +60,24 @@ if ($pkgnum) {
 my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unkonwn svcpart" unless $part_svc;
 
-SendHeaders(); # one guess.
-print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Mail Alias View</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER><H1>Mail Alias View</H1>
-END
+print $cgi->header, header('Mail Alias View');
+
+my $p = popurl(2);
 if ($pkgnum || $custnum) {
   print <<END;
-<A HREF="../view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> | 
-<A HREF="../view/cust_main.cgi?$custnum">View this customer (#$custnum)</A> | 
+<A HREF="${p}view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> | 
+<A HREF="${p}view/cust_main.cgi?$custnum">View this customer (#$custnum)</A> | 
 END
 } else {
   print <<END;
-<A HREF="../misc/cancel-unaudited.cgi?$svcnum">Cancel this (unaudited)account</A> |
+<A HREF="${p}misc/cancel-unaudited.cgi?$svcnum">Cancel this (unaudited)account</A> |
 END
 }
 
 print <<END;
-    <A HREF="../">Main menu</A></CENTER><BR<
+    <A HREF="${p}">Main menu</A></CENTER><BR<
     <FONT SIZE=+1>Service #$svcnum</FONT>
-    <P><A HREF="../edit/svc_acct_sm.cgi?$svcnum">Edit this information</A>
+    <P><A HREF="${p}edit/svc_acct_sm.cgi?$svcnum">Edit this information</A>
     <BASEFONT SIZE=3>
 END
 
diff --git a/htdocs/view/svc_domain.cgi b/htdocs/view/svc_domain.cgi
index fa35a8cd5..a903fa4ba 100755
--- a/htdocs/view/svc_domain.cgi
+++ b/htdocs/view/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# View svc_domain records
+# $Id: svc_domain.cgi,v 1.3 1998-12-17 09:57:25 ivan Exp $
 #
 # Usage: svc_domain svcnum
 #        http://server.name/path/svc_domain.cgi?svcnum
@@ -15,7 +15,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.2  1998-11-13 09:56:50  ivan
+# Revision 1.3  1998-12-17 09:57:25  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+# Revision 1.2  1998/11/13 09:56:50  ivan
 # change configuration file layout to support multiple distinct databases (with
 # own set of config files, export, etc.)
 #
@@ -23,6 +26,7 @@
 use strict;
 use CGI;
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header menubar popurl);
 use FS::Record qw(qsearchs);
 
 my($cgi) = new CGI;
@@ -46,19 +50,13 @@ if ($pkgnum) {
 my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unkonwn svcpart" unless $part_svc;
 
-print $cgi->header, <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Domain View</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER><H1>Domain View</H1>
-    <BASEFONT SIZE=3>
-<CENTER>
-<A HREF="../view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> | 
-<A HREF="../view/cust_main.cgi?$custnum">View this customer (#$custnum)</A> | 
-<A HREF="../">Main menu</A></CENTER><BR>
-    <FONT SIZE=+1>Service #$svcnum</FONT>
+my $p = popurl(2);
+print $cgi->header, header('Domain View', menubar(
+  "Main menu" => $p,
+  "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
+  "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+)), <<END;
+    <BR><FONT SIZE=+1>Service #$svcnum</FONT>
     </CENTER>
 END
 
-- 
cgit v1.2.1


From e10ac0a3a728f9410ae6d7b121809eb14e33c42f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 20 Dec 1998 02:11:31 +0000
Subject: suggest suEXEC as an alternative to suidperl

---
 htdocs/docs/install.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 058a60a1e..5d00f9641 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -40,10 +40,17 @@ cp fs-x.y.z/site_perl/* /usr/local/lib/site_perl/FS</pre> or <pre>ln -s /full/pa
 cp -r fs-x.y.z/htdocs/* /usr/local/apache/htdocs/freeside</pre> or <pre>ln -s /full/path/to/fs-x.y.z/htdocs /usr/local/apache/htdocs/freeside</pre>
   <li>Restrict access to this web interface.  (with <a href="http://www.apache.org/docs/misc/FAQ.html#user-authentication">Apache</a>)
   <li>Enable CGI execution for files with the `.cgi' extension.  (with <a href="http://www.apache.org/docs/mod/mod_mime.html#addhandler">Apache</a>)
-  <li>Set ownership and permissions for the web interface.  Your system should support secure setuid scripts or Perl's emulation, see <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">perlsec: Security Bugs</a> for information and workarounds.
+  <li>Set ownership and permissions for the web interface.  The web interface needs to run as the freeside user - there are several ways to do this.
+    <ul>
+      <li>Use Perl's setuid emulation: see the <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">Security Bugs</a> section of the <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html">perlsec</a> manpage.
 <pre>cd /usr/local/apache/htdocs/freeside
 chown -R freeside .
 chmod 4755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.cgi search/*.cgi view/*.cgi</pre>
+      <li>Use Apache's <a href="http://www.apache.org/docs/suexec.html">suEXEC</a>.
+<pre>cd /usr/local/apache/htdocs/freeside
+chown -R freeside .
+chmod 755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.cgi search/*.cgi view/*.cgi</pre>
+    </ul>
 <li>Create the necessary <a href="config.html">configuration files</a>.
 <li>Create the `/usr/local/etc/freeside/counters.<i>datasrc</i>', and 
   `/usr/local/etc/freeside/export.<i>datasrc</i>' directories for each <i>datasrc</i>.
-- 
cgit v1.2.1


From 09a5eb8c6c43659d31fc043f556e404dcf322b13 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Dec 1998 02:23:16 +0000
Subject: popurl always has trailing slash

---
 site_perl/CGI.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index 65bf2012d..b21a88837 100644
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -134,7 +134,9 @@ sub popurl {
   my(@path)=$url->path_components;
   splice @path, 0-$up;
   $url->path_components(@path);
-  $url->as_string;
+  my $x = $url->as_string;
+  $x .= '/' unless $x =~ /\/$/;
+  $x;
 }
 
 =item table
@@ -171,7 +173,10 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 pod ivan@sisd.com 98-sep-12
 
 $Log: CGI.pm,v $
-Revision 1.11  1998-11-12 07:43:54  ivan
+Revision 1.12  1998-12-23 02:23:16  ivan
+popurl always has trailing slash
+
+Revision 1.11  1998/11/12 07:43:54  ivan
 *** empty log message ***
 
 Revision 1.10  1998/11/12 01:53:47  ivan
-- 
cgit v1.2.1


From abd87398fd638bb964fc57142dbf7000b6bb6752 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Dec 1998 02:26:06 +0000
Subject: *** empty log message ***

---
 htdocs/edit/cust_credit.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/edit/cust_credit.cgi b/htdocs/edit/cust_credit.cgi
index 793a451e6..02b8008f7 100755
--- a/htdocs/edit/cust_credit.cgi
+++ b/htdocs/edit/cust_credit.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_credit.cgi,v 1.2 1998-12-17 06:16:59 ivan Exp $
+# $Id: cust_credit.cgi,v 1.3 1998-12-23 02:26:06 ivan Exp $
 #
 # Usage: cust_credit.cgi custnum [ -paybatch ]
 #        http://server.name/path/cust_credit?custnum [ -paybatch ]
@@ -25,7 +25,10 @@
 # rewrite ivan@sisd.com 98-mar-16
 #
 # $Log: cust_credit.cgi,v $
-# Revision 1.2  1998-12-17 06:16:59  ivan
+# Revision 1.3  1998-12-23 02:26:06  ivan
+# *** empty log message ***
+#
+# Revision 1.2  1998/12/17 06:16:59  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 
@@ -33,7 +36,7 @@ use strict;
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker popurl);
+use FS::UID qw(cgisuidsetup getotaker);
 use FS::CGI qw(header popurl);
 
 my $cgi = new CGI;
-- 
cgit v1.2.1


From b809dc5ade3eff7116807ab1ed2c0658f3dee9a7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Dec 1998 02:36:28 +0000
Subject: use FS::cust_refund; to eliminate warning

---
 htdocs/view/cust_main.cgi | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index b1c0bbb01..c28c80067 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.4 1998-12-17 09:57:21 ivan Exp $
+# $Id: cust_main.cgi,v 1.5 1998-12-23 02:36:28 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -33,7 +33,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.4  1998-12-17 09:57:21  ivan
+# Revision 1.5  1998-12-23 02:36:28  ivan
+# use FS::cust_refund; to eliminate warning
+#
+# Revision 1.4  1998/12/17 09:57:21  ivan
 # s/CGI::(Base|Request)/CGI.pm/;
 #
 # Revision 1.3  1998/11/15 13:14:20  ivan
@@ -58,6 +61,7 @@ use FS::cust_pkg;
 use FS::part_referral;
 use FS::agent;
 use FS::cust_main;
+use FS::cust_refund;
 
 my($cgi) = new CGI;
 &cgisuidsetup($cgi);
-- 
cgit v1.2.1


From 4ed0ae683393ee52ffc0e6febe395e1083f5277d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Dec 1998 02:42:33 +0000
Subject: remove double '/' in link urls

---
 htdocs/view/cust_main.cgi | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index c28c80067..cc6983d70 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.5 1998-12-23 02:36:28 ivan Exp $
+# $Id: cust_main.cgi,v 1.6 1998-12-23 02:42:33 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -33,7 +33,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.5  1998-12-23 02:36:28  ivan
+# Revision 1.6  1998-12-23 02:42:33  ivan
+# remove double '/' in link urls
+#
+# Revision 1.5  1998/12/23 02:36:28  ivan
 # use FS::cust_refund; to eliminate warning
 #
 # Revision 1.4  1998/12/17 09:57:21  ivan
@@ -209,12 +212,12 @@ foreach $package (@packages) {
   my($part_pkg)=qsearchs('part_pkg',{
     'pkgpart' => $pref->{pkgpart}
   } );
-  print qq!<TR><TD><FONT SIZE=-1><A HREF="!, popurl(2), qq!/view/cust_pkg.cgi?!,
+  print qq!<TR><TD><FONT SIZE=-1><A HREF="!, popurl(2), qq!view/cust_pkg.cgi?!,
         $pref->{pkgnum}, qq!">!, 
         $pref->{pkgnum}, qq!</A></FONT></TD>!,
         "<TD><FONT SIZE=-1>", $part_pkg->getfield('pkg'), " - ",
         $part_pkg->getfield('comment'), 
-          qq!<FORM ACTION="!, popurl(2), qq!/edit/part_pkg.cgi" METHOD=POST>!,
+          qq!<FORM ACTION="!, popurl(2), qq!edit/part_pkg.cgi" METHOD=POST>!,
           qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $part_pkg->pkgpart, qq!">!,
           qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $package->pkgnum, qq!">!,
           qq!<INPUT TYPE="submit" VALUE="Customize Pricing">!,
-- 
cgit v1.2.1


From 6b842a0891010b36bf7b0596bd062f70bcff7826 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Dec 1998 03:10:19 +0000
Subject: $cgi->keywords instead of $cgi->query_string

---
 htdocs/edit/svc_acct_pop.cgi     | 10 +++++++---
 htdocs/edit/svc_acct_sm.cgi      | 13 +++++++++----
 htdocs/edit/svc_domain.cgi       | 12 ++++++++----
 htdocs/misc/bill.cgi             | 10 +++++++---
 htdocs/misc/cancel-unaudited.cgi | 10 +++++++---
 htdocs/misc/cancel_pkg.cgi       | 10 +++++++---
 htdocs/misc/link.cgi             | 10 +++++++---
 htdocs/misc/print-invoice.cgi    | 10 +++++++---
 htdocs/misc/susp_pkg.cgi         | 10 +++++++---
 htdocs/misc/unsusp_pkg.cgi       | 10 +++++++---
 htdocs/search/cust_pkg.cgi       |  9 ++++++---
 htdocs/search/svc_acct.cgi       |  9 ++++++---
 htdocs/search/svc_domain.cgi     |  9 ++++++---
 htdocs/view/cust_bill.cgi        | 10 +++++++---
 htdocs/view/cust_pkg.cgi         | 14 +++++++++++---
 htdocs/view/svc_acct.cgi         | 10 +++++++---
 htdocs/view/svc_acct_sm.cgi      | 10 +++++++---
 htdocs/view/svc_domain.cgi       | 10 +++++++---
 18 files changed, 130 insertions(+), 56 deletions(-)

diff --git a/htdocs/edit/svc_acct_pop.cgi b/htdocs/edit/svc_acct_pop.cgi
index 9695d9398..4d41d0b32 100755
--- a/htdocs/edit/svc_acct_pop.cgi
+++ b/htdocs/edit/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.3 1998-12-17 06:17:10 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.4 1998-12-23 02:57:45 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8 
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.3  1998-12-17 06:17:10  ivan
+# Revision 1.4  1998-12-23 02:57:45  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 06:17:10  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 # Revision 1.2  1998/11/13 09:56:47  ivan
@@ -31,7 +34,8 @@ my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
 my($svc_acct_pop,$action);
-if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
+my($query)=$cgi->keywords;
+if ( $query =~ /^(\d+)$/ ) { #editing
   $svc_acct_pop=qsearchs('svc_acct_pop',{'popnum'=>$1});
   $action='Edit';
 } else { #adding
diff --git a/htdocs/edit/svc_acct_sm.cgi b/htdocs/edit/svc_acct_sm.cgi
index 3f96efc4e..7a1b946e0 100755
--- a/htdocs/edit/svc_acct_sm.cgi
+++ b/htdocs/edit/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.3 1998-12-17 06:17:11 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.4 1998-12-23 02:58:45 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct_sm.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -35,7 +35,10 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-26
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.3  1998-12-17 06:17:11  ivan
+# Revision 1.4  1998-12-23 02:58:45  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 06:17:11  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 # Revision 1.2  1998/12/16 05:19:15  ivan
@@ -59,7 +62,9 @@ $conf = new FS::Conf;
 my $mydomain = $conf->config('domain');
 
 my($action,$svcnum,$svc_acct_sm,$pkgnum,$svcpart,$part_svc);
-if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
+
+my($query) = $cgi->keywords;
+if ( $query =~ /^(\d+)$/ ) { #editing
 
   $svcnum=$1;
   $svc_acct_sm=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum})
@@ -80,7 +85,7 @@ if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
 
   $svc_acct_sm=create FS::svc_acct_sm({});
 
-  foreach $_ (split(/-/,$cgi->query_string)) { #get & untaint pkgnum & svcpart
+  foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
     $pkgnum=$1 if /^pkgnum(\d+)$/;
     $svcpart=$1 if /^svcpart(\d+)$/;
   }
diff --git a/htdocs/edit/svc_domain.cgi b/htdocs/edit/svc_domain.cgi
index 3d0a2e723..6373ebb48 100755
--- a/htdocs/edit/svc_domain.cgi
+++ b/htdocs/edit/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.3 1998-12-17 06:17:12 ivan Exp $
+# $Id: svc_domain.cgi,v 1.4 1998-12-23 03:00:16 ivan Exp $
 #
 # Usage: svc_domain.cgi pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_domain.cgi?pkgnum{pkgnum}-svcpart{svcpart}
@@ -17,7 +17,10 @@
 # no GOV in instructions ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.3  1998-12-17 06:17:12  ivan
+# Revision 1.4  1998-12-23 03:00:16  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 06:17:12  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 # Revision 1.2  1998/11/13 09:56:48  ivan
@@ -38,7 +41,8 @@ my($cgi) = new CGI;
 
 my($action,$svcnum,$svc_domain,$pkgnum,$svcpart,$part_svc);
 
-if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
+my($query) = $cgi->keywords;
+if ( $query =~ /^(\d+)$/ ) { #editing
 
   $svcnum=$1;
   $svc_domain=qsearchs('svc_domain',{'svcnum'=>$svcnum})
@@ -59,7 +63,7 @@ if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
 
   $svc_domain=create FS::svc_domain({});
   
-  foreach $_ (split(/-/,$cgi->query_string)) {
+  foreach $_ (split(/-/,$query)) {
     $pkgnum=$1 if /^pkgnum(\d+)$/;
     $svcpart=$1 if /^svcpart(\d+)$/;
   }
diff --git a/htdocs/misc/bill.cgi b/htdocs/misc/bill.cgi
index 76f160289..430aefa4b 100755
--- a/htdocs/misc/bill.cgi
+++ b/htdocs/misc/bill.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: bill.cgi,v 1.2 1998-12-17 09:12:41 ivan Exp $
+# $Id: bill.cgi,v 1.3 1998-12-23 03:01:13 ivan Exp $
 #
 # s/FS:Search/FS::Record/ and cgisuidsetup($cgi) ivan@sisd.com 98-mar-13
 #
@@ -8,7 +8,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: bill.cgi,v $
-# Revision 1.2  1998-12-17 09:12:41  ivan
+# Revision 1.3  1998-12-23 03:01:13  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:41  ivan
 # s/CGI::(Request|Base)/CGI.pm/;
 #
 
@@ -24,7 +27,8 @@ my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
 #untaint custnum
-$cgi->query_string =~ /^(\d*)$/;
+my($query) = $cgi->keywords;
+$query =~ /^(\d*)$/;
 my($custnum)=$1;
 my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
 die "Can't find customer!\n" unless $cust_main;
diff --git a/htdocs/misc/cancel-unaudited.cgi b/htdocs/misc/cancel-unaudited.cgi
index 93edef372..4c5fbc7f3 100755
--- a/htdocs/misc/cancel-unaudited.cgi
+++ b/htdocs/misc/cancel-unaudited.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cancel-unaudited.cgi,v 1.2 1998-12-17 09:12:42 ivan Exp $
+# $Id: cancel-unaudited.cgi,v 1.3 1998-12-23 03:02:05 ivan Exp $
 #
 # Usage: cancel-unaudited.cgi svcnum
 #        http://server.name/path/cancel-unaudited.cgi pkgnum
@@ -18,7 +18,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cancel-unaudited.cgi,v $
-# Revision 1.2  1998-12-17 09:12:42  ivan
+# Revision 1.3  1998-12-23 03:02:05  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:42  ivan
 # s/CGI::(Request|Base)/CGI.pm/;
 #
 
@@ -35,7 +38,8 @@ my($cgi) = new CGI;
 &cgisuidsetup($cgi);
  
 #untaint svcnum
-$cgi->query_string =~ /^(\d+)$/;
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
 my($svcnum)=$1;
 
 my($svc_acct) = qsearchs('svc_acct',{'svcnum'=>$svcnum});
diff --git a/htdocs/misc/cancel_pkg.cgi b/htdocs/misc/cancel_pkg.cgi
index a9aea3f2a..45afee8a1 100755
--- a/htdocs/misc/cancel_pkg.cgi
+++ b/htdocs/misc/cancel_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cancel_pkg.cgi,v 1.2 1998-12-17 09:12:43 ivan Exp $
+# $Id: cancel_pkg.cgi,v 1.3 1998-12-23 03:02:54 ivan Exp $
 #
 # Usage: cancel_pkg.cgi pkgnum
 #        http://server.name/path/cancel_pkg.cgi pkgnum
@@ -29,7 +29,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cancel_pkg.cgi,v $
-# Revision 1.2  1998-12-17 09:12:43  ivan
+# Revision 1.3  1998-12-23 03:02:54  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:43  ivan
 # s/CGI::(Request|Base)/CGI.pm/;
 #
 
@@ -45,7 +48,8 @@ my($cgi) = new CGI;
 &cgisuidsetup($cgi);
  
 #untaint pkgnum
-$cgi->query_string =~ /^(\d+)$/ || die "Illegal pkgnum";
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ || die "Illegal pkgnum";
 my($pkgnum)=$1;
 
 my($cust_pkg) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
diff --git a/htdocs/misc/link.cgi b/htdocs/misc/link.cgi
index 7c7fd6688..6823365f5 100755
--- a/htdocs/misc/link.cgi
+++ b/htdocs/misc/link.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: link.cgi,v 1.2 1998-12-17 09:12:45 ivan Exp $
+# $Id: link.cgi,v 1.3 1998-12-23 03:03:39 ivan Exp $
 #
 # Note: Should be run setuid freeside as user nobody
 #
@@ -11,7 +11,10 @@
 # can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
 #
 # $Log: link.cgi,v $
-# Revision 1.2  1998-12-17 09:12:45  ivan
+# Revision 1.3  1998-12-23 03:03:39  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:45  ivan
 # s/CGI::(Request|Base)/CGI.pm/;
 #
 
@@ -34,7 +37,8 @@ my($cgi) = new CGI;
 cgisuidsetup($cgi);
 
 my($pkgnum,$svcpart);
-foreach $_ (split(/-/,$cgi->query_string)) { #get & untaint pkgnum & svcpart
+my($query) = $cgi->keywords;
+foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
   $pkgnum=$1 if /^pkgnum(\d+)$/;
   $svcpart=$1 if /^svcpart(\d+)$/;
 }
diff --git a/htdocs/misc/print-invoice.cgi b/htdocs/misc/print-invoice.cgi
index 546b93ed6..0ece4261e 100755
--- a/htdocs/misc/print-invoice.cgi
+++ b/htdocs/misc/print-invoice.cgi
@@ -1,12 +1,15 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: print-invoice.cgi,v 1.2 1998-12-17 09:12:47 ivan Exp $
+# $Id: print-invoice.cgi,v 1.3 1998-12-23 03:04:24 ivan Exp $
 #
 # just a kludge for now, since this duplicates in a way it shouldn't stuff from
 # Bill.pm (like $lpr) ivan@sisd.com 98-jun-16
 #
 # $Log: print-invoice.cgi,v $
-# Revision 1.2  1998-12-17 09:12:47  ivan
+# Revision 1.3  1998-12-23 03:04:24  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:47  ivan
 # s/CGI::(Request|Base)/CGI.pm/;
 #
 
@@ -26,7 +29,8 @@ $conf = new FS::Conf;
 my $lpr = $conf->config('lpr');
 
 #untaint invnum
-$cgi->query_string =~ /^(\d*)$/;
+my($query) = $cgi->keywords;
+$query =~ /^(\d*)$/;
 my($invnum)=$1;
 my($cust_bill)=qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Can't find invoice!\n" unless $cust_bill;
diff --git a/htdocs/misc/susp_pkg.cgi b/htdocs/misc/susp_pkg.cgi
index cb20f82b2..7b8096470 100755
--- a/htdocs/misc/susp_pkg.cgi
+++ b/htdocs/misc/susp_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: susp_pkg.cgi,v 1.2 1998-12-17 09:12:48 ivan Exp $
+# $Id: susp_pkg.cgi,v 1.3 1998-12-23 03:04:56 ivan Exp $
 #
 # Usage: susp_pkg.cgi pkgnum
 #        http://server.name/path/susp_pkg.cgi pkgnum
@@ -23,7 +23,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: susp_pkg.cgi,v $
-# Revision 1.2  1998-12-17 09:12:48  ivan
+# Revision 1.3  1998-12-23 03:04:56  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:48  ivan
 # s/CGI::(Request|Base)/CGI.pm/;
 #
 
@@ -38,7 +41,8 @@ my($cgi) = new CGI;
 &cgisuidsetup($cgi);
  
 #untaint pkgnum
-$cgi->query_string =~ /^(\d+)$/ || die "Illegal pkgnum";
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ || die "Illegal pkgnum";
 my($pkgnum)=$1;
 
 my($cust_pkg) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
diff --git a/htdocs/misc/unsusp_pkg.cgi b/htdocs/misc/unsusp_pkg.cgi
index 82ecb748e..170d85f8a 100755
--- a/htdocs/misc/unsusp_pkg.cgi
+++ b/htdocs/misc/unsusp_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: unsusp_pkg.cgi,v 1.2 1998-12-17 09:12:49 ivan Exp $
+# $Id: unsusp_pkg.cgi,v 1.3 1998-12-23 03:05:25 ivan Exp $
 #
 # Usage: susp_pkg.cgi pkgnum
 #        http://server.name/path/susp_pkg.cgi pkgnum
@@ -23,7 +23,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: unsusp_pkg.cgi,v $
-# Revision 1.2  1998-12-17 09:12:49  ivan
+# Revision 1.3  1998-12-23 03:05:25  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:49  ivan
 # s/CGI::(Request|Base)/CGI.pm/;
 #
 
@@ -39,7 +42,8 @@ my($cgi) = new CGI;
 &cgisuidsetup($cgi);
  
 #untaint pkgnum
-$cgi->query_string =~ /^(\d+)$/ || die "Illegal pkgnum";
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ || die "Illegal pkgnum";
 my($pkgnum)=$1;
 
 my($cust_pkg) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
diff --git a/htdocs/search/cust_pkg.cgi b/htdocs/search/cust_pkg.cgi
index 12d601a01..d1db3747a 100755
--- a/htdocs/search/cust_pkg.cgi
+++ b/htdocs/search/cust_pkg.cgi
@@ -1,11 +1,14 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.2 1998-12-17 09:41:09 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.3 1998-12-23 03:05:59 ivan Exp $
 #
 # based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.2  1998-12-17 09:41:09  ivan
+# Revision 1.3  1998-12-23 03:05:59  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:41:09  ivan
 # s/CGI::(Base|Request)/CGI.pm/;
 #
 
@@ -21,7 +24,7 @@ my($cgi)=new CGI;
 
 my(@cust_pkg,$sortby);
 
-my($query)=$cgi->query_string;
+my($query)=$cgi->keywords;
 #this tree is a little bit redundant
 if ( $query eq 'pkgnum' ) {
   $sortby=\*pkgnum_sort;
diff --git a/htdocs/search/svc_acct.cgi b/htdocs/search/svc_acct.cgi
index 2b6c1ee4e..0afdb1a26 100755
--- a/htdocs/search/svc_acct.cgi
+++ b/htdocs/search/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.2 1998-12-17 09:41:10 ivan Exp $
+# $Id: svc_acct.cgi,v 1.3 1998-12-23 03:06:28 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
@@ -23,7 +23,10 @@
 # give service and customer info too ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.2  1998-12-17 09:41:10  ivan
+# Revision 1.3  1998-12-23 03:06:28  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:41:10  ivan
 # s/CGI::(Base|Request)/CGI.pm/;
 #
 
@@ -39,7 +42,7 @@ my($cgi)=new CGI;
 
 my(@svc_acct,$sortby);
 
-my($query)=$cgi->query_string;
+my($query)=$cgi->keywords;
 #this tree is a little bit redundant
 if ( $query eq 'svcnum' ) {
   $sortby=\*svcnum_sort;
diff --git a/htdocs/search/svc_domain.cgi b/htdocs/search/svc_domain.cgi
index 1fd6a515b..b902bbe1c 100755
--- a/htdocs/search/svc_domain.cgi
+++ b/htdocs/search/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.2 1998-12-17 09:41:12 ivan Exp $
+# $Id: svc_domain.cgi,v 1.3 1998-12-23 03:06:50 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -17,7 +17,10 @@
 # display total, use FS::CGI now does browsing too ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.2  1998-12-17 09:41:12  ivan
+# Revision 1.3  1998-12-23 03:06:50  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:41:12  ivan
 # s/CGI::(Base|Request)/CGI.pm/;
 #
 
@@ -34,7 +37,7 @@ my($cgi)=new CGI;
 my(@svc_domain);
 my($sortby);
 
-my($query)=$cgi->query_string;
+my($query)=$cgi->keywords;
 if ( $query eq 'svcnum' ) {
   $sortby=\*svcnum_sort;
   @svc_domain=qsearch('svc_domain',{});
diff --git a/htdocs/view/cust_bill.cgi b/htdocs/view/cust_bill.cgi
index e77f13d9b..06fd2d76d 100755
--- a/htdocs/view/cust_bill.cgi
+++ b/htdocs/view/cust_bill.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_bill.cgi,v 1.2 1998-12-17 09:57:20 ivan Exp $
+# $Id: cust_bill.cgi,v 1.3 1998-12-23 03:07:49 ivan Exp $
 #
 # Note: Should be run setuid freeside as user nobody.
 #
@@ -25,7 +25,10 @@
 # also print 'printed' field ivan@sisd.com 98-jul-10
 #
 # $Log: cust_bill.cgi,v $
-# Revision 1.2  1998-12-17 09:57:20  ivan
+# Revision 1.3  1998-12-23 03:07:49  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:57:20  ivan
 # s/CGI::(Base|Request)/CGI.pm/;
 #
 
@@ -42,7 +45,8 @@ my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
 #untaint invnum
-$cgi->query_string =~ /^(\d+)$/;
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
 my($invnum)=$1;
 
 my($cust_bill) = qsearchs('cust_bill',{'invnum'=>$invnum});
diff --git a/htdocs/view/cust_pkg.cgi b/htdocs/view/cust_pkg.cgi
index bbe3db53d..034389755 100755
--- a/htdocs/view/cust_pkg.cgi
+++ b/htdocs/view/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.3 1998-12-17 09:57:22 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.4 1998-12-23 03:08:40 ivan Exp $
 #
 # Usage: cust_pkg.cgi pkgnum
 #        http://server.name/path/cust_pkg.cgi?pkgnum
@@ -26,7 +26,10 @@
 # no FS::Search ivan@sisd.com 98-mar-7
 # 
 # $Log: cust_pkg.cgi,v $
-# Revision 1.3  1998-12-17 09:57:22  ivan
+# Revision 1.4  1998-12-23 03:08:40  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 09:57:22  ivan
 # s/CGI::(Base|Request)/CGI.pm/;
 #
 # Revision 1.2  1998/11/13 09:56:49  ivan
@@ -41,6 +44,11 @@ use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(popurl header);
 use FS::Record qw(qsearch qsearchs);
+use FS::part_svc;
+use FS::cust_pkg;
+use FS::part_pkg;
+use FS::pkg_svc;
+use FS::cust_svc;
 
 my($cgi) = new CGI;
 cgisuidsetup($cgi);
@@ -54,7 +62,7 @@ foreach $part_svc ( qsearch('part_svc',{}) ) {
 
 print $cgi->header, header('Package View', '');
 
-$cgi->query_string =~ /^(\d+)$/;
+$cgi->query_string =~ /^(\d+)$/ or die $cgi->query_string;
 my($pkgnum)=$1;
 
 #get package record
diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi
index 9fcc4c57c..e658d2bb8 100755
--- a/htdocs/view/svc_acct.cgi
+++ b/htdocs/view/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.3 1998-12-17 09:57:23 ivan Exp $
+# $Id: svc_acct.cgi,v 1.4 1998-12-23 03:09:19 ivan Exp $
 #
 # Usage: svc_acct.cgi svcnum
 #        http://server.name/path/svc_acct.cgi?svcnum
@@ -35,7 +35,10 @@
 # displays arbitrary radius attributes ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.3  1998-12-17 09:57:23  ivan
+# Revision 1.4  1998-12-23 03:09:19  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 09:57:23  ivan
 # s/CGI::(Base|Request)/CGI.pm/;
 #
 # Revision 1.2  1998/12/16 05:24:29  ivan
@@ -57,7 +60,8 @@ $conf = new FS::Conf;
 my $mydomain = $conf->config('domain');
 
 #untaint svcnum
-$cgi->query_string =~ /^(\d+)$/;
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
 my($svcnum)=$1;
 my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svcnum});
 die "Unkonwn svcnum" unless $svc_acct;
diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi
index a80e36845..f30fb429b 100755
--- a/htdocs/view/svc_acct_sm.cgi
+++ b/htdocs/view/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.3 1998-12-17 09:57:24 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.4 1998-12-23 03:09:52 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi svcnum
 #        http://server.name/path/svc_acct_sm.cgi?svcnum
@@ -22,7 +22,10 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.3  1998-12-17 09:57:24  ivan
+# Revision 1.4  1998-12-23 03:09:52  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 09:57:24  ivan
 # s/CGI::(Base|Request)/CGI.pm/;
 #
 # Revision 1.2  1998/12/16 05:24:30  ivan
@@ -44,7 +47,8 @@ $conf = new FS::Conf;
 my $mydomain = $conf->config('domain');
 
 #untaint svcnum
-$cgi->query_string =~ /^(\d+)$/;
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
 my($svcnum)=$1;
 my($svc_acct_sm)=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum});
 die "Unknown svcnum" unless $svc_acct_sm;
diff --git a/htdocs/view/svc_domain.cgi b/htdocs/view/svc_domain.cgi
index a903fa4ba..9abeebbf4 100755
--- a/htdocs/view/svc_domain.cgi
+++ b/htdocs/view/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.3 1998-12-17 09:57:25 ivan Exp $
+# $Id: svc_domain.cgi,v 1.4 1998-12-23 03:10:19 ivan Exp $
 #
 # Usage: svc_domain svcnum
 #        http://server.name/path/svc_domain.cgi?svcnum
@@ -15,7 +15,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.3  1998-12-17 09:57:25  ivan
+# Revision 1.4  1998-12-23 03:10:19  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 09:57:25  ivan
 # s/CGI::(Base|Request)/CGI.pm/;
 #
 # Revision 1.2  1998/11/13 09:56:50  ivan
@@ -33,7 +36,8 @@ my($cgi) = new CGI;
 cgisuidsetup($cgi);
 
 #untaint svcnum
-$cgi->query_string =~ /^(\d+)$/;
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
 my($svcnum)=$1;
 my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$svcnum});
 die "Unknown svcnum" unless $svc_domain;
-- 
cgit v1.2.1


From 4013e8c540af6a8c41f9a95dd72be87198239dba Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Dec 1998 03:11:40 +0000
Subject: *** empty log message ***

---
 htdocs/view/cust_pkg.cgi | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/view/cust_pkg.cgi b/htdocs/view/cust_pkg.cgi
index 034389755..b394da591 100755
--- a/htdocs/view/cust_pkg.cgi
+++ b/htdocs/view/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.4 1998-12-23 03:08:40 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.5 1998-12-23 03:11:40 ivan Exp $
 #
 # Usage: cust_pkg.cgi pkgnum
 #        http://server.name/path/cust_pkg.cgi?pkgnum
@@ -26,8 +26,8 @@
 # no FS::Search ivan@sisd.com 98-mar-7
 # 
 # $Log: cust_pkg.cgi,v $
-# Revision 1.4  1998-12-23 03:08:40  ivan
-# $cgi->keywords instead of $cgi->query_string
+# Revision 1.5  1998-12-23 03:11:40  ivan
+# *** empty log message ***
 #
 # Revision 1.3  1998/12/17 09:57:22  ivan
 # s/CGI::(Base|Request)/CGI.pm/;
@@ -62,7 +62,8 @@ foreach $part_svc ( qsearch('part_svc',{}) ) {
 
 print $cgi->header, header('Package View', '');
 
-$cgi->query_string =~ /^(\d+)$/ or die $cgi->query_string;
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
 my($pkgnum)=$1;
 
 #get package record
-- 
cgit v1.2.1


From c7e564bd708dd0181763cbca28b303d8d6445e45 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Dec 1998 08:08:15 +0000
Subject: fix typo

---
 htdocs/edit/cust_main.cgi | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 1a91f3dd8..19db4a907 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.3 1998-12-17 06:17:00 ivan Exp $
+# $Id: cust_main.cgi,v 1.4 1998-12-23 08:08:15 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -40,7 +40,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.3  1998-12-17 06:17:00  ivan
+# Revision 1.4  1998-12-23 08:08:15  ivan
+# fix typo
+#
+# Revision 1.3  1998/12/17 06:17:00  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 
@@ -70,7 +73,7 @@ if ( $query =~ /^(\d+)$/ ) { #editing
   $action='Add';
 }
 
-my $p1 = popurl(1);'
+my $p1 = popurl(1);
 print $cgi->header, header("Customer $action", ''), <<END;
     <FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST>
     <PRE>
@@ -82,7 +85,7 @@ print $custnum ? $custnum : " (NEW)" , "</B></FONT>";
 
 #agentnum
 my($agentnum)=$cust_main->agentnum || 1; #set to first agent by default
-my(@agents) = qsearch('agent',{});
+my @agents = qsearch( 'agent', {} );
 print qq!\n\nAgent # <SELECT NAME="agentnum" SIZE="1">!;
 my($agent);
 foreach $agent (sort {
-- 
cgit v1.2.1


From f57f15482187e6fe502d4569dcd698d3205abd81 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Dec 1998 09:41:47 +0000
Subject: typo

---
 htdocs/docs/upgrade3.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/docs/upgrade3.html b/htdocs/docs/upgrade3.html
index 87f551d26..d2795bdb2 100644
--- a/htdocs/docs/upgrade3.html
+++ b/htdocs/docs/upgrade3.html
@@ -33,7 +33,6 @@ CREATE TABLE cust_main_invoice (
    INDEX ( custnum )
 );
 </pre>
-  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are r
-unning a different database engine you will need to modify it slightly.
+  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
   <li>Copy or symlink htdocs and site_perl to the new copies.
 </body>
-- 
cgit v1.2.1


From 1f2d8690193476319d61b20b78461eb1a3ff106e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 29 Dec 1998 11:59:58 +0000
Subject: mostly properly OO, some work still to be done with svc_ stuff

---
 TODO                            |  10 +-
 site_perl/Record.pm             | 288 +++++++++++++++++++--------------
 site_perl/agent.pm              |  75 +++------
 site_perl/agent_type.pm         |  69 +++-----
 site_perl/cust_bill.pm          | 148 ++++++++---------
 site_perl/cust_bill_pkg.pm      |  73 +++------
 site_perl/cust_credit.pm        | 104 +++++-------
 site_perl/cust_main.pm          | 343 +++++++++++++++++-----------------------
 site_perl/cust_main_county.pm   |  75 ++-------
 site_perl/cust_main_invoice.pm  |  69 +++-----
 site_perl/cust_pay.pm           | 138 ++++++----------
 site_perl/cust_pay_batch.pm     | 100 ++++--------
 site_perl/cust_pkg.pm           | 203 ++++++++++--------------
 site_perl/cust_refund.pm        | 121 ++++++--------
 site_perl/cust_svc.pm           | 107 +++++--------
 site_perl/part_pkg.pm           |  85 +++-------
 site_perl/part_referral.pm      |  74 +++------
 site_perl/part_svc.pm           |  94 +++++------
 site_perl/pkg_svc.pm            |  83 ++++------
 site_perl/svc_acct.pm           | 135 +++++++---------
 site_perl/svc_acct_pop.pm       |  77 +++------
 site_perl/svc_acct_sm.pm        |  33 ++--
 site_perl/svc_domain.pm         | 160 ++++++++-----------
 site_perl/table_template-svc.pm |  21 ++-
 site_perl/table_template.pm     |  68 +++-----
 site_perl/type_pkgs.pm          |  90 ++++-------
 26 files changed, 1114 insertions(+), 1729 deletions(-)

diff --git a/TODO b/TODO
index 24461b621..5c8e02cef 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.16 1998-12-16 05:38:39 ivan Exp $
+$Id: TODO,v 1.17 1998-12-29 11:59:32 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,14 @@ duplication of effort.
 
 -- 1.1.x --
 
+check all .pm's for numeric comparisons done as `eq'
+
+FS::cust_pkg _require_'s FS::$svc, but this won't work with %FS::UID::callback
+loading of configuration.  (pry need same idea, but will run immediately if
+context allows).  Looks like error is masked by 'use FS::cust_svc' which in
+turn 'use's FS::{svc_acct, svc_acct_sm, svc_domain}' which is now explicit
+w/comments in source
+
 int'l stuff in web interface (not on david's time)
 
 admin web interface for titles (Dr., Mrs.) and default in fs-setup
diff --git a/site_perl/Record.pm b/site_perl/Record.pm
index b8d565cd9..0f098b471 100644
--- a/site_perl/Record.pm
+++ b/site_perl/Record.pm
@@ -26,7 +26,7 @@ FS::Record - Database record objects
 =head1 SYNOPSIS
 
     use FS::Record;
-    use FS::Record qw(dbh fields hfields qsearch qsearchs dbdef);
+    use FS::Record qw(dbh fields qsearch qsearchs dbdef);
 
     $record = new FS::Record 'table', \%hash;
     $record = new FS::Record 'table', { 'column' => 'value', ... };
@@ -51,11 +51,14 @@ FS::Record - Database record objects
 
     $hashref = $record->hashref;
 
-    $error = $record->add;
+    $error = $record->insert;
+    #$error = $record->add; #depriciated
 
-    $error = $record->del;
+    $error = $record->delete;
+    #$error = $record->del; #depriciated
 
-    $error = $new_record->rep($old_record);
+    $error = $new_record->replace($old_record);
+    #$error = $new_record->rep($old_record); #depriciated
 
     $value = $record->unique('column');
 
@@ -80,7 +83,8 @@ FS::Record - Database record objects
     $fields = hfields('table');
     if ( $fields->{Field} ) { # etc.
 
-    @fields = fields 'table';
+    @fields = fields 'table'; #as a subroutine
+    @fields = $record->fields; #as a method call
 
 
 =head1 DESCRIPTION
@@ -89,64 +93,57 @@ FS::Record - Database record objects
 implemented on top of DBI.  FS::Record is intended as a base class for
 table-specific classes to inherit from, i.e. FS::cust_main.
 
-=head1 METHODS
+=head1 CONSTRUCTORS
 
 =over 4
 
-=item new TABLE, HASHREF
+=item new [ TABLE, ] HASHREF
 
 Creates a new record.  It doesn't store it in the database, though.  See
-L<"add"> for that.
+L<"insert"> for that.
 
 Note that the object stores this hash reference, not a distinct copy of the
 hash it points to.  You can ask the object for a copy with the I<hash> 
 method.
 
+TABLE can only be omitted when a dervived class overrides the table method.
+
 =cut
 
 sub new { 
-  my($proto,$table,$hashref) = @_;
-  confess "Second arguement to FS::Record->new is not a HASH ref: ",
-          ref($hashref), " ", $hashref, "\n"
-    unless ref($hashref) eq 'HASH'; #bad practice?
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = {};
+  bless ($self, $class);
 
-  #check to make sure $table exists? (ask dbdef)
+  $self->{'Table'} = shift unless defined ( $self->table );
 
-  foreach my $field ( FS::Record::fields $table ) { 
-     $hashref->{$field}='' unless defined $hashref->{$field};
-  }
+  my $hashref = $self->{'Hash'} = shift;
 
-  # mySQL must rtrim the inbound text strings or store them z-terminated
-  # I simulate this for Postgres below
-  # Turned off in favor of ChopBlanks in UID.pm (see man DBI)
-  #if (datasrc =~ m/Pg/)
-  #{
-  #  foreach my $index (keys %$hashref)
-  #  {
-  #    $$hashref{$index} = unpack("A255", $$hashref{$index})
-  #	if ($$hashref{$index} =~ m/ $/) ;
-  #  }
-  #}
-
-  foreach my $column ( FS::Record::fields $table ) { 
-    #trim the '$' from money fields for Pg (beong HERE?)
+  foreach my $field ( $self->fields ) { 
+    $hashref->{$field}='' unless defined $hashref->{$field};
+    #trim the '$' from money fields for Pg (belong HERE?)
     #(what about Pg i18n?)
     if ( datasrc =~ m/Pg/ 
-         && $dbdef->table($table)->column($column)->type eq 'money' ) {
-      ${$hashref}{$column} =~ s/^\$//;
+         && $self->dbdef_table->column($field)->type eq 'money' ) {
+      ${$hashref}{$field} =~ s/^\$//;
     }
-    #foreach my $column ( grep $dbdef->table($table)->column($_)->type eq 'money', keys %{$hashref} ) {
-    #  ${$hashref}{$column} =~ s/^\$//;
-    #}
   }
 
-  my $class = ref($proto) || $proto;
-  my $self = { 'Table' => $table,
-               'Hash' => $hashref,
-             };
+  $self;
+}
 
+sub create {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = {};
   bless ($self, $class);
-
+  if ( defined $self->table ) {
+    cluck "create constructor is depriciated, use new!";
+    $self->new(@_);
+  } else {
+    croak "FS::Record::create called (not from a subclass)!";
+  }
 }
 
 =item qsearch TABLE, HASHREF
@@ -158,8 +155,6 @@ objects.
 
 =cut
 
-# Usage: @records = &FS::Search::qsearch($table,\%hash);
-# Each element of @records is a FS::Record object.
 sub qsearch {
   my($table,$record) = @_;
   my($dbh) = dbh;
@@ -181,7 +176,7 @@ sub qsearch {
 
   if ( eval ' scalar(@FS::'. $table. '::ISA);' ) {
     map {
-      eval 'create FS::'. $table. ' ( $sth->fetchrow_hashref );';
+      eval 'new FS::'. $table. ' ( $sth->fetchrow_hashref );';
     } ( 1 .. $sth->execute );
   } else {
     cluck "qsearch: warning: FS::$table not loaded; returning generic FS::Record objects";
@@ -202,11 +197,17 @@ for a single item, or your data is corrupted.
 
 sub qsearchs { # $result_record = &FS::Record:qsearchs('table',\%hash);
   my(@result) = qsearch(@_);
-  carp "Multiple records in scalar search!" if scalar(@result) > 1;
+  carp "warning: Multiple records in scalar search!" if scalar(@result) > 1;
     #should warn more vehemently if the search was on a primary key?
   $result[0];
 }
 
+=back
+
+=head1 METHODS
+
+=over 4
+
 =item table
 
 Returns the table name.
@@ -214,7 +215,8 @@ Returns the table name.
 =cut
 
 sub table {
-  my($self) = @_;
+#  cluck "warning: FS::Record::table depriciated; supply one in subclass!";
+  my $self = shift;
   $self -> {'Table'};
 }
 
@@ -246,7 +248,8 @@ sub get {
   }
 }
 sub getfield {
-  get(@_);
+  my $self = shift;
+  $self->get(@_);
 }
 
 =item set, setfield COLUMN, VALUE
@@ -260,7 +263,8 @@ sub set {
   $self->{'Hash'}->{$field} = $value;
 }
 sub setfield {
-  set(@_);
+  my $self = shift;
+  $self->set(@_);
 }
 
 =item AUTLOADED METHODS
@@ -308,41 +312,41 @@ sub hashref {
   $self->{'Hash'};
 }
 
-=item add
+=item insert
 
-Adds this record to the database.  If there is an error, returns the error,
+Inserts this record to the database.  If there is an error, returns the error,
 otherwise returns false.
 
 =cut
 
-sub add {
-  my($self) = @_;
-  my($dbh)=dbh;
-  my($table)=$self->table;
+sub insert {
+  my $self = shift;
+
+  my $error = $self->check;
+  return $error if $error;
 
   #single-field unique keys are given a value if false
   #(like MySQL's AUTO_INCREMENT)
-  foreach ( $dbdef->table($table)->unique->singles ) {
+  foreach ( $self->dbdef_table->unique->singles ) {
     $self->unique($_) unless $self->getfield($_);
   }
   #and also the primary key
-  my($primary_key)=$dbdef->table($table)->primary_key;
+  my $primary_key = $self->dbdef_table->primary_key;
   $self->unique($primary_key) 
     if $primary_key && ! $self->getfield($primary_key);
 
-  my (@fields) =
+  my @fields =
     grep defined($self->getfield($_)) && $self->getfield($_) ne "",
-    fields($table)
+    $self->fields
   ;
 
-  my($sth);
-  my($statement)="INSERT INTO $table ( ".
+  my $statement = "INSERT INTO ". $self->table. " ( ".
       join(', ',@fields ).
     ") VALUES (".
-      join(', ',map(_quote($self->getfield($_),$table,$_), @fields)).
+      join(', ',map(_quote($self->getfield($_),$self->table,$_), @fields)).
     ")"
   ;
-  $sth = $dbh->prepare($statement) or return $dbh->errstr;
+  my $sth = dbh->prepare($statement) or return dbh->errstr;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -355,29 +359,37 @@ sub add {
   '';
 }
 
-=item del
+=item add
+
+Depriciated (use insert instead).
+
+=cut
+
+sub add {
+  cluck "warning: FS::Record::add depriciated!";
+  insert @_; #call method in this scope
+}
+
+=item delete
 
 Delete this record from the database.  If there is an error, returns the error,
 otherwise returns false.
 
 =cut
 
-sub del {
-  my($self) = @_;
-  my($dbh)=dbh;
-  my($table)=$self->table;
+sub delete {
+  my $self = shift;
 
-  my($sth);
-  my($statement)="DELETE FROM $table WHERE ". join(' AND ',
+  my($statement)="DELETE FROM ". $self->table. " WHERE ". join(' AND ',
     map {
       $self->getfield($_) eq ''
         ? "$_ IS NULL"
-        : "$_ = ". _quote($self->getfield($_),$table,$_)
-    } ( $dbdef->table($table)->primary_key )
-          ? ($dbdef->table($table)->primary_key)
-          : fields($table)
+        : "$_ = ". _quote($self->getfield($_),$self->table,$_)
+    } ( $self->dbdef_table->primary_key )
+          ? ( $self->dbdef_table->primary_key)
+          : $self->fields
   );
-  $sth = $dbh->prepare($statement) or return $dbh->errstr;
+  my $sth = dbh->prepare($statement) or return dbh->errstr;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -385,8 +397,7 @@ sub del {
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
 
-  my($rc);
-  $rc=$sth->execute or return $sth->errstr;
+  my $rc = $sth->execute or return $sth->errstr;
   #not portable #return "Record not found, statement:\n$statement" if $rc eq "0E0";
 
   undef $self; #no need to keep object!
@@ -394,48 +405,57 @@ sub del {
   '';
 }
 
-=item rep OLD_RECORD
+=item del
+
+Depriciated (use delete instead).
+
+=cut
+
+sub del {
+  cluck "warning: FS::Record::del depriciated!";
+  &delete(@_); #call method in this scope
+}
+
+=item replace OLD_RECORD
 
 Replace the OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
 =cut
 
-sub rep {
-  my($new,$old)=@_;
-  my($dbh)=dbh;
-  my($table)=$old->table;
-  my(@fields)=fields($table);
-  my(@diff)=grep $new->getfield($_) ne $old->getfield($_), @fields;
+sub replace {
+  my ( $new, $old ) = ( shift, shift );
 
-  if ( scalar(@diff) == 0 ) {
+  my @diff = grep $new->getfield($_) ne $old->getfield($_), $old->fields;
+  unless ( @diff ) {
     carp "warning: records identical";
     return '';
   }
 
-  return "Records not in same table!" unless $new->table eq $table;
+  return "Records not in same table!" unless $new->table eq $old->table;
 
-  my($sth);
-  my($statement)="UPDATE $table SET ". join(', ',
+  my $primary_key = $old->dbdef_table->primary_key;
+  return "Can't change $primary_key"
+    if $primary_key
+       && ( $old->getfield($primary_key) ne $new->getfield($primary_key) );
+
+  my $error = $new->check;
+  return $error if $error;
+
+  my $statement = "UPDATE ". $old->table. " SET ". join(', ',
     map {
-      "$_ = ". _quote($new->getfield($_),$table,$_) 
+      "$_ = ". _quote($new->getfield($_),$old->table,$_) 
     } @diff
   ). ' WHERE '.
     join(' AND ',
       map {
         $old->getfield($_) eq ''
           ? "$_ IS NULL"
-          : "$_ = ". _quote($old->getfield($_),$table,$_)
-#      } @fields
-#      } ( primary_key($table) ? (primary_key($table)) : @fields )
-      } ( $dbdef->table($table)->primary_key 
-            ? ($dbdef->table($table)->primary_key)
-            : @fields
-        )
+          : "$_ = ". _quote($old->getfield($_),$old->table,$_)
+      } ( $primary_key ? ( $primary_key ) : $old->fields )
     )
   ;
-  #warn $statement;
-  $sth = $dbh->prepare($statement) or return $dbh->errstr;
+  my $sth = dbh->prepare($statement) or return dbh->errstr;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -443,14 +463,34 @@ sub rep {
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
 
-  my($rc);
-  $rc=$sth->execute or return $sth->errstr;
+  my $rc = $sth->execute or return $sth->errstr;
   #not portable #return "Record not found (or records identical)." if $rc eq "0E0";
 
   '';
 
 }
 
+=item rep
+
+Depriciated (use replace instead).
+
+=cut
+
+sub rep {
+  cluck "warning: FS::Record::rep depriciated!";
+  replace @_; #call method in this scope
+}
+
+=item check
+
+Not yet implemented, croaks.  Derived classes should provide a check method.
+
+=cut
+
+sub check {
+  croak "FS::Record::check not implemented; supply one in subclass!";
+}
+
 =item unique COLUMN
 
 Replaces COLUMN in record with a unique number.  Called by the B<add> method
@@ -655,6 +695,29 @@ sub ut_anything {
   '';
 }
 
+=item fields [ TABLE ]
+
+This can be used as both a subroutine and a method call.  It returns a list
+of the columns in this record's table, or an explicitly specified table.
+(See L<dbdef_table>).
+
+=cut
+
+# Usage: @fields = fields($table);
+#        @fields = $record->fields;
+sub fields {
+  my $something = shift;
+  my $table;
+  if ( ref($something) ) {
+    $table = $something->table;
+  } else {
+    $table = $something;
+  }
+  #croak "Usage: \@fields = fields(\$table)\n   or: \@fields = \$record->fields" unless $table;
+  my($table_obj) = $dbdef->table($table);
+  croak "Unknown table $table" unless $table_obj;
+  $table_obj->columns;
+}
 
 =head1 SUBROUTINES
 
@@ -711,7 +774,7 @@ It returns a hash-type list with the fields of this record's table set true.
 =cut
 
 sub hfields {
-  carp "hfields is depriciated";
+  carp "warning: hfields is depriciated";
   my($table)=@_;
   my(%hash);
   foreach (fields($table)) {
@@ -720,23 +783,6 @@ sub hfields {
   \%hash;
 }
 
-=item fields TABLE
-
-This returns a list of the columns in this record's table
-(See L<dbdef_table>).
-
-=cut
-
-# Usage: @fields = fields($table);
-sub fields {
-  my($table) = @_;
-  #my(@fields) = $dbdef->table($table)->columns;
-  croak "Usage: \@fields = fields(\$table)" unless $table;
-  my($table_obj) = $dbdef->table($table);
-  croak "Unknown table $table" unless $table_obj;
-  $table_obj->columns;
-}
-
 #sub _dump {
 #  my($self)=@_;
 #  join("\n", map {
@@ -759,7 +805,7 @@ sub fields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.9 1998-11-21 07:26:45 ivan Exp $
+$Id: Record.pm,v 1.10 1998-12-29 11:59:33 ivan Exp $
 
 =head1 BUGS
 
@@ -795,6 +841,9 @@ The _quote function should probably use ut_float instead of a regex.
 
 All the subroutines probably should be methods, here or elsewhere.
 
+Probably should borrow/use some dbdef methods where appropriate (like sub
+fields)
+
 =head1 SEE ALSO
 
 L<FS::dbdef>, L<FS::UID>, L<DBI>
@@ -878,7 +927,10 @@ added pod documentation ivan@sisd.com 98-sep-6
 ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
 $Log: Record.pm,v $
-Revision 1.9  1998-11-21 07:26:45  ivan
+Revision 1.10  1998-12-29 11:59:33  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+Revision 1.9  1998/11/21 07:26:45  ivan
 "Records identical" carp tells us it is just a warning.
 
 Revision 1.8  1998/11/15 11:02:04  ivan
diff --git a/site_perl/agent.pm b/site_perl/agent.pm
index ab06f6798..7632d2fca 100644
--- a/site_perl/agent.pm
+++ b/site_perl/agent.pm
@@ -1,14 +1,12 @@
 package FS::agent;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK);
-use Exporter;
-use FS::Record qw(fields qsearch qsearchs);
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs);
 use FS::cust_main;
 use FS::agent_type;
 
-@ISA = qw(FS::Record Exporter);
-@EXPORT_OK = qw(fields);
+@ISA = qw( FS::Record );
 
 =head1 NAME
 
@@ -18,8 +16,8 @@ FS::agent - Object methods for agent records
 
   use FS::agent;
 
-  $record = create FS::agent \%hash;
-  $record = create FS::agent { 'column' => 'value' };
+  $record = new FS::agent \%hash;
+  $record = new FS::agent { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -53,38 +51,19 @@ from FS::Record.  The following fields are currently supported:
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new agent.  To add the agent to the database, see L<"insert">.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('agent')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('agent',$hashref);
-}
+sub table { 'agent'; }
 
 =item insert
 
 Adds this agent to the database.  If there is an error, returns the error,
 otherwise returns false.
 
-=cut
-
-sub insert {
-  my($self)=@_;
-
-  $self->check or
-  $self->add;
-}
-
 =item delete
 
 Deletes this agent from the database.  Only agents with no customers can be
@@ -93,10 +72,12 @@ deleted.  If there is an error, returns the error, otherwise returns false.
 =cut
 
 sub delete {
-  my($self)=@_;
+  my $self = shift;
+
   return "Can't delete an agent with customers!"
-    if qsearch('cust_main',{'agentnum' => $self->agentnum});
-  $self->del;
+    if qsearch( 'cust_main', { 'agentnum' => $self->agentnum } );
+
+  $self->SUPER::delete;
 }
 
 =item replace OLD_RECORD
@@ -104,17 +85,6 @@ sub delete {
 Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
-=cut
-
-sub replace {
-  my($new,$old)=@_;
-  return "(Old) Not an agent record!" unless $old->table eq "agent";
-  return "Can't change agentnum!"
-    unless $old->getfield('agentnum') eq $new->getfield('agentnum');
-  $new->check or
-  $new->rep($old);
-}
-
 =item check
 
 Checks all fields to make sure this is a valid agent.  If there is an error,
@@ -124,20 +94,19 @@ methods.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a agent record!" unless $self->table eq "agent";
+  my $self = shift;
 
-  my($error)=
+  my $error =
     $self->ut_numbern('agentnum')
-      or $self->ut_text('agent')
-      or $self->ut_number('typenum')
-      or $self->ut_numbern('freq')
-      or $self->ut_textn('prog')
+      || $self->ut_text('agent')
+      || $self->ut_number('typenum')
+      || $self->ut_numbern('freq')
+      || $self->ut_textn('prog')
   ;
   return $error if $error;
 
   return "Unknown typenum!"
-    unless qsearchs('agent_type',{'typenum'=> $self->getfield('typenum') });
+    unless qsearchs( 'agent_type', { 'typenum' => $self->typenum } );
 
   '';
 
@@ -145,9 +114,11 @@ sub check {
 
 =back
 
-=head1 BUGS
+=head1 VERSION
 
-It doesn't properly override FS::Record yet.
+$Id: agent.pm,v 1.3 1998-12-29 11:59:34 ivan Exp $
+
+=head1 BUGS
 
 =head1 SEE ALSO
 
diff --git a/site_perl/agent_type.pm b/site_perl/agent_type.pm
index 002c36f54..54a91c8bf 100644
--- a/site_perl/agent_type.pm
+++ b/site_perl/agent_type.pm
@@ -1,12 +1,10 @@
 package FS::agent_type;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK);
-use Exporter;
-use FS::Record qw(qsearch fields);
+use vars qw( @ISA );
+use FS::Record qw( qsearch );
 
-@ISA = qw(FS::Record Exporter);
-@EXPORT_OK = qw(fields);
+@ISA = qw( FS::Record );
 
 =head1 NAME
 
@@ -16,8 +14,8 @@ FS::agent_type - Object methods for agent_type records
 
   use FS::agent_type;
 
-  $record = create FS::agent_type \%hash;
-  $record = create FS::agent_type { 'column' => 'value' };
+  $record = new FS::agent_type \%hash;
+  $record = new FS::agent_type { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -47,40 +45,20 @@ FS::Record.  The following fields are currently supported:
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new agent type.  To add the agent type to the database, see
 L<"insert">.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('agent_type')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('agent_type',$hashref);
-
-}
+sub table { 'agent_type'; }
 
 =item insert
 
 Adds this agent type to the database.  If there is an error, returns the error,
 otherwise returns false.
 
-=cut
-
-sub insert {
-  my($self)=@_;
-
-  $self->check or
-  $self->add;
-}
-
 =item delete
 
 Deletes this agent type from the database.  Only agent types with no agents
@@ -90,10 +68,12 @@ false.
 =cut
 
 sub delete {
-  my($self)=@_;
+  my $self = shift;
+
   return "Can't delete an agent_type with agents!"
-    if qsearch('agent',{'typenum' => $self->typenum});
-  $self->del;
+    if qsearch( 'agent', { 'typenum' => $self->typenum } );
+
+  $self->SUPER::delete;
 }
 
 =item replace OLD_RECORD
@@ -101,17 +81,6 @@ sub delete {
 Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
-=cut
-
-sub replace {
-  my($new,$old)=@_;
-  return "(Old) Not a agent_type record!" unless $old->table eq "agent_type";
-  return "Can't change typenum!"   
-    unless $old->getfield('typenum') eq $new->getfield('typenum');
-  $new->check or
-  $new->rep($old);
-}
-
 =item check
 
 Checks all fields to make sure this is a valid agent type.  If there is an
@@ -121,8 +90,7 @@ replace methods.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a agent_type record!" unless $self->table eq "agent_type";
+  my $self = shift;
 
   $self->ut_numbern('typenum')
   or $self->ut_text('atype');
@@ -131,9 +99,11 @@ sub check {
 
 =back
 
-=head1 BUGS
+=head1 VERSION
+
+$Id: agent_type.pm,v 1.2 1998-12-29 11:59:35 ivan Exp $
 
-It doesn't properly override FS::Record yet.
+=head1 BUGS
 
 =head1 SEE ALSO
 
@@ -155,6 +125,11 @@ Changed 'type' to 'atype' because Pg6.3 reserves the type word
 
 pod, added check in delete ivan@sisd.com 98-sep-21
 
+$Log: agent_type.pm,v $
+Revision 1.2  1998-12-29 11:59:35  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+
 =cut
 
 1;
diff --git a/site_perl/cust_bill.pm b/site_perl/cust_bill.pm
index 455fc2d4f..3706aa4bf 100644
--- a/site_perl/cust_bill.pm
+++ b/site_perl/cust_bill.pm
@@ -1,12 +1,16 @@
 package FS::cust_bill;
 
 use strict;
-use vars qw(@ISA $conf $add1 $add2 $add3 $add4);
-use Exporter;
+use vars qw( @ISA $conf $add1 $add2 $add3 $add4 );
 use Date::Format;
-use FS::Record qw(fields qsearch qsearchs);
+use FS::Record qw( qsearch qsearchs );
+use FS::cust_main;
+use FS::cust_bill_pkg;
+use FS::cust_credit;
+use FS::cust_pay;
+use FS::cust_pkg;
 
-@ISA = qw(FS::Record Exporter);
+@ISA = qw( FS::Record );
 
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::cust_bill'} = sub { 
@@ -22,8 +26,8 @@ FS::cust_bill - Object methods for cust_bill records
 
   use FS::cust_bill;
 
-  $record = create FS::cust_bill \%hash;
-  $record = create FS::cust_bill { 'column' => 'value' };
+  $record = new FS::cust_bill \%hash;
+  $record = new FS::cust_bill { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -72,7 +76,7 @@ all payments (see L<FS::cust_pay>).
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new invoice.  To add the invoice to the database, see L<"insert">.
 Invoices are normally created by calling the bill method of a customer object
@@ -80,17 +84,7 @@ Invoices are normally created by calling the bill method of a customer object
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('cust_bill')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('cust_bill',$hashref);
-}
+sub table { 'cust_bill'; }
 
 =item insert
 
@@ -103,14 +97,13 @@ automatically set to charged).
 =cut
 
 sub insert {
-  my($self)=@_;
+  my $self = shift;
 
-  $self->setfield('owed',$self->charged) if $self->owed eq '';
+  $self->owed( $self->charged ) if $self->owed eq '';
   return "owed != charged!"
     unless $self->owed == $self->charged;
 
-  $self->check or
-  $self->add;
+  $self->SUPER::insert;
 }
 
 =item delete
@@ -122,8 +115,6 @@ no record you ever posted this invoice (which is bad, no?)
 
 sub delete {
   return "Can't remove invoice!"
-  #my($self)=@_;
-  #$self->del;
 }
 
 =item replace OLD_RECORD
@@ -138,21 +129,13 @@ calling the collect method of a customer object (see L<FS::cust_main>).
 =cut
 
 sub replace {
-  my($new,$old)=@_;
-  return "(Old) Not a cust_bill record!" unless $old->table eq "cust_bill";
-  return "Can't change invnum!"
-    unless $old->getfield('invnum') eq $new->getfield('invnum');
-  return "Can't change custnum!"
-    unless $old->getfield('custnum') eq $new->getfield('custnum');
-  return "Can't change _date!"
-    unless $old->getfield('_date') eq $new->getfield('_date');
-  return "Can't change charged!"
-    unless $old->getfield('charged') eq $new->getfield('charged');
-  return "(New) owed can't be > (new) charged!"
-    if $new->getfield('owed') > $new->getfield('charged');
-
-  $new->check or
-  $new->rep($old);
+  my( $new, $old ) = ( shift, shift );
+  return "Can't change custnum!" unless $old->custnum eq $new->custnum;
+  return "Can't change _date!" unless $old->_date eq $new->_date;
+  return "Can't change charged!" unless $old->charged eq $new->charged;
+  return "(New) owed can't be > (new) charged!" if $new->owed > $new->charged;
+
+  $new->SUPER::replace($old);
 }
 
 =item check
@@ -164,30 +147,24 @@ methods.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a cust_bill record!" unless $self->table eq "cust_bill";
-  my($recref) = $self->hashref;
-
-  $recref->{invnum} =~ /^(\d*)$/ or return "Illegal invnum";
-  $recref->{invnum} = $1;
+  my $self = shift;
+
+  my $error =
+    $self->ut_numbern('invnum')
+    || $self->ut_number('custnum')
+    || $self->ut_numbern('_date')
+    || $self->ut_money('charged')
+    || $self->ut_money('owed')
+    || $self->ut_numbern('printed')
+  ;
+  return $error if $error;
 
-  $recref->{custnum} =~ /^(\d+)$/ or return "Illegal custnum";
-  $recref->{custnum} = $1;
   return "Unknown customer"
-    unless qsearchs('cust_main',{'custnum'=>$recref->{custnum}});
+    unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
 
-  $recref->{_date} =~ /^(\d*)$/ or return "Illegal date";
-  $recref->{_date} = $recref->{_date} ? $1 : time;
+  $self->_date(time) unless $self->_date;
 
-  #$recref->{charged} =~ /^(\d+(\.\d\d)?)$/ or return "Illegal charged";
-  $recref->{charged} =~ /^(\-?\d+(\.\d\d)?)$/ or return "Illegal charged";
-  $recref->{charged} = $1;
-
-  $recref->{owed} =~ /^(\-?\d+(\.\d\d)?)$/ or return "Illegal owed";
-  $recref->{owed} = $1;
-
-  $recref->{printed} =~ /^(\d*)$/ or return "Illegal printed";
-  $recref->{printed} = $1 || '0';
+  $self->printed(0) if $self->printed eq '';
 
   ''; #no error
 }
@@ -200,13 +177,13 @@ followed by the previous outstanding invoices (as FS::cust_bill objects also).
 =cut
 
 sub previous {
-  my($self)=@_;
-  my($total)=0;
-  my(@cust_bill) = sort { $a->_date <=> $b->_date }
+  my $self = shift;
+  my $total = 0;
+  my @cust_bill = sort { $a->_date <=> $b->_date }
     grep { $_->owed != 0 && $_->_date < $self->_date }
-      qsearch('cust_bill',{ 'custnum' => $self->custnum } ) 
+      qsearch( 'cust_bill', { 'custnum' => $self->custnum } ) 
   ;
-  foreach (@cust_bill) { $total += $_->owed; }
+  foreach ( @cust_bill ) { $total += $_->owed; }
   $total, @cust_bill;
 }
 
@@ -217,7 +194,7 @@ Returns the line items (see L<FS::cust_bill_pkg>) for this invoice.
 =cut
 
 sub cust_bill_pkg {
-  my($self)=@_;
+  my $self = shift;
   qsearch( 'cust_bill_pkg', { 'invnum' => $self->invnum } );
 }
 
@@ -230,9 +207,9 @@ credits (FS::cust_credit objects).
 =cut
 
 sub cust_credit {
-  my($self)=@_;
-  my($total)=0;
-  my(@cust_credit) = sort { $a->_date <=> $b->date }
+  my $self = shift;
+  my $total = 0;
+  my @cust_credit = sort { $a->_date <=> $b->date }
     grep { $_->credited != 0 && $_->_date < $self->_date }
       qsearch('cust_credit', { 'custnum' => $self->custnum } )
   ;
@@ -247,7 +224,7 @@ Returns all payments (see L<FS::cust_pay>) for this invoice.
 =cut
 
 sub cust_pay {
-  my($self)=@_;
+  my $self = shift;
   sort { $a->_date <=> $b->date }
     qsearch( 'cust_pay', { 'invnum' => $self->invnum } )
   ;
@@ -266,27 +243,25 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 sub print_text {
 
-  my($self,$today)=@_;
+  my( $self, $today ) = ( shift, shift );
   $today ||= time;
-  my($invnum)=$self->invnum;
-  my($cust_main) = qsearchs('cust_main', 
-                            { 'custnum', $self->custnum } );
-  $cust_main->setfield('payname',
-    $cust_main->first. ' '. $cust_main->getfield('last')
-  ) unless $cust_main->payname;
+  my $invnum = $self->invnum;
+  my $cust_main = qsearchs('cust_main', { 'custnum', $self->custnum } );
+  $cust_main->payname( $cust_main->first. ' '. $cust_main->getfield('last') )
+    unless $cust_main->payname;
 
-  my($pr_total,@pr_cust_bill) = $self->previous; #previous balance
-  my($cr_total,@cr_cust_credit) = $self->cust_credit; #credits
-  my($balance_due) = $self->owed + $pr_total - $cr_total;
+  my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
+  my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
+  my $balance_due = $self->owed + $pr_total - $cr_total;
 
   #overdue?
-  my($overdue) = ( 
+  my $overdue = ( 
     $balance_due > 0
     && $today > $self->_date 
     && $self->printed > 1
   );
 
-  #printing bits here
+  #printing bits here (yuck!)
 
   local($SIG{CHLD}) = sub { wait() };
   $|=1;
@@ -459,12 +434,14 @@ $address[4],''
 
 =back
 
+=head1 VERSION
+
+$Id: cust_bill.pm,v 1.4 1998-12-29 11:59:36 ivan Exp $
+
 =head1 BUGS
 
 The delete method.
 
-It doesn't properly override FS::Record yet.
-
 print_text formatting (and some logic :/) is in source as a format declaration,
 which needs to be slurped in from a file.  the fork is rather kludgy as well.
 It could be cleaned with swrite from man perlform, and the picture could be
@@ -492,7 +469,10 @@ charges can be negative ivan@sisd.com 98-jul-13
 pod, ingegrate with FS::Invoice ivan@sisd.com 98-sep-20
 
 $Log: cust_bill.pm,v $
-Revision 1.3  1998-11-13 09:56:53  ivan
+Revision 1.4  1998-12-29 11:59:36  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+Revision 1.3  1998/11/13 09:56:53  ivan
 change configuration file layout to support multiple distinct databases (with
 own set of config files, export, etc.)
 
diff --git a/site_perl/cust_bill_pkg.pm b/site_perl/cust_bill_pkg.pm
index e41d7c12c..a52539433 100644
--- a/site_perl/cust_bill_pkg.pm
+++ b/site_perl/cust_bill_pkg.pm
@@ -1,12 +1,12 @@
 package FS::cust_bill_pkg;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK);
-use Exporter;
-use FS::Record qw(fields qsearchs);
+use vars qw( @ISA );
+use FS::Record qw( qsearchs );
+use FS::cust_pkg;
+use FS::cust_bill;
 
-@ISA = qw(FS::Record Exporter);
-@EXPORT_OK = qw(fields);
+@ISA = qw(FS::Record );
 
 =head1 NAME
 
@@ -16,8 +16,8 @@ FS::cust_bill_pkg - Object methods for cust_bill_pkg records
 
   use FS::cust_bill_pkg;
 
-  $record = create FS::cust_bill_pkg \%hash;
-  $record = create FS::cust_bill_pkg { 'column' => 'value' };
+  $record = new FS::cust_bill_pkg \%hash;
+  $record = new FS::cust_bill_pkg { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -56,7 +56,7 @@ see L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new line item.  To add the line item to the database, see
 L<"insert">.  Line items are normally created by calling the bill method of a
@@ -64,33 +64,13 @@ customer object (see L<FS::cust_main>).
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('cust_bill_pkg')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('cust_bill_pkg',$hashref);
-
-}
+sub table { 'cust_bill_pkg'; }
 
 =item insert
 
 Adds this line item to the database.  If there is an error, returns the error,
 otherwise returns false.
 
-=cut
-
-sub insert {
-  my($self)=@_;
-
-  $self->check or
-  $self->add;
-}
-
 =item delete
 
 Currently unimplemented.  I don't remove line items because there would then be
@@ -100,8 +80,6 @@ no record the items ever existed (which is bad, no?)
 
 sub delete {
   return "Can't delete cust_bill_pkg records!";
-  #my($self)=@_;
-  #$self->del;
 }
 
 =item replace OLD_RECORD
@@ -113,12 +91,6 @@ than deleteing the items.  Just don't do it.
 
 sub replace {
   return "Can't modify cust_bill_pkg records!";
-  #my($new,$old)=@_;
-  #return "(Old) Not a cust_bill_pkg record!" 
-  #  unless $old->table eq "cust_bill_pkg";
-  #
-  #$new->check or
-  #$new->rep($old);
 }
 
 =item check
@@ -130,35 +102,36 @@ method.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a cust_bill_pkg record!" unless $self->table eq "cust_bill_pkg";
+  my $self = shift;
 
-  my($error)=
+  my $error =
     $self->ut_number('pkgnum')
-      or $self->ut_number('invnum')
-      or $self->ut_money('setup')
-      or $self->ut_money('recur')
-      or $self->ut_numbern('sdate')
-      or $self->ut_numbern('edate')
+      || $self->ut_number('invnum')
+      || $self->ut_money('setup')
+      || $self->ut_money('recur')
+      || $self->ut_numbern('sdate')
+      || $self->ut_numbern('edate')
   ;
   return $error if $error;
 
   if ( $self->pkgnum != 0 ) { #allow unchecked pkgnum 0 for tax! (add to part_pkg?)
-    return "Unknown pkgnum ".$self->pkgnum
-    unless qsearchs('cust_pkg',{'pkgnum'=> $self->pkgnum });
+    return "Unknown pkgnum ". $self->pkgnum
+      unless qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
   }
 
   return "Unknown invnum"
-    unless qsearchs('cust_bill',{'invnum'=> $self->invnum });
+    unless qsearchs( 'cust_bill' ,{ 'invnum' => $self->invnum } );
 
   ''; #no error
 }
 
 =back
 
-=head1 BUGS
+=head1 VERSION
+
+$Id: cust_bill_pkg.pm,v 1.2 1998-12-29 11:59:37 ivan Exp $
 
-It doesn't properly override FS::Record yet.
+=head1 BUGS
 
 =head1 SEE ALSO
 
diff --git a/site_perl/cust_credit.pm b/site_perl/cust_credit.pm
index b1a5e1649..321c01b34 100644
--- a/site_perl/cust_credit.pm
+++ b/site_perl/cust_credit.pm
@@ -1,13 +1,12 @@
 package FS::cust_credit;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK);
-use Exporter;
-use FS::UID qw(getotaker);
-use FS::Record qw(fields qsearchs);
+use vars qw( @ISA );
+use FS::UID qw( getotaker );
+use FS::Record qw( qsearchs );
+use FS::cust_main;
 
-@ISA = qw(FS::Record Exporter);
-@EXPORT_OK = qw(fields);
+@ISA = qw( FS::Record );
 
 =head1 NAME
 
@@ -17,8 +16,8 @@ FS::cust_credit - Object methods for cust_credit records
 
   use FS::cust_credit;
 
-  $record = create FS::cust_credit \%hash;
-  $record = create FS::cust_credit { 'column' => 'value' };
+  $record = new FS::cust_credit \%hash;
+  $record = new FS::cust_credit { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -57,23 +56,13 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new credit.  To add the credit to the database, see L<"insert">.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('cust_credit')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('cust_credit',$hashref);
-}
+sub table { 'cust_credit'; }
 
 =item insert
 
@@ -86,14 +75,13 @@ automatically set to amount).
 =cut
 
 sub insert {
-  my($self)=@_;
+  my $self = shift;
 
-  $self->setfield('credited',$self->amount) if $self->credited eq '';
+  $self->credited($self->amount) if $self->credited eq '';
   return "credited != amount!"
     unless $self->credited == $self->amount;
 
-  $self->check or
-  $self->add;
+  $self->SUPER::insert;
 }
 
 =item delete
@@ -104,8 +92,6 @@ Currently unimplemented.
 
 sub delete {
   return "Can't remove credit!"
-  #my($self)=@_;
-  #$self->del;
 }
 
 =item replace OLD_RECORD
@@ -119,21 +105,15 @@ inserting a refund (see L<FS::cust_refund>).
 =cut
 
 sub replace {
-  my($new,$old)=@_;
-  return "(Old) Not a cust_credit record!" unless $old->table eq "cust_credit";
-  return "Can't change crednum!"
-    unless $old->getfield('crednum') eq $new->getfield('crednum');
-  return "Can't change custnum!"
-    unless $old->getfield('custnum') eq $new->getfield('custnum');
-  return "Can't change date!"
-    unless $old->getfield('_date') eq $new->getfield('_date');
-  return "Can't change amount!"
-    unless $old->getfield('amount') eq $new->getfield('amount');
+  my ( $new, $old ) = ( shift, shift );
+
+  return "Can't change custnum!" unless $old->custnum eq $new->custnum;
+  return "Can't change date!" unless $old->_date eq $new->_date;
+  return "Can't change amount!" unless $old->amount eq $new->amount;
   return "(New) credited can't be > (new) amount!"
-    if $new->getfield('credited') > $new->getfield('amount');
+    if $new->credited > $new->amount;
 
-  $new->check or
-  $new->rep($old);
+  $new->SUPER::replace($old);
 }
 
 =item check
@@ -145,43 +125,38 @@ methods.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a cust_credit record!" unless $self->table eq "cust_credit";
-  my($recref) = $self->hashref;
+  my $self = shift;
+
+  my $error =
+    $self->ut_numbern('crednum')
+    || $self->ut_number('custnum')
+    || $self->ut_numbern('_date')
+    || $self->ut_money('amount')
+    || $self->ut_money('credited')
+    || $self->ut_textn('reason');
+  ;
+  return $error if $error;
 
-  $recref->{crednum} =~ /^(\d*)$/ or return "Illegal crednum";
-  $recref->{crednum} = $1;
-
-  $recref->{custnum} =~ /^(\d+)$/ or return "Illegal custnum";
-  $recref->{custnum} = $1;
   return "Unknown customer"
-    unless qsearchs('cust_main',{'custnum'=>$recref->{custnum}});
-
-  $recref->{_date} =~ /^(\d*)$/ or return "Illegal date";
-  $recref->{_date} = $recref->{_date} ? $1 : time;
-
-  $recref->{amount} =~ /^(\d+(\.\d\d)?)$/ or return "Illegal amount";
-  $recref->{amount} = $1;
+    unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
 
-  $recref->{credited} =~ /^(\-?\d+(\.\d\d)?)$/ or return "Illegal credited";
-  $recref->{credited} = $1;
+  $self->_date(time) unless $self->_date;
 
-  #$recref->{otaker} =~ /^(\w+)$/ or return "Illegal otaker";
-  #$recref->{otaker} = $1;
   $self->otaker(getotaker);
 
-  $self->ut_textn('reason');
-
+  ''; #no error
 }
 
 =back
 
+=head1 VERSION
+
+$Id: cust_credit.pm,v 1.2 1998-12-29 11:59:38 ivan Exp $
+
 =head1 BUGS
 
 The delete method.
 
-It doesn't properly override FS::Record yet.
-
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::cust_refund>, L<FS::cust_bill>, schema.html from the base
@@ -193,6 +168,11 @@ ivan@sisd.com 98-mar-17
 
 pod, otaker from FS::UID ivan@sisd.com 98-sep-21
 
+$Log: cust_credit.pm,v $
+Revision 1.2  1998-12-29 11:59:38  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+
 =cut
 
 1;
diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index 6c9c0b109..77ebb2d04 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -5,16 +5,15 @@ use vars qw($paymentserversecret $paymentserverport $paymentserverhost);
 package FS::cust_main;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK $conf $lpr $processor $xaction $E_NoErr);
+use vars qw(@ISA $conf $lpr $processor $xaction $E_NoErr);
 use Safe;
-use Exporter;
 use Carp;
 use Time::Local;
 use Date::Format;
 use Date::Manip;
 use Business::CreditCard;
-use FS::UID qw(getotaker);
-use FS::Record qw(fields hfields qsearchs qsearch);
+use FS::UID qw( getotaker );
+use FS::Record qw( qsearchs qsearch );
 use FS::cust_pkg;
 use FS::cust_bill;
 use FS::cust_bill_pkg;
@@ -26,8 +25,7 @@ use FS::cust_main_county;
 use FS::agent;
 use FS::cust_main_invoice;
 
-@ISA = qw(FS::Record Exporter);
-@EXPORT_OK = qw(hfields);
+@ISA = qw( FS::Record );
 
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::cust_main'} = sub { 
@@ -75,8 +73,8 @@ FS::cust_main - Object methods for cust_main records
 
   use FS::cust_main;
 
-  $record = create FS::cust_main \%hash;
-  $record = create FS::cust_main { 'column' => 'value' };
+  $record = new FS::cust_main \%hash;
+  $record = new FS::cust_main { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -158,7 +156,7 @@ FS::Record.  The following fields are currently supported:
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new customer.  To add the customer to the database, see L<"insert">.
 
@@ -167,39 +165,13 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my $field;
-  #foreach $field (fields('cust_main')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('cust_main',$hashref);
-}
+sub table { 'cust_main'; }
 
 =item insert
 
 Adds this customer to the database.  If there is an error, returns the error,
 otherwise returns false.
 
-=cut
-
-sub insert {
-  my($self)=@_;
-
-  #no callbacks in check, only data checks
-  #local $SIG{HUP} = 'IGNORE';
-  #local $SIG{INT} = 'IGNORE';
-  #local $SIG{QUIT} = 'IGNORE';
-  #local $SIG{TERM} = 'IGNORE';
-  #local $SIG{TSTP} = 'IGNORE';
-
-  $self->check or
-  $self->add;
-}
-
 =item delete
 
 Currently unimplemented.  Maybe cancel all of this customer's
@@ -210,12 +182,8 @@ be no record the customer ever existed (which is bad, no?)
 
 =cut
 
-# Usage: $error = $record -> delete;
 sub delete {
    return "Can't (yet?) delete customers.";
-#  my($self)=@_;
-#
-#  $self->del;
 }
 
 =item replace OLD_RECORD
@@ -223,17 +191,6 @@ sub delete {
 Replaces the OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
-=cut
-
-sub replace {
-  my($new,$old)=@_;
-  return "(Old) Not a cust_main record!" unless $old->table eq "cust_main";
-  return "Can't change custnum!"
-    unless $old->getfield('custnum') eq $new->getfield('custnum');
-  $new->check or
-  $new->rep($old);
-}
-
 =item check
 
 Checks all fields to make sure this is a valid customer record.  If there is
@@ -243,9 +200,7 @@ and repalce methods.
 =cut
 
 sub check {
-  my($self)=@_;
-
-  return "Not a cust_main record!" unless $self->table eq "cust_main";
+  my $self = shift;
 
   my $error =
     $self->ut_number('agentnum')
@@ -263,10 +218,10 @@ sub check {
   return $error if $error;
 
   return "Unknown agent"
-    unless qsearchs('agent',{'agentnum'=>$self->agentnum});
+    unless qsearchs( 'agent', { 'agentnum' => $self->agentnum } );
 
   return "Unknown referral"
-    unless qsearchs('part_referral',{'refnum'=>$self->refnum});
+    unless qsearchs( 'part_referral', { 'refnum' => $self->refnum } );
 
   $self->getfield('last') =~ /^([\w \,\.\-\']+)$/ or return "Illegal last name";
   $self->setfield('last',$1);
@@ -314,22 +269,17 @@ sub check {
     $payinfo = $1;
     $self->payinfo($payinfo);
     validate($payinfo) or return "Illegal credit card number";
-    my $type = cardtype($payinfo);
-    return "Unknown credit card type"
-      unless ( $type =~ /^VISA/ ||
-               $type =~ /^MasterCard/ ||
-               $type =~ /^American Express/ ||
-               $type =~ /^Discover/ );
+    return "Unknown card type" if cardtype($self->payinfo) eq "Unknown";
 
   } elsif ( $self->payby eq 'BILL' ) {
 
-    $self->payinfo =~ /^([\w \-]*)$/ or return "Illegal P.O. number";
-    $self->payinfo($1);
+    $error = $self->ut_textn('payinfo');
+    return "Illegal P.O. number" if $error;
 
   } elsif ( $self->payby eq 'COMP' ) {
 
-    $self->payinfo =~ /^(\w{2,8})$/ or return "Illegal comp account issuer";
-    $self->payinfo($1);
+    $error = $self->ut_textn('payinfo');
+    return "Illegal comp account issuer" if $error;
 
   }
 
@@ -371,7 +321,7 @@ Returns all packages (see L<FS::cust_pkg>) for this customer.
 =cut
 
 sub all_pkgs {
-  my($self)=@_;
+  my $self = shift;
   qsearch( 'cust_pkg', { 'custnum' => $self->custnum });
 }
 
@@ -382,7 +332,7 @@ Returns all non-cancelled packages (see L<FS::cust_pkg>) for this customer.
 =cut
 
 sub ncancelled_pkgs {
-  my($self)=@_;
+  my $self = shift;
   qsearch( 'cust_pkg', {
     'custnum' => $self->custnum,
     'cancel'  => '',
@@ -404,10 +354,10 @@ If there is an error, returns the error, otherwise returns false.
 =cut
 
 sub bill {
-  my($self,%options)=@_;
-  my($time) = $options{'time'} || $^T;
+  my( $self, %options ) = @_;
+  my $time = $options{'time'} || $^T;
 
-  my($error);
+  my $error;
 
   #put below somehow?
   local $SIG{HUP} = 'IGNORE';
@@ -419,38 +369,33 @@ sub bill {
   # find the packages which are due for billing, find out how much they are
   # & generate invoice database.
  
-  my($total_setup,$total_recur)=(0,0);
-
-  my(@cust_bill_pkg);
+  my( $total_setup, $total_recur ) = ( 0, 0 );
+  my @cust_bill_pkg;
 
-  my($cust_pkg);
-  foreach $cust_pkg (
+  foreach my $cust_pkg (
     qsearch('cust_pkg',{'custnum'=> $self->getfield('custnum') } )
   ) {
 
-    bless($cust_pkg,"FS::cust_pkg");
- 
-    next if ( $cust_pkg->getfield('cancel') );  
+    next if $cust_pkg->getfield('cancel');  
 
     #? to avoid use of uninitialized value errors... ?
     $cust_pkg->setfield('bill', '')
       unless defined($cust_pkg->bill);
  
-    my($part_pkg)=
-      qsearchs('part_pkg',{'pkgpart'=> $cust_pkg->pkgpart } );
+    my $part_pkg = qsearchs( 'part_pkg', { 'pkgpart' => $cust_pkg->pkgpart } );
 
     #so we don't modify cust_pkg record unnecessarily
-    my($cust_pkg_mod_flag)=0;
-    my(%hash)=$cust_pkg->hash;
-    my($old_cust_pkg)=create FS::cust_pkg(\%hash);
+    my $cust_pkg_mod_flag = 0;
+    my %hash = $cust_pkg->hash;
+    my $old_cust_pkg = new FS::cust_pkg \%hash;
 
     # bill setup
-    my($setup)=0;
+    my $setup = 0;
     unless ( $cust_pkg->setup ) {
-      my($setup_prog)=$part_pkg->getfield('setup');
-      my($cpt) = new Safe;
+      my $setup_prog = $part_pkg->getfield('setup');
+      my $cpt = new Safe;
       #$cpt->permit(); #what is necessary?
-      $cpt->share(qw($cust_pkg)); #can $cpt now use $cust_pkg methods?
+      $cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
       $setup = $cpt->reval($setup_prog);
       unless ( defined($setup) ) {
         warn "Error reval-ing part_pkg->setup pkgpart ", 
@@ -462,16 +407,16 @@ sub bill {
     }
 
     #bill recurring fee
-    my($recur)=0;
-    my($sdate);
+    my $recur = 0;
+    my $sdate;
     if ( $part_pkg->getfield('freq') > 0 &&
          ! $cust_pkg->getfield('susp') &&
          ( $cust_pkg->getfield('bill') || 0 ) < $time
     ) {
-      my($recur_prog)=$part_pkg->getfield('recur');
-      my($cpt) = new Safe;
+      my $recur_prog = $part_pkg->getfield('recur');
+      my $cpt = new Safe;
       #$cpt->permit(); #what is necessary?
-      $cpt->share(qw($cust_pkg)); #can $cpt now use $cust_pkg methods?
+      $cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
       $recur = $cpt->reval($recur_prog);
       unless ( defined($recur) ) {
         warn "Error reval-ing part_pkg->recur pkgpart ",
@@ -480,13 +425,14 @@ sub bill {
         #change this bit to use Date::Manip?
         #$sdate=$cust_pkg->bill || time;
         #$sdate=$cust_pkg->bill || $time;
-        $sdate=$cust_pkg->bill || $cust_pkg->setup || $time;
-        my($sec,$min,$hour,$mday,$mon,$year)=
+        $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
+        my ($sec,$min,$hour,$mday,$mon,$year) =
           (localtime($sdate) )[0,1,2,3,4,5];
         $mon += $part_pkg->getfield('freq');
         until ( $mon < 12 ) { $mon -= 12; $year++; }
-        $cust_pkg->setfield('bill',timelocal($sec,$min,$hour,$mday,$mon,$year));
-        $cust_pkg_mod_flag=1; 
+        $cust_pkg->setfield('bill',
+          timelocal($sec,$min,$hour,$mday,$mon,$year));
+        $cust_pkg_mod_flag = 1; 
       }
     }
 
@@ -494,15 +440,14 @@ sub bill {
     warn "recur is undefinded" unless defined($recur);
     warn "cust_pkg bill is undefinded" unless defined($cust_pkg->bill);
 
-    if ($cust_pkg_mod_flag) {
+    if ( $cust_pkg_mod_flag ) {
       $error=$cust_pkg->replace($old_cust_pkg);
-      if ( $error ) {
+      if ( $error ) { #just in case
         warn "Error modifying pkgnum ", $cust_pkg->pkgnum, ": $error";
       } else {
-        #just in case
-        $setup=sprintf("%.2f",$setup);
-        $recur=sprintf("%.2f",$recur);
-        my($cust_bill_pkg)=create FS::cust_bill_pkg ({
+        $setup = sprintf( "%.2f", $setup );
+        $recur = sprintf( "%.2f", $recur );
+        my $cust_bill_pkg = new FS::cust_bill_pkg ({
           'pkgnum' => $cust_pkg->pkgnum,
           'setup'  => $setup,
           'recur'  => $recur,
@@ -517,24 +462,24 @@ sub bill {
 
   }
 
-  my($charged)=sprintf("%.2f",$total_setup + $total_recur);
+  my $charged = sprintf( "%.2f", $total_setup + $total_recur );
 
   return '' if scalar(@cust_bill_pkg) == 0;
 
-  unless ( $self->getfield('tax') eq 'Y' ||
-           $self->getfield('tax') eq 'y' ||
-           $self->getfield('payby') eq 'COMP'
+  unless ( $self->getfield('tax') =~ /Y/i
+           || $self->getfield('payby') eq 'COMP'
   ) {
-    my($cust_main_county) = qsearchs('cust_main_county',{
-      'county' => $self->getfield('county'),
-      'state'  => $self->getfield('state'),
+    my $cust_main_county = qsearchs('cust_main_county',{
+        'state'   => $self->state,
+        'county'  => $self->county,
+        'country' => $self->country,
     } );
-    my($tax) = sprintf("%.2f",
+    my $tax = sprintf( "%.2f",
       $charged * ( $cust_main_county->getfield('tax') / 100 )
     );
-    $charged = sprintf("%.2f",$charged+$tax);
+    $charged = sprintf( "%.2f", $charged+$tax );
 
-    my($cust_bill_pkg)=create FS::cust_bill_pkg ({
+    my $cust_bill_pkg = new FS::cust_bill_pkg ({
       'pkgnum' => 0,
       'setup'  => $tax,
       'recur'  => 0,
@@ -544,23 +489,23 @@ sub bill {
     push @cust_bill_pkg, $cust_bill_pkg;
   }
 
-  my($cust_bill) = create FS::cust_bill ( {
+  my $cust_bill = new FS::cust_bill ( {
     'custnum' => $self->getfield('custnum'),
     '_date' => $time,
     'charged' => $charged,
   } );
-  $error=$cust_bill->insert;
+  $error = $cust_bill->insert;
   #shouldn't happen, but how else to handle this? (wrap me in eval, to catch 
   # fatal errors)
   die "Error creating cust_bill record: $error!\n",
       "Check updated but unbilled packages for customer", $self->custnum, "\n"
     if $error;
 
-  my($invnum)=$cust_bill->invnum;
-  my($cust_bill_pkg);
+  my $invnum = $cust_bill->invnum;
+  my $cust_bill_pkg;
   foreach $cust_bill_pkg ( @cust_bill_pkg ) {
-    $cust_bill_pkg->setfield('invnum',$invnum);
-    $error=$cust_bill_pkg->insert;
+    $cust_bill_pkg->setfield( 'invnum', $invnum );
+    $error = $cust_bill_pkg->insert;
     #shouldn't happen, but how else tohandle this?
     die "Error creating cust_bill_pkg record: $error!\n",
         "Check incomplete invoice ", $invnum, "\n"
@@ -596,10 +541,10 @@ return an error.  By default, they don't.
 =cut
 
 sub collect {
-  my($self,%options)=@_;
-  my($invoice_time) = $options{'invoice_time'} || $^T;
+  my( $self, %options ) = @_;
+  my $invoice_time = $options{'invoice_time'} || $^T;
 
-  my($total_owed) = $self->balance;
+  my $total_owed = $self->balance;
   return '' unless $total_owed > 0; #redundant?????
 
   #put below somehow?
@@ -609,90 +554,84 @@ sub collect {
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
 
-  foreach my $cust_bill ( qsearch('cust_bill', {
-    'custnum' => $self->getfield('custnum'),
-  } ) ) {
-
-    bless($cust_bill,"FS::cust_bill");
+  foreach my $cust_bill (
+    qsearch('cust_bill', { 'custnum' => $self->custnum, } )
+  ) {
 
     #this has to be before next's
-    my($amount) = sprintf("%.2f", $total_owed < $cust_bill->owed
+    my $amount = sprintf( "%.2f", $total_owed < $cust_bill->owed
                                   ? $total_owed
                                   : $cust_bill->owed
     );
-    $total_owed = sprintf("%.2f",$total_owed-$amount);
+    $total_owed = sprintf( "%.2f", $total_owed - $amount );
 
     next unless $cust_bill->owed > 0;
 
-    next if qsearchs('cust_pay_batch',{'invnum'=> $cust_bill->invnum });
+    next if qsearchs( 'cust_pay_batch', { 'invnum' => $cust_bill->invnum } );
 
     #warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ", amount $amount, total_owed $total_owed)";
 
     next unless $amount > 0;
 
-    if ( $self->getfield('payby') eq 'BILL' ) {
+    if ( $self->payby eq 'BILL' ) {
 
       #30 days 2592000
-      my($since)=$invoice_time - ( $cust_bill->_date || 0 );
+      my $since = $invoice_time - ( $cust_bill->_date || 0 );
       #warn "$invoice_time ", $cust_bill->_date, " $since";
       if ( $since >= 0 #don't print future invoices
            && ( $cust_bill->printed * 2592000 ) <= $since
       ) {
 
-        open(LPR,"|$lpr") or die "Can't open $lpr: $!";
+        open(LPR, "|$lpr") or die "Can't open pipe to $lpr: $!";
         print LPR $cust_bill->print_text; #( date )
         close LPR
           or die $! ? "Error closing $lpr: $!"
                        : "Exit status $? from $lpr";
 
-        my(%hash)=$cust_bill->hash;
+        my %hash = $cust_bill->hash;
         $hash{'printed'}++;
-        my($new_cust_bill)=create FS::cust_bill(\%hash);
-        my($error)=$new_cust_bill->replace($cust_bill);
-        if ( $error ) {
-          warn "Error updating $cust_bill->printed: $error";
-        }
+        my $new_cust_bill = new FS::cust_bill(\%hash);
+        my $error = $new_cust_bill->replace($cust_bill);
+        warn "Error updating $cust_bill->printed: $error" if $error;
 
       }
 
-    } elsif ( $self->getfield('payby') eq 'COMP' ) {
-      my($cust_pay) = create FS::cust_pay ( {
-         'invnum' => $cust_bill->getfield('invnum'),
+    } elsif ( $self->payby eq 'COMP' ) {
+      my $cust_pay = new FS::cust_pay ( {
+         'invnum' => $cust_bill->invnum,
          'paid' => $amount,
          '_date' => '',
          'payby' => 'COMP',
-         'payinfo' => $self->getfield('payinfo'),
+         'payinfo' => $self->payinfo,
          'paybatch' => ''
       } );
-      my($error)=$cust_pay->insert;
-      return 'Error COMPing invnum #' . $cust_bill->getfield('invnum') .
+      my $error = $cust_pay->insert;
+      return 'Error COMPing invnum #' . $cust_bill->invnum .
              ':' . $error if $error;
-    } elsif ( $self->getfield('payby') eq 'CARD' ) {
+    } elsif ( $self->payby eq 'CARD' ) {
 
       if ( $options{'batch_card'} ne 'yes' ) {
 
         return "Real time card processing not enabled!" unless $processor;
 
-        if ( $processor =~ /cybercash/ ) {
+        if ( $processor =~ /^cybercash/ ) {
 
           #fix exp. date for cybercash
-          $self->getfield('paydate') =~ /^(\d+)\/\d*(\d{2})$/;
-          my($exp)="$1/$2";
+          $self->paydate =~ /^(\d+)\/\d*(\d{2})$/;
+          my $exp = "$1/$2";
 
-          my($paybatch)= $cust_bill->getfield('invnum') . 
-                         '-' . time2str("%y%m%d%H%M%S",time);
+          my $paybatch = $cust_bill->invnum. 
+                         '-' . time2str("%y%m%d%H%M%S", time);
 
-          my($payname)= $self->getfield('payname') ||
-                        $self->getfield('first') . ' ' .$self->getfield('last');
+          my $payname = $self->payname ||
+                        $self->getfield('first'). ' '. $self->getfield('last');
 
-          my($address)= $self->getfield('address1');
-          $address .= ", " . $self->getfield('address2')
-            if $self->getfield('address2');
+          my $address = $self->address1;
+          $address .= ", ". $self->address2 if $self->address2;
 
-          my($country) = $self->getfield('country') eq 'US' ?
-                         'USA' : $self->getfield('country');
+          my $country = 'USA' if $self->country eq 'US';
 
-          my(@full_xaction)=($xaction,
+          my @full_xaction = ( $xaction,
             'Order-ID'     => $paybatch,
             'Amount'       => "usd $amount",
             'Card-Number'  => $self->getfield('payinfo'),
@@ -705,7 +644,7 @@ sub collect {
             'Card-Exp'     => $exp,
           );
 
-          my(%result);
+          my %result;
           if ( $processor eq 'cybercash2' ) {
             $^W=0; #CCLib isn't -w safe, ugh!
             %result = &CCLib::sendmserver(@full_xaction);
@@ -719,21 +658,21 @@ sub collect {
           #if ( $result{'MActionCode'} == 7 ) { #cybercash smps v.1.1.3
           #if ( $result{'action-code'} == 7 ) { #cybercash smps v.2.1
           if ( $result{'MStatus'} eq 'success' ) { #cybercash smps v.2 or 3
-            my($cust_pay) = create FS::cust_pay ( {
-               'invnum'   => $cust_bill->getfield('invnum'),
+            my $cust_pay = new FS::cust_pay ( {
+               'invnum'   => $cust_bill->invnum,
                'paid'     => $amount,
                '_date'     => '',
                'payby'    => 'CARD',
-               'payinfo'  => $self->getfield('payinfo'),
+               'payinfo'  => $self->payinfo,
                'paybatch' => "$processor:$paybatch",
             } );
-            my($error)=$cust_pay->insert;
+            my $error = $cust_pay->insert;
             return 'Error applying payment, invnum #' . 
-              $cust_bill->getfield('invnum') . ':' . $error if $error;
+              $cust_bill->invnum. ':'. $error if $error;
           } elsif ( $result{'Mstatus'} ne 'failure-bad-money'
                  || $options{'report_badcard'} ) {
              return 'Cybercash error, invnum #' . 
-               $cust_bill->getfield('invnum') . ':' . $result{'MErrMsg'};
+               $cust_bill->invnum. ':'. $result{'MErrMsg'};
           } else {
             return '';
           }
@@ -744,8 +683,7 @@ sub collect {
 
       } else { #batch card
 
-#       my($cust_pay_batch) = create FS::cust_pay_batch ( {
-       my($cust_pay_batch) = new FS::Record ('cust_pay_batch', {
+       my $cust_pay_batch = new FS::Record ('cust_pay_batch', {
          'invnum'   => $cust_bill->getfield('invnum'),
          'custnum'  => $self->getfield('custnum'),
          'last'     => $self->getfield('last'),
@@ -762,14 +700,13 @@ sub collect {
          'payname'  => $self->getfield('payname'),
          'amount'   => $amount,
        } );
-#       my($error)=$cust_pay_batch->insert;
-       my($error)=$cust_pay_batch->add;
+       my $error = $cust_pay_batch->insert;
        return "Error adding to cust_pay_batch: $error" if $error;
 
       }
 
     } else {
-      return "Unknown payment type ".$self->getfield('payby');
+      return "Unknown payment type ". $self->payby;
     }
 
   }
@@ -785,15 +722,14 @@ Returns the total owed for this customer on all invoices
 =cut
 
 sub total_owed {
-  my($self) = @_;
-  my($total_bill) = 0;
-  my($cust_bill);
-  foreach $cust_bill ( qsearch('cust_bill', {
-    'custnum' => $self->getfield('custnum'),
+  my $self = shift;
+  my $total_bill = 0;
+  foreach my $cust_bill ( qsearch('cust_bill', {
+    'custnum' => $self->custnum,
   } ) ) {
-    $total_bill += $cust_bill->getfield('owed');
+    $total_bill += $cust_bill->owed;
   }
-  sprintf("%.2f",$total_bill);
+  sprintf( "%.2f", $total_bill );
 }
 
 =item total_credited
@@ -803,15 +739,14 @@ Returns the total credits (see L<FS::cust_credit>) for this customer.
 =cut
 
 sub total_credited {
-  my($self) = @_;
-  my($total_credit) = 0;
-  my($cust_credit);
-  foreach $cust_credit ( qsearch('cust_credit', {
-    'custnum' => $self->getfield('custnum'),
+  my $self = shift;
+  my $total_credit = 0;
+  foreach my $cust_credit ( qsearch('cust_credit', {
+    'custnum' => $self->custnum,
   } ) ) {
-    $total_credit += $cust_credit->getfield('credited');
+    $total_credit += $cust_credit->credited;
   }
-  sprintf("%.2f",$total_credit);
+  sprintf( "%.2f", $total_credit );
 }
 
 =item balance
@@ -821,8 +756,8 @@ Returns the balance for this customer (total owed minus total credited).
 =cut
 
 sub balance {
-  my($self) = @_;
-  sprintf("%.2f",$self->total_owed - $self->total_credited);
+  my $self = shift;
+  sprintf( "%.2f", $self->total_owed - $self->total_credited );
 }
 
 =item invoicing_list [ ITEM, ITEM, ... ]
@@ -836,20 +771,20 @@ Returns a list of email addresses (with svcnum entries expanded).
 =cut
 
 sub invoicing_list {
-  my($self, @addresses) = @_;
+  my( $self, @addresses ) = @_;
   if ( @addresses ) {
     my @cust_main_invoice = 
-      qsearch('cust_main_invoice', { 'custnum' => $self->custnum } );
+      qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
     foreach my $cust_main_invoice ( @cust_main_invoice ) {
       unless ( grep { $cust_main_invoice->address eq $_ } @addresses ) {
         $cust_main_invoice->delete;
       }
     }
     @cust_main_invoice =
-      qsearch('cust_main_invoice', { 'custnum' => $self->custnum } );
+      qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
     foreach my $address ( @addresses ) {
       unless ( grep { $address eq $_->address } @cust_main_invoice ) {
-        my $cust_main_invoice = create FS::cust_main_invoice (
+        my $cust_main_invoice = new FS::cust_main_invoice (
           'custnum' => $self->custnum,
           'dest'    => $address,
         );
@@ -859,7 +794,7 @@ sub invoicing_list {
     }
   }
   map { $_->address }
-    qsearch('cust_main_invoice', { 'custnum' => $self->custnum } );
+    qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
 }
 
 =item check_invoicing_list ITEM, ITEM
@@ -870,9 +805,9 @@ is an error, returns the error, otherwise returns false.
 =cut
 
 sub check_invoicing_list {
-  my($self, @addresses) = @_;
+  my( $self, @addresses ) = @_;
   foreach my $address ( @addresses ) {
-    my $cust_main_invoice = create FS::cust_main_invoice (
+    my $cust_main_invoice = new FS::cust_main_invoice (
       'custnum' => $self->custnum,
       'dest'    => $address,
     );
@@ -884,19 +819,26 @@ sub check_invoicing_list {
 
 =back
 
-=head1 BUGS
+=head1 VERSION
 
-The delete method.
+$Id: cust_main.pm,v 1.8 1998-12-29 11:59:39 ivan Exp $
 
-It doesn't properly override FS::Record yet.
+=head1 BUGS
 
-hfields should be removed.
+The delete method.
 
 Bill and collect options should probably be passed as references instead of a
 list.
 
 CyberCash v2 forces us to define some variables in package main.
 
+There should probably be a configuration file with a list of allowed credit
+card types.
+
+CyberCash is the only processor.
+
+No multiple currency support (probably a larger project than just this module).
+
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::cust_pkg>, L<FS::cust_bill>, L<FS::cust_credit>
@@ -935,7 +877,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.7  1998-12-16 09:58:52  ivan
+Revision 1.8  1998-12-29 11:59:39  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+Revision 1.7  1998/12/16 09:58:52  ivan
 library support for editing email invoice destinations (not in sub collect yet)
 
 Revision 1.6  1998/11/18 09:01:42  ivan
diff --git a/site_perl/cust_main_county.pm b/site_perl/cust_main_county.pm
index 9c81406ae..1ecaed1ec 100644
--- a/site_perl/cust_main_county.pm
+++ b/site_perl/cust_main_county.pm
@@ -1,12 +1,10 @@
 package FS::cust_main_county;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK);
-use Exporter;
-use FS::Record qw(fields hfields qsearch qsearchs);
+use vars qw( @ISA );
+use FS::Record;
 
-@ISA = qw(FS::Record Exporter);
-@EXPORT_OK = qw(hfields);
+@ISA = qw( FS::Record );
 
 =head1 NAME
 
@@ -16,8 +14,8 @@ FS::cust_main_county - Object methods for cust_main_county objects
 
   use FS::cust_main_county;
 
-  $record = create FS::cust_main_county \%hash;
-  $record = create FS::cust_main_county { 'column' => 'value' };
+  $record = new FS::cust_main_county \%hash;
+  $record = new FS::cust_main_county { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -51,68 +49,29 @@ currently supported:
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new tax rate.  To add the tax rate to the database, see L<"insert">.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('cust_main_county')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('cust_main_county',$hashref);
-}
+sub table { 'cust_main_county'; }
 
 =item insert
 
 Adds this tax rate to the database.  If there is an error, returns the error,
 otherwise returns false.
 
-=cut
-
-sub insert {
-  my($self)=@_;
-
-  $self->check or
-  $self->add;
-}
-
 =item delete
 
 Deletes this tax rate from the database.  If there is an error, returns the
 error, otherwise returns false.
 
-=cut
-
-sub delete {
-  my($self)=@_;
-
-  $self->del;
-}
-
 =item replace OLD_RECORD
 
 Replaces the OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
-=cut
-
-sub replace {
-  my($new,$old)=@_;
-  return "(Old) Not a cust_main_county record!"
-    unless $old->table eq "cust_main_county";
-  return "Can't change taxnum!"
-    unless $old->getfield('taxnum') eq $new->getfield('taxnum');
-  $new->check or
-  $new->rep($old);
-}
-
 =item check
 
 Checks all fields to make sure this is a valid tax rate.  If there is an error,
@@ -122,15 +81,12 @@ methods.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a cust_main_county record!"
-    unless $self->table eq "cust_main_county";
-  my($recref) = $self->hashref;
+  my $self = shift;
 
   $self->ut_numbern('taxnum')
-    or $self->ut_textn('state')
-    or $self->ut_textn('county')
-    or $self->ut_float('tax')
+    || $self->ut_textn('state')
+    || $self->ut_textn('county')
+    || $self->ut_float('tax')
   ;
 
 }
@@ -139,12 +95,10 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_main_county.pm,v 1.2 1998-11-18 09:01:43 ivan Exp $
+$Id: cust_main_county.pm,v 1.3 1998-12-29 11:59:41 ivan Exp $
 
 =head1 BUGS
 
-It doesn't properly override FS::Record yet.
-
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::cust_main>, L<FS::cust_bill>, schema.html from the base
@@ -160,7 +114,10 @@ Changed check for 'tax' to use the new ut_float subroutine
 pod ivan@sisd.com 98-sep-21
 
 $Log: cust_main_county.pm,v $
-Revision 1.2  1998-11-18 09:01:43  ivan
+Revision 1.3  1998-12-29 11:59:41  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+Revision 1.2  1998/11/18 09:01:43  ivan
 i18n! i18n!
 
 
diff --git a/site_perl/cust_main_invoice.pm b/site_perl/cust_main_invoice.pm
index 90d653a4a..9c1a86a12 100644
--- a/site_perl/cust_main_invoice.pm
+++ b/site_perl/cust_main_invoice.pm
@@ -3,10 +3,12 @@ package FS::cust_main_invoice;
 use strict;
 use vars qw(@ISA $conf $mydomain);
 use Exporter;
-use FS::Record; # qw(qsearch qsearchs);
+use FS::Record qw( qsearchs );
 use FS::Conf;
+use FS::cust_main;
+use FS::svc_acct;
 
-@ISA = qw(FS::Record);
+@ISA = qw( FS::Record );
 
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::cust_main_invoice'} = sub { 
@@ -22,8 +24,8 @@ FS::cust_main_invoice - Object methods for cust_main_invoice records
 
   use FS::cust_main_invoice;
 
-  $record = create FS::cust_main_invoice \%hash;
-  $record = create FS::cust_main_invoice { 'column' => 'value' };
+  $record = new FS::cust_main_invoice \%hash;
+  $record = new FS::cust_main_invoice { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -54,7 +56,7 @@ FS::Record.  The following fields are currently supported:
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new invoice destination.  To add the invoice destination to the database, see L<"insert">.
 
@@ -63,45 +65,17 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  $proto->new('cust_main_invoice',$hashref);
-
-}
+sub table { 'cust_main_invoice'; }
 
 =item insert
 
 Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
 
-=cut
-
-sub insert {
-  my($self)=@_;
-
-  #local $SIG{HUP} = 'IGNORE';
-  #local $SIG{INT} = 'IGNORE';
-  #local $SIG{QUIT} = 'IGNORE';
-  #local $SIG{TERM} = 'IGNORE';
-  #local $SIG{TSTP} = 'IGNORE';
-
-  $self->check or
-  $self->add;
-}
-
 =item delete
 
 Delete this record from the database.
 
-=cut
-
-sub delete {
-  my($self)=@_;
-
-  $self->del;
-}
-
 =item replace OLD_RECORD
 
 Replaces the OLD_RECORD with this one in the database.  If there is an error,
@@ -110,16 +84,11 @@ returns the error, otherwise returns false.
 =cut
 
 sub replace {
-  my($new,$old)=@_;
-  return "(Old) Not a cust_main_invoice record!" unless $old->table eq "cust_main_invoice";
+  my ( $new, $old ) = ( shift, shift );
 
-  return "Can't change destnum!"
-     unless $old->getfield('destnum') eq $new->getfield('destnum');
-  return "Can't change custnum!"
-     unless $old->getfield('custnum') eq $new->getfield('custnum');
+  return "Can't change custnum!" unless $old->custnum eq $new->custnum;
 
-  $new->check or
-  $new->rep($old);
+  $new->SUPER::replace;
 }
 
 
@@ -132,8 +101,7 @@ and repalce methods.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a cust_main_invoice record!" unless $self->table eq "cust_main_invoice";
+  my $self = shift;
 
   my $error = $self->ut_number('destnum')
         or $self->ut_number('custnum')
@@ -148,11 +116,11 @@ sub check {
     #contemplate our navel
   } elsif ( $self->dest =~ /^(\d+)$/ ) {
     return "Unknown local account (specified by svcnum)"
-      unless qsearchs('svc_acct', { 'svcnum' => $self->dest } );
+      unless qsearchs( 'svc_acct', { 'svcnum' => $self->dest } );
   } elsif ( $self->dest =~ /^([\w\.\-]+)\@(([\w\.\-]\.)+\w+)$/ ) {
     my($user, $domain) = ($1, $2);
     if ( $domain eq $mydomain ) {
-      my $svc_acct = qsearchs('svc_acct', { 'username' => $user } );
+      my $svc_acct = qsearchs( 'svc_acct', { 'username' => $user } );
       return "Unknown local account (specified literally)" unless $svc_acct;
       $svc_acct->svcnum =~ /^(\d+)$/ or die "Non-numeric svcnum?!";
       $self->dest($1);
@@ -173,7 +141,7 @@ Returns the literal email address for this record (or `POST').
 sub address {
   my $self = shift;
   if ( $self->dest =~ /(\d+)$/ ) {
-    my $svc_acct = qsearchs('svc_acct', { 'svcnum' => $1 } );
+    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $1 } );
     $svc_acct->username . '@' . $mydomain;
   } else {
     $self->dest;
@@ -184,7 +152,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.2 1998-12-16 09:58:53 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.3 1998-12-29 11:59:42 ivan Exp $
 
 =head1 BUGS
 
@@ -200,7 +168,10 @@ added hfields
 ivan@sisd.com 97-nov-13
 
 $Log: cust_main_invoice.pm,v $
-Revision 1.2  1998-12-16 09:58:53  ivan
+Revision 1.3  1998-12-29 11:59:42  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+Revision 1.2  1998/12/16 09:58:53  ivan
 library support for editing email invoice destinations (not in sub collect yet)
 
 Revision 1.1  1998/12/16 07:40:02  ivan
diff --git a/site_perl/cust_pay.pm b/site_perl/cust_pay.pm
index 6e30c595b..fc9112b00 100644
--- a/site_perl/cust_pay.pm
+++ b/site_perl/cust_pay.pm
@@ -1,14 +1,12 @@
 package FS::cust_pay;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK);
-use Exporter;
+use vars qw( @ISA );
 use Business::CreditCard;
-use FS::Record qw(fields qsearchs);
+use FS::Record qw( qsearchs );
 use FS::cust_bill;
 
-@ISA = qw(FS::Record Exporter);
-@EXPORT_OK = qw(fields);
+@ISA = qw( FS::Record );
 
 =head1 NAME
 
@@ -18,8 +16,8 @@ FS::cust_pay - Object methods for cust_pay objects
 
   use FS::cust_pay;
 
-  $record = create FS::cust_pay \%hash;
-  $record = create FS::cust_pay { 'column' => 'value' };
+  $record = new FS::cust_pay \%hash;
+  $record = new FS::cust_pay { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -57,24 +55,13 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =over 4 
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new payment.  To add the payment to the databse, see L<"insert">.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('cust_pay')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('cust_pay',$hashref);
-
-}
+sub table { 'cust_pay'; }
 
 =item insert
 
@@ -84,20 +71,18 @@ L<FS::cust_bill>).
 =cut
 
 sub insert {
-  my($self)=@_;
+  my $self = shift;
 
-  my($error);
+  my $error;
 
-  $error=$self->check;
+  $error = $self->check;
   return $error if $error;
 
-  my($old_cust_bill) = qsearchs('cust_bill', {
-                                'invnum' => $self->getfield('invnum')
-                               } );
+  my $old_cust_bill = qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
   return "Unknown invnum" unless $old_cust_bill;
-  my(%hash)=$old_cust_bill->hash;
-  $hash{owed} = sprintf("%.2f",$hash{owed} - $self->getfield('paid') );
-  my($new_cust_bill) = create FS::cust_bill ( \%hash );
+  my %hash = $old_cust_bill->hash;
+  $hash{'owed'} = sprintf("%.2f", $hash{owed} - $self->paid );
+  my $new_cust_bill = new FS::cust_bill ( \%hash );
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -105,10 +90,10 @@ sub insert {
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
 
-  $error=$new_cust_bill -> replace($old_cust_bill);
+  $error = $new_cust_bill->replace($old_cust_bill);
   return "Error modifying cust_bill: $error" if $error;
 
-  $self->add;
+  $self->SUPER::insert;
 }
 
 =item delete
@@ -119,10 +104,6 @@ Currently unimplemented (accounting reasons).
 
 sub delete {
   return "Can't (yet?) delete cust_pay records!";
-#template code below
-#  my($self)=@_;
-#
-#  $self->del;
 }
 
 =item replace OLD_RECORD
@@ -133,12 +114,6 @@ Currently unimplemented (accounting reasons).
 
 sub replace {
    return "Can't (yet?) modify cust_pay records!";
-#template code below
-#  my($new,$old)=@_;
-#  return "(Old) Not a cust_pay record!" unless $old->table eq "cust_pay";
-#
-#  $new->check or
-#  $new->rep($old);
 }
 
 =item check
@@ -149,61 +124,43 @@ returns the error, otherwise returns false.  Called by the insert method.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a cust_pay record!" unless $self->table eq "cust_pay";
-  my($recref) = $self->hashref;
-
-  $recref->{paynum} =~ /^(\d*)$/ or return "Illegal paynum";
-  $recref->{paynum} = $1;
+  my $self = shift;
 
-  $recref->{invnum} =~ /^(\d+)$/ or return "Illegal invnum";
-  $recref->{invnum} = $1;
+  my $error;
 
-  $recref->{paid} =~ /^(\d+(\.\d\d)?)$/ or return "Illegal paid";
-  $recref->{paid} = $1;
-
-  $recref->{_date} =~ /^(\d*)$/ or return "Illegal date";
-  $recref->{_date} = $recref->{_date} ? $1 : time;
+  $error =
+    $self->ut_numbern('paynum')
+    || $self->ut_number('invnum')
+    || $self->ut_money('paid')
+    || $self->ut_numbern('_date')
+  ;
+  return $error if $error;
 
-  $recref->{payby} =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
-  $recref->{payby} = $1;
+  $self->_date(time) unless $self->_date;
 
-  if ( $recref->{payby} eq 'CARD' ) {
+  $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
+  $self->payby($1);
 
-    $recref->{payinfo} =~ s/\D//g;
-    if ( $recref->{payinfo} ) {
-      $recref->{payinfo} =~ /^(\d{13,16})$/
+  if ( $self->payby eq 'CARD' ) {
+    my $payinfo = $self->payinfo;
+    $self->payinfo($payinfo =~ s/\D//g);
+    if ( $self->payinfo ) {
+      $self->payinfo =~ /^(\d{13,16})$/
         or return "Illegal (mistyped?) credit card number (payinfo)";
-      $recref->{payinfo} = $1;
-      #validate($recref->{payinfo})
-      #  or return "Illegal credit card number";
-      my($type)=cardtype($recref->{payinfo});
-      return "Unknown credit card type"
-        unless ( $type =~ /^VISA/ ||
-                 $type =~ /^MasterCard/ ||
-                 $type =~ /^American Express/ ||
-                 $type =~ /^Discover/ );
+      $self->payinfo($1);
+      validate($self->payinfo) or return "Illegal credit card number";
+      return "Unknown card type" if cardtype($self->payinfo) eq "Unknown";
     } else {
-      $recref->{payinfo}='N/A';
+      $self->payinfo('N/A');
     }
 
-  } elsif ( $recref->{payby} eq 'BILL' ) {
-
-    $recref->{payinfo} =~ /^([\w \-]*)$/
-      or return "Illegal P.O. number (payinfo)";
-    $recref->{payinfo} = $1;
-
-  } elsif ( $recref->{payby} eq 'COMP' ) {
-
-    $recref->{payinfo} =~ /^([\w]{2,8})$/
-      or return "Illegal comp account issuer (payinfo)";
-    $recref->{payinfo} = $1;
-
+  } else {
+    $error = $self->ut_textn('payinfo');
+    return $error if $error;
   }
 
-  $recref->{paybatch} =~ /^([\w\-\:]*)$/
-    or return "Illegal paybatch";
-  $recref->{paybatch} = $1;
+  $error = $self->ut_textn('paybatch');
+  return $error if $error;
 
   ''; #no error
 
@@ -211,9 +168,11 @@ sub check {
 
 =back
 
-=head1 BUGS
+=head1 VERSION
 
-It doesn't properly override FS::Record yet.
+$Id: cust_pay.pm,v 1.2 1998-12-29 11:59:43 ivan Exp $
+
+=head1 BUGS
 
 Delete and replace methods.
 
@@ -229,6 +188,11 @@ new api ivan@sisd.com 98-mar-13
 
 pod ivan@sisd.com 98-sep-21
 
+$Log: cust_pay.pm,v $
+Revision 1.2  1998-12-29 11:59:43  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+
 =cut
 
 1;
diff --git a/site_perl/cust_pay_batch.pm b/site_perl/cust_pay_batch.pm
index f40a04970..f7350c116 100644
--- a/site_perl/cust_pay_batch.pm
+++ b/site_perl/cust_pay_batch.pm
@@ -1,24 +1,22 @@
 package FS::cust_pay_batch;
 
 use strict;
-use vars qw (@ISA);
-use Exporter;
-#use FS::UID qw(getotaker);
-use FS::Record qw(hfields qsearch qsearchs);
+use vars qw( @ISA );
+use FS::Record;
 use Business::CreditCard;
 
-@ISA = qw(FS::Record);
+@ISA = qw( FS::Record );
 
 =head1 NAME
 
-FS::cust_pay_batdh - Object methods for batch cards
+FS::cust_pay_batch - Object methods for batch cards
 
 =head1 SYNOPSIS
 
   use FS::cust_pay_batch;
 
-  $record = create FS::cust_pay_batch \%hash;
-  $record = create FS::cust_pay_batch { 'column' => 'value' };
+  $record = new FS::cust_pay_batch \%hash;
+  $record = new FS::cust_pay_batch { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -73,7 +71,7 @@ following fields are currently supported:
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new record.  To add the record to the database, see L<"insert">.
 
@@ -82,48 +80,17 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  $proto->new('cust_pay_batch',$hashref);
-
-}
+sub table { 'cust_pay_batch'; }
 
 =item insert
 
 Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
 
-=cut
-
-sub insert {
-  my($self)=@_;
-
-  #local $SIG{HUP} = 'IGNORE';
-  #local $SIG{INT} = 'IGNORE';
-  #local $SIG{QUIT} = 'IGNORE';
-  #local $SIG{TERM} = 'IGNORE';
-  #local $SIG{TSTP} = 'IGNORE';
-
-  $self->check or
-  $self->add;
-}
-
 =item delete
 
-#inactive
-#
-#Delete this record from the database.
-
-=cut
-
-sub delete {
-  my($self)=@_;
-
-  #$self->del;
-
-  return "Can't (yet?) delete batched transactions!";
-}
+Delete this record from the database.  If there is an error, returns the error,
+otherwise returns false.
 
 =item replace OLD_RECORD
 
@@ -135,40 +102,30 @@ sub delete {
 =cut
 
 sub replace {
-  my($new,$old)=@_;
-  #return "(Old) Not a table_name record!" unless $old->table eq "table_name";
-  #
-  #return "Can't change keyfield!"
-  #   unless $old->getfield('keyfield') eq $new->getfield('keyfield');
-  #
-  #$new->check or
-  #$new->rep($old);
-
   return "Can't (yet?) replace batched transactions!";
 }
 
 =item check
 
-Checks all fields to make sure this is a valid example.  If there is
+Checks all fields to make sure this is a valid transaction.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
 and repalce methods.
 
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a cust_pay_batch record!" unless $self->table eq "cust_pay_batch";
+  my $self = shift;
 
   my $error = 
       $self->ut_numbern('trancode')
-    or $self->ut_number('cardnum') 
-    or $self->ut_money('amount')
-    or $self->ut_number('invnum')
-    or $self->ut_number('custnum')
-    or $self->ut_text('address1')
-    or $self->ut_textn('address2')
-    or $self->ut_text('city')
-    or $self->ut_text('state')
+    || $self->ut_number('cardnum') 
+    || $self->ut_money('amount')
+    || $self->ut_number('invnum')
+    || $self->ut_number('custnum')
+    || $self->ut_text('address1')
+    || $self->ut_textn('address2')
+    || $self->ut_text('city')
+    || $self->ut_text('state')
   ;
 
   return $error if $error;
@@ -186,12 +143,7 @@ sub check {
   $cardnum = $1;
   $self->cardnum($cardnum);
   validate($cardnum) or return "Illegal credit card number";
-  my $type = cardtype($cardnum);
-  return "Unknown credit card type"
-    unless ( $type =~ /^VISA/ ||
-             $type =~ /^MasterCard/ ||
-             $type =~ /^American Express/ ||
-             $type =~ /^Discover/ );
+  return "Unknown card type" if cardtype($self->payinfo) eq "Unknown";
 
   if ( $self->exp eq '' ) {
     return "Expriation date required";
@@ -231,10 +183,13 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_pay_batch.pm,v 1.2 1998-11-18 09:01:44 ivan Exp $
+$Id: cust_pay_batch.pm,v 1.3 1998-12-29 11:59:44 ivan Exp $
 
 =head1 BUGS
 
+There should probably be a configuration file with a list of allowed credit
+card types.
+
 =head1 SEE ALSO
 
 L<FS::cust_main>, L<FS::Record>
@@ -247,7 +202,10 @@ added hfields
 ivan@sisd.com 97-nov-13
 
 $Log: cust_pay_batch.pm,v $
-Revision 1.2  1998-11-18 09:01:44  ivan
+Revision 1.3  1998-12-29 11:59:44  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+Revision 1.2  1998/11/18 09:01:44  ivan
 i18n! i18n!
 
 Revision 1.1  1998/11/15 05:19:58  ivan
diff --git a/site_perl/cust_pkg.pm b/site_perl/cust_pkg.pm
index 5640e24b6..66193510e 100644
--- a/site_perl/cust_pkg.pm
+++ b/site_perl/cust_pkg.pm
@@ -2,14 +2,20 @@ package FS::cust_pkg;
 
 use strict;
 use vars qw(@ISA);
-use Exporter;
-use FS::UID qw(getotaker);
-use FS::Record qw(fields qsearch qsearchs);
+use FS::UID qw( getotaker );
+use FS::Record qw( qsearch qsearchs );
 use FS::cust_svc;
 use FS::part_pkg;
 use FS::cust_main;
 
-@ISA = qw(FS::Record Exporter);
+# need to 'use' these instead of 'require' in sub { cancel, suspend, unsuspend,
+# setup }
+# because they load configuraion by setting FS::UID::callback (see TODO)
+use FS::svc_acct;
+use FS::svc_acct_sm;
+use FS::svc_domain;
+
+@ISA = qw( FS::Record );
 
 =head1 NAME
 
@@ -19,8 +25,8 @@ FS::cust_pkg - Object methods for cust_pkg objects
 
   use FS::cust_pkg;
 
-  $record = create FS::cust_pkg \%hash;
-  $record = create FS::cust_pkg { 'column' => 'value' };
+  $record = new FS::cust_pkg \%hash;
+  $record = new FS::cust_pkg { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -76,44 +82,27 @@ conversion functions.
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Create a new billing item.  To add the item to the database, see L<"insert">.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('cust_pkg')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('cust_pkg',$hashref);
-}
+sub table { 'cust_pkg'; }
 
 =item insert
 
 Adds this billing item to the database ("Orders" the item).  If there is an
 error, returns the error, otherwise returns false.
 
-=cut
-
-sub insert {
-  my($self)=@_;
-
-  $self->check or
-  $self->add;
-}
-
 =item delete
 
 Currently unimplemented.  You don't want to delete billing items, because there
 would then be no record the customer ever purchased the item.  Instead, see
 the cancel method.
 
+=cut
+
 sub delete {
   return "Can't delete cust_pkg records!";
 }
@@ -138,21 +127,16 @@ in some cases).
 =cut
 
 sub replace {
-  my($new,$old)=@_;
-  return "(Old) Not a cust_pkg record!" if $old->table ne "cust_pkg";
-  return "Can't change pkgnum!"
-    if $old->getfield('pkgnum') ne $new->getfield('pkgnum');
-  #return "Can't (yet?) change pkgpart!"
-  #  if $old->getfield('pkgpart') ne $new->getfield('pkgpart');
-  return "Can't change otaker!"
-    if $old->getfield('otaker') ne $new->getfield('otaker');
+  my( $new, $old ) = ( shift, shift );
+
+  #return "Can't (yet?) change pkgpart!" if $old->pkgpart ne $new->pkgpart;
+  return "Can't change otaker!" if $old->otaker ne $new->otaker;
   return "Can't change setup once it exists!"
     if $old->getfield('setup') &&
        $old->getfield('setup') != $new->getfield('setup');
   #some logic for bill, susp, cancel?
 
-  $new->check or
-  $new->rep($old);
+  $new->SUPER::replace($old);
 }
 
 =item check
@@ -164,38 +148,28 @@ replace methods.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a cust_pkg record!" if $self->table ne "cust_pkg";
-  my($recref) = $self->hashref;
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('pkgnum')
+    || $self->ut_number('custnum')
+    || $self->ut_number('pkgpart')
+    || $self->ut_numbern('setup')
+    || $self->ut_numbern('bill')
+    || $self->ut_numbern('susp')
+    || $self->ut_numbern('cancel')
+  ;
+  return $error if $error;
 
-  $recref->{pkgnum} =~ /^(\d*)$/ or return "Illegal pkgnum";
-  $recref->{pkgnum}=$1;
-
-  $recref->{custnum} =~ /^(\d+)$/ or return "Illegal custnum";
-  $recref->{custnum}=$1;
   return "Unknown customer"
-    unless qsearchs('cust_main',{'custnum'=>$recref->{custnum}});
+    unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
 
-  $recref->{pkgpart} =~ /^(\d+)$/ or return "Illegal pkgpart";
-  $recref->{pkgpart}=$1;
   return "Unknown pkgpart"
-    unless qsearchs('part_pkg',{'pkgpart'=>$recref->{pkgpart}});
-
-  $recref->{otaker} ||= &getotaker;
-  $recref->{otaker} =~ /^(\w{0,8})$/ or return "Illegal otaker";
-  $recref->{otaker}=$1;
-
-  $recref->{setup} =~ /^(\d*)$/ or return "Illegal setup date";
-  $recref->{setup}=$1;
+    unless qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
 
-  $recref->{bill} =~ /^(\d*)$/ or return "Illegal bill date";
-  $recref->{bill}=$1;
-
-  $recref->{susp} =~ /^(\d*)$/ or return "Illegal susp date";
-  $recref->{susp}=$1;
-
-  $recref->{cancel} =~ /^(\d*)$/ or return "Illegal cancel date";
-  $recref->{cancel}=$1;
+  $self->otaker(getotaker) unless $self->otaker;
+  $self->otaker =~ /^(\w{0,16})$/ or return "Illegal otaker";
+  $self->otaker($1);
 
   ''; #no error
 }
@@ -211,8 +185,8 @@ If there is an error, returns the error, otherwise returns false.
 =cut
 
 sub cancel {
-  my($self)=@_;
-  my($error);
+  my $self = shift;
+  my $error;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -220,38 +194,34 @@ sub cancel {
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
 
-  my($cust_svc);
-  foreach $cust_svc (
-    qsearch('cust_svc',{'pkgnum'=> $self->pkgnum } )
+  foreach my $cust_svc (
+    qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum } )
   ) {
-    my($part_svc)=
-      qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+    my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $cust_svc->svcpart } );
 
-    $part_svc->getfield('svcdb') =~ /^([\w\-]+)$/
+    $part_svc->svcdb =~ /^([\w\-]+)$/
       or return "Illegal svcdb value in part_svc!";
-    my($svcdb) = $1;
+    my $svcdb = $1;
     require "FS/$svcdb.pm";
 
-    my($svc) = qsearchs($svcdb,{'svcnum' => $cust_svc->svcnum } );
+    my $svc = qsearchs( $svcdb, { 'svcnum' => $cust_svc->svcnum } );
     if ($svc) {
-      bless($svc,"FS::$svcdb");
       $error = $svc->cancel;
       return "Error cancelling service: $error" if $error;
       $error = $svc->delete;
       return "Error deleting service: $error" if $error;
     }
 
-    bless($cust_svc,"FS::cust_svc");
     $error = $cust_svc->delete;
     return "Error deleting cust_svc: $error" if $error;
 
   }
 
   unless ( $self->getfield('cancel') ) {
-    my(%hash) = $self->hash;
-    $hash{'cancel'}=$^T;
-    my($new) = create FS::cust_pkg ( \%hash );
-    $error=$new->replace($self);
+    my %hash = $self->hash;
+    $hash{'cancel'} = $^T;
+    my $new = new FS::cust_pkg ( \%hash );
+    $error = $new->replace($self);
     return $error if $error;
   }
 
@@ -268,30 +238,27 @@ If there is an error, returns the error, otherwise returns false.
 =cut
 
 sub suspend {
-  my($self)=@_;
-  my($error);
+  my $self = shift;
+  my $error ;
+
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE'; 
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
 
-  my($cust_svc);
-  foreach $cust_svc (
-    qsearch('cust_svc',{'pkgnum'=> $self->getfield('pkgnum') } )
+  foreach my $cust_svc (
+    qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum } )
   ) {
-    my($part_svc)=
-      qsearchs('part_svc',{'svcpart'=> $cust_svc->getfield('svcpart') } );
+    my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $cust_svc->svcpart } );
 
-    $part_svc->getfield('svcdb') =~ /^([\w\-]+)$/
+    $part_svc->svcdb =~ /^([\w\-]+)$/
       or return "Illegal svcdb value in part_svc!";
-    my($svcdb) = $1;
+    my $svcdb = $1;
     require "FS/$svcdb.pm";
 
-    my($svc) = qsearchs($svcdb,{'svcnum' => $cust_svc->getfield('svcnum') } );
-
+    my $svc = qsearchs( $svcdb, { 'svcnum' => $cust_svc->svcnum } );
     if ($svc) {
-      bless($svc,"FS::$svcdb");
       $error = $svc->suspend;
       return $error if $error;
     }
@@ -299,10 +266,10 @@ sub suspend {
   }
 
   unless ( $self->getfield('susp') ) {
-    my(%hash) = $self->hash;
-    $hash{'susp'}=$^T;
-    my($new) = create FS::cust_pkg ( \%hash );
-    $error=$new->replace($self);
+    my %hash = $self->hash;
+    $hash{'susp'} = $^T;
+    my $new = new FS::cust_pkg ( \%hash );
+    $error = $new->replace($self);
     return $error if $error;
   }
 
@@ -319,7 +286,7 @@ If there is an error, returns the error, otherwise returns false.
 =cut
 
 sub unsuspend {
-  my($self)=@_;
+  my $self = shift;
   my($error);
 
   local $SIG{HUP} = 'IGNORE';
@@ -328,21 +295,18 @@ sub unsuspend {
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
 
-  my($cust_svc);
-  foreach $cust_svc (
-    qsearch('cust_svc',{'pkgnum'=> $self->getfield('pkgnum') } )
+  foreach my $cust_svc (
+    qsearch('cust_svc',{'pkgnum'=> $self->pkgnum } )
   ) {
-    my($part_svc)=
-      qsearchs('part_svc',{'svcpart'=> $cust_svc->getfield('svcpart') } );
+    my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $cust_svc->svcpart } );
 
-    $part_svc->getfield('svcdb') =~ /^([\w\-]+)$/
+    $part_svc->svcdb =~ /^([\w\-]+)$/
       or return "Illegal svcdb value in part_svc!";
-    my($svcdb) = $1;
+    my $svcdb = $1;
     require "FS/$svcdb.pm";
 
-    my($svc) = qsearchs($svcdb,{'svcnum' => $cust_svc->getfield('svcnum') } );
+    my $svc = qsearchs( $svcdb, { 'svcnum' => $cust_svc->svcnum } );
     if ($svc) {
-      bless($svc,"FS::$svcdb");
       $error = $svc->unsuspend;
       return $error if $error;
     }
@@ -350,10 +314,10 @@ sub unsuspend {
   }
 
   unless ( ! $self->getfield('susp') ) {
-    my(%hash) = $self->hash;
-    $hash{'susp'}='';
-    my($new) = create FS::cust_pkg ( \%hash );
-    $error=$new->replace($self);
+    my %hash = $self->hash;
+    $hash{'susp'} = '';
+    my $new = new FS::cust_pkg ( \%hash );
+    $error = $new->replace($self);
     return $error if $error;
   }
 
@@ -368,8 +332,8 @@ L<FS::part_pkg).
 =cut
 
 sub part_pkg {
-  my($self)=@_;
-  qsearchs('part_pkg', { 'pkgpart' => $self->pkgpart });
+  my $self = shift;
+  qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
 }
 
 =back
@@ -495,12 +459,10 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.3 1998-11-15 13:01:35 ivan Exp $
+$Id: cust_pkg.pm,v 1.4 1998-12-29 11:59:45 ivan Exp $
 
 =head1 BUGS
 
-It doesn't properly override FS::Record yet.
-
 sub order is not OO.  Perhaps it should be moved to FS::cust_main and made so?
 
 In sub order, the @pkgparts array (passed by reference) is clobbered.
@@ -508,6 +470,12 @@ In sub order, the @pkgparts array (passed by reference) is clobbered.
 Also in sub order, no money is adjusted.  Once FS::part_pkg defines a standard
 method to pass dates to the recur_prog expression, it should do so.
 
+FS::svc_acct, FS::svc_acct_sm, and FS::svc_domain are loaded via 'use' at 
+compile time, rather than via 'require' in sub { setup, suspend, unsuspend,
+cancel } because they use %FS::UID::callback to load configuration values.
+Probably need a subroutine which decides what to do based on whether or not
+we've fetched the user yet, rather than a hash.  See FS::UID and the TODO.
+
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::cust_main>, L<FS::part_pkg>, L<FS::cust_svc>
@@ -522,7 +490,10 @@ fixed for new agent->agent_type->type_pkgs in &order ivan@sisd.com 98-mar-7
 pod ivan@sisd.com 98-sep-21
 
 $Log: cust_pkg.pm,v $
-Revision 1.3  1998-11-15 13:01:35  ivan
+Revision 1.4  1998-12-29 11:59:45  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+Revision 1.3  1998/11/15 13:01:35  ivan
 allow pkgpart changing (for per-customer custom pricing).  warn about it in doc
 
 Revision 1.2  1998/11/12 03:42:45  ivan
diff --git a/site_perl/cust_refund.pm b/site_perl/cust_refund.pm
index a30f21716..0778473a9 100644
--- a/site_perl/cust_refund.pm
+++ b/site_perl/cust_refund.pm
@@ -1,15 +1,13 @@
 package FS::cust_refund;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK);
-use Exporter;
+use vars qw( @ISA );
 use Business::CreditCard;
-use FS::Record qw(fields qsearchs);
+use FS::Record qw( qsearchs );
 use FS::UID qw(getotaker);
 use FS::cust_credit;
 
-@ISA = qw(FS::Record Exporter);
-@EXPORT_OK = qw(fields);
+@ISA = qw( FS::Record );
 
 =head1 NAME
 
@@ -19,8 +17,8 @@ FS::cust_refund - Object method for cust_refund objects
 
   use FS::cust_refund;
 
-  $record = create FS::cust_refund \%hash;
-  $record = create FS::cust_refund { 'column' => 'value' };
+  $record = new FS::cust_refund \%hash;
+  $record = new FS::cust_refund { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -58,24 +56,13 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new refund.  To add the refund to the database, see L<"insert">.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('cust_refund')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('cust_refund',$hashref);
-
-}
+sub table { 'cust_refund'; }
 
 =item insert
 
@@ -85,20 +72,19 @@ L<FS::cust_credit>).
 =cut
 
 sub insert {
-  my($self)=@_;
+  my $self = shift;
 
-  my($error);
+  my $error;
 
   $error=$self->check;
   return $error if $error;
 
-  my($old_cust_credit) = qsearchs('cust_credit', {
-                                'crednum' => $self->getfield('crednum')
-                               } );
+  my $old_cust_credit =
+    qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
   return "Unknown crednum" unless $old_cust_credit;
-  my(%hash)=$old_cust_credit->hash;
-  $hash{credited} = sprintf("%.2f",$hash{credited} - $self->getfield('refund') );
-  my($new_cust_credit) = create FS::cust_credit ( \%hash );
+  my %hash = $old_cust_credit->hash;
+  $hash{credited} = sprintf("%.2f", $hash{credited} - $self->refund );
+  my($new_cust_credit) = new FS::cust_credit ( \%hash );
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -106,10 +92,10 @@ sub insert {
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
 
-  $error=$new_cust_credit -> replace($old_cust_credit);
+  $error = $new_cust_credit->replace($old_cust_credit);
   return "Error modifying cust_credit: $error" if $error;
 
-  $self->add;
+  $self->SUPER::insert;
 }
 
 =item delete
@@ -120,10 +106,6 @@ Currently unimplemented (accounting reasons).
 
 sub delete {
   return "Can't (yet?) delete cust_refund records!";
-#template code below
-#  my($self)=@_;
-#
-#  $self->del;
 }
 
 =item replace OLD_RECORD
@@ -134,12 +116,6 @@ Currently unimplemented (accounting reasons).
 
 sub replace {
    return "Can't (yet?) modify cust_refund records!";
-#template code below
-#  my($new,$old)=@_;
-#  return "(Old) Not a cust_refund record!" unless $old->table eq "cust_refund";
-#
-#  $new->check or
-#  $new->rep($old);
 }
 
 =item check
@@ -150,10 +126,11 @@ returns the error, otherwise returns false.  Called by the insert method.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a cust_refund record!" unless $self->table eq "cust_refund";
+  my $self = shift;
 
-  my $error =
+  my $error;
+
+  $error =
     $self->ut_number('refundnum')
     || $self->ut_number('crednum')
     || $self->ut_money('amount')
@@ -161,44 +138,27 @@ sub check {
   ;
   return $error if $error;
 
-  my($recref) = $self->hashref;
-
-  $recref->{_date} ||= time;
+  $self->_date(time) unless $self->_date;
 
-  $recref->{payby} =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
-  $recref->{payby} = $1;
+  $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
+  $self->payby($1);
 
-  if ( $recref->{payby} eq 'CARD' ) {
-
-    $recref->{payinfo} =~ s/\D//g;
-    if ( $recref->{payinfo} ) {
-      $recref->{payinfo} =~ /^(\d{13,16})$/
+  if ( $self->payby eq 'CARD' ) {
+    my $payinfo = $self->payinfo;
+    $self->payinfo($payinfo =~ s/\D//g);
+    if ( $self->payinfo ) {
+      $self->payinfo =~ /^(\d{13,16})$/
         or return "Illegal (mistyped?) credit card number (payinfo)";
-      $recref->{payinfo} = $1;
-      #validate($recref->{payinfo})
-      #  or return "Illegal (checksum) credit card number (payinfo)";
-      my($type)=cardtype($recref->{payinfo});
-      return "Unknown credit card type"
-        unless ( $type =~ /^VISA/ ||
-                 $type =~ /^MasterCard/ ||
-                 $type =~ /^American Express/ ||
-                 $type =~ /^Discover/ );
+      $self->payinfo($1);
+      validate($self->payinfo) or return "Illegal credit card number";
+      return "Unknown card type" if cardtype($self->payinfo) eq "Unknown";
     } else {
-      $recref->{payinfo}='N/A';
+      $self->payinfo('N/A');
     }
 
-  } elsif ( $recref->{payby} eq 'BILL' ) {
-
-    $recref->{payinfo} =~ /^([\w \-]*)$/
-      or return "Illegal P.O. number (payinfo)";
-    $recref->{payinfo} = $1;
-
-  } elsif ( $recref->{payby} eq 'COMP' ) {
-
-    $recref->{payinfo} =~ /^([\w]{2,8})$/
-      or return "Illegal comp account issuer (payinfo)";
-    $recref->{payinfo} = $1;
-
+  } else {
+    $error = $self->ut_textn('payinfo');
+    return $error if $error;
   }
 
   $self->otaker(getotaker);
@@ -208,9 +168,11 @@ sub check {
 
 =back
 
-=head1 BUGS
+=head1 VERSION
 
-It doesn't properly override FS::Record yet.
+$Id: cust_refund.pm,v 1.2 1998-12-29 11:59:46 ivan Exp $
+
+=head1 BUGS
 
 Delete and replace methods.
 
@@ -227,6 +189,11 @@ ivan@sisd.com 98-mar-18
 
 pod and finish up ivan@sisd.com 98-sep-21
 
+$Log: cust_refund.pm,v $
+Revision 1.2  1998-12-29 11:59:46  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+
 =cut
 
 1;
diff --git a/site_perl/cust_svc.pm b/site_perl/cust_svc.pm
index ef93f86da..f97f5fe9d 100644
--- a/site_perl/cust_svc.pm
+++ b/site_perl/cust_svc.pm
@@ -1,10 +1,9 @@
 package FS::cust_svc;
 
 use strict;
-use vars qw(@ISA);
-use Carp;
-use Exporter;
-use FS::Record qw(fields qsearchs);
+use vars qw( @ISA );
+use Carp qw( cluck );
+use FS::Record qw( qsearchs );
 use FS::cust_pkg;
 use FS::part_pkg;
 use FS::part_svc;
@@ -12,7 +11,7 @@ use FS::svc_acct;
 use FS::svc_acct_sm;
 use FS::svc_domain;
 
-@ISA = qw(FS::Record Exporter);
+@ISA = qw( FS::Record );
 
 =head1 NAME
 
@@ -22,8 +21,8 @@ FS::cust_svc - Object method for cust_svc objects
 
   use FS::cust_svc;
 
-  $record = create FS::cust_svc \%hash
-  $record = create FS::cust_svc { 'column' => 'value' };
+  $record = new FS::cust_svc \%hash
+  $record = new FS::cust_svc { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -54,7 +53,7 @@ The following fields are currently supported:
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new service.  To add the refund to the database, see L<"insert">.
 Services are normally created by creating FS::svc_ objects (see
@@ -62,32 +61,13 @@ L<FS::svc_acct>, L<FS::svc_domain>, and L<FS::svc_acct_sm>, among others).
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_; 
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('cust_svc')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('cust_svc',$hashref);
-}
+sub table { 'cust_svc'; }
 
 =item insert
 
 Adds this service to the database.  If there is an error, returns the error,
 otherwise returns false.
 
-=cut
-
-sub insert {
-  my($self)=@_;
-
-  $self->check or
-  $self->add;
-}
-
 =item delete
 
 Deletes this service from the database.  If there is an error, returns the
@@ -95,30 +75,11 @@ error, otherwise returns false.
 
 Called by the cancel method of the package (see L<FS::cust_pkg>).
 
-=cut
-
-sub delete {
-  my($self)=@_;
-  # anything else here?
-  $self->del;
-}
-
 =item replace OLD_RECORD
 
 Replaces the OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
-=cut
-
-sub replace {
-  my($new,$old)=@_;
-  return "(Old) Not a cust_svc record!" unless $old->table eq "cust_svc";
-  return "Can't change svcnum!"
-    unless $old->getfield('svcnum') eq $new->getfield('svcnum');
-  $new->check or
-  $new->rep($old);
-}
-
 =item check
 
 Checks all fields to make sure this is a valid service.  If there is an error,
@@ -128,23 +89,21 @@ replace methods.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a cust_svc record!" unless $self->table eq "cust_svc";
-  my($recref) = $self->hashref;
+  my $self = shift;
 
-  $recref->{svcnum} =~ /^(\d*)$/ or return "Illegal svcnum";
-  $recref->{svcnum}=$1;
+  my $error =
+    $self->ut_numbern('svcnum')
+    || $self->ut_numbern('pkgnum')
+    || $self->ut_number('svcpart')
+  ;
+  return $error if $error;
 
-  $recref->{pkgnum} =~ /^(\d*)$/ or return "Illegal pkgnum";
-  $recref->{pkgnum}=$1;
-  return "Unknown pkgnum" unless
-    ! $recref->{pkgnum} ||
-    qsearchs('cust_pkg',{'pkgnum'=>$recref->{pkgnum}});
+  return "Unknown pkgnum"
+    unless ! $self->pkgnum
+      || qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
 
-  $recref->{svcpart} =~ /^(\d+)$/ or return "Illegal svcpart";
-  $recref->{svcpart}=$1;
   return "Unknown svcpart" unless
-    qsearchs('part_svc',{'svcpart'=>$recref->{svcpart}});
+    qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
 
   ''; #no error
 }
@@ -159,12 +118,12 @@ Returns a list consisting of:
 =cut
 
 sub label {
-  my($self)=@_;
-  my($part_svc) = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
-  my($svcdb) = $part_svc->svcdb;
-  my($svc_x) = qsearchs( $svcdb, { 'svcnum' => $self->svcnum } );
-  my($svc) = $part_svc->svc;
-  my($tag);
+  my $self = shift;
+  my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
+  my $svcdb = $part_svc->svcdb;
+  my $svc_x = qsearchs( $svcdb, { 'svcnum' => $self->svcnum } );
+  my $svc = $part_svc->svc;
+  my $tag;
   if ( $svcdb eq 'svc_acct' ) {
     $tag = $svc_x->getfield('username');
   } elsif ( $svcdb eq 'svc_acct_sm' ) {
@@ -173,9 +132,9 @@ sub label {
     my $domain = $svc_domain->domain;
     $tag = "$domuser\@$domain";
   } elsif ( $svcdb eq 'svc_domain' ) {
-    return $svc, $svc_x->getfield('domain');
+    $tag = $svc_x->getfield('domain');
   } else {
-    carp "warning: asked for label of unsupported svcdb; using svcnum";
+    cluck "warning: asked for label of unsupported svcdb; using svcnum";
     $tag = $svc_x->getfield('svcnum');
   }
   $svc, $tag, $svcdb;
@@ -183,6 +142,10 @@ sub label {
 
 =back
 
+=head1 VERSION
+
+$Id: cust_svc.pm,v 1.5 1998-12-29 11:59:47 ivan Exp $
+
 =head1 BUGS
 
 Behaviour of changing the svcpart of cust_svc records is undefined and should
@@ -190,6 +153,9 @@ possibly be prohibited, and pkg_svc records are not checked.
 
 pkg_svc records are not checked in general (here).
 
+Deleting this record doesn't check or delete the svc_* record associated
+with this record.
+
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::cust_pkg>, L<FS::part_svc>, L<FS::pkg_svc>, 
@@ -204,7 +170,10 @@ no TableUtil, no FS::Lock ivan@sisd.com 98-mar-7
 pod ivan@sisd.com 98-sep-21
 
 $Log: cust_svc.pm,v $
-Revision 1.4  1998-11-12 07:58:15  ivan
+Revision 1.5  1998-12-29 11:59:47  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+Revision 1.4  1998/11/12 07:58:15  ivan
 added svcdb to label
 
 Revision 1.3  1998/11/12 03:45:38  ivan
diff --git a/site_perl/part_pkg.pm b/site_perl/part_pkg.pm
index 4643b9f15..82c7aec28 100644
--- a/site_perl/part_pkg.pm
+++ b/site_perl/part_pkg.pm
@@ -1,12 +1,10 @@
 package FS::part_pkg;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK);
-use Exporter;
-use FS::Record qw(fields hfields);
+use vars qw( @ISA );
+use FS::Record;
 
-@ISA = qw(FS::Record Exporter);
-@EXPORT_OK = qw(hfields fields);
+@ISA = qw( FS::Record );
 
 =head1 NAME
 
@@ -16,8 +14,8 @@ FS::part_pkg - Object methods for part_pkg objects
 
   use FS::part_pkg;
 
-  $record = create FS::part_pkg \%hash
-  $record = create FS::part_pkg { 'column' => 'value' };
+  $record = new FS::part_pkg \%hash
+  $record = new FS::part_pkg { 'column' => 'value' };
 
   $custom_record = $template_record->clone;
 
@@ -57,40 +55,33 @@ just as you would normally.  More advanced semantics are not yet defined.
 
 =over 4 
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new billing item definition.  To add the billing item definition to
 the database, see L<"insert">.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('part_pkg')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('part_pkg',$hashref);
-}
+sub table { 'part_pkg'; }
 
 =item clone
 
-Creates a new billing item definition by duplicating an existing definition.
-A new pkgpart is assigned and "(CUSTOM) " is prepended to the comment field.
-To add the billing item definition to the database, see L<"insert">.
+An alternate constructor.  Creates a new billing item definition by duplicating
+an existing definition.  A new pkgpart is assigned and `(CUSTOM) ' is prepended
+to the comment field.  To add the billing item definition to the database, see
+L<"insert">.
 
 =cut
 
 sub clone {
   my $self = shift;
+  my $class = ref($self);
   my %hash = $self->hash;
   $hash{'pkgpart'} = '';
   $hash{'comment'} = "(CUSTOM) ". $hash{'comment'}
     unless $hash{'comment'} =~ /^\(CUSTOM\) /;
-  create FS::part_pkg ( \%hash ); # ?
+  #new FS::part_pkg ( \%hash ); # ?
+  new $class ( \%hash ); # ?
 }
 
 =item insert
@@ -98,15 +89,6 @@ sub clone {
 Adds this billing item definition to the database.  If there is an error,
 returns the error, otherwise returns false.
 
-=cut
-
-sub insert {
-  my($self)=@_;
-
-  $self->check or
-  $self->add;
-}
-
 =item delete
 
 Currently unimplemented.
@@ -115,10 +97,7 @@ Currently unimplemented.
 
 sub delete {
   return "Can't (yet?) delete package definitions.";
-# maybe check & make sure the pkgpart isn't in cust_pkg or type_pkgs?
-#  my($self)=@_;
-#
-#  $self->del;
+# check & make sure the pkgpart isn't in cust_pkg or type_pkgs?
 }
 
 =item replace OLD_RECORD
@@ -126,17 +105,6 @@ sub delete {
 Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
-=cut
-
-sub replace {
-  my($new,$old)=@_;
-  return "(Old) Not a part_pkg record!" unless $old->table eq "part_pkg";
-  return "Can't change pkgpart!"
-    unless $old->getfield('pkgpart') eq $new->getfield('pkgpart');
-  $new->check or
-  $new->rep($old);
-}
-
 =item check
 
 Checks all fields to make sure this is a valid billing item definition.  If
@@ -146,29 +114,25 @@ insert and replace methods.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a part_pkg record!" unless $self->table eq "part_pkg";
+  my $self = shift;
 
   $self->ut_numbern('pkgpart')
-    or $self->ut_text('pkg')
-    or $self->ut_text('comment')
-    or $self->ut_anything('setup')
-    or $self->ut_number('freq')
-    or $self->ut_anything('recur')
+    || $self->ut_text('pkg')
+    || $self->ut_text('comment')
+    || $self->ut_anything('setup')
+    || $self->ut_number('freq')
+    || $self->ut_anything('recur')
   ;
-
 }
 
 =back
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.3 1998-11-15 13:00:15 ivan Exp $
+$Id: part_pkg.pm,v 1.4 1998-12-29 11:59:48 ivan Exp $
 
 =head1 BUGS
 
-It doesn't properly override FS::Record yet.
-
 The delete method is unimplemented.
 
 setup and recur semantics are not yet defined (and are implemented in
@@ -186,7 +150,10 @@ ivan@sisd.com 97-dec-5
 pod ivan@sisd.com 98-sep-21
 
 $Log: part_pkg.pm,v $
-Revision 1.3  1998-11-15 13:00:15  ivan
+Revision 1.4  1998-12-29 11:59:48  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+Revision 1.3  1998/11/15 13:00:15  ivan
 bugfix in clone method, clone method doc clarification
 
 
diff --git a/site_perl/part_referral.pm b/site_perl/part_referral.pm
index 1b4a1b65a..e63e822a8 100644
--- a/site_perl/part_referral.pm
+++ b/site_perl/part_referral.pm
@@ -1,12 +1,10 @@
 package FS::part_referral;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK);
-use Exporter;
-use FS::Record qw(fields qsearchs);
+use vars qw( @ISA );
+use FS::Record;
 
-@ISA = qw(FS::Record Exporter);
-@EXPORT_OK = qw(fields);
+@ISA = qw( FS::Record );
 
 =head1 NAME
 
@@ -16,8 +14,8 @@ FS::part_referral - Object methods for part_referral objects
 
   use FS::part_referral;
 
-  $record = create FS::part_referral \%hash
-  $record = create FS::part_referral { 'column' => 'value' };
+  $record = new FS::part_referral \%hash
+  $record = new FS::part_referral { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -46,38 +44,19 @@ following fields are currently supported:
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new referral.  To add the referral to the database, see L<"insert">.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('part_referral')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('part_referral',$hashref);
-}
+sub table { 'part_referral'; }
 
 =item insert
 
 Adds this referral to the database.  If there is an error, returns the error,
 otherwise returns false.
 
-=cut
-
-sub insert {
-  my($self)=@_;
-
-  $self->check or
-  $self->add;
-}
-
 =item delete
 
 Currently unimplemented.
@@ -85,9 +64,9 @@ Currently unimplemented.
 =cut
 
 sub delete {
-  my($self)=@_;
+  my $self = shift;
   return "Can't (yet?) delete part_referral records";
-  #$self->del;
+  #need to make sure no customers have this referral!
 }
 
 =item replace OLD_RECORD
@@ -95,18 +74,6 @@ sub delete {
 Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
-=cut
-
-sub replace {
-  my($new,$old)=@_;
-  return "(Old) Not an part_referral record!" 
-    unless $old->table eq "part_referral";
-  return "Can't change refnum!"
-    unless $old->getfield('refnum') eq $new->getfield('refnum');
-  $new->check or
-  $new->rep($old);
-}
-
 =item check
 
 Checks all fields to make sure this is a valid referral.  If there is an error,
@@ -116,24 +83,20 @@ methods.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a part_referral record!" unless $self->table eq "part_referral";
+  my $self = shift;
 
-  my($error)=
-    $self->ut_numbern('refnum')
-      or $self->ut_text('referral')
+  $self->ut_numbern('refnum')
+    || $self->ut_text('referral')
   ;
-  return $error if $error;
-
-  '';
-
 }
 
 =back
 
-=head1 BUGS
+=head1 VERSION
 
-It doesn't properly override FS::Record yet.
+$Id: part_referral.pm,v 1.2 1998-12-29 11:59:49 ivan Exp $
+
+=head1 BUGS
 
 The delete method is unimplemented.
 
@@ -149,6 +112,11 @@ ivan@sisd.com 98-feb-23
 
 pod ivan@sisd.com 98-sep-21
 
+$Log: part_referral.pm,v $
+Revision 1.2  1998-12-29 11:59:49  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+
 =cut
 
 1;
diff --git a/site_perl/part_svc.pm b/site_perl/part_svc.pm
index 0fd8ee47d..fa3462350 100644
--- a/site_perl/part_svc.pm
+++ b/site_perl/part_svc.pm
@@ -1,12 +1,10 @@
 package FS::part_svc;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK);
-use Exporter;
-use FS::Record qw(fields hfields);
+use vars qw( @ISA );
+use FS::Record qw( fields );
 
-@ISA = qw(FS::Record Exporter);
-@EXPORT_OK = qw(hfields fields);
+@ISA = qw(FS::Record);
 
 =head1 NAME
 
@@ -16,8 +14,8 @@ FS::part_svc - Object methods for part_svc objects
 
   use FS::part_svc;
 
-  $record = create FS::part_referral \%hash
-  $record = create FS::part_referral { 'column' => 'value' };
+  $record = new FS::part_referral \%hash
+  $record = new FS::part_referral { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -51,39 +49,20 @@ L<FS::svc_domain>, and L<FS::svc_acct_sm>, among others.
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new service definition.  To add the service definition to the
 database, see L<"insert">.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('part_svc')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('part_svc',$hashref);
-}
+sub table { 'part_svc'; }
 
 =item insert
 
 Adds this service definition to the database.  If there is an error, returns
 the error, otherwise returns false.
 
-=cut
-
-sub insert {
-  my($self)=@_;
-
-  $self->check or
-  $self->add;
-}
-
 =item delete
 
 Currently unimplemented.
@@ -92,10 +71,7 @@ Currently unimplemented.
 
 sub delete {
   return "Can't (yet?) delete service definitions.";
-# maybe check & make sure the svcpart isn't in cust_svc or (in any packages)?
-#  my($self)=@_;
-#
-#  $self->del;
+# check & make sure the svcpart isn't in cust_svc or pkg_svc (in any packages)?
 }
 
 =item replace OLD_RECORD
@@ -106,14 +82,12 @@ returns the error, otherwise returns false.
 =cut
 
 sub replace {
-  my($new,$old)=@_;
-  return "(Old) Not a part_svc record!" unless $old->table eq "part_svc";
-  return "Can't change svcpart!"
-    unless $old->getfield('svcpart') eq $new->getfield('svcpart');
+  my ( $new, $old ) = shift, shift;
+
   return "Can't change svcdb!"
-    unless $old->getfield('svcdb') eq $new->getfield('svcdb');
-  $new->check or
-  $new->rep($old);
+    unless $old->svcdb eq $new->svcdb;
+
+  $new->SUPER::replace( $old );
 }
 
 =item check
@@ -125,30 +99,29 @@ and replace methods.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a part_svc record!" unless $self->table eq "part_svc";
-  my($recref) = $self->hashref;
+  my $self = shift;
+  my $recref = $self->hashref;
 
-  my($error);
-  return $error if $error=
+  my $error;
+  $error=
     $self->ut_numbern('svcpart')
     || $self->ut_text('svc')
     || $self->ut_alpha('svcdb')
   ;
+  return $error if $error;
 
-  my(@fields) = eval { fields($recref->{svcdb}) }; #might die
+  my @fields = eval { fields( $recref->{svcdb} ) }; #might die
   return "Unknown svcdb!" unless @fields;
 
-  my($svcdb);
+  my $svcdb;
   foreach $svcdb ( qw(
-    svc_acct svc_acct_sm svc_charge svc_domain svc_wo
+    svc_acct svc_acct_sm svc_domain
   ) ) {
-    my(@rows)=map { /^${svcdb}__(.*)$/; $1 }
+    my @rows = map { /^${svcdb}__(.*)$/; $1 }
       grep ! /_flag$/,
         grep /^${svcdb}__/,
           fields('part_svc');
-    my($row);
-    foreach $row (@rows) {
+    foreach my $row (@rows) {
       unless ( $svcdb eq $recref->{svcdb} ) {
         $recref->{$svcdb.'__'.$row}='';
         $recref->{$svcdb.'__'.$row.'_flag'}='';
@@ -158,11 +131,8 @@ sub check {
         or return "Illegal flag for $svcdb $row";
       $recref->{$svcdb.'__'.$row.'_flag'} = $1;
 
-#      $recref->{$svcdb.'__'.$row} =~ /^(.*)$/ #not restrictive enough?
-#        or return "Illegal value for $svcdb $row";
-#      $recref->{$svcdb.'__'.$row} = $1;
-      my($error);
-      return $error if $error=$self->ut_anything($svcdb.'__'.$row);
+      my $error = $self->ut_anything($svcdb.'__'.$row);
+      return $error if $error;
 
     }
   }
@@ -172,12 +142,17 @@ sub check {
 
 =back
 
-=head1 BUGS
+=head1 VERSION
+
+$Id: part_svc.pm,v 1.2 1998-12-29 11:59:50 ivan Exp $
 
-It doesn't properly override FS::Record yet.
+=head1 BUGS
 
 Delete is unimplemented.
 
+The list of svc_* tables is hardcoded.  When svc_acct_pop is renamed, this
+should be fixed.
+
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::part_pkg>, L<FS::pkg_svc>, L<FS::cust_svc>,
@@ -193,6 +168,11 @@ ivan@sisd.com 97-dec-6
 
 pod ivan@sisd.com 98-sep-21
 
+$Log: part_svc.pm,v $
+Revision 1.2  1998-12-29 11:59:50  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+
 =cut
 
 1;
diff --git a/site_perl/pkg_svc.pm b/site_perl/pkg_svc.pm
index 517125c01..9db0a12da 100644
--- a/site_perl/pkg_svc.pm
+++ b/site_perl/pkg_svc.pm
@@ -1,12 +1,10 @@
 package FS::pkg_svc;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK);
-use Exporter;
-use FS::Record qw(fields hfields qsearchs);
+use vars qw( @ISA );
+use FS::Record qw( qsearchs );
 
-@ISA = qw(FS::Record Exporter);
-@EXPORT_OK = qw(hfields);
+@ISA = qw( FS::Record );
 
 =head1 NAME
 
@@ -16,8 +14,8 @@ FS::pkg_svc - Object methods for pkg_svc records
 
   use FS::pkg_svc;
 
-  $record = create FS::pkg_svc \%hash;
-  $record = create FS::pkg_svc { 'column' => 'value' };
+  $record = new FS::pkg_svc \%hash;
+  $record = new FS::pkg_svc { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -48,52 +46,24 @@ definition includes
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Create a new record.  To add the record to the database, see L<"insert">.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('pkg_svc')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('pkg_svc',$hashref);
-
-}
+sub table { 'pkg_svc'; }
 
 =item insert
 
 Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
 
-=cut
-
-sub insert {
-  my($self)=@_;
-
-  $self->check or
-  $self->add;
-}
-
 =item delete
 
 Deletes this record from the database.  If there is an error, returns the
 error, otherwise returns false.
 
-=cut
-
-sub delete {
-  my($self)=@_;
-
-  $self->del;
-}
-
 =item replace OLD_RECORD
 
 Replaces OLD_RECORD with this one in the database.  If there is an error,
@@ -102,15 +72,12 @@ returns the error, otherwise returns false.
 =cut
 
 sub replace {
-  my($new,$old)=@_;
-  return "(Old) Not a pkg_svc record!" unless $old->table eq "pkg_svc";
-  return "Can't change pkgpart!"
-    if $old->getfield('pkgpart') ne $new->getfield('pkgpart');
-  return "Can't change svcpart!"
-    if $old->getfield('svcpart') ne $new->getfield('svcpart');
-
-  $new->check or
-  $new->rep($old);
+  my ( $new, $old ) = ( shift, shift );
+
+  return "Can't change pkgpart!" if $old->pkgpart ne $new->pkgpart;
+  return "Can't change svcpart!" if $old->svcpart ne $new->svcpart;
+
+  $new->SUPER::replace($old);
 }
 
 =item check
@@ -122,31 +89,32 @@ methods.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a pkg_svc record!" unless $self->table eq "pkg_svc";
-  my($recref) = $self->hashref;
+  my $self = shift;
 
-  my($error);
-  return $error if $error =
+  my $error;
+  $error =
     $self->ut_number('pkgpart')
     || $self->ut_number('svcpart')
     || $self->ut_number('quantity')
   ;
+  return $error if $error;
 
   return "Unknown pkgpart!"
-    unless qsearchs('part_pkg',{'pkgpart'=> $self->getfield('pkgpart')});
+    unless qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
 
   return "Unknown svcpart!"
-    unless qsearchs('part_svc',{'svcpart'=> $self->getfield('svcpart')});
+    unless qsearchs('part_svc', { 'svcpart' => $self->svcpart } );
 
   ''; #no error
 }
 
 =back
 
-=head1 BUGS
+=head1 VERSION
+
+$Id: pkg_svc.pm,v 1.2 1998-12-29 11:59:51 ivan Exp $
 
-It doesn't properly override FS::Record yet.
+=head1 BUGS
 
 =head1 SEE ALSO
 
@@ -162,6 +130,11 @@ ivan@sisd.com 97-nov-13
 
 pod ivan@sisd.com 98-sep-22
 
+$Log: pkg_svc.pm,v $
+Revision 1.2  1998-12-29 11:59:51  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+
 =cut
 
 1;
diff --git a/site_perl/svc_acct.pm b/site_perl/svc_acct.pm
index fdc9f0bc1..1d3085969 100644
--- a/site_perl/svc_acct.pm
+++ b/site_perl/svc_acct.pm
@@ -1,16 +1,14 @@
 package FS::svc_acct;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK $nossh_hack $conf $dir_prefix @shells
+use vars qw(@ISA $nossh_hack $conf $dir_prefix @shells
             $shellmachine @saltset @pw_set);
-use Exporter;
 use FS::Conf;
-use FS::Record qw(fields qsearchs);
+use FS::Record qw( qsearchs fields );
 use FS::SSH qw(ssh);
 use FS::cust_svc;
 
-@ISA = qw(FS::Record Exporter);
-@EXPORT_OK = qw(fields);
+@ISA = qw( FS::Record );
 
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::svc_acct'} = sub { 
@@ -33,8 +31,8 @@ FS::svc_acct - Object methods for svc_acct records
 
   use FS::svc_acct;
 
-  $record = create FS::svc_acct \%hash;
-  $record = create FS::svc_acct { 'column' => 'value' };
+  $record = new FS::svc_acct \%hash;
+  $record = new FS::svc_acct { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -87,24 +85,13 @@ FS::Record.  The following fields are currently supported:
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new account.  To add the account to the database, see L<"insert">.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('svc_acct')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('svc_acct',$hashref);
-
-}
+sub table { 'svc_acct'; }
 
 =item insert
 
@@ -125,8 +112,8 @@ setting $FS::svc_acct::nossh_hack true.
 =cut
 
 sub insert {
-  my($self)=@_;
-  my($error);
+  my $self = shift;
+  my $error;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -134,41 +121,40 @@ sub insert {
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
 
-  $error=$self->check;
+  $error = $self->check;
   return $error if $error;
 
   return "Username ". $self->username. " in use"
-    if qsearchs('svc_acct',{'username'=> $self->username } );
+    if qsearchs( 'svc_acct', { 'username' => $self->username } );
 
-  my($part_svc) = qsearchs('part_svc',{ 'svcpart' => $self->svcpart });
+  my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
   return "Unkonwn svcpart" unless $part_svc;
   return "uid in use"
     if $part_svc->svc_acct__uid_flag ne 'F'
-      && qsearchs('svc_acct',{'uid'=> $self->uid } )
+      && qsearchs( 'svc_acct', { 'uid' => $self->uid } )
       && $self->username !~ /^(hyla)?fax$/
     ;
 
-  my($svcnum)=$self->svcnum;
-  my($cust_svc);
+  my $svcnum = $self->svcnum;
+  my $cust_svc;
   unless ( $svcnum ) {
-    $cust_svc=create FS::cust_svc ( {
+    $cust_svc = new FS::cust_svc ( {
       'svcnum'  => $svcnum,
       'pkgnum'  => $self->pkgnum,
       'svcpart' => $self->svcpart,
     } );
-    my($error) = $cust_svc->insert;
+    my $error = $cust_svc->insert;
     return $error if $error;
     $svcnum = $self->svcnum($cust_svc->svcnum);
   }
 
-  $error = $self->add;
+  $error = $self->SUPER::insert;
   if ($error) {
-    #$cust_svc->del if $cust_svc;
     $cust_svc->delete if $cust_svc;
     return $error;
   }
 
-  my($username,$uid,$dir,$shell) = (
+  my ( $username, $uid, $dir, $shell ) = (
     $self->username,
     $self->uid,
     $self->dir,
@@ -210,8 +196,8 @@ setting $FS::svc_acct::nossh_hack true.
 =cut
 
 sub delete {
-  my($self)=@_;
-  my($error);
+  my $self = shift;
+  my $error;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -219,16 +205,16 @@ sub delete {
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
 
-  my($svcnum)=$self->getfield('svcnum');
+  my $svcnum = $self->getfield('svcnum');
 
-  $error = $self->del;
+  $error = $self->SUPER::delete;
   return $error if $error;
 
-  my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});  
-  $error = $cust_svc->del;
+  my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );  
+  $error = $cust_svc->delete;
   return $error if $error;
 
-  my($username) = $self->getfield('username');
+  my $username = $self->username;
   if ( $username && $shellmachine && ! $nossh_hack ) {
     ssh("root\@$shellmachine","userdel $username");
   }
@@ -261,27 +247,17 @@ setting $FS::svc_acct::nossh_hack true.
 =cut
 
 sub replace {
-  my($new,$old)=@_;
-  my($error);
-
-  return "(Old) Not a svc_acct record!" unless $old->table eq "svc_acct";
-  return "Can't change svcnum!"
-    unless $old->getfield('svcnum') eq $new->getfield('svcnum');
+  my ( $new, $old ) = @_;
+  my $error;
 
   return "Username in use"
-    if $old->getfield('username') ne $new->getfield('username') &&
-      qsearchs('svc_acct',{'username'=> $new->getfield('username') } );
+    if $old->username ne $new->username &&
+      qsearchs( 'svc_acct', { 'username' => $new->username } );
 
-  return "Can't change uid!"
-    if $old->getfield('uid') ne $new->getfield('uid');
+  return "Can't change uid!" if $old->uid ne $new->uid;
 
   #change homdir when we change username
-  if ( $old->getfield('username') ne $new->getfield('username') ) {
-    $new->setfield('dir','');
-  }
-
-  $error=$new->check;
-  return $error if $error;
+  $new->setfield('dir', '') if $old->username ne $new->username;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -289,11 +265,11 @@ sub replace {
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
 
-  $error = $new->rep($old);
+  $error = $new->SUPER::replace($old);
   return $error if $error;
 
-  my($old_dir,$new_dir)=( $old->getfield('dir'),$new->getfield('dir') );
-  my($uid,$gid)=( $new->getfield('uid'), $new->getfield('gid') );
+  my ( $old_dir, $new_dir ) = ( $old->getfield('dir'), $new->getfield('dir') );
+  my ( $uid, $gid) = ( $new->getfield('uid'), $new->getfield('gid') );
   if ( $old_dir
        && $new_dir
        && $old_dir ne $new_dir
@@ -322,17 +298,15 @@ Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
 =cut
 
 sub suspend {
-  my($old) = @_;
-  my(%hash) = $old->hash;
+  my $self = shift;
+  my %hash = $self->hash;
   unless ( $hash{_password} =~ /^\*SUSPENDED\* / ) {
     $hash{_password} = '*SUSPENDED* '.$hash{_password};
-    my($new) = create FS::svc_acct ( \%hash );
-#    $new->replace($old);
-    $new->rep($old); #to avoid password checking :)
+    my $new = new FS::svc_acct ( \%hash );
+    $new->replace($self);
   } else {
     ''; #no error (already suspended)
   }
-
 }
 
 =item unsuspend
@@ -345,13 +319,12 @@ Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
 =cut
 
 sub unsuspend {
-  my($old) = @_;
-  my(%hash) = $old->hash;
+  my $self = shift;
+  my %hash = $self->hash;
   if ( $hash{_password} =~ /^\*SUSPENDED\* (.*)$/ ) {
     $hash{_password} = $1;
-    my($new) = create FS::svc_acct ( \%hash );
-#    $new->replace($old);
-    $new->rep($old); #to avoid password checking :)
+    my $new = new FS::svc_acct ( \%hash );
+    $new->replace($self);
   } else {
     ''; #no error (already unsuspended)
   }
@@ -365,7 +338,6 @@ Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
 
 =cut
 
-# Usage: $error = $record -> cancel;
 sub cancel {
   ''; #stub (no error) - taken care of in delete
 }
@@ -381,8 +353,8 @@ Sets any fixed values; see L<FS::part_svc>.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a svc_acct record!" unless $self->table eq "svc_acct";
+  my $self = shift;
+
   my($recref) = $self->hashref;
 
   $recref->{svcnum} =~ /^(\d*)$/ or return "Illegal svcnum";
@@ -514,15 +486,21 @@ sub check {
 
 =back
 
-=head1 BUGS
+=head1 VERSION
+
+$Id: svc_acct.pm,v 1.3 1998-12-29 11:59:52 ivan Exp $
 
-It doesn't properly override FS::Record yet.
+=head1 BUGS
 
 The remote commands should be configurable.
 
-The create method should set defaults from part_svc (like the check method
+The new method should set defaults from part_svc (like the check method
 sets fixed values).
 
+The bits which ssh should fork before doing so.
+
+The $recref stuff in sub check should be cleaned up.
+
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
@@ -555,7 +533,10 @@ arbitrary radius attributes ivan@sisd.com 98-aug-13
 pod and FS::conf ivan@sisd.com 98-sep-22
 
 $Log: svc_acct.pm,v $
-Revision 1.2  1998-11-13 09:56:55  ivan
+Revision 1.3  1998-12-29 11:59:52  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+Revision 1.2  1998/11/13 09:56:55  ivan
 change configuration file layout to support multiple distinct databases (with
 own set of config files, export, etc.)
 
diff --git a/site_perl/svc_acct_pop.pm b/site_perl/svc_acct_pop.pm
index a6f801f22..fe2b5f3ac 100644
--- a/site_perl/svc_acct_pop.pm
+++ b/site_perl/svc_acct_pop.pm
@@ -1,12 +1,10 @@
 package FS::svc_acct_pop;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK);
-use Exporter;
-use FS::Record qw(fields qsearchs);
+use vars qw( @ISA );
+use FS::Record qw( qsearchs );
 
-@ISA = qw(FS::Record Exporter);
-@EXPORT_OK = qw(fields);
+@ISA = qw( FS::Record );
 
 =head1 NAME
 
@@ -16,8 +14,8 @@ FS::svc_acct_pop - Object methods for svc_acct_pop records
 
   use FS::svc_acct_pop;
 
-  $record = create FS::svc_acct_pop \%hash;
-  $record = create FS::svc_acct_pop { 'column' => 'value' };
+  $record = new FS::svc_acct_pop \%hash;
+  $record = new FS::svc_acct_pop { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -50,68 +48,29 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new point of presence (if only it were that easy!).  To add the 
 point of presence to the database, see L<"insert">.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('svc_acct_pop')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('svc_acct_pop',$hashref);
-}
+sub table { 'svc_acct_pop'; }
 
 =item insert
 
-Adds this point of presence to the databaes.  If there is an error, returns the
+Adds this point of presence to the database.  If there is an error, returns the
 error, otherwise returns false.
 
-=cut
-
-sub insert {
-  my($self)=@_;
-
-  $self->check or
-  $self->add;
-}
-
 =item delete
 
-Currently unimplemented.
-
-=cut
-
-sub delete {
-  my($self)=@_;
-  return "Can't (yet) delete POPs!";
-  #$self->del;
-}
+Removes this point of presence from the database.
 
 =item replace OLD_RECORD
 
 Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
-=cut
-
-sub replace {
-  my($new,$old)=@_;
-  return "(Old) Not an svc_acct_pop record!"
-    unless $old->table eq "svc_acct_pop";
-  return "Can't change popnum!"
-    unless $old->getfield('popnum') eq $new->getfield('popnum');
-  $new->check or
-  $new->rep($old);
-}
-
 =item check
 
 Checks all fields to make sure this is a valid point of presence.  If there is
@@ -121,27 +80,24 @@ and replace methods.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a svc_acct_pop record!" unless $self->table eq "svc_acct_pop";
+  my $self = shift;
 
-  my($error)=
     $self->ut_numbern('popnum')
       or $self->ut_text('city')
       or $self->ut_text('state')
       or $self->ut_number('ac')
       or $self->ut_number('exch')
   ;
-  return $error if $error;
-
-  '';
 
 }
 
 =back
 
-=head1 BUGS
+=head1 VERSION
+
+$Id: svc_acct_pop.pm,v 1.2 1998-12-29 11:59:53 ivan Exp $
 
-It doesn't properly override FS::Record yet.
+=head1 BUGS
 
 It should be renamed to part_pop.
 
@@ -157,6 +113,11 @@ ivan@sisd.com 98-mar-8
 
 pod ivan@sisd.com 98-sep-23
 
+$Log: svc_acct_pop.pm,v $
+Revision 1.2  1998-12-29 11:59:53  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+
 =cut
 
 1;
diff --git a/site_perl/svc_acct_sm.pm b/site_perl/svc_acct_sm.pm
index 4293e0365..f1c049263 100644
--- a/site_perl/svc_acct_sm.pm
+++ b/site_perl/svc_acct_sm.pm
@@ -1,15 +1,13 @@
 package FS::svc_acct_sm;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK $nossh_hack $conf $shellmachine @qmailmachines);
-use Exporter;
-use FS::Record qw(fields qsearch qsearchs);
+use vars qw( @ISA $nossh_hack $conf $shellmachine @qmailmachines );
+use FS::Record qw( fields qsearch qsearchs );
 use FS::cust_svc;
 use FS::SSH qw(ssh);
 use FS::Conf;
 
-@ISA = qw(FS::Record Exporter);
-@EXPORT_OK = qw(fields);
+@ISA = qw( FS::Record );
 
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::svc_acct_sm'} = sub { 
@@ -27,8 +25,8 @@ FS::svc_acct_sm - Object methods for svc_acct_sm records
 
   use FS::svc_acct_sm;
 
-  $record = create FS::svc_acct_sm \%hash;
-  $record = create FS::svc_acct_sm { 'column' => 'value' };
+  $record = new FS::svc_acct_sm \%hash;
+  $record = new FS::svc_acct_sm { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -65,25 +63,14 @@ from FS::Record.  The following fields are currently supported:
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new virtual mail alias.  To add the virtual mail alias to the
 database, see L<"insert">.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('svc_acct_sm')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('svc_acct_sm',$hashref);
-
-}
+sub table { 'svc_acct_sm'; }
 
 =item insert
 
@@ -320,9 +307,11 @@ sub check {
 
 =back
 
-=head1 BUGS
+=head1 VERSION
+
+$Id: svc_acct_sm.pm,v 1.3 1998-12-29 11:59:54 ivan Exp $
 
-It doesn't properly override FS::Record yet.
+=head1 BUGS
 
 The remote commands should be configurable.
 
diff --git a/site_perl/svc_domain.pm b/site_perl/svc_domain.pm
index 69b225eb5..c7e1e70bd 100644
--- a/site_perl/svc_domain.pm
+++ b/site_perl/svc_domain.pm
@@ -1,10 +1,9 @@
 package FS::svc_domain;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK $whois_hack $conf $mydomain $smtpmachine
+use vars qw( @ISA $whois_hack $conf $mydomain $smtpmachine
   $tech_contact $from $to @nameservers @nameserver_ips @template
 );
-use Exporter;
 use Carp;
 use Mail::Internet;
 use Mail::Header;
@@ -14,7 +13,6 @@ use FS::cust_svc;
 use FS::Conf;
 
 @ISA = qw(FS::Record Exporter);
-@EXPORT_OK = qw(fields);
 
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::domain'} = sub { 
@@ -50,8 +48,8 @@ FS::svc_domain - Object methods for svc_domain records
 
   use FS::svc_domain;
 
-  $record = create FS::svc_domain \%hash;
-  $record = create FS::svc_domain { 'column' => 'value' };
+  $record = new FS::svc_domain \%hash;
+  $record = new FS::svc_domain { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -84,24 +82,13 @@ FS::Record.  The following fields are currently supported:
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new domain.  To add the domain to the database, see L<"insert">.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('svc_domain')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('svc_domain',$hashref);
-
-}
+sub table { 'svc_domain'; }
 
 =item insert
 
@@ -125,8 +112,8 @@ in the same package, it is automatically used.  Otherwise an error is returned.
 =cut
 
 sub insert {
-  my($self)=@_;
-  my($error);
+  my $self = shift;
+  my $error;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -134,34 +121,34 @@ sub insert {
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
 
-  $error=$self->check;
+  $error = $self->check;
   return $error if $error;
 
   return "Domain in use (here)"
-    if qsearchs('svc_domain',{'domain'=> $self->domain } );
+    if qsearchs( 'svc_domain', { 'domain' => $self->domain } );
 
-  my($whois)=(($self->_whois)[0]);
+  my $whois = ($self->_whois)[0];
   return "Domain in use (see whois)"
     if ( $self->action eq "N" && $whois !~ /^No match for/ );
   return "Domain not found (see whois)"
     if ( $self->action eq "M" && $whois =~ /^No match for/ );
 
-  my($svcnum)=$self->getfield('svcnum');
-  my($cust_svc);
+  my $svcnum = $self->svcnum;
+  my $cust_svc;
   unless ( $svcnum ) {
-    $cust_svc=create FS::cust_svc ( {
+    $cust_svc = new FS::cust_svc ( {
       'svcnum'  => $svcnum,
-      'pkgnum'  => $self->getfield('pkgnum'),
-      'svcpart' => $self->getfield('svcpart'),
+      'pkgnum'  => $self->pkgnum,
+      'svcpart' => $self->svcpart,
     } );
-    my($error) = $cust_svc->insert;
+    my $error = $cust_svc->insert;
     return $error if $error;
-    $svcnum = $self->setfield('svcnum',$cust_svc->getfield('svcnum'));
+    $svcnum = $self->setfield( 'svcnum', $cust_svc->svcnum );
   }
 
-  $error = $self->add;
-  if ($error) {
-    $cust_svc->del if $cust_svc;
+  $error = $self->SUPER::insert;
+  if ( $error ) {
+    $cust_svc->delete if $cust_svc;
     return $error;
   }
 
@@ -180,16 +167,16 @@ The corresponding FS::cust_svc record will be deleted as well.
 =cut
 
 sub delete {
-  my($self)=@_;
-  my($error);
+  my $self = shift;
+  my $error;
 
-  my($svcnum)=$self->getfield('svcnum');
+  my $svcnum = $self->svcnum;
   
-  $error = $self->del;
+  $error = $self->delete;
   return $error if $error;
 
-  my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});  
-  $error = $cust_svc->del;
+  my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } );  
+  $error = $cust_svc->delete;
   return $error if $error;
 
   '';
@@ -203,29 +190,13 @@ returns the error, otherwise returns false.
 =cut
 
 sub replace {
-  my($new,$old)=@_;
-  my($error);
-
-  return "(Old) Not a svc_domain record!" unless $old->table eq "svc_domain";
-  return "Can't change svcnum!"
-    unless $old->getfield('svcnum') eq $new->getfield('svcnum');
+  my ( $new, $old ) = ( shift, shift );
+  my $error;
 
   return "Can't change domain - reorder."
     if $old->getfield('domain') ne $new->getfield('domain'); 
 
-  $error=$new->check;
-  return $error if $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-
-  $error = $new->rep($old);
-  return $error if $error;
-
-  '';
+  $new->SUPER::replace($old);
 
 }
 
@@ -276,12 +247,16 @@ Sets any fixed values; see L<FS::part_svc>.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a svc_domain record!" unless $self->table eq "svc_domain";
+  my $self = shift;
+
   my($recref) = $self->hashref;
 
-  $recref->{svcnum} =~ /^(\d*)$/ or return "Illegal svcnum";
-  $recref->{svcnum} = $1;
+  my $error;
+
+  $error =
+    $self->ut_numbern('svcnum')
+  ;
+  return $error if $error;
 
   #get part_svc (and pkgnum)
   my($svcpart,$pkgnum);
@@ -356,10 +331,10 @@ $FS::svc_domain::whois_hack is set true.)
 =cut
 
 sub _whois {
-  my($self)=@_;
-  my($domain)=$self->domain;
+  my $self = shift;
+  my $domain = $self->domain;
   return ( "No match for domain \"$domain\"." ) if $whois_hack;
-  open(WHOIS,"whois do $domain |");
+  open(WHOIS, "whois do $domain |");
   return <WHOIS>;
 }
 
@@ -370,14 +345,14 @@ Submits a registration email for this domain.
 =cut
 
 sub submit_internic {
-  my($self)=@_;
+  my $self = shift;
 
-  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$self->pkgnum});
+  my $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
   return unless $cust_pkg;
-  my($cust_main)=qsearchs('cust_main',{'custnum'=>$cust_pkg->custnum});
+  my cust_main) = qsearchs( 'cust_main', { 'custnum' => $cust_pkg->custnum } );
   return unless $cust_main;
 
-  my(%subs)=(
+  my %subs = (
     'action'       => $self->action,
     'purpose'      => $self->purpose,
     'domain'       => $self->domain,
@@ -400,18 +375,18 @@ sub submit_internic {
   );
 
   #yuck
-  my(@xtemplate)=@template;
-  my(@body);
-  my($line);
-  OLOOP: while ( defined($line = shift @xtemplate) ) {
+  my @xtemplate = @template;
+  my @body;
+  my $line;
+  OLOOP: while ( defined( $line = shift @xtemplate ) ) {
 
     if ( $line =~ /^###LOOP###$/ ) {
       my(@buffer);
-      LOADBUF: while ( defined($line = shift @xtemplate) ) {
+      LOADBUF: while ( defined( $line = shift @xtemplate ) ) {
         last LOADBUF if ( $line =~ /^###ENDLOOP###$/ );
         push @buffer, $line;
       }
-      my(%lubs)=(
+      my %lubs = (
         'address'      => $cust_main->address2 
                             ? [ $cust_main->address1, $cust_main->address2 ]
                             : [ $cust_main->address1 ]
@@ -420,8 +395,8 @@ sub submit_internic {
         'secondary_ip' => [ @nameserver_ips ],
       );
       LOOP: while (1) {
-        my(@xbuffer)=@buffer;
-        SUBLOOP: while ( defined($line = shift @xbuffer) ) {
+        my @xbuffer = @buffer;
+        SUBLOOP: while ( defined( $line = shift @xbuffer ) ) {
           if ( $line =~ /###(\w+)###/ ) {
             #last LOOP unless my($lub)=shift@{$lubs{$1}};
             next OLOOP unless my $lub = shift @{$lubs{$1}};
@@ -445,23 +420,23 @@ sub submit_internic {
 
   } #OLOOP
 
-  my($subject);
+  my $subject;
   if ( $self->action eq "M" ) {
     $subject = "MODIFY DOMAIN ". $self->domain;
-  } elsif ($self->action eq "N" ) { 
+  } elsif ( $self->action eq "N" ) { 
     $subject = "NEW DOMAIN ". $self->domain;
   } else {
     croak "submit_internic called with action ". $self->action;
   }
 
-  $ENV{SMTPHOSTS}=$smtpmachine;
-  $ENV{MAILADDRESS}=$from;
-  my($header)=Mail::Header->new( [
+  $ENV{SMTPHOSTS} = $smtpmachine;
+  $ENV{MAILADDRESS} = $from;
+  my $header = Mail::Header->new( [
     "From: $from",
     "To: $to",
     "Sender: $from",
     "Reply-To: $from",
-    "Date: ". time2str("%a, %d %b %Y %X %z",time),
+    "Date: ". time2str("%a, %d %b %Y %X %z", time),
     "Subject: $subject",
   ] );
 
@@ -476,15 +451,17 @@ sub submit_internic {
 
 =back
 
-=head1 BUGS
+=head1 VERSION
 
-It doesn't properly override FS::Record yet.
+$Id: svc_domain.pm,v 1.4 1998-12-29 11:59:55 ivan Exp $
+
+=head1 BUGS
 
 All BIND/DNS fields should be included (and exported).
 
-All registries should be supported.
+Delete doesn't send a registration template.
 
-Not all configuration access is through FS::Conf!
+All registries should be supported.
 
 Should change action to a real field.
 
@@ -494,10 +471,6 @@ L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
 L<FS::SSH>, L<ssh>, L<dot-qmail>, schema.html from the base documentation,
 config.html from the base documentation.
 
-=head1 VERSION
-
-$Id: svc_domain.pm,v 1.3 1998-11-13 09:56:57 ivan Exp $
-
 =head1 HISTORY
 
 ivan@voicenet.com 97-jul-21
@@ -515,7 +488,10 @@ ivan@sisd.com 98-jul-17-19
 pod, some FS::Conf (not complete) ivan@sisd.com 98-sep-23
 
 $Log: svc_domain.pm,v $
-Revision 1.3  1998-11-13 09:56:57  ivan
+Revision 1.4  1998-12-29 11:59:55  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+Revision 1.3  1998/11/13 09:56:57  ivan
 change configuration file layout to support multiple distinct databases (with
 own set of config files, export, etc.)
 
diff --git a/site_perl/table_template-svc.pm b/site_perl/table_template-svc.pm
index d4536e5f6..4180d8d13 100644
--- a/site_perl/table_template-svc.pm
+++ b/site_perl/table_template-svc.pm
@@ -2,7 +2,6 @@ package FS::svc_table;
 
 use strict;
 use vars qw(@ISA);
-use Exporter;
 use FS::Record qw(fields qsearch qsearchs);
 use FS::cust_svc;
 
@@ -16,8 +15,8 @@ FS::table_name - Object methods for table_name records
 
   use FS::table_name;
 
-  $record = create FS::table_name \%hash;
-  $record = create FS::table_name { 'column' => 'value' };
+  $record = new FS::table_name \%hash;
+  $record = new FS::table_name { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -48,7 +47,7 @@ FS::Record.  The following fields are currently supported:
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new example.  To add the example to the database, see L<"insert">.
 
@@ -57,12 +56,7 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  $proto->new('svc_table',$hashref);
-
-}
+sub table { 'table_name'; }
 
 =item insert
 
@@ -226,7 +220,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: table_template-svc.pm,v 1.2 1998-11-15 04:33:01 ivan Exp $
+$Id: table_template-svc.pm,v 1.3 1998-12-29 11:59:56 ivan Exp $
 
 =head1 BUGS
 
@@ -242,7 +236,10 @@ froom the base documentation.
 ivan@voicenet.com 97-jul-21
 
 $Log: table_template-svc.pm,v $
-Revision 1.2  1998-11-15 04:33:01  ivan
+Revision 1.3  1998-12-29 11:59:56  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+Revision 1.2  1998/11/15 04:33:01  ivan
 updates for newest versoin
 
 
diff --git a/site_perl/table_template.pm b/site_perl/table_template.pm
index 8945a39d7..0173bc5cf 100644
--- a/site_perl/table_template.pm
+++ b/site_perl/table_template.pm
@@ -1,10 +1,8 @@
 package FS::table_name;
 
 use strict;
-use vars qw (@ISA);
-use Exporter;
-#use FS::UID qw(getotaker);
-use FS::Record qw(hfields qsearch qsearchs);
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
 
 @ISA = qw(FS::Record);
 
@@ -16,8 +14,8 @@ FS::table_name - Object methods for table_name records
 
   use FS::table_name;
 
-  $record = create FS::table_name \%hash;
-  $record = create FS::table_name { 'column' => 'value' };
+  $record = new FS::table_name \%hash;
+  $record = new FS::table_name { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -42,7 +40,7 @@ FS::Record.  The following fields are currently supported:
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Creates a new example.  To add the example to the database, see L<"insert">.
 
@@ -51,12 +49,9 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
+# the new method can be inherited from FS::Record, if a table method is defined
 
-  $proto->new('table_name',$hashref);
-
-}
+sub table { 'table_name'; }
 
 =item insert
 
@@ -65,18 +60,7 @@ otherwise returns false.
 
 =cut
 
-sub insert {
-  my($self)=@_;
-
-  #local $SIG{HUP} = 'IGNORE';
-  #local $SIG{INT} = 'IGNORE';
-  #local $SIG{QUIT} = 'IGNORE';
-  #local $SIG{TERM} = 'IGNORE';
-  #local $SIG{TSTP} = 'IGNORE';
-
-  $self->check or
-  $self->add;
-}
+# the insert method can be inherited from FS::Record
 
 =item delete
 
@@ -84,11 +68,7 @@ Delete this record from the database.
 
 =cut
 
-sub delete {
-  my($self)=@_;
-
-  $self->del;
-}
+# the delete method can be inherited from FS::Record
 
 =item replace OLD_RECORD
 
@@ -97,30 +77,21 @@ returns the error, otherwise returns false.
 
 =cut
 
-sub replace {
-  my($new,$old)=@_;
-  return "(Old) Not a table_name record!" unless $old->table eq "table_name";
-
-  return "Can't change keyfield!"
-     unless $old->getfield('keyfield') eq $new->getfield('keyfield');
-
-  $new->check or
-  $new->rep($old);
-}
-
+# the replace method can be inherited from FS::Record
 
 =item check
 
 Checks all fields to make sure this is a valid example.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
-and repalce methods.
+and replace methods.
 
 =cut
 
-sub check {
-  my($self)=@_;
-  return "Not a table_name record!" unless $self->table eq "table_name";
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
 
+sub check {
+  my $self = shift;
 
   ''; #no error
 }
@@ -129,7 +100,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: table_template.pm,v 1.3 1998-11-15 04:33:00 ivan Exp $
+$Id: table_template.pm,v 1.4 1998-12-29 11:59:57 ivan Exp $
 
 =head1 BUGS
 
@@ -137,7 +108,7 @@ The author forgot to customize this manpage.
 
 =head1 SEE ALSO
 
-L<FS::Record>
+L<FS::Record>, schema.html from the base documentation.
 
 =head1 HISTORY
 
@@ -147,7 +118,10 @@ added hfields
 ivan@sisd.com 97-nov-13
 
 $Log: table_template.pm,v $
-Revision 1.3  1998-11-15 04:33:00  ivan
+Revision 1.4  1998-12-29 11:59:57  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+Revision 1.3  1998/11/15 04:33:00  ivan
 updates for newest versoin
 
 Revision 1.2  1998/11/15 03:48:49  ivan
diff --git a/site_perl/type_pkgs.pm b/site_perl/type_pkgs.pm
index a71579603..e19345e7c 100644
--- a/site_perl/type_pkgs.pm
+++ b/site_perl/type_pkgs.pm
@@ -1,12 +1,12 @@
 package FS::type_pkgs;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK);
-use Exporter;
-use FS::Record qw(fields qsearchs);
+use vars qw( @ISA );
+use FS::Record qw( qsearchs );
+use FS::agent_type;
+use FS::part_pkg;
 
-@ISA = qw(FS::Record Exporter);
-@EXPORT_OK = qw(fields);
+@ISA = qw( FS::Record );
 
 =head1 NAME
 
@@ -16,8 +16,8 @@ FS::type_pkgs - Object methods for type_pkgs records
 
   use FS::type_pkgs;
 
-  $record = create FS::type_pkgs \%hash;
-  $record = create FS::type_pkgs { 'column' => 'value' };
+  $record = new FS::type_pkgs \%hash;
+  $record = new FS::type_pkgs { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -45,67 +45,29 @@ FS::Record.  The following fields are currently supported:
 
 =over 4
 
-=item create HASHREF
+=item new HASHREF
 
 Create a new record.  To add the record to the database, see L<"insert">.
 
 =cut
 
-sub create {
-  my($proto,$hashref)=@_;
-
-  #now in FS::Record::new
-  #my($field);
-  #foreach $field (fields('type_pkgs')) {
-  #  $hashref->{$field}='' unless defined $hashref->{$field};
-  #}
-
-  $proto->new('type_pkgs',$hashref);
-
-}
+sub table { 'type_pkgs'; }
 
 =item insert
 
 Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
 
-=cut
-
-sub insert {
-  my($self)=@_;
-
-  $self->check or
-  $self->add;
-}
-
 =item delete
 
 Deletes this record from the database.  If there is an error, returns the
 error, otherwise returns false.
 
-=cut
-
-sub delete {
-  my($self)=@_;
-
-  $self->del;
-}
-
 =item replace OLD_RECORD
 
 Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
-=cut
-
-sub replace {
-  my($new,$old)=@_;
-  return "(Old) Not a type_pkgs record!" unless $old->table eq "type_pkgs";
-
-  $new->check or
-  $new->rep($old);
-}
-
 =item check
 
 Checks all fields to make sure this is a valid record.  If there is an error,
@@ -115,25 +77,36 @@ methods.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a type_pkgs record!" unless $self->table eq "type_pkgs";
-  my($recref) = $self->hashref;
+  my $self = shift;
+
+  my $error = 
+    $self->ut_number('typenum')
+    || $self->ut_number('pkgpart')
+  ;
+  return $error if $error;
 
-  $recref->{typenum} =~ /^(\d+)$/ or return "Illegal typenum";
-  $recref->{typenum} = $1;
   return "Unknown typenum"
-    unless qsearchs('agent_type',{'typenum'=>$recref->{typenum}});
+    unless qsearchs( 'agent_type', { 'typenum' => $self->typenum } );
 
-  $recref->{pkgpart} =~ /^(\d+)$/ or return "Illegal pkgpart";
-  $recref->{pkgpart} = $1;
   return "Unknown pkgpart"
-    unless qsearchs('part_pkg',{'pkgpart'=>$recref->{pkgpart}});
+    unless qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
 
   ''; #no error
 }
 
 =back
 
+=head1 VERSION
+
+$Id: type_pkgs.pm,v 1.2 1998-12-29 11:59:58 ivan Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::agent_type>, L<FS::part_pkgs>, schema.html from the base
+documentation.
+
 =head1 HISTORY
 
 Defines the relation between agent types and pkgparts
@@ -144,6 +117,11 @@ ivan@sisd.com 97-nov-13
 change to ut_ FS::Record, fixed bugs
 ivan@sisd.com 97-dec-10
 
+$Log: type_pkgs.pm,v $
+Revision 1.2  1998-12-29 11:59:58  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+
 =cut
 
 1;
-- 
cgit v1.2.1


From 4a5b07fb140e6abe0c29122cf349ff3f917e9610 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 30 Dec 1998 00:30:48 +0000
Subject: svc_ stuff is more properly OO - has a common superclass
 FS::svc_Common

---
 site_perl/Invoice.pm            |   2 +-
 site_perl/agent.pm              |   4 +-
 site_perl/svc_Common.pm         | 190 ++++++++++++++++++++++++++++++++++++++++
 site_perl/svc_acct.pm           |  81 ++++-------------
 site_perl/svc_acct_sm.pm        | 132 ++++++----------------------
 site_perl/svc_domain.pm         | 118 ++++++-------------------
 site_perl/table_template-svc.pm | 126 ++++++--------------------
 7 files changed, 288 insertions(+), 365 deletions(-)
 create mode 100644 site_perl/svc_Common.pm

diff --git a/site_perl/Invoice.pm b/site_perl/Invoice.pm
index 5eb596fad..20a016274 100644
--- a/site_perl/Invoice.pm
+++ b/site_perl/Invoice.pm
@@ -6,7 +6,7 @@ use FS::cust_bill;
 
 @ISA = qw(FS::cust_bill);
 
-#warn "FS::Invoice depriciated\n";
+warn "FS::Invoice depriciated\n";
 
 =head1 NAME
 
diff --git a/site_perl/agent.pm b/site_perl/agent.pm
index 7632d2fca..cc4fb1088 100644
--- a/site_perl/agent.pm
+++ b/site_perl/agent.pm
@@ -2,7 +2,7 @@ package FS::agent;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs);
+use FS::Record qw( qsearch qsearchs );
 use FS::cust_main;
 use FS::agent_type;
 
@@ -116,7 +116,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: agent.pm,v 1.3 1998-12-29 11:59:34 ivan Exp $
+$Id: agent.pm,v 1.4 1998-12-30 00:30:44 ivan Exp $
 
 =head1 BUGS
 
diff --git a/site_perl/svc_Common.pm b/site_perl/svc_Common.pm
new file mode 100644
index 000000000..e516e0065
--- /dev/null
+++ b/site_perl/svc_Common.pm
@@ -0,0 +1,190 @@
+package FS::svc_Common;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs fields );
+use FS::cust_svc;
+use FS::part_svc;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::svc_Common - Object method for all svc_ records
+
+=head1 SYNOPSIS
+
+use FS::svc_Common;
+
+@ISA = qw( FS::svc_Common );
+
+=head1 DESCRIPTION
+
+FS::svc_Common is intended as a base class for table-specific classes to
+inherit from, i.e. FS::svc_acct.  FS::svc_Common inherits from FS::Record.
+
+=head1 METHODS
+
+=over 4
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
+defined.  An FS::cust_svc record will be created and inserted.
+
+=cut
+
+sub insert {
+  my $self = shift;
+  my $error;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  $error = $self->check;
+  return $error if $error;
+
+  my $svcnum = $self->svcnum;
+  my $cust_svc;
+  unless ( $svcnum ) {
+    $cust_svc = new FS::cust_svc ( {
+      'svcnum'  => $svcnum,
+      'pkgnum'  => $self->pkgnum,
+      'svcpart' => $self->svcpart,
+    } );
+    $error = $cust_svc->insert;
+    return $error if $error;
+    $svcnum = $self->svcnum($cust_svc->svcnum);
+  }
+
+  $error = $self->SUPER::insert;
+  if ( $error ) {
+    $cust_svc->delete if $cust_svc;
+    return $error;
+  }
+
+  '';
+}
+
+=item delete
+
+Deletes this account from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+The corresponding FS::cust_svc record will be deleted as well.
+
+=cut
+
+sub delete {
+  my $self = shift;
+  my $error;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+
+  my $svcnum = $self->svcnum;
+
+  $error = $self->SUPER::delete;
+  return $error if $error;
+
+  my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );  
+  $error = $cust_svc->delete;
+  return $error if $error;
+
+  '';
+}
+
+=item setfixed;
+
+Sets any fixed fields for this service (see L<FS::part_svc>).  If there is an
+error, returns the error, otherwise returns the FS::part_svc object (use ref()
+to test the return).  Usually called by the check method.
+
+=cut
+
+sub setfixed {
+  my $self = shift;
+
+  my $error;
+
+  $error =
+    $self->ut_numbern('svcnum')
+  ;
+  return $error if $error;
+
+  #get part_svc
+  my $svcpart;
+  if ( $self->svcnum ) {
+    my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $self->svcnum } );
+    return "Unknown svcnum" unless $cust_svc; 
+    $svcpart = $cust_svc->svcpart;
+  } else {
+    $svcpart = $self->getfield('svcpart');
+  }
+  my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
+  return "Unkonwn svcpart" unless $part_svc;
+
+  #set fixed fields from part_svc
+  foreach my $field ( fields('svc_acct') ) {
+    if ( $part_svc->getfield('svc_acct__'. $field. '_flag') eq 'F' ) {
+      $self->setfield( $field, $part_svc->getfield('svc_acct__'. $field) );
+    }
+  }
+
+ $part_svc;
+
+}
+
+=item suspend
+
+=item unsuspend
+
+=item cancel
+
+Stubs - return false (no error) so derived classes don't need to define these
+methods.  Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=cut
+
+sub suspend { ''; }
+sub unsuspend { ''; }
+sub cancel { ''; }
+
+=back
+
+=head1 VERSION
+
+$Id: svc_Common.pm,v 1.1 1998-12-30 00:30:45 ivan Exp $
+
+=head1 BUGS
+
+The setfixed method return value.
+
+The new method should set defaults from part_svc (like the check method
+sets fixed values).
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>, schema.html
+from the base documentation.
+
+=head1 HISTORY
+
+$Log: svc_Common.pm,v $
+Revision 1.1  1998-12-30 00:30:45  ivan
+svc_ stuff is more properly OO - has a common superclass FS::svc_Common
+
+
+=cut
+
+1;
+
diff --git a/site_perl/svc_acct.pm b/site_perl/svc_acct.pm
index 1d3085969..473f78b24 100644
--- a/site_perl/svc_acct.pm
+++ b/site_perl/svc_acct.pm
@@ -5,10 +5,10 @@ use vars qw(@ISA $nossh_hack $conf $dir_prefix @shells
             $shellmachine @saltset @pw_set);
 use FS::Conf;
 use FS::Record qw( qsearchs fields );
+use FS::svc_Common;
 use FS::SSH qw(ssh);
-use FS::cust_svc;
 
-@ISA = qw( FS::Record );
+@ISA = qw( FS::svc_Common );
 
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::svc_acct'} = sub { 
@@ -51,7 +51,7 @@ FS::svc_acct - Object methods for svc_acct records
 =head1 DESCRIPTION
 
 An FS::svc_acct object represents an account.  FS::svc_acct inherits from
-FS::Record.  The following fields are currently supported:
+FS::svc_Common.  The following fields are currently supported:
 
 =over 4
 
@@ -135,24 +135,8 @@ sub insert {
       && $self->username !~ /^(hyla)?fax$/
     ;
 
-  my $svcnum = $self->svcnum;
-  my $cust_svc;
-  unless ( $svcnum ) {
-    $cust_svc = new FS::cust_svc ( {
-      'svcnum'  => $svcnum,
-      'pkgnum'  => $self->pkgnum,
-      'svcpart' => $self->svcpart,
-    } );
-    my $error = $cust_svc->insert;
-    return $error if $error;
-    $svcnum = $self->svcnum($cust_svc->svcnum);
-  }
-
   $error = $self->SUPER::insert;
-  if ($error) {
-    $cust_svc->delete if $cust_svc;
-    return $error;
-  }
+  return $error if $error;
 
   my ( $username, $uid, $dir, $shell ) = (
     $self->username,
@@ -205,15 +189,9 @@ sub delete {
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
 
-  my $svcnum = $self->getfield('svcnum');
-
   $error = $self->SUPER::delete;
   return $error if $error;
 
-  my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );  
-  $error = $cust_svc->delete;
-  return $error if $error;
-
   my $username = $self->username;
   if ( $username && $shellmachine && ! $nossh_hack ) {
     ssh("root\@$shellmachine","userdel $username");
@@ -247,7 +225,7 @@ setting $FS::svc_acct::nossh_hack true.
 =cut
 
 sub replace {
-  my ( $new, $old ) = @_;
+  my ( $new, $old ) = ( shift, shift );
   my $error;
 
   return "Username in use"
@@ -336,12 +314,6 @@ Just returns false (no error) for now.
 
 Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
 
-=cut
-
-sub cancel {
-  ''; #stub (no error) - taken care of in delete
-}
-
 =item check
 
 Checks all fields to make sure this is a valid service.  If there is an error,
@@ -357,31 +329,11 @@ sub check {
 
   my($recref) = $self->hashref;
 
-  $recref->{svcnum} =~ /^(\d*)$/ or return "Illegal svcnum";
-  $recref->{svcnum} = $1;
-
-  #get part_svc
-  my($svcpart);
-  my($svcnum)=$self->getfield('svcnum');
-  if ($svcnum) {
-    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
-    return "Unknown svcnum" unless $cust_svc; 
-    $svcpart=$cust_svc->svcpart;
-  } else {
-    $svcpart=$self->getfield('svcpart');
-  }
-  my($part_svc)=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  return "Unkonwn svcpart" unless $part_svc;
+  my $x = $self->setfixed;
+  return $x unless ref($x);
+  my $part_svc = $x;
 
-  #set fixed fields from part_svc
-  my($field);
-  foreach $field ( fields('svc_acct') ) {
-    if ( $part_svc->getfield('svc_acct__'. $field. '_flag') eq 'F' ) {
-      $self->setfield($field,$part_svc->getfield('svc_acct__'. $field) );
-    }
-  }
-
-  my($ulen)=$self->dbdef_table->column('username')->length;
+  my $ulen =$self->dbdef_table->column('username')->length;
   $recref->{username} =~ /^([a-z0-9_\-]{2,$ulen})$/
     or return "Illegal username";
   $recref->{username} = $1;
@@ -488,24 +440,21 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.3 1998-12-29 11:59:52 ivan Exp $
+$Id: svc_acct.pm,v 1.4 1998-12-30 00:30:45 ivan Exp $
 
 =head1 BUGS
 
 The remote commands should be configurable.
 
-The new method should set defaults from part_svc (like the check method
-sets fixed values).
-
 The bits which ssh should fork before doing so.
 
 The $recref stuff in sub check should be cleaned up.
 
 =head1 SEE ALSO
 
-L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
-L<FS::SSH>, L<ssh>, L<FS::svc_acct_pop>, schema.html from the base
-documentation.
+L<FS::svc_Common>, L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>,
+L<FS::part_svc>, L<FS::cust_pkg>, L<FS::SSH>, L<ssh>, L<FS::svc_acct_pop>,
+schema.html from the base documentation.
 
 =head1 HISTORY
 
@@ -533,8 +482,8 @@ arbitrary radius attributes ivan@sisd.com 98-aug-13
 pod and FS::conf ivan@sisd.com 98-sep-22
 
 $Log: svc_acct.pm,v $
-Revision 1.3  1998-12-29 11:59:52  ivan
-mostly properly OO, some work still to be done with svc_ stuff
+Revision 1.4  1998-12-30 00:30:45  ivan
+svc_ stuff is more properly OO - has a common superclass FS::svc_Common
 
 Revision 1.2  1998/11/13 09:56:55  ivan
 change configuration file layout to support multiple distinct databases (with
diff --git a/site_perl/svc_acct_sm.pm b/site_perl/svc_acct_sm.pm
index f1c049263..75e7b0281 100644
--- a/site_perl/svc_acct_sm.pm
+++ b/site_perl/svc_acct_sm.pm
@@ -3,11 +3,12 @@ package FS::svc_acct_sm;
 use strict;
 use vars qw( @ISA $nossh_hack $conf $shellmachine @qmailmachines );
 use FS::Record qw( fields qsearch qsearchs );
+use FS::svc_Common;
 use FS::cust_svc;
 use FS::SSH qw(ssh);
 use FS::Conf;
 
-@ISA = qw( FS::Record );
+@ISA = qw( FS::svc_Common );
 
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::svc_acct_sm'} = sub { 
@@ -94,8 +95,8 @@ This behaviour can be surpressed by setting $FS::svc_acct_sm::nossh_hack true.
 =cut
 
 sub insert {
-  my($self)=@_;
-  my($error);
+  my $self = shift;
+  my $error;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -116,34 +117,18 @@ sub insert {
     if $self->domuser ne '*' &&
        ! qsearch('svc_acct_sm',{ 'domsvc' => $self->domsvc } );
 
-  my($svcnum)=$self->getfield('svcnum');
-  my($cust_svc);
-  unless ( $svcnum ) {
-    $cust_svc=create FS::cust_svc ( {
-      'svcnum'  => $svcnum,
-      'pkgnum'  => $self->getfield('pkgnum'),
-      'svcpart' => $self->getfield('svcpart'),
-    } );
-    my($error) = $cust_svc->insert;
-    return $error if $error;
-    $svcnum = $self->setfield('svcnum',$cust_svc->getfield('svcnum'));
-  }
-
-  $error = $self->add;
-  if ($error) {
-    $cust_svc->del if $cust_svc;
-    return $error;
-  }
+  $error = $self->SUPER::insert;
+  return $error if $error;
 
-  my $svc_domain = qsearchs('svc_domain',{'svcnum'=> $self->domsvc } );
-  my $svc_acct = qsearchs('svc_acct',{'uid'=> $self->domuid } );
-  my($uid,$gid,$dir,$domain)=(
-    $svc_acct->getfield('uid'),
-    $svc_acct->getfield('gid'),
-    $svc_acct->getfield('dir'),
-    $svc_domain->getfield('domain')
+  my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } );
+  my $svc_acct = qsearchs( 'svc_acct', { 'uid' => $self->domuid } );
+  my ( $uid, $gid, $dir, $domain ) = (
+    $svc_acct->uid,
+    $svc_acct->gid,
+    $svc_acct->dir,
+    $svc_domain->domain,
   );
-  my($qdomain)=$domain;
+  my $qdomain = $domain;
   $qdomain =~ s/\./:/g; #see manpage for 'dot-qmail': EXTENSION ADDRESSES
   ssh("root\@$shellmachine","[ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }")  
     if ( ! $nossh_hack && $shellmachine && $dir && $self->domuser eq '*' );
@@ -159,25 +144,6 @@ returns the error, otherwise returns false.
 
 The corresponding FS::cust_svc record will be deleted as well.
 
-=cut
-
-sub delete {
-  my($self)=@_;
-  my($error);
-
-  my($svcnum)=$self->getfield('svcnum');
-
-  $error = $self->del;
-  return $error if $error;
-
-  my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
-  $error = $cust_svc->del;
-  return $error if $error;
-
-  '';
-  
-}
-
 =item replace OLD_RECORD
 
 Replaces OLD_RECORD with this one in the database.  If there is an error,
@@ -186,12 +152,8 @@ returns the error, otherwise returns false.
 =cut
 
 sub replace {
-  my($new,$old)=@_;
-  my($error);
-
-  return "(Old) Not a svc_acct_sm record!" unless $old->table eq "svc_acct_sm";
-  return "Can't change svcnum!"
-    unless $old->getfield('svcnum') eq $new->getfield('svcnum');
+  my ( $new, $old ) = ( shift, shift );
+  my $error;
 
   return "Domain username (domuser) in use for this domain (domsvc)"
     if ( $old->domuser ne $new->domuser
@@ -202,13 +164,8 @@ sub replace {
        } )
      ;
 
-  $error=$new->check;
-  return $error if $error;
-
-  $error = $new->rep($old);
-  return $error if $error;
+ $new->SUPER::replace($old);
 
-  ''; #no error
 }
 
 =item suspend
@@ -217,36 +174,18 @@ Just returns false (no error) for now.
 
 Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
 
-=cut
-
-sub suspend {
-  ''; #no error (stub)
-}
-
 =item unsuspend
 
 Just returns false (no error) for now.
 
 Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
 
-=cut
-
-sub unsuspend {
-  ''; #no error (stub)
-}
-
 =item cancel
 
 Just returns false (no error) for now.
 
 Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
 
-=cut
-
-sub cancel {
-  ''; #no error (stub)
-}
-
 =item check
 
 Checks all fields to make sure this is a valid virtual mail alias.  If there is
@@ -258,33 +197,14 @@ Sets any fixed values; see L<FS::part_svc>.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a svc_acct_sm record!" unless $self->table eq "svc_acct_sm";
-  my($recref) = $self->hashref;
+  my $self = shift;
+  my $error;
 
-  $recref->{svcnum} =~ /^(\d*)$/ or return "Illegal svcnum";
-  $recref->{svcnum} = $1;
-
-  #get part_svc
-  my($svcpart);
-  my($svcnum)=$self->getfield('svcnum');
-  if ($svcnum) {
-    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
-    return "Unknown svcnum" unless $cust_svc; 
-    $svcpart=$cust_svc->svcpart;
-  } else {
-    $svcpart=$self->getfield('svcpart');
-  }
-  my($part_svc)=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  return "Unkonwn svcpart" unless $part_svc;
-
-  #set fixed fields from part_svc
-  my($field);
-  foreach $field ( fields('svc_acct_sm') ) {
-    if ( $part_svc->getfield('svc_acct_sm__'. $field. '_flag') eq 'F' ) {
-      $self->setfield($field,$part_svc->getfield('svc_acct_sm__'. $field) );
-    }
-  }
+  my $x = $self->setfixed;
+  return $x unless ref($x);
+  my $part_svc = $x;
+
+  my($recref) = $self->hashref;
 
   $recref->{domuser} =~ /^(\*|[a-z0-9_\-]{2,32})$/
     or return "Illegal domain username (domuser)";
@@ -309,12 +229,14 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_acct_sm.pm,v 1.3 1998-12-29 11:59:54 ivan Exp $
+$Id: svc_acct_sm.pm,v 1.4 1998-12-30 00:30:46 ivan Exp $
 
 =head1 BUGS
 
 The remote commands should be configurable.
 
+The $recref stuff in sub check should be cleaned up.
+
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
diff --git a/site_perl/svc_domain.pm b/site_perl/svc_domain.pm
index c7e1e70bd..f86723f4a 100644
--- a/site_perl/svc_domain.pm
+++ b/site_perl/svc_domain.pm
@@ -9,10 +9,11 @@ use Mail::Internet;
 use Mail::Header;
 use Date::Format;
 use FS::Record qw(fields qsearch qsearchs);
+use FS::svc_Common;
 use FS::cust_svc;
 use FS::Conf;
 
-@ISA = qw(FS::Record Exporter);
+@ISA = qw( FS::svc_Common );
 
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::domain'} = sub { 
@@ -68,7 +69,7 @@ FS::svc_domain - Object methods for svc_domain records
 =head1 DESCRIPTION
 
 An FS::svc_domain object represents a domain.  FS::svc_domain inherits from
-FS::Record.  The following fields are currently supported:
+FS::svc_Common.  The following fields are currently supported:
 
 =over 4
 
@@ -133,24 +134,8 @@ sub insert {
   return "Domain not found (see whois)"
     if ( $self->action eq "M" && $whois =~ /^No match for/ );
 
-  my $svcnum = $self->svcnum;
-  my $cust_svc;
-  unless ( $svcnum ) {
-    $cust_svc = new FS::cust_svc ( {
-      'svcnum'  => $svcnum,
-      'pkgnum'  => $self->pkgnum,
-      'svcpart' => $self->svcpart,
-    } );
-    my $error = $cust_svc->insert;
-    return $error if $error;
-    $svcnum = $self->setfield( 'svcnum', $cust_svc->svcnum );
-  }
-
   $error = $self->SUPER::insert;
-  if ( $error ) {
-    $cust_svc->delete if $cust_svc;
-    return $error;
-  }
+  return $error if $error;
 
   $self->submit_internic unless $whois_hack;
 
@@ -164,24 +149,6 @@ error, otherwise returns false.
 
 The corresponding FS::cust_svc record will be deleted as well.
 
-=cut
-
-sub delete {
-  my $self = shift;
-  my $error;
-
-  my $svcnum = $self->svcnum;
-  
-  $error = $self->delete;
-  return $error if $error;
-
-  my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } );  
-  $error = $cust_svc->delete;
-  return $error if $error;
-
-  '';
-}
-
 =item replace OLD_RECORD
 
 Replaces OLD_RECORD with this one in the database.  If there is an error,
@@ -206,36 +173,18 @@ Just returns false (no error) for now.
 
 Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
 
-=cut
-
-sub suspend {
-  ''; #no error (stub)
-}
-
 =item unsuspend
 
 Just returns false (no error) for now.
 
 Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
 
-=cut
-
-sub unsuspend {
-  ''; #no error (stub)
-}
-
 =item cancel
 
 Just returns false (no error) for now.
 
 Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
 
-=cut
-
-sub cancel {
-  ''; #no error (stub)
-}
-
 =item check
 
 Checks all fields to make sure this is a valid domain.  If there is an error,
@@ -248,44 +197,28 @@ Sets any fixed values; see L<FS::part_svc>.
 
 sub check {
   my $self = shift;
-
-  my($recref) = $self->hashref;
-
   my $error;
 
-  $error =
-    $self->ut_numbern('svcnum')
-  ;
-  return $error if $error;
+  my $x = $self->setfixed;
+  return $x unless ref($x);
+  my $part_svc = $x;
 
-  #get part_svc (and pkgnum)
-  my($svcpart,$pkgnum);
-  my($svcnum)=$self->getfield('svcnum');
-  if ($svcnum) {
-    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
-    return "Unknown svcnum" unless $cust_svc; 
-    $svcpart=$cust_svc->svcpart;
-    $pkgnum=$cust_svc->pkgnum;
+  #hmm
+  my $pkgnum;
+  if ( $self->svcnum ) {
+    my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $self->svcnum } );
+    $pkgnum = $cust_svc->pkgnum;
   } else {
-    $svcpart=$self->svcpart;
-    $pkgnum=$self->pkgnum;
-  }
-  my($part_svc)=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  return "Unkonwn svcpart" unless $part_svc;
-
-  #set fixed fields from part_svc
-  my($field);
-  foreach $field ( fields('svc_acct') ) {
-    if ( $part_svc->getfield('svc_domain__'. $field. '_flag') eq 'F' ) {
-      $self->setfield($field,$part_svc->getfield('svc_domain__'. $field) );
-    }
+    $pkgnum = $self->pkgnum;
   }
 
+  my($recref) = $self->hashref;
+
   unless ( $whois_hack ) {
     unless ( $self->email ) { #find out an email address
-      my(@svc_acct);
-      foreach ( qsearch('cust_svc',{'pkgnum'=>$pkgnum}) ) {
-        my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$_->svcnum});
+      my @svc_acct;
+      foreach ( qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } ) ) {
+        my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $_->svcnum } );
         push @svc_acct, $svc_acct if $svc_acct;
       }
 
@@ -349,7 +282,7 @@ sub submit_internic {
 
   my $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
   return unless $cust_pkg;
-  my cust_main) = qsearchs( 'cust_main', { 'custnum' => $cust_pkg->custnum } );
+  my $cust_main = qsearchs( 'cust_main', { 'custnum' => $cust_pkg->custnum } );
   return unless $cust_main;
 
   my %subs = (
@@ -453,7 +386,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.4 1998-12-29 11:59:55 ivan Exp $
+$Id: svc_domain.pm,v 1.5 1998-12-30 00:30:47 ivan Exp $
 
 =head1 BUGS
 
@@ -465,11 +398,12 @@ All registries should be supported.
 
 Should change action to a real field.
 
+The $recref stuff in sub check should be cleaned up.
+
 =head1 SEE ALSO
 
-L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
-L<FS::SSH>, L<ssh>, L<dot-qmail>, schema.html from the base documentation,
-config.html from the base documentation.
+L<FS::svc_Common>, L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>,
+L<FS::part_svc>, L<FS::cust_pkg>, L<FS::SSH>, L<ssh>, L<dot-qmail>, schema.html from the base documentation, config.html from the base documentation.
 
 =head1 HISTORY
 
@@ -488,8 +422,8 @@ ivan@sisd.com 98-jul-17-19
 pod, some FS::Conf (not complete) ivan@sisd.com 98-sep-23
 
 $Log: svc_domain.pm,v $
-Revision 1.4  1998-12-29 11:59:55  ivan
-mostly properly OO, some work still to be done with svc_ stuff
+Revision 1.5  1998-12-30 00:30:47  ivan
+svc_ stuff is more properly OO - has a common superclass FS::svc_Common
 
 Revision 1.3  1998/11/13 09:56:57  ivan
 change configuration file layout to support multiple distinct databases (with
diff --git a/site_perl/table_template-svc.pm b/site_perl/table_template-svc.pm
index 4180d8d13..40c9ed9b5 100644
--- a/site_perl/table_template-svc.pm
+++ b/site_perl/table_template-svc.pm
@@ -2,10 +2,11 @@ package FS::svc_table;
 
 use strict;
 use vars qw(@ISA);
-use FS::Record qw(fields qsearch qsearchs);
+#use FS::Record qw( qsearch qsearchs );
+use FS::svc_Common;
 use FS::cust_svc;
 
-@ISA = qw(FS::Record);
+@ISA = qw(svc_Common);
 
 =head1 NAME
 
@@ -35,7 +36,7 @@ FS::table_name - Object methods for table_name records
 =head1 DESCRIPTION
 
 An FS::table_name object represents an example.  FS::table_name inherits from
-FS::Record.  The following fields are currently supported:
+FS::svc_Common.  The following fields are currently supported:
 
 =over 4
 
@@ -69,38 +70,13 @@ defined.  An FS::cust_svc record will be created and inserted.
 =cut
 
 sub insert {
-  my($self)=@_;
-  my($error);
+  my $self = shift;
+  my $error;
 
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-
-  $error=$self->check;
+  $error = $self->SUPER::insert;
   return $error if $error;
 
-  my($svcnum)=$self->svcnum;
-  my($cust_svc);
-  unless ( $svcnum ) {
-    $cust_svc=create FS::cust_svc ( {
-      'svcnum'  => $svcnum,
-      'pkgnum'  => $self->pkgnum,
-      'svcpart' => $self->svcpart,
-    } );
-    my($error) = $cust_svc->insert;
-    return $error if $error;
-    $svcnum = $self->svcnum($cust_svc->svcnum);
-  }
-
-  $error = $self->add;
-  if ($error) {
-    #$cust_svc->del if $cust_svc;
-    $cust_svc->delete if $cust_svc;
-    return $error;
-
-  ''; #no error
+  '';
 }
 
 =item delete
@@ -110,12 +86,13 @@ Delete this record from the database.
 =cut
 
 sub delete {
-  my($self)=@_;
-  my($error);
+  my $self = shift;
+  my $error;
 
-  $error = $self->del;
+  $error = $self->SUPER::delete;
   return $error if $error;
 
+  '';
 }
 
 
@@ -127,55 +104,27 @@ returns the error, otherwise returns false.
 =cut
 
 sub replace {
-  my($new,$old)=@_;
-  my($error);
-
-  return "(Old) Not a svc_table record!" unless $old->table eq "svc_table";
-  return "Can't change svcnum!"
-    unless $old->getfield('svcnum') eq $new->getfield('svcnum');
-
-  $error=$new->check;
-  return $error if $error;
+  my ( $new, $old ) = ( shift, shift );
+  my $error;
 
-  $error = $new->rep($old);
+  $error = $new->SUPER::replace($old);
   return $error if $error;
 
-  ''; #no error
+  '';
 }
 
 =item suspend
 
 Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
 
-=cut
-
-sub suspend {
-  ''; #no error (stub)
-}
-
 =item unsuspend
 
 Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
 
-=cut
-
-sub unsuspend {
-  ''; #no error (stub)
-}
-
-
 =item cancel
 
-Just returns false (no error) for now.
-
 Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
 
-=cut
-
-sub cancel {
-  ''; #no error (stub)
-}
-
 =item check
 
 Checks all fields to make sure this is a valid example.  If there is
@@ -185,33 +134,12 @@ and repalce methods.
 =cut
 
 sub check {
-  my($self)=@_;
-  return "Not a svc_table record!" unless $self->table eq "svc_table";
-  my($recref) = $self->hashref;
-
-  $recref->{svcnum} =~ /^(\d+)$/ or return "Illegal svcnum";
-  $recref->{svcnum} = $1;
-
-  #get part_svc
-  my($svcpart);
-  my($svcnum)=$self->getfield('svcnum');
-  if ($svcnum) {
-    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
-    return "Unknown svcnum" unless $cust_svc; 
-    $svcpart=$cust_svc->svcpart;
-  } else {
-    $svcpart=$self->getfield('svcpart');
-  }
-  my($part_svc)=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  return "Unkonwn svcpart" unless $part_svc;
-
-  #set fixed fields from part_svc
-  my($field);
-  foreach $field ( fields('svc_acct') ) {
-    if ( $part_svc->getfield('svc_acct__'. $field. '_flag') eq 'F' ) {
-      $self->setfield($field,$part_svc->getfield('svc_acct__'. $field) );
-    }
-  }
+  my $self = shift;
+
+  my $x = $self->setfixed;
+  return $x unless ref($x);
+  my $part_svc = $x;
+
 
   ''; #no error
 }
@@ -220,7 +148,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: table_template-svc.pm,v 1.3 1998-12-29 11:59:56 ivan Exp $
+$Id: table_template-svc.pm,v 1.4 1998-12-30 00:30:48 ivan Exp $
 
 =head1 BUGS
 
@@ -228,16 +156,16 @@ The author forgot to customize this manpage.
 
 =head1 SEE ALSO
 
-L<FS::Record>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>, schema.html
-froom the base documentation.
+L<FS::svc_Common>, L<FS::Record>, L<FS::cust_svc>, L<FS::part_svc>,
+L<FS::cust_pkg>, schema.html from the base documentation.
 
 =head1 HISTORY
 
 ivan@voicenet.com 97-jul-21
 
 $Log: table_template-svc.pm,v $
-Revision 1.3  1998-12-29 11:59:56  ivan
-mostly properly OO, some work still to be done with svc_ stuff
+Revision 1.4  1998-12-30 00:30:48  ivan
+svc_ stuff is more properly OO - has a common superclass FS::svc_Common
 
 Revision 1.2  1998/11/15 04:33:01  ivan
 updates for newest versoin
-- 
cgit v1.2.1


From a3e720b5de05f45ab48d30d5fcfe07f1ef6c3a81 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 30 Dec 1998 00:57:50 +0000
Subject: bug

---
 htdocs/search/cust_main.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index 6241f3310..262c1579c 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.3 1998-12-17 09:41:08 ivan Exp $
+# $Id: cust_main.cgi,v 1.4 1998-12-30 00:57:50 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -19,7 +19,10 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.3  1998-12-17 09:41:08  ivan
+# Revision 1.4  1998-12-30 00:57:50  ivan
+# bug
+#
+# Revision 1.3  1998/12/17 09:41:08  ivan
 # s/CGI::(Base|Request)/CGI.pm/;
 #
 # Revision 1.2  1998/11/12 08:10:22  ivan
@@ -111,7 +114,7 @@ END
     }
 
     #my($rowspan) = scalar(@{$all_pkgs{$custnum}});
-    my($view) = popurl(2). "/view/cust_main.cgi?$custnum";
+    my($view) = popurl(2). "view/cust_main.cgi?$custnum";
     print <<END;
     <TR>
       <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$custnum</FONT></A></TD>
-- 
cgit v1.2.1


From d51c41b94bfa87d6c779ac666495151bf6fc3913 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 30 Dec 1998 23:03:34 +0000
Subject: bugfixes; fields isn't exported by derived classes

---
 TODO                                  |  5 +++--
 htdocs/browse/part_svc.cgi            | 11 +++++++----
 htdocs/edit/part_svc.cgi              | 11 +++++++----
 htdocs/edit/process/agent.cgi         | 11 +++++++----
 htdocs/edit/process/agent_type.cgi    | 11 +++++++----
 htdocs/edit/process/cust_pay.cgi      |  9 ++++++---
 htdocs/edit/process/part_pkg.cgi      | 11 +++++++----
 htdocs/edit/process/part_referral.cgi | 11 +++++++----
 htdocs/edit/process/part_svc.cgi      | 11 +++++++----
 htdocs/edit/process/svc_acct_pop.cgi  | 11 +++++++----
 htdocs/edit/svc_acct.cgi              | 11 +++++++----
 htdocs/edit/svc_acct_sm.cgi           | 11 +++++++----
 htdocs/edit/svc_domain.cgi            | 11 +++++++----
 htdocs/view/cust_bill.cgi             |  9 ++++++---
 htdocs/view/cust_main.cgi             | 11 +++++++----
 15 files changed, 99 insertions(+), 56 deletions(-)

diff --git a/TODO b/TODO
index 5c8e02cef..349b2bf12 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.17 1998-12-29 11:59:32 ivan Exp $
+$Id: TODO,v 1.18 1998-12-30 23:03:19 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,7 +6,8 @@ duplication of effort.
 
 -- 1.1.x --
 
-check all .pm's for numeric comparisons done as `eq'
+check all .pm's for numeric comparisons done as `eq' - works fine now because
+only used with integers that aren't space-padded.
 
 FS::cust_pkg _require_'s FS::$svc, but this won't work with %FS::UID::callback
 loading of configuration.  (pry need same idea, but will run immediately if
diff --git a/htdocs/browse/part_svc.cgi b/htdocs/browse/part_svc.cgi
index 983849f69..93864a422 100755
--- a/htdocs/browse/part_svc.cgi
+++ b/htdocs/browse/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.5 1998-12-17 05:25:21 ivan Exp $
+# $Id: part_svc.cgi,v 1.6 1998-12-30 23:03:20 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14, 97-dec-9
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.5  1998-12-17 05:25:21  ivan
+# Revision 1.6  1998-12-30 23:03:20  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.5  1998/12/17 05:25:21  ivan
 # fix visual and other bugs
 #
 # Revision 1.4  1998/11/21 02:26:22  ivan
@@ -27,8 +30,8 @@ use strict;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch);
-use FS::part_svc qw(fields);
+use FS::Record qw(qsearch fields);
+use FS::part_svc);
 use FS::CGI qw(header menubar popurl table);
 
 my($cgi) = new CGI;
diff --git a/htdocs/edit/part_svc.cgi b/htdocs/edit/part_svc.cgi
index 6fbe19428..9baaabfe0 100755
--- a/htdocs/edit/part_svc.cgi
+++ b/htdocs/edit/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.4 1998-12-17 06:17:07 ivan Exp $
+# $Id: part_svc.cgi,v 1.5 1998-12-30 23:03:21 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.4  1998-12-17 06:17:07  ivan
+# Revision 1.5  1998-12-30 23:03:21  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.4  1998/12/17 06:17:07  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 # Revision 1.3  1998/11/21 06:43:26  ivan
@@ -21,8 +24,8 @@ use strict;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs);
-use FS::part_svc qw(fields);
+use FS::Record qw(qsearchs fields);
+use FS::part_svc;
 use FS::CGI qw(header menubar popurl table);
 
 my($cgi) = new CGI;
diff --git a/htdocs/edit/process/agent.cgi b/htdocs/edit/process/agent.cgi
index 1bb5bbaae..b8f818675 100755
--- a/htdocs/edit/process/agent.cgi
+++ b/htdocs/edit/process/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.3 1998-12-17 08:40:16 ivan Exp $
+# $Id: agent.cgi,v 1.4 1998-12-30 23:03:26 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent.cgi,v $
-# Revision 1.3  1998-12-17 08:40:16  ivan
+# Revision 1.4  1998-12-30 23:03:26  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.3  1998/12/17 08:40:16  ivan
 # s/CGI::Request/CGI.pm/; etc
 #
 # Revision 1.2  1998/11/23 07:52:29  ivan
@@ -21,8 +24,8 @@ use strict;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::agent qw(fields);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::agent;
 use FS::CGI qw(idiot popurl);
 
 my($cgi)=new CGI;
diff --git a/htdocs/edit/process/agent_type.cgi b/htdocs/edit/process/agent_type.cgi
index c6f607d42..c796dd66d 100755
--- a/htdocs/edit/process/agent_type.cgi
+++ b/htdocs/edit/process/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.3 1998-12-17 08:40:17 ivan Exp $
+# $Id: agent_type.cgi,v 1.4 1998-12-30 23:03:27 ivan Exp $
 #
 # ivan@sisd.com 97-dec-11
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.3  1998-12-17 08:40:17  ivan
+# Revision 1.4  1998-12-30 23:03:27  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.3  1998/12/17 08:40:17  ivan
 # s/CGI::Request/CGI.pm/; etc
 #
 # Revision 1.2  1998/11/21 07:49:20  ivan
@@ -22,8 +25,8 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::CGI qw(idiot popurl);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::agent_type qw(fields);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::agent_type;
 use FS::type_pkgs;
 use FS::part_pkg;
 
diff --git a/htdocs/edit/process/cust_pay.cgi b/htdocs/edit/process/cust_pay.cgi
index 619a93a2a..ce7929a77 100755
--- a/htdocs/edit/process/cust_pay.cgi
+++ b/htdocs/edit/process/cust_pay.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pay.cgi,v 1.2 1998-12-17 08:40:22 ivan Exp $
+# $Id: cust_pay.cgi,v 1.3 1998-12-30 23:03:28 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_pay.cgi
@@ -15,7 +15,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_pay.cgi,v $
-# Revision 1.2  1998-12-17 08:40:22  ivan
+# Revision 1.3  1998-12-30 23:03:28  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.2  1998/12/17 08:40:22  ivan
 # s/CGI::Request/CGI.pm/; etc
 #
 
@@ -24,7 +27,7 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(idiot popurl);
-use FS::cust_pay qw(fields);
+use FS::cust_pay;
 
 my($cgi)=new CGI;
 &cgisuidsetup($cgi);
diff --git a/htdocs/edit/process/part_pkg.cgi b/htdocs/edit/process/part_pkg.cgi
index dca8f1374..d1f023df9 100755
--- a/htdocs/edit/process/part_pkg.cgi
+++ b/htdocs/edit/process/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.4 1998-12-17 08:40:24 ivan Exp $
+# $Id: part_pkg.cgi,v 1.5 1998-12-30 23:03:29 ivan Exp $
 #
 # process/part_pkg.cgi: Edit package definitions (process form)
 #
@@ -17,7 +17,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.4  1998-12-17 08:40:24  ivan
+# Revision 1.5  1998-12-30 23:03:29  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.4  1998/12/17 08:40:24  ivan
 # s/CGI::Request/CGI.pm/; etc
 #
 # Revision 1.3  1998/11/21 07:17:58  ivan
@@ -32,8 +35,8 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(eidiot popurl);
-use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg qw(fields);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::part_pkg;
 use FS::pkg_svc;
 use FS::cust_pkg;
 
diff --git a/htdocs/edit/process/part_referral.cgi b/htdocs/edit/process/part_referral.cgi
index 94d29c40e..998cd93db 100755
--- a/htdocs/edit/process/part_referral.cgi
+++ b/htdocs/edit/process/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_referral.cgi,v 1.2 1998-12-17 08:40:25 ivan Exp $
+# $Id: part_referral.cgi,v 1.3 1998-12-30 23:03:30 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_referral.cgi,v $
-# Revision 1.2  1998-12-17 08:40:25  ivan
+# Revision 1.3  1998-12-30 23:03:30  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.2  1998/12/17 08:40:25  ivan
 # s/CGI::Request/CGI.pm/; etc
 #
 
@@ -18,8 +21,8 @@ use strict;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs);
-use FS::part_referral qw(fields);
+use FS::Record qw(qsearchs fields);
+use FS::part_referral;
 use FS::CGI qw(popurl eidiot);
 
 my($cgi)=new CGI; # create form object
diff --git a/htdocs/edit/process/part_svc.cgi b/htdocs/edit/process/part_svc.cgi
index 0f67410ee..1298dbc4e 100755
--- a/htdocs/edit/process/part_svc.cgi
+++ b/htdocs/edit/process/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.3 1998-12-17 08:40:26 ivan Exp $
+# $Id: part_svc.cgi,v 1.4 1998-12-30 23:03:31 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.3  1998-12-17 08:40:26  ivan
+# Revision 1.4  1998-12-30 23:03:31  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.3  1998/12/17 08:40:26  ivan
 # s/CGI::Request/CGI.pm/; etc
 #
 # Revision 1.2  1998/11/21 06:43:08  ivan
@@ -21,8 +24,8 @@ use strict;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs);
-use FS::part_svc qw(fields);
+use FS::Record qw(qsearchs fields);
+use FS::part_svc;
 use FS::CGI qw(eidiot popurl);
 
 my($cgi)=new CGI; # create form object
diff --git a/htdocs/edit/process/svc_acct_pop.cgi b/htdocs/edit/process/svc_acct_pop.cgi
index 89cc75c35..8b0e60835 100755
--- a/htdocs/edit/process/svc_acct_pop.cgi
+++ b/htdocs/edit/process/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.2 1998-12-17 08:40:28 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.3 1998-12-30 23:03:32 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.2  1998-12-17 08:40:28  ivan
+# Revision 1.3  1998-12-30 23:03:32  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.2  1998/12/17 08:40:28  ivan
 # s/CGI::Request/CGI.pm/; etc
 #
 
@@ -18,8 +21,8 @@ use strict;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::svc_acct_pop qw(fields);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::svc_acct_pop;
 use FS::CGI qw(popurl eidiot);
 
 my($cgi)=new CGI; # create form object
diff --git a/htdocs/edit/svc_acct.cgi b/htdocs/edit/svc_acct.cgi
index dc9f6e91a..edb4a684e 100755
--- a/htdocs/edit/svc_acct.cgi
+++ b/htdocs/edit/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.3 1998-12-17 06:17:08 ivan Exp $
+# $Id: svc_acct.cgi,v 1.4 1998-12-30 23:03:22 ivan Exp $
 #
 # Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -18,7 +18,10 @@
 # use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.3  1998-12-17 06:17:08  ivan
+# Revision 1.4  1998-12-30 23:03:22  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.3  1998/12/17 06:17:08  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 
@@ -28,8 +31,8 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
 use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs);
-use FS::svc_acct qw(fields);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::svc_acct;
 use FS::Conf;
 
 my($cgi) = new CGI;
diff --git a/htdocs/edit/svc_acct_sm.cgi b/htdocs/edit/svc_acct_sm.cgi
index 7a1b946e0..be5350d84 100755
--- a/htdocs/edit/svc_acct_sm.cgi
+++ b/htdocs/edit/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.4 1998-12-23 02:58:45 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.5 1998-12-30 23:03:24 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct_sm.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -35,7 +35,10 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-26
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.4  1998-12-23 02:58:45  ivan
+# Revision 1.5  1998-12-30 23:03:24  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.4  1998/12/23 02:58:45  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.3  1998/12/17 06:17:11  ivan
@@ -51,8 +54,8 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs);
-use FS::svc_acct_sm qw(fields);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::svc_acct_sm;
 use FS::Conf;
 
 my($cgi) = new CGI;
diff --git a/htdocs/edit/svc_domain.cgi b/htdocs/edit/svc_domain.cgi
index 6373ebb48..2937ccea0 100755
--- a/htdocs/edit/svc_domain.cgi
+++ b/htdocs/edit/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.4 1998-12-23 03:00:16 ivan Exp $
+# $Id: svc_domain.cgi,v 1.5 1998-12-30 23:03:25 ivan Exp $
 #
 # Usage: svc_domain.cgi pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_domain.cgi?pkgnum{pkgnum}-svcpart{svcpart}
@@ -17,7 +17,10 @@
 # no GOV in instructions ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.4  1998-12-23 03:00:16  ivan
+# Revision 1.5  1998-12-30 23:03:25  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.4  1998/12/23 03:00:16  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.3  1998/12/17 06:17:12  ivan
@@ -33,8 +36,8 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
 use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs);
-use FS::svc_domain qw(fields);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::svc_domain;
 
 my($cgi) = new CGI;
 &cgisuidsetup($cgi);
diff --git a/htdocs/view/cust_bill.cgi b/htdocs/view/cust_bill.cgi
index 06fd2d76d..80aab187f 100755
--- a/htdocs/view/cust_bill.cgi
+++ b/htdocs/view/cust_bill.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_bill.cgi,v 1.3 1998-12-23 03:07:49 ivan Exp $
+# $Id: cust_bill.cgi,v 1.4 1998-12-30 23:03:33 ivan Exp $
 #
 # Note: Should be run setuid freeside as user nobody.
 #
@@ -25,7 +25,10 @@
 # also print 'printed' field ivan@sisd.com 98-jul-10
 #
 # $Log: cust_bill.cgi,v $
-# Revision 1.3  1998-12-23 03:07:49  ivan
+# Revision 1.4  1998-12-30 23:03:33  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.3  1998/12/23 03:07:49  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.2  1998/12/17 09:57:20  ivan
@@ -37,7 +40,7 @@ use IO::File;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl);
+use FS::CGI qw(header popurl menubar);
 use FS::Record qw(qsearchs);
 use FS::cust_bill;
 
diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index cc6983d70..8e6145519 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.6 1998-12-23 02:42:33 ivan Exp $
+# $Id: cust_main.cgi,v 1.7 1998-12-30 23:03:34 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -33,7 +33,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.6  1998-12-23 02:42:33  ivan
+# Revision 1.7  1998-12-30 23:03:34  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.6  1998/12/23 02:42:33  ivan
 # remove double '/' in link urls
 #
 # Revision 1.5  1998/12/23 02:36:28  ivan
@@ -247,7 +250,7 @@ print "</TABLE></CENTER>";
 print qq!<CENTER><HR><A NAME="history"><FONT SIZE=+1>Payment History!,
       qq!</FONT></A><BR>!,
       qq!Click on invoice to view invoice/enter payment.<BR>!,
-      qq!<A HREF="!, popurl(2), qq!/edit/cust_credit.cgi?$custnum">!,
+      qq!<A HREF="!, popurl(2), qq!edit/cust_credit.cgi?$custnum">!,
       qq!Post Credit / Refund</A></CENTER><BR>!;
 
 #get payment history
@@ -262,7 +265,7 @@ my($bill);
 foreach $bill (@bills) {
   my($bref)=$bill->hashref;
   push @history,
-    $bref->{_date} . qq!\t<A HREF="!. popurl(2). qq!/view/cust_bill.cgi?! .
+    $bref->{_date} . qq!\t<A HREF="!. popurl(2). qq!view/cust_bill.cgi?! .
     $bref->{invnum} . qq!">Invoice #! . $bref->{invnum} .
     qq! (Balance \$! . $bref->{owed} . qq!)</A>\t! .
     $bref->{charged} . qq!\t\t\t!;
-- 
cgit v1.2.1


From 915bc1e827ced3378a19d13407d12f1dd0e50420 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 30 Dec 1998 23:06:22 +0000
Subject: typo

---
 htdocs/browse/part_svc.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/browse/part_svc.cgi b/htdocs/browse/part_svc.cgi
index 93864a422..17308ffd5 100755
--- a/htdocs/browse/part_svc.cgi
+++ b/htdocs/browse/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.6 1998-12-30 23:03:20 ivan Exp $
+# $Id: part_svc.cgi,v 1.7 1998-12-30 23:06:22 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14, 97-dec-9
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.6  1998-12-30 23:03:20  ivan
+# Revision 1.7  1998-12-30 23:06:22  ivan
+# typo
+#
+# Revision 1.6  1998/12/30 23:03:20  ivan
 # bugfixes; fields isn't exported by derived classes
 #
 # Revision 1.5  1998/12/17 05:25:21  ivan
@@ -31,7 +34,7 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch fields);
-use FS::part_svc);
+use FS::part_svc;
 use FS::CGI qw(header menubar popurl table);
 
 my($cgi) = new CGI;
-- 
cgit v1.2.1


From 12c943571c30557b302edd6e74990877b859c261 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 31 Dec 1998 01:04:16 +0000
Subject: doc

---
 site_perl/part_pkg.pm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/site_perl/part_pkg.pm b/site_perl/part_pkg.pm
index 82c7aec28..4b6cc09a4 100644
--- a/site_perl/part_pkg.pm
+++ b/site_perl/part_pkg.pm
@@ -29,8 +29,8 @@ FS::part_pkg - Object methods for part_pkg objects
 
 =head1 DESCRIPTION
 
-An FS::part_pkg represents a billing item definition.  FS::part_pkg inherits
-from FS::Record.  The following fields are currently supported:
+An FS::part_pkg object represents a billing item definition.  FS::part_pkg
+inherits from FS::Record.  The following fields are currently supported:
 
 =over 4
 
@@ -129,10 +129,12 @@ sub check {
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.4 1998-12-29 11:59:48 ivan Exp $
+$Id: part_pkg.pm,v 1.5 1998-12-31 01:04:16 ivan Exp $
 
 =head1 BUGS
 
+It doesn't properly override FS::Record yet.
+
 The delete method is unimplemented.
 
 setup and recur semantics are not yet defined (and are implemented in
@@ -150,8 +152,8 @@ ivan@sisd.com 97-dec-5
 pod ivan@sisd.com 98-sep-21
 
 $Log: part_pkg.pm,v $
-Revision 1.4  1998-12-29 11:59:48  ivan
-mostly properly OO, some work still to be done with svc_ stuff
+Revision 1.5  1998-12-31 01:04:16  ivan
+doc
 
 Revision 1.3  1998/11/15 13:00:15  ivan
 bugfix in clone method, clone method doc clarification
-- 
cgit v1.2.1


From 1cbf7c33a30bd7accd36e856b7e2f2f80ae06cd3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 9 Jan 1999 05:38:34 +0000
Subject: *** empty log message ***

---
 CREDITS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CREDITS b/CREDITS
index 602e0788b..8b8baaf24 100644
--- a/CREDITS
+++ b/CREDITS
@@ -8,6 +8,9 @@ is also the creator of Freeside's elusive mascot, Snakeman.
 Jerry St. Pierre <jstpi@city.timmins.on.ca> did the "SISD" graphic used in
 1.0.x and most of 1.1.x.
 
+Mark Norris of Urban Design, Inc. <http://www.urban.com/> did the red "S"
+logo for later 1.1.x versions and 1.2.x
+
 Brian McCane? <bmccane@maxbaud.net> contributed PostgreSQL support, HTML
 style enhancements and many, many bugfixes.
 
-- 
cgit v1.2.1


From f85f184ed6243ddca8ea4710abee6e747640df56 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 16 Jan 1999 00:24:37 +0000
Subject: *** empty log message ***

---
 CREDITS | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CREDITS b/CREDITS
index 8b8baaf24..fc5988360 100644
--- a/CREDITS
+++ b/CREDITS
@@ -21,11 +21,7 @@ following Freeside features by contracting me for a custom billing system
 based on Freeside:
   - Multiple, separate databases and configurations on one box.
   - Per-customer pricing (custom packages)
-  - Optional customer titles, middle initials and EIN numbers
   - Internationalization wrt addresses (cust_main, cust_main_county)
-
-  - Integration with Radiator, http://www.open.com.au/radiator
-  - Integration with NetSurfer NetKit ISP, http://www.netsurfer.com/
 Thanks!
 
 Everything else is my (Ivan Kohler <ivan@sisd.com>) fault.
-- 
cgit v1.2.1


From 228a29352a267bd457ce372e7ee933c9b07e11fd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 17 Jan 1999 03:11:52 +0000
Subject: remove preliminary completehost changes

---
 bin/fs-setup | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 9f8740093..222ce1611 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.10 1998-12-16 06:05:38 ivan Exp $
+# $Id: fs-setup,v 1.11 1999-01-17 03:11:52 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.10  1998-12-16 06:05:38  ivan
+# Revision 1.11  1999-01-17 03:11:52  ivan
+# remove preliminary completehost changes
+#
+# Revision 1.10  1998/12/16 06:05:38  ivan
 # add table cust_main_invoice
 #
 # Revision 1.9  1998/12/15 04:36:29  ivan
@@ -341,9 +344,9 @@ sub tables_hash_hack {
       'columns' => [
         'custnum',  'int',  '',     '',
         'agentnum', 'int',  '',     '',
-        'titlenum', 'int',  'NULL',   '',
+#        'titlenum', 'int',  'NULL',   '',
         'last',     'varchar', '',     $char_d,
-        'middle',   'varchar', 'NULL', $char_d,
+#        'middle',   'varchar', 'NULL', $char_d,
         'first',    'varchar', '',     $char_d,
         'ss',       'char', 'NULL', 11,
         'company',  'varchar', 'NULL', $char_d,
@@ -497,15 +500,15 @@ sub tables_hash_hack {
       'index' => [ [] ],
     },
 
-    'part_title' => {
-      'columns' => [
-        'titlenum',   'int',    '',   '',
-        'title',      'varchar',   '',   $char_d,
-      ],
-      'primary_key' => 'titlenum',
-      'unique' => [ [] ],
-      'index' => [ [] ],
-    },
+#    'part_title' => {
+#      'columns' => [
+#        'titlenum',   'int',    '',   '',
+#        'title',      'varchar',   '',   $char_d,
+#      ],
+#      'primary_key' => 'titlenum',
+#      'unique' => [ [] ],
+#      'index' => [ [] ],
+#    },
 
     'pkg_svc' => {
       'columns' => [
-- 
cgit v1.2.1


From b86d2714e8d815a72ecfae2b65aa0ea200d84511 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 17 Jan 1999 03:13:40 +0000
Subject: s/Information/Freeside home page/;

---
 htdocs/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index 92d3ed1c2..c75dfe8d2 100755
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -14,7 +14,7 @@
     </td></tr>
   </table>
       <A HREF="http://www.sisd.com/freeside">
-        Information
+        Freeside home page
       </A>
       <BR><A HREF="docs/">
         Documentation
-- 
cgit v1.2.1


From e74e6d0896eae348d54dbd6e436f37a2a0e69389 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 17 Jan 1999 04:04:13 +0000
Subject: itable

---
 site_perl/CGI.pm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index b21a88837..a7856f8dd 100644
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -149,6 +149,16 @@ sub table {
   "<TABLE BORDER=1>";
 }
 
+=item itable
+
+Returns HTML tag for beginning an (invisible) table.
+
+=cut
+
+sub itable {
+  "<TABLE>";
+}
+
 =back
 
 =head1 BUGS
@@ -173,7 +183,10 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 pod ivan@sisd.com 98-sep-12
 
 $Log: CGI.pm,v $
-Revision 1.12  1998-12-23 02:23:16  ivan
+Revision 1.13  1999-01-17 04:04:13  ivan
+itable
+
+Revision 1.12  1998/12/23 02:23:16  ivan
 popurl always has trailing slash
 
 Revision 1.11  1998/11/12 07:43:54  ivan
-- 
cgit v1.2.1


From c93520accf00e15095e7af5fcb59caed2bd9e556 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Jan 1999 09:22:42 +0000
Subject: changes to track email addresses for email invoicing

---
 htdocs/browse/agent.cgi           |  20 +++-
 htdocs/docs/trouble.html          |   4 +-
 htdocs/docs/upgrade3.html         |  11 +-
 htdocs/edit/agent_type.cgi        |  11 +-
 htdocs/edit/cust_main.cgi         | 235 ++++++++++++++++++++++----------------
 htdocs/edit/process/cust_main.cgi |  70 +++++++-----
 htdocs/search/cust_pkg.cgi        |  27 ++---
 htdocs/search/svc_acct.cgi        |  17 ++-
 htdocs/view/cust_main.cgi         |   9 +-
 htdocs/view/svc_acct.cgi          |  21 +++-
 site_perl/CGI.pm                  |  28 +++--
 site_perl/Record.pm               |  13 ++-
 site_perl/UID.pm                  |  11 +-
 site_perl/cust_main.pm            |  48 +++++---
 site_perl/cust_main_invoice.pm    |  15 ++-
 15 files changed, 325 insertions(+), 215 deletions(-)

diff --git a/htdocs/browse/agent.cgi b/htdocs/browse/agent.cgi
index 1241ced03..442ea6ee0 100755
--- a/htdocs/browse/agent.cgi
+++ b/htdocs/browse/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.7 1998-12-17 05:25:16 ivan Exp $
+# $Id: agent.cgi,v 1.8 1999-01-18 09:22:26 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -15,7 +15,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent.cgi,v $
-# Revision 1.7  1998-12-17 05:25:16  ivan
+# Revision 1.8  1999-01-18 09:22:26  ivan
+# changes to track email addresses for email invoicing
+#
+# Revision 1.7  1998/12/17 05:25:16  ivan
 # fix visual and other bugs
 #
 # Revision 1.6  1998/11/23 05:29:46  ivan
@@ -43,6 +46,19 @@ use FS::CGI qw(header menubar table popurl);
 use FS::agent;
 use FS::agent_type;
 
+#Begin silliness
+
+use FS::UI::CGI;
+use FS::UI::agent;
+
+my $ui = new FS::UI::agent;
+$ui->browse;
+exit;
+
+#End silliness
+
+__END__
+
 my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
diff --git a/htdocs/docs/trouble.html b/htdocs/docs/trouble.html
index 2c5b92fd5..dcbe1bbd2 100644
--- a/htdocs/docs/trouble.html
+++ b/htdocs/docs/trouble.html
@@ -5,7 +5,7 @@
   <h1>Troubleshooting</h1>
   <ul>
     <li>When troubleshooting the web interface, helpful information is often in your web server's error log.
-    <li>Internet Explorer will not work with Freeside's HTML interface. 
+    <li>Internet Explorer will not work with Freeside's HTML interface.  <b>This may be fixed in >1.2, please report your experiences!</b>
 <a HREF="http://www.netscape.com">Netscape</a>,                                 
 <a HREF="http://lynx.browser.org">Lynx</a>, and                                 
 <a HREF="http://www.cs.indiana.edu/elisp/w3/docs.html">Emacs/W3</a>,            
@@ -17,7 +17,7 @@ Ambiguous use of value => resolved to "value" =>
 at /usr/lib/perl5/site_perl/File/CounterFile.pm line 132.
 </pre>
         This clutters up your log files but is otherwise harmless.  Upgrade to the latest File::CounterFile. 
-    <li>If you get an Internal Server Error when adding or editing, but find that the update has occured, and you get something like the following in your web server's error log:
+    <li><b>(No longer applicable in >1.2!)</b> If you get an Internal Server Error when adding or editing, but find that the update has occured, and you get something like the following in your web server's error log:
 <pre>
 access to <i>/your/path</i>/edit/process/<i>some_table</i>.cgi failed for
 <i>machine.domain.tld</i>, reason: malformed header from script.
diff --git a/htdocs/docs/upgrade3.html b/htdocs/docs/upgrade3.html
index d2795bdb2..539fe5d82 100644
--- a/htdocs/docs/upgrade3.html
+++ b/htdocs/docs/upgrade3.html
@@ -14,18 +14,19 @@
   <li>Move /var/spool/freeside/export to /usr/local/etc/freeside/export.<i>datasrc</i>.
   <li>Apply the following changes to your database:
 <pre>
-ALTER TABLE cust_main ADD middle varchar(80) NULL;
+<!-- ALTER TABLE cust_main ADD middle varchar(80) NULL;
 ALTER TABLE cust_main ADD titlenum int NULL;
-ALTER TABLE cust_main CHANGE state state varchar(80) NULL;
+-->ALTER TABLE cust_main CHANGE state state varchar(80) NULL;
 ALTER TABLE cust_main_county CHANGE state state varchar(80) NULL;
 ALTER TABLE cust_main_county ADD country char(2);
-UPDATE cust_main_county SET country = "US" where country IS NULL;
-CREATE TABLE part_title (
+UPDATE cust_main SET country = "US" where country IS NULL OR country = '';
+UPDATE cust_main_county SET country = "US" where country IS NULL OR country = "";
+<!--CREATE TABLE part_title (
    titlenum int NOT NULL,
    title varchar(80) NOT NULL,
    PRIMARY KEY (titlenum)
 );
-CREATE TABLE cust_main_invoice (
+-->CREATE TABLE cust_main_invoice (
    destnum int NOT NULL,
    custnum int NOT NULL,
    dest varchar(80) NOT NULL,
diff --git a/htdocs/edit/agent_type.cgi b/htdocs/edit/agent_type.cgi
index d9c0851aa..9bfc37429 100755
--- a/htdocs/edit/agent_type.cgi
+++ b/htdocs/edit/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.6 1998-12-17 06:16:58 ivan Exp $
+# $Id: agent_type.cgi,v 1.7 1999-01-18 09:22:29 ivan Exp $
 #
 # agent_type.cgi: Add/Edit agent type (output form)
 #
@@ -13,7 +13,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.6  1998-12-17 06:16:58  ivan
+# Revision 1.7  1999-01-18 09:22:29  ivan
+# changes to track email addresses for email invoicing
+#
+# Revision 1.6  1998/12/17 06:16:58  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 # Revision 1.5  1998/11/21 07:58:27  ivan
@@ -46,7 +49,9 @@ my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
 my($agent_type,$action);
-if ( $cgi->keywords =~ /^(\d+)$/ ) { #editing
+if ( $cgi->keywords ) { #editing
+  my( $query ) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
   $agent_type=qsearchs('agent_type',{'typenum'=>$1});
   $action='Edit';
 } else { #adding
diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 19db4a907..d712f7649 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.4 1998-12-23 08:08:15 ivan Exp $
+# $Id: cust_main.cgi,v 1.5 1999-01-18 09:22:30 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -40,7 +40,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.4  1998-12-23 08:08:15  ivan
+# Revision 1.5  1999-01-18 09:22:30  ivan
+# changes to track email addresses for email invoicing
+#
+# Revision 1.4  1998/12/23 08:08:15  ivan
 # fix typo
 #
 # Revision 1.3  1998/12/17 06:17:00  ivan
@@ -48,71 +51,63 @@
 #
 
 use strict;
-use CGI;
+use CGI::Switch;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header popurl);
+use FS::CGI qw(header popurl itable table);
 use FS::cust_main;
 
-my($cgi) = new CGI;
-
+my $cgi = new CGI;
 cgisuidsetup($cgi);
 
 #get record
-my($custnum,$action,$cust_main);
-my($query) = $cgi->keywords;
-if ( $query =~ /^(\d+)$/ ) { #editing
+
+my ( $custnum, $action, $cust_main );
+if ( $cgi->keywords ) { #editing
+  my( $query ) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
   $custnum=$1;
-  $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
+  $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
   $action='Edit';
 } else {
   $custnum='';
-  $cust_main = create FS::cust_main ( {} );
+  $cust_main = new FS::cust_main ( {} );
   $cust_main->setfield('otaker',&getotaker);
   $action='Add';
 }
 
+# top
+
 my $p1 = popurl(1);
-print $cgi->header, header("Customer $action", ''), <<END;
-    <FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST>
-    <PRE>
-END
+print $cgi->header, header("Customer $action", ''),
+      qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST>!,
+      qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!,
+      qq!Customer # !, ( $custnum ? $custnum : " (NEW)" ),
+      
+;
 
-print qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!,
-      qq!Customer #<FONT SIZE="+1"><B>!;
-print $custnum ? $custnum : " (NEW)" , "</B></FONT>";
+# agent
 
-#agentnum
-my($agentnum)=$cust_main->agentnum || 1; #set to first agent by default
 my @agents = qsearch( 'agent', {} );
-print qq!\n\nAgent # <SELECT NAME="agentnum" SIZE="1">!;
-my($agent);
-foreach $agent (sort {
-  $a->agent cmp $b->agent;
-} @agents) {
-    print "<OPTION" . " SELECTED"x($agent->agentnum==$agentnum),
-    ">", $agent->agentnum,": ", $agent->agent, "\n";
-}
-print "</SELECT>";
-
-#referral
-#unless ($custnum) {
-  my($refnum)=$cust_main->refnum || 0; #to avoid "arguement not numeric" error
-  my(@referrals) = qsearch('part_referral',{});
-  print qq!\nReferral <SELECT NAME="refnum" SIZE="1">!;
-  print "<OPTION> \n";
-  my($referral);
-  foreach $referral (sort {
-    $a->refnum <=> $b->refnum;
-  } @referrals) {
-    print "<OPTION" . " SELECTED"x($referral->refnum==$refnum),
-    ">", $referral->refnum, ": ", $referral->referral,"\n";
+my $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
+if ( scalar(@agents) == 1 ) {
+  print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!;
+} else {
+  print qq!<BR><BR>Agent <SELECT NAME="agentnum" SIZE="1">!;
+  my $agent;
+  foreach $agent (sort {
+    $a->agent cmp $b->agent;
+  } @agents) {
+      print "<OPTION" . " SELECTED"x($agent->agentnum==$agentnum),
+      ">", $agent->agentnum,": ", $agent->agent;
   }
   print "</SELECT>";
-#}
+}
 
-my($last,$first,$ss,$company,$address1,$address2,$city)=(
+# contact info
+
+my($last,$first,$ss,$company,$address1,$address2,$city,$zip)=(
   $cust_main->last,
   $cust_main->first,
   $cust_main->ss,
@@ -120,18 +115,18 @@ my($last,$first,$ss,$company,$address1,$address2,$city)=(
   $cust_main->address1,
   $cust_main->address2,
   $cust_main->city,
+  $cust_main->zip,
 );
 
-print <<END;
-
-
-Name (last)<INPUT TYPE="text" NAME="last" VALUE="$last"> (first)<INPUT TYPE="text" NAME="first" VALUE="$first">  SS# <INPUT TYPE="text" NAME="ss" VALUE="$ss" SIZE=11 MAXLENGTH=11>
-Company <INPUT TYPE="text" NAME="company" VALUE="$company">
-Address <INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=40 MAXLENGTH=40>
-        <INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=40 MAXLENGTH=40>
-City <INPUT TYPE="text" NAME="city" VALUE="$city">  State (county) / Country<SELECT NAME="state" SIZE="1">
+print "<BR><BR>Contact information", itable("#c0c0c0"), <<END;
+<TR><TH ALIGN="right">Contact name<BR>(last, first)</TH><TD COLSPAN=3><INPUT TYPE="text" NAME="last" VALUE="$last">, <INPUT TYPE="text" NAME="first" VALUE="$first"></TD><TD ALIGN="right">SS#</TD><TD><INPUT TYPE="text" NAME="ss" VALUE="$ss" SIZE=11></TD></TR>
+<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="company" VALUE="$company" SIZE=70></TD></TR>
+<TR><TH ALIGN="right">Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=70></TH></TR>
+<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=70></TD></TR>
+<TR><TH ALIGN="right">City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"><TH ALIGN="right">State/Country</TH><TD><SELECT NAME="state" SIZE="1">
 END
 
+$cust_main->country('US') unless $cust_main->country; #eww
 foreach ( qsearch('cust_main_county',{}) ) {
   print "<OPTION";
   print " SELECTED" if ( $cust_main->state eq $_->state
@@ -142,73 +137,115 @@ foreach ( qsearch('cust_main_county',{}) ) {
   print " (",$_->county,")" if $_->county;
   print " / ", $_->country;
 }
-print "</SELECT>";
+print qq!</SELECT></TD><TH>Zip</TH><TD><INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10></TD></TR>!;
 
-my($zip,$daytime,$night,$fax)=(
-  $cust_main->zip,
+my($daytime,$night,$fax)=(
   $cust_main->daytime,
   $cust_main->night,
   $cust_main->fax,
 );
 
 print <<END;
-  Zip <INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10 MAXLENGTH=10>
-
-Phone (daytime)<INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18 MAXLENGTH=20>  (night)<INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18 MAXLENGTH=20>  (fax)<INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12 MAXLENGTH=12>
-
+<TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18></TD></TR>
+<TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18></TD></TR>
+<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12></TD></TR>
 END
 
-my(%payby)=(
-  'CARD' => "Credit card    ",
-  'BILL' => "Billing    ",
-  'COMP' => "Complimentary",
-);
-for (qw(CARD BILL COMP)) {
-  print qq!<INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
-  print qq! CHECKED! if ($cust_main->payby eq "$_");
-  print qq!>$payby{$_}!;
-}
+print "</TABLE>";
 
+# billing info
 
-my($payinfo,$payname,$otaker)=(
-  $cust_main->payinfo,
-  $cust_main->payname,
-  $cust_main->otaker,
-);
+sub expselect {
+  my $prefix = shift;
+  my $date = shift || '';
+  my( $m, $y ) = ( 0, 0 );
+  if ( $date  =~ /^(\d{4})-(\d{2})-\d{2}$/ ) { #PostgreSQL date format
+    ( $m, $y ) = ( $2, $1 );
+  } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+    ( $m, $y ) = ( $1, $3 );
+  }
+  my $return = qq!<SELECT NAME="$prefix!. qq!_month" SIZE="1">!;
+  for ( 1 .. 12 ) {
+    $return .= "<OPTION";
+    $return .= " SELECTED" if $_ == $m;
+    $return .= ">$_";
+  }
+  $return .= qq!</SELECT>/<SELECT NAME="$prefix!. qq!_year" SIZE="1">!;
+  for ( 1999 .. 2037 ) {
+    $return .= "<OPTION";
+    $return .= " SELECTED" if $_ == $y;
+    $return .= ">$_";
+  }
+  $return .= "</SELECT>";
 
-my($paydate);
-if ( $cust_main->paydate =~ /^(\d{4})-(\d{2})-\d{2}$/ ) {
-  $paydate="$2/$1"
-} elsif ( $cust_main->paydate =~ /^(\d{2})-\d{2}-(\d{4}$)/ ) {
-  $paydate="$1/$2"
-}
-else {
-  $paydate='';
+  $return;
 }
 
-print <<END;
+print "<BR>Billing information", itable("#c0c0c0"),
+      qq!<TR><TD><INPUT TYPE="checkbox" NAME="tax" VALUE="Y"!;
+print qq! CHECKED! if $cust_main->tax eq "Y";
+print qq!>Tax Exempt!;
+print qq!</TD></TR><TR><TD><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
+my @invoicing_list = $cust_main->invoicing_list;
+print qq! CHECKED!
+  if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
+print qq!> Postal mail invoice!;
+my $invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
+print qq!</TD></TR><TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD>!;
 
-  Card number ,   P.O. #   or   Authorization    <INPUT TYPE="text" NAME="payinfo" VALUE="$payinfo" SIZE=19 MAXLENGTH=19>
-END
+print "</TD></TR></TABLE>";
 
-print qq!Exp. date (MM/YY or MM/YYYY)<INPUT TYPE="text" NAME="paydate" VALUE="$paydate" SIZE=8 MAXLENGTH=7>    Billing name <INPUT TYPE="text" NAME="payname" VALUE="$payname">\n<INPUT TYPE="checkbox" NAME="tax" VALUE="Y"!;
-print qq! CHECKED! if $cust_main->tax eq "Y";
-print qq!> Tax Exempt!;
+print table("#c0c0c0"), "<TR>";
 
-print <<END;
+my($payinfo, $payname)=(
+  $cust_main->payinfo,
+  $cust_main->payname,
+);
 
+my %payby = (
+  'CARD' => qq!Credit card<BR><INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>Exp !. expselect("CARD"). qq!<BR>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>Exp !. expselect("BILL", "12-2037"). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
+  'COMP' => qq!Complimentary<BR>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>Exp !. expselect("COMP"),
+);
+my %paybychecked = (
+  'CARD' => qq!Credit card<BR><INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+  'COMP' => qq!Complimentary<BR>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>Exp !. expselect("COMP", $cust_main->paydate),
+);
+for (qw(CARD BILL COMP)) {
+  print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
+  if ($cust_main->payby eq "$_") {
+    print qq! CHECKED> $paybychecked{$_}</TD>!;
+  } else {
+    print qq!> $payby{$_}</TD>!;
+  }
+}
 
-Order taken by: <FONT SIZE="+1"><B>$otaker</B></FONT><INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">
-</PRE>
-END
+print "</TR></TABLE>";
 
-print qq!<CENTER><INPUT TYPE="submit" VALUE="!,
-      $custnum ?  "Apply Changes" : "Add Customer", qq!"></CENTER>!;
+#referral
 
-print <<END;
+my $refnum = $cust_main->refnum || 0;
+if ( $custnum ) {
+  print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
+} else {
+  my(@referrals) = qsearch('part_referral',{});
+  print qq!<BR>Referral <SELECT NAME="refnum" SIZE="1">!;
+  print "<OPTION> ";
+  my($referral);
+  foreach $referral (sort {
+    $a->refnum <=> $b->refnum;
+  } @referrals) {
+    print "<OPTION" . " SELECTED"x($referral->refnum==$refnum),
+    ">", $referral->refnum, ": ", $referral->referral;
+  }
+  print "</SELECT>";
+}
 
-    </FORM>
-  </BODY>
-</HTML>
-END
+my $otaker = $cust_main->otaker;
+print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!,
+      qq!<BR><BR><INPUT TYPE="submit" VALUE="!,
+      $custnum ?  "Apply Changes" : "Add Customer", qq!">!,
+      "</FORM></BODY></HTML>",
+;
 
diff --git a/htdocs/edit/process/cust_main.cgi b/htdocs/edit/process/cust_main.cgi
index 8404ba894..f65665142 100755
--- a/htdocs/edit/process/cust_main.cgi
+++ b/htdocs/edit/process/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.3 1998-12-17 08:40:19 ivan Exp $
+# $Id: cust_main.cgi,v 1.4 1999-01-18 09:22:32 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -22,7 +22,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.3  1998-12-17 08:40:19  ivan
+# Revision 1.4  1999-01-18 09:22:32  ivan
+# changes to track email addresses for email invoicing
+#
+# Revision 1.3  1998/12/17 08:40:19  ivan
 # s/CGI::Request/CGI.pm/; etc
 #
 # Revision 1.2  1998/11/18 08:57:36  ivan
@@ -30,60 +33,71 @@
 #
 
 use strict;
+#use CGI;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
+use FS::UID qw(cgisuidsetup getotaker);
 use FS::CGI qw(eidiot popurl);
-use FS::Record qw(qsearchs);
+use FS::Record qw(qsearchs fields);
 use FS::cust_main;
 
 my($cgi)=new CGI;
-
 &cgisuidsetup($cgi);
 
-#create new record object
+#unmunge stuff
 
-#unmunge agentnum
-$cgi->param('agentnum', 
-  (split(/:/, ($cgi->param('agentnum'))[0] ))[0]
-);
+$cgi->param('agentnum', (split(/:/, ($cgi->param('agentnum'))[0] ))[0] );
 
-#unmunge tax
 $cgi->param('tax','') unless defined($cgi->param('tax'));
 
-#unmunge refnum
-$cgi->param('refnum',
-  (split(/:/, ($cgi->param('refnum'))[0] ))[0]
-);
+$cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
 
-#unmunge state/county/country
 $cgi->param('state') =~ /^(\w+)( \((\w+)\))? \/ (\w+)$/;
 $cgi->param('state', $1);
 $cgi->param('county', $3 || '');
 $cgi->param('country', $4);
 
-my($new) = create FS::cust_main ( {
+my $payby = $cgi->param('payby');
+$cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
+$cgi->param('paydate',
+  $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
+$cgi->param('payname', $cgi->param( $payby. '_payname' ) );
+
+$cgi->param('otaker', &getotaker );
+
+my @invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
+push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
+
+#create new record object
+
+my($new) = new FS::cust_main ( {
   map {
     $_, scalar($cgi->param($_))
-  } qw(custnum agentnum last first ss company address1 address2 city county
-       state zip daytime night fax payby payinfo paydate payname tax
-       otaker refnum)
+#  } qw(custnum agentnum last first ss company address1 address2 city county
+#       state zip daytime night fax payby payinfo paydate payname tax
+#       otaker refnum)
+  } fields('cust_main')
 } );
 
+#perhaps the invocing_list magic should move to cust_main.pm?
 if ( $new->custnum eq '' ) {
-
-  my($error)=$new->insert;
+  my $error;
+  $error = $new->check_invoicing_list( \@invoicing_list );
+  &ediot($error) if $error;
+  $error = $new->insert;
   &eidiot($error) if $error;
-
+  $new->invoicing_list( \@invoicing_list );
 } else { #create old record object
-
-  my($old) = qsearchs( 'cust_main', { 'custnum', $new->custnum } ); 
+  my $error;
+  my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } ); 
   &eidiot("Old record not found!") unless $old;
-  my($error)=$new->replace($old);
+  $error = $new->check_invoicing_list( \@invoicing_list );
   &eidiot($error) if $error;
-
+  $error = $new->replace($old);
+  &eidiot($error) if $error;
+  $new->invoicing_list( \@invoicing_list );
 }
 
-my($custnum)=$new->custnum;
+my $custnum = $new->custnum;
 print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#cust_main");
 
diff --git a/htdocs/search/cust_pkg.cgi b/htdocs/search/cust_pkg.cgi
index d1db3747a..c198a56b6 100755
--- a/htdocs/search/cust_pkg.cgi
+++ b/htdocs/search/cust_pkg.cgi
@@ -1,11 +1,14 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.3 1998-12-23 03:05:59 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.4 1999-01-18 09:22:33 ivan Exp $
 #
 # based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.3  1998-12-23 03:05:59  ivan
+# Revision 1.4  1999-01-18 09:22:33  ivan
+# changes to track email addresses for email invoicing
+#
+# Revision 1.3  1998/12/23 03:05:59  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.2  1998/12/17 09:41:09  ivan
@@ -65,8 +68,7 @@ if ( scalar(@cust_pkg) == 1 ) {
   exit;
 } else {
   my($total)=scalar(@cust_pkg);
-  CGI::Base::SendHeaders(); # one guess
-  print header('Package Search Results',''), <<END;
+  print $cgi->header, header('Package Search Results',''), <<END;
     $total matching packages found
     <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
       <TR>
@@ -77,8 +79,6 @@ if ( scalar(@cust_pkg) == 1 ) {
       </TR>
 END
 
-  my($lines)=16;
-  my($lcount)=$lines;
   my(%saw,$cust_pkg);
   foreach $cust_pkg (
     sort $sortby grep(!$saw{$_->pkgnum}++, @cust_pkg)
@@ -98,20 +98,7 @@ END
       <TD><FONT SIZE=-1>$company</FONT></TD>
     </TR>
 END
-    if ($lcount-- == 0) { # lots of little tables instead of one big one
-      $lcount=$lines;
-      print <<END;   
-  </TABLE>
-  <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
-    <TR>
-        <TH>Package #</TH>
-        <TH>Customer #</TH>
-        <TH>Name</TH>
-        <TH>Company</TH>
-      <TH>
-    </TR>
-END
-    }
+
   }
  
   print <<END;
diff --git a/htdocs/search/svc_acct.cgi b/htdocs/search/svc_acct.cgi
index 0afdb1a26..75fbcb9b7 100755
--- a/htdocs/search/svc_acct.cgi
+++ b/htdocs/search/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.3 1998-12-23 03:06:28 ivan Exp $
+# $Id: svc_acct.cgi,v 1.4 1999-01-18 09:22:34 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
@@ -23,7 +23,10 @@
 # give service and customer info too ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.3  1998-12-23 03:06:28  ivan
+# Revision 1.4  1999-01-18 09:22:34  ivan
+# changes to track email addresses for email invoicing
+#
+# Revision 1.3  1998/12/23 03:06:28  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.2  1998/12/17 09:41:10  ivan
@@ -36,6 +39,8 @@ use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header idiot popurl);
+use FS::svc_acct;
+use FS::cust_main;
 
 my($cgi)=new CGI;
 &cgisuidsetup($cgi);
@@ -43,6 +48,7 @@ my($cgi)=new CGI;
 my(@svc_acct,$sortby);
 
 my($query)=$cgi->keywords;
+$query ||= ''; #to avoid use of unitialized value errors
 #this tree is a little bit redundant
 if ( $query eq 'svcnum' ) {
   $sortby=\*svcnum_sort;
@@ -84,7 +90,7 @@ if ( scalar(@svc_acct) == 1 ) {
   exit;
 } else {
   my($total)=scalar(@svc_acct);
-  print $cgi->header("Account Search Results",''), <<END;
+  print $cgi->header, header("Account Search Results",''), <<END;
     $total matching accounts found
     <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
       <TR>
@@ -128,7 +134,8 @@ END
       ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\"><FONT SIZE=-1>$custnum</FONT></A>"
       : "<I>(unlinked)</I>"
     ;
-    my($pname) = $custnum ? "$last, $first" : '';
+    my($pname) = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$last, $first</A>" : '';
+    my $pcompany = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$company</A>" : '';
     print <<END;
     <TR>
       <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
@@ -137,7 +144,7 @@ END
       <TD><FONT SIZE=-1>$svc</FONT></TH>
       <TD><FONT SIZE=-1>$pcustnum</FONT></TH>
       <TD><FONT SIZE=-1>$pname<FONT></TH>
-      <TD><FONT SIZE=-1>$company</FONT></TH>
+      <TD><FONT SIZE=-1>$pcompany</FONT></TH>
     </TR>
 END
 
diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index 8e6145519..0f7a3f4d3 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.7 1998-12-30 23:03:34 ivan Exp $
+# $Id: cust_main.cgi,v 1.8 1999-01-18 09:22:35 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -33,7 +33,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.7  1998-12-30 23:03:34  ivan
+# Revision 1.8  1999-01-18 09:22:35  ivan
+# changes to track email addresses for email invoicing
+#
+# Revision 1.7  1998/12/30 23:03:34  ivan
 # bugfixes; fields isn't exported by derived classes
 #
 # Revision 1.6  1998/12/23 02:42:33  ivan
@@ -100,7 +103,7 @@ print qq!<HR><CENTER><A HREF="!, popurl(2), qq!/misc/bill.cgi?$custnum">!,
 #formatting
 print qq!<HR><A NAME="cust_main"><CENTER><FONT SIZE=+1>Customer Information!,
       qq!</FONT>!,
-      qq!<BR><A HREF="!, popurl(2), qq!/edit/cust_main.cgi?$custnum!,
+      qq!<BR><A HREF="!, popurl(2), qq!edit/cust_main.cgi?$custnum!,
       qq!">Edit this information</A></CENTER><FONT SIZE=-1>!;
 
 #agentnum
diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi
index e658d2bb8..66ae2d1e9 100755
--- a/htdocs/view/svc_acct.cgi
+++ b/htdocs/view/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.4 1998-12-23 03:09:19 ivan Exp $
+# $Id: svc_acct.cgi,v 1.5 1999-01-18 09:22:36 ivan Exp $
 #
 # Usage: svc_acct.cgi svcnum
 #        http://server.name/path/svc_acct.cgi?svcnum
@@ -35,7 +35,10 @@
 # displays arbitrary radius attributes ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.4  1998-12-23 03:09:19  ivan
+# Revision 1.5  1999-01-18 09:22:36  ivan
+# changes to track email addresses for email invoicing
+#
+# Revision 1.4  1998/12/23 03:09:19  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.3  1998/12/17 09:57:23  ivan
@@ -46,12 +49,18 @@
 #
 
 use strict;
-use vars qw($conf);
+use vars qw( $conf );
 use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs fields);
+use CGI::Carp qw( fatalsToBrowser );
+use FS::UID qw( cgisuidsetup );
+use FS::CGI qw( header popurl );
+use FS::Record qw( qsearchs fields );
 use FS::Conf;
+use FS::svc_acct;
+use FS::cust_svc;
+use FS::cust_pkg;
+use FS::part_svc;
+use FS::svc_acct_pop;
 
 my($cgi) = new CGI;
 &cgisuidsetup($cgi);
diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index a7856f8dd..136a05cf7 100644
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -9,7 +9,7 @@ use CGI::Carp qw(fatalsToBrowser);
 use FS::UID;
 
 @ISA = qw(Exporter);
-@EXPORT_OK = qw(header menubar idiot eidiot popurl table);
+@EXPORT_OK = qw(header menubar idiot eidiot popurl table itable);
 
 =head1 NAME
 
@@ -45,21 +45,21 @@ Returns an HTML header.
 sub header {
   my($title,$menubar)=@_;
 
-  <<END;
+  my $x =  <<END;
     <HTML>
       <HEAD>
         <TITLE>
           $title
         </TITLE>
       </HEAD>
-      <BODY BGCOLOR="#ffffff">
+      <BODY BGCOLOR="#e8e8e8">
           <FONT COLOR="#FF0000" SIZE=7>
             $title
           </FONT>
           <BR><BR>
-          $menubar
-      <BR><BR>
 END
+  $x .=  $menubar. "<BR><BR>" if $menubar;
+  $x;
 }
 
 =item menubar ITEM, URL, ...
@@ -146,7 +146,12 @@ Returns HTML tag for beginning a table.
 =cut
 
 sub table {
-  "<TABLE BORDER=1>";
+  my $col = shift;
+  if ( $col ) {
+    "<TABLE BGCOLOR=$col BORDER=1 WIDTH=\"100%\">";
+  } else { 
+    "<TABLE BORDER=1>";
+  }
 }
 
 =item itable
@@ -156,7 +161,12 @@ Returns HTML tag for beginning an (invisible) table.
 =cut
 
 sub itable {
-  "<TABLE>";
+  my $col = shift;
+  if ( $col ) {
+    qq!<TABLE BGCOLOR=$col BORDER=0 CELLSPACING=0 WIDTH=\"100%\">!;
+  } else {
+    "<TABLE>";
+  }
 }
 
 =back
@@ -183,8 +193,8 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 pod ivan@sisd.com 98-sep-12
 
 $Log: CGI.pm,v $
-Revision 1.13  1999-01-17 04:04:13  ivan
-itable
+Revision 1.14  1999-01-18 09:22:37  ivan
+changes to track email addresses for email invoicing
 
 Revision 1.12  1998/12/23 02:23:16  ivan
 popurl always has trailing slash
diff --git a/site_perl/Record.pm b/site_perl/Record.pm
index 0f098b471..81574131e 100644
--- a/site_perl/Record.pm
+++ b/site_perl/Record.pm
@@ -166,7 +166,7 @@ sub qsearch {
     ? " WHERE ". join(' AND ',
       map {
         $record->{$_} eq ''
-          ? "$_ IS NULL"
+          ? "( $_ IS NULL OR $_ = \"\" )"
           : "$_ = ". _quote($record->{$_},$table,$_)
       } @fields
     ) : ''
@@ -383,7 +383,7 @@ sub delete {
   my($statement)="DELETE FROM ". $self->table. " WHERE ". join(' AND ',
     map {
       $self->getfield($_) eq ''
-        ? "$_ IS NULL"
+        ? "( $_ IS NULL OR $_ = \"\" )"
         : "$_ = ". _quote($self->getfield($_),$self->table,$_)
     } ( $self->dbdef_table->primary_key )
           ? ( $self->dbdef_table->primary_key)
@@ -450,7 +450,7 @@ sub replace {
     join(' AND ',
       map {
         $old->getfield($_) eq ''
-          ? "$_ IS NULL"
+          ? "( $_ IS NULL OR $_ = \"\" )"
           : "$_ = ". _quote($old->getfield($_),$old->table,$_)
       } ( $primary_key ? ( $primary_key ) : $old->fields )
     )
@@ -805,7 +805,7 @@ sub hfields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.10 1998-12-29 11:59:33 ivan Exp $
+$Id: Record.pm,v 1.11 1999-01-18 09:22:38 ivan Exp $
 
 =head1 BUGS
 
@@ -927,7 +927,10 @@ added pod documentation ivan@sisd.com 98-sep-6
 ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
 $Log: Record.pm,v $
-Revision 1.10  1998-12-29 11:59:33  ivan
+Revision 1.11  1999-01-18 09:22:38  ivan
+changes to track email addresses for email invoicing
+
+Revision 1.10  1998/12/29 11:59:33  ivan
 mostly properly OO, some work still to be done with svc_ stuff
 
 Revision 1.9  1998/11/21 07:26:45  ivan
diff --git a/site_perl/UID.pm b/site_perl/UID.pm
index 156bd3024..c141cab63 100644
--- a/site_perl/UID.pm
+++ b/site_perl/UID.pm
@@ -78,7 +78,7 @@ sub adminsuidsetup {
                           'ChopBlanks' => 'true',
   } ) or die "DBI->connect error: $DBI::errstr\n";
 
-  swapuid(); #go to non-privledged user if running setuid freeside
+  #swapuid(); #go to non-privledged user if running setuid freeside
 
   foreach ( keys %callback ) {
     &{$callback{$_}};
@@ -200,7 +200,7 @@ Swaps real and effective UIDs.
 =cut
 
 sub swapuid {
-  ($<,$>) = ($>,$<);
+  ($<,$>) = ($>,$<) if $< != $>;
 }
 
 =item getsecrets [ USER ]
@@ -241,7 +241,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.6 1998-11-15 05:27:48 ivan Exp $
+$Id: UID.pm,v 1.7 1999-01-18 09:22:40 ivan Exp $
 
 =head1 BUGS
 
@@ -287,7 +287,10 @@ inlined suidsetup
 ivan@sisd.com 98-sep-12
 
 $Log: UID.pm,v $
-Revision 1.6  1998-11-15 05:27:48  ivan
+Revision 1.7  1999-01-18 09:22:40  ivan
+changes to track email addresses for email invoicing
+
+Revision 1.6  1998/11/15 05:27:48  ivan
 bugfix for new configuration layout
 
 Revision 1.5  1998/11/15 00:51:51  ivan
diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index 77ebb2d04..979b6f4d6 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -203,7 +203,8 @@ sub check {
   my $self = shift;
 
   my $error =
-    $self->ut_number('agentnum')
+    $self->ut_numbern('custnum')
+    || $self->ut_number('agentnum')
     || $self->ut_number('refnum')
     || $self->ut_textn('company')
     || $self->ut_text('address1')
@@ -254,7 +255,7 @@ sub check {
       } );
   }
 
-  $self->zip =~ /^([\w\-]{10})$/ or return "Illegal zip";
+  $self->zip =~ /^([\w\-]{5,10})$/ or return "Illegal zip";
   $self->zip($1);
 
   $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
@@ -760,34 +761,42 @@ sub balance {
   sprintf( "%.2f", $self->total_owed - $self->total_credited );
 }
 
-=item invoicing_list [ ITEM, ITEM, ... ]
+=item invoicing_list [ ARRAYREF ]
 
-If arguements are given, sets these email addresses as invoice recipients
+If an arguement is given, sets these email addresses as invoice recipients
 (see L<FS::cust_main_invoice>).  Errors are not fatal and are not reported
 (except as warnings), so use check_invoicing_list first.
 
 Returns a list of email addresses (with svcnum entries expanded).
 
+Note: You can clear the invoicing list by passing an empty ARRAYREF.  You can
+check it without disturbing anything by passing nothing.
+
+This interface may change in the future.
+
 =cut
 
 sub invoicing_list {
-  my( $self, @addresses ) = @_;
-  if ( @addresses ) {
+  my( $self, $arrayref ) = @_;
+  if ( $arrayref ) {
     my @cust_main_invoice = 
       qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
     foreach my $cust_main_invoice ( @cust_main_invoice ) {
-      unless ( grep { $cust_main_invoice->address eq $_ } @addresses ) {
-        $cust_main_invoice->delete;
+      #warn $cust_main_invoice->destnum;
+      unless ( grep { $cust_main_invoice->address eq $_ } @{$arrayref} ) {
+        #warn $cust_main_invoice->destnum;
+        my $error = $cust_main_invoice->delete;
+        warn $error if $error;
       }
     }
     @cust_main_invoice =
       qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
-    foreach my $address ( @addresses ) {
+    foreach my $address ( @{$arrayref} ) {
       unless ( grep { $address eq $_->address } @cust_main_invoice ) {
-        my $cust_main_invoice = new FS::cust_main_invoice (
+        my $cust_main_invoice = new FS::cust_main_invoice ( {
           'custnum' => $self->custnum,
           'dest'    => $address,
-        );
+        } );
         my $error = $cust_main_invoice->insert;
         warn $error if $error;
       } 
@@ -797,7 +806,7 @@ sub invoicing_list {
     qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
 }
 
-=item check_invoicing_list ITEM, ITEM
+=item check_invoicing_list ARRAYREF
 
 Checks these arguements as valid input for the invoicing_list method.  If there
 is an error, returns the error, otherwise returns false.
@@ -805,12 +814,12 @@ is an error, returns the error, otherwise returns false.
 =cut
 
 sub check_invoicing_list {
-  my( $self, @addresses ) = @_;
-  foreach my $address ( @addresses ) {
-    my $cust_main_invoice = new FS::cust_main_invoice (
+  my( $self, $arrayref ) = @_;
+  foreach my $address ( @{$arrayref} ) {
+    my $cust_main_invoice = new FS::cust_main_invoice ( {
       'custnum' => $self->custnum,
       'dest'    => $address,
-    );
+    } );
     my $error = $cust_main_invoice->check;
     return $error if $error;
   }
@@ -821,7 +830,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.8 1998-12-29 11:59:39 ivan Exp $
+$Id: cust_main.pm,v 1.9 1999-01-18 09:22:41 ivan Exp $
 
 =head1 BUGS
 
@@ -877,7 +886,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.8  1998-12-29 11:59:39  ivan
+Revision 1.9  1999-01-18 09:22:41  ivan
+changes to track email addresses for email invoicing
+
+Revision 1.8  1998/12/29 11:59:39  ivan
 mostly properly OO, some work still to be done with svc_ stuff
 
 Revision 1.7  1998/12/16 09:58:52  ivan
diff --git a/site_perl/cust_main_invoice.pm b/site_perl/cust_main_invoice.pm
index 9c1a86a12..61edae961 100644
--- a/site_perl/cust_main_invoice.pm
+++ b/site_perl/cust_main_invoice.pm
@@ -103,9 +103,9 @@ and repalce methods.
 sub check {
   my $self = shift;
 
-  my $error = $self->ut_number('destnum')
-        or $self->ut_number('custnum')
-        or $self->ut_text('dest')
+  my $error = $self->ut_numbern('destnum')
+           || $self->ut_number('custnum')
+           || $self->ut_text('dest')
   ;
   return $error if $error;
 
@@ -117,7 +117,7 @@ sub check {
   } elsif ( $self->dest =~ /^(\d+)$/ ) {
     return "Unknown local account (specified by svcnum)"
       unless qsearchs( 'svc_acct', { 'svcnum' => $self->dest } );
-  } elsif ( $self->dest =~ /^([\w\.\-]+)\@(([\w\.\-]\.)+\w+)$/ ) {
+  } elsif ( $self->dest =~ /^([\w\.\-]+)\@(([\w\.\-]+\.)+\w+)$/ ) {
     my($user, $domain) = ($1, $2);
     if ( $domain eq $mydomain ) {
       my $svc_acct = qsearchs( 'svc_acct', { 'username' => $user } );
@@ -152,7 +152,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.3 1998-12-29 11:59:42 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.4 1999-01-18 09:22:42 ivan Exp $
 
 =head1 BUGS
 
@@ -168,7 +168,10 @@ added hfields
 ivan@sisd.com 97-nov-13
 
 $Log: cust_main_invoice.pm,v $
-Revision 1.3  1998-12-29 11:59:42  ivan
+Revision 1.4  1999-01-18 09:22:42  ivan
+changes to track email addresses for email invoicing
+
+Revision 1.3  1998/12/29 11:59:42  ivan
 mostly properly OO, some work still to be done with svc_ stuff
 
 Revision 1.2  1998/12/16 09:58:53  ivan
-- 
cgit v1.2.1


From 183f64ede863fff923db7e00d962b3495e405477 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Jan 1999 09:41:48 +0000
Subject: all $cgi->header calls now include ( '-expires' => 'now' ) for
 mod_perl (good idea anyway)

---
 htdocs/browse/agent.cgi                 | 10 +++++++---
 htdocs/browse/agent_type.cgi            | 10 +++++++---
 htdocs/browse/cust_main_county.cgi      | 10 +++++++---
 htdocs/browse/part_pkg.cgi              | 10 +++++++---
 htdocs/browse/part_referral.cgi         | 10 +++++++---
 htdocs/browse/part_svc.cgi              | 10 +++++++---
 htdocs/browse/svc_acct_pop.cgi          | 10 +++++++---
 htdocs/edit/agent.cgi                   | 10 +++++++---
 htdocs/edit/agent_type.cgi              | 10 +++++++---
 htdocs/edit/cust_credit.cgi             | 10 +++++++---
 htdocs/edit/cust_main.cgi               | 10 +++++++---
 htdocs/edit/cust_main_county-expand.cgi | 10 +++++++---
 htdocs/edit/cust_main_county.cgi        | 10 +++++++---
 htdocs/edit/cust_pay.cgi                | 10 +++++++---
 htdocs/edit/cust_pkg.cgi                | 10 +++++++---
 htdocs/edit/part_pkg.cgi                | 10 +++++++---
 htdocs/edit/part_referral.cgi           | 10 +++++++---
 htdocs/edit/part_svc.cgi                | 10 +++++++---
 htdocs/edit/svc_acct.cgi                | 10 +++++++---
 htdocs/edit/svc_acct_pop.cgi            | 10 +++++++---
 htdocs/edit/svc_acct_sm.cgi             | 10 +++++++---
 htdocs/edit/svc_domain.cgi              | 10 +++++++---
 htdocs/misc/link.cgi                    | 10 +++++++---
 htdocs/search/cust_main.cgi             | 10 +++++++---
 htdocs/search/cust_pkg.cgi              | 10 +++++++---
 htdocs/search/svc_acct.cgi              | 10 +++++++---
 htdocs/search/svc_acct_sm.cgi           | 10 +++++++---
 htdocs/view/cust_bill.cgi               | 10 +++++++---
 htdocs/view/cust_main.cgi               | 10 +++++++---
 htdocs/view/cust_pkg.cgi                | 10 +++++++---
 htdocs/view/svc_acct.cgi                | 10 +++++++---
 htdocs/view/svc_acct_sm.cgi             | 10 +++++++---
 htdocs/view/svc_domain.cgi              | 10 +++++++---
 site_perl/CGI.pm                        |  8 ++++++--
 34 files changed, 237 insertions(+), 101 deletions(-)

diff --git a/htdocs/browse/agent.cgi b/htdocs/browse/agent.cgi
index 442ea6ee0..446401eca 100755
--- a/htdocs/browse/agent.cgi
+++ b/htdocs/browse/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.8 1999-01-18 09:22:26 ivan Exp $
+# $Id: agent.cgi,v 1.9 1999-01-18 09:41:14 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -15,7 +15,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent.cgi,v $
-# Revision 1.8  1999-01-18 09:22:26  ivan
+# Revision 1.9  1999-01-18 09:41:14  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.8  1999/01/18 09:22:26  ivan
 # changes to track email addresses for email invoicing
 #
 # Revision 1.7  1998/12/17 05:25:16  ivan
@@ -65,7 +69,7 @@ my($cgi) = new CGI;
 
 my($p)=popurl(2);
 
-print $cgi->header, header('Agent Listing', menubar(
+print $cgi->header( '-expires' => 'now' ), header('Agent Listing', menubar(
   'Main Menu'   => $p,
   'Agent Types' => $p. 'browse/agent_type.cgi',
 #  'Add new agent' => '../edit/agent.cgi'
diff --git a/htdocs/browse/agent_type.cgi b/htdocs/browse/agent_type.cgi
index a1fa3b28e..8bbf1e291 100755
--- a/htdocs/browse/agent_type.cgi
+++ b/htdocs/browse/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.3 1998-12-17 05:25:17 ivan Exp $
+# $Id: agent_type.cgi,v 1.4 1999-01-18 09:41:15 ivan Exp $
 #
 # ivan@sisd.com 97-dec-10
 #
@@ -11,7 +11,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.3  1998-12-17 05:25:17  ivan
+# Revision 1.4  1999-01-18 09:41:15  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 05:25:17  ivan
 # fix visual and other bugs
 #
 # Revision 1.2  1998/11/21 07:39:52  ivan
@@ -33,7 +37,7 @@ my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
 my($p)=popurl(2);
-print $cgi->header, header("Agent Type Listing", menubar(
+print $cgi->header( '-expires' => 'now' ), header("Agent Type Listing", menubar(
   'Main Menu' => $p,
 )), "Agent types define groups of packages that you can then assign to".
     " particular agents.<BR><BR>", table, <<END;
diff --git a/htdocs/browse/cust_main_county.cgi b/htdocs/browse/cust_main_county.cgi
index fc0935515..728f1d937 100755
--- a/htdocs/browse/cust_main_county.cgi
+++ b/htdocs/browse/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.3 1998-12-17 05:25:18 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.4 1999-01-18 09:41:16 ivan Exp $
 #
 # ivan@sisd.com 97-dec-13
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county.cgi,v $
-# Revision 1.3  1998-12-17 05:25:18  ivan
+# Revision 1.4  1999-01-18 09:41:16  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 05:25:18  ivan
 # fix visual and other bugs
 #
 # Revision 1.2  1998/11/18 09:01:34  ivan
@@ -31,7 +35,7 @@ my($cgi) = new CGI;
 
 my($p) = popurl(2);
 
-print $cgi->header, header("Tax Rate Listing", menubar(
+print $cgi->header( '-expires' => 'now' ), header("Tax Rate Listing", menubar(
   'Main Menu' => $p,
   'Edit tax rates' => $p. "edit/cust_main_county.cgi",
 )),<<END;
diff --git a/htdocs/browse/part_pkg.cgi b/htdocs/browse/part_pkg.cgi
index 5d4aaa11f..22d8b9a15 100755
--- a/htdocs/browse/part_pkg.cgi
+++ b/htdocs/browse/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.4 1998-12-17 05:25:19 ivan Exp $
+# $Id: part_pkg.cgi,v 1.5 1999-01-18 09:41:17 ivan Exp $
 #
 # ivan@sisd.com 97-dec-5,9
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.4  1998-12-17 05:25:19  ivan
+# Revision 1.5  1999-01-18 09:41:17  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/17 05:25:19  ivan
 # fix visual and other bugs
 #
 # Revision 1.3  1998/11/21 07:23:45  ivan
@@ -36,7 +40,7 @@ my($cgi) = new CGI;
 
 my $p = popurl(2);
 
-print $cgi->header, header("Package Part Listing",menubar(
+print $cgi->header( '-expires' => 'now' ), header("Package Part Listing",menubar(
   'Main Menu' => $p,
 )), "One or more services are grouped together into a package and given",
   " pricing information. Customers purchase packages, not services.<BR><BR>", 
diff --git a/htdocs/browse/part_referral.cgi b/htdocs/browse/part_referral.cgi
index b08efdbbc..859995af0 100755
--- a/htdocs/browse/part_referral.cgi
+++ b/htdocs/browse/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_referral.cgi,v 1.5 1998-12-17 05:25:20 ivan Exp $
+# $Id: part_referral.cgi,v 1.6 1999-01-18 09:41:18 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23 
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_referral.cgi,v $
-# Revision 1.5  1998-12-17 05:25:20  ivan
+# Revision 1.6  1999-01-18 09:41:18  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1998/12/17 05:25:20  ivan
 # fix visual and other bugs
 #
 # Revision 1.4  1998/12/17 04:32:55  ivan
@@ -37,7 +41,7 @@ my $cgi = new CGI;
 
 my $p = popurl(2);
 
-print $cgi->header, header("Referral Listing", menubar(
+print $cgi->header( '-expires' => 'now' ), header("Referral Listing", menubar(
   'Main Menu' => $p,
 #  'Add new referral' => "../edit/part_referral.cgi",
 )), "Where a customer heard about your service. Tracked for informational purposes.<BR><BR>", table, <<END;
diff --git a/htdocs/browse/part_svc.cgi b/htdocs/browse/part_svc.cgi
index 17308ffd5..38c05cb7c 100755
--- a/htdocs/browse/part_svc.cgi
+++ b/htdocs/browse/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.7 1998-12-30 23:06:22 ivan Exp $
+# $Id: part_svc.cgi,v 1.8 1999-01-18 09:41:19 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14, 97-dec-9
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.7  1998-12-30 23:06:22  ivan
+# Revision 1.8  1999-01-18 09:41:19  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.7  1998/12/30 23:06:22  ivan
 # typo
 #
 # Revision 1.6  1998/12/30 23:03:20  ivan
@@ -43,7 +47,7 @@ my($cgi) = new CGI;
 
 my $p = popurl(2);
 
-print $cgi->header, header('Service Part Listing', menubar(
+print $cgi->header( '-expires' => 'now' ), header('Service Part Listing', menubar(
   'Main Menu' => $p,
 )),<<END;
     Services are items you offer to your customers.<BR><BR>
diff --git a/htdocs/browse/svc_acct_pop.cgi b/htdocs/browse/svc_acct_pop.cgi
index 2231aefe2..b172e78ea 100755
--- a/htdocs/browse/svc_acct_pop.cgi
+++ b/htdocs/browse/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.3 1998-12-17 05:25:22 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.4 1999-01-18 09:41:20 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.3  1998-12-17 05:25:22  ivan
+# Revision 1.4  1999-01-18 09:41:20  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 05:25:22  ivan
 # fix visual and other bugs
 #
 # Revision 1.2  1998/12/17 04:36:59  ivan
@@ -31,7 +35,7 @@ my($cgi) = new CGI;
 
 my $p = popurl(2);
 
-print $cgi->header, header('POP Listing', menubar(
+print $cgi->header( '-expires' => 'now' ), header('POP Listing', menubar(
   'Main Menu' => $p,
 )), "Points of Presence<BR><BR>", table, <<END;
       <TR>
diff --git a/htdocs/edit/agent.cgi b/htdocs/edit/agent.cgi
index 44c1676b2..291f1b234 100755
--- a/htdocs/edit/agent.cgi
+++ b/htdocs/edit/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.3 1998-12-17 06:16:57 ivan Exp $
+# $Id: agent.cgi,v 1.4 1999-01-18 09:41:21 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -11,7 +11,11 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: agent.cgi,v $
-# Revision 1.3  1998-12-17 06:16:57  ivan
+# Revision 1.4  1999-01-18 09:41:21  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 06:16:57  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 # Revision 1.2  1998/11/23 07:52:08  ivan
@@ -44,7 +48,7 @@ my($hashref)=$agent->hashref;
 
 my $p = popurl(2);
 
-print $cgi->header, header("$action Agent", menubar(
+print $cgi->header( '-expires' => 'now' ), header("$action Agent", menubar(
   'Main Menu' => $p,
   'View all agents' => $p. 'browse/agent.cgi',
 )), '<FORM ACTION="', popurl(1), 'process/agent.cgi" METHOD=POST>';
diff --git a/htdocs/edit/agent_type.cgi b/htdocs/edit/agent_type.cgi
index 9bfc37429..b9da2a283 100755
--- a/htdocs/edit/agent_type.cgi
+++ b/htdocs/edit/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.7 1999-01-18 09:22:29 ivan Exp $
+# $Id: agent_type.cgi,v 1.8 1999-01-18 09:41:22 ivan Exp $
 #
 # agent_type.cgi: Add/Edit agent type (output form)
 #
@@ -13,7 +13,11 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.7  1999-01-18 09:22:29  ivan
+# Revision 1.8  1999-01-18 09:41:22  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.7  1999/01/18 09:22:29  ivan
 # changes to track email addresses for email invoicing
 #
 # Revision 1.6  1998/12/17 06:16:58  ivan
@@ -61,7 +65,7 @@ if ( $cgi->keywords ) { #editing
 my($hashref)=$agent_type->hashref;
 
 my($p)=popurl(2);
-print $cgi->header, header("$action Agent Type", menubar(
+print $cgi->header( '-expires' => 'now' ), header("$action Agent Type", menubar(
   'Main Menu' => "$p",
   'View all agent types' => "${p}browse/agent_type.cgi",
 )), '<FORM ACTION="', popurl(1), 'process/agent_type.cgi" METHOD=POST>';
diff --git a/htdocs/edit/cust_credit.cgi b/htdocs/edit/cust_credit.cgi
index 02b8008f7..4b7276f4b 100755
--- a/htdocs/edit/cust_credit.cgi
+++ b/htdocs/edit/cust_credit.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_credit.cgi,v 1.3 1998-12-23 02:26:06 ivan Exp $
+# $Id: cust_credit.cgi,v 1.4 1999-01-18 09:41:23 ivan Exp $
 #
 # Usage: cust_credit.cgi custnum [ -paybatch ]
 #        http://server.name/path/cust_credit?custnum [ -paybatch ]
@@ -25,7 +25,11 @@
 # rewrite ivan@sisd.com 98-mar-16
 #
 # $Log: cust_credit.cgi,v $
-# Revision 1.3  1998-12-23 02:26:06  ivan
+# Revision 1.4  1999-01-18 09:41:23  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/23 02:26:06  ivan
 # *** empty log message ***
 #
 # Revision 1.2  1998/12/17 06:16:59  ivan
@@ -51,7 +55,7 @@ my($otaker)=getotaker;
 
 my $p1 = popurl(1);
 
-print $cgi->header, header("Post Credit", ''), <<END;
+print $cgi->header( '-expires' => 'now' ), header("Post Credit", ''), <<END;
     <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>
     <HR><PRE>
 END
diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index d712f7649..174c7986f 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.5 1999-01-18 09:22:30 ivan Exp $
+# $Id: cust_main.cgi,v 1.6 1999-01-18 09:41:24 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -40,7 +40,11 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.5  1999-01-18 09:22:30  ivan
+# Revision 1.6  1999-01-18 09:41:24  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1999/01/18 09:22:30  ivan
 # changes to track email addresses for email invoicing
 #
 # Revision 1.4  1998/12/23 08:08:15  ivan
@@ -80,7 +84,7 @@ if ( $cgi->keywords ) { #editing
 # top
 
 my $p1 = popurl(1);
-print $cgi->header, header("Customer $action", ''),
+print $cgi->header( '-expires' => 'now' ), header("Customer $action", ''),
       qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST>!,
       qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!,
       qq!Customer # !, ( $custnum ? $custnum : " (NEW)" ),
diff --git a/htdocs/edit/cust_main_county-expand.cgi b/htdocs/edit/cust_main_county-expand.cgi
index eccb1d934..1b231bcec 100755
--- a/htdocs/edit/cust_main_county-expand.cgi
+++ b/htdocs/edit/cust_main_county-expand.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county-expand.cgi,v 1.3 1998-12-17 06:17:01 ivan Exp $
+# $Id: cust_main_county-expand.cgi,v 1.4 1999-01-18 09:41:25 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county-expand.cgi,v $
-# Revision 1.3  1998-12-17 06:17:01  ivan
+# Revision 1.4  1999-01-18 09:41:25  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 06:17:01  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 # Revision 1.2  1998/11/18 09:01:38  ivan
@@ -38,7 +42,7 @@ my($cust_main_county)=qsearchs('cust_main_county',{'taxnum'=>$taxnum});
 die "Can't expand entry!" if $cust_main_county->getfield('county');
 
 my $p1 = popurl(1);
-print $cgi->header, header("Tax Rate (expand)", menubar(
+print $cgi->header( '-expires' => 'now' ), header("Tax Rate (expand)", menubar(
   'Main Menu' => popurl(2),
 )), <<END;
     <FORM ACTION="${p1}process/cust_main_county-expand.cgi" METHOD=POST>
diff --git a/htdocs/edit/cust_main_county.cgi b/htdocs/edit/cust_main_county.cgi
index 537d5740a..7d5468bed 100755
--- a/htdocs/edit/cust_main_county.cgi
+++ b/htdocs/edit/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.3 1998-12-17 06:17:02 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.4 1999-01-18 09:41:26 ivan Exp $
 #
 # ivan@sisd.com 97-dec-13-16
 #
@@ -11,7 +11,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 # 
 # $Log: cust_main_county.cgi,v $
-# Revision 1.3  1998-12-17 06:17:02  ivan
+# Revision 1.4  1999-01-18 09:41:26  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 06:17:02  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 # Revision 1.2  1998/11/18 09:01:39  ivan
@@ -30,7 +34,7 @@ my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
-print $cgi->header, header("Edit tax rates", menubar(
+print $cgi->header( '-expires' => 'now' ), header("Edit tax rates", menubar(
   'Main Menu' => popurl(2),
 )), qq!<FORM ACTION="!, popurl(1),
     qq!process/cust_main_county.cgi" METHOD=POST>!, table, <<END;
diff --git a/htdocs/edit/cust_pay.cgi b/htdocs/edit/cust_pay.cgi
index a3a308803..929c9e7e4 100755
--- a/htdocs/edit/cust_pay.cgi
+++ b/htdocs/edit/cust_pay.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pay.cgi,v 1.2 1998-12-17 06:17:03 ivan Exp $
+# $Id: cust_pay.cgi,v 1.3 1999-01-18 09:41:27 ivan Exp $
 #
 # Usage: cust_pay.cgi invnum
 #        http://server.name/path/cust_pay.cgi?invnum
@@ -14,7 +14,11 @@
 # rewrite ivan@sisd.com 98-mar-16
 #
 # $Log: cust_pay.cgi,v $
-# Revision 1.2  1998-12-17 06:17:03  ivan
+# Revision 1.3  1999-01-18 09:41:27  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.2  1998/12/17 06:17:03  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 
@@ -33,7 +37,7 @@ $query =~ /^(\d+)$/;
 my($invnum)=$1;
 
 my $p1 = popurl(1);
-print $cgi->header, header("Enter payment", ''), <<END;
+print $cgi->header( '-expires' => 'now' ), header("Enter payment", ''), <<END;
     <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
     <HR><PRE>
 END
diff --git a/htdocs/edit/cust_pkg.cgi b/htdocs/edit/cust_pkg.cgi
index 68abf9698..763eeae07 100755
--- a/htdocs/edit/cust_pkg.cgi
+++ b/htdocs/edit/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.2 1998-12-17 06:17:04 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.3 1999-01-18 09:41:28 ivan Exp $
 #
 # this is for changing packages around, not editing things within the package
 #
@@ -25,7 +25,11 @@
 # 98-jun-1
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.2  1998-12-17 06:17:04  ivan
+# Revision 1.3  1999-01-18 09:41:28  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.2  1998/12/17 06:17:04  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 
@@ -55,7 +59,7 @@ my($custnum)=$1;
 my($otaker)=&getotaker;
 
 my $p1 = popurl(1);
-print $cgi->header, header("Add/Edit Packages", ''), <<END;
+print $cgi->header( '-expires' => 'now' ), header("Add/Edit Packages", ''), <<END;
     <FORM ACTION="${p1}process/cust_pkg.cgi" METHOD=POST>
     <HR>
 END
diff --git a/htdocs/edit/part_pkg.cgi b/htdocs/edit/part_pkg.cgi
index c30a85965..9870017ad 100755
--- a/htdocs/edit/part_pkg.cgi
+++ b/htdocs/edit/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.6 1998-12-17 06:17:05 ivan Exp $
+# $Id: part_pkg.cgi,v 1.7 1999-01-18 09:41:29 ivan Exp $
 #
 # part_pkg.cgi: Add/Edit package (output form)
 #
@@ -13,7 +13,11 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.6  1998-12-17 06:17:05  ivan
+# Revision 1.7  1999-01-18 09:41:29  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.6  1998/12/17 06:17:05  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 # Revision 1.5  1998/11/21 07:12:26  ivan
@@ -70,7 +74,7 @@ if ( $cgi->param('clone') ) {
 }
 my($hashref)=$part_pkg->hashref;
 
-print $cgi->header, header("$action Package Definition", menubar(
+print $cgi->header( '-expires' => 'now' ), header("$action Package Definition", menubar(
   'Main Menu' => popurl(2),
   'View all packages' => popurl(2). 'browse/part_pkg.cgi',
 )), '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>';
diff --git a/htdocs/edit/part_referral.cgi b/htdocs/edit/part_referral.cgi
index 4eeec9982..e159e03ee 100755
--- a/htdocs/edit/part_referral.cgi
+++ b/htdocs/edit/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_referral.cgi,v 1.2 1998-12-17 06:17:06 ivan Exp $
+# $Id: part_referral.cgi,v 1.3 1999-01-18 09:41:30 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23
 #
@@ -12,7 +12,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_referral.cgi,v $
-# Revision 1.2  1998-12-17 06:17:06  ivan
+# Revision 1.3  1999-01-18 09:41:30  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.2  1998/12/17 06:17:06  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 
@@ -39,7 +43,7 @@ if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
 my($hashref)=$part_referral->hashref;
 
 my $p1 = popurl(1);
-print $cgi->header, header("$action Referral", menubar(
+print $cgi->header( '-expires' => 'now' ), header("$action Referral", menubar(
   'Main Menu' => popurl(2),
   'View all referrals' => popurl(2). "browse/part_referral.cgi",
 )), <<END;
diff --git a/htdocs/edit/part_svc.cgi b/htdocs/edit/part_svc.cgi
index 9baaabfe0..c17d518fc 100755
--- a/htdocs/edit/part_svc.cgi
+++ b/htdocs/edit/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.5 1998-12-30 23:03:21 ivan Exp $
+# $Id: part_svc.cgi,v 1.6 1999-01-18 09:41:31 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,11 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.5  1998-12-30 23:03:21  ivan
+# Revision 1.6  1999-01-18 09:41:31  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1998/12/30 23:03:21  ivan
 # bugfixes; fields isn't exported by derived classes
 #
 # Revision 1.4  1998/12/17 06:17:07  ivan
@@ -44,7 +48,7 @@ if ( $query && $query =~ /^(\d+)$/ ) { #editing
 my($hashref)=$part_svc->hashref;
 
 my $p = popurl(2);
-print $cgi->header, header("$action Service Definition", menubar(
+print $cgi->header( '-expires' => 'now' ), header("$action Service Definition", menubar(
   'Main Menu' => $p,
   'View all services' => "${p}browse/part_svc.cgi",
 )), '<FORM ACTION="', popurl(1), 'process/part_svc.cgi" METHOD=POST>';
diff --git a/htdocs/edit/svc_acct.cgi b/htdocs/edit/svc_acct.cgi
index edb4a684e..e5cf4857c 100755
--- a/htdocs/edit/svc_acct.cgi
+++ b/htdocs/edit/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.4 1998-12-30 23:03:22 ivan Exp $
+# $Id: svc_acct.cgi,v 1.5 1999-01-18 09:41:32 ivan Exp $
 #
 # Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -18,7 +18,11 @@
 # use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.4  1998-12-30 23:03:22  ivan
+# Revision 1.5  1999-01-18 09:41:32  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/30 23:03:22  ivan
 # bugfixes; fields isn't exported by derived classes
 #
 # Revision 1.3  1998/12/17 06:17:08  ivan
@@ -108,7 +112,7 @@ my($ulen)=$svc_acct->dbdef_table->column('username')->length;
 my($ulen2)=$ulen+2;
 
 my $p1 = popurl(1);
-print $cgi->header, header("$action $svc account"), <<END;
+print $cgi->header( '-expires' => 'now' ), header("$action $svc account"), <<END;
     <FORM ACTION="${p1}process/svc_acct.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
       <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
diff --git a/htdocs/edit/svc_acct_pop.cgi b/htdocs/edit/svc_acct_pop.cgi
index 4d41d0b32..e2c4bcdbe 100755
--- a/htdocs/edit/svc_acct_pop.cgi
+++ b/htdocs/edit/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.4 1998-12-23 02:57:45 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.5 1999-01-18 09:41:33 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8 
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.4  1998-12-23 02:57:45  ivan
+# Revision 1.5  1999-01-18 09:41:33  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/23 02:57:45  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.3  1998/12/17 06:17:10  ivan
@@ -45,7 +49,7 @@ if ( $query =~ /^(\d+)$/ ) { #editing
 my($hashref)=$svc_acct_pop->hashref;
 
 my $p1 = popurl(1);
-print $cgi->header, header("$action POP", menubar(
+print $cgi->header( '-expires' => 'now' ), header("$action POP", menubar(
   'Main Menu' => popurl(2),
   'View all POPs' => popurl(2). "browse/svc_acct_pop.cgi",
 )), <<END;
diff --git a/htdocs/edit/svc_acct_sm.cgi b/htdocs/edit/svc_acct_sm.cgi
index be5350d84..9acaed188 100755
--- a/htdocs/edit/svc_acct_sm.cgi
+++ b/htdocs/edit/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.5 1998-12-30 23:03:24 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.6 1999-01-18 09:41:34 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct_sm.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -35,7 +35,11 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-26
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.5  1998-12-30 23:03:24  ivan
+# Revision 1.6  1999-01-18 09:41:34  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1998/12/30 23:03:24  ivan
 # bugfixes; fields isn't exported by derived classes
 #
 # Revision 1.4  1998/12/23 02:58:45  ivan
@@ -168,7 +172,7 @@ if ($pkgnum) {
 }
 
 my $p1 = popurl(1);
-print $cgi->header, header("Mail Alias $action", ''), <<END;
+print $cgi->header( '-expires' => 'now' ), header("Mail Alias $action", ''), <<END;
     <FORM ACTION="${p1}process/svc_acct_sm.cgi" METHOD=POST>
 END
 
diff --git a/htdocs/edit/svc_domain.cgi b/htdocs/edit/svc_domain.cgi
index 2937ccea0..d40f9001b 100755
--- a/htdocs/edit/svc_domain.cgi
+++ b/htdocs/edit/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.5 1998-12-30 23:03:25 ivan Exp $
+# $Id: svc_domain.cgi,v 1.6 1999-01-18 09:41:35 ivan Exp $
 #
 # Usage: svc_domain.cgi pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_domain.cgi?pkgnum{pkgnum}-svcpart{svcpart}
@@ -17,7 +17,11 @@
 # no GOV in instructions ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.5  1998-12-30 23:03:25  ivan
+# Revision 1.6  1999-01-18 09:41:35  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1998/12/30 23:03:25  ivan
 # bugfixes; fields isn't exported by derived classes
 #
 # Revision 1.4  1998/12/23 03:00:16  ivan
@@ -96,7 +100,7 @@ my($domain)=(
 );
 
 my $p1 = popurl(1);
-print $cgi->header, header("$action $svc", ''), <<END;
+print $cgi->header( '-expires' => 'now' ), header("$action $svc", ''), <<END;
     <FORM ACTION="${p1}process/svc_domain.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
       <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
diff --git a/htdocs/misc/link.cgi b/htdocs/misc/link.cgi
index 6823365f5..d18cfccc1 100755
--- a/htdocs/misc/link.cgi
+++ b/htdocs/misc/link.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: link.cgi,v 1.3 1998-12-23 03:03:39 ivan Exp $
+# $Id: link.cgi,v 1.4 1999-01-18 09:41:36 ivan Exp $
 #
 # Note: Should be run setuid freeside as user nobody
 #
@@ -11,7 +11,11 @@
 # can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
 #
 # $Log: link.cgi,v $
-# Revision 1.3  1998-12-23 03:03:39  ivan
+# Revision 1.4  1999-01-18 09:41:36  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/23 03:03:39  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.2  1998/12/17 09:12:45  ivan
@@ -48,7 +52,7 @@ my($svc) = $part_svc->getfield('svc');
 my($svcdb) = $part_svc->getfield('svcdb');
 my($link_field) = $link_field{$svcdb};
 
-print $cgi->header, header("Link to existing $svc account"),
+print $cgi->header( '-expires' => 'now' ), header("Link to existing $svc account"),
       qq!<FORM ACTION="!, popurl(1), qq!process/link.cgi" METHOD=POST>!;
 
 if ( $link_field ) { 
diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index 262c1579c..48e88539b 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.4 1998-12-30 00:57:50 ivan Exp $
+# $Id: cust_main.cgi,v 1.5 1999-01-18 09:41:37 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -19,7 +19,11 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.4  1998-12-30 00:57:50  ivan
+# Revision 1.5  1999-01-18 09:41:37  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/30 00:57:50  ivan
 # bug
 #
 # Revision 1.3  1998/12/17 09:41:08  ivan
@@ -82,7 +86,7 @@ if ( scalar(@cust_main) == 1 ) {
 } else { 
 
   my($total)=scalar(@cust_main);
-  print $cgi->header, header("Customer Search Results",menubar(
+  print $cgi->header( '-expires' => 'now' ), header("Customer Search Results",menubar(
     'Main Menu', popurl(2)
   )), "$total matching customers found<BR>", table, <<END;
       <TR>
diff --git a/htdocs/search/cust_pkg.cgi b/htdocs/search/cust_pkg.cgi
index c198a56b6..248833ce1 100755
--- a/htdocs/search/cust_pkg.cgi
+++ b/htdocs/search/cust_pkg.cgi
@@ -1,11 +1,15 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.4 1999-01-18 09:22:33 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.5 1999-01-18 09:41:38 ivan Exp $
 #
 # based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.4  1999-01-18 09:22:33  ivan
+# Revision 1.5  1999-01-18 09:41:38  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1999/01/18 09:22:33  ivan
 # changes to track email addresses for email invoicing
 #
 # Revision 1.3  1998/12/23 03:05:59  ivan
@@ -68,7 +72,7 @@ if ( scalar(@cust_pkg) == 1 ) {
   exit;
 } else {
   my($total)=scalar(@cust_pkg);
-  print $cgi->header, header('Package Search Results',''), <<END;
+  print $cgi->header( '-expires' => 'now' ), header('Package Search Results',''), <<END;
     $total matching packages found
     <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
       <TR>
diff --git a/htdocs/search/svc_acct.cgi b/htdocs/search/svc_acct.cgi
index 75fbcb9b7..5dd33a678 100755
--- a/htdocs/search/svc_acct.cgi
+++ b/htdocs/search/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.4 1999-01-18 09:22:34 ivan Exp $
+# $Id: svc_acct.cgi,v 1.5 1999-01-18 09:41:39 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
@@ -23,7 +23,11 @@
 # give service and customer info too ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.4  1999-01-18 09:22:34  ivan
+# Revision 1.5  1999-01-18 09:41:39  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1999/01/18 09:22:34  ivan
 # changes to track email addresses for email invoicing
 #
 # Revision 1.3  1998/12/23 03:06:28  ivan
@@ -90,7 +94,7 @@ if ( scalar(@svc_acct) == 1 ) {
   exit;
 } else {
   my($total)=scalar(@svc_acct);
-  print $cgi->header, header("Account Search Results",''), <<END;
+  print $cgi->header( '-expires' => 'now' ), header("Account Search Results",''), <<END;
     $total matching accounts found
     <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
       <TR>
diff --git a/htdocs/search/svc_acct_sm.cgi b/htdocs/search/svc_acct_sm.cgi
index 824a551c7..c1c593673 100755
--- a/htdocs/search/svc_acct_sm.cgi
+++ b/htdocs/search/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.3 1998-12-17 09:41:11 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.4 1999-01-18 09:41:40 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -19,7 +19,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.3  1998-12-17 09:41:11  ivan
+# Revision 1.4  1999-01-18 09:41:40  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 09:41:11  ivan
 # s/CGI::(Base|Request)/CGI.pm/;
 #
 
@@ -61,7 +65,7 @@ if ( scalar(@svc_acct_sm) == 1 ) {
   print $cgi->redirect(popurl(2). "view/svc_acct_sm.cgi?$svcnum");  #redirect
 } elsif ( scalar(@svc_acct_sm) > 1 ) {
   CGI::Base::SendHeaders();
-  print $cgi->header, header('Mail Alias Search Results'), table, <<END;
+  print $cgi->header( '-expires' => 'now' ), header('Mail Alias Search Results'), table, <<END;
       <TR>
         <TH>Mail to<BR><FONT SIZE=-2>(click here to view mail alias)</FONT></TH>
         <TH>Forwards to<BR><FONT SIZE=-2>(click here to view account)</FONT></TH>
diff --git a/htdocs/view/cust_bill.cgi b/htdocs/view/cust_bill.cgi
index 80aab187f..ccfc33c81 100755
--- a/htdocs/view/cust_bill.cgi
+++ b/htdocs/view/cust_bill.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_bill.cgi,v 1.4 1998-12-30 23:03:33 ivan Exp $
+# $Id: cust_bill.cgi,v 1.5 1999-01-18 09:41:42 ivan Exp $
 #
 # Note: Should be run setuid freeside as user nobody.
 #
@@ -25,7 +25,11 @@
 # also print 'printed' field ivan@sisd.com 98-jul-10
 #
 # $Log: cust_bill.cgi,v $
-# Revision 1.4  1998-12-30 23:03:33  ivan
+# Revision 1.5  1999-01-18 09:41:42  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/30 23:03:33  ivan
 # bugfixes; fields isn't exported by derived classes
 #
 # Revision 1.3  1998/12/23 03:07:49  ivan
@@ -59,7 +63,7 @@ my($custnum) = $cust_bill->getfield('custnum');
 my($printed) = $cust_bill->printed;
 
 my $p = popurl(2);
-print $cgi->header, header('Invoice View', menubar(
+print $cgi->header( '-expires' => 'now' ), header('Invoice View', menubar(
   "Main Menu" => $p,
   "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
 )), <<END;
diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index 0f7a3f4d3..71a4e517e 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.8 1999-01-18 09:22:35 ivan Exp $
+# $Id: cust_main.cgi,v 1.9 1999-01-18 09:41:43 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -33,7 +33,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.8  1999-01-18 09:22:35  ivan
+# Revision 1.9  1999-01-18 09:41:43  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.8  1999/01/18 09:22:35  ivan
 # changes to track email addresses for email invoicing
 #
 # Revision 1.7  1998/12/30 23:03:34  ivan
@@ -75,7 +79,7 @@ use FS::cust_refund;
 my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
-print $cgi->header, header("Customer View", menubar(
+print $cgi->header( '-expires' => 'now' ), header("Customer View", menubar(
   'Main Menu' => popurl(2)
 )),<<END;
     <BASEFONT SIZE=3>
diff --git a/htdocs/view/cust_pkg.cgi b/htdocs/view/cust_pkg.cgi
index b394da591..3f6eed614 100755
--- a/htdocs/view/cust_pkg.cgi
+++ b/htdocs/view/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.5 1998-12-23 03:11:40 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.6 1999-01-18 09:41:44 ivan Exp $
 #
 # Usage: cust_pkg.cgi pkgnum
 #        http://server.name/path/cust_pkg.cgi?pkgnum
@@ -26,7 +26,11 @@
 # no FS::Search ivan@sisd.com 98-mar-7
 # 
 # $Log: cust_pkg.cgi,v $
-# Revision 1.5  1998-12-23 03:11:40  ivan
+# Revision 1.6  1999-01-18 09:41:44  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1998/12/23 03:11:40  ivan
 # *** empty log message ***
 #
 # Revision 1.3  1998/12/17 09:57:22  ivan
@@ -60,7 +64,7 @@ foreach $part_svc ( qsearch('part_svc',{}) ) {
   $uiadd{$part_svc->svcpart}= popurl(2). "edit/". $part_svc->svcdb . ".cgi";
 }
 
-print $cgi->header, header('Package View', '');
+print $cgi->header( '-expires' => 'now' ), header('Package View', '');
 
 my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi
index 66ae2d1e9..1151e1ced 100755
--- a/htdocs/view/svc_acct.cgi
+++ b/htdocs/view/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.5 1999-01-18 09:22:36 ivan Exp $
+# $Id: svc_acct.cgi,v 1.6 1999-01-18 09:41:45 ivan Exp $
 #
 # Usage: svc_acct.cgi svcnum
 #        http://server.name/path/svc_acct.cgi?svcnum
@@ -35,7 +35,11 @@
 # displays arbitrary radius attributes ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.5  1999-01-18 09:22:36  ivan
+# Revision 1.6  1999-01-18 09:41:45  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1999/01/18 09:22:36  ivan
 # changes to track email addresses for email invoicing
 #
 # Revision 1.4  1998/12/23 03:09:19  ivan
@@ -86,7 +90,7 @@ if ($pkgnum) {
 my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unkonwn svcpart" unless $part_svc;
 
-print $cgi->header, header('Account View', '');
+print $cgi->header( '-expires' => 'now' ), header('Account View', '');
 
 my $p = popurl(2);
 if ($pkgnum || $custnum) {
diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi
index f30fb429b..ab8450fce 100755
--- a/htdocs/view/svc_acct_sm.cgi
+++ b/htdocs/view/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.4 1998-12-23 03:09:52 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.5 1999-01-18 09:41:46 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi svcnum
 #        http://server.name/path/svc_acct_sm.cgi?svcnum
@@ -22,7 +22,11 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.4  1998-12-23 03:09:52  ivan
+# Revision 1.5  1999-01-18 09:41:46  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/23 03:09:52  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.3  1998/12/17 09:57:24  ivan
@@ -64,7 +68,7 @@ if ($pkgnum) {
 my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unkonwn svcpart" unless $part_svc;
 
-print $cgi->header, header('Mail Alias View');
+print $cgi->header( '-expires' => 'now' ), header('Mail Alias View');
 
 my $p = popurl(2);
 if ($pkgnum || $custnum) {
diff --git a/htdocs/view/svc_domain.cgi b/htdocs/view/svc_domain.cgi
index 9abeebbf4..7fa65e020 100755
--- a/htdocs/view/svc_domain.cgi
+++ b/htdocs/view/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.4 1998-12-23 03:10:19 ivan Exp $
+# $Id: svc_domain.cgi,v 1.5 1999-01-18 09:41:47 ivan Exp $
 #
 # Usage: svc_domain svcnum
 #        http://server.name/path/svc_domain.cgi?svcnum
@@ -15,7 +15,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.4  1998-12-23 03:10:19  ivan
+# Revision 1.5  1999-01-18 09:41:47  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/23 03:10:19  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.3  1998/12/17 09:57:25  ivan
@@ -55,7 +59,7 @@ my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unkonwn svcpart" unless $part_svc;
 
 my $p = popurl(2);
-print $cgi->header, header('Domain View', menubar(
+print $cgi->header( '-expires' => 'now' ), header('Domain View', menubar(
   "Main menu" => $p,
   "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
   "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index 136a05cf7..97dedaddf 100644
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -90,7 +90,7 @@ sub idiot {
     no strict 'subs';
     &CGI::Base::SendHeaders;
   } else {
-    print $cgi->header;
+    print $cgi->header( '-expires' => 'now' );
   }
   print <<END;
 <HTML>
@@ -193,7 +193,11 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 pod ivan@sisd.com 98-sep-12
 
 $Log: CGI.pm,v $
-Revision 1.14  1999-01-18 09:22:37  ivan
+Revision 1.15  1999-01-18 09:41:48  ivan
+all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+(good idea anyway)
+
+Revision 1.14  1999/01/18 09:22:37  ivan
 changes to track email addresses for email invoicing
 
 Revision 1.12  1998/12/23 02:23:16  ivan
-- 
cgit v1.2.1


From a99792ee88e249c27c661a4ece2b4fa241f59e76 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Jan 1999 21:58:10 +0000
Subject: esthetic: eq and ne were used in a few places instead of == and !=

---
 site_perl/cust_bill.pm         | 14 +++++++++-----
 site_perl/cust_credit.pm       | 14 +++++++++-----
 site_perl/cust_main_invoice.pm |  9 ++++++---
 site_perl/cust_pkg.pm          |  9 ++++++---
 site_perl/pkg_svc.pm           | 11 +++++++----
 site_perl/svc_acct.pm          |  9 ++++++---
 site_perl/svc_acct_sm.pm       |  4 ++--
 7 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/site_perl/cust_bill.pm b/site_perl/cust_bill.pm
index 3706aa4bf..5de1d929b 100644
--- a/site_perl/cust_bill.pm
+++ b/site_perl/cust_bill.pm
@@ -130,9 +130,10 @@ calling the collect method of a customer object (see L<FS::cust_main>).
 
 sub replace {
   my( $new, $old ) = ( shift, shift );
-  return "Can't change custnum!" unless $old->custnum eq $new->custnum;
-  return "Can't change _date!" unless $old->_date eq $new->_date;
-  return "Can't change charged!" unless $old->charged eq $new->charged;
+  return "Can't change custnum!" unless $old->custnum == $new->custnum;
+  #return "Can't change _date!" unless $old->_date eq $new->_date;
+  return "Can't change _date!" unless $old->_date == $new->_date;
+  return "Can't change charged!" unless $old->charged == $new->charged;
   return "(New) owed can't be > (new) charged!" if $new->owed > $new->charged;
 
   $new->SUPER::replace($old);
@@ -436,7 +437,7 @@ $address[4],''
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.4 1998-12-29 11:59:36 ivan Exp $
+$Id: cust_bill.pm,v 1.5 1999-01-18 21:58:03 ivan Exp $
 
 =head1 BUGS
 
@@ -469,7 +470,10 @@ charges can be negative ivan@sisd.com 98-jul-13
 pod, ingegrate with FS::Invoice ivan@sisd.com 98-sep-20
 
 $Log: cust_bill.pm,v $
-Revision 1.4  1998-12-29 11:59:36  ivan
+Revision 1.5  1999-01-18 21:58:03  ivan
+esthetic: eq and ne were used in a few places instead of == and !=
+
+Revision 1.4  1998/12/29 11:59:36  ivan
 mostly properly OO, some work still to be done with svc_ stuff
 
 Revision 1.3  1998/11/13 09:56:53  ivan
diff --git a/site_perl/cust_credit.pm b/site_perl/cust_credit.pm
index 321c01b34..a050e3021 100644
--- a/site_perl/cust_credit.pm
+++ b/site_perl/cust_credit.pm
@@ -107,9 +107,10 @@ inserting a refund (see L<FS::cust_refund>).
 sub replace {
   my ( $new, $old ) = ( shift, shift );
 
-  return "Can't change custnum!" unless $old->custnum eq $new->custnum;
-  return "Can't change date!" unless $old->_date eq $new->_date;
-  return "Can't change amount!" unless $old->amount eq $new->amount;
+  return "Can't change custnum!" unless $old->custnum == $new->custnum;
+  #return "Can't change date!" unless $old->_date eq $new->_date;
+  return "Can't change date!" unless $old->_date == $new->_date;
+  return "Can't change amount!" unless $old->amount == $new->amount;
   return "(New) credited can't be > (new) amount!"
     if $new->credited > $new->amount;
 
@@ -151,7 +152,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_credit.pm,v 1.2 1998-12-29 11:59:38 ivan Exp $
+$Id: cust_credit.pm,v 1.3 1999-01-18 21:58:04 ivan Exp $
 
 =head1 BUGS
 
@@ -169,7 +170,10 @@ ivan@sisd.com 98-mar-17
 pod, otaker from FS::UID ivan@sisd.com 98-sep-21
 
 $Log: cust_credit.pm,v $
-Revision 1.2  1998-12-29 11:59:38  ivan
+Revision 1.3  1999-01-18 21:58:04  ivan
+esthetic: eq and ne were used in a few places instead of == and !=
+
+Revision 1.2  1998/12/29 11:59:38  ivan
 mostly properly OO, some work still to be done with svc_ stuff
 
 
diff --git a/site_perl/cust_main_invoice.pm b/site_perl/cust_main_invoice.pm
index 61edae961..6ae6425ef 100644
--- a/site_perl/cust_main_invoice.pm
+++ b/site_perl/cust_main_invoice.pm
@@ -86,7 +86,7 @@ returns the error, otherwise returns false.
 sub replace {
   my ( $new, $old ) = ( shift, shift );
 
-  return "Can't change custnum!" unless $old->custnum eq $new->custnum;
+  return "Can't change custnum!" unless $old->custnum == $new->custnum;
 
   $new->SUPER::replace;
 }
@@ -152,7 +152,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.4 1999-01-18 09:22:42 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.5 1999-01-18 21:58:05 ivan Exp $
 
 =head1 BUGS
 
@@ -168,7 +168,10 @@ added hfields
 ivan@sisd.com 97-nov-13
 
 $Log: cust_main_invoice.pm,v $
-Revision 1.4  1999-01-18 09:22:42  ivan
+Revision 1.5  1999-01-18 21:58:05  ivan
+esthetic: eq and ne were used in a few places instead of == and !=
+
+Revision 1.4  1999/01/18 09:22:42  ivan
 changes to track email addresses for email invoicing
 
 Revision 1.3  1998/12/29 11:59:42  ivan
diff --git a/site_perl/cust_pkg.pm b/site_perl/cust_pkg.pm
index 66193510e..5b119ed28 100644
--- a/site_perl/cust_pkg.pm
+++ b/site_perl/cust_pkg.pm
@@ -129,7 +129,7 @@ in some cases).
 sub replace {
   my( $new, $old ) = ( shift, shift );
 
-  #return "Can't (yet?) change pkgpart!" if $old->pkgpart ne $new->pkgpart;
+  #return "Can't (yet?) change pkgpart!" if $old->pkgpart != $new->pkgpart;
   return "Can't change otaker!" if $old->otaker ne $new->otaker;
   return "Can't change setup once it exists!"
     if $old->getfield('setup') &&
@@ -459,7 +459,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.4 1998-12-29 11:59:45 ivan Exp $
+$Id: cust_pkg.pm,v 1.5 1999-01-18 21:58:07 ivan Exp $
 
 =head1 BUGS
 
@@ -490,7 +490,10 @@ fixed for new agent->agent_type->type_pkgs in &order ivan@sisd.com 98-mar-7
 pod ivan@sisd.com 98-sep-21
 
 $Log: cust_pkg.pm,v $
-Revision 1.4  1998-12-29 11:59:45  ivan
+Revision 1.5  1999-01-18 21:58:07  ivan
+esthetic: eq and ne were used in a few places instead of == and !=
+
+Revision 1.4  1998/12/29 11:59:45  ivan
 mostly properly OO, some work still to be done with svc_ stuff
 
 Revision 1.3  1998/11/15 13:01:35  ivan
diff --git a/site_perl/pkg_svc.pm b/site_perl/pkg_svc.pm
index 9db0a12da..ee4ad629e 100644
--- a/site_perl/pkg_svc.pm
+++ b/site_perl/pkg_svc.pm
@@ -74,8 +74,8 @@ returns the error, otherwise returns false.
 sub replace {
   my ( $new, $old ) = ( shift, shift );
 
-  return "Can't change pkgpart!" if $old->pkgpart ne $new->pkgpart;
-  return "Can't change svcpart!" if $old->svcpart ne $new->svcpart;
+  return "Can't change pkgpart!" if $old->pkgpart != $new->pkgpart;
+  return "Can't change svcpart!" if $old->svcpart != $new->svcpart;
 
   $new->SUPER::replace($old);
 }
@@ -112,7 +112,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: pkg_svc.pm,v 1.2 1998-12-29 11:59:51 ivan Exp $
+$Id: pkg_svc.pm,v 1.3 1999-01-18 21:58:08 ivan Exp $
 
 =head1 BUGS
 
@@ -131,7 +131,10 @@ ivan@sisd.com 97-nov-13
 pod ivan@sisd.com 98-sep-22
 
 $Log: pkg_svc.pm,v $
-Revision 1.2  1998-12-29 11:59:51  ivan
+Revision 1.3  1999-01-18 21:58:08  ivan
+esthetic: eq and ne were used in a few places instead of == and !=
+
+Revision 1.2  1998/12/29 11:59:51  ivan
 mostly properly OO, some work still to be done with svc_ stuff
 
 
diff --git a/site_perl/svc_acct.pm b/site_perl/svc_acct.pm
index 473f78b24..c69f1032b 100644
--- a/site_perl/svc_acct.pm
+++ b/site_perl/svc_acct.pm
@@ -232,7 +232,7 @@ sub replace {
     if $old->username ne $new->username &&
       qsearchs( 'svc_acct', { 'username' => $new->username } );
 
-  return "Can't change uid!" if $old->uid ne $new->uid;
+  return "Can't change uid!" if $old->uid != $new->uid;
 
   #change homdir when we change username
   $new->setfield('dir', '') if $old->username ne $new->username;
@@ -440,7 +440,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.4 1998-12-30 00:30:45 ivan Exp $
+$Id: svc_acct.pm,v 1.5 1999-01-18 21:58:09 ivan Exp $
 
 =head1 BUGS
 
@@ -482,7 +482,10 @@ arbitrary radius attributes ivan@sisd.com 98-aug-13
 pod and FS::conf ivan@sisd.com 98-sep-22
 
 $Log: svc_acct.pm,v $
-Revision 1.4  1998-12-30 00:30:45  ivan
+Revision 1.5  1999-01-18 21:58:09  ivan
+esthetic: eq and ne were used in a few places instead of == and !=
+
+Revision 1.4  1998/12/30 00:30:45  ivan
 svc_ stuff is more properly OO - has a common superclass FS::svc_Common
 
 Revision 1.2  1998/11/13 09:56:55  ivan
diff --git a/site_perl/svc_acct_sm.pm b/site_perl/svc_acct_sm.pm
index 75e7b0281..5c0f510e4 100644
--- a/site_perl/svc_acct_sm.pm
+++ b/site_perl/svc_acct_sm.pm
@@ -157,7 +157,7 @@ sub replace {
 
   return "Domain username (domuser) in use for this domain (domsvc)"
     if ( $old->domuser ne $new->domuser
-         || $old->domsvc  ne $new->domsvc
+         || $old->domsvc != $new->domsvc
        )  && qsearchs('svc_acct_sm',{
          'domuser'=> $new->domuser,
          'domsvc' => $new->domsvc,
@@ -229,7 +229,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_acct_sm.pm,v 1.4 1998-12-30 00:30:46 ivan Exp $
+$Id: svc_acct_sm.pm,v 1.5 1999-01-18 21:58:10 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From d9e82fbe0fcd02bed8601002ad1e14ebbe5f0d5f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Jan 1999 22:16:40 +0000
Subject: typo

---
 site_perl/Invoice.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site_perl/Invoice.pm b/site_perl/Invoice.pm
index 20a016274..7fdcaaf6f 100644
--- a/site_perl/Invoice.pm
+++ b/site_perl/Invoice.pm
@@ -14,7 +14,7 @@ FS::Invoice - Legacy stub
 
 =head1 SYNOPSIS
 
-The functioanlity of FS::invoice has been integrated in FS::cust_bill.
+The functionality of FS::Invoice has been integrated in FS::cust_bill.
 
 =head1 HISTORY
 
-- 
cgit v1.2.1


From 3f81acee781ba7b9defc47680679d7d92d6440ed Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Jan 1999 22:48:02 +0000
Subject: s/create/new/g; and use fields('table_name')

---
 htdocs/edit/process/agent.cgi                   |  9 ++++++---
 htdocs/edit/process/agent_type.cgi              | 11 +++++++----
 htdocs/edit/process/cust_credit.cgi             | 13 +++++++++----
 htdocs/edit/process/cust_main_county-expand.cgi |  9 ++++++---
 htdocs/edit/process/cust_main_county.cgi        |  9 ++++++---
 htdocs/edit/process/cust_pay.cgi                | 13 +++++++++----
 htdocs/edit/process/part_pkg.cgi                | 13 ++++++++-----
 htdocs/edit/process/part_referral.cgi           | 12 +++++++-----
 htdocs/edit/process/part_svc.cgi                | 12 +++++++-----
 htdocs/edit/process/svc_acct.cgi                | 16 ++++++++++------
 htdocs/edit/process/svc_acct_pop.cgi            |  9 ++++++---
 htdocs/edit/process/svc_acct_sm.cgi             | 16 ++++++++++------
 htdocs/edit/process/svc_domain.cgi              | 12 ++++++++----
 13 files changed, 99 insertions(+), 55 deletions(-)

diff --git a/htdocs/edit/process/agent.cgi b/htdocs/edit/process/agent.cgi
index b8f818675..dbbfe8055 100755
--- a/htdocs/edit/process/agent.cgi
+++ b/htdocs/edit/process/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.4 1998-12-30 23:03:26 ivan Exp $
+# $Id: agent.cgi,v 1.5 1999-01-18 22:47:49 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent.cgi,v $
-# Revision 1.4  1998-12-30 23:03:26  ivan
+# Revision 1.5  1999-01-18 22:47:49  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.4  1998/12/30 23:03:26  ivan
 # bugfixes; fields isn't exported by derived classes
 #
 # Revision 1.3  1998/12/17 08:40:16  ivan
@@ -40,7 +43,7 @@ my($old)=qsearchs('agent',{'agentnum'=>$agentnum}) if $agentnum;
 $cgi->param('typenum') =~ /^(\d+)(:.*)?$/;
 $cgi->param('typenum',$1);
 
-my($new)=create FS::agent ( {
+my($new)=new FS::agent ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('agent')
diff --git a/htdocs/edit/process/agent_type.cgi b/htdocs/edit/process/agent_type.cgi
index c796dd66d..1efef9e46 100755
--- a/htdocs/edit/process/agent_type.cgi
+++ b/htdocs/edit/process/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.4 1998-12-30 23:03:27 ivan Exp $
+# $Id: agent_type.cgi,v 1.5 1999-01-18 22:47:50 ivan Exp $
 #
 # ivan@sisd.com 97-dec-11
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.4  1998-12-30 23:03:27  ivan
+# Revision 1.5  1999-01-18 22:47:50  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.4  1998/12/30 23:03:27  ivan
 # bugfixes; fields isn't exported by derived classes
 #
 # Revision 1.3  1998/12/17 08:40:17  ivan
@@ -36,7 +39,7 @@ my($cgi)=new CGI;
 my($typenum)=$cgi->param('typenum');
 my($old)=qsearchs('agent_type',{'typenum'=>$typenum}) if $typenum;
 
-my($new)=create FS::agent_type ( {
+my($new)=new FS::agent_type ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('agent_type')
@@ -75,7 +78,7 @@ foreach $part_pkg (qsearch('part_pkg',{})) {
             && ! $type_pkgs
   ) {
     #ok to clobber it now (but bad form nonetheless?)
-    $type_pkgs=create FS::type_pkgs ({
+    $type_pkgs=new FS::type_pkgs ({
       'typenum' => $typenum,
       'pkgpart' => $pkgpart,
     });
diff --git a/htdocs/edit/process/cust_credit.cgi b/htdocs/edit/process/cust_credit.cgi
index e87d588d3..e88d05769 100755
--- a/htdocs/edit/process/cust_credit.cgi
+++ b/htdocs/edit/process/cust_credit.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_credit.cgi,v 1.2 1998-12-17 08:40:18 ivan Exp $
+# $Id: cust_credit.cgi,v 1.3 1999-01-18 22:47:51 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_credit.cgi
@@ -22,7 +22,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_credit.cgi,v $
-# Revision 1.2  1998-12-17 08:40:18  ivan
+# Revision 1.3  1999-01-18 22:47:51  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.2  1998/12/17 08:40:18  ivan
 # s/CGI::Request/CGI.pm/; etc
 #
 
@@ -31,6 +34,7 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
 use FS::CGI qw(popurl eidiot);
+use FS::Record qw(fields);
 use FS::cust_credit;
 
 my($cgi)=new CGI; # create form object
@@ -41,10 +45,11 @@ my($custnum)=$1;
 
 $cgi->param('otaker',getotaker);
 
-my($new) = create FS::cust_credit ( {
+my($new) = new FS::cust_credit ( {
   map {
     $_, scalar($cgi->param($_));
-  } qw(custnum _date amount otaker reason)
+  #} qw(custnum _date amount otaker reason)
+  } fields('cust_credit');
 } );
 
 my($error);
diff --git a/htdocs/edit/process/cust_main_county-expand.cgi b/htdocs/edit/process/cust_main_county-expand.cgi
index 368949e50..e91410f64 100755
--- a/htdocs/edit/process/cust_main_county-expand.cgi
+++ b/htdocs/edit/process/cust_main_county-expand.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county-expand.cgi,v 1.3 1998-12-17 08:40:20 ivan Exp $
+# $Id: cust_main_county-expand.cgi,v 1.4 1999-01-18 22:47:52 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -15,7 +15,10 @@
 # ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county-expand.cgi,v $
-# Revision 1.3  1998-12-17 08:40:20  ivan
+# Revision 1.4  1999-01-18 22:47:52  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.3  1998/12/17 08:40:20  ivan
 # s/CGI::Request/CGI.pm/; etc
 #
 # Revision 1.2  1998/11/18 09:01:40  ivan
@@ -57,7 +60,7 @@ if ( $cgi->param('delim') eq 'n' ) {
 my($expansion);
 foreach ( @expansion) {
   my(%hash)=$cust_main_county->hash;
-  my($new)=create FS::cust_main_county \%hash;
+  my($new)=new FS::cust_main_county \%hash;
   $new->setfield('taxnum','');
   if ( ! $cust_main_county->state ) {
     $new->setfield('state',$_);
diff --git a/htdocs/edit/process/cust_main_county.cgi b/htdocs/edit/process/cust_main_county.cgi
index 11f55f236..8d274b81f 100755
--- a/htdocs/edit/process/cust_main_county.cgi
+++ b/htdocs/edit/process/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.3 1998-12-17 08:40:21 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.4 1999-01-18 22:47:53 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county.cgi,v $
-# Revision 1.3  1998-12-17 08:40:21  ivan
+# Revision 1.4  1999-01-18 22:47:53  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.3  1998/12/17 08:40:21  ivan
 # s/CGI::Request/CGI.pm/; etc
 #
 # Revision 1.2  1998/11/18 09:01:41  ivan
@@ -36,7 +39,7 @@ foreach ( $cgi->param ) {
   next unless $old->getfield('tax') ne $cgi->param("tax$taxnum");
   my(%hash)=$old->hash;
   $hash{tax}=$cgi->param("tax$taxnum");
-  my($new)=create FS::cust_main_county \%hash;
+  my($new)=new FS::cust_main_county \%hash;
   my($error)=$new->replace($old);
   eidiot($error) if $error;
 }
diff --git a/htdocs/edit/process/cust_pay.cgi b/htdocs/edit/process/cust_pay.cgi
index ce7929a77..4d8770404 100755
--- a/htdocs/edit/process/cust_pay.cgi
+++ b/htdocs/edit/process/cust_pay.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pay.cgi,v 1.3 1998-12-30 23:03:28 ivan Exp $
+# $Id: cust_pay.cgi,v 1.4 1999-01-18 22:47:54 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_pay.cgi
@@ -15,7 +15,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_pay.cgi,v $
-# Revision 1.3  1998-12-30 23:03:28  ivan
+# Revision 1.4  1999-01-18 22:47:54  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.3  1998/12/30 23:03:28  ivan
 # bugfixes; fields isn't exported by derived classes
 #
 # Revision 1.2  1998/12/17 08:40:22  ivan
@@ -27,6 +30,7 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(idiot popurl);
+use FS::Record qw(fields);
 use FS::cust_pay;
 
 my($cgi)=new CGI;
@@ -35,10 +39,11 @@ my($cgi)=new CGI;
 $cgi->param('invnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 my($invnum)=$1;
 
-my($new) = create FS::cust_pay ( {
+my($new) = new FS::cust_pay ( {
   map {
     $_, scalar($cgi->param($_));
-  } qw(invnum paid _date payby payinfo paybatch)
+  #} qw(invnum paid _date payby payinfo paybatch)
+  } fields('cust_pay')
 } );
 
 my($error);
diff --git a/htdocs/edit/process/part_pkg.cgi b/htdocs/edit/process/part_pkg.cgi
index d1f023df9..55bf4ffaf 100755
--- a/htdocs/edit/process/part_pkg.cgi
+++ b/htdocs/edit/process/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.5 1998-12-30 23:03:29 ivan Exp $
+# $Id: part_pkg.cgi,v 1.6 1999-01-18 22:47:56 ivan Exp $
 #
 # process/part_pkg.cgi: Edit package definitions (process form)
 #
@@ -17,7 +17,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.5  1998-12-30 23:03:29  ivan
+# Revision 1.6  1999-01-18 22:47:56  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.5  1998/12/30 23:03:29  ivan
 # bugfixes; fields isn't exported by derived classes
 #
 # Revision 1.4  1998/12/17 08:40:24  ivan
@@ -47,7 +50,7 @@ my($pkgpart)=$cgi->param('pkgpart');
 
 my($old)=qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
 
-my($new)=create FS::part_pkg ( {
+my($new)=new FS::part_pkg ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('part_pkg')
@@ -80,7 +83,7 @@ foreach $part_svc (qsearch('part_svc',{})) {
   });
   my($old_quantity)=$old_pkg_svc ? $old_pkg_svc->quantity : 0;
   next unless $old_quantity != $quantity; #!here
-  my($new_pkg_svc)=create FS::pkg_svc({
+  my($new_pkg_svc)=new FS::pkg_svc({
     'pkgpart'  => $pkgpart,
     'svcpart'  => $part_svc->getfield('svcpart'),
     #'quantity' => $cgi->param('pkg_svc'. $part_svc->getfield('svcpart')),
@@ -101,7 +104,7 @@ unless ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
   my($old_cust_pkg) = qsearchs( 'cust_pkg', { 'pkgnum' => $1 } );
   my %hash = $old_cust_pkg->hash;
   $hash{'pkgpart'} = $pkgpart;
-  my($new_cust_pkg) = create FS::cust_pkg \%hash;
+  my($new_cust_pkg) = new FS::cust_pkg \%hash;
   my $error = $new_cust_pkg->replace($old_cust_pkg);
   eidiot "Error modifying cust_pkg record: $error\n" if $error;
   print $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new_cust_pkg->custnum);
diff --git a/htdocs/edit/process/part_referral.cgi b/htdocs/edit/process/part_referral.cgi
index 998cd93db..b5e479d3b 100755
--- a/htdocs/edit/process/part_referral.cgi
+++ b/htdocs/edit/process/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_referral.cgi,v 1.3 1998-12-30 23:03:30 ivan Exp $
+# $Id: part_referral.cgi,v 1.4 1999-01-18 22:47:57 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_referral.cgi,v $
-# Revision 1.3  1998-12-30 23:03:30  ivan
+# Revision 1.4  1999-01-18 22:47:57  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.3  1998/12/30 23:03:30  ivan
 # bugfixes; fields isn't exported by derived classes
 #
 # Revision 1.2  1998/12/17 08:40:25  ivan
@@ -25,13 +28,12 @@ use FS::Record qw(qsearchs fields);
 use FS::part_referral;
 use FS::CGI qw(popurl eidiot);
 
-my($cgi)=new CGI; # create form object
-
+my($cgi)=new CGI;
 &cgisuidsetup($cgi);
 
 my($refnum)=$cgi->param('refnum');
 
-my($new)=create FS::part_referral ( {
+my($new)=new FS::part_referral ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('part_referral')
diff --git a/htdocs/edit/process/part_svc.cgi b/htdocs/edit/process/part_svc.cgi
index 1298dbc4e..5b814363b 100755
--- a/htdocs/edit/process/part_svc.cgi
+++ b/htdocs/edit/process/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.4 1998-12-30 23:03:31 ivan Exp $
+# $Id: part_svc.cgi,v 1.5 1999-01-18 22:47:58 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.4  1998-12-30 23:03:31  ivan
+# Revision 1.5  1999-01-18 22:47:58  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.4  1998/12/30 23:03:31  ivan
 # bugfixes; fields isn't exported by derived classes
 #
 # Revision 1.3  1998/12/17 08:40:26  ivan
@@ -28,15 +31,14 @@ use FS::Record qw(qsearchs fields);
 use FS::part_svc;
 use FS::CGI qw(eidiot popurl);
 
-my($cgi)=new CGI; # create form object
-
+my($cgi)=new CGI;
 &cgisuidsetup($cgi);
 
 my($svcpart)=$cgi->param('svcpart');
 
 my($old)=qsearchs('part_svc',{'svcpart'=>$svcpart}) if $svcpart;
 
-my($new)=create FS::part_svc ( {
+my($new)=new FS::part_svc ( {
   map {
     $_, scalar($cgi->param($_));
 #  } qw(svcpart svc svcdb)
diff --git a/htdocs/edit/process/svc_acct.cgi b/htdocs/edit/process/svc_acct.cgi
index 644a0444e..4e4080da7 100755
--- a/htdocs/edit/process/svc_acct.cgi
+++ b/htdocs/edit/process/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.2 1998-12-17 08:40:27 ivan Exp $
+# $Id: svc_acct.cgi,v 1.3 1999-01-18 22:47:59 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
@@ -23,7 +23,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.2  1998-12-17 08:40:27  ivan
+# Revision 1.3  1999-01-18 22:47:59  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.2  1998/12/17 08:40:27  ivan
 # s/CGI::Request/CGI.pm/; etc
 #
 
@@ -32,7 +35,7 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(eidiot popurl);
-use FS::Record qw(qsearchs);
+use FS::Record qw(qsearchs fields);
 use FS::svc_acct;
 
 my($cgi) = new CGI;
@@ -51,11 +54,12 @@ if ( $cgi->param('_password') eq '*HIDDEN*' ) {
   $cgi->param('_password',$old->getfield('_password'));
 }
 
-my($new) = create FS::svc_acct ( {
+my($new) = new FS::svc_acct ( {
   map {
     $_, scalar($cgi->param($_));
-  } qw(svcnum pkgnum svcpart username _password popnum uid gid finger dir
-    shell quota slipip)
+  #} qw(svcnum pkgnum svcpart username _password popnum uid gid finger dir
+  #  shell quota slipip)
+  } ( fields('svc_acct'), qw( pkgnum svcpart ) )
 } );
 
 if ( $svcnum ) {
diff --git a/htdocs/edit/process/svc_acct_pop.cgi b/htdocs/edit/process/svc_acct_pop.cgi
index 8b0e60835..fac2fa452 100755
--- a/htdocs/edit/process/svc_acct_pop.cgi
+++ b/htdocs/edit/process/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.3 1998-12-30 23:03:32 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.4 1999-01-18 22:48:00 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.3  1998-12-30 23:03:32  ivan
+# Revision 1.4  1999-01-18 22:48:00  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.3  1998/12/30 23:03:32  ivan
 # bugfixes; fields isn't exported by derived classes
 #
 # Revision 1.2  1998/12/17 08:40:28  ivan
@@ -33,7 +36,7 @@ my($popnum)=$cgi->param('popnum');
 
 my($old)=qsearchs('svc_acct_pop',{'popnum'=>$popnum}) if $popnum;
 
-my($new)=create FS::svc_acct_pop ( {
+my($new)=new FS::svc_acct_pop ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('svc_acct_pop')
diff --git a/htdocs/edit/process/svc_acct_sm.cgi b/htdocs/edit/process/svc_acct_sm.cgi
index 74ddc1a18..fc723d9de 100755
--- a/htdocs/edit/process/svc_acct_sm.cgi
+++ b/htdocs/edit/process/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.2 1998-12-17 08:40:29 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.3 1999-01-18 22:48:01 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct_sm.cgi
@@ -24,7 +24,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.2  1998-12-17 08:40:29  ivan
+# Revision 1.3  1999-01-18 22:48:01  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.2  1998/12/17 08:40:29  ivan
 # s/CGI::Request/CGI.pm/; etc
 #
 
@@ -32,10 +35,10 @@ use strict;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs);
+use FS::Record qw(qsearchs fields);
 use FS::svc_acct_sm;
 
-my($cgi)=new CGI; # create form object
+my($cgi)=new CGI;
 cgisuidsetup($cgi);
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
@@ -47,10 +50,11 @@ my($old)=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
 $cgi->param('domsvc',(split(/:/, $cgi->param('domsvc') ))[0] );
 $cgi->param('domuid',(split(/:/, $cgi->param('domuid') ))[0] );
 
-my($new) = create FS::svc_acct_sm ( {
+my($new) = new FS::svc_acct_sm ( {
   map {
     ($_, scalar($cgi->param($_)));
-  } qw(svcnum pkgnum svcpart domuser domuid domsvc)
+  #} qw(svcnum pkgnum svcpart domuser domuid domsvc)
+  } ( fields('svc_acct_sm'), qw( pkgnum svcpart) )
 } );
 
 my($error);
diff --git a/htdocs/edit/process/svc_domain.cgi b/htdocs/edit/process/svc_domain.cgi
index e4b751dbb..992123cc7 100755
--- a/htdocs/edit/process/svc_domain.cgi
+++ b/htdocs/edit/process/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.2 1998-12-17 08:40:30 ivan Exp $
+# $Id: svc_domain.cgi,v 1.3 1999-01-18 22:48:02 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -20,7 +20,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.2  1998-12-17 08:40:30  ivan
+# Revision 1.3  1999-01-18 22:48:02  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.2  1998/12/17 08:40:30  ivan
 # s/CGI::Request/CGI.pm/; etc
 #
 
@@ -40,10 +43,11 @@ my($cgi) = new CGI;
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 my($svcnum)=$1;
 
-my($new) = create FS::svc_domain ( {
+my($new) = new FS::svc_domain ( {
   map {
     $_, scalar($cgi->param($_));
-  } qw(svcnum pkgnum svcpart domain action purpose)
+  #} qw(svcnum pkgnum svcpart domain action purpose)
+  } ( fields('svc_domain'), qw( pkgnum svcpart action purpose ) )
 } );
 
 my($error);
-- 
cgit v1.2.1


From 65a4f2fb7d37996f89b5e22dac831e57d467d050 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Jan 1999 23:05:00 +0000
Subject: update TODO for stuff that was done etc.

---
 TODO | 190 ++++++++++++++++++++++++-------------------------------------------
 1 file changed, 67 insertions(+), 123 deletions(-)

diff --git a/TODO b/TODO
index 349b2bf12..d53dab078 100644
--- a/TODO
+++ b/TODO
@@ -1,13 +1,17 @@
-$Id: TODO,v 1.18 1998-12-30 23:03:19 ivan Exp $
+$Id: TODO,v 1.19 1999-01-18 23:05:00 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
 duplication of effort.
 
--- 1.1.x --
+-- before 1.2b1 --
 
-check all .pm's for numeric comparisons done as `eq' - works fine now because
-only used with integers that aren't space-padded.
+Lay out the forms a bit better.
+
+view/cust_main.cgi should show country
+
+add doc on mod_perl: upgrade to current CGI.pm
+doc Apache::AuthDBI as well
 
 FS::cust_pkg _require_'s FS::$svc, but this won't work with %FS::UID::callback
 loading of configuration.  (pry need same idea, but will run immediately if
@@ -15,53 +19,71 @@ context allows).  Looks like error is masked by 'use FS::cust_svc' which in
 turn 'use's FS::{svc_acct, svc_acct_sm, svc_domain}' which is now explicit
 w/comments in source
 
-int'l stuff in web interface (not on david's time)
+libwww regression test - since it will create sample data, can also use this
+for the web demo
+make fs-setup option to add sample data so you can click on "New Customer" right away?  so people understand what this stuff is?
 
-admin web interface for titles (Dr., Mrs.) and default in fs-setup
-(not on david's time)
+Allow a cancelled/suspended/active status from packages to bubble up to
+the customer lists.  Put active, then suspended, then cancelled accounts.
+Similar ordering on the package listing inside a single customer.
 
-test and document libapache-dbi-logger (woo!)
+Add the ability for services to filter information up to the package level
+for invoices and web screens, so you can select a particlar package based
+on username or domain name, etc.
+
+You can't delete the stuff under administration yet.  Add this,
+_including_ making sure the thing you are deleting is not in use!
+
+(Test this)
+one-time/per-customer/? changes in rates and descriptions ('remembered
+invoices'): implement by creating a new package on the fly... but it isn't 
+associated with any agent types so it won't show up for other customers to buy.
+(but also... make sure they go away when the customer does! - need this? :
+ one-off package edits! : need a cust_pkgs or cust_part_pkgs or something table,
+ with custnum and partpkg (like type_pkgs)
+
+update site_perl/table_template* (pry out of date)
+
+-- before or after ---
+
+svc_domain.pm mail sending uses Date::Format which doesn't seem to pick up 
+correct timezone.
+
+view/svc_domain.cgi needs to know the domain might be unaudited (cosmetic)
 
 remove whois_hack set to 1 for svc_domain.pm?  add all known registries and
 whois accordingly.
+.us domains and others!
+site_perl/svc_domain.cgi (hmm... or maybe should have a button?  or maybe svc_domain.pm should handle this) should set $whois_hack for non-internic domains, so you can add them...
 
-get rid of all relative URL's (have to make them on the fly) - see doc for
-->redirect in CGI.pm
+(test cust_main.pm with cybercash v2 and v3, especially with the callback
+ stuff AND with mod_perl w/cybercash v2 kludge in package main)
+(callback stuff should be eliminated by now)
 
-radius logfile parsing and perl expression check.
+-- after --
 
 faq
 
-(test cust_main.pm with cybercash v2 and v3, especially with the callback
- stuff)
+cust_bill.pm uses '==' comparison on dates because they're currently ints
+
+config file for allowed card types
+
+write instructions for adding new services w/svc_Common.pm.  Get rid of all
+places where svc_* tables are hardcoded (rename svc_acct_pop to part_pop so
+we can do that)
+
+test and document libapache-dbi-logger (woo!)
+
+radius logfile parsing and perl expression check.
 
 Fix in cust_bill BUGS: 
 There is an off-by-one error in print_text which causes a visual error (Page 1
 of 2 printed on some single-page invoices).
 
-FIX It doesn't properly inherit/override FS::Record yet, so no more replace vs
-rep silliness!
-
 fields should be a method against a FS::Record or derived object, as well as
 being something you can call as FS::Record::fields('tablename').  Might
 even be able to handle both in the same routine (that would be neato).
 
-Override FS::Record new, add, rep and del (create, insert, replace and
-delete) in all derived classes.
-IE create, insert, delete and replace from derived classes should override new, 
-add, del and rep (respectively) from FS::Record.  Depriciate old names.
-
-Allow a cancelled/suspended/active status from packages to bubble up to
-the customer lists.  Put active, then suspended, then cancelled accounts.
-Similar ordering on the package listing inside a single customer.
-
-Add the ability for services to filter information up to the package level
-for invoices and web screens, so you can select a particlar package based
-on username or domain name, etc.
-
-You can't delete the stuff under administration yet.  Add this,
-_including_ making sure the thing you are deleting is not in use!
-
 Immediate removal of incorrectly entered check payments (can't take too
 long to do this, or accounting is fubared).
 
@@ -85,13 +107,12 @@ name or first+last from cust_main.
 move all phone number logic out of Freeside - let HylaFAX or whatever
 handle it.
 
-soundex searches for customer name and company?  where are free soundex tools? (standard Text::Soundex duh)
+soundex searches for customer name and company?  where are free soundex tools? (standard Text::Soundex duh) - I could have sworn I saw Text::Soundex on CPAN?!
 
-should be able to link on (username, domain name, some field in email alias) instead of svcnum only. (username done, what else?)
+should be able to link on some field in email alias (right now you can link
+on username or domain with a fallback to svcnum)
 
-(done but clean up) change svc_domain.pm mail sending from a pipe to "/usr/lib/sendmail" to Mail::Mailer or Net::SMTP or something.  also is the complete text of the registration agreement needed in there (it used to be)?
-
-generalize and make configurable new invoice printing scheme in FS::Bill::collect (past due)
+generalize and make configurable new invoice printing scheme in FS::cust_main::collect (past due)
 
 deleting an svc_domain should delete all associated svc_acct_sm records.
 same with a svc_acct.
@@ -105,34 +126,18 @@ expire cron job
 ...
 Allow for a future setup date on accounts.
 
-one-time/per-customer/? changes in rates and descriptions ('remembered
-invoices'): implement by creating a new package on the fly... but it isn't 
-associated with any agent types so it won't show up for other customers to buy.
-
-if CGI::Base will not have redirect fixed (cgifix.html), should migrate to
-CGI.pm insetead?  It is >1 year newer.
-
-library repetitve stuff from Bill.pm Invoice.pm and friends (calculating
-previous balances etc etc)
-
-
 sub AUTOLOAD in FS::Record should warn? die? if used with a non-existant column
 name?
 
 edit (not just import, export and allow default/fixed) arbitrary radius stuff
 in svc_acct
-
 edit/svc_acct.cgi and edit/process/svc_acct.cgi should deal with arbitrary radius stuff
 
 radius import should take DEFAULT entry and put it in /var/spool/freeside/conf/radius-default ; svc_acct.export should use it (and doc)
 
-FS::Invoice and FS::Bill should merge with the classes they're derived from
-
 in UI, s/State/State\/Provence/go and s/County/County\/Locality/go
 
-.us domains and others!
-
-what else (besides l10n) for i18n?
+what else (besides l10n) for i18n? (money!)
 
 audit htdocs/* for things that should be libraried and things that should be
 new methods on the objects (need to do this before implementing a new UI)
@@ -142,10 +147,7 @@ some places we die() where we should &FS::CGI::idiot (and perhaps vice-versa).
 Decide based on whether or not the "error" should show up in logs.
 
 all .cgi's should use standard header/footer and idiot() subroutines.  maybe HTML:: perl modules
-for HTML creation.  CGI.pm instead.
-
-library the conf reading stuff; bin/svc_acct.export version with missing-filename checking is good
-library conf stuff -> check all the conf stuff to make sure they close filehandles.
+for HTML creation.  Maybe Embperl or something along those lines.  ?
 
 When running bin/bill, Fix this (Annoying but harmless):
 Use of uninitialized value at /usr/local/lib/site_perl/FS/cust_pkg.pm line 99, <ADDRESS> chunk 4.
@@ -161,49 +163,9 @@ should FS::Record use Tie::Hash?  That would be very clean, but where do we
 store the other information?  Maybe you could ask any FS::Record object for a
 tied hash?
 
-change all htdocs/edit/process/* loops to look like: (library this sort of thing!!!!)
-
-my($new) = create FS::svc_acct_sm ( {
-  map {
-    ($_, scalar($req->param($_)));
-  } qw(svcnum pkgnum svcpart domuser domuid domsvc)
-} );
-
-to avoid form errors causing too much silliness
-
-add this code to all svc_*.pm (already in acct and acct_sm and domain): (library!)
-
-  #get part_svc
-  my($svcpart);
-  my($svcnum)=$self->getfield('svcnum');
-  if ($svcnum) {
-    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
-    return "Unknown svcnum" unless $cust_svc; 
-    $svcpart=$cust_svc->svcpart;
-  } else {
-    $svcpart=$self->getfield('svcpart');
-  }
-  my($part_svc)=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  return "Unkonwn svcpart" unless $part_svc;
-
-  #set fixed fields from part_svc
-  my($field);
-  foreach $field ( fields('svc_acct') ) {
-    if ( $part_svc->getfield('svc_acct__'. $field. '_flag') eq 'F' ) {
-      $self->setfield($field,$part_svc->getfield('svc_acct__'. $field) );
-    }
-  }
-
 change all file access from regular open(FILE,) stuff to OO, because of 
 problems scoping and passing filehandles like that.
 
-svc_domain.pm mail sending uses Date::Format which doesn't seem to pick up 
-correct timezone.
-
-view/svc_domain.cgi needs to know the domain might be unaudited (cosmetic)
-
---- 1.1.x or 1.2 or later
-
 the web interface should create a new object and use it instead of a blank
 form for new records.  the create method of svc_ objects should set defaults
 (from part_svc).
@@ -228,8 +190,6 @@ between packages).
 
 Auto-increment expired cards one year, and try again?
 
-Lay out the forms a bit better.
-
 More non-US stuff - zip codes, country codes, foreign currencies, etc.
 
 cust_refund.{cgi.pm} need to do cards xaxtions.  (now we only have cust_credit)
@@ -256,7 +216,6 @@ Add more registries (not just InterNIC's com org net edu)
 
 Nice postscript paper invoices, rather than current ASCII invoices.
 
-
 think about race-condititions in FS::Record and derived ->check ->insert
 and so on, uid and username checks in svc_acct, etc.
 
@@ -278,14 +237,14 @@ write a generic batch senders and batch parsers.
 
 need a way to override svc_acct export on a per-machine basis; just use config files based on machine name i suppose; document that. (no, import desync_hosts
 type stuff from cerkit)
+...
+add a table with column of export services (passwd, shadow, master.passwd, .qmail file update, dns update, etc.) and rows machine groups and whether or not to export that (and any necessary parameters).  wasn't matt (vunderkid, not matt@michweb) working on this?  find him?  each machine goes in a group of its own as well as a group based on function.  add a table with only svcpart and machine group.  now, when you import from each machine, it can get its own accounts with one svcpart and universal accounts with another svcpart.  (though that does make the username duplicate checking more interesting)
 
 you should be able to get column types as a method against an FS::Record object
 as well as dbdef->table($table)->column($column)->type
 
 move to perl module for fuzzy and soundex searching.
 
-make fs-setup option to add sample data so you can click on "New Customer" right away?  so people understand what this stuff is?
-
 package view needs to list extraneous services; we need to prevent the
 creation of them so this never happens (and mark it as such in the source)
 (the creation problem should be fixed - though they will still happen if people
@@ -304,11 +263,6 @@ something to automate making a release and updating the web demo
 
 export a debian-style (also redhat and?) /etc/group file aswell!
 
-seems to be an off-by-one error in the ascii invoice formatting which is saying
-"1 of 2" pages when there is only one.
-
-site_perl/svc_domain.cgi (hmm... or maybe should have a button?  or maybe svc_domain.pm should handle this) should set $whois_hack for non-internic domains, so you can add them...
-
 svc_acct_sm.import qmail import should pull in recipientmap people too.
 
 .pm's like svc_acct.pm which need to do time-consuming things like ssh remotely
@@ -323,13 +277,8 @@ additional interfaces (perltk?  java?)
 
 Put the GPL notice in all files.
 
--- 1.2 or later --
-
 integrate w/IDEA's signup server
 
-one-off package edits! : need a cust_pkgs or cust_part_pkgs or something table,
-with custnum and partpkg (like type_pkgs)
-
 $cust_bill->owed database field to be eliminated, replaced by a method call
 that calculates on the fly.  make sure to grep for ->(get|set)field('owed') 
 same for cust_credit->credited
@@ -385,8 +334,6 @@ edit/svc_wo.cgi
 edit/process/svc_wo.cgi
 Call tracking and trouble tickets.
 
-use mod_perl and Apache::AuthDBI instead of mod_auth_mysql when we do local 
-users
 More accoutability for complimentary accounts: approval, expiration, term
 (no more than x months in advance) and notification.
 Flag particular users (or all users, for that matter) as having their
@@ -397,14 +344,11 @@ Better Freeside-level configurable access, for those ISP's who have
 employees they can't trust.  Right now you're "stuck" with setting up
 .htaccess stuff yourself.  This should really just be integrated. 
 
-update site_perl/table_template* (pry out of date)
-
-/var/spool/freeside/conf (and whatever else /var/spool/freeside we can)
-in database (except secrets), then web interface, 
-make /var/spool/freeside a configurable directory (probably as part of 
-some automated installation process?)
-
-add a table with column of export services (passwd, shadow, master.passwd, .qmail file update, dns update, etc.) and rows machine groups and whether or not to export that (and any necessary parameters).  wasn't matt (vunderkid, not matt@michweb) working on this?  find him?  each machine goes in a group of its own as well as a group based on function.  add a table with only svcpart and machine group.  now, when you import from each machine, it can get its own accounts with one svcpart and universal accounts with another svcpart.  (though that does make the username duplicate checking more interesting)
+configuration/setup should get web interface
+...
+/usr/local/etc/freeside should be configurable
+...
+(probably as part of some automated installation process?)
 
 password and slipip stuff in svc_acct.pm store need to be split into two fields or something, so the silliness in svc_acct.pm and svc_acct.export with looking at the data to decide what to do with it can be fixed (1.2)
 
-- 
cgit v1.2.1


From c116ce940c33dcd7e37a87a8eb2936e17cc68b11 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Jan 1999 05:14:23 +0000
Subject: for mod_perl: no more top-level my() variables; use vars instead also
 the last s/create/new/;

---
 htdocs/browse/agent.cgi                         | 16 +++++----
 htdocs/browse/agent_type.cgi                    | 14 +++++---
 htdocs/browse/cust_main_county.cgi              | 14 +++++---
 htdocs/browse/part_pkg.cgi                      | 14 +++++---
 htdocs/browse/part_referral.cgi                 | 14 +++++---
 htdocs/browse/part_svc.cgi                      | 14 +++++---
 htdocs/browse/svc_acct_pop.cgi                  | 14 +++++---
 htdocs/edit/agent.cgi                           | 21 ++++++------
 htdocs/edit/agent_type.cgi                      | 19 ++++++-----
 htdocs/edit/cust_credit.cgi                     | 27 +++++++++-------
 htdocs/edit/cust_main.cgi                       | 39 +++++++++++++---------
 htdocs/edit/cust_main_county-expand.cgi         | 19 +++++++----
 htdocs/edit/cust_main_county.cgi                | 12 ++++---
 htdocs/edit/cust_pay.cgi                        | 23 +++++++------
 htdocs/edit/cust_pkg.cgi                        | 30 +++++++++--------
 htdocs/edit/part_pkg.cgi                        | 22 +++++++------
 htdocs/edit/part_referral.cgi                   | 18 +++++++----
 htdocs/edit/part_svc.cgi                        | 23 +++++++------
 htdocs/edit/process/agent.cgi                   | 18 +++++++----
 htdocs/edit/process/agent_type.cgi              | 19 ++++++-----
 htdocs/edit/process/cust_credit.cgi             | 16 +++++----
 htdocs/edit/process/cust_main.cgi               | 20 +++++++-----
 htdocs/edit/process/cust_main_county-expand.cgi | 17 ++++++----
 htdocs/edit/process/cust_main_county.cgi        | 11 +++++--
 htdocs/edit/process/cust_pay.cgi                | 16 +++++----
 htdocs/edit/process/cust_pkg.cgi                | 19 ++++++-----
 htdocs/edit/process/part_pkg.cgi                | 18 +++++++----
 htdocs/edit/process/part_referral.cgi           | 15 ++++++---
 htdocs/edit/process/part_svc.cgi                | 17 ++++++----
 htdocs/edit/process/svc_acct.cgi                | 17 ++++++----
 htdocs/edit/process/svc_acct_pop.cgi            | 17 ++++++----
 htdocs/edit/process/svc_acct_sm.cgi             | 18 +++++++----
 htdocs/edit/process/svc_domain.cgi              | 16 +++++----
 htdocs/edit/svc_acct.cgi                        | 42 +++++++++++++-----------
 htdocs/edit/svc_acct_pop.cgi                    | 20 +++++++-----
 htdocs/edit/svc_acct_sm.cgi                     | 25 +++++++-------
 htdocs/edit/svc_domain.cgi                      | 28 ++++++++--------
 htdocs/misc/bill.cgi                            | 19 ++++++-----
 htdocs/misc/cancel-unaudited.cgi                | 21 ++++++------
 htdocs/misc/cancel_pkg.cgi                      | 19 +++++++----
 htdocs/misc/expire_pkg.cgi                      | 22 +++++++------
 htdocs/misc/link.cgi                            | 25 ++++++++------
 htdocs/misc/print-invoice.cgi                   | 22 +++++++------
 htdocs/misc/process/link.cgi                    | 16 +++++----
 htdocs/misc/susp_pkg.cgi                        | 19 +++++++----
 htdocs/misc/unsusp_pkg.cgi                      | 19 +++++++----
 htdocs/search/cust_bill.cgi                     | 13 +++++---
 htdocs/search/cust_main.cgi                     | 21 ++++++------
 htdocs/search/cust_pkg.cgi                      | 15 +++++----
 htdocs/search/svc_acct.cgi                      | 15 +++++----
 htdocs/search/svc_acct_sm.cgi                   | 21 ++++++------
 htdocs/search/svc_domain.cgi                    | 16 +++++----
 htdocs/view/cust_bill.cgi                       | 23 +++++++------
 htdocs/view/cust_main.cgi                       | 39 +++++++++++-----------
 htdocs/view/cust_pkg.cgi                        | 33 +++++++++++--------
 htdocs/view/svc_acct.cgi                        | 32 ++++++++++--------
 htdocs/view/svc_acct_sm.cgi                     | 43 ++++++++++++++-----------
 htdocs/view/svc_domain.cgi                      | 29 ++++++++++-------
 58 files changed, 715 insertions(+), 489 deletions(-)

diff --git a/htdocs/browse/agent.cgi b/htdocs/browse/agent.cgi
index 446401eca..1b459df95 100755
--- a/htdocs/browse/agent.cgi
+++ b/htdocs/browse/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.9 1999-01-18 09:41:14 ivan Exp $
+# $Id: agent.cgi,v 1.10 1999-01-19 05:13:24 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -15,7 +15,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent.cgi,v $
-# Revision 1.9  1999-01-18 09:41:14  ivan
+# Revision 1.10  1999-01-19 05:13:24  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.9  1999/01/18 09:41:14  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -42,6 +46,7 @@
 #
 
 use strict;
+use vars qw( $ui $cgi $p $agent );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup swapuid);
@@ -55,7 +60,7 @@ use FS::agent_type;
 use FS::UI::CGI;
 use FS::UI::agent;
 
-my $ui = new FS::UI::agent;
+$ui = new FS::UI::agent;
 $ui->browse;
 exit;
 
@@ -63,11 +68,11 @@ exit;
 
 __END__
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-my($p)=popurl(2);
+$p = popurl(2);
 
 print $cgi->header( '-expires' => 'now' ), header('Agent Listing', menubar(
   'Main Menu'   => $p,
@@ -88,7 +93,6 @@ END
 #        <TH><FONT SIZE=-1>Agent #</FONT></TH>
 #        <TH>Agent</TH>
 
-my($agent);
 foreach $agent ( sort { 
   $a->getfield('agentnum') <=> $b->getfield('agentnum')
 } qsearch('agent',{}) ) {
diff --git a/htdocs/browse/agent_type.cgi b/htdocs/browse/agent_type.cgi
index 8bbf1e291..ff3a68cf6 100755
--- a/htdocs/browse/agent_type.cgi
+++ b/htdocs/browse/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.4 1999-01-18 09:41:15 ivan Exp $
+# $Id: agent_type.cgi,v 1.5 1999-01-19 05:13:25 ivan Exp $
 #
 # ivan@sisd.com 97-dec-10
 #
@@ -11,7 +11,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.4  1999-01-18 09:41:15  ivan
+# Revision 1.5  1999-01-19 05:13:25  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:15  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -23,6 +27,7 @@
 #
 
 use strict;
+use vars qw( $cgi $p $agent_type );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup swapuid);
@@ -32,11 +37,11 @@ use FS::agent_type;
 use FS::type_pkgs;
 use FS::part_pkg;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-my($p)=popurl(2);
+$p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header("Agent Type Listing", menubar(
   'Main Menu' => $p,
 )), "Agent types define groups of packages that you can then assign to".
@@ -47,7 +52,6 @@ print $cgi->header( '-expires' => 'now' ), header("Agent Type Listing", menubar(
       </TR>
 END
 
-my($agent_type);
 foreach $agent_type ( sort { 
   $a->getfield('typenum') <=> $b->getfield('typenum')
 } qsearch('agent_type',{}) ) {
diff --git a/htdocs/browse/cust_main_county.cgi b/htdocs/browse/cust_main_county.cgi
index 728f1d937..0e899f246 100755
--- a/htdocs/browse/cust_main_county.cgi
+++ b/htdocs/browse/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.4 1999-01-18 09:41:16 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.5 1999-01-19 05:13:26 ivan Exp $
 #
 # ivan@sisd.com 97-dec-13
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county.cgi,v $
-# Revision 1.4  1999-01-18 09:41:16  ivan
+# Revision 1.5  1999-01-19 05:13:26  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:16  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -22,6 +26,7 @@
 #
 
 use strict;
+use vars qw( $cgi $p $cust_main_county );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup swapuid);
@@ -29,11 +34,11 @@ use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header menubar popurl table);
 use FS::cust_main_county;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-my($p) = popurl(2);
+$p = popurl(2);
 
 print $cgi->header( '-expires' => 'now' ), header("Tax Rate Listing", menubar(
   'Main Menu' => $p,
@@ -52,7 +57,6 @@ print table, <<END;
       </TR>
 END
 
-my($cust_main_county);
 foreach $cust_main_county ( qsearch('cust_main_county',{}) ) {
   my($hashref)=$cust_main_county->hashref;
   print <<END;
diff --git a/htdocs/browse/part_pkg.cgi b/htdocs/browse/part_pkg.cgi
index 22d8b9a15..413a108cf 100755
--- a/htdocs/browse/part_pkg.cgi
+++ b/htdocs/browse/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.5 1999-01-18 09:41:17 ivan Exp $
+# $Id: part_pkg.cgi,v 1.6 1999-01-19 05:13:27 ivan Exp $
 #
 # ivan@sisd.com 97-dec-5,9
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.5  1999-01-18 09:41:17  ivan
+# Revision 1.6  1999-01-19 05:13:27  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:17  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -25,6 +29,7 @@
 #
 
 use strict;
+use vars qw( $cgi $p $part_pkg );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup swapuid);
@@ -34,11 +39,11 @@ use FS::part_pkg;
 use FS::pkg_svc;
 use FS::part_svc;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-my $p = popurl(2);
+$p = popurl(2);
 
 print $cgi->header( '-expires' => 'now' ), header("Package Part Listing",menubar(
   'Main Menu' => $p,
@@ -57,7 +62,6 @@ print $cgi->header( '-expires' => 'now' ), header("Package Part Listing",menubar
       </TR>
 END
 
-my($part_pkg);
 foreach $part_pkg ( sort { 
   $a->getfield('pkgpart') <=> $b->getfield('pkgpart')
 } qsearch('part_pkg',{}) ) {
diff --git a/htdocs/browse/part_referral.cgi b/htdocs/browse/part_referral.cgi
index 859995af0..e3360567c 100755
--- a/htdocs/browse/part_referral.cgi
+++ b/htdocs/browse/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_referral.cgi,v 1.6 1999-01-18 09:41:18 ivan Exp $
+# $Id: part_referral.cgi,v 1.7 1999-01-19 05:13:28 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23 
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_referral.cgi,v $
-# Revision 1.6  1999-01-18 09:41:18  ivan
+# Revision 1.7  1999-01-19 05:13:28  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6  1999/01/18 09:41:18  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -28,6 +32,7 @@
 #
 
 use strict;
+use vars qw( $cgi $p $part_referral );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup swapuid);
@@ -35,11 +40,11 @@ use FS::Record qw(qsearch);
 use FS::CGI qw(header menubar popurl table);
 use FS::part_referral;
 
-my $cgi = new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-my $p = popurl(2);
+$p = popurl(2);
 
 print $cgi->header( '-expires' => 'now' ), header("Referral Listing", menubar(
   'Main Menu' => $p,
@@ -50,7 +55,6 @@ print $cgi->header( '-expires' => 'now' ), header("Referral Listing", menubar(
       </TR>
 END
 
-my($part_referral);
 foreach $part_referral ( sort { 
   $a->getfield('refnum') <=> $b->getfield('refnum')
 } qsearch('part_referral',{}) ) {
diff --git a/htdocs/browse/part_svc.cgi b/htdocs/browse/part_svc.cgi
index 38c05cb7c..5112f5120 100755
--- a/htdocs/browse/part_svc.cgi
+++ b/htdocs/browse/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.8 1999-01-18 09:41:19 ivan Exp $
+# $Id: part_svc.cgi,v 1.9 1999-01-19 05:13:29 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14, 97-dec-9
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.8  1999-01-18 09:41:19  ivan
+# Revision 1.9  1999-01-19 05:13:29  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.8  1999/01/18 09:41:19  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -34,6 +38,7 @@
 #
 
 use strict;
+use vars qw( $cgi $p $part_svc );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -41,11 +46,11 @@ use FS::Record qw(qsearch fields);
 use FS::part_svc;
 use FS::CGI qw(header menubar popurl table);
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-my $p = popurl(2);
+$p = popurl(2);
 
 print $cgi->header( '-expires' => 'now' ), header('Service Part Listing', menubar(
   'Main Menu' => $p,
@@ -61,7 +66,6 @@ print table, <<END;
       </TR>
 END
 
-my($part_svc);
 foreach $part_svc ( sort {
   $a->getfield('svcpart') <=> $b->getfield('svcpart')
 } qsearch('part_svc',{}) ) {
diff --git a/htdocs/browse/svc_acct_pop.cgi b/htdocs/browse/svc_acct_pop.cgi
index b172e78ea..5f4126137 100755
--- a/htdocs/browse/svc_acct_pop.cgi
+++ b/htdocs/browse/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.4 1999-01-18 09:41:20 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.5 1999-01-19 05:13:30 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.4  1999-01-18 09:41:20  ivan
+# Revision 1.5  1999-01-19 05:13:30  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:20  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -22,6 +26,7 @@
 #
 
 use strict;
+use vars qw( $cgi $p $svc_acct_pop );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup swapuid);
@@ -29,11 +34,11 @@ use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header menubar table popurl);
 use FS::svc_acct_pop;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-my $p = popurl(2);
+$p = popurl(2);
 
 print $cgi->header( '-expires' => 'now' ), header('POP Listing', menubar(
   'Main Menu' => $p,
@@ -47,7 +52,6 @@ print $cgi->header( '-expires' => 'now' ), header('POP Listing', menubar(
       </TR>
 END
 
-my($svc_acct_pop);
 foreach $svc_acct_pop ( sort { 
   $a->getfield('popnum') <=> $b->getfield('popnum')
 } qsearch('svc_acct_pop',{}) ) {
diff --git a/htdocs/edit/agent.cgi b/htdocs/edit/agent.cgi
index 291f1b234..85489079b 100755
--- a/htdocs/edit/agent.cgi
+++ b/htdocs/edit/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.4 1999-01-18 09:41:21 ivan Exp $
+# $Id: agent.cgi,v 1.5 1999-01-19 05:13:31 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -11,7 +11,11 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: agent.cgi,v $
-# Revision 1.4  1999-01-18 09:41:21  ivan
+# Revision 1.5  1999-01-19 05:13:31  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:21  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -23,6 +27,7 @@
 #
 
 use strict;
+use vars qw ( $cgi $agent $action $query $hashref $p $agent_type );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -31,22 +36,21 @@ use FS::Record qw(qsearch qsearchs);
 use FS::agent;
 use FS::agent_type;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-my($agent,$action);
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 if ( $query =~ /^(\d+)$/ ) { #editing
   $agent=qsearchs('agent',{'agentnum'=>$1});
   $action='Edit';
 } else { #adding
-  $agent=create FS::agent {};
+  $agent = new FS::agent {};
   $action='Add';
 }
-my($hashref)=$agent->hashref;
+$hashref = $agent->hashref;
 
-my $p = popurl(2);
+$p = popurl(2);
 
 print $cgi->header( '-expires' => 'now' ), header("$action Agent", menubar(
   'Main Menu' => $p,
@@ -62,7 +66,6 @@ Agent                     <INPUT TYPE="text" NAME="agent" SIZE=32 VALUE="$hashre
 Agent type                <SELECT NAME="typenum" SIZE=1>
 END
 
-my($agent_type);
 foreach $agent_type (qsearch('agent_type',{})) {
   print "<OPTION";
   print " SELECTED"
diff --git a/htdocs/edit/agent_type.cgi b/htdocs/edit/agent_type.cgi
index b9da2a283..b12c4e28f 100755
--- a/htdocs/edit/agent_type.cgi
+++ b/htdocs/edit/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.8 1999-01-18 09:41:22 ivan Exp $
+# $Id: agent_type.cgi,v 1.9 1999-01-19 05:13:32 ivan Exp $
 #
 # agent_type.cgi: Add/Edit agent type (output form)
 #
@@ -13,7 +13,11 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.8  1999-01-18 09:41:22  ivan
+# Revision 1.9  1999-01-19 05:13:32  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.8  1999/01/18 09:41:22  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -38,6 +42,7 @@
 #
 
 use strict;
+use vars qw( $cgi $agent_type $action $hashref $p $part_pkg );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -48,23 +53,22 @@ use FS::agent_type;
 use FS::part_pkg;
 use FS::type_pkgs;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-my($agent_type,$action);
 if ( $cgi->keywords ) { #editing
   my( $query ) = $cgi->keywords;
   $query =~ /^(\d+)$/;
   $agent_type=qsearchs('agent_type',{'typenum'=>$1});
   $action='Edit';
 } else { #adding
-  $agent_type=create FS::agent_type {};
+  $agent_type = new FS::agent_type {};
   $action='Add';
 }
-my($hashref)=$agent_type->hashref;
+$hashref = $agent_type->hashref;
 
-my($p)=popurl(2);
+$p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header("$action Agent Type", menubar(
   'Main Menu' => "$p",
   'View all agent types' => "${p}browse/agent_type.cgi",
@@ -78,7 +82,6 @@ print <<END;
 <BR><BR>Select which packages agents of this type may sell to customers<BR>
 END
 
-my($part_pkg);
 foreach $part_pkg ( qsearch('part_pkg',{}) ) {
   print qq!<BR><INPUT TYPE="checkbox" NAME="pkgpart!,
         $part_pkg->getfield('pkgpart'), qq!" !,
diff --git a/htdocs/edit/cust_credit.cgi b/htdocs/edit/cust_credit.cgi
index 4b7276f4b..fdb821fa6 100755
--- a/htdocs/edit/cust_credit.cgi
+++ b/htdocs/edit/cust_credit.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_credit.cgi,v 1.4 1999-01-18 09:41:23 ivan Exp $
+# $Id: cust_credit.cgi,v 1.5 1999-01-19 05:13:33 ivan Exp $
 #
 # Usage: cust_credit.cgi custnum [ -paybatch ]
 #        http://server.name/path/cust_credit?custnum [ -paybatch ]
@@ -25,7 +25,11 @@
 # rewrite ivan@sisd.com 98-mar-16
 #
 # $Log: cust_credit.cgi,v $
-# Revision 1.4  1999-01-18 09:41:23  ivan
+# Revision 1.5  1999-01-19 05:13:33  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:23  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -37,23 +41,24 @@
 #
 
 use strict;
+use vars qw( $cgi $query $custnum $otaker $p1 $crednum $date $amount $reason );
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
 use FS::CGI qw(header popurl);
 
-my $cgi = new CGI;
+$cgi = new CGI;
 
 cgisuidsetup($cgi);
 
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
-my($custnum)=$1;
+$custnum = $1;
 
-my($otaker)=getotaker;
+$otaker = getotaker;
 
-my $p1 = popurl(1);
+$p1 = popurl(1);
 
 print $cgi->header( '-expires' => 'now' ), header("Post Credit", ''), <<END;
     <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>
@@ -61,7 +66,7 @@ print $cgi->header( '-expires' => 'now' ), header("Post Credit", ''), <<END;
 END
 
 #crednum
-my($crednum)="";
+$crednum = "";
 print qq!Credit #<B>!, $crednum ? $crednum : " <I>(NEW)</I>", qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
 
 #custnum
@@ -71,11 +76,11 @@ print qq!\nCustomer #<B>$custnum</B><INPUT TYPE="hidden" NAME="custnum" VALUE="$
 print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
 
 #date
-my($date)=time;
+$date = time;
 print qq!\nDate: <B>!, time2str("%D",$date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="$date">!;
 
 #amount
-my($amount)='';
+$amount = '';
 print qq!\nAmount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
 
 #refund?
@@ -85,7 +90,7 @@ print qq!\nAmount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXL
 print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!;
 
 #reason
-my($reason)='';
+$reason = '';
 print qq!\nReason <INPUT TYPE="text" NAME="reason" VALUE="$reason" SIZE=72>!;
 
 print <<END;
diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 174c7986f..1c2ba4cd4 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.6 1999-01-18 09:41:24 ivan Exp $
+# $Id: cust_main.cgi,v 1.7 1999-01-19 05:13:34 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -40,7 +40,11 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.6  1999-01-18 09:41:24  ivan
+# Revision 1.7  1999-01-19 05:13:34  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6  1999/01/18 09:41:24  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -55,6 +59,10 @@
 #
 
 use strict;
+use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
+             $last $first $ss $company $address1 $address2 $city $zip 
+             $daytime $night $fax @invoicing_list $invoicing_list $payinfo
+             $payname %payby %paybychecked $refnum $otaker );
 use CGI::Switch;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
@@ -62,12 +70,11 @@ use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header popurl itable table);
 use FS::cust_main;
 
-my $cgi = new CGI;
+$cgi = new CGI;
 cgisuidsetup($cgi);
 
 #get record
 
-my ( $custnum, $action, $cust_main );
 if ( $cgi->keywords ) { #editing
   my( $query ) = $cgi->keywords;
   $query =~ /^(\d+)$/;
@@ -83,7 +90,7 @@ if ( $cgi->keywords ) { #editing
 
 # top
 
-my $p1 = popurl(1);
+$p1 = popurl(1);
 print $cgi->header( '-expires' => 'now' ), header("Customer $action", ''),
       qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST>!,
       qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!,
@@ -93,8 +100,8 @@ print $cgi->header( '-expires' => 'now' ), header("Customer $action", ''),
 
 # agent
 
-my @agents = qsearch( 'agent', {} );
-my $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
+@agents = qsearch( 'agent', {} );
+$agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
 if ( scalar(@agents) == 1 ) {
   print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!;
 } else {
@@ -111,7 +118,7 @@ if ( scalar(@agents) == 1 ) {
 
 # contact info
 
-my($last,$first,$ss,$company,$address1,$address2,$city,$zip)=(
+($last,$first,$ss,$company,$address1,$address2,$city,$zip)=(
   $cust_main->last,
   $cust_main->first,
   $cust_main->ss,
@@ -143,7 +150,7 @@ foreach ( qsearch('cust_main_county',{}) ) {
 }
 print qq!</SELECT></TD><TH>Zip</TH><TD><INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10></TD></TR>!;
 
-my($daytime,$night,$fax)=(
+($daytime,$night,$fax)=(
   $cust_main->daytime,
   $cust_main->night,
   $cust_main->fax,
@@ -190,28 +197,28 @@ print "<BR>Billing information", itable("#c0c0c0"),
 print qq! CHECKED! if $cust_main->tax eq "Y";
 print qq!>Tax Exempt!;
 print qq!</TD></TR><TR><TD><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
-my @invoicing_list = $cust_main->invoicing_list;
+@invoicing_list = $cust_main->invoicing_list;
 print qq! CHECKED!
   if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
 print qq!> Postal mail invoice!;
-my $invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
+$invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
 print qq!</TD></TR><TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD>!;
 
 print "</TD></TR></TABLE>";
 
 print table("#c0c0c0"), "<TR>";
 
-my($payinfo, $payname)=(
+($payinfo, $payname)=(
   $cust_main->payinfo,
   $cust_main->payname,
 );
 
-my %payby = (
+%payby = (
   'CARD' => qq!Credit card<BR><INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>Exp !. expselect("CARD"). qq!<BR>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
   'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>Exp !. expselect("BILL", "12-2037"). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
   'COMP' => qq!Complimentary<BR>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>Exp !. expselect("COMP"),
 );
-my %paybychecked = (
+%paybychecked = (
   'CARD' => qq!Credit card<BR><INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
   'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
   'COMP' => qq!Complimentary<BR>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>Exp !. expselect("COMP", $cust_main->paydate),
@@ -229,7 +236,7 @@ print "</TR></TABLE>";
 
 #referral
 
-my $refnum = $cust_main->refnum || 0;
+$refnum = $cust_main->refnum || 0;
 if ( $custnum ) {
   print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
 } else {
@@ -246,7 +253,7 @@ if ( $custnum ) {
   print "</SELECT>";
 }
 
-my $otaker = $cust_main->otaker;
+$otaker = $cust_main->otaker;
 print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!,
       qq!<BR><BR><INPUT TYPE="submit" VALUE="!,
       $custnum ?  "Apply Changes" : "Add Customer", qq!">!,
diff --git a/htdocs/edit/cust_main_county-expand.cgi b/htdocs/edit/cust_main_county-expand.cgi
index 1b231bcec..65629844d 100755
--- a/htdocs/edit/cust_main_county-expand.cgi
+++ b/htdocs/edit/cust_main_county-expand.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county-expand.cgi,v 1.4 1999-01-18 09:41:25 ivan Exp $
+# $Id: cust_main_county-expand.cgi,v 1.5 1999-01-19 05:13:35 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county-expand.cgi,v $
-# Revision 1.4  1999-01-18 09:41:25  ivan
+# Revision 1.5  1999-01-19 05:13:35  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:25  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -22,6 +26,7 @@
 #
 
 use strict;
+use vars qw( $cgi $query $taxnum $cust_main_county $p1 );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -29,19 +34,19 @@ use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header menubar popurl);
 use FS::cust_main_county;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 $query =~ /^(\d+)$/
   or die "Illegal taxnum!";
-my($taxnum)=$1;
+$taxnum = $1;
 
-my($cust_main_county)=qsearchs('cust_main_county',{'taxnum'=>$taxnum});
+$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum});
 die "Can't expand entry!" if $cust_main_county->getfield('county');
 
-my $p1 = popurl(1);
+$p1 = popurl(1);
 print $cgi->header( '-expires' => 'now' ), header("Tax Rate (expand)", menubar(
   'Main Menu' => popurl(2),
 )), <<END;
diff --git a/htdocs/edit/cust_main_county.cgi b/htdocs/edit/cust_main_county.cgi
index 7d5468bed..05c072786 100755
--- a/htdocs/edit/cust_main_county.cgi
+++ b/htdocs/edit/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.4 1999-01-18 09:41:26 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.5 1999-01-19 05:13:36 ivan Exp $
 #
 # ivan@sisd.com 97-dec-13-16
 #
@@ -11,7 +11,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 # 
 # $Log: cust_main_county.cgi,v $
-# Revision 1.4  1999-01-18 09:41:26  ivan
+# Revision 1.5  1999-01-19 05:13:36  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:26  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -23,6 +27,7 @@
 #
 
 use strict;
+use vars qw( $cgi $cust_main_county );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -30,7 +35,7 @@ use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header menubar popurl table);
 use FS::cust_main_county;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
@@ -46,7 +51,6 @@ print $cgi->header( '-expires' => 'now' ), header("Edit tax rates", menubar(
       </TR>
 END
 
-my($cust_main_county);
 foreach $cust_main_county ( qsearch('cust_main_county',{}) ) {
   my($hashref)=$cust_main_county->hashref;
   print <<END;
diff --git a/htdocs/edit/cust_pay.cgi b/htdocs/edit/cust_pay.cgi
index 929c9e7e4..4cd95de55 100755
--- a/htdocs/edit/cust_pay.cgi
+++ b/htdocs/edit/cust_pay.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pay.cgi,v 1.3 1999-01-18 09:41:27 ivan Exp $
+# $Id: cust_pay.cgi,v 1.4 1999-01-19 05:13:37 ivan Exp $
 #
 # Usage: cust_pay.cgi invnum
 #        http://server.name/path/cust_pay.cgi?invnum
@@ -14,7 +14,11 @@
 # rewrite ivan@sisd.com 98-mar-16
 #
 # $Log: cust_pay.cgi,v $
-# Revision 1.3  1999-01-18 09:41:27  ivan
+# Revision 1.4  1999-01-19 05:13:37  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 09:41:27  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -23,20 +27,21 @@
 #
 
 use strict;
+use vars qw( $cgi $query $invnum $p1 $date $payby $payinfo );
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(header popurl);
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 cgisuidsetup($cgi);
 
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
-my($invnum)=$1;
+$invnum = $1;
 
-my $p1 = popurl(1);
+$p1 = popurl(1);
 print $cgi->header( '-expires' => 'now' ), header("Enter payment", ''), <<END;
     <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
     <HR><PRE>
@@ -46,18 +51,18 @@ END
 print qq!Invoice #<B>$invnum</B><INPUT TYPE="hidden" NAME="invnum" VALUE="$invnum">!;
 
 #date
-my($date)=time;
+$date = time;
 print qq!<BR>Date: <B>!, time2str("%D",$date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="$date">!;
 
 #paid
 print qq!<BR>Amount \$<INPUT TYPE="text" NAME="paid" VALUE="" SIZE=8 MAXLENGTH=8>!;
 
 #payby
-my($payby)="BILL";
+$payby = "BILL";
 print qq!<BR>Payby: <B>$payby</B><INPUT TYPE="hidden" NAME="payby" VALUE="$payby">!;
 
 #payinfo (check # now as payby="BILL" hardcoded.. what to do later?)
-my($payinfo)="";
+$payinfo = "";
 print qq!<BR>Check #<INPUT TYPE="text" NAME="payinfo" VALUE="$payinfo">!;
 
 #paybatch
diff --git a/htdocs/edit/cust_pkg.cgi b/htdocs/edit/cust_pkg.cgi
index 763eeae07..ed4200830 100755
--- a/htdocs/edit/cust_pkg.cgi
+++ b/htdocs/edit/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.3 1999-01-18 09:41:28 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.4 1999-01-19 05:13:38 ivan Exp $
 #
 # this is for changing packages around, not editing things within the package
 #
@@ -25,7 +25,11 @@
 # 98-jun-1
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.3  1999-01-18 09:41:28  ivan
+# Revision 1.4  1999-01-19 05:13:38  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 09:41:28  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -34,6 +38,8 @@
 #
 
 use strict;
+use vars qw( $cgi %pkg %comment $query $custnum $otaker $p1 @cust_pkg 
+             $cust_main $agent $type_pkgs $count );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
@@ -41,10 +47,9 @@ use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header popurl);
 use FS::part_pkg;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
-my(%pkg,%comment);
 foreach (qsearch('part_pkg', {})) {
   $pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
   $comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
@@ -52,13 +57,13 @@ foreach (qsearch('part_pkg', {})) {
 
 #untaint custnum
 
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
-my($custnum)=$1;
+$custnum = $1;
 
-my($otaker)=&getotaker;
+$otaker = &getotaker;
 
-my $p1 = popurl(1);
+$p1 = popurl(1);
 print $cgi->header( '-expires' => 'now' ), header("Add/Edit Packages", ''), <<END;
     <FORM ACTION="${p1}process/cust_pkg.cgi" METHOD=POST>
     <HR>
@@ -68,7 +73,7 @@ END
 print qq!<INPUT TYPE="hidden" NAME="new_custnum" VALUE="$custnum">!;
 
 #current packages (except cancelled packages)
-my(@cust_pkg) = grep ! $_->getfield('cancel'),
+@cust_pkg = grep ! $_->getfield('cancel'),
   qsearch('cust_pkg',{'custnum'=>$custnum});
 
 if (@cust_pkg) {
@@ -105,11 +110,10 @@ These are packages the customer can purchase.  Specify the quantity to add
 of each package.<BR><BR>
 END
 
-my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
-my($agent)=qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
+$cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
+$agent = qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
 
-my($type_pkgs);
-my ($count) = 0 ;
+$count = 0 ;
 print qq!<CENTER><TABLE>! ;
 foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
   my($pkgpart)=$type_pkgs->pkgpart;
diff --git a/htdocs/edit/part_pkg.cgi b/htdocs/edit/part_pkg.cgi
index 9870017ad..e7ac2aeb2 100755
--- a/htdocs/edit/part_pkg.cgi
+++ b/htdocs/edit/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.7 1999-01-18 09:41:29 ivan Exp $
+# $Id: part_pkg.cgi,v 1.8 1999-01-19 05:13:39 ivan Exp $
 #
 # part_pkg.cgi: Add/Edit package (output form)
 #
@@ -13,7 +13,11 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.7  1999-01-18 09:41:29  ivan
+# Revision 1.8  1999-01-19 05:13:39  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.7  1999/01/18 09:41:29  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -34,6 +38,7 @@
 #
 
 use strict;
+use vars qw( $cgi $part_pkg $action $query $hashref $part_svc $count );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -43,7 +48,7 @@ use FS::part_svc;
 use FS::pkg_svc;
 use FS::CGI qw(header menubar popurl);
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
@@ -58,8 +63,7 @@ if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
   $cgi->param('pkgnum', '');
 }
 
-my($part_pkg,$action);
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 if ( $cgi->param('clone') ) {
   $action='Custom Pricing';
   my $old_part_pkg =
@@ -70,9 +74,9 @@ if ( $cgi->param('clone') ) {
   $part_pkg=qsearchs('part_pkg',{'pkgpart'=>$1});
 } else {
   $action='Add';
-  $part_pkg=create FS::part_pkg {};
+  $part_pkg = new FS::part_pkg {};
 }
-my($hashref)=$part_pkg->hashref;
+$hashref = $part_pkg->hashref;
 
 print $cgi->header( '-expires' => 'now' ), header("$action Package Definition", menubar(
   'Main Menu' => popurl(2),
@@ -109,15 +113,13 @@ Enter the quantity of each service this package includes.<BR><BR>
 END
 }
 
-my($part_svc);
-my($count) = 0 ;
 foreach $part_svc ( qsearch('part_svc',{}) ) {
 
   my($svcpart)=$part_svc->getfield('svcpart');
   my($pkg_svc)=qsearchs('pkg_svc',{
     'pkgpart'  => $cgi->param('clone') || $part_pkg->getfield('pkgpart'),
     'svcpart'  => $svcpart,
-  })  || create FS::pkg_svc({
+  })  || new FS::pkg_svc({
     'pkgpart'  => $part_pkg->getfield('pkgpart'),
     'svcpart'  => $svcpart,
     'quantity' => 0,
diff --git a/htdocs/edit/part_referral.cgi b/htdocs/edit/part_referral.cgi
index e159e03ee..6fd75f851 100755
--- a/htdocs/edit/part_referral.cgi
+++ b/htdocs/edit/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_referral.cgi,v 1.3 1999-01-18 09:41:30 ivan Exp $
+# $Id: part_referral.cgi,v 1.4 1999-01-19 05:13:41 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23
 #
@@ -12,7 +12,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_referral.cgi,v $
-# Revision 1.3  1999-01-18 09:41:30  ivan
+# Revision 1.4  1999-01-19 05:13:41  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 09:41:30  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -21,6 +25,7 @@
 #
 
 use strict;
+use vars qw( $cgi $part_referral $action $hashref $p1 );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -28,21 +33,20 @@ use FS::Record qw(qsearch qsearchs);
 use FS::part_referral;
 use FS::CGI qw(header menubar);
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-my($part_referral,$action);
 if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
   $part_referral=qsearchs('part_referral',{'refnum'=>$1});
   $action='Edit';
 } else { #adding
-  $part_referral=create FS::part_referral {};
+  $part_referral = new FS::part_referral {};
   $action='Add';
 }
-my($hashref)=$part_referral->hashref;
+$hashref = $part_referral->hashref;
 
-my $p1 = popurl(1);
+$p1 = popurl(1);
 print $cgi->header( '-expires' => 'now' ), header("$action Referral", menubar(
   'Main Menu' => popurl(2),
   'View all referrals' => popurl(2). "browse/part_referral.cgi",
diff --git a/htdocs/edit/part_svc.cgi b/htdocs/edit/part_svc.cgi
index c17d518fc..58a1e048e 100755
--- a/htdocs/edit/part_svc.cgi
+++ b/htdocs/edit/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.6 1999-01-18 09:41:31 ivan Exp $
+# $Id: part_svc.cgi,v 1.7 1999-01-19 05:13:42 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,11 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.6  1999-01-18 09:41:31  ivan
+# Revision 1.7  1999-01-19 05:13:42  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6  1999/01/18 09:41:31  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -25,6 +29,7 @@
 #
 
 use strict;
+use vars qw( $cgi $part_svc $action $query $hashref $p %defs $svcdb );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -32,22 +37,21 @@ use FS::Record qw(qsearchs fields);
 use FS::part_svc;
 use FS::CGI qw(header menubar popurl table);
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-my($part_svc,$action);
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 if ( $query && $query =~ /^(\d+)$/ ) { #editing
   $part_svc=qsearchs('part_svc',{'svcpart'=>$1});
   $action='Edit';
 } else { #adding
-  $part_svc=create FS::part_svc {};
+  $part_svc = new  FS::part_svc {};
   $action='Add';
 }
-my($hashref)=$part_svc->hashref;
+$hashref = $part_svc->hashref;
 
-my $p = popurl(2);
+$p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header("$action Service Definition", menubar(
   'Main Menu' => $p,
   'View all services' => "${p}browse/part_svc.cgi",
@@ -90,7 +94,7 @@ END
 
 #these might belong somewhere else for other user interfaces 
 #pry need to eventually create stuff that's shared amount UIs
-my(%defs)=(
+%defs = (
   'svc_acct' => {
     'dir'       => 'Home directory',
     'uid'       => 'UID (set to fixed and blank for dial-only)',
@@ -120,7 +124,6 @@ my(%defs)=(
   },
 );
 
-my($svcdb);
 #  svc_acct svc_domain svc_acct_sm svc_charge svc_wo
 foreach $svcdb ( qw(
   svc_acct svc_domain svc_acct_sm
diff --git a/htdocs/edit/process/agent.cgi b/htdocs/edit/process/agent.cgi
index dbbfe8055..1dab7601b 100755
--- a/htdocs/edit/process/agent.cgi
+++ b/htdocs/edit/process/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.5 1999-01-18 22:47:49 ivan Exp $
+# $Id: agent.cgi,v 1.6 1999-01-19 05:13:47 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent.cgi,v $
-# Revision 1.5  1999-01-18 22:47:49  ivan
+# Revision 1.6  1999-01-19 05:13:47  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 22:47:49  ivan
 # s/create/new/g; and use fields('table_name')
 #
 # Revision 1.4  1998/12/30 23:03:26  ivan
@@ -24,6 +28,7 @@
 #
 
 use strict;
+use vars qw ( $cgi $agentnum $old $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -31,25 +36,24 @@ use FS::Record qw(qsearch qsearchs fields);
 use FS::agent;
 use FS::CGI qw(idiot popurl);
 
-my($cgi)=new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-my($agentnum)=$cgi->param('agentnum');
+$agentnum = $cgi->param('agentnum');
 
-my($old)=qsearchs('agent',{'agentnum'=>$agentnum}) if $agentnum;
+$old = qsearchs('agent',{'agentnum'=>$agentnum}) if $agentnum;
 
 #unmunge typenum
 $cgi->param('typenum') =~ /^(\d+)(:.*)?$/;
 $cgi->param('typenum',$1);
 
-my($new)=new FS::agent ( {
+$new = new FS::agent ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('agent')
 } );
 
-my($error);
 if ( $agentnum ) {
   $error=$new->replace($old);
 } else {
diff --git a/htdocs/edit/process/agent_type.cgi b/htdocs/edit/process/agent_type.cgi
index 1efef9e46..e13817121 100755
--- a/htdocs/edit/process/agent_type.cgi
+++ b/htdocs/edit/process/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.5 1999-01-18 22:47:50 ivan Exp $
+# $Id: agent_type.cgi,v 1.6 1999-01-19 05:13:48 ivan Exp $
 #
 # ivan@sisd.com 97-dec-11
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.5  1999-01-18 22:47:50  ivan
+# Revision 1.6  1999-01-19 05:13:48  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 22:47:50  ivan
 # s/create/new/g; and use fields('table_name')
 #
 # Revision 1.4  1998/12/30 23:03:27  ivan
@@ -24,6 +28,7 @@
 #
 
 use strict;
+use vars qw ( $cgi $typenum $old $new $error $part_pkg );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::CGI qw(idiot popurl);
@@ -33,19 +38,18 @@ use FS::agent_type;
 use FS::type_pkgs;
 use FS::part_pkg;
 
-my($cgi)=new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
-my($typenum)=$cgi->param('typenum');
-my($old)=qsearchs('agent_type',{'typenum'=>$typenum}) if $typenum;
+$typenum = $cgi->param('typenum');
+$old = qsearchs('agent_type',{'typenum'=>$typenum}) if $typenum;
 
-my($new)=new FS::agent_type ( {
+$new = new FS::agent_type ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('agent_type')
 } );
 
-my($error);
 if ( $typenum ) {
   $error=$new->replace($old);
 } else {
@@ -58,7 +62,6 @@ if ( $error ) {
   exit;
 }
 
-my($part_pkg);
 foreach $part_pkg (qsearch('part_pkg',{})) {
   my($pkgpart)=$part_pkg->getfield('pkgpart');
 
diff --git a/htdocs/edit/process/cust_credit.cgi b/htdocs/edit/process/cust_credit.cgi
index e88d05769..8f4515e48 100755
--- a/htdocs/edit/process/cust_credit.cgi
+++ b/htdocs/edit/process/cust_credit.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_credit.cgi,v 1.3 1999-01-18 22:47:51 ivan Exp $
+# $Id: cust_credit.cgi,v 1.4 1999-01-19 05:13:49 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_credit.cgi
@@ -22,7 +22,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_credit.cgi,v $
-# Revision 1.3  1999-01-18 22:47:51  ivan
+# Revision 1.4  1999-01-19 05:13:49  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 22:47:51  ivan
 # s/create/new/g; and use fields('table_name')
 #
 # Revision 1.2  1998/12/17 08:40:18  ivan
@@ -30,6 +34,7 @@
 #
 
 use strict;
+use vars qw( $cgi $custnum $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
@@ -37,22 +42,21 @@ use FS::CGI qw(popurl eidiot);
 use FS::Record qw(fields);
 use FS::cust_credit;
 
-my($cgi)=new CGI; # create form object
+$cgi = new CGI;
 cgisuidsetup($cgi);
 
 $cgi->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
-my($custnum)=$1;
+$custnum = $1;
 
 $cgi->param('otaker',getotaker);
 
-my($new) = new FS::cust_credit ( {
+$new = new FS::cust_credit ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(custnum _date amount otaker reason)
   } fields('cust_credit');
 } );
 
-my($error);
 $error=$new->insert;
 &eidiot($error) if $error;
 
diff --git a/htdocs/edit/process/cust_main.cgi b/htdocs/edit/process/cust_main.cgi
index f65665142..850f2add4 100755
--- a/htdocs/edit/process/cust_main.cgi
+++ b/htdocs/edit/process/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.4 1999-01-18 09:22:32 ivan Exp $
+# $Id: cust_main.cgi,v 1.5 1999-01-19 05:13:50 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -22,7 +22,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.4  1999-01-18 09:22:32  ivan
+# Revision 1.5  1999-01-19 05:13:50  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:22:32  ivan
 # changes to track email addresses for email invoicing
 #
 # Revision 1.3  1998/12/17 08:40:19  ivan
@@ -33,7 +37,7 @@
 #
 
 use strict;
-#use CGI;
+use vars qw( $cgi $payby @invoicing_list $new $custnum );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
@@ -41,7 +45,7 @@ use FS::CGI qw(eidiot popurl);
 use FS::Record qw(qsearchs fields);
 use FS::cust_main;
 
-my($cgi)=new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
 #unmunge stuff
@@ -57,7 +61,7 @@ $cgi->param('state', $1);
 $cgi->param('county', $3 || '');
 $cgi->param('country', $4);
 
-my $payby = $cgi->param('payby');
+$payby = $cgi->param('payby');
 $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
 $cgi->param('paydate',
   $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
@@ -65,12 +69,12 @@ $cgi->param('payname', $cgi->param( $payby. '_payname' ) );
 
 $cgi->param('otaker', &getotaker );
 
-my @invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
+@invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
 push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
 
 #create new record object
 
-my($new) = new FS::cust_main ( {
+$new = new FS::cust_main ( {
   map {
     $_, scalar($cgi->param($_))
 #  } qw(custnum agentnum last first ss company address1 address2 city county
@@ -98,6 +102,6 @@ if ( $new->custnum eq '' ) {
   $new->invoicing_list( \@invoicing_list );
 }
 
-my $custnum = $new->custnum;
+$custnum = $new->custnum;
 print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#cust_main");
 
diff --git a/htdocs/edit/process/cust_main_county-expand.cgi b/htdocs/edit/process/cust_main_county-expand.cgi
index e91410f64..94aa8547e 100755
--- a/htdocs/edit/process/cust_main_county-expand.cgi
+++ b/htdocs/edit/process/cust_main_county-expand.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county-expand.cgi,v 1.4 1999-01-18 22:47:52 ivan Exp $
+# $Id: cust_main_county-expand.cgi,v 1.5 1999-01-19 05:13:51 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -15,7 +15,11 @@
 # ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county-expand.cgi,v $
-# Revision 1.4  1999-01-18 22:47:52  ivan
+# Revision 1.5  1999-01-19 05:13:51  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 22:47:52  ivan
 # s/create/new/g; and use fields('table_name')
 #
 # Revision 1.3  1998/12/17 08:40:20  ivan
@@ -26,6 +30,7 @@
 #
 
 use strict;
+use vars qw ( $cgi $taxnum $cust_main_county @expansion $expansion );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup datasrc);
@@ -34,16 +39,15 @@ use FS::CGI qw(eidiot popurl);
 use FS::cust_main_county;
 use FS::cust_main;
 
-my($cgi)=new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
 $cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
-my($taxnum)=$1;
-my($cust_main_county)=qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+$taxnum = $1;
+$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
   or die ("Unknown taxnum!");
 
-my(@expansion);
 if ( $cgi->param('delim') eq 'n' ) {
   @expansion=split(/\n/,$cgi->param('expansion'));
 } elsif ( $cgi->param('delim') eq 's' ) {
@@ -57,7 +61,6 @@ if ( $cgi->param('delim') eq 'n' ) {
   $1;
 } @expansion;
 
-my($expansion);
 foreach ( @expansion) {
   my(%hash)=$cust_main_county->hash;
   my($new)=new FS::cust_main_county \%hash;
diff --git a/htdocs/edit/process/cust_main_county.cgi b/htdocs/edit/process/cust_main_county.cgi
index 8d274b81f..3b0cdebe9 100755
--- a/htdocs/edit/process/cust_main_county.cgi
+++ b/htdocs/edit/process/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.4 1999-01-18 22:47:53 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.5 1999-01-19 05:13:52 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county.cgi,v $
-# Revision 1.4  1999-01-18 22:47:53  ivan
+# Revision 1.5  1999-01-19 05:13:52  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 22:47:53  ivan
 # s/create/new/g; and use fields('table_name')
 #
 # Revision 1.3  1998/12/17 08:40:21  ivan
@@ -21,6 +25,7 @@
 #
 
 use strict;
+use vars qw( $cgi );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -28,7 +33,7 @@ use FS::CGI qw(eidiot);
 use FS::Record qw(qsearch qsearchs);
 use FS::cust_main_county;
 
-my($cgi)=new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
 foreach ( $cgi->param ) {
diff --git a/htdocs/edit/process/cust_pay.cgi b/htdocs/edit/process/cust_pay.cgi
index 4d8770404..21431f48d 100755
--- a/htdocs/edit/process/cust_pay.cgi
+++ b/htdocs/edit/process/cust_pay.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pay.cgi,v 1.4 1999-01-18 22:47:54 ivan Exp $
+# $Id: cust_pay.cgi,v 1.5 1999-01-19 05:13:53 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_pay.cgi
@@ -15,7 +15,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_pay.cgi,v $
-# Revision 1.4  1999-01-18 22:47:54  ivan
+# Revision 1.5  1999-01-19 05:13:53  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 22:47:54  ivan
 # s/create/new/g; and use fields('table_name')
 #
 # Revision 1.3  1998/12/30 23:03:28  ivan
@@ -26,6 +30,7 @@
 #
 
 use strict;
+use vars qw( $cgi $invnum $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -33,20 +38,19 @@ use FS::CGI qw(idiot popurl);
 use FS::Record qw(fields);
 use FS::cust_pay;
 
-my($cgi)=new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
 $cgi->param('invnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-my($invnum)=$1;
+$invnum = $1;
 
-my($new) = new FS::cust_pay ( {
+$new = new FS::cust_pay ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(invnum paid _date payby payinfo paybatch)
   } fields('cust_pay')
 } );
 
-my($error);
 $error=$new->insert;
 
 if ($error) { #error!
diff --git a/htdocs/edit/process/cust_pkg.cgi b/htdocs/edit/process/cust_pkg.cgi
index 9cd9e02f1..e8493b2de 100755
--- a/htdocs/edit/process/cust_pkg.cgi
+++ b/htdocs/edit/process/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.2 1998-12-17 08:40:23 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.3 1999-01-19 05:13:54 ivan Exp $
 #
 # this is for changing packages around, not for editing things within the
 # package
@@ -21,32 +21,35 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.2  1998-12-17 08:40:23  ivan
+# Revision 1.3  1999-01-19 05:13:54  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.2  1998/12/17 08:40:23  ivan
 # s/CGI::Request/CGI.pm/; etc
 #
 
 use strict;
+use vars qw( $cgi $custnum @remove_pkgnums @pkgparts $pkgpart $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(idiot popurl);
 use FS::cust_pkg;
 
-my($cgi)=new CGI; # create form object
+$cgi = new CGI; # create form object
 
 &cgisuidsetup($cgi);
 
 #untaint custnum
 $cgi->param('new_custnum') =~ /^(\d+)$/;
-my($custnum)=$1;
+$custnum = $1;
 
-my(@remove_pkgnums) = map {
+@remove_pkgnums = map {
   /^(\d+)$/ or die "Illegal remove_pkg value!";
   $1;
 } $cgi->param('remove_pkg');
 
-my(@pkgparts);
-my($pkgpart);
 foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
   my($num_pkgs)=$cgi->param("pkg$pkgpart");
   while ( $num_pkgs-- ) {
@@ -54,7 +57,7 @@ foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
   }
 }
 
-my($error) = FS::cust_pkg::order($custnum,\@pkgparts,\@remove_pkgnums);
+$error = FS::cust_pkg::order($custnum,\@pkgparts,\@remove_pkgnums);
 
 if ($error) {
   idiot($error);
diff --git a/htdocs/edit/process/part_pkg.cgi b/htdocs/edit/process/part_pkg.cgi
index 55bf4ffaf..3ec31589a 100755
--- a/htdocs/edit/process/part_pkg.cgi
+++ b/htdocs/edit/process/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.6 1999-01-18 22:47:56 ivan Exp $
+# $Id: part_pkg.cgi,v 1.7 1999-01-19 05:13:55 ivan Exp $
 #
 # process/part_pkg.cgi: Edit package definitions (process form)
 #
@@ -17,7 +17,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.6  1999-01-18 22:47:56  ivan
+# Revision 1.7  1999-01-19 05:13:55  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6  1999/01/18 22:47:56  ivan
 # s/create/new/g; and use fields('table_name')
 #
 # Revision 1.5  1998/12/30 23:03:29  ivan
@@ -34,6 +38,7 @@
 #
 
 use strict;
+use vars qw( $cgi $pkgpart $old $new $part_svc );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -43,14 +48,14 @@ use FS::part_pkg;
 use FS::pkg_svc;
 use FS::cust_pkg;
 
-my($cgi)=new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
-my($pkgpart)=$cgi->param('pkgpart');
+$pkgpart = $cgi->param('pkgpart');
 
-my($old)=qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
+$old = qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
 
-my($new)=new FS::part_pkg ( {
+$new = new FS::part_pkg ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('part_pkg')
@@ -71,7 +76,6 @@ if ( $pkgpart ) {
   $pkgpart=$new->getfield('pkgpart');
 }
 
-my($part_svc);
 foreach $part_svc (qsearch('part_svc',{})) {
 # don't update non-changing records in part_svc (causing harmless but annoying
 # "Records identical" errors). ivan@sisd.com 98-jan-19
diff --git a/htdocs/edit/process/part_referral.cgi b/htdocs/edit/process/part_referral.cgi
index b5e479d3b..9886015f9 100755
--- a/htdocs/edit/process/part_referral.cgi
+++ b/htdocs/edit/process/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_referral.cgi,v 1.4 1999-01-18 22:47:57 ivan Exp $
+# $Id: part_referral.cgi,v 1.5 1999-01-19 05:13:56 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_referral.cgi,v $
-# Revision 1.4  1999-01-18 22:47:57  ivan
+# Revision 1.5  1999-01-19 05:13:56  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 22:47:57  ivan
 # s/create/new/g; and use fields('table_name')
 #
 # Revision 1.3  1998/12/30 23:03:30  ivan
@@ -21,6 +25,7 @@
 #
 
 use strict;
+use vars qw( $cgi $refnum $new );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -28,12 +33,12 @@ use FS::Record qw(qsearchs fields);
 use FS::part_referral;
 use FS::CGI qw(popurl eidiot);
 
-my($cgi)=new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
-my($refnum)=$cgi->param('refnum');
+$refnum = $cgi->param('refnum');
 
-my($new)=new FS::part_referral ( {
+$new = new FS::part_referral ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('part_referral')
diff --git a/htdocs/edit/process/part_svc.cgi b/htdocs/edit/process/part_svc.cgi
index 5b814363b..e25192c1c 100755
--- a/htdocs/edit/process/part_svc.cgi
+++ b/htdocs/edit/process/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.5 1999-01-18 22:47:58 ivan Exp $
+# $Id: part_svc.cgi,v 1.6 1999-01-19 05:13:57 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.5  1999-01-18 22:47:58  ivan
+# Revision 1.6  1999-01-19 05:13:57  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 22:47:58  ivan
 # s/create/new/g; and use fields('table_name')
 #
 # Revision 1.4  1998/12/30 23:03:31  ivan
@@ -24,6 +28,7 @@
 #
 
 use strict;
+use vars qw ( $cgi $svcpart $old $new );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -31,14 +36,14 @@ use FS::Record qw(qsearchs fields);
 use FS::part_svc;
 use FS::CGI qw(eidiot popurl);
 
-my($cgi)=new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
-my($svcpart)=$cgi->param('svcpart');
+$svcpart = $cgi->param('svcpart');
 
-my($old)=qsearchs('part_svc',{'svcpart'=>$svcpart}) if $svcpart;
+$old = qsearchs('part_svc',{'svcpart'=>$svcpart}) if $svcpart;
 
-my($new)=new FS::part_svc ( {
+$new = new FS::part_svc ( {
   map {
     $_, scalar($cgi->param($_));
 #  } qw(svcpart svc svcdb)
diff --git a/htdocs/edit/process/svc_acct.cgi b/htdocs/edit/process/svc_acct.cgi
index 4e4080da7..7fd87ea84 100755
--- a/htdocs/edit/process/svc_acct.cgi
+++ b/htdocs/edit/process/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.3 1999-01-18 22:47:59 ivan Exp $
+# $Id: svc_acct.cgi,v 1.4 1999-01-19 05:13:58 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
@@ -23,7 +23,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.3  1999-01-18 22:47:59  ivan
+# Revision 1.4  1999-01-19 05:13:58  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 22:47:59  ivan
 # s/create/new/g; and use fields('table_name')
 #
 # Revision 1.2  1998/12/17 08:40:27  ivan
@@ -31,6 +35,7 @@
 #
 
 use strict;
+use vars qw( $cgi $svcnum $old $new );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -38,13 +43,13 @@ use FS::CGI qw(eidiot popurl);
 use FS::Record qw(qsearchs fields);
 use FS::svc_acct;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-my($svcnum)=$1;
+$svcnum = $1;
 
-my($old)=qsearchs('svc_acct',{'svcnum'=>$svcnum}) if $svcnum;
+$old = qsearchs('svc_acct',{'svcnum'=>$svcnum}) if $svcnum;
 
 #unmunge popnum
 $cgi->param('popnum', (split(/:/, $cgi->param('popnum') ))[0] );
@@ -54,7 +59,7 @@ if ( $cgi->param('_password') eq '*HIDDEN*' ) {
   $cgi->param('_password',$old->getfield('_password'));
 }
 
-my($new) = new FS::svc_acct ( {
+$new = new FS::svc_acct ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(svcnum pkgnum svcpart username _password popnum uid gid finger dir
diff --git a/htdocs/edit/process/svc_acct_pop.cgi b/htdocs/edit/process/svc_acct_pop.cgi
index fac2fa452..414c6fb28 100755
--- a/htdocs/edit/process/svc_acct_pop.cgi
+++ b/htdocs/edit/process/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.4 1999-01-18 22:48:00 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.5 1999-01-19 05:13:59 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.4  1999-01-18 22:48:00  ivan
+# Revision 1.5  1999-01-19 05:13:59  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 22:48:00  ivan
 # s/create/new/g; and use fields('table_name')
 #
 # Revision 1.3  1998/12/30 23:03:32  ivan
@@ -21,6 +25,7 @@
 #
 
 use strict;
+use vars qw( $cgi $popnum $old $new );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -28,15 +33,15 @@ use FS::Record qw(qsearch qsearchs fields);
 use FS::svc_acct_pop;
 use FS::CGI qw(popurl eidiot);
 
-my($cgi)=new CGI; # create form object
+$cgi = new CGI; # create form object
 
 &cgisuidsetup($cgi);
 
-my($popnum)=$cgi->param('popnum');
+$popnum = $cgi->param('popnum');
 
-my($old)=qsearchs('svc_acct_pop',{'popnum'=>$popnum}) if $popnum;
+$old = qsearchs('svc_acct_pop',{'popnum'=>$popnum}) if $popnum;
 
-my($new)=new FS::svc_acct_pop ( {
+$new = new FS::svc_acct_pop ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('svc_acct_pop')
diff --git a/htdocs/edit/process/svc_acct_sm.cgi b/htdocs/edit/process/svc_acct_sm.cgi
index fc723d9de..53650c888 100755
--- a/htdocs/edit/process/svc_acct_sm.cgi
+++ b/htdocs/edit/process/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.3 1999-01-18 22:48:01 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.4 1999-01-19 05:14:00 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct_sm.cgi
@@ -24,7 +24,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.3  1999-01-18 22:48:01  ivan
+# Revision 1.4  1999-01-19 05:14:00  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 22:48:01  ivan
 # s/create/new/g; and use fields('table_name')
 #
 # Revision 1.2  1998/12/17 08:40:29  ivan
@@ -32,32 +36,32 @@
 #
 
 use strict;
+use vars qw( $cgi $svcnum $old $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs fields);
 use FS::svc_acct_sm;
 
-my($cgi)=new CGI;
+$cgi = new CGI;
 cgisuidsetup($cgi);
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-my($svcnum)=$1;
+$svcnum =$1;
 
-my($old)=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
+$old = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
 
 #unmunge domsvc and domuid
 $cgi->param('domsvc',(split(/:/, $cgi->param('domsvc') ))[0] );
 $cgi->param('domuid',(split(/:/, $cgi->param('domuid') ))[0] );
 
-my($new) = new FS::svc_acct_sm ( {
+$new = new FS::svc_acct_sm ( {
   map {
     ($_, scalar($cgi->param($_)));
   #} qw(svcnum pkgnum svcpart domuser domuid domsvc)
   } ( fields('svc_acct_sm'), qw( pkgnum svcpart) )
 } );
 
-my($error);
 if ( $svcnum ) {
   $error = $new->replace($old);
 } else {
diff --git a/htdocs/edit/process/svc_domain.cgi b/htdocs/edit/process/svc_domain.cgi
index 992123cc7..4c96823e2 100755
--- a/htdocs/edit/process/svc_domain.cgi
+++ b/htdocs/edit/process/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.3 1999-01-18 22:48:02 ivan Exp $
+# $Id: svc_domain.cgi,v 1.4 1999-01-19 05:14:01 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -20,7 +20,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.3  1999-01-18 22:48:02  ivan
+# Revision 1.4  1999-01-19 05:14:01  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 22:48:02  ivan
 # s/create/new/g; and use fields('table_name')
 #
 # Revision 1.2  1998/12/17 08:40:30  ivan
@@ -28,6 +32,7 @@
 #
 
 use strict;
+use vars qw( $cgi $svcnum $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -37,20 +42,19 @@ use FS::svc_domain;
 #remove this to actually test the domains!
 $FS::svc_domain::whois_hack = 1;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-my($svcnum)=$1;
+$svcnum = $1;
 
-my($new) = new FS::svc_domain ( {
+$new = new FS::svc_domain ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(svcnum pkgnum svcpart domain action purpose)
   } ( fields('svc_domain'), qw( pkgnum svcpart action purpose ) )
 } );
 
-my($error);
 if ($cgi->param('legal') ne "Yes") {
   $error = "Customer did not agree to be bound by NSI's ".
     qq!<A HREF="http://rs.internic.net/help/agreement.txt">!.
diff --git a/htdocs/edit/svc_acct.cgi b/htdocs/edit/svc_acct.cgi
index e5cf4857c..af18654ac 100755
--- a/htdocs/edit/svc_acct.cgi
+++ b/htdocs/edit/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.5 1999-01-18 09:41:32 ivan Exp $
+# $Id: svc_acct.cgi,v 1.6 1999-01-19 05:13:43 ivan Exp $
 #
 # Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -18,7 +18,11 @@
 # use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.5  1999-01-18 09:41:32  ivan
+# Revision 1.6  1999-01-19 05:13:43  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:32  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -30,7 +34,9 @@
 #
 
 use strict;
-use vars qw($conf);
+use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
+             $part_svc $query $svc $otaker $username $password $ulen $ulen2 $p1
+             $popnum $uid $gid $finger $dir $shell $quota $slipip );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
@@ -39,15 +45,13 @@ use FS::Record qw(qsearch qsearchs fields);
 use FS::svc_acct;
 use FS::Conf;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
 $conf = new FS::Conf;
-my @shells = $conf->config('shells');
-
-my($action,$svcnum,$svc_acct,$pkgnum,$svcpart,$part_svc);
+@shells = $conf->config('shells');
 
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 if ( $query =~ /^(\d+)$/ ) { #editing
 
   $svcnum=$1;
@@ -67,7 +71,7 @@ if ( $query =~ /^(\d+)$/ ) { #editing
 
 } else { #adding
 
-  $svc_acct=create FS::svc_acct({}); 
+  $svc_acct = new FS::svc_acct({}); 
 
   foreach $_ (split(/-/,$query)) {
     $pkgnum=$1 if /^pkgnum(\d+)$/;
@@ -99,19 +103,19 @@ if ( $query =~ /^(\d+)$/ ) { #editing
 
 }
 
-my($svc)=$part_svc->getfield('svc');
+$svc = $part_svc->getfield('svc');
 
-my($otaker)=getotaker;
+$otaker = getotaker;
 
-my($username,$password)=(
+($username,$password)=(
   $svc_acct->username,
   $svc_acct->_password ? "*HIDDEN*" : '',
 );
 
-my($ulen)=$svc_acct->dbdef_table->column('username')->length;
-my($ulen2)=$ulen+2;
+$ulen = $svc_acct->dbdef_table->column('username')->length;
+$ulen2 = $ulen+2;
 
-my $p1 = popurl(1);
+$p1 = popurl(1);
 print $cgi->header( '-expires' => 'now' ), header("$action $svc account"), <<END;
     <FORM ACTION="${p1}process/svc_acct.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
@@ -125,7 +129,7 @@ Username:
 END
 
 #pop
-my($popnum)=$svc_acct->popnum || 0;
+$popnum = $svc_acct->popnum || 0;
 if ( $part_svc->svc_acct__popnum_flag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$popnum">!;
 } else { 
@@ -143,7 +147,7 @@ if ( $part_svc->svc_acct__popnum_flag eq "F" ) {
   print "</SELECT>";
 }
 
-my($uid,$gid,$finger,$dir)=(
+($uid,$gid,$finger,$dir)=(
   $svc_acct->uid,
   $svc_acct->gid,
   $svc_acct->finger,
@@ -157,7 +161,7 @@ print <<END;
 <INPUT TYPE="hidden" NAME="dir" VALUE="$dir">
 END
 
-my($shell)=$svc_acct->shell;
+$shell = $svc_acct->shell;
 if ( $part_svc->svc_acct__shell_flag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="shell" VALUE="$shell">!;
 } else {
@@ -170,7 +174,7 @@ if ( $part_svc->svc_acct__shell_flag eq "F" ) {
   print "</SELECT>";
 }
 
-my($quota,$slipip)=(
+($quota,$slipip)=(
   $svc_acct->quota,
   $svc_acct->slipip,
 );
diff --git a/htdocs/edit/svc_acct_pop.cgi b/htdocs/edit/svc_acct_pop.cgi
index e2c4bcdbe..115c46745 100755
--- a/htdocs/edit/svc_acct_pop.cgi
+++ b/htdocs/edit/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.5 1999-01-18 09:41:33 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.6 1999-01-19 05:13:44 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8 
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.5  1999-01-18 09:41:33  ivan
+# Revision 1.6  1999-01-19 05:13:44  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:33  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -26,6 +30,7 @@
 #
 
 use strict;
+use vars qw( $cgi $svc_acct_pop $action $query $hashref $p1 );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -33,22 +38,21 @@ use FS::Record qw(qsearch qsearchs);
 use FS::svc_acct_pop;
 use FS::CGI qw(header menubar);
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-my($svc_acct_pop,$action);
-my($query)=$cgi->keywords;
+($query)=$cgi->keywords;
 if ( $query =~ /^(\d+)$/ ) { #editing
   $svc_acct_pop=qsearchs('svc_acct_pop',{'popnum'=>$1});
   $action='Edit';
 } else { #adding
-  $svc_acct_pop=create FS::svc_acct_pop {};
+  $svc_acct_pop = new FS::svc_acct_pop {};
   $action='Add';
 }
-my($hashref)=$svc_acct_pop->hashref;
+$hashref = $svc_acct_pop->hashref;
 
-my $p1 = popurl(1);
+$p1 = popurl(1);
 print $cgi->header( '-expires' => 'now' ), header("$action POP", menubar(
   'Main Menu' => popurl(2),
   'View all POPs' => popurl(2). "browse/svc_acct_pop.cgi",
diff --git a/htdocs/edit/svc_acct_sm.cgi b/htdocs/edit/svc_acct_sm.cgi
index 9acaed188..0de4fa1ac 100755
--- a/htdocs/edit/svc_acct_sm.cgi
+++ b/htdocs/edit/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.6 1999-01-18 09:41:34 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.7 1999-01-19 05:13:45 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct_sm.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -35,7 +35,11 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-26
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.6  1999-01-18 09:41:34  ivan
+# Revision 1.7  1999-01-19 05:13:45  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6  1999/01/18 09:41:34  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -53,7 +57,8 @@
 #
 
 use strict;
-use vars qw($conf);
+use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
+             $part_svc $query %username %domain $p1 $domuser $domsvc $domuid );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -62,15 +67,14 @@ use FS::Record qw(qsearch qsearchs fields);
 use FS::svc_acct_sm;
 use FS::Conf;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
 $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
+$mydomain = $conf->config('domain');
 
-my($action,$svcnum,$svc_acct_sm,$pkgnum,$svcpart,$part_svc);
 
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 if ( $query =~ /^(\d+)$/ ) { #editing
 
   $svcnum=$1;
@@ -90,7 +94,7 @@ if ( $query =~ /^(\d+)$/ ) { #editing
 
 } else { #adding
 
-  $svc_acct_sm=create FS::svc_acct_sm({});
+  $svc_acct_sm = new FS::svc_acct_sm({});
 
   foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
     $pkgnum=$1 if /^pkgnum(\d+)$/;
@@ -113,7 +117,6 @@ if ( $query =~ /^(\d+)$/ ) { #editing
 
 }
 
-my(%username,%domain);
 if ($pkgnum) {
 
   #find all possible uids (and usernames)
@@ -171,7 +174,7 @@ if ($pkgnum) {
   die "\$action eq Add, but \$pkgnum is null!\n";
 }
 
-my $p1 = popurl(1);
+$p1 = popurl(1);
 print $cgi->header( '-expires' => 'now' ), header("Mail Alias $action", ''), <<END;
     <FORM ACTION="${p1}process/svc_acct_sm.cgi" METHOD=POST>
 END
@@ -191,7 +194,7 @@ print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
 #svcpart
 print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
 
-my($domuser,$domsvc,$domuid)=(
+($domuser,$domsvc,$domuid)=(
   $svc_acct_sm->domuser,
   $svc_acct_sm->domsvc,
   $svc_acct_sm->domuid,
diff --git a/htdocs/edit/svc_domain.cgi b/htdocs/edit/svc_domain.cgi
index d40f9001b..45ff8bb6c 100755
--- a/htdocs/edit/svc_domain.cgi
+++ b/htdocs/edit/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.6 1999-01-18 09:41:35 ivan Exp $
+# $Id: svc_domain.cgi,v 1.7 1999-01-19 05:13:46 ivan Exp $
 #
 # Usage: svc_domain.cgi pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_domain.cgi?pkgnum{pkgnum}-svcpart{svcpart}
@@ -17,7 +17,11 @@
 # no GOV in instructions ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.6  1999-01-18 09:41:35  ivan
+# Revision 1.7  1999-01-19 05:13:46  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6  1999/01/18 09:41:35  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -36,6 +40,8 @@
 #
 
 use strict;
+use vars qw( $cgi $action $svcnum $svc_domain $pkgnum $svcpart $part_svc
+             $query $svc $otaker $domain $p1 );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
@@ -43,12 +49,10 @@ use FS::CGI qw(header popurl);
 use FS::Record qw(qsearch qsearchs fields);
 use FS::svc_domain;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
-my($action,$svcnum,$svc_domain,$pkgnum,$svcpart,$part_svc);
-
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 if ( $query =~ /^(\d+)$/ ) { #editing
 
   $svcnum=$1;
@@ -68,7 +72,7 @@ if ( $query =~ /^(\d+)$/ ) { #editing
 
 } else { #adding
 
-  $svc_domain=create FS::svc_domain({});
+  $svc_domain = new FS::svc_domain({});
   
   foreach $_ (split(/-/,$query)) {
     $pkgnum=$1 if /^pkgnum(\d+)$/;
@@ -91,15 +95,13 @@ if ( $query =~ /^(\d+)$/ ) { #editing
 
 }
 
-my($svc)=$part_svc->getfield('svc');
+$svc = $part_svc->getfield('svc');
 
-my($otaker)=getotaker;
+$otaker = getotaker;
 
-my($domain)=(
-  $svc_domain->domain,
-);
+$domain = $svc_domain->domain;
 
-my $p1 = popurl(1);
+$p1 = popurl(1);
 print $cgi->header( '-expires' => 'now' ), header("$action $svc", ''), <<END;
     <FORM ACTION="${p1}process/svc_domain.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
diff --git a/htdocs/misc/bill.cgi b/htdocs/misc/bill.cgi
index 430aefa4b..2c17baec7 100755
--- a/htdocs/misc/bill.cgi
+++ b/htdocs/misc/bill.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: bill.cgi,v 1.3 1998-12-23 03:01:13 ivan Exp $
+# $Id: bill.cgi,v 1.4 1999-01-19 05:14:02 ivan Exp $
 #
 # s/FS:Search/FS::Record/ and cgisuidsetup($cgi) ivan@sisd.com 98-mar-13
 #
@@ -8,7 +8,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: bill.cgi,v $
-# Revision 1.3  1998-12-23 03:01:13  ivan
+# Revision 1.4  1999-01-19 05:14:02  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1998/12/23 03:01:13  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.2  1998/12/17 09:12:41  ivan
@@ -16,6 +20,7 @@
 #
 
 use strict;
+use vars qw( $cgi $query $custnum $cust_main $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -23,18 +28,16 @@ use FS::CGI qw(popurl eidiot);
 use FS::Record qw(qsearchs);
 use FS::cust_main;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
 #untaint custnum
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 $query =~ /^(\d*)$/;
-my($custnum)=$1;
-my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
+$custnum = $1;
+$cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
 die "Can't find customer!\n" unless $cust_main;
 
-my($error);
-
 $error = $cust_main->bill(
 #                          'time'=>$time
                          );
diff --git a/htdocs/misc/cancel-unaudited.cgi b/htdocs/misc/cancel-unaudited.cgi
index 4c5fbc7f3..b8729440f 100755
--- a/htdocs/misc/cancel-unaudited.cgi
+++ b/htdocs/misc/cancel-unaudited.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cancel-unaudited.cgi,v 1.3 1998-12-23 03:02:05 ivan Exp $
+# $Id: cancel-unaudited.cgi,v 1.4 1999-01-19 05:14:03 ivan Exp $
 #
 # Usage: cancel-unaudited.cgi svcnum
 #        http://server.name/path/cancel-unaudited.cgi pkgnum
@@ -18,7 +18,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cancel-unaudited.cgi,v $
-# Revision 1.3  1998-12-23 03:02:05  ivan
+# Revision 1.4  1999-01-19 05:14:03  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1998/12/23 03:02:05  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.2  1998/12/17 09:12:42  ivan
@@ -26,6 +30,7 @@
 #
 
 use strict;
+use vars qw( $cgi $query $svcnum $svc_acct $cust_svc $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -34,18 +39,18 @@ use FS::Record qw(qsearchs);
 use FS::cust_svc;
 use FS::svc_acct;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
  
 #untaint svcnum
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
-my($svcnum)=$1;
+$svcnum = $1;
 
-my($svc_acct) = qsearchs('svc_acct',{'svcnum'=>$svcnum});
+$svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
 &eidiot("Unknown svcnum!") unless $svc_acct;
 
-my($cust_svc) = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
 &eidiot(qq!This account has already been audited.  Cancel the 
     <A HREF="!. popurl(2). qq!view/cust_pkg.cgi?! . $cust_svc->getfield('pkgnum') .
     qq!pkgnum"> package</A> instead.!) 
@@ -57,8 +62,6 @@ local $SIG{QUIT} = 'IGNORE';
 local $SIG{TERM} = 'IGNORE';
 local $SIG{TSTP} = 'IGNORE';
 
-my($error);
-
 $error = $svc_acct->cancel;
 &eidiot($error) if $error;
 $error = $svc_acct->delete;
diff --git a/htdocs/misc/cancel_pkg.cgi b/htdocs/misc/cancel_pkg.cgi
index 45afee8a1..27bc277c0 100755
--- a/htdocs/misc/cancel_pkg.cgi
+++ b/htdocs/misc/cancel_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cancel_pkg.cgi,v 1.3 1998-12-23 03:02:54 ivan Exp $
+# $Id: cancel_pkg.cgi,v 1.4 1999-01-19 05:14:04 ivan Exp $
 #
 # Usage: cancel_pkg.cgi pkgnum
 #        http://server.name/path/cancel_pkg.cgi pkgnum
@@ -29,7 +29,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cancel_pkg.cgi,v $
-# Revision 1.3  1998-12-23 03:02:54  ivan
+# Revision 1.4  1999-01-19 05:14:04  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1998/12/23 03:02:54  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.2  1998/12/17 09:12:43  ivan
@@ -37,6 +41,7 @@
 #
 
 use strict;
+use vars qw ( $cgi $query $pkgnum $cust_pkg $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -44,17 +49,17 @@ use FS::CGI qw(eidiot popurl);
 use FS::Record qw(qsearchs);
 use FS::cust_pkg;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
  
 #untaint pkgnum
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 $query =~ /^(\d+)$/ || die "Illegal pkgnum";
-my($pkgnum)=$1;
+$pkgnum = $1;
 
-my($cust_pkg) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
 
-my($error)=$cust_pkg->cancel;
+$error = $cust_pkg->cancel;
 eidiot($error) if $error;
 
 print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
diff --git a/htdocs/misc/expire_pkg.cgi b/htdocs/misc/expire_pkg.cgi
index e921c7218..8cf553a26 100755
--- a/htdocs/misc/expire_pkg.cgi
+++ b/htdocs/misc/expire_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: expire_pkg.cgi,v 1.2 1998-12-17 09:12:44 ivan Exp $
+# $Id: expire_pkg.cgi,v 1.3 1999-01-19 05:14:05 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/expire_pkg.cgi
@@ -16,11 +16,16 @@
 #       bmccane@maxbaud.net     98-apr-3
 # 
 # $Log: expire_pkg.cgi,v $
-# Revision 1.2  1998-12-17 09:12:44  ivan
+# Revision 1.3  1999-01-19 05:14:05  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.2  1998/12/17 09:12:44  ivan
 # s/CGI::(Request|Base)/CGI.pm/;
 #
 
 use strict;
+use vars qw ( $cgi $date $pkgnum $cust_pkg %hash $new $error );
 use Date::Parse;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
@@ -29,12 +34,11 @@ use FS::CGI qw(popurl eidiot);
 use FS::Record qw(qsearchs);
 use FS::cust_pkg;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
 #untaint date & pkgnum
 
-my($date);
 if ( $cgi->param('date') ) {
   str2time($cgi->param('date')) =~ /^(\d+)$/ or die "Illegal date";
   $date=$1;
@@ -43,13 +47,13 @@ if ( $cgi->param('date') ) {
 }
 
 $cgi->param('pkgnum') =~ /^(\d+)$/ or die "Illegal pkgnum";
-my($pkgnum)=$1;
+$pkgnum = $1;
 
-my($cust_pkg) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-my(%hash)=$cust_pkg->hash;
+$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+%hash = $cust_pkg->hash;
 $hash{expire}=$date;
-my($new)=create FS::cust_pkg ( \%hash );
-my($error) = $new->replace($cust_pkg);
+$new = new FS::cust_pkg ( \%hash );
+$error = $new->replace($cust_pkg);
 &eidiot($error) if $error;
 
 print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
diff --git a/htdocs/misc/link.cgi b/htdocs/misc/link.cgi
index d18cfccc1..208ed8ee5 100755
--- a/htdocs/misc/link.cgi
+++ b/htdocs/misc/link.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: link.cgi,v 1.4 1999-01-18 09:41:36 ivan Exp $
+# $Id: link.cgi,v 1.5 1999-01-19 05:14:06 ivan Exp $
 #
 # Note: Should be run setuid freeside as user nobody
 #
@@ -11,7 +11,11 @@
 # can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
 #
 # $Log: link.cgi,v $
-# Revision 1.4  1999-01-18 09:41:36  ivan
+# Revision 1.5  1999-01-19 05:14:06  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:36  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -23,13 +27,15 @@
 #
 
 use strict;
+use vars qw ( %link_field $cgi $pkgnum $svcpart $query $part_svc $svc $svcdb 
+              $link_field );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(popurl);
 use FS::Record qw(qsearchs);
 
-my(%link_field)=(
+%link_field = (
   'svc_acct'    => 'username',
   'svc_domain'  => 'domain',
   'svc_acct_sm' => '',
@@ -37,20 +43,19 @@ my(%link_field)=(
   'svc_wo'      => '',
 );
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 cgisuidsetup($cgi);
 
-my($pkgnum,$svcpart);
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
   $pkgnum=$1 if /^pkgnum(\d+)$/;
   $svcpart=$1 if /^svcpart(\d+)$/;
 }
 
-my($part_svc) = qsearchs('part_svc',{'svcpart'=>$svcpart});
-my($svc) = $part_svc->getfield('svc');
-my($svcdb) = $part_svc->getfield('svcdb');
-my($link_field) = $link_field{$svcdb};
+$part_svc = qsearchs('part_svc',{'svcpart'=>$svcpart});
+$svc = $part_svc->getfield('svc');
+$svcdb = $part_svc->getfield('svcdb');
+$link_field = $link_field{$svcdb};
 
 print $cgi->header( '-expires' => 'now' ), header("Link to existing $svc account"),
       qq!<FORM ACTION="!, popurl(1), qq!process/link.cgi" METHOD=POST>!;
diff --git a/htdocs/misc/print-invoice.cgi b/htdocs/misc/print-invoice.cgi
index 0ece4261e..213f15406 100755
--- a/htdocs/misc/print-invoice.cgi
+++ b/htdocs/misc/print-invoice.cgi
@@ -1,12 +1,16 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: print-invoice.cgi,v 1.3 1998-12-23 03:04:24 ivan Exp $
+# $Id: print-invoice.cgi,v 1.4 1999-01-19 05:14:07 ivan Exp $
 #
 # just a kludge for now, since this duplicates in a way it shouldn't stuff from
 # Bill.pm (like $lpr) ivan@sisd.com 98-jun-16
 #
 # $Log: print-invoice.cgi,v $
-# Revision 1.3  1998-12-23 03:04:24  ivan
+# Revision 1.4  1999-01-19 05:14:07  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1998/12/23 03:04:24  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.2  1998/12/17 09:12:47  ivan
@@ -14,7 +18,7 @@
 #
 
 use strict;
-use vars qw($conf);
+use vars qw($conf $cgi $lpr $query $invnum $cust_bill $custnum );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -22,17 +26,17 @@ use FS::CGI qw(popurl);
 use FS::Record qw(qsearchs);
 use FS::cust_bill;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
 $conf = new FS::Conf;
-my $lpr = $conf->config('lpr');
+$lpr = $conf->config('lpr');
 
 #untaint invnum
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 $query =~ /^(\d*)$/;
-my($invnum)=$1;
-my($cust_bill)=qsearchs('cust_bill',{'invnum'=>$invnum});
+$invnum = $1;
+$cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Can't find invoice!\n" unless $cust_bill;
 
         open(LPR,"|$lpr") or die "Can't open $lpr: $!";
@@ -41,7 +45,7 @@ die "Can't find invoice!\n" unless $cust_bill;
           or die $! ? "Error closing $lpr: $!"
                        : "Exit status $? from $lpr";
 
-my($custnum)=$cust_bill->getfield('custnum');
+$custnum = $cust_bill->getfield('custnum');
 
 print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum#history");
 
diff --git a/htdocs/misc/process/link.cgi b/htdocs/misc/process/link.cgi
index aab26411d..c20b47373 100755
--- a/htdocs/misc/process/link.cgi
+++ b/htdocs/misc/process/link.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: link.cgi,v 1.2 1998-12-17 09:15:00 ivan Exp $
+# $Id: link.cgi,v 1.3 1999-01-19 05:14:10 ivan Exp $
 #
 # ivan@voicenet.com 97-feb-5
 #
@@ -12,11 +12,16 @@
 # can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
 #
 # $Log: link.cgi,v $
-# Revision 1.2  1998-12-17 09:15:00  ivan
+# Revision 1.3  1999-01-19 05:14:10  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.2  1998/12/17 09:15:00  ivan
 # s/CGI::Request/CGI.pm/;
 #
 
 use strict;
+use vars qw ( $cgi $old $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::CGI qw(popurlidiot);
@@ -24,7 +29,7 @@ use FS::UID qw(cgisuidsetup);
 use FS::cust_svc;
 use FS::Record qw(qsearchs);
 
-my($cgi)=new CGI;
+$cgi = new CGI;
 cgisuidsetup($cgi);
 
 $cgi->param('pkgnum') =~ /^(\d+)$/; my($pkgnum)=$1;
@@ -40,15 +45,14 @@ unless ( $svcnum ) {
   $svcnum=$svc_acct->svcnum;
 }
 
-my($old)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
+$old = qsearchs('cust_svc',{'svcnum'=>$svcnum});
 die "svcnum not found!" unless $old;
-my($new)=create FS::cust_svc ({
+$new = new FS::cust_svc ({
   'svcnum' => $svcnum,
   'pkgnum' => $pkgnum,
   'svcpart' => $svcpart,
 });
 
-my($error);
 $error = $new->replace($old);
 
 unless ($error) {
diff --git a/htdocs/misc/susp_pkg.cgi b/htdocs/misc/susp_pkg.cgi
index 7b8096470..851a53f7f 100755
--- a/htdocs/misc/susp_pkg.cgi
+++ b/htdocs/misc/susp_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: susp_pkg.cgi,v 1.3 1998-12-23 03:04:56 ivan Exp $
+# $Id: susp_pkg.cgi,v 1.4 1999-01-19 05:14:08 ivan Exp $
 #
 # Usage: susp_pkg.cgi pkgnum
 #        http://server.name/path/susp_pkg.cgi pkgnum
@@ -23,7 +23,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: susp_pkg.cgi,v $
-# Revision 1.3  1998-12-23 03:04:56  ivan
+# Revision 1.4  1999-01-19 05:14:08  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1998/12/23 03:04:56  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.2  1998/12/17 09:12:48  ivan
@@ -31,23 +35,24 @@
 #
 
 use strict;
+use vars qw( $cgi $query $pkgnum $cust_pkg $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs);
 use FS::cust_pkg;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
  
 #untaint pkgnum
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 $query =~ /^(\d+)$/ || die "Illegal pkgnum";
-my($pkgnum)=$1;
+$pkgnum = $1;
 
-my($cust_pkg) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
 
-my($error)=$cust_pkg->suspend;
+$error = $cust_pkg->suspend;
 &eidiot($error) if $error;
 
 print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
diff --git a/htdocs/misc/unsusp_pkg.cgi b/htdocs/misc/unsusp_pkg.cgi
index 170d85f8a..c8bb4f4a8 100755
--- a/htdocs/misc/unsusp_pkg.cgi
+++ b/htdocs/misc/unsusp_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: unsusp_pkg.cgi,v 1.3 1998-12-23 03:05:25 ivan Exp $
+# $Id: unsusp_pkg.cgi,v 1.4 1999-01-19 05:14:09 ivan Exp $
 #
 # Usage: susp_pkg.cgi pkgnum
 #        http://server.name/path/susp_pkg.cgi pkgnum
@@ -23,7 +23,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: unsusp_pkg.cgi,v $
-# Revision 1.3  1998-12-23 03:05:25  ivan
+# Revision 1.4  1999-01-19 05:14:09  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1998/12/23 03:05:25  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.2  1998/12/17 09:12:49  ivan
@@ -31,6 +35,7 @@
 #
 
 use strict;
+use vars qw( $cgi $query $pkgnum $cust_pkg $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -38,17 +43,17 @@ use FS::CGI qw(popurl eidiot);
 use FS::Record qw(qsearchs);
 use FS::cust_pkg;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
  
 #untaint pkgnum
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 $query =~ /^(\d+)$/ || die "Illegal pkgnum";
-my($pkgnum)=$1;
+$pkgnum = $1;
 
-my($cust_pkg) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
 
-my($error)=$cust_pkg->unsuspend;
+$error = $cust_pkg->unsuspend;
 &eidiot($error) if $error;
 
 print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
diff --git a/htdocs/search/cust_bill.cgi b/htdocs/search/cust_bill.cgi
index 29ff78107..e6dd3e3c7 100755
--- a/htdocs/search/cust_bill.cgi
+++ b/htdocs/search/cust_bill.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_bill.cgi,v 1.2 1998-12-17 09:41:07 ivan Exp $
+# $Id: cust_bill.cgi,v 1.3 1999-01-19 05:14:11 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_bill.cgi
@@ -13,22 +13,27 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_bill.cgi,v $
-# Revision 1.2  1998-12-17 09:41:07  ivan
+# Revision 1.3  1999-01-19 05:14:11  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.2  1998/12/17 09:41:07  ivan
 # s/CGI::(Base|Request)/CGI.pm/;
 #
 
 use strict;
+use vars qw ( $cgi $invnum );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(popurl idiot);
 use FS::Record qw(qsearchs);
 
-my($cgi)=new CGI;
+$cgi = new CGI;
 cgisuidsetup($cgi);
 
 $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
-my($invnum)=$2;
+$invnum = $2;
 
 if ( qsearchs('cust_bill',{'invnum'=>$invnum}) ) {
   print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index 48e88539b..a50cee88f 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.5 1999-01-18 09:41:37 ivan Exp $
+# $Id: cust_main.cgi,v 1.6 1999-01-19 05:14:12 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -19,7 +19,11 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.5  1999-01-18 09:41:37  ivan
+# Revision 1.6  1999-01-19 05:14:12  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:37  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -38,7 +42,7 @@
 #
 
 use strict;
-use vars qw(%ncancelled_pkgs %all_pkgs);
+use vars qw(%ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use IO::Handle;
@@ -48,12 +52,9 @@ use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header menubar idiot popurl table);
 use FS::cust_main;
 
-my($cgi)=new CGI;
+$cgi = new CGI;
 cgisuidsetup($cgi);
 
-my(@cust_main);
-my($sortby);
-
 if ( $cgi->keywords ) {
   my($query)=$cgi->keywords;
   if ( $query eq 'custnum' ) {
@@ -72,10 +73,8 @@ if ( $cgi->keywords ) {
   &companysearch if ( $cgi->param('company_on') && $cgi->param('company_text') );
 }
 
-my(%ncancelled_pkgs) =
-  map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
-my(%all_pkgs) = 
-  map { $_->custnum => [ $_->all_pkgs ] } @cust_main;
+%ncancelled_pkgs = map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
+%all_pkgs = map { $_->custnum => [ $_->all_pkgs ] } @cust_main;
 
 if ( scalar(@cust_main) == 1 ) {
   print $cgi->redirect(popurl(2). "view/cust_main.cgi?". $cust_main[0]->custnum);
diff --git a/htdocs/search/cust_pkg.cgi b/htdocs/search/cust_pkg.cgi
index 248833ce1..6685aea70 100755
--- a/htdocs/search/cust_pkg.cgi
+++ b/htdocs/search/cust_pkg.cgi
@@ -1,11 +1,15 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.5 1999-01-18 09:41:38 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.6 1999-01-19 05:14:13 ivan Exp $
 #
 # based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.5  1999-01-18 09:41:38  ivan
+# Revision 1.6  1999-01-19 05:14:13  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:38  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -20,18 +24,17 @@
 #
 
 use strict;
+use vars qw ( $cgi @cust_pkg $sortby $query );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header idiot popurl);
 
-my($cgi)=new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
-my(@cust_pkg,$sortby);
-
-my($query)=$cgi->keywords;
+($query) = $cgi->keywords;
 #this tree is a little bit redundant
 if ( $query eq 'pkgnum' ) {
   $sortby=\*pkgnum_sort;
diff --git a/htdocs/search/svc_acct.cgi b/htdocs/search/svc_acct.cgi
index 5dd33a678..f3305080b 100755
--- a/htdocs/search/svc_acct.cgi
+++ b/htdocs/search/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.5 1999-01-18 09:41:39 ivan Exp $
+# $Id: svc_acct.cgi,v 1.6 1999-01-19 05:14:14 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
@@ -23,7 +23,11 @@
 # give service and customer info too ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.5  1999-01-18 09:41:39  ivan
+# Revision 1.6  1999-01-19 05:14:14  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:39  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -38,6 +42,7 @@
 #
 
 use strict;
+use vars qw( $cgi @svc_acct $sortby $query );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -46,12 +51,10 @@ use FS::CGI qw(header idiot popurl);
 use FS::svc_acct;
 use FS::cust_main;
 
-my($cgi)=new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
-my(@svc_acct,$sortby);
-
-my($query)=$cgi->keywords;
+($query)=$cgi->keywords;
 $query ||= ''; #to avoid use of unitialized value errors
 #this tree is a little bit redundant
 if ( $query eq 'svcnum' ) {
diff --git a/htdocs/search/svc_acct_sm.cgi b/htdocs/search/svc_acct_sm.cgi
index c1c593673..ecdf0bc0c 100755
--- a/htdocs/search/svc_acct_sm.cgi
+++ b/htdocs/search/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.4 1999-01-18 09:41:40 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.5 1999-01-19 05:14:16 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -19,7 +19,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.4  1999-01-18 09:41:40  ivan
+# Revision 1.5  1999-01-19 05:14:16  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:40  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -28,7 +32,7 @@
 #
 
 use strict;
-use vars qw($conf);
+use vars qw( $conf $cgi $mydomain $domuser $svc_domain $domsvc @svc_acct_sm );
 use CGI::Request;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -36,21 +40,20 @@ use FS::CGI qw(popurl idiot header table);
 use FS::Record qw(qsearch qsearchs);
 use FS::Conf;
 
-my($cgi)=new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
 $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
+$mydomain = $conf->config('domain');
 
 $cgi->param('domuser') =~ /^([a-z0-9_\-]{0,32})$/;
-my($domuser)=$1;
+$domuser = $1;
 
 $cgi->param('domain') =~ /^([\w\-\.]+)$/ or die "Illegal domain";
-my($svc_domain)=qsearchs('svc_domain',{'domain'=>$1})
+$svc_domain = qsearchs('svc_domain',{'domain'=>$1})
   or die "Unknown domain";
-my($domsvc)=$svc_domain->svcnum;
+$domsvc = $svc_domain->svcnum;
 
-my(@svc_acct_sm);
 if ($domuser) {
   @svc_acct_sm=qsearch('svc_acct_sm',{
     'domuser' => $domuser,
diff --git a/htdocs/search/svc_domain.cgi b/htdocs/search/svc_domain.cgi
index b902bbe1c..cb704a3c4 100755
--- a/htdocs/search/svc_domain.cgi
+++ b/htdocs/search/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.3 1998-12-23 03:06:50 ivan Exp $
+# $Id: svc_domain.cgi,v 1.4 1999-01-19 05:14:17 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -17,7 +17,11 @@
 # display total, use FS::CGI now does browsing too ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.3  1998-12-23 03:06:50  ivan
+# Revision 1.4  1999-01-19 05:14:17  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1998/12/23 03:06:50  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.2  1998/12/17 09:41:12  ivan
@@ -25,19 +29,17 @@
 #
 
 use strict;
+use vars qw ( $cgi @svc_domain $sortby $query );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header idiot popurl);
 
-my($cgi)=new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
-my(@svc_domain);
-my($sortby);
-
-my($query)=$cgi->keywords;
+($query)=$cgi->keywords;
 if ( $query eq 'svcnum' ) {
   $sortby=\*svcnum_sort;
   @svc_domain=qsearch('svc_domain',{});
diff --git a/htdocs/view/cust_bill.cgi b/htdocs/view/cust_bill.cgi
index ccfc33c81..44e3a4a1b 100755
--- a/htdocs/view/cust_bill.cgi
+++ b/htdocs/view/cust_bill.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_bill.cgi,v 1.5 1999-01-18 09:41:42 ivan Exp $
+# $Id: cust_bill.cgi,v 1.6 1999-01-19 05:14:18 ivan Exp $
 #
 # Note: Should be run setuid freeside as user nobody.
 #
@@ -25,7 +25,11 @@
 # also print 'printed' field ivan@sisd.com 98-jul-10
 #
 # $Log: cust_bill.cgi,v $
-# Revision 1.5  1999-01-18 09:41:42  ivan
+# Revision 1.6  1999-01-19 05:14:18  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:42  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -40,6 +44,7 @@
 #
 
 use strict;
+use vars qw ( $cgi $query $invnum $cust_bill $custnum $printed $p );
 use IO::File;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
@@ -48,21 +53,21 @@ use FS::CGI qw(header popurl menubar);
 use FS::Record qw(qsearchs);
 use FS::cust_bill;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
 #untaint invnum
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
-my($invnum)=$1;
+$invnum = $1;
 
-my($cust_bill) = qsearchs('cust_bill',{'invnum'=>$invnum});
+$cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Invoice #$invnum not found!" unless $cust_bill;
-my($custnum) = $cust_bill->getfield('custnum');
+$custnum = $cust_bill->getfield('custnum');
 
-my($printed) = $cust_bill->printed;
+$printed = $cust_bill->printed;
 
-my $p = popurl(2);
+$p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header('Invoice View', menubar(
   "Main Menu" => $p,
   "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index 71a4e517e..7c5f4bead 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.9 1999-01-18 09:41:43 ivan Exp $
+# $Id: cust_main.cgi,v 1.10 1999-01-19 05:14:19 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -33,7 +33,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.9  1999-01-18 09:41:43  ivan
+# Revision 1.10  1999-01-19 05:14:19  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.9  1999/01/18 09:41:43  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -60,6 +64,9 @@
 #
 
 use strict;
+use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
+              @packages $package @history @bills $bill @credits $credit
+              $balance $item ); 
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use Date::Format;
@@ -76,7 +83,7 @@ use FS::agent;
 use FS::cust_main;
 use FS::cust_refund;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
 print $cgi->header( '-expires' => 'now' ), header("Customer View", menubar(
@@ -86,12 +93,12 @@ print $cgi->header( '-expires' => 'now' ), header("Customer View", menubar(
 END
 
 die "No customer specified (bad URL)!" unless $cgi->keywords;
-my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
+($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
 $query =~ /^(\d+)$/;
-my($custnum)=$1;
-my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
+$custnum = $1;
+$cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
 die "Customer not found!" unless $cust_main;
-my($hashref)=$cust_main->hashref;
+$hashref = $cust_main->hashref;
 
 #custnum
 print "<FONT SIZE=+1><CENTER>Customer #<B>$custnum</B></CENTER></FONT>",
@@ -111,7 +118,7 @@ print qq!<HR><A NAME="cust_main"><CENTER><FONT SIZE=+1>Customer Information!,
       qq!">Edit this information</A></CENTER><FONT SIZE=-1>!;
 
 #agentnum
-my($agent)=qsearchs('agent',{
+$agent = qsearchs('agent',{
   'agentnum' => $cust_main->getfield('agentnum')
 } );
 die "Agent not found!" unless $agent;
@@ -119,7 +126,7 @@ print "<BR>Agent #<B>" , $agent->getfield('agentnum') , ": " ,
                          $agent->getfield('agent') , "</B>";
 
 #refnum
-my($referral)=qsearchs('part_referral',{'refnum' => $cust_main->refnum});
+$referral = qsearchs('part_referral',{'refnum' => $cust_main->refnum});
 die "Referral not found!" unless $referral;
 print "<BR>Referral #<B>", $referral->refnum, ": ",
       $referral->referral, "<\B>"; 
@@ -215,8 +222,7 @@ print qq!<CENTER>!, table, "\n",
       qq!</TR>\n!;
 
 #get package info
-my(@packages)=qsearch('cust_pkg',{'custnum'=>$custnum});
-my($package);
+@packages = qsearch('cust_pkg',{'custnum'=>$custnum});
 foreach $package (@packages) {
   my($pref)=$package->hashref;
   my($part_pkg)=qsearchs('part_pkg',{
@@ -265,10 +271,7 @@ print qq!<CENTER><HR><A NAME="history"><FONT SIZE=+1>Payment History!,
 # major problem: this whole thing is way too sloppy.
 # minor problem: the description lines need better formatting.
 
-my(@history);
-
-my(@bills)=qsearch('cust_bill',{'custnum'=>$custnum});
-my($bill);
+@bills = qsearch('cust_bill',{'custnum'=>$custnum});
 foreach $bill (@bills) {
   my($bref)=$bill->hashref;
   push @history,
@@ -292,8 +295,7 @@ foreach $bill (@bills) {
   }
 }
 
-my(@credits)=qsearch('cust_credit',{'custnum'=>$custnum});
-my($credit);
+@credits = qsearch('cust_credit',{'custnum'=>$custnum});
 foreach $credit (@credits) {
   my($cref)=$credit->hashref;
   push @history,
@@ -328,8 +330,7 @@ END
 
 #display payment history
 
-my($balance)=0;
-my($item);
+$balance = 0;
 foreach $item (sort keyfield_numerically @history) {
   my($date,$desc,$charge,$payment,$credit,$refund)=split(/\t/,$item);
   $charge ||= 0;
diff --git a/htdocs/view/cust_pkg.cgi b/htdocs/view/cust_pkg.cgi
index 3f6eed614..f1b7b9473 100755
--- a/htdocs/view/cust_pkg.cgi
+++ b/htdocs/view/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.6 1999-01-18 09:41:44 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.7 1999-01-19 05:14:20 ivan Exp $
 #
 # Usage: cust_pkg.cgi pkgnum
 #        http://server.name/path/cust_pkg.cgi?pkgnum
@@ -26,7 +26,11 @@
 # no FS::Search ivan@sisd.com 98-mar-7
 # 
 # $Log: cust_pkg.cgi,v $
-# Revision 1.6  1999-01-18 09:41:44  ivan
+# Revision 1.7  1999-01-19 05:14:20  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6  1999/01/18 09:41:44  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -42,6 +46,9 @@
 #
 
 use strict;
+use vars qw ( $cgi %uiview %uiadd $part_svc $query $pkgnum $cust_pkg $part_pkg
+              $custnum $susp $cancel $expire $pkg $comment $setup $bill
+              $otaker );
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
@@ -54,11 +61,9 @@ use FS::part_pkg;
 use FS::pkg_svc;
 use FS::cust_svc;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 cgisuidsetup($cgi);
 
-my(%uiview,%uiadd);
-my($part_svc);
 foreach $part_svc ( qsearch('part_svc',{}) ) {
   $uiview{$part_svc->svcpart} = popurl(2). "view/". $part_svc->svcdb . ".cgi";
   $uiadd{$part_svc->svcpart}= popurl(2). "edit/". $part_svc->svcdb . ".cgi";
@@ -66,22 +71,22 @@ foreach $part_svc ( qsearch('part_svc',{}) ) {
 
 print $cgi->header( '-expires' => 'now' ), header('Package View', '');
 
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
-my($pkgnum)=$1;
+$pkgnum = $1;
 
 #get package record
-my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
 die "No package!" unless $cust_pkg;
-my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
+$part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
 
 #nav bar
-my($custnum)=$cust_pkg->getfield('custnum');
+$custnum = $cust_pkg->getfield('custnum');
 print qq!<CENTER><A HREF="../view/cust_main.cgi?$custnum">View this customer!,
       qq! (#$custnum)</A> | <A HREF="../">Main menu</A></CENTER><BR>!;
 
 #print info
-my($susp,$cancel,$expire)=(
+($susp,$cancel,$expire)=(
   $cust_pkg->getfield('susp'),
   $cust_pkg->getfield('cancel'),
   $cust_pkg->getfield('expire'),
@@ -91,13 +96,13 @@ print qq!<BR><A HREF="#package">Package Information</A>!;
 print qq! | <A HREF="#services">Service Information</A>! unless $cancel;
 print qq!</CENTER><HR>\n!;
 
-my($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment'));
+($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment'));
 print qq!<A NAME="package"><CENTER><FONT SIZE=+1>Package Information!,
       qq!</FONT></A>!;
 print qq!<BR><A HREF="../unimp.html">Edit this information</A></CENTER>!;
 print "<P>Package: <B>$pkg - $comment</B>";
 
-my($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
+($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
 print "<BR>Setup: <B>", $setup ? time2str("%D",$setup) : "(Not setup)" ,"</B>";
 print "<BR>Next bill: <B>", $bill ? time2str("%D",$bill) : "" ,"</B>";
 
@@ -125,7 +130,7 @@ if ($cancel) {
 }
 
 #otaker
-my($otaker)=$cust_pkg->getfield('otaker');
+$otaker = $cust_pkg->getfield('otaker');
 print "<P>Order taken by <B>$otaker</B>";
 
 unless ($cancel) {
diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi
index 1151e1ced..a5b4f4858 100755
--- a/htdocs/view/svc_acct.cgi
+++ b/htdocs/view/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.6 1999-01-18 09:41:45 ivan Exp $
+# $Id: svc_acct.cgi,v 1.7 1999-01-19 05:14:21 ivan Exp $
 #
 # Usage: svc_acct.cgi svcnum
 #        http://server.name/path/svc_acct.cgi?svcnum
@@ -35,7 +35,11 @@
 # displays arbitrary radius attributes ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.6  1999-01-18 09:41:45  ivan
+# Revision 1.7  1999-01-19 05:14:21  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6  1999/01/18 09:41:45  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -53,7 +57,8 @@
 #
 
 use strict;
-use vars qw( $conf );
+use vars qw( $conf $cgi $mydomain $query $svcnum $svc_acct $cust_svc $pkgnum
+             $cust_pkg $custnum $part_svc $p $svc_acct_pop );
 use CGI;
 use CGI::Carp qw( fatalsToBrowser );
 use FS::UID qw( cgisuidsetup );
@@ -66,33 +71,32 @@ use FS::cust_pkg;
 use FS::part_svc;
 use FS::svc_acct_pop;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
 $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
+$mydomain = $conf->config('domain');
 
 #untaint svcnum
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
-my($svcnum)=$1;
-my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svcnum});
+$svcnum = $1;
+$svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
 die "Unkonwn svcnum" unless $svc_acct;
 
-my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
-my($pkgnum)=$cust_svc->getfield('pkgnum');
-my($cust_pkg,$custnum);
+$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+$pkgnum = $cust_svc->getfield('pkgnum');
 if ($pkgnum) {
   $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
   $custnum=$cust_pkg->getfield('custnum');
 }
 
-my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unkonwn svcpart" unless $part_svc;
 
 print $cgi->header( '-expires' => 'now' ), header('Account View', '');
 
-my $p = popurl(2);
+$p = popurl(2);
 if ($pkgnum || $custnum) {
   print <<END;
 <A HREF="${p}view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> | 
@@ -131,7 +135,7 @@ if (substr($svc_acct->_password,0,1) eq "*") {
 }
 
 # popnum -> svc_acct_pop record
-my($svc_acct_pop)=qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
+$svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
 
 #pop
 print "POP: <B>", $svc_acct_pop->city, ", ", $svc_acct_pop->state,
diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi
index ab8450fce..80bd48967 100755
--- a/htdocs/view/svc_acct_sm.cgi
+++ b/htdocs/view/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.5 1999-01-18 09:41:46 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.6 1999-01-19 05:14:22 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi svcnum
 #        http://server.name/path/svc_acct_sm.cgi?svcnum
@@ -22,7 +22,11 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.5  1999-01-18 09:41:46  ivan
+# Revision 1.6  1999-01-19 05:14:22  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:46  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -37,40 +41,41 @@
 #
 
 use strict;
-use vars qw($conf);
+use vars qw($conf $cgi $mydomain $query $svcnum $svc_acct_sm $cust_svc
+            $pkgnum cust_pkg $custnum $part_svc $p $domsvc,$domuid,$domuser
+            $svc $svc_domain $domain $svc_acct $username );
 use CGI;
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(header popurl);
 use FS::Record qw(qsearchs);
 use FS::Conf;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 cgisuidsetup($cgi);
 
 $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
+$mydomain = $conf->config('domain');
 
 #untaint svcnum
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
-my($svcnum)=$1;
-my($svc_acct_sm)=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum});
+$svcnum = $1;
+$svc_acct_sm = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum});
 die "Unknown svcnum" unless $svc_acct_sm;
 
-my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
-my($pkgnum)=$cust_svc->getfield('pkgnum');
-my($cust_pkg,$custnum);
+$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+$pkgnum = $cust_svc->getfield('pkgnum');
 if ($pkgnum) {
   $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
   $custnum=$cust_pkg->getfield('custnum');
 }
 
-my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unkonwn svcpart" unless $part_svc;
 
 print $cgi->header( '-expires' => 'now' ), header('Mail Alias View');
 
-my $p = popurl(2);
+$p = popurl(2);
 if ($pkgnum || $custnum) {
   print <<END;
 <A HREF="${p}view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> | 
@@ -89,16 +94,16 @@ print <<END;
     <BASEFONT SIZE=3>
 END
 
-my($domsvc,$domuid,$domuser)=(
+($domsvc,$domuid,$domuser) = (
   $svc_acct_sm->domsvc,
   $svc_acct_sm->domuid,
   $svc_acct_sm->domuser,
 );
-my($svc) = $part_svc->svc;
-my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$domsvc});
-my($domain)=$svc_domain->domain;
-my($svc_acct)=qsearchs('svc_acct',{'uid'=>$domuid});
-my($username)=$svc_acct->username;
+$svc = $part_svc->svc;
+$svc_domain = qsearchs('svc_domain',{'svcnum'=>$domsvc});
+$domain = $svc_domain->domain;
+$svc_acct = qsearchs('svc_acct',{'uid'=>$domuid});
+$username = $svc_acct->username;
 
 #formatting
 print qq!<HR>!;
diff --git a/htdocs/view/svc_domain.cgi b/htdocs/view/svc_domain.cgi
index 7fa65e020..a6de40429 100755
--- a/htdocs/view/svc_domain.cgi
+++ b/htdocs/view/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.5 1999-01-18 09:41:47 ivan Exp $
+# $Id: svc_domain.cgi,v 1.6 1999-01-19 05:14:23 ivan Exp $
 #
 # Usage: svc_domain svcnum
 #        http://server.name/path/svc_domain.cgi?svcnum
@@ -15,7 +15,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.5  1999-01-18 09:41:47  ivan
+# Revision 1.6  1999-01-19 05:14:23  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:47  ivan
 # all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 # (good idea anyway)
 #
@@ -31,34 +35,35 @@
 #
 
 use strict;
+use vars qw( $cgi $query $svcnum $svc_domain $domain $cust_svc $pkgnum 
+             $cust_pkg $custnum $part_svc $p );
 use CGI;
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(header menubar popurl);
 use FS::Record qw(qsearchs);
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 cgisuidsetup($cgi);
 
 #untaint svcnum
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
-my($svcnum)=$1;
-my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$svcnum});
+$svcnum = $1;
+$svc_domain = qsearchs('svc_domain',{'svcnum'=>$svcnum});
 die "Unknown svcnum" unless $svc_domain;
-my($domain)=$svc_domain->domain;
+$domain = $svc_domain->domain;
 
-my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
-my($pkgnum)=$cust_svc->getfield('pkgnum');
-my($cust_pkg,$custnum);
+$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+$pkgnum = $cust_svc->getfield('pkgnum');
 if ($pkgnum) {
   $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
   $custnum=$cust_pkg->getfield('custnum');
 }
 
-my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unkonwn svcpart" unless $part_svc;
 
-my $p = popurl(2);
+$p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header('Domain View', menubar(
   "Main menu" => $p,
   "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-- 
cgit v1.2.1


From 5c519554565e024b5bf32a7ff6e78b0d468c6fa1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Jan 1999 08:55:27 +0000
Subject: documentation update: mod_perl support

---
 htdocs/docs/install.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 5d00f9641..6cf9677fd 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -49,6 +49,10 @@ chmod 4755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.
       <li>Use Apache's <a href="http://www.apache.org/docs/suexec.html">suEXEC</a>.
 <pre>cd /usr/local/apache/htdocs/freeside
 chown -R freeside .
+chmod 755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.cgi search/*.cgi view/*.cgi</pre>
+      <li>Use <a href="http://perl.apache.org/">mod_perl</a>.  You should run a separate iteration of Apache[-SSL] as the freeside user.  (Warning:  The redirect method of CGI.pm 2.36 [as distributed with Perl 5.004_04] is broken under mod_perl.  Downlaod the current version from <a href="http://www.perl.com/CPAN/modules/by-module/CGI">CPAN</a>.)
+<pre>cd /usr/local/apache/htdocs/freeside
+chown -R root .
 chmod 755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.cgi search/*.cgi view/*.cgi</pre>
     </ul>
 <li>Create the necessary <a href="config.html">configuration files</a>.
-- 
cgit v1.2.1


From bd4de8dbae14d0671b83529be2d98faac7bb25aa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Jan 1999 09:30:36 +0000
Subject: skeletal cross-UI UI code.

---
 site_perl/UI/Base.pm  | 191 ++++++++++++++++++++++++++++++++++++++++
 site_perl/UI/CGI.pm   | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++
 site_perl/UI/Gtk.pm   | 221 ++++++++++++++++++++++++++++++++++++++++++++++
 site_perl/UI/agent.pm |  62 +++++++++++++
 4 files changed, 710 insertions(+)
 create mode 100644 site_perl/UI/Base.pm
 create mode 100644 site_perl/UI/CGI.pm
 create mode 100644 site_perl/UI/Gtk.pm
 create mode 100644 site_perl/UI/agent.pm

diff --git a/site_perl/UI/Base.pm b/site_perl/UI/Base.pm
new file mode 100644
index 000000000..38087f6c8
--- /dev/null
+++ b/site_perl/UI/Base.pm
@@ -0,0 +1,191 @@
+package FS::UI::Base;
+
+use strict;
+use vars qw ( @ISA );
+use FS::Record qw( fields qsearch );
+
+@ISA = ( $FS::UI::Base::_lock );
+
+=head1 NAME
+
+FS::UI::Base - Base class for all user-interface objects
+
+=head1 SYNOPSIS
+
+  use FS::UI::SomeInterface;
+  use FS::UI::some_table;
+
+  $interface = new FS::UI::some_table;
+
+  $error = $interface->browse;
+  $error = $interface->search;
+  $error = $interface->view;
+  $error = $interface->edit;
+  $error = $interface->process;
+
+=head1 DESCRIPTION
+
+An FS::UI::Base object represents a user interface object.  FS::UI::Base
+is intended as a base class for table-specfic classes to inherit from, i.e.
+FS::UI::cust_main.  The simplest case, which will provide a default UI for your
+new table, is as follows:
+
+  package FS::UI::table_name;
+  use vars qw ( @ISA );
+  use FS::UI::Base;
+  @ISA = qw( FS::UI::Base );
+  sub db_table { 'table_name'; }
+
+Currently available interfaces are:
+  FS::UI::Gtk, an X-Windows UI implemented using the Gtk+ toolkit
+  FS::UI::CGI, a web interface implemented using CGI.pm, etc.
+
+=head1 METHODS
+
+=over 4
+
+=item new
+
+=cut
+
+=item browse
+
+=cut
+
+sub browse {
+  my $self = shift;
+
+  my @fields = $self->list_fields;
+
+  #begin browse-specific stuff
+
+  $self->title( "Browse ". $self->db_names ) unless $self->title;
+  my @records = qsearch ( $self->db_table, {} );
+
+  #end browse-specific stuff
+
+  $self->addwidget ( new FS::UI::_Text ( $self->db_description ) );
+
+  my @header = $self->list_header;
+  my @headerspan = $self->list_headerspan;
+  my %callback = $self->db_callback;
+
+  my $columns;
+
+  my $table = new FS::UI::_Tableborder (
+    'rows' => 1 + scalar(@records),
+    'columns' => $columns || scalar(@fields),
+  );
+
+  my $c = 0;
+  foreach my $header ( @header ) {
+    my $headerspan = shift(@headerspan) || 1;
+    $table->attach(
+      0, $c, new FS::UI::_Text ( $header ), 1, $headerspan
+    );
+    $c += $headerspan;
+  }
+
+  my $r = 1;
+  
+  foreach my $record ( @records ) {
+    $c = 0;
+    foreach my $field ( @fields ) {
+      my $value = $record->getfield($field);
+      my $widget;
+      if ( $callback{$field} ) {
+        $widget = &{ $callback{$field} }( $value, $record );
+      } else {
+        $widget = new FS::UI::_Text ( $value );
+      }
+      $table->attach( $r, $c++, $widget, 1, 1 );
+    }
+    $r++;
+  }
+
+  $self->addwidget( $table );
+
+  $self->activate;
+
+}
+
+=item title
+
+=cut
+
+sub title {
+  my $self = shift;
+  my $value = shift;
+  if ( defined($value) ) {
+    $self->{'title'} = $value;
+  } else {
+    $self->{'title'};
+  }
+}
+
+=item addwidget
+
+=cut
+
+sub addwidget {
+  my $self = shift;
+  my $widget = shift;
+  push @{ $self->{'Widgets'} }, $widget;
+}
+
+#fallback methods
+
+sub db_description {}
+
+sub db_name {}
+
+sub db_names {
+  my $self = shift;
+  $self->db_name. 's';
+}
+
+sub list_fields {
+  my $self = shift;
+  fields( $self->db_table );
+}
+
+sub list_header {
+  my $self = shift;
+  $self->list_fields
+}
+
+sub list_headerspan {
+  my $self = shift;
+  map 1, $self->list_header;
+}
+
+sub db_callback {}
+
+=back
+
+=head1 VERSION
+
+$Id: Base.pm,v 1.1 1999-01-20 09:30:36 ivan Exp $
+
+=head1 BUGS
+
+This documentation is incomplete.
+
+There should be some sort of per-(freeside)-user preferences and the ability
+for specific FS::UI:: modules to put their own values there as well.
+
+=head1 SEE ALSO
+
+L<FS::UI::Gtk>, L<FS::UI::CGI>
+
+=head1 HISTORY
+
+$Log: Base.pm,v $
+Revision 1.1  1999-01-20 09:30:36  ivan
+skeletal cross-UI UI code.
+
+
+=cut
+
+1;
+
diff --git a/site_perl/UI/CGI.pm b/site_perl/UI/CGI.pm
new file mode 100644
index 000000000..e02e3d35a
--- /dev/null
+++ b/site_perl/UI/CGI.pm
@@ -0,0 +1,236 @@
+package FS::UI::CGI;
+
+use strict;
+use CGI;
+#use CGI::Switch;  #when FS::UID user and preference callback stuff is fixed
+use CGI::Carp qw(fatalsToBrowser);
+use HTML::Table;
+use FS::UID qw(adminsuidsetup);
+#use FS::Record qw( qsearch fields );
+
+die "Can't initialize CGI interface; $FS::UI::Base::_lock used"
+  if $FS::UI::Base::_lock;
+$FS::UI::Base::_lock = "FS::UI::CGI";
+
+=head1 NAME
+
+FS::UI::CGI - Base class for CGI user-interface objects
+
+=head1 SYNOPSIS
+
+  use FS::UI::CGI;
+  use FS::UI::some_table;
+
+  $interface = new FS::UI::some_table;
+
+  $error = $interface->browse;
+  $error = $interface->search;
+  $error = $interface->view;
+  $error = $interface->edit;
+  $error = $interface->process;
+
+=head1 DESCRIPTION
+
+An FS::UI::CGI object represents a CGI interface object.
+
+=head1 METHODS
+
+=over 4
+
+=item new
+
+=cut
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = { @_ };
+
+  $self->{'_cgi'} = new CGI;
+  $self->{'_user'} = $self->{'_cgi'}->remote_user;
+  $self->{'_dbh'} = FS::UID::adminsuidsetup $self->{'_user'};
+
+  bless ( $self, $class);
+}
+
+sub activate {
+  my $self = shift;
+  print $self->_header,
+        join ( "<BR>", map $_->sprint, @{ $self->{'Widgets'} } ),
+        $self->_footer,
+  ;
+}
+
+=item _header
+
+=cut
+
+sub _header {
+  my $self = shift;
+  my $cgi = $self->{'_cgi'};
+
+  $cgi->header( '-expires' => 'now' ), '<HTML>', 
+    '<HEAD><TITLE>', $self->title, '</TITLE></HEAD>',
+    '<BODY BGCOLOR="#ffffff">',
+    '<FONT COLOR="#ff0000" SIZE=7>', $self->title, '</FONT><BR><BR>',
+  ;
+}
+
+=item _footer
+
+=cut
+
+sub _footer {
+  "</BODY></HTML>";
+}
+
+=item interface
+
+Returns the string `CGI'.  Useful for the author of a table-specific UI class
+to conditionally specify certain behaviour.
+
+=cut
+
+sub interface { 'CGI'; }
+
+=back
+
+=cut
+
+package FS::UI::_Widget;
+
+use vars qw( $AUTOLOAD );
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = { @_ };
+  bless ( $self, $class );
+}
+
+sub AUTOLOAD {
+  my $self = shift;
+  my $value = shift;
+  my($field)=$AUTOLOAD;
+  $field =~ s/.*://;
+  if ( defined($value) ) {
+    $self->{$field} = $value;
+  } else {
+    $self->{$field};
+  }    
+}
+
+package FS::UI::_Text;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Widget);
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = {};
+  $self->{'_text'} = shift;
+  bless ( $self, $class );
+}
+
+sub sprint {
+  my $self = shift;
+  $self->{'_text'};
+}
+
+package FS::UI::_Link;
+
+use vars qw ( @ISA $BASE_URL );
+
+@ISA = qw ( FS::UI::_Widget);
+$BASE_URL = "http://rootwood.sisd.com/freeside";
+
+sub sprint {
+  my $self = shift;
+  my $table = $self->{'table'};
+  my $method = $self->{'method'};
+
+  # i will be cleaned up when we're done moving from the old webinterface!
+  my @arg = @{$self->{'arg'}};
+  my $yuck = join( "&", @arg);
+  qq(<A HREF="$BASE_URL/$method/$table.cgi?$yuck">). $self->{'text'}. "<\A>";
+}
+
+package FS::UI::_Table;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Widget);
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = $class eq $proto ? { @_ } : $proto;
+  bless ( $self, $class );
+  $self->{'_table'} = new HTML::Table ( $self->rows, $self->columns );
+  $self;
+}
+
+sub attach {
+  my $self = shift;
+  my ( $row, $column, $widget, $rowspan, $colspan ) = @_;
+  $self->{"_table"}->setCell( $row+1, $column+1, $widget->sprint );
+  $self->{"_table"}->setCellRowSpan( $row+1, $column+1, $rowspan ) if $rowspan;
+  $self->{"_table"}->setCellColSpan( $row+1, $column+1, $colspan ) if $colspan;
+}
+
+sub sprint {
+  my $self = shift;
+  $self->{'_table'}->getTable;
+}
+
+package FS::UI::_Tableborder;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Table );
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = $class eq $proto ? { @_ } : $proto;
+  bless ( $self, $class );
+  $self->SUPER::new(@_);
+  $self->{'_table'}->setBorder;
+  $self;
+}
+
+=head1 VERSION
+
+$Id: CGI.pm,v 1.1 1999-01-20 09:30:36 ivan Exp $
+
+=head1 BUGS
+
+This documentation is incomplete.
+
+In _Tableborder, headers should be links that sort on their fields.
+
+_Link uses a constant $BASE_URL
+
+_Link passes the arguments as a manually-constructed GET string instead
+of POSTing, for compatability while the web interface is upgraded.  Once
+this is done it should pass arguements properly (i.e. as a POST, 8-bit clean)
+
+Still some small bits of widget code same as FS::UI::Gtk.
+
+=head1 SEE ALSO
+
+L<FS::UI::Base>
+
+=head1 HISTORY
+
+$Log: CGI.pm,v $
+Revision 1.1  1999-01-20 09:30:36  ivan
+skeletal cross-UI UI code.
+
+
+=cut
+
+1;
+
diff --git a/site_perl/UI/Gtk.pm b/site_perl/UI/Gtk.pm
new file mode 100644
index 000000000..498f05a47
--- /dev/null
+++ b/site_perl/UI/Gtk.pm
@@ -0,0 +1,221 @@
+package FS::UI::Gtk;
+
+use strict;
+use Gtk;
+use FS::UID qw(adminsuidsetup);
+
+die "Can't initialize Gtk interface; $FS::UI::Base::_lock used"
+  if $FS::UI::Base::_lock;
+$FS::UI::Base::_lock = "FS::UI::Gtk";
+
+=head1 NAME
+
+FS::UI::Gtk - Base class for Gtk user-interface objects
+
+=head1 SYNOPSIS
+
+  use FS::UI::Gtk;
+  use FS::UI::some_table;
+
+  $interface = new FS::UI::some_table;
+
+  $error = $interface->browse;
+  $error = $interface->search;
+  $error = $interface->view;
+  $error = $interface->edit;
+  $error = $interface->process;
+
+=head1 DESCRIPTION
+
+An FS::UI::Gtk object represents a Gtk user interface object.
+
+=head1 METHODS
+
+=over 4
+
+=item new
+
+=cut
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = { @_ };
+
+  bless ( $self, $class );
+
+  $self->{'_user'} = 'ivan'; #Pop up login window?
+  $self->{'_dbh'} = FS::UID::adminsuidsetup $self->{'_user'};
+
+
+
+  $self;
+}
+
+sub activate {
+  my $self = shift;
+
+  my $vbox = new Gtk::VBox ( 0, 4 );
+
+  foreach my $widget ( @{ $self->{'Widgets'} } ) {
+    $widget->_gtk->show;
+    $vbox->pack_start ( $widget->_gtk, 1, 1, 4 );
+  }
+  $vbox->show;
+
+  my $window = new Gtk::Window "toplevel";
+  $self->{'_gtk'} = $window;
+  $window->set_title( $self->title );
+  $window->add ( $vbox );
+  $window->show;
+  main Gtk;
+}
+
+=item interface
+
+Returns the string `Gtk'.  Useful for the author of a table-specific UI class
+to conditionally specify certain behaviour.
+
+=cut 
+
+sub interface { 'Gtk'; }
+
+=back
+
+=cut
+
+package FS::UI::_Widget;
+
+use vars qw( $AUTOLOAD );
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = { @_ };
+  bless ( $self, $class );
+}
+
+sub _gtk {
+  my $self = shift;
+  $self->{'_gtk'};
+}
+
+sub AUTOLOAD {
+  my $self = shift;
+  my $value = shift;
+  my($field)=$AUTOLOAD;
+  $field =~ s/.*://;
+  if ( defined($value) ) {
+    $self->{$field} = $value;
+  } else {
+    $self->{$field};
+  }    
+}
+
+package FS::UI::_Text;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Widget );
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = {};
+  $self->{'_gtk'} = new Gtk::Label ( shift );
+  bless ( $self, $class );
+}
+
+package FS::UI::_Link;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Widget );
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = { @_ };
+  $self->{'_gtk'} = new_with_label Gtk::Button ( $self->{'text'} );
+  $self->{'_gtk'}->signal_connect( 'clicked', sub {
+      print "STUB: (Gtk) FS::UI::_Link";
+    }, "hi", "there" );
+  bless ( $self, $class );
+}
+
+
+package FS::UI::_Table;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Widget );
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = { @_ };
+  bless ( $self, $class );
+
+  $self->{'_gtk'} = new Gtk::Table (
+    $self->rows,
+    $self->columns,
+    0, #homogeneous
+  );
+
+  $self;
+}
+
+sub attach {
+  my $self = shift;
+  my ( $row, $column, $widget, $rowspan, $colspan ) = @_;
+  $rowspan ||= 1;
+  $colspan ||= 1;
+  $self->_gtk->attach_defaults(
+    $widget->_gtk,
+    $column,
+    $column + $colspan,
+    $row,
+    $row + $rowspan,
+  );
+  $widget->_gtk->show;
+}
+
+package FS::UI::_Tableborder;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Table );
+
+=head1 VERSION
+
+$Id: Gtk.pm,v 1.1 1999-01-20 09:30:36 ivan Exp $
+
+=head1 BUGS
+
+This documentation is incomplete.
+
+_Tableborder is just a _Table now.  _Tableborders should scroll (but not the
+headers) and need and need more decoration. (data in white section ala gtksql
+and sliding field widths) headers should be buttons that callback to sort on
+their fields.
+
+There should be a persistant, per-(freeside)-user store for window positions
+and sizes and sort fields etc (see L<FS::UI::CGI/BUGS>.
+
+Still some small bits of widget code same as FS::UI::CGI.
+
+=head1 SEE ALSO
+
+L<FS::UI::Base>
+
+=head1 HISTORY
+
+$Log: Gtk.pm,v $
+Revision 1.1  1999-01-20 09:30:36  ivan
+skeletal cross-UI UI code.
+
+
+=cut
+
+1;
+
diff --git a/site_perl/UI/agent.pm b/site_perl/UI/agent.pm
new file mode 100644
index 000000000..ce9744a55
--- /dev/null
+++ b/site_perl/UI/agent.pm
@@ -0,0 +1,62 @@
+package FS::UI::agent;
+
+use strict;
+use vars qw ( @ISA );
+use FS::UI::Base;
+use FS::Record qw( qsearchs );
+use FS::agent;
+use FS::agent_type;
+
+@ISA = qw ( FS::UI::Base );
+
+sub db_table { 'agent' };
+
+sub db_name { 'Agent' };
+
+sub db_description { <<END;
+Agents are resellers of your service. Agents may be limited to a subset of your
+full offerings (via their type).
+END
+}
+
+sub list_fields {
+  'agentnum',
+  'typenum',
+#  'freq',
+#  'prog',
+; }
+
+sub list_header {
+  'Agent',
+  'Type',
+#  'Freq (n/a)',
+#  'Prog (n/a)',
+; }
+
+sub db_callback { 
+  'agentnum' =>
+    sub {
+      my ( $agentnum, $record ) = @_;
+      my $agent = $record->agent;
+      new FS::UI::_Link (
+        'table'  => 'agent',
+        'method' => 'edit',
+        'arg'    => [ $agentnum ],
+        'text'   => "$agentnum: $agent",
+      );
+    },
+  'typenum' =>
+    sub {
+      my $typenum = shift;
+      my $agent_type = qsearchs( 'agent_type', { 'typenum' => $typenum } );
+      my $atype = $agent_type->atype;
+      new FS::UI::_Link (
+        'table'  => 'agent_type',
+        'method' => 'edit',
+        'arg'    => [ $typenum ],
+        'text'   => "$typenum: $atype"
+      );
+    },
+}
+
+1;
-- 
cgit v1.2.1


From 06f4284a7f367b0d70903ab969b305bf4efb6b1b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Jan 1999 09:43:16 +0000
Subject: comment out future UI code (but look at it, it's neat!)

---
 htdocs/browse/agent.cgi | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/browse/agent.cgi b/htdocs/browse/agent.cgi
index 1b459df95..4ec472c33 100755
--- a/htdocs/browse/agent.cgi
+++ b/htdocs/browse/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.10 1999-01-19 05:13:24 ivan Exp $
+# $Id: agent.cgi,v 1.11 1999-01-20 09:43:16 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -15,7 +15,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent.cgi,v $
-# Revision 1.10  1999-01-19 05:13:24  ivan
+# Revision 1.11  1999-01-20 09:43:16  ivan
+# comment out future UI code (but look at it, it's neat!)
+#
+# Revision 1.10  1999/01/19 05:13:24  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -56,18 +59,16 @@ use FS::agent;
 use FS::agent_type;
 
 #Begin silliness
-
-use FS::UI::CGI;
-use FS::UI::agent;
-
-$ui = new FS::UI::agent;
-$ui->browse;
-exit;
-
+#
+#use FS::UI::CGI;
+#use FS::UI::agent;
+#
+#$ui = new FS::UI::agent;
+#$ui->browse;
+#exit;
+#__END__
 #End silliness
 
-__END__
-
 $cgi = new CGI;
 
 &cgisuidsetup($cgi);
-- 
cgit v1.2.1


From 6e5eed5d49163fdb06f16c735ab43486c047011d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 25 Jan 1999 12:10:00 +0000
Subject: yet more mod_perl stuff

---
 TODO                                    |  48 +++++++++----
 htdocs/edit/agent.cgi                   |  36 ++++++----
 htdocs/edit/agent_type.cgi              |  27 +++++---
 htdocs/edit/cust_credit.cgi             |  56 +++++++++------
 htdocs/edit/cust_main.cgi               | 116 +++++++++++++++++++-------------
 htdocs/edit/cust_main_county-expand.cgi |  46 +++++++++----
 htdocs/edit/cust_main_county.cgi        |  15 ++++-
 htdocs/edit/cust_pay.cgi                |  47 ++++++++-----
 htdocs/edit/process/agent.cgi           |  16 ++---
 htdocs/edit/process/agent_type.cgi      |  22 +++---
 htdocs/edit/process/cust_credit.cgi     |  21 ++++--
 htdocs/edit/process/cust_main.cgi       |  51 +++++++-------
 12 files changed, 314 insertions(+), 187 deletions(-)

diff --git a/TODO b/TODO
index d53dab078..363c42adb 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.19 1999-01-18 23:05:00 ivan Exp $
+$Id: TODO,v 1.20 1999-01-25 12:09:48 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,18 +6,9 @@ duplication of effort.
 
 -- before 1.2b1 --
 
-Lay out the forms a bit better.
-
-view/cust_main.cgi should show country
-
-add doc on mod_perl: upgrade to current CGI.pm
-doc Apache::AuthDBI as well
+Can't use [e]idiot with mod_perl.
 
-FS::cust_pkg _require_'s FS::$svc, but this won't work with %FS::UID::callback
-loading of configuration.  (pry need same idea, but will run immediately if
-context allows).  Looks like error is masked by 'use FS::cust_svc' which in
-turn 'use's FS::{svc_acct, svc_acct_sm, svc_domain}' which is now explicit
-w/comments in source
+Lay out the forms a bit better.
 
 libwww regression test - since it will create sample data, can also use this
 for the web demo
@@ -41,11 +32,24 @@ associated with any agent types so it won't show up for other customers to buy.
 (but also... make sure they go away when the customer does! - need this? :
  one-off package edits! : need a cust_pkgs or cust_part_pkgs or something table,
  with custnum and partpkg (like type_pkgs)
+(what happens if you hit "custom pricing" but the pricing is already custom?)
 
 update site_perl/table_template* (pry out of date)
 
+update web demo
+
 -- before or after ---
 
+FS::cust_pkg _require_'s FS::$svc, but this won't work with %FS::UID::callback
+loading of configuration.  (pry need same idea, but will run immediately if
+context allows).  Looks like error is masked by 'use FS::cust_svc' which in
+turn 'use's FS::{svc_acct, svc_acct_sm, svc_domain}' which is now explicit
+w/comments in source
+
+Allow a cancelled/suspended/active status from packages to bubble up to
+the customer lists.  Put active, then suspended, then cancelled accounts.
+Similar ordering on the package listing inside a single customer.
+
 svc_domain.pm mail sending uses Date::Format which doesn't seem to pick up 
 correct timezone.
 
@@ -62,6 +66,19 @@ site_perl/svc_domain.cgi (hmm... or maybe should have a button?  or maybe svc_do
 
 -- after --
 
+bah, table/itable/*table in FS::CGI is silly.
+
+doc Apache::AuthDBI as well
+..
+Provide sample httpd.conf files.
+
+hey look: Tie::DBI!  Check that out.  Override its commit with something that
+does perl-side caching for ? a performance improvement and as an emulation
+layer to plug in f.ex mysql's atomic transactions
+..
+Record.pm uses does some non-portable DBI things.  MySQL and Pg seem fine.
+Fix it anyway unless we migrate to Tie::DBI.
+
 faq
 
 cust_bill.pm uses '==' comparison on dates because they're currently ints
@@ -366,6 +383,13 @@ transactions or atomic updates).  Or just require a RDBMS that supports
 rollback and/or atomic updates and get rid of the work-arounds?  The /rdb
 interface had this kludge on top of it but is a technical dead-end in most
 other ways, unless it can gain an SQL parser and DBD interface.
+...
+if i'm really bored, find the /rdb interface in fsold and port it to NoSQL,
+and while I'm add it add interfaces for AnyDBM_File tied hash.. hmm.  Shouldn't
+an FS::Record have something to do with a tied hash?  But we don't want
+performance to go gaga... maybe something with commit to help out here?
+...
+Ok: FS::Record gives you a tied hash, and you get methods for commit, etc.
 
 Better automated comparison of our CC records with processors (CyberCash,
 at least, has not always had 100% accuracy, though recent versions are
diff --git a/htdocs/edit/agent.cgi b/htdocs/edit/agent.cgi
index 85489079b..d0ceac38d 100755
--- a/htdocs/edit/agent.cgi
+++ b/htdocs/edit/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.5 1999-01-19 05:13:31 ivan Exp $
+# $Id: agent.cgi,v 1.6 1999-01-25 12:09:50 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -11,7 +11,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: agent.cgi,v $
-# Revision 1.5  1999-01-19 05:13:31  ivan
+# Revision 1.6  1999-01-25 12:09:50  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:31  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -27,12 +30,12 @@
 #
 
 use strict;
-use vars qw ( $cgi $agent $action $query $hashref $p $agent_type );
+use vars qw ( $cgi $agent $action $hashref $p $agent_type );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(header menubar popurl);
-use FS::Record qw(qsearch qsearchs);
+use FS::Record qw(qsearch qsearchs fields);
 use FS::agent;
 use FS::agent_type;
 
@@ -40,14 +43,18 @@ $cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-($query) = $cgi->keywords;
-if ( $query =~ /^(\d+)$/ ) { #editing
-  $agent=qsearchs('agent',{'agentnum'=>$1});
-  $action='Edit';
+if ( $cgi->param('error') ) {
+  $agent = new FS::agent ( {
+    map { $_, scalar($cgi->param($_)) } fields('agent')
+  } );
+} elsif ( $cgi->keywords ) {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $agent = qsearchs( 'agent', { 'agentnum' => $1 } );
 } else { #adding
   $agent = new FS::agent {};
-  $action='Add';
 }
+$action = $agent->agentnum ? 'Edit' : 'Add';
 $hashref = $agent->hashref;
 
 $p = popurl(2);
@@ -55,9 +62,14 @@ $p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header("$action Agent", menubar(
   'Main Menu' => $p,
   'View all agents' => $p. 'browse/agent.cgi',
-)), '<FORM ACTION="', popurl(1), 'process/agent.cgi" METHOD=POST>';
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
 
-print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$hashref->{agentnum}">!,
+print '<FORM ACTION="', popurl(1), 'process/agent.cgi" METHOD=POST>',
+      qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$hashref->{agentnum}">!,
       "Agent #", $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)";
 
 print <<END;
@@ -67,7 +79,7 @@ Agent type                <SELECT NAME="typenum" SIZE=1>
 END
 
 foreach $agent_type (qsearch('agent_type',{})) {
-  print "<OPTION";
+  print "<OPTION VALUE=". $agent_type->typenum;
   print " SELECTED"
     if $hashref->{typenum} == $agent_type->getfield('typenum');
   print ">", $agent_type->getfield('typenum'), ": ",
diff --git a/htdocs/edit/agent_type.cgi b/htdocs/edit/agent_type.cgi
index b12c4e28f..147bb6f98 100755
--- a/htdocs/edit/agent_type.cgi
+++ b/htdocs/edit/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.9 1999-01-19 05:13:32 ivan Exp $
+# $Id: agent_type.cgi,v 1.10 1999-01-25 12:09:51 ivan Exp $
 #
 # agent_type.cgi: Add/Edit agent type (output form)
 #
@@ -13,7 +13,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.9  1999-01-19 05:13:32  ivan
+# Revision 1.10  1999-01-25 12:09:51  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.9  1999/01/19 05:13:32  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -46,7 +49,7 @@ use vars qw( $cgi $agent_type $action $hashref $p $part_pkg );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
+use FS::Record qw(qsearch qsearchs fields);
 use FS::agent_type;
 use FS::CGI qw(header menubar popurl);
 use FS::agent_type;
@@ -57,24 +60,32 @@ $cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-if ( $cgi->keywords ) { #editing
+if ( $cgi->param('error') ) {
+  $agent_type = new FS::agent_type ( {
+    map { $_, scalar($cgi->param($_)) } fields('agent')
+  } );
+} elsif ( $cgi->keywords ) { #editing
   my( $query ) = $cgi->keywords;
   $query =~ /^(\d+)$/;
   $agent_type=qsearchs('agent_type',{'typenum'=>$1});
-  $action='Edit';
 } else { #adding
   $agent_type = new FS::agent_type {};
-  $action='Add';
 }
+$action = $agent_type->typenum ? 'Edit' : 'Add';
 $hashref = $agent_type->hashref;
 
 $p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header("$action Agent Type", menubar(
   'Main Menu' => "$p",
   'View all agent types' => "${p}browse/agent_type.cgi",
-)), '<FORM ACTION="', popurl(1), 'process/agent_type.cgi" METHOD=POST>';
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
 
-print qq!<INPUT TYPE="hidden" NAME="typenum" VALUE="$hashref->{typenum}">!,
+print '<FORM ACTION="', popurl(1), 'process/agent_type.cgi" METHOD=POST>',
+      qq!<INPUT TYPE="hidden" NAME="typenum" VALUE="$hashref->{typenum}">!,
       "Agent Type #", $hashref->{typenum} ? $hashref->{typenum} : "(NEW)";
 
 print <<END;
diff --git a/htdocs/edit/cust_credit.cgi b/htdocs/edit/cust_credit.cgi
index fdb821fa6..f0b17e172 100755
--- a/htdocs/edit/cust_credit.cgi
+++ b/htdocs/edit/cust_credit.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_credit.cgi,v 1.5 1999-01-19 05:13:33 ivan Exp $
+# $Id: cust_credit.cgi,v 1.6 1999-01-25 12:09:52 ivan Exp $
 #
 # Usage: cust_credit.cgi custnum [ -paybatch ]
 #        http://server.name/path/cust_credit?custnum [ -paybatch ]
@@ -25,7 +25,10 @@
 # rewrite ivan@sisd.com 98-mar-16
 #
 # $Log: cust_credit.cgi,v $
-# Revision 1.5  1999-01-19 05:13:33  ivan
+# Revision 1.6  1999-01-25 12:09:52  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:33  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -41,56 +44,65 @@
 #
 
 use strict;
-use vars qw( $cgi $query $custnum $otaker $p1 $crednum $date $amount $reason );
+use vars qw( $cgi $query $custnum $otaker $p1 $crednum $_date $amount $reason );
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
 use FS::CGI qw(header popurl);
+use FS::Record qw(fields);
+#use FS::cust_credit;
 
 $cgi = new CGI;
-
 cgisuidsetup($cgi);
 
-($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-$custnum = $1;
+if ( $cgi->param('error') ) {
+  #$cust_credit = new FS::cust_credit ( {
+  #  map { $_, scalar($cgi->param($_)) } fields('cust_credit')
+  #} );
+  $custnum = $cgi->param('custnum');
+  $amount = $cgi->param('amount');
+  #$refund = $cgi->param('refund');
+  $reason = $cgi->param('reason');
+} else {
+  ($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $custnum = $1;
+  $amount = '';
+  #$refund = 'yes';
+  $reason = '';
+}
+$_date = time;
 
 $otaker = getotaker;
 
 $p1 = popurl(1);
 
-print $cgi->header( '-expires' => 'now' ), header("Post Credit", ''), <<END;
+print $cgi->header( '-expires' => 'now' ), header("Post Credit", '');
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+print <<END;
     <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>
-    <HR><PRE>
+    <PRE>
 END
 
-#crednum
 $crednum = "";
 print qq!Credit #<B>!, $crednum ? $crednum : " <I>(NEW)</I>", qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
 
-#custnum
 print qq!\nCustomer #<B>$custnum</B><INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
 
-#paybatch
 print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
 
-#date
-$date = time;
-print qq!\nDate: <B>!, time2str("%D",$date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="$date">!;
+print qq!\nDate: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
 
-#amount
-$amount = '';
 print qq!\nAmount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
+print qq!<INPUT TYPE="hidden" NAME="credited" VALUE="">!;
 
-#refund?
-#print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="yes">Also post refund!;
+#print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
 
-#otaker (hidden)
 print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!;
 
-#reason
-$reason = '';
 print qq!\nReason <INPUT TYPE="text" NAME="reason" VALUE="$reason" SIZE=72>!;
 
 print <<END;
diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 1c2ba4cd4..03252b054 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.7 1999-01-19 05:13:34 ivan Exp $
+# $Id: cust_main.cgi,v 1.8 1999-01-25 12:09:53 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -40,7 +40,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.7  1999-01-19 05:13:34  ivan
+# Revision 1.8  1999-01-25 12:09:53  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.7  1999/01/19 05:13:34  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -62,11 +65,11 @@ use strict;
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
              $daytime $night $fax @invoicing_list $invoicing_list $payinfo
-             $payname %payby %paybychecked $refnum $otaker );
+             $payname %payby %paybychecked $refnum $otaker $r );
 use CGI::Switch;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
-use FS::Record qw(qsearch qsearchs);
+use FS::Record qw(qsearch qsearchs fields);
 use FS::CGI qw(header popurl itable table);
 use FS::cust_main;
 
@@ -75,24 +78,31 @@ cgisuidsetup($cgi);
 
 #get record
 
-if ( $cgi->keywords ) { #editing
+if ( $cgi->param('error') ) {
+  $cust_main = new FS::cust_main ( {
+    map { $_, scalar($cgi->param($_)) } fields('cust_main')
+  } );
+  $custnum = $cust_main->custnum;
+} elsif ( $cgi->keywords ) { #editing
   my( $query ) = $cgi->keywords;
   $query =~ /^(\d+)$/;
   $custnum=$1;
   $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
-  $action='Edit';
 } else {
   $custnum='';
   $cust_main = new FS::cust_main ( {} );
   $cust_main->setfield('otaker',&getotaker);
-  $action='Add';
 }
+$action = $custnum ? 'Edit' : 'Add';
 
 # top
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Customer $action", ''),
-      qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST>!,
+print $cgi->header( '-expires' => 'now' ), header("Customer $action", '');
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST>!,
       qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!,
       qq!Customer # !, ( $custnum ? $custnum : " (NEW)" ),
       
@@ -100,22 +110,50 @@ print $cgi->header( '-expires' => 'now' ), header("Customer $action", ''),
 
 # agent
 
+$r = qq!<font color="#ff0000">*</font>!;
+
 @agents = qsearch( 'agent', {} );
 $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
 if ( scalar(@agents) == 1 ) {
   print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!;
 } else {
-  print qq!<BR><BR>Agent <SELECT NAME="agentnum" SIZE="1">!;
+  print qq!<BR><BR>${r}Agent <SELECT NAME="agentnum" SIZE="1">!;
   my $agent;
   foreach $agent (sort {
     $a->agent cmp $b->agent;
   } @agents) {
-      print "<OPTION" . " SELECTED"x($agent->agentnum==$agentnum),
+      print '<OPTION VALUE="', $agent->agentnum, '"',
+      " SELECTED"x($agent->agentnum==$agentnum),
       ">", $agent->agentnum,": ", $agent->agent;
   }
   print "</SELECT>";
 }
 
+#referral
+
+$refnum = $cust_main->refnum || 0;
+if ( $custnum ) {
+  print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
+} else {
+  my(@referrals) = qsearch('part_referral',{});
+  if ( scalar(@referrals) == 1 ) {
+    $refnum ||= $referrals[0]->refnum;
+    print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
+  } else {
+    print qq!<BR>${r}Referral <SELECT NAME="refnum" SIZE="1">!;
+    print "<OPTION> ";
+    my($referral);
+    foreach $referral (sort {
+      $a->refnum <=> $b->refnum;
+    } @referrals) {
+      print "<OPTION" . " SELECTED"x($referral->refnum==$refnum),
+      ">", $referral->refnum, ": ", $referral->referral;
+    }
+    print "</SELECT>";
+  }
+}
+
+
 # contact info
 
 ($last,$first,$ss,$company,$address1,$address2,$city,$zip)=(
@@ -130,11 +168,11 @@ if ( scalar(@agents) == 1 ) {
 );
 
 print "<BR><BR>Contact information", itable("#c0c0c0"), <<END;
-<TR><TH ALIGN="right">Contact name<BR>(last, first)</TH><TD COLSPAN=3><INPUT TYPE="text" NAME="last" VALUE="$last">, <INPUT TYPE="text" NAME="first" VALUE="$first"></TD><TD ALIGN="right">SS#</TD><TD><INPUT TYPE="text" NAME="ss" VALUE="$ss" SIZE=11></TD></TR>
+<TR><TH ALIGN="right">${r}Contact name<BR>(last, first)</TH><TD COLSPAN=3><INPUT TYPE="text" NAME="last" VALUE="$last">, <INPUT TYPE="text" NAME="first" VALUE="$first"></TD><TD ALIGN="right">SS#</TD><TD><INPUT TYPE="text" NAME="ss" VALUE="$ss" SIZE=11></TD></TR>
 <TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="company" VALUE="$company" SIZE=70></TD></TR>
-<TR><TH ALIGN="right">Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=70></TH></TR>
+<TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=70></TD></TR>
 <TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=70></TD></TR>
-<TR><TH ALIGN="right">City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"><TH ALIGN="right">State/Country</TH><TD><SELECT NAME="state" SIZE="1">
+<TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="state" SIZE="1">
 END
 
 $cust_main->country('US') unless $cust_main->country; #eww
@@ -148,7 +186,7 @@ foreach ( qsearch('cust_main_county',{}) ) {
   print " (",$_->county,")" if $_->county;
   print " / ", $_->country;
 }
-print qq!</SELECT></TD><TH>Zip</TH><TD><INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10></TD></TR>!;
+print qq!</SELECT></TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10></TD></TR>!;
 
 ($daytime,$night,$fax)=(
   $cust_main->daytime,
@@ -162,7 +200,7 @@ print <<END;
 <TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12></TD></TR>
 END
 
-print "</TABLE>";
+print "</TABLE>$r designates required fields<BR>";
 
 # billing info
 
@@ -195,18 +233,18 @@ sub expselect {
 print "<BR>Billing information", itable("#c0c0c0"),
       qq!<TR><TD><INPUT TYPE="checkbox" NAME="tax" VALUE="Y"!;
 print qq! CHECKED! if $cust_main->tax eq "Y";
-print qq!>Tax Exempt!;
-print qq!</TD></TR><TR><TD><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
+print qq!>Tax Exempt</TD></TR>!;
+print qq!<TR><TD><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
 @invoicing_list = $cust_main->invoicing_list;
 print qq! CHECKED!
   if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
-print qq!> Postal mail invoice!;
+print qq!>Postal mail invoice</TD></TR>!;
 $invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
-print qq!</TD></TR><TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD>!;
-
-print "</TD></TR></TABLE>";
+print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
 
-print table("#c0c0c0"), "<TR>";
+print "<TR><TD>Billing type</TD></TR>",
+      "</TABLE>",
+      table("#c0c0c0"), "<TR>";
 
 ($payinfo, $payname)=(
   $cust_main->payinfo,
@@ -214,14 +252,14 @@ print table("#c0c0c0"), "<TR>";
 );
 
 %payby = (
-  'CARD' => qq!Credit card<BR><INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>Exp !. expselect("CARD"). qq!<BR>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>Exp !. expselect("BILL", "12-2037"). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
-  'COMP' => qq!Complimentary<BR>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>Exp !. expselect("COMP"),
+  'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>${r}Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
+  'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
 );
 %paybychecked = (
-  'CARD' => qq!Credit card<BR><INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
-  'COMP' => qq!Complimentary<BR>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>Exp !. expselect("COMP", $cust_main->paydate),
+  'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>${r}Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+  'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
 );
 for (qw(CARD BILL COMP)) {
   print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
@@ -232,26 +270,8 @@ for (qw(CARD BILL COMP)) {
   }
 }
 
-print "</TR></TABLE>";
-
-#referral
+print "</TR></TABLE>$r designates required fields for each billing type";
 
-$refnum = $cust_main->refnum || 0;
-if ( $custnum ) {
-  print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
-} else {
-  my(@referrals) = qsearch('part_referral',{});
-  print qq!<BR>Referral <SELECT NAME="refnum" SIZE="1">!;
-  print "<OPTION> ";
-  my($referral);
-  foreach $referral (sort {
-    $a->refnum <=> $b->refnum;
-  } @referrals) {
-    print "<OPTION" . " SELECTED"x($referral->refnum==$refnum),
-    ">", $referral->refnum, ": ", $referral->referral;
-  }
-  print "</SELECT>";
-}
 
 $otaker = $cust_main->otaker;
 print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!,
diff --git a/htdocs/edit/cust_main_county-expand.cgi b/htdocs/edit/cust_main_county-expand.cgi
index 65629844d..783e92826 100755
--- a/htdocs/edit/cust_main_county-expand.cgi
+++ b/htdocs/edit/cust_main_county-expand.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county-expand.cgi,v 1.5 1999-01-19 05:13:35 ivan Exp $
+# $Id: cust_main_county-expand.cgi,v 1.6 1999-01-25 12:09:54 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county-expand.cgi,v $
-# Revision 1.5  1999-01-19 05:13:35  ivan
+# Revision 1.6  1999-01-25 12:09:54  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:35  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -26,7 +29,7 @@
 #
 
 use strict;
-use vars qw( $cgi $query $taxnum $cust_main_county $p1 );
+use vars qw( $cgi $taxnum $cust_main_county $p1 $delim $expansion );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -38,10 +41,18 @@ $cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-($query) = $cgi->keywords;
-$query =~ /^(\d+)$/
-  or die "Illegal taxnum!";
-$taxnum = $1;
+if ( $cgi->param('error') ) {
+  $taxnum = $cgi->param('taxnum');
+  $delim = $cgi->param('delim');
+  $expansion = $cgi->param('expansion');
+} else {
+  my ($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/
+    or die "Illegal taxnum!";
+  $taxnum = $1;
+  $delim = 'n';
+  $expansion = '';
+}
 
 $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum});
 die "Can't expand entry!" if $cust_main_county->getfield('county');
@@ -49,15 +60,26 @@ die "Can't expand entry!" if $cust_main_county->getfield('county');
 $p1 = popurl(1);
 print $cgi->header( '-expires' => 'now' ), header("Tax Rate (expand)", menubar(
   'Main Menu' => popurl(2),
-)), <<END;
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print <<END;
     <FORM ACTION="${p1}process/cust_main_county-expand.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="taxnum" VALUE="$taxnum">
       Separate by
-      <INPUT TYPE="radio" NAME="delim" VALUE="n" CHECKED>line
-      (rumor has it broken on some browsers) or
-      <INPUT TYPE="radio" NAME="delim" VALUE="s">whitespace.
+END
+print '<INPUT TYPE="radio" NAME="delim" VALUE="n"';
+print ' CHECKED' if $delim eq 'n';
+print '>line (rumor has it broken on some browsers) or',
+      '<INPUT TYPE="radio" NAME="delim" VALUE="s"';
+print ' CHECKED' if $delim eq 's';
+print '>whitespace.';
+print <<END;
       <BR><INPUT TYPE="submit" VALUE="Submit">
-      <BR><TEXTAREA NAME="expansion" ROWS=100></TEXTAREA>
+      <BR><TEXTAREA NAME="expansion" ROWS=100>$expansion</TEXTAREA>
     </FORM>
     </CENTER>
   </BODY>
diff --git a/htdocs/edit/cust_main_county.cgi b/htdocs/edit/cust_main_county.cgi
index 05c072786..3c2efec5b 100755
--- a/htdocs/edit/cust_main_county.cgi
+++ b/htdocs/edit/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.5 1999-01-19 05:13:36 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.6 1999-01-25 12:09:55 ivan Exp $
 #
 # ivan@sisd.com 97-dec-13-16
 #
@@ -11,7 +11,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 # 
 # $Log: cust_main_county.cgi,v $
-# Revision 1.5  1999-01-19 05:13:36  ivan
+# Revision 1.6  1999-01-25 12:09:55  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:36  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -41,7 +44,13 @@ $cgi = new CGI;
 
 print $cgi->header( '-expires' => 'now' ), header("Edit tax rates", menubar(
   'Main Menu' => popurl(2),
-)), qq!<FORM ACTION="!, popurl(1),
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="!, popurl(1),
     qq!process/cust_main_county.cgi" METHOD=POST>!, table, <<END;
       <TR>
         <TH><FONT SIZE=-1>Country</FONT></TH>
diff --git a/htdocs/edit/cust_pay.cgi b/htdocs/edit/cust_pay.cgi
index 4cd95de55..27015171f 100755
--- a/htdocs/edit/cust_pay.cgi
+++ b/htdocs/edit/cust_pay.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pay.cgi,v 1.4 1999-01-19 05:13:37 ivan Exp $
+# $Id: cust_pay.cgi,v 1.5 1999-01-25 12:09:56 ivan Exp $
 #
 # Usage: cust_pay.cgi invnum
 #        http://server.name/path/cust_pay.cgi?invnum
@@ -14,7 +14,10 @@
 # rewrite ivan@sisd.com 98-mar-16
 #
 # $Log: cust_pay.cgi,v $
-# Revision 1.4  1999-01-19 05:13:37  ivan
+# Revision 1.5  1999-01-25 12:09:56  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.4  1999/01/19 05:13:37  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -27,7 +30,7 @@
 #
 
 use strict;
-use vars qw( $cgi $query $invnum $p1 $date $payby $payinfo );
+use vars qw( $cgi $invnum $p1 $_date $payby $payinfo $paid );
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
@@ -37,32 +40,42 @@ use FS::CGI qw(header popurl);
 $cgi = new CGI;
 cgisuidsetup($cgi);
 
-($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-$invnum = $1;
+if ( $cgi->param('error') ) {
+  $invnum = $cgi->param('invnum');
+  $paid = $cgi->param('paid');
+  $payby = $cgi->param('payby');
+  $payinfo = $cgi->param('payinfo');
+} else {
+  my ($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $invnum = $1;
+  $paid = '';
+  $payby = "BILL";
+  $payinfo = "";
+}
+$_date = time;
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Enter payment", ''), <<END;
+print $cgi->header( '-expires' => 'now' ), header("Enter payment", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print <<END;
     <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
     <HR><PRE>
 END
 
-#invnum
 print qq!Invoice #<B>$invnum</B><INPUT TYPE="hidden" NAME="invnum" VALUE="$invnum">!;
 
-#date
-$date = time;
-print qq!<BR>Date: <B>!, time2str("%D",$date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="$date">!;
+print qq!<BR>Date: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
 
-#paid
-print qq!<BR>Amount \$<INPUT TYPE="text" NAME="paid" VALUE="" SIZE=8 MAXLENGTH=8>!;
+print qq!<BR>Amount \$<INPUT TYPE="text" NAME="paid" VALUE="$paid" SIZE=8 MAXLENGTH=8>!;
 
-#payby
-$payby = "BILL";
 print qq!<BR>Payby: <B>$payby</B><INPUT TYPE="hidden" NAME="payby" VALUE="$payby">!;
 
 #payinfo (check # now as payby="BILL" hardcoded.. what to do later?)
-$payinfo = "";
 print qq!<BR>Check #<INPUT TYPE="text" NAME="payinfo" VALUE="$payinfo">!;
 
 #paybatch
@@ -71,7 +84,7 @@ print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
 print <<END;
 </PRE>
 <BR>
-<CENTER><INPUT TYPE="submit" VALUE="Post"></CENTER>
+<INPUT TYPE="submit" VALUE="Post payment">
 END
 
 print <<END;
diff --git a/htdocs/edit/process/agent.cgi b/htdocs/edit/process/agent.cgi
index 1dab7601b..c1b397aac 100755
--- a/htdocs/edit/process/agent.cgi
+++ b/htdocs/edit/process/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.6 1999-01-19 05:13:47 ivan Exp $
+# $Id: agent.cgi,v 1.7 1999-01-25 12:09:57 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent.cgi,v $
-# Revision 1.6  1999-01-19 05:13:47  ivan
+# Revision 1.7  1999-01-25 12:09:57  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.6  1999/01/19 05:13:47  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -34,7 +37,7 @@ use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs fields);
 use FS::agent;
-use FS::CGI qw(idiot popurl);
+use FS::CGI qw(popurl);
 
 $cgi = new CGI;
 
@@ -44,10 +47,6 @@ $agentnum = $cgi->param('agentnum');
 
 $old = qsearchs('agent',{'agentnum'=>$agentnum}) if $agentnum;
 
-#unmunge typenum
-$cgi->param('typenum') =~ /^(\d+)(:.*)?$/;
-$cgi->param('typenum',$1);
-
 $new = new FS::agent ( {
   map {
     $_, scalar($cgi->param($_));
@@ -62,7 +61,8 @@ if ( $agentnum ) {
 }
 
 if ( $error ) {
-  &idiot($error);
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "agent.cgi?". $cgi->query_string );
 } else { 
   print $cgi->redirect(popurl(3). "browse/agent.cgi");
 }
diff --git a/htdocs/edit/process/agent_type.cgi b/htdocs/edit/process/agent_type.cgi
index e13817121..99c54ab3b 100755
--- a/htdocs/edit/process/agent_type.cgi
+++ b/htdocs/edit/process/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.6 1999-01-19 05:13:48 ivan Exp $
+# $Id: agent_type.cgi,v 1.7 1999-01-25 12:09:58 ivan Exp $
 #
 # ivan@sisd.com 97-dec-11
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.6  1999-01-19 05:13:48  ivan
+# Revision 1.7  1999-01-25 12:09:58  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.6  1999/01/19 05:13:48  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -31,7 +34,7 @@ use strict;
 use vars qw ( $cgi $typenum $old $new $error $part_pkg );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
-use FS::CGI qw(idiot popurl);
+use FS::CGI qw( popurl);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs fields);
 use FS::agent_type;
@@ -58,7 +61,8 @@ if ( $typenum ) {
 }
 
 if ( $error ) {
-  idiot($error);
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "agent_type.cgi?". $cgi->query_string );
   exit;
 }
 
@@ -72,10 +76,7 @@ foreach $part_pkg (qsearch('part_pkg',{})) {
   if ( $type_pkgs && ! $cgi->param("pkgpart$pkgpart") ) {
     my($d_type_pkgs)=$type_pkgs; #need to save $type_pkgs for below.
     $error=$d_type_pkgs->delete;
-    if ( $error ) {
-      idiot($error);
-      exit;
-    }
+    die $error if $error;
 
   } elsif ( $cgi->param("pkgpart$pkgpart")
             && ! $type_pkgs
@@ -86,10 +87,7 @@ foreach $part_pkg (qsearch('part_pkg',{})) {
       'pkgpart' => $pkgpart,
     });
     $error= $type_pkgs->insert;
-    if ( $error ) {
-      idiot($error);
-      exit;
-    }
+    die $error if $error;
   }
 
 }
diff --git a/htdocs/edit/process/cust_credit.cgi b/htdocs/edit/process/cust_credit.cgi
index 8f4515e48..f95688197 100755
--- a/htdocs/edit/process/cust_credit.cgi
+++ b/htdocs/edit/process/cust_credit.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_credit.cgi,v 1.4 1999-01-19 05:13:49 ivan Exp $
+# $Id: cust_credit.cgi,v 1.5 1999-01-25 12:09:59 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_credit.cgi
@@ -22,7 +22,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_credit.cgi,v $
-# Revision 1.4  1999-01-19 05:13:49  ivan
+# Revision 1.5  1999-01-25 12:09:59  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.4  1999/01/19 05:13:49  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -38,7 +41,7 @@ use vars qw( $cgi $custnum $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(popurl eidiot);
+use FS::CGI qw(popurl);
 use FS::Record qw(fields);
 use FS::cust_credit;
 
@@ -54,12 +57,16 @@ $new = new FS::cust_credit ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(custnum _date amount otaker reason)
-  } fields('cust_credit');
+  } fields('cust_credit')
 } );
 
 $error=$new->insert;
-&eidiot($error) if $error;
 
-#no errors, no refund, so view our credit.
-print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#history");
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "cust_credit.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#history");
+}
+
 
diff --git a/htdocs/edit/process/cust_main.cgi b/htdocs/edit/process/cust_main.cgi
index 850f2add4..3262c42e2 100755
--- a/htdocs/edit/process/cust_main.cgi
+++ b/htdocs/edit/process/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.5 1999-01-19 05:13:50 ivan Exp $
+# $Id: cust_main.cgi,v 1.6 1999-01-25 12:10:00 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -22,7 +22,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.5  1999-01-19 05:13:50  ivan
+# Revision 1.6  1999-01-25 12:10:00  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:50  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -37,11 +40,11 @@
 #
 
 use strict;
-use vars qw( $cgi $payby @invoicing_list $new $custnum );
+use vars qw( $cgi $payby @invoicing_list $new $custnum $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(eidiot popurl);
+use FS::CGI qw( popurl );
 use FS::Record qw(qsearchs fields);
 use FS::cust_main;
 
@@ -50,8 +53,6 @@ $cgi = new CGI;
 
 #unmunge stuff
 
-$cgi->param('agentnum', (split(/:/, ($cgi->param('agentnum'))[0] ))[0] );
-
 $cgi->param('tax','') unless defined($cgi->param('tax'));
 
 $cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
@@ -61,11 +62,12 @@ $cgi->param('state', $1);
 $cgi->param('county', $3 || '');
 $cgi->param('country', $4);
 
-$payby = $cgi->param('payby');
-$cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
-$cgi->param('paydate',
+if ( $payby = $cgi->param('payby') ) {
+  $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
+  $cgi->param('paydate',
   $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
-$cgi->param('payname', $cgi->param( $payby. '_payname' ) );
+  $cgi->param('payname', $cgi->param( $payby. '_payname' ) );
+}
 
 $cgi->param('otaker', &getotaker );
 
@@ -83,25 +85,22 @@ $new = new FS::cust_main ( {
   } fields('cust_main')
 } );
 
+$error = $new->check_invoicing_list( \@invoicing_list );
+
 #perhaps the invocing_list magic should move to cust_main.pm?
 if ( $new->custnum eq '' ) {
-  my $error;
-  $error = $new->check_invoicing_list( \@invoicing_list );
-  &ediot($error) if $error;
-  $error = $new->insert;
-  &eidiot($error) if $error;
-  $new->invoicing_list( \@invoicing_list );
+  $error ||= $new->insert;
 } else { #create old record object
-  my $error;
   my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } ); 
-  &eidiot("Old record not found!") unless $old;
-  $error = $new->check_invoicing_list( \@invoicing_list );
-  &eidiot($error) if $error;
-  $error = $new->replace($old);
-  &eidiot($error) if $error;
-  $new->invoicing_list( \@invoicing_list );
+  $error ||= "Old record not found!" unless $old;
+  $error ||= $new->replace($old);
 }
 
-$custnum = $new->custnum;
-print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#cust_main");
-
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "cust_main.cgi?". $cgi->query_string );
+} else { 
+  $new->invoicing_list( \@invoicing_list );
+  $custnum = $new->custnum;
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#cust_main");
+} 
-- 
cgit v1.2.1


From cd6989b0380bb289bffac0b947a3bfa6eb8c773e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 25 Jan 1999 12:19:11 +0000
Subject: yet more mod_perl stuff

---
 htdocs/edit/process/cust_main_county-expand.cgi | 16 +++++++++++-----
 htdocs/edit/process/cust_main_county.cgi        | 15 +++++++++++----
 htdocs/edit/process/cust_pay.cgi                | 17 +++++++++++------
 htdocs/edit/process/cust_pkg.cgi                | 10 +++++++---
 htdocs/search/cust_main.cgi                     | 12 ++++++++----
 5 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/htdocs/edit/process/cust_main_county-expand.cgi b/htdocs/edit/process/cust_main_county-expand.cgi
index 94aa8547e..7e618c7b8 100755
--- a/htdocs/edit/process/cust_main_county-expand.cgi
+++ b/htdocs/edit/process/cust_main_county-expand.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county-expand.cgi,v 1.5 1999-01-19 05:13:51 ivan Exp $
+# $Id: cust_main_county-expand.cgi,v 1.6 1999-01-25 12:19:07 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -15,7 +15,10 @@
 # ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county-expand.cgi,v $
-# Revision 1.5  1999-01-19 05:13:51  ivan
+# Revision 1.6  1999-01-25 12:19:07  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:51  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -35,12 +38,11 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup datasrc);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(eidiot popurl);
+use FS::CGI qw(popurl);
 use FS::cust_main_county;
 use FS::cust_main;
 
 $cgi = new CGI;
-
 &cgisuidsetup($cgi);
 
 $cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
@@ -57,7 +59,11 @@ if ( $cgi->param('delim') eq 'n' ) {
 }
 
 @expansion=map {
-  /^\s*([\w\- ]+)\s*$/ or eidiot("Illegal expansion");
+  unless ( /^\s*([\w\- ]+)\s*$/ ) {
+    $cgi->param('error', "Illegal item in expansion");
+    print $cgi->redirect(popurl(2). "cust_main_county-expand.cgi?". $cgi->query_string );
+    exit;
+  }
   $1;
 } @expansion;
 
diff --git a/htdocs/edit/process/cust_main_county.cgi b/htdocs/edit/process/cust_main_county.cgi
index 3b0cdebe9..0fc1708c5 100755
--- a/htdocs/edit/process/cust_main_county.cgi
+++ b/htdocs/edit/process/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.5 1999-01-19 05:13:52 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.6 1999-01-25 12:19:08 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county.cgi,v $
-# Revision 1.5  1999-01-19 05:13:52  ivan
+# Revision 1.6  1999-01-25 12:19:08  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:52  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -29,7 +32,7 @@ use vars qw( $cgi );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(eidiot);
+use FS::CGI qw(popurl);
 use FS::Record qw(qsearch qsearchs);
 use FS::cust_main_county;
 
@@ -46,7 +49,11 @@ foreach ( $cgi->param ) {
   $hash{tax}=$cgi->param("tax$taxnum");
   my($new)=new FS::cust_main_county \%hash;
   my($error)=$new->replace($old);
-  eidiot($error) if $error;
+  if ( $error ) {
+    $cgi->param('error', $error);
+    print $cgi->redirect(popurl(2). "cust_main_county.cgi?". $cgi->query_string );
+    exit;
+  }
 }
 
 print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi");
diff --git a/htdocs/edit/process/cust_pay.cgi b/htdocs/edit/process/cust_pay.cgi
index 21431f48d..0bd9acab4 100755
--- a/htdocs/edit/process/cust_pay.cgi
+++ b/htdocs/edit/process/cust_pay.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pay.cgi,v 1.5 1999-01-19 05:13:53 ivan Exp $
+# $Id: cust_pay.cgi,v 1.6 1999-01-25 12:19:09 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_pay.cgi
@@ -15,7 +15,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_pay.cgi,v $
-# Revision 1.5  1999-01-19 05:13:53  ivan
+# Revision 1.6  1999-01-25 12:19:09  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:53  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -34,7 +37,7 @@ use vars qw( $cgi $invnum $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(idiot popurl);
+use FS::CGI qw(popurl);
 use FS::Record qw(fields);
 use FS::cust_pay;
 
@@ -53,9 +56,11 @@ $new = new FS::cust_pay ( {
 
 $error=$new->insert;
 
-if ($error) { #error!
-  idiot($error);
-} else { #no errors!
+if ($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). 'cust_pay.cgi?'. $cgi->query_string );
+  exit;
+} else {
   print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$invnum");
 }
 
diff --git a/htdocs/edit/process/cust_pkg.cgi b/htdocs/edit/process/cust_pkg.cgi
index e8493b2de..639b2f140 100755
--- a/htdocs/edit/process/cust_pkg.cgi
+++ b/htdocs/edit/process/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.3 1999-01-19 05:13:54 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.4 1999-01-25 12:19:10 ivan Exp $
 #
 # this is for changing packages around, not for editing things within the
 # package
@@ -21,7 +21,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.3  1999-01-19 05:13:54  ivan
+# Revision 1.4  1999-01-25 12:19:10  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.3  1999/01/19 05:13:54  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -60,7 +63,8 @@ foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
 $error = FS::cust_pkg::order($custnum,\@pkgparts,\@remove_pkgnums);
 
 if ($error) {
-  idiot($error);
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "cust_pkg.cgi?". $cgi->query_string );
 } else {
   print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#cust_pkg");
 }
diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index a50cee88f..55139e9a8 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.6 1999-01-19 05:14:12 ivan Exp $
+# $Id: cust_main.cgi,v 1.7 1999-01-25 12:19:11 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -19,7 +19,10 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.6  1999-01-19 05:14:12  ivan
+# Revision 1.7  1999-01-25 12:19:11  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.6  1999/01/19 05:14:12  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -73,7 +76,7 @@ if ( $cgi->keywords ) {
   &companysearch if ( $cgi->param('company_on') && $cgi->param('company_text') );
 }
 
-%ncancelled_pkgs = map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
+#%ncancelled_pkgs = map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
 %all_pkgs = map { $_->custnum => [ $_->all_pkgs ] } @cust_main;
 
 if ( scalar(@cust_main) == 1 ) {
@@ -129,12 +132,13 @@ END
     foreach ( @{$all_pkgs{$custnum}} ) {
       my($pkgnum) = ($_->pkgnum);
       my($pkg) = $_->part_pkg->pkg;
+      my $comment = $_->part_pkg->comment;
       my($pkgview) = popurl(2). "/view/cust_pkg.cgi?$pkgnum";
       #my(@cust_svc) = shift @lol_cust_svc;
       my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
       my($rowspan) = scalar(@cust_svc) || 1;
 
-      print $n1, qq!<TD ROWSPAN=$rowspan><A HREF="$pkgview"><FONT SIZE=-1>$pkg</FONT></A></TD>!;
+      print $n1, qq!<TD ROWSPAN=$rowspan><A HREF="$pkgview"><FONT SIZE=-1>$pkg - $comment</FONT></A></TD>!;
       my($n2)='';
       foreach my $cust_svc ( @cust_svc ) {
          my($label, $value, $svcdb) = $cust_svc->label;
-- 
cgit v1.2.1


From 963a290ad2d9a89b45b66ac9d9ccdd612a756f11 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 25 Jan 1999 12:26:17 +0000
Subject: yet more mod_perl stuff

---
 htdocs/view/cust_bill.cgi      |   9 +-
 htdocs/view/cust_main.cgi      | 330 ++++++++++++++++++++++-------------------
 site_perl/CGI.pm               |  40 ++++-
 site_perl/Record.pm            |  13 +-
 site_perl/cust_bill.pm         | 310 ++++++++++++++++++--------------------
 site_perl/cust_credit.pm       |  14 +-
 site_perl/cust_main.pm         |  18 ++-
 site_perl/cust_main_invoice.pm |  24 ++-
 site_perl/cust_pay.pm          |   8 +-
 site_perl/cust_pkg.pm          |  31 ++--
 site_perl/cust_refund.pm       |   8 +-
 site_perl/svc_Common.pm        |   9 +-
 site_perl/svc_acct.pm          |  10 +-
 site_perl/svc_acct_sm.pm       |   3 +-
 site_perl/svc_domain.pm        |   8 +-
 15 files changed, 472 insertions(+), 363 deletions(-)

diff --git a/htdocs/view/cust_bill.cgi b/htdocs/view/cust_bill.cgi
index 44e3a4a1b..1989726a3 100755
--- a/htdocs/view/cust_bill.cgi
+++ b/htdocs/view/cust_bill.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_bill.cgi,v 1.6 1999-01-19 05:14:18 ivan Exp $
+# $Id: cust_bill.cgi,v 1.7 1999-01-25 12:26:03 ivan Exp $
 #
 # Note: Should be run setuid freeside as user nobody.
 #
@@ -25,7 +25,10 @@
 # also print 'printed' field ivan@sisd.com 98-jul-10
 #
 # $Log: cust_bill.cgi,v $
-# Revision 1.6  1999-01-19 05:14:18  ivan
+# Revision 1.7  1999-01-25 12:26:03  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.6  1999/01/19 05:14:18  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -75,7 +78,7 @@ print $cgi->header( '-expires' => 'now' ), header('Invoice View', menubar(
       <A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) against this invoice</A>
       <BR><A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>
       <BR><BR>(Printed $printed times)
-    <FONT SIZE=-1><PRE>
+    <PRE>
 END
 
 print $cust_bill->print_text;
diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index 7c5f4bead..2119b3e0c 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.10 1999-01-19 05:14:19 ivan Exp $
+# $Id: cust_main.cgi,v 1.11 1999-01-25 12:26:04 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -33,7 +33,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.10  1999-01-19 05:14:19  ivan
+# Revision 1.11  1999-01-25 12:26:04  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.10  1999/01/19 05:14:19  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -66,13 +69,13 @@
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
               @packages $package @history @bills $bill @credits $credit
-              $balance $item ); 
+              $balance $item @agents @referrals @invoicing_list $n1 ); 
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use Date::Format;
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs qsearch);
-use FS::CGI qw(header menubar popurl table);
+use FS::CGI qw(header menubar popurl table itable ntable);
 use FS::cust_credit;
 use FS::cust_pay;
 use FS::cust_bill;
@@ -88,9 +91,7 @@ $cgi = new CGI;
 
 print $cgi->header( '-expires' => 'now' ), header("Customer View", menubar(
   'Main Menu' => popurl(2)
-)),<<END;
-    <BASEFONT SIZE=3>
-END
+));
 
 die "No customer specified (bad URL)!" unless $cgi->keywords;
 ($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
@@ -100,120 +101,133 @@ $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
 die "Customer not found!" unless $cust_main;
 $hashref = $cust_main->hashref;
 
-#custnum
-print "<FONT SIZE=+1><CENTER>Customer #<B>$custnum</B></CENTER></FONT>",
-      qq!<CENTER><A HREF="#cust_main">Customer Information</A> | !,
-      qq!<A HREF="#cust_comments">Comments</A> | !,
-      qq!<A HREF="#cust_pkg">Packages</A> | !,
-      qq!<A HREF="#history">Payment History</A> </CENTER>!;
+print itable(), '<TR><TD><A NAME="cust_main"></A>';
 
-#bill now linke
-print qq!<HR><CENTER><A HREF="!, popurl(2), qq!/misc/bill.cgi?$custnum">!,
-      qq!Bill this customer now</A></CENTER>!;
+print qq!<A HREF="!, popurl(2), 
+      qq!edit/cust_main.cgi?$custnum">Edit this customer</A>!,
+      ntable("#c0c0c0"), "<TR><TD>", ntable("#c0c0c0",2),
+      '<TR><TD ALIGN="right">Customer number</TD><TD BGCOLOR="#ffffff">',
+      $custnum, '</TD></TR>',
+;
 
-#formatting
-print qq!<HR><A NAME="cust_main"><CENTER><FONT SIZE=+1>Customer Information!,
-      qq!</FONT>!,
-      qq!<BR><A HREF="!, popurl(2), qq!edit/cust_main.cgi?$custnum!,
-      qq!">Edit this information</A></CENTER><FONT SIZE=-1>!;
-
-#agentnum
-$agent = qsearchs('agent',{
-  'agentnum' => $cust_main->getfield('agentnum')
-} );
-die "Agent not found!" unless $agent;
-print "<BR>Agent #<B>" , $agent->getfield('agentnum') , ": " ,
-                         $agent->getfield('agent') , "</B>";
-
-#refnum
-$referral = qsearchs('part_referral',{'refnum' => $cust_main->refnum});
-die "Referral not found!" unless $referral;
-print "<BR>Referral #<B>", $referral->refnum, ": ",
-      $referral->referral, "<\B>"; 
-
-#last, first
-print "<P><B>", $hashref->{'last'}, ", ", $hashref->{first}, "</B>";
-
-#ss
-print " (SS# <B>", $hashref->{ss}, "</B>)" if $hashref->{ss};
-
-#company
-print "<BR><B>", $hashref->{company}, "</B>" if $hashref->{company};
-
-#address1
-print "<BR><B>", $hashref->{address1}, "</B>";
-
-#address2
-print "<BR><B>", $hashref->{address2}, "</B>" if $hashref->{address2};
-
-#city
-print "<BR><B>", $hashref->{city}, "</B>";
-
-#county
-print " (<B>", $hashref->{county}, "</B> county)" if $hashref->{county};
-
-#state
-print ",<B>", $hashref->{state}, "</B>";
-
-#zip
-print "  <B>", $hashref->{zip}, "</B>";
-
-#country
-print "<BR><B>", $hashref->{country}, "</B>"
-  unless $hashref->{country} eq "US";
-
-#daytime
-print "<P><B>", $hashref->{daytime}, "</B>" if $hashref->{daytime};
-print " (Day)" if $hashref->{daytime} && $hashref->{night};
-
-#night
-print "<BR><B>", $hashref->{night}, "</B>" if $hashref->{night};
-print " (Night)" if $hashref->{daytime} && $hashref->{night};
-
-#fax
-print "<BR><B>", $hashref->{fax}, "</B> (Fax)" if $hashref->{fax};
-
-#payby/payinfo/paydate/payname
-if ($hashref->{payby} eq "CARD") {
-  print "<P>Card #<B>", $hashref->{payinfo}, "</B> Exp. <B>",
-    $hashref->{paydate}, "</B>";
-  print " (<B>", $hashref->{payname}, "</B>)" if $hashref->{payname};
-} elsif ($hashref->{payby} eq "BILL") {
-  print "<P>Bill";
-  print " on P.O. #<B>", $hashref->{payinfo}, "</B>"
-    if $hashref->{payinfo};
-  print " until <B>", $hashref->{paydate}, "</B>"
-    if $hashref->{paydate};
-  print " to <B>", $hashref->{payname}, "</B> at above address"
-    if $hashref->{payname};
-} elsif ($hashref->{payby} eq "COMP") {
-  print "<P>Access complimentary";
-  print " courtesy of <B>", $hashref->{payinfo}, "</B>"
-    if $hashref->{payinfo};
-  print " until <B>", $hashref->{paydate}, "</B>"
-    if $hashref->{paydate};
-} else {
-  print "Unknown payment type ", $hashref->{payby}, "!";
+@agents = qsearch( 'agent', {} );
+unless ( scalar(@agents) == 1 ) {
+  $agent = qsearchs('agent',{
+    'agentnum' => $cust_main->agentnum
+  } );
+  print '<TR><TD ALIGN="right">Agent</TD><TD BGCOLOR="#ffffff">',
+        $agent->agentnum, ": ", $agent->agent, '</TD></TR>';
+}
+@referrals = qsearch( 'part_referral', {} );
+unless ( scalar(@referrals) == 1 ) {
+  my $referral = qsearchs('part_referral', {
+    'refnum' => $cust_main->refnum
+  } );
+  print '<TR><TD ALIGN="right">Referral</TD><TD BGCOLOR="#ffffff">',
+        $referral->refnum, ": ", $referral->referral, '</TD></TR>';
+}
+print '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
+  $cust_main->otaker, '</TD></TR>';
+
+print '</TABLE></TD></TR></TABLE>';
+
+print '</TD><TD ROWSPAN=2>';
+
+print "Contact information", ntable("#c0c0c0"), "<TR><TD>",
+      ntable("#c0c0c0",2),
+  '<TR><TD ALIGN="right">Contact name<BR>(last, first)</TD>',
+    '<TD COLSPAN=3 BGCOLOR="#ffffff">',
+    $cust_main->last, ', ', $cust_main->first,
+    '</TD><TD ALIGN="right">SS#</TD><TD BGCOLOR="#ffffff">',
+    $cust_main->ss || '&nbsp', '</TD></TR>',
+  '<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+    $cust_main->company,
+    '</TD></TR>',
+  '<TR><TD ALIGN="right">Address</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+    $cust_main->address1,
+    '</TD></TR>',
+;
+print '<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+      $cust_main->address2, '</TD></TR>'
+  if $cust_main->address2;
+print '<TR><TD ALIGN="right">City</TD><TD BGCOLOR="#ffffff">',
+        $cust_main->city,
+        '</TD><TD ALIGN="right">State</TD><TD BGCOLOR="#ffffff">',
+        $cust_main->state,
+        '</TD><TD ALIGN="right">Zip</TD><TD BGCOLOR="#ffffff">',
+        $cust_main->zip, '</TD></TR>',
+      '<TR><TD ALIGN="right">Country</TD><TD BGCOLOR="#ffffff">',
+        $cust_main->country,
+        '</TD></TR>',
+;
+print '<TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+        $cust_main->daytime || '&nbsp', '</TD></TR>',
+      '<TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+        $cust_main->night || '&nbsp', '</TD></TR>',
+      '<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+        $cust_main->fax || '&nbsp', '</TD></TR>',
+      '</TABLE>', "</TD></TR></TABLE>"
+;
+
+print '</TD></TR><TR><TD>';
+
+@invoicing_list = $cust_main->invoicing_list;
+print "Billing information (",
+      qq!<A HREF="!, popurl(2), qq!/misc/bill.cgi?$custnum">!, "Bill now</A>)",
+      ntable("#c0c0c0"), "<TR><TD>", ntable("#c0c0c0",2),
+      '<TR><TD ALIGN="right">Tax exempt</TD><TD BGCOLOR="#ffffff">',
+      $cust_main->tax ? 'yes' : 'no',
+      '</TD></TR>',
+      '<TR><TD ALIGN="right">Postal invoices</TD><TD BGCOLOR="#ffffff">',
+      ( grep { $_ eq 'POST' } @invoicing_list ) ? 'yes' : 'no',
+      '</TD></TR>',
+      '<TR><TD ALIGN="right">Email invoices</TD><TD BGCOLOR="#ffffff">',
+      join(', ', grep { $_ ne 'POST' } @invoicing_list ),
+      '</TD></TR>',
+      '<TR><TD ALIGN="right">Billing type</TD><TD BGCOLOR="#ffffff">',
+;
+
+if ( $cust_main->payby eq 'CARD' ) {
+  print 'Credit card</TD></TR>',
+        '<TR><TD ALIGN="right">Card number</TD><TD BGCOLOR="#ffffff">',
+        $cust_main->payinfo, '</TD></TR>',
+        '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
+        $cust_main->paydate, '</TD></TR>',
+        '<TR><TD ALIGN="right">Name on card</TD><TD BGCOLOR="#ffffff">',
+        $cust_main->payname, '</TD></TR>'
+  ;
+} elsif ( $cust_main->payby eq 'BILL' ) {
+  print 'Billing</TD></TR>';
+  print '<TR><TD ALIGN="right">P.O. </TD><TD BGCOLOR="#ffffff">',
+        $cust_main->payinfo, '</TD></TR>',
+    if $cust_main->payinfo;
+  print '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
+        $cust_main->paydate, '</TD></TR>',
+        '<TR><TD ALIGN="right">Attention</TD><TD BGCOLOR="#ffffff">',
+        $cust_main->payname, '</TD></TR>',
+  ;
+} elsif ( $cust_main->payby eq 'COMP' ) {
+  print 'Complimentary</TD></TR>',
+        '<TR><TD ALIGN="right">Authorized by</TD><TD BGCOLOR="#ffffff">',
+        $cust_main->payinfo, '</TD></TR>',
+        '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
+        $cust_main->paydate, '</TD></TR>',
+  ;
 }
 
-#tax
-print "<BR>(Tax exempt)" if $hashref->{tax};
-
-#otaker
-print "<P>Order taken by <B>", $hashref->{otaker}, "</B>";
+print "</TABLE></TD></TR></TABLE></TD></TR></TABLE>";
 
-#formatting	
-print qq!<HR><FONT SIZE=+1><A NAME="cust_pkg"><CENTER>Packages</A></FONT>!,
-      qq!<BR>Click on package number to view/edit package.!,
-      qq!<BR><A HREF="!, popurl(2), qq!/edit/cust_pkg.cgi?$custnum">Add/Edit packages</A>!,
-      qq!</CENTER><BR>!;
+print qq!<BR><BR><A NAME="cust_pkg">Packages</A> !,
+#      qq!<BR>Click on package number to view/edit package.!,
+      qq!( <A HREF="!, popurl(2), qq!/edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> )!,
+;
 
 #display packages
 
 #formatting
-print qq!<CENTER>!, table, "\n",
-      qq!<TR><TH ROWSPAN=2>#</TH><TH ROWSPAN=2>Package</TH><TH COLSPAN=5>!,
-      qq!Dates</TH></TR>\n!,
+print qq!!, table, "\n",
+      qq!<TR><TH COLSPAN=2 ROWSPAN=2>Package</TH><TH COLSPAN=5>!,
+      qq!Dates</TH><TH COLSPAN=2 ROWSPAN=2>Services</TH></TR>\n!,
       qq!<TR><TH><FONT SIZE=-1>Setup</FONT></TH><TH>!,
       qq!<FONT SIZE=-1>Next bill</FONT>!,
       qq!</TH><TH><FONT SIZE=-1>Susp.</FONT></TH><TH><FONT SIZE=-1>Expire!,
@@ -222,55 +236,68 @@ print qq!<CENTER>!, table, "\n",
       qq!</TR>\n!;
 
 #get package info
-@packages = qsearch('cust_pkg',{'custnum'=>$custnum});
+@packages = $cust_main->all_pkgs;
+#@packages = $cust_main->ncancelled_pkgs;
+
+$n1 = '';
 foreach $package (@packages) {
-  my($pref)=$package->hashref;
-  my($part_pkg)=qsearchs('part_pkg',{
-    'pkgpart' => $pref->{pkgpart}
-  } );
-  print qq!<TR><TD><FONT SIZE=-1><A HREF="!, popurl(2), qq!view/cust_pkg.cgi?!,
-        $pref->{pkgnum}, qq!">!, 
-        $pref->{pkgnum}, qq!</A></FONT></TD>!,
-        "<TD><FONT SIZE=-1>", $part_pkg->getfield('pkg'), " - ",
-        $part_pkg->getfield('comment'), 
-          qq!<FORM ACTION="!, popurl(2), qq!edit/part_pkg.cgi" METHOD=POST>!,
-          qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $part_pkg->pkgpart, qq!">!,
-          qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $package->pkgnum, qq!">!,
-          qq!<INPUT TYPE="submit" VALUE="Customize Pricing">!,
-          "</FORM></FONT></TD>",
-        "<TD><FONT SIZE=-1>", 
-        $pref->{setup} ? time2str("%D",$pref->{setup} ) : "" ,
-        "</FONT></TD>",
-        "<TD><FONT SIZE=-1>", 
-        $pref->{bill} ? time2str("%D",$pref->{bill} ) : "" ,
-        "</FONT></TD>",
-        "<TD><FONT SIZE=-1>",
-        $pref->{susp} ? time2str("%D",$pref->{susp} ) : "" ,
-        "</FONT></TD>",
-        "<TD><FONT SIZE=-1>",
-        $pref->{expire} ? time2str("%D",$pref->{expire} ) : "" ,
-        "</FONT></TD>",
-        "<TD><FONT SIZE=-1>",
-        $pref->{cancel} ? time2str("%D",$pref->{cancel} ) : "" ,
-        "</FONT></TD>",
-        "</TR>";
-}
+  my $pkgnum = $package->pkgnum;
+  my $pkg = $package->part_pkg->pkg;
+  my $comment = $package->part_pkg->comment;
+  my $pkgview = popurl(2). "view/cust_pkg.cgi?$pkgnum";
+  my @cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
+  my $rowspan = scalar(@cust_svc) || 1;
+
+  my $button_cgi = new CGI;
+  $button_cgi->param('clone', $package->part_pkg->pkgpart);
+  $button_cgi->param('pkgnum', $package->pkgnum);
+  my $button_url = popurl(2). "edit/part_pkg.cgi?". $button_cgi->query_string;
+
+  #print $n1, qq!<TD ROWSPAN=$rowspan><A HREF="$pkgview">$pkgnum</A></TD>!,
+  print $n1, qq!<TD ROWSPAN=$rowspan>$pkgnum</TD>!,
+        qq!<TD ROWSPAN=$rowspan><FONT SIZE=-1>!,
+        #qq!<A HREF="$pkgview">$pkg - $comment</A>!,
+        qq!$pkg - $comment!,
+        qq! ( <A HREF="$pkgview">Edit</A> | <A HREF="$button_url">Customize pricing</A>)</FONT></TD>!,
+  ;
+  for ( qw( setup bill susp expire cancel ) ) {
+    print "<TD ROWSPAN=$rowspan><FONT SIZE=-1>", ( $package->getfield($_)
+            ? time2str("%D", $package->getfield($_) )
+            :  '&nbsp'
+          ), '</FONT></TD>',
+    ;
+  }
+
+  my $n2 = '';
+  foreach my $cust_svc ( @cust_svc ) {
+     my($label, $value, $svcdb) = $cust_svc->label;
+     my($svcnum) = $cust_svc->svcnum;
+     my($sview) = popurl(2). "/view";
+     print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
+           qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
+     $n2="</TR><TR>";
+  }
+  $n1="</TR><TR>";
+}  
+print "</TR>";
 
 #formatting
-print "</TABLE></CENTER>";
+print "</TABLE>";
 
 #formatting
-print qq!<CENTER><HR><A NAME="history"><FONT SIZE=+1>Payment History!,
-      qq!</FONT></A><BR>!,
-      qq!Click on invoice to view invoice/enter payment.<BR>!,
+print qq!<BR><BR><A NAME="history">Payment History!,
+      qq!</A>!,
+      qq! ( Click on invoice to view invoice/enter payment. | !,
       qq!<A HREF="!, popurl(2), qq!edit/cust_credit.cgi?$custnum">!,
-      qq!Post Credit / Refund</A></CENTER><BR>!;
+      qq!Post credit / refund</A> )!;
 
 #get payment history
 #
 # major problem: this whole thing is way too sloppy.
 # minor problem: the description lines need better formatting.
 
+@history = (); #needed for mod_perl :)
+
 @bills = qsearch('cust_bill',{'custnum'=>$custnum});
 foreach $bill (@bills) {
   my($bref)=$bill->hashref;
@@ -283,7 +310,6 @@ foreach $bill (@bills) {
   my(@payments)=qsearch('cust_pay',{'invnum'=> $bref->{invnum} } );
   my($payment);
   foreach $payment (@payments) {
-#    my($pref)=$payment->hashref;
     my($date,$invnum,$payby,$payinfo,$paid)=($payment->getfield('_date'),
                                              $payment->getfield('invnum'),
                                              $payment->getfield('payby'),
@@ -316,7 +342,7 @@ foreach $credit (@credits) {
 }
 
         #formatting
-        print "<CENTER>", table, <<END;
+        print table(), <<END;
 <TR>
   <TH>Date</TH>
   <TH>Description</TH>
@@ -360,7 +386,7 @@ foreach $item (sort keyfield_numerically @history) {
 }
 
 #formatting
-print "</TABLE></CENTER>";
+print "</TABLE>";
 
 #end
 
diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index 97dedaddf..142438e4c 100644
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -9,7 +9,7 @@ use CGI::Carp qw(fatalsToBrowser);
 use FS::UID;
 
 @ISA = qw(Exporter);
-@EXPORT_OK = qw(header menubar idiot eidiot popurl table itable);
+@EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable);
 
 =head1 NAME
 
@@ -53,7 +53,7 @@ sub header {
         </TITLE>
       </HEAD>
       <BODY BGCOLOR="#e8e8e8">
-          <FONT COLOR="#FF0000" SIZE=7>
+          <FONT SIZE=7>
             $title
           </FONT>
           <BR><BR>
@@ -79,11 +79,14 @@ sub menubar { #$menubar=menubar('Main Menu', '../', 'Item', 'url', ... );
 
 =item idiot ERROR
 
+This is depriciated.  Don't use it.
+
 Sends headers and an HTML error message.
 
 =cut
 
 sub idiot {
+  #warn "idiot depriciated";
   my($error)=@_;
   my($cgi)=FS::UID::cgi;
   if ( $cgi->isa('CGI::Base') ) {
@@ -103,7 +106,6 @@ sub idiot {
     </CENTER>
     Your request could not be processed because of the following error:
     <P><B>$error</B>
-    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and try again.
   </BODY>
 </HTML>
 END
@@ -112,11 +114,14 @@ END
 
 =item eidiot ERROR
 
+This is depriciated.  Don't use it.
+
 Sends headers and an HTML error message, then exits.
 
 =cut
 
 sub eidiot {
+  #warn "eidiot depriciated";
   idiot(@_);
   exit;
 }
@@ -148,7 +153,7 @@ Returns HTML tag for beginning a table.
 sub table {
   my $col = shift;
   if ( $col ) {
-    "<TABLE BGCOLOR=$col BORDER=1 WIDTH=\"100%\">";
+    qq!<TABLE BGCOLOR="$col" BORDER=1 WIDTH="100%">!;
   } else { 
     "<TABLE BORDER=1>";
   }
@@ -162,11 +167,29 @@ Returns HTML tag for beginning an (invisible) table.
 
 sub itable {
   my $col = shift;
+  my $cellspacing = shift || 0;
+  if ( $col ) {
+    qq!<TABLE BGCOLOR="$col" BORDER=0 CELLSPACING=$cellspacing WIDTH="100%">!;
+  } else {
+    qq!<TABLE BORDER=0 $cellspacing=$cellspacing WIDTH="100%">!;
+  }
+}
+
+=item ntable
+
+This is getting silly.
+
+=cut
+
+sub ntable {
+  my $col = shift;
+  my $cellspacing = shift || 0;
   if ( $col ) {
-    qq!<TABLE BGCOLOR=$col BORDER=0 CELLSPACING=0 WIDTH=\"100%\">!;
+    qq!<TABLE BGCOLOR="$col" BORDER=0 CELLSPACING=$cellspacing>!;
   } else {
-    "<TABLE>";
+    "<TABLE BORDER>";
   }
+
 }
 
 =back
@@ -193,7 +216,10 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 pod ivan@sisd.com 98-sep-12
 
 $Log: CGI.pm,v $
-Revision 1.15  1999-01-18 09:41:48  ivan
+Revision 1.16  1999-01-25 12:26:05  ivan
+yet more mod_perl stuff
+
+Revision 1.15  1999/01/18 09:41:48  ivan
 all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
 (good idea anyway)
 
diff --git a/site_perl/Record.pm b/site_perl/Record.pm
index 81574131e..aa8d75b3d 100644
--- a/site_perl/Record.pm
+++ b/site_perl/Record.pm
@@ -353,6 +353,7 @@ sub insert {
   local $SIG{QUIT} = 'IGNORE'; 
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
 
   $sth->execute or return $sth->errstr;
 
@@ -396,6 +397,7 @@ sub delete {
   local $SIG{QUIT} = 'IGNORE'; 
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
 
   my $rc = $sth->execute or return $sth->errstr;
   #not portable #return "Record not found, statement:\n$statement" if $rc eq "0E0";
@@ -462,6 +464,7 @@ sub replace {
   local $SIG{QUIT} = 'IGNORE'; 
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
 
   my $rc = $sth->execute or return $sth->errstr;
   #not portable #return "Record not found (or records identical)." if $rc eq "0E0";
@@ -590,9 +593,10 @@ is an error, returns the error, otherwise returns false.
 
 sub ut_money {
   my($self,$field)=@_;
+  $self->setfield($field, 0) if $self->getfield($field) eq '';
   $self->getfield($field) =~ /^(\-)? ?(\d*)(\.\d{2})?$/
     or return "Illegal (money) $field!";
-  $self->setfield($field,"$1$2$3" || 0);
+  $self->setfield($field, "$1$2$3" || 0);
   '';
 }
 
@@ -805,7 +809,7 @@ sub hfields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.11 1999-01-18 09:22:38 ivan Exp $
+$Id: Record.pm,v 1.12 1999-01-25 12:26:06 ivan Exp $
 
 =head1 BUGS
 
@@ -927,7 +931,10 @@ added pod documentation ivan@sisd.com 98-sep-6
 ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
 $Log: Record.pm,v $
-Revision 1.11  1999-01-18 09:22:38  ivan
+Revision 1.12  1999-01-25 12:26:06  ivan
+yet more mod_perl stuff
+
+Revision 1.11  1999/01/18 09:22:38  ivan
 changes to track email addresses for email invoicing
 
 Revision 1.10  1998/12/29 11:59:33  ivan
diff --git a/site_perl/cust_bill.pm b/site_perl/cust_bill.pm
index 5de1d929b..6d87b1bb3 100644
--- a/site_perl/cust_bill.pm
+++ b/site_perl/cust_bill.pm
@@ -15,7 +15,7 @@ use FS::cust_pkg;
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::cust_bill'} = sub { 
   $conf = new FS::Conf;
-  ( $add1, $add2, $add3, $add4 ) = $conf->config('address');
+  ( $add1, $add2, $add3, $add4 ) = ( $conf->config('address'), '', '', '', '' );
 };
 
 =head1 NAME
@@ -264,172 +264,156 @@ sub print_text {
 
   #printing bits here (yuck!)
 
-  local($SIG{CHLD}) = sub { wait() };
-  $|=1;
-  my($pid)=open(CHILD,"-|");
-  die "Can't fork: $!" unless defined($pid); 
+  my @collect = ();
 
-  if ($pid) { #parent
-    my(@collect)=<CHILD>;
-    close CHILD;
-    return @collect;
-  } else { #child
-
-    my($description,$amount);
-    my(@buf);
-
-    #define format stuff
-    $%=0;
-    $= = 35;
-    local($^L) = <<END;
-
-
-
-
-
-
-
-END
-
-    #format address
-    my($l,@address)=(0,'','','','','');
-    $address[$l++]=$cust_main->company if $cust_main->company;
-    $address[$l++]=$cust_main->address1;
-    $address[$l++]=$cust_main->address2 if $cust_main->address2;
-    $address[$l++]=$cust_main->city. ", ". $cust_main->state. "  ".
-                   $cust_main->zip;
-    $address[$l++]=$cust_main->country unless $cust_main->country eq 'US';
-
-    #previous balance
-    foreach ( @pr_cust_bill ) {
-      push @buf, (
-        "Previous Balance, Invoice #". $_->invnum. 
-                   " (". time2str("%x",$_->_date). ")",
-        '$'. sprintf("%10.2f",$_->owed)
-      );
-    }
-    if (@pr_cust_bill) {
-      push @buf,('','-----------');
-      push @buf,('Total Previous Balance','$' . sprintf("%10.2f",$pr_total ) );
-      push @buf,('','');
-    }
-
-    #new charges
-    foreach ( $self->cust_bill_pkg ) {
-
-      if ( $_->pkgnum ) {
-
-        my($cust_pkg)=qsearchs('cust_pkg', { 'pkgnum', $_->pkgnum } );
-        my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->pkgpart});
-        my($pkg)=$part_pkg->pkg;
-
-        push @buf, ( "$pkg Setup",'$' . sprintf("%10.2f",$_->setup) )
-          if $_->setup != 0;
-        push @buf, (
-          "$pkg (" . time2str("%x",$_->sdate) . " - " .
-                                time2str("%x",$_->edate) . ")",
-          '$' . sprintf("%10.2f",$_->recur)
-        ) if $_->recur != 0;
-
-      } else { #pkgnum Tax
-        push @buf,("Tax",'$' . sprintf("%10.2f",$_->setup) ) 
-          if $_->setup != 0;
-      }
-    }
+  my($description,$amount);
+  my(@buf);
 
+  #format address
+  my($l,@address)=(0,'','','','','','','');
+  $address[$l++] =
+    $cust_main->payname.
+      ( ( $cust_main->payby eq 'BILL' ) && $cust_main->payinfo
+        ? " (P.O. #". $cust_main->payinfo. ")"
+        : ''
+      )
+  ;
+  $address[$l++]=$cust_main->company if $cust_main->company;
+  $address[$l++]=$cust_main->address1;
+  $address[$l++]=$cust_main->address2 if $cust_main->address2;
+  $address[$l++]=$cust_main->city. ", ". $cust_main->state. "  ".
+                 $cust_main->zip;
+  $address[$l++]=$cust_main->country unless $cust_main->country eq 'US';
+
+  #previous balance
+  foreach ( @pr_cust_bill ) {
+    push @buf, (
+      "Previous Balance, Invoice #". $_->invnum. 
+                 " (". time2str("%x",$_->_date). ")",
+      '$'. sprintf("%10.2f",$_->owed)
+    );
+  }
+  if (@pr_cust_bill) {
     push @buf,('','-----------');
-    push @buf,('Total New Charges',
-               '$' . sprintf("%10.2f",$self->charged) );
+    push @buf,('Total Previous Balance','$' . sprintf("%10.2f",$pr_total ) );
     push @buf,('','');
+  }
 
-    push @buf,('','-----------');
-    push @buf,('Total Charges',
-               '$' . sprintf("%10.2f",$self->charged + $pr_total) );
-    push @buf,('','');
+  #new charges
+  foreach ( $self->cust_bill_pkg ) {
 
-    #credits
-    foreach ( @cr_cust_credit ) {
-      push @buf,(
-        "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
-        '$' . sprintf("%10.2f",$_->credited)
-      );
-    }
+    if ( $_->pkgnum ) {
 
-    #get & print payments
-    foreach ( $self->cust_pay ) {
-      push @buf,(
-        "Payment received ". time2str("%x",$_->_date ),
-        '$' . sprintf("%10.2f",$_->paid )
-      );
-    }
-
-    #balance due
-    push @buf,('','-----------');
-    push @buf,('Balance Due','$' . 
-      sprintf("%10.2f",$self->owed + $pr_total - $cr_total ) );
+      my($cust_pkg)=qsearchs('cust_pkg', { 'pkgnum', $_->pkgnum } );
+      my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->pkgpart});
+      my($pkg)=$part_pkg->pkg;
 
-    #now print
-
-    my($tot_pages)=int(scalar(@buf)/30); #15 lines, 2 values per line
-    $tot_pages++ if scalar(@buf) % 30;
-
-    while (@buf) {
+      push @buf, ( "$pkg Setup",'$' . sprintf("%10.2f",$_->setup) )
+        if $_->setup != 0;
+      push @buf, (
+        "$pkg (" . time2str("%x",$_->sdate) . " - " .
+                              time2str("%x",$_->edate) . ")",
+        '$' . sprintf("%10.2f",$_->recur)
+      ) if $_->recur != 0;
+
+    } else { #pkgnum Tax
+      push @buf,("Tax",'$' . sprintf("%10.2f",$_->setup) ) 
+        if $_->setup != 0;
+    }
+  }
+
+  push @buf,('','-----------');
+  push @buf,('Total New Charges',
+             '$' . sprintf("%10.2f",$self->charged) );
+  push @buf,('','');
+
+  push @buf,('','-----------');
+  push @buf,('Total Charges',
+             '$' . sprintf("%10.2f",$self->charged + $pr_total) );
+  push @buf,('','');
+
+  #credits
+  foreach ( @cr_cust_credit ) {
+    push @buf,(
+      "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
+      '$' . sprintf("%10.2f",$_->credited)
+    );
+  }
+
+  #get & print payments
+  foreach ( $self->cust_pay ) {
+    push @buf,(
+      "Payment received ". time2str("%x",$_->_date ),
+      '$' . sprintf("%10.2f",$_->paid )
+    );
+  }
+
+  #balance due
+  push @buf,('','-----------');
+  push @buf,('Balance Due','$' . 
+    sprintf("%10.2f",$self->owed + $pr_total - $cr_total ) );
+
+  #now print
+
+  my $tot_lines = 50; #should be configurable
+   #header is 17 lines
+  my $tot_pages = int( scalar(@buf) / ( 2 * ( $tot_lines - 17 ) ) );
+  $tot_pages++ if scalar(@buf) % ( 2 * ( $tot_lines - 17 ) );
+
+  my $page = 1;
+  my $lines;
+  while (@buf) {
+    $lines = $tot_lines;
+    my @header = &header(
+      $page, $tot_pages, $self->_date, $self->invnum, @address
+    );
+    push @collect, @header;
+    $lines -= scalar(@header);
+
+    while ( $lines-- && @buf ) {
       $description=shift(@buf);
       $amount=shift(@buf);
-      write;
+      push @collect, myswrite($description, $amount);
     }
-      ($description,$amount)=('','');
-      write while ( $- );
-      print $^L;
-
-      exit; #kid
-
-    format STDOUT_TOP =
-
-                                      @|||||||||||||||||||
-                                     "Invoice"
-                                      @||||||||||||||||||| @<<<<<<< @<<<<<<<<<<<
-{
-              ( $tot_pages != 1 ) ? "Page $% of $tot_pages" : '',
-  time2str("%x",( $self->_date )), "FS-$invnum"
-}
-
-
-@>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-$add1
-@>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-$add2
-@>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-$add3
-@>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-$add4
-
-  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<             @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-{ $cust_main->payname,
-  ( ( $cust_main->payby eq 'BILL' ) && $cust_main->payinfo )
-  ? "P.O. #". $cust_main->payinfo : ''
-}
-  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<             @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-$address[0],''
-  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<             @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-$address[1],$overdue ? "* This invoice is now PAST DUE! *" : ''
-  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<             @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-$address[2],$overdue ? " Please forward payment promptly " : ''
-  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<             @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-$address[3],$overdue ? "to avoid interruption of service." : ''
-  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<             @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-$address[4],''
-
-
-
-.
-
-    format STDOUT =
+    $page++;
+  }
+  while ( $lines-- ) {
+    push @collect, myswrite('', '');
+  }
+
+  return @collect;
+
+  sub header { #17 lines
+    my ( $page, $tot_pages, $date, $invnum, @address ) = @_ ;
+    push @address, '', '', '', '';
+
+    my @return = ();
+    my $i = ' 'x32;
+    push @return,
+      '',
+      $i. 'Invoice',
+      $i. substr("Page $page of $tot_pages".' 'x10, 0, 20).
+        time2str("%x", $date ). "  FS-". $invnum,
+      '',
+      '',
+      $add1,
+      $add2,
+      $add3,
+      $add4,
+      '',
+      splice @address, 0, 7;
+    ;
+    return map $_. "\n", @return;
+  }
+
+  sub myswrite {
+    my $format = <<END;
   @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<
-  $description,$amount
-.
-
-  } #endchild
+END
+    $^A = '';
+    formline( $format, @_ );
+    return $^A;
+  }
 
 }
 
@@ -437,23 +421,18 @@ $address[4],''
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.5 1999-01-18 21:58:03 ivan Exp $
+$Id: cust_bill.pm,v 1.6 1999-01-25 12:26:07 ivan Exp $
 
 =head1 BUGS
 
 The delete method.
 
-print_text formatting (and some logic :/) is in source as a format declaration,
-which needs to be slurped in from a file.  the fork is rather kludgy as well.
-It could be cleaned with swrite from man perlform, and the picture could be
-put in a /var/spool/freeside/conf file.  Also number of lines ($=).
+print_text formatting (and some logic :/) is in source, but needs to be
+slurped in from a file.  Also number of lines ($=).
 
 missing print_ps for a nice postscript copy (maybe HylaFAX-cover-page-style
 or something similar so the look can be completely customized?)
 
-There is an off-by-one error in print_text which causes a visual error: "Page 1
-of 2" printed on some single-page invoices?
-
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::cust_main>, L<FS::cust_pay>, L<FS::cust_bill_pkg>,
@@ -470,7 +449,10 @@ charges can be negative ivan@sisd.com 98-jul-13
 pod, ingegrate with FS::Invoice ivan@sisd.com 98-sep-20
 
 $Log: cust_bill.pm,v $
-Revision 1.5  1999-01-18 21:58:03  ivan
+Revision 1.6  1999-01-25 12:26:07  ivan
+yet more mod_perl stuff
+
+Revision 1.5  1999/01/18 21:58:03  ivan
 esthetic: eq and ne were used in a few places instead of == and !=
 
 Revision 1.4  1998/12/29 11:59:36  ivan
diff --git a/site_perl/cust_credit.pm b/site_perl/cust_credit.pm
index a050e3021..b9a05832b 100644
--- a/site_perl/cust_credit.pm
+++ b/site_perl/cust_credit.pm
@@ -77,7 +77,12 @@ automatically set to amount).
 sub insert {
   my $self = shift;
 
-  $self->credited($self->amount) if $self->credited eq '';
+  my $error;
+  return $error if $error = $self->ut_money('credited')
+                         || $self->ut_money('amount');
+
+  $self->credited($self->amount) if $self->credited == 0
+                                 || $self->credited eq '';
   return "credited != amount!"
     unless $self->credited == $self->amount;
 
@@ -152,7 +157,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_credit.pm,v 1.3 1999-01-18 21:58:04 ivan Exp $
+$Id: cust_credit.pm,v 1.4 1999-01-25 12:26:08 ivan Exp $
 
 =head1 BUGS
 
@@ -170,7 +175,10 @@ ivan@sisd.com 98-mar-17
 pod, otaker from FS::UID ivan@sisd.com 98-sep-21
 
 $Log: cust_credit.pm,v $
-Revision 1.3  1999-01-18 21:58:04  ivan
+Revision 1.4  1999-01-25 12:26:08  ivan
+yet more mod_perl stuff
+
+Revision 1.3  1999/01/18 21:58:04  ivan
 esthetic: eq and ne were used in a few places instead of == and !=
 
 Revision 1.2  1998/12/29 11:59:38  ivan
diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index 979b6f4d6..a89896da6 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -356,7 +356,7 @@ If there is an error, returns the error, otherwise returns false.
 
 sub bill {
   my( $self, %options ) = @_;
-  my $time = $options{'time'} || $^T;
+  my $time = $options{'time'} || time;
 
   my $error;
 
@@ -366,6 +366,7 @@ sub bill {
   local $SIG{QUIT} = 'IGNORE';
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
 
   # find the packages which are due for billing, find out how much they are
   # & generate invoice database.
@@ -543,7 +544,7 @@ return an error.  By default, they don't.
 
 sub collect {
   my( $self, %options ) = @_;
-  my $invoice_time = $options{'invoice_time'} || $^T;
+  my $invoice_time = $options{'invoice_time'} || time;
 
   my $total_owed = $self->balance;
   return '' unless $total_owed > 0; #redundant?????
@@ -554,6 +555,7 @@ sub collect {
   local $SIG{QUIT} = 'IGNORE';
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
 
   foreach my $cust_bill (
     qsearch('cust_bill', { 'custnum' => $self->custnum, } )
@@ -820,7 +822,10 @@ sub check_invoicing_list {
       'custnum' => $self->custnum,
       'dest'    => $address,
     } );
-    my $error = $cust_main_invoice->check;
+    my $error = $self->custnum
+                ? $cust_main_invoice->check
+                : $cust_main_invoice->checkdest
+    ;
     return $error if $error;
   }
   '';
@@ -830,7 +835,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.9 1999-01-18 09:22:41 ivan Exp $
+$Id: cust_main.pm,v 1.10 1999-01-25 12:26:09 ivan Exp $
 
 =head1 BUGS
 
@@ -886,7 +891,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.9  1999-01-18 09:22:41  ivan
+Revision 1.10  1999-01-25 12:26:09  ivan
+yet more mod_perl stuff
+
+Revision 1.9  1999/01/18 09:22:41  ivan
 changes to track email addresses for email invoicing
 
 Revision 1.8  1998/12/29 11:59:39  ivan
diff --git a/site_perl/cust_main_invoice.pm b/site_perl/cust_main_invoice.pm
index 6ae6425ef..2823294c1 100644
--- a/site_perl/cust_main_invoice.pm
+++ b/site_perl/cust_main_invoice.pm
@@ -105,13 +105,28 @@ sub check {
 
   my $error = $self->ut_numbern('destnum')
            || $self->ut_number('custnum')
-           || $self->ut_text('dest')
+           || $self->checkdest;
   ;
   return $error if $error;
 
   return "Unknown customer"
     unless qsearchs('cust_main',{ 'custnum' => $self->custnum });
 
+  ''; #noerror
+}
+
+=item checkdest
+
+Checks the dest field only.
+
+=cut
+
+sub checkdest { 
+  my $self = shift;
+
+  my $error = $self->ut_text('dest');
+  return $error if $error;
+
   if ( $self->dest eq 'POST' ) {
     #contemplate our navel
   } elsif ( $self->dest =~ /^(\d+)$/ ) {
@@ -152,7 +167,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.5 1999-01-18 21:58:05 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.6 1999-01-25 12:26:10 ivan Exp $
 
 =head1 BUGS
 
@@ -168,7 +183,10 @@ added hfields
 ivan@sisd.com 97-nov-13
 
 $Log: cust_main_invoice.pm,v $
-Revision 1.5  1999-01-18 21:58:05  ivan
+Revision 1.6  1999-01-25 12:26:10  ivan
+yet more mod_perl stuff
+
+Revision 1.5  1999/01/18 21:58:05  ivan
 esthetic: eq and ne were used in a few places instead of == and !=
 
 Revision 1.4  1999/01/18 09:22:42  ivan
diff --git a/site_perl/cust_pay.pm b/site_perl/cust_pay.pm
index fc9112b00..2cb256baa 100644
--- a/site_perl/cust_pay.pm
+++ b/site_perl/cust_pay.pm
@@ -89,6 +89,7 @@ sub insert {
   local $SIG{QUIT} = 'IGNORE';
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
 
   $error = $new_cust_bill->replace($old_cust_bill);
   return "Error modifying cust_bill: $error" if $error;
@@ -170,7 +171,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.2 1998-12-29 11:59:43 ivan Exp $
+$Id: cust_pay.pm,v 1.3 1999-01-25 12:26:11 ivan Exp $
 
 =head1 BUGS
 
@@ -189,7 +190,10 @@ new api ivan@sisd.com 98-mar-13
 pod ivan@sisd.com 98-sep-21
 
 $Log: cust_pay.pm,v $
-Revision 1.2  1998-12-29 11:59:43  ivan
+Revision 1.3  1999-01-25 12:26:11  ivan
+yet more mod_perl stuff
+
+Revision 1.2  1998/12/29 11:59:43  ivan
 mostly properly OO, some work still to be done with svc_ stuff
 
 
diff --git a/site_perl/cust_pkg.pm b/site_perl/cust_pkg.pm
index 5b119ed28..039b65451 100644
--- a/site_perl/cust_pkg.pm
+++ b/site_perl/cust_pkg.pm
@@ -193,6 +193,7 @@ sub cancel {
   local $SIG{QUIT} = 'IGNORE'; 
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
 
   foreach my $cust_svc (
     qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum } )
@@ -219,7 +220,7 @@ sub cancel {
 
   unless ( $self->getfield('cancel') ) {
     my %hash = $self->hash;
-    $hash{'cancel'} = $^T;
+    $hash{'cancel'} = time;
     my $new = new FS::cust_pkg ( \%hash );
     $error = $new->replace($self);
     return $error if $error;
@@ -246,6 +247,7 @@ sub suspend {
   local $SIG{QUIT} = 'IGNORE'; 
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
 
   foreach my $cust_svc (
     qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum } )
@@ -267,7 +269,7 @@ sub suspend {
 
   unless ( $self->getfield('susp') ) {
     my %hash = $self->hash;
-    $hash{'susp'} = $^T;
+    $hash{'susp'} = time;
     my $new = new FS::cust_pkg ( \%hash );
     $error = $new->replace($self);
     return $error if $error;
@@ -294,6 +296,7 @@ sub unsuspend {
   local $SIG{QUIT} = 'IGNORE'; 
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
 
   foreach my $cust_svc (
     qsearch('cust_svc',{'pkgnum'=> $self->pkgnum } )
@@ -417,38 +420,39 @@ sub order {
   local $SIG{QUIT} = 'IGNORE';
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE'; 
+  local $SIG{PIPE} = 'IGNORE'; 
 
   #first cancel old packages
 #  my($pkgnum);
   foreach $pkgnum ( @{$remove_pkgnums} ) {
     my($old) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-    return "Package $pkgnum not found to remove!" unless $old;
+    die "Package $pkgnum not found to remove!" unless $old;
     my(%hash) = $old->hash;
-    $hash{'cancel'}=$^T;   
-    my($new) = create FS::cust_pkg ( \%hash );
+    $hash{'cancel'}=time;   
+    my($new) = new FS::cust_pkg ( \%hash );
     my($error)=$new->replace($old);
-    return $error if $error;
+    die "Couldn't update package $pkgnum: $error" if $error;
   }
 
   #now add new packages, changing cust_svc records if necessary
 #  my($pkgpart);
   while ($pkgpart=shift @{$pkgparts} ) {
  
-    my($new) = create FS::cust_pkg ( {
+    my($new) = new FS::cust_pkg ( {
                                        'custnum' => $custnum,
                                        'pkgpart' => $pkgpart,
                                     } );
     my($error) = $new->insert;
-    return $error if $error; 
+    die "Couldn't insert new cust_pkg record: $error" if $error; 
     my($pkgnum)=$new->getfield('pkgnum');
  
     my($cust_svc);
     foreach $cust_svc ( @{ shift @cust_svc } ) {
       my(%hash) = $cust_svc->hash;
       $hash{'pkgnum'}=$pkgnum;
-      my($new) = create FS::cust_svc ( \%hash );
+      my($new) = new FS::cust_svc ( \%hash );
       my($error)=$new->replace($cust_svc);
-      return $error if $error;
+      die "Couldn't link old service to new package: $error" if $error;
     }
   }  
 
@@ -459,7 +463,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.5 1999-01-18 21:58:07 ivan Exp $
+$Id: cust_pkg.pm,v 1.6 1999-01-25 12:26:12 ivan Exp $
 
 =head1 BUGS
 
@@ -490,7 +494,10 @@ fixed for new agent->agent_type->type_pkgs in &order ivan@sisd.com 98-mar-7
 pod ivan@sisd.com 98-sep-21
 
 $Log: cust_pkg.pm,v $
-Revision 1.5  1999-01-18 21:58:07  ivan
+Revision 1.6  1999-01-25 12:26:12  ivan
+yet more mod_perl stuff
+
+Revision 1.5  1999/01/18 21:58:07  ivan
 esthetic: eq and ne were used in a few places instead of == and !=
 
 Revision 1.4  1998/12/29 11:59:45  ivan
diff --git a/site_perl/cust_refund.pm b/site_perl/cust_refund.pm
index 0778473a9..4ec54907d 100644
--- a/site_perl/cust_refund.pm
+++ b/site_perl/cust_refund.pm
@@ -91,6 +91,7 @@ sub insert {
   local $SIG{QUIT} = 'IGNORE';
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
 
   $error = $new_cust_credit->replace($old_cust_credit);
   return "Error modifying cust_credit: $error" if $error;
@@ -170,7 +171,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.2 1998-12-29 11:59:46 ivan Exp $
+$Id: cust_refund.pm,v 1.3 1999-01-25 12:26:13 ivan Exp $
 
 =head1 BUGS
 
@@ -190,7 +191,10 @@ ivan@sisd.com 98-mar-18
 pod and finish up ivan@sisd.com 98-sep-21
 
 $Log: cust_refund.pm,v $
-Revision 1.2  1998-12-29 11:59:46  ivan
+Revision 1.3  1999-01-25 12:26:13  ivan
+yet more mod_perl stuff
+
+Revision 1.2  1998/12/29 11:59:46  ivan
 mostly properly OO, some work still to be done with svc_ stuff
 
 
diff --git a/site_perl/svc_Common.pm b/site_perl/svc_Common.pm
index e516e0065..9c0c4e69f 100644
--- a/site_perl/svc_Common.pm
+++ b/site_perl/svc_Common.pm
@@ -46,6 +46,7 @@ sub insert {
   local $SIG{QUIT} = 'IGNORE';
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
 
   $error = $self->check;
   return $error if $error;
@@ -90,6 +91,7 @@ sub delete {
   local $SIG{QUIT} = 'IGNORE';
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
 
   my $svcnum = $self->svcnum;
 
@@ -163,7 +165,7 @@ sub cancel { ''; }
 
 =head1 VERSION
 
-$Id: svc_Common.pm,v 1.1 1998-12-30 00:30:45 ivan Exp $
+$Id: svc_Common.pm,v 1.2 1999-01-25 12:26:14 ivan Exp $
 
 =head1 BUGS
 
@@ -180,7 +182,10 @@ from the base documentation.
 =head1 HISTORY
 
 $Log: svc_Common.pm,v $
-Revision 1.1  1998-12-30 00:30:45  ivan
+Revision 1.2  1999-01-25 12:26:14  ivan
+yet more mod_perl stuff
+
+Revision 1.1  1998/12/30 00:30:45  ivan
 svc_ stuff is more properly OO - has a common superclass FS::svc_Common
 
 
diff --git a/site_perl/svc_acct.pm b/site_perl/svc_acct.pm
index c69f1032b..1ba92aec1 100644
--- a/site_perl/svc_acct.pm
+++ b/site_perl/svc_acct.pm
@@ -120,6 +120,7 @@ sub insert {
   local $SIG{QUIT} = 'IGNORE';
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
 
   $error = $self->check;
   return $error if $error;
@@ -188,6 +189,7 @@ sub delete {
   local $SIG{QUIT} = 'IGNORE';
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
 
   $error = $self->SUPER::delete;
   return $error if $error;
@@ -242,6 +244,7 @@ sub replace {
   local $SIG{QUIT} = 'IGNORE';
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
 
   $error = $new->SUPER::replace($old);
   return $error if $error;
@@ -440,7 +443,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.5 1999-01-18 21:58:09 ivan Exp $
+$Id: svc_acct.pm,v 1.6 1999-01-25 12:26:15 ivan Exp $
 
 =head1 BUGS
 
@@ -482,7 +485,10 @@ arbitrary radius attributes ivan@sisd.com 98-aug-13
 pod and FS::conf ivan@sisd.com 98-sep-22
 
 $Log: svc_acct.pm,v $
-Revision 1.5  1999-01-18 21:58:09  ivan
+Revision 1.6  1999-01-25 12:26:15  ivan
+yet more mod_perl stuff
+
+Revision 1.5  1999/01/18 21:58:09  ivan
 esthetic: eq and ne were used in a few places instead of == and !=
 
 Revision 1.4  1998/12/30 00:30:45  ivan
diff --git a/site_perl/svc_acct_sm.pm b/site_perl/svc_acct_sm.pm
index 5c0f510e4..b0eee114c 100644
--- a/site_perl/svc_acct_sm.pm
+++ b/site_perl/svc_acct_sm.pm
@@ -103,6 +103,7 @@ sub insert {
   local $SIG{QUIT} = 'IGNORE';
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
 
   $error=$self->check;
   return $error if $error;
@@ -229,7 +230,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_acct_sm.pm,v 1.5 1999-01-18 21:58:10 ivan Exp $
+$Id: svc_acct_sm.pm,v 1.6 1999-01-25 12:26:16 ivan Exp $
 
 =head1 BUGS
 
diff --git a/site_perl/svc_domain.pm b/site_perl/svc_domain.pm
index f86723f4a..76d666b86 100644
--- a/site_perl/svc_domain.pm
+++ b/site_perl/svc_domain.pm
@@ -121,6 +121,7 @@ sub insert {
   local $SIG{QUIT} = 'IGNORE';
   local $SIG{TERM} = 'IGNORE';
   local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
 
   $error = $self->check;
   return $error if $error;
@@ -386,7 +387,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.5 1998-12-30 00:30:47 ivan Exp $
+$Id: svc_domain.pm,v 1.6 1999-01-25 12:26:17 ivan Exp $
 
 =head1 BUGS
 
@@ -422,7 +423,10 @@ ivan@sisd.com 98-jul-17-19
 pod, some FS::Conf (not complete) ivan@sisd.com 98-sep-23
 
 $Log: svc_domain.pm,v $
-Revision 1.5  1998-12-30 00:30:47  ivan
+Revision 1.6  1999-01-25 12:26:17  ivan
+yet more mod_perl stuff
+
+Revision 1.5  1998/12/30 00:30:47  ivan
 svc_ stuff is more properly OO - has a common superclass FS::svc_Common
 
 Revision 1.3  1998/11/13 09:56:57  ivan
-- 
cgit v1.2.1


From 4757f810e753160f874de68190df5dabc43488d5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Feb 1999 10:42:27 +0000
Subject: *** empty log message ***

---
 bin/fs-setup | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 222ce1611..2c425df39 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.11 1999-01-17 03:11:52 ivan Exp $
+# $Id: fs-setup,v 1.12 1999-02-03 10:42:27 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.11  1999-01-17 03:11:52  ivan
+# Revision 1.12  1999-02-03 10:42:27  ivan
+# *** empty log message ***
+#
+# Revision 1.11  1999/01/17 03:11:52  ivan
 # remove preliminary completehost changes
 #
 # Revision 1.10  1998/12/16 06:05:38  ivan
@@ -177,7 +180,7 @@ foreach (qw(svc_acct svc_acct_sm svc_domain)) {
 
 #important
 $dbdef->save($dbdef_file);
-FS::Record::reload_dbdef($dbdef_file);
+&FS::Record::reload_dbdef($dbdef_file);
 
 ###
 # create 'em
-- 
cgit v1.2.1


From 3e38c8e98073ab22c443de245846008a9db98000 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 4 Feb 1999 06:09:23 +0000
Subject: add AU provences

---
 bin/fs-setup | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 2c425df39..2683e98ad 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.12 1999-02-03 10:42:27 ivan Exp $
+# $Id: fs-setup,v 1.13 1999-02-04 06:09:23 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.12  1999-02-03 10:42:27  ivan
+# Revision 1.13  1999-02-04 06:09:23  ivan
+# add AU provences
+#
+# Revision 1.12  1999/02/03 10:42:27  ivan
 # *** empty log message ***
 #
 # Revision 1.11  1999/01/17 03:11:52  ivan
@@ -228,9 +231,23 @@ SC SD TN TX TT UT VT VI VA WA WV WI WY AE AA AP
   die $error if $error;
 }
 
-#ISO 2-letter country codes (same as country TLDs) except US
+#AU "offical" state codes ala mark.williamson@ebbs.com.au (Mark Williamson)
+foreach ( qw(
+VIC NSW NT QLD TAS ACT WA SA
+) ) {
+  my($cust_main_county)=create FS::cust_main_county({
+    'state' => $_,
+    'tax'   => 0,
+    'country' => 'AU',
+  });  
+  my($error);
+  $error=$cust_main_county->insert;
+  die $error if $error;
+}
+
+#ISO 2-letter country codes (same as country TLDs) except US and AU
 foreach ( qw(
-AF AL DZ AS AD AO AI AQ AG AR AM AW AU AT AZ BS BH BD BB BY BE BZ BJ BM BT BO
+AF AL DZ AS AD AO AI AQ AG AR AM AW AT AZ BS BH BD BB BY BE BZ BJ BM BT BO
 BA BW BV BR IO BN BG BF BI KH CM CA CV KY CF TD CL CN CX CC CO KM CG CK CR CI
 HR CU CY CZ DK DJ DM DO TP EC EG SV GQ ER EE ET FK FO FJ FI FR FX GF PF TF GA
 GM GE DE GH GI GR GL GD GP GU GT GN GW GY HT HM HN HK HU IS IN ID IR IQ IE IL
-- 
cgit v1.2.1


From 899b323ee2feeaf78afdb40526eb75995fe72cad Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Feb 1999 22:43:24 +0000
Subject: don't use [e]idiot; display error messages on the form page

---
 CREDITS |  3 +++
 TODO    | 24 ++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/CREDITS b/CREDITS
index fc5988360..8558cb6e1 100644
--- a/CREDITS
+++ b/CREDITS
@@ -24,5 +24,8 @@ based on Freeside:
   - Internationalization wrt addresses (cust_main, cust_main_county)
 Thanks!
 
+Mark Williamson <mark.williamson@ebbs.com.au> and Roger Mangraviti
+<rem@atu.com.au> contributed state/provence listings for Australia.
+
 Everything else is my (Ivan Kohler <ivan@sisd.com>) fault.
 
diff --git a/TODO b/TODO
index 363c42adb..920e160ab 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.20 1999-01-25 12:09:48 ivan Exp $
+$Id: TODO,v 1.21 1999-02-06 22:43:24 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,7 +6,25 @@ duplication of effort.
 
 -- before 1.2b1 --
 
-Can't use [e]idiot with mod_perl.
+Can't use [e]idiot with mod_perl (not with forms and `press back button' and
+expire=>now, anyway).
+
+"popurlidiot" is not exported by the FS::CGI module at htdocs/misc/process/link.cgi line 27
+Content-type: text/html
+
+<H1>Software error:</H1>
+<CODE>Can't continue after import errors at htdocs/misc/process/link.cgi line 27
+BEGIN failed--compilation aborted at htdocs/misc/process/link.cgi line 27.
+</CODE>
+<P>
+For help, please send mail to this site's webmaster, giving this error message 
+and the time and date of the error.
+
+[Fri Feb  5 02:26:23 1999] link.cgi: Can't continue after import errors at htdocs/misc/process/link.cgi line 27
+[Fri Feb  5 02:26:23 1999] link.cgi: BEGIN failed--compilation aborted at htdocs/misc/process/link.cgi line 27.
+
+
+clean up view/cust_pkg and view/svc_* yuck!
 
 Lay out the forms a bit better.
 
@@ -40,6 +58,8 @@ update web demo
 
 -- before or after ---
 
+add links on view/cust_main.cgi to setup services, like view/cust_pkg.cgi
+
 FS::cust_pkg _require_'s FS::$svc, but this won't work with %FS::UID::callback
 loading of configuration.  (pry need same idea, but will run immediately if
 context allows).  Looks like error is masked by 'use FS::cust_svc' which in
-- 
cgit v1.2.1


From e0da34d97b1463b55a334e8dae10cd55796e2312 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Feb 1999 09:59:44 +0000
Subject: more mod_perl fixes, and bugfixes Peter Wemm sent via email

---
 CREDITS                               |   3 +
 TODO                                  |  33 ++++-------
 bin/fs-setup                          |  15 +++--
 htdocs/docs/export.html               |   3 +-
 htdocs/docs/schema.html               |   1 +
 htdocs/docs/trouble.html              |   8 +--
 htdocs/edit/cust_pkg.cgi              |  89 +++++++++++++++--------------
 htdocs/edit/part_pkg.cgi              |  67 +++++++++++++---------
 htdocs/edit/part_referral.cgi         |  24 +++++---
 htdocs/edit/part_svc.cgi              |  27 ++++++---
 htdocs/edit/process/cust_pkg.cgi      |  25 +++++----
 htdocs/edit/process/part_pkg.cgi      |  72 ++++++++++++++----------
 htdocs/edit/process/part_referral.cgi |  30 ++++++----
 htdocs/edit/process/part_svc.cgi      |  24 +++++---
 htdocs/edit/process/svc_acct.cgi      |  28 +++++----
 htdocs/edit/process/svc_acct_pop.cgi  |  25 ++++++---
 htdocs/edit/process/svc_acct_sm.cgi   |  21 ++++---
 htdocs/edit/process/svc_domain.cgi    |  17 ++++--
 htdocs/edit/svc_acct.cgi              | 102 +++++++++++++++++++--------------
 htdocs/edit/svc_acct_pop.cgi          |  35 ++++++++----
 htdocs/edit/svc_acct_sm.cgi           |  93 +++++++++++++++++-------------
 htdocs/edit/svc_domain.cgi            | 103 +++++++++++++++++++++-------------
 htdocs/misc/cancel-unaudited.cgi      |  11 ++--
 htdocs/misc/process/link.cgi          |  11 ++--
 htdocs/search/cust_main.cgi           |  19 ++++---
 htdocs/search/cust_pkg.cgi            |  17 ++++--
 htdocs/search/svc_acct.cgi            |  12 ++--
 htdocs/search/svc_domain.cgi          |  12 ++--
 htdocs/view/cust_main.cgi             |  15 +++--
 htdocs/view/svc_acct_sm.cgi           |  23 ++++----
 site_perl/CGI.pm                      |   7 ++-
 site_perl/part_svc.pm                 |   9 ++-
 32 files changed, 577 insertions(+), 404 deletions(-)

diff --git a/CREDITS b/CREDITS
index 8558cb6e1..996cb3b9b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -27,5 +27,8 @@ Thanks!
 Mark Williamson <mark.williamson@ebbs.com.au> and Roger Mangraviti
 <rem@atu.com.au> contributed state/provence listings for Australia.
 
+Peter Wemm <peter@netplex.com.au> sent in a bunch of bugfixes for the 1.2
+release.
+
 Everything else is my (Ivan Kohler <ivan@sisd.com>) fault.
 
diff --git a/TODO b/TODO
index 920e160ab..869e13d4a 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.21 1999-02-06 22:43:24 ivan Exp $
+$Id: TODO,v 1.22 1999-02-07 09:59:12 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,23 +6,9 @@ duplication of effort.
 
 -- before 1.2b1 --
 
-Can't use [e]idiot with mod_perl (not with forms and `press back button' and
-expire=>now, anyway).
-
-"popurlidiot" is not exported by the FS::CGI module at htdocs/misc/process/link.cgi line 27
-Content-type: text/html
-
-<H1>Software error:</H1>
-<CODE>Can't continue after import errors at htdocs/misc/process/link.cgi line 27
-BEGIN failed--compilation aborted at htdocs/misc/process/link.cgi line 27.
-</CODE>
-<P>
-For help, please send mail to this site's webmaster, giving this error message 
-and the time and date of the error.
-
-[Fri Feb  5 02:26:23 1999] link.cgi: Can't continue after import errors at htdocs/misc/process/link.cgi line 27
-[Fri Feb  5 02:26:23 1999] link.cgi: BEGIN failed--compilation aborted at htdocs/misc/process/link.cgi line 27.
+missed popurl in (at least) search/cust_pkg.cgi
 
+one-screen new customer entry
 
 clean up view/cust_pkg and view/svc_* yuck!
 
@@ -40,9 +26,6 @@ Add the ability for services to filter information up to the package level
 for invoices and web screens, so you can select a particlar package based
 on username or domain name, etc.
 
-You can't delete the stuff under administration yet.  Add this,
-_including_ making sure the thing you are deleting is not in use!
-
 (Test this)
 one-time/per-customer/? changes in rates and descriptions ('remembered
 invoices'): implement by creating a new package on the fly... but it isn't 
@@ -56,7 +39,10 @@ update site_perl/table_template* (pry out of date)
 
 update web demo
 
--- before or after ---
+-- release 1.2b1 ---
+
+You can't delete the stuff under administration yet.  Add this,
+_including_ making sure the thing you are deleting is not in use!
 
 add links on view/cust_main.cgi to setup services, like view/cust_pkg.cgi
 
@@ -80,12 +66,13 @@ whois accordingly.
 .us domains and others!
 site_perl/svc_domain.cgi (hmm... or maybe should have a button?  or maybe svc_domain.pm should handle this) should set $whois_hack for non-internic domains, so you can add them...
 
+turn on the depriciation warnings for [e]idiot in FS::CGI. Stop using [e]idiot
+the last places it is (htdocs/search/ htdocs/misc/ htdocs/misc/process)
+
 (test cust_main.pm with cybercash v2 and v3, especially with the callback
  stuff AND with mod_perl w/cybercash v2 kludge in package main)
 (callback stuff should be eliminated by now)
 
--- after --
-
 bah, table/itable/*table in FS::CGI is silly.
 
 doc Apache::AuthDBI as well
diff --git a/bin/fs-setup b/bin/fs-setup
index 2683e98ad..f028c6e1d 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.13 1999-02-04 06:09:23 ivan Exp $
+# $Id: fs-setup,v 1.14 1999-02-07 09:59:14 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.13  1999-02-04 06:09:23  ivan
+# Revision 1.14  1999-02-07 09:59:14  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.13  1999/02/04 06:09:23  ivan
 # add AU provences
 #
 # Revision 1.12  1999/02/03 10:42:27  ivan
@@ -374,7 +377,7 @@ sub tables_hash_hack {
         'address2', 'varchar', 'NULL', $char_d,
         'city',     'varchar', '',     $char_d,
         'county',   'varchar', 'NULL', $char_d,
-        'state',    'varchar', '',     $char_d,
+        'state',    'varchar', 'NULL', $char_d,
         'zip',      'varchar', '',     10,
         'country',  'char', '',     2,
         'daytime',  'varchar', 'NULL', 20,
@@ -410,7 +413,7 @@ sub tables_hash_hack {
                             # a tax rate.
       'columns' => [
         'taxnum',   'int',   '',    '',
-        'state',    'char',  'NULL',    $char_d,
+        'state',    'varchar',  'NULL',    $char_d,
         'county',   'varchar',  'NULL',    $char_d,
         'country',  'char',  '', 2, 
         'tax',      'real',  '',    '', #tax %
@@ -447,7 +450,7 @@ sub tables_hash_hack {
         'address1', 'varchar', '',     $char_d,
         'address2', 'varchar', 'NULL', $char_d,
         'city',     'varchar', '',     $char_d,
-        'state',    'char', '',     2,
+        'state',    'varchar', '',     $char_d,
         'zip',      'varchar', '',     10,
         'country',  'char', '',     2,
         'trancode', 'int', '', '',
@@ -567,7 +570,7 @@ sub tables_hash_hack {
       'columns' => [
         'popnum',    'int',    '',   '',
         'city',      'varchar',   '',   $char_d,
-        'state',     'char',   '',   2,
+        'state',     'varchar',   '',   $char_d,
         'ac',        'char',   '',   3,
         'exch',      'char',   '',   3,
         #rest o' number?
diff --git a/htdocs/docs/export.html b/htdocs/docs/export.html
index d8022ae45..86a2b4ccd 100644
--- a/htdocs/docs/export.html
+++ b/htdocs/docs/export.html
@@ -4,7 +4,8 @@
 <body>
   <h1>File exporting</h1>
   <ul>
-    <li>bin/svc_acct.export will create UNIX <b>passwd</b>, <b>shadow</b> and <b>master.passwd</b> files, ERPCD <b>acp_passwd</b> and <b>acp_dialup</b> files and a RADIUS <b>users</b> file in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattended; see below.
+    <li>bin/svc_acct.export will create UNIX <b>passwd</b>, <b>shadow</b> and <b>master.passwd</b> files, ERPCD <b>acp_passwd</b> and <b>acp_dialup</b> files and a RADIUS <b>users</b> file in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattended; see below.  Some RADIUS servers (such as <a href="http://www.open.com.au/radiator/">Radiator</a>) will authenticate directly out of an SQL database.  In these cases,
+it is reccommended that you copy the svc_acct table to an external RADIUS machine rather than run the RADIUS server on your Freeside machine.
       <ul>
         <li>shellmachines - <b>passwd</b> and <b>shadow</b> are copied to the remote machine as <b>/etc/passwd.new</b> and <b>/etc/shadow.new</b> and then moved to <b>/etc/passwd</b> and <b>/etc/shadow</b> if no errors occur.
         <li>bsdshellmachines - <b>passwd</b> and <b>master.passwd</b> are copied to the remote machine as <b>/etc/passwd.new</b> and <b>/etc/master.passwd.new</b> and moved to <b>/etc/passwd</b> and <b>/etc/master.passwd</b> if no errors occur.
diff --git a/htdocs/docs/schema.html b/htdocs/docs/schema.html
index 6f4d99937..f50525183 100644
--- a/htdocs/docs/schema.html
+++ b/htdocs/docs/schema.html
@@ -77,6 +77,7 @@
         <li>destnum - primary key
         <li>custnum - <a href="#cust_main">customer</a>
         <li>dest - Invoice destination: If numeric, a <a href="#svc_acct">svcnum</a>, if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)
+      </ul>
     <li><a name="cust_main_county">cust_main_county</a> - Tax rates
       <ul>
         <li>taxnum - primary key
diff --git a/htdocs/docs/trouble.html b/htdocs/docs/trouble.html
index dcbe1bbd2..c918138c8 100644
--- a/htdocs/docs/trouble.html
+++ b/htdocs/docs/trouble.html
@@ -31,12 +31,8 @@ at <i>/your/path</i>/site_perl/FS/UID.pm line 26.
 BEGIN failed--compilation aborted at
 <i>/your/path</i>/edit/process/part_svc.cgi line 15.
 </pre>
-        Then the scripts are not running setuid freeside.  If you were editing
-the files, it is possible you inadvertantly removed the setuid bit.
-As mentioned in the <a href="install.html">New Installation</a> section of the documentation, set ownership and permissions for the web interface.  Your system should support secure setuid scripts or Perl's emulation, see <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">perlsec: Security Bugs</a> for information and workarounds.
-<pre>cd /usr/local/apache/htdocs/freeside
-chown -R freeside .
-chmod 4755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.cgi search/*.cgi view/*.cgi</pre>
+        Then the scripts are not running as the freeside freeside user.  See
+the <a href="install.html">New Installation</a> section of the documentation.
   <li>If you receive `can not connect to server' errors using MySQL on a system that doesn't support native threading, you may need to specify the full hostname in your DBI datasource.  See the <a href="http://www.mysql.com/Manual_chapter/manual_Problems.html#Can_not_connect_to_server">MySQL documentation</a>, DBI manpage and the DBD::mysql manpage for details.
   </ul>
 </body>
diff --git a/htdocs/edit/cust_pkg.cgi b/htdocs/edit/cust_pkg.cgi
index ed4200830..afe6f8770 100755
--- a/htdocs/edit/cust_pkg.cgi
+++ b/htdocs/edit/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.4 1999-01-19 05:13:38 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.5 1999-02-07 09:59:18 ivan Exp $
 #
 # this is for changing packages around, not editing things within the package
 #
@@ -25,7 +25,10 @@
 # 98-jun-1
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.4  1999-01-19 05:13:38  ivan
+# Revision 1.5  1999-02-07 09:59:18  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:13:38  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -38,60 +41,62 @@
 #
 
 use strict;
-use vars qw( $cgi %pkg %comment $query $custnum $otaker $p1 @cust_pkg 
-             $cust_main $agent $type_pkgs $count );
+use vars qw( $cgi %pkg %comment $custnum $p1 @cust_pkg 
+             $cust_main $agent $type_pkgs $count %remove_pkg );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
+use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header popurl);
 use FS::part_pkg;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
+use FS::type_pkgs;
 
 foreach (qsearch('part_pkg', {})) {
   $pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
   $comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
 }
 
-#untaint custnum
-
-($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-$custnum = $1;
+$cgi = new CGI;
+&cgisuidsetup($cgi);
 
-$otaker = &getotaker;
+if ( $cgi->param('error') ) {
+  $custnum = $cgi->param('custnum');
+  %remove_pkg = map { $_ => 1 } $cgi->param('remove_pkg');
+} else {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $custnum = $1;
+  undef %remove_pkg;
+}
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Add/Edit Packages", ''), <<END;
-    <FORM ACTION="${p1}process/cust_pkg.cgi" METHOD=POST>
-    <HR>
-END
+print $cgi->header( '-expires' => 'now' ), header("Add/Edit Packages", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
 
-#custnum
-print qq!<INPUT TYPE="hidden" NAME="new_custnum" VALUE="$custnum">!;
+print qq!<FORM ACTION="${p1}process/cust_pkg.cgi" METHOD=POST>!;
 
-#current packages (except cancelled packages)
-@cust_pkg = grep ! $_->getfield('cancel'),
-  qsearch('cust_pkg',{'custnum'=>$custnum});
+print qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
+
+#current packages
+@cust_pkg = qsearch('cust_pkg',{ 'custnum' => $custnum, 'cancel' => '' } );
 
 if (@cust_pkg) {
   print <<END;
-<CENTER><FONT SIZE="+2">Current packages</FONT></CENTER>
-These are packages the customer currently has.  Select those packages you
-wish to remove (if any).<BR><BR>
+Current packages - select to remove (services are moved to a new package below)
+<BR><BR>
 END
 
   my ($count) = 0 ;
-  print qq!<CENTER><TABLE>! ;
+  print qq!<TABLE>! ;
   foreach (@cust_pkg) {
-    print qq!<TR>! if ($count ==0) ;
+    print '<TR>' if $count == 0;
     my($pkgnum,$pkgpart)=( $_->getfield('pkgnum'), $_->getfield('pkgpart') );
-    print qq!<TD><INPUT TYPE="checkbox" NAME="remove_pkg" VALUE="$pkgnum">!,
-          #qq!$pkgnum: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n!,
-          #now you've got to admit this bug was pretty cool
-          qq!$pkgnum: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n!;
+    print qq!<TD><INPUT TYPE="checkbox" NAME="remove_pkg" VALUE="$pkgnum"!;
+    print " CHECKED" if $remove_pkg{$pkgnum};
+    print qq!>$pkgnum: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n!;
     $count ++ ;
     if ($count == 2)
     {
@@ -99,28 +104,25 @@ END
       print qq!</TR>\n! ;
     }
   }
-  print qq!</TABLE></CENTER>! ;
-
-  print "<HR>";
+  print qq!</TABLE><BR><BR>!;
 }
 
 print <<END;
-<CENTER><FONT SIZE="+2">New packages</FONT></CENTER>
-These are packages the customer can purchase.  Specify the quantity to add
-of each package.<BR><BR>
+Order new packages<BR><BR>
 END
 
 $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
 $agent = qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
 
 $count = 0 ;
-print qq!<CENTER><TABLE>! ;
+print qq!<TABLE>! ;
 foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
   my($pkgpart)=$type_pkgs->pkgpart;
   print qq!<TR>! if ($count == 0) ;
+  my $value = $cgi->param("pkg$pkgpart") || 0;
   print <<END;
   <TD>
-  <INPUT TYPE="text" NAME="pkg$pkgpart" VALUE="0" SIZE="2" MAXLENGTH="2">
+  <INPUT TYPE="text" NAME="pkg$pkgpart" VALUE="$value" SIZE="2" MAXLENGTH="2">
   $pkgpart: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n
 END
   $count ++ ;
@@ -130,13 +132,10 @@ END
     $count = 0 ;
   }
 }
-print qq!</TABLE></CENTER>! ;
-
-#otaker
-print qq!<INPUT TYPE="hidden" NAME="new_otaker" VALUE="$otaker">\n!;
+print qq!</TABLE>! ;
 
 #submit
-print qq!<P><CENTER><INPUT TYPE="submit" VALUE="Order"></CENTER>\n!;
+print qq!<P><INPUT TYPE="submit" VALUE="Order">\n!;
 
 print <<END;
     </FORM>
diff --git a/htdocs/edit/part_pkg.cgi b/htdocs/edit/part_pkg.cgi
index e7ac2aeb2..f7ade88c8 100755
--- a/htdocs/edit/part_pkg.cgi
+++ b/htdocs/edit/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.8 1999-01-19 05:13:39 ivan Exp $
+# $Id: part_pkg.cgi,v 1.9 1999-02-07 09:59:19 ivan Exp $
 #
 # part_pkg.cgi: Add/Edit package (output form)
 #
@@ -13,7 +13,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.8  1999-01-19 05:13:39  ivan
+# Revision 1.9  1999-02-07 09:59:19  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.8  1999/01/19 05:13:39  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -42,7 +45,7 @@ use vars qw( $cgi $part_pkg $action $query $hashref $part_svc $count );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
+use FS::Record qw(qsearch qsearchs fields);
 use FS::part_pkg;
 use FS::part_svc;
 use FS::pkg_svc;
@@ -64,24 +67,36 @@ if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
 }
 
 ($query) = $cgi->keywords;
+$action = '';
+$part_pkg = '';
+if ( $cgi->param('error') ) {
+  $part_pkg = new FS::part_pkg ( {
+    map { $_, scalar($cgi->param($_)) } fields('part_pkg')
+  } );
+}
 if ( $cgi->param('clone') ) {
   $action='Custom Pricing';
   my $old_part_pkg =
     qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
-  $part_pkg = $old_part_pkg->clone;
-} elsif ( $query =~ /^(\d+)$/ ) {
-  $action='Edit';
-  $part_pkg=qsearchs('part_pkg',{'pkgpart'=>$1});
+  $part_pkg ||= $old_part_pkg->clone;
+} elsif ( $query && $query =~ /^(\d+)$/ ) {
+  $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
 } else {
-  $action='Add';
-  $part_pkg = new FS::part_pkg {};
+  $part_pkg ||= new FS::part_pkg {};
 }
+$action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
 $hashref = $part_pkg->hashref;
 
 print $cgi->header( '-expires' => 'now' ), header("$action Package Definition", menubar(
   'Main Menu' => popurl(2),
   'View all packages' => popurl(2). 'browse/part_pkg.cgi',
-)), '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>';
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>';
 
 if ( $cgi->param('clone') ) {
   print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
@@ -113,34 +128,34 @@ Enter the quantity of each service this package includes.<BR><BR>
 END
 }
 
-foreach $part_svc ( qsearch('part_svc',{}) ) {
-
-  my($svcpart)=$part_svc->getfield('svcpart');
-  my($pkg_svc)=qsearchs('pkg_svc',{
-    'pkgpart'  => $cgi->param('clone') || $part_pkg->getfield('pkgpart'),
+$count = 0;
+foreach $part_svc ( ( qsearch( 'part_svc', {} ) ) ) {
+  my $svcpart = $part_svc->svcpart;
+  my $pkg_svc = qsearchs( 'pkg_svc', {
+    'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
     'svcpart'  => $svcpart,
-  })  || new FS::pkg_svc({
-    'pkgpart'  => $part_pkg->getfield('pkgpart'),
+  } ) || new FS::pkg_svc ( {
+    'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
     'svcpart'  => $svcpart,
     'quantity' => 0,
   });
-  next unless $pkg_svc;
+  #? #next unless $pkg_svc;
 
-  unless ( $cgi->param('clone') ) {
-    print qq!<TR>! if $count == 0 ;
+  unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) {
+    print '<TR>' if $count == 0 ;
     print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=3 VALUE="!,
-          $pkg_svc->getfield('quantity') || 0,qq!"></TD>!,
-          qq!<TD><A HREF="part_svc.cgi?!,$part_svc->getfield('svcpart'),
+          $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0,
+          qq!"></TD><TD><A HREF="part_svc.cgi?!,$part_svc->svcpart,
           qq!">!, $part_svc->getfield('svc'), "</A></TD>";
-    $count ++ ;
+    $count++;
     if ($count == 2)
     {
-      print qq!</TR>! ;
-      $count = 0 ;
+      print '</TR>';
+      $count = 0;
     }
   } else {
     print qq!<INPUT TYPE="hidden" NAME="pkg_svc$svcpart" VALUE="!,
-          $pkg_svc->getfield('quantity') || 0, qq!">\n!;
+          $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0, qq!">\n!;
   }
 }
 
diff --git a/htdocs/edit/part_referral.cgi b/htdocs/edit/part_referral.cgi
index 6fd75f851..ed3b2678e 100755
--- a/htdocs/edit/part_referral.cgi
+++ b/htdocs/edit/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_referral.cgi,v 1.4 1999-01-19 05:13:41 ivan Exp $
+# $Id: part_referral.cgi,v 1.5 1999-02-07 09:59:20 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23
 #
@@ -12,7 +12,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_referral.cgi,v $
-# Revision 1.4  1999-01-19 05:13:41  ivan
+# Revision 1.5  1999-02-07 09:59:20  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:13:41  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -25,19 +28,20 @@
 #
 
 use strict;
-use vars qw( $cgi $part_referral $action $hashref $p1 );
+use vars qw( $cgi $part_referral $action $hashref $p1 $query );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::part_referral;
-use FS::CGI qw(header menubar);
+use FS::CGI qw(header menubar popurl);
 
 $cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
+($query) = $cgi->keywords;
+if ( $query =~ /^(\d+)$/ ) { #editing
   $part_referral=qsearchs('part_referral',{'refnum'=>$1});
   $action='Edit';
 } else { #adding
@@ -50,11 +54,13 @@ $p1 = popurl(1);
 print $cgi->header( '-expires' => 'now' ), header("$action Referral", menubar(
   'Main Menu' => popurl(2),
   'View all referrals' => popurl(2). "browse/part_referral.cgi",
-)), <<END;
-    <FORM ACTION="${p1}process/part_referral.cgi" METHOD=POST>
-END
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
 
-#display
+print qq!<FORM ACTION="${p1}process/part_referral.cgi" METHOD=POST>!;
 
 print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$hashref->{refnum}">!,
       "Referral #", $hashref->{refnum} ? $hashref->{refnum} : "(NEW)";
diff --git a/htdocs/edit/part_svc.cgi b/htdocs/edit/part_svc.cgi
index 58a1e048e..8a39fc7a9 100755
--- a/htdocs/edit/part_svc.cgi
+++ b/htdocs/edit/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.7 1999-01-19 05:13:42 ivan Exp $
+# $Id: part_svc.cgi,v 1.8 1999-02-07 09:59:21 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.7  1999-01-19 05:13:42  ivan
+# Revision 1.8  1999-02-07 09:59:21  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.7  1999/01/19 05:13:42  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -41,21 +44,31 @@ $cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-($query) = $cgi->keywords;
-if ( $query && $query =~ /^(\d+)$/ ) { #editing
+if ( $cgi->param('error') ) {
+  $part_svc = new FS::part_svc ( {
+    map { $_, scalar($cgi->param($_)) } fields('part_svc')
+  } );
+} elsif ( $cgi->keywords ) {
+  my ($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
   $part_svc=qsearchs('part_svc',{'svcpart'=>$1});
-  $action='Edit';
 } else { #adding
   $part_svc = new  FS::part_svc {};
-  $action='Add';
 }
+$action = $part_svc->svcpart ? 'Edit' : 'Add';
 $hashref = $part_svc->hashref;
 
 $p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header("$action Service Definition", menubar(
   'Main Menu' => $p,
   'View all services' => "${p}browse/part_svc.cgi",
-)), '<FORM ACTION="', popurl(1), 'process/part_svc.cgi" METHOD=POST>';
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print '<FORM ACTION="', popurl(1), 'process/part_svc.cgi" METHOD=POST>';
 
 print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$hashref->{svcpart}">!,
       "Service Part #", $hashref->{svcpart} ? $hashref->{svcpart} : "(NEW)";
diff --git a/htdocs/edit/process/cust_pkg.cgi b/htdocs/edit/process/cust_pkg.cgi
index 639b2f140..2c5eaef97 100755
--- a/htdocs/edit/process/cust_pkg.cgi
+++ b/htdocs/edit/process/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.4 1999-01-25 12:19:10 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.5 1999-02-07 09:59:26 ivan Exp $
 #
 # this is for changing packages around, not for editing things within the
 # package
@@ -21,8 +21,8 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.4  1999-01-25 12:19:10  ivan
-# yet more mod_perl stuff
+# Revision 1.5  1999-02-07 09:59:26  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.3  1999/01/19 05:13:54  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
@@ -37,15 +37,15 @@ use vars qw( $cgi $custnum @remove_pkgnums @pkgparts $pkgpart $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(idiot popurl);
+use FS::CGI qw(popurl);
 use FS::cust_pkg;
 
 $cgi = new CGI; # create form object
-
 &cgisuidsetup($cgi);
+$error = '';
 
 #untaint custnum
-$cgi->param('new_custnum') =~ /^(\d+)$/;
+$cgi->param('custnum') =~ /^(\d+)$/;
 $custnum = $1;
 
 @remove_pkgnums = map {
@@ -54,13 +54,18 @@ $custnum = $1;
 } $cgi->param('remove_pkg');
 
 foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
-  my($num_pkgs)=$cgi->param("pkg$pkgpart");
-  while ( $num_pkgs-- ) {
-    push @pkgparts,$pkgpart;
+  if ( $cgi->param("pkg$pkgpart") =~ /^(\d+)$/ ) {
+    my $num_pkgs = $1;
+    while ( $num_pkgs-- ) {
+      push @pkgparts,$pkgpart;
+    }
+  } else {
+    $error = "Illegal quantity";
+    last;
   }
 }
 
-$error = FS::cust_pkg::order($custnum,\@pkgparts,\@remove_pkgnums);
+$error ||= FS::cust_pkg::order($custnum,\@pkgparts,\@remove_pkgnums);
 
 if ($error) {
   $cgi->param('error', $error);
diff --git a/htdocs/edit/process/part_pkg.cgi b/htdocs/edit/process/part_pkg.cgi
index 3ec31589a..adf4672bd 100755
--- a/htdocs/edit/process/part_pkg.cgi
+++ b/htdocs/edit/process/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.7 1999-01-19 05:13:55 ivan Exp $
+# $Id: part_pkg.cgi,v 1.8 1999-02-07 09:59:27 ivan Exp $
 #
 # process/part_pkg.cgi: Edit package definitions (process form)
 #
@@ -17,7 +17,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.7  1999-01-19 05:13:55  ivan
+# Revision 1.8  1999-02-07 09:59:27  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.7  1999/01/19 05:13:55  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -38,11 +41,11 @@
 #
 
 use strict;
-use vars qw( $cgi $pkgpart $old $new $part_svc );
+use vars qw( $cgi $pkgpart $old $new $part_svc $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(eidiot popurl);
+use FS::CGI qw(popurl);
 use FS::Record qw(qsearch qsearchs fields);
 use FS::part_pkg;
 use FS::pkg_svc;
@@ -61,44 +64,55 @@ $new = new FS::part_pkg ( {
   } fields('part_pkg')
 } );
 
+#most of the stuff below should move to part_pkg.pm
+
+foreach $part_svc ( qsearch('part_svc', {} ) ) {
+  my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
+  unless ( $quantity =~ /^(\d+)$/ ) {
+    $cgi->param('error', "Illegal quantity" );
+    print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
+    exit;
+  }
+}
+
 local $SIG{HUP} = 'IGNORE';
 local $SIG{INT} = 'IGNORE';
 local $SIG{QUIT} = 'IGNORE';
 local $SIG{TERM} = 'IGNORE';
 local $SIG{TSTP} = 'IGNORE';
+local $SIG{PIPE} = 'IGNORE';
 
 if ( $pkgpart ) {
-  my($error)=$new->replace($old);
-  eidiot($error) if $error;
+  $error = $new->replace($old);
 } else {
-  my($error)=$new->insert;
-  eidiot($error) if $error;
-  $pkgpart=$new->getfield('pkgpart');
+  $error = $new->insert;
+  $pkgpart=$new->pkgpart;
+}
+if ( $error ) {
+  $cgi->param('error', $error );
+  print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
+  exit;
 }
 
 foreach $part_svc (qsearch('part_svc',{})) {
-# don't update non-changing records in part_svc (causing harmless but annoying
-# "Records identical" errors). ivan@sisd.com 98-jan-19
-  #my($quantity)=$cgi->param('pkg_svc'. $part_svc->getfield('svcpart')),
-  my($quantity)=$cgi->param('pkg_svc'. $part_svc->svcpart) || 0,
-  my($old_pkg_svc)=qsearchs('pkg_svc',{
-    'pkgpart'  => $pkgpart,
-    'svcpart'  => $part_svc->getfield('svcpart'),
-  });
-  my($old_quantity)=$old_pkg_svc ? $old_pkg_svc->quantity : 0;
+  my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
+  my $old_pkg_svc = qsearchs('pkg_svc', {
+    'pkgpart' => $pkgpart,
+    'svcpart' => $part_svc->svcpart,
+  } );
+  my $old_quantity = $old_pkg_svc ? $old_pkg_svc->quantity : 0;
   next unless $old_quantity != $quantity; #!here
-  my($new_pkg_svc)=new FS::pkg_svc({
+  my $new_pkg_svc = new FS::pkg_svc( {
     'pkgpart'  => $pkgpart,
-    'svcpart'  => $part_svc->getfield('svcpart'),
-    #'quantity' => $cgi->param('pkg_svc'. $part_svc->getfield('svcpart')),
+    'svcpart'  => $part_svc->svcpart,
     'quantity' => $quantity, 
-  });
-  if ($old_pkg_svc) {
-    my($error)=$new_pkg_svc->replace($old_pkg_svc);
-    eidiot($error) if $error;
+  } );
+  if ( $old_pkg_svc ) {
+    my $myerror = $new_pkg_svc->replace($old_pkg_svc);
+    die $myerror if $myerror;
   } else {
-    my($error)=$new_pkg_svc->insert;
-    eidiot($error) if $error;
+    my $myerror = $new_pkg_svc->insert;
+    die $myerror if $myerror;
   }
 }
 
@@ -109,8 +123,8 @@ unless ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
   my %hash = $old_cust_pkg->hash;
   $hash{'pkgpart'} = $pkgpart;
   my($new_cust_pkg) = new FS::cust_pkg \%hash;
-  my $error = $new_cust_pkg->replace($old_cust_pkg);
-  eidiot "Error modifying cust_pkg record: $error\n" if $error;
+  my $myerror = $new_cust_pkg->replace($old_cust_pkg);
+  die "Error modifying cust_pkg record: $myerror\n" if $myerror;
   print $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new_cust_pkg->custnum);
 }
 
diff --git a/htdocs/edit/process/part_referral.cgi b/htdocs/edit/process/part_referral.cgi
index 9886015f9..cde27ede1 100755
--- a/htdocs/edit/process/part_referral.cgi
+++ b/htdocs/edit/process/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_referral.cgi,v 1.5 1999-01-19 05:13:56 ivan Exp $
+# $Id: part_referral.cgi,v 1.6 1999-02-07 09:59:28 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_referral.cgi,v $
-# Revision 1.5  1999-01-19 05:13:56  ivan
+# Revision 1.6  1999-02-07 09:59:28  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.5  1999/01/19 05:13:56  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -25,13 +28,13 @@
 #
 
 use strict;
-use vars qw( $cgi $refnum $new );
+use vars qw( $cgi $refnum $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs fields);
 use FS::part_referral;
-use FS::CGI qw(popurl eidiot);
+use FS::CGI qw(popurl);
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
@@ -45,15 +48,18 @@ $new = new FS::part_referral ( {
 } );
 
 if ( $refnum ) {
-  my($old)=qsearchs('part_referral',{'refnum'=>$refnum});
-  eidiot("(Old) Record not found!") unless $old;
-  my($error)=$new->replace($old);
-  eidiot($error) if $error;
+  my $old = qsearchs( 'part_referral', { 'refnum' =>$ refnum } );
+  die "(Old) Record not found!" unless $old;
+  $error = $new->replace($old);
 } else {
-  my($error)=$new->insert;
-  eidiot($error) if $error;
+  $error = $new->insert;
 }
+$refnum=$new->refnum;
 
-$refnum=$new->getfield('refnum');
-print $cgi->redirect(popurl(3). "browse/part_referral.cgi");
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "part_referral.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "browse/part_referral.cgi");
+}
 
diff --git a/htdocs/edit/process/part_svc.cgi b/htdocs/edit/process/part_svc.cgi
index e25192c1c..0b3e2cd1c 100755
--- a/htdocs/edit/process/part_svc.cgi
+++ b/htdocs/edit/process/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.6 1999-01-19 05:13:57 ivan Exp $
+# $Id: part_svc.cgi,v 1.7 1999-02-07 09:59:29 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.6  1999-01-19 05:13:57  ivan
+# Revision 1.7  1999-02-07 09:59:29  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.6  1999/01/19 05:13:57  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -28,13 +31,13 @@
 #
 
 use strict;
-use vars qw ( $cgi $svcpart $old $new );
+use vars qw ( $cgi $svcpart $old $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs fields);
 use FS::part_svc;
-use FS::CGI qw(eidiot popurl);
+use FS::CGI qw(popurl);
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
@@ -51,13 +54,16 @@ $new = new FS::part_svc ( {
 } );
 
 if ( $svcpart ) {
-  my($error)=$new->replace($old);
-  eidiot($error) if $error;
+  $error = $new->replace($old);
 } else {
-  my($error)=$new->insert;
-  eidiot($error) if $error;
+  $error = $new->insert;
   $svcpart=$new->getfield('svcpart');
 }
 
-print $cgi->redirect(popurl(3)."browse/part_svc.cgi");
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "part_svc.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3)."browse/part_svc.cgi");
+}
 
diff --git a/htdocs/edit/process/svc_acct.cgi b/htdocs/edit/process/svc_acct.cgi
index 7fd87ea84..ba231ece3 100755
--- a/htdocs/edit/process/svc_acct.cgi
+++ b/htdocs/edit/process/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.4 1999-01-19 05:13:58 ivan Exp $
+# $Id: svc_acct.cgi,v 1.5 1999-02-07 09:59:30 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
@@ -23,7 +23,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.4  1999-01-19 05:13:58  ivan
+# Revision 1.5  1999-02-07 09:59:30  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:13:58  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -35,11 +38,11 @@
 #
 
 use strict;
-use vars qw( $cgi $svcnum $old $new );
+use vars qw( $cgi $svcnum $old $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(eidiot popurl);
+use FS::CGI qw(popurl);
 use FS::Record qw(qsearchs fields);
 use FS::svc_acct;
 
@@ -68,15 +71,16 @@ $new = new FS::svc_acct ( {
 } );
 
 if ( $svcnum ) {
-  my($error) = $new->replace($old);
-  &eidiot($error) if $error;
+  $error = $new->replace($old);
 } else {
-  my($error) = $new->insert;
-  &eidiot($error) if $error;
-  $svcnum = $new->getfield('svcnum');
+  $error = $new->insert;
+  $svcnum = $new->svcnum;
 }
 
-#no errors, view account
-print $cgi->redirect(popurl(3). "view/svc_acct.cgi?" . $svcnum );
-
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_acct.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/svc_acct.cgi?" . $svcnum );
+}
 
diff --git a/htdocs/edit/process/svc_acct_pop.cgi b/htdocs/edit/process/svc_acct_pop.cgi
index 414c6fb28..763bca4a8 100755
--- a/htdocs/edit/process/svc_acct_pop.cgi
+++ b/htdocs/edit/process/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.5 1999-01-19 05:13:59 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.6 1999-02-07 09:59:31 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.5  1999-01-19 05:13:59  ivan
+# Revision 1.6  1999-02-07 09:59:31  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.5  1999/01/19 05:13:59  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -25,13 +28,13 @@
 #
 
 use strict;
-use vars qw( $cgi $popnum $old $new );
+use vars qw( $cgi $popnum $old $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs fields);
 use FS::svc_acct_pop;
-use FS::CGI qw(popurl eidiot);
+use FS::CGI qw(popurl);
 
 $cgi = new CGI; # create form object
 
@@ -48,12 +51,16 @@ $new = new FS::svc_acct_pop ( {
 } );
 
 if ( $popnum ) {
-  my($error)=$new->replace($old);
-  eidiot($error) if $error;
+  $error = $new->replace($old);
 } else {
-  my($error)=$new->insert;
-  eidiot($error) if $error;
+  $error = $new->insert;
   $popnum=$new->getfield('popnum');
 }
-print $cgi->redirect(popurl(3). "browse/svc_acct_pop.cgi");
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_acct_pop.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "browse/svc_acct_pop.cgi");
+}
 
diff --git a/htdocs/edit/process/svc_acct_sm.cgi b/htdocs/edit/process/svc_acct_sm.cgi
index 53650c888..5fefeafdb 100755
--- a/htdocs/edit/process/svc_acct_sm.cgi
+++ b/htdocs/edit/process/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.4 1999-01-19 05:14:00 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.5 1999-02-07 09:59:32 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct_sm.cgi
@@ -24,7 +24,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.4  1999-01-19 05:14:00  ivan
+# Revision 1.5  1999-02-07 09:59:32  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:14:00  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -42,6 +45,7 @@ use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs fields);
 use FS::svc_acct_sm;
+use FS::CGI qw(popurl);
 
 $cgi = new CGI;
 cgisuidsetup($cgi);
@@ -52,14 +56,14 @@ $svcnum =$1;
 $old = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
 
 #unmunge domsvc and domuid
-$cgi->param('domsvc',(split(/:/, $cgi->param('domsvc') ))[0] );
-$cgi->param('domuid',(split(/:/, $cgi->param('domuid') ))[0] );
+#$cgi->param('domsvc',(split(/:/, $cgi->param('domsvc') ))[0] );
+#$cgi->param('domuid',(split(/:/, $cgi->param('domuid') ))[0] );
 
 $new = new FS::svc_acct_sm ( {
   map {
     ($_, scalar($cgi->param($_)));
   #} qw(svcnum pkgnum svcpart domuser domuid domsvc)
-  } ( fields('svc_acct_sm'), qw( pkgnum svcpart) )
+  } ( fields('svc_acct_sm'), qw( pkgnum svcpart ) )
 } );
 
 if ( $svcnum ) {
@@ -69,9 +73,10 @@ if ( $svcnum ) {
   $svcnum = $new->getfield('svcnum');
 } 
 
-unless ($error) {
-  print $cgi->redirect(popurl(3). "view/svc_acct_sm.cgi?$svcnum");
+if ($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_acct_sm.cgi?". $cgi->query_string );
 } else {
-  idiot($error);
+  print $cgi->redirect(popurl(3). "view/svc_acct_sm.cgi?$svcnum");
 }
 
diff --git a/htdocs/edit/process/svc_domain.cgi b/htdocs/edit/process/svc_domain.cgi
index 4c96823e2..fe3c6f7a1 100755
--- a/htdocs/edit/process/svc_domain.cgi
+++ b/htdocs/edit/process/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.4 1999-01-19 05:14:01 ivan Exp $
+# $Id: svc_domain.cgi,v 1.5 1999-02-07 09:59:33 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -20,7 +20,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.4  1999-01-19 05:14:01  ivan
+# Revision 1.5  1999-02-07 09:59:33  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:14:01  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -36,8 +39,9 @@ use vars qw( $cgi $svcnum $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs);
+use FS::Record qw(qsearchs fields);
 use FS::svc_domain;
+use FS::CGI qw(popurl);
 
 #remove this to actually test the domains!
 $FS::svc_domain::whois_hack = 1;
@@ -66,9 +70,10 @@ if ($cgi->param('legal') ne "Yes") {
   $svcnum=$new->svcnum;
 }
 
-unless ($error) {
-  print $cgi->redirect(popurl(3). "view/svc_domain.cgi?$svcnum");
+if ($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_domain.cgi?". $cgi->query_string );
 } else {
-  idiot($error);
+  print $cgi->redirect(popurl(3). "view/svc_domain.cgi?$svcnum");
 }
 
diff --git a/htdocs/edit/svc_acct.cgi b/htdocs/edit/svc_acct.cgi
index af18654ac..876d7be5a 100755
--- a/htdocs/edit/svc_acct.cgi
+++ b/htdocs/edit/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.6 1999-01-19 05:13:43 ivan Exp $
+# $Id: svc_acct.cgi,v 1.7 1999-02-07 09:59:22 ivan Exp $
 #
 # Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -18,7 +18,10 @@
 # use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.6  1999-01-19 05:13:43  ivan
+# Revision 1.7  1999-02-07 09:59:22  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.6  1999/01/19 05:13:43  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -35,7 +38,7 @@
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
-             $part_svc $query $svc $otaker $username $password $ulen $ulen2 $p1
+             $part_svc $svc $otaker $username $password $ulen $ulen2 $p1
              $popnum $uid $gid $finger $dir $shell $quota $slipip );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
@@ -51,57 +54,64 @@ $cgi = new CGI;
 $conf = new FS::Conf;
 @shells = $conf->config('shells');
 
-($query) = $cgi->keywords;
-if ( $query =~ /^(\d+)$/ ) { #editing
-
-  $svcnum=$1;
-  $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svcnum})
-    or die "Unknown (svc_acct) svcnum!";
-
-  my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-    or die "Unknown (cust_svc) svcnum!";
-
-  $pkgnum=$cust_svc->pkgnum;
-  $svcpart=$cust_svc->svcpart;
-
+if ( $cgi->param('error') ) {
+  $svc_acct = new FS::svc_acct ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_acct')
+  } );
+  $svcnum = $svc_acct->svcnum;
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
   $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
   die "No part_svc entry!" unless $part_svc;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $svcnum=$1;
+    $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svcnum})
+      or die "Unknown (svc_acct) svcnum!";
 
-  $action="Edit";
-
-} else { #adding
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+      or die "Unknown (cust_svc) svcnum!";
 
-  $svc_acct = new FS::svc_acct({}); 
+    $pkgnum=$cust_svc->pkgnum;
+    $svcpart=$cust_svc->svcpart;
 
-  foreach $_ (split(/-/,$query)) {
-    $pkgnum=$1 if /^pkgnum(\d+)$/;
-    $svcpart=$1 if /^svcpart(\d+)$/;
-  }
-  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  die "No part_svc entry!" unless $part_svc;
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
 
-  $svcnum='';
+  } else { #adding
 
-  #set gecos
-  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-  if ($cust_pkg) {
-    my($cust_main)=qsearchs('cust_main',{'custnum'=> $cust_pkg->custnum } );
-    $svc_acct->setfield('finger',
-      $cust_main->getfield('first') . " " . $cust_main->getfield('last')
-    ) ;
-  }
+    $svc_acct = new FS::svc_acct({}); 
 
-  #set fixed and default fields from part_svc
-  my($field);
-  foreach $field ( fields('svc_acct') ) {
-    if ( $part_svc->getfield('svc_acct__'. $field. '_flag') ne '' ) {
-      $svc_acct->setfield($field,$part_svc->getfield('svc_acct__'. $field) );
+    foreach $_ (split(/-/,$query)) {
+      $pkgnum=$1 if /^pkgnum(\d+)$/;
+      $svcpart=$1 if /^svcpart(\d+)$/;
+    }
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+    $svcnum='';
+
+    #set gecos
+    my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+    if ($cust_pkg) {
+      my($cust_main)=qsearchs('cust_main',{'custnum'=> $cust_pkg->custnum } );
+      $svc_acct->setfield('finger',
+        $cust_main->getfield('first') . " " . $cust_main->getfield('last')
+      ) ;
     }
-  }
 
-  $action="Add";
+    #set fixed and default fields from part_svc
+    my($field);
+    foreach $field ( fields('svc_acct') ) {
+      if ( $part_svc->getfield('svc_acct__'. $field. '_flag') ne '' ) {
+        $svc_acct->setfield($field,$part_svc->getfield('svc_acct__'. $field) );
+      }
+    }
 
+  }
 }
+$action = $svcnum ? 'Edit' : 'Add';
 
 $svc = $part_svc->getfield('svc');
 
@@ -116,7 +126,13 @@ $ulen = $svc_acct->dbdef_table->column('username')->length;
 $ulen2 = $ulen+2;
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("$action $svc account"), <<END;
+print $cgi->header( '-expires' => 'now' ), header("$action $svc account");
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print <<END;
     <FORM ACTION="${p1}process/svc_acct.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
       <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
diff --git a/htdocs/edit/svc_acct_pop.cgi b/htdocs/edit/svc_acct_pop.cgi
index 115c46745..41a163ebb 100755
--- a/htdocs/edit/svc_acct_pop.cgi
+++ b/htdocs/edit/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.6 1999-01-19 05:13:44 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.7 1999-02-07 09:59:23 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8 
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.6  1999-01-19 05:13:44  ivan
+# Revision 1.7  1999-02-07 09:59:23  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.6  1999/01/19 05:13:44  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -34,31 +37,39 @@ use vars qw( $cgi $svc_acct_pop $action $query $hashref $p1 );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
+use FS::Record qw(qsearch qsearchs fields);
 use FS::svc_acct_pop;
-use FS::CGI qw(header menubar);
+use FS::CGI qw(header menubar popurl);
 
 $cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-($query)=$cgi->keywords;
-if ( $query =~ /^(\d+)$/ ) { #editing
+if ( $cgi->param('error') ) {
+  $svc_acct_pop = new FS::svc_acct_pop ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_acct_pop')
+  } );
+} elsif ( $cgi->keywords ) { #editing
+  my($query)=$cgi->keywords;
+  $query =~ /^(\d+)$/;
   $svc_acct_pop=qsearchs('svc_acct_pop',{'popnum'=>$1});
-  $action='Edit';
 } else { #adding
   $svc_acct_pop = new FS::svc_acct_pop {};
-  $action='Add';
 }
+$action = $svc_acct_pop->popnum ? 'Edit' : 'Add';
 $hashref = $svc_acct_pop->hashref;
 
 $p1 = popurl(1);
 print $cgi->header( '-expires' => 'now' ), header("$action POP", menubar(
   'Main Menu' => popurl(2),
   'View all POPs' => popurl(2). "browse/svc_acct_pop.cgi",
-)), <<END;
-    <FORM ACTION="${p1}process/svc_acct_pop.cgi" METHOD=POST>
-END
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/svc_acct_pop.cgi" METHOD=POST>!;
 
 #display
 
@@ -68,7 +79,7 @@ print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$hashref->{popnum}">!,
 print <<END;
 <PRE>
 City      <INPUT TYPE="text" NAME="city" SIZE=32 VALUE="$hashref->{city}">
-State     <INPUT TYPE="text" NAME="state" SIZE=3 MAXLENGTH=2 VALUE="$hashref->{state}">
+State     <INPUT TYPE="text" NAME="state" SIZE=16 MAXLENGTH=16 VALUE="$hashref->{state}">
 Area Code <INPUT TYPE="text" NAME="ac" SIZE=4 MAXLENGTH=3 VALUE="$hashref->{ac}">
 Exchange  <INPUT TYPE="text" NAME="exch" SIZE=4 MAXLENGTH=3 VALUE="$hashref->{exch}">
 </PRE>
diff --git a/htdocs/edit/svc_acct_sm.cgi b/htdocs/edit/svc_acct_sm.cgi
index 0de4fa1ac..d68d67c3a 100755
--- a/htdocs/edit/svc_acct_sm.cgi
+++ b/htdocs/edit/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.7 1999-01-19 05:13:45 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.8 1999-02-07 09:59:24 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct_sm.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -35,7 +35,10 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-26
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.7  1999-01-19 05:13:45  ivan
+# Revision 1.8  1999-02-07 09:59:24  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.7  1999/01/19 05:13:45  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -73,49 +76,55 @@ $cgi = new CGI;
 $conf = new FS::Conf;
 $mydomain = $conf->config('domain');
 
-
-($query) = $cgi->keywords;
-if ( $query =~ /^(\d+)$/ ) { #editing
-
-  $svcnum=$1;
-  $svc_acct_sm=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum})
-    or die "Unknown (svc_acct_sm) svcnum!";
-
-  my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-    or die "Unknown (cust_svc) svcnum!";
-
-  $pkgnum=$cust_svc->pkgnum;
-  $svcpart=$cust_svc->svcpart;
-  
+if ( $cgi->param('error') ) {
+  $svc_acct_sm = new FS::svc_acct_sm ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_acct_sm')
+  } );
+  $svcnum = $svc_acct_sm->svcnum;
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
   $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
   die "No part_svc entry!" unless $part_svc;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $svcnum=$1;
+    $svc_acct_sm=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum})
+      or die "Unknown (svc_acct_sm) svcnum!";
 
-  $action="Edit";
-
-} else { #adding
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+      or die "Unknown (cust_svc) svcnum!";
 
-  $svc_acct_sm = new FS::svc_acct_sm({});
+    $pkgnum=$cust_svc->pkgnum;
+    $svcpart=$cust_svc->svcpart;
+  
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
 
-  foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
-    $pkgnum=$1 if /^pkgnum(\d+)$/;
-    $svcpart=$1 if /^svcpart(\d+)$/;
-  }
-  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  die "No part_svc entry!" unless $part_svc;
+  } else { #adding
 
-  $svcnum='';
+    $svc_acct_sm = new FS::svc_acct_sm({});
 
-  #set fixed and default fields from part_svc
-  my($field);
-  foreach $field ( fields('svc_acct_sm') ) {
-    if ( $part_svc->getfield('svc_acct_sm__'. $field. '_flag') ne '' ) {
-      $svc_acct_sm->setfield($field,$part_svc->getfield('svc_acct_sm__'. $field) );
+    foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
+      $pkgnum=$1 if /^pkgnum(\d+)$/;
+      $svcpart=$1 if /^svcpart(\d+)$/;
     }
-  }
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
 
-  $action='Add';
+    $svcnum='';
+
+    #set fixed and default fields from part_svc
+    my($field);
+    foreach $field ( fields('svc_acct_sm') ) {
+      if ( $part_svc->getfield('svc_acct_sm__'. $field. '_flag') ne '' ) {
+        $svc_acct_sm->setfield($field,$part_svc->getfield('svc_acct_sm__'. $field) );
+      }
+    }
 
+  }
 }
+$action = $svc_acct_sm->svcnum ? 'Edit' : 'Add';
 
 if ($pkgnum) {
 
@@ -175,9 +184,13 @@ if ($pkgnum) {
 }
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Mail Alias $action", ''), <<END;
-    <FORM ACTION="${p1}process/svc_acct_sm.cgi" METHOD=POST>
-END
+print $cgi->header( '-expires' => 'now' ), header("Mail Alias $action", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/svc_acct_sm.cgi" METHOD=POST>!;
 
 #display
 
@@ -206,14 +219,16 @@ print qq!\n\nMail to <INPUT TYPE="text" NAME="domuser" VALUE="$domuser"> <I>( *
 #domsvc
 print qq! \@ <SELECT NAME="domsvc" SIZE=1>!;
 foreach $_ (keys %domain) {
-  print "<OPTION", $_ eq $domsvc ? " SELECTED" : "", ">$_: $domain{$_}";
+  print "<OPTION", $_ eq $domsvc ? " SELECTED" : "",
+        qq! VALUE="$_">$domain{$_}!;
 }
 print "</SELECT>";
 
 #uid
 print qq!\nforwards to <SELECT NAME="domuid" SIZE=1>!;
 foreach $_ (keys %username) {
-  print "<OPTION", ($_ eq $domuid) ? " SELECTED" : "", ">$_: $username{$_}";
+  print "<OPTION", ($_ eq $domuid) ? " SELECTED" : "",
+        qq! VALUE="$_">$username{$_}!;
 }
 print "</SELECT>\@$mydomain mailbox.";
 
diff --git a/htdocs/edit/svc_domain.cgi b/htdocs/edit/svc_domain.cgi
index 45ff8bb6c..05cabba2b 100755
--- a/htdocs/edit/svc_domain.cgi
+++ b/htdocs/edit/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.7 1999-01-19 05:13:46 ivan Exp $
+# $Id: svc_domain.cgi,v 1.8 1999-02-07 09:59:25 ivan Exp $
 #
 # Usage: svc_domain.cgi pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_domain.cgi?pkgnum{pkgnum}-svcpart{svcpart}
@@ -17,7 +17,10 @@
 # no GOV in instructions ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.7  1999-01-19 05:13:46  ivan
+# Revision 1.8  1999-02-07 09:59:25  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.7  1999/01/19 05:13:46  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -41,7 +44,7 @@
 
 use strict;
 use vars qw( $cgi $action $svcnum $svc_domain $pkgnum $svcpart $part_svc
-             $query $svc $otaker $domain $p1 );
+             $svc $otaker $domain $p1 $kludge_action $purpose );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
@@ -52,48 +55,59 @@ use FS::svc_domain;
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
-($query) = $cgi->keywords;
-if ( $query =~ /^(\d+)$/ ) { #editing
-
-  $svcnum=$1;
-  $svc_domain=qsearchs('svc_domain',{'svcnum'=>$svcnum})
-    or die "Unknown (svc_domain) svcnum!";
-
-  my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-    or die "Unknown (cust_svc) svcnum!";
+if ( $cgi->param('error') ) {
+  $svc_domain = new FS::svc_domain ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_domain')
+  } );
+  $svcnum = $svc_domain->svcnum;
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
+  $kludge_action = $cgi->param('action');
+  $purpose = $cgi->param('purpose');
+  $part_svc = qsearchs('part_svc', { 'svcpart' => $svcpart } );
+  die "No part_svc entry!" unless $part_svc;
+} else {
+  $kludge_action = '';
+  $purpose = '';
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $svcnum=$1;
+    $svc_domain=qsearchs('svc_domain',{'svcnum'=>$svcnum})
+      or die "Unknown (svc_domain) svcnum!";
 
-  $pkgnum=$cust_svc->pkgnum;
-  $svcpart=$cust_svc->svcpart;
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+      or die "Unknown (cust_svc) svcnum!";
 
-  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  die "No part_svc entry!" unless $part_svc;
+    $pkgnum=$cust_svc->pkgnum;
+    $svcpart=$cust_svc->svcpart;
 
-  $action="Edit";
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
 
-} else { #adding
+  } else { #adding
 
-  $svc_domain = new FS::svc_domain({});
+    $svc_domain = new FS::svc_domain({});
   
-  foreach $_ (split(/-/,$query)) {
-    $pkgnum=$1 if /^pkgnum(\d+)$/;
-    $svcpart=$1 if /^svcpart(\d+)$/;
-  }
-  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  die "No part_svc entry!" unless $part_svc;
+    foreach $_ (split(/-/,$query)) {
+      $pkgnum=$1 if /^pkgnum(\d+)$/;
+      $svcpart=$1 if /^svcpart(\d+)$/;
+    }
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
 
-  $svcnum='';
+    $svcnum='';
 
-  #set fixed and default fields from part_svc
-  my($field);
-  foreach $field ( fields('svc_domain') ) {
-    if ( $part_svc->getfield('svc_domain__'. $field. '_flag') ne '' ) {
-      $svc_domain->setfield($field,$part_svc->getfield('svc_domain__'. $field) );
+    #set fixed and default fields from part_svc
+    my($field);
+    foreach $field ( fields('svc_domain') ) {
+      if ( $part_svc->getfield('svc_domain__'. $field. '_flag') ne '' ) {
+        $svc_domain->setfield($field,$part_svc->getfield('svc_domain__'. $field) );
+      }
     }
-  }
-
-  $action="Add";
 
+  }
 }
+$action = $svcnum ? 'Edit' : 'Add';
 
 $svc = $part_svc->getfield('svc');
 
@@ -102,20 +116,33 @@ $otaker = getotaker;
 $domain = $svc_domain->domain;
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("$action $svc", ''), <<END;
+print $cgi->header( '-expires' => 'now' ), header("$action $svc", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print <<END;
     <FORM ACTION="${p1}process/svc_domain.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
       <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
       <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
-      <INPUT TYPE="radio" NAME="action" VALUE="N">New
-      <BR><INPUT TYPE="radio" NAME="action" VALUE="M">Transfer
+END
+
+print qq!<INPUT TYPE="radio" NAME="action" VALUE="N"!;
+print ' CHECKED' if $kludge_action eq 'N';
+print qq!>New!;
+print qq!<BR><INPUT TYPE="radio" NAME="action" VALUE="M"!;
+print ' CHECKED' if $kludge_action eq 'M';
+print qq!>Transfer!;
 
+print <<END;
 <P>Customer agrees to be bound by NSI's
 <A HREF="http://rs.internic.net/help/agreement.txt">
 Domain Name Registration Agreement</A>
 <SELECT NAME="legal" SIZE=1><OPTION SELECTED>No<OPTION>Yes</SELECT>
 <P>Domain <INPUT TYPE="text" NAME="domain" VALUE="$domain" SIZE=28 MAXLENGTH=26>
-<BR>Purpose/Description: <INPUT TYPE="text" NAME="purpose" VALUE="" SIZE=64>
+<BR>Purpose/Description: <INPUT TYPE="text" NAME="purpose" VALUE="$purpose" SIZE=64>
 <P><CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>
 <UL>
   <LI>COM is for commercial, for-profit organziations
diff --git a/htdocs/misc/cancel-unaudited.cgi b/htdocs/misc/cancel-unaudited.cgi
index b8729440f..d54674660 100755
--- a/htdocs/misc/cancel-unaudited.cgi
+++ b/htdocs/misc/cancel-unaudited.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cancel-unaudited.cgi,v 1.4 1999-01-19 05:14:03 ivan Exp $
+# $Id: cancel-unaudited.cgi,v 1.5 1999-02-07 09:59:34 ivan Exp $
 #
 # Usage: cancel-unaudited.cgi svcnum
 #        http://server.name/path/cancel-unaudited.cgi pkgnum
@@ -18,7 +18,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cancel-unaudited.cgi,v $
-# Revision 1.4  1999-01-19 05:14:03  ivan
+# Revision 1.5  1999-02-07 09:59:34  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:14:03  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -48,7 +51,7 @@ $query =~ /^(\d+)$/;
 $svcnum = $1;
 
 $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
-&eidiot("Unknown svcnum!") unless $svc_acct;
+die "Unknown svcnum!" unless $svc_acct;
 
 $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
 &eidiot(qq!This account has already been audited.  Cancel the 
@@ -70,5 +73,5 @@ $error = $svc_acct->delete;
 $error = $cust_svc->delete;
 &eidiot($error) if $error;
 
-$cgi->redirect(popurl(2));
+print $cgi->redirect(popurl(2));
 
diff --git a/htdocs/misc/process/link.cgi b/htdocs/misc/process/link.cgi
index c20b47373..808299415 100755
--- a/htdocs/misc/process/link.cgi
+++ b/htdocs/misc/process/link.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: link.cgi,v 1.3 1999-01-19 05:14:10 ivan Exp $
+# $Id: link.cgi,v 1.4 1999-02-07 09:59:35 ivan Exp $
 #
 # ivan@voicenet.com 97-feb-5
 #
@@ -12,7 +12,10 @@
 # can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
 #
 # $Log: link.cgi,v $
-# Revision 1.3  1999-01-19 05:14:10  ivan
+# Revision 1.4  1999-02-07 09:59:35  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.3  1999/01/19 05:14:10  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -24,7 +27,7 @@ use strict;
 use vars qw ( $cgi $old $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
-use FS::CGI qw(popurlidiot);
+use FS::CGI qw(popurl idiot);
 use FS::UID qw(cgisuidsetup);
 use FS::cust_svc;
 use FS::Record qw(qsearchs);
@@ -41,7 +44,7 @@ unless ( $svcnum ) {
   my($svcdb) = $part_svc->getfield('svcdb');
   $cgi->param('link_field') =~ /^(\w+)$/; my($link_field)=$1;
   my($svc_acct)=qsearchs($svcdb,{$link_field => $cgi->param('link_value') });
-  idiot("$link_field not found!") unless $svc_acct;
+  eidiot("$link_field not found!") unless $svc_acct;
   $svcnum=$svc_acct->svcnum;
 }
 
diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index 55139e9a8..ed7b71425 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.7 1999-01-25 12:19:11 ivan Exp $
+# $Id: cust_main.cgi,v 1.8 1999-02-07 09:59:36 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -19,7 +19,10 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.7  1999-01-25 12:19:11  ivan
+# Revision 1.8  1999-02-07 09:59:36  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.7  1999/01/25 12:19:11  ivan
 # yet more mod_perl stuff
 #
 # Revision 1.6  1999/01/19 05:14:12  ivan
@@ -52,7 +55,7 @@ use IO::Handle;
 use String::Approx qw(amatch);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar idiot popurl table);
+use FS::CGI qw(header menubar eidiot popurl table);
 use FS::cust_main;
 
 $cgi = new CGI;
@@ -83,8 +86,7 @@ if ( scalar(@cust_main) == 1 ) {
   print $cgi->redirect(popurl(2). "view/cust_main.cgi?". $cust_main[0]->custnum);
   exit;
 } elsif ( scalar(@cust_main) == 0 ) {
-  idiot "No matching customers found!\n";
-  exit;
+  eidiot "No matching customers found!\n";
 } else { 
 
   my($total)=scalar(@cust_main);
@@ -156,7 +158,6 @@ END
  
   print <<END;
     </TABLE>
-    </CENTER>
   </BODY>
 </HTML>
 END
@@ -183,7 +184,7 @@ sub cardsearch {
 
   my($card)=$cgi->param('card');
   $card =~ s/\D//g;
-  $card =~ /^(\d{13,16})$/ or do { idiot "Illegal card number\n"; exit; };
+  $card =~ /^(\d{13,16})$/ or eidiot "Illegal card number\n";
   my($payinfo)=$1;
 
   push @cust_main, qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'CARD'});
@@ -197,7 +198,7 @@ sub lastsearch {
   }
 
   $cgi->param('last_text') =~ /^([\w \,\.\-\']*)$/
-    or do { idiot "Illegal last name"; exit; };
+    or eidiot "Illegal last name";
   my($last)=$1;
 
   if ( $last_type{'Exact'}
@@ -237,7 +238,7 @@ sub companysearch {
   };
 
   $cgi->param('company_text') =~ /^([\w \,\.\-\']*)$/
-    or do { idiot "Illegal company"; exit; };
+    or eidiot "Illegal company";
   my($company)=$1;
 
   if ( $company_type{'Exact'}
diff --git a/htdocs/search/cust_pkg.cgi b/htdocs/search/cust_pkg.cgi
index 6685aea70..b7afc62a5 100755
--- a/htdocs/search/cust_pkg.cgi
+++ b/htdocs/search/cust_pkg.cgi
@@ -1,11 +1,14 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.6 1999-01-19 05:14:13 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.7 1999-02-07 09:59:37 ivan Exp $
 #
 # based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.6  1999-01-19 05:14:13  ivan
+# Revision 1.7  1999-02-07 09:59:37  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.6  1999/01/19 05:14:13  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -29,7 +32,11 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header idiot popurl);
+use FS::CGI qw(header eidiot popurl);
+use FS::cust_pkg;
+use FS::pkg_svc;
+use FS::cust_svc;
+use FS::cust_main;
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
@@ -71,8 +78,7 @@ if ( scalar(@cust_pkg) == 1 ) {
   print $cgi->redirect(popurl(2). "view/cust_pkg.cgi?$pkgnum");
   exit;
 } elsif ( scalar(@cust_pkg) == 0 ) { #error
-  &idiot("No packages found");
-  exit;
+  eidiot("No packages found");
 } else {
   my($total)=scalar(@cust_pkg);
   print $cgi->header( '-expires' => 'now' ), header('Package Search Results',''), <<END;
@@ -110,7 +116,6 @@ END
  
   print <<END;
     </TABLE>
-    </CENTER>
   </BODY>
 </HTML>
 END
diff --git a/htdocs/search/svc_acct.cgi b/htdocs/search/svc_acct.cgi
index f3305080b..93b03e56d 100755
--- a/htdocs/search/svc_acct.cgi
+++ b/htdocs/search/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.6 1999-01-19 05:14:14 ivan Exp $
+# $Id: svc_acct.cgi,v 1.7 1999-02-07 09:59:38 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
@@ -23,7 +23,10 @@
 # give service and customer info too ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.6  1999-01-19 05:14:14  ivan
+# Revision 1.7  1999-02-07 09:59:38  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.6  1999/01/19 05:14:14  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -47,7 +50,7 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header idiot popurl);
+use FS::CGI qw(header eidiot popurl);
 use FS::svc_acct;
 use FS::cust_main;
 
@@ -93,8 +96,7 @@ if ( scalar(@svc_acct) == 1 ) {
   print $cgi->redirect(popurl(2). "view/svc_acct.cgi?$svcnum");  #redirect
   exit;
 } elsif ( scalar(@svc_acct) == 0 ) { #error
-  idiot("Account not found");
-  exit;
+  eidiot("Account not found");
 } else {
   my($total)=scalar(@svc_acct);
   print $cgi->header( '-expires' => 'now' ), header("Account Search Results",''), <<END;
diff --git a/htdocs/search/svc_domain.cgi b/htdocs/search/svc_domain.cgi
index cb704a3c4..732265210 100755
--- a/htdocs/search/svc_domain.cgi
+++ b/htdocs/search/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.4 1999-01-19 05:14:17 ivan Exp $
+# $Id: svc_domain.cgi,v 1.5 1999-02-07 09:59:39 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -17,7 +17,10 @@
 # display total, use FS::CGI now does browsing too ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.4  1999-01-19 05:14:17  ivan
+# Revision 1.5  1999-02-07 09:59:39  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:14:17  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -34,7 +37,7 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header idiot popurl);
+use FS::CGI qw(header eidiot popurl);
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
@@ -68,8 +71,7 @@ if ( scalar(@svc_domain) == 1 ) {
   print $cgi->redirect(popurl(2). "view/svc_domain.cgi?". $svc_domain[0]->svcnum);
   exit;
 } elsif ( scalar(@svc_domain) == 0 ) {
-  idiot "No matching domains found!\n";
-  exit;
+  eidiot "No matching domains found!\n";
 } else {
   CGI::Base::SendHeaders(); # one guess
 
diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index 2119b3e0c..7d51e288a 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.11 1999-01-25 12:26:04 ivan Exp $
+# $Id: cust_main.cgi,v 1.12 1999-02-07 09:59:40 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -33,7 +33,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.11  1999-01-25 12:26:04  ivan
+# Revision 1.12  1999-02-07 09:59:40  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.11  1999/01/25 12:26:04  ivan
 # yet more mod_perl stuff
 #
 # Revision 1.10  1999/01/19 05:14:19  ivan
@@ -182,7 +185,7 @@ print "Billing information (",
       ( grep { $_ eq 'POST' } @invoicing_list ) ? 'yes' : 'no',
       '</TD></TR>',
       '<TR><TD ALIGN="right">Email invoices</TD><TD BGCOLOR="#ffffff">',
-      join(', ', grep { $_ ne 'POST' } @invoicing_list ),
+      join(', ', grep { $_ ne 'POST' } @invoicing_list ) || 'no',
       '</TD></TR>',
       '<TR><TD ALIGN="right">Billing type</TD><TD BGCOLOR="#ffffff">',
 ;
@@ -219,7 +222,7 @@ print "</TABLE></TD></TR></TABLE></TD></TR></TABLE>";
 
 print qq!<BR><BR><A NAME="cust_pkg">Packages</A> !,
 #      qq!<BR>Click on package number to view/edit package.!,
-      qq!( <A HREF="!, popurl(2), qq!/edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> )!,
+      qq!( <A HREF="!, popurl(2), qq!edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> )!,
 ;
 
 #display packages
@@ -239,7 +242,7 @@ print qq!!, table, "\n",
 @packages = $cust_main->all_pkgs;
 #@packages = $cust_main->ncancelled_pkgs;
 
-$n1 = '';
+$n1 = '<TR>';
 foreach $package (@packages) {
   my $pkgnum = $package->pkgnum;
   my $pkg = $package->part_pkg->pkg;
@@ -258,7 +261,7 @@ foreach $package (@packages) {
         qq!<TD ROWSPAN=$rowspan><FONT SIZE=-1>!,
         #qq!<A HREF="$pkgview">$pkg - $comment</A>!,
         qq!$pkg - $comment!,
-        qq! ( <A HREF="$pkgview">Edit</A> | <A HREF="$button_url">Customize pricing</A>)</FONT></TD>!,
+        qq! ( <A HREF="$pkgview">Edit</A> | <A HREF="$button_url">Customize pricing</A> )</FONT></TD>!,
   ;
   for ( qw( setup bill susp expire cancel ) ) {
     print "<TD ROWSPAN=$rowspan><FONT SIZE=-1>", ( $package->getfield($_)
diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi
index 80bd48967..24c78ad18 100755
--- a/htdocs/view/svc_acct_sm.cgi
+++ b/htdocs/view/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.6 1999-01-19 05:14:22 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.7 1999-02-07 09:59:42 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi svcnum
 #        http://server.name/path/svc_acct_sm.cgi?svcnum
@@ -22,7 +22,10 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.6  1999-01-19 05:14:22  ivan
+# Revision 1.7  1999-02-07 09:59:42  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.6  1999/01/19 05:14:22  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -42,7 +45,7 @@
 
 use strict;
 use vars qw($conf $cgi $mydomain $query $svcnum $svc_acct_sm $cust_svc
-            $pkgnum cust_pkg $custnum $part_svc $p $domsvc,$domuid,$domuser
+            $pkgnum $cust_pkg $custnum $part_svc $p $domsvc $domuid $domuser
             $svc $svc_domain $domain $svc_acct $username );
 use CGI;
 use FS::UID qw(cgisuidsetup);
@@ -68,6 +71,9 @@ $pkgnum = $cust_svc->getfield('pkgnum');
 if ($pkgnum) {
   $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
   $custnum=$cust_pkg->getfield('custnum');
+} else {
+  $cust_pkg = '';
+  $custnum = '';
 }
 
 $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
@@ -88,10 +94,9 @@ END
 }
 
 print <<END;
-    <A HREF="${p}">Main menu</A></CENTER><BR<
-    <FONT SIZE=+1>Service #$svcnum</FONT>
+    <A HREF="${p}">Main menu</A></CENTER><BR>
+    Service #$svcnum
     <P><A HREF="${p}edit/svc_acct_sm.cgi?$svcnum">Edit this information</A>
-    <BASEFONT SIZE=3>
 END
 
 ($domsvc,$domuid,$domuser) = (
@@ -106,17 +111,15 @@ $svc_acct = qsearchs('svc_acct',{'uid'=>$domuid});
 $username = $svc_acct->username;
 
 #formatting
-print qq!<HR>!;
+print qq!<BR><BR>!;
 
 #svc
 print "Service: <B>$svc</B>";
 
-print "<HR>";
+print "<BR><BR>";
 
 print qq!Mail to <B>!, ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ) , qq!</B>\@<B>$domain</B> forwards to <B>$username</B>\@$mydomain mailbox.!;
 
-print "<HR>";
-
 	#formatting
 	print <<END;
 
diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index 142438e4c..723d7f4ec 100644
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -171,7 +171,7 @@ sub itable {
   if ( $col ) {
     qq!<TABLE BGCOLOR="$col" BORDER=0 CELLSPACING=$cellspacing WIDTH="100%">!;
   } else {
-    qq!<TABLE BORDER=0 $cellspacing=$cellspacing WIDTH="100%">!;
+    qq!<TABLE BORDER=0 CELLSPACING=$cellspacing WIDTH="100%">!;
   }
 }
 
@@ -216,7 +216,10 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 pod ivan@sisd.com 98-sep-12
 
 $Log: CGI.pm,v $
-Revision 1.16  1999-01-25 12:26:05  ivan
+Revision 1.17  1999-02-07 09:59:43  ivan
+more mod_perl fixes, and bugfixes Peter Wemm sent via email
+
+Revision 1.16  1999/01/25 12:26:05  ivan
 yet more mod_perl stuff
 
 Revision 1.15  1999/01/18 09:41:48  ivan
diff --git a/site_perl/part_svc.pm b/site_perl/part_svc.pm
index fa3462350..6b3ba3d9f 100644
--- a/site_perl/part_svc.pm
+++ b/site_perl/part_svc.pm
@@ -82,7 +82,7 @@ returns the error, otherwise returns false.
 =cut
 
 sub replace {
-  my ( $new, $old ) = shift, shift;
+  my ( $new, $old ) = ( shift, shift );
 
   return "Can't change svcdb!"
     unless $old->svcdb eq $new->svcdb;
@@ -144,7 +144,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: part_svc.pm,v 1.2 1998-12-29 11:59:50 ivan Exp $
+$Id: part_svc.pm,v 1.3 1999-02-07 09:59:44 ivan Exp $
 
 =head1 BUGS
 
@@ -169,7 +169,10 @@ ivan@sisd.com 97-dec-6
 pod ivan@sisd.com 98-sep-21
 
 $Log: part_svc.pm,v $
-Revision 1.2  1998-12-29 11:59:50  ivan
+Revision 1.3  1999-02-07 09:59:44  ivan
+more mod_perl fixes, and bugfixes Peter Wemm sent via email
+
+Revision 1.2  1998/12/29 11:59:50  ivan
 mostly properly OO, some work still to be done with svc_ stuff
 
 
-- 
cgit v1.2.1


From 29ad6d23263f0f6af67e130f6f4f7da431fc5a15 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 9 Feb 1999 05:45:48 +0000
Subject: no longer needed

---
 htdocs/docs/CGI-modules-2.76-patch.txt | 39 ----------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100755 htdocs/docs/CGI-modules-2.76-patch.txt

diff --git a/htdocs/docs/CGI-modules-2.76-patch.txt b/htdocs/docs/CGI-modules-2.76-patch.txt
deleted file mode 100755
index 9729623fa..000000000
--- a/htdocs/docs/CGI-modules-2.76-patch.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-# This is a patch for Base.pm.old to update it to Base.pm.
-# It was generated by makepatch 1.93 (2.0BETA) on Tue Nov  3 21:44:39 1998.
-#
-# To apply this patch, chdir to source directory Base.pm.old and enter
-#
-#     patch -p1 -N < <this-file>
-
-exit
-# End of preamble.
-
-# Patch input follows.
-__DATA__
-Index: Base.pm
-Prereq:  2.76 
-#######  => 
-*** Base.pm.old	Wed Oct 14 00:24:12 1998
---- Base.pm	Tue Nov  3 21:38:49 1998
-***************
-*** 938,945 ****
-      my $orig_uri = $self->get_uri;
-      $self->log("Redirecting $CGI::Base::REQUEST_METHOD $orig_uri to $to_uri")
-  	if $Debug;
-!     my $msg =   ($perm) ? ServerHdr(301,"Moved Permanently")
-! 			: ServerHdr(302,"Moved Temporarily");
-      my $hdrs = SendHeaders($msg, LocationHdr($to_uri));
-      $self->log($hdrs);
-  }
---- 938,945 ----
-      my $orig_uri = $self->get_uri;
-      $self->log("Redirecting $CGI::Base::REQUEST_METHOD $orig_uri to $to_uri")
-  	if $Debug;
-!     my $msg =   ($perm) ? StatusHdr(301,"Moved Permanently")
-! 			: StatusHdr(302,"Moved Temporarily");
-      my $hdrs = SendHeaders($msg, LocationHdr($to_uri));
-      $self->log($hdrs);
-  }
-
-
-End of Patch.
-- 
cgit v1.2.1


From 2d5b6a99008439861b047739d1064fd828eccc7d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 9 Feb 1999 09:23:00 +0000
Subject: visual and bugfixes

---
 htdocs/search/cust_pkg.cgi    | 18 +++++---
 htdocs/search/svc_acct_sm.cgi | 65 +++++++++++++++++-----------
 htdocs/search/svc_domain.cgi  | 99 ++++++++++++++++++++++++++++++++-----------
 htdocs/view/svc_acct_sm.cgi   | 13 +++++-
 4 files changed, 138 insertions(+), 57 deletions(-)

diff --git a/htdocs/search/cust_pkg.cgi b/htdocs/search/cust_pkg.cgi
index b7afc62a5..c48a3c703 100755
--- a/htdocs/search/cust_pkg.cgi
+++ b/htdocs/search/cust_pkg.cgi
@@ -1,11 +1,14 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.7 1999-02-07 09:59:37 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.8 1999-02-09 09:22:57 ivan Exp $
 #
 # based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.7  1999-02-07 09:59:37  ivan
+# Revision 1.8  1999-02-09 09:22:57  ivan
+# visual and bugfixes
+#
+# Revision 1.7  1999/02/07 09:59:37  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.6  1999/01/19 05:14:13  ivan
@@ -87,7 +90,7 @@ if ( scalar(@cust_pkg) == 1 ) {
       <TR>
         <TH>Package #</TH>
         <TH>Customer #</TH>
-        <TH>Name</TH>
+        <TH>Contact name</TH>
         <TH>Company</TH>
       </TR>
 END
@@ -103,12 +106,13 @@ END
       $cust_main->last. ', '. $cust_main->first,
       $cust_main->company,
     );
+    my $p = popurl(2);
     print <<END;
     <TR>
-      <TD><A HREF="../view/cust_pkg.cgi?$pkgnum"><FONT SIZE=-1>$pkgnum</FONT></A></TD>
-      <TD><FONT SIZE=-1>$custnum</FONT></TD>
-      <TD><FONT SIZE=-1>$name</FONT></TD>
-      <TD><FONT SIZE=-1>$company</FONT></TD>
+      <TD><A HREF="${p}view/cust_pkg.cgi?$pkgnum"><FONT SIZE=-1>$pkgnum</FONT></A></TD>
+      <TD><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$custnum</A></FONT></TD>
+      <TD><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$name</A></FONT></TD>
+      <TD><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$company</A></FONT></TD>
     </TR>
 END
 
diff --git a/htdocs/search/svc_acct_sm.cgi b/htdocs/search/svc_acct_sm.cgi
index ecdf0bc0c..60241bbdb 100755
--- a/htdocs/search/svc_acct_sm.cgi
+++ b/htdocs/search/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.5 1999-01-19 05:14:16 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.6 1999-02-09 09:22:58 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -19,7 +19,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.5  1999-01-19 05:14:16  ivan
+# Revision 1.6  1999-02-09 09:22:58  ivan
+# visual and bugfixes
+#
+# Revision 1.5  1999/01/19 05:14:16  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -39,6 +42,9 @@ use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(popurl idiot header table);
 use FS::Record qw(qsearch qsearchs);
 use FS::Conf;
+use FS::svc_domain;
+use FS::svc_acct_sm;
+use FS::svc_acct;
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
@@ -65,13 +71,14 @@ if ($domuser) {
 
 if ( scalar(@svc_acct_sm) == 1 ) {
   my($svcnum)=$svc_acct_sm[0]->svcnum;
-  print $cgi->redirect(popurl(2). "view/svc_acct_sm.cgi?$svcnum");  #redirect
+  print $cgi->redirect(popurl(2). "view/svc_acct_sm.cgi?$svcnum");
 } elsif ( scalar(@svc_acct_sm) > 1 ) {
-  CGI::Base::SendHeaders();
-  print $cgi->header( '-expires' => 'now' ), header('Mail Alias Search Results'), table, <<END;
+  print $cgi->header( '-expires' => 'now' ),
+        header('Mail Alias Search Results'),
+        table, <<END;
       <TR>
-        <TH>Mail to<BR><FONT SIZE=-2>(click here to view mail alias)</FONT></TH>
-        <TH>Forwards to<BR><FONT SIZE=-2>(click here to view account)</FONT></TH>
+        <TH>Mail to<BR><FONT SIZE=-1>(click to view mail alias)</FONT></TH>
+        <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
       </TR>
 END
 
@@ -83,29 +90,39 @@ END
       $svc_acct_sm->domuid,
       $svc_acct_sm->domsvc,
     );
-    my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$domsvc});
-    my($domain)=$svc_domain->domain;
-    my($svc_acct)=qsearchs('svc_acct',{'uid'=>$domuid});
-    my($username)=$svc_acct->username;
-    my($svc_acct_svcnum)=$svc_acct->svcnum;
 
-    print qq!<TR>\n        <TD> <A HREF="!. popurl(2). qq!view/svc_acct_sm.cgi?$svcnum">!;
+    my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $domsvc } );
+    if ( $svc_domain ) {
+      my $domain = $svc_domain->domain;
 
-    print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
+      print qq!<TR><TD><A HREF="!. popurl(2). qq!view/svc_acct_sm.cgi?$svcnum">!,
+      #print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
+            ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ),
+            qq!\@$domain</A> </TD>!,
+      ;
+    } else {
+      my $warning = "couldn't find svc_domain.svcnum $svcnum ( svc_acct_sm.svcnum $svcnum";
+      warn $warning;
+      print "<TR><TD>WARNING: $warning</TD>";
+    }
 
-    print <<END;
-\@$domain</A> </TD>\n
-<TD> <A HREF="../view/svc_acct.cgi?$svc_acct_svcnum">$username\@$mydomain</A> </TD>\n      </TR>\n
-END
+    my $svc_acct = qsearchs( 'svc_acct', { 'uid' => $domuid } );
+    if ( $svc_acct ) {
+      my $username = $svc_acct->username;
+      my $svc_acct_svcnum =$svc_acct->svcnum;
+      print qq!<TD><A HREF="!, popurl(2),
+            qq!view/svc_acct.cgi?$svc_acct_svcnum">$username\@$mydomain</A>!,
+            qq!</TD></TR>!
+      ;
+    } else {
+      my $warning = "couldn't find svc_acct.uid $domuid (svc_acct_sm.svcnum $svcnum)!";
+      warn $warning;
+      print "<TD>WARNING: $warning</TD></TR>";
+    }
 
   }
 
-  print <<END;
-      </TABLE>
-    </CENTER>
-  </BODY>
-</HTML>
-END
+  print '</TABLE></BODY></HTML>';
 
 } else { #error
   idiot("Mail Alias not found");
diff --git a/htdocs/search/svc_domain.cgi b/htdocs/search/svc_domain.cgi
index 732265210..778584d80 100755
--- a/htdocs/search/svc_domain.cgi
+++ b/htdocs/search/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.5 1999-02-07 09:59:39 ivan Exp $
+# $Id: svc_domain.cgi,v 1.6 1999-02-09 09:22:59 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -17,7 +17,10 @@
 # display total, use FS::CGI now does browsing too ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.5  1999-02-07 09:59:39  ivan
+# Revision 1.6  1999-02-09 09:22:59  ivan
+# visual and bugfixes
+#
+# Revision 1.5  1999/02/07 09:59:39  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.4  1999/01/19 05:14:17  ivan
@@ -32,7 +35,7 @@
 #
 
 use strict;
-use vars qw ( $cgi @svc_domain $sortby $query );
+use vars qw ( $cgi @svc_domain $sortby $query $conf );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -42,6 +45,9 @@ use FS::CGI qw(header eidiot popurl);
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
+$conf = new FS::Conf;
+$mydomain = $conf->config('domain');
+
 ($query)=$cgi->keywords;
 if ( $query eq 'svcnum' ) {
   $sortby=\*svcnum_sort;
@@ -73,18 +79,17 @@ if ( scalar(@svc_domain) == 1 ) {
 } elsif ( scalar(@svc_domain) == 0 ) {
   eidiot "No matching domains found!\n";
 } else {
-  CGI::Base::SendHeaders(); # one guess
 
   my($total)=scalar(@svc_domain);
-  CGI::Base::SendHeaders(); # one guess
-  print header("Domain Search Results",''), <<END;
+  print $cgi->header, header("Domain Search Results",''), <<END;
 
     $total matching domains found
     <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
       <TR>
         <TH>Service #</TH>
         <TH>Domain</TH>
-        <TH></TH>
+        <TH>Mail to<BR><FONT SIZE=-1>(click to view mail alias)</FONT></TH>
+        <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
       </TR>
 END
 
@@ -97,30 +102,76 @@ END
       $svc_domain->svcnum,
       $svc_domain->domain,
     );
-    my($malias);
-    if ( qsearch('svc_acct_sm',{'domsvc'=>$svcnum}) ) {
-      $malias=(
-        qq|<FORM ACTION="svc_acct_sm.cgi" METHOD="post">|.
-          qq|<INPUT TYPE="hidden" NAME="domuser" VALUE="">|.
-          qq|<INPUT TYPE="hidden" NAME="domain" VALUE="$domain">|.
-          qq|<INPUT TYPE="submit" VALUE="(mail aliases)">|.
-          qq|</FORM>|
-      );
-    } else {
-      $malias='';
-    }
+    #my($malias);
+    #if ( qsearch('svc_acct_sm',{'domsvc'=>$svcnum}) ) {
+    #  $malias=(
+    #    qq|<FORM ACTION="svc_acct_sm.cgi" METHOD="post">|.
+    #      qq|<INPUT TYPE="hidden" NAME="domuser" VALUE="">|.
+    #      qq|<INPUT TYPE="hidden" NAME="domain" VALUE="$domain">|.
+    #      qq|<INPUT TYPE="submit" VALUE="(mail aliases)">|.
+    #      qq|</FORM>|
+    #  );
+    #} else {
+    #  $malias='';
+    #}
+
+    my @svc_acct_sm=qsearch('svc_acct_sm',{'domsvc' => $svcnum});
+    my $rowspan = scalar(@svc_acct_sm) || 1;
+
     print <<END;
     <TR>
-      <TD><A HREF="${p}view/svc_domain.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
-      <TD><FONT SIZE=-1>$domain</FONT></TD>
-      <TD><FONT SIZE=-1>$malias</FONT></TD>
-    </TR>
+      <TD ROWSPAN=$rowspan><A HREF="${p}view/svc_domain.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
+      <TD ROWSPAN=$rowspan>$domain</TD>
 END
+
+    my $n1 = '';
+    # false laziness: this was stolen from search/svc_acct_sm.cgi.  but the
+    # web interface in general needs to be rewritten in a mucho cleaner way
+    my($svc_acct_sm);
+    foreach $svc_acct_sm (@svc_acct_sm) {
+      my($svcnum,$domuser,$domuid,$domsvc)=(
+        $svc_acct_sm->svcnum,
+        $svc_acct_sm->domuser,
+        $svc_acct_sm->domuid,
+        $svc_acct_sm->domsvc,
+      );
+      #my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $domsvc } );
+      #if ( $svc_domain ) {
+      #  my $domain = $svc_domain->domain;
+
+        print qq!$n1<TD><A HREF="!. popurl(2). qq!view/svc_acct_sm.cgi?$svcnum">!,
+        #print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
+              ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ),
+              qq!\@$domain</A> </TD>!,
+        ;
+      #} else {
+      #  my $warning = "couldn't find svc_domain.svcnum $svcnum ( svc_acct_sm.svcnum $svcnum";
+      #  warn $warning;
+      #  print "$n1<TD>WARNING: $warning</TD>";
+      #}
+
+      my $svc_acct = qsearchs( 'svc_acct', { 'uid' => $domuid } );
+      if ( $svc_acct ) {
+        my $username = $svc_acct->username;
+        my $svc_acct_svcnum =$svc_acct->svcnum;
+        print qq!<TD><A HREF="!, popurl(2),
+              qq!view/svc_acct.cgi?$svc_acct_svcnum">$username\@$mydomain</A>!,
+              qq!</TD></TR>!
+        ;
+      } else {
+        my $warning = "couldn't find svc_acct.uid $domuid (svc_acct_sm.svcnum $svcnum)!";
+        warn $warning;
+        print "<TD>WARNING: $warning</TD>";
+      }
+      $n1 = "</TR><TR>";
+    }
+    #end of false laziness
+    print "</TR>";
+
   }
  
   print <<END;
     </TABLE>
-    </CENTER>
   </BODY>
 </HTML>
 END
diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi
index 24c78ad18..4c86ffd32 100755
--- a/htdocs/view/svc_acct_sm.cgi
+++ b/htdocs/view/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.7 1999-02-07 09:59:42 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.8 1999-02-09 09:23:00 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi svcnum
 #        http://server.name/path/svc_acct_sm.cgi?svcnum
@@ -22,7 +22,10 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.7  1999-02-07 09:59:42  ivan
+# Revision 1.8  1999-02-09 09:23:00  ivan
+# visual and bugfixes
+#
+# Revision 1.7  1999/02/07 09:59:42  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.6  1999/01/19 05:14:22  ivan
@@ -52,6 +55,12 @@ use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(header popurl);
 use FS::Record qw(qsearchs);
 use FS::Conf;
+use FS::svc_acct_sm;
+use FS::cust_svc;
+use FS::cust_pkg;
+use FS::part_svc;
+use FS::svc_domain;
+use FS::svc_acct;
 
 $cgi = new CGI;
 cgisuidsetup($cgi);
-- 
cgit v1.2.1


From 9e95f24c0c93f9ca0c8d07041478bc1b36c571d8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 9 Feb 1999 09:38:15 +0000
Subject: regenerated perl api docs from embedded pod

---
 htdocs/docs/man/CGI.txt              | 33 +++++++++++--
 htdocs/docs/man/Invoice.txt          |  2 +-
 htdocs/docs/man/Record.txt           | 89 ++++++++++++++++++++++++++++--------
 htdocs/docs/man/UID.txt              | 24 ++++++++--
 htdocs/docs/man/agent.txt            | 11 +++--
 htdocs/docs/man/agent_type.txt       | 17 +++++--
 htdocs/docs/man/cust_bill.txt        | 44 ++++++++++--------
 htdocs/docs/man/cust_bill_pkg.txt    | 11 +++--
 htdocs/docs/man/cust_credit.txt      | 23 ++++++++--
 htdocs/docs/man/cust_main.txt        | 79 ++++++++++++++++++++++++++------
 htdocs/docs/man/cust_main_county.txt | 23 +++++++---
 htdocs/docs/man/cust_pay.txt         | 20 ++++++--
 htdocs/docs/man/cust_pkg.txt         | 50 ++++++++++++++------
 htdocs/docs/man/cust_refund.txt      | 20 ++++++--
 htdocs/docs/man/cust_svc.txt         | 23 ++++++----
 htdocs/docs/man/index.html           |  2 +
 htdocs/docs/man/part_pkg.txt         | 28 ++++++++++--
 htdocs/docs/man/part_referral.txt    | 17 +++++--
 htdocs/docs/man/part_svc.txt         | 23 ++++++++--
 htdocs/docs/man/pkg_svc.txt          | 21 +++++++--
 htdocs/docs/man/svc_acct.txt         | 43 +++++++++++------
 htdocs/docs/man/svc_acct_pop.txt     | 21 ++++++---
 htdocs/docs/man/svc_acct_sm.txt      | 13 ++++--
 htdocs/docs/man/svc_domain.txt       | 52 ++++++++++++---------
 htdocs/docs/man/type_pkgs.txt        | 20 ++++++--
 25 files changed, 516 insertions(+), 193 deletions(-)

diff --git a/htdocs/docs/man/CGI.txt b/htdocs/docs/man/CGI.txt
index 15a5ca17d..c8eb4ff23 100644
--- a/htdocs/docs/man/CGI.txt
+++ b/htdocs/docs/man/CGI.txt
@@ -24,9 +24,13 @@ SUBROUTINES
         Returns an HTML menubar.
 
     idiot ERROR
+        This is depriciated. Don't use it.
+
         Sends headers and an HTML error message.
 
     eidiot ERROR
+        This is depriciated. Don't use it.
+
         Sends headers and an HTML error message, then exits.
 
     popurl LEVEL
@@ -36,6 +40,12 @@ SUBROUTINES
     table
         Returns HTML tag for beginning a table.
 
+    itable
+        Returns HTML tag for beginning an (invisible) table.
+
+    ntable
+        This is getting silly.
+
 BUGS
     Not OO.
 
@@ -54,11 +64,24 @@ HISTORY
     pod ivan@sisd.com 98-sep-12
 
     $Log: CGI.txt,v $
-    Revision 1.2  1998-11-13 09:56:34  ivan
-    change configuration file layout to support multiple distinct databases (with
-    own set of config files, export, etc.)
- Revision 1.11 1998/11/12 07:43:54 ivan ***
-    empty log message ***
+    Revision 1.4  1999-04-08 13:39:31  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.17 1999/02/07 09:59:43 ivan more
+    mod_perl fixes, and bugfixes Peter Wemm sent via email
+
+    Revision 1.16 1999/01/25 12:26:05 ivan yet more mod_perl stuff
+
+    Revision 1.15 1999/01/18 09:41:48 ivan all $cgi->header calls
+    now include ( '-expires' => 'now' ) for mod_perl (good idea
+    anyway)
+
+    Revision 1.14 1999/01/18 09:22:37 ivan changes to track email
+    addresses for email invoicing
+
+    Revision 1.12 1998/12/23 02:23:16 ivan popurl always has
+    trailing slash
+
+    Revision 1.11 1998/11/12 07:43:54 ivan *** empty log message ***
 
     Revision 1.10 1998/11/12 01:53:47 ivan added table command
 
diff --git a/htdocs/docs/man/Invoice.txt b/htdocs/docs/man/Invoice.txt
index 426359f94..d0ca37fd0 100644
--- a/htdocs/docs/man/Invoice.txt
+++ b/htdocs/docs/man/Invoice.txt
@@ -2,7 +2,7 @@ NAME
     FS::Invoice - Legacy stub
 
 SYNOPSIS
-    The functioanlity of FS::invoice has been integrated in
+    The functionality of FS::Invoice has been integrated in
     FS::cust_bill.
 
 HISTORY
diff --git a/htdocs/docs/man/Record.txt b/htdocs/docs/man/Record.txt
index 8409c2ecc..e1902fee8 100644
--- a/htdocs/docs/man/Record.txt
+++ b/htdocs/docs/man/Record.txt
@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         use FS::Record;
-        use FS::Record qw(dbh fields hfields qsearch qsearchs dbdef);
+        use FS::Record qw(dbh fields qsearch qsearchs dbdef);
 
         $record = new FS::Record 'table', \%hash;
         $record = new FS::Record 'table', { 'column' => 'value', ... };
@@ -28,11 +28,14 @@ SYNOPSIS
 
         $hashref = $record->hashref;
 
-        $error = $record->add;
+        $error = $record->insert;
+        #$error = $record->add; #depriciated
 
-        $error = $record->del;
+        $error = $record->delete;
+        #$error = $record->del; #depriciated
 
-        $error = $new_record->rep($old_record);
+        $error = $new_record->replace($old_record);
+        #$error = $new_record->rep($old_record); #depriciated
 
         $value = $record->unique('column');
 
@@ -57,7 +60,8 @@ SYNOPSIS
         $fields = hfields('table');
         if ( $fields->{Field} ) { # etc.
 
-        @fields = fields 'table';
+        @fields = fields 'table'; #as a subroutine
+        @fields = $record->fields; #as a method call
 
 DESCRIPTION
     (Mostly) object-oriented interface to database records. Records
@@ -65,15 +69,18 @@ DESCRIPTION
     as a base class for table-specific classes to inherit from, i.e.
     FS::cust_main.
 
-METHODS
-    new TABLE, HASHREF
+CONSTRUCTORS
+    new [ TABLE, ] HASHREF
         Creates a new record. It doesn't store it in the database,
-        though. See the section on "add" for that.
+        though. See the section on "insert" for that.
 
         Note that the object stores this hash reference, not a
         distinct copy of the hash it points to. You can ask the
         object for a copy with the *hash* method.
 
+        TABLE can only be omitted when a dervived class overrides
+        the table method.
+
     qsearch TABLE, HASHREF
         Searches the database for all records matching (at least)
         the key/value pairs in HASHREF. Returns all the records
@@ -87,6 +94,7 @@ METHODS
         you either made a logic error in asking for a single item,
         or your data is corrupted.
 
+METHODS
     table
         Returns the table name.
 
@@ -118,17 +126,29 @@ METHODS
     hashref
         Returns a reference to the column/value hash.
 
-    add Adds this record to the database. If there is an error, returns
-        the error, otherwise returns false.
+    insert
+        Inserts this record to the database. If there is an error,
+        returns the error, otherwise returns false.
+
+    add Depriciated (use insert instead).
 
-    del Delete this record from the database. If there is an error,
+    delete
+        Delete this record from the database. If there is an error,
         returns the error, otherwise returns false.
 
-    rep OLD_RECORD
+    del Depriciated (use delete instead).
+
+    replace OLD_RECORD
         Replace the OLD_RECORD with this one in the database. If
         there is an error, returns the error, otherwise returns
         false.
 
+    rep Depriciated (use replace instead).
+
+    check
+        Not yet implemented, croaks. Derived classes should provide
+        a check method.
+
     unique COLUMN
         Replaces COLUMN in record with a unique number. Called by
         the add method on primary keys and single-field unique
@@ -184,6 +204,11 @@ METHODS
     ut_anything COLUMN
         Untaints arbitrary data. Be careful.
 
+    fields [ TABLE ]
+        This can be used as both a subroutine and a method call. It
+        returns a list of the columns in this record's table, or an
+        explicitly specified table. (See the dbdef_table manpage).
+
 SUBROUTINES
     reload_dbdef([FILENAME])
             Load a database definition (see the FS::dbdef manpage),
@@ -207,9 +232,8 @@ SUBROUTINES
             It returns a hash-type list with the fields of this
             record's table set true.
 
-    fields TABLE
-            This returns a list of the columns in this record's
-            table (See the dbdef_table manpage).
+VERSION
+        $Id: Record.txt,v 1.4 1999-02-09 09:37:51 ivan Exp $
 
 BUGS
         This module should probably be renamed, since much of the
@@ -251,6 +275,9 @@ BUGS
         All the subroutines probably should be methods, here or
         elsewhere.
 
+        Probably should borrow/use some dbdef methods where
+        appropriate (like sub fields)
+
 SEE ALSO
         the FS::dbdef manpage, the FS::UID manpage, the DBI manpage
 
@@ -333,11 +360,33 @@ HISTORY
         ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
         $Log: Record.txt,v $
-        Revision 1.3  1998-11-13 09:56:36  ivan
-        change configuration file layout to support multiple distinct databases (with
-        own set of config files, export, etc.)
- Revision 1.4 1998/11/10 07:45:25 ivan
-        doc clarification
+        Revision 1.4  1999-02-09 09:37:51  ivan
+        regenerated perl api docs from embedded pod
+ Revision 1.12 1999/01/25 12:26:06 ivan
+        yet more mod_perl stuff
+
+        Revision 1.11 1999/01/18 09:22:38 ivan changes to track
+        email addresses for email invoicing
+
+        Revision 1.10 1998/12/29 11:59:33 ivan mostly properly OO,
+        some work still to be done with svc_ stuff
+
+        Revision 1.9 1998/11/21 07:26:45 ivan "Records identical"
+        carp tells us it is just a warning.
+
+        Revision 1.8 1998/11/15 11:02:04 ivan bugsquash
+
+        Revision 1.7 1998/11/15 10:56:31 ivan qsearch gets sames "IS
+        NULL" semantics as other WHERE clauses
+
+        Revision 1.6 1998/11/15 05:31:03 ivan bugfix for new config
+        layout
+
+        Revision 1.5 1998/11/13 09:56:51 ivan change configuration
+        file layout to support multiple distinct databases (with own
+        set of config files, export, etc.)
+
+        Revision 1.4 1998/11/10 07:45:25 ivan doc clarification
 
         Revision 1.2 1998/11/07 05:17:18 ivan In sub new, Pg wrapper
         for money fields from dbdef (FS::Record::fields $table), not
diff --git a/htdocs/docs/man/UID.txt b/htdocs/docs/man/UID.txt
index e24636487..7c4b1abc5 100644
--- a/htdocs/docs/man/UID.txt
+++ b/htdocs/docs/man/UID.txt
@@ -69,6 +69,9 @@ CALLBACKS
         $coderef = sub { warn "Hi, I'm returning your call!" };
         $FS::UID::callback{'Package::Name'};
 
+VERSION
+    $Id: UID.txt,v 1.3 1999-02-09 09:37:52 ivan Exp $
+
 BUGS
     Too many package-global variables.
 
@@ -111,11 +114,22 @@ HISTORY
     inlined suidsetup ivan@sisd.com 98-sep-12
 
     $Log: UID.txt,v $
-    Revision 1.2  1998-11-13 09:56:37  ivan
-    change configuration file layout to support multiple distinct databases (with
-    own set of config files, export, etc.)
- Revision 1.3 1998/11/08 10:45:42 ivan got sub
-    cgi for FS::CGI
+    Revision 1.3  1999-02-09 09:37:52  ivan
+    regenerated perl api docs from embedded pod
+ Revision 1.7 1999/01/18 09:22:40 ivan changes
+    to track email addresses for email invoicing
+
+    Revision 1.6 1998/11/15 05:27:48 ivan bugfix for new
+    configuration layout
+
+    Revision 1.5 1998/11/15 00:51:51 ivan eliminated some warnings
+    on certain fatal errors (well, it is less confusing)
+
+    Revision 1.4 1998/11/13 09:56:52 ivan change configuration file
+    layout to support multiple distinct databases (with own set of
+    config files, export, etc.)
+
+    Revision 1.3 1998/11/08 10:45:42 ivan got sub cgi for FS::CGI
 
     Revision 1.2 1998/11/08 09:38:43 ivan cgisuidsetup complains if
     you pass it a isa CGI::Base instead of an isa CGI (first step in
diff --git a/htdocs/docs/man/agent.txt b/htdocs/docs/man/agent.txt
index b0317f6f7..13a4f0c4b 100644
--- a/htdocs/docs/man/agent.txt
+++ b/htdocs/docs/man/agent.txt
@@ -4,8 +4,8 @@ NAME
 SYNOPSIS
       use FS::agent;
 
-      $record = create FS::agent \%hash;
-      $record = create FS::agent { 'column' => 'value' };
+      $record = new FS::agent \%hash;
+      $record = new FS::agent { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -27,7 +27,7 @@ DESCRIPTION
     prog - For future use.
     freq - For future use.
 METHODS
-    create HASHREF
+    new HASHREF
         Creates a new agent. To add the agent to the database, see
         the section on "insert".
 
@@ -49,9 +49,10 @@ METHODS
         there is an error, returns the error, otherwise returns
         false. Called by the insert and replace methods.
 
-BUGS
-    It doesn't properly override FS::Record yet.
+VERSION
+    $Id: agent.txt,v 1.3 1999-04-08 13:39:31 ivan Exp $
 
+BUGS
 SEE ALSO
     the FS::Record manpage, the FS::agent_type manpage, the
     FS::cust_main manpage, schema.html from the base documentation.
diff --git a/htdocs/docs/man/agent_type.txt b/htdocs/docs/man/agent_type.txt
index ea1edec0c..5983fee88 100644
--- a/htdocs/docs/man/agent_type.txt
+++ b/htdocs/docs/man/agent_type.txt
@@ -4,8 +4,8 @@ NAME
 SYNOPSIS
       use FS::agent_type;
 
-      $record = create FS::agent_type \%hash;
-      $record = create FS::agent_type { 'column' => 'value' };
+      $record = new FS::agent_type \%hash;
+      $record = new FS::agent_type { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -27,7 +27,7 @@ DESCRIPTION
     typenum - primary key (assigned automatically for new agent types)
     atype - Text name of this agent type
 METHODS
-    create HASHREF
+    new HASHREF
         Creates a new agent type. To add the agent type to the
         database, see the section on "insert".
 
@@ -49,9 +49,10 @@ METHODS
         If there is an error, returns the error, otherwise returns
         false. Called by the insert and replace methods.
 
-BUGS
-    It doesn't properly override FS::Record yet.
+VERSION
+    $Id: agent_type.txt,v 1.3 1999-04-08 13:39:31 ivan Exp $
 
+BUGS
 SEE ALSO
     the FS::Record manpage, the FS::agent manpage, the FS::type_pkgs
     manpage, the FS::cust_main manpage, the FS::part_pkg manpage,
@@ -70,3 +71,9 @@ HISTORY
 
     pod, added check in delete ivan@sisd.com 98-sep-21
 
+    $Log: agent_type.txt,v $
+    Revision 1.3  1999-04-08 13:39:31  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.2 1998/12/29 11:59:35 ivan
+    mostly properly OO, some work still to be done with svc_ stuff
+
diff --git a/htdocs/docs/man/cust_bill.txt b/htdocs/docs/man/cust_bill.txt
index bc0b64da3..9780ca7c6 100644
--- a/htdocs/docs/man/cust_bill.txt
+++ b/htdocs/docs/man/cust_bill.txt
@@ -4,8 +4,8 @@ NAME
 SYNOPSIS
       use FS::cust_bill;
 
-      $record = create FS::cust_bill \%hash;
-      $record = create FS::cust_bill { 'column' => 'value' };
+      $record = new FS::cust_bill \%hash;
+      $record = new FS::cust_bill { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -41,7 +41,7 @@ DESCRIPTION
     printed - how many times this invoice has been printed automatically
     (see the section on "collect" in the FS::cust_main manpage).
 METHODS
-    create HASHREF
+    new HASHREF
         Creates a new invoice. To add the invoice to the database,
         see the section on "insert". Invoices are normally created
         by calling the bill method of a customer object (see the
@@ -105,24 +105,19 @@ METHODS
         manpage. Also see the Time::Local manpage and the
         Date::Parse manpage for conversion functions.
 
+VERSION
+    $Id: cust_bill.txt,v 1.3 1999-02-09 09:37:55 ivan Exp $
+
 BUGS
     The delete method.
 
-    It doesn't properly override FS::Record yet.
-
-    print_text formatting (and some logic :/) is in source as a
-    format declaration, which needs to be slurped in from a file.
-    the fork is rather kludgy as well. It could be cleaned with
-    swrite from man perlform, and the picture could be put in a
-    /var/spool/freeside/conf file. Also number of lines ($=).
+    print_text formatting (and some logic :/) is in source, but
+    needs to be slurped in from a file. Also number of lines ($=).
 
     missing print_ps for a nice postscript copy (maybe HylaFAX-
     cover-page-style or something similar so the look can be
     completely customized?)
 
-    There is an off-by-one error in print_text which causes a visual
-    error: "Page 1 of 2" printed on some single-page invoices?
-
 SEE ALSO
     the FS::Record manpage, the FS::cust_main manpage, the
     FS::cust_pay manpage, the FS::cust_bill_pkg manpage, the
@@ -139,10 +134,21 @@ HISTORY
     pod, ingegrate with FS::Invoice ivan@sisd.com 98-sep-20
 
     $Log: cust_bill.txt,v $
-    Revision 1.2  1998-11-13 09:56:38  ivan
-    change configuration file layout to support multiple distinct databases (with
-    own set of config files, export, etc.)
- Revision 1.2 1998/11/07 10:24:24 ivan
-    don't use depriciated FS::Bill and FS::Invoice, other
-    miscellania
+    Revision 1.3  1999-02-09 09:37:55  ivan
+    regenerated perl api docs from embedded pod
+ Revision 1.6 1999/01/25 12:26:07 ivan yet
+    more mod_perl stuff
+
+    Revision 1.5 1999/01/18 21:58:03 ivan esthetic: eq and ne were
+    used in a few places instead of == and !=
+
+    Revision 1.4 1998/12/29 11:59:36 ivan mostly properly OO, some
+    work still to be done with svc_ stuff
+
+    Revision 1.3 1998/11/13 09:56:53 ivan change configuration file
+    layout to support multiple distinct databases (with own set of
+    config files, export, etc.)
+
+    Revision 1.2 1998/11/07 10:24:24 ivan don't use depriciated
+    FS::Bill and FS::Invoice, other miscellania
 
diff --git a/htdocs/docs/man/cust_bill_pkg.txt b/htdocs/docs/man/cust_bill_pkg.txt
index 1ca4b8cca..d725c941e 100644
--- a/htdocs/docs/man/cust_bill_pkg.txt
+++ b/htdocs/docs/man/cust_bill_pkg.txt
@@ -4,8 +4,8 @@ NAME
 SYNOPSIS
       use FS::cust_bill_pkg;
 
-      $record = create FS::cust_bill_pkg \%hash;
-      $record = create FS::cust_bill_pkg { 'column' => 'value' };
+      $record = new FS::cust_bill_pkg \%hash;
+      $record = new FS::cust_bill_pkg { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -32,7 +32,7 @@ DESCRIPTION
     functions.
 
 METHODS
-    create HASHREF
+    new HASHREF
         Creates a new line item. To add the line item to the
         database, see the section on "insert". Line items are
         normally created by calling the bill method of a customer
@@ -57,9 +57,10 @@ METHODS
         there is an error, returns the error, otherwise returns
         false. Called by the insert method.
 
-BUGS
-    It doesn't properly override FS::Record yet.
+VERSION
+    $Id: cust_bill_pkg.txt,v 1.3 1999-04-08 13:39:31 ivan Exp $
 
+BUGS
 SEE ALSO
     the FS::Record manpage, the FS::cust_bill manpage, the
     FS::cust_pkg manpage, the FS::cust_main manpage, schema.html
diff --git a/htdocs/docs/man/cust_credit.txt b/htdocs/docs/man/cust_credit.txt
index 84591ee81..c26c1fbd6 100644
--- a/htdocs/docs/man/cust_credit.txt
+++ b/htdocs/docs/man/cust_credit.txt
@@ -4,8 +4,8 @@ NAME
 SYNOPSIS
       use FS::cust_credit;
 
-      $record = create FS::cust_credit \%hash;
-      $record = create FS::cust_credit { 'column' => 'value' };
+      $record = new FS::cust_credit \%hash;
+      $record = new FS::cust_credit { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -30,7 +30,7 @@ DESCRIPTION
     otaker - order taker (assigned automatically, see the FS::UID manpage)
     reason - text
 METHODS
-    create HASHREF
+    new HASHREF
         Creates a new credit. To add the credit to the database, see
         the section on "insert".
 
@@ -59,11 +59,12 @@ METHODS
         there is an error, returns the error, otherwise returns
         false. Called by the insert and replace methods.
 
+VERSION
+    $Id: cust_credit.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
+
 BUGS
     The delete method.
 
-    It doesn't properly override FS::Record yet.
-
 SEE ALSO
     the FS::Record manpage, the FS::cust_refund manpage, the
     FS::cust_bill manpage, schema.html from the base documentation.
@@ -73,3 +74,15 @@ HISTORY
 
     pod, otaker from FS::UID ivan@sisd.com 98-sep-21
 
+    $Log: cust_credit.txt,v $
+    Revision 1.3  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.4 1999/01/25 12:26:08 ivan
+    yet more mod_perl stuff
+
+    Revision 1.3 1999/01/18 21:58:04 ivan esthetic: eq and ne were
+    used in a few places instead of == and !=
+
+    Revision 1.2 1998/12/29 11:59:38 ivan mostly properly OO, some
+    work still to be done with svc_ stuff
+
diff --git a/htdocs/docs/man/cust_main.txt b/htdocs/docs/man/cust_main.txt
index f0625c173..707cf956b 100644
--- a/htdocs/docs/man/cust_main.txt
+++ b/htdocs/docs/man/cust_main.txt
@@ -4,8 +4,8 @@ NAME
 SYNOPSIS
       use FS::cust_main;
 
-      $record = create FS::cust_main \%hash;
-      $record = create FS::cust_main { 'column' => 'value' };
+      $record = new FS::cust_main \%hash;
+      $record = new FS::cust_main { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -58,7 +58,7 @@ DESCRIPTION
     tax - tax exempt, empty or `Y'
     otaker - order taker (assigned automatically, see the FS::UID manpage)
 METHODS
-    create HASHREF
+    new HASHREF
         Creates a new customer. To add the customer to the database,
         see the section on "insert".
 
@@ -151,24 +151,52 @@ METHODS
         Returns the balance for this customer (total owed minus
         total credited).
 
-BUGS
-    The delete method.
+    invoicing_list [ ARRAYREF ]
+        If an arguement is given, sets these email addresses as
+        invoice recipients (see the FS::cust_main_invoice manpage).
+        Errors are not fatal and are not reported (except as
+        warnings), so use check_invoicing_list first.
+
+        Returns a list of email addresses (with svcnum entries
+        expanded).
+
+        Note: You can clear the invoicing list by passing an empty
+        ARRAYREF. You can check it without disturbing anything by
+        passing nothing.
+
+        This interface may change in the future.
 
-    It doesn't properly override FS::Record yet.
+    check_invoicing_list ARRAYREF
+        Checks these arguements as valid input for the
+        invoicing_list method. If there is an error, returns the
+        error, otherwise returns false.
 
-    hfields should be removed.
+VERSION
+    $Id: cust_main.txt,v 1.3 1999-02-09 09:37:58 ivan Exp $
+
+BUGS
+    The delete method.
 
     Bill and collect options should probably be passed as references
     instead of a list.
 
     CyberCash v2 forces us to define some variables in package main.
 
+    There should probably be a configuration file with a list of
+    allowed credit card types.
+
+    CyberCash is the only processor.
+
+    No multiple currency support (probably a larger project than
+    just this module).
+
 SEE ALSO
     the FS::Record manpage, the FS::cust_pkg manpage, the
     FS::cust_bill manpage, the FS::cust_credit manpage the
     FS::cust_pay_batch manpage, the FS::agent manpage, the
     FS::part_referral manpage, the FS::cust_main_county manpage, the
-    FS::UID manpage, schema.html from the base documentation.
+    FS::cust_main_invoice manpage, the FS::UID manpage, schema.html
+    from the base documentation.
 
 HISTORY
     ivan@voicenet.com 97-jul-28
@@ -199,10 +227,33 @@ HISTORY
     FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
     $Log: cust_main.txt,v $
-    Revision 1.2  1998-11-13 09:56:39  ivan
-    change configuration file layout to support multiple distinct databases (with
-    own set of config files, export, etc.)
- Revision 1.2 1998/11/07 10:24:25 ivan
-    don't use depriciated FS::Bill and FS::Invoice, other
-    miscellania
+    Revision 1.3  1999-02-09 09:37:58  ivan
+    regenerated perl api docs from embedded pod
+ Revision 1.10 1999/01/25 12:26:09 ivan
+    yet more mod_perl stuff
+
+    Revision 1.9 1999/01/18 09:22:41 ivan changes to track email
+    addresses for email invoicing
+
+    Revision 1.8 1998/12/29 11:59:39 ivan mostly properly OO, some
+    work still to be done with svc_ stuff
+
+    Revision 1.7 1998/12/16 09:58:52 ivan library support for
+    editing email invoice destinations (not in sub collect yet)
+
+    Revision 1.6 1998/11/18 09:01:42 ivan i18n! i18n!
+
+    Revision 1.5 1998/11/15 11:23:14 ivan use FS::table_name for all
+    searches to eliminate warnings, emit state/county when they
+    don't match
+
+    Revision 1.4 1998/11/15 05:30:48 ivan bugfix for new config
+    layout
+
+    Revision 1.3 1998/11/13 09:56:54 ivan change configuration file
+    layout to support multiple distinct databases (with own set of
+    config files, export, etc.)
+
+    Revision 1.2 1998/11/07 10:24:25 ivan don't use depriciated
+    FS::Bill and FS::Invoice, other miscellania
 
diff --git a/htdocs/docs/man/cust_main_county.txt b/htdocs/docs/man/cust_main_county.txt
index 8e99397cc..9a4a60e33 100644
--- a/htdocs/docs/man/cust_main_county.txt
+++ b/htdocs/docs/man/cust_main_county.txt
@@ -5,8 +5,8 @@ NAME
 SYNOPSIS
       use FS::cust_main_county;
 
-      $record = create FS::cust_main_county \%hash;
-      $record = create FS::cust_main_county { 'column' => 'value' };
+      $record = new FS::cust_main_county \%hash;
+      $record = new FS::cust_main_county { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -24,9 +24,10 @@ DESCRIPTION
     taxnum - primary key (assigned automatically for new tax rates)
     state
     county
+    country
     tax - percentage
 METHODS
-    create HASHREF
+    new HASHREF
         Creates a new tax rate. To add the tax rate to the database,
         see the section on "insert".
 
@@ -48,11 +49,10 @@ METHODS
         there is an error, returns the error, otherwise returns
         false. Called by the insert and replace methods.
 
-BUGS
-    It doesn't properly override FS::Record yet.
-
-    A country field (and possibly a currency field) should be added.
+VERSION
+    $Id: cust_main_county.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
 
+BUGS
 SEE ALSO
     the FS::Record manpage, the FS::cust_main manpage, the
     FS::cust_bill manpage, schema.html from the base documentation.
@@ -65,3 +65,12 @@ HISTORY
 
     pod ivan@sisd.com 98-sep-21
 
+    $Log: cust_main_county.txt,v $
+    Revision 1.3  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.3 1998/12/29 11:59:41
+    ivan mostly properly OO, some work still to be done with svc_
+    stuff
+
+    Revision 1.2 1998/11/18 09:01:43 ivan i18n! i18n!
+
diff --git a/htdocs/docs/man/cust_pay.txt b/htdocs/docs/man/cust_pay.txt
index 9f28d0822..14843d022 100644
--- a/htdocs/docs/man/cust_pay.txt
+++ b/htdocs/docs/man/cust_pay.txt
@@ -4,8 +4,8 @@ NAME
 SYNOPSIS
       use FS::cust_pay;
 
-      $record = create FS::cust_pay \%hash;
-      $record = create FS::cust_pay { 'column' => 'value' };
+      $record = new FS::cust_pay \%hash;
+      $record = new FS::cust_pay { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -29,7 +29,7 @@ DESCRIPTION
     payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
     paybatch - text field for tracking card processing
 METHODS
-    create HASHREF
+    new HASHREF
         Creates a new payment. To add the payment to the databse,
         see the section on "insert".
 
@@ -48,9 +48,10 @@ METHODS
         there is an error, returns the error, otherwise returns
         false. Called by the insert method.
 
-BUGS
-    It doesn't properly override FS::Record yet.
+VERSION
+    $Id: cust_pay.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
 
+BUGS
     Delete and replace methods.
 
 SEE ALSO
@@ -64,3 +65,12 @@ HISTORY
 
     pod ivan@sisd.com 98-sep-21
 
+    $Log: cust_pay.txt,v $
+    Revision 1.3  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.3 1999/01/25 12:26:11 ivan yet
+    more mod_perl stuff
+
+    Revision 1.2 1998/12/29 11:59:43 ivan mostly properly OO, some
+    work still to be done with svc_ stuff
+
diff --git a/htdocs/docs/man/cust_pkg.txt b/htdocs/docs/man/cust_pkg.txt
index c5d143dbe..7486456fe 100644
--- a/htdocs/docs/man/cust_pkg.txt
+++ b/htdocs/docs/man/cust_pkg.txt
@@ -4,8 +4,8 @@ NAME
 SYNOPSIS
       use FS::cust_pkg;
 
-      $record = create FS::cust_pkg \%hash;
-      $record = create FS::cust_pkg { 'column' => 'value' };
+      $record = new FS::cust_pkg \%hash;
+      $record = new FS::cust_pkg { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -23,6 +23,8 @@ SYNOPSIS
 
       $part_pkg = $record->part_pkg;
 
+      @labels = $record->labels;
+
       $error = FS::cust_pkg::order( $custnum, \@pkgparts );
       $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );
 
@@ -46,7 +48,7 @@ DESCRIPTION
     conversion functions.
 
 METHODS
-    create HASHREF
+    new HASHREF
         Create a new billing item. To add the item to the database,
         see the section on "insert".
 
@@ -60,8 +62,6 @@ METHODS
         items, because there would then be no record the customer
         ever purchased the item. Instead, see the cancel method.
 
-        sub delete { return "Can't delete cust_pkg records!"; }
-
     replace OLD_RECORD
         Replaces the OLD_RECORD with this one in the database. If
         there is an error, returns the error, otherwise returns
@@ -70,7 +70,8 @@ METHODS
         Currently, custnum, setup, bill, susp, expire, and cancel
         may be changed.
 
-        pkgpart may not be changed, but see the order subroutine.
+        Changing pkgpart may have disasterous effects. See the order
+        subroutine.
 
         setup and bill are normally updated by calling the bill
         method of a customer object (see the FS::cust_main manpage).
@@ -114,6 +115,11 @@ METHODS
         Returns the definition for this billing item, as an
         FS::part_pkg object (see L<FS::part_pkg).
 
+    labels
+        Returns a list of lists, calling the label method for all
+        services (see the FS::cust_svc manpage) of this billing
+        item.
+
 SUBROUTINES
     order CUSTNUM, PKGPARTS_ARYREF, [ REMOVE_PKGNUMS_ARYREF ]
         CUSTNUM is a customer (see the FS::cust_main manpage)
@@ -128,9 +134,10 @@ SUBROUTINES
         items. An error is returned if this is not possible (see the
         FS::pkg_svc manpage).
 
-BUGS
-    It doesn't properly override FS::Record yet.
+VERSION
+    $Id: cust_pkg.txt,v 1.3 1999-02-09 09:38:01 ivan Exp $
 
+BUGS
     sub order is not OO. Perhaps it should be moved to FS::cust_main
     and made so?
 
@@ -141,6 +148,13 @@ BUGS
     defines a standard method to pass dates to the recur_prog
     expression, it should do so.
 
+    FS::svc_acct, FS::svc_acct_sm, and FS::svc_domain are loaded via
+    'use' at compile time, rather than via 'require' in sub { setup,
+    suspend, unsuspend, cancel } because they use %FS::UID::callback
+    to load configuration values. Probably need a subroutine which
+    decides what to do based on whether or not we've fetched the
+    user yet, rather than a hash. See FS::UID and the TODO.
+
 SEE ALSO
     the FS::Record manpage, the FS::cust_main manpage, the
     FS::part_pkg manpage, the FS::cust_svc manpage , the FS::pkg_svc
@@ -155,9 +169,19 @@ HISTORY
     pod ivan@sisd.com 98-sep-21
 
     $Log: cust_pkg.txt,v $
-    Revision 1.2  1998-11-13 09:56:40  ivan
-    change configuration file layout to support multiple distinct databases (with
-    own set of config files, export, etc.)
- Revision 1.2 1998/11/12 03:42:45 ivan
-    added label method
+    Revision 1.3  1999-02-09 09:38:01  ivan
+    regenerated perl api docs from embedded pod
+ Revision 1.6 1999/01/25 12:26:12 ivan yet
+    more mod_perl stuff
+
+    Revision 1.5 1999/01/18 21:58:07 ivan esthetic: eq and ne were
+    used in a few places instead of == and !=
+
+    Revision 1.4 1998/12/29 11:59:45 ivan mostly properly OO, some
+    work still to be done with svc_ stuff
+
+    Revision 1.3 1998/11/15 13:01:35 ivan allow pkgpart changing
+    (for per-customer custom pricing). warn about it in doc
+
+    Revision 1.2 1998/11/12 03:42:45 ivan added label method
 
diff --git a/htdocs/docs/man/cust_refund.txt b/htdocs/docs/man/cust_refund.txt
index 392a0b57a..a982ca610 100644
--- a/htdocs/docs/man/cust_refund.txt
+++ b/htdocs/docs/man/cust_refund.txt
@@ -4,8 +4,8 @@ NAME
 SYNOPSIS
       use FS::cust_refund;
 
-      $record = create FS::cust_refund \%hash;
-      $record = create FS::cust_refund { 'column' => 'value' };
+      $record = new FS::cust_refund \%hash;
+      $record = new FS::cust_refund { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -28,7 +28,7 @@ DESCRIPTION
     payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
     otaker - order taker (assigned automatically, see the FS::UID manpage)
 METHODS
-    create HASHREF
+    new HASHREF
         Creates a new refund. To add the refund to the database, see
         the section on "insert".
 
@@ -47,9 +47,10 @@ METHODS
         there is an error, returns the error, otherwise returns
         false. Called by the insert method.
 
-BUGS
-    It doesn't properly override FS::Record yet.
+VERSION
+    $Id: cust_refund.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
 
+BUGS
     Delete and replace methods.
 
 SEE ALSO
@@ -64,3 +65,12 @@ HISTORY
 
     pod and finish up ivan@sisd.com 98-sep-21
 
+    $Log: cust_refund.txt,v $
+    Revision 1.3  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.3 1999/01/25 12:26:13 ivan
+    yet more mod_perl stuff
+
+    Revision 1.2 1998/12/29 11:59:46 ivan mostly properly OO, some
+    work still to be done with svc_ stuff
+
diff --git a/htdocs/docs/man/cust_svc.txt b/htdocs/docs/man/cust_svc.txt
index adc1ca23f..206d9d34b 100644
--- a/htdocs/docs/man/cust_svc.txt
+++ b/htdocs/docs/man/cust_svc.txt
@@ -4,8 +4,8 @@ NAME
 SYNOPSIS
       use FS::cust_svc;
 
-      $record = create FS::cust_svc \%hash
-      $record = create FS::cust_svc { 'column' => 'value' };
+      $record = new FS::cust_svc \%hash
+      $record = new FS::cust_svc { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -25,7 +25,7 @@ DESCRIPTION
     pkgnum - Package (see the FS::cust_pkg manpage)
     svcpart - Service definition (see the FS::part_svc manpage)
 METHODS
-    create HASHREF
+    new HASHREF
         Creates a new service. To add the refund to the database,
         see the section on "insert". Services are normally created
         by creating FS::svc_ objects (see the FS::svc_acct manpage,
@@ -59,6 +59,9 @@ METHODS
         or mail alias) - The table name (i.e. svc_domain) for this
         service
 
+VERSION
+    $Id: cust_svc.txt,v 1.4 1999-04-08 13:39:32 ivan Exp $
+
 BUGS
     Behaviour of changing the svcpart of cust_svc records is
     undefined and should possibly be prohibited, and pkg_svc records
@@ -66,6 +69,9 @@ BUGS
 
     pkg_svc records are not checked in general (here).
 
+    Deleting this record doesn't check or delete the svc_* record
+    associated with this record.
+
 SEE ALSO
     the FS::Record manpage, the FS::cust_pkg manpage, the
     FS::part_svc manpage, the FS::pkg_svc manpage, schema.html from
@@ -79,11 +85,12 @@ HISTORY
     pod ivan@sisd.com 98-sep-21
 
     $Log: cust_svc.txt,v $
-    Revision 1.2  1998-11-13 09:56:41  ivan
-    change configuration file layout to support multiple distinct databases (with
-    own set of config files, export, etc.)
- Revision 1.4 1998/11/12 07:58:15 ivan
-    added svcdb to label
+    Revision 1.4  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.5 1998/12/29 11:59:47 ivan
+    mostly properly OO, some work still to be done with svc_ stuff
+
+    Revision 1.4 1998/11/12 07:58:15 ivan added svcdb to label
 
     Revision 1.3 1998/11/12 03:45:38 ivan use FS::table_name for all
     tables qsearch()'ed
diff --git a/htdocs/docs/man/index.html b/htdocs/docs/man/index.html
index 4f33dd485..c3307e868 100644
--- a/htdocs/docs/man/index.html
+++ b/htdocs/docs/man/index.html
@@ -11,6 +11,7 @@
 <li><a href="cust_credit.txt">FS::cust_credit</a>
 <li><a href="cust_main.txt">FS::cust_main</a>
 <li><a href="cust_main_county.txt">FS::cust_main_county</a>
+<li><a href="cust_main_invoice.txt">FS::cust_main_invoice</a>
 <li><a href="cust_pay.txt">FS::cust_pay</a>
 <li><a href="cust_pkg.txt">FS::cust_pkg</a>
 <li><a href="cust_refund.txt">FS::cust_refund</a>
@@ -19,6 +20,7 @@
 <li><a href="part_referral.txt">FS::part_referral</a>
 <li><a href="part_svc.txt">FS::part_svc</a>
 <li><a href="pkg_svc.txt">FS::pkg_svc</a>
+<li><a href="svc_Common.txt">FS::svc_Common</a>
 <li><a href="svc_acct.txt">FS::svc_acct</a>
 <li><a href="svc_acct_pop.txt">FS::svc_acct_pop</a>
 <li><a href="svc_acct_sm.txt">FS::svc_acct_sm</a>
diff --git a/htdocs/docs/man/part_pkg.txt b/htdocs/docs/man/part_pkg.txt
index dc1bce423..02aa109a0 100644
--- a/htdocs/docs/man/part_pkg.txt
+++ b/htdocs/docs/man/part_pkg.txt
@@ -4,8 +4,10 @@ NAME
 SYNOPSIS
       use FS::part_pkg;
 
-      $record = create FS::part_pkg \%hash
-      $record = create FS::part_pkg { 'column' => 'value' };
+      $record = new FS::part_pkg \%hash
+      $record = new FS::part_pkg { 'column' => 'value' };
+
+      $custom_record = $template_record->clone;
 
       $error = $record->insert;
 
@@ -16,7 +18,7 @@ SYNOPSIS
       $error = $record->check;
 
 DESCRIPTION
-    An FS::part_pkg represents a billing item definition.
+    An FS::part_pkg object represents a billing item definition.
     FS::part_pkg inherits from FS::Record. The following fields are
     currently supported:
 
@@ -31,11 +33,18 @@ DESCRIPTION
     are not yet defined.
 
 METHODS
-    create HASHREF
+    new HASHREF
         Creates a new billing item definition. To add the billing
         item definition to the database, see the section on
         "insert".
 
+    clone
+        An alternate constructor. Creates a new billing item
+        definition by duplicating an existing definition. A new
+        pkgpart is assigned and `(CUSTOM) ' is prepended to the
+        comment field. To add the billing item definition to the
+        database, see the section on "insert".
+
     insert
         Adds this billing item definition to the database. If there
         is an error, returns the error, otherwise returns false.
@@ -53,6 +62,9 @@ METHODS
         otherwise returns false. Called by the insert and replace
         methods.
 
+VERSION
+    $Id: part_pkg.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
+
 BUGS
     It doesn't properly override FS::Record yet.
 
@@ -71,3 +83,11 @@ HISTORY
 
     pod ivan@sisd.com 98-sep-21
 
+    $Log: part_pkg.txt,v $
+    Revision 1.3  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.5 1998/12/31 01:04:16 ivan doc
+
+    Revision 1.3 1998/11/15 13:00:15 ivan bugfix in clone method,
+    clone method doc clarification
+
diff --git a/htdocs/docs/man/part_referral.txt b/htdocs/docs/man/part_referral.txt
index 534996323..fbc141c45 100644
--- a/htdocs/docs/man/part_referral.txt
+++ b/htdocs/docs/man/part_referral.txt
@@ -4,8 +4,8 @@ NAME
 SYNOPSIS
       use FS::part_referral;
 
-      $record = create FS::part_referral \%hash
-      $record = create FS::part_referral { 'column' => 'value' };
+      $record = new FS::part_referral \%hash
+      $record = new FS::part_referral { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -25,7 +25,7 @@ DESCRIPTION
     refnum - primary key (assigned automatically for new referrals)
     referral - Text name of this referral
 METHODS
-    create HASHREF
+    new HASHREF
         Creates a new referral. To add the referral to the database,
         see the section on "insert".
 
@@ -45,9 +45,10 @@ METHODS
         there is an error, returns the error, otherwise returns
         false. Called by the insert and replace methods.
 
-BUGS
-    It doesn't properly override FS::Record yet.
+VERSION
+    $Id: part_referral.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
 
+BUGS
     The delete method is unimplemented.
 
 SEE ALSO
@@ -61,3 +62,9 @@ HISTORY
 
     pod ivan@sisd.com 98-sep-21
 
+    $Log: part_referral.txt,v $
+    Revision 1.3  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.2 1998/12/29 11:59:49 ivan
+    mostly properly OO, some work still to be done with svc_ stuff
+
diff --git a/htdocs/docs/man/part_svc.txt b/htdocs/docs/man/part_svc.txt
index 680944e2f..71af2c4f4 100644
--- a/htdocs/docs/man/part_svc.txt
+++ b/htdocs/docs/man/part_svc.txt
@@ -4,8 +4,8 @@ NAME
 SYNOPSIS
       use FS::part_svc;
 
-      $record = create FS::part_referral \%hash
-      $record = create FS::part_referral { 'column' => 'value' };
+      $record = new FS::part_referral \%hash
+      $record = new FS::part_referral { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -27,7 +27,7 @@ DESCRIPTION
     *svcdb*__*field* - Default or fixed value for *field* in *svcdb*.
     *svcdb*__*field*_flag - defines *svcdb*__*field* action: null, `D' for default, or `F' for fixed
 METHODS
-    create HASHREF
+    new HASHREF
         Creates a new service definition. To add the service
         definition to the database, see the section on "insert".
 
@@ -48,11 +48,15 @@ METHODS
         otherwise returns false. Called by the insert and replace
         methods.
 
-BUGS
-    It doesn't properly override FS::Record yet.
+VERSION
+    $Id: part_svc.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
 
+BUGS
     Delete is unimplemented.
 
+    The list of svc_* tables is hardcoded. When svc_acct_pop is
+    renamed, this should be fixed.
+
 SEE ALSO
     the FS::Record manpage, the FS::part_pkg manpage, the
     FS::pkg_svc manpage, the FS::cust_svc manpage, the FS::svc_acct
@@ -67,3 +71,12 @@ HISTORY
 
     pod ivan@sisd.com 98-sep-21
 
+    $Log: part_svc.txt,v $
+    Revision 1.3  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.3 1999/02/07 09:59:44 ivan more
+    mod_perl fixes, and bugfixes Peter Wemm sent via email
+
+    Revision 1.2 1998/12/29 11:59:50 ivan mostly properly OO, some
+    work still to be done with svc_ stuff
+
diff --git a/htdocs/docs/man/pkg_svc.txt b/htdocs/docs/man/pkg_svc.txt
index bde0043f1..d921642be 100644
--- a/htdocs/docs/man/pkg_svc.txt
+++ b/htdocs/docs/man/pkg_svc.txt
@@ -4,8 +4,8 @@ NAME
 SYNOPSIS
       use FS::pkg_svc;
 
-      $record = create FS::pkg_svc \%hash;
-      $record = create FS::pkg_svc { 'column' => 'value' };
+      $record = new FS::pkg_svc \%hash;
+      $record = new FS::pkg_svc { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -26,7 +26,7 @@ DESCRIPTION
     quantity - Quantity of this service definition that this billing item
     definition includes
 METHODS
-    create HASHREF
+    new HASHREF
         Create a new record. To add the record to the database, see
         the section on "insert".
 
@@ -47,9 +47,10 @@ METHODS
         there is an error, returns the error, otherwise returns
         false. Called by the insert and replace methods.
 
-BUGS
-    It doesn't properly override FS::Record yet.
+VERSION
+    $Id: pkg_svc.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
 
+BUGS
 SEE ALSO
     the FS::Record manpage, the FS::part_pkg manpage, the
     FS::part_svc manpage, schema.html from the base documentation.
@@ -59,3 +60,13 @@ HISTORY
 
     pod ivan@sisd.com 98-sep-22
 
+    $Log: pkg_svc.txt,v $
+    Revision 1.3  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.3 1999/01/18 21:58:08 ivan
+    esthetic: eq and ne were used in a few places instead of == and
+    !=
+
+    Revision 1.2 1998/12/29 11:59:51 ivan mostly properly OO, some
+    work still to be done with svc_ stuff
+
diff --git a/htdocs/docs/man/svc_acct.txt b/htdocs/docs/man/svc_acct.txt
index 4c4e8e2c4..f27c1d653 100644
--- a/htdocs/docs/man/svc_acct.txt
+++ b/htdocs/docs/man/svc_acct.txt
@@ -4,8 +4,8 @@ NAME
 SYNOPSIS
       use FS::svc_acct;
 
-      $record = create FS::svc_acct \%hash;
-      $record = create FS::svc_acct { 'column' => 'value' };
+      $record = new FS::svc_acct \%hash;
+      $record = new FS::svc_acct { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -23,7 +23,7 @@ SYNOPSIS
 
 DESCRIPTION
     An FS::svc_acct object represents an account. FS::svc_acct
-    inherits from FS::Record. The following fields are currently
+    inherits from FS::svc_Common. The following fields are currently
     supported:
 
     svcnum - primary key (assigned automatcially for new accounts)
@@ -39,7 +39,7 @@ DESCRIPTION
     slipip - IP address
     radius_*Radius_Attribute* - *Radius-Attribute*
 METHODS
-    create HASHREF
+    new HASHREF
         Creates a new account. To add the account to the database,
         see the section on "insert".
 
@@ -126,19 +126,22 @@ METHODS
 
         Sets any fixed values; see the FS::part_svc manpage.
 
-BUGS
-    It doesn't properly override FS::Record yet.
+VERSION
+    $Id: svc_acct.txt,v 1.3 1999-02-09 09:38:11 ivan Exp $
 
+BUGS
     The remote commands should be configurable.
 
-    The create method should set defaults from part_svc (like the
-    check method sets fixed values).
+    The bits which ssh should fork before doing so.
+
+    The $recref stuff in sub check should be cleaned up.
 
 SEE ALSO
-    the FS::Record manpage, the FS::Conf manpage, the FS::cust_svc
-    manpage, the FS::part_svc manpage, the FS::cust_pkg manpage, the
-    FS::SSH manpage, the ssh manpage, the FS::svc_acct_pop manpage,
-    schema.html from the base documentation.
+    the FS::svc_Common manpage, the FS::Record manpage, the FS::Conf
+    manpage, the FS::cust_svc manpage, the FS::part_svc manpage, the
+    FS::cust_pkg manpage, the FS::SSH manpage, the ssh manpage, the
+    FS::svc_acct_pop manpage, schema.html from the base
+    documentation.
 
 HISTORY
     ivan@voicenet.com 97-jul-16 - 21
@@ -167,8 +170,18 @@ HISTORY
     pod and FS::conf ivan@sisd.com 98-sep-22
 
     $Log: svc_acct.txt,v $
-    Revision 1.2  1998-11-13 09:56:44  ivan
-    change configuration file layout to support multiple distinct databases (with
-    own set of config files, export, etc.)
+    Revision 1.3  1999-02-09 09:38:11  ivan
+    regenerated perl api docs from embedded pod
+ Revision 1.6 1999/01/25 12:26:15 ivan yet
+    more mod_perl stuff
+
+    Revision 1.5 1999/01/18 21:58:09 ivan esthetic: eq and ne were
+    used in a few places instead of == and !=
+
+    Revision 1.4 1998/12/30 00:30:45 ivan svc_ stuff is more
+    properly OO - has a common superclass FS::svc_Common
 
+    Revision 1.2 1998/11/13 09:56:55 ivan change configuration file
+    layout to support multiple distinct databases (with own set of
+    config files, export, etc.)
 
diff --git a/htdocs/docs/man/svc_acct_pop.txt b/htdocs/docs/man/svc_acct_pop.txt
index ac0965413..e8629fd47 100644
--- a/htdocs/docs/man/svc_acct_pop.txt
+++ b/htdocs/docs/man/svc_acct_pop.txt
@@ -4,8 +4,8 @@ NAME
 SYNOPSIS
       use FS::svc_acct_pop;
 
-      $record = create FS::svc_acct_pop \%hash;
-      $record = create FS::svc_acct_pop { 'column' => 'value' };
+      $record = new FS::svc_acct_pop \%hash;
+      $record = new FS::svc_acct_pop { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -26,17 +26,17 @@ DESCRIPTION
     ac - area code
     exch - exchange
 METHODS
-    create HASHREF
+    new HASHREF
         Creates a new point of presence (if only it were that
         easy!). To add the point of presence to the database, see
         the section on "insert".
 
     insert
-        Adds this point of presence to the databaes. If there is an
+        Adds this point of presence to the database. If there is an
         error, returns the error, otherwise returns false.
 
     delete
-        Currently unimplemented.
+        Removes this point of presence from the database.
 
     replace OLD_RECORD
         Replaces OLD_RECORD with this one in the database. If there
@@ -47,9 +47,10 @@ METHODS
         presence. If there is an error, returns the error, otherwise
         returns false. Called by the insert and replace methods.
 
-BUGS
-    It doesn't properly override FS::Record yet.
+VERSION
+    $Id: svc_acct_pop.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
 
+BUGS
     It should be renamed to part_pop.
 
 SEE ALSO
@@ -63,3 +64,9 @@ HISTORY
 
     pod ivan@sisd.com 98-sep-23
 
+    $Log: svc_acct_pop.txt,v $
+    Revision 1.3  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.2 1998/12/29 11:59:53 ivan
+    mostly properly OO, some work still to be done with svc_ stuff
+
diff --git a/htdocs/docs/man/svc_acct_sm.txt b/htdocs/docs/man/svc_acct_sm.txt
index e9940af9a..f260d9f75 100644
--- a/htdocs/docs/man/svc_acct_sm.txt
+++ b/htdocs/docs/man/svc_acct_sm.txt
@@ -4,8 +4,8 @@ NAME
 SYNOPSIS
       use FS::svc_acct_sm;
 
-      $record = create FS::svc_acct_sm \%hash;
-      $record = create FS::svc_acct_sm { 'column' => 'value' };
+      $record = new FS::svc_acct_sm \%hash;
+      $record = new FS::svc_acct_sm { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -31,7 +31,7 @@ DESCRIPTION
     domuid - uid of the target account (see the FS::svc_acct manpage)
     domuser - virtual username
 METHODS
-    create HASHREF
+    new HASHREF
         Creates a new virtual mail alias. To add the virtual mail
         alias to the database, see the section on "insert".
 
@@ -93,11 +93,14 @@ METHODS
 
         Sets any fixed values; see the FS::part_svc manpage.
 
-BUGS
-    It doesn't properly override FS::Record yet.
+VERSION
+    $Id: svc_acct_sm.txt,v 1.2 1999-02-09 09:38:13 ivan Exp $
 
+BUGS
     The remote commands should be configurable.
 
+    The $recref stuff in sub check should be cleaned up.
+
 SEE ALSO
     the FS::Record manpage, the FS::Conf manpage, the FS::cust_svc
     manpage, the FS::part_svc manpage, the FS::cust_pkg manpage, the
diff --git a/htdocs/docs/man/svc_domain.txt b/htdocs/docs/man/svc_domain.txt
index da8c06015..bc69535a0 100644
--- a/htdocs/docs/man/svc_domain.txt
+++ b/htdocs/docs/man/svc_domain.txt
@@ -4,8 +4,8 @@ NAME
 SYNOPSIS
       use FS::svc_domain;
 
-      $record = create FS::svc_domain \%hash;
-      $record = create FS::svc_domain { 'column' => 'value' };
+      $record = new FS::svc_domain \%hash;
+      $record = new FS::svc_domain { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -23,13 +23,13 @@ SYNOPSIS
 
 DESCRIPTION
     An FS::svc_domain object represents a domain. FS::svc_domain
-    inherits from FS::Record. The following fields are currently
+    inherits from FS::svc_Common. The following fields are currently
     supported:
 
     svcnum - primary key (assigned automatically for new accounts)
     domain
 METHODS
-    create HASHREF
+    new HASHREF
         Creates a new domain. To add the domain to the database, see
         the section on "insert".
 
@@ -103,26 +103,26 @@ METHODS
     submit_internic
         Submits a registration email for this domain.
 
-BUGS
-    It doesn't properly override FS::Record yet.
+VERSION
+    $Id: svc_domain.txt,v 1.3 1999-02-09 09:38:14 ivan Exp $
 
+BUGS
     All BIND/DNS fields should be included (and exported).
 
-    All registries should be supported.
+    Delete doesn't send a registration template.
 
-    Not all configuration access is through FS::Conf!
+    All registries should be supported.
 
     Should change action to a real field.
 
-SEE ALSO
-    the FS::Record manpage, the FS::Conf manpage, the FS::cust_svc
-    manpage, the FS::part_svc manpage, the FS::cust_pkg manpage, the
-    FS::SSH manpage, the ssh manpage, the dot-qmail manpage,
-    schema.html from the base documentation, config.html from the
-    base documentation.
+    The $recref stuff in sub check should be cleaned up.
 
-VERSION
-    $Id: svc_domain.txt,v 1.2 1998-11-13 09:56:45 ivan Exp $
+SEE ALSO
+    the FS::svc_Common manpage, the FS::Record manpage, the FS::Conf
+    manpage, the FS::cust_svc manpage, the FS::part_svc manpage, the
+    FS::cust_pkg manpage, the FS::SSH manpage, the ssh manpage, the
+    dot-qmail manpage, schema.html from the base documentation,
+    config.html from the base documentation.
 
 HISTORY
     ivan@voicenet.com 97-jul-21
@@ -140,10 +140,18 @@ HISTORY
     pod, some FS::Conf (not complete) ivan@sisd.com 98-sep-23
 
     $Log: svc_domain.txt,v $
-    Revision 1.2  1998-11-13 09:56:45  ivan
-    change configuration file layout to support multiple distinct databases (with
-    own set of config files, export, etc.)
- Revision 1.2 1998/10/14 08:18:21 ivan
-    More informative error messages and better doc for admin contact
-    email stuff
+    Revision 1.3  1999-02-09 09:38:14  ivan
+    regenerated perl api docs from embedded pod
+ Revision 1.6 1999/01/25 12:26:17 ivan
+    yet more mod_perl stuff
+
+    Revision 1.5 1998/12/30 00:30:47 ivan svc_ stuff is more
+    properly OO - has a common superclass FS::svc_Common
+
+    Revision 1.3 1998/11/13 09:56:57 ivan change configuration file
+    layout to support multiple distinct databases (with own set of
+    config files, export, etc.)
+
+    Revision 1.2 1998/10/14 08:18:21 ivan More informative error
+    messages and better doc for admin contact email stuff
 
diff --git a/htdocs/docs/man/type_pkgs.txt b/htdocs/docs/man/type_pkgs.txt
index 9822b4802..f575e2041 100644
--- a/htdocs/docs/man/type_pkgs.txt
+++ b/htdocs/docs/man/type_pkgs.txt
@@ -4,8 +4,8 @@ NAME
 SYNOPSIS
       use FS::type_pkgs;
 
-      $record = create FS::type_pkgs \%hash;
-      $record = create FS::type_pkgs { 'column' => 'value' };
+      $record = new FS::type_pkgs \%hash;
+      $record = new FS::type_pkgs { 'column' => 'value' };
 
       $error = $record->insert;
 
@@ -24,7 +24,7 @@ DESCRIPTION
     typenum - Agent type, see the FS::agent_type manpage
     pkgpart - Billing item definition, see the FS::part_pkg manpage
 METHODS
-    create HASHREF
+    new HASHREF
         Create a new record. To add the record to the database, see
         the section on "insert".
 
@@ -45,6 +45,14 @@ METHODS
         there is an error, returns the error, otherwise returns
         false. Called by the insert and replace methods.
 
+VERSION
+    $Id: type_pkgs.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
+
+BUGS
+SEE ALSO
+    the FS::Record manpage, the FS::agent_type manpage, the
+    FS::part_pkgs manpage, schema.html from the base documentation.
+
 HISTORY
     Defines the relation between agent types and pkgparts (Which
     pkgparts can the different [types of] agents sell?)
@@ -53,3 +61,9 @@ HISTORY
 
     change to ut_ FS::Record, fixed bugs ivan@sisd.com 97-dec-10
 
+    $Log: type_pkgs.txt,v $
+    Revision 1.3  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.2 1998/12/29 11:59:58 ivan
+    mostly properly OO, some work still to be done with svc_ stuff
+
-- 
cgit v1.2.1


From 3b9e59cc875b1fedb67072efe223c5ed6f1efd5e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 9 Feb 1999 09:55:06 +0000
Subject: invoices show line items for each service in a package (see the label
 method of FS::cust_svc)

---
 site_perl/cust_bill.pm | 28 +++++++++++++++++++---------
 site_perl/cust_pkg.pm  | 22 ++++++++++++++++++++--
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/site_perl/cust_bill.pm b/site_perl/cust_bill.pm
index 6d87b1bb3..0e87755ac 100644
--- a/site_perl/cust_bill.pm
+++ b/site_perl/cust_bill.pm
@@ -308,13 +308,19 @@ sub print_text {
       my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->pkgpart});
       my($pkg)=$part_pkg->pkg;
 
-      push @buf, ( "$pkg Setup",'$' . sprintf("%10.2f",$_->setup) )
-        if $_->setup != 0;
-      push @buf, (
-        "$pkg (" . time2str("%x",$_->sdate) . " - " .
-                              time2str("%x",$_->edate) . ")",
-        '$' . sprintf("%10.2f",$_->recur)
-      ) if $_->recur != 0;
+      if ( $_->setup != 0 ) {
+        push @buf, ( "$pkg Setup",'$' . sprintf("%10.2f",$_->setup) );
+        push @buf, map { "  ". $_->[0]. ": ". $_->[1], '' } $cust_pkg->labels;
+      }
+
+      if ( $_->recur != 0 ) {
+        push @buf, (
+          "$pkg (" . time2str("%x",$_->sdate) . " - " .
+                                time2str("%x",$_->edate) . ")",
+          '$' . sprintf("%10.2f",$_->recur)
+        );
+        push @buf, map { "  ". $_->[0]. ": ". $_->[1], '' } $cust_pkg->labels;
+      }
 
     } else { #pkgnum Tax
       push @buf,("Tax",'$' . sprintf("%10.2f",$_->setup) ) 
@@ -421,7 +427,7 @@ END
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.6 1999-01-25 12:26:07 ivan Exp $
+$Id: cust_bill.pm,v 1.7 1999-02-09 09:55:05 ivan Exp $
 
 =head1 BUGS
 
@@ -449,7 +455,11 @@ charges can be negative ivan@sisd.com 98-jul-13
 pod, ingegrate with FS::Invoice ivan@sisd.com 98-sep-20
 
 $Log: cust_bill.pm,v $
-Revision 1.6  1999-01-25 12:26:07  ivan
+Revision 1.7  1999-02-09 09:55:05  ivan
+invoices show line items for each service in a package (see the label method
+of FS::cust_svc)
+
+Revision 1.6  1999/01/25 12:26:07  ivan
 yet more mod_perl stuff
 
 Revision 1.5  1999/01/18 21:58:03  ivan
diff --git a/site_perl/cust_pkg.pm b/site_perl/cust_pkg.pm
index 039b65451..1f5a873d5 100644
--- a/site_perl/cust_pkg.pm
+++ b/site_perl/cust_pkg.pm
@@ -44,6 +44,8 @@ FS::cust_pkg - Object methods for cust_pkg objects
 
   $part_pkg = $record->part_pkg;
 
+  @labels = $record->labels;
+
   $error = FS::cust_pkg::order( $custnum, \@pkgparts );
   $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );
 
@@ -339,6 +341,18 @@ sub part_pkg {
   qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
 }
 
+=item labels
+
+Returns a list of lists, calling the label method for all services
+(see L<FS::cust_svc>) of this billing item.
+
+=cut
+
+sub labels {
+  my $self = shift;
+  map { [ $_->label ] } qsearch ( 'cust_svc', { 'pkgnum' => $self->pkgnum } );
+}
+
 =back
 
 =head1 SUBROUTINES
@@ -463,7 +477,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.6 1999-01-25 12:26:12 ivan Exp $
+$Id: cust_pkg.pm,v 1.7 1999-02-09 09:55:06 ivan Exp $
 
 =head1 BUGS
 
@@ -494,7 +508,11 @@ fixed for new agent->agent_type->type_pkgs in &order ivan@sisd.com 98-mar-7
 pod ivan@sisd.com 98-sep-21
 
 $Log: cust_pkg.pm,v $
-Revision 1.6  1999-01-25 12:26:12  ivan
+Revision 1.7  1999-02-09 09:55:06  ivan
+invoices show line items for each service in a package (see the label method
+of FS::cust_svc)
+
+Revision 1.6  1999/01/25 12:26:12  ivan
 yet more mod_perl stuff
 
 Revision 1.5  1999/01/18 21:58:07  ivan
-- 
cgit v1.2.1


From 56db918b73539ac0e06bc056528ead7efb928d52 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 9 Feb 1999 09:56:34 +0000
Subject: *** empty log message ***

---
 TODO | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/TODO b/TODO
index 869e13d4a..32961b6a9 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.22 1999-02-07 09:59:12 ivan Exp $
+$Id: TODO,v 1.23 1999-02-09 09:56:34 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,11 +6,9 @@ duplication of effort.
 
 -- before 1.2b1 --
 
-missed popurl in (at least) search/cust_pkg.cgi
-
 one-screen new customer entry
 
-clean up view/cust_pkg and view/svc_* yuck!
+clean up view/cust_pkg and view/svc_* yuck (popurl and visual)!
 
 Lay out the forms a bit better.
 
@@ -18,14 +16,6 @@ libwww regression test - since it will create sample data, can also use this
 for the web demo
 make fs-setup option to add sample data so you can click on "New Customer" right away?  so people understand what this stuff is?
 
-Allow a cancelled/suspended/active status from packages to bubble up to
-the customer lists.  Put active, then suspended, then cancelled accounts.
-Similar ordering on the package listing inside a single customer.
-
-Add the ability for services to filter information up to the package level
-for invoices and web screens, so you can select a particlar package based
-on username or domain name, etc.
-
 (Test this)
 one-time/per-customer/? changes in rates and descriptions ('remembered
 invoices'): implement by creating a new package on the fly... but it isn't 
@@ -41,6 +31,23 @@ update web demo
 
 -- release 1.2b1 ---
 
+(is this missing on any web screens?  (easy with $cust_svc->label)
+Add the ability for services to filter information up to the package level
+for web screens, so you can select a particlar package based
+on username or domain name, etc.
+
+Allow a cancelled/suspended/active status from packages to bubble up to
+the customer lists.  Put active, then suspended, then cancelled accounts.
+Similar ordering on the package listing inside a single customer.
+
+false laziness: some of search/svc_acct_sm.cgi was copied to search/svc_domain.cgi.  but web interface in general needs to be rewritten in a mucho cleaner way.
+
+Portability: in FS::Record, $sth->execute does not return a number of rows for all DBD's.  see man DBI
+
+subroutine the where clause (eventually all SQL) as OO perhaps (has anyone done this?)
+
+add a select method to 
+
 You can't delete the stuff under administration yet.  Add this,
 _including_ making sure the thing you are deleting is not in use!
 
-- 
cgit v1.2.1


From 9b6448c43836802b019043e4c20ecf6328af3f1b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Feb 1999 08:27:55 +0000
Subject: *** empty log message ***

---
 TODO | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 32961b6a9..93f9ed88d 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.23 1999-02-09 09:56:34 ivan Exp $
+$Id: TODO,v 1.24 1999-02-10 08:27:55 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -31,6 +31,11 @@ update web demo
 
 -- release 1.2b1 ---
 
+edit/cust_main.cgi gives an uninformative error message:
+> Can't call method "agentnum" without a package or object reference at   
+> /usr/local/apache-ssl/htdocs/freeside/edit/cust_main.cgi line 116.
+if there are no agents.
+
 (is this missing on any web screens?  (easy with $cust_svc->label)
 Add the ability for services to filter information up to the package level
 for web screens, so you can select a particlar package based
-- 
cgit v1.2.1


From 505de354b53f046210d86066b87752b56b2aff40 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Feb 1999 09:02:57 +0000
Subject: some new doc files

---
 etc/sql-reserved-words.txt | 103 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 etc/sql-reserved-words.txt

diff --git a/etc/sql-reserved-words.txt b/etc/sql-reserved-words.txt
new file mode 100644
index 000000000..dc507cef5
--- /dev/null
+++ b/etc/sql-reserved-words.txt
@@ -0,0 +1,103 @@
+From http://epoch.cs.berkeley.edu:8000/sequoia/dba/montage/FAQ/SQL.html
+  by Jean Anderson (jta@postgres.berkeley.edu)
+
+What are the SQL reserved words? 
+
+I grep'd the following list out of the sql docs available via anonymous ftp to speckle.ncsl.nist.gov:/isowg3.
+SQL3 words are not set in stone, but you'd do well to avoid them. 
+
+    From sql1992.txt:
+
+         AFTER, ALIAS, ASYNC, BEFORE, BOOLEAN, BREADTH,
+         COMPLETION, CALL, CYCLE, DATA, DEPTH, DICTIONARY, EACH, ELSEIF,
+         EQUALS, GENERAL, IF, IGNORE, LEAVE, LESS, LIMIT, LOOP, MODIFY,
+         NEW, NONE, OBJECT, OFF, OID, OLD, OPERATION, OPERATORS, OTHERS,
+         PARAMETERS, PENDANT, PREORDER, PRIVATE, PROTECTED, RECURSIVE, REF,
+         REFERENCING, REPLACE, RESIGNAL, RETURN, RETURNS, ROLE, ROUTINE,
+         ROW, SAVEPOINT, SEARCH, SENSITIVE, SEQUENCE, SIGNAL, SIMILAR,
+         SQLEXCEPTION, SQLWARNING, STRUCTURE, TEST, THERE, TRIGGER, TYPE,
+         UNDER, VARIABLE, VIRTUAL, VISIBLE, WAIT, WHILE, WITHOUT
+
+    From sql1992.txt (Annex E):
+
+         ABSOLUTE, ACTION, ADD, ALLOCATE, ALTER, ARE, ASSERTION, AT, BETWEEN,
+         BIT, BIT
+
+What are the SQL reserved words? 
+
+I grep'd the following list out of the sql docs available via anonymous ftp to speckle.ncsl.nist.gov:/isowg3.
+SQL3 words are not set in stone, but you'd do well to avoid them. 
+
+    From sql1992.txt:
+
+         AFTER, ALIAS, ASYNC, BEFORE, BOOLEAN, BREADTH,
+         COMPLETION, CALL, CYCLE, DATA, DEPTH, DICTIONARY, EACH, ELSEIF,
+         EQUALS, GENERAL, IF, IGNORE, LEAVE, LESS, LIMIT, LOOP, MODIFY,
+         NEW, NONE, OBJECT, OFF, OID, OLD, OPERATION, OPERATORS, OTHERS,
+         PARAMETERS, PENDANT, PREORDER, PRIVATE, PROTECTED, RECURSIVE, REF,
+         REFERENCING, REPLACE, RESIGNAL, RETURN, RETURNS, ROLE, ROUTINE,
+         ROW, SAVEPOINT, SEARCH, SENSITIVE, SEQUENCE, SIGNAL, SIMILAR,
+         SQLEXCEPTION, SQLWARNING, STRUCTURE, TEST, THERE, TRIGGER, TYPE,
+         UNDER, VARIABLE, VIRTUAL, VISIBLE, WAIT, WHILE, WITHOUT
+
+    From sql1992.txt (Annex E):
+
+         ABSOLUTE, ACTION, ADD, ALLOCATE, ALTER, ARE, ASSERTION, AT, BETWEEN,
+         BIT, BIT
+
+What are the SQL reserved words? 
+
+I grep'd the following list out of the sql docs available via anonymous ftp to speckle.ncsl.nist.gov:/isowg3.
+SQL3 words are not set in stone, but you'd do well to avoid them. 
+
+    From sql1992.txt:
+
+         AFTER, ALIAS, ASYNC, BEFORE, BOOLEAN, BREADTH,
+         COMPLETION, CALL, CYCLE, DATA, DEPTH, DICTIONARY, EACH, ELSEIF,
+         EQUALS, GENERAL, IF, IGNORE, LEAVE, LESS, LIMIT, LOOP, MODIFY,
+         NEW, NONE, OBJECT, OFF, OID, OLD, OPERATION, OPERATORS, OTHERS,
+         PARAMETERS, PENDANT, PREORDER, PRIVATE, PROTECTED, RECURSIVE, REF,
+         REFERENCING, REPLACE, RESIGNAL, RETURN, RETURNS, ROLE, ROUTINE,
+         ROW, SAVEPOINT, SEARCH, SENSITIVE, SEQUENCE, SIGNAL, SIMILAR,
+         SQLEXCEPTION, SQLWARNING, STRUCTURE, TEST, THERE, TRIGGER, TYPE,
+         UNDER, VARIABLE, VIRTUAL, VISIBLE, WAIT, WHILE, WITHOUT
+
+    From sql1992.txt (Annex E):
+
+         ABSOLUTE, ACTION, ADD, ALLOCATE, ALTER, ARE, ASSERTION, AT, BETWEEN,
+         BIT, BIT_LENGTH, BOTH, CASCADE, CASCADED, CASE, CAST, CATALOG,
+         CHAR_LENGTH, CHARACTER_LENGTH, COALESCE, COLLATE, COLLATION, COLUMN,
+         CONNECT, CONNECTION, CONSTRAINT, CONSTRAINTS, CONVERT, CORRESPONDING,
+         CROSS, CURRENT_DATE, CURRENT_TIME, CURRENT_TIMESTAMP, CURRENT_USER,
+         DATE, DAY, DEALLOCATE, DEFERRABLE, DEFERRED, DESCRIBE, DESCRIPTOR,
+         DIAGNOSTICS, DISCONNECT, DOMAIN, DROP, ELSE, END-EXEC, EXCEPT,
+         EXCEPTION, EXECUTE, EXTERNAL, EXTRACT, FALSE, FIRST, FULL, GET,
+         GLOBAL, HOUR, IDENTITY, IMMEDIATE, INITIALLY, INNER, INPUT,
+         INSENSITIVE, INTERSECT, INTERVAL, ISOLATION, JOIN, LAST, LEADING,
+         LEFT, LEVEL, LOCAL, LOWER, MATCH, MINUTE, MONTH, NAMES, NATIONAL,
+         NATURAL, NCHAR, NEXT, NO, NULLIF, OCTET_LENGTH, ONLY, OUTER, OUTPUT,
+         OVERLAPS, PAD, PARTIAL, POSITION, PREPARE, PRESERVE, PRIOR, READ,
+         RELATIVE, RESTRICT, REVOKE, RIGHT, ROWS, SCROLL, SECOND, SESSION,
+         SESSION_USER, SIZE, SPACE, SQLSTATE, SUBSTRING, SYSTEM_USER,
+         TEMPORARY, THEN, TIME, TIMESTAMP, TIMEZONE_HOUR, TIMEZONE_MINUTE,
+         TRAILING, TRANSACTION, TRANSLATE, TRANSLATION, TRIM, TRUE, UNKNOWN,
+         UPPER, USAGE, USING, VALUE, VARCHAR, VARYING, WHEN, WRITE, YEAR, ZONE
+
+    From sql3part2.txt (Annex E)
+
+         ACTION, ACTOR, AFTER, ALIAS, ASYNC, ATTRIBUTES, BEFORE, BOOLEAN,
+         BREADTH, COMPLETION, CURRENT_PATH, CYCLE, DATA, DEPTH, DESTROY,
+         DICTIONARY, EACH, ELEMENT, ELSEIF, EQUALS, FACTOR, GENERAL, HOLD,
+         IGNORE, INSTEAD, LESS, LIMIT, LIST, MODIFY, NEW, NEW_TABLE, NO,
+         NONE, OFF, OID, OLD, OLD_TABLE, OPERATION, OPERATOR, OPERATORS,
+         PARAMETERS, PATH, PENDANT, POSTFIX, PREFIX, PREORDER, PRIVATE,
+         PROTECTED, RECURSIVE, REFERENCING, REPLACE, ROLE, ROUTINE, ROW,
+         SAVEPOINT, SEARCH, SENSITIVE, SEQUENCE, SESSION, SIMILAR, SPACE,
+         SQLEXCEPTION, SQLWARNING, START, STATE, STRUCTURE, SYMBOL, TERM,
+         TEST, THERE, TRIGGER, TYPE, UNDER, VARIABLE, VIRTUAL, VISIBLE,
+         WAIT, WITHOUT
+
+    sql3part4.txt (ANNEX E):
+
+         CALL, DO, ELSEIF, EXCEPTION, IF, LEAVE, LOOP, OTHERS, RESIGNAL,
+         RETURN, RETURNS, SIGNAL, TUPLE, WHILE
-- 
cgit v1.2.1


From 36e3aafeef2f035b31ee03f3214370ba025aba6f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Feb 1999 07:23:23 +0000
Subject: oops, don't comment out &swapuid in &adminsuidsetup!

---
 site_perl/UID.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/site_perl/UID.pm b/site_perl/UID.pm
index c141cab63..b4486c1e8 100644
--- a/site_perl/UID.pm
+++ b/site_perl/UID.pm
@@ -78,7 +78,7 @@ sub adminsuidsetup {
                           'ChopBlanks' => 'true',
   } ) or die "DBI->connect error: $DBI::errstr\n";
 
-  #swapuid(); #go to non-privledged user if running setuid freeside
+  swapuid(); #go to non-privledged user if running setuid freeside
 
   foreach ( keys %callback ) {
     &{$callback{$_}};
@@ -241,7 +241,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.7 1999-01-18 09:22:40 ivan Exp $
+$Id: UID.pm,v 1.8 1999-02-23 07:23:23 ivan Exp $
 
 =head1 BUGS
 
@@ -287,7 +287,10 @@ inlined suidsetup
 ivan@sisd.com 98-sep-12
 
 $Log: UID.pm,v $
-Revision 1.7  1999-01-18 09:22:40  ivan
+Revision 1.8  1999-02-23 07:23:23  ivan
+oops, don't comment out &swapuid in &adminsuidsetup!
+
+Revision 1.7  1999/01/18 09:22:40  ivan
 changes to track email addresses for email invoicing
 
 Revision 1.6  1998/11/15 05:27:48  ivan
-- 
cgit v1.2.1


From 510d2f9647c0651a82760e456b46505e8050d6ed Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Feb 1999 08:09:27 +0000
Subject: beginnings of one-screen new customer entry and some other
 miscellania

---
 TODO                         | 27 ++++++++++--
 htdocs/docs/config.html      |  1 +
 htdocs/edit/cust_main.cgi    | 98 +++++++++++++++++++++++++++++++++++++++++---
 htdocs/edit/part_svc.cgi     | 16 +++++---
 htdocs/edit/svc_acct.cgi     |  9 ++--
 htdocs/edit/svc_acct_pop.cgi | 11 ++---
 htdocs/search/svc_domain.cgi | 13 ++++--
 htdocs/view/svc_domain.cgi   | 11 ++++-
 site_perl/cust_main.pm       | 46 +++++++++++++++++----
 9 files changed, 196 insertions(+), 36 deletions(-)

diff --git a/TODO b/TODO
index 93f9ed88d..611f83ec5 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.24 1999-02-10 08:27:55 ivan Exp $
+$Id: TODO,v 1.25 1999-02-23 08:09:18 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,8 @@ duplication of effort.
 
 -- before 1.2b1 --
 
+TEST email invoices
+
 one-screen new customer entry
 
 clean up view/cust_pkg and view/svc_* yuck (popurl and visual)!
@@ -15,6 +17,8 @@ Lay out the forms a bit better.
 libwww regression test - since it will create sample data, can also use this
 for the web demo
 make fs-setup option to add sample data so you can click on "New Customer" right away?  so people understand what this stuff is?
+(in sample data [ AND DOCUMENT! ] all svc_acct services should have a default
+ or fixed shell )
 
 (Test this)
 one-time/per-customer/? changes in rates and descriptions ('remembered
@@ -27,10 +31,24 @@ associated with any agent types so it won't show up for other customers to buy.
 
 update site_perl/table_template* (pry out of date)
 
+remove "records identical" warning?  gets in the way of more important stuff.
+
 update web demo
 
 -- release 1.2b1 ---
 
+password and slipip stuff in svc_acct.pm store need to be split into two fields or something, so the silliness in svc_acct.pm and svc_acct.export with looking at the data to decide what to do with it can be fixed
+
+i10n: Apache::Language
+
+Apache::Session?  Other useful Apache::* ?
+
+email invoices are only sent for the BILL payby.  If setup, should statements
+(since they're not invoices) be sent for COMP and CARD as well?
+
+$cgi->keywords is causing the (hard to trace) error:
+   	Use of uninitialized value at (eval 5) line 5
+
 edit/cust_main.cgi gives an uninformative error message:
 > Can't call method "agentnum" without a package or object reference at   
 > /usr/local/apache-ssl/htdocs/freeside/edit/cust_main.cgi line 116.
@@ -45,13 +63,16 @@ Allow a cancelled/suspended/active status from packages to bubble up to
 the customer lists.  Put active, then suspended, then cancelled accounts.
 Similar ordering on the package listing inside a single customer.
 
+false laziness: edit/cust_main.cgi got some parts copied from edit/svc_acct.cgi
+the web interface in general needs to be redone in a more abstract way.
+
 false laziness: some of search/svc_acct_sm.cgi was copied to search/svc_domain.cgi.  but web interface in general needs to be rewritten in a mucho cleaner way.
 
 Portability: in FS::Record, $sth->execute does not return a number of rows for all DBD's.  see man DBI
 
 subroutine the where clause (eventually all SQL) as OO perhaps (has anyone done this?)
 
-add a select method to 
+add a select method to ?
 
 You can't delete the stuff under administration yet.  Add this,
 _including_ making sure the thing you are deleting is not in use!
@@ -386,8 +407,6 @@ configuration/setup should get web interface
 ...
 (probably as part of some automated installation process?)
 
-password and slipip stuff in svc_acct.pm store need to be split into two fields or something, so the silliness in svc_acct.pm and svc_acct.export with looking at the data to decide what to do with it can be fixed (1.2)
-
 This requires some serious magic in FS::Record:
 ok, if date_type in fs-setup is to be something besides int,
 now we need to create wrappers
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index 848456cad..1a30b525e 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -28,6 +28,7 @@ All further configuration files and directories are located in
   <li>domain - Your domain name.
   <li>erpcdmachines - Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd' and `/usr/annex/acp_dialup'.
   <li>home - For new users, prefixed to usrename to create a directory name.  Should have a leading but not a trailing slash.
+  <li>invoice_from - Return address on email invoices.
   <li>lpr - Print command for paper invoices, for example `lpr -h'.
   <li>nismachines - Your NIS master (not slave master) machines, one per line.  This enables export of `/etc/global/passwd' and `/etc/global/shadow'.
   <li>qmailmachines - Your qmail machines, one per line.  This enables export of `/var/qmail/control/virtualdomains', `/var/qmail/control/recipientmap', and `/var/qmail/control/rcpthosts'.  The existance of this file (even if empty) also turns on user `.qmail-extension' file maintenance in conjunction with `shellmachine'.
diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 03252b054..ba8642808 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.8 1999-01-25 12:09:53 ivan Exp $
+# $Id: cust_main.cgi,v 1.9 1999-02-23 08:09:20 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -40,7 +40,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.8  1999-01-25 12:09:53  ivan
+# Revision 1.9  1999-02-23 08:09:20  ivan
+# beginnings of one-screen new customer entry and some other miscellania
+#
+# Revision 1.8  1999/01/25 12:09:53  ivan
 # yet more mod_perl stuff
 #
 # Revision 1.7  1999/01/19 05:13:34  ivan
@@ -66,12 +69,25 @@ use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum
              $last $first $ss $company $address1 $address2 $city $zip 
              $daytime $night $fax @invoicing_list $invoicing_list $payinfo
              $payname %payby %paybychecked $refnum $otaker $r );
+use vars qw ( $conf $pkgpart $username $password $popnum $ulen $ulen2 );
 use CGI::Switch;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
-use FS::Record qw(qsearch qsearchs fields);
+#use FS::Record qw(qsearch qsearchs fields);
+use FS::Record qw(qsearch qsearchs fields dbdef);
 use FS::CGI qw(header popurl itable table);
 use FS::cust_main;
+use FS::agent;
+use FS::part_referral;
+use FS::cust_main_county;
+
+  #for misplaced logic below
+  use FS::pkg_svc;
+  use FS::part_svc;
+  use FS::part_pkg;
+
+  #for false laziness below
+  use FS::svc_acct_pop;
 
 $cgi = new CGI;
 cgisuidsetup($cgi);
@@ -83,15 +99,27 @@ if ( $cgi->param('error') ) {
     map { $_, scalar($cgi->param($_)) } fields('cust_main')
   } );
   $custnum = $cust_main->custnum;
+  $pkgpart = $cgi->param('pkgpart');
+  $username = $cgi->param('username');
+  $password = $cgi->param('_password');
+  $popnum = $cgi->param('popnum');
 } elsif ( $cgi->keywords ) { #editing
   my( $query ) = $cgi->keywords;
   $query =~ /^(\d+)$/;
   $custnum=$1;
   $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
+  $pkgpart = 0;
+  $username = '';
+  $password = '';
+  $popnum = 0;
 } else {
   $custnum='';
   $cust_main = new FS::cust_main ( {} );
   $cust_main->setfield('otaker',&getotaker);
+  $pkgpart = 0;
+  $username = '';
+  $password = '';
+  $popnum = 0;
 }
 $action = $custnum ? 'Edit' : 'Add';
 
@@ -140,7 +168,7 @@ if ( $custnum ) {
     $refnum ||= $referrals[0]->refnum;
     print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
   } else {
-    print qq!<BR>${r}Referral <SELECT NAME="refnum" SIZE="1">!;
+    print qq!<BR><BR>${r}Referral <SELECT NAME="refnum" SIZE="1">!;
     print "<OPTION> ";
     my($referral);
     foreach $referral (sort {
@@ -200,7 +228,7 @@ print <<END;
 <TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12></TD></TR>
 END
 
-print "</TABLE>$r designates required fields<BR>";
+print "</TABLE>$r required fields<BR>";
 
 # billing info
 
@@ -270,8 +298,66 @@ for (qw(CARD BILL COMP)) {
   }
 }
 
-print "</TR></TABLE>$r designates required fields for each billing type";
+print "</TR></TABLE>$r required fields for each billing type";
+
+unless ( $custnum ) {
+  # pry the wrong place for this logic.  also pretty expensive
+  #use FS::pkg_svc;
+  #use FS::part_svc;
+  #use FS::part_pkg;
+
+  my %pkgpart;
+  #foreach ( @pkg_svc ) {
+  foreach ( qsearch( 'pkg_svc', {} ) ) {
+    my $part_svc = qsearchs ( 'part_svc', { 'svcpart' => $_->svcpart } );
+    $pkgpart{ $_->pkgpart } = 9999 # never will == 1 below
+      if ( $part_svc->svcdb ne 'svc_acct' );
+    $pkgpart{ $_->pkgpart }++;
+  }
+
+  my @part_pkg =
+    #grep { $pkgpart{ $_->pkgpart } == 1 } qsearch( 'part_pkg', {} );
+    grep { ( $pkgpart{ $_->pkgpart } || 0 ) == 1 } qsearch( 'part_pkg', {} );
+
+  if ( @part_pkg ) {
 
+    print "<BR><BR>First package", itable("#c0c0c0"),
+          qq!<TR><TD COLSPAN=2><SELECT NAME="pkgpart">!;
+
+    print qq!<OPTION VALUE="">(none)!;
+
+    foreach my $part_pkg ( @part_pkg ) {
+      print qq!<OPTION VALUE="!, $part_pkg->pkgpart, '"',
+            " SELECTED"x($part_pkg->pkgpart == $pkgpart),
+            ">", $part_pkg->pkg, " - ", $part_pkg->comment;
+    }
+    print "</SELECT></TD></TR>";
+
+    #false laziness: (mostly) copied from edit/svc_acct.cgi
+    #$ulen = $svc_acct->dbdef_table->column('username')->length;
+    $ulen = dbdef->table('svc_acct')->column('username')->length;
+    $ulen2 = $ulen+2;
+    print <<END;
+<TR><TD ALIGN="right">Username</TD>
+<TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
+<TR><TD ALIGN="right">Password</TD>
+<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8>
+(blank to generate)</TD></TR>
+END
+    print qq!<TR><TD ALIGN="right">POP</TD><TD><SELECT NAME="popnum" SIZE=1><OPTION> !;
+    my($svc_acct_pop);
+    foreach $svc_acct_pop ( qsearch ('svc_acct_pop',{} ) ) {
+    print "<OPTION", $svc_acct_pop->popnum == $popnum ? ' SELECTED' : '', ">", 
+          $svc_acct_pop->popnum, ": ", 
+          $svc_acct_pop->city, ", ",
+          $svc_acct_pop->state,
+          " (", $svc_acct_pop->ac, ")/",
+          $svc_acct_pop->exch, "\n"
+        ;
+    }
+    print "</SELECT></TD></TR></TABLE>";
+  }
+}
 
 $otaker = $cust_main->otaker;
 print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!,
diff --git a/htdocs/edit/part_svc.cgi b/htdocs/edit/part_svc.cgi
index 8a39fc7a9..95e1c8755 100755
--- a/htdocs/edit/part_svc.cgi
+++ b/htdocs/edit/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.8 1999-02-07 09:59:21 ivan Exp $
+# $Id: part_svc.cgi,v 1.9 1999-02-23 08:09:21 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.8  1999-02-07 09:59:21  ivan
+# Revision 1.9  1999-02-23 08:09:21  ivan
+# beginnings of one-screen new customer entry and some other miscellania
+#
+# Revision 1.8  1999/02/07 09:59:21  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.7  1999/01/19 05:13:42  ivan
@@ -151,9 +154,12 @@ foreach $svcdb ( qw(
   my($ptmp)="<TD ROWSPAN=$rowspan>$svcdb</TD>";
   my($row);
   foreach $row (@rows) {
-    my($value)=$part_svc->getfield($svcdb.'__'.$row);
-    my($flag)=$part_svc->getfield($svcdb.'__'.$row.'_flag');
-    print "<TR>$ptmp<TD>$row - <FONT SIZE=-1>$defs{$svcdb}{$row}</FONT></TD>";
+    my $value = $part_svc->getfield($svcdb. '__'. $row);
+    my $flag = $part_svc->getfield($svcdb. '__'. $row. '_flag');
+    print "<TR>$ptmp<TD>$row";
+    print "- <FONT SIZE=-1>$defs{$svcdb}{$row}</FONT>"
+      if defined $defs{$svcdb}{$row};
+    print "</TD>";
     print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE=""!.
       ' CHECKED'x($flag eq ''). ">Off</TD>";
     print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE="D"!.
diff --git a/htdocs/edit/svc_acct.cgi b/htdocs/edit/svc_acct.cgi
index 876d7be5a..010cdca96 100755
--- a/htdocs/edit/svc_acct.cgi
+++ b/htdocs/edit/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.7 1999-02-07 09:59:22 ivan Exp $
+# $Id: svc_acct.cgi,v 1.8 1999-02-23 08:09:22 ivan Exp $
 #
 # Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -18,7 +18,10 @@
 # use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.7  1999-02-07 09:59:22  ivan
+# Revision 1.8  1999-02-23 08:09:22  ivan
+# beginnings of one-screen new customer entry and some other miscellania
+#
+# Revision 1.7  1999/02/07 09:59:22  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.6  1999/01/19 05:13:43  ivan
@@ -156,7 +159,7 @@ if ( $part_svc->svc_acct__popnum_flag eq "F" ) {
         $svc_acct_pop->popnum, ": ", 
         $svc_acct_pop->city, ", ",
         $svc_acct_pop->state,
-        "(", $svc_acct_pop->ac, ")/",
+        " (", $svc_acct_pop->ac, ")/",
         $svc_acct_pop->exch, "\n"
       ;
   }
diff --git a/htdocs/edit/svc_acct_pop.cgi b/htdocs/edit/svc_acct_pop.cgi
index 41a163ebb..d6e2e5d3d 100755
--- a/htdocs/edit/svc_acct_pop.cgi
+++ b/htdocs/edit/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.7 1999-02-07 09:59:23 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.8 1999-02-23 08:09:23 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8 
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.7  1999-02-07 09:59:23  ivan
+# Revision 1.8  1999-02-23 08:09:23  ivan
+# beginnings of one-screen new customer entry and some other miscellania
+#
+# Revision 1.7  1999/02/07 09:59:23  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.6  1999/01/19 05:13:44  ivan
@@ -38,11 +41,9 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_acct_pop;
 use FS::CGI qw(header menubar popurl);
-
+use FS::svc_acct_pop;
 $cgi = new CGI;
-
 &cgisuidsetup($cgi);
 
 if ( $cgi->param('error') ) {
diff --git a/htdocs/search/svc_domain.cgi b/htdocs/search/svc_domain.cgi
index 778584d80..0058acabd 100755
--- a/htdocs/search/svc_domain.cgi
+++ b/htdocs/search/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.6 1999-02-09 09:22:59 ivan Exp $
+# $Id: svc_domain.cgi,v 1.7 1999-02-23 08:09:24 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -17,7 +17,10 @@
 # display total, use FS::CGI now does browsing too ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.6  1999-02-09 09:22:59  ivan
+# Revision 1.7  1999-02-23 08:09:24  ivan
+# beginnings of one-screen new customer entry and some other miscellania
+#
+# Revision 1.6  1999/02/09 09:22:59  ivan
 # visual and bugfixes
 #
 # Revision 1.5  1999/02/07 09:59:39  ivan
@@ -35,12 +38,16 @@
 #
 
 use strict;
-use vars qw ( $cgi @svc_domain $sortby $query $conf );
+use vars qw ( $cgi @svc_domain $sortby $query $conf $mydomain );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header eidiot popurl);
+use FS::svc_domain;
+use FS::cust_svc;
+use FS::svc_acct_sm;
+use FS::svc_acct;
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
diff --git a/htdocs/view/svc_domain.cgi b/htdocs/view/svc_domain.cgi
index a6de40429..8941a3c89 100755
--- a/htdocs/view/svc_domain.cgi
+++ b/htdocs/view/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.6 1999-01-19 05:14:23 ivan Exp $
+# $Id: svc_domain.cgi,v 1.7 1999-02-23 08:09:25 ivan Exp $
 #
 # Usage: svc_domain svcnum
 #        http://server.name/path/svc_domain.cgi?svcnum
@@ -15,7 +15,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.6  1999-01-19 05:14:23  ivan
+# Revision 1.7  1999-02-23 08:09:25  ivan
+# beginnings of one-screen new customer entry and some other miscellania
+#
+# Revision 1.6  1999/01/19 05:14:23  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -41,6 +44,10 @@ use CGI;
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(header menubar popurl);
 use FS::Record qw(qsearchs);
+use FS::svc_domain;
+use FS::cust_svc;
+use FS::cust_pkg;
+use FS::part_svc;
 
 $cgi = new CGI;
 cgisuidsetup($cgi);
diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index a89896da6..5a83741b0 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -5,12 +5,14 @@ use vars qw($paymentserversecret $paymentserverport $paymentserverhost);
 package FS::cust_main;
 
 use strict;
-use vars qw(@ISA $conf $lpr $processor $xaction $E_NoErr);
+use vars qw(@ISA $conf $lpr $processor $xaction $E_NoErr $invoice_from);
 use Safe;
 use Carp;
 use Time::Local;
 use Date::Format;
 use Date::Manip;
+use Mail::Internet;
+use Mail::Header;
 use Business::CreditCard;
 use FS::UID qw( getotaker );
 use FS::Record qw( qsearchs qsearch );
@@ -31,6 +33,7 @@ use FS::cust_main_invoice;
 $FS::UID::callback{'FS::cust_main'} = sub { 
   $conf = new FS::Conf;
   $lpr = $conf->config('lpr');
+  $invoice_from = $conf->config('invoice_from');
 
   if ( $conf->exists('cybercash3.2') ) {
     require CCMckLib3_2;
@@ -585,11 +588,30 @@ sub collect {
            && ( $cust_bill->printed * 2592000 ) <= $since
       ) {
 
-        open(LPR, "|$lpr") or die "Can't open pipe to $lpr: $!";
-        print LPR $cust_bill->print_text; #( date )
-        close LPR
-          or die $! ? "Error closing $lpr: $!"
-                       : "Exit status $? from $lpr";
+        #my @print_text = $cust_bill->print_text; #( date )
+        my @invoicing_list = $self->invoicing_list;
+        if ( grep { $_ ne 'POST' } @invoicing_list ) { #email invoice
+          my $header = new Mail::Header ( [
+            "From: $invoice_from",
+            "To: ". join(', ', grep { $_ ne 'POST' } @invoicing_list ),
+            "Sender: $invoice_from",
+            "Reply-To: $invoice_from",
+            "Date: ". time2str("%a, %d %b %Y %X %z", time),
+            "Subject: Invoice",
+          ] );
+          my $message = new Mail::Internet (
+            'Header' => $header,
+            'Body' => [ $cust_bill->print_text ], #( date)
+          );
+          $message->smtpsend or die "Can't send invoice email!"; #die?  warn?
+
+        } elsif ( ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list ) {
+          open(LPR, "|$lpr") or die "Can't open pipe to $lpr: $!";
+          print LPR $cust_bill->print_text; #( date )
+          close LPR
+            or die $! ? "Error closing $lpr: $!"
+                         : "Exit status $? from $lpr";
+        }
 
         my %hash = $cust_bill->hash;
         $hash{'printed'}++;
@@ -611,6 +633,7 @@ sub collect {
       my $error = $cust_pay->insert;
       return 'Error COMPing invnum #' . $cust_bill->invnum .
              ':' . $error if $error;
+
     } elsif ( $self->payby eq 'CARD' ) {
 
       if ( $options{'batch_card'} ne 'yes' ) {
@@ -712,6 +735,10 @@ sub collect {
       return "Unknown payment type ". $self->payby;
     }
 
+
+
+
+
   }
   '';
 
@@ -835,7 +862,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.10 1999-01-25 12:26:09 ivan Exp $
+$Id: cust_main.pm,v 1.11 1999-02-23 08:09:27 ivan Exp $
 
 =head1 BUGS
 
@@ -891,7 +918,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.10  1999-01-25 12:26:09  ivan
+Revision 1.11  1999-02-23 08:09:27  ivan
+beginnings of one-screen new customer entry and some other miscellania
+
+Revision 1.10  1999/01/25 12:26:09  ivan
 yet more mod_perl stuff
 
 Revision 1.9  1999/01/18 09:22:41  ivan
-- 
cgit v1.2.1


From 532db8ddd43eae7f09200ad25fbc542524f2093d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 27 Feb 1999 21:06:48 +0000
Subject: cust_main.paydate should be varchar(10), not @date_type ; problem
 reported by Ben Leibig <leibig@colorado.edu>

---
 bin/fs-setup              | 11 ++++++++---
 htdocs/docs/upgrade3.html |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index f028c6e1d..7a5403b01 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.14 1999-02-07 09:59:14 ivan Exp $
+# $Id: fs-setup,v 1.15 1999-02-27 21:06:21 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,11 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.14  1999-02-07 09:59:14  ivan
+# Revision 1.15  1999-02-27 21:06:21  ivan
+# cust_main.paydate should be varchar(10), not @date_type ; problem reported
+# by Ben Leibig <leibig@colorado.edu>
+#
+# Revision 1.14  1999/02/07 09:59:14  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.13  1999/02/04 06:09:23  ivan
@@ -385,7 +389,8 @@ sub tables_hash_hack {
         'fax',      'varchar', 'NULL', 12,
         'payby',    'char', '',     4,
         'payinfo',  'varchar', 'NULL', 16,
-        'paydate',  @date_type,
+        #'paydate',  @date_type,
+        'paydate',  'varchar', 'NULL', 10,
         'payname',  'varchar', 'NULL', $char_d,
         'tax',      'char', 'NULL', 1,
         'otaker',   'varchar', '',     8,
diff --git a/htdocs/docs/upgrade3.html b/htdocs/docs/upgrade3.html
index 539fe5d82..815652aaf 100644
--- a/htdocs/docs/upgrade3.html
+++ b/htdocs/docs/upgrade3.html
@@ -19,6 +19,7 @@ ALTER TABLE cust_main ADD titlenum int NULL;
 -->ALTER TABLE cust_main CHANGE state state varchar(80) NULL;
 ALTER TABLE cust_main_county CHANGE state state varchar(80) NULL;
 ALTER TABLE cust_main_county ADD country char(2);
+ALTER TABLE cust_main CHANGE paydate paydate varchar(10);
 UPDATE cust_main SET country = "US" where country IS NULL OR country = '';
 UPDATE cust_main_county SET country = "US" where country IS NULL OR country = "";
 <!--CREATE TABLE part_title (
-- 
cgit v1.2.1


From 9ad5cd28c3e9bd036bb632a3778c582fd4d7b9b5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 27 Feb 1999 21:24:22 +0000
Subject: parse paydate correctly for cybercash

---
 site_perl/cust_main.pm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index 5a83741b0..ad2ff0264 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -643,8 +643,9 @@ sub collect {
         if ( $processor =~ /^cybercash/ ) {
 
           #fix exp. date for cybercash
-          $self->paydate =~ /^(\d+)\/\d*(\d{2})$/;
-          my $exp = "$1/$2";
+          #$self->paydate =~ /^(\d+)\/\d*(\d{2})$/;
+          $self->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
+          my $exp = "$2/$1";
 
           my $paybatch = $cust_bill->invnum. 
                          '-' . time2str("%y%m%d%H%M%S", time);
@@ -862,7 +863,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.11 1999-02-23 08:09:27 ivan Exp $
+$Id: cust_main.pm,v 1.12 1999-02-27 21:24:22 ivan Exp $
 
 =head1 BUGS
 
@@ -918,7 +919,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.11  1999-02-23 08:09:27  ivan
+Revision 1.12  1999-02-27 21:24:22  ivan
+parse paydate correctly for cybercash
+
+Revision 1.11  1999/02/23 08:09:27  ivan
 beginnings of one-screen new customer entry and some other miscellania
 
 Revision 1.10  1999/01/25 12:26:09  ivan
-- 
cgit v1.2.1


From 37dcdd94962587d6dbc3225439c91e46b0b623c5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 28 Feb 1999 00:04:04 +0000
Subject: removed misleading comments

---
 htdocs/edit/cust_credit.cgi         |  9 ++++----
 htdocs/edit/cust_main.cgi           | 46 +++++++++++++++++++++++++++++++++----
 htdocs/edit/cust_pay.cgi            |  9 ++++----
 htdocs/edit/cust_pkg.cgi            |  9 ++++----
 htdocs/edit/process/cust_credit.cgi |  9 ++++----
 htdocs/edit/process/cust_main.cgi   | 12 ++++++----
 htdocs/edit/process/cust_pay.cgi    |  9 ++++----
 htdocs/edit/process/cust_pkg.cgi    |  9 ++++----
 htdocs/edit/process/svc_acct.cgi    |  9 ++++----
 htdocs/edit/process/svc_acct_sm.cgi |  9 ++++----
 htdocs/edit/process/svc_domain.cgi  |  9 ++++----
 htdocs/edit/svc_acct.cgi            |  9 ++++----
 htdocs/edit/svc_acct_sm.cgi         |  9 ++++----
 htdocs/edit/svc_domain.cgi          |  9 ++++----
 htdocs/misc/cancel-unaudited.cgi    |  9 ++++----
 htdocs/misc/cancel_pkg.cgi          |  9 ++++----
 htdocs/misc/expire_pkg.cgi          |  9 ++++----
 htdocs/misc/link.cgi                |  9 ++++----
 htdocs/misc/susp_pkg.cgi            |  9 ++++----
 htdocs/misc/unsusp_pkg.cgi          |  9 ++++----
 htdocs/search/cust_bill.cgi         |  9 ++++----
 htdocs/search/cust_main.cgi         |  9 ++++----
 htdocs/search/svc_acct_sm.cgi       |  9 ++++----
 htdocs/search/svc_domain.cgi        |  9 ++++----
 htdocs/view/cust_bill.cgi           |  9 ++++----
 htdocs/view/cust_main.cgi           |  9 ++++----
 htdocs/view/cust_pkg.cgi            |  9 ++++----
 htdocs/view/svc_acct.cgi            |  9 ++++----
 htdocs/view/svc_acct_sm.cgi         |  9 ++++----
 htdocs/view/svc_domain.cgi          |  9 ++++----
 30 files changed, 189 insertions(+), 121 deletions(-)

diff --git a/htdocs/edit/cust_credit.cgi b/htdocs/edit/cust_credit.cgi
index f0b17e172..35c4d48fe 100755
--- a/htdocs/edit/cust_credit.cgi
+++ b/htdocs/edit/cust_credit.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_credit.cgi,v 1.6 1999-01-25 12:09:52 ivan Exp $
+# $Id: cust_credit.cgi,v 1.7 1999-02-28 00:03:33 ivan Exp $
 #
 # Usage: cust_credit.cgi custnum [ -paybatch ]
 #        http://server.name/path/cust_credit?custnum [ -paybatch ]
 #
-# Note: Should be run setuid root as user nobody.
-#
 # some hooks in here for modifications as well as additions, but needs (lots) more work.
 # also see process/cust_credit.cgi, the script that processes the form.
 #
@@ -25,7 +23,10 @@
 # rewrite ivan@sisd.com 98-mar-16
 #
 # $Log: cust_credit.cgi,v $
-# Revision 1.6  1999-01-25 12:09:52  ivan
+# Revision 1.7  1999-02-28 00:03:33  ivan
+# removed misleading comments
+#
+# Revision 1.6  1999/01/25 12:09:52  ivan
 # yet more mod_perl stuff
 #
 # Revision 1.5  1999/01/19 05:13:33  ivan
diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index ba8642808..35b80fa14 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.9 1999-02-23 08:09:20 ivan Exp $
+# $Id: cust_main.cgi,v 1.10 1999-02-28 00:03:34 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
 #
-# Note: Should be run setuid freeside as user nobody.
-#
 # ivan@voicenet.com 96-nov-29 -> 96-dec-04
 #
 # Blank custnum for new customer.
@@ -40,7 +38,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.9  1999-02-23 08:09:20  ivan
+# Revision 1.10  1999-02-28 00:03:34  ivan
+# removed misleading comments
+#
+# Revision 1.9  1999/02/23 08:09:20  ivan
 # beginnings of one-screen new customer entry and some other miscellania
 #
 # Revision 1.8  1999/01/25 12:09:53  ivan
@@ -89,6 +90,10 @@ use FS::cust_main_county;
   #for false laziness below
   use FS::svc_acct_pop;
 
+  #for (other) false laziness below
+  use FS::agent;
+  use FS::type_pkgs;
+
 $cgi = new CGI;
 cgisuidsetup($cgi);
 
@@ -306,6 +311,34 @@ unless ( $custnum ) {
   #use FS::part_svc;
   #use FS::part_pkg;
 
+  #false laziness, copied from FS::cust_pkg::order
+  my %part_pkg;
+  if ( scalar(@agents) == 1 ) {
+    # generate %part_pkg
+    # $part_pkg{$pkgpart} is true iff $custnum may purchase $pkgpart
+    	#my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
+    	#my($agent)=qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
+    my($agent)=qsearchs('agent',{'agentnum'=> $agentnum });
+
+    my($type_pkgs);
+    foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
+      my($pkgpart)=$type_pkgs->pkgpart;
+      $part_pkg{$pkgpart}++;
+    }
+  } else {
+    #can't know (agent not chosen), so, allow all
+    my %typenum;
+    foreach my $agent ( @agents ) {
+      next if $typenum{$agent->typenum}++;
+      foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
+        my($pkgpart)=$type_pkgs->pkgpart;
+        $part_pkg{$pkgpart}++;
+      }
+    }
+
+  }
+  #eslaf
+
   my %pkgpart;
   #foreach ( @pkg_svc ) {
   foreach ( qsearch( 'pkg_svc', {} ) ) {
@@ -317,7 +350,10 @@ unless ( $custnum ) {
 
   my @part_pkg =
     #grep { $pkgpart{ $_->pkgpart } == 1 } qsearch( 'part_pkg', {} );
-    grep { ( $pkgpart{ $_->pkgpart } || 0 ) == 1 } qsearch( 'part_pkg', {} );
+    grep {
+      ( $pkgpart{ $_->pkgpart } || 0 ) == 1
+      && $part_pkg{ $_->pkgpart }
+    } qsearch( 'part_pkg', {} );
 
   if ( @part_pkg ) {
 
diff --git a/htdocs/edit/cust_pay.cgi b/htdocs/edit/cust_pay.cgi
index 27015171f..5dee76ed9 100755
--- a/htdocs/edit/cust_pay.cgi
+++ b/htdocs/edit/cust_pay.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pay.cgi,v 1.5 1999-01-25 12:09:56 ivan Exp $
+# $Id: cust_pay.cgi,v 1.6 1999-02-28 00:03:35 ivan Exp $
 #
 # Usage: cust_pay.cgi invnum
 #        http://server.name/path/cust_pay.cgi?invnum
 #
-# Note: Should be run setuid as user nobody.
-#
 # some hooks for modifications as well as additions, but needs work.
 #
 # ivan@voicenet.com 96-dec-11
@@ -14,7 +12,10 @@
 # rewrite ivan@sisd.com 98-mar-16
 #
 # $Log: cust_pay.cgi,v $
-# Revision 1.5  1999-01-25 12:09:56  ivan
+# Revision 1.6  1999-02-28 00:03:35  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/01/25 12:09:56  ivan
 # yet more mod_perl stuff
 #
 # Revision 1.4  1999/01/19 05:13:37  ivan
diff --git a/htdocs/edit/cust_pkg.cgi b/htdocs/edit/cust_pkg.cgi
index afe6f8770..8906a9441 100755
--- a/htdocs/edit/cust_pkg.cgi
+++ b/htdocs/edit/cust_pkg.cgi
@@ -1,14 +1,12 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.5 1999-02-07 09:59:18 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.6 1999-02-28 00:03:36 ivan Exp $
 #
 # this is for changing packages around, not editing things within the package
 #
 # Usage: cust_pkg.cgi custnum
 #        http://server.name/path/cust_pkg.cgi?custnum
 #
-# Note: Should be run setuid freeside as user nobody
-#
 # started with /sales/add/cust_pkg.cgi, which added packages
 # ivan@voicenet.com 97-jan-5, 97-mar-21
 #
@@ -25,7 +23,10 @@
 # 98-jun-1
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.5  1999-02-07 09:59:18  ivan
+# Revision 1.6  1999-02-28 00:03:36  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/02/07 09:59:18  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.4  1999/01/19 05:13:38  ivan
diff --git a/htdocs/edit/process/cust_credit.cgi b/htdocs/edit/process/cust_credit.cgi
index f95688197..0b3cb54db 100755
--- a/htdocs/edit/process/cust_credit.cgi
+++ b/htdocs/edit/process/cust_credit.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_credit.cgi,v 1.5 1999-01-25 12:09:59 ivan Exp $
+# $Id: cust_credit.cgi,v 1.6 1999-02-28 00:03:41 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_credit.cgi
 #
-# Note: Should be run setuid root as user nobody.
-#
 # ivan@voicenet.com 96-dec-05 -> 96-dec-08
 #
 # post a refund if $new_paybatch
@@ -22,7 +20,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_credit.cgi,v $
-# Revision 1.5  1999-01-25 12:09:59  ivan
+# Revision 1.6  1999-02-28 00:03:41  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/01/25 12:09:59  ivan
 # yet more mod_perl stuff
 #
 # Revision 1.4  1999/01/19 05:13:49  ivan
diff --git a/htdocs/edit/process/cust_main.cgi b/htdocs/edit/process/cust_main.cgi
index 3262c42e2..9745fa68d 100755
--- a/htdocs/edit/process/cust_main.cgi
+++ b/htdocs/edit/process/cust_main.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.6 1999-01-25 12:10:00 ivan Exp $
+# $Id: cust_main.cgi,v 1.7 1999-02-28 00:03:42 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
 #
-# Note: Should be run setuid root as user nobody.
-#
 # ivan@voicenet.com 96-dec-04
 #
 # added referral check
@@ -22,7 +20,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.6  1999-01-25 12:10:00  ivan
+# Revision 1.7  1999-02-28 00:03:42  ivan
+# removed misleading comments
+#
+# Revision 1.6  1999/01/25 12:10:00  ivan
 # yet more mod_perl stuff
 #
 # Revision 1.5  1999/01/19 05:13:50  ivan
@@ -89,6 +90,9 @@ $error = $new->check_invoicing_list( \@invoicing_list );
 
 #perhaps the invocing_list magic should move to cust_main.pm?
 if ( $new->custnum eq '' ) {
+  #false laziness: copied from cust_pkg.pm
+  HERE!
+  #
   $error ||= $new->insert;
 } else { #create old record object
   my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } ); 
diff --git a/htdocs/edit/process/cust_pay.cgi b/htdocs/edit/process/cust_pay.cgi
index 0bd9acab4..ca5029c3c 100755
--- a/htdocs/edit/process/cust_pay.cgi
+++ b/htdocs/edit/process/cust_pay.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pay.cgi,v 1.6 1999-01-25 12:19:09 ivan Exp $
+# $Id: cust_pay.cgi,v 1.7 1999-02-28 00:03:43 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_pay.cgi
 #
-# Note: Should be run setuid root as user nobody.
-#
 # ivan@voicenet.com 96-dec-11
 #
 # rewrite ivan@sisd.com 98-mar-16
@@ -15,7 +13,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_pay.cgi,v $
-# Revision 1.6  1999-01-25 12:19:09  ivan
+# Revision 1.7  1999-02-28 00:03:43  ivan
+# removed misleading comments
+#
+# Revision 1.6  1999/01/25 12:19:09  ivan
 # yet more mod_perl stuff
 #
 # Revision 1.5  1999/01/19 05:13:53  ivan
diff --git a/htdocs/edit/process/cust_pkg.cgi b/htdocs/edit/process/cust_pkg.cgi
index 2c5eaef97..437569fb4 100755
--- a/htdocs/edit/process/cust_pkg.cgi
+++ b/htdocs/edit/process/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.5 1999-02-07 09:59:26 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.6 1999-02-28 00:03:44 ivan Exp $
 #
 # this is for changing packages around, not for editing things within the
 # package
@@ -8,8 +8,6 @@
 # Usage: post form to:
 #        http://server.name/path/cust_pkg.cgi
 #
-# Note: Should be run setuid root as user nobody.
-#
 # ivan@voicenet.com 97-mar-21 - 97-mar-24
 #
 # rewrote for new API
@@ -21,7 +19,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.5  1999-02-07 09:59:26  ivan
+# Revision 1.6  1999-02-28 00:03:44  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/02/07 09:59:26  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.3  1999/01/19 05:13:54  ivan
diff --git a/htdocs/edit/process/svc_acct.cgi b/htdocs/edit/process/svc_acct.cgi
index ba231ece3..73e9d5d74 100755
--- a/htdocs/edit/process/svc_acct.cgi
+++ b/htdocs/edit/process/svc_acct.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.5 1999-02-07 09:59:30 ivan Exp $
+# $Id: svc_acct.cgi,v 1.6 1999-02-28 00:03:45 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
 #
-# Note: Should br run setuid root as user nobody.
-#
 # ivan@voicenet.com 96-dec-18
 #
 # Changed /u to /u2
@@ -23,7 +21,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.5  1999-02-07 09:59:30  ivan
+# Revision 1.6  1999-02-28 00:03:45  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/02/07 09:59:30  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.4  1999/01/19 05:13:58  ivan
diff --git a/htdocs/edit/process/svc_acct_sm.cgi b/htdocs/edit/process/svc_acct_sm.cgi
index 5fefeafdb..9c39bb8e5 100755
--- a/htdocs/edit/process/svc_acct_sm.cgi
+++ b/htdocs/edit/process/svc_acct_sm.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.5 1999-02-07 09:59:32 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.6 1999-02-28 00:03:46 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct_sm.cgi
 #
-# Note: Should br run setuid root as user nobody.
-#
 # lots of crufty stuff from svc_acct still in here, and modifications are (unelegantly) disabled.
 #
 # ivan@voicenet.com 97-jan-6
@@ -24,7 +22,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.5  1999-02-07 09:59:32  ivan
+# Revision 1.6  1999-02-28 00:03:46  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/02/07 09:59:32  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.4  1999/01/19 05:14:00  ivan
diff --git a/htdocs/edit/process/svc_domain.cgi b/htdocs/edit/process/svc_domain.cgi
index fe3c6f7a1..e12aa1b55 100755
--- a/htdocs/edit/process/svc_domain.cgi
+++ b/htdocs/edit/process/svc_domain.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.5 1999-02-07 09:59:33 ivan Exp $
+# $Id: svc_domain.cgi,v 1.6 1999-02-28 00:03:47 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
 #
-# Note: Should br run setuid root as user nobody.
-#
 # lots of yucky stuff in this one... bleachlkjhui!
 #
 # ivan@voicenet.com 97-jan-6
@@ -20,7 +18,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.5  1999-02-07 09:59:33  ivan
+# Revision 1.6  1999-02-28 00:03:47  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/02/07 09:59:33  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.4  1999/01/19 05:14:01  ivan
diff --git a/htdocs/edit/svc_acct.cgi b/htdocs/edit/svc_acct.cgi
index 010cdca96..a8c4cfb39 100755
--- a/htdocs/edit/svc_acct.cgi
+++ b/htdocs/edit/svc_acct.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.8 1999-02-23 08:09:22 ivan Exp $
+# $Id: svc_acct.cgi,v 1.9 1999-02-28 00:03:37 ivan Exp $
 #
 # Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #
-# Note: Should be run setuid freeside as user nobody
-#
 # ivan@voicenet.com 96-dec-18
 #
 # rewrite ivan@sisd.com 98-mar-8
@@ -18,7 +16,10 @@
 # use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.8  1999-02-23 08:09:22  ivan
+# Revision 1.9  1999-02-28 00:03:37  ivan
+# removed misleading comments
+#
+# Revision 1.8  1999/02/23 08:09:22  ivan
 # beginnings of one-screen new customer entry and some other miscellania
 #
 # Revision 1.7  1999/02/07 09:59:22  ivan
diff --git a/htdocs/edit/svc_acct_sm.cgi b/htdocs/edit/svc_acct_sm.cgi
index d68d67c3a..cb7cbfae0 100755
--- a/htdocs/edit/svc_acct_sm.cgi
+++ b/htdocs/edit/svc_acct_sm.cgi
@@ -1,14 +1,12 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.8 1999-02-07 09:59:24 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.9 1999-02-28 00:03:38 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct_sm.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #
 # use {svcnum} for edit, pkgnum{pkgnum}-svcpart{svcpart} for add
 #
-# Note: Should be run setuid freeside as user nobody.
-#
 # should error out in a more CGI-friendly way, and should have more error checking (sigh).
 #
 # ivan@voicenet.com 97-jan-5
@@ -35,7 +33,10 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-26
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.8  1999-02-07 09:59:24  ivan
+# Revision 1.9  1999-02-28 00:03:38  ivan
+# removed misleading comments
+#
+# Revision 1.8  1999/02/07 09:59:24  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.7  1999/01/19 05:13:45  ivan
diff --git a/htdocs/edit/svc_domain.cgi b/htdocs/edit/svc_domain.cgi
index 05cabba2b..6b5eff560 100755
--- a/htdocs/edit/svc_domain.cgi
+++ b/htdocs/edit/svc_domain.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.8 1999-02-07 09:59:25 ivan Exp $
+# $Id: svc_domain.cgi,v 1.9 1999-02-28 00:03:39 ivan Exp $
 #
 # Usage: svc_domain.cgi pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_domain.cgi?pkgnum{pkgnum}-svcpart{svcpart}
 #
-# Note: Should be run setuid freeside as user nobody
-#
 # ivan@voicenet.com 97-jan-5 -> 97-jan-6
 #
 # changes for domain template 3.5
@@ -17,7 +15,10 @@
 # no GOV in instructions ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.8  1999-02-07 09:59:25  ivan
+# Revision 1.9  1999-02-28 00:03:39  ivan
+# removed misleading comments
+#
+# Revision 1.8  1999/02/07 09:59:25  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.7  1999/01/19 05:13:46  ivan
diff --git a/htdocs/misc/cancel-unaudited.cgi b/htdocs/misc/cancel-unaudited.cgi
index d54674660..78b7d3175 100755
--- a/htdocs/misc/cancel-unaudited.cgi
+++ b/htdocs/misc/cancel-unaudited.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cancel-unaudited.cgi,v 1.5 1999-02-07 09:59:34 ivan Exp $
+# $Id: cancel-unaudited.cgi,v 1.6 1999-02-28 00:03:48 ivan Exp $
 #
 # Usage: cancel-unaudited.cgi svcnum
 #        http://server.name/path/cancel-unaudited.cgi pkgnum
 #
-# Note: Should be run setuid freeside as user nobody
-#
 # ivan@voicenet.com 97-apr-23
 #
 # rewrote for new API
@@ -18,7 +16,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cancel-unaudited.cgi,v $
-# Revision 1.5  1999-02-07 09:59:34  ivan
+# Revision 1.6  1999-02-28 00:03:48  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/02/07 09:59:34  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.4  1999/01/19 05:14:03  ivan
diff --git a/htdocs/misc/cancel_pkg.cgi b/htdocs/misc/cancel_pkg.cgi
index 27bc277c0..78ae64d1f 100755
--- a/htdocs/misc/cancel_pkg.cgi
+++ b/htdocs/misc/cancel_pkg.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cancel_pkg.cgi,v 1.4 1999-01-19 05:14:04 ivan Exp $
+# $Id: cancel_pkg.cgi,v 1.5 1999-02-28 00:03:49 ivan Exp $
 #
 # Usage: cancel_pkg.cgi pkgnum
 #        http://server.name/path/cancel_pkg.cgi pkgnum
 #
-# Note: Should be run setuid freeside as user nobody
-#
 # IT DOESN'T RUN THE APPROPRIATE PROGRAMS YET!!!!
 #
 # probably should generalize this to do cancels, suspensions, unsuspensions, etc.
@@ -29,7 +27,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cancel_pkg.cgi,v $
-# Revision 1.4  1999-01-19 05:14:04  ivan
+# Revision 1.5  1999-02-28 00:03:49  ivan
+# removed misleading comments
+#
+# Revision 1.4  1999/01/19 05:14:04  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
diff --git a/htdocs/misc/expire_pkg.cgi b/htdocs/misc/expire_pkg.cgi
index 8cf553a26..cf1f23153 100755
--- a/htdocs/misc/expire_pkg.cgi
+++ b/htdocs/misc/expire_pkg.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: expire_pkg.cgi,v 1.3 1999-01-19 05:14:05 ivan Exp $
+# $Id: expire_pkg.cgi,v 1.4 1999-02-28 00:03:50 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/expire_pkg.cgi
 #
-# Note: Should be run setuid freeside as user nobody
-#
 # based on susp_pkg
 # ivan@voicenet.com 97-jul-29
 #
@@ -16,7 +14,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 # 
 # $Log: expire_pkg.cgi,v $
-# Revision 1.3  1999-01-19 05:14:05  ivan
+# Revision 1.4  1999-02-28 00:03:50  ivan
+# removed misleading comments
+#
+# Revision 1.3  1999/01/19 05:14:05  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
diff --git a/htdocs/misc/link.cgi b/htdocs/misc/link.cgi
index 208ed8ee5..10ea000bc 100755
--- a/htdocs/misc/link.cgi
+++ b/htdocs/misc/link.cgi
@@ -1,8 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: link.cgi,v 1.5 1999-01-19 05:14:06 ivan Exp $
-#
-# Note: Should be run setuid freeside as user nobody
+# $Id: link.cgi,v 1.6 1999-02-28 00:03:51 ivan Exp $
 #
 # ivan@voicenet.com 97-feb-5
 #
@@ -11,7 +9,10 @@
 # can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
 #
 # $Log: link.cgi,v $
-# Revision 1.5  1999-01-19 05:14:06  ivan
+# Revision 1.6  1999-02-28 00:03:51  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/01/19 05:14:06  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
diff --git a/htdocs/misc/susp_pkg.cgi b/htdocs/misc/susp_pkg.cgi
index 851a53f7f..265469340 100755
--- a/htdocs/misc/susp_pkg.cgi
+++ b/htdocs/misc/susp_pkg.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: susp_pkg.cgi,v 1.4 1999-01-19 05:14:08 ivan Exp $
+# $Id: susp_pkg.cgi,v 1.5 1999-02-28 00:03:52 ivan Exp $
 #
 # Usage: susp_pkg.cgi pkgnum
 #        http://server.name/path/susp_pkg.cgi pkgnum
 #
-# Note: Should be run setuid freeside as user nobody
-#
 # probably should generalize this to do cancels, suspensions, unsuspensions, etc.
 #
 # ivan@voicenet.com 97-feb-27
@@ -23,7 +21,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: susp_pkg.cgi,v $
-# Revision 1.4  1999-01-19 05:14:08  ivan
+# Revision 1.5  1999-02-28 00:03:52  ivan
+# removed misleading comments
+#
+# Revision 1.4  1999/01/19 05:14:08  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
diff --git a/htdocs/misc/unsusp_pkg.cgi b/htdocs/misc/unsusp_pkg.cgi
index c8bb4f4a8..9e60064c3 100755
--- a/htdocs/misc/unsusp_pkg.cgi
+++ b/htdocs/misc/unsusp_pkg.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: unsusp_pkg.cgi,v 1.4 1999-01-19 05:14:09 ivan Exp $
+# $Id: unsusp_pkg.cgi,v 1.5 1999-02-28 00:03:53 ivan Exp $
 #
 # Usage: susp_pkg.cgi pkgnum
 #        http://server.name/path/susp_pkg.cgi pkgnum
 #
-# Note: Should be run setuid freeside as user nobody
-#
 # probably should generalize this to do cancels, suspensions, unsuspensions, etc.
 #
 # ivan@voicenet.com 97-feb-27
@@ -23,7 +21,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: unsusp_pkg.cgi,v $
-# Revision 1.4  1999-01-19 05:14:09  ivan
+# Revision 1.5  1999-02-28 00:03:53  ivan
+# removed misleading comments
+#
+# Revision 1.4  1999/01/19 05:14:09  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
diff --git a/htdocs/search/cust_bill.cgi b/htdocs/search/cust_bill.cgi
index e6dd3e3c7..c849341e3 100755
--- a/htdocs/search/cust_bill.cgi
+++ b/htdocs/search/cust_bill.cgi
@@ -1,19 +1,20 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_bill.cgi,v 1.3 1999-01-19 05:14:11 ivan Exp $
+# $Id: cust_bill.cgi,v 1.4 1999-02-28 00:03:54 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_bill.cgi
 #
-# Note: Should be run setuid freeside as user nobody.
-#
 # ivan@voicenet.com 97-apr-4
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_bill.cgi,v $
-# Revision 1.3  1999-01-19 05:14:11  ivan
+# Revision 1.4  1999-02-28 00:03:54  ivan
+# removed misleading comments
+#
+# Revision 1.3  1999/01/19 05:14:11  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index ed7b71425..03f02e4be 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.8 1999-02-07 09:59:36 ivan Exp $
+# $Id: cust_main.cgi,v 1.9 1999-02-28 00:03:55 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
 #
-# Note: Should be run setuid freeside as user nobody.
-#
 # ivan@voicenet.com 96-dec-12
 #
 # rewrite ivan@sisd.com 98-mar-4
@@ -19,7 +17,10 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.8  1999-02-07 09:59:36  ivan
+# Revision 1.9  1999-02-28 00:03:55  ivan
+# removed misleading comments
+#
+# Revision 1.8  1999/02/07 09:59:36  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.7  1999/01/25 12:19:11  ivan
diff --git a/htdocs/search/svc_acct_sm.cgi b/htdocs/search/svc_acct_sm.cgi
index 60241bbdb..cade20e86 100755
--- a/htdocs/search/svc_acct_sm.cgi
+++ b/htdocs/search/svc_acct_sm.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.6 1999-02-09 09:22:58 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.7 1999-02-28 00:03:56 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
 #
-# Note: Should be run setuid freeside as user nobody.
-#
 # ivan@voicenet.com 96-mar-5
 #
 # need to look at table in results to make it more readable
@@ -19,7 +17,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.6  1999-02-09 09:22:58  ivan
+# Revision 1.7  1999-02-28 00:03:56  ivan
+# removed misleading comments
+#
+# Revision 1.6  1999/02/09 09:22:58  ivan
 # visual and bugfixes
 #
 # Revision 1.5  1999/01/19 05:14:16  ivan
diff --git a/htdocs/search/svc_domain.cgi b/htdocs/search/svc_domain.cgi
index 0058acabd..b366e5724 100755
--- a/htdocs/search/svc_domain.cgi
+++ b/htdocs/search/svc_domain.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.7 1999-02-23 08:09:24 ivan Exp $
+# $Id: svc_domain.cgi,v 1.8 1999-02-28 00:03:57 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
 #
-# Note: Should be run setuid freeside as user nobody.
-#
 # ivan@voicenet.com 97-mar-5
 #
 # rewrite ivan@sisd.com 98-mar-14
@@ -17,7 +15,10 @@
 # display total, use FS::CGI now does browsing too ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.7  1999-02-23 08:09:24  ivan
+# Revision 1.8  1999-02-28 00:03:57  ivan
+# removed misleading comments
+#
+# Revision 1.7  1999/02/23 08:09:24  ivan
 # beginnings of one-screen new customer entry and some other miscellania
 #
 # Revision 1.6  1999/02/09 09:22:59  ivan
diff --git a/htdocs/view/cust_bill.cgi b/htdocs/view/cust_bill.cgi
index 1989726a3..93a6f7a29 100755
--- a/htdocs/view/cust_bill.cgi
+++ b/htdocs/view/cust_bill.cgi
@@ -1,8 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_bill.cgi,v 1.7 1999-01-25 12:26:03 ivan Exp $
-#
-# Note: Should be run setuid freeside as user nobody.
+# $Id: cust_bill.cgi,v 1.8 1999-02-28 00:03:58 ivan Exp $
 #
 # this is a quick & ugly hack which does little more than add some formatting to the ascii output from /dbin/print-invoice
 #
@@ -25,7 +23,10 @@
 # also print 'printed' field ivan@sisd.com 98-jul-10
 #
 # $Log: cust_bill.cgi,v $
-# Revision 1.7  1999-01-25 12:26:03  ivan
+# Revision 1.8  1999-02-28 00:03:58  ivan
+# removed misleading comments
+#
+# Revision 1.7  1999/01/25 12:26:03  ivan
 # yet more mod_perl stuff
 #
 # Revision 1.6  1999/01/19 05:14:18  ivan
diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index 7d51e288a..4e80fdd4e 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.12 1999-02-07 09:59:40 ivan Exp $
+# $Id: cust_main.cgi,v 1.13 1999-02-28 00:04:00 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
 #
-# Note: Should be run setuid freeside as user nobody.
-#
 # the payment history section could use some work, see below
 # 
 # ivan@voicenet.com 96-nov-29 -> 96-dec-11
@@ -33,7 +31,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.12  1999-02-07 09:59:40  ivan
+# Revision 1.13  1999-02-28 00:04:00  ivan
+# removed misleading comments
+#
+# Revision 1.12  1999/02/07 09:59:40  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.11  1999/01/25 12:26:04  ivan
diff --git a/htdocs/view/cust_pkg.cgi b/htdocs/view/cust_pkg.cgi
index f1b7b9473..939fcc2dc 100755
--- a/htdocs/view/cust_pkg.cgi
+++ b/htdocs/view/cust_pkg.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.7 1999-01-19 05:14:20 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.8 1999-02-28 00:04:01 ivan Exp $
 #
 # Usage: cust_pkg.cgi pkgnum
 #        http://server.name/path/cust_pkg.cgi?pkgnum
 #
-# Note: Should be run setuid freeside as user nobody.
-#
 # ivan@voicenet.com 96-dec-15
 #
 # services section needs to be cleaned up, needs to display extraneous
@@ -26,7 +24,10 @@
 # no FS::Search ivan@sisd.com 98-mar-7
 # 
 # $Log: cust_pkg.cgi,v $
-# Revision 1.7  1999-01-19 05:14:20  ivan
+# Revision 1.8  1999-02-28 00:04:01  ivan
+# removed misleading comments
+#
+# Revision 1.7  1999/01/19 05:14:20  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi
index a5b4f4858..900dc56a8 100755
--- a/htdocs/view/svc_acct.cgi
+++ b/htdocs/view/svc_acct.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.7 1999-01-19 05:14:21 ivan Exp $
+# $Id: svc_acct.cgi,v 1.8 1999-02-28 00:04:02 ivan Exp $
 #
 # Usage: svc_acct.cgi svcnum
 #        http://server.name/path/svc_acct.cgi?svcnum
 #
-# Note: Should be run setuid freeside as user nobody.
-#
 # ivan@voicenet.com 96-dec-17
 #
 # added link to send info
@@ -35,7 +33,10 @@
 # displays arbitrary radius attributes ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.7  1999-01-19 05:14:21  ivan
+# Revision 1.8  1999-02-28 00:04:02  ivan
+# removed misleading comments
+#
+# Revision 1.7  1999/01/19 05:14:21  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi
index 4c86ffd32..89ca6be6b 100755
--- a/htdocs/view/svc_acct_sm.cgi
+++ b/htdocs/view/svc_acct_sm.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.8 1999-02-09 09:23:00 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.9 1999-02-28 00:04:03 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi svcnum
 #        http://server.name/path/svc_acct_sm.cgi?svcnum
 #
-# Note: Should be run setuid freeside as user nobody.
-#
 # based on view/svc_acct.cgi
 # 
 # ivan@voicenet.com 97-jan-5
@@ -22,7 +20,10 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.8  1999-02-09 09:23:00  ivan
+# Revision 1.9  1999-02-28 00:04:03  ivan
+# removed misleading comments
+#
+# Revision 1.8  1999/02/09 09:23:00  ivan
 # visual and bugfixes
 #
 # Revision 1.7  1999/02/07 09:59:42  ivan
diff --git a/htdocs/view/svc_domain.cgi b/htdocs/view/svc_domain.cgi
index 8941a3c89..84fa9db0b 100755
--- a/htdocs/view/svc_domain.cgi
+++ b/htdocs/view/svc_domain.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.7 1999-02-23 08:09:25 ivan Exp $
+# $Id: svc_domain.cgi,v 1.8 1999-02-28 00:04:04 ivan Exp $
 #
 # Usage: svc_domain svcnum
 #        http://server.name/path/svc_domain.cgi?svcnum
 #
-# Note: Should be run setuid freeside as user nobody.
-#
 # ivan@voicenet.com 97-jan-6
 #
 # rewrite ivan@sisd.com 98-mar-14
@@ -15,7 +13,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.7  1999-02-23 08:09:25  ivan
+# Revision 1.8  1999-02-28 00:04:04  ivan
+# removed misleading comments
+#
+# Revision 1.7  1999/02/23 08:09:25  ivan
 # beginnings of one-screen new customer entry and some other miscellania
 #
 # Revision 1.6  1999/01/19 05:14:23  ivan
-- 
cgit v1.2.1


From b295ca59242c863db3f6f79295625392680e144b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 28 Feb 1999 19:44:16 +0000
Subject: constructors s/create/new/ pointed out by "Bao C. Ha" <bao@hacom.net>

---
 bin/fs-setup | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 7a5403b01..b7d4a1889 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.15 1999-02-27 21:06:21 ivan Exp $
+# $Id: fs-setup,v 1.16 1999-02-28 19:44:16 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.15  1999-02-27 21:06:21  ivan
+# Revision 1.16  1999-02-28 19:44:16  ivan
+# constructors s/create/new/ pointed out by "Bao C. Ha" <bao@hacom.net>
+#
+# Revision 1.15  1999/02/27 21:06:21  ivan
 # cust_main.paydate should be varchar(10), not @date_type ; problem reported
 # by Ben Leibig <leibig@colorado.edu>
 #
@@ -228,7 +231,7 @@ AL AK AS AZ AR CA CO CT DC DE FM FL GA GU HI ID IL IN IA KS KY LA
 ME MH MD MA MI MN MS MO MT NC ND NE NH NJ NM NV NY MP OH OK OR PA PW PR RI 
 SC SD TN TX TT UT VT VI VA WA WV WI WY AE AA AP
 ) ) {
-  my($cust_main_county)=create FS::cust_main_county({
+  my($cust_main_county)=new FS::cust_main_county({
     'state' => $_,
     'tax'   => 0,
     'country' => 'US',
@@ -242,7 +245,7 @@ SC SD TN TX TT UT VT VI VA WA WV WI WY AE AA AP
 foreach ( qw(
 VIC NSW NT QLD TAS ACT WA SA
 ) ) {
-  my($cust_main_county)=create FS::cust_main_county({
+  my($cust_main_county)=new FS::cust_main_county({
     'state' => $_,
     'tax'   => 0,
     'country' => 'AU',
@@ -265,7 +268,7 @@ ST SA SN SC SL SG SK SI SB SO ZA GS ES LK SH PM SD SR SJ SZ SE CH SY TW TJ TZ
 TH TG TK TO TT TN TR TM TC TV UG UA AE GB UM UY UZ VU VA VE VN VG VI WF EH
 YE YU ZR ZM ZW
 ) ) {
-  my($cust_main_county)=create FS::cust_main_county({
+  my($cust_main_county)=new FS::cust_main_county({
     'tax'   => 0,
     'country' => $_,
   });  
-- 
cgit v1.2.1


From 220ac1e017ab668f9fac1e5ff0ca648f8fdfe913 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 28 Feb 1999 20:09:03 +0000
Subject: allow spaces in zip codes, for (at least) canada.  pointed out by
 Clayton Gray <clgray@bcgroup.net>

---
 site_perl/cust_main.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index ad2ff0264..2002f7a59 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -258,7 +258,7 @@ sub check {
       } );
   }
 
-  $self->zip =~ /^([\w\-]{5,10})$/ or return "Illegal zip";
+  $self->zip =~ /^\s*(\w[\w\-\s]{3,8}\w)\s*$/ or return "Illegal zip";
   $self->zip($1);
 
   $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
@@ -863,7 +863,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.12 1999-02-27 21:24:22 ivan Exp $
+$Id: cust_main.pm,v 1.13 1999-02-28 20:09:03 ivan Exp $
 
 =head1 BUGS
 
@@ -919,7 +919,11 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.12  1999-02-27 21:24:22  ivan
+Revision 1.13  1999-02-28 20:09:03  ivan
+allow spaces in zip codes, for (at least) canada.  pointed out by
+Clayton Gray <clgray@bcgroup.net>
+
+Revision 1.12  1999/02/27 21:24:22  ivan
 parse paydate correctly for cybercash
 
 Revision 1.11  1999/02/23 08:09:27  ivan
-- 
cgit v1.2.1


From beea3b3e0c801ceeb05eee672957d318930a9a2d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Mar 1999 00:43:38 +0000
Subject: die if no relevant services

---
 bin/svc_acct.import | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index 8343ce867..c22cb0d15 100755
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.import,v 1.3 1998-12-10 07:23:16 ivan Exp $
+# $Id: svc_acct.import,v 1.4 1999-03-24 00:43:38 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -17,7 +17,10 @@
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 #
 # $Log: svc_acct.import,v $
-# Revision 1.3  1998-12-10 07:23:16  ivan
+# Revision 1.4  1999-03-24 00:43:38  ivan
+# die if no relevant services
+#
+# Revision 1.3  1998/12/10 07:23:16  ivan
 # use FS::Conf, need user (for datasrc)
 #
 # Revision 1.2  1998/10/13 12:07:51  ivan
@@ -44,6 +47,8 @@ $FS::svc_acct::nossh_hack = 1;
 
 %part_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_acct'});
 
+die "No services with svcdb svc_acct!\n" unless %part_svc;
+
 print "\n\n", &menu_svc, "\n", <<END;
 Most accounts probably have entries in passwd and users (with Port-Limit
 nonexistant or 1).
-- 
cgit v1.2.1


From 8bc379c21dd64cc9ce29996338917b12529ea8a3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Mar 1999 00:51:55 +0000
Subject: die if no relevant services... cvspain

---
 bin/svc_acct_sm.import | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/svc_acct_sm.import b/bin/svc_acct_sm.import
index f94bda637..647e5c2ee 100755
--- a/bin/svc_acct_sm.import
+++ b/bin/svc_acct_sm.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.import,v 1.2 1998-12-10 07:23:18 ivan Exp $
+# $Id: svc_acct_sm.import,v 1.3 1999-03-24 00:51:55 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -16,7 +16,10 @@
 # ivan@sisd.com 98-jul-13
 #
 # $Log: svc_acct_sm.import,v $
-# Revision 1.2  1998-12-10 07:23:18  ivan
+# Revision 1.3  1999-03-24 00:51:55  ivan
+# die if no relevant services... cvspain
+#
+# Revision 1.2  1998/12/10 07:23:18  ivan
 # use FS::Conf, need user (for datasrc)
 #
 
@@ -47,6 +50,9 @@ my(%mta) = (
 %m_part_svc =
   map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_acct_sm'});
 
+die "No services with svcdb svc_domain!\n" unless %d_part_svc;
+die "No services with svcdb svc_svc_acct_sm!\n" unless %m_part_svc;
+
 print "\n\n", 
       ( join "\n", map "$_: ".$d_part_svc{$_}->svc, sort keys %d_part_svc ),
       "\n\nEnter part number for domains: ";
-- 
cgit v1.2.1


From fa884e7ce54e21c7593abe2bc3430bd26a607ce7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Mar 1999 05:24:48 +0000
Subject: URI unbundled from libwww-perl, so list it separately

---
 htdocs/docs/install.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 6cf9677fd..b9b4a97d0 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -14,6 +14,7 @@ Before installing, you need:
       <li><a href="http://www.perl.com/CPAN/modules/by-module/MIME/">MIME-Base64</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Data">Data-Dumper</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/MD5">MD5</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/URI">URI</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Net">libnet</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/LWP/">libwww-perl</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Business/">Business-CreditCard</a>
-- 
cgit v1.2.1


From 93ced168cd4e1e23d36094a919576fc646b4df28 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Mar 1999 08:42:20 +0000
Subject: import stuff uses Term::Query and spits out (some kinds of)
 nonsensical input

---
 bin/svc_acct.import      | 36 +++++++++++++++++----------------
 bin/svc_acct_sm.import   | 52 +++++++++++++++++++++++++++++-------------------
 htdocs/docs/install.html |  2 ++
 3 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index c22cb0d15..512572251 100755
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.import,v 1.4 1999-03-24 00:43:38 ivan Exp $
+# $Id: svc_acct.import,v 1.5 1999-03-25 08:42:19 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -17,7 +17,10 @@
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 #
 # $Log: svc_acct.import,v $
-# Revision 1.4  1999-03-24 00:43:38  ivan
+# Revision 1.5  1999-03-25 08:42:19  ivan
+# import stuff uses Term::Query and spits out (some kinds of) nonsensical input
+#
+# Revision 1.4  1999/03/24 00:43:38  ivan
 # die if no relevant services
 #
 # Revision 1.3  1998/12/10 07:23:16  ivan
@@ -30,6 +33,7 @@
 use strict;
 use vars qw(%part_svc);
 use Date::Parse;
+use Term::Query qw(query);
 use FS::SSH qw(iscp);
 use FS::UID qw(adminsuidsetup datasrc);
 use FS::Record qw(qsearch);
@@ -74,8 +78,7 @@ my($oisdn_svcpart)=&getpart;
 print "\n\n", &menu_svc, "\n", <<END;
 POP mail accounts have entries in passwd only, and have a particular shell.
 END
-print "Enter that shell: ";
-my($pop_shell)=&getvalue;
+my($pop_shell)=&getvalue("Enter that shell:");
 my($popmail_svcpart)=&getpart;
 
 print "\n\n", &menu_svc, "\n", <<END;
@@ -87,37 +90,36 @@ print "\n\n", <<END;
 Enter the location and name of your _user_ passwd file, for example
 "mail.isp.com:/etc/passwd" or "nis.isp.com:/etc/global/passwd"
 END
-print ":";
-my($loc_passwd)=&getvalue;
+my($loc_passwd)=&getvalue(":");
 iscp("root\@$loc_passwd", "$spooldir/passwd.import");
 
 print "\n\n", <<END;
 Enter the location and name of your _user_ shadow file, for example
 "mail.isp.com:/etc/shadow" or "bsd.isp.com:/etc/master.passwd"
 END
-print ":";
-my($loc_shadow)=&getvalue;
+my($loc_shadow)=&getvalue(":");
 iscp("root\@$loc_shadow", "$spooldir/shadow.import");
 
 print "\n\n", <<END;
 Enter the location and name of your radius "users" file, for example
 "radius.isp.com:/etc/raddb/users"
 END
-print ":";
-my($loc_users)=&getvalue;
+my($loc_users)=&getvalue(":");
 iscp("root\@$loc_users", "$spooldir/users.import");
 
 sub menu_svc {
   ( join "\n", map "$_: ".$part_svc{$_}->svc, sort keys %part_svc ). "\n";
 }
 sub getpart {
-  print "Enter part number, or 0 for none: ";
-  &getvalue;
+  $^W=0; # Term::Query isn't -w-safe
+  query "Enter part number:", 'irk', [ keys %part_svc ];
+  $^W=1;
 }
 sub getvalue {
-  my($x)=scalar(<STDIN>);
-  chop $x;
-  $x;
+  my $prompt = shift;
+  $^W=0; # Term::Query isn't -w-safe
+  query $prompt, '';
+  $^W=1;
 }
 
 print "\n\n";
@@ -193,7 +195,7 @@ while (<PASSWD>) {
     $svcpart = $shell_svcpart;
   }
 
-  my($svc_acct) = create FS::svc_acct ({
+  my($svc_acct) = new FS::svc_acct ({
     'svcpart'  => $svcpart,
     'username' => $username,
     'password' => $password,
@@ -227,7 +229,7 @@ foreach $username ( keys %upassword ) {
     die "Illegal Port-Limit in users!\n";
   }
 
-  my($svc_acct) = create FS::svc_acct ({
+  my($svc_acct) = new FS::svc_acct ({
     'svcpart'  => $svcpart,
     'username' => $username,
     'password' => $password,
diff --git a/bin/svc_acct_sm.import b/bin/svc_acct_sm.import
index 647e5c2ee..bda9762e1 100755
--- a/bin/svc_acct_sm.import
+++ b/bin/svc_acct_sm.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.import,v 1.3 1999-03-24 00:51:55 ivan Exp $
+# $Id: svc_acct_sm.import,v 1.4 1999-03-25 08:42:20 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -16,7 +16,10 @@
 # ivan@sisd.com 98-jul-13
 #
 # $Log: svc_acct_sm.import,v $
-# Revision 1.3  1999-03-24 00:51:55  ivan
+# Revision 1.4  1999-03-25 08:42:20  ivan
+# import stuff uses Term::Query and spits out (some kinds of) nonsensical input
+#
+# Revision 1.3  1999/03/24 00:51:55  ivan
 # die if no relevant services... cvspain
 #
 # Revision 1.2  1998/12/10 07:23:18  ivan
@@ -25,6 +28,7 @@
 
 use strict;
 use vars qw(%d_part_svc %m_part_svc);
+use Term::Query qw(query);
 use FS::SSH qw(iscp);
 use FS::UID qw(adminsuidsetup datasrc);
 use FS::Record qw(qsearch qsearchs);
@@ -55,20 +59,28 @@ die "No services with svcdb svc_svc_acct_sm!\n" unless %m_part_svc;
 
 print "\n\n", 
       ( join "\n", map "$_: ".$d_part_svc{$_}->svc, sort keys %d_part_svc ),
-      "\n\nEnter part number for domains: ";
-my($domain_svcpart)=&getvalue;
+      "\n\n";
+$^W=0; #Term::Query isn't -w-safe
+my $domain_svcpart = 
+  query "Enter part number for domains: ", 'irk', [ keys %d_part_svc ];
+$^W=1;
 
 print "\n\n", 
       ( join "\n", map "$_: ".$m_part_svc{$_}->svc, sort keys %m_part_svc ),
-      "\n\nEnter part number for mail aliases: ";
-my($mailalias_svcpart)=&getvalue;
+      "\n\n";
+$^W=0; #Term::Query isn't -w-safe
+my $mailalias_svcpart = 
+  query "Enter part number for mail aliases: ", 'irk', [ keys %m_part_svc ];
+$^W=1;
 
 print "\n\n", <<END;
 Select your MTA from the following list.
 END
 print join "\n", map "$_: $mta{$_}", sort keys %mta;
-print "\n\n:";
-my($mta)=&getvalue;
+print "\n\n";
+$^W=0; #Term::Query isn't -w-safe
+my $mta = query ":", 'irk', [ keys %mta ];
+$^W=1;
 
 if ( $mta{$mta} eq "qmail" ) {
 
@@ -76,8 +88,7 @@ if ( $mta{$mta} eq "qmail" ) {
 Enter the location and name of your qmail control directory, for example
 "mail.isp.com:/var/qmail/control"
 END
-  print ":";
-  my($control)=&getvalue;
+  my($control)=&getvalue(":");
   iscp("root\@$control/rcpthosts","$spooldir/rcpthosts.import");
 #  iscp("root\@$control/recipientmap","$spooldir/recipientmap.import");
   iscp("root\@$control/virtualdomains","$spooldir/virtualdomains.import");
@@ -95,16 +106,14 @@ END
 Enter the location and name of your sendmail virtual user table, for example
 "mail.isp.com:/etc/virtusertable"
 END
-  print ":";
-  my($virtusertable)=&getvalue;
+  my($virtusertable)=&getvalue(":");
   iscp("root\@$virtusertable","$spooldir/virtusertable.import");
 
   print "\n\n", <<END;
 Enter the location and name of your sendmail.cw file, for example
 "mail.isp.com:/etc/sendmail.cw"
 END
-  print ":";
-  my($sendmail_cw)=&getvalue;
+  my($sendmail_cw)=&getvalue(":");
   iscp("root\@$sendmail_cw","$spooldir/sendmail.cw.import");
 
 } else {
@@ -112,9 +121,10 @@ END
 }
 
 sub getvalue {
-  my($x)=scalar(<STDIN>);
-  chop $x;
-  $x;
+  my $prompt = shift;
+  $^W=0; #Term::Query isn't -w-safe
+  query $prompt, '';
+  $^W=1;
 }
 
 print "\n\n";
@@ -144,7 +154,7 @@ while (<RCPTHOSTS>) {
   my $domain = $1;
   my($svc_domain);
   unless ( $svc_domain = qsearchs('svc_domain', {'domain'=>$domain} ) ) {
-    $svc_domain = create FS::svc_domain ({
+    $svc_domain = new FS::svc_domain ({
       'domain'  => $domain,
       'svcpart' => $domain_svcpart,
       'action'  => 'N',
@@ -199,7 +209,7 @@ END
     }
 
     unless ( exists $svcnum{$domain} ) {
-      my($svc_domain) = create FS::svc_domain ({
+      my($svc_domain) = new FS::svc_domain ({
         'domain'  => $domain,
         'svcpart' => $domain_svcpart,
         'action'  => 'N',
@@ -210,7 +220,7 @@ END
       $svcnum{$domain}=$svc_domain->svcnum;
     }
 
-    my($svc_acct_sm)=create FS::svc_acct_sm ({
+    my($svc_acct_sm)=new FS::svc_acct_sm ({
       'domsvc'  => $svcnum{$domain},
       'domuid'  => $svc_acct->uid,
       'domuser' => '*',
@@ -240,7 +250,7 @@ END
       die "Unknown user $username in virtusertable";
       next;
     }
-    my($svc_acct_sm)=create FS::svc_acct_sm ({
+    my($svc_acct_sm)=new FS::svc_acct_sm ({
       'domsvc'  => $svcnum{$domain},
       'domuid'  => $svc_acct->uid,
       'domuser' => $domuser || '*',
diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index b9b4a97d0..f96065136 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -11,6 +11,8 @@ Before installing, you need:
   <li>A database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>, such as <a href="http://www.tcx.se/">MySQL</a> or <a href="http://www.postgresql.org/">PostgreSQL</a>
   <li>Perl modules
     <ul>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/Array/">Array-PrintCols</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/Term/">Term-Query</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/MIME/">MIME-Base64</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Data">Data-Dumper</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/MD5">MD5</a>
-- 
cgit v1.2.1


From c4cd24cc3bcaec8f9c7c120e3e728c90aa5b35c1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Mar 1999 13:31:29 +0000
Subject: added setdefault method (generalized setfixed method to setx method)

---
 site_perl/svc_Common.pm | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/site_perl/svc_Common.pm b/site_perl/svc_Common.pm
index 9c0c4e69f..f53e83e48 100644
--- a/site_perl/svc_Common.pm
+++ b/site_perl/svc_Common.pm
@@ -105,7 +105,7 @@ sub delete {
   '';
 }
 
-=item setfixed;
+=item setfixed
 
 Sets any fixed fields for this service (see L<FS::part_svc>).  If there is an
 error, returns the error, otherwise returns the FS::part_svc object (use ref()
@@ -115,6 +115,25 @@ to test the return).  Usually called by the check method.
 
 sub setfixed {
   my $self = shift;
+  $self->setx('F');
+}
+
+=item setdefault
+
+Sets all fields to their defaults (see L<FS::part_svc>), overriding their
+current values.  If there is an error, returns the error, otherwise returns
+the FS::part_svc object (use ref() to test the return).
+
+=cut
+
+sub setdefault {
+  my $self = shift;
+  $self->setx('D');
+}
+
+sub setx {
+  my $self = shift;
+  my $x = shift;
 
   my $error;
 
@@ -135,9 +154,9 @@ sub setfixed {
   my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
   return "Unkonwn svcpart" unless $part_svc;
 
-  #set fixed fields from part_svc
+  #set default/fixed/whatever fields from part_svc
   foreach my $field ( fields('svc_acct') ) {
-    if ( $part_svc->getfield('svc_acct__'. $field. '_flag') eq 'F' ) {
+    if ( $part_svc->getfield('svc_acct__'. $field. '_flag') eq $x ) {
       $self->setfield( $field, $part_svc->getfield('svc_acct__'. $field) );
     }
   }
@@ -165,14 +184,14 @@ sub cancel { ''; }
 
 =head1 VERSION
 
-$Id: svc_Common.pm,v 1.2 1999-01-25 12:26:14 ivan Exp $
+$Id: svc_Common.pm,v 1.3 1999-03-25 13:31:29 ivan Exp $
 
 =head1 BUGS
 
 The setfixed method return value.
 
 The new method should set defaults from part_svc (like the check method
-sets fixed values).
+sets fixed values)?
 
 =head1 SEE ALSO
 
@@ -182,7 +201,10 @@ from the base documentation.
 =head1 HISTORY
 
 $Log: svc_Common.pm,v $
-Revision 1.2  1999-01-25 12:26:14  ivan
+Revision 1.3  1999-03-25 13:31:29  ivan
+added setdefault method (generalized setfixed method to setx method)
+
+Revision 1.2  1999/01/25 12:26:14  ivan
 yet more mod_perl stuff
 
 Revision 1.1  1998/12/30 00:30:45  ivan
-- 
cgit v1.2.1


From de46aa575f3e726a9b005172706cff5e542955fd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Mar 1999 13:48:14 +0000
Subject: allow empty custnum in sub check (but call that an error in sub
 insert), for one-screen new customer entry

---
 site_perl/cust_pkg.pm | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/site_perl/cust_pkg.pm b/site_perl/cust_pkg.pm
index 1f5a873d5..31b4524f2 100644
--- a/site_perl/cust_pkg.pm
+++ b/site_perl/cust_pkg.pm
@@ -97,6 +97,22 @@ sub table { 'cust_pkg'; }
 Adds this billing item to the database ("Orders" the item).  If there is an
 error, returns the error, otherwise returns false.
 
+sub insert {
+  my $self = shift;
+
+  # custnum might not have have been defined in sub check (for one-shot new
+  # customers), so check it here instead
+
+  my $error = $self->ut_number('custnum');
+  return $error if $error
+
+  return "Unknown customer"
+    unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+
+  $self->SUPER::insert;
+
+}
+
 =item delete
 
 Currently unimplemented.  You don't want to delete billing items, because there
@@ -154,7 +170,7 @@ sub check {
 
   my $error = 
     $self->ut_numbern('pkgnum')
-    || $self->ut_number('custnum')
+    || $self->ut_numbern('custnum')
     || $self->ut_number('pkgpart')
     || $self->ut_numbern('setup')
     || $self->ut_numbern('bill')
@@ -163,8 +179,10 @@ sub check {
   ;
   return $error if $error;
 
-  return "Unknown customer"
-    unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+  if ( $self->custnum ) { 
+    return "Unknown customer"
+      unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+  }
 
   return "Unknown pkgpart"
     unless qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
@@ -477,7 +495,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.7 1999-02-09 09:55:06 ivan Exp $
+$Id: cust_pkg.pm,v 1.8 1999-03-25 13:48:14 ivan Exp $
 
 =head1 BUGS
 
@@ -508,7 +526,11 @@ fixed for new agent->agent_type->type_pkgs in &order ivan@sisd.com 98-mar-7
 pod ivan@sisd.com 98-sep-21
 
 $Log: cust_pkg.pm,v $
-Revision 1.7  1999-02-09 09:55:06  ivan
+Revision 1.8  1999-03-25 13:48:14  ivan
+allow empty custnum in sub check (but call that an error in sub insert),
+for one-screen new customer entry
+
+Revision 1.7  1999/02/09 09:55:06  ivan
 invoices show line items for each service in a package (see the label method
 of FS::cust_svc)
 
-- 
cgit v1.2.1


From 59518b8dec0720fdf32aab8a1ecc2dbb689a0b85 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Mar 1999 13:55:10 +0000
Subject: one-screen new customer entry (including package and service) for
 simple packages with one svc_acct service

---
 htdocs/edit/cust_main.cgi         | 33 +++++++++++-----
 htdocs/edit/process/cust_main.cgi | 82 +++++++++++++++++++++++++++++++++++----
 2 files changed, 99 insertions(+), 16 deletions(-)

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 35b80fa14..901923d98 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.10 1999-02-28 00:03:34 ivan Exp $
+# $Id: cust_main.cgi,v 1.11 1999-03-25 13:55:10 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,11 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.10  1999-02-28 00:03:34  ivan
+# Revision 1.11  1999-03-25 13:55:10  ivan
+# one-screen new customer entry (including package and service) for simple
+# packages with one svc_acct service
+#
+# Revision 1.10  1999/02/28 00:03:34  ivan
 # removed misleading comments
 #
 # Revision 1.9  1999/02/23 08:09:20  ivan
@@ -104,7 +108,9 @@ if ( $cgi->param('error') ) {
     map { $_, scalar($cgi->param($_)) } fields('cust_main')
   } );
   $custnum = $cust_main->custnum;
-  $pkgpart = $cgi->param('pkgpart');
+  $pkgpart = $cgi->param('pkgpart_svcpart');
+  $pkgpart =~ /^(\d+)_/;
+  $pkgpart = $1;
   $username = $cgi->param('username');
   $password = $cgi->param('_password');
   $popnum = $cgi->param('popnum');
@@ -343,27 +349,35 @@ unless ( $custnum ) {
   #foreach ( @pkg_svc ) {
   foreach ( qsearch( 'pkg_svc', {} ) ) {
     my $part_svc = qsearchs ( 'part_svc', { 'svcpart' => $_->svcpart } );
-    $pkgpart{ $_->pkgpart } = 9999 # never will == 1 below
+    $pkgpart{ $_->pkgpart } = -1 # never will == 1 below
       if ( $part_svc->svcdb ne 'svc_acct' );
-    $pkgpart{ $_->pkgpart }++;
+    if ( $pkgpart{ $_->pkgpart } ) {
+      $pkgpart{ $_->pkgpart } = '-1';
+    } else {
+      $pkgpart{ $_->pkgpart } = $_->svcpart;
+    }
   }
 
   my @part_pkg =
     #grep { $pkgpart{ $_->pkgpart } == 1 } qsearch( 'part_pkg', {} );
     grep {
-      ( $pkgpart{ $_->pkgpart } || 0 ) == 1
+      #( $pkgpart{ $_->pkgpart } || 0 ) == 1
+      $pkgpart{ $_->pkgpart } 
+      && $pkgpart{ $_->pkgpart } != -1
       && $part_pkg{ $_->pkgpart }
+      ;
     } qsearch( 'part_pkg', {} );
 
   if ( @part_pkg ) {
 
     print "<BR><BR>First package", itable("#c0c0c0"),
-          qq!<TR><TD COLSPAN=2><SELECT NAME="pkgpart">!;
+          qq!<TR><TD COLSPAN=2><SELECT NAME="pkgpart_svcpart">!;
 
     print qq!<OPTION VALUE="">(none)!;
 
     foreach my $part_pkg ( @part_pkg ) {
-      print qq!<OPTION VALUE="!, $part_pkg->pkgpart, '"',
+      print qq!<OPTION VALUE="!,
+              $part_pkg->pkgpart. "_". $pkgpart{ $part_pkg->pkgpart }, '"',
             " SELECTED"x($part_pkg->pkgpart == $pkgpart),
             ">", $part_pkg->pkg, " - ", $part_pkg->comment;
     }
@@ -383,7 +397,8 @@ END
     print qq!<TR><TD ALIGN="right">POP</TD><TD><SELECT NAME="popnum" SIZE=1><OPTION> !;
     my($svc_acct_pop);
     foreach $svc_acct_pop ( qsearch ('svc_acct_pop',{} ) ) {
-    print "<OPTION", $svc_acct_pop->popnum == $popnum ? ' SELECTED' : '', ">", 
+    print qq!<OPTION VALUE="!, $svc_acct_pop->popnum, '"',
+          ( $popnum && $svc_acct_pop->popnum == $popnum ) ? ' SELECTED' : '', ">", 
           $svc_acct_pop->popnum, ": ", 
           $svc_acct_pop->city, ", ",
           $svc_acct_pop->state,
diff --git a/htdocs/edit/process/cust_main.cgi b/htdocs/edit/process/cust_main.cgi
index 9745fa68d..2eb1c19e3 100755
--- a/htdocs/edit/process/cust_main.cgi
+++ b/htdocs/edit/process/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.7 1999-02-28 00:03:42 ivan Exp $
+# $Id: cust_main.cgi,v 1.8 1999-03-25 13:55:10 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -20,7 +20,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.7  1999-02-28 00:03:42  ivan
+# Revision 1.8  1999-03-25 13:55:10  ivan
+# one-screen new customer entry (including package and service) for simple
+# packages with one svc_acct service
+#
+# Revision 1.7  1999/02/28 00:03:42  ivan
 # removed misleading comments
 #
 # Revision 1.6  1999/01/25 12:10:00  ivan
@@ -42,12 +46,15 @@
 
 use strict;
 use vars qw( $cgi $payby @invoicing_list $new $custnum $error );
+use vars qw( $cust_pkg $cust_svc $svc_acct );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
 use FS::CGI qw( popurl );
-use FS::Record qw(qsearchs fields);
+use FS::Record qw( qsearch qsearchs fields );
 use FS::cust_main;
+use FS::type_pkgs;
+use FS::agent;
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
@@ -86,14 +93,75 @@ $new = new FS::cust_main ( {
   } fields('cust_main')
 } );
 
+#perhaps the invocing_list magic should move to cust_main.pm?
 $error = $new->check_invoicing_list( \@invoicing_list );
 
-#perhaps the invocing_list magic should move to cust_main.pm?
+#perhaps this stuff should go to cust_main.pm as well
+$cust_pkg = '';
+$svc_acct = '';
 if ( $new->custnum eq '' ) {
-  #false laziness: copied from cust_pkg.pm
-  HERE!
-  #
+
+  if ( $cgi->param('pkgpart_svcpart') ) {
+    my $x = $cgi->param('pkgpart_svcpart');
+    $x =~ /^(\d+)_(\d+)$/;
+    my($pkgpart, $svcpart) = ($1, $2);
+    #false laziness: copied from FS::cust_pkg::order (which should become a
+    #FS::cust_main method)
+    my(%part_pkg);
+    # generate %part_pkg
+    # $part_pkg{$pkgpart} is true iff $custnum may purchase $pkgpart
+    my $agent = qsearchs('agent',{'agentnum'=> $new->agentnum });
+    my($type_pkgs);
+    foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
+      my($pkgpart)=$type_pkgs->pkgpart;
+      $part_pkg{$pkgpart}++;
+    }
+    #eslaf
+
+    $error ||= "Agent ". $new->agentnum. " (type ". $agent->typenum. ") can't".
+               "purchase pkgpart ". $pkgpart
+      unless $part_pkg{ $pkgpart };
+
+    $cust_pkg = new FS::cust_pkg ( {
+                            #later         'custnum' => $custnum,
+                                     'pkgpart' => $pkgpart,
+                                   } );
+    $error ||= $cust_pkg->check;
+
+    #$cust_svc = new FS::cust_svc ( { 'svcpart' => $svcpart } );
+
+    #$error ||= $cust_svc->check;
+
+    $svc_acct = new FS::svc_acct ( {
+                                     'svcpart'   => $svcpart,
+                                     'username'  => $cgi->param('username'),
+                                     '_password' => $cgi->param('_password'),
+                                     'popnum'    => $cgi->param('popnum'),
+                                   } );
+
+    my $y = $svc_acct->setdefault; # arguably should be in new method
+    $error ||= $y unless ref($y);
+    #and just in case you were silly
+    $svc_acct->svcpart($svcpart);
+    $svc_acct->username($cgi->param('username'));
+    $svc_acct->_password($cgi->param('_password'));
+    $svc_acct->popnum($cgi->param('popnum'));
+
+    $error ||= $svc_acct->check;
+
+  } elsif ( $cgi->param('username') ) { #good thing to catch
+    $error = "Can't assign username without a package!";
+  }
+
   $error ||= $new->insert;
+  if ( $cust_pkg && ! $error ) {
+    $cust_pkg->custnum( $new->custnum );
+    $error ||= $cust_pkg->insert; 
+    warn "WARNING: $error on pre-checked cust_pkg record!" if $error;
+    $svc_acct->pkgnum( $cust_pkg->pkgnum );
+    $error ||= $svc_acct->insert;
+    warn "WARNING: $error on pre-checked svc_acct record!" if $error;
+  }
 } else { #create old record object
   my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } ); 
   $error ||= "Old record not found!" unless $old;
-- 
cgit v1.2.1


From 9fb39f590f06d9913ec9f433403c67b30c955bd5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Mar 1999 13:00:10 +0000
Subject: s/create/new/

---
 fs_passwd/fs_passwd_server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_passwd/fs_passwd_server b/fs_passwd/fs_passwd_server
index 42f930e6d..cb0e693dd 100755
--- a/fs_passwd/fs_passwd_server
+++ b/fs_passwd/fs_passwd_server
@@ -57,7 +57,7 @@ while (1) {
     unless ( $svc_acct ) { print $writer "Incorrect password.\n"; next; }
 
     my(%hash)=$svc_acct->hash;
-    my($new_svc_acct) = create FS::svc_acct ( \%hash );
+    my($new_svc_acct) = new FS::svc_acct ( \%hash );
     $new_svc_acct->setfield('_password',$new_password) 
       if $new_password && $new_password ne $old_password;
     $new_svc_acct->setfield('finger',$new_gecos) if $new_gecos;
-- 
cgit v1.2.1


From b5a96aa7ba534b919e74d4e9451bce945232019a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Mar 1999 13:15:56 +0000
Subject: s/create/new/, use all necessary FS::table_names to avoid warnings

---
 eg/TEMPLATE_cust_main.import | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/eg/TEMPLATE_cust_main.import b/eg/TEMPLATE_cust_main.import
index 4ac7efdc7..448186991 100755
--- a/eg/TEMPLATE_cust_main.import
+++ b/eg/TEMPLATE_cust_main.import
@@ -2,21 +2,27 @@
 
 # Template for importing legacy customer data
 #
-# $Id: TEMPLATE_cust_main.import,v 1.2 1998-12-16 05:29:45 ivan Exp $
+# $Id: TEMPLATE_cust_main.import,v 1.3 1999-03-26 13:15:56 ivan Exp $
 #
 # ivan@sisd.com 98-aug-17 - 20
 #
 # $Log: TEMPLATE_cust_main.import,v $
-# Revision 1.2  1998-12-16 05:29:45  ivan
+# Revision 1.3  1999-03-26 13:15:56  ivan
+# s/create/new/, use all necessary FS::table_names to avoid warnings
+#
+# Revision 1.2  1998/12/16 05:29:45  ivan
 # adminsuidsetup now need user
 #
 
 use strict;
+use Date::Parse;
 use FS::UID qw(adminsuidsetup datasrc);
 use FS::Record qw(fields qsearch qsearchs);
 use FS::cust_main;
 use FS::cust_pkg;
-use Date::Parse;
+use FS::cust_svc;
+use FS::svc_acct;
+use FS::pkg_svc;
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
@@ -98,7 +104,7 @@ while (<CLIENT>) {
   $svc{'First'} =~ s/&/and/go; 
   $svc{'Zip'} =~ s/\s+$//go;
 
-  my($cust_main) = create FS::cust_main ( {
+  my($cust_main) = new FS::cust_main ( {
     'custnum'  => $svc{'custnum'},
     'agentnum' => $agentnum,
     'last'     => $svc{'last'},
@@ -129,7 +135,7 @@ while (<CLIENT>) {
     die $error;
   }
 
-  my($cust_pkg)=create FS::cust_pkg ( {
+  my($cust_pkg)=new FS::cust_pkg ( {
     'custnum' => $svc{'custnum'},
     'pkgpart' => $pkgpart{$svc{'LegacyBillingData'}},
     'setup'   => '', 
@@ -176,7 +182,7 @@ while (<CLIENT>) {
         } else {
 
           #create new cust_svc record linked to cust_pkg record 
-          my($n_cust_svc) = create FS::cust_svc ({
+          my($n_cust_svc) = new FS::cust_svc ({
             'svcnum'  => $o_cust_svc->svcnum,
             'pkgnum'  => $cust_pkg->pkgnum,
             'svcpart' => $pkg_svc->svcpart,
-- 
cgit v1.2.1


From ba645a8c36119b3a0448b1ae1eeaecbaef13b244 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Mar 1999 01:11:51 +0000
Subject: use FS::type_pkgs

---
 site_perl/cust_pkg.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/site_perl/cust_pkg.pm b/site_perl/cust_pkg.pm
index 31b4524f2..aa68f608f 100644
--- a/site_perl/cust_pkg.pm
+++ b/site_perl/cust_pkg.pm
@@ -7,6 +7,7 @@ use FS::Record qw( qsearch qsearchs );
 use FS::cust_svc;
 use FS::part_pkg;
 use FS::cust_main;
+use FS::type_pkgs;
 
 # need to 'use' these instead of 'require' in sub { cancel, suspend, unsuspend,
 # setup }
@@ -495,7 +496,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.8 1999-03-25 13:48:14 ivan Exp $
+$Id: cust_pkg.pm,v 1.9 1999-03-29 01:11:51 ivan Exp $
 
 =head1 BUGS
 
@@ -526,7 +527,10 @@ fixed for new agent->agent_type->type_pkgs in &order ivan@sisd.com 98-mar-7
 pod ivan@sisd.com 98-sep-21
 
 $Log: cust_pkg.pm,v $
-Revision 1.8  1999-03-25 13:48:14  ivan
+Revision 1.9  1999-03-29 01:11:51  ivan
+use FS::type_pkgs
+
+Revision 1.8  1999/03/25 13:48:14  ivan
 allow empty custnum in sub check (but call that an error in sub insert),
 for one-screen new customer entry
 
-- 
cgit v1.2.1


From bc968434919daeb185fae0d765aa01cd4734f14d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Mar 1999 01:29:33 +0000
Subject: die unless the configuration directory exists

---
 site_perl/Conf.pm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/site_perl/Conf.pm b/site_perl/Conf.pm
index 96a284f78..9cc0d900e 100644
--- a/site_perl/Conf.pm
+++ b/site_perl/Conf.pm
@@ -53,7 +53,12 @@ Returns the directory.
 
 sub dir {
   my($self) = @_;
-  $self->{dir};
+  my $dir = $self->{dir};
+  -e $dir or die "FATAL: $dir doesn't exist!";
+  -d $dir or die "FATAL: $dir isn't a directory!";
+  -r $dir or die "FATAL: Can't read $dir!";
+  -x $dir or die "FATAL: $dir not searchable (executable)!";
+  $dir;
 }
 
 =item config 
@@ -107,7 +112,10 @@ Ivan Kohler <ivan@sisd.com> 98-sep-6
 sub exists forgot to fetch $dir ivan@sisd.com 98-sep-27
 
 $Log: Conf.pm,v $
-Revision 1.2  1998-11-13 04:08:44  ivan
+Revision 1.3  1999-03-29 01:29:33  ivan
+die unless the configuration directory exists
+
+Revision 1.2  1998/11/13 04:08:44  ivan
 no default default_dir (ironic)
 
 
-- 
cgit v1.2.1


From 89966e55787fa73834c06a356abf1ba91651a1f4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Mar 1999 11:55:43 +0000
Subject: eliminate warnings in ut_money

---
 site_perl/Record.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/site_perl/Record.pm b/site_perl/Record.pm
index aa8d75b3d..da7ba435d 100644
--- a/site_perl/Record.pm
+++ b/site_perl/Record.pm
@@ -596,7 +596,8 @@ sub ut_money {
   $self->setfield($field, 0) if $self->getfield($field) eq '';
   $self->getfield($field) =~ /^(\-)? ?(\d*)(\.\d{2})?$/
     or return "Illegal (money) $field!";
-  $self->setfield($field, "$1$2$3" || 0);
+  #$self->setfield($field, "$1$2$3" || 0);
+  $self->setfield($field, ( ($1||''). ($2||''). ($3||'') ) || 0);
   '';
 }
 
@@ -809,7 +810,7 @@ sub hfields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.12 1999-01-25 12:26:06 ivan Exp $
+$Id: Record.pm,v 1.13 1999-03-29 11:55:43 ivan Exp $
 
 =head1 BUGS
 
@@ -931,7 +932,10 @@ added pod documentation ivan@sisd.com 98-sep-6
 ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
 $Log: Record.pm,v $
-Revision 1.12  1999-01-25 12:26:06  ivan
+Revision 1.13  1999-03-29 11:55:43  ivan
+eliminate warnings in ut_money
+
+Revision 1.12  1999/01/25 12:26:06  ivan
 yet more mod_perl stuff
 
 Revision 1.11  1999/01/18 09:22:38  ivan
-- 
cgit v1.2.1


From ee825e2c43273e6260d0291dee3e944ce14a83bc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Mar 1999 12:06:15 +0000
Subject: buglet in email invoices fixed

---
 site_perl/cust_main.pm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index 2002f7a59..842d52216 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -5,7 +5,8 @@ use vars qw($paymentserversecret $paymentserverport $paymentserverhost);
 package FS::cust_main;
 
 use strict;
-use vars qw(@ISA $conf $lpr $processor $xaction $E_NoErr $invoice_from);
+use vars qw( @ISA $conf $lpr $processor $xaction $E_NoErr $invoice_from
+             $smtpmachine );
 use Safe;
 use Carp;
 use Time::Local;
@@ -34,6 +35,7 @@ $FS::UID::callback{'FS::cust_main'} = sub {
   $conf = new FS::Conf;
   $lpr = $conf->config('lpr');
   $invoice_from = $conf->config('invoice_from');
+  $smtpmachine = $conf->config('smtpmachine');
 
   if ( $conf->exists('cybercash3.2') ) {
     require CCMckLib3_2;
@@ -591,6 +593,8 @@ sub collect {
         #my @print_text = $cust_bill->print_text; #( date )
         my @invoicing_list = $self->invoicing_list;
         if ( grep { $_ ne 'POST' } @invoicing_list ) { #email invoice
+          $ENV{SMTPHOSTS} = $smtpmachine;
+          $ENV{MAILADDRESS} = $invoice_from;
           my $header = new Mail::Header ( [
             "From: $invoice_from",
             "To: ". join(', ', grep { $_ ne 'POST' } @invoicing_list ),
@@ -863,7 +867,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.13 1999-02-28 20:09:03 ivan Exp $
+$Id: cust_main.pm,v 1.14 1999-03-29 12:06:15 ivan Exp $
 
 =head1 BUGS
 
@@ -919,7 +923,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.13  1999-02-28 20:09:03  ivan
+Revision 1.14  1999-03-29 12:06:15  ivan
+buglet in email invoices fixed
+
+Revision 1.13  1999/02/28 20:09:03  ivan
 allow spaces in zip codes, for (at least) canada.  pointed out by
 Clayton Gray <clgray@bcgroup.net>
 
-- 
cgit v1.2.1


From 9aaa4e00c332533784a62b445141171adb5fc5ca Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 4 Apr 1999 01:21:19 +0000
Subject: doc clarification

---
 htdocs/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index f96065136..1527e2e77 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -60,7 +60,7 @@ chmod 755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.c
     </ul>
 <li>Create the necessary <a href="config.html">configuration files</a>.
 <li>Create the `/usr/local/etc/freeside/counters.<i>datasrc</i>', and 
-  `/usr/local/etc/freeside/export.<i>datasrc</i>' directories for each <i>datasrc</i>.
+  `/usr/local/etc/freeside/export.<i>datasrc</i>' directories for each <i>datasrc</i> (owned by the freeside user).
   <li>As the freeside user, run bin/fs-setup to create the database tables.
 </ul>
 </body>
-- 
cgit v1.2.1


From 4d3796c2b65d3e3eb34d17a48f66c1681b50c0c8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 4 Apr 1999 01:53:45 +0000
Subject: Change Admin entries to read service/package definitions, for clariy

---
 htdocs/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index c75dfe8d2..041a88781 100755
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -55,11 +55,11 @@
       <li><A NAME="admin">Administration</a>
         <ul>
           <LI><A HREF="browse/part_svc.cgi">
-            View/Edit services
+            View/Edit service definitions
           </A>
             - Services are items you offer to your customers.
           <LI><A HREF="browse/part_pkg.cgi">
-            View/Edit packages
+            View/Edit package definitions
           </A>
             - One or more services are grouped together into a package and
               given pricing information.  Customers purchase packages, not
-- 
cgit v1.2.1


From fc1995c41d1fdad01d9cd068464749003f2fd761 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 4 Apr 1999 02:55:39 +0000
Subject: *** empty log message ***

---
 htdocs/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index 041a88781..052aed3ed 100755
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -67,8 +67,8 @@
           <LI><A HREF="browse/agent_type.cgi">
             View/Edit agent types
           </A>
-            - Agent types define groups of packages that you can then assign
-              to particular agents.
+            - Agent types define groups of package definitions that you can
+              then assign to particular agents.
           <LI><A HREF="browse/agent.cgi">
             View/Edit agents
           </A>
-- 
cgit v1.2.1


From 1b8a83fba8cbe60b403fce17836c94170fa9c7f5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Apr 1999 06:46:45 +0000
Subject: *** empty log message ***

---
 htdocs/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 1527e2e77..90211884d 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -53,7 +53,7 @@ chmod 4755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.
 <pre>cd /usr/local/apache/htdocs/freeside
 chown -R freeside .
 chmod 755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.cgi search/*.cgi view/*.cgi</pre>
-      <li>Use <a href="http://perl.apache.org/">mod_perl</a>.  You should run a separate iteration of Apache[-SSL] as the freeside user.  (Warning:  The redirect method of CGI.pm 2.36 [as distributed with Perl 5.004_04] is broken under mod_perl.  Downlaod the current version from <a href="http://www.perl.com/CPAN/modules/by-module/CGI">CPAN</a>.)
+      <li>Use <a href="http://perl.apache.org/">mod_perl</a>.  You should run a separate iteration of Apache[-SSL] as the freeside user.  (Warning:  The redirect method of CGI.pm 2.36 [as distributed with Perl 5.004_04] is broken under mod_perl.  Downlaod the current version from <a href="http://www.perl.com/CPAN/modules/by-module/CGI">CPAN</a>.  Apache 1.3.6 is also highly recommended because of signal handling problems in earlier versions.)
 <pre>cd /usr/local/apache/htdocs/freeside
 chown -R root .
 chmod 755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.cgi search/*.cgi view/*.cgi</pre>
-- 
cgit v1.2.1


From 17af0cfbc879299b4a5a063929b05ef042ca724e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Apr 1999 08:55:12 +0000
Subject: postgres notes

---
 htdocs/docs/install.html    |  2 +-
 htdocs/docs/postgresql.html | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100755 htdocs/docs/postgresql.html

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 90211884d..7aaad14ae 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -8,7 +8,7 @@ Before installing, you need:
   <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
   <li><a href="ftp://ftp.cs.hut.fi/pub/ssh/">SSH</a>
   <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_04)
-  <li>A database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>, such as <a href="http://www.tcx.se/">MySQL</a> or <a href="http://www.postgresql.org/">PostgreSQL</a>
+  <li>A database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>, such as <a href="http://www.tcx.se/">MySQL</a> or <a href="http://www.postgresql.org/">PostgreSQL</a> (see the <a href="postgresql.html">PostgreSQL notes</a>)
   <li>Perl modules
     <ul>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Array/">Array-PrintCols</a>
diff --git a/htdocs/docs/postgresql.html b/htdocs/docs/postgresql.html
new file mode 100755
index 000000000..151081176
--- /dev/null
+++ b/htdocs/docs/postgresql.html
@@ -0,0 +1,23 @@
+<head>
+  <title>PostgreSQL notes</title>
+</head>
+<body>
+  <h1>PostgreSQL notes</h1>
+<p>
+PostgreSQL ships by default with a maximum of 31 character column names.  If
+you use arbitrary RADIUS attributes longer than 9 characters, fs-setup will
+fail with `duplicate column' errors (in the part_svc table).
+Solution: use a different database
+engine, or recompile PostgreSQL with 64 character column names.
+</p>
+Future versions of Freeside will keep all column names under 31 characters to
+avoid this problem.
+</p>
+<p>
+( I've personally been unable to get PostgreSQL working with larger column names,
+though the process does look like it should be straightforward.  If anyone is
+interested in assisting me with this, please get in touch.
+ -Ivan <a href="mailto:ivan@sisd.com">&lt;ivan@sisd.com</a>&gt; )
+</p>
+</body>
+
-- 
cgit v1.2.1


From 2aa22dcacc8523311ebe32e4f8c077a227bc0dbb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Apr 1999 11:16:16 +0000
Subject: give a meaningful error message if you try to create a customer
 before you've created an agent

---
 htdocs/edit/cust_main.cgi | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 901923d98..233fff2a2 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.11 1999-03-25 13:55:10 ivan Exp $
+# $Id: cust_main.cgi,v 1.12 1999-04-06 11:16:16 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,11 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.11  1999-03-25 13:55:10  ivan
+# Revision 1.12  1999-04-06 11:16:16  ivan
+# give a meaningful error message if you try to create a customer before you've
+# created an agent
+#
+# Revision 1.11  1999/03/25 13:55:10  ivan
 # one-screen new customer entry (including package and service) for simple
 # packages with one svc_acct service
 #
@@ -152,6 +156,7 @@ print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST>!,
 $r = qq!<font color="#ff0000">*</font>!;
 
 @agents = qsearch( 'agent', {} );
+die "No agents created!" unless @agents;
 $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
 if ( scalar(@agents) == 1 ) {
   print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!;
-- 
cgit v1.2.1


From 0f55176926123fca13ef61a7515da8e0ea7a1db8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Apr 1999 11:10:46 +0000
Subject: harmless typo

---
 htdocs/browse/agent_type.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/browse/agent_type.cgi b/htdocs/browse/agent_type.cgi
index ff3a68cf6..5b090abff 100755
--- a/htdocs/browse/agent_type.cgi
+++ b/htdocs/browse/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.5 1999-01-19 05:13:25 ivan Exp $
+# $Id: agent_type.cgi,v 1.6 1999-04-07 11:10:46 ivan Exp $
 #
 # ivan@sisd.com 97-dec-10
 #
@@ -11,7 +11,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.5  1999-01-19 05:13:25  ivan
+# Revision 1.6  1999-04-07 11:10:46  ivan
+# harmless typo
+#
+# Revision 1.5  1999/01/19 05:13:25  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -64,7 +67,7 @@ foreach $agent_type ( sort {
         <TD ROWSPAN=$rowspan><A HREF="${p}edit/agent_type.cgi?$hashref->{typenum}">
           $hashref->{typenum}
         </A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="${p}/edit/agent_type.cgi?$hashref->{typenum}">$hashref->{atype}</A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/agent_type.cgi?$hashref->{typenum}">$hashref->{atype}</A></TD>
 END
 
   my($type_pkgs);
-- 
cgit v1.2.1


From cbccf1d59c49b95ffc26703a4e251052c27ee63a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Apr 1999 11:19:21 +0000
Subject: silly HTML typo

---
 htdocs/edit/agent_type.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/edit/agent_type.cgi b/htdocs/edit/agent_type.cgi
index 147bb6f98..bdf64c58f 100755
--- a/htdocs/edit/agent_type.cgi
+++ b/htdocs/edit/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.10 1999-01-25 12:09:51 ivan Exp $
+# $Id: agent_type.cgi,v 1.11 1999-04-07 11:19:21 ivan Exp $
 #
 # agent_type.cgi: Add/Edit agent type (output form)
 #
@@ -13,7 +13,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.10  1999-01-25 12:09:51  ivan
+# Revision 1.11  1999-04-07 11:19:21  ivan
+# silly HTML typo
+#
+# Revision 1.10  1999/01/25 12:09:51  ivan
 # yet more mod_perl stuff
 #
 # Revision 1.9  1999/01/19 05:13:32  ivan
@@ -103,7 +106,7 @@ foreach $part_pkg ( qsearch('part_pkg',{}) ) {
         })
           ? 'CHECKED '
           : '',
-        qq!"VALUE="ON"> !,
+        qq!VALUE="ON"> !,
     qq!<A HREF="${p}edit/part_pkg.cgi?!, $part_pkg->pkgpart, 
     '">', $part_pkg->getfield('pkg'), '</A>',
   ;
-- 
cgit v1.2.1


From 47efa9f6718a02e670f1cbcffad04bf409f580f7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Apr 1999 11:27:50 +0000
Subject: avoid perl's silly arguement not numeric error

---
 htdocs/edit/agent.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/edit/agent.cgi b/htdocs/edit/agent.cgi
index d0ceac38d..5b42095b3 100755
--- a/htdocs/edit/agent.cgi
+++ b/htdocs/edit/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.6 1999-01-25 12:09:50 ivan Exp $
+# $Id: agent.cgi,v 1.7 1999-04-07 11:27:50 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -11,7 +11,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: agent.cgi,v $
-# Revision 1.6  1999-01-25 12:09:50  ivan
+# Revision 1.7  1999-04-07 11:27:50  ivan
+# avoid perl's silly arguement not numeric error
+#
+# Revision 1.6  1999/01/25 12:09:50  ivan
 # yet more mod_perl stuff
 #
 # Revision 1.5  1999/01/19 05:13:31  ivan
@@ -81,7 +84,7 @@ END
 foreach $agent_type (qsearch('agent_type',{})) {
   print "<OPTION VALUE=". $agent_type->typenum;
   print " SELECTED"
-    if $hashref->{typenum} == $agent_type->getfield('typenum');
+    if $hashref->{typenum} && ( $hashref->{typenum} == $agent_type->typenum );
   print ">", $agent_type->getfield('typenum'), ": ",
         $agent_type->getfield('atype'),"\n";
 }
-- 
cgit v1.2.1


From decb6d7a4becdc7e759f788454cf7ad700f6a45f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Apr 1999 11:43:23 +0000
Subject: pick up errors right away, leave input

---
 htdocs/edit/part_referral.cgi | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/htdocs/edit/part_referral.cgi b/htdocs/edit/part_referral.cgi
index ed3b2678e..24ac9dd82 100755
--- a/htdocs/edit/part_referral.cgi
+++ b/htdocs/edit/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_referral.cgi,v 1.5 1999-02-07 09:59:20 ivan Exp $
+# $Id: part_referral.cgi,v 1.6 1999-04-07 11:43:23 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23
 #
@@ -12,7 +12,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_referral.cgi,v $
-# Revision 1.5  1999-02-07 09:59:20  ivan
+# Revision 1.6  1999-04-07 11:43:23  ivan
+# pick up errors right away, leave input
+#
+# Revision 1.5  1999/02/07 09:59:20  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.4  1999/01/19 05:13:41  ivan
@@ -32,7 +35,7 @@ use vars qw( $cgi $part_referral $action $hashref $p1 $query );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
+use FS::Record qw(qsearch qsearchs fields);
 use FS::part_referral;
 use FS::CGI qw(header menubar popurl);
 
@@ -40,14 +43,18 @@ $cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-($query) = $cgi->keywords;
-if ( $query =~ /^(\d+)$/ ) { #editing
-  $part_referral=qsearchs('part_referral',{'refnum'=>$1});
-  $action='Edit';
+if ( $cgi->param('error') ) {
+  $part_referral = new FS::part_referral ( {
+    map { $_, scalar($cgi->param($_)) } fields('part_referral')
+  } );
+} elsif ( $cgi->keywords ) {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $part_referral = qsearchs( 'part_referral', { 'refnum' => $1 } );
 } else { #adding
   $part_referral = new FS::part_referral {};
-  $action='Add';
 }
+$action = $part_referral->refnum ? 'Edit' : 'Add';
 $hashref = $part_referral->hashref;
 
 $p1 = popurl(1);
-- 
cgit v1.2.1


From 05c60524e89b7b0f0f70a531c7b7f56db45a3d9d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Apr 1999 13:41:54 +0000
Subject: in &invoicing_list, don't search if there's no custnum yet

---
 site_perl/cust_main.pm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index 842d52216..077740995 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -836,8 +836,12 @@ sub invoicing_list {
       } 
     }
   }
-  map { $_->address }
-    qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
+  if ( $self->custnum ) {
+    map { $_->address }
+      qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
+  } else {
+    ();
+  }
 }
 
 =item check_invoicing_list ARRAYREF
@@ -867,7 +871,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.14 1999-03-29 12:06:15 ivan Exp $
+$Id: cust_main.pm,v 1.15 1999-04-07 13:41:54 ivan Exp $
 
 =head1 BUGS
 
@@ -923,7 +927,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.14  1999-03-29 12:06:15  ivan
+Revision 1.15  1999-04-07 13:41:54  ivan
+in &invoicing_list, don't search if there's no custnum yet
+
+Revision 1.14  1999/03/29 12:06:15  ivan
 buglet in email invoices fixed
 
 Revision 1.13  1999/02/28 20:09:03  ivan
-- 
cgit v1.2.1


From 4e46a47e7dda792f7aee893f7fb8b7341bba00f3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Apr 1999 14:32:19 +0000
Subject: more &invoicing_list logic to skip searches when there is no custnum

---
 site_perl/cust_main.pm | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index 077740995..768d77273 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -813,8 +813,13 @@ This interface may change in the future.
 sub invoicing_list {
   my( $self, $arrayref ) = @_;
   if ( $arrayref ) {
-    my @cust_main_invoice = 
-      qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
+    my @cust_main_invoice;
+    if ( $self->custnum ) {
+      @cust_main_invoice = 
+        qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
+    } else {
+      @cust_main_invoice = ();
+    }
     foreach my $cust_main_invoice ( @cust_main_invoice ) {
       #warn $cust_main_invoice->destnum;
       unless ( grep { $cust_main_invoice->address eq $_ } @{$arrayref} ) {
@@ -823,8 +828,12 @@ sub invoicing_list {
         warn $error if $error;
       }
     }
-    @cust_main_invoice =
-      qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
+    if ( $self->custnum ) {
+      @cust_main_invoice = 
+        qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
+    } else {
+      @cust_main_invoice = ();
+    }
     foreach my $address ( @{$arrayref} ) {
       unless ( grep { $address eq $_->address } @cust_main_invoice ) {
         my $cust_main_invoice = new FS::cust_main_invoice ( {
@@ -871,7 +880,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.15 1999-04-07 13:41:54 ivan Exp $
+$Id: cust_main.pm,v 1.16 1999-04-07 14:32:19 ivan Exp $
 
 =head1 BUGS
 
@@ -927,7 +936,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.15  1999-04-07 13:41:54  ivan
+Revision 1.16  1999-04-07 14:32:19  ivan
+more &invoicing_list logic to skip searches when there is no custnum
+
+Revision 1.15  1999/04/07 13:41:54  ivan
 in &invoicing_list, don't search if there's no custnum yet
 
 Revision 1.14  1999/03/29 12:06:15  ivan
-- 
cgit v1.2.1


From f892887626d5d6288e455768d24b5bcaff646123 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Apr 1999 14:37:37 +0000
Subject: use FS::part_svc and FS::svc_acct_pop to avoid warnings

---
 site_perl/svc_acct.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/site_perl/svc_acct.pm b/site_perl/svc_acct.pm
index 1ba92aec1..f066ebdd6 100644
--- a/site_perl/svc_acct.pm
+++ b/site_perl/svc_acct.pm
@@ -7,6 +7,8 @@ use FS::Conf;
 use FS::Record qw( qsearchs fields );
 use FS::svc_Common;
 use FS::SSH qw(ssh);
+use FS::part_svc;
+use FS::svc_acct_pop;
 
 @ISA = qw( FS::svc_Common );
 
@@ -443,7 +445,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.6 1999-01-25 12:26:15 ivan Exp $
+$Id: svc_acct.pm,v 1.7 1999-04-07 14:37:37 ivan Exp $
 
 =head1 BUGS
 
@@ -485,7 +487,10 @@ arbitrary radius attributes ivan@sisd.com 98-aug-13
 pod and FS::conf ivan@sisd.com 98-sep-22
 
 $Log: svc_acct.pm,v $
-Revision 1.6  1999-01-25 12:26:15  ivan
+Revision 1.7  1999-04-07 14:37:37  ivan
+use FS::part_svc and FS::svc_acct_pop to avoid warnings
+
+Revision 1.6  1999/01/25 12:26:15  ivan
 yet more mod_perl stuff
 
 Revision 1.5  1999/01/18 21:58:09  ivan
-- 
cgit v1.2.1


From eded85cf29342b0791f4bf18aa79b3e7f46fd999 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Apr 1999 14:40:15 +0000
Subject: use all stuff that's qsearch'ed to avoid warnings

---
 site_perl/svc_acct_sm.pm |  4 +++-
 site_perl/svc_domain.pm  | 12 +++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/site_perl/svc_acct_sm.pm b/site_perl/svc_acct_sm.pm
index b0eee114c..c757ab073 100644
--- a/site_perl/svc_acct_sm.pm
+++ b/site_perl/svc_acct_sm.pm
@@ -7,6 +7,8 @@ use FS::svc_Common;
 use FS::cust_svc;
 use FS::SSH qw(ssh);
 use FS::Conf;
+use FS::svc_acct;
+use FS::svc_domain;
 
 @ISA = qw( FS::svc_Common );
 
@@ -230,7 +232,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_acct_sm.pm,v 1.6 1999-01-25 12:26:16 ivan Exp $
+$Id: svc_acct_sm.pm,v 1.7 1999-04-07 14:40:15 ivan Exp $
 
 =head1 BUGS
 
diff --git a/site_perl/svc_domain.pm b/site_perl/svc_domain.pm
index 76d666b86..19aac3f88 100644
--- a/site_perl/svc_domain.pm
+++ b/site_perl/svc_domain.pm
@@ -9,9 +9,12 @@ use Mail::Internet;
 use Mail::Header;
 use Date::Format;
 use FS::Record qw(fields qsearch qsearchs);
+use FS::Conf;
 use FS::svc_Common;
 use FS::cust_svc;
-use FS::Conf;
+use FS::svc_acct;
+use FS::cust_pkg;
+use FS::cust_main;
 
 @ISA = qw( FS::svc_Common );
 
@@ -387,7 +390,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.6 1999-01-25 12:26:17 ivan Exp $
+$Id: svc_domain.pm,v 1.7 1999-04-07 14:40:15 ivan Exp $
 
 =head1 BUGS
 
@@ -423,7 +426,10 @@ ivan@sisd.com 98-jul-17-19
 pod, some FS::Conf (not complete) ivan@sisd.com 98-sep-23
 
 $Log: svc_domain.pm,v $
-Revision 1.6  1999-01-25 12:26:17  ivan
+Revision 1.7  1999-04-07 14:40:15  ivan
+use all stuff that's qsearch'ed to avoid warnings
+
+Revision 1.6  1999/01/25 12:26:17  ivan
 yet more mod_perl stuff
 
 Revision 1.5  1998/12/30 00:30:47  ivan
-- 
cgit v1.2.1


From 35efa918b163f10c1bdcc70087653f8be00b3bc5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Apr 1999 14:58:31 +0000
Subject: more kludges to get around different null/empty handling in Perl vs.
 MySQL vs. PostgreSQL etc.

---
 site_perl/Record.pm | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/site_perl/Record.pm b/site_perl/Record.pm
index da7ba435d..4634026b8 100644
--- a/site_perl/Record.pm
+++ b/site_perl/Record.pm
@@ -166,13 +166,17 @@ sub qsearch {
     ? " WHERE ". join(' AND ',
       map {
         $record->{$_} eq ''
-          ? "( $_ IS NULL OR $_ = \"\" )"
+          ? ( datasrc =~ m/Pg/
+                ? "$_ IS NULL"
+                : "( $_ IS NULL OR $_ = \"\" )"
+            )
           : "$_ = ". _quote($record->{$_},$table,$_)
       } @fields
     ) : ''
   );
   $sth=$dbh->prepare($statement)
     or croak $dbh->errstr; #is that a little too harsh?  hmm.
+  #warn $statement #if $debug # or some such;
 
   if ( eval ' scalar(@FS::'. $table. '::ISA);' ) {
     map {
@@ -384,7 +388,11 @@ sub delete {
   my($statement)="DELETE FROM ". $self->table. " WHERE ". join(' AND ',
     map {
       $self->getfield($_) eq ''
-        ? "( $_ IS NULL OR $_ = \"\" )"
+        #? "( $_ IS NULL OR $_ = \"\" )"
+        ? ( datasrc =~ m/Pg/
+              ? "$_ IS NULL"
+              : "( $_ IS NULL OR $_ = \"\" )"
+          )
         : "$_ = ". _quote($self->getfield($_),$self->table,$_)
     } ( $self->dbdef_table->primary_key )
           ? ( $self->dbdef_table->primary_key)
@@ -452,7 +460,11 @@ sub replace {
     join(' AND ',
       map {
         $old->getfield($_) eq ''
-          ? "( $_ IS NULL OR $_ = \"\" )"
+          #? "( $_ IS NULL OR $_ = \"\" )"
+          ? ( datasrc =~ m/Pg/
+                ? "$_ IS NULL"
+                : "( $_ IS NULL OR $_ = \"\" )"
+            )
           : "$_ = ". _quote($old->getfield($_),$old->table,$_)
       } ( $primary_key ? ( $primary_key ) : $old->fields )
     )
@@ -810,7 +822,7 @@ sub hfields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.13 1999-03-29 11:55:43 ivan Exp $
+$Id: Record.pm,v 1.14 1999-04-07 14:58:31 ivan Exp $
 
 =head1 BUGS
 
@@ -932,7 +944,11 @@ added pod documentation ivan@sisd.com 98-sep-6
 ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
 $Log: Record.pm,v $
-Revision 1.13  1999-03-29 11:55:43  ivan
+Revision 1.14  1999-04-07 14:58:31  ivan
+more kludges to get around different null/empty handling in Perl vs. MySQL vs.
+PostgreSQL etc.
+
+Revision 1.13  1999/03/29 11:55:43  ivan
 eliminate warnings in ut_money
 
 Revision 1.12  1999/01/25 12:26:06  ivan
-- 
cgit v1.2.1


From 4ad9c02763c02067fe53cd994b2a75468f280bf0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Apr 1999 15:24:06 +0000
Subject: don't use anchor in redirect

---
 htdocs/edit/process/cust_credit.cgi | 9 ++++++---
 htdocs/edit/process/cust_main.cgi   | 9 ++++++---
 htdocs/edit/process/cust_pkg.cgi    | 9 ++++++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/htdocs/edit/process/cust_credit.cgi b/htdocs/edit/process/cust_credit.cgi
index 0b3cb54db..ea9c5a3a2 100755
--- a/htdocs/edit/process/cust_credit.cgi
+++ b/htdocs/edit/process/cust_credit.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_credit.cgi,v 1.6 1999-02-28 00:03:41 ivan Exp $
+# $Id: cust_credit.cgi,v 1.7 1999-04-07 15:23:05 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_credit.cgi
@@ -20,7 +20,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_credit.cgi,v $
-# Revision 1.6  1999-02-28 00:03:41  ivan
+# Revision 1.7  1999-04-07 15:23:05  ivan
+# don't use anchor in redirect
+#
+# Revision 1.6  1999/02/28 00:03:41  ivan
 # removed misleading comments
 #
 # Revision 1.5  1999/01/25 12:09:59  ivan
@@ -67,7 +70,7 @@ if ( $error ) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). "cust_credit.cgi?". $cgi->query_string );
 } else {
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#history");
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
 }
 
 
diff --git a/htdocs/edit/process/cust_main.cgi b/htdocs/edit/process/cust_main.cgi
index 2eb1c19e3..729bed7c4 100755
--- a/htdocs/edit/process/cust_main.cgi
+++ b/htdocs/edit/process/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.8 1999-03-25 13:55:10 ivan Exp $
+# $Id: cust_main.cgi,v 1.9 1999-04-07 15:22:19 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -20,7 +20,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.8  1999-03-25 13:55:10  ivan
+# Revision 1.9  1999-04-07 15:22:19  ivan
+# don't use anchor in redirect
+#
+# Revision 1.8  1999/03/25 13:55:10  ivan
 # one-screen new customer entry (including package and service) for simple
 # packages with one svc_acct service
 #
@@ -174,5 +177,5 @@ if ( $error ) {
 } else { 
   $new->invoicing_list( \@invoicing_list );
   $custnum = $new->custnum;
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#cust_main");
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
 } 
diff --git a/htdocs/edit/process/cust_pkg.cgi b/htdocs/edit/process/cust_pkg.cgi
index 437569fb4..9d82b3c24 100755
--- a/htdocs/edit/process/cust_pkg.cgi
+++ b/htdocs/edit/process/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.6 1999-02-28 00:03:44 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.7 1999-04-07 15:24:06 ivan Exp $
 #
 # this is for changing packages around, not for editing things within the
 # package
@@ -19,7 +19,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.6  1999-02-28 00:03:44  ivan
+# Revision 1.7  1999-04-07 15:24:06  ivan
+# don't use anchor in redirect
+#
+# Revision 1.6  1999/02/28 00:03:44  ivan
 # removed misleading comments
 #
 # Revision 1.5  1999/02/07 09:59:26  ivan
@@ -72,6 +75,6 @@ if ($error) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). "cust_pkg.cgi?". $cgi->query_string );
 } else {
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#cust_pkg");
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
 }
 
-- 
cgit v1.2.1


From 2841990a893a7595047e4dccf853cd98036f89cf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 1999 04:04:37 +0000
Subject: eliminate double // in links

---
 htdocs/view/cust_main.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index 4e80fdd4e..58c1323a4 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.13 1999-02-28 00:04:00 ivan Exp $
+# $Id: cust_main.cgi,v 1.14 1999-04-08 04:04:37 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -31,7 +31,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.13  1999-02-28 00:04:00  ivan
+# Revision 1.14  1999-04-08 04:04:37  ivan
+# eliminate double // in links
+#
+# Revision 1.13  1999/02/28 00:04:00  ivan
 # removed misleading comments
 #
 # Revision 1.12  1999/02/07 09:59:40  ivan
@@ -276,7 +279,7 @@ foreach $package (@packages) {
   foreach my $cust_svc ( @cust_svc ) {
      my($label, $value, $svcdb) = $cust_svc->label;
      my($svcnum) = $cust_svc->svcnum;
-     my($sview) = popurl(2). "/view";
+     my($sview) = popurl(2). "view";
      print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
            qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
      $n2="</TR><TR>";
-- 
cgit v1.2.1


From 2e2575e376ae4fa2e41673ab48dfd2c9b42d9fd8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 1999 10:35:02 +0000
Subject: import necessary subroutines from FS::CGI

---
 htdocs/misc/cancel_pkg.cgi | 8 ++++++--
 htdocs/misc/susp_pkg.cgi   | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/htdocs/misc/cancel_pkg.cgi b/htdocs/misc/cancel_pkg.cgi
index 78ae64d1f..7bbcf6e7f 100755
--- a/htdocs/misc/cancel_pkg.cgi
+++ b/htdocs/misc/cancel_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cancel_pkg.cgi,v 1.5 1999-02-28 00:03:49 ivan Exp $
+# $Id: cancel_pkg.cgi,v 1.6 1999-04-08 10:35:02 ivan Exp $
 #
 # Usage: cancel_pkg.cgi pkgnum
 #        http://server.name/path/cancel_pkg.cgi pkgnum
@@ -27,7 +27,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cancel_pkg.cgi,v $
-# Revision 1.5  1999-02-28 00:03:49  ivan
+# Revision 1.6  1999-04-08 10:35:02  ivan
+# import necessary subroutines from FS::CGI
+#
+# Revision 1.5  1999/02/28 00:03:49  ivan
 # removed misleading comments
 #
 # Revision 1.4  1999/01/19 05:14:04  ivan
@@ -48,6 +51,7 @@ use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(eidiot popurl);
 use FS::Record qw(qsearchs);
+use FS::CGI qw(popurl eidiot);
 use FS::cust_pkg;
 
 $cgi = new CGI;
diff --git a/htdocs/misc/susp_pkg.cgi b/htdocs/misc/susp_pkg.cgi
index 265469340..abe4f70b0 100755
--- a/htdocs/misc/susp_pkg.cgi
+++ b/htdocs/misc/susp_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: susp_pkg.cgi,v 1.5 1999-02-28 00:03:52 ivan Exp $
+# $Id: susp_pkg.cgi,v 1.6 1999-04-08 10:35:02 ivan Exp $
 #
 # Usage: susp_pkg.cgi pkgnum
 #        http://server.name/path/susp_pkg.cgi pkgnum
@@ -21,7 +21,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: susp_pkg.cgi,v $
-# Revision 1.5  1999-02-28 00:03:52  ivan
+# Revision 1.6  1999-04-08 10:35:02  ivan
+# import necessary subroutines from FS::CGI
+#
+# Revision 1.5  1999/02/28 00:03:52  ivan
 # removed misleading comments
 #
 # Revision 1.4  1999/01/19 05:14:08  ivan
@@ -41,6 +44,7 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs);
+use FS::CGI qw(popurl eidiot);
 use FS::cust_pkg;
 
 $cgi = new CGI;
-- 
cgit v1.2.1


From 9091c98dd6e6472b202ad5911fee45bd96b03f41 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 1999 11:31:40 +0000
Subject: *** empty log message ***

---
 htdocs/misc/link.cgi | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/misc/link.cgi b/htdocs/misc/link.cgi
index 10ea000bc..eb1780711 100755
--- a/htdocs/misc/link.cgi
+++ b/htdocs/misc/link.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: link.cgi,v 1.6 1999-02-28 00:03:51 ivan Exp $
+# $Id: link.cgi,v 1.7 1999-04-08 11:31:40 ivan Exp $
 #
 # ivan@voicenet.com 97-feb-5
 #
@@ -9,7 +9,10 @@
 # can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
 #
 # $Log: link.cgi,v $
-# Revision 1.6  1999-02-28 00:03:51  ivan
+# Revision 1.7  1999-04-08 11:31:40  ivan
+# *** empty log message ***
+#
+# Revision 1.6  1999/02/28 00:03:51  ivan
 # removed misleading comments
 #
 # Revision 1.5  1999/01/19 05:14:06  ivan
@@ -33,7 +36,7 @@ use vars qw ( %link_field $cgi $pkgnum $svcpart $query $part_svc $svc $svcdb
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
+use FS::CGI qw(popurl header);
 use FS::Record qw(qsearchs);
 
 %link_field = (
@@ -58,7 +61,7 @@ $svc = $part_svc->getfield('svc');
 $svcdb = $part_svc->getfield('svcdb');
 $link_field = $link_field{$svcdb};
 
-print $cgi->header( '-expires' => 'now' ), header("Link to existing $svc account"),
+print $cgi->header( '-expires' => 'now' ), header("Link to existing $svc"),
       qq!<FORM ACTION="!, popurl(1), qq!process/link.cgi" METHOD=POST>!;
 
 if ( $link_field ) { 
-- 
cgit v1.2.1


From ef9dcbfdf3c2e7c0ac44eeff478e6eddcd038d62 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 1999 12:00:19 +0000
Subject: aesthetic update

---
 htdocs/view/cust_pkg.cgi    | 119 +++++++++++++++++++++++---------------------
 htdocs/view/svc_acct.cgi    | 106 ++++++++++++++-------------------------
 htdocs/view/svc_acct_sm.cgi |  60 ++++++++--------------
 htdocs/view/svc_domain.cgi  |  53 ++++++++++----------
 4 files changed, 146 insertions(+), 192 deletions(-)

diff --git a/htdocs/view/cust_pkg.cgi b/htdocs/view/cust_pkg.cgi
index 939fcc2dc..bf7f29bc1 100755
--- a/htdocs/view/cust_pkg.cgi
+++ b/htdocs/view/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.8 1999-02-28 00:04:01 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.9 1999-04-08 12:00:19 ivan Exp $
 #
 # Usage: cust_pkg.cgi pkgnum
 #        http://server.name/path/cust_pkg.cgi?pkgnum
@@ -24,7 +24,10 @@
 # no FS::Search ivan@sisd.com 98-mar-7
 # 
 # $Log: cust_pkg.cgi,v $
-# Revision 1.8  1999-02-28 00:04:01  ivan
+# Revision 1.9  1999-04-08 12:00:19  ivan
+# aesthetic update
+#
+# Revision 1.8  1999/02/28 00:04:01  ivan
 # removed misleading comments
 #
 # Revision 1.7  1999/01/19 05:14:20  ivan
@@ -54,7 +57,7 @@ use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl header);
+use FS::CGI qw(popurl header menubar ntable table);
 use FS::Record qw(qsearch qsearchs);
 use FS::part_svc;
 use FS::cust_pkg;
@@ -70,8 +73,6 @@ foreach $part_svc ( qsearch('part_svc',{}) ) {
   $uiadd{$part_svc->svcpart}= popurl(2). "edit/". $part_svc->svcdb . ".cgi";
 }
 
-print $cgi->header( '-expires' => 'now' ), header('Package View', '');
-
 ($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
 $pkgnum = $1;
@@ -81,10 +82,11 @@ $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
 die "No package!" unless $cust_pkg;
 $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
 
-#nav bar
 $custnum = $cust_pkg->getfield('custnum');
-print qq!<CENTER><A HREF="../view/cust_main.cgi?$custnum">View this customer!,
-      qq! (#$custnum)</A> | <A HREF="../">Main menu</A></CENTER><BR>!;
+print $cgi->header( '-expires' => 'now' ), header('Package View', menubar(
+  "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum",
+  'Main Menu' => popurl(2)
+));
 
 #print info
 ($susp,$cancel,$expire)=(
@@ -92,67 +94,63 @@ print qq!<CENTER><A HREF="../view/cust_main.cgi?$custnum">View this customer!,
   $cust_pkg->getfield('cancel'),
   $cust_pkg->getfield('expire'),
 );
-print "<FONT SIZE=+1><CENTER>Package #<B>$pkgnum</B></FONT>";
-print qq!<BR><A HREF="#package">Package Information</A>!;
-print qq! | <A HREF="#services">Service Information</A>! unless $cancel;
-print qq!</CENTER><HR>\n!;
-
 ($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment'));
-print qq!<A NAME="package"><CENTER><FONT SIZE=+1>Package Information!,
-      qq!</FONT></A>!;
-print qq!<BR><A HREF="../unimp.html">Edit this information</A></CENTER>!;
-print "<P>Package: <B>$pkg - $comment</B>";
-
 ($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
-print "<BR>Setup: <B>", $setup ? time2str("%D",$setup) : "(Not setup)" ,"</B>";
-print "<BR>Next bill: <B>", $bill ? time2str("%D",$bill) : "" ,"</B>";
-
-if ($susp) {
-  print "<BR>Suspended: <B>", time2str("%D",$susp), "</B>";
-  print qq! <A HREF="../misc/unsusp_pkg.cgi?$pkgnum">Unsuspend</A>! unless $cancel;
-} else {
-  print qq!<BR><A HREF="../misc/susp_pkg.cgi?$pkgnum">Suspend</A>! unless $cancel;
-}
-
-if ($expire) {
-  print "<BR>Expire: <B>", time2str("%D",$expire), "</B>";
-}
-  print <<END;
-<FORM ACTION="../misc/expire_pkg.cgi" METHOD="post">
-<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
-Expire (date): <INPUT TYPE="text" NAME="date" VALUE="" >
-<INPUT TYPE="submit" VALUE="Cancel later">
-END
-
-if ($cancel) {
-  print "<BR>Cancelled: <B>", time2str("%D",$cancel), "</B>";
-} else {
-  print qq!<BR><A HREF="../misc/cancel_pkg.cgi?$pkgnum">Cancel now</A>!;
-}
-
-#otaker
 $otaker = $cust_pkg->getfield('otaker');
-print "<P>Order taken by <B>$otaker</B>";
+
+print "Package information";
+print ' (<A HREF="'. popurl(2). 'misc/unsusp_pkg.cgi?'. $pkgnum.
+      '">unsuspend</A>)' if ( $susp && ! $cancel );
+print ' (<A HREF="'. popurl(2). 'misc/susp_pkg.cgi?'. $pkgnum.
+      '">suspend</A>)' unless ( $susp || $cancel );
+print ' (<A HREF="'. popurl(2). 'misc/cancel_pkg.cgi?'. $pkgnum.
+      '">cancel</A>)' unless $cancel;
+
+print ntable("#c0c0c0"), '<TR><TD>', ntable("#c0c0c0",2),
+      '<TR><TD ALIGN="right">Package number</TD><TD BGCOLOR="#ffffff">',
+      $pkgnum, '</TD></TR>',
+      '<TR><TD ALIGN="right">Package</TD><TD BGCOLOR="#ffffff">',
+      $pkg,  '</TD></TR>',
+      '<TR><TD ALIGN="right">Comment</TD><TD BGCOLOR="#ffffff">',
+      $comment,  '</TD></TR>',
+      '<TR><TD ALIGN="right">Setup date</TD><TD BGCOLOR="#ffffff">',
+      ( $setup ? time2str("%D",$setup) : "(Not setup)" ), '</TD></TR>',
+      '<TR><TD ALIGN="right">Next bill date</TD><TD BGCOLOR="#ffffff">',
+      ( $bill ? time2str("%D",$bill) : "&nbsp;" ), '</TD></TR>',
+;
+print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
+       time2str("%D",$susp), '</TD></TR>' if $susp;
+print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
+       time2str("%D",$expire), '</TD></TR>' if $expire;
+print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
+       time2str("%D",$cancel), '</TD></TR>' if $cancel;
+print  '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
+      $otaker,  '</TD></TR>',
+      '</TABLE></TD></TR></TABLE>'
+;
+
+#  print <<END;
+#<FORM ACTION="../misc/expire_pkg.cgi" METHOD="post">
+#<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
+#Expire (date): <INPUT TYPE="text" NAME="date" VALUE="" >
+#<INPUT TYPE="submit" VALUE="Cancel later">
+#END
 
 unless ($cancel) {
 
   #services
-  print <<END;
-<HR><A NAME="services"><CENTER><FONT SIZE=+1>Service Information</FONT></A>
-<BR>Click on service to view/edit/add service.</CENTER><BR>
-<CENTER><B>Do NOT pick the "Link to existing" option unless you are auditing!!!</B></CENTER>
-<CENTER><TABLE BORDER=4>
-<TR><TH>Service</TH>
-END
+  print '<BR>Service Information', table,
+  ;
 
   #list of services this pkgpart includes
-  my($pkg_svc,%pkg_svc);
+  my $pkg_svc;
+  my %pkg_svc = ();
   foreach $pkg_svc ( qsearch('pkg_svc',{'pkgpart'=> $cust_pkg->pkgpart }) ) {
     $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity if $pkg_svc->quantity;
   }
 
   #list of records from cust_svc
-  my($svcpart);
+  my $svcpart;
   foreach $svcpart (sort {$a <=> $b} keys %pkg_svc) {
 
     my($svc)=qsearchs('part_svc',{'svcpart'=>$svcpart})->getfield('svc');
@@ -167,8 +165,9 @@ END
       my($cust_svc);
       if ( $cust_svc=shift @cust_svc ) {
         my($svcnum)=$cust_svc->svcnum;
+        my($label, $value, $svcdb) = $cust_svc->label;
         print <<END;
-<TR><TD><A HREF="$uiview{$svcpart}?$svcnum">(View) $svc<A></TD></TR>
+<TR><TD><A HREF="$uiview{$svcpart}?$svcnum">(View) $svc: $value<A></TD></TR>
 END
       } else {
         print <<END;
@@ -186,8 +185,12 @@ END
     warn "WARNING: Leftover services pkgnum $pkgnum!" if @cust_svc;; 
   }
 
-  print "</TABLE></CENTER>";
-
+  print "</TABLE><FONT SIZE=-1>",
+        "Choose (View) to view or edit an existing service<BR>",
+        "Choose (Add) to setup a new service<BR>",
+        "Choose (Link to existing) to link to a legacy (pre-Freeside) service",
+        "</FONT>"
+  ;
 }
 
 #formatting
diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi
index 900dc56a8..a191c25dd 100755
--- a/htdocs/view/svc_acct.cgi
+++ b/htdocs/view/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.8 1999-02-28 00:04:02 ivan Exp $
+# $Id: svc_acct.cgi,v 1.9 1999-04-08 12:00:19 ivan Exp $
 #
 # Usage: svc_acct.cgi svcnum
 #        http://server.name/path/svc_acct.cgi?svcnum
@@ -33,7 +33,10 @@
 # displays arbitrary radius attributes ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.8  1999-02-28 00:04:02  ivan
+# Revision 1.9  1999-04-08 12:00:19  ivan
+# aesthetic update
+#
+# Revision 1.8  1999/02/28 00:04:02  ivan
 # removed misleading comments
 #
 # Revision 1.7  1999/01/19 05:14:21  ivan
@@ -63,7 +66,7 @@ use vars qw( $conf $cgi $mydomain $query $svcnum $svc_acct $cust_svc $pkgnum
 use CGI;
 use CGI::Carp qw( fatalsToBrowser );
 use FS::UID qw( cgisuidsetup );
-use FS::CGI qw( header popurl );
+use FS::CGI qw( header popurl menubar);
 use FS::Record qw( qsearchs fields );
 use FS::Conf;
 use FS::svc_acct;
@@ -78,7 +81,6 @@ $cgi = new CGI;
 $conf = new FS::Conf;
 $mydomain = $conf->config('domain');
 
-#untaint svcnum
 ($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
 $svcnum = $1;
@@ -90,83 +92,58 @@ $pkgnum = $cust_svc->getfield('pkgnum');
 if ($pkgnum) {
   $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
   $custnum=$cust_pkg->getfield('custnum');
+} else {
+  $cust_pkg = '';
+  $custnum = '';
 }
 
 $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unkonwn svcpart" unless $part_svc;
 
-print $cgi->header( '-expires' => 'now' ), header('Account View', '');
-
 $p = popurl(2);
-if ($pkgnum || $custnum) {
-  print <<END;
-<A HREF="${p}view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> | 
-<A HREF="${p}view/cust_main.cgi?$custnum">View this customer (#$custnum)</A> | 
-END
-} else {
-  print <<END;
-<A HREF="${p}misc/cancel-unaudited.cgi?$svcnum">Cancel this (unaudited)account</A> |
-END
-}
-
-print <<END;
-<A HREF="${p}">Main menu</A></CENTER><BR>
-<FONT SIZE=+1>Service #$svcnum</FONT>
-END
+print $cgi->header( '-expires' => 'now' ), header('Account View', menubar(
+  ( ( $pkgnum || $custnum )
+    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
+        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+      )
+    : ( "Cancel this (unaudited) account" =>
+          "${p}misc/cancel-unaudited.cgi?$svcnum" )
+  ),
+  "Main menu" => $p,
+));
 
-print qq!<BR><A HREF="${p}edit/svc_acct.cgi?$svcnum">Edit this information</A>!;
 #print qq!<BR><A HREF="../misc/sendconfig.cgi?$svcnum">Send account information</A>!;
-print qq!<BR><BR><A HREF="#general">General</A> | <A HREF="#shell">Shell account</A> | !;
-print qq!<A HREF="#slip">SLIP/PPP account</A></CENTER>!;
-
-#formatting
-print qq!<HR><CENTER><FONT SIZE=+1><A NAME="general">General</A></FONT></CENTER>!;
-
-#svc
-print "Service: <B>", $part_svc->svc, "</B>";
 
-#username
-print "<BR>Username: <B>", $svc_acct->username, "</B>";
-
-#password
+print qq!<A HREF="${p}edit/svc_acct.cgi?$svcnum">Edit this information</A>!,
+      "<BR>Service #$svcnum",
+      "<BR>Service: <B>", $part_svc->svc, "</B>",
+      "<BR><BR>Username: <B>", $svc_acct->username, "</B>"
+;
 if (substr($svc_acct->_password,0,1) eq "*") {
-  print "<BR>Password: <I>(Login disabled)</I><BR>";
+  print "<BR>Password: <I>(Login disabled)</I>";
 } else {
-  print "<BR>Password: <I>(hidden)</I><BR>";
+  print "<BR>Password: <I>(hidden)</I>";
 }
 
-# popnum -> svc_acct_pop record
 $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
-
-#pop
-print "POP: <B>", $svc_acct_pop->city, ", ", $svc_acct_pop->state,
+print "<BR>POP: <B>", $svc_acct_pop->city, ", ", $svc_acct_pop->state,
       " (", $svc_acct_pop->ac, ")/", $svc_acct_pop->exch, "<\B>"
   if $svc_acct_pop;
 
-#shell account
-print qq!<HR><CENTER><FONT SIZE=+1><A NAME="shell">!;
 if ($svc_acct->uid ne '') {
-  print "Shell account";
-  print "</A></FONT></CENTER>";
-  print "Uid: <B>", $svc_acct->uid, "</B>";
-  print "<BR>Gid: <B>", $svc_acct->gid, "</B>";
-
-  print qq!<BR>Finger name: <B>!, $svc_acct->finger, qq!</B><BR>!;
-
-  print "Home directory: <B>", $svc_acct->dir, "</B><BR>";
-
-  print "Shell: <B>", $svc_acct->shell, "</B><BR>";
-
-  print "Quota: <B>", $svc_acct->quota, "</B> <I>(unimplemented)</I>";
+  print "<BR><BR>Uid: <B>", $svc_acct->uid, "</B>",
+        "<BR>Gid: <B>", $svc_acct->gid, "</B>",
+        "<BR>Finger name: <B>", $svc_acct->finger, "</B>",
+        "<BR>Home directory: <B>", $svc_acct->dir, "</B>",
+        "<BR>Shell: <B>", $svc_acct->shell, "</B>",
+        "<BR>Quota: <B>", $svc_acct->quota, "</B> <I>(unimplemented)</I>"
+  ;
 } else {
-  print "No shell account.</A></FONT></CENTER>";
+  print "<BR><BR>(No shell account)";
 }
 
-# SLIP/PPP
-print qq!<HR><CENTER><FONT SIZE=+1><A NAME="slip">!;
 if ($svc_acct->slipip) {
-  print "SLIP/PPP account</A></FONT></CENTER>";
-  print "IP address: <B>", ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' ) ? "<I>(Dynamic)</I>" : $svc_acct->slipip ,"</B>";
+  print "<BR><BR>IP address: <B>", ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' ) ? "<I>(Dynamic)</I>" : $svc_acct->slipip ,"</B>";
   my($attribute);
   foreach $attribute ( grep /^radius_/, fields('svc_acct') ) {
     #warn $attribute;
@@ -176,15 +153,8 @@ if ($svc_acct->slipip) {
     print "<BR>Radius $pattribute: <B>". $svc_acct->getfield($attribute), "</B>";
   }
 } else {
-  print "No SLIP/PPP account</A></FONT></CENTER>"
+  print "<BR><BR>(No SLIP/PPP account)";
 }
 
-print "<HR>";
-
-	#formatting
-	print <<END;
-
-  </BODY>
-</HTML>
-END
+print "</BODY></HTML>";
 
diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi
index 89ca6be6b..51fbc0351 100755
--- a/htdocs/view/svc_acct_sm.cgi
+++ b/htdocs/view/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.9 1999-02-28 00:04:03 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.10 1999-04-08 12:00:19 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi svcnum
 #        http://server.name/path/svc_acct_sm.cgi?svcnum
@@ -20,7 +20,10 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.9  1999-02-28 00:04:03  ivan
+# Revision 1.10  1999-04-08 12:00:19  ivan
+# aesthetic update
+#
+# Revision 1.9  1999/02/28 00:04:03  ivan
 # removed misleading comments
 #
 # Revision 1.8  1999/02/09 09:23:00  ivan
@@ -53,7 +56,7 @@ use vars qw($conf $cgi $mydomain $query $svcnum $svc_acct_sm $cust_svc
             $svc $svc_domain $domain $svc_acct $username );
 use CGI;
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl);
+use FS::CGI qw(header popurl menubar );
 use FS::Record qw(qsearchs);
 use FS::Conf;
 use FS::svc_acct_sm;
@@ -69,7 +72,6 @@ cgisuidsetup($cgi);
 $conf = new FS::Conf;
 $mydomain = $conf->config('domain');
 
-#untaint svcnum
 ($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
 $svcnum = $1;
@@ -89,25 +91,17 @@ if ($pkgnum) {
 $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unkonwn svcpart" unless $part_svc;
 
-print $cgi->header( '-expires' => 'now' ), header('Mail Alias View');
-
 $p = popurl(2);
-if ($pkgnum || $custnum) {
-  print <<END;
-<A HREF="${p}view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> | 
-<A HREF="${p}view/cust_main.cgi?$custnum">View this customer (#$custnum)</A> | 
-END
-} else {
-  print <<END;
-<A HREF="${p}misc/cancel-unaudited.cgi?$svcnum">Cancel this (unaudited)account</A> |
-END
-}
-
-print <<END;
-    <A HREF="${p}">Main menu</A></CENTER><BR>
-    Service #$svcnum
-    <P><A HREF="${p}edit/svc_acct_sm.cgi?$svcnum">Edit this information</A>
-END
+print $cgi->header( '-expires' => 'now' ), header('Mail Alias View', menubar(
+  ( ( $pkgnum || $custnum )
+    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
+        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+      )
+    : ( "Cancel this (unaudited) account" =>
+          "${p}misc/cancel-unaudited.cgi?$svcnum" )
+  ),
+  "Main menu" => $p,
+));
 
 ($domsvc,$domuid,$domuser) = (
   $svc_acct_sm->domsvc,
@@ -120,20 +114,10 @@ $domain = $svc_domain->domain;
 $svc_acct = qsearchs('svc_acct',{'uid'=>$domuid});
 $username = $svc_acct->username;
 
-#formatting
-print qq!<BR><BR>!;
-
-#svc
-print "Service: <B>$svc</B>";
-
-print "<BR><BR>";
-
-print qq!Mail to <B>!, ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ) , qq!</B>\@<B>$domain</B> forwards to <B>$username</B>\@$mydomain mailbox.!;
-
-	#formatting
-	print <<END;
-
-  </BODY>
-</HTML>
-END
+print qq!<A HREF="${p}edit/svc_acct_sm.cgi?$svcnum">Edit this information</A>!,
+      "<BR>Service #$svcnum",
+      "<BR>Service: <B>$svc</B>",
+      qq!<BR>Mail to <B>!, ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ) , qq!</B>\@<B>$domain</B> forwards to <B>$username</B>\@$mydomain mailbox.!,
+      '</BODY></HTML>'
+;
 
diff --git a/htdocs/view/svc_domain.cgi b/htdocs/view/svc_domain.cgi
index 84fa9db0b..90526973d 100755
--- a/htdocs/view/svc_domain.cgi
+++ b/htdocs/view/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.8 1999-02-28 00:04:04 ivan Exp $
+# $Id: svc_domain.cgi,v 1.9 1999-04-08 12:00:19 ivan Exp $
 #
 # Usage: svc_domain svcnum
 #        http://server.name/path/svc_domain.cgi?svcnum
@@ -13,7 +13,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.8  1999-02-28 00:04:04  ivan
+# Revision 1.9  1999-04-08 12:00:19  ivan
+# aesthetic update
+#
+# Revision 1.8  1999/02/28 00:04:04  ivan
 # removed misleading comments
 #
 # Revision 1.7  1999/02/23 08:09:25  ivan
@@ -43,7 +46,7 @@ use vars qw( $cgi $query $svcnum $svc_domain $domain $cust_svc $pkgnum
              $cust_pkg $custnum $part_svc $p );
 use CGI;
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header menubar popurl);
+use FS::CGI qw(header menubar popurl menubar);
 use FS::Record qw(qsearchs);
 use FS::svc_domain;
 use FS::cust_svc;
@@ -53,47 +56,41 @@ use FS::part_svc;
 $cgi = new CGI;
 cgisuidsetup($cgi);
 
-#untaint svcnum
 ($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
 $svcnum = $1;
 $svc_domain = qsearchs('svc_domain',{'svcnum'=>$svcnum});
 die "Unknown svcnum" unless $svc_domain;
-$domain = $svc_domain->domain;
 
 $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
 $pkgnum = $cust_svc->getfield('pkgnum');
 if ($pkgnum) {
   $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
   $custnum=$cust_pkg->getfield('custnum');
+} else {
+  $cust_pkg = '';
+  $custnum = '';
 }
 
 $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unkonwn svcpart" unless $part_svc;
 
+$domain = $svc_domain->domain;
+
 $p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header('Domain View', menubar(
+  ( ( $pkgnum || $custnum )
+    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
+        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+      )
+    : ( "Cancel this (unaudited) account" =>
+          "${p}misc/cancel-unaudited.cgi?$svcnum" )
+  ),
   "Main menu" => $p,
-  "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-  "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-)), <<END;
-    <BR><FONT SIZE=+1>Service #$svcnum</FONT>
-    </CENTER>
-END
-
-print "<HR>";
-print "Service: <B>", $part_svc->svc, "</B>";
-print "<HR>";
-
-print qq!Domain name <B>$domain</B>.!;
-print qq!<P><A HREF="http://rs.internic.net/cgi-bin/whois?do+$domain">View whois information.</A>!;
-
-print "<HR>";
-
-	#formatting
-	print <<END;
-
-  </BODY>
-</HTML>
-END
-
+)),
+      "Service #$svcnum",
+      "<BR>Service: <B>", $part_svc->svc, "</B>",
+      "<BR>Domain name: <B>$domain</B>.",
+      qq!<BR><BR><A HREF="http://rs.internic.net/cgi-bin/whois?do+$domain">View whois information.</A>!,
+      '</BODY></HTML>',
+;
-- 
cgit v1.2.1


From 78920f21696cd2c75d655d5bdfbbed3b5dd50d57 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 1999 12:08:59 +0000
Subject: fix up PostgreSQL money fields so you can actually use them as
 numbers.  bah.

---
 site_perl/Record.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/site_perl/Record.pm b/site_perl/Record.pm
index 4634026b8..730b1f969 100644
--- a/site_perl/Record.pm
+++ b/site_perl/Record.pm
@@ -122,11 +122,12 @@ sub new {
 
   foreach my $field ( $self->fields ) { 
     $hashref->{$field}='' unless defined $hashref->{$field};
-    #trim the '$' from money fields for Pg (belong HERE?)
+    #trim the '$' and ',' from money fields for Pg (belong HERE?)
     #(what about Pg i18n?)
     if ( datasrc =~ m/Pg/ 
          && $self->dbdef_table->column($field)->type eq 'money' ) {
       ${$hashref}{$field} =~ s/^\$//;
+      ${$hashref}{$field} =~ s/\,//;
     }
   }
 
@@ -822,7 +823,7 @@ sub hfields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.14 1999-04-07 14:58:31 ivan Exp $
+$Id: Record.pm,v 1.15 1999-04-08 12:08:59 ivan Exp $
 
 =head1 BUGS
 
@@ -944,7 +945,10 @@ added pod documentation ivan@sisd.com 98-sep-6
 ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
 $Log: Record.pm,v $
-Revision 1.14  1999-04-07 14:58:31  ivan
+Revision 1.15  1999-04-08 12:08:59  ivan
+fix up PostgreSQL money fields so you can actually use them as numbers.  bah.
+
+Revision 1.14  1999/04/07 14:58:31  ivan
 more kludges to get around different null/empty handling in Perl vs. MySQL vs.
 PostgreSQL etc.
 
-- 
cgit v1.2.1


From 2841512efcbde72742665f2556882936eb4fbdaf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 1999 13:01:50 +0000
Subject:  [ AND DOCUMENT! ] all svc_acct services should have a default  or
 fixed shell

---
 htdocs/edit/part_svc.cgi | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/edit/part_svc.cgi b/htdocs/edit/part_svc.cgi
index 95e1c8755..57811a0b6 100755
--- a/htdocs/edit/part_svc.cgi
+++ b/htdocs/edit/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.9 1999-02-23 08:09:21 ivan Exp $
+# $Id: part_svc.cgi,v 1.10 1999-04-08 13:01:50 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,11 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.9  1999-02-23 08:09:21  ivan
+# Revision 1.10  1999-04-08 13:01:50  ivan
+#  [ AND DOCUMENT! ] all svc_acct services should have a default
+#  or fixed shell
+#
+# Revision 1.9  1999/02/23 08:09:21  ivan
 # beginnings of one-screen new customer entry and some other miscellania
 #
 # Revision 1.8  1999/02/07 09:59:21  ivan
@@ -120,7 +124,7 @@ END
     'quota'     => '(unimplemented)',
     '_password' => 'Password',
     'gid'       => 'GID (when blank, defaults to UID)',
-    'shell'     => 'Shell',
+    'shell'     => 'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file)',
     'finger'    => 'GECOS',
   },
   'svc_domain' => {
-- 
cgit v1.2.1


From f54abd440ef3d4d480eba185df1c5e65b0affd4c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 1999 13:03:02 +0000
Subject: *** empty log message ***

---
 TODO | 53 +++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/TODO b/TODO
index 611f83ec5..7b1a5143d 100644
--- a/TODO
+++ b/TODO
@@ -1,41 +1,34 @@
-$Id: TODO,v 1.25 1999-02-23 08:09:18 ivan Exp $
+$Id: TODO,v 1.26 1999-04-08 13:03:02 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
 duplication of effort.
 
--- before 1.2b1 --
+---
 
-TEST email invoices
+javascript (yuck!) "are you sure?" confirmation on cancelations, etc.
+(view/cust_pkg and view/svc_*)
 
-one-screen new customer entry
+get rid of time2str("%D") which formats dates in a non-y2k-safe looking fashion
+(all the actual date handling uses UNIX timestamps and is fine)
 
-clean up view/cust_pkg and view/svc_* yuck (popurl and visual)!
+uncomment expire in view/cust_pkg.cgi and find the expire cron from fsold
 
-Lay out the forms a bit better.
-
-libwww regression test - since it will create sample data, can also use this
-for the web demo
-make fs-setup option to add sample data so you can click on "New Customer" right away?  so people understand what this stuff is?
-(in sample data [ AND DOCUMENT! ] all svc_acct services should have a default
- or fixed shell )
-
-(Test this)
-one-time/per-customer/? changes in rates and descriptions ('remembered
-invoices'): implement by creating a new package on the fly... but it isn't 
-associated with any agent types so it won't show up for other customers to buy.
-(but also... make sure they go away when the customer does! - need this? :
- one-off package edits! : need a cust_pkgs or cust_part_pkgs or something table,
- with custnum and partpkg (like type_pkgs)
-(what happens if you hit "custom pricing" but the pricing is already custom?)
-
-update site_perl/table_template* (pry out of date)
+Lay out any remaining ugly forms better.
 
 remove "records identical" warning?  gets in the way of more important stuff.
+or fix logic which tries to update identical records??
+1.2 should be quiet enough that the error log is useful, hopefully.
 
-update web demo
+Postgres has a maximum column length of 31 characters (but see NAMEDATALEN in
+postgres_ext.h).  part_svc has columns like: svc_acct__radius_Attribute_flag
+(22 characters!)  It seems that stuff over the limit is silently ignored,
+so we get 4 characters back.  So, Radius_Attributes are max 13 characters with
+stock Postgres.  see rfc2138 for what's affected
+What's a good fix?  (besides recompiling postgres with NAMEDATALEN 64)
+(mysql has a 64 character max column length.  others?)
 
--- release 1.2b1 ---
+look at DBIx::Recordset!  (and Tie::DBI, and...)
 
 password and slipip stuff in svc_acct.pm store need to be split into two fields or something, so the silliness in svc_acct.pm and svc_acct.export with looking at the data to decide what to do with it can be fixed
 
@@ -72,7 +65,15 @@ Portability: in FS::Record, $sth->execute does not return a number of rows for a
 
 subroutine the where clause (eventually all SQL) as OO perhaps (has anyone done this?)
 
-add a select method to ?
+add a select method to FS::Record?
+
+one-time/per-customer/? changes in rates and descriptions ('remembered
+invoices'): implement by creating a new package on the fly... but it isn't 
+associated with any agent types so it won't show up for other customers to buy.
+(but also... make sure they go away when the customer does! - need this? :
+ one-off package edits! : need a cust_pkgs or cust_part_pkgs or something table,
+ with custnum and partpkg (like type_pkgs)
+(what happens if you hit "custom pricing" but the pricing is already custom?)
 
 You can't delete the stuff under administration yet.  Add this,
 _including_ making sure the thing you are deleting is not in use!
-- 
cgit v1.2.1


From fb0b6751596d6e31c3b42b8d24f5e1045402651e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 1999 13:05:40 +0000
Subject: web interface tester / sample data creator

---
 test/cgi-test | 561 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 561 insertions(+)
 create mode 100755 test/cgi-test

diff --git a/test/cgi-test b/test/cgi-test
new file mode 100755
index 000000000..e88bfd750
--- /dev/null
+++ b/test/cgi-test
@@ -0,0 +1,561 @@
+#!/usr/bin/perl -Tw
+#
+# $Id: cgi-test,v 1.1 1999-04-08 13:05:40 ivan Exp $
+#
+# This is the beginning of a test suite for the web interface.
+# It's also excellent for populating your database with some meaningful test
+# data.  (a derivative is used by the web demo)
+# It only works on an empty database (probably need empty counters too, and
+# no arbirary RADIUS attributes).
+# Usage: cgi-test http://base.freeside.url/with/path/ username password
+# (Yes, if you were properly paranoid and are using SSL, you'll need to get
+#  libwww-perl working with SSL to use this.)
+#
+# $Log: cgi-test,v $
+# Revision 1.1  1999-04-08 13:05:40  ivan
+# web interface tester / sample data creator
+#
+
+use strict;
+#use diagnostics;
+use subs qw( big_ugly_data_structure );
+use CGI;
+use LWP::UserAgent;
+
+my ( $base_url, $username, $password ) = ( shift, shift, shift );
+
+my @data = &big_ugly_data_structure;
+
+my $ua = new LWP::UserAgent;
+{
+  local $^W = 0;
+  eval '
+    sub LWP::UserAgent::get_basic_credentials {
+      #my $self = shift;
+      ( $username, $password );
+    }
+  ';
+}
+
+my $data;
+while ( $data = shift @data ) {
+  my $cgi = new CGI ( $data->{'params'} );
+  my $full_url = $base_url. $data->{'url'}. '?'. $cgi->query_string;
+  #my $request = new HTTP::Request( 'POST', $full_url );
+  my $request = new HTTP::Request( 'GET', $full_url );
+  my $response = $ua->request( $request );
+  if ( $response->is_redirect ) {
+    die "Unexpected redirect!\n".
+           "URL: $full_url\n".
+           "To: ". $response->base. "\n"
+    ;
+  } elsif ( $response->is_success ) {
+    my $location = $response->base;
+    my $expected_location = $data->{'location'};
+    #if ( $location =~ /^$base_url$expected_location$/ ) {
+    if ( $location eq $base_url. $expected_location ) {
+      #warn "cool, got expected response $location from $full_url\n";
+    } else {
+      die "Strange, regular response, but unexpected base!\n".
+        "URL: $full_url\n".
+        "Base    : ". $response->base. "\n".
+        "Expected: $base_url$expected_location\n".
+        "Output: ". $response->content. "\n"
+      ;
+    }
+  } elsif ( $response->is_error ) {
+    die "Strange, I got an error\n".
+        "URL: $full_url\n".
+        "Error: ". $response->error_as_HTML. "\n".
+        "Output: ". $response->content. "\n"
+    ;
+  } elsif ( $response->is_info ) {
+    die "Strange, I got an info reponse\n".
+        "URL: $full_url\n".
+        "Output: ". $response->content. "\n"
+    ;
+  } else {
+    die "Really strange, got an unrecognized response from LWP::UserAgent!\n";
+  }
+}
+
+#---
+
+sub big_ugly_data_structure {
+
+  (
+    { 'url'      => 'edit/process/part_svc.cgi',
+      'params'   => {
+                      'svcpart' => '',
+                      'svc'     => 'Shell',
+                      'svcdb'   => 'svc_acct',
+                      'svc_acct__popnum_flag' => '',
+                      'svc_acct__popnum' => '',
+                      'svc_acct__dir_flag' => '',
+                      'svc_acct__dir' => '',
+                      'svc_acct__username_flag' => '',
+                      'svc_acct__username' => '',
+                      'svc_acct__uid_flag' => '',
+                      'svc_acct__uid' => '',
+                      'svc_acct__quota_flag' => 'F',
+                      'svc_acct__quota' => '10',
+                      'svc_acct__slipip_flag' => 'F',
+                      'svc_acct__slipip' => '',
+                      'svc_acct___password_flag' => '',
+                      'svc_acct___password' => '',
+                      'svc_acct__gid_flag' => '',
+                      'svc_acct__gid' => '',
+                      'svc_acct__shell_flag' => 'D',
+                      'svc_acct__shell' => '/bin/sh',
+                      'svc_acct__finger_flag' => '',
+                      'svc_acct__finger' => '',
+                      'svc_domain__domain_flag' => '',
+                      'svc_domain__domain' => '',
+                      'svc_acct_sm__domuser_flag' => '',
+                      'svc_acct_sm__domuser' => '',
+                      'svc_acct_sm__domuid_flag' => '',
+                      'svc_acct_sm__domuid' => '',
+                      'svc_acct_sm__domsvc_flag' => '',
+                      'svc_acct_sm__domsvc' => '',
+                    },
+      'location' => 'browse/part_svc.cgi',
+    },
+    { 'url'      => 'edit/process/part_svc.cgi',
+      'params'   => {
+                      'svcpart' => '',
+                      'svc'     => 'SLIP/PPP',
+                      'svcdb'   => 'svc_acct',
+                      'svc_acct__popnum_flag' => '',
+                      'svc_acct__popnum' => '',
+                      'svc_acct__dir_flag' => '',
+                      'svc_acct__dir' => '',
+                      'svc_acct__username_flag' => '',
+                      'svc_acct__username' => '',
+                      'svc_acct__uid_flag' => '',
+                      'svc_acct__uid' => '',
+                      'svc_acct__quota_flag' => 'F',
+                      'svc_acct__quota' => '10',
+                      'svc_acct__slipip_flag' => 'D',
+                      'svc_acct__slipip' => '0.0.0.0',
+                      'svc_acct___password_flag' => '',
+                      'svc_acct___password' => '',
+                      'svc_acct__gid_flag' => '',
+                      'svc_acct__gid' => '',
+                      'svc_acct__shell_flag' => 'D',
+                      'svc_acct__shell' => '/bin/sh',
+                      'svc_acct__finger_flag' => '',
+                      'svc_acct__finger' => '',
+                      'svc_domain__domain_flag' => '',
+                      'svc_domain__domain' => '',
+                      'svc_acct_sm__domuser_flag' => '',
+                      'svc_acct_sm__domuser' => '',
+                      'svc_acct_sm__domuid_flag' => '',
+                      'svc_acct_sm__domuid' => '',
+                      'svc_acct_sm__domsvc_flag' => '',
+                      'svc_acct_sm__domsvc' => '',
+                    },
+      'location' => 'browse/part_svc.cgi',
+    },
+    { 'url'      => 'edit/process/part_svc.cgi',
+      'params'   => {
+                      'svcpart' => '',
+                      'svc'     => 'POP Mailbox',
+                      'svcdb'   => 'svc_acct',,
+                      'svc_acct__popnum_flag' => 'F',
+                      'svc_acct__popnum' => '',
+                      'svc_acct__dir_flag' => '',
+                      'svc_acct__dir' => '',
+                      'svc_acct__username_flag' => '',
+                      'svc_acct__username' => '',
+                      'svc_acct__uid_flag' => '',
+                      'svc_acct__uid' => '',
+                      'svc_acct__quota_flag' => 'F',
+                      'svc_acct__quota' => '10',
+                      'svc_acct__slipip_flag' => 'F',
+                      'svc_acct__slipip' => '',
+                      'svc_acct___password_flag' => '',
+                      'svc_acct___password' => '',
+                      'svc_acct__gid_flag' => '',
+                      'svc_acct__gid' => '',
+                      'svc_acct__shell_flag' => 'F',
+                      'svc_acct__shell' => '/bin/passwd',
+                      'svc_acct__finger_flag' => '',
+                      'svc_acct__finger' => '',
+                      'svc_domain__domain_flag' => '',
+                      'svc_domain__domain' => '',
+                      'svc_acct_sm__domuser_flag' => '',
+                      'svc_acct_sm__domuser' => '',
+                      'svc_acct_sm__domuid_flag' => '',
+                      'svc_acct_sm__domuid' => '',
+                      'svc_acct_sm__domsvc_flag' => '',
+                      'svc_acct_sm__domsvc' => '',
+                    },
+      'location' => 'browse/part_svc.cgi',
+    },
+    { 'url'      => 'edit/process/part_svc.cgi',
+      'params'   => {
+                      'svcpart' => '',
+                      'svc'     => 'Domain',
+                      'svcdb'   => 'svc_domain',,
+                      'svc_acct__popnum_flag' => '',
+                      'svc_acct__popnum' => '',
+                      'svc_acct__dir_flag' => '',
+                      'svc_acct__dir' => '',
+                      'svc_acct__username_flag' => '',
+                      'svc_acct__username' => '',
+                      'svc_acct__uid_flag' => '',
+                      'svc_acct__uid' => '',
+                      'svc_acct__quota_flag' => '',
+                      'svc_acct__quota' => '',
+                      'svc_acct__slipip_flag' => '',
+                      'svc_acct__slipip' => '',
+                      'svc_acct___password_flag' => '',
+                      'svc_acct___password' => '',
+                      'svc_acct__gid_flag' => '',
+                      'svc_acct__gid' => '',
+                      'svc_acct__shell_flag' => '',
+                      'svc_acct__shell' => '',
+                      'svc_acct__finger_flag' => '',
+                      'svc_acct__finger' => '',
+                      'svc_domain__domain_flag' => '',
+                      'svc_domain__domain' => '',
+                      'svc_acct_sm__domuser_flag' => '',
+                      'svc_acct_sm__domuser' => '',
+                      'svc_acct_sm__domuid_flag' => '',
+                      'svc_acct_sm__domuid' => '',
+                      'svc_acct_sm__domsvc_flag' => '',
+                      'svc_acct_sm__domsvc' => '',
+                    },
+      'location' => 'browse/part_svc.cgi',
+    },
+    { 'url'      => 'edit/process/part_svc.cgi',
+      'params'   => {
+                      'svcpart' => '',
+                      'svc'     => 'Domain email alias',
+                      'svcdb'   => 'svc_acct_sm',,
+                      'svc_acct__popnum_flag' => '',
+                      'svc_acct__popnum' => '',
+                      'svc_acct__dir_flag' => '',
+                      'svc_acct__dir' => '',
+                      'svc_acct__username_flag' => '',
+                      'svc_acct__username' => '',
+                      'svc_acct__uid_flag' => '',
+                      'svc_acct__uid' => '',
+                      'svc_acct__quota_flag' => '',
+                      'svc_acct__quota' => '',
+                      'svc_acct__slipip_flag' => '',
+                      'svc_acct__slipip' => '',
+                      'svc_acct___password_flag' => '',
+                      'svc_acct___password' => '',
+                      'svc_acct__gid_flag' => '',
+                      'svc_acct__gid' => '',
+                      'svc_acct__shell_flag' => '',
+                      'svc_acct__shell' => '',
+                      'svc_acct__finger_flag' => '',
+                      'svc_acct__finger' => '',
+                      'svc_domain__domain_flag' => '',
+                      'svc_domain__domain' => '',
+                      'svc_acct_sm__domuser_flag' => '',
+                      'svc_acct_sm__domuser' => '',
+                      'svc_acct_sm__domuid_flag' => '',
+                      'svc_acct_sm__domuid' => '',
+                      'svc_acct_sm__domsvc_flag' => '',
+                      'svc_acct_sm__domsvc' => '',
+                    },
+      'location' => 'browse/part_svc.cgi',
+    },
+
+    { 'url'      => 'edit/process/part_pkg.cgi',
+      'params'   => {
+                      'pkgpart' => '',
+                      'pkg' => 'Personal SLIP/PPP',
+                      'comment' => '$30/setup, $19.99/month',
+                      'setup' => '30',
+                      'recur' => '19.99',
+                      'freq' => '1',
+                      'pkg_svc1' => '0',
+                      'pkg_svc2' => '1',
+                      'pkg_svc3' => '0',
+                      'pkg_svc4' => '0',
+                      'pkg_svc5' => '0',
+                    },
+      'location' => 'browse/part_pkg.cgi',
+    },
+    { 'url'      => 'edit/process/part_pkg.cgi',
+      'params'   => {
+                      'pkgpart' => '',
+                      'pkg' => 'Personal SLIP/PPP',
+                      'comment' => '$0/setup, $179.88/year',
+                      'setup' => '0',
+                      'recur' => '179.88',
+                      'freq' => '12',
+                      'pkg_svc1' => '0',
+                      'pkg_svc2' => '1',
+                      'pkg_svc3' => '0',
+                      'pkg_svc4' => '0',
+                      'pkg_svc5' => '0',
+                    },
+      'location' => 'browse/part_pkg.cgi',
+    },
+    { 'url'      => 'edit/process/part_pkg.cgi',
+      'params'   => {
+                      'pkgpart' => '',
+                      'pkg' => 'Personal POP mailbox',
+                      'comment' => '$10/setup, $5/month',
+                      'setup' => '10',
+                      'recur' => '5',
+                      'freq' => '1',
+                      'pkg_svc1' => '0',
+                      'pkg_svc2' => '0',
+                      'pkg_svc3' => '1',
+                      'pkg_svc4' => '0',
+                      'pkg_svc5' => '0',
+                    },
+      'location' => 'browse/part_pkg.cgi',
+    },
+    { 'url'      => 'edit/process/part_pkg.cgi',
+      'params'   => {
+                      'pkgpart' => '',
+                      'pkg' => 'Business SLIP/PPP',
+                      'comment' => '$30/setup, $29.99/month',
+                      'setup' => '30',
+                      'recur' => '29.99',
+                      'freq' => '1',
+                      'pkg_svc1' => '0',
+                      'pkg_svc2' => '1',
+                      'pkg_svc3' => '0',
+                      'pkg_svc4' => '1',
+                      'pkg_svc5' => '1',
+                    },
+      'location' => 'browse/part_pkg.cgi',
+    },
+    { 'url'      => 'edit/process/part_pkg.cgi',
+      'params'   => {
+                      'pkgpart' => '',
+                      'pkg' => 'Business SLIP/PPP',
+                      'comment' => '$0/setup, $299.88/year',
+                      'setup' => '0',
+                      'recur' => '299.88',
+                      'freq' => '12',
+                      'pkg_svc1' => '0',
+                      'pkg_svc2' => '1',
+                      'pkg_svc3' => '0',
+                      'pkg_svc4' => '1',
+                      'pkg_svc5' => '1',
+                    },
+      'location' => 'browse/part_pkg.cgi',
+    },
+    { 'url'      => 'edit/process/part_pkg.cgi',
+      'params'   => {
+                      'pkgpart' => '',
+                      'pkg' => 'Business POP mailbox',
+                      'comment' => '$10/setup, $5/month',
+                      'setup' => '10',
+                      'recur' => '5',
+                      'freq' => '1',
+                      'pkg_svc1' => '0',
+                      'pkg_svc2' => '0',
+                      'pkg_svc3' => '1',
+                      'pkg_svc4' => '0',
+                      'pkg_svc5' => '1',
+                    },
+      'location' => 'browse/part_pkg.cgi',
+    },
+    { 'url'      => 'edit/process/part_pkg.cgi',
+      'params'   => {
+                      'pkgpart' => '',
+                      'pkg' => 'UNIX shell',
+                      'comment' => '$20/setup, $9.99/month',
+                      'setup' => '20',
+                      'recur' => '9.99',
+                      'freq' => '1',
+                      'pkg_svc1' => '1',
+                      'pkg_svc2' => '0',
+                      'pkg_svc3' => '0',
+                      'pkg_svc4' => '0',
+                      'pkg_svc5' => '0',
+                    },
+      'location' => 'browse/part_pkg.cgi',
+    },
+    { 'url'      => 'edit/process/part_pkg.cgi',
+      'params'   => {
+                      'pkgpart' => '',
+                      'pkg' => 'Point-to-point T1',
+                      'comment' => '$1000/setup, $1000/month',
+                      'setup' => '1000',
+                      'recur' => '1000',
+                      'freq' => '1',
+                      'pkg_svc1' => '0',
+                      'pkg_svc2' => '0',
+                      'pkg_svc3' => '5',
+                      'pkg_svc4' => '1',
+                      'pkg_svc5' => '5',
+                    },
+      'location' => 'browse/part_pkg.cgi',
+    },
+    { 'url'      => 'edit/process/part_pkg.cgi',
+      'params'   => {
+                      'pkgpart' => '',
+                      'pkg' => 'Cisco 2501 Router',
+                      'comment' => '$2500',
+                      'setup' => '2500',
+                      'recur' => '0',
+                      'freq' => '0',
+                      'pkg_svc1' => '0',
+                      'pkg_svc2' => '0',
+                      'pkg_svc3' => '0',
+                      'pkg_svc4' => '0',
+                      'pkg_svc5' => '0',
+                    },
+      'location' => 'browse/part_pkg.cgi',
+    },
+
+    { 'url'      => 'edit/process/agent_type.cgi',
+      'params'   => {
+                      'typenum' => '',
+                      'atype' => 'Internal Sales',
+                      'pkgpart1' => 'ON',
+                      'pkgpart2' => 'ON',
+                      'pkgpart3' => 'ON',
+                      'pkgpart4' => 'ON',
+                      'pkgpart5' => 'ON',
+                      'pkgpart6' => 'ON',
+                      'pkgpart7' => 'ON',
+                      'pkgpart8' => 'ON',
+                      'pkgpart9' => 'ON',
+                    },
+      'location' => 'browse/agent_type.cgi',
+    },
+
+    { 'url'      => 'edit/process/agent.cgi',
+      'params'   => {
+                      'agentnum' => '',
+                      'agent' => 'Internal Sales',
+                      'typenum' => '1',
+                      'freq' => '',
+                      'prog' => '',
+                    },
+      'location' => 'browse/agent.cgi',
+    },
+
+    { 'url'      => 'edit/process/part_referral.cgi',
+      'params'   => {
+                      'refnum' => '',
+                      'referral' => 'Another customer',
+                    },
+      'location' => 'browse/part_referral.cgi',
+    },
+    { 'url'      => 'edit/process/part_referral.cgi',
+      'params'   => {
+                      'refnum' => '',
+                      'referral' => 'Newspaper ad',
+                    },
+      'location' => 'browse/part_referral.cgi',
+    },
+
+    { 'url'      => 'edit/process/svc_acct_pop.cgi',
+      'params'   => {
+                      'popnum' => '',
+                      'city' => 'Line Lexington',
+                      'state' => 'PA',
+                      'ac' => '215',
+                      'exch' => '996',
+                    },
+      'location' => 'browse/svc_acct_pop.cgi',
+    },
+    { 'url'      => 'edit/process/svc_acct_pop.cgi',
+      'params'   => {
+                      'popnum' => '',
+                      'city' => 'Oakland',
+                      'state' => 'CA',
+                      'ac' => '510',
+                      'exch' => '208',
+                    },
+      'location' => 'browse/svc_acct_pop.cgi',
+    },
+
+    { 'url'      => 'edit/process/cust_main.cgi',
+      'params'   => {
+                      'custnum' => '',
+                      'agentnum' => '1',
+                      'refnum' => '1',
+                      'last' => 'Hogan',
+                      'first' => 'Shawn D.',
+                      'ss' => '',
+                      'company' => 'Digital Point Solutions',
+                      'address1' => '3570 Tony Drive',
+                      'address2' => '',
+                      'city' => 'San Diego',
+                      'state' => 'CA / US',
+                      'zip' => '92122-2307',
+                      'daytime' => '',
+                      'night' => '',
+                      'fax' => '',
+                      'tax' => '',
+                      'invoicing_list_POST' => '',
+                      'invoicing_list' => '',
+                      'payby' => 'BILL',
+                      'CARD_payinfo' => '',
+                      'CARD_month' => '1',
+                      'CARD_year' => '1999',
+                      'CARD_payname' => '',
+                      'BILL_payinfo' => '',
+                      'BILL_month' => '12',
+                      'BILL_year' => '2037',
+                      'BILL_payname' => 'Accounts Payable',
+                      'COMP_payinfo' => '',
+                      'COMP_month' => '1',
+                      'COMP_year' => '1999',
+                      'pkgpart_svcpart' => '1_2',
+                      'username' => 'cyborg',
+                      '_password' => '',
+                      'popnum' => '1',
+                      'otaker' => 'example',
+                    },
+      'location' => 'view/cust_main.cgi?1',
+    },
+    { 'url'      => 'edit/process/cust_main.cgi',
+      'params'   => {
+                      'custnum' => '',
+                      'agentnum' => '1',
+                      'refnum' => '2',
+                      'last' => 'Ford',
+                      'first' => 'Bill',
+                      'ss' => '',
+                      'company' => 'Boardtown Corporation',
+                      'address1' => '116 East Main Street',
+                      'address2' => '',
+                      'city' => 'Starkville',
+                      'state' => 'MS / US',
+                      'zip' => '39759',
+                      'daytime' => '',
+                      'night' => '',
+                      'fax' => '',
+                      'tax' => '',
+                      'invoicing_list_POST' => '',
+                      'invoicing_list' => '',
+                      'payby' => 'BILL',
+                      'CARD_payinfo' => '',
+                      'CARD_month' => '1',
+                      'CARD_year' => '1999',
+                      'CARD_payname' => '',
+                      'BILL_payinfo' => '',
+                      'BILL_month' => '12',
+                      'BILL_year' => '2037',
+                      'BILL_payname' => 'Accounts Payable',
+                      'COMP_payinfo' => '',
+                      'COMP_month' => '1',
+                      'COMP_year' => '1999',
+                      'pkgpart_svcpart' => '3_3',
+                      'username' => 'billf',
+                      '_password' => '',
+                      'popnum' => '',
+                      'otaker' => 'example',
+                    },
+      'location' => 'view/cust_main.cgi?2',
+    },
+
+           
+  );
+}
+
-- 
cgit v1.2.1


From bd4d3c2418f4a221263a0b85fc6a34cb59ffdf50 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 1999 13:11:32 +0000
Subject: 1.2.0

---
 README | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README b/README
index e758447af..b22627727 100644
--- a/README
+++ b/README
@@ -1,6 +1,8 @@
-Freeside, 1.1.6
+Freeside, 1.2.0
 
-Copyright (C) 1998 Silicon Interactive Software Design.  All rights reserved.
+Copyright (C) 1999 Ivan Kohler
+Copyright (C) 1999 Silicon Interactive Software Design
+All rights reserved
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of either:
@@ -38,6 +40,5 @@ A mailing list for users and developers is available.  Send a blank message to
 Commercial support is available from Ivan Kohler <ivan@sisd.com>.  Please
 subscribe to the the mailing list to request free support!
 
-Ivan Kohler
-ivan@sisd.com
-
+Ivan Kohler <ivan@sisd.com>
+20 4,16 * * * saytime
-- 
cgit v1.2.1


From 1f03f5d6ad51f6800abe8d4d073814fc81050613 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 1999 13:22:46 +0000
Subject: *** empty log message ***

---
 CREDITS      | 8 ++++++--
 conf/address | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CREDITS b/CREDITS
index 996cb3b9b..9f52df88f 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,9 +1,12 @@
 Thanks to Matt Simerson <matt@michweb.net> of MichWeb Inc. for documentation
 and pre-release testing.  Without his help the documentation in 1.0.0
 release would have consisted of a single screenfull of text.
+(To clear up some misunderstanding, Matt did not write the current
+documentation.)
 
 Steve Cleff <cleff@yahoo.com> did the default background image in 1.0.x and
-is also the creator of Freeside's elusive mascot, Snakeman.
+is also the creator of Freeside's elusive mascot, Snakeman, who we hope will
+make an appearance in a later 1.2.x version.
 
 Jerry St. Pierre <jstpi@city.timmins.on.ca> did the "SISD" graphic used in
 1.0.x and most of 1.1.x.
@@ -14,7 +17,8 @@ logo for later 1.1.x versions and 1.2.x
 Brian McCane? <bmccane@maxbaud.net> contributed PostgreSQL support, HTML
 style enhancements and many, many bugfixes.
 
-Cerkit <cerkit@alfheim.net> contributed 
+Cerkit <cerkit@alfheim.net> contributed rsync support and desynced hosts.
+His changes will hopefully be included in a later 1.2.x version.
 
 CompleteHOST, Inc. (http://www.completehost.com) funded the development of the
 following Freeside features by contracting me for a custom billing system
diff --git a/conf/address b/conf/address
index b8b6610a7..62ec516ea 100644
--- a/conf/address
+++ b/conf/address
@@ -1,4 +1,4 @@
 Silicon Interactive Software Design
-119 Signal Hill Road
-Holland, PA  18966-2924
+15 Skyview Way
+Newtown, PA  18940
 
-- 
cgit v1.2.1


From 991f8f1fd45bb229c3d2d28abae7356d94534a03 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 1999 13:39:32 +0000
Subject: convert from pod for 1.2.0 release

---
 htdocs/docs/man/Conf.txt              | 11 ++--
 htdocs/docs/man/Record.txt            | 21 ++++++--
 htdocs/docs/man/UID.txt               | 13 +++--
 htdocs/docs/man/cust_bill.txt         | 13 +++--
 htdocs/docs/man/cust_main.txt         | 29 +++++++++--
 htdocs/docs/man/cust_main_invoice.txt | 98 +++++++++++++++++++++++++++++++++++
 htdocs/docs/man/cust_pay_batch.txt    | 96 ++++++++++++++++++++++++++++++++++
 htdocs/docs/man/cust_pkg.txt          | 35 +++++++++++--
 htdocs/docs/man/index.html            |  1 +
 htdocs/docs/man/svc_Common.txt        | 75 +++++++++++++++++++++++++++
 htdocs/docs/man/svc_acct.txt          | 12 +++--
 htdocs/docs/man/svc_acct_sm.txt       |  2 +-
 htdocs/docs/man/svc_domain.txt        | 12 +++--
 13 files changed, 378 insertions(+), 40 deletions(-)
 create mode 100644 htdocs/docs/man/cust_main_invoice.txt
 create mode 100644 htdocs/docs/man/cust_pay_batch.txt
 create mode 100644 htdocs/docs/man/svc_Common.txt

diff --git a/htdocs/docs/man/Conf.txt b/htdocs/docs/man/Conf.txt
index 816df7995..01b7cf5e6 100644
--- a/htdocs/docs/man/Conf.txt
+++ b/htdocs/docs/man/Conf.txt
@@ -47,8 +47,11 @@ HISTORY
     sub exists forgot to fetch $dir ivan@sisd.com 98-sep-27
 
     $Log: Conf.txt,v $
-    Revision 1.4  1999-02-09 09:37:48  ivan
-    regenerated perl api docs from embedded pod
- Revision 1.2 1998/11/13 04:08:44 ivan no
-    default default_dir (ironic)
+    Revision 1.5  1999-04-08 13:39:31  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.3 1999/03/29 01:29:33 ivan die
+    unless the configuration directory exists
+
+    Revision 1.2 1998/11/13 04:08:44 ivan no default default_dir
+    (ironic)
 
diff --git a/htdocs/docs/man/Record.txt b/htdocs/docs/man/Record.txt
index e1902fee8..1708e3c67 100644
--- a/htdocs/docs/man/Record.txt
+++ b/htdocs/docs/man/Record.txt
@@ -233,7 +233,7 @@ SUBROUTINES
             record's table set true.
 
 VERSION
-        $Id: Record.txt,v 1.4 1999-02-09 09:37:51 ivan Exp $
+        $Id: Record.txt,v 1.5 1999-04-08 13:39:31 ivan Exp $
 
 BUGS
         This module should probably be renamed, since much of the
@@ -360,10 +360,21 @@ HISTORY
         ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
         $Log: Record.txt,v $
-        Revision 1.4  1999-02-09 09:37:51  ivan
-        regenerated perl api docs from embedded pod
- Revision 1.12 1999/01/25 12:26:06 ivan
-        yet more mod_perl stuff
+        Revision 1.5  1999-04-08 13:39:31  ivan
+        convert from pod for 1.2.0 release
+ Revision 1.15 1999/04/08 12:08:59 ivan
+        fix up PostgreSQL money fields so you can actually use them
+        as numbers. bah.
+
+        Revision 1.14 1999/04/07 14:58:31 ivan more kludges to get
+        around different null/empty handling in Perl vs. MySQL vs.
+        PostgreSQL etc.
+
+        Revision 1.13 1999/03/29 11:55:43 ivan eliminate warnings in
+        ut_money
+
+        Revision 1.12 1999/01/25 12:26:06 ivan yet more mod_perl
+        stuff
 
         Revision 1.11 1999/01/18 09:22:38 ivan changes to track
         email addresses for email invoicing
diff --git a/htdocs/docs/man/UID.txt b/htdocs/docs/man/UID.txt
index 7c4b1abc5..efe3b6670 100644
--- a/htdocs/docs/man/UID.txt
+++ b/htdocs/docs/man/UID.txt
@@ -70,7 +70,7 @@ CALLBACKS
         $FS::UID::callback{'Package::Name'};
 
 VERSION
-    $Id: UID.txt,v 1.3 1999-02-09 09:37:52 ivan Exp $
+    $Id: UID.txt,v 1.4 1999-04-08 13:39:31 ivan Exp $
 
 BUGS
     Too many package-global variables.
@@ -114,10 +114,13 @@ HISTORY
     inlined suidsetup ivan@sisd.com 98-sep-12
 
     $Log: UID.txt,v $
-    Revision 1.3  1999-02-09 09:37:52  ivan
-    regenerated perl api docs from embedded pod
- Revision 1.7 1999/01/18 09:22:40 ivan changes
-    to track email addresses for email invoicing
+    Revision 1.4  1999-04-08 13:39:31  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.8 1999/02/23 07:23:23 ivan oops,
+    don't comment out &swapuid in &adminsuidsetup!
+
+    Revision 1.7 1999/01/18 09:22:40 ivan changes to track email
+    addresses for email invoicing
 
     Revision 1.6 1998/11/15 05:27:48 ivan bugfix for new
     configuration layout
diff --git a/htdocs/docs/man/cust_bill.txt b/htdocs/docs/man/cust_bill.txt
index 9780ca7c6..c11840117 100644
--- a/htdocs/docs/man/cust_bill.txt
+++ b/htdocs/docs/man/cust_bill.txt
@@ -106,7 +106,7 @@ METHODS
         Date::Parse manpage for conversion functions.
 
 VERSION
-    $Id: cust_bill.txt,v 1.3 1999-02-09 09:37:55 ivan Exp $
+    $Id: cust_bill.txt,v 1.4 1999-04-08 13:39:31 ivan Exp $
 
 BUGS
     The delete method.
@@ -134,10 +134,13 @@ HISTORY
     pod, ingegrate with FS::Invoice ivan@sisd.com 98-sep-20
 
     $Log: cust_bill.txt,v $
-    Revision 1.3  1999-02-09 09:37:55  ivan
-    regenerated perl api docs from embedded pod
- Revision 1.6 1999/01/25 12:26:07 ivan yet
-    more mod_perl stuff
+    Revision 1.4  1999-04-08 13:39:31  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.7 1999/02/09 09:55:05 ivan
+    invoices show line items for each service in a package (see the
+    label method of FS::cust_svc)
+
+    Revision 1.6 1999/01/25 12:26:07 ivan yet more mod_perl stuff
 
     Revision 1.5 1999/01/18 21:58:03 ivan esthetic: eq and ne were
     used in a few places instead of == and !=
diff --git a/htdocs/docs/man/cust_main.txt b/htdocs/docs/man/cust_main.txt
index 707cf956b..bef2b9d94 100644
--- a/htdocs/docs/man/cust_main.txt
+++ b/htdocs/docs/man/cust_main.txt
@@ -172,7 +172,7 @@ METHODS
         error, otherwise returns false.
 
 VERSION
-    $Id: cust_main.txt,v 1.3 1999-02-09 09:37:58 ivan Exp $
+    $Id: cust_main.txt,v 1.4 1999-04-08 13:39:32 ivan Exp $
 
 BUGS
     The delete method.
@@ -227,10 +227,29 @@ HISTORY
     FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
     $Log: cust_main.txt,v $
-    Revision 1.3  1999-02-09 09:37:58  ivan
-    regenerated perl api docs from embedded pod
- Revision 1.10 1999/01/25 12:26:09 ivan
-    yet more mod_perl stuff
+    Revision 1.4  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.16 1999/04/07 14:32:19 ivan
+    more &invoicing_list logic to skip searches when there is no
+    custnum
+
+    Revision 1.15 1999/04/07 13:41:54 ivan in &invoicing_list, don't
+    search if there's no custnum yet
+
+    Revision 1.14 1999/03/29 12:06:15 ivan buglet in email invoices
+    fixed
+
+    Revision 1.13 1999/02/28 20:09:03 ivan allow spaces in zip
+    codes, for (at least) canada. pointed out by Clayton Gray
+    <clgray@bcgroup.net>
+
+    Revision 1.12 1999/02/27 21:24:22 ivan parse paydate correctly
+    for cybercash
+
+    Revision 1.11 1999/02/23 08:09:27 ivan beginnings of one-screen
+    new customer entry and some other miscellania
+
+    Revision 1.10 1999/01/25 12:26:09 ivan yet more mod_perl stuff
 
     Revision 1.9 1999/01/18 09:22:41 ivan changes to track email
     addresses for email invoicing
diff --git a/htdocs/docs/man/cust_main_invoice.txt b/htdocs/docs/man/cust_main_invoice.txt
new file mode 100644
index 000000000..5d50a9f26
--- /dev/null
+++ b/htdocs/docs/man/cust_main_invoice.txt
@@ -0,0 +1,98 @@
+NAME
+    FS::cust_main_invoice - Object methods for cust_main_invoice
+    records
+
+SYNOPSIS
+      use FS::cust_main_invoice;
+
+      $record = new FS::cust_main_invoice \%hash;
+      $record = new FS::cust_main_invoice { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+      $email_address = $record->address;
+
+DESCRIPTION
+    An FS::cust_main_invoice object represents an invoice
+    destination. FS::cust_main_invoice inherits from FS::Record. The
+    following fields are currently supported:
+
+    destnum - primary key
+    custnum - customer (see the FS::cust_main manpage)
+    dest - Invoice destination: If numeric, a <a href="#svc_acct">svcnum</a>, if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)
+METHODS
+    new HASHREF
+        Creates a new invoice destination. To add the invoice
+        destination to the database, see the section on "insert".
+
+        Note that this stores the hash reference, not a distinct
+        copy of the hash it points to. You can ask the object for a
+        copy with the *hash* method.
+
+    insert
+        Adds this record to the database. If there is an error,
+        returns the error, otherwise returns false.
+
+    delete
+        Delete this record from the database.
+
+    replace OLD_RECORD
+        Replaces the OLD_RECORD with this one in the database. If
+        there is an error, returns the error, otherwise returns
+        false.
+
+    check
+        Checks all fields to make sure this is a valid invoice
+        destination. If there is an error, returns the error,
+        otherwise returns false. Called by the insert and repalce
+        methods.
+
+    checkdest
+        Checks the dest field only.
+
+    address
+        Returns the literal email address for this record (or
+        `POST').
+
+VERSION
+    $Id: cust_main_invoice.txt,v 1.1 1999-04-08 13:39:32 ivan Exp $
+
+BUGS
+SEE ALSO
+    the FS::Record manpage, the FS::cust_main manpage
+
+HISTORY
+    ivan@voicenet.com 97-jul-1
+
+    added hfields ivan@sisd.com 97-nov-13
+
+    $Log: cust_main_invoice.txt,v $
+    Revision 1.1  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.6 1999/01/25 12:26:10
+    ivan yet more mod_perl stuff
+
+    Revision 1.5 1999/01/18 21:58:05 ivan esthetic: eq and ne were
+    used in a few places instead of == and !=
+
+    Revision 1.4 1999/01/18 09:22:42 ivan changes to track email
+    addresses for email invoicing
+
+    Revision 1.3 1998/12/29 11:59:42 ivan mostly properly OO, some
+    work still to be done with svc_ stuff
+
+    Revision 1.2 1998/12/16 09:58:53 ivan library support for
+    editing email invoice destinations (not in sub collect yet)
+
+    Revision 1.1 1998/12/16 07:40:02 ivan new table
+
+    Revision 1.3 1998/11/15 04:33:00 ivan updates for newest versoin
+
+    Revision 1.2 1998/11/15 03:48:49 ivan update for current version
+
diff --git a/htdocs/docs/man/cust_pay_batch.txt b/htdocs/docs/man/cust_pay_batch.txt
new file mode 100644
index 000000000..2d6267843
--- /dev/null
+++ b/htdocs/docs/man/cust_pay_batch.txt
@@ -0,0 +1,96 @@
+NAME
+    FS::cust_pay_batch - Object methods for batch cards
+
+SYNOPSIS
+      use FS::cust_pay_batch;
+
+      $record = new FS::cust_pay_batch \%hash;
+      $record = new FS::cust_pay_batch { 'column' => 'value' };
+
+      $error = $record->insert;
+
+      $error = $new_record->replace($old_record);
+
+      $error = $record->delete;
+
+      $error = $record->check;
+
+DESCRIPTION
+    An FS::cust_pay_batch object represents a credit card
+    transaction ready to be batched (sent to a processor).
+    FS::cust_pay_batch inherits from FS::Record. Typically called by
+    the collect method of an FS::cust_main object. The following
+    fields are currently supported:
+
+    trancode - 77 for charges
+    cardnum
+    exp - card expiration
+    amount
+    invnum - invoice
+    custnum - customer
+    payname - name on card
+    first - name
+    last - name
+    address1
+    address2
+    city
+    state
+    zip
+    country
+METHODS
+    new HASHREF
+        Creates a new record. To add the record to the database, see
+        the section on "insert".
+
+        Note that this stores the hash reference, not a distinct
+        copy of the hash it points to. You can ask the object for a
+        copy with the *hash* method.
+
+    insert
+        Adds this record to the database. If there is an error,
+        returns the error, otherwise returns false.
+
+    delete
+        Delete this record from the database. If there is an error,
+        returns the error, otherwise returns false.
+
+    replace OLD_RECORD
+        #inactive # #Replaces the OLD_RECORD with this one in the
+        database. If there is an error, #returns the error,
+        otherwise returns false.
+
+    check
+        Checks all fields to make sure this is a valid transaction.
+        If there is an error, returns the error, otherwise returns
+        false. Called by the insert and repalce methods.
+
+VERSION
+    $Id: cust_pay_batch.txt,v 1.1 1999-04-08 13:39:32 ivan Exp $
+
+BUGS
+    There should probably be a configuration file with a list of
+    allowed credit card types.
+
+SEE ALSO
+    the FS::cust_main manpage, the FS::Record manpage
+
+HISTORY
+    ivan@voicenet.com 97-jul-1
+
+    added hfields ivan@sisd.com 97-nov-13
+
+    $Log: cust_pay_batch.txt,v $
+    Revision 1.1  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.3 1998/12/29 11:59:44
+    ivan mostly properly OO, some work still to be done with svc_
+    stuff
+
+    Revision 1.2 1998/11/18 09:01:44 ivan i18n! i18n!
+
+    Revision 1.1 1998/11/15 05:19:58 ivan long overdue
+
+    Revision 1.3 1998/11/15 04:33:00 ivan updates for newest versoin
+
+    Revision 1.2 1998/11/15 03:48:49 ivan update for current version
+
diff --git a/htdocs/docs/man/cust_pkg.txt b/htdocs/docs/man/cust_pkg.txt
index 7486456fe..395403192 100644
--- a/htdocs/docs/man/cust_pkg.txt
+++ b/htdocs/docs/man/cust_pkg.txt
@@ -57,6 +57,21 @@ METHODS
         If there is an error, returns the error, otherwise returns
         false.
 
+        sub insert { my $self = shift;
+
+          # custnum might not have have been defined in sub check (for one-shot new
+          # customers), so check it here instead
+
+          my $error = $self->ut_number('custnum');
+          return $error if $error
+
+          return "Unknown customer"
+            unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+
+          $self->SUPER::insert;
+
+        }
+
     delete
         Currently unimplemented. You don't want to delete billing
         items, because there would then be no record the customer
@@ -135,7 +150,7 @@ SUBROUTINES
         FS::pkg_svc manpage).
 
 VERSION
-    $Id: cust_pkg.txt,v 1.3 1999-02-09 09:38:01 ivan Exp $
+    $Id: cust_pkg.txt,v 1.4 1999-04-08 13:39:32 ivan Exp $
 
 BUGS
     sub order is not OO. Perhaps it should be moved to FS::cust_main
@@ -169,10 +184,20 @@ HISTORY
     pod ivan@sisd.com 98-sep-21
 
     $Log: cust_pkg.txt,v $
-    Revision 1.3  1999-02-09 09:38:01  ivan
-    regenerated perl api docs from embedded pod
- Revision 1.6 1999/01/25 12:26:12 ivan yet
-    more mod_perl stuff
+    Revision 1.4  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.9 1999/03/29 01:11:51 ivan use
+    FS::type_pkgs
+
+    Revision 1.8 1999/03/25 13:48:14 ivan allow empty custnum in sub
+    check (but call that an error in sub insert), for one-screen new
+    customer entry
+
+    Revision 1.7 1999/02/09 09:55:06 ivan invoices show line items
+    for each service in a package (see the label method of
+    FS::cust_svc)
+
+    Revision 1.6 1999/01/25 12:26:12 ivan yet more mod_perl stuff
 
     Revision 1.5 1999/01/18 21:58:07 ivan esthetic: eq and ne were
     used in a few places instead of == and !=
diff --git a/htdocs/docs/man/index.html b/htdocs/docs/man/index.html
index c3307e868..79fda2e04 100644
--- a/htdocs/docs/man/index.html
+++ b/htdocs/docs/man/index.html
@@ -13,6 +13,7 @@
 <li><a href="cust_main_county.txt">FS::cust_main_county</a>
 <li><a href="cust_main_invoice.txt">FS::cust_main_invoice</a>
 <li><a href="cust_pay.txt">FS::cust_pay</a>
+<li><a href="cust_pay_batch.txt">FS::cust_pay_batch</a>
 <li><a href="cust_pkg.txt">FS::cust_pkg</a>
 <li><a href="cust_refund.txt">FS::cust_refund</a>
 <li><a href="cust_svc.txt">FS::cust_svc</a>
diff --git a/htdocs/docs/man/svc_Common.txt b/htdocs/docs/man/svc_Common.txt
new file mode 100644
index 000000000..d63b8f245
--- /dev/null
+++ b/htdocs/docs/man/svc_Common.txt
@@ -0,0 +1,75 @@
+NAME
+    FS::svc_Common - Object method for all svc_ records
+
+SYNOPSIS
+    use FS::svc_Common;
+
+    @ISA = qw( FS::svc_Common );
+
+DESCRIPTION
+    FS::svc_Common is intended as a base class for table-specific
+    classes to inherit from, i.e. FS::svc_acct. FS::svc_Common
+    inherits from FS::Record.
+
+METHODS
+    insert
+        Adds this record to the database. If there is an error,
+        returns the error, otherwise returns false.
+
+        The additional fields pkgnum and svcpart (see the
+        FS::cust_svc manpage) should be defined. An FS::cust_svc
+        record will be created and inserted.
+
+    delete
+        Deletes this account from the database. If there is an
+        error, returns the error, otherwise returns false.
+
+        The corresponding FS::cust_svc record will be deleted as
+        well.
+
+    setfixed
+        Sets any fixed fields for this service (see the FS::part_svc
+        manpage). If there is an error, returns the error, otherwise
+        returns the FS::part_svc object (use ref() to test the
+        return). Usually called by the check method.
+
+    setdefault
+        Sets all fields to their defaults (see the FS::part_svc
+        manpage), overriding their current values. If there is an
+        error, returns the error, otherwise returns the FS::part_svc
+        object (use ref() to test the return).
+
+    suspend
+    unsuspend
+    cancel
+        Stubs - return false (no error) so derived classes don't
+        need to define these methods. Called by the cancel method of
+        FS::cust_pkg (see the FS::cust_pkg manpage).
+
+VERSION
+    $Id: svc_Common.txt,v 1.1 1999-04-08 13:39:32 ivan Exp $
+
+BUGS
+    The setfixed method return value.
+
+    The new method should set defaults from part_svc (like the check
+    method sets fixed values)?
+
+SEE ALSO
+    the FS::Record manpage, the FS::cust_svc manpage, the
+    FS::part_svc manpage, the FS::cust_pkg manpage, schema.html from
+    the base documentation.
+
+HISTORY
+    $Log: svc_Common.txt,v $
+    Revision 1.1  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.3 1999/03/25 13:31:29 ivan
+    added setdefault method (generalized setfixed method to setx
+    method)
+
+    Revision 1.2 1999/01/25 12:26:14 ivan yet more mod_perl stuff
+
+    Revision 1.1 1998/12/30 00:30:45 ivan svc_ stuff is more
+    properly OO - has a common superclass FS::svc_Common
+
diff --git a/htdocs/docs/man/svc_acct.txt b/htdocs/docs/man/svc_acct.txt
index f27c1d653..7eb5be47b 100644
--- a/htdocs/docs/man/svc_acct.txt
+++ b/htdocs/docs/man/svc_acct.txt
@@ -127,7 +127,7 @@ METHODS
         Sets any fixed values; see the FS::part_svc manpage.
 
 VERSION
-    $Id: svc_acct.txt,v 1.3 1999-02-09 09:38:11 ivan Exp $
+    $Id: svc_acct.txt,v 1.4 1999-04-08 13:39:32 ivan Exp $
 
 BUGS
     The remote commands should be configurable.
@@ -170,10 +170,12 @@ HISTORY
     pod and FS::conf ivan@sisd.com 98-sep-22
 
     $Log: svc_acct.txt,v $
-    Revision 1.3  1999-02-09 09:38:11  ivan
-    regenerated perl api docs from embedded pod
- Revision 1.6 1999/01/25 12:26:15 ivan yet
-    more mod_perl stuff
+    Revision 1.4  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.7 1999/04/07 14:37:37 ivan use
+    FS::part_svc and FS::svc_acct_pop to avoid warnings
+
+    Revision 1.6 1999/01/25 12:26:15 ivan yet more mod_perl stuff
 
     Revision 1.5 1999/01/18 21:58:09 ivan esthetic: eq and ne were
     used in a few places instead of == and !=
diff --git a/htdocs/docs/man/svc_acct_sm.txt b/htdocs/docs/man/svc_acct_sm.txt
index f260d9f75..dc0773f0f 100644
--- a/htdocs/docs/man/svc_acct_sm.txt
+++ b/htdocs/docs/man/svc_acct_sm.txt
@@ -94,7 +94,7 @@ METHODS
         Sets any fixed values; see the FS::part_svc manpage.
 
 VERSION
-    $Id: svc_acct_sm.txt,v 1.2 1999-02-09 09:38:13 ivan Exp $
+    $Id: svc_acct_sm.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
 
 BUGS
     The remote commands should be configurable.
diff --git a/htdocs/docs/man/svc_domain.txt b/htdocs/docs/man/svc_domain.txt
index bc69535a0..939a940ac 100644
--- a/htdocs/docs/man/svc_domain.txt
+++ b/htdocs/docs/man/svc_domain.txt
@@ -104,7 +104,7 @@ METHODS
         Submits a registration email for this domain.
 
 VERSION
-    $Id: svc_domain.txt,v 1.3 1999-02-09 09:38:14 ivan Exp $
+    $Id: svc_domain.txt,v 1.4 1999-04-08 13:39:32 ivan Exp $
 
 BUGS
     All BIND/DNS fields should be included (and exported).
@@ -140,10 +140,12 @@ HISTORY
     pod, some FS::Conf (not complete) ivan@sisd.com 98-sep-23
 
     $Log: svc_domain.txt,v $
-    Revision 1.3  1999-02-09 09:38:14  ivan
-    regenerated perl api docs from embedded pod
- Revision 1.6 1999/01/25 12:26:17 ivan
-    yet more mod_perl stuff
+    Revision 1.4  1999-04-08 13:39:32  ivan
+    convert from pod for 1.2.0 release
+ Revision 1.7 1999/04/07 14:40:15 ivan
+    use all stuff that's qsearch'ed to avoid warnings
+
+    Revision 1.6 1999/01/25 12:26:17 ivan yet more mod_perl stuff
 
     Revision 1.5 1998/12/30 00:30:47 ivan svc_ stuff is more
     properly OO - has a common superclass FS::svc_Common
-- 
cgit v1.2.1


From 639f53025c49248c598a324814f6d77739bdfd89 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 Apr 1999 03:52:16 +0000
Subject: *** empty log message ***

---
 TODO | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 7b1a5143d..6d57aa09c 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.26 1999-04-08 13:03:02 ivan Exp $
+$Id: TODO,v 1.27 1999-04-09 03:52:16 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -14,6 +14,15 @@ get rid of time2str("%D") which formats dates in a non-y2k-safe looking fashion
 
 uncomment expire in view/cust_pkg.cgi and find the expire cron from fsold
 
+(Test this)
+one-time/per-customer/? changes in rates and descriptions ('remembered
+invoices'): implement by creating a new package on the fly... but it isn't 
+associated with any agent types so it won't show up for other customers to buy.
+(but also... make sure they go away when the customer does! - need this? :
+ one-off package edits! : need a cust_pkgs or cust_part_pkgs or something table,
+ with custnum and partpkg (like type_pkgs)
+(what happens if you hit "custom pricing" but the pricing is already custom?)
+
 Lay out any remaining ugly forms better.
 
 remove "records identical" warning?  gets in the way of more important stuff.
@@ -28,8 +37,20 @@ stock Postgres.  see rfc2138 for what's affected
 What's a good fix?  (besides recompiling postgres with NAMEDATALEN 64)
 (mysql has a 64 character max column length.  others?)
 
+[Mon Mar 29 06:57:56 1999] -e: Use of uninitialized value at /usr/lib/perl5/Date/Format.pm line 333.
+(when sending mail in cust_main.pm::bill or svc_domain.pm)
+
 look at DBIx::Recordset!  (and Tie::DBI, and...)
 
+undefined conf/lpr gives this uninfomative error:
+[Fri Feb 26 16:42:36 1999] bill.cgi: Can't do bidirectional pipe at
+/usr/lib/per
+l5/site_perl/FS/cust_main.pm line 629.
+[Fri Feb 26 16:42:38 1999] bill.cgi: Error closing : Broken pipe at
+/usr/lib/per
+l5/site_perl/FS/cust_main.pm line 631.
+So give a meaningful error!
+
 password and slipip stuff in svc_acct.pm store need to be split into two fields or something, so the silliness in svc_acct.pm and svc_acct.export with looking at the data to decide what to do with it can be fixed
 
 i10n: Apache::Language
-- 
cgit v1.2.1


From b6d1aed30d51bdae49ca22e5aa5baab635969097 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 Apr 1999 03:52:55 +0000
Subject: explicit & for table/itable/ntable

---
 htdocs/browse/agent.cgi            |  9 ++++++---
 htdocs/browse/agent_type.cgi       |  9 ++++++---
 htdocs/browse/cust_main_county.cgi |  9 ++++++---
 htdocs/browse/part_pkg.cgi         |  9 ++++++---
 htdocs/browse/part_referral.cgi    |  9 ++++++---
 htdocs/browse/part_svc.cgi         |  9 ++++++---
 htdocs/browse/svc_acct_pop.cgi     |  9 ++++++---
 htdocs/edit/cust_main.cgi          | 15 +++++++++------
 htdocs/edit/cust_main_county.cgi   |  9 ++++++---
 htdocs/edit/part_svc.cgi           |  9 ++++++---
 htdocs/search/cust_main.cgi        |  9 ++++++---
 htdocs/search/svc_acct_sm.cgi      |  9 ++++++---
 htdocs/view/cust_main.cgi          | 21 ++++++++++++---------
 htdocs/view/cust_pkg.cgi           | 11 +++++++----
 14 files changed, 94 insertions(+), 52 deletions(-)

diff --git a/htdocs/browse/agent.cgi b/htdocs/browse/agent.cgi
index 4ec472c33..c6e7da5f1 100755
--- a/htdocs/browse/agent.cgi
+++ b/htdocs/browse/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.11 1999-01-20 09:43:16 ivan Exp $
+# $Id: agent.cgi,v 1.12 1999-04-09 03:52:55 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -15,7 +15,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent.cgi,v $
-# Revision 1.11  1999-01-20 09:43:16  ivan
+# Revision 1.12  1999-04-09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.11  1999/01/20 09:43:16  ivan
 # comment out future UI code (but look at it, it's neat!)
 #
 # Revision 1.10  1999/01/19 05:13:24  ivan
@@ -83,7 +86,7 @@ print $cgi->header( '-expires' => 'now' ), header('Agent Listing', menubar(
 Agents are resellers of your service. Agents may be limited to a subset of your
 full offerings (via their type).<BR><BR>
 END
-print table, <<END;
+print &table, <<END;
       <TR>
         <TH COLSPAN=2>Agent</TH>
         <TH>Type</TH>
diff --git a/htdocs/browse/agent_type.cgi b/htdocs/browse/agent_type.cgi
index 5b090abff..76aafa80b 100755
--- a/htdocs/browse/agent_type.cgi
+++ b/htdocs/browse/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.6 1999-04-07 11:10:46 ivan Exp $
+# $Id: agent_type.cgi,v 1.7 1999-04-09 03:52:55 ivan Exp $
 #
 # ivan@sisd.com 97-dec-10
 #
@@ -11,7 +11,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.6  1999-04-07 11:10:46  ivan
+# Revision 1.7  1999-04-09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.6  1999/04/07 11:10:46  ivan
 # harmless typo
 #
 # Revision 1.5  1999/01/19 05:13:25  ivan
@@ -48,7 +51,7 @@ $p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header("Agent Type Listing", menubar(
   'Main Menu' => $p,
 )), "Agent types define groups of packages that you can then assign to".
-    " particular agents.<BR><BR>", table, <<END;
+    " particular agents.<BR><BR>", &table, <<END;
       <TR>
         <TH COLSPAN=2>Agent Type</TH>
         <TH COLSPAN="2">Packages</TH>
diff --git a/htdocs/browse/cust_main_county.cgi b/htdocs/browse/cust_main_county.cgi
index 0e899f246..5d7e77573 100755
--- a/htdocs/browse/cust_main_county.cgi
+++ b/htdocs/browse/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.5 1999-01-19 05:13:26 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.6 1999-04-09 03:52:55 ivan Exp $
 #
 # ivan@sisd.com 97-dec-13
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county.cgi,v $
-# Revision 1.5  1999-01-19 05:13:26  ivan
+# Revision 1.6  1999-04-09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.5  1999/01/19 05:13:26  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -48,7 +51,7 @@ print $cgi->header( '-expires' => 'now' ), header("Tax Rate Listing", menubar(
     <BR>Click on <u>expand state</u> to specify a state's tax rates by county.
     <BR><BR>
 END
-print table, <<END;
+print &table, <<END;
       <TR>
         <TH><FONT SIZE=-1>Country</FONT></TH>
         <TH><FONT SIZE=-1>State</FONT></TH>
diff --git a/htdocs/browse/part_pkg.cgi b/htdocs/browse/part_pkg.cgi
index 413a108cf..ecf10e059 100755
--- a/htdocs/browse/part_pkg.cgi
+++ b/htdocs/browse/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.6 1999-01-19 05:13:27 ivan Exp $
+# $Id: part_pkg.cgi,v 1.7 1999-04-09 03:52:55 ivan Exp $
 #
 # ivan@sisd.com 97-dec-5,9
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.6  1999-01-19 05:13:27  ivan
+# Revision 1.7  1999-04-09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.6  1999/01/19 05:13:27  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -49,7 +52,7 @@ print $cgi->header( '-expires' => 'now' ), header("Package Part Listing",menubar
   'Main Menu' => $p,
 )), "One or more services are grouped together into a package and given",
   " pricing information. Customers purchase packages, not services.<BR><BR>", 
-  table, <<END;
+  &table, <<END;
     <TABLE BORDER>
       <TR>
         <TH COLSPAN=2>Package</TH>
diff --git a/htdocs/browse/part_referral.cgi b/htdocs/browse/part_referral.cgi
index e3360567c..1b6ebf6cd 100755
--- a/htdocs/browse/part_referral.cgi
+++ b/htdocs/browse/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_referral.cgi,v 1.7 1999-01-19 05:13:28 ivan Exp $
+# $Id: part_referral.cgi,v 1.8 1999-04-09 03:52:55 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23 
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_referral.cgi,v $
-# Revision 1.7  1999-01-19 05:13:28  ivan
+# Revision 1.8  1999-04-09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.7  1999/01/19 05:13:28  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -49,7 +52,7 @@ $p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header("Referral Listing", menubar(
   'Main Menu' => $p,
 #  'Add new referral' => "../edit/part_referral.cgi",
-)), "Where a customer heard about your service. Tracked for informational purposes.<BR><BR>", table, <<END;
+)), "Where a customer heard about your service. Tracked for informational purposes.<BR><BR>", &table, <<END;
       <TR>
         <TH COLSPAN=2>Referral</TH>
       </TR>
diff --git a/htdocs/browse/part_svc.cgi b/htdocs/browse/part_svc.cgi
index 5112f5120..b47cfd143 100755
--- a/htdocs/browse/part_svc.cgi
+++ b/htdocs/browse/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.9 1999-01-19 05:13:29 ivan Exp $
+# $Id: part_svc.cgi,v 1.10 1999-04-09 03:52:55 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14, 97-dec-9
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.9  1999-01-19 05:13:29  ivan
+# Revision 1.10  1999-04-09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.9  1999/01/19 05:13:29  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -57,7 +60,7 @@ print $cgi->header( '-expires' => 'now' ), header('Service Part Listing', menuba
 )),<<END;
     Services are items you offer to your customers.<BR><BR>
 END
-print table, <<END;
+print &table, <<END;
       <TR>
         <TH COLSPAN=2>Service</TH>
         <TH>Table</TH>
diff --git a/htdocs/browse/svc_acct_pop.cgi b/htdocs/browse/svc_acct_pop.cgi
index 5f4126137..d0a51b323 100755
--- a/htdocs/browse/svc_acct_pop.cgi
+++ b/htdocs/browse/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.5 1999-01-19 05:13:30 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.6 1999-04-09 03:52:55 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.5  1999-01-19 05:13:30  ivan
+# Revision 1.6  1999-04-09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.5  1999/01/19 05:13:30  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -42,7 +45,7 @@ $p = popurl(2);
 
 print $cgi->header( '-expires' => 'now' ), header('POP Listing', menubar(
   'Main Menu' => $p,
-)), "Points of Presence<BR><BR>", table, <<END;
+)), "Points of Presence<BR><BR>", &table, <<END;
       <TR>
         <TH></TH>
         <TH>City</TH>
diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 233fff2a2..d144beba6 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.12 1999-04-06 11:16:16 ivan Exp $
+# $Id: cust_main.cgi,v 1.13 1999-04-09 03:52:55 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.12  1999-04-06 11:16:16  ivan
+# Revision 1.13  1999-04-09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.12  1999/04/06 11:16:16  ivan
 # give a meaningful error message if you try to create a customer before you've
 # created an agent
 #
@@ -211,7 +214,7 @@ if ( $custnum ) {
   $cust_main->zip,
 );
 
-print "<BR><BR>Contact information", itable("#c0c0c0"), <<END;
+print "<BR><BR>Contact information", &itable("#c0c0c0"), <<END;
 <TR><TH ALIGN="right">${r}Contact name<BR>(last, first)</TH><TD COLSPAN=3><INPUT TYPE="text" NAME="last" VALUE="$last">, <INPUT TYPE="text" NAME="first" VALUE="$first"></TD><TD ALIGN="right">SS#</TD><TD><INPUT TYPE="text" NAME="ss" VALUE="$ss" SIZE=11></TD></TR>
 <TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="company" VALUE="$company" SIZE=70></TD></TR>
 <TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=70></TD></TR>
@@ -274,7 +277,7 @@ sub expselect {
   $return;
 }
 
-print "<BR>Billing information", itable("#c0c0c0"),
+print "<BR>Billing information", &itable("#c0c0c0"),
       qq!<TR><TD><INPUT TYPE="checkbox" NAME="tax" VALUE="Y"!;
 print qq! CHECKED! if $cust_main->tax eq "Y";
 print qq!>Tax Exempt</TD></TR>!;
@@ -288,7 +291,7 @@ print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$
 
 print "<TR><TD>Billing type</TD></TR>",
       "</TABLE>",
-      table("#c0c0c0"), "<TR>";
+      &table("#c0c0c0"), "<TR>";
 
 ($payinfo, $payname)=(
   $cust_main->payinfo,
@@ -375,7 +378,7 @@ unless ( $custnum ) {
 
   if ( @part_pkg ) {
 
-    print "<BR><BR>First package", itable("#c0c0c0"),
+    print "<BR><BR>First package", &itable("#c0c0c0"),
           qq!<TR><TD COLSPAN=2><SELECT NAME="pkgpart_svcpart">!;
 
     print qq!<OPTION VALUE="">(none)!;
diff --git a/htdocs/edit/cust_main_county.cgi b/htdocs/edit/cust_main_county.cgi
index 3c2efec5b..3d2b0e263 100755
--- a/htdocs/edit/cust_main_county.cgi
+++ b/htdocs/edit/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.6 1999-01-25 12:09:55 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.7 1999-04-09 03:52:55 ivan Exp $
 #
 # ivan@sisd.com 97-dec-13-16
 #
@@ -11,7 +11,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 # 
 # $Log: cust_main_county.cgi,v $
-# Revision 1.6  1999-01-25 12:09:55  ivan
+# Revision 1.7  1999-04-09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.6  1999/01/25 12:09:55  ivan
 # yet more mod_perl stuff
 #
 # Revision 1.5  1999/01/19 05:13:36  ivan
@@ -51,7 +54,7 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
   if $cgi->param('error');
 
 print qq!<FORM ACTION="!, popurl(1),
-    qq!process/cust_main_county.cgi" METHOD=POST>!, table, <<END;
+    qq!process/cust_main_county.cgi" METHOD=POST>!, &table, <<END;
       <TR>
         <TH><FONT SIZE=-1>Country</FONT></TH>
         <TH><FONT SIZE=-1>State</FONT></TH>
diff --git a/htdocs/edit/part_svc.cgi b/htdocs/edit/part_svc.cgi
index 57811a0b6..8a9018a25 100755
--- a/htdocs/edit/part_svc.cgi
+++ b/htdocs/edit/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.10 1999-04-08 13:01:50 ivan Exp $
+# $Id: part_svc.cgi,v 1.11 1999-04-09 03:52:55 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.10  1999-04-08 13:01:50  ivan
+# Revision 1.11  1999-04-09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.10  1999/04/08 13:01:50  ivan
 #  [ AND DOCUMENT! ] all svc_acct services should have a default
 #  or fixed shell
 #
@@ -100,7 +103,7 @@ blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
 <B>/usr/bin/passwd</B>.
 <BR><BR>
 END
-print table, '<TR><TH>Table<SELECT NAME="svcdb" SIZE=1>',
+print &table, '<TR><TH>Table<SELECT NAME="svcdb" SIZE=1>',
       map '<OPTION'. ' SELECTED'x($_ eq $hashref->{svcdb}). ">$_\n", qw(
         svc_acct svc_domain svc_acct_sm
       );
diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index 03f02e4be..1a9c591a1 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.9 1999-02-28 00:03:55 ivan Exp $
+# $Id: cust_main.cgi,v 1.10 1999-04-09 03:52:55 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -17,7 +17,10 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.9  1999-02-28 00:03:55  ivan
+# Revision 1.10  1999-04-09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.9  1999/02/28 00:03:55  ivan
 # removed misleading comments
 #
 # Revision 1.8  1999/02/07 09:59:36  ivan
@@ -93,7 +96,7 @@ if ( scalar(@cust_main) == 1 ) {
   my($total)=scalar(@cust_main);
   print $cgi->header( '-expires' => 'now' ), header("Customer Search Results",menubar(
     'Main Menu', popurl(2)
-  )), "$total matching customers found<BR>", table, <<END;
+  )), "$total matching customers found<BR>", &table, <<END;
       <TR>
         <TH></TH>
         <TH>Contact name</TH>
diff --git a/htdocs/search/svc_acct_sm.cgi b/htdocs/search/svc_acct_sm.cgi
index cade20e86..fedbaa0dc 100755
--- a/htdocs/search/svc_acct_sm.cgi
+++ b/htdocs/search/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.7 1999-02-28 00:03:56 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.8 1999-04-09 03:52:55 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -17,7 +17,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.7  1999-02-28 00:03:56  ivan
+# Revision 1.8  1999-04-09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.7  1999/02/28 00:03:56  ivan
 # removed misleading comments
 #
 # Revision 1.6  1999/02/09 09:22:58  ivan
@@ -76,7 +79,7 @@ if ( scalar(@svc_acct_sm) == 1 ) {
 } elsif ( scalar(@svc_acct_sm) > 1 ) {
   print $cgi->header( '-expires' => 'now' ),
         header('Mail Alias Search Results'),
-        table, <<END;
+        &table, <<END;
       <TR>
         <TH>Mail to<BR><FONT SIZE=-1>(click to view mail alias)</FONT></TH>
         <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index 58c1323a4..4bde0be28 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.14 1999-04-08 04:04:37 ivan Exp $
+# $Id: cust_main.cgi,v 1.15 1999-04-09 03:52:55 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -31,7 +31,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.14  1999-04-08 04:04:37  ivan
+# Revision 1.15  1999-04-09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.14  1999/04/08 04:04:37  ivan
 # eliminate double // in links
 #
 # Revision 1.13  1999/02/28 00:04:00  ivan
@@ -108,11 +111,11 @@ $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
 die "Customer not found!" unless $cust_main;
 $hashref = $cust_main->hashref;
 
-print itable(), '<TR><TD><A NAME="cust_main"></A>';
+print &itable(), '<TR><TD><A NAME="cust_main"></A>';
 
 print qq!<A HREF="!, popurl(2), 
       qq!edit/cust_main.cgi?$custnum">Edit this customer</A>!,
-      ntable("#c0c0c0"), "<TR><TD>", ntable("#c0c0c0",2),
+      &ntable("#c0c0c0"), "<TR><TD>", &ntable("#c0c0c0",2),
       '<TR><TD ALIGN="right">Customer number</TD><TD BGCOLOR="#ffffff">',
       $custnum, '</TD></TR>',
 ;
@@ -140,8 +143,8 @@ print '</TABLE></TD></TR></TABLE>';
 
 print '</TD><TD ROWSPAN=2>';
 
-print "Contact information", ntable("#c0c0c0"), "<TR><TD>",
-      ntable("#c0c0c0",2),
+print "Contact information", &ntable("#c0c0c0"), "<TR><TD>",
+      &ntable("#c0c0c0",2),
   '<TR><TD ALIGN="right">Contact name<BR>(last, first)</TD>',
     '<TD COLSPAN=3 BGCOLOR="#ffffff">',
     $cust_main->last, ', ', $cust_main->first,
@@ -181,7 +184,7 @@ print '</TD></TR><TR><TD>';
 @invoicing_list = $cust_main->invoicing_list;
 print "Billing information (",
       qq!<A HREF="!, popurl(2), qq!/misc/bill.cgi?$custnum">!, "Bill now</A>)",
-      ntable("#c0c0c0"), "<TR><TD>", ntable("#c0c0c0",2),
+      &ntable("#c0c0c0"), "<TR><TD>", &ntable("#c0c0c0",2),
       '<TR><TD ALIGN="right">Tax exempt</TD><TD BGCOLOR="#ffffff">',
       $cust_main->tax ? 'yes' : 'no',
       '</TD></TR>',
@@ -232,7 +235,7 @@ print qq!<BR><BR><A NAME="cust_pkg">Packages</A> !,
 #display packages
 
 #formatting
-print qq!!, table, "\n",
+print qq!!, &table, "\n",
       qq!<TR><TH COLSPAN=2 ROWSPAN=2>Package</TH><TH COLSPAN=5>!,
       qq!Dates</TH><TH COLSPAN=2 ROWSPAN=2>Services</TH></TR>\n!,
       qq!<TR><TH><FONT SIZE=-1>Setup</FONT></TH><TH>!,
@@ -349,7 +352,7 @@ foreach $credit (@credits) {
 }
 
         #formatting
-        print table(), <<END;
+        print &table(), <<END;
 <TR>
   <TH>Date</TH>
   <TH>Description</TH>
diff --git a/htdocs/view/cust_pkg.cgi b/htdocs/view/cust_pkg.cgi
index bf7f29bc1..6bb294836 100755
--- a/htdocs/view/cust_pkg.cgi
+++ b/htdocs/view/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.9 1999-04-08 12:00:19 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.10 1999-04-09 03:52:55 ivan Exp $
 #
 # Usage: cust_pkg.cgi pkgnum
 #        http://server.name/path/cust_pkg.cgi?pkgnum
@@ -24,7 +24,10 @@
 # no FS::Search ivan@sisd.com 98-mar-7
 # 
 # $Log: cust_pkg.cgi,v $
-# Revision 1.9  1999-04-08 12:00:19  ivan
+# Revision 1.10  1999-04-09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.9  1999/04/08 12:00:19  ivan
 # aesthetic update
 #
 # Revision 1.8  1999/02/28 00:04:01  ivan
@@ -106,7 +109,7 @@ print ' (<A HREF="'. popurl(2). 'misc/susp_pkg.cgi?'. $pkgnum.
 print ' (<A HREF="'. popurl(2). 'misc/cancel_pkg.cgi?'. $pkgnum.
       '">cancel</A>)' unless $cancel;
 
-print ntable("#c0c0c0"), '<TR><TD>', ntable("#c0c0c0",2),
+print &ntable("#c0c0c0"), '<TR><TD>', &ntable("#c0c0c0",2),
       '<TR><TD ALIGN="right">Package number</TD><TD BGCOLOR="#ffffff">',
       $pkgnum, '</TD></TR>',
       '<TR><TD ALIGN="right">Package</TD><TD BGCOLOR="#ffffff">',
@@ -139,7 +142,7 @@ print  '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
 unless ($cancel) {
 
   #services
-  print '<BR>Service Information', table,
+  print '<BR>Service Information', &table,
   ;
 
   #list of services this pkgpart includes
-- 
cgit v1.2.1


From e3843e0a3823b0d67dc891a0965f2dad4d0bdc10 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 Apr 1999 04:22:34 +0000
Subject: also table()

---
 htdocs/browse/agent.cgi            |  9 ++++++---
 htdocs/browse/agent_type.cgi       |  9 ++++++---
 htdocs/browse/cust_main_county.cgi |  9 ++++++---
 htdocs/browse/part_pkg.cgi         |  9 ++++++---
 htdocs/browse/part_referral.cgi    |  9 ++++++---
 htdocs/browse/part_svc.cgi         |  9 ++++++---
 htdocs/browse/svc_acct_pop.cgi     |  9 ++++++---
 htdocs/edit/cust_main_county.cgi   |  9 ++++++---
 htdocs/edit/part_svc.cgi           |  9 ++++++---
 htdocs/search/cust_main.cgi        |  9 ++++++---
 htdocs/search/svc_acct_sm.cgi      |  9 ++++++---
 htdocs/view/cust_main.cgi          |  9 ++++++---
 htdocs/view/cust_pkg.cgi           | 10 ++++++----
 13 files changed, 78 insertions(+), 40 deletions(-)

diff --git a/htdocs/browse/agent.cgi b/htdocs/browse/agent.cgi
index c6e7da5f1..b73d17b76 100755
--- a/htdocs/browse/agent.cgi
+++ b/htdocs/browse/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.12 1999-04-09 03:52:55 ivan Exp $
+# $Id: agent.cgi,v 1.13 1999-04-09 04:22:34 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -15,7 +15,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent.cgi,v $
-# Revision 1.12  1999-04-09 03:52:55  ivan
+# Revision 1.13  1999-04-09 04:22:34  ivan
+# also table()
+#
+# Revision 1.12  1999/04/09 03:52:55  ivan
 # explicit & for table/itable/ntable
 #
 # Revision 1.11  1999/01/20 09:43:16  ivan
@@ -86,7 +89,7 @@ print $cgi->header( '-expires' => 'now' ), header('Agent Listing', menubar(
 Agents are resellers of your service. Agents may be limited to a subset of your
 full offerings (via their type).<BR><BR>
 END
-print &table, <<END;
+print &table(), <<END;
       <TR>
         <TH COLSPAN=2>Agent</TH>
         <TH>Type</TH>
diff --git a/htdocs/browse/agent_type.cgi b/htdocs/browse/agent_type.cgi
index 76aafa80b..9d8687299 100755
--- a/htdocs/browse/agent_type.cgi
+++ b/htdocs/browse/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.7 1999-04-09 03:52:55 ivan Exp $
+# $Id: agent_type.cgi,v 1.8 1999-04-09 04:22:34 ivan Exp $
 #
 # ivan@sisd.com 97-dec-10
 #
@@ -11,7 +11,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.7  1999-04-09 03:52:55  ivan
+# Revision 1.8  1999-04-09 04:22:34  ivan
+# also table()
+#
+# Revision 1.7  1999/04/09 03:52:55  ivan
 # explicit & for table/itable/ntable
 #
 # Revision 1.6  1999/04/07 11:10:46  ivan
@@ -51,7 +54,7 @@ $p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header("Agent Type Listing", menubar(
   'Main Menu' => $p,
 )), "Agent types define groups of packages that you can then assign to".
-    " particular agents.<BR><BR>", &table, <<END;
+    " particular agents.<BR><BR>", &table(), <<END;
       <TR>
         <TH COLSPAN=2>Agent Type</TH>
         <TH COLSPAN="2">Packages</TH>
diff --git a/htdocs/browse/cust_main_county.cgi b/htdocs/browse/cust_main_county.cgi
index 5d7e77573..5f2b13dc0 100755
--- a/htdocs/browse/cust_main_county.cgi
+++ b/htdocs/browse/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.6 1999-04-09 03:52:55 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.7 1999-04-09 04:22:34 ivan Exp $
 #
 # ivan@sisd.com 97-dec-13
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county.cgi,v $
-# Revision 1.6  1999-04-09 03:52:55  ivan
+# Revision 1.7  1999-04-09 04:22:34  ivan
+# also table()
+#
+# Revision 1.6  1999/04/09 03:52:55  ivan
 # explicit & for table/itable/ntable
 #
 # Revision 1.5  1999/01/19 05:13:26  ivan
@@ -51,7 +54,7 @@ print $cgi->header( '-expires' => 'now' ), header("Tax Rate Listing", menubar(
     <BR>Click on <u>expand state</u> to specify a state's tax rates by county.
     <BR><BR>
 END
-print &table, <<END;
+print &table(), <<END;
       <TR>
         <TH><FONT SIZE=-1>Country</FONT></TH>
         <TH><FONT SIZE=-1>State</FONT></TH>
diff --git a/htdocs/browse/part_pkg.cgi b/htdocs/browse/part_pkg.cgi
index ecf10e059..d4c359b28 100755
--- a/htdocs/browse/part_pkg.cgi
+++ b/htdocs/browse/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.7 1999-04-09 03:52:55 ivan Exp $
+# $Id: part_pkg.cgi,v 1.8 1999-04-09 04:22:34 ivan Exp $
 #
 # ivan@sisd.com 97-dec-5,9
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.7  1999-04-09 03:52:55  ivan
+# Revision 1.8  1999-04-09 04:22:34  ivan
+# also table()
+#
+# Revision 1.7  1999/04/09 03:52:55  ivan
 # explicit & for table/itable/ntable
 #
 # Revision 1.6  1999/01/19 05:13:27  ivan
@@ -52,7 +55,7 @@ print $cgi->header( '-expires' => 'now' ), header("Package Part Listing",menubar
   'Main Menu' => $p,
 )), "One or more services are grouped together into a package and given",
   " pricing information. Customers purchase packages, not services.<BR><BR>", 
-  &table, <<END;
+  &table(), <<END;
     <TABLE BORDER>
       <TR>
         <TH COLSPAN=2>Package</TH>
diff --git a/htdocs/browse/part_referral.cgi b/htdocs/browse/part_referral.cgi
index 1b6ebf6cd..e4ca25a65 100755
--- a/htdocs/browse/part_referral.cgi
+++ b/htdocs/browse/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_referral.cgi,v 1.8 1999-04-09 03:52:55 ivan Exp $
+# $Id: part_referral.cgi,v 1.9 1999-04-09 04:22:34 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23 
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_referral.cgi,v $
-# Revision 1.8  1999-04-09 03:52:55  ivan
+# Revision 1.9  1999-04-09 04:22:34  ivan
+# also table()
+#
+# Revision 1.8  1999/04/09 03:52:55  ivan
 # explicit & for table/itable/ntable
 #
 # Revision 1.7  1999/01/19 05:13:28  ivan
@@ -52,7 +55,7 @@ $p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header("Referral Listing", menubar(
   'Main Menu' => $p,
 #  'Add new referral' => "../edit/part_referral.cgi",
-)), "Where a customer heard about your service. Tracked for informational purposes.<BR><BR>", &table, <<END;
+)), "Where a customer heard about your service. Tracked for informational purposes.<BR><BR>", &table(), <<END;
       <TR>
         <TH COLSPAN=2>Referral</TH>
       </TR>
diff --git a/htdocs/browse/part_svc.cgi b/htdocs/browse/part_svc.cgi
index b47cfd143..123cb7d2a 100755
--- a/htdocs/browse/part_svc.cgi
+++ b/htdocs/browse/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.10 1999-04-09 03:52:55 ivan Exp $
+# $Id: part_svc.cgi,v 1.11 1999-04-09 04:22:34 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14, 97-dec-9
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.10  1999-04-09 03:52:55  ivan
+# Revision 1.11  1999-04-09 04:22:34  ivan
+# also table()
+#
+# Revision 1.10  1999/04/09 03:52:55  ivan
 # explicit & for table/itable/ntable
 #
 # Revision 1.9  1999/01/19 05:13:29  ivan
@@ -60,7 +63,7 @@ print $cgi->header( '-expires' => 'now' ), header('Service Part Listing', menuba
 )),<<END;
     Services are items you offer to your customers.<BR><BR>
 END
-print &table, <<END;
+print &table(), <<END;
       <TR>
         <TH COLSPAN=2>Service</TH>
         <TH>Table</TH>
diff --git a/htdocs/browse/svc_acct_pop.cgi b/htdocs/browse/svc_acct_pop.cgi
index d0a51b323..1ddbcdc2e 100755
--- a/htdocs/browse/svc_acct_pop.cgi
+++ b/htdocs/browse/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.6 1999-04-09 03:52:55 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.7 1999-04-09 04:22:34 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.6  1999-04-09 03:52:55  ivan
+# Revision 1.7  1999-04-09 04:22:34  ivan
+# also table()
+#
+# Revision 1.6  1999/04/09 03:52:55  ivan
 # explicit & for table/itable/ntable
 #
 # Revision 1.5  1999/01/19 05:13:30  ivan
@@ -45,7 +48,7 @@ $p = popurl(2);
 
 print $cgi->header( '-expires' => 'now' ), header('POP Listing', menubar(
   'Main Menu' => $p,
-)), "Points of Presence<BR><BR>", &table, <<END;
+)), "Points of Presence<BR><BR>", &table(), <<END;
       <TR>
         <TH></TH>
         <TH>City</TH>
diff --git a/htdocs/edit/cust_main_county.cgi b/htdocs/edit/cust_main_county.cgi
index 3d2b0e263..747a63df6 100755
--- a/htdocs/edit/cust_main_county.cgi
+++ b/htdocs/edit/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.7 1999-04-09 03:52:55 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.8 1999-04-09 04:22:34 ivan Exp $
 #
 # ivan@sisd.com 97-dec-13-16
 #
@@ -11,7 +11,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 # 
 # $Log: cust_main_county.cgi,v $
-# Revision 1.7  1999-04-09 03:52:55  ivan
+# Revision 1.8  1999-04-09 04:22:34  ivan
+# also table()
+#
+# Revision 1.7  1999/04/09 03:52:55  ivan
 # explicit & for table/itable/ntable
 #
 # Revision 1.6  1999/01/25 12:09:55  ivan
@@ -54,7 +57,7 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
   if $cgi->param('error');
 
 print qq!<FORM ACTION="!, popurl(1),
-    qq!process/cust_main_county.cgi" METHOD=POST>!, &table, <<END;
+    qq!process/cust_main_county.cgi" METHOD=POST>!, &table(), <<END;
       <TR>
         <TH><FONT SIZE=-1>Country</FONT></TH>
         <TH><FONT SIZE=-1>State</FONT></TH>
diff --git a/htdocs/edit/part_svc.cgi b/htdocs/edit/part_svc.cgi
index 8a9018a25..e1f1e2ad5 100755
--- a/htdocs/edit/part_svc.cgi
+++ b/htdocs/edit/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.11 1999-04-09 03:52:55 ivan Exp $
+# $Id: part_svc.cgi,v 1.12 1999-04-09 04:22:34 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.11  1999-04-09 03:52:55  ivan
+# Revision 1.12  1999-04-09 04:22:34  ivan
+# also table()
+#
+# Revision 1.11  1999/04/09 03:52:55  ivan
 # explicit & for table/itable/ntable
 #
 # Revision 1.10  1999/04/08 13:01:50  ivan
@@ -103,7 +106,7 @@ blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
 <B>/usr/bin/passwd</B>.
 <BR><BR>
 END
-print &table, '<TR><TH>Table<SELECT NAME="svcdb" SIZE=1>',
+print &table(), '<TR><TH>Table<SELECT NAME="svcdb" SIZE=1>',
       map '<OPTION'. ' SELECTED'x($_ eq $hashref->{svcdb}). ">$_\n", qw(
         svc_acct svc_domain svc_acct_sm
       );
diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index 1a9c591a1..099b3c0e8 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.10 1999-04-09 03:52:55 ivan Exp $
+# $Id: cust_main.cgi,v 1.11 1999-04-09 04:22:34 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -17,7 +17,10 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.10  1999-04-09 03:52:55  ivan
+# Revision 1.11  1999-04-09 04:22:34  ivan
+# also table()
+#
+# Revision 1.10  1999/04/09 03:52:55  ivan
 # explicit & for table/itable/ntable
 #
 # Revision 1.9  1999/02/28 00:03:55  ivan
@@ -96,7 +99,7 @@ if ( scalar(@cust_main) == 1 ) {
   my($total)=scalar(@cust_main);
   print $cgi->header( '-expires' => 'now' ), header("Customer Search Results",menubar(
     'Main Menu', popurl(2)
-  )), "$total matching customers found<BR>", &table, <<END;
+  )), "$total matching customers found<BR>", &table(), <<END;
       <TR>
         <TH></TH>
         <TH>Contact name</TH>
diff --git a/htdocs/search/svc_acct_sm.cgi b/htdocs/search/svc_acct_sm.cgi
index fedbaa0dc..e92a15ebb 100755
--- a/htdocs/search/svc_acct_sm.cgi
+++ b/htdocs/search/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.8 1999-04-09 03:52:55 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.9 1999-04-09 04:22:34 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -17,7 +17,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.8  1999-04-09 03:52:55  ivan
+# Revision 1.9  1999-04-09 04:22:34  ivan
+# also table()
+#
+# Revision 1.8  1999/04/09 03:52:55  ivan
 # explicit & for table/itable/ntable
 #
 # Revision 1.7  1999/02/28 00:03:56  ivan
@@ -79,7 +82,7 @@ if ( scalar(@svc_acct_sm) == 1 ) {
 } elsif ( scalar(@svc_acct_sm) > 1 ) {
   print $cgi->header( '-expires' => 'now' ),
         header('Mail Alias Search Results'),
-        &table, <<END;
+        &table(), <<END;
       <TR>
         <TH>Mail to<BR><FONT SIZE=-1>(click to view mail alias)</FONT></TH>
         <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index 4bde0be28..6f6c33540 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.15 1999-04-09 03:52:55 ivan Exp $
+# $Id: cust_main.cgi,v 1.16 1999-04-09 04:22:34 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -31,7 +31,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.15  1999-04-09 03:52:55  ivan
+# Revision 1.16  1999-04-09 04:22:34  ivan
+# also table()
+#
+# Revision 1.15  1999/04/09 03:52:55  ivan
 # explicit & for table/itable/ntable
 #
 # Revision 1.14  1999/04/08 04:04:37  ivan
@@ -235,7 +238,7 @@ print qq!<BR><BR><A NAME="cust_pkg">Packages</A> !,
 #display packages
 
 #formatting
-print qq!!, &table, "\n",
+print qq!!, &table(), "\n",
       qq!<TR><TH COLSPAN=2 ROWSPAN=2>Package</TH><TH COLSPAN=5>!,
       qq!Dates</TH><TH COLSPAN=2 ROWSPAN=2>Services</TH></TR>\n!,
       qq!<TR><TH><FONT SIZE=-1>Setup</FONT></TH><TH>!,
diff --git a/htdocs/view/cust_pkg.cgi b/htdocs/view/cust_pkg.cgi
index 6bb294836..0054ee0fa 100755
--- a/htdocs/view/cust_pkg.cgi
+++ b/htdocs/view/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.10 1999-04-09 03:52:55 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.11 1999-04-09 04:22:34 ivan Exp $
 #
 # Usage: cust_pkg.cgi pkgnum
 #        http://server.name/path/cust_pkg.cgi?pkgnum
@@ -24,7 +24,10 @@
 # no FS::Search ivan@sisd.com 98-mar-7
 # 
 # $Log: cust_pkg.cgi,v $
-# Revision 1.10  1999-04-09 03:52:55  ivan
+# Revision 1.11  1999-04-09 04:22:34  ivan
+# also table()
+#
+# Revision 1.10  1999/04/09 03:52:55  ivan
 # explicit & for table/itable/ntable
 #
 # Revision 1.9  1999/04/08 12:00:19  ivan
@@ -142,8 +145,7 @@ print  '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
 unless ($cancel) {
 
   #services
-  print '<BR>Service Information', &table,
-  ;
+  print '<BR>Service Information', &table();
 
   #list of services this pkgpart includes
   my $pkg_svc;
-- 
cgit v1.2.1


From 8750780f24d5613081aab5afe4cbcf4bfccd035b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 Apr 1999 23:43:29 +0000
Subject: just in case

---
 htdocs/search/svc_acct.cgi | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/search/svc_acct.cgi b/htdocs/search/svc_acct.cgi
index 93b03e56d..a3ebf081c 100755
--- a/htdocs/search/svc_acct.cgi
+++ b/htdocs/search/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.7 1999-02-07 09:59:38 ivan Exp $
+# $Id: svc_acct.cgi,v 1.8 1999-04-09 23:43:29 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
@@ -23,7 +23,10 @@
 # give service and customer info too ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.7  1999-02-07 09:59:38  ivan
+# Revision 1.8  1999-04-09 23:43:29  ivan
+# just in case
+#
+# Revision 1.7  1999/02/07 09:59:38  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.6  1999/01/19 05:14:14  ivan
@@ -88,6 +91,7 @@ if ( $query eq 'svcnum' ) {
       'pkgnum' => '',
     }), qsearch('svc_acct',{});
 } else {
+  $sortby=\*uid_sort;
   &usernamesearch;
 }
 
-- 
cgit v1.2.1


From 9d68b52edb3bb1f02aeccba86ebad0f6aebc4e6c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 10 Apr 1999 01:53:18 +0000
Subject: oops, search usernames limited to 8 chars

---
 htdocs/search/svc_acct.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/search/svc_acct.cgi b/htdocs/search/svc_acct.cgi
index a3ebf081c..96ddf957a 100755
--- a/htdocs/search/svc_acct.cgi
+++ b/htdocs/search/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.8 1999-04-09 23:43:29 ivan Exp $
+# $Id: svc_acct.cgi,v 1.9 1999-04-10 01:53:18 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
@@ -23,7 +23,10 @@
 # give service and customer info too ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.8  1999-04-09 23:43:29  ivan
+# Revision 1.9  1999-04-10 01:53:18  ivan
+# oops, search usernames limited to 8 chars
+#
+# Revision 1.8  1999/04/09 23:43:29  ivan
 # just in case
 #
 # Revision 1.7  1999/02/07 09:59:38  ivan
@@ -187,7 +190,7 @@ sub uid_sort {
 
 sub usernamesearch {
 
-  $cgi->param('username') =~ /^([\w\d\-]{2,8})$/; #untaint username_text
+  $cgi->param('username') =~ /^([\w\d\-]+)$/; #untaint username_text
   my($username)=$1;
 
   @svc_acct=qsearch('svc_acct',{'username'=>$username});
-- 
cgit v1.2.1


From 7f423abd0b553e1f0dd1419adec8735ee2c31df2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 10 Apr 1999 05:27:38 +0000
Subject: display an illegal payby, to assist importing

---
 site_perl/cust_main.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index 768d77273..838e2091e 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -263,7 +263,7 @@ sub check {
   $self->zip =~ /^\s*(\w[\w\-\s]{3,8}\w)\s*$/ or return "Illegal zip";
   $self->zip($1);
 
-  $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
+  $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby: ". $self->payby;
   $self->payby($1);
 
   if ( $self->payby eq 'CARD' ) {
@@ -880,7 +880,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.16 1999-04-07 14:32:19 ivan Exp $
+$Id: cust_main.pm,v 1.17 1999-04-10 05:27:38 ivan Exp $
 
 =head1 BUGS
 
@@ -936,7 +936,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.16  1999-04-07 14:32:19  ivan
+Revision 1.17  1999-04-10 05:27:38  ivan
+display an illegal payby, to assist importing
+
+Revision 1.16  1999/04/07 14:32:19  ivan
 more &invoicing_list logic to skip searches when there is no custnum
 
 Revision 1.15  1999/04/07 13:41:54  ivan
-- 
cgit v1.2.1


From 0fb7b7994ceae4f26c0e0c03c25ae9b71c59a6ed Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 10 Apr 1999 06:54:11 +0000
Subject: ditto

---
 site_perl/cust_main.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index 838e2091e..fa1dc29a0 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -229,7 +229,8 @@ sub check {
   return "Unknown referral"
     unless qsearchs( 'part_referral', { 'refnum' => $self->refnum } );
 
-  $self->getfield('last') =~ /^([\w \,\.\-\']+)$/ or return "Illegal last name";
+  $self->getfield('last') =~ /^([\w \,\.\-\']+)$/
+    or return "Illegal last name: ". $self->getfield('last');
   $self->setfield('last',$1);
 
   $self->first =~ /^([\w \,\.\-\']+)$/ or return "Illegal first name";
@@ -880,7 +881,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.17 1999-04-10 05:27:38 ivan Exp $
+$Id: cust_main.pm,v 1.18 1999-04-10 06:54:11 ivan Exp $
 
 =head1 BUGS
 
@@ -936,7 +937,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.17  1999-04-10 05:27:38  ivan
+Revision 1.18  1999-04-10 06:54:11  ivan
+ditto
+
+Revision 1.17  1999/04/10 05:27:38  ivan
 display an illegal payby, to assist importing
 
 Revision 1.16  1999/04/07 14:32:19  ivan
-- 
cgit v1.2.1


From 065d837ab0125c1b035809b744be4f3c8e4385a3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 10 Apr 1999 07:03:38 +0000
Subject: return the value with ut_* error messages, to assist in debugging

---
 site_perl/Record.pm | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/site_perl/Record.pm b/site_perl/Record.pm
index 730b1f969..6496d3ce5 100644
--- a/site_perl/Record.pm
+++ b/site_perl/Record.pm
@@ -562,7 +562,7 @@ sub ut_float {
    $self->getfield($field) =~ /^(\d+)$/ ||
    $self->getfield($field) =~ /^(\d+\.\d+e\d+)$/ ||
    $self->getfield($field) =~ /^(\d+e\d+)$/)
-    or return "Illegal or empty (float) $field!";
+    or return "Illegal or empty (float) $field: ". $self->getfield($field);
   $self->setfield($field,$1);
   '';
 }
@@ -577,7 +577,7 @@ is an error, returns the error, otherwise returns false.
 sub ut_number {
   my($self,$field)=@_;
   $self->getfield($field) =~ /^(\d+)$/
-    or return "Illegal or empty (numeric) $field!";
+    or return "Illegal or empty (numeric) $field: ". $self->getfield($field);
   $self->setfield($field,$1);
   '';
 }
@@ -592,7 +592,7 @@ an error, returns the error, otherwise returns false.
 sub ut_numbern {
   my($self,$field)=@_;
   $self->getfield($field) =~ /^(\d*)$/
-    or return "Illegal (numeric) $field!";
+    or return "Illegal (numeric) $field: ". $self->getfield($field);
   $self->setfield($field,$1);
   '';
 }
@@ -608,7 +608,7 @@ sub ut_money {
   my($self,$field)=@_;
   $self->setfield($field, 0) if $self->getfield($field) eq '';
   $self->getfield($field) =~ /^(\-)? ?(\d*)(\.\d{2})?$/
-    or return "Illegal (money) $field!";
+    or return "Illegal (money) $field: ". $self->getfield($field);
   #$self->setfield($field, "$1$2$3" || 0);
   $self->setfield($field, ( ($1||''). ($2||''). ($3||'') ) || 0);
   '';
@@ -626,7 +626,7 @@ false.
 sub ut_text {
   my($self,$field)=@_;
   $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/]+)$/
-    or return "Illegal or empty (text) $field";
+    or return "Illegal or empty (text) $field: ". $self->getfield($field);
   $self->setfield($field,$1);
   '';
 }
@@ -642,7 +642,7 @@ May be null.  If there is an error, returns the error, otherwise returns false.
 sub ut_textn {
   my($self,$field)=@_;
   $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/]*)$/
-    or return "Illegal (text) $field";
+    or return "Illegal (text) $field: ". $self->getfield($field);
   $self->setfield($field,$1);
   '';
 }
@@ -657,7 +657,8 @@ an error, returns the error, otherwise returns false.
 sub ut_alpha {
   my($self,$field)=@_;
   $self->getfield($field) =~ /^(\w+)$/
-    or return "Illegal or empty (alphanumeric) $field!";
+    or return "Illegal or empty (alphanumeric) $field: ".
+              $self->getfield($field);
   $self->setfield($field,$1);
   '';
 }
@@ -672,7 +673,7 @@ error, returns the error, otherwise returns false.
 sub ut_alphan {
   my($self,$field)=@_;
   $self->getfield($field) =~ /^(\w*)$/ 
-    or return "Illegal (alphanumeric) $field!";
+    or return "Illegal (alphanumeric) $field: ". $self->getfield($field);
   $self->setfield($field,$1);
   '';
 }
@@ -692,7 +693,7 @@ sub ut_phonen {
   } else {
     $phonen =~ s/\D//g;
     $phonen =~ /^(\d{3})(\d{3})(\d{4})(\d*)$/
-      or return "Illegal (phone) $field!";
+      or return "Illegal (phone) $field: ". $self->getfield($field);
     $phonen = "$1-$2-$3";
     $phonen .= " x$4" if $4;
     $self->setfield($field,$phonen);
@@ -708,7 +709,8 @@ Untaints arbitrary data.  Be careful.
 
 sub ut_anything {
   my($self,$field)=@_;
-  $self->getfield($field) =~ /^(.*)$/ or return "Illegal $field!";
+  $self->getfield($field) =~ /^(.*)$/
+    or return "Illegal $field: ". $self->getfield($field);
   $self->setfield($field,$1);
   '';
 }
@@ -823,7 +825,7 @@ sub hfields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.15 1999-04-08 12:08:59 ivan Exp $
+$Id: Record.pm,v 1.16 1999-04-10 07:03:38 ivan Exp $
 
 =head1 BUGS
 
@@ -945,7 +947,10 @@ added pod documentation ivan@sisd.com 98-sep-6
 ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
 $Log: Record.pm,v $
-Revision 1.15  1999-04-08 12:08:59  ivan
+Revision 1.16  1999-04-10 07:03:38  ivan
+return the value with ut_* error messages, to assist in debugging
+
+Revision 1.15  1999/04/08 12:08:59  ivan
 fix up PostgreSQL money fields so you can actually use them as numbers.  bah.
 
 Revision 1.14  1999/04/07 14:58:31  ivan
-- 
cgit v1.2.1


From 3268e924e5c041114349d0dcda0039d04034d96d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 10 Apr 1999 07:38:06 +0000
Subject: _all_ check stuff with illegal data return the bad data too, to help
 debugging

---
 site_perl/cust_main.pm | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index fa1dc29a0..10df79015 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -233,7 +233,8 @@ sub check {
     or return "Illegal last name: ". $self->getfield('last');
   $self->setfield('last',$1);
 
-  $self->first =~ /^([\w \,\.\-\']+)$/ or return "Illegal first name";
+  $self->first =~ /^([\w \,\.\-\']+)$/
+    or return "Illegal first name: ". $self->first;
   $self->first($1);
 
   if ( $self->ss eq '' ) {
@@ -242,11 +243,11 @@ sub check {
     my $ss = $self->ss;
     $ss =~ s/\D//g;
     $ss =~ /^(\d{3})(\d{2})(\d{4})$/
-      or return "Illegal social security number";
+      or return "Illegal social security number: ". $self->ss;
     $self->ss("$1-$2-$3");
   }
 
-  $self->country =~ /^(\w\w)$/ or return "Illegal country";
+  $self->country =~ /^(\w\w)$/ or return "Illegal country: ". $self->country;
   $self->country($1);
   unless ( qsearchs('cust_main_county', {
     'country' => $self->country,
@@ -261,10 +262,12 @@ sub check {
       } );
   }
 
-  $self->zip =~ /^\s*(\w[\w\-\s]{3,8}\w)\s*$/ or return "Illegal zip";
+  $self->zip =~ /^\s*(\w[\w\-\s]{3,8}\w)\s*$/
+    or return "Illegal zip: ". $self->zip;
   $self->zip($1);
 
-  $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby: ". $self->payby;
+  $self->payby =~ /^(CARD|BILL|COMP)$/
+    or return "Illegal payby: ". $self->payby;
   $self->payby($1);
 
   if ( $self->payby eq 'CARD' ) {
@@ -272,21 +275,22 @@ sub check {
     my $payinfo = $self->payinfo;
     $payinfo =~ s/\D//g;
     $payinfo =~ /^(\d{13,16})$/
-      or return "Illegal credit card number";
+      or return "Illegal credit card number: ". $self->payinfo;
     $payinfo = $1;
     $self->payinfo($payinfo);
-    validate($payinfo) or return "Illegal credit card number";
+    validate($payinfo)
+      or return "Illegal credit card number: ". $self->payinfo;
     return "Unknown card type" if cardtype($self->payinfo) eq "Unknown";
 
   } elsif ( $self->payby eq 'BILL' ) {
 
     $error = $self->ut_textn('payinfo');
-    return "Illegal P.O. number" if $error;
+    return "Illegal P.O. number: ". $self->payinfo if $error;
 
   } elsif ( $self->payby eq 'COMP' ) {
 
     $error = $self->ut_textn('payinfo');
-    return "Illegal comp account issuer" if $error;
+    return "Illegal comp account issuer: ". $self->payinfo if $error;
 
   }
 
@@ -295,7 +299,7 @@ sub check {
     $self->paydate('');
   } else {
     $self->paydate =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/
-      or return "Illegal expiration date";
+      or return "Illegal expiration date: ". $self->paydate;
     if ( length($2) == 4 ) {
       $self->paydate("$2-$1-01");
     } elsif ( $2 > 97 ) { #should pry change to check for "this year"
@@ -309,11 +313,11 @@ sub check {
     $self->payname( $self->first. " ". $self->getfield('last') );
   } else {
     $self->payname =~ /^([\w \,\.\-\']+)$/
-      or return "Illegal billing name";
+      or return "Illegal billing name: ". $self->payname;
     $self->payname($1);
   }
 
-  $self->tax =~ /^(Y?)$/ or return "Illegal tax";
+  $self->tax =~ /^(Y?)$/ or return "Illegal tax: ". $self->tax;
   $self->tax($1);
 
   $self->otaker(getotaker);
@@ -881,7 +885,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.18 1999-04-10 06:54:11 ivan Exp $
+$Id: cust_main.pm,v 1.19 1999-04-10 07:38:06 ivan Exp $
 
 =head1 BUGS
 
@@ -937,7 +941,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.18  1999-04-10 06:54:11  ivan
+Revision 1.19  1999-04-10 07:38:06  ivan
+_all_ check stuff with illegal data return the bad data too, to help debugging
+
+Revision 1.18  1999/04/10 06:54:11  ivan
 ditto
 
 Revision 1.17  1999/04/10 05:27:38  ivan
-- 
cgit v1.2.1


From 315d063dbcc86d90a523db155012da8fcacb2b0d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 10 Apr 1999 08:35:14 +0000
Subject: say what the unknown state/county/country are!

---
 site_perl/cust_main.pm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index 10df79015..7dba86a7a 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -253,8 +253,8 @@ sub check {
     'country' => $self->country,
     'state'   => '',
    } ) ) {
-    return "Unknown state/county/country"
-      #" state ". $self->state. " county ". $self->county. " country ". $self->country
+    return "Unknown state/county/country: ".
+      $self->state. "/". $self->county. "/". $self->country
       unless qsearchs('cust_main_county',{
         'state'   => $self->state,
         'county'  => $self->county,
@@ -885,7 +885,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.19 1999-04-10 07:38:06 ivan Exp $
+$Id: cust_main.pm,v 1.20 1999-04-10 08:35:14 ivan Exp $
 
 =head1 BUGS
 
@@ -941,7 +941,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.19  1999-04-10 07:38:06  ivan
+Revision 1.20  1999-04-10 08:35:14  ivan
+say what the unknown state/county/country are!
+
+Revision 1.19  1999/04/10 07:38:06  ivan
 _all_ check stuff with illegal data return the bad data too, to help debugging
 
 Revision 1.18  1999/04/10 06:54:11  ivan
-- 
cgit v1.2.1


From 6a5ebc353a96181fbef6bf4bbfcc5c205f1ef15d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Apr 1999 21:09:39 +0000
Subject: force username to lowercase

---
 site_perl/UID.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/site_perl/UID.pm b/site_perl/UID.pm
index b4486c1e8..f7338202e 100644
--- a/site_perl/UID.pm
+++ b/site_perl/UID.pm
@@ -170,7 +170,7 @@ sub cgisetotaker {
   } else {
     die "fatal: Can't get REMOTE_USER!";
   }
-  return $user;
+  lc($user);
 }
 
 =item checkeuid
@@ -241,7 +241,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.8 1999-02-23 07:23:23 ivan Exp $
+$Id: UID.pm,v 1.9 1999-04-12 21:09:39 ivan Exp $
 
 =head1 BUGS
 
@@ -287,7 +287,10 @@ inlined suidsetup
 ivan@sisd.com 98-sep-12
 
 $Log: UID.pm,v $
-Revision 1.8  1999-02-23 07:23:23  ivan
+Revision 1.9  1999-04-12 21:09:39  ivan
+force username to lowercase
+
+Revision 1.8  1999/02/23 07:23:23  ivan
 oops, don't comment out &swapuid in &adminsuidsetup!
 
 Revision 1.7  1999/01/18 09:22:40  ivan
-- 
cgit v1.2.1


From 8f4617e35f89b741b8ab5ba9136667b4c877d992 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Apr 1999 22:41:09 +0000
Subject: bugfix; $user is a global (yuck)

---
 site_perl/UID.pm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/site_perl/UID.pm b/site_perl/UID.pm
index f7338202e..ad7c89dd5 100644
--- a/site_perl/UID.pm
+++ b/site_perl/UID.pm
@@ -164,13 +164,13 @@ object.  Support for CGI::Base and derived classes is depriciated.
 sub cgisetotaker {
   if ( $cgi && $cgi->isa('CGI::Base') && defined $cgi->var('REMOTE_USER')) {
     carp "Use of CGI::Base is depriciated";
-    $user = $cgi->var('REMOTE_USER');
+    $user = lc ( $cgi->var('REMOTE_USER') );
   } elsif ( $cgi && $cgi->isa('CGI') && defined $cgi->remote_user ) {
-    $user = $cgi->remote_user;
+    $user = lc ( $cgi->remote_user );
   } else {
     die "fatal: Can't get REMOTE_USER!";
   }
-  lc($user);
+  $user;
 }
 
 =item checkeuid
@@ -241,7 +241,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.9 1999-04-12 21:09:39 ivan Exp $
+$Id: UID.pm,v 1.10 1999-04-12 22:41:09 ivan Exp $
 
 =head1 BUGS
 
@@ -287,7 +287,10 @@ inlined suidsetup
 ivan@sisd.com 98-sep-12
 
 $Log: UID.pm,v $
-Revision 1.9  1999-04-12 21:09:39  ivan
+Revision 1.10  1999-04-12 22:41:09  ivan
+bugfix; $user is a global (yuck)
+
+Revision 1.9  1999/04/12 21:09:39  ivan
 force username to lowercase
 
 Revision 1.8  1999/02/23 07:23:23  ivan
-- 
cgit v1.2.1


From 6acd692c933d5d47459114b400e04c5a3675335b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 Apr 1999 01:03:01 +0000
Subject: oops, in 1.2 tree, can't do searches until [cgi|admin]suidsetup, bug
 is hidden by mod_perl persistance

---
 htdocs/edit/cust_pkg.cgi | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/htdocs/edit/cust_pkg.cgi b/htdocs/edit/cust_pkg.cgi
index 8906a9441..766aa60ac 100755
--- a/htdocs/edit/cust_pkg.cgi
+++ b/htdocs/edit/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.6 1999-02-28 00:03:36 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.7 1999-04-14 01:03:01 ivan Exp $
 #
 # this is for changing packages around, not editing things within the package
 #
@@ -23,7 +23,11 @@
 # 98-jun-1
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.6  1999-02-28 00:03:36  ivan
+# Revision 1.7  1999-04-14 01:03:01  ivan
+# oops, in 1.2 tree, can't do searches until [cgi|admin]suidsetup,
+# bug is hidden by mod_perl persistance
+#
+# Revision 1.6  1999/02/28 00:03:36  ivan
 # removed misleading comments
 #
 # Revision 1.5  1999/02/07 09:59:18  ivan
@@ -52,14 +56,16 @@ use FS::CGI qw(header popurl);
 use FS::part_pkg;
 use FS::type_pkgs;
 
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+%pkg = ();
+%comment = ();
 foreach (qsearch('part_pkg', {})) {
   $pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
   $comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
 }
 
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
 if ( $cgi->param('error') ) {
   $custnum = $cgi->param('custnum');
   %remove_pkg = map { $_ => 1 } $cgi->param('remove_pkg');
-- 
cgit v1.2.1


From a4cdd045fcb3edab2b49d5603e02ce5683a778af Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 Apr 1999 07:47:53 +0000
Subject: i18n fixes

---
 htdocs/edit/cust_main.cgi         | 22 ++++++++++++++--------
 htdocs/edit/process/cust_main.cgi | 10 +++++++---
 site_perl/cust_main.pm            |  9 ++++++---
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index d144beba6..813c4b54f 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.13 1999-04-09 03:52:55 ivan Exp $
+# $Id: cust_main.cgi,v 1.14 1999-04-14 07:47:53 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.13  1999-04-09 03:52:55  ivan
+# Revision 1.14  1999-04-14 07:47:53  ivan
+# i18n fixes
+#
+# Revision 1.13  1999/04/09 03:52:55  ivan
 # explicit & for table/itable/ntable
 #
 # Revision 1.12  1999/04/06 11:16:16  ivan
@@ -115,9 +118,12 @@ if ( $cgi->param('error') ) {
     map { $_, scalar($cgi->param($_)) } fields('cust_main')
   } );
   $custnum = $cust_main->custnum;
-  $pkgpart = $cgi->param('pkgpart_svcpart');
-  $pkgpart =~ /^(\d+)_/;
-  $pkgpart = $1;
+  $pkgpart = $cgi->param('pkgpart_svcpart') || '';
+  if ( $pkgpart =~ /^(\d+)_/ ) {
+    $pkgpart = $1;
+  } else {
+    $pkgpart = '';
+  }
   $username = $cgi->param('username');
   $password = $cgi->param('_password');
   $popnum = $cgi->param('popnum');
@@ -385,9 +391,9 @@ unless ( $custnum ) {
 
     foreach my $part_pkg ( @part_pkg ) {
       print qq!<OPTION VALUE="!,
-              $part_pkg->pkgpart. "_". $pkgpart{ $part_pkg->pkgpart }, '"',
-            " SELECTED"x($part_pkg->pkgpart == $pkgpart),
-            ">", $part_pkg->pkg, " - ", $part_pkg->comment;
+              $part_pkg->pkgpart. "_". $pkgpart{ $part_pkg->pkgpart }, '"';
+      print " SELECTED" if $pkgpart && ( $part_pkg->pkgpart == $pkgpart );
+      print ">", $part_pkg->pkg, " - ", $part_pkg->comment;
     }
     print "</SELECT></TD></TR>";
 
diff --git a/htdocs/edit/process/cust_main.cgi b/htdocs/edit/process/cust_main.cgi
index 729bed7c4..a66432ad1 100755
--- a/htdocs/edit/process/cust_main.cgi
+++ b/htdocs/edit/process/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.9 1999-04-07 15:22:19 ivan Exp $
+# $Id: cust_main.cgi,v 1.10 1999-04-14 07:47:53 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -20,7 +20,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.9  1999-04-07 15:22:19  ivan
+# Revision 1.10  1999-04-14 07:47:53  ivan
+# i18n fixes
+#
+# Revision 1.9  1999/04/07 15:22:19  ivan
 # don't use anchor in redirect
 #
 # Revision 1.8  1999/03/25 13:55:10  ivan
@@ -68,7 +71,8 @@ $cgi->param('tax','') unless defined($cgi->param('tax'));
 
 $cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
 
-$cgi->param('state') =~ /^(\w+)( \((\w+)\))? \/ (\w+)$/;
+$cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
+  or die "Oops, illegal \"state\" param: ". $cgi->param('state');
 $cgi->param('state', $1);
 $cgi->param('county', $3 || '');
 $cgi->param('country', $4);
diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index 7dba86a7a..7bdbc08ac 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -216,7 +216,7 @@ sub check {
     || $self->ut_textn('address2')
     || $self->ut_text('city')
     || $self->ut_textn('county')
-    || $self->ut_text('state')
+    || $self->ut_textn('state')
     || $self->ut_phonen('daytime')
     || $self->ut_phonen('night')
     || $self->ut_phonen('fax')
@@ -885,7 +885,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.20 1999-04-10 08:35:14 ivan Exp $
+$Id: cust_main.pm,v 1.21 1999-04-14 07:47:53 ivan Exp $
 
 =head1 BUGS
 
@@ -941,7 +941,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.20  1999-04-10 08:35:14  ivan
+Revision 1.21  1999-04-14 07:47:53  ivan
+i18n fixes
+
+Revision 1.20  1999/04/10 08:35:14  ivan
 say what the unknown state/county/country are!
 
 Revision 1.19  1999/04/10 07:38:06  ivan
-- 
cgit v1.2.1


From ce11defad5298448b5c62c7e40fa1d0351f2af8a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 Apr 1999 07:58:39 +0000
Subject: export getsecrets from FS::UID instead of calling it explicitly

---
 bin/fs-setup     | 11 +++++++----
 site_perl/UID.pm |  9 ++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index b7d4a1889..d21b41d3d 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.16 1999-02-28 19:44:16 ivan Exp $
+# $Id: fs-setup,v 1.17 1999-04-14 07:58:39 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.16  1999-02-28 19:44:16  ivan
+# Revision 1.17  1999-04-14 07:58:39  ivan
+# export getsecrets from FS::UID instead of calling it explicitly
+#
+# Revision 1.16  1999/02/28 19:44:16  ivan
 # constructors s/create/new/ pointed out by "Bao C. Ha" <bao@hacom.net>
 #
 # Revision 1.15  1999/02/27 21:06:21  ivan
@@ -82,14 +85,14 @@ BEGIN { $FS::Record::setup_hack = 1; }
 use strict;
 use DBI;
 use FS::dbdef;
-use FS::UID qw(adminsuidsetup datasrc checkeuid);
+use FS::UID qw(adminsuidsetup datasrc checkeuid getsecrets);
 use FS::Record;
 use FS::cust_main_county;
 
 die "Not running uid freeside!" unless checkeuid();
 
 my $user = shift or die &usage;
-FS::UID::getsecrets $user;
+getsecrets($user);
 
 #needs to match FS::Record
 my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;
diff --git a/site_perl/UID.pm b/site_perl/UID.pm
index ad7c89dd5..889ccb65f 100644
--- a/site_perl/UID.pm
+++ b/site_perl/UID.pm
@@ -15,7 +15,7 @@ use FS::Conf;
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(checkeuid checkruid swapuid cgisuidsetup
-                adminsuidsetup getotaker dbh datasrc);
+                adminsuidsetup getotaker dbh datasrc getsecrets );
 
 $freeside_uid = scalar(getpwnam('freeside'));
 
@@ -241,7 +241,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.10 1999-04-12 22:41:09 ivan Exp $
+$Id: UID.pm,v 1.11 1999-04-14 07:58:39 ivan Exp $
 
 =head1 BUGS
 
@@ -287,7 +287,10 @@ inlined suidsetup
 ivan@sisd.com 98-sep-12
 
 $Log: UID.pm,v $
-Revision 1.10  1999-04-12 22:41:09  ivan
+Revision 1.11  1999-04-14 07:58:39  ivan
+export getsecrets from FS::UID instead of calling it explicitly
+
+Revision 1.10  1999/04/12 22:41:09  ivan
 bugfix; $user is a global (yuck)
 
 Revision 1.9  1999/04/12 21:09:39  ivan
-- 
cgit v1.2.1


From 65c463c724448543666035f3ec967a0c14be8960 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 Apr 1999 08:58:59 +0000
Subject: *** empty log message ***

---
 TODO | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 6d57aa09c..f6eaf5ed1 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.27 1999-04-09 03:52:16 ivan Exp $
+$Id: TODO,v 1.28 1999-04-14 08:58:59 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,17 @@ duplication of effort.
 
 ---
 
+hmm... maybe svc_acct__shell should check off the legal shells list if
+applicable?  yeah... cool.
+
+payinfo field should me much larger than 16
+
+default (and ordering) state/county/country config file
+
+[Mon Apr 12 20:31:21 1999] [error] [Mon Apr 12 20:31:21 1999] null: Error closing true: Broken pipe at /usr/local/lib/site_perl/FS/cust_main.pm line 615.
+
+configuration option to show passwords
+
 javascript (yuck!) "are you sure?" confirmation on cancelations, etc.
 (view/cust_pkg and view/svc_*)
 
-- 
cgit v1.2.1


From 7d291d850717fadb1ccd23fe470d033414650402 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 Apr 1999 11:20:21 +0000
Subject: visual fix

---
 htdocs/search/svc_acct.cgi | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/htdocs/search/svc_acct.cgi b/htdocs/search/svc_acct.cgi
index 96ddf957a..4bc791225 100755
--- a/htdocs/search/svc_acct.cgi
+++ b/htdocs/search/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.9 1999-04-10 01:53:18 ivan Exp $
+# $Id: svc_acct.cgi,v 1.10 1999-04-14 11:20:21 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
@@ -23,7 +23,10 @@
 # give service and customer info too ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.9  1999-04-10 01:53:18  ivan
+# Revision 1.10  1999-04-14 11:20:21  ivan
+# visual fix
+#
+# Revision 1.9  1999/04/10 01:53:18  ivan
 # oops, search usernames limited to 8 chars
 #
 # Revision 1.8  1999/04/09 23:43:29  ivan
@@ -56,7 +59,7 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header eidiot popurl);
+use FS::CGI qw(header eidiot popurl table);
 use FS::svc_acct;
 use FS::cust_main;
 
@@ -106,17 +109,19 @@ if ( scalar(@svc_acct) == 1 ) {
   eidiot("Account not found");
 } else {
   my($total)=scalar(@svc_acct);
-  print $cgi->header( '-expires' => 'now' ), header("Account Search Results",''), <<END;
+  print $cgi->header( '-expires' => 'now' ),
+        header("Account Search Results",''),
+        "$total matching accounts found",
+        &table(), <<END;
     $total matching accounts found
-    <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
       <TR>
-        <TH>Service #</TH>
-        <TH>Username</TH>
-        <TH>UID</TH>
-        <TH>Service</TH>
-        <TH>Customer #</TH>
-        <TH>Contact name</TH>
-        <TH>Company</TH>
+        <TH><FONT SIZE=-1>Service #</FONT></TH>
+        <TH><FONT SIZE=-1>Username</FONT></TH>
+        <TH><FONT SIZE=-1>UID</FONT></TH>
+        <TH><FONT SIZE=-1>Service</FONT></TH>
+        <TH><FONT SIZE=-1>Customer #</FONT></TH>
+        <TH><FONT SIZE=-1>Contact name</FONT></TH>
+        <TH><FONT SIZE=-1>Company</FONT></TH>
       </TR>
 END
 
@@ -155,8 +160,8 @@ END
     print <<END;
     <TR>
       <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
-      <TD><FONT SIZE=-1>$username</FONT></TD>
-      <TD><FONT SIZE=-1>$uid</FONT></TD>
+      <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$username</FONT></A></TD>
+      <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$uid</FONT></A></TD>
       <TD><FONT SIZE=-1>$svc</FONT></TH>
       <TD><FONT SIZE=-1>$pcustnum</FONT></TH>
       <TD><FONT SIZE=-1>$pname<FONT></TH>
-- 
cgit v1.2.1


From 5768ff6007bc4b4089f411e5fb9a26b9b00ec6da Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 Apr 1999 11:25:33 +0000
Subject: *** empty log message ***

---
 htdocs/search/svc_acct.cgi | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/search/svc_acct.cgi b/htdocs/search/svc_acct.cgi
index 4bc791225..850865789 100755
--- a/htdocs/search/svc_acct.cgi
+++ b/htdocs/search/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.10 1999-04-14 11:20:21 ivan Exp $
+# $Id: svc_acct.cgi,v 1.11 1999-04-14 11:25:33 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
@@ -23,7 +23,10 @@
 # give service and customer info too ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.10  1999-04-14 11:20:21  ivan
+# Revision 1.11  1999-04-14 11:25:33  ivan
+# *** empty log message ***
+#
+# Revision 1.10  1999/04/14 11:20:21  ivan
 # visual fix
 #
 # Revision 1.9  1999/04/10 01:53:18  ivan
@@ -113,7 +116,6 @@ if ( scalar(@svc_acct) == 1 ) {
         header("Account Search Results",''),
         "$total matching accounts found",
         &table(), <<END;
-    $total matching accounts found
       <TR>
         <TH><FONT SIZE=-1>Service #</FONT></TH>
         <TH><FONT SIZE=-1>Username</FONT></TH>
-- 
cgit v1.2.1


From 6c44581c70239fcf331b072bbfb4b2e08ef04166 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 Apr 1999 11:27:06 +0000
Subject: showpasswords config option to show passwords

---
 TODO                     |  4 +---
 htdocs/docs/config.html  |  1 +
 htdocs/edit/svc_acct.cgi | 23 ++++++++++++++++-------
 htdocs/view/svc_acct.cgi | 23 +++++++++++++++++------
 4 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/TODO b/TODO
index f6eaf5ed1..114e010ae 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.28 1999-04-14 08:58:59 ivan Exp $
+$Id: TODO,v 1.29 1999-04-14 11:27:06 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -15,8 +15,6 @@ default (and ordering) state/county/country config file
 
 [Mon Apr 12 20:31:21 1999] [error] [Mon Apr 12 20:31:21 1999] null: Error closing true: Broken pipe at /usr/local/lib/site_perl/FS/cust_main.pm line 615.
 
-configuration option to show passwords
-
 javascript (yuck!) "are you sure?" confirmation on cancelations, etc.
 (view/cust_pkg and view/svc_*)
 
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index 1a30b525e..6937f48b0 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -48,6 +48,7 @@ All further configuration files and directories are located in
   <li>shellmachine - A single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines', it also enables `.qmail-extension' file maintenance.
   <li>shellmachines - Your Linux and System V flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/shadow' files.
   <li>shells - Legal shells (think /etc/shells).  You probably want to `cut -d: -f7 /etc/passwd | sort | uniq' initially so that importing doesn't fail with `Illegal shell' errors, then remove any special entries afterwords.  A blank line specifies that an empty shell is permitted.
+  <li>showpasswords - The existance of this file will allow unencrypted user passwords to be displayed.
   <li>smtpmachine - SMTP relay for Freeside's outgoing mail.
 </ul>
 </body>
diff --git a/htdocs/edit/svc_acct.cgi b/htdocs/edit/svc_acct.cgi
index a8c4cfb39..963bc1edf 100755
--- a/htdocs/edit/svc_acct.cgi
+++ b/htdocs/edit/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.9 1999-02-28 00:03:37 ivan Exp $
+# $Id: svc_acct.cgi,v 1.10 1999-04-14 11:27:06 ivan Exp $
 #
 # Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -16,7 +16,10 @@
 # use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.9  1999-02-28 00:03:37  ivan
+# Revision 1.10  1999-04-14 11:27:06  ivan
+# showpasswords config option to show passwords
+#
+# Revision 1.9  1999/02/28 00:03:37  ivan
 # removed misleading comments
 #
 # Revision 1.8  1999/02/23 08:09:22  ivan
@@ -121,10 +124,16 @@ $svc = $part_svc->getfield('svc');
 
 $otaker = getotaker;
 
-($username,$password)=(
-  $svc_acct->username,
-  $svc_acct->_password ? "*HIDDEN*" : '',
-);
+$username = $svc_acct->username;
+if ( $svc_acct->_password ) {
+  if ( $conf->exists('showpasswords') ) {
+    $password = $svc_acct->_password;
+  } else {
+    $password = "*HIDDEN*";
+  }
+} else {
+  $password = '';
+}
 
 $ulen = $svc_acct->dbdef_table->column('username')->length;
 $ulen2 = $ulen+2;
@@ -208,7 +217,7 @@ if ( $part_svc->svc_acct__slipip_flag eq "F" ) {
 }
 
 #submit
-print qq!<P><CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>!; 
+print qq!<P><INPUT TYPE="submit" VALUE="Submit">!; 
 
 print <<END;
     </FORM>
diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi
index a191c25dd..e203c7ec0 100755
--- a/htdocs/view/svc_acct.cgi
+++ b/htdocs/view/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.9 1999-04-08 12:00:19 ivan Exp $
+# $Id: svc_acct.cgi,v 1.10 1999-04-14 11:27:06 ivan Exp $
 #
 # Usage: svc_acct.cgi svcnum
 #        http://server.name/path/svc_acct.cgi?svcnum
@@ -33,7 +33,10 @@
 # displays arbitrary radius attributes ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.9  1999-04-08 12:00:19  ivan
+# Revision 1.10  1999-04-14 11:27:06  ivan
+# showpasswords config option to show passwords
+#
+# Revision 1.9  1999/04/08 12:00:19  ivan
 # aesthetic update
 #
 # Revision 1.8  1999/02/28 00:04:02  ivan
@@ -62,7 +65,7 @@
 
 use strict;
 use vars qw( $conf $cgi $mydomain $query $svcnum $svc_acct $cust_svc $pkgnum
-             $cust_pkg $custnum $part_svc $p $svc_acct_pop );
+             $cust_pkg $custnum $part_svc $p $svc_acct_pop $password );
 use CGI;
 use CGI::Carp qw( fatalsToBrowser );
 use FS::UID qw( cgisuidsetup );
@@ -119,11 +122,19 @@ print qq!<A HREF="${p}edit/svc_acct.cgi?$svcnum">Edit this information</A>!,
       "<BR>Service: <B>", $part_svc->svc, "</B>",
       "<BR><BR>Username: <B>", $svc_acct->username, "</B>"
 ;
-if (substr($svc_acct->_password,0,1) eq "*") {
-  print "<BR>Password: <I>(Login disabled)</I>";
+
+print "<BR>Password: ";
+$password = $svc_acct->_password;
+if ( $password =~ /^\*\w+\* (.*)$/ ) {
+  $password = $1;
+  print "<I>(login disabled)</I> ";
+}
+if ( $conf->exists('showpasswords') ) {
+  print "<B>$password</B>";
 } else {
-  print "<BR>Password: <I>(hidden)</I>";
+  print "<I>(hidden)</I>";
 }
+$password = '';
 
 $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
 print "<BR>POP: <B>", $svc_acct_pop->city, ", ", $svc_acct_pop->state,
-- 
cgit v1.2.1


From ff9083f7660a3397d73377efec15feff432d5958 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 Apr 1999 13:14:54 +0000
Subject: configuration option to edit referrals of existing customers

---
 TODO                      |  9 +++++++--
 htdocs/docs/config.html   |  1 +
 htdocs/edit/cust_main.cgi | 13 +++++++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/TODO b/TODO
index 114e010ae..5dbfab256 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.29 1999-04-14 11:27:06 ivan Exp $
+$Id: TODO,v 1.30 1999-04-14 13:14:54 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,12 +6,17 @@ duplication of effort.
 
 ---
 
+default (and ordering) state/county/country config file
+expand the
+cust_main_county table to provide a preferred ordering, so the most common
+entries would be at the top of the selection box.  automatically, based on
+recent selections?
+
 hmm... maybe svc_acct__shell should check off the legal shells list if
 applicable?  yeah... cool.
 
 payinfo field should me much larger than 16
 
-default (and ordering) state/county/country config file
 
 [Mon Apr 12 20:31:21 1999] [error] [Mon Apr 12 20:31:21 1999] null: Error closing true: Broken pipe at /usr/local/lib/site_perl/FS/cust_main.pm line 615.
 
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index 6937f48b0..fba745af2 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -26,6 +26,7 @@ All further configuration files and directories are located in
   <li>cybercash2 - <a href="http://www.cybercash.com/cybercash/services/cashreg214.html">CyberCash v2</a> support, four lines: paymentserverhost, paymentserverport, paymentserversecret, and transaction type (`mauthonly' or `mauthcapture').  CCLib.pm is required.
   <li>cybercash3.2 - <a href="http://www.cybercash.com/cybercash/services/technology.html">CyberCash v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly' or `mauthcapture').  CCMckLib3_2.pm, CCMckDirectLib3_2.pm and CCMckErrno3_2 are required.
   <li>domain - Your domain name.
+  <li>editreferrals - The existance of this file will allow you to change the referral of existing customers.
   <li>erpcdmachines - Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd' and `/usr/annex/acp_dialup'.
   <li>home - For new users, prefixed to usrename to create a directory name.  Should have a leading but not a trailing slash.
   <li>invoice_from - Return address on email invoices.
diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 813c4b54f..51cf0ab1e 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.14 1999-04-14 07:47:53 ivan Exp $
+# $Id: cust_main.cgi,v 1.15 1999-04-14 13:14:54 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.14  1999-04-14 07:47:53  ivan
+# Revision 1.15  1999-04-14 13:14:54  ivan
+# configuration option to edit referrals of existing customers
+#
+# Revision 1.14  1999/04/14 07:47:53  ivan
 # i18n fixes
 #
 # Revision 1.13  1999/04/09 03:52:55  ivan
@@ -111,6 +114,8 @@ use FS::cust_main_county;
 $cgi = new CGI;
 cgisuidsetup($cgi);
 
+$conf = new FS::Conf;
+
 #get record
 
 if ( $cgi->param('error') ) {
@@ -185,7 +190,7 @@ if ( scalar(@agents) == 1 ) {
 #referral
 
 $refnum = $cust_main->refnum || 0;
-if ( $custnum ) {
+if ( $custnum && ! $conf->exists('editreferrals') ) {
   print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
 } else {
   my(@referrals) = qsearch('part_referral',{});
@@ -194,7 +199,7 @@ if ( $custnum ) {
     print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
   } else {
     print qq!<BR><BR>${r}Referral <SELECT NAME="refnum" SIZE="1">!;
-    print "<OPTION> ";
+    print "<OPTION> " unless $refnum;
     my($referral);
     foreach $referral (sort {
       $a->refnum <=> $b->refnum;
-- 
cgit v1.2.1


From f779b20addd7e1507b4f521cd462ea4de87ae926 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 15 Apr 1999 13:39:16 +0000
Subject: $cgi->header( '-expires' => 'now' )

---
 htdocs/search/svc_domain.cgi | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/search/svc_domain.cgi b/htdocs/search/svc_domain.cgi
index b366e5724..21a3b751f 100755
--- a/htdocs/search/svc_domain.cgi
+++ b/htdocs/search/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.8 1999-02-28 00:03:57 ivan Exp $
+# $Id: svc_domain.cgi,v 1.9 1999-04-15 13:39:16 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -15,7 +15,10 @@
 # display total, use FS::CGI now does browsing too ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.8  1999-02-28 00:03:57  ivan
+# Revision 1.9  1999-04-15 13:39:16  ivan
+# $cgi->header( '-expires' => 'now' )
+#
+# Revision 1.8  1999/02/28 00:03:57  ivan
 # removed misleading comments
 #
 # Revision 1.7  1999/02/23 08:09:24  ivan
@@ -89,7 +92,8 @@ if ( scalar(@svc_domain) == 1 ) {
 } else {
 
   my($total)=scalar(@svc_domain);
-  print $cgi->header, header("Domain Search Results",''), <<END;
+  print $cgi->header( '-expires' => 'now' ),
+        header("Domain Search Results",''), <<END;
 
     $total matching domains found
     <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
-- 
cgit v1.2.1


From e021cf31d93dbe68342e64ee48444b273bee62f1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 15 Apr 1999 14:09:17 +0000
Subject: get rid of top-level my() variables

---
 htdocs/misc/process/link.cgi | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/htdocs/misc/process/link.cgi b/htdocs/misc/process/link.cgi
index 808299415..eec43cf47 100755
--- a/htdocs/misc/process/link.cgi
+++ b/htdocs/misc/process/link.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: link.cgi,v 1.4 1999-02-07 09:59:35 ivan Exp $
+# $Id: link.cgi,v 1.5 1999-04-15 14:09:17 ivan Exp $
 #
 # ivan@voicenet.com 97-feb-5
 #
@@ -12,7 +12,10 @@
 # can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
 #
 # $Log: link.cgi,v $
-# Revision 1.4  1999-02-07 09:59:35  ivan
+# Revision 1.5  1999-04-15 14:09:17  ivan
+# get rid of top-level my() variables
+#
+# Revision 1.4  1999/02/07 09:59:35  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.3  1999/01/19 05:14:10  ivan
@@ -24,7 +27,7 @@
 #
 
 use strict;
-use vars qw ( $cgi $old $new $error );
+use vars qw ( $cgi $old $new $error $pkgnum $svcpart $svcnum );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::CGI qw(popurl idiot);
@@ -35,10 +38,13 @@ use FS::Record qw(qsearchs);
 $cgi = new CGI;
 cgisuidsetup($cgi);
 
-$cgi->param('pkgnum') =~ /^(\d+)$/; my($pkgnum)=$1;
-$cgi->param('svcpart') =~ /^(\d+)$/; my($svcpart)=$1;
+$cgi->param('pkgnum') =~ /^(\d+)$/;
+$pkgnum = $1;
+$cgi->param('svcpart') =~ /^(\d+)$/;
+$svcpart = $1;
+$cgi->param('svcnum') =~ /^(\d*)$/;
+$svcnum = $1;
 
-$cgi->param('svcnum') =~ /^(\d*)$/; my($svcnum)=$1;
 unless ( $svcnum ) {
   my($part_svc) = qsearchs('part_svc',{'svcpart'=>$svcpart});
   my($svcdb) = $part_svc->getfield('svcdb');
-- 
cgit v1.2.1


From a0cc907f12d2e516ab8806f96ce8b3c142fe008f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 15 Apr 1999 15:22:12 +0000
Subject: make &idiot() work, yuck.

---
 site_perl/CGI.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index 723d7f4ec..3ce53de9b 100644
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -88,7 +88,7 @@ Sends headers and an HTML error message.
 sub idiot {
   #warn "idiot depriciated";
   my($error)=@_;
-  my($cgi)=FS::UID::cgi;
+  my $cgi = &FS::UID::cgi();
   if ( $cgi->isa('CGI::Base') ) {
     no strict 'subs';
     &CGI::Base::SendHeaders;
@@ -216,7 +216,10 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 pod ivan@sisd.com 98-sep-12
 
 $Log: CGI.pm,v $
-Revision 1.17  1999-02-07 09:59:43  ivan
+Revision 1.18  1999-04-15 15:22:12  ivan
+make &idiot() work, yuck.
+
+Revision 1.17  1999/02/07 09:59:43  ivan
 more mod_perl fixes, and bugfixes Peter Wemm sent via email
 
 Revision 1.16  1999/01/25 12:26:05  ivan
-- 
cgit v1.2.1


From ab210fc8d75ee85574c5d4ca345c33190d9d5e2e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 15 Apr 1999 16:44:36 +0000
Subject: delete customers

---
 htdocs/docs/config.html                 |  1 +
 htdocs/misc/delete-customer.cgi         | 58 +++++++++++++++++++++++++++++
 htdocs/misc/process/delete-customer.cgi | 46 +++++++++++++++++++++++
 htdocs/view/cust_main.cgi               | 18 ++++++---
 site_perl/cust_main.pm                  | 65 +++++++++++++++++++++++++++++----
 5 files changed, 175 insertions(+), 13 deletions(-)
 create mode 100755 htdocs/misc/delete-customer.cgi
 create mode 100755 htdocs/misc/process/delete-customer.cgi

diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index fba745af2..7994af8f9 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -25,6 +25,7 @@ All further configuration files and directories are located in
   <li>bsdshellmachines - Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/master.passwd'.
   <li>cybercash2 - <a href="http://www.cybercash.com/cybercash/services/cashreg214.html">CyberCash v2</a> support, four lines: paymentserverhost, paymentserverport, paymentserversecret, and transaction type (`mauthonly' or `mauthcapture').  CCLib.pm is required.
   <li>cybercash3.2 - <a href="http://www.cybercash.com/cybercash/services/technology.html">CyberCash v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly' or `mauthcapture').  CCMckLib3_2.pm, CCMckDirectLib3_2.pm and CCMckErrno3_2 are required.
+  <li>deletecustomers - The existance of this file will enable customer deletions.
   <li>domain - Your domain name.
   <li>editreferrals - The existance of this file will allow you to change the referral of existing customers.
   <li>erpcdmachines - Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd' and `/usr/annex/acp_dialup'.
diff --git a/htdocs/misc/delete-customer.cgi b/htdocs/misc/delete-customer.cgi
new file mode 100755
index 000000000..8addbd657
--- /dev/null
+++ b/htdocs/misc/delete-customer.cgi
@@ -0,0 +1,58 @@
+#!/usr/bin/perl -Tw
+#
+# $Id: delete-customer.cgi,v 1.1 1999-04-15 16:44:36 ivan Exp $
+#
+# $Log: delete-customer.cgi,v $
+# Revision 1.1  1999-04-15 16:44:36  ivan
+# delete customers
+#
+
+use strict;
+use vars qw( $cgi $conf $query $custnum $new_custnum $cust_main );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl);
+use FS::Record qw(qsearch qsearchs);
+use FS::cust_main;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+die "Customer deletions not enabled" unless $conf->exists('deletecustomers');
+
+if ( $cgi->param('error') ) {
+  $custnum = $cgi->param('custnum');
+  $new_custnum = $cgi->param('new_custnum');
+} else {
+  ($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/ or die "Illegal query: $query";
+  $custnum = $1;
+  $new_custnum = '';
+}
+$cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } )
+  or die "Customer not found: $custnum";
+
+print $cgi->header ( '-expires' => 'now' ), header('Delete customer');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print 
+  qq!<form action="!, popurl(1), qq!process/delete-customer.cgi" method=post>!,
+  qq!<input type="hidden" name="custnum" value="$custnum">!;
+
+if ( qsearch('cust_pkg', { 'custnum' => $custnum, 'cancel' => '' } ) ) {
+  print "Move uncancelled packages to customer number ",
+        qq!<input type="text" name="new_custnum" value="$new_custnum"><br><br>!;
+}
+
+print <<END;
+This will <b>completely remove</b> all traces of this customer record.
+<br>Are you <b>absolutely sure</b> you want to delete this customer?
+<br><input type="submit" value="Yes">
+</form></body></html>
+END
+
diff --git a/htdocs/misc/process/delete-customer.cgi b/htdocs/misc/process/delete-customer.cgi
new file mode 100755
index 000000000..0a939c559
--- /dev/null
+++ b/htdocs/misc/process/delete-customer.cgi
@@ -0,0 +1,46 @@
+#!/usr/bin/perl -Tw
+#
+# $Id: delete-customer.cgi,v 1.1 1999-04-15 16:44:36 ivan Exp $
+#
+# $Log: delete-customer.cgi,v $
+# Revision 1.1  1999-04-15 16:44:36  ivan
+# delete customers
+#
+
+use strict;
+use vars qw ( $cgi $conf $custnum $new_custnum $cust_main $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+use FS::CGI qw(popurl);
+use FS::cust_main;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+die "Customer deletions not enabled" unless $conf->exists('deletecustomers');
+
+$cgi->param('custnum') =~ /^(\d+)$/;
+$custnum = $1;
+if ( $cgi->param('new_custnum') ) {
+  $cgi->param('new_custnum') =~ /^(\d+)$/
+    or die "Illegal new customer number: ". $cgi->param('new_custnum');
+  $new_custnum = $1;
+} else {
+  $new_custnum = '';
+}
+$cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } )
+  or die "Customer not found: $custnum";
+
+$error = $cust_main->delete($new_custnum);
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "delete-customer.cgi?". $cgi->query_string );
+} elsif ( $new_custnum ) {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$new_custnum");
+} else {
+  print $cgi->redirect(popurl(3));
+}
diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index 6f6c33540..de9ff7f89 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.16 1999-04-09 04:22:34 ivan Exp $
+# $Id: cust_main.cgi,v 1.17 1999-04-15 16:44:36 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -31,7 +31,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.16  1999-04-09 04:22:34  ivan
+# Revision 1.17  1999-04-15 16:44:36  ivan
+# delete customers
+#
+# Revision 1.16  1999/04/09 04:22:34  ivan
 # also table()
 #
 # Revision 1.15  1999/04/09 03:52:55  ivan
@@ -82,7 +85,7 @@
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
               @packages $package @history @bills $bill @credits $credit
-              $balance $item @agents @referrals @invoicing_list $n1 ); 
+              $balance $item @agents @referrals @invoicing_list $n1 $conf ); 
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use Date::Format;
@@ -102,6 +105,8 @@ use FS::cust_refund;
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
+$conf = new FS::Conf;
+
 print $cgi->header( '-expires' => 'now' ), header("Customer View", menubar(
   'Main Menu' => popurl(2)
 ));
@@ -117,8 +122,11 @@ $hashref = $cust_main->hashref;
 print &itable(), '<TR><TD><A NAME="cust_main"></A>';
 
 print qq!<A HREF="!, popurl(2), 
-      qq!edit/cust_main.cgi?$custnum">Edit this customer</A>!,
-      &ntable("#c0c0c0"), "<TR><TD>", &ntable("#c0c0c0",2),
+      qq!edit/cust_main.cgi?$custnum">Edit this customer</A>!;
+print qq! | <A HREF="!, popurl(2), 
+      qq!misc/delete-customer.cgi?$custnum"> Delete this customer</A>!
+  if $conf->exists('deletecustomers');
+print &ntable("#c0c0c0"), "<TR><TD>", &ntable("#c0c0c0",2),
       '<TR><TD ALIGN="right">Customer number</TD><TD BGCOLOR="#ffffff">',
       $custnum, '</TD></TR>',
 ;
diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index 7bdbc08ac..b5cb271f4 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -177,18 +177,61 @@ sub table { 'cust_main'; }
 Adds this customer to the database.  If there is an error, returns the error,
 otherwise returns false.
 
-=item delete
+=item delete NEW_CUSTNUM
 
-Currently unimplemented.  Maybe cancel all of this customer's
-packages (cust_pkg)?
+This deletes the customer.  If there is an error, returns the error, otherwise
+returns false.
 
-I don't remove the customer record in the database because there would then
-be no record the customer ever existed (which is bad, no?)
+This will completely remove all traces of the customer record.  This is not
+what you want when a customer cancels service; for that, cancel all of the
+customer's packages (see L<FS::cust_pkg/cancel>).
+
+If the customer has any packages, you need to pass a new (valid) customer
+number for those packages to be transferred to.
+
+You can't delete a customer with invoices (see L<FS::cust_bill>),
+or credits (see L<FS::cust_credit>).
 
 =cut
 
 sub delete {
-   return "Can't (yet?) delete customers.";
+  my $self = shift;
+
+  if ( qsearch( 'cust_bill', { 'custnum' => $self->custnum } ) ) {
+    return "Can't delete a customer with invoices";
+  }
+  if ( qsearch( 'cust_credit', { 'custnum' => $self->custnum } ) ) {
+    return "Can't delete a customer with credits";
+  }
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my @cust_pkg = qsearch( 'cust_pkg', { 'custnum' => $self->custnum } );
+  if ( @cust_pkg ) {
+    my $new_custnum = shift;
+    return "Invalid new customer number: $new_custnum"
+      unless qsearchs( 'cust_main', { 'custnum' => $new_custnum } );
+    foreach my $cust_pkg ( @cust_pkg ) {
+      my %hash = $cust_pkg->hash;
+      $hash{'custnum'} = $new_custnum;
+      my $new_cust_pkg = new FS::cust_pkg ( \%hash );
+      my $error = $new_cust_pkg->replace($cust_pkg);
+      return $error if $error;
+    }
+  }
+  foreach my $cust_main_invoice (
+    qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } )
+  ) {
+    my $error = $cust_main_invoice->delete;
+    return $error if $error;
+  }
+
+  $self->SUPER::delete;
 }
 
 =item replace OLD_RECORD
@@ -885,12 +928,15 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.21 1999-04-14 07:47:53 ivan Exp $
+$Id: cust_main.pm,v 1.22 1999-04-15 16:44:36 ivan Exp $
 
 =head1 BUGS
 
 The delete method.
 
+The delete method should possibly take an FS::cust_main object reference
+instead of a scalar customer number.
+
 Bill and collect options should probably be passed as references instead of a
 list.
 
@@ -941,7 +987,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.21  1999-04-14 07:47:53  ivan
+Revision 1.22  1999-04-15 16:44:36  ivan
+delete customers
+
+Revision 1.21  1999/04/14 07:47:53  ivan
 i18n fixes
 
 Revision 1.20  1999/04/10 08:35:14  ivan
-- 
cgit v1.2.1


From a39a2158c87c105f4cf04d68a02bc44557b5a85a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 15 Apr 1999 22:46:30 +0000
Subject: TT isn't a state!

---
 bin/fs-setup | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index d21b41d3d..ca5e82211 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.17 1999-04-14 07:58:39 ivan Exp $
+# $Id: fs-setup,v 1.18 1999-04-15 22:46:30 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.17  1999-04-14 07:58:39  ivan
+# Revision 1.18  1999-04-15 22:46:30  ivan
+# TT isn't a state!
+#
+# Revision 1.17  1999/04/14 07:58:39  ivan
 # export getsecrets from FS::UID instead of calling it explicitly
 #
 # Revision 1.16  1999/02/28 19:44:16  ivan
@@ -232,7 +235,7 @@ foreach  ($dbdef->tables) {
 foreach ( qw(
 AL AK AS AZ AR CA CO CT DC DE FM FL GA GU HI ID IL IN IA KS KY LA
 ME MH MD MA MI MN MS MO MT NC ND NE NH NJ NM NV NY MP OH OK OR PA PW PR RI 
-SC SD TN TX TT UT VT VI VA WA WV WI WY AE AA AP
+SC SD TN TX UT VT VI VA WA WV WI WY AE AA AP
 ) ) {
   my($cust_main_county)=new FS::cust_main_county({
     'state' => $_,
-- 
cgit v1.2.1


From c96d27c7f346fca4a229b2cb20e253f7f8e578e5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 18 Apr 1999 09:27:34 +0000
Subject: out-dated links, fix from "Greg Kuhnert" <gregk@no1.com.au>

---
 htdocs/docs/install.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 7aaad14ae..7fcd13aeb 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -34,8 +34,8 @@ Before installing, you need:
 Install the Freeside distribution:
 <ul>
   <li>Add the user `freeside' to your system.
-  <li>Add the freeside database to your database engine.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Syntax.html#Create database">MySQL</a>) (with <a href="http://www.postgresql.org/docs/admin/manage-ag.htm#AEN854">PostgreSQL</a>)
-  <li>Allow the freeside user full access to the freeside database.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Privilege_system.html#Privilege system">MySQL</a>) (with <a href="http://www.postgresql.org/docs/admin/newuser.htm">PostgreSQL</a>)
+  <li>Add the freeside database to your database engine.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Syntax.html#Create_database">MySQL</a>) (with <a href="http://www.postgresql.org/docs/admin/manage-ag.htm#AEN854">PostgreSQL</a>)
+  <li>Allow the freeside user full access to the freeside database.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Privilege_system.html#Privilege_system">MySQL</a>) (with <a href="http://www.postgresql.org/docs/admin/newuser.htm">PostgreSQL</a>)
   <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>
   <li>Copy or link fs-x.y.z/site_perl to FS in your site_perl directory.  (try `<code>perl -V</code>' if unsure) <pre>mkdir /usr/local/lib/site_perl/FS
 cp fs-x.y.z/site_perl/* /usr/local/lib/site_perl/FS</pre> or <pre>ln -s /full/path/to/fs-x.y.z/site_perl /usr/local/lib/site_perl/FS</pre>
-- 
cgit v1.2.1


From 8d170c8856aff89704d43ea71224f3602c4e9411 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 19 Apr 1999 10:32:44 +0000
Subject: if you are a megapop customer...

---
 etc/megapop.pl | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100755 etc/megapop.pl

diff --git a/etc/megapop.pl b/etc/megapop.pl
new file mode 100755
index 000000000..b250bcdde
--- /dev/null
+++ b/etc/megapop.pl
@@ -0,0 +1,116 @@
+#!/usr/bin/perl -Tw
+#
+# $Id: megapop.pl,v 1.1 1999-04-19 10:32:44 ivan Exp $
+#
+# this will break when megapop changes the URL or format of their listing page.
+# that's stupid.  perhaps they can provide a machine-readable listing?
+
+use strict;
+use LWP::UserAgent;
+use FS::UID qw(adminsuidsetup);
+use FS::svc_acct_pop;
+
+my $url = "http://www.megapop.com/location.htm";
+
+my $user = shift or die &usage;
+adminsuidsetup($user);
+
+my %state2usps = &state2usps;
+$state2usps{'WASHINGTON STATE'} = 'WA'; #megapop's on crack
+$state2usps{'CANADA'} = 'CANADA'; #freeside's on crack
+
+my $ua = new LWP::UserAgent;
+my $request = new HTTP::Request('GET', $url);
+my $response = $ua->request($request);
+die $response->error_as_HTML unless $response->is_success;
+my $line;
+my $usps = '';
+foreach $line ( split("\n", $response->content) ) {
+  if ( $line =~ /\W(\w[\w\s]*\w)\s+LOCATIONS/i ) {
+    $usps = $state2usps{uc($1)}
+      or warn "warning: unknown state $1\n";
+  } elsif ( $line =~ /(\d{3})\-(\d{3})\-(\d{4})\s+(\w[\w\s]*\w)/ ) {
+    print "$1 $2 $3 $4 $usps\n";
+    my $svc_acct_pop = new FS::svc_acct_pop ( {
+      'city' => $4,
+      'state' => $usps,
+      'ac' => $1,
+      'exch' => $2,
+    } );
+    my $error = $svc_acct_pop->insert;
+    die $error if $error;
+  }
+}
+
+sub usage {
+  die "Usage:\n  $0 user\n";
+}
+
+sub state2usps{ (
+  'ALABAMA' => 'AL',
+  'ALASKA' => 'AK',
+  'AMERICAN SAMOA' => 'AS',
+  'ARIZONA' => 'AZ',
+  'ARKANSAS' => 'AR',
+  'CALIFORNIA' => 'CA',
+  'COLORADO' => 'CO',
+  'CONNECTICUT' => 'CT',
+  'DELAWARE' => 'DE',
+  'DISTRICT OF COLUMBIA' => 'DC',
+  'FEDERATED STATES OF MICRONESIA' => 'FM',
+  'FLORIDA' => 'FL',
+  'GEORGIA' => 'GA',
+  'GUAM' => 'GU',
+  'HAWAII' => 'HI',
+  'IDAHO' => 'ID',
+  'ILLINOIS' => 'IL',
+  'INDIANA' => 'IN',
+  'IOWA' => 'IA',
+  'KANSAS' => 'KS',
+  'KENTUCKY' => 'KY',
+  'LOUISIANA' => 'LA',
+  'MAINE' => 'ME',
+  'MARSHALL ISLANDS' => 'MH',
+  'MARYLAND' => 'MD',
+  'MASSACHUSETTS' => 'MA',
+  'MICHIGAN' => 'MI',
+  'MINNESOTA' => 'MN',
+  'MISSISSIPPI' => 'MS',
+  'MISSOURI' => 'MO',
+  'MONTANA' => 'MT',
+  'NEBRASKA' => 'NE',
+  'NEVADA' => 'NV',
+  'NEW HAMPSHIRE' => 'NH',
+  'NEW JERSEY' => 'NJ',
+  'NEW MEXICO' => 'NM',
+  'NEW YORK' => 'NY',
+  'NORTH CAROLINA' => 'NC',
+  'NORTH DAKOTA' => 'ND',
+  'NORTHERN MARIANA ISLANDS' => 'MP',
+  'OHIO' => 'OH',
+  'OKLAHOMA' => 'OK',
+  'OREGON' => 'OR',
+  'PALAU' => 'PW',
+  'PENNSYLVANIA' => 'PA',
+  'PUERTO RICO' => 'PR',
+  'RHODE ISLAND' => 'RI',
+  'SOUTH CAROLINA' => 'SC',
+  'SOUTH DAKOTA' => 'SD',
+  'TENNESSEE' => 'TN',
+  'TEXAS' => 'TX',
+  'UTAH' => 'UT',
+  'VERMONT' => 'VT',
+  'VIRGIN ISLANDS' => 'VI',
+  'VIRGINIA' => 'VA',
+  'WASHINGTON' => 'WA',
+  'WEST VIRGINIA' => 'WV',
+  'WISCONSIN' => 'WI',
+  'WYOMING' => 'WY',
+  'ARMED FORCES AFRICA' => 'AE',
+  'ARMED FORCES AMERICAS' => 'AA',
+  'ARMED FORCES CANADA' => 'AE',
+  'ARMED FORCES EUROPE' => 'AE',
+  'ARMED FORCES MIDDLE EAST' => 'AE',
+  'ARMED FORCES PACIFIC' => 'AP',
+) }
+
-- 
cgit v1.2.1


From f5c0ace146c743f9fea788fc0bca463bc0d138d4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Apr 1999 09:00:02 +0000
Subject: aixelsyd

---
 htdocs/docs/upgrade3.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/upgrade3.html b/htdocs/docs/upgrade3.html
index 815652aaf..0837e0207 100644
--- a/htdocs/docs/upgrade3.html
+++ b/htdocs/docs/upgrade3.html
@@ -2,7 +2,7 @@
   <title>Upgrading to 1.2.x</title>
 </head>
 <body>
-<h1>Upgrading to 1.1.x from 1.2.x</h1>
+<h1>Upgrading to 1.2.x from 1.1.x</h1>
 <ul>
   <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
   <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
-- 
cgit v1.2.1


From 014ccf7cfed0db6c06e92d76de5825ccd19b6cbe Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Apr 1999 09:37:45 +0000
Subject: *** empty log message ***

---
 TODO | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 75 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 5dbfab256..251aa8907 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.30 1999-04-14 13:14:54 ivan Exp $
+$Id: TODO,v 1.31 1999-04-29 09:37:45 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,80 @@ duplication of effort.
 
 ---
 
+> Second, when trying to add a new user I get two types of errors; first one
+> is when I place an e-mail address and select the "submit," Freeside
+> complains with "Error: Unknown local account (specified literally)"
+.  
+You probably put a (local) email address in for email invoices.  Freeside
+stores these as references to the database records, so (for example) they
+follow username changes.
+.
+I'm guessing you put in the email address that you were creating, and got
+that error because it didn't exist yet.  Sounds like a buglet to me.  I'll
+try to fix that soon; in the meantime you can add the invoicing email 
+address afterwords.
+
+Postgres `money' time sucks rocks anyway.  I'll probably just require 6.5
+and use the numeric types, which *finally* work right.
+On Sat, Apr 24, 1999 at 12:52:00PM -0700, Mr. Poet wrote:
+> Software error:
+> Error creating cust_bill record: ERROR: parser:
+> attribute 'charged' is of type 'money' but expression
+> is of type 'float8' You will need to rewrite or cast 
+> the expression ! Check updated but unbilled packages 
+> for customer1
+.
+Postgres `money' time sucks rocks anyway.  I'll probably just require 6.5
+and use the numeric types, which *finally* work right (well, according to 
+the web site, anyway).
+.
+In the mean-time, this could probably be fixed with the reverse of        
+the kludge in FS::Record::new.  This removes `$' and `,' from money fields
+coming out of the database.  Something which fixed up the data so Postgres
+was happy with it could go in FS::Record::_quote, for data going into the
+database.
+
+our data display problem might be a Freeside problem wrt not using 
+Oracle-compatible DBI syntax (uses the return value from $sth->execute as
+a number of rows).  Fixing this is on the TODO.
+
+hooks for arbitrary commands out of configuration files
+svc_acct.pm svc_acct_sm.pm etc.
+
+Add this to a FAQ, along with doing it for middle names:
+
+
+>  What I'm finding difficult is how to easily 
+> customize fields.  For example, I am trying to add a "middle name" field
+> to the Customer Edit, view, etc.  If I'm going about it right, it appears
+> I have to edit the cust_main.cgi under edit and edit/process and the
+> site_perl/cust_main.pm, as well as other things.  Perhaps you could shed
+> some light on the best way of doing this.
+
+You have the basic idea.  To implement that completely, I would:
+- Add the new field to bin/fs-setup for new users
+- Document the field in htdocs/docs/schema.html
+- Document the change in a new file, htdocs/docs/upgrade4.html
+* Run bin/dbdef-create
+* Add the new field to edit/cust_main.cgi and edit/process/cust_main.cgi
+
+For bonus points, I'd grep around for the various bits which use "$first 
+$last" or "$last, $first" and replace them with a method call in cust_main.pm,
+ , like search/cust_main.cgi
+
+document security model:
+Don't forget about Apache usernames - since, via the mapsecrets file, each
+user can login to the SQL database with a different username and
+password, you can utitilize the security model of the SQL database as
+well.  Also, each username here can point to a different configuration
+directory where you could store user-specific configuration info.  Then   
+you could link each username to one-to-many agents. 
+(The web demo works using a trivial version of this.)
+
+Yes, queue processing or the equivalent via checkpoint fields on various  
+talbes (which you pick up via a pretty simple SELECT) would be really 
+nice too.
+
 default (and ordering) state/county/country config file
 expand the
 cust_main_county table to provide a preferred ordering, so the most common
-- 
cgit v1.2.1


From 8e9af78fe74749396abf2ecbabd7a6e4dfabd59d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 May 1999 10:09:13 +0000
Subject: try to diagnose strange multiple-line problem

---
 site_perl/Conf.pm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/site_perl/Conf.pm b/site_perl/Conf.pm
index 9cc0d900e..0b2d5b328 100644
--- a/site_perl/Conf.pm
+++ b/site_perl/Conf.pm
@@ -73,11 +73,13 @@ sub config {
   my $fh = new IO::File "<$dir/$file" or return;
   if ( wantarray ) {
     map {
-      /^(.*)$/ or die "Illegal line in $dir/$file:\n$_\n";
+      /^(.*)$/
+        or die "Illegal line (array context) in $dir/$file:\n$_\n";
       $1;
     } <$fh>;
   } else {
-    <$fh> =~ /^(.*)$/ or die "Illegal line in $dir/$file:\n$_\n";
+    <$fh> =~ /^(.*)$/
+      or die "Illegal line (scalar context) in $dir/$file:\n$_\n";
     $1;
   }
 }
@@ -112,7 +114,10 @@ Ivan Kohler <ivan@sisd.com> 98-sep-6
 sub exists forgot to fetch $dir ivan@sisd.com 98-sep-27
 
 $Log: Conf.pm,v $
-Revision 1.3  1999-03-29 01:29:33  ivan
+Revision 1.4  1999-05-11 10:09:13  ivan
+try to diagnose strange multiple-line problem
+
+Revision 1.3  1999/03/29 01:29:33  ivan
 die unless the configuration directory exists
 
 Revision 1.2  1998/11/13 04:08:44  ivan
-- 
cgit v1.2.1


From f56cc7785c80f2b97c14653486a19c9cc34146cf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 May 1999 08:29:54 +0000
Subject: don't use threaded or unsupported perl versions

---
 htdocs/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 7fcd13aeb..5ac2611b4 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -7,7 +7,7 @@ Before installing, you need:
 <ul>
   <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
   <li><a href="ftp://ftp.cs.hut.fi/pub/ssh/">SSH</a>
-  <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_04)
+  <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_04 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
   <li>A database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>, such as <a href="http://www.tcx.se/">MySQL</a> or <a href="http://www.postgresql.org/">PostgreSQL</a> (see the <a href="postgresql.html">PostgreSQL notes</a>)
   <li>Perl modules
     <ul>
-- 
cgit v1.2.1


From a1438f1181c842889fc9bab5b8a24bcbbe31a6a3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Jul 1999 01:02:24 +0000
Subject: *** empty log message ***

---
 TODO | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 251aa8907..9641831c1 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.31 1999-04-29 09:37:45 ivan Exp $
+$Id: TODO,v 1.32 1999-07-08 01:02:24 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,18 @@ duplication of effort.
 
 ---
 
+Multiple tax rates by geographic region (county, state, and county) are   
+supported; just choose View/Edit tax rates from the main menu.
+
+Multiple tax rates by package are not (yet) supported.
+
+On Wed, Jul 07, 1999 at 12:13:36PM -0400, Shaun Batterton wrote:
+> How would you handle something like multiple tax rates and multiple   
+> states?  For example in Connecticut, they just changed computer and/or
+> data processing services to 3% (whatever that is), and everything else
+> is 6%.
+
+
 > Second, when trying to add a new user I get two types of errors; first one
 > is when I place an e-mail address and select the "submit," Freeside
 > complains with "Error: Unknown local account (specified literally)"
-- 
cgit v1.2.1


From fe1fe9e3c076c7e4f45a810d6cd07c9008cb2e5b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Jul 1999 01:49:00 +0000
Subject: updates to avoid -w warnings from Joel Griffiths
 <griff@aver-computer.com>

---
 bin/svc_acct.import | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index 512572251..85bc2f5eb 100755
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.import,v 1.5 1999-03-25 08:42:19 ivan Exp $
+# $Id: svc_acct.import,v 1.6 1999-07-08 01:49:00 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -17,7 +17,10 @@
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 #
 # $Log: svc_acct.import,v $
-# Revision 1.5  1999-03-25 08:42:19  ivan
+# Revision 1.6  1999-07-08 01:49:00  ivan
+# updates to avoid -w warnings from Joel Griffiths <griff@aver-computer.com>
+#
+# Revision 1.5  1999/03/25 08:42:19  ivan
 # import stuff uses Term::Query and spits out (some kinds of) nonsensical input
 #
 # Revision 1.4  1999/03/24 00:43:38  ivan
@@ -149,8 +152,12 @@ while (<USERS>) {
   while (<USERS>) {
     chop;
     if ( /^\s*$/ ) {
-      $ip{$username}=$param{'radius_Framed_IP_Address'}||'0e0';
-      delete $param{'radius_Framed_IP_Address'};
+      if ( defined $param{'radius_Framed_IP_Address'} ) {
+        $ip{$username} = $param{'radius_Framed_IP_Address'};
+        delete $param{'radius_Framed_IP_Address'};
+      } else {
+        $ip{$username} = '0e0';
+      }
       $allparam{$username}={ %param };
       last;
     } elsif ( /^\s+([\w\-]+)\s=\s"?([\w\.\-\s]+)"?,?\s*$/ ) {
@@ -163,8 +170,12 @@ while (<USERS>) {
   }
 }
 #? incase there isn't a terminating blank line ?
-$ip{$username}=$param{'radius_Framed_IP_Address'}||'0e0';
-delete $param{'radius_Framed_IP_Address'};
+if ( defined $param{'radius_Framed_IP_Address'} ) {
+  $ip{$username} = $param{'radius_Framed_IP_Address'};
+  delete $param{'radius_Framed_IP_Address'};
+} else {
+  $ip{$username} = '0e0';
+}
 $allparam{$username}={ %param };
 
 my(%password);
-- 
cgit v1.2.1


From 4c0a9a7c47dd5a1eb72e540f33c092e91aae1398 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Jul 1999 01:49:58 +0000
Subject: add joel

---
 CREDITS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CREDITS b/CREDITS
index 9f52df88f..62dcf6a24 100644
--- a/CREDITS
+++ b/CREDITS
@@ -34,5 +34,8 @@ Mark Williamson <mark.williamson@ebbs.com.au> and Roger Mangraviti
 Peter Wemm <peter@netplex.com.au> sent in a bunch of bugfixes for the 1.2
 release.
 
+Joel Griffiths <griff@aver-computer.com> contribued many bugfixes, and offers
+invaluable help to users on the mailing list.
+
 Everything else is my (Ivan Kohler <ivan@sisd.com>) fault.
 
-- 
cgit v1.2.1


From eb815cc14f3fea0a8d68b22b2fbf282eae09a92a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Jul 1999 02:32:26 +0000
Subject: import fix, noticed by Ben Leibig and Joel Griffiths

---
 bin/svc_acct.import | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index 85bc2f5eb..6541a9fd4 100755
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.import,v 1.6 1999-07-08 01:49:00 ivan Exp $
+# $Id: svc_acct.import,v 1.7 1999-07-08 02:32:26 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -17,7 +17,10 @@
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 #
 # $Log: svc_acct.import,v $
-# Revision 1.6  1999-07-08 01:49:00  ivan
+# Revision 1.7  1999-07-08 02:32:26  ivan
+# import fix, noticed by Ben Leibig and Joel Griffiths
+#
+# Revision 1.6  1999/07/08 01:49:00  ivan
 # updates to avoid -w warnings from Joel Griffiths <griff@aver-computer.com>
 #
 # Revision 1.5  1999/03/25 08:42:19  ivan
@@ -115,14 +118,16 @@ sub menu_svc {
 }
 sub getpart {
   $^W=0; # Term::Query isn't -w-safe
-  query "Enter part number:", 'irk', [ keys %part_svc ];
+  my $return = query "Enter part number:", 'irk', [ keys %part_svc ];
   $^W=1;
+  $return;
 }
 sub getvalue {
   my $prompt = shift;
   $^W=0; # Term::Query isn't -w-safe
-  query $prompt, '';
+  my $return = query $prompt, '';
   $^W=1;
+  $return;
 }
 
 print "\n\n";
-- 
cgit v1.2.1


From 7613e14fd13aabb2a44bb26ca8640053f44930ea Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Jul 1999 11:40:40 +0000
Subject: *** empty log message ***

---
 CREDITS |   2 +
 README  |   2 +-
 TODO    | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 132 insertions(+), 2 deletions(-)

diff --git a/CREDITS b/CREDITS
index 62dcf6a24..5017cbe6f 100644
--- a/CREDITS
+++ b/CREDITS
@@ -34,6 +34,8 @@ Mark Williamson <mark.williamson@ebbs.com.au> and Roger Mangraviti
 Peter Wemm <peter@netplex.com.au> sent in a bunch of bugfixes for the 1.2
 release.
 
+Greg Kuhnert <gregk@no1.com.au> sent some documentation updates.
+
 Joel Griffiths <griff@aver-computer.com> contribued many bugfixes, and offers
 invaluable help to users on the mailing list.
 
diff --git a/README b/README
index b22627727..0c6640f9f 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Freeside, 1.2.0
+Freeside, (pre-1.2.2 or pre.1.3.0?)
 
 Copyright (C) 1999 Ivan Kohler
 Copyright (C) 1999 Silicon Interactive Software Design
diff --git a/TODO b/TODO
index 9641831c1..44358e938 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.32 1999-07-08 01:02:24 ivan Exp $
+$Id: TODO,v 1.33 1999-07-08 11:40:40 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,134 @@ duplication of effort.
 
 ---
 
+grep 'uncomment this to encrypt password immediately' site_perl/svc_acct.pm
+Not to say that it shouldn't be a configurable option.
+
+in site_perl/cust_main_invoice.pm (elsewhere?), error out if mydomain config file is gone
+(at least until the idea of a default domain goes away)
+
+FS::Record::qsearch does an eval every loop iteration (which is itself not
+guaranteed to work across all DBD's and should be fixed).  This has got to be
+slow.  Fix it.  (I think recent Perls might have a way to accept a variable
+there, no eval needed?)
+
+Could you have added /bin/sync, /sbin/shutdown, and /bin/halt to the
+`shells' configuration file before importing, and removed them afterwords?
+(even better if svc_acct.import did that automatically - it could just    
+munge and restore @FS::svc_acct::shells... hmm.)
+
+> BTW, Ivan, I am trying to verify in an additional database table that a
+> particular user doesn't exist. This database is used to store email aliases a$
+> additional POP boxes for our customers (kinda like AOL allows). I have toyed  
+> with the idea of just writing the aliases to an email only svc_acct that
+> doesn't write to the password file, but that isn't really how I want to do it.
+
+Actually, I think that's a pretty good way to do it.  Cerkit contributed
+support a little while back for svc_acct.pm and svc_acct.export for
+multiple export targets.  It needs to be cleaned up and documented, which
+I'll try to get to soon.  For this to work correctly, the svc_acct_sm
+table should go away, along with the concept of a "default" domain.  
+
+default setting for new packages should allow all agents to purchase them...
+with a config file for the old behaviour
+
+replace Term::Query  with Quiz::Question?
+
+Check config file reading stuff from CPAN
+ 
+Authorizenet module from CPAN!
+
+<http://www.math.fu-berlin.de/~leitner/mutt/faq.html> has a good y2k complience
+statement!
+
+    I'm hoping Freeside can support arbitrailly complex pricing plans
+    because of a simple concept: all prices are perl expressions.  So if
+    you use `19.95' for example, perl evalates that to be `19.95'.  But if
+    you need to do a complex pricing scheme, you just need to write an
+    appropriate perl expression, which will most likely pull data from the
+    database to return pricing.  Some things will already log to SQL; for
+    example most RADIUS servers can or have a patch available.  Getting
+    Freeside to bill based on any sort of data then becomes a matter of
+    importing the data into the database.
+ 
+    There are some issues involved with pro-rating, partial month charges,
+    that sort of thing.  Expressions will need a standard way to have the
+    applicable time/data ranges passed to them.  Also the expressions are
+    currently running under the Safe perl module, and the opmask might not
+    be right in all situations.  I'll try to spend some time working on
+    this if you are using it.
+
+> 2. can customers view their bills on-line.                                    
+ 
+Not yet; it needs to be proxied from Freeside to a customer web server in
+a secure way using something not completely unlike the fs_passwd,
+fs_passwdd, fs_passwd_server trio.
+
+
+> Lastly, if someone over pays on an invoice, the credit part does not flow
+> over to other invoices..
+
+The total balance flows over correctly, but individual payments don't.
+The code you're looking for is in FS::cust_pay::insert
+
+The question of what to do with overpayments that don't have another 
+invoice to flow into (yet.. or possibly not) is still an open one.    The
+legacy system Freeside replaced long ago had a separate place for this
+(payments waiting for an invoice) for each customer, and it gave our
+bookeeper fits.
+
+
+option to relax username uniqueness in favor of username+domain or mail/shell
+vs. radius to ease import for isp's with namespace problems or who buy others.
+
+do i have to store anything for radius realms besides regular radius attributes
+(which are handled fine now)?
+
+warn or complain or something when invoice_from is empty (and we use it)
+
+Right now Freeside uses the `freq' field of a package definition as a 
+number of months.  The specific section of code you're looking for is in  
+FS::cust_main::bill:
+        
+        #change this bit to use Date::Manip?
+        #$sdate=$cust_pkg->bill || time;
+        #$sdate=$cust_pkg->bill || $time;
+        $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
+        my ($sec,$min,$hour,$mday,$mon,$year) =
+          (localtime($sdate) )[0,1,2,3,4,5];
+        $mon += $part_pkg->getfield('freq');
+        until ( $mon < 12 ) { $mon -= 12; $year++; }
+        $cust_pkg->setfield('bill',
+          timelocal($sec,$min,$hour,$mday,$mon,$year));
+        $cust_pkg_mod_flag = 1;
+  
+..and when I went poking for this, looks like it tells us just what needs   
+to be done!  Hehehe...
+
+Date::Manip can handle cool things like "+ 1 month" (actually the current
+case of /^(\d+)$/ would have to be added as a special case of "+ $1 
+month") and "+ 30 days" (what you need) and even "+ 5 business days" !
+
+
+On Wed, Apr 28, 1999 at 08:38:16PM +0000, Kristian Hoffmann wrote:
+> I can't quite seem to figure out how this exporting works.  From what I
+> understand, when you run svc_acct.export, it rewrites the /etc/passwd,
+> /etc/shadow, etc. files.  Is this only for initial setups with the
+> export hooks being in the pm's?
+ 
+You can use both, or just one method.  The configuration files control    
+this.  One of the things in the TODO is to take out the last few things   
+that aren't customizable wrt this and put them in config files.
+
+http://www.daemonnews.org/199905/user-mgmt.html
+
+Term::Query doesn't install out of the box from CPAN.  Fix it (and get it 
+submitted upstream!), or remove requirement from bin/svc_acct.import and
+bin/svc_acct_sm.import and take it out of the install instructions.
+
+use this cool link to explain the Freeside API
+ftp://cpan.nas.nasa.gov/pub/perl/CPAN/doc/FMTEYEWTK/easy_objects.html
+
 Multiple tax rates by geographic region (county, state, and county) are   
 supported; just choose View/Edit tax rates from the main menu.
 
-- 
cgit v1.2.1


From 76cfe14729d0313365206e4f55882a09f1a68890 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 15 Jul 1999 23:50:42 +0000
Subject: *** empty log message ***

---
 TODO | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 44358e938..61a8d318d 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.33 1999-07-08 11:40:40 ivan Exp $
+$Id: TODO,v 1.34 1999-07-15 23:50:42 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,17 @@ duplication of effort.
 
 ---
 
+middle names and titles
+
+On Wed, Jul 07, 1999 at 01:11:40PM -0400, Frank Nazario wrote:
+> Playing and entering information to Freeside i encountered the following
+> missing reports:
+> 
+> View Customers by Agent
+> 
+> View Pending Invoices
+> 
+
 grep 'uncomment this to encrypt password immediately' site_perl/svc_acct.pm
 Not to say that it shouldn't be a configurable option.
 
-- 
cgit v1.2.1


From 518adbd51689c6b8be42891485648fccd650f8cb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 16 Jul 1999 00:20:53 +0000
Subject: *** empty log message ***

---
 TODO | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 61a8d318d..e24c9935a 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,14 @@
-$Id: TODO,v 1.34 1999-07-15 23:50:42 ivan Exp $
+$Id: TODO,v 1.35 1999-07-16 00:20:53 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
 duplication of effort.
 
 ---
+Put this in the doc (quoting Mark Wells <mark@pc-intouch.com>):
+>Of course, thanks to the sheer coolness of SQL and MyODBC, you can do
+>whatever reports you want in basically whatever application you want.
+>There's no need for Freeside itself to do any reports at all.
 
 middle names and titles
 
-- 
cgit v1.2.1


From c2a7ce47397f8110245db44b1de0ddf920568895 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 17 Jul 1999 01:34:25 +0000
Subject: s/croak/confess/; in check method

---
 site_perl/Record.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/site_perl/Record.pm b/site_perl/Record.pm
index 6496d3ce5..5d69619ef 100644
--- a/site_perl/Record.pm
+++ b/site_perl/Record.pm
@@ -504,7 +504,7 @@ Not yet implemented, croaks.  Derived classes should provide a check method.
 =cut
 
 sub check {
-  croak "FS::Record::check not implemented; supply one in subclass!";
+  confess "FS::Record::check not implemented; supply one in subclass!";
 }
 
 =item unique COLUMN
@@ -825,7 +825,7 @@ sub hfields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.16 1999-04-10 07:03:38 ivan Exp $
+$Id: Record.pm,v 1.17 1999-07-17 01:34:25 ivan Exp $
 
 =head1 BUGS
 
@@ -947,7 +947,10 @@ added pod documentation ivan@sisd.com 98-sep-6
 ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
 
 $Log: Record.pm,v $
-Revision 1.16  1999-04-10 07:03:38  ivan
+Revision 1.17  1999-07-17 01:34:25  ivan
+s/croak/confess/; in check method
+
+Revision 1.16  1999/04/10 07:03:38  ivan
 return the value with ut_* error messages, to assist in debugging
 
 Revision 1.15  1999/04/08 12:08:59  ivan
-- 
cgit v1.2.1


From 5f97dcbac2620cb3ad079f91e1af8f33c67af4af Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 17 Jul 1999 02:24:14 +0000
Subject: bug noticed by Steve Gertz <sglist@hollywood.mwis.net>

---
 site_perl/cust_main.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index b5cb271f4..d67e6811f 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -762,7 +762,7 @@ sub collect {
 
       } else { #batch card
 
-       my $cust_pay_batch = new FS::Record ('cust_pay_batch', {
+       my $cust_pay_batch = new FS::cust_pay_batch ( {
          'invnum'   => $cust_bill->getfield('invnum'),
          'custnum'  => $self->getfield('custnum'),
          'last'     => $self->getfield('last'),
@@ -928,7 +928,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.22 1999-04-15 16:44:36 ivan Exp $
+$Id: cust_main.pm,v 1.23 1999-07-17 02:24:14 ivan Exp $
 
 =head1 BUGS
 
@@ -987,7 +987,10 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.22  1999-04-15 16:44:36  ivan
+Revision 1.23  1999-07-17 02:24:14  ivan
+bug noticed by Steve Gertz <sglist@hollywood.mwis.net>
+
+Revision 1.22  1999/04/15 16:44:36  ivan
 delete customers
 
 Revision 1.21  1999/04/14 07:47:53  ivan
-- 
cgit v1.2.1


From b58d8054d384ac50989bda5851c9c3a80d5d05b3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 17 Jul 1999 06:01:24 +0000
Subject: perl dependency documentation update from dk smith <dks@spies.com>

---
 htdocs/docs/install.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 5ac2611b4..5db8f2e4e 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -15,8 +15,9 @@ Before installing, you need:
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Term/">Term-Query</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/MIME/">MIME-Base64</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Data">Data-Dumper</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/MD5">MD5</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/MD5">Digest-MD5</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/URI">URI</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/HTTP">HTML-Parser</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Net">libnet</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/LWP/">libwww-perl</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Business/">Business-CreditCard</a>
-- 
cgit v1.2.1


From 4704b155c817d88cda363550b9c0c0e05eb80cb0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 17 Jul 1999 10:38:52 +0000
Subject: scott nelson <scott@ultimanet.com> noticed this mod_perl-triggered
 bug and gave me a great bugreport at the last rhythmethod

---
 htdocs/search/cust_main.cgi  |  9 +++++++--
 htdocs/search/cust_pkg.cgi   | 10 +++++++---
 htdocs/search/svc_domain.cgi | 11 ++++++++---
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index 099b3c0e8..9af2fce7b 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.11 1999-04-09 04:22:34 ivan Exp $
+# $Id: cust_main.cgi,v 1.12 1999-07-17 10:38:52 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -17,7 +17,11 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.11  1999-04-09 04:22:34  ivan
+# Revision 1.12  1999-07-17 10:38:52  ivan
+# scott nelson <scott@ultimanet.com> noticed this mod_perl-triggered bug and
+# gave me a great bugreport at the last rhythmethod
+#
+# Revision 1.11  1999/04/09 04:22:34  ivan
 # also table()
 #
 # Revision 1.10  1999/04/09 03:52:55  ivan
@@ -81,6 +85,7 @@ if ( $cgi->keywords ) {
     @cust_main=qsearch('cust_main',{});
   }
 } else {
+  @cust_main=();
   &cardsearch if ( $cgi->param('card_on') && $cgi->param('card') );
   &lastsearch if ( $cgi->param('last_on') && $cgi->param('last_text') );
   &companysearch if ( $cgi->param('company_on') && $cgi->param('company_text') );
diff --git a/htdocs/search/cust_pkg.cgi b/htdocs/search/cust_pkg.cgi
index c48a3c703..033bc2585 100755
--- a/htdocs/search/cust_pkg.cgi
+++ b/htdocs/search/cust_pkg.cgi
@@ -1,11 +1,15 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.8 1999-02-09 09:22:57 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.9 1999-07-17 10:38:52 ivan Exp $
 #
 # based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.8  1999-02-09 09:22:57  ivan
+# Revision 1.9  1999-07-17 10:38:52  ivan
+# scott nelson <scott@ultimanet.com> noticed this mod_perl-triggered bug and
+# gave me a great bugreport at the last rhythmethod
+#
+# Revision 1.8  1999/02/09 09:22:57  ivan
 # visual and bugfixes
 #
 # Revision 1.7  1999/02/07 09:59:37  ivan
@@ -51,7 +55,7 @@ if ( $query eq 'pkgnum' ) {
   @cust_pkg=qsearch('cust_pkg',{});
 } elsif ( $query eq 'APKG_pkgnum' ) {
   $sortby=\*pkgnum_sort;
-
+  @cust_pkg=();
   #perhaps this should go in cust_pkg as a qsearch-like constructor?
   my($cust_pkg);
   foreach $cust_pkg (qsearch('cust_pkg',{})) {
diff --git a/htdocs/search/svc_domain.cgi b/htdocs/search/svc_domain.cgi
index 21a3b751f..bf85e4a73 100755
--- a/htdocs/search/svc_domain.cgi
+++ b/htdocs/search/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.9 1999-04-15 13:39:16 ivan Exp $
+# $Id: svc_domain.cgi,v 1.10 1999-07-17 10:38:52 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -15,7 +15,11 @@
 # display total, use FS::CGI now does browsing too ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.9  1999-04-15 13:39:16  ivan
+# Revision 1.10  1999-07-17 10:38:52  ivan
+# scott nelson <scott@ultimanet.com> noticed this mod_perl-triggered bug and
+# gave me a great bugreport at the last rhythmethod
+#
+# Revision 1.9  1999/04/15 13:39:16  ivan
 # $cgi->header( '-expires' => 'now' )
 #
 # Revision 1.8  1999/02/28 00:03:57  ivan
@@ -81,7 +85,8 @@ if ( $query eq 'svcnum' ) {
 } else {
   $cgi->param('domain') =~ /^([\w\-\.]+)$/; 
   my($domain)=$1;
-  push @svc_domain, qsearchs('svc_domain',{'domain'=>$domain});
+  #push @svc_domain, qsearchs('svc_domain',{'domain'=>$domain});
+  @svc_domain = qsearchs('svc_domain',{'domain'=>$domain});
 }
 
 if ( scalar(@svc_domain) == 1 ) {
-- 
cgit v1.2.1


From 097c8747ef6978ddd3715405f8fc645b5187b7c1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 17 Jul 1999 22:02:16 +0000
Subject: another bug noticed by Steve Gertz <sglist@hollywood.mwis.net>

---
 site_perl/cust_pay_batch.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/site_perl/cust_pay_batch.pm b/site_perl/cust_pay_batch.pm
index f7350c116..b54412a81 100644
--- a/site_perl/cust_pay_batch.pm
+++ b/site_perl/cust_pay_batch.pm
@@ -143,7 +143,7 @@ sub check {
   $cardnum = $1;
   $self->cardnum($cardnum);
   validate($cardnum) or return "Illegal credit card number";
-  return "Unknown card type" if cardtype($self->payinfo) eq "Unknown";
+  return "Unknown card type" if cardtype($cardnum) eq "Unknown";
 
   if ( $self->exp eq '' ) {
     return "Expriation date required";
@@ -183,7 +183,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_pay_batch.pm,v 1.3 1998-12-29 11:59:44 ivan Exp $
+$Id: cust_pay_batch.pm,v 1.4 1999-07-17 22:02:16 ivan Exp $
 
 =head1 BUGS
 
@@ -202,7 +202,10 @@ added hfields
 ivan@sisd.com 97-nov-13
 
 $Log: cust_pay_batch.pm,v $
-Revision 1.3  1998-12-29 11:59:44  ivan
+Revision 1.4  1999-07-17 22:02:16  ivan
+another bug noticed by Steve Gertz <sglist@hollywood.mwis.net>
+
+Revision 1.3  1998/12/29 11:59:44  ivan
 mostly properly OO, some work still to be done with svc_ stuff
 
 Revision 1.2  1998/11/18 09:01:44  ivan
-- 
cgit v1.2.1


From 21707d8773402d92c6b6dd3aef034e8ac0f12cb2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 20 Jul 1999 06:01:43 +0000
Subject: harmless since Exporter was used anyway, but...

---
 site_perl/dbdef_colgroup.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site_perl/dbdef_colgroup.pm b/site_perl/dbdef_colgroup.pm
index 64f2e3082..43be04430 100644
--- a/site_perl/dbdef_colgroup.pm
+++ b/site_perl/dbdef_colgroup.pm
@@ -2,6 +2,7 @@ package FS::dbdef_colgroup;
 
 use strict;
 use vars qw(@ISA);
+use Exporter;
 
 @ISA = qw(Exporter);
 
-- 
cgit v1.2.1


From 96b783724b04667bf52aaa2dbee166df4d1319db Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 20 Jul 1999 06:03:36 +0000
Subject: s/CGI::Request/CGI/; (how'd i miss that before?)

---
 htdocs/search/svc_acct_sm.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/search/svc_acct_sm.cgi b/htdocs/search/svc_acct_sm.cgi
index e92a15ebb..ddf2a1f23 100755
--- a/htdocs/search/svc_acct_sm.cgi
+++ b/htdocs/search/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.9 1999-04-09 04:22:34 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.10 1999-07-20 06:03:36 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -17,7 +17,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.9  1999-04-09 04:22:34  ivan
+# Revision 1.10  1999-07-20 06:03:36  ivan
+# s/CGI::Request/CGI/; (how'd i miss that before?)
+#
+# Revision 1.9  1999/04/09 04:22:34  ivan
 # also table()
 #
 # Revision 1.8  1999/04/09 03:52:55  ivan
@@ -43,7 +46,7 @@
 
 use strict;
 use vars qw( $conf $cgi $mydomain $domuser $svc_domain $domsvc @svc_acct_sm );
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(popurl idiot header table);
-- 
cgit v1.2.1


From d605e2e68f3c388bd0479fb0aba1bb1bc8e61e73 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 20 Jul 1999 06:24:17 +0000
Subject: oops, forgot cust_main.fax

---
 htdocs/docs/schema.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/docs/schema.html b/htdocs/docs/schema.html
index f50525183..9558109e9 100644
--- a/htdocs/docs/schema.html
+++ b/htdocs/docs/schema.html
@@ -65,6 +65,7 @@
         <li>country
         <li>daytime - phone
         <li>night - phone
+        <li>fax - phone
         <li>payby - CARD, BILL, or COMP
         <li>payinfo - card number, P.O.#, or comp issuer
         <li>paydate - expiration date
-- 
cgit v1.2.1


From 19c3d2717fb417187fb0f020a7ba2b065f3f8e30 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 20 Jul 1999 10:37:05 +0000
Subject: cleaned up the new one-screen signup bits in
 htdocs/edit/cust_main.cgi to prepare for a signup server

---
 htdocs/edit/cust_main.cgi     | 59 ++++++++++---------------------------------
 site_perl/agent.pm            | 37 ++++++++++++++++++++++++---
 site_perl/agent_type.pm       | 55 ++++++++++++++++++++++++++++++++++++++--
 site_perl/cust_main.pm        | 10 ++++++--
 site_perl/cust_main_county.pm |  9 +++++--
 site_perl/cust_pkg.pm         | 20 +++++++--------
 site_perl/part_pkg.pm         | 49 +++++++++++++++++++++++++++++++----
 site_perl/pkg_svc.pm          | 43 ++++++++++++++++++++++++++-----
 8 files changed, 204 insertions(+), 78 deletions(-)

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 51cf0ab1e..e2e2d334d 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.15 1999-04-14 13:14:54 ivan Exp $
+# $Id: cust_main.cgi,v 1.16 1999-07-20 10:37:05 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,11 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.15  1999-04-14 13:14:54  ivan
+# Revision 1.16  1999-07-20 10:37:05  ivan
+# cleaned up the new one-screen signup bits in htdocs/edit/cust_main.cgi to
+# prepare for a signup server
+#
+# Revision 1.15  1999/04/14 13:14:54  ivan
 # configuration option to edit referrals of existing customers
 #
 # Revision 1.14  1999/04/14 07:47:53  ivan
@@ -100,8 +104,6 @@ use FS::part_referral;
 use FS::cust_main_county;
 
   #for misplaced logic below
-  use FS::pkg_svc;
-  use FS::part_svc;
   use FS::part_pkg;
 
   #for false laziness below
@@ -332,60 +334,26 @@ print "</TR></TABLE>$r required fields for each billing type";
 
 unless ( $custnum ) {
   # pry the wrong place for this logic.  also pretty expensive
-  #use FS::pkg_svc;
-  #use FS::part_svc;
   #use FS::part_pkg;
 
   #false laziness, copied from FS::cust_pkg::order
-  my %part_pkg;
+  my $pkgpart;
   if ( scalar(@agents) == 1 ) {
-    # generate %part_pkg
-    # $part_pkg{$pkgpart} is true iff $custnum may purchase $pkgpart
-    	#my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
-    	#my($agent)=qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
+    # $pkgpart->{$pkgpart} is true iff $custnum may purchase $pkgpart
     my($agent)=qsearchs('agent',{'agentnum'=> $agentnum });
-
-    my($type_pkgs);
-    foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
-      my($pkgpart)=$type_pkgs->pkgpart;
-      $part_pkg{$pkgpart}++;
-    }
+    $pkgpart = $agent->pkgpart_hashref;
   } else {
     #can't know (agent not chosen), so, allow all
     my %typenum;
     foreach my $agent ( @agents ) {
       next if $typenum{$agent->typenum}++;
-      foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
-        my($pkgpart)=$type_pkgs->pkgpart;
-        $part_pkg{$pkgpart}++;
-      }
+      $pkgpart->{$_}++ foreach keys %{ $agent->pkgpart_hashref }
     }
-
   }
   #eslaf
 
-  my %pkgpart;
-  #foreach ( @pkg_svc ) {
-  foreach ( qsearch( 'pkg_svc', {} ) ) {
-    my $part_svc = qsearchs ( 'part_svc', { 'svcpart' => $_->svcpart } );
-    $pkgpart{ $_->pkgpart } = -1 # never will == 1 below
-      if ( $part_svc->svcdb ne 'svc_acct' );
-    if ( $pkgpart{ $_->pkgpart } ) {
-      $pkgpart{ $_->pkgpart } = '-1';
-    } else {
-      $pkgpart{ $_->pkgpart } = $_->svcpart;
-    }
-  }
-
-  my @part_pkg =
-    #grep { $pkgpart{ $_->pkgpart } == 1 } qsearch( 'part_pkg', {} );
-    grep {
-      #( $pkgpart{ $_->pkgpart } || 0 ) == 1
-      $pkgpart{ $_->pkgpart } 
-      && $pkgpart{ $_->pkgpart } != -1
-      && $part_pkg{ $_->pkgpart }
-      ;
-    } qsearch( 'part_pkg', {} );
+  my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } }
+    qsearch( 'part_pkg', {} );
 
   if ( @part_pkg ) {
 
@@ -396,7 +364,8 @@ unless ( $custnum ) {
 
     foreach my $part_pkg ( @part_pkg ) {
       print qq!<OPTION VALUE="!,
-              $part_pkg->pkgpart. "_". $pkgpart{ $part_pkg->pkgpart }, '"';
+#              $part_pkg->pkgpart. "_". $pkgpart{ $part_pkg->pkgpart }, '"';
+              $part_pkg->pkgpart. "_". $part_pkg->svcpart, '"';
       print " SELECTED" if $pkgpart && ( $part_pkg->pkgpart == $pkgpart );
       print ">", $part_pkg->pkg, " - ", $part_pkg->comment;
     }
diff --git a/site_perl/agent.pm b/site_perl/agent.pm
index cc4fb1088..dab157b3f 100644
--- a/site_perl/agent.pm
+++ b/site_perl/agent.pm
@@ -27,6 +27,11 @@ FS::agent - Object methods for agent records
 
   $error = $record->check;
 
+  $agent_type = $record->agent_type;
+
+  $hashref = $record->pkgpart_hashref;
+  #may purchase $pkgpart if $hashref->{$pkgpart};
+
 =head1 DESCRIPTION
 
 An FS::agent object represents an agent.  Every customer has an agent.  Agents
@@ -106,24 +111,48 @@ sub check {
   return $error if $error;
 
   return "Unknown typenum!"
-    unless qsearchs( 'agent_type', { 'typenum' => $self->typenum } );
+    unless $self->agent_type;
 
   '';
 
 }
 
+=item agent_type
+
+Returns the FS::agent_type object (see L<FS::agent_type>) for this agent.
+
+=cut
+
+sub agent_type {
+  my $self = shift;
+  qsearchs( 'agent_type', { 'typenum' => $self->typenum } );
+}
+
+=item pkgpart_hashref
+
+Returns a hash reference.  The keys of the hash are pkgparts.  The value is
+true iff this agent may purchase the specified package definition.  See
+L<FS::part_pkg>.
+
+=cut
+
+sub pkgpart_hashref {
+  my $self = shift;
+  $self->agent_type->pkgpart_hashref;
+}
+
 =back
 
 =head1 VERSION
 
-$Id: agent.pm,v 1.4 1998-12-30 00:30:44 ivan Exp $
+$Id: agent.pm,v 1.5 1999-07-20 10:37:05 ivan Exp $
 
 =head1 BUGS
 
 =head1 SEE ALSO
 
-L<FS::Record>, L<FS::agent_type>, L<FS::cust_main>, schema.html from the base
-documentation.
+L<FS::Record>, L<FS::agent_type>, L<FS::cust_main>, L<FS::part_pkg>, 
+schema.html from the base documentation.
 
 =head1 HISTORY
 
diff --git a/site_perl/agent_type.pm b/site_perl/agent_type.pm
index 54a91c8bf..6ea3d2a70 100644
--- a/site_perl/agent_type.pm
+++ b/site_perl/agent_type.pm
@@ -3,6 +3,8 @@ package FS::agent_type;
 use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearch );
+use FS::agent;
+use FS::type_pkgs;
 
 @ISA = qw( FS::Record );
 
@@ -25,6 +27,13 @@ FS::agent_type - Object methods for agent_type records
 
   $error = $record->check;
 
+  $hashref = $record->pkgpart_hashref;
+  #may purchase $pkgpart if $hashref->{$pkgpart};
+
+  @type_pkgs = $record->type_pkgs;
+
+  @pkgparts = $record->pkgpart;
+
 =head1 DESCRIPTION
 
 An FS::agent_type object represents an agent type.  Every agent (see
@@ -97,11 +106,49 @@ sub check {
 
 }
 
+=item pkgpart_hashref
+
+Returns a hash reference.  The keys of the hash are pkgparts.  The value is
+true iff this agent may purchase the specified package definition.  See
+L<FS::part_pkg>.
+
+=cut
+
+sub pkgpart_hashref {
+  my $self = shift;
+  my %pkgpart;
+  $pkgpart{$_}++ foreach $self->pkgpart;
+  \%pkgpart;
+}
+
+=item type_pkgs
+
+Returns all FS::type_pkgs objects (see L<FS::type_pkgs>) for this agent type.
+
+=cut
+
+sub type_pkgs {
+  my $self = shift;
+  qsearch('type_pkgs', { 'typenum' => $self->typenum } );
+}
+
+=item pkgpart
+
+Returns the pkgpart of all package definitions (see L<FS::part_pkg>) for this
+agent type.
+
+=cut
+
+sub pkgpart {
+  my $self = shift;
+  map $_->pkgpart, $self->type_pkgs;
+}
+
 =back
 
 =head1 VERSION
 
-$Id: agent_type.pm,v 1.2 1998-12-29 11:59:35 ivan Exp $
+$Id: agent_type.pm,v 1.3 1999-07-20 10:37:05 ivan Exp $
 
 =head1 BUGS
 
@@ -126,7 +173,11 @@ Changed 'type' to 'atype' because Pg6.3 reserves the type word
 pod, added check in delete ivan@sisd.com 98-sep-21
 
 $Log: agent_type.pm,v $
-Revision 1.2  1998-12-29 11:59:35  ivan
+Revision 1.3  1999-07-20 10:37:05  ivan
+cleaned up the new one-screen signup bits in htdocs/edit/cust_main.cgi to
+prepare for a signup server
+
+Revision 1.2  1998/12/29 11:59:35  ivan
 mostly properly OO, some work still to be done with svc_ stuff
 
 
diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index d67e6811f..6140dcc29 100644
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -143,6 +143,8 @@ FS::Record.  The following fields are currently supported:
 
 =item night - phone (optional)
 
+=item fax - phone (optional)
+
 =item payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
 
 =item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
@@ -928,7 +930,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.23 1999-07-17 02:24:14 ivan Exp $
+$Id: cust_main.pm,v 1.24 1999-07-20 10:37:05 ivan Exp $
 
 =head1 BUGS
 
@@ -987,7 +989,11 @@ enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 $Log: cust_main.pm,v $
-Revision 1.23  1999-07-17 02:24:14  ivan
+Revision 1.24  1999-07-20 10:37:05  ivan
+cleaned up the new one-screen signup bits in htdocs/edit/cust_main.cgi to
+prepare for a signup server
+
+Revision 1.23  1999/07/17 02:24:14  ivan
 bug noticed by Steve Gertz <sglist@hollywood.mwis.net>
 
 Revision 1.22  1999/04/15 16:44:36  ivan
diff --git a/site_perl/cust_main_county.pm b/site_perl/cust_main_county.pm
index 1ecaed1ec..1418ca1ea 100644
--- a/site_perl/cust_main_county.pm
+++ b/site_perl/cust_main_county.pm
@@ -86,6 +86,7 @@ sub check {
   $self->ut_numbern('taxnum')
     || $self->ut_textn('state')
     || $self->ut_textn('county')
+    || $self->ut_text('country')
     || $self->ut_float('tax')
   ;
 
@@ -95,7 +96,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_main_county.pm,v 1.3 1998-12-29 11:59:41 ivan Exp $
+$Id: cust_main_county.pm,v 1.4 1999-07-20 10:37:05 ivan Exp $
 
 =head1 BUGS
 
@@ -114,7 +115,11 @@ Changed check for 'tax' to use the new ut_float subroutine
 pod ivan@sisd.com 98-sep-21
 
 $Log: cust_main_county.pm,v $
-Revision 1.3  1998-12-29 11:59:41  ivan
+Revision 1.4  1999-07-20 10:37:05  ivan
+cleaned up the new one-screen signup bits in htdocs/edit/cust_main.cgi to
+prepare for a signup server
+
+Revision 1.3  1998/12/29 11:59:41  ivan
 mostly properly OO, some work still to be done with svc_ stuff
 
 Revision 1.2  1998/11/18 09:01:43  ivan
diff --git a/site_perl/cust_pkg.pm b/site_perl/cust_pkg.pm
index aa68f608f..bbd242972 100644
--- a/site_perl/cust_pkg.pm
+++ b/site_perl/cust_pkg.pm
@@ -396,18 +396,12 @@ L<FS::pkg_svc>).
 sub order {
   my($custnum,$pkgparts,$remove_pkgnums)=@_;
 
-  my(%part_pkg);
   # generate %part_pkg
   # $part_pkg{$pkgpart} is true iff $custnum may purchase $pkgpart
-    my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
-    my($agent)=qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
-
-    my($type_pkgs);
-    foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
-      my($pkgpart)=$type_pkgs->pkgpart;
-      $part_pkg{$pkgpart}++;
-    }
   #
+  my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
+  my($agent)=qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
+  my %part_pkg = %{ $agent->pkgpart_hashref };
 
   my(%svcnum);
   # generate %svcnum
@@ -496,7 +490,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.9 1999-03-29 01:11:51 ivan Exp $
+$Id: cust_pkg.pm,v 1.10 1999-07-20 10:37:05 ivan Exp $
 
 =head1 BUGS
 
@@ -527,7 +521,11 @@ fixed for new agent->agent_type->type_pkgs in &order ivan@sisd.com 98-mar-7
 pod ivan@sisd.com 98-sep-21
 
 $Log: cust_pkg.pm,v $
-Revision 1.9  1999-03-29 01:11:51  ivan
+Revision 1.10  1999-07-20 10:37:05  ivan
+cleaned up the new one-screen signup bits in htdocs/edit/cust_main.cgi to
+prepare for a signup server
+
+Revision 1.9  1999/03/29 01:11:51  ivan
 use FS::type_pkgs
 
 Revision 1.8  1999/03/25 13:48:14  ivan
diff --git a/site_perl/part_pkg.pm b/site_perl/part_pkg.pm
index 4b6cc09a4..556146e38 100644
--- a/site_perl/part_pkg.pm
+++ b/site_perl/part_pkg.pm
@@ -2,7 +2,8 @@ package FS::part_pkg;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record;
+use FS::Record qw( qsearch );
+use FS::pkg_svc;
 
 @ISA = qw( FS::Record );
 
@@ -27,6 +28,11 @@ FS::part_pkg - Object methods for part_pkg objects
 
   $error = $record->check;
 
+  @pkg_svc = $record->pkg_svc;
+
+  $svcnum = $record->svcpart;
+  $svcnum = $record->svcpart( 'svc_acct' );
+
 =head1 DESCRIPTION
 
 An FS::part_pkg object represents a billing item definition.  FS::part_pkg
@@ -125,16 +131,45 @@ sub check {
   ;
 }
 
+=item pkg_svc
+
+Returns all FS::pkg_svc objects (see L<FS::pkg_svc>) for this package
+definition.
+
+=cut
+
+sub pkg_svc {
+  my $self = shift;
+  qsearch( 'pkg_svc', { 'pkgpart' => $self->pkgpart } );
+}
+
+=item svcpart [ SVCDB ]
+
+Returns the svcpart of a single service definition (see L<FS::part_svc>)
+associated with this billing item definition (see L<FS::pkg_svc>).  Returns
+false if there not exactly one service definition with quantity 1, or if 
+SVCDB is specified and does not match the svcdb of the service definition, 
+
+=cut
+
+sub svcpart {
+  my $self = shift;
+  my $svcdb = shift;
+  my @pkg_svc = $self->pkg_svc;
+  return '' if scalar(@pkg_svc) != 1
+               || $pkg_svc[0]->quantity != 1
+               || ( $svcdb && $pkg_svc[0]->part_svc->svcdb ne $svcdb );
+  $pkg_svc[0]->svcpart;
+}
+
 =back
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.5 1998-12-31 01:04:16 ivan Exp $
+$Id: part_pkg.pm,v 1.6 1999-07-20 10:37:05 ivan Exp $
 
 =head1 BUGS
 
-It doesn't properly override FS::Record yet.
-
 The delete method is unimplemented.
 
 setup and recur semantics are not yet defined (and are implemented in
@@ -152,7 +187,11 @@ ivan@sisd.com 97-dec-5
 pod ivan@sisd.com 98-sep-21
 
 $Log: part_pkg.pm,v $
-Revision 1.5  1998-12-31 01:04:16  ivan
+Revision 1.6  1999-07-20 10:37:05  ivan
+cleaned up the new one-screen signup bits in htdocs/edit/cust_main.cgi to
+prepare for a signup server
+
+Revision 1.5  1998/12/31 01:04:16  ivan
 doc
 
 Revision 1.3  1998/11/15 13:00:15  ivan
diff --git a/site_perl/pkg_svc.pm b/site_perl/pkg_svc.pm
index ee4ad629e..f28745d28 100644
--- a/site_perl/pkg_svc.pm
+++ b/site_perl/pkg_svc.pm
@@ -3,6 +3,8 @@ package FS::pkg_svc;
 use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearchs );
+use FS::part_pkg;
+use FS::part_svc;
 
 @ISA = qw( FS::Record );
 
@@ -25,6 +27,10 @@ FS::pkg_svc - Object methods for pkg_svc records
 
   $error = $record->check;
 
+  $part_pkg = $record->part_pkg;
+
+  $part_svc = $record->part_svc;
+
 =head1 DESCRIPTION
 
 An FS::pkg_svc record links a billing item definition (see L<FS::part_pkg>) to
@@ -99,20 +105,39 @@ sub check {
   ;
   return $error if $error;
 
-  return "Unknown pkgpart!"
-    unless qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
-
-  return "Unknown svcpart!"
-    unless qsearchs('part_svc', { 'svcpart' => $self->svcpart } );
+  return "Unknown pkgpart!" unless $self->part_pkg;
+  return "Unknown svcpart!" unless $self->part_svc;
 
   ''; #no error
 }
 
+=item part_pkg
+
+Returns the FS::part_pkg object (see L<FS::part_pkg>).
+
+=cut
+
+sub part_pkg {
+  my $self = shift;
+  qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
+}
+
+=item part_svc
+
+Returns the FS::part_svc object (see L<FS::part_svc>).
+
+=cut
+
+sub part_svc {
+  my $self = shift;
+  qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
+}
+
 =back
 
 =head1 VERSION
 
-$Id: pkg_svc.pm,v 1.3 1999-01-18 21:58:08 ivan Exp $
+$Id: pkg_svc.pm,v 1.4 1999-07-20 10:37:05 ivan Exp $
 
 =head1 BUGS
 
@@ -131,7 +156,11 @@ ivan@sisd.com 97-nov-13
 pod ivan@sisd.com 98-sep-22
 
 $Log: pkg_svc.pm,v $
-Revision 1.3  1999-01-18 21:58:08  ivan
+Revision 1.4  1999-07-20 10:37:05  ivan
+cleaned up the new one-screen signup bits in htdocs/edit/cust_main.cgi to
+prepare for a signup server
+
+Revision 1.3  1999/01/18 21:58:08  ivan
 esthetic: eq and ne were used in a few places instead of == and !=
 
 Revision 1.2  1998/12/29 11:59:51  ivan
-- 
cgit v1.2.1


From 971e4ca0af5a6adbc8c724c9dff12cf8edf93dd9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 20 Jul 1999 19:18:25 +0000
Subject: initial checkin

---
 fs_signup/Signup.pm        | 129 +++++++++++++++++++++++++++++++++++++++++++++
 fs_signup/fs_signup_server |  77 +++++++++++++++++++++++++++
 fs_signup/fs_signupd       |  49 +++++++++++++++++
 3 files changed, 255 insertions(+)
 create mode 100755 fs_signup/Signup.pm
 create mode 100755 fs_signup/fs_signup_server
 create mode 100755 fs_signup/fs_signupd

diff --git a/fs_signup/Signup.pm b/fs_signup/Signup.pm
new file mode 100755
index 000000000..bcf09f1fe
--- /dev/null
+++ b/fs_signup/Signup.pm
@@ -0,0 +1,129 @@
+#!/usr/bin/perl -Tw
+#
+# fs_passwd
+#
+# portions of this script are copied from the `passwd' script in the original
+# (perl 4) camel book, now archived at 
+# http://www.perl.com/CPAN/scripts/nutshell/ch6/passwd
+#
+# ivan@sisd.com 98-mar-8
+#
+# password lengths 0,255 instead of 6,8 - we'll let the server process
+# check the data ivan@sisd.com 98-jul-17
+
+use strict;
+use Getopt::Std;
+use Socket;
+use IO::Handle;
+use vars qw($opt_f $opt_s);
+
+my($fs_passwdd_socket)="/usr/local/freeside/fs_passwdd_socket";
+my($freeside_uid)=scalar(getpwnam('freeside'));
+
+$ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin';
+$ENV{'SHELL'} = '/bin/sh';
+$ENV{'IFS'} = " \t\n";
+$ENV{'CDPATH'} = '';
+$ENV{'ENV'} = '';
+$ENV{'BASH_ENV'} = '';
+
+$SIG{__DIE__}= sub { system '/bin/stty', 'echo'; };
+
+die "passwd program isn't running setuid to freeside\n" if $> != $freeside_uid;
+
+unshift @ARGV, "-f" if $0 =~ /chfn$/;
+unshift @ARGV, "-s" if $0 =~ /chsh$/;
+
+getopts('fs');
+
+my($me)='';
+if ( $_ = shift(@ARGV) ) {
+  /^(\w{2,8})$/;
+  $me = $1; 
+}
+die "You can't change the password for $me." if $me && $<;
+$me = (getpwuid($<))[0] unless $me;
+
+my($name,$passwd,$uid,$gid,$quota,$comment,$gcos,$dir,$shell)=
+  getpwnam $me;
+
+my($old_password,$new_password,$new_gecos,$new_shell);
+
+if ( $opt_f || $opt_s ) {
+  system '/bin/stty', '-echo';
+  print "Password:";
+  $old_password=<STDIN>;
+  system '/bin/stty', 'echo'; 
+  chop($old_password);
+  #$old_password =~ /^(.{6,8})$/ or die "\nIllegal password.\n";
+  $old_password =~ /^(.{0,255})$/ or die "\nIllegal password.\n";
+  $old_password = $1;
+
+  $new_password = '';
+
+  if ( $opt_f ) {
+    print "\nChanging gecos for $me.\n";
+    print "Gecos [", $gcos, "]: ";
+    $new_gecos=<STDIN>;
+    chop($new_gecos);
+    $new_gecos ||= $gcos;
+    $new_gecos =~ /^(.{0,255})$/ or die "\nIllegal gecos.\n";
+  } else {
+    $new_gecos = '';
+  } 
+
+  if ( $opt_s ) {
+    print "\nChanging shell for $me.\n";
+    print "Shell [", $shell, "]: ";
+    $new_shell=<STDIN>;
+    chop($new_shell);
+    $new_shell ||= $shell;
+    $new_shell =~ /^(.{0,255})$/ or die "\nIllegal shell.\n";
+  } else {
+    $new_shell = '';
+  }
+
+} else {
+
+  print "Changing password for $me.\n";
+  print "Old password:";
+  system '/bin/stty', '-echo';
+  $old_password=<STDIN>;
+  chop $old_password;
+  #$old_password =~ /^(.{6,8})$/ or die "\nIllegal password.\n";
+  $old_password =~ /^(.{0,255})$/ or die "\nIllegal password.\n";
+  $old_password = $1;
+  print "\nEnter the new password (minimum of 6, maximum of 8 characters)\n";
+  print "Please use a combination of upper and lowercase letters and numbers.\n";
+  print "New password:";
+  $new_password=<STDIN>;
+  chop($new_password);
+  #$new_password =~ /^(.{6,8})$/ or die "\nIllegal password.\n";
+  $new_password =~ /^(.{0,255})$/ or die "\nIllegal password.\n";
+  $new_password = $1;
+  print "\nRe-enter new password:";
+  my($check_new_password);
+  $check_new_password=<STDIN>;
+  chop($check_new_password);
+  die "\nThey don't match; try again.\n" unless $check_new_password eq $new_password;
+
+  $new_gecos='';
+  $new_shell='';
+}
+print "\n";
+
+system '/bin/stty', 'echo'; 
+
+socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+connect(SOCK, sockaddr_un($fs_passwdd_socket)) or die "connect: $!";
+print SOCK join("\n",$me,$old_password,$new_password,$new_gecos,$new_shell),"\n";
+SOCK->flush;
+my($error);
+$error = <SOCK>;
+chop $error;
+
+if ($error) {
+  print "\nUpdate error: $error\n";
+} else {
+  print "\nUpdate sucessful.\n";
+}
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
new file mode 100755
index 000000000..cb0e693dd
--- /dev/null
+++ b/fs_signup/fs_signup_server
@@ -0,0 +1,77 @@
+#!/usr/bin/perl -Tw
+#
+# fs_passwd_server
+#
+# portions of this script are copied from the `passwd' script in the original
+# (perl 4) camel book, now archived at 
+# http://www.perl.com/CPAN/scripts/nutshell/ch6/passwd
+#
+# ivan@sisd.com 98-mar-9
+#
+# crypt-aware, s/password/_password/; ivan@sisd.com 98-aug-23
+
+use strict;
+use IO::Handle;
+use FS::SSH qw(sshopen2);
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearchs);
+use FS::svc_acct;
+
+my $user = shift or die &usage;
+adminsuidsetup $user; 
+
+my($shellmachine)=shift or die &usage;
+
+$SIG{CHLD} = sub { wait() };
+
+my($fs_passwdd)="/usr/local/sbin/fs_passwdd";
+
+while (1) {
+  my($reader,$writer)=(new IO::Handle, new IO::Handle);
+  $writer->autoflush(1);
+  sshopen2($shellmachine,$reader,$writer,$fs_passwdd);
+  while (1) {
+    my($username,$old_password,$new_password,$new_gecos,$new_shell);
+    defined($username=<$reader>) or last;
+    defined($old_password=<$reader>) or last; 
+    defined($new_password=<$reader>) or last; 
+    defined($new_gecos=<$reader>) or last; 
+    defined($new_shell=<$reader>) or last; 
+    chop($username);
+    chop($old_password);
+    chop($new_password);
+    chop($new_gecos);
+    chop($new_shell);
+    my($svc_acct);
+
+    #need to try both $old_password and encrypted $old_password
+    #maybe the crypt function in svc_acct.export needs to be a library?
+    my $salt = substr($old_password,0,2);
+    my $cold_password = crypt($old_password,$salt);
+    $svc_acct=qsearchs('svc_acct',{'username'=>$username,
+                                   '_password'=>$old_password,
+    } )
+           || qsearchs('svc_acct',{'username'=>$username,
+                                   '_password'=>$cold_password,
+    } );
+    unless ( $svc_acct ) { print $writer "Incorrect password.\n"; next; }
+
+    my(%hash)=$svc_acct->hash;
+    my($new_svc_acct) = new FS::svc_acct ( \%hash );
+    $new_svc_acct->setfield('_password',$new_password) 
+      if $new_password && $new_password ne $old_password;
+    $new_svc_acct->setfield('finger',$new_gecos) if $new_gecos;
+    $new_svc_acct->setfield('shell',$new_shell) if $new_shell;
+    my($error)=$new_svc_acct->replace($svc_acct);
+    print $writer $error,"\n";
+  }
+  close $writer;
+  close $reader;
+  sleep 60;
+  warn "Connection to $shellmachine lost!  Reconnecting...\n";
+}
+
+sub usage {
+  die "Usage:\n\n  fs_passwd_server user shellmachine\n";
+}
+
diff --git a/fs_signup/fs_signupd b/fs_signup/fs_signupd
new file mode 100755
index 000000000..582e13ccd
--- /dev/null
+++ b/fs_signup/fs_signupd
@@ -0,0 +1,49 @@
+#!/usr/bin/perl -Tw
+#
+# fs_passwdd
+#
+# This is run REMOTELY over ssh by fs_passwd_server.
+#
+# ivan@sisd.com 98-mar-9
+
+use strict;
+use Socket;
+
+my($fs_passwdd_socket)="/usr/local/freeside/fs_passwdd_socket";
+
+$ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin';
+$ENV{'SHELL'} = '/bin/sh';
+$ENV{'IFS'} = " \t\n";
+$ENV{'CDPATH'} = '';
+$ENV{'ENV'} = '';
+$ENV{'BASH_ENV'} = '';
+
+$|=1;
+
+my $uaddr = sockaddr_un($fs_passwdd_socket);
+my $proto = getprotobyname('tcp');
+
+socket(Server,PF_UNIX,SOCK_STREAM,0) or die "socket: $!";
+unlink($fs_passwdd_socket);
+bind(Server, $uaddr) or die "bind: $!";
+listen(Server,SOMAXCONN) or die "listen: $!";
+
+my($paddr);
+for ( ; $paddr = accept(Client,Server); close Client) {
+  my($me,$old_password,$new_password,$new_gecos,$new_shell);
+
+  $me=<Client>;
+  $old_password=<Client>;
+  $new_password=<Client>;
+  $new_gecos=<Client>;
+  $new_shell=<Client>;
+
+  print $me,$old_password,$new_password,$new_gecos,$new_shell;
+  my($error);
+
+  $error=<STDIN>;
+  
+  print Client $error;
+  close Client;
+}
+
-- 
cgit v1.2.1


From 413261640a2439987da8383c023c379accd355a1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Jul 1999 06:32:08 +0000
Subject: workaround for syntax not compatible w/5.004_04 (ok in 5.004_05)

---
 site_perl/agent_type.pm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/site_perl/agent_type.pm b/site_perl/agent_type.pm
index 6ea3d2a70..5b82cc3d6 100644
--- a/site_perl/agent_type.pm
+++ b/site_perl/agent_type.pm
@@ -117,7 +117,9 @@ L<FS::part_pkg>.
 sub pkgpart_hashref {
   my $self = shift;
   my %pkgpart;
-  $pkgpart{$_}++ foreach $self->pkgpart;
+  #$pkgpart{$_}++ foreach $self->pkgpart;
+  # not compatible w/5.004_04 (fixed in 5.004_05)
+  foreach ( $self->pkgpart ) { $pkgpart{$_}++; }
   \%pkgpart;
 }
 
@@ -148,7 +150,7 @@ sub pkgpart {
 
 =head1 VERSION
 
-$Id: agent_type.pm,v 1.3 1999-07-20 10:37:05 ivan Exp $
+$Id: agent_type.pm,v 1.4 1999-07-21 06:32:08 ivan Exp $
 
 =head1 BUGS
 
@@ -173,7 +175,10 @@ Changed 'type' to 'atype' because Pg6.3 reserves the type word
 pod, added check in delete ivan@sisd.com 98-sep-21
 
 $Log: agent_type.pm,v $
-Revision 1.3  1999-07-20 10:37:05  ivan
+Revision 1.4  1999-07-21 06:32:08  ivan
+workaround for syntax not compatible w/5.004_04 (ok in 5.004_05)
+
+Revision 1.3  1999/07/20 10:37:05  ivan
 cleaned up the new one-screen signup bits in htdocs/edit/cust_main.cgi to
 prepare for a signup server
 
-- 
cgit v1.2.1


From a9687b2eaaadbbfdd7636ef79adab97994417ba3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Jul 1999 07:34:13 +0000
Subject: links to package browse and agent type edit if there aren't any
 packages to order.  thanks to "Tech Account" <techy@orac.hq.org>

---
 htdocs/edit/cust_pkg.cgi | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/htdocs/edit/cust_pkg.cgi b/htdocs/edit/cust_pkg.cgi
index 766aa60ac..b3c92249f 100755
--- a/htdocs/edit/cust_pkg.cgi
+++ b/htdocs/edit/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.7 1999-04-14 01:03:01 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.8 1999-07-21 07:34:13 ivan Exp $
 #
 # this is for changing packages around, not editing things within the package
 #
@@ -23,7 +23,11 @@
 # 98-jun-1
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.7  1999-04-14 01:03:01  ivan
+# Revision 1.8  1999-07-21 07:34:13  ivan
+# links to package browse and agent type edit if there aren't any packages to
+# order.  thanks to "Tech Account" <techy@orac.hq.org>
+#
+# Revision 1.7  1999/04/14 01:03:01  ivan
 # oops, in 1.2 tree, can't do searches until [cgi|admin]suidsetup,
 # bug is hidden by mod_perl persistance
 #
@@ -47,7 +51,7 @@
 
 use strict;
 use vars qw( $cgi %pkg %comment $custnum $p1 @cust_pkg 
-             $cust_main $agent $type_pkgs $count %remove_pkg );
+             $cust_main $agent $type_pkgs $count %remove_pkg $pkgparts );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -121,11 +125,13 @@ END
 $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
 $agent = qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
 
-$count = 0 ;
-print qq!<TABLE>! ;
+$count = 0;
+$pkgparts = 0;
+print qq!<TABLE>!;
 foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
+  $pkgparts++;
   my($pkgpart)=$type_pkgs->pkgpart;
-  print qq!<TR>! if ($count == 0) ;
+  print qq!<TR>! if ( $count == 0 );
   my $value = $cgi->param("pkg$pkgpart") || 0;
   print <<END;
   <TD>
@@ -133,18 +139,28 @@ foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
   $pkgpart: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n
 END
   $count ++ ;
-  if ($count == 2)
-  {
+  if ( $count == 2 ) {
     print qq!</TR>\n! ;
-    $count = 0 ;
+    $count = 0;
   }
 }
-print qq!</TABLE>! ;
+print qq!</TABLE>!;
 
-#submit
-print qq!<P><INPUT TYPE="submit" VALUE="Order">\n!;
+unless ( $pkgparts ) {
+  my $p2 = popurl(2);
+  my $typenum = $agent->typenum;
+  my $agent_type = qsearchs( 'agent_type', { 'typenum' => $typenum } );
+  my $atype = $agent_type->atype;
+  print <<END;
+(No <a href="${p2}browse/part_pkg.cgi">package definitions</a>, or agent type
+<a href="${p2}edit/agent_type.cgi?$typenum">$atype</a> not allowed to purchase
+any packages.)
+END
+}
 
+#submit
 print <<END;
+<P><INPUT TYPE="submit" VALUE="Order">
     </FORM>
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From 07032e1b6ac8c99c25896d638cf7ac27fcd6a157 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Jul 1999 07:49:04 +0000
Subject: fixes for bugs noticed by Joel Griffiths <griff@aver-computer.com>

---
 site_perl/cust_pay_batch.pm | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/site_perl/cust_pay_batch.pm b/site_perl/cust_pay_batch.pm
index b54412a81..c7a0ccb9d 100644
--- a/site_perl/cust_pay_batch.pm
+++ b/site_perl/cust_pay_batch.pm
@@ -146,17 +146,21 @@ sub check {
   return "Unknown card type" if cardtype($cardnum) eq "Unknown";
 
   if ( $self->exp eq '' ) {
-    return "Expriation date required";
+    return "Expriation date required"; #unless 
     $self->exp('');
   } else {
-    $self->exp =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/
-      or return "Illegal expiration date";
-    if ( length($2) == 4 ) {
-      $self->exp("$2-$1-01");
-    } elsif ( $2 > 98 ) { #should pry change to check for "this year"
-      $self->exp("19$2-$1-01");
+    if ( $self->exp =~ /^(\d{4})[\/\-](\d{1,2})[\/\-](\d{1,2})$/ ) {
+      $self->exp("$1-$2-$3");
+    } elsif ( $self->exp =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/ ) {
+      if ( length($2) == 4 ) {
+        $self->exp("$2-$1-01");
+      } elsif ( $2 > 98 ) { #should pry change to check for "this year"
+        $self->exp("19$2-$1-01");
+      } else {
+        $self->exp("20$2-$1-01");
+      }
     } else {
-      $self->exp("20$2-$1-01");
+      return "Illegal expiration date";
     }
   }
 
@@ -168,7 +172,8 @@ sub check {
     $self->payname($1);
   }
 
-  $self->zip =~ /^([\w\-]{10})$/ or return "Illegal zip";
+  $self->zip =~ /^\s*(\w[\w\-\s]{3,8}\w)\s*$/
+    or return "Illegal zip: ". $self->zip;
   $self->zip($1);
 
   $self->country =~ /^(\w\w)$/ or return "Illegal \w\wy";
@@ -183,7 +188,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_pay_batch.pm,v 1.4 1999-07-17 22:02:16 ivan Exp $
+$Id: cust_pay_batch.pm,v 1.5 1999-07-29 07:49:04 ivan Exp $
 
 =head1 BUGS
 
@@ -202,7 +207,10 @@ added hfields
 ivan@sisd.com 97-nov-13
 
 $Log: cust_pay_batch.pm,v $
-Revision 1.4  1999-07-17 22:02:16  ivan
+Revision 1.5  1999-07-29 07:49:04  ivan
+fixes for bugs noticed by Joel Griffiths <griff@aver-computer.com>
+
+Revision 1.4  1999/07/17 22:02:16  ivan
 another bug noticed by Steve Gertz <sglist@hollywood.mwis.net>
 
 Revision 1.3  1998/12/29 11:59:44  ivan
-- 
cgit v1.2.1


From b0c959ef8937cb1e0273e58388a101c0eab92e36 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Jul 1999 08:47:26 +0000
Subject: more informative illegal shells error.

---
 site_perl/svc_acct.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/site_perl/svc_acct.pm b/site_perl/svc_acct.pm
index f066ebdd6..9ae531a90 100644
--- a/site_perl/svc_acct.pm
+++ b/site_perl/svc_acct.pm
@@ -378,7 +378,8 @@ sub check {
       if ( $shell = (grep $_ eq $recref->{shell}, @shells)[0] ) {
         $recref->{shell} = $shell;
       } else {
-        return "Illegal shell ". $self->shell;
+        return "Illegal shell \`". $self->shell. "\'; ".
+               $conf->dir. "/shells contains: @shells";
       }
     } else {
       $recref->{shell} = '/bin/sync';
@@ -445,7 +446,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.7 1999-04-07 14:37:37 ivan Exp $
+$Id: svc_acct.pm,v 1.8 1999-07-29 08:47:26 ivan Exp $
 
 =head1 BUGS
 
@@ -487,7 +488,10 @@ arbitrary radius attributes ivan@sisd.com 98-aug-13
 pod and FS::conf ivan@sisd.com 98-sep-22
 
 $Log: svc_acct.pm,v $
-Revision 1.7  1999-04-07 14:37:37  ivan
+Revision 1.8  1999-07-29 08:47:26  ivan
+more informative illegal shells error.
+
+Revision 1.7  1999/04/07 14:37:37  ivan
 use FS::part_svc and FS::svc_acct_pop to avoid warnings
 
 Revision 1.6  1999/01/25 12:26:15  ivan
-- 
cgit v1.2.1


From 196b3d878b3526995fd25592168fefd624d757ac Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Jul 1999 08:50:35 +0000
Subject: wrong type for cust_pay_batch.exp

---
 bin/fs-setup | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index ca5e82211..aae9c5739 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.18 1999-04-15 22:46:30 ivan Exp $
+# $Id: fs-setup,v 1.19 1999-07-29 08:50:35 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.18  1999-04-15 22:46:30  ivan
+# Revision 1.19  1999-07-29 08:50:35  ivan
+# wrong type for cust_pay_batch.exp
+#
+# Revision 1.18  1999/04/15 22:46:30  ivan
 # TT isn't a state!
 #
 # Revision 1.17  1999/04/14 07:58:39  ivan
@@ -469,7 +472,8 @@ sub tables_hash_hack {
         'country',  'char', '',     2,
         'trancode', 'int', '', '',
         'cardnum',  'varchar', '',     16,
-        'exp',      @date_type,
+        #'exp',      @date_type,
+        'exp',      'varchar', '',     11,
         'payname',  'varchar', 'NULL', $char_d,
         'amount',   @money_type,
       ],
-- 
cgit v1.2.1


From 70eae60cfd775e24fa4ab02e6fb8f644eace2e94 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Jul 1999 08:58:14 +0000
Subject: upgrade info for 1.2.2

---
 htdocs/docs/index.html    |  1 +
 htdocs/docs/upgrade4.html | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 htdocs/docs/upgrade4.html

diff --git a/htdocs/docs/index.html b/htdocs/docs/index.html
index d593a5e3b..73429c825 100644
--- a/htdocs/docs/index.html
+++ b/htdocs/docs/index.html
@@ -8,6 +8,7 @@
   <li><a href="upgrade.html">Upgrading from 1.0.x to 1.1.x</a>
   <li><a href="upgrade2.html">Upgrading from 1.1.x to 1.1.4</a>
   <li><a href="upgrade3.html">Upgrading from 1.1.x to 1.2.x</a>
+  <li><a href="upgrade4.html">Upgrading from 1.2.x to 1.2.2</a>
   <li><a href="config.html">Configuration files</a>
 <!--
   <li><a href="admin.html">Administration</a>
diff --git a/htdocs/docs/upgrade4.html b/htdocs/docs/upgrade4.html
new file mode 100644
index 000000000..50f65731b
--- /dev/null
+++ b/htdocs/docs/upgrade4.html
@@ -0,0 +1,17 @@
+<head>
+  <title>Upgrading to 1.2.2</title>
+</head>
+<body>
+<h1>Upgrading to 1.2.2 from 1.2.x</h1>
+<ul>
+  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
+  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
+  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
+  <li>Back up your data and current Freeside installation.
+  <li>Apply the following changes to your database:
+<pre>
+ALTER TABLE cust_pay_batch CHANGE exp exp VARCHAR(11);
+</pre>
+  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
+  <li>Copy or symlink htdocs and site_perl to the new copies.
+</body>
-- 
cgit v1.2.1


From 6022e7e4e8b72e87e781a1306e3bba4f98e1d6a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Jul 1999 09:07:44 +0000
Subject: embarassing.

---
 site_perl/cust_pay.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/site_perl/cust_pay.pm b/site_perl/cust_pay.pm
index 2cb256baa..46addac01 100644
--- a/site_perl/cust_pay.pm
+++ b/site_perl/cust_pay.pm
@@ -144,7 +144,8 @@ sub check {
 
   if ( $self->payby eq 'CARD' ) {
     my $payinfo = $self->payinfo;
-    $self->payinfo($payinfo =~ s/\D//g);
+    $payinfo =~ s/\D//g;
+    $self->payinfo($payinfo);
     if ( $self->payinfo ) {
       $self->payinfo =~ /^(\d{13,16})$/
         or return "Illegal (mistyped?) credit card number (payinfo)";
@@ -171,7 +172,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.3 1999-01-25 12:26:11 ivan Exp $
+$Id: cust_pay.pm,v 1.4 1999-07-29 09:07:44 ivan Exp $
 
 =head1 BUGS
 
@@ -190,7 +191,10 @@ new api ivan@sisd.com 98-mar-13
 pod ivan@sisd.com 98-sep-21
 
 $Log: cust_pay.pm,v $
-Revision 1.3  1999-01-25 12:26:11  ivan
+Revision 1.4  1999-07-29 09:07:44  ivan
+embarassing.
+
+Revision 1.3  1999/01/25 12:26:11  ivan
 yet more mod_perl stuff
 
 Revision 1.2  1998/12/29 11:59:43  ivan
-- 
cgit v1.2.1


From 53437ddeba0439876f496eae235700d46ea7645f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Jul 1999 19:13:06 +0000
Subject: *** empty log message ***

---
 TODO                       | 19 +++++++++++++++-
 fs_signup/fs_signup_server | 54 +++++++++++++++++++++++++++++++++++-----------
 2 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/TODO b/TODO
index e24c9935a..670201602 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,27 @@
-$Id: TODO,v 1.35 1999-07-16 00:20:53 ivan Exp $
+$Id: TODO,v 1.36 1999-07-29 19:13:06 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
 duplication of effort.
 
 ---
+
+A web version of the fs_passwd stuff would be nifty.   
+
+If you have Cistron authenticating directly from MySQL, you can replicate
+in real-time instead of exporting periodically.  See 
+<http://www.mysql.com/Manual_chapter/manual_Common_problems.html#Replication>.
+
+these go in docs:
+<http://www.sisd.com/freeside/list-archive/msg00546.html>, and
+<http://www.sisd.com/freeside/list-archive/msg00554.html>
+
+and http://www.sisd.com/freeside/list-archive/msg00423.html
+
+> > 5: Is there anyway to get freeside to send a sysadmin a warning when a
+> > credit card has expired?
+No, but there should be.
+
 Put this in the doc (quoting Mark Wells <mark@pc-intouch.com>):
 >Of course, thanks to the sheer coolness of SQL and MyODBC, you can do
 >whatever reports you want in basically whatever application you want.
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index cb0e693dd..5feed4cb6 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -1,36 +1,64 @@
 #!/usr/bin/perl -Tw
 #
-# fs_passwd_server
+# fs_signup_server
 #
-# portions of this script are copied from the `passwd' script in the original
-# (perl 4) camel book, now archived at 
-# http://www.perl.com/CPAN/scripts/nutshell/ch6/passwd
-#
-# ivan@sisd.com 98-mar-9
-#
-# crypt-aware, s/password/_password/; ivan@sisd.com 98-aug-23
 
 use strict;
 use IO::Handle;
 use FS::SSH qw(sshopen2);
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearchs);
-use FS::svc_acct;
+use FS::cust_main_county;
+use FS::cust_main;
+
+use vars qw( $opt );
 
 my $user = shift or die &usage;
 adminsuidsetup $user; 
 
-my($shellmachine)=shift or die &usage;
+my $machine = shift or die &usage;
+
+my $agentnum = shift or die &usage;
+my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } ) or die &usage;
+#my %part_pkg = %{ $agent->pkgpart_hashref };
+
+my $refnum = shift or die &usage;
 
 $SIG{CHLD} = sub { wait() };
 
-my($fs_passwdd)="/usr/local/sbin/fs_passwdd";
+my($fs_signupd)="/usr/local/sbin/fs_signupd";
 
 while (1) {
   my($reader,$writer)=(new IO::Handle, new IO::Handle);
   $writer->autoflush(1);
-  sshopen2($shellmachine,$reader,$writer,$fs_passwdd);
+  sshopen2($shellmachine,$reader,$writer,$fs_signupd);
+
+  #send fs_signupd state/county/country
+  @cust_main_county = qsearch('cust_main_county', {} );
+  print $writer join("\n",
+    scalar(@cust_main_county),
+    map {
+      $_->taxnum,
+      $_->state,
+      $_->county,
+      $_->country,
+    } @cust_main_county
+  ),"\n";
+
+  #send fs_signupd package definitions
+
+  #send fs_signupd POPs
+
+
+
   while (1) {
+    my( $first, $last, $ss, $company, $address1, $address2, $city, $county,
+        $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
+        $paydate, $payname, $username, $password, $popnum,
+    );
+
+
+
     my($username,$old_password,$new_password,$new_gecos,$new_shell);
     defined($username=<$reader>) or last;
     defined($old_password=<$reader>) or last; 
@@ -72,6 +100,6 @@ while (1) {
 }
 
 sub usage {
-  die "Usage:\n\n  fs_passwd_server user shellmachine\n";
+  die "Usage:\n\n  fs_signup_server user machine agentnum refnum\n";
 }
 
-- 
cgit v1.2.1


From 9f2781f5d45997c856e1930757daa2cb1d5cddcc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 3 Aug 1999 07:43:33 +0000
Subject: use Net::Whois;

---
 TODO                     |  5 ++++-
 htdocs/docs/install.html |  1 +
 site_perl/svc_domain.pm  | 42 +++++++++++++++++++++++++-----------------
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/TODO b/TODO
index 670201602..12bacc8c5 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.36 1999-07-29 19:13:06 ivan Exp $
+$Id: TODO,v 1.37 1999-08-03 07:43:33 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,9 @@ duplication of effort.
 
 ---
 
+take the GPL'ed whois proxy stuff at www.geektools.com and turn it into
+intelligence for Net::Whois.
+
 A web version of the fs_passwd stuff would be nifty.   
 
 If you have Cistron authenticating directly from MySQL, you can replicate
diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 5db8f2e4e..8c88a5acb 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -19,6 +19,7 @@ Before installing, you need:
       <li><a href="http://www.perl.com/CPAN/modules/by-module/URI">URI</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/HTTP">HTML-Parser</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Net">libnet</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/Net">Net::Whois</a> with this <a href="Net-Whois-0.23-ivan1.patch">patch</a> applied
       <li><a href="http://www.perl.com/CPAN/modules/by-module/LWP/">libwww-perl</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Business/">Business-CreditCard</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Data/">Data-ShowTable</a>
diff --git a/site_perl/svc_domain.pm b/site_perl/svc_domain.pm
index 19aac3f88..17fdd19d5 100644
--- a/site_perl/svc_domain.pm
+++ b/site_perl/svc_domain.pm
@@ -8,6 +8,7 @@ use Carp;
 use Mail::Internet;
 use Mail::Header;
 use Date::Format;
+use Net::Whois; #0.24;
 use FS::Record qw(fields qsearch qsearchs);
 use FS::Conf;
 use FS::svc_Common;
@@ -132,11 +133,11 @@ sub insert {
   return "Domain in use (here)"
     if qsearchs( 'svc_domain', { 'domain' => $self->domain } );
 
-  my $whois = ($self->_whois)[0];
+  my $whois = $self->whois;
   return "Domain in use (see whois)"
-    if ( $self->action eq "N" && $whois !~ /^No match for/ );
+    if ( $self->action eq "N" && $whois );
   return "Domain not found (see whois)"
-    if ( $self->action eq "M" && $whois =~ /^No match for/ );
+    if ( $self->action eq "M" && ! $whois );
 
   $error = $self->SUPER::insert;
   return $error if $error;
@@ -254,25 +255,27 @@ sub check {
 
 }
 
-=item _whois
+=item whois
+
+Returns the Net::Whois object corresponding to this domain, or undef if
+the domain is not found in whois.
 
-Executes the command:
+(If $FS::svc_domain::whois_hack is true, returns that in all cases instead.)
+
+=cut
 
-  whois do $domain
+sub whois {
+  $whois_hack or new Net::Whois::Domain $_[0]->domain;
+}
 
-and returns the output.
+=item _whois
 
-(Always returns I<No match for domian "$domain".> if
-$FS::svc_domain::whois_hack is set true.)
+Depriciated.
 
 =cut
 
 sub _whois {
-  my $self = shift;
-  my $domain = $self->domain;
-  return ( "No match for domain \"$domain\"." ) if $whois_hack;
-  open(WHOIS, "whois do $domain |");
-  return <WHOIS>;
+  die "_whois depriciated";
 }
 
 =item submit_internic
@@ -390,7 +393,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.7 1999-04-07 14:40:15 ivan Exp $
+$Id: svc_domain.pm,v 1.8 1999-08-03 07:43:33 ivan Exp $
 
 =head1 BUGS
 
@@ -407,7 +410,9 @@ The $recref stuff in sub check should be cleaned up.
 =head1 SEE ALSO
 
 L<FS::svc_Common>, L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>,
-L<FS::part_svc>, L<FS::cust_pkg>, L<FS::SSH>, L<ssh>, L<dot-qmail>, schema.html from the base documentation, config.html from the base documentation.
+L<FS::part_svc>, L<FS::cust_pkg>, L<FS::SSH>, L<Net::Whois>, L<ssh>,
+L<dot-qmail>, schema.html from the base documentation, config.html from the
+base documentation.
 
 =head1 HISTORY
 
@@ -426,7 +431,10 @@ ivan@sisd.com 98-jul-17-19
 pod, some FS::Conf (not complete) ivan@sisd.com 98-sep-23
 
 $Log: svc_domain.pm,v $
-Revision 1.7  1999-04-07 14:40:15  ivan
+Revision 1.8  1999-08-03 07:43:33  ivan
+use Net::Whois;
+
+Revision 1.7  1999/04/07 14:40:15  ivan
 use all stuff that's qsearch'ed to avoid warnings
 
 Revision 1.6  1999/01/25 12:26:17  ivan
-- 
cgit v1.2.1


From 1e3eae905b861761f93643aa5fce14a8be5d9ed2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Aug 1999 04:15:20 +0000
Subject: initial h2xs

---
 FS/Changes     |  5 +++++
 FS/FS.pm       | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 FS/MANIFEST    |  5 +++++
 FS/Makefile.PL |  7 +++++++
 FS/test.pl     | 20 ++++++++++++++++++++
 5 files changed, 88 insertions(+)
 create mode 100644 FS/Changes
 create mode 100644 FS/FS.pm
 create mode 100644 FS/MANIFEST
 create mode 100644 FS/Makefile.PL
 create mode 100644 FS/test.pl

diff --git a/FS/Changes b/FS/Changes
new file mode 100644
index 000000000..c94ef10f5
--- /dev/null
+++ b/FS/Changes
@@ -0,0 +1,5 @@
+Revision history for Perl extension FS.
+
+0.01  Wed Aug  4 00:13:45 1999
+	- original version; created by h2xs 1.19
+
diff --git a/FS/FS.pm b/FS/FS.pm
new file mode 100644
index 000000000..c7defbc7f
--- /dev/null
+++ b/FS/FS.pm
@@ -0,0 +1,51 @@
+package FS;
+
+use strict;
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
+
+require Exporter;
+
+@ISA = qw(Exporter AutoLoader);
+# Items to export into callers namespace by default. Note: do not export
+# names by default without a very good reason. Use EXPORT_OK instead.
+# Do not simply export all your public functions/methods/constants.
+@EXPORT = qw(
+	
+);
+$VERSION = '0.01';
+
+
+# Preloaded methods go here.
+
+# Autoload methods go after =cut, and are processed by the autosplit program.
+
+1;
+__END__
+# Below is the stub of documentation for your module. You better edit it!
+
+=head1 NAME
+
+FS - Perl extension for blah blah blah
+
+=head1 SYNOPSIS
+
+  use FS;
+  blah blah blah
+
+=head1 DESCRIPTION
+
+Stub documentation for FS was created by h2xs. It looks like the
+author of the extension was negligent enough to leave the stub
+unedited.
+
+Blah blah blah.
+
+=head1 AUTHOR
+
+A. U. Thor, a.u.thor@a.galaxy.far.far.away
+
+=head1 SEE ALSO
+
+perl(1).
+
+=cut
diff --git a/FS/MANIFEST b/FS/MANIFEST
new file mode 100644
index 000000000..c036308ed
--- /dev/null
+++ b/FS/MANIFEST
@@ -0,0 +1,5 @@
+Changes
+FS.pm
+MANIFEST
+Makefile.PL
+test.pl
diff --git a/FS/Makefile.PL b/FS/Makefile.PL
new file mode 100644
index 000000000..22b412d21
--- /dev/null
+++ b/FS/Makefile.PL
@@ -0,0 +1,7 @@
+use ExtUtils::MakeMaker;
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written.
+WriteMakefile(
+    'NAME'	=> 'FS',
+    'VERSION_FROM' => 'FS.pm', # finds $VERSION
+);
diff --git a/FS/test.pl b/FS/test.pl
new file mode 100644
index 000000000..dc3726236
--- /dev/null
+++ b/FS/test.pl
@@ -0,0 +1,20 @@
+# Before `make install' is performed this script should be runnable with
+# `make test'. After `make install' it should work as `perl test.pl'
+
+######################### We start with some black magic to print on failure.
+
+# Change 1..1 below to 1..last_test_to_print .
+# (It may become useful if the test is moved to ./t subdirectory.)
+
+BEGIN { $| = 1; print "1..1\n"; }
+END {print "not ok 1\n" unless $loaded;}
+use FS;
+$loaded = 1;
+print "ok 1\n";
+
+######################### End of black magic.
+
+# Insert your test code below (better if it prints "ok 13"
+# (correspondingly "not ok 13") depending on the success of chunk 13
+# of the test code):
+
-- 
cgit v1.2.1


From 75e22f3c399435c50ed5698cb7c19d0e9f2617f8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Aug 1999 07:34:15 +0000
Subject: initial FS manpage

---
 FS/FS.pm | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 149 insertions(+), 25 deletions(-)

diff --git a/FS/FS.pm b/FS/FS.pm
index c7defbc7f..78317392a 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -1,51 +1,175 @@
 package FS;
 
 use strict;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
+use vars qw($VERSION);
 
-require Exporter;
-
-@ISA = qw(Exporter AutoLoader);
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-@EXPORT = qw(
-	
-);
 $VERSION = '0.01';
 
-
-# Preloaded methods go here.
-
-# Autoload methods go after =cut, and are processed by the autosplit program.
-
 1;
 __END__
-# Below is the stub of documentation for your module. You better edit it!
 
 =head1 NAME
 
-FS - Perl extension for blah blah blah
+FS - Freeside Perl modules
 
 =head1 SYNOPSIS
 
-  use FS;
-  blah blah blah
+FS is the temporary prefix for many disparate modules written for the Freeside
+ISP billing software.  This includes:
+
+=head2 Database metadata classes
+
+=over 4
+
+=item L<FS::dbdef|FS::dbdef> - Database class
+
+=item L<FS::dbdef_table|FS::dbdef_table> - Database table class
+
+=item L<FS::dbdef_column|FS::dbdef_column> - Database column class
+
+=item L<FS::dbdef_colgroup|FS::dbdef_colgroup> - Database column group class
+
+=item L<FS::dbdef_index|FS::dbdef_index> - Database index class
+
+=item L<FS::dbdef_unique|FS::dbdef_unique> - Database unique index class
+
+=back
+
+=head2 Utility classes
+
+=over 4
+
+=item L<FS::SSH|FS::SSH> - Simple wrappers around ssh and scp commands.
+
+=item L<FS::Conf|FS::Conf> - Freeside configuration values
+
+=item L<FS::UID|FS::UID> - User class (not yet OO)
+
+=item L<FS::CGI|FS::CGI> - Non OO-subroutines for the web interface.  This is
+depriciated.  Future development will be focused on the FS::UI user-interface
+classes (see below).
+
+=back
+
+=head2 Database record classes
+
+=over 4
+
+=item L<FS::Record|FS::Record> - Database record base class
+
+=item L<FS::svc_acct_pop|FS::svc_acct_pop> - POP (Point of Presence, not Post
+Office Protocol) class
+
+=item L<FS::part_referral|FS::part_referral> - Referral class
+
+=item L<FS::cust_main_county|FS::cust_main_county> - Locale (tax rate) class
+
+=item L<FS::svc_Common|FS::svc_Common> - Service base class
+
+=item L<FS::svc_acct|FS::svc_acct> - Account (shell, RADIUS, POP3) class
+
+=item L<FS::svc_domain|FS::svc_domain> - Domain class
+
+=item L<FS::svc_acct_sm|FS::svc_acct_sm> - Vitual mail alias class
+
+=item L<FS::part_svc|FS::part_svc> - Service definition class
+
+=item L<FS::part_pkg|FS::part_pkg> - Package (billing item) definition class
+
+=item L<FS::pkg_svc|FS::pkg_svc> - Class linking package (billing item)
+definitions (see L<FS::part_pkg>) with service definitions
+(see L<FS::part_svc>)
+
+=item L<FS::agent|FS::agent> - Agent (reseller) class
+
+=item L<FS::agent_type|FS::agent_type> - Agent type class
+
+=item L<FS::type_pkgs|FS::type_pkgs> - Class linking agent types (see
+L<FS::agent_type>) with package (billing item) definitions
+(see L<FS::part_pkg>)
+
+=item L<FS::cust_svc|FS::cust_svc> - Service class
+
+=item L<FS::cust_pkg|FS::cust_pkg> - Package (billing item) class
+
+=item L<FS::cust_main|FS::cust_main> - Customer class
+
+=item L<FS::cust_main_invoice|FS::cust_main_invoice> - Invoice destination
+class
+
+=item L<FS::cust_bill|FS::cust_bill> - Invoice class
+
+=item L<FS::cust_bill_pkg|FS::cust_bill_pkg> - Invoice line item class
+
+=item L<FS::cust_pay|FS::cust_pay> - Payment class
+
+=item L<FS::cust_credit|FS::cust_credit> - Credit class
+
+=item L<FS::cust_refund|FS::cust_refund> - Refund class
+
+=item L<FS::cust_pay_batch|FS::cust_pay_batch> - Credit card transaction queue
+class
+
+=back
+
+=head2 User Interface classes (under development; not yet usable)
+
+=over 4
+
+=item L<FS::UI::Base|FS::UI::Base> - User-interface base class
+
+=item L<FS::UI::Gtk|FS::UI::Gtk> - Gtk user-interface class
+
+=item L<FS::UI::CGI|FS::UI::CGI> - CGI (HTML) user-interface class
+
+=item L<FS::UI::agent|FS::UI::agent> - agent table user-interface class
+
+=back
+
+To quote perl(1), "If you're intending to read these straight through for the
+first time, the suggested order will tend to reduce the number of forward
+references."
 
 =head1 DESCRIPTION
 
-Stub documentation for FS was created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
+Freeside is a billing and administration package for Internet Service
+Providers.
+
+The Freeside home page is at <http://www.sisd.com/freeside>.
+
+The main documentation is in htdocs/docs.
+
+=head1 VERSION
 
-Blah blah blah.
+$Id: FS.pm,v 1.2 1999-08-04 07:34:15 ivan Exp $
+
+=head1 SUPPORT
+
+A mailing list for users and developers is available.  Send a blank message to
+<ivan-freeside-subscribe@sisd.com> to subscribe.
+
+Commercial support is available; see
+<http://www.sisd.com/freeside/commercial.html>.
 
 =head1 AUTHOR
 
-A. U. Thor, a.u.thor@a.galaxy.far.far.away
+Primarily Ivan Kohler <ivan@sisd.com>, with help from many kind folks.
+
+See the CREDITS file in the Freeside distribution for a (hopefully) complete
+list and the individal files for details.
 
 =head1 SEE ALSO
 
-perl(1).
+perl(1), main Freeside documentation in htdocs/docs/
+
+=head1 BUGS
+
+The version number of the FS Perl extension differs from the version of the
+Freeside distribution, which are both different from the CVS version tag for
+each file, which appears under the VERSION heading.
+
+Those modules which would be useful separately should be pulled out, 
+renamed appropriately and uploaded to CPAN.
 
 =cut
+
-- 
cgit v1.2.1


From c4534c2eb63a4eadfb588cefef0007e85c057036 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Aug 1999 07:38:13 +0000
Subject: move to FS directory: proper Perl module installation has arrived!

---
 site_perl/Bill.pm               |   44 --
 site_perl/CGI.pm                |  264 ----------
 site_perl/Conf.pm               |  129 -----
 site_perl/Invoice.pm            |   45 --
 site_perl/Record.pm             | 1002 ------------------------------------
 site_perl/SSH.pm                |  157 ------
 site_perl/UID.pm                |  326 ------------
 site_perl/agent.pm              |  168 ------
 site_perl/agent_type.pm         |  192 -------
 site_perl/cust_bill.pm          |  482 ------------------
 site_perl/cust_bill_pkg.pm      |  150 ------
 site_perl/cust_credit.pm        |  191 -------
 site_perl/cust_main.pm          | 1070 ---------------------------------------
 site_perl/cust_main_county.pm   |  132 -----
 site_perl/cust_main_invoice.pm  |  214 --------
 site_perl/cust_pay.pm           |  207 --------
 site_perl/cust_pay_batch.pm     |  235 ---------
 site_perl/cust_pkg.pm           |  558 --------------------
 site_perl/cust_refund.pm        |  204 --------
 site_perl/cust_svc.pm           |  189 -------
 site_perl/dbdef.pm              |  174 -------
 site_perl/dbdef_colgroup.pm     |  108 ----
 site_perl/dbdef_column.pm       |  192 -------
 site_perl/dbdef_index.pm        |   43 --
 site_perl/dbdef_table.pm        |  258 ----------
 site_perl/dbdef_unique.pm       |   44 --
 site_perl/part_pkg.pm           |  204 --------
 site_perl/part_referral.pm      |  123 -----
 site_perl/part_svc.pm           |  182 -------
 site_perl/pkg_svc.pm            |  173 -------
 site_perl/svc_Common.pm         |  217 --------
 site_perl/svc_acct.pm           |  514 -------------------
 site_perl/svc_acct_pop.pm       |  124 -----
 site_perl/svc_acct_sm.pm        |  266 ----------
 site_perl/svc_domain.pm         |  458 -----------------
 site_perl/table_template-svc.pm |  177 -------
 site_perl/table_template.pm     |  134 -----
 site_perl/type_pkgs.pm          |  128 -----
 38 files changed, 9478 deletions(-)
 delete mode 100644 site_perl/Bill.pm
 delete mode 100644 site_perl/CGI.pm
 delete mode 100644 site_perl/Conf.pm
 delete mode 100644 site_perl/Invoice.pm
 delete mode 100644 site_perl/Record.pm
 delete mode 100644 site_perl/SSH.pm
 delete mode 100644 site_perl/UID.pm
 delete mode 100644 site_perl/agent.pm
 delete mode 100644 site_perl/agent_type.pm
 delete mode 100644 site_perl/cust_bill.pm
 delete mode 100644 site_perl/cust_bill_pkg.pm
 delete mode 100644 site_perl/cust_credit.pm
 delete mode 100644 site_perl/cust_main.pm
 delete mode 100644 site_perl/cust_main_county.pm
 delete mode 100644 site_perl/cust_main_invoice.pm
 delete mode 100644 site_perl/cust_pay.pm
 delete mode 100644 site_perl/cust_pay_batch.pm
 delete mode 100644 site_perl/cust_pkg.pm
 delete mode 100644 site_perl/cust_refund.pm
 delete mode 100644 site_perl/cust_svc.pm
 delete mode 100644 site_perl/dbdef.pm
 delete mode 100644 site_perl/dbdef_colgroup.pm
 delete mode 100644 site_perl/dbdef_column.pm
 delete mode 100644 site_perl/dbdef_index.pm
 delete mode 100644 site_perl/dbdef_table.pm
 delete mode 100644 site_perl/dbdef_unique.pm
 delete mode 100644 site_perl/part_pkg.pm
 delete mode 100644 site_perl/part_referral.pm
 delete mode 100644 site_perl/part_svc.pm
 delete mode 100644 site_perl/pkg_svc.pm
 delete mode 100644 site_perl/svc_Common.pm
 delete mode 100644 site_perl/svc_acct.pm
 delete mode 100644 site_perl/svc_acct_pop.pm
 delete mode 100644 site_perl/svc_acct_sm.pm
 delete mode 100644 site_perl/svc_domain.pm
 delete mode 100644 site_perl/table_template-svc.pm
 delete mode 100644 site_perl/table_template.pm
 delete mode 100644 site_perl/type_pkgs.pm

diff --git a/site_perl/Bill.pm b/site_perl/Bill.pm
deleted file mode 100644
index 4d7e059ed..000000000
--- a/site_perl/Bill.pm
+++ /dev/null
@@ -1,44 +0,0 @@
-package FS::Bill;
-
-use strict;
-use vars qw(@ISA);
-use FS::cust_main;
-
-@ISA = qw(FS::cust_main);
-
-warn "FS::Bill depriciated\n";
-
-=head1 NAME
-
-FS::Bill - Legacy stub
-
-=head1 SYNOPSIS
-
-The functionality of FS::Bill has been integrated into FS::cust_main.
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-jul-24 - 25 - 28
-
-use Safe; evaluate all fees with perl (still on TODO list until I write
-some examples & test opmask to see if we can read db)
-%hash=$obj->hash later ivan@sisd.com 98-mar-13
-
-packages with no next bill date start at $time not time, this should
-eliminate the last of the problems with billing at a past date
-also rewrite the invoice priting logic not to print invoices for things
-that haven't happended yet and update $cust_bill->printed when we print
-so PAST DUE notices work, and s/date/_date/ 
-ivan@sisd.com 98-jun-4
-
-more logic for past due stuff - packages with no next bill date start
-at $cust_pkg->setup || $time ivan@sisd.com 98-jul-13
-
-moved a few things in collection logic; negative charges should work
-ivan@sisd.com 98-aug-6
-
-pod, moved everything to FS::cust_main ivan@sisd.com 98-sep-19
-
-=cut
-
-1;
diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
deleted file mode 100644
index 3ce53de9b..000000000
--- a/site_perl/CGI.pm
+++ /dev/null
@@ -1,264 +0,0 @@
-package FS::CGI;
-
-use strict;
-use vars qw(@EXPORT_OK @ISA);
-use Exporter;
-use CGI;
-use URI::URL;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID;
-
-@ISA = qw(Exporter);
-@EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable);
-
-=head1 NAME
-
-FS::CGI - Subroutines for the web interface
-
-=head1 SYNOPSIS
-
-  use FS::CGI qw(header menubar idiot eidiot popurl);
-
-  print header( 'Title', '' );
-  print header( 'Title', menubar('item', 'URL', ... ) );
-
-  idiot "error message"; 
-  eidiot "error message";
-
-  $url = popurl; #returns current url
-  $url = popurl(3); #three levels up
-
-=head1 DESCRIPTION
-
-Provides a few common subroutines for the web interface.
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item header TITLE, MENUBAR
-
-Returns an HTML header.
-
-=cut
-
-sub header {
-  my($title,$menubar)=@_;
-
-  my $x =  <<END;
-    <HTML>
-      <HEAD>
-        <TITLE>
-          $title
-        </TITLE>
-      </HEAD>
-      <BODY BGCOLOR="#e8e8e8">
-          <FONT SIZE=7>
-            $title
-          </FONT>
-          <BR><BR>
-END
-  $x .=  $menubar. "<BR><BR>" if $menubar;
-  $x;
-}
-
-=item menubar ITEM, URL, ...
-
-Returns an HTML menubar.
-
-=cut
-
-sub menubar { #$menubar=menubar('Main Menu', '../', 'Item', 'url', ... );
-  my($item,$url,@html);
-  while (@_) {
-    ($item,$url)=splice(@_,0,2);
-    push @html, qq!<A HREF="$url">$item</A>!;
-  }
-  join(' | ',@html);
-}
-
-=item idiot ERROR
-
-This is depriciated.  Don't use it.
-
-Sends headers and an HTML error message.
-
-=cut
-
-sub idiot {
-  #warn "idiot depriciated";
-  my($error)=@_;
-  my $cgi = &FS::UID::cgi();
-  if ( $cgi->isa('CGI::Base') ) {
-    no strict 'subs';
-    &CGI::Base::SendHeaders;
-  } else {
-    print $cgi->header( '-expires' => 'now' );
-  }
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error processing your request</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Error processing your request</H4>
-    </CENTER>
-    Your request could not be processed because of the following error:
-    <P><B>$error</B>
-  </BODY>
-</HTML>
-END
-
-}
-
-=item eidiot ERROR
-
-This is depriciated.  Don't use it.
-
-Sends headers and an HTML error message, then exits.
-
-=cut
-
-sub eidiot {
-  #warn "eidiot depriciated";
-  idiot(@_);
-  exit;
-}
-
-=item popurl LEVEL
-
-Returns current URL with LEVEL levels of path removed from the end (default 0).
-
-=cut
-
-sub popurl {
-  my($up)=@_;
-  my($cgi)=&FS::UID::cgi;
-  my($url)=new URI::URL $cgi->url;
-  my(@path)=$url->path_components;
-  splice @path, 0-$up;
-  $url->path_components(@path);
-  my $x = $url->as_string;
-  $x .= '/' unless $x =~ /\/$/;
-  $x;
-}
-
-=item table
-
-Returns HTML tag for beginning a table.
-
-=cut
-
-sub table {
-  my $col = shift;
-  if ( $col ) {
-    qq!<TABLE BGCOLOR="$col" BORDER=1 WIDTH="100%">!;
-  } else { 
-    "<TABLE BORDER=1>";
-  }
-}
-
-=item itable
-
-Returns HTML tag for beginning an (invisible) table.
-
-=cut
-
-sub itable {
-  my $col = shift;
-  my $cellspacing = shift || 0;
-  if ( $col ) {
-    qq!<TABLE BGCOLOR="$col" BORDER=0 CELLSPACING=$cellspacing WIDTH="100%">!;
-  } else {
-    qq!<TABLE BORDER=0 CELLSPACING=$cellspacing WIDTH="100%">!;
-  }
-}
-
-=item ntable
-
-This is getting silly.
-
-=cut
-
-sub ntable {
-  my $col = shift;
-  my $cellspacing = shift || 0;
-  if ( $col ) {
-    qq!<TABLE BGCOLOR="$col" BORDER=0 CELLSPACING=$cellspacing>!;
-  } else {
-    "<TABLE BORDER>";
-  }
-
-}
-
-=back
-
-=head1 BUGS
-
-Not OO.
-
-Not complete.
-
-=head1 SEE ALSO
-
-L<CGI>, L<CGI::Base>
-
-=head1 HISTORY
-
-subroutines for the HTML/CGI GUI, not properly OO. :(
-
-ivan@sisd.com 98-apr-16
-ivan@sisd.com 98-jun-22
-
-lose the background, eidiot ivan@sisd.com 98-sep-2
-
-pod ivan@sisd.com 98-sep-12
-
-$Log: CGI.pm,v $
-Revision 1.18  1999-04-15 15:22:12  ivan
-make &idiot() work, yuck.
-
-Revision 1.17  1999/02/07 09:59:43  ivan
-more mod_perl fixes, and bugfixes Peter Wemm sent via email
-
-Revision 1.16  1999/01/25 12:26:05  ivan
-yet more mod_perl stuff
-
-Revision 1.15  1999/01/18 09:41:48  ivan
-all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-(good idea anyway)
-
-Revision 1.14  1999/01/18 09:22:37  ivan
-changes to track email addresses for email invoicing
-
-Revision 1.12  1998/12/23 02:23:16  ivan
-popurl always has trailing slash
-
-Revision 1.11  1998/11/12 07:43:54  ivan
-*** empty log message ***
-
-Revision 1.10  1998/11/12 01:53:47  ivan
-added table command
-
-Revision 1.9  1998/11/09 08:51:49  ivan
-bug squash
-
-Revision 1.7  1998/11/09 06:10:59  ivan
-added sub url
-
-Revision 1.6  1998/11/09 05:44:20  ivan
-*** empty log message ***
-
-Revision 1.4  1998/11/09 04:55:42  ivan
-support depriciated CGI::Base as well as CGI.pm (for now)
-
-Revision 1.3  1998/11/08 10:50:19  ivan
-s/CGI::Base/CGI/; etc.
-
-
-=cut
-
-1;
-
-
diff --git a/site_perl/Conf.pm b/site_perl/Conf.pm
deleted file mode 100644
index 0b2d5b328..000000000
--- a/site_perl/Conf.pm
+++ /dev/null
@@ -1,129 +0,0 @@
-package FS::Conf;
-
-use vars qw($default_dir);
-use IO::File;
-
-=head1 NAME
-
-FS::Conf - Read access to Freeside configuration values
-
-=head1 SYNOPSIS
-
-  use FS::Conf;
-
-  $conf = new FS::Conf "/config/directory";
-
-  $FS::Conf::default_dir = "/config/directory";
-  $conf = new FS::Conf;
-
-  $dir = $conf->dir;
-
-  $value = $conf->config('key');
-  @list  = $conf->config('key');
-  $bool  = $conf->exists('key');
-
-=head1 DESCRIPTION
-
-Read access to Freeside configuration values.  Keys currently map to filenames,
-but this may change in the future.
-
-=head1 METHODS
-
-=over 4
-
-=item new [ DIRECTORY ]
-
-Create a new configuration object.  A directory arguement is required if
-$FS::Conf::default_dir has not been set.
-
-=cut
-
-sub new {
-  my($proto,$dir) = @_;
-  my($class) = ref($proto) || $proto;
-  my($self) = { 'dir' => $dir || $default_dir } ;
-  bless ($self, $class);
-}
-
-=item dir
-
-Returns the directory.
-
-=cut
-
-sub dir {
-  my($self) = @_;
-  my $dir = $self->{dir};
-  -e $dir or die "FATAL: $dir doesn't exist!";
-  -d $dir or die "FATAL: $dir isn't a directory!";
-  -r $dir or die "FATAL: Can't read $dir!";
-  -x $dir or die "FATAL: $dir not searchable (executable)!";
-  $dir;
-}
-
-=item config 
-
-Returns the configuration value or values (depending on context) for key.
-
-=cut
-
-sub config {
-  my($self,$file)=@_;
-  my($dir)=$self->dir;
-  my $fh = new IO::File "<$dir/$file" or return;
-  if ( wantarray ) {
-    map {
-      /^(.*)$/
-        or die "Illegal line (array context) in $dir/$file:\n$_\n";
-      $1;
-    } <$fh>;
-  } else {
-    <$fh> =~ /^(.*)$/
-      or die "Illegal line (scalar context) in $dir/$file:\n$_\n";
-    $1;
-  }
-}
-
-=item exists
-
-Returns true if the specified key exists, even if the corresponding value
-is undefined.
-
-=cut
-
-sub exists {
-  my($self,$file)=@_;
-  my($dir) = $self->dir;
-  -e "$dir/$file";
-}
-
-=back
-
-=head1 BUGS
-
-Write access (with locking) should be implemented.
-
-=head1 SEE ALSO
-
-config.html from the base documentation contains a list of configuration files.
-
-=head1 HISTORY
-
-Ivan Kohler <ivan@sisd.com> 98-sep-6
-
-sub exists forgot to fetch $dir ivan@sisd.com 98-sep-27
-
-$Log: Conf.pm,v $
-Revision 1.4  1999-05-11 10:09:13  ivan
-try to diagnose strange multiple-line problem
-
-Revision 1.3  1999/03/29 01:29:33  ivan
-die unless the configuration directory exists
-
-Revision 1.2  1998/11/13 04:08:44  ivan
-no default default_dir (ironic)
-
-
-=cut
-
-1;
diff --git a/site_perl/Invoice.pm b/site_perl/Invoice.pm
deleted file mode 100644
index 7fdcaaf6f..000000000
--- a/site_perl/Invoice.pm
+++ /dev/null
@@ -1,45 +0,0 @@
-package FS::Invoice;
-
-use strict;
-use vars qw(@ISA);
-use FS::cust_bill;
-
-@ISA = qw(FS::cust_bill);
-
-warn "FS::Invoice depriciated\n";
-
-=head1 NAME
-
-FS::Invoice - Legacy stub
-
-=head1 SYNOPSIS
-
-The functionality of FS::Invoice has been integrated in FS::cust_bill.
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-jun-25 - 27
-
-maybe should be changed to be OO-functions on $cust_bill objects?
-(instead of passing invnum, ugh).
-
-ISA cust_bill and return inovice instead of passing filehandle
-ivan@sisd.com 98-mar-13
- 
-(add postscript output!)
-
-close our kid when we're done ivan@sisd.com 98-jun-4
-
-separated code which shuffled data from code which formatted.
-(so i could) fixed past due notices showing up when balance due =< 0
-return address comes from /var/spool/freeside/conf/address
-ivan@sisd.com 98-jul-2
-
-pod ivan@sisd.com 98-sep-20something
-
-s/ISA/@ISA/ in use vars ivan@sisd.com 98-sep-27
-
-=cut
-
-1;
-
diff --git a/site_perl/Record.pm b/site_perl/Record.pm
deleted file mode 100644
index 5d69619ef..000000000
--- a/site_perl/Record.pm
+++ /dev/null
@@ -1,1002 +0,0 @@
-package FS::Record;
-
-use strict;
-use vars qw($dbdef_file $dbdef $setup_hack $AUTOLOAD @ISA @EXPORT_OK);
-use subs qw(reload_dbdef);
-use Exporter;
-use Carp qw(carp cluck croak confess);
-use File::CounterFile;
-use FS::UID qw(dbh checkruid swapuid getotaker datasrc);
-use FS::dbdef;
-
-@ISA = qw(Exporter);
-@EXPORT_OK = qw(dbh fields hfields qsearch qsearchs dbdef);
-
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::Record'} = sub { 
-  $File::CounterFile::DEFAULT_DIR = "/usr/local/etc/freeside/counters.". datasrc;
-  $dbdef_file = "/usr/local/etc/freeside/dbdef.". datasrc;
-  &reload_dbdef unless $setup_hack; #$setup_hack needed now?
-};
-
-=head1 NAME
-
-FS::Record - Database record objects
-
-=head1 SYNOPSIS
-
-    use FS::Record;
-    use FS::Record qw(dbh fields qsearch qsearchs dbdef);
-
-    $record = new FS::Record 'table', \%hash;
-    $record = new FS::Record 'table', { 'column' => 'value', ... };
-
-    $record  = qsearchs FS::Record 'table', \%hash;
-    $record  = qsearchs FS::Record 'table', { 'column' => 'value', ... };
-    @records = qsearch  FS::Record 'table', \%hash; 
-    @records = qsearch  FS::Record 'table', { 'column' => 'value', ... };
-
-    $table = $record->table;
-    $dbdef_table = $record->dbdef_table;
-
-    $value = $record->get('column');
-    $value = $record->getfield('column');
-    $value = $record->column;
-
-    $record->set( 'column' => 'value' );
-    $record->setfield( 'column' => 'value' );
-    $record->column('value');
-
-    %hash = $record->hash;
-
-    $hashref = $record->hashref;
-
-    $error = $record->insert;
-    #$error = $record->add; #depriciated
-
-    $error = $record->delete;
-    #$error = $record->del; #depriciated
-
-    $error = $new_record->replace($old_record);
-    #$error = $new_record->rep($old_record); #depriciated
-
-    $value = $record->unique('column');
-
-    $value = $record->ut_float('column');
-    $value = $record->ut_number('column');
-    $value = $record->ut_numbern('column');
-    $value = $record->ut_money('column');
-    $value = $record->ut_text('column');
-    $value = $record->ut_textn('column');
-    $value = $record->ut_alpha('column');
-    $value = $record->ut_alphan('column');
-    $value = $record->ut_phonen('column');
-    $value = $record->ut_anythingn('column');
-
-    $dbdef = reload_dbdef;
-    $dbdef = reload_dbdef "/non/standard/filename";
-    $dbdef = dbdef;
-
-    $quoted_value = _quote($value,'table','field');
-
-    #depriciated
-    $fields = hfields('table');
-    if ( $fields->{Field} ) { # etc.
-
-    @fields = fields 'table'; #as a subroutine
-    @fields = $record->fields; #as a method call
-
-
-=head1 DESCRIPTION
-
-(Mostly) object-oriented interface to database records.  Records are currently
-implemented on top of DBI.  FS::Record is intended as a base class for
-table-specific classes to inherit from, i.e. FS::cust_main.
-
-=head1 CONSTRUCTORS
-
-=over 4
-
-=item new [ TABLE, ] HASHREF
-
-Creates a new record.  It doesn't store it in the database, though.  See
-L<"insert"> for that.
-
-Note that the object stores this hash reference, not a distinct copy of the
-hash it points to.  You can ask the object for a copy with the I<hash> 
-method.
-
-TABLE can only be omitted when a dervived class overrides the table method.
-
-=cut
-
-sub new { 
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = {};
-  bless ($self, $class);
-
-  $self->{'Table'} = shift unless defined ( $self->table );
-
-  my $hashref = $self->{'Hash'} = shift;
-
-  foreach my $field ( $self->fields ) { 
-    $hashref->{$field}='' unless defined $hashref->{$field};
-    #trim the '$' and ',' from money fields for Pg (belong HERE?)
-    #(what about Pg i18n?)
-    if ( datasrc =~ m/Pg/ 
-         && $self->dbdef_table->column($field)->type eq 'money' ) {
-      ${$hashref}{$field} =~ s/^\$//;
-      ${$hashref}{$field} =~ s/\,//;
-    }
-  }
-
-  $self;
-}
-
-sub create {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = {};
-  bless ($self, $class);
-  if ( defined $self->table ) {
-    cluck "create constructor is depriciated, use new!";
-    $self->new(@_);
-  } else {
-    croak "FS::Record::create called (not from a subclass)!";
-  }
-}
-
-=item qsearch TABLE, HASHREF
-
-Searches the database for all records matching (at least) the key/value pairs
-in HASHREF.  Returns all the records found as `FS::TABLE' objects if that
-module is loaded (i.e. via `use FS::cust_main;'), otherwise returns FS::Record
-objects.
-
-=cut
-
-sub qsearch {
-  my($table,$record) = @_;
-  my($dbh) = dbh;
-
-  my(@fields)=grep exists($record->{$_}), fields($table);
-
-  my($sth);
-  my($statement) = "SELECT * FROM $table". ( @fields
-    ? " WHERE ". join(' AND ',
-      map {
-        $record->{$_} eq ''
-          ? ( datasrc =~ m/Pg/
-                ? "$_ IS NULL"
-                : "( $_ IS NULL OR $_ = \"\" )"
-            )
-          : "$_ = ". _quote($record->{$_},$table,$_)
-      } @fields
-    ) : ''
-  );
-  $sth=$dbh->prepare($statement)
-    or croak $dbh->errstr; #is that a little too harsh?  hmm.
-  #warn $statement #if $debug # or some such;
-
-  if ( eval ' scalar(@FS::'. $table. '::ISA);' ) {
-    map {
-      eval 'new FS::'. $table. ' ( $sth->fetchrow_hashref );';
-    } ( 1 .. $sth->execute );
-  } else {
-    cluck "qsearch: warning: FS::$table not loaded; returning generic FS::Record objects";
-    map {
-      new FS::Record ($table,$sth->fetchrow_hashref);
-    } ( 1 .. $sth->execute );
-  }
-
-}
-
-=item qsearchs TABLE, HASHREF
-
-Same as qsearch, except that if more than one record matches, it B<carp>s but
-returns the first.  If this happens, you either made a logic error in asking
-for a single item, or your data is corrupted.
-
-=cut
-
-sub qsearchs { # $result_record = &FS::Record:qsearchs('table',\%hash);
-  my(@result) = qsearch(@_);
-  carp "warning: Multiple records in scalar search!" if scalar(@result) > 1;
-    #should warn more vehemently if the search was on a primary key?
-  $result[0];
-}
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item table
-
-Returns the table name.
-
-=cut
-
-sub table {
-#  cluck "warning: FS::Record::table depriciated; supply one in subclass!";
-  my $self = shift;
-  $self -> {'Table'};
-}
-
-=item dbdef_table
-
-Returns the FS::dbdef_table object for the table.
-
-=cut
-
-sub dbdef_table {
-  my($self)=@_;
-  my($table)=$self->table;
-  $dbdef->table($table);
-}
-
-=item get, getfield COLUMN
-
-Returns the value of the column/field/key COLUMN.
-
-=cut
-
-sub get {
-  my($self,$field) = @_;
-  # to avoid "Use of unitialized value" errors
-  if ( defined ( $self->{Hash}->{$field} ) ) {
-    $self->{Hash}->{$field};
-  } else { 
-    '';
-  }
-}
-sub getfield {
-  my $self = shift;
-  $self->get(@_);
-}
-
-=item set, setfield COLUMN, VALUE
-
-Sets the value of the column/field/key COLUMN to VALUE.  Returns VALUE.
-
-=cut
-
-sub set { 
-  my($self,$field,$value) = @_;
-  $self->{'Hash'}->{$field} = $value;
-}
-sub setfield {
-  my $self = shift;
-  $self->set(@_);
-}
-
-=item AUTLOADED METHODS
-
-$record->column is a synonym for $record->get('column');
-
-$record->column('value') is a synonym for $record->set('column','value');
-
-=cut
-
-sub AUTOLOAD {
-  my($self,$value)=@_;
-  my($field)=$AUTOLOAD;
-  $field =~ s/.*://;
-  if ( defined($value) ) {
-    $self->setfield($field,$value);
-  } else {
-    $self->getfield($field);
-  }    
-}
-
-=item hash
-
-Returns a list of the column/value pairs, usually for assigning to a new hash.
-
-To make a distinct duplicate of an FS::Record object, you can do:
-
-    $new = new FS::Record ( $old->table, { $old->hash } );
-
-=cut
-
-sub hash {
-  my($self) = @_;
-  %{ $self->{'Hash'} }; 
-}
-
-=item hashref
-
-Returns a reference to the column/value hash.
-
-=cut
-
-sub hashref {
-  my($self) = @_;
-  $self->{'Hash'};
-}
-
-=item insert
-
-Inserts this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-sub insert {
-  my $self = shift;
-
-  my $error = $self->check;
-  return $error if $error;
-
-  #single-field unique keys are given a value if false
-  #(like MySQL's AUTO_INCREMENT)
-  foreach ( $self->dbdef_table->unique->singles ) {
-    $self->unique($_) unless $self->getfield($_);
-  }
-  #and also the primary key
-  my $primary_key = $self->dbdef_table->primary_key;
-  $self->unique($primary_key) 
-    if $primary_key && ! $self->getfield($primary_key);
-
-  my @fields =
-    grep defined($self->getfield($_)) && $self->getfield($_) ne "",
-    $self->fields
-  ;
-
-  my $statement = "INSERT INTO ". $self->table. " ( ".
-      join(', ',@fields ).
-    ") VALUES (".
-      join(', ',map(_quote($self->getfield($_),$self->table,$_), @fields)).
-    ")"
-  ;
-  my $sth = dbh->prepare($statement) or return dbh->errstr;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE'; 
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  $sth->execute or return $sth->errstr;
-
-  '';
-}
-
-=item add
-
-Depriciated (use insert instead).
-
-=cut
-
-sub add {
-  cluck "warning: FS::Record::add depriciated!";
-  insert @_; #call method in this scope
-}
-
-=item delete
-
-Delete this record from the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-sub delete {
-  my $self = shift;
-
-  my($statement)="DELETE FROM ". $self->table. " WHERE ". join(' AND ',
-    map {
-      $self->getfield($_) eq ''
-        #? "( $_ IS NULL OR $_ = \"\" )"
-        ? ( datasrc =~ m/Pg/
-              ? "$_ IS NULL"
-              : "( $_ IS NULL OR $_ = \"\" )"
-          )
-        : "$_ = ". _quote($self->getfield($_),$self->table,$_)
-    } ( $self->dbdef_table->primary_key )
-          ? ( $self->dbdef_table->primary_key)
-          : $self->fields
-  );
-  my $sth = dbh->prepare($statement) or return dbh->errstr;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE'; 
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $rc = $sth->execute or return $sth->errstr;
-  #not portable #return "Record not found, statement:\n$statement" if $rc eq "0E0";
-
-  undef $self; #no need to keep object!
-
-  '';
-}
-
-=item del
-
-Depriciated (use delete instead).
-
-=cut
-
-sub del {
-  cluck "warning: FS::Record::del depriciated!";
-  &delete(@_); #call method in this scope
-}
-
-=item replace OLD_RECORD
-
-Replace the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-
-  my @diff = grep $new->getfield($_) ne $old->getfield($_), $old->fields;
-  unless ( @diff ) {
-    carp "warning: records identical";
-    return '';
-  }
-
-  return "Records not in same table!" unless $new->table eq $old->table;
-
-  my $primary_key = $old->dbdef_table->primary_key;
-  return "Can't change $primary_key"
-    if $primary_key
-       && ( $old->getfield($primary_key) ne $new->getfield($primary_key) );
-
-  my $error = $new->check;
-  return $error if $error;
-
-  my $statement = "UPDATE ". $old->table. " SET ". join(', ',
-    map {
-      "$_ = ". _quote($new->getfield($_),$old->table,$_) 
-    } @diff
-  ). ' WHERE '.
-    join(' AND ',
-      map {
-        $old->getfield($_) eq ''
-          #? "( $_ IS NULL OR $_ = \"\" )"
-          ? ( datasrc =~ m/Pg/
-                ? "$_ IS NULL"
-                : "( $_ IS NULL OR $_ = \"\" )"
-            )
-          : "$_ = ". _quote($old->getfield($_),$old->table,$_)
-      } ( $primary_key ? ( $primary_key ) : $old->fields )
-    )
-  ;
-  my $sth = dbh->prepare($statement) or return dbh->errstr;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE'; 
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $rc = $sth->execute or return $sth->errstr;
-  #not portable #return "Record not found (or records identical)." if $rc eq "0E0";
-
-  '';
-
-}
-
-=item rep
-
-Depriciated (use replace instead).
-
-=cut
-
-sub rep {
-  cluck "warning: FS::Record::rep depriciated!";
-  replace @_; #call method in this scope
-}
-
-=item check
-
-Not yet implemented, croaks.  Derived classes should provide a check method.
-
-=cut
-
-sub check {
-  confess "FS::Record::check not implemented; supply one in subclass!";
-}
-
-=item unique COLUMN
-
-Replaces COLUMN in record with a unique number.  Called by the B<add> method
-on primary keys and single-field unique columns (see L<FS::dbdef_table>).
-Returns the new value.
-
-=cut
-
-sub unique {
-  my($self,$field) = @_;
-  my($table)=$self->table;
-
-  croak("&FS::UID::checkruid failed") unless &checkruid;
-
-  croak "Unique called on field $field, but it is ",
-        $self->getfield($field),
-        ", not null!"
-    if $self->getfield($field);
-
-  #warn "table $table is tainted" if is_tainted($table);
-  #warn "field $field is tainted" if is_tainted($field);
-
-  &swapuid;
-  my($counter) = new File::CounterFile "$table.$field",0;
-# hack for web demo
-#  getotaker() =~ /^([\w\-]{1,16})$/ or die "Illegal CGI REMOTE_USER!";
-#  my($user)=$1;
-#  my($counter) = new File::CounterFile "$user/$table.$field",0;
-# endhack
-
-  my($index)=$counter->inc;
-  $index=$counter->inc
-    while qsearchs($table,{$field=>$index}); #just in case
-  &swapuid;
-
-  $index =~ /^(\d*)$/;
-  $index=$1;
-
-  $self->setfield($field,$index);
-
-}
-
-=item ut_float COLUMN
-
-Check/untaint floating point numeric data: 1.1, 1, 1.1e10, 1e10.  May not be
-null.  If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub ut_float {
-  my($self,$field)=@_ ;
-  ($self->getfield($field) =~ /^(\d+\.\d+)$/ ||
-   $self->getfield($field) =~ /^(\d+)$/ ||
-   $self->getfield($field) =~ /^(\d+\.\d+e\d+)$/ ||
-   $self->getfield($field) =~ /^(\d+e\d+)$/)
-    or return "Illegal or empty (float) $field: ". $self->getfield($field);
-  $self->setfield($field,$1);
-  '';
-}
-
-=item ut_number COLUMN
-
-Check/untaint simple numeric data (whole numbers).  May not be null.  If there
-is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub ut_number {
-  my($self,$field)=@_;
-  $self->getfield($field) =~ /^(\d+)$/
-    or return "Illegal or empty (numeric) $field: ". $self->getfield($field);
-  $self->setfield($field,$1);
-  '';
-}
-
-=item ut_numbern COLUMN
-
-Check/untaint simple numeric data (whole numbers).  May be null.  If there is
-an error, returns the error, otherwise returns false.
-
-=cut
-
-sub ut_numbern {
-  my($self,$field)=@_;
-  $self->getfield($field) =~ /^(\d*)$/
-    or return "Illegal (numeric) $field: ". $self->getfield($field);
-  $self->setfield($field,$1);
-  '';
-}
-
-=item ut_money COLUMN
-
-Check/untaint monetary numbers.  May be negative.  Set to 0 if null.  If there
-is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub ut_money {
-  my($self,$field)=@_;
-  $self->setfield($field, 0) if $self->getfield($field) eq '';
-  $self->getfield($field) =~ /^(\-)? ?(\d*)(\.\d{2})?$/
-    or return "Illegal (money) $field: ". $self->getfield($field);
-  #$self->setfield($field, "$1$2$3" || 0);
-  $self->setfield($field, ( ($1||''). ($2||''). ($3||'') ) || 0);
-  '';
-}
-
-=item ut_text COLUMN
-
-Check/untaint text.  Alphanumerics, spaces, and the following punctuation
-symbols are currently permitted: ! @ # $ % & ( ) - + ; : ' " , . ? /
-May not be null.  If there is an error, returns the error, otherwise returns
-false.
-
-=cut
-
-sub ut_text {
-  my($self,$field)=@_;
-  $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/]+)$/
-    or return "Illegal or empty (text) $field: ". $self->getfield($field);
-  $self->setfield($field,$1);
-  '';
-}
-
-=item ut_textn COLUMN
-
-Check/untaint text.  Alphanumerics, spaces, and the following punctuation
-symbols are currently permitted: ! @ # $ % & ( ) - + ; : ' " , . ? /
-May be null.  If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub ut_textn {
-  my($self,$field)=@_;
-  $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/]*)$/
-    or return "Illegal (text) $field: ". $self->getfield($field);
-  $self->setfield($field,$1);
-  '';
-}
-
-=item ut_alpha COLUMN
-
-Check/untaint alphanumeric strings (no spaces).  May not be null.  If there is
-an error, returns the error, otherwise returns false.
-
-=cut
-
-sub ut_alpha {
-  my($self,$field)=@_;
-  $self->getfield($field) =~ /^(\w+)$/
-    or return "Illegal or empty (alphanumeric) $field: ".
-              $self->getfield($field);
-  $self->setfield($field,$1);
-  '';
-}
-
-=item ut_alpha COLUMN
-
-Check/untaint alphanumeric strings (no spaces).  May be null.  If there is an
-error, returns the error, otherwise returns false.
-
-=cut
-
-sub ut_alphan {
-  my($self,$field)=@_;
-  $self->getfield($field) =~ /^(\w*)$/ 
-    or return "Illegal (alphanumeric) $field: ". $self->getfield($field);
-  $self->setfield($field,$1);
-  '';
-}
-
-=item ut_phonen COLUMN
-
-Check/untaint phone numbers.  May be null.  If there is an error, returns
-the error, otherwise returns false.
-
-=cut
-
-sub ut_phonen {
-  my($self,$field)=@_;
-  my $phonen = $self->getfield($field);
-  if ( $phonen eq '' ) {
-    $self->setfield($field,'');
-  } else {
-    $phonen =~ s/\D//g;
-    $phonen =~ /^(\d{3})(\d{3})(\d{4})(\d*)$/
-      or return "Illegal (phone) $field: ". $self->getfield($field);
-    $phonen = "$1-$2-$3";
-    $phonen .= " x$4" if $4;
-    $self->setfield($field,$phonen);
-  }
-  '';
-}
-
-=item ut_anything COLUMN
-
-Untaints arbitrary data.  Be careful.
-
-=cut
-
-sub ut_anything {
-  my($self,$field)=@_;
-  $self->getfield($field) =~ /^(.*)$/
-    or return "Illegal $field: ". $self->getfield($field);
-  $self->setfield($field,$1);
-  '';
-}
-
-=item fields [ TABLE ]
-
-This can be used as both a subroutine and a method call.  It returns a list
-of the columns in this record's table, or an explicitly specified table.
-(See L<dbdef_table>).
-
-=cut
-
-# Usage: @fields = fields($table);
-#        @fields = $record->fields;
-sub fields {
-  my $something = shift;
-  my $table;
-  if ( ref($something) ) {
-    $table = $something->table;
-  } else {
-    $table = $something;
-  }
-  #croak "Usage: \@fields = fields(\$table)\n   or: \@fields = \$record->fields" unless $table;
-  my($table_obj) = $dbdef->table($table);
-  croak "Unknown table $table" unless $table_obj;
-  $table_obj->columns;
-}
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item reload_dbdef([FILENAME])
-
-Load a database definition (see L<FS::dbdef>), optionally from a non-default
-filename.  This command is executed at startup unless
-I<$FS::Record::setup_hack> is true.  Returns a FS::dbdef object.
-
-=cut
-
-sub reload_dbdef {
-  my $file = shift || $dbdef_file;
-  $dbdef = load FS::dbdef ($file);
-}
-
-=item dbdef
-
-Returns the current database definition.  See L<FS::dbdef>.
-
-=cut
-
-sub dbdef { $dbdef; }
-
-=item _quote VALUE, TABLE, COLUMN
-
-This is an internal function used to construct SQL statements.  It returns
-VALUE DBI-quoted (see L<DBI/"quote">) unless VALUE is a number and the column
-type (see L<dbdef_column>) does not end in `char' or `binary'.
-
-=cut
-
-sub _quote {
-  my($value,$table,$field)=@_;
-  my($dbh)=dbh;
-  if ( $value =~ /^\d+(\.\d+)?$/ && 
-#       ! ( datatype($table,$field) =~ /^char/ ) 
-       ! ( $dbdef->table($table)->column($field)->type =~ /(char|binary)$/i ) 
-  ) {
-    $value;
-  } else {
-    $dbh->quote($value);
-  }
-}
-
-=item hfields TABLE
-
-This is depriciated.  Don't use it.
-
-It returns a hash-type list with the fields of this record's table set true.
-
-=cut
-
-sub hfields {
-  carp "warning: hfields is depriciated";
-  my($table)=@_;
-  my(%hash);
-  foreach (fields($table)) {
-    $hash{$_}=1;
-  }
-  \%hash;
-}
-
-#sub _dump {
-#  my($self)=@_;
-#  join("\n", map {
-#    "$_: ". $self->getfield($_). "|"
-#  } (fields($self->table)) );
-#}
-
-#sub DESTROY {
-#  my $self = shift;
-#  #use Carp qw(cluck);
-#  #cluck "DESTROYING $self";
-#  warn "DESTROYING $self";
-#}
-
-#sub is_tainted {
-#             return ! eval { join('',@_), kill 0; 1; };
-#         }
-
-=back
-
-=head1 VERSION
-
-$Id: Record.pm,v 1.17 1999-07-17 01:34:25 ivan Exp $
-
-=head1 BUGS
-
-This module should probably be renamed, since much of the functionality is
-of general use.  It is not completely unlike Adapter::DBI (see below).
-
-Exported qsearch and qsearchs should be depriciated in favor of method calls
-(against an FS::Record object like the old search and searchs that qsearch
-and qsearchs were on top of.)
-
-The whole fields / hfields mess should be removed.
-
-The various WHERE clauses should be subroutined.
-
-table string should be depriciated in favor of FS::dbdef_table.
-
-No doubt we could benefit from a Tied hash.  Documenting how exists / defined
-true maps to the database (and WHERE clauses) would also help.
-
-The ut_ methods should ask the dbdef for a default length.
-
-ut_sqltype (like ut_varchar) should all be defined
-
-A fallback check method should be provided whith uses the dbdef.
-
-The ut_money method assumes money has two decimal digits.
-
-The Pg money kludge in the new method only strips `$'.
-
-The ut_phonen method assumes US-style phone numbers.
-
-The _quote function should probably use ut_float instead of a regex.
-
-All the subroutines probably should be methods, here or elsewhere.
-
-Probably should borrow/use some dbdef methods where appropriate (like sub
-fields)
-
-=head1 SEE ALSO
-
-L<FS::dbdef>, L<FS::UID>, L<DBI>
-
-Adapter::DBI from Ch. 11 of Advanced Perl Programming by Sriram Srinivasan.
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-jun-2 - 9, 19, 25, 27, 30
-
-DBI version
-ivan@sisd.com 97-nov-8 - 12
-
-cleaned up, added autoloaded $self->any_field calls, moved DBI login stuff
-to FS::UID
-ivan@sisd.com 97-nov-21-23
-
-since AUTO_INCREMENT is MySQL specific, use my own unique number generator
-(again)
-ivan@sisd.com 97-dec-4
-
-untaint $user in unique (web demo hack...bah)
-make unique skip multiple-field unique's from dbdef
-ivan@sisd.com 97-dec-11
-
-merge with FS::Search, which after all was just alternate constructors for
-FS::Record objects.  Makes lots of things cleaner.  :)
-ivan@sisd.com 97-dec-13
-
-use FS::dbdef::primary key in replace searches, hopefully for all practical 
-purposes the string/number problem in SQL statements should be gone?
-(SQL bites)
-ivan@sisd.com 98-jan-20
-
-Put all SQL statments in $statment before we $sth=$dbh->prepare( them,
-for debugging reasons (warn $statement) ivan@sisd.com 98-feb-19
-
-(sigh)... use dbdef type (char, etc.) instead of a regex to decide
-what to quote in _quote (more sillines...)  SQL bites.
-ivan@sisd.com 98-feb-20
-
-more friendly error messages ivan@sisd.com 98-mar-13
-
-Added import of datasrc from FS::UID to allow Pg6.3 to work
-Added code to right-trim strings read from Pg6.3 databases
-Modified 'add' to only insert fields that actually have data
-Added ut_float to handle floating point numbers (for sales tax).
-Pg6.3 does not have a "SHOW FIELDS" statement, so I faked it 8).
-	bmccane@maxbaud.net	98-apr-3
-
-commented out Pg wrapper around `` Modified 'add' to only insert fields that
-actually have data '' ivan@sisd.com 98-apr-16
-
-dbdef usage changes ivan@sisd.com 98-jun-1
-
-sub fields now asks dbdef, not database ivan@sisd.com 98-jun-2
-
-added debugging method ->_dump ivan@sisd.com 98-jun-16
-
-use FS::dbdef::primary key in delete searches as well as replace
-searches (SQL still bites) ivan@sisd.com 98-jun-22
-
-sub dbdef_table ivan@sisd.com 98-jun-28
-
-removed Pg wrapper around `` Modified 'add' to only insert fields that
-actually have data '' ivan@sisd.com 98-jul-14
-
-sub fields croaks on errors ivan@sisd.com 98-jul-17
-
-$rc eq '0E0' doesn't mean we couldn't delete for all rdbmss 
-ivan@sisd.com 98-jul-18
-
-commented out code to right-trim strings read from Pg6.3 databases;
-ChopBlanks is in UID.pm ivan@sisd.com 98-aug-16
-
-added code (with Pg wrapper) to deal with Pg money fields
-ivan@sisd.com 98-aug-18
-
-added pod documentation ivan@sisd.com 98-sep-6
-
-ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
-
-$Log: Record.pm,v $
-Revision 1.17  1999-07-17 01:34:25  ivan
-s/croak/confess/; in check method
-
-Revision 1.16  1999/04/10 07:03:38  ivan
-return the value with ut_* error messages, to assist in debugging
-
-Revision 1.15  1999/04/08 12:08:59  ivan
-fix up PostgreSQL money fields so you can actually use them as numbers.  bah.
-
-Revision 1.14  1999/04/07 14:58:31  ivan
-more kludges to get around different null/empty handling in Perl vs. MySQL vs.
-PostgreSQL etc.
-
-Revision 1.13  1999/03/29 11:55:43  ivan
-eliminate warnings in ut_money
-
-Revision 1.12  1999/01/25 12:26:06  ivan
-yet more mod_perl stuff
-
-Revision 1.11  1999/01/18 09:22:38  ivan
-changes to track email addresses for email invoicing
-
-Revision 1.10  1998/12/29 11:59:33  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-Revision 1.9  1998/11/21 07:26:45  ivan
-"Records identical" carp tells us it is just a warning.
-
-Revision 1.8  1998/11/15 11:02:04  ivan
-bugsquash
-
-Revision 1.7  1998/11/15 10:56:31  ivan
-qsearch gets sames "IS NULL" semantics as other WHERE clauses
-
-Revision 1.6  1998/11/15 05:31:03  ivan
-bugfix for new config layout
-
-Revision 1.5  1998/11/13 09:56:51  ivan
-change configuration file layout to support multiple distinct databases (with
-own set of config files, export, etc.)
-
-Revision 1.4  1998/11/10 07:45:25  ivan
-doc clarification
-
-Revision 1.2  1998/11/07 05:17:18  ivan
-In sub new, Pg wrapper for money fields from dbdef (FS::Record::fields $table),
-not keys of supplied hashref.
-
-
-=cut
-
-1;
-
diff --git a/site_perl/SSH.pm b/site_perl/SSH.pm
deleted file mode 100644
index d5a0df654..000000000
--- a/site_perl/SSH.pm
+++ /dev/null
@@ -1,157 +0,0 @@
-package FS::SSH;
-
-use strict;
-use vars qw(@ISA @EXPORT_OK $ssh $scp);
-use Exporter;
-use IPC::Open2;
-use IPC::Open3;
-
-@ISA = qw(Exporter);
-@EXPORT_OK = qw(ssh scp issh iscp sshopen2 sshopen3);
-
-$ssh="ssh";
-$scp="scp";
-
-=head1 NAME
-
-FS::SSH - Subroutines to call ssh and scp
-
-=head1 SYNOPSIS
-
-  use FS::SSH qw(ssh scp issh iscp sshopen2 sshopen3);
-
-  ssh($host, $command);
-
-  issh($host, $command);
-
-  scp($source, $destination);
-
-  iscp($source, $destination);
-
-  sshopen2($host, $reader, $writer, $command);
-
-  sshopen3($host, $reader, $writer, $error, $command);
-
-=head1 DESCRIPTION
-
-  Simple wrappers around ssh and scp commands.
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item ssh HOST, COMMAND 
-
-Calls ssh in batch mode.
-
-=cut
-
-sub ssh {
-  my($host,$command)=@_;
-  my(@cmd)=($ssh, "-o", "BatchMode yes", $host, $command);
-#  	print join(' ',@cmd),"\n";
-#0;
-  system(@cmd);
-}
-
-=item issh HOST, COMMAND
-
-Prints the ssh command to be executed, waits for the user to confirm, and
-(optionally) executes the command.
-
-=cut
-
-sub issh {
-  my($host,$command)=@_;
-  my(@cmd)=($ssh, $host, $command);
-  print join(' ',@cmd),"\n";
-  if ( &_yesno ) {
-    	###print join(' ',@cmd),"\n";
-    system(@cmd);
-  }
-}
-
-=item scp SOURCE, DESTINATION
-
-Calls scp in batch mode.
-
-=cut
-
-sub scp {
-  my($src,$dest)=@_;
-  my(@cmd)=($scp,"-Bprq",$src,$dest);
-#  	print join(' ',@cmd),"\n";
-#0;
-  system(@cmd);
-}
-
-=item iscp SOURCE, DESTINATION
-
-Prints the scp command to be executed, waits for the user to confirm, and
-(optionally) executes the command.
-
-=cut
-
-sub iscp {
-  my($src,$dest)=@_;
-  my(@cmd)=($scp,"-pr",$src,$dest);
-  print join(' ',@cmd),"\n";
-  if ( &_yesno ) {
-    	###print join(' ',@cmd),"\n";
-    system(@cmd);
-  }
-}
-
-=item sshopen2 HOST, READER, WRITER, COMMAND
-
-Connects the supplied filehandles to the ssh process (in batch mode).
-
-=cut
-
-sub sshopen2 {
-  my($host,$reader,$writer,$command)=@_;
-  open2($reader,$writer,$ssh,'-o','Batchmode yes',$host,$command);
-}
-
-=item sshopen3 HOST, WRITER, READER, ERROR, COMMAND
-
-Connects the supplied filehandles to the ssh process (in batch mode).
-
-=cut
-
-sub sshopen3 {
-  my($host,$writer,$reader,$error,$command)=@_;
-  open3($writer,$reader,$error,$ssh,'-o','Batchmode yes',$host,$command);
-}
-
-sub _yesno {
-  print "Proceed [y/N]:";
-  my($x)=scalar(<STDIN>);
-  $x =~ /^y/i;
-}
-
-=head1 BUGS
-
-Not OO.
-
-scp stuff should transparantly use rsync-over-ssh instead.
-
-=head1 SEE ALSO
-
-L<ssh>, L<scp>, L<IPC::Open2>, L<IPC::Open3>
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-jul-17
-
-added sshopen2 and sshopen3 ivan@sisd.com 98-mar-9
-
-added iscp ivan@sisd.com 98-jul-25
-now iscp asks y/n, issh and took out path ivan@sisd.com 98-jul-30
-
-pod ivan@sisd.com 98-sep-21
-
-=cut
-
-1;
-
diff --git a/site_perl/UID.pm b/site_perl/UID.pm
deleted file mode 100644
index 889ccb65f..000000000
--- a/site_perl/UID.pm
+++ /dev/null
@@ -1,326 +0,0 @@
-package FS::UID;
-
-use strict;
-use vars qw(
-  @ISA @EXPORT_OK $cgi $dbh $freeside_uid $user 
-  $conf_dir $secrets $datasrc $db_user $db_pass %callback
-);
-use subs qw(
-  getsecrets cgisetotaker
-);
-use Exporter;
-use Carp;
-use DBI;
-use FS::Conf;
-
-@ISA = qw(Exporter);
-@EXPORT_OK = qw(checkeuid checkruid swapuid cgisuidsetup
-                adminsuidsetup getotaker dbh datasrc getsecrets );
-
-$freeside_uid = scalar(getpwnam('freeside'));
-
-$conf_dir = "/usr/local/etc/freeside/";
-
-=head1 NAME
-
-FS::UID - Subroutines for database login and assorted other stuff
-
-=head1 SYNOPSIS
-
-  use FS::UID qw(adminsuidsetup cgisuidsetup dbh datasrc getotaker
-  checkeuid checkruid swapuid);
-
-  adminsuidsetup $user;
-
-  $cgi = new CGI;
-  $dbh = cgisuidsetup($cgi);
-
-  $dbh = dbh;
-
-  $datasrc = datasrc;
-
-=head1 DESCRIPTION
-
-Provides a hodgepodge of subroutines. 
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item adminsuidsetup USER
-
-Sets the user to USER (see config.html from the base documentation).
-Cleans the environment.
-Make sure the script is running as freeside, or setuid freeside.
-Opens a connection to the database.
-Swaps real and effective UIDs.
-Runs any defined callbacks (see below).
-Returns the DBI database handle (usually you don't need this).
-
-=cut
-
-sub adminsuidsetup {
-
-  $user = shift;
-  croak "fatal: adminsuidsetup called without arguements" unless $user;
-
-  $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
-  $ENV{'SHELL'} = '/bin/sh';
-  $ENV{'IFS'} = " \t\n";
-  $ENV{'CDPATH'} = '';
-  $ENV{'ENV'} = '';
-  $ENV{'BASH_ENV'} = '';
-
-  croak "Not running uid freeside!" unless checkeuid();
-  getsecrets;
-  $dbh = DBI->connect($datasrc,$db_user,$db_pass, {
-                          'AutoCommit' => 'true',
-                          'ChopBlanks' => 'true',
-  } ) or die "DBI->connect error: $DBI::errstr\n";
-
-  swapuid(); #go to non-privledged user if running setuid freeside
-
-  foreach ( keys %callback ) {
-    &{$callback{$_}};
-  }
-
-  $dbh;
-}
-
-=item cgisuidsetup CGI_object
-
-Stores the CGI (see L<CGI>) object for later use. (CGI::Base is depriciated)
-Runs adminsuidsetup.
-
-=cut
-
-sub cgisuidsetup {
-  $cgi=shift;
-  if ( $cgi->isa('CGI::Base') ) {
-    carp "Use of CGI::Base is depriciated";
-  } elsif ( ! $cgi->isa('CGI') ) {
-    croak "Pass a CGI object to cgisuidsetup!";
-  }
-  cgisetotaker; 
-  adminsuidsetup($user);
-}
-
-=item cgi
-
-Returns the CGI (see L<CGI>) object.
-
-=cut
-
-sub cgi {
-  $cgi;
-}
-
-=item dbh
-
-Returns the DBI database handle.
-
-=cut
-
-sub dbh {
-  $dbh;
-}
-
-=item datasrc
-
-Returns the DBI data source.
-
-=cut
-
-sub datasrc {
-  $datasrc;
-}
-
-#hack for web demo
-#sub setdbh {
-#  $dbh=$_[0];
-#}
-
-sub suidsetup {
-  croak "suidsetup depriciated";
-}
-
-=item getotaker
-
-Returns the current Freeside user.
-
-=cut
-
-sub getotaker {
-  $user;
-}
-
-=item cgisetotaker
-
-Sets and returns the CGI REMOTE_USER.  $cgi should be defined as a CGI.pm
-object.  Support for CGI::Base and derived classes is depriciated.
-
-=cut
-
-sub cgisetotaker {
-  if ( $cgi && $cgi->isa('CGI::Base') && defined $cgi->var('REMOTE_USER')) {
-    carp "Use of CGI::Base is depriciated";
-    $user = lc ( $cgi->var('REMOTE_USER') );
-  } elsif ( $cgi && $cgi->isa('CGI') && defined $cgi->remote_user ) {
-    $user = lc ( $cgi->remote_user );
-  } else {
-    die "fatal: Can't get REMOTE_USER!";
-  }
-  $user;
-}
-
-=item checkeuid
-
-Returns true if effective UID is that of the freeside user.
-
-=cut
-
-sub checkeuid {
-  ( $> == $freeside_uid );
-}
-
-=item checkruid
-
-Returns true if the real UID is that of the freeside user.
-
-=cut
-
-sub checkruid {
-  ( $< == $freeside_uid );
-}
-
-=item swapuid
-
-Swaps real and effective UIDs.
-
-=cut
-
-sub swapuid {
-  ($<,$>) = ($>,$<) if $< != $>;
-}
-
-=item getsecrets [ USER ]
-
-Sets the user to USER, if supplied.
-Sets and returns the DBI datasource, username and password for this user from
-the `/usr/local/etc/freeside/mapsecrets' file.
-
-=cut
-
-sub getsecrets {
-  my($setuser) = shift;
-  $user = $setuser if $setuser;
-  die "No user!" unless $user;
-  my($conf) = new FS::Conf $conf_dir;
-  my($line) = grep /^\s*$user\s/, $conf->config('mapsecrets');
-  die "User not found in mapsecrets!" unless $line;
-  $line =~ /^\s*$user\s+(.*)$/;
-  $secrets = $1;
-  die "Illegal mapsecrets line for user?!" unless $secrets;
-  ($datasrc, $db_user, $db_pass) = $conf->config($secrets)
-    or die "Can't get secrets: $!";
-  $FS::Conf::default_dir = $conf_dir. "/conf.$datasrc";
-  ($datasrc, $db_user, $db_pass);
-}
-
-=back
-
-=head1 CALLBACKS
-
-Warning: this interface is likely to change in future releases.
-
-A package can install a callback to be run in adminsuidsetup by putting a
-coderef into the hash %FS::UID::callback :
-
-    $coderef = sub { warn "Hi, I'm returning your call!" };
-    $FS::UID::callback{'Package::Name'};
-
-=head1 VERSION
-
-$Id: UID.pm,v 1.11 1999-04-14 07:58:39 ivan Exp $
-
-=head1 BUGS
-
-Too many package-global variables.
-
-Not OO.
-
-No capabilities yet.  When mod_perl and Authen::DBI are implemented, 
-cgisuidsetup will go away as well.
-
-Goes through contortions to support non-OO syntax with multiple datasrc's.
-
-Callbacks are inelegant.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<CGI>, L<DBI>, config.html from the base documentation.
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-jun-4 - 9
- 
-untaint otaker ivan@voicenet.com 97-jul-7
-
-generalize and auto-get uid (getotaker still needs to be db'ed)
-ivan@sisd.com 97-nov-10
-
-&cgisuidsetup logs into database.  other cleaning.
-ivan@sisd.com 97-nov-22,23
-
-&adminsuidsetup logs into database with otaker='freeside' (for
-automated tasks like billing)
-ivan@sisd.com 97-dec-13
-
-added sub datasrc for fs-setup ivan@sisd.com 98-feb-21
-
-datasrc, user and pass now come from conf/secrets ivan@sisd.com 98-jun-28
-
-added ChopBlanks to DBI call (see man DBI) ivan@sisd.com 98-aug-16
-
-pod, use FS::Conf, implemented cgisuidsetup as adminsuidsetup,
-inlined suidsetup
-ivan@sisd.com 98-sep-12
-
-$Log: UID.pm,v $
-Revision 1.11  1999-04-14 07:58:39  ivan
-export getsecrets from FS::UID instead of calling it explicitly
-
-Revision 1.10  1999/04/12 22:41:09  ivan
-bugfix; $user is a global (yuck)
-
-Revision 1.9  1999/04/12 21:09:39  ivan
-force username to lowercase
-
-Revision 1.8  1999/02/23 07:23:23  ivan
-oops, don't comment out &swapuid in &adminsuidsetup!
-
-Revision 1.7  1999/01/18 09:22:40  ivan
-changes to track email addresses for email invoicing
-
-Revision 1.6  1998/11/15 05:27:48  ivan
-bugfix for new configuration layout
-
-Revision 1.5  1998/11/15 00:51:51  ivan
-eliminated some warnings on certain fatal errors (well, it is less confusing)
-
-Revision 1.4  1998/11/13 09:56:52  ivan
-change configuration file layout to support multiple distinct databases (with
-own set of config files, export, etc.)
-
-Revision 1.3  1998/11/08 10:45:42  ivan
-got sub cgi for FS::CGI
-
-Revision 1.2  1998/11/08 09:38:43  ivan
-cgisuidsetup complains if you pass it a isa CGI::Base instead of an isa CGI
-(first step in migrating from CGI-modules to CGI.pm)
-
-
-=cut
-
-1;
-
diff --git a/site_perl/agent.pm b/site_perl/agent.pm
deleted file mode 100644
index dab157b3f..000000000
--- a/site_perl/agent.pm
+++ /dev/null
@@ -1,168 +0,0 @@
-package FS::agent;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-use FS::cust_main;
-use FS::agent_type;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::agent - Object methods for agent records
-
-=head1 SYNOPSIS
-
-  use FS::agent;
-
-  $record = new FS::agent \%hash;
-  $record = new FS::agent { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $agent_type = $record->agent_type;
-
-  $hashref = $record->pkgpart_hashref;
-  #may purchase $pkgpart if $hashref->{$pkgpart};
-
-=head1 DESCRIPTION
-
-An FS::agent object represents an agent.  Every customer has an agent.  Agents
-can be used to track things like resellers or salespeople.  FS::agent inherits
-from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item agemtnum - primary key (assigned automatically for new agents)
-
-=item agent - Text name of this agent
-
-=item typenum - Agent type.  See L<FS::agent_type>
-
-=item prog - For future use.
-
-=item freq - For future use.
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new agent.  To add the agent to the database, see L<"insert">.
-
-=cut
-
-sub table { 'agent'; }
-
-=item insert
-
-Adds this agent to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this agent from the database.  Only agents with no customers can be
-deleted.  If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub delete {
-  my $self = shift;
-
-  return "Can't delete an agent with customers!"
-    if qsearch( 'cust_main', { 'agentnum' => $self->agentnum } );
-
-  $self->SUPER::delete;
-}
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid agent.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error =
-    $self->ut_numbern('agentnum')
-      || $self->ut_text('agent')
-      || $self->ut_number('typenum')
-      || $self->ut_numbern('freq')
-      || $self->ut_textn('prog')
-  ;
-  return $error if $error;
-
-  return "Unknown typenum!"
-    unless $self->agent_type;
-
-  '';
-
-}
-
-=item agent_type
-
-Returns the FS::agent_type object (see L<FS::agent_type>) for this agent.
-
-=cut
-
-sub agent_type {
-  my $self = shift;
-  qsearchs( 'agent_type', { 'typenum' => $self->typenum } );
-}
-
-=item pkgpart_hashref
-
-Returns a hash reference.  The keys of the hash are pkgparts.  The value is
-true iff this agent may purchase the specified package definition.  See
-L<FS::part_pkg>.
-
-=cut
-
-sub pkgpart_hashref {
-  my $self = shift;
-  $self->agent_type->pkgpart_hashref;
-}
-
-=back
-
-=head1 VERSION
-
-$Id: agent.pm,v 1.5 1999-07-20 10:37:05 ivan Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::agent_type>, L<FS::cust_main>, L<FS::part_pkg>, 
-schema.html from the base documentation.
-
-=head1 HISTORY
-
-Class dealing with agent (resellers)
-
-ivan@sisd.com 97-nov-13, 97-dec-10
-
-pod, added check in ->delete ivan@sisd.com 98-sep-22
-
-=cut
-
-1;
-
diff --git a/site_perl/agent_type.pm b/site_perl/agent_type.pm
deleted file mode 100644
index 5b82cc3d6..000000000
--- a/site_perl/agent_type.pm
+++ /dev/null
@@ -1,192 +0,0 @@
-package FS::agent_type;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch );
-use FS::agent;
-use FS::type_pkgs;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::agent_type - Object methods for agent_type records
-
-=head1 SYNOPSIS
-
-  use FS::agent_type;
-
-  $record = new FS::agent_type \%hash;
-  $record = new FS::agent_type { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $hashref = $record->pkgpart_hashref;
-  #may purchase $pkgpart if $hashref->{$pkgpart};
-
-  @type_pkgs = $record->type_pkgs;
-
-  @pkgparts = $record->pkgpart;
-
-=head1 DESCRIPTION
-
-An FS::agent_type object represents an agent type.  Every agent (see
-L<FS::agent>) has an agent type.  Agent types define which packages (see
-L<FS::part_pkg>) may be purchased by customers (see L<FS::cust_main>), via 
-FS::type_pkgs records (see L<FS::type_pkgs>).  FS::agent_type inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item typenum - primary key (assigned automatically for new agent types)
-
-=item atype - Text name of this agent type
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new agent type.  To add the agent type to the database, see
-L<"insert">.
-
-=cut
-
-sub table { 'agent_type'; }
-
-=item insert
-
-Adds this agent type to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this agent type from the database.  Only agent types with no agents
-can be deleted.  If there is an error, returns the error, otherwise returns
-false.
-
-=cut
-
-sub delete {
-  my $self = shift;
-
-  return "Can't delete an agent_type with agents!"
-    if qsearch( 'agent', { 'typenum' => $self->typenum } );
-
-  $self->SUPER::delete;
-}
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid agent type.  If there is an
-error, returns the error, otherwise returns false.  Called by the insert and
-replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  $self->ut_numbern('typenum')
-  or $self->ut_text('atype');
-
-}
-
-=item pkgpart_hashref
-
-Returns a hash reference.  The keys of the hash are pkgparts.  The value is
-true iff this agent may purchase the specified package definition.  See
-L<FS::part_pkg>.
-
-=cut
-
-sub pkgpart_hashref {
-  my $self = shift;
-  my %pkgpart;
-  #$pkgpart{$_}++ foreach $self->pkgpart;
-  # not compatible w/5.004_04 (fixed in 5.004_05)
-  foreach ( $self->pkgpart ) { $pkgpart{$_}++; }
-  \%pkgpart;
-}
-
-=item type_pkgs
-
-Returns all FS::type_pkgs objects (see L<FS::type_pkgs>) for this agent type.
-
-=cut
-
-sub type_pkgs {
-  my $self = shift;
-  qsearch('type_pkgs', { 'typenum' => $self->typenum } );
-}
-
-=item pkgpart
-
-Returns the pkgpart of all package definitions (see L<FS::part_pkg>) for this
-agent type.
-
-=cut
-
-sub pkgpart {
-  my $self = shift;
-  map $_->pkgpart, $self->type_pkgs;
-}
-
-=back
-
-=head1 VERSION
-
-$Id: agent_type.pm,v 1.4 1999-07-21 06:32:08 ivan Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::agent>, L<FS::type_pkgs>, L<FS::cust_main>,
-L<FS::part_pkg>, schema.html from the base documentation.
-
-=head1 HISTORY
-
-Class for the different sets of allowable packages you can assign to an
-agent.
-
-ivan@sisd.com 97-nov-13
-
-ut_ FS::Record methods
-ivan@sisd.com 97-dec-10
-
-Changed 'type' to 'atype' because Pg6.3 reserves the type word
-	bmccane@maxbaud.net	98-apr-3
-
-pod, added check in delete ivan@sisd.com 98-sep-21
-
-$Log: agent_type.pm,v $
-Revision 1.4  1999-07-21 06:32:08  ivan
-workaround for syntax not compatible w/5.004_04 (ok in 5.004_05)
-
-Revision 1.3  1999/07/20 10:37:05  ivan
-cleaned up the new one-screen signup bits in htdocs/edit/cust_main.cgi to
-prepare for a signup server
-
-Revision 1.2  1998/12/29 11:59:35  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-
-=cut
-
-1;
-
diff --git a/site_perl/cust_bill.pm b/site_perl/cust_bill.pm
deleted file mode 100644
index 0e87755ac..000000000
--- a/site_perl/cust_bill.pm
+++ /dev/null
@@ -1,482 +0,0 @@
-package FS::cust_bill;
-
-use strict;
-use vars qw( @ISA $conf $add1 $add2 $add3 $add4 );
-use Date::Format;
-use FS::Record qw( qsearch qsearchs );
-use FS::cust_main;
-use FS::cust_bill_pkg;
-use FS::cust_credit;
-use FS::cust_pay;
-use FS::cust_pkg;
-
-@ISA = qw( FS::Record );
-
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::cust_bill'} = sub { 
-  $conf = new FS::Conf;
-  ( $add1, $add2, $add3, $add4 ) = ( $conf->config('address'), '', '', '', '' );
-};
-
-=head1 NAME
-
-FS::cust_bill - Object methods for cust_bill records
-
-=head1 SYNOPSIS
-
-  use FS::cust_bill;
-
-  $record = new FS::cust_bill \%hash;
-  $record = new FS::cust_bill { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  ( $total_previous_balance, @previous_cust_bill ) = $record->previous;
-
-  @cust_bill_pkg_objects = $cust_bill->cust_bill_pkg;
-
-  ( $total_previous_credits, @previous_cust_credit ) = $record->cust_credit;
-
-  @cust_pay_objects = $cust_bill->cust_pay;
-
-  @lines = $cust_bill->print_text;
-  @lines = $cust_bill->print_text $time;
-
-=head1 DESCRIPTION
-
-An FS::cust_bill object represents an invoice.  FS::cust_bill inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item invnum - primary key (assigned automatically for new invoices)
-
-=item custnum - customer (see L<FS::cust_main>)
-
-=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=item charged - amount of this invoice
-
-=item owed - amount still outstanding on this invoice, which is charged minus
-all payments (see L<FS::cust_pay>).
-
-=item printed - how many times this invoice has been printed automatically
-(see L<FS::cust_main/"collect">).
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new invoice.  To add the invoice to the database, see L<"insert">.
-Invoices are normally created by calling the bill method of a customer object
-(see L<FS::cust_main>).
-
-=cut
-
-sub table { 'cust_bill'; }
-
-=item insert
-
-Adds this invoice to the database ("Posts" the invoice).  If there is an error,
-returns the error, otherwise returns false.
-
-When adding new invoices, owed must be charged (or null, in which case it is
-automatically set to charged).
-
-=cut
-
-sub insert {
-  my $self = shift;
-
-  $self->owed( $self->charged ) if $self->owed eq '';
-  return "owed != charged!"
-    unless $self->owed == $self->charged;
-
-  $self->SUPER::insert;
-}
-
-=item delete
-
-Currently unimplemented.  I don't remove invoices because there would then be
-no record you ever posted this invoice (which is bad, no?)
-
-=cut
-
-sub delete {
-  return "Can't remove invoice!"
-}
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-Only owed and printed may be changed.  Owed is normally updated by creating and
-inserting a payment (see L<FS::cust_pay>).  Printed is normally updated by
-calling the collect method of a customer object (see L<FS::cust_main>).
-
-=cut
-
-sub replace {
-  my( $new, $old ) = ( shift, shift );
-  return "Can't change custnum!" unless $old->custnum == $new->custnum;
-  #return "Can't change _date!" unless $old->_date eq $new->_date;
-  return "Can't change _date!" unless $old->_date == $new->_date;
-  return "Can't change charged!" unless $old->charged == $new->charged;
-  return "(New) owed can't be > (new) charged!" if $new->owed > $new->charged;
-
-  $new->SUPER::replace($old);
-}
-
-=item check
-
-Checks all fields to make sure this is a valid invoice.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error =
-    $self->ut_numbern('invnum')
-    || $self->ut_number('custnum')
-    || $self->ut_numbern('_date')
-    || $self->ut_money('charged')
-    || $self->ut_money('owed')
-    || $self->ut_numbern('printed')
-  ;
-  return $error if $error;
-
-  return "Unknown customer"
-    unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
-
-  $self->_date(time) unless $self->_date;
-
-  $self->printed(0) if $self->printed eq '';
-
-  ''; #no error
-}
-
-=item previous
-
-Returns a list consisting of the total previous balance for this customer, 
-followed by the previous outstanding invoices (as FS::cust_bill objects also).
-
-=cut
-
-sub previous {
-  my $self = shift;
-  my $total = 0;
-  my @cust_bill = sort { $a->_date <=> $b->_date }
-    grep { $_->owed != 0 && $_->_date < $self->_date }
-      qsearch( 'cust_bill', { 'custnum' => $self->custnum } ) 
-  ;
-  foreach ( @cust_bill ) { $total += $_->owed; }
-  $total, @cust_bill;
-}
-
-=item cust_bill_pkg
-
-Returns the line items (see L<FS::cust_bill_pkg>) for this invoice.
-
-=cut
-
-sub cust_bill_pkg {
-  my $self = shift;
-  qsearch( 'cust_bill_pkg', { 'invnum' => $self->invnum } );
-}
-
-=item cust_credit
-
-Returns a list consisting of the total previous credited (see
-L<FS::cust_credit>) for this customer, followed by the previous outstanding
-credits (FS::cust_credit objects).
-
-=cut
-
-sub cust_credit {
-  my $self = shift;
-  my $total = 0;
-  my @cust_credit = sort { $a->_date <=> $b->date }
-    grep { $_->credited != 0 && $_->_date < $self->_date }
-      qsearch('cust_credit', { 'custnum' => $self->custnum } )
-  ;
-  foreach (@cust_credit) { $total += $_->credited; }
-  $total, @cust_credit;
-}
-
-=item cust_pay
-
-Returns all payments (see L<FS::cust_pay>) for this invoice.
-
-=cut
-
-sub cust_pay {
-  my $self = shift;
-  sort { $a->_date <=> $b->date }
-    qsearch( 'cust_pay', { 'invnum' => $self->invnum } )
-  ;
-}
-
-=item print_text [TIME];
-
-Returns an ASCII invoice, as a list of lines.
-
-TIME an optional value used to control the printing of overdue messages.  The
-default is now.  It isn't the date of the invoice; that's the `_date' field.
-It is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=cut
-
-sub print_text {
-
-  my( $self, $today ) = ( shift, shift );
-  $today ||= time;
-  my $invnum = $self->invnum;
-  my $cust_main = qsearchs('cust_main', { 'custnum', $self->custnum } );
-  $cust_main->payname( $cust_main->first. ' '. $cust_main->getfield('last') )
-    unless $cust_main->payname;
-
-  my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
-  my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
-  my $balance_due = $self->owed + $pr_total - $cr_total;
-
-  #overdue?
-  my $overdue = ( 
-    $balance_due > 0
-    && $today > $self->_date 
-    && $self->printed > 1
-  );
-
-  #printing bits here (yuck!)
-
-  my @collect = ();
-
-  my($description,$amount);
-  my(@buf);
-
-  #format address
-  my($l,@address)=(0,'','','','','','','');
-  $address[$l++] =
-    $cust_main->payname.
-      ( ( $cust_main->payby eq 'BILL' ) && $cust_main->payinfo
-        ? " (P.O. #". $cust_main->payinfo. ")"
-        : ''
-      )
-  ;
-  $address[$l++]=$cust_main->company if $cust_main->company;
-  $address[$l++]=$cust_main->address1;
-  $address[$l++]=$cust_main->address2 if $cust_main->address2;
-  $address[$l++]=$cust_main->city. ", ". $cust_main->state. "  ".
-                 $cust_main->zip;
-  $address[$l++]=$cust_main->country unless $cust_main->country eq 'US';
-
-  #previous balance
-  foreach ( @pr_cust_bill ) {
-    push @buf, (
-      "Previous Balance, Invoice #". $_->invnum. 
-                 " (". time2str("%x",$_->_date). ")",
-      '$'. sprintf("%10.2f",$_->owed)
-    );
-  }
-  if (@pr_cust_bill) {
-    push @buf,('','-----------');
-    push @buf,('Total Previous Balance','$' . sprintf("%10.2f",$pr_total ) );
-    push @buf,('','');
-  }
-
-  #new charges
-  foreach ( $self->cust_bill_pkg ) {
-
-    if ( $_->pkgnum ) {
-
-      my($cust_pkg)=qsearchs('cust_pkg', { 'pkgnum', $_->pkgnum } );
-      my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->pkgpart});
-      my($pkg)=$part_pkg->pkg;
-
-      if ( $_->setup != 0 ) {
-        push @buf, ( "$pkg Setup",'$' . sprintf("%10.2f",$_->setup) );
-        push @buf, map { "  ". $_->[0]. ": ". $_->[1], '' } $cust_pkg->labels;
-      }
-
-      if ( $_->recur != 0 ) {
-        push @buf, (
-          "$pkg (" . time2str("%x",$_->sdate) . " - " .
-                                time2str("%x",$_->edate) . ")",
-          '$' . sprintf("%10.2f",$_->recur)
-        );
-        push @buf, map { "  ". $_->[0]. ": ". $_->[1], '' } $cust_pkg->labels;
-      }
-
-    } else { #pkgnum Tax
-      push @buf,("Tax",'$' . sprintf("%10.2f",$_->setup) ) 
-        if $_->setup != 0;
-    }
-  }
-
-  push @buf,('','-----------');
-  push @buf,('Total New Charges',
-             '$' . sprintf("%10.2f",$self->charged) );
-  push @buf,('','');
-
-  push @buf,('','-----------');
-  push @buf,('Total Charges',
-             '$' . sprintf("%10.2f",$self->charged + $pr_total) );
-  push @buf,('','');
-
-  #credits
-  foreach ( @cr_cust_credit ) {
-    push @buf,(
-      "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
-      '$' . sprintf("%10.2f",$_->credited)
-    );
-  }
-
-  #get & print payments
-  foreach ( $self->cust_pay ) {
-    push @buf,(
-      "Payment received ". time2str("%x",$_->_date ),
-      '$' . sprintf("%10.2f",$_->paid )
-    );
-  }
-
-  #balance due
-  push @buf,('','-----------');
-  push @buf,('Balance Due','$' . 
-    sprintf("%10.2f",$self->owed + $pr_total - $cr_total ) );
-
-  #now print
-
-  my $tot_lines = 50; #should be configurable
-   #header is 17 lines
-  my $tot_pages = int( scalar(@buf) / ( 2 * ( $tot_lines - 17 ) ) );
-  $tot_pages++ if scalar(@buf) % ( 2 * ( $tot_lines - 17 ) );
-
-  my $page = 1;
-  my $lines;
-  while (@buf) {
-    $lines = $tot_lines;
-    my @header = &header(
-      $page, $tot_pages, $self->_date, $self->invnum, @address
-    );
-    push @collect, @header;
-    $lines -= scalar(@header);
-
-    while ( $lines-- && @buf ) {
-      $description=shift(@buf);
-      $amount=shift(@buf);
-      push @collect, myswrite($description, $amount);
-    }
-    $page++;
-  }
-  while ( $lines-- ) {
-    push @collect, myswrite('', '');
-  }
-
-  return @collect;
-
-  sub header { #17 lines
-    my ( $page, $tot_pages, $date, $invnum, @address ) = @_ ;
-    push @address, '', '', '', '';
-
-    my @return = ();
-    my $i = ' 'x32;
-    push @return,
-      '',
-      $i. 'Invoice',
-      $i. substr("Page $page of $tot_pages".' 'x10, 0, 20).
-        time2str("%x", $date ). "  FS-". $invnum,
-      '',
-      '',
-      $add1,
-      $add2,
-      $add3,
-      $add4,
-      '',
-      splice @address, 0, 7;
-    ;
-    return map $_. "\n", @return;
-  }
-
-  sub myswrite {
-    my $format = <<END;
-  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<
-END
-    $^A = '';
-    formline( $format, @_ );
-    return $^A;
-  }
-
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_bill.pm,v 1.7 1999-02-09 09:55:05 ivan Exp $
-
-=head1 BUGS
-
-The delete method.
-
-print_text formatting (and some logic :/) is in source, but needs to be
-slurped in from a file.  Also number of lines ($=).
-
-missing print_ps for a nice postscript copy (maybe HylaFAX-cover-page-style
-or something similar so the look can be completely customized?)
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_main>, L<FS::cust_pay>, L<FS::cust_bill_pkg>,
-L<FS::cust_credit>, schema.html from the base documentation.
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-jul-1
-
-small fix for new API ivan@sisd.com 98-mar-14
-
-charges can be negative ivan@sisd.com 98-jul-13
-
-pod, ingegrate with FS::Invoice ivan@sisd.com 98-sep-20
-
-$Log: cust_bill.pm,v $
-Revision 1.7  1999-02-09 09:55:05  ivan
-invoices show line items for each service in a package (see the label method
-of FS::cust_svc)
-
-Revision 1.6  1999/01/25 12:26:07  ivan
-yet more mod_perl stuff
-
-Revision 1.5  1999/01/18 21:58:03  ivan
-esthetic: eq and ne were used in a few places instead of == and !=
-
-Revision 1.4  1998/12/29 11:59:36  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-Revision 1.3  1998/11/13 09:56:53  ivan
-change configuration file layout to support multiple distinct databases (with
-own set of config files, export, etc.)
-
-Revision 1.2  1998/11/07 10:24:24  ivan
-don't use depriciated FS::Bill and FS::Invoice, other miscellania
-
-
-=cut
-
-1;
-
diff --git a/site_perl/cust_bill_pkg.pm b/site_perl/cust_bill_pkg.pm
deleted file mode 100644
index a52539433..000000000
--- a/site_perl/cust_bill_pkg.pm
+++ /dev/null
@@ -1,150 +0,0 @@
-package FS::cust_bill_pkg;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs );
-use FS::cust_pkg;
-use FS::cust_bill;
-
-@ISA = qw(FS::Record );
-
-=head1 NAME
-
-FS::cust_bill_pkg - Object methods for cust_bill_pkg records
-
-=head1 SYNOPSIS
-
-  use FS::cust_bill_pkg;
-
-  $record = new FS::cust_bill_pkg \%hash;
-  $record = new FS::cust_bill_pkg { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cust_bill_pkg object represents an invoice line item.
-FS::cust_bill_pkg inherits from FS::Record.  The following fields are currently
-supported:
-
-=over 4
-
-=item invnum - invoice (see L<FS::cust_bill>)
-
-=item pkgnum - package (see L<FS::cust_pkg>)
-
-=item setup - setup fee
-
-=item recur - recurring fee
-
-=item sdate - starting date of recurring fee
-
-=item edate - ending date of recurring fee
-
-=back
-
-sdate and edate are specified as UNIX timestamps; see L<perlfunc/"time">.  Also
-see L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new line item.  To add the line item to the database, see
-L<"insert">.  Line items are normally created by calling the bill method of a
-customer object (see L<FS::cust_main>).
-
-=cut
-
-sub table { 'cust_bill_pkg'; }
-
-=item insert
-
-Adds this line item to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Currently unimplemented.  I don't remove line items because there would then be
-no record the items ever existed (which is bad, no?)
-
-=cut
-
-sub delete {
-  return "Can't delete cust_bill_pkg records!";
-}
-
-=item replace OLD_RECORD
-
-Currently unimplemented.  This would be even more of an accounting nightmare
-than deleteing the items.  Just don't do it.
-
-=cut
-
-sub replace {
-  return "Can't modify cust_bill_pkg records!";
-}
-
-=item check
-
-Checks all fields to make sure this is a valid line item.  If there is an
-error, returns the error, otherwise returns false.  Called by the insert
-method.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error =
-    $self->ut_number('pkgnum')
-      || $self->ut_number('invnum')
-      || $self->ut_money('setup')
-      || $self->ut_money('recur')
-      || $self->ut_numbern('sdate')
-      || $self->ut_numbern('edate')
-  ;
-  return $error if $error;
-
-  if ( $self->pkgnum != 0 ) { #allow unchecked pkgnum 0 for tax! (add to part_pkg?)
-    return "Unknown pkgnum ". $self->pkgnum
-      unless qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
-  }
-
-  return "Unknown invnum"
-    unless qsearchs( 'cust_bill' ,{ 'invnum' => $self->invnum } );
-
-  ''; #no error
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_bill_pkg.pm,v 1.2 1998-12-29 11:59:37 ivan Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_bill>, L<FS::cust_pkg>, L<FS::cust_main>, schema.html
-from the base documentation.
-
-=head1 HISTORY
-
-ivan@sisd.com 98-mar-13
-
-pod ivan@sisd.com 98-sep-21
-
-=cut
-
-1;
-
diff --git a/site_perl/cust_credit.pm b/site_perl/cust_credit.pm
deleted file mode 100644
index b9a05832b..000000000
--- a/site_perl/cust_credit.pm
+++ /dev/null
@@ -1,191 +0,0 @@
-package FS::cust_credit;
-
-use strict;
-use vars qw( @ISA );
-use FS::UID qw( getotaker );
-use FS::Record qw( qsearchs );
-use FS::cust_main;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::cust_credit - Object methods for cust_credit records
-
-=head1 SYNOPSIS
-
-  use FS::cust_credit;
-
-  $record = new FS::cust_credit \%hash;
-  $record = new FS::cust_credit { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cust_credit object represents a credit.  FS::cust_credit inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item crednum - primary key (assigned automatically for new credits)
-
-=item custnum - customer (see L<FS::cust_main>)
-
-=item amount - amount of the credit
-
-=item credited - how much of this credit that is still outstanding, which is
-amount minus all refunds (see L<FS::cust_refund>).
-
-=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=item otaker - order taker (assigned automatically, see L<FS::UID>)
-
-=item reason - text
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new credit.  To add the credit to the database, see L<"insert">.
-
-=cut
-
-sub table { 'cust_credit'; }
-
-=item insert
-
-Adds this credit to the database ("Posts" the credit).  If there is an error,
-returns the error, otherwise returns false.
-
-When adding new invoices, credited must be amount (or null, in which case it is
-automatically set to amount).
-
-=cut
-
-sub insert {
-  my $self = shift;
-
-  my $error;
-  return $error if $error = $self->ut_money('credited')
-                         || $self->ut_money('amount');
-
-  $self->credited($self->amount) if $self->credited == 0
-                                 || $self->credited eq '';
-  return "credited != amount!"
-    unless $self->credited == $self->amount;
-
-  $self->SUPER::insert;
-}
-
-=item delete
-
-Currently unimplemented.
-
-=cut
-
-sub delete {
-  return "Can't remove credit!"
-}
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-Only credited may be changed.  Credited is normally updated by creating and
-inserting a refund (see L<FS::cust_refund>).
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-
-  return "Can't change custnum!" unless $old->custnum == $new->custnum;
-  #return "Can't change date!" unless $old->_date eq $new->_date;
-  return "Can't change date!" unless $old->_date == $new->_date;
-  return "Can't change amount!" unless $old->amount == $new->amount;
-  return "(New) credited can't be > (new) amount!"
-    if $new->credited > $new->amount;
-
-  $new->SUPER::replace($old);
-}
-
-=item check
-
-Checks all fields to make sure this is a valid credit.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error =
-    $self->ut_numbern('crednum')
-    || $self->ut_number('custnum')
-    || $self->ut_numbern('_date')
-    || $self->ut_money('amount')
-    || $self->ut_money('credited')
-    || $self->ut_textn('reason');
-  ;
-  return $error if $error;
-
-  return "Unknown customer"
-    unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
-
-  $self->_date(time) unless $self->_date;
-
-  $self->otaker(getotaker);
-
-  ''; #no error
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_credit.pm,v 1.4 1999-01-25 12:26:08 ivan Exp $
-
-=head1 BUGS
-
-The delete method.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_refund>, L<FS::cust_bill>, schema.html from the base
-documentation.
-
-=head1 HISTORY
-
-ivan@sisd.com 98-mar-17
-
-pod, otaker from FS::UID ivan@sisd.com 98-sep-21
-
-$Log: cust_credit.pm,v $
-Revision 1.4  1999-01-25 12:26:08  ivan
-yet more mod_perl stuff
-
-Revision 1.3  1999/01/18 21:58:04  ivan
-esthetic: eq and ne were used in a few places instead of == and !=
-
-Revision 1.2  1998/12/29 11:59:38  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-
-=cut
-
-1;
-
diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
deleted file mode 100644
index 6140dcc29..000000000
--- a/site_perl/cust_main.pm
+++ /dev/null
@@ -1,1070 +0,0 @@
-#this is so kludgy i'd be embarassed if it wasn't cybercash's fault
-package main;
-use vars qw($paymentserversecret $paymentserverport $paymentserverhost);
-
-package FS::cust_main;
-
-use strict;
-use vars qw( @ISA $conf $lpr $processor $xaction $E_NoErr $invoice_from
-             $smtpmachine );
-use Safe;
-use Carp;
-use Time::Local;
-use Date::Format;
-use Date::Manip;
-use Mail::Internet;
-use Mail::Header;
-use Business::CreditCard;
-use FS::UID qw( getotaker );
-use FS::Record qw( qsearchs qsearch );
-use FS::cust_pkg;
-use FS::cust_bill;
-use FS::cust_bill_pkg;
-use FS::cust_pay;
-use FS::cust_credit;
-use FS::cust_pay_batch;
-use FS::part_referral;
-use FS::cust_main_county;
-use FS::agent;
-use FS::cust_main_invoice;
-
-@ISA = qw( FS::Record );
-
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::cust_main'} = sub { 
-  $conf = new FS::Conf;
-  $lpr = $conf->config('lpr');
-  $invoice_from = $conf->config('invoice_from');
-  $smtpmachine = $conf->config('smtpmachine');
-
-  if ( $conf->exists('cybercash3.2') ) {
-    require CCMckLib3_2;
-      #qw($MCKversion %Config InitConfig CCError CCDebug CCDebug2);
-    require CCMckDirectLib3_2;
-      #qw(SendCC2_1Server);
-    require CCMckErrno3_2;
-      #qw(MCKGetErrorMessage $E_NoErr);
-    import CCMckErrno3_2 qw($E_NoErr);
-
-    my $merchant_conf;
-    ($merchant_conf,$xaction)= $conf->config('cybercash3.2');
-    my $status = &CCMckLib3_2::InitConfig($merchant_conf);
-    if ( $status != $E_NoErr ) {
-      warn "CCMckLib3_2::InitConfig error:\n";
-      foreach my $key (keys %CCMckLib3_2::Config) {
-        warn "  $key => $CCMckLib3_2::Config{$key}\n"
-      }
-      my($errmsg) = &CCMckErrno3_2::MCKGetErrorMessage($status);
-      die "CCMckLib3_2::InitConfig fatal error: $errmsg\n";
-    }
-    $processor='cybercash3.2';
-  } elsif ( $conf->exists('cybercash2') ) {
-    require CCLib;
-      #qw(sendmserver);
-    ( $main::paymentserverhost, 
-      $main::paymentserverport, 
-      $main::paymentserversecret,
-      $xaction,
-    ) = $conf->config('cybercash2');
-    $processor='cybercash2';
-  }
-};
-
-=head1 NAME
-
-FS::cust_main - Object methods for cust_main records
-
-=head1 SYNOPSIS
-
-  use FS::cust_main;
-
-  $record = new FS::cust_main \%hash;
-  $record = new FS::cust_main { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  @cust_pkg = $record->all_pkgs;
-
-  @cust_pkg = $record->ncancelled_pkgs;
-
-  $error = $record->bill;
-  $error = $record->bill %options;
-  $error = $record->bill 'time' => $time;
-
-  $error = $record->collect;
-  $error = $record->collect %options;
-  $error = $record->collect 'invoice_time'   => $time,
-                            'batch_card'     => 'yes',
-                            'report_badcard' => 'yes',
-                          ;
-
-=head1 DESCRIPTION
-
-An FS::cust_main object represents a customer.  FS::cust_main inherits from 
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item custnum - primary key (assigned automatically for new customers)
-
-=item agentnum - agent (see L<FS::agent>)
-
-=item refnum - referral (see L<FS::part_referral>)
-
-=item first - name
-
-=item last - name
-
-=item ss - social security number (optional)
-
-=item company - (optional)
-
-=item address1
-
-=item address2 - (optional)
-
-=item city
-
-=item county - (optional, see L<FS::cust_main_county>)
-
-=item state - (see L<FS::cust_main_county>)
-
-=item zip
-
-=item country - (see L<FS::cust_main_county>)
-
-=item daytime - phone (optional)
-
-=item night - phone (optional)
-
-=item fax - phone (optional)
-
-=item payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
-
-=item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
-
-=item paydate - expiration date, mm/yyyy, m/yyyy, mm/yy or m/yy
-
-=item payname - name on card or billing name
-
-=item tax - tax exempt, empty or `Y'
-
-=item otaker - order taker (assigned automatically, see L<FS::UID>)
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new customer.  To add the customer to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-sub table { 'cust_main'; }
-
-=item insert
-
-Adds this customer to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete NEW_CUSTNUM
-
-This deletes the customer.  If there is an error, returns the error, otherwise
-returns false.
-
-This will completely remove all traces of the customer record.  This is not
-what you want when a customer cancels service; for that, cancel all of the
-customer's packages (see L<FS::cust_pkg/cancel>).
-
-If the customer has any packages, you need to pass a new (valid) customer
-number for those packages to be transferred to.
-
-You can't delete a customer with invoices (see L<FS::cust_bill>),
-or credits (see L<FS::cust_credit>).
-
-=cut
-
-sub delete {
-  my $self = shift;
-
-  if ( qsearch( 'cust_bill', { 'custnum' => $self->custnum } ) ) {
-    return "Can't delete a customer with invoices";
-  }
-  if ( qsearch( 'cust_credit', { 'custnum' => $self->custnum } ) ) {
-    return "Can't delete a customer with credits";
-  }
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my @cust_pkg = qsearch( 'cust_pkg', { 'custnum' => $self->custnum } );
-  if ( @cust_pkg ) {
-    my $new_custnum = shift;
-    return "Invalid new customer number: $new_custnum"
-      unless qsearchs( 'cust_main', { 'custnum' => $new_custnum } );
-    foreach my $cust_pkg ( @cust_pkg ) {
-      my %hash = $cust_pkg->hash;
-      $hash{'custnum'} = $new_custnum;
-      my $new_cust_pkg = new FS::cust_pkg ( \%hash );
-      my $error = $new_cust_pkg->replace($cust_pkg);
-      return $error if $error;
-    }
-  }
-  foreach my $cust_main_invoice (
-    qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } )
-  ) {
-    my $error = $cust_main_invoice->delete;
-    return $error if $error;
-  }
-
-  $self->SUPER::delete;
-}
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid customer record.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and repalce methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error =
-    $self->ut_numbern('custnum')
-    || $self->ut_number('agentnum')
-    || $self->ut_number('refnum')
-    || $self->ut_textn('company')
-    || $self->ut_text('address1')
-    || $self->ut_textn('address2')
-    || $self->ut_text('city')
-    || $self->ut_textn('county')
-    || $self->ut_textn('state')
-    || $self->ut_phonen('daytime')
-    || $self->ut_phonen('night')
-    || $self->ut_phonen('fax')
-  ;
-  return $error if $error;
-
-  return "Unknown agent"
-    unless qsearchs( 'agent', { 'agentnum' => $self->agentnum } );
-
-  return "Unknown referral"
-    unless qsearchs( 'part_referral', { 'refnum' => $self->refnum } );
-
-  $self->getfield('last') =~ /^([\w \,\.\-\']+)$/
-    or return "Illegal last name: ". $self->getfield('last');
-  $self->setfield('last',$1);
-
-  $self->first =~ /^([\w \,\.\-\']+)$/
-    or return "Illegal first name: ". $self->first;
-  $self->first($1);
-
-  if ( $self->ss eq '' ) {
-    $self->ss('');
-  } else {
-    my $ss = $self->ss;
-    $ss =~ s/\D//g;
-    $ss =~ /^(\d{3})(\d{2})(\d{4})$/
-      or return "Illegal social security number: ". $self->ss;
-    $self->ss("$1-$2-$3");
-  }
-
-  $self->country =~ /^(\w\w)$/ or return "Illegal country: ". $self->country;
-  $self->country($1);
-  unless ( qsearchs('cust_main_county', {
-    'country' => $self->country,
-    'state'   => '',
-   } ) ) {
-    return "Unknown state/county/country: ".
-      $self->state. "/". $self->county. "/". $self->country
-      unless qsearchs('cust_main_county',{
-        'state'   => $self->state,
-        'county'  => $self->county,
-        'country' => $self->country,
-      } );
-  }
-
-  $self->zip =~ /^\s*(\w[\w\-\s]{3,8}\w)\s*$/
-    or return "Illegal zip: ". $self->zip;
-  $self->zip($1);
-
-  $self->payby =~ /^(CARD|BILL|COMP)$/
-    or return "Illegal payby: ". $self->payby;
-  $self->payby($1);
-
-  if ( $self->payby eq 'CARD' ) {
-
-    my $payinfo = $self->payinfo;
-    $payinfo =~ s/\D//g;
-    $payinfo =~ /^(\d{13,16})$/
-      or return "Illegal credit card number: ". $self->payinfo;
-    $payinfo = $1;
-    $self->payinfo($payinfo);
-    validate($payinfo)
-      or return "Illegal credit card number: ". $self->payinfo;
-    return "Unknown card type" if cardtype($self->payinfo) eq "Unknown";
-
-  } elsif ( $self->payby eq 'BILL' ) {
-
-    $error = $self->ut_textn('payinfo');
-    return "Illegal P.O. number: ". $self->payinfo if $error;
-
-  } elsif ( $self->payby eq 'COMP' ) {
-
-    $error = $self->ut_textn('payinfo');
-    return "Illegal comp account issuer: ". $self->payinfo if $error;
-
-  }
-
-  if ( $self->paydate eq '' ) {
-    return "Expriation date required" unless $self->payby eq 'BILL';
-    $self->paydate('');
-  } else {
-    $self->paydate =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/
-      or return "Illegal expiration date: ". $self->paydate;
-    if ( length($2) == 4 ) {
-      $self->paydate("$2-$1-01");
-    } elsif ( $2 > 97 ) { #should pry change to check for "this year"
-      $self->paydate("19$2-$1-01");
-    } else {
-      $self->paydate("20$2-$1-01");
-    }
-  }
-
-  if ( $self->payname eq '' ) {
-    $self->payname( $self->first. " ". $self->getfield('last') );
-  } else {
-    $self->payname =~ /^([\w \,\.\-\']+)$/
-      or return "Illegal billing name: ". $self->payname;
-    $self->payname($1);
-  }
-
-  $self->tax =~ /^(Y?)$/ or return "Illegal tax: ". $self->tax;
-  $self->tax($1);
-
-  $self->otaker(getotaker);
-
-  ''; #no error
-}
-
-=item all_pkgs
-
-Returns all packages (see L<FS::cust_pkg>) for this customer.
-
-=cut
-
-sub all_pkgs {
-  my $self = shift;
-  qsearch( 'cust_pkg', { 'custnum' => $self->custnum });
-}
-
-=item ncancelled_pkgs
-
-Returns all non-cancelled packages (see L<FS::cust_pkg>) for this customer.
-
-=cut
-
-sub ncancelled_pkgs {
-  my $self = shift;
-  qsearch( 'cust_pkg', {
-    'custnum' => $self->custnum,
-    'cancel'  => '',
-  });
-}
-
-=item bill OPTIONS
-
-Generates invoices (see L<FS::cust_bill>) for this customer.  Usually used in
-conjunction with the collect method.
-
-The only currently available option is `time', which bills the customer as if
-it were that time.  It is specified as a UNIX timestamp; see
-L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse> for conversion
-functions.
-
-If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub bill {
-  my( $self, %options ) = @_;
-  my $time = $options{'time'} || time;
-
-  my $error;
-
-  #put below somehow?
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  # find the packages which are due for billing, find out how much they are
-  # & generate invoice database.
- 
-  my( $total_setup, $total_recur ) = ( 0, 0 );
-  my @cust_bill_pkg;
-
-  foreach my $cust_pkg (
-    qsearch('cust_pkg',{'custnum'=> $self->getfield('custnum') } )
-  ) {
-
-    next if $cust_pkg->getfield('cancel');  
-
-    #? to avoid use of uninitialized value errors... ?
-    $cust_pkg->setfield('bill', '')
-      unless defined($cust_pkg->bill);
- 
-    my $part_pkg = qsearchs( 'part_pkg', { 'pkgpart' => $cust_pkg->pkgpart } );
-
-    #so we don't modify cust_pkg record unnecessarily
-    my $cust_pkg_mod_flag = 0;
-    my %hash = $cust_pkg->hash;
-    my $old_cust_pkg = new FS::cust_pkg \%hash;
-
-    # bill setup
-    my $setup = 0;
-    unless ( $cust_pkg->setup ) {
-      my $setup_prog = $part_pkg->getfield('setup');
-      my $cpt = new Safe;
-      #$cpt->permit(); #what is necessary?
-      $cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
-      $setup = $cpt->reval($setup_prog);
-      unless ( defined($setup) ) {
-        warn "Error reval-ing part_pkg->setup pkgpart ", 
-             $part_pkg->pkgpart, ": $@";
-      } else {
-        $cust_pkg->setfield('setup',$time);
-        $cust_pkg_mod_flag=1; 
-      }
-    }
-
-    #bill recurring fee
-    my $recur = 0;
-    my $sdate;
-    if ( $part_pkg->getfield('freq') > 0 &&
-         ! $cust_pkg->getfield('susp') &&
-         ( $cust_pkg->getfield('bill') || 0 ) < $time
-    ) {
-      my $recur_prog = $part_pkg->getfield('recur');
-      my $cpt = new Safe;
-      #$cpt->permit(); #what is necessary?
-      $cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
-      $recur = $cpt->reval($recur_prog);
-      unless ( defined($recur) ) {
-        warn "Error reval-ing part_pkg->recur pkgpart ",
-             $part_pkg->pkgpart, ": $@";
-      } else {
-        #change this bit to use Date::Manip?
-        #$sdate=$cust_pkg->bill || time;
-        #$sdate=$cust_pkg->bill || $time;
-        $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
-        my ($sec,$min,$hour,$mday,$mon,$year) =
-          (localtime($sdate) )[0,1,2,3,4,5];
-        $mon += $part_pkg->getfield('freq');
-        until ( $mon < 12 ) { $mon -= 12; $year++; }
-        $cust_pkg->setfield('bill',
-          timelocal($sec,$min,$hour,$mday,$mon,$year));
-        $cust_pkg_mod_flag = 1; 
-      }
-    }
-
-    warn "setup is undefinded" unless defined($setup);
-    warn "recur is undefinded" unless defined($recur);
-    warn "cust_pkg bill is undefinded" unless defined($cust_pkg->bill);
-
-    if ( $cust_pkg_mod_flag ) {
-      $error=$cust_pkg->replace($old_cust_pkg);
-      if ( $error ) { #just in case
-        warn "Error modifying pkgnum ", $cust_pkg->pkgnum, ": $error";
-      } else {
-        $setup = sprintf( "%.2f", $setup );
-        $recur = sprintf( "%.2f", $recur );
-        my $cust_bill_pkg = new FS::cust_bill_pkg ({
-          'pkgnum' => $cust_pkg->pkgnum,
-          'setup'  => $setup,
-          'recur'  => $recur,
-          'sdate'  => $sdate,
-          'edate'  => $cust_pkg->bill,
-        });
-        push @cust_bill_pkg, $cust_bill_pkg;
-        $total_setup += $setup;
-        $total_recur += $recur;
-      }
-    }
-
-  }
-
-  my $charged = sprintf( "%.2f", $total_setup + $total_recur );
-
-  return '' if scalar(@cust_bill_pkg) == 0;
-
-  unless ( $self->getfield('tax') =~ /Y/i
-           || $self->getfield('payby') eq 'COMP'
-  ) {
-    my $cust_main_county = qsearchs('cust_main_county',{
-        'state'   => $self->state,
-        'county'  => $self->county,
-        'country' => $self->country,
-    } );
-    my $tax = sprintf( "%.2f",
-      $charged * ( $cust_main_county->getfield('tax') / 100 )
-    );
-    $charged = sprintf( "%.2f", $charged+$tax );
-
-    my $cust_bill_pkg = new FS::cust_bill_pkg ({
-      'pkgnum' => 0,
-      'setup'  => $tax,
-      'recur'  => 0,
-      'sdate'  => '',
-      'edate'  => '',
-    });
-    push @cust_bill_pkg, $cust_bill_pkg;
-  }
-
-  my $cust_bill = new FS::cust_bill ( {
-    'custnum' => $self->getfield('custnum'),
-    '_date' => $time,
-    'charged' => $charged,
-  } );
-  $error = $cust_bill->insert;
-  #shouldn't happen, but how else to handle this? (wrap me in eval, to catch 
-  # fatal errors)
-  die "Error creating cust_bill record: $error!\n",
-      "Check updated but unbilled packages for customer", $self->custnum, "\n"
-    if $error;
-
-  my $invnum = $cust_bill->invnum;
-  my $cust_bill_pkg;
-  foreach $cust_bill_pkg ( @cust_bill_pkg ) {
-    $cust_bill_pkg->setfield( 'invnum', $invnum );
-    $error = $cust_bill_pkg->insert;
-    #shouldn't happen, but how else tohandle this?
-    die "Error creating cust_bill_pkg record: $error!\n",
-        "Check incomplete invoice ", $invnum, "\n"
-      if $error;
-  }
-  
-  ''; #no error
-}
-
-=item collect OPTIONS
-
-(Attempt to) collect money for this customer's outstanding invoices (see
-L<FS::cust_bill>).  Usually used after the bill method.
-
-Depending on the value of `payby', this may print an invoice (`BILL'), charge
-a credit card (`CARD'), or just add any necessary (pseudo-)payment (`COMP').
-
-If there is an error, returns the error, otherwise returns false.
-
-Currently available options are:
-
-invoice_time - Use this time when deciding when to print invoices and
-late notices on those invoices.  The default is now.  It is specified as a UNIX timestamp; see L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse>
-for conversion functions.
-
-batch_card - Set this true to batch cards (see L<cust_pay_batch>).  By
-default, cards are processed immediately, which will generate an error if
-CyberCash is not installed.
-
-report_badcard - Set this true if you want bad card transactions to
-return an error.  By default, they don't.
-
-=cut
-
-sub collect {
-  my( $self, %options ) = @_;
-  my $invoice_time = $options{'invoice_time'} || time;
-
-  my $total_owed = $self->balance;
-  return '' unless $total_owed > 0; #redundant?????
-
-  #put below somehow?
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  foreach my $cust_bill (
-    qsearch('cust_bill', { 'custnum' => $self->custnum, } )
-  ) {
-
-    #this has to be before next's
-    my $amount = sprintf( "%.2f", $total_owed < $cust_bill->owed
-                                  ? $total_owed
-                                  : $cust_bill->owed
-    );
-    $total_owed = sprintf( "%.2f", $total_owed - $amount );
-
-    next unless $cust_bill->owed > 0;
-
-    next if qsearchs( 'cust_pay_batch', { 'invnum' => $cust_bill->invnum } );
-
-    #warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ", amount $amount, total_owed $total_owed)";
-
-    next unless $amount > 0;
-
-    if ( $self->payby eq 'BILL' ) {
-
-      #30 days 2592000
-      my $since = $invoice_time - ( $cust_bill->_date || 0 );
-      #warn "$invoice_time ", $cust_bill->_date, " $since";
-      if ( $since >= 0 #don't print future invoices
-           && ( $cust_bill->printed * 2592000 ) <= $since
-      ) {
-
-        #my @print_text = $cust_bill->print_text; #( date )
-        my @invoicing_list = $self->invoicing_list;
-        if ( grep { $_ ne 'POST' } @invoicing_list ) { #email invoice
-          $ENV{SMTPHOSTS} = $smtpmachine;
-          $ENV{MAILADDRESS} = $invoice_from;
-          my $header = new Mail::Header ( [
-            "From: $invoice_from",
-            "To: ". join(', ', grep { $_ ne 'POST' } @invoicing_list ),
-            "Sender: $invoice_from",
-            "Reply-To: $invoice_from",
-            "Date: ". time2str("%a, %d %b %Y %X %z", time),
-            "Subject: Invoice",
-          ] );
-          my $message = new Mail::Internet (
-            'Header' => $header,
-            'Body' => [ $cust_bill->print_text ], #( date)
-          );
-          $message->smtpsend or die "Can't send invoice email!"; #die?  warn?
-
-        } elsif ( ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list ) {
-          open(LPR, "|$lpr") or die "Can't open pipe to $lpr: $!";
-          print LPR $cust_bill->print_text; #( date )
-          close LPR
-            or die $! ? "Error closing $lpr: $!"
-                         : "Exit status $? from $lpr";
-        }
-
-        my %hash = $cust_bill->hash;
-        $hash{'printed'}++;
-        my $new_cust_bill = new FS::cust_bill(\%hash);
-        my $error = $new_cust_bill->replace($cust_bill);
-        warn "Error updating $cust_bill->printed: $error" if $error;
-
-      }
-
-    } elsif ( $self->payby eq 'COMP' ) {
-      my $cust_pay = new FS::cust_pay ( {
-         'invnum' => $cust_bill->invnum,
-         'paid' => $amount,
-         '_date' => '',
-         'payby' => 'COMP',
-         'payinfo' => $self->payinfo,
-         'paybatch' => ''
-      } );
-      my $error = $cust_pay->insert;
-      return 'Error COMPing invnum #' . $cust_bill->invnum .
-             ':' . $error if $error;
-
-    } elsif ( $self->payby eq 'CARD' ) {
-
-      if ( $options{'batch_card'} ne 'yes' ) {
-
-        return "Real time card processing not enabled!" unless $processor;
-
-        if ( $processor =~ /^cybercash/ ) {
-
-          #fix exp. date for cybercash
-          #$self->paydate =~ /^(\d+)\/\d*(\d{2})$/;
-          $self->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
-          my $exp = "$2/$1";
-
-          my $paybatch = $cust_bill->invnum. 
-                         '-' . time2str("%y%m%d%H%M%S", time);
-
-          my $payname = $self->payname ||
-                        $self->getfield('first'). ' '. $self->getfield('last');
-
-          my $address = $self->address1;
-          $address .= ", ". $self->address2 if $self->address2;
-
-          my $country = 'USA' if $self->country eq 'US';
-
-          my @full_xaction = ( $xaction,
-            'Order-ID'     => $paybatch,
-            'Amount'       => "usd $amount",
-            'Card-Number'  => $self->getfield('payinfo'),
-            'Card-Name'    => $payname,
-            'Card-Address' => $address,
-            'Card-City'    => $self->getfield('city'),
-            'Card-State'   => $self->getfield('state'),
-            'Card-Zip'     => $self->getfield('zip'),
-            'Card-Country' => $country,
-            'Card-Exp'     => $exp,
-          );
-
-          my %result;
-          if ( $processor eq 'cybercash2' ) {
-            $^W=0; #CCLib isn't -w safe, ugh!
-            %result = &CCLib::sendmserver(@full_xaction);
-            $^W=1;
-          } elsif ( $processor eq 'cybercash3.2' ) {
-            %result = &CCMckDirectLib3_2::SendCC2_1Server(@full_xaction);
-          } else {
-            return "Unkonwn real-time processor $processor\n";
-          }
-         
-          #if ( $result{'MActionCode'} == 7 ) { #cybercash smps v.1.1.3
-          #if ( $result{'action-code'} == 7 ) { #cybercash smps v.2.1
-          if ( $result{'MStatus'} eq 'success' ) { #cybercash smps v.2 or 3
-            my $cust_pay = new FS::cust_pay ( {
-               'invnum'   => $cust_bill->invnum,
-               'paid'     => $amount,
-               '_date'     => '',
-               'payby'    => 'CARD',
-               'payinfo'  => $self->payinfo,
-               'paybatch' => "$processor:$paybatch",
-            } );
-            my $error = $cust_pay->insert;
-            return 'Error applying payment, invnum #' . 
-              $cust_bill->invnum. ':'. $error if $error;
-          } elsif ( $result{'Mstatus'} ne 'failure-bad-money'
-                 || $options{'report_badcard'} ) {
-             return 'Cybercash error, invnum #' . 
-               $cust_bill->invnum. ':'. $result{'MErrMsg'};
-          } else {
-            return '';
-          }
-
-        } else {
-          return "Unkonwn real-time processor $processor\n";
-        }
-
-      } else { #batch card
-
-       my $cust_pay_batch = new FS::cust_pay_batch ( {
-         'invnum'   => $cust_bill->getfield('invnum'),
-         'custnum'  => $self->getfield('custnum'),
-         'last'     => $self->getfield('last'),
-         'first'    => $self->getfield('first'),
-         'address1' => $self->getfield('address1'),
-         'address2' => $self->getfield('address2'),
-         'city'     => $self->getfield('city'),
-         'state'    => $self->getfield('state'),
-         'zip'      => $self->getfield('zip'),
-         'country'  => $self->getfield('country'),
-         'trancode' => 77,
-         'cardnum'  => $self->getfield('payinfo'),
-         'exp'      => $self->getfield('paydate'),
-         'payname'  => $self->getfield('payname'),
-         'amount'   => $amount,
-       } );
-       my $error = $cust_pay_batch->insert;
-       return "Error adding to cust_pay_batch: $error" if $error;
-
-      }
-
-    } else {
-      return "Unknown payment type ". $self->payby;
-    }
-
-
-
-
-
-  }
-  '';
-
-}
-
-=item total_owed
-
-Returns the total owed for this customer on all invoices
-(see L<FS::cust_bill>).
-
-=cut
-
-sub total_owed {
-  my $self = shift;
-  my $total_bill = 0;
-  foreach my $cust_bill ( qsearch('cust_bill', {
-    'custnum' => $self->custnum,
-  } ) ) {
-    $total_bill += $cust_bill->owed;
-  }
-  sprintf( "%.2f", $total_bill );
-}
-
-=item total_credited
-
-Returns the total credits (see L<FS::cust_credit>) for this customer.
-
-=cut
-
-sub total_credited {
-  my $self = shift;
-  my $total_credit = 0;
-  foreach my $cust_credit ( qsearch('cust_credit', {
-    'custnum' => $self->custnum,
-  } ) ) {
-    $total_credit += $cust_credit->credited;
-  }
-  sprintf( "%.2f", $total_credit );
-}
-
-=item balance
-
-Returns the balance for this customer (total owed minus total credited).
-
-=cut
-
-sub balance {
-  my $self = shift;
-  sprintf( "%.2f", $self->total_owed - $self->total_credited );
-}
-
-=item invoicing_list [ ARRAYREF ]
-
-If an arguement is given, sets these email addresses as invoice recipients
-(see L<FS::cust_main_invoice>).  Errors are not fatal and are not reported
-(except as warnings), so use check_invoicing_list first.
-
-Returns a list of email addresses (with svcnum entries expanded).
-
-Note: You can clear the invoicing list by passing an empty ARRAYREF.  You can
-check it without disturbing anything by passing nothing.
-
-This interface may change in the future.
-
-=cut
-
-sub invoicing_list {
-  my( $self, $arrayref ) = @_;
-  if ( $arrayref ) {
-    my @cust_main_invoice;
-    if ( $self->custnum ) {
-      @cust_main_invoice = 
-        qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
-    } else {
-      @cust_main_invoice = ();
-    }
-    foreach my $cust_main_invoice ( @cust_main_invoice ) {
-      #warn $cust_main_invoice->destnum;
-      unless ( grep { $cust_main_invoice->address eq $_ } @{$arrayref} ) {
-        #warn $cust_main_invoice->destnum;
-        my $error = $cust_main_invoice->delete;
-        warn $error if $error;
-      }
-    }
-    if ( $self->custnum ) {
-      @cust_main_invoice = 
-        qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
-    } else {
-      @cust_main_invoice = ();
-    }
-    foreach my $address ( @{$arrayref} ) {
-      unless ( grep { $address eq $_->address } @cust_main_invoice ) {
-        my $cust_main_invoice = new FS::cust_main_invoice ( {
-          'custnum' => $self->custnum,
-          'dest'    => $address,
-        } );
-        my $error = $cust_main_invoice->insert;
-        warn $error if $error;
-      } 
-    }
-  }
-  if ( $self->custnum ) {
-    map { $_->address }
-      qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
-  } else {
-    ();
-  }
-}
-
-=item check_invoicing_list ARRAYREF
-
-Checks these arguements as valid input for the invoicing_list method.  If there
-is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub check_invoicing_list {
-  my( $self, $arrayref ) = @_;
-  foreach my $address ( @{$arrayref} ) {
-    my $cust_main_invoice = new FS::cust_main_invoice ( {
-      'custnum' => $self->custnum,
-      'dest'    => $address,
-    } );
-    my $error = $self->custnum
-                ? $cust_main_invoice->check
-                : $cust_main_invoice->checkdest
-    ;
-    return $error if $error;
-  }
-  '';
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_main.pm,v 1.24 1999-07-20 10:37:05 ivan Exp $
-
-=head1 BUGS
-
-The delete method.
-
-The delete method should possibly take an FS::cust_main object reference
-instead of a scalar customer number.
-
-Bill and collect options should probably be passed as references instead of a
-list.
-
-CyberCash v2 forces us to define some variables in package main.
-
-There should probably be a configuration file with a list of allowed credit
-card types.
-
-CyberCash is the only processor.
-
-No multiple currency support (probably a larger project than just this module).
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_pkg>, L<FS::cust_bill>, L<FS::cust_credit>
-L<FS::cust_pay_batch>, L<FS::agent>, L<FS::part_referral>,
-L<FS::cust_main_county>, L<FS::cust_main_invoice>,
-L<FS::UID>, schema.html from the base documentation.
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-jul-28
-
-Changed to standard Business::CreditCard
-no more TableUtil
-EXPORT_OK FS::Record's hfields
-removed unique calls and locking (not needed here now)
-wrapped the (now) optional fields in if statements in sub check (notyetdone!)
-ivan@sisd.com 97-nov-12
-
-updated paydate with SQL-type date info ivan@sisd.com 98-mar-5
-
-Added export of datasrc from UID.pm for Pg6.3
-changed 'day' to 'daytime' because Pg6.3 reserves the day word
-	bmccane@maxbaud.net	98-apr-3
-
-in ->create, s/svc_acct/cust_main/, now it should actually eliminate the
-warnings it was meant to ivan@sisd.com 98-jul-16
-
-don't require a phone number and allow '/' in company names
-ivan@sisd.com 98-jul-18
-
-use ut_ and rewrite &check, &*_pkgs ivan@sisd.com 98-sep-5
-
-pod, merge with FS::Bill (about time!), total_owed, total_credited and balance
-methods, cleaned collect method, source modifications no longer necessary to
-enable cybercash, cybercash v3 support, don't need to import
-FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
-
-$Log: cust_main.pm,v $
-Revision 1.24  1999-07-20 10:37:05  ivan
-cleaned up the new one-screen signup bits in htdocs/edit/cust_main.cgi to
-prepare for a signup server
-
-Revision 1.23  1999/07/17 02:24:14  ivan
-bug noticed by Steve Gertz <sglist@hollywood.mwis.net>
-
-Revision 1.22  1999/04/15 16:44:36  ivan
-delete customers
-
-Revision 1.21  1999/04/14 07:47:53  ivan
-i18n fixes
-
-Revision 1.20  1999/04/10 08:35:14  ivan
-say what the unknown state/county/country are!
-
-Revision 1.19  1999/04/10 07:38:06  ivan
-_all_ check stuff with illegal data return the bad data too, to help debugging
-
-Revision 1.18  1999/04/10 06:54:11  ivan
-ditto
-
-Revision 1.17  1999/04/10 05:27:38  ivan
-display an illegal payby, to assist importing
-
-Revision 1.16  1999/04/07 14:32:19  ivan
-more &invoicing_list logic to skip searches when there is no custnum
-
-Revision 1.15  1999/04/07 13:41:54  ivan
-in &invoicing_list, don't search if there's no custnum yet
-
-Revision 1.14  1999/03/29 12:06:15  ivan
-buglet in email invoices fixed
-
-Revision 1.13  1999/02/28 20:09:03  ivan
-allow spaces in zip codes, for (at least) canada.  pointed out by
-Clayton Gray <clgray@bcgroup.net>
-
-Revision 1.12  1999/02/27 21:24:22  ivan
-parse paydate correctly for cybercash
-
-Revision 1.11  1999/02/23 08:09:27  ivan
-beginnings of one-screen new customer entry and some other miscellania
-
-Revision 1.10  1999/01/25 12:26:09  ivan
-yet more mod_perl stuff
-
-Revision 1.9  1999/01/18 09:22:41  ivan
-changes to track email addresses for email invoicing
-
-Revision 1.8  1998/12/29 11:59:39  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-Revision 1.7  1998/12/16 09:58:52  ivan
-library support for editing email invoice destinations (not in sub collect yet)
-
-Revision 1.6  1998/11/18 09:01:42  ivan
-i18n! i18n!
-
-Revision 1.5  1998/11/15 11:23:14  ivan
-use FS::table_name for all searches to eliminate warnings,
-emit state/county when they don't match
-
-Revision 1.4  1998/11/15 05:30:48  ivan
-bugfix for new config layout
-
-Revision 1.3  1998/11/13 09:56:54  ivan
-change configuration file layout to support multiple distinct databases (with
-own set of config files, export, etc.)
-
-Revision 1.2  1998/11/07 10:24:25  ivan
-don't use depriciated FS::Bill and FS::Invoice, other miscellania
-
-
-=cut
-
-1;
-
-
diff --git a/site_perl/cust_main_county.pm b/site_perl/cust_main_county.pm
deleted file mode 100644
index 1418ca1ea..000000000
--- a/site_perl/cust_main_county.pm
+++ /dev/null
@@ -1,132 +0,0 @@
-package FS::cust_main_county;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::cust_main_county - Object methods for cust_main_county objects
-
-=head1 SYNOPSIS
-
-  use FS::cust_main_county;
-
-  $record = new FS::cust_main_county \%hash;
-  $record = new FS::cust_main_county { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cust_main_county object represents a tax rate, defined by locale.
-FS::cust_main_county inherits from FS::Record.  The following fields are
-currently supported:
-
-=over 4
-
-=item taxnum - primary key (assigned automatically for new tax rates)
-
-=item state
-
-=item county
-
-=item country
-
-=item tax - percentage
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new tax rate.  To add the tax rate to the database, see L<"insert">.
-
-=cut
-
-sub table { 'cust_main_county'; }
-
-=item insert
-
-Adds this tax rate to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this tax rate from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid tax rate.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  $self->ut_numbern('taxnum')
-    || $self->ut_textn('state')
-    || $self->ut_textn('county')
-    || $self->ut_text('country')
-    || $self->ut_float('tax')
-  ;
-
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_main_county.pm,v 1.4 1999-07-20 10:37:05 ivan Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_main>, L<FS::cust_bill>, schema.html from the base
-documentation.
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-dec-16
-
-Changed check for 'tax' to use the new ut_float subroutine
-	bmccane@maxbaud.net	98-apr-3
-
-pod ivan@sisd.com 98-sep-21
-
-$Log: cust_main_county.pm,v $
-Revision 1.4  1999-07-20 10:37:05  ivan
-cleaned up the new one-screen signup bits in htdocs/edit/cust_main.cgi to
-prepare for a signup server
-
-Revision 1.3  1998/12/29 11:59:41  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-Revision 1.2  1998/11/18 09:01:43  ivan
-i18n! i18n!
-
-
-=cut
-
-1;
-
diff --git a/site_perl/cust_main_invoice.pm b/site_perl/cust_main_invoice.pm
deleted file mode 100644
index 2823294c1..000000000
--- a/site_perl/cust_main_invoice.pm
+++ /dev/null
@@ -1,214 +0,0 @@
-package FS::cust_main_invoice;
-
-use strict;
-use vars qw(@ISA $conf $mydomain);
-use Exporter;
-use FS::Record qw( qsearchs );
-use FS::Conf;
-use FS::cust_main;
-use FS::svc_acct;
-
-@ISA = qw( FS::Record );
-
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::cust_main_invoice'} = sub { 
-  $conf = new FS::Conf;
-  $mydomain = $conf->config('domain');
-};
-
-=head1 NAME
-
-FS::cust_main_invoice - Object methods for cust_main_invoice records
-
-=head1 SYNOPSIS
-
-  use FS::cust_main_invoice;
-
-  $record = new FS::cust_main_invoice \%hash;
-  $record = new FS::cust_main_invoice { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $email_address = $record->address;
-
-=head1 DESCRIPTION
-
-An FS::cust_main_invoice object represents an invoice destination.  FS::cust_main_invoice inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item destnum - primary key
-
-=item custnum - customer (see L<FS::cust_main>)
-
-=item dest - Invoice destination: If numeric, a <a href="#svc_acct">svcnum</a>, if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new invoice destination.  To add the invoice destination to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-sub table { 'cust_main_invoice'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Delete this record from the database.
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-
-  return "Can't change custnum!" unless $old->custnum == $new->custnum;
-
-  $new->SUPER::replace;
-}
-
-
-=item check
-
-Checks all fields to make sure this is a valid invoice destination.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and repalce methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error = $self->ut_numbern('destnum')
-           || $self->ut_number('custnum')
-           || $self->checkdest;
-  ;
-  return $error if $error;
-
-  return "Unknown customer"
-    unless qsearchs('cust_main',{ 'custnum' => $self->custnum });
-
-  ''; #noerror
-}
-
-=item checkdest
-
-Checks the dest field only.
-
-=cut
-
-sub checkdest { 
-  my $self = shift;
-
-  my $error = $self->ut_text('dest');
-  return $error if $error;
-
-  if ( $self->dest eq 'POST' ) {
-    #contemplate our navel
-  } elsif ( $self->dest =~ /^(\d+)$/ ) {
-    return "Unknown local account (specified by svcnum)"
-      unless qsearchs( 'svc_acct', { 'svcnum' => $self->dest } );
-  } elsif ( $self->dest =~ /^([\w\.\-]+)\@(([\w\.\-]+\.)+\w+)$/ ) {
-    my($user, $domain) = ($1, $2);
-    if ( $domain eq $mydomain ) {
-      my $svc_acct = qsearchs( 'svc_acct', { 'username' => $user } );
-      return "Unknown local account (specified literally)" unless $svc_acct;
-      $svc_acct->svcnum =~ /^(\d+)$/ or die "Non-numeric svcnum?!";
-      $self->dest($1);
-    }
-  } else {
-    return "Illegal destination!";
-  }
-
-  ''; #no error
-}
-
-=item address
-
-Returns the literal email address for this record (or `POST').
-
-=cut
-
-sub address {
-  my $self = shift;
-  if ( $self->dest =~ /(\d+)$/ ) {
-    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $1 } );
-    $svc_acct->username . '@' . $mydomain;
-  } else {
-    $self->dest;
-  }
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_main_invoice.pm,v 1.6 1999-01-25 12:26:10 ivan Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_main>
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-jul-1
-
-added hfields
-ivan@sisd.com 97-nov-13
-
-$Log: cust_main_invoice.pm,v $
-Revision 1.6  1999-01-25 12:26:10  ivan
-yet more mod_perl stuff
-
-Revision 1.5  1999/01/18 21:58:05  ivan
-esthetic: eq and ne were used in a few places instead of == and !=
-
-Revision 1.4  1999/01/18 09:22:42  ivan
-changes to track email addresses for email invoicing
-
-Revision 1.3  1998/12/29 11:59:42  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-Revision 1.2  1998/12/16 09:58:53  ivan
-library support for editing email invoice destinations (not in sub collect yet)
-
-Revision 1.1  1998/12/16 07:40:02  ivan
-new table
-
-Revision 1.3  1998/11/15 04:33:00  ivan
-updates for newest versoin
-
-Revision 1.2  1998/11/15 03:48:49  ivan
-update for current version
-
-
-=cut
-
-1;
-
diff --git a/site_perl/cust_pay.pm b/site_perl/cust_pay.pm
deleted file mode 100644
index 46addac01..000000000
--- a/site_perl/cust_pay.pm
+++ /dev/null
@@ -1,207 +0,0 @@
-package FS::cust_pay;
-
-use strict;
-use vars qw( @ISA );
-use Business::CreditCard;
-use FS::Record qw( qsearchs );
-use FS::cust_bill;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::cust_pay - Object methods for cust_pay objects
-
-=head1 SYNOPSIS
-
-  use FS::cust_pay;
-
-  $record = new FS::cust_pay \%hash;
-  $record = new FS::cust_pay { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cust_pay object represents a payment.  FS::cust_pay inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item paynum - primary key (assigned automatically for new payments)
-
-=item invnum - Invoice (see L<FS::cust_bill>)
-
-=item paid - Amount of this payment
-
-=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=item payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
-
-=item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
-
-=item paybatch - text field for tracking card processing
-
-=back
-
-=head1 METHODS
-
-=over 4 
-
-=item new HASHREF
-
-Creates a new payment.  To add the payment to the databse, see L<"insert">.
-
-=cut
-
-sub table { 'cust_pay'; }
-
-=item insert
-
-Adds this payment to the databse, and updates the invoice (see
-L<FS::cust_bill>).
-
-=cut
-
-sub insert {
-  my $self = shift;
-
-  my $error;
-
-  $error = $self->check;
-  return $error if $error;
-
-  my $old_cust_bill = qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
-  return "Unknown invnum" unless $old_cust_bill;
-  my %hash = $old_cust_bill->hash;
-  $hash{'owed'} = sprintf("%.2f", $hash{owed} - $self->paid );
-  my $new_cust_bill = new FS::cust_bill ( \%hash );
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  $error = $new_cust_bill->replace($old_cust_bill);
-  return "Error modifying cust_bill: $error" if $error;
-
-  $self->SUPER::insert;
-}
-
-=item delete
-
-Currently unimplemented (accounting reasons).
-
-=cut
-
-sub delete {
-  return "Can't (yet?) delete cust_pay records!";
-}
-
-=item replace OLD_RECORD
-
-Currently unimplemented (accounting reasons).
-
-=cut
-
-sub replace {
-   return "Can't (yet?) modify cust_pay records!";
-}
-
-=item check
-
-Checks all fields to make sure this is a valid payment.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert method.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error;
-
-  $error =
-    $self->ut_numbern('paynum')
-    || $self->ut_number('invnum')
-    || $self->ut_money('paid')
-    || $self->ut_numbern('_date')
-  ;
-  return $error if $error;
-
-  $self->_date(time) unless $self->_date;
-
-  $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
-  $self->payby($1);
-
-  if ( $self->payby eq 'CARD' ) {
-    my $payinfo = $self->payinfo;
-    $payinfo =~ s/\D//g;
-    $self->payinfo($payinfo);
-    if ( $self->payinfo ) {
-      $self->payinfo =~ /^(\d{13,16})$/
-        or return "Illegal (mistyped?) credit card number (payinfo)";
-      $self->payinfo($1);
-      validate($self->payinfo) or return "Illegal credit card number";
-      return "Unknown card type" if cardtype($self->payinfo) eq "Unknown";
-    } else {
-      $self->payinfo('N/A');
-    }
-
-  } else {
-    $error = $self->ut_textn('payinfo');
-    return $error if $error;
-  }
-
-  $error = $self->ut_textn('paybatch');
-  return $error if $error;
-
-  ''; #no error
-
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_pay.pm,v 1.4 1999-07-29 09:07:44 ivan Exp $
-
-=head1 BUGS
-
-Delete and replace methods.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_bill>, schema.html from the base documentation.
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-jul-1 - 25 - 29
-
-new api ivan@sisd.com 98-mar-13
-
-pod ivan@sisd.com 98-sep-21
-
-$Log: cust_pay.pm,v $
-Revision 1.4  1999-07-29 09:07:44  ivan
-embarassing.
-
-Revision 1.3  1999/01/25 12:26:11  ivan
-yet more mod_perl stuff
-
-Revision 1.2  1998/12/29 11:59:43  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-
-=cut
-
-1;
-
diff --git a/site_perl/cust_pay_batch.pm b/site_perl/cust_pay_batch.pm
deleted file mode 100644
index c7a0ccb9d..000000000
--- a/site_perl/cust_pay_batch.pm
+++ /dev/null
@@ -1,235 +0,0 @@
-package FS::cust_pay_batch;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record;
-use Business::CreditCard;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::cust_pay_batch - Object methods for batch cards
-
-=head1 SYNOPSIS
-
-  use FS::cust_pay_batch;
-
-  $record = new FS::cust_pay_batch \%hash;
-  $record = new FS::cust_pay_batch { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cust_pay_batch object represents a credit card transaction ready to be
-batched (sent to a processor).  FS::cust_pay_batch inherits from FS::Record.  
-Typically called by the collect method of an FS::cust_main object.  The
-following fields are currently supported:
-
-=over 4
-
-=item trancode - 77 for charges
-
-=item cardnum
-
-=item exp - card expiration 
-
-=item amount 
-
-=item invnum - invoice
-
-=item custnum - customer 
-
-=item payname - name on card 
-
-=item first - name 
-
-=item last - name 
-
-=item address1 
-
-=item address2 
-
-=item city 
-
-=item state 
-
-=item zip 
-
-=item country 
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new record.  To add the record to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-sub table { 'cust_pay_batch'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Delete this record from the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item replace OLD_RECORD
-
-#inactive
-#
-#Replaces the OLD_RECORD with this one in the database.  If there is an error,
-#returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  return "Can't (yet?) replace batched transactions!";
-}
-
-=item check
-
-Checks all fields to make sure this is a valid transaction.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and repalce methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-      $self->ut_numbern('trancode')
-    || $self->ut_number('cardnum') 
-    || $self->ut_money('amount')
-    || $self->ut_number('invnum')
-    || $self->ut_number('custnum')
-    || $self->ut_text('address1')
-    || $self->ut_textn('address2')
-    || $self->ut_text('city')
-    || $self->ut_text('state')
-  ;
-
-  return $error if $error;
-
-  $self->getfield('last') =~ /^([\w \,\.\-\']+)$/ or return "Illegal last name";
-  $self->setfield('last',$1);
-
-  $self->first =~ /^([\w \,\.\-\']+)$/ or return "Illegal first name";
-  $self->first($1);
-
-  my $cardnum = $self->cardnum;
-  $cardnum =~ s/\D//g;
-  $cardnum =~ /^(\d{13,16})$/
-    or return "Illegal credit card number";
-  $cardnum = $1;
-  $self->cardnum($cardnum);
-  validate($cardnum) or return "Illegal credit card number";
-  return "Unknown card type" if cardtype($cardnum) eq "Unknown";
-
-  if ( $self->exp eq '' ) {
-    return "Expriation date required"; #unless 
-    $self->exp('');
-  } else {
-    if ( $self->exp =~ /^(\d{4})[\/\-](\d{1,2})[\/\-](\d{1,2})$/ ) {
-      $self->exp("$1-$2-$3");
-    } elsif ( $self->exp =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/ ) {
-      if ( length($2) == 4 ) {
-        $self->exp("$2-$1-01");
-      } elsif ( $2 > 98 ) { #should pry change to check for "this year"
-        $self->exp("19$2-$1-01");
-      } else {
-        $self->exp("20$2-$1-01");
-      }
-    } else {
-      return "Illegal expiration date";
-    }
-  }
-
-  if ( $self->payname eq '' ) {
-    $self->payname( $self->first. " ". $self->getfield('last') );
-  } else {
-    $self->payname =~ /^([\w \,\.\-\']+)$/
-      or return "Illegal billing name";
-    $self->payname($1);
-  }
-
-  $self->zip =~ /^\s*(\w[\w\-\s]{3,8}\w)\s*$/
-    or return "Illegal zip: ". $self->zip;
-  $self->zip($1);
-
-  $self->country =~ /^(\w\w)$/ or return "Illegal \w\wy";
-  $self->country($1);
-
-  #check invnum, custnum, ?
-
-  ''; #no error
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_pay_batch.pm,v 1.5 1999-07-29 07:49:04 ivan Exp $
-
-=head1 BUGS
-
-There should probably be a configuration file with a list of allowed credit
-card types.
-
-=head1 SEE ALSO
-
-L<FS::cust_main>, L<FS::Record>
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-jul-1
-
-added hfields
-ivan@sisd.com 97-nov-13
-
-$Log: cust_pay_batch.pm,v $
-Revision 1.5  1999-07-29 07:49:04  ivan
-fixes for bugs noticed by Joel Griffiths <griff@aver-computer.com>
-
-Revision 1.4  1999/07/17 22:02:16  ivan
-another bug noticed by Steve Gertz <sglist@hollywood.mwis.net>
-
-Revision 1.3  1998/12/29 11:59:44  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-Revision 1.2  1998/11/18 09:01:44  ivan
-i18n! i18n!
-
-Revision 1.1  1998/11/15 05:19:58  ivan
-long overdue
-
-Revision 1.3  1998/11/15 04:33:00  ivan
-updates for newest versoin
-
-Revision 1.2  1998/11/15 03:48:49  ivan
-update for current version
-
-
-=cut
-
-1;
-
diff --git a/site_perl/cust_pkg.pm b/site_perl/cust_pkg.pm
deleted file mode 100644
index bbd242972..000000000
--- a/site_perl/cust_pkg.pm
+++ /dev/null
@@ -1,558 +0,0 @@
-package FS::cust_pkg;
-
-use strict;
-use vars qw(@ISA);
-use FS::UID qw( getotaker );
-use FS::Record qw( qsearch qsearchs );
-use FS::cust_svc;
-use FS::part_pkg;
-use FS::cust_main;
-use FS::type_pkgs;
-
-# need to 'use' these instead of 'require' in sub { cancel, suspend, unsuspend,
-# setup }
-# because they load configuraion by setting FS::UID::callback (see TODO)
-use FS::svc_acct;
-use FS::svc_acct_sm;
-use FS::svc_domain;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::cust_pkg - Object methods for cust_pkg objects
-
-=head1 SYNOPSIS
-
-  use FS::cust_pkg;
-
-  $record = new FS::cust_pkg \%hash;
-  $record = new FS::cust_pkg { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $error = $record->cancel;
-
-  $error = $record->suspend;
-
-  $error = $record->unsuspend;
-
-  $part_pkg = $record->part_pkg;
-
-  @labels = $record->labels;
-
-  $error = FS::cust_pkg::order( $custnum, \@pkgparts );
-  $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );
-
-=head1 DESCRIPTION
-
-An FS::cust_pkg object represents a customer billing item.  FS::cust_pkg
-inherits from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item pkgnum - primary key (assigned automatically for new billing items)
-
-=item custnum - Customer (see L<FS::cust_main>)
-
-=item pkgpart - Billing item definition (see L<FS::part_pkg>)
-
-=item setup - date
-
-=item bill - date
-
-=item susp - date
-
-=item expire - date
-
-=item cancel - date
-
-=item otaker - order taker (assigned automatically if null, see L<FS::UID>)
-
-=back
-
-Note: setup, bill, susp, expire and cancel are specified as UNIX timestamps;
-see L<perlfunc/"time">.  Also see L<Time::Local> and L<Date::Parse> for
-conversion functions.
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Create a new billing item.  To add the item to the database, see L<"insert">.
-
-=cut
-
-sub table { 'cust_pkg'; }
-
-=item insert
-
-Adds this billing item to the database ("Orders" the item).  If there is an
-error, returns the error, otherwise returns false.
-
-sub insert {
-  my $self = shift;
-
-  # custnum might not have have been defined in sub check (for one-shot new
-  # customers), so check it here instead
-
-  my $error = $self->ut_number('custnum');
-  return $error if $error
-
-  return "Unknown customer"
-    unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
-
-  $self->SUPER::insert;
-
-}
-
-=item delete
-
-Currently unimplemented.  You don't want to delete billing items, because there
-would then be no record the customer ever purchased the item.  Instead, see
-the cancel method.
-
-=cut
-
-sub delete {
-  return "Can't delete cust_pkg records!";
-}
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-Currently, custnum, setup, bill, susp, expire, and cancel may be changed.
-
-Changing pkgpart may have disasterous effects.  See the order subroutine.
-
-setup and bill are normally updated by calling the bill method of a customer
-object (see L<FS::cust_main>).
-
-suspend is normally updated by the suspend and unsuspend methods.
-
-cancel is normally updated by the cancel method (and also the order subroutine
-in some cases).
-
-=cut
-
-sub replace {
-  my( $new, $old ) = ( shift, shift );
-
-  #return "Can't (yet?) change pkgpart!" if $old->pkgpart != $new->pkgpart;
-  return "Can't change otaker!" if $old->otaker ne $new->otaker;
-  return "Can't change setup once it exists!"
-    if $old->getfield('setup') &&
-       $old->getfield('setup') != $new->getfield('setup');
-  #some logic for bill, susp, cancel?
-
-  $new->SUPER::replace($old);
-}
-
-=item check
-
-Checks all fields to make sure this is a valid billing item.  If there is an
-error, returns the error, otherwise returns false.  Called by the insert and
-replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-    $self->ut_numbern('pkgnum')
-    || $self->ut_numbern('custnum')
-    || $self->ut_number('pkgpart')
-    || $self->ut_numbern('setup')
-    || $self->ut_numbern('bill')
-    || $self->ut_numbern('susp')
-    || $self->ut_numbern('cancel')
-  ;
-  return $error if $error;
-
-  if ( $self->custnum ) { 
-    return "Unknown customer"
-      unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
-  }
-
-  return "Unknown pkgpart"
-    unless qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
-
-  $self->otaker(getotaker) unless $self->otaker;
-  $self->otaker =~ /^(\w{0,16})$/ or return "Illegal otaker";
-  $self->otaker($1);
-
-  ''; #no error
-}
-
-=item cancel
-
-Cancels and removes all services (see L<FS::cust_svc> and L<FS::part_svc>)
-in this package, then cancels the package itself (sets the cancel field to
-now).
-
-If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub cancel {
-  my $self = shift;
-  my $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE'; 
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  foreach my $cust_svc (
-    qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum } )
-  ) {
-    my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $cust_svc->svcpart } );
-
-    $part_svc->svcdb =~ /^([\w\-]+)$/
-      or return "Illegal svcdb value in part_svc!";
-    my $svcdb = $1;
-    require "FS/$svcdb.pm";
-
-    my $svc = qsearchs( $svcdb, { 'svcnum' => $cust_svc->svcnum } );
-    if ($svc) {
-      $error = $svc->cancel;
-      return "Error cancelling service: $error" if $error;
-      $error = $svc->delete;
-      return "Error deleting service: $error" if $error;
-    }
-
-    $error = $cust_svc->delete;
-    return "Error deleting cust_svc: $error" if $error;
-
-  }
-
-  unless ( $self->getfield('cancel') ) {
-    my %hash = $self->hash;
-    $hash{'cancel'} = time;
-    my $new = new FS::cust_pkg ( \%hash );
-    $error = $new->replace($self);
-    return $error if $error;
-  }
-
-  ''; #no errors
-}
-
-=item suspend
-
-Suspends all services (see L<FS::cust_svc> and L<FS::part_svc>) in this
-package, then suspends the package itself (sets the susp field to now).
-
-If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub suspend {
-  my $self = shift;
-  my $error ;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE'; 
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  foreach my $cust_svc (
-    qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum } )
-  ) {
-    my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $cust_svc->svcpart } );
-
-    $part_svc->svcdb =~ /^([\w\-]+)$/
-      or return "Illegal svcdb value in part_svc!";
-    my $svcdb = $1;
-    require "FS/$svcdb.pm";
-
-    my $svc = qsearchs( $svcdb, { 'svcnum' => $cust_svc->svcnum } );
-    if ($svc) {
-      $error = $svc->suspend;
-      return $error if $error;
-    }
-
-  }
-
-  unless ( $self->getfield('susp') ) {
-    my %hash = $self->hash;
-    $hash{'susp'} = time;
-    my $new = new FS::cust_pkg ( \%hash );
-    $error = $new->replace($self);
-    return $error if $error;
-  }
-
-  ''; #no errors
-}
-
-=item unsuspend
-
-Unsuspends all services (see L<FS::cust_svc> and L<FS::part_svc>) in this
-package, then unsuspends the package itself (clears the susp field).
-
-If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub unsuspend {
-  my $self = shift;
-  my($error);
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE'; 
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  foreach my $cust_svc (
-    qsearch('cust_svc',{'pkgnum'=> $self->pkgnum } )
-  ) {
-    my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $cust_svc->svcpart } );
-
-    $part_svc->svcdb =~ /^([\w\-]+)$/
-      or return "Illegal svcdb value in part_svc!";
-    my $svcdb = $1;
-    require "FS/$svcdb.pm";
-
-    my $svc = qsearchs( $svcdb, { 'svcnum' => $cust_svc->svcnum } );
-    if ($svc) {
-      $error = $svc->unsuspend;
-      return $error if $error;
-    }
-
-  }
-
-  unless ( ! $self->getfield('susp') ) {
-    my %hash = $self->hash;
-    $hash{'susp'} = '';
-    my $new = new FS::cust_pkg ( \%hash );
-    $error = $new->replace($self);
-    return $error if $error;
-  }
-
-  ''; #no errors
-}
-
-=item part_pkg
-
-Returns the definition for this billing item, as an FS::part_pkg object (see
-L<FS::part_pkg).
-
-=cut
-
-sub part_pkg {
-  my $self = shift;
-  qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
-}
-
-=item labels
-
-Returns a list of lists, calling the label method for all services
-(see L<FS::cust_svc>) of this billing item.
-
-=cut
-
-sub labels {
-  my $self = shift;
-  map { [ $_->label ] } qsearch ( 'cust_svc', { 'pkgnum' => $self->pkgnum } );
-}
-
-=back
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item order CUSTNUM, PKGPARTS_ARYREF, [ REMOVE_PKGNUMS_ARYREF ]
-
-CUSTNUM is a customer (see L<FS::cust_main>)
-
-PKGPARTS is a list of pkgparts specifying the the billing item definitions (see
-L<FS::part_pkg>) to order for this customer.  Duplicates are of course
-permitted.
-
-REMOVE_PKGNUMS is an optional list of pkgnums specifying the billing items to
-remove for this customer.  The services (see L<FS::cust_svc>) are moved to the
-new billing items.  An error is returned if this is not possible (see
-L<FS::pkg_svc>).
-
-=cut
-
-sub order {
-  my($custnum,$pkgparts,$remove_pkgnums)=@_;
-
-  # generate %part_pkg
-  # $part_pkg{$pkgpart} is true iff $custnum may purchase $pkgpart
-  #
-  my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
-  my($agent)=qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
-  my %part_pkg = %{ $agent->pkgpart_hashref };
-
-  my(%svcnum);
-  # generate %svcnum
-  # for those packages being removed:
-  #@{ $svcnum{$svcpart} } goes from a svcpart to a list of FS::Record
-  # objects (table eq 'cust_svc')
-  my($pkgnum);
-  foreach $pkgnum ( @{$remove_pkgnums} ) {
-    my($cust_svc);
-    foreach $cust_svc (qsearch('cust_svc',{'pkgnum'=>$pkgnum})) {
-      push @{ $svcnum{$cust_svc->getfield('svcpart')} }, $cust_svc;
-    }
-  }
-  
-  my(@cust_svc);
-  #generate @cust_svc
-  # for those packages the customer is purchasing:
-  # @{$pkgparts} is a list of said packages, by pkgpart
-  # @cust_svc is a corresponding list of lists of FS::Record objects
-  my($pkgpart);
-  foreach $pkgpart ( @{$pkgparts} ) {
-    return "Customer not permitted to purchase pkgpart $pkgpart!"
-      unless $part_pkg{$pkgpart};
-    push @cust_svc, [
-      map {
-        ( $svcnum{$_} && @{ $svcnum{$_} } ) ? shift @{ $svcnum{$_} } : ();
-      } (split(/,/,
-       qsearchs('part_pkg',{'pkgpart'=>$pkgpart})->getfield('services')
-      ))
-    ];
-  }
-
-  #check for leftover services
-  foreach (keys %svcnum) {
-    next unless @{ $svcnum{$_} };
-    return "Leftover services!";
-  }
-
-  #no leftover services, let's make changes.
- 
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE'; 
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE'; 
-  local $SIG{PIPE} = 'IGNORE'; 
-
-  #first cancel old packages
-#  my($pkgnum);
-  foreach $pkgnum ( @{$remove_pkgnums} ) {
-    my($old) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-    die "Package $pkgnum not found to remove!" unless $old;
-    my(%hash) = $old->hash;
-    $hash{'cancel'}=time;   
-    my($new) = new FS::cust_pkg ( \%hash );
-    my($error)=$new->replace($old);
-    die "Couldn't update package $pkgnum: $error" if $error;
-  }
-
-  #now add new packages, changing cust_svc records if necessary
-#  my($pkgpart);
-  while ($pkgpart=shift @{$pkgparts} ) {
- 
-    my($new) = new FS::cust_pkg ( {
-                                       'custnum' => $custnum,
-                                       'pkgpart' => $pkgpart,
-                                    } );
-    my($error) = $new->insert;
-    die "Couldn't insert new cust_pkg record: $error" if $error; 
-    my($pkgnum)=$new->getfield('pkgnum');
- 
-    my($cust_svc);
-    foreach $cust_svc ( @{ shift @cust_svc } ) {
-      my(%hash) = $cust_svc->hash;
-      $hash{'pkgnum'}=$pkgnum;
-      my($new) = new FS::cust_svc ( \%hash );
-      my($error)=$new->replace($cust_svc);
-      die "Couldn't link old service to new package: $error" if $error;
-    }
-  }  
-
-  ''; #no errors
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_pkg.pm,v 1.10 1999-07-20 10:37:05 ivan Exp $
-
-=head1 BUGS
-
-sub order is not OO.  Perhaps it should be moved to FS::cust_main and made so?
-
-In sub order, the @pkgparts array (passed by reference) is clobbered.
-
-Also in sub order, no money is adjusted.  Once FS::part_pkg defines a standard
-method to pass dates to the recur_prog expression, it should do so.
-
-FS::svc_acct, FS::svc_acct_sm, and FS::svc_domain are loaded via 'use' at 
-compile time, rather than via 'require' in sub { setup, suspend, unsuspend,
-cancel } because they use %FS::UID::callback to load configuration values.
-Probably need a subroutine which decides what to do based on whether or not
-we've fetched the user yet, rather than a hash.  See FS::UID and the TODO.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_main>, L<FS::part_pkg>, L<FS::cust_svc>
-, L<FS::pkg_svc>, schema.html from the base documentation
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-jul-1 - 21
-
-fixed for new agent->agent_type->type_pkgs in &order ivan@sisd.com 98-mar-7
-
-pod ivan@sisd.com 98-sep-21
-
-$Log: cust_pkg.pm,v $
-Revision 1.10  1999-07-20 10:37:05  ivan
-cleaned up the new one-screen signup bits in htdocs/edit/cust_main.cgi to
-prepare for a signup server
-
-Revision 1.9  1999/03/29 01:11:51  ivan
-use FS::type_pkgs
-
-Revision 1.8  1999/03/25 13:48:14  ivan
-allow empty custnum in sub check (but call that an error in sub insert),
-for one-screen new customer entry
-
-Revision 1.7  1999/02/09 09:55:06  ivan
-invoices show line items for each service in a package (see the label method
-of FS::cust_svc)
-
-Revision 1.6  1999/01/25 12:26:12  ivan
-yet more mod_perl stuff
-
-Revision 1.5  1999/01/18 21:58:07  ivan
-esthetic: eq and ne were used in a few places instead of == and !=
-
-Revision 1.4  1998/12/29 11:59:45  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-Revision 1.3  1998/11/15 13:01:35  ivan
-allow pkgpart changing (for per-customer custom pricing).  warn about it in doc
-
-Revision 1.2  1998/11/12 03:42:45  ivan
-added label method
-
-
-=cut
-
-1;
-
diff --git a/site_perl/cust_refund.pm b/site_perl/cust_refund.pm
deleted file mode 100644
index 4ec54907d..000000000
--- a/site_perl/cust_refund.pm
+++ /dev/null
@@ -1,204 +0,0 @@
-package FS::cust_refund;
-
-use strict;
-use vars qw( @ISA );
-use Business::CreditCard;
-use FS::Record qw( qsearchs );
-use FS::UID qw(getotaker);
-use FS::cust_credit;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::cust_refund - Object method for cust_refund objects
-
-=head1 SYNOPSIS
-
-  use FS::cust_refund;
-
-  $record = new FS::cust_refund \%hash;
-  $record = new FS::cust_refund { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cust_refund represents a refund.  FS::cust_refund inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item refundnum - primary key (assigned automatically for new refunds)
-
-=item crednum - Credit (see L<FS::cust_credit>)
-
-=item refund - Amount of the refund
-
-=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=item payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
-
-=item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
-
-=item otaker - order taker (assigned automatically, see L<FS::UID>)
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new refund.  To add the refund to the database, see L<"insert">.
-
-=cut
-
-sub table { 'cust_refund'; }
-
-=item insert
-
-Adds this refund to the database, and updates the credit (see
-L<FS::cust_credit>).
-
-=cut
-
-sub insert {
-  my $self = shift;
-
-  my $error;
-
-  $error=$self->check;
-  return $error if $error;
-
-  my $old_cust_credit =
-    qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
-  return "Unknown crednum" unless $old_cust_credit;
-  my %hash = $old_cust_credit->hash;
-  $hash{credited} = sprintf("%.2f", $hash{credited} - $self->refund );
-  my($new_cust_credit) = new FS::cust_credit ( \%hash );
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  $error = $new_cust_credit->replace($old_cust_credit);
-  return "Error modifying cust_credit: $error" if $error;
-
-  $self->SUPER::insert;
-}
-
-=item delete
-
-Currently unimplemented (accounting reasons).
-
-=cut
-
-sub delete {
-  return "Can't (yet?) delete cust_refund records!";
-}
-
-=item replace OLD_RECORD
-
-Currently unimplemented (accounting reasons).
-
-=cut
-
-sub replace {
-   return "Can't (yet?) modify cust_refund records!";
-}
-
-=item check
-
-Checks all fields to make sure this is a valid refund.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert method.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error;
-
-  $error =
-    $self->ut_number('refundnum')
-    || $self->ut_number('crednum')
-    || $self->ut_money('amount')
-    || $self->ut_numbern('_date')
-  ;
-  return $error if $error;
-
-  $self->_date(time) unless $self->_date;
-
-  $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
-  $self->payby($1);
-
-  if ( $self->payby eq 'CARD' ) {
-    my $payinfo = $self->payinfo;
-    $self->payinfo($payinfo =~ s/\D//g);
-    if ( $self->payinfo ) {
-      $self->payinfo =~ /^(\d{13,16})$/
-        or return "Illegal (mistyped?) credit card number (payinfo)";
-      $self->payinfo($1);
-      validate($self->payinfo) or return "Illegal credit card number";
-      return "Unknown card type" if cardtype($self->payinfo) eq "Unknown";
-    } else {
-      $self->payinfo('N/A');
-    }
-
-  } else {
-    $error = $self->ut_textn('payinfo');
-    return $error if $error;
-  }
-
-  $self->otaker(getotaker);
-
-  ''; #no error
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_refund.pm,v 1.3 1999-01-25 12:26:13 ivan Exp $
-
-=head1 BUGS
-
-Delete and replace methods.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_credit>, schema.html from the base documentation.
-
-=head1 HISTORY
-
-ivan@sisd.com 98-mar-18
-
-->create had wrong tablename ivan@sisd.com 98-jun-16
-(finish me!)
-
-pod and finish up ivan@sisd.com 98-sep-21
-
-$Log: cust_refund.pm,v $
-Revision 1.3  1999-01-25 12:26:13  ivan
-yet more mod_perl stuff
-
-Revision 1.2  1998/12/29 11:59:46  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-
-=cut
-
-1;
-
diff --git a/site_perl/cust_svc.pm b/site_perl/cust_svc.pm
deleted file mode 100644
index f97f5fe9d..000000000
--- a/site_perl/cust_svc.pm
+++ /dev/null
@@ -1,189 +0,0 @@
-package FS::cust_svc;
-
-use strict;
-use vars qw( @ISA );
-use Carp qw( cluck );
-use FS::Record qw( qsearchs );
-use FS::cust_pkg;
-use FS::part_pkg;
-use FS::part_svc;
-use FS::svc_acct;
-use FS::svc_acct_sm;
-use FS::svc_domain;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::cust_svc - Object method for cust_svc objects
-
-=head1 SYNOPSIS
-
-  use FS::cust_svc;
-
-  $record = new FS::cust_svc \%hash
-  $record = new FS::cust_svc { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  ($label, $value) = $record->label;
-
-=head1 DESCRIPTION
-
-An FS::cust_svc represents a service.  FS::cust_svc inherits from FS::Record.
-The following fields are currently supported:
-
-=over 4
-
-=item svcnum - primary key (assigned automatically for new services)
-
-=item pkgnum - Package (see L<FS::cust_pkg>)
-
-=item svcpart - Service definition (see L<FS::part_svc>)
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new service.  To add the refund to the database, see L<"insert">.
-Services are normally created by creating FS::svc_ objects (see
-L<FS::svc_acct>, L<FS::svc_domain>, and L<FS::svc_acct_sm>, among others).
-
-=cut
-
-sub table { 'cust_svc'; }
-
-=item insert
-
-Adds this service to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this service from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-Called by the cancel method of the package (see L<FS::cust_pkg>).
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid service.  If there is an error,
-returns the error, otehrwise returns false.  Called by the insert and
-replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error =
-    $self->ut_numbern('svcnum')
-    || $self->ut_numbern('pkgnum')
-    || $self->ut_number('svcpart')
-  ;
-  return $error if $error;
-
-  return "Unknown pkgnum"
-    unless ! $self->pkgnum
-      || qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
-
-  return "Unknown svcpart" unless
-    qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
-
-  ''; #no error
-}
-
-=item label
-
-Returns a list consisting of:
-- The name of this service (from part_svc)
-- A meaningful identifier (username, domain, or mail alias)
-- The table name (i.e. svc_domain) for this service
-
-=cut
-
-sub label {
-  my $self = shift;
-  my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
-  my $svcdb = $part_svc->svcdb;
-  my $svc_x = qsearchs( $svcdb, { 'svcnum' => $self->svcnum } );
-  my $svc = $part_svc->svc;
-  my $tag;
-  if ( $svcdb eq 'svc_acct' ) {
-    $tag = $svc_x->getfield('username');
-  } elsif ( $svcdb eq 'svc_acct_sm' ) {
-    my $domuser = $svc_x->domuser eq '*' ? '(anything)' : $svc_x->domuser;
-    my $svc_domain = qsearchs ( 'svc_domain', { 'svcnum' => $svc_x->domsvc } );
-    my $domain = $svc_domain->domain;
-    $tag = "$domuser\@$domain";
-  } elsif ( $svcdb eq 'svc_domain' ) {
-    $tag = $svc_x->getfield('domain');
-  } else {
-    cluck "warning: asked for label of unsupported svcdb; using svcnum";
-    $tag = $svc_x->getfield('svcnum');
-  }
-  $svc, $tag, $svcdb;
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_svc.pm,v 1.5 1998-12-29 11:59:47 ivan Exp $
-
-=head1 BUGS
-
-Behaviour of changing the svcpart of cust_svc records is undefined and should
-possibly be prohibited, and pkg_svc records are not checked.
-
-pkg_svc records are not checked in general (here).
-
-Deleting this record doesn't check or delete the svc_* record associated
-with this record.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_pkg>, L<FS::part_svc>, L<FS::pkg_svc>, 
-schema.html from the base documentation
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-jul-10,14
-
-no TableUtil, no FS::Lock ivan@sisd.com 98-mar-7
-
-pod ivan@sisd.com 98-sep-21
-
-$Log: cust_svc.pm,v $
-Revision 1.5  1998-12-29 11:59:47  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-Revision 1.4  1998/11/12 07:58:15  ivan
-added svcdb to label
-
-Revision 1.3  1998/11/12 03:45:38  ivan
-use FS::table_name for all tables qsearch()'ed
-
-Revision 1.2  1998/11/12 03:32:46  ivan
-added label method
-
-
-=cut
-
-1;
-
diff --git a/site_perl/dbdef.pm b/site_perl/dbdef.pm
deleted file mode 100644
index ac31bff0b..000000000
--- a/site_perl/dbdef.pm
+++ /dev/null
@@ -1,174 +0,0 @@
-package FS::dbdef;
-
-use strict;
-use vars qw(@ISA);
-use Exporter;
-use Carp;
-use FreezeThaw qw(freeze thaw cmpStr);
-use FS::dbdef_table;
-use FS::dbdef_unique;
-use FS::dbdef_index;
-use FS::dbdef_column;
-
-@ISA = qw(Exporter);
-
-=head1 NAME
-
-FS::dbdef - Database objects
-
-=head1 SYNOPSIS
-
-  use FS::dbdef;
-
-  $dbdef = new FS::dbdef (@dbdef_table_objects);
-  $dbdef = load FS::dbdef "filename";
-
-  $dbdef->save("filename");
-
-  $dbdef->addtable($dbdef_table_object);
-
-  @table_names = $dbdef->tables;
-
-  $FS_dbdef_table_object = $dbdef->table;
-
-=head1 DESCRIPTION
-
-FS::dbdef objects are collections of FS::dbdef_table objects and represnt
-a database (a collection of tables).
-
-=head1 METHODS
-
-=over 4
-
-=item new TABLE, TABLE, ...
-
-Creates a new FS::dbdef object
-
-=cut
-
-sub new {
-  my($proto,@tables)=@_;
-  my(%tables)=map  { $_->name, $_ } @tables; #check for duplicates?
-
-  my($class) = ref($proto) || $proto;
-  my($self) = {
-    'tables' => \%tables,
-  };
-
-  bless ($self, $class);
-
-}
-
-=item load FILENAME
-
-Loads an FS::dbdef object from a file.
-
-=cut
-
-sub load {
-  my($proto,$file)=@_; #use $proto ?
-  open(FILE,"<$file") or die "Can't open $file: $!";
-  my($string)=join('',<FILE>); #can $string have newlines?  pry not?
-  close FILE or die "Can't close $file: $!";
-  my($self)=thaw $string;
-  #no bless needed?
-  $self;
-}
-
-=item save FILENAME
-
-Saves an FS::dbdef object to a file.
-
-=cut
-
-sub save {
-  my($self,$file)=@_;
-  my($string)=freeze $self;
-  open(FILE,">$file") or die "Can't open $file: $!";
-  print FILE $string;
-  close FILE or die "Can't close file: $!";
-  my($check_self)=thaw $string;
-  die "Verify error: Can't freeze and thaw dbdef $self"
-    if (cmpStr($self,$check_self));
-}
-
-=item addtable TABLE
-
-Adds this FS::dbdef_table object.
-
-=cut
-
-sub addtable {
-  my($self,$table)=@_;
-  ${$self->{'tables'}}{$table->name}=$table; #check for dupliates?
-}
-
-=item tables 
-
-Returns the names of all tables.
-
-=cut
-
-sub tables {
-  my($self)=@_;
-  keys %{$self->{'tables'}};
-}
-
-=item table TABLENAME
-
-Returns the named FS::dbdef_table object.
-
-=cut
-
-sub table {
-  my($self,$table)=@_;
-  $self->{'tables'}->{$table};
-}
-
-=head1 BUGS
-
-Each FS::dbdef object should have a name which corresponds to its name within
-the SQL database engine.
-
-=head1 SEE ALSO
-
-L<FS::dbdef_table>, L<FS::Record>,
-
-=head1 HISTORY
-
-beginning of abstraction into a class (not really)
-
-ivan@sisd.com 97-dec-4
-
-added primary_key
-ivan@sisd.com 98-jan-20
-
-added datatype (very kludgy and needs to be cleaned)
-ivan@sisd.com 98-feb-21
-
-perltrap (sigh) masked by mysql 3.20->3,21 ivan@sisd.com 98-mar-2
-
-Change 'type' to 'atype' in agent_type
-Changed attributes to special words which are changed in fs-setup
-	ie. double(10,2) <=> MONEYTYPE
-Changed order of some of the field definitions because Pg6.3 is picky
-Changed 'day' to 'daytime' in cust_main
-Changed type of tax from tinyint to real
-Change 'password' to '_password' in svc_acct
-Pg6.3 does not allow 'field char(x) NULL'
-	bmccane@maxbaud.net	98-apr-3
-
-rewrite: now properly OO.  See also FS::dbdef_{table,column,unique,index}
-
-ivan@sisd.com 98-apr-17
-
-gained some extra functions ivan@sisd.com 98-may-11
-
-now knows how to Freeze and Thaw itself ivan@sisd.com 98-jun-2
-
-pod ivan@sisd.com 98-sep-23
-
-=cut
-
-1;
-
diff --git a/site_perl/dbdef_colgroup.pm b/site_perl/dbdef_colgroup.pm
deleted file mode 100644
index 43be04430..000000000
--- a/site_perl/dbdef_colgroup.pm
+++ /dev/null
@@ -1,108 +0,0 @@
-package FS::dbdef_colgroup;
-
-use strict;
-use vars qw(@ISA);
-use Exporter;
-
-@ISA = qw(Exporter);
-
-=head1 NAME
-
-FS::dbdef_colgroup - Column group objects
-
-=head1 SYNOPSIS
-
-  use FS::dbdef_colgroup;
-
-  $colgroup = new FS::dbdef_colgroup ( $lol );
-  $colgroup = new FS::dbdef_colgroup (
-    [
-      [ 'single_column' ],
-      [ 'multiple_columns', 'another_column', ],
-    ]
-  );
-
-  @sql_lists = $colgroup->sql_list;
-
-  @singles = $colgroup->singles;
-
-=head1 DESCRIPTION
-
-FS::dbdef_colgroup objects represent sets of sets of columns.
-
-=head1 METHODS
-
-=over 4
-
-=item new
-
-Creates a new FS::dbdef_colgroup object.
-
-=cut
-
-sub new {
-  my($proto, $lol) = @_;
-
-  my $class = ref($proto) || $proto;
-  my $self = {
-    'lol' => $lol,
-  };
-
-  bless ($self, $class);
-
-}
-
-=item sql_list
-
-Returns a flat list of comma-separated values, for SQL statements.
-
-=cut
-
-sub sql_list { #returns a flat list of comman-separates lists (for sql)
-  my($self)=@_;
-   grep $_ ne '', map join(', ', @{$_}), @{$self->{'lol'}};
-}
-
-=item singles
-
-Returns a flat list of all single item lists.
-
-=cut
-
-sub singles { #returns single-field groups as a flat list
-  my($self)=@_;
-  #map ${$_}[0], grep scalar(@{$_}) == 1, @{$self->{'lol'}};
-  map { 
-    ${$_}[0] =~ /^(\w+)$/
-      #aah!
-      or die "Illegal column ", ${$_}[0], " in colgroup!";
-    $1;
-  } grep scalar(@{$_}) == 1, @{$self->{'lol'}};
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::dbdef_table>, L<FS::dbdef_unique>, L<FS::dbdef_index>,
-L<FS::dbdef_column>, L<FS::dbdef>, L<perldsc>
-
-=head1 HISTORY
-
-class for dealing with groups of groups of columns (used as a base class by
-FS::dbdef_{unique,index} )
-
-ivan@sisd.com 98-apr-19
-
-added singles, fixed sql_list to skip empty lists ivan@sisd.com 98-jun-2
-
-untaint things we're returning in sub singels ivan@sisd.com 98-jun-4
-
-pod ivan@sisd.com 98-sep-24
-
-=cut
-
-1;
-
diff --git a/site_perl/dbdef_column.pm b/site_perl/dbdef_column.pm
deleted file mode 100644
index dc07305b8..000000000
--- a/site_perl/dbdef_column.pm
+++ /dev/null
@@ -1,192 +0,0 @@
-package FS::dbdef_column;
-
-use strict;
-#use Carp;
-use Exporter;
-use vars qw(@ISA);
-
-@ISA = qw(Exporter);
-
-=head1 NAME
-
-FS::dbdef_column - Column object
-
-=head1 SYNOPSIS
-
-  use FS::dbdef_column;
-
-  $column_object = new FS::dbdef_column ( $name, $sql_type, '' );
-  $column_object = new FS::dbdef_column ( $name, $sql_type, 'NULL' );
-  $column_object = new FS::dbdef_column ( $name, $sql_type, '', $length );
-  $column_object = new FS::dbdef_column ( $name, $sql_type, 'NULL', $length );
-
-  $name = $column_object->name;
-  $column_object->name ( 'name' );
-
-  $name = $column_object->type;
-  $column_object->name ( 'sql_type' );
-
-  $name = $column_object->null;
-  $column_object->name ( 'NOT NULL' );
-
-  $name = $column_object->length;
-  $column_object->name ( $length );
-
-  $sql_line = $column->line;
-  $sql_line = $column->line $datasrc;
-
-=head1 DESCRIPTION
-
-FS::dbdef::column objects represend columns in tables (see L<FS::dbdef_table>).
-
-=head1 METHODS
-
-=over 4
-
-=item new
-
-Creates a new FS::dbdef_column object.
-
-=cut
-
-sub new {
-  my($proto,$name,$type,$null,$length)=@_;
-
-  #croak "Illegal name: $name" if grep $name eq $_, @reserved_words;
-
-  $null =~ s/^NOT NULL$//i;
-
-  my $class = ref($proto) || $proto;
-  my $self = {
-    'name'   => $name,
-    'type'   => $type,
-    'null'   => $null,
-    'length' => $length,
-  };
-
-  bless ($self, $class);
-
-}
-
-=item name
-
-Returns or sets the column name.
-
-=cut
-
-sub name {
-  my($self,$value)=@_;
-  if ( defined($value) ) {
-  #croak "Illegal name: $name" if grep $name eq $_, @reserved_words;
-    $self->{'name'} = $value;
-  } else {
-    $self->{'name'};
-  }
-}
-
-=item type
-
-Returns or sets the column type.
-
-=cut
-
-sub type {
-  my($self,$value)=@_;
-  if ( defined($value) ) {
-    $self->{'type'} = $value;
-  } else {
-    $self->{'type'};
-  }
-}
-
-=item null
-
-Returns or sets the column null flag.
-
-=cut
-
-sub null {
-  my($self,$value)=@_;
-  if ( defined($value) ) {
-    $value =~ s/^NOT NULL$//i;
-    $self->{'null'} = $value;
-  } else {
-    $self->{'null'};
-  }
-}
-
-=item type
-
-Returns or sets the column length.
-
-=cut
-
-sub length {
-  my($self,$value)=@_;
-  if ( defined($value) ) {
-    $self->{'length'} = $value;
-  } else {
-    $self->{'length'};
-  }
-}
-
-=item line [ $datasrc ]
-
-Returns an SQL column definition.
-
-If passed a DBI $datasrc specifying L<DBD::mysql> or L<DBD::Pg>, will use
-engine-specific syntax.
-
-=cut
-
-sub line {
-  my($self,$datasrc)=@_;
-  my($null)=$self->null;
-  if ( $datasrc =~ /mysql/ ) { #yucky mysql hack
-    $null ||= "NOT NULL"
-  }
-  if ( $datasrc =~ /Pg/ ) { #yucky Pg hack
-    $null ||= "NOT NULL";
-    $null =~ s/^NULL$//;
-  }
-  join(' ',
-    $self->name,
-    $self->type. ( $self->length ? '('.$self->length.')' : '' ),
-    $null,
-  );
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::dbdef_table>, L<FS::dbdef>, L<DBI>
-
-=head1 VERSION
-
-$Id: dbdef_column.pm,v 1.3 1998-10-13 13:04:17 ivan Exp $
-
-=head1 HISTORY
-
-class for dealing with column definitions
-
-ivan@sisd.com 98-apr-17
-
-now methods can be used to get or set data ivan@sisd.com 98-may-11
-
-mySQL-specific hack for null (what should be default?) ivan@sisd.com 98-jun-2
-
-$Log: dbdef_column.pm,v $
-Revision 1.3  1998-10-13 13:04:17  ivan
-fixed doc to indicate Pg specific syntax too
-
-Revision 1.2  1998/10/12 23:40:28  ivan
-added Pg-specific behaviour in sub line
-
-
-=cut
-
-1;
-
diff --git a/site_perl/dbdef_index.pm b/site_perl/dbdef_index.pm
deleted file mode 100644
index 2097db1ea..000000000
--- a/site_perl/dbdef_index.pm
+++ /dev/null
@@ -1,43 +0,0 @@
-package FS::dbdef_index;
-
-use strict;
-use vars qw(@ISA);
-use FS::dbdef_colgroup;
-
-@ISA=qw(FS::dbdef_colgroup);
-
-=head1 NAME
-
-FS::dbdef_unique.pm - Index object
-
-=head1 SYNOPSIS
-
-  use FS::dbdef_index;
-
-    # see FS::dbdef_colgroup methods
-
-=head1 DESCRIPTION
-
-FS::dbdef_unique objects represent the (non-unique) indices of a table
-(L<FS::dbdef_table>).  FS::dbdef_unique inherits from FS::dbdef_colgroup.
-
-=head1 BUGS
-
-Is this empty subclass needed?
-
-=head1 SEE ALSO
-
-L<FS::dbdef_colgroup>, L<FS::dbdef_record>, L<FS::Record>
-
-=head1 HISTORY
-
-class for dealing with index definitions
-
-ivan@sisd.com 98-apr-19
-
-pod ivan@sisd.com 98-sep-24
-
-=cut
-
-1;
-
diff --git a/site_perl/dbdef_table.pm b/site_perl/dbdef_table.pm
deleted file mode 100644
index 8c5bcfe77..000000000
--- a/site_perl/dbdef_table.pm
+++ /dev/null
@@ -1,258 +0,0 @@
-package FS::dbdef_table;
-
-use strict;
-#use Carp;
-use Exporter;
-use vars qw(@ISA);
-use FS::dbdef_column;
-
-@ISA = qw(Exporter);
-
-=head1 NAME
-
-FS::dbdef_table - Table objects
-
-=head1 SYNOPSIS
-
-  use FS::dbdef_table;
-
-  $dbdef_table = new FS::dbdef_table (
-    "table_name",
-    "primary_key",
-    $FS_dbdef_unique_object,
-    $FS_dbdef_index_object,
-    @FS_dbdef_column_objects,
-  );
-
-  $dbdef_table->addcolumn ( $FS_dbdef_column_object );
-
-  $table_name = $dbdef_table->name;
-  $dbdef_table->name ("table_name");
-
-  $table_name = $dbdef_table->primary_keye;
-  $dbdef_table->primary_key ("primary_key");
-
-  $FS_dbdef_unique_object = $dbdef_table->unique;
-  $dbdef_table->unique ( $FS_dbdef_unique_object );
-
-  $FS_dbdef_index_object = $dbdef_table->index;
-  $dbdef_table->index ( $FS_dbdef_index_object );
-
-  @column_names = $dbdef->columns;
-
-  $FS_dbdef_column_object = $dbdef->column;
-
-  @sql_statements = $dbdef->sql_create_table;
-  @sql_statements = $dbdef->sql_create_table $datasrc;
-
-=head1 DESCRIPTION
-
-FS::dbdef_table objects represent a single database table.
-
-=head1 METHODS
-
-=over 4
-
-=item new
-
-Creates a new FS::dbdef_table object.
-
-=cut
-
-sub new {
-  my($proto,$name,$primary_key,$unique,$index,@columns)=@_;
-
-  my(%columns) = map { $_->name, $_ } @columns;
-
-  #check $primary_key, $unique and $index to make sure they are $columns ?
-  # (and sanity check?)
-
-  my $class = ref($proto) || $proto;
-  my $self = {
-    'name'        => $name,
-    'primary_key' => $primary_key,
-    'unique'      => $unique,
-    'index'       => $index,
-    'columns'     => \%columns,
-  };
-
-  bless ($self, $class);
-
-}
-
-=item addcolumn
-
-Adds this FS::dbdef_column object. 
-
-=cut
-
-sub addcolumn {
-  my($self,$column)=@_;
-  ${$self->{'columns'}}{$column->name}=$column; #sanity check?
-}
-
-=item name
-
-Returns or sets the table name.
-
-=cut
-
-sub name {
-  my($self,$value)=@_;
-  if ( defined($value) ) {
-    $self->{name} = $value;
-  } else {
-    $self->{name};
-  }
-}
-
-=item primary_key
-
-Returns or sets the primary key.
-
-=cut
-
-sub primary_key {
-  my($self,$value)=@_;
-  if ( defined($value) ) {
-    $self->{primary_key} = $value;
-  } else {
-    #$self->{primary_key};
-    #hmm.  maybe should untaint the entire structure when it comes off disk 
-    # cause if you don't trust that, ?
-    $self->{primary_key} =~ /^(\w*)$/ 
-      #aah!
-      or die "Illegal primary key ", $self->{primary_key}, " in dbdef!\n";
-    $1;
-  }
-}
-
-=item unique
-
-Returns or sets the FS::dbdef_unique object.
-
-=cut
-
-sub unique { 
-  my($self,$value)=@_;
-  if ( defined($value) ) {
-    $self->{unique} = $value;
-  } else {
-    $self->{unique};
-  }
-}
-
-=item index
-
-Returns or sets the FS::dbdef_index object.
-
-=cut
-
-sub index { 
-  my($self,$value)=@_;
-  if ( defined($value) ) {
-    $self->{'index'} = $value;
-  } else {
-    $self->{'index'};
-  }
-}
-
-=item columns
-
-Returns a list consisting of the names of all columns.
-
-=cut
-
-sub columns {
-  my($self)=@_;
-  keys %{$self->{'columns'}};
-}
-
-=item column "column"
-
-Returns the column object (see L<FS::dbdef_column>) for "column".
-
-=cut
-
-sub column {
-  my($self,$column)=@_;
-  $self->{'columns'}->{$column};
-}
-
-=item sql_create_table [ $datasrc ]
-
-Returns an array of SQL statments to create this table.
-
-If passed a DBI $datasrc specifying L<DBD::mysql>, will use MySQL-specific
-syntax.  Non-standard syntax for other engines (if applicable) may also be
-supported in the future.
-
-=cut
-
-sub sql_create_table { 
-  my($self,$datasrc)=@_;
-
-  my(@columns)=map { $self->column($_)->line($datasrc) } $self->columns;
-  push @columns, "PRIMARY KEY (". $self->primary_key. ")"
-    if $self->primary_key;
-  if ( $datasrc =~ /mysql/ ) { #yucky mysql hack
-    push @columns, map "UNIQUE ($_)", $self->unique->sql_list;
-    push @columns, map "INDEX ($_)", $self->index->sql_list;
-  }
-
-  "CREATE TABLE ". $self->name. " ( ". join(", ", @columns). " )",
-  ( map {
-    my($index) = $self->name. "__". $_ . "_index";
-    $index =~ s/,\s*/_/g;
-    "CREATE UNIQUE INDEX $index ON ". $self->name. " ($_)"
-  } $self->unique->sql_list ),
-  ( map {
-    my($index) = $self->name. "__". $_ . "_index";
-    $index =~ s/,\s*/_/g;
-    "CREATE INDEX $index ON ". $self->name. " ($_)"
-  } $self->index->sql_list ),
-  ;  
-
-
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::dbdef>, L<FS::dbdef_unique>, L<FS::dbdef_index>, L<FS::dbdef_unique>,
-L<DBI>
-
-=head1 VERSION
-
-$Id: dbdef_table.pm,v 1.2 1998-10-14 07:05:06 ivan Exp $
-
-=head1 HISTORY
-
-class for dealing with table definitions
-
-ivan@sisd.com 98-apr-18
-
-gained extra functions (should %columns be an IxHash?)
-ivan@sisd.com 98-may-11
-
-sql_create_table returns a list of statments, not just one, and now it
-does indices (plus mysql hack) ivan@sisd.com 98-jun-2
-
-untaint primary_key... hmm.  is this a hack around a bigger problem?
-looks like, did the same thing singles in colgroup!
-ivan@sisd.com 98-jun-4
-
-pod ivan@sisd.com 98-sep-24
-
-$Log: dbdef_table.pm,v $
-Revision 1.2  1998-10-14 07:05:06  ivan
-1.1.4 release, fix postgresql
-
-
-=cut
-
-1;
-
diff --git a/site_perl/dbdef_unique.pm b/site_perl/dbdef_unique.pm
deleted file mode 100644
index 4ec40de60..000000000
--- a/site_perl/dbdef_unique.pm
+++ /dev/null
@@ -1,44 +0,0 @@
-package FS::dbdef_unique;
-
-use strict;
-use vars qw(@ISA);
-use FS::dbdef_colgroup;
-
-@ISA=qw(FS::dbdef_colgroup);
-
-=head1 NAME
-
-FS::dbdef_unique.pm - Unique object
-
-=head1 SYNOPSIS
-
-  use FS::dbdef_unique;
-
-  # see FS::dbdef_colgroup methods
-
-=head1 DESCRIPTION
-
-FS::dbdef_unique objects represent the unique indices of a database table
-(L<FS::dbdef_table>).  FS::dbdef_unique inherits from FS::dbdef_colgroup.
-
-=head1 BUGS
-
-Is this empty subclass needed?
-
-=head1 SEE ALSO
-
-L<FS::dbdef_colgroup>, L<FS::dbdef_record>, L<FS::Record>
-
-=head1 HISTORY
-
-class for dealing with unique definitions
-
-ivan@sisd.com 98-apr-19
-
-pod ivan@sisd.com 98-sep-24
-
-=cut
-
-1;
-
-
diff --git a/site_perl/part_pkg.pm b/site_perl/part_pkg.pm
deleted file mode 100644
index 556146e38..000000000
--- a/site_perl/part_pkg.pm
+++ /dev/null
@@ -1,204 +0,0 @@
-package FS::part_pkg;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch );
-use FS::pkg_svc;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::part_pkg - Object methods for part_pkg objects
-
-=head1 SYNOPSIS
-
-  use FS::part_pkg;
-
-  $record = new FS::part_pkg \%hash
-  $record = new FS::part_pkg { 'column' => 'value' };
-
-  $custom_record = $template_record->clone;
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  @pkg_svc = $record->pkg_svc;
-
-  $svcnum = $record->svcpart;
-  $svcnum = $record->svcpart( 'svc_acct' );
-
-=head1 DESCRIPTION
-
-An FS::part_pkg object represents a billing item definition.  FS::part_pkg
-inherits from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item pkgpart - primary key (assigned automatically for new billing item definitions)
-
-=item pkg - Text name of this billing item definition (customer-viewable)
-
-=item comment - Text name of this billing item definition (non-customer-viewable)
-
-=item setup - Setup fee
-
-=item freq - Frequency of recurring fee
-
-=item recur - Recurring fee
-
-=back
-
-setup and recur are evaluated as Safe perl expressions.  You can use numbers
-just as you would normally.  More advanced semantics are not yet defined.
-
-=head1 METHODS
-
-=over 4 
-
-=item new HASHREF
-
-Creates a new billing item definition.  To add the billing item definition to
-the database, see L<"insert">.
-
-=cut
-
-sub table { 'part_pkg'; }
-
-=item clone
-
-An alternate constructor.  Creates a new billing item definition by duplicating
-an existing definition.  A new pkgpart is assigned and `(CUSTOM) ' is prepended
-to the comment field.  To add the billing item definition to the database, see
-L<"insert">.
-
-=cut
-
-sub clone {
-  my $self = shift;
-  my $class = ref($self);
-  my %hash = $self->hash;
-  $hash{'pkgpart'} = '';
-  $hash{'comment'} = "(CUSTOM) ". $hash{'comment'}
-    unless $hash{'comment'} =~ /^\(CUSTOM\) /;
-  #new FS::part_pkg ( \%hash ); # ?
-  new $class ( \%hash ); # ?
-}
-
-=item insert
-
-Adds this billing item definition to the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item delete
-
-Currently unimplemented.
-
-=cut
-
-sub delete {
-  return "Can't (yet?) delete package definitions.";
-# check & make sure the pkgpart isn't in cust_pkg or type_pkgs?
-}
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid billing item definition.  If
-there is an error, returns the error, otherwise returns false.  Called by the
-insert and replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  $self->ut_numbern('pkgpart')
-    || $self->ut_text('pkg')
-    || $self->ut_text('comment')
-    || $self->ut_anything('setup')
-    || $self->ut_number('freq')
-    || $self->ut_anything('recur')
-  ;
-}
-
-=item pkg_svc
-
-Returns all FS::pkg_svc objects (see L<FS::pkg_svc>) for this package
-definition.
-
-=cut
-
-sub pkg_svc {
-  my $self = shift;
-  qsearch( 'pkg_svc', { 'pkgpart' => $self->pkgpart } );
-}
-
-=item svcpart [ SVCDB ]
-
-Returns the svcpart of a single service definition (see L<FS::part_svc>)
-associated with this billing item definition (see L<FS::pkg_svc>).  Returns
-false if there not exactly one service definition with quantity 1, or if 
-SVCDB is specified and does not match the svcdb of the service definition, 
-
-=cut
-
-sub svcpart {
-  my $self = shift;
-  my $svcdb = shift;
-  my @pkg_svc = $self->pkg_svc;
-  return '' if scalar(@pkg_svc) != 1
-               || $pkg_svc[0]->quantity != 1
-               || ( $svcdb && $pkg_svc[0]->part_svc->svcdb ne $svcdb );
-  $pkg_svc[0]->svcpart;
-}
-
-=back
-
-=head1 VERSION
-
-$Id: part_pkg.pm,v 1.6 1999-07-20 10:37:05 ivan Exp $
-
-=head1 BUGS
-
-The delete method is unimplemented.
-
-setup and recur semantics are not yet defined (and are implemented in
-FS::cust_bill.  hmm.).
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_pkg>, L<FS::type_pkgs>, L<FS::pkg_svc>, L<Safe>.
-schema.html from the base documentation.
-
-=head1 HISTORY
-
-ivan@sisd.com 97-dec-5
-
-pod ivan@sisd.com 98-sep-21
-
-$Log: part_pkg.pm,v $
-Revision 1.6  1999-07-20 10:37:05  ivan
-cleaned up the new one-screen signup bits in htdocs/edit/cust_main.cgi to
-prepare for a signup server
-
-Revision 1.5  1998/12/31 01:04:16  ivan
-doc
-
-Revision 1.3  1998/11/15 13:00:15  ivan
-bugfix in clone method, clone method doc clarification
-
-
-=cut
-
-1;
-
diff --git a/site_perl/part_referral.pm b/site_perl/part_referral.pm
deleted file mode 100644
index e63e822a8..000000000
--- a/site_perl/part_referral.pm
+++ /dev/null
@@ -1,123 +0,0 @@
-package FS::part_referral;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::part_referral - Object methods for part_referral objects
-
-=head1 SYNOPSIS
-
-  use FS::part_referral;
-
-  $record = new FS::part_referral \%hash
-  $record = new FS::part_referral { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::part_referral represents a referral - where a customer heard of your
-services.  This can be used to track the effectiveness of a particular piece of
-advertising, for example.  FS::part_referral inherits from FS::Record.  The
-following fields are currently supported:
-
-=over 4
-
-=item refnum - primary key (assigned automatically for new referrals)
-
-=item referral - Text name of this referral
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new referral.  To add the referral to the database, see L<"insert">.
-
-=cut
-
-sub table { 'part_referral'; }
-
-=item insert
-
-Adds this referral to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Currently unimplemented.
-
-=cut
-
-sub delete {
-  my $self = shift;
-  return "Can't (yet?) delete part_referral records";
-  #need to make sure no customers have this referral!
-}
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid referral.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  $self->ut_numbern('refnum')
-    || $self->ut_text('referral')
-  ;
-}
-
-=back
-
-=head1 VERSION
-
-$Id: part_referral.pm,v 1.2 1998-12-29 11:59:49 ivan Exp $
-
-=head1 BUGS
-
-The delete method is unimplemented.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_main>, schema.html from the base documentation.
-
-=head1 HISTORY
-
-Class dealing with referrals
-
-ivan@sisd.com 98-feb-23
-
-pod ivan@sisd.com 98-sep-21
-
-$Log: part_referral.pm,v $
-Revision 1.2  1998-12-29 11:59:49  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-
-=cut
-
-1;
-
diff --git a/site_perl/part_svc.pm b/site_perl/part_svc.pm
deleted file mode 100644
index 6b3ba3d9f..000000000
--- a/site_perl/part_svc.pm
+++ /dev/null
@@ -1,182 +0,0 @@
-package FS::part_svc;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( fields );
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::part_svc - Object methods for part_svc objects
-
-=head1 SYNOPSIS
-
-  use FS::part_svc;
-
-  $record = new FS::part_referral \%hash
-  $record = new FS::part_referral { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::part_svc represents a service definition.  FS::part_svc inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item svcpart - primary key (assigned automatically for new service definitions)
-
-=item svc - text name of this service definition
-
-=item svcdb - table used for this service.  See L<FS::svc_acct>,
-L<FS::svc_domain>, and L<FS::svc_acct_sm>, among others.
-
-=item I<svcdb>__I<field> - Default or fixed value for I<field> in I<svcdb>.
-
-=item I<svcdb>__I<field>_flag - defines I<svcdb>__I<field> action: null, `D' for default, or `F' for fixed
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new service definition.  To add the service definition to the
-database, see L<"insert">.
-
-=cut
-
-sub table { 'part_svc'; }
-
-=item insert
-
-Adds this service definition to the database.  If there is an error, returns
-the error, otherwise returns false.
-
-=item delete
-
-Currently unimplemented.
-
-=cut
-
-sub delete {
-  return "Can't (yet?) delete service definitions.";
-# check & make sure the svcpart isn't in cust_svc or pkg_svc (in any packages)?
-}
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-
-  return "Can't change svcdb!"
-    unless $old->svcdb eq $new->svcdb;
-
-  $new->SUPER::replace( $old );
-}
-
-=item check
-
-Checks all fields to make sure this is a valid service definition.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-  my $recref = $self->hashref;
-
-  my $error;
-  $error=
-    $self->ut_numbern('svcpart')
-    || $self->ut_text('svc')
-    || $self->ut_alpha('svcdb')
-  ;
-  return $error if $error;
-
-  my @fields = eval { fields( $recref->{svcdb} ) }; #might die
-  return "Unknown svcdb!" unless @fields;
-
-  my $svcdb;
-  foreach $svcdb ( qw(
-    svc_acct svc_acct_sm svc_domain
-  ) ) {
-    my @rows = map { /^${svcdb}__(.*)$/; $1 }
-      grep ! /_flag$/,
-        grep /^${svcdb}__/,
-          fields('part_svc');
-    foreach my $row (@rows) {
-      unless ( $svcdb eq $recref->{svcdb} ) {
-        $recref->{$svcdb.'__'.$row}='';
-        $recref->{$svcdb.'__'.$row.'_flag'}='';
-        next;
-      }
-      $recref->{$svcdb.'__'.$row.'_flag'} =~ /^([DF]?)$/
-        or return "Illegal flag for $svcdb $row";
-      $recref->{$svcdb.'__'.$row.'_flag'} = $1;
-
-      my $error = $self->ut_anything($svcdb.'__'.$row);
-      return $error if $error;
-
-    }
-  }
-
-  ''; #no error
-}
-
-=back
-
-=head1 VERSION
-
-$Id: part_svc.pm,v 1.3 1999-02-07 09:59:44 ivan Exp $
-
-=head1 BUGS
-
-Delete is unimplemented.
-
-The list of svc_* tables is hardcoded.  When svc_acct_pop is renamed, this
-should be fixed.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::part_pkg>, L<FS::pkg_svc>, L<FS::cust_svc>,
-L<FS::svc_acct>, L<FS::svc_acct_sm>, L<FS::svc_domain>, schema.html from the
-base documentation.
-
-=head1 HISTORY
-
-ivan@sisd.com 97-nov-14
-
-data checking/untainting calls into FS::Record added
-ivan@sisd.com 97-dec-6
-
-pod ivan@sisd.com 98-sep-21
-
-$Log: part_svc.pm,v $
-Revision 1.3  1999-02-07 09:59:44  ivan
-more mod_perl fixes, and bugfixes Peter Wemm sent via email
-
-Revision 1.2  1998/12/29 11:59:50  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-
-=cut
-
-1;
-
diff --git a/site_perl/pkg_svc.pm b/site_perl/pkg_svc.pm
deleted file mode 100644
index f28745d28..000000000
--- a/site_perl/pkg_svc.pm
+++ /dev/null
@@ -1,173 +0,0 @@
-package FS::pkg_svc;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs );
-use FS::part_pkg;
-use FS::part_svc;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::pkg_svc - Object methods for pkg_svc records
-
-=head1 SYNOPSIS
-
-  use FS::pkg_svc;
-
-  $record = new FS::pkg_svc \%hash;
-  $record = new FS::pkg_svc { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $part_pkg = $record->part_pkg;
-
-  $part_svc = $record->part_svc;
-
-=head1 DESCRIPTION
-
-An FS::pkg_svc record links a billing item definition (see L<FS::part_pkg>) to
-a service definition (see L<FS::part_svc>).  FS::pkg_svc inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item pkgpart - Billing item definition (see L<FS::part_pkg>)
-
-=item svcpart - Service definition (see L<FS::part_svc>)
-
-=item quantity - Quantity of this service definition that this billing item
-definition includes
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Create a new record.  To add the record to the database, see L<"insert">.
-
-=cut
-
-sub table { 'pkg_svc'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-
-  return "Can't change pkgpart!" if $old->pkgpart != $new->pkgpart;
-  return "Can't change svcpart!" if $old->svcpart != $new->svcpart;
-
-  $new->SUPER::replace($old);
-}
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error;
-  $error =
-    $self->ut_number('pkgpart')
-    || $self->ut_number('svcpart')
-    || $self->ut_number('quantity')
-  ;
-  return $error if $error;
-
-  return "Unknown pkgpart!" unless $self->part_pkg;
-  return "Unknown svcpart!" unless $self->part_svc;
-
-  ''; #no error
-}
-
-=item part_pkg
-
-Returns the FS::part_pkg object (see L<FS::part_pkg>).
-
-=cut
-
-sub part_pkg {
-  my $self = shift;
-  qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
-}
-
-=item part_svc
-
-Returns the FS::part_svc object (see L<FS::part_svc>).
-
-=cut
-
-sub part_svc {
-  my $self = shift;
-  qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
-}
-
-=back
-
-=head1 VERSION
-
-$Id: pkg_svc.pm,v 1.4 1999-07-20 10:37:05 ivan Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::part_pkg>, L<FS::part_svc>, schema.html from the base
-documentation.
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-jul-1
- 
-added hfields
-ivan@sisd.com 97-nov-13
-
-pod ivan@sisd.com 98-sep-22
-
-$Log: pkg_svc.pm,v $
-Revision 1.4  1999-07-20 10:37:05  ivan
-cleaned up the new one-screen signup bits in htdocs/edit/cust_main.cgi to
-prepare for a signup server
-
-Revision 1.3  1999/01/18 21:58:08  ivan
-esthetic: eq and ne were used in a few places instead of == and !=
-
-Revision 1.2  1998/12/29 11:59:51  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-
-=cut
-
-1;
-
diff --git a/site_perl/svc_Common.pm b/site_perl/svc_Common.pm
deleted file mode 100644
index f53e83e48..000000000
--- a/site_perl/svc_Common.pm
+++ /dev/null
@@ -1,217 +0,0 @@
-package FS::svc_Common;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs fields );
-use FS::cust_svc;
-use FS::part_svc;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::svc_Common - Object method for all svc_ records
-
-=head1 SYNOPSIS
-
-use FS::svc_Common;
-
-@ISA = qw( FS::svc_Common );
-
-=head1 DESCRIPTION
-
-FS::svc_Common is intended as a base class for table-specific classes to
-inherit from, i.e. FS::svc_acct.  FS::svc_Common inherits from FS::Record.
-
-=head1 METHODS
-
-=over 4
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
-defined.  An FS::cust_svc record will be created and inserted.
-
-=cut
-
-sub insert {
-  my $self = shift;
-  my $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  $error = $self->check;
-  return $error if $error;
-
-  my $svcnum = $self->svcnum;
-  my $cust_svc;
-  unless ( $svcnum ) {
-    $cust_svc = new FS::cust_svc ( {
-      'svcnum'  => $svcnum,
-      'pkgnum'  => $self->pkgnum,
-      'svcpart' => $self->svcpart,
-    } );
-    $error = $cust_svc->insert;
-    return $error if $error;
-    $svcnum = $self->svcnum($cust_svc->svcnum);
-  }
-
-  $error = $self->SUPER::insert;
-  if ( $error ) {
-    $cust_svc->delete if $cust_svc;
-    return $error;
-  }
-
-  '';
-}
-
-=item delete
-
-Deletes this account from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-The corresponding FS::cust_svc record will be deleted as well.
-
-=cut
-
-sub delete {
-  my $self = shift;
-  my $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $svcnum = $self->svcnum;
-
-  $error = $self->SUPER::delete;
-  return $error if $error;
-
-  my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );  
-  $error = $cust_svc->delete;
-  return $error if $error;
-
-  '';
-}
-
-=item setfixed
-
-Sets any fixed fields for this service (see L<FS::part_svc>).  If there is an
-error, returns the error, otherwise returns the FS::part_svc object (use ref()
-to test the return).  Usually called by the check method.
-
-=cut
-
-sub setfixed {
-  my $self = shift;
-  $self->setx('F');
-}
-
-=item setdefault
-
-Sets all fields to their defaults (see L<FS::part_svc>), overriding their
-current values.  If there is an error, returns the error, otherwise returns
-the FS::part_svc object (use ref() to test the return).
-
-=cut
-
-sub setdefault {
-  my $self = shift;
-  $self->setx('D');
-}
-
-sub setx {
-  my $self = shift;
-  my $x = shift;
-
-  my $error;
-
-  $error =
-    $self->ut_numbern('svcnum')
-  ;
-  return $error if $error;
-
-  #get part_svc
-  my $svcpart;
-  if ( $self->svcnum ) {
-    my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $self->svcnum } );
-    return "Unknown svcnum" unless $cust_svc; 
-    $svcpart = $cust_svc->svcpart;
-  } else {
-    $svcpart = $self->getfield('svcpart');
-  }
-  my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
-  return "Unkonwn svcpart" unless $part_svc;
-
-  #set default/fixed/whatever fields from part_svc
-  foreach my $field ( fields('svc_acct') ) {
-    if ( $part_svc->getfield('svc_acct__'. $field. '_flag') eq $x ) {
-      $self->setfield( $field, $part_svc->getfield('svc_acct__'. $field) );
-    }
-  }
-
- $part_svc;
-
-}
-
-=item suspend
-
-=item unsuspend
-
-=item cancel
-
-Stubs - return false (no error) so derived classes don't need to define these
-methods.  Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=cut
-
-sub suspend { ''; }
-sub unsuspend { ''; }
-sub cancel { ''; }
-
-=back
-
-=head1 VERSION
-
-$Id: svc_Common.pm,v 1.3 1999-03-25 13:31:29 ivan Exp $
-
-=head1 BUGS
-
-The setfixed method return value.
-
-The new method should set defaults from part_svc (like the check method
-sets fixed values)?
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>, schema.html
-from the base documentation.
-
-=head1 HISTORY
-
-$Log: svc_Common.pm,v $
-Revision 1.3  1999-03-25 13:31:29  ivan
-added setdefault method (generalized setfixed method to setx method)
-
-Revision 1.2  1999/01/25 12:26:14  ivan
-yet more mod_perl stuff
-
-Revision 1.1  1998/12/30 00:30:45  ivan
-svc_ stuff is more properly OO - has a common superclass FS::svc_Common
-
-
-=cut
-
-1;
-
diff --git a/site_perl/svc_acct.pm b/site_perl/svc_acct.pm
deleted file mode 100644
index 9ae531a90..000000000
--- a/site_perl/svc_acct.pm
+++ /dev/null
@@ -1,514 +0,0 @@
-package FS::svc_acct;
-
-use strict;
-use vars qw(@ISA $nossh_hack $conf $dir_prefix @shells
-            $shellmachine @saltset @pw_set);
-use FS::Conf;
-use FS::Record qw( qsearchs fields );
-use FS::svc_Common;
-use FS::SSH qw(ssh);
-use FS::part_svc;
-use FS::svc_acct_pop;
-
-@ISA = qw( FS::svc_Common );
-
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::svc_acct'} = sub { 
-  $conf = new FS::Conf;
-  $dir_prefix = $conf->config('home');
-  @shells = $conf->config('shells');
-  $shellmachine = $conf->config('shellmachine');
-};
-
-@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
-@pw_set = ( 'a'..'z', 'A'..'Z', '0'..'9', '(', ')', '#', '!', '.', ',' );
-
-#not needed in 5.004 #srand($$|time);
-
-=head1 NAME
-
-FS::svc_acct - Object methods for svc_acct records
-
-=head1 SYNOPSIS
-
-  use FS::svc_acct;
-
-  $record = new FS::svc_acct \%hash;
-  $record = new FS::svc_acct { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $error = $record->suspend;
-
-  $error = $record->unsuspend;
-
-  $error = $record->cancel;
-
-=head1 DESCRIPTION
-
-An FS::svc_acct object represents an account.  FS::svc_acct inherits from
-FS::svc_Common.  The following fields are currently supported:
-
-=over 4
-
-=item svcnum - primary key (assigned automatcially for new accounts)
-
-=item username
-
-=item _password - generated if blank
-
-=item popnum - Point of presence (see L<FS::svc_acct_pop>)
-
-=item uid
-
-=item gid
-
-=item finger - GECOS
-
-=item dir - set automatically if blank (and uid is not)
-
-=item shell
-
-=item quota - (unimplementd)
-
-=item slipip - IP address
-
-=item radius_I<Radius_Attribute> - I<Radius-Attribute>
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new account.  To add the account to the database, see L<"insert">.
-
-=cut
-
-sub table { 'svc_acct'; }
-
-=item insert
-
-Adds this account to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
-defined.  An FS::cust_svc record will be created and inserted.
-
-If the configuration value (see L<FS::Conf>) shellmachine exists, and the 
-username, uid, and dir fields are defined, the command
-
-  useradd -d $dir -m -s $shell -u $uid $username
-
-is executed on shellmachine via ssh.  This behaviour can be surpressed by
-setting $FS::svc_acct::nossh_hack true.
-
-=cut
-
-sub insert {
-  my $self = shift;
-  my $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  $error = $self->check;
-  return $error if $error;
-
-  return "Username ". $self->username. " in use"
-    if qsearchs( 'svc_acct', { 'username' => $self->username } );
-
-  my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
-  return "Unkonwn svcpart" unless $part_svc;
-  return "uid in use"
-    if $part_svc->svc_acct__uid_flag ne 'F'
-      && qsearchs( 'svc_acct', { 'uid' => $self->uid } )
-      && $self->username !~ /^(hyla)?fax$/
-    ;
-
-  $error = $self->SUPER::insert;
-  return $error if $error;
-
-  my ( $username, $uid, $dir, $shell ) = (
-    $self->username,
-    $self->uid,
-    $self->dir,
-    $self->shell,
-  );
-  if ( $username 
-       && $uid
-       && $dir
-       && $shellmachine
-       && ! $nossh_hack ) {
-    #one way
-    ssh("root\@$shellmachine",
-        "useradd -d $dir -m -s $shell -u $uid $username"
-    );
-    #another way
-    #ssh("root\@$shellmachine","/bin/mkdir $dir; /bin/chmod 711 $dir; ".
-    #  "/bin/cp -p /etc/skel/.* $dir 2>/dev/null; ".
-    #  "/bin/cp -pR /etc/skel/Maildir $dir 2>/dev/null; ".
-    #  "/bin/chown -R $uid $dir") unless $nossh_hack;
-  }
-
-  ''; #no error
-}
-
-=item delete
-
-Deletes this account from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-The corresponding FS::cust_svc record will be deleted as well.
-
-If the configuration value (see L<FS::Conf>) shellmachine exists, the command:
-
-  userdel $username
-
-is executed on shellmachine via ssh.  This behaviour can be surpressed by
-setting $FS::svc_acct::nossh_hack true.
-
-=cut
-
-sub delete {
-  my $self = shift;
-  my $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  $error = $self->SUPER::delete;
-  return $error if $error;
-
-  my $username = $self->username;
-  if ( $username && $shellmachine && ! $nossh_hack ) {
-    ssh("root\@$shellmachine","userdel $username");
-  }
-
-  '';
-}
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-If the configuration value (see L<FS::Conf>) shellmachine exists, and the 
-dir field has changed, the command:
-
-  [ -d $old_dir ] && (
-    chmod u+t $old_dir;
-    umask 022;
-    mkdir $new_dir;
-    cd $old_dir;
-    find . -depth -print | cpio -pdm $new_dir;
-    chmod u-t $new_dir;
-    chown -R $uid.$gid $new_dir;
-    rm -rf $old_dir
-  )
-
-is executed on shellmachine via ssh.  This behaviour can be surpressed by
-setting $FS::svc_acct::nossh_hack true.
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-  my $error;
-
-  return "Username in use"
-    if $old->username ne $new->username &&
-      qsearchs( 'svc_acct', { 'username' => $new->username } );
-
-  return "Can't change uid!" if $old->uid != $new->uid;
-
-  #change homdir when we change username
-  $new->setfield('dir', '') if $old->username ne $new->username;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  $error = $new->SUPER::replace($old);
-  return $error if $error;
-
-  my ( $old_dir, $new_dir ) = ( $old->getfield('dir'), $new->getfield('dir') );
-  my ( $uid, $gid) = ( $new->getfield('uid'), $new->getfield('gid') );
-  if ( $old_dir
-       && $new_dir
-       && $old_dir ne $new_dir
-       && ! $nossh_hack
-  ) {
-    ssh("root\@$shellmachine","[ -d $old_dir ] && ".
-                 "( chmod u+t $old_dir; ". #turn off qmail delivery
-                 "umask 022; mkdir $new_dir; cd $old_dir; ".
-                 "find . -depth -print | cpio -pdm $new_dir; ".
-                 "chmod u-t $new_dir; chown -R $uid.$gid $new_dir; ".
-                 "rm -rf $old_dir". 
-                 ")"
-    );
-  }
-
-  ''; #no error
-}
-
-=item suspend
-
-Suspends this account by prefixing *SUSPENDED* to the password.  If there is an
-error, returns the error, otherwise returns false.
-
-Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=cut
-
-sub suspend {
-  my $self = shift;
-  my %hash = $self->hash;
-  unless ( $hash{_password} =~ /^\*SUSPENDED\* / ) {
-    $hash{_password} = '*SUSPENDED* '.$hash{_password};
-    my $new = new FS::svc_acct ( \%hash );
-    $new->replace($self);
-  } else {
-    ''; #no error (already suspended)
-  }
-}
-
-=item unsuspend
-
-Unsuspends this account by removing *SUSPENDED* from the password.  If there is
-an error, returns the error, otherwise returns false.
-
-Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=cut
-
-sub unsuspend {
-  my $self = shift;
-  my %hash = $self->hash;
-  if ( $hash{_password} =~ /^\*SUSPENDED\* (.*)$/ ) {
-    $hash{_password} = $1;
-    my $new = new FS::svc_acct ( \%hash );
-    $new->replace($self);
-  } else {
-    ''; #no error (already unsuspended)
-  }
-}
-
-=item cancel
-
-Just returns false (no error) for now.
-
-Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item check
-
-Checks all fields to make sure this is a valid service.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-Sets any fixed values; see L<FS::part_svc>.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my($recref) = $self->hashref;
-
-  my $x = $self->setfixed;
-  return $x unless ref($x);
-  my $part_svc = $x;
-
-  my $ulen =$self->dbdef_table->column('username')->length;
-  $recref->{username} =~ /^([a-z0-9_\-]{2,$ulen})$/
-    or return "Illegal username";
-  $recref->{username} = $1;
-  $recref->{username} =~ /[a-z]/ or return "Illegal username";
-
-  $recref->{popnum} =~ /^(\d*)$/ or return "Illegal popnum";
-  $recref->{popnum} = $1;
-  return "Unkonwn popnum" unless
-    ! $recref->{popnum} ||
-    qsearchs('svc_acct_pop',{'popnum'=> $recref->{popnum} } );
-
-  unless ( $part_svc->getfield('svc_acct__uid_flag') eq 'F' ) {
-
-    $recref->{uid} =~ /^(\d*)$/ or return "Illegal uid";
-    $recref->{uid} = $1 eq '' ? $self->unique('uid') : $1;
-
-    $recref->{gid} =~ /^(\d*)$/ or return "Illegal gid";
-    $recref->{gid} = $1 eq '' ? $recref->{uid} : $1;
-    #not all systems use gid=uid
-    #you can set a fixed gid in part_svc
-
-    return "Only root can have uid 0"
-      if $recref->{uid} == 0 && $recref->{username} ne 'root';
-
-    my($error);
-    return $error if $error=$self->ut_textn('finger');
-
-    $recref->{dir} =~ /^([\/\w\-]*)$/
-      or return "Illegal directory";
-    $recref->{dir} = $1 || 
-      $dir_prefix . '/' . $recref->{username}
-      #$dir_prefix . '/' . substr($recref->{username},0,1). '/' . $recref->{username}
-    ;
-
-    unless ( $recref->{username} eq 'sync' ) {
-      my($shell);
-      if ( $shell = (grep $_ eq $recref->{shell}, @shells)[0] ) {
-        $recref->{shell} = $shell;
-      } else {
-        return "Illegal shell \`". $self->shell. "\'; ".
-               $conf->dir. "/shells contains: @shells";
-      }
-    } else {
-      $recref->{shell} = '/bin/sync';
-    }
-
-    $recref->{quota} =~ /^(\d*)$/ or return "Illegal quota (unimplemented)";
-    $recref->{quota} = $1;
-
-  } else {
-    $recref->{gid} ne '' ? 
-      return "Can't have gid without uid" : ( $recref->{gid}='' );
-    $recref->{finger} ne '' ? 
-      return "Can't have finger-name without uid" : ( $recref->{finger}='' );
-    $recref->{dir} ne '' ? 
-      return "Can't have directory without uid" : ( $recref->{dir}='' );
-    $recref->{shell} ne '' ? 
-      return "Can't have shell without uid" : ( $recref->{shell}='' );
-    $recref->{quota} ne '' ? 
-      return "Can't have quota without uid" : ( $recref->{quota}='' );
-  }
-
-  unless ( $part_svc->getfield('svc_acct__slipip_flag') eq 'F' ) {
-    unless ( $recref->{slipip} eq '0e0' ) {
-      $recref->{slipip} =~ /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/
-        or return "Illegal slipip". $self->slipip;
-      $recref->{slipip} = $1;
-    } else {
-      $recref->{slipip} = '0e0';
-    }
-
-  }
-
-  #arbitrary RADIUS stuff; allow ut_textn for now
-  foreach ( grep /^radius_/, fields('svc_acct') ) {
-    $self->ut_textn($_);
-  }
-
-  #generate a password if it is blank
-  $recref->{_password} = join('',map($pw_set[ int(rand $#pw_set) ], (0..7) ) )
-    unless ( $recref->{_password} );
-
-  #if ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([^\t\n]{4,16})$/ ) {
-  if ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([^\t\n]{4,8})$/ ) {
-    $recref->{_password} = $1.$3;
-    #uncomment this to encrypt password immediately upon entry, or run
-    #bin/crypt_pw in cron to give new users a window during which their
-    #password is available to techs, for faxing, etc.  (also be aware of 
-    #radius issues!)
-    #$recref->{password} = $1.
-    #  crypt($3,$saltset[int(rand(64))].$saltset[int(rand(64))]
-    #;
-  } elsif ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([\w\.\/]{13,24})$/ ) {
-    $recref->{_password} = $1.$3;
-  } elsif ( $recref->{_password} eq '*' ) {
-    $recref->{_password} = '*';
-  } else {
-    return "Illegal password";
-  }
-
-  ''; #no error
-}
-
-=back
-
-=head1 VERSION
-
-$Id: svc_acct.pm,v 1.8 1999-07-29 08:47:26 ivan Exp $
-
-=head1 BUGS
-
-The remote commands should be configurable.
-
-The bits which ssh should fork before doing so.
-
-The $recref stuff in sub check should be cleaned up.
-
-=head1 SEE ALSO
-
-L<FS::svc_Common>, L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>,
-L<FS::part_svc>, L<FS::cust_pkg>, L<FS::SSH>, L<ssh>, L<FS::svc_acct_pop>,
-schema.html from the base documentation.
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-jul-16 - 21
-
-rewrite (among other things, now know about part_svc) ivan@sisd.com 98-mar-8
-
-Changed 'password' to '_password' because Pg6.3 reserves the password word
-	bmccane@maxbaud.net	98-apr-3
-
-username length and shell no longer hardcoded ivan@sisd.com 98-jun-28
-
-eww but needed: ignore uid duplicates for 'fax' and 'hylafax'
-ivan@sisd.com 98-jun-29
-
-$nossh_hack ivan@sisd.com 98-jul-13
-
-protections against UID/GID of 0 for incorrectly-setup RDBMSs (also
-in bin/svc_acct.export) ivan@sisd.com 98-jul-13
-
-arbitrary radius attributes ivan@sisd.com 98-aug-13
-
-/var/spool/freeside/conf/shellmachine ivan@sisd.com 98-aug-13
-
-pod and FS::conf ivan@sisd.com 98-sep-22
-
-$Log: svc_acct.pm,v $
-Revision 1.8  1999-07-29 08:47:26  ivan
-more informative illegal shells error.
-
-Revision 1.7  1999/04/07 14:37:37  ivan
-use FS::part_svc and FS::svc_acct_pop to avoid warnings
-
-Revision 1.6  1999/01/25 12:26:15  ivan
-yet more mod_perl stuff
-
-Revision 1.5  1999/01/18 21:58:09  ivan
-esthetic: eq and ne were used in a few places instead of == and !=
-
-Revision 1.4  1998/12/30 00:30:45  ivan
-svc_ stuff is more properly OO - has a common superclass FS::svc_Common
-
-Revision 1.2  1998/11/13 09:56:55  ivan
-change configuration file layout to support multiple distinct databases (with
-own set of config files, export, etc.)
-
-
-=cut
-
-1;
-
diff --git a/site_perl/svc_acct_pop.pm b/site_perl/svc_acct_pop.pm
deleted file mode 100644
index fe2b5f3ac..000000000
--- a/site_perl/svc_acct_pop.pm
+++ /dev/null
@@ -1,124 +0,0 @@
-package FS::svc_acct_pop;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs );
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::svc_acct_pop - Object methods for svc_acct_pop records
-
-=head1 SYNOPSIS
-
-  use FS::svc_acct_pop;
-
-  $record = new FS::svc_acct_pop \%hash;
-  $record = new FS::svc_acct_pop { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::svc_acct object represents an point of presence.  FS::svc_acct_pop
-inherits from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item popnum - primary key (assigned automatically for new accounts)
-
-=item city
-
-=item state
-
-=item ac - area code
-
-=item exch - exchange
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new point of presence (if only it were that easy!).  To add the 
-point of presence to the database, see L<"insert">.
-
-=cut
-
-sub table { 'svc_acct_pop'; }
-
-=item insert
-
-Adds this point of presence to the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item delete
-
-Removes this point of presence from the database.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid point of presence.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-    $self->ut_numbern('popnum')
-      or $self->ut_text('city')
-      or $self->ut_text('state')
-      or $self->ut_number('ac')
-      or $self->ut_number('exch')
-  ;
-
-}
-
-=back
-
-=head1 VERSION
-
-$Id: svc_acct_pop.pm,v 1.2 1998-12-29 11:59:53 ivan Exp $
-
-=head1 BUGS
-
-It should be renamed to part_pop.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<svc_acct>, schema.html from the base documentation.
-
-=head1 HISTORY
-
-Class dealing with pops 
-
-ivan@sisd.com 98-mar-8 
-
-pod ivan@sisd.com 98-sep-23
-
-$Log: svc_acct_pop.pm,v $
-Revision 1.2  1998-12-29 11:59:53  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-
-=cut
-
-1;
-
diff --git a/site_perl/svc_acct_sm.pm b/site_perl/svc_acct_sm.pm
deleted file mode 100644
index c757ab073..000000000
--- a/site_perl/svc_acct_sm.pm
+++ /dev/null
@@ -1,266 +0,0 @@
-package FS::svc_acct_sm;
-
-use strict;
-use vars qw( @ISA $nossh_hack $conf $shellmachine @qmailmachines );
-use FS::Record qw( fields qsearch qsearchs );
-use FS::svc_Common;
-use FS::cust_svc;
-use FS::SSH qw(ssh);
-use FS::Conf;
-use FS::svc_acct;
-use FS::svc_domain;
-
-@ISA = qw( FS::svc_Common );
-
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::svc_acct_sm'} = sub { 
-  $conf = new FS::Conf;
-  $shellmachine = $conf->exists('qmailmachines')
-                  ? $conf->config('shellmachine')
-                  : '';
-};
-
-=head1 NAME
-
-FS::svc_acct_sm - Object methods for svc_acct_sm records
-
-=head1 SYNOPSIS
-
-  use FS::svc_acct_sm;
-
-  $record = new FS::svc_acct_sm \%hash;
-  $record = new FS::svc_acct_sm { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $error = $record->suspend;
-
-  $error = $record->unsuspend;
-
-  $error = $record->cancel;
-
-=head1 DESCRIPTION
-
-An FS::svc_acct object represents a virtual mail alias.  FS::svc_acct inherits
-from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item svcnum - primary key (assigned automatcially for new accounts)
-
-=item domsvc - svcnum of the virtual domain (see L<FS::svc_domain>)
-
-=item domuid - uid of the target account (see L<FS::svc_acct>)
-
-=item domuser - virtual username
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new virtual mail alias.  To add the virtual mail alias to the
-database, see L<"insert">.
-
-=cut
-
-sub table { 'svc_acct_sm'; }
-
-=item insert
-
-Adds this virtual mail alias to the database.  If there is an error, returns
-the error, otherwise returns false.
-
-The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
-defined.  An FS::cust_svc record will be created and inserted.
-
-If the configuration values (see L<FS::Conf>) shellmachine and qmailmachines
-exist, and domuser is `*' (meaning a catch-all mailbox), the command:
-
-  [ -e $dir/.qmail-$qdomain-default ] || {
-    touch $dir/.qmail-$qdomain-default;
-    chown $uid:$gid $dir/.qmail-$qdomain-default;
-  }
-
-is executed on shellmachine via ssh (see L<dot-qmail/"EXTENSION ADDRESSES">).
-This behaviour can be surpressed by setting $FS::svc_acct_sm::nossh_hack true.
-
-=cut
-
-sub insert {
-  my $self = shift;
-  my $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  $error=$self->check;
-  return $error if $error;
-
-  return "Domain username (domuser) in use for this domain (domsvc)"
-    if qsearchs('svc_acct_sm',{ 'domuser'=> $self->domuser,
-                                'domsvc' => $self->domsvc,
-                              } );
-
-  return "First domain username (domuser) for domain (domsvc) must be " .
-         qq='*' (catch-all)!=
-    if $self->domuser ne '*' &&
-       ! qsearch('svc_acct_sm',{ 'domsvc' => $self->domsvc } );
-
-  $error = $self->SUPER::insert;
-  return $error if $error;
-
-  my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } );
-  my $svc_acct = qsearchs( 'svc_acct', { 'uid' => $self->domuid } );
-  my ( $uid, $gid, $dir, $domain ) = (
-    $svc_acct->uid,
-    $svc_acct->gid,
-    $svc_acct->dir,
-    $svc_domain->domain,
-  );
-  my $qdomain = $domain;
-  $qdomain =~ s/\./:/g; #see manpage for 'dot-qmail': EXTENSION ADDRESSES
-  ssh("root\@$shellmachine","[ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }")  
-    if ( ! $nossh_hack && $shellmachine && $dir && $self->domuser eq '*' );
-
-  ''; #no error
-
-}
-
-=item delete
-
-Deletes this virtual mail alias from the database.  If there is an error,
-returns the error, otherwise returns false.
-
-The corresponding FS::cust_svc record will be deleted as well.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-  my $error;
-
-  return "Domain username (domuser) in use for this domain (domsvc)"
-    if ( $old->domuser ne $new->domuser
-         || $old->domsvc != $new->domsvc
-       )  && qsearchs('svc_acct_sm',{
-         'domuser'=> $new->domuser,
-         'domsvc' => $new->domsvc,
-       } )
-     ;
-
- $new->SUPER::replace($old);
-
-}
-
-=item suspend
-
-Just returns false (no error) for now.
-
-Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item unsuspend
-
-Just returns false (no error) for now.
-
-Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item cancel
-
-Just returns false (no error) for now.
-
-Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item check
-
-Checks all fields to make sure this is a valid virtual mail alias.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert and
-replace methods.
-
-Sets any fixed values; see L<FS::part_svc>.
-
-=cut
-
-sub check {
-  my $self = shift;
-  my $error;
-
-  my $x = $self->setfixed;
-  return $x unless ref($x);
-  my $part_svc = $x;
-
-  my($recref) = $self->hashref;
-
-  $recref->{domuser} =~ /^(\*|[a-z0-9_\-]{2,32})$/
-    or return "Illegal domain username (domuser)";
-  $recref->{domuser} = $1;
-
-  $recref->{domsvc} =~ /^(\d+)$/ or return "Illegal domsvc";
-  $recref->{domsvc} = $1;
-  my($svc_domain);
-  return "Unknown domsvc" unless
-    $svc_domain=qsearchs('svc_domain',{'svcnum'=> $recref->{domsvc} } );
-
-  $recref->{domuid} =~ /^(\d+)$/ or return "Illegal uid";
-  $recref->{domuid} = $1;
-  my($svc_acct);
-  return "Unknown uid" unless
-    $svc_acct=qsearchs('svc_acct',{'uid'=> $recref->{domuid} } );
-
-  ''; #no error
-}
-
-=back
-
-=head1 VERSION
-
-$Id: svc_acct_sm.pm,v 1.7 1999-04-07 14:40:15 ivan Exp $
-
-=head1 BUGS
-
-The remote commands should be configurable.
-
-The $recref stuff in sub check should be cleaned up.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
-L<FS::svc_acct>, L<FS::svc_domain>, L<FS::SSH>, L<ssh>, L<dot-qmail>,
-schema.html from the base documentation.
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-jul-16 - 21
-
-rewrite ivan@sisd.com 98-mar-10
-
-s/qsearchs/qsearch/ to eliminate warning ivan@sisd.com 98-apr-19
-
-uses conf/shellmachine and has an nossh_hack ivan@sisd.com 98-jul-14
-
-s/\./:/g in .qmail-domain:com ivan@sisd.com 98-aug-13 
-
-pod, FS::Conf, moved .qmail file from check to insert 98-sep-23
-
-=cut
-
-1;
-
diff --git a/site_perl/svc_domain.pm b/site_perl/svc_domain.pm
deleted file mode 100644
index 17fdd19d5..000000000
--- a/site_perl/svc_domain.pm
+++ /dev/null
@@ -1,458 +0,0 @@
-package FS::svc_domain;
-
-use strict;
-use vars qw( @ISA $whois_hack $conf $mydomain $smtpmachine
-  $tech_contact $from $to @nameservers @nameserver_ips @template
-);
-use Carp;
-use Mail::Internet;
-use Mail::Header;
-use Date::Format;
-use Net::Whois; #0.24;
-use FS::Record qw(fields qsearch qsearchs);
-use FS::Conf;
-use FS::svc_Common;
-use FS::cust_svc;
-use FS::svc_acct;
-use FS::cust_pkg;
-use FS::cust_main;
-
-@ISA = qw( FS::svc_Common );
-
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::domain'} = sub { 
-  $conf = new FS::Conf;
-
-  $mydomain = $conf->config('domain');
-  $smtpmachine = $conf->config('smtpmachine');
-
-  my($internic)="/registries/internic";
-  $tech_contact = $conf->config("$internic/tech_contact");
-  $from = $conf->config("$internic/from");
-  $to = $conf->config("$internic/to");
-  my(@ns) = $conf->config("$internic/nameservers");
-  @nameservers=map {
-    /^\s*\d+\.\d+\.\d+\.\d+\s+([^\s]+)\s*$/
-      or die "Illegal line in $internic/nameservers";
-    $1;
-  } @ns;
-  @nameserver_ips=map {
-    /^\s*(\d+\.\d+\.\d+\.\d+)\s+([^\s]+)\s*$/
-      or die "Illegal line in $internic/nameservers!";
-    $1;
-  } @ns;
-  @template = map { $_. "\n" } $conf->config("$internic/template");
-
-};
-
-=head1 NAME
-
-FS::svc_domain - Object methods for svc_domain records
-
-=head1 SYNOPSIS
-
-  use FS::svc_domain;
-
-  $record = new FS::svc_domain \%hash;
-  $record = new FS::svc_domain { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $error = $record->suspend;
-
-  $error = $record->unsuspend;
-
-  $error = $record->cancel;
-
-=head1 DESCRIPTION
-
-An FS::svc_domain object represents a domain.  FS::svc_domain inherits from
-FS::svc_Common.  The following fields are currently supported:
-
-=over 4
-
-=item svcnum - primary key (assigned automatically for new accounts)
-
-=item domain
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new domain.  To add the domain to the database, see L<"insert">.
-
-=cut
-
-sub table { 'svc_domain'; }
-
-=item insert
-
-Adds this domain to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-The additional fields I<pkgnum> and I<svcpart> (see L<FS::cust_svc>) should be 
-defined.  An FS::cust_svc record will be created and inserted.
-
-The additional field I<action> should be set to I<N> for new domains or I<M>
-for transfers.
-
-A registration or transfer email will be submitted unless
-$FS::svc_domain::whois_hack is true.
-
-The additional field I<email> can be used to manually set the admin contact
-email address on this email.  Otherwise, the svc_acct records for this package 
-(see L<FS::cust_pkg>) are searched.  If there is exactly one svc_acct record
-in the same package, it is automatically used.  Otherwise an error is returned.
-
-=cut
-
-sub insert {
-  my $self = shift;
-  my $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  $error = $self->check;
-  return $error if $error;
-
-  return "Domain in use (here)"
-    if qsearchs( 'svc_domain', { 'domain' => $self->domain } );
-
-  my $whois = $self->whois;
-  return "Domain in use (see whois)"
-    if ( $self->action eq "N" && $whois );
-  return "Domain not found (see whois)"
-    if ( $self->action eq "M" && ! $whois );
-
-  $error = $self->SUPER::insert;
-  return $error if $error;
-
-  $self->submit_internic unless $whois_hack;
-
-  ''; #no error
-}
-
-=item delete
-
-Deletes this domain from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-The corresponding FS::cust_svc record will be deleted as well.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-  my $error;
-
-  return "Can't change domain - reorder."
-    if $old->getfield('domain') ne $new->getfield('domain'); 
-
-  $new->SUPER::replace($old);
-
-}
-
-=item suspend
-
-Just returns false (no error) for now.
-
-Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item unsuspend
-
-Just returns false (no error) for now.
-
-Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item cancel
-
-Just returns false (no error) for now.
-
-Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item check
-
-Checks all fields to make sure this is a valid domain.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-Sets any fixed values; see L<FS::part_svc>.
-
-=cut
-
-sub check {
-  my $self = shift;
-  my $error;
-
-  my $x = $self->setfixed;
-  return $x unless ref($x);
-  my $part_svc = $x;
-
-  #hmm
-  my $pkgnum;
-  if ( $self->svcnum ) {
-    my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $self->svcnum } );
-    $pkgnum = $cust_svc->pkgnum;
-  } else {
-    $pkgnum = $self->pkgnum;
-  }
-
-  my($recref) = $self->hashref;
-
-  unless ( $whois_hack ) {
-    unless ( $self->email ) { #find out an email address
-      my @svc_acct;
-      foreach ( qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } ) ) {
-        my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $_->svcnum } );
-        push @svc_acct, $svc_acct if $svc_acct;
-      }
-
-      if ( scalar(@svc_acct) == 0 ) {
-        return "Must order an account in package ". $pkgnum. " first";
-      } elsif ( scalar(@svc_acct) > 1 ) {
-        return "More than one account in package ". $pkgnum. ": specify admin contact email";
-      } else {
-        $self->email($svc_acct[0]->username. '@'. $mydomain);
-      }
-    }
-  }
-
-  #if ( $recref->{domain} =~ /^([\w\-\.]{1,22})\.(com|net|org|edu)$/ ) {
-  if ( $recref->{domain} =~ /^([\w\-]{1,22})\.(com|net|org|edu)$/ ) {
-    $recref->{domain} = "$1.$2";
-  # hmmmmmmmm.
-  } elsif ( $whois_hack && $recref->{domain} =~ /^([\w\-\.]+)$/ ) {
-    $recref->{domain} = $1;
-  } else {
-    return "Illegal domain ". $recref->{domain}.
-           " (or unknown registry - try \$whois_hack)";
-  }
-
-  $recref->{action} =~ /^(M|N)$/ or return "Illegal action";
-  $recref->{action} = $1;
-
-  $self->ut_textn('purpose');
-
-}
-
-=item whois
-
-Returns the Net::Whois object corresponding to this domain, or undef if
-the domain is not found in whois.
-
-(If $FS::svc_domain::whois_hack is true, returns that in all cases instead.)
-
-=cut
-
-sub whois {
-  $whois_hack or new Net::Whois::Domain $_[0]->domain;
-}
-
-=item _whois
-
-Depriciated.
-
-=cut
-
-sub _whois {
-  die "_whois depriciated";
-}
-
-=item submit_internic
-
-Submits a registration email for this domain.
-
-=cut
-
-sub submit_internic {
-  my $self = shift;
-
-  my $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
-  return unless $cust_pkg;
-  my $cust_main = qsearchs( 'cust_main', { 'custnum' => $cust_pkg->custnum } );
-  return unless $cust_main;
-
-  my %subs = (
-    'action'       => $self->action,
-    'purpose'      => $self->purpose,
-    'domain'       => $self->domain,
-    'company'      => $cust_main->company 
-                        || $cust_main->getfield('first'). ' '.
-                           $cust_main->getfield('last')
-                      ,
-    'city'         => $cust_main->city,
-    'state'        => $cust_main->state,
-    'zip'          => $cust_main->zip,
-    'country'      => $cust_main->country,
-    'last'         => $cust_main->getfield('last'),
-    'first'        => $cust_main->getfield('first'),
-    'daytime'      => $cust_main->daytime,
-    'fax'          => $cust_main->fax,
-    'email'        => $self->email,
-    'tech_contact' => $tech_contact,
-    'primary'      => shift @nameservers,
-    'primary_ip'   => shift @nameserver_ips,
-  );
-
-  #yuck
-  my @xtemplate = @template;
-  my @body;
-  my $line;
-  OLOOP: while ( defined( $line = shift @xtemplate ) ) {
-
-    if ( $line =~ /^###LOOP###$/ ) {
-      my(@buffer);
-      LOADBUF: while ( defined( $line = shift @xtemplate ) ) {
-        last LOADBUF if ( $line =~ /^###ENDLOOP###$/ );
-        push @buffer, $line;
-      }
-      my %lubs = (
-        'address'      => $cust_main->address2 
-                            ? [ $cust_main->address1, $cust_main->address2 ]
-                            : [ $cust_main->address1 ]
-                          ,
-        'secondary'    => [ @nameservers ],
-        'secondary_ip' => [ @nameserver_ips ],
-      );
-      LOOP: while (1) {
-        my @xbuffer = @buffer;
-        SUBLOOP: while ( defined( $line = shift @xbuffer ) ) {
-          if ( $line =~ /###(\w+)###/ ) {
-            #last LOOP unless my($lub)=shift@{$lubs{$1}};
-            next OLOOP unless my $lub = shift @{$lubs{$1}};
-            $line =~ s/###(\w+)###/$lub/e;
-            redo SUBLOOP;
-          } else {
-            push @body, $line;
-          }
-        } #SUBLOOP
-      } #LOOP
-
-    }
-
-    if ( $line =~ /###(\w+)###/ ) {
-      #$line =~ s/###(\w+)###/$subs{$1}/eg;
-      $line =~ s/###(\w+)###/$subs{$1}/e;
-      redo OLOOP;
-    } else {
-      push @body, $line;
-    }
-
-  } #OLOOP
-
-  my $subject;
-  if ( $self->action eq "M" ) {
-    $subject = "MODIFY DOMAIN ". $self->domain;
-  } elsif ( $self->action eq "N" ) { 
-    $subject = "NEW DOMAIN ". $self->domain;
-  } else {
-    croak "submit_internic called with action ". $self->action;
-  }
-
-  $ENV{SMTPHOSTS} = $smtpmachine;
-  $ENV{MAILADDRESS} = $from;
-  my $header = Mail::Header->new( [
-    "From: $from",
-    "To: $to",
-    "Sender: $from",
-    "Reply-To: $from",
-    "Date: ". time2str("%a, %d %b %Y %X %z", time),
-    "Subject: $subject",
-  ] );
-
-  my($msg)=Mail::Internet->new(
-    'Header' => $header,
-    'Body' => \@body,
-  );
-
-  $msg->smtpsend or die "Can't send registration email"; #die? warn?
-
-}
-
-=back
-
-=head1 VERSION
-
-$Id: svc_domain.pm,v 1.8 1999-08-03 07:43:33 ivan Exp $
-
-=head1 BUGS
-
-All BIND/DNS fields should be included (and exported).
-
-Delete doesn't send a registration template.
-
-All registries should be supported.
-
-Should change action to a real field.
-
-The $recref stuff in sub check should be cleaned up.
-
-=head1 SEE ALSO
-
-L<FS::svc_Common>, L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>,
-L<FS::part_svc>, L<FS::cust_pkg>, L<FS::SSH>, L<Net::Whois>, L<ssh>,
-L<dot-qmail>, schema.html from the base documentation, config.html from the
-base documentation.
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-jul-21
-
-rewrite ivan@sisd.com 98-mar-10
-
-add internic bits ivan@sisd.com 98-mar-14
-
-Changed 'day' to 'daytime' because Pg6.3 reserves the day word
-	bmccane@maxbaud.net	98-apr-3
-
-/var/spool/freeside/conf/registries/internic/, Mail::Internet, etc.
-ivan@sisd.com 98-jul-17-19
-
-pod, some FS::Conf (not complete) ivan@sisd.com 98-sep-23
-
-$Log: svc_domain.pm,v $
-Revision 1.8  1999-08-03 07:43:33  ivan
-use Net::Whois;
-
-Revision 1.7  1999/04/07 14:40:15  ivan
-use all stuff that's qsearch'ed to avoid warnings
-
-Revision 1.6  1999/01/25 12:26:17  ivan
-yet more mod_perl stuff
-
-Revision 1.5  1998/12/30 00:30:47  ivan
-svc_ stuff is more properly OO - has a common superclass FS::svc_Common
-
-Revision 1.3  1998/11/13 09:56:57  ivan
-change configuration file layout to support multiple distinct databases (with
-own set of config files, export, etc.)
-
-Revision 1.2  1998/10/14 08:18:21  ivan
-More informative error messages and better doc for admin contact email stuff
-
-
-=cut
-
-1;
-
-
diff --git a/site_perl/table_template-svc.pm b/site_perl/table_template-svc.pm
deleted file mode 100644
index 40c9ed9b5..000000000
--- a/site_perl/table_template-svc.pm
+++ /dev/null
@@ -1,177 +0,0 @@
-package FS::svc_table;
-
-use strict;
-use vars qw(@ISA);
-#use FS::Record qw( qsearch qsearchs );
-use FS::svc_Common;
-use FS::cust_svc;
-
-@ISA = qw(svc_Common);
-
-=head1 NAME
-
-FS::table_name - Object methods for table_name records
-
-=head1 SYNOPSIS
-
-  use FS::table_name;
-
-  $record = new FS::table_name \%hash;
-  $record = new FS::table_name { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $error = $record->suspend;
-
-  $error = $record->unsuspend;
-
-  $error = $record->cancel;
-
-=head1 DESCRIPTION
-
-An FS::table_name object represents an example.  FS::table_name inherits from
-FS::svc_Common.  The following fields are currently supported:
-
-=over 4
-
-=item field - description
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new example.  To add the example to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-sub table { 'table_name'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
-defined.  An FS::cust_svc record will be created and inserted.
-
-=cut
-
-sub insert {
-  my $self = shift;
-  my $error;
-
-  $error = $self->SUPER::insert;
-  return $error if $error;
-
-  '';
-}
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-sub delete {
-  my $self = shift;
-  my $error;
-
-  $error = $self->SUPER::delete;
-  return $error if $error;
-
-  '';
-}
-
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-  my $error;
-
-  $error = $new->SUPER::replace($old);
-  return $error if $error;
-
-  '';
-}
-
-=item suspend
-
-Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item unsuspend
-
-Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item cancel
-
-Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item check
-
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and repalce methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $x = $self->setfixed;
-  return $x unless ref($x);
-  my $part_svc = $x;
-
-
-  ''; #no error
-}
-
-=back
-
-=head1 VERSION
-
-$Id: table_template-svc.pm,v 1.4 1998-12-30 00:30:48 ivan Exp $
-
-=head1 BUGS
-
-The author forgot to customize this manpage.
-
-=head1 SEE ALSO
-
-L<FS::svc_Common>, L<FS::Record>, L<FS::cust_svc>, L<FS::part_svc>,
-L<FS::cust_pkg>, schema.html from the base documentation.
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-jul-21
-
-$Log: table_template-svc.pm,v $
-Revision 1.4  1998-12-30 00:30:48  ivan
-svc_ stuff is more properly OO - has a common superclass FS::svc_Common
-
-Revision 1.2  1998/11/15 04:33:01  ivan
-updates for newest versoin
-
-
-=cut
-
-1;
-
diff --git a/site_perl/table_template.pm b/site_perl/table_template.pm
deleted file mode 100644
index 0173bc5cf..000000000
--- a/site_perl/table_template.pm
+++ /dev/null
@@ -1,134 +0,0 @@
-package FS::table_name;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::table_name - Object methods for table_name records
-
-=head1 SYNOPSIS
-
-  use FS::table_name;
-
-  $record = new FS::table_name \%hash;
-  $record = new FS::table_name { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::table_name object represents an example.  FS::table_name inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item field - description
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new example.  To add the example to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'table_name'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  ''; #no error
-}
-
-=back
-
-=head1 VERSION
-
-$Id: table_template.pm,v 1.4 1998-12-29 11:59:57 ivan Exp $
-
-=head1 BUGS
-
-The author forgot to customize this manpage.
-
-=head1 SEE ALSO
-
-L<FS::Record>, schema.html from the base documentation.
-
-=head1 HISTORY
-
-ivan@voicenet.com 97-jul-1
-
-added hfields
-ivan@sisd.com 97-nov-13
-
-$Log: table_template.pm,v $
-Revision 1.4  1998-12-29 11:59:57  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-Revision 1.3  1998/11/15 04:33:00  ivan
-updates for newest versoin
-
-Revision 1.2  1998/11/15 03:48:49  ivan
-update for current version
-
-
-=cut
-
-1;
-
diff --git a/site_perl/type_pkgs.pm b/site_perl/type_pkgs.pm
deleted file mode 100644
index e19345e7c..000000000
--- a/site_perl/type_pkgs.pm
+++ /dev/null
@@ -1,128 +0,0 @@
-package FS::type_pkgs;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs );
-use FS::agent_type;
-use FS::part_pkg;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::type_pkgs - Object methods for type_pkgs records
-
-=head1 SYNOPSIS
-
-  use FS::type_pkgs;
-
-  $record = new FS::type_pkgs \%hash;
-  $record = new FS::type_pkgs { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::type_pkgs record links an agent type (see L<FS::agent_type>) to a
-billing item definition (see L<FS::part_pkg>).  FS::type_pkgs inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item typenum - Agent type, see L<FS::agent_type>
-
-=item pkgpart - Billing item definition, see L<FS::part_pkg>
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Create a new record.  To add the record to the database, see L<"insert">.
-
-=cut
-
-sub table { 'type_pkgs'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-    $self->ut_number('typenum')
-    || $self->ut_number('pkgpart')
-  ;
-  return $error if $error;
-
-  return "Unknown typenum"
-    unless qsearchs( 'agent_type', { 'typenum' => $self->typenum } );
-
-  return "Unknown pkgpart"
-    unless qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
-
-  ''; #no error
-}
-
-=back
-
-=head1 VERSION
-
-$Id: type_pkgs.pm,v 1.2 1998-12-29 11:59:58 ivan Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::agent_type>, L<FS::part_pkgs>, schema.html from the base
-documentation.
-
-=head1 HISTORY
-
-Defines the relation between agent types and pkgparts
-(Which pkgparts can the different [types of] agents sell?)
-
-ivan@sisd.com 97-nov-13
-
-change to ut_ FS::Record, fixed bugs
-ivan@sisd.com 97-dec-10
-
-$Log: type_pkgs.pm,v $
-Revision 1.2  1998-12-29 11:59:58  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-
-=cut
-
-1;
-
-- 
cgit v1.2.1


From be415b1dd6b788a2fe2071093b404ff10cfd4654 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Aug 1999 08:00:43 +0000
Subject: move to perl installation directory

---
 site_perl/UI/Base.pm  | 191 ----------------------------------------
 site_perl/UI/CGI.pm   | 236 --------------------------------------------------
 site_perl/UI/Gtk.pm   | 221 ----------------------------------------------
 site_perl/UI/agent.pm |  62 -------------
 4 files changed, 710 deletions(-)
 delete mode 100644 site_perl/UI/Base.pm
 delete mode 100644 site_perl/UI/CGI.pm
 delete mode 100644 site_perl/UI/Gtk.pm
 delete mode 100644 site_perl/UI/agent.pm

diff --git a/site_perl/UI/Base.pm b/site_perl/UI/Base.pm
deleted file mode 100644
index 38087f6c8..000000000
--- a/site_perl/UI/Base.pm
+++ /dev/null
@@ -1,191 +0,0 @@
-package FS::UI::Base;
-
-use strict;
-use vars qw ( @ISA );
-use FS::Record qw( fields qsearch );
-
-@ISA = ( $FS::UI::Base::_lock );
-
-=head1 NAME
-
-FS::UI::Base - Base class for all user-interface objects
-
-=head1 SYNOPSIS
-
-  use FS::UI::SomeInterface;
-  use FS::UI::some_table;
-
-  $interface = new FS::UI::some_table;
-
-  $error = $interface->browse;
-  $error = $interface->search;
-  $error = $interface->view;
-  $error = $interface->edit;
-  $error = $interface->process;
-
-=head1 DESCRIPTION
-
-An FS::UI::Base object represents a user interface object.  FS::UI::Base
-is intended as a base class for table-specfic classes to inherit from, i.e.
-FS::UI::cust_main.  The simplest case, which will provide a default UI for your
-new table, is as follows:
-
-  package FS::UI::table_name;
-  use vars qw ( @ISA );
-  use FS::UI::Base;
-  @ISA = qw( FS::UI::Base );
-  sub db_table { 'table_name'; }
-
-Currently available interfaces are:
-  FS::UI::Gtk, an X-Windows UI implemented using the Gtk+ toolkit
-  FS::UI::CGI, a web interface implemented using CGI.pm, etc.
-
-=head1 METHODS
-
-=over 4
-
-=item new
-
-=cut
-
-=item browse
-
-=cut
-
-sub browse {
-  my $self = shift;
-
-  my @fields = $self->list_fields;
-
-  #begin browse-specific stuff
-
-  $self->title( "Browse ". $self->db_names ) unless $self->title;
-  my @records = qsearch ( $self->db_table, {} );
-
-  #end browse-specific stuff
-
-  $self->addwidget ( new FS::UI::_Text ( $self->db_description ) );
-
-  my @header = $self->list_header;
-  my @headerspan = $self->list_headerspan;
-  my %callback = $self->db_callback;
-
-  my $columns;
-
-  my $table = new FS::UI::_Tableborder (
-    'rows' => 1 + scalar(@records),
-    'columns' => $columns || scalar(@fields),
-  );
-
-  my $c = 0;
-  foreach my $header ( @header ) {
-    my $headerspan = shift(@headerspan) || 1;
-    $table->attach(
-      0, $c, new FS::UI::_Text ( $header ), 1, $headerspan
-    );
-    $c += $headerspan;
-  }
-
-  my $r = 1;
-  
-  foreach my $record ( @records ) {
-    $c = 0;
-    foreach my $field ( @fields ) {
-      my $value = $record->getfield($field);
-      my $widget;
-      if ( $callback{$field} ) {
-        $widget = &{ $callback{$field} }( $value, $record );
-      } else {
-        $widget = new FS::UI::_Text ( $value );
-      }
-      $table->attach( $r, $c++, $widget, 1, 1 );
-    }
-    $r++;
-  }
-
-  $self->addwidget( $table );
-
-  $self->activate;
-
-}
-
-=item title
-
-=cut
-
-sub title {
-  my $self = shift;
-  my $value = shift;
-  if ( defined($value) ) {
-    $self->{'title'} = $value;
-  } else {
-    $self->{'title'};
-  }
-}
-
-=item addwidget
-
-=cut
-
-sub addwidget {
-  my $self = shift;
-  my $widget = shift;
-  push @{ $self->{'Widgets'} }, $widget;
-}
-
-#fallback methods
-
-sub db_description {}
-
-sub db_name {}
-
-sub db_names {
-  my $self = shift;
-  $self->db_name. 's';
-}
-
-sub list_fields {
-  my $self = shift;
-  fields( $self->db_table );
-}
-
-sub list_header {
-  my $self = shift;
-  $self->list_fields
-}
-
-sub list_headerspan {
-  my $self = shift;
-  map 1, $self->list_header;
-}
-
-sub db_callback {}
-
-=back
-
-=head1 VERSION
-
-$Id: Base.pm,v 1.1 1999-01-20 09:30:36 ivan Exp $
-
-=head1 BUGS
-
-This documentation is incomplete.
-
-There should be some sort of per-(freeside)-user preferences and the ability
-for specific FS::UI:: modules to put their own values there as well.
-
-=head1 SEE ALSO
-
-L<FS::UI::Gtk>, L<FS::UI::CGI>
-
-=head1 HISTORY
-
-$Log: Base.pm,v $
-Revision 1.1  1999-01-20 09:30:36  ivan
-skeletal cross-UI UI code.
-
-
-=cut
-
-1;
-
diff --git a/site_perl/UI/CGI.pm b/site_perl/UI/CGI.pm
deleted file mode 100644
index e02e3d35a..000000000
--- a/site_perl/UI/CGI.pm
+++ /dev/null
@@ -1,236 +0,0 @@
-package FS::UI::CGI;
-
-use strict;
-use CGI;
-#use CGI::Switch;  #when FS::UID user and preference callback stuff is fixed
-use CGI::Carp qw(fatalsToBrowser);
-use HTML::Table;
-use FS::UID qw(adminsuidsetup);
-#use FS::Record qw( qsearch fields );
-
-die "Can't initialize CGI interface; $FS::UI::Base::_lock used"
-  if $FS::UI::Base::_lock;
-$FS::UI::Base::_lock = "FS::UI::CGI";
-
-=head1 NAME
-
-FS::UI::CGI - Base class for CGI user-interface objects
-
-=head1 SYNOPSIS
-
-  use FS::UI::CGI;
-  use FS::UI::some_table;
-
-  $interface = new FS::UI::some_table;
-
-  $error = $interface->browse;
-  $error = $interface->search;
-  $error = $interface->view;
-  $error = $interface->edit;
-  $error = $interface->process;
-
-=head1 DESCRIPTION
-
-An FS::UI::CGI object represents a CGI interface object.
-
-=head1 METHODS
-
-=over 4
-
-=item new
-
-=cut
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = { @_ };
-
-  $self->{'_cgi'} = new CGI;
-  $self->{'_user'} = $self->{'_cgi'}->remote_user;
-  $self->{'_dbh'} = FS::UID::adminsuidsetup $self->{'_user'};
-
-  bless ( $self, $class);
-}
-
-sub activate {
-  my $self = shift;
-  print $self->_header,
-        join ( "<BR>", map $_->sprint, @{ $self->{'Widgets'} } ),
-        $self->_footer,
-  ;
-}
-
-=item _header
-
-=cut
-
-sub _header {
-  my $self = shift;
-  my $cgi = $self->{'_cgi'};
-
-  $cgi->header( '-expires' => 'now' ), '<HTML>', 
-    '<HEAD><TITLE>', $self->title, '</TITLE></HEAD>',
-    '<BODY BGCOLOR="#ffffff">',
-    '<FONT COLOR="#ff0000" SIZE=7>', $self->title, '</FONT><BR><BR>',
-  ;
-}
-
-=item _footer
-
-=cut
-
-sub _footer {
-  "</BODY></HTML>";
-}
-
-=item interface
-
-Returns the string `CGI'.  Useful for the author of a table-specific UI class
-to conditionally specify certain behaviour.
-
-=cut
-
-sub interface { 'CGI'; }
-
-=back
-
-=cut
-
-package FS::UI::_Widget;
-
-use vars qw( $AUTOLOAD );
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = { @_ };
-  bless ( $self, $class );
-}
-
-sub AUTOLOAD {
-  my $self = shift;
-  my $value = shift;
-  my($field)=$AUTOLOAD;
-  $field =~ s/.*://;
-  if ( defined($value) ) {
-    $self->{$field} = $value;
-  } else {
-    $self->{$field};
-  }    
-}
-
-package FS::UI::_Text;
-
-use vars qw ( @ISA );
-
-@ISA = qw ( FS::UI::_Widget);
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = {};
-  $self->{'_text'} = shift;
-  bless ( $self, $class );
-}
-
-sub sprint {
-  my $self = shift;
-  $self->{'_text'};
-}
-
-package FS::UI::_Link;
-
-use vars qw ( @ISA $BASE_URL );
-
-@ISA = qw ( FS::UI::_Widget);
-$BASE_URL = "http://rootwood.sisd.com/freeside";
-
-sub sprint {
-  my $self = shift;
-  my $table = $self->{'table'};
-  my $method = $self->{'method'};
-
-  # i will be cleaned up when we're done moving from the old webinterface!
-  my @arg = @{$self->{'arg'}};
-  my $yuck = join( "&", @arg);
-  qq(<A HREF="$BASE_URL/$method/$table.cgi?$yuck">). $self->{'text'}. "<\A>";
-}
-
-package FS::UI::_Table;
-
-use vars qw ( @ISA );
-
-@ISA = qw ( FS::UI::_Widget);
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = $class eq $proto ? { @_ } : $proto;
-  bless ( $self, $class );
-  $self->{'_table'} = new HTML::Table ( $self->rows, $self->columns );
-  $self;
-}
-
-sub attach {
-  my $self = shift;
-  my ( $row, $column, $widget, $rowspan, $colspan ) = @_;
-  $self->{"_table"}->setCell( $row+1, $column+1, $widget->sprint );
-  $self->{"_table"}->setCellRowSpan( $row+1, $column+1, $rowspan ) if $rowspan;
-  $self->{"_table"}->setCellColSpan( $row+1, $column+1, $colspan ) if $colspan;
-}
-
-sub sprint {
-  my $self = shift;
-  $self->{'_table'}->getTable;
-}
-
-package FS::UI::_Tableborder;
-
-use vars qw ( @ISA );
-
-@ISA = qw ( FS::UI::_Table );
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = $class eq $proto ? { @_ } : $proto;
-  bless ( $self, $class );
-  $self->SUPER::new(@_);
-  $self->{'_table'}->setBorder;
-  $self;
-}
-
-=head1 VERSION
-
-$Id: CGI.pm,v 1.1 1999-01-20 09:30:36 ivan Exp $
-
-=head1 BUGS
-
-This documentation is incomplete.
-
-In _Tableborder, headers should be links that sort on their fields.
-
-_Link uses a constant $BASE_URL
-
-_Link passes the arguments as a manually-constructed GET string instead
-of POSTing, for compatability while the web interface is upgraded.  Once
-this is done it should pass arguements properly (i.e. as a POST, 8-bit clean)
-
-Still some small bits of widget code same as FS::UI::Gtk.
-
-=head1 SEE ALSO
-
-L<FS::UI::Base>
-
-=head1 HISTORY
-
-$Log: CGI.pm,v $
-Revision 1.1  1999-01-20 09:30:36  ivan
-skeletal cross-UI UI code.
-
-
-=cut
-
-1;
-
diff --git a/site_perl/UI/Gtk.pm b/site_perl/UI/Gtk.pm
deleted file mode 100644
index 498f05a47..000000000
--- a/site_perl/UI/Gtk.pm
+++ /dev/null
@@ -1,221 +0,0 @@
-package FS::UI::Gtk;
-
-use strict;
-use Gtk;
-use FS::UID qw(adminsuidsetup);
-
-die "Can't initialize Gtk interface; $FS::UI::Base::_lock used"
-  if $FS::UI::Base::_lock;
-$FS::UI::Base::_lock = "FS::UI::Gtk";
-
-=head1 NAME
-
-FS::UI::Gtk - Base class for Gtk user-interface objects
-
-=head1 SYNOPSIS
-
-  use FS::UI::Gtk;
-  use FS::UI::some_table;
-
-  $interface = new FS::UI::some_table;
-
-  $error = $interface->browse;
-  $error = $interface->search;
-  $error = $interface->view;
-  $error = $interface->edit;
-  $error = $interface->process;
-
-=head1 DESCRIPTION
-
-An FS::UI::Gtk object represents a Gtk user interface object.
-
-=head1 METHODS
-
-=over 4
-
-=item new
-
-=cut
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = { @_ };
-
-  bless ( $self, $class );
-
-  $self->{'_user'} = 'ivan'; #Pop up login window?
-  $self->{'_dbh'} = FS::UID::adminsuidsetup $self->{'_user'};
-
-
-
-  $self;
-}
-
-sub activate {
-  my $self = shift;
-
-  my $vbox = new Gtk::VBox ( 0, 4 );
-
-  foreach my $widget ( @{ $self->{'Widgets'} } ) {
-    $widget->_gtk->show;
-    $vbox->pack_start ( $widget->_gtk, 1, 1, 4 );
-  }
-  $vbox->show;
-
-  my $window = new Gtk::Window "toplevel";
-  $self->{'_gtk'} = $window;
-  $window->set_title( $self->title );
-  $window->add ( $vbox );
-  $window->show;
-  main Gtk;
-}
-
-=item interface
-
-Returns the string `Gtk'.  Useful for the author of a table-specific UI class
-to conditionally specify certain behaviour.
-
-=cut 
-
-sub interface { 'Gtk'; }
-
-=back
-
-=cut
-
-package FS::UI::_Widget;
-
-use vars qw( $AUTOLOAD );
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = { @_ };
-  bless ( $self, $class );
-}
-
-sub _gtk {
-  my $self = shift;
-  $self->{'_gtk'};
-}
-
-sub AUTOLOAD {
-  my $self = shift;
-  my $value = shift;
-  my($field)=$AUTOLOAD;
-  $field =~ s/.*://;
-  if ( defined($value) ) {
-    $self->{$field} = $value;
-  } else {
-    $self->{$field};
-  }    
-}
-
-package FS::UI::_Text;
-
-use vars qw ( @ISA );
-
-@ISA = qw ( FS::UI::_Widget );
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = {};
-  $self->{'_gtk'} = new Gtk::Label ( shift );
-  bless ( $self, $class );
-}
-
-package FS::UI::_Link;
-
-use vars qw ( @ISA );
-
-@ISA = qw ( FS::UI::_Widget );
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = { @_ };
-  $self->{'_gtk'} = new_with_label Gtk::Button ( $self->{'text'} );
-  $self->{'_gtk'}->signal_connect( 'clicked', sub {
-      print "STUB: (Gtk) FS::UI::_Link";
-    }, "hi", "there" );
-  bless ( $self, $class );
-}
-
-
-package FS::UI::_Table;
-
-use vars qw ( @ISA );
-
-@ISA = qw ( FS::UI::_Widget );
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = { @_ };
-  bless ( $self, $class );
-
-  $self->{'_gtk'} = new Gtk::Table (
-    $self->rows,
-    $self->columns,
-    0, #homogeneous
-  );
-
-  $self;
-}
-
-sub attach {
-  my $self = shift;
-  my ( $row, $column, $widget, $rowspan, $colspan ) = @_;
-  $rowspan ||= 1;
-  $colspan ||= 1;
-  $self->_gtk->attach_defaults(
-    $widget->_gtk,
-    $column,
-    $column + $colspan,
-    $row,
-    $row + $rowspan,
-  );
-  $widget->_gtk->show;
-}
-
-package FS::UI::_Tableborder;
-
-use vars qw ( @ISA );
-
-@ISA = qw ( FS::UI::_Table );
-
-=head1 VERSION
-
-$Id: Gtk.pm,v 1.1 1999-01-20 09:30:36 ivan Exp $
-
-=head1 BUGS
-
-This documentation is incomplete.
-
-_Tableborder is just a _Table now.  _Tableborders should scroll (but not the
-headers) and need and need more decoration. (data in white section ala gtksql
-and sliding field widths) headers should be buttons that callback to sort on
-their fields.
-
-There should be a persistant, per-(freeside)-user store for window positions
-and sizes and sort fields etc (see L<FS::UI::CGI/BUGS>.
-
-Still some small bits of widget code same as FS::UI::CGI.
-
-=head1 SEE ALSO
-
-L<FS::UI::Base>
-
-=head1 HISTORY
-
-$Log: Gtk.pm,v $
-Revision 1.1  1999-01-20 09:30:36  ivan
-skeletal cross-UI UI code.
-
-
-=cut
-
-1;
-
diff --git a/site_perl/UI/agent.pm b/site_perl/UI/agent.pm
deleted file mode 100644
index ce9744a55..000000000
--- a/site_perl/UI/agent.pm
+++ /dev/null
@@ -1,62 +0,0 @@
-package FS::UI::agent;
-
-use strict;
-use vars qw ( @ISA );
-use FS::UI::Base;
-use FS::Record qw( qsearchs );
-use FS::agent;
-use FS::agent_type;
-
-@ISA = qw ( FS::UI::Base );
-
-sub db_table { 'agent' };
-
-sub db_name { 'Agent' };
-
-sub db_description { <<END;
-Agents are resellers of your service. Agents may be limited to a subset of your
-full offerings (via their type).
-END
-}
-
-sub list_fields {
-  'agentnum',
-  'typenum',
-#  'freq',
-#  'prog',
-; }
-
-sub list_header {
-  'Agent',
-  'Type',
-#  'Freq (n/a)',
-#  'Prog (n/a)',
-; }
-
-sub db_callback { 
-  'agentnum' =>
-    sub {
-      my ( $agentnum, $record ) = @_;
-      my $agent = $record->agent;
-      new FS::UI::_Link (
-        'table'  => 'agent',
-        'method' => 'edit',
-        'arg'    => [ $agentnum ],
-        'text'   => "$agentnum: $agent",
-      );
-    },
-  'typenum' =>
-    sub {
-      my $typenum = shift;
-      my $agent_type = qsearchs( 'agent_type', { 'typenum' => $typenum } );
-      my $atype = $agent_type->atype;
-      new FS::UI::_Link (
-        'table'  => 'agent_type',
-        'method' => 'edit',
-        'arg'    => [ $typenum ],
-        'text'   => "$typenum: $atype"
-      );
-    },
-}
-
-1;
-- 
cgit v1.2.1


From 6981a417a49264fd4e03dc0167e070f7a4c128e1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Aug 1999 08:03:03 +0000
Subject: move table subclass examples out of production directory

---
 eg/table_template-svc.pm | 180 +++++++++++++++++++++++++++++++++++++++++++++++
 eg/table_template.pm     | 137 ++++++++++++++++++++++++++++++++++++
 2 files changed, 317 insertions(+)
 create mode 100644 eg/table_template-svc.pm
 create mode 100644 eg/table_template.pm

diff --git a/eg/table_template-svc.pm b/eg/table_template-svc.pm
new file mode 100644
index 000000000..a4f5028f5
--- /dev/null
+++ b/eg/table_template-svc.pm
@@ -0,0 +1,180 @@
+package FS::svc_table;
+
+use strict;
+use vars qw(@ISA);
+#use FS::Record qw( qsearch qsearchs );
+use FS::svc_Common;
+use FS::cust_svc;
+
+@ISA = qw(svc_Common);
+
+=head1 NAME
+
+FS::table_name - Object methods for table_name records
+
+=head1 SYNOPSIS
+
+  use FS::table_name;
+
+  $record = new FS::table_name \%hash;
+  $record = new FS::table_name { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $error = $record->suspend;
+
+  $error = $record->unsuspend;
+
+  $error = $record->cancel;
+
+=head1 DESCRIPTION
+
+An FS::table_name object represents an example.  FS::table_name inherits from
+FS::svc_Common.  The following fields are currently supported:
+
+=over 4
+
+=item field - description
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new example.  To add the example to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub table { 'table_name'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
+defined.  An FS::cust_svc record will be created and inserted.
+
+=cut
+
+sub insert {
+  my $self = shift;
+  my $error;
+
+  $error = $self->SUPER::insert;
+  return $error if $error;
+
+  '';
+}
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+sub delete {
+  my $self = shift;
+  my $error;
+
+  $error = $self->SUPER::delete;
+  return $error if $error;
+
+  '';
+}
+
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my ( $new, $old ) = ( shift, shift );
+  my $error;
+
+  $error = $new->SUPER::replace($old);
+  return $error if $error;
+
+  '';
+}
+
+=item suspend
+
+Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item unsuspend
+
+Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item cancel
+
+Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $x = $self->setfixed;
+  return $x unless ref($x);
+  my $part_svc = $x;
+
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: table_template-svc.pm,v 1.1 1999-08-04 08:03:03 ivan Exp $
+
+=head1 BUGS
+
+The author forgot to customize this manpage.
+
+=head1 SEE ALSO
+
+L<FS::svc_Common>, L<FS::Record>, L<FS::cust_svc>, L<FS::part_svc>,
+L<FS::cust_pkg>, schema.html from the base documentation.
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jul-21
+
+$Log: table_template-svc.pm,v $
+Revision 1.1  1999-08-04 08:03:03  ivan
+move table subclass examples out of production directory
+
+Revision 1.4  1998/12/30 00:30:48  ivan
+svc_ stuff is more properly OO - has a common superclass FS::svc_Common
+
+Revision 1.2  1998/11/15 04:33:01  ivan
+updates for newest versoin
+
+
+=cut
+
+1;
+
diff --git a/eg/table_template.pm b/eg/table_template.pm
new file mode 100644
index 000000000..7f74ac342
--- /dev/null
+++ b/eg/table_template.pm
@@ -0,0 +1,137 @@
+package FS::table_name;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::table_name - Object methods for table_name records
+
+=head1 SYNOPSIS
+
+  use FS::table_name;
+
+  $record = new FS::table_name \%hash;
+  $record = new FS::table_name { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::table_name object represents an example.  FS::table_name inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item field - description
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new example.  To add the example to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'table_name'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: table_template.pm,v 1.1 1999-08-04 08:03:03 ivan Exp $
+
+=head1 BUGS
+
+The author forgot to customize this manpage.
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jul-1
+
+added hfields
+ivan@sisd.com 97-nov-13
+
+$Log: table_template.pm,v $
+Revision 1.1  1999-08-04 08:03:03  ivan
+move table subclass examples out of production directory
+
+Revision 1.4  1998/12/29 11:59:57  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+Revision 1.3  1998/11/15 04:33:00  ivan
+updates for newest versoin
+
+Revision 1.2  1998/11/15 03:48:49  ivan
+update for current version
+
+
+=cut
+
+1;
+
-- 
cgit v1.2.1


From 6cd87c0d3b5280446301c647fa5f1ec5a593fa3f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Aug 1999 09:03:53 +0000
Subject: initial checkin of module files for proper perl installation

---
 FS/FS/Bill.pm              |  21 +
 FS/FS/CGI.pm               | 211 ++++++++++
 FS/FS/Conf.pm              | 112 ++++++
 FS/FS/Invoice.pm           |  22 ++
 FS/FS/Record.pm            | 876 ++++++++++++++++++++++++++++++++++++++++
 FS/FS/SSH.pm               | 146 +++++++
 FS/FS/UI/Base.pm           | 194 +++++++++
 FS/FS/UI/CGI.pm            | 239 +++++++++++
 FS/FS/UI/Gtk.pm            | 224 +++++++++++
 FS/FS/UI/agent.pm          |  62 +++
 FS/FS/UID.pm               | 266 +++++++++++++
 FS/FS/agent.pm             | 160 ++++++++
 FS/FS/agent_type.pm        | 165 ++++++++
 FS/FS/cust_bill.pm         | 450 +++++++++++++++++++++
 FS/FS/cust_bill_pkg.pm     | 144 +++++++
 FS/FS/cust_credit.pm       | 174 ++++++++
 FS/FS/cust_main.pm         | 965 +++++++++++++++++++++++++++++++++++++++++++++
 FS/FS/cust_main_county.pm  | 111 ++++++
 FS/FS/cust_main_invoice.pm | 181 +++++++++
 FS/FS/cust_pay.pm          | 188 +++++++++
 FS/FS/cust_pay_batch.pm    | 205 ++++++++++
 FS/FS/cust_pkg.pm          | 518 ++++++++++++++++++++++++
 FS/FS/cust_refund.pm       | 187 +++++++++
 FS/FS/cust_svc.pm          | 167 ++++++++
 FS/FS/dbdef.pm             | 140 +++++++
 FS/FS/dbdef_colgroup.pm    |  95 +++++
 FS/FS/dbdef_column.pm      | 174 ++++++++
 FS/FS/dbdef_index.pm       |  35 ++
 FS/FS/dbdef_table.pm       | 235 +++++++++++
 FS/FS/dbdef_unique.pm      |  36 ++
 FS/FS/part_pkg.pm          | 186 +++++++++
 FS/FS/part_referral.pm     | 110 ++++++
 FS/FS/part_svc.pm          | 165 ++++++++
 FS/FS/pkg_svc.pm           | 152 +++++++
 FS/FS/svc_Common.pm        | 204 ++++++++++
 FS/FS/svc_acct.pm          | 468 ++++++++++++++++++++++
 FS/FS/svc_acct_pop.pm      | 111 ++++++
 FS/FS/svc_acct_sm.pm       | 252 ++++++++++++
 FS/FS/svc_domain.pm        | 421 ++++++++++++++++++++
 FS/FS/type_pkgs.pm         | 113 ++++++
 FS/MANIFEST                |  42 ++
 FS/MANIFEST.SKIP           |   1 +
 FS/README                  |   6 +
 43 files changed, 8934 insertions(+)
 create mode 100644 FS/FS/Bill.pm
 create mode 100644 FS/FS/CGI.pm
 create mode 100644 FS/FS/Conf.pm
 create mode 100644 FS/FS/Invoice.pm
 create mode 100644 FS/FS/Record.pm
 create mode 100644 FS/FS/SSH.pm
 create mode 100644 FS/FS/UI/Base.pm
 create mode 100644 FS/FS/UI/CGI.pm
 create mode 100644 FS/FS/UI/Gtk.pm
 create mode 100644 FS/FS/UI/agent.pm
 create mode 100644 FS/FS/UID.pm
 create mode 100644 FS/FS/agent.pm
 create mode 100644 FS/FS/agent_type.pm
 create mode 100644 FS/FS/cust_bill.pm
 create mode 100644 FS/FS/cust_bill_pkg.pm
 create mode 100644 FS/FS/cust_credit.pm
 create mode 100644 FS/FS/cust_main.pm
 create mode 100644 FS/FS/cust_main_county.pm
 create mode 100644 FS/FS/cust_main_invoice.pm
 create mode 100644 FS/FS/cust_pay.pm
 create mode 100644 FS/FS/cust_pay_batch.pm
 create mode 100644 FS/FS/cust_pkg.pm
 create mode 100644 FS/FS/cust_refund.pm
 create mode 100644 FS/FS/cust_svc.pm
 create mode 100644 FS/FS/dbdef.pm
 create mode 100644 FS/FS/dbdef_colgroup.pm
 create mode 100644 FS/FS/dbdef_column.pm
 create mode 100644 FS/FS/dbdef_index.pm
 create mode 100644 FS/FS/dbdef_table.pm
 create mode 100644 FS/FS/dbdef_unique.pm
 create mode 100644 FS/FS/part_pkg.pm
 create mode 100644 FS/FS/part_referral.pm
 create mode 100644 FS/FS/part_svc.pm
 create mode 100644 FS/FS/pkg_svc.pm
 create mode 100644 FS/FS/svc_Common.pm
 create mode 100644 FS/FS/svc_acct.pm
 create mode 100644 FS/FS/svc_acct_pop.pm
 create mode 100644 FS/FS/svc_acct_sm.pm
 create mode 100644 FS/FS/svc_domain.pm
 create mode 100644 FS/FS/type_pkgs.pm
 create mode 100644 FS/MANIFEST.SKIP
 create mode 100644 FS/README

diff --git a/FS/FS/Bill.pm b/FS/FS/Bill.pm
new file mode 100644
index 000000000..11c8121c6
--- /dev/null
+++ b/FS/FS/Bill.pm
@@ -0,0 +1,21 @@
+package FS::Bill;
+
+use strict;
+use vars qw(@ISA);
+use FS::cust_main;
+
+@ISA = qw(FS::cust_main);
+
+warn "FS::Bill depriciated\n";
+
+=head1 NAME
+
+FS::Bill - Legacy stub
+
+=head1 SYNOPSIS
+
+The functionality of FS::Bill has been integrated into FS::cust_main.
+
+=cut
+
+1;
diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
new file mode 100644
index 000000000..3577c14b8
--- /dev/null
+++ b/FS/FS/CGI.pm
@@ -0,0 +1,211 @@
+package FS::CGI;
+
+use strict;
+use vars qw(@EXPORT_OK @ISA);
+use Exporter;
+use CGI;
+use URI::URL;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID;
+
+@ISA = qw(Exporter);
+@EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable);
+
+=head1 NAME
+
+FS::CGI - Subroutines for the web interface
+
+=head1 SYNOPSIS
+
+  use FS::CGI qw(header menubar idiot eidiot popurl);
+
+  print header( 'Title', '' );
+  print header( 'Title', menubar('item', 'URL', ... ) );
+
+  idiot "error message"; 
+  eidiot "error message";
+
+  $url = popurl; #returns current url
+  $url = popurl(3); #three levels up
+
+=head1 DESCRIPTION
+
+Provides a few common subroutines for the web interface.
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item header TITLE, MENUBAR
+
+Returns an HTML header.
+
+=cut
+
+sub header {
+  my($title,$menubar)=@_;
+
+  my $x =  <<END;
+    <HTML>
+      <HEAD>
+        <TITLE>
+          $title
+        </TITLE>
+      </HEAD>
+      <BODY BGCOLOR="#e8e8e8">
+          <FONT SIZE=7>
+            $title
+          </FONT>
+          <BR><BR>
+END
+  $x .=  $menubar. "<BR><BR>" if $menubar;
+  $x;
+}
+
+=item menubar ITEM, URL, ...
+
+Returns an HTML menubar.
+
+=cut
+
+sub menubar { #$menubar=menubar('Main Menu', '../', 'Item', 'url', ... );
+  my($item,$url,@html);
+  while (@_) {
+    ($item,$url)=splice(@_,0,2);
+    push @html, qq!<A HREF="$url">$item</A>!;
+  }
+  join(' | ',@html);
+}
+
+=item idiot ERROR
+
+This is depriciated.  Don't use it.
+
+Sends headers and an HTML error message.
+
+=cut
+
+sub idiot {
+  #warn "idiot depriciated";
+  my($error)=@_;
+  my $cgi = &FS::UID::cgi();
+  if ( $cgi->isa('CGI::Base') ) {
+    no strict 'subs';
+    &CGI::Base::SendHeaders;
+  } else {
+    print $cgi->header( '-expires' => 'now' );
+  }
+  print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Error processing your request</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+    <H4>Error processing your request</H4>
+    </CENTER>
+    Your request could not be processed because of the following error:
+    <P><B>$error</B>
+  </BODY>
+</HTML>
+END
+
+}
+
+=item eidiot ERROR
+
+This is depriciated.  Don't use it.
+
+Sends headers and an HTML error message, then exits.
+
+=cut
+
+sub eidiot {
+  #warn "eidiot depriciated";
+  idiot(@_);
+  exit;
+}
+
+=item popurl LEVEL
+
+Returns current URL with LEVEL levels of path removed from the end (default 0).
+
+=cut
+
+sub popurl {
+  my($up)=@_;
+  my($cgi)=&FS::UID::cgi;
+  my($url)=new URI::URL $cgi->url;
+  my(@path)=$url->path_components;
+  splice @path, 0-$up;
+  $url->path_components(@path);
+  my $x = $url->as_string;
+  $x .= '/' unless $x =~ /\/$/;
+  $x;
+}
+
+=item table
+
+Returns HTML tag for beginning a table.
+
+=cut
+
+sub table {
+  my $col = shift;
+  if ( $col ) {
+    qq!<TABLE BGCOLOR="$col" BORDER=1 WIDTH="100%">!;
+  } else { 
+    "<TABLE BORDER=1>";
+  }
+}
+
+=item itable
+
+Returns HTML tag for beginning an (invisible) table.
+
+=cut
+
+sub itable {
+  my $col = shift;
+  my $cellspacing = shift || 0;
+  if ( $col ) {
+    qq!<TABLE BGCOLOR="$col" BORDER=0 CELLSPACING=$cellspacing WIDTH="100%">!;
+  } else {
+    qq!<TABLE BORDER=0 CELLSPACING=$cellspacing WIDTH="100%">!;
+  }
+}
+
+=item ntable
+
+This is getting silly.
+
+=cut
+
+sub ntable {
+  my $col = shift;
+  my $cellspacing = shift || 0;
+  if ( $col ) {
+    qq!<TABLE BGCOLOR="$col" BORDER=0 CELLSPACING=$cellspacing>!;
+  } else {
+    "<TABLE BORDER>";
+  }
+
+}
+
+=back
+
+=head1 BUGS
+
+Not OO.
+
+Not complete.
+
+=head1 SEE ALSO
+
+L<CGI>, L<CGI::Base>
+
+=cut
+
+1;
+
+
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
new file mode 100644
index 000000000..7c6105bdc
--- /dev/null
+++ b/FS/FS/Conf.pm
@@ -0,0 +1,112 @@
+package FS::Conf;
+
+use vars qw($default_dir);
+use IO::File;
+
+=head1 NAME
+
+FS::Conf - Read access to Freeside configuration values
+
+=head1 SYNOPSIS
+
+  use FS::Conf;
+
+  $conf = new FS::Conf "/config/directory";
+
+  $FS::Conf::default_dir = "/config/directory";
+  $conf = new FS::Conf;
+
+  $dir = $conf->dir;
+
+  $value = $conf->config('key');
+  @list  = $conf->config('key');
+  $bool  = $conf->exists('key');
+
+=head1 DESCRIPTION
+
+Read access to Freeside configuration values.  Keys currently map to filenames,
+but this may change in the future.
+
+=head1 METHODS
+
+=over 4
+
+=item new [ DIRECTORY ]
+
+Create a new configuration object.  A directory arguement is required if
+$FS::Conf::default_dir has not been set.
+
+=cut
+
+sub new {
+  my($proto,$dir) = @_;
+  my($class) = ref($proto) || $proto;
+  my($self) = { 'dir' => $dir || $default_dir } ;
+  bless ($self, $class);
+}
+
+=item dir
+
+Returns the directory.
+
+=cut
+
+sub dir {
+  my($self) = @_;
+  my $dir = $self->{dir};
+  -e $dir or die "FATAL: $dir doesn't exist!";
+  -d $dir or die "FATAL: $dir isn't a directory!";
+  -r $dir or die "FATAL: Can't read $dir!";
+  -x $dir or die "FATAL: $dir not searchable (executable)!";
+  $dir;
+}
+
+=item config 
+
+Returns the configuration value or values (depending on context) for key.
+
+=cut
+
+sub config {
+  my($self,$file)=@_;
+  my($dir)=$self->dir;
+  my $fh = new IO::File "<$dir/$file" or return;
+  if ( wantarray ) {
+    map {
+      /^(.*)$/
+        or die "Illegal line (array context) in $dir/$file:\n$_\n";
+      $1;
+    } <$fh>;
+  } else {
+    <$fh> =~ /^(.*)$/
+      or die "Illegal line (scalar context) in $dir/$file:\n$_\n";
+    $1;
+  }
+}
+
+=item exists
+
+Returns true if the specified key exists, even if the corresponding value
+is undefined.
+
+=cut
+
+sub exists {
+  my($self,$file)=@_;
+  my($dir) = $self->dir;
+  -e "$dir/$file";
+}
+
+=back
+
+=head1 BUGS
+
+Write access (with locking) should be implemented.
+
+=head1 SEE ALSO
+
+config.html from the base documentation contains a list of configuration files.
+
+=cut
+
+1;
diff --git a/FS/FS/Invoice.pm b/FS/FS/Invoice.pm
new file mode 100644
index 000000000..11894a6ad
--- /dev/null
+++ b/FS/FS/Invoice.pm
@@ -0,0 +1,22 @@
+package FS::Invoice;
+
+use strict;
+use vars qw(@ISA);
+use FS::cust_bill;
+
+@ISA = qw(FS::cust_bill);
+
+warn "FS::Invoice depriciated\n";
+
+=head1 NAME
+
+FS::Invoice - Legacy stub
+
+=head1 SYNOPSIS
+
+The functionality of FS::Invoice has been integrated in FS::cust_bill.
+
+=cut
+
+1;
+
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
new file mode 100644
index 000000000..f5f928210
--- /dev/null
+++ b/FS/FS/Record.pm
@@ -0,0 +1,876 @@
+package FS::Record;
+
+use strict;
+use vars qw($dbdef_file $dbdef $setup_hack $AUTOLOAD @ISA @EXPORT_OK);
+use subs qw(reload_dbdef);
+use Exporter;
+use Carp qw(carp cluck croak confess);
+use File::CounterFile;
+use FS::UID qw(dbh checkruid swapuid getotaker datasrc);
+use FS::dbdef;
+
+@ISA = qw(Exporter);
+@EXPORT_OK = qw(dbh fields hfields qsearch qsearchs dbdef);
+
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::Record'} = sub { 
+  $File::CounterFile::DEFAULT_DIR = "/usr/local/etc/freeside/counters.". datasrc;
+  $dbdef_file = "/usr/local/etc/freeside/dbdef.". datasrc;
+  &reload_dbdef unless $setup_hack; #$setup_hack needed now?
+};
+
+=head1 NAME
+
+FS::Record - Database record objects
+
+=head1 SYNOPSIS
+
+    use FS::Record;
+    use FS::Record qw(dbh fields qsearch qsearchs dbdef);
+
+    $record = new FS::Record 'table', \%hash;
+    $record = new FS::Record 'table', { 'column' => 'value', ... };
+
+    $record  = qsearchs FS::Record 'table', \%hash;
+    $record  = qsearchs FS::Record 'table', { 'column' => 'value', ... };
+    @records = qsearch  FS::Record 'table', \%hash; 
+    @records = qsearch  FS::Record 'table', { 'column' => 'value', ... };
+
+    $table = $record->table;
+    $dbdef_table = $record->dbdef_table;
+
+    $value = $record->get('column');
+    $value = $record->getfield('column');
+    $value = $record->column;
+
+    $record->set( 'column' => 'value' );
+    $record->setfield( 'column' => 'value' );
+    $record->column('value');
+
+    %hash = $record->hash;
+
+    $hashref = $record->hashref;
+
+    $error = $record->insert;
+    #$error = $record->add; #depriciated
+
+    $error = $record->delete;
+    #$error = $record->del; #depriciated
+
+    $error = $new_record->replace($old_record);
+    #$error = $new_record->rep($old_record); #depriciated
+
+    $value = $record->unique('column');
+
+    $value = $record->ut_float('column');
+    $value = $record->ut_number('column');
+    $value = $record->ut_numbern('column');
+    $value = $record->ut_money('column');
+    $value = $record->ut_text('column');
+    $value = $record->ut_textn('column');
+    $value = $record->ut_alpha('column');
+    $value = $record->ut_alphan('column');
+    $value = $record->ut_phonen('column');
+    $value = $record->ut_anythingn('column');
+
+    $dbdef = reload_dbdef;
+    $dbdef = reload_dbdef "/non/standard/filename";
+    $dbdef = dbdef;
+
+    $quoted_value = _quote($value,'table','field');
+
+    #depriciated
+    $fields = hfields('table');
+    if ( $fields->{Field} ) { # etc.
+
+    @fields = fields 'table'; #as a subroutine
+    @fields = $record->fields; #as a method call
+
+
+=head1 DESCRIPTION
+
+(Mostly) object-oriented interface to database records.  Records are currently
+implemented on top of DBI.  FS::Record is intended as a base class for
+table-specific classes to inherit from, i.e. FS::cust_main.
+
+=head1 CONSTRUCTORS
+
+=over 4
+
+=item new [ TABLE, ] HASHREF
+
+Creates a new record.  It doesn't store it in the database, though.  See
+L<"insert"> for that.
+
+Note that the object stores this hash reference, not a distinct copy of the
+hash it points to.  You can ask the object for a copy with the I<hash> 
+method.
+
+TABLE can only be omitted when a dervived class overrides the table method.
+
+=cut
+
+sub new { 
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = {};
+  bless ($self, $class);
+
+  $self->{'Table'} = shift unless defined ( $self->table );
+
+  my $hashref = $self->{'Hash'} = shift;
+
+  foreach my $field ( $self->fields ) { 
+    $hashref->{$field}='' unless defined $hashref->{$field};
+    #trim the '$' and ',' from money fields for Pg (belong HERE?)
+    #(what about Pg i18n?)
+    if ( datasrc =~ m/Pg/ 
+         && $self->dbdef_table->column($field)->type eq 'money' ) {
+      ${$hashref}{$field} =~ s/^\$//;
+      ${$hashref}{$field} =~ s/\,//;
+    }
+  }
+
+  $self;
+}
+
+sub create {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = {};
+  bless ($self, $class);
+  if ( defined $self->table ) {
+    cluck "create constructor is depriciated, use new!";
+    $self->new(@_);
+  } else {
+    croak "FS::Record::create called (not from a subclass)!";
+  }
+}
+
+=item qsearch TABLE, HASHREF
+
+Searches the database for all records matching (at least) the key/value pairs
+in HASHREF.  Returns all the records found as `FS::TABLE' objects if that
+module is loaded (i.e. via `use FS::cust_main;'), otherwise returns FS::Record
+objects.
+
+=cut
+
+sub qsearch {
+  my($table,$record) = @_;
+  my($dbh) = dbh;
+
+  my(@fields)=grep exists($record->{$_}), fields($table);
+
+  my($sth);
+  my($statement) = "SELECT * FROM $table". ( @fields
+    ? " WHERE ". join(' AND ',
+      map {
+        $record->{$_} eq ''
+          ? ( datasrc =~ m/Pg/
+                ? "$_ IS NULL"
+                : "( $_ IS NULL OR $_ = \"\" )"
+            )
+          : "$_ = ". _quote($record->{$_},$table,$_)
+      } @fields
+    ) : ''
+  );
+  $sth=$dbh->prepare($statement)
+    or croak $dbh->errstr; #is that a little too harsh?  hmm.
+  #warn $statement #if $debug # or some such;
+
+  if ( eval ' scalar(@FS::'. $table. '::ISA);' ) {
+    map {
+      eval 'new FS::'. $table. ' ( $sth->fetchrow_hashref );';
+    } ( 1 .. $sth->execute );
+  } else {
+    cluck "qsearch: warning: FS::$table not loaded; returning generic FS::Record objects";
+    map {
+      new FS::Record ($table,$sth->fetchrow_hashref);
+    } ( 1 .. $sth->execute );
+  }
+
+}
+
+=item qsearchs TABLE, HASHREF
+
+Same as qsearch, except that if more than one record matches, it B<carp>s but
+returns the first.  If this happens, you either made a logic error in asking
+for a single item, or your data is corrupted.
+
+=cut
+
+sub qsearchs { # $result_record = &FS::Record:qsearchs('table',\%hash);
+  my(@result) = qsearch(@_);
+  carp "warning: Multiple records in scalar search!" if scalar(@result) > 1;
+    #should warn more vehemently if the search was on a primary key?
+  $result[0];
+}
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item table
+
+Returns the table name.
+
+=cut
+
+sub table {
+#  cluck "warning: FS::Record::table depriciated; supply one in subclass!";
+  my $self = shift;
+  $self -> {'Table'};
+}
+
+=item dbdef_table
+
+Returns the FS::dbdef_table object for the table.
+
+=cut
+
+sub dbdef_table {
+  my($self)=@_;
+  my($table)=$self->table;
+  $dbdef->table($table);
+}
+
+=item get, getfield COLUMN
+
+Returns the value of the column/field/key COLUMN.
+
+=cut
+
+sub get {
+  my($self,$field) = @_;
+  # to avoid "Use of unitialized value" errors
+  if ( defined ( $self->{Hash}->{$field} ) ) {
+    $self->{Hash}->{$field};
+  } else { 
+    '';
+  }
+}
+sub getfield {
+  my $self = shift;
+  $self->get(@_);
+}
+
+=item set, setfield COLUMN, VALUE
+
+Sets the value of the column/field/key COLUMN to VALUE.  Returns VALUE.
+
+=cut
+
+sub set { 
+  my($self,$field,$value) = @_;
+  $self->{'Hash'}->{$field} = $value;
+}
+sub setfield {
+  my $self = shift;
+  $self->set(@_);
+}
+
+=item AUTLOADED METHODS
+
+$record->column is a synonym for $record->get('column');
+
+$record->column('value') is a synonym for $record->set('column','value');
+
+=cut
+
+sub AUTOLOAD {
+  my($self,$value)=@_;
+  my($field)=$AUTOLOAD;
+  $field =~ s/.*://;
+  if ( defined($value) ) {
+    $self->setfield($field,$value);
+  } else {
+    $self->getfield($field);
+  }    
+}
+
+=item hash
+
+Returns a list of the column/value pairs, usually for assigning to a new hash.
+
+To make a distinct duplicate of an FS::Record object, you can do:
+
+    $new = new FS::Record ( $old->table, { $old->hash } );
+
+=cut
+
+sub hash {
+  my($self) = @_;
+  %{ $self->{'Hash'} }; 
+}
+
+=item hashref
+
+Returns a reference to the column/value hash.
+
+=cut
+
+sub hashref {
+  my($self) = @_;
+  $self->{'Hash'};
+}
+
+=item insert
+
+Inserts this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub insert {
+  my $self = shift;
+
+  my $error = $self->check;
+  return $error if $error;
+
+  #single-field unique keys are given a value if false
+  #(like MySQL's AUTO_INCREMENT)
+  foreach ( $self->dbdef_table->unique->singles ) {
+    $self->unique($_) unless $self->getfield($_);
+  }
+  #and also the primary key
+  my $primary_key = $self->dbdef_table->primary_key;
+  $self->unique($primary_key) 
+    if $primary_key && ! $self->getfield($primary_key);
+
+  my @fields =
+    grep defined($self->getfield($_)) && $self->getfield($_) ne "",
+    $self->fields
+  ;
+
+  my $statement = "INSERT INTO ". $self->table. " ( ".
+      join(', ',@fields ).
+    ") VALUES (".
+      join(', ',map(_quote($self->getfield($_),$self->table,$_), @fields)).
+    ")"
+  ;
+  my $sth = dbh->prepare($statement) or return dbh->errstr;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE'; 
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  $sth->execute or return $sth->errstr;
+
+  '';
+}
+
+=item add
+
+Depriciated (use insert instead).
+
+=cut
+
+sub add {
+  cluck "warning: FS::Record::add depriciated!";
+  insert @_; #call method in this scope
+}
+
+=item delete
+
+Delete this record from the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub delete {
+  my $self = shift;
+
+  my($statement)="DELETE FROM ". $self->table. " WHERE ". join(' AND ',
+    map {
+      $self->getfield($_) eq ''
+        #? "( $_ IS NULL OR $_ = \"\" )"
+        ? ( datasrc =~ m/Pg/
+              ? "$_ IS NULL"
+              : "( $_ IS NULL OR $_ = \"\" )"
+          )
+        : "$_ = ". _quote($self->getfield($_),$self->table,$_)
+    } ( $self->dbdef_table->primary_key )
+          ? ( $self->dbdef_table->primary_key)
+          : $self->fields
+  );
+  my $sth = dbh->prepare($statement) or return dbh->errstr;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE'; 
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $rc = $sth->execute or return $sth->errstr;
+  #not portable #return "Record not found, statement:\n$statement" if $rc eq "0E0";
+
+  undef $self; #no need to keep object!
+
+  '';
+}
+
+=item del
+
+Depriciated (use delete instead).
+
+=cut
+
+sub del {
+  cluck "warning: FS::Record::del depriciated!";
+  &delete(@_); #call method in this scope
+}
+
+=item replace OLD_RECORD
+
+Replace the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my ( $new, $old ) = ( shift, shift );
+
+  my @diff = grep $new->getfield($_) ne $old->getfield($_), $old->fields;
+  unless ( @diff ) {
+    carp "warning: records identical";
+    return '';
+  }
+
+  return "Records not in same table!" unless $new->table eq $old->table;
+
+  my $primary_key = $old->dbdef_table->primary_key;
+  return "Can't change $primary_key"
+    if $primary_key
+       && ( $old->getfield($primary_key) ne $new->getfield($primary_key) );
+
+  my $error = $new->check;
+  return $error if $error;
+
+  my $statement = "UPDATE ". $old->table. " SET ". join(', ',
+    map {
+      "$_ = ". _quote($new->getfield($_),$old->table,$_) 
+    } @diff
+  ). ' WHERE '.
+    join(' AND ',
+      map {
+        $old->getfield($_) eq ''
+          #? "( $_ IS NULL OR $_ = \"\" )"
+          ? ( datasrc =~ m/Pg/
+                ? "$_ IS NULL"
+                : "( $_ IS NULL OR $_ = \"\" )"
+            )
+          : "$_ = ". _quote($old->getfield($_),$old->table,$_)
+      } ( $primary_key ? ( $primary_key ) : $old->fields )
+    )
+  ;
+  my $sth = dbh->prepare($statement) or return dbh->errstr;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE'; 
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $rc = $sth->execute or return $sth->errstr;
+  #not portable #return "Record not found (or records identical)." if $rc eq "0E0";
+
+  '';
+
+}
+
+=item rep
+
+Depriciated (use replace instead).
+
+=cut
+
+sub rep {
+  cluck "warning: FS::Record::rep depriciated!";
+  replace @_; #call method in this scope
+}
+
+=item check
+
+Not yet implemented, croaks.  Derived classes should provide a check method.
+
+=cut
+
+sub check {
+  confess "FS::Record::check not implemented; supply one in subclass!";
+}
+
+=item unique COLUMN
+
+Replaces COLUMN in record with a unique number.  Called by the B<add> method
+on primary keys and single-field unique columns (see L<FS::dbdef_table>).
+Returns the new value.
+
+=cut
+
+sub unique {
+  my($self,$field) = @_;
+  my($table)=$self->table;
+
+  croak("&FS::UID::checkruid failed") unless &checkruid;
+
+  croak "Unique called on field $field, but it is ",
+        $self->getfield($field),
+        ", not null!"
+    if $self->getfield($field);
+
+  #warn "table $table is tainted" if is_tainted($table);
+  #warn "field $field is tainted" if is_tainted($field);
+
+  &swapuid;
+  my($counter) = new File::CounterFile "$table.$field",0;
+# hack for web demo
+#  getotaker() =~ /^([\w\-]{1,16})$/ or die "Illegal CGI REMOTE_USER!";
+#  my($user)=$1;
+#  my($counter) = new File::CounterFile "$user/$table.$field",0;
+# endhack
+
+  my($index)=$counter->inc;
+  $index=$counter->inc
+    while qsearchs($table,{$field=>$index}); #just in case
+  &swapuid;
+
+  $index =~ /^(\d*)$/;
+  $index=$1;
+
+  $self->setfield($field,$index);
+
+}
+
+=item ut_float COLUMN
+
+Check/untaint floating point numeric data: 1.1, 1, 1.1e10, 1e10.  May not be
+null.  If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub ut_float {
+  my($self,$field)=@_ ;
+  ($self->getfield($field) =~ /^(\d+\.\d+)$/ ||
+   $self->getfield($field) =~ /^(\d+)$/ ||
+   $self->getfield($field) =~ /^(\d+\.\d+e\d+)$/ ||
+   $self->getfield($field) =~ /^(\d+e\d+)$/)
+    or return "Illegal or empty (float) $field: ". $self->getfield($field);
+  $self->setfield($field,$1);
+  '';
+}
+
+=item ut_number COLUMN
+
+Check/untaint simple numeric data (whole numbers).  May not be null.  If there
+is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub ut_number {
+  my($self,$field)=@_;
+  $self->getfield($field) =~ /^(\d+)$/
+    or return "Illegal or empty (numeric) $field: ". $self->getfield($field);
+  $self->setfield($field,$1);
+  '';
+}
+
+=item ut_numbern COLUMN
+
+Check/untaint simple numeric data (whole numbers).  May be null.  If there is
+an error, returns the error, otherwise returns false.
+
+=cut
+
+sub ut_numbern {
+  my($self,$field)=@_;
+  $self->getfield($field) =~ /^(\d*)$/
+    or return "Illegal (numeric) $field: ". $self->getfield($field);
+  $self->setfield($field,$1);
+  '';
+}
+
+=item ut_money COLUMN
+
+Check/untaint monetary numbers.  May be negative.  Set to 0 if null.  If there
+is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub ut_money {
+  my($self,$field)=@_;
+  $self->setfield($field, 0) if $self->getfield($field) eq '';
+  $self->getfield($field) =~ /^(\-)? ?(\d*)(\.\d{2})?$/
+    or return "Illegal (money) $field: ". $self->getfield($field);
+  #$self->setfield($field, "$1$2$3" || 0);
+  $self->setfield($field, ( ($1||''). ($2||''). ($3||'') ) || 0);
+  '';
+}
+
+=item ut_text COLUMN
+
+Check/untaint text.  Alphanumerics, spaces, and the following punctuation
+symbols are currently permitted: ! @ # $ % & ( ) - + ; : ' " , . ? /
+May not be null.  If there is an error, returns the error, otherwise returns
+false.
+
+=cut
+
+sub ut_text {
+  my($self,$field)=@_;
+  $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/]+)$/
+    or return "Illegal or empty (text) $field: ". $self->getfield($field);
+  $self->setfield($field,$1);
+  '';
+}
+
+=item ut_textn COLUMN
+
+Check/untaint text.  Alphanumerics, spaces, and the following punctuation
+symbols are currently permitted: ! @ # $ % & ( ) - + ; : ' " , . ? /
+May be null.  If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub ut_textn {
+  my($self,$field)=@_;
+  $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/]*)$/
+    or return "Illegal (text) $field: ". $self->getfield($field);
+  $self->setfield($field,$1);
+  '';
+}
+
+=item ut_alpha COLUMN
+
+Check/untaint alphanumeric strings (no spaces).  May not be null.  If there is
+an error, returns the error, otherwise returns false.
+
+=cut
+
+sub ut_alpha {
+  my($self,$field)=@_;
+  $self->getfield($field) =~ /^(\w+)$/
+    or return "Illegal or empty (alphanumeric) $field: ".
+              $self->getfield($field);
+  $self->setfield($field,$1);
+  '';
+}
+
+=item ut_alpha COLUMN
+
+Check/untaint alphanumeric strings (no spaces).  May be null.  If there is an
+error, returns the error, otherwise returns false.
+
+=cut
+
+sub ut_alphan {
+  my($self,$field)=@_;
+  $self->getfield($field) =~ /^(\w*)$/ 
+    or return "Illegal (alphanumeric) $field: ". $self->getfield($field);
+  $self->setfield($field,$1);
+  '';
+}
+
+=item ut_phonen COLUMN
+
+Check/untaint phone numbers.  May be null.  If there is an error, returns
+the error, otherwise returns false.
+
+=cut
+
+sub ut_phonen {
+  my($self,$field)=@_;
+  my $phonen = $self->getfield($field);
+  if ( $phonen eq '' ) {
+    $self->setfield($field,'');
+  } else {
+    $phonen =~ s/\D//g;
+    $phonen =~ /^(\d{3})(\d{3})(\d{4})(\d*)$/
+      or return "Illegal (phone) $field: ". $self->getfield($field);
+    $phonen = "$1-$2-$3";
+    $phonen .= " x$4" if $4;
+    $self->setfield($field,$phonen);
+  }
+  '';
+}
+
+=item ut_anything COLUMN
+
+Untaints arbitrary data.  Be careful.
+
+=cut
+
+sub ut_anything {
+  my($self,$field)=@_;
+  $self->getfield($field) =~ /^(.*)$/
+    or return "Illegal $field: ". $self->getfield($field);
+  $self->setfield($field,$1);
+  '';
+}
+
+=item fields [ TABLE ]
+
+This can be used as both a subroutine and a method call.  It returns a list
+of the columns in this record's table, or an explicitly specified table.
+(See L<dbdef_table>).
+
+=cut
+
+# Usage: @fields = fields($table);
+#        @fields = $record->fields;
+sub fields {
+  my $something = shift;
+  my $table;
+  if ( ref($something) ) {
+    $table = $something->table;
+  } else {
+    $table = $something;
+  }
+  #croak "Usage: \@fields = fields(\$table)\n   or: \@fields = \$record->fields" unless $table;
+  my($table_obj) = $dbdef->table($table);
+  croak "Unknown table $table" unless $table_obj;
+  $table_obj->columns;
+}
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item reload_dbdef([FILENAME])
+
+Load a database definition (see L<FS::dbdef>), optionally from a non-default
+filename.  This command is executed at startup unless
+I<$FS::Record::setup_hack> is true.  Returns a FS::dbdef object.
+
+=cut
+
+sub reload_dbdef {
+  my $file = shift || $dbdef_file;
+  $dbdef = load FS::dbdef ($file);
+}
+
+=item dbdef
+
+Returns the current database definition.  See L<FS::dbdef>.
+
+=cut
+
+sub dbdef { $dbdef; }
+
+=item _quote VALUE, TABLE, COLUMN
+
+This is an internal function used to construct SQL statements.  It returns
+VALUE DBI-quoted (see L<DBI/"quote">) unless VALUE is a number and the column
+type (see L<dbdef_column>) does not end in `char' or `binary'.
+
+=cut
+
+sub _quote {
+  my($value,$table,$field)=@_;
+  my($dbh)=dbh;
+  if ( $value =~ /^\d+(\.\d+)?$/ && 
+#       ! ( datatype($table,$field) =~ /^char/ ) 
+       ! ( $dbdef->table($table)->column($field)->type =~ /(char|binary)$/i ) 
+  ) {
+    $value;
+  } else {
+    $dbh->quote($value);
+  }
+}
+
+=item hfields TABLE
+
+This is depriciated.  Don't use it.
+
+It returns a hash-type list with the fields of this record's table set true.
+
+=cut
+
+sub hfields {
+  carp "warning: hfields is depriciated";
+  my($table)=@_;
+  my(%hash);
+  foreach (fields($table)) {
+    $hash{$_}=1;
+  }
+  \%hash;
+}
+
+#sub _dump {
+#  my($self)=@_;
+#  join("\n", map {
+#    "$_: ". $self->getfield($_). "|"
+#  } (fields($self->table)) );
+#}
+
+#sub DESTROY {
+#  my $self = shift;
+#  #use Carp qw(cluck);
+#  #cluck "DESTROYING $self";
+#  warn "DESTROYING $self";
+#}
+
+#sub is_tainted {
+#             return ! eval { join('',@_), kill 0; 1; };
+#         }
+
+=back
+
+=head1 VERSION
+
+$Id: Record.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+This module should probably be renamed, since much of the functionality is
+of general use.  It is not completely unlike Adapter::DBI (see below).
+
+Exported qsearch and qsearchs should be depriciated in favor of method calls
+(against an FS::Record object like the old search and searchs that qsearch
+and qsearchs were on top of.)
+
+The whole fields / hfields mess should be removed.
+
+The various WHERE clauses should be subroutined.
+
+table string should be depriciated in favor of FS::dbdef_table.
+
+No doubt we could benefit from a Tied hash.  Documenting how exists / defined
+true maps to the database (and WHERE clauses) would also help.
+
+The ut_ methods should ask the dbdef for a default length.
+
+ut_sqltype (like ut_varchar) should all be defined
+
+A fallback check method should be provided whith uses the dbdef.
+
+The ut_money method assumes money has two decimal digits.
+
+The Pg money kludge in the new method only strips `$'.
+
+The ut_phonen method assumes US-style phone numbers.
+
+The _quote function should probably use ut_float instead of a regex.
+
+All the subroutines probably should be methods, here or elsewhere.
+
+Probably should borrow/use some dbdef methods where appropriate (like sub
+fields)
+
+=head1 SEE ALSO
+
+L<FS::dbdef>, L<FS::UID>, L<DBI>
+
+Adapter::DBI from Ch. 11 of Advanced Perl Programming by Sriram Srinivasan.
+
+=cut
+
+1;
+
diff --git a/FS/FS/SSH.pm b/FS/FS/SSH.pm
new file mode 100644
index 000000000..84ac06b44
--- /dev/null
+++ b/FS/FS/SSH.pm
@@ -0,0 +1,146 @@
+package FS::SSH;
+
+use strict;
+use vars qw(@ISA @EXPORT_OK $ssh $scp);
+use Exporter;
+use IPC::Open2;
+use IPC::Open3;
+
+@ISA = qw(Exporter);
+@EXPORT_OK = qw(ssh scp issh iscp sshopen2 sshopen3);
+
+$ssh="ssh";
+$scp="scp";
+
+=head1 NAME
+
+FS::SSH - Subroutines to call ssh and scp
+
+=head1 SYNOPSIS
+
+  use FS::SSH qw(ssh scp issh iscp sshopen2 sshopen3);
+
+  ssh($host, $command);
+
+  issh($host, $command);
+
+  scp($source, $destination);
+
+  iscp($source, $destination);
+
+  sshopen2($host, $reader, $writer, $command);
+
+  sshopen3($host, $reader, $writer, $error, $command);
+
+=head1 DESCRIPTION
+
+  Simple wrappers around ssh and scp commands.
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item ssh HOST, COMMAND 
+
+Calls ssh in batch mode.
+
+=cut
+
+sub ssh {
+  my($host,$command)=@_;
+  my(@cmd)=($ssh, "-o", "BatchMode yes", $host, $command);
+#  	print join(' ',@cmd),"\n";
+#0;
+  system(@cmd);
+}
+
+=item issh HOST, COMMAND
+
+Prints the ssh command to be executed, waits for the user to confirm, and
+(optionally) executes the command.
+
+=cut
+
+sub issh {
+  my($host,$command)=@_;
+  my(@cmd)=($ssh, $host, $command);
+  print join(' ',@cmd),"\n";
+  if ( &_yesno ) {
+    	###print join(' ',@cmd),"\n";
+    system(@cmd);
+  }
+}
+
+=item scp SOURCE, DESTINATION
+
+Calls scp in batch mode.
+
+=cut
+
+sub scp {
+  my($src,$dest)=@_;
+  my(@cmd)=($scp,"-Bprq",$src,$dest);
+#  	print join(' ',@cmd),"\n";
+#0;
+  system(@cmd);
+}
+
+=item iscp SOURCE, DESTINATION
+
+Prints the scp command to be executed, waits for the user to confirm, and
+(optionally) executes the command.
+
+=cut
+
+sub iscp {
+  my($src,$dest)=@_;
+  my(@cmd)=($scp,"-pr",$src,$dest);
+  print join(' ',@cmd),"\n";
+  if ( &_yesno ) {
+    	###print join(' ',@cmd),"\n";
+    system(@cmd);
+  }
+}
+
+=item sshopen2 HOST, READER, WRITER, COMMAND
+
+Connects the supplied filehandles to the ssh process (in batch mode).
+
+=cut
+
+sub sshopen2 {
+  my($host,$reader,$writer,$command)=@_;
+  open2($reader,$writer,$ssh,'-o','Batchmode yes',$host,$command);
+}
+
+=item sshopen3 HOST, WRITER, READER, ERROR, COMMAND
+
+Connects the supplied filehandles to the ssh process (in batch mode).
+
+=cut
+
+sub sshopen3 {
+  my($host,$writer,$reader,$error,$command)=@_;
+  open3($writer,$reader,$error,$ssh,'-o','Batchmode yes',$host,$command);
+}
+
+sub _yesno {
+  print "Proceed [y/N]:";
+  my($x)=scalar(<STDIN>);
+  $x =~ /^y/i;
+}
+
+=head1 BUGS
+
+Not OO.
+
+scp stuff should transparantly use rsync-over-ssh instead.
+
+=head1 SEE ALSO
+
+L<ssh>, L<scp>, L<IPC::Open2>, L<IPC::Open3>
+
+=cut
+
+1;
+
diff --git a/FS/FS/UI/Base.pm b/FS/FS/UI/Base.pm
new file mode 100644
index 000000000..bbeb9e171
--- /dev/null
+++ b/FS/FS/UI/Base.pm
@@ -0,0 +1,194 @@
+package FS::UI::Base;
+
+use strict;
+use vars qw ( @ISA );
+use FS::Record qw( fields qsearch );
+
+@ISA = ( $FS::UI::Base::_lock );
+
+=head1 NAME
+
+FS::UI::Base - Base class for all user-interface objects
+
+=head1 SYNOPSIS
+
+  use FS::UI::SomeInterface;
+  use FS::UI::some_table;
+
+  $interface = new FS::UI::some_table;
+
+  $error = $interface->browse;
+  $error = $interface->search;
+  $error = $interface->view;
+  $error = $interface->edit;
+  $error = $interface->process;
+
+=head1 DESCRIPTION
+
+An FS::UI::Base object represents a user interface object.  FS::UI::Base
+is intended as a base class for table-specfic classes to inherit from, i.e.
+FS::UI::cust_main.  The simplest case, which will provide a default UI for your
+new table, is as follows:
+
+  package FS::UI::table_name;
+  use vars qw ( @ISA );
+  use FS::UI::Base;
+  @ISA = qw( FS::UI::Base );
+  sub db_table { 'table_name'; }
+
+Currently available interfaces are:
+  FS::UI::Gtk, an X-Windows UI implemented using the Gtk+ toolkit
+  FS::UI::CGI, a web interface implemented using CGI.pm, etc.
+
+=head1 METHODS
+
+=over 4
+
+=item new
+
+=cut
+
+=item browse
+
+=cut
+
+sub browse {
+  my $self = shift;
+
+  my @fields = $self->list_fields;
+
+  #begin browse-specific stuff
+
+  $self->title( "Browse ". $self->db_names ) unless $self->title;
+  my @records = qsearch ( $self->db_table, {} );
+
+  #end browse-specific stuff
+
+  $self->addwidget ( new FS::UI::_Text ( $self->db_description ) );
+
+  my @header = $self->list_header;
+  my @headerspan = $self->list_headerspan;
+  my %callback = $self->db_callback;
+
+  my $columns;
+
+  my $table = new FS::UI::_Tableborder (
+    'rows' => 1 + scalar(@records),
+    'columns' => $columns || scalar(@fields),
+  );
+
+  my $c = 0;
+  foreach my $header ( @header ) {
+    my $headerspan = shift(@headerspan) || 1;
+    $table->attach(
+      0, $c, new FS::UI::_Text ( $header ), 1, $headerspan
+    );
+    $c += $headerspan;
+  }
+
+  my $r = 1;
+  
+  foreach my $record ( @records ) {
+    $c = 0;
+    foreach my $field ( @fields ) {
+      my $value = $record->getfield($field);
+      my $widget;
+      if ( $callback{$field} ) {
+        $widget = &{ $callback{$field} }( $value, $record );
+      } else {
+        $widget = new FS::UI::_Text ( $value );
+      }
+      $table->attach( $r, $c++, $widget, 1, 1 );
+    }
+    $r++;
+  }
+
+  $self->addwidget( $table );
+
+  $self->activate;
+
+}
+
+=item title
+
+=cut
+
+sub title {
+  my $self = shift;
+  my $value = shift;
+  if ( defined($value) ) {
+    $self->{'title'} = $value;
+  } else {
+    $self->{'title'};
+  }
+}
+
+=item addwidget
+
+=cut
+
+sub addwidget {
+  my $self = shift;
+  my $widget = shift;
+  push @{ $self->{'Widgets'} }, $widget;
+}
+
+#fallback methods
+
+sub db_description {}
+
+sub db_name {}
+
+sub db_names {
+  my $self = shift;
+  $self->db_name. 's';
+}
+
+sub list_fields {
+  my $self = shift;
+  fields( $self->db_table );
+}
+
+sub list_header {
+  my $self = shift;
+  $self->list_fields
+}
+
+sub list_headerspan {
+  my $self = shift;
+  map 1, $self->list_header;
+}
+
+sub db_callback {}
+
+=back
+
+=head1 VERSION
+
+$Id: Base.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+This documentation is incomplete.
+
+There should be some sort of per-(freeside)-user preferences and the ability
+for specific FS::UI:: modules to put their own values there as well.
+
+=head1 SEE ALSO
+
+L<FS::UI::Gtk>, L<FS::UI::CGI>
+
+=head1 HISTORY
+
+$Log: Base.pm,v $
+Revision 1.1  1999-08-04 09:03:53  ivan
+initial checkin of module files for proper perl installation
+
+Revision 1.1  1999/01/20 09:30:36  ivan
+skeletal cross-UI UI code.
+
+
+=cut
+
+1;
+
diff --git a/FS/FS/UI/CGI.pm b/FS/FS/UI/CGI.pm
new file mode 100644
index 000000000..ae87d1375
--- /dev/null
+++ b/FS/FS/UI/CGI.pm
@@ -0,0 +1,239 @@
+package FS::UI::CGI;
+
+use strict;
+use CGI;
+#use CGI::Switch;  #when FS::UID user and preference callback stuff is fixed
+use CGI::Carp qw(fatalsToBrowser);
+use HTML::Table;
+use FS::UID qw(adminsuidsetup);
+#use FS::Record qw( qsearch fields );
+
+die "Can't initialize CGI interface; $FS::UI::Base::_lock used"
+  if $FS::UI::Base::_lock;
+$FS::UI::Base::_lock = "FS::UI::CGI";
+
+=head1 NAME
+
+FS::UI::CGI - Base class for CGI user-interface objects
+
+=head1 SYNOPSIS
+
+  use FS::UI::CGI;
+  use FS::UI::some_table;
+
+  $interface = new FS::UI::some_table;
+
+  $error = $interface->browse;
+  $error = $interface->search;
+  $error = $interface->view;
+  $error = $interface->edit;
+  $error = $interface->process;
+
+=head1 DESCRIPTION
+
+An FS::UI::CGI object represents a CGI interface object.
+
+=head1 METHODS
+
+=over 4
+
+=item new
+
+=cut
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = { @_ };
+
+  $self->{'_cgi'} = new CGI;
+  $self->{'_user'} = $self->{'_cgi'}->remote_user;
+  $self->{'_dbh'} = FS::UID::adminsuidsetup $self->{'_user'};
+
+  bless ( $self, $class);
+}
+
+sub activate {
+  my $self = shift;
+  print $self->_header,
+        join ( "<BR>", map $_->sprint, @{ $self->{'Widgets'} } ),
+        $self->_footer,
+  ;
+}
+
+=item _header
+
+=cut
+
+sub _header {
+  my $self = shift;
+  my $cgi = $self->{'_cgi'};
+
+  $cgi->header( '-expires' => 'now' ), '<HTML>', 
+    '<HEAD><TITLE>', $self->title, '</TITLE></HEAD>',
+    '<BODY BGCOLOR="#ffffff">',
+    '<FONT COLOR="#ff0000" SIZE=7>', $self->title, '</FONT><BR><BR>',
+  ;
+}
+
+=item _footer
+
+=cut
+
+sub _footer {
+  "</BODY></HTML>";
+}
+
+=item interface
+
+Returns the string `CGI'.  Useful for the author of a table-specific UI class
+to conditionally specify certain behaviour.
+
+=cut
+
+sub interface { 'CGI'; }
+
+=back
+
+=cut
+
+package FS::UI::_Widget;
+
+use vars qw( $AUTOLOAD );
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = { @_ };
+  bless ( $self, $class );
+}
+
+sub AUTOLOAD {
+  my $self = shift;
+  my $value = shift;
+  my($field)=$AUTOLOAD;
+  $field =~ s/.*://;
+  if ( defined($value) ) {
+    $self->{$field} = $value;
+  } else {
+    $self->{$field};
+  }    
+}
+
+package FS::UI::_Text;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Widget);
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = {};
+  $self->{'_text'} = shift;
+  bless ( $self, $class );
+}
+
+sub sprint {
+  my $self = shift;
+  $self->{'_text'};
+}
+
+package FS::UI::_Link;
+
+use vars qw ( @ISA $BASE_URL );
+
+@ISA = qw ( FS::UI::_Widget);
+$BASE_URL = "http://rootwood.sisd.com/freeside";
+
+sub sprint {
+  my $self = shift;
+  my $table = $self->{'table'};
+  my $method = $self->{'method'};
+
+  # i will be cleaned up when we're done moving from the old webinterface!
+  my @arg = @{$self->{'arg'}};
+  my $yuck = join( "&", @arg);
+  qq(<A HREF="$BASE_URL/$method/$table.cgi?$yuck">). $self->{'text'}. "<\A>";
+}
+
+package FS::UI::_Table;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Widget);
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = $class eq $proto ? { @_ } : $proto;
+  bless ( $self, $class );
+  $self->{'_table'} = new HTML::Table ( $self->rows, $self->columns );
+  $self;
+}
+
+sub attach {
+  my $self = shift;
+  my ( $row, $column, $widget, $rowspan, $colspan ) = @_;
+  $self->{"_table"}->setCell( $row+1, $column+1, $widget->sprint );
+  $self->{"_table"}->setCellRowSpan( $row+1, $column+1, $rowspan ) if $rowspan;
+  $self->{"_table"}->setCellColSpan( $row+1, $column+1, $colspan ) if $colspan;
+}
+
+sub sprint {
+  my $self = shift;
+  $self->{'_table'}->getTable;
+}
+
+package FS::UI::_Tableborder;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Table );
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = $class eq $proto ? { @_ } : $proto;
+  bless ( $self, $class );
+  $self->SUPER::new(@_);
+  $self->{'_table'}->setBorder;
+  $self;
+}
+
+=head1 VERSION
+
+$Id: CGI.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+This documentation is incomplete.
+
+In _Tableborder, headers should be links that sort on their fields.
+
+_Link uses a constant $BASE_URL
+
+_Link passes the arguments as a manually-constructed GET string instead
+of POSTing, for compatability while the web interface is upgraded.  Once
+this is done it should pass arguements properly (i.e. as a POST, 8-bit clean)
+
+Still some small bits of widget code same as FS::UI::Gtk.
+
+=head1 SEE ALSO
+
+L<FS::UI::Base>
+
+=head1 HISTORY
+
+$Log: CGI.pm,v $
+Revision 1.1  1999-08-04 09:03:53  ivan
+initial checkin of module files for proper perl installation
+
+Revision 1.1  1999/01/20 09:30:36  ivan
+skeletal cross-UI UI code.
+
+
+=cut
+
+1;
+
diff --git a/FS/FS/UI/Gtk.pm b/FS/FS/UI/Gtk.pm
new file mode 100644
index 000000000..507a29361
--- /dev/null
+++ b/FS/FS/UI/Gtk.pm
@@ -0,0 +1,224 @@
+package FS::UI::Gtk;
+
+use strict;
+use Gtk;
+use FS::UID qw(adminsuidsetup);
+
+die "Can't initialize Gtk interface; $FS::UI::Base::_lock used"
+  if $FS::UI::Base::_lock;
+$FS::UI::Base::_lock = "FS::UI::Gtk";
+
+=head1 NAME
+
+FS::UI::Gtk - Base class for Gtk user-interface objects
+
+=head1 SYNOPSIS
+
+  use FS::UI::Gtk;
+  use FS::UI::some_table;
+
+  $interface = new FS::UI::some_table;
+
+  $error = $interface->browse;
+  $error = $interface->search;
+  $error = $interface->view;
+  $error = $interface->edit;
+  $error = $interface->process;
+
+=head1 DESCRIPTION
+
+An FS::UI::Gtk object represents a Gtk user interface object.
+
+=head1 METHODS
+
+=over 4
+
+=item new
+
+=cut
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = { @_ };
+
+  bless ( $self, $class );
+
+  $self->{'_user'} = 'ivan'; #Pop up login window?
+  $self->{'_dbh'} = FS::UID::adminsuidsetup $self->{'_user'};
+
+
+
+  $self;
+}
+
+sub activate {
+  my $self = shift;
+
+  my $vbox = new Gtk::VBox ( 0, 4 );
+
+  foreach my $widget ( @{ $self->{'Widgets'} } ) {
+    $widget->_gtk->show;
+    $vbox->pack_start ( $widget->_gtk, 1, 1, 4 );
+  }
+  $vbox->show;
+
+  my $window = new Gtk::Window "toplevel";
+  $self->{'_gtk'} = $window;
+  $window->set_title( $self->title );
+  $window->add ( $vbox );
+  $window->show;
+  main Gtk;
+}
+
+=item interface
+
+Returns the string `Gtk'.  Useful for the author of a table-specific UI class
+to conditionally specify certain behaviour.
+
+=cut 
+
+sub interface { 'Gtk'; }
+
+=back
+
+=cut
+
+package FS::UI::_Widget;
+
+use vars qw( $AUTOLOAD );
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = { @_ };
+  bless ( $self, $class );
+}
+
+sub _gtk {
+  my $self = shift;
+  $self->{'_gtk'};
+}
+
+sub AUTOLOAD {
+  my $self = shift;
+  my $value = shift;
+  my($field)=$AUTOLOAD;
+  $field =~ s/.*://;
+  if ( defined($value) ) {
+    $self->{$field} = $value;
+  } else {
+    $self->{$field};
+  }    
+}
+
+package FS::UI::_Text;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Widget );
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = {};
+  $self->{'_gtk'} = new Gtk::Label ( shift );
+  bless ( $self, $class );
+}
+
+package FS::UI::_Link;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Widget );
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = { @_ };
+  $self->{'_gtk'} = new_with_label Gtk::Button ( $self->{'text'} );
+  $self->{'_gtk'}->signal_connect( 'clicked', sub {
+      print "STUB: (Gtk) FS::UI::_Link";
+    }, "hi", "there" );
+  bless ( $self, $class );
+}
+
+
+package FS::UI::_Table;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Widget );
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = { @_ };
+  bless ( $self, $class );
+
+  $self->{'_gtk'} = new Gtk::Table (
+    $self->rows,
+    $self->columns,
+    0, #homogeneous
+  );
+
+  $self;
+}
+
+sub attach {
+  my $self = shift;
+  my ( $row, $column, $widget, $rowspan, $colspan ) = @_;
+  $rowspan ||= 1;
+  $colspan ||= 1;
+  $self->_gtk->attach_defaults(
+    $widget->_gtk,
+    $column,
+    $column + $colspan,
+    $row,
+    $row + $rowspan,
+  );
+  $widget->_gtk->show;
+}
+
+package FS::UI::_Tableborder;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Table );
+
+=head1 VERSION
+
+$Id: Gtk.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+This documentation is incomplete.
+
+_Tableborder is just a _Table now.  _Tableborders should scroll (but not the
+headers) and need and need more decoration. (data in white section ala gtksql
+and sliding field widths) headers should be buttons that callback to sort on
+their fields.
+
+There should be a persistant, per-(freeside)-user store for window positions
+and sizes and sort fields etc (see L<FS::UI::CGI/BUGS>.
+
+Still some small bits of widget code same as FS::UI::CGI.
+
+=head1 SEE ALSO
+
+L<FS::UI::Base>
+
+=head1 HISTORY
+
+$Log: Gtk.pm,v $
+Revision 1.1  1999-08-04 09:03:53  ivan
+initial checkin of module files for proper perl installation
+
+Revision 1.1  1999/01/20 09:30:36  ivan
+skeletal cross-UI UI code.
+
+
+=cut
+
+1;
+
diff --git a/FS/FS/UI/agent.pm b/FS/FS/UI/agent.pm
new file mode 100644
index 000000000..ce9744a55
--- /dev/null
+++ b/FS/FS/UI/agent.pm
@@ -0,0 +1,62 @@
+package FS::UI::agent;
+
+use strict;
+use vars qw ( @ISA );
+use FS::UI::Base;
+use FS::Record qw( qsearchs );
+use FS::agent;
+use FS::agent_type;
+
+@ISA = qw ( FS::UI::Base );
+
+sub db_table { 'agent' };
+
+sub db_name { 'Agent' };
+
+sub db_description { <<END;
+Agents are resellers of your service. Agents may be limited to a subset of your
+full offerings (via their type).
+END
+}
+
+sub list_fields {
+  'agentnum',
+  'typenum',
+#  'freq',
+#  'prog',
+; }
+
+sub list_header {
+  'Agent',
+  'Type',
+#  'Freq (n/a)',
+#  'Prog (n/a)',
+; }
+
+sub db_callback { 
+  'agentnum' =>
+    sub {
+      my ( $agentnum, $record ) = @_;
+      my $agent = $record->agent;
+      new FS::UI::_Link (
+        'table'  => 'agent',
+        'method' => 'edit',
+        'arg'    => [ $agentnum ],
+        'text'   => "$agentnum: $agent",
+      );
+    },
+  'typenum' =>
+    sub {
+      my $typenum = shift;
+      my $agent_type = qsearchs( 'agent_type', { 'typenum' => $typenum } );
+      my $atype = $agent_type->atype;
+      new FS::UI::_Link (
+        'table'  => 'agent_type',
+        'method' => 'edit',
+        'arg'    => [ $typenum ],
+        'text'   => "$typenum: $atype"
+      );
+    },
+}
+
+1;
diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
new file mode 100644
index 000000000..2315c266d
--- /dev/null
+++ b/FS/FS/UID.pm
@@ -0,0 +1,266 @@
+package FS::UID;
+
+use strict;
+use vars qw(
+  @ISA @EXPORT_OK $cgi $dbh $freeside_uid $user 
+  $conf_dir $secrets $datasrc $db_user $db_pass %callback
+);
+use subs qw(
+  getsecrets cgisetotaker
+);
+use Exporter;
+use Carp;
+use DBI;
+use FS::Conf;
+
+@ISA = qw(Exporter);
+@EXPORT_OK = qw(checkeuid checkruid swapuid cgisuidsetup
+                adminsuidsetup getotaker dbh datasrc getsecrets );
+
+$freeside_uid = scalar(getpwnam('freeside'));
+
+$conf_dir = "/usr/local/etc/freeside/";
+
+=head1 NAME
+
+FS::UID - Subroutines for database login and assorted other stuff
+
+=head1 SYNOPSIS
+
+  use FS::UID qw(adminsuidsetup cgisuidsetup dbh datasrc getotaker
+  checkeuid checkruid swapuid);
+
+  adminsuidsetup $user;
+
+  $cgi = new CGI;
+  $dbh = cgisuidsetup($cgi);
+
+  $dbh = dbh;
+
+  $datasrc = datasrc;
+
+=head1 DESCRIPTION
+
+Provides a hodgepodge of subroutines. 
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item adminsuidsetup USER
+
+Sets the user to USER (see config.html from the base documentation).
+Cleans the environment.
+Make sure the script is running as freeside, or setuid freeside.
+Opens a connection to the database.
+Swaps real and effective UIDs.
+Runs any defined callbacks (see below).
+Returns the DBI database handle (usually you don't need this).
+
+=cut
+
+sub adminsuidsetup {
+
+  $user = shift;
+  croak "fatal: adminsuidsetup called without arguements" unless $user;
+
+  $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
+  $ENV{'SHELL'} = '/bin/sh';
+  $ENV{'IFS'} = " \t\n";
+  $ENV{'CDPATH'} = '';
+  $ENV{'ENV'} = '';
+  $ENV{'BASH_ENV'} = '';
+
+  croak "Not running uid freeside!" unless checkeuid();
+  getsecrets;
+  $dbh = DBI->connect($datasrc,$db_user,$db_pass, {
+                          'AutoCommit' => 'true',
+                          'ChopBlanks' => 'true',
+  } ) or die "DBI->connect error: $DBI::errstr\n";
+
+  swapuid(); #go to non-privledged user if running setuid freeside
+
+  foreach ( keys %callback ) {
+    &{$callback{$_}};
+  }
+
+  $dbh;
+}
+
+=item cgisuidsetup CGI_object
+
+Stores the CGI (see L<CGI>) object for later use. (CGI::Base is depriciated)
+Runs adminsuidsetup.
+
+=cut
+
+sub cgisuidsetup {
+  $cgi=shift;
+  if ( $cgi->isa('CGI::Base') ) {
+    carp "Use of CGI::Base is depriciated";
+  } elsif ( ! $cgi->isa('CGI') ) {
+    croak "Pass a CGI object to cgisuidsetup!";
+  }
+  cgisetotaker; 
+  adminsuidsetup($user);
+}
+
+=item cgi
+
+Returns the CGI (see L<CGI>) object.
+
+=cut
+
+sub cgi {
+  $cgi;
+}
+
+=item dbh
+
+Returns the DBI database handle.
+
+=cut
+
+sub dbh {
+  $dbh;
+}
+
+=item datasrc
+
+Returns the DBI data source.
+
+=cut
+
+sub datasrc {
+  $datasrc;
+}
+
+#hack for web demo
+#sub setdbh {
+#  $dbh=$_[0];
+#}
+
+sub suidsetup {
+  croak "suidsetup depriciated";
+}
+
+=item getotaker
+
+Returns the current Freeside user.
+
+=cut
+
+sub getotaker {
+  $user;
+}
+
+=item cgisetotaker
+
+Sets and returns the CGI REMOTE_USER.  $cgi should be defined as a CGI.pm
+object.  Support for CGI::Base and derived classes is depriciated.
+
+=cut
+
+sub cgisetotaker {
+  if ( $cgi && $cgi->isa('CGI::Base') && defined $cgi->var('REMOTE_USER')) {
+    carp "Use of CGI::Base is depriciated";
+    $user = lc ( $cgi->var('REMOTE_USER') );
+  } elsif ( $cgi && $cgi->isa('CGI') && defined $cgi->remote_user ) {
+    $user = lc ( $cgi->remote_user );
+  } else {
+    die "fatal: Can't get REMOTE_USER!";
+  }
+  $user;
+}
+
+=item checkeuid
+
+Returns true if effective UID is that of the freeside user.
+
+=cut
+
+sub checkeuid {
+  ( $> == $freeside_uid );
+}
+
+=item checkruid
+
+Returns true if the real UID is that of the freeside user.
+
+=cut
+
+sub checkruid {
+  ( $< == $freeside_uid );
+}
+
+=item swapuid
+
+Swaps real and effective UIDs.
+
+=cut
+
+sub swapuid {
+  ($<,$>) = ($>,$<) if $< != $>;
+}
+
+=item getsecrets [ USER ]
+
+Sets the user to USER, if supplied.
+Sets and returns the DBI datasource, username and password for this user from
+the `/usr/local/etc/freeside/mapsecrets' file.
+
+=cut
+
+sub getsecrets {
+  my($setuser) = shift;
+  $user = $setuser if $setuser;
+  die "No user!" unless $user;
+  my($conf) = new FS::Conf $conf_dir;
+  my($line) = grep /^\s*$user\s/, $conf->config('mapsecrets');
+  die "User not found in mapsecrets!" unless $line;
+  $line =~ /^\s*$user\s+(.*)$/;
+  $secrets = $1;
+  die "Illegal mapsecrets line for user?!" unless $secrets;
+  ($datasrc, $db_user, $db_pass) = $conf->config($secrets)
+    or die "Can't get secrets: $!";
+  $FS::Conf::default_dir = $conf_dir. "/conf.$datasrc";
+  ($datasrc, $db_user, $db_pass);
+}
+
+=back
+
+=head1 CALLBACKS
+
+Warning: this interface is likely to change in future releases.
+
+A package can install a callback to be run in adminsuidsetup by putting a
+coderef into the hash %FS::UID::callback :
+
+    $coderef = sub { warn "Hi, I'm returning your call!" };
+    $FS::UID::callback{'Package::Name'};
+
+=head1 VERSION
+
+$Id: UID.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+Too many package-global variables.
+
+Not OO.
+
+No capabilities yet.  When mod_perl and Authen::DBI are implemented, 
+cgisuidsetup will go away as well.
+
+Goes through contortions to support non-OO syntax with multiple datasrc's.
+
+Callbacks are inelegant.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<CGI>, L<DBI>, config.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
new file mode 100644
index 000000000..27e9aed71
--- /dev/null
+++ b/FS/FS/agent.pm
@@ -0,0 +1,160 @@
+package FS::agent;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+use FS::cust_main;
+use FS::agent_type;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::agent - Object methods for agent records
+
+=head1 SYNOPSIS
+
+  use FS::agent;
+
+  $record = new FS::agent \%hash;
+  $record = new FS::agent { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $agent_type = $record->agent_type;
+
+  $hashref = $record->pkgpart_hashref;
+  #may purchase $pkgpart if $hashref->{$pkgpart};
+
+=head1 DESCRIPTION
+
+An FS::agent object represents an agent.  Every customer has an agent.  Agents
+can be used to track things like resellers or salespeople.  FS::agent inherits
+from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item agemtnum - primary key (assigned automatically for new agents)
+
+=item agent - Text name of this agent
+
+=item typenum - Agent type.  See L<FS::agent_type>
+
+=item prog - For future use.
+
+=item freq - For future use.
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new agent.  To add the agent to the database, see L<"insert">.
+
+=cut
+
+sub table { 'agent'; }
+
+=item insert
+
+Adds this agent to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Deletes this agent from the database.  Only agents with no customers can be
+deleted.  If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub delete {
+  my $self = shift;
+
+  return "Can't delete an agent with customers!"
+    if qsearch( 'cust_main', { 'agentnum' => $self->agentnum } );
+
+  $self->SUPER::delete;
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid agent.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error =
+    $self->ut_numbern('agentnum')
+      || $self->ut_text('agent')
+      || $self->ut_number('typenum')
+      || $self->ut_numbern('freq')
+      || $self->ut_textn('prog')
+  ;
+  return $error if $error;
+
+  return "Unknown typenum!"
+    unless $self->agent_type;
+
+  '';
+
+}
+
+=item agent_type
+
+Returns the FS::agent_type object (see L<FS::agent_type>) for this agent.
+
+=cut
+
+sub agent_type {
+  my $self = shift;
+  qsearchs( 'agent_type', { 'typenum' => $self->typenum } );
+}
+
+=item pkgpart_hashref
+
+Returns a hash reference.  The keys of the hash are pkgparts.  The value is
+true iff this agent may purchase the specified package definition.  See
+L<FS::part_pkg>.
+
+=cut
+
+sub pkgpart_hashref {
+  my $self = shift;
+  $self->agent_type->pkgpart_hashref;
+}
+
+=back
+
+=head1 VERSION
+
+$Id: agent.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::agent_type>, L<FS::cust_main>, L<FS::part_pkg>, 
+schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/agent_type.pm b/FS/FS/agent_type.pm
new file mode 100644
index 000000000..988533ae3
--- /dev/null
+++ b/FS/FS/agent_type.pm
@@ -0,0 +1,165 @@
+package FS::agent_type;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch );
+use FS::agent;
+use FS::type_pkgs;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::agent_type - Object methods for agent_type records
+
+=head1 SYNOPSIS
+
+  use FS::agent_type;
+
+  $record = new FS::agent_type \%hash;
+  $record = new FS::agent_type { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $hashref = $record->pkgpart_hashref;
+  #may purchase $pkgpart if $hashref->{$pkgpart};
+
+  @type_pkgs = $record->type_pkgs;
+
+  @pkgparts = $record->pkgpart;
+
+=head1 DESCRIPTION
+
+An FS::agent_type object represents an agent type.  Every agent (see
+L<FS::agent>) has an agent type.  Agent types define which packages (see
+L<FS::part_pkg>) may be purchased by customers (see L<FS::cust_main>), via 
+FS::type_pkgs records (see L<FS::type_pkgs>).  FS::agent_type inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item typenum - primary key (assigned automatically for new agent types)
+
+=item atype - Text name of this agent type
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new agent type.  To add the agent type to the database, see
+L<"insert">.
+
+=cut
+
+sub table { 'agent_type'; }
+
+=item insert
+
+Adds this agent type to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Deletes this agent type from the database.  Only agent types with no agents
+can be deleted.  If there is an error, returns the error, otherwise returns
+false.
+
+=cut
+
+sub delete {
+  my $self = shift;
+
+  return "Can't delete an agent_type with agents!"
+    if qsearch( 'agent', { 'typenum' => $self->typenum } );
+
+  $self->SUPER::delete;
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid agent type.  If there is an
+error, returns the error, otherwise returns false.  Called by the insert and
+replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  $self->ut_numbern('typenum')
+  or $self->ut_text('atype');
+
+}
+
+=item pkgpart_hashref
+
+Returns a hash reference.  The keys of the hash are pkgparts.  The value is
+true iff this agent may purchase the specified package definition.  See
+L<FS::part_pkg>.
+
+=cut
+
+sub pkgpart_hashref {
+  my $self = shift;
+  my %pkgpart;
+  #$pkgpart{$_}++ foreach $self->pkgpart;
+  # not compatible w/5.004_04 (fixed in 5.004_05)
+  foreach ( $self->pkgpart ) { $pkgpart{$_}++; }
+  \%pkgpart;
+}
+
+=item type_pkgs
+
+Returns all FS::type_pkgs objects (see L<FS::type_pkgs>) for this agent type.
+
+=cut
+
+sub type_pkgs {
+  my $self = shift;
+  qsearch('type_pkgs', { 'typenum' => $self->typenum } );
+}
+
+=item pkgpart
+
+Returns the pkgpart of all package definitions (see L<FS::part_pkg>) for this
+agent type.
+
+=cut
+
+sub pkgpart {
+  my $self = shift;
+  map $_->pkgpart, $self->type_pkgs;
+}
+
+=back
+
+=head1 VERSION
+
+$Id: agent_type.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::agent>, L<FS::type_pkgs>, L<FS::cust_main>,
+L<FS::part_pkg>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
new file mode 100644
index 000000000..30db4699f
--- /dev/null
+++ b/FS/FS/cust_bill.pm
@@ -0,0 +1,450 @@
+package FS::cust_bill;
+
+use strict;
+use vars qw( @ISA $conf $add1 $add2 $add3 $add4 );
+use Date::Format;
+use FS::Record qw( qsearch qsearchs );
+use FS::cust_main;
+use FS::cust_bill_pkg;
+use FS::cust_credit;
+use FS::cust_pay;
+use FS::cust_pkg;
+
+@ISA = qw( FS::Record );
+
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::cust_bill'} = sub { 
+  $conf = new FS::Conf;
+  ( $add1, $add2, $add3, $add4 ) = ( $conf->config('address'), '', '', '', '' );
+};
+
+=head1 NAME
+
+FS::cust_bill - Object methods for cust_bill records
+
+=head1 SYNOPSIS
+
+  use FS::cust_bill;
+
+  $record = new FS::cust_bill \%hash;
+  $record = new FS::cust_bill { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  ( $total_previous_balance, @previous_cust_bill ) = $record->previous;
+
+  @cust_bill_pkg_objects = $cust_bill->cust_bill_pkg;
+
+  ( $total_previous_credits, @previous_cust_credit ) = $record->cust_credit;
+
+  @cust_pay_objects = $cust_bill->cust_pay;
+
+  @lines = $cust_bill->print_text;
+  @lines = $cust_bill->print_text $time;
+
+=head1 DESCRIPTION
+
+An FS::cust_bill object represents an invoice.  FS::cust_bill inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item invnum - primary key (assigned automatically for new invoices)
+
+=item custnum - customer (see L<FS::cust_main>)
+
+=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=item charged - amount of this invoice
+
+=item owed - amount still outstanding on this invoice, which is charged minus
+all payments (see L<FS::cust_pay>).
+
+=item printed - how many times this invoice has been printed automatically
+(see L<FS::cust_main/"collect">).
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new invoice.  To add the invoice to the database, see L<"insert">.
+Invoices are normally created by calling the bill method of a customer object
+(see L<FS::cust_main>).
+
+=cut
+
+sub table { 'cust_bill'; }
+
+=item insert
+
+Adds this invoice to the database ("Posts" the invoice).  If there is an error,
+returns the error, otherwise returns false.
+
+When adding new invoices, owed must be charged (or null, in which case it is
+automatically set to charged).
+
+=cut
+
+sub insert {
+  my $self = shift;
+
+  $self->owed( $self->charged ) if $self->owed eq '';
+  return "owed != charged!"
+    unless $self->owed == $self->charged;
+
+  $self->SUPER::insert;
+}
+
+=item delete
+
+Currently unimplemented.  I don't remove invoices because there would then be
+no record you ever posted this invoice (which is bad, no?)
+
+=cut
+
+sub delete {
+  return "Can't remove invoice!"
+}
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+Only owed and printed may be changed.  Owed is normally updated by creating and
+inserting a payment (see L<FS::cust_pay>).  Printed is normally updated by
+calling the collect method of a customer object (see L<FS::cust_main>).
+
+=cut
+
+sub replace {
+  my( $new, $old ) = ( shift, shift );
+  return "Can't change custnum!" unless $old->custnum == $new->custnum;
+  #return "Can't change _date!" unless $old->_date eq $new->_date;
+  return "Can't change _date!" unless $old->_date == $new->_date;
+  return "Can't change charged!" unless $old->charged == $new->charged;
+  return "(New) owed can't be > (new) charged!" if $new->owed > $new->charged;
+
+  $new->SUPER::replace($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid invoice.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error =
+    $self->ut_numbern('invnum')
+    || $self->ut_number('custnum')
+    || $self->ut_numbern('_date')
+    || $self->ut_money('charged')
+    || $self->ut_money('owed')
+    || $self->ut_numbern('printed')
+  ;
+  return $error if $error;
+
+  return "Unknown customer"
+    unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+
+  $self->_date(time) unless $self->_date;
+
+  $self->printed(0) if $self->printed eq '';
+
+  ''; #no error
+}
+
+=item previous
+
+Returns a list consisting of the total previous balance for this customer, 
+followed by the previous outstanding invoices (as FS::cust_bill objects also).
+
+=cut
+
+sub previous {
+  my $self = shift;
+  my $total = 0;
+  my @cust_bill = sort { $a->_date <=> $b->_date }
+    grep { $_->owed != 0 && $_->_date < $self->_date }
+      qsearch( 'cust_bill', { 'custnum' => $self->custnum } ) 
+  ;
+  foreach ( @cust_bill ) { $total += $_->owed; }
+  $total, @cust_bill;
+}
+
+=item cust_bill_pkg
+
+Returns the line items (see L<FS::cust_bill_pkg>) for this invoice.
+
+=cut
+
+sub cust_bill_pkg {
+  my $self = shift;
+  qsearch( 'cust_bill_pkg', { 'invnum' => $self->invnum } );
+}
+
+=item cust_credit
+
+Returns a list consisting of the total previous credited (see
+L<FS::cust_credit>) for this customer, followed by the previous outstanding
+credits (FS::cust_credit objects).
+
+=cut
+
+sub cust_credit {
+  my $self = shift;
+  my $total = 0;
+  my @cust_credit = sort { $a->_date <=> $b->date }
+    grep { $_->credited != 0 && $_->_date < $self->_date }
+      qsearch('cust_credit', { 'custnum' => $self->custnum } )
+  ;
+  foreach (@cust_credit) { $total += $_->credited; }
+  $total, @cust_credit;
+}
+
+=item cust_pay
+
+Returns all payments (see L<FS::cust_pay>) for this invoice.
+
+=cut
+
+sub cust_pay {
+  my $self = shift;
+  sort { $a->_date <=> $b->date }
+    qsearch( 'cust_pay', { 'invnum' => $self->invnum } )
+  ;
+}
+
+=item print_text [TIME];
+
+Returns an ASCII invoice, as a list of lines.
+
+TIME an optional value used to control the printing of overdue messages.  The
+default is now.  It isn't the date of the invoice; that's the `_date' field.
+It is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=cut
+
+sub print_text {
+
+  my( $self, $today ) = ( shift, shift );
+  $today ||= time;
+  my $invnum = $self->invnum;
+  my $cust_main = qsearchs('cust_main', { 'custnum', $self->custnum } );
+  $cust_main->payname( $cust_main->first. ' '. $cust_main->getfield('last') )
+    unless $cust_main->payname;
+
+  my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
+  my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
+  my $balance_due = $self->owed + $pr_total - $cr_total;
+
+  #overdue?
+  my $overdue = ( 
+    $balance_due > 0
+    && $today > $self->_date 
+    && $self->printed > 1
+  );
+
+  #printing bits here (yuck!)
+
+  my @collect = ();
+
+  my($description,$amount);
+  my(@buf);
+
+  #format address
+  my($l,@address)=(0,'','','','','','','');
+  $address[$l++] =
+    $cust_main->payname.
+      ( ( $cust_main->payby eq 'BILL' ) && $cust_main->payinfo
+        ? " (P.O. #". $cust_main->payinfo. ")"
+        : ''
+      )
+  ;
+  $address[$l++]=$cust_main->company if $cust_main->company;
+  $address[$l++]=$cust_main->address1;
+  $address[$l++]=$cust_main->address2 if $cust_main->address2;
+  $address[$l++]=$cust_main->city. ", ". $cust_main->state. "  ".
+                 $cust_main->zip;
+  $address[$l++]=$cust_main->country unless $cust_main->country eq 'US';
+
+  #previous balance
+  foreach ( @pr_cust_bill ) {
+    push @buf, (
+      "Previous Balance, Invoice #". $_->invnum. 
+                 " (". time2str("%x",$_->_date). ")",
+      '$'. sprintf("%10.2f",$_->owed)
+    );
+  }
+  if (@pr_cust_bill) {
+    push @buf,('','-----------');
+    push @buf,('Total Previous Balance','$' . sprintf("%10.2f",$pr_total ) );
+    push @buf,('','');
+  }
+
+  #new charges
+  foreach ( $self->cust_bill_pkg ) {
+
+    if ( $_->pkgnum ) {
+
+      my($cust_pkg)=qsearchs('cust_pkg', { 'pkgnum', $_->pkgnum } );
+      my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->pkgpart});
+      my($pkg)=$part_pkg->pkg;
+
+      if ( $_->setup != 0 ) {
+        push @buf, ( "$pkg Setup",'$' . sprintf("%10.2f",$_->setup) );
+        push @buf, map { "  ". $_->[0]. ": ". $_->[1], '' } $cust_pkg->labels;
+      }
+
+      if ( $_->recur != 0 ) {
+        push @buf, (
+          "$pkg (" . time2str("%x",$_->sdate) . " - " .
+                                time2str("%x",$_->edate) . ")",
+          '$' . sprintf("%10.2f",$_->recur)
+        );
+        push @buf, map { "  ". $_->[0]. ": ". $_->[1], '' } $cust_pkg->labels;
+      }
+
+    } else { #pkgnum Tax
+      push @buf,("Tax",'$' . sprintf("%10.2f",$_->setup) ) 
+        if $_->setup != 0;
+    }
+  }
+
+  push @buf,('','-----------');
+  push @buf,('Total New Charges',
+             '$' . sprintf("%10.2f",$self->charged) );
+  push @buf,('','');
+
+  push @buf,('','-----------');
+  push @buf,('Total Charges',
+             '$' . sprintf("%10.2f",$self->charged + $pr_total) );
+  push @buf,('','');
+
+  #credits
+  foreach ( @cr_cust_credit ) {
+    push @buf,(
+      "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
+      '$' . sprintf("%10.2f",$_->credited)
+    );
+  }
+
+  #get & print payments
+  foreach ( $self->cust_pay ) {
+    push @buf,(
+      "Payment received ". time2str("%x",$_->_date ),
+      '$' . sprintf("%10.2f",$_->paid )
+    );
+  }
+
+  #balance due
+  push @buf,('','-----------');
+  push @buf,('Balance Due','$' . 
+    sprintf("%10.2f",$self->owed + $pr_total - $cr_total ) );
+
+  #now print
+
+  my $tot_lines = 50; #should be configurable
+   #header is 17 lines
+  my $tot_pages = int( scalar(@buf) / ( 2 * ( $tot_lines - 17 ) ) );
+  $tot_pages++ if scalar(@buf) % ( 2 * ( $tot_lines - 17 ) );
+
+  my $page = 1;
+  my $lines;
+  while (@buf) {
+    $lines = $tot_lines;
+    my @header = &header(
+      $page, $tot_pages, $self->_date, $self->invnum, @address
+    );
+    push @collect, @header;
+    $lines -= scalar(@header);
+
+    while ( $lines-- && @buf ) {
+      $description=shift(@buf);
+      $amount=shift(@buf);
+      push @collect, myswrite($description, $amount);
+    }
+    $page++;
+  }
+  while ( $lines-- ) {
+    push @collect, myswrite('', '');
+  }
+
+  return @collect;
+
+  sub header { #17 lines
+    my ( $page, $tot_pages, $date, $invnum, @address ) = @_ ;
+    push @address, '', '', '', '';
+
+    my @return = ();
+    my $i = ' 'x32;
+    push @return,
+      '',
+      $i. 'Invoice',
+      $i. substr("Page $page of $tot_pages".' 'x10, 0, 20).
+        time2str("%x", $date ). "  FS-". $invnum,
+      '',
+      '',
+      $add1,
+      $add2,
+      $add3,
+      $add4,
+      '',
+      splice @address, 0, 7;
+    ;
+    return map $_. "\n", @return;
+  }
+
+  sub myswrite {
+    my $format = <<END;
+  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<
+END
+    $^A = '';
+    formline( $format, @_ );
+    return $^A;
+  }
+
+}
+
+=back
+
+=head1 VERSION
+
+$Id: cust_bill.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+The delete method.
+
+print_text formatting (and some logic :/) is in source, but needs to be
+slurped in from a file.  Also number of lines ($=).
+
+missing print_ps for a nice postscript copy (maybe HylaFAX-cover-page-style
+or something similar so the look can be completely customized?)
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_main>, L<FS::cust_pay>, L<FS::cust_bill_pkg>,
+L<FS::cust_credit>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
new file mode 100644
index 000000000..38d059df8
--- /dev/null
+++ b/FS/FS/cust_bill_pkg.pm
@@ -0,0 +1,144 @@
+package FS::cust_bill_pkg;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs );
+use FS::cust_pkg;
+use FS::cust_bill;
+
+@ISA = qw(FS::Record );
+
+=head1 NAME
+
+FS::cust_bill_pkg - Object methods for cust_bill_pkg records
+
+=head1 SYNOPSIS
+
+  use FS::cust_bill_pkg;
+
+  $record = new FS::cust_bill_pkg \%hash;
+  $record = new FS::cust_bill_pkg { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_bill_pkg object represents an invoice line item.
+FS::cust_bill_pkg inherits from FS::Record.  The following fields are currently
+supported:
+
+=over 4
+
+=item invnum - invoice (see L<FS::cust_bill>)
+
+=item pkgnum - package (see L<FS::cust_pkg>)
+
+=item setup - setup fee
+
+=item recur - recurring fee
+
+=item sdate - starting date of recurring fee
+
+=item edate - ending date of recurring fee
+
+=back
+
+sdate and edate are specified as UNIX timestamps; see L<perlfunc/"time">.  Also
+see L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new line item.  To add the line item to the database, see
+L<"insert">.  Line items are normally created by calling the bill method of a
+customer object (see L<FS::cust_main>).
+
+=cut
+
+sub table { 'cust_bill_pkg'; }
+
+=item insert
+
+Adds this line item to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Currently unimplemented.  I don't remove line items because there would then be
+no record the items ever existed (which is bad, no?)
+
+=cut
+
+sub delete {
+  return "Can't delete cust_bill_pkg records!";
+}
+
+=item replace OLD_RECORD
+
+Currently unimplemented.  This would be even more of an accounting nightmare
+than deleteing the items.  Just don't do it.
+
+=cut
+
+sub replace {
+  return "Can't modify cust_bill_pkg records!";
+}
+
+=item check
+
+Checks all fields to make sure this is a valid line item.  If there is an
+error, returns the error, otherwise returns false.  Called by the insert
+method.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error =
+    $self->ut_number('pkgnum')
+      || $self->ut_number('invnum')
+      || $self->ut_money('setup')
+      || $self->ut_money('recur')
+      || $self->ut_numbern('sdate')
+      || $self->ut_numbern('edate')
+  ;
+  return $error if $error;
+
+  if ( $self->pkgnum != 0 ) { #allow unchecked pkgnum 0 for tax! (add to part_pkg?)
+    return "Unknown pkgnum ". $self->pkgnum
+      unless qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
+  }
+
+  return "Unknown invnum"
+    unless qsearchs( 'cust_bill' ,{ 'invnum' => $self->invnum } );
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: cust_bill_pkg.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_bill>, L<FS::cust_pkg>, L<FS::cust_main>, schema.html
+from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
new file mode 100644
index 000000000..de8c39d69
--- /dev/null
+++ b/FS/FS/cust_credit.pm
@@ -0,0 +1,174 @@
+package FS::cust_credit;
+
+use strict;
+use vars qw( @ISA );
+use FS::UID qw( getotaker );
+use FS::Record qw( qsearchs );
+use FS::cust_main;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::cust_credit - Object methods for cust_credit records
+
+=head1 SYNOPSIS
+
+  use FS::cust_credit;
+
+  $record = new FS::cust_credit \%hash;
+  $record = new FS::cust_credit { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_credit object represents a credit.  FS::cust_credit inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item crednum - primary key (assigned automatically for new credits)
+
+=item custnum - customer (see L<FS::cust_main>)
+
+=item amount - amount of the credit
+
+=item credited - how much of this credit that is still outstanding, which is
+amount minus all refunds (see L<FS::cust_refund>).
+
+=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=item otaker - order taker (assigned automatically, see L<FS::UID>)
+
+=item reason - text
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new credit.  To add the credit to the database, see L<"insert">.
+
+=cut
+
+sub table { 'cust_credit'; }
+
+=item insert
+
+Adds this credit to the database ("Posts" the credit).  If there is an error,
+returns the error, otherwise returns false.
+
+When adding new invoices, credited must be amount (or null, in which case it is
+automatically set to amount).
+
+=cut
+
+sub insert {
+  my $self = shift;
+
+  my $error;
+  return $error if $error = $self->ut_money('credited')
+                         || $self->ut_money('amount');
+
+  $self->credited($self->amount) if $self->credited == 0
+                                 || $self->credited eq '';
+  return "credited != amount!"
+    unless $self->credited == $self->amount;
+
+  $self->SUPER::insert;
+}
+
+=item delete
+
+Currently unimplemented.
+
+=cut
+
+sub delete {
+  return "Can't remove credit!"
+}
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+Only credited may be changed.  Credited is normally updated by creating and
+inserting a refund (see L<FS::cust_refund>).
+
+=cut
+
+sub replace {
+  my ( $new, $old ) = ( shift, shift );
+
+  return "Can't change custnum!" unless $old->custnum == $new->custnum;
+  #return "Can't change date!" unless $old->_date eq $new->_date;
+  return "Can't change date!" unless $old->_date == $new->_date;
+  return "Can't change amount!" unless $old->amount == $new->amount;
+  return "(New) credited can't be > (new) amount!"
+    if $new->credited > $new->amount;
+
+  $new->SUPER::replace($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid credit.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error =
+    $self->ut_numbern('crednum')
+    || $self->ut_number('custnum')
+    || $self->ut_numbern('_date')
+    || $self->ut_money('amount')
+    || $self->ut_money('credited')
+    || $self->ut_textn('reason');
+  ;
+  return $error if $error;
+
+  return "Unknown customer"
+    unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+
+  $self->_date(time) unless $self->_date;
+
+  $self->otaker(getotaker);
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: cust_credit.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+The delete method.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_refund>, L<FS::cust_bill>, schema.html from the base
+documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
new file mode 100644
index 000000000..25b6b9f46
--- /dev/null
+++ b/FS/FS/cust_main.pm
@@ -0,0 +1,965 @@
+#this is so kludgy i'd be embarassed if it wasn't cybercash's fault
+package main;
+use vars qw($paymentserversecret $paymentserverport $paymentserverhost);
+
+package FS::cust_main;
+
+use strict;
+use vars qw( @ISA $conf $lpr $processor $xaction $E_NoErr $invoice_from
+             $smtpmachine );
+use Safe;
+use Carp;
+use Time::Local;
+use Date::Format;
+use Date::Manip;
+use Mail::Internet;
+use Mail::Header;
+use Business::CreditCard;
+use FS::UID qw( getotaker );
+use FS::Record qw( qsearchs qsearch );
+use FS::cust_pkg;
+use FS::cust_bill;
+use FS::cust_bill_pkg;
+use FS::cust_pay;
+use FS::cust_credit;
+use FS::cust_pay_batch;
+use FS::part_referral;
+use FS::cust_main_county;
+use FS::agent;
+use FS::cust_main_invoice;
+
+@ISA = qw( FS::Record );
+
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::cust_main'} = sub { 
+  $conf = new FS::Conf;
+  $lpr = $conf->config('lpr');
+  $invoice_from = $conf->config('invoice_from');
+  $smtpmachine = $conf->config('smtpmachine');
+
+  if ( $conf->exists('cybercash3.2') ) {
+    require CCMckLib3_2;
+      #qw($MCKversion %Config InitConfig CCError CCDebug CCDebug2);
+    require CCMckDirectLib3_2;
+      #qw(SendCC2_1Server);
+    require CCMckErrno3_2;
+      #qw(MCKGetErrorMessage $E_NoErr);
+    import CCMckErrno3_2 qw($E_NoErr);
+
+    my $merchant_conf;
+    ($merchant_conf,$xaction)= $conf->config('cybercash3.2');
+    my $status = &CCMckLib3_2::InitConfig($merchant_conf);
+    if ( $status != $E_NoErr ) {
+      warn "CCMckLib3_2::InitConfig error:\n";
+      foreach my $key (keys %CCMckLib3_2::Config) {
+        warn "  $key => $CCMckLib3_2::Config{$key}\n"
+      }
+      my($errmsg) = &CCMckErrno3_2::MCKGetErrorMessage($status);
+      die "CCMckLib3_2::InitConfig fatal error: $errmsg\n";
+    }
+    $processor='cybercash3.2';
+  } elsif ( $conf->exists('cybercash2') ) {
+    require CCLib;
+      #qw(sendmserver);
+    ( $main::paymentserverhost, 
+      $main::paymentserverport, 
+      $main::paymentserversecret,
+      $xaction,
+    ) = $conf->config('cybercash2');
+    $processor='cybercash2';
+  }
+};
+
+=head1 NAME
+
+FS::cust_main - Object methods for cust_main records
+
+=head1 SYNOPSIS
+
+  use FS::cust_main;
+
+  $record = new FS::cust_main \%hash;
+  $record = new FS::cust_main { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  @cust_pkg = $record->all_pkgs;
+
+  @cust_pkg = $record->ncancelled_pkgs;
+
+  $error = $record->bill;
+  $error = $record->bill %options;
+  $error = $record->bill 'time' => $time;
+
+  $error = $record->collect;
+  $error = $record->collect %options;
+  $error = $record->collect 'invoice_time'   => $time,
+                            'batch_card'     => 'yes',
+                            'report_badcard' => 'yes',
+                          ;
+
+=head1 DESCRIPTION
+
+An FS::cust_main object represents a customer.  FS::cust_main inherits from 
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item custnum - primary key (assigned automatically for new customers)
+
+=item agentnum - agent (see L<FS::agent>)
+
+=item refnum - referral (see L<FS::part_referral>)
+
+=item first - name
+
+=item last - name
+
+=item ss - social security number (optional)
+
+=item company - (optional)
+
+=item address1
+
+=item address2 - (optional)
+
+=item city
+
+=item county - (optional, see L<FS::cust_main_county>)
+
+=item state - (see L<FS::cust_main_county>)
+
+=item zip
+
+=item country - (see L<FS::cust_main_county>)
+
+=item daytime - phone (optional)
+
+=item night - phone (optional)
+
+=item fax - phone (optional)
+
+=item payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
+
+=item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
+
+=item paydate - expiration date, mm/yyyy, m/yyyy, mm/yy or m/yy
+
+=item payname - name on card or billing name
+
+=item tax - tax exempt, empty or `Y'
+
+=item otaker - order taker (assigned automatically, see L<FS::UID>)
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new customer.  To add the customer to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub table { 'cust_main'; }
+
+=item insert
+
+Adds this customer to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete NEW_CUSTNUM
+
+This deletes the customer.  If there is an error, returns the error, otherwise
+returns false.
+
+This will completely remove all traces of the customer record.  This is not
+what you want when a customer cancels service; for that, cancel all of the
+customer's packages (see L<FS::cust_pkg/cancel>).
+
+If the customer has any packages, you need to pass a new (valid) customer
+number for those packages to be transferred to.
+
+You can't delete a customer with invoices (see L<FS::cust_bill>),
+or credits (see L<FS::cust_credit>).
+
+=cut
+
+sub delete {
+  my $self = shift;
+
+  if ( qsearch( 'cust_bill', { 'custnum' => $self->custnum } ) ) {
+    return "Can't delete a customer with invoices";
+  }
+  if ( qsearch( 'cust_credit', { 'custnum' => $self->custnum } ) ) {
+    return "Can't delete a customer with credits";
+  }
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my @cust_pkg = qsearch( 'cust_pkg', { 'custnum' => $self->custnum } );
+  if ( @cust_pkg ) {
+    my $new_custnum = shift;
+    return "Invalid new customer number: $new_custnum"
+      unless qsearchs( 'cust_main', { 'custnum' => $new_custnum } );
+    foreach my $cust_pkg ( @cust_pkg ) {
+      my %hash = $cust_pkg->hash;
+      $hash{'custnum'} = $new_custnum;
+      my $new_cust_pkg = new FS::cust_pkg ( \%hash );
+      my $error = $new_cust_pkg->replace($cust_pkg);
+      return $error if $error;
+    }
+  }
+  foreach my $cust_main_invoice (
+    qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } )
+  ) {
+    my $error = $cust_main_invoice->delete;
+    return $error if $error;
+  }
+
+  $self->SUPER::delete;
+}
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid customer record.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error =
+    $self->ut_numbern('custnum')
+    || $self->ut_number('agentnum')
+    || $self->ut_number('refnum')
+    || $self->ut_textn('company')
+    || $self->ut_text('address1')
+    || $self->ut_textn('address2')
+    || $self->ut_text('city')
+    || $self->ut_textn('county')
+    || $self->ut_textn('state')
+    || $self->ut_phonen('daytime')
+    || $self->ut_phonen('night')
+    || $self->ut_phonen('fax')
+  ;
+  return $error if $error;
+
+  return "Unknown agent"
+    unless qsearchs( 'agent', { 'agentnum' => $self->agentnum } );
+
+  return "Unknown referral"
+    unless qsearchs( 'part_referral', { 'refnum' => $self->refnum } );
+
+  $self->getfield('last') =~ /^([\w \,\.\-\']+)$/
+    or return "Illegal last name: ". $self->getfield('last');
+  $self->setfield('last',$1);
+
+  $self->first =~ /^([\w \,\.\-\']+)$/
+    or return "Illegal first name: ". $self->first;
+  $self->first($1);
+
+  if ( $self->ss eq '' ) {
+    $self->ss('');
+  } else {
+    my $ss = $self->ss;
+    $ss =~ s/\D//g;
+    $ss =~ /^(\d{3})(\d{2})(\d{4})$/
+      or return "Illegal social security number: ". $self->ss;
+    $self->ss("$1-$2-$3");
+  }
+
+  $self->country =~ /^(\w\w)$/ or return "Illegal country: ". $self->country;
+  $self->country($1);
+  unless ( qsearchs('cust_main_county', {
+    'country' => $self->country,
+    'state'   => '',
+   } ) ) {
+    return "Unknown state/county/country: ".
+      $self->state. "/". $self->county. "/". $self->country
+      unless qsearchs('cust_main_county',{
+        'state'   => $self->state,
+        'county'  => $self->county,
+        'country' => $self->country,
+      } );
+  }
+
+  $self->zip =~ /^\s*(\w[\w\-\s]{3,8}\w)\s*$/
+    or return "Illegal zip: ". $self->zip;
+  $self->zip($1);
+
+  $self->payby =~ /^(CARD|BILL|COMP)$/
+    or return "Illegal payby: ". $self->payby;
+  $self->payby($1);
+
+  if ( $self->payby eq 'CARD' ) {
+
+    my $payinfo = $self->payinfo;
+    $payinfo =~ s/\D//g;
+    $payinfo =~ /^(\d{13,16})$/
+      or return "Illegal credit card number: ". $self->payinfo;
+    $payinfo = $1;
+    $self->payinfo($payinfo);
+    validate($payinfo)
+      or return "Illegal credit card number: ". $self->payinfo;
+    return "Unknown card type" if cardtype($self->payinfo) eq "Unknown";
+
+  } elsif ( $self->payby eq 'BILL' ) {
+
+    $error = $self->ut_textn('payinfo');
+    return "Illegal P.O. number: ". $self->payinfo if $error;
+
+  } elsif ( $self->payby eq 'COMP' ) {
+
+    $error = $self->ut_textn('payinfo');
+    return "Illegal comp account issuer: ". $self->payinfo if $error;
+
+  }
+
+  if ( $self->paydate eq '' ) {
+    return "Expriation date required" unless $self->payby eq 'BILL';
+    $self->paydate('');
+  } else {
+    $self->paydate =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/
+      or return "Illegal expiration date: ". $self->paydate;
+    if ( length($2) == 4 ) {
+      $self->paydate("$2-$1-01");
+    } elsif ( $2 > 97 ) { #should pry change to check for "this year"
+      $self->paydate("19$2-$1-01");
+    } else {
+      $self->paydate("20$2-$1-01");
+    }
+  }
+
+  if ( $self->payname eq '' ) {
+    $self->payname( $self->first. " ". $self->getfield('last') );
+  } else {
+    $self->payname =~ /^([\w \,\.\-\']+)$/
+      or return "Illegal billing name: ". $self->payname;
+    $self->payname($1);
+  }
+
+  $self->tax =~ /^(Y?)$/ or return "Illegal tax: ". $self->tax;
+  $self->tax($1);
+
+  $self->otaker(getotaker);
+
+  ''; #no error
+}
+
+=item all_pkgs
+
+Returns all packages (see L<FS::cust_pkg>) for this customer.
+
+=cut
+
+sub all_pkgs {
+  my $self = shift;
+  qsearch( 'cust_pkg', { 'custnum' => $self->custnum });
+}
+
+=item ncancelled_pkgs
+
+Returns all non-cancelled packages (see L<FS::cust_pkg>) for this customer.
+
+=cut
+
+sub ncancelled_pkgs {
+  my $self = shift;
+  qsearch( 'cust_pkg', {
+    'custnum' => $self->custnum,
+    'cancel'  => '',
+  });
+}
+
+=item bill OPTIONS
+
+Generates invoices (see L<FS::cust_bill>) for this customer.  Usually used in
+conjunction with the collect method.
+
+The only currently available option is `time', which bills the customer as if
+it were that time.  It is specified as a UNIX timestamp; see
+L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse> for conversion
+functions.
+
+If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub bill {
+  my( $self, %options ) = @_;
+  my $time = $options{'time'} || time;
+
+  my $error;
+
+  #put below somehow?
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  # find the packages which are due for billing, find out how much they are
+  # & generate invoice database.
+ 
+  my( $total_setup, $total_recur ) = ( 0, 0 );
+  my @cust_bill_pkg;
+
+  foreach my $cust_pkg (
+    qsearch('cust_pkg',{'custnum'=> $self->getfield('custnum') } )
+  ) {
+
+    next if $cust_pkg->getfield('cancel');  
+
+    #? to avoid use of uninitialized value errors... ?
+    $cust_pkg->setfield('bill', '')
+      unless defined($cust_pkg->bill);
+ 
+    my $part_pkg = qsearchs( 'part_pkg', { 'pkgpart' => $cust_pkg->pkgpart } );
+
+    #so we don't modify cust_pkg record unnecessarily
+    my $cust_pkg_mod_flag = 0;
+    my %hash = $cust_pkg->hash;
+    my $old_cust_pkg = new FS::cust_pkg \%hash;
+
+    # bill setup
+    my $setup = 0;
+    unless ( $cust_pkg->setup ) {
+      my $setup_prog = $part_pkg->getfield('setup');
+      my $cpt = new Safe;
+      #$cpt->permit(); #what is necessary?
+      $cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
+      $setup = $cpt->reval($setup_prog);
+      unless ( defined($setup) ) {
+        warn "Error reval-ing part_pkg->setup pkgpart ", 
+             $part_pkg->pkgpart, ": $@";
+      } else {
+        $cust_pkg->setfield('setup',$time);
+        $cust_pkg_mod_flag=1; 
+      }
+    }
+
+    #bill recurring fee
+    my $recur = 0;
+    my $sdate;
+    if ( $part_pkg->getfield('freq') > 0 &&
+         ! $cust_pkg->getfield('susp') &&
+         ( $cust_pkg->getfield('bill') || 0 ) < $time
+    ) {
+      my $recur_prog = $part_pkg->getfield('recur');
+      my $cpt = new Safe;
+      #$cpt->permit(); #what is necessary?
+      $cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
+      $recur = $cpt->reval($recur_prog);
+      unless ( defined($recur) ) {
+        warn "Error reval-ing part_pkg->recur pkgpart ",
+             $part_pkg->pkgpart, ": $@";
+      } else {
+        #change this bit to use Date::Manip?
+        #$sdate=$cust_pkg->bill || time;
+        #$sdate=$cust_pkg->bill || $time;
+        $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
+        my ($sec,$min,$hour,$mday,$mon,$year) =
+          (localtime($sdate) )[0,1,2,3,4,5];
+        $mon += $part_pkg->getfield('freq');
+        until ( $mon < 12 ) { $mon -= 12; $year++; }
+        $cust_pkg->setfield('bill',
+          timelocal($sec,$min,$hour,$mday,$mon,$year));
+        $cust_pkg_mod_flag = 1; 
+      }
+    }
+
+    warn "setup is undefinded" unless defined($setup);
+    warn "recur is undefinded" unless defined($recur);
+    warn "cust_pkg bill is undefinded" unless defined($cust_pkg->bill);
+
+    if ( $cust_pkg_mod_flag ) {
+      $error=$cust_pkg->replace($old_cust_pkg);
+      if ( $error ) { #just in case
+        warn "Error modifying pkgnum ", $cust_pkg->pkgnum, ": $error";
+      } else {
+        $setup = sprintf( "%.2f", $setup );
+        $recur = sprintf( "%.2f", $recur );
+        my $cust_bill_pkg = new FS::cust_bill_pkg ({
+          'pkgnum' => $cust_pkg->pkgnum,
+          'setup'  => $setup,
+          'recur'  => $recur,
+          'sdate'  => $sdate,
+          'edate'  => $cust_pkg->bill,
+        });
+        push @cust_bill_pkg, $cust_bill_pkg;
+        $total_setup += $setup;
+        $total_recur += $recur;
+      }
+    }
+
+  }
+
+  my $charged = sprintf( "%.2f", $total_setup + $total_recur );
+
+  return '' if scalar(@cust_bill_pkg) == 0;
+
+  unless ( $self->getfield('tax') =~ /Y/i
+           || $self->getfield('payby') eq 'COMP'
+  ) {
+    my $cust_main_county = qsearchs('cust_main_county',{
+        'state'   => $self->state,
+        'county'  => $self->county,
+        'country' => $self->country,
+    } );
+    my $tax = sprintf( "%.2f",
+      $charged * ( $cust_main_county->getfield('tax') / 100 )
+    );
+    $charged = sprintf( "%.2f", $charged+$tax );
+
+    my $cust_bill_pkg = new FS::cust_bill_pkg ({
+      'pkgnum' => 0,
+      'setup'  => $tax,
+      'recur'  => 0,
+      'sdate'  => '',
+      'edate'  => '',
+    });
+    push @cust_bill_pkg, $cust_bill_pkg;
+  }
+
+  my $cust_bill = new FS::cust_bill ( {
+    'custnum' => $self->getfield('custnum'),
+    '_date' => $time,
+    'charged' => $charged,
+  } );
+  $error = $cust_bill->insert;
+  #shouldn't happen, but how else to handle this? (wrap me in eval, to catch 
+  # fatal errors)
+  die "Error creating cust_bill record: $error!\n",
+      "Check updated but unbilled packages for customer", $self->custnum, "\n"
+    if $error;
+
+  my $invnum = $cust_bill->invnum;
+  my $cust_bill_pkg;
+  foreach $cust_bill_pkg ( @cust_bill_pkg ) {
+    $cust_bill_pkg->setfield( 'invnum', $invnum );
+    $error = $cust_bill_pkg->insert;
+    #shouldn't happen, but how else tohandle this?
+    die "Error creating cust_bill_pkg record: $error!\n",
+        "Check incomplete invoice ", $invnum, "\n"
+      if $error;
+  }
+  
+  ''; #no error
+}
+
+=item collect OPTIONS
+
+(Attempt to) collect money for this customer's outstanding invoices (see
+L<FS::cust_bill>).  Usually used after the bill method.
+
+Depending on the value of `payby', this may print an invoice (`BILL'), charge
+a credit card (`CARD'), or just add any necessary (pseudo-)payment (`COMP').
+
+If there is an error, returns the error, otherwise returns false.
+
+Currently available options are:
+
+invoice_time - Use this time when deciding when to print invoices and
+late notices on those invoices.  The default is now.  It is specified as a UNIX timestamp; see L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse>
+for conversion functions.
+
+batch_card - Set this true to batch cards (see L<cust_pay_batch>).  By
+default, cards are processed immediately, which will generate an error if
+CyberCash is not installed.
+
+report_badcard - Set this true if you want bad card transactions to
+return an error.  By default, they don't.
+
+=cut
+
+sub collect {
+  my( $self, %options ) = @_;
+  my $invoice_time = $options{'invoice_time'} || time;
+
+  my $total_owed = $self->balance;
+  return '' unless $total_owed > 0; #redundant?????
+
+  #put below somehow?
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  foreach my $cust_bill (
+    qsearch('cust_bill', { 'custnum' => $self->custnum, } )
+  ) {
+
+    #this has to be before next's
+    my $amount = sprintf( "%.2f", $total_owed < $cust_bill->owed
+                                  ? $total_owed
+                                  : $cust_bill->owed
+    );
+    $total_owed = sprintf( "%.2f", $total_owed - $amount );
+
+    next unless $cust_bill->owed > 0;
+
+    next if qsearchs( 'cust_pay_batch', { 'invnum' => $cust_bill->invnum } );
+
+    #warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ", amount $amount, total_owed $total_owed)";
+
+    next unless $amount > 0;
+
+    if ( $self->payby eq 'BILL' ) {
+
+      #30 days 2592000
+      my $since = $invoice_time - ( $cust_bill->_date || 0 );
+      #warn "$invoice_time ", $cust_bill->_date, " $since";
+      if ( $since >= 0 #don't print future invoices
+           && ( $cust_bill->printed * 2592000 ) <= $since
+      ) {
+
+        #my @print_text = $cust_bill->print_text; #( date )
+        my @invoicing_list = $self->invoicing_list;
+        if ( grep { $_ ne 'POST' } @invoicing_list ) { #email invoice
+          $ENV{SMTPHOSTS} = $smtpmachine;
+          $ENV{MAILADDRESS} = $invoice_from;
+          my $header = new Mail::Header ( [
+            "From: $invoice_from",
+            "To: ". join(', ', grep { $_ ne 'POST' } @invoicing_list ),
+            "Sender: $invoice_from",
+            "Reply-To: $invoice_from",
+            "Date: ". time2str("%a, %d %b %Y %X %z", time),
+            "Subject: Invoice",
+          ] );
+          my $message = new Mail::Internet (
+            'Header' => $header,
+            'Body' => [ $cust_bill->print_text ], #( date)
+          );
+          $message->smtpsend or die "Can't send invoice email!"; #die?  warn?
+
+        } elsif ( ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list ) {
+          open(LPR, "|$lpr") or die "Can't open pipe to $lpr: $!";
+          print LPR $cust_bill->print_text; #( date )
+          close LPR
+            or die $! ? "Error closing $lpr: $!"
+                         : "Exit status $? from $lpr";
+        }
+
+        my %hash = $cust_bill->hash;
+        $hash{'printed'}++;
+        my $new_cust_bill = new FS::cust_bill(\%hash);
+        my $error = $new_cust_bill->replace($cust_bill);
+        warn "Error updating $cust_bill->printed: $error" if $error;
+
+      }
+
+    } elsif ( $self->payby eq 'COMP' ) {
+      my $cust_pay = new FS::cust_pay ( {
+         'invnum' => $cust_bill->invnum,
+         'paid' => $amount,
+         '_date' => '',
+         'payby' => 'COMP',
+         'payinfo' => $self->payinfo,
+         'paybatch' => ''
+      } );
+      my $error = $cust_pay->insert;
+      return 'Error COMPing invnum #' . $cust_bill->invnum .
+             ':' . $error if $error;
+
+    } elsif ( $self->payby eq 'CARD' ) {
+
+      if ( $options{'batch_card'} ne 'yes' ) {
+
+        return "Real time card processing not enabled!" unless $processor;
+
+        if ( $processor =~ /^cybercash/ ) {
+
+          #fix exp. date for cybercash
+          #$self->paydate =~ /^(\d+)\/\d*(\d{2})$/;
+          $self->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
+          my $exp = "$2/$1";
+
+          my $paybatch = $cust_bill->invnum. 
+                         '-' . time2str("%y%m%d%H%M%S", time);
+
+          my $payname = $self->payname ||
+                        $self->getfield('first'). ' '. $self->getfield('last');
+
+          my $address = $self->address1;
+          $address .= ", ". $self->address2 if $self->address2;
+
+          my $country = 'USA' if $self->country eq 'US';
+
+          my @full_xaction = ( $xaction,
+            'Order-ID'     => $paybatch,
+            'Amount'       => "usd $amount",
+            'Card-Number'  => $self->getfield('payinfo'),
+            'Card-Name'    => $payname,
+            'Card-Address' => $address,
+            'Card-City'    => $self->getfield('city'),
+            'Card-State'   => $self->getfield('state'),
+            'Card-Zip'     => $self->getfield('zip'),
+            'Card-Country' => $country,
+            'Card-Exp'     => $exp,
+          );
+
+          my %result;
+          if ( $processor eq 'cybercash2' ) {
+            $^W=0; #CCLib isn't -w safe, ugh!
+            %result = &CCLib::sendmserver(@full_xaction);
+            $^W=1;
+          } elsif ( $processor eq 'cybercash3.2' ) {
+            %result = &CCMckDirectLib3_2::SendCC2_1Server(@full_xaction);
+          } else {
+            return "Unkonwn real-time processor $processor\n";
+          }
+         
+          #if ( $result{'MActionCode'} == 7 ) { #cybercash smps v.1.1.3
+          #if ( $result{'action-code'} == 7 ) { #cybercash smps v.2.1
+          if ( $result{'MStatus'} eq 'success' ) { #cybercash smps v.2 or 3
+            my $cust_pay = new FS::cust_pay ( {
+               'invnum'   => $cust_bill->invnum,
+               'paid'     => $amount,
+               '_date'     => '',
+               'payby'    => 'CARD',
+               'payinfo'  => $self->payinfo,
+               'paybatch' => "$processor:$paybatch",
+            } );
+            my $error = $cust_pay->insert;
+            return 'Error applying payment, invnum #' . 
+              $cust_bill->invnum. ':'. $error if $error;
+          } elsif ( $result{'Mstatus'} ne 'failure-bad-money'
+                 || $options{'report_badcard'} ) {
+             return 'Cybercash error, invnum #' . 
+               $cust_bill->invnum. ':'. $result{'MErrMsg'};
+          } else {
+            return '';
+          }
+
+        } else {
+          return "Unkonwn real-time processor $processor\n";
+        }
+
+      } else { #batch card
+
+       my $cust_pay_batch = new FS::cust_pay_batch ( {
+         'invnum'   => $cust_bill->getfield('invnum'),
+         'custnum'  => $self->getfield('custnum'),
+         'last'     => $self->getfield('last'),
+         'first'    => $self->getfield('first'),
+         'address1' => $self->getfield('address1'),
+         'address2' => $self->getfield('address2'),
+         'city'     => $self->getfield('city'),
+         'state'    => $self->getfield('state'),
+         'zip'      => $self->getfield('zip'),
+         'country'  => $self->getfield('country'),
+         'trancode' => 77,
+         'cardnum'  => $self->getfield('payinfo'),
+         'exp'      => $self->getfield('paydate'),
+         'payname'  => $self->getfield('payname'),
+         'amount'   => $amount,
+       } );
+       my $error = $cust_pay_batch->insert;
+       return "Error adding to cust_pay_batch: $error" if $error;
+
+      }
+
+    } else {
+      return "Unknown payment type ". $self->payby;
+    }
+
+
+
+
+
+  }
+  '';
+
+}
+
+=item total_owed
+
+Returns the total owed for this customer on all invoices
+(see L<FS::cust_bill>).
+
+=cut
+
+sub total_owed {
+  my $self = shift;
+  my $total_bill = 0;
+  foreach my $cust_bill ( qsearch('cust_bill', {
+    'custnum' => $self->custnum,
+  } ) ) {
+    $total_bill += $cust_bill->owed;
+  }
+  sprintf( "%.2f", $total_bill );
+}
+
+=item total_credited
+
+Returns the total credits (see L<FS::cust_credit>) for this customer.
+
+=cut
+
+sub total_credited {
+  my $self = shift;
+  my $total_credit = 0;
+  foreach my $cust_credit ( qsearch('cust_credit', {
+    'custnum' => $self->custnum,
+  } ) ) {
+    $total_credit += $cust_credit->credited;
+  }
+  sprintf( "%.2f", $total_credit );
+}
+
+=item balance
+
+Returns the balance for this customer (total owed minus total credited).
+
+=cut
+
+sub balance {
+  my $self = shift;
+  sprintf( "%.2f", $self->total_owed - $self->total_credited );
+}
+
+=item invoicing_list [ ARRAYREF ]
+
+If an arguement is given, sets these email addresses as invoice recipients
+(see L<FS::cust_main_invoice>).  Errors are not fatal and are not reported
+(except as warnings), so use check_invoicing_list first.
+
+Returns a list of email addresses (with svcnum entries expanded).
+
+Note: You can clear the invoicing list by passing an empty ARRAYREF.  You can
+check it without disturbing anything by passing nothing.
+
+This interface may change in the future.
+
+=cut
+
+sub invoicing_list {
+  my( $self, $arrayref ) = @_;
+  if ( $arrayref ) {
+    my @cust_main_invoice;
+    if ( $self->custnum ) {
+      @cust_main_invoice = 
+        qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
+    } else {
+      @cust_main_invoice = ();
+    }
+    foreach my $cust_main_invoice ( @cust_main_invoice ) {
+      #warn $cust_main_invoice->destnum;
+      unless ( grep { $cust_main_invoice->address eq $_ } @{$arrayref} ) {
+        #warn $cust_main_invoice->destnum;
+        my $error = $cust_main_invoice->delete;
+        warn $error if $error;
+      }
+    }
+    if ( $self->custnum ) {
+      @cust_main_invoice = 
+        qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
+    } else {
+      @cust_main_invoice = ();
+    }
+    foreach my $address ( @{$arrayref} ) {
+      unless ( grep { $address eq $_->address } @cust_main_invoice ) {
+        my $cust_main_invoice = new FS::cust_main_invoice ( {
+          'custnum' => $self->custnum,
+          'dest'    => $address,
+        } );
+        my $error = $cust_main_invoice->insert;
+        warn $error if $error;
+      } 
+    }
+  }
+  if ( $self->custnum ) {
+    map { $_->address }
+      qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
+  } else {
+    ();
+  }
+}
+
+=item check_invoicing_list ARRAYREF
+
+Checks these arguements as valid input for the invoicing_list method.  If there
+is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub check_invoicing_list {
+  my( $self, $arrayref ) = @_;
+  foreach my $address ( @{$arrayref} ) {
+    my $cust_main_invoice = new FS::cust_main_invoice ( {
+      'custnum' => $self->custnum,
+      'dest'    => $address,
+    } );
+    my $error = $self->custnum
+                ? $cust_main_invoice->check
+                : $cust_main_invoice->checkdest
+    ;
+    return $error if $error;
+  }
+  '';
+}
+
+=back
+
+=head1 VERSION
+
+$Id: cust_main.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+The delete method.
+
+The delete method should possibly take an FS::cust_main object reference
+instead of a scalar customer number.
+
+Bill and collect options should probably be passed as references instead of a
+list.
+
+CyberCash v2 forces us to define some variables in package main.
+
+There should probably be a configuration file with a list of allowed credit
+card types.
+
+CyberCash is the only processor.
+
+No multiple currency support (probably a larger project than just this module).
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_pkg>, L<FS::cust_bill>, L<FS::cust_credit>
+L<FS::cust_pay_batch>, L<FS::agent>, L<FS::part_referral>,
+L<FS::cust_main_county>, L<FS::cust_main_invoice>,
+L<FS::UID>, schema.html from the base documentation.
+
+=cut
+
+1;
+
+
diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
new file mode 100644
index 000000000..383360b7b
--- /dev/null
+++ b/FS/FS/cust_main_county.pm
@@ -0,0 +1,111 @@
+package FS::cust_main_county;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::cust_main_county - Object methods for cust_main_county objects
+
+=head1 SYNOPSIS
+
+  use FS::cust_main_county;
+
+  $record = new FS::cust_main_county \%hash;
+  $record = new FS::cust_main_county { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_main_county object represents a tax rate, defined by locale.
+FS::cust_main_county inherits from FS::Record.  The following fields are
+currently supported:
+
+=over 4
+
+=item taxnum - primary key (assigned automatically for new tax rates)
+
+=item state
+
+=item county
+
+=item country
+
+=item tax - percentage
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new tax rate.  To add the tax rate to the database, see L<"insert">.
+
+=cut
+
+sub table { 'cust_main_county'; }
+
+=item insert
+
+Adds this tax rate to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Deletes this tax rate from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid tax rate.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  $self->ut_numbern('taxnum')
+    || $self->ut_textn('state')
+    || $self->ut_textn('county')
+    || $self->ut_text('country')
+    || $self->ut_float('tax')
+  ;
+
+}
+
+=back
+
+=head1 VERSION
+
+$Id: cust_main_county.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_main>, L<FS::cust_bill>, schema.html from the base
+documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm
new file mode 100644
index 000000000..bd7d53dd6
--- /dev/null
+++ b/FS/FS/cust_main_invoice.pm
@@ -0,0 +1,181 @@
+package FS::cust_main_invoice;
+
+use strict;
+use vars qw(@ISA $conf $mydomain);
+use Exporter;
+use FS::Record qw( qsearchs );
+use FS::Conf;
+use FS::cust_main;
+use FS::svc_acct;
+
+@ISA = qw( FS::Record );
+
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::cust_main_invoice'} = sub { 
+  $conf = new FS::Conf;
+  $mydomain = $conf->config('domain');
+};
+
+=head1 NAME
+
+FS::cust_main_invoice - Object methods for cust_main_invoice records
+
+=head1 SYNOPSIS
+
+  use FS::cust_main_invoice;
+
+  $record = new FS::cust_main_invoice \%hash;
+  $record = new FS::cust_main_invoice { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $email_address = $record->address;
+
+=head1 DESCRIPTION
+
+An FS::cust_main_invoice object represents an invoice destination.  FS::cust_main_invoice inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item destnum - primary key
+
+=item custnum - customer (see L<FS::cust_main>)
+
+=item dest - Invoice destination: If numeric, a <a href="#svc_acct">svcnum</a>, if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new invoice destination.  To add the invoice destination to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub table { 'cust_main_invoice'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Delete this record from the database.
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my ( $new, $old ) = ( shift, shift );
+
+  return "Can't change custnum!" unless $old->custnum == $new->custnum;
+
+  $new->SUPER::replace;
+}
+
+
+=item check
+
+Checks all fields to make sure this is a valid invoice destination.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error = $self->ut_numbern('destnum')
+           || $self->ut_number('custnum')
+           || $self->checkdest;
+  ;
+  return $error if $error;
+
+  return "Unknown customer"
+    unless qsearchs('cust_main',{ 'custnum' => $self->custnum });
+
+  ''; #noerror
+}
+
+=item checkdest
+
+Checks the dest field only.
+
+=cut
+
+sub checkdest { 
+  my $self = shift;
+
+  my $error = $self->ut_text('dest');
+  return $error if $error;
+
+  if ( $self->dest eq 'POST' ) {
+    #contemplate our navel
+  } elsif ( $self->dest =~ /^(\d+)$/ ) {
+    return "Unknown local account (specified by svcnum)"
+      unless qsearchs( 'svc_acct', { 'svcnum' => $self->dest } );
+  } elsif ( $self->dest =~ /^([\w\.\-]+)\@(([\w\.\-]+\.)+\w+)$/ ) {
+    my($user, $domain) = ($1, $2);
+    if ( $domain eq $mydomain ) {
+      my $svc_acct = qsearchs( 'svc_acct', { 'username' => $user } );
+      return "Unknown local account (specified literally)" unless $svc_acct;
+      $svc_acct->svcnum =~ /^(\d+)$/ or die "Non-numeric svcnum?!";
+      $self->dest($1);
+    }
+  } else {
+    return "Illegal destination!";
+  }
+
+  ''; #no error
+}
+
+=item address
+
+Returns the literal email address for this record (or `POST').
+
+=cut
+
+sub address {
+  my $self = shift;
+  if ( $self->dest =~ /(\d+)$/ ) {
+    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $1 } );
+    $svc_acct->username . '@' . $mydomain;
+  } else {
+    $self->dest;
+  }
+}
+
+=back
+
+=head1 VERSION
+
+$Id: cust_main_invoice.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_main>
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
new file mode 100644
index 000000000..e2b92982d
--- /dev/null
+++ b/FS/FS/cust_pay.pm
@@ -0,0 +1,188 @@
+package FS::cust_pay;
+
+use strict;
+use vars qw( @ISA );
+use Business::CreditCard;
+use FS::Record qw( qsearchs );
+use FS::cust_bill;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::cust_pay - Object methods for cust_pay objects
+
+=head1 SYNOPSIS
+
+  use FS::cust_pay;
+
+  $record = new FS::cust_pay \%hash;
+  $record = new FS::cust_pay { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_pay object represents a payment.  FS::cust_pay inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item paynum - primary key (assigned automatically for new payments)
+
+=item invnum - Invoice (see L<FS::cust_bill>)
+
+=item paid - Amount of this payment
+
+=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=item payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
+
+=item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
+
+=item paybatch - text field for tracking card processing
+
+=back
+
+=head1 METHODS
+
+=over 4 
+
+=item new HASHREF
+
+Creates a new payment.  To add the payment to the databse, see L<"insert">.
+
+=cut
+
+sub table { 'cust_pay'; }
+
+=item insert
+
+Adds this payment to the databse, and updates the invoice (see
+L<FS::cust_bill>).
+
+=cut
+
+sub insert {
+  my $self = shift;
+
+  my $error;
+
+  $error = $self->check;
+  return $error if $error;
+
+  my $old_cust_bill = qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
+  return "Unknown invnum" unless $old_cust_bill;
+  my %hash = $old_cust_bill->hash;
+  $hash{'owed'} = sprintf("%.2f", $hash{owed} - $self->paid );
+  my $new_cust_bill = new FS::cust_bill ( \%hash );
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  $error = $new_cust_bill->replace($old_cust_bill);
+  return "Error modifying cust_bill: $error" if $error;
+
+  $self->SUPER::insert;
+}
+
+=item delete
+
+Currently unimplemented (accounting reasons).
+
+=cut
+
+sub delete {
+  return "Can't (yet?) delete cust_pay records!";
+}
+
+=item replace OLD_RECORD
+
+Currently unimplemented (accounting reasons).
+
+=cut
+
+sub replace {
+   return "Can't (yet?) modify cust_pay records!";
+}
+
+=item check
+
+Checks all fields to make sure this is a valid payment.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert method.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error;
+
+  $error =
+    $self->ut_numbern('paynum')
+    || $self->ut_number('invnum')
+    || $self->ut_money('paid')
+    || $self->ut_numbern('_date')
+  ;
+  return $error if $error;
+
+  $self->_date(time) unless $self->_date;
+
+  $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
+  $self->payby($1);
+
+  if ( $self->payby eq 'CARD' ) {
+    my $payinfo = $self->payinfo;
+    $payinfo =~ s/\D//g;
+    $self->payinfo($payinfo);
+    if ( $self->payinfo ) {
+      $self->payinfo =~ /^(\d{13,16})$/
+        or return "Illegal (mistyped?) credit card number (payinfo)";
+      $self->payinfo($1);
+      validate($self->payinfo) or return "Illegal credit card number";
+      return "Unknown card type" if cardtype($self->payinfo) eq "Unknown";
+    } else {
+      $self->payinfo('N/A');
+    }
+
+  } else {
+    $error = $self->ut_textn('payinfo');
+    return $error if $error;
+  }
+
+  $error = $self->ut_textn('paybatch');
+  return $error if $error;
+
+  ''; #no error
+
+}
+
+=back
+
+=head1 VERSION
+
+$Id: cust_pay.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+Delete and replace methods.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_bill>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
new file mode 100644
index 000000000..7c5c6c404
--- /dev/null
+++ b/FS/FS/cust_pay_batch.pm
@@ -0,0 +1,205 @@
+package FS::cust_pay_batch;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record;
+use Business::CreditCard;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::cust_pay_batch - Object methods for batch cards
+
+=head1 SYNOPSIS
+
+  use FS::cust_pay_batch;
+
+  $record = new FS::cust_pay_batch \%hash;
+  $record = new FS::cust_pay_batch { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_pay_batch object represents a credit card transaction ready to be
+batched (sent to a processor).  FS::cust_pay_batch inherits from FS::Record.  
+Typically called by the collect method of an FS::cust_main object.  The
+following fields are currently supported:
+
+=over 4
+
+=item trancode - 77 for charges
+
+=item cardnum
+
+=item exp - card expiration 
+
+=item amount 
+
+=item invnum - invoice
+
+=item custnum - customer 
+
+=item payname - name on card 
+
+=item first - name 
+
+=item last - name 
+
+=item address1 
+
+=item address2 
+
+=item city 
+
+=item state 
+
+=item zip 
+
+=item country 
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new record.  To add the record to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub table { 'cust_pay_batch'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Delete this record from the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item replace OLD_RECORD
+
+#inactive
+#
+#Replaces the OLD_RECORD with this one in the database.  If there is an error,
+#returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  return "Can't (yet?) replace batched transactions!";
+}
+
+=item check
+
+Checks all fields to make sure this is a valid transaction.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+      $self->ut_numbern('trancode')
+    || $self->ut_number('cardnum') 
+    || $self->ut_money('amount')
+    || $self->ut_number('invnum')
+    || $self->ut_number('custnum')
+    || $self->ut_text('address1')
+    || $self->ut_textn('address2')
+    || $self->ut_text('city')
+    || $self->ut_text('state')
+  ;
+
+  return $error if $error;
+
+  $self->getfield('last') =~ /^([\w \,\.\-\']+)$/ or return "Illegal last name";
+  $self->setfield('last',$1);
+
+  $self->first =~ /^([\w \,\.\-\']+)$/ or return "Illegal first name";
+  $self->first($1);
+
+  my $cardnum = $self->cardnum;
+  $cardnum =~ s/\D//g;
+  $cardnum =~ /^(\d{13,16})$/
+    or return "Illegal credit card number";
+  $cardnum = $1;
+  $self->cardnum($cardnum);
+  validate($cardnum) or return "Illegal credit card number";
+  return "Unknown card type" if cardtype($cardnum) eq "Unknown";
+
+  if ( $self->exp eq '' ) {
+    return "Expriation date required"; #unless 
+    $self->exp('');
+  } else {
+    if ( $self->exp =~ /^(\d{4})[\/\-](\d{1,2})[\/\-](\d{1,2})$/ ) {
+      $self->exp("$1-$2-$3");
+    } elsif ( $self->exp =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/ ) {
+      if ( length($2) == 4 ) {
+        $self->exp("$2-$1-01");
+      } elsif ( $2 > 98 ) { #should pry change to check for "this year"
+        $self->exp("19$2-$1-01");
+      } else {
+        $self->exp("20$2-$1-01");
+      }
+    } else {
+      return "Illegal expiration date";
+    }
+  }
+
+  if ( $self->payname eq '' ) {
+    $self->payname( $self->first. " ". $self->getfield('last') );
+  } else {
+    $self->payname =~ /^([\w \,\.\-\']+)$/
+      or return "Illegal billing name";
+    $self->payname($1);
+  }
+
+  $self->zip =~ /^\s*(\w[\w\-\s]{3,8}\w)\s*$/
+    or return "Illegal zip: ". $self->zip;
+  $self->zip($1);
+
+  $self->country =~ /^(\w\w)$/ or return "Illegal \w\wy";
+  $self->country($1);
+
+  #check invnum, custnum, ?
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: cust_pay_batch.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+There should probably be a configuration file with a list of allowed credit
+card types.
+
+=head1 SEE ALSO
+
+L<FS::cust_main>, L<FS::Record>
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
new file mode 100644
index 000000000..c31340d2f
--- /dev/null
+++ b/FS/FS/cust_pkg.pm
@@ -0,0 +1,518 @@
+package FS::cust_pkg;
+
+use strict;
+use vars qw(@ISA);
+use FS::UID qw( getotaker );
+use FS::Record qw( qsearch qsearchs );
+use FS::cust_svc;
+use FS::part_pkg;
+use FS::cust_main;
+use FS::type_pkgs;
+
+# need to 'use' these instead of 'require' in sub { cancel, suspend, unsuspend,
+# setup }
+# because they load configuraion by setting FS::UID::callback (see TODO)
+use FS::svc_acct;
+use FS::svc_acct_sm;
+use FS::svc_domain;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::cust_pkg - Object methods for cust_pkg objects
+
+=head1 SYNOPSIS
+
+  use FS::cust_pkg;
+
+  $record = new FS::cust_pkg \%hash;
+  $record = new FS::cust_pkg { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $error = $record->cancel;
+
+  $error = $record->suspend;
+
+  $error = $record->unsuspend;
+
+  $part_pkg = $record->part_pkg;
+
+  @labels = $record->labels;
+
+  $error = FS::cust_pkg::order( $custnum, \@pkgparts );
+  $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );
+
+=head1 DESCRIPTION
+
+An FS::cust_pkg object represents a customer billing item.  FS::cust_pkg
+inherits from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item pkgnum - primary key (assigned automatically for new billing items)
+
+=item custnum - Customer (see L<FS::cust_main>)
+
+=item pkgpart - Billing item definition (see L<FS::part_pkg>)
+
+=item setup - date
+
+=item bill - date
+
+=item susp - date
+
+=item expire - date
+
+=item cancel - date
+
+=item otaker - order taker (assigned automatically if null, see L<FS::UID>)
+
+=back
+
+Note: setup, bill, susp, expire and cancel are specified as UNIX timestamps;
+see L<perlfunc/"time">.  Also see L<Time::Local> and L<Date::Parse> for
+conversion functions.
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Create a new billing item.  To add the item to the database, see L<"insert">.
+
+=cut
+
+sub table { 'cust_pkg'; }
+
+=item insert
+
+Adds this billing item to the database ("Orders" the item).  If there is an
+error, returns the error, otherwise returns false.
+
+sub insert {
+  my $self = shift;
+
+  # custnum might not have have been defined in sub check (for one-shot new
+  # customers), so check it here instead
+
+  my $error = $self->ut_number('custnum');
+  return $error if $error
+
+  return "Unknown customer"
+    unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+
+  $self->SUPER::insert;
+
+}
+
+=item delete
+
+Currently unimplemented.  You don't want to delete billing items, because there
+would then be no record the customer ever purchased the item.  Instead, see
+the cancel method.
+
+=cut
+
+sub delete {
+  return "Can't delete cust_pkg records!";
+}
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+Currently, custnum, setup, bill, susp, expire, and cancel may be changed.
+
+Changing pkgpart may have disasterous effects.  See the order subroutine.
+
+setup and bill are normally updated by calling the bill method of a customer
+object (see L<FS::cust_main>).
+
+suspend is normally updated by the suspend and unsuspend methods.
+
+cancel is normally updated by the cancel method (and also the order subroutine
+in some cases).
+
+=cut
+
+sub replace {
+  my( $new, $old ) = ( shift, shift );
+
+  #return "Can't (yet?) change pkgpart!" if $old->pkgpart != $new->pkgpart;
+  return "Can't change otaker!" if $old->otaker ne $new->otaker;
+  return "Can't change setup once it exists!"
+    if $old->getfield('setup') &&
+       $old->getfield('setup') != $new->getfield('setup');
+  #some logic for bill, susp, cancel?
+
+  $new->SUPER::replace($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid billing item.  If there is an
+error, returns the error, otherwise returns false.  Called by the insert and
+replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('pkgnum')
+    || $self->ut_numbern('custnum')
+    || $self->ut_number('pkgpart')
+    || $self->ut_numbern('setup')
+    || $self->ut_numbern('bill')
+    || $self->ut_numbern('susp')
+    || $self->ut_numbern('cancel')
+  ;
+  return $error if $error;
+
+  if ( $self->custnum ) { 
+    return "Unknown customer"
+      unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+  }
+
+  return "Unknown pkgpart"
+    unless qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
+
+  $self->otaker(getotaker) unless $self->otaker;
+  $self->otaker =~ /^(\w{0,16})$/ or return "Illegal otaker";
+  $self->otaker($1);
+
+  ''; #no error
+}
+
+=item cancel
+
+Cancels and removes all services (see L<FS::cust_svc> and L<FS::part_svc>)
+in this package, then cancels the package itself (sets the cancel field to
+now).
+
+If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub cancel {
+  my $self = shift;
+  my $error;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE'; 
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  foreach my $cust_svc (
+    qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum } )
+  ) {
+    my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $cust_svc->svcpart } );
+
+    $part_svc->svcdb =~ /^([\w\-]+)$/
+      or return "Illegal svcdb value in part_svc!";
+    my $svcdb = $1;
+    require "FS/$svcdb.pm";
+
+    my $svc = qsearchs( $svcdb, { 'svcnum' => $cust_svc->svcnum } );
+    if ($svc) {
+      $error = $svc->cancel;
+      return "Error cancelling service: $error" if $error;
+      $error = $svc->delete;
+      return "Error deleting service: $error" if $error;
+    }
+
+    $error = $cust_svc->delete;
+    return "Error deleting cust_svc: $error" if $error;
+
+  }
+
+  unless ( $self->getfield('cancel') ) {
+    my %hash = $self->hash;
+    $hash{'cancel'} = time;
+    my $new = new FS::cust_pkg ( \%hash );
+    $error = $new->replace($self);
+    return $error if $error;
+  }
+
+  ''; #no errors
+}
+
+=item suspend
+
+Suspends all services (see L<FS::cust_svc> and L<FS::part_svc>) in this
+package, then suspends the package itself (sets the susp field to now).
+
+If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub suspend {
+  my $self = shift;
+  my $error ;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE'; 
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  foreach my $cust_svc (
+    qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum } )
+  ) {
+    my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $cust_svc->svcpart } );
+
+    $part_svc->svcdb =~ /^([\w\-]+)$/
+      or return "Illegal svcdb value in part_svc!";
+    my $svcdb = $1;
+    require "FS/$svcdb.pm";
+
+    my $svc = qsearchs( $svcdb, { 'svcnum' => $cust_svc->svcnum } );
+    if ($svc) {
+      $error = $svc->suspend;
+      return $error if $error;
+    }
+
+  }
+
+  unless ( $self->getfield('susp') ) {
+    my %hash = $self->hash;
+    $hash{'susp'} = time;
+    my $new = new FS::cust_pkg ( \%hash );
+    $error = $new->replace($self);
+    return $error if $error;
+  }
+
+  ''; #no errors
+}
+
+=item unsuspend
+
+Unsuspends all services (see L<FS::cust_svc> and L<FS::part_svc>) in this
+package, then unsuspends the package itself (clears the susp field).
+
+If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub unsuspend {
+  my $self = shift;
+  my($error);
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE'; 
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  foreach my $cust_svc (
+    qsearch('cust_svc',{'pkgnum'=> $self->pkgnum } )
+  ) {
+    my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $cust_svc->svcpart } );
+
+    $part_svc->svcdb =~ /^([\w\-]+)$/
+      or return "Illegal svcdb value in part_svc!";
+    my $svcdb = $1;
+    require "FS/$svcdb.pm";
+
+    my $svc = qsearchs( $svcdb, { 'svcnum' => $cust_svc->svcnum } );
+    if ($svc) {
+      $error = $svc->unsuspend;
+      return $error if $error;
+    }
+
+  }
+
+  unless ( ! $self->getfield('susp') ) {
+    my %hash = $self->hash;
+    $hash{'susp'} = '';
+    my $new = new FS::cust_pkg ( \%hash );
+    $error = $new->replace($self);
+    return $error if $error;
+  }
+
+  ''; #no errors
+}
+
+=item part_pkg
+
+Returns the definition for this billing item, as an FS::part_pkg object (see
+L<FS::part_pkg).
+
+=cut
+
+sub part_pkg {
+  my $self = shift;
+  qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
+}
+
+=item labels
+
+Returns a list of lists, calling the label method for all services
+(see L<FS::cust_svc>) of this billing item.
+
+=cut
+
+sub labels {
+  my $self = shift;
+  map { [ $_->label ] } qsearch ( 'cust_svc', { 'pkgnum' => $self->pkgnum } );
+}
+
+=back
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item order CUSTNUM, PKGPARTS_ARYREF, [ REMOVE_PKGNUMS_ARYREF ]
+
+CUSTNUM is a customer (see L<FS::cust_main>)
+
+PKGPARTS is a list of pkgparts specifying the the billing item definitions (see
+L<FS::part_pkg>) to order for this customer.  Duplicates are of course
+permitted.
+
+REMOVE_PKGNUMS is an optional list of pkgnums specifying the billing items to
+remove for this customer.  The services (see L<FS::cust_svc>) are moved to the
+new billing items.  An error is returned if this is not possible (see
+L<FS::pkg_svc>).
+
+=cut
+
+sub order {
+  my($custnum,$pkgparts,$remove_pkgnums)=@_;
+
+  # generate %part_pkg
+  # $part_pkg{$pkgpart} is true iff $custnum may purchase $pkgpart
+  #
+  my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
+  my($agent)=qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
+  my %part_pkg = %{ $agent->pkgpart_hashref };
+
+  my(%svcnum);
+  # generate %svcnum
+  # for those packages being removed:
+  #@{ $svcnum{$svcpart} } goes from a svcpart to a list of FS::Record
+  # objects (table eq 'cust_svc')
+  my($pkgnum);
+  foreach $pkgnum ( @{$remove_pkgnums} ) {
+    my($cust_svc);
+    foreach $cust_svc (qsearch('cust_svc',{'pkgnum'=>$pkgnum})) {
+      push @{ $svcnum{$cust_svc->getfield('svcpart')} }, $cust_svc;
+    }
+  }
+  
+  my(@cust_svc);
+  #generate @cust_svc
+  # for those packages the customer is purchasing:
+  # @{$pkgparts} is a list of said packages, by pkgpart
+  # @cust_svc is a corresponding list of lists of FS::Record objects
+  my($pkgpart);
+  foreach $pkgpart ( @{$pkgparts} ) {
+    return "Customer not permitted to purchase pkgpart $pkgpart!"
+      unless $part_pkg{$pkgpart};
+    push @cust_svc, [
+      map {
+        ( $svcnum{$_} && @{ $svcnum{$_} } ) ? shift @{ $svcnum{$_} } : ();
+      } (split(/,/,
+       qsearchs('part_pkg',{'pkgpart'=>$pkgpart})->getfield('services')
+      ))
+    ];
+  }
+
+  #check for leftover services
+  foreach (keys %svcnum) {
+    next unless @{ $svcnum{$_} };
+    return "Leftover services!";
+  }
+
+  #no leftover services, let's make changes.
+ 
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE'; 
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE'; 
+  local $SIG{PIPE} = 'IGNORE'; 
+
+  #first cancel old packages
+#  my($pkgnum);
+  foreach $pkgnum ( @{$remove_pkgnums} ) {
+    my($old) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+    die "Package $pkgnum not found to remove!" unless $old;
+    my(%hash) = $old->hash;
+    $hash{'cancel'}=time;   
+    my($new) = new FS::cust_pkg ( \%hash );
+    my($error)=$new->replace($old);
+    die "Couldn't update package $pkgnum: $error" if $error;
+  }
+
+  #now add new packages, changing cust_svc records if necessary
+#  my($pkgpart);
+  while ($pkgpart=shift @{$pkgparts} ) {
+ 
+    my($new) = new FS::cust_pkg ( {
+                                       'custnum' => $custnum,
+                                       'pkgpart' => $pkgpart,
+                                    } );
+    my($error) = $new->insert;
+    die "Couldn't insert new cust_pkg record: $error" if $error; 
+    my($pkgnum)=$new->getfield('pkgnum');
+ 
+    my($cust_svc);
+    foreach $cust_svc ( @{ shift @cust_svc } ) {
+      my(%hash) = $cust_svc->hash;
+      $hash{'pkgnum'}=$pkgnum;
+      my($new) = new FS::cust_svc ( \%hash );
+      my($error)=$new->replace($cust_svc);
+      die "Couldn't link old service to new package: $error" if $error;
+    }
+  }  
+
+  ''; #no errors
+}
+
+=back
+
+=head1 VERSION
+
+$Id: cust_pkg.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+sub order is not OO.  Perhaps it should be moved to FS::cust_main and made so?
+
+In sub order, the @pkgparts array (passed by reference) is clobbered.
+
+Also in sub order, no money is adjusted.  Once FS::part_pkg defines a standard
+method to pass dates to the recur_prog expression, it should do so.
+
+FS::svc_acct, FS::svc_acct_sm, and FS::svc_domain are loaded via 'use' at 
+compile time, rather than via 'require' in sub { setup, suspend, unsuspend,
+cancel } because they use %FS::UID::callback to load configuration values.
+Probably need a subroutine which decides what to do based on whether or not
+we've fetched the user yet, rather than a hash.  See FS::UID and the TODO.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_main>, L<FS::part_pkg>, L<FS::cust_svc>
+, L<FS::pkg_svc>, schema.html from the base documentation
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
new file mode 100644
index 000000000..65254aef4
--- /dev/null
+++ b/FS/FS/cust_refund.pm
@@ -0,0 +1,187 @@
+package FS::cust_refund;
+
+use strict;
+use vars qw( @ISA );
+use Business::CreditCard;
+use FS::Record qw( qsearchs );
+use FS::UID qw(getotaker);
+use FS::cust_credit;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::cust_refund - Object method for cust_refund objects
+
+=head1 SYNOPSIS
+
+  use FS::cust_refund;
+
+  $record = new FS::cust_refund \%hash;
+  $record = new FS::cust_refund { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_refund represents a refund.  FS::cust_refund inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item refundnum - primary key (assigned automatically for new refunds)
+
+=item crednum - Credit (see L<FS::cust_credit>)
+
+=item refund - Amount of the refund
+
+=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=item payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
+
+=item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
+
+=item otaker - order taker (assigned automatically, see L<FS::UID>)
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new refund.  To add the refund to the database, see L<"insert">.
+
+=cut
+
+sub table { 'cust_refund'; }
+
+=item insert
+
+Adds this refund to the database, and updates the credit (see
+L<FS::cust_credit>).
+
+=cut
+
+sub insert {
+  my $self = shift;
+
+  my $error;
+
+  $error=$self->check;
+  return $error if $error;
+
+  my $old_cust_credit =
+    qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
+  return "Unknown crednum" unless $old_cust_credit;
+  my %hash = $old_cust_credit->hash;
+  $hash{credited} = sprintf("%.2f", $hash{credited} - $self->refund );
+  my($new_cust_credit) = new FS::cust_credit ( \%hash );
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  $error = $new_cust_credit->replace($old_cust_credit);
+  return "Error modifying cust_credit: $error" if $error;
+
+  $self->SUPER::insert;
+}
+
+=item delete
+
+Currently unimplemented (accounting reasons).
+
+=cut
+
+sub delete {
+  return "Can't (yet?) delete cust_refund records!";
+}
+
+=item replace OLD_RECORD
+
+Currently unimplemented (accounting reasons).
+
+=cut
+
+sub replace {
+   return "Can't (yet?) modify cust_refund records!";
+}
+
+=item check
+
+Checks all fields to make sure this is a valid refund.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert method.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error;
+
+  $error =
+    $self->ut_number('refundnum')
+    || $self->ut_number('crednum')
+    || $self->ut_money('amount')
+    || $self->ut_numbern('_date')
+  ;
+  return $error if $error;
+
+  $self->_date(time) unless $self->_date;
+
+  $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
+  $self->payby($1);
+
+  if ( $self->payby eq 'CARD' ) {
+    my $payinfo = $self->payinfo;
+    $self->payinfo($payinfo =~ s/\D//g);
+    if ( $self->payinfo ) {
+      $self->payinfo =~ /^(\d{13,16})$/
+        or return "Illegal (mistyped?) credit card number (payinfo)";
+      $self->payinfo($1);
+      validate($self->payinfo) or return "Illegal credit card number";
+      return "Unknown card type" if cardtype($self->payinfo) eq "Unknown";
+    } else {
+      $self->payinfo('N/A');
+    }
+
+  } else {
+    $error = $self->ut_textn('payinfo');
+    return $error if $error;
+  }
+
+  $self->otaker(getotaker);
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: cust_refund.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+Delete and replace methods.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_credit>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
new file mode 100644
index 000000000..cbc4d91fa
--- /dev/null
+++ b/FS/FS/cust_svc.pm
@@ -0,0 +1,167 @@
+package FS::cust_svc;
+
+use strict;
+use vars qw( @ISA );
+use Carp qw( cluck );
+use FS::Record qw( qsearchs );
+use FS::cust_pkg;
+use FS::part_pkg;
+use FS::part_svc;
+use FS::svc_acct;
+use FS::svc_acct_sm;
+use FS::svc_domain;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::cust_svc - Object method for cust_svc objects
+
+=head1 SYNOPSIS
+
+  use FS::cust_svc;
+
+  $record = new FS::cust_svc \%hash
+  $record = new FS::cust_svc { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  ($label, $value) = $record->label;
+
+=head1 DESCRIPTION
+
+An FS::cust_svc represents a service.  FS::cust_svc inherits from FS::Record.
+The following fields are currently supported:
+
+=over 4
+
+=item svcnum - primary key (assigned automatically for new services)
+
+=item pkgnum - Package (see L<FS::cust_pkg>)
+
+=item svcpart - Service definition (see L<FS::part_svc>)
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new service.  To add the refund to the database, see L<"insert">.
+Services are normally created by creating FS::svc_ objects (see
+L<FS::svc_acct>, L<FS::svc_domain>, and L<FS::svc_acct_sm>, among others).
+
+=cut
+
+sub table { 'cust_svc'; }
+
+=item insert
+
+Adds this service to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Deletes this service from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+Called by the cancel method of the package (see L<FS::cust_pkg>).
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid service.  If there is an error,
+returns the error, otehrwise returns false.  Called by the insert and
+replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error =
+    $self->ut_numbern('svcnum')
+    || $self->ut_numbern('pkgnum')
+    || $self->ut_number('svcpart')
+  ;
+  return $error if $error;
+
+  return "Unknown pkgnum"
+    unless ! $self->pkgnum
+      || qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
+
+  return "Unknown svcpart" unless
+    qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
+
+  ''; #no error
+}
+
+=item label
+
+Returns a list consisting of:
+- The name of this service (from part_svc)
+- A meaningful identifier (username, domain, or mail alias)
+- The table name (i.e. svc_domain) for this service
+
+=cut
+
+sub label {
+  my $self = shift;
+  my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
+  my $svcdb = $part_svc->svcdb;
+  my $svc_x = qsearchs( $svcdb, { 'svcnum' => $self->svcnum } );
+  my $svc = $part_svc->svc;
+  my $tag;
+  if ( $svcdb eq 'svc_acct' ) {
+    $tag = $svc_x->getfield('username');
+  } elsif ( $svcdb eq 'svc_acct_sm' ) {
+    my $domuser = $svc_x->domuser eq '*' ? '(anything)' : $svc_x->domuser;
+    my $svc_domain = qsearchs ( 'svc_domain', { 'svcnum' => $svc_x->domsvc } );
+    my $domain = $svc_domain->domain;
+    $tag = "$domuser\@$domain";
+  } elsif ( $svcdb eq 'svc_domain' ) {
+    $tag = $svc_x->getfield('domain');
+  } else {
+    cluck "warning: asked for label of unsupported svcdb; using svcnum";
+    $tag = $svc_x->getfield('svcnum');
+  }
+  $svc, $tag, $svcdb;
+}
+
+=back
+
+=head1 VERSION
+
+$Id: cust_svc.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+Behaviour of changing the svcpart of cust_svc records is undefined and should
+possibly be prohibited, and pkg_svc records are not checked.
+
+pkg_svc records are not checked in general (here).
+
+Deleting this record doesn't check or delete the svc_* record associated
+with this record.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_pkg>, L<FS::part_svc>, L<FS::pkg_svc>, 
+schema.html from the base documentation
+
+=cut
+
+1;
+
diff --git a/FS/FS/dbdef.pm b/FS/FS/dbdef.pm
new file mode 100644
index 000000000..b737fd53a
--- /dev/null
+++ b/FS/FS/dbdef.pm
@@ -0,0 +1,140 @@
+package FS::dbdef;
+
+use strict;
+use vars qw(@ISA);
+use Exporter;
+use Carp;
+use FreezeThaw qw(freeze thaw cmpStr);
+use FS::dbdef_table;
+use FS::dbdef_unique;
+use FS::dbdef_index;
+use FS::dbdef_column;
+
+@ISA = qw(Exporter);
+
+=head1 NAME
+
+FS::dbdef - Database objects
+
+=head1 SYNOPSIS
+
+  use FS::dbdef;
+
+  $dbdef = new FS::dbdef (@dbdef_table_objects);
+  $dbdef = load FS::dbdef "filename";
+
+  $dbdef->save("filename");
+
+  $dbdef->addtable($dbdef_table_object);
+
+  @table_names = $dbdef->tables;
+
+  $FS_dbdef_table_object = $dbdef->table;
+
+=head1 DESCRIPTION
+
+FS::dbdef objects are collections of FS::dbdef_table objects and represnt
+a database (a collection of tables).
+
+=head1 METHODS
+
+=over 4
+
+=item new TABLE, TABLE, ...
+
+Creates a new FS::dbdef object
+
+=cut
+
+sub new {
+  my($proto,@tables)=@_;
+  my(%tables)=map  { $_->name, $_ } @tables; #check for duplicates?
+
+  my($class) = ref($proto) || $proto;
+  my($self) = {
+    'tables' => \%tables,
+  };
+
+  bless ($self, $class);
+
+}
+
+=item load FILENAME
+
+Loads an FS::dbdef object from a file.
+
+=cut
+
+sub load {
+  my($proto,$file)=@_; #use $proto ?
+  open(FILE,"<$file") or die "Can't open $file: $!";
+  my($string)=join('',<FILE>); #can $string have newlines?  pry not?
+  close FILE or die "Can't close $file: $!";
+  my($self)=thaw $string;
+  #no bless needed?
+  $self;
+}
+
+=item save FILENAME
+
+Saves an FS::dbdef object to a file.
+
+=cut
+
+sub save {
+  my($self,$file)=@_;
+  my($string)=freeze $self;
+  open(FILE,">$file") or die "Can't open $file: $!";
+  print FILE $string;
+  close FILE or die "Can't close file: $!";
+  my($check_self)=thaw $string;
+  die "Verify error: Can't freeze and thaw dbdef $self"
+    if (cmpStr($self,$check_self));
+}
+
+=item addtable TABLE
+
+Adds this FS::dbdef_table object.
+
+=cut
+
+sub addtable {
+  my($self,$table)=@_;
+  ${$self->{'tables'}}{$table->name}=$table; #check for dupliates?
+}
+
+=item tables 
+
+Returns the names of all tables.
+
+=cut
+
+sub tables {
+  my($self)=@_;
+  keys %{$self->{'tables'}};
+}
+
+=item table TABLENAME
+
+Returns the named FS::dbdef_table object.
+
+=cut
+
+sub table {
+  my($self,$table)=@_;
+  $self->{'tables'}->{$table};
+}
+
+=head1 BUGS
+
+Each FS::dbdef object should have a name which corresponds to its name within
+the SQL database engine.
+
+=head1 SEE ALSO
+
+L<FS::dbdef_table>, L<FS::Record>,
+
+=cut
+
+1;
+
diff --git a/FS/FS/dbdef_colgroup.pm b/FS/FS/dbdef_colgroup.pm
new file mode 100644
index 000000000..c25b07ada
--- /dev/null
+++ b/FS/FS/dbdef_colgroup.pm
@@ -0,0 +1,95 @@
+package FS::dbdef_colgroup;
+
+use strict;
+use vars qw(@ISA);
+use Exporter;
+
+@ISA = qw(Exporter);
+
+=head1 NAME
+
+FS::dbdef_colgroup - Column group objects
+
+=head1 SYNOPSIS
+
+  use FS::dbdef_colgroup;
+
+  $colgroup = new FS::dbdef_colgroup ( $lol );
+  $colgroup = new FS::dbdef_colgroup (
+    [
+      [ 'single_column' ],
+      [ 'multiple_columns', 'another_column', ],
+    ]
+  );
+
+  @sql_lists = $colgroup->sql_list;
+
+  @singles = $colgroup->singles;
+
+=head1 DESCRIPTION
+
+FS::dbdef_colgroup objects represent sets of sets of columns.
+
+=head1 METHODS
+
+=over 4
+
+=item new
+
+Creates a new FS::dbdef_colgroup object.
+
+=cut
+
+sub new {
+  my($proto, $lol) = @_;
+
+  my $class = ref($proto) || $proto;
+  my $self = {
+    'lol' => $lol,
+  };
+
+  bless ($self, $class);
+
+}
+
+=item sql_list
+
+Returns a flat list of comma-separated values, for SQL statements.
+
+=cut
+
+sub sql_list { #returns a flat list of comman-separates lists (for sql)
+  my($self)=@_;
+   grep $_ ne '', map join(', ', @{$_}), @{$self->{'lol'}};
+}
+
+=item singles
+
+Returns a flat list of all single item lists.
+
+=cut
+
+sub singles { #returns single-field groups as a flat list
+  my($self)=@_;
+  #map ${$_}[0], grep scalar(@{$_}) == 1, @{$self->{'lol'}};
+  map { 
+    ${$_}[0] =~ /^(\w+)$/
+      #aah!
+      or die "Illegal column ", ${$_}[0], " in colgroup!";
+    $1;
+  } grep scalar(@{$_}) == 1, @{$self->{'lol'}};
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::dbdef_table>, L<FS::dbdef_unique>, L<FS::dbdef_index>,
+L<FS::dbdef_column>, L<FS::dbdef>, L<perldsc>
+
+=cut
+
+1;
+
diff --git a/FS/FS/dbdef_column.pm b/FS/FS/dbdef_column.pm
new file mode 100644
index 000000000..e784e8495
--- /dev/null
+++ b/FS/FS/dbdef_column.pm
@@ -0,0 +1,174 @@
+package FS::dbdef_column;
+
+use strict;
+#use Carp;
+use Exporter;
+use vars qw(@ISA);
+
+@ISA = qw(Exporter);
+
+=head1 NAME
+
+FS::dbdef_column - Column object
+
+=head1 SYNOPSIS
+
+  use FS::dbdef_column;
+
+  $column_object = new FS::dbdef_column ( $name, $sql_type, '' );
+  $column_object = new FS::dbdef_column ( $name, $sql_type, 'NULL' );
+  $column_object = new FS::dbdef_column ( $name, $sql_type, '', $length );
+  $column_object = new FS::dbdef_column ( $name, $sql_type, 'NULL', $length );
+
+  $name = $column_object->name;
+  $column_object->name ( 'name' );
+
+  $name = $column_object->type;
+  $column_object->name ( 'sql_type' );
+
+  $name = $column_object->null;
+  $column_object->name ( 'NOT NULL' );
+
+  $name = $column_object->length;
+  $column_object->name ( $length );
+
+  $sql_line = $column->line;
+  $sql_line = $column->line $datasrc;
+
+=head1 DESCRIPTION
+
+FS::dbdef::column objects represend columns in tables (see L<FS::dbdef_table>).
+
+=head1 METHODS
+
+=over 4
+
+=item new
+
+Creates a new FS::dbdef_column object.
+
+=cut
+
+sub new {
+  my($proto,$name,$type,$null,$length)=@_;
+
+  #croak "Illegal name: $name" if grep $name eq $_, @reserved_words;
+
+  $null =~ s/^NOT NULL$//i;
+
+  my $class = ref($proto) || $proto;
+  my $self = {
+    'name'   => $name,
+    'type'   => $type,
+    'null'   => $null,
+    'length' => $length,
+  };
+
+  bless ($self, $class);
+
+}
+
+=item name
+
+Returns or sets the column name.
+
+=cut
+
+sub name {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+  #croak "Illegal name: $name" if grep $name eq $_, @reserved_words;
+    $self->{'name'} = $value;
+  } else {
+    $self->{'name'};
+  }
+}
+
+=item type
+
+Returns or sets the column type.
+
+=cut
+
+sub type {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{'type'} = $value;
+  } else {
+    $self->{'type'};
+  }
+}
+
+=item null
+
+Returns or sets the column null flag.
+
+=cut
+
+sub null {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $value =~ s/^NOT NULL$//i;
+    $self->{'null'} = $value;
+  } else {
+    $self->{'null'};
+  }
+}
+
+=item type
+
+Returns or sets the column length.
+
+=cut
+
+sub length {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{'length'} = $value;
+  } else {
+    $self->{'length'};
+  }
+}
+
+=item line [ $datasrc ]
+
+Returns an SQL column definition.
+
+If passed a DBI $datasrc specifying L<DBD::mysql> or L<DBD::Pg>, will use
+engine-specific syntax.
+
+=cut
+
+sub line {
+  my($self,$datasrc)=@_;
+  my($null)=$self->null;
+  if ( $datasrc =~ /mysql/ ) { #yucky mysql hack
+    $null ||= "NOT NULL"
+  }
+  if ( $datasrc =~ /Pg/ ) { #yucky Pg hack
+    $null ||= "NOT NULL";
+    $null =~ s/^NULL$//;
+  }
+  join(' ',
+    $self->name,
+    $self->type. ( $self->length ? '('.$self->length.')' : '' ),
+    $null,
+  );
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::dbdef_table>, L<FS::dbdef>, L<DBI>
+
+=head1 VERSION
+
+$Id: dbdef_column.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=cut
+
+1;
+
diff --git a/FS/FS/dbdef_index.pm b/FS/FS/dbdef_index.pm
new file mode 100644
index 000000000..49bf51dd9
--- /dev/null
+++ b/FS/FS/dbdef_index.pm
@@ -0,0 +1,35 @@
+package FS::dbdef_index;
+
+use strict;
+use vars qw(@ISA);
+use FS::dbdef_colgroup;
+
+@ISA=qw(FS::dbdef_colgroup);
+
+=head1 NAME
+
+FS::dbdef_unique.pm - Index object
+
+=head1 SYNOPSIS
+
+  use FS::dbdef_index;
+
+    # see FS::dbdef_colgroup methods
+
+=head1 DESCRIPTION
+
+FS::dbdef_unique objects represent the (non-unique) indices of a table
+(L<FS::dbdef_table>).  FS::dbdef_unique inherits from FS::dbdef_colgroup.
+
+=head1 BUGS
+
+Is this empty subclass needed?
+
+=head1 SEE ALSO
+
+L<FS::dbdef_colgroup>, L<FS::dbdef_record>, L<FS::Record>
+
+=cut
+
+1;
+
diff --git a/FS/FS/dbdef_table.pm b/FS/FS/dbdef_table.pm
new file mode 100644
index 000000000..4b6d6619a
--- /dev/null
+++ b/FS/FS/dbdef_table.pm
@@ -0,0 +1,235 @@
+package FS::dbdef_table;
+
+use strict;
+#use Carp;
+use Exporter;
+use vars qw(@ISA);
+use FS::dbdef_column;
+
+@ISA = qw(Exporter);
+
+=head1 NAME
+
+FS::dbdef_table - Table objects
+
+=head1 SYNOPSIS
+
+  use FS::dbdef_table;
+
+  $dbdef_table = new FS::dbdef_table (
+    "table_name",
+    "primary_key",
+    $FS_dbdef_unique_object,
+    $FS_dbdef_index_object,
+    @FS_dbdef_column_objects,
+  );
+
+  $dbdef_table->addcolumn ( $FS_dbdef_column_object );
+
+  $table_name = $dbdef_table->name;
+  $dbdef_table->name ("table_name");
+
+  $table_name = $dbdef_table->primary_keye;
+  $dbdef_table->primary_key ("primary_key");
+
+  $FS_dbdef_unique_object = $dbdef_table->unique;
+  $dbdef_table->unique ( $FS_dbdef_unique_object );
+
+  $FS_dbdef_index_object = $dbdef_table->index;
+  $dbdef_table->index ( $FS_dbdef_index_object );
+
+  @column_names = $dbdef->columns;
+
+  $FS_dbdef_column_object = $dbdef->column;
+
+  @sql_statements = $dbdef->sql_create_table;
+  @sql_statements = $dbdef->sql_create_table $datasrc;
+
+=head1 DESCRIPTION
+
+FS::dbdef_table objects represent a single database table.
+
+=head1 METHODS
+
+=over 4
+
+=item new
+
+Creates a new FS::dbdef_table object.
+
+=cut
+
+sub new {
+  my($proto,$name,$primary_key,$unique,$index,@columns)=@_;
+
+  my(%columns) = map { $_->name, $_ } @columns;
+
+  #check $primary_key, $unique and $index to make sure they are $columns ?
+  # (and sanity check?)
+
+  my $class = ref($proto) || $proto;
+  my $self = {
+    'name'        => $name,
+    'primary_key' => $primary_key,
+    'unique'      => $unique,
+    'index'       => $index,
+    'columns'     => \%columns,
+  };
+
+  bless ($self, $class);
+
+}
+
+=item addcolumn
+
+Adds this FS::dbdef_column object. 
+
+=cut
+
+sub addcolumn {
+  my($self,$column)=@_;
+  ${$self->{'columns'}}{$column->name}=$column; #sanity check?
+}
+
+=item name
+
+Returns or sets the table name.
+
+=cut
+
+sub name {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{name} = $value;
+  } else {
+    $self->{name};
+  }
+}
+
+=item primary_key
+
+Returns or sets the primary key.
+
+=cut
+
+sub primary_key {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{primary_key} = $value;
+  } else {
+    #$self->{primary_key};
+    #hmm.  maybe should untaint the entire structure when it comes off disk 
+    # cause if you don't trust that, ?
+    $self->{primary_key} =~ /^(\w*)$/ 
+      #aah!
+      or die "Illegal primary key ", $self->{primary_key}, " in dbdef!\n";
+    $1;
+  }
+}
+
+=item unique
+
+Returns or sets the FS::dbdef_unique object.
+
+=cut
+
+sub unique { 
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{unique} = $value;
+  } else {
+    $self->{unique};
+  }
+}
+
+=item index
+
+Returns or sets the FS::dbdef_index object.
+
+=cut
+
+sub index { 
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{'index'} = $value;
+  } else {
+    $self->{'index'};
+  }
+}
+
+=item columns
+
+Returns a list consisting of the names of all columns.
+
+=cut
+
+sub columns {
+  my($self)=@_;
+  keys %{$self->{'columns'}};
+}
+
+=item column "column"
+
+Returns the column object (see L<FS::dbdef_column>) for "column".
+
+=cut
+
+sub column {
+  my($self,$column)=@_;
+  $self->{'columns'}->{$column};
+}
+
+=item sql_create_table [ $datasrc ]
+
+Returns an array of SQL statments to create this table.
+
+If passed a DBI $datasrc specifying L<DBD::mysql>, will use MySQL-specific
+syntax.  Non-standard syntax for other engines (if applicable) may also be
+supported in the future.
+
+=cut
+
+sub sql_create_table { 
+  my($self,$datasrc)=@_;
+
+  my(@columns)=map { $self->column($_)->line($datasrc) } $self->columns;
+  push @columns, "PRIMARY KEY (". $self->primary_key. ")"
+    if $self->primary_key;
+  if ( $datasrc =~ /mysql/ ) { #yucky mysql hack
+    push @columns, map "UNIQUE ($_)", $self->unique->sql_list;
+    push @columns, map "INDEX ($_)", $self->index->sql_list;
+  }
+
+  "CREATE TABLE ". $self->name. " ( ". join(", ", @columns). " )",
+  ( map {
+    my($index) = $self->name. "__". $_ . "_index";
+    $index =~ s/,\s*/_/g;
+    "CREATE UNIQUE INDEX $index ON ". $self->name. " ($_)"
+  } $self->unique->sql_list ),
+  ( map {
+    my($index) = $self->name. "__". $_ . "_index";
+    $index =~ s/,\s*/_/g;
+    "CREATE INDEX $index ON ". $self->name. " ($_)"
+  } $self->index->sql_list ),
+  ;  
+
+
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::dbdef>, L<FS::dbdef_unique>, L<FS::dbdef_index>, L<FS::dbdef_unique>,
+L<DBI>
+
+=head1 VERSION
+
+$Id: dbdef_table.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=cut
+
+1;
+
diff --git a/FS/FS/dbdef_unique.pm b/FS/FS/dbdef_unique.pm
new file mode 100644
index 000000000..fa28d585d
--- /dev/null
+++ b/FS/FS/dbdef_unique.pm
@@ -0,0 +1,36 @@
+package FS::dbdef_unique;
+
+use strict;
+use vars qw(@ISA);
+use FS::dbdef_colgroup;
+
+@ISA=qw(FS::dbdef_colgroup);
+
+=head1 NAME
+
+FS::dbdef_unique.pm - Unique object
+
+=head1 SYNOPSIS
+
+  use FS::dbdef_unique;
+
+  # see FS::dbdef_colgroup methods
+
+=head1 DESCRIPTION
+
+FS::dbdef_unique objects represent the unique indices of a database table
+(L<FS::dbdef_table>).  FS::dbdef_unique inherits from FS::dbdef_colgroup.
+
+=head1 BUGS
+
+Is this empty subclass needed?
+
+=head1 SEE ALSO
+
+L<FS::dbdef_colgroup>, L<FS::dbdef_record>, L<FS::Record>
+
+=cut
+
+1;
+
+
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
new file mode 100644
index 000000000..863e962bb
--- /dev/null
+++ b/FS/FS/part_pkg.pm
@@ -0,0 +1,186 @@
+package FS::part_pkg;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch );
+use FS::pkg_svc;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::part_pkg - Object methods for part_pkg objects
+
+=head1 SYNOPSIS
+
+  use FS::part_pkg;
+
+  $record = new FS::part_pkg \%hash
+  $record = new FS::part_pkg { 'column' => 'value' };
+
+  $custom_record = $template_record->clone;
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  @pkg_svc = $record->pkg_svc;
+
+  $svcnum = $record->svcpart;
+  $svcnum = $record->svcpart( 'svc_acct' );
+
+=head1 DESCRIPTION
+
+An FS::part_pkg object represents a billing item definition.  FS::part_pkg
+inherits from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item pkgpart - primary key (assigned automatically for new billing item definitions)
+
+=item pkg - Text name of this billing item definition (customer-viewable)
+
+=item comment - Text name of this billing item definition (non-customer-viewable)
+
+=item setup - Setup fee
+
+=item freq - Frequency of recurring fee
+
+=item recur - Recurring fee
+
+=back
+
+setup and recur are evaluated as Safe perl expressions.  You can use numbers
+just as you would normally.  More advanced semantics are not yet defined.
+
+=head1 METHODS
+
+=over 4 
+
+=item new HASHREF
+
+Creates a new billing item definition.  To add the billing item definition to
+the database, see L<"insert">.
+
+=cut
+
+sub table { 'part_pkg'; }
+
+=item clone
+
+An alternate constructor.  Creates a new billing item definition by duplicating
+an existing definition.  A new pkgpart is assigned and `(CUSTOM) ' is prepended
+to the comment field.  To add the billing item definition to the database, see
+L<"insert">.
+
+=cut
+
+sub clone {
+  my $self = shift;
+  my $class = ref($self);
+  my %hash = $self->hash;
+  $hash{'pkgpart'} = '';
+  $hash{'comment'} = "(CUSTOM) ". $hash{'comment'}
+    unless $hash{'comment'} =~ /^\(CUSTOM\) /;
+  #new FS::part_pkg ( \%hash ); # ?
+  new $class ( \%hash ); # ?
+}
+
+=item insert
+
+Adds this billing item definition to the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item delete
+
+Currently unimplemented.
+
+=cut
+
+sub delete {
+  return "Can't (yet?) delete package definitions.";
+# check & make sure the pkgpart isn't in cust_pkg or type_pkgs?
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid billing item definition.  If
+there is an error, returns the error, otherwise returns false.  Called by the
+insert and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  $self->ut_numbern('pkgpart')
+    || $self->ut_text('pkg')
+    || $self->ut_text('comment')
+    || $self->ut_anything('setup')
+    || $self->ut_number('freq')
+    || $self->ut_anything('recur')
+  ;
+}
+
+=item pkg_svc
+
+Returns all FS::pkg_svc objects (see L<FS::pkg_svc>) for this package
+definition.
+
+=cut
+
+sub pkg_svc {
+  my $self = shift;
+  qsearch( 'pkg_svc', { 'pkgpart' => $self->pkgpart } );
+}
+
+=item svcpart [ SVCDB ]
+
+Returns the svcpart of a single service definition (see L<FS::part_svc>)
+associated with this billing item definition (see L<FS::pkg_svc>).  Returns
+false if there not exactly one service definition with quantity 1, or if 
+SVCDB is specified and does not match the svcdb of the service definition, 
+
+=cut
+
+sub svcpart {
+  my $self = shift;
+  my $svcdb = shift;
+  my @pkg_svc = $self->pkg_svc;
+  return '' if scalar(@pkg_svc) != 1
+               || $pkg_svc[0]->quantity != 1
+               || ( $svcdb && $pkg_svc[0]->part_svc->svcdb ne $svcdb );
+  $pkg_svc[0]->svcpart;
+}
+
+=back
+
+=head1 VERSION
+
+$Id: part_pkg.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+The delete method is unimplemented.
+
+setup and recur semantics are not yet defined (and are implemented in
+FS::cust_bill.  hmm.).
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_pkg>, L<FS::type_pkgs>, L<FS::pkg_svc>, L<Safe>.
+schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/part_referral.pm b/FS/FS/part_referral.pm
new file mode 100644
index 000000000..3f0af4b8e
--- /dev/null
+++ b/FS/FS/part_referral.pm
@@ -0,0 +1,110 @@
+package FS::part_referral;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::part_referral - Object methods for part_referral objects
+
+=head1 SYNOPSIS
+
+  use FS::part_referral;
+
+  $record = new FS::part_referral \%hash
+  $record = new FS::part_referral { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::part_referral represents a referral - where a customer heard of your
+services.  This can be used to track the effectiveness of a particular piece of
+advertising, for example.  FS::part_referral inherits from FS::Record.  The
+following fields are currently supported:
+
+=over 4
+
+=item refnum - primary key (assigned automatically for new referrals)
+
+=item referral - Text name of this referral
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new referral.  To add the referral to the database, see L<"insert">.
+
+=cut
+
+sub table { 'part_referral'; }
+
+=item insert
+
+Adds this referral to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Currently unimplemented.
+
+=cut
+
+sub delete {
+  my $self = shift;
+  return "Can't (yet?) delete part_referral records";
+  #need to make sure no customers have this referral!
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid referral.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  $self->ut_numbern('refnum')
+    || $self->ut_text('referral')
+  ;
+}
+
+=back
+
+=head1 VERSION
+
+$Id: part_referral.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+The delete method is unimplemented.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_main>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
new file mode 100644
index 000000000..01487b75f
--- /dev/null
+++ b/FS/FS/part_svc.pm
@@ -0,0 +1,165 @@
+package FS::part_svc;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( fields );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::part_svc - Object methods for part_svc objects
+
+=head1 SYNOPSIS
+
+  use FS::part_svc;
+
+  $record = new FS::part_referral \%hash
+  $record = new FS::part_referral { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::part_svc represents a service definition.  FS::part_svc inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item svcpart - primary key (assigned automatically for new service definitions)
+
+=item svc - text name of this service definition
+
+=item svcdb - table used for this service.  See L<FS::svc_acct>,
+L<FS::svc_domain>, and L<FS::svc_acct_sm>, among others.
+
+=item I<svcdb>__I<field> - Default or fixed value for I<field> in I<svcdb>.
+
+=item I<svcdb>__I<field>_flag - defines I<svcdb>__I<field> action: null, `D' for default, or `F' for fixed
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new service definition.  To add the service definition to the
+database, see L<"insert">.
+
+=cut
+
+sub table { 'part_svc'; }
+
+=item insert
+
+Adds this service definition to the database.  If there is an error, returns
+the error, otherwise returns false.
+
+=item delete
+
+Currently unimplemented.
+
+=cut
+
+sub delete {
+  return "Can't (yet?) delete service definitions.";
+# check & make sure the svcpart isn't in cust_svc or pkg_svc (in any packages)?
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my ( $new, $old ) = ( shift, shift );
+
+  return "Can't change svcdb!"
+    unless $old->svcdb eq $new->svcdb;
+
+  $new->SUPER::replace( $old );
+}
+
+=item check
+
+Checks all fields to make sure this is a valid service definition.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+  my $recref = $self->hashref;
+
+  my $error;
+  $error=
+    $self->ut_numbern('svcpart')
+    || $self->ut_text('svc')
+    || $self->ut_alpha('svcdb')
+  ;
+  return $error if $error;
+
+  my @fields = eval { fields( $recref->{svcdb} ) }; #might die
+  return "Unknown svcdb!" unless @fields;
+
+  my $svcdb;
+  foreach $svcdb ( qw(
+    svc_acct svc_acct_sm svc_domain
+  ) ) {
+    my @rows = map { /^${svcdb}__(.*)$/; $1 }
+      grep ! /_flag$/,
+        grep /^${svcdb}__/,
+          fields('part_svc');
+    foreach my $row (@rows) {
+      unless ( $svcdb eq $recref->{svcdb} ) {
+        $recref->{$svcdb.'__'.$row}='';
+        $recref->{$svcdb.'__'.$row.'_flag'}='';
+        next;
+      }
+      $recref->{$svcdb.'__'.$row.'_flag'} =~ /^([DF]?)$/
+        or return "Illegal flag for $svcdb $row";
+      $recref->{$svcdb.'__'.$row.'_flag'} = $1;
+
+      my $error = $self->ut_anything($svcdb.'__'.$row);
+      return $error if $error;
+
+    }
+  }
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: part_svc.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+Delete is unimplemented.
+
+The list of svc_* tables is hardcoded.  When svc_acct_pop is renamed, this
+should be fixed.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::part_pkg>, L<FS::pkg_svc>, L<FS::cust_svc>,
+L<FS::svc_acct>, L<FS::svc_acct_sm>, L<FS::svc_domain>, schema.html from the
+base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/pkg_svc.pm b/FS/FS/pkg_svc.pm
new file mode 100644
index 000000000..1812dbf29
--- /dev/null
+++ b/FS/FS/pkg_svc.pm
@@ -0,0 +1,152 @@
+package FS::pkg_svc;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs );
+use FS::part_pkg;
+use FS::part_svc;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::pkg_svc - Object methods for pkg_svc records
+
+=head1 SYNOPSIS
+
+  use FS::pkg_svc;
+
+  $record = new FS::pkg_svc \%hash;
+  $record = new FS::pkg_svc { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $part_pkg = $record->part_pkg;
+
+  $part_svc = $record->part_svc;
+
+=head1 DESCRIPTION
+
+An FS::pkg_svc record links a billing item definition (see L<FS::part_pkg>) to
+a service definition (see L<FS::part_svc>).  FS::pkg_svc inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item pkgpart - Billing item definition (see L<FS::part_pkg>)
+
+=item svcpart - Service definition (see L<FS::part_svc>)
+
+=item quantity - Quantity of this service definition that this billing item
+definition includes
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Create a new record.  To add the record to the database, see L<"insert">.
+
+=cut
+
+sub table { 'pkg_svc'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my ( $new, $old ) = ( shift, shift );
+
+  return "Can't change pkgpart!" if $old->pkgpart != $new->pkgpart;
+  return "Can't change svcpart!" if $old->svcpart != $new->svcpart;
+
+  $new->SUPER::replace($old);
+}
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error;
+  $error =
+    $self->ut_number('pkgpart')
+    || $self->ut_number('svcpart')
+    || $self->ut_number('quantity')
+  ;
+  return $error if $error;
+
+  return "Unknown pkgpart!" unless $self->part_pkg;
+  return "Unknown svcpart!" unless $self->part_svc;
+
+  ''; #no error
+}
+
+=item part_pkg
+
+Returns the FS::part_pkg object (see L<FS::part_pkg>).
+
+=cut
+
+sub part_pkg {
+  my $self = shift;
+  qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
+}
+
+=item part_svc
+
+Returns the FS::part_svc object (see L<FS::part_svc>).
+
+=cut
+
+sub part_svc {
+  my $self = shift;
+  qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
+}
+
+=back
+
+=head1 VERSION
+
+$Id: pkg_svc.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::part_pkg>, L<FS::part_svc>, schema.html from the base
+documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
new file mode 100644
index 000000000..5bea5b0ce
--- /dev/null
+++ b/FS/FS/svc_Common.pm
@@ -0,0 +1,204 @@
+package FS::svc_Common;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs fields );
+use FS::cust_svc;
+use FS::part_svc;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::svc_Common - Object method for all svc_ records
+
+=head1 SYNOPSIS
+
+use FS::svc_Common;
+
+@ISA = qw( FS::svc_Common );
+
+=head1 DESCRIPTION
+
+FS::svc_Common is intended as a base class for table-specific classes to
+inherit from, i.e. FS::svc_acct.  FS::svc_Common inherits from FS::Record.
+
+=head1 METHODS
+
+=over 4
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
+defined.  An FS::cust_svc record will be created and inserted.
+
+=cut
+
+sub insert {
+  my $self = shift;
+  my $error;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  $error = $self->check;
+  return $error if $error;
+
+  my $svcnum = $self->svcnum;
+  my $cust_svc;
+  unless ( $svcnum ) {
+    $cust_svc = new FS::cust_svc ( {
+      'svcnum'  => $svcnum,
+      'pkgnum'  => $self->pkgnum,
+      'svcpart' => $self->svcpart,
+    } );
+    $error = $cust_svc->insert;
+    return $error if $error;
+    $svcnum = $self->svcnum($cust_svc->svcnum);
+  }
+
+  $error = $self->SUPER::insert;
+  if ( $error ) {
+    $cust_svc->delete if $cust_svc;
+    return $error;
+  }
+
+  '';
+}
+
+=item delete
+
+Deletes this account from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+The corresponding FS::cust_svc record will be deleted as well.
+
+=cut
+
+sub delete {
+  my $self = shift;
+  my $error;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $svcnum = $self->svcnum;
+
+  $error = $self->SUPER::delete;
+  return $error if $error;
+
+  my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );  
+  $error = $cust_svc->delete;
+  return $error if $error;
+
+  '';
+}
+
+=item setfixed
+
+Sets any fixed fields for this service (see L<FS::part_svc>).  If there is an
+error, returns the error, otherwise returns the FS::part_svc object (use ref()
+to test the return).  Usually called by the check method.
+
+=cut
+
+sub setfixed {
+  my $self = shift;
+  $self->setx('F');
+}
+
+=item setdefault
+
+Sets all fields to their defaults (see L<FS::part_svc>), overriding their
+current values.  If there is an error, returns the error, otherwise returns
+the FS::part_svc object (use ref() to test the return).
+
+=cut
+
+sub setdefault {
+  my $self = shift;
+  $self->setx('D');
+}
+
+sub setx {
+  my $self = shift;
+  my $x = shift;
+
+  my $error;
+
+  $error =
+    $self->ut_numbern('svcnum')
+  ;
+  return $error if $error;
+
+  #get part_svc
+  my $svcpart;
+  if ( $self->svcnum ) {
+    my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $self->svcnum } );
+    return "Unknown svcnum" unless $cust_svc; 
+    $svcpart = $cust_svc->svcpart;
+  } else {
+    $svcpart = $self->getfield('svcpart');
+  }
+  my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
+  return "Unkonwn svcpart" unless $part_svc;
+
+  #set default/fixed/whatever fields from part_svc
+  foreach my $field ( fields('svc_acct') ) {
+    if ( $part_svc->getfield('svc_acct__'. $field. '_flag') eq $x ) {
+      $self->setfield( $field, $part_svc->getfield('svc_acct__'. $field) );
+    }
+  }
+
+ $part_svc;
+
+}
+
+=item suspend
+
+=item unsuspend
+
+=item cancel
+
+Stubs - return false (no error) so derived classes don't need to define these
+methods.  Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=cut
+
+sub suspend { ''; }
+sub unsuspend { ''; }
+sub cancel { ''; }
+
+=back
+
+=head1 VERSION
+
+$Id: svc_Common.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+The setfixed method return value.
+
+The new method should set defaults from part_svc (like the check method
+sets fixed values)?
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>, schema.html
+from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
new file mode 100644
index 000000000..b2f23c933
--- /dev/null
+++ b/FS/FS/svc_acct.pm
@@ -0,0 +1,468 @@
+package FS::svc_acct;
+
+use strict;
+use vars qw(@ISA $nossh_hack $conf $dir_prefix @shells
+            $shellmachine @saltset @pw_set);
+use FS::Conf;
+use FS::Record qw( qsearchs fields );
+use FS::svc_Common;
+use FS::SSH qw(ssh);
+use FS::part_svc;
+use FS::svc_acct_pop;
+
+@ISA = qw( FS::svc_Common );
+
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::svc_acct'} = sub { 
+  $conf = new FS::Conf;
+  $dir_prefix = $conf->config('home');
+  @shells = $conf->config('shells');
+  $shellmachine = $conf->config('shellmachine');
+};
+
+@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+@pw_set = ( 'a'..'z', 'A'..'Z', '0'..'9', '(', ')', '#', '!', '.', ',' );
+
+#not needed in 5.004 #srand($$|time);
+
+=head1 NAME
+
+FS::svc_acct - Object methods for svc_acct records
+
+=head1 SYNOPSIS
+
+  use FS::svc_acct;
+
+  $record = new FS::svc_acct \%hash;
+  $record = new FS::svc_acct { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $error = $record->suspend;
+
+  $error = $record->unsuspend;
+
+  $error = $record->cancel;
+
+=head1 DESCRIPTION
+
+An FS::svc_acct object represents an account.  FS::svc_acct inherits from
+FS::svc_Common.  The following fields are currently supported:
+
+=over 4
+
+=item svcnum - primary key (assigned automatcially for new accounts)
+
+=item username
+
+=item _password - generated if blank
+
+=item popnum - Point of presence (see L<FS::svc_acct_pop>)
+
+=item uid
+
+=item gid
+
+=item finger - GECOS
+
+=item dir - set automatically if blank (and uid is not)
+
+=item shell
+
+=item quota - (unimplementd)
+
+=item slipip - IP address
+
+=item radius_I<Radius_Attribute> - I<Radius-Attribute>
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new account.  To add the account to the database, see L<"insert">.
+
+=cut
+
+sub table { 'svc_acct'; }
+
+=item insert
+
+Adds this account to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
+defined.  An FS::cust_svc record will be created and inserted.
+
+If the configuration value (see L<FS::Conf>) shellmachine exists, and the 
+username, uid, and dir fields are defined, the command
+
+  useradd -d $dir -m -s $shell -u $uid $username
+
+is executed on shellmachine via ssh.  This behaviour can be surpressed by
+setting $FS::svc_acct::nossh_hack true.
+
+=cut
+
+sub insert {
+  my $self = shift;
+  my $error;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  $error = $self->check;
+  return $error if $error;
+
+  return "Username ". $self->username. " in use"
+    if qsearchs( 'svc_acct', { 'username' => $self->username } );
+
+  my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
+  return "Unkonwn svcpart" unless $part_svc;
+  return "uid in use"
+    if $part_svc->svc_acct__uid_flag ne 'F'
+      && qsearchs( 'svc_acct', { 'uid' => $self->uid } )
+      && $self->username !~ /^(hyla)?fax$/
+    ;
+
+  $error = $self->SUPER::insert;
+  return $error if $error;
+
+  my ( $username, $uid, $dir, $shell ) = (
+    $self->username,
+    $self->uid,
+    $self->dir,
+    $self->shell,
+  );
+  if ( $username 
+       && $uid
+       && $dir
+       && $shellmachine
+       && ! $nossh_hack ) {
+    #one way
+    ssh("root\@$shellmachine",
+        "useradd -d $dir -m -s $shell -u $uid $username"
+    );
+    #another way
+    #ssh("root\@$shellmachine","/bin/mkdir $dir; /bin/chmod 711 $dir; ".
+    #  "/bin/cp -p /etc/skel/.* $dir 2>/dev/null; ".
+    #  "/bin/cp -pR /etc/skel/Maildir $dir 2>/dev/null; ".
+    #  "/bin/chown -R $uid $dir") unless $nossh_hack;
+  }
+
+  ''; #no error
+}
+
+=item delete
+
+Deletes this account from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+The corresponding FS::cust_svc record will be deleted as well.
+
+If the configuration value (see L<FS::Conf>) shellmachine exists, the command:
+
+  userdel $username
+
+is executed on shellmachine via ssh.  This behaviour can be surpressed by
+setting $FS::svc_acct::nossh_hack true.
+
+=cut
+
+sub delete {
+  my $self = shift;
+  my $error;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  $error = $self->SUPER::delete;
+  return $error if $error;
+
+  my $username = $self->username;
+  if ( $username && $shellmachine && ! $nossh_hack ) {
+    ssh("root\@$shellmachine","userdel $username");
+  }
+
+  '';
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+If the configuration value (see L<FS::Conf>) shellmachine exists, and the 
+dir field has changed, the command:
+
+  [ -d $old_dir ] && (
+    chmod u+t $old_dir;
+    umask 022;
+    mkdir $new_dir;
+    cd $old_dir;
+    find . -depth -print | cpio -pdm $new_dir;
+    chmod u-t $new_dir;
+    chown -R $uid.$gid $new_dir;
+    rm -rf $old_dir
+  )
+
+is executed on shellmachine via ssh.  This behaviour can be surpressed by
+setting $FS::svc_acct::nossh_hack true.
+
+=cut
+
+sub replace {
+  my ( $new, $old ) = ( shift, shift );
+  my $error;
+
+  return "Username in use"
+    if $old->username ne $new->username &&
+      qsearchs( 'svc_acct', { 'username' => $new->username } );
+
+  return "Can't change uid!" if $old->uid != $new->uid;
+
+  #change homdir when we change username
+  $new->setfield('dir', '') if $old->username ne $new->username;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  $error = $new->SUPER::replace($old);
+  return $error if $error;
+
+  my ( $old_dir, $new_dir ) = ( $old->getfield('dir'), $new->getfield('dir') );
+  my ( $uid, $gid) = ( $new->getfield('uid'), $new->getfield('gid') );
+  if ( $old_dir
+       && $new_dir
+       && $old_dir ne $new_dir
+       && ! $nossh_hack
+  ) {
+    ssh("root\@$shellmachine","[ -d $old_dir ] && ".
+                 "( chmod u+t $old_dir; ". #turn off qmail delivery
+                 "umask 022; mkdir $new_dir; cd $old_dir; ".
+                 "find . -depth -print | cpio -pdm $new_dir; ".
+                 "chmod u-t $new_dir; chown -R $uid.$gid $new_dir; ".
+                 "rm -rf $old_dir". 
+                 ")"
+    );
+  }
+
+  ''; #no error
+}
+
+=item suspend
+
+Suspends this account by prefixing *SUSPENDED* to the password.  If there is an
+error, returns the error, otherwise returns false.
+
+Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=cut
+
+sub suspend {
+  my $self = shift;
+  my %hash = $self->hash;
+  unless ( $hash{_password} =~ /^\*SUSPENDED\* / ) {
+    $hash{_password} = '*SUSPENDED* '.$hash{_password};
+    my $new = new FS::svc_acct ( \%hash );
+    $new->replace($self);
+  } else {
+    ''; #no error (already suspended)
+  }
+}
+
+=item unsuspend
+
+Unsuspends this account by removing *SUSPENDED* from the password.  If there is
+an error, returns the error, otherwise returns false.
+
+Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=cut
+
+sub unsuspend {
+  my $self = shift;
+  my %hash = $self->hash;
+  if ( $hash{_password} =~ /^\*SUSPENDED\* (.*)$/ ) {
+    $hash{_password} = $1;
+    my $new = new FS::svc_acct ( \%hash );
+    $new->replace($self);
+  } else {
+    ''; #no error (already unsuspended)
+  }
+}
+
+=item cancel
+
+Just returns false (no error) for now.
+
+Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item check
+
+Checks all fields to make sure this is a valid service.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+Sets any fixed values; see L<FS::part_svc>.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my($recref) = $self->hashref;
+
+  my $x = $self->setfixed;
+  return $x unless ref($x);
+  my $part_svc = $x;
+
+  my $ulen =$self->dbdef_table->column('username')->length;
+  $recref->{username} =~ /^([a-z0-9_\-]{2,$ulen})$/
+    or return "Illegal username";
+  $recref->{username} = $1;
+  $recref->{username} =~ /[a-z]/ or return "Illegal username";
+
+  $recref->{popnum} =~ /^(\d*)$/ or return "Illegal popnum";
+  $recref->{popnum} = $1;
+  return "Unkonwn popnum" unless
+    ! $recref->{popnum} ||
+    qsearchs('svc_acct_pop',{'popnum'=> $recref->{popnum} } );
+
+  unless ( $part_svc->getfield('svc_acct__uid_flag') eq 'F' ) {
+
+    $recref->{uid} =~ /^(\d*)$/ or return "Illegal uid";
+    $recref->{uid} = $1 eq '' ? $self->unique('uid') : $1;
+
+    $recref->{gid} =~ /^(\d*)$/ or return "Illegal gid";
+    $recref->{gid} = $1 eq '' ? $recref->{uid} : $1;
+    #not all systems use gid=uid
+    #you can set a fixed gid in part_svc
+
+    return "Only root can have uid 0"
+      if $recref->{uid} == 0 && $recref->{username} ne 'root';
+
+    my($error);
+    return $error if $error=$self->ut_textn('finger');
+
+    $recref->{dir} =~ /^([\/\w\-]*)$/
+      or return "Illegal directory";
+    $recref->{dir} = $1 || 
+      $dir_prefix . '/' . $recref->{username}
+      #$dir_prefix . '/' . substr($recref->{username},0,1). '/' . $recref->{username}
+    ;
+
+    unless ( $recref->{username} eq 'sync' ) {
+      my($shell);
+      if ( $shell = (grep $_ eq $recref->{shell}, @shells)[0] ) {
+        $recref->{shell} = $shell;
+      } else {
+        return "Illegal shell \`". $self->shell. "\'; ".
+               $conf->dir. "/shells contains: @shells";
+      }
+    } else {
+      $recref->{shell} = '/bin/sync';
+    }
+
+    $recref->{quota} =~ /^(\d*)$/ or return "Illegal quota (unimplemented)";
+    $recref->{quota} = $1;
+
+  } else {
+    $recref->{gid} ne '' ? 
+      return "Can't have gid without uid" : ( $recref->{gid}='' );
+    $recref->{finger} ne '' ? 
+      return "Can't have finger-name without uid" : ( $recref->{finger}='' );
+    $recref->{dir} ne '' ? 
+      return "Can't have directory without uid" : ( $recref->{dir}='' );
+    $recref->{shell} ne '' ? 
+      return "Can't have shell without uid" : ( $recref->{shell}='' );
+    $recref->{quota} ne '' ? 
+      return "Can't have quota without uid" : ( $recref->{quota}='' );
+  }
+
+  unless ( $part_svc->getfield('svc_acct__slipip_flag') eq 'F' ) {
+    unless ( $recref->{slipip} eq '0e0' ) {
+      $recref->{slipip} =~ /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/
+        or return "Illegal slipip". $self->slipip;
+      $recref->{slipip} = $1;
+    } else {
+      $recref->{slipip} = '0e0';
+    }
+
+  }
+
+  #arbitrary RADIUS stuff; allow ut_textn for now
+  foreach ( grep /^radius_/, fields('svc_acct') ) {
+    $self->ut_textn($_);
+  }
+
+  #generate a password if it is blank
+  $recref->{_password} = join('',map($pw_set[ int(rand $#pw_set) ], (0..7) ) )
+    unless ( $recref->{_password} );
+
+  #if ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([^\t\n]{4,16})$/ ) {
+  if ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([^\t\n]{4,8})$/ ) {
+    $recref->{_password} = $1.$3;
+    #uncomment this to encrypt password immediately upon entry, or run
+    #bin/crypt_pw in cron to give new users a window during which their
+    #password is available to techs, for faxing, etc.  (also be aware of 
+    #radius issues!)
+    #$recref->{password} = $1.
+    #  crypt($3,$saltset[int(rand(64))].$saltset[int(rand(64))]
+    #;
+  } elsif ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([\w\.\/]{13,24})$/ ) {
+    $recref->{_password} = $1.$3;
+  } elsif ( $recref->{_password} eq '*' ) {
+    $recref->{_password} = '*';
+  } else {
+    return "Illegal password";
+  }
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: svc_acct.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+The remote commands should be configurable.
+
+The bits which ssh should fork before doing so.
+
+The $recref stuff in sub check should be cleaned up.
+
+=head1 SEE ALSO
+
+L<FS::svc_Common>, L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>,
+L<FS::part_svc>, L<FS::cust_pkg>, L<FS::SSH>, L<ssh>, L<FS::svc_acct_pop>,
+schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/svc_acct_pop.pm b/FS/FS/svc_acct_pop.pm
new file mode 100644
index 000000000..a64adb25a
--- /dev/null
+++ b/FS/FS/svc_acct_pop.pm
@@ -0,0 +1,111 @@
+package FS::svc_acct_pop;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs );
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::svc_acct_pop - Object methods for svc_acct_pop records
+
+=head1 SYNOPSIS
+
+  use FS::svc_acct_pop;
+
+  $record = new FS::svc_acct_pop \%hash;
+  $record = new FS::svc_acct_pop { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::svc_acct object represents an point of presence.  FS::svc_acct_pop
+inherits from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item popnum - primary key (assigned automatically for new accounts)
+
+=item city
+
+=item state
+
+=item ac - area code
+
+=item exch - exchange
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new point of presence (if only it were that easy!).  To add the 
+point of presence to the database, see L<"insert">.
+
+=cut
+
+sub table { 'svc_acct_pop'; }
+
+=item insert
+
+Adds this point of presence to the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=item delete
+
+Removes this point of presence from the database.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid point of presence.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+    $self->ut_numbern('popnum')
+      or $self->ut_text('city')
+      or $self->ut_text('state')
+      or $self->ut_number('ac')
+      or $self->ut_number('exch')
+  ;
+
+}
+
+=back
+
+=head1 VERSION
+
+$Id: svc_acct_pop.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+It should be renamed to part_pop.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<svc_acct>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/svc_acct_sm.pm b/FS/FS/svc_acct_sm.pm
new file mode 100644
index 000000000..96bc3a27b
--- /dev/null
+++ b/FS/FS/svc_acct_sm.pm
@@ -0,0 +1,252 @@
+package FS::svc_acct_sm;
+
+use strict;
+use vars qw( @ISA $nossh_hack $conf $shellmachine @qmailmachines );
+use FS::Record qw( fields qsearch qsearchs );
+use FS::svc_Common;
+use FS::cust_svc;
+use FS::SSH qw(ssh);
+use FS::Conf;
+use FS::svc_acct;
+use FS::svc_domain;
+
+@ISA = qw( FS::svc_Common );
+
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::svc_acct_sm'} = sub { 
+  $conf = new FS::Conf;
+  $shellmachine = $conf->exists('qmailmachines')
+                  ? $conf->config('shellmachine')
+                  : '';
+};
+
+=head1 NAME
+
+FS::svc_acct_sm - Object methods for svc_acct_sm records
+
+=head1 SYNOPSIS
+
+  use FS::svc_acct_sm;
+
+  $record = new FS::svc_acct_sm \%hash;
+  $record = new FS::svc_acct_sm { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $error = $record->suspend;
+
+  $error = $record->unsuspend;
+
+  $error = $record->cancel;
+
+=head1 DESCRIPTION
+
+An FS::svc_acct object represents a virtual mail alias.  FS::svc_acct inherits
+from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item svcnum - primary key (assigned automatcially for new accounts)
+
+=item domsvc - svcnum of the virtual domain (see L<FS::svc_domain>)
+
+=item domuid - uid of the target account (see L<FS::svc_acct>)
+
+=item domuser - virtual username
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new virtual mail alias.  To add the virtual mail alias to the
+database, see L<"insert">.
+
+=cut
+
+sub table { 'svc_acct_sm'; }
+
+=item insert
+
+Adds this virtual mail alias to the database.  If there is an error, returns
+the error, otherwise returns false.
+
+The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
+defined.  An FS::cust_svc record will be created and inserted.
+
+If the configuration values (see L<FS::Conf>) shellmachine and qmailmachines
+exist, and domuser is `*' (meaning a catch-all mailbox), the command:
+
+  [ -e $dir/.qmail-$qdomain-default ] || {
+    touch $dir/.qmail-$qdomain-default;
+    chown $uid:$gid $dir/.qmail-$qdomain-default;
+  }
+
+is executed on shellmachine via ssh (see L<dot-qmail/"EXTENSION ADDRESSES">).
+This behaviour can be surpressed by setting $FS::svc_acct_sm::nossh_hack true.
+
+=cut
+
+sub insert {
+  my $self = shift;
+  my $error;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  $error=$self->check;
+  return $error if $error;
+
+  return "Domain username (domuser) in use for this domain (domsvc)"
+    if qsearchs('svc_acct_sm',{ 'domuser'=> $self->domuser,
+                                'domsvc' => $self->domsvc,
+                              } );
+
+  return "First domain username (domuser) for domain (domsvc) must be " .
+         qq='*' (catch-all)!=
+    if $self->domuser ne '*' &&
+       ! qsearch('svc_acct_sm',{ 'domsvc' => $self->domsvc } );
+
+  $error = $self->SUPER::insert;
+  return $error if $error;
+
+  my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } );
+  my $svc_acct = qsearchs( 'svc_acct', { 'uid' => $self->domuid } );
+  my ( $uid, $gid, $dir, $domain ) = (
+    $svc_acct->uid,
+    $svc_acct->gid,
+    $svc_acct->dir,
+    $svc_domain->domain,
+  );
+  my $qdomain = $domain;
+  $qdomain =~ s/\./:/g; #see manpage for 'dot-qmail': EXTENSION ADDRESSES
+  ssh("root\@$shellmachine","[ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }")  
+    if ( ! $nossh_hack && $shellmachine && $dir && $self->domuser eq '*' );
+
+  ''; #no error
+
+}
+
+=item delete
+
+Deletes this virtual mail alias from the database.  If there is an error,
+returns the error, otherwise returns false.
+
+The corresponding FS::cust_svc record will be deleted as well.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my ( $new, $old ) = ( shift, shift );
+  my $error;
+
+  return "Domain username (domuser) in use for this domain (domsvc)"
+    if ( $old->domuser ne $new->domuser
+         || $old->domsvc != $new->domsvc
+       )  && qsearchs('svc_acct_sm',{
+         'domuser'=> $new->domuser,
+         'domsvc' => $new->domsvc,
+       } )
+     ;
+
+ $new->SUPER::replace($old);
+
+}
+
+=item suspend
+
+Just returns false (no error) for now.
+
+Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item unsuspend
+
+Just returns false (no error) for now.
+
+Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item cancel
+
+Just returns false (no error) for now.
+
+Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item check
+
+Checks all fields to make sure this is a valid virtual mail alias.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert and
+replace methods.
+
+Sets any fixed values; see L<FS::part_svc>.
+
+=cut
+
+sub check {
+  my $self = shift;
+  my $error;
+
+  my $x = $self->setfixed;
+  return $x unless ref($x);
+  my $part_svc = $x;
+
+  my($recref) = $self->hashref;
+
+  $recref->{domuser} =~ /^(\*|[a-z0-9_\-]{2,32})$/
+    or return "Illegal domain username (domuser)";
+  $recref->{domuser} = $1;
+
+  $recref->{domsvc} =~ /^(\d+)$/ or return "Illegal domsvc";
+  $recref->{domsvc} = $1;
+  my($svc_domain);
+  return "Unknown domsvc" unless
+    $svc_domain=qsearchs('svc_domain',{'svcnum'=> $recref->{domsvc} } );
+
+  $recref->{domuid} =~ /^(\d+)$/ or return "Illegal uid";
+  $recref->{domuid} = $1;
+  my($svc_acct);
+  return "Unknown uid" unless
+    $svc_acct=qsearchs('svc_acct',{'uid'=> $recref->{domuid} } );
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: svc_acct_sm.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+The remote commands should be configurable.
+
+The $recref stuff in sub check should be cleaned up.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
+L<FS::svc_acct>, L<FS::svc_domain>, L<FS::SSH>, L<ssh>, L<dot-qmail>,
+schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
new file mode 100644
index 000000000..c6d124833
--- /dev/null
+++ b/FS/FS/svc_domain.pm
@@ -0,0 +1,421 @@
+package FS::svc_domain;
+
+use strict;
+use vars qw( @ISA $whois_hack $conf $mydomain $smtpmachine
+  $tech_contact $from $to @nameservers @nameserver_ips @template
+);
+use Carp;
+use Mail::Internet;
+use Mail::Header;
+use Date::Format;
+use Net::Whois; #0.24;
+use FS::Record qw(fields qsearch qsearchs);
+use FS::Conf;
+use FS::svc_Common;
+use FS::cust_svc;
+use FS::svc_acct;
+use FS::cust_pkg;
+use FS::cust_main;
+
+@ISA = qw( FS::svc_Common );
+
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::domain'} = sub { 
+  $conf = new FS::Conf;
+
+  $mydomain = $conf->config('domain');
+  $smtpmachine = $conf->config('smtpmachine');
+
+  my($internic)="/registries/internic";
+  $tech_contact = $conf->config("$internic/tech_contact");
+  $from = $conf->config("$internic/from");
+  $to = $conf->config("$internic/to");
+  my(@ns) = $conf->config("$internic/nameservers");
+  @nameservers=map {
+    /^\s*\d+\.\d+\.\d+\.\d+\s+([^\s]+)\s*$/
+      or die "Illegal line in $internic/nameservers";
+    $1;
+  } @ns;
+  @nameserver_ips=map {
+    /^\s*(\d+\.\d+\.\d+\.\d+)\s+([^\s]+)\s*$/
+      or die "Illegal line in $internic/nameservers!";
+    $1;
+  } @ns;
+  @template = map { $_. "\n" } $conf->config("$internic/template");
+
+};
+
+=head1 NAME
+
+FS::svc_domain - Object methods for svc_domain records
+
+=head1 SYNOPSIS
+
+  use FS::svc_domain;
+
+  $record = new FS::svc_domain \%hash;
+  $record = new FS::svc_domain { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $error = $record->suspend;
+
+  $error = $record->unsuspend;
+
+  $error = $record->cancel;
+
+=head1 DESCRIPTION
+
+An FS::svc_domain object represents a domain.  FS::svc_domain inherits from
+FS::svc_Common.  The following fields are currently supported:
+
+=over 4
+
+=item svcnum - primary key (assigned automatically for new accounts)
+
+=item domain
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new domain.  To add the domain to the database, see L<"insert">.
+
+=cut
+
+sub table { 'svc_domain'; }
+
+=item insert
+
+Adds this domain to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+The additional fields I<pkgnum> and I<svcpart> (see L<FS::cust_svc>) should be 
+defined.  An FS::cust_svc record will be created and inserted.
+
+The additional field I<action> should be set to I<N> for new domains or I<M>
+for transfers.
+
+A registration or transfer email will be submitted unless
+$FS::svc_domain::whois_hack is true.
+
+The additional field I<email> can be used to manually set the admin contact
+email address on this email.  Otherwise, the svc_acct records for this package 
+(see L<FS::cust_pkg>) are searched.  If there is exactly one svc_acct record
+in the same package, it is automatically used.  Otherwise an error is returned.
+
+=cut
+
+sub insert {
+  my $self = shift;
+  my $error;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  $error = $self->check;
+  return $error if $error;
+
+  return "Domain in use (here)"
+    if qsearchs( 'svc_domain', { 'domain' => $self->domain } );
+
+  my $whois = $self->whois;
+  return "Domain in use (see whois)"
+    if ( $self->action eq "N" && $whois );
+  return "Domain not found (see whois)"
+    if ( $self->action eq "M" && ! $whois );
+
+  $error = $self->SUPER::insert;
+  return $error if $error;
+
+  $self->submit_internic unless $whois_hack;
+
+  ''; #no error
+}
+
+=item delete
+
+Deletes this domain from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+The corresponding FS::cust_svc record will be deleted as well.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my ( $new, $old ) = ( shift, shift );
+  my $error;
+
+  return "Can't change domain - reorder."
+    if $old->getfield('domain') ne $new->getfield('domain'); 
+
+  $new->SUPER::replace($old);
+
+}
+
+=item suspend
+
+Just returns false (no error) for now.
+
+Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item unsuspend
+
+Just returns false (no error) for now.
+
+Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item cancel
+
+Just returns false (no error) for now.
+
+Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item check
+
+Checks all fields to make sure this is a valid domain.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+Sets any fixed values; see L<FS::part_svc>.
+
+=cut
+
+sub check {
+  my $self = shift;
+  my $error;
+
+  my $x = $self->setfixed;
+  return $x unless ref($x);
+  my $part_svc = $x;
+
+  #hmm
+  my $pkgnum;
+  if ( $self->svcnum ) {
+    my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $self->svcnum } );
+    $pkgnum = $cust_svc->pkgnum;
+  } else {
+    $pkgnum = $self->pkgnum;
+  }
+
+  my($recref) = $self->hashref;
+
+  unless ( $whois_hack ) {
+    unless ( $self->email ) { #find out an email address
+      my @svc_acct;
+      foreach ( qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } ) ) {
+        my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $_->svcnum } );
+        push @svc_acct, $svc_acct if $svc_acct;
+      }
+
+      if ( scalar(@svc_acct) == 0 ) {
+        return "Must order an account in package ". $pkgnum. " first";
+      } elsif ( scalar(@svc_acct) > 1 ) {
+        return "More than one account in package ". $pkgnum. ": specify admin contact email";
+      } else {
+        $self->email($svc_acct[0]->username. '@'. $mydomain);
+      }
+    }
+  }
+
+  #if ( $recref->{domain} =~ /^([\w\-\.]{1,22})\.(com|net|org|edu)$/ ) {
+  if ( $recref->{domain} =~ /^([\w\-]{1,22})\.(com|net|org|edu)$/ ) {
+    $recref->{domain} = "$1.$2";
+  # hmmmmmmmm.
+  } elsif ( $whois_hack && $recref->{domain} =~ /^([\w\-\.]+)$/ ) {
+    $recref->{domain} = $1;
+  } else {
+    return "Illegal domain ". $recref->{domain}.
+           " (or unknown registry - try \$whois_hack)";
+  }
+
+  $recref->{action} =~ /^(M|N)$/ or return "Illegal action";
+  $recref->{action} = $1;
+
+  $self->ut_textn('purpose');
+
+}
+
+=item whois
+
+Returns the Net::Whois object corresponding to this domain, or undef if
+the domain is not found in whois.
+
+(If $FS::svc_domain::whois_hack is true, returns that in all cases instead.)
+
+=cut
+
+sub whois {
+  $whois_hack or new Net::Whois::Domain $_[0]->domain;
+}
+
+=item _whois
+
+Depriciated.
+
+=cut
+
+sub _whois {
+  die "_whois depriciated";
+}
+
+=item submit_internic
+
+Submits a registration email for this domain.
+
+=cut
+
+sub submit_internic {
+  my $self = shift;
+
+  my $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
+  return unless $cust_pkg;
+  my $cust_main = qsearchs( 'cust_main', { 'custnum' => $cust_pkg->custnum } );
+  return unless $cust_main;
+
+  my %subs = (
+    'action'       => $self->action,
+    'purpose'      => $self->purpose,
+    'domain'       => $self->domain,
+    'company'      => $cust_main->company 
+                        || $cust_main->getfield('first'). ' '.
+                           $cust_main->getfield('last')
+                      ,
+    'city'         => $cust_main->city,
+    'state'        => $cust_main->state,
+    'zip'          => $cust_main->zip,
+    'country'      => $cust_main->country,
+    'last'         => $cust_main->getfield('last'),
+    'first'        => $cust_main->getfield('first'),
+    'daytime'      => $cust_main->daytime,
+    'fax'          => $cust_main->fax,
+    'email'        => $self->email,
+    'tech_contact' => $tech_contact,
+    'primary'      => shift @nameservers,
+    'primary_ip'   => shift @nameserver_ips,
+  );
+
+  #yuck
+  my @xtemplate = @template;
+  my @body;
+  my $line;
+  OLOOP: while ( defined( $line = shift @xtemplate ) ) {
+
+    if ( $line =~ /^###LOOP###$/ ) {
+      my(@buffer);
+      LOADBUF: while ( defined( $line = shift @xtemplate ) ) {
+        last LOADBUF if ( $line =~ /^###ENDLOOP###$/ );
+        push @buffer, $line;
+      }
+      my %lubs = (
+        'address'      => $cust_main->address2 
+                            ? [ $cust_main->address1, $cust_main->address2 ]
+                            : [ $cust_main->address1 ]
+                          ,
+        'secondary'    => [ @nameservers ],
+        'secondary_ip' => [ @nameserver_ips ],
+      );
+      LOOP: while (1) {
+        my @xbuffer = @buffer;
+        SUBLOOP: while ( defined( $line = shift @xbuffer ) ) {
+          if ( $line =~ /###(\w+)###/ ) {
+            #last LOOP unless my($lub)=shift@{$lubs{$1}};
+            next OLOOP unless my $lub = shift @{$lubs{$1}};
+            $line =~ s/###(\w+)###/$lub/e;
+            redo SUBLOOP;
+          } else {
+            push @body, $line;
+          }
+        } #SUBLOOP
+      } #LOOP
+
+    }
+
+    if ( $line =~ /###(\w+)###/ ) {
+      #$line =~ s/###(\w+)###/$subs{$1}/eg;
+      $line =~ s/###(\w+)###/$subs{$1}/e;
+      redo OLOOP;
+    } else {
+      push @body, $line;
+    }
+
+  } #OLOOP
+
+  my $subject;
+  if ( $self->action eq "M" ) {
+    $subject = "MODIFY DOMAIN ". $self->domain;
+  } elsif ( $self->action eq "N" ) { 
+    $subject = "NEW DOMAIN ". $self->domain;
+  } else {
+    croak "submit_internic called with action ". $self->action;
+  }
+
+  $ENV{SMTPHOSTS} = $smtpmachine;
+  $ENV{MAILADDRESS} = $from;
+  my $header = Mail::Header->new( [
+    "From: $from",
+    "To: $to",
+    "Sender: $from",
+    "Reply-To: $from",
+    "Date: ". time2str("%a, %d %b %Y %X %z", time),
+    "Subject: $subject",
+  ] );
+
+  my($msg)=Mail::Internet->new(
+    'Header' => $header,
+    'Body' => \@body,
+  );
+
+  $msg->smtpsend or die "Can't send registration email"; #die? warn?
+
+}
+
+=back
+
+=head1 VERSION
+
+$Id: svc_domain.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+All BIND/DNS fields should be included (and exported).
+
+Delete doesn't send a registration template.
+
+All registries should be supported.
+
+Should change action to a real field.
+
+The $recref stuff in sub check should be cleaned up.
+
+=head1 SEE ALSO
+
+L<FS::svc_Common>, L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>,
+L<FS::part_svc>, L<FS::cust_pkg>, L<FS::SSH>, L<Net::Whois>, L<ssh>,
+L<dot-qmail>, schema.html from the base documentation, config.html from the
+base documentation.
+
+=cut
+
+1;
+
+
diff --git a/FS/FS/type_pkgs.pm b/FS/FS/type_pkgs.pm
new file mode 100644
index 000000000..8e0d4ef56
--- /dev/null
+++ b/FS/FS/type_pkgs.pm
@@ -0,0 +1,113 @@
+package FS::type_pkgs;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs );
+use FS::agent_type;
+use FS::part_pkg;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::type_pkgs - Object methods for type_pkgs records
+
+=head1 SYNOPSIS
+
+  use FS::type_pkgs;
+
+  $record = new FS::type_pkgs \%hash;
+  $record = new FS::type_pkgs { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::type_pkgs record links an agent type (see L<FS::agent_type>) to a
+billing item definition (see L<FS::part_pkg>).  FS::type_pkgs inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item typenum - Agent type, see L<FS::agent_type>
+
+=item pkgpart - Billing item definition, see L<FS::part_pkg>
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Create a new record.  To add the record to the database, see L<"insert">.
+
+=cut
+
+sub table { 'type_pkgs'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_number('typenum')
+    || $self->ut_number('pkgpart')
+  ;
+  return $error if $error;
+
+  return "Unknown typenum"
+    unless qsearchs( 'agent_type', { 'typenum' => $self->typenum } );
+
+  return "Unknown pkgpart"
+    unless qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: type_pkgs.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::agent_type>, L<FS::part_pkgs>, schema.html from the base
+documentation.
+
+=cut
+
+1;
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index c036308ed..37e19e890 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -1,5 +1,47 @@
 Changes
 FS.pm
+FS/Bill.pm
+FS/CGI.pm
+FS/Conf.pm
+FS/Invoice.pm
+FS/Record.pm
+FS/SSH.pm
+FS/UI/Base.pm
+FS/UI/CGI.pm
+FS/UI/Gtk.pm
+FS/UI/agent.pm
+FS/UID.pm
+FS/agent.pm
+FS/agent_type.pm
+FS/cust_bill.pm
+FS/cust_bill_pkg.pm
+FS/cust_credit.pm
+FS/cust_main.pm
+FS/cust_main_county.pm
+FS/cust_main_invoice.pm
+FS/cust_pay.pm
+FS/cust_pay_batch.pm
+FS/cust_pkg.pm
+FS/cust_refund.pm
+FS/cust_svc.pm
+FS/dbdef.pm
+FS/dbdef_colgroup.pm
+FS/dbdef_column.pm
+FS/dbdef_index.pm
+FS/dbdef_table.pm
+FS/dbdef_unique.pm
+FS/part_pkg.pm
+FS/part_referral.pm
+FS/part_svc.pm
+FS/pkg_svc.pm
+FS/svc_Common.pm
+FS/svc_acct.pm
+FS/svc_acct_pop.pm
+FS/svc_acct_sm.pm
+FS/svc_domain.pm
+FS/type_pkgs.pm
 MANIFEST
+MANIFEST.SKIP
 Makefile.PL
 test.pl
+README
diff --git a/FS/MANIFEST.SKIP b/FS/MANIFEST.SKIP
new file mode 100644
index 000000000..ae335e78a
--- /dev/null
+++ b/FS/MANIFEST.SKIP
@@ -0,0 +1 @@
+CVS/
diff --git a/FS/README b/FS/README
new file mode 100644
index 000000000..d4c35acb4
--- /dev/null
+++ b/FS/README
@@ -0,0 +1,6 @@
+This is the Perl module section of Freeside.
+
+perl Makefile.PL
+make
+make test
+make install
-- 
cgit v1.2.1


From 263f3ca6d5572cc855760147ec09477b759f5c1e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Aug 1999 10:41:22 +0000
Subject: some pod syntax update to generate nicer html docs

---
 FS/FS/Record.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index f5f928210..e486e1ce7 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -719,7 +719,7 @@ sub ut_anything {
 
 This can be used as both a subroutine and a method call.  It returns a list
 of the columns in this record's table, or an explicitly specified table.
-(See L<dbdef_table>).
+(See L<FS::dbdef_table>).
 
 =cut
 
@@ -768,7 +768,7 @@ sub dbdef { $dbdef; }
 
 This is an internal function used to construct SQL statements.  It returns
 VALUE DBI-quoted (see L<DBI/"quote">) unless VALUE is a number and the column
-type (see L<dbdef_column>) does not end in `char' or `binary'.
+type (see L<FS::dbdef_column>) does not end in `char' or `binary'.
 
 =cut
 
@@ -825,7 +825,7 @@ sub hfields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: Record.pm,v 1.2 1999-08-04 10:41:22 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 52ba6db7b5930e9fda318a87ee00977fd12207db Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Aug 1999 11:50:41 +0000
Subject: pod syntax

---
 FS/FS/cust_pkg.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index c31340d2f..2de664b5c 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -351,7 +351,7 @@ sub unsuspend {
 =item part_pkg
 
 Returns the definition for this billing item, as an FS::part_pkg object (see
-L<FS::part_pkg).
+L<FS::part_pkg>).
 
 =cut
 
@@ -490,7 +490,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: cust_pkg.pm,v 1.2 1999-08-04 11:50:41 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From c5c64b9b6225072e50e74106dc2ffc455cb6118d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Aug 1999 12:12:57 +0000
Subject: correct link to new html documentation

---
 htdocs/docs/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/index.html b/htdocs/docs/index.html
index 73429c825..88714dc71 100644
--- a/htdocs/docs/index.html
+++ b/htdocs/docs/index.html
@@ -20,6 +20,6 @@
   <li><a href="billing.html">Billing</a>
   <li><a href="trouble.html">Troubleshooting</a>
   <li><a href="schema.html">Schema reference</a>
-  <li><a href="man/">Perl API</a>
+  <li><a href="man/FS.html">Perl API</a>
 </ul>
 </body>
-- 
cgit v1.2.1


From 2c816f314a8f3cc46e72e31f34ed97b4e11d0449 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Aug 1999 12:13:27 +0000
Subject: new HTML manpages

---
 htdocs/docs/man/Bill.txt                  |  29 ---
 htdocs/docs/man/CGI.txt                   |  98 --------
 htdocs/docs/man/Conf.txt                  |  57 -----
 htdocs/docs/man/FS.html                   | 247 ++++++++++++++++++
 htdocs/docs/man/FS/Bill.html              |  32 +++
 htdocs/docs/man/FS/CGI.html               | 115 +++++++++
 htdocs/docs/man/FS/Conf.html              |  94 +++++++
 htdocs/docs/man/FS/Invoice.html           |  32 +++
 htdocs/docs/man/FS/Record.html            | 380 ++++++++++++++++++++++++++++
 htdocs/docs/man/FS/SSH.html               | 104 ++++++++
 htdocs/docs/man/FS/UI/Base.html           | 117 +++++++++
 htdocs/docs/man/FS/UI/CGI.html            | 115 +++++++++
 htdocs/docs/man/FS/UI/Gtk.html            | 112 +++++++++
 htdocs/docs/man/FS/UI/agent.html          |   0
 htdocs/docs/man/FS/UID.html               | 160 ++++++++++++
 htdocs/docs/man/FS/agent.html             | 130 ++++++++++
 htdocs/docs/man/FS/agent_type.html        | 138 ++++++++++
 htdocs/docs/man/FS/cust_bill.html         | 184 ++++++++++++++
 htdocs/docs/man/FS/cust_bill_pkg.html     | 119 +++++++++
 htdocs/docs/man/FS/cust_credit.html       | 126 ++++++++++
 htdocs/docs/man/FS/cust_main.html         | 277 ++++++++++++++++++++
 htdocs/docs/man/FS/cust_main_county.html  | 113 +++++++++
 htdocs/docs/man/FS/cust_main_invoice.html | 128 ++++++++++
 htdocs/docs/man/FS/cust_pay.html          | 116 +++++++++
 htdocs/docs/man/FS/cust_pay_batch.html    | 134 ++++++++++
 htdocs/docs/man/FS/cust_pkg.html          | 254 +++++++++++++++++++
 htdocs/docs/man/FS/cust_refund.html       | 116 +++++++++
 htdocs/docs/man/FS/cust_svc.html          | 134 ++++++++++
 htdocs/docs/man/FS/dbdef.html             |  97 +++++++
 htdocs/docs/man/FS/dbdef_colgroup.html    |  86 +++++++
 htdocs/docs/man/FS/dbdef_column.html      | 118 +++++++++
 htdocs/docs/man/FS/dbdef_index.html       |  58 +++++
 htdocs/docs/man/FS/dbdef_table.html       | 144 +++++++++++
 htdocs/docs/man/FS/dbdef_unique.html      |  58 +++++
 htdocs/docs/man/FS/part_pkg.html          | 152 +++++++++++
 htdocs/docs/man/FS/part_referral.html     | 113 +++++++++
 htdocs/docs/man/FS/part_svc.html          | 121 +++++++++
 htdocs/docs/man/FS/pkg_svc.html           | 125 +++++++++
 htdocs/docs/man/FS/svc_Common.html        | 109 ++++++++
 htdocs/docs/man/FS/svc_acct.html          | 210 ++++++++++++++++
 htdocs/docs/man/FS/svc_acct_pop.html      | 115 +++++++++
 htdocs/docs/man/FS/svc_acct_sm.html       | 172 +++++++++++++
 htdocs/docs/man/FS/svc_domain.html        | 196 +++++++++++++++
 htdocs/docs/man/FS/type_pkgs.html         | 109 ++++++++
 htdocs/docs/man/Invoice.txt               |  27 --
 htdocs/docs/man/Record.txt                | 405 ------------------------------
 htdocs/docs/man/SSH.txt                   |  63 -----
 htdocs/docs/man/UID.txt                   | 140 -----------
 htdocs/docs/man/agent.txt                 |  66 -----
 htdocs/docs/man/agent_type.txt            |  79 ------
 htdocs/docs/man/cust_bill.txt             | 157 ------------
 htdocs/docs/man/cust_bill_pkg.txt         |  73 ------
 htdocs/docs/man/cust_credit.txt           |  88 -------
 htdocs/docs/man/cust_main.txt             | 278 --------------------
 htdocs/docs/man/cust_main_county.txt      |  76 ------
 htdocs/docs/man/cust_main_invoice.txt     |  98 --------
 htdocs/docs/man/cust_pay.txt              |  76 ------
 htdocs/docs/man/cust_pay_batch.txt        |  96 -------
 htdocs/docs/man/cust_pkg.txt              | 212 ----------------
 htdocs/docs/man/cust_refund.txt           |  76 ------
 htdocs/docs/man/cust_svc.txt              |  99 --------
 htdocs/docs/man/dbdef.txt                 |  80 ------
 htdocs/docs/man/dbdef_colgroup.txt        |  51 ----
 htdocs/docs/man/dbdef_column.txt          |  79 ------
 htdocs/docs/man/dbdef_index.txt           |  27 --
 htdocs/docs/man/dbdef_table.txt           | 103 --------
 htdocs/docs/man/dbdef_unique.txt          |  27 --
 htdocs/docs/man/index.html                |  51 ----
 htdocs/docs/man/part_pkg.txt              |  93 -------
 htdocs/docs/man/part_referral.txt         |  70 ------
 htdocs/docs/man/part_svc.txt              |  82 ------
 htdocs/docs/man/pkg_svc.txt               |  72 ------
 htdocs/docs/man/svc_Common.txt            |  75 ------
 htdocs/docs/man/svc_acct.txt              | 189 --------------
 htdocs/docs/man/svc_acct_pop.txt          |  72 ------
 htdocs/docs/man/svc_acct_sm.txt           | 124 ---------
 htdocs/docs/man/svc_domain.txt            | 159 ------------
 htdocs/docs/man/type_pkgs.txt             |  69 -----
 78 files changed, 5460 insertions(+), 3716 deletions(-)
 delete mode 100644 htdocs/docs/man/Bill.txt
 delete mode 100644 htdocs/docs/man/CGI.txt
 delete mode 100644 htdocs/docs/man/Conf.txt
 create mode 100644 htdocs/docs/man/FS.html
 create mode 100644 htdocs/docs/man/FS/Bill.html
 create mode 100644 htdocs/docs/man/FS/CGI.html
 create mode 100644 htdocs/docs/man/FS/Conf.html
 create mode 100644 htdocs/docs/man/FS/Invoice.html
 create mode 100644 htdocs/docs/man/FS/Record.html
 create mode 100644 htdocs/docs/man/FS/SSH.html
 create mode 100644 htdocs/docs/man/FS/UI/Base.html
 create mode 100644 htdocs/docs/man/FS/UI/CGI.html
 create mode 100644 htdocs/docs/man/FS/UI/Gtk.html
 create mode 100644 htdocs/docs/man/FS/UI/agent.html
 create mode 100644 htdocs/docs/man/FS/UID.html
 create mode 100644 htdocs/docs/man/FS/agent.html
 create mode 100644 htdocs/docs/man/FS/agent_type.html
 create mode 100644 htdocs/docs/man/FS/cust_bill.html
 create mode 100644 htdocs/docs/man/FS/cust_bill_pkg.html
 create mode 100644 htdocs/docs/man/FS/cust_credit.html
 create mode 100644 htdocs/docs/man/FS/cust_main.html
 create mode 100644 htdocs/docs/man/FS/cust_main_county.html
 create mode 100644 htdocs/docs/man/FS/cust_main_invoice.html
 create mode 100644 htdocs/docs/man/FS/cust_pay.html
 create mode 100644 htdocs/docs/man/FS/cust_pay_batch.html
 create mode 100644 htdocs/docs/man/FS/cust_pkg.html
 create mode 100644 htdocs/docs/man/FS/cust_refund.html
 create mode 100644 htdocs/docs/man/FS/cust_svc.html
 create mode 100644 htdocs/docs/man/FS/dbdef.html
 create mode 100644 htdocs/docs/man/FS/dbdef_colgroup.html
 create mode 100644 htdocs/docs/man/FS/dbdef_column.html
 create mode 100644 htdocs/docs/man/FS/dbdef_index.html
 create mode 100644 htdocs/docs/man/FS/dbdef_table.html
 create mode 100644 htdocs/docs/man/FS/dbdef_unique.html
 create mode 100644 htdocs/docs/man/FS/part_pkg.html
 create mode 100644 htdocs/docs/man/FS/part_referral.html
 create mode 100644 htdocs/docs/man/FS/part_svc.html
 create mode 100644 htdocs/docs/man/FS/pkg_svc.html
 create mode 100644 htdocs/docs/man/FS/svc_Common.html
 create mode 100644 htdocs/docs/man/FS/svc_acct.html
 create mode 100644 htdocs/docs/man/FS/svc_acct_pop.html
 create mode 100644 htdocs/docs/man/FS/svc_acct_sm.html
 create mode 100644 htdocs/docs/man/FS/svc_domain.html
 create mode 100644 htdocs/docs/man/FS/type_pkgs.html
 delete mode 100644 htdocs/docs/man/Invoice.txt
 delete mode 100644 htdocs/docs/man/Record.txt
 delete mode 100644 htdocs/docs/man/SSH.txt
 delete mode 100644 htdocs/docs/man/UID.txt
 delete mode 100644 htdocs/docs/man/agent.txt
 delete mode 100644 htdocs/docs/man/agent_type.txt
 delete mode 100644 htdocs/docs/man/cust_bill.txt
 delete mode 100644 htdocs/docs/man/cust_bill_pkg.txt
 delete mode 100644 htdocs/docs/man/cust_credit.txt
 delete mode 100644 htdocs/docs/man/cust_main.txt
 delete mode 100644 htdocs/docs/man/cust_main_county.txt
 delete mode 100644 htdocs/docs/man/cust_main_invoice.txt
 delete mode 100644 htdocs/docs/man/cust_pay.txt
 delete mode 100644 htdocs/docs/man/cust_pay_batch.txt
 delete mode 100644 htdocs/docs/man/cust_pkg.txt
 delete mode 100644 htdocs/docs/man/cust_refund.txt
 delete mode 100644 htdocs/docs/man/cust_svc.txt
 delete mode 100644 htdocs/docs/man/dbdef.txt
 delete mode 100644 htdocs/docs/man/dbdef_colgroup.txt
 delete mode 100644 htdocs/docs/man/dbdef_column.txt
 delete mode 100644 htdocs/docs/man/dbdef_index.txt
 delete mode 100644 htdocs/docs/man/dbdef_table.txt
 delete mode 100644 htdocs/docs/man/dbdef_unique.txt
 delete mode 100644 htdocs/docs/man/index.html
 delete mode 100644 htdocs/docs/man/part_pkg.txt
 delete mode 100644 htdocs/docs/man/part_referral.txt
 delete mode 100644 htdocs/docs/man/part_svc.txt
 delete mode 100644 htdocs/docs/man/pkg_svc.txt
 delete mode 100644 htdocs/docs/man/svc_Common.txt
 delete mode 100644 htdocs/docs/man/svc_acct.txt
 delete mode 100644 htdocs/docs/man/svc_acct_pop.txt
 delete mode 100644 htdocs/docs/man/svc_acct_sm.txt
 delete mode 100644 htdocs/docs/man/svc_domain.txt
 delete mode 100644 htdocs/docs/man/type_pkgs.txt

diff --git a/htdocs/docs/man/Bill.txt b/htdocs/docs/man/Bill.txt
deleted file mode 100644
index 545dd1a4c..000000000
--- a/htdocs/docs/man/Bill.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-NAME
-    FS::Bill - Legacy stub
-
-SYNOPSIS
-    The functionality of FS::Bill has been integrated into
-    FS::cust_main.
-
-HISTORY
-    ivan@voicenet.com 97-jul-24 - 25 - 28
-
-    use Safe; evaluate all fees with perl (still on TODO list until
-    I write some examples & test opmask to see if we can read db)
-    %hash=$obj->hash later ivan@sisd.com 98-mar-13
-
-    packages with no next bill date start at $time not time, this
-    should eliminate the last of the problems with billing at a past
-    date also rewrite the invoice priting logic not to print
-    invoices for things that haven't happended yet and update
-    $cust_bill->printed when we print so PAST DUE notices work, and
-    s/date/_date/ ivan@sisd.com 98-jun-4
-
-    more logic for past due stuff - packages with no next bill date
-    start at $cust_pkg->setup || $time ivan@sisd.com 98-jul-13
-
-    moved a few things in collection logic; negative charges should
-    work ivan@sisd.com 98-aug-6
-
-    pod, moved everything to FS::cust_main ivan@sisd.com 98-sep-19
-
diff --git a/htdocs/docs/man/CGI.txt b/htdocs/docs/man/CGI.txt
deleted file mode 100644
index c8eb4ff23..000000000
--- a/htdocs/docs/man/CGI.txt
+++ /dev/null
@@ -1,98 +0,0 @@
-NAME
-    FS::CGI - Subroutines for the web interface
-
-SYNOPSIS
-      use FS::CGI qw(header menubar idiot eidiot popurl);
-
-      print header( 'Title', '' );
-      print header( 'Title', menubar('item', 'URL', ... ) );
-
-      idiot "error message"; 
-      eidiot "error message";
-
-      $url = popurl; #returns current url
-      $url = popurl(3); #three levels up
-
-DESCRIPTION
-    Provides a few common subroutines for the web interface.
-
-SUBROUTINES
-    header TITLE, MENUBAR
-        Returns an HTML header.
-
-    menubar ITEM, URL, ...
-        Returns an HTML menubar.
-
-    idiot ERROR
-        This is depriciated. Don't use it.
-
-        Sends headers and an HTML error message.
-
-    eidiot ERROR
-        This is depriciated. Don't use it.
-
-        Sends headers and an HTML error message, then exits.
-
-    popurl LEVEL
-        Returns current URL with LEVEL levels of path removed from
-        the end (default 0).
-
-    table
-        Returns HTML tag for beginning a table.
-
-    itable
-        Returns HTML tag for beginning an (invisible) table.
-
-    ntable
-        This is getting silly.
-
-BUGS
-    Not OO.
-
-    Not complete.
-
-SEE ALSO
-    the CGI manpage, the CGI::Base manpage
-
-HISTORY
-    subroutines for the HTML/CGI GUI, not properly OO. :(
-
-    ivan@sisd.com 98-apr-16 ivan@sisd.com 98-jun-22
-
-    lose the background, eidiot ivan@sisd.com 98-sep-2
-
-    pod ivan@sisd.com 98-sep-12
-
-    $Log: CGI.txt,v $
-    Revision 1.4  1999-04-08 13:39:31  ivan
-    convert from pod for 1.2.0 release
- Revision 1.17 1999/02/07 09:59:43 ivan more
-    mod_perl fixes, and bugfixes Peter Wemm sent via email
-
-    Revision 1.16 1999/01/25 12:26:05 ivan yet more mod_perl stuff
-
-    Revision 1.15 1999/01/18 09:41:48 ivan all $cgi->header calls
-    now include ( '-expires' => 'now' ) for mod_perl (good idea
-    anyway)
-
-    Revision 1.14 1999/01/18 09:22:37 ivan changes to track email
-    addresses for email invoicing
-
-    Revision 1.12 1998/12/23 02:23:16 ivan popurl always has
-    trailing slash
-
-    Revision 1.11 1998/11/12 07:43:54 ivan *** empty log message ***
-
-    Revision 1.10 1998/11/12 01:53:47 ivan added table command
-
-    Revision 1.9 1998/11/09 08:51:49 ivan bug squash
-
-    Revision 1.7 1998/11/09 06:10:59 ivan added sub url
-
-    Revision 1.6 1998/11/09 05:44:20 ivan *** empty log message ***
-
-    Revision 1.4 1998/11/09 04:55:42 ivan support depriciated
-    CGI::Base as well as CGI.pm (for now)
-
-    Revision 1.3 1998/11/08 10:50:19 ivan s/CGI::Base/CGI/; etc.
-
diff --git a/htdocs/docs/man/Conf.txt b/htdocs/docs/man/Conf.txt
deleted file mode 100644
index 01b7cf5e6..000000000
--- a/htdocs/docs/man/Conf.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-NAME
-    FS::Conf - Read access to Freeside configuration values
-
-SYNOPSIS
-      use FS::Conf;
-
-      $conf = new FS::Conf "/config/directory";
-
-      $FS::Conf::default_dir = "/config/directory";
-      $conf = new FS::Conf;
-
-      $dir = $conf->dir;
-
-      $value = $conf->config('key');
-      @list  = $conf->config('key');
-      $bool  = $conf->exists('key');
-
-DESCRIPTION
-    Read access to Freeside configuration values. Keys currently map
-    to filenames, but this may change in the future.
-
-METHODS
-    new [ DIRECTORY ]
-        Create a new configuration object. A directory arguement is
-        required if $FS::Conf::default_dir has not been set.
-
-    dir Returns the directory.
-
-    config
-        Returns the configuration value or values (depending on
-        context) for key.
-
-    exists
-        Returns true if the specified key exists, even if the
-        corresponding value is undefined.
-
-BUGS
-    Write access (with locking) should be implemented.
-
-SEE ALSO
-    config.html from the base documentation contains a list of
-    configuration files.
-
-HISTORY
-    Ivan Kohler <ivan@sisd.com> 98-sep-6
-
-    sub exists forgot to fetch $dir ivan@sisd.com 98-sep-27
-
-    $Log: Conf.txt,v $
-    Revision 1.5  1999-04-08 13:39:31  ivan
-    convert from pod for 1.2.0 release
- Revision 1.3 1999/03/29 01:29:33 ivan die
-    unless the configuration directory exists
-
-    Revision 1.2 1998/11/13 04:08:44 ivan no default default_dir
-    (ironic)
-
diff --git a/htdocs/docs/man/FS.html b/htdocs/docs/man/FS.html
new file mode 100644
index 000000000..b2f0dd3a2
--- /dev/null
+++ b/htdocs/docs/man/FS.html
@@ -0,0 +1,247 @@
+<HTML>
+<HEAD>
+<TITLE>FS - Freeside Perl modules</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<UL>
+
+		<LI><A HREF="#Database_metadata_classes">Database metadata classes</A>
+		<LI><A HREF="#Utility_classes">Utility classes</A>
+		<LI><A HREF="#Database_record_classes">Database record classes</A>
+		<LI><A HREF="#User_Interface_classes_under_de">User Interface classes (under development; not yet usable)</A>
+		<LI><A HREF="#Notes">Notes</A>
+	</UL>
+
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#SUPPORT">SUPPORT</A>
+	<LI><A HREF="#AUTHOR">AUTHOR</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS - Freeside Perl modules
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+FS is the temporary prefix for many disparate modules written for the
+Freeside ISP billing software. This includes:
+
+<P>
+<HR>
+<H2><A NAME="Database_metadata_classes">Database metadata classes</A></H2>
+<P>
+<A HREF="./FS/dbdef.html">FS::dbdef</A> - Database class
+
+<P>
+<A HREF="./FS/dbdef_table.html">FS::dbdef_table</A> - Database table class
+
+<P>
+<A HREF="./FS/dbdef_column.html">FS::dbdef_column</A> - Database column class
+
+<P>
+<A HREF="./FS/dbdef_colgroup.html">FS::dbdef_colgroup</A> - Database column group class
+
+<P>
+<A HREF="./FS/dbdef_index.html">FS::dbdef_index</A> - Database index class
+
+<P>
+<A HREF="./FS/dbdef_unique.html">FS::dbdef_unique</A> - Database unique index class
+
+<P>
+<HR>
+<H2><A NAME="Utility_classes">Utility classes</A></H2>
+<P>
+<A HREF="./FS/SSH.html">FS::SSH</A> - Simple wrappers around ssh and scp commands.
+
+<P>
+<A HREF="./FS/Conf.html">FS::Conf</A> - Freeside configuration values
+
+<P>
+<A HREF="./FS/UID.html">FS::UID</A> - User class (not yet OO)
+
+<P>
+<A HREF="./FS/CGI.html">FS::CGI</A> - Non OO-subroutines for the web interface. This is depriciated. Future
+development will be focused on the FS::UI user-interface classes (see
+below).
+
+<P>
+<HR>
+<H2><A NAME="Database_record_classes">Database record classes</A></H2>
+<P>
+<A HREF="./FS/Record.html">FS::Record</A> - Database record base class
+
+<P>
+<A HREF="./FS/svc_acct_pop.html">FS::svc_acct_pop</A> - POP (Point of Presence, not Post Office Protocol) class
+
+<P>
+<A HREF="./FS/part_referral.html">FS::part_referral</A> - Referral class
+
+<P>
+<A HREF="./FS/cust_main_county.html">FS::cust_main_county</A> - Locale (tax rate) class
+
+<P>
+<A HREF="./FS/svc_Common.html">FS::svc_Common</A> - Service base class
+
+<P>
+<A HREF="./FS/svc_acct.html">FS::svc_acct</A> - Account (shell, RADIUS, POP3) class
+
+<P>
+<A HREF="./FS/svc_domain.html">FS::svc_domain</A> - Domain class
+
+<P>
+<A HREF="./FS/svc_acct_sm.html">FS::svc_acct_sm</A> - Vitual mail alias class
+
+<P>
+<A HREF="./FS/part_svc.html">FS::part_svc</A> - Service definition class
+
+<P>
+<A HREF="./FS/part_pkg.html">FS::part_pkg</A> - Package (billing item) definition class
+
+<P>
+<A HREF="./FS/pkg_svc.html">FS::pkg_svc</A> - Class linking package (billing item) definitions (see <A HREF="./FS/part_pkg.html">FS::part_pkg</A>) with service definitions (see <A HREF="./FS/part_svc.html">FS::part_svc</A>)
+
+<P>
+<A HREF="./FS/agent.html">FS::agent</A> - Agent (reseller) class
+
+<P>
+<A HREF="./FS/agent_type.html">FS::agent_type</A> - Agent type class
+
+<P>
+<A HREF="./FS/type_pkgs.html">FS::type_pkgs</A> - Class linking agent types (see
+<A HREF="./FS/agent_type.html">FS::agent_type</A>) with package (billing item) definitions (see <A HREF="./FS/part_pkg.html">FS::part_pkg</A>)
+
+<P>
+<A HREF="./FS/cust_svc.html">FS::cust_svc</A> - Service class
+
+<P>
+<A HREF="./FS/cust_pkg.html">FS::cust_pkg</A> - Package (billing item) class
+
+<P>
+<A HREF="./FS/cust_main.html">FS::cust_main</A> - Customer class
+
+<P>
+<A HREF="./FS/cust_main_invoice.html">FS::cust_main_invoice</A> - Invoice destination class
+
+<P>
+<A HREF="./FS/cust_bill.html">FS::cust_bill</A> - Invoice class
+
+<P>
+<A HREF="./FS/cust_bill_pkg.html">FS::cust_bill_pkg</A> - Invoice line item class
+
+<P>
+<A HREF="./FS/cust_pay.html">FS::cust_pay</A> - Payment class
+
+<P>
+<A HREF="./FS/cust_credit.html">FS::cust_credit</A> - Credit class
+
+<P>
+<A HREF="./FS/cust_refund.html">FS::cust_refund</A> - Refund class
+
+<P>
+<A HREF="./FS/cust_pay_batch.html">FS::cust_pay_batch</A> - Credit card transaction queue class
+
+<P>
+<HR>
+<H2><A NAME="User_Interface_classes_under_de">User Interface classes (under development; not yet usable)</A></H2>
+<P>
+<A HREF="./FS/UI/Base.html">FS::UI::Base</A> - User-interface base class
+
+<P>
+<A HREF="./FS/UI/Gtk.html">FS::UI::Gtk</A> - Gtk user-interface class
+
+<P>
+<A HREF="./FS/UI/CGI.html">FS::UI::CGI</A> - CGI (HTML) user-interface class
+
+<P>
+<A HREF="./FS/UI/agent.html">FS::UI::agent</A> - agent table user-interface class
+
+<P>
+<HR>
+<H2><A NAME="Notes">Notes</A></H2>
+<P>
+To quote <CODE>perl(1),</CODE> ``If you're intending to read these straight
+through for the first time, the suggested order will tend to reduce the
+number of forward references.''
+
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+Freeside is a billing and administration package for Internet Service
+Providers.
+
+<P>
+The Freeside home page is at &lt;http://www.sisd.com/freeside&gt;.
+
+<P>
+The main documentation is in htdocs/docs.
+
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: FS.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="SUPPORT">SUPPORT</A></H1>
+<P>
+A mailing list for users and developers is available. Send a blank message
+to &lt;<A
+HREF="mailto:ivan-freeside-subscribe@sisd.com">ivan-freeside-subscribe@sisd.com</A>&gt;
+to subscribe.
+
+<P>
+Commercial support is available; see
+&lt;http://www.sisd.com/freeside/commercial.html&gt;.
+
+<P>
+<HR>
+<H1><A NAME="AUTHOR">AUTHOR</A></H1>
+<P>
+Primarily Ivan Kohler &lt;<A
+HREF="mailto:ivan@sisd.com">ivan@sisd.com</A>&gt;, with help from many kind
+folks.
+
+<P>
+See the CREDITS file in the Freeside distribution for a (hopefully)
+complete list and the individal files for details.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<CODE>perl(1),</CODE> main Freeside documentation in htdocs/docs/
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+The version number of the FS Perl extension differs from the version of the
+Freeside distribution, which are both different from the CVS version tag
+for each file, which appears under the VERSION heading.
+
+<P>
+Those modules which would be useful separately should be pulled out,
+renamed appropriately and uploaded to CPAN.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/Bill.html b/htdocs/docs/man/FS/Bill.html
new file mode 100644
index 000000000..e5832f8d9
--- /dev/null
+++ b/htdocs/docs/man/FS/Bill.html
@@ -0,0 +1,32 @@
+<HTML>
+<HEAD>
+<TITLE>FS::Bill - Legacy stub</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::Bill - Legacy stub
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+The functionality of FS::Bill has been integrated into FS::cust_main.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/CGI.html b/htdocs/docs/man/FS/CGI.html
new file mode 100644
index 000000000..e1a42ec59
--- /dev/null
+++ b/htdocs/docs/man/FS/CGI.html
@@ -0,0 +1,115 @@
+<HTML>
+<HEAD>
+<TITLE>FS::CGI - Subroutines for the web interface</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#SUBROUTINES">SUBROUTINES</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::CGI - Subroutines for the web interface
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::CGI qw(header menubar idiot eidiot popurl);
+</PRE>
+<P>
+<PRE>  print header( 'Title', '' );
+  print header( 'Title', menubar('item', 'URL', ... ) );
+</PRE>
+<P>
+<PRE>  idiot &quot;error message&quot;; 
+  eidiot &quot;error message&quot;;
+</PRE>
+<P>
+<PRE>  $url = popurl; #returns current url
+  $url = popurl(3); #three levels up
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+Provides a few common subroutines for the web interface.
+
+<P>
+<HR>
+<H1><A NAME="SUBROUTINES">SUBROUTINES</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_header">header TITLE, MENUBAR</A></STRONG><DD>
+<P>
+Returns an HTML header.
+
+<DT><STRONG><A NAME="item_menubar">menubar ITEM, URL, ...</A></STRONG><DD>
+<P>
+Returns an HTML menubar.
+
+<DT><STRONG><A NAME="item_idiot">idiot ERROR</A></STRONG><DD>
+<P>
+This is depriciated. Don't use it.
+
+<P>
+Sends headers and an HTML error message.
+
+<DT><STRONG><A NAME="item_eidiot">eidiot ERROR</A></STRONG><DD>
+<P>
+This is depriciated. Don't use it.
+
+<P>
+Sends headers and an HTML error message, then exits.
+
+<DT><STRONG><A NAME="item_popurl">popurl LEVEL</A></STRONG><DD>
+<P>
+Returns current URL with LEVEL levels of path removed from the end (default
+0).
+
+<DT><STRONG><A NAME="item_table">table</A></STRONG><DD>
+<P>
+Returns HTML tag for beginning a table.
+
+<DT><STRONG><A NAME="item_itable">itable</A></STRONG><DD>
+<P>
+Returns HTML tag for beginning an (invisible) table.
+
+<DT><STRONG><A NAME="item_ntable">ntable</A></STRONG><DD>
+<P>
+This is getting silly.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+Not OO.
+
+<P>
+Not complete.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF=".././FS/CGI.html#">the CGI manpage</A>, <A HREF="../CGI/Base.html">CGI::Base</A>
+
+
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/Conf.html b/htdocs/docs/man/FS/Conf.html
new file mode 100644
index 000000000..e4555c3a9
--- /dev/null
+++ b/htdocs/docs/man/FS/Conf.html
@@ -0,0 +1,94 @@
+<HTML>
+<HEAD>
+<TITLE>FS::Conf - Read access to Freeside configuration values</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::Conf - Read access to Freeside configuration values
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::Conf;
+</PRE>
+<P>
+<PRE>  $conf = new FS::Conf &quot;/config/directory&quot;;
+</PRE>
+<P>
+<PRE>  $FS::Conf::default_dir = &quot;/config/directory&quot;;
+  $conf = new FS::Conf;
+</PRE>
+<P>
+<PRE>  $dir = $conf-&gt;dir;
+</PRE>
+<P>
+<PRE>  $value = $conf-&gt;config('key');
+  @list  = $conf-&gt;config('key');
+  $bool  = $conf-&gt;exists('key');
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+Read access to Freeside configuration values. Keys currently map to
+filenames, but this may change in the future.
+
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new [ DIRECTORY ]</A></STRONG><DD>
+<P>
+Create a new configuration object. A directory arguement is required if
+$FS::Conf::default_dir has not been set.
+
+<DT><STRONG><A NAME="item_dir">dir</A></STRONG><DD>
+<P>
+Returns the directory.
+
+<DT><STRONG><A NAME="item_config">config</A></STRONG><DD>
+<P>
+Returns the configuration value or values (depending on context) for key.
+
+<DT><STRONG><A NAME="item_exists">exists</A></STRONG><DD>
+<P>
+Returns true if the specified key exists, even if the corresponding value
+is undefined.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+Write access (with locking) should be implemented.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+config.html from the base documentation contains a list of configuration
+files.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/Invoice.html b/htdocs/docs/man/FS/Invoice.html
new file mode 100644
index 000000000..283e89a35
--- /dev/null
+++ b/htdocs/docs/man/FS/Invoice.html
@@ -0,0 +1,32 @@
+<HTML>
+<HEAD>
+<TITLE>FS::Invoice - Legacy stub</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::Invoice - Legacy stub
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+The functionality of FS::Invoice has been integrated in FS::cust_bill.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/Record.html b/htdocs/docs/man/FS/Record.html
new file mode 100644
index 000000000..da1fc5287
--- /dev/null
+++ b/htdocs/docs/man/FS/Record.html
@@ -0,0 +1,380 @@
+<HTML>
+<HEAD>
+<TITLE>FS::Record - Database record objects</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#CONSTRUCTORS">CONSTRUCTORS</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#SUBROUTINES">SUBROUTINES</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::Record - Database record objects
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>    use FS::Record;
+    use FS::Record qw(dbh fields qsearch qsearchs dbdef);
+</PRE>
+<P>
+<PRE>    $record = new FS::Record 'table', \%hash;
+    $record = new FS::Record 'table', { 'column' =&gt; 'value', ... };
+</PRE>
+<P>
+<PRE>    $record  = qsearchs FS::Record 'table', \%hash;
+    $record  = qsearchs FS::Record 'table', { 'column' =&gt; 'value', ... };
+    @records = qsearch  FS::Record 'table', \%hash; 
+    @records = qsearch  FS::Record 'table', { 'column' =&gt; 'value', ... };
+</PRE>
+<P>
+<PRE>    $table = $record-&gt;table;
+    $dbdef_table = $record-&gt;dbdef_table;
+</PRE>
+<P>
+<PRE>    $value = $record-&gt;get('column');
+    $value = $record-&gt;getfield('column');
+    $value = $record-&gt;column;
+</PRE>
+<P>
+<PRE>    $record-&gt;set( 'column' =&gt; 'value' );
+    $record-&gt;setfield( 'column' =&gt; 'value' );
+    $record-&gt;column('value');
+</PRE>
+<P>
+<PRE>    %hash = $record-&gt;hash;
+</PRE>
+<P>
+<PRE>    $hashref = $record-&gt;hashref;
+</PRE>
+<P>
+<PRE>    $error = $record-&gt;insert;
+    #$error = $record-&gt;add; #depriciated
+</PRE>
+<P>
+<PRE>    $error = $record-&gt;delete;
+    #$error = $record-&gt;del; #depriciated
+</PRE>
+<P>
+<PRE>    $error = $new_record-&gt;replace($old_record);
+    #$error = $new_record-&gt;rep($old_record); #depriciated
+</PRE>
+<P>
+<PRE>    $value = $record-&gt;unique('column');
+</PRE>
+<P>
+<PRE>    $value = $record-&gt;ut_float('column');
+    $value = $record-&gt;ut_number('column');
+    $value = $record-&gt;ut_numbern('column');
+    $value = $record-&gt;ut_money('column');
+    $value = $record-&gt;ut_text('column');
+    $value = $record-&gt;ut_textn('column');
+    $value = $record-&gt;ut_alpha('column');
+    $value = $record-&gt;ut_alphan('column');
+    $value = $record-&gt;ut_phonen('column');
+    $value = $record-&gt;ut_anythingn('column');
+</PRE>
+<P>
+<PRE>    $dbdef = reload_dbdef;
+    $dbdef = reload_dbdef &quot;/non/standard/filename&quot;;
+    $dbdef = dbdef;
+</PRE>
+<P>
+<PRE>    $quoted_value = _quote($value,'table','field');
+</PRE>
+<P>
+<PRE>    #depriciated
+    $fields = hfields('table');
+    if ( $fields-&gt;{Field} ) { # etc.
+</PRE>
+<P>
+<PRE>    @fields = fields 'table'; #as a subroutine
+    @fields = $record-&gt;fields; #as a method call
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+(Mostly) object-oriented interface to database records. Records are
+currently implemented on top of DBI. FS::Record is intended as a base class
+for table-specific classes to inherit from, i.e. FS::cust_main.
+
+<P>
+<HR>
+<H1><A NAME="CONSTRUCTORS">CONSTRUCTORS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new [ TABLE, ] HASHREF</A></STRONG><DD>
+<P>
+Creates a new record. It doesn't store it in the database, though. See
+<A HREF="#insert">insert</A> for that.
+
+<P>
+Note that the object stores this hash reference, not a distinct copy of the
+hash it points to. You can ask the object for a copy with the <EM>hash</EM> 
+method.
+
+<P>
+TABLE can only be omitted when a dervived class overrides the table method.
+
+<DT><STRONG><A NAME="item_qsearch">qsearch TABLE, HASHREF</A></STRONG><DD>
+<P>
+Searches the database for all records matching (at least) the key/value
+pairs in HASHREF. Returns all the records found as `FS::TABLE' objects if
+that module is loaded (i.e. via `use FS::cust_main;'), otherwise returns
+FS::Record objects.
+
+<DT><STRONG><A NAME="item_qsearchs">qsearchs TABLE, HASHREF</A></STRONG><DD>
+<P>
+Same as qsearch, except that if more than one record matches, it <STRONG>carp</STRONG>s but returns the first. If this happens, you either made a logic error in
+asking for a single item, or your data is corrupted.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_table">table</A></STRONG><DD>
+<P>
+Returns the table name.
+
+<DT><STRONG><A NAME="item_dbdef_table">dbdef_table</A></STRONG><DD>
+<P>
+Returns the FS::dbdef_table object for the table.
+
+<DT><STRONG><A NAME="item_get">get, getfield COLUMN</A></STRONG><DD>
+<P>
+Returns the value of the column/field/key COLUMN.
+
+<DT><STRONG><A NAME="item_set">set, setfield COLUMN, VALUE</A></STRONG><DD>
+<P>
+Sets the value of the column/field/key COLUMN to VALUE. Returns VALUE.
+
+<DT><STRONG><A NAME="item_AUTLOADED">AUTLOADED METHODS</A></STRONG><DD>
+<P>
+$record-&gt;column is a synonym for $record-&gt;get('column');
+
+<P>
+$record-&gt;column('value') is a synonym for
+$record-&gt;set('column','value');
+
+<DT><STRONG><A NAME="item_hash">hash</A></STRONG><DD>
+<P>
+Returns a list of the column/value pairs, usually for assigning to a new
+hash.
+
+<P>
+To make a distinct duplicate of an FS::Record object, you can do:
+
+<P>
+<PRE>    $new = new FS::Record ( $old-&gt;table, { $old-&gt;hash } );
+</PRE>
+<DT><STRONG><A NAME="item_hashref">hashref</A></STRONG><DD>
+<P>
+Returns a reference to the column/value hash.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Inserts this record to the database. If there is an error, returns the
+error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_add">add</A></STRONG><DD>
+<P>
+Depriciated (use insert instead).
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Delete this record from the database. If there is an error, returns the
+error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_del">del</A></STRONG><DD>
+<P>
+Depriciated (use delete instead).
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replace the OLD_RECORD with this one in the database. If there is an error,
+returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_rep">rep</A></STRONG><DD>
+<P>
+Depriciated (use replace instead).
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Not yet implemented, croaks. Derived classes should provide a check method.
+
+<DT><STRONG><A NAME="item_unique">unique COLUMN</A></STRONG><DD>
+<P>
+Replaces COLUMN in record with a unique number. Called by the <STRONG>add</STRONG> method on primary keys and single-field unique columns (see <A HREF="../FS/dbdef_table.html">FS::dbdef_table</A>). Returns the new value.
+
+<DT><STRONG><A NAME="item_ut_float">ut_float COLUMN</A></STRONG><DD>
+<P>
+Check/untaint floating point numeric data: 1.1, 1, 1.1e10, 1e10. May not be
+null. If there is an error, returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_ut_number">ut_number COLUMN</A></STRONG><DD>
+<P>
+Check/untaint simple numeric data (whole numbers). May not be null. If
+there is an error, returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_ut_numbern">ut_numbern COLUMN</A></STRONG><DD>
+<P>
+Check/untaint simple numeric data (whole numbers). May be null. If there is
+an error, returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_ut_money">ut_money COLUMN</A></STRONG><DD>
+<P>
+Check/untaint monetary numbers. May be negative. Set to 0 if null. If there
+is an error, returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_ut_text">ut_text COLUMN</A></STRONG><DD>
+<P>
+Check/untaint text. Alphanumerics, spaces, and the following punctuation
+symbols are currently permitted: ! @ # $ % &amp; ( ) - + ; : ' `` , . ? /
+May not be null. If there is an error, returns the error, otherwise returns
+false.
+
+<DT><STRONG><A NAME="item_ut_textn">ut_textn COLUMN</A></STRONG><DD>
+<P>
+Check/untaint text. Alphanumerics, spaces, and the following punctuation
+symbols are currently permitted: ! @ # $ % &amp; ( ) - + ; : ' `` , . ? /
+May be null. If there is an error, returns the error, otherwise returns
+false.
+
+<DT><STRONG><A NAME="item_ut_alpha">ut_alpha COLUMN</A></STRONG><DD>
+<P>
+Check/untaint alphanumeric strings (no spaces). May not be null. If there
+is an error, returns the error, otherwise returns false.
+
+<DT><STRONG>ut_alpha COLUMN</STRONG><DD>
+<P>
+Check/untaint alphanumeric strings (no spaces). May be null. If there is an
+error, returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_ut_phonen">ut_phonen COLUMN</A></STRONG><DD>
+<P>
+Check/untaint phone numbers. May be null. If there is an error, returns the
+error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_ut_anything">ut_anything COLUMN</A></STRONG><DD>
+<P>
+Untaints arbitrary data. Be careful.
+
+<DT><STRONG><A NAME="item_fields">fields [ TABLE ]</A></STRONG><DD>
+<P>
+This can be used as both a subroutine and a method call. It returns a list
+of the columns in this record's table, or an explicitly specified table.
+(See <A HREF="../FS/dbdef_table.html">FS::dbdef_table</A>).
+
+<H1><A NAME="SUBROUTINES">SUBROUTINES</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_reload_dbdef">reload_dbdef([FILENAME])</A></STRONG><DD>
+<P>
+Load a database definition (see <A HREF="../FS/dbdef.html">FS::dbdef</A>), optionally from a non-default filename. This command is executed at
+startup unless
+<EM>$FS::Record::setup_hack</EM> is true. Returns a FS::dbdef object.
+
+<DT><STRONG><A NAME="item_dbdef">dbdef</A></STRONG><DD>
+<P>
+Returns the current database definition. See <A HREF="../FS/dbdef.html">FS::dbdef</A>.
+
+<DT><STRONG><A NAME="item__quote">_quote VALUE, TABLE, COLUMN</A></STRONG><DD>
+<P>
+This is an internal function used to construct SQL statements. It returns
+VALUE DBI-quoted (see <EM>DBI</EM>) unless VALUE is a number and the column type (see <A HREF="../FS/dbdef_column.html">FS::dbdef_column</A>) does not end in `char' or `binary'.
+
+<DT><STRONG><A NAME="item_hfields">hfields TABLE</A></STRONG><DD>
+<P>
+This is depriciated. Don't use it.
+
+<P>
+It returns a hash-type list with the fields of this record's table set
+true.
+
+</DL>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: Record.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+This module should probably be renamed, since much of the functionality is
+of general use. It is not completely unlike Adapter::DBI (see below).
+
+<P>
+Exported qsearch and qsearchs should be depriciated in favor of method
+calls (against an FS::Record object like the old search and searchs that
+qsearch and qsearchs were on top of.)
+
+<P>
+The whole fields / hfields mess should be removed.
+
+<P>
+The various WHERE clauses should be subroutined.
+
+<P>
+table string should be depriciated in favor of FS::dbdef_table.
+
+<P>
+No doubt we could benefit from a Tied hash. Documenting how exists /
+defined true maps to the database (and WHERE clauses) would also help.
+
+<P>
+The ut_ methods should ask the dbdef for a default length.
+
+<P>
+ut_sqltype (like ut_varchar) should all be defined
+
+<P>
+A fallback check method should be provided whith uses the dbdef.
+
+<P>
+The ut_money method assumes money has two decimal digits.
+
+<P>
+The Pg money kludge in the new method only strips `$'.
+
+<P>
+The ut_phonen method assumes US-style phone numbers.
+
+<P>
+The _quote function should probably use ut_float instead of a regex.
+
+<P>
+All the subroutines probably should be methods, here or elsewhere.
+
+<P>
+Probably should borrow/use some dbdef methods where appropriate (like sub
+fields)
+
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/dbdef.html">FS::dbdef</A>, <A HREF="../FS/UID.html">FS::UID</A>, <EM>DBI</EM>
+
+
+
+<P>
+Adapter::DBI from Ch. 11 of Advanced Perl Programming by Sriram Srinivasan.
+
+</DL>
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/SSH.html b/htdocs/docs/man/FS/SSH.html
new file mode 100644
index 000000000..aa8929b09
--- /dev/null
+++ b/htdocs/docs/man/FS/SSH.html
@@ -0,0 +1,104 @@
+<HTML>
+<HEAD>
+<TITLE>FS::SSH - Subroutines to call ssh and scp</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#SUBROUTINES">SUBROUTINES</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::SSH - Subroutines to call ssh and scp
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::SSH qw(ssh scp issh iscp sshopen2 sshopen3);
+</PRE>
+<P>
+<PRE>  ssh($host, $command);
+</PRE>
+<P>
+<PRE>  issh($host, $command);
+</PRE>
+<P>
+<PRE>  scp($source, $destination);
+</PRE>
+<P>
+<PRE>  iscp($source, $destination);
+</PRE>
+<P>
+<PRE>  sshopen2($host, $reader, $writer, $command);
+</PRE>
+<P>
+<PRE>  sshopen3($host, $reader, $writer, $error, $command);
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+<PRE>  Simple wrappers around ssh and scp commands.
+</PRE>
+<P>
+<HR>
+<H1><A NAME="SUBROUTINES">SUBROUTINES</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_ssh">ssh HOST, COMMAND</A></STRONG><DD>
+<P>
+Calls ssh in batch mode.
+
+<DT><STRONG><A NAME="item_issh">issh HOST, COMMAND</A></STRONG><DD>
+<P>
+Prints the ssh command to be executed, waits for the user to confirm, and
+(optionally) executes the command.
+
+<DT><STRONG><A NAME="item_scp">scp SOURCE, DESTINATION</A></STRONG><DD>
+<P>
+Calls scp in batch mode.
+
+<DT><STRONG><A NAME="item_iscp">iscp SOURCE, DESTINATION</A></STRONG><DD>
+<P>
+Prints the scp command to be executed, waits for the user to confirm, and
+(optionally) executes the command.
+
+<DT><STRONG><A NAME="item_sshopen2">sshopen2 HOST, READER, WRITER, COMMAND</A></STRONG><DD>
+<P>
+Connects the supplied filehandles to the ssh process (in batch mode).
+
+<DT><STRONG><A NAME="item_sshopen3">sshopen3 HOST, WRITER, READER, ERROR, COMMAND</A></STRONG><DD>
+<P>
+Connects the supplied filehandles to the ssh process (in batch mode).
+
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+Not OO.
+
+<P>
+scp stuff should transparantly use rsync-over-ssh instead.
+
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<EM>ssh</EM>, <EM>scp</EM>, <A HREF="../IPC/Open2.html">IPC::Open2</A>, <A HREF="../IPC/Open3.html">IPC::Open3</A>
+
+
+
+</DL>
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/UI/Base.html b/htdocs/docs/man/FS/UI/Base.html
new file mode 100644
index 000000000..91a4df64d
--- /dev/null
+++ b/htdocs/docs/man/FS/UI/Base.html
@@ -0,0 +1,117 @@
+<HTML>
+<HEAD>
+<TITLE>FS::UI::Base - Base class for all user-interface objects</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#HISTORY">HISTORY</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::UI::Base - Base class for all user-interface objects
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::UI::SomeInterface;
+  use FS::UI::some_table;
+</PRE>
+<P>
+<PRE>  $interface = new FS::UI::some_table;
+</PRE>
+<P>
+<PRE>  $error = $interface-&gt;browse;
+  $error = $interface-&gt;search;
+  $error = $interface-&gt;view;
+  $error = $interface-&gt;edit;
+  $error = $interface-&gt;process;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::UI::Base object represents a user interface object. FS::UI::Base is
+intended as a base class for table-specfic classes to inherit from, i.e.
+FS::UI::cust_main. The simplest case, which will provide a default UI for
+your new table, is as follows:
+
+<P>
+<PRE>  package FS::UI::table_name;
+  use vars qw ( @ISA );
+  use FS::UI::Base;
+  @ISA = qw( FS::UI::Base );
+  sub db_table { 'table_name'; }
+</PRE>
+<P>
+Currently available interfaces are: FS::UI::Gtk, an X-Windows UI
+implemented using the Gtk+ toolkit FS::UI::CGI, a web interface implemented
+using CGI.pm, etc.
+
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new</A></STRONG><DD>
+<DT><STRONG><A NAME="item_browse">browse</A></STRONG><DD>
+<DT><STRONG><A NAME="item_title">title</A></STRONG><DD>
+<DT><STRONG><A NAME="item_addwidget">addwidget</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: Base.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+This documentation is incomplete.
+
+<P>
+There should be some sort of per-(freeside)-user preferences and the
+ability for specific FS::UI:: modules to put their own values there as
+well.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../../FS/UI/Gtk.html">FS::UI::Gtk</A>, <A HREF="../../FS/UI/CGI.html">FS::UI::CGI</A>
+
+
+
+<P>
+<HR>
+<H1><A NAME="HISTORY">HISTORY</A></H1>
+<P>
+$Log: Base.html,v $
+Revision 1.1  1999-08-04 12:13:27  ivan
+new HTML manpages
+ Revision 1.1 1999/08/04 09:03:53 ivan initial checkin of
+module files for proper perl installation
+
+<P>
+Revision 1.1 1999/01/20 09:30:36 ivan skeletal cross-UI UI code.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/UI/CGI.html b/htdocs/docs/man/FS/UI/CGI.html
new file mode 100644
index 000000000..c3efdc746
--- /dev/null
+++ b/htdocs/docs/man/FS/UI/CGI.html
@@ -0,0 +1,115 @@
+<HTML>
+<HEAD>
+<TITLE>FS::UI::CGI - Base class for CGI user-interface objects</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#HISTORY">HISTORY</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::UI::CGI - Base class for CGI user-interface objects
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::UI::CGI;
+  use FS::UI::some_table;
+</PRE>
+<P>
+<PRE>  $interface = new FS::UI::some_table;
+</PRE>
+<P>
+<PRE>  $error = $interface-&gt;browse;
+  $error = $interface-&gt;search;
+  $error = $interface-&gt;view;
+  $error = $interface-&gt;edit;
+  $error = $interface-&gt;process;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::UI::CGI object represents a CGI interface object.
+
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new</A></STRONG><DD>
+<DT><STRONG><A NAME="item__header">_header</A></STRONG><DD>
+<DT><STRONG><A NAME="item__footer">_footer</A></STRONG><DD>
+<DT><STRONG><A NAME="item_interface">interface</A></STRONG><DD>
+<P>
+Returns the string `CGI'. Useful for the author of a table-specific UI
+class to conditionally specify certain behaviour.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: CGI.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+This documentation is incomplete.
+
+<P>
+In _Tableborder, headers should be links that sort on their fields.
+
+<P>
+_Link uses a constant <CODE>$BASE_URL</CODE>
+
+<P>
+_Link passes the arguments as a manually-constructed GET string instead of
+POSTing, for compatability while the web interface is upgraded. Once this
+is done it should pass arguements properly (i.e. as a POST, 8-bit clean)
+
+<P>
+Still some small bits of widget code same as FS::UI::Gtk.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../../FS/UI/Base.html">FS::UI::Base</A>
+
+
+
+<P>
+<HR>
+<H1><A NAME="HISTORY">HISTORY</A></H1>
+<P>
+$Log: CGI.html,v $
+Revision 1.1  1999-08-04 12:13:27  ivan
+new HTML manpages
+ Revision 1.1 1999/08/04 09:03:53 ivan initial checkin of
+module files for proper perl installation
+
+<P>
+Revision 1.1 1999/01/20 09:30:36 ivan skeletal cross-UI UI code.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/UI/Gtk.html b/htdocs/docs/man/FS/UI/Gtk.html
new file mode 100644
index 000000000..cb2a864ac
--- /dev/null
+++ b/htdocs/docs/man/FS/UI/Gtk.html
@@ -0,0 +1,112 @@
+<HTML>
+<HEAD>
+<TITLE>FS::UI::Gtk - Base class for Gtk user-interface objects</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#HISTORY">HISTORY</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::UI::Gtk - Base class for Gtk user-interface objects
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::UI::Gtk;
+  use FS::UI::some_table;
+</PRE>
+<P>
+<PRE>  $interface = new FS::UI::some_table;
+</PRE>
+<P>
+<PRE>  $error = $interface-&gt;browse;
+  $error = $interface-&gt;search;
+  $error = $interface-&gt;view;
+  $error = $interface-&gt;edit;
+  $error = $interface-&gt;process;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::UI::Gtk object represents a Gtk user interface object.
+
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new</A></STRONG><DD>
+<DT><STRONG><A NAME="item_interface">interface</A></STRONG><DD>
+<P>
+Returns the string `Gtk'. Useful for the author of a table-specific UI
+class to conditionally specify certain behaviour.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: Gtk.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+This documentation is incomplete.
+
+<P>
+_Tableborder is just a _Table now. _Tableborders should scroll (but not the
+headers) and need and need more decoration. (data in white section ala
+gtksql and sliding field widths) headers should be buttons that callback to
+sort on their fields.
+
+<P>
+There should be a persistant, per-(freeside)-user store for window
+positions and sizes and sort fields etc (see <A HREF="../../FS/UI/CGI.html#BUGS">BUGS</A>.
+
+<P>
+Still some small bits of widget code same as FS::UI::CGI.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../../FS/UI/Base.html">FS::UI::Base</A>
+
+
+
+<P>
+<HR>
+<H1><A NAME="HISTORY">HISTORY</A></H1>
+<P>
+$Log: Gtk.html,v $
+Revision 1.1  1999-08-04 12:13:27  ivan
+new HTML manpages
+ Revision 1.1 1999/08/04 09:03:53 ivan initial checkin of
+module files for proper perl installation
+
+<P>
+Revision 1.1 1999/01/20 09:30:36 ivan skeletal cross-UI UI code.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/UI/agent.html b/htdocs/docs/man/FS/UI/agent.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/htdocs/docs/man/FS/UID.html b/htdocs/docs/man/FS/UID.html
new file mode 100644
index 000000000..34444623a
--- /dev/null
+++ b/htdocs/docs/man/FS/UID.html
@@ -0,0 +1,160 @@
+<HTML>
+<HEAD>
+<TITLE>FS::UID - Subroutines for database login and assorted other stuff</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#SUBROUTINES">SUBROUTINES</A>
+	<LI><A HREF="#CALLBACKS">CALLBACKS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::UID - Subroutines for database login and assorted other stuff
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::UID qw(adminsuidsetup cgisuidsetup dbh datasrc getotaker
+  checkeuid checkruid swapuid);
+</PRE>
+<P>
+<PRE>  adminsuidsetup $user;
+</PRE>
+<P>
+<PRE>  $cgi = new CGI;
+  $dbh = cgisuidsetup($cgi);
+</PRE>
+<P>
+<PRE>  $dbh = dbh;
+</PRE>
+<P>
+<PRE>  $datasrc = datasrc;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+Provides a hodgepodge of subroutines. 
+
+<P>
+<HR>
+<H1><A NAME="SUBROUTINES">SUBROUTINES</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_adminsuidsetup">adminsuidsetup USER</A></STRONG><DD>
+<P>
+Sets the user to USER (see config.html from the base documentation). Cleans
+the environment. Make sure the script is running as freeside, or setuid
+freeside. Opens a connection to the database. Swaps real and effective
+UIDs. Runs any defined callbacks (see below). Returns the DBI database
+handle (usually you don't need this).
+
+<DT><STRONG><A NAME="item_cgisuidsetup">cgisuidsetup CGI_object</A></STRONG><DD>
+<P>
+Stores the CGI (see <A HREF=".././FS/CGI.html#">the CGI manpage</A>) object for later use. (CGI::Base is depriciated) Runs adminsuidsetup.
+
+<DT><STRONG><A NAME="item_cgi">cgi</A></STRONG><DD>
+<P>
+Returns the CGI (see <A HREF=".././FS/CGI.html#">the CGI manpage</A>) object.
+
+<DT><STRONG><A NAME="item_dbh">dbh</A></STRONG><DD>
+<P>
+Returns the DBI database handle.
+
+<DT><STRONG><A NAME="item_datasrc">datasrc</A></STRONG><DD>
+<P>
+Returns the DBI data source.
+
+<DT><STRONG><A NAME="item_getotaker">getotaker</A></STRONG><DD>
+<P>
+Returns the current Freeside user.
+
+<DT><STRONG><A NAME="item_cgisetotaker">cgisetotaker</A></STRONG><DD>
+<P>
+Sets and returns the CGI REMOTE_USER. <A HREF="#item__cgi">$cgi</A> should
+be defined as a CGI.pm object. Support for CGI::Base and derived classes is
+depriciated.
+
+<DT><STRONG><A NAME="item_checkeuid">checkeuid</A></STRONG><DD>
+<P>
+Returns true if effective UID is that of the freeside user.
+
+<DT><STRONG><A NAME="item_checkruid">checkruid</A></STRONG><DD>
+<P>
+Returns true if the real UID is that of the freeside user.
+
+<DT><STRONG><A NAME="item_swapuid">swapuid</A></STRONG><DD>
+<P>
+Swaps real and effective UIDs.
+
+<DT><STRONG><A NAME="item_getsecrets">getsecrets [ USER ]</A></STRONG><DD>
+<P>
+Sets the user to USER, if supplied. Sets and returns the DBI datasource,
+username and password for this user from the
+`/usr/local/etc/freeside/mapsecrets' file.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="CALLBACKS">CALLBACKS</A></H1>
+<P>
+Warning: this interface is likely to change in future releases.
+
+<P>
+A package can install a callback to be run in adminsuidsetup by putting a
+coderef into the hash %FS::UID::callback :
+
+<P>
+<PRE>    $coderef = sub { warn &quot;Hi, I'm returning your call!&quot; };
+    $FS::UID::callback{'Package::Name'};
+</PRE>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: UID.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+Too many package-global variables.
+
+<P>
+Not OO.
+
+<P>
+No capabilities yet. When mod_perl and Authen::DBI are implemented,
+cgisuidsetup will go away as well.
+
+<P>
+Goes through contortions to support non-OO syntax with multiple datasrc's.
+
+<P>
+Callbacks are inelegant.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF=".././FS/CGI.html#">the CGI manpage</A>, <EM>DBI</EM>, config.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/agent.html b/htdocs/docs/man/FS/agent.html
new file mode 100644
index 000000000..bdbf019c5
--- /dev/null
+++ b/htdocs/docs/man/FS/agent.html
@@ -0,0 +1,130 @@
+<HTML>
+<HEAD>
+<TITLE>FS::agent - Object methods for agent records</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::agent - Object methods for agent records
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::agent;
+</PRE>
+<P>
+<PRE>  $record = new FS::agent \%hash;
+  $record = new FS::agent { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<PRE>  $agent_type = $record-&gt;agent_type;
+</PRE>
+<P>
+<PRE>  $hashref = $record-&gt;pkgpart_hashref;
+  #may purchase $pkgpart if $hashref-&gt;{$pkgpart};
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::agent object represents an agent. Every customer has an agent.
+Agents can be used to track things like resellers or salespeople. FS::agent
+inherits from FS::Record. The following fields are currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_agemtnum">agemtnum - primary key (assigned automatically for new agents)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_agent">agent - Text name of this agent</A></STRONG><DD>
+<DT><STRONG><A NAME="item_typenum">typenum - Agent type.  See FS::agent_type</A></STRONG><DD>
+<DT><STRONG><A NAME="item_prog">prog - For future use.</A></STRONG><DD>
+<DT><STRONG><A NAME="item_freq">freq - For future use.</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new agent. To add the agent to the database, see <A HREF="#insert">insert</A>.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this agent to the database. If there is an error, returns the error,
+otherwise returns false.
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Deletes this agent from the database. Only agents with no customers can be
+deleted. If there is an error, returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replaces OLD_RECORD with this one in the database. If there is an error,
+returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid agent. If there is an error,
+returns the error, otherwise returns false. Called by the insert and
+replace methods.
+
+<DT><STRONG><A NAME="item_agent_type">agent_type</A></STRONG><DD>
+<P>
+Returns the FS::agent_type object (see <A HREF="../FS/agent_type.html">FS::agent_type</A>) for this agent.
+
+<DT><STRONG><A NAME="item_pkgpart_hashref">pkgpart_hashref</A></STRONG><DD>
+<P>
+Returns a hash reference. The keys of the hash are pkgparts. The value is
+true iff this agent may purchase the specified package definition. See
+<A HREF="../FS/part_pkg.html">FS::part_pkg</A>.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: agent.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/agent_type.html">FS::agent_type</A>, <A HREF="../FS/cust_main.html">FS::cust_main</A>, <A HREF="../FS/part_pkg.html">FS::part_pkg</A>, schema.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/agent_type.html b/htdocs/docs/man/FS/agent_type.html
new file mode 100644
index 000000000..25ed652da
--- /dev/null
+++ b/htdocs/docs/man/FS/agent_type.html
@@ -0,0 +1,138 @@
+<HTML>
+<HEAD>
+<TITLE>FS::agent_type - Object methods for agent_type records</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::agent_type - Object methods for agent_type records
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::agent_type;
+</PRE>
+<P>
+<PRE>  $record = new FS::agent_type \%hash;
+  $record = new FS::agent_type { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<PRE>  $hashref = $record-&gt;pkgpart_hashref;
+  #may purchase $pkgpart if $hashref-&gt;{$pkgpart};
+</PRE>
+<P>
+<PRE>  @type_pkgs = $record-&gt;type_pkgs;
+</PRE>
+<P>
+<PRE>  @pkgparts = $record-&gt;pkgpart;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::agent_type object represents an agent type. Every agent (see
+<A HREF="../FS/agent.html">FS::agent</A>) has an agent type. Agent types define which packages (see
+<A HREF="../FS/part_pkg.html">FS::part_pkg</A>) may be purchased by customers (see <A HREF="../FS/cust_main.html">FS::cust_main</A>), via FS::type_pkgs records (see <A HREF="../FS/type_pkgs.html">FS::type_pkgs</A>). FS::agent_type inherits from FS::Record. The following fields are
+currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_typenum">typenum - primary key (assigned automatically for new agent types)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_atype">atype - Text name of this agent type</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new agent type. To add the agent type to the database, see
+<A HREF="#insert">insert</A>.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this agent type to the database. If there is an error, returns the
+error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Deletes this agent type from the database. Only agent types with no agents
+can be deleted. If there is an error, returns the error, otherwise returns
+false.
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replaces OLD_RECORD with this one in the database. If there is an error,
+returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid agent type. If there is an
+error, returns the error, otherwise returns false. Called by the insert and
+replace methods.
+
+<DT><STRONG><A NAME="item_pkgpart_hashref">pkgpart_hashref</A></STRONG><DD>
+<P>
+Returns a hash reference. The keys of the hash are pkgparts. The value is
+true iff this agent may purchase the specified package definition. See
+<A HREF="../FS/part_pkg.html">FS::part_pkg</A>.
+
+<DT><STRONG><A NAME="item_type_pkgs">type_pkgs</A></STRONG><DD>
+<P>
+Returns all FS::type_pkgs objects (see <A HREF="../FS/type_pkgs.html">FS::type_pkgs</A>) for this agent type.
+
+<DT><STRONG><A NAME="item_pkgpart">pkgpart</A></STRONG><DD>
+<P>
+Returns the pkgpart of all package definitions (see <A HREF="../FS/part_pkg.html">FS::part_pkg</A>) for this agent type.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: agent_type.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/agent.html">FS::agent</A>, <A HREF="../FS/type_pkgs.html">FS::type_pkgs</A>, <A HREF="../FS/cust_main.html">FS::cust_main</A>,
+<A HREF="../FS/part_pkg.html">FS::part_pkg</A>, schema.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/cust_bill.html b/htdocs/docs/man/FS/cust_bill.html
new file mode 100644
index 000000000..c28aa85a1
--- /dev/null
+++ b/htdocs/docs/man/FS/cust_bill.html
@@ -0,0 +1,184 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_bill - Object methods for cust_bill records</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::cust_bill - Object methods for cust_bill records
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::cust_bill;
+</PRE>
+<P>
+<PRE>  $record = new FS::cust_bill \%hash;
+  $record = new FS::cust_bill { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<PRE>  ( $total_previous_balance, @previous_cust_bill ) = $record-&gt;previous;
+</PRE>
+<P>
+<PRE>  @cust_bill_pkg_objects = $cust_bill-&gt;cust_bill_pkg;
+</PRE>
+<P>
+<PRE>  ( $total_previous_credits, @previous_cust_credit ) = $record-&gt;cust_credit;
+</PRE>
+<P>
+<PRE>  @cust_pay_objects = $cust_bill-&gt;cust_pay;
+</PRE>
+<P>
+<PRE>  @lines = $cust_bill-&gt;print_text;
+  @lines = $cust_bill-&gt;print_text $time;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::cust_bill object represents an invoice. FS::cust_bill inherits from
+FS::Record. The following fields are currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_invnum">invnum - primary key (assigned automatically for new invoices)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_custnum">custnum - customer (see FS::cust_main)</A></STRONG><DD>
+<DT><STRONG><A NAME="item__date">_date - specified as a UNIX timestamp; see perlfunc/&quot;time&quot;.  Also see
+Time::Local and Date::Parse for conversion functions.</A></STRONG><DD>
+<DT><STRONG><A NAME="item_charged">charged - amount of this invoice</A></STRONG><DD>
+<DT><STRONG><A NAME="item_owed">owed - amount still outstanding on this invoice, which is charged minus
+all payments (see FS::cust_pay).</A></STRONG><DD>
+<DT><STRONG><A NAME="item_printed">printed - how many times this invoice has been printed automatically
+(see FS::cust_main/&quot;collect&quot;).</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new invoice. To add the invoice to the database, see <A HREF="#insert">insert</A>. Invoices are normally created by calling the bill method of a customer
+object (see <A HREF="../FS/cust_main.html">FS::cust_main</A>).
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this invoice to the database (``Posts'' the invoice). If there is an
+error, returns the error, otherwise returns false.
+
+<P>
+When adding new invoices, owed must be charged (or null, in which case it
+is automatically set to charged).
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Currently unimplemented. I don't remove invoices because there would then
+be no record you ever posted this invoice (which is bad, no?)
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replaces the OLD_RECORD with this one in the database. If there is an
+error, returns the error, otherwise returns false.
+
+<P>
+Only owed and printed may be changed. Owed is normally updated by creating
+and inserting a payment (see <A HREF="../FS/cust_pay.html">FS::cust_pay</A>). Printed is normally updated by calling the collect method of a customer
+object (see <A HREF="../FS/cust_main.html">FS::cust_main</A>).
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid invoice. If there is an
+error, returns the error, otherwise returns false. Called by the insert and
+replace methods.
+
+<DT><STRONG><A NAME="item_previous">previous</A></STRONG><DD>
+<P>
+Returns a list consisting of the total previous balance for this customer,
+followed by the previous outstanding invoices (as FS::cust_bill objects
+also).
+
+<DT><STRONG><A NAME="item_cust_bill_pkg">cust_bill_pkg</A></STRONG><DD>
+<P>
+Returns the line items (see <A HREF="../FS/cust_bill_pkg.html">FS::cust_bill_pkg</A>) for this invoice.
+
+<DT><STRONG><A NAME="item_cust_credit">cust_credit</A></STRONG><DD>
+<P>
+Returns a list consisting of the total previous credited (see
+<A HREF="../FS/cust_credit.html">FS::cust_credit</A>) for this customer, followed by the previous outstanding credits
+(FS::cust_credit objects).
+
+<DT><STRONG><A NAME="item_cust_pay">cust_pay</A></STRONG><DD>
+<P>
+Returns all payments (see <A HREF="../FS/cust_pay.html">FS::cust_pay</A>) for this invoice.
+
+<DT><STRONG><A NAME="item_print_text">print_text [TIME];</A></STRONG><DD>
+<P>
+Returns an ASCII invoice, as a list of lines.
+
+<P>
+TIME an optional value used to control the printing of overdue messages.
+The default is now. It isn't the date of the invoice; that's the `_date'
+field. It is specified as a UNIX timestamp; see <EM>perlfunc</EM>. Also see
+<A HREF="../Time/Local.html">Time::Local</A> and <A HREF="../Date/Parse.html">Date::Parse</A> for conversion functions.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: cust_bill.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+The delete method.
+
+<P>
+print_text formatting (and some logic :/) is in source, but needs to be
+slurped in from a file. Also number of lines ($=).
+
+<P>
+missing print_ps for a nice postscript copy (maybe HylaFAX-cover-page-style
+or something similar so the look can be completely customized?)
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_main.html">FS::cust_main</A>, <A HREF="../FS/cust_pay.html">FS::cust_pay</A>, <A HREF="../FS/cust_bill_pkg.html">FS::cust_bill_pkg</A>,
+<A HREF="../FS/cust_credit.html">FS::cust_credit</A>, schema.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/cust_bill_pkg.html b/htdocs/docs/man/FS/cust_bill_pkg.html
new file mode 100644
index 000000000..229e88b5f
--- /dev/null
+++ b/htdocs/docs/man/FS/cust_bill_pkg.html
@@ -0,0 +1,119 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_bill_pkg - Object methods for cust_bill_pkg records</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::cust_bill_pkg - Object methods for cust_bill_pkg records
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::cust_bill_pkg;
+</PRE>
+<P>
+<PRE>  $record = new FS::cust_bill_pkg \%hash;
+  $record = new FS::cust_bill_pkg { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::cust_bill_pkg object represents an invoice line item.
+FS::cust_bill_pkg inherits from FS::Record. The following fields are
+currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_invnum">invnum - invoice (see FS::cust_bill)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_pkgnum">pkgnum - package (see FS::cust_pkg)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_setup">setup - setup fee</A></STRONG><DD>
+<DT><STRONG><A NAME="item_recur">recur - recurring fee</A></STRONG><DD>
+<DT><STRONG><A NAME="item_sdate">sdate - starting date of recurring fee</A></STRONG><DD>
+<DT><STRONG><A NAME="item_edate">edate - ending date of recurring fee</A></STRONG><DD>
+</DL>
+<P>
+sdate and edate are specified as UNIX timestamps; see <EM>perlfunc</EM>. Also see <A HREF="../Time/Local.html">Time::Local</A> and <A HREF="../Date/Parse.html">Date::Parse</A> for conversion functions.
+
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new line item. To add the line item to the database, see
+<A HREF="#insert">insert</A>. Line items are normally created by calling the bill method of a customer
+object (see <A HREF="../FS/cust_main.html">FS::cust_main</A>).
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this line item to the database. If there is an error, returns the
+error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Currently unimplemented. I don't remove line items because there would then
+be no record the items ever existed (which is bad, no?)
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Currently unimplemented. This would be even more of an accounting nightmare
+than deleteing the items. Just don't do it.
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid line item. If there is an
+error, returns the error, otherwise returns false. Called by the insert
+method.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: cust_bill_pkg.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_bill.html">FS::cust_bill</A>, <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>, <A HREF="../FS/cust_main.html">FS::cust_main</A>, schema.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/cust_credit.html b/htdocs/docs/man/FS/cust_credit.html
new file mode 100644
index 000000000..5683fcd0d
--- /dev/null
+++ b/htdocs/docs/man/FS/cust_credit.html
@@ -0,0 +1,126 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_credit - Object methods for cust_credit records</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::cust_credit - Object methods for cust_credit records
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::cust_credit;
+</PRE>
+<P>
+<PRE>  $record = new FS::cust_credit \%hash;
+  $record = new FS::cust_credit { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::cust_credit object represents a credit. FS::cust_credit inherits
+from FS::Record. The following fields are currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_crednum">crednum - primary key (assigned automatically for new credits)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_custnum">custnum - customer (see FS::cust_main)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_amount">amount - amount of the credit</A></STRONG><DD>
+<DT><STRONG><A NAME="item_credited">credited - how much of this credit that is still outstanding, which is
+amount minus all refunds (see FS::cust_refund).</A></STRONG><DD>
+<DT><STRONG><A NAME="item__date">_date - specified as a UNIX timestamp; see perlfunc/&quot;time&quot;.  Also see
+Time::Local and Date::Parse for conversion functions.</A></STRONG><DD>
+<DT><STRONG><A NAME="item_otaker">otaker - order taker (assigned automatically, see FS::UID)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_reason">reason - text</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new credit. To add the credit to the database, see <A HREF="#insert">insert</A>.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this credit to the database (``Posts'' the credit). If there is an
+error, returns the error, otherwise returns false.
+
+<P>
+When adding new invoices, credited must be amount (or null, in which case
+it is automatically set to amount).
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Currently unimplemented.
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replaces the OLD_RECORD with this one in the database. If there is an
+error, returns the error, otherwise returns false.
+
+<P>
+Only credited may be changed. Credited is normally updated by creating and
+inserting a refund (see <A HREF="../FS/cust_refund.html">FS::cust_refund</A>).
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid credit. If there is an
+error, returns the error, otherwise returns false. Called by the insert and
+replace methods.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: cust_credit.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+The delete method.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_refund.html">FS::cust_refund</A>, <A HREF="../FS/cust_bill.html">FS::cust_bill</A>, schema.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/cust_main.html b/htdocs/docs/man/FS/cust_main.html
new file mode 100644
index 000000000..5e0b8eef7
--- /dev/null
+++ b/htdocs/docs/man/FS/cust_main.html
@@ -0,0 +1,277 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_main - Object methods for cust_main records</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::cust_main - Object methods for cust_main records
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::cust_main;
+</PRE>
+<P>
+<PRE>  $record = new FS::cust_main \%hash;
+  $record = new FS::cust_main { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<PRE>  @cust_pkg = $record-&gt;all_pkgs;
+</PRE>
+<P>
+<PRE>  @cust_pkg = $record-&gt;ncancelled_pkgs;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;bill;
+  $error = $record-&gt;bill %options;
+  $error = $record-&gt;bill 'time' =&gt; $time;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;collect;
+  $error = $record-&gt;collect %options;
+  $error = $record-&gt;collect 'invoice_time'   =&gt; $time,
+                            'batch_card'     =&gt; 'yes',
+                            'report_badcard' =&gt; 'yes',
+                          ;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::cust_main object represents a customer. FS::cust_main inherits from
+FS::Record. The following fields are currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_custnum">custnum - primary key (assigned automatically for new customers)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_agentnum">agentnum - agent (see FS::agent)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_refnum">refnum - referral (see FS::part_referral)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_first">first - name</A></STRONG><DD>
+<DT><STRONG><A NAME="item_last">last - name</A></STRONG><DD>
+<DT><STRONG><A NAME="item_ss">ss - social security number (optional)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_company">company - (optional)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_address1">address1</A></STRONG><DD>
+<DT><STRONG><A NAME="item_address2">address2 - (optional)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_city">city</A></STRONG><DD>
+<DT><STRONG><A NAME="item_county">county - (optional, see FS::cust_main_county)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_state">state - (see FS::cust_main_county)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_zip">zip</A></STRONG><DD>
+<DT><STRONG><A NAME="item_country">country - (see FS::cust_main_county)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_daytime">daytime - phone (optional)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_night">night - phone (optional)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_fax">fax - phone (optional)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_payby">payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_payinfo">payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_paydate">paydate - expiration date, mm/yyyy, m/yyyy, mm/yy or m/yy</A></STRONG><DD>
+<DT><STRONG><A NAME="item_payname">payname - name on card or billing name</A></STRONG><DD>
+<DT><STRONG><A NAME="item_tax">tax - tax exempt, empty or `Y'</A></STRONG><DD>
+<DT><STRONG><A NAME="item_otaker">otaker - order taker (assigned automatically, see FS::UID)</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new customer. To add the customer to the database, see <A HREF="#insert">insert</A>.
+
+<P>
+Note that this stores the hash reference, not a distinct copy of the hash
+it points to. You can ask the object for a copy with the <EM>hash</EM> method.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this customer to the database. If there is an error, returns the
+error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_delete">delete NEW_CUSTNUM</A></STRONG><DD>
+<P>
+This deletes the customer. If there is an error, returns the error,
+otherwise returns false.
+
+<P>
+This will completely remove all traces of the customer record. This is not
+what you want when a customer cancels service; for that, cancel all of the
+customer's packages (see <A HREF="../FS/cust_pkg.html#cancel">cancel</A>).
+
+<P>
+If the customer has any packages, you need to pass a new (valid) customer
+number for those packages to be transferred to.
+
+<P>
+You can't delete a customer with invoices (see <A HREF="../FS/cust_bill.html">FS::cust_bill</A>), or credits (see <A HREF="../FS/cust_credit.html">FS::cust_credit</A>).
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replaces the OLD_RECORD with this one in the database. If there is an
+error, returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid customer record. If there is
+an error, returns the error, otherwise returns false. Called by the insert
+and repalce methods.
+
+<DT><STRONG><A NAME="item_all_pkgs">all_pkgs</A></STRONG><DD>
+<P>
+Returns all packages (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>) for this customer.
+
+<DT><STRONG><A NAME="item_ncancelled_pkgs">ncancelled_pkgs</A></STRONG><DD>
+<P>
+Returns all non-cancelled packages (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>) for this customer.
+
+<DT><STRONG><A NAME="item_bill">bill OPTIONS</A></STRONG><DD>
+<P>
+Generates invoices (see <A HREF="../FS/cust_bill.html">FS::cust_bill</A>) for this customer. Usually used in conjunction with the collect method.
+
+<P>
+The only currently available option is `time', which bills the customer as
+if it were that time. It is specified as a UNIX timestamp; see
+<EM>perlfunc</EM>). Also see <A HREF="../Time/Local.html">Time::Local</A> and <A HREF="../Date/Parse.html">Date::Parse</A> for conversion functions.
+
+<P>
+If there is an error, returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_collect">collect OPTIONS</A></STRONG><DD>
+<P>
+(Attempt to) collect money for this customer's outstanding invoices (see
+<A HREF="../FS/cust_bill.html">FS::cust_bill</A>). Usually used after the bill method.
+
+<P>
+Depending on the value of `payby', this may print an invoice (`BILL'),
+charge a credit card (`CARD'), or just add any necessary (pseudo-)payment
+(`COMP').
+
+<P>
+If there is an error, returns the error, otherwise returns false.
+
+<P>
+Currently available options are:
+
+<P>
+invoice_time - Use this time when deciding when to print invoices and late
+notices on those invoices. The default is now. It is specified as a UNIX
+timestamp; see <EM>perlfunc</EM>). Also see <A HREF="../Time/Local.html">Time::Local</A> and <A HREF="../Date/Parse.html">Date::Parse</A>
+for conversion functions.
+
+<P>
+batch_card - Set this true to batch cards (see <A HREF=".././FS/cust_pay_batch.html#">the cust_pay_batch manpage</A>). By default, cards are processed immediately, which will generate an
+error if CyberCash is not installed.
+
+<P>
+report_badcard - Set this true if you want bad card transactions to return
+an error. By default, they don't.
+
+<DT><STRONG><A NAME="item_total_owed">total_owed</A></STRONG><DD>
+<P>
+Returns the total owed for this customer on all invoices (see <A HREF="../FS/cust_bill.html">FS::cust_bill</A>).
+
+<DT><STRONG><A NAME="item_total_credited">total_credited</A></STRONG><DD>
+<P>
+Returns the total credits (see <A HREF="../FS/cust_credit.html">FS::cust_credit</A>) for this customer.
+
+<DT><STRONG><A NAME="item_balance">balance</A></STRONG><DD>
+<P>
+Returns the balance for this customer (total owed minus total credited).
+
+<DT><STRONG><A NAME="item_invoicing_list">invoicing_list [ ARRAYREF ]</A></STRONG><DD>
+<P>
+If an arguement is given, sets these email addresses as invoice recipients
+(see <A HREF="../FS/cust_main_invoice.html">FS::cust_main_invoice</A>). Errors are not fatal and are not reported (except as warnings), so use
+check_invoicing_list first.
+
+<P>
+Returns a list of email addresses (with svcnum entries expanded).
+
+<P>
+Note: You can clear the invoicing list by passing an empty ARRAYREF. You
+can check it without disturbing anything by passing nothing.
+
+<P>
+This interface may change in the future.
+
+<DT><STRONG><A NAME="item_check_invoicing_list">check_invoicing_list ARRAYREF</A></STRONG><DD>
+<P>
+Checks these arguements as valid input for the invoicing_list method. If
+there is an error, returns the error, otherwise returns false.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: cust_main.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+The delete method.
+
+<P>
+The delete method should possibly take an FS::cust_main object reference
+instead of a scalar customer number.
+
+<P>
+Bill and collect options should probably be passed as references instead of
+a list.
+
+<P>
+CyberCash v2 forces us to define some variables in package main.
+
+<P>
+There should probably be a configuration file with a list of allowed credit
+card types.
+
+<P>
+CyberCash is the only processor.
+
+<P>
+No multiple currency support (probably a larger project than just this
+module).
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>, <A HREF="../FS/cust_bill.html">FS::cust_bill</A>, <A HREF="../FS/cust_credit.html">FS::cust_credit</A>
+
+<A HREF="../FS/cust_pay_batch.html">FS::cust_pay_batch</A>, <A HREF="../FS/agent.html">FS::agent</A>, <A HREF="../FS/part_referral.html">FS::part_referral</A>,
+<A HREF="../FS/cust_main_county.html">FS::cust_main_county</A>, <A HREF="../FS/cust_main_invoice.html">FS::cust_main_invoice</A>,
+<A HREF="../FS/UID.html">FS::UID</A>, schema.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/cust_main_county.html b/htdocs/docs/man/FS/cust_main_county.html
new file mode 100644
index 000000000..a3c1f400c
--- /dev/null
+++ b/htdocs/docs/man/FS/cust_main_county.html
@@ -0,0 +1,113 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_main_county - Object methods for cust_main_county objects</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::cust_main_county - Object methods for cust_main_county objects
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::cust_main_county;
+</PRE>
+<P>
+<PRE>  $record = new FS::cust_main_county \%hash;
+  $record = new FS::cust_main_county { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::cust_main_county object represents a tax rate, defined by locale.
+FS::cust_main_county inherits from FS::Record. The following fields are
+currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_taxnum">taxnum - primary key (assigned automatically for new tax rates)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_state">state</A></STRONG><DD>
+<DT><STRONG><A NAME="item_county">county</A></STRONG><DD>
+<DT><STRONG><A NAME="item_country">country</A></STRONG><DD>
+<DT><STRONG><A NAME="item_tax">tax - percentage</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new tax rate. To add the tax rate to the database, see <A HREF="#insert">insert</A>.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this tax rate to the database. If there is an error, returns the
+error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Deletes this tax rate from the database. If there is an error, returns the
+error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replaces the OLD_RECORD with this one in the database. If there is an
+error, returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid tax rate. If there is an
+error, returns the error, otherwise returns false. Called by the insert and
+replace methods.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: cust_main_county.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_main.html">FS::cust_main</A>, <A HREF="../FS/cust_bill.html">FS::cust_bill</A>, schema.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/cust_main_invoice.html b/htdocs/docs/man/FS/cust_main_invoice.html
new file mode 100644
index 000000000..2fc22b306
--- /dev/null
+++ b/htdocs/docs/man/FS/cust_main_invoice.html
@@ -0,0 +1,128 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_main_invoice - Object methods for cust_main_invoice records</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::cust_main_invoice - Object methods for cust_main_invoice records
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::cust_main_invoice;
+</PRE>
+<P>
+<PRE>  $record = new FS::cust_main_invoice \%hash;
+  $record = new FS::cust_main_invoice { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<PRE>  $email_address = $record-&gt;address;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::cust_main_invoice object represents an invoice destination.
+FS::cust_main_invoice inherits from FS::Record. The following fields are
+currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_destnum">destnum - primary key</A></STRONG><DD>
+<DT><STRONG><A NAME="item_custnum">custnum - customer (see FS::cust_main)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_dest">dest - Invoice destination: If numeric, a &lt;a href=&quot;#svc_acct&quot;&gt;svcnum&lt;/a&gt;, if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new invoice destination. To add the invoice destination to the
+database, see <A HREF="#insert">insert</A>.
+
+<P>
+Note that this stores the hash reference, not a distinct copy of the hash
+it points to. You can ask the object for a copy with the <EM>hash</EM> method.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this record to the database. If there is an error, returns the error,
+otherwise returns false.
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Delete this record from the database.
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replaces the OLD_RECORD with this one in the database. If there is an
+error, returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid invoice destination. If
+there is an error, returns the error, otherwise returns false. Called by
+the insert and repalce methods.
+
+<DT><STRONG><A NAME="item_checkdest">checkdest</A></STRONG><DD>
+<P>
+Checks the dest field only.
+
+<DT><STRONG><A NAME="item_address">address</A></STRONG><DD>
+<P>
+Returns the literal email address for this record (or `POST').
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: cust_main_invoice.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_main.html">FS::cust_main</A>
+
+
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/cust_pay.html b/htdocs/docs/man/FS/cust_pay.html
new file mode 100644
index 000000000..026745e73
--- /dev/null
+++ b/htdocs/docs/man/FS/cust_pay.html
@@ -0,0 +1,116 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_pay - Object methods for cust_pay objects</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::cust_pay - Object methods for cust_pay objects
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::cust_pay;
+</PRE>
+<P>
+<PRE>  $record = new FS::cust_pay \%hash;
+  $record = new FS::cust_pay { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::cust_pay object represents a payment. FS::cust_pay inherits from
+FS::Record. The following fields are currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_paynum">paynum - primary key (assigned automatically for new payments)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_invnum">invnum - Invoice (see FS::cust_bill)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_paid">paid - Amount of this payment</A></STRONG><DD>
+<DT><STRONG><A NAME="item__date">_date - specified as a UNIX timestamp; see perlfunc/&quot;time&quot;.  Also see
+Time::Local and Date::Parse for conversion functions.</A></STRONG><DD>
+<DT><STRONG><A NAME="item_payby">payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_payinfo">payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_paybatch">paybatch - text field for tracking card processing</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new payment. To add the payment to the databse, see <A HREF="#insert">insert</A>.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this payment to the databse, and updates the invoice (see
+<A HREF="../FS/cust_bill.html">FS::cust_bill</A>).
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Currently unimplemented (accounting reasons).
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Currently unimplemented (accounting reasons).
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid payment. If there is an
+error, returns the error, otherwise returns false. Called by the insert
+method.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: cust_pay.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+Delete and replace methods.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_bill.html">FS::cust_bill</A>, schema.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/cust_pay_batch.html b/htdocs/docs/man/FS/cust_pay_batch.html
new file mode 100644
index 000000000..1a5189e6b
--- /dev/null
+++ b/htdocs/docs/man/FS/cust_pay_batch.html
@@ -0,0 +1,134 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_pay_batch - Object methods for batch cards</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::cust_pay_batch - Object methods for batch cards
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::cust_pay_batch;
+</PRE>
+<P>
+<PRE>  $record = new FS::cust_pay_batch \%hash;
+  $record = new FS::cust_pay_batch { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::cust_pay_batch object represents a credit card transaction ready to
+be batched (sent to a processor). FS::cust_pay_batch inherits from
+FS::Record. Typically called by the collect method of an FS::cust_main
+object. The following fields are currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_trancode">trancode - 77 for charges</A></STRONG><DD>
+<DT><STRONG><A NAME="item_cardnum">cardnum</A></STRONG><DD>
+<DT><STRONG><A NAME="item_exp">exp - card expiration</A></STRONG><DD>
+<DT><STRONG><A NAME="item_amount">amount</A></STRONG><DD>
+<DT><STRONG><A NAME="item_invnum">invnum - invoice</A></STRONG><DD>
+<DT><STRONG><A NAME="item_custnum">custnum - customer</A></STRONG><DD>
+<DT><STRONG><A NAME="item_payname">payname - name on card</A></STRONG><DD>
+<DT><STRONG><A NAME="item_first">first - name</A></STRONG><DD>
+<DT><STRONG><A NAME="item_last">last - name</A></STRONG><DD>
+<DT><STRONG><A NAME="item_address1">address1</A></STRONG><DD>
+<DT><STRONG><A NAME="item_address2">address2</A></STRONG><DD>
+<DT><STRONG><A NAME="item_city">city</A></STRONG><DD>
+<DT><STRONG><A NAME="item_state">state</A></STRONG><DD>
+<DT><STRONG><A NAME="item_zip">zip</A></STRONG><DD>
+<DT><STRONG><A NAME="item_country">country</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new record. To add the record to the database, see <A HREF="#insert">insert</A>.
+
+<P>
+Note that this stores the hash reference, not a distinct copy of the hash
+it points to. You can ask the object for a copy with the <EM>hash</EM> method.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this record to the database. If there is an error, returns the error,
+otherwise returns false.
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Delete this record from the database. If there is an error, returns the
+error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+#inactive # #Replaces the OLD_RECORD with this one in the database. If
+there is an error, #returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid transaction. If there is an
+error, returns the error, otherwise returns false. Called by the insert and
+repalce methods.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: cust_pay_batch.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+There should probably be a configuration file with a list of allowed credit
+card types.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/cust_main.html">FS::cust_main</A>, <A HREF="../FS/Record.html">FS::Record</A>
+
+
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/cust_pkg.html b/htdocs/docs/man/FS/cust_pkg.html
new file mode 100644
index 000000000..e105a30df
--- /dev/null
+++ b/htdocs/docs/man/FS/cust_pkg.html
@@ -0,0 +1,254 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_pkg - Object methods for cust_pkg objects</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#SUBROUTINES">SUBROUTINES</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::cust_pkg - Object methods for cust_pkg objects
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::cust_pkg;
+</PRE>
+<P>
+<PRE>  $record = new FS::cust_pkg \%hash;
+  $record = new FS::cust_pkg { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;cancel;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;suspend;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;unsuspend;
+</PRE>
+<P>
+<PRE>  $part_pkg = $record-&gt;part_pkg;
+</PRE>
+<P>
+<PRE>  @labels = $record-&gt;labels;
+</PRE>
+<P>
+<PRE>  $error = FS::cust_pkg::order( $custnum, \@pkgparts );
+  $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::cust_pkg object represents a customer billing item. FS::cust_pkg
+inherits from FS::Record. The following fields are currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_pkgnum">pkgnum - primary key (assigned automatically for new billing items)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_custnum">custnum - Customer (see FS::cust_main)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_pkgpart">pkgpart - Billing item definition (see FS::part_pkg)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_setup">setup - date</A></STRONG><DD>
+<DT><STRONG><A NAME="item_bill">bill - date</A></STRONG><DD>
+<DT><STRONG><A NAME="item_susp">susp - date</A></STRONG><DD>
+<DT><STRONG><A NAME="item_expire">expire - date</A></STRONG><DD>
+<DT><STRONG><A NAME="item_cancel">cancel - date</A></STRONG><DD>
+<DT><STRONG><A NAME="item_otaker">otaker - order taker (assigned automatically if null, see FS::UID)</A></STRONG><DD>
+</DL>
+<P>
+Note: setup, bill, susp, expire and cancel are specified as UNIX
+timestamps; see <EM>perlfunc</EM>. Also see <A HREF="../Time/Local.html">Time::Local</A> and <A HREF="../Date/Parse.html">Date::Parse</A> for conversion functions.
+
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Create a new billing item. To add the item to the database, see <A HREF="#insert">insert</A>.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this billing item to the database (``Orders'' the item). If there is
+an error, returns the error, otherwise returns false.
+
+<P>
+sub insert { my <CODE>$self</CODE> = shift;
+
+<P>
+<PRE>  # custnum might not have have been defined in sub check (for one-shot new
+  # customers), so check it here instead
+</PRE>
+<P>
+<PRE>  my $error = $self-&gt;ut_number('custnum');
+  return $error if $error
+</PRE>
+<P>
+<PRE>  return &quot;Unknown customer&quot;
+    unless qsearchs( 'cust_main', { 'custnum' =&gt; $self-&gt;custnum } );
+</PRE>
+<P>
+<PRE>  $self-&gt;SUPER::insert;
+</PRE>
+<P>
+}
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Currently unimplemented. You don't want to delete billing items, because
+there would then be no record the customer ever purchased the item.
+Instead, see the cancel method.
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replaces the OLD_RECORD with this one in the database. If there is an
+error, returns the error, otherwise returns false.
+
+<P>
+Currently, custnum, setup, bill, susp, expire, and cancel may be changed.
+
+<P>
+Changing pkgpart may have disasterous effects. See the order subroutine.
+
+<P>
+setup and bill are normally updated by calling the bill method of a
+customer object (see <A HREF="../FS/cust_main.html">FS::cust_main</A>).
+
+<P>
+suspend is normally updated by the suspend and unsuspend methods.
+
+<P>
+cancel is normally updated by the cancel method (and also the order
+subroutine in some cases).
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid billing item. If there is an
+error, returns the error, otherwise returns false. Called by the insert and
+replace methods.
+
+<DT><STRONG>cancel</STRONG><DD>
+<P>
+Cancels and removes all services (see <A HREF="../FS/cust_svc.html">FS::cust_svc</A> and <A HREF="../FS/part_svc.html">FS::part_svc</A>) in this package, then cancels the package itself (sets the cancel field
+to now).
+
+<P>
+If there is an error, returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><DD>
+<P>
+Suspends all services (see <A HREF="../FS/cust_svc.html">FS::cust_svc</A> and <A HREF="../FS/part_svc.html">FS::part_svc</A>) in this package, then suspends the package itself (sets the susp field to
+now).
+
+<P>
+If there is an error, returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><DD>
+<P>
+Unsuspends all services (see <A HREF="../FS/cust_svc.html">FS::cust_svc</A> and <A HREF="../FS/part_svc.html">FS::part_svc</A>) in this package, then unsuspends the package itself (clears the susp
+field).
+
+<P>
+If there is an error, returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_part_pkg">part_pkg</A></STRONG><DD>
+<P>
+Returns the definition for this billing item, as an FS::part_pkg object
+(see
+<A HREF="../FS/part_pkg.html">FS::part_pkg</A>).
+
+<DT><STRONG><A NAME="item_labels">labels</A></STRONG><DD>
+<P>
+Returns a list of lists, calling the label method for all services (see <A HREF="../FS/cust_svc.html">FS::cust_svc</A>) of this billing item.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="SUBROUTINES">SUBROUTINES</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_order">order CUSTNUM, PKGPARTS_ARYREF, [ REMOVE_PKGNUMS_ARYREF ]</A></STRONG><DD>
+<P>
+CUSTNUM is a customer (see <A HREF="../FS/cust_main.html">FS::cust_main</A>)
+
+<P>
+PKGPARTS is a list of pkgparts specifying the the billing item definitions
+(see
+<A HREF="../FS/part_pkg.html">FS::part_pkg</A>) to order for this customer. Duplicates are of course permitted.
+
+<P>
+REMOVE_PKGNUMS is an optional list of pkgnums specifying the billing items
+to remove for this customer. The services (see <A HREF="../FS/cust_svc.html">FS::cust_svc</A>) are moved to the new billing items. An error is returned if this is not
+possible (see
+<A HREF="../FS/pkg_svc.html">FS::pkg_svc</A>).
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: cust_pkg.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+sub order is not OO. Perhaps it should be moved to FS::cust_main and made
+so?
+
+<P>
+In sub order, the <CODE>@pkgparts</CODE> array (passed by reference) is
+clobbered.
+
+<P>
+Also in sub order, no money is adjusted. Once FS::part_pkg defines a
+standard method to pass dates to the recur_prog expression, it should do
+so.
+
+<P>
+FS::svc_acct, FS::svc_acct_sm, and FS::svc_domain are loaded via 'use' at
+compile time, rather than via 'require' in sub { setup, suspend, unsuspend,
+cancel } because they use %FS::UID::callback to load configuration values.
+Probably need a subroutine which decides what to do based on whether or not
+we've fetched the user yet, rather than a hash. See FS::UID and the TODO.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_main.html">FS::cust_main</A>, <A HREF="../FS/part_pkg.html">FS::part_pkg</A>, <A HREF="../FS/cust_svc.html">FS::cust_svc</A>
+, <A HREF="../FS/pkg_svc.html">FS::pkg_svc</A>, schema.html from the base documentation
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/cust_refund.html b/htdocs/docs/man/FS/cust_refund.html
new file mode 100644
index 000000000..f1d106c2f
--- /dev/null
+++ b/htdocs/docs/man/FS/cust_refund.html
@@ -0,0 +1,116 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_refund - Object method for cust_refund objects</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::cust_refund - Object method for cust_refund objects
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::cust_refund;
+</PRE>
+<P>
+<PRE>  $record = new FS::cust_refund \%hash;
+  $record = new FS::cust_refund { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::cust_refund represents a refund. FS::cust_refund inherits from
+FS::Record. The following fields are currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_refundnum">refundnum - primary key (assigned automatically for new refunds)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_crednum">crednum - Credit (see FS::cust_credit)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_refund">refund - Amount of the refund</A></STRONG><DD>
+<DT><STRONG><A NAME="item__date">_date - specified as a UNIX timestamp; see perlfunc/&quot;time&quot;.  Also see
+Time::Local and Date::Parse for conversion functions.</A></STRONG><DD>
+<DT><STRONG><A NAME="item_payby">payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_payinfo">payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_otaker">otaker - order taker (assigned automatically, see FS::UID)</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new refund. To add the refund to the database, see <A HREF="#insert">insert</A>.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this refund to the database, and updates the credit (see
+<A HREF="../FS/cust_credit.html">FS::cust_credit</A>).
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Currently unimplemented (accounting reasons).
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Currently unimplemented (accounting reasons).
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid refund. If there is an
+error, returns the error, otherwise returns false. Called by the insert
+method.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: cust_refund.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+Delete and replace methods.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_credit.html">FS::cust_credit</A>, schema.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/cust_svc.html b/htdocs/docs/man/FS/cust_svc.html
new file mode 100644
index 000000000..060fb7fa6
--- /dev/null
+++ b/htdocs/docs/man/FS/cust_svc.html
@@ -0,0 +1,134 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_svc - Object method for cust_svc objects</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::cust_svc - Object method for cust_svc objects
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::cust_svc;
+</PRE>
+<P>
+<PRE>  $record = new FS::cust_svc \%hash
+  $record = new FS::cust_svc { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<PRE>  ($label, $value) = $record-&gt;label;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::cust_svc represents a service. FS::cust_svc inherits from
+FS::Record. The following fields are currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_svcnum">svcnum - primary key (assigned automatically for new services)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_pkgnum">pkgnum - Package (see FS::cust_pkg)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_svcpart">svcpart - Service definition (see FS::part_svc)</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new service. To add the refund to the database, see <A HREF="#insert">insert</A>. Services are normally created by creating FS::svc_ objects (see
+<A HREF="../FS/svc_acct.html">FS::svc_acct</A>, <A HREF="../FS/svc_domain.html">FS::svc_domain</A>, and <A HREF="../FS/svc_acct_sm.html">FS::svc_acct_sm</A>, among others).
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this service to the database. If there is an error, returns the error,
+otherwise returns false.
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Deletes this service from the database. If there is an error, returns the
+error, otherwise returns false.
+
+<P>
+Called by the cancel method of the package (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replaces the OLD_RECORD with this one in the database. If there is an
+error, returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid service. If there is an
+error, returns the error, otehrwise returns false. Called by the insert and
+replace methods.
+
+<DT><STRONG><A NAME="item_label">label</A></STRONG><DD>
+<P>
+Returns a list consisting of: - The name of this service (from part_svc) -
+A meaningful identifier (username, domain, or mail alias) - The table name
+(i.e. svc_domain) for this service
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: cust_svc.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+Behaviour of changing the svcpart of cust_svc records is undefined and
+should possibly be prohibited, and pkg_svc records are not checked.
+
+<P>
+pkg_svc records are not checked in general (here).
+
+<P>
+Deleting this record doesn't check or delete the svc_* record associated
+with this record.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>, <A HREF="../FS/part_svc.html">FS::part_svc</A>, <A HREF="../FS/pkg_svc.html">FS::pkg_svc</A>, schema.html from the base documentation
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/dbdef.html b/htdocs/docs/man/FS/dbdef.html
new file mode 100644
index 000000000..9b8274b29
--- /dev/null
+++ b/htdocs/docs/man/FS/dbdef.html
@@ -0,0 +1,97 @@
+<HTML>
+<HEAD>
+<TITLE>FS::dbdef - Database objects</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::dbdef - Database objects
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::dbdef;
+</PRE>
+<P>
+<PRE>  $dbdef = new FS::dbdef (@dbdef_table_objects);
+  $dbdef = load FS::dbdef &quot;filename&quot;;
+</PRE>
+<P>
+<PRE>  $dbdef-&gt;save(&quot;filename&quot;);
+</PRE>
+<P>
+<PRE>  $dbdef-&gt;addtable($dbdef_table_object);
+</PRE>
+<P>
+<PRE>  @table_names = $dbdef-&gt;tables;
+</PRE>
+<P>
+<PRE>  $FS_dbdef_table_object = $dbdef-&gt;table;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+FS::dbdef objects are collections of FS::dbdef_table objects and represnt a
+database (a collection of tables).
+
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new TABLE, TABLE, ...</A></STRONG><DD>
+<P>
+Creates a new FS::dbdef object
+
+<DT><STRONG><A NAME="item_load">load FILENAME</A></STRONG><DD>
+<P>
+Loads an FS::dbdef object from a file.
+
+<DT><STRONG><A NAME="item_save">save FILENAME</A></STRONG><DD>
+<P>
+Saves an FS::dbdef object to a file.
+
+<DT><STRONG><A NAME="item_addtable">addtable TABLE</A></STRONG><DD>
+<P>
+Adds this FS::dbdef_table object.
+
+<DT><STRONG><A NAME="item_tables">tables</A></STRONG><DD>
+<P>
+Returns the names of all tables.
+
+<DT><STRONG><A NAME="item_table">table TABLENAME</A></STRONG><DD>
+<P>
+Returns the named FS::dbdef_table object.
+
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+Each FS::dbdef object should have a name which corresponds to its name
+within the SQL database engine.
+
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/dbdef_table.html">FS::dbdef_table</A>, <A HREF="../FS/Record.html">FS::Record</A>,
+
+</DL>
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/dbdef_colgroup.html b/htdocs/docs/man/FS/dbdef_colgroup.html
new file mode 100644
index 000000000..9c4f7f43d
--- /dev/null
+++ b/htdocs/docs/man/FS/dbdef_colgroup.html
@@ -0,0 +1,86 @@
+<HTML>
+<HEAD>
+<TITLE>FS::dbdef_colgroup - Column group objects</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::dbdef_colgroup - Column group objects
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::dbdef_colgroup;
+</PRE>
+<P>
+<PRE>  $colgroup = new FS::dbdef_colgroup ( $lol );
+  $colgroup = new FS::dbdef_colgroup (
+    [
+      [ 'single_column' ],
+      [ 'multiple_columns', 'another_column', ],
+    ]
+  );
+</PRE>
+<P>
+<PRE>  @sql_lists = $colgroup-&gt;sql_list;
+</PRE>
+<P>
+<PRE>  @singles = $colgroup-&gt;singles;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+FS::dbdef_colgroup objects represent sets of sets of columns.
+
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new</A></STRONG><DD>
+<P>
+Creates a new FS::dbdef_colgroup object.
+
+<DT><STRONG><A NAME="item_sql_list">sql_list</A></STRONG><DD>
+<P>
+Returns a flat list of comma-separated values, for SQL statements.
+
+<DT><STRONG><A NAME="item_singles">singles</A></STRONG><DD>
+<P>
+Returns a flat list of all single item lists.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/dbdef_table.html">FS::dbdef_table</A>, <A HREF="../FS/dbdef_unique.html">FS::dbdef_unique</A>, <A HREF="../FS/dbdef_index.html">FS::dbdef_index</A>,
+<A HREF="../FS/dbdef_column.html">FS::dbdef_column</A>, <A HREF="../FS/dbdef.html">FS::dbdef</A>, <EM>perldsc</EM>
+
+
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/dbdef_column.html b/htdocs/docs/man/FS/dbdef_column.html
new file mode 100644
index 000000000..c753b52f7
--- /dev/null
+++ b/htdocs/docs/man/FS/dbdef_column.html
@@ -0,0 +1,118 @@
+<HTML>
+<HEAD>
+<TITLE>FS::dbdef_column - Column object</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::dbdef_column - Column object
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::dbdef_column;
+</PRE>
+<P>
+<PRE>  $column_object = new FS::dbdef_column ( $name, $sql_type, '' );
+  $column_object = new FS::dbdef_column ( $name, $sql_type, 'NULL' );
+  $column_object = new FS::dbdef_column ( $name, $sql_type, '', $length );
+  $column_object = new FS::dbdef_column ( $name, $sql_type, 'NULL', $length );
+</PRE>
+<P>
+<PRE>  $name = $column_object-&gt;name;
+  $column_object-&gt;name ( 'name' );
+</PRE>
+<P>
+<PRE>  $name = $column_object-&gt;type;
+  $column_object-&gt;name ( 'sql_type' );
+</PRE>
+<P>
+<PRE>  $name = $column_object-&gt;null;
+  $column_object-&gt;name ( 'NOT NULL' );
+</PRE>
+<P>
+<PRE>  $name = $column_object-&gt;length;
+  $column_object-&gt;name ( $length );
+</PRE>
+<P>
+<PRE>  $sql_line = $column-&gt;line;
+  $sql_line = $column-&gt;line $datasrc;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+FS::dbdef::column objects represend columns in tables (see <A HREF="../FS/dbdef_table.html">FS::dbdef_table</A>).
+
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new</A></STRONG><DD>
+<P>
+Creates a new FS::dbdef_column object.
+
+<DT><STRONG><A NAME="item_name">name</A></STRONG><DD>
+<P>
+Returns or sets the column name.
+
+<DT><STRONG><A NAME="item_type">type</A></STRONG><DD>
+<P>
+Returns or sets the column type.
+
+<DT><STRONG><A NAME="item_null">null</A></STRONG><DD>
+<P>
+Returns or sets the column null flag.
+
+<DT><STRONG>type</STRONG><DD>
+<P>
+Returns or sets the column length.
+
+<DT><STRONG><A NAME="item_line">line [ $datasrc ]</A></STRONG><DD>
+<P>
+Returns an SQL column definition.
+
+<P>
+If passed a DBI <CODE>$datasrc</CODE> specifying <A HREF="../DBD/mysql.html">DBD::mysql</A> or <A HREF="../DBD/Pg.html">DBD::Pg</A>, will use engine-specific syntax.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/dbdef_table.html">FS::dbdef_table</A>, <A HREF="../FS/dbdef.html">FS::dbdef</A>, <EM>DBI</EM>
+
+
+
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: dbdef_column.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/dbdef_index.html b/htdocs/docs/man/FS/dbdef_index.html
new file mode 100644
index 000000000..7a9e5039e
--- /dev/null
+++ b/htdocs/docs/man/FS/dbdef_index.html
@@ -0,0 +1,58 @@
+<HTML>
+<HEAD>
+<TITLE>FS::dbdef_unique.pm - Index object</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::dbdef_unique.pm - Index object
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::dbdef_index;
+</PRE>
+<P>
+<PRE>    # see FS::dbdef_colgroup methods
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+FS::dbdef_unique objects represent the (non-unique) indices of a table (<A HREF="../FS/dbdef_table.html">FS::dbdef_table</A>). FS::dbdef_unique inherits from FS::dbdef_colgroup.
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+Is this empty subclass needed?
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/dbdef_colgroup.html">FS::dbdef_colgroup</A>, <A HREF="../FS/dbdef_record.html">FS::dbdef_record</A>, <A HREF="../FS/Record.html">FS::Record</A>
+
+
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/dbdef_table.html b/htdocs/docs/man/FS/dbdef_table.html
new file mode 100644
index 000000000..7056b0f9b
--- /dev/null
+++ b/htdocs/docs/man/FS/dbdef_table.html
@@ -0,0 +1,144 @@
+<HTML>
+<HEAD>
+<TITLE>FS::dbdef_table - Table objects</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::dbdef_table - Table objects
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::dbdef_table;
+</PRE>
+<P>
+<PRE>  $dbdef_table = new FS::dbdef_table (
+    &quot;table_name&quot;,
+    &quot;primary_key&quot;,
+    $FS_dbdef_unique_object,
+    $FS_dbdef_index_object,
+    @FS_dbdef_column_objects,
+  );
+</PRE>
+<P>
+<PRE>  $dbdef_table-&gt;addcolumn ( $FS_dbdef_column_object );
+</PRE>
+<P>
+<PRE>  $table_name = $dbdef_table-&gt;name;
+  $dbdef_table-&gt;name (&quot;table_name&quot;);
+</PRE>
+<P>
+<PRE>  $table_name = $dbdef_table-&gt;primary_keye;
+  $dbdef_table-&gt;primary_key (&quot;primary_key&quot;);
+</PRE>
+<P>
+<PRE>  $FS_dbdef_unique_object = $dbdef_table-&gt;unique;
+  $dbdef_table-&gt;unique ( $FS_dbdef_unique_object );
+</PRE>
+<P>
+<PRE>  $FS_dbdef_index_object = $dbdef_table-&gt;index;
+  $dbdef_table-&gt;index ( $FS_dbdef_index_object );
+</PRE>
+<P>
+<PRE>  @column_names = $dbdef-&gt;columns;
+</PRE>
+<P>
+<PRE>  $FS_dbdef_column_object = $dbdef-&gt;column;
+</PRE>
+<P>
+<PRE>  @sql_statements = $dbdef-&gt;sql_create_table;
+  @sql_statements = $dbdef-&gt;sql_create_table $datasrc;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+FS::dbdef_table objects represent a single database table.
+
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new</A></STRONG><DD>
+<P>
+Creates a new FS::dbdef_table object.
+
+<DT><STRONG><A NAME="item_addcolumn">addcolumn</A></STRONG><DD>
+<P>
+Adds this FS::dbdef_column object. 
+
+<DT><STRONG><A NAME="item_name">name</A></STRONG><DD>
+<P>
+Returns or sets the table name.
+
+<DT><STRONG><A NAME="item_primary_key">primary_key</A></STRONG><DD>
+<P>
+Returns or sets the primary key.
+
+<DT><STRONG><A NAME="item_unique">unique</A></STRONG><DD>
+<P>
+Returns or sets the FS::dbdef_unique object.
+
+<DT><STRONG><A NAME="item_index">index</A></STRONG><DD>
+<P>
+Returns or sets the FS::dbdef_index object.
+
+<DT><STRONG><A NAME="item_columns">columns</A></STRONG><DD>
+<P>
+Returns a list consisting of the names of all columns.
+
+<DT><STRONG><A NAME="item_column">column &quot;column&quot;</A></STRONG><DD>
+<P>
+Returns the column object (see <A HREF="../FS/dbdef_column.html">FS::dbdef_column</A>) for ``column''.
+
+<DT><STRONG><A NAME="item_sql_create_table">sql_create_table [ $datasrc ]</A></STRONG><DD>
+<P>
+Returns an array of SQL statments to create this table.
+
+<P>
+If passed a DBI <CODE>$datasrc</CODE> specifying <A HREF="../DBD/mysql.html">DBD::mysql</A>, will use MySQL-specific syntax. Non-standard syntax for other engines (if
+applicable) may also be supported in the future.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/dbdef.html">FS::dbdef</A>, <A HREF="../FS/dbdef_unique.html">FS::dbdef_unique</A>, <A HREF="../FS/dbdef_index.html">FS::dbdef_index</A>, <A HREF="../FS/dbdef_unique.html">FS::dbdef_unique</A>,
+<EM>DBI</EM>
+
+
+
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: dbdef_table.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/dbdef_unique.html b/htdocs/docs/man/FS/dbdef_unique.html
new file mode 100644
index 000000000..73c885c75
--- /dev/null
+++ b/htdocs/docs/man/FS/dbdef_unique.html
@@ -0,0 +1,58 @@
+<HTML>
+<HEAD>
+<TITLE>FS::dbdef_unique.pm - Unique object</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::dbdef_unique.pm - Unique object
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::dbdef_unique;
+</PRE>
+<P>
+<PRE>  # see FS::dbdef_colgroup methods
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+FS::dbdef_unique objects represent the unique indices of a database table (<A HREF="../FS/dbdef_table.html">FS::dbdef_table</A>). FS::dbdef_unique inherits from FS::dbdef_colgroup.
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+Is this empty subclass needed?
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/dbdef_colgroup.html">FS::dbdef_colgroup</A>, <A HREF="../FS/dbdef_record.html">FS::dbdef_record</A>, <A HREF="../FS/Record.html">FS::Record</A>
+
+
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/part_pkg.html b/htdocs/docs/man/FS/part_pkg.html
new file mode 100644
index 000000000..e36b5840c
--- /dev/null
+++ b/htdocs/docs/man/FS/part_pkg.html
@@ -0,0 +1,152 @@
+<HTML>
+<HEAD>
+<TITLE>FS::part_pkg - Object methods for part_pkg objects</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::part_pkg - Object methods for part_pkg objects
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::part_pkg;
+</PRE>
+<P>
+<PRE>  $record = new FS::part_pkg \%hash
+  $record = new FS::part_pkg { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $custom_record = $template_record-&gt;clone;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<PRE>  @pkg_svc = $record-&gt;pkg_svc;
+</PRE>
+<P>
+<PRE>  $svcnum = $record-&gt;svcpart;
+  $svcnum = $record-&gt;svcpart( 'svc_acct' );
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::part_pkg object represents a billing item definition. FS::part_pkg
+inherits from FS::Record. The following fields are currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_pkgpart">pkgpart - primary key (assigned automatically for new billing item definitions)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_pkg">pkg - Text name of this billing item definition (customer-viewable)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_comment">comment - Text name of this billing item definition (non-customer-viewable)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_setup">setup - Setup fee</A></STRONG><DD>
+<DT><STRONG><A NAME="item_freq">freq - Frequency of recurring fee</A></STRONG><DD>
+<DT><STRONG><A NAME="item_recur">recur - Recurring fee</A></STRONG><DD>
+</DL>
+<P>
+setup and recur are evaluated as Safe perl expressions. You can use numbers
+just as you would normally. More advanced semantics are not yet defined.
+
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new billing item definition. To add the billing item definition
+to the database, see <A HREF="#insert">insert</A>.
+
+<DT><STRONG><A NAME="item_clone">clone</A></STRONG><DD>
+<P>
+An alternate constructor. Creates a new billing item definition by
+duplicating an existing definition. A new pkgpart is assigned and `(CUSTOM)
+' is prepended to the comment field. To add the billing item definition to
+the database, see
+<A HREF="#insert">insert</A>.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this billing item definition to the database. If there is an error,
+returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Currently unimplemented.
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replaces OLD_RECORD with this one in the database. If there is an error,
+returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid billing item definition. If
+there is an error, returns the error, otherwise returns false. Called by
+the insert and replace methods.
+
+<DT><STRONG><A NAME="item_pkg_svc">pkg_svc</A></STRONG><DD>
+<P>
+Returns all FS::pkg_svc objects (see <A HREF="../FS/pkg_svc.html">FS::pkg_svc</A>) for this package definition.
+
+<DT><STRONG><A NAME="item_svcpart">svcpart [ SVCDB ]</A></STRONG><DD>
+<P>
+Returns the svcpart of a single service definition (see <A HREF="../FS/part_svc.html">FS::part_svc</A>) associated with this billing item definition (see <A HREF="../FS/pkg_svc.html">FS::pkg_svc</A>). Returns false if there not exactly one service definition with quantity
+1, or if SVCDB is specified and does not match the svcdb of the service
+definition, 
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: part_pkg.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+The delete method is unimplemented.
+
+<P>
+setup and recur semantics are not yet defined (and are implemented in
+FS::cust_bill. hmm.).
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>, <A HREF="../FS/type_pkgs.html">FS::type_pkgs</A>, <A HREF="../FS/pkg_svc.html">FS::pkg_svc</A>, <EM>Safe</EM>. schema.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/part_referral.html b/htdocs/docs/man/FS/part_referral.html
new file mode 100644
index 000000000..b6fd2ce89
--- /dev/null
+++ b/htdocs/docs/man/FS/part_referral.html
@@ -0,0 +1,113 @@
+<HTML>
+<HEAD>
+<TITLE>FS::part_referral - Object methods for part_referral objects</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::part_referral - Object methods for part_referral objects
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::part_referral;
+</PRE>
+<P>
+<PRE>  $record = new FS::part_referral \%hash
+  $record = new FS::part_referral { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::part_referral represents a referral - where a customer heard of your
+services. This can be used to track the effectiveness of a particular piece
+of advertising, for example. FS::part_referral inherits from FS::Record.
+The following fields are currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_refnum">refnum - primary key (assigned automatically for new referrals)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_referral">referral - Text name of this referral</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new referral. To add the referral to the database, see <A HREF="#insert">insert</A>.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this referral to the database. If there is an error, returns the
+error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Currently unimplemented.
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replaces OLD_RECORD with this one in the database. If there is an error,
+returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid referral. If there is an
+error, returns the error, otherwise returns false. Called by the insert and
+replace methods.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: part_referral.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+The delete method is unimplemented.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_main.html">FS::cust_main</A>, schema.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/part_svc.html b/htdocs/docs/man/FS/part_svc.html
new file mode 100644
index 000000000..fedcbd3bf
--- /dev/null
+++ b/htdocs/docs/man/FS/part_svc.html
@@ -0,0 +1,121 @@
+<HTML>
+<HEAD>
+<TITLE>FS::part_svc - Object methods for part_svc objects</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::part_svc - Object methods for part_svc objects
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::part_svc;
+</PRE>
+<P>
+<PRE>  $record = new FS::part_referral \%hash
+  $record = new FS::part_referral { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::part_svc represents a service definition. FS::part_svc inherits from
+FS::Record. The following fields are currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_svcpart">svcpart - primary key (assigned automatically for new service definitions)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_svc">svc - text name of this service definition</A></STRONG><DD>
+<DT><STRONG><A NAME="item_svcdb">svcdb - table used for this service.  See FS::svc_acct,
+FS::svc_domain, and FS::svc_acct_sm, among others.</A></STRONG><DD>
+<DT><STRONG><A NAME="item_svcdb_field">svcdb__field - Default or fixed value for field in svcdb.</A></STRONG><DD>
+<DT><STRONG><A NAME="item_svcdb_field_flag">svcdb__field_flag - defines svcdb__field action: null, `D' for default, or `F' for fixed</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new service definition. To add the service definition to the
+database, see <A HREF="#insert">insert</A>.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this service definition to the database. If there is an error, returns
+the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Currently unimplemented.
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replaces OLD_RECORD with this one in the database. If there is an error,
+returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid service definition. If there
+is an error, returns the error, otherwise returns false. Called by the
+insert and replace methods.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: part_svc.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+Delete is unimplemented.
+
+<P>
+The list of svc_* tables is hardcoded. When svc_acct_pop is renamed, this
+should be fixed.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/part_pkg.html">FS::part_pkg</A>, <A HREF="../FS/pkg_svc.html">FS::pkg_svc</A>, <A HREF="../FS/cust_svc.html">FS::cust_svc</A>,
+<A HREF="../FS/svc_acct.html">FS::svc_acct</A>, <A HREF="../FS/svc_acct_sm.html">FS::svc_acct_sm</A>, <A HREF="../FS/svc_domain.html">FS::svc_domain</A>, schema.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/pkg_svc.html b/htdocs/docs/man/FS/pkg_svc.html
new file mode 100644
index 000000000..7cd786354
--- /dev/null
+++ b/htdocs/docs/man/FS/pkg_svc.html
@@ -0,0 +1,125 @@
+<HTML>
+<HEAD>
+<TITLE>FS::pkg_svc - Object methods for pkg_svc records</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::pkg_svc - Object methods for pkg_svc records
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::pkg_svc;
+</PRE>
+<P>
+<PRE>  $record = new FS::pkg_svc \%hash;
+  $record = new FS::pkg_svc { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<PRE>  $part_pkg = $record-&gt;part_pkg;
+</PRE>
+<P>
+<PRE>  $part_svc = $record-&gt;part_svc;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::pkg_svc record links a billing item definition (see <A HREF="../FS/part_pkg.html">FS::part_pkg</A>) to a service definition (see <A HREF="../FS/part_svc.html">FS::part_svc</A>). FS::pkg_svc inherits from FS::Record. The following fields are currently
+supported:
+
+<DL>
+<DT><STRONG><A NAME="item_pkgpart">pkgpart - Billing item definition (see FS::part_pkg)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_svcpart">svcpart - Service definition (see FS::part_svc)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_quantity">quantity - Quantity of this service definition that this billing item
+definition includes</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Create a new record. To add the record to the database, see <A HREF="#insert">insert</A>.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this record to the database. If there is an error, returns the error,
+otherwise returns false.
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Deletes this record from the database. If there is an error, returns the
+error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replaces OLD_RECORD with this one in the database. If there is an error,
+returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid record. If there is an
+error, returns the error, otherwise returns false. Called by the insert and
+replace methods.
+
+<DT><STRONG><A NAME="item_part_pkg">part_pkg</A></STRONG><DD>
+<P>
+Returns the FS::part_pkg object (see <A HREF="../FS/part_pkg.html">FS::part_pkg</A>).
+
+<DT><STRONG><A NAME="item_part_svc">part_svc</A></STRONG><DD>
+<P>
+Returns the FS::part_svc object (see <A HREF="../FS/part_svc.html">FS::part_svc</A>).
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: pkg_svc.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/part_pkg.html">FS::part_pkg</A>, <A HREF="../FS/part_svc.html">FS::part_svc</A>, schema.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/svc_Common.html b/htdocs/docs/man/FS/svc_Common.html
new file mode 100644
index 000000000..d8d81a0a7
--- /dev/null
+++ b/htdocs/docs/man/FS/svc_Common.html
@@ -0,0 +1,109 @@
+<HTML>
+<HEAD>
+<TITLE>FS::svc_Common - Object method for all svc_ records</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::svc_Common - Object method for all svc_ records
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+use FS::svc_Common;
+
+<P>
+<CODE>@ISA</CODE> = <CODE>qw(</CODE> FS::svc_Common );
+
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+FS::svc_Common is intended as a base class for table-specific classes to
+inherit from, i.e. FS::svc_acct. FS::svc_Common inherits from FS::Record.
+
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this record to the database. If there is an error, returns the error,
+otherwise returns false.
+
+<P>
+The additional fields pkgnum and svcpart (see <A HREF="../FS/cust_svc.html">FS::cust_svc</A>) should be defined. An FS::cust_svc record will be created and inserted.
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Deletes this account from the database. If there is an error, returns the
+error, otherwise returns false.
+
+<P>
+The corresponding FS::cust_svc record will be deleted as well.
+
+<DT><STRONG><A NAME="item_setfixed">setfixed</A></STRONG><DD>
+<P>
+Sets any fixed fields for this service (see <A HREF="../FS/part_svc.html">FS::part_svc</A>). If there is an error, returns the error, otherwise returns the
+FS::part_svc object (use <CODE>ref()</CODE> to test the return). Usually
+called by the check method.
+
+<DT><STRONG><A NAME="item_setdefault">setdefault</A></STRONG><DD>
+<P>
+Sets all fields to their defaults (see <A HREF="../FS/part_svc.html">FS::part_svc</A>), overriding their current values. If there is an error, returns the
+error, otherwise returns the FS::part_svc object (use <CODE>ref()</CODE> to
+test the return).
+
+<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><DD>
+<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><DD>
+<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><DD>
+<P>
+Stubs - return false (no error) so derived classes don't need to define
+these methods. Called by the cancel method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: svc_Common.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+The setfixed method return value.
+
+<P>
+The new method should set defaults from part_svc (like the check method
+sets fixed values)?
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_svc.html">FS::cust_svc</A>, <A HREF="../FS/part_svc.html">FS::part_svc</A>, <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>, schema.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/svc_acct.html b/htdocs/docs/man/FS/svc_acct.html
new file mode 100644
index 000000000..4b307455e
--- /dev/null
+++ b/htdocs/docs/man/FS/svc_acct.html
@@ -0,0 +1,210 @@
+<HTML>
+<HEAD>
+<TITLE>FS::svc_acct - Object methods for svc_acct records</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::svc_acct - Object methods for svc_acct records
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::svc_acct;
+</PRE>
+<P>
+<PRE>  $record = new FS::svc_acct \%hash;
+  $record = new FS::svc_acct { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;suspend;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;unsuspend;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;cancel;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::svc_acct object represents an account. FS::svc_acct inherits from
+FS::svc_Common. The following fields are currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_svcnum">svcnum - primary key (assigned automatcially for new accounts)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_username">username</A></STRONG><DD>
+<DT><STRONG><A NAME="item__password">_password - generated if blank</A></STRONG><DD>
+<DT><STRONG><A NAME="item_popnum">popnum - Point of presence (see FS::svc_acct_pop)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_uid">uid</A></STRONG><DD>
+<DT><STRONG><A NAME="item_gid">gid</A></STRONG><DD>
+<DT><STRONG><A NAME="item_finger">finger - GECOS</A></STRONG><DD>
+<DT><STRONG><A NAME="item_dir">dir - set automatically if blank (and uid is not)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_shell">shell</A></STRONG><DD>
+<DT><STRONG><A NAME="item_quota">quota - (unimplementd)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_slipip">slipip - IP address</A></STRONG><DD>
+<DT><STRONG><A NAME="item_radius_Radius_Attribute">radius_Radius_Attribute - Radius-Attribute</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new account. To add the account to the database, see <A HREF="#insert">insert</A>.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this account to the database. If there is an error, returns the error,
+otherwise returns false.
+
+<P>
+The additional fields pkgnum and svcpart (see <A HREF="../FS/cust_svc.html">FS::cust_svc</A>) should be defined. An FS::cust_svc record will be created and inserted.
+
+<P>
+If the configuration value (see <A HREF="../FS/Conf.html">FS::Conf</A>) shellmachine exists, and the username, uid, and dir fields are defined,
+the command
+
+<P>
+<PRE>  useradd -d $dir -m -s $shell -u $uid $username
+</PRE>
+<P>
+is executed on shellmachine via ssh. This behaviour can be surpressed by
+setting $FS::svc_acct::nossh_hack true.
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Deletes this account from the database. If there is an error, returns the
+error, otherwise returns false.
+
+<P>
+The corresponding FS::cust_svc record will be deleted as well.
+
+<P>
+If the configuration value (see <A HREF="../FS/Conf.html">FS::Conf</A>) shellmachine exists, the command:
+
+<P>
+<PRE>  userdel $username
+</PRE>
+<P>
+is executed on shellmachine via ssh. This behaviour can be surpressed by
+setting $FS::svc_acct::nossh_hack true.
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replaces OLD_RECORD with this one in the database. If there is an error,
+returns the error, otherwise returns false.
+
+<P>
+If the configuration value (see <A HREF="../FS/Conf.html">FS::Conf</A>) shellmachine exists, and the dir field has changed, the command:
+
+<P>
+<PRE>  [ -d $old_dir ] &amp;&amp; (
+    chmod u+t $old_dir;
+    umask 022;
+    mkdir $new_dir;
+    cd $old_dir;
+    find . -depth -print | cpio -pdm $new_dir;
+    chmod u-t $new_dir;
+    chown -R $uid.$gid $new_dir;
+    rm -rf $old_dir
+  )
+</PRE>
+<P>
+is executed on shellmachine via ssh. This behaviour can be surpressed by
+setting $FS::svc_acct::nossh_hack true.
+
+<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><DD>
+<P>
+Suspends this account by prefixing *SUSPENDED* to the password. If there is
+an error, returns the error, otherwise returns false.
+
+<P>
+Called by the suspend method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
+
+<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><DD>
+<P>
+Unsuspends this account by removing *SUSPENDED* from the password. If there
+is an error, returns the error, otherwise returns false.
+
+<P>
+Called by the unsuspend method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
+
+<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><DD>
+<P>
+Just returns false (no error) for now.
+
+<P>
+Called by the cancel method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid service. If there is an
+error, returns the error, otherwise returns false. Called by the insert and
+replace methods.
+
+<P>
+Sets any fixed values; see <A HREF="../FS/part_svc.html">FS::part_svc</A>.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: svc_acct.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+The remote commands should be configurable.
+
+<P>
+The bits which ssh should fork before doing so.
+
+<P>
+The <CODE>$recref</CODE> stuff in sub check should be cleaned up.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/svc_Common.html">FS::svc_Common</A>, <A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/Conf.html">FS::Conf</A>, <A HREF="../FS/cust_svc.html">FS::cust_svc</A>,
+<A HREF="../FS/part_svc.html">FS::part_svc</A>, <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>, <A HREF="../FS/SSH.html">FS::SSH</A>, <EM>ssh</EM>, <A HREF="../FS/svc_acct_pop.html">FS::svc_acct_pop</A>, schema.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/svc_acct_pop.html b/htdocs/docs/man/FS/svc_acct_pop.html
new file mode 100644
index 000000000..0deee2eac
--- /dev/null
+++ b/htdocs/docs/man/FS/svc_acct_pop.html
@@ -0,0 +1,115 @@
+<HTML>
+<HEAD>
+<TITLE>FS::svc_acct_pop - Object methods for svc_acct_pop records</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::svc_acct_pop - Object methods for svc_acct_pop records
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::svc_acct_pop;
+</PRE>
+<P>
+<PRE>  $record = new FS::svc_acct_pop \%hash;
+  $record = new FS::svc_acct_pop { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::svc_acct object represents an point of presence. FS::svc_acct_pop
+inherits from FS::Record. The following fields are currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_popnum">popnum - primary key (assigned automatically for new accounts)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_city">city</A></STRONG><DD>
+<DT><STRONG><A NAME="item_state">state</A></STRONG><DD>
+<DT><STRONG><A NAME="item_ac">ac - area code</A></STRONG><DD>
+<DT><STRONG><A NAME="item_exch">exch - exchange</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new point of presence (if only it were that easy!). To add the
+point of presence to the database, see <A HREF="#insert">insert</A>.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this point of presence to the database. If there is an error, returns
+the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Removes this point of presence from the database.
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replaces OLD_RECORD with this one in the database. If there is an error,
+returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid point of presence. If there
+is an error, returns the error, otherwise returns false. Called by the
+insert and replace methods.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: svc_acct_pop.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+It should be renamed to part_pop.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF=".././FS/svc_acct.html#">the svc_acct manpage</A>, schema.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/svc_acct_sm.html b/htdocs/docs/man/FS/svc_acct_sm.html
new file mode 100644
index 000000000..2b8348544
--- /dev/null
+++ b/htdocs/docs/man/FS/svc_acct_sm.html
@@ -0,0 +1,172 @@
+<HTML>
+<HEAD>
+<TITLE>FS::svc_acct_sm - Object methods for svc_acct_sm records</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::svc_acct_sm - Object methods for svc_acct_sm records
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::svc_acct_sm;
+</PRE>
+<P>
+<PRE>  $record = new FS::svc_acct_sm \%hash;
+  $record = new FS::svc_acct_sm { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;suspend;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;unsuspend;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;cancel;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::svc_acct object represents a virtual mail alias. FS::svc_acct
+inherits from FS::Record. The following fields are currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_svcnum">svcnum - primary key (assigned automatcially for new accounts)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_domsvc">domsvc - svcnum of the virtual domain (see FS::svc_domain)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_domuid">domuid - uid of the target account (see FS::svc_acct)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_domuser">domuser - virtual username</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new virtual mail alias. To add the virtual mail alias to the
+database, see <A HREF="#insert">insert</A>.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this virtual mail alias to the database. If there is an error, returns
+the error, otherwise returns false.
+
+<P>
+The additional fields pkgnum and svcpart (see <A HREF="../FS/cust_svc.html">FS::cust_svc</A>) should be defined. An FS::cust_svc record will be created and inserted.
+
+<P>
+If the configuration values (see <A HREF="../FS/Conf.html">FS::Conf</A>) shellmachine and qmailmachines exist, and domuser is `*' (meaning a
+catch-all mailbox), the command:
+
+<P>
+<PRE>  [ -e $dir/.qmail-$qdomain-default ] || {
+    touch $dir/.qmail-$qdomain-default;
+    chown $uid:$gid $dir/.qmail-$qdomain-default;
+  }
+</PRE>
+<P>
+is executed on shellmachine via ssh (see <EM>dot-qmail</EM>). This behaviour can be surpressed by setting $FS::svc_acct_sm::nossh_hack
+true.
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Deletes this virtual mail alias from the database. If there is an error,
+returns the error, otherwise returns false.
+
+<P>
+The corresponding FS::cust_svc record will be deleted as well.
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replaces OLD_RECORD with this one in the database. If there is an error,
+returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><DD>
+<P>
+Just returns false (no error) for now.
+
+<P>
+Called by the suspend method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
+
+<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><DD>
+<P>
+Just returns false (no error) for now.
+
+<P>
+Called by the unsuspend method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
+
+<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><DD>
+<P>
+Just returns false (no error) for now.
+
+<P>
+Called by the cancel method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid virtual mail alias. If there
+is an error, returns the error, otherwise returns false. Called by the
+insert and replace methods.
+
+<P>
+Sets any fixed values; see <A HREF="../FS/part_svc.html">FS::part_svc</A>.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: svc_acct_sm.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+The remote commands should be configurable.
+
+<P>
+The <CODE>$recref</CODE> stuff in sub check should be cleaned up.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/Conf.html">FS::Conf</A>, <A HREF="../FS/cust_svc.html">FS::cust_svc</A>, <A HREF="../FS/part_svc.html">FS::part_svc</A>, <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>,
+<A HREF="../FS/svc_acct.html">FS::svc_acct</A>, <A HREF="../FS/svc_domain.html">FS::svc_domain</A>, <A HREF="../FS/SSH.html">FS::SSH</A>, <EM>ssh</EM>, <EM>dot-qmail</EM>, schema.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/svc_domain.html b/htdocs/docs/man/FS/svc_domain.html
new file mode 100644
index 000000000..9b5e1a53c
--- /dev/null
+++ b/htdocs/docs/man/FS/svc_domain.html
@@ -0,0 +1,196 @@
+<HTML>
+<HEAD>
+<TITLE>FS::svc_domain - Object methods for svc_domain records</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::svc_domain - Object methods for svc_domain records
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::svc_domain;
+</PRE>
+<P>
+<PRE>  $record = new FS::svc_domain \%hash;
+  $record = new FS::svc_domain { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;suspend;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;unsuspend;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;cancel;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::svc_domain object represents a domain. FS::svc_domain inherits from
+FS::svc_Common. The following fields are currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_svcnum">svcnum - primary key (assigned automatically for new accounts)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_domain">domain</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Creates a new domain. To add the domain to the database, see <A HREF="#insert">insert</A>.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this domain to the database. If there is an error, returns the error,
+otherwise returns false.
+
+<P>
+The additional fields <EM>pkgnum</EM> and <EM>svcpart</EM> (see <A HREF="../FS/cust_svc.html">FS::cust_svc</A>) should be defined. An FS::cust_svc record will be created and inserted.
+
+<P>
+The additional field <EM>action</EM> should be set to <EM>N</EM> for new domains or <EM>M</EM>
+for transfers.
+
+<P>
+A registration or transfer email will be submitted unless
+$FS::svc_domain::whois_hack is true.
+
+<P>
+The additional field <EM>email</EM> can be used to manually set the admin contact email address on this email.
+Otherwise, the svc_acct records for this package (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>) are searched. If there is exactly one svc_acct record in the same
+package, it is automatically used. Otherwise an error is returned.
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Deletes this domain from the database. If there is an error, returns the
+error, otherwise returns false.
+
+<P>
+The corresponding FS::cust_svc record will be deleted as well.
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replaces OLD_RECORD with this one in the database. If there is an error,
+returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><DD>
+<P>
+Just returns false (no error) for now.
+
+<P>
+Called by the suspend method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
+
+<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><DD>
+<P>
+Just returns false (no error) for now.
+
+<P>
+Called by the unsuspend method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
+
+<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><DD>
+<P>
+Just returns false (no error) for now.
+
+<P>
+Called by the cancel method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid domain. If there is an
+error, returns the error, otherwise returns false. Called by the insert and
+replace methods.
+
+<P>
+Sets any fixed values; see <A HREF="../FS/part_svc.html">FS::part_svc</A>.
+
+<DT><STRONG><A NAME="item_whois">whois</A></STRONG><DD>
+<P>
+Returns the Net::Whois object corresponding to this domain, or undef if the
+domain is not found in whois.
+
+<P>
+(If $FS::svc_domain::whois_hack is true, returns that in all cases
+instead.)
+
+<DT><STRONG><A NAME="item__whois">_whois</A></STRONG><DD>
+<P>
+Depriciated.
+
+<DT><STRONG><A NAME="item_submit_internic">submit_internic</A></STRONG><DD>
+<P>
+Submits a registration email for this domain.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: svc_domain.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+All BIND/DNS fields should be included (and exported).
+
+<P>
+Delete doesn't send a registration template.
+
+<P>
+All registries should be supported.
+
+<P>
+Should change action to a real field.
+
+<P>
+The <CODE>$recref</CODE> stuff in sub check should be cleaned up.
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/svc_Common.html">FS::svc_Common</A>, <A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/Conf.html">FS::Conf</A>, <A HREF="../FS/cust_svc.html">FS::cust_svc</A>,
+<A HREF="../FS/part_svc.html">FS::part_svc</A>, <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>, <A HREF="../FS/SSH.html">FS::SSH</A>, <A HREF="../Net/Whois.html">Net::Whois</A>, <EM>ssh</EM>,
+<EM>dot-qmail</EM>, schema.html from the base documentation, config.html from the base
+documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/type_pkgs.html b/htdocs/docs/man/FS/type_pkgs.html
new file mode 100644
index 000000000..aa55cce9d
--- /dev/null
+++ b/htdocs/docs/man/FS/type_pkgs.html
@@ -0,0 +1,109 @@
+<HTML>
+<HEAD>
+<TITLE>FS::type_pkgs - Object methods for type_pkgs records</TITLE>
+<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#METHODS">METHODS</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::type_pkgs - Object methods for type_pkgs records
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::type_pkgs;
+</PRE>
+<P>
+<PRE>  $record = new FS::type_pkgs \%hash;
+  $record = new FS::type_pkgs { 'column' =&gt; 'value' };
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;insert;
+</PRE>
+<P>
+<PRE>  $error = $new_record-&gt;replace($old_record);
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;delete;
+</PRE>
+<P>
+<PRE>  $error = $record-&gt;check;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+An FS::type_pkgs record links an agent type (see <A HREF="../FS/agent_type.html">FS::agent_type</A>) to a billing item definition (see <A HREF="../FS/part_pkg.html">FS::part_pkg</A>). FS::type_pkgs inherits from FS::Record. The following fields are
+currently supported:
+
+<DL>
+<DT><STRONG><A NAME="item_typenum">typenum - Agent type, see FS::agent_type</A></STRONG><DD>
+<DT><STRONG><A NAME="item_pkgpart">pkgpart - Billing item definition, see FS::part_pkg</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="METHODS">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
+<P>
+Create a new record. To add the record to the database, see <A HREF="#insert">insert</A>.
+
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
+<P>
+Adds this record to the database. If there is an error, returns the error,
+otherwise returns false.
+
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
+<P>
+Deletes this record from the database. If there is an error, returns the
+error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
+<P>
+Replaces OLD_RECORD with this one in the database. If there is an error,
+returns the error, otherwise returns false.
+
+<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
+<P>
+Checks all fields to make sure this is a valid record. If there is an
+error, returns the error, otherwise returns false. Called by the insert and
+replace methods.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: type_pkgs.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/agent_type.html">FS::agent_type</A>, <A HREF="../FS/part_pkgs.html">FS::part_pkgs</A>, schema.html from the base documentation.
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/Invoice.txt b/htdocs/docs/man/Invoice.txt
deleted file mode 100644
index d0ca37fd0..000000000
--- a/htdocs/docs/man/Invoice.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-NAME
-    FS::Invoice - Legacy stub
-
-SYNOPSIS
-    The functionality of FS::Invoice has been integrated in
-    FS::cust_bill.
-
-HISTORY
-    ivan@voicenet.com 97-jun-25 - 27
-
-    maybe should be changed to be OO-functions on $cust_bill
-    objects? (instead of passing invnum, ugh).
-
-    ISA cust_bill and return inovice instead of passing filehandle
-    ivan@sisd.com 98-mar-13 (add postscript output!)
-
-    close our kid when we're done ivan@sisd.com 98-jun-4
-
-    separated code which shuffled data from code which formatted.
-    (so i could) fixed past due notices showing up when balance due
-    =< 0 return address comes from /var/spool/freeside/conf/address
-    ivan@sisd.com 98-jul-2
-
-    pod ivan@sisd.com 98-sep-20something
-
-    s/ISA/@ISA/ in use vars ivan@sisd.com 98-sep-27
-
diff --git a/htdocs/docs/man/Record.txt b/htdocs/docs/man/Record.txt
deleted file mode 100644
index 1708e3c67..000000000
--- a/htdocs/docs/man/Record.txt
+++ /dev/null
@@ -1,405 +0,0 @@
-NAME
-    FS::Record - Database record objects
-
-SYNOPSIS
-        use FS::Record;
-        use FS::Record qw(dbh fields qsearch qsearchs dbdef);
-
-        $record = new FS::Record 'table', \%hash;
-        $record = new FS::Record 'table', { 'column' => 'value', ... };
-
-        $record  = qsearchs FS::Record 'table', \%hash;
-        $record  = qsearchs FS::Record 'table', { 'column' => 'value', ... };
-        @records = qsearch  FS::Record 'table', \%hash; 
-        @records = qsearch  FS::Record 'table', { 'column' => 'value', ... };
-
-        $table = $record->table;
-        $dbdef_table = $record->dbdef_table;
-
-        $value = $record->get('column');
-        $value = $record->getfield('column');
-        $value = $record->column;
-
-        $record->set( 'column' => 'value' );
-        $record->setfield( 'column' => 'value' );
-        $record->column('value');
-
-        %hash = $record->hash;
-
-        $hashref = $record->hashref;
-
-        $error = $record->insert;
-        #$error = $record->add; #depriciated
-
-        $error = $record->delete;
-        #$error = $record->del; #depriciated
-
-        $error = $new_record->replace($old_record);
-        #$error = $new_record->rep($old_record); #depriciated
-
-        $value = $record->unique('column');
-
-        $value = $record->ut_float('column');
-        $value = $record->ut_number('column');
-        $value = $record->ut_numbern('column');
-        $value = $record->ut_money('column');
-        $value = $record->ut_text('column');
-        $value = $record->ut_textn('column');
-        $value = $record->ut_alpha('column');
-        $value = $record->ut_alphan('column');
-        $value = $record->ut_phonen('column');
-        $value = $record->ut_anythingn('column');
-
-        $dbdef = reload_dbdef;
-        $dbdef = reload_dbdef "/non/standard/filename";
-        $dbdef = dbdef;
-
-        $quoted_value = _quote($value,'table','field');
-
-        #depriciated
-        $fields = hfields('table');
-        if ( $fields->{Field} ) { # etc.
-
-        @fields = fields 'table'; #as a subroutine
-        @fields = $record->fields; #as a method call
-
-DESCRIPTION
-    (Mostly) object-oriented interface to database records. Records
-    are currently implemented on top of DBI. FS::Record is intended
-    as a base class for table-specific classes to inherit from, i.e.
-    FS::cust_main.
-
-CONSTRUCTORS
-    new [ TABLE, ] HASHREF
-        Creates a new record. It doesn't store it in the database,
-        though. See the section on "insert" for that.
-
-        Note that the object stores this hash reference, not a
-        distinct copy of the hash it points to. You can ask the
-        object for a copy with the *hash* method.
-
-        TABLE can only be omitted when a dervived class overrides
-        the table method.
-
-    qsearch TABLE, HASHREF
-        Searches the database for all records matching (at least)
-        the key/value pairs in HASHREF. Returns all the records
-        found as `FS::TABLE' objects if that module is loaded (i.e.
-        via `use FS::cust_main;'), otherwise returns FS::Record
-        objects.
-
-    qsearchs TABLE, HASHREF
-        Same as qsearch, except that if more than one record
-        matches, it carps but returns the first. If this happens,
-        you either made a logic error in asking for a single item,
-        or your data is corrupted.
-
-METHODS
-    table
-        Returns the table name.
-
-    dbdef_table
-        Returns the FS::dbdef_table object for the table.
-
-    get, getfield COLUMN
-        Returns the value of the column/field/key COLUMN.
-
-    set, setfield COLUMN, VALUE
-        Sets the value of the column/field/key COLUMN to VALUE.
-        Returns VALUE.
-
-    AUTLOADED METHODS
-        $record->column is a synonym for $record->get('column');
-
-        $record->column('value') is a synonym for $record-
-        >set('column','value');
-
-    hash
-        Returns a list of the column/value pairs, usually for
-        assigning to a new hash.
-
-        To make a distinct duplicate of an FS::Record object, you
-        can do:
-
-            $new = new FS::Record ( $old->table, { $old->hash } );
-
-    hashref
-        Returns a reference to the column/value hash.
-
-    insert
-        Inserts this record to the database. If there is an error,
-        returns the error, otherwise returns false.
-
-    add Depriciated (use insert instead).
-
-    delete
-        Delete this record from the database. If there is an error,
-        returns the error, otherwise returns false.
-
-    del Depriciated (use delete instead).
-
-    replace OLD_RECORD
-        Replace the OLD_RECORD with this one in the database. If
-        there is an error, returns the error, otherwise returns
-        false.
-
-    rep Depriciated (use replace instead).
-
-    check
-        Not yet implemented, croaks. Derived classes should provide
-        a check method.
-
-    unique COLUMN
-        Replaces COLUMN in record with a unique number. Called by
-        the add method on primary keys and single-field unique
-        columns (see the FS::dbdef_table manpage). Returns the new
-        value.
-
-    ut_float COLUMN
-        Check/untaint floating point numeric data: 1.1, 1, 1.1e10,
-        1e10. May not be null. If there is an error, returns the
-        error, otherwise returns false.
-
-    ut_number COLUMN
-        Check/untaint simple numeric data (whole numbers). May not
-        be null. If there is an error, returns the error, otherwise
-        returns false.
-
-    ut_numbern COLUMN
-        Check/untaint simple numeric data (whole numbers). May be
-        null. If there is an error, returns the error, otherwise
-        returns false.
-
-    ut_money COLUMN
-        Check/untaint monetary numbers. May be negative. Set to 0 if
-        null. If there is an error, returns the error, otherwise
-        returns false.
-
-    ut_text COLUMN
-        Check/untaint text. Alphanumerics, spaces, and the following
-        punctuation symbols are currently permitted: ! @ # $ % & ( )
-        - + ; : ' " , . ? / May not be null. If there is an error,
-        returns the error, otherwise returns false.
-
-    ut_textn COLUMN
-        Check/untaint text. Alphanumerics, spaces, and the following
-        punctuation symbols are currently permitted: ! @ # $ % & ( )
-        - + ; : ' " , . ? / May be null. If there is an error,
-        returns the error, otherwise returns false.
-
-    ut_alpha COLUMN
-        Check/untaint alphanumeric strings (no spaces). May not be
-        null. If there is an error, returns the error, otherwise
-        returns false.
-
-    ut_alpha COLUMN
-        Check/untaint alphanumeric strings (no spaces). May be null.
-        If there is an error, returns the error, otherwise returns
-        false.
-
-    ut_phonen COLUMN
-        Check/untaint phone numbers. May be null. If there is an
-        error, returns the error, otherwise returns false.
-
-    ut_anything COLUMN
-        Untaints arbitrary data. Be careful.
-
-    fields [ TABLE ]
-        This can be used as both a subroutine and a method call. It
-        returns a list of the columns in this record's table, or an
-        explicitly specified table. (See the dbdef_table manpage).
-
-SUBROUTINES
-    reload_dbdef([FILENAME])
-            Load a database definition (see the FS::dbdef manpage),
-            optionally from a non-default filename. This command is
-            executed at startup unless *$FS::Record::setup_hack* is
-            true. Returns a FS::dbdef object.
-
-    dbdef   Returns the current database definition. See the FS::dbdef
-            manpage.
-
-    _quote VALUE, TABLE, COLUMN
-            This is an internal function used to construct SQL
-            statements. It returns VALUE DBI-quoted (see the section
-            on "quote" in the DBI manpage) unless VALUE is a number
-            and the column type (see the dbdef_column manpage) does
-            not end in `char' or `binary'.
-
-    hfields TABLE
-            This is depriciated. Don't use it.
-
-            It returns a hash-type list with the fields of this
-            record's table set true.
-
-VERSION
-        $Id: Record.txt,v 1.5 1999-04-08 13:39:31 ivan Exp $
-
-BUGS
-        This module should probably be renamed, since much of the
-        functionality is of general use. It is not completely unlike
-        Adapter::DBI (see below).
-
-        Exported qsearch and qsearchs should be depriciated in favor
-        of method calls (against an FS::Record object like the old
-        search and searchs that qsearch and qsearchs were on top
-        of.)
-
-        The whole fields / hfields mess should be removed.
-
-        The various WHERE clauses should be subroutined.
-
-        table string should be depriciated in favor of
-        FS::dbdef_table.
-
-        No doubt we could benefit from a Tied hash. Documenting how
-        exists / defined true maps to the database (and WHERE
-        clauses) would also help.
-
-        The ut_ methods should ask the dbdef for a default length.
-
-        ut_sqltype (like ut_varchar) should all be defined
-
-        A fallback check method should be provided whith uses the
-        dbdef.
-
-        The ut_money method assumes money has two decimal digits.
-
-        The Pg money kludge in the new method only strips `$'.
-
-        The ut_phonen method assumes US-style phone numbers.
-
-        The _quote function should probably use ut_float instead of
-        a regex.
-
-        All the subroutines probably should be methods, here or
-        elsewhere.
-
-        Probably should borrow/use some dbdef methods where
-        appropriate (like sub fields)
-
-SEE ALSO
-        the FS::dbdef manpage, the FS::UID manpage, the DBI manpage
-
-        Adapter::DBI from Ch. 11 of Advanced Perl Programming by
-        Sriram Srinivasan.
-
-HISTORY
-        ivan@voicenet.com 97-jun-2 - 9, 19, 25, 27, 30
-
-        DBI version ivan@sisd.com 97-nov-8 - 12
-
-        cleaned up, added autoloaded $self->any_field calls, moved
-        DBI login stuff to FS::UID ivan@sisd.com 97-nov-21-23
-
-        since AUTO_INCREMENT is MySQL specific, use my own unique
-        number generator (again) ivan@sisd.com 97-dec-4
-
-        untaint $user in unique (web demo hack...bah) make unique
-        skip multiple-field unique's from dbdef ivan@sisd.com 97-
-        dec-11
-
-        merge with FS::Search, which after all was just alternate
-        constructors for FS::Record objects. Makes lots of things
-        cleaner. :) ivan@sisd.com 97-dec-13
-
-        use FS::dbdef::primary key in replace searches, hopefully
-        for all practical purposes the string/number problem in SQL
-        statements should be gone? (SQL bites) ivan@sisd.com 98-jan-
-        20
-
-        Put all SQL statments in $statment before we $sth=$dbh-
-        >prepare( them, for debugging reasons (warn $statement)
-        ivan@sisd.com 98-feb-19
-
-        (sigh)... use dbdef type (char, etc.) instead of a regex to
-        decide what to quote in _quote (more sillines...) SQL bites.
-        ivan@sisd.com 98-feb-20
-
-        more friendly error messages ivan@sisd.com 98-mar-13
-
-        Added import of datasrc from FS::UID to allow Pg6.3 to work
-        Added code to right-trim strings read from Pg6.3 databases
-        Modified 'add' to only insert fields that actually have data
-        Added ut_float to handle floating point numbers (for sales
-        tax). Pg6.3 does not have a "SHOW FIELDS" statement, so I
-        faked it 8). bmccane@maxbaud.net 98-apr-3
-
-        commented out Pg wrapper around `` Modified 'add' to only
-        insert fields that actually have data '' ivan@sisd.com 98-
-        apr-16
-
-        dbdef usage changes ivan@sisd.com 98-jun-1
-
-        sub fields now asks dbdef, not database ivan@sisd.com 98-
-        jun-2
-
-        added debugging method ->_dump ivan@sisd.com 98-jun-16
-
-        use FS::dbdef::primary key in delete searches as well as
-        replace searches (SQL still bites) ivan@sisd.com 98-jun-22
-
-        sub dbdef_table ivan@sisd.com 98-jun-28
-
-        removed Pg wrapper around `` Modified 'add' to only insert
-        fields that actually have data '' ivan@sisd.com 98-jul-14
-
-        sub fields croaks on errors ivan@sisd.com 98-jul-17
-
-        $rc eq '0E0' doesn't mean we couldn't delete for all rdbmss
-        ivan@sisd.com 98-jul-18
-
-        commented out code to right-trim strings read from Pg6.3
-        databases; ChopBlanks is in UID.pm ivan@sisd.com 98-aug-16
-
-        added code (with Pg wrapper) to deal with Pg money fields
-        ivan@sisd.com 98-aug-18
-
-        added pod documentation ivan@sisd.com 98-sep-6
-
-        ut_phonen got ''; at the end ivan@sisd.com 98-sep-27
-
-        $Log: Record.txt,v $
-        Revision 1.5  1999-04-08 13:39:31  ivan
-        convert from pod for 1.2.0 release
- Revision 1.15 1999/04/08 12:08:59 ivan
-        fix up PostgreSQL money fields so you can actually use them
-        as numbers. bah.
-
-        Revision 1.14 1999/04/07 14:58:31 ivan more kludges to get
-        around different null/empty handling in Perl vs. MySQL vs.
-        PostgreSQL etc.
-
-        Revision 1.13 1999/03/29 11:55:43 ivan eliminate warnings in
-        ut_money
-
-        Revision 1.12 1999/01/25 12:26:06 ivan yet more mod_perl
-        stuff
-
-        Revision 1.11 1999/01/18 09:22:38 ivan changes to track
-        email addresses for email invoicing
-
-        Revision 1.10 1998/12/29 11:59:33 ivan mostly properly OO,
-        some work still to be done with svc_ stuff
-
-        Revision 1.9 1998/11/21 07:26:45 ivan "Records identical"
-        carp tells us it is just a warning.
-
-        Revision 1.8 1998/11/15 11:02:04 ivan bugsquash
-
-        Revision 1.7 1998/11/15 10:56:31 ivan qsearch gets sames "IS
-        NULL" semantics as other WHERE clauses
-
-        Revision 1.6 1998/11/15 05:31:03 ivan bugfix for new config
-        layout
-
-        Revision 1.5 1998/11/13 09:56:51 ivan change configuration
-        file layout to support multiple distinct databases (with own
-        set of config files, export, etc.)
-
-        Revision 1.4 1998/11/10 07:45:25 ivan doc clarification
-
-        Revision 1.2 1998/11/07 05:17:18 ivan In sub new, Pg wrapper
-        for money fields from dbdef (FS::Record::fields $table), not
-        keys of supplied hashref.
-
diff --git a/htdocs/docs/man/SSH.txt b/htdocs/docs/man/SSH.txt
deleted file mode 100644
index b6d205b55..000000000
--- a/htdocs/docs/man/SSH.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-NAME
-    FS::SSH - Subroutines to call ssh and scp
-
-SYNOPSIS
-      use FS::SSH qw(ssh scp issh iscp sshopen2 sshopen3);
-
-      ssh($host, $command);
-
-      issh($host, $command);
-
-      scp($source, $destination);
-
-      iscp($source, $destination);
-
-      sshopen2($host, $reader, $writer, $command);
-
-      sshopen3($host, $reader, $writer, $error, $command);
-
-DESCRIPTION
-      Simple wrappers around ssh and scp commands.
-
-SUBROUTINES
-    ssh HOST, COMMAND
-        Calls ssh in batch mode.
-
-    issh HOST, COMMAND
-        Prints the ssh command to be executed, waits for the user to
-        confirm, and (optionally) executes the command.
-
-    scp SOURCE, DESTINATION
-        Calls scp in batch mode.
-
-    iscp SOURCE, DESTINATION
-        Prints the scp command to be executed, waits for the user to
-        confirm, and (optionally) executes the command.
-
-    sshopen2 HOST, READER, WRITER, COMMAND
-        Connects the supplied filehandles to the ssh process (in
-        batch mode).
-
-    sshopen3 HOST, WRITER, READER, ERROR, COMMAND
-        Connects the supplied filehandles to the ssh process (in
-        batch mode).
-
-BUGS
-        Not OO.
-
-        scp stuff should transparantly use rsync-over-ssh instead.
-
-SEE ALSO
-        the ssh manpage, the scp manpage, the IPC::Open2 manpage,
-        the IPC::Open3 manpage
-
-HISTORY
-        ivan@voicenet.com 97-jul-17
-
-        added sshopen2 and sshopen3 ivan@sisd.com 98-mar-9
-
-        added iscp ivan@sisd.com 98-jul-25 now iscp asks y/n, issh
-        and took out path ivan@sisd.com 98-jul-30
-
-        pod ivan@sisd.com 98-sep-21
-
diff --git a/htdocs/docs/man/UID.txt b/htdocs/docs/man/UID.txt
deleted file mode 100644
index efe3b6670..000000000
--- a/htdocs/docs/man/UID.txt
+++ /dev/null
@@ -1,140 +0,0 @@
-NAME
-    FS::UID - Subroutines for database login and assorted other
-    stuff
-
-SYNOPSIS
-      use FS::UID qw(adminsuidsetup cgisuidsetup dbh datasrc getotaker
-      checkeuid checkruid swapuid);
-
-      adminsuidsetup $user;
-
-      $cgi = new CGI;
-      $dbh = cgisuidsetup($cgi);
-
-      $dbh = dbh;
-
-      $datasrc = datasrc;
-
-DESCRIPTION
-    Provides a hodgepodge of subroutines.
-
-SUBROUTINES
-    adminsuidsetup USER
-        Sets the user to USER (see config.html from the base
-        documentation). Cleans the environment. Make sure the script
-        is running as freeside, or setuid freeside. Opens a
-        connection to the database. Swaps real and effective UIDs.
-        Runs any defined callbacks (see below). Returns the DBI
-        database handle (usually you don't need this).
-
-    cgisuidsetup CGI_object
-        Stores the CGI (see the CGI manpage) object for later use.
-        (CGI::Base is depriciated) Runs adminsuidsetup.
-
-    cgi Returns the CGI (see the CGI manpage) object.
-
-    dbh Returns the DBI database handle.
-
-    datasrc
-        Returns the DBI data source.
-
-    getotaker
-        Returns the current Freeside user.
-
-    cgisetotaker
-        Sets and returns the CGI REMOTE_USER. $cgi should be defined
-        as a CGI.pm object. Support for CGI::Base and derived
-        classes is depriciated.
-
-    checkeuid
-        Returns true if effective UID is that of the freeside user.
-
-    checkruid
-        Returns true if the real UID is that of the freeside user.
-
-    swapuid
-        Swaps real and effective UIDs.
-
-    getsecrets [ USER ]
-        Sets the user to USER, if supplied. Sets and returns the DBI
-        datasource, username and password for this user from the
-        `/usr/local/etc/freeside/mapsecrets' file.
-
-CALLBACKS
-    Warning: this interface is likely to change in future releases.
-
-    A package can install a callback to be run in adminsuidsetup by
-    putting a coderef into the hash %FS::UID::callback :
-
-        $coderef = sub { warn "Hi, I'm returning your call!" };
-        $FS::UID::callback{'Package::Name'};
-
-VERSION
-    $Id: UID.txt,v 1.4 1999-04-08 13:39:31 ivan Exp $
-
-BUGS
-    Too many package-global variables.
-
-    Not OO.
-
-    No capabilities yet. When mod_perl and Authen::DBI are
-    implemented, cgisuidsetup will go away as well.
-
-    Goes through contortions to support non-OO syntax with multiple
-    datasrc's.
-
-    Callbacks are inelegant.
-
-SEE ALSO
-    the FS::Record manpage, the CGI manpage, the DBI manpage,
-    config.html from the base documentation.
-
-HISTORY
-    ivan@voicenet.com 97-jun-4 - 9 untaint otaker ivan@voicenet.com
-    97-jul-7
-
-    generalize and auto-get uid (getotaker still needs to be db'ed)
-    ivan@sisd.com 97-nov-10
-
-    &cgisuidsetup logs into database. other cleaning. ivan@sisd.com
-    97-nov-22,23
-
-    &adminsuidsetup logs into database with otaker='freeside' (for
-    automated tasks like billing) ivan@sisd.com 97-dec-13
-
-    added sub datasrc for fs-setup ivan@sisd.com 98-feb-21
-
-    datasrc, user and pass now come from conf/secrets ivan@sisd.com
-    98-jun-28
-
-    added ChopBlanks to DBI call (see man DBI) ivan@sisd.com 98-aug-
-    16
-
-    pod, use FS::Conf, implemented cgisuidsetup as adminsuidsetup,
-    inlined suidsetup ivan@sisd.com 98-sep-12
-
-    $Log: UID.txt,v $
-    Revision 1.4  1999-04-08 13:39:31  ivan
-    convert from pod for 1.2.0 release
- Revision 1.8 1999/02/23 07:23:23 ivan oops,
-    don't comment out &swapuid in &adminsuidsetup!
-
-    Revision 1.7 1999/01/18 09:22:40 ivan changes to track email
-    addresses for email invoicing
-
-    Revision 1.6 1998/11/15 05:27:48 ivan bugfix for new
-    configuration layout
-
-    Revision 1.5 1998/11/15 00:51:51 ivan eliminated some warnings
-    on certain fatal errors (well, it is less confusing)
-
-    Revision 1.4 1998/11/13 09:56:52 ivan change configuration file
-    layout to support multiple distinct databases (with own set of
-    config files, export, etc.)
-
-    Revision 1.3 1998/11/08 10:45:42 ivan got sub cgi for FS::CGI
-
-    Revision 1.2 1998/11/08 09:38:43 ivan cgisuidsetup complains if
-    you pass it a isa CGI::Base instead of an isa CGI (first step in
-    migrating from CGI-modules to CGI.pm)
-
diff --git a/htdocs/docs/man/agent.txt b/htdocs/docs/man/agent.txt
deleted file mode 100644
index 13a4f0c4b..000000000
--- a/htdocs/docs/man/agent.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-NAME
-    FS::agent - Object methods for agent records
-
-SYNOPSIS
-      use FS::agent;
-
-      $record = new FS::agent \%hash;
-      $record = new FS::agent { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-DESCRIPTION
-    An FS::agent object represents an agent. Every customer has an
-    agent. Agents can be used to track things like resellers or
-    salespeople. FS::agent inherits from FS::Record. The following
-    fields are currently supported:
-
-    agemtnum - primary key (assigned automatically for new agents)
-    agent - Text name of this agent
-    typenum - Agent type.  See the FS::agent_type manpage
-    prog - For future use.
-    freq - For future use.
-METHODS
-    new HASHREF
-        Creates a new agent. To add the agent to the database, see
-        the section on "insert".
-
-    insert
-        Adds this agent to the database. If there is an error,
-        returns the error, otherwise returns false.
-
-    delete
-        Deletes this agent from the database. Only agents with no
-        customers can be deleted. If there is an error, returns the
-        error, otherwise returns false.
-
-    replace OLD_RECORD
-        Replaces OLD_RECORD with this one in the database. If there
-        is an error, returns the error, otherwise returns false.
-
-    check
-        Checks all fields to make sure this is a valid agent. If
-        there is an error, returns the error, otherwise returns
-        false. Called by the insert and replace methods.
-
-VERSION
-    $Id: agent.txt,v 1.3 1999-04-08 13:39:31 ivan Exp $
-
-BUGS
-SEE ALSO
-    the FS::Record manpage, the FS::agent_type manpage, the
-    FS::cust_main manpage, schema.html from the base documentation.
-
-HISTORY
-    Class dealing with agent (resellers)
-
-    ivan@sisd.com 97-nov-13, 97-dec-10
-
-    pod, added check in ->delete ivan@sisd.com 98-sep-22
-
diff --git a/htdocs/docs/man/agent_type.txt b/htdocs/docs/man/agent_type.txt
deleted file mode 100644
index 5983fee88..000000000
--- a/htdocs/docs/man/agent_type.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-NAME
-    FS::agent_type - Object methods for agent_type records
-
-SYNOPSIS
-      use FS::agent_type;
-
-      $record = new FS::agent_type \%hash;
-      $record = new FS::agent_type { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-DESCRIPTION
-    An FS::agent_type object represents an agent type. Every agent
-    (see the FS::agent manpage) has an agent type. Agent types
-    define which packages (see the FS::part_pkg manpage) may be
-    purchased by customers (see the FS::cust_main manpage), via
-    FS::type_pkgs records (see the FS::type_pkgs manpage).
-    FS::agent_type inherits from FS::Record. The following fields
-    are currently supported:
-
-    typenum - primary key (assigned automatically for new agent types)
-    atype - Text name of this agent type
-METHODS
-    new HASHREF
-        Creates a new agent type. To add the agent type to the
-        database, see the section on "insert".
-
-    insert
-        Adds this agent type to the database. If there is an error,
-        returns the error, otherwise returns false.
-
-    delete
-        Deletes this agent type from the database. Only agent types
-        with no agents can be deleted. If there is an error, returns
-        the error, otherwise returns false.
-
-    replace OLD_RECORD
-        Replaces OLD_RECORD with this one in the database. If there
-        is an error, returns the error, otherwise returns false.
-
-    check
-        Checks all fields to make sure this is a valid agent type.
-        If there is an error, returns the error, otherwise returns
-        false. Called by the insert and replace methods.
-
-VERSION
-    $Id: agent_type.txt,v 1.3 1999-04-08 13:39:31 ivan Exp $
-
-BUGS
-SEE ALSO
-    the FS::Record manpage, the FS::agent manpage, the FS::type_pkgs
-    manpage, the FS::cust_main manpage, the FS::part_pkg manpage,
-    schema.html from the base documentation.
-
-HISTORY
-    Class for the different sets of allowable packages you can
-    assign to an agent.
-
-    ivan@sisd.com 97-nov-13
-
-    ut_ FS::Record methods ivan@sisd.com 97-dec-10
-
-    Changed 'type' to 'atype' because Pg6.3 reserves the type word
-    bmccane@maxbaud.net 98-apr-3
-
-    pod, added check in delete ivan@sisd.com 98-sep-21
-
-    $Log: agent_type.txt,v $
-    Revision 1.3  1999-04-08 13:39:31  ivan
-    convert from pod for 1.2.0 release
- Revision 1.2 1998/12/29 11:59:35 ivan
-    mostly properly OO, some work still to be done with svc_ stuff
-
diff --git a/htdocs/docs/man/cust_bill.txt b/htdocs/docs/man/cust_bill.txt
deleted file mode 100644
index c11840117..000000000
--- a/htdocs/docs/man/cust_bill.txt
+++ /dev/null
@@ -1,157 +0,0 @@
-NAME
-    FS::cust_bill - Object methods for cust_bill records
-
-SYNOPSIS
-      use FS::cust_bill;
-
-      $record = new FS::cust_bill \%hash;
-      $record = new FS::cust_bill { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-      ( $total_previous_balance, @previous_cust_bill ) = $record->previous;
-
-      @cust_bill_pkg_objects = $cust_bill->cust_bill_pkg;
-
-      ( $total_previous_credits, @previous_cust_credit ) = $record->cust_credit;
-
-      @cust_pay_objects = $cust_bill->cust_pay;
-
-      @lines = $cust_bill->print_text;
-      @lines = $cust_bill->print_text $time;
-
-DESCRIPTION
-    An FS::cust_bill object represents an invoice. FS::cust_bill
-    inherits from FS::Record. The following fields are currently
-    supported:
-
-    invnum - primary key (assigned automatically for new invoices)
-    custnum - customer (see the FS::cust_main manpage)
-    _date - specified as a UNIX timestamp; see the section on "time" in the perlfunc manpage.  Also see
-    the Time::Local manpage and the Date::Parse manpage for conversion functions.
-    charged - amount of this invoice
-    owed - amount still outstanding on this invoice, which is charged minus
-    all payments (see the FS::cust_pay manpage).
-    printed - how many times this invoice has been printed automatically
-    (see the section on "collect" in the FS::cust_main manpage).
-METHODS
-    new HASHREF
-        Creates a new invoice. To add the invoice to the database,
-        see the section on "insert". Invoices are normally created
-        by calling the bill method of a customer object (see the
-        FS::cust_main manpage).
-
-    insert
-        Adds this invoice to the database ("Posts" the invoice). If
-        there is an error, returns the error, otherwise returns
-        false.
-
-        When adding new invoices, owed must be charged (or null, in
-        which case it is automatically set to charged).
-
-    delete
-        Currently unimplemented. I don't remove invoices because
-        there would then be no record you ever posted this invoice
-        (which is bad, no?)
-
-    replace OLD_RECORD
-        Replaces the OLD_RECORD with this one in the database. If
-        there is an error, returns the error, otherwise returns
-        false.
-
-        Only owed and printed may be changed. Owed is normally
-        updated by creating and inserting a payment (see the
-        FS::cust_pay manpage). Printed is normally updated by
-        calling the collect method of a customer object (see the
-        FS::cust_main manpage).
-
-    check
-        Checks all fields to make sure this is a valid invoice. If
-        there is an error, returns the error, otherwise returns
-        false. Called by the insert and replace methods.
-
-    previous
-        Returns a list consisting of the total previous balance for
-        this customer, followed by the previous outstanding invoices
-        (as FS::cust_bill objects also).
-
-    cust_bill_pkg
-        Returns the line items (see the FS::cust_bill_pkg manpage)
-        for this invoice.
-
-    cust_credit
-        Returns a list consisting of the total previous credited
-        (see the FS::cust_credit manpage) for this customer,
-        followed by the previous outstanding credits
-        (FS::cust_credit objects).
-
-    cust_pay
-        Returns all payments (see the FS::cust_pay manpage) for this
-        invoice.
-
-    print_text [TIME];
-        Returns an ASCII invoice, as a list of lines.
-
-        TIME an optional value used to control the printing of
-        overdue messages. The default is now. It isn't the date of
-        the invoice; that's the `_date' field. It is specified as a
-        UNIX timestamp; see the section on "time" in the perlfunc
-        manpage. Also see the Time::Local manpage and the
-        Date::Parse manpage for conversion functions.
-
-VERSION
-    $Id: cust_bill.txt,v 1.4 1999-04-08 13:39:31 ivan Exp $
-
-BUGS
-    The delete method.
-
-    print_text formatting (and some logic :/) is in source, but
-    needs to be slurped in from a file. Also number of lines ($=).
-
-    missing print_ps for a nice postscript copy (maybe HylaFAX-
-    cover-page-style or something similar so the look can be
-    completely customized?)
-
-SEE ALSO
-    the FS::Record manpage, the FS::cust_main manpage, the
-    FS::cust_pay manpage, the FS::cust_bill_pkg manpage, the
-    FS::cust_credit manpage, schema.html from the base
-    documentation.
-
-HISTORY
-    ivan@voicenet.com 97-jul-1
-
-    small fix for new API ivan@sisd.com 98-mar-14
-
-    charges can be negative ivan@sisd.com 98-jul-13
-
-    pod, ingegrate with FS::Invoice ivan@sisd.com 98-sep-20
-
-    $Log: cust_bill.txt,v $
-    Revision 1.4  1999-04-08 13:39:31  ivan
-    convert from pod for 1.2.0 release
- Revision 1.7 1999/02/09 09:55:05 ivan
-    invoices show line items for each service in a package (see the
-    label method of FS::cust_svc)
-
-    Revision 1.6 1999/01/25 12:26:07 ivan yet more mod_perl stuff
-
-    Revision 1.5 1999/01/18 21:58:03 ivan esthetic: eq and ne were
-    used in a few places instead of == and !=
-
-    Revision 1.4 1998/12/29 11:59:36 ivan mostly properly OO, some
-    work still to be done with svc_ stuff
-
-    Revision 1.3 1998/11/13 09:56:53 ivan change configuration file
-    layout to support multiple distinct databases (with own set of
-    config files, export, etc.)
-
-    Revision 1.2 1998/11/07 10:24:24 ivan don't use depriciated
-    FS::Bill and FS::Invoice, other miscellania
-
diff --git a/htdocs/docs/man/cust_bill_pkg.txt b/htdocs/docs/man/cust_bill_pkg.txt
deleted file mode 100644
index d725c941e..000000000
--- a/htdocs/docs/man/cust_bill_pkg.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-NAME
-    FS::cust_bill_pkg - Object methods for cust_bill_pkg records
-
-SYNOPSIS
-      use FS::cust_bill_pkg;
-
-      $record = new FS::cust_bill_pkg \%hash;
-      $record = new FS::cust_bill_pkg { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-DESCRIPTION
-    An FS::cust_bill_pkg object represents an invoice line item.
-    FS::cust_bill_pkg inherits from FS::Record. The following fields
-    are currently supported:
-
-    invnum - invoice (see the FS::cust_bill manpage)
-    pkgnum - package (see the FS::cust_pkg manpage)
-    setup - setup fee
-    recur - recurring fee
-    sdate - starting date of recurring fee
-    edate - ending date of recurring fee
-    sdate and edate are specified as UNIX timestamps; see the
-    section on "time" in the perlfunc manpage. Also see the
-    Time::Local manpage and the Date::Parse manpage for conversion
-    functions.
-
-METHODS
-    new HASHREF
-        Creates a new line item. To add the line item to the
-        database, see the section on "insert". Line items are
-        normally created by calling the bill method of a customer
-        object (see the FS::cust_main manpage).
-
-    insert
-        Adds this line item to the database. If there is an error,
-        returns the error, otherwise returns false.
-
-    delete
-        Currently unimplemented. I don't remove line items because
-        there would then be no record the items ever existed (which
-        is bad, no?)
-
-    replace OLD_RECORD
-        Currently unimplemented. This would be even more of an
-        accounting nightmare than deleteing the items. Just don't do
-        it.
-
-    check
-        Checks all fields to make sure this is a valid line item. If
-        there is an error, returns the error, otherwise returns
-        false. Called by the insert method.
-
-VERSION
-    $Id: cust_bill_pkg.txt,v 1.3 1999-04-08 13:39:31 ivan Exp $
-
-BUGS
-SEE ALSO
-    the FS::Record manpage, the FS::cust_bill manpage, the
-    FS::cust_pkg manpage, the FS::cust_main manpage, schema.html
-    from the base documentation.
-
-HISTORY
-    ivan@sisd.com 98-mar-13
-
-    pod ivan@sisd.com 98-sep-21
-
diff --git a/htdocs/docs/man/cust_credit.txt b/htdocs/docs/man/cust_credit.txt
deleted file mode 100644
index c26c1fbd6..000000000
--- a/htdocs/docs/man/cust_credit.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-NAME
-    FS::cust_credit - Object methods for cust_credit records
-
-SYNOPSIS
-      use FS::cust_credit;
-
-      $record = new FS::cust_credit \%hash;
-      $record = new FS::cust_credit { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-DESCRIPTION
-    An FS::cust_credit object represents a credit. FS::cust_credit
-    inherits from FS::Record. The following fields are currently
-    supported:
-
-    crednum - primary key (assigned automatically for new credits)
-    custnum - customer (see the FS::cust_main manpage)
-    amount - amount of the credit
-    credited - how much of this credit that is still outstanding, which is
-    amount minus all refunds (see the FS::cust_refund manpage).
-    _date - specified as a UNIX timestamp; see the section on "time" in the perlfunc manpage.  Also see
-    the Time::Local manpage and the Date::Parse manpage for conversion functions.
-    otaker - order taker (assigned automatically, see the FS::UID manpage)
-    reason - text
-METHODS
-    new HASHREF
-        Creates a new credit. To add the credit to the database, see
-        the section on "insert".
-
-    insert
-        Adds this credit to the database ("Posts" the credit). If
-        there is an error, returns the error, otherwise returns
-        false.
-
-        When adding new invoices, credited must be amount (or null,
-        in which case it is automatically set to amount).
-
-    delete
-        Currently unimplemented.
-
-    replace OLD_RECORD
-        Replaces the OLD_RECORD with this one in the database. If
-        there is an error, returns the error, otherwise returns
-        false.
-
-        Only credited may be changed. Credited is normally updated
-        by creating and inserting a refund (see the FS::cust_refund
-        manpage).
-
-    check
-        Checks all fields to make sure this is a valid credit. If
-        there is an error, returns the error, otherwise returns
-        false. Called by the insert and replace methods.
-
-VERSION
-    $Id: cust_credit.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-    The delete method.
-
-SEE ALSO
-    the FS::Record manpage, the FS::cust_refund manpage, the
-    FS::cust_bill manpage, schema.html from the base documentation.
-
-HISTORY
-    ivan@sisd.com 98-mar-17
-
-    pod, otaker from FS::UID ivan@sisd.com 98-sep-21
-
-    $Log: cust_credit.txt,v $
-    Revision 1.3  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.4 1999/01/25 12:26:08 ivan
-    yet more mod_perl stuff
-
-    Revision 1.3 1999/01/18 21:58:04 ivan esthetic: eq and ne were
-    used in a few places instead of == and !=
-
-    Revision 1.2 1998/12/29 11:59:38 ivan mostly properly OO, some
-    work still to be done with svc_ stuff
-
diff --git a/htdocs/docs/man/cust_main.txt b/htdocs/docs/man/cust_main.txt
deleted file mode 100644
index bef2b9d94..000000000
--- a/htdocs/docs/man/cust_main.txt
+++ /dev/null
@@ -1,278 +0,0 @@
-NAME
-    FS::cust_main - Object methods for cust_main records
-
-SYNOPSIS
-      use FS::cust_main;
-
-      $record = new FS::cust_main \%hash;
-      $record = new FS::cust_main { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-      @cust_pkg = $record->all_pkgs;
-
-      @cust_pkg = $record->ncancelled_pkgs;
-
-      $error = $record->bill;
-      $error = $record->bill %options;
-      $error = $record->bill 'time' => $time;
-
-      $error = $record->collect;
-      $error = $record->collect %options;
-      $error = $record->collect 'invoice_time'   => $time,
-                                'batch_card'     => 'yes',
-                                'report_badcard' => 'yes',
-                              ;
-
-DESCRIPTION
-    An FS::cust_main object represents a customer. FS::cust_main
-    inherits from FS::Record. The following fields are currently
-    supported:
-
-    custnum - primary key (assigned automatically for new customers)
-    agentnum - agent (see the FS::agent manpage)
-    refnum - referral (see the FS::part_referral manpage)
-    first - name
-    last - name
-    ss - social security number (optional)
-    company - (optional)
-    address1
-    address2 - (optional)
-    city
-    county - (optional, see the FS::cust_main_county manpage)
-    state - (see the FS::cust_main_county manpage)
-    zip
-    country - (see the FS::cust_main_county manpage)
-    daytime - phone (optional)
-    night - phone (optional)
-    payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
-    payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
-    paydate - expiration date, mm/yyyy, m/yyyy, mm/yy or m/yy
-    payname - name on card or billing name
-    tax - tax exempt, empty or `Y'
-    otaker - order taker (assigned automatically, see the FS::UID manpage)
-METHODS
-    new HASHREF
-        Creates a new customer. To add the customer to the database,
-        see the section on "insert".
-
-        Note that this stores the hash reference, not a distinct
-        copy of the hash it points to. You can ask the object for a
-        copy with the *hash* method.
-
-    insert
-        Adds this customer to the database. If there is an error,
-        returns the error, otherwise returns false.
-
-    delete
-        Currently unimplemented. Maybe cancel all of this customer's
-        packages (cust_pkg)?
-
-        I don't remove the customer record in the database because
-        there would then be no record the customer ever existed
-        (which is bad, no?)
-
-    replace OLD_RECORD
-        Replaces the OLD_RECORD with this one in the database. If
-        there is an error, returns the error, otherwise returns
-        false.
-
-    check
-        Checks all fields to make sure this is a valid customer
-        record. If there is an error, returns the error, otherwise
-        returns false. Called by the insert and repalce methods.
-
-    all_pkgs
-        Returns all packages (see the FS::cust_pkg manpage) for this
-        customer.
-
-    ncancelled_pkgs
-        Returns all non-cancelled packages (see the FS::cust_pkg
-        manpage) for this customer.
-
-    bill OPTIONS
-        Generates invoices (see the FS::cust_bill manpage) for this
-        customer. Usually used in conjunction with the collect
-        method.
-
-        The only currently available option is `time', which bills
-        the customer as if it were that time. It is specified as a
-        UNIX timestamp; see the section on "time" in the perlfunc
-        manpage). Also see the Time::Local manpage and the
-        Date::Parse manpage for conversion functions.
-
-        If there is an error, returns the error, otherwise returns
-        false.
-
-    collect OPTIONS
-        (Attempt to) collect money for this customer's outstanding
-        invoices (see the FS::cust_bill manpage). Usually used after
-        the bill method.
-
-        Depending on the value of `payby', this may print an invoice
-        (`BILL'), charge a credit card (`CARD'), or just add any
-        necessary (pseudo-)payment (`COMP').
-
-        If there is an error, returns the error, otherwise returns
-        false.
-
-        Currently available options are:
-
-        invoice_time - Use this time when deciding when to print
-        invoices and late notices on those invoices. The default is
-        now. It is specified as a UNIX timestamp; see the section on
-        "time" in the perlfunc manpage). Also see the Time::Local
-        manpage and the Date::Parse manpage for conversion
-        functions.
-
-        batch_card - Set this true to batch cards (see the
-        cust_pay_batch manpage). By default, cards are processed
-        immediately, which will generate an error if CyberCash is
-        not installed.
-
-        report_badcard - Set this true if you want bad card
-        transactions to return an error. By default, they don't.
-
-    total_owed
-        Returns the total owed for this customer on all invoices
-        (see the FS::cust_bill manpage).
-
-    total_credited
-        Returns the total credits (see the FS::cust_credit manpage)
-        for this customer.
-
-    balance
-        Returns the balance for this customer (total owed minus
-        total credited).
-
-    invoicing_list [ ARRAYREF ]
-        If an arguement is given, sets these email addresses as
-        invoice recipients (see the FS::cust_main_invoice manpage).
-        Errors are not fatal and are not reported (except as
-        warnings), so use check_invoicing_list first.
-
-        Returns a list of email addresses (with svcnum entries
-        expanded).
-
-        Note: You can clear the invoicing list by passing an empty
-        ARRAYREF. You can check it without disturbing anything by
-        passing nothing.
-
-        This interface may change in the future.
-
-    check_invoicing_list ARRAYREF
-        Checks these arguements as valid input for the
-        invoicing_list method. If there is an error, returns the
-        error, otherwise returns false.
-
-VERSION
-    $Id: cust_main.txt,v 1.4 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-    The delete method.
-
-    Bill and collect options should probably be passed as references
-    instead of a list.
-
-    CyberCash v2 forces us to define some variables in package main.
-
-    There should probably be a configuration file with a list of
-    allowed credit card types.
-
-    CyberCash is the only processor.
-
-    No multiple currency support (probably a larger project than
-    just this module).
-
-SEE ALSO
-    the FS::Record manpage, the FS::cust_pkg manpage, the
-    FS::cust_bill manpage, the FS::cust_credit manpage the
-    FS::cust_pay_batch manpage, the FS::agent manpage, the
-    FS::part_referral manpage, the FS::cust_main_county manpage, the
-    FS::cust_main_invoice manpage, the FS::UID manpage, schema.html
-    from the base documentation.
-
-HISTORY
-    ivan@voicenet.com 97-jul-28
-
-    Changed to standard Business::CreditCard no more TableUtil
-    EXPORT_OK FS::Record's hfields removed unique calls and locking
-    (not needed here now) wrapped the (now) optional fields in if
-    statements in sub check (notyetdone!) ivan@sisd.com 97-nov-12
-
-    updated paydate with SQL-type date info ivan@sisd.com 98-mar-5
-
-    Added export of datasrc from UID.pm for Pg6.3 changed 'day' to
-    'daytime' because Pg6.3 reserves the day word
-    bmccane@maxbaud.net 98-apr-3
-
-    in ->create, s/svc_acct/cust_main/, now it should actually
-    eliminate the warnings it was meant to ivan@sisd.com 98-jul-16
-
-    don't require a phone number and allow '/' in company names
-    ivan@sisd.com 98-jul-18
-
-    use ut_ and rewrite &check, &*_pkgs ivan@sisd.com 98-sep-5
-
-    pod, merge with FS::Bill (about time!), total_owed,
-    total_credited and balance methods, cleaned collect method,
-    source modifications no longer necessary to enable cybercash,
-    cybercash v3 support, don't need to import
-    FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
-
-    $Log: cust_main.txt,v $
-    Revision 1.4  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.16 1999/04/07 14:32:19 ivan
-    more &invoicing_list logic to skip searches when there is no
-    custnum
-
-    Revision 1.15 1999/04/07 13:41:54 ivan in &invoicing_list, don't
-    search if there's no custnum yet
-
-    Revision 1.14 1999/03/29 12:06:15 ivan buglet in email invoices
-    fixed
-
-    Revision 1.13 1999/02/28 20:09:03 ivan allow spaces in zip
-    codes, for (at least) canada. pointed out by Clayton Gray
-    <clgray@bcgroup.net>
-
-    Revision 1.12 1999/02/27 21:24:22 ivan parse paydate correctly
-    for cybercash
-
-    Revision 1.11 1999/02/23 08:09:27 ivan beginnings of one-screen
-    new customer entry and some other miscellania
-
-    Revision 1.10 1999/01/25 12:26:09 ivan yet more mod_perl stuff
-
-    Revision 1.9 1999/01/18 09:22:41 ivan changes to track email
-    addresses for email invoicing
-
-    Revision 1.8 1998/12/29 11:59:39 ivan mostly properly OO, some
-    work still to be done with svc_ stuff
-
-    Revision 1.7 1998/12/16 09:58:52 ivan library support for
-    editing email invoice destinations (not in sub collect yet)
-
-    Revision 1.6 1998/11/18 09:01:42 ivan i18n! i18n!
-
-    Revision 1.5 1998/11/15 11:23:14 ivan use FS::table_name for all
-    searches to eliminate warnings, emit state/county when they
-    don't match
-
-    Revision 1.4 1998/11/15 05:30:48 ivan bugfix for new config
-    layout
-
-    Revision 1.3 1998/11/13 09:56:54 ivan change configuration file
-    layout to support multiple distinct databases (with own set of
-    config files, export, etc.)
-
-    Revision 1.2 1998/11/07 10:24:25 ivan don't use depriciated
-    FS::Bill and FS::Invoice, other miscellania
-
diff --git a/htdocs/docs/man/cust_main_county.txt b/htdocs/docs/man/cust_main_county.txt
deleted file mode 100644
index 9a4a60e33..000000000
--- a/htdocs/docs/man/cust_main_county.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-NAME
-    FS::cust_main_county - Object methods for cust_main_county
-    objects
-
-SYNOPSIS
-      use FS::cust_main_county;
-
-      $record = new FS::cust_main_county \%hash;
-      $record = new FS::cust_main_county { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-DESCRIPTION
-    An FS::cust_main_county object represents a tax rate, defined by
-    locale. FS::cust_main_county inherits from FS::Record. The
-    following fields are currently supported:
-
-    taxnum - primary key (assigned automatically for new tax rates)
-    state
-    county
-    country
-    tax - percentage
-METHODS
-    new HASHREF
-        Creates a new tax rate. To add the tax rate to the database,
-        see the section on "insert".
-
-    insert
-        Adds this tax rate to the database. If there is an error,
-        returns the error, otherwise returns false.
-
-    delete
-        Deletes this tax rate from the database. If there is an
-        error, returns the error, otherwise returns false.
-
-    replace OLD_RECORD
-        Replaces the OLD_RECORD with this one in the database. If
-        there is an error, returns the error, otherwise returns
-        false.
-
-    check
-        Checks all fields to make sure this is a valid tax rate. If
-        there is an error, returns the error, otherwise returns
-        false. Called by the insert and replace methods.
-
-VERSION
-    $Id: cust_main_county.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-SEE ALSO
-    the FS::Record manpage, the FS::cust_main manpage, the
-    FS::cust_bill manpage, schema.html from the base documentation.
-
-HISTORY
-    ivan@voicenet.com 97-dec-16
-
-    Changed check for 'tax' to use the new ut_float subroutine
-    bmccane@maxbaud.net 98-apr-3
-
-    pod ivan@sisd.com 98-sep-21
-
-    $Log: cust_main_county.txt,v $
-    Revision 1.3  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.3 1998/12/29 11:59:41
-    ivan mostly properly OO, some work still to be done with svc_
-    stuff
-
-    Revision 1.2 1998/11/18 09:01:43 ivan i18n! i18n!
-
diff --git a/htdocs/docs/man/cust_main_invoice.txt b/htdocs/docs/man/cust_main_invoice.txt
deleted file mode 100644
index 5d50a9f26..000000000
--- a/htdocs/docs/man/cust_main_invoice.txt
+++ /dev/null
@@ -1,98 +0,0 @@
-NAME
-    FS::cust_main_invoice - Object methods for cust_main_invoice
-    records
-
-SYNOPSIS
-      use FS::cust_main_invoice;
-
-      $record = new FS::cust_main_invoice \%hash;
-      $record = new FS::cust_main_invoice { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-      $email_address = $record->address;
-
-DESCRIPTION
-    An FS::cust_main_invoice object represents an invoice
-    destination. FS::cust_main_invoice inherits from FS::Record. The
-    following fields are currently supported:
-
-    destnum - primary key
-    custnum - customer (see the FS::cust_main manpage)
-    dest - Invoice destination: If numeric, a <a href="#svc_acct">svcnum</a>, if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)
-METHODS
-    new HASHREF
-        Creates a new invoice destination. To add the invoice
-        destination to the database, see the section on "insert".
-
-        Note that this stores the hash reference, not a distinct
-        copy of the hash it points to. You can ask the object for a
-        copy with the *hash* method.
-
-    insert
-        Adds this record to the database. If there is an error,
-        returns the error, otherwise returns false.
-
-    delete
-        Delete this record from the database.
-
-    replace OLD_RECORD
-        Replaces the OLD_RECORD with this one in the database. If
-        there is an error, returns the error, otherwise returns
-        false.
-
-    check
-        Checks all fields to make sure this is a valid invoice
-        destination. If there is an error, returns the error,
-        otherwise returns false. Called by the insert and repalce
-        methods.
-
-    checkdest
-        Checks the dest field only.
-
-    address
-        Returns the literal email address for this record (or
-        `POST').
-
-VERSION
-    $Id: cust_main_invoice.txt,v 1.1 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-SEE ALSO
-    the FS::Record manpage, the FS::cust_main manpage
-
-HISTORY
-    ivan@voicenet.com 97-jul-1
-
-    added hfields ivan@sisd.com 97-nov-13
-
-    $Log: cust_main_invoice.txt,v $
-    Revision 1.1  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.6 1999/01/25 12:26:10
-    ivan yet more mod_perl stuff
-
-    Revision 1.5 1999/01/18 21:58:05 ivan esthetic: eq and ne were
-    used in a few places instead of == and !=
-
-    Revision 1.4 1999/01/18 09:22:42 ivan changes to track email
-    addresses for email invoicing
-
-    Revision 1.3 1998/12/29 11:59:42 ivan mostly properly OO, some
-    work still to be done with svc_ stuff
-
-    Revision 1.2 1998/12/16 09:58:53 ivan library support for
-    editing email invoice destinations (not in sub collect yet)
-
-    Revision 1.1 1998/12/16 07:40:02 ivan new table
-
-    Revision 1.3 1998/11/15 04:33:00 ivan updates for newest versoin
-
-    Revision 1.2 1998/11/15 03:48:49 ivan update for current version
-
diff --git a/htdocs/docs/man/cust_pay.txt b/htdocs/docs/man/cust_pay.txt
deleted file mode 100644
index 14843d022..000000000
--- a/htdocs/docs/man/cust_pay.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-NAME
-    FS::cust_pay - Object methods for cust_pay objects
-
-SYNOPSIS
-      use FS::cust_pay;
-
-      $record = new FS::cust_pay \%hash;
-      $record = new FS::cust_pay { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-DESCRIPTION
-    An FS::cust_pay object represents a payment. FS::cust_pay
-    inherits from FS::Record. The following fields are currently
-    supported:
-
-    paynum - primary key (assigned automatically for new payments)
-    invnum - Invoice (see the FS::cust_bill manpage)
-    paid - Amount of this payment
-    _date - specified as a UNIX timestamp; see the section on "time" in the perlfunc manpage.  Also see
-    the Time::Local manpage and the Date::Parse manpage for conversion functions.
-    payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
-    payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
-    paybatch - text field for tracking card processing
-METHODS
-    new HASHREF
-        Creates a new payment. To add the payment to the databse,
-        see the section on "insert".
-
-    insert
-        Adds this payment to the databse, and updates the invoice
-        (see the FS::cust_bill manpage).
-
-    delete
-        Currently unimplemented (accounting reasons).
-
-    replace OLD_RECORD
-        Currently unimplemented (accounting reasons).
-
-    check
-        Checks all fields to make sure this is a valid payment. If
-        there is an error, returns the error, otherwise returns
-        false. Called by the insert method.
-
-VERSION
-    $Id: cust_pay.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-    Delete and replace methods.
-
-SEE ALSO
-    the FS::Record manpage, the FS::cust_bill manpage, schema.html
-    from the base documentation.
-
-HISTORY
-    ivan@voicenet.com 97-jul-1 - 25 - 29
-
-    new api ivan@sisd.com 98-mar-13
-
-    pod ivan@sisd.com 98-sep-21
-
-    $Log: cust_pay.txt,v $
-    Revision 1.3  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.3 1999/01/25 12:26:11 ivan yet
-    more mod_perl stuff
-
-    Revision 1.2 1998/12/29 11:59:43 ivan mostly properly OO, some
-    work still to be done with svc_ stuff
-
diff --git a/htdocs/docs/man/cust_pay_batch.txt b/htdocs/docs/man/cust_pay_batch.txt
deleted file mode 100644
index 2d6267843..000000000
--- a/htdocs/docs/man/cust_pay_batch.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-NAME
-    FS::cust_pay_batch - Object methods for batch cards
-
-SYNOPSIS
-      use FS::cust_pay_batch;
-
-      $record = new FS::cust_pay_batch \%hash;
-      $record = new FS::cust_pay_batch { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-DESCRIPTION
-    An FS::cust_pay_batch object represents a credit card
-    transaction ready to be batched (sent to a processor).
-    FS::cust_pay_batch inherits from FS::Record. Typically called by
-    the collect method of an FS::cust_main object. The following
-    fields are currently supported:
-
-    trancode - 77 for charges
-    cardnum
-    exp - card expiration
-    amount
-    invnum - invoice
-    custnum - customer
-    payname - name on card
-    first - name
-    last - name
-    address1
-    address2
-    city
-    state
-    zip
-    country
-METHODS
-    new HASHREF
-        Creates a new record. To add the record to the database, see
-        the section on "insert".
-
-        Note that this stores the hash reference, not a distinct
-        copy of the hash it points to. You can ask the object for a
-        copy with the *hash* method.
-
-    insert
-        Adds this record to the database. If there is an error,
-        returns the error, otherwise returns false.
-
-    delete
-        Delete this record from the database. If there is an error,
-        returns the error, otherwise returns false.
-
-    replace OLD_RECORD
-        #inactive # #Replaces the OLD_RECORD with this one in the
-        database. If there is an error, #returns the error,
-        otherwise returns false.
-
-    check
-        Checks all fields to make sure this is a valid transaction.
-        If there is an error, returns the error, otherwise returns
-        false. Called by the insert and repalce methods.
-
-VERSION
-    $Id: cust_pay_batch.txt,v 1.1 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-    There should probably be a configuration file with a list of
-    allowed credit card types.
-
-SEE ALSO
-    the FS::cust_main manpage, the FS::Record manpage
-
-HISTORY
-    ivan@voicenet.com 97-jul-1
-
-    added hfields ivan@sisd.com 97-nov-13
-
-    $Log: cust_pay_batch.txt,v $
-    Revision 1.1  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.3 1998/12/29 11:59:44
-    ivan mostly properly OO, some work still to be done with svc_
-    stuff
-
-    Revision 1.2 1998/11/18 09:01:44 ivan i18n! i18n!
-
-    Revision 1.1 1998/11/15 05:19:58 ivan long overdue
-
-    Revision 1.3 1998/11/15 04:33:00 ivan updates for newest versoin
-
-    Revision 1.2 1998/11/15 03:48:49 ivan update for current version
-
diff --git a/htdocs/docs/man/cust_pkg.txt b/htdocs/docs/man/cust_pkg.txt
deleted file mode 100644
index 395403192..000000000
--- a/htdocs/docs/man/cust_pkg.txt
+++ /dev/null
@@ -1,212 +0,0 @@
-NAME
-    FS::cust_pkg - Object methods for cust_pkg objects
-
-SYNOPSIS
-      use FS::cust_pkg;
-
-      $record = new FS::cust_pkg \%hash;
-      $record = new FS::cust_pkg { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-      $error = $record->cancel;
-
-      $error = $record->suspend;
-
-      $error = $record->unsuspend;
-
-      $part_pkg = $record->part_pkg;
-
-      @labels = $record->labels;
-
-      $error = FS::cust_pkg::order( $custnum, \@pkgparts );
-      $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );
-
-DESCRIPTION
-    An FS::cust_pkg object represents a customer billing item.
-    FS::cust_pkg inherits from FS::Record. The following fields are
-    currently supported:
-
-    pkgnum - primary key (assigned automatically for new billing items)
-    custnum - Customer (see the FS::cust_main manpage)
-    pkgpart - Billing item definition (see the FS::part_pkg manpage)
-    setup - date
-    bill - date
-    susp - date
-    expire - date
-    cancel - date
-    otaker - order taker (assigned automatically if null, see the FS::UID manpage)
-    Note: setup, bill, susp, expire and cancel are specified as UNIX
-    timestamps; see the section on "time" in the perlfunc manpage.
-    Also see the Time::Local manpage and the Date::Parse manpage for
-    conversion functions.
-
-METHODS
-    new HASHREF
-        Create a new billing item. To add the item to the database,
-        see the section on "insert".
-
-    insert
-        Adds this billing item to the database ("Orders" the item).
-        If there is an error, returns the error, otherwise returns
-        false.
-
-        sub insert { my $self = shift;
-
-          # custnum might not have have been defined in sub check (for one-shot new
-          # customers), so check it here instead
-
-          my $error = $self->ut_number('custnum');
-          return $error if $error
-
-          return "Unknown customer"
-            unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
-
-          $self->SUPER::insert;
-
-        }
-
-    delete
-        Currently unimplemented. You don't want to delete billing
-        items, because there would then be no record the customer
-        ever purchased the item. Instead, see the cancel method.
-
-    replace OLD_RECORD
-        Replaces the OLD_RECORD with this one in the database. If
-        there is an error, returns the error, otherwise returns
-        false.
-
-        Currently, custnum, setup, bill, susp, expire, and cancel
-        may be changed.
-
-        Changing pkgpart may have disasterous effects. See the order
-        subroutine.
-
-        setup and bill are normally updated by calling the bill
-        method of a customer object (see the FS::cust_main manpage).
-
-        suspend is normally updated by the suspend and unsuspend
-        methods.
-
-        cancel is normally updated by the cancel method (and also
-        the order subroutine in some cases).
-
-    check
-        Checks all fields to make sure this is a valid billing item.
-        If there is an error, returns the error, otherwise returns
-        false. Called by the insert and replace methods.
-
-    cancel
-        Cancels and removes all services (see the FS::cust_svc
-        manpage and the FS::part_svc manpage) in this package, then
-        cancels the package itself (sets the cancel field to now).
-
-        If there is an error, returns the error, otherwise returns
-        false.
-
-    suspend
-        Suspends all services (see the FS::cust_svc manpage and the
-        FS::part_svc manpage) in this package, then suspends the
-        package itself (sets the susp field to now).
-
-        If there is an error, returns the error, otherwise returns
-        false.
-
-    unsuspend
-        Unsuspends all services (see the FS::cust_svc manpage and
-        the FS::part_svc manpage) in this package, then unsuspends
-        the package itself (clears the susp field).
-
-        If there is an error, returns the error, otherwise returns
-        false.
-
-    part_pkg
-        Returns the definition for this billing item, as an
-        FS::part_pkg object (see L<FS::part_pkg).
-
-    labels
-        Returns a list of lists, calling the label method for all
-        services (see the FS::cust_svc manpage) of this billing
-        item.
-
-SUBROUTINES
-    order CUSTNUM, PKGPARTS_ARYREF, [ REMOVE_PKGNUMS_ARYREF ]
-        CUSTNUM is a customer (see the FS::cust_main manpage)
-
-        PKGPARTS is a list of pkgparts specifying the the billing
-        item definitions (see the FS::part_pkg manpage) to order for
-        this customer. Duplicates are of course permitted.
-
-        REMOVE_PKGNUMS is an optional list of pkgnums specifying the
-        billing items to remove for this customer. The services (see
-        the FS::cust_svc manpage) are moved to the new billing
-        items. An error is returned if this is not possible (see the
-        FS::pkg_svc manpage).
-
-VERSION
-    $Id: cust_pkg.txt,v 1.4 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-    sub order is not OO. Perhaps it should be moved to FS::cust_main
-    and made so?
-
-    In sub order, the @pkgparts array (passed by reference) is
-    clobbered.
-
-    Also in sub order, no money is adjusted. Once FS::part_pkg
-    defines a standard method to pass dates to the recur_prog
-    expression, it should do so.
-
-    FS::svc_acct, FS::svc_acct_sm, and FS::svc_domain are loaded via
-    'use' at compile time, rather than via 'require' in sub { setup,
-    suspend, unsuspend, cancel } because they use %FS::UID::callback
-    to load configuration values. Probably need a subroutine which
-    decides what to do based on whether or not we've fetched the
-    user yet, rather than a hash. See FS::UID and the TODO.
-
-SEE ALSO
-    the FS::Record manpage, the FS::cust_main manpage, the
-    FS::part_pkg manpage, the FS::cust_svc manpage , the FS::pkg_svc
-    manpage, schema.html from the base documentation
-
-HISTORY
-    ivan@voicenet.com 97-jul-1 - 21
-
-    fixed for new agent->agent_type->type_pkgs in &order
-    ivan@sisd.com 98-mar-7
-
-    pod ivan@sisd.com 98-sep-21
-
-    $Log: cust_pkg.txt,v $
-    Revision 1.4  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.9 1999/03/29 01:11:51 ivan use
-    FS::type_pkgs
-
-    Revision 1.8 1999/03/25 13:48:14 ivan allow empty custnum in sub
-    check (but call that an error in sub insert), for one-screen new
-    customer entry
-
-    Revision 1.7 1999/02/09 09:55:06 ivan invoices show line items
-    for each service in a package (see the label method of
-    FS::cust_svc)
-
-    Revision 1.6 1999/01/25 12:26:12 ivan yet more mod_perl stuff
-
-    Revision 1.5 1999/01/18 21:58:07 ivan esthetic: eq and ne were
-    used in a few places instead of == and !=
-
-    Revision 1.4 1998/12/29 11:59:45 ivan mostly properly OO, some
-    work still to be done with svc_ stuff
-
-    Revision 1.3 1998/11/15 13:01:35 ivan allow pkgpart changing
-    (for per-customer custom pricing). warn about it in doc
-
-    Revision 1.2 1998/11/12 03:42:45 ivan added label method
-
diff --git a/htdocs/docs/man/cust_refund.txt b/htdocs/docs/man/cust_refund.txt
deleted file mode 100644
index a982ca610..000000000
--- a/htdocs/docs/man/cust_refund.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-NAME
-    FS::cust_refund - Object method for cust_refund objects
-
-SYNOPSIS
-      use FS::cust_refund;
-
-      $record = new FS::cust_refund \%hash;
-      $record = new FS::cust_refund { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-DESCRIPTION
-    An FS::cust_refund represents a refund. FS::cust_refund inherits
-    from FS::Record. The following fields are currently supported:
-
-    refundnum - primary key (assigned automatically for new refunds)
-    crednum - Credit (see the FS::cust_credit manpage)
-    refund - Amount of the refund
-    _date - specified as a UNIX timestamp; see the section on "time" in the perlfunc manpage.  Also see
-    the Time::Local manpage and the Date::Parse manpage for conversion functions.
-    payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
-    payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
-    otaker - order taker (assigned automatically, see the FS::UID manpage)
-METHODS
-    new HASHREF
-        Creates a new refund. To add the refund to the database, see
-        the section on "insert".
-
-    insert
-        Adds this refund to the database, and updates the credit
-        (see the FS::cust_credit manpage).
-
-    delete
-        Currently unimplemented (accounting reasons).
-
-    replace OLD_RECORD
-        Currently unimplemented (accounting reasons).
-
-    check
-        Checks all fields to make sure this is a valid refund. If
-        there is an error, returns the error, otherwise returns
-        false. Called by the insert method.
-
-VERSION
-    $Id: cust_refund.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-    Delete and replace methods.
-
-SEE ALSO
-    the FS::Record manpage, the FS::cust_credit manpage, schema.html
-    from the base documentation.
-
-HISTORY
-    ivan@sisd.com 98-mar-18
-
-    ->create had wrong tablename ivan@sisd.com 98-jun-16 (finish
-    me!)
-
-    pod and finish up ivan@sisd.com 98-sep-21
-
-    $Log: cust_refund.txt,v $
-    Revision 1.3  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.3 1999/01/25 12:26:13 ivan
-    yet more mod_perl stuff
-
-    Revision 1.2 1998/12/29 11:59:46 ivan mostly properly OO, some
-    work still to be done with svc_ stuff
-
diff --git a/htdocs/docs/man/cust_svc.txt b/htdocs/docs/man/cust_svc.txt
deleted file mode 100644
index 206d9d34b..000000000
--- a/htdocs/docs/man/cust_svc.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-NAME
-    FS::cust_svc - Object method for cust_svc objects
-
-SYNOPSIS
-      use FS::cust_svc;
-
-      $record = new FS::cust_svc \%hash
-      $record = new FS::cust_svc { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-      ($label, $value) = $record->label;
-
-DESCRIPTION
-    An FS::cust_svc represents a service. FS::cust_svc inherits from
-    FS::Record. The following fields are currently supported:
-
-    svcnum - primary key (assigned automatically for new services)
-    pkgnum - Package (see the FS::cust_pkg manpage)
-    svcpart - Service definition (see the FS::part_svc manpage)
-METHODS
-    new HASHREF
-        Creates a new service. To add the refund to the database,
-        see the section on "insert". Services are normally created
-        by creating FS::svc_ objects (see the FS::svc_acct manpage,
-        the FS::svc_domain manpage, and the FS::svc_acct_sm manpage,
-        among others).
-
-    insert
-        Adds this service to the database. If there is an error,
-        returns the error, otherwise returns false.
-
-    delete
-        Deletes this service from the database. If there is an
-        error, returns the error, otherwise returns false.
-
-        Called by the cancel method of the package (see the
-        FS::cust_pkg manpage).
-
-    replace OLD_RECORD
-        Replaces the OLD_RECORD with this one in the database. If
-        there is an error, returns the error, otherwise returns
-        false.
-
-    check
-        Checks all fields to make sure this is a valid service. If
-        there is an error, returns the error, otehrwise returns
-        false. Called by the insert and replace methods.
-
-    label
-        Returns a list consisting of: - The name of this service
-        (from part_svc) - A meaningful identifier (username, domain,
-        or mail alias) - The table name (i.e. svc_domain) for this
-        service
-
-VERSION
-    $Id: cust_svc.txt,v 1.4 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-    Behaviour of changing the svcpart of cust_svc records is
-    undefined and should possibly be prohibited, and pkg_svc records
-    are not checked.
-
-    pkg_svc records are not checked in general (here).
-
-    Deleting this record doesn't check or delete the svc_* record
-    associated with this record.
-
-SEE ALSO
-    the FS::Record manpage, the FS::cust_pkg manpage, the
-    FS::part_svc manpage, the FS::pkg_svc manpage, schema.html from
-    the base documentation
-
-HISTORY
-    ivan@voicenet.com 97-jul-10,14
-
-    no TableUtil, no FS::Lock ivan@sisd.com 98-mar-7
-
-    pod ivan@sisd.com 98-sep-21
-
-    $Log: cust_svc.txt,v $
-    Revision 1.4  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.5 1998/12/29 11:59:47 ivan
-    mostly properly OO, some work still to be done with svc_ stuff
-
-    Revision 1.4 1998/11/12 07:58:15 ivan added svcdb to label
-
-    Revision 1.3 1998/11/12 03:45:38 ivan use FS::table_name for all
-    tables qsearch()'ed
-
-    Revision 1.2 1998/11/12 03:32:46 ivan added label method
-
diff --git a/htdocs/docs/man/dbdef.txt b/htdocs/docs/man/dbdef.txt
deleted file mode 100644
index 6f1215a84..000000000
--- a/htdocs/docs/man/dbdef.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-NAME
-    FS::dbdef - Database objects
-
-SYNOPSIS
-      use FS::dbdef;
-
-      $dbdef = new FS::dbdef (@dbdef_table_objects);
-      $dbdef = load FS::dbdef "filename";
-
-      $dbdef->save("filename");
-
-      $dbdef->addtable($dbdef_table_object);
-
-      @table_names = $dbdef->tables;
-
-      $FS_dbdef_table_object = $dbdef->table;
-
-DESCRIPTION
-    FS::dbdef objects are collections of FS::dbdef_table objects and
-    represnt a database (a collection of tables).
-
-METHODS
-    new TABLE, TABLE, ...
-        Creates a new FS::dbdef object
-
-    load FILENAME
-        Loads an FS::dbdef object from a file.
-
-    save FILENAME
-        Saves an FS::dbdef object to a file.
-
-    addtable TABLE
-        Adds this FS::dbdef_table object.
-
-    tables
-        Returns the names of all tables.
-
-    table TABLENAME
-        Returns the named FS::dbdef_table object.
-
-BUGS
-        Each FS::dbdef object should have a name which corresponds
-        to its name within the SQL database engine.
-
-SEE ALSO
-        the FS::dbdef_table manpage, the FS::Record manpage,
-
-HISTORY
-        beginning of abstraction into a class (not really)
-
-        ivan@sisd.com 97-dec-4
-
-        added primary_key ivan@sisd.com 98-jan-20
-
-        added datatype (very kludgy and needs to be cleaned)
-        ivan@sisd.com 98-feb-21
-
-        perltrap (sigh) masked by mysql 3.20->3,21 ivan@sisd.com 98-
-        mar-2
-
-        Change 'type' to 'atype' in agent_type Changed attributes to
-        special words which are changed in fs-setup ie. double(10,2)
-        <=> MONEYTYPE Changed order of some of the field definitions
-        because Pg6.3 is picky Changed 'day' to 'daytime' in
-        cust_main Changed type of tax from tinyint to real Change
-        'password' to '_password' in svc_acct Pg6.3 does not allow
-        'field char(x) NULL' bmccane@maxbaud.net 98-apr-3
-
-        rewrite: now properly OO. See also
-        FS::dbdef_{table,column,unique,index}
-
-        ivan@sisd.com 98-apr-17
-
-        gained some extra functions ivan@sisd.com 98-may-11
-
-        now knows how to Freeze and Thaw itself ivan@sisd.com 98-
-        jun-2
-
-        pod ivan@sisd.com 98-sep-23
-
diff --git a/htdocs/docs/man/dbdef_colgroup.txt b/htdocs/docs/man/dbdef_colgroup.txt
deleted file mode 100644
index a7eebc6c7..000000000
--- a/htdocs/docs/man/dbdef_colgroup.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-NAME
-    FS::dbdef_colgroup - Column group objects
-
-SYNOPSIS
-      use FS::dbdef_colgroup;
-
-      $colgroup = new FS::dbdef_colgroup ( $lol );
-      $colgroup = new FS::dbdef_colgroup (
-        [
-          [ 'single_column' ],
-          [ 'multiple_columns', 'another_column', ],
-        ]
-      );
-
-      @sql_lists = $colgroup->sql_list;
-
-      @singles = $colgroup->singles;
-
-DESCRIPTION
-    FS::dbdef_colgroup objects represent sets of sets of columns.
-
-METHODS
-    new Creates a new FS::dbdef_colgroup object.
-
-    sql_list
-        Returns a flat list of comma-separated values, for SQL
-        statements.
-
-    singles
-        Returns a flat list of all single item lists.
-
-BUGS
-SEE ALSO
-    the FS::dbdef_table manpage, the FS::dbdef_unique manpage, the
-    FS::dbdef_index manpage, the FS::dbdef_column manpage, the
-    FS::dbdef manpage, the perldsc manpage
-
-HISTORY
-    class for dealing with groups of groups of columns (used as a
-    base class by FS::dbdef_{unique,index} )
-
-    ivan@sisd.com 98-apr-19
-
-    added singles, fixed sql_list to skip empty lists ivan@sisd.com
-    98-jun-2
-
-    untaint things we're returning in sub singels ivan@sisd.com 98-
-    jun-4
-
-    pod ivan@sisd.com 98-sep-24
-
diff --git a/htdocs/docs/man/dbdef_column.txt b/htdocs/docs/man/dbdef_column.txt
deleted file mode 100644
index 6747a328c..000000000
--- a/htdocs/docs/man/dbdef_column.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-NAME
-    FS::dbdef_column - Column object
-
-SYNOPSIS
-      use FS::dbdef_column;
-
-      $column_object = new FS::dbdef_column ( $name, $sql_type, '' );
-      $column_object = new FS::dbdef_column ( $name, $sql_type, 'NULL' );
-      $column_object = new FS::dbdef_column ( $name, $sql_type, '', $length );
-      $column_object = new FS::dbdef_column ( $name, $sql_type, 'NULL', $length );
-
-      $name = $column_object->name;
-      $column_object->name ( 'name' );
-
-      $name = $column_object->type;
-      $column_object->name ( 'sql_type' );
-
-      $name = $column_object->null;
-      $column_object->name ( 'NOT NULL' );
-
-      $name = $column_object->length;
-      $column_object->name ( $length );
-
-      $sql_line = $column->line;
-      $sql_line = $column->line $datasrc;
-
-DESCRIPTION
-    FS::dbdef::column objects represend columns in tables (see the
-    FS::dbdef_table manpage).
-
-METHODS
-    new Creates a new FS::dbdef_column object.
-
-    name
-        Returns or sets the column name.
-
-    type
-        Returns or sets the column type.
-
-    null
-        Returns or sets the column null flag.
-
-    type
-        Returns or sets the column length.
-
-    line [ $datasrc ]
-        Returns an SQL column definition.
-
-        If passed a DBI $datasrc specifying the DBD::mysql manpage
-        or the DBD::Pg manpage, will use engine-specific syntax.
-
-BUGS
-SEE ALSO
-    the FS::dbdef_table manpage, the FS::dbdef manpage, the DBI
-    manpage
-
-VERSION
-    $Id: dbdef_column.txt,v 1.5 1999-04-08 13:39:32 ivan Exp $
-
-HISTORY
-    class for dealing with column definitions
-
-    ivan@sisd.com 98-apr-17
-
-    now methods can be used to get or set data ivan@sisd.com 98-may-
-    11
-
-    mySQL-specific hack for null (what should be default?)
-    ivan@sisd.com 98-jun-2
-
-    $Log: dbdef_column.txt,v $
-    Revision 1.5  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.3 1998/10/13 13:04:17 ivan
-    fixed doc to indicate Pg specific syntax too
-
-    Revision 1.2 1998/10/12 23:40:28 ivan added Pg-specific
-    behaviour in sub line
-
diff --git a/htdocs/docs/man/dbdef_index.txt b/htdocs/docs/man/dbdef_index.txt
deleted file mode 100644
index 8cf339b84..000000000
--- a/htdocs/docs/man/dbdef_index.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-NAME
-    FS::dbdef_unique.pm - Index object
-
-SYNOPSIS
-      use FS::dbdef_index;
-
-        # see FS::dbdef_colgroup methods
-
-DESCRIPTION
-    FS::dbdef_unique objects represent the (non-unique) indices of a
-    table (the FS::dbdef_table manpage). FS::dbdef_unique inherits
-    from FS::dbdef_colgroup.
-
-BUGS
-    Is this empty subclass needed?
-
-SEE ALSO
-    the FS::dbdef_colgroup manpage, the FS::dbdef_record manpage,
-    the FS::Record manpage
-
-HISTORY
-    class for dealing with index definitions
-
-    ivan@sisd.com 98-apr-19
-
-    pod ivan@sisd.com 98-sep-24
-
diff --git a/htdocs/docs/man/dbdef_table.txt b/htdocs/docs/man/dbdef_table.txt
deleted file mode 100644
index 1a1887156..000000000
--- a/htdocs/docs/man/dbdef_table.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-NAME
-    FS::dbdef_table - Table objects
-
-SYNOPSIS
-      use FS::dbdef_table;
-
-      $dbdef_table = new FS::dbdef_table (
-        "table_name",
-        "primary_key",
-        $FS_dbdef_unique_object,
-        $FS_dbdef_index_object,
-        @FS_dbdef_column_objects,
-      );
-
-      $dbdef_table->addcolumn ( $FS_dbdef_column_object );
-
-      $table_name = $dbdef_table->name;
-      $dbdef_table->name ("table_name");
-
-      $table_name = $dbdef_table->primary_keye;
-      $dbdef_table->primary_key ("primary_key");
-
-      $FS_dbdef_unique_object = $dbdef_table->unique;
-      $dbdef_table->unique ( $FS_dbdef_unique_object );
-
-      $FS_dbdef_index_object = $dbdef_table->index;
-      $dbdef_table->index ( $FS_dbdef_index_object );
-
-      @column_names = $dbdef->columns;
-
-      $FS_dbdef_column_object = $dbdef->column;
-
-      @sql_statements = $dbdef->sql_create_table;
-      @sql_statements = $dbdef->sql_create_table $datasrc;
-
-DESCRIPTION
-    FS::dbdef_table objects represent a single database table.
-
-METHODS
-    new Creates a new FS::dbdef_table object.
-
-    addcolumn
-        Adds this FS::dbdef_column object.
-
-    name
-        Returns or sets the table name.
-
-    primary_key
-        Returns or sets the primary key.
-
-    unique
-        Returns or sets the FS::dbdef_unique object.
-
-    index
-        Returns or sets the FS::dbdef_index object.
-
-    columns
-        Returns a list consisting of the names of all columns.
-
-    column "column"
-        Returns the column object (see the FS::dbdef_column manpage)
-        for "column".
-
-    sql_create_table [ $datasrc ]
-        Returns an array of SQL statments to create this table.
-
-        If passed a DBI $datasrc specifying the DBD::mysql manpage,
-        will use MySQL-specific syntax. Non-standard syntax for
-        other engines (if applicable) may also be supported in the
-        future.
-
-BUGS
-SEE ALSO
-    the FS::dbdef manpage, the FS::dbdef_unique manpage, the
-    FS::dbdef_index manpage, the FS::dbdef_unique manpage, the DBI
-    manpage
-
-VERSION
-    $Id: dbdef_table.txt,v 1.5 1999-04-08 13:39:32 ivan Exp $
-
-HISTORY
-    class for dealing with table definitions
-
-    ivan@sisd.com 98-apr-18
-
-    gained extra functions (should %columns be an IxHash?)
-    ivan@sisd.com 98-may-11
-
-    sql_create_table returns a list of statments, not just one, and
-    now it does indices (plus mysql hack) ivan@sisd.com 98-jun-2
-
-    untaint primary_key... hmm. is this a hack around a bigger
-    problem? looks like, did the same thing singles in colgroup!
-    ivan@sisd.com 98-jun-4
-
-    pod ivan@sisd.com 98-sep-24
-
-    $Log: dbdef_table.txt,v $
-    Revision 1.5  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.2 1998/10/14 07:05:06 ivan
-    1.1.4 release, fix postgresql
-
diff --git a/htdocs/docs/man/dbdef_unique.txt b/htdocs/docs/man/dbdef_unique.txt
deleted file mode 100644
index 0e4f0150b..000000000
--- a/htdocs/docs/man/dbdef_unique.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-NAME
-    FS::dbdef_unique.pm - Unique object
-
-SYNOPSIS
-      use FS::dbdef_unique;
-
-      # see FS::dbdef_colgroup methods
-
-DESCRIPTION
-    FS::dbdef_unique objects represent the unique indices of a
-    database table (the FS::dbdef_table manpage). FS::dbdef_unique
-    inherits from FS::dbdef_colgroup.
-
-BUGS
-    Is this empty subclass needed?
-
-SEE ALSO
-    the FS::dbdef_colgroup manpage, the FS::dbdef_record manpage,
-    the FS::Record manpage
-
-HISTORY
-    class for dealing with unique definitions
-
-    ivan@sisd.com 98-apr-19
-
-    pod ivan@sisd.com 98-sep-24
-
diff --git a/htdocs/docs/man/index.html b/htdocs/docs/man/index.html
deleted file mode 100644
index 79fda2e04..000000000
--- a/htdocs/docs/man/index.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<head>
-  <title>Perl API</title>
-</head>
-<body>
-  <h1>Perl API</h1>
-  <ul>
-<li><a href="agent.txt">FS::agent</a>
-<li><a href="agent_type.txt">FS::agent_type</a>
-<li><a href="cust_bill.txt">FS::cust_bill</a>
-<li><a href="cust_bill_pkg.txt">FS::cust_bill_pkg</a>
-<li><a href="cust_credit.txt">FS::cust_credit</a>
-<li><a href="cust_main.txt">FS::cust_main</a>
-<li><a href="cust_main_county.txt">FS::cust_main_county</a>
-<li><a href="cust_main_invoice.txt">FS::cust_main_invoice</a>
-<li><a href="cust_pay.txt">FS::cust_pay</a>
-<li><a href="cust_pay_batch.txt">FS::cust_pay_batch</a>
-<li><a href="cust_pkg.txt">FS::cust_pkg</a>
-<li><a href="cust_refund.txt">FS::cust_refund</a>
-<li><a href="cust_svc.txt">FS::cust_svc</a>
-<li><a href="part_pkg.txt">FS::part_pkg</a>
-<li><a href="part_referral.txt">FS::part_referral</a>
-<li><a href="part_svc.txt">FS::part_svc</a>
-<li><a href="pkg_svc.txt">FS::pkg_svc</a>
-<li><a href="svc_Common.txt">FS::svc_Common</a>
-<li><a href="svc_acct.txt">FS::svc_acct</a>
-<li><a href="svc_acct_pop.txt">FS::svc_acct_pop</a>
-<li><a href="svc_acct_sm.txt">FS::svc_acct_sm</a>
-<li><a href="svc_domain.txt">FS::svc_domain</a>
-<li><a href="type_pkgs.txt">FS::type_pkgs</a>
-</ul>
-<br>
-<ul>
-<li><a href="Bill.txt">FS::Bill</a>
-<li><a href="CGI.txt">FS::CGI</a>
-<li><a href="Conf.txt">FS::Conf</a>
-<li><a href="Invoice.txt">FS::Invoice</a>
-<li><a href="Record.txt">FS::Record</a>
-<li><a href="SSH.txt">FS::SSH</a>
-<li><a href="UID.txt">FS::UID</a>
-</ul>
-<br>
-<ul>
-<li><a href="dbdef.txt">FS::dbdef</a>
-<li><a href="dbdef_colgroup.txt">FS::dbdef_colgroup</a>
-<li><a href="dbdef_column.txt">FS::dbdef_column</a>
-<li><a href="dbdef_index.txt">FS::dbdef_index</a>
-<li><a href="dbdef_table.txt">FS::dbdef_table</a>
-<li><a href="dbdef_unique.txt">FS::dbdef_unique</a>
-
-<ul>
-</body>
diff --git a/htdocs/docs/man/part_pkg.txt b/htdocs/docs/man/part_pkg.txt
deleted file mode 100644
index 02aa109a0..000000000
--- a/htdocs/docs/man/part_pkg.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-NAME
-    FS::part_pkg - Object methods for part_pkg objects
-
-SYNOPSIS
-      use FS::part_pkg;
-
-      $record = new FS::part_pkg \%hash
-      $record = new FS::part_pkg { 'column' => 'value' };
-
-      $custom_record = $template_record->clone;
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-DESCRIPTION
-    An FS::part_pkg object represents a billing item definition.
-    FS::part_pkg inherits from FS::Record. The following fields are
-    currently supported:
-
-    pkgpart - primary key (assigned automatically for new billing item definitions)
-    pkg - Text name of this billing item definition (customer-viewable)
-    comment - Text name of this billing item definition (non-customer-viewable)
-    setup - Setup fee
-    freq - Frequency of recurring fee
-    recur - Recurring fee
-    setup and recur are evaluated as Safe perl expressions. You can
-    use numbers just as you would normally. More advanced semantics
-    are not yet defined.
-
-METHODS
-    new HASHREF
-        Creates a new billing item definition. To add the billing
-        item definition to the database, see the section on
-        "insert".
-
-    clone
-        An alternate constructor. Creates a new billing item
-        definition by duplicating an existing definition. A new
-        pkgpart is assigned and `(CUSTOM) ' is prepended to the
-        comment field. To add the billing item definition to the
-        database, see the section on "insert".
-
-    insert
-        Adds this billing item definition to the database. If there
-        is an error, returns the error, otherwise returns false.
-
-    delete
-        Currently unimplemented.
-
-    replace OLD_RECORD
-        Replaces OLD_RECORD with this one in the database. If there
-        is an error, returns the error, otherwise returns false.
-
-    check
-        Checks all fields to make sure this is a valid billing item
-        definition. If there is an error, returns the error,
-        otherwise returns false. Called by the insert and replace
-        methods.
-
-VERSION
-    $Id: part_pkg.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-    It doesn't properly override FS::Record yet.
-
-    The delete method is unimplemented.
-
-    setup and recur semantics are not yet defined (and are
-    implemented in FS::cust_bill. hmm.).
-
-SEE ALSO
-    the FS::Record manpage, the FS::cust_pkg manpage, the
-    FS::type_pkgs manpage, the FS::pkg_svc manpage, the Safe
-    manpage. schema.html from the base documentation.
-
-HISTORY
-    ivan@sisd.com 97-dec-5
-
-    pod ivan@sisd.com 98-sep-21
-
-    $Log: part_pkg.txt,v $
-    Revision 1.3  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.5 1998/12/31 01:04:16 ivan doc
-
-    Revision 1.3 1998/11/15 13:00:15 ivan bugfix in clone method,
-    clone method doc clarification
-
diff --git a/htdocs/docs/man/part_referral.txt b/htdocs/docs/man/part_referral.txt
deleted file mode 100644
index fbc141c45..000000000
--- a/htdocs/docs/man/part_referral.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-NAME
-    FS::part_referral - Object methods for part_referral objects
-
-SYNOPSIS
-      use FS::part_referral;
-
-      $record = new FS::part_referral \%hash
-      $record = new FS::part_referral { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-DESCRIPTION
-    An FS::part_referral represents a referral - where a customer
-    heard of your services. This can be used to track the
-    effectiveness of a particular piece of advertising, for example.
-    FS::part_referral inherits from FS::Record. The following fields
-    are currently supported:
-
-    refnum - primary key (assigned automatically for new referrals)
-    referral - Text name of this referral
-METHODS
-    new HASHREF
-        Creates a new referral. To add the referral to the database,
-        see the section on "insert".
-
-    insert
-        Adds this referral to the database. If there is an error,
-        returns the error, otherwise returns false.
-
-    delete
-        Currently unimplemented.
-
-    replace OLD_RECORD
-        Replaces OLD_RECORD with this one in the database. If there
-        is an error, returns the error, otherwise returns false.
-
-    check
-        Checks all fields to make sure this is a valid referral. If
-        there is an error, returns the error, otherwise returns
-        false. Called by the insert and replace methods.
-
-VERSION
-    $Id: part_referral.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-    The delete method is unimplemented.
-
-SEE ALSO
-    the FS::Record manpage, the FS::cust_main manpage, schema.html
-    from the base documentation.
-
-HISTORY
-    Class dealing with referrals
-
-    ivan@sisd.com 98-feb-23
-
-    pod ivan@sisd.com 98-sep-21
-
-    $Log: part_referral.txt,v $
-    Revision 1.3  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.2 1998/12/29 11:59:49 ivan
-    mostly properly OO, some work still to be done with svc_ stuff
-
diff --git a/htdocs/docs/man/part_svc.txt b/htdocs/docs/man/part_svc.txt
deleted file mode 100644
index 71af2c4f4..000000000
--- a/htdocs/docs/man/part_svc.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-NAME
-    FS::part_svc - Object methods for part_svc objects
-
-SYNOPSIS
-      use FS::part_svc;
-
-      $record = new FS::part_referral \%hash
-      $record = new FS::part_referral { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-DESCRIPTION
-    An FS::part_svc represents a service definition. FS::part_svc
-    inherits from FS::Record. The following fields are currently
-    supported:
-
-    svcpart - primary key (assigned automatically for new service definitions)
-    svc - text name of this service definition
-    svcdb - table used for this service.  See the FS::svc_acct manpage,
-    the FS::svc_domain manpage, and the FS::svc_acct_sm manpage, among others.
-    *svcdb*__*field* - Default or fixed value for *field* in *svcdb*.
-    *svcdb*__*field*_flag - defines *svcdb*__*field* action: null, `D' for default, or `F' for fixed
-METHODS
-    new HASHREF
-        Creates a new service definition. To add the service
-        definition to the database, see the section on "insert".
-
-    insert
-        Adds this service definition to the database. If there is an
-        error, returns the error, otherwise returns false.
-
-    delete
-        Currently unimplemented.
-
-    replace OLD_RECORD
-        Replaces OLD_RECORD with this one in the database. If there
-        is an error, returns the error, otherwise returns false.
-
-    check
-        Checks all fields to make sure this is a valid service
-        definition. If there is an error, returns the error,
-        otherwise returns false. Called by the insert and replace
-        methods.
-
-VERSION
-    $Id: part_svc.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-    Delete is unimplemented.
-
-    The list of svc_* tables is hardcoded. When svc_acct_pop is
-    renamed, this should be fixed.
-
-SEE ALSO
-    the FS::Record manpage, the FS::part_pkg manpage, the
-    FS::pkg_svc manpage, the FS::cust_svc manpage, the FS::svc_acct
-    manpage, the FS::svc_acct_sm manpage, the FS::svc_domain
-    manpage, schema.html from the base documentation.
-
-HISTORY
-    ivan@sisd.com 97-nov-14
-
-    data checking/untainting calls into FS::Record added
-    ivan@sisd.com 97-dec-6
-
-    pod ivan@sisd.com 98-sep-21
-
-    $Log: part_svc.txt,v $
-    Revision 1.3  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.3 1999/02/07 09:59:44 ivan more
-    mod_perl fixes, and bugfixes Peter Wemm sent via email
-
-    Revision 1.2 1998/12/29 11:59:50 ivan mostly properly OO, some
-    work still to be done with svc_ stuff
-
diff --git a/htdocs/docs/man/pkg_svc.txt b/htdocs/docs/man/pkg_svc.txt
deleted file mode 100644
index d921642be..000000000
--- a/htdocs/docs/man/pkg_svc.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-NAME
-    FS::pkg_svc - Object methods for pkg_svc records
-
-SYNOPSIS
-      use FS::pkg_svc;
-
-      $record = new FS::pkg_svc \%hash;
-      $record = new FS::pkg_svc { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-DESCRIPTION
-    An FS::pkg_svc record links a billing item definition (see the
-    FS::part_pkg manpage) to a service definition (see the
-    FS::part_svc manpage). FS::pkg_svc inherits from FS::Record. The
-    following fields are currently supported:
-
-    pkgpart - Billing item definition (see the FS::part_pkg manpage)
-    svcpart - Service definition (see the FS::part_svc manpage)
-    quantity - Quantity of this service definition that this billing item
-    definition includes
-METHODS
-    new HASHREF
-        Create a new record. To add the record to the database, see
-        the section on "insert".
-
-    insert
-        Adds this record to the database. If there is an error,
-        returns the error, otherwise returns false.
-
-    delete
-        Deletes this record from the database. If there is an error,
-        returns the error, otherwise returns false.
-
-    replace OLD_RECORD
-        Replaces OLD_RECORD with this one in the database. If there
-        is an error, returns the error, otherwise returns false.
-
-    check
-        Checks all fields to make sure this is a valid record. If
-        there is an error, returns the error, otherwise returns
-        false. Called by the insert and replace methods.
-
-VERSION
-    $Id: pkg_svc.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-SEE ALSO
-    the FS::Record manpage, the FS::part_pkg manpage, the
-    FS::part_svc manpage, schema.html from the base documentation.
-
-HISTORY
-    ivan@voicenet.com 97-jul-1 added hfields ivan@sisd.com 97-nov-13
-
-    pod ivan@sisd.com 98-sep-22
-
-    $Log: pkg_svc.txt,v $
-    Revision 1.3  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.3 1999/01/18 21:58:08 ivan
-    esthetic: eq and ne were used in a few places instead of == and
-    !=
-
-    Revision 1.2 1998/12/29 11:59:51 ivan mostly properly OO, some
-    work still to be done with svc_ stuff
-
diff --git a/htdocs/docs/man/svc_Common.txt b/htdocs/docs/man/svc_Common.txt
deleted file mode 100644
index d63b8f245..000000000
--- a/htdocs/docs/man/svc_Common.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-NAME
-    FS::svc_Common - Object method for all svc_ records
-
-SYNOPSIS
-    use FS::svc_Common;
-
-    @ISA = qw( FS::svc_Common );
-
-DESCRIPTION
-    FS::svc_Common is intended as a base class for table-specific
-    classes to inherit from, i.e. FS::svc_acct. FS::svc_Common
-    inherits from FS::Record.
-
-METHODS
-    insert
-        Adds this record to the database. If there is an error,
-        returns the error, otherwise returns false.
-
-        The additional fields pkgnum and svcpart (see the
-        FS::cust_svc manpage) should be defined. An FS::cust_svc
-        record will be created and inserted.
-
-    delete
-        Deletes this account from the database. If there is an
-        error, returns the error, otherwise returns false.
-
-        The corresponding FS::cust_svc record will be deleted as
-        well.
-
-    setfixed
-        Sets any fixed fields for this service (see the FS::part_svc
-        manpage). If there is an error, returns the error, otherwise
-        returns the FS::part_svc object (use ref() to test the
-        return). Usually called by the check method.
-
-    setdefault
-        Sets all fields to their defaults (see the FS::part_svc
-        manpage), overriding their current values. If there is an
-        error, returns the error, otherwise returns the FS::part_svc
-        object (use ref() to test the return).
-
-    suspend
-    unsuspend
-    cancel
-        Stubs - return false (no error) so derived classes don't
-        need to define these methods. Called by the cancel method of
-        FS::cust_pkg (see the FS::cust_pkg manpage).
-
-VERSION
-    $Id: svc_Common.txt,v 1.1 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-    The setfixed method return value.
-
-    The new method should set defaults from part_svc (like the check
-    method sets fixed values)?
-
-SEE ALSO
-    the FS::Record manpage, the FS::cust_svc manpage, the
-    FS::part_svc manpage, the FS::cust_pkg manpage, schema.html from
-    the base documentation.
-
-HISTORY
-    $Log: svc_Common.txt,v $
-    Revision 1.1  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.3 1999/03/25 13:31:29 ivan
-    added setdefault method (generalized setfixed method to setx
-    method)
-
-    Revision 1.2 1999/01/25 12:26:14 ivan yet more mod_perl stuff
-
-    Revision 1.1 1998/12/30 00:30:45 ivan svc_ stuff is more
-    properly OO - has a common superclass FS::svc_Common
-
diff --git a/htdocs/docs/man/svc_acct.txt b/htdocs/docs/man/svc_acct.txt
deleted file mode 100644
index 7eb5be47b..000000000
--- a/htdocs/docs/man/svc_acct.txt
+++ /dev/null
@@ -1,189 +0,0 @@
-NAME
-    FS::svc_acct - Object methods for svc_acct records
-
-SYNOPSIS
-      use FS::svc_acct;
-
-      $record = new FS::svc_acct \%hash;
-      $record = new FS::svc_acct { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-      $error = $record->suspend;
-
-      $error = $record->unsuspend;
-
-      $error = $record->cancel;
-
-DESCRIPTION
-    An FS::svc_acct object represents an account. FS::svc_acct
-    inherits from FS::svc_Common. The following fields are currently
-    supported:
-
-    svcnum - primary key (assigned automatcially for new accounts)
-    username
-    _password - generated if blank
-    popnum - Point of presence (see the FS::svc_acct_pop manpage)
-    uid
-    gid
-    finger - GECOS
-    dir - set automatically if blank (and uid is not)
-    shell
-    quota - (unimplementd)
-    slipip - IP address
-    radius_*Radius_Attribute* - *Radius-Attribute*
-METHODS
-    new HASHREF
-        Creates a new account. To add the account to the database,
-        see the section on "insert".
-
-    insert
-        Adds this account to the database. If there is an error,
-        returns the error, otherwise returns false.
-
-        The additional fields pkgnum and svcpart (see the
-        FS::cust_svc manpage) should be defined. An FS::cust_svc
-        record will be created and inserted.
-
-        If the configuration value (see the FS::Conf manpage)
-        shellmachine exists, and the username, uid, and dir fields
-        are defined, the command
-
-          useradd -d $dir -m -s $shell -u $uid $username
-
-        is executed on shellmachine via ssh. This behaviour can be
-        surpressed by setting $FS::svc_acct::nossh_hack true.
-
-    delete
-        Deletes this account from the database. If there is an
-        error, returns the error, otherwise returns false.
-
-        The corresponding FS::cust_svc record will be deleted as
-        well.
-
-        If the configuration value (see the FS::Conf manpage)
-        shellmachine exists, the command:
-
-          userdel $username
-
-        is executed on shellmachine via ssh. This behaviour can be
-        surpressed by setting $FS::svc_acct::nossh_hack true.
-
-    replace OLD_RECORD
-        Replaces OLD_RECORD with this one in the database. If there
-        is an error, returns the error, otherwise returns false.
-
-        If the configuration value (see the FS::Conf manpage)
-        shellmachine exists, and the dir field has changed, the
-        command:
-
-          [ -d $old_dir ] && (
-            chmod u+t $old_dir;
-            umask 022;
-            mkdir $new_dir;
-            cd $old_dir;
-            find . -depth -print | cpio -pdm $new_dir;
-            chmod u-t $new_dir;
-            chown -R $uid.$gid $new_dir;
-            rm -rf $old_dir
-          )
-
-        is executed on shellmachine via ssh. This behaviour can be
-        surpressed by setting $FS::svc_acct::nossh_hack true.
-
-    suspend
-        Suspends this account by prefixing *SUSPENDED* to the
-        password. If there is an error, returns the error, otherwise
-        returns false.
-
-        Called by the suspend method of FS::cust_pkg (see the
-        FS::cust_pkg manpage).
-
-    unsuspend
-        Unsuspends this account by removing *SUSPENDED* from the
-        password. If there is an error, returns the error, otherwise
-        returns false.
-
-        Called by the unsuspend method of FS::cust_pkg (see the
-        FS::cust_pkg manpage).
-
-    cancel
-        Just returns false (no error) for now.
-
-        Called by the cancel method of FS::cust_pkg (see the
-        FS::cust_pkg manpage).
-
-    check
-        Checks all fields to make sure this is a valid service. If
-        there is an error, returns the error, otherwise returns
-        false. Called by the insert and replace methods.
-
-        Sets any fixed values; see the FS::part_svc manpage.
-
-VERSION
-    $Id: svc_acct.txt,v 1.4 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-    The remote commands should be configurable.
-
-    The bits which ssh should fork before doing so.
-
-    The $recref stuff in sub check should be cleaned up.
-
-SEE ALSO
-    the FS::svc_Common manpage, the FS::Record manpage, the FS::Conf
-    manpage, the FS::cust_svc manpage, the FS::part_svc manpage, the
-    FS::cust_pkg manpage, the FS::SSH manpage, the ssh manpage, the
-    FS::svc_acct_pop manpage, schema.html from the base
-    documentation.
-
-HISTORY
-    ivan@voicenet.com 97-jul-16 - 21
-
-    rewrite (among other things, now know about part_svc)
-    ivan@sisd.com 98-mar-8
-
-    Changed 'password' to '_password' because Pg6.3 reserves the
-    password word bmccane@maxbaud.net 98-apr-3
-
-    username length and shell no longer hardcoded ivan@sisd.com 98-
-    jun-28
-
-    eww but needed: ignore uid duplicates for 'fax' and 'hylafax'
-    ivan@sisd.com 98-jun-29
-
-    $nossh_hack ivan@sisd.com 98-jul-13
-
-    protections against UID/GID of 0 for incorrectly-setup RDBMSs
-    (also in bin/svc_acct.export) ivan@sisd.com 98-jul-13
-
-    arbitrary radius attributes ivan@sisd.com 98-aug-13
-
-    /var/spool/freeside/conf/shellmachine ivan@sisd.com 98-aug-13
-
-    pod and FS::conf ivan@sisd.com 98-sep-22
-
-    $Log: svc_acct.txt,v $
-    Revision 1.4  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.7 1999/04/07 14:37:37 ivan use
-    FS::part_svc and FS::svc_acct_pop to avoid warnings
-
-    Revision 1.6 1999/01/25 12:26:15 ivan yet more mod_perl stuff
-
-    Revision 1.5 1999/01/18 21:58:09 ivan esthetic: eq and ne were
-    used in a few places instead of == and !=
-
-    Revision 1.4 1998/12/30 00:30:45 ivan svc_ stuff is more
-    properly OO - has a common superclass FS::svc_Common
-
-    Revision 1.2 1998/11/13 09:56:55 ivan change configuration file
-    layout to support multiple distinct databases (with own set of
-    config files, export, etc.)
-
diff --git a/htdocs/docs/man/svc_acct_pop.txt b/htdocs/docs/man/svc_acct_pop.txt
deleted file mode 100644
index e8629fd47..000000000
--- a/htdocs/docs/man/svc_acct_pop.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-NAME
-    FS::svc_acct_pop - Object methods for svc_acct_pop records
-
-SYNOPSIS
-      use FS::svc_acct_pop;
-
-      $record = new FS::svc_acct_pop \%hash;
-      $record = new FS::svc_acct_pop { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-DESCRIPTION
-    An FS::svc_acct object represents an point of presence.
-    FS::svc_acct_pop inherits from FS::Record. The following fields
-    are currently supported:
-
-    popnum - primary key (assigned automatically for new accounts)
-    city
-    state
-    ac - area code
-    exch - exchange
-METHODS
-    new HASHREF
-        Creates a new point of presence (if only it were that
-        easy!). To add the point of presence to the database, see
-        the section on "insert".
-
-    insert
-        Adds this point of presence to the database. If there is an
-        error, returns the error, otherwise returns false.
-
-    delete
-        Removes this point of presence from the database.
-
-    replace OLD_RECORD
-        Replaces OLD_RECORD with this one in the database. If there
-        is an error, returns the error, otherwise returns false.
-
-    check
-        Checks all fields to make sure this is a valid point of
-        presence. If there is an error, returns the error, otherwise
-        returns false. Called by the insert and replace methods.
-
-VERSION
-    $Id: svc_acct_pop.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-    It should be renamed to part_pop.
-
-SEE ALSO
-    the FS::Record manpage, the svc_acct manpage, schema.html from
-    the base documentation.
-
-HISTORY
-    Class dealing with pops
-
-    ivan@sisd.com 98-mar-8
-
-    pod ivan@sisd.com 98-sep-23
-
-    $Log: svc_acct_pop.txt,v $
-    Revision 1.3  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.2 1998/12/29 11:59:53 ivan
-    mostly properly OO, some work still to be done with svc_ stuff
-
diff --git a/htdocs/docs/man/svc_acct_sm.txt b/htdocs/docs/man/svc_acct_sm.txt
deleted file mode 100644
index dc0773f0f..000000000
--- a/htdocs/docs/man/svc_acct_sm.txt
+++ /dev/null
@@ -1,124 +0,0 @@
-NAME
-    FS::svc_acct_sm - Object methods for svc_acct_sm records
-
-SYNOPSIS
-      use FS::svc_acct_sm;
-
-      $record = new FS::svc_acct_sm \%hash;
-      $record = new FS::svc_acct_sm { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-      $error = $record->suspend;
-
-      $error = $record->unsuspend;
-
-      $error = $record->cancel;
-
-DESCRIPTION
-    An FS::svc_acct object represents a virtual mail alias.
-    FS::svc_acct inherits from FS::Record. The following fields are
-    currently supported:
-
-    svcnum - primary key (assigned automatcially for new accounts)
-    domsvc - svcnum of the virtual domain (see the FS::svc_domain manpage)
-    domuid - uid of the target account (see the FS::svc_acct manpage)
-    domuser - virtual username
-METHODS
-    new HASHREF
-        Creates a new virtual mail alias. To add the virtual mail
-        alias to the database, see the section on "insert".
-
-    insert
-        Adds this virtual mail alias to the database. If there is an
-        error, returns the error, otherwise returns false.
-
-        The additional fields pkgnum and svcpart (see the
-        FS::cust_svc manpage) should be defined. An FS::cust_svc
-        record will be created and inserted.
-
-        If the configuration values (see the FS::Conf manpage)
-        shellmachine and qmailmachines exist, and domuser is `*'
-        (meaning a catch-all mailbox), the command:
-
-          [ -e $dir/.qmail-$qdomain-default ] || {
-            touch $dir/.qmail-$qdomain-default;
-            chown $uid:$gid $dir/.qmail-$qdomain-default;
-          }
-
-        is executed on shellmachine via ssh (see the section on
-        "EXTENSION ADDRESSES" in the dot-qmail manpage). This
-        behaviour can be surpressed by setting
-        $FS::svc_acct_sm::nossh_hack true.
-
-    delete
-        Deletes this virtual mail alias from the database. If there
-        is an error, returns the error, otherwise returns false.
-
-        The corresponding FS::cust_svc record will be deleted as
-        well.
-
-    replace OLD_RECORD
-        Replaces OLD_RECORD with this one in the database. If there
-        is an error, returns the error, otherwise returns false.
-
-    suspend
-        Just returns false (no error) for now.
-
-        Called by the suspend method of FS::cust_pkg (see the
-        FS::cust_pkg manpage).
-
-    unsuspend
-        Just returns false (no error) for now.
-
-        Called by the unsuspend method of FS::cust_pkg (see the
-        FS::cust_pkg manpage).
-
-    cancel
-        Just returns false (no error) for now.
-
-        Called by the cancel method of FS::cust_pkg (see the
-        FS::cust_pkg manpage).
-
-    check
-        Checks all fields to make sure this is a valid virtual mail
-        alias. If there is an error, returns the error, otherwise
-        returns false. Called by the insert and replace methods.
-
-        Sets any fixed values; see the FS::part_svc manpage.
-
-VERSION
-    $Id: svc_acct_sm.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-    The remote commands should be configurable.
-
-    The $recref stuff in sub check should be cleaned up.
-
-SEE ALSO
-    the FS::Record manpage, the FS::Conf manpage, the FS::cust_svc
-    manpage, the FS::part_svc manpage, the FS::cust_pkg manpage, the
-    FS::svc_acct manpage, the FS::svc_domain manpage, the FS::SSH
-    manpage, the ssh manpage, the dot-qmail manpage, schema.html
-    from the base documentation.
-
-HISTORY
-    ivan@voicenet.com 97-jul-16 - 21
-
-    rewrite ivan@sisd.com 98-mar-10
-
-    s/qsearchs/qsearch/ to eliminate warning ivan@sisd.com 98-apr-19
-
-    uses conf/shellmachine and has an nossh_hack ivan@sisd.com 98-
-    jul-14
-
-    s/\./:/g in .qmail-domain:com ivan@sisd.com 98-aug-13
-
-    pod, FS::Conf, moved .qmail file from check to insert 98-sep-23
-
diff --git a/htdocs/docs/man/svc_domain.txt b/htdocs/docs/man/svc_domain.txt
deleted file mode 100644
index 939a940ac..000000000
--- a/htdocs/docs/man/svc_domain.txt
+++ /dev/null
@@ -1,159 +0,0 @@
-NAME
-    FS::svc_domain - Object methods for svc_domain records
-
-SYNOPSIS
-      use FS::svc_domain;
-
-      $record = new FS::svc_domain \%hash;
-      $record = new FS::svc_domain { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-      $error = $record->suspend;
-
-      $error = $record->unsuspend;
-
-      $error = $record->cancel;
-
-DESCRIPTION
-    An FS::svc_domain object represents a domain. FS::svc_domain
-    inherits from FS::svc_Common. The following fields are currently
-    supported:
-
-    svcnum - primary key (assigned automatically for new accounts)
-    domain
-METHODS
-    new HASHREF
-        Creates a new domain. To add the domain to the database, see
-        the section on "insert".
-
-    insert
-        Adds this domain to the database. If there is an error,
-        returns the error, otherwise returns false.
-
-        The additional fields *pkgnum* and *svcpart* (see the
-        FS::cust_svc manpage) should be defined. An FS::cust_svc
-        record will be created and inserted.
-
-        The additional field *action* should be set to *N* for new
-        domains or *M* for transfers.
-
-        A registration or transfer email will be submitted unless
-        $FS::svc_domain::whois_hack is true.
-
-        The additional field *email* can be used to manually set the
-        admin contact email address on this email. Otherwise, the
-        svc_acct records for this package (see the FS::cust_pkg
-        manpage) are searched. If there is exactly one svc_acct
-        record in the same package, it is automatically used.
-        Otherwise an error is returned.
-
-    delete
-        Deletes this domain from the database. If there is an error,
-        returns the error, otherwise returns false.
-
-        The corresponding FS::cust_svc record will be deleted as
-        well.
-
-    replace OLD_RECORD
-        Replaces OLD_RECORD with this one in the database. If there
-        is an error, returns the error, otherwise returns false.
-
-    suspend
-        Just returns false (no error) for now.
-
-        Called by the suspend method of FS::cust_pkg (see the
-        FS::cust_pkg manpage).
-
-    unsuspend
-        Just returns false (no error) for now.
-
-        Called by the unsuspend method of FS::cust_pkg (see the
-        FS::cust_pkg manpage).
-
-    cancel
-        Just returns false (no error) for now.
-
-        Called by the cancel method of FS::cust_pkg (see the
-        FS::cust_pkg manpage).
-
-    check
-        Checks all fields to make sure this is a valid domain. If
-        there is an error, returns the error, otherwise returns
-        false. Called by the insert and replace methods.
-
-        Sets any fixed values; see the FS::part_svc manpage.
-
-    _whois
-        Executes the command:
-
-          whois do $domain
-
-        and returns the output.
-
-        (Always returns *No match for domian "$domain".* if
-        $FS::svc_domain::whois_hack is set true.)
-
-    submit_internic
-        Submits a registration email for this domain.
-
-VERSION
-    $Id: svc_domain.txt,v 1.4 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-    All BIND/DNS fields should be included (and exported).
-
-    Delete doesn't send a registration template.
-
-    All registries should be supported.
-
-    Should change action to a real field.
-
-    The $recref stuff in sub check should be cleaned up.
-
-SEE ALSO
-    the FS::svc_Common manpage, the FS::Record manpage, the FS::Conf
-    manpage, the FS::cust_svc manpage, the FS::part_svc manpage, the
-    FS::cust_pkg manpage, the FS::SSH manpage, the ssh manpage, the
-    dot-qmail manpage, schema.html from the base documentation,
-    config.html from the base documentation.
-
-HISTORY
-    ivan@voicenet.com 97-jul-21
-
-    rewrite ivan@sisd.com 98-mar-10
-
-    add internic bits ivan@sisd.com 98-mar-14
-
-    Changed 'day' to 'daytime' because Pg6.3 reserves the day word
-    bmccane@maxbaud.net 98-apr-3
-
-    /var/spool/freeside/conf/registries/internic/, Mail::Internet,
-    etc. ivan@sisd.com 98-jul-17-19
-
-    pod, some FS::Conf (not complete) ivan@sisd.com 98-sep-23
-
-    $Log: svc_domain.txt,v $
-    Revision 1.4  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.7 1999/04/07 14:40:15 ivan
-    use all stuff that's qsearch'ed to avoid warnings
-
-    Revision 1.6 1999/01/25 12:26:17 ivan yet more mod_perl stuff
-
-    Revision 1.5 1998/12/30 00:30:47 ivan svc_ stuff is more
-    properly OO - has a common superclass FS::svc_Common
-
-    Revision 1.3 1998/11/13 09:56:57 ivan change configuration file
-    layout to support multiple distinct databases (with own set of
-    config files, export, etc.)
-
-    Revision 1.2 1998/10/14 08:18:21 ivan More informative error
-    messages and better doc for admin contact email stuff
-
diff --git a/htdocs/docs/man/type_pkgs.txt b/htdocs/docs/man/type_pkgs.txt
deleted file mode 100644
index f575e2041..000000000
--- a/htdocs/docs/man/type_pkgs.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-NAME
-    FS::type_pkgs - Object methods for type_pkgs records
-
-SYNOPSIS
-      use FS::type_pkgs;
-
-      $record = new FS::type_pkgs \%hash;
-      $record = new FS::type_pkgs { 'column' => 'value' };
-
-      $error = $record->insert;
-
-      $error = $new_record->replace($old_record);
-
-      $error = $record->delete;
-
-      $error = $record->check;
-
-DESCRIPTION
-    An FS::type_pkgs record links an agent type (see the
-    FS::agent_type manpage) to a billing item definition (see the
-    FS::part_pkg manpage). FS::type_pkgs inherits from FS::Record.
-    The following fields are currently supported:
-
-    typenum - Agent type, see the FS::agent_type manpage
-    pkgpart - Billing item definition, see the FS::part_pkg manpage
-METHODS
-    new HASHREF
-        Create a new record. To add the record to the database, see
-        the section on "insert".
-
-    insert
-        Adds this record to the database. If there is an error,
-        returns the error, otherwise returns false.
-
-    delete
-        Deletes this record from the database. If there is an error,
-        returns the error, otherwise returns false.
-
-    replace OLD_RECORD
-        Replaces OLD_RECORD with this one in the database. If there
-        is an error, returns the error, otherwise returns false.
-
-    check
-        Checks all fields to make sure this is a valid record. If
-        there is an error, returns the error, otherwise returns
-        false. Called by the insert and replace methods.
-
-VERSION
-    $Id: type_pkgs.txt,v 1.3 1999-04-08 13:39:32 ivan Exp $
-
-BUGS
-SEE ALSO
-    the FS::Record manpage, the FS::agent_type manpage, the
-    FS::part_pkgs manpage, schema.html from the base documentation.
-
-HISTORY
-    Defines the relation between agent types and pkgparts (Which
-    pkgparts can the different [types of] agents sell?)
-
-    ivan@sisd.com 97-nov-13
-
-    change to ut_ FS::Record, fixed bugs ivan@sisd.com 97-dec-10
-
-    $Log: type_pkgs.txt,v $
-    Revision 1.3  1999-04-08 13:39:32  ivan
-    convert from pod for 1.2.0 release
- Revision 1.2 1998/12/29 11:59:58 ivan
-    mostly properly OO, some work still to be done with svc_ stuff
-
-- 
cgit v1.2.1


From a25c55d306f1d9a0146177db172e9bac5e8802f9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Aug 1999 12:26:26 +0000
Subject: updated install/upgrade instructions for new perl module stuff

---
 htdocs/docs/install.html  |  9 +++++++--
 htdocs/docs/upgrade4.html | 11 ++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 8c88a5acb..b77d37c6f 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -39,8 +39,13 @@ Install the Freeside distribution:
   <li>Add the freeside database to your database engine.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Syntax.html#Create_database">MySQL</a>) (with <a href="http://www.postgresql.org/docs/admin/manage-ag.htm#AEN854">PostgreSQL</a>)
   <li>Allow the freeside user full access to the freeside database.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Privilege_system.html#Privilege_system">MySQL</a>) (with <a href="http://www.postgresql.org/docs/admin/newuser.htm">PostgreSQL</a>)
   <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>
-  <li>Copy or link fs-x.y.z/site_perl to FS in your site_perl directory.  (try `<code>perl -V</code>' if unsure) <pre>mkdir /usr/local/lib/site_perl/FS
-cp fs-x.y.z/site_perl/* /usr/local/lib/site_perl/FS</pre> or <pre>ln -s /full/path/to/fs-x.y.z/site_perl /usr/local/lib/site_perl/FS</pre>
+  <li>Build and install the Perl libraries:
+    <pre>
+$ cd FS/
+$ perl Makefile.PL
+$ make
+$ su
+# make install</pre>
   <li>Copy or link fs-x.y.z/htdocs to your web server's document space.  <pre>mkdir /usr/local/apache/htdocs/freeside
 cp -r fs-x.y.z/htdocs/* /usr/local/apache/htdocs/freeside</pre> or <pre>ln -s /full/path/to/fs-x.y.z/htdocs /usr/local/apache/htdocs/freeside</pre>
   <li>Restrict access to this web interface.  (with <a href="http://www.apache.org/docs/misc/FAQ.html#user-authentication">Apache</a>)
diff --git a/htdocs/docs/upgrade4.html b/htdocs/docs/upgrade4.html
index 50f65731b..de44b7515 100644
--- a/htdocs/docs/upgrade4.html
+++ b/htdocs/docs/upgrade4.html
@@ -12,6 +12,15 @@
 <pre>
 ALTER TABLE cust_pay_batch CHANGE exp exp VARCHAR(11);
 </pre>
+  <li>Copy or symlink htdocs to the new copy.
+  <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
+  <li>Change to the FS directory in the new tarball, and build and install the
+      Perl modules:
+    <pre>
+$ cd FS/
+$ perl Makefile.PL
+$ make
+$ su
+# make install</pre>
   <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
-  <li>Copy or symlink htdocs and site_perl to the new copies.
 </body>
-- 
cgit v1.2.1


From 6ba4a02c70fd5e79f163ccde02a4f14c89dd8679 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Aug 1999 12:39:14 +0000
Subject: hopefully not necessary soon

---
 htdocs/docs/Net-Whois-0.23-ivan1.patch | 42 ++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 htdocs/docs/Net-Whois-0.23-ivan1.patch

diff --git a/htdocs/docs/Net-Whois-0.23-ivan1.patch b/htdocs/docs/Net-Whois-0.23-ivan1.patch
new file mode 100644
index 000000000..73de0de11
--- /dev/null
+++ b/htdocs/docs/Net-Whois-0.23-ivan1.patch
@@ -0,0 +1,42 @@
+# This is a patch for Net-Whois-0.23/Whois.pm to update it to Net-Whois-0.23-ivan1/Whois.pm.
+# It was generated by makepatch 1.93 (2.0BETA) on Tue Aug  3 02:40:13 1999.
+#
+# To apply this patch, chdir to source directory Net-Whois-0.23/Whois.pm and enter
+#
+#     patch -p1 -N < <this-file>
+
+exit
+# End of preamble.
+
+# Patch input follows.
+__DATA__
+Index: Net-Whois-0.23-ivan1/Whois.pm
+Prereq:  1.13 
+#######  => 
+*** Net-Whois-0.23/Whois.pm	Fri Jan 29 22:00:46 1999
+--- Net-Whois-0.23-ivan1/Whois.pm	Tue Aug  3 02:33:57 1999
+***************
+*** 216,224 ****
+      my %info;
+  
+      do {
+! 	$t = shift @text;
+!     } while (@text && ($t eq '' || $t =~ /^registrant:/i));
+!     @info{'NAME', 'TAG'} = ($t =~ /^(.*)\s+\((\S+)\)$/)
+  	or return;
+  
+      @t = ();
+--- 216,225 ----
+      my %info;
+  
+      do {
+!       $t = shift @text;
+!     } while ( @text && ($t !~ /^registrant:/i ) );
+!     $t = shift @text or return;
+!     @info{'NAME', 'TAG'} = ( $t =~ /^(.*)\s+\((\S+)\)$/)
+  	or return;
+  
+      @t = ();
+
+
+End of Patch.
-- 
cgit v1.2.1


From e14a30891181730a042f451bb094dee1e263700c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Aug 1999 12:41:47 +0000
Subject: pod fix

---
 FS/FS.pm | 94 +++++++++++++++++++++++++++-------------------------------------
 1 file changed, 40 insertions(+), 54 deletions(-)

diff --git a/FS/FS.pm b/FS/FS.pm
index 78317392a..64461a5d1 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -19,112 +19,98 @@ ISP billing software.  This includes:
 
 =head2 Database metadata classes
 
-=over 4
+L<FS::dbdef> - Database class
 
-=item L<FS::dbdef|FS::dbdef> - Database class
+L<FS::dbdef_table> - Database table class
 
-=item L<FS::dbdef_table|FS::dbdef_table> - Database table class
+L<FS::dbdef_column> - Database column class
 
-=item L<FS::dbdef_column|FS::dbdef_column> - Database column class
+L<FS::dbdef_colgroup> - Database column group class
 
-=item L<FS::dbdef_colgroup|FS::dbdef_colgroup> - Database column group class
+L<FS::dbdef_index> - Database index class
 
-=item L<FS::dbdef_index|FS::dbdef_index> - Database index class
-
-=item L<FS::dbdef_unique|FS::dbdef_unique> - Database unique index class
-
-=back
+L<FS::dbdef_unique> - Database unique index class
 
 =head2 Utility classes
 
-=over 4
+L<FS::SSH> - Simple wrappers around ssh and scp commands.
 
-=item L<FS::SSH|FS::SSH> - Simple wrappers around ssh and scp commands.
+L<FS::Conf> - Freeside configuration values
 
-=item L<FS::Conf|FS::Conf> - Freeside configuration values
+L<FS::UID> - User class (not yet OO)
 
-=item L<FS::UID|FS::UID> - User class (not yet OO)
-
-=item L<FS::CGI|FS::CGI> - Non OO-subroutines for the web interface.  This is
+L<FS::CGI> - Non OO-subroutines for the web interface.  This is
 depriciated.  Future development will be focused on the FS::UI user-interface
 classes (see below).
 
-=back
-
 =head2 Database record classes
 
-=over 4
+L<FS::Record> - Database record base class
 
-=item L<FS::Record|FS::Record> - Database record base class
-
-=item L<FS::svc_acct_pop|FS::svc_acct_pop> - POP (Point of Presence, not Post
+L<FS::svc_acct_pop> - POP (Point of Presence, not Post
 Office Protocol) class
 
-=item L<FS::part_referral|FS::part_referral> - Referral class
+L<FS::part_referral> - Referral class
 
-=item L<FS::cust_main_county|FS::cust_main_county> - Locale (tax rate) class
+L<FS::cust_main_county> - Locale (tax rate) class
 
-=item L<FS::svc_Common|FS::svc_Common> - Service base class
+L<FS::svc_Common> - Service base class
 
-=item L<FS::svc_acct|FS::svc_acct> - Account (shell, RADIUS, POP3) class
+L<FS::svc_acct> - Account (shell, RADIUS, POP3) class
 
-=item L<FS::svc_domain|FS::svc_domain> - Domain class
+L<FS::svc_domain> - Domain class
 
-=item L<FS::svc_acct_sm|FS::svc_acct_sm> - Vitual mail alias class
+L<FS::svc_acct_sm> - Vitual mail alias class
 
-=item L<FS::part_svc|FS::part_svc> - Service definition class
+L<FS::part_svc> - Service definition class
 
-=item L<FS::part_pkg|FS::part_pkg> - Package (billing item) definition class
+L<FS::part_pkg> - Package (billing item) definition class
 
-=item L<FS::pkg_svc|FS::pkg_svc> - Class linking package (billing item)
+L<FS::pkg_svc> - Class linking package (billing item)
 definitions (see L<FS::part_pkg>) with service definitions
 (see L<FS::part_svc>)
 
-=item L<FS::agent|FS::agent> - Agent (reseller) class
+L<FS::agent> - Agent (reseller) class
 
-=item L<FS::agent_type|FS::agent_type> - Agent type class
+L<FS::agent_type> - Agent type class
 
-=item L<FS::type_pkgs|FS::type_pkgs> - Class linking agent types (see
+L<FS::type_pkgs> - Class linking agent types (see
 L<FS::agent_type>) with package (billing item) definitions
 (see L<FS::part_pkg>)
 
-=item L<FS::cust_svc|FS::cust_svc> - Service class
+L<FS::cust_svc> - Service class
 
-=item L<FS::cust_pkg|FS::cust_pkg> - Package (billing item) class
+L<FS::cust_pkg> - Package (billing item) class
 
-=item L<FS::cust_main|FS::cust_main> - Customer class
+L<FS::cust_main> - Customer class
 
-=item L<FS::cust_main_invoice|FS::cust_main_invoice> - Invoice destination
+L<FS::cust_main_invoice> - Invoice destination
 class
 
-=item L<FS::cust_bill|FS::cust_bill> - Invoice class
+L<FS::cust_bill> - Invoice class
 
-=item L<FS::cust_bill_pkg|FS::cust_bill_pkg> - Invoice line item class
+L<FS::cust_bill_pkg> - Invoice line item class
 
-=item L<FS::cust_pay|FS::cust_pay> - Payment class
+L<FS::cust_pay> - Payment class
 
-=item L<FS::cust_credit|FS::cust_credit> - Credit class
+L<FS::cust_credit> - Credit class
 
-=item L<FS::cust_refund|FS::cust_refund> - Refund class
+L<FS::cust_refund> - Refund class
 
-=item L<FS::cust_pay_batch|FS::cust_pay_batch> - Credit card transaction queue
+L<FS::cust_pay_batch> - Credit card transaction queue
 class
 
-=back
-
 =head2 User Interface classes (under development; not yet usable)
 
-=over 4
-
-=item L<FS::UI::Base|FS::UI::Base> - User-interface base class
+L<FS::UI::Base> - User-interface base class
 
-=item L<FS::UI::Gtk|FS::UI::Gtk> - Gtk user-interface class
+L<FS::UI::Gtk> - Gtk user-interface class
 
-=item L<FS::UI::CGI|FS::UI::CGI> - CGI (HTML) user-interface class
+L<FS::UI::CGI> - CGI (HTML) user-interface class
 
-=item L<FS::UI::agent|FS::UI::agent> - agent table user-interface class
+L<FS::UI::agent> - agent table user-interface class
 
-=back
+=head2 Notes
 
 To quote perl(1), "If you're intending to read these straight through for the
 first time, the suggested order will tend to reduce the number of forward
@@ -141,7 +127,7 @@ The main documentation is in htdocs/docs.
 
 =head1 VERSION
 
-$Id: FS.pm,v 1.2 1999-08-04 07:34:15 ivan Exp $
+$Id: FS.pm,v 1.3 1999-08-04 12:41:47 ivan Exp $
 
 =head1 SUPPORT
 
-- 
cgit v1.2.1


From 32794e9defaeb5ebc84afabf3ef5b360f5533d08 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Aug 1999 12:42:19 +0000
Subject: new, kludgy-but-working html generator

---
 bin/pod2x | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/bin/pod2x b/bin/pod2x
index 1edb1c41e..2c10a30d0 100755
--- a/bin/pod2x
+++ b/bin/pod2x
@@ -3,21 +3,27 @@
 #use Pod::Text;
 #$Pod::Text::termcap=1;
 
-my $site_perl = "./site_perl";
+my $site_perl = "./FS";
 #my $catman = "./catman";
-my $catman = "./htdocs/docs/man";
-#my $html = "./htdocs/docs/man";
+#my $catman = "./htdocs/docs/man";
+my $html = "./htdocs/docs/man";
 
 $|=1;
 
 die "Can't find $site_perl and $catman"
   unless [ -d $site_perl ] && [ -d $catman ] && [ -d $html ];
 
-foreach my $file (glob("$site_perl/*.pm")) {
-  $file =~ /\/([\w\-]+)\.pm$/ or die "oops file $file";
+foreach my $file (
+  glob("$site_perl/*.pm"),
+  glob("$site_perl/*/*.pm"),
+  glob("$site_perl/*/*/*.pm")
+) {
+  #$file =~ /\/([\w\-]+)\.pm$/ or die "oops file $file";
+  $file =~ /$site_perl\/(.*)\.pm$/ or die "oops file $file";
   my $name = $1;
-  print "$name\n"; 
-  system "pod2text $file >$catman/$name.txt"; 
-#  system "pod2html --podpath=$site_perl $file >$html/$name.html";
+  print "$name\n";
+  my $htmlroot = join('/', map '..',1..(scalar($file =~ tr/\///)-2)) || '.';
+#  system "pod2text $file >$catman/$name.txt"; 
+  system "pod2html --podroot=$site_perl --podpath=./FS:./FS/UI:. --norecurse --htmlroot=$htmlroot $file >$html/$name.html";
 #  system "pod2html $file >$html/$name.html";
 }
-- 
cgit v1.2.1


From 5c797603d68f5a240a49e0082508a96fc2a1cd8e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 5 Aug 1999 07:19:54 +0000
Subject: minor documentation update

---
 htdocs/docs/install.html |  2 +-
 htdocs/docs/trouble.html | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index b77d37c6f..f38b89e3b 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -7,7 +7,7 @@ Before installing, you need:
 <ul>
   <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
   <li><a href="ftp://ftp.cs.hut.fi/pub/ssh/">SSH</a>
-  <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_04 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
+  <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
   <li>A database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>, such as <a href="http://www.tcx.se/">MySQL</a> or <a href="http://www.postgresql.org/">PostgreSQL</a> (see the <a href="postgresql.html">PostgreSQL notes</a>)
   <li>Perl modules
     <ul>
diff --git a/htdocs/docs/trouble.html b/htdocs/docs/trouble.html
index c918138c8..fce743928 100644
--- a/htdocs/docs/trouble.html
+++ b/htdocs/docs/trouble.html
@@ -5,11 +5,6 @@
   <h1>Troubleshooting</h1>
   <ul>
     <li>When troubleshooting the web interface, helpful information is often in your web server's error log.
-    <li>Internet Explorer will not work with Freeside's HTML interface.  <b>This may be fixed in >1.2, please report your experiences!</b>
-<a HREF="http://www.netscape.com">Netscape</a>,                                 
-<a HREF="http://lynx.browser.org">Lynx</a>, and                                 
-<a HREF="http://www.cs.indiana.edu/elisp/w3/docs.html">Emacs/W3</a>,            
-among others, should work fine.
     <li>If bin/svc_acct.import fails with an "Out of memory!" error using MySQL, upgrede MySQL and recompile the Perl DBD.  There was a memory leak in some older versions of MySQL.
     <li>If you get tons of errors in your web server's error log like this:
 <pre>
@@ -17,13 +12,6 @@ Ambiguous use of value => resolved to "value" =>
 at /usr/lib/perl5/site_perl/File/CounterFile.pm line 132.
 </pre>
         This clutters up your log files but is otherwise harmless.  Upgrade to the latest File::CounterFile. 
-    <li><b>(No longer applicable in >1.2!)</b> If you get an Internal Server Error when adding or editing, but find that the update has occured, and you get something like the following in your web server's error log:
-<pre>
-access to <i>/your/path</i>/edit/process/<i>some_table</i>.cgi failed for
-<i>machine.domain.tld</i>, reason: malformed header from script.
-Bad header=HTTP/1.0 302 Moved Temporarily
-</pre>
-        Then you forgot to apply this <a href="CGI-modules-2.76-patch.txt">patch</a> as mentioned in the <a href="install.html">New Installation</a> section of the documentation.
     <li>If you get errors like this:
 <pre>
 UID.pm: Can't open /var/spool/freeside/conf/secrets: Permission denied 
-- 
cgit v1.2.1


From 40e0a5460891d0b9e49233a1717b5914318a4289 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 10 Aug 1999 11:15:45 +0000
Subject: corrected a misleading comment

---
 htdocs/edit/cust_main.cgi | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index e2e2d334d..612d137b2 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.16 1999-07-20 10:37:05 ivan Exp $
+# $Id: cust_main.cgi,v 1.17 1999-08-10 11:15:45 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,9 +38,8 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.16  1999-07-20 10:37:05  ivan
-# cleaned up the new one-screen signup bits in htdocs/edit/cust_main.cgi to
-# prepare for a signup server
+# Revision 1.17  1999-08-10 11:15:45  ivan
+# corrected a misleading comment
 #
 # Revision 1.15  1999/04/14 13:14:54  ivan
 # configuration option to edit referrals of existing customers
@@ -339,7 +338,7 @@ unless ( $custnum ) {
   #false laziness, copied from FS::cust_pkg::order
   my $pkgpart;
   if ( scalar(@agents) == 1 ) {
-    # $pkgpart->{$pkgpart} is true iff $custnum may purchase $pkgpart
+    # $pkgpart->{PKGPART} is true iff $custnum may purchase $pkgpart
     my($agent)=qsearchs('agent',{'agentnum'=> $agentnum });
     $pkgpart = $agent->pkgpart_hashref;
   } else {
-- 
cgit v1.2.1


From dbd9d65ba61281c0e5d4c976b60e233111e1dfb1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 10 Aug 1999 12:06:40 +0000
Subject: even though you should probably set this for your installation

---
 fs_passwd/fs_passwdd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_passwd/fs_passwdd b/fs_passwd/fs_passwdd
index 582e13ccd..be7539984 100755
--- a/fs_passwd/fs_passwdd
+++ b/fs_passwd/fs_passwdd
@@ -11,7 +11,7 @@ use Socket;
 
 my($fs_passwdd_socket)="/usr/local/freeside/fs_passwdd_socket";
 
-$ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin';
+$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
 $ENV{'SHELL'} = '/bin/sh';
 $ENV{'IFS'} = " \t\n";
 $ENV{'CDPATH'} = '';
-- 
cgit v1.2.1


From fde6e8e3367ffca17bff1451d1d6bd78c87c092d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 10 Aug 1999 12:54:06 +0000
Subject: use FS::cust_pkg::pkgpart_href

---
 htdocs/edit/process/cust_main.cgi | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/htdocs/edit/process/cust_main.cgi b/htdocs/edit/process/cust_main.cgi
index a66432ad1..25dc0299b 100755
--- a/htdocs/edit/process/cust_main.cgi
+++ b/htdocs/edit/process/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.10 1999-04-14 07:47:53 ivan Exp $
+# $Id: cust_main.cgi,v 1.11 1999-08-10 12:54:06 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -20,7 +20,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.10  1999-04-14 07:47:53  ivan
+# Revision 1.11  1999-08-10 12:54:06  ivan
+# use FS::cust_pkg::pkgpart_href
+#
+# Revision 1.10  1999/04/14 07:47:53  ivan
 # i18n fixes
 #
 # Revision 1.9  1999/04/07 15:22:19  ivan
@@ -118,21 +121,25 @@ if ( $new->custnum eq '' ) {
     # generate %part_pkg
     # $part_pkg{$pkgpart} is true iff $custnum may purchase $pkgpart
     my $agent = qsearchs('agent',{'agentnum'=> $new->agentnum });
-    my($type_pkgs);
-    foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
-      my($pkgpart)=$type_pkgs->pkgpart;
-      $part_pkg{$pkgpart}++;
-    }
+    	#my($type_pkgs);
+    	#foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
+    	#  my($pkgpart)=$type_pkgs->pkgpart;
+    	#  $part_pkg{$pkgpart}++;
+    	#}
+    # $pkgpart_href->{PKGPART} is true iff $custnum may purchase $pkgpart
+    my $pkgpart_href = $agent->pkgpart_hashref;
     #eslaf
 
+    # this should wind up in FS::cust_pkg!
     $error ||= "Agent ". $new->agentnum. " (type ". $agent->typenum. ") can't".
                "purchase pkgpart ". $pkgpart
-      unless $part_pkg{ $pkgpart };
+      #unless $part_pkg{ $pkgpart };
+      unless $pkgpart_href->{ $pkgpart };
 
     $cust_pkg = new FS::cust_pkg ( {
-                            #later         'custnum' => $custnum,
-                                     'pkgpart' => $pkgpart,
-                                   } );
+      #later         'custnum' => $custnum,
+      'pkgpart' => $pkgpart,
+    } );
     $error ||= $cust_pkg->check;
 
     #$cust_svc = new FS::cust_svc ( { 'svcpart' => $svcpart } );
-- 
cgit v1.2.1


From 453f8ffb1b1b54998c208ec49a8284394b2727bf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 10 Aug 1999 12:55:11 +0000
Subject: ready for testing

---
 fs_signup/fs_signup_server | 152 ++++++++++++++++++++++++++++++++-------------
 fs_signup/fs_signupd       | 116 ++++++++++++++++++++++++++++------
 2 files changed, 206 insertions(+), 62 deletions(-)

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 5feed4cb6..cf2519ec0 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -20,7 +20,7 @@ my $machine = shift or die &usage;
 
 my $agentnum = shift or die &usage;
 my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } ) or die &usage;
-#my %part_pkg = %{ $agent->pkgpart_hashref };
+my $pkgpart = $agent->pkgpart_hashref;
 
 my $refnum = shift or die &usage;
 
@@ -34,9 +34,9 @@ while (1) {
   sshopen2($shellmachine,$reader,$writer,$fs_signupd);
 
   #send fs_signupd state/county/country
-  @cust_main_county = qsearch('cust_main_county', {} );
+  @my cust_main_county = qsearch('cust_main_county', {} );
   print $writer join("\n",
-    scalar(@cust_main_county),
+    scalar(@cust_main_county) || die "no tax rates (cust_main_county records)",
     map {
       $_->taxnum,
       $_->state,
@@ -46,57 +46,121 @@ while (1) {
   ),"\n";
 
   #send fs_signupd package definitions
+  my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } }
+    qsearch( 'part_pkg', {} );
+  print $writer join("\n",
+    scalar(@part_pkg) || die "no usable package definitions, agent $agentnum",
+    map {
+      $_->pkgpart,
+      $_->pkg,
+    } @part_pkg
+  ), "\n";
 
   #send fs_signupd POPs
+  my @svc_acct_pop = qsearch ('svc_acct_pop',{} );
+  print $writer join("\n",
+    scalar(@svc_acct_pop) || die "No points of presence (svc_acct_pop records)",
+    map {
+      $_->popnum,
+      $_->city,
+      $_->state,
+      $_->ac,
+      $_->exch,
+    } @svc_acct_pop
+  ), "\n";
 
+  while (1) {
+    chop( my(
+      $first, $last, $ss, $company, $address1, $address2, $city, $county,
+      $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
+      $paydate, $payname, $invoicing_list, $pkgpart, $username, $password,
+      $popnum,
+    ) = <$reader> );
+
+    my $error = '';
+
+    #shares some stuff with htdocs/edit/process/cust_main.cgi... take any
+    # common that are still here and library them.
+    my $cust_main = new FS::cust_main ( {
+      'custnum'  => '',
+      'agentnum' => $agentnum,
+      'refnum'   => $refnum,
+      'last'     => $last,
+      'first'    => $first,
+      'ss'       => $ss,
+      'company'  => $company,
+      'address1' => $address1,
+      'address2' => $address2,
+      'city'     => $city,
+      'county'   => $county,
+      'state'    => $state,
+      'zip'      => $zip,
+      'country'  => $country,
+      'daytime'  => $daytime,
+      'night'    => $night,
+      'fax'      => $fax,
+      'payby'    => $payby,
+      'payinfo'  => $payinfo,
+      'paydate'  => $paydate,
+      'payname'  => $payname,
+    } );
 
+    my @invoicing_list = split( /\s*\,\s*/, $invoicing_list );
 
-  while (1) {
-    my( $first, $last, $ss, $company, $address1, $address2, $city, $county,
-        $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
-        $paydate, $payname, $username, $password, $popnum,
-    );
-
-
-
-    my($username,$old_password,$new_password,$new_gecos,$new_shell);
-    defined($username=<$reader>) or last;
-    defined($old_password=<$reader>) or last; 
-    defined($new_password=<$reader>) or last; 
-    defined($new_gecos=<$reader>) or last; 
-    defined($new_shell=<$reader>) or last; 
-    chop($username);
-    chop($old_password);
-    chop($new_password);
-    chop($new_gecos);
-    chop($new_shell);
-    my($svc_acct);
-
-    #need to try both $old_password and encrypted $old_password
-    #maybe the crypt function in svc_acct.export needs to be a library?
-    my $salt = substr($old_password,0,2);
-    my $cold_password = crypt($old_password,$salt);
-    $svc_acct=qsearchs('svc_acct',{'username'=>$username,
-                                   '_password'=>$old_password,
-    } )
-           || qsearchs('svc_acct',{'username'=>$username,
-                                   '_password'=>$cold_password,
+    $error ||= $cust_main->check_invoicing_list( \@invoicing_list );
+
+    my $part_pkg = qsearchs( 'part_pkg', { 'pkgpart' => $pkgpart } )
+      or die "unknown pkgpart $pkgpart";
+    my $svcpart = $part_pkg->svcpart;
+
+    # this should wind up in FS::cust_pkg!
+    die "agent $agentnum can't purchase pkgpart $pkgpart"
+      unless $pkgpart->{ $pkgpart };
+
+    my $cust_pkg = new FS::cust_pkg ( {
+      #later#'custnum' => $custnum,
+      'pkgpart' => $pkgpart,
+    } );
+    $error ||= $cust_pkg->check;
+
+    $svc_acct = new FS::svc_acct ( {
+      'svcpart'   => $svcpart,
+      'username'  => $username,
+      '_password' => $password,
+      'popnum'    => $popnum,
     } );
-    unless ( $svc_acct ) { print $writer "Incorrect password.\n"; next; }
-
-    my(%hash)=$svc_acct->hash;
-    my($new_svc_acct) = new FS::svc_acct ( \%hash );
-    $new_svc_acct->setfield('_password',$new_password) 
-      if $new_password && $new_password ne $old_password;
-    $new_svc_acct->setfield('finger',$new_gecos) if $new_gecos;
-    $new_svc_acct->setfield('shell',$new_shell) if $new_shell;
-    my($error)=$new_svc_acct->replace($svc_acct);
-    print $writer $error,"\n";
+
+    my $y = $svc_acct->setdefault; # arguably should be in new method
+    $error ||= $y unless ref($y);
+    #and just in case you were silly
+    $svc_acct->svcpart($svcpart);
+    $svc_acct->username($username);
+    $svc_acct->_password($password);
+    $svc_acct->popnum($popnum);
+
+    $error ||= $svc_acct->check;
+
+    $error ||= $cust_main->insert;
+    if ( $cust_pkg && ! $error ) { #in this case, $cust_pkg should always
+                                   #be definied, but....
+      $cust_pkg->custnum( $new->custnum );
+      $error ||= $cust_pkg->insert; 
+      warn "WARNING: $error on pre-checked cust_pkg record!" if $error;
+      $svc_acct->pkgnum( $cust_pkg->pkgnum );
+      $error ||= $svc_acct->insert;
+      warn "WARNING: $error on pre-checked svc_acct record!" if $error;
+    }
+
+    print $writer $error, "\n";
+
+    $cust_main->invoicing_list( \@invoicing_list ) unless $error;
+
   }
   close $writer;
   close $reader;
+  warn "connection to $shellmachine lost!  waiting 60 seconds...\n";
   sleep 60;
-  warn "Connection to $shellmachine lost!  Reconnecting...\n";
+  warn "reconnecting...\n";
 }
 
 sub usage {
diff --git a/fs_signup/fs_signupd b/fs_signup/fs_signupd
index 582e13ccd..71fd1540d 100755
--- a/fs_signup/fs_signupd
+++ b/fs_signup/fs_signupd
@@ -1,17 +1,16 @@
 #!/usr/bin/perl -Tw
 #
-# fs_passwdd
+# fs_signupd
 #
-# This is run REMOTELY over ssh by fs_passwd_server.
+# This is run REMOTELY over ssh by fs_signup_server.
 #
-# ivan@sisd.com 98-mar-9
 
 use strict;
 use Socket;
 
-my($fs_passwdd_socket)="/usr/local/freeside/fs_passwdd_socket";
+my($fs_passwdd_socket)="/usr/local/freeside/fs_signupd_socket";
 
-$ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin';
+$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
 $ENV{'SHELL'} = '/bin/sh';
 $ENV{'IFS'} = " \t\n";
 $ENV{'CDPATH'} = '';
@@ -20,6 +19,46 @@ $ENV{'BASH_ENV'} = '';
 
 $|=1;
 
+chomp( my $n_cust_main_county = <STDIN> );
+my @cust_main_county = map {
+  chomp( my $taxnum = <STDIN> );
+  chomp( my $state = <STDIN> );
+  chomp( my $county = <STDIN> );
+  chomp( my $country = <STDIN> );
+  {
+    'taxnum'  => $taxnum,
+    'state'   => $state,
+    'county'  => $county,
+    'country' => $country,
+  };
+} ( 1 .. $n_cust_main_county );
+
+chomp( my $n_part_pkg = <STDIN> );
+my @part_pkg = map {
+  chomp( my $pkgpart = <STDIN> );
+  chomp( my $pkg = <STDIN> );
+  {
+    'pkgpart' => $pkgpart,
+    'pkg'     => $pkg,
+  };
+} ( 1 .. $n_part_pkg );
+
+chomp( my $n_svc_acct_pop = <STDIN> );
+my @svc_acct_pop = map {
+  chomp( my $popnum = <STDIN> );
+  chomp( my $city = <STDIN> );
+  chomp( my $state = <STDIN> );
+  chomp( my $ac = <STDIN> );
+  chomp( my $exch = <STDIN> );
+  {
+    'popnum' => $popnum,
+    'city'   => $city,
+    'state'  => $state,
+    'ac'     => $ac,
+    'exch'   => $exch,
+  };
+} ( 1 .. $n_svc_acct_pop );
+
 my $uaddr = sockaddr_un($fs_passwdd_socket);
 my $proto = getprotobyname('tcp');
 
@@ -28,22 +67,63 @@ unlink($fs_passwdd_socket);
 bind(Server, $uaddr) or die "bind: $!";
 listen(Server,SOMAXCONN) or die "listen: $!";
 
-my($paddr);
+my $paddr;
+
 for ( ; $paddr = accept(Client,Server); close Client) {
-  my($me,$old_password,$new_password,$new_gecos,$new_shell);
 
-  $me=<Client>;
-  $old_password=<Client>;
-  $new_password=<Client>;
-  $new_gecos=<Client>;
-  $new_shell=<Client>;
+  chop( my $command = <Client> );
+
+  if ( $command eq "signup_info" ) {
+
+    print Client join("\n", $n_cust_main_county,
+      map {
+        $_->{taxnum},
+        $_->{state},
+        $_->{county},
+        $_->{country},
+      } @cust_main_county
+    ), "\n";
+
+    print Client join("\n", $n_part_pkg,
+      map {
+        $_->{pkgpart},
+        $_->{pkg},
+      } @part_pkg
+    ), "\n";
+
+    print Client join("\n", $n_svc_acct_pop,
+      map {
+        $_->{popnum},
+        $_->{city},
+        $_->{state},
+        $_->{ac},
+        $_->{exch},
+      } @svc_acct_pop
+    ), "\n";
+
+  } elsif ( $operation eq "new_customer" ) {
+
+    my(
+      $first, $last, $ss, $company, $address1, $address2, $city, $county,
+      $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
+      $paydate, $payname, $invoicing_list, $pkgpart, $username, $password,
+      $popnum,
+    ) = <Client>;
+
+    print 
+      $first, $last, $ss, $company, $address1, $address2, $city, $county,
+      $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
+      $paydate, $payname, $invoicing_list, $pkgpart, $username, $password,
+      $popnum,
+    ;
+
+    my $error = <STDIN>;
+
+    print Client $error;
 
-  print $me,$old_password,$new_password,$new_gecos,$new_shell;
-  my($error);
+  } else {
+    die "unexpected command from client: $command";
+  }
 
-  $error=<STDIN>;
-  
-  print Client $error;
-  close Client;
 }
 
-- 
cgit v1.2.1


From 8ba31246d8226ff4d71d0ddabcb31d984e7a1548 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 11 Aug 1999 13:12:11 +0000
Subject: require a working Net::Whois version

---
 FS/FS/svc_domain.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index c6d124833..57fa47fa8 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -8,7 +8,7 @@ use Carp;
 use Mail::Internet;
 use Mail::Header;
 use Date::Format;
-use Net::Whois; #0.24;
+use Net::Whois 1.001;
 use FS::Record qw(fields qsearch qsearchs);
 use FS::Conf;
 use FS::svc_Common;
@@ -393,7 +393,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: svc_domain.pm,v 1.2 1999-08-11 13:12:11 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 48ecf4bec10d12ad53519406d8cf8b358aadd8cc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 11 Aug 1999 13:13:13 +0000
Subject: no longer needed, Net::Whois v1.001 released

---
 htdocs/docs/Net-Whois-0.23-ivan1.patch | 42 ----------------------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 htdocs/docs/Net-Whois-0.23-ivan1.patch

diff --git a/htdocs/docs/Net-Whois-0.23-ivan1.patch b/htdocs/docs/Net-Whois-0.23-ivan1.patch
deleted file mode 100644
index 73de0de11..000000000
--- a/htdocs/docs/Net-Whois-0.23-ivan1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# This is a patch for Net-Whois-0.23/Whois.pm to update it to Net-Whois-0.23-ivan1/Whois.pm.
-# It was generated by makepatch 1.93 (2.0BETA) on Tue Aug  3 02:40:13 1999.
-#
-# To apply this patch, chdir to source directory Net-Whois-0.23/Whois.pm and enter
-#
-#     patch -p1 -N < <this-file>
-
-exit
-# End of preamble.
-
-# Patch input follows.
-__DATA__
-Index: Net-Whois-0.23-ivan1/Whois.pm
-Prereq:  1.13 
-#######  => 
-*** Net-Whois-0.23/Whois.pm	Fri Jan 29 22:00:46 1999
---- Net-Whois-0.23-ivan1/Whois.pm	Tue Aug  3 02:33:57 1999
-***************
-*** 216,224 ****
-      my %info;
-  
-      do {
-! 	$t = shift @text;
-!     } while (@text && ($t eq '' || $t =~ /^registrant:/i));
-!     @info{'NAME', 'TAG'} = ($t =~ /^(.*)\s+\((\S+)\)$/)
-  	or return;
-  
-      @t = ();
---- 216,225 ----
-      my %info;
-  
-      do {
-!       $t = shift @text;
-!     } while ( @text && ($t !~ /^registrant:/i ) );
-!     $t = shift @text or return;
-!     @info{'NAME', 'TAG'} = ( $t =~ /^(.*)\s+\((\S+)\)$/)
-  	or return;
-  
-      @t = ();
-
-
-End of Patch.
-- 
cgit v1.2.1


From 29704e87180ba0be89392b14c1420ff4f36af40a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 11 Aug 1999 13:54:18 +0000
Subject: documentation updates

---
 htdocs/docs/install.html  | 5 +++--
 htdocs/docs/upgrade4.html | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index f38b89e3b..592d6566d 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -9,7 +9,7 @@ Before installing, you need:
   <li><a href="ftp://ftp.cs.hut.fi/pub/ssh/">SSH</a>
   <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
   <li>A database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>, such as <a href="http://www.tcx.se/">MySQL</a> or <a href="http://www.postgresql.org/">PostgreSQL</a> (see the <a href="postgresql.html">PostgreSQL notes</a>)
-  <li>Perl modules
+  <li>Perl modules (<a href="http://www.perl.com/CPAN/doc/manual/html/lib/CPAN.html">CPAN</a> will query, download and build perl modules))
     <ul>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Array/">Array-PrintCols</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Term/">Term-Query</a>
@@ -19,7 +19,8 @@ Before installing, you need:
       <li><a href="http://www.perl.com/CPAN/modules/by-module/URI">URI</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/HTTP">HTML-Parser</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Net">libnet</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/Net">Net::Whois</a> with this <a href="Net-Whois-0.23-ivan1.patch">patch</a> applied
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/Locale">Locale-Codes</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/Net">Net-Whois</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/LWP/">libwww-perl</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Business/">Business-CreditCard</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Data/">Data-ShowTable</a>
diff --git a/htdocs/docs/upgrade4.html b/htdocs/docs/upgrade4.html
index de44b7515..1d70f8b73 100644
--- a/htdocs/docs/upgrade4.html
+++ b/htdocs/docs/upgrade4.html
@@ -8,6 +8,7 @@
   <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
   <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
   <li>Back up your data and current Freeside installation.
+  <li>Install the Perl modules <a href="http://www.perl.com/CPAN/modules/by-module/Locale/">Locale-Codes</a> and <a href="http://www.perl.com/CPAN/modules/by-module/Net/">Net-Whois</a>.
   <li>Apply the following changes to your database:
 <pre>
 ALTER TABLE cust_pay_batch CHANGE exp exp VARCHAR(11);
-- 
cgit v1.2.1


From 6178bdb5a08527e9c64deb05fab6b836af869695 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 11 Aug 1999 14:42:57 +0000
Subject: *** empty log message ***

---
 bin/backup-freeside      | 6 ++++++
 htdocs/docs/install.html | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 bin/backup-freeside

diff --git a/bin/backup-freeside b/bin/backup-freeside
new file mode 100644
index 000000000..a39b04692
--- /dev/null
+++ b/bin/backup-freeside
@@ -0,0 +1,6 @@
+#!/bin/sh
+/etc/init.d/apache stop
+/etc/init.d/mysql stop
+tar czvf var-lib-mysql-`date +%y%m%d%H%M%S`.tar.gz /var/lib/mysql
+/etc/init.d/mysql start
+/etc/init.d/apache start
diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 592d6566d..5a4d1b2d7 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -9,7 +9,7 @@ Before installing, you need:
   <li><a href="ftp://ftp.cs.hut.fi/pub/ssh/">SSH</a>
   <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
   <li>A database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>, such as <a href="http://www.tcx.se/">MySQL</a> or <a href="http://www.postgresql.org/">PostgreSQL</a> (see the <a href="postgresql.html">PostgreSQL notes</a>)
-  <li>Perl modules (<a href="http://www.perl.com/CPAN/doc/manual/html/lib/CPAN.html">CPAN</a> will query, download and build perl modules))
+  <li>Perl modules (<a href="http://www.perl.com/CPAN/doc/manual/html/lib/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
     <ul>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Array/">Array-PrintCols</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Term/">Term-Query</a>
-- 
cgit v1.2.1


From a1e172b1700ef8ea6b9d84f600e26ff53b9e300e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 11 Aug 1999 15:38:33 +0000
Subject: fix for perl 5.004_04

---
 htdocs/edit/cust_main.cgi | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 612d137b2..d5ae36348 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.17 1999-08-10 11:15:45 ivan Exp $
+# $Id: cust_main.cgi,v 1.18 1999-08-11 15:38:33 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.17  1999-08-10 11:15:45  ivan
+# Revision 1.18  1999-08-11 15:38:33  ivan
+# fix for perl 5.004_04
+#
+# Revision 1.17  1999/08/10 11:15:45  ivan
 # corrected a misleading comment
 #
 # Revision 1.15  1999/04/14 13:14:54  ivan
@@ -346,7 +349,8 @@ unless ( $custnum ) {
     my %typenum;
     foreach my $agent ( @agents ) {
       next if $typenum{$agent->typenum}++;
-      $pkgpart->{$_}++ foreach keys %{ $agent->pkgpart_hashref }
+      #5.004_04 barfs (5.004_05 okay?)# $pkgpart->{$_}++ foreach keys %{ $agent->pkgpart_hashref }
+      foreach ( keys %{ $agent->pkgpart_hashref } ) { $pkgpart->{$_}++; }
     }
   }
   #eslaf
-- 
cgit v1.2.1


From 0b1f40cc85eee025f01dd14e155cc65837e3f9e5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 11 Aug 1999 20:41:28 +0000
Subject: new bill script,

---
 FS/FS/svc_domain.pm  |   4 +-
 FS/MANIFEST          |   1 +
 FS/Makefile.PL       |   3 +-
 FS/bin/freeside-bill | 122 +++++++++++++++++++++++++++++++++++
 bin/bill             | 176 ---------------------------------------------------
 5 files changed, 127 insertions(+), 179 deletions(-)
 create mode 100755 FS/bin/freeside-bill
 delete mode 100755 bin/bill

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 57fa47fa8..73cc3e340 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -8,7 +8,7 @@ use Carp;
 use Mail::Internet;
 use Mail::Header;
 use Date::Format;
-use Net::Whois 1.001;
+use Net::Whois 1.0;
 use FS::Record qw(fields qsearch qsearchs);
 use FS::Conf;
 use FS::svc_Common;
@@ -393,7 +393,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.2 1999-08-11 13:12:11 ivan Exp $
+$Id: svc_domain.pm,v 1.3 1999-08-11 20:41:27 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 37e19e890..e1b4413c6 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -45,3 +45,4 @@ MANIFEST.SKIP
 Makefile.PL
 test.pl
 README
+bin/freeside-bill
diff --git a/FS/Makefile.PL b/FS/Makefile.PL
index 22b412d21..ab4c2281b 100644
--- a/FS/Makefile.PL
+++ b/FS/Makefile.PL
@@ -2,6 +2,7 @@ use ExtUtils::MakeMaker;
 # See lib/ExtUtils/MakeMaker.pm for details of how to influence
 # the contents of the Makefile that is written.
 WriteMakefile(
-    'NAME'	=> 'FS',
+    'NAME'	   => 'FS',
     'VERSION_FROM' => 'FS.pm', # finds $VERSION
+    'EXE_FILES'    => [ glob 'bin/*' ],
 );
diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill
new file mode 100755
index 000000000..8f2c32fb2
--- /dev/null
+++ b/FS/bin/freeside-bill
@@ -0,0 +1,122 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use Fcntl qw(:flock);
+use Date::Parse;
+use Getopt::Std;
+use FS::UID qw(adminsuidsetup swapuid);
+use FS::Record qw(qsearch qsearchs);
+use FS::cust_main;
+
+&untaint_argv;	#what it sounds like  (eww)
+use vars qw($opt_a $opt_c $opt_i $opt_d);
+getopts("acid:");
+my $user = shift or die &usage;
+
+adminsuidsetup $user;
+
+my %bill_only = map { $_ => 1 } (
+  @ARGV ? @ARGV : ( map $_->custnum, qsearch('cust_main', {} ) )
+);
+
+#we're at now now (and later).
+my($time)= $main::opt_d ? str2time($main::opt_d) : $^T;
+
+# find packages w/ bill < time && cancel != '', and create corresponding
+# customer objects
+
+my($cust_main,%saw);
+foreach $cust_main (
+  map {
+    if (
+      ( $main::opt_a || ( ( $_->getfield('bill') || 0 ) <= $time ) )
+      && $bill_only{ $_->custnum }
+      && !$saw{ $_->custnum }++
+    ) {
+      qsearchs('cust_main',{'custnum'=> $_->custnum } );
+    } else {
+      ();
+    }
+  } ( qsearch('cust_pkg', { 'cancel' => '' }),
+      qsearch('cust_pkg', { 'cancel' => 0  }),
+    )
+) {
+
+  # and bill them
+
+  print "Billing customer #" . $cust_main->getfield('custnum') . "\n";
+  next;
+
+  my($error);
+
+  $error=$cust_main->bill('time'=>$time);
+  warn "Error billing,  customer #" . $cust_main->getfield('custnum') . 
+    ":" . $error if $error;
+
+  if ($main::opt_c) {
+    $error=$cust_main->collect('invoice_time'=>$time,
+                               'batch_card' => $main::opt_i ? 'no' : 'yes',
+                              );
+    warn "Error collecting customer #" . $cust_main->getfield('custnum') .
+      ":" . $error if $error;
+
+  #sleep 1;
+
+  }
+
+}
+
+# subroutines
+
+sub untaint_argv {
+  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
+    $ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
+    $ARGV[$_]=$1;
+  }
+}
+
+sub usage {
+  die "Usage:\n\n  bill [ -c [ i ] ] [ -d 'date' ] [ -b ] user\n";
+}
+
+=head1 NAME
+
+freeside-bill - Command line (crontab, script) interface to customer billing.
+
+=head1 SYNOPSIS
+
+  freeside-bill [ -c [ -a ] [ -i ] ] [ -d 'date' ] user [ custnum custnum ... ]
+
+=head1 DESCRIPTION
+
+Bills customers.  Searches for customers who are due for billing and calls
+the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
+
+  -c: Turn on collecting (you probably want this).
+
+  -a: Call collect even if there isn't a new invoice (probably a bad idea for
+      daily use)
+
+  -i: real-time billing (as opposed to batch billing).  only relevant
+      for credit cards.
+
+  -d: Pretent it's 'date'.  Date is in any format Date::Parse is happy with,
+      but be careful.
+
+user: From the mapsecrets file - see config.html from the base documentation
+
+custnum: if one or more customer numbers are specified, only bills those
+customers.  Otherwise, bills all customers.
+
+=head1 VERSION
+
+$Id: freeside-bill,v 1.1 1999-08-11 20:41:27 ivan Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::cust_main>, config.html from the base documentation
+
+=cut
+
diff --git a/bin/bill b/bin/bill
deleted file mode 100755
index 9553af966..000000000
--- a/bin/bill
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use Fcntl qw(:flock);
-use Date::Parse;
-use Getopt::Std;
-use FS::UID qw(adminsuidsetup swapuid);
-use FS::Record qw(qsearch qsearchs);
-use FS::cust_main;
-
-&untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_b $opt_c $opt_i $opt_d);
-getopts("bcid:");	#switches
-my $user = shift or die &usage;
-
-adminsuidsetup $user;
-
-#we're at now now (and later).
-my($time)= $main::opt_d ? str2time($main::opt_d) : $^T;
-
-# find packages w/ bill < time && cancel != '', and create corresponding
-# customer objects
-
-my($cust_main,%saw);
-foreach $cust_main (
-  map {
-    if ( ( $_->getfield('bill') || 0 ) <= $time &&
-         !$saw{ $_->getfield('custnum') }++ ) {
-      qsearchs('cust_main',{'custnum'=> $_->getfield('custnum') } );
-    } else {
-      ();
-    }
-  } ( qsearch('cust_pkg', { 'cancel' => '' }),
-      qsearch('cust_pkg', { 'cancel' => 0  }),
-    )
-) {
-
-  # and bill them
-
-  print "Billing customer #" . $cust_main->getfield('custnum') . "\n";
-
-  my($error);
-
-  $error=$cust_main->bill('time'=>$time);
-  warn "Error billing,  customer #" . $cust_main->getfield('custnum') . 
-    ":" . $error if $error;
-
-  if ($main::opt_c) {
-    $error=$cust_main->collect('invoice_time'=>$time,
-                               'batch_card' => $main::opt_i ? 'no' : 'yes',
-                              );
-    warn "Error collecting customer #" . $cust_main->getfield('custnum') .
-      ":" . $error if $error;
-
-  #sleep 1;
-
-  }
-
-}
-
-# subroutines
-
-sub untaint_argv {
-  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    $ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
-    $ARGV[$_]=$1;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n  bill [ -c [ i ] ] [ -d 'date' ] [ -b ] user\n";
-}
-
-=head1 NAME
-
-bill - Command line (crontab, script) interface to customer billing.
-
-=head1 SYNOPSIS
-
-  bill [ -c [ i ] ] [ -d 'date' ] user
-
-=head1 DESCRIPTION
-
-Bills all customers.  Searches for customers who are due for billing and calls
-the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
-
--c: Turn on collecting (you probably want this).
-
--i: real-time billing (as opposed to batch billing).  only relevant
-    for credit cards.
-
--d: Pretent it's 'date'.  Date is in any format Date::Parse is happy with,
-    but be careful.
-
-user: From the mapsecrets file - see config.html from the base documentation
-
-=head1 VERSION
-
-$Id: bill,v 1.6 1998-11-15 02:53:00 ivan Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::cust_main>, config.html from the base documentation
-
-=head1 HISTORY
-
-ivan@voicenet.com sep/oct 96
-
-separated billing and collections, cleaned up code.
-ivan@voicenet.com 96-nov-11
-
-added -d option
-ivan@voicenet.com 96-nov-13
-
-added -v option and started to implement it, added 'd:' to getopts call
-  (oops!)
-ivan@voicenet.com 97-jan-2
-
-added more debug messages, moved some searches to fssearch.pl library (for 
-speed)
-rewrote "all customer" finder to know about bill dates, for speed.
-ivan@voicenet.com 97-jan-8
-
-thought about it a while, and removed passing of the -d option to collect...?
-ivan@voicenet.com 97-jan-14
-
-make all -v stuff STDERR 
-ivan@voicenet.com 97-feb-4
-
-added pkgnum as argument to program from /db/part_pkg, with kludge for the
-"/bin/echo XX" 's already there.
-ivan@voicenet.com 97-feb-23
-
-- general cleanup
-- customers who are suspended can still be billed for the setup fee
-- cust_pkg record is re-read after the package setup fee program is run.
-  this way,
-  that program can modify the record (for example, to start accounts off
-  suspended)
-  (best to think four or five times before modifying anything else!)
-ivan@voicenet.com 97-feb-26
-
-don't bill recurring fee if its not time! (was removed)
-ivan@voicenet.com 97-mar-6
-
-added -b option, send batch when done billing.
-ivan@voicenet.com 97-apr-4
-
-insecure dependency on line 179ish below needs to be fixed before bill is
-used setuid
-ivan@voicenet.com 97-jun-2
-
-removed running of setup program (depriciated)
-ivan@voicenet.com 97-jul-21
-
-rewrote for new API, removed option to specify custnums (use FS::Bill 
-instead), removed -v option (?)
-ivan@voicenet.com 97-jul-22 - 23 - 25 -28
-(need to add back in email stuff, look in /home/ivan/old/dbin/collect)
-
-s/suidsetup/adminsuidsetup/, s/FS::Search/FS::Record/, added some batch
-exporting stuff (which still needs to be generalized) and removed &idiot
-ivan@sisd.com 98-may-27
-
-$Log: bill,v $
-Revision 1.6  1998-11-15 02:53:00  ivan
-afterthought
-
-Revision 1.4  1998/11/07 08:21:26  ivan
-missing use
-
-=cut
-
-
-- 
cgit v1.2.1


From 9d1c4be2e9cc349481101bbc11a9acdc1b7c235a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 11 Aug 1999 20:51:54 +0000
Subject: *** empty log message ***

---
 FS/bin/freeside-bill | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill
index 8f2c32fb2..a251df4d5 100755
--- a/FS/bin/freeside-bill
+++ b/FS/bin/freeside-bill
@@ -45,7 +45,6 @@ foreach $cust_main (
   # and bill them
 
   print "Billing customer #" . $cust_main->getfield('custnum') . "\n";
-  next;
 
   my($error);
 
@@ -110,7 +109,7 @@ customers.  Otherwise, bills all customers.
 
 =head1 VERSION
 
-$Id: freeside-bill,v 1.1 1999-08-11 20:41:27 ivan Exp $
+$Id: freeside-bill,v 1.2 1999-08-11 20:51:54 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From cd4acd5da9225088baec070872ebec125c670981 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 11 Aug 1999 20:57:52 +0000
Subject: *** empty log message ***

---
 htdocs/docs/billing.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/billing.html b/htdocs/docs/billing.html
index 02bfbd783..c0354f1ca 100644
--- a/htdocs/docs/billing.html
+++ b/htdocs/docs/billing.html
@@ -3,7 +3,7 @@
 </head>
 <body>
   <h1>Billing</h1>
-  The bin/bill script can be run daily to bill all customers.  Usage: bill [ -c [ i ] ] [ -d <i>date</i> ] [ -b ]
+  The freeside-bill script can be run daily to bill all customers.  Usage: bill [ -c [ i ] ] [ -d <i>date</i> ] [ -b ]
   <ul>
     <li>-c: Turn on collecting (you probably want this).
     <li>-i: Real-time billing (as opposed to bacth billing).  Only relevant for credit cards.  Not available without modifying site_perl/Bill.pm
-- 
cgit v1.2.1


From aa39234613e8148c531ad3fd0ca46ee806563f6c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Aug 1999 00:05:03 +0000
Subject: configurable min/max username length, min password length, periods in
 usernames

---
 FS/FS/svc_acct.pm       | 16 ++++++++++------
 htdocs/docs/config.html |  3 +++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index b2f23c933..079508b84 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1,8 +1,9 @@
 package FS::svc_acct;
 
 use strict;
-use vars qw(@ISA $nossh_hack $conf $dir_prefix @shells
-            $shellmachine @saltset @pw_set);
+use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
+             $usernamemax $passwordmin
+             $shellmachine @saltset @pw_set);
 use FS::Conf;
 use FS::Record qw( qsearchs fields );
 use FS::svc_Common;
@@ -18,6 +19,9 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
   $dir_prefix = $conf->config('home');
   @shells = $conf->config('shells');
   $shellmachine = $conf->config('shellmachine');
+  $usernamemin = $conf->config('usernamemin') || 2;
+  $usernamemax = $conf->config('usernamemax');
+  $passwordmin = $conf->config('passwordmin') || 6;
 };
 
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
@@ -338,8 +342,8 @@ sub check {
   return $x unless ref($x);
   my $part_svc = $x;
 
-  my $ulen =$self->dbdef_table->column('username')->length;
-  $recref->{username} =~ /^([a-z0-9_\-]{2,$ulen})$/
+  my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;
+  $recref->{username} =~ /^([a-z0-9_\-\.]{$usernamemin,$ulen})$/
     or return "Illegal username";
   $recref->{username} = $1;
   $recref->{username} =~ /[a-z]/ or return "Illegal username";
@@ -422,7 +426,7 @@ sub check {
     unless ( $recref->{_password} );
 
   #if ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([^\t\n]{4,16})$/ ) {
-  if ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([^\t\n]{4,8})$/ ) {
+  if ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([^\t\n]{$passwordmin,8})$/ ) {
     $recref->{_password} = $1.$3;
     #uncomment this to encrypt password immediately upon entry, or run
     #bin/crypt_pw in cron to give new users a window during which their
@@ -446,7 +450,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: svc_acct.pm,v 1.2 1999-08-12 00:05:03 ivan Exp $
 
 =head1 BUGS
 
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index 7994af8f9..3d4e743c1 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -33,6 +33,7 @@ All further configuration files and directories are located in
   <li>invoice_from - Return address on email invoices.
   <li>lpr - Print command for paper invoices, for example `lpr -h'.
   <li>nismachines - Your NIS master (not slave master) machines, one per line.  This enables export of `/etc/global/passwd' and `/etc/global/shadow'.
+  <li>passwordmin - Minimum password length (default 6);
   <li>qmailmachines - Your qmail machines, one per line.  This enables export of `/var/qmail/control/virtualdomains', `/var/qmail/control/recipientmap', and `/var/qmail/control/rcpthosts'.  The existance of this file (even if empty) also turns on user `.qmail-extension' file maintenance in conjunction with `shellmachine'.
   <li>radiusmachines - Your RADIUS authentication machines, one per line.  This enables export of `/etc/raddb/users'.
   <li>registries - Directory which contains domain registry information.  Each registry is a directory.
@@ -52,6 +53,8 @@ All further configuration files and directories are located in
   <li>shells - Legal shells (think /etc/shells).  You probably want to `cut -d: -f7 /etc/passwd | sort | uniq' initially so that importing doesn't fail with `Illegal shell' errors, then remove any special entries afterwords.  A blank line specifies that an empty shell is permitted.
   <li>showpasswords - The existance of this file will allow unencrypted user passwords to be displayed.
   <li>smtpmachine - SMTP relay for Freeside's outgoing mail.
+  <li>usernamemin - Minimum username length (default 2);
+  <li>usernamemax - Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)
 </ul>
 </body>
 
-- 
cgit v1.2.1


From 6ce5ed47f0108896bc9d32a348b5afa44bd09c84 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Aug 1999 04:16:01 +0000
Subject: hidecancelledpackages config option

---
 FS/FS/cust_main.pm        | 17 +++++++++++++----
 htdocs/docs/config.html   |  4 +++-
 htdocs/view/cust_main.cgi | 14 ++++++++++----
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 25b6b9f46..50535da55 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -6,7 +6,7 @@ package FS::cust_main;
 
 use strict;
 use vars qw( @ISA $conf $lpr $processor $xaction $E_NoErr $invoice_from
-             $smtpmachine );
+             $smtpmachine $Debug );
 use Safe;
 use Carp;
 use Time::Local;
@@ -30,6 +30,9 @@ use FS::cust_main_invoice;
 
 @ISA = qw( FS::Record );
 
+$Debug = 0;
+#$Debug = 1;
+
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::cust_main'} = sub { 
   $conf = new FS::Conf;
@@ -392,7 +395,12 @@ sub ncancelled_pkgs {
   qsearch( 'cust_pkg', {
     'custnum' => $self->custnum,
     'cancel'  => '',
-  });
+  }),
+  qsearch( 'cust_pkg', {
+    'custnum' => $self->custnum,
+    'cancel'  => 0,
+  }),
+  ;
 }
 
 =item bill OPTIONS
@@ -602,6 +610,7 @@ sub collect {
   my $invoice_time = $options{'invoice_time'} || time;
 
   my $total_owed = $self->balance;
+  warn "collect: total owed $total_owed " if $Debug;
   return '' unless $total_owed > 0; #redundant?????
 
   #put below somehow?
@@ -627,7 +636,7 @@ sub collect {
 
     next if qsearchs( 'cust_pay_batch', { 'invnum' => $cust_bill->invnum } );
 
-    #warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ", amount $amount, total_owed $total_owed)";
+    warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ", amount $amount, total_owed $total_owed)" if $Debug;
 
     next unless $amount > 0;
 
@@ -930,7 +939,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: cust_main.pm,v 1.2 1999-08-12 04:16:01 ivan Exp $
 
 =head1 BUGS
 
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index 3d4e743c1..cad10ce65 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -25,10 +25,12 @@ All further configuration files and directories are located in
   <li>bsdshellmachines - Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/master.passwd'.
   <li>cybercash2 - <a href="http://www.cybercash.com/cybercash/services/cashreg214.html">CyberCash v2</a> support, four lines: paymentserverhost, paymentserverport, paymentserversecret, and transaction type (`mauthonly' or `mauthcapture').  CCLib.pm is required.
   <li>cybercash3.2 - <a href="http://www.cybercash.com/cybercash/services/technology.html">CyberCash v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly' or `mauthcapture').  CCMckLib3_2.pm, CCMckDirectLib3_2.pm and CCMckErrno3_2 are required.
-  <li>deletecustomers - The existance of this file will enable customer deletions.
+  <li>deletecustomers - The existance of this file will enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that this customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers' packages if they cancel service.
   <li>domain - Your domain name.
   <li>editreferrals - The existance of this file will allow you to change the referral of existing customers.
   <li>erpcdmachines - Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd' and `/usr/annex/acp_dialup'.
+  <li>hidecancelledpackages - The existance of this file will prevent cancelled packages from showing up in listings (though they will still be in the database)
+  <li>hidecancelledcustomers - The existance of this file will prevent customers with only cancelled packages from showing up in listings (though they will still be in the database)
   <li>home - For new users, prefixed to usrename to create a directory name.  Should have a leading but not a trailing slash.
   <li>invoice_from - Return address on email invoices.
   <li>lpr - Print command for paper invoices, for example `lpr -h'.
diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index de9ff7f89..055256570 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.17 1999-04-15 16:44:36 ivan Exp $
+# $Id: cust_main.cgi,v 1.18 1999-08-12 04:16:01 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -31,7 +31,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.17  1999-04-15 16:44:36  ivan
+# Revision 1.18  1999-08-12 04:16:01  ivan
+# hidecancelledpackages config option
+#
+# Revision 1.17  1999/04/15 16:44:36  ivan
 # delete customers
 #
 # Revision 1.16  1999/04/09 04:22:34  ivan
@@ -257,8 +260,11 @@ print qq!!, &table(), "\n",
       qq!</TR>\n!;
 
 #get package info
-@packages = $cust_main->all_pkgs;
-#@packages = $cust_main->ncancelled_pkgs;
+if ( $conf->exists('hidecancelledpackages') ) {
+  @packages = $cust_main->ncancelled_pkgs;
+} else {
+  @packages = $cust_main->all_pkgs;
+}
 
 $n1 = '<TR>';
 foreach $package (@packages) {
-- 
cgit v1.2.1


From c81882184aba764c5aa17ee22e7b73718ac7a281 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Aug 1999 04:32:21 +0000
Subject: hidecancelledcustomers

---
 htdocs/misc/bill.cgi        |  9 ++++++---
 htdocs/search/cust_main.cgi | 21 ++++++++++++++++-----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/htdocs/misc/bill.cgi b/htdocs/misc/bill.cgi
index 2c17baec7..52323ba59 100755
--- a/htdocs/misc/bill.cgi
+++ b/htdocs/misc/bill.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: bill.cgi,v 1.4 1999-01-19 05:14:02 ivan Exp $
+# $Id: bill.cgi,v 1.5 1999-08-12 04:32:21 ivan Exp $
 #
 # s/FS:Search/FS::Record/ and cgisuidsetup($cgi) ivan@sisd.com 98-mar-13
 #
@@ -8,7 +8,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: bill.cgi,v $
-# Revision 1.4  1999-01-19 05:14:02  ivan
+# Revision 1.5  1999-08-12 04:32:21  ivan
+# hidecancelledcustomers
+#
+# Revision 1.4  1999/01/19 05:14:02  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -51,5 +54,5 @@ $error = $cust_main->collect(
                             );
 &eidiot($error) if $error;
 
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum#history");
+print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum");
 
diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index 9af2fce7b..c754dd94b 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.12 1999-07-17 10:38:52 ivan Exp $
+# $Id: cust_main.cgi,v 1.13 1999-08-12 04:32:21 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -17,7 +17,10 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.12  1999-07-17 10:38:52  ivan
+# Revision 1.13  1999-08-12 04:32:21  ivan
+# hidecancelledcustomers
+#
+# Revision 1.12  1999/07/17 10:38:52  ivan
 # scott nelson <scott@ultimanet.com> noticed this mod_perl-triggered bug and
 # gave me a great bugreport at the last rhythmethod
 #
@@ -59,7 +62,8 @@
 #
 
 use strict;
-use vars qw(%ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
+#use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
+use vars qw( $conf %all_pkgs $cgi @cust_main $sortby );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use IO::Handle;
@@ -72,6 +76,8 @@ use FS::cust_main;
 $cgi = new CGI;
 cgisuidsetup($cgi);
 
+$conf = new FS::Conf;
+
 if ( $cgi->keywords ) {
   my($query)=$cgi->keywords;
   if ( $query eq 'custnum' ) {
@@ -91,8 +97,13 @@ if ( $cgi->keywords ) {
   &companysearch if ( $cgi->param('company_on') && $cgi->param('company_text') );
 }
 
-#%ncancelled_pkgs = map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
-%all_pkgs = map { $_->custnum => [ $_->all_pkgs ] } @cust_main;
+@cust_main = grep { $_->ncancelled_pkgs || ! $_->all_pkgs } @cust_main
+  if $conf->exists('hidecancelledcustomers');
+if ( $conf->exists('hidecancelledpackages' ) {
+  %all_pkgs = map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
+} else {
+  %all_pkgs = map { $_->custnum => [ $_->all_pkgs ] } @cust_main;
+}
 
 if ( scalar(@cust_main) == 1 ) {
   print $cgi->redirect(popurl(2). "view/cust_main.cgi?". $cust_main[0]->custnum);
-- 
cgit v1.2.1


From 4dd18328e3ef62f946ea30f1450a66c179417cf6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Aug 1999 04:45:21 +0000
Subject: typo - missed a paren

---
 htdocs/search/cust_main.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index c754dd94b..ef076f97e 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.13 1999-08-12 04:32:21 ivan Exp $
+# $Id: cust_main.cgi,v 1.14 1999-08-12 04:45:21 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -17,7 +17,10 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.13  1999-08-12 04:32:21  ivan
+# Revision 1.14  1999-08-12 04:45:21  ivan
+# typo - missed a paren
+#
+# Revision 1.13  1999/08/12 04:32:21  ivan
 # hidecancelledcustomers
 #
 # Revision 1.12  1999/07/17 10:38:52  ivan
@@ -99,7 +102,7 @@ if ( $cgi->keywords ) {
 
 @cust_main = grep { $_->ncancelled_pkgs || ! $_->all_pkgs } @cust_main
   if $conf->exists('hidecancelledcustomers');
-if ( $conf->exists('hidecancelledpackages' ) {
+if ( $conf->exists('hidecancelledpackages' ) ) {
   %all_pkgs = map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
 } else {
   %all_pkgs = map { $_->custnum => [ $_->all_pkgs ] } @cust_main;
-- 
cgit v1.2.1


From 75f1f7889d2a653c61adb689c029e8c8a7544565 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 20 Aug 1999 08:27:06 +0000
Subject: fix for bug noticed by Martin G. Bayerle: > if you eliminate services
 from any package, to reduce it to only one service, > once gone, they won't
 reappear.

---
 FS/FS/part_pkg.pm | 6 +++---
 README            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 863e962bb..d262a04e0 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -134,13 +134,13 @@ sub check {
 =item pkg_svc
 
 Returns all FS::pkg_svc objects (see L<FS::pkg_svc>) for this package
-definition.
+definition (with non-zero quantity).
 
 =cut
 
 sub pkg_svc {
   my $self = shift;
-  qsearch( 'pkg_svc', { 'pkgpart' => $self->pkgpart } );
+  grep { $_->quantity } qsearch( 'pkg_svc', { 'pkgpart' => $self->pkgpart } );
 }
 
 =item svcpart [ SVCDB ]
@@ -166,7 +166,7 @@ sub svcpart {
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: part_pkg.pm,v 1.2 1999-08-20 08:27:06 ivan Exp $
 
 =head1 BUGS
 
diff --git a/README b/README
index 0c6640f9f..496d3b974 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Freeside, (pre-1.2.2 or pre.1.3.0?)
+Freeside, 1.2.2
 
 Copyright (C) 1999 Ivan Kohler
 Copyright (C) 1999 Silicon Interactive Software Design
-- 
cgit v1.2.1


From 18e983e01dff4ef98d08b5ed0b158870462654ab Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Aug 1999 02:14:25 +0000
Subject: better error message for no agents

---
 htdocs/edit/cust_main.cgi | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index d5ae36348..1405fe34e 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.18 1999-08-11 15:38:33 ivan Exp $
+# $Id: cust_main.cgi,v 1.19 1999-08-21 02:14:25 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.18  1999-08-11 15:38:33  ivan
+# Revision 1.19  1999-08-21 02:14:25  ivan
+# better error message for no agents
+#
+# Revision 1.18  1999/08/11 15:38:33  ivan
 # fix for perl 5.004_04
 #
 # Revision 1.17  1999/08/10 11:15:45  ivan
@@ -174,7 +177,8 @@ print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST>!,
 $r = qq!<font color="#ff0000">*</font>!;
 
 @agents = qsearch( 'agent', {} );
-die "No agents created!" unless @agents;
+#die "No agents created!" unless @agents;
+die "You have not created any agents.  You must create at least one agent before adding a customer.  <a href=\"". popurl(2). "browse/agent.cgi\">Create at least one agent here.</a>" unless @agents;
 $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
 if ( scalar(@agents) == 1 ) {
   print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!;
-- 
cgit v1.2.1


From e41296af7d8e4f672e9bd95f2bfb5e07b6395e9a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Aug 1999 07:08:11 +0000
Subject: no CGI::Switch for now

---
 htdocs/edit/cust_main.cgi | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 1405fe34e..c73a06940 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.19 1999-08-21 02:14:25 ivan Exp $
+# $Id: cust_main.cgi,v 1.20 1999-08-23 07:08:11 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.19  1999-08-21 02:14:25  ivan
+# Revision 1.20  1999-08-23 07:08:11  ivan
+# no CGI::Switch for now
+#
+# Revision 1.19  1999/08/21 02:14:25  ivan
 # better error message for no agents
 #
 # Revision 1.18  1999/08/11 15:38:33  ivan
@@ -97,7 +100,8 @@ use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum
              $daytime $night $fax @invoicing_list $invoicing_list $payinfo
              $payname %payby %paybychecked $refnum $otaker $r );
 use vars qw ( $conf $pkgpart $username $password $popnum $ulen $ulen2 );
-use CGI::Switch;
+#use CGI::Switch;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
 #use FS::Record qw(qsearch qsearchs fields);
-- 
cgit v1.2.1


From 15b530404a67b933230a80497f620b751fb5a6e1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Aug 1999 07:40:38 +0000
Subject: missing </TD> flag

---
 htdocs/edit/cust_main.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index c73a06940..7be84c1fc 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.20 1999-08-23 07:08:11 ivan Exp $
+# $Id: cust_main.cgi,v 1.21 1999-08-23 07:40:38 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.20  1999-08-23 07:08:11  ivan
+# Revision 1.21  1999-08-23 07:40:38  ivan
+# missing </TD> flag
+#
+# Revision 1.20  1999/08/23 07:08:11  ivan
 # no CGI::Switch for now
 #
 # Revision 1.19  1999/08/21 02:14:25  ivan
@@ -242,7 +245,7 @@ print "<BR><BR>Contact information", &itable("#c0c0c0"), <<END;
 <TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="company" VALUE="$company" SIZE=70></TD></TR>
 <TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=70></TD></TR>
 <TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=70></TD></TR>
-<TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="state" SIZE="1">
+<TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="state" SIZE="1">
 END
 
 $cust_main->country('US') unless $cust_main->country; #eww
-- 
cgit v1.2.1


From 60980ca92d257c48503c9fb7c9613a0aedd37978 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Aug 1999 12:26:37 +0000
Subject: need to untaint the command line

---
 test/cgi-test | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/cgi-test b/test/cgi-test
index e88bfd750..5f2f07f97 100755
--- a/test/cgi-test
+++ b/test/cgi-test
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cgi-test,v 1.1 1999-04-08 13:05:40 ivan Exp $
+# $Id: cgi-test,v 1.2 1999-08-23 12:26:37 ivan Exp $
 #
 # This is the beginning of a test suite for the web interface.
 # It's also excellent for populating your database with some meaningful test
@@ -12,7 +12,10 @@
 #  libwww-perl working with SSL to use this.)
 #
 # $Log: cgi-test,v $
-# Revision 1.1  1999-04-08 13:05:40  ivan
+# Revision 1.2  1999-08-23 12:26:37  ivan
+# need to untaint the command line
+#
+# Revision 1.1  1999/04/08 13:05:40  ivan
 # web interface tester / sample data creator
 #
 
@@ -23,6 +26,10 @@ use CGI;
 use LWP::UserAgent;
 
 my ( $base_url, $username, $password ) = ( shift, shift, shift );
+#trust 'em
+$base_url =~ /^(.*)$/; $base_url = $1;
+$username =~ /^(.*)$/; $username = $1;
+$password =~ /^(.*)$/; $password = $1;
 
 my @data = &big_ugly_data_structure;
 
-- 
cgit v1.2.1


From 464d6da8fb57fe3e60e4c2c3cae6069bdafff6a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 24 Aug 1999 07:40:45 +0000
Subject: initial checkin of signup server

---
 fs_signup/FS-SignupClient/Changes        |   5 +
 fs_signup/FS-SignupClient/MANIFEST       |   8 +
 fs_signup/FS-SignupClient/MANIFEST.SKIP  |   1 +
 fs_signup/FS-SignupClient/Makefile.PL    |  10 +
 fs_signup/FS-SignupClient/cgi/signup.cgi | 302 +++++++++++++++++++++++++++++++
 fs_signup/FS-SignupClient/fs_signupd     | 139 ++++++++++++++
 fs_signup/FS-SignupClient/test.pl        |  20 ++
 fs_signup/README                         |  18 ++
 fs_signup/Signup.pm                      | 129 -------------
 fs_signup/fs_signup_server               |  61 ++++---
 fs_signup/fs_signupd                     | 129 -------------
 11 files changed, 543 insertions(+), 279 deletions(-)
 create mode 100644 fs_signup/FS-SignupClient/Changes
 create mode 100644 fs_signup/FS-SignupClient/MANIFEST
 create mode 100644 fs_signup/FS-SignupClient/MANIFEST.SKIP
 create mode 100644 fs_signup/FS-SignupClient/Makefile.PL
 create mode 100755 fs_signup/FS-SignupClient/cgi/signup.cgi
 create mode 100755 fs_signup/FS-SignupClient/fs_signupd
 create mode 100644 fs_signup/FS-SignupClient/test.pl
 create mode 100644 fs_signup/README
 delete mode 100755 fs_signup/Signup.pm
 delete mode 100755 fs_signup/fs_signupd

diff --git a/fs_signup/FS-SignupClient/Changes b/fs_signup/FS-SignupClient/Changes
new file mode 100644
index 000000000..e750a82bc
--- /dev/null
+++ b/fs_signup/FS-SignupClient/Changes
@@ -0,0 +1,5 @@
+Revision history for Perl extension FS::SignupClient.
+
+0.01  Mon Aug 23 01:12:46 1999
+	- original version; created by h2xs 1.19
+
diff --git a/fs_signup/FS-SignupClient/MANIFEST b/fs_signup/FS-SignupClient/MANIFEST
new file mode 100644
index 000000000..b4a9900c8
--- /dev/null
+++ b/fs_signup/FS-SignupClient/MANIFEST
@@ -0,0 +1,8 @@
+Changes
+MANIFEST
+MANIFEST.SKIP
+Makefile.PL
+SignupClient.pm
+test.pl
+fs_signupd
+cgi/signup.cgi
diff --git a/fs_signup/FS-SignupClient/MANIFEST.SKIP b/fs_signup/FS-SignupClient/MANIFEST.SKIP
new file mode 100644
index 000000000..ae335e78a
--- /dev/null
+++ b/fs_signup/FS-SignupClient/MANIFEST.SKIP
@@ -0,0 +1 @@
+CVS/
diff --git a/fs_signup/FS-SignupClient/Makefile.PL b/fs_signup/FS-SignupClient/Makefile.PL
new file mode 100644
index 000000000..859d757c3
--- /dev/null
+++ b/fs_signup/FS-SignupClient/Makefile.PL
@@ -0,0 +1,10 @@
+use ExtUtils::MakeMaker;
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written.
+WriteMakefile(
+    'NAME'	    => 'FS::SignupClient',
+    'VERSION_FROM'  => 'SignupClient.pm', # finds $VERSION
+    'EXE_FILES'     => [ 'fs_signupd' ],
+    'INSTALLSCRIPT' => '/usr/local/sbin',
+    'PERM_RWX'      => '750',
+);
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
new file mode 100755
index 000000000..7131ad2e8
--- /dev/null
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -0,0 +1,302 @@
+#!/usr/bin/perl -Tw
+#
+# $Id: signup.cgi,v 1.1 1999-08-24 07:40:45 ivan Exp $
+
+use strict;
+use vars qw( @payby $cgi $locales $packages $pops $r $error
+             $last $first $ss $company $address1 $address2 $city $state $county
+             $country $zip $daytime $night $fax $invoicing_list $payby $payinfo
+             $paydate $payname $pkgpart $username $password $popnum );
+use subs qw( print_form print_okay expselect );
+
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::SignupClient qw( signup_info new_customer );
+
+#@payby = qw( CARD BILL COMP );
+#@payby = qw( CARD BILL );
+@payby = qw( CARD );
+
+( $locales, $packages, $pops ) = signup_info();
+
+$cgi = new CGI;
+
+if ( defined $cgi->param('magic') ) {
+  if ( $cgi->param('magic') eq 'process' ) {
+
+    $cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
+      or die "Oops, illegal \"state\" param: ". $cgi->param('state');
+    $state = $1;
+    $county = $3 || '';
+    $country = $4;
+
+    $payby = $cgi->param('payby');
+    $payinfo = $cgi->param( $payby. '_payinfo' );
+    $paydate =
+      $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' );
+    $payname = $cgi->param( $payby. '_payname' );
+
+    if ( $invoicing_list = $cgi->param('invoicing_list') ) {
+      $invoicing_list .= ', POST' if $cgi->param('invoicing_list_POST');
+    } else {
+      $invoicing_list = 'POST';
+    }
+
+    ( $error = new_customer ( {
+      'last'           => $last            = $cgi->param('last'),
+      'first'          => $first           = $cgi->param('first'),
+      'ss'             => $ss              = $cgi->param('ss'),
+      'company'        => $company         = $cgi->param('company'),
+      'address1'       => $address1        = $cgi->param('address1'),
+      'address2'       => $address2        = $cgi->param('address2'),
+      'city'           => $city            = $cgi->param('city'),
+      'county'         => $county,
+      'state'          => $state,
+      'zip'            => $zip             = $cgi->param('zip'),
+      'country'        => $country,
+      'daytime'        => $daytime         = $cgi->param('daytime'),
+      'night'          => $night           = $cgi->param('night'),
+      'fax'            => $fax             = $cgi->param('fax'),
+      'payby'          => $payby,
+      'payinfo'        => $payinfo,
+      'paydate'        => $paydate,
+      'payname'        => $payname,
+      'invoicing_list' => $invoicing_list,
+      'pkgpart'        => $pkgpart         = $cgi->param('pkgpart'),
+      'username'       => $username        = $cgi->param('username'),
+      '_password'      => $password        = $cgi->param('_password'),
+      'popnum'         => $popnum          = $cgi->param('popnum'),
+    } ) )
+      ? print_form()
+      : print_okay();
+  } else {
+    die "unrecognized magic: ". $cgi->param('magic');
+  }
+} else {
+  $error = '';
+  $last = '';
+  $first = '';
+  $ss = '';
+  $company = '';
+  $address1 = '';
+  $address2 = '';
+  $city = '';
+  $state = '';
+  $county = '';
+  $country = '';
+  $zip = '';
+  $daytime = '';
+  $night = '';
+  $fax = '';
+  $invoicing_list = '';
+  $payby = '';
+  $payinfo = '';
+  $paydate = '';
+  $payname = '';
+  $pkgpart = '';
+  $username = '';
+  $password = '';
+  $popnum = '';
+
+  print_form;
+}
+
+sub print_form {
+
+  my $r = qq!<font color="#ff0000">*</font>!;
+  my $self_url = $cgi->self_url;
+
+  print $cgi->header( '-expires' => 'now' ), <<END;
+<HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
+<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>ISP Signup form</FONT><BR><BR>
+END
+
+  print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT>! if $error;
+
+  print <<END;
+<FORM ACTION="$self_url" METHOD=POST>
+<INPUT TYPE="hidden" NAME="magic" VALUE="process">
+Contact Information
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR>
+  <TH ALIGN="right">${r}Contact name<BR>(last, first)</TH>
+  <TD COLSPAN=3><INPUT TYPE="text" NAME="last" VALUE="$last">,
+                <INPUT TYPE="text" NAME="first" VALUE="$first"></TD>
+  <TD ALIGN="right">SS#</TD>
+  <TD><INPUT TYPE="text" NAME="ss" SIZE=11 VALUE="$ss"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Company</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="$company"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right">${r}Address</TH>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="$address1"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">&nbsp;</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="$address2"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right">${r}City</TH>
+  <TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD>
+  <TH ALIGN="right">${r}State/Country</TH>
+  <TD><SELECT NAME="state" SIZE="1">
+END
+
+  foreach ( @{$locales} ) {
+    print "<OPTION";
+    print " SELECTED" if ( $state eq $_->{'state'}
+                           && $county eq $_->{'county'}
+                           && $country eq $_->{'country'}
+                         );
+    print ">", $_->{'state'};
+    print " (",$_->{'county'},")" if $_->{'county'};
+    print " / ", $_->{'country'};
+  }
+
+  print <<END;
+  </SELECT></TD>
+  <TH>${r}Zip</TH>
+  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="$zip"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Day Phone</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Night Phone</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Fax</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12></TD>
+</TR>
+</TABLE>$r required fields<BR>
+<BR>Billing information<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR><TD>
+END
+
+  print qq!<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
+  my @invoicing_list = split(', ', $invoicing_list );
+  print ' CHECKED'
+    if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
+  print '>Postal mail invoice</TD></TR><TR><TD>Email invoice ',
+         qq!<INPUT TYPE="text" NAME="invoicing_list" VALUE="!,
+         join(', ', grep { $_ ne 'POST' } @invoicing_list ),
+         qq!"></TD></TR>!;
+
+  print <<END;
+<TR><TD>Billing type</TD></TR></TABLE>
+<TABLE BGCOLOR="#c0c0c0" BORDER=1 WIDTH="100%">
+<TR>
+END
+
+  my %payby = (
+    'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>${r}Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
+    'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
+  );
+
+  my %paybychecked = (
+    'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $paydate). qq!<BR>${r}Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+    'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $paydate),
+  );
+
+  for (@payby) {
+    print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
+    if ($payby eq $_) {
+      print qq! CHECKED> $paybychecked{$_}</TD>!;
+    } else {
+      print qq!> $payby{$_}</TD>!;
+    }
+  }
+
+  print <<END;
+</TR></TABLE>$r required fields for each billing type
+<BR><BR>First package
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR>
+  <TD COLSPAN=2><SELECT NAME="pkgpart"><OPTION VALUE="">(none)
+END
+
+  foreach my $package ( @{$packages} ) {
+    print qq!<OPTION VALUE="!, $package->{'pkgpart'}, '"';
+    print " SELECTED" if $pkgpart && ( $package->{'pkgpart'} == $pkgpart );
+    print ">", $package->{'pkg'};
+  }
+
+  print <<END;
+  </SELECT></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Username</TD>
+  <TD><INPUT TYPE="text" NAME="username" VALUE="$username"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Password</TD>
+  <TD><INPUT TYPE="text" NAME="_password" VALUE="$password">
+  (blank to generate)</TD>
+</TR>
+<TR>
+  <TD ALIGN="right">POP</TD>
+  <TD><SELECT NAME="popnum" SIZE=1><OPTION> 
+END
+
+  foreach my $pop ( @{$pops} ) {
+    print qq!<OPTION VALUE="!, $pop->{'popnum'}, '"',
+          ( $popnum && $pop->{'popnum'} == $popnum ) ? ' SELECTED' : '', ">", 
+          $pop->{'popnum'}, ": ", 
+          $pop->{'city'}, ", ",
+          $pop->{'state'},
+          " (", $pop->{'ac'}, ")/",
+          $pop->{'exch'}, "\n"
+        ;
+  }
+  print <<END;
+  </SELECT></TD>
+</TR>
+</TABLE>
+<BR><BR><INPUT TYPE="submit" VALUE="Signup">
+</FORM></BODY></HTML>
+END
+
+}
+
+sub print_okay {
+  print $cgi->header( '-expires' => 'now' ), <<END;
+<HTML><HEAD><TITLE>Signup successful</TITLE></HEAD>
+<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Signup successful</FONT><BR><BR>
+blah blah blah
+</BODY>
+</HTML>
+END
+}
+
+sub expselect {
+  my $prefix = shift;
+  my $date = shift || '';
+  my( $m, $y ) = ( 0, 0 );
+  if ( $date  =~ /^(\d{4})-(\d{2})-\d{2}$/ ) { #PostgreSQL date format
+    ( $m, $y ) = ( $2, $1 );
+  } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+    ( $m, $y ) = ( $1, $3 );
+  }
+  my $return = qq!<SELECT NAME="$prefix!. qq!_month" SIZE="1">!;
+  for ( 1 .. 12 ) {
+    $return .= "<OPTION";
+    $return .= " SELECTED" if $_ == $m;
+    $return .= ">$_";
+  }
+  $return .= qq!</SELECT>/<SELECT NAME="$prefix!. qq!_year" SIZE="1">!;
+  for ( 1999 .. 2037 ) {
+    $return .= "<OPTION";
+    $return .= " SELECTED" if $_ == $y;
+    $return .= ">$_";
+  }
+  $return .= "</SELECT>";
+
+  $return;
+}
+
diff --git a/fs_signup/FS-SignupClient/fs_signupd b/fs_signup/FS-SignupClient/fs_signupd
new file mode 100755
index 000000000..972e3c7b4
--- /dev/null
+++ b/fs_signup/FS-SignupClient/fs_signupd
@@ -0,0 +1,139 @@
+#!/usr/bin/perl -Tw
+#
+# fs_signupd
+#
+# This is run REMOTELY over ssh by fs_signup_server.
+#
+
+use strict;
+use Socket;
+
+use vars qw( $Debug );
+
+$Debug = 0;
+
+my($fs_signupd_socket)="/usr/local/freeside/fs_signupd_socket";
+
+$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
+$ENV{'SHELL'} = '/bin/sh';
+$ENV{'IFS'} = " \t\n";
+$ENV{'CDPATH'} = '';
+$ENV{'ENV'} = '';
+$ENV{'BASH_ENV'} = '';
+
+$|=1;
+
+warn "[fs_signupd] Reading locales...\n" if $Debug;
+chomp( my $n_cust_main_county = <STDIN> );
+my @cust_main_county = map {
+  chomp( my $taxnum = <STDIN> );
+  chomp( my $state = <STDIN> );
+  chomp( my $county = <STDIN> );
+  chomp( my $country = <STDIN> );
+  {
+    'taxnum'  => $taxnum,
+    'state'   => $state,
+    'county'  => $county,
+    'country' => $country,
+  };
+} ( 1 .. $n_cust_main_county );
+
+warn "[fs_signupd] Reading package definitions...\n" if $Debug;
+chomp( my $n_part_pkg = <STDIN> );
+my @part_pkg = map {
+  chomp( my $pkgpart = <STDIN> );
+  chomp( my $pkg = <STDIN> );
+  {
+    'pkgpart' => $pkgpart,
+    'pkg'     => $pkg,
+  };
+} ( 1 .. $n_part_pkg );
+
+warn "[fs_signupd] Reading POPs...\n" if $Debug;
+chomp( my $n_svc_acct_pop = <STDIN> );
+my @svc_acct_pop = map {
+  chomp( my $popnum = <STDIN> );
+  chomp( my $city = <STDIN> );
+  chomp( my $state = <STDIN> );
+  chomp( my $ac = <STDIN> );
+  chomp( my $exch = <STDIN> );
+  {
+    'popnum' => $popnum,
+    'city'   => $city,
+    'state'  => $state,
+    'ac'     => $ac,
+    'exch'   => $exch,
+  };
+} ( 1 .. $n_svc_acct_pop );
+
+warn "[fs_signupd] Creating $fs_signupd_socket\n" if $Debug;
+my $uaddr = sockaddr_un($fs_signupd_socket);
+my $proto = getprotobyname('tcp');
+socket(Server,PF_UNIX,SOCK_STREAM,0) or die "socket: $!";
+unlink($fs_signupd_socket);
+bind(Server, $uaddr) or die "bind: $!";
+listen(Server,SOMAXCONN) or die "listen: $!";
+
+warn "[fs_signupd] Entering main loop...\n" if $Debug;
+my $paddr;
+for ( ; $paddr = accept(Client,Server); close Client) {
+
+  chop( my $command = <Client> );
+
+  if ( $command eq "signup_info" ) {
+    warn "[fs_signupd] sending signup info...\n" if $Debug; 
+    print Client join("\n", $n_cust_main_county,
+      map {
+        $_->{taxnum},
+        $_->{state},
+        $_->{county},
+        $_->{country},
+      } @cust_main_county
+    ), "\n";
+
+    print Client join("\n", $n_part_pkg,
+      map {
+        $_->{pkgpart},
+        $_->{pkg},
+      } @part_pkg
+    ), "\n";
+
+    print Client join("\n", $n_svc_acct_pop,
+      map {
+        $_->{popnum},
+        $_->{city},
+        $_->{state},
+        $_->{ac},
+        $_->{exch},
+      } @svc_acct_pop
+    ), "\n";
+
+  } elsif ( $command eq "new_customer" ) {
+    warn "[fs_signupd] reading customer signup...\n" if $Debug;
+    my(
+      $first, $last, $ss, $company, $address1, $address2, $city, $county,
+      $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
+      $paydate, $payname, $invoicing_list, $pkgpart, $username, $password,
+      $popnum,
+    ) = map { scalar(<Client>) } ( 1 .. 23 );
+
+    warn "[fs_signupd] sending customer data to remote server...\n" if $Debug;
+    print 
+      $first, $last, $ss, $company, $address1, $address2, $city, $county,
+      $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
+      $paydate, $payname, $invoicing_list, $pkgpart, $username, $password,
+      $popnum,
+    ;
+
+    warn "[fs_signupd] reading error from remote server...\n" if $Debug;
+    my $error = <STDIN>;
+
+    warn "[fs_signupd] sending error to local client...\n" if $Debug;
+    print Client $error;
+
+  } else {
+    die "unexpected command from client: $command";
+  }
+
+}
+
diff --git a/fs_signup/FS-SignupClient/test.pl b/fs_signup/FS-SignupClient/test.pl
new file mode 100644
index 000000000..690f5840e
--- /dev/null
+++ b/fs_signup/FS-SignupClient/test.pl
@@ -0,0 +1,20 @@
+# Before `make install' is performed this script should be runnable with
+# `make test'. After `make install' it should work as `perl test.pl'
+
+######################### We start with some black magic to print on failure.
+
+# Change 1..1 below to 1..last_test_to_print .
+# (It may become useful if the test is moved to ./t subdirectory.)
+
+BEGIN { $| = 1; print "1..1\n"; }
+END {print "not ok 1\n" unless $loaded;}
+use FS::SignupClient;
+$loaded = 1;
+print "ok 1\n";
+
+######################### End of black magic.
+
+# Insert your test code below (better if it prints "ok 13"
+# (correspondingly "not ok 13") depending on the success of chunk 13
+# of the test code):
+
diff --git a/fs_signup/README b/fs_signup/README
new file mode 100644
index 000000000..631c22364
--- /dev/null
+++ b/fs_signup/README
@@ -0,0 +1,18 @@
+this should become better docs soon
+
+on client machine (public webserver):
+
+install perl, ssh, CGI.pm
+cd FS-SignupClient; perl Makefile.PL; make; su; make install
+copy or symlink FS-SignupClient/cgi/signup.cgi into the web server's view
+use suExec or setuid to run cgi/signup.cgi as the freeside user
+(chmod /usr/local/freeside/fs_signupd_socket 600, chown freeside)
+
+on server machine (Freeside machine):
+
+run fs_signup_server user machine agentnum refnum
+
+  user is a freeside user from mapsecrets
+  machine is the client machine
+  agentnum and refnum are the fixed values for this signup server
+
diff --git a/fs_signup/Signup.pm b/fs_signup/Signup.pm
deleted file mode 100755
index bcf09f1fe..000000000
--- a/fs_signup/Signup.pm
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# fs_passwd
-#
-# portions of this script are copied from the `passwd' script in the original
-# (perl 4) camel book, now archived at 
-# http://www.perl.com/CPAN/scripts/nutshell/ch6/passwd
-#
-# ivan@sisd.com 98-mar-8
-#
-# password lengths 0,255 instead of 6,8 - we'll let the server process
-# check the data ivan@sisd.com 98-jul-17
-
-use strict;
-use Getopt::Std;
-use Socket;
-use IO::Handle;
-use vars qw($opt_f $opt_s);
-
-my($fs_passwdd_socket)="/usr/local/freeside/fs_passwdd_socket";
-my($freeside_uid)=scalar(getpwnam('freeside'));
-
-$ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin';
-$ENV{'SHELL'} = '/bin/sh';
-$ENV{'IFS'} = " \t\n";
-$ENV{'CDPATH'} = '';
-$ENV{'ENV'} = '';
-$ENV{'BASH_ENV'} = '';
-
-$SIG{__DIE__}= sub { system '/bin/stty', 'echo'; };
-
-die "passwd program isn't running setuid to freeside\n" if $> != $freeside_uid;
-
-unshift @ARGV, "-f" if $0 =~ /chfn$/;
-unshift @ARGV, "-s" if $0 =~ /chsh$/;
-
-getopts('fs');
-
-my($me)='';
-if ( $_ = shift(@ARGV) ) {
-  /^(\w{2,8})$/;
-  $me = $1; 
-}
-die "You can't change the password for $me." if $me && $<;
-$me = (getpwuid($<))[0] unless $me;
-
-my($name,$passwd,$uid,$gid,$quota,$comment,$gcos,$dir,$shell)=
-  getpwnam $me;
-
-my($old_password,$new_password,$new_gecos,$new_shell);
-
-if ( $opt_f || $opt_s ) {
-  system '/bin/stty', '-echo';
-  print "Password:";
-  $old_password=<STDIN>;
-  system '/bin/stty', 'echo'; 
-  chop($old_password);
-  #$old_password =~ /^(.{6,8})$/ or die "\nIllegal password.\n";
-  $old_password =~ /^(.{0,255})$/ or die "\nIllegal password.\n";
-  $old_password = $1;
-
-  $new_password = '';
-
-  if ( $opt_f ) {
-    print "\nChanging gecos for $me.\n";
-    print "Gecos [", $gcos, "]: ";
-    $new_gecos=<STDIN>;
-    chop($new_gecos);
-    $new_gecos ||= $gcos;
-    $new_gecos =~ /^(.{0,255})$/ or die "\nIllegal gecos.\n";
-  } else {
-    $new_gecos = '';
-  } 
-
-  if ( $opt_s ) {
-    print "\nChanging shell for $me.\n";
-    print "Shell [", $shell, "]: ";
-    $new_shell=<STDIN>;
-    chop($new_shell);
-    $new_shell ||= $shell;
-    $new_shell =~ /^(.{0,255})$/ or die "\nIllegal shell.\n";
-  } else {
-    $new_shell = '';
-  }
-
-} else {
-
-  print "Changing password for $me.\n";
-  print "Old password:";
-  system '/bin/stty', '-echo';
-  $old_password=<STDIN>;
-  chop $old_password;
-  #$old_password =~ /^(.{6,8})$/ or die "\nIllegal password.\n";
-  $old_password =~ /^(.{0,255})$/ or die "\nIllegal password.\n";
-  $old_password = $1;
-  print "\nEnter the new password (minimum of 6, maximum of 8 characters)\n";
-  print "Please use a combination of upper and lowercase letters and numbers.\n";
-  print "New password:";
-  $new_password=<STDIN>;
-  chop($new_password);
-  #$new_password =~ /^(.{6,8})$/ or die "\nIllegal password.\n";
-  $new_password =~ /^(.{0,255})$/ or die "\nIllegal password.\n";
-  $new_password = $1;
-  print "\nRe-enter new password:";
-  my($check_new_password);
-  $check_new_password=<STDIN>;
-  chop($check_new_password);
-  die "\nThey don't match; try again.\n" unless $check_new_password eq $new_password;
-
-  $new_gecos='';
-  $new_shell='';
-}
-print "\n";
-
-system '/bin/stty', 'echo'; 
-
-socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-connect(SOCK, sockaddr_un($fs_passwdd_socket)) or die "connect: $!";
-print SOCK join("\n",$me,$old_password,$new_password,$new_gecos,$new_shell),"\n";
-SOCK->flush;
-my($error);
-$error = <SOCK>;
-chop $error;
-
-if ($error) {
-  print "\nUpdate error: $error\n";
-} else {
-  print "\nUpdate sucessful.\n";
-}
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index cf2519ec0..e1c9b3517 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -7,14 +7,18 @@ use strict;
 use IO::Handle;
 use FS::SSH qw(sshopen2);
 use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearchs);
+use FS::Record qw( qsearch qsearchs );
 use FS::cust_main_county;
 use FS::cust_main;
 
-use vars qw( $opt );
+use vars qw( $opt $Debug );
+
+$Debug = 0;
+
+my @payby = qw(CARD);
 
 my $user = shift or die &usage;
-adminsuidsetup $user; 
+&adminsuidsetup( $user ); 
 
 my $machine = shift or die &usage;
 
@@ -31,12 +35,15 @@ my($fs_signupd)="/usr/local/sbin/fs_signupd";
 while (1) {
   my($reader,$writer)=(new IO::Handle, new IO::Handle);
   $writer->autoflush(1);
-  sshopen2($shellmachine,$reader,$writer,$fs_signupd);
+  warn "[fs_signup_server] Connecting to $machine...\n" if $Debug;
+  sshopen2($machine,$reader,$writer,$fs_signupd);
+
+  my $data;
 
-  #send fs_signupd state/county/country
-  @my cust_main_county = qsearch('cust_main_county', {} );
-  print $writer join("\n",
-    scalar(@cust_main_county) || die "no tax rates (cust_main_county records)",
+  warn "[fs_signup_server] Sending locales...\n" if $Debug;
+  my @cust_main_county = qsearch('cust_main_county', {} );
+  print $writer $data = join("\n",
+    ( scalar(@cust_main_county) || die "no tax rates (cust_main_county records)" ),
     map {
       $_->taxnum,
       $_->state,
@@ -44,22 +51,24 @@ while (1) {
       $_->country,
     } @cust_main_county
   ),"\n";
+  warn "[fs_signup_server] $data\n" if $Debug > 2;
 
-  #send fs_signupd package definitions
+  warn "[fs_signup_server] Sending package definitions...\n" if $Debug;
   my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } }
     qsearch( 'part_pkg', {} );
-  print $writer join("\n",
-    scalar(@part_pkg) || die "no usable package definitions, agent $agentnum",
+  print $writer $data = join("\n",
+    ( scalar(@part_pkg) || die "no usable package definitions, agent $agentnum" ),
     map {
       $_->pkgpart,
       $_->pkg,
     } @part_pkg
   ), "\n";
+  warn "[fs_signup_server] $data\n" if $Debug > 2;
 
-  #send fs_signupd POPs
+  warn "[fs_signup_server] Sending POPs...\n" if $Debug;
   my @svc_acct_pop = qsearch ('svc_acct_pop',{} );
-  print $writer join("\n",
-    scalar(@svc_acct_pop) || die "No points of presence (svc_acct_pop records)",
+  print $writer $data = join("\n",
+    ( scalar(@svc_acct_pop) || die "No points of presence (svc_acct_pop records)" ),
     map {
       $_->popnum,
       $_->city,
@@ -68,14 +77,19 @@ while (1) {
       $_->exch,
     } @svc_acct_pop
   ), "\n";
+  warn "[fs_signup_server] $data\n" if $Debug > 2;
 
+  warn "[fs_signup_server] Entering main loop...\n" if $Debug;
   while (1) {
+    warn "[fs_signup_server] Reading (waiting for) signup data...\n" if $Debug;
     chop( my(
       $first, $last, $ss, $company, $address1, $address2, $city, $county,
       $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
       $paydate, $payname, $invoicing_list, $pkgpart, $username, $password,
       $popnum,
-    ) = <$reader> );
+    ) = map { scalar(<$reader>) } ( 1 .. 23 ) );
+
+    warn "[fs_signup_server] Processing signup...\n" if $Debug;
 
     my $error = '';
 
@@ -105,17 +119,21 @@ while (1) {
       'payname'  => $payname,
     } );
 
+    $error = "Illegal payment type" unless grep { $_ eq $payby } @payby;
+
     my @invoicing_list = split( /\s*\,\s*/, $invoicing_list );
 
     $error ||= $cust_main->check_invoicing_list( \@invoicing_list );
 
     my $part_pkg = qsearchs( 'part_pkg', { 'pkgpart' => $pkgpart } )
-      or die "unknown pkgpart $pkgpart";
+      or $error ||= "WARNING: unknown pkgpart $pkgpart";
     my $svcpart = $part_pkg->svcpart;
 
     # this should wind up in FS::cust_pkg!
-    die "agent $agentnum can't purchase pkgpart $pkgpart"
-      unless $pkgpart->{ $pkgpart };
+    my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } );
+    my $pkgpart_href = $agent->pkgpart_hashref;
+    $error ||= "WARNING: agent $agentnum can't purchase pkgpart $pkgpart"
+      unless $pkgpart_href->{ $pkgpart };
 
     my $cust_pkg = new FS::cust_pkg ( {
       #later#'custnum' => $custnum,
@@ -123,7 +141,7 @@ while (1) {
     } );
     $error ||= $cust_pkg->check;
 
-    $svc_acct = new FS::svc_acct ( {
+    my $svc_acct = new FS::svc_acct ( {
       'svcpart'   => $svcpart,
       'username'  => $username,
       '_password' => $password,
@@ -143,7 +161,7 @@ while (1) {
     $error ||= $cust_main->insert;
     if ( $cust_pkg && ! $error ) { #in this case, $cust_pkg should always
                                    #be definied, but....
-      $cust_pkg->custnum( $new->custnum );
+      $cust_pkg->custnum( $cust_main->custnum );
       $error ||= $cust_pkg->insert; 
       warn "WARNING: $error on pre-checked cust_pkg record!" if $error;
       $svc_acct->pkgnum( $cust_pkg->pkgnum );
@@ -151,6 +169,7 @@ while (1) {
       warn "WARNING: $error on pre-checked svc_acct record!" if $error;
     }
 
+    warn "[fs_signup_server] Sending results...\n" if $Debug;
     print $writer $error, "\n";
 
     $cust_main->invoicing_list( \@invoicing_list ) unless $error;
@@ -158,7 +177,7 @@ while (1) {
   }
   close $writer;
   close $reader;
-  warn "connection to $shellmachine lost!  waiting 60 seconds...\n";
+  warn "connection to $machine lost!  waiting 60 seconds...\n";
   sleep 60;
   warn "reconnecting...\n";
 }
diff --git a/fs_signup/fs_signupd b/fs_signup/fs_signupd
deleted file mode 100755
index 71fd1540d..000000000
--- a/fs_signup/fs_signupd
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# fs_signupd
-#
-# This is run REMOTELY over ssh by fs_signup_server.
-#
-
-use strict;
-use Socket;
-
-my($fs_passwdd_socket)="/usr/local/freeside/fs_signupd_socket";
-
-$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
-$ENV{'SHELL'} = '/bin/sh';
-$ENV{'IFS'} = " \t\n";
-$ENV{'CDPATH'} = '';
-$ENV{'ENV'} = '';
-$ENV{'BASH_ENV'} = '';
-
-$|=1;
-
-chomp( my $n_cust_main_county = <STDIN> );
-my @cust_main_county = map {
-  chomp( my $taxnum = <STDIN> );
-  chomp( my $state = <STDIN> );
-  chomp( my $county = <STDIN> );
-  chomp( my $country = <STDIN> );
-  {
-    'taxnum'  => $taxnum,
-    'state'   => $state,
-    'county'  => $county,
-    'country' => $country,
-  };
-} ( 1 .. $n_cust_main_county );
-
-chomp( my $n_part_pkg = <STDIN> );
-my @part_pkg = map {
-  chomp( my $pkgpart = <STDIN> );
-  chomp( my $pkg = <STDIN> );
-  {
-    'pkgpart' => $pkgpart,
-    'pkg'     => $pkg,
-  };
-} ( 1 .. $n_part_pkg );
-
-chomp( my $n_svc_acct_pop = <STDIN> );
-my @svc_acct_pop = map {
-  chomp( my $popnum = <STDIN> );
-  chomp( my $city = <STDIN> );
-  chomp( my $state = <STDIN> );
-  chomp( my $ac = <STDIN> );
-  chomp( my $exch = <STDIN> );
-  {
-    'popnum' => $popnum,
-    'city'   => $city,
-    'state'  => $state,
-    'ac'     => $ac,
-    'exch'   => $exch,
-  };
-} ( 1 .. $n_svc_acct_pop );
-
-my $uaddr = sockaddr_un($fs_passwdd_socket);
-my $proto = getprotobyname('tcp');
-
-socket(Server,PF_UNIX,SOCK_STREAM,0) or die "socket: $!";
-unlink($fs_passwdd_socket);
-bind(Server, $uaddr) or die "bind: $!";
-listen(Server,SOMAXCONN) or die "listen: $!";
-
-my $paddr;
-
-for ( ; $paddr = accept(Client,Server); close Client) {
-
-  chop( my $command = <Client> );
-
-  if ( $command eq "signup_info" ) {
-
-    print Client join("\n", $n_cust_main_county,
-      map {
-        $_->{taxnum},
-        $_->{state},
-        $_->{county},
-        $_->{country},
-      } @cust_main_county
-    ), "\n";
-
-    print Client join("\n", $n_part_pkg,
-      map {
-        $_->{pkgpart},
-        $_->{pkg},
-      } @part_pkg
-    ), "\n";
-
-    print Client join("\n", $n_svc_acct_pop,
-      map {
-        $_->{popnum},
-        $_->{city},
-        $_->{state},
-        $_->{ac},
-        $_->{exch},
-      } @svc_acct_pop
-    ), "\n";
-
-  } elsif ( $operation eq "new_customer" ) {
-
-    my(
-      $first, $last, $ss, $company, $address1, $address2, $city, $county,
-      $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
-      $paydate, $payname, $invoicing_list, $pkgpart, $username, $password,
-      $popnum,
-    ) = <Client>;
-
-    print 
-      $first, $last, $ss, $company, $address1, $address2, $city, $county,
-      $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
-      $paydate, $payname, $invoicing_list, $pkgpart, $username, $password,
-      $popnum,
-    ;
-
-    my $error = <STDIN>;
-
-    print Client $error;
-
-  } else {
-    die "unexpected command from client: $command";
-  }
-
-}
-
-- 
cgit v1.2.1


From 76b34eacaaa4237ef73b24a028a01b45020d77b3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 24 Aug 1999 07:56:38 +0000
Subject: forgot this file!

---
 fs_signup/FS-SignupClient/SignupClient.pm | 215 ++++++++++++++++++++++++++++++
 1 file changed, 215 insertions(+)
 create mode 100644 fs_signup/FS-SignupClient/SignupClient.pm

diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm
new file mode 100644
index 000000000..d3118467b
--- /dev/null
+++ b/fs_signup/FS-SignupClient/SignupClient.pm
@@ -0,0 +1,215 @@
+package FS::SignupClient;
+
+use strict;
+use vars qw($VERSION @ISA @EXPORT_OK $fs_signupd_socket);
+use Exporter;
+use Socket;
+use IO::Handle;
+
+$VERSION = '0.01';
+
+@ISA = qw( Exporter );
+@EXPORT_OK = qw( signup_info new_customer );
+
+$fs_signupd_socket = "/usr/local/freeside/fs_signupd_socket";
+
+$ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin';
+$ENV{'SHELL'} = '/bin/sh';
+$ENV{'IFS'} = " \t\n";
+$ENV{'CDPATH'} = '';
+$ENV{'ENV'} = '';
+$ENV{'BASH_ENV'} = '';
+
+my $freeside_uid = scalar(getpwnam('freeside'));
+die "not running as the freeside user\n" if $> != $freeside_uid;
+
+=head1 NAME
+
+FS::SignupClient - Freeside signup client API
+
+=head1 SYNOPSIS
+
+  use FS::SignupClient qw( signup_info new_customer );
+
+  ( $locales, $packages, $pops ) = signup_info;
+
+  $error = new_customer ( {
+    'first'          => $first,
+    'last'           => $last,
+    'ss'             => $ss,
+    'comapny'        => $company,
+    'address1'       => $address1,
+    'address2'       => $address2,
+    'city'           => $city,
+    'county'         => $county,
+    'state'          => $state,
+    'zip'            => $zip,
+    'country'        => $country,
+    'daytime'        => $daytime,
+    'night'          => $night,
+    'fax'            => $fax,
+    'payby'          => $payby,
+    'payinfo'        => $payinfo,
+    'paydate'        => $paydate,
+    'payname'        => $payname,
+    'invoicing_list' => $invoicing_list,
+    'pkgpart'        => $pkgpart,
+    'username'       => $username,
+    '_password'       => $password,
+    'popnum'         => $popnum,
+  } );
+
+=head1 DESCRIPTION
+
+This module provides an API for a remote signup server.
+
+It needs to be run as the freeside user.  Because of this, the program which
+calls these subroutines should be written very carefully.
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item signup_info
+
+Returns three array references of hash references.
+
+The first set of hash references is of allowable locales.  Each hash reference
+has the following keys:
+  taxnum
+  state
+  county
+  country
+
+The second set of hash references is of allowable packages.  Each hash
+reference has the following keys:
+  pkgpart
+  pkg
+
+The third set of hash references is of allowable POPs (Points Of Presence).
+Each hash reference has the following keys:
+  popnum
+  city
+  state
+  ac
+  exch
+
+=cut
+
+sub signup_info {
+  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+  connect(SOCK, sockaddr_un($fs_signupd_socket)) or die "connect: $!";
+  print SOCK "signup_info\n";
+  SOCK->flush;
+
+  chop ( my $n_cust_main_county = <SOCK> );
+  my @cust_main_county = map {
+    chop ( my $taxnum  = <SOCK> ); 
+    chop ( my $state   = <SOCK> ); 
+    chop ( my $county  = <SOCK> ); 
+    chop ( my $country = <SOCK> );
+    {
+      'taxnum'  => $taxnum,
+      'state'   => $state,
+      'county'  => $county,
+      'country' => $country,
+    };
+  } 1 .. $n_cust_main_county;
+
+  chop ( my $n_part_pkg = <SOCK> );
+  my @part_pkg = map {
+    chop ( my $pkgpart = <SOCK> ); 
+    chop ( my $pkg     = <SOCK> ); 
+    {
+      'pkgpart' => $pkgpart,
+      'pkg'     => $pkg,
+    };
+  } 1 .. $n_part_pkg;
+
+  chop ( my $n_svc_acct_pop = <SOCK> );
+  my @svc_acct_pop = map {
+    chop ( my $popnum = <SOCK> ); 
+    chop ( my $city   = <SOCK> ); 
+    chop ( my $state  = <SOCK> ); 
+    chop ( my $ac     = <SOCK> );
+    chop ( my $exch   = <SOCK> );
+    {
+      'popnum' => $popnum,
+      'city'   => $city,
+      'state'  => $state,
+      'ac'     => $ac,
+      'exch'   => $exch,
+    };
+  } 1 .. $n_svc_acct_pop;
+
+  close SOCK;
+
+  \@cust_main_county, \@part_pkg, \@svc_acct_pop;
+}
+
+=item new_customer HASHREF
+
+Adds a customer to the remote Freeside system.  Requires a hash reference as
+a paramater with the following keys:
+  first
+  last
+  ss
+  comapny
+  address1
+  address2
+  city
+  county
+  state
+  zip
+  country
+  daytime
+  night
+  fax
+  payby
+  payinfo
+  paydate
+  payname
+  invoicing_list
+  pkgpart
+  username
+  _password
+  popnum
+
+Returns a scalar error message, or the empty string for success.
+
+=cut
+
+sub new_customer {
+  my $hashref = shift;
+
+  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+  connect(SOCK, sockaddr_un($fs_signupd_socket)) or die "connect: $!";
+  print SOCK "new_customer\n";
+
+  print SOCK join("\n", map { $hashref->{$_} } qw(
+    first last ss company address1 address2 city county state zip country
+    daytime night fax payby payinfo paydate payname invoicing_list
+    pkgpart username _password popnum
+  ) ), "\n";
+  SOCK->flush;
+
+  chop( my $error = <SOCK> );
+  $error;
+}
+
+=back
+
+=head1 VERSION
+
+$Id: SignupClient.pm,v 1.1 1999-08-24 07:56:38 ivan Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<fs_signupd>, L<FS::SignupServer>, L<FS::cust_main>
+
+=cut
+
+1;
+
-- 
cgit v1.2.1


From 3e8f1e99c88d187044f6dbc3a347cba4814f342a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 27 Aug 1999 00:26:33 +0000
Subject: better error messages

---
 htdocs/edit/process/svc_acct.cgi | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/htdocs/edit/process/svc_acct.cgi b/htdocs/edit/process/svc_acct.cgi
index 73e9d5d74..84f93abe8 100755
--- a/htdocs/edit/process/svc_acct.cgi
+++ b/htdocs/edit/process/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.6 1999-02-28 00:03:45 ivan Exp $
+# $Id: svc_acct.cgi,v 1.7 1999-08-27 00:26:33 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
@@ -21,7 +21,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.6  1999-02-28 00:03:45  ivan
+# Revision 1.7  1999-08-27 00:26:33  ivan
+# better error messages
+#
+# Revision 1.6  1999/02/28 00:03:45  ivan
 # removed misleading comments
 #
 # Revision 1.5  1999/02/07 09:59:30  ivan
@@ -53,13 +56,19 @@ $cgi = new CGI;
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 $svcnum = $1;
 
-$old = qsearchs('svc_acct',{'svcnum'=>$svcnum}) if $svcnum;
+if ( $svcnum ) {
+  $old = qsearchs('svc_acct', { 'svcnum' => $svcnum } )
+    or die "fatal: can't find account (svcnum $svcnum)!";
+} else {
+  $old = '';
+}
 
 #unmunge popnum
 $cgi->param('popnum', (split(/:/, $cgi->param('popnum') ))[0] );
 
 #unmunge passwd
 if ( $cgi->param('_password') eq '*HIDDEN*' ) {
+  die "fatal: no previous account to recall hidden password from!" unless $old;
   $cgi->param('_password',$old->getfield('_password'));
 }
 
-- 
cgit v1.2.1


From 8baa6fc6b5ce7373cf2bb68ae2686a70935d47aa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 27 Aug 1999 06:25:56 +0000
Subject: *** empty log message ***

---
 TODO | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 12bacc8c5..f7d95d697 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.37 1999-08-03 07:43:33 ivan Exp $
+$Id: TODO,v 1.38 1999-08-27 06:25:56 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,12 @@ duplication of effort.
 
 ---
 
+> So is there anyway it could be setup to allow you to select a "primary
+> service" from each package?  This service would be the one you were prompted
+> for.  Could the signup server then be expanded to allow users to go into
+> their package and "turn-on" the remaining non-primary services(using the
+> primary account.)
+
 take the GPL'ed whois proxy stuff at www.geektools.com and turn it into
 intelligence for Net::Whois.
 
-- 
cgit v1.2.1


From fbe7d08f7d3fec9fe1c057afb61e8c4fb9e6dea3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 27 Aug 1999 22:18:44 +0000
Subject: point to patrick instead of internic!

---
 htdocs/view/svc_domain.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/view/svc_domain.cgi b/htdocs/view/svc_domain.cgi
index 90526973d..fef5ad4f3 100755
--- a/htdocs/view/svc_domain.cgi
+++ b/htdocs/view/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.9 1999-04-08 12:00:19 ivan Exp $
+# $Id: svc_domain.cgi,v 1.10 1999-08-27 22:18:44 ivan Exp $
 #
 # Usage: svc_domain svcnum
 #        http://server.name/path/svc_domain.cgi?svcnum
@@ -13,7 +13,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.9  1999-04-08 12:00:19  ivan
+# Revision 1.10  1999-08-27 22:18:44  ivan
+# point to patrick instead of internic!
+#
+# Revision 1.9  1999/04/08 12:00:19  ivan
 # aesthetic update
 #
 # Revision 1.8  1999/02/28 00:04:04  ivan
@@ -91,6 +94,6 @@ print $cgi->header( '-expires' => 'now' ), header('Domain View', menubar(
       "Service #$svcnum",
       "<BR>Service: <B>", $part_svc->svc, "</B>",
       "<BR>Domain name: <B>$domain</B>.",
-      qq!<BR><BR><A HREF="http://rs.internic.net/cgi-bin/whois?do+$domain">View whois information.</A>!,
+      qq!<BR><BR><A HREF="http://209.133.38.12/step1.cgi?query=$domain">View whois information.</A>!,
       '</BODY></HTML>',
 ;
-- 
cgit v1.2.1


From 145eb4372ae27ef1b884a80666b70283eadfbaf8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 22 Sep 1999 22:06:34 +0000
Subject: ya todo update

---
 TODO | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index f7d95d697..1e4774e12 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.38 1999-08-27 06:25:56 ivan Exp $
+$Id: TODO,v 1.39 1999-09-22 22:06:34 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,65 @@ duplication of effort.
 
 ---
 
+Your suggested script with back up /usr/local/etc/freeside, but will miss
+any database not named `freeside'.  Both of our scripts are specific to
+MySQL.  If you're interested in contributing to Freeside, maybe you could
+work on a script which: reads the mapsecrets configuration file and then
+each secrets file to find out what specific database engine(s) (MySQL,
+PostgreSQL, etc.) and database(s) need to be backed up, then does so,
+serializing backups of the same engine, i.e. stop mysql, do all the mysql
+backups, start mysql, stop postgresql, do all the postgresql backups,
+start postgresql, etc.
+> #!/bin/sh                                                                     
+> apachectl stop                                                                
+> mysqldump -t freeside > fs-backup.sql                                         
+> apachectl start                                                               
+> tar -Pzcvf fs-backup-`date +%y%m%d%H%M%S`.tgz fs-backup.sql /usr/local/etc/freeside/                                                       
+> rm fs-backup.sql                                                              
+
+I chose to use counters in the filesystem because there is no standard way
+to get the value of an auto-incrementing keyfield which is common across  
+all databases (as seen through DBI/DBD).
+.
+It certainly wouldn't be a bad idea to use the database-specific methods,
+when available.
+
+htdocs/edit/svc_acct.cgi:
+(Does the `*HIDDEN*' show up when you are adding a new account, and 
+specify the password, then receive an error and are returned to the form?)
+
+more DOC:
+Thought some of you might be interested in this:
+  
+<ftp://ftp.minivend.com/pub> has CyberCash compatibility modules for 
+Paymentnet <http://www.paymentnet.com> and Authorizenet 
+<http://www.authorizenet.com> which should allow you process transactions
+using those services as well as CyberCash.
+
+The files are named CCLib.pm.paymentnet and CCLib.pm_authorizenet,
+respectively, and are installed by renaming to CCLib.pm and moving to your
+site_perl directory.  Otherwise, follow the directions for Cybercash v2 in
+htdocs/docs/config.html
+
+DOC:
+fs_passwd/ is a client-server replacement for the `passwd', `chfn' and    
+`chsh' commands that updates the Freeside database.  (so for that to be   
+useful, you'd have to be exporting that data periodically)
+  
+fs_radlog/ is a client-server RADIUS log parser that stuffs the data into
+SQL.  It isn't finished, and probably won't be unless someone who I can't
+convince to use one of the RADIUS daemons that logs to SQL directly pays  
+me money or something.
+  
+fs_signup/ is a client-server signup server.  i'm just finishing it up    
+now; probably isn't on your machine yet.
+
+
+http://www.sisd.com/freeside/list-archive/msg00812.html
+
+package definitions should be implicit allow wrt agent types, not implicit deny
+(with the old behavior possible via a config file)
+
 > So is there anyway it could be setup to allow you to select a "primary
 > service" from each package?  This service would be the one you were prompted
 > for.  Could the signup server then be expanded to allow users to go into
-- 
cgit v1.2.1


From 7c7bc66bd24874e7ccd4fd3445f1da7f88e9679d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 4 Oct 1999 08:23:26 +0000
Subject: silly 'use of unitialized value' errors

---
 FS/bin/freeside-bill | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill
index a251df4d5..417df767b 100755
--- a/FS/bin/freeside-bill
+++ b/FS/bin/freeside-bill
@@ -28,6 +28,9 @@ my($time)= $main::opt_d ? str2time($main::opt_d) : $^T;
 my($cust_main,%saw);
 foreach $cust_main (
   map {
+    unless ( exists $saw{ $_->custnum } && defined $saw{ $_->custnum} ) {
+      $saw{ $_->custnum } = 0; # to avoid 'use of uninitialized value' errors
+    }
     if (
       ( $main::opt_a || ( ( $_->getfield('bill') || 0 ) <= $time ) )
       && $bill_only{ $_->custnum }
@@ -109,7 +112,7 @@ customers.  Otherwise, bills all customers.
 
 =head1 VERSION
 
-$Id: freeside-bill,v 1.2 1999-08-11 20:51:54 ivan Exp $
+$Id: freeside-bill,v 1.3 1999-10-04 08:23:26 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 8a45867abd9f8349bec410910af8ad166e1434a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 8 Nov 1999 21:38:38 +0000
Subject: remove services using pkg_svc table now, oops!

---
 FS/FS/cust_pkg.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 2de664b5c..1dcdab8d5 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -8,6 +8,7 @@ use FS::cust_svc;
 use FS::part_pkg;
 use FS::cust_main;
 use FS::type_pkgs;
+use FS::pkg_svc;
 
 # need to 'use' these instead of 'require' in sub { cancel, suspend, unsuspend,
 # setup }
@@ -428,16 +429,15 @@ sub order {
     push @cust_svc, [
       map {
         ( $svcnum{$_} && @{ $svcnum{$_} } ) ? shift @{ $svcnum{$_} } : ();
-      } (split(/,/,
-       qsearchs('part_pkg',{'pkgpart'=>$pkgpart})->getfield('services')
-      ))
+      } map { $_->svcpart } qsearch('pkg_svc', { 'pkgpart' => $pkgpart })
     ];
   }
 
   #check for leftover services
   foreach (keys %svcnum) {
     next unless @{ $svcnum{$_} };
-    return "Leftover services!";
+    return "Leftover services, svcpart $_: svcnum ".
+           join(', ', map { $_->svcnum } @{ $svcnum{$_} } );
   }
 
   #no leftover services, let's make changes.
@@ -490,7 +490,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.2 1999-08-04 11:50:41 ivan Exp $
+$Id: cust_pkg.pm,v 1.3 1999-11-08 21:38:38 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 31c2cb41e1ede74a570b2559d326b4a1361a1223 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Dec 1999 02:33:23 +0000
Subject: argh

---
 htdocs/edit/cust_main.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 7be84c1fc..e1262c542 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.21 1999-08-23 07:40:38 ivan Exp $
+# $Id: cust_main.cgi,v 1.22 1999-12-17 02:33:23 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.21  1999-08-23 07:40:38  ivan
+# Revision 1.22  1999-12-17 02:33:23  ivan
+# argh
+#
+# Revision 1.21  1999/08/23 07:40:38  ivan
 # missing </TD> flag
 #
 # Revision 1.20  1999/08/23 07:08:11  ivan
@@ -185,7 +188,7 @@ $r = qq!<font color="#ff0000">*</font>!;
 
 @agents = qsearch( 'agent', {} );
 #die "No agents created!" unless @agents;
-die "You have not created any agents.  You must create at least one agent before adding a customer.  <a href=\"". popurl(2). "browse/agent.cgi\">Create at least one agent here.</a>" unless @agents;
+die "You have not created any agents.  You must create at least one agent before adding a customer.  Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents;
 $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
 if ( scalar(@agents) == 1 ) {
   print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!;
-- 
cgit v1.2.1


From add9a2b100af10df0b5d4ed174c158d99358cee3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Dec 1999 12:03:03 +0000
Subject: beginning of IEAK support

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 80 ++++++++++++++++++++++++++++++--
 1 file changed, 77 insertions(+), 3 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 7131ad2e8..15767c151 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,22 +1,34 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.1 1999-08-24 07:40:45 ivan Exp $
+# $Id: signup.cgi,v 1.2 1999-12-17 12:03:03 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $r $error
              $last $first $ss $company $address1 $address2 $city $state $county
              $country $zip $daytime $night $fax $invoicing_list $payby $payinfo
-             $paydate $payname $pkgpart $username $password $popnum );
+             $paydate $payname $pkgpart $username $password $popnum
+             $ieak_docroot $ieak_baseurl );
 use subs qw( print_form print_okay expselect );
 
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
+use HTTP::Headers::UserAgent 2.00;
 use FS::SignupClient qw( signup_info new_customer );
 
+#acceptable payment methods
+#
 #@payby = qw( CARD BILL COMP );
 #@payby = qw( CARD BILL );
 @payby = qw( CARD );
 
+#to enable ieak signups, you need to specify a directory in the web server's
+#document space and the equivalent base URL
+#
+$ieak_docroot = "/var/www/sisd.420.am/freeside/ieak";
+$ieak_baseurl = "http://sisd.420.am/freeside/ieak";
+
+#srand (time ^ $$ ^ unpack "%L*", `ps axww | gzip`);
+
 ( $locales, $packages, $pops ) = signup_info();
 
 $cgi = new CGI;
@@ -265,13 +277,75 @@ END
 }
 
 sub print_okay {
-  print $cgi->header( '-expires' => 'now' ), <<END;
+  $user_agent = new HTTP::Headers::UserAgnet $ENV{HTTP_USER_AGENT};
+  if (    defined($ieak_docroot)
+       && defined($ieak_baseurl)
+       && defined($ieak_secret)
+       && $user_agent->platform eq 'ia32'
+       && $user_agent->os =~ /^win/
+       && ($user-agent->browser)[0] eq 'IE'
+     )
+  { #send an IEAK config
+    my $username = $cgi->param('username');
+    my $password = $cgi->param('_password');
+    my $email_name = $cgi->param('first'). ' '. $cgi->param('last');
+    my $ins_file = rand(4294967296). ".ins";
+    open(INS_FILE, ">$ieak_docroot/$ins_file");
+    print INS_FILE <<END;
+[Entry]\r
+Entry_Name = Netloud\r
+[Phone]\r
+Dial_As_Is=no\r
+Phone_Number = 5551212\r
+Area_Code = 415\r
+Country_Code = 1\r
+Country_Id = 1\r
+[Server]\r
+Type = PPP\r
+SW_Compress = Yes\r
+PW_Encrypt = Yes\r
+Negotiate_TCP/IP = Yes\r
+Disable_LCP = No\r
+[TCP/IP]\r
+Specify_IP_Address = No\r
+Specity_Server_Address = No\r
+IP_Header_Compress = Yes\r
+Gateway_On_Remote = Yes\r
+[User]\r
+Name = $username\r
+Password = $password\r
+Display_Password = Yes\r
+[Internet_Mail]\r
+Email_Name = $email_name\r
+Email_Address = $username\@netloud.com\r
+POP_Server = mail.netloud.com\r
+POP_Server_Port_Number = 110\r
+POP_Login_Name = $username\r
+POP_Login_Password = $password\r
+SMTP_Server = mail.netloud.com\r
+SMTP_Server_Port_Number = 25\r
+Install_Mail = 1\r
+[Internet_News]\r
+NNTP_Server = news.netloud.com\r
+NNTP_Server_Port_Number = 119\r
+Logon_Required = No\r
+Install_News = 1\r
+[Branding]\r
+Window_Title = Internet Explorer From Netloud.com\r
+END
+    close INS_FILE;
+
+    print $cgi->redirect("$ieak_docroot/$ins_file");
+
+  } else { #send a simple confirmation
+    print $cgi->header( '-expires' => 'now' ), <<END;
 <HTML><HEAD><TITLE>Signup successful</TITLE></HEAD>
 <BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Signup successful</FONT><BR><BR>
 blah blah blah
 </BODY>
 </HTML>
 END
+  }
 }
 
 sub expselect {
-- 
cgit v1.2.1


From 0c31694b965b242281d6970f517376b8ea9b2d58 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 Jan 2000 00:27:50 +0000
Subject: update TODO

---
 TODO | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/TODO b/TODO
index 1e4774e12..b93c91650 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.39 1999-09-22 22:06:34 ivan Exp $
+$Id: TODO,v 1.40 2000-01-27 00:27:50 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,38 @@ duplication of effort.
 
 ---
 
+There's no way to do this currently, though it would be pretty
+straightforward to modify the source - specifically, the _collect_
+subroutine in FS::cust_main.
+>
+On Mon, Dec 13, 1999 at 04:05:32PM -0700, Jeff Garner wrote:
+> Freeside will e-mail my users when they are billed if they are setup as
+> billing.
+>
+> When setup by credit card it does not e-mail them.  Is there a way to
+> turn on e-mail invoices for those who are billed via credit card?  Kind
+> of like a recipt of billing....
+
+
+doc: http://www.softagency.co.jp/mysql/qmail.en.html
+
+sql1992.txt standard is 18 character column names.  shoot for that, not just
+32 (postgresql default)
+
+Also note that (AFAIK) Freeside won't display any package that has more
+than one service on the "Add Customer" page.  The reason for this is
+because there's no way to dynamically alter the displayed html form
+based on which package is selected. One possible solution would be to
+make an additional page that's used in the signup process that would
+display the form for each package, like a MS-style "Wizard".  The first
+page lets you select the package, then the second page has the custom
+form with fields for each service in that package and a save button. Of
+course, that would require a little perl work.
+.
+Later,
+Scott Cruzen <sic@boernenet.com>
+
+
 Your suggested script with back up /usr/local/etc/freeside, but will miss
 any database not named `freeside'.  Both of our scripts are specific to
 MySQL.  If you're interested in contributing to Freeside, maybe you could
@@ -137,7 +169,7 @@ table should go away, along with the concept of a "default" domain.
 default setting for new packages should allow all agents to purchase them...
 with a config file for the old behaviour
 
-replace Term::Query  with Quiz::Question?
+fix or replace Term::Query (Quiz::Question doesn't do what i need)
 
 Check config file reading stuff from CPAN
  
-- 
cgit v1.2.1


From d3fe11011e0a9bfa3a7a953b5e409683a6eab42f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 Jan 2000 00:37:33 +0000
Subject: ack

---
 README | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/README b/README
index 496d3b974..def59bc60 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
-Freeside, 1.2.2
+Freeside, (pre-1.3.0)
 
-Copyright (C) 1999 Ivan Kohler
+Copyright (C) 2000 Ivan Kohler
 Copyright (C) 1999 Silicon Interactive Software Design
 All rights reserved
 
@@ -35,10 +35,11 @@ The Freeside home page is at `http://www.sisd.com/freeside'.
 The documentation is in `htdocs/docs'.
 
 A mailing list for users and developers is available.  Send a blank message to
-<ivan-freeside-subscribe@sisd.com> to subscribe.
+<ivan-freeside-subscribe@420.am> to subscribe.
 
-Commercial support is available from Ivan Kohler <ivan@sisd.com>.  Please
-subscribe to the the mailing list to request free support!
+Commercial support is available from Ivan Kohler <ivan@sisd.com>.  Requests for
+free support sent to me directly will be ignored.  Please subscribe to the the
+mailing list to request free support!
+
+Ivan Kohler <ivan@420.am>
 
-Ivan Kohler <ivan@sisd.com>
-20 4,16 * * * saytime
-- 
cgit v1.2.1


From 382224a6275c2503e6455c6628e2dfb9b83963fa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 Jan 2000 00:53:14 +0000
Subject: 5.004_04 workaround

---
 htdocs/edit/cust_main.cgi | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index e1262c542..10f1dba1f 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.22 1999-12-17 02:33:23 ivan Exp $
+# $Id: cust_main.cgi,v 1.23 2000-01-27 00:53:14 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.22  1999-12-17 02:33:23  ivan
+# Revision 1.23  2000-01-27 00:53:14  ivan
+# 5.004_04 workaround
+#
+# Revision 1.22  1999/12/17 02:33:23  ivan
 # argh
 #
 # Revision 1.21  1999/08/23 07:40:38  ivan
@@ -363,8 +366,8 @@ unless ( $custnum ) {
     my %typenum;
     foreach my $agent ( @agents ) {
       next if $typenum{$agent->typenum}++;
-      #5.004_04 barfs (5.004_05 okay?)# $pkgpart->{$_}++ foreach keys %{ $agent->pkgpart_hashref }
-      foreach ( keys %{ $agent->pkgpart_hashref } ) { $pkgpart->{$_}++; }
+      #fixed in 5.004_05 #$pkgpart->{$_}++ foreach keys %{ $agent->pkgpart_hashref }
+      foreach ( keys %{ $agent->pkgpart_hashref } ) { $pkgpart->{$_}++; } #5.004_04 workaround
     }
   }
   #eslaf
-- 
cgit v1.2.1


From 359433c470f820e110e3da847700fd32aa3d44d1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Jan 2000 22:47:31 +0000
Subject: wrote real documentation

---
 fs_signup/README | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 fs_signup/README

diff --git a/fs_signup/README b/fs_signup/README
deleted file mode 100644
index 631c22364..000000000
--- a/fs_signup/README
+++ /dev/null
@@ -1,18 +0,0 @@
-this should become better docs soon
-
-on client machine (public webserver):
-
-install perl, ssh, CGI.pm
-cd FS-SignupClient; perl Makefile.PL; make; su; make install
-copy or symlink FS-SignupClient/cgi/signup.cgi into the web server's view
-use suExec or setuid to run cgi/signup.cgi as the freeside user
-(chmod /usr/local/freeside/fs_signupd_socket 600, chown freeside)
-
-on server machine (Freeside machine):
-
-run fs_signup_server user machine agentnum refnum
-
-  user is a freeside user from mapsecrets
-  machine is the client machine
-  agentnum and refnum are the fixed values for this signup server
-
-- 
cgit v1.2.1


From 7fa1271c9e0be6e154aa12d31466109407bb03b4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Jan 2000 22:48:33 +0000
Subject: example template

---
 fs_signup/ieak.template | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100755 fs_signup/ieak.template

diff --git a/fs_signup/ieak.template b/fs_signup/ieak.template
new file mode 100755
index 000000000..5da2a2036
--- /dev/null
+++ b/fs_signup/ieak.template
@@ -0,0 +1,40 @@
+[Entry]\r
+Entry_Name = The Internet\r
+[Phone]\r
+Dial_As_Is=no\r
+Phone_Number = { $exch. $loc }\r
+Area_Code = { $ac }\r
+Country_Code = 1\r
+Country_Id = 1\r
+[Server]\r
+Type = PPP\r
+SW_Compress = Yes\r
+PW_Encrypt = Yes\r
+Negotiate_TCP/IP = Yes\r
+Disable_LCP = No\r
+[TCP/IP]\r
+Specify_IP_Address = No\r
+Specity_Server_Address = No\r
+IP_Header_Compress = Yes\r
+Gateway_On_Remote = Yes\r
+[User]\r
+Name = { $username }\r
+Password = { $password }\r
+Display_Password = Yes\r
+[Internet_Mail]\r
+Email_Name = { $email_name }\r
+Email_Address = { $username }\@domain.tld\r
+POP_Server = mail.domain.tld\r
+POP_Server_Port_Number = 110\r
+POP_Login_Name = { $username }\r
+POP_Login_Password = { $password }\r
+SMTP_Server = mail.domain.tld\r
+SMTP_Server_Port_Number = 25\r
+Install_Mail = 1\r
+[Internet_News]\r
+NNTP_Server = news.domain.tld\r
+NNTP_Server_Port_Number = 119\r
+Logon_Required = No\r
+Install_News = 1\r
+[Branding]\r
+Window_Title = The Internet\r
-- 
cgit v1.2.1


From 5e39e2d7963d6f8304e5afb5d8b5f50aa6eaaf14 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Jan 2000 22:49:28 +0000
Subject: full phone number

---
 fs_signup/FS-SignupClient/SignupClient.pm | 4 +++-
 fs_signup/FS-SignupClient/fs_signupd      | 3 +++
 fs_signup/fs_signup_server                | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm
index d3118467b..7c96609f6 100644
--- a/fs_signup/FS-SignupClient/SignupClient.pm
+++ b/fs_signup/FS-SignupClient/SignupClient.pm
@@ -133,12 +133,14 @@ sub signup_info {
     chop ( my $state  = <SOCK> ); 
     chop ( my $ac     = <SOCK> );
     chop ( my $exch   = <SOCK> );
+    chop ( my $loc    = <SOCK> );
     {
       'popnum' => $popnum,
       'city'   => $city,
       'state'  => $state,
       'ac'     => $ac,
       'exch'   => $exch,
+      'loc'    => $loc,
     };
   } 1 .. $n_svc_acct_pop;
 
@@ -201,7 +203,7 @@ sub new_customer {
 
 =head1 VERSION
 
-$Id: SignupClient.pm,v 1.1 1999-08-24 07:56:38 ivan Exp $
+$Id: SignupClient.pm,v 1.2 2000-01-28 22:49:28 ivan Exp $
 
 =head1 BUGS
 
diff --git a/fs_signup/FS-SignupClient/fs_signupd b/fs_signup/FS-SignupClient/fs_signupd
index 972e3c7b4..f22ab15d4 100755
--- a/fs_signup/FS-SignupClient/fs_signupd
+++ b/fs_signup/FS-SignupClient/fs_signupd
@@ -57,12 +57,14 @@ my @svc_acct_pop = map {
   chomp( my $state = <STDIN> );
   chomp( my $ac = <STDIN> );
   chomp( my $exch = <STDIN> );
+  chomp( my $loc = <STDIN> );
   {
     'popnum' => $popnum,
     'city'   => $city,
     'state'  => $state,
     'ac'     => $ac,
     'exch'   => $exch,
+    'loc'    => $loc,
   };
 } ( 1 .. $n_svc_acct_pop );
 
@@ -105,6 +107,7 @@ for ( ; $paddr = accept(Client,Server); close Client) {
         $_->{state},
         $_->{ac},
         $_->{exch},
+        $_->{loc},
       } @svc_acct_pop
     ), "\n";
 
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index e1c9b3517..56d616b53 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -75,6 +75,7 @@ while (1) {
       $_->state,
       $_->ac,
       $_->exch,
+      $_->loc,
     } @svc_acct_pop
   ), "\n";
   warn "[fs_signup_server] $data\n" if $Debug > 2;
-- 
cgit v1.2.1


From b202e6a1fd3f2ef13f5bc8d77f44e2869083c494 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Jan 2000 22:49:49 +0000
Subject: proper IEAK stuff

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 88 +++++++++++---------------------
 1 file changed, 30 insertions(+), 58 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 15767c151..6fccf11b1 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,19 +1,22 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.2 1999-12-17 12:03:03 ivan Exp $
+# $Id: signup.cgi,v 1.3 2000-01-28 22:49:49 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $r $error
              $last $first $ss $company $address1 $address2 $city $state $county
              $country $zip $daytime $night $fax $invoicing_list $payby $payinfo
              $paydate $payname $pkgpart $username $password $popnum
-             $ieak_docroot $ieak_baseurl );
+             $ieak_file $ieak_template $ac $exch $loc
+           );
+             #$ieak_docroot $ieak_baseurl
 use subs qw( print_form print_okay expselect );
 
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use HTTP::Headers::UserAgent 2.00;
 use FS::SignupClient qw( signup_info new_customer );
+use Text::Template;
 
 #acceptable payment methods
 #
@@ -21,11 +24,20 @@ use FS::SignupClient qw( signup_info new_customer );
 #@payby = qw( CARD BILL );
 @payby = qw( CARD );
 
-#to enable ieak signups, you need to specify a directory in the web server's
-#document space and the equivalent base URL
-#
-$ieak_docroot = "/var/www/sisd.420.am/freeside/ieak";
-$ieak_baseurl = "http://sisd.420.am/freeside/ieak";
+$ieak_file = '/usr/local/freeside/ieak.template';
+
+if ( -e $ieak_file ) {
+  $ieak_template = new Text::Template ( TYPE => 'FILE', SOURCE => $ieak_file )
+    or die "Couldn't construct template: $Text::Template::ERROR";
+} else {
+  $ieak_template = '';
+}
+
+#	#to enable ieak signups, you need to specify a directory in the web server's
+#	#document space and the equivalent base URL
+#	#
+#	$ieak_docroot = "/var/www/sisd.420.am/freeside/ieak";
+#	$ieak_baseurl = "http://sisd.420.am/freeside/ieak";
 
 #srand (time ^ $$ ^ unpack "%L*", `ps axww | gzip`);
 
@@ -277,65 +289,25 @@ END
 }
 
 sub print_okay {
-  $user_agent = new HTTP::Headers::UserAgnet $ENV{HTTP_USER_AGENT};
-  if (    defined($ieak_docroot)
-       && defined($ieak_baseurl)
-       && defined($ieak_secret)
+  my $user_agent = new HTTP::Headers::UserAgnet $ENV{HTTP_USER_AGENT};
+  if ( $ieak_template
        && $user_agent->platform eq 'ia32'
        && $user_agent->os =~ /^win/
-       && ($user-agent->browser)[0] eq 'IE'
+       && ($user_agent->browser)[0] eq 'IE'
      )
   { #send an IEAK config
     my $username = $cgi->param('username');
     my $password = $cgi->param('_password');
     my $email_name = $cgi->param('first'). ' '. $cgi->param('last');
-    my $ins_file = rand(4294967296). ".ins";
-    open(INS_FILE, ">$ieak_docroot/$ins_file");
-    print INS_FILE <<END;
-[Entry]\r
-Entry_Name = Netloud\r
-[Phone]\r
-Dial_As_Is=no\r
-Phone_Number = 5551212\r
-Area_Code = 415\r
-Country_Code = 1\r
-Country_Id = 1\r
-[Server]\r
-Type = PPP\r
-SW_Compress = Yes\r
-PW_Encrypt = Yes\r
-Negotiate_TCP/IP = Yes\r
-Disable_LCP = No\r
-[TCP/IP]\r
-Specify_IP_Address = No\r
-Specity_Server_Address = No\r
-IP_Header_Compress = Yes\r
-Gateway_On_Remote = Yes\r
-[User]\r
-Name = $username\r
-Password = $password\r
-Display_Password = Yes\r
-[Internet_Mail]\r
-Email_Name = $email_name\r
-Email_Address = $username\@netloud.com\r
-POP_Server = mail.netloud.com\r
-POP_Server_Port_Number = 110\r
-POP_Login_Name = $username\r
-POP_Login_Password = $password\r
-SMTP_Server = mail.netloud.com\r
-SMTP_Server_Port_Number = 25\r
-Install_Mail = 1\r
-[Internet_News]\r
-NNTP_Server = news.netloud.com\r
-NNTP_Server_Port_Number = 119\r
-Logon_Required = No\r
-Install_News = 1\r
-[Branding]\r
-Window_Title = Internet Explorer From Netloud.com\r
-END
-    close INS_FILE;
 
-    print $cgi->redirect("$ieak_docroot/$ins_file");
+    print $cgi->header('application/x-Internet-signup'),
+          $ieak_template->fill_in();
+
+#    my $ins_file = rand(4294967296). ".ins";
+#    open(INS_FILE, ">$ieak_docroot/$ins_file");
+#    print INS_FILE <<END;
+#    close INS_FILE;
+#    print $cgi->redirect("$ieak_docroot/$ins_file");
 
   } else { #send a simple confirmation
     print $cgi->header( '-expires' => 'now' ), <<END;
-- 
cgit v1.2.1


From c2e9ca0ddbdcd3588f94c8c550120c73c0844bb1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Jan 2000 22:51:17 +0000
Subject: add signup server documentation, track full phone number

---
 htdocs/docs/index.html    |  2 ++
 htdocs/docs/schema.html   |  1 +
 htdocs/docs/signup.html   | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 htdocs/docs/upgrade5.html | 27 +++++++++++++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100644 htdocs/docs/signup.html
 create mode 100644 htdocs/docs/upgrade5.html

diff --git a/htdocs/docs/index.html b/htdocs/docs/index.html
index 88714dc71..21ec25755 100644
--- a/htdocs/docs/index.html
+++ b/htdocs/docs/index.html
@@ -9,6 +9,7 @@
   <li><a href="upgrade2.html">Upgrading from 1.1.x to 1.1.4</a>
   <li><a href="upgrade3.html">Upgrading from 1.1.x to 1.2.x</a>
   <li><a href="upgrade4.html">Upgrading from 1.2.x to 1.2.2</a>
+  <li><a href="upgrade5.html">Upgrading from 1.2.2 to 1.3.0</a>
   <li><a href="config.html">Configuration files</a>
 <!--
   <li><a href="admin.html">Administration</a>
@@ -17,6 +18,7 @@
   <li><a href="legacy.html">Importing legacy data</a>
   <li><a href="export.html">File exporting and remote setup</a>
   <li><a href="passwd.html">fs_passwd</a>
+  <li><a href="signup.html">Signup server</a>
   <li><a href="billing.html">Billing</a>
   <li><a href="trouble.html">Troubleshooting</a>
   <li><a href="schema.html">Schema reference</a>
diff --git a/htdocs/docs/schema.html b/htdocs/docs/schema.html
index 9558109e9..92965d795 100644
--- a/htdocs/docs/schema.html
+++ b/htdocs/docs/schema.html
@@ -198,6 +198,7 @@
         <li>state
         <li>ac - area code
         <li>exch - exchange
+        <li>loc - rest of number
       </ul>
     <li><a name="svc_acct_sm">svc_acct_sm</a> - Domain mail aliases
       <ul>
diff --git a/htdocs/docs/signup.html b/htdocs/docs/signup.html
new file mode 100644
index 000000000..a00995994
--- /dev/null
+++ b/htdocs/docs/signup.html
@@ -0,0 +1,46 @@
+<head>
+  <title>Signup server</title>
+</head>
+<body>
+  <h1>Signup server</h1>
+For security reasons, the signup server should run on an external public
+webserver.  On this machine, install:
+<ul>
+  <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
+  <li><a href="ftp://ftp.cs.hut.fi/pub/ssh/">SSH</a>
+  <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
+  <li><a href="http://www.perl.com/CPAN/modules/by-module/Text/">Text::Template</a>
+  <li><a href="http://www.perl.com/CPAN/modules/by-author/IVAN/">HTTP::Headers::UserAgent</a> (version 2.0 or higher; not yet indexed correctly on CPAN)
+
+  <li><a href="man/FS/SignupClient.html">FS::SignupClient</a> (copy the fs_signup/FS-SignupClient directory to the external machine, then: perl Makefile.PL; make; make install)
+</ul>
+Then:
+<ul>
+  <li>Add the user `freeside' to the the external machine.
+  <li>Copy or symlink fs_signup/FS-SignupClient/cgi/signup.cgi into the web server's document space.
+  <li>Enable CGI execution for files with the `.cgi' extension.  (with <a href="http://www.apache.org/docs/mod/mod_mime.html#addhandler">Apache</a>)
+  <li>Create the /usr/local/freeside directory on the external machine (owned by the freeside user).
+  <li>touch /usr/local/freeside/fs_signupd_socket; chown freeside /usr/local/freeside/fs_signupd_socket; chmod 600 /usr/local/freeside/fs_signupd_socket
+  <li>Use <a href="http://www.apache.org/docs/suexec.html">suEXEC</a> or <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">setuid</a> (see <a href="install.html">install.html</a> for details) to run signup.cgi as the freeside user.
+  <li>Append the identity.pub from the freeside user on your freeside machine to the authorized_keys file of the newly created freeside user on the external machine(s).
+  <li>Run <pre>fs_signup_server <i>user</i> <i>machine</i> <i>agentnum</i> <i>refnum</i></pre> on the Freeside machine.
+  <ul>
+    <li><i>user</i> is a user from the mapsecrets file.
+    <li><i>machine</i> is the name of the external machine.
+    <li><i>agentnum</i> and <i>refnum</i> are the <a href="schema.html#agent">agent</a> and <a href="schema.html#part_referral">referral</a>, respectively, to use for customers who sign up via this signup server.
+  </ul>
+</ul>
+Optional:
+<ul>
+  <li>If you create a <b>/usr/local/freeside/ieak.template</b> file on the external machine, it will be sent to IE users with MIME type <i>application/x-Internet-signup</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the following variables available:
+  <ul>
+    <li>$ac - area code of selected POP
+    <li>$exch - exchange of selected POP
+    <li>$loc - local part of selected POP
+    <li>$username
+    <li>$password
+    <li>$email_name - first and last name
+  </ul>
+(an example file is included as <b>fs_signup/ieak.template</b>)
+</ul>
+</body>
diff --git a/htdocs/docs/upgrade5.html b/htdocs/docs/upgrade5.html
new file mode 100644
index 000000000..82a7602a3
--- /dev/null
+++ b/htdocs/docs/upgrade5.html
@@ -0,0 +1,27 @@
+<head>
+  <title>Upgrading to 1.3.0</title>
+</head>
+<body>
+<h1>Upgrading to 1.3.0 from 1.2.2</h1>
+<ul>
+  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
+  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
+  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
+  <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
+  <li>Back up your data and current Freeside installation.
+  <li>Apply the following changes to your database:
+<pre>
+ALTER TABLE svc_acct_pop ADD loc CHAR(4);
+</pre>
+  <li>Copy or symlink htdocs to the new copy.
+  <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
+  <li>Change to the FS directory in the new tarball, and build and install the
+      Perl modules:
+    <pre>
+$ cd FS/
+$ perl Makefile.PL
+$ make
+$ su
+# make install</pre>
+  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
+</body>
-- 
cgit v1.2.1


From 9a34cb208f355e2046580232eb731b00deac4b89 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Jan 2000 22:56:13 +0000
Subject: track full phone number

---
 FS/FS/svc_acct_pop.pm          |  5 ++++-
 bin/fs-setup                   |  9 ++++++---
 htdocs/browse/svc_acct_pop.cgi | 10 ++++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/FS/FS/svc_acct_pop.pm b/FS/FS/svc_acct_pop.pm
index a64adb25a..5e755ef73 100644
--- a/FS/FS/svc_acct_pop.pm
+++ b/FS/FS/svc_acct_pop.pm
@@ -42,6 +42,8 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item exch - exchange
 
+=item loc - rest of number
+
 =back
 
 =head1 METHODS
@@ -87,6 +89,7 @@ sub check {
       or $self->ut_text('state')
       or $self->ut_number('ac')
       or $self->ut_number('exch')
+      or $self->ut_numbern('loc')
   ;
 
 }
@@ -95,7 +98,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_acct_pop.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: svc_acct_pop.pm,v 1.2 2000-01-28 22:55:06 ivan Exp $
 
 =head1 BUGS
 
diff --git a/bin/fs-setup b/bin/fs-setup
index aae9c5739..6ba07e897 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.19 1999-07-29 08:50:35 ivan Exp $
+# $Id: fs-setup,v 1.20 2000-01-28 22:53:33 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.19  1999-07-29 08:50:35  ivan
+# Revision 1.20  2000-01-28 22:53:33  ivan
+# track full phone number
+#
+# Revision 1.19  1999/07/29 08:50:35  ivan
 # wrong type for cust_pay_batch.exp
 #
 # Revision 1.18  1999/04/15 22:46:30  ivan
@@ -591,7 +594,7 @@ sub tables_hash_hack {
         'state',     'varchar',   '',   $char_d,
         'ac',        'char',   '',   3,
         'exch',      'char',   '',   3,
-        #rest o' number?
+        'loc',       'char',   'NULL',   4, #NULL for legacy purposes
       ],
       'primary_key' => 'popnum',
       'unique' => [ [] ],
diff --git a/htdocs/browse/svc_acct_pop.cgi b/htdocs/browse/svc_acct_pop.cgi
index 1ddbcdc2e..8094a9fd1 100755
--- a/htdocs/browse/svc_acct_pop.cgi
+++ b/htdocs/browse/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.7 1999-04-09 04:22:34 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.8 2000-01-28 22:56:13 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.7  1999-04-09 04:22:34  ivan
+# Revision 1.8  2000-01-28 22:56:13  ivan
+# track full phone number
+#
+# Revision 1.7  1999/04/09 04:22:34  ivan
 # also table()
 #
 # Revision 1.6  1999/04/09 03:52:55  ivan
@@ -55,6 +58,7 @@ print $cgi->header( '-expires' => 'now' ), header('POP Listing', menubar(
         <TH>State</TH>
         <TH>Area code</TH>
         <TH>Exchange</TH>
+        <TH>Local</TH>
       </TR>
 END
 
@@ -74,6 +78,8 @@ foreach $svc_acct_pop ( sort {
           $hashref->{ac}</A></TD>
         <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
           $hashref->{exch}</A></TD>
+        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
+          $hashref->{loc}</A></TD>
       </TR>
 END
 
-- 
cgit v1.2.1


From 2d7c7784f01a7012c944a5b060284d6dde3fb07f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Jan 2000 23:02:48 +0000
Subject: track full phone number

---
 htdocs/edit/svc_acct_pop.cgi | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/edit/svc_acct_pop.cgi b/htdocs/edit/svc_acct_pop.cgi
index d6e2e5d3d..1797b2b8e 100755
--- a/htdocs/edit/svc_acct_pop.cgi
+++ b/htdocs/edit/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.8 1999-02-23 08:09:23 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.9 2000-01-28 23:02:48 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8 
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.8  1999-02-23 08:09:23  ivan
+# Revision 1.9  2000-01-28 23:02:48  ivan
+# track full phone number
+#
+# Revision 1.8  1999/02/23 08:09:23  ivan
 # beginnings of one-screen new customer entry and some other miscellania
 #
 # Revision 1.7  1999/02/07 09:59:23  ivan
@@ -83,6 +86,7 @@ City      <INPUT TYPE="text" NAME="city" SIZE=32 VALUE="$hashref->{city}">
 State     <INPUT TYPE="text" NAME="state" SIZE=16 MAXLENGTH=16 VALUE="$hashref->{state}">
 Area Code <INPUT TYPE="text" NAME="ac" SIZE=4 MAXLENGTH=3 VALUE="$hashref->{ac}">
 Exchange  <INPUT TYPE="text" NAME="exch" SIZE=4 MAXLENGTH=3 VALUE="$hashref->{exch}">
+Local     <INPUT TYPE="text" NAME="loc" SIZE=5 MAXLENGTH=4 VALUE="$hashref->{loc}">
 </PRE>
 END
 
-- 
cgit v1.2.1


From ccbd7d4704d768d4d79c3beafbc9ef44ace49f8c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 29 Jan 2000 21:10:13 +0000
Subject: doc update

---
 FS/FS/svc_domain.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 73cc3e340..f960de066 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -257,8 +257,8 @@ sub check {
 
 =item whois
 
-Returns the Net::Whois object corresponding to this domain, or undef if
-the domain is not found in whois.
+Returns the Net::Whois::Domain object (see L<Net::Whois>) for this domain, or
+undef if the domain is not found in whois.
 
 (If $FS::svc_domain::whois_hack is true, returns that in all cases instead.)
 
@@ -393,7 +393,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.3 1999-08-11 20:41:27 ivan Exp $
+$Id: svc_domain.pm,v 1.4 2000-01-29 21:10:13 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 8f685842fce6c912568c215f645b01b7fc73c647 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 30 Jan 2000 06:05:07 +0000
Subject: postgres 6.5 finally supports decimal(10,2)

---
 bin/fs-setup             | 14 ++++++--------
 htdocs/docs/install.html |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 6ba07e897..f1dd3a8b4 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.20 2000-01-28 22:53:33 ivan Exp $
+# $Id: fs-setup,v 1.21 2000-01-30 06:03:26 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.20  2000-01-28 22:53:33  ivan
+# Revision 1.21  2000-01-30 06:03:26  ivan
+# postgres 6.5 finally supports decimal(10,2)
+#
+# Revision 1.20  2000/01/28 22:53:33  ivan
 # track full phone number
 #
 # Revision 1.19  1999/07/29 08:50:35  ivan
@@ -131,12 +134,7 @@ my($char_d) = 80; #default maxlength for text fields
 #my(@date_type)  = ( 'timestamp', '', ''     );
 my(@date_type)  = ( 'int', 'NULL', ''     );
 my(@perl_type) = ( 'varchar', 'NULL', 255  ); 
-my(@money_type);
-if (datasrc =~ m/Pg/) { #Pg can't do decimal(10,2)
-  @money_type = ( 'money',   '', '' );
-} else {
-  @money_type = ( 'decimal',   '', '10,2' );
-}
+my @money_type = ( 'decimal',   '', '10,2' );
 
 ###
 # create a dbdef object from the old data structure
diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 5a4d1b2d7..574ab91e4 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -8,7 +8,7 @@ Before installing, you need:
   <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
   <li><a href="ftp://ftp.cs.hut.fi/pub/ssh/">SSH</a>
   <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
-  <li>A database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>, such as <a href="http://www.tcx.se/">MySQL</a> or <a href="http://www.postgresql.org/">PostgreSQL</a> (see the <a href="postgresql.html">PostgreSQL notes</a>)
+  <li>A database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>, such as <a href="http://www.tcx.se/">MySQL</a> or <a href="http://www.postgresql.org/">PostgreSQL</a> (verstion 6.5 or higher) (see the <a href="postgresql.html">PostgreSQL notes</a>)
   <li>Perl modules (<a href="http://www.perl.com/CPAN/doc/manual/html/lib/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
     <ul>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Array/">Array-PrintCols</a>
-- 
cgit v1.2.1


From fe10321b9a9fa1025af12aeb61e7b08e9ba25cb2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 30 Jan 2000 06:11:09 +0000
Subject: .

---
 TODO | 42 +++++++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/TODO b/TODO
index b93c91650..ae39d824e 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.40 2000-01-27 00:27:50 ivan Exp $
+$Id: TODO,v 1.41 2000-01-30 06:11:09 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,31 @@ duplication of effort.
 
 ---
 
+
+           CVS via SSH (Score:1)
+           by platinum (jedgar at fxp dot org) on Thursday September 30, @07:13PM EDT (#4)
+           (User Info) http://www.fxp.org/~jedgar
+           The links above are your best bet for basic cvs server configuration. Once you have a pserver set up, you
+           may consider using cvs via ssh. All you need to do is the following: 
+
+           1) Have ssh and sshd set up on the client and server machines 
+           2) Set CVSROOT="joe@example.com:/home/ncvs" 
+           3) Set CVS_RSH="/usr/local/bin/ssh" 
+           4) Use cvs normally 
+           (Obviously, insert the proper host/paths above) 
+
+           You can also set up cvs/ssh to not need a password every time (similiar to an initial 'cvs login'): 
+
+           1) run ssh-keygen on client machine using no passphrase. 
+           2) copy/add ~/.ssh/identity.pub on the client to ~/.ssh/authorized_keys on the server 
+           (man ssh for more details) 
+
+           The main reason I mentio
+           CVS via SSH (Score:1)
+           by platinum (jedgar at fxp dot org) on Thursday September 30, @07:13PM EDT (#4)
+           (User Info) http://www.fxp.org/~jedgar
+
+
 There's no way to do this currently, though it would be pretty
 straightforward to modify the source - specifically, the _collect_
 subroutine in FS::cust_main.
@@ -291,20 +316,7 @@ that error because it didn't exist yet.  Sounds like a buglet to me.  I'll
 try to fix that soon; in the meantime you can add the invoicing email 
 address afterwords.
 
-Postgres `money' time sucks rocks anyway.  I'll probably just require 6.5
-and use the numeric types, which *finally* work right.
-On Sat, Apr 24, 1999 at 12:52:00PM -0700, Mr. Poet wrote:
-> Software error:
-> Error creating cust_bill record: ERROR: parser:
-> attribute 'charged' is of type 'money' but expression
-> is of type 'float8' You will need to rewrite or cast 
-> the expression ! Check updated but unbilled packages 
-> for customer1
-.
-Postgres `money' time sucks rocks anyway.  I'll probably just require 6.5
-and use the numeric types, which *finally* work right (well, according to 
-the web site, anyway).
-.
+(workaround for postgres before 6.5) (unlikely to ever be implemented)
 In the mean-time, this could probably be fixed with the reverse of        
 the kludge in FS::Record::new.  This removes `$' and `,' from money fields
 coming out of the database.  Something which fixed up the data so Postgres
-- 
cgit v1.2.1


From b950a203e0cc09ae962baf888df26c775b9f17f1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 30 Jan 2000 06:54:50 +0000
Subject: credit card expiration dates not sticky bug fixed?

---
 htdocs/edit/cust_main.cgi | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 10f1dba1f..4eef9c74d 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.23 2000-01-27 00:53:14 ivan Exp $
+# $Id: cust_main.cgi,v 1.24 2000-01-30 06:54:50 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.23  2000-01-27 00:53:14  ivan
+# Revision 1.24  2000-01-30 06:54:50  ivan
+# credit card expiration dates not sticky bug fixed?
+#
+# Revision 1.23  2000/01/27 00:53:14  ivan
 # 5.004_04 workaround
 #
 # Revision 1.22  1999/12/17 02:33:23  ivan
@@ -285,13 +288,18 @@ print "</TABLE>$r required fields<BR>";
 
 sub expselect {
   my $prefix = shift;
-  my $date = shift || '';
-  my( $m, $y ) = ( 0, 0 );
-  if ( $date  =~ /^(\d{4})-(\d{2})-\d{2}$/ ) { #PostgreSQL date format
-    ( $m, $y ) = ( $2, $1 );
-  } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-    ( $m, $y ) = ( $1, $3 );
+  my( $m, $y ) = (0, 0);
+  if ( scalar(@_) ) {
+    my $date = shift;
+    if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
+      ( $m, $y ) = ( $2, $1 );
+    } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+      ( $m, $y ) = ( $1, $3 );
+    } else {
+      die "unrecognized expiration date format: $date";
+    }
   }
+
   my $return = qq!<SELECT NAME="$prefix!. qq!_month" SIZE="1">!;
   for ( 1 .. 12 ) {
     $return .= "<OPTION";
-- 
cgit v1.2.1


From 8079b2e02397e4c35ca2991afaa156f65330a084 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 30 Jan 2000 08:18:10 +0000
Subject: .

---
 CREDITS | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/CREDITS b/CREDITS
index 5017cbe6f..3ec57a4c2 100644
--- a/CREDITS
+++ b/CREDITS
@@ -6,7 +6,7 @@ documentation.)
 
 Steve Cleff <cleff@yahoo.com> did the default background image in 1.0.x and
 is also the creator of Freeside's elusive mascot, Snakeman, who we hope will
-make an appearance in a later 1.2.x version.
+make an appearance in an upcoming version.
 
 Jerry St. Pierre <jstpi@city.timmins.on.ca> did the "SISD" graphic used in
 1.0.x and most of 1.1.x.
@@ -18,11 +18,10 @@ Brian McCane? <bmccane@maxbaud.net> contributed PostgreSQL support, HTML
 style enhancements and many, many bugfixes.
 
 Cerkit <cerkit@alfheim.net> contributed rsync support and desynced hosts.
-His changes will hopefully be included in a later 1.2.x version.
+His changes will hopefully be included in an upcoming version.
 
 CompleteHOST, Inc. (http://www.completehost.com) funded the development of the
-following Freeside features by contracting me for a custom billing system
-based on Freeside:
+following features:
   - Multiple, separate databases and configurations on one box.
   - Per-customer pricing (custom packages)
   - Internationalization wrt addresses (cust_main, cust_main_county)
@@ -39,5 +38,15 @@ Greg Kuhnert <gregk@no1.com.au> sent some documentation updates.
 Joel Griffiths <griff@aver-computer.com> contribued many bugfixes, and offers
 invaluable help to users on the mailing list.
 
-Everything else is my (Ivan Kohler <ivan@sisd.com>) fault.
+NetLoud <http://www.netloud.com/> funded the development of the following
+features:
+  - IEAK support for the signup server
+  - Pre-payment support
+
+NetAcces.Net (not netaccess.net) funded the development of the following
+features:
+  - DNS tracking and export to BIND configuration files
+  - Web site virtual host tracking and export to Apache configuration files
+
+Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
-- 
cgit v1.2.1


From 959663cd4d4885295f44de43ac005e55d054102f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 31 Jan 2000 05:22:23 +0000
Subject: prepaid "internet cards"

---
 FS/FS/cust_main.pm                       |  72 ++++++++++++++---
 FS/FS/prepay_credit.pm                   | 128 +++++++++++++++++++++++++++++++
 bin/fs-setup                             |  18 ++++-
 fs_signup/FS-SignupClient/cgi/signup.cgi |   7 +-
 htdocs/docs/schema.html                  |  10 ++-
 htdocs/docs/signup.html                  |   3 +-
 htdocs/docs/upgrade5.html                |   7 ++
 7 files changed, 229 insertions(+), 16 deletions(-)
 create mode 100644 FS/FS/prepay_credit.pm

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 50535da55..59ec41b81 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -27,6 +27,7 @@ use FS::part_referral;
 use FS::cust_main_county;
 use FS::agent;
 use FS::cust_main_invoice;
+use FS::prepay_credit;
 
 @ISA = qw( FS::Record );
 
@@ -148,9 +149,9 @@ FS::Record.  The following fields are currently supported:
 
 =item fax - phone (optional)
 
-=item payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
+=item payby - `CARD' (credit cards), `BILL' (billing), `COMP' (free), or `PREPAY' (special billing type: applies a credit - see L<FS::prepay_credit> and sets billing type to BILL)
 
-=item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
+=item payinfo - card number, P.O., comp issuer (4-8 lowercase alphanumerics; think username) or prepayment identifier (see L<FS::prepay_credit>)
 
 =item paydate - expiration date, mm/yyyy, m/yyyy, mm/yy or m/yy
 
@@ -182,6 +183,52 @@ sub table { 'cust_main'; }
 Adds this customer to the database.  If there is an error, returns the error,
 otherwise returns false.
 
+=cut
+
+sub insert {
+  my $self = shift;
+
+  my $flag = 0;
+  if ( $self->payby eq 'PREPAY' ) {
+    $self->payby('BILL');
+    $flag = 1;
+  }
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $error = $self->SUPER::insert;
+  return $error if $error;
+
+  if ( $flag ) {
+    my $prepay_credit =
+      qsearchs('prepay_credit', { 'identifier' => $self->payinfo } );
+    warn "WARNING: can't find pre-found prepay_credit: ". $self->payinfo
+      unless $prepay_credit;
+    my $amount = $prepay_credit->amount;
+    my $error = $prepay_credit->delete;
+    if ( $error ) {
+      warn "WARNING: can't delete prepay_credit: ". $self->payinfo;
+    } else {
+      my $cust_credit = new FS::cust_credit {
+        'custnum' => $self->custnum,
+        'amount'  => $amount,
+      };
+      my $error = $cust_credit->insert;
+      warn "WARNING: error inserting cust_credit for prepay_credit: $error"
+        if $error;
+    }
+
+  }
+
+  '';
+
+}
+
 =item delete NEW_CUSTNUM
 
 This deletes the customer.  If there is an error, returns the error, otherwise
@@ -314,7 +361,7 @@ sub check {
     or return "Illegal zip: ". $self->zip;
   $self->zip($1);
 
-  $self->payby =~ /^(CARD|BILL|COMP)$/
+  $self->payby =~ /^(CARD|BILL|COMP|PREPAY)$/
     or return "Illegal payby: ". $self->payby;
   $self->payby($1);
 
@@ -340,10 +387,21 @@ sub check {
     $error = $self->ut_textn('payinfo');
     return "Illegal comp account issuer: ". $self->payinfo if $error;
 
+  } elsif ( $self->payby eq 'PREPAY' ) {
+
+    my $payinfo = $self->payinfo;
+    $payinfo =~ s/\W//g; #anything else would just confuse things
+    $self->payinfo($payinfo);
+    $error = $self->ut_alpha('payinfo');
+    return "Illegal prepayment identifier: ". $self->payinfo if $error;
+    return "Unknown prepayment identifier"
+      unless qsearchs('prepay_credit', { 'identifier' => $self->payinfo } );
+
   }
 
   if ( $self->paydate eq '' ) {
-    return "Expriation date required" unless $self->payby eq 'BILL';
+    return "Expriation date required"
+      unless $self->payby eq 'BILL' || $self->payby eq 'PREPAY';
     $self->paydate('');
   } else {
     $self->paydate =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/
@@ -799,10 +857,6 @@ sub collect {
       return "Unknown payment type ". $self->payby;
     }
 
-
-
-
-
   }
   '';
 
@@ -939,7 +993,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.2 1999-08-12 04:16:01 ivan Exp $
+$Id: cust_main.pm,v 1.3 2000-01-31 05:22:23 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/prepay_credit.pm b/FS/FS/prepay_credit.pm
new file mode 100644
index 000000000..86274aa4c
--- /dev/null
+++ b/FS/FS/prepay_credit.pm
@@ -0,0 +1,128 @@
+package FS::prepay_credit;
+
+use strict;
+use vars qw( @ISA );
+#use FS::Record qw( qsearch qsearchs );
+use FS::Record qw();
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::prepay_credit - Object methods for prepay_credit records
+
+=head1 SYNOPSIS
+
+  use FS::prepay_credit;
+
+  $record = new FS::prepay_credit \%hash;
+  $record = new FS::prepay_credit {
+    'identifier' => '4198123455512121'
+    'amount'     => '19.95',
+  };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::table_name object represents an pre--paid credit, such as a pre-paid
+"calling card".  FS::prepay_credit inherits from FS::Record.  The following
+fields are currently supported:
+
+=over 4
+
+=item field - description
+
+=item identifier - identifier entered by the user to receive the credit
+
+=item amount - amount of the credit
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new pre-paid credit.  To add the example to the database, see
+L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub table { 'prepay_credit'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+=item check
+
+Checks all fields to make sure this is a valid pre-paid credit.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $identifier = $self->identifier;
+  $identifier =~ s/\W//g; #anything else would just confuse things
+  $self->identifier($identifier);
+
+  $self->ut_number('prepaynum')
+  || $self->ut_alpha('identifier')
+  || $self->ut_money('amount')
+  ;
+
+}
+
+=back
+
+=head1 VERSION
+
+$Id: prepay_credit.pm,v 1.1 2000-01-31 05:22:23 ivan Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=head1 HISTORY
+
+$Log: prepay_credit.pm,v $
+Revision 1.1  2000-01-31 05:22:23  ivan
+prepaid "internet cards"
+
+
+=cut
+
+1;
+
diff --git a/bin/fs-setup b/bin/fs-setup
index f1dd3a8b4..dcaccdf1c 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.21 2000-01-30 06:03:26 ivan Exp $
+# $Id: fs-setup,v 1.22 2000-01-31 05:22:23 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.21  2000-01-30 06:03:26  ivan
+# Revision 1.22  2000-01-31 05:22:23  ivan
+# prepaid "internet cards"
+#
+# Revision 1.21  2000/01/30 06:03:26  ivan
 # postgres 6.5 finally supports decimal(10,2)
 #
 # Revision 1.20  2000/01/28 22:53:33  ivan
@@ -663,6 +666,17 @@ sub tables_hash_hack {
     #  'index' => [ [] ],
     #},
 
+    'prepay_credit' => {
+      'columns' => [
+        'prepaynum',   'int',     '',   '',
+        'identifier',  'varchar', '', $char_d,
+        'amount',      @money_type,
+      ],
+      'primary_key' => 'prepaynum',
+      'unique'      => [ ['identifier'] ],
+      'index        => [ [] ],
+    },
+
   );
 
   %tables;
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 6fccf11b1..961ad505a 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.3 2000-01-28 22:49:49 ivan Exp $
+# $Id: signup.cgi,v 1.4 2000-01-31 05:22:23 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $r $error
@@ -22,7 +22,8 @@ use Text::Template;
 #
 #@payby = qw( CARD BILL COMP );
 #@payby = qw( CARD BILL );
-@payby = qw( CARD );
+#@payby = qw( CARD );
+@payby = qw( CARD PREPAY );
 
 $ieak_file = '/usr/local/freeside/ieak.template';
 
@@ -220,12 +221,14 @@ END
     'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>${r}Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
+    'PREPAY' => qq!Prepaid card<BR>${r}<INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
   );
 
   my %paybychecked = (
     'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $paydate). qq!<BR>${r}Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $paydate),
+    'PREPAY' => qq!Prepaid card<BR>${r}<INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
   );
 
   for (@payby) {
diff --git a/htdocs/docs/schema.html b/htdocs/docs/schema.html
index 92965d795..3eea6f69d 100644
--- a/htdocs/docs/schema.html
+++ b/htdocs/docs/schema.html
@@ -154,8 +154,8 @@
       </ul>
     <li><a name="part_referral">part_referral</a> - Referral listing
       <ul>
-        <li>refnum</li> - primary key
-        <li>referral</li> - referral
+        <li>refnum - primary key
+        <li>referral - referral
       </ul>
     <li><a name="part_svc">part_svc</a> - Service definitions
       <ul>
@@ -176,6 +176,12 @@
         <li>svcpart - <a href="#part_svc">Service definition</a>
         <li>quantity - quantity of this service that this package includes
       </ul>
+    <li><a name="prepay_credit">prepay_credit</a>
+      <ul>
+        <li>prepaynum - primary key
+        <li>identifier - text or numeric string used to receive this credit
+        <li>amount - amount of credit
+      </ul>
     <li><a name="svc_acct">svc_acct</a> - Accounts
       <ul>
         <li>svcnum - <a href="#cust_svc">primary key</a>
diff --git a/htdocs/docs/signup.html b/htdocs/docs/signup.html
index a00995994..c78d1362c 100644
--- a/htdocs/docs/signup.html
+++ b/htdocs/docs/signup.html
@@ -41,6 +41,7 @@ Optional:
     <li>$password
     <li>$email_name - first and last name
   </ul>
-(an example file is included as <b>fs_signup/ieak.template</b>)
+  (an example file is included as <b>fs_signup/ieak.template</b>)
+  <li>If there are any entries in the <i>prepay_credit</i> table, a user can enter a string matching the <b>identifier</i> column to receive the credit specified in the <b>amount</b> column, after which that <b>identifier</b> is no longer valid.  This can be used to implement pre-paid "calling card" type signups.
 </ul>
 </body>
diff --git a/htdocs/docs/upgrade5.html b/htdocs/docs/upgrade5.html
index 82a7602a3..fc4bf2c39 100644
--- a/htdocs/docs/upgrade5.html
+++ b/htdocs/docs/upgrade5.html
@@ -12,6 +12,13 @@
   <li>Apply the following changes to your database:
 <pre>
 ALTER TABLE svc_acct_pop ADD loc CHAR(4);
+CREATE TABLE prepay_credit (
+  prepaynum int NOT NULL,
+  identifier varchar(80) NOT NULL,
+  amount decimal(10,2) NOT NULL,
+  PRIMARY KEY (prepaynum),
+  INDEX (identifier)
+);
 </pre>
   <li>Copy or symlink htdocs to the new copy.
   <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
-- 
cgit v1.2.1


From b812b5a4a664e0bd271392ae4a609b18e85ca6b6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 2 Feb 2000 07:44:00 +0000
Subject: fix some bugs in signup server

---
 fs_signup/FS-SignupClient/SignupClient.pm | 3 ++-
 fs_signup/FS-SignupClient/cgi/signup.cgi  | 4 ++--
 fs_signup/fs_signup_server                | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm
index 7c96609f6..5769c18fc 100644
--- a/fs_signup/FS-SignupClient/SignupClient.pm
+++ b/fs_signup/FS-SignupClient/SignupClient.pm
@@ -4,6 +4,7 @@ use strict;
 use vars qw($VERSION @ISA @EXPORT_OK $fs_signupd_socket);
 use Exporter;
 use Socket;
+use FileHandle;
 use IO::Handle;
 
 $VERSION = '0.01';
@@ -203,7 +204,7 @@ sub new_customer {
 
 =head1 VERSION
 
-$Id: SignupClient.pm,v 1.2 2000-01-28 22:49:28 ivan Exp $
+$Id: SignupClient.pm,v 1.3 2000-02-02 07:44:00 ivan Exp $
 
 =head1 BUGS
 
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 961ad505a..e5cf6d050 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.4 2000-01-31 05:22:23 ivan Exp $
+# $Id: signup.cgi,v 1.5 2000-02-02 07:44:00 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $r $error
@@ -292,7 +292,7 @@ END
 }
 
 sub print_okay {
-  my $user_agent = new HTTP::Headers::UserAgnet $ENV{HTTP_USER_AGENT};
+  my $user_agent = new HTTP::Headers::UserAgent $ENV{HTTP_USER_AGENT};
   if ( $ieak_template
        && $user_agent->platform eq 'ia32'
        && $user_agent->os =~ /^win/
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 56d616b53..f6702386e 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -128,7 +128,7 @@ while (1) {
 
     my $part_pkg = qsearchs( 'part_pkg', { 'pkgpart' => $pkgpart } )
       or $error ||= "WARNING: unknown pkgpart $pkgpart";
-    my $svcpart = $part_pkg->svcpart;
+    my $svcpart = $part_pkg->svcpart unless $error;
 
     # this should wind up in FS::cust_pkg!
     my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } );
-- 
cgit v1.2.1


From 3bfec7cf75a1a4eb4da1cdf8c64003bd6babcd81 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 2 Feb 2000 20:22:18 +0000
Subject: bugfix prepayment in signup server

---
 FS/FS/cust_main.pm         |  4 ++--
 FS/FS/prepay_credit.pm     |  9 ++++++---
 bin/generate-prepay        | 32 ++++++++++++++++++++++++++++++++
 fs_signup/fs_signup_server |  2 +-
 htdocs/docs/signup.html    |  2 +-
 5 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100755 bin/generate-prepay

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 59ec41b81..26883d554 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -399,7 +399,7 @@ sub check {
 
   }
 
-  if ( $self->paydate eq '' ) {
+  if ( $self->paydate eq '' || $self->paydate eq '-' ) {
     return "Expriation date required"
       unless $self->payby eq 'BILL' || $self->payby eq 'PREPAY';
     $self->paydate('');
@@ -993,7 +993,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.3 2000-01-31 05:22:23 ivan Exp $
+$Id: cust_main.pm,v 1.4 2000-02-02 20:22:18 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/prepay_credit.pm b/FS/FS/prepay_credit.pm
index 86274aa4c..113cee823 100644
--- a/FS/FS/prepay_credit.pm
+++ b/FS/FS/prepay_credit.pm
@@ -96,7 +96,7 @@ sub check {
   $identifier =~ s/\W//g; #anything else would just confuse things
   $self->identifier($identifier);
 
-  $self->ut_number('prepaynum')
+  $self->ut_numbern('prepaynum')
   || $self->ut_alpha('identifier')
   || $self->ut_money('amount')
   ;
@@ -107,7 +107,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: prepay_credit.pm,v 1.1 2000-01-31 05:22:23 ivan Exp $
+$Id: prepay_credit.pm,v 1.2 2000-02-02 20:22:18 ivan Exp $
 
 =head1 BUGS
 
@@ -118,7 +118,10 @@ L<FS::Record>, schema.html from the base documentation.
 =head1 HISTORY
 
 $Log: prepay_credit.pm,v $
-Revision 1.1  2000-01-31 05:22:23  ivan
+Revision 1.2  2000-02-02 20:22:18  ivan
+bugfix prepayment in signup server
+
+Revision 1.1  2000/01/31 05:22:23  ivan
 prepaid "internet cards"
 
 
diff --git a/bin/generate-prepay b/bin/generate-prepay
new file mode 100755
index 000000000..6fb615ab1
--- /dev/null
+++ b/bin/generate-prepay
@@ -0,0 +1,32 @@
+#!/usr/bin/perl -w
+
+use strict;
+use FS::UID qw(adminsuidsetup);
+use FS::prepay_credit;
+
+require 5.004; #srand(time|$$);
+
+my $user = shift or die &usage;
+&adminsuidsetup( $user );
+
+my $amount = shift or die &usage;
+
+my $num_digits = shift or die &usage;
+
+my $num_entries = shift or die &usage;
+
+for ( 1 .. $num_entries ) {
+  my $identifier = join( '', map int(rand(10)), ( 1 .. $num_digits ) );
+  my $prepay_credit = new FS::prepay_credit {
+    'identifier' => $identifier,
+    'amount'     => $amount,
+  };
+  my $error = $prepay_credit->insert;
+  die $error if $error;
+  print "$identifier\n";
+}
+
+sub usage {
+  die "Usage:\n\n  generate-prepay user amount num_digits num_entries";
+}
+
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index f6702386e..1d7ab291b 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -15,7 +15,7 @@ use vars qw( $opt $Debug );
 
 $Debug = 0;
 
-my @payby = qw(CARD);
+my @payby = qw(CARD PREPAY);
 
 my $user = shift or die &usage;
 &adminsuidsetup( $user ); 
diff --git a/htdocs/docs/signup.html b/htdocs/docs/signup.html
index c78d1362c..fbd19df62 100644
--- a/htdocs/docs/signup.html
+++ b/htdocs/docs/signup.html
@@ -42,6 +42,6 @@ Optional:
     <li>$email_name - first and last name
   </ul>
   (an example file is included as <b>fs_signup/ieak.template</b>)
-  <li>If there are any entries in the <i>prepay_credit</i> table, a user can enter a string matching the <b>identifier</i> column to receive the credit specified in the <b>amount</b> column, after which that <b>identifier</b> is no longer valid.  This can be used to implement pre-paid "calling card" type signups.
+  <li>If there are any entries in the <i>prepay_credit</i> table, a user can enter a string matching the <b>identifier</i> column to receive the credit specified in the <b>amount</b> column, after which that <b>identifier</b> is no longer valid.  This can be used to implement pre-paid "calling card" type signups.  The <i>bin/generate-prepay</i> script can be used to populate the <i>prepay_credit</i> table.
 </ul>
 </body>
-- 
cgit v1.2.1


From 5bd5f206a77cf975515d955119d4dff7764a2d8c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 3 Feb 2000 05:17:39 +0000
Subject: beginning of DNS and Apache support

---
 FS/FS/cust_pkg.pm         |   3 +-
 FS/FS/domain_record.pm    | 182 ++++++++++++++++++++++++++++++++++
 FS/FS/svc_domain.pm       |  68 ++++++++++++-
 FS/FS/svc_www.pm          | 242 ++++++++++++++++++++++++++++++++++++++++++++++
 bin/fs-setup              |  34 ++++++-
 bin/svc_acct.import       |   9 +-
 bin/svc_acct_sm.import    |   9 +-
 bin/svc_domain.import     |  92 ++++++++++++++++++
 htdocs/docs/config.html   |  13 +++
 htdocs/docs/install.html  |   2 +-
 htdocs/docs/schema.html   |  14 +++
 htdocs/docs/upgrade5.html |  22 +++++
 12 files changed, 678 insertions(+), 12 deletions(-)
 create mode 100644 FS/FS/domain_record.pm
 create mode 100644 FS/FS/svc_www.pm
 create mode 100644 bin/svc_domain.import

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 1dcdab8d5..08be4e4e0 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -16,6 +16,7 @@ use FS::pkg_svc;
 use FS::svc_acct;
 use FS::svc_acct_sm;
 use FS::svc_domain;
+use FS::svc_www;
 
 @ISA = qw( FS::Record );
 
@@ -490,7 +491,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.3 1999-11-08 21:38:38 ivan Exp $
+$Id: cust_pkg.pm,v 1.4 2000-02-03 05:16:52 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
new file mode 100644
index 000000000..9b7081b2c
--- /dev/null
+++ b/FS/FS/domain_record.pm
@@ -0,0 +1,182 @@
+package FS::domain_record;
+
+use strict;
+use vars qw( @ISA );
+#use FS::Record qw( qsearch qsearchs );
+use FS::Record qw( qsearchs );
+use FS::svc_domain;
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::domain_record - Object methods for domain_record records
+
+=head1 SYNOPSIS
+
+  use FS::domain_record;
+
+  $record = new FS::domain_record \%hash;
+  $record = new FS::domain_record { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::domain_record object represents an entry in a DNS zone.
+FS::domain_record inherits from FS::Record.  The following fields are currently
+supported:
+
+=over 4
+
+=item recnum - primary key
+
+=item svcnum - Domain (see L<FS::svc_domain>) of this entry
+
+=item reczone - partial (or full) zone for this entry
+
+=item recaf - address family for this entry, currently only `IN' is recognized.
+
+=item rectype - record type for this entry (A, MX, etc.)
+
+=item recdata - data for this entry
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new entry.  To add the example to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub table { 'domain_record'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('recnum')
+    || $self->ut_number('svcnum')
+  ;
+  return $error if $error;
+
+  return "Unknown svcnum (in svc_domain)"
+    unless qsearchs('svc_domain', { 'svcnum' => $self->svcnum } );
+
+  $self->reczone =~ /^(@|[a-z0-9\.\-]+)$/
+    or return "Illegal reczone: ". $self->reczone;
+  $self->reczone($1);
+
+  $self->recaf =~ /^(IN)$/ or return "Illegal recaf: ". $self->recaf;
+  $self->recaf($1);
+
+  $self->rectype =~ /^(SOA|NS|MX|A|PTR|CNAME)$/
+    or return "Illegal rectype (only SOA NS MX A PTR CNAME recognized): ".
+              $self->rectype;
+  $self->rectype($1);
+
+  if ( $self->rectype eq 'SOA' ) {
+    my $recdata = $self->recdata;
+    $recdata =~ s/\s+/ /g;
+    $recdata =~ /^([a-z0-9\.\-]+ [\w\-\+]+\.[a-z0-9\.\-]+ \( (\d+ ){5}\))$/
+      or return "Illegal data for SOA reocrd: $recdata";
+    $self->recdata($1);
+  } elsif ( $self->rectype eq 'NS' ) {
+    $self->recdata =~ /^([a-z0-9\.\-]+)$/
+      or return "Illegal data for NS record: ". $self->recdata;
+    $self->recdata($1);
+  } elsif ( $self->rectype eq 'MX' ) {
+    $self->recdata =~ /^(\d+)\s+([a-z0-9\.\-]+)$/
+      or return "Illegal data for MX record: ". $self->recdata;
+    $self->recdata("$1 $2");
+  } elsif ( $self->rectype eq 'A' ) {
+    $self->recdata =~ /^((\d{1,3}\.){3}\d{1,3})$/
+      or return "Illegal data for A record: ". $self->recdata;
+    $self->recdata($1);
+  } elsif ( $self->rectype eq 'PTR' ) {
+    $self->recdata =~ /^([a-z0-9\.\-]+)$/
+      or return "Illegal data for PTR record: ". $self->recdata;
+    $self->recdata($1);
+  } elsif ( $self->rectype eq 'CNAME' ) {
+    $self->recdata =~ /^([a-z0-9\.\-]+)$/
+      or return "Illegal data for CNAME record: ". $self->recdata;
+    $self->recdata($1);
+  } else {
+    die "ack!";
+  }
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: domain_record.pm,v 1.1 2000-02-03 05:16:52 ivan Exp $
+
+=head1 BUGS
+
+The data validation doesn't check everything it could.  In particular,
+there is no protection against bad data that passes the regex, duplicate
+SOA records, forgetting the trailing `.', impossible IP addersses, etc.  Of
+course, it's still better than editing the zone files directly.  :)
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=head1 HISTORY
+
+$Log: domain_record.pm,v $
+Revision 1.1  2000-02-03 05:16:52  ivan
+beginning of DNS and Apache support
+
+
+=cut
+
+1;
+
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index f960de066..4d4db5ad8 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -3,6 +3,8 @@ package FS::svc_domain;
 use strict;
 use vars qw( @ISA $whois_hack $conf $mydomain $smtpmachine
   $tech_contact $from $to @nameservers @nameserver_ips @template
+  @mxmachines @nsmachines $soadefaultttl $soaemail $soaexpire $soamachine
+  $soarefresh $soaretry
 );
 use Carp;
 use Mail::Internet;
@@ -16,6 +18,7 @@ use FS::cust_svc;
 use FS::svc_acct;
 use FS::cust_pkg;
 use FS::cust_main;
+use FS::domain_record;
 
 @ISA = qw( FS::svc_Common );
 
@@ -43,6 +46,15 @@ $FS::UID::callback{'FS::domain'} = sub {
   } @ns;
   @template = map { $_. "\n" } $conf->config("$internic/template");
 
+  @mxmachines    = $conf->config('mxmachines');
+  @nsmachines    = $conf->config('nsmachines');
+  $soadefaultttl = $conf->config('soadefaultttl');
+  $soaemail      = $conf->config('soaemail');
+  $soaexpire     = $conf->config('soaexpire');
+  $soamachine    = $conf->config('soamachine');
+  $soarefresh    = $conf->config('soarefresh');
+  $soaretry      = $conf->config('soaretry');
+
 };
 
 =head1 NAME
@@ -114,6 +126,19 @@ email address on this email.  Otherwise, the svc_acct records for this package
 (see L<FS::cust_pkg>) are searched.  If there is exactly one svc_acct record
 in the same package, it is automatically used.  Otherwise an error is returned.
 
+If any I<soamachine> configuration file exists, an SOA record is added to
+the domain_record table (see <FS::domain_record>).
+
+If any machines are defined in the I<nsmachines> configuration file, NS
+records are added to the domain_record table (see L<FS::domain_record>).
+
+If any machines are defined in the I<mxmachines> configuration file, MX
+records are added to the domain_record table (see L<FS::domain_record>).
+
+Any problems adding FS::domain_record records will emit warnings, but will
+not return errors from this method.  If your configuration files are correct
+you shouln't have any problems.
+
 =cut
 
 sub insert {
@@ -144,6 +169,47 @@ sub insert {
 
   $self->submit_internic unless $whois_hack;
 
+  if ( $soamachine ) {
+    my $soa = new FS::domain_record {
+      'svcnum'  => $self->svcnum,
+      'reczone' => '@',
+      'recaf'   => 'IN',
+      'rectype' => 'SOA',
+      'recdata' => "$soamachine $soaemail ( ". time2str("%Y%m%e", time). "00 ".
+                   "$soarefresh $soarety $soaexpire $soadefaultttl )"
+    };
+    $error = $soa->insert;
+    warn "WARNING: couldn't insert SOA record for new domain: $error" if $error;
+
+    foreach $nsmachine ( @nsmachines ) {
+      my $ns = new FS::domain_record {
+        'svcnum'  => $self->svcnum,
+        'reczone' => '@',
+        'recaf'   => 'IN',
+        'rectype' => 'NS',
+        'recdata' => $nsmachine,
+      };
+      my $error = $ns->insert;
+      warn "WARNING: couldn't insert NS record for new domain: $error"
+        if $error;
+    }
+
+    foreach $mxmachine ( @mxmachines ) {
+      my $mx = new FS::domain_record {
+        'svcnum'  => $self->svcnum,
+        'reczone' => '@',
+        'recaf'   => 'IN',
+        'rectype' => 'mx',
+        'recdata' => $mxmachine,
+      };
+      my $error = $mx->insert;
+      warn "WARNING: couldn't insert MX record for new domain: $error"
+        if $error;
+    }
+
+  }
+
+
   ''; #no error
 }
 
@@ -393,7 +459,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.4 2000-01-29 21:10:13 ivan Exp $
+$Id: svc_domain.pm,v 1.5 2000-02-03 05:16:52 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_www.pm b/FS/FS/svc_www.pm
new file mode 100644
index 000000000..fc1419c7d
--- /dev/null
+++ b/FS/FS/svc_www.pm
@@ -0,0 +1,242 @@
+package FS::svc_www;
+
+use strict;
+use vars qw(@ISA $conf $apacheroot $apachemachine $nossh_hack );
+#use FS::Record qw( qsearch qsearchs );
+use FS::Record qw( qsearchs );
+use FS::svc_Common;
+use FS::cust_svc;
+use FS::domain_record;
+use FS::svc_acct;
+use FS::SSH qw(ssh);
+
+@ISA = qw(svc_Common);
+
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::svc_www'} = sub { 
+  $conf = new FS::Conf;
+  $apacheroot = $conf->config('apacheroot');
+  $apachemachine = $conf->config('apachemachine');
+};
+
+=head1 NAME
+
+FS::svc_www - Object methods for svc_www records
+
+=head1 SYNOPSIS
+
+  use FS::svc_www;
+
+  $record = new FS::svc_www \%hash;
+  $record = new FS::svc_www { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $error = $record->suspend;
+
+  $error = $record->unsuspend;
+
+  $error = $record->cancel;
+
+=head1 DESCRIPTION
+
+An FS::svc_www object represents an web virtual host.  FS::svc_www inherits
+from FS::svc_Common.  The following fields are currently supported:
+
+=over 4
+
+=item svcnum - primary key
+
+=item recnum - DNS `A' record corresponding to this web virtual host. (see L<FS::domain_record))
+
+=item usersvc - account (see L<FS::svc_acct>) corresponding to this web virtual host.
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new web virtual host.  To add the record to the database, see
+L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub table { 'svc_www'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
+defined.  An FS::cust_svc record will be created and inserted.
+
+If the configuration values (see L<FS::Conf>) I<apachemachine>, and
+I<apacheroot> exist, the command:
+
+  mkdir $apacheroot/$zone;
+  chown $username $apacheroot/$zone;
+  ln -s $apacheroot/$zone $homedir/$zone
+
+I<$zone> is the DNS A record pointed to by I<recnum>
+I<$username> is the username pointed to by I<usersvc>
+I<$homedir> is that user's home directory
+
+is executed on I<apachemachine> via ssh.  This behaviour can be surpressed by
+setting $FS::svc_www::nossh_hack true.
+
+=cut
+
+sub insert {
+  my $self = shift;
+  my $error;
+
+  $error = $self->SUPER::insert;
+  return $error if $error;
+
+  my $domain_record = qsearchs('domain_record', { 'recnum' => $self->recnum } );    # or die ?
+  my $zone = $domain_record->reczone;
+    # or die ?
+  unless ( $zone =~ /\.$/ ) {
+    my $dom_svcnum = $domain_record->svcnum;
+    my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $dom_svcnum } );
+      # or die ?
+    $zone .= $svc_domain->domain;
+  }
+
+  my $svc_acct = qsearchs('svc_acct', { 'svcnum' => $self->usersvc } );
+    # or die ?
+  my $username = $svc_acct->username;
+    # or die ?
+  my $homedir = $svc_acct->dir;
+    # or die ?
+
+  if ( $apachemachine
+       && $apacheroot
+       && $zone
+       && $username
+       && $homedir
+       && ! $nossh_hack
+  ) {
+    ssh("root\@$apachemachine",
+        "mkdir $apacheroot/$zone; ".
+        "chown $username $apacheroot/$zone; ".
+        "ln -s $apacheroot/$zone $homedir/$zone"
+    );
+  }
+
+  '';
+}
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+sub delete {
+  my $self = shift;
+  my $error;
+
+  $error = $self->SUPER::delete;
+  return $error if $error;
+
+  '';
+}
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my ( $new, $old ) = ( shift, shift );
+  my $error;
+
+  $error = $new->SUPER::replace($old);
+  return $error if $error;
+
+  '';
+}
+
+=item suspend
+
+Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item unsuspend
+
+Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item cancel
+
+Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $x = $self->setfixed;
+  return $x unless ref($x);
+  my $part_svc = $x;
+
+  my $error =
+    $self->ut_numbern('svcnum')
+    || $self->ut_number('recnum')
+    || $self->ut_number('usersvc')
+  ;
+  return $error if $error;
+
+  return "Unknown recnum: ". $self->recnum
+    unless qsearchs('domain_record', { 'recnum' => $self->recnum } );
+
+  return "Unknown usersvc (svc_acct.svcnum): ". $self->usersvc
+    unless qsearchs('svc_acct', { 'svcnum' => $self->usersvc } );
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: svc_www.pm,v 1.1 2000-02-03 05:16:52 ivan Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::svc_Common>, L<FS::Record>, L<FS::domain_record>, L<FS::cust_svc>,
+L<FS::part_svc>, L<FS::cust_pkg>, schema.html from the base documentation.
+
+=head1 HISTORY
+
+$Log: svc_www.pm,v $
+Revision 1.1  2000-02-03 05:16:52  ivan
+beginning of DNS and Apache support
+
+
+=cut
+
+1;
+
diff --git a/bin/fs-setup b/bin/fs-setup
index dcaccdf1c..b75058d55 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.22 2000-01-31 05:22:23 ivan Exp $
+# $Id: fs-setup,v 1.23 2000-02-03 05:16:52 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.22  2000-01-31 05:22:23  ivan
+# Revision 1.23  2000-02-03 05:16:52  ivan
+# beginning of DNS and Apache support
+#
+# Revision 1.22  2000/01/31 05:22:23  ivan
 # prepaid "internet cards"
 #
 # Revision 1.21  2000/01/30 06:03:26  ivan
@@ -184,7 +187,7 @@ my($part_svc)=$dbdef->table('part_svc');
 #because of svc_acct_pop
 #foreach (grep /^svc_/, $dbdef->tables) { 
 #foreach (qw(svc_acct svc_acct_sm svc_charge svc_domain svc_wo)) {
-foreach (qw(svc_acct svc_acct_sm svc_domain)) {
+foreach (qw(svc_acct svc_acct_sm svc_domain svc_www)) {
   my($table)=$dbdef->table($_);
   my($col);
   foreach $col ( $table->columns ) {
@@ -653,6 +656,31 @@ sub tables_hash_hack {
       'index' => [ [] ],
     },
 
+    'domain_record' => {
+      'columns' => [
+        'recnum',    'int',     '',  '',
+        'svcnum',    'int',     '',  '',
+        'reczone',   'varchar', '',  $char_d,
+        'recaf',     'char',    '',  2,
+        'rectype',   'char',    '',  5,
+        'recdata',   'varchar', '',  $char_d,
+      ],
+      'primary_key' => 'recnum',
+      'unique'      => [ [] ],
+      'index'       => [ ['svcnum'] ],
+    },
+
+    'svc_www' => {
+      'columns' => [
+        'svcnum',   'int',    '',  '',
+        'recnum',   'int',    '',  '',
+        'usersvc',  'int',    '',  '',
+      ],
+      'primary_key' => 'svcnum',
+      'unique'      => [ [] ],
+      'index'       => [ [] ],
+    },
+
     #'svc_wo' => {
     #  'columns' => [
     #    'svcnum',    'int',    '',   '',
diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index 6541a9fd4..893a8298a 100755
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.import,v 1.7 1999-07-08 02:32:26 ivan Exp $
+# $Id: svc_acct.import,v 1.8 2000-02-03 05:16:52 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -17,7 +17,10 @@
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 #
 # $Log: svc_acct.import,v $
-# Revision 1.7  1999-07-08 02:32:26  ivan
+# Revision 1.8  2000-02-03 05:16:52  ivan
+# beginning of DNS and Apache support
+#
+# Revision 1.7  1999/07/08 02:32:26  ivan
 # import fix, noticed by Ben Leibig and Joel Griffiths
 #
 # Revision 1.6  1999/07/08 01:49:00  ivan
@@ -263,6 +266,6 @@ foreach $username ( keys %upassword ) {
 #
 
 sub usage {
-  die "Usage:\n\n  svc_acct.export user\n";
+  die "Usage:\n\n  svc_acct.import user\n";
 }
 
diff --git a/bin/svc_acct_sm.import b/bin/svc_acct_sm.import
index bda9762e1..50b0f6702 100755
--- a/bin/svc_acct_sm.import
+++ b/bin/svc_acct_sm.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.import,v 1.4 1999-03-25 08:42:20 ivan Exp $
+# $Id: svc_acct_sm.import,v 1.5 2000-02-03 05:16:52 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -16,7 +16,10 @@
 # ivan@sisd.com 98-jul-13
 #
 # $Log: svc_acct_sm.import,v $
-# Revision 1.4  1999-03-25 08:42:20  ivan
+# Revision 1.5  2000-02-03 05:16:52  ivan
+# beginning of DNS and Apache support
+#
+# Revision 1.4  1999/03/25 08:42:20  ivan
 # import stuff uses Term::Query and spits out (some kinds of) nonsensical input
 #
 # Revision 1.3  1999/03/24 00:51:55  ivan
@@ -278,6 +281,6 @@ END
 #
 
 sub usage {
-  die "Usage:\n\n  svc_acct_sm.export user\n";
+  die "Usage:\n\n  svc_acct_sm.import user\n";
 }
 
diff --git a/bin/svc_domain.import b/bin/svc_domain.import
new file mode 100644
index 000000000..329465ca1
--- /dev/null
+++ b/bin/svc_domain.import
@@ -0,0 +1,92 @@
+#!/usr/bin/perl -w
+#
+# $Id: svc_domain.import,v 1.1 2000-02-03 05:17:39 ivan Exp $
+
+use strict;
+use vars qw( %d_part_svc );
+use Term::Query qw(query);
+use FS::SSH qw(iscp);
+use FS::UID qw(adminsuidsetup datasrc);
+#use FS::Record qw(qsearch qsearchs);
+#use FS::svc_acct_sm;
+use FS::svc_domain;
+use FS::domain_record;
+#use FS::svc_acct;
+#use FS::part_svc;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
+
+%d_part_svc =
+  map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_domain'});
+
+print "\n\n",
+      ( join "\n", map "$_: ".$d_part_svc{$_}->svc, sort keys %d_part_svc ),
+      "\n\n";
+$^W=0; #Term::Query isn't -w-safe
+my $domain_svcpart =
+  query "Enter part number for domains: ", 'irk', [ keys %d_part_svc ];
+$^W=1;
+
+  print "\n\n", <<END;
+Enter the location and name of your primary named.conf file, for example
+"ns.isp.com:/var/named/named.conf"
+END
+  my($named_conf)=&getvalue(":");
+  iscp("root\@$named_conf","$spooldir/named.conf.import");
+
+my $named_machine = (split(/:/, $named_conf))[0];
+
+print "\n\n";
+
+##
+
+$FS::svc_domain::whois_hack=1;
+
+open(NAMED_CONF,"<$spooldir/named.conf.import")
+  or die "Can't open $spooldir/named.conf.import: $!";
+
+while (<NAMED_CONF>) {
+  next unless /^\s*options/;
+}
+my $directory;
+while (<NAMED_CONF>) {
+  last if /^\s*directory\s+\"([\/\w+]+)\";/;
+} 
+$directory = $1 or die "can't locate directory in named.conf!";
+whlie (<NAMED_CONF>) {
+  next unless /^\s*zone\s+\"([\w\.\-]+)\"\s+\{/;
+  my $zone = $1;
+  while (<NAMED_CONF>) {
+    my $type;
+    if ( /^\s*type\s+(master|slave)\s*\;/ ) {
+      $type = $1;
+    }
+    if ( /^\s*file\s+\"([\w\.\-]+)\"\s*\;/ && $type eq 'master' ) {
+
+      #
+      # (add svc_domain)
+      my $file = $1;
+      iscp("root\@$named_machine:$directory/$file","$spooldir/$file.import");
+      open(ZONE,"<$spooldir/$file.import")
+        or die "Can't open $spooldir/$file.import: $!";
+      while (<ZONE>) {
+        # (add domain_record)
+      }
+
+      #
+
+    }
+    
+    last if /^\s*\}\s*\;/;
+  }
+}
+
+##
+
+sub usage {
+  die "Usage:\n\n  svc_domain.import user\n";
+}
+
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index cad10ce65..6f7a2b561 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -22,6 +22,11 @@ All further configuration files and directories are located in
 `/usr/local/etc/freeside/conf.DBI:Pg:dbname=freeside'
 <ul>
   <li>address - Your company name and address, four lines.
+  <li>apacheroot - The directory containing Apache virtual hosts
+  <li>apachemachine - A machine with the apacheroot directory and user home directories.  The existance of this file enables setup of virtual host directories, and, in conjunction with the `home' configuration file, symlinks into user home directories.
+  <li>apachemachines - Your Apache machines, one per line.  This enables export of `/etc/apache/vhosts.conf', which can be included in your Apache configuration via the <a href="http://www.apache.org/docs/mod/core.html#include">Include</a> directive.
+  <li>bindprimary - Your BIND primary nameserver.  This enables export of /var/named/named.conf and zone files into /var/named
+  <li>bindsecondaries - Your BIND secondary nameservers, one per line.  This enables export of /var/named/named.conf
   <li>bsdshellmachines - Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/master.passwd'.
   <li>cybercash2 - <a href="http://www.cybercash.com/cybercash/services/cashreg214.html">CyberCash v2</a> support, four lines: paymentserverhost, paymentserverport, paymentserversecret, and transaction type (`mauthonly' or `mauthcapture').  CCLib.pm is required.
   <li>cybercash3.2 - <a href="http://www.cybercash.com/cybercash/services/technology.html">CyberCash v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly' or `mauthcapture').  CCMckLib3_2.pm, CCMckDirectLib3_2.pm and CCMckErrno3_2 are required.
@@ -34,6 +39,8 @@ All further configuration files and directories are located in
   <li>home - For new users, prefixed to usrename to create a directory name.  Should have a leading but not a trailing slash.
   <li>invoice_from - Return address on email invoices.
   <li>lpr - Print command for paper invoices, for example `lpr -h'.
+  <li>mxmachines - MX entries for new domains, weight and machine, one per line, with trailing `.'
+  <li>nsmachines - NS nameservers for new domains, one per line, with trailing `.'
   <li>nismachines - Your NIS master (not slave master) machines, one per line.  This enables export of `/etc/global/passwd' and `/etc/global/shadow'.
   <li>passwordmin - Minimum password length (default 6);
   <li>qmailmachines - Your qmail machines, one per line.  This enables export of `/var/qmail/control/virtualdomains', `/var/qmail/control/recipientmap', and `/var/qmail/control/rcpthosts'.  The existance of this file (even if empty) also turns on user `.qmail-extension' file maintenance in conjunction with `shellmachine'.
@@ -55,6 +62,12 @@ All further configuration files and directories are located in
   <li>shells - Legal shells (think /etc/shells).  You probably want to `cut -d: -f7 /etc/passwd | sort | uniq' initially so that importing doesn't fail with `Illegal shell' errors, then remove any special entries afterwords.  A blank line specifies that an empty shell is permitted.
   <li>showpasswords - The existance of this file will allow unencrypted user passwords to be displayed.
   <li>smtpmachine - SMTP relay for Freeside's outgoing mail.
+  <li>soadefaultttl - SOA default TTL for new domains.
+  <li>soaemail - SOA email for new domains, in BIND form (`.' instead of `@'), with trailing `.'
+  <li>soaexpire - SOA expire for new domains
+  <li>soamachine - SOA machine for new domains, with trailing `.'
+  <li>soarefresh - SOA refresh for new domains
+  <li>soaretry - SOA retry for new domains
   <li>usernamemin - Minimum username length (default 2);
   <li>usernamemax - Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)
 </ul>
diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 574ab91e4..bb621e9a1 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -12,7 +12,7 @@ Before installing, you need:
   <li>Perl modules (<a href="http://www.perl.com/CPAN/doc/manual/html/lib/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
     <ul>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Array/">Array-PrintCols</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/Term/">Term-Query</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/Term/">Term-Query</a> (make test broken; install manually)
       <li><a href="http://www.perl.com/CPAN/modules/by-module/MIME/">MIME-Base64</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Data">Data-Dumper</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/MD5">Digest-MD5</a>
diff --git a/htdocs/docs/schema.html b/htdocs/docs/schema.html
index 3eea6f69d..1ab0e7f62 100644
--- a/htdocs/docs/schema.html
+++ b/htdocs/docs/schema.html
@@ -218,6 +218,20 @@
         <li>svcnum - <a href="#cust_svc">primary key</a>
         <li>domain
       </ul>
+    <li><a name="domain_record">domain_record</a> - Domain zone detail
+      <ul>
+        <li>recnum - primary key
+        <li>svcnum - <a href="#svc_domain">Domain</a> (by svcnum)
+        <li>reczone - zone for this line
+        <li>recaf - address family, usually <b>IN</b>
+        <li>rectype - type for this record (<b>A</b>, <b>MX</b>, etc.)
+        <li>recdata - data for this record
+      </ul>
+    <li><a name="svc_www">svc_www</a>
+       <li>svcnum - <a href="#cust-svc">primary key</a>
+       <li>recnum - <a href="#domain_record">host</a>
+       <li>usersvc - <a href="#svc_acct">account</a>
+     </ul>
     <li><a name="type_pkgs">type_pkgs</a>
       <ul>
         <li>typenum - <a href="#agent_type">agent type</a>
diff --git a/htdocs/docs/upgrade5.html b/htdocs/docs/upgrade5.html
index fc4bf2c39..2be3c6e1b 100644
--- a/htdocs/docs/upgrade5.html
+++ b/htdocs/docs/upgrade5.html
@@ -19,6 +19,28 @@ CREATE TABLE prepay_credit (
   PRIMARY KEY (prepaynum),
   INDEX (identifier)
 );
+CREATE TABLE domain_record (
+  recnum int NOT NULL,
+  svcnum int NOT NULL,
+  reczone varchar(80) NOT NULL,
+  recaf char(2) NOT NULL,
+  rectype char(5) NOT NULL,
+  recdata varchar(80) NOT NULL,
+  PRIMARY KEY (recnum)
+);
+CREATE TABLE svc_www (
+  svcnum int NOT NULL,
+  recnum int NOT NULL,
+  usersvc int NOT NULL,
+  PRIMARY KEY (svcnum)
+);
+ALTER TABLE part_svc ADD svc_www__svcnum varchar(80) NULL;
+ALTER TABLE part_svc ADD svc_www__svcnum_flag char(1) NULL;
+ALTER TABLE part_svc ADD svc_www__recnum varchar(80) NULL;
+ALTER TABLE part_svc ADD svc_www__recnum_flag char(1) NULL;
+ALTER TABLE part_svc ADD svc_www__usersvc varchar(80) NULL;
+ALTER TABLE part_svc ADD svc_www__uesrsvc_flag char(1) NULL;
+
 </pre>
   <li>Copy or symlink htdocs to the new copy.
   <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
-- 
cgit v1.2.1


From 7d6c833f134715aa9388de35ceb53ff7697bee81 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Feb 2000 11:08:23 +0000
Subject: initial checkin

---
 fs_webdemo/register.cgi | 272 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 272 insertions(+)
 create mode 100755 fs_webdemo/register.cgi

diff --git a/fs_webdemo/register.cgi b/fs_webdemo/register.cgi
new file mode 100755
index 000000000..4332958f6
--- /dev/null
+++ b/fs_webdemo/register.cgi
@@ -0,0 +1,272 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use vars qw( $freeside_bin $freeside_test $freeside_conf
+             $datasrc $user $pass $x
+             @pw_set @saltset
+             $cgi $username $name $email $user_pw $crypt_pw $dbh $sth
+             $header $msg
+             );
+use CGI;
+#use CGI::Carp qw(fatalsToBrowser);
+use DBI;
+use Mail::Internet;
+use Mail::Header;
+use Date::Format;
+
+$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
+$ENV{'SHELL'} = '/bin/sh';
+$ENV{'IFS'} = " \t\n";
+$ENV{'CDPATH'} = '';
+$ENV{'ENV'} = '';
+$ENV{'BASH_ENV'} = '';
+
+$freeside_bin = '/home/freeside/bin/';
+$freeside_test = '/home/freeside/test/';
+$freeside_conf = '/usr/local/etc/freeside/';
+
+$datasrc = 'DBI:mysql:http_auth';
+$user = "freeside";
+$pass = "maelcolm";
+
+#my(@pw_set)= ( 'a'..'z', 'A'..'Z', '0'..'9', '(', ')', '#', '!', '.', ',' );
+#my(@pw_set)= ( 'a'..'z', 'A'..'Z', '0'..'9' );
+@pw_set = ( 'a'..'z', '0'..'9' );
+@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+
+###
+
+$cgi = new CGI;
+
+$username = $cgi->param('username');
+$username =~ /^\s*([a-z][\w]{0,15})\s*$/i
+  or &idiot("Illegal username.  Please use 1-16 alphanumeric characters, and start your username with a letter.");
+$username = lc($1);
+
+$name = $cgi->param('name');
+$name =~ /^([\w\-\,\. ]*)$/
+  or &idiot("Illegal name.  ".
+            "Only alphanumerics, the dash, comma and period are legal.");
+$name = $1;
+
+$email = $cgi->param('email');
+$email =~ /^([\w\-\.\+]+\@[\w\-\.]+)$/
+  or &idiot("Illegal email address.");
+$email = $1;
+
+###
+
+$user_pw = join('',map($pw_set[ int(rand $#pw_set) ], (0..7) ) );
+$crypt_pw = crypt($user_pw,$saltset[int(rand(64))].$saltset[int(rand(64))]);
+
+###
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+###
+
+$dbh = DBI->connect( $datasrc, $user, $pass, {
+	'AutoCommit' => 'true',
+} ) or die "DBI->connect error: $DBI::errstr\n";
+$x = $DBI::errstr; #silly; to avoid "used only once" warning
+
+$sth = $dbh->prepare("INSERT INTO mysql_auth VALUES (". join(", ",
+  $dbh->quote($username),
+  $dbh->quote($crypt_pw),
+  $dbh->quote('freeside'),
+). ")" );
+
+$sth->execute or &idiot($sth->errstr);
+
+$dbh->disconnect or die $dbh->errstr;
+
+###
+
+$|=1;
+print $cgi->header;
+print <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Freeside demo registration successful</TITLE>
+  </HEAD>
+  <BODY BGCOLOR="#FFFFFF">
+  <table>
+    <tr><td>
+    <p align=center>
+      <img border=0 alt="Silicon Interactive Software Design" src="http://www.sisd.com/freeside/small-logo.gif">
+    </td><td>
+    <center><font color="#ff0000" size=7>freeside demo registration successful</font></center>
+    </td></tr>
+  </table>
+  <P>Your sample database has been setup.  Your username, password, and URL
+    have been emailed to you.
+  </BODY>
+</HTML>
+END
+
+###
+
+system("/usr/bin/mysqladmin --user=$user --password=$pass ".
+  "create $username >/dev/null");
+
+open(MAPSECRETS, ">>${freeside_conf}mapsecrets")
+  or die "Can\'t open ${freeside_conf}mapsecrets: $!";
+print MAPSECRETS "$username secrets.$username\n";
+close MAPSECRETS;
+
+open(SECRETS, ">${freeside_conf}secrets.$username")
+  or die "Can\'t open ${freeside_conf}secrets.$username: $!";
+chmod 0600, "${freeside_conf}secrets.$username";
+print SECRETS "DBI:mysql:$username\nfreeside\nmaelcolm\n";
+close SECRETS;
+
+mkdir "${freeside_conf}conf.DBI:mysql:$username", 0755;
+
+open(ADDRESS, ">${freeside_conf}conf.DBI:mysql:$username/address")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/address: $!";
+print ADDRESS <<END;
+Internet Service Provider, Inc.
+1 Packet Blvd.
+Router, MN  10010  
+
+END
+close ADDRESS;
+
+open(DOMAIN, ">${freeside_conf}conf.DBI:mysql:$username/domain")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/domain: $!";
+print DOMAIN "this-is-an-example-domain.tld\n";
+close DOMAIN;
+
+open(HOME, ">${freeside_conf}conf.DBI:mysql:$username/home")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/home: $!";
+print HOME "/home\n";
+close HOME;
+
+open(INVOICE_FROM, ">${freeside_conf}conf.DBI:mysql:$username/invoice_from")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/invoice_from: $!";
+print INVOICE_FROM "$email\n";
+close INVOICE_FROM;
+
+open(LPR, ">${freeside_conf}conf.DBI:mysql:$username/lpr")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/lpr: $!";
+print LPR "cat >/dev/null\n";
+close LPR;
+
+mkdir "${freeside_conf}conf.DBI:mysql:$username/registries", 0755;
+mkdir "${freeside_conf}conf.DBI:mysql:$username/registries/internic", 0755;
+open(FROM, ">${freeside_conf}conf.DBI:mysql:$username/registries/internic/from")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/registries/internic/from: $!";
+print FROM "$email\n";
+close FROM;
+open(NAMESERVERS, ">${freeside_conf}conf.DBI:mysql:$username/registries/internic/nameservers")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/registries/internic/nameservers: $!";
+print NAMESERVERS <<END;
+10.0.0.1 ns1.this-is-an-example-domain.tld
+10.0.0.2 ns2.this-is-an-example-domain.tld
+10.0.0.3 ns3.this-is-an-example-domain.tld
+END
+close NAMESERVERS;
+open(TECH_CONTACT, ">${freeside_conf}conf.DBI:mysql:$username/registries/internic/tech_contact")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/registries/internic/tech_contact: $!";
+print TECH_CONTACT "EXAMPLE-INTERNIC-HANDLE\n";
+close TECH_CONTACT;
+system ("cp", "${freeside_conf}.domain-template.txt",
+        "${freeside_conf}conf.DBI:mysql:$username/registries/internic/template"
+       );
+open(TO, ">${freeside_conf}conf.DBI:mysql:$username/registries/internic/to")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/registries/internic/to: $!";
+print TO "$email\n";
+close TO;
+
+open(SHELLS, ">${freeside_conf}conf.DBI:mysql:$username/shells")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/shells: $!";
+print SHELLS <<END;
+/bin/sh
+/bin/csh
+/bin/bash
+/bin/tcsh
+/bin/ksh
+/bin/passwd
+/bin/true
+/bin/false
+
+END
+close SHELLS;
+
+open(SMTPMACHINE, ">${freeside_conf}conf.DBI:mysql:$username/smtpmachine")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/smtpmachine: $!";
+print SMTPMACHINE "localhost\n";
+close SMTPMACHINE;
+
+#make counter dir
+mkdir("/usr/local/etc/freeside/counters.DBI:mysql:$username",0755)
+  or die "Can't create counter spooldir: $!";
+
+system("${freeside_bin}fs-setup.webdemo", "$username");
+system("${freeside_test}cgi-test",
+       "http://freeside.sisd.com/", $username, $user_pw);
+
+###
+
+$ENV{SMTPHOSTS} = "localhost";
+$ENV{MAILADDRESS} = 'ivan@sisd.com';
+$header = Mail::Header->new( [
+  'From: ivan@sisd.com',
+  "To: $email",
+  'Cc: ivan-fsreg@sisd.com',
+  'Sender: ivan@sisd.com',
+  'Reply-To: ivan@sisd.com',
+  'Date: '. time2str("%a, %d %b %Y %X %z", time),
+  'Subject: Freeside demo information',
+] );
+$msg = Mail::Internet->new(
+  'Header' => $header,
+  'Body' => [
+"Hello $name <$email>,\n",
+"\n",
+"Your sample Freeside database has been setup.\n",
+"\n",
+"Point your web browswer at http://freeside.sisd.com/ and use the following\n",
+"authentication information:\n",
+"\n",
+"Username: $username\n",
+"Password: $user_pw\n",
+"\n",
+"You may wish to subscribe to the Freeside mailing list - send a blank\n",
+"message to ivan-freeside-subscribe\@sisd.com.\n",
+"\n",
+"-- \n",
+"Ivan Kohler <ivan\@sisd.com>\n",
+"20 4,16 \* \* \* saytime\n",
+            ]
+);
+$msg->smtpsend or die "Can\'t send registration email!";
+
+###
+
+sub idiot {
+  my($error)=@_;
+  print $cgi->header, <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Registration error</TITLE>
+  </HEAD>
+  <BODY BGCOLOR="#FFFFFF">
+    <CENTER>
+    <H4>Registration error</H4>
+    </CENTER>
+    <P><B>$error</B>
+    <P>Hit the <I>Back</I> button in your web browser, correct this mistake,
+       and submit the form again.
+  </BODY>
+</HTML>
+END
+  
+  exit;
+ 
+}
-- 
cgit v1.2.1


From 051f66ab072bfbb2a074f656b9886ccbc47287ed Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 1 Mar 2000 08:13:59 +0000
Subject: compilation bugfixes

---
 FS/FS/svc_domain.pm | 8 ++++----
 FS/FS/svc_www.pm    | 9 ++++++---
 FS/MANIFEST         | 3 +++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 4d4db5ad8..e1e4eb8b5 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -176,12 +176,12 @@ sub insert {
       'recaf'   => 'IN',
       'rectype' => 'SOA',
       'recdata' => "$soamachine $soaemail ( ". time2str("%Y%m%e", time). "00 ".
-                   "$soarefresh $soarety $soaexpire $soadefaultttl )"
+                   "$soarefresh $soaretry $soaexpire $soadefaultttl )"
     };
     $error = $soa->insert;
     warn "WARNING: couldn't insert SOA record for new domain: $error" if $error;
 
-    foreach $nsmachine ( @nsmachines ) {
+    foreach my $nsmachine ( @nsmachines ) {
       my $ns = new FS::domain_record {
         'svcnum'  => $self->svcnum,
         'reczone' => '@',
@@ -194,7 +194,7 @@ sub insert {
         if $error;
     }
 
-    foreach $mxmachine ( @mxmachines ) {
+    foreach my $mxmachine ( @mxmachines ) {
       my $mx = new FS::domain_record {
         'svcnum'  => $self->svcnum,
         'reczone' => '@',
@@ -459,7 +459,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.5 2000-02-03 05:16:52 ivan Exp $
+$Id: svc_domain.pm,v 1.6 2000-03-01 08:13:59 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_www.pm b/FS/FS/svc_www.pm
index fc1419c7d..bb765b193 100644
--- a/FS/FS/svc_www.pm
+++ b/FS/FS/svc_www.pm
@@ -10,7 +10,7 @@ use FS::domain_record;
 use FS::svc_acct;
 use FS::SSH qw(ssh);
 
-@ISA = qw(svc_Common);
+@ISA = qw( FS::svc_Common );
 
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::svc_www'} = sub { 
@@ -220,7 +220,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_www.pm,v 1.1 2000-02-03 05:16:52 ivan Exp $
+$Id: svc_www.pm,v 1.2 2000-03-01 08:13:59 ivan Exp $
 
 =head1 BUGS
 
@@ -232,7 +232,10 @@ L<FS::part_svc>, L<FS::cust_pkg>, schema.html from the base documentation.
 =head1 HISTORY
 
 $Log: svc_www.pm,v $
-Revision 1.1  2000-02-03 05:16:52  ivan
+Revision 1.2  2000-03-01 08:13:59  ivan
+compilation bugfixes
+
+Revision 1.1  2000/02/03 05:16:52  ivan
 beginning of DNS and Apache support
 
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index e1b4413c6..e0b5b51e5 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -46,3 +46,6 @@ Makefile.PL
 test.pl
 README
 bin/freeside-bill
+FS/domain_record.pm
+FS/prepay_credit.pm
+FS/svc_www.pm
-- 
cgit v1.2.1


From ee2813f461f788e18c13bf0eabbf6bd242f51c2f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 1 Mar 2000 08:14:30 +0000
Subject: cvs cruft

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index e5cf6d050..48376c219 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.5 2000-02-02 07:44:00 ivan Exp $
+# $Id: signup.cgi,v 1.6 2000-03-01 08:14:30 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $r $error
-- 
cgit v1.2.1


From 9634d838efee4b155c89c36f524eca98d73d1868 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 1 Mar 2000 08:15:10 +0000
Subject: queuing webdemo registration

---
 fs_webdemo/register.cgi  | 190 +++++--------------------------
 fs_webdemo/register.html |  34 ++++++
 fs_webdemo/registerd     | 285 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 345 insertions(+), 164 deletions(-)
 create mode 100644 fs_webdemo/register.html
 create mode 100755 fs_webdemo/registerd

diff --git a/fs_webdemo/register.cgi b/fs_webdemo/register.cgi
index 4332958f6..45b5d6aeb 100755
--- a/fs_webdemo/register.cgi
+++ b/fs_webdemo/register.cgi
@@ -1,18 +1,22 @@
 #!/usr/bin/perl -Tw
+#
+# $Id: register.cgi,v 1.2 2000-03-01 08:15:10 ivan Exp $
 
 use strict;
-use vars qw( $freeside_bin $freeside_test $freeside_conf
+use vars qw( #$freeside_bin $freeside_test $freeside_conf
              $datasrc $user $pass $x
-             @pw_set @saltset
-             $cgi $username $name $email $user_pw $crypt_pw $dbh $sth
-             $header $msg
+             #@pw_set @saltset
+             $cgi $username $email 
+             #$user_pw $crypt_pw 
+             $dbh $sth
+             #$header $msg
              );
 use CGI;
 #use CGI::Carp qw(fatalsToBrowser);
 use DBI;
-use Mail::Internet;
-use Mail::Header;
-use Date::Format;
+#use Mail::Internet;
+#use Mail::Header;
+#use Date::Format;
 
 $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
 $ENV{'SHELL'} = '/bin/sh';
@@ -21,18 +25,18 @@ $ENV{'CDPATH'} = '';
 $ENV{'ENV'} = '';
 $ENV{'BASH_ENV'} = '';
 
-$freeside_bin = '/home/freeside/bin/';
-$freeside_test = '/home/freeside/test/';
-$freeside_conf = '/usr/local/etc/freeside/';
+#$freeside_bin = '/home/freeside/bin/';
+#$freeside_test = '/home/freeside/test/';
+#$freeside_conf = '/usr/local/etc/freeside/';
 
 $datasrc = 'DBI:mysql:http_auth';
 $user = "freeside";
 $pass = "maelcolm";
 
-#my(@pw_set)= ( 'a'..'z', 'A'..'Z', '0'..'9', '(', ')', '#', '!', '.', ',' );
-#my(@pw_set)= ( 'a'..'z', 'A'..'Z', '0'..'9' );
-@pw_set = ( 'a'..'z', '0'..'9' );
-@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+##my(@pw_set)= ( 'a'..'z', 'A'..'Z', '0'..'9', '(', ')', '#', '!', '.', ',' );
+##my(@pw_set)= ( 'a'..'z', 'A'..'Z', '0'..'9' );
+#@pw_set = ( 'a'..'z', '0'..'9' );
+#@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
 
 ###
 
@@ -43,12 +47,6 @@ $username =~ /^\s*([a-z][\w]{0,15})\s*$/i
   or &idiot("Illegal username.  Please use 1-16 alphanumeric characters, and start your username with a letter.");
 $username = lc($1);
 
-$name = $cgi->param('name');
-$name =~ /^([\w\-\,\. ]*)$/
-  or &idiot("Illegal name.  ".
-            "Only alphanumerics, the dash, comma and period are legal.");
-$name = $1;
-
 $email = $cgi->param('email');
 $email =~ /^([\w\-\.\+]+\@[\w\-\.]+)$/
   or &idiot("Illegal email address.");
@@ -56,8 +54,8 @@ $email = $1;
 
 ###
 
-$user_pw = join('',map($pw_set[ int(rand $#pw_set) ], (0..7) ) );
-$crypt_pw = crypt($user_pw,$saltset[int(rand(64))].$saltset[int(rand(64))]);
+#$user_pw = join('',map($pw_set[ int(rand $#pw_set) ], (0..7) ) );
+#$crypt_pw = crypt($user_pw,$saltset[int(rand(64))].$saltset[int(rand(64))]);
 
 ###
 
@@ -77,11 +75,13 @@ $x = $DBI::errstr; #silly; to avoid "used only once" warning
 
 $sth = $dbh->prepare("INSERT INTO mysql_auth VALUES (". join(", ",
   $dbh->quote($username),
-  $dbh->quote($crypt_pw),
+  $dbh->quote("X"),
+#  $dbh->quote($crypt_pw),
   $dbh->quote('freeside'),
+  $dbh->quote('unconfigured'),
 ). ")" );
 
-$sth->execute or &idiot($sth->errstr);
+$sth->execute or &idiot("Username in use: ". $sth->errstr);
 
 $dbh->disconnect or die $dbh->errstr;
 
@@ -103,152 +103,14 @@ print <<END;
     <center><font color="#ff0000" size=7>freeside demo registration successful</font></center>
     </td></tr>
   </table>
-  <P>Your sample database has been setup.  Your username, password, and URL
-    have been emailed to you.
+  <P>Your sample database has been setup.  Your password and the URL for the
+    Freeside demo have been emailed to you.
   </BODY>
 </HTML>
 END
 
 ###
 
-system("/usr/bin/mysqladmin --user=$user --password=$pass ".
-  "create $username >/dev/null");
-
-open(MAPSECRETS, ">>${freeside_conf}mapsecrets")
-  or die "Can\'t open ${freeside_conf}mapsecrets: $!";
-print MAPSECRETS "$username secrets.$username\n";
-close MAPSECRETS;
-
-open(SECRETS, ">${freeside_conf}secrets.$username")
-  or die "Can\'t open ${freeside_conf}secrets.$username: $!";
-chmod 0600, "${freeside_conf}secrets.$username";
-print SECRETS "DBI:mysql:$username\nfreeside\nmaelcolm\n";
-close SECRETS;
-
-mkdir "${freeside_conf}conf.DBI:mysql:$username", 0755;
-
-open(ADDRESS, ">${freeside_conf}conf.DBI:mysql:$username/address")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/address: $!";
-print ADDRESS <<END;
-Internet Service Provider, Inc.
-1 Packet Blvd.
-Router, MN  10010  
-
-END
-close ADDRESS;
-
-open(DOMAIN, ">${freeside_conf}conf.DBI:mysql:$username/domain")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/domain: $!";
-print DOMAIN "this-is-an-example-domain.tld\n";
-close DOMAIN;
-
-open(HOME, ">${freeside_conf}conf.DBI:mysql:$username/home")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/home: $!";
-print HOME "/home\n";
-close HOME;
-
-open(INVOICE_FROM, ">${freeside_conf}conf.DBI:mysql:$username/invoice_from")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/invoice_from: $!";
-print INVOICE_FROM "$email\n";
-close INVOICE_FROM;
-
-open(LPR, ">${freeside_conf}conf.DBI:mysql:$username/lpr")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/lpr: $!";
-print LPR "cat >/dev/null\n";
-close LPR;
-
-mkdir "${freeside_conf}conf.DBI:mysql:$username/registries", 0755;
-mkdir "${freeside_conf}conf.DBI:mysql:$username/registries/internic", 0755;
-open(FROM, ">${freeside_conf}conf.DBI:mysql:$username/registries/internic/from")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/registries/internic/from: $!";
-print FROM "$email\n";
-close FROM;
-open(NAMESERVERS, ">${freeside_conf}conf.DBI:mysql:$username/registries/internic/nameservers")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/registries/internic/nameservers: $!";
-print NAMESERVERS <<END;
-10.0.0.1 ns1.this-is-an-example-domain.tld
-10.0.0.2 ns2.this-is-an-example-domain.tld
-10.0.0.3 ns3.this-is-an-example-domain.tld
-END
-close NAMESERVERS;
-open(TECH_CONTACT, ">${freeside_conf}conf.DBI:mysql:$username/registries/internic/tech_contact")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/registries/internic/tech_contact: $!";
-print TECH_CONTACT "EXAMPLE-INTERNIC-HANDLE\n";
-close TECH_CONTACT;
-system ("cp", "${freeside_conf}.domain-template.txt",
-        "${freeside_conf}conf.DBI:mysql:$username/registries/internic/template"
-       );
-open(TO, ">${freeside_conf}conf.DBI:mysql:$username/registries/internic/to")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/registries/internic/to: $!";
-print TO "$email\n";
-close TO;
-
-open(SHELLS, ">${freeside_conf}conf.DBI:mysql:$username/shells")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/shells: $!";
-print SHELLS <<END;
-/bin/sh
-/bin/csh
-/bin/bash
-/bin/tcsh
-/bin/ksh
-/bin/passwd
-/bin/true
-/bin/false
-
-END
-close SHELLS;
-
-open(SMTPMACHINE, ">${freeside_conf}conf.DBI:mysql:$username/smtpmachine")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/smtpmachine: $!";
-print SMTPMACHINE "localhost\n";
-close SMTPMACHINE;
-
-#make counter dir
-mkdir("/usr/local/etc/freeside/counters.DBI:mysql:$username",0755)
-  or die "Can't create counter spooldir: $!";
-
-system("${freeside_bin}fs-setup.webdemo", "$username");
-system("${freeside_test}cgi-test",
-       "http://freeside.sisd.com/", $username, $user_pw);
-
-###
-
-$ENV{SMTPHOSTS} = "localhost";
-$ENV{MAILADDRESS} = 'ivan@sisd.com';
-$header = Mail::Header->new( [
-  'From: ivan@sisd.com',
-  "To: $email",
-  'Cc: ivan-fsreg@sisd.com',
-  'Sender: ivan@sisd.com',
-  'Reply-To: ivan@sisd.com',
-  'Date: '. time2str("%a, %d %b %Y %X %z", time),
-  'Subject: Freeside demo information',
-] );
-$msg = Mail::Internet->new(
-  'Header' => $header,
-  'Body' => [
-"Hello $name <$email>,\n",
-"\n",
-"Your sample Freeside database has been setup.\n",
-"\n",
-"Point your web browswer at http://freeside.sisd.com/ and use the following\n",
-"authentication information:\n",
-"\n",
-"Username: $username\n",
-"Password: $user_pw\n",
-"\n",
-"You may wish to subscribe to the Freeside mailing list - send a blank\n",
-"message to ivan-freeside-subscribe\@sisd.com.\n",
-"\n",
-"-- \n",
-"Ivan Kohler <ivan\@sisd.com>\n",
-"20 4,16 \* \* \* saytime\n",
-            ]
-);
-$msg->smtpsend or die "Can\'t send registration email!";
-
-###
-
 sub idiot {
   my($error)=@_;
   print $cgi->header, <<END;
diff --git a/fs_webdemo/register.html b/fs_webdemo/register.html
new file mode 100644
index 000000000..fccf49c48
--- /dev/null
+++ b/fs_webdemo/register.html
@@ -0,0 +1,34 @@
+<HTML>
+  <HEAD>
+    <TITLE>
+      Freeside - Billing and account administration software for ISPs
+    </TITLE>
+  </HEAD>
+  <BODY BGCOLOR="#ffffff">
+  <table>
+    <tr><td>
+      <A HREF="http://www.sisd.com/">
+        <IMG BORDER=0 SRC="small-logo.gif" ALIGN=LEFT>
+      </A>
+    </td><td>
+      <center><font color="#ff0000" size=7 size=+4>freeside demo registration</font></center>
+    </td></tr>
+  </table>
+<P>You will need to choose a username for access to the Freeside web demo.
+     Also enter your email address and (optionally) your name.
+
+<P><FONT SIZE=+1 COLOR="#ff0000">A password
+      and the URL for your demo will be emailed to you, so don't waste your
+      time with non-deliverable addresses.</FONT>
+We will <B>not</B> give your name or email address to any third party,
+      nor will we send you any unsolicited email.
+    <FORM ACTION="register.cgi" METHOD="POST">
+      <PRE>
+Freeside username: <INPUT TYPE="text" NAME="username" MAXLENGTH=16>
+
+Email address:     <INPUT TYPE="text" NAME="email">
+</PRE>
+<BR><INPUT TYPE="Submit" VALUE="Register">
+    </FORM>
+  </BODY>
+</HTML>
diff --git a/fs_webdemo/registerd b/fs_webdemo/registerd
new file mode 100755
index 000000000..91dd8df29
--- /dev/null
+++ b/fs_webdemo/registerd
@@ -0,0 +1,285 @@
+#!/usr/bin/perl -Tw
+#
+# $Id: registerd,v 1.1 2000-03-01 08:15:10 ivan Exp $
+
+use strict;
+use vars qw(# $freeside_bin $freeside_test 
+            $freeside_conf
+            $mysql_data
+            $datasrc $user $pass $x
+             @pw_set @saltset
+            # $cgi $username $name $email $user_pw $crypt_pw $dbh $sth
+            # $header $msg
+             );
+#use CGI;
+#use CGI::Carp qw(fatalsToBrowser);
+use DBI;
+use Mail::Internet;
+use Mail::Header;
+use Date::Format;
+
+#$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
+#$ENV{'SHELL'} = '/bin/sh';
+#$ENV{'IFS'} = " \t\n";
+#$ENV{'CDPATH'} = '';
+#$ENV{'ENV'} = '';
+#$ENV{'BASH_ENV'} = '';
+
+#$freeside_bin = '/home/freeside/bin/';
+#$freeside_test = '/home/freeside/test/';
+$freeside_conf = '/usr/local/etc/freeside/';
+
+$mysql_data = "/var/lib/mysql";
+
+$datasrc = 'DBI:mysql:http_auth';
+$user = "freeside";
+$pass = "maelcolm";
+
+#my(@pw_set)= ( 'a'..'z', 'A'..'Z', '0'..'9', '(', ')', '#', '!', '.', ',' );
+#my(@pw_set)= ( 'a'..'z', 'A'..'Z', '0'..'9' );
+@pw_set = ( 'a'..'z', '0'..'9' );
+@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+
+die "not running as system user freeside"
+  unless $> == scalar(getpwnam('freeside'))
+
+$dbh = DBI->connect( $datasrc, $user, $pass, {
+	'AutoCommit' => 'true',
+} ) or die "DBI->connect error: $DBI::errstr\n";
+$x = $DBI::errstr; #silly; to avoid "used only once" warning
+
+while ( 1 ) {
+
+  $SIG{HUP} = 'IGNORE';
+  $SIG{INT} = 'IGNORE';
+  $SIG{QUIT} = 'IGNORE';
+  $SIG{TERM} = 'IGNORE';
+  $SIG{TSTP} = 'IGNORE';
+  $SIG{PIPE} = 'IGNORE';
+
+  $sth = $dbh->prepare("LOCK TABLES mysql_auth WRITE");
+  $sth->execute or die $sth->errstr;
+
+  $sth = $dbh->prepare(
+    'SELECT * FROM mysql_auth WHERE status = "unconfigured"'
+  );
+  $sth->execute or die $sth->errstr;
+  my $pending = $sth->fetchall_arrayref( {} );
+
+  $sth = $dbh->prepare(
+    'UPDATE mysql_auth SET status = "locked" WHERE status = "unconfigured"'
+  );
+  $sth->execute or die $sth->errstr;
+
+  $sth = $dbh->prepare("UNLOCK TABLES");
+  $sth->execute or die $sth->errstr;
+
+  #
+
+  foreach my $row ( @{$pending} ) {
+
+    my $username = $row->{'username'};
+
+    my $user_pw = join('',map($pw_set[ int(rand $#pw_set) ], (0..7) ) );
+    my $crypt_pw =
+      crypt($user_pw,$saltset[int(rand(64))].$saltset[int(rand(64))]);
+
+    system("/usr/bin/mysqladmin --user=$user --password=$pass ".
+      "create demo_$username >/dev/null");
+
+    system "cp $mysql_data/demo_template/* $mysql_data/demo_$username";
+
+    mkdir "${freeside_conf}conf.DBI:mysql:demo_$username", 0755;    
+    system "cp -r ${freeside_conf}conf.DBI:mysql:demo_template/* ".
+           "${freeside_conf}conf.DBI:mysql:demo_$username";
+
+    mkdir "${freeside_conf}counters.DBI:mysql:demo_$username", 0755;    
+    system "cp ${freeside_conf}counters.DBI:mysql:demo_template/* ".
+           "${freeside_conf}counters.DBI:mysql:demo_$username";
+
+
+    open(SECRETS, ">${freeside_conf}secrets.$username")
+      or die "Can\'t open ${freeside_conf}secrets.demo_$username: $!";
+    chmod 0600, "${freeside_conf}secrets.$username";
+    print SECRETS "DBI:mysql:demo_$username\nfreeside\nmaelcolm\n";
+    close SECRETS;
+
+    open(MAPSECRETS, ">>${freeside_conf}mapsecrets")
+      or die "Can\'t open ${freeside_conf}mapsecrets: $!";
+    print MAPSECRETS "$username secrets.demo_$username\n";
+    close MAPSECRETS;
+
+
+
+
+  }
+
+
+  $SIG{HUP} = 'DEFAULT';
+  $SIG{INT} = 'DEFAULT';
+  $SIG{QUIT} = 'DEFAULT';
+  $SIG{TERM} = 'DEFAULT';
+  $SIG{TSTP} = 'DEFAULT';
+  $SIG{PIPE} = 'DEFAULT';
+
+  sleep 5;
+
+}
+
+$sth = $dbh->prepare("INSERT INTO mysql_auth VALUES (". join(", ",
+  $dbh->quote($username),
+  $dbh->quote($crypt_pw),
+  $dbh->quote('freeside'),
+). ")" );
+
+$sth->execute or &idiot("Username in use: ". $sth->errstr);
+
+$dbh->disconnect or die $dbh->errstr;
+
+###
+
+
+
+open(ADDRESS, ">${freeside_conf}conf.DBI:mysql:$username/address")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/address: $!";
+print ADDRESS <<END;
+Internet Service Provider, Inc.
+1 Packet Blvd.
+Router, MN  10010  
+
+END
+close ADDRESS;
+
+open(DOMAIN, ">${freeside_conf}conf.DBI:mysql:$username/domain")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/domain: $!";
+print DOMAIN "this-is-an-example-domain.tld\n";
+close DOMAIN;
+
+open(HOME, ">${freeside_conf}conf.DBI:mysql:$username/home")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/home: $!";
+print HOME "/home\n";
+close HOME;
+
+open(INVOICE_FROM, ">${freeside_conf}conf.DBI:mysql:$username/invoice_from")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/invoice_from: $!";
+print INVOICE_FROM "$email\n";
+close INVOICE_FROM;
+
+open(LPR, ">${freeside_conf}conf.DBI:mysql:$username/lpr")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/lpr: $!";
+print LPR "cat >/dev/null\n";
+close LPR;
+
+mkdir "${freeside_conf}conf.DBI:mysql:$username/registries", 0755;
+mkdir "${freeside_conf}conf.DBI:mysql:$username/registries/internic", 0755;
+open(FROM, ">${freeside_conf}conf.DBI:mysql:$username/registries/internic/from")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/registries/internic/from: $!";
+print FROM "$email\n";
+close FROM;
+open(NAMESERVERS, ">${freeside_conf}conf.DBI:mysql:$username/registries/internic/nameservers")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/registries/internic/nameservers: $!";
+print NAMESERVERS <<END;
+10.0.0.1 ns1.this-is-an-example-domain.tld
+10.0.0.2 ns2.this-is-an-example-domain.tld
+10.0.0.3 ns3.this-is-an-example-domain.tld
+END
+close NAMESERVERS;
+open(TECH_CONTACT, ">${freeside_conf}conf.DBI:mysql:$username/registries/internic/tech_contact")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/registries/internic/tech_contact: $!";
+print TECH_CONTACT "EXAMPLE-INTERNIC-HANDLE\n";
+close TECH_CONTACT;
+system ("cp", "${freeside_conf}.domain-template.txt",
+        "${freeside_conf}conf.DBI:mysql:$username/registries/internic/template"
+       );
+open(TO, ">${freeside_conf}conf.DBI:mysql:$username/registries/internic/to")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/registries/internic/to: $!";
+print TO "$email\n";
+close TO;
+
+open(SHELLS, ">${freeside_conf}conf.DBI:mysql:$username/shells")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/shells: $!";
+print SHELLS <<END;
+/bin/sh
+/bin/csh
+/bin/bash
+/bin/tcsh
+/bin/ksh
+/bin/passwd
+/bin/true
+/bin/false
+
+END
+close SHELLS;
+
+open(SMTPMACHINE, ">${freeside_conf}conf.DBI:mysql:$username/smtpmachine")
+  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/smtpmachine: $!";
+print SMTPMACHINE "localhost\n";
+close SMTPMACHINE;
+
+#make counter dir
+mkdir("/usr/local/etc/freeside/counters.DBI:mysql:$username",0755)
+  or die "Can't create counter spooldir: $!";
+
+system("${freeside_bin}fs-setup.webdemo", "$username");
+system("${freeside_test}cgi-test",
+       "http://freeside.sisd.com/", $username, $user_pw);
+
+###
+
+$ENV{SMTPHOSTS} = "localhost";
+$ENV{MAILADDRESS} = 'ivan@sisd.com';
+$header = Mail::Header->new( [
+  'From: ivan@sisd.com',
+  "To: $email",
+  'Cc: ivan-fsreg@sisd.com',
+  'Sender: ivan@sisd.com',
+  'Reply-To: ivan@sisd.com',
+  'Date: '. time2str("%a, %d %b %Y %X %z", time),
+  'Subject: Freeside demo information',
+] );
+$msg = Mail::Internet->new(
+  'Header' => $header,
+  'Body' => [
+"Hello $name <$email>,\n",
+"\n",
+"Your sample Freeside database has been setup.\n",
+"\n",
+"Point your web browswer at http://freeside.sisd.com/ and use the following\n",
+"authentication information:\n",
+"\n",
+"Username: $username\n",
+"Password: $user_pw\n",
+"\n",
+"You may wish to subscribe to the Freeside mailing list - send a blank\n",
+"message to ivan-freeside-subscribe\@sisd.com.\n",
+"\n",
+"-- \n",
+"Ivan Kohler <ivan\@sisd.com>\n",
+"20 4,16 \* \* \* saytime\n",
+            ]
+);
+$msg->smtpsend or die "Can\'t send registration email!";
+
+###
+
+sub idiot {
+  my($error)=@_;
+  print $cgi->header, <<END;
+<HTML>
+  <HEAD>
+    <TITLE>Registration error</TITLE>
+  </HEAD>
+  <BODY BGCOLOR="#FFFFFF">
+    <CENTER>
+    <H4>Registration error</H4>
+    </CENTER>
+    <P><B>$error</B>
+    <P>Hit the <I>Back</I> button in your web browser, correct this mistake,
+       and submit the form again.
+  </BODY>
+</HTML>
+END
+  
+  exit;
+ 
+}
-- 
cgit v1.2.1


From ea6d841c989123295d887d356d4566ee22a4f97c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 1 Mar 2000 08:19:23 +0000
Subject: x

---
 fs_webdemo/register.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_webdemo/register.html b/fs_webdemo/register.html
index fccf49c48..5cb1140d8 100644
--- a/fs_webdemo/register.html
+++ b/fs_webdemo/register.html
@@ -20,7 +20,7 @@
 <P><FONT SIZE=+1 COLOR="#ff0000">A password
       and the URL for your demo will be emailed to you, so don't waste your
       time with non-deliverable addresses.</FONT>
-We will <B>not</B> give your name or email address to any third party,
+We will <B>not</B> give your email address to any third party,
       nor will we send you any unsolicited email.
     <FORM ACTION="register.cgi" METHOD="POST">
       <PRE>
-- 
cgit v1.2.1


From 6b8cf061c763925866f765fb5cae8e16e2babe0c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 1 Mar 2000 08:22:50 +0000
Subject: *** empty log message ***

---
 fs_webdemo/register.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs_webdemo/register.html b/fs_webdemo/register.html
index 5cb1140d8..7781b058c 100644
--- a/fs_webdemo/register.html
+++ b/fs_webdemo/register.html
@@ -15,13 +15,12 @@
     </td></tr>
   </table>
 <P>You will need to choose a username for access to the Freeside web demo.
-     Also enter your email address and (optionally) your name.
 
 <P><FONT SIZE=+1 COLOR="#ff0000">A password
       and the URL for your demo will be emailed to you, so don't waste your
       time with non-deliverable addresses.</FONT>
 We will <B>not</B> give your email address to any third party,
-      nor will we send you any unsolicited email.
+      nor will we send you any unsolicited email (or in fact any email beyond the automatic registration).
     <FORM ACTION="register.cgi" METHOD="POST">
       <PRE>
 Freeside username: <INPUT TYPE="text" NAME="username" MAXLENGTH=16>
-- 
cgit v1.2.1


From ac721c152d7e874d95a376d225c5acf2f2390af3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 1 Mar 2000 08:23:18 +0000
Subject: *** empty log message ***

---
 fs_webdemo/register.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_webdemo/register.html b/fs_webdemo/register.html
index 7781b058c..acf9cff7f 100644
--- a/fs_webdemo/register.html
+++ b/fs_webdemo/register.html
@@ -20,7 +20,7 @@
       and the URL for your demo will be emailed to you, so don't waste your
       time with non-deliverable addresses.</FONT>
 We will <B>not</B> give your email address to any third party,
-      nor will we send you any unsolicited email (or in fact any email beyond the automatic registration).
+      nor will we send you any unsolicited email (or in fact any email after the automatic registration).
     <FORM ACTION="register.cgi" METHOD="POST">
       <PRE>
 Freeside username: <INPUT TYPE="text" NAME="username" MAXLENGTH=16>
-- 
cgit v1.2.1


From b2aed426363c22c3dc4cbad5e899028f8f96a4da Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 2 Mar 2000 07:44:07 +0000
Subject: typo forgot closing '

---
 bin/fs-setup | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index b75058d55..3dde038b2 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.23 2000-02-03 05:16:52 ivan Exp $
+# $Id: fs-setup,v 1.24 2000-03-02 07:44:07 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.23  2000-02-03 05:16:52  ivan
+# Revision 1.24  2000-03-02 07:44:07  ivan
+# typo forgot closing '
+#
+# Revision 1.23  2000/02/03 05:16:52  ivan
 # beginning of DNS and Apache support
 #
 # Revision 1.22  2000/01/31 05:22:23  ivan
@@ -702,7 +705,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'prepaynum',
       'unique'      => [ ['identifier'] ],
-      'index        => [ [] ],
+      'index'       => [ [] ],
     },
 
   );
-- 
cgit v1.2.1


From ad5de6e3d03da72070a32d089cc14632208e1ea4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 2 Mar 2000 08:09:38 +0000
Subject: still need to allow blank expiration dates

---
 htdocs/edit/cust_main.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 4eef9c74d..6356a4d74 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.24 2000-01-30 06:54:50 ivan Exp $
+# $Id: cust_main.cgi,v 1.25 2000-03-02 08:09:38 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.24  2000-01-30 06:54:50  ivan
+# Revision 1.25  2000-03-02 08:09:38  ivan
+# still need to allow blank expiration dates
+#
+# Revision 1.24  2000/01/30 06:54:50  ivan
 # credit card expiration dates not sticky bug fixed?
 #
 # Revision 1.23  2000/01/27 00:53:14  ivan
@@ -290,7 +293,7 @@ sub expselect {
   my $prefix = shift;
   my( $m, $y ) = (0, 0);
   if ( scalar(@_) ) {
-    my $date = shift;
+    my $date = shift || '01-2000';
     if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
       ( $m, $y ) = ( $2, $1 );
     } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-- 
cgit v1.2.1


From dab9ff90d22cd188c4f4a436c320814f24af6846 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 3 Mar 2000 05:29:24 +0000
Subject: first pass at separate registerd process

---
 fs_webdemo/register.cgi |   5 +-
 fs_webdemo/registerd    | 245 ++++++++++++++----------------------------------
 2 files changed, 75 insertions(+), 175 deletions(-)

diff --git a/fs_webdemo/register.cgi b/fs_webdemo/register.cgi
index 45b5d6aeb..e240a974e 100755
--- a/fs_webdemo/register.cgi
+++ b/fs_webdemo/register.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: register.cgi,v 1.2 2000-03-01 08:15:10 ivan Exp $
+# $Id: register.cgi,v 1.3 2000-03-03 05:29:24 ivan Exp $
 
 use strict;
 use vars qw( #$freeside_bin $freeside_test $freeside_conf
@@ -75,8 +75,9 @@ $x = $DBI::errstr; #silly; to avoid "used only once" warning
 
 $sth = $dbh->prepare("INSERT INTO mysql_auth VALUES (". join(", ",
   $dbh->quote($username),
-  $dbh->quote("X"),
+#  $dbh->quote("X"),
 #  $dbh->quote($crypt_pw),
+  $dbh->quote($email);
   $dbh->quote('freeside'),
   $dbh->quote('unconfigured'),
 ). ")" );
diff --git a/fs_webdemo/registerd b/fs_webdemo/registerd
index 91dd8df29..4840d9eee 100755
--- a/fs_webdemo/registerd
+++ b/fs_webdemo/registerd
@@ -1,16 +1,18 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: registerd,v 1.1 2000-03-01 08:15:10 ivan Exp $
+# $Id: registerd,v 1.2 2000-03-03 05:29:24 ivan Exp $
 
 use strict;
-use vars qw(# $freeside_bin $freeside_test 
-            $freeside_conf
-            $mysql_data
-            $datasrc $user $pass $x
+use vars qw(
+             $freeside_conf
+             $mysql_data
+             $datasrc $user $pass $x
+             $dbh $sth
              @pw_set @saltset
-            # $cgi $username $name $email $user_pw $crypt_pw $dbh $sth
-            # $header $msg
-             );
+             $header $msg
+           );
+            # $freeside_bin $freeside_test 
+            # $cgi $username $name $email $user_pw $crypt_pw 
 #use CGI;
 #use CGI::Carp qw(fatalsToBrowser);
 use DBI;
@@ -41,7 +43,7 @@ $pass = "maelcolm";
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
 
 die "not running as system user freeside"
-  unless $> == scalar(getpwnam('freeside'))
+  unless $> == scalar(getpwnam('freeside'));
 
 $dbh = DBI->connect( $datasrc, $user, $pass, {
 	'AutoCommit' => 'true',
@@ -79,10 +81,7 @@ while ( 1 ) {
   foreach my $row ( @{$pending} ) {
 
     my $username = $row->{'username'};
-
-    my $user_pw = join('',map($pw_set[ int(rand $#pw_set) ], (0..7) ) );
-    my $crypt_pw =
-      crypt($user_pw,$saltset[int(rand(64))].$saltset[int(rand(64))]);
+    my $email = $row->{'passwd'};
 
     system("/usr/bin/mysqladmin --user=$user --password=$pass ".
       "create demo_$username >/dev/null");
@@ -97,8 +96,30 @@ while ( 1 ) {
     system "cp ${freeside_conf}counters.DBI:mysql:demo_template/* ".
            "${freeside_conf}counters.DBI:mysql:demo_$username";
 
+    system "cp ${freeside_conf}dbdef.DBI:mysql:demo_template ".
+           "${freeside_conf}dbdef.DBI:mysql:demo_$username";
+
+    open(INVOICE_FROM, ">${freeside_conf}conf.DBI:mysql:demo_$username/invoice_from")
+      or die "Can\'t open ${freeside_conf}conf.DBI:mysql:demo_$username/invoice_from: $!";
+    print INVOICE_FROM "$email\n";
+    close INVOICE_FROM;
+
+    open(LPR, ">${freeside_conf}conf.DBI:mysql:demo_$username/lpr")
+      or die "Can\'t open ${freeside_conf}conf.DBI:mysql:demo_$username/lpr: $!";
+    print LPR "mail $email";
+    close LPR;
+
+    open(FROM, ">${freeside_conf}conf.DBI:mysql:demo_$username/registries/internic/from")
+      or die "Can\'t open ${freeside_conf}conf.DBI:mysql:demo_$username/registries/internic/from: $!";
+    print FROM "$email\n";
+    close FROM;
 
-    open(SECRETS, ">${freeside_conf}secrets.$username")
+    open(TO, ">${freeside_conf}conf.DBI:mysql:demo_$username/registries/internic/to")
+      or die "Can\'t open ${freeside_conf}conf.DBI:mysql:demo_$username/registries/internic/to: $!";
+    print TO "$email\n";
+    close TO;
+
+    open(SECRETS, ">${freeside_conf}secrets.demo_$username")
       or die "Can\'t open ${freeside_conf}secrets.demo_$username: $!";
     chmod 0600, "${freeside_conf}secrets.$username";
     print SECRETS "DBI:mysql:demo_$username\nfreeside\nmaelcolm\n";
@@ -109,12 +130,47 @@ while ( 1 ) {
     print MAPSECRETS "$username secrets.demo_$username\n";
     close MAPSECRETS;
 
+    my $user_pw = join('',map($pw_set[ int(rand $#pw_set) ], (0..7) ) );
+    my $crypt_pw =
+      crypt($user_pw,$saltset[int(rand(64))].$saltset[int(rand(64))]);
 
-
+    $sth = $dbh->prepare(
+      'UPDATE mysql_auth SET passwd = "$crypt_pw" WHERE username = "$username"'
+    );
+    $sth->execute or die $sth->errstr;
+
+    $ENV{SMTPHOSTS} = "localhost";
+    $ENV{MAILADDRESS} = 'ivan-fsreg@sisd.com';
+    $header = Mail::Header->new( [
+      'From: ivan-fsreg@sisd.com',
+      "To: $email",
+      'Bcc: ivan-fsreg_bcc@sisd.com',
+      'Sender: ivan-fsreg@sisd.com',
+      'Reply-To: ivan-fsreg@sisd.com',
+      'Date: '. time2str("%a, %d %b %Y %X %z", time),
+      'Subject: Freeside demo information',
+    ] );
+    $msg = Mail::Internet->new(
+      'Header' => $header,
+      'Body' => [
+    "Hello,\n",
+    "\n",
+    "Your sample Freeside database has been setup.\n",
+    "\n",
+    "Point your web browswer at http://freeside.sisd.com/ and use the following\n",
+    "authentication information:\n",
+    "\n",
+    "Username: $username\n",
+    "Password: $user_pw\n",
+    "\n",
+    "-- \n",
+    "ivan\n",
+                ]
+    );
+    $msg->smtpsend or die "Can\'t send registration email!";
 
   }
 
-
   $SIG{HUP} = 'DEFAULT';
   $SIG{INT} = 'DEFAULT';
   $SIG{QUIT} = 'DEFAULT';
@@ -126,160 +182,3 @@ while ( 1 ) {
 
 }
 
-$sth = $dbh->prepare("INSERT INTO mysql_auth VALUES (". join(", ",
-  $dbh->quote($username),
-  $dbh->quote($crypt_pw),
-  $dbh->quote('freeside'),
-). ")" );
-
-$sth->execute or &idiot("Username in use: ". $sth->errstr);
-
-$dbh->disconnect or die $dbh->errstr;
-
-###
-
-
-
-open(ADDRESS, ">${freeside_conf}conf.DBI:mysql:$username/address")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/address: $!";
-print ADDRESS <<END;
-Internet Service Provider, Inc.
-1 Packet Blvd.
-Router, MN  10010  
-
-END
-close ADDRESS;
-
-open(DOMAIN, ">${freeside_conf}conf.DBI:mysql:$username/domain")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/domain: $!";
-print DOMAIN "this-is-an-example-domain.tld\n";
-close DOMAIN;
-
-open(HOME, ">${freeside_conf}conf.DBI:mysql:$username/home")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/home: $!";
-print HOME "/home\n";
-close HOME;
-
-open(INVOICE_FROM, ">${freeside_conf}conf.DBI:mysql:$username/invoice_from")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/invoice_from: $!";
-print INVOICE_FROM "$email\n";
-close INVOICE_FROM;
-
-open(LPR, ">${freeside_conf}conf.DBI:mysql:$username/lpr")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/lpr: $!";
-print LPR "cat >/dev/null\n";
-close LPR;
-
-mkdir "${freeside_conf}conf.DBI:mysql:$username/registries", 0755;
-mkdir "${freeside_conf}conf.DBI:mysql:$username/registries/internic", 0755;
-open(FROM, ">${freeside_conf}conf.DBI:mysql:$username/registries/internic/from")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/registries/internic/from: $!";
-print FROM "$email\n";
-close FROM;
-open(NAMESERVERS, ">${freeside_conf}conf.DBI:mysql:$username/registries/internic/nameservers")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/registries/internic/nameservers: $!";
-print NAMESERVERS <<END;
-10.0.0.1 ns1.this-is-an-example-domain.tld
-10.0.0.2 ns2.this-is-an-example-domain.tld
-10.0.0.3 ns3.this-is-an-example-domain.tld
-END
-close NAMESERVERS;
-open(TECH_CONTACT, ">${freeside_conf}conf.DBI:mysql:$username/registries/internic/tech_contact")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/registries/internic/tech_contact: $!";
-print TECH_CONTACT "EXAMPLE-INTERNIC-HANDLE\n";
-close TECH_CONTACT;
-system ("cp", "${freeside_conf}.domain-template.txt",
-        "${freeside_conf}conf.DBI:mysql:$username/registries/internic/template"
-       );
-open(TO, ">${freeside_conf}conf.DBI:mysql:$username/registries/internic/to")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/registries/internic/to: $!";
-print TO "$email\n";
-close TO;
-
-open(SHELLS, ">${freeside_conf}conf.DBI:mysql:$username/shells")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/shells: $!";
-print SHELLS <<END;
-/bin/sh
-/bin/csh
-/bin/bash
-/bin/tcsh
-/bin/ksh
-/bin/passwd
-/bin/true
-/bin/false
-
-END
-close SHELLS;
-
-open(SMTPMACHINE, ">${freeside_conf}conf.DBI:mysql:$username/smtpmachine")
-  or die "Can\'t open ${freeside_conf}conf.DBI:mysql:$username/smtpmachine: $!";
-print SMTPMACHINE "localhost\n";
-close SMTPMACHINE;
-
-#make counter dir
-mkdir("/usr/local/etc/freeside/counters.DBI:mysql:$username",0755)
-  or die "Can't create counter spooldir: $!";
-
-system("${freeside_bin}fs-setup.webdemo", "$username");
-system("${freeside_test}cgi-test",
-       "http://freeside.sisd.com/", $username, $user_pw);
-
-###
-
-$ENV{SMTPHOSTS} = "localhost";
-$ENV{MAILADDRESS} = 'ivan@sisd.com';
-$header = Mail::Header->new( [
-  'From: ivan@sisd.com',
-  "To: $email",
-  'Cc: ivan-fsreg@sisd.com',
-  'Sender: ivan@sisd.com',
-  'Reply-To: ivan@sisd.com',
-  'Date: '. time2str("%a, %d %b %Y %X %z", time),
-  'Subject: Freeside demo information',
-] );
-$msg = Mail::Internet->new(
-  'Header' => $header,
-  'Body' => [
-"Hello $name <$email>,\n",
-"\n",
-"Your sample Freeside database has been setup.\n",
-"\n",
-"Point your web browswer at http://freeside.sisd.com/ and use the following\n",
-"authentication information:\n",
-"\n",
-"Username: $username\n",
-"Password: $user_pw\n",
-"\n",
-"You may wish to subscribe to the Freeside mailing list - send a blank\n",
-"message to ivan-freeside-subscribe\@sisd.com.\n",
-"\n",
-"-- \n",
-"Ivan Kohler <ivan\@sisd.com>\n",
-"20 4,16 \* \* \* saytime\n",
-            ]
-);
-$msg->smtpsend or die "Can\'t send registration email!";
-
-###
-
-sub idiot {
-  my($error)=@_;
-  print $cgi->header, <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Registration error</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#FFFFFF">
-    <CENTER>
-    <H4>Registration error</H4>
-    </CENTER>
-    <P><B>$error</B>
-    <P>Hit the <I>Back</I> button in your web browser, correct this mistake,
-       and submit the form again.
-  </BODY>
-</HTML>
-END
-  
-  exit;
- 
-}
-- 
cgit v1.2.1


From 8f7bf60ca805e407e797c9be99231a9d11c95d6d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 3 Mar 2000 05:32:56 +0000
Subject: fix silly syntax errors

---
 fs_webdemo/register.cgi | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/fs_webdemo/register.cgi b/fs_webdemo/register.cgi
index e240a974e..e5f24efe0 100755
--- a/fs_webdemo/register.cgi
+++ b/fs_webdemo/register.cgi
@@ -1,16 +1,17 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: register.cgi,v 1.3 2000-03-03 05:29:24 ivan Exp $
+# $Id: register.cgi,v 1.4 2000-03-03 05:32:56 ivan Exp $
 
 use strict;
-use vars qw( #$freeside_bin $freeside_test $freeside_conf
+use vars qw(
              $datasrc $user $pass $x
-             #@pw_set @saltset
              $cgi $username $email 
-             #$user_pw $crypt_pw 
              $dbh $sth
-             #$header $msg
              );
+             #$freeside_bin $freeside_test $freeside_conf
+             #@pw_set @saltset
+             #$user_pw $crypt_pw 
+             #$header $msg
 use CGI;
 #use CGI::Carp qw(fatalsToBrowser);
 use DBI;
@@ -77,7 +78,7 @@ $sth = $dbh->prepare("INSERT INTO mysql_auth VALUES (". join(", ",
   $dbh->quote($username),
 #  $dbh->quote("X"),
 #  $dbh->quote($crypt_pw),
-  $dbh->quote($email);
+  $dbh->quote($email),
   $dbh->quote('freeside'),
   $dbh->quote('unconfigured'),
 ). ")" );
-- 
cgit v1.2.1


From 66ebb4df3b5c07b448ed94618a4d3aef1e455def Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 3 Mar 2000 05:47:24 +0000
Subject: *** empty log message ***

---
 fs_webdemo/registerd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs_webdemo/registerd b/fs_webdemo/registerd
index 4840d9eee..e6c071d70 100755
--- a/fs_webdemo/registerd
+++ b/fs_webdemo/registerd
@@ -1,6 +1,6 @@
-#!/usr/bin/perl -Tw
+#!/usr/bin/perl -w
 #
-# $Id: registerd,v 1.2 2000-03-03 05:29:24 ivan Exp $
+# $Id: registerd,v 1.3 2000-03-03 05:47:24 ivan Exp $
 
 use strict;
 use vars qw(
-- 
cgit v1.2.1


From 7eec2c6a15f1baf2f3c6dddf57d0a58eb357da12 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 3 Mar 2000 06:03:15 +0000
Subject: *** empty log message ***

---
 fs_webdemo/registerd | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/fs_webdemo/registerd b/fs_webdemo/registerd
index e6c071d70..e10acf2fe 100755
--- a/fs_webdemo/registerd
+++ b/fs_webdemo/registerd
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: registerd,v 1.3 2000-03-03 05:47:24 ivan Exp $
+# $Id: registerd,v 1.4 2000-03-03 06:03:15 ivan Exp $
 
 use strict;
 use vars qw(
@@ -42,8 +42,10 @@ $pass = "maelcolm";
 @pw_set = ( 'a'..'z', '0'..'9' );
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
 
-die "not running as system user freeside"
-  unless $> == scalar(getpwnam('freeside'));
+#die "not running as system user freeside"
+#  unless $> == scalar(getpwnam('freeside'));
+die "not running as root user"
+  unless $> == 0;
 
 $dbh = DBI->connect( $datasrc, $user, $pass, {
 	'AutoCommit' => 'true',
@@ -86,17 +88,17 @@ while ( 1 ) {
     system("/usr/bin/mysqladmin --user=$user --password=$pass ".
       "create demo_$username >/dev/null");
 
-    system "cp $mysql_data/demo_template/* $mysql_data/demo_$username";
+    system "cp -p $mysql_data/demo_template/* $mysql_data/demo_$username";
 
     mkdir "${freeside_conf}conf.DBI:mysql:demo_$username", 0755;    
-    system "cp -r ${freeside_conf}conf.DBI:mysql:demo_template/* ".
+    system "cp -pr ${freeside_conf}conf.DBI:mysql:demo_template/* ".
            "${freeside_conf}conf.DBI:mysql:demo_$username";
 
     mkdir "${freeside_conf}counters.DBI:mysql:demo_$username", 0755;    
-    system "cp ${freeside_conf}counters.DBI:mysql:demo_template/* ".
+    system "cp -p ${freeside_conf}counters.DBI:mysql:demo_template/* ".
            "${freeside_conf}counters.DBI:mysql:demo_$username";
 
-    system "cp ${freeside_conf}dbdef.DBI:mysql:demo_template ".
+    system "cp -p ${freeside_conf}dbdef.DBI:mysql:demo_template ".
            "${freeside_conf}dbdef.DBI:mysql:demo_$username";
 
     open(INVOICE_FROM, ">${freeside_conf}conf.DBI:mysql:demo_$username/invoice_from")
@@ -135,7 +137,7 @@ while ( 1 ) {
       crypt($user_pw,$saltset[int(rand(64))].$saltset[int(rand(64))]);
 
     $sth = $dbh->prepare(
-      'UPDATE mysql_auth SET passwd = "$crypt_pw" WHERE username = "$username"'
+      'UPDATE mysql_auth SET passwd = "$crypt_pw", status = "done" WHERE username = "$username"'
     );
     $sth->execute or die $sth->errstr;
 
@@ -147,7 +149,7 @@ while ( 1 ) {
       'Bcc: ivan-fsreg_bcc@sisd.com',
       'Sender: ivan-fsreg@sisd.com',
       'Reply-To: ivan-fsreg@sisd.com',
-      'Date: '. time2str("%a, %d %b %Y %X %z", time),
+      'Date: '. time2str("%a, %d %b %Y %X %z", time, 'US/Pacific'),
       'Subject: Freeside demo information',
     ] );
     $msg = Mail::Internet->new(
-- 
cgit v1.2.1


From 859bfa57db033957bdb1778f042e7ee9a1df4e1e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 3 Mar 2000 06:10:18 +0000
Subject: *** empty log message ***

---
 fs_webdemo/registerd | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fs_webdemo/registerd b/fs_webdemo/registerd
index e10acf2fe..e6127638b 100755
--- a/fs_webdemo/registerd
+++ b/fs_webdemo/registerd
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: registerd,v 1.4 2000-03-03 06:03:15 ivan Exp $
+# $Id: registerd,v 1.5 2000-03-03 06:10:18 ivan Exp $
 
 use strict;
 use vars qw(
@@ -137,19 +137,20 @@ while ( 1 ) {
       crypt($user_pw,$saltset[int(rand(64))].$saltset[int(rand(64))]);
 
     $sth = $dbh->prepare(
-      'UPDATE mysql_auth SET passwd = "$crypt_pw", status = "done" WHERE username = "$username"'
+      qq(UPDATE mysql_auth SET passwd = "$crypt_pw", status = "done" WHERE username = "$username")
     );
     $sth->execute or die $sth->errstr;
 
     $ENV{SMTPHOSTS} = "localhost";
     $ENV{MAILADDRESS} = 'ivan-fsreg@sisd.com';
+    $ENV{TZ} = "PST8PDT";
     $header = Mail::Header->new( [
       'From: ivan-fsreg@sisd.com',
       "To: $email",
       'Bcc: ivan-fsreg_bcc@sisd.com',
       'Sender: ivan-fsreg@sisd.com',
       'Reply-To: ivan-fsreg@sisd.com',
-      'Date: '. time2str("%a, %d %b %Y %X %z", time, 'US/Pacific'),
+      'Date: '. time2str("%a, %d %b %Y %X %z", time ),
       'Subject: Freeside demo information',
     ] );
     $msg = Mail::Internet->new(
-- 
cgit v1.2.1


From ab3994ca459732272181e32dad40caaf371f9be7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 3 Mar 2000 06:28:50 +0000
Subject: kludge but effective

---
 fs_webdemo/registerd | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fs_webdemo/registerd b/fs_webdemo/registerd
index e6127638b..258d198db 100755
--- a/fs_webdemo/registerd
+++ b/fs_webdemo/registerd
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: registerd,v 1.5 2000-03-03 06:10:18 ivan Exp $
+# $Id: registerd,v 1.6 2000-03-03 06:28:50 ivan Exp $
 
 use strict;
 use vars qw(
@@ -123,7 +123,9 @@ while ( 1 ) {
 
     open(SECRETS, ">${freeside_conf}secrets.demo_$username")
       or die "Can\'t open ${freeside_conf}secrets.demo_$username: $!";
-    chmod 0600, "${freeside_conf}secrets.$username";
+    chown scalar(getpwnam('freeside')), scalar(getgrnam('freeside')),
+          "${freeside_conf}secrets.demo_$username";
+    chmod 0600, "${freeside_conf}secrets.demo_$username";
     print SECRETS "DBI:mysql:demo_$username\nfreeside\nmaelcolm\n";
     close SECRETS;
 
@@ -150,7 +152,8 @@ while ( 1 ) {
       'Bcc: ivan-fsreg_bcc@sisd.com',
       'Sender: ivan-fsreg@sisd.com',
       'Reply-To: ivan-fsreg@sisd.com',
-      'Date: '. time2str("%a, %d %b %Y %X %z", time ),
+      #'Date: '. time2str("%a, %d %b %Y %X %z", time ),
+      'Date: '. time2str("%a, %d %b %Y %X ", time ). "-0800",
       'Subject: Freeside demo information',
     ] );
     $msg = Mail::Internet->new(
-- 
cgit v1.2.1


From 22bc8f11195530bf2e9435f4892dd953e2acaf42 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 3 Mar 2000 06:36:49 +0000
Subject: *** empty log message ***

---
 fs_webdemo/registerd | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs_webdemo/registerd b/fs_webdemo/registerd
index 258d198db..e5315e52c 100755
--- a/fs_webdemo/registerd
+++ b/fs_webdemo/registerd
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: registerd,v 1.6 2000-03-03 06:28:50 ivan Exp $
+# $Id: registerd,v 1.7 2000-03-03 06:36:49 ivan Exp $
 
 use strict;
 use vars qw(
@@ -97,6 +97,8 @@ while ( 1 ) {
     mkdir "${freeside_conf}counters.DBI:mysql:demo_$username", 0755;    
     system "cp -p ${freeside_conf}counters.DBI:mysql:demo_template/* ".
            "${freeside_conf}counters.DBI:mysql:demo_$username";
+    chown scalar(getpwnam('freeside')), scalar(getgrnam('freeside')),
+           "${freeside_conf}counters.demo_$username";
 
     system "cp -p ${freeside_conf}dbdef.DBI:mysql:demo_template ".
            "${freeside_conf}dbdef.DBI:mysql:demo_$username";
-- 
cgit v1.2.1


From 84fd99ada2bca1b38ba547fb1125e3a53db1fc55 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 3 Mar 2000 12:27:54 +0000
Subject: silly typo

---
 fs_webdemo/registerd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs_webdemo/registerd b/fs_webdemo/registerd
index e5315e52c..6314d0af2 100755
--- a/fs_webdemo/registerd
+++ b/fs_webdemo/registerd
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: registerd,v 1.7 2000-03-03 06:36:49 ivan Exp $
+# $Id: registerd,v 1.8 2000-03-03 12:27:54 ivan Exp $
 
 use strict;
 use vars qw(
@@ -98,7 +98,7 @@ while ( 1 ) {
     system "cp -p ${freeside_conf}counters.DBI:mysql:demo_template/* ".
            "${freeside_conf}counters.DBI:mysql:demo_$username";
     chown scalar(getpwnam('freeside')), scalar(getgrnam('freeside')),
-           "${freeside_conf}counters.demo_$username";
+           "${freeside_conf}counters.DBI:mysql:demo_$username";
 
     system "cp -p ${freeside_conf}dbdef.DBI:mysql:demo_template ".
            "${freeside_conf}dbdef.DBI:mysql:demo_$username";
-- 
cgit v1.2.1


From 12debb17cbd12e68261dc7f98e39bfbc3915e6f6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 3 Mar 2000 18:21:38 +0000
Subject: changes backported from 1.2.3 release, bugfix from web demo

---
 FS/FS/Record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index e486e1ce7..dae9f3707 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -204,7 +204,7 @@ sub qsearchs { # $result_record = &FS::Record:qsearchs('table',\%hash);
   my(@result) = qsearch(@_);
   carp "warning: Multiple records in scalar search!" if scalar(@result) > 1;
     #should warn more vehemently if the search was on a primary key?
-  $result[0];
+  scalar(@result) ? ($result[0]) : ();
 }
 
 =back
@@ -825,7 +825,7 @@ sub hfields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.2 1999-08-04 10:41:22 ivan Exp $
+$Id: Record.pm,v 1.3 2000-03-03 18:21:38 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 61a85894466342b93507614785e61932f7358c50 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 3 Mar 2000 18:22:44 +0000
Subject: changes from 1.2.3 release, fixes from webdemo

---
 fs_webdemo/register.cgi                   |  4 ++--
 htdocs/docs/index.html                    |  2 +-
 htdocs/docs/man/FS.html                   |  4 ++--
 htdocs/docs/man/FS/Bill.html              |  2 +-
 htdocs/docs/man/FS/CGI.html               |  2 +-
 htdocs/docs/man/FS/Conf.html              |  2 +-
 htdocs/docs/man/FS/Invoice.html           |  2 +-
 htdocs/docs/man/FS/Record.html            |  4 ++--
 htdocs/docs/man/FS/SSH.html               |  2 +-
 htdocs/docs/man/FS/UI/Base.html           |  8 ++++----
 htdocs/docs/man/FS/UI/CGI.html            |  8 ++++----
 htdocs/docs/man/FS/UI/Gtk.html            |  8 ++++----
 htdocs/docs/man/FS/UID.html               |  4 ++--
 htdocs/docs/man/FS/agent.html             |  4 ++--
 htdocs/docs/man/FS/agent_type.html        |  4 ++--
 htdocs/docs/man/FS/cust_bill.html         |  4 ++--
 htdocs/docs/man/FS/cust_bill_pkg.html     |  4 ++--
 htdocs/docs/man/FS/cust_credit.html       |  4 ++--
 htdocs/docs/man/FS/cust_main.html         |  8 ++++----
 htdocs/docs/man/FS/cust_main_county.html  |  4 ++--
 htdocs/docs/man/FS/cust_main_invoice.html |  4 ++--
 htdocs/docs/man/FS/cust_pay.html          |  4 ++--
 htdocs/docs/man/FS/cust_pay_batch.html    |  4 ++--
 htdocs/docs/man/FS/cust_pkg.html          |  4 ++--
 htdocs/docs/man/FS/cust_refund.html       |  4 ++--
 htdocs/docs/man/FS/cust_svc.html          |  4 ++--
 htdocs/docs/man/FS/dbdef.html             |  2 +-
 htdocs/docs/man/FS/dbdef_colgroup.html    |  2 +-
 htdocs/docs/man/FS/dbdef_column.html      |  4 ++--
 htdocs/docs/man/FS/dbdef_index.html       |  2 +-
 htdocs/docs/man/FS/dbdef_table.html       |  4 ++--
 htdocs/docs/man/FS/dbdef_unique.html      |  2 +-
 htdocs/docs/man/FS/part_pkg.html          |  6 +++---
 htdocs/docs/man/FS/part_referral.html     |  4 ++--
 htdocs/docs/man/FS/part_svc.html          |  4 ++--
 htdocs/docs/man/FS/pkg_svc.html           |  4 ++--
 htdocs/docs/man/FS/svc_Common.html        |  4 ++--
 htdocs/docs/man/FS/svc_acct.html          |  4 ++--
 htdocs/docs/man/FS/svc_acct_pop.html      |  5 +++--
 htdocs/docs/man/FS/svc_acct_sm.html       |  4 ++--
 htdocs/docs/man/FS/svc_domain.html        | 22 ++++++++++++++++++----
 htdocs/docs/man/FS/type_pkgs.html         |  4 ++--
 htdocs/docs/upgrade5.html                 |  2 +-
 htdocs/search/svc_domain.cgi              |  8 ++++++--
 44 files changed, 107 insertions(+), 88 deletions(-)

diff --git a/fs_webdemo/register.cgi b/fs_webdemo/register.cgi
index e5f24efe0..825582262 100755
--- a/fs_webdemo/register.cgi
+++ b/fs_webdemo/register.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: register.cgi,v 1.4 2000-03-03 05:32:56 ivan Exp $
+# $Id: register.cgi,v 1.5 2000-03-03 18:22:42 ivan Exp $
 
 use strict;
 use vars qw(
@@ -13,7 +13,7 @@ use vars qw(
              #$user_pw $crypt_pw 
              #$header $msg
 use CGI;
-#use CGI::Carp qw(fatalsToBrowser);
+use CGI::Carp qw(fatalsToBrowser);
 use DBI;
 #use Mail::Internet;
 #use Mail::Header;
diff --git a/htdocs/docs/index.html b/htdocs/docs/index.html
index 21ec25755..e03bffb39 100644
--- a/htdocs/docs/index.html
+++ b/htdocs/docs/index.html
@@ -9,7 +9,7 @@
   <li><a href="upgrade2.html">Upgrading from 1.1.x to 1.1.4</a>
   <li><a href="upgrade3.html">Upgrading from 1.1.x to 1.2.x</a>
   <li><a href="upgrade4.html">Upgrading from 1.2.x to 1.2.2</a>
-  <li><a href="upgrade5.html">Upgrading from 1.2.2 to 1.3.0</a>
+  <li><a href="upgrade5.html">Upgrading from 1.2.2 to 1.2.3</a>
   <li><a href="config.html">Configuration files</a>
 <!--
   <li><a href="admin.html">Administration</a>
diff --git a/htdocs/docs/man/FS.html b/htdocs/docs/man/FS.html
index b2f0dd3a2..ab01acf99 100644
--- a/htdocs/docs/man/FS.html
+++ b/htdocs/docs/man/FS.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS - Freeside Perl modules</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -197,7 +197,7 @@ The main documentation is in htdocs/docs.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: FS.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: FS.html,v 1.2 2000-03-03 18:22:42 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/Bill.html b/htdocs/docs/man/FS/Bill.html
index e5832f8d9..cf996ae80 100644
--- a/htdocs/docs/man/FS/Bill.html
+++ b/htdocs/docs/man/FS/Bill.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::Bill - Legacy stub</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
diff --git a/htdocs/docs/man/FS/CGI.html b/htdocs/docs/man/FS/CGI.html
index e1a42ec59..8bcb6a27a 100644
--- a/htdocs/docs/man/FS/CGI.html
+++ b/htdocs/docs/man/FS/CGI.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::CGI - Subroutines for the web interface</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
diff --git a/htdocs/docs/man/FS/Conf.html b/htdocs/docs/man/FS/Conf.html
index e4555c3a9..563eea878 100644
--- a/htdocs/docs/man/FS/Conf.html
+++ b/htdocs/docs/man/FS/Conf.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::Conf - Read access to Freeside configuration values</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
diff --git a/htdocs/docs/man/FS/Invoice.html b/htdocs/docs/man/FS/Invoice.html
index 283e89a35..cc837be2e 100644
--- a/htdocs/docs/man/FS/Invoice.html
+++ b/htdocs/docs/man/FS/Invoice.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::Invoice - Legacy stub</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
diff --git a/htdocs/docs/man/FS/Record.html b/htdocs/docs/man/FS/Record.html
index da1fc5287..924f0b662 100644
--- a/htdocs/docs/man/FS/Record.html
+++ b/htdocs/docs/man/FS/Record.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::Record - Database record objects</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -312,7 +312,7 @@ true.
 </DL>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: Record.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: Record.html,v 1.2 2000-03-03 18:22:42 ivan Exp $
 
 <H1><A NAME="BUGS">BUGS</A></H1>
 <P>
diff --git a/htdocs/docs/man/FS/SSH.html b/htdocs/docs/man/FS/SSH.html
index aa8929b09..4368b8c11 100644
--- a/htdocs/docs/man/FS/SSH.html
+++ b/htdocs/docs/man/FS/SSH.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::SSH - Subroutines to call ssh and scp</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
diff --git a/htdocs/docs/man/FS/UI/Base.html b/htdocs/docs/man/FS/UI/Base.html
index 91a4df64d..7823090f6 100644
--- a/htdocs/docs/man/FS/UI/Base.html
+++ b/htdocs/docs/man/FS/UI/Base.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::UI::Base - Base class for all user-interface objects</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -78,7 +78,7 @@ using CGI.pm, etc.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: Base.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: Base.html,v 1.2 2000-03-03 18:22:44 ivan Exp $
 
 <P>
 <HR>
@@ -104,8 +104,8 @@ well.
 <H1><A NAME="HISTORY">HISTORY</A></H1>
 <P>
 $Log: Base.html,v $
-Revision 1.1  1999-08-04 12:13:27  ivan
-new HTML manpages
+Revision 1.2  2000-03-03 18:22:44  ivan
+changes from 1.2.3 release, fixes from webdemo
  Revision 1.1 1999/08/04 09:03:53 ivan initial checkin of
 module files for proper perl installation
 
diff --git a/htdocs/docs/man/FS/UI/CGI.html b/htdocs/docs/man/FS/UI/CGI.html
index c3efdc746..69bff5671 100644
--- a/htdocs/docs/man/FS/UI/CGI.html
+++ b/htdocs/docs/man/FS/UI/CGI.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::UI::CGI - Base class for CGI user-interface objects</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -67,7 +67,7 @@ class to conditionally specify certain behaviour.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: CGI.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: CGI.html,v 1.2 2000-03-03 18:22:44 ivan Exp $
 
 <P>
 <HR>
@@ -102,8 +102,8 @@ Still some small bits of widget code same as FS::UI::Gtk.
 <H1><A NAME="HISTORY">HISTORY</A></H1>
 <P>
 $Log: CGI.html,v $
-Revision 1.1  1999-08-04 12:13:27  ivan
-new HTML manpages
+Revision 1.2  2000-03-03 18:22:44  ivan
+changes from 1.2.3 release, fixes from webdemo
  Revision 1.1 1999/08/04 09:03:53 ivan initial checkin of
 module files for proper perl installation
 
diff --git a/htdocs/docs/man/FS/UI/Gtk.html b/htdocs/docs/man/FS/UI/Gtk.html
index cb2a864ac..3328e9746 100644
--- a/htdocs/docs/man/FS/UI/Gtk.html
+++ b/htdocs/docs/man/FS/UI/Gtk.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::UI::Gtk - Base class for Gtk user-interface objects</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -65,7 +65,7 @@ class to conditionally specify certain behaviour.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: Gtk.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: Gtk.html,v 1.2 2000-03-03 18:22:44 ivan Exp $
 
 <P>
 <HR>
@@ -99,8 +99,8 @@ Still some small bits of widget code same as FS::UI::CGI.
 <H1><A NAME="HISTORY">HISTORY</A></H1>
 <P>
 $Log: Gtk.html,v $
-Revision 1.1  1999-08-04 12:13:27  ivan
-new HTML manpages
+Revision 1.2  2000-03-03 18:22:44  ivan
+changes from 1.2.3 release, fixes from webdemo
  Revision 1.1 1999/08/04 09:03:53 ivan initial checkin of
 module files for proper perl installation
 
diff --git a/htdocs/docs/man/FS/UID.html b/htdocs/docs/man/FS/UID.html
index 34444623a..cad23d59d 100644
--- a/htdocs/docs/man/FS/UID.html
+++ b/htdocs/docs/man/FS/UID.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::UID - Subroutines for database login and assorted other stuff</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -128,7 +128,7 @@ coderef into the hash %FS::UID::callback :
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: UID.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: UID.html,v 1.2 2000-03-03 18:22:42 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/agent.html b/htdocs/docs/man/FS/agent.html
index bdbf019c5..cb422fce7 100644
--- a/htdocs/docs/man/FS/agent.html
+++ b/htdocs/docs/man/FS/agent.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::agent - Object methods for agent records</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -114,7 +114,7 @@ true iff this agent may purchase the specified package definition. See
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: agent.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: agent.html,v 1.2 2000-03-03 18:22:42 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/agent_type.html b/htdocs/docs/man/FS/agent_type.html
index 25ed652da..d246bea3d 100644
--- a/htdocs/docs/man/FS/agent_type.html
+++ b/htdocs/docs/man/FS/agent_type.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::agent_type - Object methods for agent_type records</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -121,7 +121,7 @@ Returns the pkgpart of all package definitions (see <A HREF="../FS/part_pkg.html
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: agent_type.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: agent_type.html,v 1.2 2000-03-03 18:22:42 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/cust_bill.html b/htdocs/docs/man/FS/cust_bill.html
index c28aa85a1..e09bae5e2 100644
--- a/htdocs/docs/man/FS/cust_bill.html
+++ b/htdocs/docs/man/FS/cust_bill.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_bill - Object methods for cust_bill records</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -156,7 +156,7 @@ field. It is specified as a UNIX timestamp; see <EM>perlfunc</EM>. Also see
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: cust_bill.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: cust_bill.html,v 1.2 2000-03-03 18:22:42 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/cust_bill_pkg.html b/htdocs/docs/man/FS/cust_bill_pkg.html
index 229e88b5f..b94874408 100644
--- a/htdocs/docs/man/FS/cust_bill_pkg.html
+++ b/htdocs/docs/man/FS/cust_bill_pkg.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_bill_pkg - Object methods for cust_bill_pkg records</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -103,7 +103,7 @@ method.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: cust_bill_pkg.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: cust_bill_pkg.html,v 1.2 2000-03-03 18:22:42 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/cust_credit.html b/htdocs/docs/man/FS/cust_credit.html
index 5683fcd0d..d23fcd7d3 100644
--- a/htdocs/docs/man/FS/cust_credit.html
+++ b/htdocs/docs/man/FS/cust_credit.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_credit - Object methods for cust_credit records</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -107,7 +107,7 @@ replace methods.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: cust_credit.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: cust_credit.html,v 1.2 2000-03-03 18:22:42 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/cust_main.html b/htdocs/docs/man/FS/cust_main.html
index 5e0b8eef7..384e3de15 100644
--- a/htdocs/docs/man/FS/cust_main.html
+++ b/htdocs/docs/man/FS/cust_main.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_main - Object methods for cust_main records</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -92,8 +92,8 @@ FS::Record. The following fields are currently supported:
 <DT><STRONG><A NAME="item_daytime">daytime - phone (optional)</A></STRONG><DD>
 <DT><STRONG><A NAME="item_night">night - phone (optional)</A></STRONG><DD>
 <DT><STRONG><A NAME="item_fax">fax - phone (optional)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_payby">payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_payinfo">payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_payby">payby - `CARD' (credit cards), `BILL' (billing), `COMP' (free), or `PREPAY' (special billing type: applies a credit - see FS::prepay_credit and sets billing type to BILL)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_payinfo">payinfo - card number, P.O., comp issuer (4-8 lowercase alphanumerics; think username) or prepayment identifier (see FS::prepay_credit)</A></STRONG><DD>
 <DT><STRONG><A NAME="item_paydate">paydate - expiration date, mm/yyyy, m/yyyy, mm/yy or m/yy</A></STRONG><DD>
 <DT><STRONG><A NAME="item_payname">payname - name on card or billing name</A></STRONG><DD>
 <DT><STRONG><A NAME="item_tax">tax - tax exempt, empty or `Y'</A></STRONG><DD>
@@ -232,7 +232,7 @@ there is an error, returns the error, otherwise returns false.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: cust_main.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: cust_main.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/cust_main_county.html b/htdocs/docs/man/FS/cust_main_county.html
index a3c1f400c..3362412ac 100644
--- a/htdocs/docs/man/FS/cust_main_county.html
+++ b/htdocs/docs/man/FS/cust_main_county.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_main_county - Object methods for cust_main_county objects</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -97,7 +97,7 @@ replace methods.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: cust_main_county.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: cust_main_county.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/cust_main_invoice.html b/htdocs/docs/man/FS/cust_main_invoice.html
index 2fc22b306..9dc1fde9e 100644
--- a/htdocs/docs/man/FS/cust_main_invoice.html
+++ b/htdocs/docs/man/FS/cust_main_invoice.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_main_invoice - Object methods for cust_main_invoice records</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -110,7 +110,7 @@ Returns the literal email address for this record (or `POST').
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: cust_main_invoice.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: cust_main_invoice.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/cust_pay.html b/htdocs/docs/man/FS/cust_pay.html
index 026745e73..e9ae08a41 100644
--- a/htdocs/docs/man/FS/cust_pay.html
+++ b/htdocs/docs/man/FS/cust_pay.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_pay - Object methods for cust_pay objects</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -97,7 +97,7 @@ method.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: cust_pay.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: cust_pay.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/cust_pay_batch.html b/htdocs/docs/man/FS/cust_pay_batch.html
index 1a5189e6b..d67c12474 100644
--- a/htdocs/docs/man/FS/cust_pay_batch.html
+++ b/htdocs/docs/man/FS/cust_pay_batch.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_pay_batch - Object methods for batch cards</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -112,7 +112,7 @@ repalce methods.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: cust_pay_batch.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: cust_pay_batch.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/cust_pkg.html b/htdocs/docs/man/FS/cust_pkg.html
index e105a30df..d7659f0ce 100644
--- a/htdocs/docs/man/FS/cust_pkg.html
+++ b/htdocs/docs/man/FS/cust_pkg.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_pkg - Object methods for cust_pkg objects</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -217,7 +217,7 @@ possible (see
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: cust_pkg.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: cust_pkg.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/cust_refund.html b/htdocs/docs/man/FS/cust_refund.html
index f1d106c2f..6d6cded8a 100644
--- a/htdocs/docs/man/FS/cust_refund.html
+++ b/htdocs/docs/man/FS/cust_refund.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_refund - Object method for cust_refund objects</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -97,7 +97,7 @@ method.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: cust_refund.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: cust_refund.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/cust_svc.html b/htdocs/docs/man/FS/cust_svc.html
index 060fb7fa6..5e73b17c9 100644
--- a/htdocs/docs/man/FS/cust_svc.html
+++ b/htdocs/docs/man/FS/cust_svc.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_svc - Object method for cust_svc objects</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -107,7 +107,7 @@ A meaningful identifier (username, domain, or mail alias) - The table name
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: cust_svc.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: cust_svc.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/dbdef.html b/htdocs/docs/man/FS/dbdef.html
index 9b8274b29..a986ad95b 100644
--- a/htdocs/docs/man/FS/dbdef.html
+++ b/htdocs/docs/man/FS/dbdef.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::dbdef - Database objects</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
diff --git a/htdocs/docs/man/FS/dbdef_colgroup.html b/htdocs/docs/man/FS/dbdef_colgroup.html
index 9c4f7f43d..8b9e12baf 100644
--- a/htdocs/docs/man/FS/dbdef_colgroup.html
+++ b/htdocs/docs/man/FS/dbdef_colgroup.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::dbdef_colgroup - Column group objects</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
diff --git a/htdocs/docs/man/FS/dbdef_column.html b/htdocs/docs/man/FS/dbdef_column.html
index c753b52f7..6a5ebc3c1 100644
--- a/htdocs/docs/man/FS/dbdef_column.html
+++ b/htdocs/docs/man/FS/dbdef_column.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::dbdef_column - Column object</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -111,7 +111,7 @@ If passed a DBI <CODE>$datasrc</CODE> specifying <A HREF="../DBD/mysql.html">DBD
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: dbdef_column.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: dbdef_column.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/dbdef_index.html b/htdocs/docs/man/FS/dbdef_index.html
index 7a9e5039e..9d0d12a76 100644
--- a/htdocs/docs/man/FS/dbdef_index.html
+++ b/htdocs/docs/man/FS/dbdef_index.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::dbdef_unique.pm - Index object</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
diff --git a/htdocs/docs/man/FS/dbdef_table.html b/htdocs/docs/man/FS/dbdef_table.html
index 7056b0f9b..a2442729f 100644
--- a/htdocs/docs/man/FS/dbdef_table.html
+++ b/htdocs/docs/man/FS/dbdef_table.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::dbdef_table - Table objects</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -137,7 +137,7 @@ applicable) may also be supported in the future.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: dbdef_table.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: dbdef_table.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/dbdef_unique.html b/htdocs/docs/man/FS/dbdef_unique.html
index 73c885c75..201f3aa61 100644
--- a/htdocs/docs/man/FS/dbdef_unique.html
+++ b/htdocs/docs/man/FS/dbdef_unique.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::dbdef_unique.pm - Unique object</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
diff --git a/htdocs/docs/man/FS/part_pkg.html b/htdocs/docs/man/FS/part_pkg.html
index e36b5840c..716b944ce 100644
--- a/htdocs/docs/man/FS/part_pkg.html
+++ b/htdocs/docs/man/FS/part_pkg.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::part_pkg - Object methods for part_pkg objects</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -116,7 +116,7 @@ the insert and replace methods.
 
 <DT><STRONG><A NAME="item_pkg_svc">pkg_svc</A></STRONG><DD>
 <P>
-Returns all FS::pkg_svc objects (see <A HREF="../FS/pkg_svc.html">FS::pkg_svc</A>) for this package definition.
+Returns all FS::pkg_svc objects (see <A HREF="../FS/pkg_svc.html">FS::pkg_svc</A>) for this package definition (with non-zero quantity).
 
 <DT><STRONG><A NAME="item_svcpart">svcpart [ SVCDB ]</A></STRONG><DD>
 <P>
@@ -129,7 +129,7 @@ definition,
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: part_pkg.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: part_pkg.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/part_referral.html b/htdocs/docs/man/FS/part_referral.html
index b6fd2ce89..a11d90348 100644
--- a/htdocs/docs/man/FS/part_referral.html
+++ b/htdocs/docs/man/FS/part_referral.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::part_referral - Object methods for part_referral objects</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -94,7 +94,7 @@ replace methods.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: part_referral.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: part_referral.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/part_svc.html b/htdocs/docs/man/FS/part_svc.html
index fedcbd3bf..95829d1d3 100644
--- a/htdocs/docs/man/FS/part_svc.html
+++ b/htdocs/docs/man/FS/part_svc.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::part_svc - Object methods for part_svc objects</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -97,7 +97,7 @@ insert and replace methods.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: part_svc.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: part_svc.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/pkg_svc.html b/htdocs/docs/man/FS/pkg_svc.html
index 7cd786354..6c8af12c4 100644
--- a/htdocs/docs/man/FS/pkg_svc.html
+++ b/htdocs/docs/man/FS/pkg_svc.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::pkg_svc - Object methods for pkg_svc records</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -109,7 +109,7 @@ Returns the FS::part_svc object (see <A HREF="../FS/part_svc.html">FS::part_svc<
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: pkg_svc.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: pkg_svc.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/svc_Common.html b/htdocs/docs/man/FS/svc_Common.html
index d8d81a0a7..970385b9f 100644
--- a/htdocs/docs/man/FS/svc_Common.html
+++ b/htdocs/docs/man/FS/svc_Common.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::svc_Common - Object method for all svc_ records</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -86,7 +86,7 @@ these methods. Called by the cancel method of FS::cust_pkg (see <A HREF="../FS/c
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: svc_Common.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: svc_Common.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/svc_acct.html b/htdocs/docs/man/FS/svc_acct.html
index 4b307455e..0f8e5b47c 100644
--- a/htdocs/docs/man/FS/svc_acct.html
+++ b/htdocs/docs/man/FS/svc_acct.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::svc_acct - Object methods for svc_acct records</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -184,7 +184,7 @@ Sets any fixed values; see <A HREF="../FS/part_svc.html">FS::part_svc</A>.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: svc_acct.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: svc_acct.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/svc_acct_pop.html b/htdocs/docs/man/FS/svc_acct_pop.html
index 0deee2eac..c94f8cd88 100644
--- a/htdocs/docs/man/FS/svc_acct_pop.html
+++ b/htdocs/docs/man/FS/svc_acct_pop.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::svc_acct_pop - Object methods for svc_acct_pop records</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -61,6 +61,7 @@ inherits from FS::Record. The following fields are currently supported:
 <DT><STRONG><A NAME="item_state">state</A></STRONG><DD>
 <DT><STRONG><A NAME="item_ac">ac - area code</A></STRONG><DD>
 <DT><STRONG><A NAME="item_exch">exch - exchange</A></STRONG><DD>
+<DT><STRONG><A NAME="item_loc">loc - rest of number</A></STRONG><DD>
 </DL>
 <P>
 <HR>
@@ -96,7 +97,7 @@ insert and replace methods.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: svc_acct_pop.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: svc_acct_pop.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/svc_acct_sm.html b/htdocs/docs/man/FS/svc_acct_sm.html
index 2b8348544..d283427e5 100644
--- a/htdocs/docs/man/FS/svc_acct_sm.html
+++ b/htdocs/docs/man/FS/svc_acct_sm.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::svc_acct_sm - Object methods for svc_acct_sm records</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -149,7 +149,7 @@ Sets any fixed values; see <A HREF="../FS/part_svc.html">FS::part_svc</A>.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: svc_acct_sm.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: svc_acct_sm.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/svc_domain.html b/htdocs/docs/man/FS/svc_domain.html
index 9b5e1a53c..bfe58c90b 100644
--- a/htdocs/docs/man/FS/svc_domain.html
+++ b/htdocs/docs/man/FS/svc_domain.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::svc_domain - Object methods for svc_domain records</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -97,6 +97,21 @@ The additional field <EM>email</EM> can be used to manually set the admin contac
 Otherwise, the svc_acct records for this package (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>) are searched. If there is exactly one svc_acct record in the same
 package, it is automatically used. Otherwise an error is returned.
 
+<P>
+If any <EM>soamachine</EM> configuration file exists, an SOA record is added to the domain_record
+table (see &lt;FS::domain_record&gt;).
+
+<P>
+If any machines are defined in the <EM>nsmachines</EM> configuration file, NS records are added to the domain_record table (see <A HREF="../FS/domain_record.html">FS::domain_record</A>).
+
+<P>
+If any machines are defined in the <EM>mxmachines</EM> configuration file, MX records are added to the domain_record table (see <A HREF="../FS/domain_record.html">FS::domain_record</A>).
+
+<P>
+Any problems adding FS::domain_record records will emit warnings, but will
+not return errors from this method. If your configuration files are correct
+you shouln't have any problems.
+
 <DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
 <P>
 Deletes this domain from the database. If there is an error, returns the
@@ -142,8 +157,7 @@ Sets any fixed values; see <A HREF="../FS/part_svc.html">FS::part_svc</A>.
 
 <DT><STRONG><A NAME="item_whois">whois</A></STRONG><DD>
 <P>
-Returns the Net::Whois object corresponding to this domain, or undef if the
-domain is not found in whois.
+Returns the Net::Whois::Domain object (see <A HREF="../Net/Whois.html">Net::Whois</A>) for this domain, or undef if the domain is not found in whois.
 
 <P>
 (If $FS::svc_domain::whois_hack is true, returns that in all cases
@@ -162,7 +176,7 @@ Submits a registration email for this domain.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: svc_domain.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: svc_domain.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/man/FS/type_pkgs.html b/htdocs/docs/man/FS/type_pkgs.html
index aa55cce9d..65fa8c0a7 100644
--- a/htdocs/docs/man/FS/type_pkgs.html
+++ b/htdocs/docs/man/FS/type_pkgs.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>FS::type_pkgs - Object methods for type_pkgs records</TITLE>
-<LINK REV="made" HREF="mailto:ivan@rootwood.sisd.com">
+<LINK REV="made" HREF="mailto:none">
 </HEAD>
 
 <BODY>
@@ -93,7 +93,7 @@ replace methods.
 <HR>
 <H1><A NAME="VERSION">VERSION</A></H1>
 <P>
-$Id: type_pkgs.html,v 1.1 1999-08-04 12:13:27 ivan Exp $
+$Id: type_pkgs.html,v 1.2 2000-03-03 18:22:44 ivan Exp $
 
 <P>
 <HR>
diff --git a/htdocs/docs/upgrade5.html b/htdocs/docs/upgrade5.html
index 2be3c6e1b..f0a080d02 100644
--- a/htdocs/docs/upgrade5.html
+++ b/htdocs/docs/upgrade5.html
@@ -2,7 +2,7 @@
   <title>Upgrading to 1.3.0</title>
 </head>
 <body>
-<h1>Upgrading to 1.3.0 from 1.2.2</h1>
+<h1>Upgrading to 1.2.3 from 1.2.2</h1>
 <ul>
   <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
   <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
diff --git a/htdocs/search/svc_domain.cgi b/htdocs/search/svc_domain.cgi
index bf85e4a73..f1d4ae461 100755
--- a/htdocs/search/svc_domain.cgi
+++ b/htdocs/search/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.10 1999-07-17 10:38:52 ivan Exp $
+# $Id: svc_domain.cgi,v 1.11 2000-03-03 18:22:44 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -15,7 +15,10 @@
 # display total, use FS::CGI now does browsing too ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.10  1999-07-17 10:38:52  ivan
+# Revision 1.11  2000-03-03 18:22:44  ivan
+# changes from 1.2.3 release, fixes from webdemo
+#
+# Revision 1.10  1999/07/17 10:38:52  ivan
 # scott nelson <scott@ultimanet.com> noticed this mod_perl-triggered bug and
 # gave me a great bugreport at the last rhythmethod
 #
@@ -64,6 +67,7 @@ $conf = new FS::Conf;
 $mydomain = $conf->config('domain');
 
 ($query)=$cgi->keywords;
+$query ||= ''; #to avoid use of unitialized value errors
 if ( $query eq 'svcnum' ) {
   $sortby=\*svcnum_sort;
   @svc_domain=qsearch('svc_domain',{});
-- 
cgit v1.2.1


From cb457f9c0242ea9e7acc80b9aaadd0d1c9bf66a9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 3 Mar 2000 18:45:21 +0000
Subject: use Apache::exit instead of exit in &eidiot - Registry wasn't
 overriding exit in modules

---
 FS/FS/CGI.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 3577c14b8..47c034e13 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -123,7 +123,9 @@ Sends headers and an HTML error message, then exits.
 sub eidiot {
   #warn "eidiot depriciated";
   idiot(@_);
-  exit;
+  #exit;
+  use Apache;
+  Apache::exit;
 }
 
 =item popurl LEVEL
-- 
cgit v1.2.1


From 147a12d9488e975954d8c3ced9fba08391922f13 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 5 Mar 2000 05:03:01 +0000
Subject: link to SISD site for HTTP::Headers::UserAgent instead of CPAN

---
 htdocs/docs/signup.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/signup.html b/htdocs/docs/signup.html
index fbd19df62..ce50f1f22 100644
--- a/htdocs/docs/signup.html
+++ b/htdocs/docs/signup.html
@@ -10,7 +10,7 @@ webserver.  On this machine, install:
   <li><a href="ftp://ftp.cs.hut.fi/pub/ssh/">SSH</a>
   <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
   <li><a href="http://www.perl.com/CPAN/modules/by-module/Text/">Text::Template</a>
-  <li><a href="http://www.perl.com/CPAN/modules/by-author/IVAN/">HTTP::Headers::UserAgent</a> (version 2.0 or higher; not yet indexed correctly on CPAN)
+  <li><a href="http://www.sisd.com/useragent">HTTP::Headers::UserAgent</a> (version 2.0 or higher; not yet indexed correctly on CPAN)
 
   <li><a href="man/FS/SignupClient.html">FS::SignupClient</a> (copy the fs_signup/FS-SignupClient directory to the external machine, then: perl Makefile.PL; make; make install)
 </ul>
-- 
cgit v1.2.1


From 236d0a0f93ffa2f7609f930c8af2c507741060ad Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 6 Mar 2000 14:12:57 +0000
Subject: ICRADIUS export support

---
 TODO                    | 40 ++++++++++++++++++++++++++++++++++-
 bin/svc_acct.export     | 56 +++++++++++++++++++++++++++++++++++++++++++++----
 htdocs/docs/config.html |  3 +++
 htdocs/docs/export.html |  7 ++++---
 4 files changed, 98 insertions(+), 8 deletions(-)

diff --git a/TODO b/TODO
index ae39d824e..19baa7228 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.41 2000-01-30 06:11:09 ivan Exp $
+$Id: TODO,v 1.42 2000-03-06 14:12:56 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,44 @@ duplication of effort.
 
 ---
 
+more email which should make it into a more organized TODO list:
+.
+I would also love to see Freeside support bandwidth billing by reading the
+Cisco NetFlow Accounting data so we and other ISP's could automatically bill
+co-located servers and even potentially other virtually hosted sites like
+MUD, Palace Chat, IRC Chat, etc based on the bandwidth they use or average
+sustained rates or whatever. I'm not much of a programmer so I don't know
+what all this entails but I did download a NetFlow client agent/whatever for
+Linux though.
+ .
+It would also be nice to see Freeside be able to read Apache log files and
+bill customers for web traffic that way as an option also. Plus an option to
+bill for excessive disk usage without having to use quotas if you didn't
+want to, would be a nice feature as well. So you could monitor with a script
+or something to see how much disk space a user was using then get some
+average and charge a certain amount for anything above some preset limit for
+that account type. I might be able to hack something like this up, but I'm
+not 100% sure where to start or if there is something out there that could
+be modified or not.
+.
+Do you think that you will ever support the HKS CCVS (Hell's Kitchen
+Software Credit Card Verification Software) since Red Hat bought them out
+and is going to be including that for credit card processing when you buy
+the professional version? What about possibly supporting the OpenCCVS which
+is a GNU/GPL version of a credit card program? I haven't had time to comb
+through the Freeside code to see how hard it would be to add support for
+these as externally called programs.
+.
+Also any thoughts on help desk, and knowledge base stuff? Any thoughts on
+this stuff, and how possible and what kinds of work or time frame would be
+involved?
+.
+Tim Jung
+System Admin
+Internet Gateway Inc.
+tjung@igateway.net
+
+
 
            CVS via SSH (Score:1)
            by platinum (jedgar at fxp dot org) on Thursday September 30, @07:13PM EDT (#4)
diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index d4ebe6bdc..8cdccda1f 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.export,v 1.2 1998-12-10 07:23:15 ivan Exp $
+# $Id: svc_acct.export,v 1.3 2000-03-06 14:12:57 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,16 +38,20 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.2  1998-12-10 07:23:15  ivan
+# Revision 1.3  2000-03-06 14:12:57  ivan
+# ICRADIUS export support
+#
+# Revision 1.2  1998/12/10 07:23:15  ivan
 # use FS::Conf, need user (for datasrc)
 #
 
 use strict;
 use vars qw($conf);
 use Fcntl qw(:flock);
+use IO::Handle;
 use FS::Conf;
-use FS::SSH qw(scp ssh);
-use FS::UID qw(adminsuidsetup datasrc);
+use FS::SSH qw(scp ssh sshopen2);
+use FS::UID qw(adminsuidsetup datasrc dbh);
 use FS::Record qw(qsearch fields);
 use FS::svc_acct;
 
@@ -71,6 +75,17 @@ my @erpcdmachines = $conf->config('erpcdmachines')
 my @radiusmachines = $conf->config('radiusmachines')
   if $conf->exists('radiusmachines');
 
+my $icradiusmachines = $conf->exists('icradiusmachines');
+my @icradiusmachines = $conf->config('icradiusmachines') if $icradiusmachines;
+my $icradius_mysqldest =
+  $conf->config('icradius_mysqldest') || "/usr/local/var/radius"
+    if $icradiusmachines;
+my $icradius_mysqlsource =
+  $conf->config('icradius_mysqlsource') || "/usr/local/var/freeside"
+    if $icradiusmachines;
+my $icradius_dbh = dbh; #could eventually get it from a config file if you're
+                        #not running MySQL for your Freeside database
+
 my(@saltset)= ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
 require 5.004; #srand(time|$$);
 
@@ -119,6 +134,11 @@ chmod 0600, "$spooldir/master.passwd",
             "$spooldir/users",
 ;
 
+if ( $icradiusmachines ) {
+  my $sth = $icradius_dbh->prepare("DELETE FROM radcheck");
+  $sth->execute or die "Can't reset radcheck table: ". $sth->errstr;
+}
+
 setpriority(0,0,10);
 
 my($svc_acct);
@@ -226,6 +246,21 @@ foreach $svc_acct (@svc_acct) {
       print USERS qq(\n\n);
     }
 
+    ###
+    # ICRADIUS export
+    if ( $icradiusmachines ) {
+      my $sth = $icradius_dbh->prepare(
+        "INSERT INTO radcheck ( id, UserName, Attribute, Value ) VALUES ( ".
+        join(", ", map { $icradius_dbh->quote( $_ ) } qw (
+          $svc_acct->svcnum
+          $svc_acct->username
+          "Password"
+          $svc_acct->_password
+        ) ). " )"
+      );
+      $sth->execute or die "Can't insert into radcheck table: ". $sth->errstr;
+   }
+
   }
 
 }
@@ -318,6 +353,19 @@ foreach $radiusmachine (@radiusmachines) {
     == 0 or die "ssh error: $!";
 }
 
+foreach my $icradiusmachine ( @icradiusmachines ) {
+  my( $machine, $db, $user, $pass ) = split(/\s+/, $icradiusmachine);
+  chdir $icradius_mysqlsource or die "Can't cd $icradius_mysqlsource: $!";
+  my($reader,$writer)=(new IO::Handle, new IO::Handle);
+  sshopen2("root\@$machine", $reader, $writer, "mysql --user=$user -p $db");
+  print $writer "$pass\nLOCK TABLES radcheck WRITE;\n";
+  foreach my $file ( glob("radcheck.*") ) {
+    scp($file,"root\@$icradiusmachine:$icradius_mysqldest/$file");
+  }
+  close $writer;
+  close $reader;
+}
+
 unlink $spoollock;
 flock(EXPORT,LOCK_UN);
 close EXPORT;
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index 6f7a2b561..3c7c0bd29 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -37,6 +37,9 @@ All further configuration files and directories are located in
   <li>hidecancelledpackages - The existance of this file will prevent cancelled packages from showing up in listings (though they will still be in the database)
   <li>hidecancelledcustomers - The existance of this file will prevent customers with only cancelled packages from showing up in listings (though they will still be in the database)
   <li>home - For new users, prefixed to usrename to create a directory name.  Should have a leading but not a trailing slash.
+  <li>icradiusmachines - Your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines, one per line.  The existance of this file (even if empty) turns on radcheck table creation (in the freeside database - the radcheck table needs to be created manually).  Machines listed in this file will have the radcheck table exported to them.  Each line of this file should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: "<CODE>radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd</CODE>".  Note that to use ICRADIUS export you need to be using MySQL.
+  <li>icradius_mysqldest - Destination directory for the MySQL radcheck table files, on the ICRADIUS machines.  Defaults to "/usr/local/var/radius".
+  <li>icradius_mysqlsource - Source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".
   <li>invoice_from - Return address on email invoices.
   <li>lpr - Print command for paper invoices, for example `lpr -h'.
   <li>mxmachines - MX entries for new domains, weight and machine, one per line, with trailing `.'
diff --git a/htdocs/docs/export.html b/htdocs/docs/export.html
index 86a2b4ccd..82da86c17 100644
--- a/htdocs/docs/export.html
+++ b/htdocs/docs/export.html
@@ -4,14 +4,15 @@
 <body>
   <h1>File exporting</h1>
   <ul>
-    <li>bin/svc_acct.export will create UNIX <b>passwd</b>, <b>shadow</b> and <b>master.passwd</b> files, ERPCD <b>acp_passwd</b> and <b>acp_dialup</b> files and a RADIUS <b>users</b> file in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattended; see below.  Some RADIUS servers (such as <a href="http://www.open.com.au/radiator/">Radiator</a>) will authenticate directly out of an SQL database.  In these cases,
-it is reccommended that you copy the svc_acct table to an external RADIUS machine rather than run the RADIUS server on your Freeside machine.
+    <li>bin/svc_acct.export will create UNIX <b>passwd</b>, <b>shadow</b> and <b>master.passwd</b> files, ERPCD <b>acp_passwd</b> and <b>acp_dialup</b> files and a RADIUS <b>users</b> file in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Some RADIUS servers (such as <a href="http://www.open.com.au/radiator/">Radiator</a> and <a href="ftp://ftp.cheapnet.net/pub/icradius/">ICRADIUS</a>) will authenticate directly out of an SQL database.  In these cases,
+it is reccommended that you replicate the data to an external RADIUS machine rather than running the RADIUS server on your Freeside machine.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattended:
       <ul>
         <li>shellmachines - <b>passwd</b> and <b>shadow</b> are copied to the remote machine as <b>/etc/passwd.new</b> and <b>/etc/shadow.new</b> and then moved to <b>/etc/passwd</b> and <b>/etc/shadow</b> if no errors occur.
         <li>bsdshellmachines - <b>passwd</b> and <b>master.passwd</b> are copied to the remote machine as <b>/etc/passwd.new</b> and <b>/etc/master.passwd.new</b> and moved to <b>/etc/passwd</b> and <b>/etc/master.passwd</b> if no errors occur.
         <li>nismachines - <b>passwd</b> and <b>shadow</b> are copied to the <b>/etc/global</b> directory on the remote machine.  If no errors occur, the command <b>( cd /var/yp; make; )</b> is executed on the remote machine.
         <li>erpcdmachines - <b>acp_passwd</b> and <b>acp_dialup</b> are copied to the <b>/usr/annex</b> directory on the remote machine.  If no errors occur, the command <b>( kill -USR1 `cat /usr/annex/erpcd.pid` )</b> is executed on the remote machine. 
         <li>radiusmachines - <b>users</b> is copied to the <b>/etc/raddb</b> directory on the remote machine.  If no errors occur, the command <b>( builddbm )</b> is executed on the remote machine.
+        <li>icradiusmachines - A local radcheck file will be created.  If any machines are specified, the remote MySQL database will be locked and the radcheck table will be copied to the those machines.  You may also need to set the icradius_mysqlsource and/or icradius_mysqldest <a href="config.html">configuration files</a>.
       </ul>
     <li>site_perl/svc_acct.pm - If a shellmachine is defined, users can be created, modified and deleted remotely; see below.
       <ul>
@@ -19,7 +20,7 @@ it is reccommended that you copy the svc_acct table to an external RADIUS machin
         <li>The command <b>userdel <i>username</i></b> is executed with a user is deleted.
         <li>If a user's home directory changes, the command <b>[ -d <i>old_homedir</i> &amp;&amp; ( chmod u+t <i>old_homedir</i>; umask 022; mkdir <i>new_homedir</i>; cd <i>old_homedir</i>; find . -depth -print | cpio -pdm <i>new_homedir</i>; chmod u-t <i>new_homedir</i>; chown -R <i>uid</i>.<i>gid</i> <i>new_homedir</i>; rm -rf <i>old_homedir</i> )</b> is executed.
       </ul>
-    <li>bin/svc_acct_sm.export will create <a href="http://www.qmail.org">Qmail</a> <b>rcpthosts</b>, <b>recipientmap</b> and <b>virtualdomains</b> files and <a href="http://www.sendmail.org">Sendmail</a> <b>virtusertable</b> and <b>sendmail.cw</b> files in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattemded; see below.
+    <li>bin/svc_acct_sm.export will create <a href="http://www.qmail.org">Qmail</a> <b>rcpthosts</b>, <b>recipientmap</b> and <b>virtualdomains</b> files and <a href="http://www.sendmail.org">Sendmail</a> <b>virtusertable</b> and <b>sendmail.cw</b> files in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattemded:
       <ul>
         <li>qmailmachines - <b>recipientmap</b>, <b>virtualdomains</b> and <b>rcpthosts</b> are copied to the <b>/var/qmail/control</b> directory on the remote machine.  Note: If you <a href="legacy.html#svc_acct_sm">imported</a> qmail configuration files, run the generated <b>/usr/local/etc/freeside/export.<i>datasrc</i>/virtualdomains.FIX</b> on a machine with your user home directories before exporting qmail configuration files.
         <li>shellmachine - The command <b>[ -e <i>homedir</i>/.qmail-default ] || { touch <i>homedir</i>/.qmail-default; chown <i>uid</i>.<i>gid</i> <i>homedir</i>/.qmail-default; }</b> will be run on this machine for users in the virtualdomains file.
-- 
cgit v1.2.1


From b70cf8e6aaeeef34baae4542f389ceab20f4f37d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 6 Mar 2000 14:19:15 +0000
Subject: ICRADIUS export bugfix

---
 bin/svc_acct.export     | 8 ++++----
 htdocs/docs/config.html | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 8cdccda1f..8bec4aa79 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.export,v 1.3 2000-03-06 14:12:57 ivan Exp $
+# $Id: svc_acct.export,v 1.4 2000-03-06 14:19:15 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,8 +38,8 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.3  2000-03-06 14:12:57  ivan
-# ICRADIUS export support
+# Revision 1.4  2000-03-06 14:19:15  ivan
+# ICRADIUS export bugfix
 #
 # Revision 1.2  1998/12/10 07:23:15  ivan
 # use FS::Conf, need user (for datasrc)
@@ -360,7 +360,7 @@ foreach my $icradiusmachine ( @icradiusmachines ) {
   sshopen2("root\@$machine", $reader, $writer, "mysql --user=$user -p $db");
   print $writer "$pass\nLOCK TABLES radcheck WRITE;\n";
   foreach my $file ( glob("radcheck.*") ) {
-    scp($file,"root\@$icradiusmachine:$icradius_mysqldest/$file");
+    scp($file,"root\@$icradiusmachine:$icradius_mysqldest/$db/$file");
   }
   close $writer;
   close $reader;
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index 3c7c0bd29..fe1cce23d 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -38,7 +38,7 @@ All further configuration files and directories are located in
   <li>hidecancelledcustomers - The existance of this file will prevent customers with only cancelled packages from showing up in listings (though they will still be in the database)
   <li>home - For new users, prefixed to usrename to create a directory name.  Should have a leading but not a trailing slash.
   <li>icradiusmachines - Your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines, one per line.  The existance of this file (even if empty) turns on radcheck table creation (in the freeside database - the radcheck table needs to be created manually).  Machines listed in this file will have the radcheck table exported to them.  Each line of this file should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: "<CODE>radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd</CODE>".  Note that to use ICRADIUS export you need to be using MySQL.
-  <li>icradius_mysqldest - Destination directory for the MySQL radcheck table files, on the ICRADIUS machines.  Defaults to "/usr/local/var/radius".
+  <li>icradius_mysqldest - Destination directory for the MySQL databases, on the ICRADIUS machines.  Defaults to "/usr/local/var/".
   <li>icradius_mysqlsource - Source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".
   <li>invoice_from - Return address on email invoices.
   <li>lpr - Print command for paper invoices, for example `lpr -h'.
-- 
cgit v1.2.1


From b5fa754313f4c98d50071a747046ee48fde0ef44 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 6 Mar 2000 14:46:41 +0000
Subject: not setuid or run by malicious user - no -T necessary

---
 bin/svc_acct.export | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 8bec4aa79..725504690 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
-#!/usr/bin/perl -Tw
+#!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.4 2000-03-06 14:19:15 ivan Exp $
+# $Id: svc_acct.export,v 1.5 2000-03-06 14:46:41 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,8 +38,8 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.4  2000-03-06 14:19:15  ivan
-# ICRADIUS export bugfix
+# Revision 1.5  2000-03-06 14:46:41  ivan
+# not setuid or run by malicious user - no -T necessary
 #
 # Revision 1.2  1998/12/10 07:23:15  ivan
 # use FS::Conf, need user (for datasrc)
-- 
cgit v1.2.1


From cd2eb2ec0256884b5e06fae6b7a9d9fb9dc7e2c3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 6 Mar 2000 14:48:29 +0000
Subject: s/icradiusmachine/machine/

---
 bin/svc_acct.export | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 725504690..a638a3261 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.5 2000-03-06 14:46:41 ivan Exp $
+# $Id: svc_acct.export,v 1.6 2000-03-06 14:48:29 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,8 +38,8 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.5  2000-03-06 14:46:41  ivan
-# not setuid or run by malicious user - no -T necessary
+# Revision 1.6  2000-03-06 14:48:29  ivan
+# s/icradiusmachine/machine/
 #
 # Revision 1.2  1998/12/10 07:23:15  ivan
 # use FS::Conf, need user (for datasrc)
@@ -360,7 +360,7 @@ foreach my $icradiusmachine ( @icradiusmachines ) {
   sshopen2("root\@$machine", $reader, $writer, "mysql --user=$user -p $db");
   print $writer "$pass\nLOCK TABLES radcheck WRITE;\n";
   foreach my $file ( glob("radcheck.*") ) {
-    scp($file,"root\@$icradiusmachine:$icradius_mysqldest/$db/$file");
+    scp($file,"root\@$machine:$icradius_mysqldest/$db/$file");
   }
   close $writer;
   close $reader;
-- 
cgit v1.2.1


From a19e9126e3bd79719e1bddd7f77381c613a157f4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 6 Mar 2000 14:50:15 +0000
Subject: oop

---
 bin/svc_acct.export | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index a638a3261..ef3edc2e2 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.6 2000-03-06 14:48:29 ivan Exp $
+# $Id: svc_acct.export,v 1.7 2000-03-06 14:50:15 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,8 +38,8 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.6  2000-03-06 14:48:29  ivan
-# s/icradiusmachine/machine/
+# Revision 1.7  2000-03-06 14:50:15  ivan
+# oop
 #
 # Revision 1.2  1998/12/10 07:23:15  ivan
 # use FS::Conf, need user (for datasrc)
@@ -78,7 +78,7 @@ my @radiusmachines = $conf->config('radiusmachines')
 my $icradiusmachines = $conf->exists('icradiusmachines');
 my @icradiusmachines = $conf->config('icradiusmachines') if $icradiusmachines;
 my $icradius_mysqldest =
-  $conf->config('icradius_mysqldest') || "/usr/local/var/radius"
+  $conf->config('icradius_mysqldest') || "/usr/local/var/"
     if $icradiusmachines;
 my $icradius_mysqlsource =
   $conf->config('icradius_mysqlsource') || "/usr/local/var/freeside"
-- 
cgit v1.2.1


From 2cc9708011a232237189440f254aea31d4ac2022 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 6 Mar 2000 14:51:27 +0000
Subject: eek

---
 bin/svc_acct.export | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index ef3edc2e2..d2f746c0e 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.7 2000-03-06 14:50:15 ivan Exp $
+# $Id: svc_acct.export,v 1.8 2000-03-06 14:51:27 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,8 +38,8 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.7  2000-03-06 14:50:15  ivan
-# oop
+# Revision 1.8  2000-03-06 14:51:27  ivan
+# eek
 #
 # Revision 1.2  1998/12/10 07:23:15  ivan
 # use FS::Conf, need user (for datasrc)
@@ -251,11 +251,11 @@ foreach $svc_acct (@svc_acct) {
     if ( $icradiusmachines ) {
       my $sth = $icradius_dbh->prepare(
         "INSERT INTO radcheck ( id, UserName, Attribute, Value ) VALUES ( ".
-        join(", ", map { $icradius_dbh->quote( $_ ) } qw (
-          $svc_acct->svcnum
-          $svc_acct->username
-          "Password"
-          $svc_acct->_password
+        join(", ", map { $icradius_dbh->quote( $_ ) } (
+          $svc_acct->svcnum,
+          $svc_acct->username,
+          "Password",
+          $svc_acct->_password,
         ) ). " )"
       );
       $sth->execute or die "Can't insert into radcheck table: ". $sth->errstr;
-- 
cgit v1.2.1


From c3f5321527ad8783f81c65f39cbb1f3612cec2e5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 6 Mar 2000 14:59:06 +0000
Subject: s/sshopen2/sshopen3/ to prevent spurious mysql "Enter password: "
 dialog from showing up in cron/terminal

---
 bin/svc_acct.export | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index d2f746c0e..303c6d28a 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.8 2000-03-06 14:51:27 ivan Exp $
+# $Id: svc_acct.export,v 1.9 2000-03-06 14:59:06 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,8 +38,9 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.8  2000-03-06 14:51:27  ivan
-# eek
+# Revision 1.9  2000-03-06 14:59:06  ivan
+# s/sshopen2/sshopen3/ to prevent spurious mysql "Enter password: " dialog from
+# showing up in cron/terminal
 #
 # Revision 1.2  1998/12/10 07:23:15  ivan
 # use FS::Conf, need user (for datasrc)
@@ -50,7 +51,7 @@ use vars qw($conf);
 use Fcntl qw(:flock);
 use IO::Handle;
 use FS::Conf;
-use FS::SSH qw(scp ssh sshopen2);
+use FS::SSH qw(scp ssh sshopen3);
 use FS::UID qw(adminsuidsetup datasrc dbh);
 use FS::Record qw(qsearch fields);
 use FS::svc_acct;
@@ -356,14 +357,17 @@ foreach $radiusmachine (@radiusmachines) {
 foreach my $icradiusmachine ( @icradiusmachines ) {
   my( $machine, $db, $user, $pass ) = split(/\s+/, $icradiusmachine);
   chdir $icradius_mysqlsource or die "Can't cd $icradius_mysqlsource: $!";
-  my($reader,$writer)=(new IO::Handle, new IO::Handle);
-  sshopen2("root\@$machine", $reader, $writer, "mysql --user=$user -p $db");
+  my($reader,$writer,$error)=(new IO::Handle, new IO::Handle, new IO::Handle);
+  sshopen3("root\@$machine", $reader, $writer, $error,
+    "mysql --user=$user -p $db"
+  );
   print $writer "$pass\nLOCK TABLES radcheck WRITE;\n";
   foreach my $file ( glob("radcheck.*") ) {
     scp($file,"root\@$machine:$icradius_mysqldest/$db/$file");
   }
   close $writer;
   close $reader;
+  close $error;
 }
 
 unlink $spoollock;
-- 
cgit v1.2.1


From 089181476b72019013be25c540d71f862e805012 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 6 Mar 2000 15:04:59 +0000
Subject: bug in IPC::Open3 documentation?

---
 FS/FS/SSH.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/SSH.pm b/FS/FS/SSH.pm
index 84ac06b44..0caae879e 100644
--- a/FS/FS/SSH.pm
+++ b/FS/FS/SSH.pm
@@ -121,7 +121,8 @@ Connects the supplied filehandles to the ssh process (in batch mode).
 
 sub sshopen3 {
   my($host,$writer,$reader,$error,$command)=@_;
-  open3($writer,$reader,$error,$ssh,'-o','Batchmode yes',$host,$command);
+  #open3($writer,$reader,$error,$ssh,'-o','Batchmode yes',$host,$command);
+  open3($reader,$writer,$error,$ssh,'-o','Batchmode yes',$host,$command);
 }
 
 sub _yesno {
-- 
cgit v1.2.1


From 0eadaa520cb08c57df5ffb196b7e98956bc2849c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 6 Mar 2000 15:15:26 +0000
Subject: backout silly change

---
 FS/FS/SSH.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/FS/FS/SSH.pm b/FS/FS/SSH.pm
index 0caae879e..84ac06b44 100644
--- a/FS/FS/SSH.pm
+++ b/FS/FS/SSH.pm
@@ -121,8 +121,7 @@ Connects the supplied filehandles to the ssh process (in batch mode).
 
 sub sshopen3 {
   my($host,$writer,$reader,$error,$command)=@_;
-  #open3($writer,$reader,$error,$ssh,'-o','Batchmode yes',$host,$command);
-  open3($reader,$writer,$error,$ssh,'-o','Batchmode yes',$host,$command);
+  open3($writer,$reader,$error,$ssh,'-o','Batchmode yes',$host,$command);
 }
 
 sub _yesno {
-- 
cgit v1.2.1


From 18439f1f53ba238bf9fba7580fce34d844827109 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 6 Mar 2000 15:59:19 +0000
Subject: finally get MySQL locking working for ICRADIUS export

---
 bin/svc_acct.export | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 303c6d28a..1e1a16318 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.9 2000-03-06 14:59:06 ivan Exp $
+# $Id: svc_acct.export,v 1.10 2000-03-06 15:59:19 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,9 +38,8 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.9  2000-03-06 14:59:06  ivan
-# s/sshopen2/sshopen3/ to prevent spurious mysql "Enter password: " dialog from
-# showing up in cron/terminal
+# Revision 1.10  2000-03-06 15:59:19  ivan
+# finally get MySQL locking working for ICRADIUS export
 #
 # Revision 1.2  1998/12/10 07:23:15  ivan
 # use FS::Conf, need user (for datasrc)
@@ -358,16 +357,13 @@ foreach my $icradiusmachine ( @icradiusmachines ) {
   my( $machine, $db, $user, $pass ) = split(/\s+/, $icradiusmachine);
   chdir $icradius_mysqlsource or die "Can't cd $icradius_mysqlsource: $!";
   my($reader,$writer,$error)=(new IO::Handle, new IO::Handle, new IO::Handle);
-  sshopen3("root\@$machine", $reader, $writer, $error,
-    "mysql --user=$user -p $db"
-  );
-  print $writer "$pass\nLOCK TABLES radcheck WRITE;\n";
+  open(WRITER,"|ssh root\@$machine mysql -v --user=$user -p $db");
+  my $oldfh = select WRITER; $|=1; select $oldfh;
+  print WRITER "$pass\n"; sleep 2; print WRITER "LOCK TABLES radcheck WRITE;\n";
   foreach my $file ( glob("radcheck.*") ) {
     scp($file,"root\@$machine:$icradius_mysqldest/$db/$file");
   }
-  close $writer;
-  close $reader;
-  close $error;
+  close WRITER;
 }
 
 unlink $spoollock;
-- 
cgit v1.2.1


From 4ac60147a2fe3734530149c1f72788e1d555abbd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 6 Mar 2000 16:00:39 +0000
Subject: sync up with working versoin

---
 bin/svc_acct.export | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 1e1a16318..47df3d169 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.10 2000-03-06 15:59:19 ivan Exp $
+# $Id: svc_acct.export,v 1.11 2000-03-06 16:00:39 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,8 +38,8 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.10  2000-03-06 15:59:19  ivan
-# finally get MySQL locking working for ICRADIUS export
+# Revision 1.11  2000-03-06 16:00:39  ivan
+# sync up with working versoin
 #
 # Revision 1.2  1998/12/10 07:23:15  ivan
 # use FS::Conf, need user (for datasrc)
@@ -50,7 +50,7 @@ use vars qw($conf);
 use Fcntl qw(:flock);
 use IO::Handle;
 use FS::Conf;
-use FS::SSH qw(scp ssh sshopen3);
+use FS::SSH qw(scp ssh);
 use FS::UID qw(adminsuidsetup datasrc dbh);
 use FS::Record qw(qsearch fields);
 use FS::svc_acct;
@@ -356,7 +356,6 @@ foreach $radiusmachine (@radiusmachines) {
 foreach my $icradiusmachine ( @icradiusmachines ) {
   my( $machine, $db, $user, $pass ) = split(/\s+/, $icradiusmachine);
   chdir $icradius_mysqlsource or die "Can't cd $icradius_mysqlsource: $!";
-  my($reader,$writer,$error)=(new IO::Handle, new IO::Handle, new IO::Handle);
   open(WRITER,"|ssh root\@$machine mysql -v --user=$user -p $db");
   my $oldfh = select WRITER; $|=1; select $oldfh;
   print WRITER "$pass\n"; sleep 2; print WRITER "LOCK TABLES radcheck WRITE;\n";
-- 
cgit v1.2.1


From e3aaca5c08b8b39627978eb30d10dfb241946b93 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 6 Mar 2000 16:38:42 +0000
Subject: better error message.  bah.

---
 FS/FS/svc_acct.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 079508b84..fcd8030df 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -348,7 +348,7 @@ sub check {
   $recref->{username} = $1;
   $recref->{username} =~ /[a-z]/ or return "Illegal username";
 
-  $recref->{popnum} =~ /^(\d*)$/ or return "Illegal popnum";
+  $recref->{popnum} =~ /^(\d*)$/ or return "Illegal popnum: ".$recref->{popnum};
   $recref->{popnum} = $1;
   return "Unkonwn popnum" unless
     ! $recref->{popnum} ||
@@ -450,7 +450,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.2 1999-08-12 00:05:03 ivan Exp $
+$Id: svc_acct.pm,v 1.3 2000-03-06 16:38:42 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 44261274cf5d0bf453005c50d43050143cd18774 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Apr 2000 02:32:57 +0000
Subject: accept anything in ARGV for -d Date::Parse

---
 FS/bin/freeside-bill | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill
index 417df767b..208f92071 100755
--- a/FS/bin/freeside-bill
+++ b/FS/bin/freeside-bill
@@ -72,7 +72,9 @@ foreach $cust_main (
 
 sub untaint_argv {
   foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    $ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
+    #$ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
+    # Date::Parse
+    $ARGV[$_] =~ /^(.*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
     $ARGV[$_]=$1;
   }
 }
@@ -112,7 +114,7 @@ customers.  Otherwise, bills all customers.
 
 =head1 VERSION
 
-$Id: freeside-bill,v 1.3 1999-10-04 08:23:26 ivan Exp $
+$Id: freeside-bill,v 1.4 2000-04-03 02:32:57 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From e7004fed34b31db9e27020cc69f9723d1059cfd3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Apr 2000 00:06:27 +0000
Subject: CGI.pm detects mod_perl and calls appropriate exit (Registry's
 override doesn't work here)

---
 FS/FS/CGI.pm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 47c034e13..1e8fca644 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -123,9 +123,14 @@ Sends headers and an HTML error message, then exits.
 sub eidiot {
   #warn "eidiot depriciated";
   idiot(@_);
-  #exit;
-  use Apache;
-  Apache::exit;
+  if (exists $ENV{MOD_PERL}) {
+    eval {
+      use Apache;
+      Apache::exit();
+    };
+  } else {
+    exit;
+  }
 }
 
 =item popurl LEVEL
-- 
cgit v1.2.1


From 11df841f26fa4b5f6531109cbf0db87a376cfc3c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 May 2000 23:57:57 +0000
Subject: Netscape CCK autoconfiguration support

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 67 ++++++++++++++++++++++----------
 fs_signup/cck.template                   | 14 +++++++
 2 files changed, 60 insertions(+), 21 deletions(-)
 create mode 100644 fs_signup/cck.template

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 48376c219..839ad333d 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,15 +1,15 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.6 2000-03-01 08:14:30 ivan Exp $
+# $Id: signup.cgi,v 1.7 2000-05-10 23:57:57 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $r $error
              $last $first $ss $company $address1 $address2 $city $state $county
              $country $zip $daytime $night $fax $invoicing_list $payby $payinfo
              $paydate $payname $pkgpart $username $password $popnum
-             $ieak_file $ieak_template $ac $exch $loc
+             $ieak_file $ieak_template $cck_file $cck_template
+             $ac $exch $loc
            );
-             #$ieak_docroot $ieak_baseurl
 use subs qw( print_form print_okay expselect );
 
 use CGI;
@@ -26,6 +26,7 @@ use Text::Template;
 @payby = qw( CARD PREPAY );
 
 $ieak_file = '/usr/local/freeside/ieak.template';
+$cck_file = '/usr/local/freeside/cck.template';
 
 if ( -e $ieak_file ) {
   $ieak_template = new Text::Template ( TYPE => 'FILE', SOURCE => $ieak_file )
@@ -33,14 +34,12 @@ if ( -e $ieak_file ) {
 } else {
   $ieak_template = '';
 }
-
-#	#to enable ieak signups, you need to specify a directory in the web server's
-#	#document space and the equivalent base URL
-#	#
-#	$ieak_docroot = "/var/www/sisd.420.am/freeside/ieak";
-#	$ieak_baseurl = "http://sisd.420.am/freeside/ieak";
-
-#srand (time ^ $$ ^ unpack "%L*", `ps axww | gzip`);
+if ( -e $cck_file ) {
+  $cck_template = new Text::Template ( TYPE => 'FILE', SOURCE => $cck_file )
+    or die "Couldn't construct template: $Text::Template::ERROR";
+} else {
+  $cck_template = '';
+}
 
 ( $locales, $packages, $pops ) = signup_info();
 
@@ -293,24 +292,41 @@ END
 
 sub print_okay {
   my $user_agent = new HTTP::Headers::UserAgent $ENV{HTTP_USER_AGENT};
+
+  $cgi->param('username') =~ /^(.+)$/
+    or die "fatal: invalid username got past FS::SignupClient::new_customer";
+  my $username = $1;
+  $cgi->param('_password') =~ /^(.+)$/
+    or die "fatal: invalid password got past FS::SignupClient::new_customer";
+  my $password = $1;
+  ( $cgi->param('first'). ' '. $cgi->param('last') ) =~ /^(.*)$/
+    or die "fatal: invalid email_name got past FS::SignupCLient::new_customer";
+  my $email_name = $1;
+
+  my $pop = pop_info($cgi->param('popnum'))
+    or die "fatal: invalid popnum got past FS::SignupClient::new_customer";
+  my ( $ac, $exch, $loc ) = ( $pop->{'ac'}, $pop->{'exch'}, $pop->{'loc'} );
+
   if ( $ieak_template
        && $user_agent->platform eq 'ia32'
        && $user_agent->os =~ /^win/
        && ($user_agent->browser)[0] eq 'IE'
      )
   { #send an IEAK config
-    my $username = $cgi->param('username');
-    my $password = $cgi->param('_password');
-    my $email_name = $cgi->param('first'). ' '. $cgi->param('last');
-
     print $cgi->header('application/x-Internet-signup'),
           $ieak_template->fill_in();
-
-#    my $ins_file = rand(4294967296). ".ins";
-#    open(INS_FILE, ">$ieak_docroot/$ins_file");
-#    print INS_FILE <<END;
-#    close INS_FILE;
-#    print $cgi->redirect("$ieak_docroot/$ins_file");
+  } elsif ( $cck_template
+            && $user_agent->platform eq 'ia32'
+            && $user_agent->os =~ /^win/
+            && ($user_agent->browser)[0] eq 'Netscape'
+          )
+  { #send a Netscape config
+    my $cck_data = $cck_template->fill_in();
+    print $cgi->header('application/x-netscape-autoconfigure-dialer-v2'),
+          map {
+            m/(.*)\s+(.*)$/;
+            pack("N", length($1)). $1. pack("N", length($2)). $2;
+          } split(/\n/, $cck_data);
 
   } else { #send a simple confirmation
     print $cgi->header( '-expires' => 'now' ), <<END;
@@ -323,6 +339,15 @@ END
   }
 }
 
+sub pop_info {
+  my $popnum = shift;
+  my $pop;
+  foreach $pop ( @{$pops} ) {
+    if ( $pop->{'popnum'} == $popnum ) { return $pop; }
+  }
+  '';
+}
+
 sub expselect {
   my $prefix = shift;
   my $date = shift || '';
diff --git a/fs_signup/cck.template b/fs_signup/cck.template
new file mode 100644
index 000000000..f1db554b1
--- /dev/null
+++ b/fs_signup/cck.template
@@ -0,0 +1,14 @@
+SITE_FILE	8chrfile
+SITE_NAME	YourISP
+LOGIN	{ $username }
+PASSWORD	{ $password }
+PHONE_NUM	+1({ $ac }){ $exch }-{ $loc }
+DNS_ADDR	10.0.0.1
+DNS_ADDR2	10.0.0.2
+NNTP_HOST	news.yourisp.com
+SMTP_HOST	mail.yourisp.com
+DOMAIN_NAME	yourisp.com
+POP_SERVER	{ $username }@mail.yourisp.com
+POP_PASSWORD	{ $password }
+HOME_URL	http://www.yourisp.com
+EMAIL_ADDR	{ $username }@yourisp.com
-- 
cgit v1.2.1


From 29ac7c07924cb5a6af7fa978eb8ff5037b7bea31 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 May 2000 00:04:13 +0000
Subject: Netscape CCK docuementation

---
 htdocs/docs/signup.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/htdocs/docs/signup.html b/htdocs/docs/signup.html
index ce50f1f22..6f1e03930 100644
--- a/htdocs/docs/signup.html
+++ b/htdocs/docs/signup.html
@@ -42,6 +42,16 @@ Optional:
     <li>$email_name - first and last name
   </ul>
   (an example file is included as <b>fs_signup/ieak.template</b>)
+  <li>If you create a <b>/usr/local/freeside/cck.template</b> file on the external machine, the variables defined will be sent to Netscape users with MIME type <i>application/x-netscape-autoconfigure-dialer-v2</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the following variables available:
+  <ul>
+    <li>$ac - area code of selected POP
+    <li>$exch - exchange of selected POP
+    <li>$loc - local part of selected POP
+    <li>$username
+    <li>$password
+    <li>$email_name - first and last name
+  </ul>
+  (an example file is included as <b>fs_signup/cck.template</b>).  See the <a href="http://help.netscape.com/products/client/mc/acctproc4.html">Netscape documentation</a> for more information.
   <li>If there are any entries in the <i>prepay_credit</i> table, a user can enter a string matching the <b>identifier</i> column to receive the credit specified in the <b>amount</b> column, after which that <b>identifier</b> is no longer valid.  This can be used to implement pre-paid "calling card" type signups.  The <i>bin/generate-prepay</i> script can be used to populate the <i>prepay_credit</i> table.
 </ul>
 </body>
-- 
cgit v1.2.1


From 6985720e3772d9244468e12cd22753e85fb304de Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 13 May 2000 21:42:20 +0000
Subject: add kristian, update joel's entry

---
 CREDITS | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CREDITS b/CREDITS
index 3ec57a4c2..90a915860 100644
--- a/CREDITS
+++ b/CREDITS
@@ -35,8 +35,8 @@ release.
 
 Greg Kuhnert <gregk@no1.com.au> sent some documentation updates.
 
-Joel Griffiths <griff@aver-computer.com> contribued many bugfixes, and offers
-invaluable help to users on the mailing list.
+Joel Griffiths <griff@aver-computer.com> contribued many bugfixes as well as
+the print-batch script.
 
 NetLoud <http://www.netloud.com/> funded the development of the following
 features:
@@ -48,5 +48,8 @@ features:
   - DNS tracking and export to BIND configuration files
   - Web site virtual host tracking and export to Apache configuration files
 
+Kristian Hoffmann <khoff@pc-intouch.com> contributed Netscape CCK
+autoconfiguration support for the signup server.
+
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
-- 
cgit v1.2.1


From f38f7128e7058d102ac7898e0f06deaf4d1fd538 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 13 May 2000 21:50:12 +0000
Subject: cgisuidsetup takes an Apache object as well as a CGI object now.

---
 FS/FS/CGI.pm |  4 ++--
 FS/FS/UID.pm | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 1e8fca644..198477ce6 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -141,8 +141,8 @@ Returns current URL with LEVEL levels of path removed from the end (default 0).
 
 sub popurl {
   my($up)=@_;
-  my($cgi)=&FS::UID::cgi;
-  my($url)=new URI::URL $cgi->url;
+  my $cgi = &FS::UID::cgi;
+  my $url = new URI::URL ( $cgi->isa('Apache') ? $cgi->uri : $cgi->url );
   my(@path)=$url->path_components;
   splice @path, 0-$up;
   $url->path_components(@path);
diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 2315c266d..2cee65d11 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -98,8 +98,10 @@ sub cgisuidsetup {
   $cgi=shift;
   if ( $cgi->isa('CGI::Base') ) {
     carp "Use of CGI::Base is depriciated";
+  } elsif ( $cgi->isa('Apache') ) {
+
   } elsif ( ! $cgi->isa('CGI') ) {
-    croak "Pass a CGI object to cgisuidsetup!";
+    croak "fatal: unrecognized object $cgi";
   }
   cgisetotaker; 
   adminsuidsetup($user);
@@ -112,6 +114,7 @@ Returns the CGI (see L<CGI>) object.
 =cut
 
 sub cgi {
+  carp "warning: \$FS::UID::cgi isa Apache" if $cgi->isa('Apache');
   $cgi;
 }
 
@@ -167,8 +170,10 @@ sub cgisetotaker {
     $user = lc ( $cgi->var('REMOTE_USER') );
   } elsif ( $cgi && $cgi->isa('CGI') && defined $cgi->remote_user ) {
     $user = lc ( $cgi->remote_user );
+  } elsif ( $cgi && $cgi->isa('Apache') ) {
+    $user = lc ( $cgi->connection->user );
   } else {
-    die "fatal: Can't get REMOTE_USER!";
+    die "fatal: Can't get REMOTE_USER! for cgi $cgi";
   }
   $user;
 }
@@ -241,7 +246,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: UID.pm,v 1.2 2000-05-13 21:50:12 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 62a808f08c065aa5a29fb9cbf6b7108fe4cb8d15 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 13 May 2000 21:57:56 +0000
Subject: add print_batch script from Joel Griffiths

---
 FS/bin/freeside-print-batch | 266 ++++++++++++++++++++++++++++++++++++++++++++
 TODO                        |  68 ++++++++++-
 htdocs/docs/billing.html    |  12 +-
 3 files changed, 340 insertions(+), 6 deletions(-)
 create mode 100755 FS/bin/freeside-print-batch

diff --git a/FS/bin/freeside-print-batch b/FS/bin/freeside-print-batch
new file mode 100755
index 000000000..c1a25edb2
--- /dev/null
+++ b/FS/bin/freeside-print-batch
@@ -0,0 +1,266 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+#use Date::Format;
+use Time::Local;
+use Getopt::Std;
+use FS::Conf;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch);
+use FS::cust_pay;
+use FS::cust_pay_batch;
+
+# Get the currennt time and date
+my $time = time;
+my ($sec,$min,$hour,$mday,$mon,$year) =
+	(localtime($time) )[0,1,2,3,4,5]; 
+my $_date =
+	timelocal($sec,$min,$hour,$mday,$mon,$year);
+
+# Set the mail program
+my $mail_program = "/usr/sbin/sendmail -t -n"; 
+
+&untaint_argv;	#what it sounds like  (eww)
+use vars qw($opt_v $opt_p $opt_e $opt_a $opt_d);
+getopts("vpead");	#switches
+
+# Login to the database
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+# Get the needed configuration files
+my $conf = new FS::Conf;
+my $lpr = $conf->config('lpr');
+my $email = $conf->config('email');
+
+my(@batch)=qsearch('cust_pay_batch',{});
+if (scalar(@batch) == 0)
+{
+	exit 1;
+}
+
+# Open print and email pipes
+# $lpr and opt_p for printing
+# $email and opt_e for email
+# 
+if ($lpr && $main::opt_p)
+{
+	open(LPR, "|$lpr");
+	print LPR qq~C R E D I T  C A R D  P A Y M E N T S  D U E $mon/$mday/$year\n\n~;
+}
+
+if ($email && $main::opt_e)
+{
+	open (MAIL, "|$mail_program");
+	print MAIL <<END
+To: $email
+From: Account Processor
+Subject: CREDIT CARD PAYMENTS DUE
+
+
+C R E D I T  C A R D  P A Y M E N T S  D U E $mon/$mday/$year
+END
+}
+
+# Now I can start looping
+foreach my $cust_pay_batch (@batch)
+{
+	my $state = $cust_pay_batch->getfield('state');
+	my $zip = $cust_pay_batch->getfield('zip');
+	my $amount = $cust_pay_batch->getfield('amount');
+	my $last = $cust_pay_batch->getfield('last');
+	my $address1 = $cust_pay_batch->getfield('address1');
+	my $address2 = $cust_pay_batch->getfield('address2');
+	my $first = $cust_pay_batch->getfield('first');
+	my $city = $cust_pay_batch->getfield('city');
+	my $cardnum = $cust_pay_batch->getfield('cardnum');
+	my $payname = $cust_pay_batch->getfield('payname');
+	my $exp = $cust_pay_batch->getfield('exp');
+	my $invnum = $cust_pay_batch->getfield('invnum');
+	my $custnum = $cust_pay_batch->getfield('custnum');
+
+	# Need a carriage return in address before address2
+	# if it exists. Otherwise address will just be address1
+	my $address = $address1;
+	$address .= "\n$address2" if ($address2);
+
+	# Only print to the screen in verbose mode
+	if ($main::opt_v)
+	{
+		printf("Invoice %d for %s %s\tCustomer Number: %d\n",
+			$invnum,
+			$first,
+			$last,
+			$custnum);
+
+		printf("\t%s\n", $address);
+		printf("\t%s, %s, %s\n\n",
+			$city,
+			$state,
+			$zip);
+
+		printf("\tCard Number: %s\tExp:%s\n",
+			$cardnum,
+			$exp);
+		printf("\t\tName: %s\n", $payname);
+		printf("\t\tAmount: %.2f\n\n\n", $amount);
+	}
+
+	if ($lpr && $main::opt_p)
+	{
+		printf(LPR "Invoice %d for %s %s\tCustomer Number: %d\n",
+			$invnum,
+			$first,
+			$last,
+			$custnum);
+
+		printf(LPR "\t%s\n", $address);
+		printf(LPR "\t%s, %s, %s\n\n",
+			$city,
+			$state,
+			$zip);
+
+		printf(LPR "\tCard Number: %s\tExp:%s\n",
+			$cardnum,
+			$exp);
+		printf(LPR "\t\tName: %s\n", $payname);
+		printf(LPR "\t\tAmount: %.2f\n\n\n", $amount);
+	}
+
+	if ($email && $main::opt_e)
+	{
+		printf(MAIL "Invoice %d for %s %s\tCustomer Number: %d\n",
+			$invnum,
+			$first,
+			$last,
+			$custnum);
+
+		printf(MAIL "\t%s\n", $address);
+		printf(MAIL "\t%s, %s, %s\n\n",
+			$city,
+			$state,
+			$zip);
+
+		printf(MAIL "\tCard Number: %s\tExp:%s\n",
+			$cardnum,
+			$exp);
+		printf(MAIL "\t\tName: %s\n", $payname);
+		printf(MAIL "\t\tAmount: %.2f\n\n\n", $amount);
+	}
+
+	# Now I want to delete the records from cust_pay_batch
+	# and mark the records in cust_pay as paid today if
+	# the delete (-d) command line option is set.
+	if($main::opt_a)
+	{
+		my $payment=new FS::cust_pay {
+			'invnum' => $invnum,
+			'paid' => $amount,
+			'_date' => $_date,
+			'payby' => "CARD",
+			'payinfo' => $cardnum,
+			'paybatch' => "AUTO",
+		};
+		
+		my $pay_error=$payment->insert;
+		if ($pay_error)
+			{
+				# warn might be better if you get root's mail
+				# NEED TO TEST THIS BEFORE DELETE IF WARN IS USED
+				die "Could not update cust_pay for invnum $invnum. $pay_error\n";
+			}
+	}
+		
+	# This just deletes the records
+	# Must be last in the foreach loop
+	if($main::opt_d)
+	{
+		my $del_error = $cust_pay_batch->delete;
+		if ($del_error)
+		{
+			die "Could not delete cust_pay_batch for invnum $invnum. $del_error\n";
+		}
+	}
+
+}
+
+# Now I need to close LPR and EMAIL if they were open
+if($lpr && $main::opt_p)
+{
+	close LPR || die "Could not close printer: $lpr\n";
+}
+
+if($email && $main::opt_e)
+{
+	close MAIL || die "Could not close printer: $lpr\n";
+}
+
+
+# subroutines
+sub untaint_argv {
+  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
+    $ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
+    $ARGV[$_]=$1;
+  }
+}
+
+sub usage {
+  die "Usage:\n\n  freeside-print-batch [-v] [-p] [-e] [-a] [-d] user\n";
+}
+
+=head1 NAME
+
+freeside-print-batch - Prints or emails cust_pay_batch. Also deletes
+              old records and adds payment to cust_pay.
+							Usually run after the bill command.
+
+=head1 SYNOPSIS
+
+  freeside-print-batch [-v] [-p] [-e] [-a] [-d] user
+
+=head1 DESCRIPTION
+
+Prints or emails cust_pay_batch. Can enter payment and delete
+printed records. Usually run as a cron job.
+
+-v: Verbose - Prints records to STDOUT.
+
+-p: Print to printer lpr as found in the conf directory.
+
+-e: Email output to user found in the Conf email file.
+
+-a: Automatically pays all records in cust_pay_batch. Use -d with this option usually.
+
+-d:	Delete - Pays account and deletes record from cust_pay_batch.
+
+user: From the mapsecrets file - see config.html from the base documentation
+
+=head1 VERSION
+
+$Id: freeside-print-batch,v 1.1 2000-05-13 21:57:56 ivan Exp $
+
+=head1 BUGS
+
+Yes..... Use at your own risk. No guarantees or warrantees of any
+kind apply to this program. Parts of this program are hacked from
+other GNU licensed software created mainly by Ivan Kohler.
+
+This is released under the GNU Public License. See www.gnu.org
+for more information regarding this license.
+
+=head1 SEE ALSO
+
+L<FS::cust_main>, config.html from the base documentation
+
+=head1 HISTORY
+
+griff@aver-computer.com July 99
+
+$Log: freeside-print-batch,v $
+Revision 1.1  2000-05-13 21:57:56  ivan
+add print_batch script from Joel Griffiths
+
+
+=cut
+
+
diff --git a/TODO b/TODO
index 19baa7228..f3fc919ea 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.42 2000-03-06 14:12:56 ivan Exp $
+$Id: TODO,v 1.43 2000-05-13 21:57:56 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,67 @@ duplication of effort.
 
 ---
 
+pro-rating, fiddling dates
+
+It looks like svc_acct.import doesn't deal well with comments and
+multi-attribute lines.
+
+ivan@rootwood:~/freeside_current$ rgrep -r domuid * | cut -d: -f1 | sort |
+uniq
+CVS/Base/TODO
+TODO
+bin/fs-setup
+bin/svc_acct_sm.export
+bin/svc_acct_sm.import
+htdocs/docs/man/svc_acct_sm.txt
+htdocs/docs/schema.html
+htdocs/edit/CVS/Base/part_svc.cgi
+htdocs/edit/part_svc.cgi
+htdocs/edit/process/svc_acct_sm.cgi
+htdocs/edit/svc_acct_sm.cgi
+htdocs/search/svc_acct_sm.cgi
+htdocs/view/svc_acct_sm.cgi
+site_perl/svc_acct_sm.pm
+
+rootwood:COMPLETEHOST/TODO
+
+Currently, you set a value in the %FS::UID::callback hash with a coderef  
+of the code you want to execute, but this was bad design and will shortly
+be changed to a subroutine to which you pass your coderef to register it.
+
+This is not a bug, it is how the system is currently designed.  After 
+defining a new package, you need to specifically allow agent types to
+purchase packages.  You can do this from the edit screen of the new agent
+type.
+.
+It wouldn't be a bad idea to add a configuration value that makes new
+packages available for all currently existing agent types automatically.
+.
+On Fri, Apr 07, 2000 at 10:50:35AM -0500, David Morton wrote:
+> For some reason, the type_pkgs table didn't get updated when I tried to
+> create a domain service and package...  insert into type_pkgs values   
+> (4,1);  fixed it up so that I could actually order the package.
+
+
+From: Chuck Cochems <zaphod@tdl.com>
+.
+1) automated generating of late notices.  So far the only way I know to
+generate one is to re-invoice manually.
+. 
+2) smart credit card rejection handling.  It should e-mail a note at
+least, explainig that it did't go through, and why.
+. 
+3)coment field in the main customer record.
+.
+4) streamlined payment entry feature. the current scheme has it fairly
+buried.
+. 
+5) queries to show al customers who owe money,and such stuff as that.
+
+
+credits aren't counted against past invoices?  hmm.  something needs to be
+done to "apply payment" genericly. and zero out invoices etc.
+
 more email which should make it into a more organized TODO list:
 .
 I would also love to see Freeside support bandwidth billing by reading the
@@ -176,10 +237,9 @@ in real-time instead of exporting periodically.  See
 <http://www.mysql.com/Manual_chapter/manual_Common_problems.html#Replication>.
 
 these go in docs:
-<http://www.sisd.com/freeside/list-archive/msg00546.html>, and
-<http://www.sisd.com/freeside/list-archive/msg00554.html>
+<http://www.sisd.com/freeside/list-archive/msg00541.html> (was 546), and
 
-and http://www.sisd.com/freeside/list-archive/msg00423.html
+and http://www.sisd.com/freeside/list-archive/msg00421.html (was 423)
 
 > > 5: Is there anyway to get freeside to send a sysadmin a warning when a
 > > credit card has expired?
diff --git a/htdocs/docs/billing.html b/htdocs/docs/billing.html
index c0354f1ca..659049d06 100644
--- a/htdocs/docs/billing.html
+++ b/htdocs/docs/billing.html
@@ -3,7 +3,7 @@
 </head>
 <body>
   <h1>Billing</h1>
-  The freeside-bill script can be run daily to bill all customers.  Usage: bill [ -c [ i ] ] [ -d <i>date</i> ] [ -b ]
+  The <b>freeside-bill</b> script can be run daily to bill all customers.  Usage: bill [ -c [ i ] ] [ -d <i>date</i> ] [ -b ] <i>user</i>
   <ul>
     <li>-c: Turn on collecting (you probably want this).
     <li>-i: Real-time billing (as opposed to bacth billing).  Only relevant for credit cards.  Not available without modifying site_perl/Bill.pm
@@ -35,6 +35,14 @@ if ( $error ) {
 
 # end loop
 </pre>
-All fields except paybatch are contained in the cust_pay_batch table.  You can use paybatch field to track particular batches and/or particular transactions within a batch.
+All fields except paybatch are contained in the cust_pay_batch table.  You can use paybatch field to track particular batches and/or particular transactions within a batch.<br><br>
+    <li>The <b>freeside-print-batch</b> script can print or email pending credit card batches for manual entry.  Usage: freeside-print-batch [-v] [-p] [-e] [-a] [-d] <i>user</i>
+      <ul>
+        <li>-v: Verbose - Prints records to STDOUT.
+        <li>-p: Print to printer lpr as found in the conf directory.
+        <li>-e: Email output to user found in the Conf email file.
+        <li>-a: Automatically pays all records in cust_pay_batch.  Use -d with this option usually.
+        <li>-d: Delete - Pays account and deletes record from cust_pay_batch.
+      </ul>
   </ul>
 </body>
-- 
cgit v1.2.1


From 26077e96836f95cd1b62aef3fff450913982f6da Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Jun 2000 08:37:56 +0000
Subject: sendmail fix from Jeff Finucane

---
 bin/svc_acct_sm.export | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bin/svc_acct_sm.export b/bin/svc_acct_sm.export
index ce4900733..380a52eff 100755
--- a/bin/svc_acct_sm.export
+++ b/bin/svc_acct_sm.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.export,v 1.2 1998-12-10 07:23:17 ivan Exp $
+# $Id: svc_acct_sm.export,v 1.3 2000-06-12 08:37:56 ivan Exp $
 # 
 # Create and export config files for sendmail, qmail
 #
@@ -42,7 +42,10 @@
 # /var/spool/freeside/conf and sendmail updates ivan@sisd.com 98-aug-14
 #
 # $Log: svc_acct_sm.export,v $
-# Revision 1.2  1998-12-10 07:23:17  ivan
+# Revision 1.3  2000-06-12 08:37:56  ivan
+# sendmail fix from Jeff Finucane
+#
+# Revision 1.2  1998/12/10 07:23:17  ivan
 # use FS::Conf, need user (for datasrc)
 #
 
@@ -90,8 +93,6 @@ unless ( flock(EXPORT,LOCK_EX|LOCK_NB) ) {
 seek(EXPORT,0,0);
 print EXPORT $$,"\n";
 
-my(@svc_acct_sm)=qsearch('svc_acct_sm',{});
-
 ( open(RCPTHOSTS,">$spooldir/rcpthosts")
   and flock(RCPTHOSTS,LOCK_EX|LOCK_NB) 
 ) or die "Can't open $spooldir/rcpthosts: $!";
@@ -153,10 +154,10 @@ foreach $svc_acct_sm ( qsearch('svc_acct_sm') ) {
     print RECIPIENTMAP "$domuser\@$domain:$username\@$mydomain\n";
   }
 
-  print VIRTUSERTABLE @sendmail;
-
 }
 
+print VIRTUSERTABLE @sendmail;
+
 chmod 0644, "$spooldir/sendmail.cw",
             "$spooldir/virtusertable",
             "$spooldir/rcpthosts",
-- 
cgit v1.2.1


From 6957f45d5cb0006941c8496ff35875c000fa4710 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 Jun 2000 03:41:37 +0000
Subject: no longer need to modify Bill.pm to enable real-time credit card
 processing

---
 htdocs/docs/billing.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/billing.html b/htdocs/docs/billing.html
index 659049d06..46ae1fdad 100644
--- a/htdocs/docs/billing.html
+++ b/htdocs/docs/billing.html
@@ -6,7 +6,7 @@
   The <b>freeside-bill</b> script can be run daily to bill all customers.  Usage: bill [ -c [ i ] ] [ -d <i>date</i> ] [ -b ] <i>user</i>
   <ul>
     <li>-c: Turn on collecting (you probably want this).
-    <li>-i: Real-time billing (as opposed to bacth billing).  Only relevant for credit cards.  Not available without modifying site_perl/Bill.pm
+    <li>-i: Real-time billing (as opposed to bacth billing).  Only relevant for credit cards.
     <li>-d: Pretend it is <i>date</i> (parsed by Date::Parse)
     <li>-b: N/A
   </ul>
-- 
cgit v1.2.1


From 9b3b646c24a4620690612fe69926c4e2c9d8f36a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 Jun 2000 11:51:04 +0000
Subject: update link for mysql database creation.  i sure wish they'd stop
 changing these all the time

---
 htdocs/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index bb621e9a1..3a77332ec 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -37,7 +37,7 @@ Before installing, you need:
 Install the Freeside distribution:
 <ul>
   <li>Add the user `freeside' to your system.
-  <li>Add the freeside database to your database engine.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Syntax.html#Create_database">MySQL</a>) (with <a href="http://www.postgresql.org/docs/admin/manage-ag.htm#AEN854">PostgreSQL</a>)
+  <li>Add the freeside database to your database engine.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Reference.html#CREATE_DATABASE">MySQL</a>) (with <a href="http://www.postgresql.org/docs/admin/manage-ag.htm#AEN854">PostgreSQL</a>)
   <li>Allow the freeside user full access to the freeside database.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Privilege_system.html#Privilege_system">MySQL</a>) (with <a href="http://www.postgresql.org/docs/admin/newuser.htm">PostgreSQL</a>)
   <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>
   <li>Build and install the Perl libraries:
-- 
cgit v1.2.1


From 836a71eb0d564e30ab1f3864288fc019adfe57eb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 Jun 2000 12:24:49 +0000
Subject: documentation updates for mysql privledges

---
 htdocs/docs/install.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 3a77332ec..4b3951cb0 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -38,7 +38,13 @@ Install the Freeside distribution:
 <ul>
   <li>Add the user `freeside' to your system.
   <li>Add the freeside database to your database engine.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Reference.html#CREATE_DATABASE">MySQL</a>) (with <a href="http://www.postgresql.org/docs/admin/manage-ag.htm#AEN854">PostgreSQL</a>)
-  <li>Allow the freeside user full access to the freeside database.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Privilege_system.html#Privilege_system">MySQL</a>) (with <a href="http://www.postgresql.org/docs/admin/newuser.htm">PostgreSQL</a>)
+  <li>Allow the freeside user full access to the freeside database.
+    <ul>
+      <li> with <a href="http://www.mysql.com/Manual_chapter/manual_Privilege_system.html#Privilege_system">MySQL</a>:<pre>$ mysqladmin -u root password '<i>set_a_root_database_password</i>'
+$ mysql -u root -p
+mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* TO freeside@localhost IDENTIFIED BY '<i>set_a_freeside_database_password</i>';</pre>
+      <li> with <a href="http://www.postgresql.org/docs/admin/newuser.htm">PostgreSQL</a>
+    </ul>
   <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>
   <li>Build and install the Perl libraries:
     <pre>
-- 
cgit v1.2.1


From 63b8bb43d76c935b7ceedf47fe3d5096f918c982 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 15 Jun 2000 11:10:31 +0000
Subject: update to the inline documentation, hopefully will make things more
 clear

---
 htdocs/edit/part_svc.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/edit/part_svc.cgi b/htdocs/edit/part_svc.cgi
index e1f1e2ad5..4c70f0762 100755
--- a/htdocs/edit/part_svc.cgi
+++ b/htdocs/edit/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.12 1999-04-09 04:22:34 ivan Exp $
+# $Id: part_svc.cgi,v 1.13 2000-06-15 11:10:31 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.12  1999-04-09 04:22:34  ivan
+# Revision 1.13  2000-06-15 11:10:31  ivan
+# update to the inline documentation, hopefully will make things more clear
+#
+# Revision 1.12  1999/04/09 04:22:34  ivan
 # also table()
 #
 # Revision 1.11  1999/04/09 03:52:55  ivan
@@ -124,7 +127,7 @@ END
   'svc_acct' => {
     'dir'       => 'Home directory',
     'uid'       => 'UID (set to fixed and blank for dial-only)',
-    'slipip'    => 'IP address',
+    'slipip'    => 'IP address (set to fixed and blank to disable dialin)',
     'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
     'username'  => 'Username',
     'quota'     => '(unimplemented)',
-- 
cgit v1.2.1


From dfbe4b673f6c64400e9399a6d56b0bd1065bafc2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 15 Jun 2000 12:30:37 +0000
Subject: bugfix from Jeff Finucane, thanks!

---
 htdocs/misc/cancel-unaudited.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/misc/cancel-unaudited.cgi b/htdocs/misc/cancel-unaudited.cgi
index 78b7d3175..b7eb7fede 100755
--- a/htdocs/misc/cancel-unaudited.cgi
+++ b/htdocs/misc/cancel-unaudited.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cancel-unaudited.cgi,v 1.6 1999-02-28 00:03:48 ivan Exp $
+# $Id: cancel-unaudited.cgi,v 1.7 2000-06-15 12:30:37 ivan Exp $
 #
 # Usage: cancel-unaudited.cgi svcnum
 #        http://server.name/path/cancel-unaudited.cgi pkgnum
@@ -16,7 +16,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cancel-unaudited.cgi,v $
-# Revision 1.6  1999-02-28 00:03:48  ivan
+# Revision 1.7  2000-06-15 12:30:37  ivan
+# bugfix from Jeff Finucane, thanks!
+#
+# Revision 1.6  1999/02/28 00:03:48  ivan
 # removed misleading comments
 #
 # Revision 1.5  1999/02/07 09:59:34  ivan
@@ -58,7 +61,7 @@ $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
 &eidiot(qq!This account has already been audited.  Cancel the 
     <A HREF="!. popurl(2). qq!view/cust_pkg.cgi?! . $cust_svc->getfield('pkgnum') .
     qq!pkgnum"> package</A> instead.!) 
-  if $cust_svc->getfield('pkgnum') ne '';
+  if $cust_svc->pkgnum ne '' && $cust_svc->pkgnum ne '0';
 
 local $SIG{HUP} = 'IGNORE';
 local $SIG{INT} = 'IGNORE';
-- 
cgit v1.2.1


From ffe6f2fa392b5b8b190304e699c2a8fdc82476ed Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 15 Jun 2000 12:38:09 +0000
Subject: fix for ncancelled_pkgs - when called in scalar context, was only
 returning second item

---
 FS/FS/cust_main.pm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 26883d554..34d601d67 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -450,15 +450,16 @@ Returns all non-cancelled packages (see L<FS::cust_pkg>) for this customer.
 
 sub ncancelled_pkgs {
   my $self = shift;
-  qsearch( 'cust_pkg', {
-    'custnum' => $self->custnum,
-    'cancel'  => '',
-  }),
-  qsearch( 'cust_pkg', {
-    'custnum' => $self->custnum,
-    'cancel'  => 0,
-  }),
-  ;
+  @{ [ # force list context
+    qsearch( 'cust_pkg', {
+      'custnum' => $self->custnum,
+      'cancel'  => '',
+    }),
+    qsearch( 'cust_pkg', {
+      'custnum' => $self->custnum,
+      'cancel'  => 0,
+    }),
+  ] };
 }
 
 =item bill OPTIONS
@@ -993,7 +994,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.4 2000-02-02 20:22:18 ivan Exp $
+$Id: cust_main.pm,v 1.5 2000-06-15 12:38:09 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 85d18115231d9c0a98e79eec997444d9f0d30866 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 15 Jun 2000 13:35:47 +0000
Subject: add radius method

---
 FS/FS/svc_acct.pm | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index fcd8030df..339081a37 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -54,6 +54,8 @@ FS::svc_acct - Object methods for svc_acct records
 
   $error = $record->cancel;
 
+  %hash = $record->radius;
+
 =head1 DESCRIPTION
 
 An FS::svc_acct object represents an account.  FS::svc_acct inherits from
@@ -446,11 +448,32 @@ sub check {
   ''; #no error
 }
 
+=item radius
+
+Returns key/value pairs, suitable for assigning to a hash, for any RADIUS
+attributes of this record.
+
+Note that this is now the preferred method for reading RADIUS attributes - 
+accessing the columns directly is discouraged, as the column names are
+expected to change in the future.
+
+=cut
+
+sub radius { 
+  my $self = shift;
+  map {
+    /^(radius_(.*))$/;
+    my($column, $attrib) = ($1, $2);
+    $attrib =~ s/_/\-/g;
+    ( $attrib, $self->getfield($column) );
+  } grep { /^radius_/ && $self->getfield($_) } fields( $self->table );
+}
+
 =back
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.3 2000-03-06 16:38:42 ivan Exp $
+$Id: svc_acct.pm,v 1.4 2000-06-15 13:35:47 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From bd8e971e7c47035eff9ab4eb33629101cf315ab9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 15 Jun 2000 14:03:52 +0000
Subject: change SSH link from ftp.cs.hut.fi (F-Secure) to www.openssh.com

---
 htdocs/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 4b3951cb0..b5cae1ba5 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -6,7 +6,7 @@
 Before installing, you need:
 <ul>
   <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
-  <li><a href="ftp://ftp.cs.hut.fi/pub/ssh/">SSH</a>
+  <li><a href="http://www.openssh.com//">SSH</a>
   <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
   <li>A database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>, such as <a href="http://www.tcx.se/">MySQL</a> or <a href="http://www.postgresql.org/">PostgreSQL</a> (verstion 6.5 or higher) (see the <a href="postgresql.html">PostgreSQL notes</a>)
   <li>Perl modules (<a href="http://www.perl.com/CPAN/doc/manual/html/lib/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
-- 
cgit v1.2.1


From 6ef8eaebaef9d8c278f5cae6f48ffee8c2359565 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 15 Jun 2000 14:07:02 +0000
Subject: added ICRADIUS radreply table support, courtesy of Kenny Elliott

---
 bin/svc_acct.export | 47 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 47df3d169..598a6df80 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.11 2000-03-06 16:00:39 ivan Exp $
+# $Id: svc_acct.export,v 1.12 2000-06-15 14:07:02 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,7 +38,10 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.11  2000-03-06 16:00:39  ivan
+# Revision 1.12  2000-06-15 14:07:02  ivan
+# added ICRADIUS radreply table support, courtesy of Kenny Elliott
+#
+# Revision 1.11  2000/03/06 16:00:39  ivan
 # sync up with working versoin
 #
 # Revision 1.2  1998/12/10 07:23:15  ivan
@@ -137,6 +140,8 @@ chmod 0600, "$spooldir/master.passwd",
 if ( $icradiusmachines ) {
   my $sth = $icradius_dbh->prepare("DELETE FROM radcheck");
   $sth->execute or die "Can't reset radcheck table: ". $sth->errstr;
+  my $sth2 = $icradius_dbh->prepare("DELETE FROM radreply");
+  $sth2->execute or die "Can't reset radreply table: ". $sth2->errstr;
 }
 
 setpriority(0,0,10);
@@ -227,19 +232,14 @@ foreach $svc_acct (@svc_acct) {
       print ACP_DIALUP $svc_acct->username, "\t*\t", $svc_acct->slipip, "\n";
     }
 
+    my %radius = $svc_acct->radius;
+
     ###
     # FORMAT OF THE USERS FILE HERE
     print USERS
       $svc_acct->username, qq(\tPassword = "$rpassword"\n\t),
-
-      join ",\n\t",
-        map  {
-          /^(radius_(.*))$/;
-          my($field,$attrib)=($1,$2);
-          $attrib =~ s/_/\-/g;
-          "$attrib = \"". $svc_acct->getfield($field). "\"";
-        } grep /^radius_/ && $svc_acct->getfield($_), fields('svc_acct') 
-    ;
+      join ",\n\t", map { qq($_ = "$radius{$_}") } keys %radius;
+    
     if ( $ip && $ip ne '0e0' ) {
       print USERS qq(,\n\tFramed-Address = "$ip"\n\n);
     } else {
@@ -252,14 +252,28 @@ foreach $svc_acct (@svc_acct) {
       my $sth = $icradius_dbh->prepare(
         "INSERT INTO radcheck ( id, UserName, Attribute, Value ) VALUES ( ".
         join(", ", map { $icradius_dbh->quote( $_ ) } (
-          $svc_acct->svcnum,
+          '',
           $svc_acct->username,
           "Password",
           $svc_acct->_password,
         ) ). " )"
       );
       $sth->execute or die "Can't insert into radcheck table: ". $sth->errstr;
-   }
+
+      foreach my $attribute ( keys %radius ) {
+        my $sth = $icradius_dbh->prepare(
+          "INSERT INTO radreply (id, UserName, Attribute, Value) VALUES ( ".
+          join(", ", map { $icradius_dbh->quote( $_ ) } (
+            '',
+            $svc_acct->username,
+            $attribute,
+            $radius{$attribute},
+          ) ). " )"
+        );
+        $sth->execute or die "Can't insert into radreply table: ". $sth->errstr;
+      }
+
+    }
 
   }
 
@@ -358,10 +372,15 @@ foreach my $icradiusmachine ( @icradiusmachines ) {
   chdir $icradius_mysqlsource or die "Can't cd $icradius_mysqlsource: $!";
   open(WRITER,"|ssh root\@$machine mysql -v --user=$user -p $db");
   my $oldfh = select WRITER; $|=1; select $oldfh;
-  print WRITER "$pass\n"; sleep 2; print WRITER "LOCK TABLES radcheck WRITE;\n";
+  print WRITER "$pass\n";
+  sleep 2;
+  print WRITER "LOCK TABLES radcheck WRITE, radreply WRITE;\n";
   foreach my $file ( glob("radcheck.*") ) {
     scp($file,"root\@$machine:$icradius_mysqldest/$db/$file");
   }
+  foreach my $file ( glob("radreply.*") ) {
+    scp($file,"root\@$machine:$icradius_mysqldest/$db/$file");
+  }
   close WRITER;
 }
 
-- 
cgit v1.2.1


From 387f0b6a7ab855203fa88c08d1cb85ccb976e526 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 15 Jun 2000 14:45:38 +0000
Subject: text updates

---
 CREDITS |  7 +++++++
 TODO    | 25 ++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/CREDITS b/CREDITS
index 90a915860..c6063b9f2 100644
--- a/CREDITS
+++ b/CREDITS
@@ -51,5 +51,12 @@ features:
 Kristian Hoffmann <khoff@pc-intouch.com> contributed Netscape CCK
 autoconfiguration support for the signup server.
 
+Jeff Finucane <jeff@cmh.net> send in a bunch of bugfixes (for the sendmail
+export, cancel-unaudited.cgi), patches to support billing date modification,
+and probably other things too (sorry if I forgot them).
+
+Kenny Elliott <kenny@neoserve.com> contributed ICRADIUS radreply table support,
+allowing attributes with ICRADIUS.
+
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
diff --git a/TODO b/TODO
index f3fc919ea..aaa90d452 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.43 2000-05-13 21:57:56 ivan Exp $
+$Id: TODO,v 1.44 2000-06-15 14:45:38 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,29 @@ duplication of effort.
 
 ---
 
+update the cybercash links in config.html and in the homepage.  add more explicit support for other payment types.  etc.
+
+From "Tim Jung" <tjung@igateway.net>
+.
+Automatic CC Decline Notices via email
+Block Time billing for prepaid internet cards (400 hours or whatever block
+time of hours)
+Trouble Ticket System with simple search function for Knowledge Base feature
+Employee Timecards
+Credit Card System support for Red Hat's CCVS, and other Linux credit card
+programs
+Contact Manager/Lead Tracking
+Pre-Sale Quotes
+Cisco NetFlow Account for IP traffic billing
+VoIP and FoIP billing
+Roaming per minute billing based on Radius Proxy support or number they
+dialed into from Radius logs (800# etc)
+Support for OpenSRS Domain Registration
+Support for TUCOWS signup CDs
+
+
+dbdef-create for postgres
+
 pro-rating, fiddling dates
 
 It looks like svc_acct.import doesn't deal well with comments and
-- 
cgit v1.2.1


From b6449417b8af1065a6e58f5cab11d63b33cbd2f9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 17 Jun 2000 21:48:05 +0000
Subject: fix typo in error message

---
 FS/FS/cust_pay_batch.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
index 7c5c6c404..0576cbefc 100644
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -176,7 +176,7 @@ sub check {
     or return "Illegal zip: ". $self->zip;
   $self->zip($1);
 
-  $self->country =~ /^(\w\w)$/ or return "Illegal \w\wy";
+  $self->country =~ /^(\w\w)$/ or return "Illegal country: ". $self->country;
   $self->country($1);
 
   #check invnum, custnum, ?
@@ -188,7 +188,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_pay_batch.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: cust_pay_batch.pm,v 1.2 2000-06-17 21:48:05 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From e946a03513a43926a4da1ef82d486c64700b2623 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 20 Jun 2000 07:13:03 +0000
Subject: documentation update

---
 FS/FS/cust_main_invoice.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm
index bd7d53dd6..309691a43 100644
--- a/FS/FS/cust_main_invoice.pm
+++ b/FS/FS/cust_main_invoice.pm
@@ -48,7 +48,7 @@ FS::Record.  The following fields are currently supported:
 
 =item custnum - customer (see L<FS::cust_main>)
 
-=item dest - Invoice destination: If numeric, a <a href="#svc_acct">svcnum</a>, if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)
+=item dest - Invoice destination: If numeric, a svcnum (see L<FS::svc_acct>), if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)
 
 =back
 
@@ -167,7 +167,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.2 2000-06-20 07:13:03 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 07d8271c8f91e6a2b34b33133ef22aad96e834ad Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 20 Jun 2000 07:57:41 +0000
Subject: documentation update for 1.2.4 release

---
 htdocs/docs/index.html    |  1 +
 htdocs/docs/upgrade5.html | 22 ---------------------
 htdocs/docs/upgrade6.html | 49 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 22 deletions(-)
 create mode 100644 htdocs/docs/upgrade6.html

diff --git a/htdocs/docs/index.html b/htdocs/docs/index.html
index e03bffb39..f4155c1b8 100644
--- a/htdocs/docs/index.html
+++ b/htdocs/docs/index.html
@@ -10,6 +10,7 @@
   <li><a href="upgrade3.html">Upgrading from 1.1.x to 1.2.x</a>
   <li><a href="upgrade4.html">Upgrading from 1.2.x to 1.2.2</a>
   <li><a href="upgrade5.html">Upgrading from 1.2.2 to 1.2.3</a>
+  <li><a href="upgrade6.html">Upgrading from 1.2.3 to 1.2.4</a>
   <li><a href="config.html">Configuration files</a>
 <!--
   <li><a href="admin.html">Administration</a>
diff --git a/htdocs/docs/upgrade5.html b/htdocs/docs/upgrade5.html
index f0a080d02..3f3431653 100644
--- a/htdocs/docs/upgrade5.html
+++ b/htdocs/docs/upgrade5.html
@@ -19,28 +19,6 @@ CREATE TABLE prepay_credit (
   PRIMARY KEY (prepaynum),
   INDEX (identifier)
 );
-CREATE TABLE domain_record (
-  recnum int NOT NULL,
-  svcnum int NOT NULL,
-  reczone varchar(80) NOT NULL,
-  recaf char(2) NOT NULL,
-  rectype char(5) NOT NULL,
-  recdata varchar(80) NOT NULL,
-  PRIMARY KEY (recnum)
-);
-CREATE TABLE svc_www (
-  svcnum int NOT NULL,
-  recnum int NOT NULL,
-  usersvc int NOT NULL,
-  PRIMARY KEY (svcnum)
-);
-ALTER TABLE part_svc ADD svc_www__svcnum varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_www__svcnum_flag char(1) NULL;
-ALTER TABLE part_svc ADD svc_www__recnum varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_www__recnum_flag char(1) NULL;
-ALTER TABLE part_svc ADD svc_www__usersvc varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_www__uesrsvc_flag char(1) NULL;
-
 </pre>
   <li>Copy or symlink htdocs to the new copy.
   <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
diff --git a/htdocs/docs/upgrade6.html b/htdocs/docs/upgrade6.html
new file mode 100644
index 000000000..f27cadc63
--- /dev/null
+++ b/htdocs/docs/upgrade6.html
@@ -0,0 +1,49 @@
+<head>
+  <title>Upgrading to 1.2.4</title>
+</head>
+<body>
+<h1>Upgrading to 1.2.4 from 1.2.3</h1>
+<ul>
+  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
+  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
+  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
+  <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
+  <li>If migrating from less than 1.2.3, see these <a href="upgrade5.html">instructions</a> first.
+  <li>Back up your data and current Freeside installation.
+  <li>Apply the following changes to your database:
+<pre>
+CREATE TABLE domain_record (
+  recnum int NOT NULL,
+  svcnum int NOT NULL,
+  reczone varchar(80) NOT NULL,
+  recaf char(2) NOT NULL,
+  rectype char(5) NOT NULL,
+  recdata varchar(80) NOT NULL,
+  PRIMARY KEY (recnum)
+);
+CREATE TABLE svc_www (
+  svcnum int NOT NULL,
+  recnum int NOT NULL,
+  usersvc int NOT NULL,
+  PRIMARY KEY (svcnum)
+);
+ALTER TABLE part_svc ADD svc_www__svcnum varchar(80) NULL;
+ALTER TABLE part_svc ADD svc_www__svcnum_flag char(1) NULL;
+ALTER TABLE part_svc ADD svc_www__recnum varchar(80) NULL;
+ALTER TABLE part_svc ADD svc_www__recnum_flag char(1) NULL;
+ALTER TABLE part_svc ADD svc_www__usersvc varchar(80) NULL;
+ALTER TABLE part_svc ADD svc_www__uesrsvc_flag char(1) NULL;
+
+</pre>
+  <li>Copy or symlink htdocs to the new copy.
+  <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
+  <li>Change to the FS directory in the new tarball, and build and install the
+      Perl modules:
+    <pre>
+$ cd FS/
+$ perl Makefile.PL
+$ make
+$ su
+# make install</pre>
+  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
+</body>
-- 
cgit v1.2.1


From 27649e60bc8cf16ba2f76731a4ebab471df3801c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 22 Jun 2000 10:52:37 +0000
Subject: tyop

---
 FS/bin/freeside-bill | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill
index 208f92071..680d29da5 100755
--- a/FS/bin/freeside-bill
+++ b/FS/bin/freeside-bill
@@ -104,7 +104,7 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
   -i: real-time billing (as opposed to batch billing).  only relevant
       for credit cards.
 
-  -d: Pretent it's 'date'.  Date is in any format Date::Parse is happy with,
+  -d: Pretend it's 'date'.  Date is in any format Date::Parse is happy with,
       but be careful.
 
 user: From the mapsecrets file - see config.html from the base documentation
@@ -114,7 +114,7 @@ customers.  Otherwise, bills all customers.
 
 =head1 VERSION
 
-$Id: freeside-bill,v 1.4 2000-04-03 02:32:57 ivan Exp $
+$Id: freeside-bill,v 1.5 2000-06-22 10:52:37 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From b4a403644cb80a612dd028882f971bdd20839275 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Jun 2000 12:25:59 +0000
Subject: FS::Record::qsearch - more portable, doesn't depend on $sth->execute
 returning a number of rows, uses placeholders and prepare_cached

---
 CREDITS         |  3 ++
 FS/FS/Record.pm | 86 +++++++++++++++++++++++++++++++++++----------------------
 FS/FS/UID.pm    | 32 +++++++++++++--------
 TODO            |  8 ++----
 4 files changed, 80 insertions(+), 49 deletions(-)

diff --git a/CREDITS b/CREDITS
index c6063b9f2..9dbed100d 100644
--- a/CREDITS
+++ b/CREDITS
@@ -58,5 +58,8 @@ and probably other things too (sorry if I forgot them).
 Kenny Elliott <kenny@neoserve.com> contributed ICRADIUS radreply table support,
 allowing attributes with ICRADIUS.
 
+Stephen Amadei <amadei@dandy.net> contribued portability cleanups for the
+low-level DBI stuff.
+
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index dae9f3707..0d989e300 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1,17 +1,20 @@
 package FS::Record;
 
 use strict;
-use vars qw($dbdef_file $dbdef $setup_hack $AUTOLOAD @ISA @EXPORT_OK);
+use vars qw($dbdef_file $dbdef $setup_hack $AUTOLOAD @ISA @EXPORT_OK $DEBUG);
 use subs qw(reload_dbdef);
 use Exporter;
 use Carp qw(carp cluck croak confess);
 use File::CounterFile;
-use FS::UID qw(dbh checkruid swapuid getotaker datasrc);
+use FS::UID qw(dbh checkruid swapuid getotaker datasrc driver_name);
 use FS::dbdef;
+use diagnostics;
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(dbh fields hfields qsearch qsearchs dbdef);
 
+$DEBUG = 0;
+
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::Record'} = sub { 
   $File::CounterFile::DEFAULT_DIR = "/usr/local/etc/freeside/counters.". datasrc;
@@ -124,7 +127,7 @@ sub new {
     $hashref->{$field}='' unless defined $hashref->{$field};
     #trim the '$' and ',' from money fields for Pg (belong HERE?)
     #(what about Pg i18n?)
-    if ( datasrc =~ m/Pg/ 
+    if ( driver_name eq 'Pg' 
          && $self->dbdef_table->column($field)->type eq 'money' ) {
       ${$hashref}{$field} =~ s/^\$//;
       ${$hashref}{$field} =~ s/\,//;
@@ -157,37 +160,50 @@ objects.
 =cut
 
 sub qsearch {
-  my($table,$record) = @_;
-  my($dbh) = dbh;
+  my($table, $record) = @_;
+  my $dbh = dbh;
+
+  my @fields = grep exists($record->{$_}), fields($table);
+
+  my $statement = "SELECT * FROM $table";
+  if ( @fields ) {
+    $statement .= " WHERE ". join(' AND ', map {
+      if ( $record->{$_} eq '' || $record->{$_} eq undef ) {
+        if ( driver_name eq 'Pg' ) {
+          "$_ IS NULL";
+        } else {
+          qq-( $_ IS NULL OR $_ = "" )-;
+        }
+      } else {
+        "$_ = ?";
+      }
+    } @fields );
+  }
 
-  my(@fields)=grep exists($record->{$_}), fields($table);
+  warn $statement if $DEBUG;
+  my $sth = $dbh->prepare_cached($statement) or croak $dbh->errstr;
 
-  my($sth);
-  my($statement) = "SELECT * FROM $table". ( @fields
-    ? " WHERE ". join(' AND ',
-      map {
-        $record->{$_} eq ''
-          ? ( datasrc =~ m/Pg/
-                ? "$_ IS NULL"
-                : "( $_ IS NULL OR $_ = \"\" )"
-            )
-          : "$_ = ". _quote($record->{$_},$table,$_)
-      } @fields
-    ) : ''
-  );
-  $sth=$dbh->prepare($statement)
-    or croak $dbh->errstr; #is that a little too harsh?  hmm.
-  #warn $statement #if $debug # or some such;
+  $sth->execute( map $record->{$_},
+    grep $record->{$_} ne '' && $record->{$_} ne undef, @fields
+  ) or croak $dbh->errstr;
 
-  if ( eval ' scalar(@FS::'. $table. '::ISA);' ) {
-    map {
-      eval 'new FS::'. $table. ' ( $sth->fetchrow_hashref );';
-    } ( 1 .. $sth->execute );
+  if ( eval 'scalar(@FS::'. $table. '::ISA);' ) {
+    if ( eval 'FS::'. $table. '->can(\'new\')' eq \&new ) {
+      #derivied class didn't override new method, so this optimization is safe
+      map {
+        new( "FS::$table", { %{$_} } )
+      } @{$sth->fetchall_arrayref( {} )};
+    } else {
+      warn "untested code (class FS::$table uses custom new method)";
+      map {
+        eval 'FS::'. $table. '->new( { %{$_} } )';
+      } @{$sth->fetchall_arrayref( {} )};
+    }
   } else {
-    cluck "qsearch: warning: FS::$table not loaded; returning generic FS::Record objects";
+    cluck "warning: FS::$table not loaded; returning FS::Record objects";
     map {
-      new FS::Record ($table,$sth->fetchrow_hashref);
-    } ( 1 .. $sth->execute );
+      FS::Record->new( $table, { %{$_} } );
+    } @{$sth->fetchall_arrayref( {} )};
   }
 
 }
@@ -390,7 +406,7 @@ sub delete {
     map {
       $self->getfield($_) eq ''
         #? "( $_ IS NULL OR $_ = \"\" )"
-        ? ( datasrc =~ m/Pg/
+        ? ( driver_name eq 'Pg' 
               ? "$_ IS NULL"
               : "( $_ IS NULL OR $_ = \"\" )"
           )
@@ -462,7 +478,7 @@ sub replace {
       map {
         $old->getfield($_) eq ''
           #? "( $_ IS NULL OR $_ = \"\" )"
-          ? ( datasrc =~ m/Pg/
+          ? ( driver_name eq 'Pg' 
                 ? "$_ IS NULL"
                 : "( $_ IS NULL OR $_ = \"\" )"
             )
@@ -825,7 +841,7 @@ sub hfields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.3 2000-03-03 18:21:38 ivan Exp $
+$Id: Record.pm,v 1.4 2000-06-23 12:25:59 ivan Exp $
 
 =head1 BUGS
 
@@ -849,7 +865,7 @@ The ut_ methods should ask the dbdef for a default length.
 
 ut_sqltype (like ut_varchar) should all be defined
 
-A fallback check method should be provided whith uses the dbdef.
+A fallback check method should be provided which uses the dbdef.
 
 The ut_money method assumes money has two decimal digits.
 
@@ -864,6 +880,10 @@ All the subroutines probably should be methods, here or elsewhere.
 Probably should borrow/use some dbdef methods where appropriate (like sub
 fields)
 
+As of 1.14, DBI fetchall_hashref( {} ) doesn't set fetchrow_hashref NAME_lc,
+or allow it to be set.  Working around it is ugly any way around - DBI should
+be fixed.  (only affects RDBMS which return uppercase column names)
+
 =head1 SEE ALSO
 
 L<FS::dbdef>, L<FS::UID>, L<DBI>
diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 2cee65d11..88d733829 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -3,19 +3,19 @@ package FS::UID;
 use strict;
 use vars qw(
   @ISA @EXPORT_OK $cgi $dbh $freeside_uid $user 
-  $conf_dir $secrets $datasrc $db_user $db_pass %callback
+  $conf_dir $secrets $datasrc $db_user $db_pass %callback $driver_name
 );
 use subs qw(
   getsecrets cgisetotaker
 );
 use Exporter;
-use Carp;
+use Carp qw(carp croak cluck);
 use DBI;
 use FS::Conf;
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(checkeuid checkruid swapuid cgisuidsetup
-                adminsuidsetup getotaker dbh datasrc getsecrets );
+                adminsuidsetup getotaker dbh datasrc getsecrets driver_name );
 
 $freeside_uid = scalar(getpwnam('freeside'));
 
@@ -39,6 +39,8 @@ FS::UID - Subroutines for database login and assorted other stuff
 
   $datasrc = datasrc;
 
+  $driver_name = driver_name;
+
 =head1 DESCRIPTION
 
 Provides a hodgepodge of subroutines. 
@@ -89,8 +91,8 @@ sub adminsuidsetup {
 
 =item cgisuidsetup CGI_object
 
-Stores the CGI (see L<CGI>) object for later use. (CGI::Base is depriciated)
-Runs adminsuidsetup.
+Takes a single argument, which is a CGI (see L<CGI>) or Apache (see L<Apache>)
+object (CGI::Base is depriciated).  Runs cgisetotaker and then adminsuidsetup.
 
 =cut
 
@@ -138,10 +140,16 @@ sub datasrc {
   $datasrc;
 }
 
-#hack for web demo
-#sub setdbh {
-#  $dbh=$_[0];
-#}
+=item driver_name
+
+Returns just the driver name portion of the DBI data source.
+
+=cut
+
+sub driver_name {
+  return $driver_name if defined $driver_name;
+  $driver_name = ( split(':', $datasrc) )[1];
+}
 
 sub suidsetup {
   croak "suidsetup depriciated";
@@ -160,7 +168,8 @@ sub getotaker {
 =item cgisetotaker
 
 Sets and returns the CGI REMOTE_USER.  $cgi should be defined as a CGI.pm
-object.  Support for CGI::Base and derived classes is depriciated.
+object (see L<CGI>) or an Apache object (see L<Apache>).  Support for CGI::Base
+and derived classes is depriciated.
 
 =cut
 
@@ -229,6 +238,7 @@ sub getsecrets {
   ($datasrc, $db_user, $db_pass) = $conf->config($secrets)
     or die "Can't get secrets: $!";
   $FS::Conf::default_dir = $conf_dir. "/conf.$datasrc";
+  undef $driver_name;
   ($datasrc, $db_user, $db_pass);
 }
 
@@ -246,7 +256,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.2 2000-05-13 21:50:12 ivan Exp $
+$Id: UID.pm,v 1.3 2000-06-23 12:25:59 ivan Exp $
 
 =head1 BUGS
 
diff --git a/TODO b/TODO
index aaa90d452..5478707ef 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.44 2000-06-15 14:45:38 ivan Exp $
+$Id: TODO,v 1.45 2000-06-23 12:25:59 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -445,8 +445,8 @@ was happy with it could go in FS::Record::_quote, for data going into the
 database.
 
 our data display problem might be a Freeside problem wrt not using 
-Oracle-compatible DBI syntax (uses the return value from $sth->execute as
-a number of rows).  Fixing this is on the TODO.
+Oracle-compatible DBI syntax (fixed using the return value from $sth->execute
+as a number of rows - something else?).
 
 hooks for arbitrary commands out of configuration files
 svc_acct.pm svc_acct_sm.pm etc.
@@ -575,8 +575,6 @@ the web interface in general needs to be redone in a more abstract way.
 
 false laziness: some of search/svc_acct_sm.cgi was copied to search/svc_domain.cgi.  but web interface in general needs to be rewritten in a mucho cleaner way.
 
-Portability: in FS::Record, $sth->execute does not return a number of rows for all DBD's.  see man DBI
-
 subroutine the where clause (eventually all SQL) as OO perhaps (has anyone done this?)
 
 add a select method to FS::Record?
-- 
cgit v1.2.1


From d2c5fa2eb293628ae281120322eb0e70d6a92a7d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 24 Jun 2000 00:28:30 +0000
Subject: don't use Date::Manip; report correct program name in freeside-bill
 usage msg

---
 FS/FS/cust_main.pm   | 7 ++++---
 FS/bin/freeside-bill | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 34d601d67..2a8a8b7ee 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -11,7 +11,7 @@ use Safe;
 use Carp;
 use Time::Local;
 use Date::Format;
-use Date::Manip;
+#use Date::Manip;
 use Mail::Internet;
 use Mail::Header;
 use Business::CreditCard;
@@ -546,7 +546,8 @@ sub bill {
         warn "Error reval-ing part_pkg->recur pkgpart ",
              $part_pkg->pkgpart, ": $@";
       } else {
-        #change this bit to use Date::Manip?
+        #change this bit to use Date::Manip? CAREFUL with timezones (see
+        # mailing list archive)
         #$sdate=$cust_pkg->bill || time;
         #$sdate=$cust_pkg->bill || $time;
         $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
@@ -994,7 +995,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.5 2000-06-15 12:38:09 ivan Exp $
+$Id: cust_main.pm,v 1.6 2000-06-24 00:28:30 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill
index 680d29da5..42991c4f8 100755
--- a/FS/bin/freeside-bill
+++ b/FS/bin/freeside-bill
@@ -80,7 +80,7 @@ sub untaint_argv {
 }
 
 sub usage {
-  die "Usage:\n\n  bill [ -c [ i ] ] [ -d 'date' ] [ -b ] user\n";
+  die "Usage:\n\n  freeside-bill [ -c [ i ] ] [ -d 'date' ] [ -b ] user\n";
 }
 
 =head1 NAME
@@ -114,7 +114,7 @@ customers.  Otherwise, bills all customers.
 
 =head1 VERSION
 
-$Id: freeside-bill,v 1.5 2000-06-22 10:52:37 ivan Exp $
+$Id: freeside-bill,v 1.6 2000-06-24 00:28:30 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 952a38a1f13f58d8be92a501fc40b9bd66291867 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 27 Jun 2000 11:27:55 +0000
Subject: logically identical, but -w safe

---
 FS/FS/Record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 0d989e300..c23ce941e 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -168,7 +168,7 @@ sub qsearch {
   my $statement = "SELECT * FROM $table";
   if ( @fields ) {
     $statement .= " WHERE ". join(' AND ', map {
-      if ( $record->{$_} eq '' || $record->{$_} eq undef ) {
+      if ( ! defined($record->{$_} || $record->{$_} eq '' ) {
         if ( driver_name eq 'Pg' ) {
           "$_ IS NULL";
         } else {
@@ -841,7 +841,7 @@ sub hfields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.4 2000-06-23 12:25:59 ivan Exp $
+$Id: Record.pm,v 1.5 2000-06-27 11:27:55 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 064b854f445b96607bb1193bb277f44a5b84b00a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 27 Jun 2000 11:29:52 +0000
Subject: fix typo in last patch, and another gratuitous -w pleaser

---
 FS/FS/Record.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index c23ce941e..69913c18d 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -168,7 +168,7 @@ sub qsearch {
   my $statement = "SELECT * FROM $table";
   if ( @fields ) {
     $statement .= " WHERE ". join(' AND ', map {
-      if ( ! defined($record->{$_} || $record->{$_} eq '' ) {
+      if ( ! defined( $record->{$_} ) || $record->{$_} eq '' ) {
         if ( driver_name eq 'Pg' ) {
           "$_ IS NULL";
         } else {
@@ -184,7 +184,7 @@ sub qsearch {
   my $sth = $dbh->prepare_cached($statement) or croak $dbh->errstr;
 
   $sth->execute( map $record->{$_},
-    grep $record->{$_} ne '' && $record->{$_} ne undef, @fields
+    grep defined( $record->{$_} ) && $record->{$_} ne '', @fields
   ) or croak $dbh->errstr;
 
   if ( eval 'scalar(@FS::'. $table. '::ISA);' ) {
@@ -841,7 +841,7 @@ sub hfields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.5 2000-06-27 11:27:55 ivan Exp $
+$Id: Record.pm,v 1.6 2000-06-27 11:29:52 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From b84f789033eba9a0fc74bca5a071cfefd87f3c69 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 27 Jun 2000 12:15:37 +0000
Subject: i18

---
 FS/FS/Record.pm    | 16 +++++++++++-----
 FS/FS/cust_main.pm | 14 +++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 69913c18d..12cc77ebf 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -8,7 +8,6 @@ use Carp qw(carp cluck croak confess);
 use File::CounterFile;
 use FS::UID qw(dbh checkruid swapuid getotaker datasrc driver_name);
 use FS::dbdef;
-use diagnostics;
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(dbh fields hfields qsearch qsearchs dbdef);
@@ -694,25 +693,32 @@ sub ut_alphan {
   '';
 }
 
-=item ut_phonen COLUMN
+=item ut_phonen COLUMN [ COUNTRY ]
 
 Check/untaint phone numbers.  May be null.  If there is an error, returns
 the error, otherwise returns false.
 
+Takes an optional two-letter ISO country code; without it or with unsupported
+countries, ut_phonen simply calls ut_alphan.
+
 =cut
 
 sub ut_phonen {
-  my($self,$field)=@_;
+  my( $self, $field, $country ) = @_;
+  return $self->ut_alphan($field) unless defined $country;
   my $phonen = $self->getfield($field);
   if ( $phonen eq '' ) {
     $self->setfield($field,'');
-  } else {
+  } elsif ( $country eq 'US' ) {
     $phonen =~ s/\D//g;
     $phonen =~ /^(\d{3})(\d{3})(\d{4})(\d*)$/
       or return "Illegal (phone) $field: ". $self->getfield($field);
     $phonen = "$1-$2-$3";
     $phonen .= " x$4" if $4;
     $self->setfield($field,$phonen);
+  } else {
+    warn "don't know how to check phone numbers for country $country";
+    return $self->ut_alphan($field);
   }
   '';
 }
@@ -841,7 +847,7 @@ sub hfields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.6 2000-06-27 11:29:52 ivan Exp $
+$Id: Record.pm,v 1.7 2000-06-27 12:15:37 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 2a8a8b7ee..b863748a0 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -312,9 +312,6 @@ sub check {
     || $self->ut_text('city')
     || $self->ut_textn('county')
     || $self->ut_textn('state')
-    || $self->ut_phonen('daytime')
-    || $self->ut_phonen('night')
-    || $self->ut_phonen('fax')
   ;
   return $error if $error;
 
@@ -357,7 +354,14 @@ sub check {
       } );
   }
 
-  $self->zip =~ /^\s*(\w[\w\-\s]{3,8}\w)\s*$/
+  $error =
+    $self->ut_phonen('daytime', $self->country)
+    || $self->ut_phonen('night', $self->country)
+    || $self->ut_phonen('fax', $self->country)
+  ;
+  return $error if $error;
+
+  $self->zip =~ /^\s*(\w[\w\-\s]{2,8}\w)\s*$/
     or return "Illegal zip: ". $self->zip;
   $self->zip($1);
 
@@ -995,7 +999,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.6 2000-06-24 00:28:30 ivan Exp $
+$Id: cust_main.pm,v 1.7 2000-06-27 12:15:37 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 2ba21fef7cc361ccd58045d490d36dab8f25a892 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 27 Jun 2000 12:15:50 +0000
Subject: i18n

---
 TODO                      |  7 ++++++-
 htdocs/docs/config.html   |  1 +
 htdocs/edit/cust_main.cgi | 10 +++++++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/TODO b/TODO
index 5478707ef..0e5c89bb9 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.45 2000-06-23 12:25:59 ivan Exp $
+$Id: TODO,v 1.46 2000-06-27 12:15:50 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,11 @@ duplication of effort.
 
 ---
 
+zip code i18n is not very good :( but at least US, CA, HU, ?
+
+ut_phonen doesn't check data length.  several
+orthogonal cleanup projects here.  *sigh*
+
 update the cybercash links in config.html and in the homepage.  add more explicit support for other payment types.  etc.
 
 From "Tim Jung" <tjung@igateway.net>
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index fe1cce23d..730a1c9f8 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -28,6 +28,7 @@ All further configuration files and directories are located in
   <li>bindprimary - Your BIND primary nameserver.  This enables export of /var/named/named.conf and zone files into /var/named
   <li>bindsecondaries - Your BIND secondary nameservers, one per line.  This enables export of /var/named/named.conf
   <li>bsdshellmachines - Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/master.passwd'.
+  <li>countrydefault - Default two-letter country code (if not supplied, the default is `US')
   <li>cybercash2 - <a href="http://www.cybercash.com/cybercash/services/cashreg214.html">CyberCash v2</a> support, four lines: paymentserverhost, paymentserverport, paymentserversecret, and transaction type (`mauthonly' or `mauthcapture').  CCLib.pm is required.
   <li>cybercash3.2 - <a href="http://www.cybercash.com/cybercash/services/technology.html">CyberCash v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly' or `mauthcapture').  CCMckLib3_2.pm, CCMckDirectLib3_2.pm and CCMckErrno3_2 are required.
   <li>deletecustomers - The existance of this file will enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that this customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers' packages if they cancel service.
diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 6356a4d74..0cde76b06 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.25 2000-03-02 08:09:38 ivan Exp $
+# $Id: cust_main.cgi,v 1.26 2000-06-27 12:15:50 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.25  2000-03-02 08:09:38  ivan
+# Revision 1.26  2000-06-27 12:15:50  ivan
+# i18n
+#
+# Revision 1.25  2000/03/02 08:09:38  ivan
 # still need to allow blank expiration dates
 #
 # Revision 1.24  2000/01/30 06:54:50  ivan
@@ -260,7 +263,8 @@ print "<BR><BR>Contact information", &itable("#c0c0c0"), <<END;
 <TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="state" SIZE="1">
 END
 
-$cust_main->country('US') unless $cust_main->country; #eww
+$cust_main->country( $conf->config('countrydefault') || 'US' )
+  unless $cust_main->country;
 foreach ( qsearch('cust_main_county',{}) ) {
   print "<OPTION";
   print " SELECTED" if ( $cust_main->state eq $_->state
-- 
cgit v1.2.1


From c30183b25bfe0f99b96bbe9f1baf099fec323d02 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 28 Jun 2000 10:38:35 +0000
Subject: documentation oops

---
 htdocs/docs/upgrade6.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/docs/upgrade6.html b/htdocs/docs/upgrade6.html
index f27cadc63..7615fa71a 100644
--- a/htdocs/docs/upgrade6.html
+++ b/htdocs/docs/upgrade6.html
@@ -27,8 +27,6 @@ CREATE TABLE svc_www (
   usersvc int NOT NULL,
   PRIMARY KEY (svcnum)
 );
-ALTER TABLE part_svc ADD svc_www__svcnum varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_www__svcnum_flag char(1) NULL;
 ALTER TABLE part_svc ADD svc_www__recnum varchar(80) NULL;
 ALTER TABLE part_svc ADD svc_www__recnum_flag char(1) NULL;
 ALTER TABLE part_svc ADD svc_www__usersvc varchar(80) NULL;
-- 
cgit v1.2.1


From 2a9820d9b4dd0c6e26761a28ff6db2b582218278 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 28 Jun 2000 10:48:42 +0000
Subject: quick hack to add RADIUS attributes

---
 bin/fs-radius-add | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100755 bin/fs-radius-add

diff --git a/bin/fs-radius-add b/bin/fs-radius-add
new file mode 100755
index 000000000..376b7a7a4
--- /dev/null
+++ b/bin/fs-radius-add
@@ -0,0 +1,53 @@
+#!/usr/bin/perl -Tw
+
+# quick'n'dirty hack of fs-setup to add radius attributes
+
+use strict;
+use DBI;
+use FS::UID qw(adminsuidsetup checkeuid);
+die "Not running uid freeside!" unless checkeuid();
+
+my $user = shift or die &usage;
+getsecrets($user);
+
+my $dbh = adminsuidsetup $user;
+
+###
+
+print "\n\n", <<END, ":";
+Enter the additional RADIUS attributes you need to track for
+each user, separated by whitespace.
+END
+my @attributes = map { s/\-/_/g; $_; } split(" ",&getvalue);
+
+sub getvalue {
+  my($x)=scalar(<STDIN>);
+  chop $x;
+  $x;
+}
+
+###
+
+my($char_d) = 80; #default maxlength for text fields
+
+###
+
+foreach my $attribute ( @attributes ) {
+  foreach my $statement ( 
+    "ALTER TABLE svc_acct ADD radius_$attribute varchar($char_d) NULL",
+    "ALTER TABLE svc_acct ADD radius_$attribute varchar($char_d) NULL",
+    "ALTER TABLE part_svc ADD svc_acct__radius_$attribute varchar($char_d) NULL;",
+    "ALTER TABLE part_svc ADD svc_acct__radius_${attribute}_flag char(1) NULL;",
+  ) {
+    $dbh->do( $statement ) or warn "Error executing $statement: ". $dbh->errstr;  }
+}
+
+$dbh->disconnect or die $dbh->errstr;
+
+print "\n\n", "Now you must run dbdef-create.\n\n";
+
+sub usage {
+  die "Usage:\n  fs-radius-add user\n"; 
+}
+
+
-- 
cgit v1.2.1


From ca1e62b0e38c8784e4b4b5d365fc0f6f42079db8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 28 Jun 2000 10:51:19 +0000
Subject: forgot to import a sub

---
 bin/fs-radius-add | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/fs-radius-add b/bin/fs-radius-add
index 376b7a7a4..707926677 100755
--- a/bin/fs-radius-add
+++ b/bin/fs-radius-add
@@ -4,7 +4,7 @@
 
 use strict;
 use DBI;
-use FS::UID qw(adminsuidsetup checkeuid);
+use FS::UID qw(adminsuidsetup checkeuid getsecrets);
 die "Not running uid freeside!" unless checkeuid();
 
 my $user = shift or die &usage;
-- 
cgit v1.2.1


From 7a503c0ec805aa1a428ee094660f8146efee4653 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 28 Jun 2000 12:03:53 +0000
Subject: make svc_acct more forgiving about RADIUS users files

---
 bin/svc_acct.import | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index 893a8298a..c2ef4fd7f 100755
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.import,v 1.8 2000-02-03 05:16:52 ivan Exp $
+# $Id: svc_acct.import,v 1.9 2000-06-28 12:03:53 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -17,7 +17,10 @@
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 #
 # $Log: svc_acct.import,v $
-# Revision 1.8  2000-02-03 05:16:52  ivan
+# Revision 1.9  2000-06-28 12:03:53  ivan
+# make svc_acct more forgiving about RADIUS users files
+#
+# Revision 1.8  2000/02/03 05:16:52  ivan
 # beginning of DNS and Apache support
 #
 # Revision 1.7  1999/07/08 02:32:26  ivan
@@ -145,7 +148,8 @@ my(%upassword,%ip,%allparam);
 my(%param,$username);
 while (<USERS>) {
   chop;
-  next if /^$/;
+  next if /^\s*$/;
+  next if /^\s*#/;
   if ( /^\S/ ) {
     /^(\w+)\s+Password\s+=\s+"([^"]+)"(,\s+Expiration\s+=\s+"([^"]*")\s*)?$/
       or die "1Unexpected line in users.import: $_";
-- 
cgit v1.2.1


From 88e029c6fab66a6596153b0f3d1f86e110f149ed Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 28 Jun 2000 12:32:30 +0000
Subject: allow RADIUS lines with "Auth-Type = Local" too

---
 bin/svc_acct.import | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index c2ef4fd7f..691798b09 100755
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.import,v 1.9 2000-06-28 12:03:53 ivan Exp $
+# $Id: svc_acct.import,v 1.10 2000-06-28 12:32:30 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -17,8 +17,8 @@
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 #
 # $Log: svc_acct.import,v $
-# Revision 1.9  2000-06-28 12:03:53  ivan
-# make svc_acct more forgiving about RADIUS users files
+# Revision 1.10  2000-06-28 12:32:30  ivan
+# allow RADIUS lines with "Auth-Type = Local" too
 #
 # Revision 1.8  2000/02/03 05:16:52  ivan
 # beginning of DNS and Apache support
@@ -151,10 +151,10 @@ while (<USERS>) {
   next if /^\s*$/;
   next if /^\s*#/;
   if ( /^\S/ ) {
-    /^(\w+)\s+Password\s+=\s+"([^"]+)"(,\s+Expiration\s+=\s+"([^"]*")\s*)?$/
+    /^(\w+)\s+(Auth-Type\s+=\s+Local,\s+)Password\s+=\s+"([^"]+)"(,\s+Expiration\s+=\s+"([^"]*")\s*)?$/
       or die "1Unexpected line in users.import: $_";
     my($password,$expiration);
-    ($username,$password,$expiration)=(lc($1),$2,$4);
+    ($username,$password,$expiration)=(lc($1),$3,$5);
     $password = '' if $password eq 'UNIX';
     $upassword{$username}=$password;
     undef %param;
-- 
cgit v1.2.1


From cb61ec822bf114015e4044868c5c7f3c3000ab0d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 28 Jun 2000 12:37:28 +0000
Subject: add support for config option textradiusprepend

---
 bin/svc_acct.export     | 11 ++++++++---
 htdocs/docs/config.html |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 598a6df80..f7ee571de 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.12 2000-06-15 14:07:02 ivan Exp $
+# $Id: svc_acct.export,v 1.13 2000-06-28 12:37:28 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,7 +38,10 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.12  2000-06-15 14:07:02  ivan
+# Revision 1.13  2000-06-28 12:37:28  ivan
+# add support for config option textradiusprepend
+#
+# Revision 1.12  2000/06/15 14:07:02  ivan
 # added ICRADIUS radreply table support, courtesy of Kenny Elliott
 #
 # Revision 1.11  2000/03/06 16:00:39  ivan
@@ -89,6 +92,8 @@ my $icradius_mysqlsource =
 my $icradius_dbh = dbh; #could eventually get it from a config file if you're
                         #not running MySQL for your Freeside database
 
+my $textradiusprepend = $conf->config('textradiusprepend');
+
 my(@saltset)= ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
 require 5.004; #srand(time|$$);
 
@@ -237,7 +242,7 @@ foreach $svc_acct (@svc_acct) {
     ###
     # FORMAT OF THE USERS FILE HERE
     print USERS
-      $svc_acct->username, qq(\tPassword = "$rpassword"\n\t),
+      $svc_acct->username, qq(\t${textradiusprepend}Password = "$rpassword"\n\t),
       join ",\n\t", map { qq($_ = "$radius{$_}") } keys %radius;
     
     if ( $ip && $ip ne '0e0' ) {
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index 730a1c9f8..c3bfe17f3 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -72,6 +72,7 @@ All further configuration files and directories are located in
   <li>soamachine - SOA machine for new domains, with trailing `.'
   <li>soarefresh - SOA refresh for new domains
   <li>soaretry - SOA retry for new domains
+  <li>textradiusprepend - The contents of this file will be prepended to the first line of a user's RADIUS entry in text exports.  If necessary, usually `Auth-Type = Local, '.
   <li>usernamemin - Minimum username length (default 2);
   <li>usernamemax - Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)
 </ul>
-- 
cgit v1.2.1


From be4e54da250b7b94ddfd67c9f8eeb02288e10020 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 28 Jun 2000 12:52:22 +0000
Subject: bugfix to accept shells that evaluate to false in perl, like the
 empty string.

---
 FS/FS/svc_acct.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 339081a37..14979ed09 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -381,8 +381,8 @@ sub check {
 
     unless ( $recref->{username} eq 'sync' ) {
       my($shell);
-      if ( $shell = (grep $_ eq $recref->{shell}, @shells)[0] ) {
-        $recref->{shell} = $shell;
+      if ( grep $_ eq $recref->{shell}, @shells ) {
+        $recref->{shell} = (grep $_ eq $recref->{shell}, @shells)[0];
       } else {
         return "Illegal shell \`". $self->shell. "\'; ".
                $conf->dir. "/shells contains: @shells";
@@ -473,7 +473,7 @@ sub radius {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.4 2000-06-15 13:35:47 ivan Exp $
+$Id: svc_acct.pm,v 1.5 2000-06-28 12:52:22 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 9d6e81f15df01d7146def82c6e62d7c65fd2bc82 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 28 Jun 2000 12:54:33 +0000
Subject: superfluous my()

---
 FS/FS/svc_acct.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 14979ed09..93354296b 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -380,7 +380,6 @@ sub check {
     ;
 
     unless ( $recref->{username} eq 'sync' ) {
-      my($shell);
       if ( grep $_ eq $recref->{shell}, @shells ) {
         $recref->{shell} = (grep $_ eq $recref->{shell}, @shells)[0];
       } else {
@@ -473,7 +472,7 @@ sub radius {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.5 2000-06-28 12:52:22 ivan Exp $
+$Id: svc_acct.pm,v 1.6 2000-06-28 12:54:33 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 958222ad6b9e290ef4db7e0ab3f1ead6bd3fcb7f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Jun 2000 10:48:25 +0000
Subject: make svc_acct_sm skip blank lines in sendmail import

---
 bin/svc_acct_sm.import | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bin/svc_acct_sm.import b/bin/svc_acct_sm.import
index 50b0f6702..8777abe7e 100755
--- a/bin/svc_acct_sm.import
+++ b/bin/svc_acct_sm.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.import,v 1.5 2000-02-03 05:16:52 ivan Exp $
+# $Id: svc_acct_sm.import,v 1.6 2000-06-29 10:48:25 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -16,7 +16,10 @@
 # ivan@sisd.com 98-jul-13
 #
 # $Log: svc_acct_sm.import,v $
-# Revision 1.5  2000-02-03 05:16:52  ivan
+# Revision 1.6  2000-06-29 10:48:25  ivan
+# make svc_acct_sm skip blank lines in sendmail import
+#
+# Revision 1.5  2000/02/03 05:16:52  ivan
 # beginning of DNS and Apache support
 #
 # Revision 1.4  1999/03/25 08:42:20  ivan
@@ -151,6 +154,7 @@ my(%svcnum);
 
 while (<RCPTHOSTS>) {
   next if /^(#|$)/;
+  next if $mta{$mta} eq 'sendmail' && /^\s*$/; #blank lines
   /^\.?([\w\-\.]+)$/
     #or do { warn "Strange rcpthosts/sendmail.cw line: $_"; next; };
     or die "Strange rcpthosts/sendmail.cw line: $_";
@@ -243,6 +247,7 @@ END
     or die "Can't open $spooldir/virtusertable.import: $!";
   while (<VIRTUSERTABLE>) {
     next if /^#/; #comments?
+    next if /^\s*$/; #blank lines
     /^([\w\-\.]+)?\@([\w\-\.]+)\t([\w\-\.]+)$/
       #or do { warn "Strange virtusertable line: $_"; next; };
       or die "Strange virtusertable line: $_";
-- 
cgit v1.2.1


From 543ac5d57838319516d325dbeac898f111065bc3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Jun 2000 10:51:52 +0000
Subject: oops, silly mistake

---
 bin/svc_acct_sm.import | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/bin/svc_acct_sm.import b/bin/svc_acct_sm.import
index 8777abe7e..349c4f26c 100755
--- a/bin/svc_acct_sm.import
+++ b/bin/svc_acct_sm.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.import,v 1.6 2000-06-29 10:48:25 ivan Exp $
+# $Id: svc_acct_sm.import,v 1.7 2000-06-29 10:51:52 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -16,7 +16,10 @@
 # ivan@sisd.com 98-jul-13
 #
 # $Log: svc_acct_sm.import,v $
-# Revision 1.6  2000-06-29 10:48:25  ivan
+# Revision 1.7  2000-06-29 10:51:52  ivan
+# oops, silly mistake
+#
+# Revision 1.6  2000/06/29 10:48:25  ivan
 # make svc_acct_sm skip blank lines in sendmail import
 #
 # Revision 1.5  2000/02/03 05:16:52  ivan
@@ -129,8 +132,9 @@ END
 sub getvalue {
   my $prompt = shift;
   $^W=0; #Term::Query isn't -w-safe
-  query $prompt, '';
+  my $data = query $prompt, '';
   $^W=1;
+  $data;
 }
 
 print "\n\n";
-- 
cgit v1.2.1


From a875d5b4fd2d12937c7a53bed773490e2f3ba50f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Jun 2000 11:12:20 +0000
Subject: don't block on $whois_hack trueness when adding new domains.

---
 FS/FS/svc_domain.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index e1e4eb8b5..5cfe69081 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -160,7 +160,7 @@ sub insert {
 
   my $whois = $self->whois;
   return "Domain in use (see whois)"
-    if ( $self->action eq "N" && $whois );
+    if ( $self->action eq "N" && ! $whois_hack && $whois );
   return "Domain not found (see whois)"
     if ( $self->action eq "M" && ! $whois );
 
@@ -459,7 +459,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.6 2000-03-01 08:13:59 ivan Exp $
+$Id: svc_domain.pm,v 1.7 2000-06-29 11:12:20 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 5072965ec7e8d55ef82769fc322240abc7fb7e00 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Jun 2000 11:56:52 +0000
Subject: md5 passwords can are 34 characters long and have $ in them.

---
 FS/FS/svc_acct.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 93354296b..26c634be3 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -436,7 +436,7 @@ sub check {
     #$recref->{password} = $1.
     #  crypt($3,$saltset[int(rand(64))].$saltset[int(rand(64))]
     #;
-  } elsif ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([\w\.\/]{13,24})$/ ) {
+  } elsif ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([\w\.\/\$]{13,34})$/ ) {
     $recref->{_password} = $1.$3;
   } elsif ( $recref->{_password} eq '*' ) {
     $recref->{_password} = '*';
@@ -472,7 +472,7 @@ sub radius {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.6 2000-06-28 12:54:33 ivan Exp $
+$Id: svc_acct.pm,v 1.7 2000-06-29 11:56:52 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From e446c1f657b37034e1867e82857a1741572da07f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Jun 2000 12:00:49 +0000
Subject: support for pre-encrypted md5 passwords.

---
 bin/fs-setup              | 9 ++++++---
 htdocs/docs/upgrade6.html | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 3dde038b2..002a4ed4c 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.24 2000-03-02 07:44:07 ivan Exp $
+# $Id: fs-setup,v 1.25 2000-06-29 12:00:49 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.24  2000-03-02 07:44:07  ivan
+# Revision 1.25  2000-06-29 12:00:49  ivan
+# support for pre-encrypted md5 passwords.
+#
+# Revision 1.24  2000/03/02 07:44:07  ivan
 # typo forgot closing '
 #
 # Revision 1.23  2000/02/03 05:16:52  ivan
@@ -612,7 +615,7 @@ sub tables_hash_hack {
       'columns' => [
         'svcnum',    'int',    '',   '',
         'username',  'varchar',   '',   $username_len, #unique (& remove dup code)
-        '_password', 'varchar',   '',   25, #13 for encryped pw's plus ' *SUSPENDED*
+        '_password', 'varchar',   '',   50, #13 for encryped pw's plus ' *SUSPENDED* (mp5 passwords can be 34)
         'popnum',    'int',    'NULL',   '',
         'uid',       'int', 'NULL',   '',
         'gid',       'int', 'NULL',   '',
diff --git a/htdocs/docs/upgrade6.html b/htdocs/docs/upgrade6.html
index 7615fa71a..c9cdf3314 100644
--- a/htdocs/docs/upgrade6.html
+++ b/htdocs/docs/upgrade6.html
@@ -31,6 +31,7 @@ ALTER TABLE part_svc ADD svc_www__recnum varchar(80) NULL;
 ALTER TABLE part_svc ADD svc_www__recnum_flag char(1) NULL;
 ALTER TABLE part_svc ADD svc_www__usersvc varchar(80) NULL;
 ALTER TABLE part_svc ADD svc_www__uesrsvc_flag char(1) NULL;
+ALTER TABLE svc_acct CHANGE _password _password varchar(50) NULL;
 
 </pre>
   <li>Copy or symlink htdocs to the new copy.
-- 
cgit v1.2.1


From 6e05f9c154f3cac80969c9a8f266b3d5b041b463 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Jun 2000 12:27:01 +0000
Subject: s/password/_password/ for PostgreSQL wasn't done in the import.

---
 bin/svc_acct.import | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index 691798b09..795b853c0 100755
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.import,v 1.10 2000-06-28 12:32:30 ivan Exp $
+# $Id: svc_acct.import,v 1.11 2000-06-29 12:27:01 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -17,7 +17,10 @@
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 #
 # $Log: svc_acct.import,v $
-# Revision 1.10  2000-06-28 12:32:30  ivan
+# Revision 1.11  2000-06-29 12:27:01  ivan
+# s/password/_password/ for PostgreSQL wasn't done in the import.
+#
+# Revision 1.10  2000/06/28 12:32:30  ivan
 # allow RADIUS lines with "Auth-Type = Local" too
 #
 # Revision 1.8  2000/02/03 05:16:52  ivan
@@ -219,15 +222,15 @@ while (<PASSWD>) {
   }
 
   my($svc_acct) = new FS::svc_acct ({
-    'svcpart'  => $svcpart,
-    'username' => $username,
-    'password' => $password,
-    'uid'      => $uid,
-    'gid'      => $gid,
-    'finger'   => $finger,
-    'dir'      => $dir,
-    'shell'    => $shell,
-    'slipip'   => $ip{$username},
+    'svcpart'   => $svcpart,
+    'username'  => $username,
+    '_password' => $password,
+    'uid'       => $uid,
+    'gid'       => $gid,
+    'finger'    => $finger,
+    'dir'       => $dir,
+    'shell'     => $shell,
+    'slipip'    => $ip{$username},
     %{$allparam{$username}},
   });
   my($error);
@@ -253,10 +256,10 @@ foreach $username ( keys %upassword ) {
   }
 
   my($svc_acct) = new FS::svc_acct ({
-    'svcpart'  => $svcpart,
-    'username' => $username,
-    'password' => $password,
-    'slipip'   => $ip{$username},
+    'svcpart'   => $svcpart,
+    'username'  => $username,
+    '_password' => $password,
+    'slipip'    => $ip{$username},
     %{$allparam{$username}},
   });
   my($error);
-- 
cgit v1.2.1


From f30825464928625a2980e9286a28ea7ab91dad64 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Jun 2000 14:02:29 +0000
Subject: add sendmailrestart configuration file

---
 bin/svc_acct_sm.export  | 11 +++++++++--
 htdocs/docs/config.html |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/bin/svc_acct_sm.export b/bin/svc_acct_sm.export
index 380a52eff..8a38f5d54 100755
--- a/bin/svc_acct_sm.export
+++ b/bin/svc_acct_sm.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.export,v 1.3 2000-06-12 08:37:56 ivan Exp $
+# $Id: svc_acct_sm.export,v 1.4 2000-06-29 14:02:29 ivan Exp $
 # 
 # Create and export config files for sendmail, qmail
 #
@@ -42,7 +42,10 @@
 # /var/spool/freeside/conf and sendmail updates ivan@sisd.com 98-aug-14
 #
 # $Log: svc_acct_sm.export,v $
-# Revision 1.3  2000-06-12 08:37:56  ivan
+# Revision 1.4  2000-06-29 14:02:29  ivan
+# add sendmailrestart configuration file
+#
+# Revision 1.3  2000/06/12 08:37:56  ivan
 # sendmail fix from Jeff Finucane
 #
 # Revision 1.2  1998/12/10 07:23:17  ivan
@@ -195,6 +198,10 @@ foreach $sendmailmachine (@sendmailmachines) {
     " )"
   )
     == 0 or die "ssh error: $!";
+  if ( $conf->config('sendmailrestart') ) {
+    ssh("root\@$sendmailmachine", $conf->config('sendmailrestart') )
+      == 0 or die "ssh error: $!";
+  }
 }
 
 my($qmailmachine);
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index c3bfe17f3..993ce74a9 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -61,6 +61,7 @@ All further configuration files and directories are located in
         </ul>
     </ul>
   <li>sendmailmachines - Your sendmail machines, one per line.  This enables export of `/etc/virtusertable' and `/etc/sendmail.cw'.
+  <li>sendmailrestart - If defined, the command which is run on sendmail machines after files are copied.
   <li>shellmachine - A single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines', it also enables `.qmail-extension' file maintenance.
   <li>shellmachines - Your Linux and System V flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/shadow' files.
   <li>shells - Legal shells (think /etc/shells).  You probably want to `cut -d: -f7 /etc/passwd | sort | uniq' initially so that importing doesn't fail with `Illegal shell' errors, then remove any special entries afterwords.  A blank line specifies that an empty shell is permitted.
-- 
cgit v1.2.1


From ba0e7c68fa1a7dd9beff5084ac1a846960f3a477 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Jun 2000 15:01:25 +0000
Subject: another silly typo in svc_acct.export

---
 bin/svc_acct.export | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index f7ee571de..53fd1f0c7 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.13 2000-06-28 12:37:28 ivan Exp $
+# $Id: svc_acct.export,v 1.14 2000-06-29 15:01:25 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,7 +38,10 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.13  2000-06-28 12:37:28  ivan
+# Revision 1.14  2000-06-29 15:01:25  ivan
+# another silly typo in svc_acct.export
+#
+# Revision 1.13  2000/06/28 12:37:28  ivan
 # add support for config option textradiusprepend
 #
 # Revision 1.12  2000/06/15 14:07:02  ivan
@@ -364,7 +367,7 @@ my($radiusmachine);
 foreach $radiusmachine (@radiusmachines) {
   scp("$spooldir/users","root\@$radiusmachine:/etc/raddb/users")
     == 0 or die "scp error: $!";
-  ssh("root\@$erpcdmachine",
+  ssh("root\@$radiusmachine",
     "( ".
       "builddbm".
     " )"
-- 
cgit v1.2.1


From 6d0c78dca827352abe7801d5642b6ae85bc75973 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Jun 2000 10:19:58 +0000
Subject: maildisablecatchall config file

---
 htdocs/docs/config.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index 993ce74a9..5aa9c66fd 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -43,6 +43,7 @@ All further configuration files and directories are located in
   <li>icradius_mysqlsource - Source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".
   <li>invoice_from - Return address on email invoices.
   <li>lpr - Print command for paper invoices, for example `lpr -h'.
+  <li>maildisablecatchall - The existance of this file will disable the requirement that each virtual domain have a catch-all mailbox.
   <li>mxmachines - MX entries for new domains, weight and machine, one per line, with trailing `.'
   <li>nsmachines - NS nameservers for new domains, one per line, with trailing `.'
   <li>nismachines - Your NIS master (not slave master) machines, one per line.  This enables export of `/etc/global/passwd' and `/etc/global/shadow'.
-- 
cgit v1.2.1


From 5a698d284b646e4077144193ead58cf0f0f91893 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Jun 2000 10:37:18 +0000
Subject: maildisablecatchall configuration file

---
 FS/FS/svc_acct_sm.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_acct_sm.pm b/FS/FS/svc_acct_sm.pm
index 96bc3a27b..15cf86d9b 100644
--- a/FS/FS/svc_acct_sm.pm
+++ b/FS/FS/svc_acct_sm.pm
@@ -117,8 +117,9 @@ sub insert {
 
   return "First domain username (domuser) for domain (domsvc) must be " .
          qq='*' (catch-all)!=
-    if $self->domuser ne '*' &&
-       ! qsearch('svc_acct_sm',{ 'domsvc' => $self->domsvc } );
+    if $self->domuser ne '*'
+       && ! qsearch('svc_acct_sm',{ 'domsvc' => $self->domsvc } )
+       && ! $conf->exists('maildisablecatchall');
 
   $error = $self->SUPER::insert;
   return $error if $error;
@@ -232,7 +233,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_acct_sm.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: svc_acct_sm.pm,v 1.2 2000-06-30 10:37:18 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From bd26886dfcdb71027f0a3393993df383e72475b5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Jul 2000 09:03:14 +0000
Subject: added sendmailrestart and sendmailconfigpath config files

---
 TODO                    |  5 ++++-
 bin/svc_acct_sm.export  | 28 +++++++++++++++++-----------
 htdocs/docs/config.html |  1 +
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/TODO b/TODO
index 0e5c89bb9..0d16f157a 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.46 2000-06-27 12:15:50 ivan Exp $
+$Id: TODO,v 1.47 2000-07-03 09:03:14 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,9 @@ duplication of effort.
 
 ---
 
+Bug: during the linking process apparantly you can link too many services to 
+a package.  *sigh*
+
 zip code i18n is not very good :( but at least US, CA, HU, ?
 
 ut_phonen doesn't check data length.  several
diff --git a/bin/svc_acct_sm.export b/bin/svc_acct_sm.export
index 8a38f5d54..0893c94df 100755
--- a/bin/svc_acct_sm.export
+++ b/bin/svc_acct_sm.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.export,v 1.4 2000-06-29 14:02:29 ivan Exp $
+# $Id: svc_acct_sm.export,v 1.5 2000-07-03 09:03:14 ivan Exp $
 # 
 # Create and export config files for sendmail, qmail
 #
@@ -42,7 +42,10 @@
 # /var/spool/freeside/conf and sendmail updates ivan@sisd.com 98-aug-14
 #
 # $Log: svc_acct_sm.export,v $
-# Revision 1.4  2000-06-29 14:02:29  ivan
+# Revision 1.5  2000-07-03 09:03:14  ivan
+# added sendmailrestart and sendmailconfigpath config files
+#
+# Revision 1.4  2000/06/29 14:02:29  ivan
 # add sendmailrestart configuration file
 #
 # Revision 1.3  2000/06/12 08:37:56  ivan
@@ -67,15 +70,18 @@ adminsuidsetup $user;
 
 $conf = new FS::Conf;
 
-my($shellmachine);
-my(@qmailmachines);
+my($shellmachine, @qmailmachines);
 if ( $conf->exists('qmailmachines') ) {
   $shellmachine = $conf->config('shellmachine');
   @qmailmachines = $conf->config('qmailmachines');
 }
 
-my @sendmailmachines = $conf->config('sendmailmachines')
-  if $conf->exists('sendmailmachines');
+my(@sendmailmachines, $sendmailconfigpath, $sendmailrestart);
+if $conf->exists('sendmailmachines') {
+  @sendmailmachines = $conf->config('sendmailmachines');
+  $sendmailconfigpath = $conf->config('sendmailconfigpath') || '/etc';
+  $sendmailrestart = $conf->config('sendmailrestart');
+}
 
 my $mydomain = $conf->config('domain');
 
@@ -186,15 +192,15 @@ close VIRTUALDOMAINS;
 
 my($sendmailmachine);
 foreach $sendmailmachine (@sendmailmachines) {
-  scp("$spooldir/sendmail.cw","root\@$sendmailmachine:/etc/sendmail.cw.new")
+  scp("$spooldir/sendmail.cw","root\@$sendmailmachine:$sendmailconfigpath/sendmail.cw.new")
     == 0 or die "scp error: $!";
-  scp("$spooldir/virtusertable","root\@$sendmailmachine:/etc/virtusertable.new")
+  scp("$spooldir/virtusertable","root\@$sendmailmachine:$sendmailconfigpath/virtusertable.new")
     == 0 or die "scp error: $!";
   ssh("root\@$sendmailmachine",
     "( ".
-      "mv /etc/sendmail.cw.new /etc/sendmail.cw; ".
-      "mv /etc/virtusertable.new /etc/virtusertable; ".
-      #"/etc/init.d/sendmail restart; ".
+      "mv $sendmailconfigpath/sendmail.cw.new $sendmailconfigpath/sendmail.cw; ".
+      "mv $sendmailconfigpath/virtusertable.new $sendmailconfigpath/virtusertable; ".
+      $sendmailrestart.
     " )"
   )
     == 0 or die "ssh error: $!";
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index 5aa9c66fd..c824b74c8 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -61,6 +61,7 @@ All further configuration files and directories are located in
           <li>registries/internic/to - Email address to which InterNIC domain registrations are sent.
         </ul>
     </ul>
+  <li>sendmailconfigpath - Sendmail configuration file path - defaults to `/etc'.  Many newer distributions use `/etc/mail'.
   <li>sendmailmachines - Your sendmail machines, one per line.  This enables export of `/etc/virtusertable' and `/etc/sendmail.cw'.
   <li>sendmailrestart - If defined, the command which is run on sendmail machines after files are copied.
   <li>shellmachine - A single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines', it also enables `.qmail-extension' file maintenance.
-- 
cgit v1.2.1


From 755e9d4966f0c09d846ad1b96f5a549ff6cd915a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Jul 2000 09:09:14 +0000
Subject: typo

---
 bin/svc_acct_sm.export | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/svc_acct_sm.export b/bin/svc_acct_sm.export
index 0893c94df..2627496c3 100755
--- a/bin/svc_acct_sm.export
+++ b/bin/svc_acct_sm.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.export,v 1.5 2000-07-03 09:03:14 ivan Exp $
+# $Id: svc_acct_sm.export,v 1.6 2000-07-03 09:09:14 ivan Exp $
 # 
 # Create and export config files for sendmail, qmail
 #
@@ -42,7 +42,10 @@
 # /var/spool/freeside/conf and sendmail updates ivan@sisd.com 98-aug-14
 #
 # $Log: svc_acct_sm.export,v $
-# Revision 1.5  2000-07-03 09:03:14  ivan
+# Revision 1.6  2000-07-03 09:09:14  ivan
+# typo
+#
+# Revision 1.5  2000/07/03 09:03:14  ivan
 # added sendmailrestart and sendmailconfigpath config files
 #
 # Revision 1.4  2000/06/29 14:02:29  ivan
@@ -77,7 +80,7 @@ if ( $conf->exists('qmailmachines') ) {
 }
 
 my(@sendmailmachines, $sendmailconfigpath, $sendmailrestart);
-if $conf->exists('sendmailmachines') {
+if ( $conf->exists('sendmailmachines') ) {
   @sendmailmachines = $conf->config('sendmailmachines');
   $sendmailconfigpath = $conf->config('sendmailconfigpath') || '/etc';
   $sendmailrestart = $conf->config('sendmailrestart');
-- 
cgit v1.2.1


From 3b998c1d6a308992f368d32c5dd5c901f262fed8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Jul 2000 09:13:10 +0000
Subject: get rid of double sendmailrestart invocation; no need for multiple
 sessions

---
 bin/svc_acct_sm.export | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bin/svc_acct_sm.export b/bin/svc_acct_sm.export
index 2627496c3..56c6115a6 100755
--- a/bin/svc_acct_sm.export
+++ b/bin/svc_acct_sm.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.export,v 1.6 2000-07-03 09:09:14 ivan Exp $
+# $Id: svc_acct_sm.export,v 1.7 2000-07-03 09:13:10 ivan Exp $
 # 
 # Create and export config files for sendmail, qmail
 #
@@ -42,7 +42,10 @@
 # /var/spool/freeside/conf and sendmail updates ivan@sisd.com 98-aug-14
 #
 # $Log: svc_acct_sm.export,v $
-# Revision 1.6  2000-07-03 09:09:14  ivan
+# Revision 1.7  2000-07-03 09:13:10  ivan
+# get rid of double sendmailrestart invocation; no need for multiple sessions
+#
+# Revision 1.6  2000/07/03 09:09:14  ivan
 # typo
 #
 # Revision 1.5  2000/07/03 09:03:14  ivan
@@ -207,10 +210,6 @@ foreach $sendmailmachine (@sendmailmachines) {
     " )"
   )
     == 0 or die "ssh error: $!";
-  if ( $conf->config('sendmailrestart') ) {
-    ssh("root\@$sendmailmachine", $conf->config('sendmailrestart') )
-      == 0 or die "ssh error: $!";
-  }
 }
 
 my($qmailmachine);
-- 
cgit v1.2.1


From 24a036da06d8418666d966895aa94cf0675318fd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Jul 2000 13:42:37 +0000
Subject: noted a API inconsistancy

---
 FS/FS/svc_acct.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 26c634be3..a59d86331 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -472,7 +472,7 @@ sub radius {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.7 2000-06-29 11:56:52 ivan Exp $
+$Id: svc_acct.pm,v 1.8 2000-07-04 13:42:37 ivan Exp $
 
 =head1 BUGS
 
@@ -482,6 +482,10 @@ The bits which ssh should fork before doing so.
 
 The $recref stuff in sub check should be cleaned up.
 
+The suspend, unsuspend and cancel methods update the database, but not the
+current object.  This is probably a bug as it's unexpected and
+counterintuitive.
+
 =head1 SEE ALSO
 
 L<FS::svc_Common>, L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>,
-- 
cgit v1.2.1


From ab67932df5b5999bcc0a94b3020bba7f57dd4980 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Jul 2000 03:37:24 +0000
Subject: don't error out on invalid svc_acct_sm.domuid's that can't be matched
 in svc_acct.uid - just warn.

---
 bin/svc_acct_sm.export | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/bin/svc_acct_sm.export b/bin/svc_acct_sm.export
index 56c6115a6..bda17e332 100755
--- a/bin/svc_acct_sm.export
+++ b/bin/svc_acct_sm.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.export,v 1.7 2000-07-03 09:13:10 ivan Exp $
+# $Id: svc_acct_sm.export,v 1.8 2000-07-06 03:37:24 ivan Exp $
 # 
 # Create and export config files for sendmail, qmail
 #
@@ -42,7 +42,11 @@
 # /var/spool/freeside/conf and sendmail updates ivan@sisd.com 98-aug-14
 #
 # $Log: svc_acct_sm.export,v $
-# Revision 1.7  2000-07-03 09:13:10  ivan
+# Revision 1.8  2000-07-06 03:37:24  ivan
+# don't error out on invalid svc_acct_sm.domuid's that can't be matched in
+# svc_acct.uid - just warn.
+#
+# Revision 1.7  2000/07/03 09:13:10  ivan
 # get rid of double sendmailrestart invocation; no need for multiple sessions
 #
 # Revision 1.6  2000/07/03 09:09:14  ivan
@@ -145,6 +149,11 @@ foreach $svc_acct_sm ( qsearch('svc_acct_sm') ) {
   );
   my($domain)=$domain{$domsvc};
   my($svc_acct)=qsearchs('svc_acct',{'uid'=>$domuid});
+  unless ( $svc_acct ) {
+    warn "WARNING: couldn't find svc_acct.uid $domuid (svc_acct_sm.svcnum ".
+         $svc_acct_sm->svcnum. ") - corruped database?\n";
+    next;
+  }
   my($username,$dir,$uid,$gid)=(
     $svc_acct->username,
     $svc_acct->dir,
-- 
cgit v1.2.1


From 61fc4e61c6644d2e0abdffe8cbdfafd4b092e84b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Jul 2000 08:57:28 +0000
Subject: support for radius check attributes (except importing).  poorly
 documented.

---
 FS/FS/svc_acct.pm       | 36 ++++++++++++++++++++++++++++++---
 TODO                    |  6 +++++-
 bin/fs-radius-add       | 53 -------------------------------------------------
 bin/fs-radius-add-check | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
 bin/fs-radius-add-reply | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
 bin/fs-setup            | 29 ++++++++++++++++++++++-----
 bin/svc_acct.export     | 41 ++++++++++++++++++++++++++++++--------
 htdocs/docs/export.html |  2 +-
 8 files changed, 202 insertions(+), 71 deletions(-)
 delete mode 100755 bin/fs-radius-add
 create mode 100755 bin/fs-radius-add-check
 create mode 100755 bin/fs-radius-add-reply

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index a59d86331..558e3838b 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -4,6 +4,7 @@ use strict;
 use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
              $usernamemax $passwordmin
              $shellmachine @saltset @pw_set);
+use Carp;
 use FS::Conf;
 use FS::Record qw( qsearchs fields );
 use FS::svc_Common;
@@ -449,8 +450,19 @@ sub check {
 
 =item radius
 
+Depriciated, use radius_reply instead.
+
+=cut
+
+sub radius {
+  carp "FS::svc_acct::radius depriciated, use radius_reply";
+  $_[0]->radius_reply;
+}
+
+=item radius_reply
+
 Returns key/value pairs, suitable for assigning to a hash, for any RADIUS
-attributes of this record.
+reply attributes of this record.
 
 Note that this is now the preferred method for reading RADIUS attributes - 
 accessing the columns directly is discouraged, as the column names are
@@ -458,7 +470,7 @@ expected to change in the future.
 
 =cut
 
-sub radius { 
+sub radius_reply { 
   my $self = shift;
   map {
     /^(radius_(.*))$/;
@@ -468,11 +480,29 @@ sub radius {
   } grep { /^radius_/ && $self->getfield($_) } fields( $self->table );
 }
 
+=item radius_check
+
+Returns key/value pairs, suitable for assigning to a hash, for any RADIUS
+check attributes of this record.
+
+Accessing RADIUS attributes directly is not supported and will break in the
+future.
+
 =back
 
+sub radius_check {
+  my $self = shift;
+  map {
+    /^(rc_(.*))$/;
+    my($column, $attrib) = ($1, $2);
+    $attrib =~ s/_/\-/g;
+    ( $attrib, $self->getfield($column) );
+  } grep { /^rc_/ && $self->getfield($_) } fields( $self->table );
+}
+
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.8 2000-07-04 13:42:37 ivan Exp $
+$Id: svc_acct.pm,v 1.9 2000-07-06 08:57:27 ivan Exp $
 
 =head1 BUGS
 
diff --git a/TODO b/TODO
index 0d16f157a..99c0b2690 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.47 2000-07-03 09:03:14 ivan Exp $
+$Id: TODO,v 1.48 2000-07-06 08:57:27 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,10 @@ duplication of effort.
 
 ---
 
+hmm - if you delete an account in svc_acct somehow that a mail alias points to,
+svc_acct_sm.export will fail.  make sure this can't be done using
+the web interface.
+
 Bug: during the linking process apparantly you can link too many services to 
 a package.  *sigh*
 
diff --git a/bin/fs-radius-add b/bin/fs-radius-add
deleted file mode 100755
index 707926677..000000000
--- a/bin/fs-radius-add
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/perl -Tw
-
-# quick'n'dirty hack of fs-setup to add radius attributes
-
-use strict;
-use DBI;
-use FS::UID qw(adminsuidsetup checkeuid getsecrets);
-die "Not running uid freeside!" unless checkeuid();
-
-my $user = shift or die &usage;
-getsecrets($user);
-
-my $dbh = adminsuidsetup $user;
-
-###
-
-print "\n\n", <<END, ":";
-Enter the additional RADIUS attributes you need to track for
-each user, separated by whitespace.
-END
-my @attributes = map { s/\-/_/g; $_; } split(" ",&getvalue);
-
-sub getvalue {
-  my($x)=scalar(<STDIN>);
-  chop $x;
-  $x;
-}
-
-###
-
-my($char_d) = 80; #default maxlength for text fields
-
-###
-
-foreach my $attribute ( @attributes ) {
-  foreach my $statement ( 
-    "ALTER TABLE svc_acct ADD radius_$attribute varchar($char_d) NULL",
-    "ALTER TABLE svc_acct ADD radius_$attribute varchar($char_d) NULL",
-    "ALTER TABLE part_svc ADD svc_acct__radius_$attribute varchar($char_d) NULL;",
-    "ALTER TABLE part_svc ADD svc_acct__radius_${attribute}_flag char(1) NULL;",
-  ) {
-    $dbh->do( $statement ) or warn "Error executing $statement: ". $dbh->errstr;  }
-}
-
-$dbh->disconnect or die $dbh->errstr;
-
-print "\n\n", "Now you must run dbdef-create.\n\n";
-
-sub usage {
-  die "Usage:\n  fs-radius-add user\n"; 
-}
-
-
diff --git a/bin/fs-radius-add-check b/bin/fs-radius-add-check
new file mode 100755
index 000000000..435f3e88a
--- /dev/null
+++ b/bin/fs-radius-add-check
@@ -0,0 +1,53 @@
+#!/usr/bin/perl -Tw
+
+# quick'n'dirty hack of fs-setup to add radius attributes
+
+use strict;
+use DBI;
+use FS::UID qw(adminsuidsetup checkeuid getsecrets);
+die "Not running uid freeside!" unless checkeuid();
+
+my $user = shift or die &usage;
+getsecrets($user);
+
+my $dbh = adminsuidsetup $user;
+
+###
+
+print "\n\n", <<END, ":";
+Enter the additional RADIUS check attributes you need to track for
+each user, separated by whitespace.
+END
+my @attributes = map { s/\-/_/g; $_; } split(" ",&getvalue);
+
+sub getvalue {
+  my($x)=scalar(<STDIN>);
+  chop $x;
+  $x;
+}
+
+###
+
+my($char_d) = 80; #default maxlength for text fields
+
+###
+
+foreach my $attribute ( @attributes ) {
+  foreach my $statement ( 
+    "ALTER TABLE svc_acct ADD rc_$attribute varchar($char_d) NULL",
+    "ALTER TABLE svc_acct ADD rc_$attribute varchar($char_d) NULL",
+    "ALTER TABLE part_svc ADD svc_acct__rc_$attribute varchar($char_d) NULL;",
+    "ALTER TABLE part_svc ADD svc_acct__rc_${attribute}_flag char(1) NULL;",
+  ) {
+    $dbh->do( $statement ) or warn "Error executing $statement: ". $dbh->errstr;  }
+}
+
+$dbh->disconnect or die $dbh->errstr;
+
+print "\n\n", "Now you must run dbdef-create.\n\n";
+
+sub usage {
+  die "Usage:\n  fs-radius-add user\n"; 
+}
+
+
diff --git a/bin/fs-radius-add-reply b/bin/fs-radius-add-reply
new file mode 100755
index 000000000..23a8d78a3
--- /dev/null
+++ b/bin/fs-radius-add-reply
@@ -0,0 +1,53 @@
+#!/usr/bin/perl -Tw
+
+# quick'n'dirty hack of fs-setup to add radius attributes
+
+use strict;
+use DBI;
+use FS::UID qw(adminsuidsetup checkeuid getsecrets);
+die "Not running uid freeside!" unless checkeuid();
+
+my $user = shift or die &usage;
+getsecrets($user);
+
+my $dbh = adminsuidsetup $user;
+
+###
+
+print "\n\n", <<END, ":";
+Enter the additional RADIUS reply attributes you need to track for
+each user, separated by whitespace.
+END
+my @attributes = map { s/\-/_/g; $_; } split(" ",&getvalue);
+
+sub getvalue {
+  my($x)=scalar(<STDIN>);
+  chop $x;
+  $x;
+}
+
+###
+
+my($char_d) = 80; #default maxlength for text fields
+
+###
+
+foreach my $attribute ( @attributes ) {
+  foreach my $statement ( 
+    "ALTER TABLE svc_acct ADD radius_$attribute varchar($char_d) NULL",
+    "ALTER TABLE svc_acct ADD radius_$attribute varchar($char_d) NULL",
+    "ALTER TABLE part_svc ADD svc_acct__radius_$attribute varchar($char_d) NULL;",
+    "ALTER TABLE part_svc ADD svc_acct__radius_${attribute}_flag char(1) NULL;",
+  ) {
+    $dbh->do( $statement ) or warn "Error executing $statement: ". $dbh->errstr;  }
+}
+
+$dbh->disconnect or die $dbh->errstr;
+
+print "\n\n", "Now you must run dbdef-create.\n\n";
+
+sub usage {
+  die "Usage:\n  fs-radius-add user\n"; 
+}
+
+
diff --git a/bin/fs-setup b/bin/fs-setup
index 002a4ed4c..ac8ff5eb7 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.25 2000-06-29 12:00:49 ivan Exp $
+# $Id: fs-setup,v 1.26 2000-07-06 08:57:27 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.25  2000-06-29 12:00:49  ivan
+# Revision 1.26  2000-07-06 08:57:27  ivan
+# support for radius check attributes (except importing).  poorly documented.
+#
+# Revision 1.25  2000/06/29 12:00:49  ivan
 # support for pre-encrypted md5 passwords.
 #
 # Revision 1.24  2000/03/02 07:44:07  ivan
@@ -127,9 +130,16 @@ print "\nEnter the maximum username length: ";
 my($username_len)=&getvalue;
 
 print "\n\n", <<END, ":";
-Freeside tracks the RADIUS attributes User-Name, Password and Framed-IP-Address
-for each user.  Enter any additional RADIUS attributes you need to track for
-each user, separated by whitespace.
+Freeside tracks the RADIUS attributes User-Name, check attribute Password and
+reply attribute Framed-IP-Address for each user.  You can specify additional
+check and reply attributes.  First enter any additional RADIUS check attributes
+you need to track for each user, separated by whitespace.
+END
+my @check_attributes = map { s/\-/_/g; $_; } split(" ",&getvalue);
+
+print "\n\n", <<END, ":";
+Now enter any additional reply attributes you need to track for each user,
+separated by whitespace.
 END
 my @attributes = map { s/\-/_/g; $_; } split(" ",&getvalue);
 
@@ -186,6 +196,15 @@ foreach $attribute (@attributes) {
   ));
 }
 
+foreach $attribute (@check_attributes) {
+  $svc_acct->addcolumn( new FS::dbdef_column (
+    'rc_'. $attribute,
+    'varchar',
+    'NULL',
+    $char_d,
+  ));
+}
+
 #make part_svc table (but now as object)
 
 my($part_svc)=$dbdef->table('part_svc');
diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 53fd1f0c7..57be2ddb7 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.14 2000-06-29 15:01:25 ivan Exp $
+# $Id: svc_acct.export,v 1.15 2000-07-06 08:57:28 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,7 +38,10 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.14  2000-06-29 15:01:25  ivan
+# Revision 1.15  2000-07-06 08:57:28  ivan
+# support for radius check attributes (except importing).  poorly documented.
+#
+# Revision 1.14  2000/06/29 15:01:25  ivan
 # another silly typo in svc_acct.export
 #
 # Revision 1.13  2000/06/28 12:37:28  ivan
@@ -240,16 +243,24 @@ foreach $svc_acct (@svc_acct) {
       print ACP_DIALUP $svc_acct->username, "\t*\t", $svc_acct->slipip, "\n";
     }
 
-    my %radius = $svc_acct->radius;
+    my %radreply = $svc_acct->radius_reply;
+    my %radcheck = $svc_acct->radius_check;
+
+    my $radcheck = join ", ", map { qq($_ = "$radcheck{$_}") } keys %radcheck;
+    $radcheck .= ", " if $radcheck;
 
     ###
     # FORMAT OF THE USERS FILE HERE
     print USERS
-      $svc_acct->username, qq(\t${textradiusprepend}Password = "$rpassword"\n\t),
-      join ",\n\t", map { qq($_ = "$radius{$_}") } keys %radius;
+      $svc_acct->username,
+      qq(\t${textradiusprepend}),
+      $radcheck,
+      qq(Password = "$rpassword"\n\t),
+      join ",\n\t", map { qq($_ = "$radreply{$_}") } keys %radreply;
     
     if ( $ip && $ip ne '0e0' ) {
-      print USERS qq(,\n\tFramed-Address = "$ip"\n\n);
+      #print USERS qq(,\n\tFramed-Address = "$ip"\n\n);
+      print USERS qq(,\n\tFramed-IP-Address = "$ip"\n\n);
     } else {
       print USERS qq(\n\n);
     }
@@ -257,6 +268,7 @@ foreach $svc_acct (@svc_acct) {
     ###
     # ICRADIUS export
     if ( $icradiusmachines ) {
+
       my $sth = $icradius_dbh->prepare(
         "INSERT INTO radcheck ( id, UserName, Attribute, Value ) VALUES ( ".
         join(", ", map { $icradius_dbh->quote( $_ ) } (
@@ -268,14 +280,27 @@ foreach $svc_acct (@svc_acct) {
       );
       $sth->execute or die "Can't insert into radcheck table: ". $sth->errstr;
 
-      foreach my $attribute ( keys %radius ) {
+      foreach my $attribute ( keys %radcheck ) {
+        my $sth = $icradius_dbh->prepare(
+          "INSERT INTO radcheck ( id, UserName, Attribute, Value ) VALUES ( ".
+          join(", ", map { $icradius_dbh->quote( $_ ) } (
+            '',
+            $svc_acct->username,
+            $attribute
+            $radcheck{$attribute},
+          ) ). " )"
+        );
+        $sth->execute or die "Can't insert into radcheck table: ". $sth->errstr;
+      }
+
+      foreach my $attribute ( keys %radreply ) {
         my $sth = $icradius_dbh->prepare(
           "INSERT INTO radreply (id, UserName, Attribute, Value) VALUES ( ".
           join(", ", map { $icradius_dbh->quote( $_ ) } (
             '',
             $svc_acct->username,
             $attribute,
-            $radius{$attribute},
+            $radreply{$attribute},
           ) ). " )"
         );
         $sth->execute or die "Can't insert into radreply table: ". $sth->errstr;
diff --git a/htdocs/docs/export.html b/htdocs/docs/export.html
index 82da86c17..d8bc6946f 100644
--- a/htdocs/docs/export.html
+++ b/htdocs/docs/export.html
@@ -12,7 +12,7 @@ it is reccommended that you replicate the data to an external RADIUS machine rat
         <li>nismachines - <b>passwd</b> and <b>shadow</b> are copied to the <b>/etc/global</b> directory on the remote machine.  If no errors occur, the command <b>( cd /var/yp; make; )</b> is executed on the remote machine.
         <li>erpcdmachines - <b>acp_passwd</b> and <b>acp_dialup</b> are copied to the <b>/usr/annex</b> directory on the remote machine.  If no errors occur, the command <b>( kill -USR1 `cat /usr/annex/erpcd.pid` )</b> is executed on the remote machine. 
         <li>radiusmachines - <b>users</b> is copied to the <b>/etc/raddb</b> directory on the remote machine.  If no errors occur, the command <b>( builddbm )</b> is executed on the remote machine.
-        <li>icradiusmachines - A local radcheck file will be created.  If any machines are specified, the remote MySQL database will be locked and the radcheck table will be copied to the those machines.  You may also need to set the icradius_mysqlsource and/or icradius_mysqldest <a href="config.html">configuration files</a>.
+        <li>icradiusmachines - Local radcheck and radreply tables will be created.  If any machines are specified, the remote MySQL database will be locked and the radcheck table will be copied to the those machines.  You may also need to set the icradius_mysqlsource and/or icradius_mysqldest <a href="config.html">configuration files</a>.  Currently you need to be running MySQL for your Freeside database to use this feature.
       </ul>
     <li>site_perl/svc_acct.pm - If a shellmachine is defined, users can be created, modified and deleted remotely; see below.
       <ul>
-- 
cgit v1.2.1


From df3db34511853d9404a4910c20dcedf0563f02f2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Jul 2000 13:19:18 +0000
Subject: remove duplicate sql statement causing spurious errors

---
 bin/fs-radius-add-check | 1 -
 bin/fs-radius-add-reply | 1 -
 2 files changed, 2 deletions(-)

diff --git a/bin/fs-radius-add-check b/bin/fs-radius-add-check
index 435f3e88a..92523eb95 100755
--- a/bin/fs-radius-add-check
+++ b/bin/fs-radius-add-check
@@ -34,7 +34,6 @@ my($char_d) = 80; #default maxlength for text fields
 
 foreach my $attribute ( @attributes ) {
   foreach my $statement ( 
-    "ALTER TABLE svc_acct ADD rc_$attribute varchar($char_d) NULL",
     "ALTER TABLE svc_acct ADD rc_$attribute varchar($char_d) NULL",
     "ALTER TABLE part_svc ADD svc_acct__rc_$attribute varchar($char_d) NULL;",
     "ALTER TABLE part_svc ADD svc_acct__rc_${attribute}_flag char(1) NULL;",
diff --git a/bin/fs-radius-add-reply b/bin/fs-radius-add-reply
index 23a8d78a3..7938feac6 100755
--- a/bin/fs-radius-add-reply
+++ b/bin/fs-radius-add-reply
@@ -34,7 +34,6 @@ my($char_d) = 80; #default maxlength for text fields
 
 foreach my $attribute ( @attributes ) {
   foreach my $statement ( 
-    "ALTER TABLE svc_acct ADD radius_$attribute varchar($char_d) NULL",
     "ALTER TABLE svc_acct ADD radius_$attribute varchar($char_d) NULL",
     "ALTER TABLE part_svc ADD svc_acct__radius_$attribute varchar($char_d) NULL;",
     "ALTER TABLE part_svc ADD svc_acct__radius_${attribute}_flag char(1) NULL;",
-- 
cgit v1.2.1


From e5d8fd10937c98ef6bfe06ee745cba36d33a9dc5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Jul 2000 13:23:29 +0000
Subject: tyop

---
 bin/svc_acct.export | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 57be2ddb7..636921a40 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.15 2000-07-06 08:57:28 ivan Exp $
+# $Id: svc_acct.export,v 1.16 2000-07-06 13:23:29 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,7 +38,10 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.15  2000-07-06 08:57:28  ivan
+# Revision 1.16  2000-07-06 13:23:29  ivan
+# tyop
+#
+# Revision 1.15  2000/07/06 08:57:28  ivan
 # support for radius check attributes (except importing).  poorly documented.
 #
 # Revision 1.14  2000/06/29 15:01:25  ivan
@@ -286,7 +289,7 @@ foreach $svc_acct (@svc_acct) {
           join(", ", map { $icradius_dbh->quote( $_ ) } (
             '',
             $svc_acct->username,
-            $attribute
+            $attribute,
             $radcheck{$attribute},
           ) ). " )"
         );
-- 
cgit v1.2.1


From aa0ba10d4319ee7cd473776df10abf7a3eec18fc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Jul 2000 13:56:42 +0000
Subject: mis-PODed =back should have been a =cut in conjunction with AUTOLOAD
 this was sure a pain to find

---
 FS/FS/svc_acct.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 558e3838b..56ad5d7fa 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -488,7 +488,7 @@ check attributes of this record.
 Accessing RADIUS attributes directly is not supported and will break in the
 future.
 
-=back
+=cut
 
 sub radius_check {
   my $self = shift;
@@ -500,9 +500,11 @@ sub radius_check {
   } grep { /^rc_/ && $self->getfield($_) } fields( $self->table );
 }
 
+=cut
+
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.9 2000-07-06 08:57:27 ivan Exp $
+$Id: svc_acct.pm,v 1.10 2000-07-06 13:56:42 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 31063fe61bb3b76b52832d2e501e997274cdd2b6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 7 Jul 2000 04:05:25 +0000
Subject: wait()ing on SIGCHLD causing hangs for some folks

---
 fs_passwd/fs_passwd_server | 3 ++-
 fs_signup/fs_signup_server | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs_passwd/fs_passwd_server b/fs_passwd/fs_passwd_server
index cb0e693dd..c15c9405d 100755
--- a/fs_passwd/fs_passwd_server
+++ b/fs_passwd/fs_passwd_server
@@ -22,7 +22,8 @@ adminsuidsetup $user;
 
 my($shellmachine)=shift or die &usage;
 
-$SIG{CHLD} = sub { wait() };
+#causing trouble for some folks
+#$SIG{CHLD} = sub { wait() };
 
 my($fs_passwdd)="/usr/local/sbin/fs_passwdd";
 
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 1d7ab291b..b5fc23c28 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -28,7 +28,8 @@ my $pkgpart = $agent->pkgpart_hashref;
 
 my $refnum = shift or die &usage;
 
-$SIG{CHLD} = sub { wait() };
+#causing trouble for some folks
+#$SIG{CHLD} = sub { wait() };
 
 my($fs_signupd)="/usr/local/sbin/fs_signupd";
 
-- 
cgit v1.2.1


From 1ed07292e05697854ce709836953ca1c07301723 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 17 Jul 2000 10:36:18 +0000
Subject: documentation updates

---
 htdocs/docs/config.html | 95 +++++++++++++++++++++++++------------------------
 htdocs/docs/export.html | 10 +++---
 2 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index c824b74c8..c500a3336 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -21,36 +21,36 @@ All further configuration files and directories are located in
 `/usr/local/etc/freeside/conf.<i>datasource</i>', for example, 
 `/usr/local/etc/freeside/conf.DBI:Pg:dbname=freeside'
 <ul>
-  <li>address - Your company name and address, four lines.
-  <li>apacheroot - The directory containing Apache virtual hosts
-  <li>apachemachine - A machine with the apacheroot directory and user home directories.  The existance of this file enables setup of virtual host directories, and, in conjunction with the `home' configuration file, symlinks into user home directories.
-  <li>apachemachines - Your Apache machines, one per line.  This enables export of `/etc/apache/vhosts.conf', which can be included in your Apache configuration via the <a href="http://www.apache.org/docs/mod/core.html#include">Include</a> directive.
-  <li>bindprimary - Your BIND primary nameserver.  This enables export of /var/named/named.conf and zone files into /var/named
-  <li>bindsecondaries - Your BIND secondary nameservers, one per line.  This enables export of /var/named/named.conf
-  <li>bsdshellmachines - Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/master.passwd'.
-  <li>countrydefault - Default two-letter country code (if not supplied, the default is `US')
-  <li>cybercash2 - <a href="http://www.cybercash.com/cybercash/services/cashreg214.html">CyberCash v2</a> support, four lines: paymentserverhost, paymentserverport, paymentserversecret, and transaction type (`mauthonly' or `mauthcapture').  CCLib.pm is required.
+  <li><a name="address">address</a> - Your company name and address, four lines.
+  <li><a name="apacheroot">apacheroot</a> - The directory containing Apache virtual hosts
+  <li><a name="apachemachine">apachemachine</a> - A machine with the apacheroot directory and user home directories.  The existance of this file enables setup of virtual host directories, and, in conjunction with the `home' configuration file, symlinks into user home directories.
+  <li><a name="apachemachines">apachemachines</a> - Your Apache machines, one per line.  This enables export of `/etc/apache/vhosts.conf', which can be included in your Apache configuration via the <a href="http://www.apache.org/docs/mod/core.html#include">Include</a> directive.
+  <li><a name="bindprimary">bindprimary</a> - Your BIND primary nameserver.  This enables export of /var/named/named.conf and zone files into /var/named
+  <li><a name="bindsecondaries">bindsecondaries</a> - Your BIND secondary nameservers, one per line.  This enables export of /var/named/named.conf
+  <li><a name="bsdshellmachines">bsdshellmachines</a> - Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/master.passwd'.
+  <li><a name="countrydefault">countrydefault</a> - Default two-letter country code (if not supplied, the default is `US')
+  <li><a name="cybercash2">cybercash2</a> - <a href="http://www.cybercash.com/cybercash/services/cashreg214.html">CyberCash v2</a> support, four lines: paymentserverhost, paymentserverport, paymentserversecret, and transaction type (`mauthonly' or `mauthcapture').  CCLib.pm is required.
   <li>cybercash3.2 - <a href="http://www.cybercash.com/cybercash/services/technology.html">CyberCash v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly' or `mauthcapture').  CCMckLib3_2.pm, CCMckDirectLib3_2.pm and CCMckErrno3_2 are required.
-  <li>deletecustomers - The existance of this file will enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that this customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers' packages if they cancel service.
-  <li>domain - Your domain name.
-  <li>editreferrals - The existance of this file will allow you to change the referral of existing customers.
-  <li>erpcdmachines - Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd' and `/usr/annex/acp_dialup'.
-  <li>hidecancelledpackages - The existance of this file will prevent cancelled packages from showing up in listings (though they will still be in the database)
-  <li>hidecancelledcustomers - The existance of this file will prevent customers with only cancelled packages from showing up in listings (though they will still be in the database)
-  <li>home - For new users, prefixed to usrename to create a directory name.  Should have a leading but not a trailing slash.
-  <li>icradiusmachines - Your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines, one per line.  The existance of this file (even if empty) turns on radcheck table creation (in the freeside database - the radcheck table needs to be created manually).  Machines listed in this file will have the radcheck table exported to them.  Each line of this file should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: "<CODE>radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd</CODE>".  Note that to use ICRADIUS export you need to be using MySQL.
-  <li>icradius_mysqldest - Destination directory for the MySQL databases, on the ICRADIUS machines.  Defaults to "/usr/local/var/".
-  <li>icradius_mysqlsource - Source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".
-  <li>invoice_from - Return address on email invoices.
-  <li>lpr - Print command for paper invoices, for example `lpr -h'.
-  <li>maildisablecatchall - The existance of this file will disable the requirement that each virtual domain have a catch-all mailbox.
-  <li>mxmachines - MX entries for new domains, weight and machine, one per line, with trailing `.'
-  <li>nsmachines - NS nameservers for new domains, one per line, with trailing `.'
-  <li>nismachines - Your NIS master (not slave master) machines, one per line.  This enables export of `/etc/global/passwd' and `/etc/global/shadow'.
-  <li>passwordmin - Minimum password length (default 6);
-  <li>qmailmachines - Your qmail machines, one per line.  This enables export of `/var/qmail/control/virtualdomains', `/var/qmail/control/recipientmap', and `/var/qmail/control/rcpthosts'.  The existance of this file (even if empty) also turns on user `.qmail-extension' file maintenance in conjunction with `shellmachine'.
-  <li>radiusmachines - Your RADIUS authentication machines, one per line.  This enables export of `/etc/raddb/users'.
-  <li>registries - Directory which contains domain registry information.  Each registry is a directory.
+  <li><a name="deletecustomers">deletecustomers</a> - The existance of this file will enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that this customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers' packages if they cancel service.
+  <li><a name="domain">domain</a> - Your domain name.
+  <li><a name="editreferrals">editreferrals</a> - The existance of this file will allow you to change the referral of existing customers.
+  <li><a name="erpcdmachines">erpcdmachines</a> - Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd' and `/usr/annex/acp_dialup'.
+  <li><a name="hidecancelledpackages">hidecancelledpackages</a> - The existance of this file will prevent cancelled packages from showing up in listings (though they will still be in the database)
+  <li><a name="hidecancelledcustomers">hidecancelledcustomers</a> - The existance of this file will prevent customers with only cancelled packages from showing up in listings (though they will still be in the database)
+  <li><a name="home">home</a> - For new users, prefixed to usrename to create a directory name.  Should have a leading but not a trailing slash.
+  <li><a name="icradiusmachines">icradiusmachines</a> - Your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines, one per line.  The existance of this file (even if empty) turns on radcheck table creation (in the freeside database - the radcheck table needs to be created manually).  Machines listed in this file will have the radcheck table exported to them.  Each line of this file should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: "<CODE>radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd</CODE>".  Note that to use ICRADIUS export you need to be using MySQL.
+  <li><a name="icradius_mysqldest">icradius_mysqldest</a> - Destination directory for the MySQL databases, on the ICRADIUS machines.  Defaults to "/usr/local/var/".
+  <li><a name="icradius_mysqlsource">icradius_mysqlsource</a> - Source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".
+  <li><a name="invoice_from">invoice_from</a> - Return address on email invoices.
+  <li><a name="lpr">lpr</a> - Print command for paper invoices, for example `lpr -h'.
+  <li><a name="maildisablecatchall">maildisablecatchall</a> - The existance of this file will disable the requirement that each virtual domain have a catch-all mailbox.
+  <li><a name="mxmachines">mxmachines</a> - MX entries for new domains, weight and machine, one per line, with trailing `.'
+  <li><a name="nsmachines">nsmachines</a> - NS nameservers for new domains, one per line, with trailing `.'
+  <li><a name="nismachines">nismachines</a> - Your NIS master (not slave master) machines, one per line.  This enables export of `/etc/global/passwd' and `/etc/global/shadow'.
+  <li><a name="passwordmin">passwordmin</a> - Minimum password length (default 6);
+  <li><a name="qmailmachines">qmailmachines</a> - Your qmail machines, one per line.  This enables export of `/var/qmail/control/virtualdomains', `/var/qmail/control/recipientmap', and `/var/qmail/control/rcpthosts'.  The existance of this file (even if empty) also turns on user `.qmail-extension' file maintenance in conjunction with `shellmachine'.
+  <li><a name="radiusmachines">radiusmachines</a> - Your RADIUS authentication machines, one per line.  This enables export of `/etc/raddb/users'.
+  <li><a name="registries">registries</a> - Directory which contains domain registry information.  Each registry is a directory.
     <ul>
       <li>registries/internic - Currently the only supported registry
         <ul>
@@ -61,23 +61,26 @@ All further configuration files and directories are located in
           <li>registries/internic/to - Email address to which InterNIC domain registrations are sent.
         </ul>
     </ul>
-  <li>sendmailconfigpath - Sendmail configuration file path - defaults to `/etc'.  Many newer distributions use `/etc/mail'.
-  <li>sendmailmachines - Your sendmail machines, one per line.  This enables export of `/etc/virtusertable' and `/etc/sendmail.cw'.
-  <li>sendmailrestart - If defined, the command which is run on sendmail machines after files are copied.
-  <li>shellmachine - A single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines', it also enables `.qmail-extension' file maintenance.
-  <li>shellmachines - Your Linux and System V flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/shadow' files.
-  <li>shells - Legal shells (think /etc/shells).  You probably want to `cut -d: -f7 /etc/passwd | sort | uniq' initially so that importing doesn't fail with `Illegal shell' errors, then remove any special entries afterwords.  A blank line specifies that an empty shell is permitted.
-  <li>showpasswords - The existance of this file will allow unencrypted user passwords to be displayed.
-  <li>smtpmachine - SMTP relay for Freeside's outgoing mail.
-  <li>soadefaultttl - SOA default TTL for new domains.
-  <li>soaemail - SOA email for new domains, in BIND form (`.' instead of `@'), with trailing `.'
-  <li>soaexpire - SOA expire for new domains
-  <li>soamachine - SOA machine for new domains, with trailing `.'
-  <li>soarefresh - SOA refresh for new domains
-  <li>soaretry - SOA retry for new domains
-  <li>textradiusprepend - The contents of this file will be prepended to the first line of a user's RADIUS entry in text exports.  If necessary, usually `Auth-Type = Local, '.
-  <li>usernamemin - Minimum username length (default 2);
-  <li>usernamemax - Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)
+  <li><a name="sendmailconfigpath">sendmailconfigpath</a> - Sendmail configuration file path - defaults to `/etc'.  Many newer distributions use `/etc/mail'.
+  <li><a name="sendmailmachines">sendmailmachines</a> - Your sendmail machines, one per line.  This enables export of `/etc/virtusertable' and `/etc/sendmail.cw'.
+  <li><a name="sendmailrestart">sendmailrestart</a> - If defined, the command which is run on sendmail machines after files are copied.
+  <li><a name="shellmachine">shellmachine</a> - A single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines', it also enables `.qmail-extension' file maintenance.
+  <li>shellmachine-useradd - The command(s) to run on shellmachine when an account is created.  If this file does not exist, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If the file exists but is empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.
+  <li>shellmachine-userdel - The command(s) to run on shellmachine when an account is deleted.  If this file does not exist, <code>userdel $username</code> is the default.  If the file exists but is empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.
+  <li>shellmachine-usermod - The command(s) to run on shellmachine when an account is modified.  If this file does not exist or is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.
+  <li><a name="shellmachines">shellmachines</a> - Your Linux and System V flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/shadow' files.
+  <li><a name="shells">shells</a> - Legal shells (think /etc/shells).  You probably want to `cut -d: -f7 /etc/passwd | sort | uniq' initially so that importing doesn't fail with `Illegal shell' errors, then remove any special entries afterwords.  A blank line specifies that an empty shell is permitted.
+  <li><a name="showpasswords">showpasswords</a> - The existance of this file will allow unencrypted user passwords to be displayed.
+  <li><a name="smtpmachine">smtpmachine</a> - SMTP relay for Freeside's outgoing mail.
+  <li><a name="soadefaultttl">soadefaultttl</a> - SOA default TTL for new domains.
+  <li><a name="soaemail">soaemail</a> - SOA email for new domains, in BIND form (`.' instead of `@'), with trailing `.'
+  <li><a name="soaexpire">soaexpire</a> - SOA expire for new domains
+  <li><a name="soamachine">soamachine</a> - SOA machine for new domains, with trailing `.'
+  <li><a name="soarefresh">soarefresh</a> - SOA refresh for new domains
+  <li><a name="soaretry">soaretry</a> - SOA retry for new domains
+  <li><a name="textradiusprepend">textradiusprepend</a> - The contents of this file will be prepended to the first line of a user's RADIUS entry in text exports.  If necessary, usually `Auth-Type = Local, '.
+  <li><a name="usernamemin">usernamemin</a> - Minimum username length (default 2);
+  <li><a name="usernamemax">usernamemax</a> - Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)
 </ul>
 </body>
 
diff --git a/htdocs/docs/export.html b/htdocs/docs/export.html
index d8bc6946f..d92eec346 100644
--- a/htdocs/docs/export.html
+++ b/htdocs/docs/export.html
@@ -12,19 +12,19 @@ it is reccommended that you replicate the data to an external RADIUS machine rat
         <li>nismachines - <b>passwd</b> and <b>shadow</b> are copied to the <b>/etc/global</b> directory on the remote machine.  If no errors occur, the command <b>( cd /var/yp; make; )</b> is executed on the remote machine.
         <li>erpcdmachines - <b>acp_passwd</b> and <b>acp_dialup</b> are copied to the <b>/usr/annex</b> directory on the remote machine.  If no errors occur, the command <b>( kill -USR1 `cat /usr/annex/erpcd.pid` )</b> is executed on the remote machine. 
         <li>radiusmachines - <b>users</b> is copied to the <b>/etc/raddb</b> directory on the remote machine.  If no errors occur, the command <b>( builddbm )</b> is executed on the remote machine.
-        <li>icradiusmachines - Local radcheck and radreply tables will be created.  If any machines are specified, the remote MySQL database will be locked and the radcheck table will be copied to the those machines.  You may also need to set the icradius_mysqlsource and/or icradius_mysqldest <a href="config.html">configuration files</a>.  Currently you need to be running MySQL for your Freeside database to use this feature.
+        <li>icradiusmachines - Local radcheck and radreply tables will be created.  If any machines are specified, the remote MySQL database will be locked and the radcheck table will be copied to the those machines.  You may also need to set the <a href="config.html#icradius_mysqlsource">icradius_mysqlsource</a> and/or <a href="config.html#icradius_mysqldest">icradius_mysqldest</a> configuration files.  Currently you need to be running MySQL for your Freeside database to use this feature.
       </ul>
     <li>site_perl/svc_acct.pm - If a shellmachine is defined, users can be created, modified and deleted remotely; see below.
       <ul>
-        <li>The command <b>useradd -d <i>homedir</i> -s <i>shell</i> -u <i>uid</i> <i>username</i></b> is executed when a user is added.
-        <li>The command <b>userdel <i>username</i></b> is executed with a user is deleted.
-        <li>If a user's home directory changes, the command <b>[ -d <i>old_homedir</i> &amp;&amp; ( chmod u+t <i>old_homedir</i>; umask 022; mkdir <i>new_homedir</i>; cd <i>old_homedir</i>; find . -depth -print | cpio -pdm <i>new_homedir</i>; chmod u-t <i>new_homedir</i>; chown -R <i>uid</i>.<i>gid</i> <i>new_homedir</i>; rm -rf <i>old_homedir</i> )</b> is executed.
+        <li>Account creation - If the <b>username</b>, <b>uid</b> and <b>dir</b> fields are defined for a new user, the command(s) specified in the <a href="config.html#shellmachine-useradd">shellmachine-useradd</a> configuration file are executed on shellmachine via ssh.  If this file does not exist, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If the file exists but is empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.
+        <li>Account deletion - The command(s) specified in the <a href="config.html#shellmachine-userdel">shellmachine-userdel</a> configuration file are executed on shellmachine via ssh.  If this file does not exist, <code>userdel $username</code> is the default.  If the file exists but is empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.
+        <li>Account modification - If a user's home directory changes, the command(s) specified in the <a href="config.html#shellmachine-usermod">shellmachine-usermod</a> configuration file are execute on shellmachine via ssh.  If this file does not exist or is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.
       </ul>
     <li>bin/svc_acct_sm.export will create <a href="http://www.qmail.org">Qmail</a> <b>rcpthosts</b>, <b>recipientmap</b> and <b>virtualdomains</b> files and <a href="http://www.sendmail.org">Sendmail</a> <b>virtusertable</b> and <b>sendmail.cw</b> files in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattemded:
       <ul>
         <li>qmailmachines - <b>recipientmap</b>, <b>virtualdomains</b> and <b>rcpthosts</b> are copied to the <b>/var/qmail/control</b> directory on the remote machine.  Note: If you <a href="legacy.html#svc_acct_sm">imported</a> qmail configuration files, run the generated <b>/usr/local/etc/freeside/export.<i>datasrc</i>/virtualdomains.FIX</b> on a machine with your user home directories before exporting qmail configuration files.
         <li>shellmachine - The command <b>[ -e <i>homedir</i>/.qmail-default ] || { touch <i>homedir</i>/.qmail-default; chown <i>uid</i>.<i>gid</i> <i>homedir</i>/.qmail-default; }</b> will be run on this machine for users in the virtualdomains file.
-        <li>sendmailmachines - <b>sendmail.cw</b> and <b>virtusertable</b> are copied to the remote machine as <b>/etc/sendmail.cw.new</b> and <b>/etc/virtusertable.new</b> and moved to <b>/etc/sendmail.cw</b> and <b>/etc/virtusertable</b> if no errors occur.
+        <li>sendmailmachines - <b>sendmail.cw</b> and <b>virtusertable</b> are copied to the remote machine as <b>/etc/sendmail.cw.new</b> and <b>/etc/virtusertable.new</b>.  If no errors occur, they are moved to <b>/etc/sendmail.cw</b> and <b>/etc/virtusertable</b> and the command specified in the <a href="config.html#sendmailrestart">sendmailrestart</a> configuration file is executed.  (The path can be changed from the default <b>/etc</b> with the <a href="config.html#sendmailconfigpath">sendmailconfigpath</a> configuration file.)
       </ul>
     <li>site_perl/svc_acct_sm.pm - If the qmailmachines configuration file exists and a shellmachine is defined, user <b>.qmail-</b> files can be updated.
       <ul>
-- 
cgit v1.2.1


From 154bcdd38c7ad508885a9c76ab5afc96ed4d9373 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 17 Jul 2000 10:36:43 +0000
Subject: rawr!

---
 CREDITS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CREDITS b/CREDITS
index 9dbed100d..e97167761 100644
--- a/CREDITS
+++ b/CREDITS
@@ -56,7 +56,8 @@ export, cancel-unaudited.cgi), patches to support billing date modification,
 and probably other things too (sorry if I forgot them).
 
 Kenny Elliott <kenny@neoserve.com> contributed ICRADIUS radreply table support,
-allowing attributes with ICRADIUS.
+allowing attributes with ICRADIUS, helped fix many bugs, and some
+other stuff I can't recall (sorry).
 
 Stephen Amadei <amadei@dandy.net> contribued portability cleanups for the
 low-level DBI stuff.
-- 
cgit v1.2.1


From ec0441faaefa3fa2bd41e88ddc4bd3049198612a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 17 Jul 2000 10:37:27 +0000
Subject: make remote commands configurable

---
 FS/FS/svc_acct.pm | 119 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 73 insertions(+), 46 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 56ad5d7fa..5986bff87 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -3,7 +3,8 @@ package FS::svc_acct;
 use strict;
 use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
              $usernamemax $passwordmin
-             $shellmachine @saltset @pw_set);
+             $shellmachine $useradd $usermod $userdel 
+             @saltset @pw_set);
 use Carp;
 use FS::Conf;
 use FS::Record qw( qsearchs fields );
@@ -23,6 +24,27 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
   $usernamemin = $conf->config('usernamemin') || 2;
   $usernamemax = $conf->config('usernamemax');
   $passwordmin = $conf->config('passwordmin') || 6;
+  if ( $shellmachine ) {
+    if ( $conf->exists('shellmachine-useradd') ) {
+      $useradd = join("\n", $conf->config('shellmachine-useradd') )
+                 || 'cp -pr /etc/skel $dir; chown -R $uid.$gid $dir';
+    } else {
+      $useradd = 'useradd -d $dir -m -s $shell -u $uid $username';
+    }
+    if ( $conf->exists('shellmachine-userdel') ) {
+      $userdel = join("\n", $conf->config('shellmachine-userdel') )
+                 || 'rm -rf $dir';
+    } else {
+      $userdel = 'userdel $username';
+    }
+    $usermod = join("\n", $conf->config('shellmachine-usermod') )
+               || '[ -d $old_dir ] && mv $old_dir $new_dir || ( '.
+                    'chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; '.
+                    'find . -depth -print | cpio -pdm $new_dir; '.
+                    'chmod u-t $new_dir; chown -R $uid.$gid $new_dir; '.
+                    'rm -rf $old_dir'.
+                  ')';
+  }
 };
 
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
@@ -111,12 +133,21 @@ The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be
 defined.  An FS::cust_svc record will be created and inserted.
 
 If the configuration value (see L<FS::Conf>) shellmachine exists, and the 
-username, uid, and dir fields are defined, the command
+username, uid, and dir fields are defined, the command(s) specified in
+the shellmachine-useradd configuration are exectued on shellmachine via ssh.
+This behaviour can be surpressed by setting $FS::svc_acct::nossh_hack true.
+If the shellmachine-useradd configuration file does not exist,
 
   useradd -d $dir -m -s $shell -u $uid $username
 
-is executed on shellmachine via ssh.  This behaviour can be surpressed by
-setting $FS::svc_acct::nossh_hack true.
+is the default.  If the shellmachine-useradd configuration file exists but
+it empty,
+
+  cp -pr /etc/skel $dir; chown -R $uid.$gid $dir
+
+is the default instead.  Otherwise the contents of the file are treated as
+a double-quoted perl string, with the following variables available:
+$username, $uid, $gid, $dir, and $shell.
 
 =cut
 
@@ -148,26 +179,15 @@ sub insert {
   $error = $self->SUPER::insert;
   return $error if $error;
 
-  my ( $username, $uid, $dir, $shell ) = (
+  my( $username, $uid, $gid, $dir, $shell ) = (
     $self->username,
     $self->uid,
+    $self->gid,
     $self->dir,
     $self->shell,
   );
-  if ( $username 
-       && $uid
-       && $dir
-       && $shellmachine
-       && ! $nossh_hack ) {
-    #one way
-    ssh("root\@$shellmachine",
-        "useradd -d $dir -m -s $shell -u $uid $username"
-    );
-    #another way
-    #ssh("root\@$shellmachine","/bin/mkdir $dir; /bin/chmod 711 $dir; ".
-    #  "/bin/cp -p /etc/skel/.* $dir 2>/dev/null; ".
-    #  "/bin/cp -pR /etc/skel/Maildir $dir 2>/dev/null; ".
-    #  "/bin/chown -R $uid $dir") unless $nossh_hack;
+  if ( $username && $uid && $dir && $shellmachine && ! $nossh_hack ) {
+    ssh("root\@$shellmachine", eval "$useradd");
   }
 
   ''; #no error
@@ -180,12 +200,22 @@ error, otherwise returns false.
 
 The corresponding FS::cust_svc record will be deleted as well.
 
-If the configuration value (see L<FS::Conf>) shellmachine exists, the command:
+If the configuration value (see L<FS::Conf>) shellmachine exists, the
+command(s) specified in the shellmachine-userdel configuration file are
+executed on shellmachine via ssh.  This behavior can be surpressed by setting
+$FS::svc_acct::nossh_hack true.  If the shellmachine-userdel configuration
+file does not exist,
 
   userdel $username
 
-is executed on shellmachine via ssh.  This behaviour can be surpressed by
-setting $FS::svc_acct::nossh_hack true.
+is the default.  If the shellmachine-userdel configuration file exists but
+is empty,
+
+  rm -rf $dir
+
+is the default instead.  Otherwise the contents of the file are treated as a
+double-quoted perl string, with the following variables available:
+$username and $dir.
 
 =cut
 
@@ -203,9 +233,12 @@ sub delete {
   $error = $self->SUPER::delete;
   return $error if $error;
 
-  my $username = $self->username;
+  my( $username, $dir ) = (
+    $self->username,
+    $self->dir,
+  );
   if ( $username && $shellmachine && ! $nossh_hack ) {
-    ssh("root\@$shellmachine","userdel $username");
+    ssh("root\@$shellmachine", eval "$userdel");
   }
 
   '';
@@ -217,11 +250,13 @@ Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
 If the configuration value (see L<FS::Conf>) shellmachine exists, and the 
-dir field has changed, the command:
+dir field has changed, the command(s) specified in the shellmachine-usermod
+configuraiton file are executed on shellmachine via ssh.  This behavior can
+be surpressed by setting $FS::svc-acct::nossh_hack true.  If the
+shellmachine-userdel configuration file does not exist or is empty, :
 
-  [ -d $old_dir ] && (
+  [ -d $old_dir ] && mv $old_dir $new_dir || (
     chmod u+t $old_dir;
-    umask 022;
     mkdir $new_dir;
     cd $old_dir;
     find . -depth -print | cpio -pdm $new_dir;
@@ -258,21 +293,14 @@ sub replace {
   $error = $new->SUPER::replace($old);
   return $error if $error;
 
-  my ( $old_dir, $new_dir ) = ( $old->getfield('dir'), $new->getfield('dir') );
-  my ( $uid, $gid) = ( $new->getfield('uid'), $new->getfield('gid') );
-  if ( $old_dir
-       && $new_dir
-       && $old_dir ne $new_dir
-       && ! $nossh_hack
-  ) {
-    ssh("root\@$shellmachine","[ -d $old_dir ] && ".
-                 "( chmod u+t $old_dir; ". #turn off qmail delivery
-                 "umask 022; mkdir $new_dir; cd $old_dir; ".
-                 "find . -depth -print | cpio -pdm $new_dir; ".
-                 "chmod u-t $new_dir; chown -R $uid.$gid $new_dir; ".
-                 "rm -rf $old_dir". 
-                 ")"
-    );
+  my ( $old_dir, $new_dir, $uid, $gid ) = (
+    $old->getfield('dir'),
+    $new->getfield('dir'),
+    $new->getfield('uid'),
+    $new->getfield('gid'),
+  );
+  if ( $old_dir && $new_dir && $old_dir ne $new_dir && ! $nossh_hack ) {
+    ssh("root\@$shellmachine", eval "$usermod" );
   }
 
   ''; #no error
@@ -504,13 +532,12 @@ sub radius_check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.10 2000-07-06 13:56:42 ivan Exp $
+$Id: svc_acct.pm,v 1.11 2000-07-17 10:37:27 ivan Exp $
 
 =head1 BUGS
 
-The remote commands should be configurable.
-
-The bits which ssh should fork before doing so.
+The bits which ssh should fork before doing so (or maybe queue jobs for a
+daemon).
 
 The $recref stuff in sub check should be cleaned up.
 
-- 
cgit v1.2.1


From 41e9b7ac95959d4392a7aee9b8aef1cc301a1eb6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 17 Jul 2000 10:53:42 +0000
Subject: prevent accounts which are the target of mail aliases from being
 deleted

---
 FS/FS/svc_acct.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 5986bff87..93b657f2d 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -12,6 +12,7 @@ use FS::svc_Common;
 use FS::SSH qw(ssh);
 use FS::part_svc;
 use FS::svc_acct_pop;
+use FS::svc_acct_sm;
 
 @ISA = qw( FS::svc_Common );
 
@@ -223,6 +224,9 @@ sub delete {
   my $self = shift;
   my $error;
 
+  return "Can't delete an account which has mail aliases pointed to it!"
+    if $self->uid && qsearch( 'svc_acct_sm', { 'domuid' => $self->uid } );
+
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE';
@@ -532,7 +536,7 @@ sub radius_check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.11 2000-07-17 10:37:27 ivan Exp $
+$Id: svc_acct.pm,v 1.12 2000-07-17 10:53:42 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 3bff481a0fd820968b94653cb51093900a9fb188 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 17 Jul 2000 10:58:42 +0000
Subject: better error messages if svc_acct or svc_domain records are missing

---
 htdocs/view/svc_acct_sm.cgi | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi
index 51fbc0351..072c94d44 100755
--- a/htdocs/view/svc_acct_sm.cgi
+++ b/htdocs/view/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.10 1999-04-08 12:00:19 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.11 2000-07-17 10:58:42 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi svcnum
 #        http://server.name/path/svc_acct_sm.cgi?svcnum
@@ -20,7 +20,10 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.10  1999-04-08 12:00:19  ivan
+# Revision 1.11  2000-07-17 10:58:42  ivan
+# better error messages if svc_acct or svc_domain records are missing
+#
+# Revision 1.10  1999/04/08 12:00:19  ivan
 # aesthetic update
 #
 # Revision 1.9  1999/02/28 00:04:03  ivan
@@ -88,8 +91,8 @@ if ($pkgnum) {
   $custnum = '';
 }
 
-$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
-die "Unkonwn svcpart" unless $part_svc;
+$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
+  or die "Unkonwn svcpart";
 
 $p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header('Mail Alias View', menubar(
@@ -109,9 +112,11 @@ print $cgi->header( '-expires' => 'now' ), header('Mail Alias View', menubar(
   $svc_acct_sm->domuser,
 );
 $svc = $part_svc->svc;
-$svc_domain = qsearchs('svc_domain',{'svcnum'=>$domsvc});
+$svc_domain = qsearchs('svc_domain',{'svcnum'=>$domsvc})
+  or die "Corrupted database: no svc_domain.svcnum matching domsvc $domsvc";
 $domain = $svc_domain->domain;
-$svc_acct = qsearchs('svc_acct',{'uid'=>$domuid});
+$svc_acct = qsearchs('svc_acct',{'uid'=>$domuid})
+  or die "Corrupted database: no svc_acct.uid matching domuid $domuid";
 $username = $svc_acct->username;
 
 print qq!<A HREF="${p}edit/svc_acct_sm.cgi?$svcnum">Edit this information</A>!,
-- 
cgit v1.2.1


From f661a63aef925a50a7529504070c69dd0f18df80 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 17 Jul 2000 12:49:29 +0000
Subject: better error message if a package isn't linked to a customer (that
 shouldn't happen)

---
 htdocs/search/cust_pkg.cgi | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/htdocs/search/cust_pkg.cgi b/htdocs/search/cust_pkg.cgi
index 033bc2585..c645ad6c1 100755
--- a/htdocs/search/cust_pkg.cgi
+++ b/htdocs/search/cust_pkg.cgi
@@ -1,11 +1,14 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.9 1999-07-17 10:38:52 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.10 2000-07-17 12:49:29 ivan Exp $
 #
 # based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.9  1999-07-17 10:38:52  ivan
+# Revision 1.10  2000-07-17 12:49:29  ivan
+# better error message if a package isn't linked to a customer (that shouldn't happen)
+#
+# Revision 1.9  1999/07/17 10:38:52  ivan
 # scott nelson <scott@ultimanet.com> noticed this mod_perl-triggered bug and
 # gave me a great bugreport at the last rhythmethod
 #
@@ -106,20 +109,28 @@ END
     my($cust_main)=qsearchs('cust_main',{'custnum'=>$cust_pkg->custnum});
     my($pkgnum,$custnum,$name,$company)=(
       $cust_pkg->pkgnum,
-      $cust_main->custnum,
-      $cust_main->last. ', '. $cust_main->first,
-      $cust_main->company,
+      $cust_pkg->custnum,
+      $cust_main ? $cust_main->last. ', '. $cust_main->first : '',
+      $cust_main ? $cust_main->company : '',
     );
     my $p = popurl(2);
     print <<END;
     <TR>
       <TD><A HREF="${p}view/cust_pkg.cgi?$pkgnum"><FONT SIZE=-1>$pkgnum</FONT></A></TD>
+END
+    if ( $cust_main ) {
+      print <<END;
       <TD><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$custnum</A></FONT></TD>
       <TD><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$name</A></FONT></TD>
       <TD><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$company</A></FONT></TD>
     </TR>
 END
-
+    } else {
+      print <<END;
+      <TD COLSPAN=3><FONT SIZE=-1>WARNING: couldn't find cust_main.custnum $custnum (cust_pkg.pkgnum $pkgnum)</TD>
+    </TR>
+END
+    }
   }
  
   print <<END;
-- 
cgit v1.2.1


From 48b905cd57f4b9e0f33e84bcee15b28d812c3d9f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 17 Jul 2000 13:51:07 +0000
Subject: silly mistake

---
 FS/FS/svc_acct.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 93b657f2d..d2e3918da 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -188,7 +188,7 @@ sub insert {
     $self->shell,
   );
   if ( $username && $uid && $dir && $shellmachine && ! $nossh_hack ) {
-    ssh("root\@$shellmachine", eval "$useradd");
+    ssh("root\@$shellmachine", eval qq("$useradd") );
   }
 
   ''; #no error
@@ -242,7 +242,7 @@ sub delete {
     $self->dir,
   );
   if ( $username && $shellmachine && ! $nossh_hack ) {
-    ssh("root\@$shellmachine", eval "$userdel");
+    ssh("root\@$shellmachine", eval qq("$userdel") );
   }
 
   '';
@@ -304,7 +304,7 @@ sub replace {
     $new->getfield('gid'),
   );
   if ( $old_dir && $new_dir && $old_dir ne $new_dir && ! $nossh_hack ) {
-    ssh("root\@$shellmachine", eval "$usermod" );
+    ssh("root\@$shellmachine", eval qq("$usermod") );
   }
 
   ''; #no error
@@ -536,7 +536,7 @@ sub radius_check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.12 2000-07-17 10:53:42 ivan Exp $
+$Id: svc_acct.pm,v 1.13 2000-07-17 13:51:07 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From e890290677daab75e0ce28d5679baddb8a997a8e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 17 Jul 2000 16:45:41 +0000
Subject: first shot at invoice browsing and some other cleanups

---
 htdocs/index.html           |  40 +++++++-----
 htdocs/search/cust_bill.cgi | 146 +++++++++++++++++++++++++++++++++++++++++---
 htdocs/search/cust_main.cgi |   9 ++-
 htdocs/search/cust_pkg.cgi  |   9 ++-
 4 files changed, 174 insertions(+), 30 deletions(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index 052aed3ed..9537b3407 100755
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -36,21 +36,31 @@
         </ul>
       <li><A NAME="browse">Browse</A>
         <ul>
-          <LI><A HREF="search/cust_main.cgi?custnum">customers (by customer number)</A>
-          <LI><A HREF="search/cust_main.cgi?last">customers (by last name)</A>
-          <LI><A HREF="search/cust_main.cgi?company">customers (by company)</A>
-          <LI><A HREF="search/cust_pkg.cgi?pkgnum">packages (by package number)</A>
-          <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
-        <LI><A HREF="search/svc_acct.cgi?svcnum">accounts (by service number)</A>
-          <LI><A HREF="search/svc_acct.cgi?username">accounts (by username)</A>
-          <LI><A HREF="search/svc_acct.cgi?uid">accounts (by uid)</A>
-          <LI><A HREF="search/svc_acct.cgi?UN_svcnum">unlinked accounts (by service number)</A>
-          <LI><A HREF="search/svc_acct.cgi?UN_username">unlinked accounts (by username)</A>
-          <LI><A HREF="search/svc_acct.cgi?UN_uid">unlinked accounts (by uid)</A>
-          <LI><A HREF="search/svc_domain.cgi?svcnum">domains (by service number)</A>
-          <LI><A HREF="search/svc_domain.cgi?domain">domains (by domain)</A>
-          <LI><A HREF="search/svc_domain.cgi?UN_svcnum">unlinked domains (by service number)</A>
-          <LI><A HREF="search/svc_domain.cgi?UN_domain">unlinked domains (by domain)</A>
+          <LI>customers (<A HREF="search/cust_main.cgi?custnum">by customer number</A>) (<A HREF="search/cust_main.cgi?last">by last name</A>) (<A HREF="search/cust_main.cgi?company">by company</A>)
+          <LI>invoices
+            <UL>
+              <LI>open invoices (<A HREF="search/cust_bill.cgi?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN_custnum">by customer number</A>)
+              <LI>30 day open invoices (<A HREF="search/cust_bill.cgi?OPEN30_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN30_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN30_custnum">by customer number</A>)
+              <LI>60 day open invoices (<A HREF="search/cust_bill.cgi?OPEN60_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN60_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN60_custnum">by customer number</A>)
+              <LI>90 day open invoices (<A HREF="search/cust_bill.cgi?OPEN90_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN90_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN90_custnum">by customer number</A>)
+              <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
+              <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>)
+            </UL>
+          <LI>packages
+            <UL>
+              <LI><A HREF="search/cust_pkg.cgi?pkgnum">packages (by package number)</A>
+              <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
+            </UL>
+          <LI>services
+            <UL>
+              <LI>accounts (<A HREF="search/svc_acct.cgi?svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?username">by username</A>) (<A HREF="search/svc_acct.cgi?uid">by uid</A>)
+              <LI>domains (<A HREF="search/svc_domain.cgi?svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?domain">by domain</A>)
+            </UL>
+          <LI>unlinked services
+            <UL>
+              <LI>unlinked accounts (<A HREF="search/svc_acct.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?UN_username">by username</A>) (<A HREF="search/svc_acct.cgi?UN_uid">by uid</A>)
+              <LI>unlinked domains (<A HREF="search/svc_domain.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?UN_domain">by domain</A>)
+            </UL>
         </ul>
       <li><A NAME="admin">Administration</a>
         <ul>
diff --git a/htdocs/search/cust_bill.cgi b/htdocs/search/cust_bill.cgi
index c849341e3..95347032d 100755
--- a/htdocs/search/cust_bill.cgi
+++ b/htdocs/search/cust_bill.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_bill.cgi,v 1.4 1999-02-28 00:03:54 ivan Exp $
+# $Id: cust_bill.cgi,v 1.5 2000-07-17 16:45:41 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_bill.cgi
@@ -11,7 +11,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_bill.cgi,v $
-# Revision 1.4  1999-02-28 00:03:54  ivan
+# Revision 1.5  2000-07-17 16:45:41  ivan
+# first shot at invoice browsing and some other cleanups
+#
+# Revision 1.4  1999/02/28 00:03:54  ivan
 # removed misleading comments
 #
 # Revision 1.3  1999/01/19 05:14:11  ivan
@@ -23,22 +26,145 @@
 #
 
 use strict;
-use vars qw ( $cgi $invnum );
+use vars qw ( $cgi $invnum $query $sortby @cust_bill );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
+use Date::Format;
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl idiot);
-use FS::Record qw(qsearchs);
+use FS::CGI qw(popurl header menubar eidiot table );
+use FS::Record qw(qsearch qsearchs);
+use FS::cust_bill;
+use FS::cust_main;
 
 $cgi = new CGI;
 cgisuidsetup($cgi);
 
-$cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
-$invnum = $2;
+if ( $cgi->keywords ) {
+  my($query) = $cgi->keywords;
+  if ( $query eq 'invnum' ) {
+    $sortby = \*invnum_sort;
+    @cust_bill = qsearch('cust_bill', {} );
+  } elsif ( $query eq 'date' ) {
+    $sortby = \*date_sort;
+    @cust_bill = qsearch('cust_bill', {} );
+  } elsif ( $query eq 'custnum' ) {
+    $sortby = \*custnum_sort;
+    @cust_bill = qsearch('cust_bill', {} );
+  } elsif ( $query eq 'OPEN_invnum' ) {
+    $sortby = \*invnum_sort;
+    @cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+  } elsif ( $query eq 'OPEN_date' ) {
+    $sortby = \*date_sort;
+    @cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+  } elsif ( $query eq 'OPEN_custnum' ) {
+    $sortby = \*custnum_sort;
+    @cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+  } elsif ( $query =~ /^OPEN(\d+)_invnum$/ ) {
+    my $open = $1 * 86400;
+    $sortby = \*invnum_sort;
+    @cust_bill =
+      grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+  } elsif ( $query =~ /^OPEN(\d+)_date$/ ) {
+    my $open = $1 * 86400;
+    $sortby = \*date_sort;
+    @cust_bill =
+      grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+  } elsif ( $query =~ /^OPEN(\d+)_custnum$/ ) {
+    my $open = $1 * 86400;
+    $sortby = \*custnum_sort;
+    @cust_bill =
+      grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+  } else {
+    die "unknown query string $query";
+  }
+} else {
+  $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
+  $invnum = $2;
+  @cust_bill = qsearchs('cust_bill', { 'invnum' => $invnum } );
+  $sortby = \*invnum_sort;
+}
 
-if ( qsearchs('cust_bill',{'invnum'=>$invnum}) ) {
+if ( scalar(@cust_bill) == 1 ) {
   print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
-} else { #error
-  idiot("Invoice not found.");
+} elsif ( scalar(@cust_bill) == 0 ) {
+  eidiot("Invoice not found.");
+} else {
+  my $total = scalar(@cust_bill);
+  print $cgi->header( '-expires' => 'now' ),
+        &header("Invoice Search Results", menubar(
+          'Main Menu', popurl(2)
+        )), "$total matching invoices found<BR>", &table(), <<END;
+      <TR>
+        <TH></TH>
+        <TH>Balance</TH>
+        <TH>Amount</TH>
+        <TH>Date</TH>
+        <TH>Contact name</TH>
+        <TH>Company</TH>
+      </TR>
+END
+
+  my(%saw, $cust_bill);
+  foreach $cust_bill (
+    sort $sortby grep(!$saw{$_->invnum}++, @cust_bill)
+  ) {
+    my($invnum, $owed, $charged, $date ) = (
+      $cust_bill->invnum,
+      $cust_bill->owed,
+      $cust_bill->charged,
+      $cust_bill->_date,
+    );
+    my $pdate = time2str("%b %d %Y", $date);
+
+    my $rowspan = 1;
+
+    my $view = popurl(2). "view/cust_bill.cgi?$invnum";
+    print <<END;
+      <TR>
+        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$invnum</FONT></A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>\$$owed</FONT></A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>\$$charged</FONT></A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$pdate</FONT></A></TD>
+END
+    my $custnum = $cust_bill->custnum;
+    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
+    if ( $cust_main ) {
+      my $cview = popurl(2). "view/cust_main.cgi?". $cust_main->custnum;
+      my ( $name, $company ) = (
+        $cust_main->last. ', '. $cust_main->first,
+        $cust_main->company,
+      );
+      print <<END;
+        <TD ROWSPAN=$rowspan><A HREF="$cview"><FONT SIZE=-1>$name</FONT></A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$cview"><FONT SIZE=-1>$company</FONT></A></TD>
+END
+    } else {
+      print <<END
+        <TD ROWSPAN=$rowspan COLSPAN=2>WARNING: couldn't find cust_main.custnum $custnum (cust_bill.invnum $invnum)</TD>
+END
+    }
+
+    print "</TR>";
+  }
+
+  print <<END;
+    </TABLE>
+  </BODY>
+</HTML>
+END
+
 }
 
+#
+
+sub invnum_sort {
+  $a->invnum <=> $b->invnum;
+}
+
+sub custnum_sort {
+  $a->custnum <=> $b->custnum || $a->invnum <=> $b->invnum;
+}
+
+sub date_sort {
+  $a->_date <=> $b->_date || $a->invnum <=> $b->invnum;
+}
diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index ef076f97e..8b3092eba 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.14 1999-08-12 04:45:21 ivan Exp $
+# $Id: cust_main.cgi,v 1.15 2000-07-17 16:45:41 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -17,7 +17,10 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.14  1999-08-12 04:45:21  ivan
+# Revision 1.15  2000-07-17 16:45:41  ivan
+# first shot at invoice browsing and some other cleanups
+#
+# Revision 1.14  1999/08/12 04:45:21  ivan
 # typo - missed a paren
 #
 # Revision 1.13  1999/08/12 04:32:21  ivan
@@ -92,6 +95,8 @@ if ( $cgi->keywords ) {
   } elsif ( $query eq 'company' ) {
     $sortby=\*company_sort;
     @cust_main=qsearch('cust_main',{});
+  } else {
+    die "unknown query string $query";
   }
 } else {
   @cust_main=();
diff --git a/htdocs/search/cust_pkg.cgi b/htdocs/search/cust_pkg.cgi
index c645ad6c1..b6439d654 100755
--- a/htdocs/search/cust_pkg.cgi
+++ b/htdocs/search/cust_pkg.cgi
@@ -1,11 +1,14 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.10 2000-07-17 12:49:29 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.11 2000-07-17 16:45:41 ivan Exp $
 #
 # based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.10  2000-07-17 12:49:29  ivan
+# Revision 1.11  2000-07-17 16:45:41  ivan
+# first shot at invoice browsing and some other cleanups
+#
+# Revision 1.10  2000/07/17 12:49:29  ivan
 # better error message if a package isn't linked to a customer (that shouldn't happen)
 #
 # Revision 1.9  1999/07/17 10:38:52  ivan
@@ -127,7 +130,7 @@ END
 END
     } else {
       print <<END;
-      <TD COLSPAN=3><FONT SIZE=-1>WARNING: couldn't find cust_main.custnum $custnum (cust_pkg.pkgnum $pkgnum)</TD>
+      <TD COLSPAN=3>WARNING: couldn't find cust_main.custnum $custnum (cust_pkg.pkgnum $pkgnum)</TD>
     </TR>
 END
     }
-- 
cgit v1.2.1


From 09be823788a1b5c1e30e344a933410966a8c7ea8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 17 Jul 2000 17:59:33 +0000
Subject: oops

---
 htdocs/misc/process/link.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/misc/process/link.cgi b/htdocs/misc/process/link.cgi
index eec43cf47..7d6bd506f 100755
--- a/htdocs/misc/process/link.cgi
+++ b/htdocs/misc/process/link.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: link.cgi,v 1.5 1999-04-15 14:09:17 ivan Exp $
+# $Id: link.cgi,v 1.6 2000-07-17 17:59:33 ivan Exp $
 #
 # ivan@voicenet.com 97-feb-5
 #
@@ -12,7 +12,10 @@
 # can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
 #
 # $Log: link.cgi,v $
-# Revision 1.5  1999-04-15 14:09:17  ivan
+# Revision 1.6  2000-07-17 17:59:33  ivan
+# oops
+#
+# Revision 1.5  1999/04/15 14:09:17  ivan
 # get rid of top-level my() variables
 #
 # Revision 1.4  1999/02/07 09:59:35  ivan
@@ -30,7 +33,7 @@ use strict;
 use vars qw ( $cgi $old $new $error $pkgnum $svcpart $svcnum );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
-use FS::CGI qw(popurl idiot);
+use FS::CGI qw(popurl idiot eidiot);
 use FS::UID qw(cgisuidsetup);
 use FS::cust_svc;
 use FS::Record qw(qsearchs);
-- 
cgit v1.2.1


From 00b5ff9afa5722225eafe017853b8d600b9161e5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Jul 2000 16:15:21 +0000
Subject: dia source

---
 htdocs/docs/overview.dia | Bin 0 -> 2213 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 htdocs/docs/overview.dia

diff --git a/htdocs/docs/overview.dia b/htdocs/docs/overview.dia
new file mode 100644
index 000000000..9bdb24e05
Binary files /dev/null and b/htdocs/docs/overview.dia differ
-- 
cgit v1.2.1


From ec9e52e13c2fa488e190db6ce2cacfcf3f978676 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Aug 2000 11:30:41 +0000
Subject: templatable invoices

---
 FS/FS/cust_bill.pm       | 224 +++++++++++++++++++++++------------------------
 TODO                     |  61 ++++++++++++-
 htdocs/docs/billing.html |  57 ++++++++----
 htdocs/docs/config.html  |   3 +-
 4 files changed, 207 insertions(+), 138 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 30db4699f..1d0790ef1 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1,8 +1,10 @@
 package FS::cust_bill;
 
 use strict;
-use vars qw( @ISA $conf $add1 $add2 $add3 $add4 );
+use vars qw( @ISA $conf $invoice_template );
+use vars qw( $invoice_lines @buf ); #yuck
 use Date::Format;
+use Text::Template;
 use FS::Record qw( qsearch qsearchs );
 use FS::cust_main;
 use FS::cust_bill_pkg;
@@ -15,7 +17,20 @@ use FS::cust_pkg;
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::cust_bill'} = sub { 
   $conf = new FS::Conf;
-  ( $add1, $add2, $add3, $add4 ) = ( $conf->config('address'), '', '', '', '' );
+  my @invoice_template = $conf->config('invoice_template')
+    or die "cannot load config file invoice_template";
+  $invoice_lines = 0;
+  foreach ( grep /invoice_lines\(\d+\)/, @invoice_template ) { #kludgy
+    /invoice_lines\((\d+)\)/;
+    $invoice_lines += $1;
+  }
+  die "no invoice_lines() functions in template?" unless $invoice_lines;
+  $invoice_template = new Text::Template (
+    TYPE   => 'ARRAY',
+    SOURCE => [ map "$_\n", @invoice_template ],
+  ) or die "can't create new Text::Template object: $Text::Template::ERROR";
+  $invoice_template->compile()
+    or die "can't compile template: $Text::Template::ERROR";
 };
 
 =head1 NAME
@@ -233,7 +248,7 @@ sub cust_pay {
 
 =item print_text [TIME];
 
-Returns an ASCII invoice, as a list of lines.
+Returns an text invoice, as a list of lines.
 
 TIME an optional value used to control the printing of overdue messages.  The
 default is now.  It isn't the date of the invoice; that's the `_date' field.
@@ -246,7 +261,7 @@ sub print_text {
 
   my( $self, $today ) = ( shift, shift );
   $today ||= time;
-  my $invnum = $self->invnum;
+#  my $invnum = $self->invnum;
   my $cust_main = qsearchs('cust_main', { 'custnum', $self->custnum } );
   $cust_main->payname( $cust_main->first. ' '. $cust_main->getfield('last') )
     unless $cust_main->payname;
@@ -255,48 +270,24 @@ sub print_text {
   my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
   my $balance_due = $self->owed + $pr_total - $cr_total;
 
-  #overdue?
-  my $overdue = ( 
-    $balance_due > 0
-    && $today > $self->_date 
-    && $self->printed > 1
-  );
+  #
 
-  #printing bits here (yuck!)
-
-  my @collect = ();
-
-  my($description,$amount);
-  my(@buf);
-
-  #format address
-  my($l,@address)=(0,'','','','','','','');
-  $address[$l++] =
-    $cust_main->payname.
-      ( ( $cust_main->payby eq 'BILL' ) && $cust_main->payinfo
-        ? " (P.O. #". $cust_main->payinfo. ")"
-        : ''
-      )
-  ;
-  $address[$l++]=$cust_main->company if $cust_main->company;
-  $address[$l++]=$cust_main->address1;
-  $address[$l++]=$cust_main->address2 if $cust_main->address2;
-  $address[$l++]=$cust_main->city. ", ". $cust_main->state. "  ".
-                 $cust_main->zip;
-  $address[$l++]=$cust_main->country unless $cust_main->country eq 'US';
+  #my @collect = ();
+  #my($description,$amount);
+  @buf = ();
 
   #previous balance
   foreach ( @pr_cust_bill ) {
-    push @buf, (
+    push @buf, [
       "Previous Balance, Invoice #". $_->invnum. 
                  " (". time2str("%x",$_->_date). ")",
       '$'. sprintf("%10.2f",$_->owed)
-    );
+    ];
   }
   if (@pr_cust_bill) {
-    push @buf,('','-----------');
-    push @buf,('Total Previous Balance','$' . sprintf("%10.2f",$pr_total ) );
-    push @buf,('','');
+    push @buf,['','-----------'];
+    push @buf,['Total Previous Balance','$' . sprintf("%10.2f",$pr_total ) ];
+    push @buf,['',''];
   }
 
   #new charges
@@ -309,117 +300,122 @@ sub print_text {
       my($pkg)=$part_pkg->pkg;
 
       if ( $_->setup != 0 ) {
-        push @buf, ( "$pkg Setup",'$' . sprintf("%10.2f",$_->setup) );
-        push @buf, map { "  ". $_->[0]. ": ". $_->[1], '' } $cust_pkg->labels;
+        push @buf, [ "$pkg Setup",'$' . sprintf("%10.2f",$_->setup) ];
+        push @buf,
+          map { [ "  ". $_->[0]. ": ". $_->[1], '' ] } $cust_pkg->labels;
       }
 
       if ( $_->recur != 0 ) {
-        push @buf, (
+        push @buf, [
           "$pkg (" . time2str("%x",$_->sdate) . " - " .
                                 time2str("%x",$_->edate) . ")",
           '$' . sprintf("%10.2f",$_->recur)
-        );
-        push @buf, map { "  ". $_->[0]. ": ". $_->[1], '' } $cust_pkg->labels;
+        ];
+        push @buf,
+          map { [ "  ". $_->[0]. ": ". $_->[1], '' ] } $cust_pkg->labels;
       }
 
     } else { #pkgnum Tax
-      push @buf,("Tax",'$' . sprintf("%10.2f",$_->setup) ) 
+      push @buf,["Tax",'$' . sprintf("%10.2f",$_->setup) ] 
         if $_->setup != 0;
     }
   }
 
-  push @buf,('','-----------');
-  push @buf,('Total New Charges',
-             '$' . sprintf("%10.2f",$self->charged) );
-  push @buf,('','');
+  push @buf,['','-----------'];
+  push @buf,['Total New Charges',
+             '$' . sprintf("%10.2f",$self->charged) ];
+  push @buf,['',''];
 
-  push @buf,('','-----------');
-  push @buf,('Total Charges',
-             '$' . sprintf("%10.2f",$self->charged + $pr_total) );
-  push @buf,('','');
+  push @buf,['','-----------'];
+  push @buf,['Total Charges',
+             '$' . sprintf("%10.2f",$self->charged + $pr_total) ];
+  push @buf,['',''];
 
   #credits
   foreach ( @cr_cust_credit ) {
-    push @buf,(
+    push @buf,[
       "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
       '$' . sprintf("%10.2f",$_->credited)
-    );
+    ];
   }
 
   #get & print payments
   foreach ( $self->cust_pay ) {
-    push @buf,(
+    push @buf,[
       "Payment received ". time2str("%x",$_->_date ),
       '$' . sprintf("%10.2f",$_->paid )
-    );
+    ];
   }
 
   #balance due
-  push @buf,('','-----------');
-  push @buf,('Balance Due','$' . 
-    sprintf("%10.2f",$self->owed + $pr_total - $cr_total ) );
-
-  #now print
+  push @buf,['','-----------'];
+  push @buf,['Balance Due','$' . 
+    sprintf("%10.2f",$self->owed + $pr_total - $cr_total ) ];
+
+  #setup template variables
+  
+  package FS::cust_bill::_template; #!
+  use vars qw( $invnum $date $page $total_pages @address $overdue @buf );
+
+  $invnum = $self->invnum;
+  $date = $self->_date;
+  $page = 1;
+
+  $total_pages =
+    int( scalar(@FS::cust_bill::buf) / $FS::cust_bill::invoice_lines );
+  $total_pages++
+    if scalar(@FS::cust_bill::buf) % $FS::cust_bill::invoice_lines;
+
+
+  #format address (variable for the template)
+  my $l = 0;
+  @address = ( '', '', '', '', '', '' );
+  package FS::cust_bill; #!
+  $FS::cust_bill::_template::address[$l++] =
+    $cust_main->payname.
+      ( ( $cust_main->payby eq 'BILL' ) && $cust_main->payinfo
+        ? " (P.O. #". $cust_main->payinfo. ")"
+        : ''
+      )
+  ;
+  $FS::cust_bill::_template::address[$l++] = $cust_main->company
+    if $cust_main->company;
+  $FS::cust_bill::_template::address[$l++] = $cust_main->address1;
+  $FS::cust_bill::_template::address[$l++] = $cust_main->address2
+    if $cust_main->address2;
+  $FS::cust_bill::_template::address[$l++] =
+    $cust_main->city. ", ". $cust_main->state. "  ".  $cust_main->zip;
+  $FS::cust_bill::_template::address[$l++] = $cust_main->country
+    unless $cust_main->country eq 'US';
+
+  #overdue? (variable for the template)
+  $FS::cust_bill::_template::overdue = ( 
+    $balance_due > 0
+    && $today > $self->_date 
+    && $self->printed > 1
+  );
 
-  my $tot_lines = 50; #should be configurable
-   #header is 17 lines
-  my $tot_pages = int( scalar(@buf) / ( 2 * ( $tot_lines - 17 ) ) );
-  $tot_pages++ if scalar(@buf) % ( 2 * ( $tot_lines - 17 ) );
+  #and subroutine for the template
 
-  my $page = 1;
+  sub FS::cust_bill::_template::invoice_lines {
+    my $lines = shift;
+    map { 
+      scalar(@buf) ? shift @buf : [ '', '' ];
+    }
+    ( 1 .. $lines );
+  }
+    
+  $FS::cust_bill::_template::page = 1;
   my $lines;
+  my @collect;
   while (@buf) {
-    $lines = $tot_lines;
-    my @header = &header(
-      $page, $tot_pages, $self->_date, $self->invnum, @address
+    push @collect, split("\n",
+      $invoice_template->fill_in( PACKAGE => 'FS::cust_bill::_template' )
     );
-    push @collect, @header;
-    $lines -= scalar(@header);
-
-    while ( $lines-- && @buf ) {
-      $description=shift(@buf);
-      $amount=shift(@buf);
-      push @collect, myswrite($description, $amount);
-    }
-    $page++;
-  }
-  while ( $lines-- ) {
-    push @collect, myswrite('', '');
-  }
-
-  return @collect;
-
-  sub header { #17 lines
-    my ( $page, $tot_pages, $date, $invnum, @address ) = @_ ;
-    push @address, '', '', '', '';
-
-    my @return = ();
-    my $i = ' 'x32;
-    push @return,
-      '',
-      $i. 'Invoice',
-      $i. substr("Page $page of $tot_pages".' 'x10, 0, 20).
-        time2str("%x", $date ). "  FS-". $invnum,
-      '',
-      '',
-      $add1,
-      $add2,
-      $add3,
-      $add4,
-      '',
-      splice @address, 0, 7;
-    ;
-    return map $_. "\n", @return;
+    $FS::cust_bill::_template::page++;
   }
 
-  sub myswrite {
-    my $format = <<END;
-  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<
-END
-    $^A = '';
-    formline( $format, @_ );
-    return $^A;
-  }
+  map "$_\n", @collect;
 
 }
 
@@ -427,7 +423,7 @@ END
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: cust_bill.pm,v 1.2 2000-08-09 11:30:41 ivan Exp $
 
 =head1 BUGS
 
diff --git a/TODO b/TODO
index 99c0b2690..f95014bfc 100644
--- a/TODO
+++ b/TODO
@@ -1,11 +1,64 @@
-$Id: TODO,v 1.48 2000-07-06 08:57:27 ivan Exp $
+$Id: TODO,v 1.49 2000-08-09 11:30:40 ivan Exp $
 
-If you are interested in helping with any of these, please join the mailing
-list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
-duplication of effort.
+If you are interested in helping with any of these, please join the
+*development* mailing list (send a blank message to
+ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
 ---
 
+http://www.ipmeter.com/ integration would be useful
+
+http://tangram.sourceforge.net/
+Tie::DBI
+
+mmm, http://pootpoot.com/~dlowe/DBIx-Table/
+
+The cybercash links in htdocs/docs/config.html are b0rken.
+
+Yes.  Which is what I've been trying to tell you.  (destination user,
+destination domainname) would be represented by the svcnum of a record in
+svc_acct.  (In retrospect, using the uid instead of the svcnum was a bad
+choice).  (domuser, domain name) would be part of the svc_acct_sm record,
+as domuser and domsvc.
+. 
+Upon further consideration, I'll probably eliminate the svc_acct_sm table
+completely, and just add a field for the svcnum of a domain and the svcnum
+of a destination mailbox to svc_acct (or perhaps a one-to-many
+relationship - multiple svcnum(s) for multiple destination mailboxes.
+hmm.)
+
+> > > > Longer-term, I need to do something about the length of the             
+> > > > column names -                                                          
+> > > > The SQL1992 standard defines 18 character column names,                 
+> > > > which would be a                                                        
+> > > > reasonable goal.                                                        
+> > >                                                                           
+> > > Maybe the thing to do would be to separate these out to separate          
+> > > tables.                                                                   
+> > > then we could simply use something like id, attrib_name,                  
+> > attrib_value                                                                
+> > > to                                                                        
+> > > store all of the radius values.                                           
+> >                                                                             
+> > Hmm, no, that's not quite right.  You don't want to store the actual        
+> > strings in the records for each account.  Probably need a table that        
+> > corresponds to the RADIUS dictionary file, with a list of                   
+> > attributes and                                                              
+> > attribute id's, then reference the attribute by id and not name.            
+> >                                                                             
+> > The more difficult bit is handling the service definitions                  
+> > correctly -                                                                 
+> > part_svc and it's effects.                                                  
+>                                                                               
+> Yes that could be a bit tricky. Perhaps just one "radius" field in            
+> part_svc that held a list of id's from the radius table that applied          
+> that particular service?                                                      
+. 
+No, that wouldn't let you set defaults or fixed values for each attribute,
+like part_svc currently does.
+ 
+
+
 hmm - if you delete an account in svc_acct somehow that a mail alias points to,
 svc_acct_sm.export will fail.  make sure this can't be done using
 the web interface.
diff --git a/htdocs/docs/billing.html b/htdocs/docs/billing.html
index 46ae1fdad..7841bf776 100644
--- a/htdocs/docs/billing.html
+++ b/htdocs/docs/billing.html
@@ -3,19 +3,37 @@
 </head>
 <body>
   <h1>Billing</h1>
-  The <b>freeside-bill</b> script can be run daily to bill all customers.  Usage: bill [ -c [ i ] ] [ -d <i>date</i> ] [ -b ] <i>user</i>
   <ul>
-    <li>-c: Turn on collecting (you probably want this).
-    <li>-i: Real-time billing (as opposed to bacth billing).  Only relevant for credit cards.
-    <li>-d: Pretend it is <i>date</i> (parsed by Date::Parse)
-    <li>-b: N/A
-  </ul>
-  Printing should be configured on your freeside machine to print invoices.
-  <br><br>Batch credit card processing
-  <ul>
-    <li>After this script is run, a credit card batch will be in the <a href="schema.html#cust_pay_batch">cust_pay_batch</a> table.  Export this table to your credit card batching.
-    <li>When your batch completes, erase the cust_pay_batch records in that batch and add any necessary paymants to the <a href="schema.html#cust_pay">cust_pay</a> table.  Example code to add payments is:
-    <pre>use FS::cust_pay;
+    <li>To enable billing, you <b>must</b> create an <a href="config.html#invoice_template">invoice_template</a> configuration file.  An example file is available in the <i>conf/</i> directory of the distribution.  You also need to create an <a href="config.html#lpr">lpr</a> configuration file to enable postal invoices.
+    <ul>
+      <li>Optional: Invoice template customization
+        <ul>
+          <li>See the <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> documentation for details on the substitution language.
+          <li>You <b>must</b> call the invoice_lines() function at least once - pass it a number of lines, and it returns a list of array references, each of two elements: a service description column, and a price column.
+          <li>In addition, the following variables are available:
+            <ul>
+              <li>$invnum - invoice number
+              <li>$date - as a UNIX timestamp (see <a href="http://search.cpan.org/doc/GBARR/TimeDate-1.09/lib/Date/Format.pm">Date::Format</a> for conversion functions).
+              <li>$page - current page
+              <li>$total_pages - total pages
+              <li>@address - A six-element array containing the customer name, company, and address.
+              <li>$overdue - true if this invoice is overdue
+            </ul>
+        </ul>
+    </ul>
+    <li>You can bill individual customers by clicking on the <i>Bill now</i> link on the main customer view.
+    <li> The <b>freeside-bill</b> script can be run daily to bill all customers.  Usage:<pre>bill [ -c [ i ] ] [ -d <i>date</i> ] [ -b ] <i>user</i></pre>
+      <ul>
+        <li>-c: Turn on collecting (you probably want this).
+        <li>-i: Real-time billing (as opposed to bacth billing).  Only relevant for credit cards.
+        <li>-d: Pretend it is <i>date</i> (parsed by <a href="http://search.cpan.org/doc/GBARR/TimeDate-1.09/lib/Date/Parse.pm">Date::Parse</a>)
+        <li>-b: N/A
+      </ul>
+      <br><br>Batch credit card processing
+      <ul>
+        <li>After this script is run, a credit card batch will be in the <a href="schema.html#cust_pay_batch">cust_pay_batch</a> table.  Export this table to your credit card batching.
+        <li>When your batch completes, erase the cust_pay_batch records in that batch and add any necessary paymants to the <a href="schema.html#cust_pay">cust_pay</a> table.  Example code to add payments is:
+        <pre>use FS::cust_pay;
 
 # loop over all records in batch
 
@@ -36,13 +54,14 @@ if ( $error ) {
 # end loop
 </pre>
 All fields except paybatch are contained in the cust_pay_batch table.  You can use paybatch field to track particular batches and/or particular transactions within a batch.<br><br>
-    <li>The <b>freeside-print-batch</b> script can print or email pending credit card batches for manual entry.  Usage: freeside-print-batch [-v] [-p] [-e] [-a] [-d] <i>user</i>
-      <ul>
-        <li>-v: Verbose - Prints records to STDOUT.
-        <li>-p: Print to printer lpr as found in the conf directory.
-        <li>-e: Email output to user found in the Conf email file.
-        <li>-a: Automatically pays all records in cust_pay_batch.  Use -d with this option usually.
-        <li>-d: Delete - Pays account and deletes record from cust_pay_batch.
+        <li>The <b>freeside-print-batch</b> script can print or email pending credit card batches for manual entry.  Usage: freeside-print-batch [-v] [-p] [-e] [-a] [-d] <i>user</i>
+          <ul>
+            <li>-v: Verbose - Prints records to STDOUT.
+            <li>-p: Print to printer lpr as found in the conf directory.
+            <li>-e: Email output to user found in the Conf email file.
+            <li>-a: Automatically pays all records in cust_pay_batch.  Use -d with this option usually.
+            <li>-d: Delete - Pays account and deletes record from cust_pay_batch.
+          </ul>
       </ul>
   </ul>
 </body>
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index c500a3336..e42cfd8e1 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -21,7 +21,7 @@ All further configuration files and directories are located in
 `/usr/local/etc/freeside/conf.<i>datasource</i>', for example, 
 `/usr/local/etc/freeside/conf.DBI:Pg:dbname=freeside'
 <ul>
-  <li><a name="address">address</a> - Your company name and address, four lines.
+  <li><a name="address">address</a> - This configuration file is no longer used.  See <a href="#invoice_template">invoice_template</a> instead.
   <li><a name="apacheroot">apacheroot</a> - The directory containing Apache virtual hosts
   <li><a name="apachemachine">apachemachine</a> - A machine with the apacheroot directory and user home directories.  The existance of this file enables setup of virtual host directories, and, in conjunction with the `home' configuration file, symlinks into user home directories.
   <li><a name="apachemachines">apachemachines</a> - Your Apache machines, one per line.  This enables export of `/etc/apache/vhosts.conf', which can be included in your Apache configuration via the <a href="http://www.apache.org/docs/mod/core.html#include">Include</a> directive.
@@ -42,6 +42,7 @@ All further configuration files and directories are located in
   <li><a name="icradius_mysqldest">icradius_mysqldest</a> - Destination directory for the MySQL databases, on the ICRADIUS machines.  Defaults to "/usr/local/var/".
   <li><a name="icradius_mysqlsource">icradius_mysqlsource</a> - Source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".
   <li><a name="invoice_from">invoice_from</a> - Return address on email invoices.
+  <li><a name="invoice_template">invoice_template</a> - Required template file for invoices.  See the <a href="billing.html">section on billing</a> for details.
   <li><a name="lpr">lpr</a> - Print command for paper invoices, for example `lpr -h'.
   <li><a name="maildisablecatchall">maildisablecatchall</a> - The existance of this file will disable the requirement that each virtual domain have a catch-all mailbox.
   <li><a name="mxmachines">mxmachines</a> - MX entries for new domains, weight and machine, one per line, with trailing `.'
-- 
cgit v1.2.1


From 4c7f7284e84faca5404f609c8af0a50197edff96 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Aug 2000 18:21:38 +0000
Subject: doc updates

---
 htdocs/docs/install.html  | 1 +
 htdocs/docs/upgrade6.html | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index b5cae1ba5..300104b2d 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -30,6 +30,7 @@ Before installing, you need:
       <li><a href="http://www.perl.com/CPAN/modules/by-module/File/">File-CounterFile</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/FreezeThaw/">FreezeThaw</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/String/">String-Approx</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/Text/">Text-Template</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/DBI/">DBI
       <li><a href="http://www.perl.com/CPAN/modules/by-module/DBD/">DBD for your database engine</a>
     </ul>
diff --git a/htdocs/docs/upgrade6.html b/htdocs/docs/upgrade6.html
index c9cdf3314..8240b6c32 100644
--- a/htdocs/docs/upgrade6.html
+++ b/htdocs/docs/upgrade6.html
@@ -10,6 +10,8 @@
   <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
   <li>If migrating from less than 1.2.3, see these <a href="upgrade5.html">instructions</a> first.
   <li>Back up your data and current Freeside installation.
+  <li>Copy the <i>invoice_template</i> file from the <i>conf/</i> directory in the distribution to your <a href="config.html">configuration directory</a>.
+  <li>Install the <a href="http://www.perl.com/CPAN/modules/by-module/Text/">Text-Template</a> Perl module.
   <li>Apply the following changes to your database:
 <pre>
 CREATE TABLE domain_record (
-- 
cgit v1.2.1


From f402899b993f7fd52a264ebf07a9acf9d07099df Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Aug 2000 18:40:22 +0000
Subject: example invoice template

---
 conf/invoice_template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 conf/invoice_template

diff --git a/conf/invoice_template b/conf/invoice_template
new file mode 100644
index 000000000..e226d636f
--- /dev/null
+++ b/conf/invoice_template
@@ -0,0 +1,27 @@
+
+                                 Invoice
+                                 { substr("Page $page of $total_pages          ", 0, 19); } { use Date::Format; time2str("%x", $date); }  FS-{ $invnum; }
+
+
+Ivan Kohler
+1339 Hayes St.
+San Francisco, CA  94117
+
+
+{ $address[0]; }
+{ $address[1]; }
+{ $address[2]; }
+{ $address[3]; }
+{ $address[4]; }
+{ $address[5]; }
+
+{
+  join("\n",
+    map {
+      my ( $desc, $price ) = @{$_};
+      "  ". substr( $desc. " "x65, 0, 65). " ". substr( $price. " "x11, 0, 11);
+    } invoice_lines(31)
+  );
+}
+
+ -=> Freeside - open-source billing for ISPs - http://www.sisd.com/freeside <=-
-- 
cgit v1.2.1


From f01fe96a27912381d4b30ccad3d355d74f76f505 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Aug 2000 07:26:50 +0000
Subject: untaint template source

---
 TODO                                     |  5 ++++-
 fs_signup/FS-SignupClient/cgi/signup.cgi | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/TODO b/TODO
index f95014bfc..7241c49cd 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.49 2000-08-09 11:30:40 ivan Exp $
+$Id: TODO,v 1.50 2000-08-24 07:26:50 ivan Exp $
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
@@ -6,6 +6,9 @@ ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
 ---
 
+"first package" and email invoice (?) not sticky on errors in new/edit customer
+screen.
+
 http://www.ipmeter.com/ integration would be useful
 
 http://tangram.sourceforge.net/
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 839ad333d..7576b8b42 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.7 2000-05-10 23:57:57 ivan Exp $
+# $Id: signup.cgi,v 1.8 2000-08-24 07:26:50 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $r $error
@@ -29,14 +29,22 @@ $ieak_file = '/usr/local/freeside/ieak.template';
 $cck_file = '/usr/local/freeside/cck.template';
 
 if ( -e $ieak_file ) {
-  $ieak_template = new Text::Template ( TYPE => 'FILE', SOURCE => $ieak_file )
-    or die "Couldn't construct template: $Text::Template::ERROR";
+  my $ieak_txt = Text::Template::_load_text($ieak_file)
+    or die $Text::Template::ERROR;
+  $ieak_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
+  $ieak_txt = $1;
+  $ieak_template = new Text::Template ( TYPE => 'STRING', SOURCE => $ieak_txt )
+    or die $Text::Template::ERROR;
 } else {
   $ieak_template = '';
 }
 if ( -e $cck_file ) {
-  $cck_template = new Text::Template ( TYPE => 'FILE', SOURCE => $cck_file )
-    or die "Couldn't construct template: $Text::Template::ERROR";
+  my $cck_txt = Text::Template::_load_text($cck_file)
+    or die $Text::Template::ERROR;
+  $cck_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
+  $cck_txt = $1;
+  $cck_template = new Text::Template ( TYPE => 'STRING', SOURCE => $cck_txt )
+    or die $Text::Template::ERROR;
 } else {
   $cck_template = '';
 }
-- 
cgit v1.2.1


From 4063430b29ef2c83da42772402249f02f8004327 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Sep 2000 10:35:21 +0000
Subject: since printed field isn't updated 'till after print_text method is
 called, want to print overdue invoices if printed > 0, not > 1

---
 FS/FS/cust_bill.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 1d0790ef1..2df92f75f 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -392,7 +392,8 @@ sub print_text {
   $FS::cust_bill::_template::overdue = ( 
     $balance_due > 0
     && $today > $self->_date 
-    && $self->printed > 1
+#    && $self->printed > 1
+    && $self->printed > 0
   );
 
   #and subroutine for the template
@@ -423,7 +424,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.2 2000-08-09 11:30:41 ivan Exp $
+$Id: cust_bill.pm,v 1.3 2000-09-20 10:35:21 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 035d2759c0bd2c1bd6ba3408559f0acab726e06e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Oct 2000 00:44:43 +0000
Subject: rawr!

---
 README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README b/README
index def59bc60..d27d39eb6 100644
--- a/README
+++ b/README
@@ -35,11 +35,11 @@ The Freeside home page is at `http://www.sisd.com/freeside'.
 The documentation is in `htdocs/docs'.
 
 A mailing list for users and developers is available.  Send a blank message to
-<ivan-freeside-subscribe@420.am> to subscribe.
+<ivan-freeside-subscribe@sisd.com> to subscribe.
 
 Commercial support is available from Ivan Kohler <ivan@sisd.com>.  Requests for
 free support sent to me directly will be ignored.  Please subscribe to the the
 mailing list to request free support!
 
-Ivan Kohler <ivan@420.am>
+Ivan Kohler <ivan-freeside_readme@420.am>
 
-- 
cgit v1.2.1


From bf2ad8bc2e8ed387f50ec1993da46ca234e8a423 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Oct 2000 12:58:25 +0000
Subject: roo

---
 TODO | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 7241c49cd..d6fa5678f 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.50 2000-08-24 07:26:50 ivan Exp $
+$Id: TODO,v 1.51 2000-10-15 12:58:25 ivan Exp $
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
@@ -6,6 +6,34 @@ ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
 ---
 
+this is awfully vauge, perhaps email for more info?  don't want to alientate
+someone with accounting experience, but i just don't have time right now.
+.
+Hi Ivan,
+.
+Thanks for the information. It took me a little while to figure it out, but I
++was
+able to create an invoice. As a lamer and an accountant, may I make a few
+suggestions?
+.
+On the Customer view page:
+1) Layout the information in the manner the invoicing process is conducted.
+    a) Customer information                                                
+    b) Package Ordering    
+    c)  Add a "Create & Edit Invoice" section - this allows auditing of  the
+invoice     before it is processed.
+    d) then put the billing section to actually process the invoice
+    e) then put payment history information                        
+.
+Thanks,
+Mark Roberts <mroberts@iopenenterprises.com>
+
+
+new overdue code might be overzealous.  test carefully.
+
+Port Freeside to use the modules that were abstracted from it:
+Net::SSH, Net::SCP, DBIx::DataSource and DBIx::DBSchema, at least.
+
 "first package" and email invoice (?) not sticky on errors in new/edit customer
 screen.
 
-- 
cgit v1.2.1


From bd732e6950eb76b971113502f1dd8a97a21f3888 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 16 Oct 2000 13:26:43 +0000
Subject: fix typo

---
 htdocs/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index 9537b3407..0ae8b5dbb 100755
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -44,7 +44,7 @@
               <LI>60 day open invoices (<A HREF="search/cust_bill.cgi?OPEN60_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN60_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN60_custnum">by customer number</A>)
               <LI>90 day open invoices (<A HREF="search/cust_bill.cgi?OPEN90_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN90_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN90_custnum">by customer number</A>)
               <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
-              <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>)
+              <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
             </UL>
           <LI>packages
             <UL>
-- 
cgit v1.2.1


From 52b07e8abd3946578a6c2701ec9e5195ec6b17e6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 27 Oct 2000 20:15:50 +0000
Subject: session monitor

---
 FS/FS/Record.pm                             |  50 +++++++++++-
 TODO                                        |  20 ++++-
 bin/fs-setup                                |  50 +++++++++++-
 eg/table_template.pm                        |  23 +-----
 fs_sesmon/FS-SessionClient/Changes          |   5 ++
 fs_sesmon/FS-SessionClient/MANIFEST         |   9 +++
 fs_sesmon/FS-SessionClient/MANIFEST.SKIP    |   1 +
 fs_sesmon/FS-SessionClient/Makefile.PL      |  10 +++
 fs_sesmon/FS-SessionClient/SessionClient.pm | 120 ++++++++++++++++++++++++++++
 fs_sesmon/FS-SessionClient/fs_sessiond      |  64 +++++++++++++++
 fs_sesmon/FS-SessionClient/test.pl          |  20 +++++
 fs_sesmon/fs_session_server                 |  53 ++++++++++++
 12 files changed, 399 insertions(+), 26 deletions(-)
 create mode 100644 fs_sesmon/FS-SessionClient/Changes
 create mode 100644 fs_sesmon/FS-SessionClient/MANIFEST
 create mode 100644 fs_sesmon/FS-SessionClient/MANIFEST.SKIP
 create mode 100644 fs_sesmon/FS-SessionClient/Makefile.PL
 create mode 100644 fs_sesmon/FS-SessionClient/SessionClient.pm
 create mode 100644 fs_sesmon/FS-SessionClient/fs_sessiond
 create mode 100644 fs_sesmon/FS-SessionClient/test.pl
 create mode 100644 fs_sesmon/fs_session_server

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 12cc77ebf..b0bfb0b3c 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -723,6 +723,54 @@ sub ut_phonen {
   '';
 }
 
+=item ut_ip COLUMN
+
+Check/untaint ip addresses.  IPv4 only for now.
+
+=cut
+
+sub ut_ip {
+  my( $self, $field ) = @_;
+  $self->getfield($field) =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/;
+    or return "Illegal (IP address) $field: ". $self->getfield($field);
+  for ( $1 $2 $3 $4 ) { return "Illegal (IP address) $field" if $_ > 255; };
+  $self->$setfield($field, "$1.$2.$3.$3");
+  '';
+}
+
+=item ut_ipn COLUMN
+
+Check/untaint ip addresses.  IPv4 only for now.  May be null.
+
+=cut
+
+sub ut_ipn {
+  my( $self, $field ) = @_;
+  if ( $self->getfield($field) =~ /^()$/ ) {
+    $self->setfield($field,'');
+    '';
+  } else {
+    $self->ut_ip($field);
+  }
+}
+
+=item ut_domain COLUMN
+
+Check/untaint host and domain names.
+
+=cut
+
+sub ut_domain {
+  my( $self, $field ) = @_;
+  #$self->getfield($field) =~/^(\w+\.)*\w+$/
+  $self->getfield($field) =~/^(\w+\.)*\w+$/
+    or return "Illegal (domain) $field: ". $self->getfield($field);
+  $self->setfield($field,$1);
+  '';
+}
+
+=cut
+
 =item ut_anything COLUMN
 
 Untaints arbitrary data.  Be careful.
@@ -847,7 +895,7 @@ sub hfields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.7 2000-06-27 12:15:37 ivan Exp $
+$Id: Record.pm,v 1.8 2000-10-27 20:15:50 ivan Exp $
 
 =head1 BUGS
 
diff --git a/TODO b/TODO
index d6fa5678f..c6d7e4362 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.51 2000-10-15 12:58:25 ivan Exp $
+$Id: TODO,v 1.52 2000-10-27 20:15:50 ivan Exp $
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
@@ -6,6 +6,24 @@ ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
 ---
 
+> 1. A Web Form to the user get his account added automatically . The
+> /etc/raddb/users and /etc/passwd would be updated automatically (these
+> file are on the same machine Freeside is). I guess the the Add
+> Customer
+> page with some customization could be the work.
+> 2. A Canceling Account Web Form available to user cancel his account   
+> at
+> any time he wants.
+> 3. A Password Changing Web Form where the user could change your
+> password by sending your username, old and new password.
+> 4. Additional POP Accounts Creation where the user supply only his
+> main
+> username/password (probably provided from a PPP Account already
+> created)
+> and his POP username/password for this specific account.
+(actually need something more general i guess - probably need some way to say
+which accounts (svc_acct) can log in and make changes per customer (cust_main) )
+
 this is awfully vauge, perhaps email for more info?  don't want to alientate
 someone with accounting experience, but i just don't have time right now.
 .
diff --git a/bin/fs-setup b/bin/fs-setup
index ac8ff5eb7..cabeb2859 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.26 2000-07-06 08:57:27 ivan Exp $
+# $Id: fs-setup,v 1.27 2000-10-27 20:15:50 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.26  2000-07-06 08:57:27  ivan
+# Revision 1.27  2000-10-27 20:15:50  ivan
+# session monitor
+#
+# Revision 1.26  2000/07/06 08:57:27  ivan
 # support for radius check attributes (except importing).  poorly documented.
 #
 # Revision 1.25  2000/06/29 12:00:49  ivan
@@ -730,6 +733,49 @@ sub tables_hash_hack {
       'index'       => [ [] ],
     },
 
+    'port' => {
+      'columns' => [
+        'portnum',  'int',     '',   '',
+        'ip',       'varchar', NULL, 15,
+        'nasport'   'int',     NULL, '',
+        'nasnum',   'int',     '',   '',
+      ],
+      'primary_key' => 'portnum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'nas' => {
+      'columns' => [
+        'nasnum',   'int',     '',    '',
+        'nas',      'varchar', '',    $char_d,
+        'nasip',    'varchar', '',    15,
+        'nasfqdn',  'varchar', '',    $char_d,
+#        'last',     'timestamp', NULL, '',
+#change to above when move to DBIx::DBSchema!!!
+        'last',     'datetime', NULL, '',
+      ],
+      'primary_key' => 'nasnum',
+      'unique'      => [ [ 'nas' ], [ 'nasip' ] ],
+      'index'       => [ [ 'last' ] ],
+    },
+
+    'session' => {
+      'columns' => [
+        'sessionnum', 'int',       '',   '',
+        'portnum',    'int',       '',   '',
+        'svcnum',     'int',       '',   '',
+#        'login',      'timestamp', '',   '',
+#        'logout',     'timestamp', '',   '',
+#change to above when move to DBIx::DBSchema!!!
+        'login',      'datetime',  '',   '',
+        'logout',     'datetime',  NULL, '',
+      ],
+      'primary_key' => 'sessionnum',
+      'unique'      => [],
+      'index'       => [ [ 'portnum' ] ],
+    },
+
   );
 
   %tables;
diff --git a/eg/table_template.pm b/eg/table_template.pm
index 7f74ac342..2cc1e1d6e 100644
--- a/eg/table_template.pm
+++ b/eg/table_template.pm
@@ -100,7 +100,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: table_template.pm,v 1.1 1999-08-04 08:03:03 ivan Exp $
+$Id: table_template.pm,v 1.2 2000-10-27 20:15:50 ivan Exp $
 
 =head1 BUGS
 
@@ -110,27 +110,6 @@ The author forgot to customize this manpage.
 
 L<FS::Record>, schema.html from the base documentation.
 
-=head1 HISTORY
-
-ivan@voicenet.com 97-jul-1
-
-added hfields
-ivan@sisd.com 97-nov-13
-
-$Log: table_template.pm,v $
-Revision 1.1  1999-08-04 08:03:03  ivan
-move table subclass examples out of production directory
-
-Revision 1.4  1998/12/29 11:59:57  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-Revision 1.3  1998/11/15 04:33:00  ivan
-updates for newest versoin
-
-Revision 1.2  1998/11/15 03:48:49  ivan
-update for current version
-
-
 =cut
 
 1;
diff --git a/fs_sesmon/FS-SessionClient/Changes b/fs_sesmon/FS-SessionClient/Changes
new file mode 100644
index 000000000..390a7b946
--- /dev/null
+++ b/fs_sesmon/FS-SessionClient/Changes
@@ -0,0 +1,5 @@
+Revision history for Perl extension FS::SessionClient
+
+0.01  Wed Oct 18 16:34:36 1999
+        - original version; created by ivan 1.0
+
diff --git a/fs_sesmon/FS-SessionClient/MANIFEST b/fs_sesmon/FS-SessionClient/MANIFEST
new file mode 100644
index 000000000..3ced1df17
--- /dev/null
+++ b/fs_sesmon/FS-SessionClient/MANIFEST
@@ -0,0 +1,9 @@
+Changes
+MANIFEST
+MANIFEST.SKIP
+Makefile.PL
+SessionClient.pm
+test.pl
+fs_sessiond
+cgi/logon.cgi
+cgi/logoff.cgi
diff --git a/fs_sesmon/FS-SessionClient/MANIFEST.SKIP b/fs_sesmon/FS-SessionClient/MANIFEST.SKIP
new file mode 100644
index 000000000..ae335e78a
--- /dev/null
+++ b/fs_sesmon/FS-SessionClient/MANIFEST.SKIP
@@ -0,0 +1 @@
+CVS/
diff --git a/fs_sesmon/FS-SessionClient/Makefile.PL b/fs_sesmon/FS-SessionClient/Makefile.PL
new file mode 100644
index 000000000..8dff176a7
--- /dev/null
+++ b/fs_sesmon/FS-SessionClient/Makefile.PL
@@ -0,0 +1,10 @@
+use ExtUtils::MakeMaker;
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written.
+WriteMakefile(
+    'NAME'          => 'FS::SessionClient',
+    'VERSION_FROM'  => 'SessionClient.pm', # finds $VERSION
+    'EXE_FILES'     => [ 'fs_sessiond' ],
+    'INSTALLSCRIPT' => '/usr/local/sbin',
+    'PERM_RWX'      => '750',
+);
diff --git a/fs_sesmon/FS-SessionClient/SessionClient.pm b/fs_sesmon/FS-SessionClient/SessionClient.pm
new file mode 100644
index 000000000..fd50e8908
--- /dev/null
+++ b/fs_sesmon/FS-SessionClient/SessionClient.pm
@@ -0,0 +1,120 @@
+package FS::SessionClient;
+
+use strict;
+use vars qw($VERSION @ISA @EXPORT_OK $fs_sessiond_socket);
+use Exporter;
+use Socket;
+use FileHandle;
+use IO::Handle;
+
+$VERSION = '0.01';
+
+@ISA = qw( Exporter );
+@EXPORT_OK = qw( login logoff );
+
+$fs_sessiond_socket = "/usr/local/freeside/fs_sessiond_socket";
+
+$ENV{'PATH'} ='/usr/bin:/bin';
+$ENV{'SHELL'} = '/bin/sh';
+$ENV{'IFS'} = " \t\n";
+$ENV{'CDPATH'} = '';
+$ENV{'ENV'} = '';
+$ENV{'BASH_ENV'} = '';
+
+my $freeside_uid = scalar(getpwnam('freeside'));
+die "not running as the freeside user\n" if $> != $freeside_uid;
+
+=head1 NAME
+
+FS::SessionClient - Freeside session client API
+
+=head1 SYNOPSIS
+
+  use FS::SessionClient qw( login portnum logoff );
+
+  $error = login ( {
+    'username' => $username,
+    'password' => $password,
+    'login'    => $timestamp,
+    'portnum'  => $portnum,
+  } );
+
+  $portnum = portnum( { 'ip' => $ip } ) or die "unknown ip!"
+  $portnum = portnum( { 'nasnum' => $nasnum, 'nasport' => $nasport } )
+    or die "unknown nasnum/nasport";
+
+  $error = logoff ( {
+    'username' => $username,
+    'password' => $password,
+    'logoff'   => $timestamp,
+    'portnum'  => $portnum,
+  } );
+
+=head1 DESCRIPTION
+
+This modules provides an API for a remote session application.
+
+It needs to be run as the freeside user.  Because of this, the program which
+calls these subroutines should be written very carefully.
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item login HASHREF
+
+HASHREF should have the following keys: username, password, login and portnum.
+login is a UNIX timestamp; if not specified, will default to the current time.
+Starts a new session for the specified user and portnum.  The password is
+optional, but must be correct if specified.
+
+Returns a scalar error message, or the empty string for success.
+
+=item portnum
+
+HASHREF should contain a single key: ip, or the two keys: nasnum and nasport.
+Returns a portnum suitable for the login and logoff subroutines, or false
+on error.
+
+=item logoff HASHREF
+
+HASHREF should have the following keys: usrename, password, logoff and portnum.
+logoff is a UNIX timestamp; if not specified, will default to the current time.
+Starts a new session for the specified user and portnum.  The password is
+optional, but must be correct if specified.
+
+Returns a scalar error message, or the empty string for success.
+
+=cut
+
+sub AUTOLOAD {
+  my $hashref = shift;
+  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+  connect(SOCK, sockaddr_un($fs_sessiond_socket)) or die "connect: $!";
+  print SOCK "$AUTOLOAD\n";
+
+  print SOCK join("\n", %{$hashref}, 'END' ), "\n";
+  SOCK->flush;
+
+  chomp( my $r = <SOCK> );
+  $r;
+}
+
+=back
+
+=head1 VERSION
+
+$Id: SessionClient.pm,v 1.1 2000-10-27 20:15:50 ivan Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<fs_sessiond>
+
+=cut
+
+1;
+
+
+
diff --git a/fs_sesmon/FS-SessionClient/fs_sessiond b/fs_sesmon/FS-SessionClient/fs_sessiond
new file mode 100644
index 000000000..74d3aab31
--- /dev/null
+++ b/fs_sesmon/FS-SessionClient/fs_sessiond
@@ -0,0 +1,64 @@
+#!/usr/bin/perl -Tw
+#
+# fs_sessiond
+#
+# This is run REMOTELY over ssh by fs_session_server
+#
+
+use strict;
+use Socket;
+
+use vars qw( $Debug );
+
+$Debug = 1;
+
+my $fs_session_socket = "/usr/local/freeside/fs_sessiond_socket";
+
+$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
+$ENV{'SHELL'} = '/bin/sh';
+$ENV{'IFS'} = " \t\n";
+$ENV{'CDPATH'} = '';
+$ENV{'ENV'} = '';
+$ENV{'BASH_ENV'} = '';
+
+$|=1;
+
+my $me = "[fs_sessiond]";
+
+warn "$me starting\n" if $Debug;
+#nothing to read from server
+
+warn "$me creating $fs_sessiond_socket\n" if $Debug;
+my $uaddr = sockaddr_un($fs_signupd_socket);
+my $proto = getprotobyname('tcp');
+socket(Server,PF_UNIX,SOCK_STREAM,0) or die "socket: $!";
+unlink($fs_signup_socket);
+bind(Server, $uaddr) or die "bind: $!";
+listen(Server,SOMAXCONN) or die "listen: $!";
+
+warn "$me entering main loop\n" if $Debug;
+my $paddr;
+for ( ; $paddr = accept(Client,Server); close Client) {
+
+  chomp( my $command = <Client> );
+
+  if ( $command eq 'login' || $command eq 'logout' || $command eq 'portnum' ) {
+    warn "$me reading data from local client\n" if $Debug;
+    my @data, $dos;
+    push @data, scalar(<Client>) until $dos++ == 99 || $data[$#data] != "END\n";
+    if ( $dos == 99 ) { 
+      warn "$me WARNING: DoS attempt!" 
+    } else {
+      warn "$me sending data to remote server\n" if $Debug;
+      print "$command\n", @data;
+      warn "$me reading result from remote server\n" if $Debug;
+      my $error = <STDIN>;
+      warn "$me sending error to local client\n" if $Debug;
+      print Client $error;
+    }
+  } else {
+    warn "$me WARNING: unexpected command from client: $command";
+  }
+
+}
+
diff --git a/fs_sesmon/FS-SessionClient/test.pl b/fs_sesmon/FS-SessionClient/test.pl
new file mode 100644
index 000000000..d05201b66
--- /dev/null
+++ b/fs_sesmon/FS-SessionClient/test.pl
@@ -0,0 +1,20 @@
+# Before `make install' is performed this script should be runnable with
+# `make test'. After `make install' it should work as `perl test.pl'
+
+######################### We start with some black magic to print on failure.
+
+# Change 1..1 below to 1..last_test_to_print .
+# (It may become useful if the test is moved to ./t subdirectory.)
+
+BEGIN { $| = 1; print "1..1\n"; }
+END {print "not ok 1\n" unless $loaded;}
+use FS::SessionClient;
+$loaded = 1;
+print "ok 1\n";
+
+######################### End of black magic.
+
+# Insert your test code below (better if it prints "ok 13"
+# (correspondingly "not ok 13") depending on the success of chunk 13
+# of the test code):
+
diff --git a/fs_sesmon/fs_session_server b/fs_sesmon/fs_session_server
new file mode 100644
index 000000000..be0a01710
--- /dev/null
+++ b/fs_sesmon/fs_session_server
@@ -0,0 +1,53 @@
+#!/usr/bin/perl -Tw
+#
+# fs_session_server
+#
+
+use strict;
+use vars qw( $opt $Debug );
+use IO::Handle;
+use Net::SSH qw(sshopen3)
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw( qsearch qsearchs );
+#use FS::cust_main_county;
+#use FS::cust_main;
+use FS::session;
+
+#require "configfile";
+$Debug = 1;
+
+my $user = shift or die &usage;
+&adminsuidsetup( $user ); 
+
+my $machine = shift or die &usage;
+
+my $fs_sessiond = "/usr/local/sbin/fs_sessiond";
+
+my $me = "[fs_session_server]";
+
+while (1) {
+  my($reader, $writer) = (new IO::Handle, new IO::Handle);
+  $writer->autoflush(1);
+  warn "$me Connecting to $machine\n" if $Debug;
+  sshopen2($machine,$reader,$writer,$fs_signupd);
+
+  warn "$me Entering main loop\n" if $Debug;
+  while (1) {
+    warn "$me Reading (waiting for) data\n" if $Debug;
+    my $command = scalar(<$reader));
+    #DoS protection here too, to protect against a compromised client?  *sigh*
+    while ( ( my $key = scalar(<$reader>) ) != "END\n" ) {
+      chomp $key;
+      chomp( $hash{$key} = scalar(<$reader>) );
+    }
+
+    if ( $command eq 'login' ) {
+
+    } elsif ( $command eq 'logoff' ) {
+
+    } elsif ( $command eq 'portnum' ) {
+
+    } else {
+      warn "$me WARNING: unrecognized command";
+    }
+
-- 
cgit v1.2.1


From eea322178c024e57730831556d28a78524df7450 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 27 Oct 2000 20:18:32 +0000
Subject: oops, also necessary for session monitor

---
 FS/FS/nas.pm     | 137 ++++++++++++++++++++++++++++++++++++++++
 FS/FS/port.pm    | 157 ++++++++++++++++++++++++++++++++++++++++++++++
 FS/FS/session.pm | 187 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 481 insertions(+)
 create mode 100644 FS/FS/nas.pm
 create mode 100644 FS/FS/port.pm
 create mode 100644 FS/FS/session.pm

diff --git a/FS/FS/nas.pm b/FS/FS/nas.pm
new file mode 100644
index 000000000..5ed95f92e
--- /dev/null
+++ b/FS/FS/nas.pm
@@ -0,0 +1,137 @@
+package FS::nas;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw();
+#use FS::Record qw( qsearch qsearchs );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::nas - Object methods for nas records
+
+=head1 SYNOPSIS
+
+  use FS::nas;
+
+  $record = new FS::nas \%hash;
+  $record = new FS::nas {
+    'nasnum'  => 1,
+    'nasip'   => '10.4.20.23',
+    'nasfqdn' => 'box1.brc.nv.us.example.net',
+  };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $error = $record->heartbeat($timestamp);
+
+=head1 DESCRIPTION
+
+An FS::nas object represents an Network Access Server on your network, such as
+a terminal server or equivalent.  FS::nas inherits from FS::Record.  The
+following fields are currently supported:
+
+=over 4
+
+=item nasnum - primary key
+
+=item nas - NAS name
+
+=item nasip - NAS ip address
+
+=item nasfqdn - NAS fully-qualified domain name
+
+=item last - timestamp indicating the last instant the NAS was in a known
+             state (used by the session monitoring).
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new NAS.  To add the NAS to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'nas'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  $self->ut_numbern('nasnum')
+    || $self->ut_text('nas')
+    || $self->ut_ip('nasip')
+    || $self->ut_domain('nasfqdn')
+    || $self->ut_numbern('last');
+}
+
+=back
+
+=head1 VERSION
+
+$Id: nas.pm,v 1.1 2000-10-27 20:18:32 ivan Exp $
+
+=head1 BUGS
+
+The author forgot to customize this manpage.
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/port.pm b/FS/FS/port.pm
new file mode 100644
index 000000000..c1bdee975
--- /dev/null
+++ b/FS/FS/port.pm
@@ -0,0 +1,157 @@
+package FS::port;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs );
+use FS::nas;
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::port - Object methods for port records
+
+=head1 SYNOPSIS
+
+  use FS::port;
+
+  $record = new FS::port \%hash;
+  $record = new FS::port { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::port object represents an individual port on a NAS.  FS::port inherits
+from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item portnum - primary key
+
+=item ip - IP address of this port
+
+=item nasport - port number on the NAS
+
+=item nasnum - NAS this port is on - see L<FS::nas>
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new port.  To add the example to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'port'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+  my $error =
+    $self->ut_numbern('portnum')
+    || $self->ut_ipn('ipn')
+    || $self->ut_numbern('nasport')
+    || $self->ut_number('nasnum');
+  ;
+  return $error if $error;
+  return "Either ip or nasport must be specified"
+    unless $self->ip || $self->nasport;
+  return "Unknown nasnum"
+    unless qsearchs('nas', { 'nasnum' => $self->nasnum } );
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: port.pm,v 1.1 2000-10-27 20:18:32 ivan Exp $
+
+=head1 BUGS
+
+The author forgot to customize this manpage.
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=head1 HISTORY
+
+ivan@voicenet.com 97-jul-1
+
+added hfields
+ivan@sisd.com 97-nov-13
+
+$Log: port.pm,v $
+Revision 1.1  2000-10-27 20:18:32  ivan
+oops, also necessary for session monitor
+
+Revision 1.1  1999/08/04 08:03:03  ivan
+move table subclass examples out of production directory
+
+Revision 1.4  1998/12/29 11:59:57  ivan
+mostly properly OO, some work still to be done with svc_ stuff
+
+Revision 1.3  1998/11/15 04:33:00  ivan
+updates for newest versoin
+
+Revision 1.2  1998/11/15 03:48:49  ivan
+update for current version
+
+
+=cut
+
+1;
+
diff --git a/FS/FS/session.pm b/FS/FS/session.pm
new file mode 100644
index 000000000..0d766bd22
--- /dev/null
+++ b/FS/FS/session.pm
@@ -0,0 +1,187 @@
+package FS::session;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs );
+use FS::svc_acct;
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::session - Object methods for session records
+
+=head1 SYNOPSIS
+
+  use FS::session;
+
+  $record = new FS::session \%hash;
+  $record = new FS::session {
+    'portnum' => 1,
+    'svcnum'  => 2,
+    'login'   => $timestamp,
+    'logout'  => $timestamp,
+  };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::session object represents an user login session.  FS::session inherits
+from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item sessionnum - primary key
+
+=item portnum - NAS port for this session - see L<FS::port>
+
+=item svcnum - User for this session - see L<FS::svc_acct>
+
+=item login - timestamp indicating the beginning of this user session.
+
+=item logout - timestamp indicating the end of this user session.  May be null,
+               which indicates a currently open session.
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new example.  To add the example to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'session'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.  If the `login' field is empty, it is replaced with
+the current time.
+
+=cut
+
+sub insert {
+  my $self = shift;
+  my $error;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  $error = $self->check;
+  return $error if $error;
+
+  $self->setfield('login', time()) unless $self->getfield('login');
+
+  $error = $self->SUPER::insert;
+  return $error if $error;
+
+  #session-starting callback!
+
+  '';
+
+}
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.  If the `logout' field is empty,
+it is replaced with the current time.
+
+=cut
+
+sub replace {
+  my $self = shift;
+  my $error;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  $error = $self->check;
+  return $error if $error;
+
+  $self->setfield('logout', time()) unless $self->getfield('logout');
+
+  $error = $self->SUPER::replace;
+  return $error if $error;
+
+  #session-ending callback!
+
+  '';
+}
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+  my $error =
+    $self->ut_numbern('sessionnum')
+    || $self->ut_number('portnum')
+    || $self->ut_number('svcnum')
+    || $self->ut_numbern('login')
+    || $self->ut_numbern('logout')
+  ;
+  return $error if $error;
+  return "Unknown svcnum"
+    unless qsearchs('svc_acct', { 'svcnum' => $self->svcnum } );
+  '';
+}
+
+=back
+
+=head1 VERSION
+
+$Id: session.pm,v 1.1 2000-10-27 20:18:32 ivan Exp $
+
+=head1 BUGS
+
+The author forgot to customize this manpage.
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
-- 
cgit v1.2.1


From b31966d5d1f9d8629bd28ff1c2ff37a5c84965c1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Oct 2000 10:47:26 +0000
Subject: nas.last can't be defined NULL if indexed

---
 bin/fs-setup | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index cabeb2859..b0f47610f 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.27 2000-10-27 20:15:50 ivan Exp $
+# $Id: fs-setup,v 1.28 2000-10-30 10:47:26 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,8 +32,8 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.27  2000-10-27 20:15:50  ivan
-# session monitor
+# Revision 1.28  2000-10-30 10:47:26  ivan
+# nas.last can't be defined NULL if indexed
 #
 # Revision 1.26  2000/07/06 08:57:27  ivan
 # support for radius check attributes (except importing).  poorly documented.
@@ -751,9 +751,9 @@ sub tables_hash_hack {
         'nas',      'varchar', '',    $char_d,
         'nasip',    'varchar', '',    15,
         'nasfqdn',  'varchar', '',    $char_d,
-#        'last',     'timestamp', NULL, '',
+#        'last',     'timestamp', '', '',
 #change to above when move to DBIx::DBSchema!!!
-        'last',     'datetime', NULL, '',
+        'last',     'datetime', '', '',
       ],
       'primary_key' => 'nasnum',
       'unique'      => [ [ 'nas' ], [ 'nasip' ] ],
-- 
cgit v1.2.1


From 7f07089722bfcabe3bf42619bb2bdb81fd8d44e1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 7 Nov 2000 15:00:37 +0000
Subject: session monitor

---
 FS/FS/Record.pm                                |  8 ++--
 FS/FS/nas.pm                                   | 12 ++++-
 FS/FS/session.pm                               | 27 +++++++++--
 FS/MANIFEST                                    |  4 ++
 bin/fs-setup                                   | 18 ++++---
 fs_sesmon/FS-SessionClient/MANIFEST            |  2 +
 fs_sesmon/FS-SessionClient/Makefile.PL         |  2 +-
 fs_sesmon/FS-SessionClient/SessionClient.pm    |  6 +--
 fs_sesmon/FS-SessionClient/bin/freeside-login  | 36 ++++++++++++++
 fs_sesmon/FS-SessionClient/bin/freeside-logoff | 37 +++++++++++++++
 fs_sesmon/fs_session_server                    | 66 ++++++++++++++++++++++++--
 htdocs/docs/index.html                         |  1 +
 htdocs/docs/schema.html                        | 24 ++++++++++
 13 files changed, 218 insertions(+), 25 deletions(-)
 create mode 100644 fs_sesmon/FS-SessionClient/bin/freeside-login
 create mode 100644 fs_sesmon/FS-SessionClient/bin/freeside-logoff

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index b0bfb0b3c..59472c898 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -731,10 +731,10 @@ Check/untaint ip addresses.  IPv4 only for now.
 
 sub ut_ip {
   my( $self, $field ) = @_;
-  $self->getfield($field) =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/;
+  $self->getfield($field) =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/
     or return "Illegal (IP address) $field: ". $self->getfield($field);
-  for ( $1 $2 $3 $4 ) { return "Illegal (IP address) $field" if $_ > 255; };
-  $self->$setfield($field, "$1.$2.$3.$3");
+  for ( $1, $2, $3, $4 ) { return "Illegal (IP address) $field" if $_ > 255; }
+  $self->setfield($field, "$1.$2.$3.$3");
   '';
 }
 
@@ -895,7 +895,7 @@ sub hfields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.8 2000-10-27 20:15:50 ivan Exp $
+$Id: Record.pm,v 1.9 2000-11-07 15:00:37 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/nas.pm b/FS/FS/nas.pm
index 5ed95f92e..873c9bce6 100644
--- a/FS/FS/nas.pm
+++ b/FS/FS/nas.pm
@@ -117,11 +117,21 @@ sub check {
     || $self->ut_numbern('last');
 }
 
+=sub heartbeat TIMESTAMP
+
+Updates the timestamp for this nas
+
+=cut
+
+sub heartbeat {
+  warn "warning: heartbeat unimplemented!"
+}
+
 =back
 
 =head1 VERSION
 
-$Id: nas.pm,v 1.1 2000-10-27 20:18:32 ivan Exp $
+$Id: nas.pm,v 1.2 2000-11-07 15:00:37 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/session.pm b/FS/FS/session.pm
index 0d766bd22..b85a5822f 100644
--- a/FS/FS/session.pm
+++ b/FS/FS/session.pm
@@ -4,6 +4,8 @@ use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearchs );
 use FS::svc_acct;
+use FS::port;
+use FS::nas;
 
 @ISA = qw(FS::Record);
 
@@ -31,6 +33,8 @@ FS::session - Object methods for session records
 
   $error = $record->check;
 
+  $error = $record->nas_heartbeat($timestamp);
+
 =head1 DESCRIPTION
 
 An FS::session object represents an user login session.  FS::session inherits
@@ -57,7 +61,7 @@ from FS::Record.  The following fields are currently supported:
 
 =item new HASHREF
 
-Creates a new example.  To add the example to the database, see L<"insert">.
+Creates a new session.  To add the session to the database, see L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the I<hash> method.
@@ -95,6 +99,8 @@ sub insert {
   $error = $self->SUPER::insert;
   return $error if $error;
 
+  $self->nas_heartbeat($self->getfield('login'));
+
   #session-starting callback!
 
   '';
@@ -136,6 +142,8 @@ sub replace {
   $error = $self->SUPER::replace;
   return $error if $error;
 
+  $self->nas_heartbeat($self->getfield('logout'));
+
   #session-ending callback!
 
   '';
@@ -143,7 +151,7 @@ sub replace {
 
 =item check
 
-Checks all fields to make sure this is a valid example.  If there is
+Checks all fields to make sure this is a valid session.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
 and replace methods.
 
@@ -167,11 +175,24 @@ sub check {
   '';
 }
 
+=item nas_heartbeat
+
+Heartbeats the nas associated with this session (see L<FS::nas>).
+
+=cut
+
+sub nas_heartbeat {
+  my $self = shift;
+  my $port = qsearchs('port',{'portnum'=>$self->portnum});
+  my $nas = qsearchs('nas',{'nasnum'=>$port->nasnum});
+  $nas->heartbeat(shift);
+}
+
 =back
 
 =head1 VERSION
 
-$Id: session.pm,v 1.1 2000-10-27 20:18:32 ivan Exp $
+$Id: session.pm,v 1.2 2000-11-07 15:00:37 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index e0b5b51e5..91d2e2fc0 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -40,12 +40,16 @@ FS/svc_acct_pop.pm
 FS/svc_acct_sm.pm
 FS/svc_domain.pm
 FS/type_pkgs.pm
+FS/nas.pm
+FS/port.pm
+FS/session.pm
 MANIFEST
 MANIFEST.SKIP
 Makefile.PL
 test.pl
 README
 bin/freeside-bill
+bin/freeside-print-batch
 FS/domain_record.pm
 FS/prepay_credit.pm
 FS/svc_www.pm
diff --git a/bin/fs-setup b/bin/fs-setup
index b0f47610f..602dc7274 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.28 2000-10-30 10:47:26 ivan Exp $
+# $Id: fs-setup,v 1.29 2000-11-07 15:00:37 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.28  2000-10-30 10:47:26  ivan
+# Revision 1.29  2000-11-07 15:00:37  ivan
+# session monitor
+#
+# Revision 1.28  2000/10/30 10:47:26  ivan
 # nas.last can't be defined NULL if indexed
 #
 # Revision 1.26  2000/07/06 08:57:27  ivan
@@ -751,9 +754,7 @@ sub tables_hash_hack {
         'nas',      'varchar', '',    $char_d,
         'nasip',    'varchar', '',    15,
         'nasfqdn',  'varchar', '',    $char_d,
-#        'last',     'timestamp', '', '',
-#change to above when move to DBIx::DBSchema!!!
-        'last',     'datetime', '', '',
+        'last',     @date_type,
       ],
       'primary_key' => 'nasnum',
       'unique'      => [ [ 'nas' ], [ 'nasip' ] ],
@@ -765,11 +766,8 @@ sub tables_hash_hack {
         'sessionnum', 'int',       '',   '',
         'portnum',    'int',       '',   '',
         'svcnum',     'int',       '',   '',
-#        'login',      'timestamp', '',   '',
-#        'logout',     'timestamp', '',   '',
-#change to above when move to DBIx::DBSchema!!!
-        'login',      'datetime',  '',   '',
-        'logout',     'datetime',  NULL, '',
+        'login',      @date_type,
+        'logout',     @date_type,
       ],
       'primary_key' => 'sessionnum',
       'unique'      => [],
diff --git a/fs_sesmon/FS-SessionClient/MANIFEST b/fs_sesmon/FS-SessionClient/MANIFEST
index 3ced1df17..6da7b22e9 100644
--- a/fs_sesmon/FS-SessionClient/MANIFEST
+++ b/fs_sesmon/FS-SessionClient/MANIFEST
@@ -7,3 +7,5 @@ test.pl
 fs_sessiond
 cgi/logon.cgi
 cgi/logoff.cgi
+bin/freeside-login
+bin/freeside-logoff
diff --git a/fs_sesmon/FS-SessionClient/Makefile.PL b/fs_sesmon/FS-SessionClient/Makefile.PL
index 8dff176a7..1f598474a 100644
--- a/fs_sesmon/FS-SessionClient/Makefile.PL
+++ b/fs_sesmon/FS-SessionClient/Makefile.PL
@@ -4,7 +4,7 @@ use ExtUtils::MakeMaker;
 WriteMakefile(
     'NAME'          => 'FS::SessionClient',
     'VERSION_FROM'  => 'SessionClient.pm', # finds $VERSION
-    'EXE_FILES'     => [ 'fs_sessiond' ],
+    'EXE_FILES'     => [ qw(fs_sessiond freeside-login freeside-logoff) ],
     'INSTALLSCRIPT' => '/usr/local/sbin',
     'PERM_RWX'      => '750',
 );
diff --git a/fs_sesmon/FS-SessionClient/SessionClient.pm b/fs_sesmon/FS-SessionClient/SessionClient.pm
index fd50e8908..97332cb26 100644
--- a/fs_sesmon/FS-SessionClient/SessionClient.pm
+++ b/fs_sesmon/FS-SessionClient/SessionClient.pm
@@ -1,7 +1,7 @@
 package FS::SessionClient;
 
 use strict;
-use vars qw($VERSION @ISA @EXPORT_OK $fs_sessiond_socket);
+use vars qw($AUTOLOAD $VERSION @ISA @EXPORT_OK $fs_sessiond_socket);
 use Exporter;
 use Socket;
 use FileHandle;
@@ -10,7 +10,7 @@ use IO::Handle;
 $VERSION = '0.01';
 
 @ISA = qw( Exporter );
-@EXPORT_OK = qw( login logoff );
+@EXPORT_OK = qw( login logoff portnum );
 
 $fs_sessiond_socket = "/usr/local/freeside/fs_sessiond_socket";
 
@@ -104,7 +104,7 @@ sub AUTOLOAD {
 
 =head1 VERSION
 
-$Id: SessionClient.pm,v 1.1 2000-10-27 20:15:50 ivan Exp $
+$Id: SessionClient.pm,v 1.2 2000-11-07 15:00:37 ivan Exp $
 
 =head1 BUGS
 
diff --git a/fs_sesmon/FS-SessionClient/bin/freeside-login b/fs_sesmon/FS-SessionClient/bin/freeside-login
new file mode 100644
index 000000000..6ca4455f8
--- /dev/null
+++ b/fs_sesmon/FS-SessionClient/bin/freeside-login
@@ -0,0 +1,36 @@
+#!/usr/bin/perl -Tw
+
+#false-laziness hack w freeside-logoff
+
+use strict;
+use FS::SessionClient qw( login portnum );
+
+my $username = shift;
+
+my $portnum;
+if ( scalar(@ARGV) == 1 ) {
+  my $arg = shift;
+  if ( $arg =~ /^(\d+)$/ ) {
+    $portnum = $1;
+  } elsif ( $arg =~ /^([\d\.]+)$/ ) {
+    $portnum = portnum( { 'ip' => $1 } ) or die "unknown ip!"
+  } else {
+    &usage;
+  }
+} elsif ( scalar(@ARGV) == 2 ) {
+  $portnum = portnum( { 'nasnum' => shift, 'nasport' => shift } )
+    or die "unknown nasnum/nasport";
+} else {
+  &usage;
+}
+
+my $error = login ( {
+  'username' => $username,
+  'portnum'  => $portnum,
+} );
+
+warn $error if $error;
+
+sub usage {
+  die "Usage:\n\n  freeside-login username ( portnum | ip | nasnum nasport )";
+}
diff --git a/fs_sesmon/FS-SessionClient/bin/freeside-logoff b/fs_sesmon/FS-SessionClient/bin/freeside-logoff
new file mode 100644
index 000000000..f7b876b33
--- /dev/null
+++ b/fs_sesmon/FS-SessionClient/bin/freeside-logoff
@@ -0,0 +1,37 @@
+#!/usr/bin/perl -Tw
+
+#false-laziness hack w freeside-login
+
+use strict;
+use FS::SessionClient qw( logoff portnum );
+
+my $username = shift;
+
+my $portnum;
+if ( scalar(@ARGV) == 1 ) {
+  my $arg = shift;
+  if ( $arg =~ /^(\d+)$/ ) {
+    $portnum = $1;
+  } elsif ( $arg =~ /^([\d\.]+)$/ ) {
+    $portnum = portnum( { 'ip' => $1 } ) or die "unknown ip!"
+  } else {
+    &usage;
+  }
+} elsif ( scalar(@ARGV) == 2 ) {
+  $portnum = portnum( { 'nasnum' => shift, 'nasport' => shift } )
+    or die "unknown nasnum/nasport";
+} else {
+  &usage;
+}
+
+my $error = login ( {
+  'username' => $username,
+  'portnum'  => $portnum,
+} );
+
+warn $error if $error;
+
+sub usage {
+  die "Usage:\n\n  freeside-logoff username ( portnum | ip | nasnum nasport )";
+}
+
diff --git a/fs_sesmon/fs_session_server b/fs_sesmon/fs_session_server
index be0a01710..46e53d118 100644
--- a/fs_sesmon/fs_session_server
+++ b/fs_sesmon/fs_session_server
@@ -12,6 +12,8 @@ use FS::Record qw( qsearch qsearchs );
 #use FS::cust_main_county;
 #use FS::cust_main;
 use FS::session;
+use FS::port;
+use FS::svc_acct;
 
 #require "configfile";
 $Debug = 1;
@@ -42,12 +44,70 @@ while (1) {
     }
 
     if ( $command eq 'login' ) {
-
+      $error = &login(\%hash);
+      print $writer "$error\n";
     } elsif ( $command eq 'logoff' ) {
-
+      $error = &logoff(\%hash);
+      print $writer "$error\n";
     } elsif ( $command eq 'portnum' ) {
-
+      if ( exists $hash{'ip'} ) {
+        $hash{'ip'} =~ /^([\d\.]+)$/ or $1='nomatch';
+        $port = qsearchs('port', { 'ip' => $1 } );
+      } else {
+        $hash{'nasnum'} =~ /^(\d+)$/ and my $nasnum = $1;
+        $hash{'nasport'} =~ /^(\d+)$/ and my $nasport = $1;
+        $port = qsearchs('port', { 'nasnum'=>$nasnum, 'nasport'=>$nasport } );
+      }
+      print $writer ( $port ? $port->portnum : '' ), "\n";
     } else {
       warn "$me WARNING: unrecognized command";
     }
+  }
+  #won't ever reach without code above to throw out of loop, but...
+  close $writer;
+  close $reader;
+  warn "connection to $machine lost!\n"
+  sleep 5;
+  warn "reconnecting...\n";
+}
+
+sub login {
+  my $href = shift;
+  $href->{'username'} =~ /^([a-z0-9_\-\.]+)$/ or return "Illegal username";
+  my $username = $1;
+  $svc_acct = qsearchs('svc_acct', { 'username' => $username } )
+    or return "Unknown user";
+  return "Incorrect password"
+    if defined($href->{'password'})
+       && $href->{'password'} ne $svc_acct->_password;
+  my $session = new FS::session {
+    'portnum' => $href->{'portnum'},
+    'svcnum'  => $svc_acct->svcnum,
+    'login'   => $href->{'login'},
+  };
+  $session->insert;
+}
+
+sub logout {
+  my $href = shift;
+  $href->{'username'} =~ /^([a-z0-9_\-\.]+)$/ or return "Illegal username";
+  my $username = $1;
+  $svc_acct = qsearchs('svc_acct', { 'username' => $username } )
+    or return "Unknown user";
+  return "Incorrect password"
+    if defined($href->{'password'})
+       && $href->{'password'} ne $svc_acct->_password;
+  my $session = qsearchs FS::session {
+    'portnum' => $href->{'portnum'},
+    'svcnum'  => $svc_acct->svcnum,
+    'logoff'  => '',
+  };
+  return "No currently open sessios found for that user/port!" unless $session;
+  my $nsession = new FS::session ( { $old->hash } );
+  $nsession->replace($session);
+}
+
+sub usage {
+  die "Usage:\n\n  fs_session_server user machine\n";
+}
 
diff --git a/htdocs/docs/index.html b/htdocs/docs/index.html
index f4155c1b8..f5c43d02c 100644
--- a/htdocs/docs/index.html
+++ b/htdocs/docs/index.html
@@ -20,6 +20,7 @@
   <li><a href="export.html">File exporting and remote setup</a>
   <li><a href="passwd.html">fs_passwd</a>
   <li><a href="signup.html">Signup server</a>
+  <li><a href="session.html">Session monitor</a>
   <li><a href="billing.html">Billing</a>
   <li><a href="trouble.html">Troubleshooting</a>
   <li><a href="schema.html">Schema reference</a>
diff --git a/htdocs/docs/schema.html b/htdocs/docs/schema.html
index 1ab0e7f62..474a3501a 100644
--- a/htdocs/docs/schema.html
+++ b/htdocs/docs/schema.html
@@ -143,6 +143,14 @@
         <li>pkgnum - <a href="#cust_pkg">package</a>
         <li>svcpart - <a href="#part_svc">Service definition</a>
       </ul>
+    <li><a name="nas">nas</a> - Network Access Server (terminal server)
+      <ul>
+        <li>nasnum - primary key
+        <li>nas - NAS name
+        <li>nasip - NAS ip address
+        <li>nasfqdn - NAS fully-qualified domain name
+        <li>last - timestamp indicating the last instant the NAS was in a known state (used by the session monitoring).
+      </ul>
     <li><a name="part_pkg">part_pkg</a> - Package definitions
       <ul>
         <li>pkgpart - primary key
@@ -176,12 +184,28 @@
         <li>svcpart - <a href="#part_svc">Service definition</a>
         <li>quantity - quantity of this service that this package includes
       </ul>
+    <li><a name="port">port</a> - individual port on a <a href="#nas">nas</a>
+      <ul>
+        <li>portnum - primary key
+        <li>ip - IP address of this port
+        <li>nasport - port number on the NAS
+        <li>nasnum - <a href="#nas">NAS</a>
+      </ul>
     <li><a name="prepay_credit">prepay_credit</a>
       <ul>
         <li>prepaynum - primary key
         <li>identifier - text or numeric string used to receive this credit
         <li>amount - amount of credit
       </ul>
+    <li><a name="session">session</a>
+      <ul>
+        <li>sessionnum - primary key
+        <li>portnum - <a href="#port">Port</a>
+        <li>svcnum - <a href="#svc_acct">Account</a>
+        <li>login - timestamp indicating the beginning of this user session.
+        <li>logout - timestamp indicating the end of this user session.  May be null, which indicates a currently open session.
+      </ul>
+
     <li><a name="svc_acct">svc_acct</a> - Accounts
       <ul>
         <li>svcnum - <a href="#cust_svc">primary key</a>
-- 
cgit v1.2.1


From e085e7fdbffc73d27eb43e5999b85c39499ccb14 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 22 Nov 2000 23:30:51 +0000
Subject: tyop

---
 FS/FS/svc_www.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_www.pm b/FS/FS/svc_www.pm
index bb765b193..6e741950f 100644
--- a/FS/FS/svc_www.pm
+++ b/FS/FS/svc_www.pm
@@ -53,7 +53,7 @@ from FS::svc_Common.  The following fields are currently supported:
 
 =item svcnum - primary key
 
-=item recnum - DNS `A' record corresponding to this web virtual host. (see L<FS::domain_record))
+=item recnum - DNS `A' record corresponding to this web virtual host. (see L<FS::domain_record>)
 
 =item usersvc - account (see L<FS::svc_acct>) corresponding to this web virtual host.
 
@@ -220,7 +220,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_www.pm,v 1.2 2000-03-01 08:13:59 ivan Exp $
+$Id: svc_www.pm,v 1.3 2000-11-22 23:30:51 ivan Exp $
 
 =head1 BUGS
 
@@ -232,7 +232,10 @@ L<FS::part_svc>, L<FS::cust_pkg>, schema.html from the base documentation.
 =head1 HISTORY
 
 $Log: svc_www.pm,v $
-Revision 1.2  2000-03-01 08:13:59  ivan
+Revision 1.3  2000-11-22 23:30:51  ivan
+tyop
+
+Revision 1.2  2000/03/01 08:13:59  ivan
 compilation bugfixes
 
 Revision 1.1  2000/02/03 05:16:52  ivan
-- 
cgit v1.2.1


From ae2f662a52a739ce966cdc0e74faef7bab1f8cb7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 1 Dec 2000 18:33:32 +0000
Subject: tyop

---
 bin/fs-setup | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 602dc7274..b2000a53b 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.29 2000-11-07 15:00:37 ivan Exp $
+# $Id: fs-setup,v 1.30 2000-12-01 18:33:32 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.29  2000-11-07 15:00:37  ivan
+# Revision 1.30  2000-12-01 18:33:32  ivan
+# tyop
+#
+# Revision 1.29  2000/11/07 15:00:37  ivan
 # session monitor
 #
 # Revision 1.28  2000/10/30 10:47:26  ivan
@@ -740,7 +743,7 @@ sub tables_hash_hack {
       'columns' => [
         'portnum',  'int',     '',   '',
         'ip',       'varchar', NULL, 15,
-        'nasport'   'int',     NULL, '',
+        'nasport',  'int',     NULL, '',
         'nasnum',   'int',     '',   '',
       ],
       'primary_key' => 'portnum',
-- 
cgit v1.2.1


From 61495019b4ef4079c771c37933d0fe0f38164f1a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 1 Dec 2000 18:34:53 +0000
Subject: another tyop

---
 bin/fs-setup | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index b2000a53b..4cdcb1b2c 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.30 2000-12-01 18:33:32 ivan Exp $
+# $Id: fs-setup,v 1.31 2000-12-01 18:34:53 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.30  2000-12-01 18:33:32  ivan
+# Revision 1.31  2000-12-01 18:34:53  ivan
+# another tyop
+#
+# Revision 1.30  2000/12/01 18:33:32  ivan
 # tyop
 #
 # Revision 1.29  2000/11/07 15:00:37  ivan
@@ -742,8 +745,8 @@ sub tables_hash_hack {
     'port' => {
       'columns' => [
         'portnum',  'int',     '',   '',
-        'ip',       'varchar', NULL, 15,
-        'nasport',  'int',     NULL, '',
+        'ip',       'varchar', 'NULL', 15,
+        'nasport',  'int',     'NULL', '',
         'nasnum',   'int',     '',   '',
       ],
       'primary_key' => 'portnum',
-- 
cgit v1.2.1


From 2cdaa48390786a61eb9973b66ef771430351c8f8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 1 Dec 2000 22:58:31 +0000
Subject: oops

---
 htdocs/docs/session.html | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 htdocs/docs/session.html

diff --git a/htdocs/docs/session.html b/htdocs/docs/session.html
new file mode 100644
index 000000000..161be9846
--- /dev/null
+++ b/htdocs/docs/session.html
@@ -0,0 +1,44 @@
+<head>
+  <title>Session monitor</title>
+</head>
+<body>
+<h1>Session monitor</h1>
+<h2>Installation</h2>
+For security reasons, the client portion of the session montior may run on an
+external public machine.  On this machine, install:
+<ul>
+  <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at l
+east 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enab
+le experimental features like threads or the PerlIO abstraction layer.)
+  <li><a href="man/FS/SessionClient.html">FS::SessionClient</a> (copy the fs_session/FS-SessionClient directory to the external machine, then: perl Makefile.PL; make; make install)
+</ul>
+Then:
+<ul>
+  <li>Add the user `freeside' to the the external machine.
+  <li>Create the /usr/local/freeside directory on the external machine (owned by the freeside user).
+  <li>touch /usr/local/freeside/fs_sessiond_socket; chown freeside /usr/local/freeside/fs_sessiond_socket; chmod 600 /usr/local/freeside/fs_sessiond_socket
+    <li>Append the identity.pub from the freeside user on your freeside machine to the authorized_keys file of the newly created freeside user on the external machine(s).
+  <li>Run <pre>fs_session_server <i>user</i> <i>machine</i></pre> on the Freeside machine.
+  <ul>
+    <li><i>user</i> is a user from the mapsecrets file.
+    <li><i>machine</i> is the name of the external machine.
+  </ul>
+</ul>
+<h2>Usage</h2>
+<ul>
+  <li>RADIUS
+  <li>Web
+  <li>Command-line
+    <br><pre>freeside-login username ( portnum | ip | nasnum nasport )</pre>
+    <ul>
+      <li><i>username</i> is a customer username from the svc_acct table
+      <li><i>portnum</i>, <i>ip</i> or <i>nasport</i> and <i>nasnum</i> uniquely identify a port in the <a href="schema.html#port">port</a> database table.
+    </ul>
+</ul>
+</body>
+
+
+
+
+
+
-- 
cgit v1.2.1


From e966cec8367fbc5f21b366f9c497fc0260292407 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Dec 2000 10:09:35 +0000
Subject: bad caches!

---
 FS/FS/CGIwrapper.pm | 17 +++++++++++++++++
 FS/MANIFEST         |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 FS/FS/CGIwrapper.pm

diff --git a/FS/FS/CGIwrapper.pm b/FS/FS/CGIwrapper.pm
new file mode 100644
index 000000000..863193e94
--- /dev/null
+++ b/FS/FS/CGIwrapper.pm
@@ -0,0 +1,17 @@
+package FS::CGIwrapper;
+
+use vars qw(@ISA);
+
+use CGI;
+
+@ISA = qw( CGI );
+
+sub header {
+  my $self = shift;
+  $self->SUPER::header(
+    @_,
+    '-expires'       => 'now',
+    '-pragma'        => 'No-Cache',
+    '-cache-control' => 'No-Cache',
+  );
+}
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 91d2e2fc0..a66c5ced7 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -53,3 +53,4 @@ bin/freeside-print-batch
 FS/domain_record.pm
 FS/prepay_credit.pm
 FS/svc_www.pm
+FS/CGIwrapper.pm
-- 
cgit v1.2.1


From c7effea426d7cefcebc4b32f162fd1719095fc12 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Dec 2000 13:44:05 +0000
Subject: beginnings of web status for session monitor

---
 FS/FS/port.pm         | 19 +++++++++++--
 htdocs/browse/nas.cgi | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++
 htdocs/index.html     |  1 +
 3 files changed, 93 insertions(+), 2 deletions(-)
 create mode 100755 htdocs/browse/nas.cgi

diff --git a/FS/FS/port.pm b/FS/FS/port.pm
index c1bdee975..ee4611d21 100644
--- a/FS/FS/port.pm
+++ b/FS/FS/port.pm
@@ -4,6 +4,7 @@ use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearchs );
 use FS::nas;
+use FS::session;
 
 @ISA = qw(FS::Record);
 
@@ -26,6 +27,8 @@ FS::port - Object methods for port records
 
   $error = $record->check;
 
+  $session = $port->session;
+
 =head1 DESCRIPTION
 
 An FS::port object represents an individual port on a NAS.  FS::port inherits
@@ -113,11 +116,20 @@ sub check {
   ''; #no error
 }
 
+=item session
+
+Returns the currently open session, or if no session is currently open, the
+most recent session.  See L<FS::session>.
+
+=cut
+
+
+
 =back
 
 =head1 VERSION
 
-$Id: port.pm,v 1.1 2000-10-27 20:18:32 ivan Exp $
+$Id: port.pm,v 1.2 2000-12-03 13:44:05 ivan Exp $
 
 =head1 BUGS
 
@@ -135,7 +147,10 @@ added hfields
 ivan@sisd.com 97-nov-13
 
 $Log: port.pm,v $
-Revision 1.1  2000-10-27 20:18:32  ivan
+Revision 1.2  2000-12-03 13:44:05  ivan
+beginnings of web status for session monitor
+
+Revision 1.1  2000/10/27 20:18:32  ivan
 oops, also necessary for session monitor
 
 Revision 1.1  1999/08/04 08:03:03  ivan
diff --git a/htdocs/browse/nas.cgi b/htdocs/browse/nas.cgi
new file mode 100755
index 000000000..2aafbc1fd
--- /dev/null
+++ b/htdocs/browse/nas.cgi
@@ -0,0 +1,75 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use vars qw( $cgi $p );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use Date::Format;
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch); # qsearchs);
+use FS::CGI qw(header menubar table popurl);
+use FS::nas;
+use FS::port;
+use FS::session;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$p=popurl(2);
+
+print $cgi->header( '-expires' => 'now' ), header('NAS ports', menubar(
+  'Main Menu' => $p,
+));
+
+my $now = time;
+
+foreach my $nas ( sort { $a->nasnum <=> $b->nasnum } qsearch( 'nas', {} ) ) {
+  print $nas->nasnum. ": ". $nas->nas. " ".
+        $nas->nasfqdn. " (". $nas->nasip. ") ".
+        "as of ". time2str("%c",$nas->last).
+        " (". &pretty_interval($now - $nas->last). " ago)<br>".
+        &table(). "<TR><TH>Nas<BR>Port #</TH><TH>Global<BR>Port #</BR></TH>".
+        "<TH>IP address</TH><TH>User</TH><TH>Since</TH><TH>Duration</TH><TR>",
+  ;
+  foreach my $port ( sort {
+    $a->nasport <=> $b->nasport || $a->portnum <=> $b->portnum
+  } qsearch( 'port' ) ) {
+    print "<TR><TD>". $port->nasport. "</TD><TD>". $port->portnum. "</TD><TD>".
+          $port->ip. "</TD><TD>". 'user'. "</TD><TD>". 'since'. "</TD><TD>". 
+          'duration'. "</TD></TR>"
+    ;
+  }
+  print "</TABLE><BR>";
+}
+
+sub pretty_interval {
+  my $interval = shift;
+  my %howlong = (
+    '604800' => 'week',
+    '86400'  => 'day',
+    '3600'   => 'hour',
+    '60'     => 'minute',
+    '1'      => 'second',
+  );
+
+  my $pretty = "";
+  foreach my $key ( sort { $b <=> $a } keys %howlong ) {
+    my $value = int( $interval / $key );
+    if ( $value  ) {
+      if ( $value == 1 ) {
+        $pretty .=
+          ( $howlong{$key} eq 'hour' ? 'an ' : 'a ' ). $howlong{$key}. " "
+      } else {
+        $pretty .= $value. ' '. $howlong{$key}. 's ';
+      }
+    }
+    $interval -= $value * $key;
+  }
+  $pretty =~ /^\s*(\S.*\S)\s*$/;
+  $1;
+} 
+
+#print &table(), <<END;
+#<TR>
+#  <TH>#</TH>
+#  <TH>NAS</
diff --git a/htdocs/index.html b/htdocs/index.html
index 0ae8b5dbb..75c301f75 100755
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -61,6 +61,7 @@
               <LI>unlinked accounts (<A HREF="search/svc_acct.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?UN_username">by username</A>) (<A HREF="search/svc_acct.cgi?UN_uid">by uid</A>)
               <LI>unlinked domains (<A HREF="search/svc_domain.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?UN_domain">by domain</A>)
             </UL>
+          <LI><A HREF="browse/nas.cgi">NAS ports</A>
         </ul>
       <li><A NAME="admin">Administration</a>
         <ul>
-- 
cgit v1.2.1


From 9951dac925264910d664b50d2fc33cf3dc1c734e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Dec 2000 13:45:15 +0000
Subject: patch from Jason Spence <thalakan@frys.com>: admin.html doc,
 autocapgen

---
 FS/FS/agent.pm            |  4 +--
 htdocs/docs/admin.html    | 53 +++++++++++++++++++++++++++++++++
 htdocs/docs/config.html   |  1 +
 htdocs/docs/index.html    |  4 +--
 htdocs/docs/install.html  |  1 +
 htdocs/edit/cust_main.cgi | 74 ++++++++++++++++++++++++++++++++++++++++++++---
 6 files changed, 129 insertions(+), 8 deletions(-)

diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
index 27e9aed71..1afe70641 100644
--- a/FS/FS/agent.pm
+++ b/FS/FS/agent.pm
@@ -131,7 +131,7 @@ sub agent_type {
 =item pkgpart_hashref
 
 Returns a hash reference.  The keys of the hash are pkgparts.  The value is
-true iff this agent may purchase the specified package definition.  See
+true if this agent may purchase the specified package definition.  See
 L<FS::part_pkg>.
 
 =cut
@@ -145,7 +145,7 @@ sub pkgpart_hashref {
 
 =head1 VERSION
 
-$Id: agent.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: agent.pm,v 1.2 2000-12-03 13:45:15 ivan Exp $
 
 =head1 BUGS
 
diff --git a/htdocs/docs/admin.html b/htdocs/docs/admin.html
index 8adddbe92..b6665e05e 100644
--- a/htdocs/docs/admin.html
+++ b/htdocs/docs/admin.html
@@ -4,3 +4,56 @@
 <body>
   <h1>Administration</h1>
 </body>
+<ul>
+  <li>Open up the root of the Freeside document tree in your web
+  browser.  For example, if you created the Freeside document tree in   
+  /home/httpd/html/freeside, and your web browser's DocumentRoot is
+  /home/httpd/html, open http://your_host/freeside/. Replace
+  "your_host" with the name or network address of your web server.
+
+  <li>Once in the Freeside web interface, you must first create a
+  service.  An example of a service would be a dial-up account or a
+  hosted virtual domain.
+
+  <li>After you create your first service or services, you must then
+  create a package of that service or services which you will sell to
+  your customer.  To allow flexibility in changing your service
+  offerings, Freeside requires that you bundle your services into a
+  package before customers may purchase them.  For instance, you could
+  create a leased line package which would consist of a one-time
+  charge for the customer premise equipment, the monthly service fee
+  for the leased line, a backup dial-up account, and a support
+  contract.  You could also create a leased line package which omits
+  the support contract simply by adding a new package that does not
+  include the support contract.
+  
+  <li>After you create your first package, then you must define who is
+  able to sell that package by creating an agent type.  An example of
+  an agent type would be an internal sales representitive which sells
+  regular and promotional packages, as opposed to an external sales
+  representitive which would only sell regular packages of services.
+
+  <li>After creating a new agent type, you must create an agent, and
+  assign the the agent type you just created to it.
+
+  <li>If the service you created was of type svc_acct, you may have to
+  create a POP from the main menu before you can create your first new
+  customer.
+
+  <li>If you are using Freeside to keep track of sales taxes, you must
+  define tax information for your locale by clicking on the "View/Edit  
+  locales and tax rates" link on the Freeside main menu.
+
+  <li>Finally, you may optionally set up a referral by clicking on the
+  "View/Edit referrals" link in the Freeside main menu.  Referrals
+  will help you keep track of how effective your advertising is, by
+  helping you keep track of where customers heard of your service
+  offerings.  You must create at least one referral.  If you do not wish to
+  use the referral functionality, simply create a single referral only.
+  
+  <li>You should now be ready to sign up your first customer by
+  clicking on the "New Customer" link at the top of the Freeside main
+  menu.
+</ul>
+</body>
+</html>
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index e42cfd8e1..db218d642 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -25,6 +25,7 @@ All further configuration files and directories are located in
   <li><a name="apacheroot">apacheroot</a> - The directory containing Apache virtual hosts
   <li><a name="apachemachine">apachemachine</a> - A machine with the apacheroot directory and user home directories.  The existance of this file enables setup of virtual host directories, and, in conjunction with the `home' configuration file, symlinks into user home directories.
   <li><a name="apachemachines">apachemachines</a> - Your Apache machines, one per line.  This enables export of `/etc/apache/vhosts.conf', which can be included in your Apache configuration via the <a href="http://www.apache.org/docs/mod/core.html#include">Include</a> directive.
+  <li><a name="autocapnames">autocapnames</a> - The presence of this file will cause Freeside to use Javascript in /htdocs/edit/cust_main.cgi to automatically capitalize the first and last names of customers.
   <li><a name="bindprimary">bindprimary</a> - Your BIND primary nameserver.  This enables export of /var/named/named.conf and zone files into /var/named
   <li><a name="bindsecondaries">bindsecondaries</a> - Your BIND secondary nameservers, one per line.  This enables export of /var/named/named.conf
   <li><a name="bsdshellmachines">bsdshellmachines</a> - Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/master.passwd'.
diff --git a/htdocs/docs/index.html b/htdocs/docs/index.html
index f5c43d02c..fa0459bca 100644
--- a/htdocs/docs/index.html
+++ b/htdocs/docs/index.html
@@ -12,10 +12,10 @@
   <li><a href="upgrade5.html">Upgrading from 1.2.2 to 1.2.3</a>
   <li><a href="upgrade6.html">Upgrading from 1.2.3 to 1.2.4</a>
   <li><a href="config.html">Configuration files</a>
-<!--
   <li><a href="admin.html">Administration</a>
-!-->
+<!--
   <li><a href="../index.html#admin">Administration</a>
+!-->
   <li><a href="legacy.html">Importing legacy data</a>
   <li><a href="export.html">File exporting and remote setup</a>
   <li><a href="passwd.html">fs_passwd</a>
diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 300104b2d..21b575139 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -77,5 +77,6 @@ chmod 755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.c
 <li>Create the `/usr/local/etc/freeside/counters.<i>datasrc</i>', and 
   `/usr/local/etc/freeside/export.<i>datasrc</i>' directories for each <i>datasrc</i> (owned by the freeside user).
   <li>As the freeside user, run bin/fs-setup to create the database tables.
+  <li>Now proceed to the initial <a href="admin.html">administration</a> of your installation.
 </ul>
 </body>
diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 0cde76b06..cb8ec83ee 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.26 2000-06-27 12:15:50 ivan Exp $
+# $Id: cust_main.cgi,v 1.27 2000-12-03 13:45:15 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.26  2000-06-27 12:15:50  ivan
+# Revision 1.27  2000-12-03 13:45:15  ivan
+# patch from Jason Spence <thalakan@frys.com>: admin.html doc, autocapgen
+#
+# Revision 1.26  2000/06/27 12:15:50  ivan
 # i18n
 #
 # Revision 1.25  2000/03/02 08:09:38  ivan
@@ -188,7 +191,54 @@ print $cgi->header( '-expires' => 'now' ), header("Customer $action", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
   if $cgi->param('error');
-print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST>!,
+
+# JRS: Javascript to set up the form for us
+    if ( $conf->exists('autocapnames') ) {
+      print <<END;
+<SCRIPT language="Javascript"><!--
+    
+function capName(name) {
+    var temp = new String();
+    var n = name.toString();
+    
+// Handle "Mc", "Mac", "Von", "Van", etc...
+ 
+    if(n.substr(0,2).toLowerCase() == "mc") {
+     temp += "Mc";
+     temp += n.charAt(2).toUpperCase();
+     temp += n.substr(3).toLowerCase();
+     return temp;
+    }
+     
+    if(n.substr(0,3).toLowerCase() == "mac") {
+     temp += "Mac";
+     temp += n.charAt(3).toUpperCase();
+     temp += n.substr(4).toLowerCase();
+     return temp;
+    }
+    if(n.substr(0,3).toLowerCase() == "von") {
+     temp += "Von";
+     temp += n.charAt(3).toUpperCase();
+     temp += n.substr(4).toLowerCase();
+     return temp;
+    }
+    if(n.substr(0,3).toLowerCase() == "van") {
+     temp += "Van";
+     temp += n.charAt(3).toUpperCase();
+     temp += n.substr(4).toLowerCase();
+     return temp;
+    }
+    temp += n.charAt(0).toUpperCase();
+    temp += n.substr(1).toLowerCase();
+    return temp;
+}
+   
+//-->
+</SCRIPT>
+END
+}
+
+print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST NAME="form1">!,
       qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!,
       qq!Customer # !, ( $custnum ? $custnum : " (NEW)" ),
       
@@ -256,7 +306,23 @@ if ( $custnum && ! $conf->exists('editreferrals') ) {
 );
 
 print "<BR><BR>Contact information", &itable("#c0c0c0"), <<END;
-<TR><TH ALIGN="right">${r}Contact name<BR>(last, first)</TH><TD COLSPAN=3><INPUT TYPE="text" NAME="last" VALUE="$last">, <INPUT TYPE="text" NAME="first" VALUE="$first"></TD><TD ALIGN="right">SS#</TD><TD><INPUT TYPE="text" NAME="ss" VALUE="$ss" SIZE=11></TD></TR>
+<TR><TH ALIGN="right">${r}Contact name<BR>(last, first)</TH><TD COLSPAN=3>
+END
+
+if ( $conf->exists('autocapnames') ) {
+  print <<END;
+<INPUT TYPE="text" NAME="last" VALUE="$last" onChange="updateUsername();">, 
+<INPUT TYPE="text" NAME="first" VALUE="$first" onChange="updateUsername();">
+END
+} else {
+  print <<END;
+<INPUT TYPE="text" NAME="last" VALUE="$last">, 
+<INPUT TYPE="text" NAME="first" VALUE="$first">
+END
+}
+
+print <<END;
+</TD><TD ALIGN="right">SS#</TD><TD><INPUT TYPE="text" NAME="ss" VALUE="$ss" SIZE=11></TD></TR>
 <TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="company" VALUE="$company" SIZE=70></TD></TR>
 <TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=70></TD></TR>
 <TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=70></TD></TR>
-- 
cgit v1.2.1


From 65dea21c4088a0dbf3e8863a6dadc39aed67d4db Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Dec 2000 14:29:15 +0000
Subject: template bugfix from Jason Spence <thalakan@frys.com>

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 7576b8b42..a3fa9e788 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.8 2000-08-24 07:26:50 ivan Exp $
+# $Id: signup.cgi,v 1.9 2000-12-03 14:29:15 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $r $error
@@ -313,7 +313,7 @@ sub print_okay {
 
   my $pop = pop_info($cgi->param('popnum'))
     or die "fatal: invalid popnum got past FS::SignupClient::new_customer";
-  my ( $ac, $exch, $loc ) = ( $pop->{'ac'}, $pop->{'exch'}, $pop->{'loc'} );
+  ( $ac, $exch, $loc ) = ( $pop->{'ac'}, $pop->{'exch'}, $pop->{'loc'} );
 
   if ( $ieak_template
        && $user_agent->platform eq 'ia32'
-- 
cgit v1.2.1


From 3a95cc316da367ffd248ba29ac594f3efbc9db61 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Dec 2000 15:14:00 +0000
Subject: bugfixes from Jeff Finucane <jeff@cmh.net>, thanks!

---
 CREDITS                    | 6 +++++-
 FS/FS/cust_bill.pm         | 6 +++---
 bin/svc_acct_sm.import     | 9 ++++++---
 htdocs/view/svc_domain.cgi | 9 ++++++---
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/CREDITS b/CREDITS
index e97167761..79b95b370 100644
--- a/CREDITS
+++ b/CREDITS
@@ -53,7 +53,8 @@ autoconfiguration support for the signup server.
 
 Jeff Finucane <jeff@cmh.net> send in a bunch of bugfixes (for the sendmail
 export, cancel-unaudited.cgi), patches to support billing date modification,
-and probably other things too (sorry if I forgot them).
+and probably other things too (sorry if I forgot them).  And yet even more
+bug squashing, thanks!
 
 Kenny Elliott <kenny@neoserve.com> contributed ICRADIUS radreply table support,
 allowing attributes with ICRADIUS, helped fix many bugs, and some
@@ -62,5 +63,8 @@ other stuff I can't recall (sorry).
 Stephen Amadei <amadei@dandy.net> contribued portability cleanups for the
 low-level DBI stuff.
 
+Jason Spence <thalakan@frys.com> contributed admin.html, autocapnames
+javascript, bugfixes & other neat stuff I can't remember.
+
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 2df92f75f..568f272aa 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -225,7 +225,7 @@ credits (FS::cust_credit objects).
 sub cust_credit {
   my $self = shift;
   my $total = 0;
-  my @cust_credit = sort { $a->_date <=> $b->date }
+  my @cust_credit = sort { $a->_date <=> $b->_date }
     grep { $_->credited != 0 && $_->_date < $self->_date }
       qsearch('cust_credit', { 'custnum' => $self->custnum } )
   ;
@@ -241,7 +241,7 @@ Returns all payments (see L<FS::cust_pay>) for this invoice.
 
 sub cust_pay {
   my $self = shift;
-  sort { $a->_date <=> $b->date }
+  sort { $a->_date <=> $b->_date }
     qsearch( 'cust_pay', { 'invnum' => $self->invnum } )
   ;
 }
@@ -424,7 +424,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.3 2000-09-20 10:35:21 ivan Exp $
+$Id: cust_bill.pm,v 1.4 2000-12-03 15:14:00 ivan Exp $
 
 =head1 BUGS
 
diff --git a/bin/svc_acct_sm.import b/bin/svc_acct_sm.import
index 349c4f26c..0714af3f1 100755
--- a/bin/svc_acct_sm.import
+++ b/bin/svc_acct_sm.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.import,v 1.7 2000-06-29 10:51:52 ivan Exp $
+# $Id: svc_acct_sm.import,v 1.8 2000-12-03 15:14:00 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -16,7 +16,10 @@
 # ivan@sisd.com 98-jul-13
 #
 # $Log: svc_acct_sm.import,v $
-# Revision 1.7  2000-06-29 10:51:52  ivan
+# Revision 1.8  2000-12-03 15:14:00  ivan
+# bugfixes from Jeff Finucane <jeff@cmh.net>, thanks!
+#
+# Revision 1.7  2000/06/29 10:51:52  ivan
 # oops, silly mistake
 #
 # Revision 1.6  2000/06/29 10:48:25  ivan
@@ -252,7 +255,7 @@ END
   while (<VIRTUSERTABLE>) {
     next if /^#/; #comments?
     next if /^\s*$/; #blank lines
-    /^([\w\-\.]+)?\@([\w\-\.]+)\t([\w\-\.]+)$/
+    /^([\w\-\.]+)?\@([\w\-\.]+)\t+([\w\-\.]+)$/
       #or do { warn "Strange virtusertable line: $_"; next; };
       or die "Strange virtusertable line: $_";
     my($domuser,$domain,$username)=($1,$2,$3);
diff --git a/htdocs/view/svc_domain.cgi b/htdocs/view/svc_domain.cgi
index fef5ad4f3..85c854ee0 100755
--- a/htdocs/view/svc_domain.cgi
+++ b/htdocs/view/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.10 1999-08-27 22:18:44 ivan Exp $
+# $Id: svc_domain.cgi,v 1.11 2000-12-03 15:14:00 ivan Exp $
 #
 # Usage: svc_domain svcnum
 #        http://server.name/path/svc_domain.cgi?svcnum
@@ -13,7 +13,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.10  1999-08-27 22:18:44  ivan
+# Revision 1.11  2000-12-03 15:14:00  ivan
+# bugfixes from Jeff Finucane <jeff@cmh.net>, thanks!
+#
+# Revision 1.10  1999/08/27 22:18:44  ivan
 # point to patrick instead of internic!
 #
 # Revision 1.9  1999/04/08 12:00:19  ivan
@@ -94,6 +97,6 @@ print $cgi->header( '-expires' => 'now' ), header('Domain View', menubar(
       "Service #$svcnum",
       "<BR>Service: <B>", $part_svc->svc, "</B>",
       "<BR>Domain name: <B>$domain</B>.",
-      qq!<BR><BR><A HREF="http://209.133.38.12/step1.cgi?query=$domain">View whois information.</A>!,
+      qq!<BR><BR><A HREF="http://www.geektools.com/cgi-bin/proxy.cgi?query=$domain;targetnic=auto">View whois information.</A>!,
       '</BODY></HTML>',
 ;
-- 
cgit v1.2.1


From b90f8cdac9371c219a72dda16f8deecc7c44fc28 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Dec 2000 20:25:20 +0000
Subject: session monitor updates

---
 FS/FS/Record.pm                                | 19 +++++++++---
 FS/FS/nas.pm                                   | 24 ++++++++++++---
 FS/FS/port.pm                                  | 27 +++++++++++++----
 FS/FS/session.pm                               | 28 ++++++++++++++---
 TODO                                           |  4 ++-
 fs_sesmon/FS-SessionClient/MANIFEST            |  4 +--
 fs_sesmon/FS-SessionClient/Makefile.PL         |  2 +-
 fs_sesmon/FS-SessionClient/SessionClient.pm    | 22 ++++++++------
 fs_sesmon/FS-SessionClient/bin/freeside-login  |  2 +-
 fs_sesmon/FS-SessionClient/bin/freeside-logoff | 37 -----------------------
 fs_sesmon/FS-SessionClient/bin/freeside-logout | 36 ++++++++++++++++++++++
 fs_sesmon/FS-SessionClient/fs_sessiond         | 10 +++---
 fs_sesmon/FS-SessionClient/test.pl             |  3 +-
 fs_sesmon/fs_session_server                    | 42 ++++++++++++++------------
 htdocs/browse/nas.cgi                          | 25 +++++++++++++--
 htdocs/view/svc_acct.cgi                       |  9 ++++--
 16 files changed, 192 insertions(+), 102 deletions(-)
 delete mode 100644 fs_sesmon/FS-SessionClient/bin/freeside-logoff
 create mode 100644 fs_sesmon/FS-SessionClient/bin/freeside-logout

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 59472c898..18541d2db 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -149,22 +149,32 @@ sub create {
   }
 }
 
-=item qsearch TABLE, HASHREF
+=item qsearch TABLE, HASHREF, SELECT, EXTRA_SQL
 
 Searches the database for all records matching (at least) the key/value pairs
 in HASHREF.  Returns all the records found as `FS::TABLE' objects if that
 module is loaded (i.e. via `use FS::cust_main;'), otherwise returns FS::Record
 objects.
 
+###oops, argh, FS::Record::new only lets us create database fields.
+#Normal behaviour if SELECT is not specified is `*', as in
+#C<SELECT * FROM table WHERE ...>.  However, there is an experimental new
+#feature where you can specify SELECT - remember, the objects returned,
+#although blessed into the appropriate `FS::TABLE' package, will only have the
+#fields you specify.  This might have unwanted results if you then go calling
+#regular FS::TABLE methods
+#on it.
+
 =cut
 
 sub qsearch {
-  my($table, $record) = @_;
+  my($table, $record, $select, $extra_sql ) = @_;
+  $select ||= '*';
   my $dbh = dbh;
 
   my @fields = grep exists($record->{$_}), fields($table);
 
-  my $statement = "SELECT * FROM $table";
+  my $statement = "SELECT $select FROM $table";
   if ( @fields ) {
     $statement .= " WHERE ". join(' AND ', map {
       if ( ! defined( $record->{$_} ) || $record->{$_} eq '' ) {
@@ -178,6 +188,7 @@ sub qsearch {
       }
     } @fields );
   }
+  $statement .= " $extra_sql" if defined($extra_sql);
 
   warn $statement if $DEBUG;
   my $sth = $dbh->prepare_cached($statement) or croak $dbh->errstr;
@@ -895,7 +906,7 @@ sub hfields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.9 2000-11-07 15:00:37 ivan Exp $
+$Id: Record.pm,v 1.10 2000-12-03 20:25:20 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/nas.pm b/FS/FS/nas.pm
index 873c9bce6..53e0fbc34 100644
--- a/FS/FS/nas.pm
+++ b/FS/FS/nas.pm
@@ -2,8 +2,8 @@ package FS::nas;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw();
-#use FS::Record qw( qsearch qsearchs );
+use FS::Record qw(qsearchs); #qsearch);
+use FS::UID qw( dbh ); #to lock the tables for heartbeat; ugh, MySQL-specific
 
 @ISA = qw(FS::Record);
 
@@ -124,18 +124,32 @@ Updates the timestamp for this nas
 =cut
 
 sub heartbeat {
-  warn "warning: heartbeat unimplemented!"
+  my($self, $timestamp) = @_;
+  my $dbh = dbh;
+  my $sth = $dbh->prepare("LOCK TABLES nas WRITE");
+  $sth->execute or die $sth->errstr; #die?
+  my $lock_self = qsearchs('nas', { 'nasnum' => $self->nasnum } )
+    or die "can't find own record for $self nasnum ". $self->nasnum;
+  if ( $timestamp > $lock_self->last ) {
+    my $new_self = new FS::nas ( { $lock_self->hash } );
+    $new_self->last($timestamp);
+    #is there a reason to? #$self->last($timestamp);
+    $new_self->replace($lock_self);
+  };
+  $sth = $dbh->prepare("UNLOCK TABLES");
+  $sth->execute or die $sth->errstr; #die?
 }
 
 =back
 
 =head1 VERSION
 
-$Id: nas.pm,v 1.2 2000-11-07 15:00:37 ivan Exp $
+$Id: nas.pm,v 1.3 2000-12-03 20:25:20 ivan Exp $
 
 =head1 BUGS
 
-The author forgot to customize this manpage.
+The B<heartbeat> method is MySQL-specific.  Yuck.  It's also not quite
+perfectly subclassable, which is much less yuck.
 
 =head1 SEE ALSO
 
diff --git a/FS/FS/port.pm b/FS/FS/port.pm
index ee4611d21..e96e71c0f 100644
--- a/FS/FS/port.pm
+++ b/FS/FS/port.pm
@@ -118,23 +118,38 @@ sub check {
 
 =item session
 
-Returns the currently open session, or if no session is currently open, the
-most recent session.  See L<FS::session>.
+Returns the currently open session on this port, or if no session is currently
+open, the most recent session.  See L<FS::session>.
 
 =cut
 
-
+sub session {
+  my $self = shift;
+  qsearchs('session', { 'portnum' => $self->portnum }, '*',
+                     'ORDER BY login DESC LIMIT 1' );
+}
 
 =back
 
 =head1 VERSION
 
-$Id: port.pm,v 1.2 2000-12-03 13:44:05 ivan Exp $
+$Id: port.pm,v 1.3 2000-12-03 20:25:20 ivan Exp $
 
 =head1 BUGS
 
 The author forgot to customize this manpage.
 
+The session method won't deal well if you have multiple open sessions on a
+port, for example if your RADIUS server drops B<stop> records.  Suggestions for
+how to deal with this sort of lossage welcome; should we close the session
+when we get a new session on that port?  Tag it as invalid somehow?  Close it
+one second after it was opened?  *sigh*  Maybe FS::session shouldn't let you
+create overlapping sessions, at least folks will find out their logging is
+dropping records.
+
+If you think the above refers multiple user logins you need to read the
+manpages again.
+
 =head1 SEE ALSO
 
 L<FS::Record>, schema.html from the base documentation.
@@ -147,8 +162,8 @@ added hfields
 ivan@sisd.com 97-nov-13
 
 $Log: port.pm,v $
-Revision 1.2  2000-12-03 13:44:05  ivan
-beginnings of web status for session monitor
+Revision 1.3  2000-12-03 20:25:20  ivan
+session monitor updates
 
 Revision 1.1  2000/10/27 20:18:32  ivan
 oops, also necessary for session monitor
diff --git a/FS/FS/session.pm b/FS/FS/session.pm
index b85a5822f..027708d98 100644
--- a/FS/FS/session.pm
+++ b/FS/FS/session.pm
@@ -94,6 +94,9 @@ sub insert {
   $error = $self->check;
   return $error if $error;
 
+  return "a session on that port is already open!"
+    if qsearchs('session', { 'portnum' => $self->portnum, 'logout' => '' } );
+
   $self->setfield('login', time()) unless $self->getfield('login');
 
   $error = $self->SUPER::insert;
@@ -124,7 +127,7 @@ it is replaced with the current time.
 =cut
 
 sub replace {
-  my $self = shift;
+  my($self, $old) = @_;
   my $error;
 
   local $SIG{HUP} = 'IGNORE';
@@ -139,7 +142,7 @@ sub replace {
 
   $self->setfield('logout', time()) unless $self->getfield('logout');
 
-  $error = $self->SUPER::replace;
+  $error = $self->SUPER::replace($old);
   return $error if $error;
 
   $self->nas_heartbeat($self->getfield('logout'));
@@ -188,15 +191,32 @@ sub nas_heartbeat {
   $nas->heartbeat(shift);
 }
 
+=item svc_acct
+
+Returns the svc_acct record associated with this session (see L<FS::svc_acct>).
+
+=cut
+
+sub svc_acct {
+  my $self = shift;
+  qsearchs('svc_acct', { 'svcnum' => $self->svcnum } );
+}
+
 =back
 
 =head1 VERSION
 
-$Id: session.pm,v 1.2 2000-11-07 15:00:37 ivan Exp $
+$Id: session.pm,v 1.3 2000-12-03 20:25:20 ivan Exp $
 
 =head1 BUGS
 
-The author forgot to customize this manpage.
+Maybe you shouldn't be able to insert a session if there's currently an open
+session on that port.  Or maybe the open session on that port should be flagged
+as problematic?  autoclosed?  *sigh*
+
+Hmm, sessions refer to current svc_acct records... probably need to constrain
+deletions to svc_acct records such that no svc_acct records are deleted which
+have a session (even if long-closed).
 
 =head1 SEE ALSO
 
diff --git a/TODO b/TODO
index c6d7e4362..4d0a0ba5f 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.52 2000-10-27 20:15:50 ivan Exp $
+$Id: TODO,v 1.53 2000-12-03 20:25:20 ivan Exp $
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
@@ -6,6 +6,8 @@ ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
 ---
 
+first package select field in edit/cust_main.cgi isn't sticky on errors, yuck
+
 > 1. A Web Form to the user get his account added automatically . The
 > /etc/raddb/users and /etc/passwd would be updated automatically (these
 > file are on the same machine Freeside is). I guess the the Add
diff --git a/fs_sesmon/FS-SessionClient/MANIFEST b/fs_sesmon/FS-SessionClient/MANIFEST
index 6da7b22e9..9da279a87 100644
--- a/fs_sesmon/FS-SessionClient/MANIFEST
+++ b/fs_sesmon/FS-SessionClient/MANIFEST
@@ -6,6 +6,6 @@ SessionClient.pm
 test.pl
 fs_sessiond
 cgi/logon.cgi
-cgi/logoff.cgi
+cgi/logout.cgi
 bin/freeside-login
-bin/freeside-logoff
+bin/freeside-logout
diff --git a/fs_sesmon/FS-SessionClient/Makefile.PL b/fs_sesmon/FS-SessionClient/Makefile.PL
index 1f598474a..137b6b8bd 100644
--- a/fs_sesmon/FS-SessionClient/Makefile.PL
+++ b/fs_sesmon/FS-SessionClient/Makefile.PL
@@ -4,7 +4,7 @@ use ExtUtils::MakeMaker;
 WriteMakefile(
     'NAME'          => 'FS::SessionClient',
     'VERSION_FROM'  => 'SessionClient.pm', # finds $VERSION
-    'EXE_FILES'     => [ qw(fs_sessiond freeside-login freeside-logoff) ],
+    'EXE_FILES'     => [ qw(fs_sessiond bin/freeside-login bin/freeside-logout) ],
     'INSTALLSCRIPT' => '/usr/local/sbin',
     'PERM_RWX'      => '750',
 );
diff --git a/fs_sesmon/FS-SessionClient/SessionClient.pm b/fs_sesmon/FS-SessionClient/SessionClient.pm
index 97332cb26..8a0ff705f 100644
--- a/fs_sesmon/FS-SessionClient/SessionClient.pm
+++ b/fs_sesmon/FS-SessionClient/SessionClient.pm
@@ -10,7 +10,7 @@ use IO::Handle;
 $VERSION = '0.01';
 
 @ISA = qw( Exporter );
-@EXPORT_OK = qw( login logoff portnum );
+@EXPORT_OK = qw( login logout portnum );
 
 $fs_sessiond_socket = "/usr/local/freeside/fs_sessiond_socket";
 
@@ -30,7 +30,7 @@ FS::SessionClient - Freeside session client API
 
 =head1 SYNOPSIS
 
-  use FS::SessionClient qw( login portnum logoff );
+  use FS::SessionClient qw( login portnum logout );
 
   $error = login ( {
     'username' => $username,
@@ -43,10 +43,10 @@ FS::SessionClient - Freeside session client API
   $portnum = portnum( { 'nasnum' => $nasnum, 'nasport' => $nasport } )
     or die "unknown nasnum/nasport";
 
-  $error = logoff ( {
+  $error = logout ( {
     'username' => $username,
     'password' => $password,
-    'logoff'   => $timestamp,
+    'logout'   => $timestamp,
     'portnum'  => $portnum,
   } );
 
@@ -73,13 +73,13 @@ Returns a scalar error message, or the empty string for success.
 =item portnum
 
 HASHREF should contain a single key: ip, or the two keys: nasnum and nasport.
-Returns a portnum suitable for the login and logoff subroutines, or false
+Returns a portnum suitable for the login and logout subroutines, or false
 on error.
 
-=item logoff HASHREF
+=item logout HASHREF
 
-HASHREF should have the following keys: usrename, password, logoff and portnum.
-logoff is a UNIX timestamp; if not specified, will default to the current time.
+HASHREF should have the following keys: usrename, password, logout and portnum.
+logout is a UNIX timestamp; if not specified, will default to the current time.
 Starts a new session for the specified user and portnum.  The password is
 optional, but must be correct if specified.
 
@@ -89,9 +89,11 @@ Returns a scalar error message, or the empty string for success.
 
 sub AUTOLOAD {
   my $hashref = shift;
+  my $method = $AUTOLOAD;
+  $method =~ s/^.*:://;
   socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
   connect(SOCK, sockaddr_un($fs_sessiond_socket)) or die "connect: $!";
-  print SOCK "$AUTOLOAD\n";
+  print SOCK "$method\n";
 
   print SOCK join("\n", %{$hashref}, 'END' ), "\n";
   SOCK->flush;
@@ -104,7 +106,7 @@ sub AUTOLOAD {
 
 =head1 VERSION
 
-$Id: SessionClient.pm,v 1.2 2000-11-07 15:00:37 ivan Exp $
+$Id: SessionClient.pm,v 1.3 2000-12-03 20:25:20 ivan Exp $
 
 =head1 BUGS
 
diff --git a/fs_sesmon/FS-SessionClient/bin/freeside-login b/fs_sesmon/FS-SessionClient/bin/freeside-login
index 6ca4455f8..a6d475169 100644
--- a/fs_sesmon/FS-SessionClient/bin/freeside-login
+++ b/fs_sesmon/FS-SessionClient/bin/freeside-login
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 
-#false-laziness hack w freeside-logoff
+#false-laziness hack w freeside-logout
 
 use strict;
 use FS::SessionClient qw( login portnum );
diff --git a/fs_sesmon/FS-SessionClient/bin/freeside-logoff b/fs_sesmon/FS-SessionClient/bin/freeside-logoff
deleted file mode 100644
index f7b876b33..000000000
--- a/fs_sesmon/FS-SessionClient/bin/freeside-logoff
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/perl -Tw
-
-#false-laziness hack w freeside-login
-
-use strict;
-use FS::SessionClient qw( logoff portnum );
-
-my $username = shift;
-
-my $portnum;
-if ( scalar(@ARGV) == 1 ) {
-  my $arg = shift;
-  if ( $arg =~ /^(\d+)$/ ) {
-    $portnum = $1;
-  } elsif ( $arg =~ /^([\d\.]+)$/ ) {
-    $portnum = portnum( { 'ip' => $1 } ) or die "unknown ip!"
-  } else {
-    &usage;
-  }
-} elsif ( scalar(@ARGV) == 2 ) {
-  $portnum = portnum( { 'nasnum' => shift, 'nasport' => shift } )
-    or die "unknown nasnum/nasport";
-} else {
-  &usage;
-}
-
-my $error = login ( {
-  'username' => $username,
-  'portnum'  => $portnum,
-} );
-
-warn $error if $error;
-
-sub usage {
-  die "Usage:\n\n  freeside-logoff username ( portnum | ip | nasnum nasport )";
-}
-
diff --git a/fs_sesmon/FS-SessionClient/bin/freeside-logout b/fs_sesmon/FS-SessionClient/bin/freeside-logout
new file mode 100644
index 000000000..9b4ecfe23
--- /dev/null
+++ b/fs_sesmon/FS-SessionClient/bin/freeside-logout
@@ -0,0 +1,36 @@
+#!/usr/bin/perl -Tw
+
+#false-laziness hack w freeside-login
+
+use strict;
+use FS::SessionClient qw( logout portnum );
+
+my $username = shift;
+
+my $portnum;
+if ( scalar(@ARGV) == 1 ) {
+  my $arg = shift;
+  if ( $arg =~ /^(\d+)$/ ) {
+    $portnum = $1;
+  } elsif ( $arg =~ /^([\d\.]+)$/ ) {
+    $portnum = portnum( { 'ip' => $1 } ) or die "unknown ip!"
+  } else {
+    &usage;
+  }
+} elsif ( scalar(@ARGV) == 2 ) {
+  $portnum = portnum( { 'nasnum' => shift, 'nasport' => shift } )
+    or die "unknown nasnum/nasport";
+} else {
+  &usage;
+}
+
+my $error = logout ( {
+  'username' => $username,
+  'portnum'  => $portnum,
+} );
+
+warn $error if $error;
+
+sub usage {
+  die "Usage:\n\n  freeside-logout username ( portnum | ip | nasnum nasport )";
+}
diff --git a/fs_sesmon/FS-SessionClient/fs_sessiond b/fs_sesmon/FS-SessionClient/fs_sessiond
index 74d3aab31..d7284b252 100644
--- a/fs_sesmon/FS-SessionClient/fs_sessiond
+++ b/fs_sesmon/FS-SessionClient/fs_sessiond
@@ -12,7 +12,7 @@ use vars qw( $Debug );
 
 $Debug = 1;
 
-my $fs_session_socket = "/usr/local/freeside/fs_sessiond_socket";
+my $fs_sessiond_socket = "/usr/local/freeside/fs_sessiond_socket";
 
 $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
 $ENV{'SHELL'} = '/bin/sh';
@@ -29,10 +29,10 @@ warn "$me starting\n" if $Debug;
 #nothing to read from server
 
 warn "$me creating $fs_sessiond_socket\n" if $Debug;
-my $uaddr = sockaddr_un($fs_signupd_socket);
+my $uaddr = sockaddr_un($fs_sessiond_socket);
 my $proto = getprotobyname('tcp');
 socket(Server,PF_UNIX,SOCK_STREAM,0) or die "socket: $!";
-unlink($fs_signup_socket);
+unlink($fs_sessiond_socket);
 bind(Server, $uaddr) or die "bind: $!";
 listen(Server,SOMAXCONN) or die "listen: $!";
 
@@ -44,8 +44,8 @@ for ( ; $paddr = accept(Client,Server); close Client) {
 
   if ( $command eq 'login' || $command eq 'logout' || $command eq 'portnum' ) {
     warn "$me reading data from local client\n" if $Debug;
-    my @data, $dos;
-    push @data, scalar(<Client>) until $dos++ == 99 || $data[$#data] != "END\n";
+    my( @data, $dos );
+    push @data, scalar(<Client>) until $dos++ == 99 || $data[$#data] eq "END\n";
     if ( $dos == 99 ) { 
       warn "$me WARNING: DoS attempt!" 
     } else {
diff --git a/fs_sesmon/FS-SessionClient/test.pl b/fs_sesmon/FS-SessionClient/test.pl
index d05201b66..4b9ae17e0 100644
--- a/fs_sesmon/FS-SessionClient/test.pl
+++ b/fs_sesmon/FS-SessionClient/test.pl
@@ -8,7 +8,8 @@
 
 BEGIN { $| = 1; print "1..1\n"; }
 END {print "not ok 1\n" unless $loaded;}
-use FS::SessionClient;
+#use FS::SessionClient;
+#sigh, "not running as the freeside user"
 $loaded = 1;
 print "ok 1\n";
 
diff --git a/fs_sesmon/fs_session_server b/fs_sesmon/fs_session_server
index 46e53d118..0930a3c00 100644
--- a/fs_sesmon/fs_session_server
+++ b/fs_sesmon/fs_session_server
@@ -6,9 +6,9 @@
 use strict;
 use vars qw( $opt $Debug );
 use IO::Handle;
-use Net::SSH qw(sshopen3)
+use Net::SSH qw(sshopen2);
 use FS::UID qw(adminsuidsetup);
-use FS::Record qw( qsearch qsearchs );
+use FS::Record qw( qsearchs ); #qsearch );
 #use FS::cust_main_county;
 #use FS::cust_main;
 use FS::session;
@@ -31,25 +31,28 @@ while (1) {
   my($reader, $writer) = (new IO::Handle, new IO::Handle);
   $writer->autoflush(1);
   warn "$me Connecting to $machine\n" if $Debug;
-  sshopen2($machine,$reader,$writer,$fs_signupd);
+  sshopen2($machine,$reader,$writer,$fs_sessiond);
 
   warn "$me Entering main loop\n" if $Debug;
   while (1) {
     warn "$me Reading (waiting for) data\n" if $Debug;
-    my $command = scalar(<$reader));
+    my $command = scalar(<$reader>);
+    chomp $command;
     #DoS protection here too, to protect against a compromised client?  *sigh*
-    while ( ( my $key = scalar(<$reader>) ) != "END\n" ) {
+    my %hash;
+    while ( ( my $key = scalar(<$reader>) ) ne "END\n" ) {
       chomp $key;
       chomp( $hash{$key} = scalar(<$reader>) );
     }
 
     if ( $command eq 'login' ) {
-      $error = &login(\%hash);
+      my $error = &login(\%hash);
       print $writer "$error\n";
-    } elsif ( $command eq 'logoff' ) {
-      $error = &logoff(\%hash);
+    } elsif ( $command eq 'logout' ) {
+      my $error = &logout(\%hash);
       print $writer "$error\n";
     } elsif ( $command eq 'portnum' ) {
+      my $port;
       if ( exists $hash{'ip'} ) {
         $hash{'ip'} =~ /^([\d\.]+)$/ or $1='nomatch';
         $port = qsearchs('port', { 'ip' => $1 } );
@@ -60,13 +63,13 @@ while (1) {
       }
       print $writer ( $port ? $port->portnum : '' ), "\n";
     } else {
-      warn "$me WARNING: unrecognized command";
+      warn "$me WARNING: unrecognized command: $command";
     }
   }
   #won't ever reach without code above to throw out of loop, but...
   close $writer;
   close $reader;
-  warn "connection to $machine lost!\n"
+  warn "connection to $machine lost!\n";
   sleep 5;
   warn "reconnecting...\n";
 }
@@ -75,10 +78,10 @@ sub login {
   my $href = shift;
   $href->{'username'} =~ /^([a-z0-9_\-\.]+)$/ or return "Illegal username";
   my $username = $1;
-  $svc_acct = qsearchs('svc_acct', { 'username' => $username } )
+  my $svc_acct = qsearchs('svc_acct', { 'username' => $username } )
     or return "Unknown user";
   return "Incorrect password"
-    if defined($href->{'password'})
+    if exists($href->{'password'})
        && $href->{'password'} ne $svc_acct->_password;
   my $session = new FS::session {
     'portnum' => $href->{'portnum'},
@@ -92,18 +95,19 @@ sub logout {
   my $href = shift;
   $href->{'username'} =~ /^([a-z0-9_\-\.]+)$/ or return "Illegal username";
   my $username = $1;
-  $svc_acct = qsearchs('svc_acct', { 'username' => $username } )
+  my $svc_acct = qsearchs('svc_acct', { 'username' => $username } )
     or return "Unknown user";
   return "Incorrect password"
-    if defined($href->{'password'})
+    if exists($href->{'password'})
        && $href->{'password'} ne $svc_acct->_password;
-  my $session = qsearchs FS::session {
+  my $session = qsearchs( 'session', {
     'portnum' => $href->{'portnum'},
     'svcnum'  => $svc_acct->svcnum,
-    'logoff'  => '',
-  };
-  return "No currently open sessios found for that user/port!" unless $session;
-  my $nsession = new FS::session ( { $old->hash } );
+    'logout'  => '',
+  } );
+  return "No currently open sessions found for that user/port!" unless $session;
+  my $nsession = new FS::session ( { $session->hash } );
+  warn "$nsession replacing $session";
   $nsession->replace($session);
 }
 
diff --git a/htdocs/browse/nas.cgi b/htdocs/browse/nas.cgi
index 2aafbc1fd..a65235b1e 100755
--- a/htdocs/browse/nas.cgi
+++ b/htdocs/browse/nas.cgi
@@ -33,10 +33,29 @@ foreach my $nas ( sort { $a->nasnum <=> $b->nasnum } qsearch( 'nas', {} ) ) {
   ;
   foreach my $port ( sort {
     $a->nasport <=> $b->nasport || $a->portnum <=> $b->portnum
-  } qsearch( 'port' ) ) {
+  } qsearch( 'port', { 'nasnum' => $nas->nasnum } ) ) {
+    my $session = $port->session;
+    my($user, $since, $pretty_since, $duration);
+    if ( ! $session ) {
+      $user = "(empty)";
+      $since = 0;
+      $pretty_since = "(never)";
+      $duration = '';
+    } elsif ( $session->logout ) {
+      $user = "(empty)";
+      $since = $session->logout;
+    } else {
+      my $svc_acct = $session->svc_acct;
+      $user = "<A HREF=\"$p/view/svc_acct.cgi?". $svc_acct->svcnum. "\">".
+              $svc_acct->username. "</A>";
+      $since = $session->login;
+    }
+    $pretty_since = time2str("%c", $since) if $since;
+    $duration = pretty_interval( $now - $since ). " ago"
+      unless defined($duration);
     print "<TR><TD>". $port->nasport. "</TD><TD>". $port->portnum. "</TD><TD>".
-          $port->ip. "</TD><TD>". 'user'. "</TD><TD>". 'since'. "</TD><TD>". 
-          'duration'. "</TD></TR>"
+          $port->ip. "</TD><TD>$user</TD><TD>$pretty_since".
+          "</TD><TD>$duration</TD></TR>"
     ;
   }
   print "</TABLE><BR>";
diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi
index e203c7ec0..22c3d76f2 100755
--- a/htdocs/view/svc_acct.cgi
+++ b/htdocs/view/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.10 1999-04-14 11:27:06 ivan Exp $
+# $Id: svc_acct.cgi,v 1.11 2000-12-03 20:25:20 ivan Exp $
 #
 # Usage: svc_acct.cgi svcnum
 #        http://server.name/path/svc_acct.cgi?svcnum
@@ -33,7 +33,10 @@
 # displays arbitrary radius attributes ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.10  1999-04-14 11:27:06  ivan
+# Revision 1.11  2000-12-03 20:25:20  ivan
+# session monitor updates
+#
+# Revision 1.10  1999/04/14 11:27:06  ivan
 # showpasswords config option to show passwords
 #
 # Revision 1.9  1999/04/08 12:00:19  ivan
@@ -138,7 +141,7 @@ $password = '';
 
 $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
 print "<BR>POP: <B>", $svc_acct_pop->city, ", ", $svc_acct_pop->state,
-      " (", $svc_acct_pop->ac, ")/", $svc_acct_pop->exch, "<\B>"
+      " (", $svc_acct_pop->ac, ")/", $svc_acct_pop->exch, "</B>"
   if $svc_acct_pop;
 
 if ($svc_acct->uid ne '') {
-- 
cgit v1.2.1


From f83184464cc34d1c2a0a999cbf215414827b39a2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Dec 2000 21:13:31 +0000
Subject: oops, forgot the web apps

---
 fs_sesmon/FS-SessionClient/cgi/login.cgi  | 90 +++++++++++++++++++++++++++++++
 fs_sesmon/FS-SessionClient/cgi/logout.cgi | 90 +++++++++++++++++++++++++++++++
 2 files changed, 180 insertions(+)
 create mode 100644 fs_sesmon/FS-SessionClient/cgi/login.cgi
 create mode 100644 fs_sesmon/FS-SessionClient/cgi/logout.cgi

diff --git a/fs_sesmon/FS-SessionClient/cgi/login.cgi b/fs_sesmon/FS-SessionClient/cgi/login.cgi
new file mode 100644
index 000000000..ad964df75
--- /dev/null
+++ b/fs_sesmon/FS-SessionClient/cgi/login.cgi
@@ -0,0 +1,90 @@
+#!/usr/bin/perl -Tw
+
+#false-laziness hack w logout.cgi
+
+use strict;
+use vars qw( $cgi $username $password $error $ip $portnum );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::SessionClient qw( login portnum );
+
+$cgi = new CGI;
+
+if ( defined $cgi->param('magic') ) {
+  $cgi->param('username') =~ /^\s*(\w{1,255})\s*$/ or do {
+    $error = "Illegal username";
+    &print_form;
+    exit;
+  };
+  $username = $1;
+  $cgi->param('password') =~ /^([^\n]{0,255})$/ or die "guru meditation #420";
+  $password = $1;
+  #$ip = $cgi->remote_host;
+  $ip = $ENV{REMOTE_ADDR};
+  $ip =~ /^([\d\.]+)$/ or die "illegal ip: $ip";
+  $ip = $1;
+  $portnum = portnum( { 'ip' => $1 } ) or do {
+    $error = "You appear to be coming from an unknown IP address.  Verify ".
+             "that your computer is set to obtain an IP address automatically ".
+             "via DHCP.";
+    &print_form;
+    exit;
+  };
+
+  ( $error = login ( {
+    'username' => $username,
+    'portnum'  => $portnum,
+    'password' => $password,
+  } ) )
+    ? &print_form()
+    : &print_okay();
+
+} else {
+  $username = '';
+  $password = '';
+  $error = '';
+  &print_form;
+}
+
+sub print_form {
+  my $self_url = $cgi->self_url;
+
+  print $cgi->header( '-expires' => 'now' ), <<END;
+<HTML><HEAD><TITLE>login</TITLE></HEAD>
+<BODY>
+END
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT>! if $error;
+
+print <<END;
+<FORM ACTION="$self_url" METHOD=POST>
+<INPUT TYPE="hidden" NAME="magic" VALUE="process">
+Username <INPUT TYPE="text" NAME="username" VALUE="$username"><BR>
+Password <INPUT TYPE="password" NAME="password"><BR>
+<INPUT TYPE="submit">
+</FORM>
+</BODY>
+</HTML>
+END
+
+}
+
+sub print_okay {
+  print $cgi->header( '-expires' => 'now' ), <<END;
+<HTML><HEAD><TITLE>login sucessful</TITLE></HEAD>
+<BODY>login successful, etc.
+</BODY>
+</HTML>
+END
+}
+
+my $error = login ( {
+  'username' => $username,
+  'portnum'  => $portnum,
+} );
+
+warn $error if $error;
+
+sub usage {
+  die "Usage:\n\n  freeside-login username ( portnum | ip | nasnum nasport )";
+}
diff --git a/fs_sesmon/FS-SessionClient/cgi/logout.cgi b/fs_sesmon/FS-SessionClient/cgi/logout.cgi
new file mode 100644
index 000000000..f5a57b2e8
--- /dev/null
+++ b/fs_sesmon/FS-SessionClient/cgi/logout.cgi
@@ -0,0 +1,90 @@
+#!/usr/bin/perl -Tw
+
+#false-laziness hack w login.cgi
+
+use strict;
+use vars qw( $cgi $username $password $error $ip $portnum );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::SessionClient qw( logout portnum );
+
+$cgi = new CGI;
+
+if ( defined $cgi->param('magic') ) {
+  $cgi->param('username') =~ /^\s*(\w{1,255})\s*$/ or do {
+    $error = "Illegal username";
+    &print_form;
+    exit;
+  };
+  $username = $1;
+  $cgi->param('password') =~ /^([^\n]{0,255})$/ or die "guru meditation #420";
+  $password = $1;
+  #$ip = $cgi->remote_host;
+  $ip = $ENV{REMOTE_ADDR};
+  $ip =~ /^([\d\.]+)$/ or die "illegal ip: $ip";
+  $ip = $1;
+  $portnum = portnum( { 'ip' => $1 } ) or do {
+    $error = "You appear to be coming from an unknown IP address.  Verify ".
+             "that your computer is set to obtain an IP address automatically ".
+             "via DHCP.";
+    &print_form;
+    exit;
+  };
+
+  ( $error = logout ( {
+    'username' => $username,
+    'portnum'  => $portnum,
+    'password' => $password,
+  } ) )
+    ? &print_form()
+    : &print_okay();
+
+} else {
+  $username = '';
+  $password = '';
+  $error = '';
+  &print_form;
+}
+
+sub print_form {
+  my $self_url = $cgi->self_url;
+
+  print $cgi->header( '-expires' => 'now' ), <<END;
+<HTML><HEAD><TITLE>logout</TITLE></HEAD>
+<BODY>
+END
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT>! if $error;
+
+print <<END;
+<FORM ACTION="$self_url" METHOD=POST>
+<INPUT TYPE="hidden" NAME="magic" VALUE="process">
+Username <INPUT TYPE="text" NAME="username" VALUE="$username"><BR>
+Password <INPUT TYPE="password" NAME="password"><BR>
+<INPUT TYPE="submit">
+</FORM>
+</BODY>
+</HTML>
+END
+
+}
+
+sub print_okay {
+  print $cgi->header( '-expires' => 'now' ), <<END;
+<HTML><HEAD><TITLE>logout sucessful</TITLE></HEAD>
+<BODY>logout successful, etc.
+</BODY>
+</HTML>
+END
+}
+
+my $error = logout ( {
+  'username' => $username,
+  'portnum'  => $portnum,
+} );
+
+warn $error if $error;
+
+sub usage {
+  die "Usage:\n\n  freeside-logout username ( portnum | ip | nasnum nasport )";
+}
-- 
cgit v1.2.1


From aaf3a2875785ff881c47087000ce187d3229e02a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Dec 2000 21:31:23 +0000
Subject: directions for webapp session foo

---
 htdocs/docs/session.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/docs/session.html b/htdocs/docs/session.html
index 161be9846..b7939acef 100644
--- a/htdocs/docs/session.html
+++ b/htdocs/docs/session.html
@@ -4,12 +4,11 @@
 <body>
 <h1>Session monitor</h1>
 <h2>Installation</h2>
-For security reasons, the client portion of the session montior may run on an
-external public machine.  On this machine, install:
+For security reasons, the client portion of the session montior may run on one
+or more external public machine(s).  On these machines, install:
 <ul>
   <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at l
-east 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enab
-le experimental features like threads or the PerlIO abstraction layer.)
+east 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
   <li><a href="man/FS/SessionClient.html">FS::SessionClient</a> (copy the fs_session/FS-SessionClient directory to the external machine, then: perl Makefile.PL; make; make install)
 </ul>
 Then:
@@ -28,6 +27,11 @@ Then:
 <ul>
   <li>RADIUS
   <li>Web
+    <ul>
+      <li>Copy FS-SessionClient/cgi/login.cgi and logout.cgi to your web
+          server's document space.  
+      <li>Use <a href="http://www.apache.org/docs/suexec.html">suEXEC</a> or <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">setuid</a> (see <a href="install.html">install.html</a> for details) to run login.cgi and logout.cgi as the freeside user.
+    </ul>
   <li>Command-line
     <br><pre>freeside-login username ( portnum | ip | nasnum nasport )</pre>
     <ul>
-- 
cgit v1.2.1


From 7ca036115f70fd3d9b9bef6bca366d7a2f6064db Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Dec 2000 21:45:36 +0000
Subject: tyop

---
 fs_sesmon/FS-SessionClient/MANIFEST | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_sesmon/FS-SessionClient/MANIFEST b/fs_sesmon/FS-SessionClient/MANIFEST
index 9da279a87..162d4e453 100644
--- a/fs_sesmon/FS-SessionClient/MANIFEST
+++ b/fs_sesmon/FS-SessionClient/MANIFEST
@@ -5,7 +5,7 @@ Makefile.PL
 SessionClient.pm
 test.pl
 fs_sessiond
-cgi/logon.cgi
+cgi/login.cgi
 cgi/logout.cgi
 bin/freeside-login
 bin/freeside-logout
-- 
cgit v1.2.1


From f16bab33441eb8bb4475f4bf3a64310e7786f0fc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 4 Dec 2000 00:13:02 +0000
Subject: fix nas.last type

---
 bin/fs-setup | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 4cdcb1b2c..2c31ff667 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.31 2000-12-01 18:34:53 ivan Exp $
+# $Id: fs-setup,v 1.32 2000-12-04 00:13:02 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.31  2000-12-01 18:34:53  ivan
+# Revision 1.32  2000-12-04 00:13:02  ivan
+# fix nas.last type
+#
+# Revision 1.31  2000/12/01 18:34:53  ivan
 # another tyop
 #
 # Revision 1.30  2000/12/01 18:33:32  ivan
@@ -760,7 +763,7 @@ sub tables_hash_hack {
         'nas',      'varchar', '',    $char_d,
         'nasip',    'varchar', '',    15,
         'nasfqdn',  'varchar', '',    $char_d,
-        'last',     @date_type,
+        'last',     'int',     '',    '',
       ],
       'primary_key' => 'nasnum',
       'unique'      => [ [ 'nas' ], [ 'nasip' ] ],
-- 
cgit v1.2.1


From cac4fe686355b65673f01d63013d9164a0a3c576 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 6 Dec 2000 10:21:13 +0000
Subject: DESTROY sub

---
 FS/FS/Record.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 18541d2db..282c5ff16 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -891,6 +891,8 @@ sub hfields {
 #  } (fields($self->table)) );
 #}
 
+sub DESTROY { return; }
+
 #sub DESTROY {
 #  my $self = shift;
 #  #use Carp qw(cluck);
@@ -906,7 +908,7 @@ sub hfields {
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.10 2000-12-03 20:25:20 ivan Exp $
+$Id: Record.pm,v 1.11 2000-12-06 10:21:13 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 21ec8a6b7223054c6137fdbffa0e059c5c6c9473 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 8 Dec 2000 22:22:31 +0000
Subject: session callbacks

---
 FS/FS/session.pm         | 26 ++++++++++++++++++++++----
 htdocs/docs/config.html  |  2 ++
 htdocs/docs/session.html | 12 ++++++------
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/FS/FS/session.pm b/FS/FS/session.pm
index 027708d98..61dc8991a 100644
--- a/FS/FS/session.pm
+++ b/FS/FS/session.pm
@@ -1,7 +1,7 @@
 package FS::session;
 
 use strict;
-use vars qw( @ISA );
+use vars qw( @ISA $conf $start $stop );
 use FS::Record qw( qsearchs );
 use FS::svc_acct;
 use FS::port;
@@ -9,6 +9,12 @@ use FS::nas;
 
 @ISA = qw(FS::Record);
 
+$FS::UID::callback{'FS::session'} = sub {
+  $conf = new FS::Conf;
+  $start = $conf->exists('session-start') ? $conf->config('session-start') : '';
+  $stop = $conf->exists('session-stop') ? $conf->config('session-stop') : '';
+};
+
 =head1 NAME
 
 FS::session - Object methods for session records
@@ -104,7 +110,13 @@ sub insert {
 
   $self->nas_heartbeat($self->getfield('login'));
 
-  #session-starting callback!
+  #session-starting callback
+    #redundant with heartbeat, yuck
+  my $port = qsearchs('port',{'portnum'=>$self->portnum});
+  my $nas = qsearchs('nas',{'nasnum'=>$port->nasnum});
+    #kcuy
+  my( $ip, $nasip, $nasfqdn ) = ( $port->ip, $nas->nasip, $nas->nasfqdn );
+  system( eval qq("$start") ) if $start;
 
   '';
 
@@ -147,7 +159,13 @@ sub replace {
 
   $self->nas_heartbeat($self->getfield('logout'));
 
-  #session-ending callback!
+  #session-ending callback
+  #redundant with heartbeat, yuck
+  my $port = qsearchs('port',{'portnum'=>$self->portnum});
+  my $nas = qsearchs('nas',{'nasnum'=>$port->nasnum});
+    #kcuy
+  my( $ip, $nasip, $nasfqdn ) = ( $port->ip, $nas->nasip, $nas->nasfqdn );
+  session( eval qq("$stop") ) if $stop;
 
   '';
 }
@@ -206,7 +224,7 @@ sub svc_acct {
 
 =head1 VERSION
 
-$Id: session.pm,v 1.3 2000-12-03 20:25:20 ivan Exp $
+$Id: session.pm,v 1.4 2000-12-08 22:22:31 ivan Exp $
 
 =head1 BUGS
 
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index db218d642..fb744bff7 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -66,6 +66,8 @@ All further configuration files and directories are located in
   <li><a name="sendmailconfigpath">sendmailconfigpath</a> - Sendmail configuration file path - defaults to `/etc'.  Many newer distributions use `/etc/mail'.
   <li><a name="sendmailmachines">sendmailmachines</a> - Your sendmail machines, one per line.  This enables export of `/etc/virtusertable' and `/etc/sendmail.cw'.
   <li><a name="sendmailrestart">sendmailrestart</a> - If defined, the command which is run on sendmail machines after files are copied.
+  <li><a name="session-start">session-start</a> - If defined, the command which is executed on the Freeside machine when a session begins.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
+  <li><a name="session-stop">session-stop</a> - If defined, the command which is executed on the Freeside machine when a session ends.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
   <li><a name="shellmachine">shellmachine</a> - A single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines', it also enables `.qmail-extension' file maintenance.
   <li>shellmachine-useradd - The command(s) to run on shellmachine when an account is created.  If this file does not exist, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If the file exists but is empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.
   <li>shellmachine-userdel - The command(s) to run on shellmachine when an account is deleted.  If this file does not exist, <code>userdel $username</code> is the default.  If the file exists but is empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.
diff --git a/htdocs/docs/session.html b/htdocs/docs/session.html
index b7939acef..3e88d568b 100644
--- a/htdocs/docs/session.html
+++ b/htdocs/docs/session.html
@@ -39,10 +39,10 @@ Then:
       <li><i>portnum</i>, <i>ip</i> or <i>nasport</i> and <i>nasnum</i> uniquely identify a port in the <a href="schema.html#port">port</a> database table.
     </ul>
 </ul>
+<h2>Callbacks</h2>
+<ul>
+  <li>Sesstion start - The command(s) specified in the <a href="config.html#session-start">session-start</a> configuration file are executed on the Freeside machine.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
+  <li>Session end - The command(s) specified in the <a href="config.html#session-stop">session-stop</a> configuration file are executed on the Freeside machine.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
+</ul>
 </body>
-
-
-
-
-
-
+</html>
-- 
cgit v1.2.1


From eefc403e7269f191637fa0b4a38b33dc8d206051 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 9 Dec 2000 02:53:31 +0000
Subject: layout nicely thanks to matt peterson <matt@peterson.org>

---
 fs_sesmon/FS-SessionClient/cgi/login.cgi | 35 +++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/fs_sesmon/FS-SessionClient/cgi/login.cgi b/fs_sesmon/FS-SessionClient/cgi/login.cgi
index ad964df75..54ac541c5 100644
--- a/fs_sesmon/FS-SessionClient/cgi/login.cgi
+++ b/fs_sesmon/FS-SessionClient/cgi/login.cgi
@@ -51,17 +51,42 @@ sub print_form {
 
   print $cgi->header( '-expires' => 'now' ), <<END;
 <HTML><HEAD><TITLE>login</TITLE></HEAD>
-<BODY>
+<BODY BGCOLOR="#FFFFFF">
 END
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT>! if $error;
 
 print <<END;
-<FORM ACTION="$self_url" METHOD=POST>
+<FORM ACTION="$self_url" METHOD="POST">
 <INPUT TYPE="hidden" NAME="magic" VALUE="process">
-Username <INPUT TYPE="text" NAME="username" VALUE="$username"><BR>
-Password <INPUT TYPE="password" NAME="password"><BR>
-<INPUT TYPE="submit">
+<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="4" ALIGN="center">
+<TR>
+        <TD ALIGN="center" COLSPAN="2">
+      <STRONG>Welcome</STRONG>
+      </TD>
+</TR>
+<TR>
+      <TD ALIGN="right">
+      Username
+      </TD>
+      <TD ALIGN="left">
+      <INPUT TYPE="text" NAME="username" VALUE="$username">
+      </TD>
+</TR>
+<TR>
+      <TD ALIGN="right">
+      Password
+      </TD>
+      <TD ALIGN="left">
+      <INPUT TYPE="password" NAME="password">
+      </TD>
+</TR>
+<TR>
+      <TD ALIGN="center" COLSPAN="2">
+      <INPUT TYPE="submit" VALUE=" Login ">
+      </TD>
+</TR>
+</TABLE>
 </FORM>
 </BODY>
 </HTML>
-- 
cgit v1.2.1


From c328bbcdf207c83be69c9b925e597d4f92288806 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Dec 2000 21:16:26 +0000
Subject: fix uninitialized value errors

---
 fs_sesmon/FS-SessionClient/fs_sessiond | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs_sesmon/FS-SessionClient/fs_sessiond b/fs_sesmon/FS-SessionClient/fs_sessiond
index d7284b252..bfdb20a1d 100644
--- a/fs_sesmon/FS-SessionClient/fs_sessiond
+++ b/fs_sesmon/FS-SessionClient/fs_sessiond
@@ -44,7 +44,8 @@ for ( ; $paddr = accept(Client,Server); close Client) {
 
   if ( $command eq 'login' || $command eq 'logout' || $command eq 'portnum' ) {
     warn "$me reading data from local client\n" if $Debug;
-    my( @data, $dos );
+    my @data;
+    my $dos = 0;
     push @data, scalar(<Client>) until $dos++ == 99 || $data[$#data] eq "END\n";
     if ( $dos == 99 ) { 
       warn "$me WARNING: DoS attempt!" 
-- 
cgit v1.2.1


From 95ff27e612e0357c6ec44036b30c77d16b173690 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 11 Dec 2000 01:10:15 +0000
Subject: ancient stuff out of my inbox

---
 TODO | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 80 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 4d0a0ba5f..84e57dce6 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.53 2000-12-03 20:25:20 ivan Exp $
+$Id: TODO,v 1.54 2000-12-11 01:10:15 ivan Exp $
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
@@ -6,6 +6,85 @@ ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
 ---
 
+wishlist wrt projects/consulting from jivko@ijs.com:
+>The other thing, which is the serious part, is the following: We do not
+>offer dial-up services and that part of the system does not have to work,
+>but we have many customer, for which we do both hosting and consulting work.
+.
+>The hosting can be handled by freeside fine, but in the little time I spent 
+>on it I could not see how exactly to solve the consulting problem. What I
+>would love to see there is a way to create 'projects' for each customer and
+>ability to follow up on those (I mean to be able to add new comments,
+>descriptions, progress updates etc.). You already have the feature, which
+>allows multiple people to access the system with different access rights so
+>it should be possible to make it keep track of who and when updated given
+>'project' so we could have the developers access the database and update
+>the projects they are working on.
+.
+Hmm.  Is this accurate:  Each project is related to a single customer, and
+zero or more packages (billing items).  Each project has a name, due date,    
+and zero or more log entries consisting of date, user, and a text field
+(for "new comments, descriptions, progress updates etc." - would you like
+anything more specific?)
+
+In conjunction with that it looks like you need the ability to create
+"one-off" packages on the fly for arbitrary charges.
+
+> Additionally it would be nice to have a page, where all open projects can
+> be listed and not only that but be able list them by date too. (Say I want
+> to find out which projects are due today or two days from today, or which
+> projects are running late)
+.
+Browse/search project by date and customer.
+.
+> Finally it would be real nice if the billing script could add the cost for
+> all completed projects (or work done by the hour) to the monthly bill along   
+> with the hosting information and using the description of the work from the
+> 'project' table. 
+.
+Can you be more specific about your needs here?
+.
+> This is a lot of work, unless you disagree :-), and I would not expect you
+> to do all of it - we can work on it too - but I would hope for you to lead 
+> the effort.
+.
+I'm trying to get a handle on specifically what you need.
+.
+> Oh, and there is one more thing, but that should be simple to do. I would
+> like to be able to give the customers access to selected information from
+> their account. I want them to be able to monitor the progress of their
+> projects and the status of their accounts. 
+.
+Ok.
+.
+> Does all this make sense? It must be close to what you need at your office
+> though or at least I think so.
+.
+Yes, but we're small and have been tracking projects manually.
+.
+.
+>You may have this already .. what I have in mind is the following. Say you
+>have a customer for which you do hosting and some consulting (CGI, JAVA
+>etc) At the end of the month you need to bill the customer for the hosting,
+>35hours of Java programming and 10 hours of HTML authoring. The last two
+>are not because the project is over but because the work was done during
+>that month.
+>
+>So the way I see it, and it could be wrong, is that during the month the
+>people who work on particular project enter their comments and time spent
+>on the project. At the end of the month the billing script generates
+>invoices in which besides the hosting charges there are also charges for
+>work done during the period.
+>
+>Currently we do this in a very stupid way by maintaining a customer file,
+>in which a script saves things to be invoiced. At the end of the month a
+>script goes through these files and generates invoices with all items from
+>the files, which have not been flagged as 'paid'. The convenience of this
+>is that no one needs to worry about the invoices containing the items they
+>need to contain.
+
+
+
 first package select field in edit/cust_main.cgi isn't sticky on errors, yuck
 
 > 1. A Web Form to the user get his account added automatically . The
-- 
cgit v1.2.1


From 8d5af30dc53cc6c74054b9fce94e45d90f2a48ed Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 11 Dec 2000 01:30:11 +0000
Subject: more ancient todo stuff from my inbox

---
 TODO | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 84e57dce6..a1d3bdaa4 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.54 2000-12-11 01:10:15 ivan Exp $
+$Id: TODO,v 1.55 2000-12-11 01:30:11 ivan Exp $
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
@@ -6,6 +6,19 @@ ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
 ---
 
+wishlist from drenalin@ultimanet.com:
+* delete button for customers
+- 15th of the month billing
+- field for customer referrals (naming who it is) and automatically crediting
++that account
+- ability to edit referrals
+- catch expired credit cards and notify via email when they are expiring
+* show passwords
+- set default shell to /bin/false when adding ppp account
+- import list of POPs from Megapop (see www.ultimanet.com and click on locations
++from text in index page)
+
+
 wishlist wrt projects/consulting from jivko@ijs.com:
 >The other thing, which is the serious part, is the following: We do not
 >offer dial-up services and that part of the system does not have to work,
-- 
cgit v1.2.1


From f0889ba0b821592e9affd0d407d1a01946b48561 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 11 Dec 2000 21:57:46 +0000
Subject: might as well put this nice picture in the docs

---
 htdocs/docs/index.html   |   1 +
 htdocs/docs/overview.dia | Bin 2213 -> 2800 bytes
 htdocs/docs/overview.png | Bin 0 -> 13064 bytes
 3 files changed, 1 insertion(+)
 create mode 100644 htdocs/docs/overview.png

diff --git a/htdocs/docs/index.html b/htdocs/docs/index.html
index fa0459bca..82410902a 100644
--- a/htdocs/docs/index.html
+++ b/htdocs/docs/index.html
@@ -3,6 +3,7 @@
 </head>
 <body>
   <h1>Documentation</h1>
+<img src="overview.png">
 <ul>
   <li><a href="install.html">New Installation</a>
   <li><a href="upgrade.html">Upgrading from 1.0.x to 1.1.x</a>
diff --git a/htdocs/docs/overview.dia b/htdocs/docs/overview.dia
index 9bdb24e05..a0e34c30e 100644
Binary files a/htdocs/docs/overview.dia and b/htdocs/docs/overview.dia differ
diff --git a/htdocs/docs/overview.png b/htdocs/docs/overview.png
new file mode 100644
index 000000000..bf2dbc26c
Binary files /dev/null and b/htdocs/docs/overview.png differ
-- 
cgit v1.2.1


From c661868d1119af8a911c47982b52a2c89776c752 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 21 Dec 2000 05:22:30 +0000
Subject: perldoc -f split

---
 htdocs/edit/process/cust_main_county-expand.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/edit/process/cust_main_county-expand.cgi b/htdocs/edit/process/cust_main_county-expand.cgi
index 7e618c7b8..a174a0a8e 100755
--- a/htdocs/edit/process/cust_main_county-expand.cgi
+++ b/htdocs/edit/process/cust_main_county-expand.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county-expand.cgi,v 1.6 1999-01-25 12:19:07 ivan Exp $
+# $Id: cust_main_county-expand.cgi,v 1.7 2000-12-21 05:22:30 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -15,7 +15,10 @@
 # ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county-expand.cgi,v $
-# Revision 1.6  1999-01-25 12:19:07  ivan
+# Revision 1.7  2000-12-21 05:22:30  ivan
+# perldoc -f split
+#
+# Revision 1.6  1999/01/25 12:19:07  ivan
 # yet more mod_perl stuff
 #
 # Revision 1.5  1999/01/19 05:13:51  ivan
@@ -53,7 +56,7 @@ $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
 if ( $cgi->param('delim') eq 'n' ) {
   @expansion=split(/\n/,$cgi->param('expansion'));
 } elsif ( $cgi->param('delim') eq 's' ) {
-  @expansion=split(/\s+/,$cgi->param('expansion'));
+  @expansion=split(' ',$cgi->param('expansion'));
 } else {
   die "Illegal delim!";
 }
-- 
cgit v1.2.1


From 263a8097a88a1808e354cbd3062f21c91fe305c0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Dec 2000 23:51:40 +0000
Subject: statedefault & referraldefault config files

---
 CREDITS                   |  3 +++
 TODO                      |  9 ++++++++-
 htdocs/docs/config.html   |  2 ++
 htdocs/edit/cust_main.cgi | 13 +++++++++----
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/CREDITS b/CREDITS
index 79b95b370..cdfaedc87 100644
--- a/CREDITS
+++ b/CREDITS
@@ -66,5 +66,8 @@ low-level DBI stuff.
 Jason Spence <thalakan@frys.com> contributed admin.html, autocapnames
 javascript, bugfixes & other neat stuff I can't remember.
 
+Brad Dameron <bdameron@tscnet.com> contributed code to do configurable state
+and referral defaults.
+
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
diff --git a/TODO b/TODO
index a1d3bdaa4..54a00a111 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.55 2000-12-11 01:30:11 ivan Exp $
+$Id: TODO,v 1.56 2000-12-26 23:51:40 ivan Exp $
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
@@ -6,6 +6,13 @@ ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
 ---
 
+Use this for email checking:
+libemail-valid-perl - Check validity of Internet email addresses
+.                                                                
+This module determines whether an email address is well-formed, and 
+optionally, whether a mail host exists for the domain.
+
+
 wishlist from drenalin@ultimanet.com:
 * delete button for customers
 - 15th of the month billing
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index fb744bff7..bc6da6bf3 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -52,6 +52,7 @@ All further configuration files and directories are located in
   <li><a name="passwordmin">passwordmin</a> - Minimum password length (default 6);
   <li><a name="qmailmachines">qmailmachines</a> - Your qmail machines, one per line.  This enables export of `/var/qmail/control/virtualdomains', `/var/qmail/control/recipientmap', and `/var/qmail/control/rcpthosts'.  The existance of this file (even if empty) also turns on user `.qmail-extension' file maintenance in conjunction with `shellmachine'.
   <li><a name="radiusmachines">radiusmachines</a> - Your RADIUS authentication machines, one per line.  This enables export of `/etc/raddb/users'.
+  <li><a name="referraldefault">referraldefault</a> - Default referral, specified by refnum.
   <li><a name="registries">registries</a> - Directory which contains domain registry information.  Each registry is a directory.
     <ul>
       <li>registries/internic - Currently the only supported registry
@@ -82,6 +83,7 @@ All further configuration files and directories are located in
   <li><a name="soamachine">soamachine</a> - SOA machine for new domains, with trailing `.'
   <li><a name="soarefresh">soarefresh</a> - SOA refresh for new domains
   <li><a name="soaretry">soaretry</a> - SOA retry for new domains
+  <li><a name="statedefault">statedefault</a> - Default state or province (if not supplied, the default is `CA')
   <li><a name="textradiusprepend">textradiusprepend</a> - The contents of this file will be prepended to the first line of a user's RADIUS entry in text exports.  If necessary, usually `Auth-Type = Local, '.
   <li><a name="usernamemin">usernamemin</a> - Minimum username length (default 2);
   <li><a name="usernamemax">usernamemax</a> - Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)
diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index cb8ec83ee..b3d9f0d80 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.27 2000-12-03 13:45:15 ivan Exp $
+# $Id: cust_main.cgi,v 1.28 2000-12-26 23:51:40 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.27  2000-12-03 13:45:15  ivan
+# Revision 1.28  2000-12-26 23:51:40  ivan
+# statedefault & referraldefault config files
+#
+# Revision 1.27  2000/12/03 13:45:15  ivan
 # patch from Jason Spence <thalakan@frys.com>: admin.html doc, autocapgen
 #
 # Revision 1.26  2000/06/27 12:15:50  ivan
@@ -269,7 +272,7 @@ if ( scalar(@agents) == 1 ) {
 
 #referral
 
-$refnum = $cust_main->refnum || 0;
+$refnum = $cust_main->refnum || $conf->config('referraldefault') || 0;
 if ( $custnum && ! $conf->exists('editreferrals') ) {
   print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
 } else {
@@ -331,6 +334,8 @@ END
 
 $cust_main->country( $conf->config('countrydefault') || 'US' )
   unless $cust_main->country;
+$cust_main->state( $conf->config('statedefault') || 'CA' )
+  unless $cust_main->state;
 foreach ( qsearch('cust_main_county',{}) ) {
   print "<OPTION";
   print " SELECTED" if ( $cust_main->state eq $_->state
@@ -380,7 +385,7 @@ sub expselect {
     $return .= ">$_";
   }
   $return .= qq!</SELECT>/<SELECT NAME="$prefix!. qq!_year" SIZE="1">!;
-  for ( 1999 .. 2037 ) {
+  for ( 2001 .. 2037 ) {
     $return .= "<OPTION";
     $return .= " SELECTED" if $_ == $y;
     $return .= ">$_";
-- 
cgit v1.2.1


From 4d92202b154d8b906306f5cd4f792bd68f87b810 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 Jan 2001 09:00:53 +0000
Subject: tyop

---
 htdocs/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 21b575139..e3c8720e9 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -17,7 +17,7 @@ Before installing, you need:
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Data">Data-Dumper</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/MD5">Digest-MD5</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/URI">URI</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/HTTP">HTML-Parser</a>
+      <li><a href="http://www.perl.com/CPAN/modules/by-module/HTML">HTML-Parser</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Net">libnet</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Locale">Locale-Codes</a>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Net">Net-Whois</a>
-- 
cgit v1.2.1


From 0b1acd4496355d7da4292be2984cb898c6d30c17 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Jan 2001 05:03:50 +0000
Subject: harmless tyop

---
 FS/FS/cust_main.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b863748a0..bb774df1c 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -565,9 +565,9 @@ sub bill {
       }
     }
 
-    warn "setup is undefinded" unless defined($setup);
-    warn "recur is undefinded" unless defined($recur);
-    warn "cust_pkg bill is undefinded" unless defined($cust_pkg->bill);
+    warn "setup is undefined" unless defined($setup);
+    warn "recur is undefined" unless defined($recur);
+    warn "cust_pkg bill is undefined" unless defined($cust_pkg->bill);
 
     if ( $cust_pkg_mod_flag ) {
       $error=$cust_pkg->replace($old_cust_pkg);
@@ -999,7 +999,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.7 2000-06-27 12:15:37 ivan Exp $
+$Id: cust_main.pm,v 1.8 2001-01-23 05:03:50 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 5e2a72629041efaeb005e75e923c3198f3ce9cf8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Jan 2001 09:08:40 +0000
Subject: tyop, thanks to Mack Nagashima <mackn@moaner.org>

---
 FS/FS/port.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/FS/FS/port.pm b/FS/FS/port.pm
index e96e71c0f..73a5b00e7 100644
--- a/FS/FS/port.pm
+++ b/FS/FS/port.pm
@@ -104,7 +104,7 @@ sub check {
   my $self = shift;
   my $error =
     $self->ut_numbern('portnum')
-    || $self->ut_ipn('ipn')
+    || $self->ut_ipn('ip')
     || $self->ut_numbern('nasport')
     || $self->ut_number('nasnum');
   ;
@@ -133,7 +133,7 @@ sub session {
 
 =head1 VERSION
 
-$Id: port.pm,v 1.3 2000-12-03 20:25:20 ivan Exp $
+$Id: port.pm,v 1.4 2001-01-30 09:08:40 ivan Exp $
 
 =head1 BUGS
 
@@ -162,7 +162,10 @@ added hfields
 ivan@sisd.com 97-nov-13
 
 $Log: port.pm,v $
-Revision 1.3  2000-12-03 20:25:20  ivan
+Revision 1.4  2001-01-30 09:08:40  ivan
+tyop, thanks to Mack Nagashima <mackn@moaner.org>
+
+Revision 1.3  2000/12/03 20:25:20  ivan
 session monitor updates
 
 Revision 1.1  2000/10/27 20:18:32  ivan
-- 
cgit v1.2.1


From d746dfce2e320169ec8217cb09b9dbb0d403675d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 31 Jan 2001 07:21:00 +0000
Subject: fix tyops

---
 FS/FS/cust_main.pm       |  6 +++---
 FS/FS/svc_acct.pm        |  6 +++---
 TODO                     | 49 +++++++++++++++++++++++++++++++++++++++++++++++-
 htdocs/view/svc_acct.cgi | 11 +++++++----
 4 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index bb774df1c..e50ea7198 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -806,7 +806,7 @@ sub collect {
           } elsif ( $processor eq 'cybercash3.2' ) {
             %result = &CCMckDirectLib3_2::SendCC2_1Server(@full_xaction);
           } else {
-            return "Unkonwn real-time processor $processor\n";
+            return "Unknown real-time processor $processor\n";
           }
          
           #if ( $result{'MActionCode'} == 7 ) { #cybercash smps v.1.1.3
@@ -832,7 +832,7 @@ sub collect {
           }
 
         } else {
-          return "Unkonwn real-time processor $processor\n";
+          return "Unknown real-time processor $processor\n";
         }
 
       } else { #batch card
@@ -999,7 +999,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.8 2001-01-23 05:03:50 ivan Exp $
+$Id: cust_main.pm,v 1.9 2001-01-31 07:21:00 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index d2e3918da..9d2db0eff 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -170,7 +170,7 @@ sub insert {
     if qsearchs( 'svc_acct', { 'username' => $self->username } );
 
   my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
-  return "Unkonwn svcpart" unless $part_svc;
+  return "Unknown svcpart" unless $part_svc;
   return "uid in use"
     if $part_svc->svc_acct__uid_flag ne 'F'
       && qsearchs( 'svc_acct', { 'uid' => $self->uid } )
@@ -385,7 +385,7 @@ sub check {
 
   $recref->{popnum} =~ /^(\d*)$/ or return "Illegal popnum: ".$recref->{popnum};
   $recref->{popnum} = $1;
-  return "Unkonwn popnum" unless
+  return "Unknown popnum" unless
     ! $recref->{popnum} ||
     qsearchs('svc_acct_pop',{'popnum'=> $recref->{popnum} } );
 
@@ -536,7 +536,7 @@ sub radius_check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.13 2000-07-17 13:51:07 ivan Exp $
+$Id: svc_acct.pm,v 1.14 2001-01-31 07:21:00 ivan Exp $
 
 =head1 BUGS
 
diff --git a/TODO b/TODO
index 54a00a111..9c9de34ea 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.56 2000-12-26 23:51:40 ivan Exp $
+$Id: TODO,v 1.57 2001-01-31 07:21:00 ivan Exp $
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
@@ -6,6 +6,52 @@ ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
 ---
 
+(future templating)
+.
+(at least) These questions need to be answered for Mason, Apache::ASP and
+eperl.  If eperl becomes too much of a pain, I'm okay with forgetting 
+about it - it's not well-maintained.  The answers below are for Mason.
+.
+How do you interpolate a value?  <% $value %>
+.
+How do you interpolate a value without escaping HTML? <% $value |n %>
+.
+How do you interpolate a (possibly non-stand-alone, non-interpolated) 
+control structure?  With an inital % - for example:
+.     
+        % for each $value ( @values ) {
+        <OPTION><% $value %></OPTION>
+        % }
+.     
+This is one of the things I worry that the webmonkey HTML editors will not
+like about Mason.  That and the <%INIT> and <%PERL> tags.
+
+
+in the context of a state machine (& MySQL and Pg locking) for LDAP export:
+.
+Also note that Pg locks are for the duration of the transaction, so 
+Freeside needs to start using transactions for this to happen.  
+FS::UID::adminsuidsetup should explicitly set AutoCommit false and export
+some functions to begin and end transactions on $FS::UID::dbh.  (Well,
+eventually FS::UID should be an overloaded subclass of a DBI handle, but
+we don't have to worry about that until perl threads + mod_perl + threaded
+Apache 2.0 is stable, i.e. quite some time).
+
+Postfix
+also supports virtual domains in a way that's somewhat similar (but not
+compatible with) the way sendmail does.  In the postfix world, all virtual
+domain info is contained in one file (similar to the virtusertable), but
+is formatted as such:
+bar.com         virtual
+foo@bar.com             some@other.net
+quux@bar.com    localuser1
+...
+and so on.  After the file is generated, it gets compiled into a hash db
+using, "postmap /etc/postfix/virtual".
+
+
+steal all the play-nice-with-cache stuff back from RT
+
 Use this for email checking:
 libemail-valid-perl - Check validity of Internet email addresses
 .                                                                
@@ -106,6 +152,7 @@ Yes, but we're small and have been tracking projects manually.
 
 
 first package select field in edit/cust_main.cgi isn't sticky on errors, yuck
+(also referral isn't sticky either?  yuck)
 
 > 1. A Web Form to the user get his account added automatically . The
 > /etc/raddb/users and /etc/passwd would be updated automatically (these
diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi
index 22c3d76f2..40e3c2d15 100755
--- a/htdocs/view/svc_acct.cgi
+++ b/htdocs/view/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.11 2000-12-03 20:25:20 ivan Exp $
+# $Id: svc_acct.cgi,v 1.12 2001-01-31 07:21:00 ivan Exp $
 #
 # Usage: svc_acct.cgi svcnum
 #        http://server.name/path/svc_acct.cgi?svcnum
@@ -33,7 +33,10 @@
 # displays arbitrary radius attributes ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.11  2000-12-03 20:25:20  ivan
+# Revision 1.12  2001-01-31 07:21:00  ivan
+# fix tyops
+#
+# Revision 1.11  2000/12/03 20:25:20  ivan
 # session monitor updates
 #
 # Revision 1.10  1999/04/14 11:27:06  ivan
@@ -91,7 +94,7 @@ $mydomain = $conf->config('domain');
 $query =~ /^(\d+)$/;
 $svcnum = $1;
 $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
-die "Unkonwn svcnum" unless $svc_acct;
+die "Unknown svcnum" unless $svc_acct;
 
 $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
 $pkgnum = $cust_svc->getfield('pkgnum');
@@ -104,7 +107,7 @@ if ($pkgnum) {
 }
 
 $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
-die "Unkonwn svcpart" unless $part_svc;
+die "Unknown svcpart" unless $part_svc;
 
 $p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header('Account View', menubar(
-- 
cgit v1.2.1


From d220c8a4bfa1aee8f17ed71c2dba655160dd3595 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 3 Feb 2001 14:03:50 +0000
Subject: time-based prepaid cards, session monitor.  woop!

---
 FS/FS/Record.pm             |  11 +++--
 FS/FS/UID.pm                |   7 ++-
 FS/FS/cust_main.pm          | 101 ++++++++++++++++++++++++++++++++++----------
 bin/fs-setup                |   9 +++-
 bin/generate-prepay         |   5 ++-
 fs_sesmon/fs_session_server |  39 +++++++++++++----
 fs_signup/fs_signup_server  |  24 ++++++-----
 htdocs/docs/session.html    |   2 +
 htdocs/docs/signup.html     |   2 +-
 htdocs/docs/upgrade6.html   |   4 ++
 10 files changed, 154 insertions(+), 50 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 282c5ff16..dd8cc542c 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -176,7 +176,7 @@ sub qsearch {
 
   my $statement = "SELECT $select FROM $table";
   if ( @fields ) {
-    $statement .= " WHERE ". join(' AND ', map {
+    $statement .= ' WHERE '. join(' AND ', map {
       if ( ! defined( $record->{$_} ) || $record->{$_} eq '' ) {
         if ( driver_name eq 'Pg' ) {
           "$_ IS NULL";
@@ -191,11 +191,13 @@ sub qsearch {
   $statement .= " $extra_sql" if defined($extra_sql);
 
   warn $statement if $DEBUG;
-  my $sth = $dbh->prepare_cached($statement) or croak $dbh->errstr;
+  my $sth = $dbh->prepare_cached($statement)
+    or croak "$dbh->errstr doing $statement";
 
   $sth->execute( map $record->{$_},
     grep defined( $record->{$_} ) && $record->{$_} ne '', @fields
   ) or croak $dbh->errstr;
+  $dbh->commit or croak $dbh->errstr if $FS::UID::AutoCommit;
 
   if ( eval 'scalar(@FS::'. $table. '::ISA);' ) {
     if ( eval 'FS::'. $table. '->can(\'new\')' eq \&new ) {
@@ -387,6 +389,7 @@ sub insert {
   local $SIG{PIPE} = 'IGNORE';
 
   $sth->execute or return $sth->errstr;
+  dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
 
   '';
 }
@@ -436,6 +439,7 @@ sub delete {
 
   my $rc = $sth->execute or return $sth->errstr;
   #not portable #return "Record not found, statement:\n$statement" if $rc eq "0E0";
+  dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
 
   undef $self; #no need to keep object!
 
@@ -507,6 +511,7 @@ sub replace {
 
   my $rc = $sth->execute or return $sth->errstr;
   #not portable #return "Record not found (or records identical)." if $rc eq "0E0";
+  dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
 
   '';
 
@@ -908,7 +913,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.11 2000-12-06 10:21:13 ivan Exp $
+$Id: Record.pm,v 1.12 2001-02-03 14:03:49 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 88d733829..5cb5572af 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -4,6 +4,7 @@ use strict;
 use vars qw(
   @ISA @EXPORT_OK $cgi $dbh $freeside_uid $user 
   $conf_dir $secrets $datasrc $db_user $db_pass %callback $driver_name
+  $AutoCommit
 );
 use subs qw(
   getsecrets cgisetotaker
@@ -21,6 +22,8 @@ $freeside_uid = scalar(getpwnam('freeside'));
 
 $conf_dir = "/usr/local/etc/freeside/";
 
+$AutoCommit = 1; #ours, not DBI
+
 =head1 NAME
 
 FS::UID - Subroutines for database login and assorted other stuff
@@ -76,7 +79,7 @@ sub adminsuidsetup {
   croak "Not running uid freeside!" unless checkeuid();
   getsecrets;
   $dbh = DBI->connect($datasrc,$db_user,$db_pass, {
-                          'AutoCommit' => 'true',
+                          'AutoCommit' => 'false',
                           'ChopBlanks' => 'true',
   } ) or die "DBI->connect error: $DBI::errstr\n";
 
@@ -256,7 +259,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.3 2000-06-23 12:25:59 ivan Exp $
+$Id: UID.pm,v 1.4 2001-02-03 14:03:49 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index e50ea7198..7b75bea1e 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -15,7 +15,7 @@ use Date::Format;
 use Mail::Internet;
 use Mail::Header;
 use Business::CreditCard;
-use FS::UID qw( getotaker );
+use FS::UID qw( getotaker dbh );
 use FS::Record qw( qsearchs qsearch );
 use FS::cust_pkg;
 use FS::cust_bill;
@@ -183,17 +183,24 @@ sub table { 'cust_main'; }
 Adds this customer to the database.  If there is an error, returns the error,
 otherwise returns false.
 
+There is a special insert mode in which you pass a data structure to the insert
+method containing FS::cust_pkg and FS::svc_I<tablename> objects.  When
+running under a transactional database, all records are inserted atomicly, or
+the transaction is rolled back.  There should be a better explanation of this,
+but until then, here's an example:
+
+  use Tie::RefHash;
+  tie %hash, 'Tie::RefHash'; #this part is important
+  %hash = {
+    $cust_pkg => [ $svc_acct ],
+  };
+  $cust_main->insert( \%hash );
+
 =cut
 
 sub insert {
   my $self = shift;
 
-  my $flag = 0;
-  if ( $self->payby eq 'PREPAY' ) {
-    $self->payby('BILL');
-    $flag = 1;
-  }
-
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE';
@@ -201,30 +208,78 @@ sub insert {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
-  my $error = $self->SUPER::insert;
-  return $error if $error;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
 
-  if ( $flag ) {
-    my $prepay_credit =
-      qsearchs('prepay_credit', { 'identifier' => $self->payinfo } );
+  my $amount = 0;
+  my $seconds = 0;
+  if ( $self->payby eq 'PREPAY' ) {
+    $self->payby('BILL');
+    my $prepay_credit = qsearchs(
+      'prepay_credit',
+      { 'identifier' => $self->payinfo },
+      '',
+      'FOR UPDATE'
+    );
     warn "WARNING: can't find pre-found prepay_credit: ". $self->payinfo
       unless $prepay_credit;
-    my $amount = $prepay_credit->amount;
+    $amount = $prepay_credit->amount;
+    $seconds = $prepay_credit->seconds;
     my $error = $prepay_credit->delete;
     if ( $error ) {
-      warn "WARNING: can't delete prepay_credit: ". $self->payinfo;
-    } else {
-      my $cust_credit = new FS::cust_credit {
-        'custnum' => $self->custnum,
-        'amount'  => $amount,
-      };
-      my $error = $cust_credit->insert;
-      warn "WARNING: error inserting cust_credit for prepay_credit: $error"
-        if $error;
+      $dbh->rollback;
+      return $error;
+    }
+  }
+
+  my $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback;
+    return $error;
+  }
+
+  if ( @_ ) {
+    my $cust_pkgs = shift;
+    foreach my $cust_pkg ( keys %$cust_pkgs ) {
+      $cust_pkg->custnum( $self->custnum );
+      $error = $cust_pkg->insert;
+      if ( $error ) {
+        $dbh->rollback;
+        return $error;
+      }
+      foreach my $svc_something ( @{$cust_pkgs->{$cust_pkg}} ) {
+        $svc_something->pkgnum( $cust_pkg->pkgnum );
+        if ( $seconds && $svc_something->isa('FS::svc_acct') ) {
+          $svc_something->seconds( $svc_something->seconds + $seconds );
+          $seconds = 0;
+        }
+        $error = $svc_something->insert;
+        if ( $error ) {
+          $dbh->rollback;
+          return $error;
+        }
+      }
     }
+  }
+
+  if ( $seconds ) {
+    $dbh->rollback;
+    return "No svc_acct record to apply pre-paid time";
+  }
 
+  if ( $amount ) {
+    my $cust_credit = new FS::cust_credit {
+      'custnum' => $self->custnum,
+      'amount'  => $amount,
+    };
+    $error = $cust_credit->insert;
+    if ( $error ) {
+      $dbh->rollback;
+      return $error;
+    }
   }
 
+  $dbh->commit or die $dbh->errstr;
   '';
 
 }
@@ -999,7 +1054,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.9 2001-01-31 07:21:00 ivan Exp $
+$Id: cust_main.pm,v 1.10 2001-02-03 14:03:50 ivan Exp $
 
 =head1 BUGS
 
diff --git a/bin/fs-setup b/bin/fs-setup
index 2c31ff667..1df46d342 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.32 2000-12-04 00:13:02 ivan Exp $
+# $Id: fs-setup,v 1.33 2001-02-03 14:03:50 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.32  2000-12-04 00:13:02  ivan
+# Revision 1.33  2001-02-03 14:03:50  ivan
+# time-based prepaid cards, session monitor.  woop!
+#
+# Revision 1.32  2000/12/04 00:13:02  ivan
 # fix nas.last type
 #
 # Revision 1.31  2000/12/01 18:34:53  ivan
@@ -658,6 +661,7 @@ sub tables_hash_hack {
         'shell',     'varchar',   'NULL',   $char_d,
         'quota',     'varchar',   'NULL',   $char_d,
         'slipip',    'varchar',   'NULL',   15, #four TINYINTs, bah.
+        'seconds',   'int', 'NULL',   '', #uhhhh
       ],
       'primary_key' => 'svcnum',
       'unique' => [ [] ],
@@ -739,6 +743,7 @@ sub tables_hash_hack {
         'prepaynum',   'int',     '',   '',
         'identifier',  'varchar', '', $char_d,
         'amount',      @money_type,
+        'seconds',     'int',     'NULL', '',
       ],
       'primary_key' => 'prepaynum',
       'unique'      => [ ['identifier'] ],
diff --git a/bin/generate-prepay b/bin/generate-prepay
index 6fb615ab1..cb4ba7fc6 100755
--- a/bin/generate-prepay
+++ b/bin/generate-prepay
@@ -11,6 +11,8 @@ my $user = shift or die &usage;
 
 my $amount = shift or die &usage;
 
+my $seconds = shift or die &usage;
+
 my $num_digits = shift or die &usage;
 
 my $num_entries = shift or die &usage;
@@ -20,6 +22,7 @@ for ( 1 .. $num_entries ) {
   my $prepay_credit = new FS::prepay_credit {
     'identifier' => $identifier,
     'amount'     => $amount,
+    'seconds'    => $seconds,
   };
   my $error = $prepay_credit->insert;
   die $error if $error;
@@ -27,6 +30,6 @@ for ( 1 .. $num_entries ) {
 }
 
 sub usage {
-  die "Usage:\n\n  generate-prepay user amount num_digits num_entries";
+  die "Usage:\n\n  generate-prepay user amount seconds num_digits num_entries";
 }
 
diff --git a/fs_sesmon/fs_session_server b/fs_sesmon/fs_session_server
index 0930a3c00..00229f8dc 100644
--- a/fs_sesmon/fs_session_server
+++ b/fs_sesmon/fs_session_server
@@ -7,7 +7,7 @@ use strict;
 use vars qw( $opt $Debug );
 use IO::Handle;
 use Net::SSH qw(sshopen2);
-use FS::UID qw(adminsuidsetup);
+use FS::UID qw(adminsuidsetup dbh);
 use FS::Record qw( qsearchs ); #qsearch );
 #use FS::cust_main_county;
 #use FS::cust_main;
@@ -83,6 +83,7 @@ sub login {
   return "Incorrect password"
     if exists($href->{'password'})
        && $href->{'password'} ne $svc_acct->_password;
+  return "Time limit exceeded" unless $svc_acct->seconds;
   my $session = new FS::session {
     'portnum' => $href->{'portnum'},
     'svcnum'  => $svc_acct->svcnum,
@@ -95,20 +96,42 @@ sub logout {
   my $href = shift;
   $href->{'username'} =~ /^([a-z0-9_\-\.]+)$/ or return "Illegal username";
   my $username = $1;
-  my $svc_acct = qsearchs('svc_acct', { 'username' => $username } )
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+  my $svc_acct =
+    qsearchs('svc_acct', { 'username' => $username }, '', 'FOR UPDATE' )
     or return "Unknown user";
   return "Incorrect password"
     if exists($href->{'password'})
        && $href->{'password'} ne $svc_acct->_password;
   my $session = qsearchs( 'session', {
-    'portnum' => $href->{'portnum'},
-    'svcnum'  => $svc_acct->svcnum,
-    'logout'  => '',
-  } );
-  return "No currently open sessions found for that user/port!" unless $session;
+                                       'portnum' => $href->{'portnum'},
+                                       'svcnum'  => $svc_acct->svcnum,
+                                       'logout'  => '',
+                                     },
+                          '', 'FOR UPDATE'
+  );
+  unless ( $session ) {
+    $dbh->rollback;
+    return "No currently open sessions found for that user/port!";
+  }
   my $nsession = new FS::session ( { $session->hash } );
   warn "$nsession replacing $session";
-  $nsession->replace($session);
+  my $error = $nsession->replace($session);
+  if ( $error ) {
+    $dbh->rollback;
+    return "can't logout: $error";
+  }
+  my $time = $nsession->logout - $nsession->login;
+  my $new_svc_acct = new FS::svc_acct ( { $svc_acct->hash } );
+  my $seconds = $new_svc_acct->seconds;
+  $seconds -= $time;
+  $seconds = 0 if $seconds < 0;
+  $new_svc_acct->seconds( $seconds );
+  $error = $new_svc_acct->replace( $svc_acct );
+  warn "can't debit time: $error\n"; #don't want to rollback, though
+  $dbh->commit or die $dbh->errstr;
+  ''
 }
 
 sub usage {
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index b5fc23c28..86455a477 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -5,6 +5,7 @@
 
 use strict;
 use IO::Handle;
+use Tie::RefHash;
 use FS::SSH qw(sshopen2);
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw( qsearch qsearchs );
@@ -160,16 +161,19 @@ while (1) {
 
     $error ||= $svc_acct->check;
 
-    $error ||= $cust_main->insert;
-    if ( $cust_pkg && ! $error ) { #in this case, $cust_pkg should always
-                                   #be definied, but....
-      $cust_pkg->custnum( $cust_main->custnum );
-      $error ||= $cust_pkg->insert; 
-      warn "WARNING: $error on pre-checked cust_pkg record!" if $error;
-      $svc_acct->pkgnum( $cust_pkg->pkgnum );
-      $error ||= $svc_acct->insert;
-      warn "WARNING: $error on pre-checked svc_acct record!" if $error;
-    }
+    use Tie::RefHash;
+    tie my %hash, 'Tie::RefHash';
+    %hash = { $cust_pkg => [ $svc_acct ] };
+    $error ||= $cust_main->insert( \%hash );
+    #if ( $cust_pkg && ! $error ) { #in this case, $cust_pkg should always
+    #                               #be definied, but....
+    #  $cust_pkg->custnum( $cust_main->custnum );
+    #  $error ||= $cust_pkg->insert; 
+    #  warn "WARNING: $error on pre-checked cust_pkg record!" if $error;
+    #  $svc_acct->pkgnum( $cust_pkg->pkgnum );
+    #  $error ||= $svc_acct->insert;
+    #  warn "WARNING: $error on pre-checked svc_acct record!" if $error;
+    #}
 
     warn "[fs_signup_server] Sending results...\n" if $Debug;
     print $writer $error, "\n";
diff --git a/htdocs/docs/session.html b/htdocs/docs/session.html
index 3e88d568b..bd8edbab4 100644
--- a/htdocs/docs/session.html
+++ b/htdocs/docs/session.html
@@ -44,5 +44,7 @@ Then:
   <li>Sesstion start - The command(s) specified in the <a href="config.html#session-start">session-start</a> configuration file are executed on the Freeside machine.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
   <li>Session end - The command(s) specified in the <a href="config.html#session-stop">session-stop</a> configuration file are executed on the Freeside machine.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
 </ul>
+<h2>Dropping expired users</h2>
+Run <pre>bin/freeside-session-kill username</pre> periodically from cron.
 </body>
 </html>
diff --git a/htdocs/docs/signup.html b/htdocs/docs/signup.html
index 6f1e03930..a40b1f963 100644
--- a/htdocs/docs/signup.html
+++ b/htdocs/docs/signup.html
@@ -52,6 +52,6 @@ Optional:
     <li>$email_name - first and last name
   </ul>
   (an example file is included as <b>fs_signup/cck.template</b>).  See the <a href="http://help.netscape.com/products/client/mc/acctproc4.html">Netscape documentation</a> for more information.
-  <li>If there are any entries in the <i>prepay_credit</i> table, a user can enter a string matching the <b>identifier</i> column to receive the credit specified in the <b>amount</b> column, after which that <b>identifier</b> is no longer valid.  This can be used to implement pre-paid "calling card" type signups.  The <i>bin/generate-prepay</i> script can be used to populate the <i>prepay_credit</i> table.
+  <li>If there are any entries in the <i>prepay_credit</i> table, a user can enter a string matching the <b>identifier</i> column to receive the credit specified in the <b>amount</b> column, and/or the time specified in the <b>seconds</b> column (for use with the <a href="session.html">session monitor</a>), after which that <b>identifier</b> is no longer valid.  This can be used to implement pre-paid "calling card" type signups.  The <i>bin/generate-prepay</i> script can be used to populate the <i>prepay_credit</i> table.
 </ul>
 </body>
diff --git a/htdocs/docs/upgrade6.html b/htdocs/docs/upgrade6.html
index 8240b6c32..8e70b5586 100644
--- a/htdocs/docs/upgrade6.html
+++ b/htdocs/docs/upgrade6.html
@@ -34,6 +34,10 @@ ALTER TABLE part_svc ADD svc_www__recnum_flag char(1) NULL;
 ALTER TABLE part_svc ADD svc_www__usersvc varchar(80) NULL;
 ALTER TABLE part_svc ADD svc_www__uesrsvc_flag char(1) NULL;
 ALTER TABLE svc_acct CHANGE _password _password varchar(50) NULL;
+ALTER TABLE svc_acct ADD seconds integer NULL;
+ALTER TABLE part_svc ADD svc_acct__seconds integer NULL;
+ALTER TABLE part_svc ADD svc_acct__seconds_flag char(1) NULL;
+ALTER TABLE prepay_credit ADD seconds integer NULL;
 
 </pre>
   <li>Copy or symlink htdocs to the new copy.
-- 
cgit v1.2.1


From 8436c8cc65a0e0a027269f915493b4eb85e963e0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Feb 2001 19:45:45 +0000
Subject: tyop

---
 htdocs/search/cust_main.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index 8b3092eba..226118586 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.15 2000-07-17 16:45:41 ivan Exp $
+# $Id: cust_main.cgi,v 1.16 2001-02-07 19:45:45 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -17,7 +17,10 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.15  2000-07-17 16:45:41  ivan
+# Revision 1.16  2001-02-07 19:45:45  ivan
+# tyop
+#
+# Revision 1.15  2000/07/17 16:45:41  ivan
 # first shot at invoice browsing and some other cleanups
 #
 # Revision 1.14  1999/08/12 04:45:21  ivan
@@ -184,7 +187,7 @@ END
       #print qq!</TR><TR>\n!;
       $n1="</TR><TR>";
     }
-    print "<\TR>";
+    print "</TR>";
   }
  
   print <<END;
-- 
cgit v1.2.1


From 13477c4eb15c3150938a2af8e90f01ad2d83b335 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 11 Feb 2001 17:17:39 +0000
Subject: documentation updates from jason

---
 CREDITS                 | 8 ++++++--
 FS/FS/cust_bill.pm      | 8 +++++---
 FS/FS/cust_credit.pm    | 5 +++--
 FS/FS/cust_pay.pm       | 7 ++++---
 FS/FS/cust_refund.pm    | 7 ++++---
 htdocs/docs/schema.html | 8 ++++----
 6 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/CREDITS b/CREDITS
index cdfaedc87..163e4f1d0 100644
--- a/CREDITS
+++ b/CREDITS
@@ -63,11 +63,15 @@ other stuff I can't recall (sorry).
 Stephen Amadei <amadei@dandy.net> contribued portability cleanups for the
 low-level DBI stuff.
 
-Jason Spence <thalakan@frys.com> contributed admin.html, autocapnames
-javascript, bugfixes & other neat stuff I can't remember.
+Jason Spence <thalakan@frys.com> contributed admin.html and other
+documentation, autocapnames javascript, bugfixes & other neat stuff I can't
+remember.
 
 Brad Dameron <bdameron@tscnet.com> contributed code to do configurable state
 and referral defaults.
 
+Surf and Sip, Inc., <http://www.surfandsip.com> generously sponsored a
+long-requested feature - the session monitor and time-based prepaid cards.
+
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 568f272aa..454a60a8a 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -65,8 +65,10 @@ FS::cust_bill - Object methods for cust_bill records
 
 =head1 DESCRIPTION
 
-An FS::cust_bill object represents an invoice.  FS::cust_bill inherits from
-FS::Record.  The following fields are currently supported:
+An FS::cust_bill object represents an invoice; a declaration that a customer
+owes you money.  The specific charges are itemized as B<cust_bill_pkg> records
+(see L<FS::cust_bill_pkg>).  FS::cust_bill inherits from FS::Record.  The
+following fields are currently supported:
 
 =over 4
 
@@ -424,7 +426,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.4 2000-12-03 15:14:00 ivan Exp $
+$Id: cust_bill.pm,v 1.5 2001-02-11 17:17:39 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index de8c39d69..e86853799 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -29,7 +29,8 @@ FS::cust_credit - Object methods for cust_credit records
 
 =head1 DESCRIPTION
 
-An FS::cust_credit object represents a credit.  FS::cust_credit inherits from
+An FS::cust_credit object represents a credit; the equivalent of a negative
+B<cust_bill> record (see L<FS::cust_bill>).  FS::cust_credit inherits from
 FS::Record.  The following fields are currently supported:
 
 =over 4
@@ -157,7 +158,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_credit.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: cust_credit.pm,v 1.2 2001-02-11 17:17:39 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index e2b92982d..728981a9b 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -29,8 +29,9 @@ FS::cust_pay - Object methods for cust_pay objects
 
 =head1 DESCRIPTION
 
-An FS::cust_pay object represents a payment.  FS::cust_pay inherits from
-FS::Record.  The following fields are currently supported:
+An FS::cust_pay object represents a payment; the transfer of money from a
+customer.  FS::cust_pay inherits from FS::Record.  The following fields are
+currently supported:
 
 =over 4
 
@@ -172,7 +173,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: cust_pay.pm,v 1.2 2001-02-11 17:17:39 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 65254aef4..742c9bb8d 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -30,8 +30,9 @@ FS::cust_refund - Object method for cust_refund objects
 
 =head1 DESCRIPTION
 
-An FS::cust_refund represents a refund.  FS::cust_refund inherits from
-FS::Record.  The following fields are currently supported:
+An FS::cust_refund represents a refund: the transfer of money to a customer;
+equivalent to a negative payment (see L<FS::cust_pay>).  FS::cust_refund
+inherits from FS::Record.  The following fields are currently supported:
 
 =over 4
 
@@ -171,7 +172,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: cust_refund.pm,v 1.2 2001-02-11 17:17:39 ivan Exp $
 
 =head1 BUGS
 
diff --git a/htdocs/docs/schema.html b/htdocs/docs/schema.html
index 474a3501a..c61781774 100644
--- a/htdocs/docs/schema.html
+++ b/htdocs/docs/schema.html
@@ -17,7 +17,7 @@
         <li>typenum - primary key
         <li>atype - name of this agent type
       </ul>
-    <li><a name="cust_bill">cust_bill</a> - Invoices
+    <li><a name="cust_bill">cust_bill</a> - Invoices.  Declarations that a customer owes you money.  The specific charges are itemized in <a href="#cust_billl_pkg">cust_bill_pkg</a>.
       <ul>
         <li>invnum - primary key
         <li>custnum - <a href="#cust_main">customer</a>
@@ -35,7 +35,7 @@
         <li>sdate - starting date
         <li>edate - ending date
       </ul>
-    <li><a name="cust_credit">cust_credit</a> - Credits
+    <li><a name="cust_credit">cust_credit</a> - Credits.  The equivalent of a negative <a href="#cust_bill>cust_bill</a> record.
       <ul>
         <li>crednum - primary key
         <li>custnum - <a href="#cust_main">customer</a>
@@ -87,7 +87,7 @@
         <li>country
         <li>tax - % rate
       </ul>
-    <li><a name="cust_pay">cust_pay</a> - Payments
+    <li><a name="cust_pay">cust_pay</a> - Payments.  Money being transferred from a customer.
       <ul>
         <li>paynum - primary key
         <li>invnum - <a href="#cust_bill">invoice</a>
@@ -127,7 +127,7 @@
         <li>cancel - (past) cancellation date
         <li>otaker - order taker
       </ul>
-    <li><a name="cust_refund">cust_refund</a> - Refunds
+    <li><a name="cust_refund">cust_refund</a> - Refunds.  The transfer of money to a customer; equivalent to a negative <a href="#cust_pay">cust_pay</a> record.
       <ul>
         <li>refundnum - primary key
         <li>crednum - <a href="#cust_credit">credit</a>
-- 
cgit v1.2.1


From 5e86d70ec02988fff974a5b728dbe647d1a7e627 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 11 Feb 2001 17:34:44 +0000
Subject: more doc updates from jason

---
 FS/FS/cust_bill_pkg.pm  | 4 ++--
 htdocs/docs/schema.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index 38d059df8..b3d3fcde2 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -37,7 +37,7 @@ supported:
 
 =item invnum - invoice (see L<FS::cust_bill>)
 
-=item pkgnum - package (see L<FS::cust_pkg>)
+=item pkgnum - package (see L<FS::cust_pkg>) or 0 for the special virtual sales tax package
 
 =item setup - setup fee
 
@@ -129,7 +129,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_bill_pkg.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: cust_bill_pkg.pm,v 1.2 2001-02-11 17:34:44 ivan Exp $
 
 =head1 BUGS
 
diff --git a/htdocs/docs/schema.html b/htdocs/docs/schema.html
index c61781774..f035286e1 100644
--- a/htdocs/docs/schema.html
+++ b/htdocs/docs/schema.html
@@ -29,7 +29,7 @@
     <li><a name="cust_bill_pkg">cust_bill_pkg</a> - Invoice line items
       <ul>
         <li>invnum - (multiple) key
-        <li>pkgnum - <a href="#cust_pkg">package</a>
+        <li>pkgnum - <a href="#cust_pkg">package</a> or 0 for the special virtual sales tax package
         <li>setup - setup fee 
         <li>recur - recurring fee
         <li>sdate - starting date
-- 
cgit v1.2.1


From bcce59dcb7c3fd19d1c415fec6e9f34e11b0049e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 13 Feb 2001 06:39:30 +0000
Subject: tyop

---
 htdocs/docs/schema.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/schema.html b/htdocs/docs/schema.html
index f035286e1..45c98ab38 100644
--- a/htdocs/docs/schema.html
+++ b/htdocs/docs/schema.html
@@ -35,7 +35,7 @@
         <li>sdate - starting date
         <li>edate - ending date
       </ul>
-    <li><a name="cust_credit">cust_credit</a> - Credits.  The equivalent of a negative <a href="#cust_bill>cust_bill</a> record.
+    <li><a name="cust_credit">cust_credit</a> - Credits.  The equivalent of a negative <a href="#cust_bill">cust_bill</a> record.
       <ul>
         <li>crednum - primary key
         <li>custnum - <a href="#cust_main">customer</a>
-- 
cgit v1.2.1


From e43ee826fe789a3cd046537576e29b990fe70356 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 Feb 2001 04:33:06 +0000
Subject: get rid of gratuitous HISTORY

---
 FS/FS/port.pm | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/FS/FS/port.pm b/FS/FS/port.pm
index 73a5b00e7..13455ca89 100644
--- a/FS/FS/port.pm
+++ b/FS/FS/port.pm
@@ -133,7 +133,7 @@ sub session {
 
 =head1 VERSION
 
-$Id: port.pm,v 1.4 2001-01-30 09:08:40 ivan Exp $
+$Id: port.pm,v 1.5 2001-02-14 04:33:06 ivan Exp $
 
 =head1 BUGS
 
@@ -154,36 +154,6 @@ manpages again.
 
 L<FS::Record>, schema.html from the base documentation.
 
-=head1 HISTORY
-
-ivan@voicenet.com 97-jul-1
-
-added hfields
-ivan@sisd.com 97-nov-13
-
-$Log: port.pm,v $
-Revision 1.4  2001-01-30 09:08:40  ivan
-tyop, thanks to Mack Nagashima <mackn@moaner.org>
-
-Revision 1.3  2000/12/03 20:25:20  ivan
-session monitor updates
-
-Revision 1.1  2000/10/27 20:18:32  ivan
-oops, also necessary for session monitor
-
-Revision 1.1  1999/08/04 08:03:03  ivan
-move table subclass examples out of production directory
-
-Revision 1.4  1998/12/29 11:59:57  ivan
-mostly properly OO, some work still to be done with svc_ stuff
-
-Revision 1.3  1998/11/15 04:33:00  ivan
-updates for newest versoin
-
-Revision 1.2  1998/11/15 03:48:49  ivan
-update for current version
-
-
 =cut
 
 1;
-- 
cgit v1.2.1


From 5666693db385d03342a5bd3474772d6f8e22a26b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 Feb 2001 05:18:37 +0000
Subject: add devel mailing list

---
 README | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/README b/README
index d27d39eb6..31601ef76 100644
--- a/README
+++ b/README
@@ -34,12 +34,16 @@ The Freeside home page is at `http://www.sisd.com/freeside'.
 
 The documentation is in `htdocs/docs'.
 
-A mailing list for users and developers is available.  Send a blank message to
+A mailing list for users is available.  Send a blank message to
 <ivan-freeside-subscribe@sisd.com> to subscribe.
 
+A mailing list for developers is available.  It is intended to be lower volume
+and higher SNR than the users list.  Send a blank message to
+<ivan-freeside-devel-subscribe@sisd.com> to subscribe.
+
 Commercial support is available from Ivan Kohler <ivan@sisd.com>.  Requests for
 free support sent to me directly will be ignored.  Please subscribe to the the
-mailing list to request free support!
+user mailing list to request free support!
 
 Ivan Kohler <ivan-freeside_readme@420.am>
 
-- 
cgit v1.2.1


From 6ce7cc58f12b76532ca3c4944618902c1718aa48 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 20 Feb 2001 16:31:06 +0000
Subject: don't use prepare_cached for now

---
 FS/FS/Record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index dd8cc542c..b5f33e12b 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -191,7 +191,7 @@ sub qsearch {
   $statement .= " $extra_sql" if defined($extra_sql);
 
   warn $statement if $DEBUG;
-  my $sth = $dbh->prepare_cached($statement)
+  my $sth = $dbh->prepare($statement)
     or croak "$dbh->errstr doing $statement";
 
   $sth->execute( map $record->{$_},
@@ -913,7 +913,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.12 2001-02-03 14:03:49 ivan Exp $
+$Id: Record.pm,v 1.13 2001-02-20 16:31:06 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From bcf7e6f16db211da681f464ec3f78746f675f449 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Feb 2001 01:45:07 +0000
Subject: DBI autocommit needs 0, not true string 'false', duh

---
 FS/FS/UID.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 5cb5572af..1902eef4b 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -79,8 +79,8 @@ sub adminsuidsetup {
   croak "Not running uid freeside!" unless checkeuid();
   getsecrets;
   $dbh = DBI->connect($datasrc,$db_user,$db_pass, {
-                          'AutoCommit' => 'false',
-                          'ChopBlanks' => 'true',
+                          'AutoCommit' => 0,
+                          'ChopBlanks' => 1,
   } ) or die "DBI->connect error: $DBI::errstr\n";
 
   swapuid(); #go to non-privledged user if running setuid freeside
@@ -259,7 +259,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.4 2001-02-03 14:03:49 ivan Exp $
+$Id: UID.pm,v 1.5 2001-02-21 01:45:07 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From b7e3e996430536fa01e1eab31f5371d862d88674 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Feb 2001 01:45:37 +0000
Subject: pod tyop

---
 FS/FS/nas.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/nas.pm b/FS/FS/nas.pm
index 53e0fbc34..13d0fb830 100644
--- a/FS/FS/nas.pm
+++ b/FS/FS/nas.pm
@@ -117,7 +117,7 @@ sub check {
     || $self->ut_numbern('last');
 }
 
-=sub heartbeat TIMESTAMP
+=item heartbeat TIMESTAMP
 
 Updates the timestamp for this nas
 
@@ -144,7 +144,7 @@ sub heartbeat {
 
 =head1 VERSION
 
-$Id: nas.pm,v 1.3 2000-12-03 20:25:20 ivan Exp $
+$Id: nas.pm,v 1.4 2001-02-21 01:45:37 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 5e58b96bc5b9bf07de518282f0303f930d119da3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Feb 2001 01:46:32 +0000
Subject: cruft

---
 FS/FS/Bill.pm    | 21 ---------------------
 FS/FS/Invoice.pm | 22 ----------------------
 2 files changed, 43 deletions(-)
 delete mode 100644 FS/FS/Bill.pm
 delete mode 100644 FS/FS/Invoice.pm

diff --git a/FS/FS/Bill.pm b/FS/FS/Bill.pm
deleted file mode 100644
index 11c8121c6..000000000
--- a/FS/FS/Bill.pm
+++ /dev/null
@@ -1,21 +0,0 @@
-package FS::Bill;
-
-use strict;
-use vars qw(@ISA);
-use FS::cust_main;
-
-@ISA = qw(FS::cust_main);
-
-warn "FS::Bill depriciated\n";
-
-=head1 NAME
-
-FS::Bill - Legacy stub
-
-=head1 SYNOPSIS
-
-The functionality of FS::Bill has been integrated into FS::cust_main.
-
-=cut
-
-1;
diff --git a/FS/FS/Invoice.pm b/FS/FS/Invoice.pm
deleted file mode 100644
index 11894a6ad..000000000
--- a/FS/FS/Invoice.pm
+++ /dev/null
@@ -1,22 +0,0 @@
-package FS::Invoice;
-
-use strict;
-use vars qw(@ISA);
-use FS::cust_bill;
-
-@ISA = qw(FS::cust_bill);
-
-warn "FS::Invoice depriciated\n";
-
-=head1 NAME
-
-FS::Invoice - Legacy stub
-
-=head1 SYNOPSIS
-
-The functionality of FS::Invoice has been integrated in FS::cust_bill.
-
-=cut
-
-1;
-
-- 
cgit v1.2.1


From 57f343771fff31b1a5e98c2c220bb43fd7eeca2c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Feb 2001 01:48:07 +0000
Subject: stupid pod errors

---
 FS/bin/freeside-print-batch | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/FS/bin/freeside-print-batch b/FS/bin/freeside-print-batch
index c1a25edb2..5efa4ccb3 100755
--- a/FS/bin/freeside-print-batch
+++ b/FS/bin/freeside-print-batch
@@ -223,21 +223,21 @@ freeside-print-batch - Prints or emails cust_pay_batch. Also deletes
 Prints or emails cust_pay_batch. Can enter payment and delete
 printed records. Usually run as a cron job.
 
--v: Verbose - Prints records to STDOUT.
+B<-v>: Verbose - Prints records to STDOUT.
 
--p: Print to printer lpr as found in the conf directory.
+B<-p>: Print to printer lpr as found in the conf directory.
 
--e: Email output to user found in the Conf email file.
+B<-e>: Email output to user found in the Conf email file.
 
--a: Automatically pays all records in cust_pay_batch. Use -d with this option usually.
+B<-a>: Automatically pays all records in cust_pay_batch. Use -d with this option usually.
 
--d:	Delete - Pays account and deletes record from cust_pay_batch.
+B<-d>:	Delete - Pays account and deletes record from cust_pay_batch.
 
 user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-print-batch,v 1.1 2000-05-13 21:57:56 ivan Exp $
+$Id: freeside-print-batch,v 1.2 2001-02-21 01:48:07 ivan Exp $
 
 =head1 BUGS
 
@@ -257,7 +257,10 @@ L<FS::cust_main>, config.html from the base documentation
 griff@aver-computer.com July 99
 
 $Log: freeside-print-batch,v $
-Revision 1.1  2000-05-13 21:57:56  ivan
+Revision 1.2  2001-02-21 01:48:07  ivan
+stupid pod errors
+
+Revision 1.1  2000/05/13 21:57:56  ivan
 add print_batch script from Joel Griffiths
 
 
-- 
cgit v1.2.1


From 4930644974239211b217a6241781db91808a3778 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Feb 2001 23:48:19 +0000
Subject: add icradius_secrets config file to export to a non-Freeside MySQL
 database for ICRADIUS

---
 bin/svc_acct.export     | 18 ++++++++++++++----
 htdocs/docs/config.html |  1 +
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 636921a40..3280904f6 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.16 2000-07-06 13:23:29 ivan Exp $
+# $Id: svc_acct.export,v 1.17 2001-02-21 23:48:19 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,7 +38,11 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.16  2000-07-06 13:23:29  ivan
+# Revision 1.17  2001-02-21 23:48:19  ivan
+# add icradius_secrets config file to export to a non-Freeside MySQL database for
+# ICRADIUS
+#
+# Revision 1.16  2000/07/06 13:23:29  ivan
 # tyop
 #
 # Revision 1.15  2000/07/06 08:57:28  ivan
@@ -64,6 +68,7 @@ use strict;
 use vars qw($conf);
 use Fcntl qw(:flock);
 use IO::Handle;
+use DBI;
 use FS::Conf;
 use FS::SSH qw(scp ssh);
 use FS::UID qw(adminsuidsetup datasrc dbh);
@@ -98,8 +103,13 @@ my $icradius_mysqldest =
 my $icradius_mysqlsource =
   $conf->config('icradius_mysqlsource') || "/usr/local/var/freeside"
     if $icradiusmachines;
-my $icradius_dbh = dbh; #could eventually get it from a config file if you're
-                        #not running MySQL for your Freeside database
+my $icradius_dbh;
+if ( $icradiusmachines && $conf->exists('icradius_secrets') ) {
+  $icradius_dbh = DBI->connect($conf->config('icradius_secrets'))
+    or die $DBI::errstr;;
+} else {
+  $icradius_dbh = dbh;
+}
 
 my $textradiusprepend = $conf->config('textradiusprepend');
 
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index bc6da6bf3..ea5172dcf 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -42,6 +42,7 @@ All further configuration files and directories are located in
   <li><a name="icradiusmachines">icradiusmachines</a> - Your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines, one per line.  The existance of this file (even if empty) turns on radcheck table creation (in the freeside database - the radcheck table needs to be created manually).  Machines listed in this file will have the radcheck table exported to them.  Each line of this file should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: "<CODE>radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd</CODE>".  Note that to use ICRADIUS export you need to be using MySQL.
   <li><a name="icradius_mysqldest">icradius_mysqldest</a> - Destination directory for the MySQL databases, on the ICRADIUS machines.  Defaults to "/usr/local/var/".
   <li><a name="icradius_mysqlsource">icradius_mysqlsource</a> - Source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".
+  <li><a name="icradius_secrets">icradius_secrets</a> - Optionally specifies a MySQL database for ICRADIUS export, if you're not running MySQL for your Freeside database.  The database should be on the Freeside machine and store data in the <a href="#icradius_mysqlsource">icradius_mysqlsource</a> directory.  Three lines: DBI data source, username and password.  This file should not be world readable.
   <li><a name="invoice_from">invoice_from</a> - Return address on email invoices.
   <li><a name="invoice_template">invoice_template</a> - Required template file for invoices.  See the <a href="billing.html">section on billing</a> for details.
   <li><a name="lpr">lpr</a> - Print command for paper invoices, for example `lpr -h'.
-- 
cgit v1.2.1


From 9adbc223d20e4441d13d672902d07ad249f67592 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 27 Feb 2001 00:59:36 +0000
Subject: silly typo, fix sent by Mack <mackn@mackn.net>, thanks!

---
 FS/FS/session.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/session.pm b/FS/FS/session.pm
index 61dc8991a..30d21d931 100644
--- a/FS/FS/session.pm
+++ b/FS/FS/session.pm
@@ -165,7 +165,7 @@ sub replace {
   my $nas = qsearchs('nas',{'nasnum'=>$port->nasnum});
     #kcuy
   my( $ip, $nasip, $nasfqdn ) = ( $port->ip, $nas->nasip, $nas->nasfqdn );
-  session( eval qq("$stop") ) if $stop;
+  system( eval qq("$stop") ) if $stop;
 
   '';
 }
@@ -224,7 +224,7 @@ sub svc_acct {
 
 =head1 VERSION
 
-$Id: session.pm,v 1.4 2000-12-08 22:22:31 ivan Exp $
+$Id: session.pm,v 1.5 2001-02-27 00:59:36 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From c6f8c3da686ce048b987df1b9853ab217dcfb51b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Mar 2001 17:33:52 +0000
Subject: config value money_char:

	Presto!  Now you can consider all numbers to be shillings.

	If you need to change the currency symbol, you can hunt down the
	instances of literal '$' in FS::cust_bill::print_text and replace them
	with your currency symbol.  I guess this should turn into a
	configuration value.
---
 FS/FS/cust_bill.pm      | 29 +++++++++++++++++------------
 htdocs/docs/config.html |  1 +
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 454a60a8a..d52c9c110 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1,7 +1,7 @@
 package FS::cust_bill;
 
 use strict;
-use vars qw( @ISA $conf $invoice_template );
+use vars qw( @ISA $conf $invoice_template $money_char );
 use vars qw( $invoice_lines @buf ); #yuck
 use Date::Format;
 use Text::Template;
@@ -16,7 +16,11 @@ use FS::cust_pkg;
 
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::cust_bill'} = sub { 
+
   $conf = new FS::Conf;
+
+  $money_char = $conf->config('money_char') || '$';  
+
   my @invoice_template = $conf->config('invoice_template')
     or die "cannot load config file invoice_template";
   $invoice_lines = 0;
@@ -283,12 +287,13 @@ sub print_text {
     push @buf, [
       "Previous Balance, Invoice #". $_->invnum. 
                  " (". time2str("%x",$_->_date). ")",
-      '$'. sprintf("%10.2f",$_->owed)
+      $money_char. sprintf("%10.2f",$_->owed)
     ];
   }
   if (@pr_cust_bill) {
     push @buf,['','-----------'];
-    push @buf,['Total Previous Balance','$' . sprintf("%10.2f",$pr_total ) ];
+    push @buf,[ 'Total Previous Balance',
+                $money_char. sprintf("%10.2f",$pr_total ) ];
     push @buf,['',''];
   }
 
@@ -302,7 +307,7 @@ sub print_text {
       my($pkg)=$part_pkg->pkg;
 
       if ( $_->setup != 0 ) {
-        push @buf, [ "$pkg Setup",'$' . sprintf("%10.2f",$_->setup) ];
+        push @buf, [ "$pkg Setup", $money_char. sprintf("%10.2f",$_->setup) ];
         push @buf,
           map { [ "  ". $_->[0]. ": ". $_->[1], '' ] } $cust_pkg->labels;
       }
@@ -311,33 +316,33 @@ sub print_text {
         push @buf, [
           "$pkg (" . time2str("%x",$_->sdate) . " - " .
                                 time2str("%x",$_->edate) . ")",
-          '$' . sprintf("%10.2f",$_->recur)
+          $money_char. sprintf("%10.2f",$_->recur)
         ];
         push @buf,
           map { [ "  ". $_->[0]. ": ". $_->[1], '' ] } $cust_pkg->labels;
       }
 
     } else { #pkgnum Tax
-      push @buf,["Tax",'$' . sprintf("%10.2f",$_->setup) ] 
+      push @buf,["Tax", $money_char. sprintf("%10.2f",$_->setup) ] 
         if $_->setup != 0;
     }
   }
 
   push @buf,['','-----------'];
   push @buf,['Total New Charges',
-             '$' . sprintf("%10.2f",$self->charged) ];
+             $money_char. sprintf("%10.2f",$self->charged) ];
   push @buf,['',''];
 
   push @buf,['','-----------'];
   push @buf,['Total Charges',
-             '$' . sprintf("%10.2f",$self->charged + $pr_total) ];
+             $money_char. sprintf("%10.2f",$self->charged + $pr_total) ];
   push @buf,['',''];
 
   #credits
   foreach ( @cr_cust_credit ) {
     push @buf,[
       "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
-      '$' . sprintf("%10.2f",$_->credited)
+      $money_char. sprintf("%10.2f",$_->credited)
     ];
   }
 
@@ -345,13 +350,13 @@ sub print_text {
   foreach ( $self->cust_pay ) {
     push @buf,[
       "Payment received ". time2str("%x",$_->_date ),
-      '$' . sprintf("%10.2f",$_->paid )
+      $money_char. sprintf("%10.2f",$_->paid )
     ];
   }
 
   #balance due
   push @buf,['','-----------'];
-  push @buf,['Balance Due','$' . 
+  push @buf,['Balance Due', $money_char. 
     sprintf("%10.2f",$self->owed + $pr_total - $cr_total ) ];
 
   #setup template variables
@@ -426,7 +431,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.5 2001-02-11 17:17:39 ivan Exp $
+$Id: cust_bill.pm,v 1.6 2001-03-30 17:33:52 ivan Exp $
 
 =head1 BUGS
 
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index ea5172dcf..216668591 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -47,6 +47,7 @@ All further configuration files and directories are located in
   <li><a name="invoice_template">invoice_template</a> - Required template file for invoices.  See the <a href="billing.html">section on billing</a> for details.
   <li><a name="lpr">lpr</a> - Print command for paper invoices, for example `lpr -h'.
   <li><a name="maildisablecatchall">maildisablecatchall</a> - The existance of this file will disable the requirement that each virtual domain have a catch-all mailbox.
+  <li><a name="money_char">money_char</a> - Currency symbol - defaults to `$'.
   <li><a name="mxmachines">mxmachines</a> - MX entries for new domains, weight and machine, one per line, with trailing `.'
   <li><a name="nsmachines">nsmachines</a> - NS nameservers for new domains, one per line, with trailing `.'
   <li><a name="nismachines">nismachines</a> - Your NIS master (not slave master) machines, one per line.  This enables export of `/etc/global/passwd' and `/etc/global/shadow'.
-- 
cgit v1.2.1


From ac2b521194a93965c45a851be001049af0ff2d05 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 2 Apr 2001 14:32:02 +0000
Subject: changed url over at apache.org

---
 htdocs/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index e3c8720e9..09c681172 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -56,7 +56,7 @@ $ su
 # make install</pre>
   <li>Copy or link fs-x.y.z/htdocs to your web server's document space.  <pre>mkdir /usr/local/apache/htdocs/freeside
 cp -r fs-x.y.z/htdocs/* /usr/local/apache/htdocs/freeside</pre> or <pre>ln -s /full/path/to/fs-x.y.z/htdocs /usr/local/apache/htdocs/freeside</pre>
-  <li>Restrict access to this web interface.  (with <a href="http://www.apache.org/docs/misc/FAQ.html#user-authentication">Apache</a>)
+  <li>Restrict access to this web interface.  (with <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache</a>)
   <li>Enable CGI execution for files with the `.cgi' extension.  (with <a href="http://www.apache.org/docs/mod/mod_mime.html#addhandler">Apache</a>)
   <li>Set ownership and permissions for the web interface.  The web interface needs to run as the freeside user - there are several ways to do this.
     <ul>
-- 
cgit v1.2.1


From 0281069f3cd7f8caab7768cd818b088991b62117 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Apr 2001 15:50:50 +0000
Subject: rar

---
 CREDITS     | 2 ++
 FS/MANIFEST | 3 +--
 TODO        | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CREDITS b/CREDITS
index 163e4f1d0..fe5ac7fa6 100644
--- a/CREDITS
+++ b/CREDITS
@@ -72,6 +72,8 @@ and referral defaults.
 
 Surf and Sip, Inc., <http://www.surfandsip.com> generously sponsored a
 long-requested feature - the session monitor and time-based prepaid cards.
+Matt Peterson <matt@peterson.org> and Mack ? <mackn@mackn.net> tested
+the new features and contributed many bugfixes.
 
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index a66c5ced7..f3c140906 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -1,9 +1,7 @@
 Changes
 FS.pm
-FS/Bill.pm
 FS/CGI.pm
 FS/Conf.pm
-FS/Invoice.pm
 FS/Record.pm
 FS/SSH.pm
 FS/UI/Base.pm
@@ -50,6 +48,7 @@ test.pl
 README
 bin/freeside-bill
 bin/freeside-print-batch
+bin/freeside-disable-overdue
 FS/domain_record.pm
 FS/prepay_credit.pm
 FS/svc_www.pm
diff --git a/TODO b/TODO
index 9c9de34ea..081c48149 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.57 2001-01-31 07:21:00 ivan Exp $
+$Id: TODO,v 1.58 2001-04-09 15:50:50 ivan Exp $
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
@@ -6,6 +6,8 @@ ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
 ---
 
+write some sample billing expressions with libcflow-perl :)
+
 (future templating)
 .
 (at least) These questions need to be answered for Mason, Apache::ASP and
-- 
cgit v1.2.1


From 15f65a0c56cbce6951d9cb4f71119725a2009f79 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Apr 2001 23:05:16 +0000
Subject: Transactions Part I!!!

---
 FS/FS/cust_bill.pm               |  41 +++++-------
 FS/FS/cust_credit.pm             |  72 +++++++++-----------
 FS/FS/cust_main.pm               | 140 ++++++++++++++++++++++++++++-----------
 FS/FS/cust_pay.pm                |  19 +-----
 FS/FS/cust_pkg.pm                | 113 +++++++++++++++++++++++++------
 FS/FS/cust_refund.pm             |  19 +-----
 FS/FS/session.pm                 |  39 +++++++++--
 FS/FS/svc_Common.pm              |   4 +-
 TODO                             |   5 +-
 bin/fs-setup                     |   9 +--
 htdocs/docs/index.html           |   2 +-
 htdocs/docs/install.html         |   2 +-
 htdocs/docs/schema.html          |   2 -
 htdocs/docs/upgrade6.html        |  16 ++++-
 htdocs/edit/process/part_pkg.cgi |  33 ++++++---
 htdocs/misc/cancel-unaudited.cgi |  26 ++++++--
 16 files changed, 347 insertions(+), 195 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index d52c9c110..8480ceadc 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -85,9 +85,6 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =item charged - amount of this invoice
 
-=item owed - amount still outstanding on this invoice, which is charged minus
-all payments (see L<FS::cust_pay>).
-
 =item printed - how many times this invoice has been printed automatically
 (see L<FS::cust_main/"collect">).
 
@@ -112,21 +109,6 @@ sub table { 'cust_bill'; }
 Adds this invoice to the database ("Posts" the invoice).  If there is an error,
 returns the error, otherwise returns false.
 
-When adding new invoices, owed must be charged (or null, in which case it is
-automatically set to charged).
-
-=cut
-
-sub insert {
-  my $self = shift;
-
-  $self->owed( $self->charged ) if $self->owed eq '';
-  return "owed != charged!"
-    unless $self->owed == $self->charged;
-
-  $self->SUPER::insert;
-}
-
 =item delete
 
 Currently unimplemented.  I don't remove invoices because there would then be
@@ -143,9 +125,8 @@ sub delete {
 Replaces the OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
-Only owed and printed may be changed.  Owed is normally updated by creating and
-inserting a payment (see L<FS::cust_pay>).  Printed is normally updated by
-calling the collect method of a customer object (see L<FS::cust_main>).
+Only printed may be changed.  printed is normally updated by calling the
+collect method of a customer object (see L<FS::cust_main>).
 
 =cut
 
@@ -155,7 +136,6 @@ sub replace {
   #return "Can't change _date!" unless $old->_date eq $new->_date;
   return "Can't change _date!" unless $old->_date == $new->_date;
   return "Can't change charged!" unless $old->charged == $new->charged;
-  return "(New) owed can't be > (new) charged!" if $new->owed > $new->charged;
 
   $new->SUPER::replace($old);
 }
@@ -176,7 +156,6 @@ sub check {
     || $self->ut_number('custnum')
     || $self->ut_numbern('_date')
     || $self->ut_money('charged')
-    || $self->ut_money('owed')
     || $self->ut_numbern('printed')
   ;
   return $error if $error;
@@ -252,6 +231,20 @@ sub cust_pay {
   ;
 }
 
+=item owed
+
+Returns the amount owed (still outstanding) on this invoice, which is charged
+minus all payments (see L<FS::cust_pay>).
+
+=cut
+
+sub owed {
+  my $self = shift;
+  my $balance = $self->charged;
+  $balance -= $_->paid foreach ( $self->cust_pay );
+  $balance;
+}
+
 =item print_text [TIME];
 
 Returns an text invoice, as a list of lines.
@@ -431,7 +424,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.6 2001-03-30 17:33:52 ivan Exp $
+$Id: cust_bill.pm,v 1.7 2001-04-09 23:05:15 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index e86853799..5888d07ef 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -5,6 +5,7 @@ use vars qw( @ISA );
 use FS::UID qw( getotaker );
 use FS::Record qw( qsearchs );
 use FS::cust_main;
+use FS::cust_refund;
 
 @ISA = qw( FS::Record );
 
@@ -41,9 +42,6 @@ FS::Record.  The following fields are currently supported:
 
 =item amount - amount of the credit
 
-=item credited - how much of this credit that is still outstanding, which is
-amount minus all refunds (see L<FS::cust_refund>).
-
 =item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
 L<Time::Local> and L<Date::Parse> for conversion functions.
 
@@ -70,26 +68,6 @@ sub table { 'cust_credit'; }
 Adds this credit to the database ("Posts" the credit).  If there is an error,
 returns the error, otherwise returns false.
 
-When adding new invoices, credited must be amount (or null, in which case it is
-automatically set to amount).
-
-=cut
-
-sub insert {
-  my $self = shift;
-
-  my $error;
-  return $error if $error = $self->ut_money('credited')
-                         || $self->ut_money('amount');
-
-  $self->credited($self->amount) if $self->credited == 0
-                                 || $self->credited eq '';
-  return "credited != amount!"
-    unless $self->credited == $self->amount;
-
-  $self->SUPER::insert;
-}
-
 =item delete
 
 Currently unimplemented.
@@ -102,25 +80,13 @@ sub delete {
 
 =item replace OLD_RECORD
 
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-Only credited may be changed.  Credited is normally updated by creating and
-inserting a refund (see L<FS::cust_refund>).
+Credits may not be modified; there would then be no record the credit was ever
+posted.
 
 =cut
 
 sub replace {
-  my ( $new, $old ) = ( shift, shift );
-
-  return "Can't change custnum!" unless $old->custnum == $new->custnum;
-  #return "Can't change date!" unless $old->_date eq $new->_date;
-  return "Can't change date!" unless $old->_date == $new->_date;
-  return "Can't change amount!" unless $old->amount == $new->amount;
-  return "(New) credited can't be > (new) amount!"
-    if $new->credited > $new->amount;
-
-  $new->SUPER::replace($old);
+  return "Can't modify credit!"
 }
 
 =item check
@@ -139,7 +105,6 @@ sub check {
     || $self->ut_number('custnum')
     || $self->ut_numbern('_date')
     || $self->ut_money('amount')
-    || $self->ut_money('credited')
     || $self->ut_textn('reason');
   ;
   return $error if $error;
@@ -154,11 +119,38 @@ sub check {
   ''; #no error
 }
 
+=item cust_refund
+
+Returns all refunds (see L<FS::cust_refund>) for this credit.
+
+=cut
+
+sub cust_refund {
+  my $self = shift;
+  sort { $a->_date <=> $b->_date }
+    qsearch( 'cust_refund', { 'crednum' => $self->crednum } )
+  ;
+}
+
+=item credited
+
+Returns the amount of this credit that is still outstanding; which is
+amount minus all refunds (see L<FS::cust_refund>).
+
+=cut
+
+sub credited {
+  my $self = shift;
+  my $amount = $self->amount;
+  $amount -= $_->refund foreach ( $self->cust_refund );
+  $amount;
+}
+
 =back
 
 =head1 VERSION
 
-$Id: cust_credit.pm,v 1.2 2001-02-11 17:17:39 ivan Exp $
+$Id: cust_credit.pm,v 1.3 2001-04-09 23:05:15 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 7b75bea1e..4a254e06c 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -208,6 +208,7 @@ sub insert {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
+  my $oldAutoCommit = $FS::UID::AutoCommit;
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
@@ -227,14 +228,14 @@ sub insert {
     $seconds = $prepay_credit->seconds;
     my $error = $prepay_credit->delete;
     if ( $error ) {
-      $dbh->rollback;
+      $dbh->rollback if $oldAutoCommit;
       return $error;
     }
   }
 
   my $error = $self->SUPER::insert;
   if ( $error ) {
-    $dbh->rollback;
+    $dbh->rollback if $oldAutoCommit;
     return $error;
   }
 
@@ -244,7 +245,7 @@ sub insert {
       $cust_pkg->custnum( $self->custnum );
       $error = $cust_pkg->insert;
       if ( $error ) {
-        $dbh->rollback;
+        $dbh->rollback if $oldAutoCommit;
         return $error;
       }
       foreach my $svc_something ( @{$cust_pkgs->{$cust_pkg}} ) {
@@ -255,7 +256,7 @@ sub insert {
         }
         $error = $svc_something->insert;
         if ( $error ) {
-          $dbh->rollback;
+          $dbh->rollback if $oldAutoCommit;
           return $error;
         }
       }
@@ -263,7 +264,7 @@ sub insert {
   }
 
   if ( $seconds ) {
-    $dbh->rollback;
+    $dbh->rollback if $oldAutoCommit;
     return "No svc_acct record to apply pre-paid time";
   }
 
@@ -274,12 +275,12 @@ sub insert {
     };
     $error = $cust_credit->insert;
     if ( $error ) {
-      $dbh->rollback;
+      $dbh->rollback if $oldAutoCommit;
       return $error;
     }
   }
 
-  $dbh->commit or die $dbh->errstr;
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 
 }
@@ -304,13 +305,6 @@ or credits (see L<FS::cust_credit>).
 sub delete {
   my $self = shift;
 
-  if ( qsearch( 'cust_bill', { 'custnum' => $self->custnum } ) ) {
-    return "Can't delete a customer with invoices";
-  }
-  if ( qsearch( 'cust_credit', { 'custnum' => $self->custnum } ) ) {
-    return "Can't delete a customer with credits";
-  }
-
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE';
@@ -318,27 +312,56 @@ sub delete {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  if ( qsearch( 'cust_bill', { 'custnum' => $self->custnum } ) ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "Can't delete a customer with invoices";
+  }
+  if ( qsearch( 'cust_credit', { 'custnum' => $self->custnum } ) ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "Can't delete a customer with credits";
+  }
+
   my @cust_pkg = qsearch( 'cust_pkg', { 'custnum' => $self->custnum } );
   if ( @cust_pkg ) {
     my $new_custnum = shift;
-    return "Invalid new customer number: $new_custnum"
-      unless qsearchs( 'cust_main', { 'custnum' => $new_custnum } );
+    unless ( qsearchs( 'cust_main', { 'custnum' => $new_custnum } ) ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "Invalid new customer number: $new_custnum";
+    }
     foreach my $cust_pkg ( @cust_pkg ) {
       my %hash = $cust_pkg->hash;
       $hash{'custnum'} = $new_custnum;
       my $new_cust_pkg = new FS::cust_pkg ( \%hash );
       my $error = $new_cust_pkg->replace($cust_pkg);
-      return $error if $error;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
     }
   }
   foreach my $cust_main_invoice (
     qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } )
   ) {
     my $error = $cust_main_invoice->delete;
-    return $error if $error;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
   }
 
-  $self->SUPER::delete;
+  my $error = $self->SUPER::delete;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+
 }
 
 =item replace OLD_RECORD
@@ -549,6 +572,10 @@ sub bill {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
   # find the packages which are due for billing, find out how much they are
   # & generate invoice database.
  
@@ -648,7 +675,10 @@ sub bill {
 
   my $charged = sprintf( "%.2f", $total_setup + $total_recur );
 
-  return '' if scalar(@cust_bill_pkg) == 0;
+  unless ( @cust_bill_pkg ) {
+    $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+    return '';
+  }
 
   unless ( $self->getfield('tax') =~ /Y/i
            || $self->getfield('payby') eq 'COMP'
@@ -679,11 +709,10 @@ sub bill {
     'charged' => $charged,
   } );
   $error = $cust_bill->insert;
-  #shouldn't happen, but how else to handle this? (wrap me in eval, to catch 
-  # fatal errors)
-  die "Error creating cust_bill record: $error!\n",
-      "Check updated but unbilled packages for customer", $self->custnum, "\n"
-    if $error;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "$error for customer #". $self->custnum;
+  }
 
   my $invnum = $cust_bill->invnum;
   my $cust_bill_pkg;
@@ -691,11 +720,13 @@ sub bill {
     $cust_bill_pkg->setfield( 'invnum', $invnum );
     $error = $cust_bill_pkg->insert;
     #shouldn't happen, but how else tohandle this?
-    die "Error creating cust_bill_pkg record: $error!\n",
-        "Check incomplete invoice ", $invnum, "\n"
-      if $error;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "$error for customer #". $self->custnum;
+    }
   }
   
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
 }
 
@@ -728,10 +759,6 @@ sub collect {
   my( $self, %options ) = @_;
   my $invoice_time = $options{'invoice_time'} || time;
 
-  my $total_owed = $self->balance;
-  warn "collect: total owed $total_owed " if $Debug;
-  return '' unless $total_owed > 0; #redundant?????
-
   #put below somehow?
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -740,6 +767,17 @@ sub collect {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $total_owed = $self->balance;
+  warn "collect: total owed $total_owed " if $Debug;
+  unless ( $total_owed > 0 ) { #redundant?????
+    $dbh->rollback if $oldAutoCommit;
+    return '';
+  }
+
   foreach my $cust_bill (
     qsearch('cust_bill', { 'custnum' => $self->custnum, } )
   ) {
@@ -813,14 +851,20 @@ sub collect {
          'paybatch' => ''
       } );
       my $error = $cust_pay->insert;
-      return 'Error COMPing invnum #' . $cust_bill->invnum .
-             ':' . $error if $error;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return 'Error COMPing invnum #'. $cust_bill->invnum. ": $error";
+      }
+
 
     } elsif ( $self->payby eq 'CARD' ) {
 
       if ( $options{'batch_card'} ne 'yes' ) {
 
-        return "Real time card processing not enabled!" unless $processor;
+        unless ( $processor ) {
+          $dbh->rollback if $oldAutoCommit;
+          return "Real time card processing not enabled!";
+        }
 
         if ( $processor =~ /^cybercash/ ) {
 
@@ -861,7 +905,8 @@ sub collect {
           } elsif ( $processor eq 'cybercash3.2' ) {
             %result = &CCMckDirectLib3_2::SendCC2_1Server(@full_xaction);
           } else {
-            return "Unknown real-time processor $processor\n";
+            $dbh->rollback if $oldAutoCommit;
+            return "Unknown real-time processor $processor";
           }
          
           #if ( $result{'MActionCode'} == 7 ) { #cybercash smps v.1.1.3
@@ -876,17 +921,27 @@ sub collect {
                'paybatch' => "$processor:$paybatch",
             } );
             my $error = $cust_pay->insert;
-            return 'Error applying payment, invnum #' . 
-              $cust_bill->invnum. ':'. $error if $error;
+            if ( $error ) {
+              # gah, even with transactions.
+              $dbh->commit if $oldAutoCommit; #well.
+              my $e = 'WARNING: Card debited but database not updated - '.
+                      'error applying payment, invnum #' . $cust_bill->invnum.
+                      " (CyberCash Order-ID $paybatch): $error";
+              warn $e;
+              return $e;
+            }
           } elsif ( $result{'Mstatus'} ne 'failure-bad-money'
                  || $options{'report_badcard'} ) {
+             $dbh->commit if $oldAutoCommit;
              return 'Cybercash error, invnum #' . 
                $cust_bill->invnum. ':'. $result{'MErrMsg'};
           } else {
+            $dbh->commit or die $dbh->errstr if $oldAutoCommit;
             return '';
           }
 
         } else {
+          $dbh->rollback if $oldAutoCommit;
           return "Unknown real-time processor $processor\n";
         }
 
@@ -910,15 +965,20 @@ sub collect {
          'amount'   => $amount,
        } );
        my $error = $cust_pay_batch->insert;
-       return "Error adding to cust_pay_batch: $error" if $error;
+       if ( $error ) {
+         $dbh->rollback if $oldAutoCommit;
+         return "Error adding to cust_pay_batch: $error";
+       }
 
       }
 
     } else {
+      $dbh->rollback if $oldAutoCommit;
       return "Unknown payment type ". $self->payby;
     }
 
   }
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 
 }
@@ -1054,7 +1114,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.10 2001-02-03 14:03:50 ivan Exp $
+$Id: cust_main.pm,v 1.11 2001-04-09 23:05:15 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 728981a9b..f0d945060 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -74,26 +74,11 @@ L<FS::cust_bill>).
 sub insert {
   my $self = shift;
 
-  my $error;
-
-  $error = $self->check;
+  my $error = $self->check;
   return $error if $error;
 
   my $old_cust_bill = qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
   return "Unknown invnum" unless $old_cust_bill;
-  my %hash = $old_cust_bill->hash;
-  $hash{'owed'} = sprintf("%.2f", $hash{owed} - $self->paid );
-  my $new_cust_bill = new FS::cust_bill ( \%hash );
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  $error = $new_cust_bill->replace($old_cust_bill);
-  return "Error modifying cust_bill: $error" if $error;
 
   $self->SUPER::insert;
 }
@@ -173,7 +158,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.2 2001-02-11 17:17:39 ivan Exp $
+$Id: cust_pay.pm,v 1.3 2001-04-09 23:05:15 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 08be4e4e0..9705827e7 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2,7 +2,7 @@ package FS::cust_pkg;
 
 use strict;
 use vars qw(@ISA);
-use FS::UID qw( getotaker );
+use FS::UID qw( getotaker dbh );
 use FS::Record qw( qsearch qsearchs );
 use FS::cust_svc;
 use FS::part_pkg;
@@ -218,26 +218,41 @@ sub cancel {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
   foreach my $cust_svc (
     qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum } )
   ) {
     my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $cust_svc->svcpart } );
 
-    $part_svc->svcdb =~ /^([\w\-]+)$/
-      or return "Illegal svcdb value in part_svc!";
+    $part_svc->svcdb =~ /^([\w\-]+)$/ or do {
+      $dbh->rollback if $oldAutoCommit;
+      return "Illegal svcdb value in part_svc!";
+    };
     my $svcdb = $1;
     require "FS/$svcdb.pm";
 
     my $svc = qsearchs( $svcdb, { 'svcnum' => $cust_svc->svcnum } );
     if ($svc) {
       $error = $svc->cancel;
-      return "Error cancelling service: $error" if $error;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "Error cancelling service: $error" 
+      }
       $error = $svc->delete;
-      return "Error deleting service: $error" if $error;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "Error deleting service: $error";
+      }
     }
 
     $error = $cust_svc->delete;
-    return "Error deleting cust_svc: $error" if $error;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "Error deleting cust_svc: $error";
+    }
 
   }
 
@@ -246,9 +261,14 @@ sub cancel {
     $hash{'cancel'} = time;
     my $new = new FS::cust_pkg ( \%hash );
     $error = $new->replace($self);
-    return $error if $error;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
   }
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
   ''; #no errors
 }
 
@@ -272,20 +292,29 @@ sub suspend {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
   foreach my $cust_svc (
     qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum } )
   ) {
     my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $cust_svc->svcpart } );
 
-    $part_svc->svcdb =~ /^([\w\-]+)$/
-      or return "Illegal svcdb value in part_svc!";
+    $part_svc->svcdb =~ /^([\w\-]+)$/ or do {
+      $dbh->rollback if $oldAutoCommit;
+      return "Illegal svcdb value in part_svc!";
+    };
     my $svcdb = $1;
     require "FS/$svcdb.pm";
 
     my $svc = qsearchs( $svcdb, { 'svcnum' => $cust_svc->svcnum } );
     if ($svc) {
       $error = $svc->suspend;
-      return $error if $error;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
     }
 
   }
@@ -295,9 +324,14 @@ sub suspend {
     $hash{'susp'} = time;
     my $new = new FS::cust_pkg ( \%hash );
     $error = $new->replace($self);
-    return $error if $error;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
   }
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
   ''; #no errors
 }
 
@@ -321,20 +355,29 @@ sub unsuspend {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
   foreach my $cust_svc (
     qsearch('cust_svc',{'pkgnum'=> $self->pkgnum } )
   ) {
     my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $cust_svc->svcpart } );
 
-    $part_svc->svcdb =~ /^([\w\-]+)$/
-      or return "Illegal svcdb value in part_svc!";
+    $part_svc->svcdb =~ /^([\w\-]+)$/ or do {
+      $dbh->rollback if $oldAutoCommit;
+      return "Illegal svcdb value in part_svc!";
+    };
     my $svcdb = $1;
     require "FS/$svcdb.pm";
 
     my $svc = qsearchs( $svcdb, { 'svcnum' => $cust_svc->svcnum } );
     if ($svc) {
       $error = $svc->unsuspend;
-      return $error if $error;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
     }
 
   }
@@ -344,9 +387,14 @@ sub unsuspend {
     $hash{'susp'} = '';
     my $new = new FS::cust_pkg ( \%hash );
     $error = $new->replace($self);
-    return $error if $error;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
   }
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
   ''; #no errors
 }
 
@@ -398,6 +446,10 @@ L<FS::pkg_svc>).
 sub order {
   my($custnum,$pkgparts,$remove_pkgnums)=@_;
 
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
   # generate %part_pkg
   # $part_pkg{$pkgpart} is true iff $custnum may purchase $pkgpart
   #
@@ -425,8 +477,10 @@ sub order {
   # @cust_svc is a corresponding list of lists of FS::Record objects
   my($pkgpart);
   foreach $pkgpart ( @{$pkgparts} ) {
-    return "Customer not permitted to purchase pkgpart $pkgpart!"
-      unless $part_pkg{$pkgpart};
+    unless ( $part_pkg{$pkgpart} ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "Customer not permitted to purchase pkgpart $pkgpart!";
+    }
     push @cust_svc, [
       map {
         ( $svcnum{$_} && @{ $svcnum{$_} } ) ? shift @{ $svcnum{$_} } : ();
@@ -437,6 +491,7 @@ sub order {
   #check for leftover services
   foreach (keys %svcnum) {
     next unless @{ $svcnum{$_} };
+    $dbh->rollback if $oldAutoCommit;
     return "Leftover services, svcpart $_: svcnum ".
            join(', ', map { $_->svcnum } @{ $svcnum{$_} } );
   }
@@ -454,12 +509,18 @@ sub order {
 #  my($pkgnum);
   foreach $pkgnum ( @{$remove_pkgnums} ) {
     my($old) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-    die "Package $pkgnum not found to remove!" unless $old;
+    unless ( $old ) {
+      $dbh->rollback if $oldAutoCommit;
+      die "Package $pkgnum not found to remove!";
+    }
     my(%hash) = $old->hash;
     $hash{'cancel'}=time;   
     my($new) = new FS::cust_pkg ( \%hash );
     my($error)=$new->replace($old);
-    die "Couldn't update package $pkgnum: $error" if $error;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      die "Couldn't update package $pkgnum: $error";
+    }
   }
 
   #now add new packages, changing cust_svc records if necessary
@@ -471,7 +532,10 @@ sub order {
                                        'pkgpart' => $pkgpart,
                                     } );
     my($error) = $new->insert;
-    die "Couldn't insert new cust_pkg record: $error" if $error; 
+   if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      die "Couldn't insert new cust_pkg record: $error";
+    }
     my($pkgnum)=$new->getfield('pkgnum');
  
     my($cust_svc);
@@ -480,10 +544,15 @@ sub order {
       $hash{'pkgnum'}=$pkgnum;
       my($new) = new FS::cust_svc ( \%hash );
       my($error)=$new->replace($cust_svc);
-      die "Couldn't link old service to new package: $error" if $error;
+     if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        die "Couldn't link old service to new package: $error";
+      }
     }
   }  
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
   ''; #no errors
 }
 
@@ -491,7 +560,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.4 2000-02-03 05:16:52 ivan Exp $
+$Id: cust_pkg.pm,v 1.5 2001-04-09 23:05:15 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 742c9bb8d..729dc02b0 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -75,27 +75,12 @@ L<FS::cust_credit>).
 sub insert {
   my $self = shift;
 
-  my $error;
-
-  $error=$self->check;
+  my $error = $self->check;
   return $error if $error;
 
   my $old_cust_credit =
     qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
   return "Unknown crednum" unless $old_cust_credit;
-  my %hash = $old_cust_credit->hash;
-  $hash{credited} = sprintf("%.2f", $hash{credited} - $self->refund );
-  my($new_cust_credit) = new FS::cust_credit ( \%hash );
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  $error = $new_cust_credit->replace($old_cust_credit);
-  return "Error modifying cust_credit: $error" if $error;
 
   $self->SUPER::insert;
 }
@@ -172,7 +157,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.2 2001-02-11 17:17:39 ivan Exp $
+$Id: cust_refund.pm,v 1.3 2001-04-09 23:05:15 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/session.pm b/FS/FS/session.pm
index 30d21d931..55bb678a7 100644
--- a/FS/FS/session.pm
+++ b/FS/FS/session.pm
@@ -2,6 +2,7 @@ package FS::session;
 
 use strict;
 use vars qw( @ISA $conf $start $stop );
+use FS::UID qw( dbh );
 use FS::Record qw( qsearchs );
 use FS::svc_acct;
 use FS::port;
@@ -100,14 +101,24 @@ sub insert {
   $error = $self->check;
   return $error if $error;
 
-  return "a session on that port is already open!"
-    if qsearchs('session', { 'portnum' => $self->portnum, 'logout' => '' } );
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  if ( qsearchs('session', { 'portnum' => $self->portnum, 'logout' => '' } ) ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "a session on that port is already open!";
+  }
 
   $self->setfield('login', time()) unless $self->getfield('login');
 
   $error = $self->SUPER::insert;
-  return $error if $error;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
 
+  #transactional accuracy not essential; just an indication of data freshness
   $self->nas_heartbeat($self->getfield('login'));
 
   #session-starting callback
@@ -117,7 +128,8 @@ sub insert {
     #kcuy
   my( $ip, $nasip, $nasfqdn ) = ( $port->ip, $nas->nasip, $nas->nasfqdn );
   system( eval qq("$start") ) if $start;
-
+  
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 
 }
@@ -149,14 +161,25 @@ sub replace {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
   $error = $self->check;
-  return $error if $error;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
 
   $self->setfield('logout', time()) unless $self->getfield('logout');
 
   $error = $self->SUPER::replace($old);
-  return $error if $error;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
 
+  #transactional accuracy not essential; just an indication of data freshness
   $self->nas_heartbeat($self->getfield('logout'));
 
   #session-ending callback
@@ -167,6 +190,8 @@ sub replace {
   my( $ip, $nasip, $nasfqdn ) = ( $port->ip, $nas->nasip, $nas->nasfqdn );
   system( eval qq("$stop") ) if $stop;
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
   '';
 }
 
@@ -224,7 +249,7 @@ sub svc_acct {
 
 =head1 VERSION
 
-$Id: session.pm,v 1.5 2001-02-27 00:59:36 ivan Exp $
+$Id: session.pm,v 1.6 2001-04-09 23:05:15 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 5bea5b0ce..8bcdf4f56 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -55,7 +55,7 @@ sub insert {
   my $cust_svc;
   unless ( $svcnum ) {
     $cust_svc = new FS::cust_svc ( {
-      'svcnum'  => $svcnum,
+      #hua?# 'svcnum'  => $svcnum,
       'pkgnum'  => $self->pkgnum,
       'svcpart' => $self->svcpart,
     } );
@@ -184,7 +184,7 @@ sub cancel { ''; }
 
 =head1 VERSION
 
-$Id: svc_Common.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: svc_Common.pm,v 1.2 2001-04-09 23:05:15 ivan Exp $
 
 =head1 BUGS
 
diff --git a/TODO b/TODO
index 081c48149..a9b3f64c1 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.58 2001-04-09 15:50:50 ivan Exp $
+$Id: TODO,v 1.59 2001-04-09 23:05:15 ivan Exp $
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
@@ -6,6 +6,9 @@ ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
 ---
 
+anything doing transactions in the web interface should likely move into *.pm.
+(transactions are here woo!)
+
 write some sample billing expressions with libcflow-perl :)
 
 (future templating)
diff --git a/bin/fs-setup b/bin/fs-setup
index 1df46d342..2a37fb8d7 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.33 2001-02-03 14:03:50 ivan Exp $
+# $Id: fs-setup,v 1.34 2001-04-09 23:05:16 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.33  2001-02-03 14:03:50  ivan
+# Revision 1.34  2001-04-09 23:05:16  ivan
+# Transactions Part I!!!
+#
+# Revision 1.33  2001/02/03 14:03:50  ivan
 # time-based prepaid cards, session monitor.  woop!
 #
 # Revision 1.32  2000/12/04 00:13:02  ivan
@@ -392,7 +395,6 @@ sub tables_hash_hack {
         'custnum',   'int',  '', '',
         '_date',     @date_type,
         'charged',   @money_type,
-        'owed',      @money_type,
         'printed',   'int',  '', '',
       ],
       'primary_key' => 'invnum',
@@ -420,7 +422,6 @@ sub tables_hash_hack {
         'custnum',  'int', '', '',
         '_date',    @date_type,
         'amount',   @money_type,
-        'credited', @money_type,
         'otaker',   'varchar', '', 8,
         'reason',   'varchar', '', 255,
       ],
diff --git a/htdocs/docs/index.html b/htdocs/docs/index.html
index 82410902a..ab2f84c1b 100644
--- a/htdocs/docs/index.html
+++ b/htdocs/docs/index.html
@@ -11,7 +11,7 @@
   <li><a href="upgrade3.html">Upgrading from 1.1.x to 1.2.x</a>
   <li><a href="upgrade4.html">Upgrading from 1.2.x to 1.2.2</a>
   <li><a href="upgrade5.html">Upgrading from 1.2.2 to 1.2.3</a>
-  <li><a href="upgrade6.html">Upgrading from 1.2.3 to 1.2.4</a>
+  <li><a href="upgrade6.html">Upgrading from 1.2.3 to 1.3.0</a>
   <li><a href="config.html">Configuration files</a>
   <li><a href="admin.html">Administration</a>
 <!--
diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 09c681172..61eec08d8 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -8,7 +8,7 @@ Before installing, you need:
   <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
   <li><a href="http://www.openssh.com//">SSH</a>
   <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
-  <li>A database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>, such as <a href="http://www.tcx.se/">MySQL</a> or <a href="http://www.postgresql.org/">PostgreSQL</a> (verstion 6.5 or higher) (see the <a href="postgresql.html">PostgreSQL notes</a>)
+  <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.  <a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.  (see the <a href="postgresql.html">PostgreSQL notes</a>)  <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>.
   <li>Perl modules (<a href="http://www.perl.com/CPAN/doc/manual/html/lib/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
     <ul>
       <li><a href="http://www.perl.com/CPAN/modules/by-module/Array/">Array-PrintCols</a>
diff --git a/htdocs/docs/schema.html b/htdocs/docs/schema.html
index 45c98ab38..95929ead8 100644
--- a/htdocs/docs/schema.html
+++ b/htdocs/docs/schema.html
@@ -23,7 +23,6 @@
         <li>custnum - <a href="#cust_main">customer</a>
         <li>_date
         <li>charged - amount of this invoice
-        <li>owed - amount still outstanding on this invoice
         <li>printed - how many times this invoice has been printed automatically
       </ul>
     <li><a name="cust_bill_pkg">cust_bill_pkg</a> - Invoice line items
@@ -40,7 +39,6 @@
         <li>crednum - primary key
         <li>custnum - <a href="#cust_main">customer</a>
         <li>amount - amount credited
-        <li>credited - amount still outstanding (not yet refunded) on this credit
         <li>_date
         <li>otaker - order taker
         <li>reason
diff --git a/htdocs/docs/upgrade6.html b/htdocs/docs/upgrade6.html
index 8e70b5586..807146f89 100644
--- a/htdocs/docs/upgrade6.html
+++ b/htdocs/docs/upgrade6.html
@@ -1,8 +1,8 @@
 <head>
-  <title>Upgrading to 1.2.4</title>
+  <title>Upgrading to 1.3.0</title>
 </head>
 <body>
-<h1>Upgrading to 1.2.4 from 1.2.3</h1>
+<h1>Upgrading to 1.3.0 from 1.2.3</h1>
 <ul>
   <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
   <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
@@ -10,6 +10,7 @@
   <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
   <li>If migrating from less than 1.2.3, see these <a href="upgrade5.html">instructions</a> first.
   <li>Back up your data and current Freeside installation.
+  <li>As 1.3.0 requires transactions, <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are no longer supported</b>.  Converting to <a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.  If you really want to use MySQL, convert your tables to one of the <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>.
   <li>Copy the <i>invoice_template</i> file from the <i>conf/</i> directory in the distribution to your <a href="config.html">configuration directory</a>.
   <li>Install the <a href="http://www.perl.com/CPAN/modules/by-module/Text/">Text-Template</a> Perl module.
   <li>Apply the following changes to your database:
@@ -40,6 +41,17 @@ ALTER TABLE part_svc ADD svc_acct__seconds_flag char(1) NULL;
 ALTER TABLE prepay_credit ADD seconds integer NULL;
 
 </pre>
+  <li>If your database supports dropping columns:
+<pre>
+ALTER TABLE cust_bill DROP owed;
+ALTER TABLE cust_credit DROP credited;
+</pre>
+     Or, if your database does not support dropping columns, you can do this:
+<pre>
+ALTER TABLE cust_bill CHANGE owed depriciated decimal(10,2);
+ALTER TABLE cust_credit CHANGE credited depriciated2 decimal(10,2);
+</pre>
+
   <li>Copy or symlink htdocs to the new copy.
   <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
   <li>Change to the FS directory in the new tarball, and build and install the
diff --git a/htdocs/edit/process/part_pkg.cgi b/htdocs/edit/process/part_pkg.cgi
index adf4672bd..5af9055d6 100755
--- a/htdocs/edit/process/part_pkg.cgi
+++ b/htdocs/edit/process/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.8 1999-02-07 09:59:27 ivan Exp $
+# $Id: part_pkg.cgi,v 1.9 2001-04-09 23:05:16 ivan Exp $
 #
 # process/part_pkg.cgi: Edit package definitions (process form)
 #
@@ -17,7 +17,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.8  1999-02-07 09:59:27  ivan
+# Revision 1.9  2001-04-09 23:05:16  ivan
+# Transactions Part I!!!
+#
+# Revision 1.8  1999/02/07 09:59:27  ivan
 # more mod_perl fixes, and bugfixes Peter Wemm sent via email
 #
 # Revision 1.7  1999/01/19 05:13:55  ivan
@@ -41,7 +44,7 @@
 #
 
 use strict;
-use vars qw( $cgi $pkgpart $old $new $part_svc $error );
+use vars qw( $cgi $pkgpart $old $new $part_svc $error $dbh );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -52,7 +55,7 @@ use FS::pkg_svc;
 use FS::cust_pkg;
 
 $cgi = new CGI;
-&cgisuidsetup($cgi);
+$dbh = &cgisuidsetup($cgi);
 
 $pkgpart = $cgi->param('pkgpart');
 
@@ -82,6 +85,8 @@ local $SIG{TERM} = 'IGNORE';
 local $SIG{TSTP} = 'IGNORE';
 local $SIG{PIPE} = 'IGNORE';
 
+local $FS::UID::AutoCommit = 0;
+
 if ( $pkgpart ) {
   $error = $new->replace($old);
 } else {
@@ -89,6 +94,7 @@ if ( $pkgpart ) {
   $pkgpart=$new->pkgpart;
 }
 if ( $error ) {
+  $dbh->rollback;
   $cgi->param('error', $error );
   print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
   exit;
@@ -109,14 +115,21 @@ foreach $part_svc (qsearch('part_svc',{})) {
   } );
   if ( $old_pkg_svc ) {
     my $myerror = $new_pkg_svc->replace($old_pkg_svc);
-    die $myerror if $myerror;
+    if ( $myerror ) {
+      $dbh->rollback;
+      die $myerror;
+    }
   } else {
     my $myerror = $new_pkg_svc->insert;
-    die $myerror if $myerror;
+    if ( $myerror ) {
+      $dbh->rollback;
+      die $myerror;
+    }
   }
 }
 
 unless ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
+  $dbh->commit or die $dbh->errstr;
   print $cgi->redirect(popurl(3). "browse/part_pkg.cgi");
 } else {
   my($old_cust_pkg) = qsearchs( 'cust_pkg', { 'pkgnum' => $1 } );
@@ -124,8 +137,12 @@ unless ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
   $hash{'pkgpart'} = $pkgpart;
   my($new_cust_pkg) = new FS::cust_pkg \%hash;
   my $myerror = $new_cust_pkg->replace($old_cust_pkg);
-  die "Error modifying cust_pkg record: $myerror\n" if $myerror;
+  if ( $myerror ) {
+    $dbh->rollback;
+    die "Error modifying cust_pkg record: $myerror\n";
+  }
+
+  $dbh->commit or die $dbh->errstr;
   print $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new_cust_pkg->custnum);
 }
 
-
diff --git a/htdocs/misc/cancel-unaudited.cgi b/htdocs/misc/cancel-unaudited.cgi
index b7eb7fede..319ac5526 100755
--- a/htdocs/misc/cancel-unaudited.cgi
+++ b/htdocs/misc/cancel-unaudited.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cancel-unaudited.cgi,v 1.7 2000-06-15 12:30:37 ivan Exp $
+# $Id: cancel-unaudited.cgi,v 1.8 2001-04-09 23:05:16 ivan Exp $
 #
 # Usage: cancel-unaudited.cgi svcnum
 #        http://server.name/path/cancel-unaudited.cgi pkgnum
@@ -16,7 +16,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cancel-unaudited.cgi,v $
-# Revision 1.7  2000-06-15 12:30:37  ivan
+# Revision 1.8  2001-04-09 23:05:16  ivan
+# Transactions Part I!!!
+#
+# Revision 1.7  2000/06/15 12:30:37  ivan
 # bugfix from Jeff Finucane, thanks!
 #
 # Revision 1.6  1999/02/28 00:03:48  ivan
@@ -37,7 +40,7 @@
 #
 
 use strict;
-use vars qw( $cgi $query $svcnum $svc_acct $cust_svc $error );
+use vars qw( $cgi $query $svcnum $svc_acct $cust_svc $error $dbh );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -47,7 +50,7 @@ use FS::cust_svc;
 use FS::svc_acct;
 
 $cgi = new CGI;
-&cgisuidsetup($cgi);
+$dbh = &cgisuidsetup($cgi);
  
 #untaint svcnum
 ($query) = $cgi->keywords;
@@ -69,13 +72,22 @@ local $SIG{QUIT} = 'IGNORE';
 local $SIG{TERM} = 'IGNORE';
 local $SIG{TSTP} = 'IGNORE';
 
+local $FS::UID::AutoCommit = 0;
+
 $error = $svc_acct->cancel;
-&eidiot($error) if $error;
+&myeidiot($error) if $error;
 $error = $svc_acct->delete;
-&eidiot($error) if $error;
+&myeidiot($error) if $error;
 
 $error = $cust_svc->delete;
-&eidiot($error) if $error;
+&myeidiot($error) if $error;
+
+$dbh->commit or die $dbh->errstr;
 
 print $cgi->redirect(popurl(2));
 
+sub myeidiot {
+  $dbh->rollback;
+  &eidiot(@_);
+}
+
-- 
cgit v1.2.1


From 139cc78c8a30f0e73742a8af65f262b783ea606e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Apr 2001 07:25:51 +0000
Subject: oops, extraneous code causing problems, thanks to Mack for bugreport

---
 fs_sesmon/FS-SessionClient/cgi/login.cgi  | 7 -------
 fs_sesmon/FS-SessionClient/cgi/logout.cgi | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/fs_sesmon/FS-SessionClient/cgi/login.cgi b/fs_sesmon/FS-SessionClient/cgi/login.cgi
index 54ac541c5..0307c5a3d 100644
--- a/fs_sesmon/FS-SessionClient/cgi/login.cgi
+++ b/fs_sesmon/FS-SessionClient/cgi/login.cgi
@@ -103,13 +103,6 @@ sub print_okay {
 END
 }
 
-my $error = login ( {
-  'username' => $username,
-  'portnum'  => $portnum,
-} );
-
-warn $error if $error;
-
 sub usage {
   die "Usage:\n\n  freeside-login username ( portnum | ip | nasnum nasport )";
 }
diff --git a/fs_sesmon/FS-SessionClient/cgi/logout.cgi b/fs_sesmon/FS-SessionClient/cgi/logout.cgi
index f5a57b2e8..95cef98d1 100644
--- a/fs_sesmon/FS-SessionClient/cgi/logout.cgi
+++ b/fs_sesmon/FS-SessionClient/cgi/logout.cgi
@@ -78,13 +78,6 @@ sub print_okay {
 END
 }
 
-my $error = logout ( {
-  'username' => $username,
-  'portnum'  => $portnum,
-} );
-
-warn $error if $error;
-
 sub usage {
   die "Usage:\n\n  freeside-logout username ( portnum | ip | nasnum nasport )";
 }
-- 
cgit v1.2.1


From 7dac9e5e79d089cfb23ab1cf9330473e698b12e8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Apr 2001 09:36:43 +0000
Subject: http://www.sisd.com/freeside/list-archive/msg01450.html

---
 bin/fs-setup | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 2a37fb8d7..b91633bf4 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.34 2001-04-09 23:05:16 ivan Exp $
+# $Id: fs-setup,v 1.35 2001-04-15 09:36:43 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.34  2001-04-09 23:05:16  ivan
+# Revision 1.35  2001-04-15 09:36:43  ivan
+# http://www.sisd.com/freeside/list-archive/msg01450.html
+#
+# Revision 1.34  2001/04/09 23:05:16  ivan
 # Transactions Part I!!!
 #
 # Revision 1.33  2001/02/03 14:03:50  ivan
@@ -570,7 +573,7 @@ sub tables_hash_hack {
     'cust_svc' => {
       'columns' => [
         'svcnum',    'int',    '',   '',
-        'pkgnum',    'int',    '',   '',
+        'pkgnum',    'int',    'NULL',   '',
         'svcpart',   'int',    '',   '',
       ],
       'primary_key' => 'svcnum',
-- 
cgit v1.2.1


From 0bdd3c05c6a3664d7ed9a191ef8ae4ade2162109 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Apr 2001 10:33:40 +0000
Subject: better docs for the worst bit, finally

---
 CREDITS                 |  5 ++++-
 TODO                    | 22 +++++++++++++++++++++-
 htdocs/docs/config.html | 38 ++++++++++++++++++++++++--------------
 3 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/CREDITS b/CREDITS
index fe5ac7fa6..cf98b61d2 100644
--- a/CREDITS
+++ b/CREDITS
@@ -49,7 +49,10 @@ features:
   - Web site virtual host tracking and export to Apache configuration files
 
 Kristian Hoffmann <khoff@pc-intouch.com> contributed Netscape CCK
-autoconfiguration support for the signup server.
+autoconfiguration support for the signup server, lots of great mailing
+lists posts which I shamelessly made into documentation, fixes to get rid of
+the embarassing and non-database-normal "owed" field, and many other things
+I'm forgetting.
 
 Jeff Finucane <jeff@cmh.net> send in a bunch of bugfixes (for the sendmail
 export, cancel-unaudited.cgi), patches to support billing date modification,
diff --git a/TODO b/TODO
index a9b3f64c1..308da8824 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.59 2001-04-09 23:05:15 ivan Exp $
+$Id: TODO,v 1.60 2001-04-15 10:33:40 ivan Exp $
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
@@ -6,6 +6,26 @@ ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
 ---
 
+********
+for 1.3.0: 
+********
+
+move to DBIx::DBSchema.  (gets non-MySQL-specific dbdef-create)
+
+finish transactions (svc_*.pm, fs_register/)
+
+Pg-style or universal-style locking in fs_sessmon FS/FS/nas.pm, or rewrite it
+to use a database expression that won't need it, or just dump the locking
+entirely as nas_heartbeat stuff doesn't need to be accurate; it's just informational.
+
+radius 
+
+test with MySQL+Sleepycat?
+
+********
+unclassified, probably either done already or post-1.3.0
+********
+
 anything doing transactions in the web interface should likely move into *.pm.
 (transactions are here woo!)
 
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index 216668591..db4b95427 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -3,23 +3,33 @@
 </head>
 <body>
   <h1>Configuration files</h1>
-Configuration file layout has changed in 1.2.x.
 <ul>
-  <li>First, the file `/usr/local/etc/freeside/mapsecrets' is read.  Each line
-in this file contains a username and filename, separated by whitespace.  Note
-that these are not local usernames - they are passed from Apache (you _did_
-setup <a href="http://www.apache.org/docs/misc/FAQ.html#user-authentication">
-user authetication</a>, correct?).  Filenames are located in 
-`/usr/local/etc/freeside/'.  The specified filename is parsed exactly
-the same as the pre-1.2.x `secrets' file:
-  <li>Three lines: Database engine datasource (for example,
-  `DBI:mysql:freeside' or `DBI:Pg:dbname=freeside'), username, and password.
-  This file should not be world readable.  See the DBI manpage and the manpage
-  for your DBD for the exact syntax.
+  <li>Create the <b>/usr/local/etc/freeside</b> directory to hold your configuration.
+  <li>Setting up <a href="http://www.apache.org/docs/misc/FAQ.html#user-authentication">Apache user authetication</a> is mandatory.
+  <li>Create the <b>/usr/local/etc/freeside/mapsecrets</b> file, which maps Apache users to a secrets file which contains a DBI data source, username and password.  Every
+line in <b>/usr/local/etc/freeside/mapsecrets</b> should contain a username and
+filename, separated by whitespace.  Note that these are not local usernames -
+they are passed from Apache.  <a href="http://www.apache.org/docs/misc/FAQ.html#user-authentication">
+Apache user authetication</a> is mandatory.  For example, if you had the Apache users admin,
+john, and sam,  
+you mapsecrets file might look like:
+<pre>
+admin secretfile
+john secretfile
+sam secretfile
+</pre>
+  <li>Next, the filename(s) referenced in <b>/usr/local/etc/freeside/mapsecrets</b> file should be created in the <b>/usr/local/etc/freeside/</b> directory.  This file contains three lines: <a href="http://search.cpan.org/doc/TIMB/DBI-1.15/DBI.pm">DBI data source</a> (for example,
+  <tt>DBI:mysql:freeside</tt> or <tt>DBI:Pg:dbname=freeside</tt>), database username, and database password.
+  This file should not be world readable.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.15/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD">manpage for your DBD</a> for the exact syntax of a DBI data source.  For example:
+<pre>
+DBI:Pg:dbname=freeside
+dbusername
+dbpassword
+</pre>
 </ul>
 All further configuration files and directories are located in
-`/usr/local/etc/freeside/conf.<i>datasource</i>', for example, 
-`/usr/local/etc/freeside/conf.DBI:Pg:dbname=freeside'
+<tt>/usr/local/etc/freeside/conf.<i>datasource</i></tt>, for example, 
+<tt>/usr/local/etc/freeside/conf.DBI:Pg:dbname=freeside</tt>
 <ul>
   <li><a name="address">address</a> - This configuration file is no longer used.  See <a href="#invoice_template">invoice_template</a> instead.
   <li><a name="apacheroot">apacheroot</a> - The directory containing Apache virtual hosts
-- 
cgit v1.2.1


From 33bd7f58c5ba0ed1ea60437983921b1d27f9da36 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Apr 2001 11:09:09 +0000
Subject: BURN OFF EVERY GIF

---
 htdocs/images/mid-logo.gif   | Bin 10606 -> 0 bytes
 htdocs/images/mid-logo.png   | Bin 0 -> 9727 bytes
 htdocs/images/small-logo.gif | Bin 5426 -> 0 bytes
 htdocs/images/small-logo.png | Bin 0 -> 4781 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 htdocs/images/mid-logo.gif
 create mode 100644 htdocs/images/mid-logo.png
 delete mode 100644 htdocs/images/small-logo.gif
 create mode 100644 htdocs/images/small-logo.png

diff --git a/htdocs/images/mid-logo.gif b/htdocs/images/mid-logo.gif
deleted file mode 100644
index 4ceb3add5..000000000
Binary files a/htdocs/images/mid-logo.gif and /dev/null differ
diff --git a/htdocs/images/mid-logo.png b/htdocs/images/mid-logo.png
new file mode 100644
index 000000000..d993419cc
Binary files /dev/null and b/htdocs/images/mid-logo.png differ
diff --git a/htdocs/images/small-logo.gif b/htdocs/images/small-logo.gif
deleted file mode 100644
index a8e9c5763..000000000
Binary files a/htdocs/images/small-logo.gif and /dev/null differ
diff --git a/htdocs/images/small-logo.png b/htdocs/images/small-logo.png
new file mode 100644
index 000000000..406a36980
Binary files /dev/null and b/htdocs/images/small-logo.png differ
-- 
cgit v1.2.1


From 622916914e4bc3c41b292fef704bf13e3f5a6fe8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Apr 2001 11:25:21 +0000
Subject: ui nit

---
 htdocs/docs/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/index.html b/htdocs/docs/index.html
index ab2f84c1b..7e3725b61 100644
--- a/htdocs/docs/index.html
+++ b/htdocs/docs/index.html
@@ -1,7 +1,7 @@
 <head>
   <title>Documentation</title>
 </head>
-<body>
+<body bgcolor="#ffffff">
   <h1>Documentation</h1>
 <img src="overview.png">
 <ul>
-- 
cgit v1.2.1


From c4e7e1dc36aff491e6ca2373e5e5b5d6e40aeb30 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Apr 2001 12:35:14 +0000
Subject: documentation updates

---
 htdocs/docs/install.html | 43 +++++++++++++++++++++----------------------
 htdocs/index.html        |  2 +-
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 61eec08d8..16def79e5 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -11,28 +11,27 @@ Before installing, you need:
   <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.  <a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.  (see the <a href="postgresql.html">PostgreSQL notes</a>)  <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>.
   <li>Perl modules (<a href="http://www.perl.com/CPAN/doc/manual/html/lib/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
     <ul>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/Array/">Array-PrintCols</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/Term/">Term-Query</a> (make test broken; install manually)
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/MIME/">MIME-Base64</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/Data">Data-Dumper</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/MD5">Digest-MD5</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/URI">URI</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/HTML">HTML-Parser</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/Net">libnet</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/Locale">Locale-Codes</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/Net">Net-Whois</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/LWP/">libwww-perl</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/Business/">Business-CreditCard</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/Data/">Data-ShowTable</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/Mail/">MailTools</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/Time/">TimeDate</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/Date/">DateManip</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/File/">File-CounterFile</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/FreezeThaw/">FreezeThaw</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/String/">String-Approx</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/Text/">Text-Template</a>
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/DBI/">DBI
-      <li><a href="http://www.perl.com/CPAN/modules/by-module/DBD/">DBD for your database engine</a>
+      <li><a href="http://search.cpan.org/search?dist=Array-PrintCols">Array-PrintCols</a>
+      <li><a href="http://search.cpan.org/search?dist=Term-Query">Term-Query</a> (make test broken; install manually)
+      <li><a href="http://search.cpan.org/search?dist=MIME-Base64">MIME-Base64</a>
+      <li><a href="http://search.cpan.org/search?dist=Digest-MD5">Digest-MD5</a>
+      <li><a href="http://search.cpan.org/search?dist=URI">URI</a>
+      <li><a href="http://search.cpan.org/search?dist=HTML-Parser">HTML-Parser</a>
+      <li><a href="http://search.cpan.org/search?dist=libnet">libnet</a>
+      <li><a href="http://search.cpan.org/search?dist=Locale-Codes">Locale-Codes</a>
+      <li><a href="http://search.cpan.org/search?dist=Net-Whois">Net-Whois</a>
+      <li><a href="http://search.cpan.org/search?dist=libwww-perl">libwww-perl</a>
+      <li><a href="http://search.cpan.org/search?dist=Business-CreditCard">Business-CreditCard</a>
+      <li><a href="http://search.cpan.org/search?dist=Data-ShowTable">Data-ShowTable</a>
+      <li><a href="http://search.cpan.org/search?dist=MailTools">MailTools</a>
+      <li><a href="http://search.cpan.org/search?dist=TimeDate">TimeDate</a>
+      <li><a href="http://search.cpan.org/search?dist=DateManip">DateManip</a>
+      <li><a href="http://search.cpan.org/search?dist=File-CounterFile">File-CounterFile</a>
+      <li><a href="http://search.cpan.org/search?dist=FreezeThaw">FreezeThaw</a>
+      <li><a href="http://search.cpan.org/search?dist=String-Approx">String-Approx</a>
+      <li><a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>
+      <li><a href="http://search.cpan.org/search?dist=DBI">DBI
+      <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a>
     </ul>
 </ul>
 Install the Freeside distribution:
diff --git a/htdocs/index.html b/htdocs/index.html
index 75c301f75..bee44a2f7 100755
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -8,7 +8,7 @@
   <table>
     <tr><td>
     <P ALIGN=CENTER>
-        <IMG BORDER=0 ALT="Silicon Interactive Software Design" SRC="images/small-logo.gif">
+        <IMG BORDER=0 ALT="Silicon Interactive Software Design" SRC="images/small-logo.png">
     </td><td>
       <center><font color="#ff0000" size=7>freeside main menu</font></center>
     </td></tr>
-- 
cgit v1.2.1


From 3b817663a3667edaf8d2130c3a8d0fe38e5f2fa0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Apr 2001 12:53:58 +0000
Subject: update urls

---
 htdocs/docs/install.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 16def79e5..4bc43358f 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -7,9 +7,9 @@ Before installing, you need:
 <ul>
   <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
   <li><a href="http://www.openssh.com//">SSH</a>
-  <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
+  <li><a href="http://www.perl.com/">Perl</a>  Don't enable experimental features like threads or the PerlIO abstraction layer.
   <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.  <a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.  (see the <a href="postgresql.html">PostgreSQL notes</a>)  <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>.
-  <li>Perl modules (<a href="http://www.perl.com/CPAN/doc/manual/html/lib/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
+  <li>Perl modules (<a href="http://theoryx5.uwinnipeg.ca/CPAN/perl/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
     <ul>
       <li><a href="http://search.cpan.org/search?dist=Array-PrintCols">Array-PrintCols</a>
       <li><a href="http://search.cpan.org/search?dist=Term-Query">Term-Query</a> (make test broken; install manually)
-- 
cgit v1.2.1


From 018f6678557506e68cc6b8643862143cc332f7da Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Apr 2001 12:56:31 +0000
Subject: s/dbdef/DBIx::DBSchema/

---
 FS/FS/Record.pm         |  26 +++---
 FS/FS/dbdef.pm          | 140 -----------------------------
 FS/FS/dbdef_colgroup.pm |  95 --------------------
 FS/FS/dbdef_column.pm   | 174 -----------------------------------
 FS/FS/dbdef_index.pm    |  35 --------
 FS/FS/dbdef_table.pm    | 235 ------------------------------------------------
 FS/FS/dbdef_unique.pm   |  36 --------
 TODO                    |   4 +-
 bin/dbdef-create        |  76 ++--------------
 bin/fs-setup            |  54 ++++++-----
 10 files changed, 47 insertions(+), 828 deletions(-)
 delete mode 100644 FS/FS/dbdef.pm
 delete mode 100644 FS/FS/dbdef_colgroup.pm
 delete mode 100644 FS/FS/dbdef_column.pm
 delete mode 100644 FS/FS/dbdef_index.pm
 delete mode 100644 FS/FS/dbdef_table.pm
 delete mode 100644 FS/FS/dbdef_unique.pm

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index b5f33e12b..113e1a18d 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -6,8 +6,8 @@ use subs qw(reload_dbdef);
 use Exporter;
 use Carp qw(carp cluck croak confess);
 use File::CounterFile;
+use DBIx::DBSchema;
 use FS::UID qw(dbh checkruid swapuid getotaker datasrc driver_name);
-use FS::dbdef;
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(dbh fields hfields qsearch qsearchs dbdef);
@@ -126,7 +126,7 @@ sub new {
     $hashref->{$field}='' unless defined $hashref->{$field};
     #trim the '$' and ',' from money fields for Pg (belong HERE?)
     #(what about Pg i18n?)
-    if ( driver_name eq 'Pg' 
+    if ( driver_name =~ /^Pg$/i
          && $self->dbdef_table->column($field)->type eq 'money' ) {
       ${$hashref}{$field} =~ s/^\$//;
       ${$hashref}{$field} =~ s/\,//;
@@ -178,7 +178,7 @@ sub qsearch {
   if ( @fields ) {
     $statement .= ' WHERE '. join(' AND ', map {
       if ( ! defined( $record->{$_} ) || $record->{$_} eq '' ) {
-        if ( driver_name eq 'Pg' ) {
+        if ( driver_name =~ /^Pg$/i ) {
           "$_ IS NULL";
         } else {
           qq-( $_ IS NULL OR $_ = "" )-;
@@ -419,7 +419,7 @@ sub delete {
     map {
       $self->getfield($_) eq ''
         #? "( $_ IS NULL OR $_ = \"\" )"
-        ? ( driver_name eq 'Pg' 
+        ? ( driver_name =~ /^Pg$/i
               ? "$_ IS NULL"
               : "( $_ IS NULL OR $_ = \"\" )"
           )
@@ -492,7 +492,7 @@ sub replace {
       map {
         $old->getfield($_) eq ''
           #? "( $_ IS NULL OR $_ = \"\" )"
-          ? ( driver_name eq 'Pg' 
+          ? ( driver_name =~ /^Pg$/i
                 ? "$_ IS NULL"
                 : "( $_ IS NULL OR $_ = \"\" )"
             )
@@ -541,7 +541,7 @@ sub check {
 =item unique COLUMN
 
 Replaces COLUMN in record with a unique number.  Called by the B<add> method
-on primary keys and single-field unique columns (see L<FS::dbdef_table>).
+on primary keys and single-field unique columns (see L<DBIx::DBSchema::Table>).
 Returns the new value.
 
 =cut
@@ -805,7 +805,7 @@ sub ut_anything {
 
 This can be used as both a subroutine and a method call.  It returns a list
 of the columns in this record's table, or an explicitly specified table.
-(See L<FS::dbdef_table>).
+(See L<DBIx::DBSchema::Table>).
 
 =cut
 
@@ -831,15 +831,15 @@ sub fields {
 
 =item reload_dbdef([FILENAME])
 
-Load a database definition (see L<FS::dbdef>), optionally from a non-default
-filename.  This command is executed at startup unless
-I<$FS::Record::setup_hack> is true.  Returns a FS::dbdef object.
+Load a database definition (see L<DBIx::DBSchema>), optionally from a
+non-default filename.  This command is executed at startup unless
+I<$FS::Record::setup_hack> is true.  Returns a DBIx::DBSchema object.
 
 =cut
 
 sub reload_dbdef {
   my $file = shift || $dbdef_file;
-  $dbdef = load FS::dbdef ($file);
+  $dbdef = load DBIx::DBSchema $file;
 }
 
 =item dbdef
@@ -913,7 +913,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.13 2001-02-20 16:31:06 ivan Exp $
+$Id: Record.pm,v 1.14 2001-04-15 12:56:30 ivan Exp $
 
 =head1 BUGS
 
@@ -958,7 +958,7 @@ be fixed.  (only affects RDBMS which return uppercase column names)
 
 =head1 SEE ALSO
 
-L<FS::dbdef>, L<FS::UID>, L<DBI>
+L<DBIx::DBSchema>, L<FS::UID>, L<DBI>
 
 Adapter::DBI from Ch. 11 of Advanced Perl Programming by Sriram Srinivasan.
 
diff --git a/FS/FS/dbdef.pm b/FS/FS/dbdef.pm
deleted file mode 100644
index b737fd53a..000000000
--- a/FS/FS/dbdef.pm
+++ /dev/null
@@ -1,140 +0,0 @@
-package FS::dbdef;
-
-use strict;
-use vars qw(@ISA);
-use Exporter;
-use Carp;
-use FreezeThaw qw(freeze thaw cmpStr);
-use FS::dbdef_table;
-use FS::dbdef_unique;
-use FS::dbdef_index;
-use FS::dbdef_column;
-
-@ISA = qw(Exporter);
-
-=head1 NAME
-
-FS::dbdef - Database objects
-
-=head1 SYNOPSIS
-
-  use FS::dbdef;
-
-  $dbdef = new FS::dbdef (@dbdef_table_objects);
-  $dbdef = load FS::dbdef "filename";
-
-  $dbdef->save("filename");
-
-  $dbdef->addtable($dbdef_table_object);
-
-  @table_names = $dbdef->tables;
-
-  $FS_dbdef_table_object = $dbdef->table;
-
-=head1 DESCRIPTION
-
-FS::dbdef objects are collections of FS::dbdef_table objects and represnt
-a database (a collection of tables).
-
-=head1 METHODS
-
-=over 4
-
-=item new TABLE, TABLE, ...
-
-Creates a new FS::dbdef object
-
-=cut
-
-sub new {
-  my($proto,@tables)=@_;
-  my(%tables)=map  { $_->name, $_ } @tables; #check for duplicates?
-
-  my($class) = ref($proto) || $proto;
-  my($self) = {
-    'tables' => \%tables,
-  };
-
-  bless ($self, $class);
-
-}
-
-=item load FILENAME
-
-Loads an FS::dbdef object from a file.
-
-=cut
-
-sub load {
-  my($proto,$file)=@_; #use $proto ?
-  open(FILE,"<$file") or die "Can't open $file: $!";
-  my($string)=join('',<FILE>); #can $string have newlines?  pry not?
-  close FILE or die "Can't close $file: $!";
-  my($self)=thaw $string;
-  #no bless needed?
-  $self;
-}
-
-=item save FILENAME
-
-Saves an FS::dbdef object to a file.
-
-=cut
-
-sub save {
-  my($self,$file)=@_;
-  my($string)=freeze $self;
-  open(FILE,">$file") or die "Can't open $file: $!";
-  print FILE $string;
-  close FILE or die "Can't close file: $!";
-  my($check_self)=thaw $string;
-  die "Verify error: Can't freeze and thaw dbdef $self"
-    if (cmpStr($self,$check_self));
-}
-
-=item addtable TABLE
-
-Adds this FS::dbdef_table object.
-
-=cut
-
-sub addtable {
-  my($self,$table)=@_;
-  ${$self->{'tables'}}{$table->name}=$table; #check for dupliates?
-}
-
-=item tables 
-
-Returns the names of all tables.
-
-=cut
-
-sub tables {
-  my($self)=@_;
-  keys %{$self->{'tables'}};
-}
-
-=item table TABLENAME
-
-Returns the named FS::dbdef_table object.
-
-=cut
-
-sub table {
-  my($self,$table)=@_;
-  $self->{'tables'}->{$table};
-}
-
-=head1 BUGS
-
-Each FS::dbdef object should have a name which corresponds to its name within
-the SQL database engine.
-
-=head1 SEE ALSO
-
-L<FS::dbdef_table>, L<FS::Record>,
-
-=cut
-
-1;
-
diff --git a/FS/FS/dbdef_colgroup.pm b/FS/FS/dbdef_colgroup.pm
deleted file mode 100644
index c25b07ada..000000000
--- a/FS/FS/dbdef_colgroup.pm
+++ /dev/null
@@ -1,95 +0,0 @@
-package FS::dbdef_colgroup;
-
-use strict;
-use vars qw(@ISA);
-use Exporter;
-
-@ISA = qw(Exporter);
-
-=head1 NAME
-
-FS::dbdef_colgroup - Column group objects
-
-=head1 SYNOPSIS
-
-  use FS::dbdef_colgroup;
-
-  $colgroup = new FS::dbdef_colgroup ( $lol );
-  $colgroup = new FS::dbdef_colgroup (
-    [
-      [ 'single_column' ],
-      [ 'multiple_columns', 'another_column', ],
-    ]
-  );
-
-  @sql_lists = $colgroup->sql_list;
-
-  @singles = $colgroup->singles;
-
-=head1 DESCRIPTION
-
-FS::dbdef_colgroup objects represent sets of sets of columns.
-
-=head1 METHODS
-
-=over 4
-
-=item new
-
-Creates a new FS::dbdef_colgroup object.
-
-=cut
-
-sub new {
-  my($proto, $lol) = @_;
-
-  my $class = ref($proto) || $proto;
-  my $self = {
-    'lol' => $lol,
-  };
-
-  bless ($self, $class);
-
-}
-
-=item sql_list
-
-Returns a flat list of comma-separated values, for SQL statements.
-
-=cut
-
-sub sql_list { #returns a flat list of comman-separates lists (for sql)
-  my($self)=@_;
-   grep $_ ne '', map join(', ', @{$_}), @{$self->{'lol'}};
-}
-
-=item singles
-
-Returns a flat list of all single item lists.
-
-=cut
-
-sub singles { #returns single-field groups as a flat list
-  my($self)=@_;
-  #map ${$_}[0], grep scalar(@{$_}) == 1, @{$self->{'lol'}};
-  map { 
-    ${$_}[0] =~ /^(\w+)$/
-      #aah!
-      or die "Illegal column ", ${$_}[0], " in colgroup!";
-    $1;
-  } grep scalar(@{$_}) == 1, @{$self->{'lol'}};
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::dbdef_table>, L<FS::dbdef_unique>, L<FS::dbdef_index>,
-L<FS::dbdef_column>, L<FS::dbdef>, L<perldsc>
-
-=cut
-
-1;
-
diff --git a/FS/FS/dbdef_column.pm b/FS/FS/dbdef_column.pm
deleted file mode 100644
index e784e8495..000000000
--- a/FS/FS/dbdef_column.pm
+++ /dev/null
@@ -1,174 +0,0 @@
-package FS::dbdef_column;
-
-use strict;
-#use Carp;
-use Exporter;
-use vars qw(@ISA);
-
-@ISA = qw(Exporter);
-
-=head1 NAME
-
-FS::dbdef_column - Column object
-
-=head1 SYNOPSIS
-
-  use FS::dbdef_column;
-
-  $column_object = new FS::dbdef_column ( $name, $sql_type, '' );
-  $column_object = new FS::dbdef_column ( $name, $sql_type, 'NULL' );
-  $column_object = new FS::dbdef_column ( $name, $sql_type, '', $length );
-  $column_object = new FS::dbdef_column ( $name, $sql_type, 'NULL', $length );
-
-  $name = $column_object->name;
-  $column_object->name ( 'name' );
-
-  $name = $column_object->type;
-  $column_object->name ( 'sql_type' );
-
-  $name = $column_object->null;
-  $column_object->name ( 'NOT NULL' );
-
-  $name = $column_object->length;
-  $column_object->name ( $length );
-
-  $sql_line = $column->line;
-  $sql_line = $column->line $datasrc;
-
-=head1 DESCRIPTION
-
-FS::dbdef::column objects represend columns in tables (see L<FS::dbdef_table>).
-
-=head1 METHODS
-
-=over 4
-
-=item new
-
-Creates a new FS::dbdef_column object.
-
-=cut
-
-sub new {
-  my($proto,$name,$type,$null,$length)=@_;
-
-  #croak "Illegal name: $name" if grep $name eq $_, @reserved_words;
-
-  $null =~ s/^NOT NULL$//i;
-
-  my $class = ref($proto) || $proto;
-  my $self = {
-    'name'   => $name,
-    'type'   => $type,
-    'null'   => $null,
-    'length' => $length,
-  };
-
-  bless ($self, $class);
-
-}
-
-=item name
-
-Returns or sets the column name.
-
-=cut
-
-sub name {
-  my($self,$value)=@_;
-  if ( defined($value) ) {
-  #croak "Illegal name: $name" if grep $name eq $_, @reserved_words;
-    $self->{'name'} = $value;
-  } else {
-    $self->{'name'};
-  }
-}
-
-=item type
-
-Returns or sets the column type.
-
-=cut
-
-sub type {
-  my($self,$value)=@_;
-  if ( defined($value) ) {
-    $self->{'type'} = $value;
-  } else {
-    $self->{'type'};
-  }
-}
-
-=item null
-
-Returns or sets the column null flag.
-
-=cut
-
-sub null {
-  my($self,$value)=@_;
-  if ( defined($value) ) {
-    $value =~ s/^NOT NULL$//i;
-    $self->{'null'} = $value;
-  } else {
-    $self->{'null'};
-  }
-}
-
-=item type
-
-Returns or sets the column length.
-
-=cut
-
-sub length {
-  my($self,$value)=@_;
-  if ( defined($value) ) {
-    $self->{'length'} = $value;
-  } else {
-    $self->{'length'};
-  }
-}
-
-=item line [ $datasrc ]
-
-Returns an SQL column definition.
-
-If passed a DBI $datasrc specifying L<DBD::mysql> or L<DBD::Pg>, will use
-engine-specific syntax.
-
-=cut
-
-sub line {
-  my($self,$datasrc)=@_;
-  my($null)=$self->null;
-  if ( $datasrc =~ /mysql/ ) { #yucky mysql hack
-    $null ||= "NOT NULL"
-  }
-  if ( $datasrc =~ /Pg/ ) { #yucky Pg hack
-    $null ||= "NOT NULL";
-    $null =~ s/^NULL$//;
-  }
-  join(' ',
-    $self->name,
-    $self->type. ( $self->length ? '('.$self->length.')' : '' ),
-    $null,
-  );
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::dbdef_table>, L<FS::dbdef>, L<DBI>
-
-=head1 VERSION
-
-$Id: dbdef_column.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
-
-=cut
-
-1;
-
diff --git a/FS/FS/dbdef_index.pm b/FS/FS/dbdef_index.pm
deleted file mode 100644
index 49bf51dd9..000000000
--- a/FS/FS/dbdef_index.pm
+++ /dev/null
@@ -1,35 +0,0 @@
-package FS::dbdef_index;
-
-use strict;
-use vars qw(@ISA);
-use FS::dbdef_colgroup;
-
-@ISA=qw(FS::dbdef_colgroup);
-
-=head1 NAME
-
-FS::dbdef_unique.pm - Index object
-
-=head1 SYNOPSIS
-
-  use FS::dbdef_index;
-
-    # see FS::dbdef_colgroup methods
-
-=head1 DESCRIPTION
-
-FS::dbdef_unique objects represent the (non-unique) indices of a table
-(L<FS::dbdef_table>).  FS::dbdef_unique inherits from FS::dbdef_colgroup.
-
-=head1 BUGS
-
-Is this empty subclass needed?
-
-=head1 SEE ALSO
-
-L<FS::dbdef_colgroup>, L<FS::dbdef_record>, L<FS::Record>
-
-=cut
-
-1;
-
diff --git a/FS/FS/dbdef_table.pm b/FS/FS/dbdef_table.pm
deleted file mode 100644
index 4b6d6619a..000000000
--- a/FS/FS/dbdef_table.pm
+++ /dev/null
@@ -1,235 +0,0 @@
-package FS::dbdef_table;
-
-use strict;
-#use Carp;
-use Exporter;
-use vars qw(@ISA);
-use FS::dbdef_column;
-
-@ISA = qw(Exporter);
-
-=head1 NAME
-
-FS::dbdef_table - Table objects
-
-=head1 SYNOPSIS
-
-  use FS::dbdef_table;
-
-  $dbdef_table = new FS::dbdef_table (
-    "table_name",
-    "primary_key",
-    $FS_dbdef_unique_object,
-    $FS_dbdef_index_object,
-    @FS_dbdef_column_objects,
-  );
-
-  $dbdef_table->addcolumn ( $FS_dbdef_column_object );
-
-  $table_name = $dbdef_table->name;
-  $dbdef_table->name ("table_name");
-
-  $table_name = $dbdef_table->primary_keye;
-  $dbdef_table->primary_key ("primary_key");
-
-  $FS_dbdef_unique_object = $dbdef_table->unique;
-  $dbdef_table->unique ( $FS_dbdef_unique_object );
-
-  $FS_dbdef_index_object = $dbdef_table->index;
-  $dbdef_table->index ( $FS_dbdef_index_object );
-
-  @column_names = $dbdef->columns;
-
-  $FS_dbdef_column_object = $dbdef->column;
-
-  @sql_statements = $dbdef->sql_create_table;
-  @sql_statements = $dbdef->sql_create_table $datasrc;
-
-=head1 DESCRIPTION
-
-FS::dbdef_table objects represent a single database table.
-
-=head1 METHODS
-
-=over 4
-
-=item new
-
-Creates a new FS::dbdef_table object.
-
-=cut
-
-sub new {
-  my($proto,$name,$primary_key,$unique,$index,@columns)=@_;
-
-  my(%columns) = map { $_->name, $_ } @columns;
-
-  #check $primary_key, $unique and $index to make sure they are $columns ?
-  # (and sanity check?)
-
-  my $class = ref($proto) || $proto;
-  my $self = {
-    'name'        => $name,
-    'primary_key' => $primary_key,
-    'unique'      => $unique,
-    'index'       => $index,
-    'columns'     => \%columns,
-  };
-
-  bless ($self, $class);
-
-}
-
-=item addcolumn
-
-Adds this FS::dbdef_column object. 
-
-=cut
-
-sub addcolumn {
-  my($self,$column)=@_;
-  ${$self->{'columns'}}{$column->name}=$column; #sanity check?
-}
-
-=item name
-
-Returns or sets the table name.
-
-=cut
-
-sub name {
-  my($self,$value)=@_;
-  if ( defined($value) ) {
-    $self->{name} = $value;
-  } else {
-    $self->{name};
-  }
-}
-
-=item primary_key
-
-Returns or sets the primary key.
-
-=cut
-
-sub primary_key {
-  my($self,$value)=@_;
-  if ( defined($value) ) {
-    $self->{primary_key} = $value;
-  } else {
-    #$self->{primary_key};
-    #hmm.  maybe should untaint the entire structure when it comes off disk 
-    # cause if you don't trust that, ?
-    $self->{primary_key} =~ /^(\w*)$/ 
-      #aah!
-      or die "Illegal primary key ", $self->{primary_key}, " in dbdef!\n";
-    $1;
-  }
-}
-
-=item unique
-
-Returns or sets the FS::dbdef_unique object.
-
-=cut
-
-sub unique { 
-  my($self,$value)=@_;
-  if ( defined($value) ) {
-    $self->{unique} = $value;
-  } else {
-    $self->{unique};
-  }
-}
-
-=item index
-
-Returns or sets the FS::dbdef_index object.
-
-=cut
-
-sub index { 
-  my($self,$value)=@_;
-  if ( defined($value) ) {
-    $self->{'index'} = $value;
-  } else {
-    $self->{'index'};
-  }
-}
-
-=item columns
-
-Returns a list consisting of the names of all columns.
-
-=cut
-
-sub columns {
-  my($self)=@_;
-  keys %{$self->{'columns'}};
-}
-
-=item column "column"
-
-Returns the column object (see L<FS::dbdef_column>) for "column".
-
-=cut
-
-sub column {
-  my($self,$column)=@_;
-  $self->{'columns'}->{$column};
-}
-
-=item sql_create_table [ $datasrc ]
-
-Returns an array of SQL statments to create this table.
-
-If passed a DBI $datasrc specifying L<DBD::mysql>, will use MySQL-specific
-syntax.  Non-standard syntax for other engines (if applicable) may also be
-supported in the future.
-
-=cut
-
-sub sql_create_table { 
-  my($self,$datasrc)=@_;
-
-  my(@columns)=map { $self->column($_)->line($datasrc) } $self->columns;
-  push @columns, "PRIMARY KEY (". $self->primary_key. ")"
-    if $self->primary_key;
-  if ( $datasrc =~ /mysql/ ) { #yucky mysql hack
-    push @columns, map "UNIQUE ($_)", $self->unique->sql_list;
-    push @columns, map "INDEX ($_)", $self->index->sql_list;
-  }
-
-  "CREATE TABLE ". $self->name. " ( ". join(", ", @columns). " )",
-  ( map {
-    my($index) = $self->name. "__". $_ . "_index";
-    $index =~ s/,\s*/_/g;
-    "CREATE UNIQUE INDEX $index ON ". $self->name. " ($_)"
-  } $self->unique->sql_list ),
-  ( map {
-    my($index) = $self->name. "__". $_ . "_index";
-    $index =~ s/,\s*/_/g;
-    "CREATE INDEX $index ON ". $self->name. " ($_)"
-  } $self->index->sql_list ),
-  ;  
-
-
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::dbdef>, L<FS::dbdef_unique>, L<FS::dbdef_index>, L<FS::dbdef_unique>,
-L<DBI>
-
-=head1 VERSION
-
-$Id: dbdef_table.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
-
-=cut
-
-1;
-
diff --git a/FS/FS/dbdef_unique.pm b/FS/FS/dbdef_unique.pm
deleted file mode 100644
index fa28d585d..000000000
--- a/FS/FS/dbdef_unique.pm
+++ /dev/null
@@ -1,36 +0,0 @@
-package FS::dbdef_unique;
-
-use strict;
-use vars qw(@ISA);
-use FS::dbdef_colgroup;
-
-@ISA=qw(FS::dbdef_colgroup);
-
-=head1 NAME
-
-FS::dbdef_unique.pm - Unique object
-
-=head1 SYNOPSIS
-
-  use FS::dbdef_unique;
-
-  # see FS::dbdef_colgroup methods
-
-=head1 DESCRIPTION
-
-FS::dbdef_unique objects represent the unique indices of a database table
-(L<FS::dbdef_table>).  FS::dbdef_unique inherits from FS::dbdef_colgroup.
-
-=head1 BUGS
-
-Is this empty subclass needed?
-
-=head1 SEE ALSO
-
-L<FS::dbdef_colgroup>, L<FS::dbdef_record>, L<FS::Record>
-
-=cut
-
-1;
-
-
diff --git a/TODO b/TODO
index 308da8824..d0276531c 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.60 2001-04-15 10:33:40 ivan Exp $
+$Id: TODO,v 1.61 2001-04-15 12:56:30 ivan Exp $
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
@@ -10,8 +10,6 @@ ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 for 1.3.0: 
 ********
 
-move to DBIx::DBSchema.  (gets non-MySQL-specific dbdef-create)
-
 finish transactions (svc_*.pm, fs_register/)
 
 Pg-style or universal-style locking in fs_sessmon FS/FS/nas.pm, or rewrite it
diff --git a/bin/dbdef-create b/bin/dbdef-create
index fe7475bec..902f7f145 100755
--- a/bin/dbdef-create
+++ b/bin/dbdef-create
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: dbdef-create,v 1.2 1998-11-19 11:17:44 ivan Exp $
+# $Id: dbdef-create,v 1.3 2001-04-15 12:56:31 ivan Exp $
 #
 # create dbdef file for existing mySQL database (needs SHOW|DESCRIBE command
 # not in Pg) based on fs-setup
@@ -8,14 +8,17 @@
 # ivan@sisd.com 98-jun-2
 #
 # $Log: dbdef-create,v $
-# Revision 1.2  1998-11-19 11:17:44  ivan
+# Revision 1.3  2001-04-15 12:56:31  ivan
+# s/dbdef/DBIx::DBSchema/
+#
+# Revision 1.2  1998/11/19 11:17:44  ivan
 # adminsuidsetup requires argument
 #
 
 use strict;
 use DBI;
-use FS::dbdef;
-use FS::UID qw(adminsuidsetup datasrc);
+use DBIx::DBSchema;
+use FS::UID qw(adminsuidsetup datasrc driver_name);
 
 my $user = shift or die &usage;
 
@@ -24,70 +27,7 @@ my($dbh)=adminsuidsetup $user;
 #needs to match FS::Record
 my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;
 
-my($tables_sth)=$dbh->prepare("SHOW TABLES");
-my($tables_rv)=$tables_sth->execute;
-
-my(@tables);
-foreach ( @{$tables_sth->fetchall_arrayref} ) {
-  my($table)=${$_}[0]; 
-  #print "TABLE\t$table\n";
-
-  my($index_sth)=$dbh->prepare("SHOW INDEX FROM $table");
-  my($primary_key)='';
-  my(%index,%unique);
-  for ( 1 .. $index_sth->execute ) {
-    my($row)=$index_sth->fetchrow_hashref;
-    if ( ${$row}{'Key_name'} eq "PRIMARY" ) {
-      $primary_key=${$row}{'Column_name'};
-      next;
-    }
-    if ( ${$row}{'Non_unique'} ) { #index
-      push @{$index{${$row}{'Key_name'}}}, ${$row}{'Column_name'};
-    } else { #unique
-      push @{$unique{${$row}{'Key_name'}}}, ${$row}{'Column_name'};
-    }
-  }
-
-  my(@index)=values %index;
-  my(@unique)=values %unique;
-  #print "\tPRIMARY KEY $primary_key\n";
-  foreach (@index) {
-    #print "\tINDEX\t", join(', ', @{$_}), "\n";
-  }
-  foreach (@unique) {
-    #print "\tUNIQUE\t", join(', ', @{$_}), "\n";
-  }
-
-  my($columns_sth)=$dbh->prepare("SHOW COLUMNS FROM $table");
-  my(@columns);
-  for ( 1 .. $columns_sth->execute ) {
-    my($row)=$columns_sth->fetchrow_hashref;
-    #print "\t", ${$row}{'Field'}, "\n";
-    ${$row}{'Type'} =~ /^(\w+)\(?([\d\,]+)?\)?( unsigned)?$/
-      or die "Illegal type ${$row}{'Type'}\n";
-    my($type,$length)=($1,$2);
-    my($null)=${$row}{'Null'};
-    $null =~ s/YES/NULL/;
-    push @columns, new FS::dbdef_column (
-      ${$row}{'Field'},
-      $type,
-      $null,
-      $length,
-    );
-  }
-
-  #print "\n";
-  push @tables, new FS::dbdef_table (
-    $table,
-    $primary_key,
-    new FS::dbdef_unique (\@unique),
-    new FS::dbdef_index (\@index),
-    @columns,
-  );
-
-}
-
-my($dbdef) = new FS::dbdef ( @tables );
+my $dbdef = new_native DBIx::DBSchema $dbh;
 
 #important
 $dbdef->save($dbdef_file);
diff --git a/bin/fs-setup b/bin/fs-setup
index b91633bf4..545c6a4df 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.35 2001-04-15 09:36:43 ivan Exp $
+# $Id: fs-setup,v 1.36 2001-04-15 12:56:31 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.35  2001-04-15 09:36:43  ivan
+# Revision 1.36  2001-04-15 12:56:31  ivan
+# s/dbdef/DBIx::DBSchema/
+#
+# Revision 1.35  2001/04/15 09:36:43  ivan
 # http://www.sisd.com/freeside/list-archive/msg01450.html
 #
 # Revision 1.34  2001/04/09 23:05:16  ivan
@@ -135,7 +138,11 @@ BEGIN { $FS::Record::setup_hack = 1; }
 
 use strict;
 use DBI;
-use FS::dbdef;
+use DBIx::DBSchema;
+use DBIx::DBSchema::Table;
+use DBIx::DBSchema::Column;
+use DBIx::DBSchema::ColGroup::Unique;
+use DBIx::DBSchema::ColGroup::Index;
 use FS::UID qw(adminsuidsetup datasrc checkeuid getsecrets);
 use FS::Record;
 use FS::cust_main_county;
@@ -189,19 +196,17 @@ my @money_type = ( 'decimal',   '', '10,2' );
 my(%tables)=&tables_hash_hack;
 
 #turn it into objects
-my($dbdef) = new FS::dbdef ( map {  
+my($dbdef) = new DBIx::DBSchema ( map {  
   my(@columns);
   while (@{$tables{$_}{'columns'}}) {
     my($name,$type,$null,$length)=splice @{$tables{$_}{'columns'}}, 0, 4;
-    push @columns, new FS::dbdef_column ( $name,$type,$null,$length );
+    push @columns, new DBIx::DBSchema::Column ( $name,$type,$null,$length );
   }
-  FS::dbdef_table->new(
+  DBIx::DBSchema::Table->new(
     $_,
     $tables{$_}{'primary_key'},
-    #FS::dbdef_unique->new(@{$tables{$_}{'unique'}}),
-    #FS::dbdef_index->new(@{$tables{$_}{'index'}}),
-    FS::dbdef_unique->new($tables{$_}{'unique'}),
-    FS::dbdef_index->new($tables{$_}{'index'}),
+    DBIx::DBSchema::ColGroup::Unique->new($tables{$_}{'unique'}),
+    DBIx::DBSchema::ColGroup::Index->new($tables{$_}{'index'}),
     @columns,
   );
 } (keys %tables) );
@@ -212,7 +217,7 @@ my($svc_acct)=$dbdef->table('svc_acct');
 
 my($attribute);
 foreach $attribute (@attributes) {
-  $svc_acct->addcolumn ( new FS::dbdef_column (
+  $svc_acct->addcolumn ( new DBIx::DBSchema::Column (
     'radius_'. $attribute,
     'varchar',
     'NULL',
@@ -221,7 +226,7 @@ foreach $attribute (@attributes) {
 }
 
 foreach $attribute (@check_attributes) {
-  $svc_acct->addcolumn( new FS::dbdef_column (
+  $svc_acct->addcolumn( new DBIx::DBSchema::Column (
     'rc_'. $attribute,
     'varchar',
     'NULL',
@@ -241,13 +246,13 @@ foreach (qw(svc_acct svc_acct_sm svc_domain svc_www)) {
   my($col);
   foreach $col ( $table->columns ) {
     next if $col =~ /^svcnum$/;
-    $part_svc->addcolumn( new FS::dbdef_column (
+    $part_svc->addcolumn( new DBIx::DBSchema::Column (
       $table->name. '__' . $table->column($col)->name,
       'varchar', #$table->column($col)->type, 
       'NULL',
       $char_d, #$table->column($col)->length,
     ));
-    $part_svc->addcolumn ( new FS::dbdef_column (
+    $part_svc->addcolumn ( new DBIx::DBSchema::Column (
       $table->name. '__'. $table->column($col)->name . "_flag",
       'char',
       'NULL',
@@ -269,21 +274,10 @@ my($dbh)=adminsuidsetup $user;
 #create tables
 $|=1;
 
-my($table);
-foreach  ($dbdef->tables) {
-  my($table)=$dbdef->table($_);
-  print "Creating $_...";
-
-  my($statement);
-
-  #create table
-  foreach $statement ($table->sql_create_table(datasrc)) {
-    #print $statement, "\n"; 
-    $dbh->do( $statement )
-      or die "CREATE error: ",$dbh->errstr, "\ndoing statement: $statement";
-  }
-
-  print "\n";
+my @sql = $dbdef->sql($dbh);
+foreach my $statement ( $dbdef->sql($dbh) ) {
+  $dbh->do( $statement )
+    or die "CREATE error: ",$dbh->errstr, "\ndoing statement: $statement";
 }
 
 #not really sample data (and shouldn't default to US)
@@ -344,6 +338,8 @@ YE YU ZR ZM ZW
 
 $dbh->disconnect or die $dbh->errstr;
 
+print "Freeside database initialized sucessfully\n";
+
 sub usage {
   die "Usage:\n  fs-setup user\n"; 
 }
-- 
cgit v1.2.1


From fb13e429f8499f6eadad09c1452489ca0f4f7031 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Apr 2001 13:35:12 +0000
Subject: transactions part deux

---
 FS/FS/nas.pm        | 23 ++++++-----------------
 FS/FS/session.pm    |  4 +---
 FS/FS/svc_Common.pm | 15 ++++++++++++---
 FS/FS/svc_domain.pm | 41 ++++++++++++++++++++++++++++++-----------
 4 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/FS/FS/nas.pm b/FS/FS/nas.pm
index 13d0fb830..cb0c1b901 100644
--- a/FS/FS/nas.pm
+++ b/FS/FS/nas.pm
@@ -3,7 +3,7 @@ package FS::nas;
 use strict;
 use vars qw( @ISA );
 use FS::Record qw(qsearchs); #qsearch);
-use FS::UID qw( dbh ); #to lock the tables for heartbeat; ugh, MySQL-specific
+use FS::UID qw( dbh );
 
 @ISA = qw(FS::Record);
 
@@ -126,31 +126,20 @@ Updates the timestamp for this nas
 sub heartbeat {
   my($self, $timestamp) = @_;
   my $dbh = dbh;
-  my $sth = $dbh->prepare("LOCK TABLES nas WRITE");
-  $sth->execute or die $sth->errstr; #die?
-  my $lock_self = qsearchs('nas', { 'nasnum' => $self->nasnum } )
-    or die "can't find own record for $self nasnum ". $self->nasnum;
-  if ( $timestamp > $lock_self->last ) {
-    my $new_self = new FS::nas ( { $lock_self->hash } );
-    $new_self->last($timestamp);
-    #is there a reason to? #$self->last($timestamp);
-    $new_self->replace($lock_self);
-  };
-  $sth = $dbh->prepare("UNLOCK TABLES");
-  $sth->execute or die $sth->errstr; #die?
+  my $sth =
+    $dbh->prepare("UPDATE nas SET last = ? WHERE nasnum = ? AND last < ?");
+  $sth->execute($timestamp, $self->nasnum, $timestamp) or die $sth->errstr;
+  $self->last($timestamp);
 }
 
 =back
 
 =head1 VERSION
 
-$Id: nas.pm,v 1.4 2001-02-21 01:45:37 ivan Exp $
+$Id: nas.pm,v 1.5 2001-04-15 13:35:12 ivan Exp $
 
 =head1 BUGS
 
-The B<heartbeat> method is MySQL-specific.  Yuck.  It's also not quite
-perfectly subclassable, which is much less yuck.
-
 =head1 SEE ALSO
 
 L<FS::Record>, schema.html from the base documentation.
diff --git a/FS/FS/session.pm b/FS/FS/session.pm
index 55bb678a7..de0f2a76a 100644
--- a/FS/FS/session.pm
+++ b/FS/FS/session.pm
@@ -118,7 +118,6 @@ sub insert {
     return $error;
   }
 
-  #transactional accuracy not essential; just an indication of data freshness
   $self->nas_heartbeat($self->getfield('login'));
 
   #session-starting callback
@@ -179,7 +178,6 @@ sub replace {
     return $error;
   }
 
-  #transactional accuracy not essential; just an indication of data freshness
   $self->nas_heartbeat($self->getfield('logout'));
 
   #session-ending callback
@@ -249,7 +247,7 @@ sub svc_acct {
 
 =head1 VERSION
 
-$Id: session.pm,v 1.6 2001-04-09 23:05:15 ivan Exp $
+$Id: session.pm,v 1.7 2001-04-15 13:35:12 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 8bcdf4f56..ac7cab72f 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -48,6 +48,10 @@ sub insert {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
   $error = $self->check;
   return $error if $error;
 
@@ -60,16 +64,21 @@ sub insert {
       'svcpart' => $self->svcpart,
     } );
     $error = $cust_svc->insert;
-    return $error if $error;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
     $svcnum = $self->svcnum($cust_svc->svcnum);
   }
 
   $error = $self->SUPER::insert;
   if ( $error ) {
-    $cust_svc->delete if $cust_svc;
+    $dbh->rollback if $oldAutoCommit;
     return $error;
   }
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
   '';
 }
 
@@ -184,7 +193,7 @@ sub cancel { ''; }
 
 =head1 VERSION
 
-$Id: svc_Common.pm,v 1.2 2001-04-09 23:05:15 ivan Exp $
+$Id: svc_Common.pm,v 1.3 2001-04-15 13:35:12 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 5cfe69081..3d011af2c 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -152,6 +152,10 @@ sub insert {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
   $error = $self->check;
   return $error if $error;
 
@@ -159,13 +163,20 @@ sub insert {
     if qsearchs( 'svc_domain', { 'domain' => $self->domain } );
 
   my $whois = $self->whois;
-  return "Domain in use (see whois)"
-    if ( $self->action eq "N" && ! $whois_hack && $whois );
-  return "Domain not found (see whois)"
-    if ( $self->action eq "M" && ! $whois );
+  if ( $self->action eq "N" && ! $whois_hack && $whois ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "Domain in use (see whois)";
+  }
+  if ( $self->action eq "M" && ! $whois ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "Domain not found (see whois)";
+  }
 
   $error = $self->SUPER::insert;
-  return $error if $error;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
 
   $self->submit_internic unless $whois_hack;
 
@@ -179,7 +190,10 @@ sub insert {
                    "$soarefresh $soaretry $soaexpire $soadefaultttl )"
     };
     $error = $soa->insert;
-    warn "WARNING: couldn't insert SOA record for new domain: $error" if $error;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "couldn't insert SOA record for new domain: $error";
+    }
 
     foreach my $nsmachine ( @nsmachines ) {
       my $ns = new FS::domain_record {
@@ -190,8 +204,10 @@ sub insert {
         'recdata' => $nsmachine,
       };
       my $error = $ns->insert;
-      warn "WARNING: couldn't insert NS record for new domain: $error"
-        if $error;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "couldn't insert NS record for new domain: $error";
+      }
     }
 
     foreach my $mxmachine ( @mxmachines ) {
@@ -203,12 +219,15 @@ sub insert {
         'recdata' => $mxmachine,
       };
       my $error = $mx->insert;
-      warn "WARNING: couldn't insert MX record for new domain: $error"
-        if $error;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "couldn't insert MX record for new domain: $error";
+      }
     }
 
   }
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   ''; #no error
 }
@@ -459,7 +478,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.7 2000-06-29 11:12:20 ivan Exp $
+$Id: svc_domain.pm,v 1.8 2001-04-15 13:35:12 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From ec50de2b78ef1796085f4949265fbe6bc0564086 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Apr 2001 13:56:54 +0000
Subject: *** empty log message ***

---
 TODO                     | 20 +-------------------
 htdocs/docs/session.html |  8 ++++++--
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/TODO b/TODO
index d0276531c..52b88fdce 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.61 2001-04-15 12:56:30 ivan Exp $
+$Id: TODO,v 1.62 2001-04-15 13:56:54 ivan Exp $
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
@@ -6,24 +6,6 @@ ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
 ---
 
-********
-for 1.3.0: 
-********
-
-finish transactions (svc_*.pm, fs_register/)
-
-Pg-style or universal-style locking in fs_sessmon FS/FS/nas.pm, or rewrite it
-to use a database expression that won't need it, or just dump the locking
-entirely as nas_heartbeat stuff doesn't need to be accurate; it's just informational.
-
-radius 
-
-test with MySQL+Sleepycat?
-
-********
-unclassified, probably either done already or post-1.3.0
-********
-
 anything doing transactions in the web interface should likely move into *.pm.
 (transactions are here woo!)
 
diff --git a/htdocs/docs/session.html b/htdocs/docs/session.html
index bd8edbab4..ed7b2ea33 100644
--- a/htdocs/docs/session.html
+++ b/htdocs/docs/session.html
@@ -25,7 +25,6 @@ Then:
 </ul>
 <h2>Usage</h2>
 <ul>
-  <li>RADIUS
   <li>Web
     <ul>
       <li>Copy FS-SessionClient/cgi/login.cgi and logout.cgi to your web
@@ -33,11 +32,16 @@ Then:
       <li>Use <a href="http://www.apache.org/docs/suexec.html">suEXEC</a> or <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">setuid</a> (see <a href="install.html">install.html</a> for details) to run login.cgi and logout.cgi as the freeside user.
     </ul>
   <li>Command-line
-    <br><pre>freeside-login username ( portnum | ip | nasnum nasport )</pre>
+    <br><pre>freeside-login username ( portnum | ip | nasnum nasport )
+freeside-logout username ( portnum | ip | nasnum nasport )</pre>
     <ul>
       <li><i>username</i> is a customer username from the svc_acct table
       <li><i>portnum</i>, <i>ip</i> or <i>nasport</i> and <i>nasnum</i> uniquely identify a port in the <a href="schema.html#port">port</a> database table.
     </ul>
+  <li>RADIUS
+    <ul>
+      <li>Configure your RADIUS server's login and logout callbacks to use the command-line freeside-login and freeside-logout utilites.
+    </ul>
 </ul>
 <h2>Callbacks</h2>
 <ul>
-- 
cgit v1.2.1


From eaa4cc77394b5c8b13e433e970cf5f517c0e7828 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Apr 2001 13:57:31 +0000
Subject: *** empty log message ***

---
 htdocs/docs/session.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/session.html b/htdocs/docs/session.html
index ed7b2ea33..7dac5fdf7 100644
--- a/htdocs/docs/session.html
+++ b/htdocs/docs/session.html
@@ -40,7 +40,7 @@ freeside-logout username ( portnum | ip | nasnum nasport )</pre>
     </ul>
   <li>RADIUS
     <ul>
-      <li>Configure your RADIUS server's login and logout callbacks to use the command-line freeside-login and freeside-logout utilites.
+      <li>Configure your RADIUS server's login and logout callbacks to use the command-line <tt>freeside-login</tt> and <tt>freeside-logout</tt> utilites.
     </ul>
 </ul>
 <h2>Callbacks</h2>
-- 
cgit v1.2.1


From e787622534b217f79536802370e1e6f9b558cc02 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Apr 2001 17:35:50 +0000
Subject: dbdef doesn't use mysql-specific syntax

---
 htdocs/docs/upgrade6.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/upgrade6.html b/htdocs/docs/upgrade6.html
index 807146f89..047250b7c 100644
--- a/htdocs/docs/upgrade6.html
+++ b/htdocs/docs/upgrade6.html
@@ -62,5 +62,5 @@ $ perl Makefile.PL
 $ make
 $ su
 # make install</pre>
-  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
+  <li>Run bin/dbdef-create.
 </body>
-- 
cgit v1.2.1


From 942ef7ba86d01a57c9daca0c7c522560b7e73966 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Apr 2001 23:53:18 +0000
Subject: no more dbdef

---
 FS/MANIFEST | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/FS/MANIFEST b/FS/MANIFEST
index f3c140906..a373f9a07 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -22,12 +22,6 @@ FS/cust_pay_batch.pm
 FS/cust_pkg.pm
 FS/cust_refund.pm
 FS/cust_svc.pm
-FS/dbdef.pm
-FS/dbdef_colgroup.pm
-FS/dbdef_column.pm
-FS/dbdef_index.pm
-FS/dbdef_table.pm
-FS/dbdef_unique.pm
 FS/part_pkg.pm
 FS/part_referral.pm
 FS/part_svc.pm
-- 
cgit v1.2.1


From 18700d872d6379527f5dca6e5b051dfb960aab20 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 22 Apr 2001 00:45:57 +0000
Subject: update postgres examples

---
 htdocs/docs/config.html  | 10 +++++-----
 htdocs/docs/install.html |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index db4b95427..b255ce30e 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -18,18 +18,18 @@ admin secretfile
 john secretfile
 sam secretfile
 </pre>
-  <li>Next, the filename(s) referenced in <b>/usr/local/etc/freeside/mapsecrets</b> file should be created in the <b>/usr/local/etc/freeside/</b> directory.  This file contains three lines: <a href="http://search.cpan.org/doc/TIMB/DBI-1.15/DBI.pm">DBI data source</a> (for example,
-  <tt>DBI:mysql:freeside</tt> or <tt>DBI:Pg:dbname=freeside</tt>), database username, and database password.
-  This file should not be world readable.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.15/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD">manpage for your DBD</a> for the exact syntax of a DBI data source.  For example:
+  <li>Next, the filename(s) referenced in <b>/usr/local/etc/freeside/mapsecrets</b> file should be created in the <b>/usr/local/etc/freeside/</b> directory.  Each file contains three lines: <a href="http://search.cpan.org/doc/TIMB/DBI-1.15/DBI.pm">DBI data source</a> (for example,
+  <tt>DBI:mysql:freeside</tt> or <tt>DBI:Pg:host=localhost;dbname=freeside</tt>), database username, and database password.
+  These files should not be world readable.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.15/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD">manpage for your DBD</a> for the exact syntax of a DBI data source.  In a normal installation such as the example above, a single file <b>/usr/local/etc/freeside/secretfile</b> would be created - for example:
 <pre>
-DBI:Pg:dbname=freeside
+DBI:Pg:host=localhost;dbname=freeside
 dbusername
 dbpassword
 </pre>
 </ul>
 All further configuration files and directories are located in
 <tt>/usr/local/etc/freeside/conf.<i>datasource</i></tt>, for example, 
-<tt>/usr/local/etc/freeside/conf.DBI:Pg:dbname=freeside</tt>
+<tt>/usr/local/etc/freeside/conf.DBI:Pg:host=localhost;dbname=freeside</tt> (remember to backslash-escape the ; character when creating directories in the shell: <tt>mkdir&nbsp;/usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=freeside</tt>).
 <ul>
   <li><a name="address">address</a> - This configuration file is no longer used.  See <a href="#invoice_template">invoice_template</a> instead.
   <li><a name="apacheroot">apacheroot</a> - The directory containing Apache virtual hosts
diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 4bc43358f..af5251d5d 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -37,14 +37,14 @@ Before installing, you need:
 Install the Freeside distribution:
 <ul>
   <li>Add the user `freeside' to your system.
-  <li>Add the freeside database to your database engine.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Reference.html#CREATE_DATABASE">MySQL</a>) (with <a href="http://www.postgresql.org/docs/admin/manage-ag.htm#AEN854">PostgreSQL</a>)
   <li>Allow the freeside user full access to the freeside database.
     <ul>
       <li> with <a href="http://www.mysql.com/Manual_chapter/manual_Privilege_system.html#Privilege_system">MySQL</a>:<pre>$ mysqladmin -u root password '<i>set_a_root_database_password</i>'
 $ mysql -u root -p
 mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* TO freeside@localhost IDENTIFIED BY '<i>set_a_freeside_database_password</i>';</pre>
-      <li> with <a href="http://www.postgresql.org/docs/admin/newuser.htm">PostgreSQL</a>
+      <li> with <a href="http://postgresql.readysetnet.com/users-lounge/docs/7.1/postgres/user-manag.html#DATABASE-USERS">PostgreSQL</a>
     </ul>
+  <li>Add the freeside database to your database engine.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Reference.html#CREATE_DATABASE">MySQL</a>) (with <a href="http://postgresql.readysetnet.com/users-lounge/docs/7.1/postgres/managing-databases.html#MANAGE-AG-CREATEDB">PostgreSQL</a>)
   <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>
   <li>Build and install the Perl libraries:
     <pre>
@@ -52,7 +52,7 @@ $ cd FS/
 $ perl Makefile.PL
 $ make
 $ su
-# make install</pre>
+# make install UNINST=1</pre>
   <li>Copy or link fs-x.y.z/htdocs to your web server's document space.  <pre>mkdir /usr/local/apache/htdocs/freeside
 cp -r fs-x.y.z/htdocs/* /usr/local/apache/htdocs/freeside</pre> or <pre>ln -s /full/path/to/fs-x.y.z/htdocs /usr/local/apache/htdocs/freeside</pre>
   <li>Restrict access to this web interface.  (with <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache</a>)
-- 
cgit v1.2.1


From 4dec1e525fc85363dec2fe0a55f0eb306bec7154 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 22 Apr 2001 00:49:30 +0000
Subject: need to import dbh sub from Record

---
 FS/FS/svc_Common.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index ac7cab72f..bc5b75640 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -2,7 +2,7 @@ package FS::svc_Common;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw( qsearchs fields );
+use FS::Record qw( qsearchs fields dbh );
 use FS::cust_svc;
 use FS::part_svc;
 
@@ -193,7 +193,7 @@ sub cancel { ''; }
 
 =head1 VERSION
 
-$Id: svc_Common.pm,v 1.3 2001-04-15 13:35:12 ivan Exp $
+$Id: svc_Common.pm,v 1.4 2001-04-22 00:49:30 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 35b2311e5702c32381a662b8172354603ea9ed1d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 22 Apr 2001 01:38:39 +0000
Subject: svc_domain needs to import dbh sub from Record view/cust_main.cgi
 needs to use ->owed method, not check (depriciated) owed field
 search/cust_bill.cgi redirect error when there's only one invoice

---
 FS/FS/svc_domain.pm         |  4 ++--
 TODO                        |  7 ++++++-
 htdocs/search/cust_bill.cgi | 10 ++++++++--
 htdocs/view/cust_main.cgi   | 11 ++++++++---
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 3d011af2c..08bcc246e 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -11,7 +11,7 @@ use Mail::Internet;
 use Mail::Header;
 use Date::Format;
 use Net::Whois 1.0;
-use FS::Record qw(fields qsearch qsearchs);
+use FS::Record qw(fields qsearch qsearchs dbh);
 use FS::Conf;
 use FS::svc_Common;
 use FS::cust_svc;
@@ -478,7 +478,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.8 2001-04-15 13:35:12 ivan Exp $
+$Id: svc_domain.pm,v 1.9 2001-04-22 01:38:39 ivan Exp $
 
 =head1 BUGS
 
diff --git a/TODO b/TODO
index 52b88fdce..593f4e989 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.62 2001-04-15 13:56:54 ivan Exp $
+$Id: TODO,v 1.63 2001-04-22 01:38:38 ivan Exp $
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
@@ -6,6 +6,11 @@ ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
 ---
 
+Things that would be nice but probably won't happen: testing with 
+MySQL+Sleepycat, a fix for the long-RADIUS-attributes-with Pg problem,    
+passive session monitoring with RADIUS (tailing a log file or monitoring a
+database, as opposed to using a RADIUS with proper callbacks).
+
 anything doing transactions in the web interface should likely move into *.pm.
 (transactions are here woo!)
 
diff --git a/htdocs/search/cust_bill.cgi b/htdocs/search/cust_bill.cgi
index 95347032d..0645d1cc0 100755
--- a/htdocs/search/cust_bill.cgi
+++ b/htdocs/search/cust_bill.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_bill.cgi,v 1.5 2000-07-17 16:45:41 ivan Exp $
+# $Id: cust_bill.cgi,v 1.6 2001-04-22 01:38:39 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_bill.cgi
@@ -11,7 +11,12 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_bill.cgi,v $
-# Revision 1.5  2000-07-17 16:45:41  ivan
+# Revision 1.6  2001-04-22 01:38:39  ivan
+# svc_domain needs to import dbh sub from Record
+# view/cust_main.cgi needs to use ->owed method, not check (depriciated) owed field
+# search/cust_bill.cgi redirect error when there's only one invoice
+#
+# Revision 1.5  2000/07/17 16:45:41  ivan
 # first shot at invoice browsing and some other cleanups
 #
 # Revision 1.4  1999/02/28 00:03:54  ivan
@@ -85,6 +90,7 @@ if ( $cgi->keywords ) {
 }
 
 if ( scalar(@cust_bill) == 1 ) {
+  my $invnum = $cust_bill[0]->invnum;
   print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
 } elsif ( scalar(@cust_bill) == 0 ) {
   eidiot("Invoice not found.");
diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index 055256570..ff169fdae 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.18 1999-08-12 04:16:01 ivan Exp $
+# $Id: cust_main.cgi,v 1.19 2001-04-22 01:38:39 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -31,7 +31,12 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.18  1999-08-12 04:16:01  ivan
+# Revision 1.19  2001-04-22 01:38:39  ivan
+# svc_domain needs to import dbh sub from Record
+# view/cust_main.cgi needs to use ->owed method, not check (depriciated) owed field
+# search/cust_bill.cgi redirect error when there's only one invoice
+#
+# Revision 1.18  1999/08/12 04:16:01  ivan
 # hidecancelledpackages config option
 #
 # Revision 1.17  1999/04/15 16:44:36  ivan
@@ -331,7 +336,7 @@ foreach $bill (@bills) {
   push @history,
     $bref->{_date} . qq!\t<A HREF="!. popurl(2). qq!view/cust_bill.cgi?! .
     $bref->{invnum} . qq!">Invoice #! . $bref->{invnum} .
-    qq! (Balance \$! . $bref->{owed} . qq!)</A>\t! .
+    qq! (Balance \$! . $bill->owed . qq!)</A>\t! .
     $bref->{charged} . qq!\t\t\t!;
 
   my(@payments)=qsearch('cust_pay',{'invnum'=> $bref->{invnum} } );
-- 
cgit v1.2.1


From 1c14b1faec0f3f07a6d4190cf535b3ddb45075ce Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 22 Apr 2001 01:56:15 +0000
Subject: get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)

---
 FS/FS.pm                   |  25 ++------
 FS/FS/SSH.pm               | 146 ---------------------------------------------
 FS/FS/svc_acct.pm          |   6 +-
 FS/FS/svc_acct_sm.pm       |   6 +-
 FS/FS/svc_domain.pm        |   4 +-
 FS/FS/svc_www.pm           |   9 ++-
 FS/MANIFEST                |   1 -
 README                     |   4 +-
 bin/svc_acct.export        |  10 +++-
 bin/svc_acct.import        |   9 ++-
 bin/svc_acct_sm.export     |  10 +++-
 bin/svc_acct_sm.import     |   9 ++-
 bin/svc_domain.import      |   4 +-
 fs_passwd/fs_passwd_server |   2 +-
 fs_signup/fs_signup_server |   2 +-
 htdocs/docs/install.html   |   3 +
 16 files changed, 54 insertions(+), 196 deletions(-)
 delete mode 100644 FS/FS/SSH.pm

diff --git a/FS/FS.pm b/FS/FS.pm
index 64461a5d1..3fd66b1fe 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -14,27 +14,11 @@ FS - Freeside Perl modules
 
 =head1 SYNOPSIS
 
-FS is the temporary prefix for many disparate modules written for the Freeside
-ISP billing software.  This includes:
-
-=head2 Database metadata classes
-
-L<FS::dbdef> - Database class
-
-L<FS::dbdef_table> - Database table class
-
-L<FS::dbdef_column> - Database column class
-
-L<FS::dbdef_colgroup> - Database column group class
-
-L<FS::dbdef_index> - Database index class
-
-L<FS::dbdef_unique> - Database unique index class
+FS is the unofficial (i.e. non-CPAN) prefix for the Perl module portion of the
+Freeside ISP billing software.  This includes:
 
 =head2 Utility classes
 
-L<FS::SSH> - Simple wrappers around ssh and scp commands.
-
 L<FS::Conf> - Freeside configuration values
 
 L<FS::UID> - User class (not yet OO)
@@ -127,7 +111,7 @@ The main documentation is in htdocs/docs.
 
 =head1 VERSION
 
-$Id: FS.pm,v 1.3 1999-08-04 12:41:47 ivan Exp $
+$Id: FS.pm,v 1.4 2001-04-22 01:56:14 ivan Exp $
 
 =head1 SUPPORT
 
@@ -155,7 +139,8 @@ Freeside distribution, which are both different from the CVS version tag for
 each file, which appears under the VERSION heading.
 
 Those modules which would be useful separately should be pulled out, 
-renamed appropriately and uploaded to CPAN.
+renamed appropriately and uploaded to CPAN.  So far: DBIx::DBSchema, Net::SSH
+and Net::SCP...
 
 =cut
 
diff --git a/FS/FS/SSH.pm b/FS/FS/SSH.pm
deleted file mode 100644
index 84ac06b44..000000000
--- a/FS/FS/SSH.pm
+++ /dev/null
@@ -1,146 +0,0 @@
-package FS::SSH;
-
-use strict;
-use vars qw(@ISA @EXPORT_OK $ssh $scp);
-use Exporter;
-use IPC::Open2;
-use IPC::Open3;
-
-@ISA = qw(Exporter);
-@EXPORT_OK = qw(ssh scp issh iscp sshopen2 sshopen3);
-
-$ssh="ssh";
-$scp="scp";
-
-=head1 NAME
-
-FS::SSH - Subroutines to call ssh and scp
-
-=head1 SYNOPSIS
-
-  use FS::SSH qw(ssh scp issh iscp sshopen2 sshopen3);
-
-  ssh($host, $command);
-
-  issh($host, $command);
-
-  scp($source, $destination);
-
-  iscp($source, $destination);
-
-  sshopen2($host, $reader, $writer, $command);
-
-  sshopen3($host, $reader, $writer, $error, $command);
-
-=head1 DESCRIPTION
-
-  Simple wrappers around ssh and scp commands.
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item ssh HOST, COMMAND 
-
-Calls ssh in batch mode.
-
-=cut
-
-sub ssh {
-  my($host,$command)=@_;
-  my(@cmd)=($ssh, "-o", "BatchMode yes", $host, $command);
-#  	print join(' ',@cmd),"\n";
-#0;
-  system(@cmd);
-}
-
-=item issh HOST, COMMAND
-
-Prints the ssh command to be executed, waits for the user to confirm, and
-(optionally) executes the command.
-
-=cut
-
-sub issh {
-  my($host,$command)=@_;
-  my(@cmd)=($ssh, $host, $command);
-  print join(' ',@cmd),"\n";
-  if ( &_yesno ) {
-    	###print join(' ',@cmd),"\n";
-    system(@cmd);
-  }
-}
-
-=item scp SOURCE, DESTINATION
-
-Calls scp in batch mode.
-
-=cut
-
-sub scp {
-  my($src,$dest)=@_;
-  my(@cmd)=($scp,"-Bprq",$src,$dest);
-#  	print join(' ',@cmd),"\n";
-#0;
-  system(@cmd);
-}
-
-=item iscp SOURCE, DESTINATION
-
-Prints the scp command to be executed, waits for the user to confirm, and
-(optionally) executes the command.
-
-=cut
-
-sub iscp {
-  my($src,$dest)=@_;
-  my(@cmd)=($scp,"-pr",$src,$dest);
-  print join(' ',@cmd),"\n";
-  if ( &_yesno ) {
-    	###print join(' ',@cmd),"\n";
-    system(@cmd);
-  }
-}
-
-=item sshopen2 HOST, READER, WRITER, COMMAND
-
-Connects the supplied filehandles to the ssh process (in batch mode).
-
-=cut
-
-sub sshopen2 {
-  my($host,$reader,$writer,$command)=@_;
-  open2($reader,$writer,$ssh,'-o','Batchmode yes',$host,$command);
-}
-
-=item sshopen3 HOST, WRITER, READER, ERROR, COMMAND
-
-Connects the supplied filehandles to the ssh process (in batch mode).
-
-=cut
-
-sub sshopen3 {
-  my($host,$writer,$reader,$error,$command)=@_;
-  open3($writer,$reader,$error,$ssh,'-o','Batchmode yes',$host,$command);
-}
-
-sub _yesno {
-  print "Proceed [y/N]:";
-  my($x)=scalar(<STDIN>);
-  $x =~ /^y/i;
-}
-
-=head1 BUGS
-
-Not OO.
-
-scp stuff should transparantly use rsync-over-ssh instead.
-
-=head1 SEE ALSO
-
-L<ssh>, L<scp>, L<IPC::Open2>, L<IPC::Open3>
-
-=cut
-
-1;
-
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 9d2db0eff..79104b883 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -9,7 +9,7 @@ use Carp;
 use FS::Conf;
 use FS::Record qw( qsearchs fields );
 use FS::svc_Common;
-use FS::SSH qw(ssh);
+use Net::SSH qw(ssh);
 use FS::part_svc;
 use FS::svc_acct_pop;
 use FS::svc_acct_sm;
@@ -536,7 +536,7 @@ sub radius_check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.14 2001-01-31 07:21:00 ivan Exp $
+$Id: svc_acct.pm,v 1.15 2001-04-22 01:56:15 ivan Exp $
 
 =head1 BUGS
 
@@ -552,7 +552,7 @@ counterintuitive.
 =head1 SEE ALSO
 
 L<FS::svc_Common>, L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>,
-L<FS::part_svc>, L<FS::cust_pkg>, L<FS::SSH>, L<ssh>, L<FS::svc_acct_pop>,
+L<FS::part_svc>, L<FS::cust_pkg>, L<Net::SSH>, L<ssh>, L<FS::svc_acct_pop>,
 schema.html from the base documentation.
 
 =cut
diff --git a/FS/FS/svc_acct_sm.pm b/FS/FS/svc_acct_sm.pm
index 15cf86d9b..8cec60b69 100644
--- a/FS/FS/svc_acct_sm.pm
+++ b/FS/FS/svc_acct_sm.pm
@@ -5,7 +5,7 @@ use vars qw( @ISA $nossh_hack $conf $shellmachine @qmailmachines );
 use FS::Record qw( fields qsearch qsearchs );
 use FS::svc_Common;
 use FS::cust_svc;
-use FS::SSH qw(ssh);
+use Net::SSH qw(ssh);
 use FS::Conf;
 use FS::svc_acct;
 use FS::svc_domain;
@@ -233,7 +233,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_acct_sm.pm,v 1.2 2000-06-30 10:37:18 ivan Exp $
+$Id: svc_acct_sm.pm,v 1.3 2001-04-22 01:56:15 ivan Exp $
 
 =head1 BUGS
 
@@ -244,7 +244,7 @@ The $recref stuff in sub check should be cleaned up.
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
-L<FS::svc_acct>, L<FS::svc_domain>, L<FS::SSH>, L<ssh>, L<dot-qmail>,
+L<FS::svc_acct>, L<FS::svc_domain>, L<Net::SSH>, L<ssh>, L<dot-qmail>,
 schema.html from the base documentation.
 
 =cut
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 08bcc246e..a70c1a340 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -478,7 +478,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.9 2001-04-22 01:38:39 ivan Exp $
+$Id: svc_domain.pm,v 1.10 2001-04-22 01:56:15 ivan Exp $
 
 =head1 BUGS
 
@@ -495,7 +495,7 @@ The $recref stuff in sub check should be cleaned up.
 =head1 SEE ALSO
 
 L<FS::svc_Common>, L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>,
-L<FS::part_svc>, L<FS::cust_pkg>, L<FS::SSH>, L<Net::Whois>, L<ssh>,
+L<FS::part_svc>, L<FS::cust_pkg>, L<Net::Whois>, L<ssh>,
 L<dot-qmail>, schema.html from the base documentation, config.html from the
 base documentation.
 
diff --git a/FS/FS/svc_www.pm b/FS/FS/svc_www.pm
index 6e741950f..bce69d6a9 100644
--- a/FS/FS/svc_www.pm
+++ b/FS/FS/svc_www.pm
@@ -8,7 +8,7 @@ use FS::svc_Common;
 use FS::cust_svc;
 use FS::domain_record;
 use FS::svc_acct;
-use FS::SSH qw(ssh);
+use Net::SSH qw(ssh);
 
 @ISA = qw( FS::svc_Common );
 
@@ -220,7 +220,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_www.pm,v 1.3 2000-11-22 23:30:51 ivan Exp $
+$Id: svc_www.pm,v 1.4 2001-04-22 01:56:15 ivan Exp $
 
 =head1 BUGS
 
@@ -232,7 +232,10 @@ L<FS::part_svc>, L<FS::cust_pkg>, schema.html from the base documentation.
 =head1 HISTORY
 
 $Log: svc_www.pm,v $
-Revision 1.3  2000-11-22 23:30:51  ivan
+Revision 1.4  2001-04-22 01:56:15  ivan
+get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)
+
+Revision 1.3  2000/11/22 23:30:51  ivan
 tyop
 
 Revision 1.2  2000/03/01 08:13:59  ivan
diff --git a/FS/MANIFEST b/FS/MANIFEST
index a373f9a07..98f76acda 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -3,7 +3,6 @@ FS.pm
 FS/CGI.pm
 FS/Conf.pm
 FS/Record.pm
-FS/SSH.pm
 FS/UI/Base.pm
 FS/UI/CGI.pm
 FS/UI/Gtk.pm
diff --git a/README b/README
index 31601ef76..dab32d607 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
-Freeside, (pre-1.3.0)
+Freeside, (1.3.0)
 
-Copyright (C) 2000 Ivan Kohler
+Copyright (C) 2000,2001 Ivan Kohler
 Copyright (C) 1999 Silicon Interactive Software Design
 All rights reserved
 
diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 3280904f6..073359587 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.17 2001-02-21 23:48:19 ivan Exp $
+# $Id: svc_acct.export,v 1.18 2001-04-22 01:56:15 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,7 +38,10 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.17  2001-02-21 23:48:19  ivan
+# Revision 1.18  2001-04-22 01:56:15  ivan
+# get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)
+#
+# Revision 1.17  2001/02/21 23:48:19  ivan
 # add icradius_secrets config file to export to a non-Freeside MySQL database for
 # ICRADIUS
 #
@@ -70,7 +73,8 @@ use Fcntl qw(:flock);
 use IO::Handle;
 use DBI;
 use FS::Conf;
-use FS::SSH qw(scp ssh);
+use Net::SSH qw(ssh);
+use Net::SCP qw(scp);
 use FS::UID qw(adminsuidsetup datasrc dbh);
 use FS::Record qw(qsearch fields);
 use FS::svc_acct;
diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index 795b853c0..0acd731c5 100755
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.import,v 1.11 2000-06-29 12:27:01 ivan Exp $
+# $Id: svc_acct.import,v 1.12 2001-04-22 01:56:15 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -17,7 +17,10 @@
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 #
 # $Log: svc_acct.import,v $
-# Revision 1.11  2000-06-29 12:27:01  ivan
+# Revision 1.12  2001-04-22 01:56:15  ivan
+# get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)
+#
+# Revision 1.11  2000/06/29 12:27:01  ivan
 # s/password/_password/ for PostgreSQL wasn't done in the import.
 #
 # Revision 1.10  2000/06/28 12:32:30  ivan
@@ -49,7 +52,7 @@ use strict;
 use vars qw(%part_svc);
 use Date::Parse;
 use Term::Query qw(query);
-use FS::SSH qw(iscp);
+use Net::SCP qw(iscp);
 use FS::UID qw(adminsuidsetup datasrc);
 use FS::Record qw(qsearch);
 use FS::svc_acct;
diff --git a/bin/svc_acct_sm.export b/bin/svc_acct_sm.export
index bda17e332..a0938caf2 100755
--- a/bin/svc_acct_sm.export
+++ b/bin/svc_acct_sm.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.export,v 1.8 2000-07-06 03:37:24 ivan Exp $
+# $Id: svc_acct_sm.export,v 1.9 2001-04-22 01:56:15 ivan Exp $
 # 
 # Create and export config files for sendmail, qmail
 #
@@ -42,7 +42,10 @@
 # /var/spool/freeside/conf and sendmail updates ivan@sisd.com 98-aug-14
 #
 # $Log: svc_acct_sm.export,v $
-# Revision 1.8  2000-07-06 03:37:24  ivan
+# Revision 1.9  2001-04-22 01:56:15  ivan
+# get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)
+#
+# Revision 1.8  2000/07/06 03:37:24  ivan
 # don't error out on invalid svc_acct_sm.domuid's that can't be matched in
 # svc_acct.uid - just warn.
 #
@@ -68,7 +71,8 @@
 use strict;
 use vars qw($conf);
 use Fcntl qw(:flock);
-use FS::SSH qw(ssh scp);
+use Net::SSH qw(ssh);
+use Net::SCP qw(scp);
 use FS::UID qw(adminsuidsetup datasrc);
 use FS::Record qw(qsearch qsearchs);
 use FS::svc_acct;
diff --git a/bin/svc_acct_sm.import b/bin/svc_acct_sm.import
index 0714af3f1..723fb029f 100755
--- a/bin/svc_acct_sm.import
+++ b/bin/svc_acct_sm.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.import,v 1.8 2000-12-03 15:14:00 ivan Exp $
+# $Id: svc_acct_sm.import,v 1.9 2001-04-22 01:56:15 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -16,7 +16,10 @@
 # ivan@sisd.com 98-jul-13
 #
 # $Log: svc_acct_sm.import,v $
-# Revision 1.8  2000-12-03 15:14:00  ivan
+# Revision 1.9  2001-04-22 01:56:15  ivan
+# get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)
+#
+# Revision 1.8  2000/12/03 15:14:00  ivan
 # bugfixes from Jeff Finucane <jeff@cmh.net>, thanks!
 #
 # Revision 1.7  2000/06/29 10:51:52  ivan
@@ -41,7 +44,7 @@
 use strict;
 use vars qw(%d_part_svc %m_part_svc);
 use Term::Query qw(query);
-use FS::SSH qw(iscp);
+use Net::SCP qw(iscp);
 use FS::UID qw(adminsuidsetup datasrc);
 use FS::Record qw(qsearch qsearchs);
 use FS::svc_acct_sm;
diff --git a/bin/svc_domain.import b/bin/svc_domain.import
index 329465ca1..3d3be9da5 100644
--- a/bin/svc_domain.import
+++ b/bin/svc_domain.import
@@ -1,11 +1,11 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_domain.import,v 1.1 2000-02-03 05:17:39 ivan Exp $
+# $Id: svc_domain.import,v 1.2 2001-04-22 01:56:15 ivan Exp $
 
 use strict;
 use vars qw( %d_part_svc );
 use Term::Query qw(query);
-use FS::SSH qw(iscp);
+use Net::SCP qw(iscp);
 use FS::UID qw(adminsuidsetup datasrc);
 #use FS::Record qw(qsearch qsearchs);
 #use FS::svc_acct_sm;
diff --git a/fs_passwd/fs_passwd_server b/fs_passwd/fs_passwd_server
index c15c9405d..f4b67ae98 100755
--- a/fs_passwd/fs_passwd_server
+++ b/fs_passwd/fs_passwd_server
@@ -12,7 +12,7 @@
 
 use strict;
 use IO::Handle;
-use FS::SSH qw(sshopen2);
+use Net::SSH qw(sshopen2);
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearchs);
 use FS::svc_acct;
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 86455a477..8fbc819ad 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -6,7 +6,7 @@
 use strict;
 use IO::Handle;
 use Tie::RefHash;
-use FS::SSH qw(sshopen2);
+use Net::SSH qw(sshopen2);
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw( qsearch qsearchs );
 use FS::cust_main_county;
diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index af5251d5d..d94ffe7fa 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -32,6 +32,9 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>
       <li><a href="http://search.cpan.org/search?dist=DBI">DBI
       <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a>
+      <li><a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>
+      <li><a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>
+      <li><a href="http://search.cpan.org/search?dist=Net-SCP">Net-SCP</a>
     </ul>
 </ul>
 Install the Freeside distribution:
-- 
cgit v1.2.1


From 0b9841bf3fea52f423242313afc2cc058d6e6a46 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Apr 2001 07:12:44 +0000
Subject: better error message (if kludgy) for no referral remove outdated NSI
 foo from domain ordering.  also, fuck NSI.

---
 FS/FS/cust_main.pm                 |  5 ++++-
 htdocs/edit/process/svc_domain.cgi | 14 +++++++-------
 htdocs/edit/svc_domain.cgi         | 12 ++++++------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 4a254e06c..0379f7f71 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -391,6 +391,9 @@ sub check {
     || $self->ut_textn('county')
     || $self->ut_textn('state')
   ;
+  #barf.  need message catalogs.  i18n.  etc.
+  $error .= "Please select a referral."
+    if $error =~ /^Illegal or empty \(numeric\) refnum: /;
   return $error if $error;
 
   return "Unknown agent"
@@ -1114,7 +1117,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.11 2001-04-09 23:05:15 ivan Exp $
+$Id: cust_main.pm,v 1.12 2001-04-23 07:12:44 ivan Exp $
 
 =head1 BUGS
 
diff --git a/htdocs/edit/process/svc_domain.cgi b/htdocs/edit/process/svc_domain.cgi
index e12aa1b55..ad1892dd1 100755
--- a/htdocs/edit/process/svc_domain.cgi
+++ b/htdocs/edit/process/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.6 1999-02-28 00:03:47 ivan Exp $
+# $Id: svc_domain.cgi,v 1.7 2001-04-23 07:12:44 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -18,7 +18,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.6  1999-02-28 00:03:47  ivan
+# Revision 1.7  2001-04-23 07:12:44  ivan
+# better error message (if kludgy) for no referral
+# remove outdated NSI foo from domain ordering.  also, fuck NSI.
+#
+# Revision 1.6  1999/02/28 00:03:47  ivan
 # removed misleading comments
 #
 # Revision 1.5  1999/02/07 09:59:33  ivan
@@ -60,11 +64,7 @@ $new = new FS::svc_domain ( {
   } ( fields('svc_domain'), qw( pkgnum svcpart action purpose ) )
 } );
 
-if ($cgi->param('legal') ne "Yes") {
-  $error = "Customer did not agree to be bound by NSI's ".
-    qq!<A HREF="http://rs.internic.net/help/agreement.txt">!.
-    "Domain Name Resgistration Agreement</A>";
-} elsif ($cgi->param('svcnum')) {
+if ($cgi->param('svcnum')) {
   $error="Can't modify a domain!";
 } else {
   $error=$new->insert;
diff --git a/htdocs/edit/svc_domain.cgi b/htdocs/edit/svc_domain.cgi
index 6b5eff560..49be88073 100755
--- a/htdocs/edit/svc_domain.cgi
+++ b/htdocs/edit/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.9 1999-02-28 00:03:39 ivan Exp $
+# $Id: svc_domain.cgi,v 1.10 2001-04-23 07:12:44 ivan Exp $
 #
 # Usage: svc_domain.cgi pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_domain.cgi?pkgnum{pkgnum}-svcpart{svcpart}
@@ -15,7 +15,11 @@
 # no GOV in instructions ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.9  1999-02-28 00:03:39  ivan
+# Revision 1.10  2001-04-23 07:12:44  ivan
+# better error message (if kludgy) for no referral
+# remove outdated NSI foo from domain ordering.  also, fuck NSI.
+#
+# Revision 1.9  1999/02/28 00:03:39  ivan
 # removed misleading comments
 #
 # Revision 1.8  1999/02/07 09:59:25  ivan
@@ -138,10 +142,6 @@ print ' CHECKED' if $kludge_action eq 'M';
 print qq!>Transfer!;
 
 print <<END;
-<P>Customer agrees to be bound by NSI's
-<A HREF="http://rs.internic.net/help/agreement.txt">
-Domain Name Registration Agreement</A>
-<SELECT NAME="legal" SIZE=1><OPTION SELECTED>No<OPTION>Yes</SELECT>
 <P>Domain <INPUT TYPE="text" NAME="domain" VALUE="$domain" SIZE=28 MAXLENGTH=26>
 <BR>Purpose/Description: <INPUT TYPE="text" NAME="purpose" VALUE="$purpose" SIZE=64>
 <P><CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>
-- 
cgit v1.2.1


From ece31063b782031e21ba1f57476afab555af5363 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Apr 2001 09:00:06 +0000
Subject: "shouldn't hurt" (famous last words)

---
 FS/FS/UID.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 1902eef4b..f5c4f6139 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -78,6 +78,7 @@ sub adminsuidsetup {
 
   croak "Not running uid freeside!" unless checkeuid();
   getsecrets;
+  $dbh->disconnect if $dbh;
   $dbh = DBI->connect($datasrc,$db_user,$db_pass, {
                           'AutoCommit' => 0,
                           'ChopBlanks' => 1,
@@ -259,7 +260,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.5 2001-02-21 01:45:07 ivan Exp $
+$Id: UID.pm,v 1.6 2001-04-23 09:00:06 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From f3235d39d083518d47f21cd5585e5f9a13070763 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Apr 2001 12:40:31 +0000
Subject: documentation and webdemo updates

---
 FS/FS.pm                                  |  17 +-
 fs_webdemo/registerd.Pg                   | 196 ++++++++++
 htdocs/docs/man/FS.html                   | 309 +++++-----------
 htdocs/docs/man/FS/CGI.html               | 138 +++----
 htdocs/docs/man/FS/Conf.html              | 101 +++--
 htdocs/docs/man/FS/Record.html            | 592 ++++++++++++++----------------
 htdocs/docs/man/FS/UI/Base.html           | 133 +++----
 htdocs/docs/man/FS/UI/CGI.html            | 133 +++----
 htdocs/docs/man/FS/UI/Gtk.html            | 127 +++----
 htdocs/docs/man/FS/UI/agent.html          |  16 +
 htdocs/docs/man/FS/UID.html               | 220 +++++------
 htdocs/docs/man/FS/agent.html             | 177 +++++----
 htdocs/docs/man/FS/agent_type.html        | 186 +++++-----
 htdocs/docs/man/FS/cust_bill.html         | 273 +++++++-------
 htdocs/docs/man/FS/cust_bill_pkg.html     | 159 ++++----
 htdocs/docs/man/FS/cust_credit.html       | 172 +++++----
 htdocs/docs/man/FS/cust_main.html         | 437 +++++++++++-----------
 htdocs/docs/man/FS/cust_main_county.html  | 147 ++++----
 htdocs/docs/man/FS/cust_main_invoice.html | 161 ++++----
 htdocs/docs/man/FS/cust_pay.html          | 148 ++++----
 htdocs/docs/man/FS/cust_pay_batch.html    | 194 +++++-----
 htdocs/docs/man/FS/cust_pkg.html          | 371 ++++++++-----------
 htdocs/docs/man/FS/cust_refund.html       | 148 ++++----
 htdocs/docs/man/FS/cust_svc.html          | 176 ++++-----
 htdocs/docs/man/FS/part_pkg.html          | 212 +++++------
 htdocs/docs/man/FS/part_referral.html     | 139 ++++---
 htdocs/docs/man/FS/part_svc.html          | 153 ++++----
 htdocs/docs/man/FS/pkg_svc.html           | 164 ++++-----
 htdocs/docs/man/FS/svc_Common.html        | 133 +++----
 htdocs/docs/man/FS/svc_acct.html          | 335 +++++++++--------
 htdocs/docs/man/FS/svc_acct_pop.html      | 147 ++++----
 htdocs/docs/man/FS/svc_acct_sm.html       | 225 +++++-------
 htdocs/docs/man/FS/svc_domain.html        | 286 ++++++---------
 htdocs/docs/man/FS/type_pkgs.html         | 133 ++++---
 htdocs/docs/schema.html                   |   3 +-
 35 files changed, 3143 insertions(+), 3518 deletions(-)
 create mode 100755 fs_webdemo/registerd.Pg

diff --git a/FS/FS.pm b/FS/FS.pm
index 3fd66b1fe..ed61db4c8 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -44,8 +44,12 @@ L<FS::svc_acct> - Account (shell, RADIUS, POP3) class
 
 L<FS::svc_domain> - Domain class
 
+L<FS::domain_record> - DNS zone entries
+
 L<FS::svc_acct_sm> - Vitual mail alias class
 
+L<FS::svc_www> - Web virtual host class.
+
 L<FS::part_svc> - Service definition class
 
 L<FS::part_pkg> - Package (billing item) definition class
@@ -81,8 +85,15 @@ L<FS::cust_credit> - Credit class
 
 L<FS::cust_refund> - Refund class
 
-L<FS::cust_pay_batch> - Credit card transaction queue
-class
+L<FS::cust_pay_batch> - Credit card transaction queue class
+
+L<FS::prepay_credit> - Prepaid "calling card" credit class.
+
+L<FS::nas> - Network Access Server class
+
+L<FS::port> - NAS port class
+
+L<FS::session> - User login session class
 
 =head2 User Interface classes (under development; not yet usable)
 
@@ -111,7 +122,7 @@ The main documentation is in htdocs/docs.
 
 =head1 VERSION
 
-$Id: FS.pm,v 1.4 2001-04-22 01:56:14 ivan Exp $
+$Id: FS.pm,v 1.5 2001-04-23 12:40:30 ivan Exp $
 
 =head1 SUPPORT
 
diff --git a/fs_webdemo/registerd.Pg b/fs_webdemo/registerd.Pg
new file mode 100755
index 000000000..a4fd0552c
--- /dev/null
+++ b/fs_webdemo/registerd.Pg
@@ -0,0 +1,196 @@
+#!/usr/bin/perl -w
+#
+# $Id: registerd.Pg,v 1.1 2001-04-23 12:40:30 ivan Exp $
+
+use strict;
+use vars qw(
+             $freeside_conf
+             $mysql_data
+             $datasrc $user $pass $x
+             $dbh $sth
+             @pw_set @saltset
+             $header $msg
+           );
+            # $freeside_bin $freeside_test 
+            # $cgi $username $name $email $user_pw $crypt_pw 
+#use CGI;
+#use CGI::Carp qw(fatalsToBrowser);
+use DBI;
+use Mail::Internet;
+use Mail::Header;
+use Date::Format;
+
+#$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
+#$ENV{'SHELL'} = '/bin/sh';
+#$ENV{'IFS'} = " \t\n";
+#$ENV{'CDPATH'} = '';
+#$ENV{'ENV'} = '';
+#$ENV{'BASH_ENV'} = '';
+
+#$freeside_bin = '/home/freeside/bin/';
+#$freeside_test = '/home/freeside/test/';
+$freeside_conf = '/usr/local/etc/freeside/';
+
+#$mysql_data = "/var/lib/mysql";
+
+$datasrc = 'DBI:mysql:http_auth';
+$user = "freeside";
+$pass = "maelcolm";
+
+#my(@pw_set)= ( 'a'..'z', 'A'..'Z', '0'..'9', '(', ')', '#', '!', '.', ',' );
+#my(@pw_set)= ( 'a'..'z', 'A'..'Z', '0'..'9' );
+@pw_set = ( 'a'..'z', '0'..'9' );
+@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+
+#die "not running as system user freeside"
+#  unless $> == scalar(getpwnam('freeside'));
+die "not running as root user"
+  unless $> == 0;
+
+$dbh = DBI->connect( $datasrc, $user, $pass, {
+	'AutoCommit' => 'true',
+} ) or die "DBI->connect error: $DBI::errstr\n";
+$x = $DBI::errstr; #silly; to avoid "used only once" warning
+
+while ( 1 ) {
+
+  $SIG{HUP} = 'IGNORE';
+  $SIG{INT} = 'IGNORE';
+  $SIG{QUIT} = 'IGNORE';
+  $SIG{TERM} = 'IGNORE';
+  $SIG{TSTP} = 'IGNORE';
+  $SIG{PIPE} = 'IGNORE';
+
+  $sth = $dbh->prepare("LOCK TABLES mysql_auth WRITE");
+  $sth->execute or die $sth->errstr;
+
+  $sth = $dbh->prepare(
+    'SELECT * FROM mysql_auth WHERE status = "unconfigured" OR status = "reconfigure"'
+  );
+  $sth->execute or die $sth->errstr;
+  my $pending = $sth->fetchall_arrayref( {} );
+
+  $sth = $dbh->prepare(
+    'UPDATE mysql_auth SET status = "locked" WHERE status = "unconfigured" OR status = "reconfigure"'
+  );
+  $sth->execute or die $sth->errstr;
+
+  $sth = $dbh->prepare("UNLOCK TABLES");
+  $sth->execute or die $sth->errstr;
+
+  #
+
+  foreach my $row ( @{$pending} ) {
+
+    my $username = $row->{'username'};
+    my $email = $row->{'passwd'};
+    my $status = $row->{'status'};
+
+    system("/usr/bin/createdb --username freeside demo_$username >/dev/null");
+
+    system "psql -U freeside demo_$username </usr/local/etc/freeside/demo_template.Pg";
+
+    mkdir "${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username", 0755;    
+    system "cp -pr ${freeside_conf}conf.DBI:Pg:host=localhost\\;dbname=demo_template/* ".
+           "${freeside_conf}conf.DBI:Pg:host=localhost\\;dbname=demo_$username";
+
+    mkdir "${freeside_conf}counters.DBI:Pg:host=localhost;dbname=demo_$username", 0755;    
+    system "cp -p ${freeside_conf}counters.DBI:Pg:host=localhost\\;dbname=demo_template/* ".
+           "${freeside_conf}counters.DBI:Pg:host=localhost\\;dbname=demo_$username";
+    chown scalar(getpwnam('freeside')), scalar(getgrnam('freeside')),
+           "${freeside_conf}counters.DBI:Pg:host=localhost;dbname=demo_$username";
+
+    system "cp -p ${freeside_conf}dbdef.DBI:Pg:host=localhost\\;dbname=demo_template ".
+           "${freeside_conf}dbdef.DBI:Pg:host=localhost\\;dbname=demo_$username";
+
+    open(INVOICE_FROM, ">${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/invoice_from")
+      or die "Can\'t open ${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/invoice_from: $!";
+    print INVOICE_FROM "$email\n";
+    close INVOICE_FROM;
+
+    open(LPR, ">${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/lpr")
+      or die "Can\'t open ${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/lpr: $!";
+    print LPR "mail $email";
+    close LPR;
+
+    open(FROM, ">${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/registries/internic/from")
+      or die "Can\'t open ${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/registries/internic/from: $!";
+    print FROM "$email\n";
+    close FROM;
+
+    open(TO, ">${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/registries/internic/to")
+      or die "Can\'t open ${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/registries/internic/to: $!";
+    print TO "$email\n";
+    close TO;
+
+    open(SECRETS, ">${freeside_conf}secrets.demo_$username")
+      or die "Can\'t open ${freeside_conf}secrets.demo_$username: $!";
+    chown scalar(getpwnam('freeside')), scalar(getgrnam('freeside')),
+          "${freeside_conf}secrets.demo_$username";
+    chmod 0600, "${freeside_conf}secrets.demo_$username";
+    print SECRETS "DBI:Pg:host=localhost;dbname=demo_$username\nfreeside\nmaelcolm\n";
+    close SECRETS;
+
+    open(MAPSECRETS, ">>${freeside_conf}mapsecrets")
+      or die "Can\'t open ${freeside_conf}mapsecrets: $!";
+    print MAPSECRETS "$username secrets.demo_$username\n";
+    close MAPSECRETS;
+
+    my $user_pw = join('',map($pw_set[ int(rand $#pw_set) ], (0..7) ) );
+    my $crypt_pw =
+      crypt($user_pw,$saltset[int(rand(64))].$saltset[int(rand(64))]);
+
+    $sth = $dbh->prepare(
+      qq(UPDATE mysql_auth SET passwd = "$crypt_pw", status = "done" WHERE username = "$username")
+    );
+    $sth->execute or die $sth->errstr;
+
+    if ( $status eq "unconfigured" ) {
+
+      #$ENV{SMTPHOSTS} = "localhost";
+      $ENV{SMTPHOSTS} = "192.168.1.1";
+      $ENV{MAILADDRESS} = 'ivan-fsreg@sisd.com';
+      $ENV{TZ} = "PST8PDT";
+      $header = Mail::Header->new( [
+        'From: ivan-fsreg@sisd.com',
+        "To: $email",
+        'Bcc: ivan-fsreg_bcc@sisd.com',
+        'Sender: ivan-fsreg@sisd.com',
+        'Reply-To: ivan-fsreg@sisd.com',
+        #'Date: '. time2str("%a, %d %b %Y %X %z", time ),
+        'Date: '. time2str("%a, %d %b %Y %X ", time ). "-0800",
+        'Subject: Freeside demo information',
+      ] );
+      $msg = Mail::Internet->new(
+        'Header' => $header,
+        'Body' => [
+      "Hello,\n",
+      "\n",
+      "Your sample Freeside database has been setup.\n",
+      "\n",
+      "Point your web browswer at http://freeside.sisd.com/ and use the following\n",
+      "authentication information:\n",
+      "\n",
+      "Username: $username\n",
+      "Password: $user_pw\n",
+      "\n",
+      "-- \n",
+      "ivan\n",
+                  ]
+      );
+      $msg->smtpsend or die "Can\'t send registration email!";
+    }
+
+  }
+
+  $SIG{HUP} = 'DEFAULT';
+  $SIG{INT} = 'DEFAULT';
+  $SIG{QUIT} = 'DEFAULT';
+  $SIG{TERM} = 'DEFAULT';
+  $SIG{TSTP} = 'DEFAULT';
+  $SIG{PIPE} = 'DEFAULT';
+
+  sleep 5;
+
+}
+
diff --git a/htdocs/docs/man/FS.html b/htdocs/docs/man/FS.html
index ab01acf99..3d07462af 100644
--- a/htdocs/docs/man/FS.html
+++ b/htdocs/docs/man/FS.html
@@ -1,246 +1,137 @@
 <HTML>
 <HEAD>
 <TITLE>FS - Freeside Perl modules</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
 	<UL>
 
-		<LI><A HREF="#Database_metadata_classes">Database metadata classes</A>
-		<LI><A HREF="#Utility_classes">Utility classes</A>
-		<LI><A HREF="#Database_record_classes">Database record classes</A>
-		<LI><A HREF="#User_Interface_classes_under_de">User Interface classes (under development; not yet usable)</A>
-		<LI><A HREF="#Notes">Notes</A>
+		<LI><A HREF="#utility classes">Utility classes</A></LI>
+		<LI><A HREF="#database record classes">Database record classes</A></LI>
+		<LI><A HREF="#user interface classes (under development; not yet usable)">User Interface classes (under development; not yet usable)</A></LI>
+		<LI><A HREF="#notes">Notes</A></LI>
 	</UL>
 
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#SUPPORT">SUPPORT</A>
-	<LI><A HREF="#AUTHOR">AUTHOR</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
-	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#support">SUPPORT</A></LI>
+	<LI><A HREF="#author">AUTHOR</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS - Freeside Perl modules
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS - Freeside Perl modules</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-FS is the temporary prefix for many disparate modules written for the
-Freeside ISP billing software. This includes:
-
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<P>FS is the unofficial (i.e. non-CPAN) prefix for the Perl module portion of the
+Freeside ISP billing software.  This includes:</P>
+<P>
+<H2><A NAME="utility classes">Utility classes</A></H2>
+<P><A HREF="././FS/Conf.html">the FS::Conf manpage</A> - Freeside configuration values</P>
+<P><A HREF="././FS/UID.html">the FS::UID manpage</A> - User class (not yet OO)</P>
+<P><A HREF="././FS/CGI.html">the FS::CGI manpage</A> - Non OO-subroutines for the web interface.  This is
+depriciated.  Future development will be focused on the FS::UI user-interface
+classes (see below).</P>
+<P>
+<H2><A NAME="database record classes">Database record classes</A></H2>
+<P><A HREF="././FS/Record.html">the FS::Record manpage</A> - Database record base class</P>
+<P><A HREF="././FS/svc_acct_pop.html">the FS::svc_acct_pop manpage</A> - POP (Point of Presence, not Post
+Office Protocol) class</P>
+<P><A HREF="././FS/part_referral.html">the FS::part_referral manpage</A> - Referral class</P>
+<P><A HREF="././FS/cust_main_county.html">the FS::cust_main_county manpage</A> - Locale (tax rate) class</P>
+<P><A HREF="././FS/svc_Common.html">the FS::svc_Common manpage</A> - Service base class</P>
+<P><A HREF="././FS/svc_acct.html">the FS::svc_acct manpage</A> - Account (shell, RADIUS, POP3) class</P>
+<P><A HREF="././FS/svc_domain.html">the FS::svc_domain manpage</A> - Domain class</P>
+<P><A HREF="././FS/domain_record.html">the FS::domain_record manpage</A> - DNS zone entries</P>
+<P><A HREF="././FS/svc_acct_sm.html">the FS::svc_acct_sm manpage</A> - Vitual mail alias class</P>
+<P><A HREF="././FS/svc_www.html">the FS::svc_www manpage</A> - Web virtual host class.</P>
+<P><A HREF="././FS/part_svc.html">the FS::part_svc manpage</A> - Service definition class</P>
+<P><A HREF="././FS/part_pkg.html">the FS::part_pkg manpage</A> - Package (billing item) definition class</P>
+<P><A HREF="././FS/pkg_svc.html">the FS::pkg_svc manpage</A> - Class linking package (billing item)
+definitions (see <A HREF="././FS/part_pkg.html">the FS::part_pkg manpage</A>) with service definitions
+(see <A HREF="././FS/part_svc.html">the FS::part_svc manpage</A>)</P>
+<P><A HREF="././FS/agent.html">the FS::agent manpage</A> - Agent (reseller) class</P>
+<P><A HREF="././FS/agent_type.html">the FS::agent_type manpage</A> - Agent type class</P>
+<P><A HREF="././FS/type_pkgs.html">the FS::type_pkgs manpage</A> - Class linking agent types (see
+<A HREF="././FS/agent_type.html">the FS::agent_type manpage</A>) with package (billing item) definitions
+(see <A HREF="././FS/part_pkg.html">the FS::part_pkg manpage</A>)</P>
+<P><A HREF="././FS/cust_svc.html">the FS::cust_svc manpage</A> - Service class</P>
+<P><A HREF="././FS/cust_pkg.html">the FS::cust_pkg manpage</A> - Package (billing item) class</P>
+<P><A HREF="././FS/cust_main.html">the FS::cust_main manpage</A> - Customer class</P>
+<P><A HREF="././FS/cust_main_invoice.html">the FS::cust_main_invoice manpage</A> - Invoice destination
+class</P>
+<P><A HREF="././FS/cust_bill.html">the FS::cust_bill manpage</A> - Invoice class</P>
+<P><A HREF="././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A> - Invoice line item class</P>
+<P><A HREF="././FS/cust_pay.html">the FS::cust_pay manpage</A> - Payment class</P>
+<P><A HREF="././FS/cust_credit.html">the FS::cust_credit manpage</A> - Credit class</P>
+<P><A HREF="././FS/cust_refund.html">the FS::cust_refund manpage</A> - Refund class</P>
+<P><A HREF="././FS/cust_pay_batch.html">the FS::cust_pay_batch manpage</A> - Credit card transaction queue class</P>
+<P><A HREF="././FS/prepay_credit.html">the FS::prepay_credit manpage</A> - Prepaid ``calling card'' credit class.</P>
+<P><A HREF="././FS/nas.html">the FS::nas manpage</A> - Network Access Server class</P>
+<P><A HREF="././FS/port.html">the FS::port manpage</A> - NAS port class</P>
+<P><A HREF="././FS/session.html">the FS::session manpage</A> - User login session class</P>
+<P>
+<H2><A NAME="user interface classes (under development; not yet usable)">User Interface classes (under development; not yet usable)</A></H2>
+<P><A HREF="././FS/UI/Base.html">the FS::UI::Base manpage</A> - User-interface base class</P>
+<P><A HREF="././FS/UI/Gtk.html">the FS::UI::Gtk manpage</A> - Gtk user-interface class</P>
+<P><A HREF="././FS/UI/CGI.html">the FS::UI::CGI manpage</A> - CGI (HTML) user-interface class</P>
+<P><A HREF="././FS/UI/agent.html">the FS::UI::agent manpage</A> - agent table user-interface class</P>
+<P>
+<H2><A NAME="notes">Notes</A></H2>
+<P>To quote perl(1), ``If you're intending to read these straight through for the
+first time, the suggested order will tend to reduce the number of forward
+references.''</P>
 <P>
 <HR>
-<H2><A NAME="Database_metadata_classes">Database metadata classes</A></H2>
-<P>
-<A HREF="./FS/dbdef.html">FS::dbdef</A> - Database class
-
-<P>
-<A HREF="./FS/dbdef_table.html">FS::dbdef_table</A> - Database table class
-
-<P>
-<A HREF="./FS/dbdef_column.html">FS::dbdef_column</A> - Database column class
-
-<P>
-<A HREF="./FS/dbdef_colgroup.html">FS::dbdef_colgroup</A> - Database column group class
-
-<P>
-<A HREF="./FS/dbdef_index.html">FS::dbdef_index</A> - Database index class
-
-<P>
-<A HREF="./FS/dbdef_unique.html">FS::dbdef_unique</A> - Database unique index class
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>Freeside is a billing and administration package for Internet Service
+Providers.</P>
+<P>The Freeside home page is at &lt;http://www.sisd.com/freeside&gt;.</P>
+<P>The main documentation is in htdocs/docs.</P>
 <P>
 <HR>
-<H2><A NAME="Utility_classes">Utility classes</A></H2>
-<P>
-<A HREF="./FS/SSH.html">FS::SSH</A> - Simple wrappers around ssh and scp commands.
-
-<P>
-<A HREF="./FS/Conf.html">FS::Conf</A> - Freeside configuration values
-
-<P>
-<A HREF="./FS/UID.html">FS::UID</A> - User class (not yet OO)
-
-<P>
-<A HREF="./FS/CGI.html">FS::CGI</A> - Non OO-subroutines for the web interface. This is depriciated. Future
-development will be focused on the FS::UI user-interface classes (see
-below).
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: FS.html,v 1.3 2001-04-23 12:40:30 ivan Exp $</P>
 <P>
 <HR>
-<H2><A NAME="Database_record_classes">Database record classes</A></H2>
-<P>
-<A HREF="./FS/Record.html">FS::Record</A> - Database record base class
-
-<P>
-<A HREF="./FS/svc_acct_pop.html">FS::svc_acct_pop</A> - POP (Point of Presence, not Post Office Protocol) class
-
-<P>
-<A HREF="./FS/part_referral.html">FS::part_referral</A> - Referral class
-
-<P>
-<A HREF="./FS/cust_main_county.html">FS::cust_main_county</A> - Locale (tax rate) class
-
-<P>
-<A HREF="./FS/svc_Common.html">FS::svc_Common</A> - Service base class
-
-<P>
-<A HREF="./FS/svc_acct.html">FS::svc_acct</A> - Account (shell, RADIUS, POP3) class
-
-<P>
-<A HREF="./FS/svc_domain.html">FS::svc_domain</A> - Domain class
-
-<P>
-<A HREF="./FS/svc_acct_sm.html">FS::svc_acct_sm</A> - Vitual mail alias class
-
-<P>
-<A HREF="./FS/part_svc.html">FS::part_svc</A> - Service definition class
-
-<P>
-<A HREF="./FS/part_pkg.html">FS::part_pkg</A> - Package (billing item) definition class
-
-<P>
-<A HREF="./FS/pkg_svc.html">FS::pkg_svc</A> - Class linking package (billing item) definitions (see <A HREF="./FS/part_pkg.html">FS::part_pkg</A>) with service definitions (see <A HREF="./FS/part_svc.html">FS::part_svc</A>)
-
-<P>
-<A HREF="./FS/agent.html">FS::agent</A> - Agent (reseller) class
-
-<P>
-<A HREF="./FS/agent_type.html">FS::agent_type</A> - Agent type class
-
-<P>
-<A HREF="./FS/type_pkgs.html">FS::type_pkgs</A> - Class linking agent types (see
-<A HREF="./FS/agent_type.html">FS::agent_type</A>) with package (billing item) definitions (see <A HREF="./FS/part_pkg.html">FS::part_pkg</A>)
-
-<P>
-<A HREF="./FS/cust_svc.html">FS::cust_svc</A> - Service class
-
-<P>
-<A HREF="./FS/cust_pkg.html">FS::cust_pkg</A> - Package (billing item) class
-
-<P>
-<A HREF="./FS/cust_main.html">FS::cust_main</A> - Customer class
-
-<P>
-<A HREF="./FS/cust_main_invoice.html">FS::cust_main_invoice</A> - Invoice destination class
-
-<P>
-<A HREF="./FS/cust_bill.html">FS::cust_bill</A> - Invoice class
-
-<P>
-<A HREF="./FS/cust_bill_pkg.html">FS::cust_bill_pkg</A> - Invoice line item class
-
-<P>
-<A HREF="./FS/cust_pay.html">FS::cust_pay</A> - Payment class
-
-<P>
-<A HREF="./FS/cust_credit.html">FS::cust_credit</A> - Credit class
-
-<P>
-<A HREF="./FS/cust_refund.html">FS::cust_refund</A> - Refund class
-
-<P>
-<A HREF="./FS/cust_pay_batch.html">FS::cust_pay_batch</A> - Credit card transaction queue class
-
-<P>
-<HR>
-<H2><A NAME="User_Interface_classes_under_de">User Interface classes (under development; not yet usable)</A></H2>
-<P>
-<A HREF="./FS/UI/Base.html">FS::UI::Base</A> - User-interface base class
-
-<P>
-<A HREF="./FS/UI/Gtk.html">FS::UI::Gtk</A> - Gtk user-interface class
-
-<P>
-<A HREF="./FS/UI/CGI.html">FS::UI::CGI</A> - CGI (HTML) user-interface class
-
-<P>
-<A HREF="./FS/UI/agent.html">FS::UI::agent</A> - agent table user-interface class
-
-<P>
-<HR>
-<H2><A NAME="Notes">Notes</A></H2>
-<P>
-To quote <CODE>perl(1),</CODE> ``If you're intending to read these straight
-through for the first time, the suggested order will tend to reduce the
-number of forward references.''
-
-<P>
-<HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-Freeside is a billing and administration package for Internet Service
-Providers.
-
-<P>
-The Freeside home page is at &lt;http://www.sisd.com/freeside&gt;.
-
-<P>
-The main documentation is in htdocs/docs.
-
-<P>
-<HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: FS.html,v 1.2 2000-03-03 18:22:42 ivan Exp $
-
-<P>
-<HR>
-<H1><A NAME="SUPPORT">SUPPORT</A></H1>
-<P>
-A mailing list for users and developers is available. Send a blank message
-to &lt;<A
-HREF="mailto:ivan-freeside-subscribe@sisd.com">ivan-freeside-subscribe@sisd.com</A>&gt;
-to subscribe.
-
-<P>
-Commercial support is available; see
-&lt;http://www.sisd.com/freeside/commercial.html&gt;.
-
+<H1><A NAME="support">SUPPORT</A></H1>
+<P>A mailing list for users and developers is available.  Send a blank message to
+&lt;<A HREF="mailto:ivan-freeside-subscribe@sisd.com">ivan-freeside-subscribe@sisd.com</A>&gt; to subscribe.</P>
+<P>Commercial support is available; see
+&lt;http://www.sisd.com/freeside/commercial.html&gt;.</P>
 <P>
 <HR>
-<H1><A NAME="AUTHOR">AUTHOR</A></H1>
-<P>
-Primarily Ivan Kohler &lt;<A
-HREF="mailto:ivan@sisd.com">ivan@sisd.com</A>&gt;, with help from many kind
-folks.
-
-<P>
-See the CREDITS file in the Freeside distribution for a (hopefully)
-complete list and the individal files for details.
-
+<H1><A NAME="author">AUTHOR</A></H1>
+<P>Primarily Ivan Kohler &lt;<A HREF="mailto:ivan@sisd.com">ivan@sisd.com</A>&gt;, with help from many kind folks.</P>
+<P>See the CREDITS file in the Freeside distribution for a (hopefully) complete
+list and the individal files for details.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<CODE>perl(1),</CODE> main Freeside documentation in htdocs/docs/
-
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P>perl(1), main Freeside documentation in htdocs/docs/</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-The version number of the FS Perl extension differs from the version of the
-Freeside distribution, which are both different from the CVS version tag
-for each file, which appears under the VERSION heading.
-
-<P>
-Those modules which would be useful separately should be pulled out,
-renamed appropriately and uploaded to CPAN.
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The version number of the FS Perl extension differs from the version of the
+Freeside distribution, which are both different from the CVS version tag for
+each file, which appears under the VERSION heading.</P>
+<P>Those modules which would be useful separately should be pulled out, 
+renamed appropriately and uploaded to CPAN.  So far: DBIx::DBSchema, Net::SSH
+and Net::SCP...</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/CGI.html b/htdocs/docs/man/FS/CGI.html
index 8bcb6a27a..05f7823b4 100644
--- a/htdocs/docs/man/FS/CGI.html
+++ b/htdocs/docs/man/FS/CGI.html
@@ -1,114 +1,94 @@
 <HTML>
 <HEAD>
 <TITLE>FS::CGI - Subroutines for the web interface</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#SUBROUTINES">SUBROUTINES</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::CGI - Subroutines for the web interface
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::CGI - Subroutines for the web interface</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::CGI qw(header menubar idiot eidiot popurl);
-</PRE>
-<P>
-<PRE>  print header( 'Title', '' );
-  print header( 'Title', menubar('item', 'URL', ... ) );
-</PRE>
-<P>
-<PRE>  idiot &quot;error message&quot;; 
-  eidiot &quot;error message&quot;;
-</PRE>
-<P>
-<PRE>  $url = popurl; #returns current url
-  $url = popurl(3); #three levels up
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::CGI qw(header menubar idiot eidiot popurl);</PRE>
+<PRE>
+  print header( 'Title', '' );
+  print header( 'Title', menubar('item', 'URL', ... ) );</PRE>
+<PRE>
+  idiot &quot;error message&quot;; 
+  eidiot &quot;error message&quot;;</PRE>
+<PRE>
+  $url = popurl; #returns current url
+  $url = popurl(3); #three levels up</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-Provides a few common subroutines for the web interface.
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>Provides a few common subroutines for the web interface.</P>
 <P>
 <HR>
-<H1><A NAME="SUBROUTINES">SUBROUTINES</A></H1>
+<H1><A NAME="subroutines">SUBROUTINES</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_header">header TITLE, MENUBAR</A></STRONG><DD>
-<P>
+<DT><STRONG><A NAME="item_header">header TITLE, MENUBAR</A></STRONG><BR>
+<DD>
 Returns an HTML header.
-
-<DT><STRONG><A NAME="item_menubar">menubar ITEM, URL, ...</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_menubar_ITEM%2C_URL%2C_%2E%2E%2E">menubar ITEM, URL, ...</A></STRONG><BR>
+<DD>
 Returns an HTML menubar.
-
-<DT><STRONG><A NAME="item_idiot">idiot ERROR</A></STRONG><DD>
-<P>
-This is depriciated. Don't use it.
-
-<P>
-Sends headers and an HTML error message.
-
-<DT><STRONG><A NAME="item_eidiot">eidiot ERROR</A></STRONG><DD>
-<P>
-This is depriciated. Don't use it.
-
-<P>
-Sends headers and an HTML error message, then exits.
-
-<DT><STRONG><A NAME="item_popurl">popurl LEVEL</A></STRONG><DD>
-<P>
-Returns current URL with LEVEL levels of path removed from the end (default
-0).
-
-<DT><STRONG><A NAME="item_table">table</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_idiot">idiot ERROR</A></STRONG><BR>
+<DD>
+This is depriciated.  Don't use it.
+<P>Sends headers and an HTML error message.</P>
+<P></P>
+<DT><STRONG><A NAME="item_eidiot">eidiot ERROR</A></STRONG><BR>
+<DD>
+This is depriciated.  Don't use it.
+<P>Sends headers and an HTML error message, then exits.</P>
+<P></P>
+<DT><STRONG><A NAME="item_popurl">popurl LEVEL</A></STRONG><BR>
+<DD>
+Returns current URL with LEVEL levels of path removed from the end (default 0).
+<P></P>
+<DT><STRONG><A NAME="item_table">table</A></STRONG><BR>
+<DD>
 Returns HTML tag for beginning a table.
-
-<DT><STRONG><A NAME="item_itable">itable</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_itable">itable</A></STRONG><BR>
+<DD>
 Returns HTML tag for beginning an (invisible) table.
-
-<DT><STRONG><A NAME="item_ntable">ntable</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_ntable">ntable</A></STRONG><BR>
+<DD>
 This is getting silly.
-
-</DL>
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-Not OO.
-
-<P>
-Not complete.
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>Not OO.</P>
+<P>Not complete.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF=".././FS/CGI.html#">the CGI manpage</A>, <A HREF="../CGI/Base.html">CGI::Base</A>
-
-
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/CGI.html">the CGI manpage</A>, <A HREF="../CGI/Base.html">the CGI::Base manpage</A></P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/Conf.html b/htdocs/docs/man/FS/Conf.html
index 563eea878..7b1613efd 100644
--- a/htdocs/docs/man/FS/Conf.html
+++ b/htdocs/docs/man/FS/Conf.html
@@ -1,93 +1,80 @@
 <HTML>
 <HEAD>
 <TITLE>FS::Conf - Read access to Freeside configuration values</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::Conf - Read access to Freeside configuration values
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::Conf - Read access to Freeside configuration values</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::Conf;
-</PRE>
-<P>
-<PRE>  $conf = new FS::Conf &quot;/config/directory&quot;;
-</PRE>
-<P>
-<PRE>  $FS::Conf::default_dir = &quot;/config/directory&quot;;
-  $conf = new FS::Conf;
-</PRE>
-<P>
-<PRE>  $dir = $conf-&gt;dir;
-</PRE>
-<P>
-<PRE>  $value = $conf-&gt;config('key');
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::Conf;</PRE>
+<PRE>
+  $conf = new FS::Conf &quot;/config/directory&quot;;</PRE>
+<PRE>
+  $FS::Conf::default_dir = &quot;/config/directory&quot;;
+  $conf = new FS::Conf;</PRE>
+<PRE>
+  $dir = $conf-&gt;dir;</PRE>
+<PRE>
+  $value = $conf-&gt;config('key');
   @list  = $conf-&gt;config('key');
-  $bool  = $conf-&gt;exists('key');
-</PRE>
+  $bool  = $conf-&gt;exists('key');</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-Read access to Freeside configuration values. Keys currently map to
-filenames, but this may change in the future.
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>Read access to Freeside configuration values.  Keys currently map to filenames,
+but this may change in the future.</P>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new [ DIRECTORY ]</A></STRONG><DD>
-<P>
-Create a new configuration object. A directory arguement is required if
+<DT><STRONG><A NAME="item_new_%5B_DIRECTORY_%5D">new [ DIRECTORY ]</A></STRONG><BR>
+<DD>
+Create a new configuration object.  A directory arguement is required if
 $FS::Conf::default_dir has not been set.
-
-<DT><STRONG><A NAME="item_dir">dir</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_dir">dir</A></STRONG><BR>
+<DD>
 Returns the directory.
-
-<DT><STRONG><A NAME="item_config">config</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_config">config</A></STRONG><BR>
+<DD>
 Returns the configuration value or values (depending on context) for key.
-
-<DT><STRONG><A NAME="item_exists">exists</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_exists">exists</A></STRONG><BR>
+<DD>
 Returns true if the specified key exists, even if the corresponding value
 is undefined.
-
-</DL>
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-Write access (with locking) should be implemented.
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>Write access (with locking) should be implemented.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-config.html from the base documentation contains a list of configuration
-files.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P>config.html from the base documentation contains a list of configuration files.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/Record.html b/htdocs/docs/man/FS/Record.html
index 924f0b662..cc3d37795 100644
--- a/htdocs/docs/man/FS/Record.html
+++ b/htdocs/docs/man/FS/Record.html
@@ -1,87 +1,74 @@
 <HTML>
 <HEAD>
 <TITLE>FS::Record - Database record objects</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#CONSTRUCTORS">CONSTRUCTORS</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#SUBROUTINES">SUBROUTINES</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#constructors">CONSTRUCTORS</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::Record - Database record objects
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::Record - Database record objects</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>    use FS::Record;
-    use FS::Record qw(dbh fields qsearch qsearchs dbdef);
-</PRE>
-<P>
-<PRE>    $record = new FS::Record 'table', \%hash;
-    $record = new FS::Record 'table', { 'column' =&gt; 'value', ... };
-</PRE>
-<P>
-<PRE>    $record  = qsearchs FS::Record 'table', \%hash;
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+    use FS::Record;
+    use FS::Record qw(dbh fields qsearch qsearchs dbdef);</PRE>
+<PRE>
+    $record = new FS::Record 'table', \%hash;
+    $record = new FS::Record 'table', { 'column' =&gt; 'value', ... };</PRE>
+<PRE>
+    $record  = qsearchs FS::Record 'table', \%hash;
     $record  = qsearchs FS::Record 'table', { 'column' =&gt; 'value', ... };
     @records = qsearch  FS::Record 'table', \%hash; 
-    @records = qsearch  FS::Record 'table', { 'column' =&gt; 'value', ... };
-</PRE>
-<P>
-<PRE>    $table = $record-&gt;table;
-    $dbdef_table = $record-&gt;dbdef_table;
-</PRE>
-<P>
-<PRE>    $value = $record-&gt;get('column');
+    @records = qsearch  FS::Record 'table', { 'column' =&gt; 'value', ... };</PRE>
+<PRE>
+    $table = $record-&gt;table;
+    $dbdef_table = $record-&gt;dbdef_table;</PRE>
+<PRE>
+    $value = $record-&gt;get('column');
     $value = $record-&gt;getfield('column');
-    $value = $record-&gt;column;
-</PRE>
-<P>
-<PRE>    $record-&gt;set( 'column' =&gt; 'value' );
+    $value = $record-&gt;column;</PRE>
+<PRE>
+    $record-&gt;set( 'column' =&gt; 'value' );
     $record-&gt;setfield( 'column' =&gt; 'value' );
-    $record-&gt;column('value');
-</PRE>
-<P>
-<PRE>    %hash = $record-&gt;hash;
-</PRE>
-<P>
-<PRE>    $hashref = $record-&gt;hashref;
-</PRE>
-<P>
-<PRE>    $error = $record-&gt;insert;
-    #$error = $record-&gt;add; #depriciated
-</PRE>
-<P>
-<PRE>    $error = $record-&gt;delete;
-    #$error = $record-&gt;del; #depriciated
-</PRE>
-<P>
-<PRE>    $error = $new_record-&gt;replace($old_record);
-    #$error = $new_record-&gt;rep($old_record); #depriciated
-</PRE>
-<P>
-<PRE>    $value = $record-&gt;unique('column');
-</PRE>
-<P>
-<PRE>    $value = $record-&gt;ut_float('column');
+    $record-&gt;column('value');</PRE>
+<PRE>
+    %hash = $record-&gt;hash;</PRE>
+<PRE>
+    $hashref = $record-&gt;hashref;</PRE>
+<PRE>
+    $error = $record-&gt;insert;
+    #$error = $record-&gt;add; #depriciated</PRE>
+<PRE>
+    $error = $record-&gt;delete;
+    #$error = $record-&gt;del; #depriciated</PRE>
+<PRE>
+    $error = $new_record-&gt;replace($old_record);
+    #$error = $new_record-&gt;rep($old_record); #depriciated</PRE>
+<PRE>
+    $value = $record-&gt;unique('column');</PRE>
+<PRE>
+    $value = $record-&gt;ut_float('column');
     $value = $record-&gt;ut_number('column');
     $value = $record-&gt;ut_numbern('column');
     $value = $record-&gt;ut_money('column');
@@ -90,291 +77,266 @@ FS::Record - Database record objects
     $value = $record-&gt;ut_alpha('column');
     $value = $record-&gt;ut_alphan('column');
     $value = $record-&gt;ut_phonen('column');
-    $value = $record-&gt;ut_anythingn('column');
-</PRE>
-<P>
-<PRE>    $dbdef = reload_dbdef;
+    $value = $record-&gt;ut_anythingn('column');</PRE>
+<PRE>
+    $dbdef = reload_dbdef;
     $dbdef = reload_dbdef &quot;/non/standard/filename&quot;;
-    $dbdef = dbdef;
-</PRE>
-<P>
-<PRE>    $quoted_value = _quote($value,'table','field');
-</PRE>
-<P>
-<PRE>    #depriciated
+    $dbdef = dbdef;</PRE>
+<PRE>
+    $quoted_value = _quote($value,'table','field');</PRE>
+<PRE>
+    #depriciated
     $fields = hfields('table');
-    if ( $fields-&gt;{Field} ) { # etc.
-</PRE>
-<P>
-<PRE>    @fields = fields 'table'; #as a subroutine
-    @fields = $record-&gt;fields; #as a method call
-</PRE>
+    if ( $fields-&gt;{Field} ) { # etc.</PRE>
+<PRE>
+    @fields = fields 'table'; #as a subroutine
+    @fields = $record-&gt;fields; #as a method call</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-(Mostly) object-oriented interface to database records. Records are
-currently implemented on top of DBI. FS::Record is intended as a base class
-for table-specific classes to inherit from, i.e. FS::cust_main.
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>(Mostly) object-oriented interface to database records.  Records are currently
+implemented on top of DBI.  FS::Record is intended as a base class for
+table-specific classes to inherit from, i.e. FS::cust_main.</P>
 <P>
 <HR>
-<H1><A NAME="CONSTRUCTORS">CONSTRUCTORS</A></H1>
+<H1><A NAME="constructors">CONSTRUCTORS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new [ TABLE, ] HASHREF</A></STRONG><DD>
-<P>
-Creates a new record. It doesn't store it in the database, though. See
+<DT><STRONG><A NAME="item_new_%5B_TABLE%2C_%5D_HASHREF">new [ TABLE, ] HASHREF</A></STRONG><BR>
+<DD>
+Creates a new record.  It doesn't store it in the database, though.  See
 <A HREF="#insert">insert</A> for that.
-
-<P>
-Note that the object stores this hash reference, not a distinct copy of the
-hash it points to. You can ask the object for a copy with the <EM>hash</EM> 
-method.
-
-<P>
-TABLE can only be omitted when a dervived class overrides the table method.
-
-<DT><STRONG><A NAME="item_qsearch">qsearch TABLE, HASHREF</A></STRONG><DD>
-<P>
-Searches the database for all records matching (at least) the key/value
-pairs in HASHREF. Returns all the records found as `FS::TABLE' objects if
-that module is loaded (i.e. via `use FS::cust_main;'), otherwise returns
-FS::Record objects.
-
-<DT><STRONG><A NAME="item_qsearchs">qsearchs TABLE, HASHREF</A></STRONG><DD>
-<P>
-Same as qsearch, except that if more than one record matches, it <STRONG>carp</STRONG>s but returns the first. If this happens, you either made a logic error in
-asking for a single item, or your data is corrupted.
-
-</DL>
+<P>Note that the object stores this hash reference, not a distinct copy of the
+hash it points to.  You can ask the object for a copy with the <EM>hash</EM> 
+method.</P>
+<P>TABLE can only be omitted when a dervived class overrides the table method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_qsearch_TABLE%2C_HASHREF%2C_SELECT%2C_EXTRA_SQL">qsearch TABLE, HASHREF, SELECT, EXTRA_SQL</A></STRONG><BR>
+<DD>
+Searches the database for all records matching (at least) the key/value pairs
+in HASHREF.  Returns all the records found as `FS::TABLE' objects if that
+module is loaded (i.e. via `use FS::cust_main;'), otherwise returns FS::Record
+objects.
+<P>###oops, argh, FS::Record::new only lets us create database fields.
+#Normal behaviour if SELECT is not specified is `*', as in
+#<CODE>SELECT * FROM table WHERE ...</CODE>.  However, there is an experimental new
+#feature where you can specify SELECT - remember, the objects returned,
+#although blessed into the appropriate `FS::TABLE' package, will only have the
+#fields you specify.  This might have unwanted results if you then go calling
+#regular FS::TABLE methods
+#on it.</P>
+<P></P>
+<DT><STRONG><A NAME="item_qsearchs">qsearchs TABLE, HASHREF</A></STRONG><BR>
+<DD>
+Same as qsearch, except that if more than one record matches, it <STRONG>carp</STRONG>s but
+returns the first.  If this happens, you either made a logic error in asking
+for a single item, or your data is corrupted.
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_table">table</A></STRONG><DD>
-<P>
+<DT><STRONG><A NAME="item_table">table</A></STRONG><BR>
+<DD>
 Returns the table name.
-
-<DT><STRONG><A NAME="item_dbdef_table">dbdef_table</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_dbdef_table">dbdef_table</A></STRONG><BR>
+<DD>
 Returns the FS::dbdef_table object for the table.
-
-<DT><STRONG><A NAME="item_get">get, getfield COLUMN</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_get%2C_getfield_COLUMN">get, getfield COLUMN</A></STRONG><BR>
+<DD>
 Returns the value of the column/field/key COLUMN.
-
-<DT><STRONG><A NAME="item_set">set, setfield COLUMN, VALUE</A></STRONG><DD>
-<P>
-Sets the value of the column/field/key COLUMN to VALUE. Returns VALUE.
-
-<DT><STRONG><A NAME="item_AUTLOADED">AUTLOADED METHODS</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_set%2C_setfield_COLUMN%2C_VALUE">set, setfield COLUMN, VALUE</A></STRONG><BR>
+<DD>
+Sets the value of the column/field/key COLUMN to VALUE.  Returns VALUE.
+<P></P>
+<DT><STRONG><A NAME="item_AUTLOADED_METHODS">AUTLOADED METHODS</A></STRONG><BR>
+<DD>
 $record-&gt;column is a synonym for $record-&gt;get('column');
-
-<P>
-$record-&gt;column('value') is a synonym for
-$record-&gt;set('column','value');
-
-<DT><STRONG><A NAME="item_hash">hash</A></STRONG><DD>
-<P>
-Returns a list of the column/value pairs, usually for assigning to a new
-hash.
-
-<P>
-To make a distinct duplicate of an FS::Record object, you can do:
-
-<P>
-<PRE>    $new = new FS::Record ( $old-&gt;table, { $old-&gt;hash } );
-</PRE>
-<DT><STRONG><A NAME="item_hashref">hashref</A></STRONG><DD>
-<P>
+<P>$record-&gt;<CODE>column('value')</CODE> is a synonym for $record-&gt;set('column','value');</P>
+<P></P>
+<DT><STRONG><A NAME="item_hash">hash</A></STRONG><BR>
+<DD>
+Returns a list of the column/value pairs, usually for assigning to a new hash.
+<P>To make a distinct duplicate of an FS::Record object, you can do:</P>
+<PRE>
+    $new = new FS::Record ( $old-&gt;table, { $old-&gt;hash } );</PRE>
+<P></P>
+<DT><STRONG><A NAME="item_hashref">hashref</A></STRONG><BR>
+<DD>
 Returns a reference to the column/value hash.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Inserts this record to the database. If there is an error, returns the
-error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_add">add</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Inserts this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_add">add</A></STRONG><BR>
+<DD>
 Depriciated (use insert instead).
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
-Delete this record from the database. If there is an error, returns the
-error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_del">del</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Delete this record from the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_del">del</A></STRONG><BR>
+<DD>
 Depriciated (use delete instead).
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replace the OLD_RECORD with this one in the database. If there is an error,
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replace the OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_rep">rep</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_rep">rep</A></STRONG><BR>
+<DD>
 Depriciated (use replace instead).
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Not yet implemented, croaks. Derived classes should provide a check method.
-
-<DT><STRONG><A NAME="item_unique">unique COLUMN</A></STRONG><DD>
-<P>
-Replaces COLUMN in record with a unique number. Called by the <STRONG>add</STRONG> method on primary keys and single-field unique columns (see <A HREF="../FS/dbdef_table.html">FS::dbdef_table</A>). Returns the new value.
-
-<DT><STRONG><A NAME="item_ut_float">ut_float COLUMN</A></STRONG><DD>
-<P>
-Check/untaint floating point numeric data: 1.1, 1, 1.1e10, 1e10. May not be
-null. If there is an error, returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_ut_number">ut_number COLUMN</A></STRONG><DD>
-<P>
-Check/untaint simple numeric data (whole numbers). May not be null. If
-there is an error, returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_ut_numbern">ut_numbern COLUMN</A></STRONG><DD>
-<P>
-Check/untaint simple numeric data (whole numbers). May be null. If there is
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Not yet implemented, croaks.  Derived classes should provide a check method.
+<P></P>
+<DT><STRONG><A NAME="item_unique">unique COLUMN</A></STRONG><BR>
+<DD>
+Replaces COLUMN in record with a unique number.  Called by the <STRONG>add</STRONG> method
+on primary keys and single-field unique columns (see <A HREF="../DBIx/DBSchema/Table.html">the DBIx::DBSchema::Table manpage</A>).
+Returns the new value.
+<P></P>
+<DT><STRONG><A NAME="item_ut_float_COLUMN">ut_float COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint floating point numeric data: 1.1, 1, 1.1e10, 1e10.  May not be
+null.  If there is an error, returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_ut_number_COLUMN">ut_number COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint simple numeric data (whole numbers).  May not be null.  If there
+is an error, returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_ut_numbern_COLUMN">ut_numbern COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint simple numeric data (whole numbers).  May be null.  If there is
 an error, returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_ut_money">ut_money COLUMN</A></STRONG><DD>
-<P>
-Check/untaint monetary numbers. May be negative. Set to 0 if null. If there
+<P></P>
+<DT><STRONG><A NAME="item_ut_money_COLUMN">ut_money COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint monetary numbers.  May be negative.  Set to 0 if null.  If there
 is an error, returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_ut_text">ut_text COLUMN</A></STRONG><DD>
-<P>
-Check/untaint text. Alphanumerics, spaces, and the following punctuation
+<P></P>
+<DT><STRONG><A NAME="item_ut_text_COLUMN">ut_text COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint text.  Alphanumerics, spaces, and the following punctuation
 symbols are currently permitted: ! @ # $ % &amp; ( ) - + ; : ' `` , . ? /
-May not be null. If there is an error, returns the error, otherwise returns
+May not be null.  If there is an error, returns the error, otherwise returns
 false.
-
-<DT><STRONG><A NAME="item_ut_textn">ut_textn COLUMN</A></STRONG><DD>
-<P>
-Check/untaint text. Alphanumerics, spaces, and the following punctuation
+<P></P>
+<DT><STRONG><A NAME="item_ut_textn_COLUMN">ut_textn COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint text.  Alphanumerics, spaces, and the following punctuation
 symbols are currently permitted: ! @ # $ % &amp; ( ) - + ; : ' `` , . ? /
-May be null. If there is an error, returns the error, otherwise returns
-false.
-
-<DT><STRONG><A NAME="item_ut_alpha">ut_alpha COLUMN</A></STRONG><DD>
-<P>
-Check/untaint alphanumeric strings (no spaces). May not be null. If there
-is an error, returns the error, otherwise returns false.
-
-<DT><STRONG>ut_alpha COLUMN</STRONG><DD>
-<P>
-Check/untaint alphanumeric strings (no spaces). May be null. If there is an
+May be null.  If there is an error, returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_ut_alpha_COLUMN">ut_alpha COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint alphanumeric strings (no spaces).  May not be null.  If there is
+an error, returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG>ut_alpha COLUMN</STRONG><BR>
+<DD>
+Check/untaint alphanumeric strings (no spaces).  May be null.  If there is an
 error, returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_ut_phonen">ut_phonen COLUMN</A></STRONG><DD>
-<P>
-Check/untaint phone numbers. May be null. If there is an error, returns the
-error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_ut_anything">ut_anything COLUMN</A></STRONG><DD>
-<P>
-Untaints arbitrary data. Be careful.
-
-<DT><STRONG><A NAME="item_fields">fields [ TABLE ]</A></STRONG><DD>
-<P>
-This can be used as both a subroutine and a method call. It returns a list
+<P></P>
+<DT><STRONG><A NAME="item_ut_phonen_COLUMN_%5B_COUNTRY_%5D">ut_phonen COLUMN [ COUNTRY ]</A></STRONG><BR>
+<DD>
+Check/untaint phone numbers.  May be null.  If there is an error, returns
+the error, otherwise returns false.
+<P>Takes an optional two-letter ISO country code; without it or with unsupported
+countries, ut_phonen simply calls ut_alphan.</P>
+<P></P>
+<DT><STRONG><A NAME="item_ut_ip_COLUMN">ut_ip COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint ip addresses.  IPv4 only for now.
+<P></P>
+<DT><STRONG><A NAME="item_ut_ipn_COLUMN">ut_ipn COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint ip addresses.  IPv4 only for now.  May be null.
+<P></P>
+<DT><STRONG><A NAME="item_ut_domain_COLUMN">ut_domain COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint host and domain names.
+<P></P>
+<DT><STRONG><A NAME="item_ut_anything_COLUMN">ut_anything COLUMN</A></STRONG><BR>
+<DD>
+Untaints arbitrary data.  Be careful.
+<P></P>
+<DT><STRONG><A NAME="item_fields_%5B_TABLE_%5D">fields [ TABLE ]</A></STRONG><BR>
+<DD>
+This can be used as both a subroutine and a method call.  It returns a list
 of the columns in this record's table, or an explicitly specified table.
-(See <A HREF="../FS/dbdef_table.html">FS::dbdef_table</A>).
-
-<H1><A NAME="SUBROUTINES">SUBROUTINES</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_reload_dbdef">reload_dbdef([FILENAME])</A></STRONG><DD>
-<P>
-Load a database definition (see <A HREF="../FS/dbdef.html">FS::dbdef</A>), optionally from a non-default filename. This command is executed at
-startup unless
-<EM>$FS::Record::setup_hack</EM> is true. Returns a FS::dbdef object.
-
-<DT><STRONG><A NAME="item_dbdef">dbdef</A></STRONG><DD>
-<P>
-Returns the current database definition. See <A HREF="../FS/dbdef.html">FS::dbdef</A>.
-
-<DT><STRONG><A NAME="item__quote">_quote VALUE, TABLE, COLUMN</A></STRONG><DD>
-<P>
-This is an internal function used to construct SQL statements. It returns
-VALUE DBI-quoted (see <EM>DBI</EM>) unless VALUE is a number and the column type (see <A HREF="../FS/dbdef_column.html">FS::dbdef_column</A>) does not end in `char' or `binary'.
-
-<DT><STRONG><A NAME="item_hfields">hfields TABLE</A></STRONG><DD>
-<P>
-This is depriciated. Don't use it.
-
-<P>
-It returns a hash-type list with the fields of this record's table set
-true.
-
-</DL>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: Record.html,v 1.2 2000-03-03 18:22:42 ivan Exp $
-
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-This module should probably be renamed, since much of the functionality is
-of general use. It is not completely unlike Adapter::DBI (see below).
-
-<P>
-Exported qsearch and qsearchs should be depriciated in favor of method
-calls (against an FS::Record object like the old search and searchs that
-qsearch and qsearchs were on top of.)
-
-<P>
-The whole fields / hfields mess should be removed.
-
-<P>
-The various WHERE clauses should be subroutined.
-
-<P>
-table string should be depriciated in favor of FS::dbdef_table.
-
+(See <A HREF="../DBIx/DBSchema/Table.html">the DBIx::DBSchema::Table manpage</A>).
+<P></P></DL>
 <P>
-No doubt we could benefit from a Tied hash. Documenting how exists /
-defined true maps to the database (and WHERE clauses) would also help.
-
-<P>
-The ut_ methods should ask the dbdef for a default length.
-
-<P>
-ut_sqltype (like ut_varchar) should all be defined
-
-<P>
-A fallback check method should be provided whith uses the dbdef.
-
-<P>
-The ut_money method assumes money has two decimal digits.
-
-<P>
-The Pg money kludge in the new method only strips `$'.
-
-<P>
-The ut_phonen method assumes US-style phone numbers.
-
-<P>
-The _quote function should probably use ut_float instead of a regex.
-
-<P>
-All the subroutines probably should be methods, here or elsewhere.
-
+<HR>
+<H1><A NAME="subroutines">SUBROUTINES</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_reload_dbdef"><CODE>reload_dbdef([FILENAME])</CODE></A></STRONG><BR>
+<DD>
+Load a database definition (see <A HREF="../DBIx/DBSchema.html">the DBIx::DBSchema manpage</A>), optionally from a
+non-default filename.  This command is executed at startup unless
+<EM>$FS::Record::setup_hack</EM> is true.  Returns a DBIx::DBSchema object.
+<P></P>
+<DT><STRONG><A NAME="item_dbdef">dbdef</A></STRONG><BR>
+<DD>
+Returns the current database definition.  See <A HREF="../FS/dbdef.html">the FS::dbdef manpage</A>.
+<P></P>
+<DT><STRONG><A NAME="item__quote_VALUE%2C_TABLE%2C_COLUMN">_quote VALUE, TABLE, COLUMN</A></STRONG><BR>
+<DD>
+This is an internal function used to construct SQL statements.  It returns
+VALUE DBI-quoted (see <EM>DBI/``quote''</EM>) unless VALUE is a number and the column
+type (see <A HREF="../FS/dbdef_column.html">the FS::dbdef_column manpage</A>) does not end in `char' or `binary'.
+<P></P>
+<DT><STRONG><A NAME="item_hfields">hfields TABLE</A></STRONG><BR>
+<DD>
+This is depriciated.  Don't use it.
+<P>It returns a hash-type list with the fields of this record's table set true.</P>
+<P></P></DL>
 <P>
-Probably should borrow/use some dbdef methods where appropriate (like sub
-fields)
-
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: Record.html,v 1.3 2001-04-23 12:40:30 ivan Exp $</P>
 <P>
-<A HREF="../FS/dbdef.html">FS::dbdef</A>, <A HREF="../FS/UID.html">FS::UID</A>, <EM>DBI</EM>
-
-
-
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>This module should probably be renamed, since much of the functionality is
+of general use.  It is not completely unlike Adapter::DBI (see below).</P>
+<P>Exported qsearch and qsearchs should be depriciated in favor of method calls
+(against an FS::Record object like the old search and searchs that qsearch
+and qsearchs were on top of.)</P>
+<P>The whole fields / hfields mess should be removed.</P>
+<P>The various WHERE clauses should be subroutined.</P>
+<P>table string should be depriciated in favor of FS::dbdef_table.</P>
+<P>No doubt we could benefit from a Tied hash.  Documenting how exists / defined
+true maps to the database (and WHERE clauses) would also help.</P>
+<P>The ut_ methods should ask the dbdef for a default length.</P>
+<P>ut_sqltype (like ut_varchar) should all be defined</P>
+<P>A fallback check method should be provided which uses the dbdef.</P>
+<P>The ut_money method assumes money has two decimal digits.</P>
+<P>The Pg money kludge in the new method only strips `$'.</P>
+<P>The ut_phonen method assumes US-style phone numbers.</P>
+<P>The _quote function should probably use ut_float instead of a regex.</P>
+<P>All the subroutines probably should be methods, here or elsewhere.</P>
+<P>Probably should borrow/use some dbdef methods where appropriate (like sub
+fields)</P>
+<P>As of 1.14, DBI fetchall_hashref( {} ) doesn't set fetchrow_hashref NAME_lc,
+or allow it to be set.  Working around it is ugly any way around - DBI should
+be fixed.  (only affects RDBMS which return uppercase column names)</P>
 <P>
-Adapter::DBI from Ch. 11 of Advanced Perl Programming by Sriram Srinivasan.
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF="../DBIx/DBSchema.html">the DBIx::DBSchema manpage</A>, <A HREF=".././FS/UID.html">the FS::UID manpage</A>, <EM>DBI</EM></P>
+<P>Adapter::DBI from Ch. 11 of Advanced Perl Programming by Sriram Srinivasan.</P>
 
-</DL>
 </BODY>
 
 </HTML>
diff --git a/htdocs/docs/man/FS/UI/Base.html b/htdocs/docs/man/FS/UI/Base.html
index 7823090f6..96c60847d 100644
--- a/htdocs/docs/man/FS/UI/Base.html
+++ b/htdocs/docs/man/FS/UI/Base.html
@@ -1,116 +1,99 @@
 <HTML>
 <HEAD>
 <TITLE>FS::UI::Base - Base class for all user-interface objects</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
-	<LI><A HREF="#HISTORY">HISTORY</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+	<LI><A HREF="#history">HISTORY</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::UI::Base - Base class for all user-interface objects
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::UI::Base - Base class for all user-interface objects</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::UI::SomeInterface;
-  use FS::UI::some_table;
-</PRE>
-<P>
-<PRE>  $interface = new FS::UI::some_table;
-</PRE>
-<P>
-<PRE>  $error = $interface-&gt;browse;
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::UI::SomeInterface;
+  use FS::UI::some_table;</PRE>
+<PRE>
+  $interface = new FS::UI::some_table;</PRE>
+<PRE>
+  $error = $interface-&gt;browse;
   $error = $interface-&gt;search;
   $error = $interface-&gt;view;
   $error = $interface-&gt;edit;
-  $error = $interface-&gt;process;
-</PRE>
+  $error = $interface-&gt;process;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::UI::Base object represents a user interface object. FS::UI::Base is
-intended as a base class for table-specfic classes to inherit from, i.e.
-FS::UI::cust_main. The simplest case, which will provide a default UI for
-your new table, is as follows:
-
-<P>
-<PRE>  package FS::UI::table_name;
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::UI::Base object represents a user interface object.  FS::UI::Base
+is intended as a base class for table-specfic classes to inherit from, i.e.
+FS::UI::cust_main.  The simplest case, which will provide a default UI for your
+new table, is as follows:</P>
+<PRE>
+  package FS::UI::table_name;
   use vars qw ( @ISA );
   use FS::UI::Base;
   @ISA = qw( FS::UI::Base );
-  sub db_table { 'table_name'; }
-</PRE>
-<P>
-Currently available interfaces are: FS::UI::Gtk, an X-Windows UI
-implemented using the Gtk+ toolkit FS::UI::CGI, a web interface implemented
-using CGI.pm, etc.
-
+  sub db_table { 'table_name'; }</PRE>
+<P>Currently available interfaces are:
+  FS::UI::Gtk, an X-Windows UI implemented using the Gtk+ toolkit
+  FS::UI::CGI, a web interface implemented using CGI.pm, etc.</P>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new</A></STRONG><DD>
-<DT><STRONG><A NAME="item_browse">browse</A></STRONG><DD>
-<DT><STRONG><A NAME="item_title">title</A></STRONG><DD>
-<DT><STRONG><A NAME="item_addwidget">addwidget</A></STRONG><DD>
+<DT><STRONG><A NAME="item_new">new</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_browse">browse</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_title">title</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_addwidget">addwidget</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: Base.html,v 1.2 2000-03-03 18:22:44 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: Base.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-This documentation is incomplete.
-
-<P>
-There should be some sort of per-(freeside)-user preferences and the
-ability for specific FS::UI:: modules to put their own values there as
-well.
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>This documentation is incomplete.</P>
+<P>There should be some sort of per-(freeside)-user preferences and the ability
+for specific FS::UI:: modules to put their own values there as well.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../../FS/UI/Gtk.html">FS::UI::Gtk</A>, <A HREF="../../FS/UI/CGI.html">FS::UI::CGI</A>
-
-
-
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF="../.././FS/UI/Gtk.html">the FS::UI::Gtk manpage</A>, <A HREF="../.././FS/UI/CGI.html">the FS::UI::CGI manpage</A></P>
 <P>
 <HR>
-<H1><A NAME="HISTORY">HISTORY</A></H1>
-<P>
-$Log: Base.html,v $
-Revision 1.2  2000-03-03 18:22:44  ivan
-changes from 1.2.3 release, fixes from webdemo
- Revision 1.1 1999/08/04 09:03:53 ivan initial checkin of
-module files for proper perl installation
-
-<P>
-Revision 1.1 1999/01/20 09:30:36 ivan skeletal cross-UI UI code.
+<H1><A NAME="history">HISTORY</A></H1>
+<P>$Log: Base.html,v $
+<P>Revision 1.3  2001-04-23 12:40:31  ivan
+<P>documentation and webdemo updates
+<P>
+Revision 1.1  1999/08/04 09:03:53  ivan
+initial checkin of module files for proper perl installation</P>
+<P>Revision 1.1  1999/01/20 09:30:36  ivan
+skeletal cross-UI UI code.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/UI/CGI.html b/htdocs/docs/man/FS/UI/CGI.html
index 69bff5671..49991f1aa 100644
--- a/htdocs/docs/man/FS/UI/CGI.html
+++ b/htdocs/docs/man/FS/UI/CGI.html
@@ -1,114 +1,93 @@
 <HTML>
 <HEAD>
 <TITLE>FS::UI::CGI - Base class for CGI user-interface objects</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
-	<LI><A HREF="#HISTORY">HISTORY</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+	<LI><A HREF="#history">HISTORY</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::UI::CGI - Base class for CGI user-interface objects
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::UI::CGI - Base class for CGI user-interface objects</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::UI::CGI;
-  use FS::UI::some_table;
-</PRE>
-<P>
-<PRE>  $interface = new FS::UI::some_table;
-</PRE>
-<P>
-<PRE>  $error = $interface-&gt;browse;
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::UI::CGI;
+  use FS::UI::some_table;</PRE>
+<PRE>
+  $interface = new FS::UI::some_table;</PRE>
+<PRE>
+  $error = $interface-&gt;browse;
   $error = $interface-&gt;search;
   $error = $interface-&gt;view;
   $error = $interface-&gt;edit;
-  $error = $interface-&gt;process;
-</PRE>
+  $error = $interface-&gt;process;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::UI::CGI object represents a CGI interface object.
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::UI::CGI object represents a CGI interface object.</P>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new</A></STRONG><DD>
-<DT><STRONG><A NAME="item__header">_header</A></STRONG><DD>
-<DT><STRONG><A NAME="item__footer">_footer</A></STRONG><DD>
-<DT><STRONG><A NAME="item_interface">interface</A></STRONG><DD>
-<P>
-Returns the string `CGI'. Useful for the author of a table-specific UI
-class to conditionally specify certain behaviour.
-
-</DL>
+<DT><STRONG><A NAME="item_new">new</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item__header">_header</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item__footer">_footer</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_interface">interface</A></STRONG><BR>
+<DD>
+Returns the string `CGI'.  Useful for the author of a table-specific UI class
+to conditionally specify certain behaviour.
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: CGI.html,v 1.2 2000-03-03 18:22:44 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: CGI.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-This documentation is incomplete.
-
-<P>
-In _Tableborder, headers should be links that sort on their fields.
-
-<P>
-_Link uses a constant <CODE>$BASE_URL</CODE>
-
-<P>
-_Link passes the arguments as a manually-constructed GET string instead of
-POSTing, for compatability while the web interface is upgraded. Once this
-is done it should pass arguements properly (i.e. as a POST, 8-bit clean)
-
-<P>
-Still some small bits of widget code same as FS::UI::Gtk.
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>This documentation is incomplete.</P>
+<P>In _Tableborder, headers should be links that sort on their fields.</P>
+<P>_Link uses a constant $BASE_URL</P>
+<P>_Link passes the arguments as a manually-constructed GET string instead
+of POSTing, for compatability while the web interface is upgraded.  Once
+this is done it should pass arguements properly (i.e. as a POST, 8-bit clean)</P>
+<P>Still some small bits of widget code same as FS::UI::Gtk.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../../FS/UI/Base.html">FS::UI::Base</A>
-
-
-
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF="../.././FS/UI/Base.html">the FS::UI::Base manpage</A></P>
 <P>
 <HR>
-<H1><A NAME="HISTORY">HISTORY</A></H1>
-<P>
-$Log: CGI.html,v $
-Revision 1.2  2000-03-03 18:22:44  ivan
-changes from 1.2.3 release, fixes from webdemo
- Revision 1.1 1999/08/04 09:03:53 ivan initial checkin of
-module files for proper perl installation
-
-<P>
-Revision 1.1 1999/01/20 09:30:36 ivan skeletal cross-UI UI code.
+<H1><A NAME="history">HISTORY</A></H1>
+<P>$Log: CGI.html,v $
+<P>Revision 1.3  2001-04-23 12:40:31  ivan
+<P>documentation and webdemo updates
+<P>
+Revision 1.1  1999/08/04 09:03:53  ivan
+initial checkin of module files for proper perl installation</P>
+<P>Revision 1.1  1999/01/20 09:30:36  ivan
+skeletal cross-UI UI code.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/UI/Gtk.html b/htdocs/docs/man/FS/UI/Gtk.html
index 3328e9746..24d620087 100644
--- a/htdocs/docs/man/FS/UI/Gtk.html
+++ b/htdocs/docs/man/FS/UI/Gtk.html
@@ -1,111 +1,90 @@
 <HTML>
 <HEAD>
 <TITLE>FS::UI::Gtk - Base class for Gtk user-interface objects</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
-	<LI><A HREF="#HISTORY">HISTORY</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+	<LI><A HREF="#history">HISTORY</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::UI::Gtk - Base class for Gtk user-interface objects
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::UI::Gtk - Base class for Gtk user-interface objects</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::UI::Gtk;
-  use FS::UI::some_table;
-</PRE>
-<P>
-<PRE>  $interface = new FS::UI::some_table;
-</PRE>
-<P>
-<PRE>  $error = $interface-&gt;browse;
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::UI::Gtk;
+  use FS::UI::some_table;</PRE>
+<PRE>
+  $interface = new FS::UI::some_table;</PRE>
+<PRE>
+  $error = $interface-&gt;browse;
   $error = $interface-&gt;search;
   $error = $interface-&gt;view;
   $error = $interface-&gt;edit;
-  $error = $interface-&gt;process;
-</PRE>
+  $error = $interface-&gt;process;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::UI::Gtk object represents a Gtk user interface object.
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::UI::Gtk object represents a Gtk user interface object.</P>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new</A></STRONG><DD>
-<DT><STRONG><A NAME="item_interface">interface</A></STRONG><DD>
-<P>
-Returns the string `Gtk'. Useful for the author of a table-specific UI
-class to conditionally specify certain behaviour.
-
-</DL>
+<DT><STRONG><A NAME="item_new">new</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_interface">interface</A></STRONG><BR>
+<DD>
+Returns the string `Gtk'.  Useful for the author of a table-specific UI class
+to conditionally specify certain behaviour.
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: Gtk.html,v 1.2 2000-03-03 18:22:44 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: Gtk.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-This documentation is incomplete.
-
-<P>
-_Tableborder is just a _Table now. _Tableborders should scroll (but not the
-headers) and need and need more decoration. (data in white section ala
-gtksql and sliding field widths) headers should be buttons that callback to
-sort on their fields.
-
-<P>
-There should be a persistant, per-(freeside)-user store for window
-positions and sizes and sort fields etc (see <A HREF="../../FS/UI/CGI.html#BUGS">BUGS</A>.
-
-<P>
-Still some small bits of widget code same as FS::UI::CGI.
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>This documentation is incomplete.</P>
+<P>_Tableborder is just a _Table now.  _Tableborders should scroll (but not the
+headers) and need and need more decoration. (data in white section ala gtksql
+and sliding field widths) headers should be buttons that callback to sort on
+their fields.</P>
+<P>There should be a persistant, per-(freeside)-user store for window positions
+and sizes and sort fields etc (see <A HREF="../.././FS/UI/CGI.html#bugs">BUGS in the FS::UI::CGI manpage</A>.</P>
+<P>Still some small bits of widget code same as FS::UI::CGI.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../../FS/UI/Base.html">FS::UI::Base</A>
-
-
-
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF="../.././FS/UI/Base.html">the FS::UI::Base manpage</A></P>
 <P>
 <HR>
-<H1><A NAME="HISTORY">HISTORY</A></H1>
-<P>
-$Log: Gtk.html,v $
-Revision 1.2  2000-03-03 18:22:44  ivan
-changes from 1.2.3 release, fixes from webdemo
- Revision 1.1 1999/08/04 09:03:53 ivan initial checkin of
-module files for proper perl installation
-
-<P>
-Revision 1.1 1999/01/20 09:30:36 ivan skeletal cross-UI UI code.
+<H1><A NAME="history">HISTORY</A></H1>
+<P>$Log: Gtk.html,v $
+<P>Revision 1.3  2001-04-23 12:40:31  ivan
+<P>documentation and webdemo updates
+<P>
+Revision 1.1  1999/08/04 09:03:53  ivan
+initial checkin of module files for proper perl installation</P>
+<P>Revision 1.1  1999/01/20 09:30:36  ivan
+skeletal cross-UI UI code.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/UI/agent.html b/htdocs/docs/man/FS/UI/agent.html
index e69de29bb..8608e4ef4 100644
--- a/htdocs/docs/man/FS/UI/agent.html
+++ b/htdocs/docs/man/FS/UI/agent.html
@@ -0,0 +1,16 @@
+<HTML>
+<HEAD>
+<TITLE>./FS/FS/UI/agent.pm</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+<!-- INDEX END -->
+
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/UID.html b/htdocs/docs/man/FS/UID.html
index cad23d59d..9c4da492b 100644
--- a/htdocs/docs/man/FS/UID.html
+++ b/htdocs/docs/man/FS/UID.html
@@ -1,159 +1,141 @@
 <HTML>
 <HEAD>
 <TITLE>FS::UID - Subroutines for database login and assorted other stuff</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#SUBROUTINES">SUBROUTINES</A>
-	<LI><A HREF="#CALLBACKS">CALLBACKS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
+	<LI><A HREF="#callbacks">CALLBACKS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::UID - Subroutines for database login and assorted other stuff
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::UID - Subroutines for database login and assorted other stuff</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::UID qw(adminsuidsetup cgisuidsetup dbh datasrc getotaker
-  checkeuid checkruid swapuid);
-</PRE>
-<P>
-<PRE>  adminsuidsetup $user;
-</PRE>
-<P>
-<PRE>  $cgi = new CGI;
-  $dbh = cgisuidsetup($cgi);
-</PRE>
-<P>
-<PRE>  $dbh = dbh;
-</PRE>
-<P>
-<PRE>  $datasrc = datasrc;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::UID qw(adminsuidsetup cgisuidsetup dbh datasrc getotaker
+  checkeuid checkruid swapuid);</PRE>
+<PRE>
+  adminsuidsetup $user;</PRE>
+<PRE>
+  $cgi = new CGI;
+  $dbh = cgisuidsetup($cgi);</PRE>
+<PRE>
+  $dbh = dbh;</PRE>
+<PRE>
+  $datasrc = datasrc;</PRE>
+<PRE>
+  $driver_name = driver_name;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-Provides a hodgepodge of subroutines. 
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>Provides a hodgepodge of subroutines.</P>
 <P>
 <HR>
-<H1><A NAME="SUBROUTINES">SUBROUTINES</A></H1>
+<H1><A NAME="subroutines">SUBROUTINES</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_adminsuidsetup">adminsuidsetup USER</A></STRONG><DD>
-<P>
-Sets the user to USER (see config.html from the base documentation). Cleans
-the environment. Make sure the script is running as freeside, or setuid
-freeside. Opens a connection to the database. Swaps real and effective
-UIDs. Runs any defined callbacks (see below). Returns the DBI database
-handle (usually you don't need this).
-
-<DT><STRONG><A NAME="item_cgisuidsetup">cgisuidsetup CGI_object</A></STRONG><DD>
-<P>
-Stores the CGI (see <A HREF=".././FS/CGI.html#">the CGI manpage</A>) object for later use. (CGI::Base is depriciated) Runs adminsuidsetup.
-
-<DT><STRONG><A NAME="item_cgi">cgi</A></STRONG><DD>
-<P>
-Returns the CGI (see <A HREF=".././FS/CGI.html#">the CGI manpage</A>) object.
-
-<DT><STRONG><A NAME="item_dbh">dbh</A></STRONG><DD>
-<P>
+<DT><STRONG><A NAME="item_adminsuidsetup">adminsuidsetup USER</A></STRONG><BR>
+<DD>
+Sets the user to USER (see config.html from the base documentation).
+Cleans the environment.
+Make sure the script is running as freeside, or setuid freeside.
+Opens a connection to the database.
+Swaps real and effective UIDs.
+Runs any defined callbacks (see below).
+Returns the DBI database handle (usually you don't need this).
+<P></P>
+<DT><STRONG><A NAME="item_cgisuidsetup_CGI_object">cgisuidsetup CGI_object</A></STRONG><BR>
+<DD>
+Takes a single argument, which is a CGI (see <A HREF=".././FS/CGI.html">the CGI manpage</A>) or Apache (see <EM>Apache</EM>)
+object (CGI::Base is depriciated).  Runs cgisetotaker and then adminsuidsetup.
+<P></P>
+<DT><STRONG><A NAME="item_cgi">cgi</A></STRONG><BR>
+<DD>
+Returns the CGI (see <A HREF=".././FS/CGI.html">the CGI manpage</A>) object.
+<P></P>
+<DT><STRONG><A NAME="item_dbh">dbh</A></STRONG><BR>
+<DD>
 Returns the DBI database handle.
-
-<DT><STRONG><A NAME="item_datasrc">datasrc</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_datasrc">datasrc</A></STRONG><BR>
+<DD>
 Returns the DBI data source.
-
-<DT><STRONG><A NAME="item_getotaker">getotaker</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_driver_name">driver_name</A></STRONG><BR>
+<DD>
+Returns just the driver name portion of the DBI data source.
+<P></P>
+<DT><STRONG><A NAME="item_getotaker">getotaker</A></STRONG><BR>
+<DD>
 Returns the current Freeside user.
-
-<DT><STRONG><A NAME="item_cgisetotaker">cgisetotaker</A></STRONG><DD>
-<P>
-Sets and returns the CGI REMOTE_USER. <A HREF="#item__cgi">$cgi</A> should
-be defined as a CGI.pm object. Support for CGI::Base and derived classes is
-depriciated.
-
-<DT><STRONG><A NAME="item_checkeuid">checkeuid</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_cgisetotaker">cgisetotaker</A></STRONG><BR>
+<DD>
+Sets and returns the CGI REMOTE_USER.  $cgi should be defined as a CGI.pm
+object (see <A HREF=".././FS/CGI.html">the CGI manpage</A>) or an Apache object (see <EM>Apache</EM>).  Support for CGI::Base
+and derived classes is depriciated.
+<P></P>
+<DT><STRONG><A NAME="item_checkeuid">checkeuid</A></STRONG><BR>
+<DD>
 Returns true if effective UID is that of the freeside user.
-
-<DT><STRONG><A NAME="item_checkruid">checkruid</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_checkruid">checkruid</A></STRONG><BR>
+<DD>
 Returns true if the real UID is that of the freeside user.
-
-<DT><STRONG><A NAME="item_swapuid">swapuid</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_swapuid">swapuid</A></STRONG><BR>
+<DD>
 Swaps real and effective UIDs.
-
-<DT><STRONG><A NAME="item_getsecrets">getsecrets [ USER ]</A></STRONG><DD>
-<P>
-Sets the user to USER, if supplied. Sets and returns the DBI datasource,
-username and password for this user from the
-`/usr/local/etc/freeside/mapsecrets' file.
-
-</DL>
+<P></P>
+<DT><STRONG><A NAME="item_getsecrets_%5B_USER_%5D">getsecrets [ USER ]</A></STRONG><BR>
+<DD>
+Sets the user to USER, if supplied.
+Sets and returns the DBI datasource, username and password for this user from
+the `/usr/local/etc/freeside/mapsecrets' file.
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="CALLBACKS">CALLBACKS</A></H1>
-<P>
-Warning: this interface is likely to change in future releases.
-
-<P>
-A package can install a callback to be run in adminsuidsetup by putting a
-coderef into the hash %FS::UID::callback :
-
-<P>
-<PRE>    $coderef = sub { warn &quot;Hi, I'm returning your call!&quot; };
-    $FS::UID::callback{'Package::Name'};
-</PRE>
+<H1><A NAME="callbacks">CALLBACKS</A></H1>
+<P>Warning: this interface is likely to change in future releases.</P>
+<P>A package can install a callback to be run in adminsuidsetup by putting a
+coderef into the hash %FS::UID::callback :</P>
+<PRE>
+    $coderef = sub { warn &quot;Hi, I'm returning your call!&quot; };
+    $FS::UID::callback{'Package::Name'};</PRE>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: UID.html,v 1.2 2000-03-03 18:22:42 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: UID.html,v 1.3 2001-04-23 12:40:30 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-Too many package-global variables.
-
-<P>
-Not OO.
-
-<P>
-No capabilities yet. When mod_perl and Authen::DBI are implemented,
-cgisuidsetup will go away as well.
-
-<P>
-Goes through contortions to support non-OO syntax with multiple datasrc's.
-
-<P>
-Callbacks are inelegant.
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>Too many package-global variables.</P>
+<P>Not OO.</P>
+<P>No capabilities yet.  When mod_perl and Authen::DBI are implemented, 
+cgisuidsetup will go away as well.</P>
+<P>Goes through contortions to support non-OO syntax with multiple datasrc's.</P>
+<P>Callbacks are inelegant.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF=".././FS/CGI.html#">the CGI manpage</A>, <EM>DBI</EM>, config.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/CGI.html">the CGI manpage</A>, <EM>DBI</EM>, config.html from the base documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/agent.html b/htdocs/docs/man/FS/agent.html
index cb422fce7..39d89a770 100644
--- a/htdocs/docs/man/FS/agent.html
+++ b/htdocs/docs/man/FS/agent.html
@@ -1,129 +1,120 @@
 <HTML>
 <HEAD>
 <TITLE>FS::agent - Object methods for agent records</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::agent - Object methods for agent records
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::agent - Object methods for agent records</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::agent;
-</PRE>
-<P>
-<PRE>  $record = new FS::agent \%hash;
-  $record = new FS::agent { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
-<P>
-<PRE>  $agent_type = $record-&gt;agent_type;
-</PRE>
-<P>
-<PRE>  $hashref = $record-&gt;pkgpart_hashref;
-  #may purchase $pkgpart if $hashref-&gt;{$pkgpart};
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::agent;</PRE>
+<PRE>
+  $record = new FS::agent \%hash;
+  $record = new FS::agent { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $agent_type = $record-&gt;agent_type;</PRE>
+<PRE>
+  $hashref = $record-&gt;pkgpart_hashref;
+  #may purchase $pkgpart if $hashref-&gt;{$pkgpart};</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::agent object represents an agent. Every customer has an agent.
-Agents can be used to track things like resellers or salespeople. FS::agent
-inherits from FS::Record. The following fields are currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::agent object represents an agent.  Every customer has an agent.  Agents
+can be used to track things like resellers or salespeople.  FS::agent inherits
+from FS::Record.  The following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_agemtnum">agemtnum - primary key (assigned automatically for new agents)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_agent">agent - Text name of this agent</A></STRONG><DD>
-<DT><STRONG><A NAME="item_typenum">typenum - Agent type.  See FS::agent_type</A></STRONG><DD>
-<DT><STRONG><A NAME="item_prog">prog - For future use.</A></STRONG><DD>
-<DT><STRONG><A NAME="item_freq">freq - For future use.</A></STRONG><DD>
+<DT><STRONG><A NAME="item_key">agemtnum - primary key (assigned automatically for new agents)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_agent_%2D_Text_name_of_this_agent">agent - Text name of this agent</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_typenum_%2D_Agent_type%2E_See_FS%3A%3Aagent_type">typenum - Agent type.  See <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A></A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_prog_%2D_For_future_use%2E">prog - For future use.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_freq_%2D_For_future_use%2E">freq - For future use.</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new agent. To add the agent to the database, see <A HREF="#insert">insert</A>.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this agent to the database. If there is an error, returns the error,
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new agent.  To add the agent to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this agent to the database.  If there is an error, returns the error,
 otherwise returns false.
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
-Deletes this agent from the database. Only agents with no customers can be
-deleted. If there is an error, returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replaces OLD_RECORD with this one in the database. If there is an error,
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this agent from the database.  Only agents with no customers can be
+deleted.  If there is an error, returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid agent. If there is an error,
-returns the error, otherwise returns false. Called by the insert and
-replace methods.
-
-<DT><STRONG><A NAME="item_agent_type">agent_type</A></STRONG><DD>
-<P>
-Returns the FS::agent_type object (see <A HREF="../FS/agent_type.html">FS::agent_type</A>) for this agent.
-
-<DT><STRONG><A NAME="item_pkgpart_hashref">pkgpart_hashref</A></STRONG><DD>
-<P>
-Returns a hash reference. The keys of the hash are pkgparts. The value is
-true iff this agent may purchase the specified package definition. See
-<A HREF="../FS/part_pkg.html">FS::part_pkg</A>.
-
-</DL>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid agent.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+<P></P>
+<DT><STRONG><A NAME="item_agent_type">agent_type</A></STRONG><BR>
+<DD>
+Returns the FS::agent_type object (see <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A>) for this agent.
+<P></P>
+<DT><STRONG><A NAME="item_pkgpart_hashref">pkgpart_hashref</A></STRONG><BR>
+<DD>
+Returns a hash reference.  The keys of the hash are pkgparts.  The value is
+true if this agent may purchase the specified package definition.  See
+<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>.
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: agent.html,v 1.2 2000-03-03 18:22:42 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: agent.html,v 1.3 2001-04-23 12:40:30 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
+<H1><A NAME="bugs">BUGS</A></H1>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/agent_type.html">FS::agent_type</A>, <A HREF="../FS/cust_main.html">FS::cust_main</A>, <A HREF="../FS/part_pkg.html">FS::part_pkg</A>, schema.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, 
+schema.html from the base documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/agent_type.html b/htdocs/docs/man/FS/agent_type.html
index d246bea3d..b34940752 100644
--- a/htdocs/docs/man/FS/agent_type.html
+++ b/htdocs/docs/man/FS/agent_type.html
@@ -1,137 +1,125 @@
 <HTML>
 <HEAD>
 <TITLE>FS::agent_type - Object methods for agent_type records</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::agent_type - Object methods for agent_type records
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::agent_type - Object methods for agent_type records</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::agent_type;
-</PRE>
-<P>
-<PRE>  $record = new FS::agent_type \%hash;
-  $record = new FS::agent_type { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
-<P>
-<PRE>  $hashref = $record-&gt;pkgpart_hashref;
-  #may purchase $pkgpart if $hashref-&gt;{$pkgpart};
-</PRE>
-<P>
-<PRE>  @type_pkgs = $record-&gt;type_pkgs;
-</PRE>
-<P>
-<PRE>  @pkgparts = $record-&gt;pkgpart;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::agent_type;</PRE>
+<PRE>
+  $record = new FS::agent_type \%hash;
+  $record = new FS::agent_type { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $hashref = $record-&gt;pkgpart_hashref;
+  #may purchase $pkgpart if $hashref-&gt;{$pkgpart};</PRE>
+<PRE>
+  @type_pkgs = $record-&gt;type_pkgs;</PRE>
+<PRE>
+  @pkgparts = $record-&gt;pkgpart;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::agent_type object represents an agent type. Every agent (see
-<A HREF="../FS/agent.html">FS::agent</A>) has an agent type. Agent types define which packages (see
-<A HREF="../FS/part_pkg.html">FS::part_pkg</A>) may be purchased by customers (see <A HREF="../FS/cust_main.html">FS::cust_main</A>), via FS::type_pkgs records (see <A HREF="../FS/type_pkgs.html">FS::type_pkgs</A>). FS::agent_type inherits from FS::Record. The following fields are
-currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::agent_type object represents an agent type.  Every agent (see
+<A HREF=".././FS/agent.html">the FS::agent manpage</A>) has an agent type.  Agent types define which packages (see
+<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>) may be purchased by customers (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>), via 
+FS::type_pkgs records (see <A HREF=".././FS/type_pkgs.html">the FS::type_pkgs manpage</A>).  FS::agent_type inherits from
+FS::Record.  The following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_typenum">typenum - primary key (assigned automatically for new agent types)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_atype">atype - Text name of this agent type</A></STRONG><DD>
+<DT><STRONG><A NAME="item_key">typenum - primary key (assigned automatically for new agent types)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_atype_%2D_Text_name_of_this_agent_type">atype - Text name of this agent type</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new agent type. To add the agent type to the database, see
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new agent type.  To add the agent type to the database, see
 <A HREF="#insert">insert</A>.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this agent type to the database. If there is an error, returns the
-error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
-Deletes this agent type from the database. Only agent types with no agents
-can be deleted. If there is an error, returns the error, otherwise returns
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this agent type to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this agent type from the database.  Only agent types with no agents
+can be deleted.  If there is an error, returns the error, otherwise returns
 false.
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replaces OLD_RECORD with this one in the database. If there is an error,
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid agent type. If there is an
-error, returns the error, otherwise returns false. Called by the insert and
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid agent type.  If there is an
+error, returns the error, otherwise returns false.  Called by the insert and
 replace methods.
-
-<DT><STRONG><A NAME="item_pkgpart_hashref">pkgpart_hashref</A></STRONG><DD>
-<P>
-Returns a hash reference. The keys of the hash are pkgparts. The value is
-true iff this agent may purchase the specified package definition. See
-<A HREF="../FS/part_pkg.html">FS::part_pkg</A>.
-
-<DT><STRONG><A NAME="item_type_pkgs">type_pkgs</A></STRONG><DD>
-<P>
-Returns all FS::type_pkgs objects (see <A HREF="../FS/type_pkgs.html">FS::type_pkgs</A>) for this agent type.
-
-<DT><STRONG><A NAME="item_pkgpart">pkgpart</A></STRONG><DD>
-<P>
-Returns the pkgpart of all package definitions (see <A HREF="../FS/part_pkg.html">FS::part_pkg</A>) for this agent type.
-
-</DL>
+<P></P>
+<DT><STRONG><A NAME="item_pkgpart_hashref">pkgpart_hashref</A></STRONG><BR>
+<DD>
+Returns a hash reference.  The keys of the hash are pkgparts.  The value is
+true iff this agent may purchase the specified package definition.  See
+<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>.
+<P></P>
+<DT><STRONG><A NAME="item_type_pkgs">type_pkgs</A></STRONG><BR>
+<DD>
+Returns all FS::type_pkgs objects (see <A HREF=".././FS/type_pkgs.html">the FS::type_pkgs manpage</A>) for this agent type.
+<P></P>
+<DT><STRONG><A NAME="item_pkgpart">pkgpart</A></STRONG><BR>
+<DD>
+Returns the pkgpart of all package definitions (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>) for this
+agent type.
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: agent_type.html,v 1.2 2000-03-03 18:22:42 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: agent_type.html,v 1.3 2001-04-23 12:40:30 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
+<H1><A NAME="bugs">BUGS</A></H1>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/agent.html">FS::agent</A>, <A HREF="../FS/type_pkgs.html">FS::type_pkgs</A>, <A HREF="../FS/cust_main.html">FS::cust_main</A>,
-<A HREF="../FS/part_pkg.html">FS::part_pkg</A>, schema.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/agent.html">the FS::agent manpage</A>, <A HREF=".././FS/type_pkgs.html">the FS::type_pkgs manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>,
+<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, schema.html from the base documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/cust_bill.html b/htdocs/docs/man/FS/cust_bill.html
index e09bae5e2..a59542c76 100644
--- a/htdocs/docs/man/FS/cust_bill.html
+++ b/htdocs/docs/man/FS/cust_bill.html
@@ -1,183 +1,160 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_bill - Object methods for cust_bill records</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::cust_bill - Object methods for cust_bill records
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_bill - Object methods for cust_bill records</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::cust_bill;
-</PRE>
-<P>
-<PRE>  $record = new FS::cust_bill \%hash;
-  $record = new FS::cust_bill { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
-<P>
-<PRE>  ( $total_previous_balance, @previous_cust_bill ) = $record-&gt;previous;
-</PRE>
-<P>
-<PRE>  @cust_bill_pkg_objects = $cust_bill-&gt;cust_bill_pkg;
-</PRE>
-<P>
-<PRE>  ( $total_previous_credits, @previous_cust_credit ) = $record-&gt;cust_credit;
-</PRE>
-<P>
-<PRE>  @cust_pay_objects = $cust_bill-&gt;cust_pay;
-</PRE>
-<P>
-<PRE>  @lines = $cust_bill-&gt;print_text;
-  @lines = $cust_bill-&gt;print_text $time;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_bill;</PRE>
+<PRE>
+  $record = new FS::cust_bill \%hash;
+  $record = new FS::cust_bill { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  ( $total_previous_balance, @previous_cust_bill ) = $record-&gt;previous;</PRE>
+<PRE>
+  @cust_bill_pkg_objects = $cust_bill-&gt;cust_bill_pkg;</PRE>
+<PRE>
+  ( $total_previous_credits, @previous_cust_credit ) = $record-&gt;cust_credit;</PRE>
+<PRE>
+  @cust_pay_objects = $cust_bill-&gt;cust_pay;</PRE>
+<PRE>
+  @lines = $cust_bill-&gt;print_text;
+  @lines = $cust_bill-&gt;print_text $time;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::cust_bill object represents an invoice. FS::cust_bill inherits from
-FS::Record. The following fields are currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_bill object represents an invoice; a declaration that a customer
+owes you money.  The specific charges are itemized as <STRONG>cust_bill_pkg</STRONG> records
+(see <A HREF=".././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A>).  FS::cust_bill inherits from FS::Record.  The
+following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_invnum">invnum - primary key (assigned automatically for new invoices)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_custnum">custnum - customer (see FS::cust_main)</A></STRONG><DD>
-<DT><STRONG><A NAME="item__date">_date - specified as a UNIX timestamp; see perlfunc/&quot;time&quot;.  Also see
-Time::Local and Date::Parse for conversion functions.</A></STRONG><DD>
-<DT><STRONG><A NAME="item_charged">charged - amount of this invoice</A></STRONG><DD>
-<DT><STRONG><A NAME="item_owed">owed - amount still outstanding on this invoice, which is charged minus
-all payments (see FS::cust_pay).</A></STRONG><DD>
-<DT><STRONG><A NAME="item_printed">printed - how many times this invoice has been printed automatically
-(see FS::cust_main/&quot;collect&quot;).</A></STRONG><DD>
+<DT><STRONG><A NAME="item_key">invnum - primary key (assigned automatically for new invoices)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_customer">custnum - customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item__date_%2D_specified_as_a_UNIX_timestamp%3B_see_per">_date - specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
+<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_charged_%2D_amount_of_this_invoice">charged - amount of this invoice</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_automatically">printed - how many times this invoice has been printed automatically
+(see <A HREF=".././FS/cust_main.html#collect">collect in the FS::cust_main manpage</A>).</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new invoice. To add the invoice to the database, see <A HREF="#insert">insert</A>. Invoices are normally created by calling the bill method of a customer
-object (see <A HREF="../FS/cust_main.html">FS::cust_main</A>).
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this invoice to the database (``Posts'' the invoice). If there is an
-error, returns the error, otherwise returns false.
-
-<P>
-When adding new invoices, owed must be charged (or null, in which case it
-is automatically set to charged).
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
-Currently unimplemented. I don't remove invoices because there would then
-be no record you ever posted this invoice (which is bad, no?)
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replaces the OLD_RECORD with this one in the database. If there is an
-error, returns the error, otherwise returns false.
-
-<P>
-Only owed and printed may be changed. Owed is normally updated by creating
-and inserting a payment (see <A HREF="../FS/cust_pay.html">FS::cust_pay</A>). Printed is normally updated by calling the collect method of a customer
-object (see <A HREF="../FS/cust_main.html">FS::cust_main</A>).
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid invoice. If there is an
-error, returns the error, otherwise returns false. Called by the insert and
-replace methods.
-
-<DT><STRONG><A NAME="item_previous">previous</A></STRONG><DD>
-<P>
-Returns a list consisting of the total previous balance for this customer,
-followed by the previous outstanding invoices (as FS::cust_bill objects
-also).
-
-<DT><STRONG><A NAME="item_cust_bill_pkg">cust_bill_pkg</A></STRONG><DD>
-<P>
-Returns the line items (see <A HREF="../FS/cust_bill_pkg.html">FS::cust_bill_pkg</A>) for this invoice.
-
-<DT><STRONG><A NAME="item_cust_credit">cust_credit</A></STRONG><DD>
-<P>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new invoice.  To add the invoice to the database, see <A HREF="#insert">insert</A>.
+Invoices are normally created by calling the bill method of a customer object
+(see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this invoice to the database (``Posts'' the invoice).  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Currently unimplemented.  I don't remove invoices because there would then be
+no record you ever posted this invoice (which is bad, no?)
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P>Only printed may be changed.  printed is normally updated by calling the
+collect method of a customer object (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid invoice.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+<P></P>
+<DT><STRONG><A NAME="item_previous">previous</A></STRONG><BR>
+<DD>
+Returns a list consisting of the total previous balance for this customer, 
+followed by the previous outstanding invoices (as FS::cust_bill objects also).
+<P></P>
+<DT><STRONG><A NAME="item_cust_bill_pkg">cust_bill_pkg</A></STRONG><BR>
+<DD>
+Returns the line items (see <A HREF=".././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A>) for this invoice.
+<P></P>
+<DT><STRONG><A NAME="item_cust_credit">cust_credit</A></STRONG><BR>
+<DD>
 Returns a list consisting of the total previous credited (see
-<A HREF="../FS/cust_credit.html">FS::cust_credit</A>) for this customer, followed by the previous outstanding credits
-(FS::cust_credit objects).
-
-<DT><STRONG><A NAME="item_cust_pay">cust_pay</A></STRONG><DD>
-<P>
-Returns all payments (see <A HREF="../FS/cust_pay.html">FS::cust_pay</A>) for this invoice.
-
-<DT><STRONG><A NAME="item_print_text">print_text [TIME];</A></STRONG><DD>
-<P>
-Returns an ASCII invoice, as a list of lines.
-
-<P>
-TIME an optional value used to control the printing of overdue messages.
-The default is now. It isn't the date of the invoice; that's the `_date'
-field. It is specified as a UNIX timestamp; see <EM>perlfunc</EM>. Also see
-<A HREF="../Time/Local.html">Time::Local</A> and <A HREF="../Date/Parse.html">Date::Parse</A> for conversion functions.
-
-</DL>
+<A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>) for this customer, followed by the previous outstanding
+credits (FS::cust_credit objects).
+<P></P>
+<DT><STRONG><A NAME="item_cust_pay">cust_pay</A></STRONG><BR>
+<DD>
+Returns all payments (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>) for this invoice.
+<P></P>
+<DT><STRONG><A NAME="item_owed">owed</A></STRONG><BR>
+<DD>
+Returns the amount owed (still outstanding) on this invoice, which is charged
+minus all payments (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_print_text_%5BTIME%5D%3B">print_text [TIME];</A></STRONG><BR>
+<DD>
+Returns an text invoice, as a list of lines.
+<P>TIME an optional value used to control the printing of overdue messages.  The
+default is now.  It isn't the date of the invoice; that's the `_date' field.
+It is specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
+<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</P>
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: cust_bill.html,v 1.2 2000-03-03 18:22:42 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_bill.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-The delete method.
-
-<P>
-print_text formatting (and some logic :/) is in source, but needs to be
-slurped in from a file. Also number of lines ($=).
-
-<P>
-missing print_ps for a nice postscript copy (maybe HylaFAX-cover-page-style
-or something similar so the look can be completely customized?)
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The delete method.</P>
+<P>print_text formatting (and some logic :/) is in source, but needs to be
+slurped in from a file.  Also number of lines ($=).</P>
+<P>missing print_ps for a nice postscript copy (maybe HylaFAX-cover-page-style
+or something similar so the look can be completely customized?)</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_main.html">FS::cust_main</A>, <A HREF="../FS/cust_pay.html">FS::cust_pay</A>, <A HREF="../FS/cust_bill_pkg.html">FS::cust_bill_pkg</A>,
-<A HREF="../FS/cust_credit.html">FS::cust_credit</A>, schema.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>, <A HREF=".././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A>,
+<A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>, schema.html from the base documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/cust_bill_pkg.html b/htdocs/docs/man/FS/cust_bill_pkg.html
index b94874408..2cdd8952e 100644
--- a/htdocs/docs/man/FS/cust_bill_pkg.html
+++ b/htdocs/docs/man/FS/cust_bill_pkg.html
@@ -1,118 +1,111 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_bill_pkg - Object methods for cust_bill_pkg records</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::cust_bill_pkg - Object methods for cust_bill_pkg records
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_bill_pkg - Object methods for cust_bill_pkg records</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::cust_bill_pkg;
-</PRE>
-<P>
-<PRE>  $record = new FS::cust_bill_pkg \%hash;
-  $record = new FS::cust_bill_pkg { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_bill_pkg;</PRE>
+<PRE>
+  $record = new FS::cust_bill_pkg \%hash;
+  $record = new FS::cust_bill_pkg { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::cust_bill_pkg object represents an invoice line item.
-FS::cust_bill_pkg inherits from FS::Record. The following fields are
-currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_bill_pkg object represents an invoice line item.
+FS::cust_bill_pkg inherits from FS::Record.  The following fields are currently
+supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_invnum">invnum - invoice (see FS::cust_bill)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_pkgnum">pkgnum - package (see FS::cust_pkg)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_setup">setup - setup fee</A></STRONG><DD>
-<DT><STRONG><A NAME="item_recur">recur - recurring fee</A></STRONG><DD>
-<DT><STRONG><A NAME="item_sdate">sdate - starting date of recurring fee</A></STRONG><DD>
-<DT><STRONG><A NAME="item_edate">edate - ending date of recurring fee</A></STRONG><DD>
+<DT><STRONG><A NAME="item_invoice">invnum - invoice (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_package">pkgnum - package (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) or 0 for the special virtual sales tax package</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_setup_%2D_setup_fee">setup - setup fee</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_recur_%2D_recurring_fee">recur - recurring fee</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_sdate_%2D_starting_date_of_recurring_fee">sdate - starting date of recurring fee</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_edate_%2D_ending_date_of_recurring_fee">edate - ending date of recurring fee</A></STRONG><BR>
+<DD>
 </DL>
-<P>
-sdate and edate are specified as UNIX timestamps; see <EM>perlfunc</EM>. Also see <A HREF="../Time/Local.html">Time::Local</A> and <A HREF="../Date/Parse.html">Date::Parse</A> for conversion functions.
-
+<P>sdate and edate are specified as UNIX timestamps; see <EM>perlfunc/``time''</EM>.  Also
+see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</P>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new line item. To add the line item to the database, see
-<A HREF="#insert">insert</A>. Line items are normally created by calling the bill method of a customer
-object (see <A HREF="../FS/cust_main.html">FS::cust_main</A>).
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this line item to the database. If there is an error, returns the
-error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
-Currently unimplemented. I don't remove line items because there would then
-be no record the items ever existed (which is bad, no?)
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Currently unimplemented. This would be even more of an accounting nightmare
-than deleteing the items. Just don't do it.
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid line item. If there is an
-error, returns the error, otherwise returns false. Called by the insert
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new line item.  To add the line item to the database, see
+<A HREF="#insert">insert</A>.  Line items are normally created by calling the bill method of a
+customer object (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this line item to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Currently unimplemented.  I don't remove line items because there would then be
+no record the items ever existed (which is bad, no?)
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Currently unimplemented.  This would be even more of an accounting nightmare
+than deleteing the items.  Just don't do it.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid line item.  If there is an
+error, returns the error, otherwise returns false.  Called by the insert
 method.
-
-</DL>
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: cust_bill_pkg.html,v 1.2 2000-03-03 18:22:42 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_bill_pkg.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
+<H1><A NAME="bugs">BUGS</A></H1>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_bill.html">FS::cust_bill</A>, <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>, <A HREF="../FS/cust_main.html">FS::cust_main</A>, schema.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, schema.html
+from the base documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/cust_credit.html b/htdocs/docs/man/FS/cust_credit.html
index d23fcd7d3..f08424561 100644
--- a/htdocs/docs/man/FS/cust_credit.html
+++ b/htdocs/docs/man/FS/cust_credit.html
@@ -1,125 +1,117 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_credit - Object methods for cust_credit records</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::cust_credit - Object methods for cust_credit records
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_credit - Object methods for cust_credit records</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::cust_credit;
-</PRE>
-<P>
-<PRE>  $record = new FS::cust_credit \%hash;
-  $record = new FS::cust_credit { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_credit;</PRE>
+<PRE>
+  $record = new FS::cust_credit \%hash;
+  $record = new FS::cust_credit { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::cust_credit object represents a credit. FS::cust_credit inherits
-from FS::Record. The following fields are currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_credit object represents a credit; the equivalent of a negative
+<STRONG>cust_bill</STRONG> record (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>).  FS::cust_credit inherits from
+FS::Record.  The following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_crednum">crednum - primary key (assigned automatically for new credits)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_custnum">custnum - customer (see FS::cust_main)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_amount">amount - amount of the credit</A></STRONG><DD>
-<DT><STRONG><A NAME="item_credited">credited - how much of this credit that is still outstanding, which is
-amount minus all refunds (see FS::cust_refund).</A></STRONG><DD>
-<DT><STRONG><A NAME="item__date">_date - specified as a UNIX timestamp; see perlfunc/&quot;time&quot;.  Also see
-Time::Local and Date::Parse for conversion functions.</A></STRONG><DD>
-<DT><STRONG><A NAME="item_otaker">otaker - order taker (assigned automatically, see FS::UID)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_reason">reason - text</A></STRONG><DD>
+<DT><STRONG><A NAME="item_key">crednum - primary key (assigned automatically for new credits)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_customer">custnum - customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_amount_%2D_amount_of_the_credit">amount - amount of the credit</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item__date_%2D_specified_as_a_UNIX_timestamp%3B_see_per">_date - specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
+<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_reason_%2D_text">reason - text</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new credit. To add the credit to the database, see <A HREF="#insert">insert</A>.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this credit to the database (``Posts'' the credit). If there is an
-error, returns the error, otherwise returns false.
-
-<P>
-When adding new invoices, credited must be amount (or null, in which case
-it is automatically set to amount).
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new credit.  To add the credit to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this credit to the database (``Posts'' the credit).  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
 Currently unimplemented.
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replaces the OLD_RECORD with this one in the database. If there is an
-error, returns the error, otherwise returns false.
-
-<P>
-Only credited may be changed. Credited is normally updated by creating and
-inserting a refund (see <A HREF="../FS/cust_refund.html">FS::cust_refund</A>).
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid credit. If there is an
-error, returns the error, otherwise returns false. Called by the insert and
-replace methods.
-
-</DL>
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Credits may not be modified; there would then be no record the credit was ever
+posted.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid credit.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+<P></P>
+<DT><STRONG><A NAME="item_cust_refund">cust_refund</A></STRONG><BR>
+<DD>
+Returns all refunds (see <A HREF=".././FS/cust_refund.html">the FS::cust_refund manpage</A>) for this credit.
+<P></P>
+<DT><STRONG><A NAME="item_credited">credited</A></STRONG><BR>
+<DD>
+Returns the amount of this credit that is still outstanding; which is
+amount minus all refunds (see <A HREF=".././FS/cust_refund.html">the FS::cust_refund manpage</A>).
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: cust_credit.html,v 1.2 2000-03-03 18:22:42 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_credit.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-The delete method.
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The delete method.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_refund.html">FS::cust_refund</A>, <A HREF="../FS/cust_bill.html">FS::cust_bill</A>, schema.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_refund.html">the FS::cust_refund manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, schema.html from the base
+documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/cust_main.html b/htdocs/docs/man/FS/cust_main.html
index 384e3de15..c5df1da12 100644
--- a/htdocs/docs/man/FS/cust_main.html
+++ b/htdocs/docs/man/FS/cust_main.html
@@ -1,276 +1,251 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_main - Object methods for cust_main records</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::cust_main - Object methods for cust_main records
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_main - Object methods for cust_main records</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::cust_main;
-</PRE>
-<P>
-<PRE>  $record = new FS::cust_main \%hash;
-  $record = new FS::cust_main { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
-<P>
-<PRE>  @cust_pkg = $record-&gt;all_pkgs;
-</PRE>
-<P>
-<PRE>  @cust_pkg = $record-&gt;ncancelled_pkgs;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;bill;
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_main;</PRE>
+<PRE>
+  $record = new FS::cust_main \%hash;
+  $record = new FS::cust_main { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  @cust_pkg = $record-&gt;all_pkgs;</PRE>
+<PRE>
+  @cust_pkg = $record-&gt;ncancelled_pkgs;</PRE>
+<PRE>
+  $error = $record-&gt;bill;
   $error = $record-&gt;bill %options;
-  $error = $record-&gt;bill 'time' =&gt; $time;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;collect;
+  $error = $record-&gt;bill 'time' =&gt; $time;</PRE>
+<PRE>
+  $error = $record-&gt;collect;
   $error = $record-&gt;collect %options;
   $error = $record-&gt;collect 'invoice_time'   =&gt; $time,
                             'batch_card'     =&gt; 'yes',
                             'report_badcard' =&gt; 'yes',
-                          ;
-</PRE>
+                          ;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::cust_main object represents a customer. FS::cust_main inherits from
-FS::Record. The following fields are currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_main object represents a customer.  FS::cust_main inherits from 
+FS::Record.  The following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_custnum">custnum - primary key (assigned automatically for new customers)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_agentnum">agentnum - agent (see FS::agent)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_refnum">refnum - referral (see FS::part_referral)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_first">first - name</A></STRONG><DD>
-<DT><STRONG><A NAME="item_last">last - name</A></STRONG><DD>
-<DT><STRONG><A NAME="item_ss">ss - social security number (optional)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_company">company - (optional)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_address1">address1</A></STRONG><DD>
-<DT><STRONG><A NAME="item_address2">address2 - (optional)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_city">city</A></STRONG><DD>
-<DT><STRONG><A NAME="item_county">county - (optional, see FS::cust_main_county)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_state">state - (see FS::cust_main_county)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_zip">zip</A></STRONG><DD>
-<DT><STRONG><A NAME="item_country">country - (see FS::cust_main_county)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_daytime">daytime - phone (optional)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_night">night - phone (optional)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_fax">fax - phone (optional)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_payby">payby - `CARD' (credit cards), `BILL' (billing), `COMP' (free), or `PREPAY' (special billing type: applies a credit - see FS::prepay_credit and sets billing type to BILL)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_payinfo">payinfo - card number, P.O., comp issuer (4-8 lowercase alphanumerics; think username) or prepayment identifier (see FS::prepay_credit)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_paydate">paydate - expiration date, mm/yyyy, m/yyyy, mm/yy or m/yy</A></STRONG><DD>
-<DT><STRONG><A NAME="item_payname">payname - name on card or billing name</A></STRONG><DD>
-<DT><STRONG><A NAME="item_tax">tax - tax exempt, empty or `Y'</A></STRONG><DD>
-<DT><STRONG><A NAME="item_otaker">otaker - order taker (assigned automatically, see FS::UID)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_key">custnum - primary key (assigned automatically for new customers)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_agent">agentnum - agent (see <A HREF=".././FS/agent.html">the FS::agent manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_referral">refnum - referral (see <A HREF=".././FS/part_referral.html">the FS::part_referral manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_first_%2D_name">first - name</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_last_%2D_name">last - name</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_number">ss - social security number (optional)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_company_%2D_%28optional%29">company - (optional)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_address1">address1</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_address2_%2D_%28optional%29">address2 - (optional)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_city">city</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_county_%2D_%28optional%2C_see_FS%3A%3Acust_main_co">county - (optional, see <A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_state_%2D_%28see_FS%3A%3Acust_main_county%29">state - (see <A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_zip">zip</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_country_%2D_%28see_FS%3A%3Acust_main_county%29">country - (see <A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_phone">daytime - phone (optional)</A></STRONG><BR>
+<DD>
+<DT><STRONG>night - phone (optional)</STRONG><BR>
+<DD>
+<DT><STRONG>fax - phone (optional)</STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_payby_%2D_%60CARD%27_%28credit_cards%29%2C_%60BILL">payby - `CARD' (credit cards), `BILL' (billing), `COMP' (free), or `PREPAY' (special billing type: applies a credit - see <A HREF=".././FS/prepay_credit.html">the FS::prepay_credit manpage</A> and sets billing type to BILL)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_issuer">payinfo - card number, P.O., comp issuer (4-8 lowercase alphanumerics; think username) or prepayment identifier (see <A HREF=".././FS/prepay_credit.html">the FS::prepay_credit manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_paydate_%2D_expiration_date%2C_mm%2Fyyyy%2C_m%2Fyy">paydate - expiration date, mm/yyyy, m/yyyy, mm/yy or m/yy</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_payname_%2D_name_on_card_or_billing_name">payname - name on card or billing name</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_tax_%2D_tax_exempt%2C_empty_or_%60Y%27">tax - tax exempt, empty or `Y'</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new customer. To add the customer to the database, see <A HREF="#insert">insert</A>.
-
-<P>
-Note that this stores the hash reference, not a distinct copy of the hash
-it points to. You can ask the object for a copy with the <EM>hash</EM> method.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this customer to the database. If there is an error, returns the
-error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_delete">delete NEW_CUSTNUM</A></STRONG><DD>
-<P>
-This deletes the customer. If there is an error, returns the error,
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new customer.  To add the customer to the database, see <A HREF="#insert">insert</A>.
+<P>Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this customer to the database.  If there is an error, returns the error,
 otherwise returns false.
-
-<P>
-This will completely remove all traces of the customer record. This is not
+<P>There is a special insert mode in which you pass a data structure to the insert
+method containing FS::cust_pkg and FS::svc_<EM>tablename</EM> objects.  When
+running under a transactional database, all records are inserted atomicly, or
+the transaction is rolled back.  There should be a better explanation of this,
+but until then, here's an example:</P>
+<PRE>
+  use Tie::RefHash;
+  tie %hash, 'Tie::RefHash'; #this part is important
+  %hash = {
+    $cust_pkg =&gt; [ $svc_acct ],
+  };
+  $cust_main-&gt;insert( \%hash );</PRE>
+<P></P>
+<DT><STRONG><A NAME="item_delete_NEW_CUSTNUM">delete NEW_CUSTNUM</A></STRONG><BR>
+<DD>
+This deletes the customer.  If there is an error, returns the error, otherwise
+returns false.
+<P>This will completely remove all traces of the customer record.  This is not
 what you want when a customer cancels service; for that, cancel all of the
-customer's packages (see <A HREF="../FS/cust_pkg.html#cancel">cancel</A>).
-
-<P>
-If the customer has any packages, you need to pass a new (valid) customer
-number for those packages to be transferred to.
-
-<P>
-You can't delete a customer with invoices (see <A HREF="../FS/cust_bill.html">FS::cust_bill</A>), or credits (see <A HREF="../FS/cust_credit.html">FS::cust_credit</A>).
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replaces the OLD_RECORD with this one in the database. If there is an
-error, returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid customer record. If there is
-an error, returns the error, otherwise returns false. Called by the insert
+customer's packages (see <A HREF=".././FS/cust_pkg.html#cancel">cancel in the FS::cust_pkg manpage</A>).</P>
+<P>If the customer has any packages, you need to pass a new (valid) customer
+number for those packages to be transferred to.</P>
+<P>You can't delete a customer with invoices (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>),
+or credits (see <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid customer record.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
 and repalce methods.
-
-<DT><STRONG><A NAME="item_all_pkgs">all_pkgs</A></STRONG><DD>
-<P>
-Returns all packages (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>) for this customer.
-
-<DT><STRONG><A NAME="item_ncancelled_pkgs">ncancelled_pkgs</A></STRONG><DD>
-<P>
-Returns all non-cancelled packages (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>) for this customer.
-
-<DT><STRONG><A NAME="item_bill">bill OPTIONS</A></STRONG><DD>
-<P>
-Generates invoices (see <A HREF="../FS/cust_bill.html">FS::cust_bill</A>) for this customer. Usually used in conjunction with the collect method.
-
-<P>
-The only currently available option is `time', which bills the customer as
-if it were that time. It is specified as a UNIX timestamp; see
-<EM>perlfunc</EM>). Also see <A HREF="../Time/Local.html">Time::Local</A> and <A HREF="../Date/Parse.html">Date::Parse</A> for conversion functions.
-
-<P>
-If there is an error, returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_collect">collect OPTIONS</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_all_pkgs">all_pkgs</A></STRONG><BR>
+<DD>
+Returns all packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this customer.
+<P></P>
+<DT><STRONG><A NAME="item_ncancelled_pkgs">ncancelled_pkgs</A></STRONG><BR>
+<DD>
+Returns all non-cancelled packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this customer.
+<P></P>
+<DT><STRONG><A NAME="item_bill">bill OPTIONS</A></STRONG><BR>
+<DD>
+Generates invoices (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>) for this customer.  Usually used in
+conjunction with the collect method.
+<P>The only currently available option is `time', which bills the customer as if
+it were that time.  It is specified as a UNIX timestamp; see
+<EM>perlfunc/``time''</EM>).  Also see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion
+functions.</P>
+<P>If there is an error, returns the error, otherwise returns false.</P>
+<P></P>
+<DT><STRONG><A NAME="item_collect">collect OPTIONS</A></STRONG><BR>
+<DD>
 (Attempt to) collect money for this customer's outstanding invoices (see
-<A HREF="../FS/cust_bill.html">FS::cust_bill</A>). Usually used after the bill method.
-
-<P>
-Depending on the value of `payby', this may print an invoice (`BILL'),
-charge a credit card (`CARD'), or just add any necessary (pseudo-)payment
-(`COMP').
-
-<P>
-If there is an error, returns the error, otherwise returns false.
-
-<P>
-Currently available options are:
-
-<P>
-invoice_time - Use this time when deciding when to print invoices and late
-notices on those invoices. The default is now. It is specified as a UNIX
-timestamp; see <EM>perlfunc</EM>). Also see <A HREF="../Time/Local.html">Time::Local</A> and <A HREF="../Date/Parse.html">Date::Parse</A>
-for conversion functions.
-
-<P>
-batch_card - Set this true to batch cards (see <A HREF=".././FS/cust_pay_batch.html#">the cust_pay_batch manpage</A>). By default, cards are processed immediately, which will generate an
-error if CyberCash is not installed.
-
-<P>
-report_badcard - Set this true if you want bad card transactions to return
-an error. By default, they don't.
-
-<DT><STRONG><A NAME="item_total_owed">total_owed</A></STRONG><DD>
-<P>
-Returns the total owed for this customer on all invoices (see <A HREF="../FS/cust_bill.html">FS::cust_bill</A>).
-
-<DT><STRONG><A NAME="item_total_credited">total_credited</A></STRONG><DD>
-<P>
-Returns the total credits (see <A HREF="../FS/cust_credit.html">FS::cust_credit</A>) for this customer.
-
-<DT><STRONG><A NAME="item_balance">balance</A></STRONG><DD>
-<P>
+<A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>).  Usually used after the bill method.
+<P>Depending on the value of `payby', this may print an invoice (`BILL'), charge
+a credit card (`CARD'), or just add any necessary (pseudo-)payment (`COMP').</P>
+<P>If there is an error, returns the error, otherwise returns false.</P>
+<P>Currently available options are:</P>
+<P>invoice_time - Use this time when deciding when to print invoices and
+late notices on those invoices.  The default is now.  It is specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>).  Also see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A>
+for conversion functions.</P>
+<P>batch_card - Set this true to batch cards (see <A HREF=".././FS/cust_pay_batch.html">the cust_pay_batch manpage</A>).  By
+default, cards are processed immediately, which will generate an error if
+CyberCash is not installed.</P>
+<P>report_badcard - Set this true if you want bad card transactions to
+return an error.  By default, they don't.</P>
+<P></P>
+<DT><STRONG><A NAME="item_total_owed">total_owed</A></STRONG><BR>
+<DD>
+Returns the total owed for this customer on all invoices
+(see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_total_credited">total_credited</A></STRONG><BR>
+<DD>
+Returns the total credits (see <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>) for this customer.
+<P></P>
+<DT><STRONG><A NAME="item_balance">balance</A></STRONG><BR>
+<DD>
 Returns the balance for this customer (total owed minus total credited).
-
-<DT><STRONG><A NAME="item_invoicing_list">invoicing_list [ ARRAYREF ]</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_invoicing_list_%5B_ARRAYREF_%5D">invoicing_list [ ARRAYREF ]</A></STRONG><BR>
+<DD>
 If an arguement is given, sets these email addresses as invoice recipients
-(see <A HREF="../FS/cust_main_invoice.html">FS::cust_main_invoice</A>). Errors are not fatal and are not reported (except as warnings), so use
-check_invoicing_list first.
-
-<P>
-Returns a list of email addresses (with svcnum entries expanded).
-
-<P>
-Note: You can clear the invoicing list by passing an empty ARRAYREF. You
-can check it without disturbing anything by passing nothing.
-
-<P>
-This interface may change in the future.
-
-<DT><STRONG><A NAME="item_check_invoicing_list">check_invoicing_list ARRAYREF</A></STRONG><DD>
-<P>
-Checks these arguements as valid input for the invoicing_list method. If
-there is an error, returns the error, otherwise returns false.
-
-</DL>
+(see <A HREF=".././FS/cust_main_invoice.html">the FS::cust_main_invoice manpage</A>).  Errors are not fatal and are not reported
+(except as warnings), so use check_invoicing_list first.
+<P>Returns a list of email addresses (with svcnum entries expanded).</P>
+<P>Note: You can clear the invoicing list by passing an empty ARRAYREF.  You can
+check it without disturbing anything by passing nothing.</P>
+<P>This interface may change in the future.</P>
+<P></P>
+<DT><STRONG><A NAME="item_check_invoicing_list_ARRAYREF">check_invoicing_list ARRAYREF</A></STRONG><BR>
+<DD>
+Checks these arguements as valid input for the invoicing_list method.  If there
+is an error, returns the error, otherwise returns false.
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: cust_main.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_main.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-The delete method.
-
-<P>
-The delete method should possibly take an FS::cust_main object reference
-instead of a scalar customer number.
-
-<P>
-Bill and collect options should probably be passed as references instead of
-a list.
-
-<P>
-CyberCash v2 forces us to define some variables in package main.
-
-<P>
-There should probably be a configuration file with a list of allowed credit
-card types.
-
-<P>
-CyberCash is the only processor.
-
-<P>
-No multiple currency support (probably a larger project than just this
-module).
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The delete method.</P>
+<P>The delete method should possibly take an FS::cust_main object reference
+instead of a scalar customer number.</P>
+<P>Bill and collect options should probably be passed as references instead of a
+list.</P>
+<P>CyberCash v2 forces us to define some variables in package main.</P>
+<P>There should probably be a configuration file with a list of allowed credit
+card types.</P>
+<P>CyberCash is the only processor.</P>
+<P>No multiple currency support (probably a larger project than just this module).</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>, <A HREF="../FS/cust_bill.html">FS::cust_bill</A>, <A HREF="../FS/cust_credit.html">FS::cust_credit</A>
-
-<A HREF="../FS/cust_pay_batch.html">FS::cust_pay_batch</A>, <A HREF="../FS/agent.html">FS::agent</A>, <A HREF="../FS/part_referral.html">FS::part_referral</A>,
-<A HREF="../FS/cust_main_county.html">FS::cust_main_county</A>, <A HREF="../FS/cust_main_invoice.html">FS::cust_main_invoice</A>,
-<A HREF="../FS/UID.html">FS::UID</A>, schema.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>
+<A HREF=".././FS/cust_pay_batch.html">the FS::cust_pay_batch manpage</A>, <A HREF=".././FS/agent.html">the FS::agent manpage</A>, <A HREF=".././FS/part_referral.html">the FS::part_referral manpage</A>,
+<A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>, <A HREF=".././FS/cust_main_invoice.html">the FS::cust_main_invoice manpage</A>,
+<A HREF=".././FS/UID.html">the FS::UID manpage</A>, schema.html from the base documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/cust_main_county.html b/htdocs/docs/man/FS/cust_main_county.html
index 3362412ac..575eaedca 100644
--- a/htdocs/docs/man/FS/cust_main_county.html
+++ b/htdocs/docs/man/FS/cust_main_county.html
@@ -1,112 +1,105 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_main_county - Object methods for cust_main_county objects</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::cust_main_county - Object methods for cust_main_county objects
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_main_county - Object methods for cust_main_county objects</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::cust_main_county;
-</PRE>
-<P>
-<PRE>  $record = new FS::cust_main_county \%hash;
-  $record = new FS::cust_main_county { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_main_county;</PRE>
+<PRE>
+  $record = new FS::cust_main_county \%hash;
+  $record = new FS::cust_main_county { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::cust_main_county object represents a tax rate, defined by locale.
-FS::cust_main_county inherits from FS::Record. The following fields are
-currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_main_county object represents a tax rate, defined by locale.
+FS::cust_main_county inherits from FS::Record.  The following fields are
+currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_taxnum">taxnum - primary key (assigned automatically for new tax rates)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_state">state</A></STRONG><DD>
-<DT><STRONG><A NAME="item_county">county</A></STRONG><DD>
-<DT><STRONG><A NAME="item_country">country</A></STRONG><DD>
-<DT><STRONG><A NAME="item_tax">tax - percentage</A></STRONG><DD>
+<DT><STRONG><A NAME="item_key">taxnum - primary key (assigned automatically for new tax rates)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_state">state</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_county">county</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_country">country</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_tax_%2D_percentage">tax - percentage</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new tax rate. To add the tax rate to the database, see <A HREF="#insert">insert</A>.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this tax rate to the database. If there is an error, returns the
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new tax rate.  To add the tax rate to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this tax rate to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this tax rate from the database.  If there is an error, returns the
 error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
-Deletes this tax rate from the database. If there is an error, returns the
-error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replaces the OLD_RECORD with this one in the database. If there is an
-error, returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid tax rate. If there is an
-error, returns the error, otherwise returns false. Called by the insert and
-replace methods.
-
-</DL>
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid tax rate.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: cust_main_county.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_main_county.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
+<H1><A NAME="bugs">BUGS</A></H1>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_main.html">FS::cust_main</A>, <A HREF="../FS/cust_bill.html">FS::cust_bill</A>, schema.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, schema.html from the base
+documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/cust_main_invoice.html b/htdocs/docs/man/FS/cust_main_invoice.html
index 9dc1fde9e..7a3719711 100644
--- a/htdocs/docs/man/FS/cust_main_invoice.html
+++ b/htdocs/docs/man/FS/cust_main_invoice.html
@@ -1,127 +1,110 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_main_invoice - Object methods for cust_main_invoice records</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::cust_main_invoice - Object methods for cust_main_invoice records
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_main_invoice - Object methods for cust_main_invoice records</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::cust_main_invoice;
-</PRE>
-<P>
-<PRE>  $record = new FS::cust_main_invoice \%hash;
-  $record = new FS::cust_main_invoice { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
-<P>
-<PRE>  $email_address = $record-&gt;address;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_main_invoice;</PRE>
+<PRE>
+  $record = new FS::cust_main_invoice \%hash;
+  $record = new FS::cust_main_invoice { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $email_address = $record-&gt;address;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::cust_main_invoice object represents an invoice destination.
-FS::cust_main_invoice inherits from FS::Record. The following fields are
-currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_main_invoice object represents an invoice destination.  FS::cust_main_invoice inherits from
+FS::Record.  The following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_destnum">destnum - primary key</A></STRONG><DD>
-<DT><STRONG><A NAME="item_custnum">custnum - customer (see FS::cust_main)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_dest">dest - Invoice destination: If numeric, a &lt;a href=&quot;#svc_acct&quot;&gt;svcnum&lt;/a&gt;, if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_destnum_%2D_primary_key">destnum - primary key</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_customer">custnum - customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_svcnum">dest - Invoice destination: If numeric, a svcnum (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>), if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new invoice destination. To add the invoice destination to the
-database, see <A HREF="#insert">insert</A>.
-
-<P>
-Note that this stores the hash reference, not a distinct copy of the hash
-it points to. You can ask the object for a copy with the <EM>hash</EM> method.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this record to the database. If there is an error, returns the error,
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new invoice destination.  To add the invoice destination to the database, see <A HREF="#insert">insert</A>.
+<P>Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
 Delete this record from the database.
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replaces the OLD_RECORD with this one in the database. If there is an
-error, returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid invoice destination. If
-there is an error, returns the error, otherwise returns false. Called by
-the insert and repalce methods.
-
-<DT><STRONG><A NAME="item_checkdest">checkdest</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid invoice destination.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+<P></P>
+<DT><STRONG><A NAME="item_checkdest">checkdest</A></STRONG><BR>
+<DD>
 Checks the dest field only.
-
-<DT><STRONG><A NAME="item_address">address</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_address">address</A></STRONG><BR>
+<DD>
 Returns the literal email address for this record (or `POST').
-
-</DL>
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: cust_main_invoice.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_main_invoice.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
+<H1><A NAME="bugs">BUGS</A></H1>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_main.html">FS::cust_main</A>
-
-
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A></P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/cust_pay.html b/htdocs/docs/man/FS/cust_pay.html
index e9ae08a41..dc7b54c8d 100644
--- a/htdocs/docs/man/FS/cust_pay.html
+++ b/htdocs/docs/man/FS/cust_pay.html
@@ -1,115 +1,107 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_pay - Object methods for cust_pay objects</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::cust_pay - Object methods for cust_pay objects
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_pay - Object methods for cust_pay objects</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::cust_pay;
-</PRE>
-<P>
-<PRE>  $record = new FS::cust_pay \%hash;
-  $record = new FS::cust_pay { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_pay;</PRE>
+<PRE>
+  $record = new FS::cust_pay \%hash;
+  $record = new FS::cust_pay { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::cust_pay object represents a payment. FS::cust_pay inherits from
-FS::Record. The following fields are currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_pay object represents a payment; the transfer of money from a
+customer.  FS::cust_pay inherits from FS::Record.  The following fields are
+currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_paynum">paynum - primary key (assigned automatically for new payments)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_invnum">invnum - Invoice (see FS::cust_bill)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_paid">paid - Amount of this payment</A></STRONG><DD>
-<DT><STRONG><A NAME="item__date">_date - specified as a UNIX timestamp; see perlfunc/&quot;time&quot;.  Also see
-Time::Local and Date::Parse for conversion functions.</A></STRONG><DD>
-<DT><STRONG><A NAME="item_payby">payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_payinfo">payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_paybatch">paybatch - text field for tracking card processing</A></STRONG><DD>
+<DT><STRONG><A NAME="item_key">paynum - primary key (assigned automatically for new payments)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_Invoice">invnum - Invoice (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_paid_%2D_Amount_of_this_payment">paid - Amount of this payment</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item__date_%2D_specified_as_a_UNIX_timestamp%3B_see_per">_date - specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
+<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_payby_%2D_%60CARD%27_%28credit_cards%29%2C_%60BILL">payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_issuer">payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_paybatch_%2D_text_field_for_tracking_card_processi">paybatch - text field for tracking card processing</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new payment. To add the payment to the databse, see <A HREF="#insert">insert</A>.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new payment.  To add the payment to the databse, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
 Adds this payment to the databse, and updates the invoice (see
-<A HREF="../FS/cust_bill.html">FS::cust_bill</A>).
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
+<A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
 Currently unimplemented (accounting reasons).
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
 Currently unimplemented (accounting reasons).
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid payment. If there is an
-error, returns the error, otherwise returns false. Called by the insert
-method.
-
-</DL>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid payment.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert method.
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: cust_pay.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_pay.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-Delete and replace methods.
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>Delete and replace methods.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_bill.html">FS::cust_bill</A>, schema.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, schema.html from the base documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/cust_pay_batch.html b/htdocs/docs/man/FS/cust_pay_batch.html
index d67c12474..b7637bc6d 100644
--- a/htdocs/docs/man/FS/cust_pay_batch.html
+++ b/htdocs/docs/man/FS/cust_pay_batch.html
@@ -1,133 +1,131 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_pay_batch - Object methods for batch cards</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::cust_pay_batch - Object methods for batch cards
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_pay_batch - Object methods for batch cards</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::cust_pay_batch;
-</PRE>
-<P>
-<PRE>  $record = new FS::cust_pay_batch \%hash;
-  $record = new FS::cust_pay_batch { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_pay_batch;</PRE>
+<PRE>
+  $record = new FS::cust_pay_batch \%hash;
+  $record = new FS::cust_pay_batch { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::cust_pay_batch object represents a credit card transaction ready to
-be batched (sent to a processor). FS::cust_pay_batch inherits from
-FS::Record. Typically called by the collect method of an FS::cust_main
-object. The following fields are currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_pay_batch object represents a credit card transaction ready to be
+batched (sent to a processor).  FS::cust_pay_batch inherits from FS::Record.  
+Typically called by the collect method of an FS::cust_main object.  The
+following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_trancode">trancode - 77 for charges</A></STRONG><DD>
-<DT><STRONG><A NAME="item_cardnum">cardnum</A></STRONG><DD>
-<DT><STRONG><A NAME="item_exp">exp - card expiration</A></STRONG><DD>
-<DT><STRONG><A NAME="item_amount">amount</A></STRONG><DD>
-<DT><STRONG><A NAME="item_invnum">invnum - invoice</A></STRONG><DD>
-<DT><STRONG><A NAME="item_custnum">custnum - customer</A></STRONG><DD>
-<DT><STRONG><A NAME="item_payname">payname - name on card</A></STRONG><DD>
-<DT><STRONG><A NAME="item_first">first - name</A></STRONG><DD>
-<DT><STRONG><A NAME="item_last">last - name</A></STRONG><DD>
-<DT><STRONG><A NAME="item_address1">address1</A></STRONG><DD>
-<DT><STRONG><A NAME="item_address2">address2</A></STRONG><DD>
-<DT><STRONG><A NAME="item_city">city</A></STRONG><DD>
-<DT><STRONG><A NAME="item_state">state</A></STRONG><DD>
-<DT><STRONG><A NAME="item_zip">zip</A></STRONG><DD>
-<DT><STRONG><A NAME="item_country">country</A></STRONG><DD>
+<DT><STRONG><A NAME="item_trancode_%2D_77_for_charges">trancode - 77 for charges</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_cardnum">cardnum</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_exp_%2D_card_expiration">exp - card expiration</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_amount">amount</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_invnum_%2D_invoice">invnum - invoice</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_custnum_%2D_customer">custnum - customer</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_payname_%2D_name_on_card">payname - name on card</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_first_%2D_name">first - name</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_last_%2D_name">last - name</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_address1">address1</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_address2">address2</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_city">city</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_state">state</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_zip">zip</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_country">country</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new record. To add the record to the database, see <A HREF="#insert">insert</A>.
-
-<P>
-Note that this stores the hash reference, not a distinct copy of the hash
-it points to. You can ask the object for a copy with the <EM>hash</EM> method.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this record to the database. If there is an error, returns the error,
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new record.  To add the record to the database, see <A HREF="#insert">insert</A>.
+<P>Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
-Delete this record from the database. If there is an error, returns the
-error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-#inactive # #Replaces the OLD_RECORD with this one in the database. If
-there is an error, #returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid transaction. If there is an
-error, returns the error, otherwise returns false. Called by the insert and
-repalce methods.
-
-</DL>
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Delete this record from the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+#inactive
+#
+#Replaces the OLD_RECORD with this one in the database.  If there is an error,
+#returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid transaction.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: cust_pay_batch.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_pay_batch.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-There should probably be a configuration file with a list of allowed credit
-card types.
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>There should probably be a configuration file with a list of allowed credit
+card types.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/cust_main.html">FS::cust_main</A>, <A HREF="../FS/Record.html">FS::Record</A>
-
-
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A></P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/cust_pkg.html b/htdocs/docs/man/FS/cust_pkg.html
index d7659f0ce..19c8ff842 100644
--- a/htdocs/docs/man/FS/cust_pkg.html
+++ b/htdocs/docs/man/FS/cust_pkg.html
@@ -1,253 +1,204 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_pkg - Object methods for cust_pkg objects</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#SUBROUTINES">SUBROUTINES</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::cust_pkg - Object methods for cust_pkg objects
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_pkg - Object methods for cust_pkg objects</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::cust_pkg;
-</PRE>
-<P>
-<PRE>  $record = new FS::cust_pkg \%hash;
-  $record = new FS::cust_pkg { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;cancel;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;suspend;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;unsuspend;
-</PRE>
-<P>
-<PRE>  $part_pkg = $record-&gt;part_pkg;
-</PRE>
-<P>
-<PRE>  @labels = $record-&gt;labels;
-</PRE>
-<P>
-<PRE>  $error = FS::cust_pkg::order( $custnum, \@pkgparts );
-  $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_pkg;</PRE>
+<PRE>
+  $record = new FS::cust_pkg \%hash;
+  $record = new FS::cust_pkg { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $error = $record-&gt;cancel;</PRE>
+<PRE>
+  $error = $record-&gt;suspend;</PRE>
+<PRE>
+  $error = $record-&gt;unsuspend;</PRE>
+<PRE>
+  $part_pkg = $record-&gt;part_pkg;</PRE>
+<PRE>
+  @labels = $record-&gt;labels;</PRE>
+<PRE>
+  $error = FS::cust_pkg::order( $custnum, \@pkgparts );
+  $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::cust_pkg object represents a customer billing item. FS::cust_pkg
-inherits from FS::Record. The following fields are currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_pkg object represents a customer billing item.  FS::cust_pkg
+inherits from FS::Record.  The following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_pkgnum">pkgnum - primary key (assigned automatically for new billing items)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_custnum">custnum - Customer (see FS::cust_main)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_pkgpart">pkgpart - Billing item definition (see FS::part_pkg)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_setup">setup - date</A></STRONG><DD>
-<DT><STRONG><A NAME="item_bill">bill - date</A></STRONG><DD>
-<DT><STRONG><A NAME="item_susp">susp - date</A></STRONG><DD>
-<DT><STRONG><A NAME="item_expire">expire - date</A></STRONG><DD>
-<DT><STRONG><A NAME="item_cancel">cancel - date</A></STRONG><DD>
-<DT><STRONG><A NAME="item_otaker">otaker - order taker (assigned automatically if null, see FS::UID)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_key">pkgnum - primary key (assigned automatically for new billing items)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_Customer">custnum - Customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_definition">pkgpart - Billing item definition (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_setup_%2D_date">setup - date</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_bill_%2D_date">bill - date</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_susp_%2D_date">susp - date</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_expire_%2D_date">expire - date</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_cancel_%2D_date">cancel - date</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically if null, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
+<DD>
 </DL>
-<P>
-Note: setup, bill, susp, expire and cancel are specified as UNIX
-timestamps; see <EM>perlfunc</EM>. Also see <A HREF="../Time/Local.html">Time::Local</A> and <A HREF="../Date/Parse.html">Date::Parse</A> for conversion functions.
-
+<P>Note: setup, bill, susp, expire and cancel are specified as UNIX timestamps;
+see <EM>perlfunc/``time''</EM>.  Also see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for
+conversion functions.</P>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Create a new billing item. To add the item to the database, see <A HREF="#insert">insert</A>.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this billing item to the database (``Orders'' the item). If there is
-an error, returns the error, otherwise returns false.
-
-<P>
-sub insert { my <CODE>$self</CODE> = shift;
-
-<P>
-<PRE>  # custnum might not have have been defined in sub check (for one-shot new
-  # customers), so check it here instead
-</PRE>
-<P>
-<PRE>  my $error = $self-&gt;ut_number('custnum');
-  return $error if $error
-</PRE>
-<P>
-<PRE>  return &quot;Unknown customer&quot;
-    unless qsearchs( 'cust_main', { 'custnum' =&gt; $self-&gt;custnum } );
-</PRE>
-<P>
-<PRE>  $self-&gt;SUPER::insert;
-</PRE>
-<P>
-}
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
-Currently unimplemented. You don't want to delete billing items, because
-there would then be no record the customer ever purchased the item.
-Instead, see the cancel method.
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replaces the OLD_RECORD with this one in the database. If there is an
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Create a new billing item.  To add the item to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this billing item to the database (``Orders'' the item).  If there is an
 error, returns the error, otherwise returns false.
-
-<P>
-Currently, custnum, setup, bill, susp, expire, and cancel may be changed.
-
-<P>
-Changing pkgpart may have disasterous effects. See the order subroutine.
-
-<P>
-setup and bill are normally updated by calling the bill method of a
-customer object (see <A HREF="../FS/cust_main.html">FS::cust_main</A>).
-
-<P>
-suspend is normally updated by the suspend and unsuspend methods.
-
-<P>
-cancel is normally updated by the cancel method (and also the order
-subroutine in some cases).
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid billing item. If there is an
-error, returns the error, otherwise returns false. Called by the insert and
+<P>sub insert {
+  my $self = shift;</P>
+<PRE>
+  # custnum might not have have been defined in sub check (for one-shot new
+  # customers), so check it here instead</PRE>
+<PRE>
+  my $error = $self-&gt;ut_number('custnum');
+  return $error if $error</PRE>
+<PRE>
+  return &quot;Unknown customer&quot;
+    unless qsearchs( 'cust_main', { 'custnum' =&gt; $self-&gt;custnum } );</PRE>
+<PRE>
+  $self-&gt;SUPER::insert;</PRE>
+<P>}</P>
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Currently unimplemented.  You don't want to delete billing items, because there
+would then be no record the customer ever purchased the item.  Instead, see
+the cancel method.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P>Currently, custnum, setup, bill, susp, expire, and cancel may be changed.</P>
+<P>Changing pkgpart may have disasterous effects.  See the order subroutine.</P>
+<P>setup and bill are normally updated by calling the bill method of a customer
+object (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>).</P>
+<P>suspend is normally updated by the suspend and unsuspend methods.</P>
+<P>cancel is normally updated by the cancel method (and also the order subroutine
+in some cases).</P>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid billing item.  If there is an
+error, returns the error, otherwise returns false.  Called by the insert and
 replace methods.
-
-<DT><STRONG>cancel</STRONG><DD>
-<P>
-Cancels and removes all services (see <A HREF="../FS/cust_svc.html">FS::cust_svc</A> and <A HREF="../FS/part_svc.html">FS::part_svc</A>) in this package, then cancels the package itself (sets the cancel field
-to now).
-
-<P>
-If there is an error, returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><DD>
-<P>
-Suspends all services (see <A HREF="../FS/cust_svc.html">FS::cust_svc</A> and <A HREF="../FS/part_svc.html">FS::part_svc</A>) in this package, then suspends the package itself (sets the susp field to
+<P></P>
+<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
+<DD>
+Cancels and removes all services (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A> and <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>)
+in this package, then cancels the package itself (sets the cancel field to
 now).
-
-<P>
-If there is an error, returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><DD>
-<P>
-Unsuspends all services (see <A HREF="../FS/cust_svc.html">FS::cust_svc</A> and <A HREF="../FS/part_svc.html">FS::part_svc</A>) in this package, then unsuspends the package itself (clears the susp
-field).
-
-<P>
-If there is an error, returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_part_pkg">part_pkg</A></STRONG><DD>
-<P>
-Returns the definition for this billing item, as an FS::part_pkg object
-(see
-<A HREF="../FS/part_pkg.html">FS::part_pkg</A>).
-
-<DT><STRONG><A NAME="item_labels">labels</A></STRONG><DD>
-<P>
-Returns a list of lists, calling the label method for all services (see <A HREF="../FS/cust_svc.html">FS::cust_svc</A>) of this billing item.
-
-</DL>
+<P>If there is an error, returns the error, otherwise returns false.</P>
+<P></P>
+<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
+<DD>
+Suspends all services (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A> and <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>) in this
+package, then suspends the package itself (sets the susp field to now).
+<P>If there is an error, returns the error, otherwise returns false.</P>
+<P></P>
+<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
+<DD>
+Unsuspends all services (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A> and <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>) in this
+package, then unsuspends the package itself (clears the susp field).
+<P>If there is an error, returns the error, otherwise returns false.</P>
+<P></P>
+<DT><STRONG><A NAME="item_part_pkg">part_pkg</A></STRONG><BR>
+<DD>
+Returns the definition for this billing item, as an FS::part_pkg object (see
+<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_labels">labels</A></STRONG><BR>
+<DD>
+Returns a list of lists, calling the label method for all services
+(see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) of this billing item.
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="SUBROUTINES">SUBROUTINES</A></H1>
+<H1><A NAME="subroutines">SUBROUTINES</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_order">order CUSTNUM, PKGPARTS_ARYREF, [ REMOVE_PKGNUMS_ARYREF ]</A></STRONG><DD>
-<P>
-CUSTNUM is a customer (see <A HREF="../FS/cust_main.html">FS::cust_main</A>)
-
-<P>
-PKGPARTS is a list of pkgparts specifying the the billing item definitions
-(see
-<A HREF="../FS/part_pkg.html">FS::part_pkg</A>) to order for this customer. Duplicates are of course permitted.
-
-<P>
-REMOVE_PKGNUMS is an optional list of pkgnums specifying the billing items
-to remove for this customer. The services (see <A HREF="../FS/cust_svc.html">FS::cust_svc</A>) are moved to the new billing items. An error is returned if this is not
-possible (see
-<A HREF="../FS/pkg_svc.html">FS::pkg_svc</A>).
-
-</DL>
+<DT><STRONG><A NAME="item_order_CUSTNUM%2C_PKGPARTS_ARYREF%2C_%5B_REMOVE_PKG">order CUSTNUM, PKGPARTS_ARYREF, [ REMOVE_PKGNUMS_ARYREF ]</A></STRONG><BR>
+<DD>
+CUSTNUM is a customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)
+<P>PKGPARTS is a list of pkgparts specifying the the billing item definitions (see
+<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>) to order for this customer.  Duplicates are of course
+permitted.</P>
+<P>REMOVE_PKGNUMS is an optional list of pkgnums specifying the billing items to
+remove for this customer.  The services (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) are moved to the
+new billing items.  An error is returned if this is not possible (see
+<A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>).</P>
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: cust_pkg.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_pkg.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-sub order is not OO. Perhaps it should be moved to FS::cust_main and made
-so?
-
-<P>
-In sub order, the <CODE>@pkgparts</CODE> array (passed by reference) is
-clobbered.
-
-<P>
-Also in sub order, no money is adjusted. Once FS::part_pkg defines a
-standard method to pass dates to the recur_prog expression, it should do
-so.
-
-<P>
-FS::svc_acct, FS::svc_acct_sm, and FS::svc_domain are loaded via 'use' at
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>sub order is not OO.  Perhaps it should be moved to FS::cust_main and made so?</P>
+<P>In sub order, the @pkgparts array (passed by reference) is clobbered.</P>
+<P>Also in sub order, no money is adjusted.  Once FS::part_pkg defines a standard
+method to pass dates to the recur_prog expression, it should do so.</P>
+<P>FS::svc_acct, FS::svc_acct_sm, and FS::svc_domain are loaded via 'use' at 
 compile time, rather than via 'require' in sub { setup, suspend, unsuspend,
 cancel } because they use %FS::UID::callback to load configuration values.
 Probably need a subroutine which decides what to do based on whether or not
-we've fetched the user yet, rather than a hash. See FS::UID and the TODO.
-
+we've fetched the user yet, rather than a hash.  See FS::UID and the TODO.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_main.html">FS::cust_main</A>, <A HREF="../FS/part_pkg.html">FS::part_pkg</A>, <A HREF="../FS/cust_svc.html">FS::cust_svc</A>
-, <A HREF="../FS/pkg_svc.html">FS::pkg_svc</A>, schema.html from the base documentation
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>
+, <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>, schema.html from the base documentation</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/cust_refund.html b/htdocs/docs/man/FS/cust_refund.html
index 6d6cded8a..8162c0b78 100644
--- a/htdocs/docs/man/FS/cust_refund.html
+++ b/htdocs/docs/man/FS/cust_refund.html
@@ -1,115 +1,107 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_refund - Object method for cust_refund objects</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::cust_refund - Object method for cust_refund objects
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_refund - Object method for cust_refund objects</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::cust_refund;
-</PRE>
-<P>
-<PRE>  $record = new FS::cust_refund \%hash;
-  $record = new FS::cust_refund { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_refund;</PRE>
+<PRE>
+  $record = new FS::cust_refund \%hash;
+  $record = new FS::cust_refund { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::cust_refund represents a refund. FS::cust_refund inherits from
-FS::Record. The following fields are currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_refund represents a refund: the transfer of money to a customer;
+equivalent to a negative payment (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>).  FS::cust_refund
+inherits from FS::Record.  The following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_refundnum">refundnum - primary key (assigned automatically for new refunds)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_crednum">crednum - Credit (see FS::cust_credit)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_refund">refund - Amount of the refund</A></STRONG><DD>
-<DT><STRONG><A NAME="item__date">_date - specified as a UNIX timestamp; see perlfunc/&quot;time&quot;.  Also see
-Time::Local and Date::Parse for conversion functions.</A></STRONG><DD>
-<DT><STRONG><A NAME="item_payby">payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_payinfo">payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_otaker">otaker - order taker (assigned automatically, see FS::UID)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_key">refundnum - primary key (assigned automatically for new refunds)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_Credit">crednum - Credit (see <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_refund_%2D_Amount_of_the_refund">refund - Amount of the refund</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item__date_%2D_specified_as_a_UNIX_timestamp%3B_see_per">_date - specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
+<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_payby_%2D_%60CARD%27_%28credit_cards%29%2C_%60BILL">payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_issuer">payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new refund. To add the refund to the database, see <A HREF="#insert">insert</A>.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new refund.  To add the refund to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
 Adds this refund to the database, and updates the credit (see
-<A HREF="../FS/cust_credit.html">FS::cust_credit</A>).
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
+<A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
 Currently unimplemented (accounting reasons).
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
 Currently unimplemented (accounting reasons).
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid refund. If there is an
-error, returns the error, otherwise returns false. Called by the insert
-method.
-
-</DL>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid refund.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert method.
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: cust_refund.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_refund.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-Delete and replace methods.
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>Delete and replace methods.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_credit.html">FS::cust_credit</A>, schema.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>, schema.html from the base documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/cust_svc.html b/htdocs/docs/man/FS/cust_svc.html
index 5e73b17c9..19416d5b7 100644
--- a/htdocs/docs/man/FS/cust_svc.html
+++ b/htdocs/docs/man/FS/cust_svc.html
@@ -1,133 +1,117 @@
 <HTML>
 <HEAD>
 <TITLE>FS::cust_svc - Object method for cust_svc objects</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::cust_svc - Object method for cust_svc objects
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_svc - Object method for cust_svc objects</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::cust_svc;
-</PRE>
-<P>
-<PRE>  $record = new FS::cust_svc \%hash
-  $record = new FS::cust_svc { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
-<P>
-<PRE>  ($label, $value) = $record-&gt;label;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_svc;</PRE>
+<PRE>
+  $record = new FS::cust_svc \%hash
+  $record = new FS::cust_svc { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  ($label, $value) = $record-&gt;label;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::cust_svc represents a service. FS::cust_svc inherits from
-FS::Record. The following fields are currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_svc represents a service.  FS::cust_svc inherits from FS::Record.
+The following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_svcnum">svcnum - primary key (assigned automatically for new services)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_pkgnum">pkgnum - Package (see FS::cust_pkg)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_svcpart">svcpart - Service definition (see FS::part_svc)</A></STRONG><DD>
+<DT><STRONG><A NAME="item_key">svcnum - primary key (assigned automatically for new services)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_Package">pkgnum - Package (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_definition">svcpart - Service definition (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>)</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new service. To add the refund to the database, see <A HREF="#insert">insert</A>. Services are normally created by creating FS::svc_ objects (see
-<A HREF="../FS/svc_acct.html">FS::svc_acct</A>, <A HREF="../FS/svc_domain.html">FS::svc_domain</A>, and <A HREF="../FS/svc_acct_sm.html">FS::svc_acct_sm</A>, among others).
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this service to the database. If there is an error, returns the error,
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new service.  To add the refund to the database, see <A HREF="#insert">insert</A>.
+Services are normally created by creating FS::svc_ objects (see
+<A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, and <A HREF=".././FS/svc_acct_sm.html">the FS::svc_acct_sm manpage</A>, among others).
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this service to the database.  If there is an error, returns the error,
 otherwise returns false.
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
-Deletes this service from the database. If there is an error, returns the
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this service from the database.  If there is an error, returns the
 error, otherwise returns false.
-
-<P>
-Called by the cancel method of the package (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replaces the OLD_RECORD with this one in the database. If there is an
-error, returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid service. If there is an
-error, returns the error, otehrwise returns false. Called by the insert and
+<P>Called by the cancel method of the package (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid service.  If there is an error,
+returns the error, otehrwise returns false.  Called by the insert and
 replace methods.
-
-<DT><STRONG><A NAME="item_label">label</A></STRONG><DD>
-<P>
-Returns a list consisting of: - The name of this service (from part_svc) -
-A meaningful identifier (username, domain, or mail alias) - The table name
-(i.e. svc_domain) for this service
-
-</DL>
+<P></P>
+<DT><STRONG><A NAME="item_label">label</A></STRONG><BR>
+<DD>
+Returns a list consisting of:
+- The name of this service (from part_svc)
+- A meaningful identifier (username, domain, or mail alias)
+- The table name (i.e. svc_domain) for this service
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: cust_svc.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_svc.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-Behaviour of changing the svcpart of cust_svc records is undefined and
-should possibly be prohibited, and pkg_svc records are not checked.
-
-<P>
-pkg_svc records are not checked in general (here).
-
-<P>
-Deleting this record doesn't check or delete the svc_* record associated
-with this record.
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>Behaviour of changing the svcpart of cust_svc records is undefined and should
+possibly be prohibited, and pkg_svc records are not checked.</P>
+<P>pkg_svc records are not checked in general (here).</P>
+<P>Deleting this record doesn't check or delete the svc_* record associated
+with this record.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>, <A HREF="../FS/part_svc.html">FS::part_svc</A>, <A HREF="../FS/pkg_svc.html">FS::pkg_svc</A>, schema.html from the base documentation
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>, 
+schema.html from the base documentation</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/part_pkg.html b/htdocs/docs/man/FS/part_pkg.html
index 716b944ce..4bf46742e 100644
--- a/htdocs/docs/man/FS/part_pkg.html
+++ b/htdocs/docs/man/FS/part_pkg.html
@@ -1,151 +1,137 @@
 <HTML>
 <HEAD>
 <TITLE>FS::part_pkg - Object methods for part_pkg objects</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::part_pkg - Object methods for part_pkg objects
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::part_pkg - Object methods for part_pkg objects</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::part_pkg;
-</PRE>
-<P>
-<PRE>  $record = new FS::part_pkg \%hash
-  $record = new FS::part_pkg { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $custom_record = $template_record-&gt;clone;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
-<P>
-<PRE>  @pkg_svc = $record-&gt;pkg_svc;
-</PRE>
-<P>
-<PRE>  $svcnum = $record-&gt;svcpart;
-  $svcnum = $record-&gt;svcpart( 'svc_acct' );
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::part_pkg;</PRE>
+<PRE>
+  $record = new FS::part_pkg \%hash
+  $record = new FS::part_pkg { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $custom_record = $template_record-&gt;clone;</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  @pkg_svc = $record-&gt;pkg_svc;</PRE>
+<PRE>
+  $svcnum = $record-&gt;svcpart;
+  $svcnum = $record-&gt;svcpart( 'svc_acct' );</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::part_pkg object represents a billing item definition. FS::part_pkg
-inherits from FS::Record. The following fields are currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::part_pkg object represents a billing item definition.  FS::part_pkg
+inherits from FS::Record.  The following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_pkgpart">pkgpart - primary key (assigned automatically for new billing item definitions)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_pkg">pkg - Text name of this billing item definition (customer-viewable)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_comment">comment - Text name of this billing item definition (non-customer-viewable)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_setup">setup - Setup fee</A></STRONG><DD>
-<DT><STRONG><A NAME="item_freq">freq - Frequency of recurring fee</A></STRONG><DD>
-<DT><STRONG><A NAME="item_recur">recur - Recurring fee</A></STRONG><DD>
+<DT><STRONG><A NAME="item_key">pkgpart - primary key (assigned automatically for new billing item definitions)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_definition">pkg - Text name of this billing item definition (customer-viewable)</A></STRONG><BR>
+<DD>
+<DT><STRONG>comment - Text name of this billing item definition (non-customer-viewable)</STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_setup_%2D_Setup_fee">setup - Setup fee</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_freq_%2D_Frequency_of_recurring_fee">freq - Frequency of recurring fee</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_recur_%2D_Recurring_fee">recur - Recurring fee</A></STRONG><BR>
+<DD>
 </DL>
-<P>
-setup and recur are evaluated as Safe perl expressions. You can use numbers
-just as you would normally. More advanced semantics are not yet defined.
-
+<P>setup and recur are evaluated as Safe perl expressions.  You can use numbers
+just as you would normally.  More advanced semantics are not yet defined.</P>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new billing item definition. To add the billing item definition
-to the database, see <A HREF="#insert">insert</A>.
-
-<DT><STRONG><A NAME="item_clone">clone</A></STRONG><DD>
-<P>
-An alternate constructor. Creates a new billing item definition by
-duplicating an existing definition. A new pkgpart is assigned and `(CUSTOM)
-' is prepended to the comment field. To add the billing item definition to
-the database, see
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new billing item definition.  To add the billing item definition to
+the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_clone">clone</A></STRONG><BR>
+<DD>
+An alternate constructor.  Creates a new billing item definition by duplicating
+an existing definition.  A new pkgpart is assigned and `(CUSTOM) ' is prepended
+to the comment field.  To add the billing item definition to the database, see
 <A HREF="#insert">insert</A>.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this billing item definition to the database. If there is an error,
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this billing item definition to the database.  If there is an error,
 returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
 Currently unimplemented.
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replaces OLD_RECORD with this one in the database. If there is an error,
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid billing item definition. If
-there is an error, returns the error, otherwise returns false. Called by
-the insert and replace methods.
-
-<DT><STRONG><A NAME="item_pkg_svc">pkg_svc</A></STRONG><DD>
-<P>
-Returns all FS::pkg_svc objects (see <A HREF="../FS/pkg_svc.html">FS::pkg_svc</A>) for this package definition (with non-zero quantity).
-
-<DT><STRONG><A NAME="item_svcpart">svcpart [ SVCDB ]</A></STRONG><DD>
-<P>
-Returns the svcpart of a single service definition (see <A HREF="../FS/part_svc.html">FS::part_svc</A>) associated with this billing item definition (see <A HREF="../FS/pkg_svc.html">FS::pkg_svc</A>). Returns false if there not exactly one service definition with quantity
-1, or if SVCDB is specified and does not match the svcdb of the service
-definition, 
-
-</DL>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid billing item definition.  If
+there is an error, returns the error, otherwise returns false.  Called by the
+insert and replace methods.
+<P></P>
+<DT><STRONG><A NAME="item_pkg_svc">pkg_svc</A></STRONG><BR>
+<DD>
+Returns all FS::pkg_svc objects (see <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>) for this package
+definition (with non-zero quantity).
+<P></P>
+<DT><STRONG><A NAME="item_svcpart_%5B_SVCDB_%5D">svcpart [ SVCDB ]</A></STRONG><BR>
+<DD>
+Returns the svcpart of a single service definition (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>)
+associated with this billing item definition (see <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>).  Returns
+false if there not exactly one service definition with quantity 1, or if 
+SVCDB is specified and does not match the svcdb of the service definition,
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: part_pkg.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: part_pkg.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-The delete method is unimplemented.
-
-<P>
-setup and recur semantics are not yet defined (and are implemented in
-FS::cust_bill. hmm.).
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The delete method is unimplemented.</P>
+<P>setup and recur semantics are not yet defined (and are implemented in
+FS::cust_bill.  hmm.).</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>, <A HREF="../FS/type_pkgs.html">FS::type_pkgs</A>, <A HREF="../FS/pkg_svc.html">FS::pkg_svc</A>, <EM>Safe</EM>. schema.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF=".././FS/type_pkgs.html">the FS::type_pkgs manpage</A>, <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>, <EM>Safe</EM>.
+schema.html from the base documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/part_referral.html b/htdocs/docs/man/FS/part_referral.html
index a11d90348..61f49de04 100644
--- a/htdocs/docs/man/FS/part_referral.html
+++ b/htdocs/docs/man/FS/part_referral.html
@@ -1,112 +1,99 @@
 <HTML>
 <HEAD>
 <TITLE>FS::part_referral - Object methods for part_referral objects</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::part_referral - Object methods for part_referral objects
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::part_referral - Object methods for part_referral objects</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::part_referral;
-</PRE>
-<P>
-<PRE>  $record = new FS::part_referral \%hash
-  $record = new FS::part_referral { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::part_referral;</PRE>
+<PRE>
+  $record = new FS::part_referral \%hash
+  $record = new FS::part_referral { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::part_referral represents a referral - where a customer heard of your
-services. This can be used to track the effectiveness of a particular piece
-of advertising, for example. FS::part_referral inherits from FS::Record.
-The following fields are currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::part_referral represents a referral - where a customer heard of your
+services.  This can be used to track the effectiveness of a particular piece of
+advertising, for example.  FS::part_referral inherits from FS::Record.  The
+following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_refnum">refnum - primary key (assigned automatically for new referrals)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_referral">referral - Text name of this referral</A></STRONG><DD>
+<DT><STRONG><A NAME="item_key">refnum - primary key (assigned automatically for new referrals)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_referral_%2D_Text_name_of_this_referral">referral - Text name of this referral</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new referral. To add the referral to the database, see <A HREF="#insert">insert</A>.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this referral to the database. If there is an error, returns the
-error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new referral.  To add the referral to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this referral to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
 Currently unimplemented.
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replaces OLD_RECORD with this one in the database. If there is an error,
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid referral. If there is an
-error, returns the error, otherwise returns false. Called by the insert and
-replace methods.
-
-</DL>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid referral.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: part_referral.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: part_referral.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-The delete method is unimplemented.
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The delete method is unimplemented.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_main.html">FS::cust_main</A>, schema.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, schema.html from the base documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/part_svc.html b/htdocs/docs/man/FS/part_svc.html
index 95829d1d3..d5a521f5c 100644
--- a/htdocs/docs/man/FS/part_svc.html
+++ b/htdocs/docs/man/FS/part_svc.html
@@ -1,120 +1,109 @@
 <HTML>
 <HEAD>
 <TITLE>FS::part_svc - Object methods for part_svc objects</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::part_svc - Object methods for part_svc objects
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::part_svc - Object methods for part_svc objects</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::part_svc;
-</PRE>
-<P>
-<PRE>  $record = new FS::part_referral \%hash
-  $record = new FS::part_referral { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::part_svc;</PRE>
+<PRE>
+  $record = new FS::part_referral \%hash
+  $record = new FS::part_referral { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::part_svc represents a service definition. FS::part_svc inherits from
-FS::Record. The following fields are currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::part_svc represents a service definition.  FS::part_svc inherits from
+FS::Record.  The following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_svcpart">svcpart - primary key (assigned automatically for new service definitions)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_svc">svc - text name of this service definition</A></STRONG><DD>
-<DT><STRONG><A NAME="item_svcdb">svcdb - table used for this service.  See FS::svc_acct,
-FS::svc_domain, and FS::svc_acct_sm, among others.</A></STRONG><DD>
-<DT><STRONG><A NAME="item_svcdb_field">svcdb__field - Default or fixed value for field in svcdb.</A></STRONG><DD>
-<DT><STRONG><A NAME="item_svcdb_field_flag">svcdb__field_flag - defines svcdb__field action: null, `D' for default, or `F' for fixed</A></STRONG><DD>
+<DT><STRONG><A NAME="item_key">svcpart - primary key (assigned automatically for new service definitions)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_svc_%2D_text_name_of_this_service_definition">svc - text name of this service definition</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_svcdb_%2D_table_used_for_this_service%2E_See_FS%3A">svcdb - table used for this service.  See <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>,
+<A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, and <A HREF=".././FS/svc_acct_sm.html">the FS::svc_acct_sm manpage</A>, among others.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_svcdb__field_%2D_Default_or_fixed_value_for_field_"><EM>svcdb</EM>__<EM>field</EM> - Default or fixed value for <EM>field</EM> in <EM>svcdb</EM>.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_svcdb__field_flag_%2D_defines_svcdb__field_action%"><EM>svcdb</EM>__<EM>field</EM>_flag - defines <EM>svcdb</EM>__<EM>field</EM> action: null, `D' for default, or `F' for fixed</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new service definition. To add the service definition to the
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new service definition.  To add the service definition to the
 database, see <A HREF="#insert">insert</A>.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this service definition to the database. If there is an error, returns
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this service definition to the database.  If there is an error, returns
 the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
 Currently unimplemented.
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replaces OLD_RECORD with this one in the database. If there is an error,
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid service definition. If there
-is an error, returns the error, otherwise returns false. Called by the
-insert and replace methods.
-
-</DL>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid service definition.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: part_svc.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: part_svc.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-Delete is unimplemented.
-
-<P>
-The list of svc_* tables is hardcoded. When svc_acct_pop is renamed, this
-should be fixed.
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>Delete is unimplemented.</P>
+<P>The list of svc_* tables is hardcoded.  When svc_acct_pop is renamed, this
+should be fixed.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/part_pkg.html">FS::part_pkg</A>, <A HREF="../FS/pkg_svc.html">FS::pkg_svc</A>, <A HREF="../FS/cust_svc.html">FS::cust_svc</A>,
-<A HREF="../FS/svc_acct.html">FS::svc_acct</A>, <A HREF="../FS/svc_acct_sm.html">FS::svc_acct_sm</A>, <A HREF="../FS/svc_domain.html">FS::svc_domain</A>, schema.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
+<A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/svc_acct_sm.html">the FS::svc_acct_sm manpage</A>, <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, schema.html from the
+base documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/pkg_svc.html b/htdocs/docs/man/FS/pkg_svc.html
index 6c8af12c4..31592d4bd 100644
--- a/htdocs/docs/man/FS/pkg_svc.html
+++ b/htdocs/docs/man/FS/pkg_svc.html
@@ -1,124 +1,114 @@
 <HTML>
 <HEAD>
 <TITLE>FS::pkg_svc - Object methods for pkg_svc records</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::pkg_svc - Object methods for pkg_svc records
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::pkg_svc - Object methods for pkg_svc records</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::pkg_svc;
-</PRE>
-<P>
-<PRE>  $record = new FS::pkg_svc \%hash;
-  $record = new FS::pkg_svc { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
-<P>
-<PRE>  $part_pkg = $record-&gt;part_pkg;
-</PRE>
-<P>
-<PRE>  $part_svc = $record-&gt;part_svc;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::pkg_svc;</PRE>
+<PRE>
+  $record = new FS::pkg_svc \%hash;
+  $record = new FS::pkg_svc { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $part_pkg = $record-&gt;part_pkg;</PRE>
+<PRE>
+  $part_svc = $record-&gt;part_svc;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::pkg_svc record links a billing item definition (see <A HREF="../FS/part_pkg.html">FS::part_pkg</A>) to a service definition (see <A HREF="../FS/part_svc.html">FS::part_svc</A>). FS::pkg_svc inherits from FS::Record. The following fields are currently
-supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::pkg_svc record links a billing item definition (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>) to
+a service definition (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>).  FS::pkg_svc inherits from
+FS::Record.  The following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_pkgpart">pkgpart - Billing item definition (see FS::part_pkg)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_svcpart">svcpart - Service definition (see FS::part_svc)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_quantity">quantity - Quantity of this service definition that this billing item
-definition includes</A></STRONG><DD>
+<DT><STRONG><A NAME="item_definition">pkgpart - Billing item definition (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG>svcpart - Service definition (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>)</STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_quantity_%2D_Quantity_of_this_service_definition_t">quantity - Quantity of this service definition that this billing item
+definition includes</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Create a new record. To add the record to the database, see <A HREF="#insert">insert</A>.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this record to the database. If there is an error, returns the error,
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Create a new record.  To add the record to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
-Deletes this record from the database. If there is an error, returns the
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this record from the database.  If there is an error, returns the
 error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replaces OLD_RECORD with this one in the database. If there is an error,
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid record. If there is an
-error, returns the error, otherwise returns false. Called by the insert and
-replace methods.
-
-<DT><STRONG><A NAME="item_part_pkg">part_pkg</A></STRONG><DD>
-<P>
-Returns the FS::part_pkg object (see <A HREF="../FS/part_pkg.html">FS::part_pkg</A>).
-
-<DT><STRONG><A NAME="item_part_svc">part_svc</A></STRONG><DD>
-<P>
-Returns the FS::part_svc object (see <A HREF="../FS/part_svc.html">FS::part_svc</A>).
-
-</DL>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+<P></P>
+<DT><STRONG><A NAME="item_part_pkg">part_pkg</A></STRONG><BR>
+<DD>
+Returns the FS::part_pkg object (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_part_svc">part_svc</A></STRONG><BR>
+<DD>
+Returns the FS::part_svc object (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>).
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: pkg_svc.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: pkg_svc.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
+<H1><A NAME="bugs">BUGS</A></H1>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/part_pkg.html">FS::part_pkg</A>, <A HREF="../FS/part_svc.html">FS::part_svc</A>, schema.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, schema.html from the base
+documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/svc_Common.html b/htdocs/docs/man/FS/svc_Common.html
index 970385b9f..7ce9ff36a 100644
--- a/htdocs/docs/man/FS/svc_Common.html
+++ b/htdocs/docs/man/FS/svc_Common.html
@@ -1,108 +1,93 @@
 <HTML>
 <HEAD>
 <TITLE>FS::svc_Common - Object method for all svc_ records</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::svc_Common - Object method for all svc_ records
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::svc_Common - Object method for all svc_ records</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-use FS::svc_Common;
-
-<P>
-<CODE>@ISA</CODE> = <CODE>qw(</CODE> FS::svc_Common );
-
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<P>use FS::svc_Common;</P>
+<P>@ISA = qw( FS::svc_Common );</P>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-FS::svc_Common is intended as a base class for table-specific classes to
-inherit from, i.e. FS::svc_acct. FS::svc_Common inherits from FS::Record.
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>FS::svc_Common is intended as a base class for table-specific classes to
+inherit from, i.e. FS::svc_acct.  FS::svc_Common inherits from FS::Record.</P>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this record to the database. If there is an error, returns the error,
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
-
-<P>
-The additional fields pkgnum and svcpart (see <A HREF="../FS/cust_svc.html">FS::cust_svc</A>) should be defined. An FS::cust_svc record will be created and inserted.
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
-Deletes this account from the database. If there is an error, returns the
+<P>The additional fields pkgnum and svcpart (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
+defined.  An FS::cust_svc record will be created and inserted.</P>
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this account from the database.  If there is an error, returns the
 error, otherwise returns false.
-
-<P>
-The corresponding FS::cust_svc record will be deleted as well.
-
-<DT><STRONG><A NAME="item_setfixed">setfixed</A></STRONG><DD>
-<P>
-Sets any fixed fields for this service (see <A HREF="../FS/part_svc.html">FS::part_svc</A>). If there is an error, returns the error, otherwise returns the
-FS::part_svc object (use <CODE>ref()</CODE> to test the return). Usually
-called by the check method.
-
-<DT><STRONG><A NAME="item_setdefault">setdefault</A></STRONG><DD>
-<P>
-Sets all fields to their defaults (see <A HREF="../FS/part_svc.html">FS::part_svc</A>), overriding their current values. If there is an error, returns the
-error, otherwise returns the FS::part_svc object (use <CODE>ref()</CODE> to
-test the return).
-
-<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><DD>
-<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><DD>
-<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><DD>
-<P>
-Stubs - return false (no error) so derived classes don't need to define
-these methods. Called by the cancel method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
-
-</DL>
+<P>The corresponding FS::cust_svc record will be deleted as well.</P>
+<P></P>
+<DT><STRONG><A NAME="item_setfixed">setfixed</A></STRONG><BR>
+<DD>
+Sets any fixed fields for this service (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>).  If there is an
+error, returns the error, otherwise returns the FS::part_svc object (use <CODE>ref()</CODE>
+to test the return).  Usually called by the check method.
+<P></P>
+<DT><STRONG><A NAME="item_setdefault">setdefault</A></STRONG><BR>
+<DD>
+Sets all fields to their defaults (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>), overriding their
+current values.  If there is an error, returns the error, otherwise returns
+the FS::part_svc object (use <CODE>ref()</CODE> to test the return).
+<P></P>
+<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
+<DD>
+Stubs - return false (no error) so derived classes don't need to define these
+methods.  Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: svc_Common.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: svc_Common.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-The setfixed method return value.
-
-<P>
-The new method should set defaults from part_svc (like the check method
-sets fixed values)?
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The setfixed method return value.</P>
+<P>The new method should set defaults from part_svc (like the check method
+sets fixed values)?</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/cust_svc.html">FS::cust_svc</A>, <A HREF="../FS/part_svc.html">FS::part_svc</A>, <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>, schema.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, schema.html
+from the base documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/svc_acct.html b/htdocs/docs/man/FS/svc_acct.html
index 0f8e5b47c..524fe3324 100644
--- a/htdocs/docs/man/FS/svc_acct.html
+++ b/htdocs/docs/man/FS/svc_acct.html
@@ -1,209 +1,218 @@
 <HTML>
 <HEAD>
 <TITLE>FS::svc_acct - Object methods for svc_acct records</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::svc_acct - Object methods for svc_acct records
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::svc_acct - Object methods for svc_acct records</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::svc_acct;
-</PRE>
-<P>
-<PRE>  $record = new FS::svc_acct \%hash;
-  $record = new FS::svc_acct { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;suspend;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;unsuspend;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;cancel;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::svc_acct;</PRE>
+<PRE>
+  $record = new FS::svc_acct \%hash;
+  $record = new FS::svc_acct { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $error = $record-&gt;suspend;</PRE>
+<PRE>
+  $error = $record-&gt;unsuspend;</PRE>
+<PRE>
+  $error = $record-&gt;cancel;</PRE>
+<PRE>
+  %hash = $record-&gt;radius;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::svc_acct object represents an account. FS::svc_acct inherits from
-FS::svc_Common. The following fields are currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::svc_acct object represents an account.  FS::svc_acct inherits from
+FS::svc_Common.  The following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_svcnum">svcnum - primary key (assigned automatcially for new accounts)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_username">username</A></STRONG><DD>
-<DT><STRONG><A NAME="item__password">_password - generated if blank</A></STRONG><DD>
-<DT><STRONG><A NAME="item_popnum">popnum - Point of presence (see FS::svc_acct_pop)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_uid">uid</A></STRONG><DD>
-<DT><STRONG><A NAME="item_gid">gid</A></STRONG><DD>
-<DT><STRONG><A NAME="item_finger">finger - GECOS</A></STRONG><DD>
-<DT><STRONG><A NAME="item_dir">dir - set automatically if blank (and uid is not)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_shell">shell</A></STRONG><DD>
-<DT><STRONG><A NAME="item_quota">quota - (unimplementd)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_slipip">slipip - IP address</A></STRONG><DD>
-<DT><STRONG><A NAME="item_radius_Radius_Attribute">radius_Radius_Attribute - Radius-Attribute</A></STRONG><DD>
+<DT><STRONG><A NAME="item_key">svcnum - primary key (assigned automatcially for new accounts)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_username">username</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item__password_%2D_generated_if_blank">_password - generated if blank</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_presence">popnum - Point of presence (see <A HREF=".././FS/svc_acct_pop.html">the FS::svc_acct_pop manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_uid">uid</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_gid">gid</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_finger_%2D_GECOS">finger - GECOS</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_blank">dir - set automatically if blank (and uid is not)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_shell">shell</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_quota_%2D_%28unimplementd%29">quota - (unimplementd)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_slipip_%2D_IP_address">slipip - IP address</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_radius_Radius_Attribute_%2D_Radius%2DAttribute">radius_<EM>Radius_Attribute</EM> - <EM>Radius-Attribute</EM></A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new account. To add the account to the database, see <A HREF="#insert">insert</A>.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this account to the database. If there is an error, returns the error,
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new account.  To add the account to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this account to the database.  If there is an error, returns the error,
 otherwise returns false.
-
-<P>
-The additional fields pkgnum and svcpart (see <A HREF="../FS/cust_svc.html">FS::cust_svc</A>) should be defined. An FS::cust_svc record will be created and inserted.
-
-<P>
-If the configuration value (see <A HREF="../FS/Conf.html">FS::Conf</A>) shellmachine exists, and the username, uid, and dir fields are defined,
-the command
-
-<P>
-<PRE>  useradd -d $dir -m -s $shell -u $uid $username
-</PRE>
-<P>
-is executed on shellmachine via ssh. This behaviour can be surpressed by
-setting $FS::svc_acct::nossh_hack true.
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
-Deletes this account from the database. If there is an error, returns the
+<P>The additional fields pkgnum and svcpart (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
+defined.  An FS::cust_svc record will be created and inserted.</P>
+<P>If the configuration value (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine exists, and the 
+username, uid, and dir fields are defined, the <CODE>command(s)</CODE> specified in
+the shellmachine-useradd configuration are exectued on shellmachine via ssh.
+This behaviour can be surpressed by setting $FS::svc_acct::nossh_hack true.
+If the shellmachine-useradd configuration file does not exist,</P>
+<PRE>
+  useradd -d $dir -m -s $shell -u $uid $username</PRE>
+<P>is the default.  If the shellmachine-useradd configuration file exists but
+it empty,</P>
+<PRE>
+  cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</PRE>
+<P>is the default instead.  Otherwise the contents of the file are treated as
+a double-quoted perl string, with the following variables available:
+$username, $uid, $gid, $dir, and $shell.</P>
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this account from the database.  If there is an error, returns the
 error, otherwise returns false.
-
-<P>
-The corresponding FS::cust_svc record will be deleted as well.
-
-<P>
-If the configuration value (see <A HREF="../FS/Conf.html">FS::Conf</A>) shellmachine exists, the command:
-
-<P>
-<PRE>  userdel $username
-</PRE>
-<P>
-is executed on shellmachine via ssh. This behaviour can be surpressed by
-setting $FS::svc_acct::nossh_hack true.
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replaces OLD_RECORD with this one in the database. If there is an error,
+<P>The corresponding FS::cust_svc record will be deleted as well.</P>
+<P>If the configuration value (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine exists, the
+<CODE>command(s)</CODE> specified in the shellmachine-userdel configuration file are
+executed on shellmachine via ssh.  This behavior can be surpressed by setting
+$FS::svc_acct::nossh_hack true.  If the shellmachine-userdel configuration
+file does not exist,</P>
+<PRE>
+  userdel $username</PRE>
+<P>is the default.  If the shellmachine-userdel configuration file exists but
+is empty,</P>
+<PRE>
+  rm -rf $dir</PRE>
+<P>is the default instead.  Otherwise the contents of the file are treated as a
+double-quoted perl string, with the following variables available:
+$username and $dir.</P>
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
-
-<P>
-If the configuration value (see <A HREF="../FS/Conf.html">FS::Conf</A>) shellmachine exists, and the dir field has changed, the command:
-
-<P>
-<PRE>  [ -d $old_dir ] &amp;&amp; (
+<P>If the configuration value (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine exists, and the 
+dir field has changed, the <CODE>command(s)</CODE> specified in the shellmachine-usermod
+configuraiton file are executed on shellmachine via ssh.  This behavior can
+be surpressed by setting $FS::svc-acct::nossh_hack true.  If the
+shellmachine-userdel configuration file does not exist or is empty, :</P>
+<PRE>
+  [ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || (
     chmod u+t $old_dir;
-    umask 022;
     mkdir $new_dir;
     cd $old_dir;
     find . -depth -print | cpio -pdm $new_dir;
     chmod u-t $new_dir;
     chown -R $uid.$gid $new_dir;
     rm -rf $old_dir
-  )
-</PRE>
-<P>
-is executed on shellmachine via ssh. This behaviour can be surpressed by
-setting $FS::svc_acct::nossh_hack true.
-
-<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><DD>
-<P>
-Suspends this account by prefixing *SUSPENDED* to the password. If there is
+  )</PRE>
+<P>is executed on shellmachine via ssh.  This behaviour can be surpressed by
+setting $FS::svc_acct::nossh_hack true.</P>
+<P></P>
+<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
+<DD>
+Suspends this account by prefixing *SUSPENDED* to the password.  If there is an
+error, returns the error, otherwise returns false.
+<P>Called by the suspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
+<DD>
+Unsuspends this account by removing *SUSPENDED* from the password.  If there is
 an error, returns the error, otherwise returns false.
-
-<P>
-Called by the suspend method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
-
-<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><DD>
-<P>
-Unsuspends this account by removing *SUSPENDED* from the password. If there
-is an error, returns the error, otherwise returns false.
-
-<P>
-Called by the unsuspend method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
-
-<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><DD>
-<P>
+<P>Called by the unsuspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
+<DD>
 Just returns false (no error) for now.
-
-<P>
-Called by the cancel method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid service. If there is an
-error, returns the error, otherwise returns false. Called by the insert and
-replace methods.
-
-<P>
-Sets any fixed values; see <A HREF="../FS/part_svc.html">FS::part_svc</A>.
-
-</DL>
+<P>Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid service.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+<P>Sets any fixed values; see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>.</P>
+<P></P>
+<DT><STRONG><A NAME="item_radius">radius</A></STRONG><BR>
+<DD>
+Depriciated, use radius_reply instead.
+<P></P>
+<DT><STRONG><A NAME="item_radius_reply">radius_reply</A></STRONG><BR>
+<DD>
+Returns key/value pairs, suitable for assigning to a hash, for any RADIUS
+reply attributes of this record.
+<P>Note that this is now the preferred method for reading RADIUS attributes - 
+accessing the columns directly is discouraged, as the column names are
+expected to change in the future.</P>
+<P></P>
+<DT><STRONG><A NAME="item_radius_check">radius_check</A></STRONG><BR>
+<DD>
+Returns key/value pairs, suitable for assigning to a hash, for any RADIUS
+check attributes of this record.
+<P>Accessing RADIUS attributes directly is not supported and will break in the
+future.</P>
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: svc_acct.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: svc_acct.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-The remote commands should be configurable.
-
-<P>
-The bits which ssh should fork before doing so.
-
-<P>
-The <CODE>$recref</CODE> stuff in sub check should be cleaned up.
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The bits which ssh should fork before doing so (or maybe queue jobs for a
+daemon).</P>
+<P>The $recref stuff in sub check should be cleaned up.</P>
+<P>The suspend, unsuspend and cancel methods update the database, but not the
+current object.  This is probably a bug as it's unexpected and
+counterintuitive.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/svc_Common.html">FS::svc_Common</A>, <A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/Conf.html">FS::Conf</A>, <A HREF="../FS/cust_svc.html">FS::cust_svc</A>,
-<A HREF="../FS/part_svc.html">FS::part_svc</A>, <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>, <A HREF="../FS/SSH.html">FS::SSH</A>, <EM>ssh</EM>, <A HREF="../FS/svc_acct_pop.html">FS::svc_acct_pop</A>, schema.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/svc_Common.html">the FS::svc_Common manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
+<A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF="../Net/SSH.html">the Net::SSH manpage</A>, <EM>ssh</EM>, <A HREF=".././FS/svc_acct_pop.html">the FS::svc_acct_pop manpage</A>,
+schema.html from the base documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/svc_acct_pop.html b/htdocs/docs/man/FS/svc_acct_pop.html
index c94f8cd88..e8c6f35d5 100644
--- a/htdocs/docs/man/FS/svc_acct_pop.html
+++ b/htdocs/docs/man/FS/svc_acct_pop.html
@@ -1,115 +1,106 @@
 <HTML>
 <HEAD>
 <TITLE>FS::svc_acct_pop - Object methods for svc_acct_pop records</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::svc_acct_pop - Object methods for svc_acct_pop records
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::svc_acct_pop - Object methods for svc_acct_pop records</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::svc_acct_pop;
-</PRE>
-<P>
-<PRE>  $record = new FS::svc_acct_pop \%hash;
-  $record = new FS::svc_acct_pop { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::svc_acct_pop;</PRE>
+<PRE>
+  $record = new FS::svc_acct_pop \%hash;
+  $record = new FS::svc_acct_pop { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::svc_acct object represents an point of presence. FS::svc_acct_pop
-inherits from FS::Record. The following fields are currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::svc_acct object represents an point of presence.  FS::svc_acct_pop
+inherits from FS::Record.  The following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_popnum">popnum - primary key (assigned automatically for new accounts)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_city">city</A></STRONG><DD>
-<DT><STRONG><A NAME="item_state">state</A></STRONG><DD>
-<DT><STRONG><A NAME="item_ac">ac - area code</A></STRONG><DD>
-<DT><STRONG><A NAME="item_exch">exch - exchange</A></STRONG><DD>
-<DT><STRONG><A NAME="item_loc">loc - rest of number</A></STRONG><DD>
+<DT><STRONG><A NAME="item_key">popnum - primary key (assigned automatically for new accounts)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_city">city</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_state">state</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_ac_%2D_area_code">ac - area code</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_exch_%2D_exchange">exch - exchange</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_loc_%2D_rest_of_number">loc - rest of number</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new point of presence (if only it were that easy!). To add the
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new point of presence (if only it were that easy!).  To add the 
 point of presence to the database, see <A HREF="#insert">insert</A>.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this point of presence to the database. If there is an error, returns
-the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this point of presence to the database.  If there is an error, returns the
+error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
 Removes this point of presence from the database.
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replaces OLD_RECORD with this one in the database. If there is an error,
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid point of presence. If there
-is an error, returns the error, otherwise returns false. Called by the
-insert and replace methods.
-
-</DL>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid point of presence.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: svc_acct_pop.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: svc_acct_pop.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-It should be renamed to part_pop.
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>It should be renamed to part_pop.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF=".././FS/svc_acct.html#">the svc_acct manpage</A>, schema.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/svc_acct.html">the svc_acct manpage</A>, schema.html from the base documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/svc_acct_sm.html b/htdocs/docs/man/FS/svc_acct_sm.html
index d283427e5..1f513536d 100644
--- a/htdocs/docs/man/FS/svc_acct_sm.html
+++ b/htdocs/docs/man/FS/svc_acct_sm.html
@@ -1,171 +1,140 @@
 <HTML>
 <HEAD>
 <TITLE>FS::svc_acct_sm - Object methods for svc_acct_sm records</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::svc_acct_sm - Object methods for svc_acct_sm records
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::svc_acct_sm - Object methods for svc_acct_sm records</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::svc_acct_sm;
-</PRE>
-<P>
-<PRE>  $record = new FS::svc_acct_sm \%hash;
-  $record = new FS::svc_acct_sm { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;suspend;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;unsuspend;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;cancel;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::svc_acct_sm;</PRE>
+<PRE>
+  $record = new FS::svc_acct_sm \%hash;
+  $record = new FS::svc_acct_sm { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $error = $record-&gt;suspend;</PRE>
+<PRE>
+  $error = $record-&gt;unsuspend;</PRE>
+<PRE>
+  $error = $record-&gt;cancel;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::svc_acct object represents a virtual mail alias. FS::svc_acct
-inherits from FS::Record. The following fields are currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::svc_acct object represents a virtual mail alias.  FS::svc_acct inherits
+from FS::Record.  The following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_svcnum">svcnum - primary key (assigned automatcially for new accounts)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_domsvc">domsvc - svcnum of the virtual domain (see FS::svc_domain)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_domuid">domuid - uid of the target account (see FS::svc_acct)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_domuser">domuser - virtual username</A></STRONG><DD>
+<DT><STRONG><A NAME="item_key">svcnum - primary key (assigned automatcially for new accounts)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_domain">domsvc - svcnum of the virtual domain (see <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_account">domuid - uid of the target account (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_domuser_%2D_virtual_username">domuser - virtual username</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new virtual mail alias. To add the virtual mail alias to the
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new virtual mail alias.  To add the virtual mail alias to the
 database, see <A HREF="#insert">insert</A>.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this virtual mail alias to the database. If there is an error, returns
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this virtual mail alias to the database.  If there is an error, returns
 the error, otherwise returns false.
-
-<P>
-The additional fields pkgnum and svcpart (see <A HREF="../FS/cust_svc.html">FS::cust_svc</A>) should be defined. An FS::cust_svc record will be created and inserted.
-
-<P>
-If the configuration values (see <A HREF="../FS/Conf.html">FS::Conf</A>) shellmachine and qmailmachines exist, and domuser is `*' (meaning a
-catch-all mailbox), the command:
-
-<P>
-<PRE>  [ -e $dir/.qmail-$qdomain-default ] || {
+<P>The additional fields pkgnum and svcpart (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
+defined.  An FS::cust_svc record will be created and inserted.</P>
+<P>If the configuration values (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine and qmailmachines
+exist, and domuser is `*' (meaning a catch-all mailbox), the command:</P>
+<PRE>
+  [ -e $dir/.qmail-$qdomain-default ] || {
     touch $dir/.qmail-$qdomain-default;
     chown $uid:$gid $dir/.qmail-$qdomain-default;
-  }
-</PRE>
-<P>
-is executed on shellmachine via ssh (see <EM>dot-qmail</EM>). This behaviour can be surpressed by setting $FS::svc_acct_sm::nossh_hack
-true.
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
-Deletes this virtual mail alias from the database. If there is an error,
+  }</PRE>
+<P>is executed on shellmachine via ssh (see <EM>dot-qmail/``EXTENSION ADDRESSES''</EM>).
+This behaviour can be surpressed by setting $FS::svc_acct_sm::nossh_hack true.</P>
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this virtual mail alias from the database.  If there is an error,
 returns the error, otherwise returns false.
-
-<P>
-The corresponding FS::cust_svc record will be deleted as well.
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replaces OLD_RECORD with this one in the database. If there is an error,
+<P>The corresponding FS::cust_svc record will be deleted as well.</P>
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
+<DD>
 Just returns false (no error) for now.
-
-<P>
-Called by the suspend method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
-
-<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><DD>
-<P>
+<P>Called by the suspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
+<DD>
 Just returns false (no error) for now.
-
-<P>
-Called by the unsuspend method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
-
-<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><DD>
-<P>
+<P>Called by the unsuspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
+<DD>
 Just returns false (no error) for now.
-
-<P>
-Called by the cancel method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid virtual mail alias. If there
-is an error, returns the error, otherwise returns false. Called by the
-insert and replace methods.
-
-<P>
-Sets any fixed values; see <A HREF="../FS/part_svc.html">FS::part_svc</A>.
-
-</DL>
+<P>Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid virtual mail alias.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert and
+replace methods.
+<P>Sets any fixed values; see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>.</P>
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: svc_acct_sm.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: svc_acct_sm.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-The remote commands should be configurable.
-
-<P>
-The <CODE>$recref</CODE> stuff in sub check should be cleaned up.
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The remote commands should be configurable.</P>
+<P>The $recref stuff in sub check should be cleaned up.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/Conf.html">FS::Conf</A>, <A HREF="../FS/cust_svc.html">FS::cust_svc</A>, <A HREF="../FS/part_svc.html">FS::part_svc</A>, <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>,
-<A HREF="../FS/svc_acct.html">FS::svc_acct</A>, <A HREF="../FS/svc_domain.html">FS::svc_domain</A>, <A HREF="../FS/SSH.html">FS::SSH</A>, <EM>ssh</EM>, <EM>dot-qmail</EM>, schema.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>,
+<A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, <A HREF="../Net/SSH.html">the Net::SSH manpage</A>, <EM>ssh</EM>, <EM>dot-qmail</EM>,
+schema.html from the base documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/svc_domain.html b/htdocs/docs/man/FS/svc_domain.html
index bfe58c90b..5c75ab221 100644
--- a/htdocs/docs/man/FS/svc_domain.html
+++ b/htdocs/docs/man/FS/svc_domain.html
@@ -1,209 +1,161 @@
 <HTML>
 <HEAD>
 <TITLE>FS::svc_domain - Object methods for svc_domain records</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::svc_domain - Object methods for svc_domain records
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::svc_domain - Object methods for svc_domain records</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::svc_domain;
-</PRE>
-<P>
-<PRE>  $record = new FS::svc_domain \%hash;
-  $record = new FS::svc_domain { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;suspend;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;unsuspend;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;cancel;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::svc_domain;</PRE>
+<PRE>
+  $record = new FS::svc_domain \%hash;
+  $record = new FS::svc_domain { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $error = $record-&gt;suspend;</PRE>
+<PRE>
+  $error = $record-&gt;unsuspend;</PRE>
+<PRE>
+  $error = $record-&gt;cancel;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::svc_domain object represents a domain. FS::svc_domain inherits from
-FS::svc_Common. The following fields are currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::svc_domain object represents a domain.  FS::svc_domain inherits from
+FS::svc_Common.  The following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_svcnum">svcnum - primary key (assigned automatically for new accounts)</A></STRONG><DD>
-<DT><STRONG><A NAME="item_domain">domain</A></STRONG><DD>
+<DT><STRONG><A NAME="item_key">svcnum - primary key (assigned automatically for new accounts)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_domain">domain</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Creates a new domain. To add the domain to the database, see <A HREF="#insert">insert</A>.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this domain to the database. If there is an error, returns the error,
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new domain.  To add the domain to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this domain to the database.  If there is an error, returns the error,
 otherwise returns false.
-
-<P>
-The additional fields <EM>pkgnum</EM> and <EM>svcpart</EM> (see <A HREF="../FS/cust_svc.html">FS::cust_svc</A>) should be defined. An FS::cust_svc record will be created and inserted.
-
-<P>
-The additional field <EM>action</EM> should be set to <EM>N</EM> for new domains or <EM>M</EM>
-for transfers.
-
-<P>
-A registration or transfer email will be submitted unless
-$FS::svc_domain::whois_hack is true.
-
-<P>
-The additional field <EM>email</EM> can be used to manually set the admin contact email address on this email.
-Otherwise, the svc_acct records for this package (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>) are searched. If there is exactly one svc_acct record in the same
-package, it is automatically used. Otherwise an error is returned.
-
-<P>
-If any <EM>soamachine</EM> configuration file exists, an SOA record is added to the domain_record
-table (see &lt;FS::domain_record&gt;).
-
-<P>
-If any machines are defined in the <EM>nsmachines</EM> configuration file, NS records are added to the domain_record table (see <A HREF="../FS/domain_record.html">FS::domain_record</A>).
-
-<P>
-If any machines are defined in the <EM>mxmachines</EM> configuration file, MX records are added to the domain_record table (see <A HREF="../FS/domain_record.html">FS::domain_record</A>).
-
-<P>
-Any problems adding FS::domain_record records will emit warnings, but will
-not return errors from this method. If your configuration files are correct
-you shouln't have any problems.
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
-Deletes this domain from the database. If there is an error, returns the
+<P>The additional fields <EM>pkgnum</EM> and <EM>svcpart</EM> (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
+defined.  An FS::cust_svc record will be created and inserted.</P>
+<P>The additional field <EM>action</EM> should be set to <EM>N</EM> for new domains or <EM>M</EM>
+for transfers.</P>
+<P>A registration or transfer email will be submitted unless
+$FS::svc_domain::whois_hack is true.</P>
+<P>The additional field <EM>email</EM> can be used to manually set the admin contact
+email address on this email.  Otherwise, the svc_acct records for this package 
+(see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) are searched.  If there is exactly one svc_acct record
+in the same package, it is automatically used.  Otherwise an error is returned.</P>
+<P>If any <EM>soamachine</EM> configuration file exists, an SOA record is added to
+the domain_record table (see &lt;FS::domain_record&gt;).</P>
+<P>If any machines are defined in the <EM>nsmachines</EM> configuration file, NS
+records are added to the domain_record table (see <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>).</P>
+<P>If any machines are defined in the <EM>mxmachines</EM> configuration file, MX
+records are added to the domain_record table (see <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>).</P>
+<P>Any problems adding FS::domain_record records will emit warnings, but will
+not return errors from this method.  If your configuration files are correct
+you shouln't have any problems.</P>
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this domain from the database.  If there is an error, returns the
 error, otherwise returns false.
-
-<P>
-The corresponding FS::cust_svc record will be deleted as well.
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replaces OLD_RECORD with this one in the database. If there is an error,
+<P>The corresponding FS::cust_svc record will be deleted as well.</P>
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
+<DD>
 Just returns false (no error) for now.
-
-<P>
-Called by the suspend method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
-
-<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><DD>
-<P>
+<P>Called by the suspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
+<DD>
 Just returns false (no error) for now.
-
-<P>
-Called by the unsuspend method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
-
-<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><DD>
-<P>
+<P>Called by the unsuspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
+<DD>
 Just returns false (no error) for now.
-
-<P>
-Called by the cancel method of FS::cust_pkg (see <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>).
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid domain. If there is an
-error, returns the error, otherwise returns false. Called by the insert and
-replace methods.
-
-<P>
-Sets any fixed values; see <A HREF="../FS/part_svc.html">FS::part_svc</A>.
-
-<DT><STRONG><A NAME="item_whois">whois</A></STRONG><DD>
-<P>
-Returns the Net::Whois::Domain object (see <A HREF="../Net/Whois.html">Net::Whois</A>) for this domain, or undef if the domain is not found in whois.
-
-<P>
-(If $FS::svc_domain::whois_hack is true, returns that in all cases
-instead.)
-
-<DT><STRONG><A NAME="item__whois">_whois</A></STRONG><DD>
-<P>
+<P>Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid domain.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+<P>Sets any fixed values; see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>.</P>
+<P></P>
+<DT><STRONG><A NAME="item_whois">whois</A></STRONG><BR>
+<DD>
+Returns the Net::Whois::Domain object (see <A HREF="../Net/Whois.html">the Net::Whois manpage</A>) for this domain, or
+undef if the domain is not found in whois.
+<P>(If $FS::svc_domain::whois_hack is true, returns that in all cases instead.)</P>
+<P></P>
+<DT><STRONG><A NAME="item__whois">_whois</A></STRONG><BR>
+<DD>
 Depriciated.
-
-<DT><STRONG><A NAME="item_submit_internic">submit_internic</A></STRONG><DD>
-<P>
+<P></P>
+<DT><STRONG><A NAME="item_submit_internic">submit_internic</A></STRONG><BR>
+<DD>
 Submits a registration email for this domain.
-
-</DL>
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: svc_domain.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: svc_domain.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-All BIND/DNS fields should be included (and exported).
-
-<P>
-Delete doesn't send a registration template.
-
-<P>
-All registries should be supported.
-
-<P>
-Should change action to a real field.
-
-<P>
-The <CODE>$recref</CODE> stuff in sub check should be cleaned up.
-
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>All BIND/DNS fields should be included (and exported).</P>
+<P>Delete doesn't send a registration template.</P>
+<P>All registries should be supported.</P>
+<P>Should change action to a real field.</P>
+<P>The $recref stuff in sub check should be cleaned up.</P>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/svc_Common.html">FS::svc_Common</A>, <A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/Conf.html">FS::Conf</A>, <A HREF="../FS/cust_svc.html">FS::cust_svc</A>,
-<A HREF="../FS/part_svc.html">FS::part_svc</A>, <A HREF="../FS/cust_pkg.html">FS::cust_pkg</A>, <A HREF="../FS/SSH.html">FS::SSH</A>, <A HREF="../Net/Whois.html">Net::Whois</A>, <EM>ssh</EM>,
-<EM>dot-qmail</EM>, schema.html from the base documentation, config.html from the base
-documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/svc_Common.html">the FS::svc_Common manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
+<A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF="../Net/Whois.html">the Net::Whois manpage</A>, <EM>ssh</EM>,
+<EM>dot-qmail</EM>, schema.html from the base documentation, config.html from the
+base documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/man/FS/type_pkgs.html b/htdocs/docs/man/FS/type_pkgs.html
index 65fa8c0a7..30b052b81 100644
--- a/htdocs/docs/man/FS/type_pkgs.html
+++ b/htdocs/docs/man/FS/type_pkgs.html
@@ -1,108 +1,99 @@
 <HTML>
 <HEAD>
 <TITLE>FS::type_pkgs - Object methods for type_pkgs records</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::type_pkgs - Object methods for type_pkgs records
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::type_pkgs - Object methods for type_pkgs records</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::type_pkgs;
-</PRE>
-<P>
-<PRE>  $record = new FS::type_pkgs \%hash;
-  $record = new FS::type_pkgs { 'column' =&gt; 'value' };
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;insert;
-</PRE>
-<P>
-<PRE>  $error = $new_record-&gt;replace($old_record);
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;delete;
-</PRE>
-<P>
-<PRE>  $error = $record-&gt;check;
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::type_pkgs;</PRE>
+<PRE>
+  $record = new FS::type_pkgs \%hash;
+  $record = new FS::type_pkgs { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-An FS::type_pkgs record links an agent type (see <A HREF="../FS/agent_type.html">FS::agent_type</A>) to a billing item definition (see <A HREF="../FS/part_pkg.html">FS::part_pkg</A>). FS::type_pkgs inherits from FS::Record. The following fields are
-currently supported:
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::type_pkgs record links an agent type (see <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A>) to a
+billing item definition (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>).  FS::type_pkgs inherits from
+FS::Record.  The following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_typenum">typenum - Agent type, see FS::agent_type</A></STRONG><DD>
-<DT><STRONG><A NAME="item_pkgpart">pkgpart - Billing item definition, see FS::part_pkg</A></STRONG><DD>
+<DT><STRONG><A NAME="item_typenum_%2D_Agent_type%2C_see_FS%3A%3Aagent_type">typenum - Agent type, see <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A></A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_pkgpart_%2D_Billing_item_definition%2C_see_FS%3A%3">pkgpart - Billing item definition, see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A></A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
+<H1><A NAME="methods">METHODS</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><DD>
-<P>
-Create a new record. To add the record to the database, see <A HREF="#insert">insert</A>.
-
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><DD>
-<P>
-Adds this record to the database. If there is an error, returns the error,
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Create a new record.  To add the record to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
-
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><DD>
-<P>
-Deletes this record from the database. If there is an error, returns the
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this record from the database.  If there is an error, returns the
 error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_replace">replace OLD_RECORD</A></STRONG><DD>
-<P>
-Replaces OLD_RECORD with this one in the database. If there is an error,
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
-
-<DT><STRONG><A NAME="item_check">check</A></STRONG><DD>
-<P>
-Checks all fields to make sure this is a valid record. If there is an
-error, returns the error, otherwise returns false. Called by the insert and
-replace methods.
-
-</DL>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: type_pkgs.html,v 1.2 2000-03-03 18:22:44 ivan Exp $
-
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: type_pkgs.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
 <P>
 <HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
+<H1><A NAME="bugs">BUGS</A></H1>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/Record.html">FS::Record</A>, <A HREF="../FS/agent_type.html">FS::agent_type</A>, <A HREF="../FS/part_pkgs.html">FS::part_pkgs</A>, schema.html from the base documentation.
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A>, <A HREF="../FS/part_pkgs.html">the FS::part_pkgs manpage</A>, schema.html from the base
+documentation.</P>
 
 </BODY>
 
diff --git a/htdocs/docs/schema.html b/htdocs/docs/schema.html
index 95929ead8..c06373b6b 100644
--- a/htdocs/docs/schema.html
+++ b/htdocs/docs/schema.html
@@ -250,10 +250,11 @@
         <li>recdata - data for this record
       </ul>
     <li><a name="svc_www">svc_www</a>
+      <ul>
        <li>svcnum - <a href="#cust-svc">primary key</a>
        <li>recnum - <a href="#domain_record">host</a>
        <li>usersvc - <a href="#svc_acct">account</a>
-     </ul>
+      </ul>
     <li><a name="type_pkgs">type_pkgs</a>
       <ul>
         <li>typenum - <a href="#agent_type">agent type</a>
-- 
cgit v1.2.1


From 35227000d6222f35ec49bc4226e94200b77abc4f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Apr 2001 12:41:57 +0000
Subject: new API documentation

---
 htdocs/docs/man/FS/CGIwrapper.html    |  16 ++++
 htdocs/docs/man/FS/SignupClient.html  | 125 ++++++++++++++++++++++++++++
 htdocs/docs/man/FS/domain_record.html | 122 +++++++++++++++++++++++++++
 htdocs/docs/man/FS/nas.html           | 117 ++++++++++++++++++++++++++
 htdocs/docs/man/FS/port.html          | 120 +++++++++++++++++++++++++++
 htdocs/docs/man/FS/prepay_credit.html | 118 ++++++++++++++++++++++++++
 htdocs/docs/man/FS/session.html       | 129 +++++++++++++++++++++++++++++
 htdocs/docs/man/FS/svc_www.html       | 150 ++++++++++++++++++++++++++++++++++
 8 files changed, 897 insertions(+)
 create mode 100644 htdocs/docs/man/FS/CGIwrapper.html
 create mode 100644 htdocs/docs/man/FS/SignupClient.html
 create mode 100644 htdocs/docs/man/FS/domain_record.html
 create mode 100644 htdocs/docs/man/FS/nas.html
 create mode 100644 htdocs/docs/man/FS/port.html
 create mode 100644 htdocs/docs/man/FS/prepay_credit.html
 create mode 100644 htdocs/docs/man/FS/session.html
 create mode 100644 htdocs/docs/man/FS/svc_www.html

diff --git a/htdocs/docs/man/FS/CGIwrapper.html b/htdocs/docs/man/FS/CGIwrapper.html
new file mode 100644
index 000000000..bab5e7f37
--- /dev/null
+++ b/htdocs/docs/man/FS/CGIwrapper.html
@@ -0,0 +1,16 @@
+<HTML>
+<HEAD>
+<TITLE>./FS/FS/CGIwrapper.pm</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+<!-- INDEX END -->
+
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/SignupClient.html b/htdocs/docs/man/FS/SignupClient.html
new file mode 100644
index 000000000..0c621edcb
--- /dev/null
+++ b/htdocs/docs/man/FS/SignupClient.html
@@ -0,0 +1,125 @@
+<HTML>
+<HEAD>
+<TITLE>FS::SignupClient - Freeside signup client API</TITLE>
+<LINK REV="made" HREF="mailto:none">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#SUBROUTINES">SUBROUTINES</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::SignupClient - Freeside signup client API
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::SignupClient qw( signup_info new_customer );
+</PRE>
+<P>
+<PRE>  ( $locales, $packages, $pops ) = signup_info;
+</PRE>
+<P>
+<PRE>  $error = new_customer ( {
+    'first'          =&gt; $first,
+    'last'           =&gt; $last,
+    'ss'             =&gt; $ss,
+    'comapny'        =&gt; $company,
+    'address1'       =&gt; $address1,
+    'address2'       =&gt; $address2,
+    'city'           =&gt; $city,
+    'county'         =&gt; $county,
+    'state'          =&gt; $state,
+    'zip'            =&gt; $zip,
+    'country'        =&gt; $country,
+    'daytime'        =&gt; $daytime,
+    'night'          =&gt; $night,
+    'fax'            =&gt; $fax,
+    'payby'          =&gt; $payby,
+    'payinfo'        =&gt; $payinfo,
+    'paydate'        =&gt; $paydate,
+    'payname'        =&gt; $payname,
+    'invoicing_list' =&gt; $invoicing_list,
+    'pkgpart'        =&gt; $pkgpart,
+    'username'       =&gt; $username,
+    '_password'       =&gt; $password,
+    'popnum'         =&gt; $popnum,
+  } );
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+This module provides an API for a remote signup server.
+
+<P>
+It needs to be run as the freeside user. Because of this, the program which
+calls these subroutines should be written very carefully.
+
+<P>
+<HR>
+<H1><A NAME="SUBROUTINES">SUBROUTINES</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_signup_info">signup_info</A></STRONG><DD>
+<P>
+Returns three array references of hash references.
+
+<P>
+The first set of hash references is of allowable locales. Each hash
+reference has the following keys: taxnum state county country
+
+<P>
+The second set of hash references is of allowable packages. Each hash
+reference has the following keys: pkgpart pkg
+
+<P>
+The third set of hash references is of allowable POPs (Points Of Presence).
+Each hash reference has the following keys: popnum city state ac exch
+
+<DT><STRONG><A NAME="item_new_customer">new_customer HASHREF</A></STRONG><DD>
+<P>
+Adds a customer to the remote Freeside system. Requires a hash reference as
+a paramater with the following keys: first last ss comapny address1
+address2 city county state zip country daytime night fax payby payinfo
+paydate payname invoicing_list pkgpart username _password popnum
+
+<P>
+Returns a scalar error message, or the empty string for success.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: SignupClient.html,v 1.1 2001-04-23 12:41:57 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<EM>fs_signupd</EM>, <A HREF="./htdocs/docs/man/FS/SignupServer.html">FS::SignupServer</A>, <A HREF="./htdocs/docs/man/FS/cust_main.html">FS::cust_main</A>
+
+
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/domain_record.html b/htdocs/docs/man/FS/domain_record.html
new file mode 100644
index 000000000..78601b4d0
--- /dev/null
+++ b/htdocs/docs/man/FS/domain_record.html
@@ -0,0 +1,122 @@
+<HTML>
+<HEAD>
+<TITLE>FS::domain_record - Object methods for domain_record records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+	<LI><A HREF="#history">HISTORY</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::domain_record - Object methods for domain_record records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::domain_record;</PRE>
+<PRE>
+  $record = new FS::domain_record \%hash;
+  $record = new FS::domain_record { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::domain_record object represents an entry in a DNS zone.
+FS::domain_record inherits from FS::Record.  The following fields are currently
+supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_recnum_%2D_primary_key">recnum - primary key</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_Domain">svcnum - Domain (see <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>) of this entry</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_partial">reczone - partial (or full) zone for this entry</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_recaf_%2D_address_family_for_this_entry%2C_current">recaf - address family for this entry, currently only `IN' is recognized.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_entry">rectype - record type for this entry (A, MX, etc.)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_recdata_%2D_data_for_this_entry">recdata - data for this entry</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new entry.  To add the example to the database, see <A HREF="#insert">insert</A>.
+<P>Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Delete this record from the database.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: domain_record.html,v 1.1 2001-04-23 12:41:57 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The data validation doesn't check everything it could.  In particular,
+there is no protection against bad data that passes the regex, duplicate
+SOA records, forgetting the trailing `.', impossible IP addersses, etc.  Of
+course, it's still better than editing the zone files directly.  :)</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
+<P>
+<HR>
+<H1><A NAME="history">HISTORY</A></H1>
+<P>$Log: domain_record.html,v $
+<P>Revision 1.1  2001-04-23 12:41:57  ivan
+<P>new API documentation
+<P>
+Revision 1.1  2000/02/03 05:16:52  ivan
+beginning of DNS and Apache support</P>
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/nas.html b/htdocs/docs/man/FS/nas.html
new file mode 100644
index 000000000..db704c777
--- /dev/null
+++ b/htdocs/docs/man/FS/nas.html
@@ -0,0 +1,117 @@
+<HTML>
+<HEAD>
+<TITLE>FS::nas - Object methods for nas records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::nas - Object methods for nas records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::nas;</PRE>
+<PRE>
+  $record = new FS::nas \%hash;
+  $record = new FS::nas {
+    'nasnum'  =&gt; 1,
+    'nasip'   =&gt; '10.4.20.23',
+    'nasfqdn' =&gt; 'box1.brc.nv.us.example.net',
+  };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $error = $record-&gt;heartbeat($timestamp);</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::nas object represents an Network Access Server on your network, such as
+a terminal server or equivalent.  FS::nas inherits from FS::Record.  The
+following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_nasnum_%2D_primary_key">nasnum - primary key</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_nas_%2D_NAS_name">nas - NAS name</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_nasip_%2D_NAS_ip_address">nasip - NAS ip address</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_nasfqdn_%2D_NAS_fully%2Dqualified_domain_name">nasfqdn - NAS fully-qualified domain name</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_state">last - timestamp indicating the last instant the NAS was in a known
+             state (used by the session monitoring).</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new NAS.  To add the NAS to the database, see <A HREF="#insert">insert</A>.
+<P>Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Delete this record from the database.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+<P></P>
+<DT><STRONG><A NAME="item_heartbeat">heartbeat TIMESTAMP</A></STRONG><BR>
+<DD>
+Updates the timestamp for this nas
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: nas.html,v 1.1 2001-04-23 12:41:57 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/port.html b/htdocs/docs/man/FS/port.html
new file mode 100644
index 000000000..b747f0ca3
--- /dev/null
+++ b/htdocs/docs/man/FS/port.html
@@ -0,0 +1,120 @@
+<HTML>
+<HEAD>
+<TITLE>FS::port - Object methods for port records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::port - Object methods for port records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::port;</PRE>
+<PRE>
+  $record = new FS::port \%hash;
+  $record = new FS::port { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $session = $port-&gt;session;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::port object represents an individual port on a NAS.  FS::port inherits
+from FS::Record.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_portnum_%2D_primary_key">portnum - primary key</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_ip_%2D_IP_address_of_this_port">ip - IP address of this port</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_nasport_%2D_port_number_on_the_NAS">nasport - port number on the NAS</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_nasnum_%2D_NAS_this_port_is_on_%2D_see_FS%3A%3Anas">nasnum - NAS this port is on - see <A HREF=".././FS/nas.html">the FS::nas manpage</A></A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new port.  To add the example to the database, see <A HREF="#insert">insert</A>.
+<P>Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Delete this record from the database.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+<P></P>
+<DT><STRONG><A NAME="item_session">session</A></STRONG><BR>
+<DD>
+Returns the currently open session on this port, or if no session is currently
+open, the most recent session.  See <A HREF=".././FS/session.html">the FS::session manpage</A>.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: port.html,v 1.1 2001-04-23 12:41:57 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The author forgot to customize this manpage.</P>
+<P>The session method won't deal well if you have multiple open sessions on a
+port, for example if your RADIUS server drops <STRONG>stop</STRONG> records.  Suggestions for
+how to deal with this sort of lossage welcome; should we close the session
+when we get a new session on that port?  Tag it as invalid somehow?  Close it
+one second after it was opened?  *sigh*  Maybe FS::session shouldn't let you
+create overlapping sessions, at least folks will find out their logging is
+dropping records.</P>
+<P>If you think the above refers multiple user logins you need to read the
+manpages again.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/prepay_credit.html b/htdocs/docs/man/FS/prepay_credit.html
new file mode 100644
index 000000000..699b1c16f
--- /dev/null
+++ b/htdocs/docs/man/FS/prepay_credit.html
@@ -0,0 +1,118 @@
+<HTML>
+<HEAD>
+<TITLE>FS::prepay_credit - Object methods for prepay_credit records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+	<LI><A HREF="#history">HISTORY</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::prepay_credit - Object methods for prepay_credit records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::prepay_credit;</PRE>
+<PRE>
+  $record = new FS::prepay_credit \%hash;
+  $record = new FS::prepay_credit {
+    'identifier' =&gt; '4198123455512121'
+    'amount'     =&gt; '19.95',
+  };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::table_name object represents an pre--paid credit, such as a pre-paid
+``calling card''.  FS::prepay_credit inherits from FS::Record.  The following
+fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_field_%2D_description">field - description</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_identifier_%2D_identifier_entered_by_the_user_to_r">identifier - identifier entered by the user to receive the credit</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_amount_%2D_amount_of_the_credit">amount - amount of the credit</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new pre-paid credit.  To add the example to the database, see
+<A HREF="#insert">insert</A>.
+<P>Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Delete this record from the database.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid pre-paid credit.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: prepay_credit.html,v 1.1 2001-04-23 12:41:57 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
+<P>
+<HR>
+<H1><A NAME="history">HISTORY</A></H1>
+<P>$Log: prepay_credit.html,v $
+<P>Revision 1.1  2001-04-23 12:41:57  ivan
+<P>new API documentation
+<P>
+Revision 1.2  2000/02/02 20:22:18  ivan
+bugfix prepayment in signup server</P>
+<P>Revision 1.1  2000/01/31 05:22:23  ivan
+prepaid ``internet cards''</P>
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/session.html b/htdocs/docs/man/FS/session.html
new file mode 100644
index 000000000..c714337be
--- /dev/null
+++ b/htdocs/docs/man/FS/session.html
@@ -0,0 +1,129 @@
+<HTML>
+<HEAD>
+<TITLE>FS::session - Object methods for session records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::session - Object methods for session records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::session;</PRE>
+<PRE>
+  $record = new FS::session \%hash;
+  $record = new FS::session {
+    'portnum' =&gt; 1,
+    'svcnum'  =&gt; 2,
+    'login'   =&gt; $timestamp,
+    'logout'  =&gt; $timestamp,
+  };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $error = $record-&gt;nas_heartbeat($timestamp);</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::session object represents an user login session.  FS::session inherits
+from FS::Record.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_sessionnum_%2D_primary_key">sessionnum - primary key</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_portnum_%2D_NAS_port_for_this_session_%2D_see_FS%3">portnum - NAS port for this session - see <A HREF=".././FS/port.html">the FS::port manpage</A></A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_svcnum_%2D_User_for_this_session_%2D_see_FS%3A%3As">svcnum - User for this session - see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A></A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_login_%2D_timestamp_indicating_the_beginning_of_th">login - timestamp indicating the beginning of this user session.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_logout_%2D_timestamp_indicating_the_end_of_this_us">logout - timestamp indicating the end of this user session.  May be null,
+               which indicates a currently open session.</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new session.  To add the session to the database, see <A HREF="#insert">insert</A>.
+<P>Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.  If the `login' field is empty, it is replaced with
+the current time.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Delete this record from the database.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.  If the `logout' field is empty,
+it is replaced with the current time.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid session.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+<P></P>
+<DT><STRONG><A NAME="item_nas_heartbeat">nas_heartbeat</A></STRONG><BR>
+<DD>
+Heartbeats the nas associated with this session (see <A HREF=".././FS/nas.html">the FS::nas manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_svc_acct">svc_acct</A></STRONG><BR>
+<DD>
+Returns the svc_acct record associated with this session (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>).
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: session.html,v 1.1 2001-04-23 12:41:57 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>Maybe you shouldn't be able to insert a session if there's currently an open
+session on that port.  Or maybe the open session on that port should be flagged
+as problematic?  autoclosed?  *sigh*</P>
+<P>Hmm, sessions refer to current svc_acct records... probably need to constrain
+deletions to svc_acct records such that no svc_acct records are deleted which
+have a session (even if long-closed).</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/htdocs/docs/man/FS/svc_www.html b/htdocs/docs/man/FS/svc_www.html
new file mode 100644
index 000000000..8f3a99a64
--- /dev/null
+++ b/htdocs/docs/man/FS/svc_www.html
@@ -0,0 +1,150 @@
+<HTML>
+<HEAD>
+<TITLE>FS::svc_www - Object methods for svc_www records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+	<LI><A HREF="#history">HISTORY</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::svc_www - Object methods for svc_www records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::svc_www;</PRE>
+<PRE>
+  $record = new FS::svc_www \%hash;
+  $record = new FS::svc_www { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $error = $record-&gt;suspend;</PRE>
+<PRE>
+  $error = $record-&gt;unsuspend;</PRE>
+<PRE>
+  $error = $record-&gt;cancel;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::svc_www object represents an web virtual host.  FS::svc_www inherits
+from FS::svc_Common.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_svcnum_%2D_primary_key">svcnum - primary key</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_recnum_%2D_DNS_%60A%27_record_corresponding_to_thi">recnum - DNS `A' record corresponding to this web virtual host. (see <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_account">usersvc - account (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>) corresponding to this web virtual host.</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new web virtual host.  To add the record to the database, see
+<A HREF="#insert">insert</A>.
+<P>Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P>The additional fields pkgnum and svcpart (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
+defined.  An FS::cust_svc record will be created and inserted.</P>
+<P>If the configuration values (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) <EM>apachemachine</EM>, and
+<EM>apacheroot</EM> exist, the command:</P>
+<PRE>
+  mkdir $apacheroot/$zone;
+  chown $username $apacheroot/$zone;
+  ln -s $apacheroot/$zone $homedir/$zone</PRE>
+<P><EM>$zone</EM> is the DNS A record pointed to by <EM>recnum</EM>
+<EM>$username</EM> is the username pointed to by <EM>usersvc</EM>
+<EM>$homedir</EM> is that user's home directory</P>
+<P>is executed on <EM>apachemachine</EM> via ssh.  This behaviour can be surpressed by
+setting $FS::svc_www::nossh_hack true.</P>
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Delete this record from the database.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
+<DD>
+Called by the suspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
+<DD>
+Called by the unsuspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
+<DD>
+Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: svc_www.html,v 1.1 2001-04-23 12:41:57 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/svc_Common.html">the FS::svc_Common manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
+<A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, schema.html from the base documentation.</P>
+<P>
+<HR>
+<H1><A NAME="history">HISTORY</A></H1>
+<P>$Log: svc_www.html,v $
+<P>Revision 1.1  2001-04-23 12:41:57  ivan
+<P>new API documentation
+<P>
+Revision 1.4  2001/04/22 01:56:15  ivan
+get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)</P>
+<P>Revision 1.3  2000/11/22 23:30:51  ivan
+tyop</P>
+<P>Revision 1.2  2000/03/01 08:13:59  ivan
+compilation bugfixes</P>
+<P>Revision 1.1  2000/02/03 05:16:52  ivan
+beginning of DNS and Apache support</P>
+
+</BODY>
+
+</HTML>
-- 
cgit v1.2.1


From fd337973c05b8cd15ecc8c4c9b913c7261e17ed6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Apr 2001 12:44:06 +0000
Subject: session killer implemeting timed access

---
 bin/freeside-session-kill | 100 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100755 bin/freeside-session-kill

diff --git a/bin/freeside-session-kill b/bin/freeside-session-kill
new file mode 100755
index 000000000..9f11abd5b
--- /dev/null
+++ b/bin/freeside-session-kill
@@ -0,0 +1,100 @@
+#!/usr/bin/perl -w
+
+use strict;
+use vars qw($conf);
+use Fcntl qw(:flock);
+use FS::UID qw(adminsuidsetup datasrc dbh);
+use FS::Record qw(dbdef qsearch fields);
+use FS::session;
+use FS::svc_acct;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+my $sessionlock = "/usr/local/etc/freeside/session-kill.lock.". datasrc;
+
+open(LOCK,"+>>$sessionlock") or die "Can't open $sessionlock: $!";
+select(LOCK); $|=1; select(STDOUT);
+unless ( flock(LOCK,LOCK_EX|LOCK_NB) ) {
+  seek(LOCK,0,0);
+  my($pid)=<LOCK>;
+  chop($pid);
+  #no reason to start loct of blocking processes
+  die "Is another session kill process running under pid $pid?\n";
+}
+seek(LOCK,0,0);
+print LOCK $$,"\n";
+
+$FS::UID::AutoCommit = 0;
+
+my $now = time;
+
+#uhhhhh
+
+use DBIx::DBSchema;
+use DBIx::DBSchema::Table; #down this path lies madness
+use DBIx::DBSchema::Column;
+
+my $dbdef = dbdef or die;
+#warn $dbdef;
+#warn $dbdef->{'tables'};
+#warn keys %{$dbdef->{'tables'}};
+my $session_table = $dbdef->table('session') or die;
+my $svc_acct_table = $dbdef->table('svc_acct') or die;
+
+my $session_svc_acct = new DBIx::DBSchema::Table ( 'session,svc_acct', '', '', '',
+  map( DBIx::DBSchema::Column->new( "session.$_",
+                              $session_table->column($_)->type,
+                              $session_table->column($_)->null,
+                              $session_table->column($_)->length,
+  ), $session_table->columns() ),
+  map( DBIx::DBSchema::Column->new( "svc_acct.$_",
+                              $svc_acct_table->column($_)->type,
+                              $svc_acct_table->column($_)->null,
+                              $svc_acct_table->column($_)->length,
+  ), $svc_acct_table->columns ),
+#  map("svc_acct.$_", $svc_acct_table->columns),
+);
+
+$dbdef->addtable($session_svc_acct); #madness, i tell you
+
+$FS::Record::DEBUG = 1;
+my @session = qsearch('session,svc_acct', {}, '', ' WHERE '. join(' AND ',
+  'svc_acct.svcnum = session.svcnum',
+  '( session.logout IS NULL OR session.logout = 0 )',
+  "( $now - session.login ) >= svc_acct.seconds"
+). " FOR UPDATE" );
+
+my $dbh = dbh;
+
+foreach my $join ( @session ) {
+
+  my $session = new FS::session ( {
+    map { $_ => $join->{'Hash'}{"session.$_"} } fields('session')
+  } ); #see no evil
+
+  my $svc_acct = new FS::svc_acct ( {
+    map { $_ => $join->{'Hash'}{"svc_acct.$_"} } fields('svc_acct')
+  } );
+
+  #false laziness w/ fs_session_server
+  my $nsession = new FS::session ( { $session->hash } );
+  my $error = $nsession->replace($session);
+  if ( $error ) {
+    $dbh->rollback;
+    die $error;
+  }
+  my $time = $nsession->logout - $nsession->login;
+  my $new_svc_acct = new FS::svc_acct ( { $svc_acct->hash } );
+  my $seconds = $new_svc_acct->seconds;
+  $seconds -= $time;
+  $seconds = 0 if $seconds < 0;
+  $new_svc_acct->seconds( $seconds );
+  $error = $new_svc_acct->replace( $svc_acct );
+  warn "can't debit time from ". $svc_acct->username. ": $error\n"; #don't want to rollback, though
+  #ssenizal eslaf
+
+}
+
+$dbh->commit or die $dbh->errstr;
+
-- 
cgit v1.2.1


From b72acc62818ec29a3852bec2561a052875273249 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Apr 2001 13:09:04 +0000
Subject: hehe, last minute upgrade instruction fixes

---
 htdocs/docs/upgrade6.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/upgrade6.html b/htdocs/docs/upgrade6.html
index 047250b7c..6758bd511 100644
--- a/htdocs/docs/upgrade6.html
+++ b/htdocs/docs/upgrade6.html
@@ -12,7 +12,7 @@
   <li>Back up your data and current Freeside installation.
   <li>As 1.3.0 requires transactions, <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are no longer supported</b>.  Converting to <a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.  If you really want to use MySQL, convert your tables to one of the <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>.
   <li>Copy the <i>invoice_template</i> file from the <i>conf/</i> directory in the distribution to your <a href="config.html">configuration directory</a>.
-  <li>Install the <a href="http://www.perl.com/CPAN/modules/by-module/Text/">Text-Template</a> Perl module.
+  <li>Install the <a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>, <a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>, <a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a> and <a href="http://search.cpan.org/search?dist=Net-SCP">Net-SCP</a> Perl modules.
   <li>Apply the following changes to your database:
 <pre>
 CREATE TABLE domain_record (
-- 
cgit v1.2.1


From 34687e57b8f651991a28cfc075a08fec67e7c6fe Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Apr 2001 15:37:19 +0000
Subject: 1.3.1 sigh

---
 FS/MANIFEST | 1 -
 1 file changed, 1 deletion(-)

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 98f76acda..15245b8d4 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -41,7 +41,6 @@ test.pl
 README
 bin/freeside-bill
 bin/freeside-print-batch
-bin/freeside-disable-overdue
 FS/domain_record.pm
 FS/prepay_credit.pm
 FS/svc_www.pm
-- 
cgit v1.2.1


From d2f0f6a76d1417f2aba85b035fa2f04f095f50e3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Apr 2001 16:07:54 +0000
Subject: fix Insecure dependency in eval while running with -T switch at
 /usr/local/lib/site_perl/FS/Record.pm line 202.

---
 htdocs/search/cust_main.cgi | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index 226118586..1b4a5a54a 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.16 2001-02-07 19:45:45 ivan Exp $
+# $Id: cust_main.cgi,v 1.17 2001-04-23 16:07:54 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -17,7 +17,11 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.16  2001-02-07 19:45:45  ivan
+# Revision 1.17  2001-04-23 16:07:54  ivan
+# fix
+# Insecure dependency in eval while running with -T switch at /usr/local/lib/site_perl/FS/Record.pm line 202.
+#
+# Revision 1.16  2001/02/07 19:45:45  ivan
 # tyop
 #
 # Revision 1.15  2000/07/17 16:45:41  ivan
@@ -81,6 +85,7 @@ use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header menubar eidiot popurl table);
 use FS::cust_main;
+use FS::cust_svc;
 
 $cgi = new CGI;
 cgisuidsetup($cgi);
-- 
cgit v1.2.1


From 37b880826261a0caee14508aeaafa9da28bd043a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Apr 2001 16:25:05 +0000
Subject: working registerd.Pg

---
 fs_webdemo/registerd.Pg | 74 +++++++++++++++++++++++--------------------------
 1 file changed, 35 insertions(+), 39 deletions(-)

diff --git a/fs_webdemo/registerd.Pg b/fs_webdemo/registerd.Pg
index a4fd0552c..471384137 100755
--- a/fs_webdemo/registerd.Pg
+++ b/fs_webdemo/registerd.Pg
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: registerd.Pg,v 1.1 2001-04-23 12:40:30 ivan Exp $
+# $Id: registerd.Pg,v 1.2 2001-04-23 16:25:05 ivan Exp $
 
 use strict;
 use vars qw(
@@ -65,13 +65,13 @@ while ( 1 ) {
   $sth->execute or die $sth->errstr;
 
   $sth = $dbh->prepare(
-    'SELECT * FROM mysql_auth WHERE status = "unconfigured" OR status = "reconfigure"'
+    'SELECT * FROM mysql_auth WHERE status = "unconfigured"'
   );
   $sth->execute or die $sth->errstr;
   my $pending = $sth->fetchall_arrayref( {} );
 
   $sth = $dbh->prepare(
-    'UPDATE mysql_auth SET status = "locked" WHERE status = "unconfigured" OR status = "reconfigure"'
+    'UPDATE mysql_auth SET status = "locked" WHERE status = "unconfigured"'
   );
   $sth->execute or die $sth->errstr;
 
@@ -84,7 +84,6 @@ while ( 1 ) {
 
     my $username = $row->{'username'};
     my $email = $row->{'passwd'};
-    my $status = $row->{'status'};
 
     system("/usr/bin/createdb --username freeside demo_$username >/dev/null");
 
@@ -145,41 +144,38 @@ while ( 1 ) {
     );
     $sth->execute or die $sth->errstr;
 
-    if ( $status eq "unconfigured" ) {
-
-      #$ENV{SMTPHOSTS} = "localhost";
-      $ENV{SMTPHOSTS} = "192.168.1.1";
-      $ENV{MAILADDRESS} = 'ivan-fsreg@sisd.com';
-      $ENV{TZ} = "PST8PDT";
-      $header = Mail::Header->new( [
-        'From: ivan-fsreg@sisd.com',
-        "To: $email",
-        'Bcc: ivan-fsreg_bcc@sisd.com',
-        'Sender: ivan-fsreg@sisd.com',
-        'Reply-To: ivan-fsreg@sisd.com',
-        #'Date: '. time2str("%a, %d %b %Y %X %z", time ),
-        'Date: '. time2str("%a, %d %b %Y %X ", time ). "-0800",
-        'Subject: Freeside demo information',
-      ] );
-      $msg = Mail::Internet->new(
-        'Header' => $header,
-        'Body' => [
-      "Hello,\n",
-      "\n",
-      "Your sample Freeside database has been setup.\n",
-      "\n",
-      "Point your web browswer at http://freeside.sisd.com/ and use the following\n",
-      "authentication information:\n",
-      "\n",
-      "Username: $username\n",
-      "Password: $user_pw\n",
-      "\n",
-      "-- \n",
-      "ivan\n",
-                  ]
-      );
-      $msg->smtpsend or die "Can\'t send registration email!";
-    }
+    #$ENV{SMTPHOSTS} = "localhost";
+    $ENV{SMTPHOSTS} = "192.168.1.1";
+    $ENV{MAILADDRESS} = 'ivan-fsreg@sisd.com';
+    $ENV{TZ} = "PST8PDT";
+    $header = Mail::Header->new( [
+      'From: ivan-fsreg@sisd.com',
+      "To: $email",
+      'Bcc: ivan-fsreg_bcc@sisd.com',
+      'Sender: ivan-fsreg@sisd.com',
+      'Reply-To: ivan-fsreg@sisd.com',
+      #'Date: '. time2str("%a, %d %b %Y %X %z", time ),
+      'Date: '. time2str("%a, %d %b %Y %X ", time ). "-0800",
+      'Subject: Freeside demo information',
+    ] );
+    $msg = Mail::Internet->new(
+      'Header' => $header,
+      'Body' => [
+    "Hello,\n",
+    "\n",
+    "Your sample Freeside database has been setup.\n",
+    "\n",
+    "Point your web browswer at http://freeside.sisd.com/ and use the following\n",
+    "authentication information:\n",
+    "\n",
+    "Username: $username\n",
+    "Password: $user_pw\n",
+    "\n",
+    "-- \n",
+    "ivan\n",
+                ]
+    );
+    $msg->smtpsend or die "Can\'t send registration email!";
 
   }
 
-- 
cgit v1.2.1


From 779280607cab20aafd3b71d161562395e183ef76 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Apr 2001 19:21:31 +0000
Subject: webdemo bugfix

---
 FS/FS/cust_credit.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 5888d07ef..3f191f4e5 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -142,7 +142,7 @@ amount minus all refunds (see L<FS::cust_refund>).
 sub credited {
   my $self = shift;
   my $amount = $self->amount;
-  $amount -= $_->refund foreach ( $self->cust_refund );
+  $amount -= $_->amount() foreach ( $self->cust_refund );
   $amount;
 }
 
@@ -150,7 +150,7 @@ sub credited {
 
 =head1 VERSION
 
-$Id: cust_credit.pm,v 1.3 2001-04-09 23:05:15 ivan Exp $
+$Id: cust_credit.pm,v 1.4 2001-04-23 19:21:31 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 4dba303c1989638060b9c76941f5e72fd35c4dd5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Apr 2001 19:27:28 +0000
Subject: *sigh*

---
 FS/FS/cust_credit.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 3f191f4e5..cc1ac395d 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -142,7 +142,7 @@ amount minus all refunds (see L<FS::cust_refund>).
 sub credited {
   my $self = shift;
   my $amount = $self->amount;
-  $amount -= $_->amount() foreach ( $self->cust_refund );
+  $amount -= $_->refund foreach ( $self->cust_refund );
   $amount;
 }
 
@@ -150,7 +150,7 @@ sub credited {
 
 =head1 VERSION
 
-$Id: cust_credit.pm,v 1.4 2001-04-23 19:21:31 ivan Exp $
+$Id: cust_credit.pm,v 1.5 2001-04-23 19:27:28 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 231db9f6d724c329e5fb45c79931f8248323e588 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Apr 2001 19:50:07 +0000
Subject: the real

Can't locate object method "setfield" via package "cust_refund" at /usr/local/lib/site_perl/FS/Record.pm line 315.

fix
---
 FS/FS/cust_credit.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index cc1ac395d..7e55dca80 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -3,7 +3,7 @@ package FS::cust_credit;
 use strict;
 use vars qw( @ISA );
 use FS::UID qw( getotaker );
-use FS::Record qw( qsearchs );
+use FS::Record qw( qsearch qsearchs );
 use FS::cust_main;
 use FS::cust_refund;
 
@@ -150,7 +150,7 @@ sub credited {
 
 =head1 VERSION
 
-$Id: cust_credit.pm,v 1.5 2001-04-23 19:27:28 ivan Exp $
+$Id: cust_credit.pm,v 1.6 2001-04-23 19:50:07 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 46f95157da49cd73ef2a58f357fcd802f578ab69 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Apr 2001 01:06:09 +0000
Subject: missing docs

---
 htdocs/docs/man/FS/SessionClient.html | 97 +++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 htdocs/docs/man/FS/SessionClient.html

diff --git a/htdocs/docs/man/FS/SessionClient.html b/htdocs/docs/man/FS/SessionClient.html
new file mode 100644
index 000000000..5f180eee4
--- /dev/null
+++ b/htdocs/docs/man/FS/SessionClient.html
@@ -0,0 +1,97 @@
+<HTML>
+<HEAD>
+<TITLE>FS::SessionClient - Freeside session client API</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::SessionClient - Freeside session client API</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::SessionClient qw( login portnum logout );</PRE>
+<PRE>
+  $error = login ( {
+    'username' =&gt; $username,
+    'password' =&gt; $password,
+    'login'    =&gt; $timestamp,
+    'portnum'  =&gt; $portnum,
+  } );</PRE>
+<PRE>
+  $portnum = portnum( { 'ip' =&gt; $ip } ) or die &quot;unknown ip!&quot;
+  $portnum = portnum( { 'nasnum' =&gt; $nasnum, 'nasport' =&gt; $nasport } )
+    or die &quot;unknown nasnum/nasport&quot;;</PRE>
+<PRE>
+  $error = logout ( {
+    'username' =&gt; $username,
+    'password' =&gt; $password,
+    'logout'   =&gt; $timestamp,
+    'portnum'  =&gt; $portnum,
+  } );</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>This modules provides an API for a remote session application.</P>
+<P>It needs to be run as the freeside user.  Because of this, the program which
+calls these subroutines should be written very carefully.</P>
+<P>
+<HR>
+<H1><A NAME="subroutines">SUBROUTINES</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_login">login HASHREF</A></STRONG><BR>
+<DD>
+HASHREF should have the following keys: username, password, login and portnum.
+login is a UNIX timestamp; if not specified, will default to the current time.
+Starts a new session for the specified user and portnum.  The password is
+optional, but must be correct if specified.
+<P>Returns a scalar error message, or the empty string for success.</P>
+<P></P>
+<DT><STRONG><A NAME="item_portnum">portnum</A></STRONG><BR>
+<DD>
+HASHREF should contain a single key: ip, or the two keys: nasnum and nasport.
+Returns a portnum suitable for the login and logout subroutines, or false
+on error.
+<P></P>
+<DT><STRONG><A NAME="item_logout">logout HASHREF</A></STRONG><BR>
+<DD>
+HASHREF should have the following keys: usrename, password, logout and portnum.
+logout is a UNIX timestamp; if not specified, will default to the current time.
+Starts a new session for the specified user and portnum.  The password is
+optional, but must be correct if specified.
+<P>Returns a scalar error message, or the empty string for success.</P>
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: SessionClient.html,v 1.1 2001-04-25 01:06:09 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><EM>fs_sessiond</EM></P>
+
+</BODY>
+
+</HTML>
-- 
cgit v1.2.1


From 9bdcd4171c17f020420b6d8c8e7b335695b2abb1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Apr 2001 00:17:39 +0000
Subject: sigh

---
 fs_webdemo/registerd.Pg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs_webdemo/registerd.Pg b/fs_webdemo/registerd.Pg
index 471384137..702d83d06 100755
--- a/fs_webdemo/registerd.Pg
+++ b/fs_webdemo/registerd.Pg
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: registerd.Pg,v 1.2 2001-04-23 16:25:05 ivan Exp $
+# $Id: registerd.Pg,v 1.3 2001-04-26 00:17:39 ivan Exp $
 
 use strict;
 use vars qw(
@@ -85,7 +85,7 @@ while ( 1 ) {
     my $username = $row->{'username'};
     my $email = $row->{'passwd'};
 
-    system("/usr/bin/createdb --username freeside demo_$username >/dev/null");
+    system("/usr/bin/createdb --username freeside demo_$username | mail ivan-createdb\@420.am");
 
     system "psql -U freeside demo_$username </usr/local/etc/freeside/demo_template.Pg";
 
-- 
cgit v1.2.1


From aa120bd3a40e65fe9751c0128c2ffe57cfad0b89 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Apr 2001 00:18:36 +0000
Subject: sigh

---
 fs_webdemo/registerd.Pg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs_webdemo/registerd.Pg b/fs_webdemo/registerd.Pg
index 702d83d06..53a118638 100755
--- a/fs_webdemo/registerd.Pg
+++ b/fs_webdemo/registerd.Pg
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: registerd.Pg,v 1.3 2001-04-26 00:17:39 ivan Exp $
+# $Id: registerd.Pg,v 1.4 2001-04-26 00:18:36 ivan Exp $
 
 use strict;
 use vars qw(
@@ -87,7 +87,7 @@ while ( 1 ) {
 
     system("/usr/bin/createdb --username freeside demo_$username | mail ivan-createdb\@420.am");
 
-    system "psql -U freeside demo_$username </usr/local/etc/freeside/demo_template.Pg";
+    system "psql -U freeside demo_$username </usr/local/etc/freeside/demo_template.Pg | mail ivan-psql\@420.am";
 
     mkdir "${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username", 0755;    
     system "cp -pr ${freeside_conf}conf.DBI:Pg:host=localhost\\;dbname=demo_template/* ".
-- 
cgit v1.2.1


From cec839776b1946de882e5bd968732ac472adbce3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Apr 2001 02:18:15 +0000
Subject: argh

---
 fs_webdemo/registerd.Pg | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/fs_webdemo/registerd.Pg b/fs_webdemo/registerd.Pg
index 53a118638..996ac8b23 100755
--- a/fs_webdemo/registerd.Pg
+++ b/fs_webdemo/registerd.Pg
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: registerd.Pg,v 1.4 2001-04-26 00:18:36 ivan Exp $
+# $Id: registerd.Pg,v 1.5 2001-04-26 02:18:15 ivan Exp $
 
 use strict;
 use vars qw(
@@ -50,7 +50,7 @@ die "not running as root user"
 $dbh = DBI->connect( $datasrc, $user, $pass, {
 	'AutoCommit' => 'true',
 } ) or die "DBI->connect error: $DBI::errstr\n";
-$x = $DBI::errstr; #silly; to avoid "used only once" warning
+#$x = $DBI::errstr; #silly; to avoid "used only once" warning
 
 while ( 1 ) {
 
@@ -85,9 +85,25 @@ while ( 1 ) {
     my $username = $row->{'username'};
     my $email = $row->{'passwd'};
 
-    system("/usr/bin/createdb --username freeside demo_$username | mail ivan-createdb\@420.am");
-
-    system "psql -U freeside demo_$username </usr/local/etc/freeside/demo_template.Pg | mail ivan-psql\@420.am";
+    $pdbh = DBI->connect( 'DBI:Pg:host=localhost;database=demo_template', 'freeside', 'maelcolm' )
+      or do { &myerr("$username: ". $DBI::errstr); next; };
+
+    $psth = $pdbh->prepare("CREATE DATABASE demo_$username")
+      or do { &myerr("$username: ". $pdbh->errstr;); next; };
+    $psth->execute()
+      or do { &myerr("$username: ". $psth->errstr;); next; };
+
+    open(PSQL,"|psql -U freeside demo_$username")
+      or do { &myerr("|psql -U freeside demo_$username: $!"); next; };
+    open(PSQLDATA, "</usr/local/etc/freeside/demo_template.Pg")
+      or do { &myerr("/usr/local/etc/freeside/demo_template.Pg: $!"); next; };
+    while(<PSQLDATA>) {
+      print PSQL $_;
+    }
+    close PSQLDATA
+      or do { &myerr("/usr/local/etc/freeside/demo_template.Pg: $!"); next; };
+    close PSQL
+      or do { &myerr("|psql -U freeside demo_$username: $!"); next; };
 
     mkdir "${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username", 0755;    
     system "cp -pr ${freeside_conf}conf.DBI:Pg:host=localhost\\;dbname=demo_template/* ".
@@ -190,3 +206,11 @@ while ( 1 ) {
 
 }
 
+sub myerr {
+  my $msg = shift;
+  open(MAIL,"|mail ivan-fsdemoerr@420.am");
+  print MAIL $msg, "\n\n";
+  print MAIL $msg, "\n\n";
+  close MAIL;
+};
+
-- 
cgit v1.2.1


From 85c2ddbd1de869de87001bbf16b50dd63ac4b6a1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Apr 2001 02:20:41 +0000
Subject: arg

---
 fs_webdemo/registerd.Pg | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fs_webdemo/registerd.Pg b/fs_webdemo/registerd.Pg
index 996ac8b23..7fa4c9a3d 100755
--- a/fs_webdemo/registerd.Pg
+++ b/fs_webdemo/registerd.Pg
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: registerd.Pg,v 1.5 2001-04-26 02:18:15 ivan Exp $
+# $Id: registerd.Pg,v 1.6 2001-04-26 02:20:41 ivan Exp $
 
 use strict;
 use vars qw(
@@ -85,14 +85,17 @@ while ( 1 ) {
     my $username = $row->{'username'};
     my $email = $row->{'passwd'};
 
-    $pdbh = DBI->connect( 'DBI:Pg:host=localhost;database=demo_template', 'freeside', 'maelcolm' )
+    my $pdbh = DBI->connect( 'DBI:Pg:host=localhost;database=demo_template', 'freeside', 'maelcolm' )
       or do { &myerr("$username: ". $DBI::errstr); next; };
 
-    $psth = $pdbh->prepare("CREATE DATABASE demo_$username")
+    my $psth = $pdbh->prepare("CREATE DATABASE demo_$username")
       or do { &myerr("$username: ". $pdbh->errstr;); next; };
     $psth->execute()
       or do { &myerr("$username: ". $psth->errstr;); next; };
 
+    $pdbh->disconnect
+      or do { &myerr("fatal: $DBI:errstr"); die; };
+
     open(PSQL,"|psql -U freeside demo_$username")
       or do { &myerr("|psql -U freeside demo_$username: $!"); next; };
     open(PSQLDATA, "</usr/local/etc/freeside/demo_template.Pg")
-- 
cgit v1.2.1


From 97d7032bb2550d35b481adc6c378b5074c66024a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Apr 2001 02:21:19 +0000
Subject: ARG

---
 fs_webdemo/registerd.Pg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs_webdemo/registerd.Pg b/fs_webdemo/registerd.Pg
index 7fa4c9a3d..672b892ff 100755
--- a/fs_webdemo/registerd.Pg
+++ b/fs_webdemo/registerd.Pg
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: registerd.Pg,v 1.6 2001-04-26 02:20:41 ivan Exp $
+# $Id: registerd.Pg,v 1.7 2001-04-26 02:21:19 ivan Exp $
 
 use strict;
 use vars qw(
@@ -89,9 +89,9 @@ while ( 1 ) {
       or do { &myerr("$username: ". $DBI::errstr); next; };
 
     my $psth = $pdbh->prepare("CREATE DATABASE demo_$username")
-      or do { &myerr("$username: ". $pdbh->errstr;); next; };
+      or do { &myerr("$username: ". $pdbh->errstr); next; };
     $psth->execute()
-      or do { &myerr("$username: ". $psth->errstr;); next; };
+      or do { &myerr("$username: ". $psth->errstr); next; };
 
     $pdbh->disconnect
       or do { &myerr("fatal: $DBI:errstr"); die; };
-- 
cgit v1.2.1


From 836e20fbc7e694ac5be5ee067637cae4b855e40a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Apr 2001 02:23:27 +0000
Subject: arfuckingargh

---
 fs_webdemo/registerd.Pg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs_webdemo/registerd.Pg b/fs_webdemo/registerd.Pg
index 672b892ff..6f882da77 100755
--- a/fs_webdemo/registerd.Pg
+++ b/fs_webdemo/registerd.Pg
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: registerd.Pg,v 1.7 2001-04-26 02:21:19 ivan Exp $
+# $Id: registerd.Pg,v 1.8 2001-04-26 02:23:27 ivan Exp $
 
 use strict;
 use vars qw(
@@ -94,7 +94,7 @@ while ( 1 ) {
       or do { &myerr("$username: ". $psth->errstr); next; };
 
     $pdbh->disconnect
-      or do { &myerr("fatal: $DBI:errstr"); die; };
+      or do { &myerr("fatal: $DBI::errstr"); die; };
 
     open(PSQL,"|psql -U freeside demo_$username")
       or do { &myerr("|psql -U freeside demo_$username: $!"); next; };
@@ -211,7 +211,7 @@ while ( 1 ) {
 
 sub myerr {
   my $msg = shift;
-  open(MAIL,"|mail ivan-fsdemoerr@420.am");
+  open(MAIL,"|mail ivan-fsdemoerr\@420.am");
   print MAIL $msg, "\n\n";
   print MAIL $msg, "\n\n";
   close MAIL;
-- 
cgit v1.2.1


From 2ce72aa7adbac1ff4ecafd2e79311b62362d4f68 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Apr 2001 02:28:40 +0000
Subject: argh

---
 fs_webdemo/registerd.Pg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs_webdemo/registerd.Pg b/fs_webdemo/registerd.Pg
index 6f882da77..b1409a92c 100755
--- a/fs_webdemo/registerd.Pg
+++ b/fs_webdemo/registerd.Pg
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: registerd.Pg,v 1.8 2001-04-26 02:23:27 ivan Exp $
+# $Id: registerd.Pg,v 1.9 2001-04-26 02:28:40 ivan Exp $
 
 use strict;
 use vars qw(
@@ -85,7 +85,7 @@ while ( 1 ) {
     my $username = $row->{'username'};
     my $email = $row->{'passwd'};
 
-    my $pdbh = DBI->connect( 'DBI:Pg:host=localhost;database=demo_template', 'freeside', 'maelcolm' )
+    my $pdbh = DBI->connect( 'DBI:Pg:host=localhost;dbname=demo_template', 'freeside', 'maelcolm' )
       or do { &myerr("$username: ". $DBI::errstr); next; };
 
     my $psth = $pdbh->prepare("CREATE DATABASE demo_$username")
-- 
cgit v1.2.1


From b0a9702eab4338ff12507ba0ca07f121256f3c13 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 3 May 2001 10:28:31 +0000
Subject: documentation updates for add'l perl dependencies. thanks to "Mike
 McCauley" <mikem@open.com.au> from Radiator

---
 htdocs/docs/install.html  | 2 ++
 htdocs/docs/upgrade6.html | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index d94ffe7fa..30354deb8 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -16,6 +16,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=MIME-Base64">MIME-Base64</a>
       <li><a href="http://search.cpan.org/search?dist=Digest-MD5">Digest-MD5</a>
       <li><a href="http://search.cpan.org/search?dist=URI">URI</a>
+      <li><a href="http://search.cpan.org/search?dist=HTML-Tagset">HTML-Tagset</a>
       <li><a href="http://search.cpan.org/search?dist=HTML-Parser">HTML-Parser</a>
       <li><a href="http://search.cpan.org/search?dist=libnet">libnet</a>
       <li><a href="http://search.cpan.org/search?dist=Locale-Codes">Locale-Codes</a>
@@ -34,6 +35,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a>
       <li><a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>
       <li><a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>
+      <li><a href="http://search.cpan.org/search?dist=String-ShellQuote">String-ShellQuote</a>
       <li><a href="http://search.cpan.org/search?dist=Net-SCP">Net-SCP</a>
     </ul>
 </ul>
diff --git a/htdocs/docs/upgrade6.html b/htdocs/docs/upgrade6.html
index 6758bd511..dc82975f3 100644
--- a/htdocs/docs/upgrade6.html
+++ b/htdocs/docs/upgrade6.html
@@ -12,7 +12,7 @@
   <li>Back up your data and current Freeside installation.
   <li>As 1.3.0 requires transactions, <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are no longer supported</b>.  Converting to <a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.  If you really want to use MySQL, convert your tables to one of the <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>.
   <li>Copy the <i>invoice_template</i> file from the <i>conf/</i> directory in the distribution to your <a href="config.html">configuration directory</a>.
-  <li>Install the <a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>, <a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>, <a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a> and <a href="http://search.cpan.org/search?dist=Net-SCP">Net-SCP</a> Perl modules.
+  <li>Install the <a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>, <a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>, <a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>, <a href="http://search.cpan.org/search?dist=String-ShellQuote">String-ShellQuote</a> and <a href="http://search.cpan.org/search?dist=Net-SCP">Net-SCP</a> Perl modules.
   <li>Apply the following changes to your database:
 <pre>
 CREATE TABLE domain_record (
-- 
cgit v1.2.1


From fafbffd5057b45c84afd30fbf664f37661ef1533 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 5 May 2001 08:51:16 +0000
Subject: http://www.sisd.com/freeside/list-archive/msg01915.html

---
 bin/svc_acct.import | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index 0acd731c5..0f459483f 100755
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.import,v 1.12 2001-04-22 01:56:15 ivan Exp $
+# $Id: svc_acct.import,v 1.13 2001-05-05 08:51:16 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -17,7 +17,10 @@
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 #
 # $Log: svc_acct.import,v $
-# Revision 1.12  2001-04-22 01:56:15  ivan
+# Revision 1.13  2001-05-05 08:51:16  ivan
+# http://www.sisd.com/freeside/list-archive/msg01915.html
+#
+# Revision 1.12  2001/04/22 01:56:15  ivan
 # get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)
 #
 # Revision 1.11  2000/06/29 12:27:01  ivan
@@ -200,6 +203,7 @@ my(%password);
 while (<SHADOW>) {
   chop;
   my($username,$password)=split(/:/);
+  $password =~ s/\!+/\*SUSPENDED\* /;
   $password{$username}=$password;
 }
 
-- 
cgit v1.2.1


From df962da38244a75e6a10277770b641bb73053e57 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 7 May 2001 02:07:38 +0000
Subject: http://www.sisd.com/freeside/list-archive/msg01906.html

---
 FS/FS/cust_main.pm         | 12 +++++++-----
 fs_signup/fs_signup_server |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 0379f7f71..00ddc828e 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -191,15 +191,17 @@ but until then, here's an example:
 
   use Tie::RefHash;
   tie %hash, 'Tie::RefHash'; #this part is important
-  %hash = {
+  %hash = (
     $cust_pkg => [ $svc_acct ],
-  };
+    ...
+  );
   $cust_main->insert( \%hash );
 
 =cut
 
 sub insert {
   my $self = shift;
+  my @param = @_;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -239,8 +241,8 @@ sub insert {
     return $error;
   }
 
-  if ( @_ ) {
-    my $cust_pkgs = shift;
+  if ( @param ) {
+    my $cust_pkgs = shift @param;
     foreach my $cust_pkg ( keys %$cust_pkgs ) {
       $cust_pkg->custnum( $self->custnum );
       $error = $cust_pkg->insert;
@@ -1117,7 +1119,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.12 2001-04-23 07:12:44 ivan Exp $
+$Id: cust_main.pm,v 1.13 2001-05-07 02:07:38 ivan Exp $
 
 =head1 BUGS
 
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 8fbc819ad..03defd6f9 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -163,7 +163,7 @@ while (1) {
 
     use Tie::RefHash;
     tie my %hash, 'Tie::RefHash';
-    %hash = { $cust_pkg => [ $svc_acct ] };
+    %hash = ( $cust_pkg => [ $svc_acct ] );
     $error ||= $cust_main->insert( \%hash );
     #if ( $cust_pkg && ! $error ) { #in this case, $cust_pkg should always
     #                               #be definied, but....
-- 
cgit v1.2.1


From f50e19a81e4f15d8ec15376d1674dfe6caad3d82 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 7 May 2001 15:24:15 +0000
Subject: s/!/*/

---
 bin/svc_acct.import | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index 0f459483f..2e51a8b2c 100755
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.import,v 1.13 2001-05-05 08:51:16 ivan Exp $
+# $Id: svc_acct.import,v 1.14 2001-05-07 15:24:15 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -17,7 +17,10 @@
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 #
 # $Log: svc_acct.import,v $
-# Revision 1.13  2001-05-05 08:51:16  ivan
+# Revision 1.14  2001-05-07 15:24:15  ivan
+# s/!/*/
+#
+# Revision 1.13  2001/05/05 08:51:16  ivan
 # http://www.sisd.com/freeside/list-archive/msg01915.html
 #
 # Revision 1.12  2001/04/22 01:56:15  ivan
@@ -203,6 +206,7 @@ my(%password);
 while (<SHADOW>) {
   chop;
   my($username,$password)=split(/:/);
+  $password =~ s/^\!$/\*/;
   $password =~ s/\!+/\*SUSPENDED\* /;
   $password{$username}=$password;
 }
-- 
cgit v1.2.1


From 410ece2d77e913892a6fe92e8abbc9271b324dc1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 7 May 2001 15:36:04 +0000
Subject: start to track down

    Insecure dependency in eval while running with -T switch at /usr/local/lib/site_perl/FS/Record.pm line 202.

errors
---
 FS/FS/Record.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 113e1a18d..426bea2f8 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -169,6 +169,8 @@ objects.
 
 sub qsearch {
   my($table, $record, $select, $extra_sql ) = @_;
+  $table =~ /^([\w\_])+$/ or die "Illegal table: $table";
+  $table = $1;
   $select ||= '*';
   my $dbh = dbh;
 
@@ -913,7 +915,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.14 2001-04-15 12:56:30 ivan Exp $
+$Id: Record.pm,v 1.15 2001-05-07 15:36:04 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 38e969ecf93f56c05e06bbcd24e9bd1ddf56d709 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 7 May 2001 15:42:02 +0000
Subject: tyop

---
 FS/FS/Record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 426bea2f8..f88be8b00 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -169,7 +169,7 @@ objects.
 
 sub qsearch {
   my($table, $record, $select, $extra_sql ) = @_;
-  $table =~ /^([\w\_])+$/ or die "Illegal table: $table";
+  $table =~ /^([\w\_]+)$/ or die "Illegal table: $table";
   $table = $1;
   $select ||= '*';
   my $dbh = dbh;
@@ -915,7 +915,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.15 2001-05-07 15:36:04 ivan Exp $
+$Id: Record.pm,v 1.16 2001-05-07 15:42:02 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 365fdd1f1938f399113a5ce013a7c2daa431a5c2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 8 May 2001 10:44:17 +0000
Subject: fix for OO Net::SCP

---
 bin/svc_acct.export    | 56 ++++++++++++++++++++++++++++++--------------------
 bin/svc_acct_sm.export | 29 +++++++++++++++-----------
 2 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 073359587..1c3ffa243 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.18 2001-04-22 01:56:15 ivan Exp $
+# $Id: svc_acct.export,v 1.19 2001-05-08 10:44:17 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,7 +38,10 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.18  2001-04-22 01:56:15  ivan
+# Revision 1.19  2001-05-08 10:44:17  ivan
+# fix for OO Net::SCP
+#
+# Revision 1.18  2001/04/22 01:56:15  ivan
 # get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)
 #
 # Revision 1.17  2001/02/21 23:48:19  ivan
@@ -349,10 +352,11 @@ close USERS;
 
 my($shellmachine);
 foreach $shellmachine (@shellmachines) {
-  scp("$spooldir/passwd","root\@$shellmachine:/etc/passwd.new")
-    == 0 or die "scp error: $!";
-  scp("$spooldir/shadow","root\@$shellmachine:/etc/shadow.new")
-    == 0 or die "scp error: $!";
+  my $scp = new Net::SCP;
+  $scp->scp("$spooldir/passwd","root\@$shellmachine:/etc/passwd.new")
+    or die "scp error: ". $scp->{errstr};
+  $scp->scp("$spooldir/shadow","root\@$shellmachine:/etc/shadow.new")
+    or die "scp error: ". $scp->{errstr};
   ssh("root\@$shellmachine",
     "( ".
       "mv /etc/passwd.new /etc/passwd; ".
@@ -364,10 +368,11 @@ foreach $shellmachine (@shellmachines) {
 
 my($bsdshellmachine);
 foreach $bsdshellmachine (@bsdshellmachines) {
-  scp("$spooldir/passwd","root\@$bsdshellmachine:/etc/passwd.new")
-    == 0 or die "scp error: $!";
-  scp("$spooldir/master.passwd","root\@$bsdshellmachine:/etc/master.passwd.new")
-    == 0 or die "scp error: $!";
+  my $scp = new Net::SCP;
+  $scp->scp("$spooldir/passwd","root\@$bsdshellmachine:/etc/passwd.new")
+    or die "scp error: ". $scp->{errstr};
+  $scp->scp("$spooldir/master.passwd","root\@$bsdshellmachine:/etc/master.passwd.new")
+    or die "scp error: ". $scp->{errstr};
   ssh("root\@$bsdshellmachine",
     "( ".
       "mv /etc/passwd.new /etc/passwd; ".
@@ -379,10 +384,11 @@ foreach $bsdshellmachine (@bsdshellmachines) {
 
 my($nismachine);
 foreach $nismachine (@nismachines) {
-  scp("$spooldir/passwd","root\@$nismachine:/etc/global/passwd")
-    == 0 or die "scp error: $!";
-  scp("$spooldir/shadow","root\@$nismachine:/etc/global/shadow")
-    == 0 or die "scp error: $!";
+  my $scp = new Net::SCP;
+  $scp->scp("$spooldir/passwd","root\@$nismachine:/etc/global/passwd")
+    or die "scp error: ". $scp->{errstr};
+  $scp->scp("$spooldir/shadow","root\@$nismachine:/etc/global/shadow")
+    or die "scp error: ". $scp->{errstr};
   ssh("root\@$nismachine",
     "( ".
       "cd /var/yp; make; ".
@@ -393,10 +399,11 @@ foreach $nismachine (@nismachines) {
 
 my($erpcdmachine);
 foreach $erpcdmachine (@erpcdmachines) {
-  scp("$spooldir/acp_passwd","root\@$erpcdmachine:/usr/annex/acp_passwd")
-    == 0 or die "scp error: $!";
-  scp("$spooldir/acp_dialup","root\@$erpcdmachine:/usr/annex/acp_dialup")
-    == 0 or die "scp error: $!";
+  my $scp = new Net::SCP;
+  $scp->scp("$spooldir/acp_passwd","root\@$erpcdmachine:/usr/annex/acp_passwd")
+    or die "scp error: ". $scp->{errstr};
+  $scp->scp("$spooldir/acp_dialup","root\@$erpcdmachine:/usr/annex/acp_dialup")
+    or die "scp error: ". $scp->{errstr};
   ssh("root\@$erpcdmachine",
     "( ".
       "kill -USR1 \`cat /usr/annex/erpcd.pid\'".
@@ -407,8 +414,9 @@ foreach $erpcdmachine (@erpcdmachines) {
 
 my($radiusmachine);
 foreach $radiusmachine (@radiusmachines) {
-  scp("$spooldir/users","root\@$radiusmachine:/etc/raddb/users")
-    == 0 or die "scp error: $!";
+  my $scp = new Net::SCP;
+  $scp->scp("$spooldir/users","root\@$radiusmachine:/etc/raddb/users")
+    or die "scp error: ". $scp->{errstr};
   ssh("root\@$radiusmachine",
     "( ".
       "builddbm".
@@ -426,10 +434,14 @@ foreach my $icradiusmachine ( @icradiusmachines ) {
   sleep 2;
   print WRITER "LOCK TABLES radcheck WRITE, radreply WRITE;\n";
   foreach my $file ( glob("radcheck.*") ) {
-    scp($file,"root\@$machine:$icradius_mysqldest/$db/$file");
+    my $scp = new Net::SCP;
+    $scp->scp($file,"root\@$machine:$icradius_mysqldest/$db/$file")
+      or die "scp error: ". $scp->{errstr};
   }
   foreach my $file ( glob("radreply.*") ) {
-    scp($file,"root\@$machine:$icradius_mysqldest/$db/$file");
+    my $scp = new Net::SCP;
+    $scp->scp($file,"root\@$machine:$icradius_mysqldest/$db/$file")
+      or die "scp error: ". $scp->{errstr};
   }
   close WRITER;
 }
diff --git a/bin/svc_acct_sm.export b/bin/svc_acct_sm.export
index a0938caf2..d7a7840f1 100755
--- a/bin/svc_acct_sm.export
+++ b/bin/svc_acct_sm.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.export,v 1.9 2001-04-22 01:56:15 ivan Exp $
+# $Id: svc_acct_sm.export,v 1.10 2001-05-08 10:44:17 ivan Exp $
 # 
 # Create and export config files for sendmail, qmail
 #
@@ -42,7 +42,10 @@
 # /var/spool/freeside/conf and sendmail updates ivan@sisd.com 98-aug-14
 #
 # $Log: svc_acct_sm.export,v $
-# Revision 1.9  2001-04-22 01:56:15  ivan
+# Revision 1.10  2001-05-08 10:44:17  ivan
+# fix for OO Net::SCP
+#
+# Revision 1.9  2001/04/22 01:56:15  ivan
 # get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)
 #
 # Revision 1.8  2000/07/06 03:37:24  ivan
@@ -211,10 +214,11 @@ close VIRTUALDOMAINS;
 
 my($sendmailmachine);
 foreach $sendmailmachine (@sendmailmachines) {
-  scp("$spooldir/sendmail.cw","root\@$sendmailmachine:$sendmailconfigpath/sendmail.cw.new")
-    == 0 or die "scp error: $!";
-  scp("$spooldir/virtusertable","root\@$sendmailmachine:$sendmailconfigpath/virtusertable.new")
-    == 0 or die "scp error: $!";
+  my $scp = new Net::SCP;
+  $scp->scp("$spooldir/sendmail.cw","root\@$sendmailmachine:$sendmailconfigpath/sendmail.cw.new")
+    or die "scp error: ". $scp->{errstr};
+  $scp->scp("$spooldir/virtusertable","root\@$sendmailmachine:$sendmailconfigpath/virtusertable.new")
+    or die "scp error: ". $scp->{errstr};
   ssh("root\@$sendmailmachine",
     "( ".
       "mv $sendmailconfigpath/sendmail.cw.new $sendmailconfigpath/sendmail.cw; ".
@@ -227,12 +231,13 @@ foreach $sendmailmachine (@sendmailmachines) {
 
 my($qmailmachine);
 foreach $qmailmachine (@qmailmachines) {
-  scp("$spooldir/recipientmap","root\@$qmailmachine:/var/qmail/control/recipientmap")
-    == 0 or die "scp error: $!";
-  scp("$spooldir/virtualdomains","root\@$qmailmachine:/var/qmail/control/virtualdomains")
-    == 0 or die "scp error: $!";
-  scp("$spooldir/rcpthosts","root\@$qmailmachine:/var/qmail/control/rcpthosts")
-    == 0 or die "scp error: $!";
+  my $scp = new Net::SCP;
+  $scp->scp("$spooldir/recipientmap","root\@$qmailmachine:/var/qmail/control/recipientmap")
+    or die "scp error: ". $scp->{errstr};
+  $scp->scp("$spooldir/virtualdomains","root\@$qmailmachine:/var/qmail/control/virtualdomains")
+    or die "scp error: ". $scp->{errstr};
+  $scp->scp("$spooldir/rcpthosts","root\@$qmailmachine:/var/qmail/control/rcpthosts")
+    or die "scp error: ". $scp->{errstr};
   #ssh("root\@$qmailmachine","/etc/init.d/qmail restart")
   #  == 0 or die "ssh error: $!";
 }
-- 
cgit v1.2.1


From f41a78f519bfeb6ecd4e9cee271c42d2c27e717f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 15 May 2001 07:52:34 +0000
Subject: simple program to list all email addresses

---
 FS/bin/freeside-email | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100755 FS/bin/freeside-email

diff --git a/FS/bin/freeside-email b/FS/bin/freeside-email
new file mode 100755
index 000000000..c7ff41114
--- /dev/null
+++ b/FS/bin/freeside-email
@@ -0,0 +1,61 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use FS::UID qw(adminsuidsetup);
+use FS::Conf;
+use FS::Record qw(qsearch);
+use FS::svc_acct;
+
+&untaint_argv;	#what it sounds like  (eww)
+my $user = shift or die &usage;
+
+adminsuidsetup $user;
+
+my $conf = new FS::Conf;
+my $domain = $conf->config('domain');
+
+my @svc_acct = qsearch('svc_acct', {});
+my @usernames = map $_->username, @svc_acct;
+my @emails = map "$_\@$domain", @usernames;
+
+print join("\n", @emails), "\n";
+
+# subroutines
+
+sub untaint_argv {
+  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
+    #$ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
+    # Date::Parse
+    $ARGV[$_] =~ /^(.*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
+    $ARGV[$_]=$1;
+  }
+}
+
+sub usage {
+  die "Usage:\n\n  freeside-email user\n";
+}
+
+=head1 NAME
+
+freeside-email - Prints email addresses of all users on STDOUT
+
+=head1 SYNOPSIS
+
+  freeside-email user
+
+=head1 DESCRIPTION
+
+Prints the email addresses of all customers on STDOUT, separated by newlines.
+
+user: From the mapsecrets file - see config.html from the base documentation
+
+=head1 VERSION
+
+$Id: freeside-email,v 1.1 2001-05-15 07:52:34 ivan Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+=cut
+
-- 
cgit v1.2.1


From 09a19f9ad1cc89c96b672e1f17af1099f7b3e2a1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 May 2001 14:08:55 +0000
Subject: tyop

---
 FS/FS/domain_record.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 9b7081b2c..743f43c56 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -123,7 +123,7 @@ sub check {
     my $recdata = $self->recdata;
     $recdata =~ s/\s+/ /g;
     $recdata =~ /^([a-z0-9\.\-]+ [\w\-\+]+\.[a-z0-9\.\-]+ \( (\d+ ){5}\))$/
-      or return "Illegal data for SOA reocrd: $recdata";
+      or return "Illegal data for SOA record: $recdata";
     $self->recdata($1);
   } elsif ( $self->rectype eq 'NS' ) {
     $self->recdata =~ /^([a-z0-9\.\-]+)$/
@@ -156,7 +156,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: domain_record.pm,v 1.1 2000-02-03 05:16:52 ivan Exp $
+$Id: domain_record.pm,v 1.2 2001-05-18 14:08:55 ivan Exp $
 
 =head1 BUGS
 
@@ -172,7 +172,10 @@ L<FS::Record>, schema.html from the base documentation.
 =head1 HISTORY
 
 $Log: domain_record.pm,v $
-Revision 1.1  2000-02-03 05:16:52  ivan
+Revision 1.2  2001-05-18 14:08:55  ivan
+tyop
+
+Revision 1.1  2000/02/03 05:16:52  ivan
 beginning of DNS and Apache support
 
 
-- 
cgit v1.2.1


From 7d5a4fc43bd26705c3f4613b05bea6141864c9a9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 May 2001 16:43:28 +0000
Subject: oops, s/mx/MX/ noticed by "Shane Chrisp" <shane@2000cn.com.au>,
 thanks!

---
 FS/FS/svc_domain.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index a70c1a340..c533ee870 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -215,7 +215,7 @@ sub insert {
         'svcnum'  => $self->svcnum,
         'reczone' => '@',
         'recaf'   => 'IN',
-        'rectype' => 'mx',
+        'rectype' => 'MX',
         'recdata' => $mxmachine,
       };
       my $error = $mx->insert;
@@ -478,7 +478,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.10 2001-04-22 01:56:15 ivan Exp $
+$Id: svc_domain.pm,v 1.11 2001-05-22 16:43:28 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 8fcfb44709aa2e4114aac9f4efae15abfdbe26a6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 May 2001 13:47:07 +0000
Subject: bugfix for defaultcountry

---
 htdocs/edit/cust_main.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index b3d9f0d80..9c61c654e 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.28 2000-12-26 23:51:40 ivan Exp $
+# $Id: cust_main.cgi,v 1.29 2001-05-23 13:47:07 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.28  2000-12-26 23:51:40  ivan
+# Revision 1.29  2001-05-23 13:47:07  ivan
+# bugfix for defaultcountry
+#
+# Revision 1.28  2000/12/26 23:51:40  ivan
 # statedefault & referraldefault config files
 #
 # Revision 1.27  2000/12/03 13:45:15  ivan
@@ -335,7 +338,7 @@ END
 $cust_main->country( $conf->config('countrydefault') || 'US' )
   unless $cust_main->country;
 $cust_main->state( $conf->config('statedefault') || 'CA' )
-  unless $cust_main->state;
+  unless $cust_main->state || $cust_main->country ne 'US';
 foreach ( qsearch('cust_main_county',{}) ) {
   print "<OPTION";
   print " SELECTED" if ( $cust_main->state eq $_->state
-- 
cgit v1.2.1


From 994ce98f176125b73d7119c51512f3574b90b29c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 May 2001 14:04:04 +0000
Subject: setting up at least one referral is not optional

---
 htdocs/docs/admin.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/admin.html b/htdocs/docs/admin.html
index b6665e05e..be53c0950 100644
--- a/htdocs/docs/admin.html
+++ b/htdocs/docs/admin.html
@@ -44,7 +44,7 @@
   define tax information for your locale by clicking on the "View/Edit  
   locales and tax rates" link on the Freeside main menu.
 
-  <li>Finally, you may optionally set up a referral by clicking on the
+  <li>Finally, set up at least one referral by clicking on the
   "View/Edit referrals" link in the Freeside main menu.  Referrals
   will help you keep track of how effective your advertising is, by
   helping you keep track of where customers heard of your service
-- 
cgit v1.2.1


From 623ac7ec862d2b72dd79f8158f91af3f08ed27ac Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 25 May 2001 00:36:19 +0000
Subject: tyop forgot closing </a>

---
 htdocs/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 30354deb8..8fadc1088 100644
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -31,7 +31,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=FreezeThaw">FreezeThaw</a>
       <li><a href="http://search.cpan.org/search?dist=String-Approx">String-Approx</a>
       <li><a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>
-      <li><a href="http://search.cpan.org/search?dist=DBI">DBI
+      <li><a href="http://search.cpan.org/search?dist=DBI">DBI</a>
       <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a>
       <li><a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>
       <li><a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>
-- 
cgit v1.2.1


From 23346364fce20eea6d801b1aae093a56c38fe066 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 30 May 2001 14:42:11 +0000
Subject: Adam Rose <adamr@eaze.net>: "In the /edit/part_svc.cgi is there a
 need to add another section for svc_www?".  Yes.  Thanks Adam.

---
 htdocs/edit/part_svc.cgi | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/htdocs/edit/part_svc.cgi b/htdocs/edit/part_svc.cgi
index 4c70f0762..e82306d74 100755
--- a/htdocs/edit/part_svc.cgi
+++ b/htdocs/edit/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.13 2000-06-15 11:10:31 ivan Exp $
+# $Id: part_svc.cgi,v 1.14 2001-05-30 14:42:11 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,11 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.13  2000-06-15 11:10:31  ivan
+# Revision 1.14  2001-05-30 14:42:11  ivan
+# Adam Rose <adamr@eaze.net>: "In the /edit/part_svc.cgi is there a need to add
+# another section for svc_www?".  Yes.  Thanks Adam.
+#
+# Revision 1.13  2000/06/15 11:10:31  ivan
 # update to the inline documentation, hopefully will make things more clear
 #
 # Revision 1.12  1999/04/09 04:22:34  ivan
@@ -97,6 +101,7 @@ Services are items you offer to your customers.
 <UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
     <LI>svc_domain - Virtual domains
     <LI>svc_acct_sm - Virtual domain mail aliasing
+    <LI>svc_www - Virtual domain website
 END
 #    <LI>svc_charge - One-time charges (Partially unimplemented)
 #    <LI>svc_wo - Work orders (Partially unimplemented)
@@ -111,7 +116,7 @@ blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
 END
 print &table(), '<TR><TH>Table<SELECT NAME="svcdb" SIZE=1>',
       map '<OPTION'. ' SELECTED'x($_ eq $hashref->{svcdb}). ">$_\n", qw(
-        svc_acct svc_domain svc_acct_sm
+        svc_acct svc_domain svc_acct_sm svc_www
       );
       print "</SELECT>";
 #  svc_acct svc_domain svc_acct_sm svc_charge svc_wo
@@ -151,11 +156,15 @@ END
     'worker'    => 'Worker',
     '_date'      => 'Date',
   },
+  'svc_www' => {
+    #'recnum' => '',
+    #'usersvc' => '',
+  },
 );
 
 #  svc_acct svc_domain svc_acct_sm svc_charge svc_wo
 foreach $svcdb ( qw(
-  svc_acct svc_domain svc_acct_sm
+  svc_acct svc_domain svc_acct_sm svc_www
 ) ) {
 
   my(@rows)=map { /^${svcdb}__(.*)$/; $1 }
-- 
cgit v1.2.1


From 08cc56589e213542a72060234bdad49fbfeb67c2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 30 May 2001 15:17:08 +0000
Subject: use Apache inside an eval BLOCK was mucking things up for the
 non-mod_perl folks

---
 FS/FS/CGI.pm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 198477ce6..6078ad96b 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -121,13 +121,11 @@ Sends headers and an HTML error message, then exits.
 =cut
 
 sub eidiot {
-  #warn "eidiot depriciated";
+  warn "eidiot depriciated";
   idiot(@_);
   if (exists $ENV{MOD_PERL}) {
-    eval {
-      use Apache;
-      Apache::exit();
-    };
+    require Apache;
+    Apache::exit();
   } else {
     exit;
   }
-- 
cgit v1.2.1


From 5928d6721ca5328d9a687d914296a2dcc3156a11 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Jun 2001 10:51:54 +0000
Subject: fixes "Error reval-ing" and won't bill errors

---
 FS/FS/cust_main.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 00ddc828e..2d7dae41f 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -608,6 +608,9 @@ sub bill {
     my $setup = 0;
     unless ( $cust_pkg->setup ) {
       my $setup_prog = $part_pkg->getfield('setup');
+      $setup_prog =~ /^(.*)$/ #presumably trusted
+        or die "Illegal setup for package ". $cust_pkg->pkgnum. ": $setup_prog";
+      $setup_prog = $1;
       my $cpt = new Safe;
       #$cpt->permit(); #what is necessary?
       $cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
@@ -629,6 +632,9 @@ sub bill {
          ( $cust_pkg->getfield('bill') || 0 ) < $time
     ) {
       my $recur_prog = $part_pkg->getfield('recur');
+      $recur_prog =~ /^(.*)$/ #presumably trusted
+        or die "Illegal recur for package ". $cust_pkg->pkgnum. ": $recur_prog";
+      $recur_prog = $1;
       my $cpt = new Safe;
       #$cpt->permit(); #what is necessary?
       $cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
@@ -1119,7 +1125,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.13 2001-05-07 02:07:38 ivan Exp $
+$Id: cust_main.pm,v 1.14 2001-06-03 10:51:54 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 2c648caa66eca3dc34e63009ba5accc4e98ec75f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Jun 2001 11:27:00 +0000
Subject: track down

  Can't locate object method "setfield" via package "svc_acct_sm" at
  /usr/local/lib/perl5/site_perl/5.005/FS/Record.pm line 318.

errors
---
 FS/FS/Record.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index f88be8b00..861f2c46b 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -315,6 +315,8 @@ sub AUTOLOAD {
   my($field)=$AUTOLOAD;
   $field =~ s/.*://;
   if ( defined($value) ) {
+    confess "errant AUTOLOAD $field for $self (arg $value)"
+      unless $self->can('setfield');
     $self->setfield($field,$value);
   } else {
     $self->getfield($field);
@@ -915,7 +917,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.16 2001-05-07 15:42:02 ivan Exp $
+$Id: Record.pm,v 1.17 2001-06-03 11:27:00 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 71a3746e52903b26baf7246d38bd46349a5b10cb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Jun 2001 11:37:08 +0000
Subject: fixes

Can't locate object method "setfield" via package "svc_acct_sm" at
/usr/local/lib/perl5/site_perl/5.005/FS/Record.pm line 318
---
 FS/FS/svc_acct.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 79104b883..774b8d0ee 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -7,7 +7,7 @@ use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
              @saltset @pw_set);
 use Carp;
 use FS::Conf;
-use FS::Record qw( qsearchs fields );
+use FS::Record qw( qsearch qsearchs fields );
 use FS::svc_Common;
 use Net::SSH qw(ssh);
 use FS::part_svc;
@@ -536,7 +536,7 @@ sub radius_check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.15 2001-04-22 01:56:15 ivan Exp $
+$Id: svc_acct.pm,v 1.16 2001-06-03 11:37:08 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 6bad87c25d14ca38162948f44a8379c8040ca50a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Jun 2001 11:40:48 +0000
Subject: inline doc clarification

---
 htdocs/view/cust_main.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index ff169fdae..7c96ddffa 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.19 2001-04-22 01:38:39 ivan Exp $
+# $Id: cust_main.cgi,v 1.20 2001-06-03 11:40:48 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -31,7 +31,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.19  2001-04-22 01:38:39  ivan
+# Revision 1.20  2001-06-03 11:40:48  ivan
+# inline doc clarification
+#
+# Revision 1.19  2001/04/22 01:38:39  ivan
 # svc_domain needs to import dbh sub from Record
 # view/cust_main.cgi needs to use ->owed method, not check (depriciated) owed field
 # search/cust_bill.cgi redirect error when there's only one invoice
@@ -248,7 +251,7 @@ print "</TABLE></TD></TR></TABLE></TD></TR></TABLE>";
 
 print qq!<BR><BR><A NAME="cust_pkg">Packages</A> !,
 #      qq!<BR>Click on package number to view/edit package.!,
-      qq!( <A HREF="!, popurl(2), qq!edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> )!,
+      qq!( <A HREF="!, popurl(2), qq!edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> (preserves services) )!,
 ;
 
 #display packages
-- 
cgit v1.2.1


From 4d23190fe52f0c3c5071c806187a524ecfa52cdd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Jun 2001 12:36:10 +0000
Subject: add username-letter and username-letterfirst config files

---
 FS/FS/svc_acct.pm       | 12 +++++++++---
 htdocs/docs/config.html |  2 ++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 774b8d0ee..0e0c88541 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -2,7 +2,7 @@ package FS::svc_acct;
 
 use strict;
 use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
-             $usernamemax $passwordmin
+             $usernamemax $passwordmin $username_letter $username_letterfirst
              $shellmachine $useradd $usermod $userdel 
              @saltset @pw_set);
 use Carp;
@@ -46,6 +46,8 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
                     'rm -rf $old_dir'.
                   ')';
   }
+  $username_letter = $conf->exists('username-letter');
+  $username_letterfirst = $conf->exists('username-letterfirst');
 };
 
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
@@ -381,7 +383,11 @@ sub check {
   $recref->{username} =~ /^([a-z0-9_\-\.]{$usernamemin,$ulen})$/
     or return "Illegal username";
   $recref->{username} = $1;
-  $recref->{username} =~ /[a-z]/ or return "Illegal username";
+  if ( $username_letterfirst ) {
+    $recref->{username} =~ /^[a-z]/ or return "Illegal username";
+  } elsif ( $username_letter ) {
+    $recref->{username} =~ /[a-z]/ or return "Illegal username";
+  }
 
   $recref->{popnum} =~ /^(\d*)$/ or return "Illegal popnum: ".$recref->{popnum};
   $recref->{popnum} = $1;
@@ -536,7 +542,7 @@ sub radius_check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.16 2001-06-03 11:37:08 ivan Exp $
+$Id: svc_acct.pm,v 1.17 2001-06-03 12:36:10 ivan Exp $
 
 =head1 BUGS
 
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index b255ce30e..49be7200b 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -99,6 +99,8 @@ All further configuration files and directories are located in
   <li><a name="textradiusprepend">textradiusprepend</a> - The contents of this file will be prepended to the first line of a user's RADIUS entry in text exports.  If necessary, usually `Auth-Type = Local, '.
   <li><a name="usernamemin">usernamemin</a> - Minimum username length (default 2);
   <li><a name="usernamemax">usernamemax</a> - Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)
+  <li><a name="usernamemax">username-letter</a> - The existance of this file will turn on the requirement that usernames contain at least one letter.
+  <li><a name="usernamemax">username-letterfirst</a> - The existance of this file will turn on the requirement that usernames start with a letter.
 </ul>
 </body>
 
-- 
cgit v1.2.1


From 8c7bd747b39f0fec96689236f4bc879cf4171360 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Jun 2001 14:15:52 +0000
Subject: yes yes

---
 TODO | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 593f4e989..eb18860b3 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.63 2001-04-22 01:38:38 ivan Exp $
+$Id: TODO,v 1.64 2001-06-03 14:15:52 ivan Exp $
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
@@ -6,6 +6,15 @@ ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
 ---
 
+"Andrew Wafula" <awafula2000@yahoo.co.uk>:
+> Following my recent questions on money_char, i would like to suggest that
+> money_char be used as well in cust_bill.cgi and cust_main.cgi so that the
+> charges are seen in whatever money_char is used in a particular country
+> instead of the default dollar currecny. This would make it such that the
+> system has one monetary unit in its entirety rather than only for the
+> invoicing part. I guess this would be something others would appreciate as
+> well.
+
 Things that would be nice but probably won't happen: testing with 
 MySQL+Sleepycat, a fix for the long-RADIUS-attributes-with Pg problem,    
 passive session monitoring with RADIUS (tailing a log file or monitoring a
-- 
cgit v1.2.1


From 42a5e04d9d5520be1fe22b8c0062a39d374a1c3e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Jun 2001 14:16:11 +0000
Subject: allow empty refund reasons

---
 bin/fs-setup | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 545c6a4df..c1e87c8d6 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.36 2001-04-15 12:56:31 ivan Exp $
+# $Id: fs-setup,v 1.37 2001-06-03 14:16:11 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.36  2001-04-15 12:56:31  ivan
+# Revision 1.37  2001-06-03 14:16:11  ivan
+# allow empty refund reasons
+#
+# Revision 1.36  2001/04/15 12:56:31  ivan
 # s/dbdef/DBIx::DBSchema/
 #
 # Revision 1.35  2001/04/15 09:36:43  ivan
@@ -422,7 +425,7 @@ sub tables_hash_hack {
         '_date',    @date_type,
         'amount',   @money_type,
         'otaker',   'varchar', '', 8,
-        'reason',   'varchar', '', 255,
+        'reason',   'varchar', 'NULL', 255,
       ],
       'primary_key' => 'crednum',
       'unique' => [ [] ],
-- 
cgit v1.2.1


From d290c05de27caa73bf26b7707184eb4fbdf9c281 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Jun 2001 14:16:19 +0000
Subject: 1.3.1!!!

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index dab32d607..4687ed411 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Freeside, (1.3.0)
+Freeside 1.3.1
 
 Copyright (C) 2000,2001 Ivan Kohler
 Copyright (C) 1999 Silicon Interactive Software Design
-- 
cgit v1.2.1


From 9efe6179dbaa549605098c8aeaca7b702bb72f42 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Jun 2001 14:21:36 +0000
Subject: 1.3.1!!!

---
 htdocs/docs/index.html    |  1 +
 htdocs/docs/upgrade7.html | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 htdocs/docs/upgrade7.html

diff --git a/htdocs/docs/index.html b/htdocs/docs/index.html
index 7e3725b61..bed5716ef 100644
--- a/htdocs/docs/index.html
+++ b/htdocs/docs/index.html
@@ -12,6 +12,7 @@
   <li><a href="upgrade4.html">Upgrading from 1.2.x to 1.2.2</a>
   <li><a href="upgrade5.html">Upgrading from 1.2.2 to 1.2.3</a>
   <li><a href="upgrade6.html">Upgrading from 1.2.3 to 1.3.0</a>
+  <li><a href="upgrade6.html">Upgrading from 1.3.0 to 1.3.1</a>
   <li><a href="config.html">Configuration files</a>
   <li><a href="admin.html">Administration</a>
 <!--
diff --git a/htdocs/docs/upgrade7.html b/htdocs/docs/upgrade7.html
new file mode 100644
index 000000000..d9dcfe2ae
--- /dev/null
+++ b/htdocs/docs/upgrade7.html
@@ -0,0 +1,24 @@
+<head>
+  <title>Upgrading to 1.3.1</title>
+</head>
+<body>
+<h1>Upgrading to 1.3.1 from 1.3.0</h1>
+<ul>
+  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
+  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
+  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
+  <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
+  <li>If migrating from less than 1.2.3, see these <a href="upgrade5.html">instructions</a> first.
+  <li>If migrating from less than 1.3.0, see these <a href="upgrade6.html">instructions</a> first.
+  <li>Back up your data and current Freeside installation.
+  <li>Copy or symlink htdocs to the new copy.
+  <li>Change to the FS directory in the new tarball, and build and install the
+      Perl modules:
+    <pre>
+$ cd FS/
+$ perl Makefile.PL
+$ make
+$ su
+# make install UNINST=1</pre>
+  <li>Run bin/dbdef-create.
+</body>
-- 
cgit v1.2.1


From dcea7c60c75544055ee1add9fcd70d0af6863c47 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Jun 2001 14:29:39 +0000
Subject: oops!

---
 htdocs/docs/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/index.html b/htdocs/docs/index.html
index bed5716ef..83e3b3e02 100644
--- a/htdocs/docs/index.html
+++ b/htdocs/docs/index.html
@@ -12,7 +12,7 @@
   <li><a href="upgrade4.html">Upgrading from 1.2.x to 1.2.2</a>
   <li><a href="upgrade5.html">Upgrading from 1.2.2 to 1.2.3</a>
   <li><a href="upgrade6.html">Upgrading from 1.2.3 to 1.3.0</a>
-  <li><a href="upgrade6.html">Upgrading from 1.3.0 to 1.3.1</a>
+  <li><a href="upgrade7.html">Upgrading from 1.3.0 to 1.3.1</a>
   <li><a href="config.html">Configuration files</a>
   <li><a href="admin.html">Administration</a>
 <!--
-- 
cgit v1.2.1


From e006c6e8ce11b3db53d5cd88b81092bf727f3080 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Jun 2001 17:22:52 +0000
Subject: SOA serial number problem with Date::Format %e: no leading zero

---
 FS/FS/svc_domain.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index c533ee870..01aa21a6c 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -186,7 +186,7 @@ sub insert {
       'reczone' => '@',
       'recaf'   => 'IN',
       'rectype' => 'SOA',
-      'recdata' => "$soamachine $soaemail ( ". time2str("%Y%m%e", time). "00 ".
+      'recdata' => "$soamachine $soaemail ( ". time2str("%Y%m%d", time). "00 ".
                    "$soarefresh $soaretry $soaexpire $soadefaultttl )"
     };
     $error = $soa->insert;
@@ -478,7 +478,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.11 2001-05-22 16:43:28 ivan Exp $
+$Id: svc_domain.pm,v 1.12 2001-06-03 17:22:52 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From e1ae1a59b53ec391cc1b9442afd4b9f1f0f31730 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Jun 2001 21:40:55 +0000
Subject: add deb packaging foo (doesn't work yet)

---
 debian/README.Debian       |   6 ++
 debian/changelog           |   9 +++
 debian/conffiles.ex        |   7 +++
 debian/control             |  82 ++++++++++++++++++++++++++
 debian/copyright           |  10 ++++
 debian/cron.d.ex           |   4 ++
 debian/dirs                |   2 +
 debian/docs                |   3 +
 debian/ex.doc-base.package |  22 +++++++
 debian/freeside-doc.docs   |   2 +
 debian/freeside-doc.files  |   2 +
 debian/init.d.ex           |  70 ++++++++++++++++++++++
 debian/manpage.1.ex        |  60 +++++++++++++++++++
 debian/manpage.sgml.ex     | 143 +++++++++++++++++++++++++++++++++++++++++++++
 debian/menu.ex             |   2 +
 debian/postinst.ex         |  47 +++++++++++++++
 debian/postrm.ex           |  36 ++++++++++++
 debian/preinst.ex          |  42 +++++++++++++
 debian/prerm.ex            |  37 ++++++++++++
 debian/rules               | 113 +++++++++++++++++++++++++++++++++++
 debian/watch.ex            |   5 ++
 21 files changed, 704 insertions(+)
 create mode 100644 debian/README.Debian
 create mode 100644 debian/changelog
 create mode 100644 debian/conffiles.ex
 create mode 100644 debian/control
 create mode 100644 debian/copyright
 create mode 100644 debian/cron.d.ex
 create mode 100644 debian/dirs
 create mode 100644 debian/docs
 create mode 100644 debian/ex.doc-base.package
 create mode 100644 debian/freeside-doc.docs
 create mode 100644 debian/freeside-doc.files
 create mode 100644 debian/init.d.ex
 create mode 100644 debian/manpage.1.ex
 create mode 100644 debian/manpage.sgml.ex
 create mode 100644 debian/menu.ex
 create mode 100644 debian/postinst.ex
 create mode 100644 debian/postrm.ex
 create mode 100644 debian/preinst.ex
 create mode 100644 debian/prerm.ex
 create mode 100755 debian/rules
 create mode 100644 debian/watch.ex

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 000000000..b51eee8d5
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,6 @@
+freeside for Debian
+-------------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Ivan Kohler <ivan-debian@420.am>, Thu, 12 Apr 2001 15:49:17 -0700
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000000000..5734b1fc8
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,9 @@
+freeside (1.3.1-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Ivan Kohler <ivan-debian@420.am>  Thu, 12 Apr 2001 15:49:17 -0700
+
+Local variables:
+mode: debian-changelog
+End:
diff --git a/debian/conffiles.ex b/debian/conffiles.ex
new file mode 100644
index 000000000..8686d2af8
--- /dev/null
+++ b/debian/conffiles.ex
@@ -0,0 +1,7 @@
+#
+# If you want to use this conffile, remove all comments and put files that
+# you want dpkg to process here using their absolute pathnames.
+# See section 9.1 of the packaging manual.
+#
+# for example:
+# /etc/freeside/freeside.conf
diff --git a/debian/control b/debian/control
new file mode 100644
index 000000000..2f66fd395
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,82 @@
+Source: freeside
+Section: admin
+Priority: optional
+Maintainer: Ivan Kohler <ivan-debian@420.am>
+Build-Depends: debhelper (>> 3.0.0)
+Standards-Version: 3.5.2
+
+Package: freeside
+Architecture: any
+Depends: freeside-lib
+Recommends: freeside-doc, freeside-ui-webui, libterm-query-perl
+Suggests: freeside-passwd-server, freeside-signup-server, freeside-session-server
+Description: Billing and administration package for ISPs.
+ Freeside is a billing and account administration package for ISPs.  It stores
+ customer information in an SQL database, and will update UNIX passwd and
+ shadow files, and configuration for sendmail, qmail, BIND and/or Apache.
+ It is also useful as a central database of accounts/domains/web-space
+ for a large number of machines.
+
+Package: freeside-doc
+Architecture: all
+Description: Documentation for freeside
+ This package provides the HTML documentation for Freeside, a billing and
+ account administration package for ISPs.
+
+Package: freeside-lib
+Architecture: all
+Depends: libdigest-md5-perl, liburi-perl, libhtml-parser-perl, libnet-perl, liblocale-codes-perl, libnet-whois-perl, libwww-perl, libbusiness-creditcard-perl, mailtools, libtimedate-perl, libdate-manip-perl, libfile-counterfile-perl, libfreezethaw-perl, libtext-template-perl, libdbd-pg-perl
+Description: Freeside libraries and extension API
+ This package contains the libraries which implement the business logic and
+ backend functions of Freeside, a billing and account administration package
+ for ISPs.  This package also contains the manual pages for the library API.
+
+Package: freeside-ui-web
+Architecture: all
+Depends: libstring-approx-perl, freeside-lib, libapache-mod-perl|apache-perl
+Suggests: libapache-mod-ssl|apache-ssl
+Description: Easy-to-use web interface for Freeside
+ This package contains the web interface for Freeside, a billing and account
+ administration package for ISPs.  This is what sales or support folks will
+ typically use to add new accounts, edit exiting accounts and so on.
+
+Package: freeside-passwd-server
+Architecture: all
+Depends: freeside-lib
+Description: Freeside password server 
+ This component of Freeside, a billing and account administration package for
+ ISPs, 
+
+Package: freeside-passwd-client
+Architecture: all
+Depends: 
+Description: 
+ <rar>
+
+Package: freeside-signup-server
+Architecture: all
+Depends: freeside-lib
+Description:
+ <rar>
+
+Package: freeside-signup-client
+Architecture: all
+Depends: 
+Description:
+ <rar>
+
+Package: freeside-signup-client-webui
+Architecture: all
+Depends: freeside-signup-client-lib, httpd
+Description: 
+ <rar>
+
+Package: freeside-session-server
+Architecture: all
+Depends: freeside-lib
+Description:
+ <rar>
+
+Package: freeside-session-client
+Architecture: all
+Depends: ssh
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000000000..e148fcec5
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,10 @@
+This package was debianized by Ivan Kohler <ivan-debian@420.am> on
+Thu, 12 Apr 2001 15:49:17 -0700.
+
+It was downloaded from <fill in ftp site>
+
+Upstream Author(s): <put author(s) name and email here>
+
+Copyright:
+
+<Must follow here>
diff --git a/debian/cron.d.ex b/debian/cron.d.ex
new file mode 100644
index 000000000..61c074da3
--- /dev/null
+++ b/debian/cron.d.ex
@@ -0,0 +1,4 @@
+#
+# Regular cron jobs for the freeside package
+#
+0 4	* * *	root	freeside_maintenance
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 000000000..ca882bbb7
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 000000000..16636bd92
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+INSTALL
+README
+TODO
diff --git a/debian/ex.doc-base.package b/debian/ex.doc-base.package
new file mode 100644
index 000000000..2a055d199
--- /dev/null
+++ b/debian/ex.doc-base.package
@@ -0,0 +1,22 @@
+Document: freeside
+Title: Debian freeside Manual
+Author: <insert document author here>
+Abstract: This manual describes what freeside is
+ and how it can be used to
+ manage online manuals on Debian systems.
+Section: unknown
+
+Format: debiandoc-sgml
+Files: /usr/share/doc/freeside/freeside.sgml.gz
+
+Format: postscript
+Files: /usr/share/doc/freeside/freeside.ps.gz
+
+Format: text
+Files: /usr/share/doc/freeside/freeside.text.gz
+
+Format: HTML
+Index: /usr/share/doc/freeside/html/index.html
+Files: /usr/share/doc/freeside/html/*.html
+
+  
diff --git a/debian/freeside-doc.docs b/debian/freeside-doc.docs
new file mode 100644
index 000000000..299950c58
--- /dev/null
+++ b/debian/freeside-doc.docs
@@ -0,0 +1,2 @@
+#DOCS#
+
diff --git a/debian/freeside-doc.files b/debian/freeside-doc.files
new file mode 100644
index 000000000..299950c58
--- /dev/null
+++ b/debian/freeside-doc.files
@@ -0,0 +1,2 @@
+#DOCS#
+
diff --git a/debian/init.d.ex b/debian/init.d.ex
new file mode 100644
index 000000000..57910493a
--- /dev/null
+++ b/debian/init.d.ex
@@ -0,0 +1,70 @@
+#! /bin/sh
+#
+# skeleton	example file to build /etc/init.d/ scripts.
+#		This file should be used to construct scripts for /etc/init.d.
+#
+#		Written by Miquel van Smoorenburg <miquels@cistron.nl>.
+#		Modified for Debian GNU/Linux
+#		by Ian Murdock <imurdock@gnu.ai.mit.edu>.
+#
+# Version:	@(#)skeleton  1.8  03-Mar-1998  miquels@cistron.nl
+#
+# This file was automatically customized by dh-make on Thu, 12 Apr 2001 15:49:17 -0700
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/freeside
+NAME=freeside
+DESC=freeside
+
+test -f $DAEMON || exit 0
+
+set -e
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
+		--exec $DAEMON
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
+		--exec $DAEMON
+	echo "$NAME."
+	;;
+  #reload)
+	#
+	#	If the daemon can reload its config files on the fly
+	#	for example by sending it SIGHUP, do it here.
+	#
+	#	If the daemon responds to changes in its config file
+	#	directly anyway, make this a do-nothing entry.
+	#
+	# echo "Reloading $DESC configuration files."
+	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
+	#	/var/run/$NAME.pid --exec $DAEMON
+  #;;
+  restart|force-reload)
+	#
+	#	If the "reload" option is implemented, move the "force-reload"
+	#	option to the "reload" entry above. If not, "force-reload" is
+	#	just the same as "restart".
+	#
+	echo -n "Restarting $DESC: "
+	start-stop-daemon --stop --quiet --pidfile \
+		/var/run/$NAME.pid --exec $DAEMON
+	sleep 1
+	start-stop-daemon --start --quiet --pidfile \
+		/var/run/$NAME.pid --exec $DAEMON
+	echo "$NAME."
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/debian/manpage.1.ex b/debian/manpage.1.ex
new file mode 100644
index 000000000..ec542bb05
--- /dev/null
+++ b/debian/manpage.1.ex
@@ -0,0 +1,60 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH FREESIDE SECTION "April 12, 2001"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+freeside \- program to do something
+.SH SYNOPSIS
+.B freeside
+.RI [ options ] " files" ...
+.br
+.B bar
+.RI [ options ] " files" ...
+.SH DESCRIPTION
+This manual page documents briefly the
+.B freeside
+and
+.B bar
+commands.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+Instead, it has documentation in the GNU Info format; see below.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBfreeside\fP is a program that...
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+For a complete description, see the Info files.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.SH SEE ALSO
+.BR bar (1),
+.BR baz (1).
+.br
+The programs are documented fully by
+.IR "The Rise and Fall of a Fooish Bar" ,
+available via the Info system.
+.SH AUTHOR
+This manual page was written by Ivan Kohler <ivan-debian@420.am>,
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/manpage.sgml.ex b/debian/manpage.sgml.ex
new file mode 100644
index 000000000..9bc3a8663
--- /dev/null
+++ b/debian/manpage.sgml.ex
@@ -0,0 +1,143 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>">
+  <!ENTITY dhsurname   "<surname>SURNAME</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>April 12, 2001</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>">
+  <!ENTITY dhemail     "<email>ivan-debian@420.am</email>">
+  <!ENTITY dhusername  "Ivan Kohler">
+  <!ENTITY dhucpackage "<refentrytitle>FREESIDE</refentrytitle>">
+  <!ENTITY dhpackage   "freeside">
+
+  <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2001</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>program to do something</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option>-e <replaceable>this</replaceable></option></arg>
+
+      <arg><option>--example <replaceable>that</replaceable></option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> and <command>bar</command>
+      commands.</para>
+
+    <para>This manual page was written for the &debian; distribution
+      because the original program does not have a manual page.
+      Instead, it has documentation in the &gnu;
+      <application>Info</application> format; see below.</para>
+
+    <para><command>&dhpackage;</command> is a program that...</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <para>These programs follow the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.  For a complete description, see the
+      <application>Info</application> files.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>-h</option>
+          <option>--help</option>
+        </term>
+        <listitem>
+          <para>Show summary of options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>
+          <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version of program.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>bar (1), baz (1).</para>
+
+    <para>The programs are documented fully by <citetitle>The Rise and
+      Fall of a Fooish Bar</citetitle> available via the
+      <application>Info</application> system.</para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the <acronym>GNU</acronym> Free Documentation
+      License, Version 1.1 or any later version published by the Free
+      Software Foundation; with no Invariant Sections, no Front-Cover
+      Texts and no Back-Cover Texts.</para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
diff --git a/debian/menu.ex b/debian/menu.ex
new file mode 100644
index 000000000..ddc947e9c
--- /dev/null
+++ b/debian/menu.ex
@@ -0,0 +1,2 @@
+?package(freeside):needs=X11|text|vc|wm section=Apps/see-menu-manual\
+  title="freeside" command="/usr/bin/freeside"
diff --git a/debian/postinst.ex b/debian/postinst.ex
new file mode 100644
index 000000000..c4d4bfba8
--- /dev/null
+++ b/debian/postinst.ex
@@ -0,0 +1,47 @@
+#! /bin/sh
+# postinst script for freeside
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/share/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+    configure)
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/postrm.ex b/debian/postrm.ex
new file mode 100644
index 000000000..bed8abd3d
--- /dev/null
+++ b/debian/postrm.ex
@@ -0,0 +1,36 @@
+#! /bin/sh
+# postrm script for freeside
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see /usr/share/doc/packaging-manual/
+
+case "$1" in
+       purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 0
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+
diff --git a/debian/preinst.ex b/debian/preinst.ex
new file mode 100644
index 000000000..0b42bb28f
--- /dev/null
+++ b/debian/preinst.ex
@@ -0,0 +1,42 @@
+#! /bin/sh
+# preinst script for freeside
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+#
+# For details see /usr/share/doc/packaging-manual/
+
+case "$1" in
+    install|upgrade)
+#        if [ "$1" = "upgrade" ]
+#        then
+#            start-stop-daemon --stop --quiet --oknodo  \
+#                --pidfile /var/run/freeside.pid  \
+#                --exec /usr/sbin/freeside 2>/dev/null || true
+#        fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/prerm.ex b/debian/prerm.ex
new file mode 100644
index 000000000..ebb87c540
--- /dev/null
+++ b/debian/prerm.ex
@@ -0,0 +1,37 @@
+#! /bin/sh
+# prerm script for freeside
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/share/doc/packaging-manual/
+
+case "$1" in
+    remove|upgrade|deconfigure)
+#       install-info --quiet --remove /usr/info/freeside.info.gz
+        ;;
+    failed-upgrade)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000000000..71016c406
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,113 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper. 
+# GNU copyright 1997 by Joey Hess.
+#
+# This version is for a hypothetical package that builds an
+# architecture-dependant package, as well as an architecture-independent
+# package.
+
+# Uncomment this to turn on verbose mode. 
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=3
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+	
+
+	touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+
+	dh_clean
+
+install: DH_OPTIONS=
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/freeside.
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/freeside
+
+	dh_movefiles
+
+# Build architecture-independent files here.
+# Pass -i to all debhelper commands in this target to reduce clutter.
+binary-indep: build install
+	dh_testdir -i
+	dh_testroot -i
+#	dh_installdebconf -i
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_installmenu -i
+#	dh_installlogrotate -i
+#	dh_installemacsen -i
+#	dh_installpam -i
+#	dh_installmime -i
+#	dh_installinit -i
+	dh_installcron -i
+#	dh_installman -i
+	dh_installinfo -i
+#	dh_undocumented -i
+	dh_installchangelogs  -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+#	dh_perl -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir -a
+	dh_testroot -a
+#	dh_installdebconf -a
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installmenu -a
+#	dh_installlogrotate -a
+#	dh_installemacsen -a
+#	dh_installpam -a
+#	dh_installmime -a
+#	dh_installinit -a
+	dh_installcron -a
+#	dh_installman -a
+	dh_installinfo -a
+#	dh_undocumented -a
+	dh_installchangelogs  -a
+	dh_strip -a
+	dh_link -a
+	dh_compress -a
+	dh_fixperms -a
+#	dh_makeshlibs -a
+	dh_installdeb -a
+#	dh_perl -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/watch.ex b/debian/watch.ex
new file mode 100644
index 000000000..3f57ae020
--- /dev/null
+++ b/debian/watch.ex
@@ -0,0 +1,5 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# Site		Directory		Pattern			Version	Script
+sunsite.unc.edu	/pub/Linux/Incoming	freeside-(.*)\.tar\.gz	debian	uupdate
-- 
cgit v1.2.1


From 44c6304b150b8c68cf6e40976a60b761ec19451c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 6 Jun 2001 22:22:13 +0000
Subject: templating thoughts

---
 TODO | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index eb18860b3..6f29f2262 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.64 2001-06-03 14:15:52 ivan Exp $
+$Id: TODO,v 1.65 2001-06-06 22:22:13 ivan Exp $
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
@@ -6,6 +6,25 @@ ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
 ---
 
+random templating thoughts:
+for starters, read the "Template Syntax" section of Text::Template
+that sums up the starting philosophy pretty well
+> Text::Template is unsuitable because it's backwards, but don't worry about
++that quite yet.  everything in that section applies
+..
+then ttp://forum.swarthmore.edu/epigone/modperl/frahthonbror/19990525144012.8806.qmail@plover.com
+..
+then: given that as background, freside will use a simple template syntax designed
++to interact well with the webmonkey html editors, and will export to Mason
++and Apache::ASP for starters, and eventually any "right-side-out" "eval"
++templating system
+
+
+make svc_acct.import complain if you try to use a local file
+
+make the invoices configurable such that:
+> Also, Can you change FreeSide so that it says "GST" instead of TAX?
+
 "Andrew Wafula" <awafula2000@yahoo.co.uk>:
 > Following my recent questions on money_char, i would like to suggest that
 > money_char be used as well in cust_bill.cgi and cust_main.cgi so that the
-- 
cgit v1.2.1


From 2c3bc7b78558ff868db86f292791dea3134e440e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Jun 2001 09:28:00 +0000
Subject: doc

---
 htdocs/docs/billing.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/docs/billing.html b/htdocs/docs/billing.html
index 7841bf776..ecb5e1799 100644
--- a/htdocs/docs/billing.html
+++ b/htdocs/docs/billing.html
@@ -22,7 +22,7 @@
         </ul>
     </ul>
     <li>You can bill individual customers by clicking on the <i>Bill now</i> link on the main customer view.
-    <li> The <b>freeside-bill</b> script can be run daily to bill all customers.  Usage:<pre>bill [ -c [ i ] ] [ -d <i>date</i> ] [ -b ] <i>user</i></pre>
+    <li> The <b>freeside-bill</b> script can be run daily to bill all customers.  Usage:<pre>freeside-bill [ -c [ i ] ] [ -d <i>date</i> ] [ -b ] <i>user</i></pre>
       <ul>
         <li>-c: Turn on collecting (you probably want this).
         <li>-i: Real-time billing (as opposed to bacth billing).  Only relevant for credit cards.
-- 
cgit v1.2.1


From e1ac5ad82d0a77d9aee14b275950642ef588db54 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Jun 2001 08:33:42 +0000
Subject: >     Use of uninitialized value in concatenation (.) at
 svc_acct.export line > 276.

---
 bin/svc_acct.export | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 1c3ffa243..822f70a9d 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.19 2001-05-08 10:44:17 ivan Exp $
+# $Id: svc_acct.export,v 1.20 2001-06-20 08:33:42 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,7 +38,11 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.19  2001-05-08 10:44:17  ivan
+# Revision 1.20  2001-06-20 08:33:42  ivan
+# >     Use of uninitialized value in concatenation (.) at svc_acct.export line
+# > 276.
+#
+# Revision 1.19  2001/05/08 10:44:17  ivan
 # fix for OO Net::SCP
 #
 # Revision 1.18  2001/04/22 01:56:15  ivan
@@ -118,7 +122,10 @@ if ( $icradiusmachines && $conf->exists('icradius_secrets') ) {
   $icradius_dbh = dbh;
 }
 
-my $textradiusprepend = $conf->config('textradiusprepend');
+my $textradiusprepend =
+  $conf->exists('textradiusprepend')
+    ? $conf->config('textradiusprepend')
+    : '';
 
 my(@saltset)= ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
 require 5.004; #srand(time|$$);
-- 
cgit v1.2.1


From 20149aef93d4f0f5425d9581a914fd8215c835d7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 21 Jun 2001 16:27:52 +0000
Subject: better error message

---
 FS/FS/UID.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index f5c4f6139..7ebe592c3 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -186,7 +186,8 @@ sub cgisetotaker {
   } elsif ( $cgi && $cgi->isa('Apache') ) {
     $user = lc ( $cgi->connection->user );
   } else {
-    die "fatal: Can't get REMOTE_USER! for cgi $cgi";
+    die "fatal: Can't get REMOTE_USER! for cgi $cgi - you need to setup ".
+        "Apache user authentication as documented in htdocs/docs/config.html";
   }
   $user;
 }
@@ -260,7 +261,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.6 2001-04-23 09:00:06 ivan Exp $
+$Id: UID.pm,v 1.7 2001-06-21 16:27:52 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 0028e270bcfc07c9e58104076c809bc5a3c76ccd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 24 Jul 2001 07:00:49 +0000
Subject: autocapnames never worked anyway

---
 htdocs/docs/config.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index 49be7200b..9282e826d 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -35,7 +35,6 @@ All further configuration files and directories are located in
   <li><a name="apacheroot">apacheroot</a> - The directory containing Apache virtual hosts
   <li><a name="apachemachine">apachemachine</a> - A machine with the apacheroot directory and user home directories.  The existance of this file enables setup of virtual host directories, and, in conjunction with the `home' configuration file, symlinks into user home directories.
   <li><a name="apachemachines">apachemachines</a> - Your Apache machines, one per line.  This enables export of `/etc/apache/vhosts.conf', which can be included in your Apache configuration via the <a href="http://www.apache.org/docs/mod/core.html#include">Include</a> directive.
-  <li><a name="autocapnames">autocapnames</a> - The presence of this file will cause Freeside to use Javascript in /htdocs/edit/cust_main.cgi to automatically capitalize the first and last names of customers.
   <li><a name="bindprimary">bindprimary</a> - Your BIND primary nameserver.  This enables export of /var/named/named.conf and zone files into /var/named
   <li><a name="bindsecondaries">bindsecondaries</a> - Your BIND secondary nameservers, one per line.  This enables export of /var/named/named.conf
   <li><a name="bsdshellmachines">bsdshellmachines</a> - Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/master.passwd'.
-- 
cgit v1.2.1


From 3ebf10b2e784390c7c3593b29886e980aff2ff5f Mon Sep 17 00:00:00 2001
From: thalakan <thalakan>
Date: Wed, 25 Jul 2001 01:06:02 +0000
Subject: Added documentation for cust_main_invoice.

---
 htdocs/docs/schema.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/docs/schema.html b/htdocs/docs/schema.html
index c06373b6b..a61000f1f 100644
--- a/htdocs/docs/schema.html
+++ b/htdocs/docs/schema.html
@@ -71,11 +71,11 @@
         <li>tax - tax exempt, Y or null
         <li>otaker - order taker
       </ul>
-    <li><a name="cust_main_invoice">cust_main_invoice</a> - Invoice destinations for email invoices
+    <li><a name="cust_main_invoice">cust_main_invoice</a> - Invoice destinations for email invoices.  Note that a customer can have many email destinations for their invoice (either literal or via svcnum), but only one postal destination.
       <ul>
         <li>destnum - primary key
         <li>custnum - <a href="#cust_main">customer</a>
-        <li>dest - Invoice destination: If numeric, a <a href="#svc_acct">svcnum</a>, if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)
+        <li>dest - Invoice destination.  Freeside supports three types of invoice delivery: send directly to a service defined in Freeside, send to an arbitrary email address, or print the invoice to a printer and have someone send it out via snail mail.  Freeside determines which method to use based on the contents of the dest field.  If the contents are numeric, a <a href="#svc_acct">svcnum</a> pointing to a valid service is expected in the field.  If the contents are a string, a literal email address is expected to be in the field.  If the special keyword `POST' is present, the snail mail method is used (which is the default if no cust_main_invoice records exist).  Snail mail invoices get their address information from <A name="#cust_main">cust_main</A> and are printed with the printer defined in the configuration files.
       </ul>
     <li><a name="cust_main_county">cust_main_county</a> - Tax rates
       <ul>
-- 
cgit v1.2.1


From 9b1aada27ca0d46931edb05a34a9885e2f253778 Mon Sep 17 00:00:00 2001
From: thalakan <thalakan>
Date: Fri, 27 Jul 2001 06:17:46 +0000
Subject: Documented some subtle behavior of the checkdest method.

---
 FS/FS/cust_main_invoice.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm
index 309691a43..d06a718e1 100644
--- a/FS/FS/cust_main_invoice.pm
+++ b/FS/FS/cust_main_invoice.pm
@@ -117,7 +117,9 @@ sub check {
 
 =item checkdest
 
-Checks the dest field only.
+Checks the dest field only.  If it finds that the account ends in the
+same domain configured in the configuration files, it will change the
+invoice destination from an email address to a service number instead.
 
 =cut
 
@@ -167,7 +169,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.2 2000-06-20 07:13:03 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.3 2001-07-27 06:17:46 thalakan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 1f74aa5510087acf5a8d0415f6efb690b0aa0c31 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 27 Jul 2001 17:16:25 +0000
Subject: clarification

---
 FS/FS/cust_main_invoice.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm
index d06a718e1..58542c688 100644
--- a/FS/FS/cust_main_invoice.pm
+++ b/FS/FS/cust_main_invoice.pm
@@ -118,8 +118,9 @@ sub check {
 =item checkdest
 
 Checks the dest field only.  If it finds that the account ends in the
-same domain configured in the configuration files, it will change the
-invoice destination from an email address to a service number instead.
+same domain configured as the B<domain> configuration file, it will change the
+invoice destination from an email address to a service number (see
+L<FS::svc_acct>).
 
 =cut
 
@@ -169,7 +170,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.3 2001-07-27 06:17:46 thalakan Exp $
+$Id: cust_main_invoice.pm,v 1.4 2001-07-27 17:16:25 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 6d49710a4eaaa51438b42059c2d97f1d99e7a243 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jul 2001 06:07:47 +0000
Subject: allow !! for locked accounts instead of changing to *SUSPENDED*

---
 bin/svc_acct.export |  8 ++++++--
 bin/svc_acct.import | 11 +++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 822f70a9d..7e92c61e8 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.20 2001-06-20 08:33:42 ivan Exp $
+# $Id: svc_acct.export,v 1.21 2001-07-30 06:07:46 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,7 +38,10 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.20  2001-06-20 08:33:42  ivan
+# Revision 1.21  2001-07-30 06:07:46  ivan
+# allow !! for locked accounts instead of changing to *SUSPENDED*
+#
+# Revision 1.20  2001/06/20 08:33:42  ivan
 # >     Use of uninitialized value in concatenation (.) at svc_acct.export line
 # > 276.
 #
@@ -191,6 +194,7 @@ foreach $svc_acct (@svc_acct) {
   my($cpassword,$rpassword);
   if ( ( length($password) <= 8 )
        && ( $password ne '*' )
+       && ( $password ne '!!' )
        && ( $password ne '' )
      ) {
     $cpassword=crypt($password,
diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index 2e51a8b2c..eaf0c03c5 100755
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.import,v 1.14 2001-05-07 15:24:15 ivan Exp $
+# $Id: svc_acct.import,v 1.15 2001-07-30 06:07:47 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -17,7 +17,10 @@
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 #
 # $Log: svc_acct.import,v $
-# Revision 1.14  2001-05-07 15:24:15  ivan
+# Revision 1.15  2001-07-30 06:07:47  ivan
+# allow !! for locked accounts instead of changing to *SUSPENDED*
+#
+# Revision 1.14  2001/05/07 15:24:15  ivan
 # s/!/*/
 #
 # Revision 1.13  2001/05/05 08:51:16  ivan
@@ -206,8 +209,8 @@ my(%password);
 while (<SHADOW>) {
   chop;
   my($username,$password)=split(/:/);
-  $password =~ s/^\!$/\*/;
-  $password =~ s/\!+/\*SUSPENDED\* /;
+  #$password =~ s/^\!$/\*/;
+  #$password =~ s/\!+/\*SUSPENDED\* /;
   $password{$username}=$password;
 }
 
-- 
cgit v1.2.1


From 0c6ad8b79dc68d779adf04256bb616f78d556505 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jul 2001 06:28:45 +0000
Subject: allow !! as password for disabled accounts

---
 FS/FS/svc_acct.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 0e0c88541..a22ecdf5e 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -479,6 +479,8 @@ sub check {
     $recref->{_password} = $1.$3;
   } elsif ( $recref->{_password} eq '*' ) {
     $recref->{_password} = '*';
+  } elsif ( $recref->{_password} eq '!!' ) {
+    $recref->{_password} = '!!';
   } else {
     return "Illegal password";
   }
@@ -542,7 +544,7 @@ sub radius_check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.17 2001-06-03 12:36:10 ivan Exp $
+$Id: svc_acct.pm,v 1.18 2001-07-30 06:28:45 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 3ce08c3b7960b2ade75126885186dd6bcfea3c9b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jul 2001 07:13:34 +0000
Subject: todocruft

---
 TODO | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/TODO b/TODO
index 6f29f2262..f9e685528 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.65 2001-06-06 22:22:13 ivan Exp $
+$Id: TODO,v 1.66 2001-07-30 07:13:34 ivan Exp $
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
@@ -6,6 +6,13 @@ ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
 ---
 
+> Does Freeside currently support notification to the customer that their
+> credit card on file is about to expire?
+> What about notification that their
+> credit card was declined after they sign up, say like in 5 months when it
+> fails?
+
+
 random templating thoughts:
 for starters, read the "Template Syntax" section of Text::Template
 that sums up the starting philosophy pretty well
@@ -48,18 +55,27 @@ write some sample billing expressions with libcflow-perl :)
 .
 (at least) These questions need to be answered for Mason, Apache::ASP and
 eperl.  If eperl becomes too much of a pain, I'm okay with forgetting 
-about it - it's not well-maintained.  The answers below are for Mason.
+about it - it's not well-maintained.
 .
-How do you interpolate a value?  <% $value %>
+How do you interpolate a value?
+mason: <% $value %>
+apache-asp(don't think there is a "with-escaping-HTML" way?): <%= $value %>
 .
-How do you interpolate a value without escaping HTML? <% $value |n %>
+How do you interpolate a value without escaping HTML?
+mason: <% $value |n %>
+apache-asp??: <%= $value %> 
 .
 How do you interpolate a (possibly non-stand-alone, non-interpolated) 
 control structure?  With an inital % - for example:
 .     
-        % for each $value ( @values ) {
+mason:
+        % foreach $value ( @values ) {
         <OPTION><% $value %></OPTION>
         % }
+apache-asp:
+        <% foreach $value ( @values ) { %>
+        <OPTION><%= $value %></OPTION>
+        <% } %>
 .     
 This is one of the things I worry that the webmonkey HTML editors will not
 like about Mason.  That and the <%INIT> and <%PERL> tags.
-- 
cgit v1.2.1


From e0ed290e529c0b9b3f29ef0c157b0d865347ddef Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jul 2001 07:14:56 +0000
Subject: templates!

---
 INSTALL | 2 +-
 README  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/INSTALL b/INSTALL
index ff2e43f4e..4b9b0853c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1 +1 @@
-See htdocs/docs/index.html
+See httemplate/docs/index.html
diff --git a/README b/README
index 4687ed411..91e625386 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Freeside 1.3.1
+Freeside 1.4.0
 
 Copyright (C) 2000,2001 Ivan Kohler
 Copyright (C) 1999 Silicon Interactive Software Design
@@ -32,7 +32,7 @@ Providers.
 
 The Freeside home page is at `http://www.sisd.com/freeside'.
 
-The documentation is in `htdocs/docs'.
+The documentation is in `httemplate/docs'.
 
 A mailing list for users is available.  Send a blank message to
 <ivan-freeside-subscribe@sisd.com> to subscribe.
-- 
cgit v1.2.1


From 9c2016b3a564d439960420114ce6f4cab3bf723b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jul 2001 07:34:41 +0000
Subject: podnitfix

---
 FS/FS/Record.pm   | 4 +++-
 FS/FS/svc_acct.pm | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 861f2c46b..646a57607 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -829,6 +829,8 @@ sub fields {
   $table_obj->columns;
 }
 
+=back
+
 =head1 SUBROUTINES
 
 =over 4
@@ -917,7 +919,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.17 2001-06-03 11:27:00 ivan Exp $
+$Id: Record.pm,v 1.18 2001-07-30 07:33:08 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index a22ecdf5e..4b7ec98c4 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -540,11 +540,11 @@ sub radius_check {
   } grep { /^rc_/ && $self->getfield($_) } fields( $self->table );
 }
 
-=cut
+=back
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.18 2001-07-30 06:28:45 ivan Exp $
+$Id: svc_acct.pm,v 1.19 2001-07-30 07:34:41 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 51984ac3d3da3006809c6866fdecd4ad83610731 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jul 2001 07:36:04 +0000
Subject: templates!!!

---
 bin/fs-setup                                       |  39 +-
 bin/masonize                                       |  70 ++++
 bin/pod2x                                          |   8 +-
 httemplate/browse/agent.cgi                        | 138 +++++++
 httemplate/browse/agent_type.cgi                   | 109 ++++++
 httemplate/browse/cust_main_county.cgi             | 108 ++++++
 httemplate/browse/nas.cgi                          |  95 +++++
 httemplate/browse/part_pkg.cgi                     | 114 ++++++
 httemplate/browse/part_referral.cgi                |  92 +++++
 httemplate/browse/part_svc.cgi                     |  60 +++
 httemplate/browse/svc_acct_pop.cgi                 | 101 +++++
 httemplate/docs/admin.html                         |  59 +++
 httemplate/docs/billing.html                       |  67 ++++
 httemplate/docs/config.html                        | 106 +++++
 httemplate/docs/export.html                        |  41 ++
 httemplate/docs/index.html                         |  32 ++
 httemplate/docs/install.html                       | 121 ++++++
 httemplate/docs/legacy.html                        |  34 ++
 httemplate/docs/man/FS.html                        | 138 +++++++
 httemplate/docs/man/FS/Bill.html                   |  32 ++
 httemplate/docs/man/FS/CGI.html                    |  95 +++++
 httemplate/docs/man/FS/CGIwrapper.html             |  16 +
 httemplate/docs/man/FS/Conf.html                   |  81 ++++
 httemplate/docs/man/FS/Invoice.html                |  32 ++
 httemplate/docs/man/FS/Record.html                 | 342 ++++++++++++++++
 httemplate/docs/man/FS/SessionClient.html          |  97 +++++
 httemplate/docs/man/FS/SignupClient.html           | 125 ++++++
 httemplate/docs/man/FS/UI/Base.html                | 100 +++++
 httemplate/docs/man/FS/UI/CGI.html                 |  94 +++++
 httemplate/docs/man/FS/UI/Gtk.html                 |  91 +++++
 httemplate/docs/man/FS/UI/agent.html               |  16 +
 httemplate/docs/man/FS/UID.html                    | 142 +++++++
 httemplate/docs/man/FS/agent.html                  | 121 ++++++
 httemplate/docs/man/FS/agent_type.html             | 126 ++++++
 httemplate/docs/man/FS/cust_bill.html              | 161 ++++++++
 httemplate/docs/man/FS/cust_bill_pkg.html          | 112 ++++++
 httemplate/docs/man/FS/cust_credit.html            | 118 ++++++
 httemplate/docs/man/FS/cust_main.html              | 279 +++++++++++++
 httemplate/docs/man/FS/cust_main_county.html       | 106 +++++
 httemplate/docs/man/FS/cust_main_invoice.html      | 114 ++++++
 httemplate/docs/man/FS/cust_pay.html               | 108 ++++++
 httemplate/docs/man/FS/cust_pay_batch.html         | 132 +++++++
 httemplate/docs/man/FS/cust_pkg.html               | 205 ++++++++++
 httemplate/docs/man/FS/cust_refund.html            | 108 ++++++
 httemplate/docs/man/FS/cust_svc.html               | 118 ++++++
 httemplate/docs/man/FS/domain_record.html          | 124 ++++++
 httemplate/docs/man/FS/nas.html                    | 117 ++++++
 httemplate/docs/man/FS/part_pkg.html               | 138 +++++++
 httemplate/docs/man/FS/part_referral.html          | 100 +++++
 httemplate/docs/man/FS/part_svc.html               | 110 ++++++
 httemplate/docs/man/FS/pkg_svc.html                | 115 ++++++
 httemplate/docs/man/FS/port.html                   | 120 ++++++
 httemplate/docs/man/FS/prepay_credit.html          | 118 ++++++
 httemplate/docs/man/FS/session.html                | 129 ++++++
 httemplate/docs/man/FS/svc_Common.html             |  94 +++++
 httemplate/docs/man/FS/svc_acct.html               | 219 +++++++++++
 httemplate/docs/man/FS/svc_acct_pop.html           | 107 +++++
 httemplate/docs/man/FS/svc_acct_sm.html            | 141 +++++++
 httemplate/docs/man/FS/svc_domain.html             | 162 ++++++++
 httemplate/docs/man/FS/svc_www.html                | 150 +++++++
 httemplate/docs/man/FS/type_pkgs.html              | 100 +++++
 httemplate/docs/passwd.html                        |  16 +
 httemplate/docs/postgresql.html                    |  23 ++
 httemplate/docs/schema.html                        | 277 +++++++++++++
 httemplate/docs/session.html                       |  54 +++
 httemplate/docs/signup.html                        |  57 +++
 httemplate/docs/trouble.html                       |  26 ++
 httemplate/docs/upgrade.html                       |  24 ++
 httemplate/docs/upgrade2.html                      |  11 +
 httemplate/docs/upgrade3.html                      |  40 ++
 httemplate/docs/upgrade4.html                      |  27 ++
 httemplate/docs/upgrade5.html                      |  34 ++
 httemplate/docs/upgrade6.html                      |  66 ++++
 httemplate/docs/upgrade7.html                      |  24 ++
 httemplate/docs/upgrade8.html                      |  82 ++++
 httemplate/edit/agent.cgi                          | 112 ++++++
 httemplate/edit/agent_type.cgi                     | 128 ++++++
 httemplate/edit/cust_credit.cgi                    | 125 ++++++
 httemplate/edit/cust_main.cgi                      | 432 +++++++++++++++++++++
 httemplate/edit/cust_main_county-expand.cgi        |  92 +++++
 httemplate/edit/cust_main_county.cgi               | 104 +++++
 httemplate/edit/cust_pay.cgi                       | 101 +++++
 httemplate/edit/cust_pkg.cgi                       | 171 ++++++++
 httemplate/edit/part_pkg.cgi                       | 180 +++++++++
 httemplate/edit/part_referral.cgi                  |  94 +++++
 httemplate/edit/part_svc.cgi                       | 218 +++++++++++
 httemplate/edit/process/agent.cgi                  |  73 ++++
 httemplate/edit/process/agent_type.cgi             | 100 +++++
 httemplate/edit/process/cust_credit.cgi            |  80 ++++
 httemplate/edit/process/cust_main.cgi              | 196 ++++++++++
 .../edit/process/cust_main_county-expand.cgi       | 104 +++++
 httemplate/edit/process/cust_main_county.cgi       |  64 +++
 httemplate/edit/process/cust_pay.cgi               |  71 ++++
 httemplate/edit/process/cust_pkg.cgi               |  84 ++++
 httemplate/edit/process/part_pkg.cgi               | 152 ++++++++
 httemplate/edit/process/part_referral.cgi          |  69 ++++
 httemplate/edit/process/part_svc.cgi               |  30 ++
 httemplate/edit/process/svc_acct.cgi               | 100 +++++
 httemplate/edit/process/svc_acct_pop.cgi           |  70 ++++
 httemplate/edit/process/svc_acct_sm.cgi            |  87 +++++
 httemplate/edit/process/svc_domain.cgi             |  84 ++++
 httemplate/edit/svc_acct.cgi                       | 232 +++++++++++
 httemplate/edit/svc_acct_pop.cgi                   | 106 +++++
 httemplate/edit/svc_acct_sm.cgi                    | 251 ++++++++++++
 httemplate/edit/svc_domain.cgi                     | 168 ++++++++
 httemplate/images/mid-logo.png                     | Bin 0 -> 9727 bytes
 httemplate/images/small-logo.png                   | Bin 0 -> 4781 bytes
 httemplate/index.html                              |  89 +++++
 httemplate/misc/bill.cgi                           |  62 +++
 httemplate/misc/cancel-unaudited.cgi               |  97 +++++
 httemplate/misc/cancel_pkg.cgi                     |  75 ++++
 httemplate/misc/delete-customer.cgi                |  62 +++
 httemplate/misc/expire_pkg.cgi                     |  65 ++++
 httemplate/misc/link.cgi                           |  89 +++++
 httemplate/misc/print-invoice.cgi                  |  55 +++
 httemplate/misc/process/delete-customer.cgi        |  50 +++
 httemplate/misc/process/link.cgi                   |  80 ++++
 httemplate/misc/susp_pkg.cgi                       |  68 ++++
 httemplate/misc/unsusp_pkg.cgi                     |  65 ++++
 httemplate/search/cust_bill.cgi                    | 180 +++++++++
 httemplate/search/cust_bill.html                   |  21 +
 httemplate/search/cust_main-payinfo.html           |  20 +
 httemplate/search/cust_main.cgi                    | 315 +++++++++++++++
 httemplate/search/cust_main.html                   |  36 ++
 httemplate/search/cust_pkg.cgi                     | 155 ++++++++
 httemplate/search/svc_acct.cgi                     | 211 ++++++++++
 httemplate/search/svc_acct.html                    |  21 +
 httemplate/search/svc_acct_sm.cgi                  | 144 +++++++
 httemplate/search/svc_acct_sm.html                 |  23 ++
 httemplate/search/svc_domain.cgi                   | 214 ++++++++++
 httemplate/search/svc_domain.html                  |  22 ++
 httemplate/view/cust_bill.cgi                      |  97 +++++
 httemplate/view/cust_main.cgi                      | 398 +++++++++++++++++++
 httemplate/view/cust_pkg.cgi                       | 210 ++++++++++
 httemplate/view/svc_acct.cgi                       | 181 +++++++++
 httemplate/view/svc_acct_sm.cgi                    | 132 +++++++
 httemplate/view/svc_domain.cgi                     | 106 +++++
 137 files changed, 14624 insertions(+), 5 deletions(-)
 create mode 100755 bin/masonize
 create mode 100755 httemplate/browse/agent.cgi
 create mode 100755 httemplate/browse/agent_type.cgi
 create mode 100755 httemplate/browse/cust_main_county.cgi
 create mode 100755 httemplate/browse/nas.cgi
 create mode 100755 httemplate/browse/part_pkg.cgi
 create mode 100755 httemplate/browse/part_referral.cgi
 create mode 100755 httemplate/browse/part_svc.cgi
 create mode 100755 httemplate/browse/svc_acct_pop.cgi
 create mode 100755 httemplate/docs/admin.html
 create mode 100644 httemplate/docs/billing.html
 create mode 100644 httemplate/docs/config.html
 create mode 100755 httemplate/docs/export.html
 create mode 100644 httemplate/docs/index.html
 create mode 100644 httemplate/docs/install.html
 create mode 100755 httemplate/docs/legacy.html
 create mode 100644 httemplate/docs/man/FS.html
 create mode 100644 httemplate/docs/man/FS/Bill.html
 create mode 100644 httemplate/docs/man/FS/CGI.html
 create mode 100644 httemplate/docs/man/FS/CGIwrapper.html
 create mode 100644 httemplate/docs/man/FS/Conf.html
 create mode 100644 httemplate/docs/man/FS/Invoice.html
 create mode 100644 httemplate/docs/man/FS/Record.html
 create mode 100644 httemplate/docs/man/FS/SessionClient.html
 create mode 100644 httemplate/docs/man/FS/SignupClient.html
 create mode 100644 httemplate/docs/man/FS/UI/Base.html
 create mode 100644 httemplate/docs/man/FS/UI/CGI.html
 create mode 100644 httemplate/docs/man/FS/UI/Gtk.html
 create mode 100644 httemplate/docs/man/FS/UI/agent.html
 create mode 100644 httemplate/docs/man/FS/UID.html
 create mode 100644 httemplate/docs/man/FS/agent.html
 create mode 100644 httemplate/docs/man/FS/agent_type.html
 create mode 100644 httemplate/docs/man/FS/cust_bill.html
 create mode 100644 httemplate/docs/man/FS/cust_bill_pkg.html
 create mode 100644 httemplate/docs/man/FS/cust_credit.html
 create mode 100644 httemplate/docs/man/FS/cust_main.html
 create mode 100644 httemplate/docs/man/FS/cust_main_county.html
 create mode 100644 httemplate/docs/man/FS/cust_main_invoice.html
 create mode 100644 httemplate/docs/man/FS/cust_pay.html
 create mode 100644 httemplate/docs/man/FS/cust_pay_batch.html
 create mode 100644 httemplate/docs/man/FS/cust_pkg.html
 create mode 100644 httemplate/docs/man/FS/cust_refund.html
 create mode 100644 httemplate/docs/man/FS/cust_svc.html
 create mode 100644 httemplate/docs/man/FS/domain_record.html
 create mode 100644 httemplate/docs/man/FS/nas.html
 create mode 100644 httemplate/docs/man/FS/part_pkg.html
 create mode 100644 httemplate/docs/man/FS/part_referral.html
 create mode 100644 httemplate/docs/man/FS/part_svc.html
 create mode 100644 httemplate/docs/man/FS/pkg_svc.html
 create mode 100644 httemplate/docs/man/FS/port.html
 create mode 100644 httemplate/docs/man/FS/prepay_credit.html
 create mode 100644 httemplate/docs/man/FS/session.html
 create mode 100644 httemplate/docs/man/FS/svc_Common.html
 create mode 100644 httemplate/docs/man/FS/svc_acct.html
 create mode 100644 httemplate/docs/man/FS/svc_acct_pop.html
 create mode 100644 httemplate/docs/man/FS/svc_acct_sm.html
 create mode 100644 httemplate/docs/man/FS/svc_domain.html
 create mode 100644 httemplate/docs/man/FS/svc_www.html
 create mode 100644 httemplate/docs/man/FS/type_pkgs.html
 create mode 100755 httemplate/docs/passwd.html
 create mode 100755 httemplate/docs/postgresql.html
 create mode 100644 httemplate/docs/schema.html
 create mode 100644 httemplate/docs/session.html
 create mode 100644 httemplate/docs/signup.html
 create mode 100755 httemplate/docs/trouble.html
 create mode 100755 httemplate/docs/upgrade.html
 create mode 100755 httemplate/docs/upgrade2.html
 create mode 100644 httemplate/docs/upgrade3.html
 create mode 100644 httemplate/docs/upgrade4.html
 create mode 100644 httemplate/docs/upgrade5.html
 create mode 100644 httemplate/docs/upgrade6.html
 create mode 100644 httemplate/docs/upgrade7.html
 create mode 100644 httemplate/docs/upgrade8.html
 create mode 100755 httemplate/edit/agent.cgi
 create mode 100755 httemplate/edit/agent_type.cgi
 create mode 100755 httemplate/edit/cust_credit.cgi
 create mode 100755 httemplate/edit/cust_main.cgi
 create mode 100755 httemplate/edit/cust_main_county-expand.cgi
 create mode 100755 httemplate/edit/cust_main_county.cgi
 create mode 100755 httemplate/edit/cust_pay.cgi
 create mode 100755 httemplate/edit/cust_pkg.cgi
 create mode 100755 httemplate/edit/part_pkg.cgi
 create mode 100755 httemplate/edit/part_referral.cgi
 create mode 100755 httemplate/edit/part_svc.cgi
 create mode 100755 httemplate/edit/process/agent.cgi
 create mode 100755 httemplate/edit/process/agent_type.cgi
 create mode 100755 httemplate/edit/process/cust_credit.cgi
 create mode 100755 httemplate/edit/process/cust_main.cgi
 create mode 100755 httemplate/edit/process/cust_main_county-expand.cgi
 create mode 100755 httemplate/edit/process/cust_main_county.cgi
 create mode 100755 httemplate/edit/process/cust_pay.cgi
 create mode 100755 httemplate/edit/process/cust_pkg.cgi
 create mode 100755 httemplate/edit/process/part_pkg.cgi
 create mode 100755 httemplate/edit/process/part_referral.cgi
 create mode 100755 httemplate/edit/process/part_svc.cgi
 create mode 100755 httemplate/edit/process/svc_acct.cgi
 create mode 100755 httemplate/edit/process/svc_acct_pop.cgi
 create mode 100755 httemplate/edit/process/svc_acct_sm.cgi
 create mode 100755 httemplate/edit/process/svc_domain.cgi
 create mode 100755 httemplate/edit/svc_acct.cgi
 create mode 100755 httemplate/edit/svc_acct_pop.cgi
 create mode 100755 httemplate/edit/svc_acct_sm.cgi
 create mode 100755 httemplate/edit/svc_domain.cgi
 create mode 100644 httemplate/images/mid-logo.png
 create mode 100644 httemplate/images/small-logo.png
 create mode 100644 httemplate/index.html
 create mode 100755 httemplate/misc/bill.cgi
 create mode 100755 httemplate/misc/cancel-unaudited.cgi
 create mode 100755 httemplate/misc/cancel_pkg.cgi
 create mode 100755 httemplate/misc/delete-customer.cgi
 create mode 100755 httemplate/misc/expire_pkg.cgi
 create mode 100755 httemplate/misc/link.cgi
 create mode 100755 httemplate/misc/print-invoice.cgi
 create mode 100755 httemplate/misc/process/delete-customer.cgi
 create mode 100755 httemplate/misc/process/link.cgi
 create mode 100755 httemplate/misc/susp_pkg.cgi
 create mode 100755 httemplate/misc/unsusp_pkg.cgi
 create mode 100755 httemplate/search/cust_bill.cgi
 create mode 100755 httemplate/search/cust_bill.html
 create mode 100755 httemplate/search/cust_main-payinfo.html
 create mode 100755 httemplate/search/cust_main.cgi
 create mode 100755 httemplate/search/cust_main.html
 create mode 100755 httemplate/search/cust_pkg.cgi
 create mode 100755 httemplate/search/svc_acct.cgi
 create mode 100755 httemplate/search/svc_acct.html
 create mode 100755 httemplate/search/svc_acct_sm.cgi
 create mode 100755 httemplate/search/svc_acct_sm.html
 create mode 100755 httemplate/search/svc_domain.cgi
 create mode 100755 httemplate/search/svc_domain.html
 create mode 100755 httemplate/view/cust_bill.cgi
 create mode 100755 httemplate/view/cust_main.cgi
 create mode 100755 httemplate/view/cust_pkg.cgi
 create mode 100755 httemplate/view/svc_acct.cgi
 create mode 100755 httemplate/view/svc_acct_sm.cgi
 create mode 100755 httemplate/view/svc_domain.cgi

diff --git a/bin/fs-setup b/bin/fs-setup
index c1e87c8d6..1113966f8 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.37 2001-06-03 14:16:11 ivan Exp $
+# $Id: fs-setup,v 1.38 2001-07-30 07:36:04 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.37  2001-06-03 14:16:11  ivan
+# Revision 1.38  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.37  2001/06/03 14:16:11  ivan
 # allow empty refund reasons
 #
 # Revision 1.36  2001/04/15 12:56:31  ivan
@@ -177,12 +180,24 @@ separated by whitespace.
 END
 my @attributes = map { s/\-/_/g; $_; } split(" ",&getvalue);
 
+print "\n\n", <<END, ":";
+Do you wish to enable the tracking of a second, separate shipping/service
+address?
+END
+my $ship = &_yesno;
+
 sub getvalue {
   my($x)=scalar(<STDIN>);
   chop $x;
   $x;
 }
 
+sub _yesno {
+  print " [y/N]:";
+  my $x = scalar(<STDIN>);
+  $x =~ /^y/i;
+}
+
 ###
 
 my($char_d) = 80; #default maxlength for text fields
@@ -214,6 +229,12 @@ my($dbdef) = new DBIx::DBSchema ( map {
   );
 } (keys %tables) );
 
+#remove ship_ from cust_main
+unless ($ship) {
+  my $cust_main = $dbdef->table('cust_main');
+  $cust_main->delcolumn($_) foreach ( grep /^ship_/, $cust_main->columns );
+}
+
 #add radius attributes to svc_acct
 
 my($svc_acct)=$dbdef->table('svc_acct');
@@ -452,6 +473,20 @@ sub tables_hash_hack {
         'daytime',  'varchar', 'NULL', 20,
         'night',    'varchar', 'NULL', 20,
         'fax',      'varchar', 'NULL', 12,
+        'ship_last',     'varchar', 'NULL', $char_d,
+#        'ship_middle',   'varchar', 'NULL', $char_d,
+        'ship_first',    'varchar', 'NULL', $char_d,
+        'ship_company',  'varchar', 'NULL', $char_d,
+        'ship_address1', 'varchar', 'NULL', $char_d,
+        'ship_address2', 'varchar', 'NULL', $char_d,
+        'ship_city',     'varchar', 'NULL', $char_d,
+        'ship_county',   'varchar', 'NULL', $char_d,
+        'ship_state',    'varchar', 'NULL', $char_d,
+        'ship_zip',      'varchar', 'NULL', 10,
+        'ship_country',  'char', 'NULL', 2,
+        'ship_daytime',  'varchar', 'NULL', 20,
+        'ship_night',    'varchar', 'NULL', 20,
+        'ship_fax',      'varchar', 'NULL', 12,
         'payby',    'char', '',     4,
         'payinfo',  'varchar', 'NULL', 16,
         #'paydate',  @date_type,
diff --git a/bin/masonize b/bin/masonize
new file mode 100755
index 000000000..475c9a6bf
--- /dev/null
+++ b/bin/masonize
@@ -0,0 +1,70 @@
+#!/usr/bin/perl
+
+foreach $file ( split(/\n/, `find . -depth -print | grep cgi\$`) ) {
+  open(F,$file) or die "can't open $file for reading: $!";
+  @file = <F>;
+  #print "$file ". scalar(@file). "\n";
+  close $file;
+  system("chmod u+w $file");
+  open(W,">$file") or die "can't open $file for writing: $!";
+  select W; $| = 1; select STDOUT;
+  $all = join('',@file);
+
+  $mode = 'html';
+  while ( length($all) ) {
+
+    if ( $mode eq 'html' ) {
+
+      if ( $all =~ /^(.+?)(<%=?.*)$/s && $1 !~ /<%/s ) {
+        print W $1;
+        $all = $2;
+        next;
+      } elsif ( $all =~ /^<%=(.*)$/s ) {
+        print W '<%';
+        $all = $1;
+        $mode = 'perlv';
+        #die;
+        next;
+      } elsif ( $all =~ /^<%(.*)$/s ) {
+        print W "\n";
+        $all = $1;
+        $mode = 'perlc';
+        next;
+      } elsif ( $all !~ /<%/s ) {
+        print W $all;
+        last;
+      } else {
+        warn length($all); die;
+      }
+      die;
+
+    } elsif ( $mode eq 'perlv' ) {
+
+      if ( $all =~ /^(.*?%>)(.*)$/s ) {
+        print W $1;
+        $all=$2;
+        $mode = 'html';
+        next;
+      }
+      die 'unterminated <%= ???';
+
+    } elsif ( $mode eq 'perlc' ) {
+
+      if ( $all =~ /^([^\n]*?)%>(.*)$/s ) {
+        print W "%$1\n";
+        $all=$2;
+        $mode='html';
+        next;
+      }
+      if ( $all =~ /^([^\n]*)\n(.*)$/s ) {
+        print W "%$1\n";
+        $all=$2;
+        next;
+      }
+
+    } else { die };
+
+  }
+
+  close W;
+}
diff --git a/bin/pod2x b/bin/pod2x
index 2c10a30d0..8c020062c 100755
--- a/bin/pod2x
+++ b/bin/pod2x
@@ -6,12 +6,14 @@
 my $site_perl = "./FS";
 #my $catman = "./catman";
 #my $catman = "./htdocs/docs/man";
-my $html = "./htdocs/docs/man";
+#my $html = "./htdocs/docs/man";
+my $html = "./httemplate/docs/man";
 
 $|=1;
 
-die "Can't find $site_perl and $catman"
-  unless [ -d $site_perl ] && [ -d $catman ] && [ -d $html ];
+die "Can't find $site_perl" unless -d $site_perl;
+#die "Can't find $catman" unless -d $catman;
+die "Can't find $html" unless -d $html;
 
 foreach my $file (
   glob("$site_perl/*.pm"),
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
new file mode 100755
index 000000000..209043744
--- /dev/null
+++ b/httemplate/browse/agent.cgi
@@ -0,0 +1,138 @@
+<%
+#
+# $Id: agent.cgi,v 1.1 2001-07-30 07:36:03 ivan Exp $
+#
+# ivan@sisd.com 97-dec-12
+#
+# changes to allow pages to load from a relative location in the web tree.
+#	bmccane@maxbaud.net	98-mar-25
+#
+# changed 'type' to 'atype' because type is reserved word in Pg6.3
+#	bmccane@maxbaud.net	98-apr-3
+#
+# agent type was linking to wrong cgi ivan@sisd.com 98-jul-18
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: agent.cgi,v $
+# Revision 1.1  2001-07-30 07:36:03  ivan
+# templates!!!
+#
+# Revision 1.13  1999/04/09 04:22:34  ivan
+# also table()
+#
+# Revision 1.12  1999/04/09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.11  1999/01/20 09:43:16  ivan
+# comment out future UI code (but look at it, it's neat!)
+#
+# Revision 1.10  1999/01/19 05:13:24  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.9  1999/01/18 09:41:14  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.8  1999/01/18 09:22:26  ivan
+# changes to track email addresses for email invoicing
+#
+# Revision 1.7  1998/12/17 05:25:16  ivan
+# fix visual and other bugs
+#
+# Revision 1.6  1998/11/23 05:29:46  ivan
+# use CGI::Carp
+#
+# Revision 1.5  1998/11/23 05:27:31  ivan
+# to eliminate warnings
+#
+# Revision 1.4  1998/11/20 08:50:36  ivan
+# s/CGI::Base/CGI.pm, visual fixes
+#
+# Revision 1.3  1998/11/08 10:11:02  ivan
+# CGI.pm
+#
+# Revision 1.2  1998/11/07 10:24:22  ivan
+# don't use depriciated FS::Bill and FS::Invoice, other miscellania
+#
+
+use strict;
+use vars qw( $ui $cgi $p $agent );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup swapuid);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header menubar table popurl);
+use FS::agent;
+use FS::agent_type;
+
+#Begin silliness
+#
+#use FS::UI::CGI;
+#use FS::UI::agent;
+#
+#$ui = new FS::UI::agent;
+#$ui->browse;
+#exit;
+#__END__
+#End silliness
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+$p = popurl(2);
+
+print $cgi->header( '-expires' => 'now' ), header('Agent Listing', menubar(
+  'Main Menu'   => $p,
+  'Agent Types' => $p. 'browse/agent_type.cgi',
+#  'Add new agent' => '../edit/agent.cgi'
+)), <<END;
+Agents are resellers of your service. Agents may be limited to a subset of your
+full offerings (via their type).<BR><BR>
+END
+print &table(), <<END;
+      <TR>
+        <TH COLSPAN=2>Agent</TH>
+        <TH>Type</TH>
+        <TH><FONT SIZE=-1>Freq. (unimp.)</FONT></TH>
+        <TH><FONT SIZE=-1>Prog. (unimp.)</FONT></TH>
+      </TR>
+END
+#        <TH><FONT SIZE=-1>Agent #</FONT></TH>
+#        <TH>Agent</TH>
+
+foreach $agent ( sort { 
+  $a->getfield('agentnum') <=> $b->getfield('agentnum')
+} qsearch('agent',{}) ) {
+  my($hashref)=$agent->hashref;
+  my($typenum)=$hashref->{typenum};
+  my($agent_type)=qsearchs('agent_type',{'typenum'=>$typenum});
+  my($atype)=$agent_type->getfield('atype');
+  print <<END;
+      <TR>
+        <TD><A HREF="${p}edit/agent.cgi?$hashref->{agentnum}">
+          $hashref->{agentnum}</A></TD>
+        <TD><A HREF="${p}edit/agent.cgi?$hashref->{agentnum}">
+          $hashref->{agent}</A></TD>
+        <TD><A HREF="${p}edit/agent_type.cgi?$typenum">$atype</A></TD>
+        <TD>$hashref->{freq}</TD>
+        <TD>$hashref->{prog}</TD>
+      </TR>
+END
+
+}
+
+print <<END;
+      <TR>
+        <TD COLSPAN=2><A HREF="${p}edit/agent.cgi"><I>Add new agent</I></A></TD>
+        <TD><A HREF="${p}edit/agent_type.cgi"><I>Add new agent type</I></A></TD>
+      </TR>
+    </TABLE>
+
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
new file mode 100755
index 000000000..9d51a37e6
--- /dev/null
+++ b/httemplate/browse/agent_type.cgi
@@ -0,0 +1,109 @@
+<%
+#
+# $Id: agent_type.cgi,v 1.1 2001-07-30 07:36:03 ivan Exp $
+#
+# ivan@sisd.com 97-dec-10
+#
+# Changes to allow page to work at a relative position in server
+# Changes to make "Packages" display 2-wide in table (old way was too vertical)
+#	bmccane@maxbaud.net 98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: agent_type.cgi,v $
+# Revision 1.1  2001-07-30 07:36:03  ivan
+# templates!!!
+#
+# Revision 1.8  1999/04/09 04:22:34  ivan
+# also table()
+#
+# Revision 1.7  1999/04/09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.6  1999/04/07 11:10:46  ivan
+# harmless typo
+#
+# Revision 1.5  1999/01/19 05:13:25  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:15  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 05:25:17  ivan
+# fix visual and other bugs
+#
+# Revision 1.2  1998/11/21 07:39:52  ivan
+# visual
+#
+
+use strict;
+use vars qw( $cgi $p $agent_type );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup swapuid);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header menubar popurl table);
+use FS::agent_type;
+use FS::type_pkgs;
+use FS::part_pkg;
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+$p = popurl(2);
+print $cgi->header( '-expires' => 'now' ), header("Agent Type Listing", menubar(
+  'Main Menu' => $p,
+)), "Agent types define groups of packages that you can then assign to".
+    " particular agents.<BR><BR>", &table(), <<END;
+      <TR>
+        <TH COLSPAN=2>Agent Type</TH>
+        <TH COLSPAN="2">Packages</TH>
+      </TR>
+END
+
+foreach $agent_type ( sort { 
+  $a->getfield('typenum') <=> $b->getfield('typenum')
+} qsearch('agent_type',{}) ) {
+  my($hashref)=$agent_type->hashref;
+  my(@type_pkgs)=qsearch('type_pkgs',{'typenum'=> $hashref->{typenum} });
+  my($rowspan)=scalar(@type_pkgs);
+  $rowspan = int($rowspan/2+0.5) ;
+  print <<END;
+      <TR>
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/agent_type.cgi?$hashref->{typenum}">
+          $hashref->{typenum}
+        </A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/agent_type.cgi?$hashref->{typenum}">$hashref->{atype}</A></TD>
+END
+
+  my($type_pkgs);
+  my($tdcount) = -1 ;
+  foreach $type_pkgs ( @type_pkgs ) {
+    my($pkgpart)=$type_pkgs->getfield('pkgpart');
+    my($part_pkg) = qsearchs('part_pkg',{'pkgpart'=> $pkgpart });
+    print qq!<TR>! if ($tdcount == 0) ;
+    $tdcount = 0 if ($tdcount == -1) ;
+    print qq!<TD><A HREF="${p}edit/part_pkg.cgi?$pkgpart">!,
+          $part_pkg->getfield('pkg'),"</A></TD>";
+    $tdcount ++ ;
+    if ($tdcount == 2)
+    {
+	print qq!</TR>\n! ;
+	$tdcount = 0 ;
+    }
+  }
+
+  print "</TR>";
+}
+
+print <<END;
+  <TR><TD COLSPAN=2><I><A HREF="${p}edit/agent_type.cgi">Add new agent type</A></I></TD></TR>
+    </TABLE>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
new file mode 100755
index 000000000..96541502c
--- /dev/null
+++ b/httemplate/browse/cust_main_county.cgi
@@ -0,0 +1,108 @@
+<%
+#
+# $Id: cust_main_county.cgi,v 1.1 2001-07-30 07:36:03 ivan Exp $
+#
+# ivan@sisd.com 97-dec-13
+#
+# Changes to allow page to work at a relative position in server
+#	bmccane@maxbaud.net	98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: cust_main_county.cgi,v $
+# Revision 1.1  2001-07-30 07:36:03  ivan
+# templates!!!
+#
+# Revision 1.7  1999/04/09 04:22:34  ivan
+# also table()
+#
+# Revision 1.6  1999/04/09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.5  1999/01/19 05:13:26  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:16  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 05:25:18  ivan
+# fix visual and other bugs
+#
+# Revision 1.2  1998/11/18 09:01:34  ivan
+# i18n! i18n!
+#
+
+use strict;
+use vars qw( $cgi $p $cust_main_county );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup swapuid);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header menubar popurl table);
+use FS::cust_main_county;
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+$p = popurl(2);
+
+print $cgi->header( '-expires' => 'now' ), header("Tax Rate Listing", menubar(
+  'Main Menu' => $p,
+  'Edit tax rates' => $p. "edit/cust_main_county.cgi",
+)),<<END;
+    Click on <u>expand country</u> to specify a country's tax rates by state.
+    <BR>Click on <u>expand state</u> to specify a state's tax rates by county.
+    <BR><BR>
+END
+print &table(), <<END;
+      <TR>
+        <TH><FONT SIZE=-1>Country</FONT></TH>
+        <TH><FONT SIZE=-1>State</FONT></TH>
+        <TH>County</TH>
+        <TH><FONT SIZE=-1>Tax</FONT></TH>
+      </TR>
+END
+
+foreach $cust_main_county ( qsearch('cust_main_county',{}) ) {
+  my($hashref)=$cust_main_county->hashref;
+  print <<END;
+      <TR>
+        <TD>$hashref->{country}</TD>
+END
+  print "<TD>", $hashref->{state}
+      ? $hashref->{state}
+      : qq!(ALL) <FONT SIZE=-1>!.
+        qq!<A HREF="${p}edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
+        qq!">expand country</A></FONT>!
+    , "</TD>";
+  print "<TD>";
+  if ( $hashref->{county} ) {
+    print $hashref->{county};
+  } else {
+    print "(ALL)";
+    if ( $hashref->{state} ) {
+      print qq!<FONT SIZE=-1>!.
+          qq!<A HREF="${p}edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
+          qq!">expand state</A></FONT>!;
+    }
+  }
+  print "</TD>";
+
+  print <<END;
+        <TD>$hashref->{tax}%</TD>
+      </TR>
+END
+
+}
+
+print <<END;
+    </TABLE>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/browse/nas.cgi b/httemplate/browse/nas.cgi
new file mode 100755
index 000000000..89d5e4650
--- /dev/null
+++ b/httemplate/browse/nas.cgi
@@ -0,0 +1,95 @@
+<%
+
+use strict;
+use vars qw( $cgi $p );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use Date::Format;
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch); # qsearchs);
+use FS::CGI qw(header menubar table popurl);
+use FS::nas;
+use FS::port;
+use FS::session;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$p=popurl(2);
+
+print $cgi->header( '-expires' => 'now' ), header('NAS ports', menubar(
+  'Main Menu' => $p,
+));
+
+my $now = time;
+
+foreach my $nas ( sort { $a->nasnum <=> $b->nasnum } qsearch( 'nas', {} ) ) {
+  print $nas->nasnum. ": ". $nas->nas. " ".
+        $nas->nasfqdn. " (". $nas->nasip. ") ".
+        "as of ". time2str("%c",$nas->last).
+        " (". &pretty_interval($now - $nas->last). " ago)<br>".
+        &table(). "<TR><TH>Nas<BR>Port #</TH><TH>Global<BR>Port #</BR></TH>".
+        "<TH>IP address</TH><TH>User</TH><TH>Since</TH><TH>Duration</TH><TR>",
+  ;
+  foreach my $port ( sort {
+    $a->nasport <=> $b->nasport || $a->portnum <=> $b->portnum
+  } qsearch( 'port', { 'nasnum' => $nas->nasnum } ) ) {
+    my $session = $port->session;
+    my($user, $since, $pretty_since, $duration);
+    if ( ! $session ) {
+      $user = "(empty)";
+      $since = 0;
+      $pretty_since = "(never)";
+      $duration = '';
+    } elsif ( $session->logout ) {
+      $user = "(empty)";
+      $since = $session->logout;
+    } else {
+      my $svc_acct = $session->svc_acct;
+      $user = "<A HREF=\"$p/view/svc_acct.cgi?". $svc_acct->svcnum. "\">".
+              $svc_acct->username. "</A>";
+      $since = $session->login;
+    }
+    $pretty_since = time2str("%c", $since) if $since;
+    $duration = pretty_interval( $now - $since ). " ago"
+      unless defined($duration);
+    print "<TR><TD>". $port->nasport. "</TD><TD>". $port->portnum. "</TD><TD>".
+          $port->ip. "</TD><TD>$user</TD><TD>$pretty_since".
+          "</TD><TD>$duration</TD></TR>"
+    ;
+  }
+  print "</TABLE><BR>";
+}
+
+sub pretty_interval {
+  my $interval = shift;
+  my %howlong = (
+    '604800' => 'week',
+    '86400'  => 'day',
+    '3600'   => 'hour',
+    '60'     => 'minute',
+    '1'      => 'second',
+  );
+
+  my $pretty = "";
+  foreach my $key ( sort { $b <=> $a } keys %howlong ) {
+    my $value = int( $interval / $key );
+    if ( $value  ) {
+      if ( $value == 1 ) {
+        $pretty .=
+          ( $howlong{$key} eq 'hour' ? 'an ' : 'a ' ). $howlong{$key}. " "
+      } else {
+        $pretty .= $value. ' '. $howlong{$key}. 's ';
+      }
+    }
+    $interval -= $value * $key;
+  }
+  $pretty =~ /^\s*(\S.*\S)\s*$/;
+  $1;
+} 
+
+#print &table(), <<END;
+#<TR>
+#  <TH>#</TH>
+#  <TH>NAS</
+%>
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
new file mode 100755
index 000000000..1d51f8145
--- /dev/null
+++ b/httemplate/browse/part_pkg.cgi
@@ -0,0 +1,114 @@
+<%
+#!/usr/bin/perl -Tw
+#
+# $Id: part_pkg.cgi,v 1.1 2001-07-30 07:36:03 ivan Exp $
+#
+# ivan@sisd.com 97-dec-5,9
+#
+# Changes to allow page to work at a relative position in server
+#	bmccane@maxbaud.net	98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: part_pkg.cgi,v $
+# Revision 1.1  2001-07-30 07:36:03  ivan
+# templates!!!
+#
+# Revision 1.8  1999/04/09 04:22:34  ivan
+# also table()
+#
+# Revision 1.7  1999/04/09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.6  1999/01/19 05:13:27  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:17  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/17 05:25:19  ivan
+# fix visual and other bugs
+#
+# Revision 1.3  1998/11/21 07:23:45  ivan
+# visual
+#
+# Revision 1.2  1998/11/21 07:00:32  ivan
+# visual
+#
+
+use strict;
+use vars qw( $cgi $p $part_pkg );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup swapuid);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header menubar popurl table);
+use FS::part_pkg;
+use FS::pkg_svc;
+use FS::part_svc;
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+$p = popurl(2);
+
+print $cgi->header( '-expires' => 'now' ), header("Package Part Listing",menubar(
+  'Main Menu' => $p,
+)), "One or more services are grouped together into a package and given",
+  " pricing information. Customers purchase packages, not services.<BR><BR>", 
+  &table(), <<END;
+    <TABLE BORDER>
+      <TR>
+        <TH COLSPAN=2>Package</TH>
+        <TH>Comment</TH>
+        <TH><FONT SIZE=-1>Setup Fee</FONT></TH>
+        <TH><FONT SIZE=-1>Freq.</FONT></TH>
+        <TH><FONT SIZE=-1>Recur. Fee</FONT></TH>
+        <TH>Service</TH>
+        <TH><FONT SIZE=-1>Quan.</FONT></TH>
+      </TR>
+END
+
+foreach $part_pkg ( sort { 
+  $a->getfield('pkgpart') <=> $b->getfield('pkgpart')
+} qsearch('part_pkg',{}) ) {
+  my($hashref)=$part_pkg->hashref;
+  my(@pkg_svc)=grep $_->getfield('quantity'),
+    qsearch('pkg_svc',{'pkgpart'=> $hashref->{pkgpart} });
+  my($rowspan)=scalar(@pkg_svc);
+  print <<END;
+      <TR>
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">
+          $hashref->{pkgpart}
+        </A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">$hashref->{pkg}</A></TD>
+        <TD ROWSPAN=$rowspan>$hashref->{comment}</TD>
+        <TD ROWSPAN=$rowspan>$hashref->{setup}</TD>
+        <TD ROWSPAN=$rowspan>$hashref->{freq}</TD>
+        <TD ROWSPAN=$rowspan>$hashref->{recur}</TD>
+END
+
+  my($pkg_svc);
+  my($n)="";
+  foreach $pkg_svc ( @pkg_svc ) {
+    my($svcpart)=$pkg_svc->getfield('svcpart');
+    my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart });
+    print $n,qq!<TD><A HREF="${p}edit/part_svc.cgi?$svcpart">!,
+          $part_svc->getfield('svc'),"</A></TD><TD>",
+          $pkg_svc->getfield('quantity'),"</TD></TR>\n";
+    $n="<TR>";
+  }
+
+  print "</TR>";
+}
+
+print <<END;
+   <TR><TD COLSPAN=2><I><A HREF="${p}edit/part_pkg.cgi">Add new package</A></I></TD></TR>
+    </TABLE>
+  </BODY>
+</HTML>
+END
+%>
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
new file mode 100755
index 000000000..408d63003
--- /dev/null
+++ b/httemplate/browse/part_referral.cgi
@@ -0,0 +1,92 @@
+<%
+#
+# $Id: part_referral.cgi,v 1.1 2001-07-30 07:36:03 ivan Exp $
+#
+# ivan@sisd.com 98-feb-23 
+#
+# Changes to allow page to work at a relative position in server
+#	bmccane@maxbaud.net	98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: part_referral.cgi,v $
+# Revision 1.1  2001-07-30 07:36:03  ivan
+# templates!!!
+#
+# Revision 1.9  1999/04/09 04:22:34  ivan
+# also table()
+#
+# Revision 1.8  1999/04/09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.7  1999/01/19 05:13:28  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6  1999/01/18 09:41:18  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1998/12/17 05:25:20  ivan
+# fix visual and other bugs
+#
+# Revision 1.4  1998/12/17 04:32:55  ivan
+# print $cgi->header
+#
+# Revision 1.3  1998/12/17 04:31:36  ivan
+# use CGI::Carp
+#
+# Revision 1.2  1998/12/17 04:26:04  ivan
+# use CGI; no relative URLs
+#
+
+use strict;
+use vars qw( $cgi $p $part_referral );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup swapuid);
+use FS::Record qw(qsearch);
+use FS::CGI qw(header menubar popurl table);
+use FS::part_referral;
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+$p = popurl(2);
+
+print $cgi->header( '-expires' => 'now' ), header("Referral Listing", menubar(
+  'Main Menu' => $p,
+#  'Add new referral' => "../edit/part_referral.cgi",
+)), "Where a customer heard about your service. Tracked for informational purposes.<BR><BR>", &table(), <<END;
+      <TR>
+        <TH COLSPAN=2>Referral</TH>
+      </TR>
+END
+
+foreach $part_referral ( sort { 
+  $a->getfield('refnum') <=> $b->getfield('refnum')
+} qsearch('part_referral',{}) ) {
+  my($hashref)=$part_referral->hashref;
+  print <<END;
+      <TR>
+        <TD><A HREF="${p}edit/part_referral.cgi?$hashref->{refnum}">
+          $hashref->{refnum}</A></TD>
+        <TD><A HREF="${p}edit/part_referral.cgi?$hashref->{refnum}">
+          $hashref->{referral}</A></TD>
+      </TR>
+END
+
+}
+
+print <<END;
+      <TR>
+        <TD COLSPAN=2><A HREF="${p}edit/part_referral.cgi"><I>Add new referral</I></A></TD>
+      </TR>
+    </TABLE>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
new file mode 100755
index 000000000..84d8a3566
--- /dev/null
+++ b/httemplate/browse/part_svc.cgi
@@ -0,0 +1,60 @@
+<!-- $Id: part_svc.cgi,v 1.1 2001-07-30 07:36:03 ivan Exp $ -->
+<%= header('Service Part Listing', menubar( 'Main Menu' => $p) ) %>
+
+    Services are items you offer to your customers.<BR><BR>
+<TABLE BORDER=1>
+  <TR>
+    <TH COLSPAN=2>Service</TH>
+    <TH>Table</TH>
+    <TH>Field</TH>
+    <TH COLSPAN=2>Modifier</TH>
+  </TR>
+
+<% foreach my $part_svc ( sort {
+     $a->getfield('svcpart') <=> $b->getfield('svcpart')
+   } qsearch('part_svc',{}) ) {
+     my($hashref)=$part_svc->hashref;
+     my($svcdb)=$hashref->{svcdb};
+     my(@rows)=
+       grep $hashref->{${svcdb}.'__'.$_.'_flag'},
+         map { /^${svcdb}__(.*)$/; $1 }
+           grep ! /_flag$/,
+             grep /^${svcdb}__/,
+               fields('part_svc')
+     ;
+     my($rowspan)=scalar(@rows) || 1;
+     my $url = "${p}edit/part_svc.cgi?$hashref->{svcpart}";
+%>
+
+  <TR>
+    <TD ROWSPAN=<%= $rowspan %>><A HREF="<%= $url %>">
+      <%= $hashref->{svcpart} %></A></TD>
+    <TD ROWSPAN=<%= $rowspan %>><A HREF="<%= $url %>">
+      <%= $hashref->{svc} %></A></TD>
+    <TD ROWSPAN=<%= $rowspan %>>
+      <%= $hashref->{svcdb} %></TD>
+
+<%   my($n1)='';
+     my($row);
+     foreach $row ( @rows ) {
+       my($flag)=$part_svc->getfield($svcdb.'__'.$row.'_flag');
+%>
+     <%= $n1 %><TD>$row</TD><TD>
+
+<%     if ( $flag eq "D" ) { print "Default"; }
+         elsif ( $flag eq "F" ) { print "Fixed"; }
+         else { print "(Unknown!)"; }
+%>
+       </TD><TD><%= $part_svc->getfield($svcdb."__".$row) %></TD>
+<%     $n1="</TR><TR>";
+     }
+%>
+  </TR>
+<% } %>
+
+  <TR>
+    <TD COLSPAN=2><A HREF="<%= $p %>edit/part_svc.cgi"><I>Add new service</I></A></TD>
+  </TR>
+</TABLE>
+</BODY>
+</HTML>
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
new file mode 100755
index 000000000..05f8a3031
--- /dev/null
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -0,0 +1,101 @@
+<%
+#
+# $Id: svc_acct_pop.cgi,v 1.1 2001-07-30 07:36:03 ivan Exp $
+#
+# ivan@sisd.com 98-mar-8
+#
+# Changes to allow page to work at a relative position in server
+#	bmccane@maxbaud.net	98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: svc_acct_pop.cgi,v $
+# Revision 1.1  2001-07-30 07:36:03  ivan
+# templates!!!
+#
+# Revision 1.8  2000/01/28 22:56:13  ivan
+# track full phone number
+#
+# Revision 1.7  1999/04/09 04:22:34  ivan
+# also table()
+#
+# Revision 1.6  1999/04/09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.5  1999/01/19 05:13:30  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:20  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 05:25:22  ivan
+# fix visual and other bugs
+#
+# Revision 1.2  1998/12/17 04:36:59  ivan
+# use CGI;, use CGI::Carp, visual changes, relative URLs
+#
+
+use strict;
+use vars qw( $cgi $p $svc_acct_pop );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup swapuid);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header menubar table popurl);
+use FS::svc_acct_pop;
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+$p = popurl(2);
+
+print $cgi->header( '-expires' => 'now' ), header('POP Listing', menubar(
+  'Main Menu' => $p,
+)), "Points of Presence<BR><BR>", &table(), <<END;
+      <TR>
+        <TH></TH>
+        <TH>City</TH>
+        <TH>State</TH>
+        <TH>Area code</TH>
+        <TH>Exchange</TH>
+        <TH>Local</TH>
+      </TR>
+END
+
+foreach $svc_acct_pop ( sort { 
+  $a->getfield('popnum') <=> $b->getfield('popnum')
+} qsearch('svc_acct_pop',{}) ) {
+  my($hashref)=$svc_acct_pop->hashref;
+  print <<END;
+      <TR>
+        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
+          $hashref->{popnum}</A></TD>
+        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
+          $hashref->{city}</A></TD>
+        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
+          $hashref->{state}</A></TD>
+        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
+          $hashref->{ac}</A></TD>
+        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
+          $hashref->{exch}</A></TD>
+        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
+          $hashref->{loc}</A></TD>
+      </TR>
+END
+
+}
+
+print <<END;
+      <TR>
+        <TD COLSPAN=5><A HREF="${p}edit/svc_acct_pop.cgi"><I>Add new POP</I></A></TD>
+      </TR>
+    </TABLE>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/docs/admin.html b/httemplate/docs/admin.html
new file mode 100755
index 000000000..be53c0950
--- /dev/null
+++ b/httemplate/docs/admin.html
@@ -0,0 +1,59 @@
+<head>
+  <title>Administration</title>
+</head>
+<body>
+  <h1>Administration</h1>
+</body>
+<ul>
+  <li>Open up the root of the Freeside document tree in your web
+  browser.  For example, if you created the Freeside document tree in   
+  /home/httpd/html/freeside, and your web browser's DocumentRoot is
+  /home/httpd/html, open http://your_host/freeside/. Replace
+  "your_host" with the name or network address of your web server.
+
+  <li>Once in the Freeside web interface, you must first create a
+  service.  An example of a service would be a dial-up account or a
+  hosted virtual domain.
+
+  <li>After you create your first service or services, you must then
+  create a package of that service or services which you will sell to
+  your customer.  To allow flexibility in changing your service
+  offerings, Freeside requires that you bundle your services into a
+  package before customers may purchase them.  For instance, you could
+  create a leased line package which would consist of a one-time
+  charge for the customer premise equipment, the monthly service fee
+  for the leased line, a backup dial-up account, and a support
+  contract.  You could also create a leased line package which omits
+  the support contract simply by adding a new package that does not
+  include the support contract.
+  
+  <li>After you create your first package, then you must define who is
+  able to sell that package by creating an agent type.  An example of
+  an agent type would be an internal sales representitive which sells
+  regular and promotional packages, as opposed to an external sales
+  representitive which would only sell regular packages of services.
+
+  <li>After creating a new agent type, you must create an agent, and
+  assign the the agent type you just created to it.
+
+  <li>If the service you created was of type svc_acct, you may have to
+  create a POP from the main menu before you can create your first new
+  customer.
+
+  <li>If you are using Freeside to keep track of sales taxes, you must
+  define tax information for your locale by clicking on the "View/Edit  
+  locales and tax rates" link on the Freeside main menu.
+
+  <li>Finally, set up at least one referral by clicking on the
+  "View/Edit referrals" link in the Freeside main menu.  Referrals
+  will help you keep track of how effective your advertising is, by
+  helping you keep track of where customers heard of your service
+  offerings.  You must create at least one referral.  If you do not wish to
+  use the referral functionality, simply create a single referral only.
+  
+  <li>You should now be ready to sign up your first customer by
+  clicking on the "New Customer" link at the top of the Freeside main
+  menu.
+</ul>
+</body>
+</html>
diff --git a/httemplate/docs/billing.html b/httemplate/docs/billing.html
new file mode 100644
index 000000000..7841bf776
--- /dev/null
+++ b/httemplate/docs/billing.html
@@ -0,0 +1,67 @@
+<head>
+  <title>Billing</title>
+</head>
+<body>
+  <h1>Billing</h1>
+  <ul>
+    <li>To enable billing, you <b>must</b> create an <a href="config.html#invoice_template">invoice_template</a> configuration file.  An example file is available in the <i>conf/</i> directory of the distribution.  You also need to create an <a href="config.html#lpr">lpr</a> configuration file to enable postal invoices.
+    <ul>
+      <li>Optional: Invoice template customization
+        <ul>
+          <li>See the <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> documentation for details on the substitution language.
+          <li>You <b>must</b> call the invoice_lines() function at least once - pass it a number of lines, and it returns a list of array references, each of two elements: a service description column, and a price column.
+          <li>In addition, the following variables are available:
+            <ul>
+              <li>$invnum - invoice number
+              <li>$date - as a UNIX timestamp (see <a href="http://search.cpan.org/doc/GBARR/TimeDate-1.09/lib/Date/Format.pm">Date::Format</a> for conversion functions).
+              <li>$page - current page
+              <li>$total_pages - total pages
+              <li>@address - A six-element array containing the customer name, company, and address.
+              <li>$overdue - true if this invoice is overdue
+            </ul>
+        </ul>
+    </ul>
+    <li>You can bill individual customers by clicking on the <i>Bill now</i> link on the main customer view.
+    <li> The <b>freeside-bill</b> script can be run daily to bill all customers.  Usage:<pre>bill [ -c [ i ] ] [ -d <i>date</i> ] [ -b ] <i>user</i></pre>
+      <ul>
+        <li>-c: Turn on collecting (you probably want this).
+        <li>-i: Real-time billing (as opposed to bacth billing).  Only relevant for credit cards.
+        <li>-d: Pretend it is <i>date</i> (parsed by <a href="http://search.cpan.org/doc/GBARR/TimeDate-1.09/lib/Date/Parse.pm">Date::Parse</a>)
+        <li>-b: N/A
+      </ul>
+      <br><br>Batch credit card processing
+      <ul>
+        <li>After this script is run, a credit card batch will be in the <a href="schema.html#cust_pay_batch">cust_pay_batch</a> table.  Export this table to your credit card batching.
+        <li>When your batch completes, erase the cust_pay_batch records in that batch and add any necessary paymants to the <a href="schema.html#cust_pay">cust_pay</a> table.  Example code to add payments is:
+        <pre>use FS::cust_pay;
+
+# loop over all records in batch
+
+my $payment=create FS::cust_pay (
+  'invnum' => $invnum,
+  'paid' => $paid,
+  '_date' => $_date,
+  'payby' => $payby,
+  'payinfo' => $payinfo,
+  'paybatch' => $paybatch,
+);
+
+my $error=$payment->insert;
+if ( $error ) {
+  #process error
+}
+
+# end loop
+</pre>
+All fields except paybatch are contained in the cust_pay_batch table.  You can use paybatch field to track particular batches and/or particular transactions within a batch.<br><br>
+        <li>The <b>freeside-print-batch</b> script can print or email pending credit card batches for manual entry.  Usage: freeside-print-batch [-v] [-p] [-e] [-a] [-d] <i>user</i>
+          <ul>
+            <li>-v: Verbose - Prints records to STDOUT.
+            <li>-p: Print to printer lpr as found in the conf directory.
+            <li>-e: Email output to user found in the Conf email file.
+            <li>-a: Automatically pays all records in cust_pay_batch.  Use -d with this option usually.
+            <li>-d: Delete - Pays account and deletes record from cust_pay_batch.
+          </ul>
+      </ul>
+  </ul>
+</body>
diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
new file mode 100644
index 000000000..49be7200b
--- /dev/null
+++ b/httemplate/docs/config.html
@@ -0,0 +1,106 @@
+<head>
+  <title>Configuration files</title>
+</head>
+<body>
+  <h1>Configuration files</h1>
+<ul>
+  <li>Create the <b>/usr/local/etc/freeside</b> directory to hold your configuration.
+  <li>Setting up <a href="http://www.apache.org/docs/misc/FAQ.html#user-authentication">Apache user authetication</a> is mandatory.
+  <li>Create the <b>/usr/local/etc/freeside/mapsecrets</b> file, which maps Apache users to a secrets file which contains a DBI data source, username and password.  Every
+line in <b>/usr/local/etc/freeside/mapsecrets</b> should contain a username and
+filename, separated by whitespace.  Note that these are not local usernames -
+they are passed from Apache.  <a href="http://www.apache.org/docs/misc/FAQ.html#user-authentication">
+Apache user authetication</a> is mandatory.  For example, if you had the Apache users admin,
+john, and sam,  
+you mapsecrets file might look like:
+<pre>
+admin secretfile
+john secretfile
+sam secretfile
+</pre>
+  <li>Next, the filename(s) referenced in <b>/usr/local/etc/freeside/mapsecrets</b> file should be created in the <b>/usr/local/etc/freeside/</b> directory.  Each file contains three lines: <a href="http://search.cpan.org/doc/TIMB/DBI-1.15/DBI.pm">DBI data source</a> (for example,
+  <tt>DBI:mysql:freeside</tt> or <tt>DBI:Pg:host=localhost;dbname=freeside</tt>), database username, and database password.
+  These files should not be world readable.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.15/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD">manpage for your DBD</a> for the exact syntax of a DBI data source.  In a normal installation such as the example above, a single file <b>/usr/local/etc/freeside/secretfile</b> would be created - for example:
+<pre>
+DBI:Pg:host=localhost;dbname=freeside
+dbusername
+dbpassword
+</pre>
+</ul>
+All further configuration files and directories are located in
+<tt>/usr/local/etc/freeside/conf.<i>datasource</i></tt>, for example, 
+<tt>/usr/local/etc/freeside/conf.DBI:Pg:host=localhost;dbname=freeside</tt> (remember to backslash-escape the ; character when creating directories in the shell: <tt>mkdir&nbsp;/usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=freeside</tt>).
+<ul>
+  <li><a name="address">address</a> - This configuration file is no longer used.  See <a href="#invoice_template">invoice_template</a> instead.
+  <li><a name="apacheroot">apacheroot</a> - The directory containing Apache virtual hosts
+  <li><a name="apachemachine">apachemachine</a> - A machine with the apacheroot directory and user home directories.  The existance of this file enables setup of virtual host directories, and, in conjunction with the `home' configuration file, symlinks into user home directories.
+  <li><a name="apachemachines">apachemachines</a> - Your Apache machines, one per line.  This enables export of `/etc/apache/vhosts.conf', which can be included in your Apache configuration via the <a href="http://www.apache.org/docs/mod/core.html#include">Include</a> directive.
+  <li><a name="autocapnames">autocapnames</a> - The presence of this file will cause Freeside to use Javascript in /htdocs/edit/cust_main.cgi to automatically capitalize the first and last names of customers.
+  <li><a name="bindprimary">bindprimary</a> - Your BIND primary nameserver.  This enables export of /var/named/named.conf and zone files into /var/named
+  <li><a name="bindsecondaries">bindsecondaries</a> - Your BIND secondary nameservers, one per line.  This enables export of /var/named/named.conf
+  <li><a name="bsdshellmachines">bsdshellmachines</a> - Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/master.passwd'.
+  <li><a name="countrydefault">countrydefault</a> - Default two-letter country code (if not supplied, the default is `US')
+  <li><a name="cybercash2">cybercash2</a> - <a href="http://www.cybercash.com/cybercash/services/cashreg214.html">CyberCash v2</a> support, four lines: paymentserverhost, paymentserverport, paymentserversecret, and transaction type (`mauthonly' or `mauthcapture').  CCLib.pm is required.
+  <li>cybercash3.2 - <a href="http://www.cybercash.com/cybercash/services/technology.html">CyberCash v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly' or `mauthcapture').  CCMckLib3_2.pm, CCMckDirectLib3_2.pm and CCMckErrno3_2 are required.
+  <li><a name="deletecustomers">deletecustomers</a> - The existance of this file will enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that this customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers' packages if they cancel service.
+  <li><a name="domain">domain</a> - Your domain name.
+  <li><a name="editreferrals">editreferrals</a> - The existance of this file will allow you to change the referral of existing customers.
+  <li><a name="erpcdmachines">erpcdmachines</a> - Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd' and `/usr/annex/acp_dialup'.
+  <li><a name="hidecancelledpackages">hidecancelledpackages</a> - The existance of this file will prevent cancelled packages from showing up in listings (though they will still be in the database)
+  <li><a name="hidecancelledcustomers">hidecancelledcustomers</a> - The existance of this file will prevent customers with only cancelled packages from showing up in listings (though they will still be in the database)
+  <li><a name="home">home</a> - For new users, prefixed to usrename to create a directory name.  Should have a leading but not a trailing slash.
+  <li><a name="icradiusmachines">icradiusmachines</a> - Your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines, one per line.  The existance of this file (even if empty) turns on radcheck table creation (in the freeside database - the radcheck table needs to be created manually).  Machines listed in this file will have the radcheck table exported to them.  Each line of this file should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: "<CODE>radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd</CODE>".  Note that to use ICRADIUS export you need to be using MySQL.
+  <li><a name="icradius_mysqldest">icradius_mysqldest</a> - Destination directory for the MySQL databases, on the ICRADIUS machines.  Defaults to "/usr/local/var/".
+  <li><a name="icradius_mysqlsource">icradius_mysqlsource</a> - Source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".
+  <li><a name="icradius_secrets">icradius_secrets</a> - Optionally specifies a MySQL database for ICRADIUS export, if you're not running MySQL for your Freeside database.  The database should be on the Freeside machine and store data in the <a href="#icradius_mysqlsource">icradius_mysqlsource</a> directory.  Three lines: DBI data source, username and password.  This file should not be world readable.
+  <li><a name="invoice_from">invoice_from</a> - Return address on email invoices.
+  <li><a name="invoice_template">invoice_template</a> - Required template file for invoices.  See the <a href="billing.html">section on billing</a> for details.
+  <li><a name="lpr">lpr</a> - Print command for paper invoices, for example `lpr -h'.
+  <li><a name="maildisablecatchall">maildisablecatchall</a> - The existance of this file will disable the requirement that each virtual domain have a catch-all mailbox.
+  <li><a name="money_char">money_char</a> - Currency symbol - defaults to `$'.
+  <li><a name="mxmachines">mxmachines</a> - MX entries for new domains, weight and machine, one per line, with trailing `.'
+  <li><a name="nsmachines">nsmachines</a> - NS nameservers for new domains, one per line, with trailing `.'
+  <li><a name="nismachines">nismachines</a> - Your NIS master (not slave master) machines, one per line.  This enables export of `/etc/global/passwd' and `/etc/global/shadow'.
+  <li><a name="passwordmin">passwordmin</a> - Minimum password length (default 6);
+  <li><a name="qmailmachines">qmailmachines</a> - Your qmail machines, one per line.  This enables export of `/var/qmail/control/virtualdomains', `/var/qmail/control/recipientmap', and `/var/qmail/control/rcpthosts'.  The existance of this file (even if empty) also turns on user `.qmail-extension' file maintenance in conjunction with `shellmachine'.
+  <li><a name="radiusmachines">radiusmachines</a> - Your RADIUS authentication machines, one per line.  This enables export of `/etc/raddb/users'.
+  <li><a name="referraldefault">referraldefault</a> - Default referral, specified by refnum.
+  <li><a name="registries">registries</a> - Directory which contains domain registry information.  Each registry is a directory.
+    <ul>
+      <li>registries/internic - Currently the only supported registry
+        <ul>
+          <li>registries/internic/from - Email address from which InterNIC domain registrations are sent.
+          <li>regestries/internic/nameservers - The nameservers for InterNIC domain registrations, one per line.  Each line contains an IP address and hostname, separated by whitespace.
+          <li>registries/internic/tech_contact - Technical contact NIC handle for domain registrations.
+          <li>registries/internic/template - Template for InterNIC domain registrations with special markup.  A suitable copy of the InterNIC domain template v4.0 is in `fs-x.y.z/etc/domain-template.txt'.
+          <li>registries/internic/to - Email address to which InterNIC domain registrations are sent.
+        </ul>
+    </ul>
+  <li><a name="sendmailconfigpath">sendmailconfigpath</a> - Sendmail configuration file path - defaults to `/etc'.  Many newer distributions use `/etc/mail'.
+  <li><a name="sendmailmachines">sendmailmachines</a> - Your sendmail machines, one per line.  This enables export of `/etc/virtusertable' and `/etc/sendmail.cw'.
+  <li><a name="sendmailrestart">sendmailrestart</a> - If defined, the command which is run on sendmail machines after files are copied.
+  <li><a name="session-start">session-start</a> - If defined, the command which is executed on the Freeside machine when a session begins.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
+  <li><a name="session-stop">session-stop</a> - If defined, the command which is executed on the Freeside machine when a session ends.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
+  <li><a name="shellmachine">shellmachine</a> - A single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines', it also enables `.qmail-extension' file maintenance.
+  <li>shellmachine-useradd - The command(s) to run on shellmachine when an account is created.  If this file does not exist, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If the file exists but is empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.
+  <li>shellmachine-userdel - The command(s) to run on shellmachine when an account is deleted.  If this file does not exist, <code>userdel $username</code> is the default.  If the file exists but is empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.
+  <li>shellmachine-usermod - The command(s) to run on shellmachine when an account is modified.  If this file does not exist or is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.
+  <li><a name="shellmachines">shellmachines</a> - Your Linux and System V flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/shadow' files.
+  <li><a name="shells">shells</a> - Legal shells (think /etc/shells).  You probably want to `cut -d: -f7 /etc/passwd | sort | uniq' initially so that importing doesn't fail with `Illegal shell' errors, then remove any special entries afterwords.  A blank line specifies that an empty shell is permitted.
+  <li><a name="showpasswords">showpasswords</a> - The existance of this file will allow unencrypted user passwords to be displayed.
+  <li><a name="smtpmachine">smtpmachine</a> - SMTP relay for Freeside's outgoing mail.
+  <li><a name="soadefaultttl">soadefaultttl</a> - SOA default TTL for new domains.
+  <li><a name="soaemail">soaemail</a> - SOA email for new domains, in BIND form (`.' instead of `@'), with trailing `.'
+  <li><a name="soaexpire">soaexpire</a> - SOA expire for new domains
+  <li><a name="soamachine">soamachine</a> - SOA machine for new domains, with trailing `.'
+  <li><a name="soarefresh">soarefresh</a> - SOA refresh for new domains
+  <li><a name="soaretry">soaretry</a> - SOA retry for new domains
+  <li><a name="statedefault">statedefault</a> - Default state or province (if not supplied, the default is `CA')
+  <li><a name="textradiusprepend">textradiusprepend</a> - The contents of this file will be prepended to the first line of a user's RADIUS entry in text exports.  If necessary, usually `Auth-Type = Local, '.
+  <li><a name="usernamemin">usernamemin</a> - Minimum username length (default 2);
+  <li><a name="usernamemax">usernamemax</a> - Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)
+  <li><a name="usernamemax">username-letter</a> - The existance of this file will turn on the requirement that usernames contain at least one letter.
+  <li><a name="usernamemax">username-letterfirst</a> - The existance of this file will turn on the requirement that usernames start with a letter.
+</ul>
+</body>
+
diff --git a/httemplate/docs/export.html b/httemplate/docs/export.html
new file mode 100755
index 000000000..d92eec346
--- /dev/null
+++ b/httemplate/docs/export.html
@@ -0,0 +1,41 @@
+<head>
+  <title>File exporting</title>
+</head>
+<body>
+  <h1>File exporting</h1>
+  <ul>
+    <li>bin/svc_acct.export will create UNIX <b>passwd</b>, <b>shadow</b> and <b>master.passwd</b> files, ERPCD <b>acp_passwd</b> and <b>acp_dialup</b> files and a RADIUS <b>users</b> file in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Some RADIUS servers (such as <a href="http://www.open.com.au/radiator/">Radiator</a> and <a href="ftp://ftp.cheapnet.net/pub/icradius/">ICRADIUS</a>) will authenticate directly out of an SQL database.  In these cases,
+it is reccommended that you replicate the data to an external RADIUS machine rather than running the RADIUS server on your Freeside machine.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattended:
+      <ul>
+        <li>shellmachines - <b>passwd</b> and <b>shadow</b> are copied to the remote machine as <b>/etc/passwd.new</b> and <b>/etc/shadow.new</b> and then moved to <b>/etc/passwd</b> and <b>/etc/shadow</b> if no errors occur.
+        <li>bsdshellmachines - <b>passwd</b> and <b>master.passwd</b> are copied to the remote machine as <b>/etc/passwd.new</b> and <b>/etc/master.passwd.new</b> and moved to <b>/etc/passwd</b> and <b>/etc/master.passwd</b> if no errors occur.
+        <li>nismachines - <b>passwd</b> and <b>shadow</b> are copied to the <b>/etc/global</b> directory on the remote machine.  If no errors occur, the command <b>( cd /var/yp; make; )</b> is executed on the remote machine.
+        <li>erpcdmachines - <b>acp_passwd</b> and <b>acp_dialup</b> are copied to the <b>/usr/annex</b> directory on the remote machine.  If no errors occur, the command <b>( kill -USR1 `cat /usr/annex/erpcd.pid` )</b> is executed on the remote machine. 
+        <li>radiusmachines - <b>users</b> is copied to the <b>/etc/raddb</b> directory on the remote machine.  If no errors occur, the command <b>( builddbm )</b> is executed on the remote machine.
+        <li>icradiusmachines - Local radcheck and radreply tables will be created.  If any machines are specified, the remote MySQL database will be locked and the radcheck table will be copied to the those machines.  You may also need to set the <a href="config.html#icradius_mysqlsource">icradius_mysqlsource</a> and/or <a href="config.html#icradius_mysqldest">icradius_mysqldest</a> configuration files.  Currently you need to be running MySQL for your Freeside database to use this feature.
+      </ul>
+    <li>site_perl/svc_acct.pm - If a shellmachine is defined, users can be created, modified and deleted remotely; see below.
+      <ul>
+        <li>Account creation - If the <b>username</b>, <b>uid</b> and <b>dir</b> fields are defined for a new user, the command(s) specified in the <a href="config.html#shellmachine-useradd">shellmachine-useradd</a> configuration file are executed on shellmachine via ssh.  If this file does not exist, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If the file exists but is empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.
+        <li>Account deletion - The command(s) specified in the <a href="config.html#shellmachine-userdel">shellmachine-userdel</a> configuration file are executed on shellmachine via ssh.  If this file does not exist, <code>userdel $username</code> is the default.  If the file exists but is empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.
+        <li>Account modification - If a user's home directory changes, the command(s) specified in the <a href="config.html#shellmachine-usermod">shellmachine-usermod</a> configuration file are execute on shellmachine via ssh.  If this file does not exist or is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.
+      </ul>
+    <li>bin/svc_acct_sm.export will create <a href="http://www.qmail.org">Qmail</a> <b>rcpthosts</b>, <b>recipientmap</b> and <b>virtualdomains</b> files and <a href="http://www.sendmail.org">Sendmail</a> <b>virtusertable</b> and <b>sendmail.cw</b> files in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattemded:
+      <ul>
+        <li>qmailmachines - <b>recipientmap</b>, <b>virtualdomains</b> and <b>rcpthosts</b> are copied to the <b>/var/qmail/control</b> directory on the remote machine.  Note: If you <a href="legacy.html#svc_acct_sm">imported</a> qmail configuration files, run the generated <b>/usr/local/etc/freeside/export.<i>datasrc</i>/virtualdomains.FIX</b> on a machine with your user home directories before exporting qmail configuration files.
+        <li>shellmachine - The command <b>[ -e <i>homedir</i>/.qmail-default ] || { touch <i>homedir</i>/.qmail-default; chown <i>uid</i>.<i>gid</i> <i>homedir</i>/.qmail-default; }</b> will be run on this machine for users in the virtualdomains file.
+        <li>sendmailmachines - <b>sendmail.cw</b> and <b>virtusertable</b> are copied to the remote machine as <b>/etc/sendmail.cw.new</b> and <b>/etc/virtusertable.new</b>.  If no errors occur, they are moved to <b>/etc/sendmail.cw</b> and <b>/etc/virtusertable</b> and the command specified in the <a href="config.html#sendmailrestart">sendmailrestart</a> configuration file is executed.  (The path can be changed from the default <b>/etc</b> with the <a href="config.html#sendmailconfigpath">sendmailconfigpath</a> configuration file.)
+      </ul>
+    <li>site_perl/svc_acct_sm.pm - If the qmailmachines configuration file exists and a shellmachine is defined, user <b>.qmail-</b> files can be updated.
+      <ul>
+        <li>The command <b>[ -e <i>homedir</i>/.qmail-<i>domain</i>-default ] || { touch <i>homedir</i>/.qmail-<i>domain</i>-default; chown <i>uid</i>.<i>gid</i> <i>homedir</i>/.qmail-<i>domain</i>-default; }</b> is run.
+      </ul>
+  </ul>
+  <br><a name=ssh>Unattended remote login</a> - Freeside can login to remote machines unattended using SSH.  This can pose a security risk if not configured correctly, and will allow an intruder who breaks into your freeside machine full access to your remote machines.  <b>Do not use this feature unless you understand what you are doing!</b>
+    <ul>
+      <li>As the freeside user (on your freeside machine), generate an authentication key using <a href="http://www.tac.nyc.ny.us/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>.  Since this is for unattended operation, you need to use a blank passphrase.
+      <li>Append the newly-created identity.pub file to root's authorized_keys on the remote machine(s).
+    </ul>
+
+</body>
+
diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html
new file mode 100644
index 000000000..2d6bfe786
--- /dev/null
+++ b/httemplate/docs/index.html
@@ -0,0 +1,32 @@
+<head>
+  <title>Documentation</title>
+</head>
+<body bgcolor="#ffffff">
+  <h1>Documentation</h1>
+<img src="overview.png">
+<ul>
+  <li><a href="install.html">New Installation</a>
+  <li><a href="upgrade.html">Upgrading from 1.0.x to 1.1.x</a>
+  <li><a href="upgrade2.html">Upgrading from 1.1.x to 1.1.4</a>
+  <li><a href="upgrade3.html">Upgrading from 1.1.x to 1.2.x</a>
+  <li><a href="upgrade4.html">Upgrading from 1.2.x to 1.2.2</a>
+  <li><a href="upgrade5.html">Upgrading from 1.2.2 to 1.2.3</a>
+  <li><a href="upgrade6.html">Upgrading from 1.2.3 to 1.3.0</a>
+  <li><a href="upgrade7.html">Upgrading from 1.3.0 to 1.3.1</a>
+  <li><a href="upgrade8.html">Upgrading from 1.3.1 to 1.4.0</a>
+  <li><a href="config.html">Configuration files</a>
+  <li><a href="admin.html">Administration</a>
+<!--
+  <li><a href="../index.html#admin">Administration</a>
+!-->
+  <li><a href="legacy.html">Importing legacy data</a>
+  <li><a href="export.html">File exporting and remote setup</a>
+  <li><a href="passwd.html">fs_passwd</a>
+  <li><a href="signup.html">Signup server</a>
+  <li><a href="session.html">Session monitor</a>
+  <li><a href="billing.html">Billing</a>
+  <li><a href="trouble.html">Troubleshooting</a>
+  <li><a href="schema.html">Schema reference</a>
+  <li><a href="man/FS.html">Perl API</a>
+</ul>
+</body>
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
new file mode 100644
index 000000000..d61dc9dfa
--- /dev/null
+++ b/httemplate/docs/install.html
@@ -0,0 +1,121 @@
+<head>
+  <title>Installation</title>
+</head>
+<body>
+<h1>Installation</h1>
+Before installing, you need:
+<ul>
+  <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
+  <li><a href="http://perl.apache.org/">mod_perl</a>
+  <li><a href="http://www.openssh.com//">SSH</a>
+  <li><a href="http://www.perl.com/">Perl</a>  Don't enable experimental features like threads or the PerlIO abstraction layer.
+  <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.  <a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.  (see the <a href="postgresql.html">PostgreSQL notes</a>)  <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>.
+  <li>Perl modules (<a href="http://theoryx5.uwinnipeg.ca/CPAN/perl/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
+    <ul>
+      <li><a href="http://search.cpan.org/search?dist=Array-PrintCols">Array-PrintCols</a>
+      <li><a href="http://search.cpan.org/search?dist=Term-Query">Term-Query</a> (make test broken; install manually)
+      <li><a href="http://search.cpan.org/search?dist=MIME-Base64">MIME-Base64</a>
+      <li><a href="http://search.cpan.org/search?dist=Digest-MD5">Digest-MD5</a>
+      <li><a href="http://search.cpan.org/search?dist=URI">URI</a>
+      <li><a href="http://search.cpan.org/search?dist=HTML-Tagset">HTML-Tagset</a>
+      <li><a href="http://search.cpan.org/search?dist=HTML-Parser">HTML-Parser</a>
+      <li><a href="http://search.cpan.org/search?dist=libnet">libnet</a>
+      <li><a href="http://search.cpan.org/search?dist=Locale-Codes">Locale-Codes</a>
+      <li><a href="http://search.cpan.org/search?dist=Net-Whois">Net-Whois</a>
+      <li><a href="http://search.cpan.org/search?dist=libwww-perl">libwww-perl</a>
+      <li><a href="http://search.cpan.org/search?dist=Business-CreditCard">Business-CreditCard</a>
+      <li><a href="http://search.cpan.org/search?dist=Data-ShowTable">Data-ShowTable</a>
+      <li><a href="http://search.cpan.org/search?dist=MailTools">MailTools</a>
+      <li><a href="http://search.cpan.org/search?dist=TimeDate">TimeDate</a>
+      <li><a href="http://search.cpan.org/search?dist=DateManip">DateManip</a>
+      <li><a href="http://search.cpan.org/search?dist=File-CounterFile">File-CounterFile</a>
+      <li><a href="http://search.cpan.org/search?dist=FreezeThaw">FreezeThaw</a>
+      <li><a href="http://search.cpan.org/search?dist=String-Approx">String-Approx</a>
+      <li><a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>
+      <li><a href="http://search.cpan.org/search?dist=DBI">DBI</a>
+      <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a>
+      <li><a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>
+      <li><a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>
+      <li><a href="http://search.cpan.org/search?dist=String-ShellQuote">String-ShellQuote</a>
+      <li><a href="http://search.cpan.org/search?dist=Net-SCP">Net-SCP</a>
+      <li><a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a>
+    </ul>
+</ul>
+Install the Freeside distribution:
+<ul>
+  <li>Add the user `freeside' to your system.
+  <li>Allow the freeside user full access to the freeside database.
+    <ul>
+      <li> with <a href="http://www.mysql.com/Manual_chapter/manual_Privilege_system.html#Privilege_system">MySQL</a>:<pre>$ mysqladmin -u root password '<i>set_a_root_database_password</i>'
+$ mysql -u root -p
+mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* TO freeside@localhost IDENTIFIED BY '<i>set_a_freeside_database_password</i>';</pre>
+      <li> with <a href="http://postgresql.readysetnet.com/users-lounge/docs/7.1/postgres/user-manag.html#DATABASE-USERS">PostgreSQL</a>
+    </ul>
+  <li>Add the freeside database to your database engine.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Reference.html#CREATE_DATABASE">MySQL</a>) (with <a href="http://postgresql.readysetnet.com/users-lounge/docs/7.1/postgres/managing-databases.html#MANAGE-AG-CREATEDB">PostgreSQL</a>)
+  <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>
+  <li>Build and install the Perl libraries:
+    <pre>
+$ cd FS/
+$ perl Makefile.PL
+$ make
+$ su
+# make install UNINST=1</pre>
+  <li>Copy or link fs-x.y.z/htdocs to your web server's document space.  <pre>mkdir /usr/local/apache/htdocs/freeside
+cp -r fs-x.y.z/htdocs/* /usr/local/apache/htdocs/freeside</pre> or <pre>ln -s /full/path/to/fs-x.y.z/htdocs /usr/local/apache/htdocs/freeside</pre>
+  <li>Restrict access to this web interface.  (with <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache</a>)
+  <li>Enable CGI execution for files with the `.cgi' extension.  (with <a href="http://www.apache.org/docs/mod/mod_mime.html#addhandler">Apache</a>)
+  <li>Set ownership and permissions for the web interface.  The web interface needs to run as the freeside user - there are several ways to do this.
+    <li>You should run a separate iteration of Apache[-SSL] with mod_perl enabled as the freeside user.
+</ul>
+<table>
+  <tr>
+    <th>Apache::ASP</th><th>Mason</th>
+  </tr>
+  <tr>
+    <td><ul>
+      <li>Run <tt>make aspdocs</tt>
+      <li>Copy <tt>aspdocs/</tt> to your web server's document space.
+      <li>Create a <a href="http://www.apache-asp.org/config.html#Global">Global</a> directory, such as <tt>/usr/local/etc/freeside/asp-global/</tt>
+      <li>Copy <tt>htetc/global.asa</tt> to the Global directory.
+      <li>Configure Apache for the Global directory and to execute .cgi files using Apache::ASP.  For example:
+<font size="-1"><pre>
+&lt;Directory /usr/local/apache/htdocs/freeside-asp&gt;
+&lt;Files ~ (\.cgi)&gt;
+AddHandler perl-script .cgi
+PerlHandler Apache::ASP
+&lt;/Files&gt;
+&lt;Perl&gt;
+$MLDBM::RemoveTaint = 1;
+&lt;/Perl&gt;
+PerlSetVar Global /usr/local/etc/freeside/asp-global/
+&lt;/Directory&gt;
+</pre></font>
+    </ul></td>
+    <td><ul>
+      <li>Run <tt>make masondocs</tt>
+      <li>Copy <tt>masondocs/</tt> to your web server's document space.
+      <li>Copy <tt>htetc/handler.pl</tt> to your web server's configuration directory.
+      <li>Edit <tt>handler.pl</tt> and set an appropriate <tt>data_dir</tt>, such as <tt>/usr/local/etc/freeside/mason-data</tt>
+      <li>Configure Apache to use the <tt>handler.pl</tt> file and to execute .cgi files using HTML::Mason.  For example:
+<font size="-1"><pre>
+&lt;Directory /usr/local/apache/htdocs/freeside-mason&gt;
+&lt;Files ~ (\.cgi)&gt;
+AddHandler perl-script .cgi
+PerlHandler HTML::Mason
+&lt;/Files&gt;
+&lt;Perl&gt;
+require "/usr/local/apache/conf/handler.pl";
+&lt;/Perl&gt;
+&lt;/Directory&gt;
+</pre></font>
+    </ul></td>
+  </tr>
+</table>
+<ul>
+<li>Create the necessary <a href="config.html">configuration files</a>.
+<li>Create the `/usr/local/etc/freeside/counters.<i>datasrc</i>', and 
+  `/usr/local/etc/freeside/export.<i>datasrc</i>' directories for each <i>datasrc</i> (owned by the freeside user).
+  <li>As the freeside user, run bin/fs-setup to create the database tables.
+  <li>Now proceed to the initial <a href="admin.html">administration</a> of your installation.
+</ul>
+</body>
diff --git a/httemplate/docs/legacy.html b/httemplate/docs/legacy.html
new file mode 100755
index 000000000..3ab21dab2
--- /dev/null
+++ b/httemplate/docs/legacy.html
@@ -0,0 +1,34 @@
+<head>
+  <title>Importing legacy data</title>
+</head>
+<body>
+  <h1>Importing legacy data</h1>
+<ul>
+  <li><a name="svc_acct">bin/svc_acct.import</a> - Import `passwd', ( `shadow' or `master.passwd' ) and RADIUS `users'.  Before running bin/svc_acct.import, you need <a href="../browse/part_svc.cgi">services</a> (with table svc_acct) as follows:
+    <ul>
+      <li>Most accounts probably have entries in passwd and users (with Port-Limit nonexistant or 1)
+      <li>Some accounts have entries in passwd and users, but with Port-Limit 2 (or more)
+      <li>Some accounts might have entries in users only (Port-Limit 1)
+      <li>Some accounts might have entries in users only (Port-Limit >= 2)
+      <li>POP mail accounts have entries in passwd only, and have a particular shell.
+      <li>Everything else in passwd is a shell account.
+    </ul>
+  <li><a name="svc_acct_sm">bin/svc_acct_sm.import</a> - Import qmail ( `virtualdomains' and `rcpthosts' ), or sendmail ( `virtusertable' and `sendmail.cw' ) files.  Before running bin/svc_acct_sm.import, you need <a href="../browse/part_svc.cgi">services</a> as follows:
+    <ul>
+      <li>Domain (table svc_acct)
+      <li>Mail alias (table svc_acct_sm)
+    </ul>
+  <li><a name="cust_main">Importing customer data</a>
+    <ul>
+      <li>Manually
+        <ul>
+          <li>Add a <a href="../edit/cust_main.cgi">new customer</a>
+          <li>Add one or more packages for this customer
+          <li>Enter a package by clicking on the package number
+          <li>Pick the `Link to existing' option
+        </ul>
+      <li>Batch - You will need to write a script to import your particular legacy data.  You can use eg/TEMPLATE_cust_main.import as a starting point.
+    </ul>
+</ul>
+</body>
+
diff --git a/httemplate/docs/man/FS.html b/httemplate/docs/man/FS.html
new file mode 100644
index 000000000..23e8ca42f
--- /dev/null
+++ b/httemplate/docs/man/FS.html
@@ -0,0 +1,138 @@
+<HTML>
+<HEAD>
+<TITLE>FS - Freeside Perl modules</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<UL>
+
+		<LI><A HREF="#utility classes">Utility classes</A></LI>
+		<LI><A HREF="#database record classes">Database record classes</A></LI>
+		<LI><A HREF="#user interface classes (under development; not yet usable)">User Interface classes (under development; not yet usable)</A></LI>
+		<LI><A HREF="#notes">Notes</A></LI>
+	</UL>
+
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#support">SUPPORT</A></LI>
+	<LI><A HREF="#author">AUTHOR</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS - Freeside Perl modules</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<P>FS is the unofficial (i.e. non-CPAN) prefix for the Perl module portion of the
+Freeside ISP billing software.  This includes:</P>
+<P>
+<H2><A NAME="utility classes">Utility classes</A></H2>
+<P><A HREF="././FS/Conf.html">the FS::Conf manpage</A> - Freeside configuration values</P>
+<P><A HREF="././FS/UID.html">the FS::UID manpage</A> - User class (not yet OO)</P>
+<P><A HREF="././FS/CGI.html">the FS::CGI manpage</A> - Non OO-subroutines for the web interface.  This is
+depriciated.  Future development will be focused on the FS::UI user-interface
+classes (see below).</P>
+<P>
+<H2><A NAME="database record classes">Database record classes</A></H2>
+<P><A HREF="././FS/Record.html">the FS::Record manpage</A> - Database record base class</P>
+<P><A HREF="././FS/svc_acct_pop.html">the FS::svc_acct_pop manpage</A> - POP (Point of Presence, not Post
+Office Protocol) class</P>
+<P><A HREF="././FS/part_referral.html">the FS::part_referral manpage</A> - Referral class</P>
+<P><A HREF="././FS/cust_main_county.html">the FS::cust_main_county manpage</A> - Locale (tax rate) class</P>
+<P><A HREF="././FS/svc_Common.html">the FS::svc_Common manpage</A> - Service base class</P>
+<P><A HREF="././FS/svc_acct.html">the FS::svc_acct manpage</A> - Account (shell, RADIUS, POP3) class</P>
+<P><A HREF="././FS/svc_domain.html">the FS::svc_domain manpage</A> - Domain class</P>
+<P><A HREF="././FS/domain_record.html">the FS::domain_record manpage</A> - DNS zone entries</P>
+<P><A HREF="././FS/svc_acct_sm.html">the FS::svc_acct_sm manpage</A> - Vitual mail alias class</P>
+<P><A HREF="././FS/svc_www.html">the FS::svc_www manpage</A> - Web virtual host class.</P>
+<P><A HREF="././FS/part_svc.html">the FS::part_svc manpage</A> - Service definition class</P>
+<P><A HREF="././FS/part_pkg.html">the FS::part_pkg manpage</A> - Package (billing item) definition class</P>
+<P><A HREF="././FS/pkg_svc.html">the FS::pkg_svc manpage</A> - Class linking package (billing item)
+definitions (see <A HREF="././FS/part_pkg.html">the FS::part_pkg manpage</A>) with service definitions
+(see <A HREF="././FS/part_svc.html">the FS::part_svc manpage</A>)</P>
+<P><A HREF="././FS/agent.html">the FS::agent manpage</A> - Agent (reseller) class</P>
+<P><A HREF="././FS/agent_type.html">the FS::agent_type manpage</A> - Agent type class</P>
+<P><A HREF="././FS/type_pkgs.html">the FS::type_pkgs manpage</A> - Class linking agent types (see
+<A HREF="././FS/agent_type.html">the FS::agent_type manpage</A>) with package (billing item) definitions
+(see <A HREF="././FS/part_pkg.html">the FS::part_pkg manpage</A>)</P>
+<P><A HREF="././FS/cust_svc.html">the FS::cust_svc manpage</A> - Service class</P>
+<P><A HREF="././FS/cust_pkg.html">the FS::cust_pkg manpage</A> - Package (billing item) class</P>
+<P><A HREF="././FS/cust_main.html">the FS::cust_main manpage</A> - Customer class</P>
+<P><A HREF="././FS/cust_main_invoice.html">the FS::cust_main_invoice manpage</A> - Invoice destination
+class</P>
+<P><A HREF="././FS/cust_bill.html">the FS::cust_bill manpage</A> - Invoice class</P>
+<P><A HREF="././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A> - Invoice line item class</P>
+<P><A HREF="././FS/cust_pay.html">the FS::cust_pay manpage</A> - Payment class</P>
+<P><A HREF="././FS/cust_credit.html">the FS::cust_credit manpage</A> - Credit class</P>
+<P><A HREF="././FS/cust_refund.html">the FS::cust_refund manpage</A> - Refund class</P>
+<P><A HREF="././FS/cust_pay_batch.html">the FS::cust_pay_batch manpage</A> - Credit card transaction queue class</P>
+<P><A HREF="././FS/prepay_credit.html">the FS::prepay_credit manpage</A> - Prepaid ``calling card'' credit class.</P>
+<P><A HREF="././FS/nas.html">the FS::nas manpage</A> - Network Access Server class</P>
+<P><A HREF="././FS/port.html">the FS::port manpage</A> - NAS port class</P>
+<P><A HREF="././FS/session.html">the FS::session manpage</A> - User login session class</P>
+<P>
+<H2><A NAME="user interface classes (under development; not yet usable)">User Interface classes (under development; not yet usable)</A></H2>
+<P><A HREF="././FS/UI/Base.html">the FS::UI::Base manpage</A> - User-interface base class</P>
+<P><A HREF="././FS/UI/Gtk.html">the FS::UI::Gtk manpage</A> - Gtk user-interface class</P>
+<P><A HREF="././FS/UI/CGI.html">the FS::UI::CGI manpage</A> - CGI (HTML) user-interface class</P>
+<P><A HREF="././FS/UI/agent.html">the FS::UI::agent manpage</A> - agent table user-interface class</P>
+<P>
+<H2><A NAME="notes">Notes</A></H2>
+<P>To quote perl(1), ``If you're intending to read these straight through for the
+first time, the suggested order will tend to reduce the number of forward
+references.''</P>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>Freeside is a billing and administration package for Internet Service
+Providers.</P>
+<P>The Freeside home page is at &lt;http://www.sisd.com/freeside&gt;.</P>
+<P>The main documentation is in htdocs/docs.</P>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: FS.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="support">SUPPORT</A></H1>
+<P>A mailing list for users and developers is available.  Send a blank message to
+&lt;<A HREF="mailto:ivan-freeside-subscribe@sisd.com">ivan-freeside-subscribe@sisd.com</A>&gt; to subscribe.</P>
+<P>Commercial support is available; see
+&lt;http://www.sisd.com/freeside/commercial.html&gt;.</P>
+<P>
+<HR>
+<H1><A NAME="author">AUTHOR</A></H1>
+<P>Primarily Ivan Kohler &lt;<A HREF="mailto:ivan@sisd.com">ivan@sisd.com</A>&gt;, with help from many kind folks.</P>
+<P>See the CREDITS file in the Freeside distribution for a (hopefully) complete
+list and the individal files for details.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P>perl(1), main Freeside documentation in htdocs/docs/</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The version number of the FS Perl extension differs from the version of the
+Freeside distribution, which are both different from the CVS version tag for
+each file, which appears under the VERSION heading.</P>
+<P>Those modules which would be useful separately should be pulled out, 
+renamed appropriately and uploaded to CPAN.  So far: DBIx::DBSchema, Net::SSH
+and Net::SCP...</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/Bill.html b/httemplate/docs/man/FS/Bill.html
new file mode 100644
index 000000000..cf996ae80
--- /dev/null
+++ b/httemplate/docs/man/FS/Bill.html
@@ -0,0 +1,32 @@
+<HTML>
+<HEAD>
+<TITLE>FS::Bill - Legacy stub</TITLE>
+<LINK REV="made" HREF="mailto:none">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::Bill - Legacy stub
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+The functionality of FS::Bill has been integrated into FS::cust_main.
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/CGI.html b/httemplate/docs/man/FS/CGI.html
new file mode 100644
index 000000000..05f7823b4
--- /dev/null
+++ b/httemplate/docs/man/FS/CGI.html
@@ -0,0 +1,95 @@
+<HTML>
+<HEAD>
+<TITLE>FS::CGI - Subroutines for the web interface</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::CGI - Subroutines for the web interface</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::CGI qw(header menubar idiot eidiot popurl);</PRE>
+<PRE>
+  print header( 'Title', '' );
+  print header( 'Title', menubar('item', 'URL', ... ) );</PRE>
+<PRE>
+  idiot &quot;error message&quot;; 
+  eidiot &quot;error message&quot;;</PRE>
+<PRE>
+  $url = popurl; #returns current url
+  $url = popurl(3); #three levels up</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>Provides a few common subroutines for the web interface.</P>
+<P>
+<HR>
+<H1><A NAME="subroutines">SUBROUTINES</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_header">header TITLE, MENUBAR</A></STRONG><BR>
+<DD>
+Returns an HTML header.
+<P></P>
+<DT><STRONG><A NAME="item_menubar_ITEM%2C_URL%2C_%2E%2E%2E">menubar ITEM, URL, ...</A></STRONG><BR>
+<DD>
+Returns an HTML menubar.
+<P></P>
+<DT><STRONG><A NAME="item_idiot">idiot ERROR</A></STRONG><BR>
+<DD>
+This is depriciated.  Don't use it.
+<P>Sends headers and an HTML error message.</P>
+<P></P>
+<DT><STRONG><A NAME="item_eidiot">eidiot ERROR</A></STRONG><BR>
+<DD>
+This is depriciated.  Don't use it.
+<P>Sends headers and an HTML error message, then exits.</P>
+<P></P>
+<DT><STRONG><A NAME="item_popurl">popurl LEVEL</A></STRONG><BR>
+<DD>
+Returns current URL with LEVEL levels of path removed from the end (default 0).
+<P></P>
+<DT><STRONG><A NAME="item_table">table</A></STRONG><BR>
+<DD>
+Returns HTML tag for beginning a table.
+<P></P>
+<DT><STRONG><A NAME="item_itable">itable</A></STRONG><BR>
+<DD>
+Returns HTML tag for beginning an (invisible) table.
+<P></P>
+<DT><STRONG><A NAME="item_ntable">ntable</A></STRONG><BR>
+<DD>
+This is getting silly.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>Not OO.</P>
+<P>Not complete.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/CGI.html">the CGI manpage</A>, <A HREF="../CGI/Base.html">the CGI::Base manpage</A></P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/CGIwrapper.html b/httemplate/docs/man/FS/CGIwrapper.html
new file mode 100644
index 000000000..bab5e7f37
--- /dev/null
+++ b/httemplate/docs/man/FS/CGIwrapper.html
@@ -0,0 +1,16 @@
+<HTML>
+<HEAD>
+<TITLE>./FS/FS/CGIwrapper.pm</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+<!-- INDEX END -->
+
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/Conf.html b/httemplate/docs/man/FS/Conf.html
new file mode 100644
index 000000000..7b1613efd
--- /dev/null
+++ b/httemplate/docs/man/FS/Conf.html
@@ -0,0 +1,81 @@
+<HTML>
+<HEAD>
+<TITLE>FS::Conf - Read access to Freeside configuration values</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::Conf - Read access to Freeside configuration values</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::Conf;</PRE>
+<PRE>
+  $conf = new FS::Conf &quot;/config/directory&quot;;</PRE>
+<PRE>
+  $FS::Conf::default_dir = &quot;/config/directory&quot;;
+  $conf = new FS::Conf;</PRE>
+<PRE>
+  $dir = $conf-&gt;dir;</PRE>
+<PRE>
+  $value = $conf-&gt;config('key');
+  @list  = $conf-&gt;config('key');
+  $bool  = $conf-&gt;exists('key');</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>Read access to Freeside configuration values.  Keys currently map to filenames,
+but this may change in the future.</P>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new_%5B_DIRECTORY_%5D">new [ DIRECTORY ]</A></STRONG><BR>
+<DD>
+Create a new configuration object.  A directory arguement is required if
+$FS::Conf::default_dir has not been set.
+<P></P>
+<DT><STRONG><A NAME="item_dir">dir</A></STRONG><BR>
+<DD>
+Returns the directory.
+<P></P>
+<DT><STRONG><A NAME="item_config">config</A></STRONG><BR>
+<DD>
+Returns the configuration value or values (depending on context) for key.
+<P></P>
+<DT><STRONG><A NAME="item_exists">exists</A></STRONG><BR>
+<DD>
+Returns true if the specified key exists, even if the corresponding value
+is undefined.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>Write access (with locking) should be implemented.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P>config.html from the base documentation contains a list of configuration files.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/Invoice.html b/httemplate/docs/man/FS/Invoice.html
new file mode 100644
index 000000000..cc837be2e
--- /dev/null
+++ b/httemplate/docs/man/FS/Invoice.html
@@ -0,0 +1,32 @@
+<HTML>
+<HEAD>
+<TITLE>FS::Invoice - Legacy stub</TITLE>
+<LINK REV="made" HREF="mailto:none">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::Invoice - Legacy stub
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+The functionality of FS::Invoice has been integrated in FS::cust_bill.
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/Record.html b/httemplate/docs/man/FS/Record.html
new file mode 100644
index 000000000..09304083f
--- /dev/null
+++ b/httemplate/docs/man/FS/Record.html
@@ -0,0 +1,342 @@
+<HTML>
+<HEAD>
+<TITLE>FS::Record - Database record objects</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#constructors">CONSTRUCTORS</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::Record - Database record objects</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+    use FS::Record;
+    use FS::Record qw(dbh fields qsearch qsearchs dbdef);</PRE>
+<PRE>
+    $record = new FS::Record 'table', \%hash;
+    $record = new FS::Record 'table', { 'column' =&gt; 'value', ... };</PRE>
+<PRE>
+    $record  = qsearchs FS::Record 'table', \%hash;
+    $record  = qsearchs FS::Record 'table', { 'column' =&gt; 'value', ... };
+    @records = qsearch  FS::Record 'table', \%hash; 
+    @records = qsearch  FS::Record 'table', { 'column' =&gt; 'value', ... };</PRE>
+<PRE>
+    $table = $record-&gt;table;
+    $dbdef_table = $record-&gt;dbdef_table;</PRE>
+<PRE>
+    $value = $record-&gt;get('column');
+    $value = $record-&gt;getfield('column');
+    $value = $record-&gt;column;</PRE>
+<PRE>
+    $record-&gt;set( 'column' =&gt; 'value' );
+    $record-&gt;setfield( 'column' =&gt; 'value' );
+    $record-&gt;column('value');</PRE>
+<PRE>
+    %hash = $record-&gt;hash;</PRE>
+<PRE>
+    $hashref = $record-&gt;hashref;</PRE>
+<PRE>
+    $error = $record-&gt;insert;
+    #$error = $record-&gt;add; #depriciated</PRE>
+<PRE>
+    $error = $record-&gt;delete;
+    #$error = $record-&gt;del; #depriciated</PRE>
+<PRE>
+    $error = $new_record-&gt;replace($old_record);
+    #$error = $new_record-&gt;rep($old_record); #depriciated</PRE>
+<PRE>
+    $value = $record-&gt;unique('column');</PRE>
+<PRE>
+    $value = $record-&gt;ut_float('column');
+    $value = $record-&gt;ut_number('column');
+    $value = $record-&gt;ut_numbern('column');
+    $value = $record-&gt;ut_money('column');
+    $value = $record-&gt;ut_text('column');
+    $value = $record-&gt;ut_textn('column');
+    $value = $record-&gt;ut_alpha('column');
+    $value = $record-&gt;ut_alphan('column');
+    $value = $record-&gt;ut_phonen('column');
+    $value = $record-&gt;ut_anythingn('column');</PRE>
+<PRE>
+    $dbdef = reload_dbdef;
+    $dbdef = reload_dbdef &quot;/non/standard/filename&quot;;
+    $dbdef = dbdef;</PRE>
+<PRE>
+    $quoted_value = _quote($value,'table','field');</PRE>
+<PRE>
+    #depriciated
+    $fields = hfields('table');
+    if ( $fields-&gt;{Field} ) { # etc.</PRE>
+<PRE>
+    @fields = fields 'table'; #as a subroutine
+    @fields = $record-&gt;fields; #as a method call</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>(Mostly) object-oriented interface to database records.  Records are currently
+implemented on top of DBI.  FS::Record is intended as a base class for
+table-specific classes to inherit from, i.e. FS::cust_main.</P>
+<P>
+<HR>
+<H1><A NAME="constructors">CONSTRUCTORS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new_%5B_TABLE%2C_%5D_HASHREF">new [ TABLE, ] HASHREF</A></STRONG><BR>
+<DD>
+Creates a new record.  It doesn't store it in the database, though.  See
+<A HREF="#insert">insert</A> for that.
+<P>Note that the object stores this hash reference, not a distinct copy of the
+hash it points to.  You can ask the object for a copy with the <EM>hash</EM> 
+method.</P>
+<P>TABLE can only be omitted when a dervived class overrides the table method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_qsearch_TABLE%2C_HASHREF%2C_SELECT%2C_EXTRA_SQL">qsearch TABLE, HASHREF, SELECT, EXTRA_SQL</A></STRONG><BR>
+<DD>
+Searches the database for all records matching (at least) the key/value pairs
+in HASHREF.  Returns all the records found as `FS::TABLE' objects if that
+module is loaded (i.e. via `use FS::cust_main;'), otherwise returns FS::Record
+objects.
+<P>###oops, argh, FS::Record::new only lets us create database fields.
+#Normal behaviour if SELECT is not specified is `*', as in
+#<CODE>SELECT * FROM table WHERE ...</CODE>.  However, there is an experimental new
+#feature where you can specify SELECT - remember, the objects returned,
+#although blessed into the appropriate `FS::TABLE' package, will only have the
+#fields you specify.  This might have unwanted results if you then go calling
+#regular FS::TABLE methods
+#on it.</P>
+<P></P>
+<DT><STRONG><A NAME="item_qsearchs">qsearchs TABLE, HASHREF</A></STRONG><BR>
+<DD>
+Same as qsearch, except that if more than one record matches, it <STRONG>carp</STRONG>s but
+returns the first.  If this happens, you either made a logic error in asking
+for a single item, or your data is corrupted.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_table">table</A></STRONG><BR>
+<DD>
+Returns the table name.
+<P></P>
+<DT><STRONG><A NAME="item_dbdef_table">dbdef_table</A></STRONG><BR>
+<DD>
+Returns the FS::dbdef_table object for the table.
+<P></P>
+<DT><STRONG><A NAME="item_get%2C_getfield_COLUMN">get, getfield COLUMN</A></STRONG><BR>
+<DD>
+Returns the value of the column/field/key COLUMN.
+<P></P>
+<DT><STRONG><A NAME="item_set%2C_setfield_COLUMN%2C_VALUE">set, setfield COLUMN, VALUE</A></STRONG><BR>
+<DD>
+Sets the value of the column/field/key COLUMN to VALUE.  Returns VALUE.
+<P></P>
+<DT><STRONG><A NAME="item_AUTLOADED_METHODS">AUTLOADED METHODS</A></STRONG><BR>
+<DD>
+$record-&gt;column is a synonym for $record-&gt;get('column');
+<P>$record-&gt;<CODE>column('value')</CODE> is a synonym for $record-&gt;set('column','value');</P>
+<P></P>
+<DT><STRONG><A NAME="item_hash">hash</A></STRONG><BR>
+<DD>
+Returns a list of the column/value pairs, usually for assigning to a new hash.
+<P>To make a distinct duplicate of an FS::Record object, you can do:</P>
+<PRE>
+    $new = new FS::Record ( $old-&gt;table, { $old-&gt;hash } );</PRE>
+<P></P>
+<DT><STRONG><A NAME="item_hashref">hashref</A></STRONG><BR>
+<DD>
+Returns a reference to the column/value hash.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Inserts this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_add">add</A></STRONG><BR>
+<DD>
+Depriciated (use insert instead).
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Delete this record from the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_del">del</A></STRONG><BR>
+<DD>
+Depriciated (use delete instead).
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replace the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_rep">rep</A></STRONG><BR>
+<DD>
+Depriciated (use replace instead).
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Not yet implemented, croaks.  Derived classes should provide a check method.
+<P></P>
+<DT><STRONG><A NAME="item_unique">unique COLUMN</A></STRONG><BR>
+<DD>
+Replaces COLUMN in record with a unique number.  Called by the <STRONG>add</STRONG> method
+on primary keys and single-field unique columns (see <A HREF="../DBIx/DBSchema/Table.html">the DBIx::DBSchema::Table manpage</A>).
+Returns the new value.
+<P></P>
+<DT><STRONG><A NAME="item_ut_float_COLUMN">ut_float COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint floating point numeric data: 1.1, 1, 1.1e10, 1e10.  May not be
+null.  If there is an error, returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_ut_number_COLUMN">ut_number COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint simple numeric data (whole numbers).  May not be null.  If there
+is an error, returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_ut_numbern_COLUMN">ut_numbern COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint simple numeric data (whole numbers).  May be null.  If there is
+an error, returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_ut_money_COLUMN">ut_money COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint monetary numbers.  May be negative.  Set to 0 if null.  If there
+is an error, returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_ut_text_COLUMN">ut_text COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint text.  Alphanumerics, spaces, and the following punctuation
+symbols are currently permitted: ! @ # $ % &amp; ( ) - + ; : ' `` , . ? /
+May not be null.  If there is an error, returns the error, otherwise returns
+false.
+<P></P>
+<DT><STRONG><A NAME="item_ut_textn_COLUMN">ut_textn COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint text.  Alphanumerics, spaces, and the following punctuation
+symbols are currently permitted: ! @ # $ % &amp; ( ) - + ; : ' `` , . ? /
+May be null.  If there is an error, returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_ut_alpha_COLUMN">ut_alpha COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint alphanumeric strings (no spaces).  May not be null.  If there is
+an error, returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG>ut_alpha COLUMN</STRONG><BR>
+<DD>
+Check/untaint alphanumeric strings (no spaces).  May be null.  If there is an
+error, returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_ut_phonen_COLUMN_%5B_COUNTRY_%5D">ut_phonen COLUMN [ COUNTRY ]</A></STRONG><BR>
+<DD>
+Check/untaint phone numbers.  May be null.  If there is an error, returns
+the error, otherwise returns false.
+<P>Takes an optional two-letter ISO country code; without it or with unsupported
+countries, ut_phonen simply calls ut_alphan.</P>
+<P></P>
+<DT><STRONG><A NAME="item_ut_ip_COLUMN">ut_ip COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint ip addresses.  IPv4 only for now.
+<P></P>
+<DT><STRONG><A NAME="item_ut_ipn_COLUMN">ut_ipn COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint ip addresses.  IPv4 only for now.  May be null.
+<P></P>
+<DT><STRONG><A NAME="item_ut_domain_COLUMN">ut_domain COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint host and domain names.
+<P></P>
+<DT><STRONG><A NAME="item_ut_anything_COLUMN">ut_anything COLUMN</A></STRONG><BR>
+<DD>
+Untaints arbitrary data.  Be careful.
+<P></P>
+<DT><STRONG><A NAME="item_fields_%5B_TABLE_%5D">fields [ TABLE ]</A></STRONG><BR>
+<DD>
+This can be used as both a subroutine and a method call.  It returns a list
+of the columns in this record's table, or an explicitly specified table.
+(See <A HREF="../DBIx/DBSchema/Table.html">the DBIx::DBSchema::Table manpage</A>).
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="subroutines">SUBROUTINES</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_reload_dbdef"><CODE>reload_dbdef([FILENAME])</CODE></A></STRONG><BR>
+<DD>
+Load a database definition (see <A HREF="../DBIx/DBSchema.html">the DBIx::DBSchema manpage</A>), optionally from a
+non-default filename.  This command is executed at startup unless
+<EM>$FS::Record::setup_hack</EM> is true.  Returns a DBIx::DBSchema object.
+<P></P>
+<DT><STRONG><A NAME="item_dbdef">dbdef</A></STRONG><BR>
+<DD>
+Returns the current database definition.  See <A HREF="../FS/dbdef.html">the FS::dbdef manpage</A>.
+<P></P>
+<DT><STRONG><A NAME="item__quote_VALUE%2C_TABLE%2C_COLUMN">_quote VALUE, TABLE, COLUMN</A></STRONG><BR>
+<DD>
+This is an internal function used to construct SQL statements.  It returns
+VALUE DBI-quoted (see <EM>DBI/``quote''</EM>) unless VALUE is a number and the column
+type (see <A HREF="../FS/dbdef_column.html">the FS::dbdef_column manpage</A>) does not end in `char' or `binary'.
+<P></P>
+<DT><STRONG><A NAME="item_hfields">hfields TABLE</A></STRONG><BR>
+<DD>
+This is depriciated.  Don't use it.
+<P>It returns a hash-type list with the fields of this record's table set true.</P>
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: Record.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>This module should probably be renamed, since much of the functionality is
+of general use.  It is not completely unlike Adapter::DBI (see below).</P>
+<P>Exported qsearch and qsearchs should be depriciated in favor of method calls
+(against an FS::Record object like the old search and searchs that qsearch
+and qsearchs were on top of.)</P>
+<P>The whole fields / hfields mess should be removed.</P>
+<P>The various WHERE clauses should be subroutined.</P>
+<P>table string should be depriciated in favor of FS::dbdef_table.</P>
+<P>No doubt we could benefit from a Tied hash.  Documenting how exists / defined
+true maps to the database (and WHERE clauses) would also help.</P>
+<P>The ut_ methods should ask the dbdef for a default length.</P>
+<P>ut_sqltype (like ut_varchar) should all be defined</P>
+<P>A fallback check method should be provided which uses the dbdef.</P>
+<P>The ut_money method assumes money has two decimal digits.</P>
+<P>The Pg money kludge in the new method only strips `$'.</P>
+<P>The ut_phonen method assumes US-style phone numbers.</P>
+<P>The _quote function should probably use ut_float instead of a regex.</P>
+<P>All the subroutines probably should be methods, here or elsewhere.</P>
+<P>Probably should borrow/use some dbdef methods where appropriate (like sub
+fields)</P>
+<P>As of 1.14, DBI fetchall_hashref( {} ) doesn't set fetchrow_hashref NAME_lc,
+or allow it to be set.  Working around it is ugly any way around - DBI should
+be fixed.  (only affects RDBMS which return uppercase column names)</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF="../DBIx/DBSchema.html">the DBIx::DBSchema manpage</A>, <A HREF=".././FS/UID.html">the FS::UID manpage</A>, <EM>DBI</EM></P>
+<P>Adapter::DBI from Ch. 11 of Advanced Perl Programming by Sriram Srinivasan.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/SessionClient.html b/httemplate/docs/man/FS/SessionClient.html
new file mode 100644
index 000000000..615f35e0e
--- /dev/null
+++ b/httemplate/docs/man/FS/SessionClient.html
@@ -0,0 +1,97 @@
+<HTML>
+<HEAD>
+<TITLE>FS::SessionClient - Freeside session client API</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::SessionClient - Freeside session client API</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::SessionClient qw( login portnum logout );</PRE>
+<PRE>
+  $error = login ( {
+    'username' =&gt; $username,
+    'password' =&gt; $password,
+    'login'    =&gt; $timestamp,
+    'portnum'  =&gt; $portnum,
+  } );</PRE>
+<PRE>
+  $portnum = portnum( { 'ip' =&gt; $ip } ) or die &quot;unknown ip!&quot;
+  $portnum = portnum( { 'nasnum' =&gt; $nasnum, 'nasport' =&gt; $nasport } )
+    or die &quot;unknown nasnum/nasport&quot;;</PRE>
+<PRE>
+  $error = logout ( {
+    'username' =&gt; $username,
+    'password' =&gt; $password,
+    'logout'   =&gt; $timestamp,
+    'portnum'  =&gt; $portnum,
+  } );</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>This modules provides an API for a remote session application.</P>
+<P>It needs to be run as the freeside user.  Because of this, the program which
+calls these subroutines should be written very carefully.</P>
+<P>
+<HR>
+<H1><A NAME="subroutines">SUBROUTINES</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_login">login HASHREF</A></STRONG><BR>
+<DD>
+HASHREF should have the following keys: username, password, login and portnum.
+login is a UNIX timestamp; if not specified, will default to the current time.
+Starts a new session for the specified user and portnum.  The password is
+optional, but must be correct if specified.
+<P>Returns a scalar error message, or the empty string for success.</P>
+<P></P>
+<DT><STRONG><A NAME="item_portnum">portnum</A></STRONG><BR>
+<DD>
+HASHREF should contain a single key: ip, or the two keys: nasnum and nasport.
+Returns a portnum suitable for the login and logout subroutines, or false
+on error.
+<P></P>
+<DT><STRONG><A NAME="item_logout">logout HASHREF</A></STRONG><BR>
+<DD>
+HASHREF should have the following keys: usrename, password, logout and portnum.
+logout is a UNIX timestamp; if not specified, will default to the current time.
+Starts a new session for the specified user and portnum.  The password is
+optional, but must be correct if specified.
+<P>Returns a scalar error message, or the empty string for success.</P>
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: SessionClient.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><EM>fs_sessiond</EM></P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/SignupClient.html b/httemplate/docs/man/FS/SignupClient.html
new file mode 100644
index 000000000..844f64f33
--- /dev/null
+++ b/httemplate/docs/man/FS/SignupClient.html
@@ -0,0 +1,125 @@
+<HTML>
+<HEAD>
+<TITLE>FS::SignupClient - Freeside signup client API</TITLE>
+<LINK REV="made" HREF="mailto:none">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#SUBROUTINES">SUBROUTINES</A>
+	<LI><A HREF="#VERSION">VERSION</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+FS::SignupClient - Freeside signup client API
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE>  use FS::SignupClient qw( signup_info new_customer );
+</PRE>
+<P>
+<PRE>  ( $locales, $packages, $pops ) = signup_info;
+</PRE>
+<P>
+<PRE>  $error = new_customer ( {
+    'first'          =&gt; $first,
+    'last'           =&gt; $last,
+    'ss'             =&gt; $ss,
+    'comapny'        =&gt; $company,
+    'address1'       =&gt; $address1,
+    'address2'       =&gt; $address2,
+    'city'           =&gt; $city,
+    'county'         =&gt; $county,
+    'state'          =&gt; $state,
+    'zip'            =&gt; $zip,
+    'country'        =&gt; $country,
+    'daytime'        =&gt; $daytime,
+    'night'          =&gt; $night,
+    'fax'            =&gt; $fax,
+    'payby'          =&gt; $payby,
+    'payinfo'        =&gt; $payinfo,
+    'paydate'        =&gt; $paydate,
+    'payname'        =&gt; $payname,
+    'invoicing_list' =&gt; $invoicing_list,
+    'pkgpart'        =&gt; $pkgpart,
+    'username'       =&gt; $username,
+    '_password'       =&gt; $password,
+    'popnum'         =&gt; $popnum,
+  } );
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+This module provides an API for a remote signup server.
+
+<P>
+It needs to be run as the freeside user. Because of this, the program which
+calls these subroutines should be written very carefully.
+
+<P>
+<HR>
+<H1><A NAME="SUBROUTINES">SUBROUTINES</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_signup_info">signup_info</A></STRONG><DD>
+<P>
+Returns three array references of hash references.
+
+<P>
+The first set of hash references is of allowable locales. Each hash
+reference has the following keys: taxnum state county country
+
+<P>
+The second set of hash references is of allowable packages. Each hash
+reference has the following keys: pkgpart pkg
+
+<P>
+The third set of hash references is of allowable POPs (Points Of Presence).
+Each hash reference has the following keys: popnum city state ac exch
+
+<DT><STRONG><A NAME="item_new_customer">new_customer HASHREF</A></STRONG><DD>
+<P>
+Adds a customer to the remote Freeside system. Requires a hash reference as
+a paramater with the following keys: first last ss comapny address1
+address2 city county state zip country daytime night fax payby payinfo
+paydate payname invoicing_list pkgpart username _password popnum
+
+<P>
+Returns a scalar error message, or the empty string for success.
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+$Id: SignupClient.html,v 1.1 2001-07-30 07:36:03 ivan Exp $
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<EM>fs_signupd</EM>, <A HREF="./htdocs/docs/man/FS/SignupServer.html">FS::SignupServer</A>, <A HREF="./htdocs/docs/man/FS/cust_main.html">FS::cust_main</A>
+
+
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/UI/Base.html b/httemplate/docs/man/FS/UI/Base.html
new file mode 100644
index 000000000..445fd0d0b
--- /dev/null
+++ b/httemplate/docs/man/FS/UI/Base.html
@@ -0,0 +1,100 @@
+<HTML>
+<HEAD>
+<TITLE>FS::UI::Base - Base class for all user-interface objects</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+	<LI><A HREF="#history">HISTORY</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::UI::Base - Base class for all user-interface objects</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::UI::SomeInterface;
+  use FS::UI::some_table;</PRE>
+<PRE>
+  $interface = new FS::UI::some_table;</PRE>
+<PRE>
+  $error = $interface-&gt;browse;
+  $error = $interface-&gt;search;
+  $error = $interface-&gt;view;
+  $error = $interface-&gt;edit;
+  $error = $interface-&gt;process;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::UI::Base object represents a user interface object.  FS::UI::Base
+is intended as a base class for table-specfic classes to inherit from, i.e.
+FS::UI::cust_main.  The simplest case, which will provide a default UI for your
+new table, is as follows:</P>
+<PRE>
+  package FS::UI::table_name;
+  use vars qw ( @ISA );
+  use FS::UI::Base;
+  @ISA = qw( FS::UI::Base );
+  sub db_table { 'table_name'; }</PRE>
+<P>Currently available interfaces are:
+  FS::UI::Gtk, an X-Windows UI implemented using the Gtk+ toolkit
+  FS::UI::CGI, a web interface implemented using CGI.pm, etc.</P>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_browse">browse</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_title">title</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_addwidget">addwidget</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: Base.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>This documentation is incomplete.</P>
+<P>There should be some sort of per-(freeside)-user preferences and the ability
+for specific FS::UI:: modules to put their own values there as well.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF="../.././FS/UI/Gtk.html">the FS::UI::Gtk manpage</A>, <A HREF="../.././FS/UI/CGI.html">the FS::UI::CGI manpage</A></P>
+<P>
+<HR>
+<H1><A NAME="history">HISTORY</A></H1>
+<P>$Log: Base.html,v $
+<P>Revision 1.3  2002-01-29 17:42:46  ivan
+<P>weight, plan and plandata fields in part_bill_event
+<P>
+Revision 1.1  1999/08/04 09:03:53  ivan
+initial checkin of module files for proper perl installation</P>
+<P>Revision 1.1  1999/01/20 09:30:36  ivan
+skeletal cross-UI UI code.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/UI/CGI.html b/httemplate/docs/man/FS/UI/CGI.html
new file mode 100644
index 000000000..22b6c76b8
--- /dev/null
+++ b/httemplate/docs/man/FS/UI/CGI.html
@@ -0,0 +1,94 @@
+<HTML>
+<HEAD>
+<TITLE>FS::UI::CGI - Base class for CGI user-interface objects</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+	<LI><A HREF="#history">HISTORY</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::UI::CGI - Base class for CGI user-interface objects</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::UI::CGI;
+  use FS::UI::some_table;</PRE>
+<PRE>
+  $interface = new FS::UI::some_table;</PRE>
+<PRE>
+  $error = $interface-&gt;browse;
+  $error = $interface-&gt;search;
+  $error = $interface-&gt;view;
+  $error = $interface-&gt;edit;
+  $error = $interface-&gt;process;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::UI::CGI object represents a CGI interface object.</P>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item__header">_header</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item__footer">_footer</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_interface">interface</A></STRONG><BR>
+<DD>
+Returns the string `CGI'.  Useful for the author of a table-specific UI class
+to conditionally specify certain behaviour.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: CGI.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>This documentation is incomplete.</P>
+<P>In _Tableborder, headers should be links that sort on their fields.</P>
+<P>_Link uses a constant $BASE_URL</P>
+<P>_Link passes the arguments as a manually-constructed GET string instead
+of POSTing, for compatability while the web interface is upgraded.  Once
+this is done it should pass arguements properly (i.e. as a POST, 8-bit clean)</P>
+<P>Still some small bits of widget code same as FS::UI::Gtk.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF="../.././FS/UI/Base.html">the FS::UI::Base manpage</A></P>
+<P>
+<HR>
+<H1><A NAME="history">HISTORY</A></H1>
+<P>$Log: CGI.html,v $
+<P>Revision 1.3  2002-01-29 17:42:46  ivan
+<P>weight, plan and plandata fields in part_bill_event
+<P>
+Revision 1.1  1999/08/04 09:03:53  ivan
+initial checkin of module files for proper perl installation</P>
+<P>Revision 1.1  1999/01/20 09:30:36  ivan
+skeletal cross-UI UI code.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/UI/Gtk.html b/httemplate/docs/man/FS/UI/Gtk.html
new file mode 100644
index 000000000..6f203c7bb
--- /dev/null
+++ b/httemplate/docs/man/FS/UI/Gtk.html
@@ -0,0 +1,91 @@
+<HTML>
+<HEAD>
+<TITLE>FS::UI::Gtk - Base class for Gtk user-interface objects</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+	<LI><A HREF="#history">HISTORY</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::UI::Gtk - Base class for Gtk user-interface objects</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::UI::Gtk;
+  use FS::UI::some_table;</PRE>
+<PRE>
+  $interface = new FS::UI::some_table;</PRE>
+<PRE>
+  $error = $interface-&gt;browse;
+  $error = $interface-&gt;search;
+  $error = $interface-&gt;view;
+  $error = $interface-&gt;edit;
+  $error = $interface-&gt;process;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::UI::Gtk object represents a Gtk user interface object.</P>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_interface">interface</A></STRONG><BR>
+<DD>
+Returns the string `Gtk'.  Useful for the author of a table-specific UI class
+to conditionally specify certain behaviour.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: Gtk.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>This documentation is incomplete.</P>
+<P>_Tableborder is just a _Table now.  _Tableborders should scroll (but not the
+headers) and need and need more decoration. (data in white section ala gtksql
+and sliding field widths) headers should be buttons that callback to sort on
+their fields.</P>
+<P>There should be a persistant, per-(freeside)-user store for window positions
+and sizes and sort fields etc (see <A HREF="../.././FS/UI/CGI.html#bugs">BUGS in the FS::UI::CGI manpage</A>.</P>
+<P>Still some small bits of widget code same as FS::UI::CGI.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF="../.././FS/UI/Base.html">the FS::UI::Base manpage</A></P>
+<P>
+<HR>
+<H1><A NAME="history">HISTORY</A></H1>
+<P>$Log: Gtk.html,v $
+<P>Revision 1.3  2002-01-29 17:42:46  ivan
+<P>weight, plan and plandata fields in part_bill_event
+<P>
+Revision 1.1  1999/08/04 09:03:53  ivan
+initial checkin of module files for proper perl installation</P>
+<P>Revision 1.1  1999/01/20 09:30:36  ivan
+skeletal cross-UI UI code.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/UI/agent.html b/httemplate/docs/man/FS/UI/agent.html
new file mode 100644
index 000000000..8608e4ef4
--- /dev/null
+++ b/httemplate/docs/man/FS/UI/agent.html
@@ -0,0 +1,16 @@
+<HTML>
+<HEAD>
+<TITLE>./FS/FS/UI/agent.pm</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+<!-- INDEX END -->
+
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/UID.html b/httemplate/docs/man/FS/UID.html
new file mode 100644
index 000000000..9f4947765
--- /dev/null
+++ b/httemplate/docs/man/FS/UID.html
@@ -0,0 +1,142 @@
+<HTML>
+<HEAD>
+<TITLE>FS::UID - Subroutines for database login and assorted other stuff</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
+	<LI><A HREF="#callbacks">CALLBACKS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::UID - Subroutines for database login and assorted other stuff</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::UID qw(adminsuidsetup cgisuidsetup dbh datasrc getotaker
+  checkeuid checkruid swapuid);</PRE>
+<PRE>
+  adminsuidsetup $user;</PRE>
+<PRE>
+  $cgi = new CGI;
+  $dbh = cgisuidsetup($cgi);</PRE>
+<PRE>
+  $dbh = dbh;</PRE>
+<PRE>
+  $datasrc = datasrc;</PRE>
+<PRE>
+  $driver_name = driver_name;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>Provides a hodgepodge of subroutines.</P>
+<P>
+<HR>
+<H1><A NAME="subroutines">SUBROUTINES</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_adminsuidsetup">adminsuidsetup USER</A></STRONG><BR>
+<DD>
+Sets the user to USER (see config.html from the base documentation).
+Cleans the environment.
+Make sure the script is running as freeside, or setuid freeside.
+Opens a connection to the database.
+Swaps real and effective UIDs.
+Runs any defined callbacks (see below).
+Returns the DBI database handle (usually you don't need this).
+<P></P>
+<DT><STRONG><A NAME="item_cgisuidsetup_CGI_object">cgisuidsetup CGI_object</A></STRONG><BR>
+<DD>
+Takes a single argument, which is a CGI (see <A HREF=".././FS/CGI.html">the CGI manpage</A>) or Apache (see <EM>Apache</EM>)
+object (CGI::Base is depriciated).  Runs cgisetotaker and then adminsuidsetup.
+<P></P>
+<DT><STRONG><A NAME="item_cgi">cgi</A></STRONG><BR>
+<DD>
+Returns the CGI (see <A HREF=".././FS/CGI.html">the CGI manpage</A>) object.
+<P></P>
+<DT><STRONG><A NAME="item_dbh">dbh</A></STRONG><BR>
+<DD>
+Returns the DBI database handle.
+<P></P>
+<DT><STRONG><A NAME="item_datasrc">datasrc</A></STRONG><BR>
+<DD>
+Returns the DBI data source.
+<P></P>
+<DT><STRONG><A NAME="item_driver_name">driver_name</A></STRONG><BR>
+<DD>
+Returns just the driver name portion of the DBI data source.
+<P></P>
+<DT><STRONG><A NAME="item_getotaker">getotaker</A></STRONG><BR>
+<DD>
+Returns the current Freeside user.
+<P></P>
+<DT><STRONG><A NAME="item_cgisetotaker">cgisetotaker</A></STRONG><BR>
+<DD>
+Sets and returns the CGI REMOTE_USER.  $cgi should be defined as a CGI.pm
+object (see <A HREF=".././FS/CGI.html">the CGI manpage</A>) or an Apache object (see <EM>Apache</EM>).  Support for CGI::Base
+and derived classes is depriciated.
+<P></P>
+<DT><STRONG><A NAME="item_checkeuid">checkeuid</A></STRONG><BR>
+<DD>
+Returns true if effective UID is that of the freeside user.
+<P></P>
+<DT><STRONG><A NAME="item_checkruid">checkruid</A></STRONG><BR>
+<DD>
+Returns true if the real UID is that of the freeside user.
+<P></P>
+<DT><STRONG><A NAME="item_swapuid">swapuid</A></STRONG><BR>
+<DD>
+Swaps real and effective UIDs.
+<P></P>
+<DT><STRONG><A NAME="item_getsecrets_%5B_USER_%5D">getsecrets [ USER ]</A></STRONG><BR>
+<DD>
+Sets the user to USER, if supplied.
+Sets and returns the DBI datasource, username and password for this user from
+the `/usr/local/etc/freeside/mapsecrets' file.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="callbacks">CALLBACKS</A></H1>
+<P>Warning: this interface is likely to change in future releases.</P>
+<P>A package can install a callback to be run in adminsuidsetup by putting a
+coderef into the hash %FS::UID::callback :</P>
+<PRE>
+    $coderef = sub { warn &quot;Hi, I'm returning your call!&quot; };
+    $FS::UID::callback{'Package::Name'};</PRE>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: UID.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>Too many package-global variables.</P>
+<P>Not OO.</P>
+<P>No capabilities yet.  When mod_perl and Authen::DBI are implemented, 
+cgisuidsetup will go away as well.</P>
+<P>Goes through contortions to support non-OO syntax with multiple datasrc's.</P>
+<P>Callbacks are inelegant.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/CGI.html">the CGI manpage</A>, <EM>DBI</EM>, config.html from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/agent.html b/httemplate/docs/man/FS/agent.html
new file mode 100644
index 000000000..a660ed427
--- /dev/null
+++ b/httemplate/docs/man/FS/agent.html
@@ -0,0 +1,121 @@
+<HTML>
+<HEAD>
+<TITLE>FS::agent - Object methods for agent records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::agent - Object methods for agent records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::agent;</PRE>
+<PRE>
+  $record = new FS::agent \%hash;
+  $record = new FS::agent { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $agent_type = $record-&gt;agent_type;</PRE>
+<PRE>
+  $hashref = $record-&gt;pkgpart_hashref;
+  #may purchase $pkgpart if $hashref-&gt;{$pkgpart};</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::agent object represents an agent.  Every customer has an agent.  Agents
+can be used to track things like resellers or salespeople.  FS::agent inherits
+from FS::Record.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_key">agemtnum - primary key (assigned automatically for new agents)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_agent_%2D_Text_name_of_this_agent">agent - Text name of this agent</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_typenum_%2D_Agent_type%2E_See_FS%3A%3Aagent_type">typenum - Agent type.  See <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A></A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_prog_%2D_For_future_use%2E">prog - For future use.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_freq_%2D_For_future_use%2E">freq - For future use.</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new agent.  To add the agent to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this agent to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this agent from the database.  Only agents with no customers can be
+deleted.  If there is an error, returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid agent.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+<P></P>
+<DT><STRONG><A NAME="item_agent_type">agent_type</A></STRONG><BR>
+<DD>
+Returns the FS::agent_type object (see <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A>) for this agent.
+<P></P>
+<DT><STRONG><A NAME="item_pkgpart_hashref">pkgpart_hashref</A></STRONG><BR>
+<DD>
+Returns a hash reference.  The keys of the hash are pkgparts.  The value is
+true if this agent may purchase the specified package definition.  See
+<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: agent.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, 
+schema.html from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/agent_type.html b/httemplate/docs/man/FS/agent_type.html
new file mode 100644
index 000000000..40552d6d3
--- /dev/null
+++ b/httemplate/docs/man/FS/agent_type.html
@@ -0,0 +1,126 @@
+<HTML>
+<HEAD>
+<TITLE>FS::agent_type - Object methods for agent_type records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::agent_type - Object methods for agent_type records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::agent_type;</PRE>
+<PRE>
+  $record = new FS::agent_type \%hash;
+  $record = new FS::agent_type { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $hashref = $record-&gt;pkgpart_hashref;
+  #may purchase $pkgpart if $hashref-&gt;{$pkgpart};</PRE>
+<PRE>
+  @type_pkgs = $record-&gt;type_pkgs;</PRE>
+<PRE>
+  @pkgparts = $record-&gt;pkgpart;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::agent_type object represents an agent type.  Every agent (see
+<A HREF=".././FS/agent.html">the FS::agent manpage</A>) has an agent type.  Agent types define which packages (see
+<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>) may be purchased by customers (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>), via 
+FS::type_pkgs records (see <A HREF=".././FS/type_pkgs.html">the FS::type_pkgs manpage</A>).  FS::agent_type inherits from
+FS::Record.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_key">typenum - primary key (assigned automatically for new agent types)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_atype_%2D_Text_name_of_this_agent_type">atype - Text name of this agent type</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new agent type.  To add the agent type to the database, see
+<A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this agent type to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this agent type from the database.  Only agent types with no agents
+can be deleted.  If there is an error, returns the error, otherwise returns
+false.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid agent type.  If there is an
+error, returns the error, otherwise returns false.  Called by the insert and
+replace methods.
+<P></P>
+<DT><STRONG><A NAME="item_pkgpart_hashref">pkgpart_hashref</A></STRONG><BR>
+<DD>
+Returns a hash reference.  The keys of the hash are pkgparts.  The value is
+true iff this agent may purchase the specified package definition.  See
+<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>.
+<P></P>
+<DT><STRONG><A NAME="item_type_pkgs">type_pkgs</A></STRONG><BR>
+<DD>
+Returns all FS::type_pkgs objects (see <A HREF=".././FS/type_pkgs.html">the FS::type_pkgs manpage</A>) for this agent type.
+<P></P>
+<DT><STRONG><A NAME="item_pkgpart">pkgpart</A></STRONG><BR>
+<DD>
+Returns the pkgpart of all package definitions (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>) for this
+agent type.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: agent_type.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/agent.html">the FS::agent manpage</A>, <A HREF=".././FS/type_pkgs.html">the FS::type_pkgs manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>,
+<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, schema.html from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/cust_bill.html b/httemplate/docs/man/FS/cust_bill.html
new file mode 100644
index 000000000..2e2ad37fe
--- /dev/null
+++ b/httemplate/docs/man/FS/cust_bill.html
@@ -0,0 +1,161 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_bill - Object methods for cust_bill records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_bill - Object methods for cust_bill records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_bill;</PRE>
+<PRE>
+  $record = new FS::cust_bill \%hash;
+  $record = new FS::cust_bill { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  ( $total_previous_balance, @previous_cust_bill ) = $record-&gt;previous;</PRE>
+<PRE>
+  @cust_bill_pkg_objects = $cust_bill-&gt;cust_bill_pkg;</PRE>
+<PRE>
+  ( $total_previous_credits, @previous_cust_credit ) = $record-&gt;cust_credit;</PRE>
+<PRE>
+  @cust_pay_objects = $cust_bill-&gt;cust_pay;</PRE>
+<PRE>
+  @lines = $cust_bill-&gt;print_text;
+  @lines = $cust_bill-&gt;print_text $time;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_bill object represents an invoice; a declaration that a customer
+owes you money.  The specific charges are itemized as <STRONG>cust_bill_pkg</STRONG> records
+(see <A HREF=".././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A>).  FS::cust_bill inherits from FS::Record.  The
+following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_key">invnum - primary key (assigned automatically for new invoices)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_customer">custnum - customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item__date_%2D_specified_as_a_UNIX_timestamp%3B_see_per">_date - specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
+<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_charged_%2D_amount_of_this_invoice">charged - amount of this invoice</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_automatically">printed - how many times this invoice has been printed automatically
+(see <A HREF=".././FS/cust_main.html#collect">collect in the FS::cust_main manpage</A>).</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new invoice.  To add the invoice to the database, see <A HREF="#insert">insert</A>.
+Invoices are normally created by calling the bill method of a customer object
+(see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this invoice to the database (``Posts'' the invoice).  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Currently unimplemented.  I don't remove invoices because there would then be
+no record you ever posted this invoice (which is bad, no?)
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P>Only printed may be changed.  printed is normally updated by calling the
+collect method of a customer object (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid invoice.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+<P></P>
+<DT><STRONG><A NAME="item_previous">previous</A></STRONG><BR>
+<DD>
+Returns a list consisting of the total previous balance for this customer, 
+followed by the previous outstanding invoices (as FS::cust_bill objects also).
+<P></P>
+<DT><STRONG><A NAME="item_cust_bill_pkg">cust_bill_pkg</A></STRONG><BR>
+<DD>
+Returns the line items (see <A HREF=".././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A>) for this invoice.
+<P></P>
+<DT><STRONG><A NAME="item_cust_credit">cust_credit</A></STRONG><BR>
+<DD>
+Returns a list consisting of the total previous credited (see
+<A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>) for this customer, followed by the previous outstanding
+credits (FS::cust_credit objects).
+<P></P>
+<DT><STRONG><A NAME="item_cust_pay">cust_pay</A></STRONG><BR>
+<DD>
+Returns all payments (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>) for this invoice.
+<P></P>
+<DT><STRONG><A NAME="item_owed">owed</A></STRONG><BR>
+<DD>
+Returns the amount owed (still outstanding) on this invoice, which is charged
+minus all payments (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_print_text_%5BTIME%5D%3B">print_text [TIME];</A></STRONG><BR>
+<DD>
+Returns an text invoice, as a list of lines.
+<P>TIME an optional value used to control the printing of overdue messages.  The
+default is now.  It isn't the date of the invoice; that's the `_date' field.
+It is specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
+<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</P>
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_bill.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The delete method.</P>
+<P>print_text formatting (and some logic :/) is in source, but needs to be
+slurped in from a file.  Also number of lines ($=).</P>
+<P>missing print_ps for a nice postscript copy (maybe HylaFAX-cover-page-style
+or something similar so the look can be completely customized?)</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>, <A HREF=".././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A>,
+<A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>, schema.html from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/cust_bill_pkg.html b/httemplate/docs/man/FS/cust_bill_pkg.html
new file mode 100644
index 000000000..0557b4aee
--- /dev/null
+++ b/httemplate/docs/man/FS/cust_bill_pkg.html
@@ -0,0 +1,112 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_bill_pkg - Object methods for cust_bill_pkg records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_bill_pkg - Object methods for cust_bill_pkg records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_bill_pkg;</PRE>
+<PRE>
+  $record = new FS::cust_bill_pkg \%hash;
+  $record = new FS::cust_bill_pkg { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_bill_pkg object represents an invoice line item.
+FS::cust_bill_pkg inherits from FS::Record.  The following fields are currently
+supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_invoice">invnum - invoice (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_package">pkgnum - package (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) or 0 for the special virtual sales tax package</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_setup_%2D_setup_fee">setup - setup fee</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_recur_%2D_recurring_fee">recur - recurring fee</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_sdate_%2D_starting_date_of_recurring_fee">sdate - starting date of recurring fee</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_edate_%2D_ending_date_of_recurring_fee">edate - ending date of recurring fee</A></STRONG><BR>
+<DD>
+</DL>
+<P>sdate and edate are specified as UNIX timestamps; see <EM>perlfunc/``time''</EM>.  Also
+see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</P>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new line item.  To add the line item to the database, see
+<A HREF="#insert">insert</A>.  Line items are normally created by calling the bill method of a
+customer object (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this line item to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Currently unimplemented.  I don't remove line items because there would then be
+no record the items ever existed (which is bad, no?)
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Currently unimplemented.  This would be even more of an accounting nightmare
+than deleteing the items.  Just don't do it.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid line item.  If there is an
+error, returns the error, otherwise returns false.  Called by the insert
+method.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_bill_pkg.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, schema.html
+from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/cust_credit.html b/httemplate/docs/man/FS/cust_credit.html
new file mode 100644
index 000000000..16caca60d
--- /dev/null
+++ b/httemplate/docs/man/FS/cust_credit.html
@@ -0,0 +1,118 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_credit - Object methods for cust_credit records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_credit - Object methods for cust_credit records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_credit;</PRE>
+<PRE>
+  $record = new FS::cust_credit \%hash;
+  $record = new FS::cust_credit { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_credit object represents a credit; the equivalent of a negative
+<STRONG>cust_bill</STRONG> record (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>).  FS::cust_credit inherits from
+FS::Record.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_key">crednum - primary key (assigned automatically for new credits)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_customer">custnum - customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_amount_%2D_amount_of_the_credit">amount - amount of the credit</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item__date_%2D_specified_as_a_UNIX_timestamp%3B_see_per">_date - specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
+<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_reason_%2D_text">reason - text</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new credit.  To add the credit to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this credit to the database (``Posts'' the credit).  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Currently unimplemented.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Credits may not be modified; there would then be no record the credit was ever
+posted.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid credit.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+<P></P>
+<DT><STRONG><A NAME="item_cust_refund">cust_refund</A></STRONG><BR>
+<DD>
+Returns all refunds (see <A HREF=".././FS/cust_refund.html">the FS::cust_refund manpage</A>) for this credit.
+<P></P>
+<DT><STRONG><A NAME="item_credited">credited</A></STRONG><BR>
+<DD>
+Returns the amount of this credit that is still outstanding; which is
+amount minus all refunds (see <A HREF=".././FS/cust_refund.html">the FS::cust_refund manpage</A>).
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_credit.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The delete method.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_refund.html">the FS::cust_refund manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, schema.html from the base
+documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/cust_main.html b/httemplate/docs/man/FS/cust_main.html
new file mode 100644
index 000000000..f8e9a8cfb
--- /dev/null
+++ b/httemplate/docs/man/FS/cust_main.html
@@ -0,0 +1,279 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_main - Object methods for cust_main records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_main - Object methods for cust_main records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_main;</PRE>
+<PRE>
+  $record = new FS::cust_main \%hash;
+  $record = new FS::cust_main { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  @cust_pkg = $record-&gt;all_pkgs;</PRE>
+<PRE>
+  @cust_pkg = $record-&gt;ncancelled_pkgs;</PRE>
+<PRE>
+  $error = $record-&gt;bill;
+  $error = $record-&gt;bill %options;
+  $error = $record-&gt;bill 'time' =&gt; $time;</PRE>
+<PRE>
+  $error = $record-&gt;collect;
+  $error = $record-&gt;collect %options;
+  $error = $record-&gt;collect 'invoice_time'   =&gt; $time,
+                            'batch_card'     =&gt; 'yes',
+                            'report_badcard' =&gt; 'yes',
+                          ;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_main object represents a customer.  FS::cust_main inherits from 
+FS::Record.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_key">custnum - primary key (assigned automatically for new customers)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_agent">agentnum - agent (see <A HREF=".././FS/agent.html">the FS::agent manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_referral">refnum - referral (see <A HREF=".././FS/part_referral.html">the FS::part_referral manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_first_%2D_name">first - name</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_last_%2D_name">last - name</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_number">ss - social security number (optional)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_company_%2D_%28optional%29">company - (optional)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_address1">address1</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_address2_%2D_%28optional%29">address2 - (optional)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_city">city</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_county_%2D_%28optional%2C_see_FS%3A%3Acust_main_co">county - (optional, see <A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_state_%2D_%28see_FS%3A%3Acust_main_county%29">state - (see <A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_zip">zip</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_country_%2D_%28see_FS%3A%3Acust_main_county%29">country - (see <A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_phone">daytime - phone (optional)</A></STRONG><BR>
+<DD>
+<DT><STRONG>night - phone (optional)</STRONG><BR>
+<DD>
+<DT><STRONG>fax - phone (optional)</STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_ship_first_%2D_name">ship_first - name</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_ship_last_%2D_name">ship_last - name</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_ship_company_%2D_%28optional%29">ship_company - (optional)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_ship_address1">ship_address1</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_ship_address2_%2D_%28optional%29">ship_address2 - (optional)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_ship_city">ship_city</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_ship_county_%2D_%28optional%2C_see_FS%3A%3Acust_ma">ship_county - (optional, see <A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_ship_state_%2D_%28see_FS%3A%3Acust_main_county%29">ship_state - (see <A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_ship_zip">ship_zip</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_ship_country_%2D_%28see_FS%3A%3Acust_main_county%2">ship_country - (see <A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG>ship_daytime - phone (optional)</STRONG><BR>
+<DD>
+<DT><STRONG>ship_night - phone (optional)</STRONG><BR>
+<DD>
+<DT><STRONG>ship_fax - phone (optional)</STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_payby_%2D_%60CARD%27_%28credit_cards%29%2C_%60BILL">payby - `CARD' (credit cards), `BILL' (billing), `COMP' (free), or `PREPAY' (special billing type: applies a credit - see <A HREF=".././FS/prepay_credit.html">the FS::prepay_credit manpage</A> and sets billing type to BILL)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_issuer">payinfo - card number, P.O., comp issuer (4-8 lowercase alphanumerics; think username) or prepayment identifier (see <A HREF=".././FS/prepay_credit.html">the FS::prepay_credit manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_paydate_%2D_expiration_date%2C_mm%2Fyyyy%2C_m%2Fyy">paydate - expiration date, mm/yyyy, m/yyyy, mm/yy or m/yy</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_payname_%2D_name_on_card_or_billing_name">payname - name on card or billing name</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_tax_%2D_tax_exempt%2C_empty_or_%60Y%27">tax - tax exempt, empty or `Y'</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new customer.  To add the customer to the database, see <A HREF="#insert">insert</A>.
+<P>Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this customer to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P>There is a special insert mode in which you pass a data structure to the insert
+method containing FS::cust_pkg and FS::svc_<EM>tablename</EM> objects.  When
+running under a transactional database, all records are inserted atomicly, or
+the transaction is rolled back.  There should be a better explanation of this,
+but until then, here's an example:</P>
+<PRE>
+  use Tie::RefHash;
+  tie %hash, 'Tie::RefHash'; #this part is important
+  %hash = (
+    $cust_pkg =&gt; [ $svc_acct ],
+    ...
+  );
+  $cust_main-&gt;insert( \%hash );</PRE>
+<P></P>
+<DT><STRONG><A NAME="item_delete_NEW_CUSTNUM">delete NEW_CUSTNUM</A></STRONG><BR>
+<DD>
+This deletes the customer.  If there is an error, returns the error, otherwise
+returns false.
+<P>This will completely remove all traces of the customer record.  This is not
+what you want when a customer cancels service; for that, cancel all of the
+customer's packages (see <A HREF=".././FS/cust_pkg.html#cancel">cancel in the FS::cust_pkg manpage</A>).</P>
+<P>If the customer has any packages, you need to pass a new (valid) customer
+number for those packages to be transferred to.</P>
+<P>You can't delete a customer with invoices (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>),
+or credits (see <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid customer record.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+<P></P>
+<DT><STRONG><A NAME="item_all_pkgs">all_pkgs</A></STRONG><BR>
+<DD>
+Returns all packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this customer.
+<P></P>
+<DT><STRONG><A NAME="item_ncancelled_pkgs">ncancelled_pkgs</A></STRONG><BR>
+<DD>
+Returns all non-cancelled packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this customer.
+<P></P>
+<DT><STRONG><A NAME="item_bill">bill OPTIONS</A></STRONG><BR>
+<DD>
+Generates invoices (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>) for this customer.  Usually used in
+conjunction with the collect method.
+<P>The only currently available option is `time', which bills the customer as if
+it were that time.  It is specified as a UNIX timestamp; see
+<EM>perlfunc/``time''</EM>).  Also see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion
+functions.</P>
+<P>If there is an error, returns the error, otherwise returns false.</P>
+<P></P>
+<DT><STRONG><A NAME="item_collect">collect OPTIONS</A></STRONG><BR>
+<DD>
+(Attempt to) collect money for this customer's outstanding invoices (see
+<A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>).  Usually used after the bill method.
+<P>Depending on the value of `payby', this may print an invoice (`BILL'), charge
+a credit card (`CARD'), or just add any necessary (pseudo-)payment (`COMP').</P>
+<P>If there is an error, returns the error, otherwise returns false.</P>
+<P>Currently available options are:</P>
+<P>invoice_time - Use this time when deciding when to print invoices and
+late notices on those invoices.  The default is now.  It is specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>).  Also see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A>
+for conversion functions.</P>
+<P>batch_card - Set this true to batch cards (see <A HREF=".././FS/cust_pay_batch.html">the cust_pay_batch manpage</A>).  By
+default, cards are processed immediately, which will generate an error if
+CyberCash is not installed.</P>
+<P>report_badcard - Set this true if you want bad card transactions to
+return an error.  By default, they don't.</P>
+<P></P>
+<DT><STRONG><A NAME="item_total_owed">total_owed</A></STRONG><BR>
+<DD>
+Returns the total owed for this customer on all invoices
+(see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_total_credited">total_credited</A></STRONG><BR>
+<DD>
+Returns the total credits (see <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>) for this customer.
+<P></P>
+<DT><STRONG><A NAME="item_balance">balance</A></STRONG><BR>
+<DD>
+Returns the balance for this customer (total owed minus total credited).
+<P></P>
+<DT><STRONG><A NAME="item_invoicing_list_%5B_ARRAYREF_%5D">invoicing_list [ ARRAYREF ]</A></STRONG><BR>
+<DD>
+If an arguement is given, sets these email addresses as invoice recipients
+(see <A HREF=".././FS/cust_main_invoice.html">the FS::cust_main_invoice manpage</A>).  Errors are not fatal and are not reported
+(except as warnings), so use check_invoicing_list first.
+<P>Returns a list of email addresses (with svcnum entries expanded).</P>
+<P>Note: You can clear the invoicing list by passing an empty ARRAYREF.  You can
+check it without disturbing anything by passing nothing.</P>
+<P>This interface may change in the future.</P>
+<P></P>
+<DT><STRONG><A NAME="item_check_invoicing_list_ARRAYREF">check_invoicing_list ARRAYREF</A></STRONG><BR>
+<DD>
+Checks these arguements as valid input for the invoicing_list method.  If there
+is an error, returns the error, otherwise returns false.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_main.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The delete method.</P>
+<P>The delete method should possibly take an FS::cust_main object reference
+instead of a scalar customer number.</P>
+<P>Bill and collect options should probably be passed as references instead of a
+list.</P>
+<P>CyberCash v2 forces us to define some variables in package main.</P>
+<P>There should probably be a configuration file with a list of allowed credit
+card types.</P>
+<P>CyberCash is the only processor.</P>
+<P>No multiple currency support (probably a larger project than just this module).</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>
+<A HREF=".././FS/cust_pay_batch.html">the FS::cust_pay_batch manpage</A>, <A HREF=".././FS/agent.html">the FS::agent manpage</A>, <A HREF=".././FS/part_referral.html">the FS::part_referral manpage</A>,
+<A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>, <A HREF=".././FS/cust_main_invoice.html">the FS::cust_main_invoice manpage</A>,
+<A HREF=".././FS/UID.html">the FS::UID manpage</A>, schema.html from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/cust_main_county.html b/httemplate/docs/man/FS/cust_main_county.html
new file mode 100644
index 000000000..2c5dcd3fc
--- /dev/null
+++ b/httemplate/docs/man/FS/cust_main_county.html
@@ -0,0 +1,106 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_main_county - Object methods for cust_main_county objects</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_main_county - Object methods for cust_main_county objects</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_main_county;</PRE>
+<PRE>
+  $record = new FS::cust_main_county \%hash;
+  $record = new FS::cust_main_county { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_main_county object represents a tax rate, defined by locale.
+FS::cust_main_county inherits from FS::Record.  The following fields are
+currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_key">taxnum - primary key (assigned automatically for new tax rates)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_state">state</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_county">county</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_country">country</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_tax_%2D_percentage">tax - percentage</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new tax rate.  To add the tax rate to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this tax rate to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this tax rate from the database.  If there is an error, returns the
+error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid tax rate.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_main_county.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, schema.html from the base
+documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/cust_main_invoice.html b/httemplate/docs/man/FS/cust_main_invoice.html
new file mode 100644
index 000000000..6ab7fa289
--- /dev/null
+++ b/httemplate/docs/man/FS/cust_main_invoice.html
@@ -0,0 +1,114 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_main_invoice - Object methods for cust_main_invoice records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_main_invoice - Object methods for cust_main_invoice records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_main_invoice;</PRE>
+<PRE>
+  $record = new FS::cust_main_invoice \%hash;
+  $record = new FS::cust_main_invoice { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $email_address = $record-&gt;address;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_main_invoice object represents an invoice destination.  FS::cust_main_invoice inherits from
+FS::Record.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_destnum_%2D_primary_key">destnum - primary key</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_customer">custnum - customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_svcnum">dest - Invoice destination: If numeric, a svcnum (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>), if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new invoice destination.  To add the invoice destination to the database, see <A HREF="#insert">insert</A>.
+<P>Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Delete this record from the database.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid invoice destination.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+<P></P>
+<DT><STRONG><A NAME="item_checkdest">checkdest</A></STRONG><BR>
+<DD>
+Checks the dest field only.  If it finds that the account ends in the
+same domain configured as the <STRONG>domain</STRONG> configuration file, it will change the
+invoice destination from an email address to a service number (see
+<A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_address">address</A></STRONG><BR>
+<DD>
+Returns the literal email address for this record (or `POST').
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_main_invoice.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A></P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/cust_pay.html b/httemplate/docs/man/FS/cust_pay.html
new file mode 100644
index 000000000..803376260
--- /dev/null
+++ b/httemplate/docs/man/FS/cust_pay.html
@@ -0,0 +1,108 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_pay - Object methods for cust_pay objects</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_pay - Object methods for cust_pay objects</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_pay;</PRE>
+<PRE>
+  $record = new FS::cust_pay \%hash;
+  $record = new FS::cust_pay { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_pay object represents a payment; the transfer of money from a
+customer.  FS::cust_pay inherits from FS::Record.  The following fields are
+currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_key">paynum - primary key (assigned automatically for new payments)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_Invoice">invnum - Invoice (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_paid_%2D_Amount_of_this_payment">paid - Amount of this payment</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item__date_%2D_specified_as_a_UNIX_timestamp%3B_see_per">_date - specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
+<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_payby_%2D_%60CARD%27_%28credit_cards%29%2C_%60BILL">payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_issuer">payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_paybatch_%2D_text_field_for_tracking_card_processi">paybatch - text field for tracking card processing</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new payment.  To add the payment to the databse, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this payment to the databse, and updates the invoice (see
+<A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Currently unimplemented (accounting reasons).
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Currently unimplemented (accounting reasons).
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid payment.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert method.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_pay.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>Delete and replace methods.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, schema.html from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/cust_pay_batch.html b/httemplate/docs/man/FS/cust_pay_batch.html
new file mode 100644
index 000000000..c1c73c301
--- /dev/null
+++ b/httemplate/docs/man/FS/cust_pay_batch.html
@@ -0,0 +1,132 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_pay_batch - Object methods for batch cards</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_pay_batch - Object methods for batch cards</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_pay_batch;</PRE>
+<PRE>
+  $record = new FS::cust_pay_batch \%hash;
+  $record = new FS::cust_pay_batch { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_pay_batch object represents a credit card transaction ready to be
+batched (sent to a processor).  FS::cust_pay_batch inherits from FS::Record.  
+Typically called by the collect method of an FS::cust_main object.  The
+following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_trancode_%2D_77_for_charges">trancode - 77 for charges</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_cardnum">cardnum</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_exp_%2D_card_expiration">exp - card expiration</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_amount">amount</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_invnum_%2D_invoice">invnum - invoice</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_custnum_%2D_customer">custnum - customer</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_payname_%2D_name_on_card">payname - name on card</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_first_%2D_name">first - name</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_last_%2D_name">last - name</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_address1">address1</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_address2">address2</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_city">city</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_state">state</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_zip">zip</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_country">country</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new record.  To add the record to the database, see <A HREF="#insert">insert</A>.
+<P>Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Delete this record from the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+#inactive
+#
+#Replaces the OLD_RECORD with this one in the database.  If there is an error,
+#returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid transaction.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_pay_batch.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>There should probably be a configuration file with a list of allowed credit
+card types.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A></P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/cust_pkg.html b/httemplate/docs/man/FS/cust_pkg.html
new file mode 100644
index 000000000..459d1297c
--- /dev/null
+++ b/httemplate/docs/man/FS/cust_pkg.html
@@ -0,0 +1,205 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_pkg - Object methods for cust_pkg objects</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_pkg - Object methods for cust_pkg objects</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_pkg;</PRE>
+<PRE>
+  $record = new FS::cust_pkg \%hash;
+  $record = new FS::cust_pkg { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $error = $record-&gt;cancel;</PRE>
+<PRE>
+  $error = $record-&gt;suspend;</PRE>
+<PRE>
+  $error = $record-&gt;unsuspend;</PRE>
+<PRE>
+  $part_pkg = $record-&gt;part_pkg;</PRE>
+<PRE>
+  @labels = $record-&gt;labels;</PRE>
+<PRE>
+  $error = FS::cust_pkg::order( $custnum, \@pkgparts );
+  $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_pkg object represents a customer billing item.  FS::cust_pkg
+inherits from FS::Record.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_key">pkgnum - primary key (assigned automatically for new billing items)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_Customer">custnum - Customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_definition">pkgpart - Billing item definition (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_setup_%2D_date">setup - date</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_bill_%2D_date">bill - date</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_susp_%2D_date">susp - date</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_expire_%2D_date">expire - date</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_cancel_%2D_date">cancel - date</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically if null, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
+<DD>
+</DL>
+<P>Note: setup, bill, susp, expire and cancel are specified as UNIX timestamps;
+see <EM>perlfunc/``time''</EM>.  Also see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for
+conversion functions.</P>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Create a new billing item.  To add the item to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this billing item to the database (``Orders'' the item).  If there is an
+error, returns the error, otherwise returns false.
+<P>sub insert {
+  my $self = shift;</P>
+<PRE>
+  # custnum might not have have been defined in sub check (for one-shot new
+  # customers), so check it here instead</PRE>
+<PRE>
+  my $error = $self-&gt;ut_number('custnum');
+  return $error if $error</PRE>
+<PRE>
+  return &quot;Unknown customer&quot;
+    unless qsearchs( 'cust_main', { 'custnum' =&gt; $self-&gt;custnum } );</PRE>
+<PRE>
+  $self-&gt;SUPER::insert;</PRE>
+<P>}</P>
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Currently unimplemented.  You don't want to delete billing items, because there
+would then be no record the customer ever purchased the item.  Instead, see
+the cancel method.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P>Currently, custnum, setup, bill, susp, expire, and cancel may be changed.</P>
+<P>Changing pkgpart may have disasterous effects.  See the order subroutine.</P>
+<P>setup and bill are normally updated by calling the bill method of a customer
+object (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>).</P>
+<P>suspend is normally updated by the suspend and unsuspend methods.</P>
+<P>cancel is normally updated by the cancel method (and also the order subroutine
+in some cases).</P>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid billing item.  If there is an
+error, returns the error, otherwise returns false.  Called by the insert and
+replace methods.
+<P></P>
+<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
+<DD>
+Cancels and removes all services (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A> and <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>)
+in this package, then cancels the package itself (sets the cancel field to
+now).
+<P>If there is an error, returns the error, otherwise returns false.</P>
+<P></P>
+<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
+<DD>
+Suspends all services (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A> and <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>) in this
+package, then suspends the package itself (sets the susp field to now).
+<P>If there is an error, returns the error, otherwise returns false.</P>
+<P></P>
+<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
+<DD>
+Unsuspends all services (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A> and <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>) in this
+package, then unsuspends the package itself (clears the susp field).
+<P>If there is an error, returns the error, otherwise returns false.</P>
+<P></P>
+<DT><STRONG><A NAME="item_part_pkg">part_pkg</A></STRONG><BR>
+<DD>
+Returns the definition for this billing item, as an FS::part_pkg object (see
+<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_labels">labels</A></STRONG><BR>
+<DD>
+Returns a list of lists, calling the label method for all services
+(see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) of this billing item.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="subroutines">SUBROUTINES</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_order_CUSTNUM%2C_PKGPARTS_ARYREF%2C_%5B_REMOVE_PKG">order CUSTNUM, PKGPARTS_ARYREF, [ REMOVE_PKGNUMS_ARYREF ]</A></STRONG><BR>
+<DD>
+CUSTNUM is a customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)
+<P>PKGPARTS is a list of pkgparts specifying the the billing item definitions (see
+<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>) to order for this customer.  Duplicates are of course
+permitted.</P>
+<P>REMOVE_PKGNUMS is an optional list of pkgnums specifying the billing items to
+remove for this customer.  The services (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) are moved to the
+new billing items.  An error is returned if this is not possible (see
+<A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>).</P>
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_pkg.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>sub order is not OO.  Perhaps it should be moved to FS::cust_main and made so?</P>
+<P>In sub order, the @pkgparts array (passed by reference) is clobbered.</P>
+<P>Also in sub order, no money is adjusted.  Once FS::part_pkg defines a standard
+method to pass dates to the recur_prog expression, it should do so.</P>
+<P>FS::svc_acct, FS::svc_acct_sm, and FS::svc_domain are loaded via 'use' at 
+compile time, rather than via 'require' in sub { setup, suspend, unsuspend,
+cancel } because they use %FS::UID::callback to load configuration values.
+Probably need a subroutine which decides what to do based on whether or not
+we've fetched the user yet, rather than a hash.  See FS::UID and the TODO.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>
+, <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>, schema.html from the base documentation</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/cust_refund.html b/httemplate/docs/man/FS/cust_refund.html
new file mode 100644
index 000000000..39ed14de4
--- /dev/null
+++ b/httemplate/docs/man/FS/cust_refund.html
@@ -0,0 +1,108 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_refund - Object method for cust_refund objects</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_refund - Object method for cust_refund objects</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_refund;</PRE>
+<PRE>
+  $record = new FS::cust_refund \%hash;
+  $record = new FS::cust_refund { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_refund represents a refund: the transfer of money to a customer;
+equivalent to a negative payment (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>).  FS::cust_refund
+inherits from FS::Record.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_key">refundnum - primary key (assigned automatically for new refunds)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_Credit">crednum - Credit (see <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_refund_%2D_Amount_of_the_refund">refund - Amount of the refund</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item__date_%2D_specified_as_a_UNIX_timestamp%3B_see_per">_date - specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
+<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_payby_%2D_%60CARD%27_%28credit_cards%29%2C_%60BILL">payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_issuer">payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new refund.  To add the refund to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this refund to the database, and updates the credit (see
+<A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Currently unimplemented (accounting reasons).
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Currently unimplemented (accounting reasons).
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid refund.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert method.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_refund.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>Delete and replace methods.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>, schema.html from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/cust_svc.html b/httemplate/docs/man/FS/cust_svc.html
new file mode 100644
index 000000000..c1ca2d700
--- /dev/null
+++ b/httemplate/docs/man/FS/cust_svc.html
@@ -0,0 +1,118 @@
+<HTML>
+<HEAD>
+<TITLE>FS::cust_svc - Object method for cust_svc objects</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::cust_svc - Object method for cust_svc objects</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::cust_svc;</PRE>
+<PRE>
+  $record = new FS::cust_svc \%hash
+  $record = new FS::cust_svc { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  ($label, $value) = $record-&gt;label;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::cust_svc represents a service.  FS::cust_svc inherits from FS::Record.
+The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_key">svcnum - primary key (assigned automatically for new services)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_Package">pkgnum - Package (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_definition">svcpart - Service definition (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>)</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new service.  To add the refund to the database, see <A HREF="#insert">insert</A>.
+Services are normally created by creating FS::svc_ objects (see
+<A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, and <A HREF=".././FS/svc_acct_sm.html">the FS::svc_acct_sm manpage</A>, among others).
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this service to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this service from the database.  If there is an error, returns the
+error, otherwise returns false.
+<P>Called by the cancel method of the package (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid service.  If there is an error,
+returns the error, otehrwise returns false.  Called by the insert and
+replace methods.
+<P></P>
+<DT><STRONG><A NAME="item_label">label</A></STRONG><BR>
+<DD>
+Returns a list consisting of:
+- The name of this service (from part_svc)
+- A meaningful identifier (username, domain, or mail alias)
+- The table name (i.e. svc_domain) for this service
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: cust_svc.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>Behaviour of changing the svcpart of cust_svc records is undefined and should
+possibly be prohibited, and pkg_svc records are not checked.</P>
+<P>pkg_svc records are not checked in general (here).</P>
+<P>Deleting this record doesn't check or delete the svc_* record associated
+with this record.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>, 
+schema.html from the base documentation</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/domain_record.html b/httemplate/docs/man/FS/domain_record.html
new file mode 100644
index 000000000..7a1bf3e32
--- /dev/null
+++ b/httemplate/docs/man/FS/domain_record.html
@@ -0,0 +1,124 @@
+<HTML>
+<HEAD>
+<TITLE>FS::domain_record - Object methods for domain_record records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+	<LI><A HREF="#history">HISTORY</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::domain_record - Object methods for domain_record records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::domain_record;</PRE>
+<PRE>
+  $record = new FS::domain_record \%hash;
+  $record = new FS::domain_record { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::domain_record object represents an entry in a DNS zone.
+FS::domain_record inherits from FS::Record.  The following fields are currently
+supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_recnum_%2D_primary_key">recnum - primary key</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_Domain">svcnum - Domain (see <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>) of this entry</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_partial">reczone - partial (or full) zone for this entry</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_recaf_%2D_address_family_for_this_entry%2C_current">recaf - address family for this entry, currently only `IN' is recognized.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_entry">rectype - record type for this entry (A, MX, etc.)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_recdata_%2D_data_for_this_entry">recdata - data for this entry</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new entry.  To add the example to the database, see <A HREF="#insert">insert</A>.
+<P>Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Delete this record from the database.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: domain_record.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The data validation doesn't check everything it could.  In particular,
+there is no protection against bad data that passes the regex, duplicate
+SOA records, forgetting the trailing `.', impossible IP addersses, etc.  Of
+course, it's still better than editing the zone files directly.  :)</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
+<P>
+<HR>
+<H1><A NAME="history">HISTORY</A></H1>
+<P>$Log: domain_record.html,v $
+<P>Revision 1.1  2001-07-30 07:36:03  ivan
+<P>templates!!!
+<P>
+Revision 1.2  2001/05/18 14:08:55  ivan
+tyop</P>
+<P>Revision 1.1  2000/02/03 05:16:52  ivan
+beginning of DNS and Apache support</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/nas.html b/httemplate/docs/man/FS/nas.html
new file mode 100644
index 000000000..5a55964e1
--- /dev/null
+++ b/httemplate/docs/man/FS/nas.html
@@ -0,0 +1,117 @@
+<HTML>
+<HEAD>
+<TITLE>FS::nas - Object methods for nas records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::nas - Object methods for nas records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::nas;</PRE>
+<PRE>
+  $record = new FS::nas \%hash;
+  $record = new FS::nas {
+    'nasnum'  =&gt; 1,
+    'nasip'   =&gt; '10.4.20.23',
+    'nasfqdn' =&gt; 'box1.brc.nv.us.example.net',
+  };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $error = $record-&gt;heartbeat($timestamp);</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::nas object represents an Network Access Server on your network, such as
+a terminal server or equivalent.  FS::nas inherits from FS::Record.  The
+following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_nasnum_%2D_primary_key">nasnum - primary key</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_nas_%2D_NAS_name">nas - NAS name</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_nasip_%2D_NAS_ip_address">nasip - NAS ip address</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_nasfqdn_%2D_NAS_fully%2Dqualified_domain_name">nasfqdn - NAS fully-qualified domain name</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_state">last - timestamp indicating the last instant the NAS was in a known
+             state (used by the session monitoring).</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new NAS.  To add the NAS to the database, see <A HREF="#insert">insert</A>.
+<P>Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Delete this record from the database.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+<P></P>
+<DT><STRONG><A NAME="item_heartbeat">heartbeat TIMESTAMP</A></STRONG><BR>
+<DD>
+Updates the timestamp for this nas
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: nas.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/part_pkg.html b/httemplate/docs/man/FS/part_pkg.html
new file mode 100644
index 000000000..9aeaa3d3d
--- /dev/null
+++ b/httemplate/docs/man/FS/part_pkg.html
@@ -0,0 +1,138 @@
+<HTML>
+<HEAD>
+<TITLE>FS::part_pkg - Object methods for part_pkg objects</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::part_pkg - Object methods for part_pkg objects</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::part_pkg;</PRE>
+<PRE>
+  $record = new FS::part_pkg \%hash
+  $record = new FS::part_pkg { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $custom_record = $template_record-&gt;clone;</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  @pkg_svc = $record-&gt;pkg_svc;</PRE>
+<PRE>
+  $svcnum = $record-&gt;svcpart;
+  $svcnum = $record-&gt;svcpart( 'svc_acct' );</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::part_pkg object represents a billing item definition.  FS::part_pkg
+inherits from FS::Record.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_key">pkgpart - primary key (assigned automatically for new billing item definitions)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_definition">pkg - Text name of this billing item definition (customer-viewable)</A></STRONG><BR>
+<DD>
+<DT><STRONG>comment - Text name of this billing item definition (non-customer-viewable)</STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_setup_%2D_Setup_fee">setup - Setup fee</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_freq_%2D_Frequency_of_recurring_fee">freq - Frequency of recurring fee</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_recur_%2D_Recurring_fee">recur - Recurring fee</A></STRONG><BR>
+<DD>
+</DL>
+<P>setup and recur are evaluated as Safe perl expressions.  You can use numbers
+just as you would normally.  More advanced semantics are not yet defined.</P>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new billing item definition.  To add the billing item definition to
+the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_clone">clone</A></STRONG><BR>
+<DD>
+An alternate constructor.  Creates a new billing item definition by duplicating
+an existing definition.  A new pkgpart is assigned and `(CUSTOM) ' is prepended
+to the comment field.  To add the billing item definition to the database, see
+<A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this billing item definition to the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Currently unimplemented.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid billing item definition.  If
+there is an error, returns the error, otherwise returns false.  Called by the
+insert and replace methods.
+<P></P>
+<DT><STRONG><A NAME="item_pkg_svc">pkg_svc</A></STRONG><BR>
+<DD>
+Returns all FS::pkg_svc objects (see <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>) for this package
+definition (with non-zero quantity).
+<P></P>
+<DT><STRONG><A NAME="item_svcpart_%5B_SVCDB_%5D">svcpart [ SVCDB ]</A></STRONG><BR>
+<DD>
+Returns the svcpart of a single service definition (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>)
+associated with this billing item definition (see <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>).  Returns
+false if there not exactly one service definition with quantity 1, or if 
+SVCDB is specified and does not match the svcdb of the service definition,
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: part_pkg.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The delete method is unimplemented.</P>
+<P>setup and recur semantics are not yet defined (and are implemented in
+FS::cust_bill.  hmm.).</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF=".././FS/type_pkgs.html">the FS::type_pkgs manpage</A>, <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>, <EM>Safe</EM>.
+schema.html from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/part_referral.html b/httemplate/docs/man/FS/part_referral.html
new file mode 100644
index 000000000..815b15cf1
--- /dev/null
+++ b/httemplate/docs/man/FS/part_referral.html
@@ -0,0 +1,100 @@
+<HTML>
+<HEAD>
+<TITLE>FS::part_referral - Object methods for part_referral objects</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::part_referral - Object methods for part_referral objects</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::part_referral;</PRE>
+<PRE>
+  $record = new FS::part_referral \%hash
+  $record = new FS::part_referral { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::part_referral represents a referral - where a customer heard of your
+services.  This can be used to track the effectiveness of a particular piece of
+advertising, for example.  FS::part_referral inherits from FS::Record.  The
+following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_key">refnum - primary key (assigned automatically for new referrals)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_referral_%2D_Text_name_of_this_referral">referral - Text name of this referral</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new referral.  To add the referral to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this referral to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Currently unimplemented.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid referral.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: part_referral.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The delete method is unimplemented.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, schema.html from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/part_svc.html b/httemplate/docs/man/FS/part_svc.html
new file mode 100644
index 000000000..ca0a5dc71
--- /dev/null
+++ b/httemplate/docs/man/FS/part_svc.html
@@ -0,0 +1,110 @@
+<HTML>
+<HEAD>
+<TITLE>FS::part_svc - Object methods for part_svc objects</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::part_svc - Object methods for part_svc objects</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::part_svc;</PRE>
+<PRE>
+  $record = new FS::part_referral \%hash
+  $record = new FS::part_referral { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::part_svc represents a service definition.  FS::part_svc inherits from
+FS::Record.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_key">svcpart - primary key (assigned automatically for new service definitions)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_svc_%2D_text_name_of_this_service_definition">svc - text name of this service definition</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_svcdb_%2D_table_used_for_this_service%2E_See_FS%3A">svcdb - table used for this service.  See <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>,
+<A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, and <A HREF=".././FS/svc_acct_sm.html">the FS::svc_acct_sm manpage</A>, among others.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_svcdb__field_%2D_Default_or_fixed_value_for_field_"><EM>svcdb</EM>__<EM>field</EM> - Default or fixed value for <EM>field</EM> in <EM>svcdb</EM>.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_svcdb__field_flag_%2D_defines_svcdb__field_action%"><EM>svcdb</EM>__<EM>field</EM>_flag - defines <EM>svcdb</EM>__<EM>field</EM> action: null, `D' for default, or `F' for fixed</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new service definition.  To add the service definition to the
+database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this service definition to the database.  If there is an error, returns
+the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Currently unimplemented.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid service definition.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: part_svc.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>Delete is unimplemented.</P>
+<P>The list of svc_* tables is hardcoded.  When svc_acct_pop is renamed, this
+should be fixed.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
+<A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/svc_acct_sm.html">the FS::svc_acct_sm manpage</A>, <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, schema.html from the
+base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/pkg_svc.html b/httemplate/docs/man/FS/pkg_svc.html
new file mode 100644
index 000000000..44db9d5ff
--- /dev/null
+++ b/httemplate/docs/man/FS/pkg_svc.html
@@ -0,0 +1,115 @@
+<HTML>
+<HEAD>
+<TITLE>FS::pkg_svc - Object methods for pkg_svc records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::pkg_svc - Object methods for pkg_svc records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::pkg_svc;</PRE>
+<PRE>
+  $record = new FS::pkg_svc \%hash;
+  $record = new FS::pkg_svc { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $part_pkg = $record-&gt;part_pkg;</PRE>
+<PRE>
+  $part_svc = $record-&gt;part_svc;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::pkg_svc record links a billing item definition (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>) to
+a service definition (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>).  FS::pkg_svc inherits from
+FS::Record.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_definition">pkgpart - Billing item definition (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG>svcpart - Service definition (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>)</STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_quantity_%2D_Quantity_of_this_service_definition_t">quantity - Quantity of this service definition that this billing item
+definition includes</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Create a new record.  To add the record to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+<P></P>
+<DT><STRONG><A NAME="item_part_pkg">part_pkg</A></STRONG><BR>
+<DD>
+Returns the FS::part_pkg object (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_part_svc">part_svc</A></STRONG><BR>
+<DD>
+Returns the FS::part_svc object (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>).
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: pkg_svc.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, schema.html from the base
+documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/port.html b/httemplate/docs/man/FS/port.html
new file mode 100644
index 000000000..3851390c8
--- /dev/null
+++ b/httemplate/docs/man/FS/port.html
@@ -0,0 +1,120 @@
+<HTML>
+<HEAD>
+<TITLE>FS::port - Object methods for port records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::port - Object methods for port records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::port;</PRE>
+<PRE>
+  $record = new FS::port \%hash;
+  $record = new FS::port { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $session = $port-&gt;session;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::port object represents an individual port on a NAS.  FS::port inherits
+from FS::Record.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_portnum_%2D_primary_key">portnum - primary key</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_ip_%2D_IP_address_of_this_port">ip - IP address of this port</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_nasport_%2D_port_number_on_the_NAS">nasport - port number on the NAS</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_nasnum_%2D_NAS_this_port_is_on_%2D_see_FS%3A%3Anas">nasnum - NAS this port is on - see <A HREF=".././FS/nas.html">the FS::nas manpage</A></A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new port.  To add the example to the database, see <A HREF="#insert">insert</A>.
+<P>Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Delete this record from the database.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+<P></P>
+<DT><STRONG><A NAME="item_session">session</A></STRONG><BR>
+<DD>
+Returns the currently open session on this port, or if no session is currently
+open, the most recent session.  See <A HREF=".././FS/session.html">the FS::session manpage</A>.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: port.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The author forgot to customize this manpage.</P>
+<P>The session method won't deal well if you have multiple open sessions on a
+port, for example if your RADIUS server drops <STRONG>stop</STRONG> records.  Suggestions for
+how to deal with this sort of lossage welcome; should we close the session
+when we get a new session on that port?  Tag it as invalid somehow?  Close it
+one second after it was opened?  *sigh*  Maybe FS::session shouldn't let you
+create overlapping sessions, at least folks will find out their logging is
+dropping records.</P>
+<P>If you think the above refers multiple user logins you need to read the
+manpages again.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/prepay_credit.html b/httemplate/docs/man/FS/prepay_credit.html
new file mode 100644
index 000000000..4e77897a3
--- /dev/null
+++ b/httemplate/docs/man/FS/prepay_credit.html
@@ -0,0 +1,118 @@
+<HTML>
+<HEAD>
+<TITLE>FS::prepay_credit - Object methods for prepay_credit records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+	<LI><A HREF="#history">HISTORY</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::prepay_credit - Object methods for prepay_credit records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::prepay_credit;</PRE>
+<PRE>
+  $record = new FS::prepay_credit \%hash;
+  $record = new FS::prepay_credit {
+    'identifier' =&gt; '4198123455512121'
+    'amount'     =&gt; '19.95',
+  };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::table_name object represents an pre--paid credit, such as a pre-paid
+``calling card''.  FS::prepay_credit inherits from FS::Record.  The following
+fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_field_%2D_description">field - description</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_identifier_%2D_identifier_entered_by_the_user_to_r">identifier - identifier entered by the user to receive the credit</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_amount_%2D_amount_of_the_credit">amount - amount of the credit</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new pre-paid credit.  To add the example to the database, see
+<A HREF="#insert">insert</A>.
+<P>Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Delete this record from the database.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid pre-paid credit.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: prepay_credit.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
+<P>
+<HR>
+<H1><A NAME="history">HISTORY</A></H1>
+<P>$Log: prepay_credit.html,v $
+<P>Revision 1.1  2001-07-30 07:36:03  ivan
+<P>templates!!!
+<P>
+Revision 1.2  2000/02/02 20:22:18  ivan
+bugfix prepayment in signup server</P>
+<P>Revision 1.1  2000/01/31 05:22:23  ivan
+prepaid ``internet cards''</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/session.html b/httemplate/docs/man/FS/session.html
new file mode 100644
index 000000000..571c2d44d
--- /dev/null
+++ b/httemplate/docs/man/FS/session.html
@@ -0,0 +1,129 @@
+<HTML>
+<HEAD>
+<TITLE>FS::session - Object methods for session records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::session - Object methods for session records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::session;</PRE>
+<PRE>
+  $record = new FS::session \%hash;
+  $record = new FS::session {
+    'portnum' =&gt; 1,
+    'svcnum'  =&gt; 2,
+    'login'   =&gt; $timestamp,
+    'logout'  =&gt; $timestamp,
+  };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $error = $record-&gt;nas_heartbeat($timestamp);</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::session object represents an user login session.  FS::session inherits
+from FS::Record.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_sessionnum_%2D_primary_key">sessionnum - primary key</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_portnum_%2D_NAS_port_for_this_session_%2D_see_FS%3">portnum - NAS port for this session - see <A HREF=".././FS/port.html">the FS::port manpage</A></A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_svcnum_%2D_User_for_this_session_%2D_see_FS%3A%3As">svcnum - User for this session - see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A></A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_login_%2D_timestamp_indicating_the_beginning_of_th">login - timestamp indicating the beginning of this user session.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_logout_%2D_timestamp_indicating_the_end_of_this_us">logout - timestamp indicating the end of this user session.  May be null,
+               which indicates a currently open session.</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new session.  To add the session to the database, see <A HREF="#insert">insert</A>.
+<P>Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.  If the `login' field is empty, it is replaced with
+the current time.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Delete this record from the database.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.  If the `logout' field is empty,
+it is replaced with the current time.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid session.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+<P></P>
+<DT><STRONG><A NAME="item_nas_heartbeat">nas_heartbeat</A></STRONG><BR>
+<DD>
+Heartbeats the nas associated with this session (see <A HREF=".././FS/nas.html">the FS::nas manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_svc_acct">svc_acct</A></STRONG><BR>
+<DD>
+Returns the svc_acct record associated with this session (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>).
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: session.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>Maybe you shouldn't be able to insert a session if there's currently an open
+session on that port.  Or maybe the open session on that port should be flagged
+as problematic?  autoclosed?  *sigh*</P>
+<P>Hmm, sessions refer to current svc_acct records... probably need to constrain
+deletions to svc_acct records such that no svc_acct records are deleted which
+have a session (even if long-closed).</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/svc_Common.html b/httemplate/docs/man/FS/svc_Common.html
new file mode 100644
index 000000000..100aee880
--- /dev/null
+++ b/httemplate/docs/man/FS/svc_Common.html
@@ -0,0 +1,94 @@
+<HTML>
+<HEAD>
+<TITLE>FS::svc_Common - Object method for all svc_ records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::svc_Common - Object method for all svc_ records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<P>use FS::svc_Common;</P>
+<P>@ISA = qw( FS::svc_Common );</P>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>FS::svc_Common is intended as a base class for table-specific classes to
+inherit from, i.e. FS::svc_acct.  FS::svc_Common inherits from FS::Record.</P>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P>The additional fields pkgnum and svcpart (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
+defined.  An FS::cust_svc record will be created and inserted.</P>
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this account from the database.  If there is an error, returns the
+error, otherwise returns false.
+<P>The corresponding FS::cust_svc record will be deleted as well.</P>
+<P></P>
+<DT><STRONG><A NAME="item_setfixed">setfixed</A></STRONG><BR>
+<DD>
+Sets any fixed fields for this service (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>).  If there is an
+error, returns the error, otherwise returns the FS::part_svc object (use <CODE>ref()</CODE>
+to test the return).  Usually called by the check method.
+<P></P>
+<DT><STRONG><A NAME="item_setdefault">setdefault</A></STRONG><BR>
+<DD>
+Sets all fields to their defaults (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>), overriding their
+current values.  If there is an error, returns the error, otherwise returns
+the FS::part_svc object (use <CODE>ref()</CODE> to test the return).
+<P></P>
+<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
+<DD>
+Stubs - return false (no error) so derived classes don't need to define these
+methods.  Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: svc_Common.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The setfixed method return value.</P>
+<P>The new method should set defaults from part_svc (like the check method
+sets fixed values)?</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, schema.html
+from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/svc_acct.html b/httemplate/docs/man/FS/svc_acct.html
new file mode 100644
index 000000000..81bc118df
--- /dev/null
+++ b/httemplate/docs/man/FS/svc_acct.html
@@ -0,0 +1,219 @@
+<HTML>
+<HEAD>
+<TITLE>FS::svc_acct - Object methods for svc_acct records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::svc_acct - Object methods for svc_acct records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::svc_acct;</PRE>
+<PRE>
+  $record = new FS::svc_acct \%hash;
+  $record = new FS::svc_acct { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $error = $record-&gt;suspend;</PRE>
+<PRE>
+  $error = $record-&gt;unsuspend;</PRE>
+<PRE>
+  $error = $record-&gt;cancel;</PRE>
+<PRE>
+  %hash = $record-&gt;radius;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::svc_acct object represents an account.  FS::svc_acct inherits from
+FS::svc_Common.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_key">svcnum - primary key (assigned automatcially for new accounts)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_username">username</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item__password_%2D_generated_if_blank">_password - generated if blank</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_presence">popnum - Point of presence (see <A HREF=".././FS/svc_acct_pop.html">the FS::svc_acct_pop manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_uid">uid</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_gid">gid</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_finger_%2D_GECOS">finger - GECOS</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_blank">dir - set automatically if blank (and uid is not)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_shell">shell</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_quota_%2D_%28unimplementd%29">quota - (unimplementd)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_slipip_%2D_IP_address">slipip - IP address</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_radius_Radius_Attribute_%2D_Radius%2DAttribute">radius_<EM>Radius_Attribute</EM> - <EM>Radius-Attribute</EM></A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new account.  To add the account to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this account to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P>The additional fields pkgnum and svcpart (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
+defined.  An FS::cust_svc record will be created and inserted.</P>
+<P>If the configuration value (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine exists, and the 
+username, uid, and dir fields are defined, the <CODE>command(s)</CODE> specified in
+the shellmachine-useradd configuration are exectued on shellmachine via ssh.
+This behaviour can be surpressed by setting $FS::svc_acct::nossh_hack true.
+If the shellmachine-useradd configuration file does not exist,</P>
+<PRE>
+  useradd -d $dir -m -s $shell -u $uid $username</PRE>
+<P>is the default.  If the shellmachine-useradd configuration file exists but
+it empty,</P>
+<PRE>
+  cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</PRE>
+<P>is the default instead.  Otherwise the contents of the file are treated as
+a double-quoted perl string, with the following variables available:
+$username, $uid, $gid, $dir, and $shell.</P>
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this account from the database.  If there is an error, returns the
+error, otherwise returns false.
+<P>The corresponding FS::cust_svc record will be deleted as well.</P>
+<P>If the configuration value (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine exists, the
+<CODE>command(s)</CODE> specified in the shellmachine-userdel configuration file are
+executed on shellmachine via ssh.  This behavior can be surpressed by setting
+$FS::svc_acct::nossh_hack true.  If the shellmachine-userdel configuration
+file does not exist,</P>
+<PRE>
+  userdel $username</PRE>
+<P>is the default.  If the shellmachine-userdel configuration file exists but
+is empty,</P>
+<PRE>
+  rm -rf $dir</PRE>
+<P>is the default instead.  Otherwise the contents of the file are treated as a
+double-quoted perl string, with the following variables available:
+$username and $dir.</P>
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P>If the configuration value (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine exists, and the 
+dir field has changed, the <CODE>command(s)</CODE> specified in the shellmachine-usermod
+configuraiton file are executed on shellmachine via ssh.  This behavior can
+be surpressed by setting $FS::svc-acct::nossh_hack true.  If the
+shellmachine-userdel configuration file does not exist or is empty, :</P>
+<PRE>
+  [ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || (
+    chmod u+t $old_dir;
+    mkdir $new_dir;
+    cd $old_dir;
+    find . -depth -print | cpio -pdm $new_dir;
+    chmod u-t $new_dir;
+    chown -R $uid.$gid $new_dir;
+    rm -rf $old_dir
+  )</PRE>
+<P>is executed on shellmachine via ssh.  This behaviour can be surpressed by
+setting $FS::svc_acct::nossh_hack true.</P>
+<P></P>
+<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
+<DD>
+Suspends this account by prefixing *SUSPENDED* to the password.  If there is an
+error, returns the error, otherwise returns false.
+<P>Called by the suspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
+<DD>
+Unsuspends this account by removing *SUSPENDED* from the password.  If there is
+an error, returns the error, otherwise returns false.
+<P>Called by the unsuspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
+<DD>
+Just returns false (no error) for now.
+<P>Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid service.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+<P>Sets any fixed values; see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>.</P>
+<P></P>
+<DT><STRONG><A NAME="item_radius">radius</A></STRONG><BR>
+<DD>
+Depriciated, use radius_reply instead.
+<P></P>
+<DT><STRONG><A NAME="item_radius_reply">radius_reply</A></STRONG><BR>
+<DD>
+Returns key/value pairs, suitable for assigning to a hash, for any RADIUS
+reply attributes of this record.
+<P>Note that this is now the preferred method for reading RADIUS attributes - 
+accessing the columns directly is discouraged, as the column names are
+expected to change in the future.</P>
+<P></P>
+<DT><STRONG><A NAME="item_radius_check">radius_check</A></STRONG><BR>
+<DD>
+Returns key/value pairs, suitable for assigning to a hash, for any RADIUS
+check attributes of this record.
+<P>Accessing RADIUS attributes directly is not supported and will break in the
+future.</P>
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: svc_acct.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The bits which ssh should fork before doing so (or maybe queue jobs for a
+daemon).</P>
+<P>The $recref stuff in sub check should be cleaned up.</P>
+<P>The suspend, unsuspend and cancel methods update the database, but not the
+current object.  This is probably a bug as it's unexpected and
+counterintuitive.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/svc_Common.html">the FS::svc_Common manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
+<A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF="../Net/SSH.html">the Net::SSH manpage</A>, <EM>ssh</EM>, <A HREF=".././FS/svc_acct_pop.html">the FS::svc_acct_pop manpage</A>,
+schema.html from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/svc_acct_pop.html b/httemplate/docs/man/FS/svc_acct_pop.html
new file mode 100644
index 000000000..d65ca5778
--- /dev/null
+++ b/httemplate/docs/man/FS/svc_acct_pop.html
@@ -0,0 +1,107 @@
+<HTML>
+<HEAD>
+<TITLE>FS::svc_acct_pop - Object methods for svc_acct_pop records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::svc_acct_pop - Object methods for svc_acct_pop records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::svc_acct_pop;</PRE>
+<PRE>
+  $record = new FS::svc_acct_pop \%hash;
+  $record = new FS::svc_acct_pop { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::svc_acct object represents an point of presence.  FS::svc_acct_pop
+inherits from FS::Record.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_key">popnum - primary key (assigned automatically for new accounts)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_city">city</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_state">state</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_ac_%2D_area_code">ac - area code</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_exch_%2D_exchange">exch - exchange</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_loc_%2D_rest_of_number">loc - rest of number</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new point of presence (if only it were that easy!).  To add the 
+point of presence to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this point of presence to the database.  If there is an error, returns the
+error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Removes this point of presence from the database.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid point of presence.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: svc_acct_pop.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>It should be renamed to part_pop.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/svc_acct.html">the svc_acct manpage</A>, schema.html from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/svc_acct_sm.html b/httemplate/docs/man/FS/svc_acct_sm.html
new file mode 100644
index 000000000..ca50e7202
--- /dev/null
+++ b/httemplate/docs/man/FS/svc_acct_sm.html
@@ -0,0 +1,141 @@
+<HTML>
+<HEAD>
+<TITLE>FS::svc_acct_sm - Object methods for svc_acct_sm records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::svc_acct_sm - Object methods for svc_acct_sm records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::svc_acct_sm;</PRE>
+<PRE>
+  $record = new FS::svc_acct_sm \%hash;
+  $record = new FS::svc_acct_sm { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $error = $record-&gt;suspend;</PRE>
+<PRE>
+  $error = $record-&gt;unsuspend;</PRE>
+<PRE>
+  $error = $record-&gt;cancel;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::svc_acct object represents a virtual mail alias.  FS::svc_acct inherits
+from FS::Record.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_key">svcnum - primary key (assigned automatcially for new accounts)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_domain">domsvc - svcnum of the virtual domain (see <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_account">domuid - uid of the target account (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_domuser_%2D_virtual_username">domuser - virtual username</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new virtual mail alias.  To add the virtual mail alias to the
+database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this virtual mail alias to the database.  If there is an error, returns
+the error, otherwise returns false.
+<P>The additional fields pkgnum and svcpart (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
+defined.  An FS::cust_svc record will be created and inserted.</P>
+<P>If the configuration values (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine and qmailmachines
+exist, and domuser is `*' (meaning a catch-all mailbox), the command:</P>
+<PRE>
+  [ -e $dir/.qmail-$qdomain-default ] || {
+    touch $dir/.qmail-$qdomain-default;
+    chown $uid:$gid $dir/.qmail-$qdomain-default;
+  }</PRE>
+<P>is executed on shellmachine via ssh (see <EM>dot-qmail/``EXTENSION ADDRESSES''</EM>).
+This behaviour can be surpressed by setting $FS::svc_acct_sm::nossh_hack true.</P>
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this virtual mail alias from the database.  If there is an error,
+returns the error, otherwise returns false.
+<P>The corresponding FS::cust_svc record will be deleted as well.</P>
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
+<DD>
+Just returns false (no error) for now.
+<P>Called by the suspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
+<DD>
+Just returns false (no error) for now.
+<P>Called by the unsuspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
+<DD>
+Just returns false (no error) for now.
+<P>Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid virtual mail alias.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert and
+replace methods.
+<P>Sets any fixed values; see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>.</P>
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: svc_acct_sm.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>The remote commands should be configurable.</P>
+<P>The $recref stuff in sub check should be cleaned up.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>,
+<A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, <A HREF="../Net/SSH.html">the Net::SSH manpage</A>, <EM>ssh</EM>, <EM>dot-qmail</EM>,
+schema.html from the base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/svc_domain.html b/httemplate/docs/man/FS/svc_domain.html
new file mode 100644
index 000000000..ace3de154
--- /dev/null
+++ b/httemplate/docs/man/FS/svc_domain.html
@@ -0,0 +1,162 @@
+<HTML>
+<HEAD>
+<TITLE>FS::svc_domain - Object methods for svc_domain records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::svc_domain - Object methods for svc_domain records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::svc_domain;</PRE>
+<PRE>
+  $record = new FS::svc_domain \%hash;
+  $record = new FS::svc_domain { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $error = $record-&gt;suspend;</PRE>
+<PRE>
+  $error = $record-&gt;unsuspend;</PRE>
+<PRE>
+  $error = $record-&gt;cancel;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::svc_domain object represents a domain.  FS::svc_domain inherits from
+FS::svc_Common.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_key">svcnum - primary key (assigned automatically for new accounts)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_domain">domain</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new domain.  To add the domain to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this domain to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P>The additional fields <EM>pkgnum</EM> and <EM>svcpart</EM> (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
+defined.  An FS::cust_svc record will be created and inserted.</P>
+<P>The additional field <EM>action</EM> should be set to <EM>N</EM> for new domains or <EM>M</EM>
+for transfers.</P>
+<P>A registration or transfer email will be submitted unless
+$FS::svc_domain::whois_hack is true.</P>
+<P>The additional field <EM>email</EM> can be used to manually set the admin contact
+email address on this email.  Otherwise, the svc_acct records for this package 
+(see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) are searched.  If there is exactly one svc_acct record
+in the same package, it is automatically used.  Otherwise an error is returned.</P>
+<P>If any <EM>soamachine</EM> configuration file exists, an SOA record is added to
+the domain_record table (see &lt;FS::domain_record&gt;).</P>
+<P>If any machines are defined in the <EM>nsmachines</EM> configuration file, NS
+records are added to the domain_record table (see <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>).</P>
+<P>If any machines are defined in the <EM>mxmachines</EM> configuration file, MX
+records are added to the domain_record table (see <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>).</P>
+<P>Any problems adding FS::domain_record records will emit warnings, but will
+not return errors from this method.  If your configuration files are correct
+you shouln't have any problems.</P>
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this domain from the database.  If there is an error, returns the
+error, otherwise returns false.
+<P>The corresponding FS::cust_svc record will be deleted as well.</P>
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
+<DD>
+Just returns false (no error) for now.
+<P>Called by the suspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
+<DD>
+Just returns false (no error) for now.
+<P>Called by the unsuspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
+<DD>
+Just returns false (no error) for now.
+<P>Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid domain.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+<P>Sets any fixed values; see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>.</P>
+<P></P>
+<DT><STRONG><A NAME="item_whois">whois</A></STRONG><BR>
+<DD>
+Returns the Net::Whois::Domain object (see <A HREF="../Net/Whois.html">the Net::Whois manpage</A>) for this domain, or
+undef if the domain is not found in whois.
+<P>(If $FS::svc_domain::whois_hack is true, returns that in all cases instead.)</P>
+<P></P>
+<DT><STRONG><A NAME="item__whois">_whois</A></STRONG><BR>
+<DD>
+Depriciated.
+<P></P>
+<DT><STRONG><A NAME="item_submit_internic">submit_internic</A></STRONG><BR>
+<DD>
+Submits a registration email for this domain.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: svc_domain.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>All BIND/DNS fields should be included (and exported).</P>
+<P>Delete doesn't send a registration template.</P>
+<P>All registries should be supported.</P>
+<P>Should change action to a real field.</P>
+<P>The $recref stuff in sub check should be cleaned up.</P>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/svc_Common.html">the FS::svc_Common manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
+<A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF="../Net/Whois.html">the Net::Whois manpage</A>, <EM>ssh</EM>,
+<EM>dot-qmail</EM>, schema.html from the base documentation, config.html from the
+base documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/svc_www.html b/httemplate/docs/man/FS/svc_www.html
new file mode 100644
index 000000000..e72b219be
--- /dev/null
+++ b/httemplate/docs/man/FS/svc_www.html
@@ -0,0 +1,150 @@
+<HTML>
+<HEAD>
+<TITLE>FS::svc_www - Object methods for svc_www records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+	<LI><A HREF="#history">HISTORY</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::svc_www - Object methods for svc_www records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::svc_www;</PRE>
+<PRE>
+  $record = new FS::svc_www \%hash;
+  $record = new FS::svc_www { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<PRE>
+  $error = $record-&gt;suspend;</PRE>
+<PRE>
+  $error = $record-&gt;unsuspend;</PRE>
+<PRE>
+  $error = $record-&gt;cancel;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::svc_www object represents an web virtual host.  FS::svc_www inherits
+from FS::svc_Common.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_svcnum_%2D_primary_key">svcnum - primary key</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_recnum_%2D_DNS_%60A%27_record_corresponding_to_thi">recnum - DNS `A' record corresponding to this web virtual host. (see <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>)</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_account">usersvc - account (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>) corresponding to this web virtual host.</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Creates a new web virtual host.  To add the record to the database, see
+<A HREF="#insert">insert</A>.
+<P>Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P>The additional fields pkgnum and svcpart (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
+defined.  An FS::cust_svc record will be created and inserted.</P>
+<P>If the configuration values (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) <EM>apachemachine</EM>, and
+<EM>apacheroot</EM> exist, the command:</P>
+<PRE>
+  mkdir $apacheroot/$zone;
+  chown $username $apacheroot/$zone;
+  ln -s $apacheroot/$zone $homedir/$zone</PRE>
+<P><EM>$zone</EM> is the DNS A record pointed to by <EM>recnum</EM>
+<EM>$username</EM> is the username pointed to by <EM>usersvc</EM>
+<EM>$homedir</EM> is that user's home directory</P>
+<P>is executed on <EM>apachemachine</EM> via ssh.  This behaviour can be surpressed by
+setting $FS::svc_www::nossh_hack true.</P>
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Delete this record from the database.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
+<DD>
+Called by the suspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
+<DD>
+Called by the unsuspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
+<DD>
+Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: svc_www.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/svc_Common.html">the FS::svc_Common manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
+<A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, schema.html from the base documentation.</P>
+<P>
+<HR>
+<H1><A NAME="history">HISTORY</A></H1>
+<P>$Log: svc_www.html,v $
+<P>Revision 1.1  2001-07-30 07:36:03  ivan
+<P>templates!!!
+<P>
+Revision 1.4  2001/04/22 01:56:15  ivan
+get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)</P>
+<P>Revision 1.3  2000/11/22 23:30:51  ivan
+tyop</P>
+<P>Revision 1.2  2000/03/01 08:13:59  ivan
+compilation bugfixes</P>
+<P>Revision 1.1  2000/02/03 05:16:52  ivan
+beginning of DNS and Apache support</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/man/FS/type_pkgs.html b/httemplate/docs/man/FS/type_pkgs.html
new file mode 100644
index 000000000..ba258252f
--- /dev/null
+++ b/httemplate/docs/man/FS/type_pkgs.html
@@ -0,0 +1,100 @@
+<HTML>
+<HEAD>
+<TITLE>FS::type_pkgs - Object methods for type_pkgs records</TITLE>
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
+</HEAD>
+
+<BODY>
+
+<A NAME="__index__"></A>
+<!-- INDEX BEGIN -->
+
+<UL>
+
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#version">VERSION</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::type_pkgs - Object methods for type_pkgs records</P>
+<P>
+<HR>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::type_pkgs;</PRE>
+<PRE>
+  $record = new FS::type_pkgs \%hash;
+  $record = new FS::type_pkgs { 'column' =&gt; 'value' };</PRE>
+<PRE>
+  $error = $record-&gt;insert;</PRE>
+<PRE>
+  $error = $new_record-&gt;replace($old_record);</PRE>
+<PRE>
+  $error = $record-&gt;delete;</PRE>
+<PRE>
+  $error = $record-&gt;check;</PRE>
+<P>
+<HR>
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>An FS::type_pkgs record links an agent type (see <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A>) to a
+billing item definition (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>).  FS::type_pkgs inherits from
+FS::Record.  The following fields are currently supported:</P>
+<DL>
+<DT><STRONG><A NAME="item_typenum_%2D_Agent_type%2C_see_FS%3A%3Aagent_type">typenum - Agent type, see <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A></A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_pkgpart_%2D_Billing_item_definition%2C_see_FS%3A%3">pkgpart - Billing item definition, see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A></A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="methods">METHODS</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
+<DD>
+Create a new record.  To add the record to the database, see <A HREF="#insert">insert</A>.
+<P></P>
+<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DD>
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DD>
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
+<DD>
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+<P></P></DL>
+<P>
+<HR>
+<H1><A NAME="version">VERSION</A></H1>
+<P>$Id: type_pkgs.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
+<P>
+<HR>
+<H1><A NAME="bugs">BUGS</A></H1>
+<P>
+<HR>
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A>, <A HREF="../FS/part_pkgs.html">the FS::part_pkgs manpage</A>, schema.html from the base
+documentation.</P>
+
+</BODY>
+
+</HTML>
diff --git a/httemplate/docs/passwd.html b/httemplate/docs/passwd.html
new file mode 100755
index 000000000..a8f8151e2
--- /dev/null
+++ b/httemplate/docs/passwd.html
@@ -0,0 +1,16 @@
+<head>
+  <title>fs_passwd</title>
+</head>
+<body>
+  <h1>fs_passwd</h1>
+You may use fs_passwd/fs_passwd as a "passwd", "chfn" and "chsh" replacement on your shell machine(s) to cause password, gecos and shell changes to update your freeside machine.  This can pose a security risk if not configured correctly.  <b>Do not use this feature unless you understand what you are doing!</b>
+<br><br>Currently it is assumed that the the crypt(3) function in the C library is the same on the Freeside machine as on the target machine.
+<ul>
+  <li>Create a freeside account on the shell machine(s).
+  <li>Append the identity.pub from the freeside user on your freeside machine to the authorized_keys file of the newly created freeside user on the shell machine(s).
+  <li>Copy fs_passwd/fs_passwd to /usr/local/bin on the shell machine(s).  (chown freeside, chmod 4755).  You may link it to passwd, chfn and chsh as well.
+  <li>Copy fs_passwd/fs_passwdd to /usr/local/sbin on the shell machine(s).  (chown freeside, chmod 500)
+  <li>Create /usr/local/freeside on the shell machine(s). (chown freeside, chmod 700)
+  <li>Run an iteration of "fs_passwd/fs_passwd_server shell.machine" as the freeside user for each shell machine (this is a daemon process).
+</ul>
+</body>
diff --git a/httemplate/docs/postgresql.html b/httemplate/docs/postgresql.html
new file mode 100755
index 000000000..151081176
--- /dev/null
+++ b/httemplate/docs/postgresql.html
@@ -0,0 +1,23 @@
+<head>
+  <title>PostgreSQL notes</title>
+</head>
+<body>
+  <h1>PostgreSQL notes</h1>
+<p>
+PostgreSQL ships by default with a maximum of 31 character column names.  If
+you use arbitrary RADIUS attributes longer than 9 characters, fs-setup will
+fail with `duplicate column' errors (in the part_svc table).
+Solution: use a different database
+engine, or recompile PostgreSQL with 64 character column names.
+</p>
+Future versions of Freeside will keep all column names under 31 characters to
+avoid this problem.
+</p>
+<p>
+( I've personally been unable to get PostgreSQL working with larger column names,
+though the process does look like it should be straightforward.  If anyone is
+interested in assisting me with this, please get in touch.
+ -Ivan <a href="mailto:ivan@sisd.com">&lt;ivan@sisd.com</a>&gt; )
+</p>
+</body>
+
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
new file mode 100644
index 000000000..f68b9d257
--- /dev/null
+++ b/httemplate/docs/schema.html
@@ -0,0 +1,277 @@
+<head>
+  <title>Schema reference</title>
+</head>
+<body>
+  <h1>Schema reference</h1>
+  <ul>
+    <li><a name="agent">agent</a> - Agents are resellers of your service.  Agents may be limited to a subset of your full offerings (via their agent type).
+      <ul>
+        <li>agentnum - primary key
+        <li>agent - name of this agent
+        <li>typenum - <a href="#agent_type">agent type</a>
+        <li>prog - (unimplemented)
+        <li>freq - (unimplemented)
+      </ul>
+    <li><a name="agent_type">agent_type</a> - Agent types define groups of packages that you can then assign to particular agents.
+      <ul>
+        <li>typenum - primary key
+        <li>atype - name of this agent type
+      </ul>
+    <li><a name="cust_bill">cust_bill</a> - Invoices.  Declarations that a customer owes you money.  The specific charges are itemized in <a href="#cust_billl_pkg">cust_bill_pkg</a>.
+      <ul>
+        <li>invnum - primary key
+        <li>custnum - <a href="#cust_main">customer</a>
+        <li>_date
+        <li>charged - amount of this invoice
+        <li>printed - how many times this invoice has been printed automatically
+      </ul>
+    <li><a name="cust_bill_pkg">cust_bill_pkg</a> - Invoice line items
+      <ul>
+        <li>invnum - (multiple) key
+        <li>pkgnum - <a href="#cust_pkg">package</a> or 0 for the special virtual sales tax package
+        <li>setup - setup fee 
+        <li>recur - recurring fee
+        <li>sdate - starting date
+        <li>edate - ending date
+      </ul>
+    <li><a name="cust_credit">cust_credit</a> - Credits.  The equivalent of a negative <a href="#cust_bill">cust_bill</a> record.
+      <ul>
+        <li>crednum - primary key
+        <li>custnum - <a href="#cust_main">customer</a>
+        <li>amount - amount credited
+        <li>_date
+        <li>otaker - order taker
+        <li>reason
+      </ul>
+    <li><a name="cust_main">cust_main</a> - Customers
+      <ul>
+        <li>custnum - primary key
+        <li>agentnum - <a href="#agent">agent</a>
+        <li>refnum - <a href="#part_referral">referral</a>
+        <li>titlenum - <a href="#part_title">title</a>
+        <li>first - name
+        <li>last - name
+        <li>ss - social security number
+        <li>company
+        <li>address1
+        <li>address2
+        <li>city
+        <li>county
+        <li>state
+        <li>zip
+        <li>country
+        <li>daytime - phone
+        <li>night - phone
+        <li>fax - phone
+        <li><i>ship_first</i>
+        <li><i>ship_last</i>
+        <li><i>ship_company</i>
+        <li><i>ship_address1</i>
+        <li><i>ship_address2</i>
+        <li><i>ship_city</i>
+        <li><i>ship_county</i>
+        <li><i>ship_state</i>
+        <li><i>ship_zip</i>
+        <li><i>ship_country</i>
+        <li><i>ship_daytime</i>
+        <li><i>ship_night</i>
+        <li><i>ship_fax</i>
+        <li>payby - CARD, BILL, or COMP
+        <li>payinfo - card number, P.O.#, or comp issuer
+        <li>paydate - expiration date
+        <li>payname - billing name (name on card)
+        <li>tax - tax exempt, Y or null
+        <li>otaker - order taker
+      </ul>
+      (columns in <i>italics</i> are optional)
+    <li><a name="cust_main_invoice">cust_main_invoice</a> - Invoice destinations for email invoices.  Note that a customer can have many email destinations for their invoice (either literal or via svcnum), but only one postal destination.
+      <ul>
+        <li>destnum - primary key
+        <li>custnum - <a href="#cust_main">customer</a>
+        <li>dest - Invoice destination.  Freeside supports three types of invoice delivery: send directly to a service defined in Freeside, send to an arbitrary email address, or print the invoice to a printer and have someone send it out via snail mail.  Freeside determines which method to use based on the contents of the dest field.  If the contents are numeric, a <a href="#svc_acct">svcnum</a> pointing to a valid service is expected in the field.  If the contents are a string, a literal email address is expected to be in the field.  If the special keyword `POST' is present, the snail mail method is used (which is the default if no cust_main_invoice records exist).  Snail mail invoices get their address information from <A name="#cust_main">cust_main</A> and are printed with the printer defined in the configuration files.
+      </ul>
+    <li><a name="cust_main_county">cust_main_county</a> - Tax rates
+      <ul>
+        <li>taxnum - primary key
+        <li>state
+        <li>county
+        <li>country
+        <li>tax - % rate
+      </ul>
+    <li><a name="cust_pay">cust_pay</a> - Payments.  Money being transferred from a customer.
+      <ul>
+        <li>paynum - primary key
+        <li>invnum - <a href="#cust_bill">invoice</a>
+        <li>paid - amount
+        <li>_date
+        <li>payby - CARD, BILL, or COMP
+        <li>payinfo - card number, P.O.#, or comp issuer
+        <li>paybatch - text field for tracking card processor batches
+      </ul>
+    <li><a name="cust_pay_batch">cust_pay_batch</a> - Pending batch
+      <ul>
+        <li>trancode - 77 for charges
+        <li>cardnum
+        <li>exp - card expiration
+        <li>amount
+        <li>invnum - <a href="#cust_bill">invoice</a>
+        <li>custnum - <a href="#cust_main">customer</a>
+        <li>payname - name on card
+        <li>first - name
+        <li>last - name
+        <li>address1
+        <li>address2
+        <li>city
+        <li>state
+        <li>zip
+        <li>country
+      </ul>
+    <li><a name="cust_pkg">cust_pkg</a> - Customer billing items
+      <ul>
+        <li>pkgnum - primary key
+        <li>custnum - <a href="#cust_main">customer</a>
+        <li>pkgpart - <a href="#part_pkg">Package definition</a>
+        <li>setup - date
+        <li>bill - next bill date
+        <li>susp - (past) suspension date
+        <li>expire - (future) cancellation date
+        <li>cancel - (past) cancellation date
+        <li>otaker - order taker
+      </ul>
+    <li><a name="cust_refund">cust_refund</a> - Refunds.  The transfer of money to a customer; equivalent to a negative <a href="#cust_pay">cust_pay</a> record.
+      <ul>
+        <li>refundnum - primary key
+        <li>crednum - <a href="#cust_credit">credit</a>
+        <li>refund - amount
+        <li>_date
+        <li>payby - CARD, BILL or COMP
+        <li>payinfo - card number, P.O.#, or comp issuer
+        <li>otaker - order taker
+      </ul>
+    <li><a name="cust_svc">cust_svc</a> - Customer services
+      <ul>
+        <li>svcnum - primary key
+        <li>pkgnum - <a href="#cust_pkg">package</a>
+        <li>svcpart - <a href="#part_svc">Service definition</a>
+      </ul>
+    <li><a name="nas">nas</a> - Network Access Server (terminal server)
+      <ul>
+        <li>nasnum - primary key
+        <li>nas - NAS name
+        <li>nasip - NAS ip address
+        <li>nasfqdn - NAS fully-qualified domain name
+        <li>last - timestamp indicating the last instant the NAS was in a known state (used by the session monitoring).
+      </ul>
+    <li><a name="part_pkg">part_pkg</a> - Package definitions
+      <ul>
+        <li>pkgpart - primary key
+        <li>pkg - package name
+        <li>comment - non-customer visable package comment
+        <li>setup - setup fee
+        <li>freq - recurring frequency (months)
+        <li>recur - recurring fee
+      </ul>
+    <li><a name="part_referral">part_referral</a> - Referral listing
+      <ul>
+        <li>refnum - primary key
+        <li>referral - referral
+      </ul>
+    <li><a name="part_svc">part_svc</a> - Service definitions
+      <ul>
+        <li>svcpart - primary key
+        <li>svc - name of this service
+        <li>svcdb - table used for this service: svc_acct, svc_acct_sm, svc_domain, svc_charge or svc_wo
+        <li><i>table</i>__<i>field</i> - Default or fixed value for <i>field</i> in <i>table</i>
+        <li><i>table</i>__<i>field</i>_flag - null, D or F
+      </ul>
+    <li><a name="part_title">part_title</a> - Personal titles
+      <ul>
+        <li>titlenum - primary key
+        <li>title - personal title (`Dr.' or `Mr.')
+      </ul>
+    <li><a name="pkg_svc">pkg_svc</a>
+      <ul>
+        <li>pkgpart - <a href="#part_pkg">Package definition</a>
+        <li>svcpart - <a href="#part_svc">Service definition</a>
+        <li>quantity - quantity of this service that this package includes
+      </ul>
+    <li><a name="port">port</a> - individual port on a <a href="#nas">nas</a>
+      <ul>
+        <li>portnum - primary key
+        <li>ip - IP address of this port
+        <li>nasport - port number on the NAS
+        <li>nasnum - <a href="#nas">NAS</a>
+      </ul>
+    <li><a name="prepay_credit">prepay_credit</a>
+      <ul>
+        <li>prepaynum - primary key
+        <li>identifier - text or numeric string used to receive this credit
+        <li>amount - amount of credit
+      </ul>
+    <li><a name="session">session</a>
+      <ul>
+        <li>sessionnum - primary key
+        <li>portnum - <a href="#port">Port</a>
+        <li>svcnum - <a href="#svc_acct">Account</a>
+        <li>login - timestamp indicating the beginning of this user session.
+        <li>logout - timestamp indicating the end of this user session.  May be null, which indicates a currently open session.
+      </ul>
+
+    <li><a name="svc_acct">svc_acct</a> - Accounts
+      <ul>
+        <li>svcnum - <a href="#cust_svc">primary key</a>
+        <li>username
+        <li>_password
+        <li>popnum - <a href="#svc_acct_pop">Point of Presence</a>
+        <li>uid
+        <li>gid
+        <li>finger - GECOS
+        <li>dir
+        <li>shell
+        <li>quota - (unimplementd)
+        <li>slipip - IP address
+        <li>radius_<i>Radius_Attribute</i> - Radius-Attribute
+      </ul>
+    <li><a name="svc_acct_pop">svc_acct_pop</a> - Points of Presence
+      <ul>
+        <li>popnum - primary key
+        <li>city
+        <li>state
+        <li>ac - area code
+        <li>exch - exchange
+        <li>loc - rest of number
+      </ul>
+    <li><a name="svc_acct_sm">svc_acct_sm</a> - Domain mail aliases
+      <ul>
+        <li>svcnum - <a href="#cust_svc">primary key</a>
+        <li>domsvc - <a href="#svc_domain">Domain</a> (by svcnum)
+        <li>domuid - <a href="#svc_acct">Account</a> (by uid)
+        <li>domuser - domuser @ <a href="#svc_domain">Domain</a> forwards to <a href="#svc_acct">Account</a>
+      </ul>
+    <li><a name="svc_domain">svc_domain</a> - Domains
+      <ul>
+        <li>svcnum - <a href="#cust_svc">primary key</a>
+        <li>domain
+      </ul>
+    <li><a name="domain_record">domain_record</a> - Domain zone detail
+      <ul>
+        <li>recnum - primary key
+        <li>svcnum - <a href="#svc_domain">Domain</a> (by svcnum)
+        <li>reczone - zone for this line
+        <li>recaf - address family, usually <b>IN</b>
+        <li>rectype - type for this record (<b>A</b>, <b>MX</b>, etc.)
+        <li>recdata - data for this record
+      </ul>
+    <li><a name="svc_www">svc_www</a>
+      <ul>
+       <li>svcnum - <a href="#cust-svc">primary key</a>
+       <li>recnum - <a href="#domain_record">host</a>
+       <li>usersvc - <a href="#svc_acct">account</a>
+      </ul>
+    <li><a name="type_pkgs">type_pkgs</a>
+      <ul>
+        <li>typenum - <a href="#agent_type">agent type</a>
+        <li>pkgpart - <a href="#part_pkg">Package definition</a>
+      </ul>
+  </ul>
+</body>
diff --git a/httemplate/docs/session.html b/httemplate/docs/session.html
new file mode 100644
index 000000000..7dac5fdf7
--- /dev/null
+++ b/httemplate/docs/session.html
@@ -0,0 +1,54 @@
+<head>
+  <title>Session monitor</title>
+</head>
+<body>
+<h1>Session monitor</h1>
+<h2>Installation</h2>
+For security reasons, the client portion of the session montior may run on one
+or more external public machine(s).  On these machines, install:
+<ul>
+  <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at l
+east 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
+  <li><a href="man/FS/SessionClient.html">FS::SessionClient</a> (copy the fs_session/FS-SessionClient directory to the external machine, then: perl Makefile.PL; make; make install)
+</ul>
+Then:
+<ul>
+  <li>Add the user `freeside' to the the external machine.
+  <li>Create the /usr/local/freeside directory on the external machine (owned by the freeside user).
+  <li>touch /usr/local/freeside/fs_sessiond_socket; chown freeside /usr/local/freeside/fs_sessiond_socket; chmod 600 /usr/local/freeside/fs_sessiond_socket
+    <li>Append the identity.pub from the freeside user on your freeside machine to the authorized_keys file of the newly created freeside user on the external machine(s).
+  <li>Run <pre>fs_session_server <i>user</i> <i>machine</i></pre> on the Freeside machine.
+  <ul>
+    <li><i>user</i> is a user from the mapsecrets file.
+    <li><i>machine</i> is the name of the external machine.
+  </ul>
+</ul>
+<h2>Usage</h2>
+<ul>
+  <li>Web
+    <ul>
+      <li>Copy FS-SessionClient/cgi/login.cgi and logout.cgi to your web
+          server's document space.  
+      <li>Use <a href="http://www.apache.org/docs/suexec.html">suEXEC</a> or <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">setuid</a> (see <a href="install.html">install.html</a> for details) to run login.cgi and logout.cgi as the freeside user.
+    </ul>
+  <li>Command-line
+    <br><pre>freeside-login username ( portnum | ip | nasnum nasport )
+freeside-logout username ( portnum | ip | nasnum nasport )</pre>
+    <ul>
+      <li><i>username</i> is a customer username from the svc_acct table
+      <li><i>portnum</i>, <i>ip</i> or <i>nasport</i> and <i>nasnum</i> uniquely identify a port in the <a href="schema.html#port">port</a> database table.
+    </ul>
+  <li>RADIUS
+    <ul>
+      <li>Configure your RADIUS server's login and logout callbacks to use the command-line <tt>freeside-login</tt> and <tt>freeside-logout</tt> utilites.
+    </ul>
+</ul>
+<h2>Callbacks</h2>
+<ul>
+  <li>Sesstion start - The command(s) specified in the <a href="config.html#session-start">session-start</a> configuration file are executed on the Freeside machine.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
+  <li>Session end - The command(s) specified in the <a href="config.html#session-stop">session-stop</a> configuration file are executed on the Freeside machine.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
+</ul>
+<h2>Dropping expired users</h2>
+Run <pre>bin/freeside-session-kill username</pre> periodically from cron.
+</body>
+</html>
diff --git a/httemplate/docs/signup.html b/httemplate/docs/signup.html
new file mode 100644
index 000000000..a40b1f963
--- /dev/null
+++ b/httemplate/docs/signup.html
@@ -0,0 +1,57 @@
+<head>
+  <title>Signup server</title>
+</head>
+<body>
+  <h1>Signup server</h1>
+For security reasons, the signup server should run on an external public
+webserver.  On this machine, install:
+<ul>
+  <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
+  <li><a href="ftp://ftp.cs.hut.fi/pub/ssh/">SSH</a>
+  <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
+  <li><a href="http://www.perl.com/CPAN/modules/by-module/Text/">Text::Template</a>
+  <li><a href="http://www.sisd.com/useragent">HTTP::Headers::UserAgent</a> (version 2.0 or higher; not yet indexed correctly on CPAN)
+
+  <li><a href="man/FS/SignupClient.html">FS::SignupClient</a> (copy the fs_signup/FS-SignupClient directory to the external machine, then: perl Makefile.PL; make; make install)
+</ul>
+Then:
+<ul>
+  <li>Add the user `freeside' to the the external machine.
+  <li>Copy or symlink fs_signup/FS-SignupClient/cgi/signup.cgi into the web server's document space.
+  <li>Enable CGI execution for files with the `.cgi' extension.  (with <a href="http://www.apache.org/docs/mod/mod_mime.html#addhandler">Apache</a>)
+  <li>Create the /usr/local/freeside directory on the external machine (owned by the freeside user).
+  <li>touch /usr/local/freeside/fs_signupd_socket; chown freeside /usr/local/freeside/fs_signupd_socket; chmod 600 /usr/local/freeside/fs_signupd_socket
+  <li>Use <a href="http://www.apache.org/docs/suexec.html">suEXEC</a> or <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">setuid</a> (see <a href="install.html">install.html</a> for details) to run signup.cgi as the freeside user.
+  <li>Append the identity.pub from the freeside user on your freeside machine to the authorized_keys file of the newly created freeside user on the external machine(s).
+  <li>Run <pre>fs_signup_server <i>user</i> <i>machine</i> <i>agentnum</i> <i>refnum</i></pre> on the Freeside machine.
+  <ul>
+    <li><i>user</i> is a user from the mapsecrets file.
+    <li><i>machine</i> is the name of the external machine.
+    <li><i>agentnum</i> and <i>refnum</i> are the <a href="schema.html#agent">agent</a> and <a href="schema.html#part_referral">referral</a>, respectively, to use for customers who sign up via this signup server.
+  </ul>
+</ul>
+Optional:
+<ul>
+  <li>If you create a <b>/usr/local/freeside/ieak.template</b> file on the external machine, it will be sent to IE users with MIME type <i>application/x-Internet-signup</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the following variables available:
+  <ul>
+    <li>$ac - area code of selected POP
+    <li>$exch - exchange of selected POP
+    <li>$loc - local part of selected POP
+    <li>$username
+    <li>$password
+    <li>$email_name - first and last name
+  </ul>
+  (an example file is included as <b>fs_signup/ieak.template</b>)
+  <li>If you create a <b>/usr/local/freeside/cck.template</b> file on the external machine, the variables defined will be sent to Netscape users with MIME type <i>application/x-netscape-autoconfigure-dialer-v2</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the following variables available:
+  <ul>
+    <li>$ac - area code of selected POP
+    <li>$exch - exchange of selected POP
+    <li>$loc - local part of selected POP
+    <li>$username
+    <li>$password
+    <li>$email_name - first and last name
+  </ul>
+  (an example file is included as <b>fs_signup/cck.template</b>).  See the <a href="http://help.netscape.com/products/client/mc/acctproc4.html">Netscape documentation</a> for more information.
+  <li>If there are any entries in the <i>prepay_credit</i> table, a user can enter a string matching the <b>identifier</i> column to receive the credit specified in the <b>amount</b> column, and/or the time specified in the <b>seconds</b> column (for use with the <a href="session.html">session monitor</a>), after which that <b>identifier</b> is no longer valid.  This can be used to implement pre-paid "calling card" type signups.  The <i>bin/generate-prepay</i> script can be used to populate the <i>prepay_credit</i> table.
+</ul>
+</body>
diff --git a/httemplate/docs/trouble.html b/httemplate/docs/trouble.html
new file mode 100755
index 000000000..fce743928
--- /dev/null
+++ b/httemplate/docs/trouble.html
@@ -0,0 +1,26 @@
+<head>
+  <title>Troubleshooting</title>
+</head>
+<body>
+  <h1>Troubleshooting</h1>
+  <ul>
+    <li>When troubleshooting the web interface, helpful information is often in your web server's error log.
+    <li>If bin/svc_acct.import fails with an "Out of memory!" error using MySQL, upgrede MySQL and recompile the Perl DBD.  There was a memory leak in some older versions of MySQL.
+    <li>If you get tons of errors in your web server's error log like this:
+<pre>
+Ambiguous use of value => resolved to "value" =>
+at /usr/lib/perl5/site_perl/File/CounterFile.pm line 132.
+</pre>
+        This clutters up your log files but is otherwise harmless.  Upgrade to the latest File::CounterFile. 
+    <li>If you get errors like this:
+<pre>
+UID.pm: Can't open /var/spool/freeside/conf/secrets: Permission denied 
+at <i>/your/path</i>/site_perl/FS/UID.pm line 26.
+BEGIN failed--compilation aborted at
+<i>/your/path</i>/edit/process/part_svc.cgi line 15.
+</pre>
+        Then the scripts are not running as the freeside freeside user.  See
+the <a href="install.html">New Installation</a> section of the documentation.
+  <li>If you receive `can not connect to server' errors using MySQL on a system that doesn't support native threading, you may need to specify the full hostname in your DBI datasource.  See the <a href="http://www.mysql.com/Manual_chapter/manual_Problems.html#Can_not_connect_to_server">MySQL documentation</a>, DBI manpage and the DBD::mysql manpage for details.
+  </ul>
+</body>
diff --git a/httemplate/docs/upgrade.html b/httemplate/docs/upgrade.html
new file mode 100755
index 000000000..d2201f601
--- /dev/null
+++ b/httemplate/docs/upgrade.html
@@ -0,0 +1,24 @@
+<head>
+  <title>Upgrading to 1.1.x</title>
+</head>
+<body>
+<h1>Upgrading to 1.1.x</h1>
+<ul>
+  <li>Back up your data and current Freeside installation.
+  <li>Unpack a copy of the 1.0.0 distribution in a separate location.
+  <li>Diff your current installation against the 1.0.0 distribution.
+  <li>Apply all the diffs you found above, if applicable.
+  <li>Apply (at least) the following changes to your database:
+<pre>
+ALTER TABLE cust_main CHANGE ss ss char(11) NULL;
+ALTER TABLE cust_main CHANGE day daytime varchar(20) NULL;
+ALTER TABLE svc_acct CHANGE password _password varchar(25) NOT NULL;
+ALTER TABLE part_svc CHANGE svc_acct__password svc_acct___password varchar(25) NULL;
+ALTER TABLE part_svc CHANGE svc_acct__password_flag svc_acct___password_flag char(1) NULL;
+ALTER TABLE agent_type CHANGE type atype varchar(80) NOT NULL;
+</pre>
+  <li>Optionally change the field lengths and types to match a 1.1.x install; see `bin/fs-setup'.
+  <li>Create the necessary <a href="config.html">configuration files</a>,
+  <li>Copy or symlink htdocs and site_perl to the new 1.1.x copies.
+  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
+</body>
diff --git a/httemplate/docs/upgrade2.html b/httemplate/docs/upgrade2.html
new file mode 100755
index 000000000..7acae48f7
--- /dev/null
+++ b/httemplate/docs/upgrade2.html
@@ -0,0 +1,11 @@
+<head>
+  <title>Upgrading to 1.1.4</title>
+</head>
+<body>
+<h1>Upgrading to 1.1.4 from 1.1.x</h1>
+<ul>
+  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
+  <li>Back up your data and current Freeside installation.
+  <li>If applicable, create the new <a href="config.html">configuration files</a>: lpr, cybercash2, cybercash3.2
+  <li>Copy or symlink htdocs and site_perl to the new copies.
+</body>
diff --git a/httemplate/docs/upgrade3.html b/httemplate/docs/upgrade3.html
new file mode 100644
index 000000000..0837e0207
--- /dev/null
+++ b/httemplate/docs/upgrade3.html
@@ -0,0 +1,40 @@
+<head>
+  <title>Upgrading to 1.2.x</title>
+</head>
+<body>
+<h1>Upgrading to 1.2.x from 1.1.x</h1>
+<ul>
+  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
+  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
+  <li>Back up your data and current Freeside installation.
+  <li>Install the Perl module <a href="http://www.perl.com/CPAN/modules/by-module/String/">String-Approx</a>
+  <li><a href="config.html">Configuration file</a> location has changed!
+  <li>Move /var/spool/freeside/dbdef.<i>datasrc</i> to /usr/local/etc/freeside/dbdef.<i>datasrc</i>.
+  <li>Move /var/spool/freeside/counters to /usr/local/etc/freeside/counters.<i>datasrc</i>.
+  <li>Move /var/spool/freeside/export to /usr/local/etc/freeside/export.<i>datasrc</i>.
+  <li>Apply the following changes to your database:
+<pre>
+<!-- ALTER TABLE cust_main ADD middle varchar(80) NULL;
+ALTER TABLE cust_main ADD titlenum int NULL;
+-->ALTER TABLE cust_main CHANGE state state varchar(80) NULL;
+ALTER TABLE cust_main_county CHANGE state state varchar(80) NULL;
+ALTER TABLE cust_main_county ADD country char(2);
+ALTER TABLE cust_main CHANGE paydate paydate varchar(10);
+UPDATE cust_main SET country = "US" where country IS NULL OR country = '';
+UPDATE cust_main_county SET country = "US" where country IS NULL OR country = "";
+<!--CREATE TABLE part_title (
+   titlenum int NOT NULL,
+   title varchar(80) NOT NULL,
+   PRIMARY KEY (titlenum)
+);
+-->CREATE TABLE cust_main_invoice (
+   destnum int NOT NULL,
+   custnum int NOT NULL,
+   dest varchar(80) NOT NULL,
+   PRIMARY KEY (destnum),
+   INDEX ( custnum )
+);
+</pre>
+  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
+  <li>Copy or symlink htdocs and site_perl to the new copies.
+</body>
diff --git a/httemplate/docs/upgrade4.html b/httemplate/docs/upgrade4.html
new file mode 100644
index 000000000..1d70f8b73
--- /dev/null
+++ b/httemplate/docs/upgrade4.html
@@ -0,0 +1,27 @@
+<head>
+  <title>Upgrading to 1.2.2</title>
+</head>
+<body>
+<h1>Upgrading to 1.2.2 from 1.2.x</h1>
+<ul>
+  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
+  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
+  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
+  <li>Back up your data and current Freeside installation.
+  <li>Install the Perl modules <a href="http://www.perl.com/CPAN/modules/by-module/Locale/">Locale-Codes</a> and <a href="http://www.perl.com/CPAN/modules/by-module/Net/">Net-Whois</a>.
+  <li>Apply the following changes to your database:
+<pre>
+ALTER TABLE cust_pay_batch CHANGE exp exp VARCHAR(11);
+</pre>
+  <li>Copy or symlink htdocs to the new copy.
+  <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
+  <li>Change to the FS directory in the new tarball, and build and install the
+      Perl modules:
+    <pre>
+$ cd FS/
+$ perl Makefile.PL
+$ make
+$ su
+# make install</pre>
+  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
+</body>
diff --git a/httemplate/docs/upgrade5.html b/httemplate/docs/upgrade5.html
new file mode 100644
index 000000000..3f3431653
--- /dev/null
+++ b/httemplate/docs/upgrade5.html
@@ -0,0 +1,34 @@
+<head>
+  <title>Upgrading to 1.3.0</title>
+</head>
+<body>
+<h1>Upgrading to 1.2.3 from 1.2.2</h1>
+<ul>
+  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
+  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
+  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
+  <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
+  <li>Back up your data and current Freeside installation.
+  <li>Apply the following changes to your database:
+<pre>
+ALTER TABLE svc_acct_pop ADD loc CHAR(4);
+CREATE TABLE prepay_credit (
+  prepaynum int NOT NULL,
+  identifier varchar(80) NOT NULL,
+  amount decimal(10,2) NOT NULL,
+  PRIMARY KEY (prepaynum),
+  INDEX (identifier)
+);
+</pre>
+  <li>Copy or symlink htdocs to the new copy.
+  <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
+  <li>Change to the FS directory in the new tarball, and build and install the
+      Perl modules:
+    <pre>
+$ cd FS/
+$ perl Makefile.PL
+$ make
+$ su
+# make install</pre>
+  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
+</body>
diff --git a/httemplate/docs/upgrade6.html b/httemplate/docs/upgrade6.html
new file mode 100644
index 000000000..dc82975f3
--- /dev/null
+++ b/httemplate/docs/upgrade6.html
@@ -0,0 +1,66 @@
+<head>
+  <title>Upgrading to 1.3.0</title>
+</head>
+<body>
+<h1>Upgrading to 1.3.0 from 1.2.3</h1>
+<ul>
+  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
+  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
+  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
+  <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
+  <li>If migrating from less than 1.2.3, see these <a href="upgrade5.html">instructions</a> first.
+  <li>Back up your data and current Freeside installation.
+  <li>As 1.3.0 requires transactions, <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are no longer supported</b>.  Converting to <a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.  If you really want to use MySQL, convert your tables to one of the <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>.
+  <li>Copy the <i>invoice_template</i> file from the <i>conf/</i> directory in the distribution to your <a href="config.html">configuration directory</a>.
+  <li>Install the <a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>, <a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>, <a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>, <a href="http://search.cpan.org/search?dist=String-ShellQuote">String-ShellQuote</a> and <a href="http://search.cpan.org/search?dist=Net-SCP">Net-SCP</a> Perl modules.
+  <li>Apply the following changes to your database:
+<pre>
+CREATE TABLE domain_record (
+  recnum int NOT NULL,
+  svcnum int NOT NULL,
+  reczone varchar(80) NOT NULL,
+  recaf char(2) NOT NULL,
+  rectype char(5) NOT NULL,
+  recdata varchar(80) NOT NULL,
+  PRIMARY KEY (recnum)
+);
+CREATE TABLE svc_www (
+  svcnum int NOT NULL,
+  recnum int NOT NULL,
+  usersvc int NOT NULL,
+  PRIMARY KEY (svcnum)
+);
+ALTER TABLE part_svc ADD svc_www__recnum varchar(80) NULL;
+ALTER TABLE part_svc ADD svc_www__recnum_flag char(1) NULL;
+ALTER TABLE part_svc ADD svc_www__usersvc varchar(80) NULL;
+ALTER TABLE part_svc ADD svc_www__uesrsvc_flag char(1) NULL;
+ALTER TABLE svc_acct CHANGE _password _password varchar(50) NULL;
+ALTER TABLE svc_acct ADD seconds integer NULL;
+ALTER TABLE part_svc ADD svc_acct__seconds integer NULL;
+ALTER TABLE part_svc ADD svc_acct__seconds_flag char(1) NULL;
+ALTER TABLE prepay_credit ADD seconds integer NULL;
+
+</pre>
+  <li>If your database supports dropping columns:
+<pre>
+ALTER TABLE cust_bill DROP owed;
+ALTER TABLE cust_credit DROP credited;
+</pre>
+     Or, if your database does not support dropping columns, you can do this:
+<pre>
+ALTER TABLE cust_bill CHANGE owed depriciated decimal(10,2);
+ALTER TABLE cust_credit CHANGE credited depriciated2 decimal(10,2);
+</pre>
+
+  <li>Copy or symlink htdocs to the new copy.
+  <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
+  <li>Change to the FS directory in the new tarball, and build and install the
+      Perl modules:
+    <pre>
+$ cd FS/
+$ perl Makefile.PL
+$ make
+$ su
+# make install</pre>
+  <li>Run bin/dbdef-create.
+</body>
diff --git a/httemplate/docs/upgrade7.html b/httemplate/docs/upgrade7.html
new file mode 100644
index 000000000..d9dcfe2ae
--- /dev/null
+++ b/httemplate/docs/upgrade7.html
@@ -0,0 +1,24 @@
+<head>
+  <title>Upgrading to 1.3.1</title>
+</head>
+<body>
+<h1>Upgrading to 1.3.1 from 1.3.0</h1>
+<ul>
+  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
+  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
+  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
+  <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
+  <li>If migrating from less than 1.2.3, see these <a href="upgrade5.html">instructions</a> first.
+  <li>If migrating from less than 1.3.0, see these <a href="upgrade6.html">instructions</a> first.
+  <li>Back up your data and current Freeside installation.
+  <li>Copy or symlink htdocs to the new copy.
+  <li>Change to the FS directory in the new tarball, and build and install the
+      Perl modules:
+    <pre>
+$ cd FS/
+$ perl Makefile.PL
+$ make
+$ su
+# make install UNINST=1</pre>
+  <li>Run bin/dbdef-create.
+</body>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
new file mode 100644
index 000000000..fdf91647f
--- /dev/null
+++ b/httemplate/docs/upgrade8.html
@@ -0,0 +1,82 @@
+<head>
+  <title>Upgrading to 1.4.0</title>
+</head>
+<body>
+<h1>Upgrading to 1.4.0 from 1.3.1</h1>
+<ul>
+  <li>If migrating from less than 1.3.1, see these <a href="upgrade7.html">instructions</a> first.
+  <li>Back up your data and current Freeside installation.
+  <li>Install <a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a>.
+</ul>
+<table>
+  <tr>
+    <th>Apache::ASP</th><th>Mason</th>
+  </tr>
+  <tr>
+    <td><ul>
+      <li>Run <tt>make aspdocs</tt>
+      <li>Copy <tt>aspdocs/</tt> to your web server's document space.
+      <li>Create a <a href="http://www.apache-asp.org/config.html#Global">Global</a> directory, such as <tt>/usr/local/etc/freeside/asp-global/</tt>
+      <li>Copy <tt>htetc/global.asa</tt> to the Global directory.
+      <li>Configure Apache for the Global directory and to execute .cgi files using Apache::ASP.  For example:
+<font size="-1"><pre>
+&lt;Directory /usr/local/apache/htdocs/freeside-asp&gt;
+&lt;Files ~ (\.cgi)&gt;
+AddHandler perl-script .cgi
+PerlHandler Apache::ASP
+&lt;/Files&gt;
+&lt;Perl&gt;
+$MLDBM::RemoveTaint = 1;
+&lt;/Perl&gt;
+PerlSetVar Global /usr/local/etc/freeside/asp-global/
+&lt;/Directory&gt;
+</pre></font>
+    </ul></td>
+    <td><ul>
+      <li>Run <tt>make masondocs</tt>
+      <li>Copy <tt>masondocs/</tt> to your web server's document space.
+      <li>Copy <tt>htetc/handler.pl</tt> to your web server's configuration directory.
+      <li>Edit <tt>handler.pl</tt> and set an appropriate <tt>data_dir</tt>, such as <tt>/usr/local/etc/freeside/mason-data</tt>
+      <li>Configure Apache to use the <tt>handler.pl</tt> file and to execute .cgi files using HTML::Mason.  For example:
+<font size="-1"><pre>
+&lt;Directory /usr/local/apache/htdocs/freeside-mason&gt;
+&lt;Files ~ (\.cgi)&gt;
+AddHandler perl-script .cgi
+PerlHandler HTML::Mason
+&lt;/Files&gt;
+&lt;Perl&gt;
+require "/usr/local/apache/conf/handler.pl";
+&lt;/Perl&gt;
+&lt;/Directory&gt;
+</pre></font>
+    </ul></td>
+  </tr>
+</table>
+<ul>
+  <li>Change to the FS directory in the new tarball, and build and install the
+      Perl modules:
+    <pre>
+$ cd FS/
+$ perl Makefile.PL
+$ make
+$ su
+# make install UNINST=1</pre>
+  <li>If you wish to enable service/shipping addresses, apply the following
+      changes to your database:
+<pre>
+ALTER TABLE cust_main ADD COLUMN ship_last varchar(80) NULL;
+ALTER TABLE cust_main ADD COLUMN ship_first varchar(80) NULL;
+ALTER TABLE cust_main ADD COLUMN ship_company varchar(80) NULL;
+ALTER TABLE cust_main ADD COLUMN ship_address1 varchar(80) NULL;
+ALTER TABLE cust_main ADD COLUMN ship_address2 varchar(80) NULL;
+ALTER TABLE cust_main ADD COLUMN ship_city varchar(80) NULL;
+ALTER TABLE cust_main ADD COLUMN ship_county varchar(80) NULL;
+ALTER TABLE cust_main ADD COLUMN ship_state varchar(80) NULL;
+ALTER TABLE cust_main ADD COLUMN ship_zip varchar(10) NULL;
+ALTER TABLE cust_main ADD COLUMN ship_country char(2) NULL;
+ALTER TABLE cust_main ADD COLUMN ship_daytime varchar(20) NULL;
+ALTER TABLE cust_main ADD COLUMN ship_night varchar(20) NULL;
+ALTER TABLE cust_main ADD COLUMN ship_fax varchar(12) NULL;
+</pre>
+  <li>Run bin/dbdef-create.
+</body>
diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
new file mode 100755
index 000000000..b4508da81
--- /dev/null
+++ b/httemplate/edit/agent.cgi
@@ -0,0 +1,112 @@
+<%
+#
+# $Id: agent.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 97-dec-12
+#
+# Changes to allow page to work at a relative position in server
+# Changed 'type' to 'atype' because Pg6.3 reserves the type word
+#	bmccane@maxbaud.net	98-apr-3
+#
+# use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
+#
+# $Log: agent.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  1999/04/07 11:27:50  ivan
+# avoid perl's silly arguement not numeric error
+#
+# Revision 1.6  1999/01/25 12:09:50  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:31  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:21  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 06:16:57  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/11/23 07:52:08  ivan
+# *** empty log message ***
+#
+
+use strict;
+use vars qw ( $cgi $agent $action $hashref $p $agent_type );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header menubar popurl);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::agent;
+use FS::agent_type;
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  $agent = new FS::agent ( {
+    map { $_, scalar($cgi->param($_)) } fields('agent')
+  } );
+} elsif ( $cgi->keywords ) {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $agent = qsearchs( 'agent', { 'agentnum' => $1 } );
+} else { #adding
+  $agent = new FS::agent {};
+}
+$action = $agent->agentnum ? 'Edit' : 'Add';
+$hashref = $agent->hashref;
+
+$p = popurl(2);
+
+print $cgi->header( '-expires' => 'now' ), header("$action Agent", menubar(
+  'Main Menu' => $p,
+  'View all agents' => $p. 'browse/agent.cgi',
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print '<FORM ACTION="', popurl(1), 'process/agent.cgi" METHOD=POST>',
+      qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$hashref->{agentnum}">!,
+      "Agent #", $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)";
+
+print <<END;
+<PRE>
+Agent                     <INPUT TYPE="text" NAME="agent" SIZE=32 VALUE="$hashref->{agent}">
+Agent type                <SELECT NAME="typenum" SIZE=1>
+END
+
+foreach $agent_type (qsearch('agent_type',{})) {
+  print "<OPTION VALUE=". $agent_type->typenum;
+  print " SELECTED"
+    if $hashref->{typenum} && ( $hashref->{typenum} == $agent_type->typenum );
+  print ">", $agent_type->getfield('typenum'), ": ",
+        $agent_type->getfield('atype'),"\n";
+}
+
+print <<END;
+</SELECT>
+Frequency (unimplemented) <INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}">
+Program (unimplemented)   <INPUT TYPE="text" NAME="prog" VALUE="$hashref->{prog}">
+</PRE>
+END
+
+print qq!<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{agentnum} ? "Apply changes" : "Add agent",
+      qq!">!;
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
new file mode 100755
index 000000000..317fd60bc
--- /dev/null
+++ b/httemplate/edit/agent_type.cgi
@@ -0,0 +1,128 @@
+<%
+#
+# $Id: agent_type.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# agent_type.cgi: Add/Edit agent type (output form)
+#
+# ivan@sisd.com 97-dec-10
+#
+# Changes to allow page to work at a relative position in server
+# Changed 'type' to 'atype' because Pg6.3 reserves the type word
+#	bmccane@maxbaud.net	98-apr-3
+#
+# use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
+#
+# $Log: agent_type.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.11  1999/04/07 11:19:21  ivan
+# silly HTML typo
+#
+# Revision 1.10  1999/01/25 12:09:51  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.9  1999/01/19 05:13:32  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.8  1999/01/18 09:41:22  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.7  1999/01/18 09:22:29  ivan
+# changes to track email addresses for email invoicing
+#
+# Revision 1.6  1998/12/17 06:16:58  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.5  1998/11/21 07:58:27  ivan
+# package names link to them
+#
+# Revision 1.4  1998/11/21 07:45:19  ivan
+# visual, use FS::table_name when doing qsearch('table_name')
+#
+# Revision 1.3  1998/11/15 11:20:12  ivan
+# s/CGI-Base/CGI.pm/ causes s/QUERY_STRING/keywords/;
+#
+# Revision 1.2  1998/11/13 09:56:46  ivan
+# change configuration file layout to support multiple distinct databases (with
+# own set of config files, export, etc.)
+#
+
+use strict;
+use vars qw( $cgi $agent_type $action $hashref $p $part_pkg );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::agent_type;
+use FS::CGI qw(header menubar popurl);
+use FS::agent_type;
+use FS::part_pkg;
+use FS::type_pkgs;
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  $agent_type = new FS::agent_type ( {
+    map { $_, scalar($cgi->param($_)) } fields('agent')
+  } );
+} elsif ( $cgi->keywords ) { #editing
+  my( $query ) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $agent_type=qsearchs('agent_type',{'typenum'=>$1});
+} else { #adding
+  $agent_type = new FS::agent_type {};
+}
+$action = $agent_type->typenum ? 'Edit' : 'Add';
+$hashref = $agent_type->hashref;
+
+$p = popurl(2);
+print $cgi->header( '-expires' => 'now' ), header("$action Agent Type", menubar(
+  'Main Menu' => "$p",
+  'View all agent types' => "${p}browse/agent_type.cgi",
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print '<FORM ACTION="', popurl(1), 'process/agent_type.cgi" METHOD=POST>',
+      qq!<INPUT TYPE="hidden" NAME="typenum" VALUE="$hashref->{typenum}">!,
+      "Agent Type #", $hashref->{typenum} ? $hashref->{typenum} : "(NEW)";
+
+print <<END;
+<BR><BR>Agent Type <INPUT TYPE="text" NAME="atype" SIZE=32 VALUE="$hashref->{atype}">
+<BR><BR>Select which packages agents of this type may sell to customers<BR>
+END
+
+foreach $part_pkg ( qsearch('part_pkg',{}) ) {
+  print qq!<BR><INPUT TYPE="checkbox" NAME="pkgpart!,
+        $part_pkg->getfield('pkgpart'), qq!" !,
+       # ( 'CHECKED 'x scalar(
+        qsearchs('type_pkgs',{
+          'typenum' => $agent_type->getfield('typenum'),
+          'pkgpart'  => $part_pkg->getfield('pkgpart'),
+        })
+          ? 'CHECKED '
+          : '',
+        qq!VALUE="ON"> !,
+    qq!<A HREF="${p}edit/part_pkg.cgi?!, $part_pkg->pkgpart, 
+    '">', $part_pkg->getfield('pkg'), '</A>',
+  ;
+}
+
+print qq!<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{typenum} ? "Apply changes" : "Add agent type",
+      qq!">!;
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
new file mode 100755
index 000000000..d3d0dc15f
--- /dev/null
+++ b/httemplate/edit/cust_credit.cgi
@@ -0,0 +1,125 @@
+<%
+#
+# $Id: cust_credit.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: cust_credit.cgi custnum [ -paybatch ]
+#        http://server.name/path/cust_credit?custnum [ -paybatch ]
+#
+# some hooks in here for modifications as well as additions, but needs (lots) more work.
+# also see process/cust_credit.cgi, the script that processes the form.
+#
+# ivan@voicenet.com 96-dec-05
+#
+# paybatch field, differentiates between credits & credits+refunds by commandline
+# ivan@voicenet.com 96-dec-08
+#
+# added (but commented out) sprintf("%.2f" in amount field.  Hmm.
+# ivan@voicenet.com 97-jan-3
+#
+# paybatch stuff thrown out - has checkbox now instead.  
+# (well, sort of.  still passed around for backward compatability and possible editing hook)
+# ivan@voicenet.com 97-apr-21
+#
+# rewrite ivan@sisd.com 98-mar-16
+#
+# $Log: cust_credit.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  1999/02/28 00:03:33  ivan
+# removed misleading comments
+#
+# Revision 1.6  1999/01/25 12:09:52  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:33  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:23  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/23 02:26:06  ivan
+# *** empty log message ***
+#
+# Revision 1.2  1998/12/17 06:16:59  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+
+use strict;
+use vars qw( $cgi $query $custnum $otaker $p1 $crednum $_date $amount $reason );
+use Date::Format;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(header popurl);
+use FS::Record qw(fields);
+#use FS::cust_credit;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  #$cust_credit = new FS::cust_credit ( {
+  #  map { $_, scalar($cgi->param($_)) } fields('cust_credit')
+  #} );
+  $custnum = $cgi->param('custnum');
+  $amount = $cgi->param('amount');
+  #$refund = $cgi->param('refund');
+  $reason = $cgi->param('reason');
+} else {
+  ($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $custnum = $1;
+  $amount = '';
+  #$refund = 'yes';
+  $reason = '';
+}
+$_date = time;
+
+$otaker = getotaker;
+
+$p1 = popurl(1);
+
+print $cgi->header( '-expires' => 'now' ), header("Post Credit", '');
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+print <<END;
+    <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>
+    <PRE>
+END
+
+$crednum = "";
+print qq!Credit #<B>!, $crednum ? $crednum : " <I>(NEW)</I>", qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
+
+print qq!\nCustomer #<B>$custnum</B><INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
+
+print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
+
+print qq!\nDate: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
+
+print qq!\nAmount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
+print qq!<INPUT TYPE="hidden" NAME="credited" VALUE="">!;
+
+#print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
+
+print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!;
+
+print qq!\nReason <INPUT TYPE="text" NAME="reason" VALUE="$reason" SIZE=72>!;
+
+print <<END;
+</PRE>
+<BR>
+<CENTER><INPUT TYPE="submit" VALUE="Post"></CENTER>
+END
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
new file mode 100755
index 000000000..8902e3dce
--- /dev/null
+++ b/httemplate/edit/cust_main.cgi
@@ -0,0 +1,432 @@
+<%
+#<!-- $Id: cust_main.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $ -->
+
+use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
+             $last $first $ss $company $address1 $address2 $city $zip 
+             $daytime $night $fax @invoicing_list $invoicing_list $payinfo
+             $payname %payby %paybychecked $refnum $otaker $r );
+use vars qw ( $conf $pkgpart $username $password $popnum $ulen $ulen2 );
+#use CGI::Switch;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+#use FS::Record qw(qsearch qsearchs fields);
+use FS::Record qw(qsearch qsearchs fields dbdef);
+use FS::CGI qw(header popurl itable table);
+use FS::cust_main;
+use FS::agent;
+use FS::part_referral;
+use FS::cust_main_county;
+
+  #for misplaced logic below
+  use FS::part_pkg;
+
+  #for false laziness below
+  use FS::svc_acct_pop;
+
+  #for (other) false laziness below
+  use FS::agent;
+  use FS::type_pkgs;
+
+$conf = new FS::Conf;
+
+#get record
+
+if ( $cgi->param('error') ) {
+  $cust_main = new FS::cust_main ( {
+    map { $_, scalar($cgi->param($_)) } fields('cust_main')
+  } );
+  $custnum = $cust_main->custnum;
+  $pkgpart = $cgi->param('pkgpart_svcpart') || '';
+  if ( $pkgpart =~ /^(\d+)_/ ) {
+    $pkgpart = $1;
+  } else {
+    $pkgpart = '';
+  }
+  $username = $cgi->param('username');
+  $password = $cgi->param('_password');
+  $popnum = $cgi->param('popnum');
+} elsif ( $cgi->keywords ) { #editing
+  my( $query ) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $custnum=$1;
+  $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
+  $pkgpart = 0;
+  $username = '';
+  $password = '';
+  $popnum = 0;
+} else {
+  $custnum='';
+  $cust_main = new FS::cust_main ( {} );
+  $cust_main->setfield('otaker',&getotaker);
+  $pkgpart = 0;
+  $username = '';
+  $password = '';
+  $popnum = 0;
+}
+$action = $custnum ? 'Edit' : 'Add';
+
+# top
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("Customer $action", '');
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST NAME="form1">!,
+      qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!,
+      qq!Customer # !, ( $custnum ? $custnum : " (NEW)" ),
+      
+;
+
+# agent
+
+$r = qq!<font color="#ff0000">*</font>!;
+
+@agents = qsearch( 'agent', {} );
+#die "No agents created!" unless @agents;
+die "You have not created any agents.  You must create at least one agent before adding a customer.  Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents;
+$agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
+if ( scalar(@agents) == 1 ) {
+  print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!;
+} else {
+  print qq!<BR><BR>${r}Agent <SELECT NAME="agentnum" SIZE="1">!;
+  my $agent;
+  foreach $agent (sort {
+    $a->agent cmp $b->agent;
+  } @agents) {
+      print '<OPTION VALUE="', $agent->agentnum, '"',
+      " SELECTED"x($agent->agentnum==$agentnum),
+      ">", $agent->agentnum,": ", $agent->agent;
+  }
+  print "</SELECT>";
+}
+
+#referral
+
+$refnum = $cust_main->refnum || $conf->config('referraldefault') || 0;
+if ( $custnum && ! $conf->exists('editreferrals') ) {
+  print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
+} else {
+  my(@referrals) = qsearch('part_referral',{});
+  if ( scalar(@referrals) == 1 ) {
+    $refnum ||= $referrals[0]->refnum;
+    print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
+  } else {
+    print qq!<BR><BR>${r}Referral <SELECT NAME="refnum" SIZE="1">!;
+    print "<OPTION> " unless $refnum;
+    my($referral);
+    foreach $referral (sort {
+      $a->refnum <=> $b->refnum;
+    } @referrals) {
+      print "<OPTION" . " SELECTED"x($referral->refnum==$refnum),
+      ">", $referral->refnum, ": ", $referral->referral;
+    }
+    print "</SELECT>";
+  }
+}
+
+
+# contact info
+
+($last,$first,$ss,$company,$address1,$address2,$city,$zip)=(
+  $cust_main->last,
+  $cust_main->first,
+  $cust_main->ss,
+  $cust_main->company,
+  $cust_main->address1,
+  $cust_main->address2,
+  $cust_main->city,
+  $cust_main->zip,
+);
+
+print "<BR><BR>Billing address", &itable("#cccccc"), <<END;
+<TR><TH ALIGN="right">${r}Contact name<BR>(last, first)</TH><TD COLSPAN=3>
+END
+
+print <<END;
+<INPUT TYPE="text" NAME="last" VALUE="$last"> , 
+<INPUT TYPE="text" NAME="first" VALUE="$first">
+END
+
+print <<END;
+</TD><TD ALIGN="right">SS#</TD><TD><INPUT TYPE="text" NAME="ss" VALUE="$ss" SIZE=11></TD></TR>
+<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="company" VALUE="$company" SIZE=70></TD></TR>
+<TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=70></TD></TR>
+<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=70></TD></TR>
+<TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="state" SIZE="1">
+END
+
+$cust_main->country( $conf->config('countrydefault') || 'US' )
+  unless $cust_main->country;
+$cust_main->state( $conf->config('statedefault') || 'CA' )
+  unless $cust_main->state || $cust_main->country ne 'US';
+foreach ( qsearch('cust_main_county',{}) ) {
+  print "<OPTION";
+  print " SELECTED" if ( $cust_main->state eq $_->state
+                         && $cust_main->county eq $_->county 
+                         && $cust_main->country eq $_->country
+                       );
+  print ">",$_->state;
+  print " (",$_->county,")" if $_->county;
+  print " / ", $_->country;
+}
+print qq!</SELECT></TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10></TD></TR>!;
+
+($daytime,$night,$fax)=(
+  $cust_main->daytime,
+  $cust_main->night,
+  $cust_main->fax,
+);
+
+print <<END;
+<TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18></TD></TR>
+<TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18></TD></TR>
+<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12></TD></TR>
+END
+
+print "</TABLE>$r required fields<BR>";
+
+# service address
+
+if ( defined $cust_main->dbdef_table->column('ship_last') ) {
+
+  print "\n", <<END;
+  <SCRIPT>
+  function changed(what) {
+    what.form.same.checked = false;
+  }
+  function samechanged(what) {
+    if ( what.checked ) {
+END
+print "      what.form.ship_$_.value = what.form.$_.value;\n"
+  for (qw( last first company address1 address2 city zip daytime night fax ));
+print <<END;
+      what.form.ship_state.selectedIndex = what.form.state.selectedIndex;
+    }
+  }
+  </SCRIPT>
+END
+
+  print '<BR>Service address ',
+        '(<INPUT TYPE="checkbox" NAME="same" onClick="samechanged(this)"';
+  unless ( $cust_main->ship_last ) {
+    print ' CHECKED';
+    foreach (
+      qw( last first company address1 address2 city state zip daytime night fax)
+    ) {
+      $cust_main->set("ship_$_", $cust_main->get($_) );
+    }
+  }
+  print '>same as billing address)<BR>';
+
+  my($ship_last,$ship_first,$ship_company,$ship_address1,$ship_address2,$ship_city,$ship_zip)=(
+    $cust_main->ship_last,
+    $cust_main->ship_first,
+    $cust_main->ship_company,
+    $cust_main->ship_address1,
+    $cust_main->ship_address2,
+    $cust_main->ship_city,
+    $cust_main->ship_zip,
+  );
+
+  print &itable("#cccccc"), <<END;
+  <TR><TH ALIGN="right">${r}Contact name<BR>(last, first)</TH><TD COLSPAN=5>
+END
+
+  print <<END;
+  <INPUT TYPE="text" NAME="ship_last" VALUE="$ship_last" onChange="changed(this)"> , 
+  <INPUT TYPE="text" NAME="ship_first" VALUE="$ship_first" onChange="changed(this)">
+END
+
+  print <<END;
+  </TD></TR>
+  <TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_company" VALUE="$ship_company" SIZE=70 onChange="changed(this)"></TD></TR>
+  <TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_address1" VALUE="$ship_address1" SIZE=70 onChange="changed(this)"></TD></TR>
+  <TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_address2" VALUE="$ship_address2" SIZE=70 onChange="changed(this)"></TD></TR>
+  <TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="ship_city" VALUE="$ship_city" onChange="changed(this)"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="ship_state" SIZE="1" onChange="changed(this)">
+END
+
+  $cust_main->ship_country( $conf->config('countrydefault') || 'US' )
+    unless $cust_main->ship_country;
+  $cust_main->ship_state( $conf->config('statedefault') || 'CA' )
+    unless $cust_main->ship_state || $cust_main->ship_country ne 'US';
+  foreach ( qsearch('cust_main_county',{}) ) {
+    print "<OPTION";
+    print " SELECTED" if ( $cust_main->ship_state eq $_->state
+                           && $cust_main->ship_county eq $_->county 
+                           && $cust_main->ship_country eq $_->country
+                         );
+    print ">",$_->state;
+    print " (",$_->county,")" if $_->county;
+    print " / ", $_->country;
+  }
+  print qq!</SELECT></TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="ship_zip" VALUE="$ship_zip" SIZE=10 onChange="changed(this)"></TD></TR>!;
+
+  my($ship_daytime,$ship_night,$ship_fax)=(
+    $cust_main->ship_daytime,
+    $cust_main->ship_night,
+    $cust_main->ship_fax,
+  );
+
+  print <<END;
+  <TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_daytime" VALUE="$ship_daytime" SIZE=18 onChange="changed(this)"></TD></TR>
+  <TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_night" VALUE="$ship_night" SIZE=18 onChange="changed(this)"></TD></TR>
+  <TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_fax" VALUE="$ship_fax" SIZE=12 onChange="changed(this)"></TD></TR>
+END
+
+  print "</TABLE>$r required fields<BR>";
+
+}
+
+# billing info
+
+sub expselect {
+  my $prefix = shift;
+  my( $m, $y ) = (0, 0);
+  if ( scalar(@_) ) {
+    my $date = shift || '01-2000';
+    if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
+      ( $m, $y ) = ( $2, $1 );
+    } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+      ( $m, $y ) = ( $1, $3 );
+    } else {
+      die "unrecognized expiration date format: $date";
+    }
+  }
+
+  my $return = qq!<SELECT NAME="$prefix!. qq!_month" SIZE="1">!;
+  for ( 1 .. 12 ) {
+    $return .= "<OPTION";
+    $return .= " SELECTED" if $_ == $m;
+    $return .= ">$_";
+  }
+  $return .= qq!</SELECT>/<SELECT NAME="$prefix!. qq!_year" SIZE="1">!;
+  for ( 2001 .. 2037 ) {
+    $return .= "<OPTION";
+    $return .= " SELECTED" if $_ == $y;
+    $return .= ">$_";
+  }
+  $return .= "</SELECT>";
+
+  $return;
+}
+
+print "<BR>Billing information", &itable("#cccccc"),
+      qq!<TR><TD><INPUT TYPE="checkbox" NAME="tax" VALUE="Y"!;
+print qq! CHECKED! if $cust_main->tax eq "Y";
+print qq!>Tax Exempt</TD></TR>!;
+print qq!<TR><TD><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
+@invoicing_list = $cust_main->invoicing_list;
+print qq! CHECKED!
+  if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
+print qq!>Postal mail invoice</TD></TR>!;
+$invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
+print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
+
+print "<TR><TD>Billing type</TD></TR>",
+      "</TABLE>",
+      &table("#cccccc"), "<TR>";
+
+($payinfo, $payname)=(
+  $cust_main->payinfo,
+  $cust_main->payname,
+);
+
+%payby = (
+  'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>${r}Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
+  'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
+);
+%paybychecked = (
+  'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>${r}Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+  'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
+);
+for (qw(CARD BILL COMP)) {
+  print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
+  if ($cust_main->payby eq "$_") {
+    print qq! CHECKED> $paybychecked{$_}</TD>!;
+  } else {
+    print qq!> $payby{$_}</TD>!;
+  }
+}
+
+print "</TR></TABLE>$r required fields for each billing type";
+
+unless ( $custnum ) {
+  # pry the wrong place for this logic.  also pretty expensive
+  #use FS::part_pkg;
+
+  #false laziness, copied from FS::cust_pkg::order
+  my $pkgpart;
+  if ( scalar(@agents) == 1 ) {
+    # $pkgpart->{PKGPART} is true iff $custnum may purchase $pkgpart
+    my($agent)=qsearchs('agent',{'agentnum'=> $agentnum });
+    $pkgpart = $agent->pkgpart_hashref;
+  } else {
+    #can't know (agent not chosen), so, allow all
+    my %typenum;
+    foreach my $agent ( @agents ) {
+      next if $typenum{$agent->typenum}++;
+      #fixed in 5.004_05 #$pkgpart->{$_}++ foreach keys %{ $agent->pkgpart_hashref }
+      foreach ( keys %{ $agent->pkgpart_hashref } ) { $pkgpart->{$_}++; } #5.004_04 workaround
+    }
+  }
+  #eslaf
+
+  my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } }
+    qsearch( 'part_pkg', {} );
+
+  if ( @part_pkg ) {
+
+    print "<BR><BR>First package", &itable("#cccccc"),
+          qq!<TR><TD COLSPAN=2><SELECT NAME="pkgpart_svcpart">!;
+
+    print qq!<OPTION VALUE="">(none)!;
+
+    foreach my $part_pkg ( @part_pkg ) {
+      print qq!<OPTION VALUE="!,
+#              $part_pkg->pkgpart. "_". $pkgpart{ $part_pkg->pkgpart }, '"';
+              $part_pkg->pkgpart. "_". $part_pkg->svcpart, '"';
+      print " SELECTED" if $pkgpart && ( $part_pkg->pkgpart == $pkgpart );
+      print ">", $part_pkg->pkg, " - ", $part_pkg->comment;
+    }
+    print "</SELECT></TD></TR>";
+
+    #false laziness: (mostly) copied from edit/svc_acct.cgi
+    #$ulen = $svc_acct->dbdef_table->column('username')->length;
+    $ulen = dbdef->table('svc_acct')->column('username')->length;
+    $ulen2 = $ulen+2;
+    print <<END;
+<TR><TD ALIGN="right">Username</TD>
+<TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
+<TR><TD ALIGN="right">Password</TD>
+<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8>
+(blank to generate)</TD></TR>
+END
+    print qq!<TR><TD ALIGN="right">POP</TD><TD><SELECT NAME="popnum" SIZE=1><OPTION> !;
+    my($svc_acct_pop);
+    foreach $svc_acct_pop ( qsearch ('svc_acct_pop',{} ) ) {
+    print qq!<OPTION VALUE="!, $svc_acct_pop->popnum, '"',
+          ( $popnum && $svc_acct_pop->popnum == $popnum ) ? ' SELECTED' : '', ">", 
+          $svc_acct_pop->popnum, ": ", 
+          $svc_acct_pop->city, ", ",
+          $svc_acct_pop->state,
+          " (", $svc_acct_pop->ac, ")/",
+          $svc_acct_pop->exch, "\n"
+        ;
+    }
+    print "</SELECT></TD></TR></TABLE>";
+  }
+}
+
+$otaker = $cust_main->otaker;
+print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!,
+      qq!<BR><BR><INPUT TYPE="submit" VALUE="!,
+      $custnum ?  "Apply Changes" : "Add Customer", qq!">!,
+      "</FORM></BODY></HTML>",
+;
+
+%>
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
new file mode 100755
index 000000000..a7b0998df
--- /dev/null
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -0,0 +1,92 @@
+<%
+#
+# $Id: cust_main_county-expand.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 97-dec-16
+#
+# Changes to allow page to work at a relative position in server
+#	bmccane@maxbaud.net	98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: cust_main_county-expand.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.6  1999/01/25 12:09:54  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:35  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:25  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 06:17:01  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/11/18 09:01:38  ivan
+# i18n! i18n!
+#
+
+use strict;
+use vars qw( $cgi $taxnum $cust_main_county $p1 $delim $expansion );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header menubar popurl);
+use FS::cust_main_county;
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  $taxnum = $cgi->param('taxnum');
+  $delim = $cgi->param('delim');
+  $expansion = $cgi->param('expansion');
+} else {
+  my ($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/
+    or die "Illegal taxnum!";
+  $taxnum = $1;
+  $delim = 'n';
+  $expansion = '';
+}
+
+$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum});
+die "Can't expand entry!" if $cust_main_county->getfield('county');
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("Tax Rate (expand)", menubar(
+  'Main Menu' => popurl(2),
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print <<END;
+    <FORM ACTION="${p1}process/cust_main_county-expand.cgi" METHOD=POST>
+      <INPUT TYPE="hidden" NAME="taxnum" VALUE="$taxnum">
+      Separate by
+END
+print '<INPUT TYPE="radio" NAME="delim" VALUE="n"';
+print ' CHECKED' if $delim eq 'n';
+print '>line (rumor has it broken on some browsers) or',
+      '<INPUT TYPE="radio" NAME="delim" VALUE="s"';
+print ' CHECKED' if $delim eq 's';
+print '>whitespace.';
+print <<END;
+      <BR><INPUT TYPE="submit" VALUE="Submit">
+      <BR><TEXTAREA NAME="expansion" ROWS=100>$expansion</TEXTAREA>
+    </FORM>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
new file mode 100755
index 000000000..38e6d6877
--- /dev/null
+++ b/httemplate/edit/cust_main_county.cgi
@@ -0,0 +1,104 @@
+<%
+#
+# $Id: cust_main_county.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 97-dec-13-16
+#
+# Changes to allow page to work at a relative position in server
+# Changed tax field to accept 6 chars (MO uses 6.1%)
+#	bmccane@maxbaud.net	98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+# 
+# $Log: cust_main_county.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.8  1999/04/09 04:22:34  ivan
+# also table()
+#
+# Revision 1.7  1999/04/09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.6  1999/01/25 12:09:55  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:36  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:26  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 06:17:02  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/11/18 09:01:39  ivan
+# i18n! i18n!
+#
+
+use strict;
+use vars qw( $cgi $cust_main_county );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header menubar popurl table);
+use FS::cust_main_county;
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+print $cgi->header( '-expires' => 'now' ), header("Edit tax rates", menubar(
+  'Main Menu' => popurl(2),
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="!, popurl(1),
+    qq!process/cust_main_county.cgi" METHOD=POST>!, &table(), <<END;
+      <TR>
+        <TH><FONT SIZE=-1>Country</FONT></TH>
+        <TH><FONT SIZE=-1>State</FONT></TH>
+        <TH>County</TH>
+        <TH><FONT SIZE=-1>Tax</FONT></TH>
+      </TR>
+END
+
+foreach $cust_main_county ( qsearch('cust_main_county',{}) ) {
+  my($hashref)=$cust_main_county->hashref;
+  print <<END;
+      <TR>
+        <TD>$hashref->{country}</TD>
+END
+
+  print "<TD>", $hashref->{state}
+      ? $hashref->{state}
+      : '(ALL)'
+    , "</TD>";
+
+  print "<TD>", $hashref->{county}
+      ? $hashref->{county}
+      : '(ALL)'
+    , "</TD>";
+
+  print qq!<TD><INPUT TYPE="text" NAME="tax!, $hashref->{taxnum},
+        qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6>%</TD></TR>!;
+END
+
+}
+
+print <<END;
+    </TABLE>
+    <INPUT TYPE="submit" VALUE="Apply changes">
+    </FORM>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
new file mode 100755
index 000000000..33320648c
--- /dev/null
+++ b/httemplate/edit/cust_pay.cgi
@@ -0,0 +1,101 @@
+<%
+#
+# $Id: cust_pay.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: cust_pay.cgi invnum
+#        http://server.name/path/cust_pay.cgi?invnum
+#
+# some hooks for modifications as well as additions, but needs work.
+#
+# ivan@voicenet.com 96-dec-11
+#
+# rewrite ivan@sisd.com 98-mar-16
+#
+# $Log: cust_pay.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.6  1999/02/28 00:03:35  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/01/25 12:09:56  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.4  1999/01/19 05:13:37  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 09:41:27  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.2  1998/12/17 06:17:03  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+
+use strict;
+use vars qw( $cgi $invnum $p1 $_date $payby $payinfo $paid );
+use Date::Format;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl);
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  $invnum = $cgi->param('invnum');
+  $paid = $cgi->param('paid');
+  $payby = $cgi->param('payby');
+  $payinfo = $cgi->param('payinfo');
+} else {
+  my ($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $invnum = $1;
+  $paid = '';
+  $payby = "BILL";
+  $payinfo = "";
+}
+$_date = time;
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("Enter payment", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print <<END;
+    <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
+    <HR><PRE>
+END
+
+print qq!Invoice #<B>$invnum</B><INPUT TYPE="hidden" NAME="invnum" VALUE="$invnum">!;
+
+print qq!<BR>Date: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
+
+print qq!<BR>Amount \$<INPUT TYPE="text" NAME="paid" VALUE="$paid" SIZE=8 MAXLENGTH=8>!;
+
+print qq!<BR>Payby: <B>$payby</B><INPUT TYPE="hidden" NAME="payby" VALUE="$payby">!;
+
+#payinfo (check # now as payby="BILL" hardcoded.. what to do later?)
+print qq!<BR>Check #<INPUT TYPE="text" NAME="payinfo" VALUE="$payinfo">!;
+
+#paybatch
+print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
+
+print <<END;
+</PRE>
+<BR>
+<INPUT TYPE="submit" VALUE="Post payment">
+END
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
new file mode 100755
index 000000000..637023703
--- /dev/null
+++ b/httemplate/edit/cust_pkg.cgi
@@ -0,0 +1,171 @@
+<%
+#
+# $Id: cust_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# this is for changing packages around, not editing things within the package
+#
+# Usage: cust_pkg.cgi custnum
+#        http://server.name/path/cust_pkg.cgi?custnum
+#
+# started with /sales/add/cust_pkg.cgi, which added packages
+# ivan@voicenet.com 97-jan-5, 97-mar-21
+#
+# Rewrote for new API
+# ivan@voicenet.com 97-jul-7
+#
+# FS::Search is no more, &cgisuidsetup needs $cgi, ivan@sisd.com 98-mar-7 
+#
+# Changes to allow page to work at a relative position in server
+# Changed to display packages 2-wide in a table
+#       bmccane@maxbaud.net     98-apr-3
+#
+# fixed a pretty cool bug from above which caused a visual glitch ivan@sisd.com
+# 98-jun-1
+#
+# $Log: cust_pkg.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.8  1999/07/21 07:34:13  ivan
+# links to package browse and agent type edit if there aren't any packages to
+# order.  thanks to "Tech Account" <techy@orac.hq.org>
+#
+# Revision 1.7  1999/04/14 01:03:01  ivan
+# oops, in 1.2 tree, can't do searches until [cgi|admin]suidsetup,
+# bug is hidden by mod_perl persistance
+#
+# Revision 1.6  1999/02/28 00:03:36  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/02/07 09:59:18  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:13:38  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 09:41:28  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.2  1998/12/17 06:17:04  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+
+use strict;
+use vars qw( $cgi %pkg %comment $custnum $p1 @cust_pkg 
+             $cust_main $agent $type_pkgs $count %remove_pkg $pkgparts );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header popurl);
+use FS::part_pkg;
+use FS::type_pkgs;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+%pkg = ();
+%comment = ();
+foreach (qsearch('part_pkg', {})) {
+  $pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
+  $comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
+}
+
+if ( $cgi->param('error') ) {
+  $custnum = $cgi->param('custnum');
+  %remove_pkg = map { $_ => 1 } $cgi->param('remove_pkg');
+} else {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $custnum = $1;
+  undef %remove_pkg;
+}
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("Add/Edit Packages", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/cust_pkg.cgi" METHOD=POST>!;
+
+print qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
+
+#current packages
+@cust_pkg = qsearch('cust_pkg',{ 'custnum' => $custnum, 'cancel' => '' } );
+
+if (@cust_pkg) {
+  print <<END;
+Current packages - select to remove (services are moved to a new package below)
+<BR><BR>
+END
+
+  my ($count) = 0 ;
+  print qq!<TABLE>! ;
+  foreach (@cust_pkg) {
+    print '<TR>' if $count == 0;
+    my($pkgnum,$pkgpart)=( $_->getfield('pkgnum'), $_->getfield('pkgpart') );
+    print qq!<TD><INPUT TYPE="checkbox" NAME="remove_pkg" VALUE="$pkgnum"!;
+    print " CHECKED" if $remove_pkg{$pkgnum};
+    print qq!>$pkgnum: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n!;
+    $count ++ ;
+    if ($count == 2)
+    {
+      $count = 0 ;
+      print qq!</TR>\n! ;
+    }
+  }
+  print qq!</TABLE><BR><BR>!;
+}
+
+print <<END;
+Order new packages<BR><BR>
+END
+
+$cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
+$agent = qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
+
+$count = 0;
+$pkgparts = 0;
+print qq!<TABLE>!;
+foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
+  $pkgparts++;
+  my($pkgpart)=$type_pkgs->pkgpart;
+  print qq!<TR>! if ( $count == 0 );
+  my $value = $cgi->param("pkg$pkgpart") || 0;
+  print <<END;
+  <TD>
+  <INPUT TYPE="text" NAME="pkg$pkgpart" VALUE="$value" SIZE="2" MAXLENGTH="2">
+  $pkgpart: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n
+END
+  $count ++ ;
+  if ( $count == 2 ) {
+    print qq!</TR>\n! ;
+    $count = 0;
+  }
+}
+print qq!</TABLE>!;
+
+unless ( $pkgparts ) {
+  my $p2 = popurl(2);
+  my $typenum = $agent->typenum;
+  my $agent_type = qsearchs( 'agent_type', { 'typenum' => $typenum } );
+  my $atype = $agent_type->atype;
+  print <<END;
+(No <a href="${p2}browse/part_pkg.cgi">package definitions</a>, or agent type
+<a href="${p2}edit/agent_type.cgi?$typenum">$atype</a> not allowed to purchase
+any packages.)
+END
+}
+
+#submit
+print <<END;
+<P><INPUT TYPE="submit" VALUE="Order">
+    </FORM>
+  </BODY>
+</HTML>
+END
+%>
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
new file mode 100755
index 000000000..002d54139
--- /dev/null
+++ b/httemplate/edit/part_pkg.cgi
@@ -0,0 +1,180 @@
+<%
+#
+# $Id: part_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# part_pkg.cgi: Add/Edit package (output form)
+#
+# ivan@sisd.com 97-dec-10
+#
+# Changes to allow page to work at a relative position in server
+# Changed to display services 2-wide in table
+#       bmccane@maxbaud.net     98-apr-3
+#
+# use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
+#
+# $Log: part_pkg.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.9  1999/02/07 09:59:19  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.8  1999/01/19 05:13:39  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.7  1999/01/18 09:41:29  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.6  1998/12/17 06:17:05  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.5  1998/11/21 07:12:26  ivan
+# *** empty log message ***
+#
+# Revision 1.4  1998/11/21 07:11:08  ivan
+# *** empty log message ***
+#
+# Revision 1.3  1998/11/21 07:07:40  ivan
+# popurl, bugfix
+#
+# Revision 1.2  1998/11/15 13:14:55  ivan
+# first pass as per-user custom pricing
+#
+
+use strict;
+use vars qw( $cgi $part_pkg $action $query $hashref $part_svc $count );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::part_pkg;
+use FS::part_svc;
+use FS::pkg_svc;
+use FS::CGI qw(header menubar popurl);
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
+  $cgi->param('clone', $1);
+} else {
+  $cgi->param('clone', '');
+}
+if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
+  $cgi->param('pkgnum', $1);
+} else {
+  $cgi->param('pkgnum', '');
+}
+
+($query) = $cgi->keywords;
+$action = '';
+$part_pkg = '';
+if ( $cgi->param('error') ) {
+  $part_pkg = new FS::part_pkg ( {
+    map { $_, scalar($cgi->param($_)) } fields('part_pkg')
+  } );
+}
+if ( $cgi->param('clone') ) {
+  $action='Custom Pricing';
+  my $old_part_pkg =
+    qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
+  $part_pkg ||= $old_part_pkg->clone;
+} elsif ( $query && $query =~ /^(\d+)$/ ) {
+  $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
+} else {
+  $part_pkg ||= new FS::part_pkg {};
+}
+$action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
+$hashref = $part_pkg->hashref;
+
+print $cgi->header( '-expires' => 'now' ), header("$action Package Definition", menubar(
+  'Main Menu' => popurl(2),
+  'View all packages' => popurl(2). 'browse/part_pkg.cgi',
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>';
+
+if ( $cgi->param('clone') ) {
+  print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
+}
+if ( $cgi->param('pkgnum') ) {
+  print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $cgi->param('pkgnum'), qq!">!;
+}
+
+print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
+      "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
+
+print <<END;
+<PRE>
+Package (customer-visable)          <INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}">
+Comment (customer-hidden)           <INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}">
+Setup fee for this package          <INPUT TYPE="text" NAME="setup" VALUE="$hashref->{setup}">
+Recurring fee for this package      <INPUT TYPE="text" NAME="recur" VALUE="$hashref->{recur}">
+Frequency (months) of recurring fee <INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}">
+
+</PRE>
+
+END
+
+unless ( $cgi->param('clone') ) {
+  print <<END;
+Enter the quantity of each service this package includes.<BR><BR>
+<TABLE BORDER><TR><TH><FONT SIZE=-1>Quan.</FONT></TH><TH>Service</TH>
+		  <TH><FONT SIZE=-1>Quan.</FONT></TH><TH>Service</TH></TR>
+END
+}
+
+$count = 0;
+foreach $part_svc ( ( qsearch( 'part_svc', {} ) ) ) {
+  my $svcpart = $part_svc->svcpart;
+  my $pkg_svc = qsearchs( 'pkg_svc', {
+    'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
+    'svcpart'  => $svcpart,
+  } ) || new FS::pkg_svc ( {
+    'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
+    'svcpart'  => $svcpart,
+    'quantity' => 0,
+  });
+  #? #next unless $pkg_svc;
+
+  unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) {
+    print '<TR>' if $count == 0 ;
+    print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=3 VALUE="!,
+          $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0,
+          qq!"></TD><TD><A HREF="part_svc.cgi?!,$part_svc->svcpart,
+          qq!">!, $part_svc->getfield('svc'), "</A></TD>";
+    $count++;
+    if ($count == 2)
+    {
+      print '</TR>';
+      $count = 0;
+    }
+  } else {
+    print qq!<INPUT TYPE="hidden" NAME="pkg_svc$svcpart" VALUE="!,
+          $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0, qq!">\n!;
+  }
+}
+
+unless ( $cgi->param('clone') ) {
+  print qq!</TR>! if ($count != 0) ;
+  print "</TABLE>";
+}
+
+print qq!<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{pkgpart} ? "Apply changes" : "Add package",
+      qq!">!;
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
new file mode 100755
index 000000000..e7d76f7e4
--- /dev/null
+++ b/httemplate/edit/part_referral.cgi
@@ -0,0 +1,94 @@
+<%
+#
+# $Id: part_referral.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 98-feb-23
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# confisuing typo on submit button ivan@sisd.com 98-jun-14
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: part_referral.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.6  1999/04/07 11:43:23  ivan
+# pick up errors right away, leave input
+#
+# Revision 1.5  1999/02/07 09:59:20  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:13:41  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 09:41:30  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.2  1998/12/17 06:17:06  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+
+use strict;
+use vars qw( $cgi $part_referral $action $hashref $p1 $query );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::part_referral;
+use FS::CGI qw(header menubar popurl);
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  $part_referral = new FS::part_referral ( {
+    map { $_, scalar($cgi->param($_)) } fields('part_referral')
+  } );
+} elsif ( $cgi->keywords ) {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $part_referral = qsearchs( 'part_referral', { 'refnum' => $1 } );
+} else { #adding
+  $part_referral = new FS::part_referral {};
+}
+$action = $part_referral->refnum ? 'Edit' : 'Add';
+$hashref = $part_referral->hashref;
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("$action Referral", menubar(
+  'Main Menu' => popurl(2),
+  'View all referrals' => popurl(2). "browse/part_referral.cgi",
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/part_referral.cgi" METHOD=POST>!;
+
+print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$hashref->{refnum}">!,
+      "Referral #", $hashref->{refnum} ? $hashref->{refnum} : "(NEW)";
+
+print <<END;
+<PRE>
+Referral   <INPUT TYPE="text" NAME="referral" SIZE=32 VALUE="$hashref->{referral}">
+</PRE>
+END
+
+print qq!<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{refnum} ? "Apply changes" : "Add referral",
+      qq!">!;
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
new file mode 100755
index 000000000..cc0ee6fd0
--- /dev/null
+++ b/httemplate/edit/part_svc.cgi
@@ -0,0 +1,218 @@
+<!-- $Id: part_svc.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $ -->
+<% 
+   my $part_svc;
+   if ( $cgi->param('error') ) { #error
+     $part_svc = new FS::part_svc ( {
+       map { $_, scalar($cgi->param($_)) } fields('part_svc')
+     } );
+   } elsif ( $cgi->keywords ) { #edit
+     my $query = $cgi->keywords;
+     $query =~ /^(\d+)$/;
+     $part_svc=qsearchs('part_svc',{'svcpart'=>$1});
+   } else { #adding
+     $part_svc = new FS::part_svc {};
+   }
+   my $action = $part_svc->svcpart ? 'Edit' : 'Add';
+   my $hashref = $part_svc->hashref;
+   my $p_svcdb = $part_svc->svcdb || 'svc_acct';
+
+%>
+
+<SCRIPT>
+function visualize(what) {
+  if (document.getElementById) {
+    document.getElementById('d<%= $p_svcdb %>').style.visibility = "visible";
+  } else {
+    document.l<%= $p_svcdb %>.visibility = "visible";
+  }
+}
+</SCRIPT>
+
+<%= header("$action Service Definition",
+           menubar( 'Main Menu'         => $p,
+                    'View all services' => "${p}browse/part_svc.cgi"
+                  ),
+           " onLoad=\"visualize()\""
+           )
+%>
+
+<% if ( $cgi->param('error') ) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+<% } %>
+
+<FORM NAME="dummy">
+
+      Service Part #<%= $part_svc->svcpart ? $part_svc->svcpart : "(NEW)" %>
+
+<PRE>
+Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>">
+</PRE>
+Services are items you offer to your customers.
+<UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
+    <LI>svc_domain - Virtual domains
+    <LI>svc_acct_sm - Virtual domain mail aliasing
+    <LI>svc_www - Virtual domain website
+<!--   <LI>svc_charge - One-time charges (Partially unimplemented)
+       <LI>svc_wo - Work orders (Partially unimplemented)
+-->
+</UL>
+For the selected table, you can give fields default or fixed (unchangable)
+values.  For example, a SLIP/PPP account may have a default (or perhaps fixed)
+<B>slipip</B> of <B>0.0.0.0</B>, while a POP mailbox will probably have a fixed
+blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
+<B>/usr/bin/passwd</B>.
+<BR><BR>
+<SCRIPT>
+var svcdb = null;
+var something = null;
+function changed(what) {
+  svcdb = what.options[what.selectedIndex].value;
+<% foreach my $svcdb ( qw( svc_acct svc_domain svc_acct_sm svc_www ) ) { %>
+  if (svcdb == "<%= $svcdb %>" ) {
+    <% foreach my $not ( grep { $_ ne $svcdb } (
+                           qw(svc_acct svc_domain svc_acct_sm svc_www) ) ) { %>
+      if (document.getElementById) {
+        document.getElementById('d<%= $not %>').style.visibility = "hidden";
+      } else {
+        document.l<%= $not %>.visibility = "hidden";
+      }
+    <% } %>
+    if (document.getElementById) {
+      document.getElementById('d<%= $svcdb %>').style.visibility = "visible";
+    } else {
+      document.l<%= $svcdb %>.visibility = "visible";
+    }
+  }
+<% } %>
+}
+</SCRIPT>
+Table<SELECT NAME="svcdb" SIZE=1 onChange="changed(this)">
+<% foreach my $svcdb (qw( svc_acct svc_domain svc_acct_sm svc_www )) { %>
+<OPTION VALUE="<%= $svcdb %>" <%= ' SELECTED'x($svcdb eq $hashref->{svcdb}) %>><%= $svcdb %>
+<% } %>
+</SELECT>
+
+<%
+#these might belong somewhere else for other user interfaces 
+#pry need to eventually create stuff that's shared amount UIs
+my %defs = (
+  'svc_acct' => {
+    'dir'       => 'Home directory',
+    'uid'       => 'UID (set to fixed and blank for dial-only)',
+    'slipip'    => 'IP address (set to fixed and blank to disable dialin)',
+    'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
+    'username'  => 'Username',
+    'quota'     => '(unimplemented)',
+    '_password' => 'Password',
+    'gid'       => 'GID (when blank, defaults to UID)',
+    'shell'     => 'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file)',
+    'finger'    => 'GECOS',
+  },
+  'svc_domain' => {
+    'domain'    => 'Domain',
+  },
+  'svc_acct_sm' => {
+    'domuser'   => 'domuser@virtualdomain.com',
+    'domuid'    => 'UID where domuser@virtualdomain.com mail is forwarded',
+    'domsvc'    => 'svcnum from svc_domain for virtualdomain.com',
+  },
+  'svc_charge' => {
+    'amount'    => 'amount',
+  },
+  'svc_wo' => {
+    'worker'    => 'Worker',
+    '_date'      => 'Date',
+  },
+  'svc_www' => {
+    #'recnum' => '',
+    #'usersvc' => '',
+  },
+);
+
+#  svc_acct svc_domain svc_acct_sm svc_charge svc_wo
+foreach my $svcdb ( qw(
+  konq_kludge svc_acct svc_domain svc_acct_sm svc_www
+) ) {
+
+  my(@rows)=map { /^${svcdb}__(.*)$/; $1 }
+    grep ! /_flag$/,
+      grep /^${svcdb}__/,
+        fields('part_svc');
+  #my($rowspan)=scalar(@rows);
+
+  #my($ptmp)="<TD ROWSPAN=$rowspan>$svcdb</TD>";
+#  $visibility = $svcdb eq $part_svc->svcdb ? "SHOW" : "HIDDEN";
+#  $visibility = $svcdb eq $p_svcdb ? "visible" : "hidden";
+  my $visibility = "hidden";
+%>
+<SCRIPT>
+if (document.getElementById) {
+    document.write("<DIV ID=\"d<%= $svcdb %>\" STYLE=\"visibility: <%= $visibility %>; position: absolute\">");
+} else {
+<% $visibility="show" if $visibility eq "visible"; %>
+    document.write("<LAYER ID=\"l<%= $svcdb %>\" VISIBILITY=\"<%= $visibility %>\">");
+}
+
+function fixup(what) {
+  what.svc.value = document.dummy.svc.value;
+  what.svcdb.value = document.dummy.svcdb.options[document.dummy.svcdb.selectedIndex].value
+}
+</SCRIPT>
+<FORM NAME="<%= $svcdb %>" ACTION="process/part_svc.cgi" METHOD=POST onSubmit="fixup(this)">
+<INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $hashref->{svcpart} %>">
+<INPUT TYPE="hidden" NAME="svc" VALUE="<%= $hashref->{svc} %>">
+<INPUT TYPE="hidden" NAME="svcdb" VALUE="<%= $svcdb %>">
+<%
+  print "$svcdb" unless $svcdb eq 'konq_kludge';
+  print "<BR><TABLE BORDER=1><TH>Field</TH><TH COLSPAN=2>Modifier</TH>" unless $svcdb eq 'konq_kludge';
+
+  my($row);
+  foreach $row (@rows) {
+    my $value = $part_svc->getfield($svcdb. '__'. $row);
+    my $flag = $part_svc->getfield($svcdb. '__'. $row. '_flag');
+    #print "<TR>$ptmp<TD>$row";
+    print "<TR><TD>$row";
+    print "- <FONT SIZE=-1>$defs{$svcdb}{$row}</FONT>"
+      if defined $defs{$svcdb}{$row};
+    print "</TD>";
+    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE=""!.
+      ' CHECKED'x($flag eq ''). ">Off</TD>";
+    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE="D"!.
+      ' CHECKED'x($flag eq 'D'). ">Default ";
+    print qq!<INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE="F"!.
+      ' CHECKED'x($flag eq 'F'). ">Fixed ";
+    print qq!<INPUT TYPE="text" NAME="${svcdb}__${row}" VALUE="$value">!,
+      "</TD></TR>\n";
+    #$ptmp='';
+  }
+  print "</TABLE>" unless $svcdb eq 'konq_kludge';
+
+print qq!\n<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{svcpart} ? "Apply changes" : "Add service",
+      qq!">! unless $svcdb eq 'konq_kludge';
+
+  print "</FORM>";
+  print <<END;
+    <SCRIPT>
+    if (document.getElementById) {
+      document.write("</DIV>");
+    } else {
+      document.write("</LAYER>");
+    }
+    </SCRIPT>
+END
+}
+#print "</TABLE>";
+%>
+
+<TAG onLoad="
+    if (document.getElementById) {
+      document.getElementById('d<%= $p_svcdb %>').style.visibility = 'visible';
+    } else {
+      document.l<%= $p_svcdb %>.visibility = 'visible';
+    }
+">
+
+  </BODY>
+</HTML>
+
diff --git a/httemplate/edit/process/agent.cgi b/httemplate/edit/process/agent.cgi
new file mode 100755
index 000000000..2b4991363
--- /dev/null
+++ b/httemplate/edit/process/agent.cgi
@@ -0,0 +1,73 @@
+<%
+#
+# $Id: agent.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 97-dec-12
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: agent.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  1999/01/25 12:09:57  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.6  1999/01/19 05:13:47  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 22:47:49  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.4  1998/12/30 23:03:26  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.3  1998/12/17 08:40:16  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/23 07:52:29  ivan
+# *** empty log message ***
+#
+
+use strict;
+use vars qw ( $cgi $agentnum $old $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::agent;
+use FS::CGI qw(popurl);
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+$agentnum = $cgi->param('agentnum');
+
+$old = qsearchs('agent',{'agentnum'=>$agentnum}) if $agentnum;
+
+$new = new FS::agent ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('agent')
+} );
+
+if ( $agentnum ) {
+  $error=$new->replace($old);
+} else {
+  $error=$new->insert;
+  $agentnum=$new->getfield('agentnum');
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "agent.cgi?". $cgi->query_string );
+} else { 
+  print $cgi->redirect(popurl(3). "browse/agent.cgi");
+}
+
+%>
diff --git a/httemplate/edit/process/agent_type.cgi b/httemplate/edit/process/agent_type.cgi
new file mode 100755
index 000000000..5c6b2b8e0
--- /dev/null
+++ b/httemplate/edit/process/agent_type.cgi
@@ -0,0 +1,100 @@
+<%
+#
+# $Id: agent_type.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 97-dec-11
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: agent_type.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  1999/01/25 12:09:58  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.6  1999/01/19 05:13:48  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 22:47:50  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.4  1998/12/30 23:03:27  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.3  1998/12/17 08:40:17  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/21 07:49:20  ivan
+# s/CGI::Request/CGI.pm/
+#
+
+use strict;
+use vars qw ( $cgi $typenum $old $new $error $part_pkg );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::CGI qw( popurl);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::agent_type;
+use FS::type_pkgs;
+use FS::part_pkg;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$typenum = $cgi->param('typenum');
+$old = qsearchs('agent_type',{'typenum'=>$typenum}) if $typenum;
+
+$new = new FS::agent_type ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('agent_type')
+} );
+
+if ( $typenum ) {
+  $error=$new->replace($old);
+} else {
+  $error=$new->insert;
+  $typenum=$new->getfield('typenum');
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "agent_type.cgi?". $cgi->query_string );
+  exit;
+}
+
+foreach $part_pkg (qsearch('part_pkg',{})) {
+  my($pkgpart)=$part_pkg->getfield('pkgpart');
+
+  my($type_pkgs)=qsearchs('type_pkgs',{
+      'typenum' => $typenum,
+      'pkgpart' => $pkgpart,
+  });
+  if ( $type_pkgs && ! $cgi->param("pkgpart$pkgpart") ) {
+    my($d_type_pkgs)=$type_pkgs; #need to save $type_pkgs for below.
+    $error=$d_type_pkgs->delete;
+    die $error if $error;
+
+  } elsif ( $cgi->param("pkgpart$pkgpart")
+            && ! $type_pkgs
+  ) {
+    #ok to clobber it now (but bad form nonetheless?)
+    $type_pkgs=new FS::type_pkgs ({
+      'typenum' => $typenum,
+      'pkgpart' => $pkgpart,
+    });
+    $error= $type_pkgs->insert;
+    die $error if $error;
+  }
+
+}
+
+print $cgi->redirect(popurl(3). "browse/agent_type.cgi");
+
+%>
diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
new file mode 100755
index 000000000..3cacab26e
--- /dev/null
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -0,0 +1,80 @@
+<%
+#
+# $Id: cust_credit.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/cust_credit.cgi
+#
+# ivan@voicenet.com 96-dec-05 -> 96-dec-08
+#
+# post a refund if $new_paybatch
+# ivan@voicenet.com 96-dec-08
+#
+# refunds are no longer applied against a specific payment (paybatch)
+# paybatch field removed
+# ivan@voicenet.com 97-apr-22
+#
+# rewrite ivan@sisd.com 98-mar-16
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cust_credit.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  1999/04/07 15:23:05  ivan
+# don't use anchor in redirect
+#
+# Revision 1.6  1999/02/28 00:03:41  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/01/25 12:09:59  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.4  1999/01/19 05:13:49  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 22:47:51  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.2  1998/12/17 08:40:18  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+
+use strict;
+use vars qw( $cgi $custnum $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(popurl);
+use FS::Record qw(fields);
+use FS::cust_credit;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$cgi->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
+$custnum = $1;
+
+$cgi->param('otaker',getotaker);
+
+$new = new FS::cust_credit ( {
+  map {
+    $_, scalar($cgi->param($_));
+  #} qw(custnum _date amount otaker reason)
+  } fields('cust_credit')
+} );
+
+$error=$new->insert;
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "cust_credit.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+}
+
+
+%>
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
new file mode 100755
index 000000000..6c52113ba
--- /dev/null
+++ b/httemplate/edit/process/cust_main.cgi
@@ -0,0 +1,196 @@
+<%
+#
+# $Id: cust_main.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/cust_main.cgi
+#
+# ivan@voicenet.com 96-dec-04
+#
+# added referral check
+# ivan@voicenet.com 97-jun-4
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-28
+#
+# same as above (again) and clean up some stuff ivan@sisd.com 98-feb-23
+#
+# Changes to allow page to work at a relative position in server
+# Changed 'day' to 'daytime' because Pg6.3 reserves the day word
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cust_main.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.11  1999/08/10 12:54:06  ivan
+# use FS::cust_pkg::pkgpart_href
+#
+# Revision 1.10  1999/04/14 07:47:53  ivan
+# i18n fixes
+#
+# Revision 1.9  1999/04/07 15:22:19  ivan
+# don't use anchor in redirect
+#
+# Revision 1.8  1999/03/25 13:55:10  ivan
+# one-screen new customer entry (including package and service) for simple
+# packages with one svc_acct service
+#
+# Revision 1.7  1999/02/28 00:03:42  ivan
+# removed misleading comments
+#
+# Revision 1.6  1999/01/25 12:10:00  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:50  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:22:32  ivan
+# changes to track email addresses for email invoicing
+#
+# Revision 1.3  1998/12/17 08:40:19  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/18 08:57:36  ivan
+# i18n, s/CGI-modules/CGI.pm/, FS::CGI::idiot instead of inline, FS::CGI::popurl
+#
+
+use strict;
+use vars qw( $cgi $payby @invoicing_list $new $custnum $error );
+use vars qw( $cust_pkg $cust_svc $svc_acct );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw( popurl );
+use FS::Record qw( qsearch qsearchs fields );
+use FS::cust_main;
+use FS::type_pkgs;
+use FS::agent;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+#unmunge stuff
+
+$cgi->param('tax','') unless defined($cgi->param('tax'));
+
+$cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
+
+$cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
+  or die "Oops, illegal \"state\" param: ". $cgi->param('state');
+$cgi->param('state', $1);
+$cgi->param('county', $3 || '');
+$cgi->param('country', $4);
+
+if ( $payby = $cgi->param('payby') ) {
+  $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
+  $cgi->param('paydate',
+  $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
+  $cgi->param('payname', $cgi->param( $payby. '_payname' ) );
+}
+
+$cgi->param('otaker', &getotaker );
+
+@invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
+push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
+
+#create new record object
+
+$new = new FS::cust_main ( {
+  map {
+    $_, scalar($cgi->param($_))
+#  } qw(custnum agentnum last first ss company address1 address2 city county
+#       state zip daytime night fax payby payinfo paydate payname tax
+#       otaker refnum)
+  } fields('cust_main')
+} );
+
+#perhaps the invocing_list magic should move to cust_main.pm?
+$error = $new->check_invoicing_list( \@invoicing_list );
+
+#perhaps this stuff should go to cust_main.pm as well
+$cust_pkg = '';
+$svc_acct = '';
+if ( $new->custnum eq '' ) {
+
+  if ( $cgi->param('pkgpart_svcpart') ) {
+    my $x = $cgi->param('pkgpart_svcpart');
+    $x =~ /^(\d+)_(\d+)$/;
+    my($pkgpart, $svcpart) = ($1, $2);
+    #false laziness: copied from FS::cust_pkg::order (which should become a
+    #FS::cust_main method)
+    my(%part_pkg);
+    # generate %part_pkg
+    # $part_pkg{$pkgpart} is true iff $custnum may purchase $pkgpart
+    my $agent = qsearchs('agent',{'agentnum'=> $new->agentnum });
+    	#my($type_pkgs);
+    	#foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
+    	#  my($pkgpart)=$type_pkgs->pkgpart;
+    	#  $part_pkg{$pkgpart}++;
+    	#}
+    # $pkgpart_href->{PKGPART} is true iff $custnum may purchase $pkgpart
+    my $pkgpart_href = $agent->pkgpart_hashref;
+    #eslaf
+
+    # this should wind up in FS::cust_pkg!
+    $error ||= "Agent ". $new->agentnum. " (type ". $agent->typenum. ") can't".
+               "purchase pkgpart ". $pkgpart
+      #unless $part_pkg{ $pkgpart };
+      unless $pkgpart_href->{ $pkgpart };
+
+    $cust_pkg = new FS::cust_pkg ( {
+      #later         'custnum' => $custnum,
+      'pkgpart' => $pkgpart,
+    } );
+    $error ||= $cust_pkg->check;
+
+    #$cust_svc = new FS::cust_svc ( { 'svcpart' => $svcpart } );
+
+    #$error ||= $cust_svc->check;
+
+    $svc_acct = new FS::svc_acct ( {
+                                     'svcpart'   => $svcpart,
+                                     'username'  => $cgi->param('username'),
+                                     '_password' => $cgi->param('_password'),
+                                     'popnum'    => $cgi->param('popnum'),
+                                   } );
+
+    my $y = $svc_acct->setdefault; # arguably should be in new method
+    $error ||= $y unless ref($y);
+    #and just in case you were silly
+    $svc_acct->svcpart($svcpart);
+    $svc_acct->username($cgi->param('username'));
+    $svc_acct->_password($cgi->param('_password'));
+    $svc_acct->popnum($cgi->param('popnum'));
+
+    $error ||= $svc_acct->check;
+
+  } elsif ( $cgi->param('username') ) { #good thing to catch
+    $error = "Can't assign username without a package!";
+  }
+
+  $error ||= $new->insert;
+  if ( $cust_pkg && ! $error ) {
+    $cust_pkg->custnum( $new->custnum );
+    $error ||= $cust_pkg->insert; 
+    warn "WARNING: $error on pre-checked cust_pkg record!" if $error;
+    $svc_acct->pkgnum( $cust_pkg->pkgnum );
+    $error ||= $svc_acct->insert;
+    warn "WARNING: $error on pre-checked svc_acct record!" if $error;
+  }
+} else { #create old record object
+  my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } ); 
+  $error ||= "Old record not found!" unless $old;
+  $error ||= $new->replace($old);
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "cust_main.cgi?". $cgi->query_string );
+} else { 
+  $new->invoicing_list( \@invoicing_list );
+  $custnum = $new->custnum;
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+} 
+%>
diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
new file mode 100755
index 000000000..b7c4547f6
--- /dev/null
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -0,0 +1,104 @@
+<%
+#
+# $Id: cust_main_county-expand.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 97-dec-16
+#
+# Changes to allow page to work at a relative position in server
+# Added import of datasrc from UID.pm for Pg6.3
+# Default tax to 0.0 if using Pg6.3
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI
+# undo default tax to 0.0 if using Pg6.3: comes from pre-expanded record
+# for that state
+# ivan@sisd.com 98-sep-2
+#
+# $Log: cust_main_county-expand.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  2000/12/21 05:22:30  ivan
+# perldoc -f split
+#
+# Revision 1.6  1999/01/25 12:19:07  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:51  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 22:47:52  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.3  1998/12/17 08:40:20  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/18 09:01:40  ivan
+# i18n! i18n!
+#
+
+use strict;
+use vars qw ( $cgi $taxnum $cust_main_county @expansion $expansion );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup datasrc);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(popurl);
+use FS::cust_main_county;
+use FS::cust_main;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
+$taxnum = $1;
+$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+  or die ("Unknown taxnum!");
+
+if ( $cgi->param('delim') eq 'n' ) {
+  @expansion=split(/\n/,$cgi->param('expansion'));
+} elsif ( $cgi->param('delim') eq 's' ) {
+  @expansion=split(' ',$cgi->param('expansion'));
+} else {
+  die "Illegal delim!";
+}
+
+@expansion=map {
+  unless ( /^\s*([\w\- ]+)\s*$/ ) {
+    $cgi->param('error', "Illegal item in expansion");
+    print $cgi->redirect(popurl(2). "cust_main_county-expand.cgi?". $cgi->query_string );
+    exit;
+  }
+  $1;
+} @expansion;
+
+foreach ( @expansion) {
+  my(%hash)=$cust_main_county->hash;
+  my($new)=new FS::cust_main_county \%hash;
+  $new->setfield('taxnum','');
+  if ( ! $cust_main_county->state ) {
+    $new->setfield('state',$_);
+  } else {
+    $new->setfield('county',$_);
+  }
+  #if (datasrc =~ m/Pg/)
+  #{
+  #    $new->setfield('tax',0.0);
+  #}
+  my($error)=$new->insert;
+  die $error if $error;
+}
+
+unless ( qsearch('cust_main',{
+  'state'  => $cust_main_county->getfield('state'),
+  'county' => $cust_main_county->getfield('county'),
+  'country' =>  $cust_main_county->getfield('country'),
+} ) ) {
+  my($error)=($cust_main_county->delete);
+  die $error if $error;
+}
+
+print $cgi->redirect(popurl(3). "edit/cust_main_county.cgi");
+
+%>
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
new file mode 100755
index 000000000..1ff2047f1
--- /dev/null
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -0,0 +1,64 @@
+<%
+#
+# $Id: cust_main_county.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 97-dec-16
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: cust_main_county.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.6  1999/01/25 12:19:08  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:52  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 22:47:53  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.3  1998/12/17 08:40:21  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/18 09:01:41  ivan
+# i18n! i18n!
+#
+
+use strict;
+use vars qw( $cgi );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl);
+use FS::Record qw(qsearch qsearchs);
+use FS::cust_main_county;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+foreach ( $cgi->param ) {
+  /^tax(\d+)$/ or die "Illegal form $_!";
+  my($taxnum)=$1;
+  my($old)=qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+    or die "Couldn't find taxnum $taxnum!";
+  next unless $old->getfield('tax') ne $cgi->param("tax$taxnum");
+  my(%hash)=$old->hash;
+  $hash{tax}=$cgi->param("tax$taxnum");
+  my($new)=new FS::cust_main_county \%hash;
+  my($error)=$new->replace($old);
+  if ( $error ) {
+    $cgi->param('error', $error);
+    print $cgi->redirect(popurl(2). "cust_main_county.cgi?". $cgi->query_string );
+    exit;
+  }
+}
+
+print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi");
+
+%>
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
new file mode 100755
index 000000000..f21ff490a
--- /dev/null
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -0,0 +1,71 @@
+<%
+#
+# $Id: cust_pay.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/cust_pay.cgi
+#
+# ivan@voicenet.com 96-dec-11
+#
+# rewrite ivan@sisd.com 98-mar-16
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cust_pay.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  1999/02/28 00:03:43  ivan
+# removed misleading comments
+#
+# Revision 1.6  1999/01/25 12:19:09  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:53  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 22:47:54  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.3  1998/12/30 23:03:28  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.2  1998/12/17 08:40:22  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+
+use strict;
+use vars qw( $cgi $invnum $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl);
+use FS::Record qw(fields);
+use FS::cust_pay;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$cgi->param('invnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$invnum = $1;
+
+$new = new FS::cust_pay ( {
+  map {
+    $_, scalar($cgi->param($_));
+  #} qw(invnum paid _date payby payinfo paybatch)
+  } fields('cust_pay')
+} );
+
+$error=$new->insert;
+
+if ($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). 'cust_pay.cgi?'. $cgi->query_string );
+  exit;
+} else {
+  print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$invnum");
+}
+
+%>
diff --git a/httemplate/edit/process/cust_pkg.cgi b/httemplate/edit/process/cust_pkg.cgi
new file mode 100755
index 000000000..0074466c8
--- /dev/null
+++ b/httemplate/edit/process/cust_pkg.cgi
@@ -0,0 +1,84 @@
+<%
+#
+# $Id: cust_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# this is for changing packages around, not for editing things within the
+# package
+#
+# Usage: post form to:
+#        http://server.name/path/cust_pkg.cgi
+#
+# ivan@voicenet.com 97-mar-21 - 97-mar-24
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-7 - 15
+#
+# &cgisuidsetup($cgi) ivan@sisd.com 98-mar-7
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cust_pkg.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  1999/04/07 15:24:06  ivan
+# don't use anchor in redirect
+#
+# Revision 1.6  1999/02/28 00:03:44  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/02/07 09:59:26  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.3  1999/01/19 05:13:54  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.2  1998/12/17 08:40:23  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+
+use strict;
+use vars qw( $cgi $custnum @remove_pkgnums @pkgparts $pkgpart $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl);
+use FS::cust_pkg;
+
+$cgi = new CGI; # create form object
+&cgisuidsetup($cgi);
+$error = '';
+
+#untaint custnum
+$cgi->param('custnum') =~ /^(\d+)$/;
+$custnum = $1;
+
+@remove_pkgnums = map {
+  /^(\d+)$/ or die "Illegal remove_pkg value!";
+  $1;
+} $cgi->param('remove_pkg');
+
+foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
+  if ( $cgi->param("pkg$pkgpart") =~ /^(\d+)$/ ) {
+    my $num_pkgs = $1;
+    while ( $num_pkgs-- ) {
+      push @pkgparts,$pkgpart;
+    }
+  } else {
+    $error = "Illegal quantity";
+    last;
+  }
+}
+
+$error ||= FS::cust_pkg::order($custnum,\@pkgparts,\@remove_pkgnums);
+
+if ($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "cust_pkg.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+}
+
+%>
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
new file mode 100755
index 000000000..3e1c07d1e
--- /dev/null
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -0,0 +1,152 @@
+<%
+#
+# $Id: part_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# process/part_pkg.cgi: Edit package definitions (process form)
+#
+# ivan@sisd.com 97-dec-10
+#
+# don't update non-changing records in part_svc (causing harmless but annoying
+# "Records identical" errors). ivan@sisd.com 98-feb-19
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# Added `|| 0 ' when getting quantity off web page ivan@sisd.com 98-jun-4
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: part_pkg.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.9  2001/04/09 23:05:16  ivan
+# Transactions Part I!!!
+#
+# Revision 1.8  1999/02/07 09:59:27  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.7  1999/01/19 05:13:55  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6  1999/01/18 22:47:56  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.5  1998/12/30 23:03:29  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.4  1998/12/17 08:40:24  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.3  1998/11/21 07:17:58  ivan
+# bugfix to work for regular aswell as custom pricing
+#
+# Revision 1.2  1998/11/15 13:16:15  ivan
+# first pass as per-user custom pricing
+#
+
+use strict;
+use vars qw( $cgi $pkgpart $old $new $part_svc $error $dbh );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::part_pkg;
+use FS::pkg_svc;
+use FS::cust_pkg;
+
+$cgi = new CGI;
+$dbh = &cgisuidsetup($cgi);
+
+$pkgpart = $cgi->param('pkgpart');
+
+$old = qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
+
+$new = new FS::part_pkg ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('part_pkg')
+} );
+
+#most of the stuff below should move to part_pkg.pm
+
+foreach $part_svc ( qsearch('part_svc', {} ) ) {
+  my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
+  unless ( $quantity =~ /^(\d+)$/ ) {
+    $cgi->param('error', "Illegal quantity" );
+    print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
+    exit;
+  }
+}
+
+local $SIG{HUP} = 'IGNORE';
+local $SIG{INT} = 'IGNORE';
+local $SIG{QUIT} = 'IGNORE';
+local $SIG{TERM} = 'IGNORE';
+local $SIG{TSTP} = 'IGNORE';
+local $SIG{PIPE} = 'IGNORE';
+
+local $FS::UID::AutoCommit = 0;
+
+if ( $pkgpart ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $pkgpart=$new->pkgpart;
+}
+if ( $error ) {
+  $dbh->rollback;
+  $cgi->param('error', $error );
+  print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
+  exit;
+}
+
+foreach $part_svc (qsearch('part_svc',{})) {
+  my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
+  my $old_pkg_svc = qsearchs('pkg_svc', {
+    'pkgpart' => $pkgpart,
+    'svcpart' => $part_svc->svcpart,
+  } );
+  my $old_quantity = $old_pkg_svc ? $old_pkg_svc->quantity : 0;
+  next unless $old_quantity != $quantity; #!here
+  my $new_pkg_svc = new FS::pkg_svc( {
+    'pkgpart'  => $pkgpart,
+    'svcpart'  => $part_svc->svcpart,
+    'quantity' => $quantity, 
+  } );
+  if ( $old_pkg_svc ) {
+    my $myerror = $new_pkg_svc->replace($old_pkg_svc);
+    if ( $myerror ) {
+      $dbh->rollback;
+      die $myerror;
+    }
+  } else {
+    my $myerror = $new_pkg_svc->insert;
+    if ( $myerror ) {
+      $dbh->rollback;
+      die $myerror;
+    }
+  }
+}
+
+unless ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
+  $dbh->commit or die $dbh->errstr;
+  print $cgi->redirect(popurl(3). "browse/part_pkg.cgi");
+} else {
+  my($old_cust_pkg) = qsearchs( 'cust_pkg', { 'pkgnum' => $1 } );
+  my %hash = $old_cust_pkg->hash;
+  $hash{'pkgpart'} = $pkgpart;
+  my($new_cust_pkg) = new FS::cust_pkg \%hash;
+  my $myerror = $new_cust_pkg->replace($old_cust_pkg);
+  if ( $myerror ) {
+    $dbh->rollback;
+    die "Error modifying cust_pkg record: $myerror\n";
+  }
+
+  $dbh->commit or die $dbh->errstr;
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new_cust_pkg->custnum);
+}
+
+%>
diff --git a/httemplate/edit/process/part_referral.cgi b/httemplate/edit/process/part_referral.cgi
new file mode 100755
index 000000000..c79ebb608
--- /dev/null
+++ b/httemplate/edit/process/part_referral.cgi
@@ -0,0 +1,69 @@
+<%
+#
+# $Id: part_referral.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 98-feb-23
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: part_referral.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.6  1999/02/07 09:59:28  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.5  1999/01/19 05:13:56  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 22:47:57  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.3  1998/12/30 23:03:30  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.2  1998/12/17 08:40:25  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+
+use strict;
+use vars qw( $cgi $refnum $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs fields);
+use FS::part_referral;
+use FS::CGI qw(popurl);
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$refnum = $cgi->param('refnum');
+
+$new = new FS::part_referral ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('part_referral')
+} );
+
+if ( $refnum ) {
+  my $old = qsearchs( 'part_referral', { 'refnum' =>$ refnum } );
+  die "(Old) Record not found!" unless $old;
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+}
+$refnum=$new->refnum;
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "part_referral.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "browse/part_referral.cgi");
+}
+
+%>
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
new file mode 100755
index 000000000..4c972e4d7
--- /dev/null
+++ b/httemplate/edit/process/part_svc.cgi
@@ -0,0 +1,30 @@
+<%
+
+my $svcpart = $cgi->param('svcpart');
+
+my $old = qsearchs('part_svc',{'svcpart'=>$svcpart}) if $svcpart;
+
+my $new = new FS::part_svc ( {
+  map {
+    $_, scalar($cgi->param($_));
+#  } qw(svcpart svc svcdb)
+  } fields('part_svc')
+} );
+
+my $error;
+if ( $svcpart ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $svcpart=$new->getfield('svcpart');
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  $Response->Redirect(popurl(2). "part_svc.cgi?". $cgi->query_string );
+} else {
+  warn "redirecting to ". popurl(3)."browse/part_svc.cgi via $Response";
+  $Response->Redirect(popurl(3)."browse/part_svc.cgi");
+}
+
+%>
diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi
new file mode 100755
index 000000000..e895e5ddf
--- /dev/null
+++ b/httemplate/edit/process/svc_acct.cgi
@@ -0,0 +1,100 @@
+<%
+#
+# $Id: svc_acct.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/svc_acct.cgi
+#
+# ivan@voicenet.com 96-dec-18
+#
+# Changed /u to /u2
+# ivan@voicenet.com 97-may-6
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-17 - 21
+#
+# no FS::Search, FS::svc_acct creates FS::cust_svc record, used for adding
+# and editing ivan@sisd.com 98-mar-8
+#
+# Changes to allow page to work at a relative position in server
+# Changed 'password' to '_password' because Pg6.3 reserves the password word
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: svc_acct.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  1999/08/27 00:26:33  ivan
+# better error messages
+#
+# Revision 1.6  1999/02/28 00:03:45  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/02/07 09:59:30  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:13:58  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 22:47:59  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.2  1998/12/17 08:40:27  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+
+use strict;
+use vars qw( $cgi $svcnum $old $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl);
+use FS::Record qw(qsearchs fields);
+use FS::svc_acct;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$svcnum = $1;
+
+if ( $svcnum ) {
+  $old = qsearchs('svc_acct', { 'svcnum' => $svcnum } )
+    or die "fatal: can't find account (svcnum $svcnum)!";
+} else {
+  $old = '';
+}
+
+#unmunge popnum
+$cgi->param('popnum', (split(/:/, $cgi->param('popnum') ))[0] );
+
+#unmunge passwd
+if ( $cgi->param('_password') eq '*HIDDEN*' ) {
+  die "fatal: no previous account to recall hidden password from!" unless $old;
+  $cgi->param('_password',$old->getfield('_password'));
+}
+
+$new = new FS::svc_acct ( {
+  map {
+    $_, scalar($cgi->param($_));
+  #} qw(svcnum pkgnum svcpart username _password popnum uid gid finger dir
+  #  shell quota slipip)
+  } ( fields('svc_acct'), qw( pkgnum svcpart ) )
+} );
+
+if ( $svcnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $svcnum = $new->svcnum;
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_acct.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/svc_acct.cgi?" . $svcnum );
+}
+
+%>
diff --git a/httemplate/edit/process/svc_acct_pop.cgi b/httemplate/edit/process/svc_acct_pop.cgi
new file mode 100755
index 000000000..95415f201
--- /dev/null
+++ b/httemplate/edit/process/svc_acct_pop.cgi
@@ -0,0 +1,70 @@
+<%
+#
+# $Id: svc_acct_pop.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 98-mar-8
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: svc_acct_pop.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.6  1999/02/07 09:59:31  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.5  1999/01/19 05:13:59  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 22:48:00  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.3  1998/12/30 23:03:32  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.2  1998/12/17 08:40:28  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+
+use strict;
+use vars qw( $cgi $popnum $old $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::svc_acct_pop;
+use FS::CGI qw(popurl);
+
+$cgi = new CGI; # create form object
+
+&cgisuidsetup($cgi);
+
+$popnum = $cgi->param('popnum');
+
+$old = qsearchs('svc_acct_pop',{'popnum'=>$popnum}) if $popnum;
+
+$new = new FS::svc_acct_pop ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('svc_acct_pop')
+} );
+
+if ( $popnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $popnum=$new->getfield('popnum');
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_acct_pop.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "browse/svc_acct_pop.cgi");
+}
+
+%>
diff --git a/httemplate/edit/process/svc_acct_sm.cgi b/httemplate/edit/process/svc_acct_sm.cgi
new file mode 100755
index 000000000..a68478898
--- /dev/null
+++ b/httemplate/edit/process/svc_acct_sm.cgi
@@ -0,0 +1,87 @@
+<%
+#
+# $Id: svc_acct_sm.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/svc_acct_sm.cgi
+#
+# lots of crufty stuff from svc_acct still in here, and modifications are (unelegantly) disabled.
+#
+# ivan@voicenet.com 97-jan-6
+#
+# enabled modifications
+# 
+# ivan@voicenet.com 97-may-7
+#
+# fixed removal of cust_svc record on modifications!
+# ivan@voicenet.com 97-jun-5
+#
+# rewrite ivan@sisd.com 98-mar-15
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: svc_acct_sm.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.6  1999/02/28 00:03:46  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/02/07 09:59:32  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:14:00  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 22:48:01  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.2  1998/12/17 08:40:29  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+
+use strict;
+use vars qw( $cgi $svcnum $old $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs fields);
+use FS::svc_acct_sm;
+use FS::CGI qw(popurl);
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$svcnum =$1;
+
+$old = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
+
+#unmunge domsvc and domuid
+#$cgi->param('domsvc',(split(/:/, $cgi->param('domsvc') ))[0] );
+#$cgi->param('domuid',(split(/:/, $cgi->param('domuid') ))[0] );
+
+$new = new FS::svc_acct_sm ( {
+  map {
+    ($_, scalar($cgi->param($_)));
+  #} qw(svcnum pkgnum svcpart domuser domuid domsvc)
+  } ( fields('svc_acct_sm'), qw( pkgnum svcpart ) )
+} );
+
+if ( $svcnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $svcnum = $new->getfield('svcnum');
+} 
+
+if ($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_acct_sm.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/svc_acct_sm.cgi?$svcnum");
+}
+
+%>
diff --git a/httemplate/edit/process/svc_domain.cgi b/httemplate/edit/process/svc_domain.cgi
new file mode 100755
index 000000000..59a0c078f
--- /dev/null
+++ b/httemplate/edit/process/svc_domain.cgi
@@ -0,0 +1,84 @@
+<%
+#
+# $Id: svc_domain.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/svc_domain.cgi
+#
+# lots of yucky stuff in this one... bleachlkjhui!
+#
+# ivan@voicenet.com 97-jan-6
+#
+# kludged for new domain template 3.5
+# ivan@voicenet.com 97-jul-24
+#
+# moved internic bits to svc_domain.pm ivan@sisd.com 98-mar-14
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: svc_domain.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  2001/04/23 07:12:44  ivan
+# better error message (if kludgy) for no referral
+# remove outdated NSI foo from domain ordering.  also, fuck NSI.
+#
+# Revision 1.6  1999/02/28 00:03:47  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/02/07 09:59:33  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:14:01  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 22:48:02  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.2  1998/12/17 08:40:30  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+
+use strict;
+use vars qw( $cgi $svcnum $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs fields);
+use FS::svc_domain;
+use FS::CGI qw(popurl);
+
+#remove this to actually test the domains!
+$FS::svc_domain::whois_hack = 1;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$svcnum = $1;
+
+$new = new FS::svc_domain ( {
+  map {
+    $_, scalar($cgi->param($_));
+  #} qw(svcnum pkgnum svcpart domain action purpose)
+  } ( fields('svc_domain'), qw( pkgnum svcpart action purpose ) )
+} );
+
+if ($cgi->param('svcnum')) {
+  $error="Can't modify a domain!";
+} else {
+  $error=$new->insert;
+  $svcnum=$new->svcnum;
+}
+
+if ($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_domain.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/svc_domain.cgi?$svcnum");
+}
+
+%>
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
new file mode 100755
index 000000000..7badfe696
--- /dev/null
+++ b/httemplate/edit/svc_acct.cgi
@@ -0,0 +1,232 @@
+<%
+#
+# $Id: svc_acct.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
+#        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
+#
+# ivan@voicenet.com 96-dec-18
+#
+# rewrite ivan@sisd.com 98-mar-8
+#
+# Changes to allow page to work at a relative position in server
+# Changed 'password' to '_password' because Pg6.3 reserves the password word
+#       bmccane@maxbaud.net     98-apr-3
+#
+# use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
+#
+# $Log: svc_acct.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.10  1999/04/14 11:27:06  ivan
+# showpasswords config option to show passwords
+#
+# Revision 1.9  1999/02/28 00:03:37  ivan
+# removed misleading comments
+#
+# Revision 1.8  1999/02/23 08:09:22  ivan
+# beginnings of one-screen new customer entry and some other miscellania
+#
+# Revision 1.7  1999/02/07 09:59:22  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.6  1999/01/19 05:13:43  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:32  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/30 23:03:22  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.3  1998/12/17 06:17:08  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+
+use strict;
+use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
+             $part_svc $svc $otaker $username $password $ulen $ulen2 $p1
+             $popnum $uid $gid $finger $dir $shell $quota $slipip );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(header popurl);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::svc_acct;
+use FS::Conf;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+@shells = $conf->config('shells');
+
+if ( $cgi->param('error') ) {
+  $svc_acct = new FS::svc_acct ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_acct')
+  } );
+  $svcnum = $svc_acct->svcnum;
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $svcnum=$1;
+    $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svcnum})
+      or die "Unknown (svc_acct) svcnum!";
+
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+      or die "Unknown (cust_svc) svcnum!";
+
+    $pkgnum=$cust_svc->pkgnum;
+    $svcpart=$cust_svc->svcpart;
+
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+  } else { #adding
+
+    $svc_acct = new FS::svc_acct({}); 
+
+    foreach $_ (split(/-/,$query)) {
+      $pkgnum=$1 if /^pkgnum(\d+)$/;
+      $svcpart=$1 if /^svcpart(\d+)$/;
+    }
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+    $svcnum='';
+
+    #set gecos
+    my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+    if ($cust_pkg) {
+      my($cust_main)=qsearchs('cust_main',{'custnum'=> $cust_pkg->custnum } );
+      $svc_acct->setfield('finger',
+        $cust_main->getfield('first') . " " . $cust_main->getfield('last')
+      ) ;
+    }
+
+    #set fixed and default fields from part_svc
+    my($field);
+    foreach $field ( fields('svc_acct') ) {
+      if ( $part_svc->getfield('svc_acct__'. $field. '_flag') ne '' ) {
+        $svc_acct->setfield($field,$part_svc->getfield('svc_acct__'. $field) );
+      }
+    }
+
+  }
+}
+$action = $svcnum ? 'Edit' : 'Add';
+
+$svc = $part_svc->getfield('svc');
+
+$otaker = getotaker;
+
+$username = $svc_acct->username;
+if ( $svc_acct->_password ) {
+  if ( $conf->exists('showpasswords') ) {
+    $password = $svc_acct->_password;
+  } else {
+    $password = "*HIDDEN*";
+  }
+} else {
+  $password = '';
+}
+
+$ulen = $svc_acct->dbdef_table->column('username')->length;
+$ulen2 = $ulen+2;
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("$action $svc account");
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print <<END;
+    <FORM ACTION="${p1}process/svc_acct.cgi" METHOD=POST>
+      <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
+      <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
+      <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
+Username: 
+<INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen>
+<BR>Password: 
+<INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8> 
+(blank to generate)
+END
+
+#pop
+$popnum = $svc_acct->popnum || 0;
+if ( $part_svc->svc_acct__popnum_flag eq "F" ) {
+  print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$popnum">!;
+} else { 
+  print qq!<BR>POP: <SELECT NAME="popnum" SIZE=1><OPTION>\n!;
+  my($svc_acct_pop);
+  foreach $svc_acct_pop ( qsearch ('svc_acct_pop',{} ) ) {
+  print "<OPTION", $svc_acct_pop->popnum == $popnum ? ' SELECTED' : '', ">", 
+        $svc_acct_pop->popnum, ": ", 
+        $svc_acct_pop->city, ", ",
+        $svc_acct_pop->state,
+        " (", $svc_acct_pop->ac, ")/",
+        $svc_acct_pop->exch, "\n"
+      ;
+  }
+  print "</SELECT>";
+}
+
+($uid,$gid,$finger,$dir)=(
+  $svc_acct->uid,
+  $svc_acct->gid,
+  $svc_acct->finger,
+  $svc_acct->dir,
+);
+
+print <<END;
+<INPUT TYPE="hidden" NAME="uid" VALUE="$uid">
+<INPUT TYPE="hidden" NAME="gid" VALUE="$gid">
+<BR>GECOS: <INPUT TYPE="text" NAME="finger" VALUE="$finger">
+<INPUT TYPE="hidden" NAME="dir" VALUE="$dir">
+END
+
+$shell = $svc_acct->shell;
+if ( $part_svc->svc_acct__shell_flag eq "F" ) {
+  print qq!<INPUT TYPE="hidden" NAME="shell" VALUE="$shell">!;
+} else {
+  print qq!<BR>Shell: <SELECT NAME="shell" SIZE=1>!;
+  my($etc_shell);
+  foreach $etc_shell (@shells) {
+    print "<OPTION", $etc_shell eq $shell ? ' SELECTED' : '', ">",
+          $etc_shell, "\n";
+  }
+  print "</SELECT>";
+}
+
+($quota,$slipip)=(
+  $svc_acct->quota,
+  $svc_acct->slipip,
+);
+
+print qq!<INPUT TYPE="hidden" NAME="quota" VALUE="$quota">!;
+
+if ( $part_svc->svc_acct__slipip_flag eq "F" ) {
+  print qq!<INPUT TYPE="hidden" NAME="slipip" VALUE="$slipip">!;
+} else {
+  print qq!<BR>IP: <INPUT TYPE="text" NAME="slipip" VALUE="$slipip">!;
+}
+
+#submit
+print qq!<P><INPUT TYPE="submit" VALUE="Submit">!; 
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+
+%>
diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
new file mode 100755
index 000000000..016031f83
--- /dev/null
+++ b/httemplate/edit/svc_acct_pop.cgi
@@ -0,0 +1,106 @@
+<%
+#
+# $Id: svc_acct_pop.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 98-mar-8 
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: svc_acct_pop.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.9  2000/01/28 23:02:48  ivan
+# track full phone number
+#
+# Revision 1.8  1999/02/23 08:09:23  ivan
+# beginnings of one-screen new customer entry and some other miscellania
+#
+# Revision 1.7  1999/02/07 09:59:23  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.6  1999/01/19 05:13:44  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:33  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/23 02:57:45  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 06:17:10  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/11/13 09:56:47  ivan
+# change configuration file layout to support multiple distinct databases (with
+# own set of config files, export, etc.)
+#
+
+use strict;
+use vars qw( $cgi $svc_acct_pop $action $query $hashref $p1 );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::CGI qw(header menubar popurl);
+use FS::svc_acct_pop;
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  $svc_acct_pop = new FS::svc_acct_pop ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_acct_pop')
+  } );
+} elsif ( $cgi->keywords ) { #editing
+  my($query)=$cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $svc_acct_pop=qsearchs('svc_acct_pop',{'popnum'=>$1});
+} else { #adding
+  $svc_acct_pop = new FS::svc_acct_pop {};
+}
+$action = $svc_acct_pop->popnum ? 'Edit' : 'Add';
+$hashref = $svc_acct_pop->hashref;
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("$action POP", menubar(
+  'Main Menu' => popurl(2),
+  'View all POPs' => popurl(2). "browse/svc_acct_pop.cgi",
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/svc_acct_pop.cgi" METHOD=POST>!;
+
+#display
+
+print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$hashref->{popnum}">!,
+      "POP #", $hashref->{popnum} ? $hashref->{popnum} : "(NEW)";
+
+print <<END;
+<PRE>
+City      <INPUT TYPE="text" NAME="city" SIZE=32 VALUE="$hashref->{city}">
+State     <INPUT TYPE="text" NAME="state" SIZE=16 MAXLENGTH=16 VALUE="$hashref->{state}">
+Area Code <INPUT TYPE="text" NAME="ac" SIZE=4 MAXLENGTH=3 VALUE="$hashref->{ac}">
+Exchange  <INPUT TYPE="text" NAME="exch" SIZE=4 MAXLENGTH=3 VALUE="$hashref->{exch}">
+Local     <INPUT TYPE="text" NAME="loc" SIZE=5 MAXLENGTH=4 VALUE="$hashref->{loc}">
+</PRE>
+END
+
+print qq!<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{popnum} ? "Apply changes" : "Add POP",
+      qq!">!;
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
new file mode 100755
index 000000000..891c3e1f6
--- /dev/null
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -0,0 +1,251 @@
+<%
+#
+# $Id: svc_acct_sm.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: svc_acct_sm.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
+#        http://server.name/path/svc_acct_sm.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
+#
+# use {svcnum} for edit, pkgnum{pkgnum}-svcpart{svcpart} for add
+#
+# should error out in a more CGI-friendly way, and should have more error checking (sigh).
+#
+# ivan@voicenet.com 97-jan-5
+#
+# added debugging code; fixed CPU-sucking problem with trying to edit an (unaudited) mail alias (no pkgnum)
+#
+# ivan@voicenet.com 97-may-7
+#
+# fixed uid selection
+# ivan@voicenet.com 97-jun-4
+#
+# uid selection across _CUSTOMER_, not just _PACKAGE_
+#
+# ( i need to be rewritten with fast searches)
+#
+# ivan@voicenet.com 97-oct-3
+#
+# added fast searches in some of the places where it is sorely needed...
+# I see DBI::mysql in your future...
+# ivan@voicenet.com 97-oct-23
+#
+# rewrite ivan@sisd.com 98-mar-15
+#
+# /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-26
+#
+# $Log: svc_acct_sm.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.9  1999/02/28 00:03:38  ivan
+# removed misleading comments
+#
+# Revision 1.8  1999/02/07 09:59:24  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.7  1999/01/19 05:13:45  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6  1999/01/18 09:41:34  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1998/12/30 23:03:24  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.4  1998/12/23 02:58:45  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 06:17:11  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/12/16 05:19:15  ivan
+# use FS::Conf
+#
+
+use strict;
+use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
+             $part_svc $query %username %domain $p1 $domuser $domsvc $domuid );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::svc_acct_sm;
+use FS::Conf;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+$mydomain = $conf->config('domain');
+
+if ( $cgi->param('error') ) {
+  $svc_acct_sm = new FS::svc_acct_sm ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_acct_sm')
+  } );
+  $svcnum = $svc_acct_sm->svcnum;
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $svcnum=$1;
+    $svc_acct_sm=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum})
+      or die "Unknown (svc_acct_sm) svcnum!";
+
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+      or die "Unknown (cust_svc) svcnum!";
+
+    $pkgnum=$cust_svc->pkgnum;
+    $svcpart=$cust_svc->svcpart;
+  
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+  } else { #adding
+
+    $svc_acct_sm = new FS::svc_acct_sm({});
+
+    foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
+      $pkgnum=$1 if /^pkgnum(\d+)$/;
+      $svcpart=$1 if /^svcpart(\d+)$/;
+    }
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+    $svcnum='';
+
+    #set fixed and default fields from part_svc
+    my($field);
+    foreach $field ( fields('svc_acct_sm') ) {
+      if ( $part_svc->getfield('svc_acct_sm__'. $field. '_flag') ne '' ) {
+        $svc_acct_sm->setfield($field,$part_svc->getfield('svc_acct_sm__'. $field) );
+      }
+    }
+
+  }
+}
+$action = $svc_acct_sm->svcnum ? 'Edit' : 'Add';
+
+if ($pkgnum) {
+
+  #find all possible uids (and usernames)
+
+  my($u_part_svc,@u_acct_svcparts);
+  foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
+    push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
+  }
+
+  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+  my($custnum)=$cust_pkg->getfield('custnum');
+  my($i_cust_pkg);
+  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
+    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
+    my($acct_svcpart);
+    foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
+                                              #record(s) in cust_svc ( for this
+                                              #pkgnum ! )
+      my($i_cust_svc);
+      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
+        my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
+        $username{$svc_acct->getfield('uid')}=$svc_acct->getfield('username');
+      }  
+    }
+  }
+
+  #find all possible domains (and domsvc's)
+
+  my($d_part_svc,@d_acct_svcparts);
+  foreach $d_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_domain'}) ) {
+    push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
+  }
+
+  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
+    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
+    my($acct_svcpart);
+    foreach $acct_svcpart (@d_acct_svcparts) {
+      my($i_cust_svc);
+      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
+        my($svc_domain)=qsearch('svc_domain',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
+        $domain{$svc_domain->getfield('svcnum')}=$svc_domain->getfield('domain');
+      }
+    }
+  }
+
+} elsif ( $action eq 'Edit' ) {
+
+  my($svc_acct)=qsearchs('svc_acct',{'uid'=>$svc_acct_sm->domuid});
+  $username{$svc_acct_sm->uid} = $svc_acct->username;
+
+  my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$svc_acct_sm->domsvc});
+  $domain{$svc_acct_sm->domsvc} = $svc_domain->domain;
+
+} else {
+  die "\$action eq Add, but \$pkgnum is null!\n";
+}
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("Mail Alias $action", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/svc_acct_sm.cgi" METHOD=POST>!;
+
+#display
+
+	#formatting
+	print "<PRE>";
+
+#svcnum
+print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
+print qq!Service #<FONT SIZE=+1><B>!, $svcnum ? $svcnum : " (NEW)", "</B></FONT>";
+
+#pkgnum
+print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
+ 
+#svcpart
+print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
+
+($domuser,$domsvc,$domuid)=(
+  $svc_acct_sm->domuser,
+  $svc_acct_sm->domsvc,
+  $svc_acct_sm->domuid,
+);
+
+#domuser
+print qq!\n\nMail to <INPUT TYPE="text" NAME="domuser" VALUE="$domuser"> <I>( * for anything )</I>!;
+
+#domsvc
+print qq! \@ <SELECT NAME="domsvc" SIZE=1>!;
+foreach $_ (keys %domain) {
+  print "<OPTION", $_ eq $domsvc ? " SELECTED" : "",
+        qq! VALUE="$_">$domain{$_}!;
+}
+print "</SELECT>";
+
+#uid
+print qq!\nforwards to <SELECT NAME="domuid" SIZE=1>!;
+foreach $_ (keys %username) {
+  print "<OPTION", ($_ eq $domuid) ? " SELECTED" : "",
+        qq! VALUE="$_">$username{$_}!;
+}
+print "</SELECT>\@$mydomain mailbox.";
+
+	#formatting
+	print "</PRE>\n";
+
+print qq!<CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>!;
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
new file mode 100755
index 000000000..dd8ad8532
--- /dev/null
+++ b/httemplate/edit/svc_domain.cgi
@@ -0,0 +1,168 @@
+<%
+#
+# $Id: svc_domain.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: svc_domain.cgi pkgnum{pkgnum}-svcpart{svcpart}
+#        http://server.name/path/svc_domain.cgi?pkgnum{pkgnum}-svcpart{svcpart}
+#
+# ivan@voicenet.com 97-jan-5 -> 97-jan-6
+#
+# changes for domain template 3.5
+# ivan@voicenet.com 97-jul-24
+#
+# rewrite ivan@sisd.com 98-mar-14
+#
+# no GOV in instructions ivan@sisd.com 98-jul-17
+#
+# $Log: svc_domain.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.10  2001/04/23 07:12:44  ivan
+# better error message (if kludgy) for no referral
+# remove outdated NSI foo from domain ordering.  also, fuck NSI.
+#
+# Revision 1.9  1999/02/28 00:03:39  ivan
+# removed misleading comments
+#
+# Revision 1.8  1999/02/07 09:59:25  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.7  1999/01/19 05:13:46  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6  1999/01/18 09:41:35  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1998/12/30 23:03:25  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.4  1998/12/23 03:00:16  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 06:17:12  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/11/13 09:56:48  ivan
+# change configuration file layout to support multiple distinct databases (with
+# own set of config files, export, etc.)
+#
+
+use strict;
+use vars qw( $cgi $action $svcnum $svc_domain $pkgnum $svcpart $part_svc
+             $svc $otaker $domain $p1 $kludge_action $purpose );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(header popurl);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::svc_domain;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  $svc_domain = new FS::svc_domain ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_domain')
+  } );
+  $svcnum = $svc_domain->svcnum;
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
+  $kludge_action = $cgi->param('action');
+  $purpose = $cgi->param('purpose');
+  $part_svc = qsearchs('part_svc', { 'svcpart' => $svcpart } );
+  die "No part_svc entry!" unless $part_svc;
+} else {
+  $kludge_action = '';
+  $purpose = '';
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $svcnum=$1;
+    $svc_domain=qsearchs('svc_domain',{'svcnum'=>$svcnum})
+      or die "Unknown (svc_domain) svcnum!";
+
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+      or die "Unknown (cust_svc) svcnum!";
+
+    $pkgnum=$cust_svc->pkgnum;
+    $svcpart=$cust_svc->svcpart;
+
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+  } else { #adding
+
+    $svc_domain = new FS::svc_domain({});
+  
+    foreach $_ (split(/-/,$query)) {
+      $pkgnum=$1 if /^pkgnum(\d+)$/;
+      $svcpart=$1 if /^svcpart(\d+)$/;
+    }
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+    $svcnum='';
+
+    #set fixed and default fields from part_svc
+    my($field);
+    foreach $field ( fields('svc_domain') ) {
+      if ( $part_svc->getfield('svc_domain__'. $field. '_flag') ne '' ) {
+        $svc_domain->setfield($field,$part_svc->getfield('svc_domain__'. $field) );
+      }
+    }
+
+  }
+}
+$action = $svcnum ? 'Edit' : 'Add';
+
+$svc = $part_svc->getfield('svc');
+
+$otaker = getotaker;
+
+$domain = $svc_domain->domain;
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("$action $svc", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print <<END;
+    <FORM ACTION="${p1}process/svc_domain.cgi" METHOD=POST>
+      <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
+      <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
+      <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
+END
+
+print qq!<INPUT TYPE="radio" NAME="action" VALUE="N"!;
+print ' CHECKED' if $kludge_action eq 'N';
+print qq!>New!;
+print qq!<BR><INPUT TYPE="radio" NAME="action" VALUE="M"!;
+print ' CHECKED' if $kludge_action eq 'M';
+print qq!>Transfer!;
+
+print <<END;
+<P>Domain <INPUT TYPE="text" NAME="domain" VALUE="$domain" SIZE=28 MAXLENGTH=26>
+<BR>Purpose/Description: <INPUT TYPE="text" NAME="purpose" VALUE="$purpose" SIZE=64>
+<P><CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>
+<UL>
+  <LI>COM is for commercial, for-profit organziations
+  <LI>ORG is for miscellaneous, usually, non-profit organizations
+  <LI>NET is for network infrastructure machines and organizations
+  <LI>EDU is for 4-year, degree granting institutions
+<!--  <LI>GOV is for United States federal government agencies
+!-->
+</UL>
+US state and local government agencies, schools, libraries, museums, and individuals should register under the US domain.  See RFC 1480 for a complete description of the US domain
+and registration procedures.
+<!--  <P>GOV registrations are limited to top-level US Federal Government agencies (see RFC 1816).
+!-->
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/images/mid-logo.png b/httemplate/images/mid-logo.png
new file mode 100644
index 000000000..d993419cc
Binary files /dev/null and b/httemplate/images/mid-logo.png differ
diff --git a/httemplate/images/small-logo.png b/httemplate/images/small-logo.png
new file mode 100644
index 000000000..406a36980
Binary files /dev/null and b/httemplate/images/small-logo.png differ
diff --git a/httemplate/index.html b/httemplate/index.html
new file mode 100644
index 000000000..f24d354b1
--- /dev/null
+++ b/httemplate/index.html
@@ -0,0 +1,89 @@
+<HTML>
+  <HEAD>
+    <TITLE>
+      Freeside Main Menu
+    </TITLE>
+  </HEAD>
+  <BODY BGCOLOR="#FFFFFF">
+  <table>
+    <tr><td>
+    <P ALIGN=CENTER>
+        <IMG BORDER=0 ALT="Silicon Interactive Software Design" SRC="images/small-logo.png">
+    </td><td>
+      <center><font color="#ff0000" size=7>freeside main menu</font></center>
+    </td></tr>
+  </table>
+      <A HREF="http://www.sisd.com/freeside">
+        Freeside home page
+      </A>
+      <BR><A HREF="docs/">
+        Documentation
+      </A>
+    </P>
+    <HR>
+    <ul>
+      <li><A HREF="edit/cust_main.cgi">New Customer</A>
+      <li><A NAME="search">Search</A>
+        <ul>
+        <LI><A HREF="search/cust_main.html">customers (by last name and/or company)</A>
+        <LI><A HREF="search/cust_main-payinfo.html">customers (by credit card number)</A>
+        <LI><A HREF="search/svc_acct.html">accounts (by username)</A>
+        <LI><A HREF="search/svc_domain.html">domains (by domain)</A>
+        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>
+        <LI><A HREF="search/cust_bill.html">invoices (by invoice number)</A>
+        </ul>
+      <li><A NAME="browse">Browse</A>
+        <ul>
+          <LI>customers (<A HREF="search/cust_main.cgi?custnum">by customer number</A>) (<A HREF="search/cust_main.cgi?last">by last name</A>) (<A HREF="search/cust_main.cgi?company">by company</A>)
+          <LI>invoices
+            <UL>
+              <LI>open invoices (<A HREF="search/cust_bill.cgi?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN_custnum">by customer number</A>)
+              <LI>30 day open invoices (<A HREF="search/cust_bill.cgi?OPEN30_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN30_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN30_custnum">by customer number</A>)
+              <LI>60 day open invoices (<A HREF="search/cust_bill.cgi?OPEN60_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN60_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN60_custnum">by customer number</A>)
+              <LI>90 day open invoices (<A HREF="search/cust_bill.cgi?OPEN90_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN90_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN90_custnum">by customer number</A>)
+              <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
+              <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
+            </UL>
+          <LI>packages
+            <UL>
+              <LI><A HREF="search/cust_pkg.cgi?pkgnum">packages (by package number)</A>
+              <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
+            </UL>
+          <LI>services
+            <UL>
+              <LI>accounts (<A HREF="search/svc_acct.cgi?svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?username">by username</A>) (<A HREF="search/svc_acct.cgi?uid">by uid</A>)
+              <LI>domains (<A HREF="search/svc_domain.cgi?svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?domain">by domain</A>)
+            </UL>
+          <LI>unlinked services
+            <UL>
+              <LI>unlinked accounts (<A HREF="search/svc_acct.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?UN_username">by username</A>) (<A HREF="search/svc_acct.cgi?UN_uid">by uid</A>)
+              <LI>unlinked domains (<A HREF="search/svc_domain.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?UN_domain">by domain</A>)
+            </UL>
+          <LI><A HREF="browse/nas.cgi">NAS ports</A>
+        </ul>
+      <li><A NAME="admin">Administration</a>
+        <ul>
+          <LI><A HREF="browse/part_svc.cgi">View/Edit service definitions</A>
+            - Services are items you offer to your customers.
+          <LI><A HREF="browse/part_pkg.cgi">View/Edit package definitions</A>
+            - One or more services are grouped together into a package and
+              given pricing information.  Customers purchase packages, not
+              services.
+          <LI><A HREF="browse/agent_type.cgi">View/Edit agent types</A>
+            - Agent types define groups of package definitions that you can
+              then assign to particular agents.
+          <LI><A HREF="browse/agent.cgi">View/Edit agents</A>
+            - Agents are resellers of your service.  Agents may be limited
+              to a subset of your full offerings (via their type).
+          <LI><A HREF="browse/part_referral.cgi">View/Edit referrals</A>
+            - Where a customer heard about your service.  Tracked for
+              informational purposes.
+          <LI><A HREF="browse/cust_main_county.cgi">View/Edit locales and tax rates</A>
+            - Change tax rates, or break down a country into states, or a state
+              into counties and assign different tax rates to each.
+          <LI><A HREF="browse/svc_acct_pop.cgi">View/Edit POPs</A>
+            - Points of Presence 
+        </ul>
+      </ul>
+  </BODY>
+</HTML>
diff --git a/httemplate/misc/bill.cgi b/httemplate/misc/bill.cgi
new file mode 100755
index 000000000..d09fc45dc
--- /dev/null
+++ b/httemplate/misc/bill.cgi
@@ -0,0 +1,62 @@
+<%
+#
+# $Id: bill.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# s/FS:Search/FS::Record/ and cgisuidsetup($cgi) ivan@sisd.com 98-mar-13
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: bill.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.5  1999/08/12 04:32:21  ivan
+# hidecancelledcustomers
+#
+# Revision 1.4  1999/01/19 05:14:02  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1998/12/23 03:01:13  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:41  ivan
+# s/CGI::(Request|Base)/CGI.pm/;
+#
+
+use strict;
+use vars qw( $cgi $query $custnum $cust_main $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl eidiot);
+use FS::Record qw(qsearchs);
+use FS::cust_main;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+#untaint custnum
+($query) = $cgi->keywords;
+$query =~ /^(\d*)$/;
+$custnum = $1;
+$cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
+die "Can't find customer!\n" unless $cust_main;
+
+$error = $cust_main->bill(
+#                          'time'=>$time
+                         );
+&eidiot($error) if $error;
+
+$error = $cust_main->collect(
+#                             'invoice-time'=>$time,
+#                             'batch_card'=> 'yes',
+                             'batch_card'=> 'no',
+                             'report_badcard'=> 'yes',
+                            );
+&eidiot($error) if $error;
+
+print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum");
+
+%>
diff --git a/httemplate/misc/cancel-unaudited.cgi b/httemplate/misc/cancel-unaudited.cgi
new file mode 100755
index 000000000..5bad5e737
--- /dev/null
+++ b/httemplate/misc/cancel-unaudited.cgi
@@ -0,0 +1,97 @@
+<%
+#
+# $Id: cancel-unaudited.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: cancel-unaudited.cgi svcnum
+#        http://server.name/path/cancel-unaudited.cgi pkgnum
+#
+# ivan@voicenet.com 97-apr-23
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-21
+#
+# Search->Record, cgisuidsetup($cgi) ivan@sids.com 98-mar-19
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cancel-unaudited.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.8  2001/04/09 23:05:16  ivan
+# Transactions Part I!!!
+#
+# Revision 1.7  2000/06/15 12:30:37  ivan
+# bugfix from Jeff Finucane, thanks!
+#
+# Revision 1.6  1999/02/28 00:03:48  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/02/07 09:59:34  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:14:03  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1998/12/23 03:02:05  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:42  ivan
+# s/CGI::(Request|Base)/CGI.pm/;
+#
+
+use strict;
+use vars qw( $cgi $query $svcnum $svc_acct $cust_svc $error $dbh );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl eidiot);
+use FS::Record qw(qsearchs);
+use FS::cust_svc;
+use FS::svc_acct;
+
+$cgi = new CGI;
+$dbh = &cgisuidsetup($cgi);
+ 
+#untaint svcnum
+($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+$svcnum = $1;
+
+$svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
+die "Unknown svcnum!" unless $svc_acct;
+
+$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+&eidiot(qq!This account has already been audited.  Cancel the 
+    <A HREF="!. popurl(2). qq!view/cust_pkg.cgi?! . $cust_svc->getfield('pkgnum') .
+    qq!pkgnum"> package</A> instead.!) 
+  if $cust_svc->pkgnum ne '' && $cust_svc->pkgnum ne '0';
+
+local $SIG{HUP} = 'IGNORE';
+local $SIG{INT} = 'IGNORE';
+local $SIG{QUIT} = 'IGNORE';
+local $SIG{TERM} = 'IGNORE';
+local $SIG{TSTP} = 'IGNORE';
+
+local $FS::UID::AutoCommit = 0;
+
+$error = $svc_acct->cancel;
+&myeidiot($error) if $error;
+$error = $svc_acct->delete;
+&myeidiot($error) if $error;
+
+$error = $cust_svc->delete;
+&myeidiot($error) if $error;
+
+$dbh->commit or die $dbh->errstr;
+
+print $cgi->redirect(popurl(2));
+
+sub myeidiot {
+  $dbh->rollback;
+  &eidiot(@_);
+}
+
+%>
diff --git a/httemplate/misc/cancel_pkg.cgi b/httemplate/misc/cancel_pkg.cgi
new file mode 100755
index 000000000..99a09bbe3
--- /dev/null
+++ b/httemplate/misc/cancel_pkg.cgi
@@ -0,0 +1,75 @@
+<%
+#
+# $Id: cancel_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: cancel_pkg.cgi pkgnum
+#        http://server.name/path/cancel_pkg.cgi pkgnum
+#
+# IT DOESN'T RUN THE APPROPRIATE PROGRAMS YET!!!!
+#
+# probably should generalize this to do cancels, suspensions, unsuspensions, etc.
+#
+# ivan@voicenet.com 97-jan-2
+#
+# still kludgy, but now runs /dbin/cancel $pkgnum
+# ivan@voicenet.com 97-feb-27
+#
+# doesn't run if pkgnum doesn't match regex
+# ivan@voicenet.com 97-mar-6
+#
+# now redirects to enter comments
+# ivan@voicenet.com 97-may-8
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-21
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cancel_pkg.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.6  1999/04/08 10:35:02  ivan
+# import necessary subroutines from FS::CGI
+#
+# Revision 1.5  1999/02/28 00:03:49  ivan
+# removed misleading comments
+#
+# Revision 1.4  1999/01/19 05:14:04  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1998/12/23 03:02:54  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:43  ivan
+# s/CGI::(Request|Base)/CGI.pm/;
+#
+
+use strict;
+use vars qw ( $cgi $query $pkgnum $cust_pkg $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(eidiot popurl);
+use FS::Record qw(qsearchs);
+use FS::CGI qw(popurl eidiot);
+use FS::cust_pkg;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+ 
+#untaint pkgnum
+($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ || die "Illegal pkgnum";
+$pkgnum = $1;
+
+$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+
+$error = $cust_pkg->cancel;
+eidiot($error) if $error;
+
+print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
+
+%>
diff --git a/httemplate/misc/delete-customer.cgi b/httemplate/misc/delete-customer.cgi
new file mode 100755
index 000000000..cb5fc76b5
--- /dev/null
+++ b/httemplate/misc/delete-customer.cgi
@@ -0,0 +1,62 @@
+<%
+#
+# $Id: delete-customer.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# $Log: delete-customer.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.1  1999/04/15 16:44:36  ivan
+# delete customers
+#
+
+use strict;
+use vars qw( $cgi $conf $query $custnum $new_custnum $cust_main );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl);
+use FS::Record qw(qsearch qsearchs);
+use FS::cust_main;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+die "Customer deletions not enabled" unless $conf->exists('deletecustomers');
+
+if ( $cgi->param('error') ) {
+  $custnum = $cgi->param('custnum');
+  $new_custnum = $cgi->param('new_custnum');
+} else {
+  ($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/ or die "Illegal query: $query";
+  $custnum = $1;
+  $new_custnum = '';
+}
+$cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } )
+  or die "Customer not found: $custnum";
+
+print $cgi->header ( '-expires' => 'now' ), header('Delete customer');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print 
+  qq!<form action="!, popurl(1), qq!process/delete-customer.cgi" method=post>!,
+  qq!<input type="hidden" name="custnum" value="$custnum">!;
+
+if ( qsearch('cust_pkg', { 'custnum' => $custnum, 'cancel' => '' } ) ) {
+  print "Move uncancelled packages to customer number ",
+        qq!<input type="text" name="new_custnum" value="$new_custnum"><br><br>!;
+}
+
+print <<END;
+This will <b>completely remove</b> all traces of this customer record.
+<br>Are you <b>absolutely sure</b> you want to delete this customer?
+<br><input type="submit" value="Yes">
+</form></body></html>
+END
+
+%>
diff --git a/httemplate/misc/expire_pkg.cgi b/httemplate/misc/expire_pkg.cgi
new file mode 100755
index 000000000..7afa94267
--- /dev/null
+++ b/httemplate/misc/expire_pkg.cgi
@@ -0,0 +1,65 @@
+<%
+#
+# $Id: expire_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/expire_pkg.cgi
+#
+# based on susp_pkg
+# ivan@voicenet.com 97-jul-29
+#
+# ivan@sisd.com 98-mar-17 FS::Search->FS::Record
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+# 
+# $Log: expire_pkg.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.4  1999/02/28 00:03:50  ivan
+# removed misleading comments
+#
+# Revision 1.3  1999/01/19 05:14:05  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.2  1998/12/17 09:12:44  ivan
+# s/CGI::(Request|Base)/CGI.pm/;
+#
+
+use strict;
+use vars qw ( $cgi $date $pkgnum $cust_pkg %hash $new $error );
+use Date::Parse;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl eidiot);
+use FS::Record qw(qsearchs);
+use FS::cust_pkg;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+#untaint date & pkgnum
+
+if ( $cgi->param('date') ) {
+  str2time($cgi->param('date')) =~ /^(\d+)$/ or die "Illegal date";
+  $date=$1;
+} else {
+  $date='';
+}
+
+$cgi->param('pkgnum') =~ /^(\d+)$/ or die "Illegal pkgnum";
+$pkgnum = $1;
+
+$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+%hash = $cust_pkg->hash;
+$hash{expire}=$date;
+$new = new FS::cust_pkg ( \%hash );
+$error = $new->replace($cust_pkg);
+&eidiot($error) if $error;
+
+print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
+
+%>
diff --git a/httemplate/misc/link.cgi b/httemplate/misc/link.cgi
new file mode 100755
index 000000000..fee02ddb7
--- /dev/null
+++ b/httemplate/misc/link.cgi
@@ -0,0 +1,89 @@
+<%
+#
+# $Id: link.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@voicenet.com 97-feb-5
+#
+# rewrite ivan@sisd.com 98-mar-17
+#
+# can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
+#
+# $Log: link.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  1999/04/08 11:31:40  ivan
+# *** empty log message ***
+#
+# Revision 1.6  1999/02/28 00:03:51  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/01/19 05:14:06  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:36  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/23 03:03:39  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:45  ivan
+# s/CGI::(Request|Base)/CGI.pm/;
+#
+
+use strict;
+use vars qw ( %link_field $cgi $pkgnum $svcpart $query $part_svc $svc $svcdb 
+              $link_field );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl header);
+use FS::Record qw(qsearchs);
+
+%link_field = (
+  'svc_acct'    => 'username',
+  'svc_domain'  => 'domain',
+  'svc_acct_sm' => '',
+  'svc_charge'  => '',
+  'svc_wo'      => '',
+);
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+($query) = $cgi->keywords;
+foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
+  $pkgnum=$1 if /^pkgnum(\d+)$/;
+  $svcpart=$1 if /^svcpart(\d+)$/;
+}
+
+$part_svc = qsearchs('part_svc',{'svcpart'=>$svcpart});
+$svc = $part_svc->getfield('svc');
+$svcdb = $part_svc->getfield('svcdb');
+$link_field = $link_field{$svcdb};
+
+print $cgi->header( '-expires' => 'now' ), header("Link to existing $svc"),
+      qq!<FORM ACTION="!, popurl(1), qq!process/link.cgi" METHOD=POST>!;
+
+if ( $link_field ) { 
+  print <<END;
+  <INPUT TYPE="hidden" NAME="svcnum" VALUE="">
+  <INPUT TYPE="hidden" NAME="link_field" VALUE="$link_field">
+  $link_field of existing service: <INPUT TYPE="text" NAME="link_value">
+END
+} else {
+  print qq!Service # of existing service: <INPUT TYPE="text" NAME="svcnum" VALUE="">!;
+}
+
+print <<END;
+<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
+<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
+<P><CENTER><INPUT TYPE="submit" VALUE="Link"></CENTER>
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/misc/print-invoice.cgi b/httemplate/misc/print-invoice.cgi
new file mode 100755
index 000000000..1d35bc0f2
--- /dev/null
+++ b/httemplate/misc/print-invoice.cgi
@@ -0,0 +1,55 @@
+<%
+#
+# $Id: print-invoice.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# just a kludge for now, since this duplicates in a way it shouldn't stuff from
+# Bill.pm (like $lpr) ivan@sisd.com 98-jun-16
+#
+# $Log: print-invoice.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.4  1999/01/19 05:14:07  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1998/12/23 03:04:24  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:47  ivan
+# s/CGI::(Request|Base)/CGI.pm/;
+#
+
+use strict;
+use vars qw($conf $cgi $lpr $query $invnum $cust_bill $custnum );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl);
+use FS::Record qw(qsearchs);
+use FS::cust_bill;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+$lpr = $conf->config('lpr');
+
+#untaint invnum
+($query) = $cgi->keywords;
+$query =~ /^(\d*)$/;
+$invnum = $1;
+$cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
+die "Can't find invoice!\n" unless $cust_bill;
+
+        open(LPR,"|$lpr") or die "Can't open $lpr: $!";
+        print LPR $cust_bill->print_text; #( date )
+        close LPR
+          or die $! ? "Error closing $lpr: $!"
+                       : "Exit status $? from $lpr";
+
+$custnum = $cust_bill->getfield('custnum');
+
+print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum#history");
+
+%>
diff --git a/httemplate/misc/process/delete-customer.cgi b/httemplate/misc/process/delete-customer.cgi
new file mode 100755
index 000000000..b15ffef17
--- /dev/null
+++ b/httemplate/misc/process/delete-customer.cgi
@@ -0,0 +1,50 @@
+<%
+#
+# $Id: delete-customer.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# $Log: delete-customer.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.1  1999/04/15 16:44:36  ivan
+# delete customers
+#
+
+use strict;
+use vars qw ( $cgi $conf $custnum $new_custnum $cust_main $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+use FS::CGI qw(popurl);
+use FS::cust_main;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+die "Customer deletions not enabled" unless $conf->exists('deletecustomers');
+
+$cgi->param('custnum') =~ /^(\d+)$/;
+$custnum = $1;
+if ( $cgi->param('new_custnum') ) {
+  $cgi->param('new_custnum') =~ /^(\d+)$/
+    or die "Illegal new customer number: ". $cgi->param('new_custnum');
+  $new_custnum = $1;
+} else {
+  $new_custnum = '';
+}
+$cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } )
+  or die "Customer not found: $custnum";
+
+$error = $cust_main->delete($new_custnum);
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "delete-customer.cgi?". $cgi->query_string );
+} elsif ( $new_custnum ) {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$new_custnum");
+} else {
+  print $cgi->redirect(popurl(3));
+}
+%>
diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
new file mode 100755
index 000000000..94afa289a
--- /dev/null
+++ b/httemplate/misc/process/link.cgi
@@ -0,0 +1,80 @@
+<%
+#
+# $Id: link.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@voicenet.com 97-feb-5
+#
+# rewrite ivan@sisd.com 98-mar-18
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
+#
+# $Log: link.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.6  2000/07/17 17:59:33  ivan
+# oops
+#
+# Revision 1.5  1999/04/15 14:09:17  ivan
+# get rid of top-level my() variables
+#
+# Revision 1.4  1999/02/07 09:59:35  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.3  1999/01/19 05:14:10  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.2  1998/12/17 09:15:00  ivan
+# s/CGI::Request/CGI.pm/;
+#
+
+use strict;
+use vars qw ( $cgi $old $new $error $pkgnum $svcpart $svcnum );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::CGI qw(popurl idiot eidiot);
+use FS::UID qw(cgisuidsetup);
+use FS::cust_svc;
+use FS::Record qw(qsearchs);
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$cgi->param('pkgnum') =~ /^(\d+)$/;
+$pkgnum = $1;
+$cgi->param('svcpart') =~ /^(\d+)$/;
+$svcpart = $1;
+$cgi->param('svcnum') =~ /^(\d*)$/;
+$svcnum = $1;
+
+unless ( $svcnum ) {
+  my($part_svc) = qsearchs('part_svc',{'svcpart'=>$svcpart});
+  my($svcdb) = $part_svc->getfield('svcdb');
+  $cgi->param('link_field') =~ /^(\w+)$/; my($link_field)=$1;
+  my($svc_acct)=qsearchs($svcdb,{$link_field => $cgi->param('link_value') });
+  eidiot("$link_field not found!") unless $svc_acct;
+  $svcnum=$svc_acct->svcnum;
+}
+
+$old = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+die "svcnum not found!" unless $old;
+$new = new FS::cust_svc ({
+  'svcnum' => $svcnum,
+  'pkgnum' => $pkgnum,
+  'svcpart' => $svcpart,
+});
+
+$error = $new->replace($old);
+
+unless ($error) {
+  #no errors, so let's view this customer.
+  print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?$pkgnum");
+} else {
+  idiot($error);
+}
+
+%>
diff --git a/httemplate/misc/susp_pkg.cgi b/httemplate/misc/susp_pkg.cgi
new file mode 100755
index 000000000..52e3ce788
--- /dev/null
+++ b/httemplate/misc/susp_pkg.cgi
@@ -0,0 +1,68 @@
+<%
+#
+# $Id: susp_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: susp_pkg.cgi pkgnum
+#        http://server.name/path/susp_pkg.cgi pkgnum
+#
+# probably should generalize this to do cancels, suspensions, unsuspensions, etc.
+#
+# ivan@voicenet.com 97-feb-27
+#
+# now redirects to enter comments
+# ivan@voicenet.com 97-may-8
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-21
+#
+# FS::Search -> FS::Record ivan@sisd.com 98-mar-17
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: susp_pkg.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.6  1999/04/08 10:35:02  ivan
+# import necessary subroutines from FS::CGI
+#
+# Revision 1.5  1999/02/28 00:03:52  ivan
+# removed misleading comments
+#
+# Revision 1.4  1999/01/19 05:14:08  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1998/12/23 03:04:56  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:48  ivan
+# s/CGI::(Request|Base)/CGI.pm/;
+#
+
+use strict;
+use vars qw( $cgi $query $pkgnum $cust_pkg $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs);
+use FS::CGI qw(popurl eidiot);
+use FS::cust_pkg;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+ 
+#untaint pkgnum
+($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ || die "Illegal pkgnum";
+$pkgnum = $1;
+
+$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+
+$error = $cust_pkg->suspend;
+&eidiot($error) if $error;
+
+print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
+
+%>
diff --git a/httemplate/misc/unsusp_pkg.cgi b/httemplate/misc/unsusp_pkg.cgi
new file mode 100755
index 000000000..d7d651b6d
--- /dev/null
+++ b/httemplate/misc/unsusp_pkg.cgi
@@ -0,0 +1,65 @@
+<%
+#
+# $Id: unsusp_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: susp_pkg.cgi pkgnum
+#        http://server.name/path/susp_pkg.cgi pkgnum
+#
+# probably should generalize this to do cancels, suspensions, unsuspensions, etc.
+#
+# ivan@voicenet.com 97-feb-27
+#
+# now redirects to enter comments
+# ivan@voicenet.com 97-may-8
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-21
+#
+# FS::Search -> FS::Record ivan@sisd.com 98-mar-17
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: unsusp_pkg.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.5  1999/02/28 00:03:53  ivan
+# removed misleading comments
+#
+# Revision 1.4  1999/01/19 05:14:09  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1998/12/23 03:05:25  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:49  ivan
+# s/CGI::(Request|Base)/CGI.pm/;
+#
+
+use strict;
+use vars qw( $cgi $query $pkgnum $cust_pkg $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl eidiot);
+use FS::Record qw(qsearchs);
+use FS::cust_pkg;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+ 
+#untaint pkgnum
+($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ || die "Illegal pkgnum";
+$pkgnum = $1;
+
+$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+
+$error = $cust_pkg->unsuspend;
+&eidiot($error) if $error;
+
+print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
+
+%>
diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
new file mode 100755
index 000000000..5550b5513
--- /dev/null
+++ b/httemplate/search/cust_bill.cgi
@@ -0,0 +1,180 @@
+<%
+#
+# $Id: cust_bill.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/cust_bill.cgi
+#
+# ivan@voicenet.com 97-apr-4
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cust_bill.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.6  2001/04/22 01:38:39  ivan
+# svc_domain needs to import dbh sub from Record
+# view/cust_main.cgi needs to use ->owed method, not check (depriciated) owed field
+# search/cust_bill.cgi redirect error when there's only one invoice
+#
+# Revision 1.5  2000/07/17 16:45:41  ivan
+# first shot at invoice browsing and some other cleanups
+#
+# Revision 1.4  1999/02/28 00:03:54  ivan
+# removed misleading comments
+#
+# Revision 1.3  1999/01/19 05:14:11  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.2  1998/12/17 09:41:07  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+
+use strict;
+use vars qw ( $cgi $invnum $query $sortby @cust_bill );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use Date::Format;
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl header menubar eidiot table );
+use FS::Record qw(qsearch qsearchs);
+use FS::cust_bill;
+use FS::cust_main;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+if ( $cgi->keywords ) {
+  my($query) = $cgi->keywords;
+  if ( $query eq 'invnum' ) {
+    $sortby = \*invnum_sort;
+    @cust_bill = qsearch('cust_bill', {} );
+  } elsif ( $query eq 'date' ) {
+    $sortby = \*date_sort;
+    @cust_bill = qsearch('cust_bill', {} );
+  } elsif ( $query eq 'custnum' ) {
+    $sortby = \*custnum_sort;
+    @cust_bill = qsearch('cust_bill', {} );
+  } elsif ( $query eq 'OPEN_invnum' ) {
+    $sortby = \*invnum_sort;
+    @cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+  } elsif ( $query eq 'OPEN_date' ) {
+    $sortby = \*date_sort;
+    @cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+  } elsif ( $query eq 'OPEN_custnum' ) {
+    $sortby = \*custnum_sort;
+    @cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+  } elsif ( $query =~ /^OPEN(\d+)_invnum$/ ) {
+    my $open = $1 * 86400;
+    $sortby = \*invnum_sort;
+    @cust_bill =
+      grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+  } elsif ( $query =~ /^OPEN(\d+)_date$/ ) {
+    my $open = $1 * 86400;
+    $sortby = \*date_sort;
+    @cust_bill =
+      grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+  } elsif ( $query =~ /^OPEN(\d+)_custnum$/ ) {
+    my $open = $1 * 86400;
+    $sortby = \*custnum_sort;
+    @cust_bill =
+      grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+  } else {
+    die "unknown query string $query";
+  }
+} else {
+  $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
+  $invnum = $2;
+  @cust_bill = qsearchs('cust_bill', { 'invnum' => $invnum } );
+  $sortby = \*invnum_sort;
+}
+
+if ( scalar(@cust_bill) == 1 ) {
+  my $invnum = $cust_bill[0]->invnum;
+  print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
+} elsif ( scalar(@cust_bill) == 0 ) {
+  eidiot("Invoice not found.");
+} else {
+  my $total = scalar(@cust_bill);
+  print $cgi->header( '-expires' => 'now' ),
+        &header("Invoice Search Results", menubar(
+          'Main Menu', popurl(2)
+        )), "$total matching invoices found<BR>", &table(), <<END;
+      <TR>
+        <TH></TH>
+        <TH>Balance</TH>
+        <TH>Amount</TH>
+        <TH>Date</TH>
+        <TH>Contact name</TH>
+        <TH>Company</TH>
+      </TR>
+END
+
+  my(%saw, $cust_bill);
+  foreach $cust_bill (
+    sort $sortby grep(!$saw{$_->invnum}++, @cust_bill)
+  ) {
+    my($invnum, $owed, $charged, $date ) = (
+      $cust_bill->invnum,
+      $cust_bill->owed,
+      $cust_bill->charged,
+      $cust_bill->_date,
+    );
+    my $pdate = time2str("%b %d %Y", $date);
+
+    my $rowspan = 1;
+
+    my $view = popurl(2). "view/cust_bill.cgi?$invnum";
+    print <<END;
+      <TR>
+        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$invnum</FONT></A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>\$$owed</FONT></A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>\$$charged</FONT></A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$pdate</FONT></A></TD>
+END
+    my $custnum = $cust_bill->custnum;
+    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
+    if ( $cust_main ) {
+      my $cview = popurl(2). "view/cust_main.cgi?". $cust_main->custnum;
+      my ( $name, $company ) = (
+        $cust_main->last. ', '. $cust_main->first,
+        $cust_main->company,
+      );
+      print <<END;
+        <TD ROWSPAN=$rowspan><A HREF="$cview"><FONT SIZE=-1>$name</FONT></A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$cview"><FONT SIZE=-1>$company</FONT></A></TD>
+END
+    } else {
+      print <<END
+        <TD ROWSPAN=$rowspan COLSPAN=2>WARNING: couldn't find cust_main.custnum $custnum (cust_bill.invnum $invnum)</TD>
+END
+    }
+
+    print "</TR>";
+  }
+
+  print <<END;
+    </TABLE>
+  </BODY>
+</HTML>
+END
+
+}
+
+#
+
+sub invnum_sort {
+  $a->invnum <=> $b->invnum;
+}
+
+sub custnum_sort {
+  $a->custnum <=> $b->custnum || $a->invnum <=> $b->invnum;
+}
+
+sub date_sort {
+  $a->_date <=> $b->_date || $a->invnum <=> $b->invnum;
+}
+%>
diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
new file mode 100755
index 000000000..4adb40e4a
--- /dev/null
+++ b/httemplate/search/cust_bill.html
@@ -0,0 +1,21 @@
+<HTML>
+  <HEAD>
+    <TITLE>Invoice Search</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+      <H1>Invoice Search</H1>
+    </CENTER>
+    <HR>
+    <FORM ACTION="cust_bill.cgi" METHOD="post">
+      Search for <B>invoice #</B>: 
+      <INPUT TYPE="text" NAME="invnum">
+
+      <P><INPUT TYPE="submit" VALUE="Search">
+
+    </FORM>
+
+  <HR>
+  </BODY>
+</HTML>
+
diff --git a/httemplate/search/cust_main-payinfo.html b/httemplate/search/cust_main-payinfo.html
new file mode 100755
index 000000000..47bb83cbd
--- /dev/null
+++ b/httemplate/search/cust_main-payinfo.html
@@ -0,0 +1,20 @@
+<HTML>
+  <HEAD>
+    <TITLE>Customer Search</TITLE>
+  </HEAD>
+  <BODY BGCOLOR="#ffffff">
+    <FONT COLOR="#ff0000" SIZE=7>
+      Customer Search
+    </FONT>
+    <BR>
+    <FORM ACTION="cust_main.cgi" METHOD="post">
+      Search for <B>Credit card #</B>: 
+      <INPUT TYPE="hidden" NAME="card_on" VALUE="TRUE">
+      <INPUT TYPE="text" NAME="card">
+
+      <P><INPUT TYPE="submit" VALUE="Search">
+
+    </FORM>
+  </BODY>
+</HTML>
+
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
new file mode 100755
index 000000000..844bb98b8
--- /dev/null
+++ b/httemplate/search/cust_main.cgi
@@ -0,0 +1,315 @@
+<%
+#
+# $Id: cust_main.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/cust_main.cgi
+#
+# ivan@voicenet.com 96-dec-12
+#
+# rewrite ivan@sisd.com 98-mar-4
+#
+# now does browsing too ivan@sisd.com 98-mar-6
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# display total, use FS::CGI ivan@sisd.com 98-jul-17
+#
+# $Log: cust_main.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.17  2001/04/23 16:07:54  ivan
+# fix
+# Insecure dependency in eval while running with -T switch at /usr/local/lib/site_perl/FS/Record.pm line 202.
+#
+# Revision 1.16  2001/02/07 19:45:45  ivan
+# tyop
+#
+# Revision 1.15  2000/07/17 16:45:41  ivan
+# first shot at invoice browsing and some other cleanups
+#
+# Revision 1.14  1999/08/12 04:45:21  ivan
+# typo - missed a paren
+#
+# Revision 1.13  1999/08/12 04:32:21  ivan
+# hidecancelledcustomers
+#
+# Revision 1.12  1999/07/17 10:38:52  ivan
+# scott nelson <scott@ultimanet.com> noticed this mod_perl-triggered bug and
+# gave me a great bugreport at the last rhythmethod
+#
+# Revision 1.11  1999/04/09 04:22:34  ivan
+# also table()
+#
+# Revision 1.10  1999/04/09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.9  1999/02/28 00:03:55  ivan
+# removed misleading comments
+#
+# Revision 1.8  1999/02/07 09:59:36  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.7  1999/01/25 12:19:11  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.6  1999/01/19 05:14:12  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:37  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/30 00:57:50  ivan
+# bug
+#
+# Revision 1.3  1998/12/17 09:41:08  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+# Revision 1.2  1998/11/12 08:10:22  ivan
+# CGI.pm instead of CGI-modules
+# relative URLs using popurl
+# got rid of lots of little tables
+# s/agrep/String::Approx/;
+# bubble up packages and services and link (slow)
+#
+
+use strict;
+#use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
+use vars qw( $conf %all_pkgs $cgi @cust_main $sortby );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use IO::Handle;
+use String::Approx qw(amatch);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header menubar eidiot popurl table);
+use FS::cust_main;
+use FS::cust_svc;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+
+if ( $cgi->keywords ) {
+  my($query)=$cgi->keywords;
+  if ( $query eq 'custnum' ) {
+    $sortby=\*custnum_sort;
+    @cust_main=qsearch('cust_main',{});  
+  } elsif ( $query eq 'last' ) {
+    $sortby=\*last_sort;
+    @cust_main=qsearch('cust_main',{});  
+  } elsif ( $query eq 'company' ) {
+    $sortby=\*company_sort;
+    @cust_main=qsearch('cust_main',{});
+  } else {
+    die "unknown query string $query";
+  }
+} else {
+  @cust_main=();
+  &cardsearch if ( $cgi->param('card_on') && $cgi->param('card') );
+  &lastsearch if ( $cgi->param('last_on') && $cgi->param('last_text') );
+  &companysearch if ( $cgi->param('company_on') && $cgi->param('company_text') );
+}
+
+@cust_main = grep { $_->ncancelled_pkgs || ! $_->all_pkgs } @cust_main
+  if $conf->exists('hidecancelledcustomers');
+if ( $conf->exists('hidecancelledpackages' ) ) {
+  %all_pkgs = map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
+} else {
+  %all_pkgs = map { $_->custnum => [ $_->all_pkgs ] } @cust_main;
+}
+
+if ( scalar(@cust_main) == 1 ) {
+  print $cgi->redirect(popurl(2). "view/cust_main.cgi?". $cust_main[0]->custnum);
+  exit;
+} elsif ( scalar(@cust_main) == 0 ) {
+  eidiot "No matching customers found!\n";
+} else { 
+
+  my($total)=scalar(@cust_main);
+  print $cgi->header( '-expires' => 'now' ), header("Customer Search Results",menubar(
+    'Main Menu', popurl(2)
+  )), "$total matching customers found<BR>", &table(), <<END;
+      <TR>
+        <TH></TH>
+        <TH>Contact name</TH>
+        <TH>Company</TH>
+        <TH>Packages</TH>
+        <TH COLSPAN=2>Services</TH>
+      </TR>
+END
+
+  my(%saw,$cust_main);
+  foreach $cust_main (
+    sort $sortby grep(!$saw{$_->custnum}++, @cust_main)
+  ) {
+    my($custnum,$last,$first,$company)=(
+      $cust_main->custnum,
+      $cust_main->getfield('last'),
+      $cust_main->getfield('first'),
+      $cust_main->company,
+    );
+
+    my(@lol_cust_svc);
+    my($rowspan)=0;#scalar( @{$all_pkgs{$custnum}} );
+    foreach ( @{$all_pkgs{$custnum}} ) {
+      my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
+      push @lol_cust_svc, \@cust_svc;
+      $rowspan += scalar(@cust_svc) || 1;
+    }
+
+    #my($rowspan) = scalar(@{$all_pkgs{$custnum}});
+    my($view) = popurl(2). "view/cust_main.cgi?$custnum";
+    print <<END;
+    <TR>
+      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$custnum</FONT></A></TD>
+      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$last, $first</FONT></A></TD>
+      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$company</FONT></A></TD>
+END
+
+    my($n1)='';
+    foreach ( @{$all_pkgs{$custnum}} ) {
+      my($pkgnum) = ($_->pkgnum);
+      my($pkg) = $_->part_pkg->pkg;
+      my $comment = $_->part_pkg->comment;
+      my($pkgview) = popurl(2). "/view/cust_pkg.cgi?$pkgnum";
+      #my(@cust_svc) = shift @lol_cust_svc;
+      my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
+      my($rowspan) = scalar(@cust_svc) || 1;
+
+      print $n1, qq!<TD ROWSPAN=$rowspan><A HREF="$pkgview"><FONT SIZE=-1>$pkg - $comment</FONT></A></TD>!;
+      my($n2)='';
+      foreach my $cust_svc ( @cust_svc ) {
+         my($label, $value, $svcdb) = $cust_svc->label;
+         my($svcnum) = $cust_svc->svcnum;
+         my($sview) = popurl(2). "/view";
+         print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
+               qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
+         $n2="</TR><TR>";
+      }
+      #print qq!</TR><TR>\n!;
+      $n1="</TR><TR>";
+    }
+    print "</TR>";
+  }
+ 
+  print <<END;
+    </TABLE>
+  </BODY>
+</HTML>
+END
+
+}
+
+#
+
+sub last_sort {
+  $a->getfield('last') cmp $b->getfield('last');
+}
+
+sub company_sort {
+  return -1 if $a->company && ! $b->company;
+  return 1 if ! $a->company && $b->company;
+  $a->getfield('company') cmp $b->getfield('company');
+}
+
+sub custnum_sort {
+  $a->getfield('custnum') <=> $b->getfield('custnum');
+}
+
+sub cardsearch {
+
+  my($card)=$cgi->param('card');
+  $card =~ s/\D//g;
+  $card =~ /^(\d{13,16})$/ or eidiot "Illegal card number\n";
+  my($payinfo)=$1;
+
+  push @cust_main, qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'CARD'});
+
+}
+
+sub lastsearch {
+  my(%last_type);
+  foreach ( $cgi->param('last_type') ) {
+    $last_type{$_}++;
+  }
+
+  $cgi->param('last_text') =~ /^([\w \,\.\-\']*)$/
+    or eidiot "Illegal last name";
+  my($last)=$1;
+
+  if ( $last_type{'Exact'}
+       && ! $last_type{'Fuzzy'} 
+     #  && ! $last_type{'Sound-alike'}
+  ) {
+
+    push @cust_main, qsearch('cust_main',{'last'=>$last});
+
+  } else {
+
+    my(%last);
+
+    my(@all_last)=map $_->getfield('last'), qsearch('cust_main',{});
+    if ($last_type{'Fuzzy'}) { 
+      foreach ( amatch($last, [ qw(i) ], @all_last) ) {
+        $last{$_}++; 
+      }
+    }
+
+    #if ($last_type{'Sound-alike'}) {
+    #}
+
+    foreach ( keys %last ) {
+      push @cust_main, qsearch('cust_main',{'last'=>$_});
+    }
+
+  }
+  $sortby=\*last_sort;
+}
+
+sub companysearch {
+
+  my(%company_type);
+  foreach ( $cgi->param('company_type') ) {
+    $company_type{$_}++ 
+  };
+
+  $cgi->param('company_text') =~ /^([\w \,\.\-\']*)$/
+    or eidiot "Illegal company";
+  my($company)=$1;
+
+  if ( $company_type{'Exact'}
+       && ! $company_type{'Fuzzy'} 
+     #  && ! $company_type{'Sound-alike'}
+  ) {
+
+    push @cust_main, qsearch('cust_main',{'company'=>$company});
+
+  } else {
+
+    my(%company);
+    my(@all_company)=map $_->company, qsearch('cust_main',{});
+
+    if ($company_type{'Fuzzy'}) { 
+      foreach ( amatch($company, [ qw(i) ], @all_company ) ) {
+        $company{$_}++;
+      }
+    }
+
+    #if ($company_type{'Sound-alike'}) {
+    #}
+
+    foreach ( keys %company ) {
+      push @cust_main, qsearch('cust_main',{'company'=>$_});
+    }
+
+  }
+  $sortby=\*company_sort;
+
+}
+%>
diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html
new file mode 100755
index 000000000..3184698b4
--- /dev/null
+++ b/httemplate/search/cust_main.html
@@ -0,0 +1,36 @@
+<HTML>
+  <HEAD>
+    <TITLE>Customer Search</TITLE>
+  </HEAD>
+  <BODY BGCOLOR="#ffffff">
+    <FONT COLOR="#ff0000" SIZE=7>
+      Customer Search
+    </FONT>
+    <BR>
+    <FORM ACTION="cust_main.cgi" METHOD="post">
+      <INPUT TYPE="checkbox" NAME="last_on" CHECKED> Search for <B>last name</B>: 
+      <INPUT TYPE="text" NAME="last_text">
+      using search method: <SELECT NAME="last_type">
+        <OPTION SELECTED>Fuzzy
+        <OPTION>Exact
+      </SELECT>
+
+      <P><INPUT TYPE="checkbox" NAME="company_on" CHECKED> Search for <B>company</B>: 
+      <INPUT TYPE="text" NAME="company_text">
+      using search methods: <SELECT NAME="company_type">
+        <OPTION SELECTED>Fuzzy
+        <OPTION>Exact
+      </SELECT>
+
+      <P><INPUT TYPE="submit" VALUE="Search"> Note: Fuzzy searching can take a while.  Please be patient.
+
+    </FORM>
+
+  <HR>Explanation of search methods:
+  <UL>
+    <LI><B>Fuzzy</B> - Searches for matches that are close to your text.
+    <LI><B>Exact</B> - Finds exact matches only, but much faster than the other search methods.
+  </UL>
+  </BODY>
+</HTML>
+
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
new file mode 100755
index 000000000..d63d2d188
--- /dev/null
+++ b/httemplate/search/cust_pkg.cgi
@@ -0,0 +1,155 @@
+<%
+#
+# $Id: cust_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
+#
+# $Log: cust_pkg.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.11  2000/07/17 16:45:41  ivan
+# first shot at invoice browsing and some other cleanups
+#
+# Revision 1.10  2000/07/17 12:49:29  ivan
+# better error message if a package isn't linked to a customer (that shouldn't happen)
+#
+# Revision 1.9  1999/07/17 10:38:52  ivan
+# scott nelson <scott@ultimanet.com> noticed this mod_perl-triggered bug and
+# gave me a great bugreport at the last rhythmethod
+#
+# Revision 1.8  1999/02/09 09:22:57  ivan
+# visual and bugfixes
+#
+# Revision 1.7  1999/02/07 09:59:37  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.6  1999/01/19 05:14:13  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:38  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1999/01/18 09:22:33  ivan
+# changes to track email addresses for email invoicing
+#
+# Revision 1.3  1998/12/23 03:05:59  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:41:09  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+
+use strict;
+use vars qw ( $cgi @cust_pkg $sortby $query );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header eidiot popurl);
+use FS::cust_pkg;
+use FS::pkg_svc;
+use FS::cust_svc;
+use FS::cust_main;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+($query) = $cgi->keywords;
+#this tree is a little bit redundant
+if ( $query eq 'pkgnum' ) {
+  $sortby=\*pkgnum_sort;
+  @cust_pkg=qsearch('cust_pkg',{});
+} elsif ( $query eq 'APKG_pkgnum' ) {
+  $sortby=\*pkgnum_sort;
+  @cust_pkg=();
+  #perhaps this should go in cust_pkg as a qsearch-like constructor?
+  my($cust_pkg);
+  foreach $cust_pkg (qsearch('cust_pkg',{})) {
+    my($flag)=0;
+    my($pkg_svc);
+    PKG_SVC: 
+    foreach $pkg_svc (qsearch('pkg_svc',{ 'pkgpart' => $cust_pkg->pkgpart })) {
+      if ( $pkg_svc->quantity 
+           > scalar(qsearch('cust_svc',{
+               'pkgnum' => $cust_pkg->pkgnum,
+               'svcpart' => $pkg_svc->svcpart,
+             }))
+         )
+      {
+        $flag=1;
+        last PKG_SVC;
+      }
+    }
+    push @cust_pkg, $cust_pkg if $flag;
+  }
+} else {
+  die "Empty QUERY_STRING!";
+}
+
+if ( scalar(@cust_pkg) == 1 ) {
+  my($pkgnum)=$cust_pkg[0]->pkgnum;
+  print $cgi->redirect(popurl(2). "view/cust_pkg.cgi?$pkgnum");
+  exit;
+} elsif ( scalar(@cust_pkg) == 0 ) { #error
+  eidiot("No packages found");
+} else {
+  my($total)=scalar(@cust_pkg);
+  print $cgi->header( '-expires' => 'now' ), header('Package Search Results',''), <<END;
+    $total matching packages found
+    <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
+      <TR>
+        <TH>Package #</TH>
+        <TH>Customer #</TH>
+        <TH>Contact name</TH>
+        <TH>Company</TH>
+      </TR>
+END
+
+  my(%saw,$cust_pkg);
+  foreach $cust_pkg (
+    sort $sortby grep(!$saw{$_->pkgnum}++, @cust_pkg)
+  ) {
+    my($cust_main)=qsearchs('cust_main',{'custnum'=>$cust_pkg->custnum});
+    my($pkgnum,$custnum,$name,$company)=(
+      $cust_pkg->pkgnum,
+      $cust_pkg->custnum,
+      $cust_main ? $cust_main->last. ', '. $cust_main->first : '',
+      $cust_main ? $cust_main->company : '',
+    );
+    my $p = popurl(2);
+    print <<END;
+    <TR>
+      <TD><A HREF="${p}view/cust_pkg.cgi?$pkgnum"><FONT SIZE=-1>$pkgnum</FONT></A></TD>
+END
+    if ( $cust_main ) {
+      print <<END;
+      <TD><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$custnum</A></FONT></TD>
+      <TD><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$name</A></FONT></TD>
+      <TD><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$company</A></FONT></TD>
+    </TR>
+END
+    } else {
+      print <<END;
+      <TD COLSPAN=3>WARNING: couldn't find cust_main.custnum $custnum (cust_pkg.pkgnum $pkgnum)</TD>
+    </TR>
+END
+    }
+  }
+ 
+  print <<END;
+    </TABLE>
+  </BODY>
+</HTML>
+END
+  exit;
+
+}
+
+sub pkgnum_sort {
+  $a->getfield('pkgnum') <=> $b->getfield('pkgnum');
+}
+
+%>
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
new file mode 100755
index 000000000..15f74ac20
--- /dev/null
+++ b/httemplate/search/svc_acct.cgi
@@ -0,0 +1,211 @@
+<%
+#
+# $Id: svc_acct.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/svc_acct.cgi
+#
+# Note: Should be run setuid freeside as user nobody.
+#
+# loosely (sp?) based on search/cust_main.cgi
+#
+# ivan@voicenet.com 96-jan-3 -> 96-jan-4
+#
+# rewrite (now does browsing too) ivan@sisd.com 98-mar-9
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# show unlinked accounts ivan@sisd.com 98-jun-22
+#
+# use FS::CGI, show total ivan@sisd.com 98-jul-17
+#
+# give service and customer info too ivan@sisd.com 98-aug-16
+#
+# $Log: svc_acct.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.11  1999/04/14 11:25:33  ivan
+# *** empty log message ***
+#
+# Revision 1.10  1999/04/14 11:20:21  ivan
+# visual fix
+#
+# Revision 1.9  1999/04/10 01:53:18  ivan
+# oops, search usernames limited to 8 chars
+#
+# Revision 1.8  1999/04/09 23:43:29  ivan
+# just in case
+#
+# Revision 1.7  1999/02/07 09:59:38  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.6  1999/01/19 05:14:14  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:39  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1999/01/18 09:22:34  ivan
+# changes to track email addresses for email invoicing
+#
+# Revision 1.3  1998/12/23 03:06:28  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:41:10  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+
+use strict;
+use vars qw( $cgi @svc_acct $sortby $query );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header eidiot popurl table);
+use FS::svc_acct;
+use FS::cust_main;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+($query)=$cgi->keywords;
+$query ||= ''; #to avoid use of unitialized value errors
+#this tree is a little bit redundant
+if ( $query eq 'svcnum' ) {
+  $sortby=\*svcnum_sort;
+  @svc_acct=qsearch('svc_acct',{});
+} elsif ( $query eq 'username' ) {
+  $sortby=\*username_sort;
+  @svc_acct=qsearch('svc_acct',{});
+} elsif ( $query eq 'uid' ) {
+  $sortby=\*uid_sort;
+  @svc_acct=grep $_->uid ne '', qsearch('svc_acct',{});
+} elsif ( $query eq 'UN_svcnum' ) {
+  $sortby=\*svcnum_sort;
+  @svc_acct = grep qsearchs('cust_svc',{
+      'svcnum' => $_->svcnum,
+      'pkgnum' => '',
+    }), qsearch('svc_acct',{});
+} elsif ( $query eq 'UN_username' ) {
+  $sortby=\*username_sort;
+  @svc_acct = grep qsearchs('cust_svc',{
+      'svcnum' => $_->svcnum,
+      'pkgnum' => '',
+    }), qsearch('svc_acct',{});
+} elsif ( $query eq 'UN_uid' ) {
+  $sortby=\*uid_sort;
+  @svc_acct = grep qsearchs('cust_svc',{
+      'svcnum' => $_->svcnum,
+      'pkgnum' => '',
+    }), qsearch('svc_acct',{});
+} else {
+  $sortby=\*uid_sort;
+  &usernamesearch;
+}
+
+if ( scalar(@svc_acct) == 1 ) {
+  my($svcnum)=$svc_acct[0]->svcnum;
+  print $cgi->redirect(popurl(2). "view/svc_acct.cgi?$svcnum");  #redirect
+  exit;
+} elsif ( scalar(@svc_acct) == 0 ) { #error
+  eidiot("Account not found");
+} else {
+  my($total)=scalar(@svc_acct);
+  print $cgi->header( '-expires' => 'now' ),
+        header("Account Search Results",''),
+        "$total matching accounts found",
+        &table(), <<END;
+      <TR>
+        <TH><FONT SIZE=-1>Service #</FONT></TH>
+        <TH><FONT SIZE=-1>Username</FONT></TH>
+        <TH><FONT SIZE=-1>UID</FONT></TH>
+        <TH><FONT SIZE=-1>Service</FONT></TH>
+        <TH><FONT SIZE=-1>Customer #</FONT></TH>
+        <TH><FONT SIZE=-1>Contact name</FONT></TH>
+        <TH><FONT SIZE=-1>Company</FONT></TH>
+      </TR>
+END
+
+  my(%saw,$svc_acct);
+  my $p = popurl(2);
+  foreach $svc_acct (
+    sort $sortby grep(!$saw{$_->svcnum}++, @svc_acct)
+  ) {
+    my $cust_svc = qsearchs('cust_svc', { 'svcnum' => $svc_acct->svcnum })
+      or die "No cust_svc record for svcnum ". $svc_acct->svcnum;
+    my $part_svc = qsearchs('part_svc', { 'svcpart' => $cust_svc->svcpart })
+      or die "No part_svc record for svcpart ". $cust_svc->svcpart;
+    my($cust_pkg,$cust_main);
+    if ( $cust_svc->pkgnum ) {
+      $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_svc->pkgnum })
+        or die "No cust_pkg record for pkgnum ". $cust_svc->pkgnum;
+      $cust_main = qsearchs('cust_main', { 'custnum' => $cust_pkg->custnum })
+        or die "No cust_main record for custnum ". $cust_pkg->custnum;
+    }
+    my($svcnum,$username,$uid,$svc,$custnum,$last,$first,$company)=(
+      $svc_acct->svcnum,
+      $svc_acct->getfield('username'),
+      $svc_acct->getfield('uid'),
+      $part_svc->svc,
+      $cust_svc->pkgnum ? $cust_main->custnum : '',
+      $cust_svc->pkgnum ? $cust_main->getfield('last') : '',
+      $cust_svc->pkgnum ? $cust_main->getfield('first') : '',
+      $cust_svc->pkgnum ? $cust_main->company : '',
+    );
+    my($pcustnum) = $custnum
+      ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\"><FONT SIZE=-1>$custnum</FONT></A>"
+      : "<I>(unlinked)</I>"
+    ;
+    my($pname) = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$last, $first</A>" : '';
+    my $pcompany = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$company</A>" : '';
+    print <<END;
+    <TR>
+      <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
+      <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$username</FONT></A></TD>
+      <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$uid</FONT></A></TD>
+      <TD><FONT SIZE=-1>$svc</FONT></TH>
+      <TD><FONT SIZE=-1>$pcustnum</FONT></TH>
+      <TD><FONT SIZE=-1>$pname<FONT></TH>
+      <TD><FONT SIZE=-1>$pcompany</FONT></TH>
+    </TR>
+END
+
+  }
+ 
+  print <<END;
+    </TABLE>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+  exit;
+
+}
+
+sub svcnum_sort {
+  $a->getfield('svcnum') <=> $b->getfield('svcnum');
+}
+
+sub username_sort {
+  $a->getfield('username') cmp $b->getfield('username');
+}
+
+sub uid_sort {
+  $a->getfield('uid') <=> $b->getfield('uid');
+}
+
+sub usernamesearch {
+
+  $cgi->param('username') =~ /^([\w\d\-]+)$/; #untaint username_text
+  my($username)=$1;
+
+  @svc_acct=qsearch('svc_acct',{'username'=>$username});
+
+}
+
+
+%>
diff --git a/httemplate/search/svc_acct.html b/httemplate/search/svc_acct.html
new file mode 100755
index 000000000..91291be99
--- /dev/null
+++ b/httemplate/search/svc_acct.html
@@ -0,0 +1,21 @@
+<HTML>
+  <HEAD>
+    <TITLE>Account Search</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+      <H1>Account Search</H1>
+    </CENTER>
+    <HR>
+    <FORM ACTION="svc_acct.cgi" METHOD="post">
+      Search for <B>username</B>: 
+      <INPUT TYPE="text" NAME="username">
+
+      <P><INPUT TYPE="submit" VALUE="Search">
+
+    </FORM>
+
+  <HR>
+  </BODY>
+</HTML>
+
diff --git a/httemplate/search/svc_acct_sm.cgi b/httemplate/search/svc_acct_sm.cgi
new file mode 100755
index 000000000..451e1fd3d
--- /dev/null
+++ b/httemplate/search/svc_acct_sm.cgi
@@ -0,0 +1,144 @@
+<%
+#
+# $Id: svc_acct_sm.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/svc_domain.cgi
+#
+# ivan@voicenet.com 96-mar-5
+#
+# need to look at table in results to make it more readable
+#
+# ivan@voicenet.com
+#
+# rewrite ivan@sisd.com 98-mar-15
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: svc_acct_sm.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.10  1999/07/20 06:03:36  ivan
+# s/CGI::Request/CGI/; (how'd i miss that before?)
+#
+# Revision 1.9  1999/04/09 04:22:34  ivan
+# also table()
+#
+# Revision 1.8  1999/04/09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.7  1999/02/28 00:03:56  ivan
+# removed misleading comments
+#
+# Revision 1.6  1999/02/09 09:22:58  ivan
+# visual and bugfixes
+#
+# Revision 1.5  1999/01/19 05:14:16  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:40  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 09:41:11  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+
+use strict;
+use vars qw( $conf $cgi $mydomain $domuser $svc_domain $domsvc @svc_acct_sm );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl idiot header table);
+use FS::Record qw(qsearch qsearchs);
+use FS::Conf;
+use FS::svc_domain;
+use FS::svc_acct_sm;
+use FS::svc_acct;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+$mydomain = $conf->config('domain');
+
+$cgi->param('domuser') =~ /^([a-z0-9_\-]{0,32})$/;
+$domuser = $1;
+
+$cgi->param('domain') =~ /^([\w\-\.]+)$/ or die "Illegal domain";
+$svc_domain = qsearchs('svc_domain',{'domain'=>$1})
+  or die "Unknown domain";
+$domsvc = $svc_domain->svcnum;
+
+if ($domuser) {
+  @svc_acct_sm=qsearch('svc_acct_sm',{
+    'domuser' => $domuser,
+    'domsvc'  => $domsvc,
+  });
+} else {
+  @svc_acct_sm=qsearch('svc_acct_sm',{'domsvc' => $domsvc});
+}
+
+if ( scalar(@svc_acct_sm) == 1 ) {
+  my($svcnum)=$svc_acct_sm[0]->svcnum;
+  print $cgi->redirect(popurl(2). "view/svc_acct_sm.cgi?$svcnum");
+} elsif ( scalar(@svc_acct_sm) > 1 ) {
+  print $cgi->header( '-expires' => 'now' ),
+        header('Mail Alias Search Results'),
+        &table(), <<END;
+      <TR>
+        <TH>Mail to<BR><FONT SIZE=-1>(click to view mail alias)</FONT></TH>
+        <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
+      </TR>
+END
+
+  my($svc_acct_sm);
+  foreach $svc_acct_sm (@svc_acct_sm) {
+    my($svcnum,$domuser,$domuid,$domsvc)=(
+      $svc_acct_sm->svcnum,
+      $svc_acct_sm->domuser,
+      $svc_acct_sm->domuid,
+      $svc_acct_sm->domsvc,
+    );
+
+    my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $domsvc } );
+    if ( $svc_domain ) {
+      my $domain = $svc_domain->domain;
+
+      print qq!<TR><TD><A HREF="!. popurl(2). qq!view/svc_acct_sm.cgi?$svcnum">!,
+      #print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
+            ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ),
+            qq!\@$domain</A> </TD>!,
+      ;
+    } else {
+      my $warning = "couldn't find svc_domain.svcnum $svcnum ( svc_acct_sm.svcnum $svcnum";
+      warn $warning;
+      print "<TR><TD>WARNING: $warning</TD>";
+    }
+
+    my $svc_acct = qsearchs( 'svc_acct', { 'uid' => $domuid } );
+    if ( $svc_acct ) {
+      my $username = $svc_acct->username;
+      my $svc_acct_svcnum =$svc_acct->svcnum;
+      print qq!<TD><A HREF="!, popurl(2),
+            qq!view/svc_acct.cgi?$svc_acct_svcnum">$username\@$mydomain</A>!,
+            qq!</TD></TR>!
+      ;
+    } else {
+      my $warning = "couldn't find svc_acct.uid $domuid (svc_acct_sm.svcnum $svcnum)!";
+      warn $warning;
+      print "<TD>WARNING: $warning</TD></TR>";
+    }
+
+  }
+
+  print '</TABLE></BODY></HTML>';
+
+} else { #error
+  idiot("Mail Alias not found");
+}
+
+%>
diff --git a/httemplate/search/svc_acct_sm.html b/httemplate/search/svc_acct_sm.html
new file mode 100755
index 000000000..0719856db
--- /dev/null
+++ b/httemplate/search/svc_acct_sm.html
@@ -0,0 +1,23 @@
+<HTML>
+  <HEAD>
+    <TITLE>Mail Alias Search</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+      <H1>Mail Alias Search</H1>
+    </CENTER>
+    <HR>
+    <FORM ACTION="svc_acct_sm.cgi" METHOD="post">
+      Search for <B>mail alias</B>: 
+      <INPUT TYPE="text" NAME="domuser"><FONT SIZE=-1>(opt.)</FONT> @
+      <INPUT TYPE="text" NAME="domain"><FONT SIZE=-1>(req.)</FONT>
+
+      <P><INPUT TYPE="submit" VALUE="Search">
+
+    </FORM>
+
+  <HR>
+
+  </BODY>
+</HTML>
+
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
new file mode 100755
index 000000000..8bcf4a694
--- /dev/null
+++ b/httemplate/search/svc_domain.cgi
@@ -0,0 +1,214 @@
+<%
+#
+# $Id: svc_domain.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/svc_domain.cgi
+#
+# ivan@voicenet.com 97-mar-5
+#
+# rewrite ivan@sisd.com 98-mar-14
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# display total, use FS::CGI now does browsing too ivan@sisd.com 98-jul-17
+#
+# $Log: svc_domain.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.11  2000/03/03 18:22:44  ivan
+# changes from 1.2.3 release, fixes from webdemo
+#
+# Revision 1.10  1999/07/17 10:38:52  ivan
+# scott nelson <scott@ultimanet.com> noticed this mod_perl-triggered bug and
+# gave me a great bugreport at the last rhythmethod
+#
+# Revision 1.9  1999/04/15 13:39:16  ivan
+# $cgi->header( '-expires' => 'now' )
+#
+# Revision 1.8  1999/02/28 00:03:57  ivan
+# removed misleading comments
+#
+# Revision 1.7  1999/02/23 08:09:24  ivan
+# beginnings of one-screen new customer entry and some other miscellania
+#
+# Revision 1.6  1999/02/09 09:22:59  ivan
+# visual and bugfixes
+#
+# Revision 1.5  1999/02/07 09:59:39  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:14:17  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1998/12/23 03:06:50  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:41:12  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+
+use strict;
+use vars qw ( $cgi @svc_domain $sortby $query $conf $mydomain );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header eidiot popurl);
+use FS::svc_domain;
+use FS::cust_svc;
+use FS::svc_acct_sm;
+use FS::svc_acct;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+$mydomain = $conf->config('domain');
+
+($query)=$cgi->keywords;
+$query ||= ''; #to avoid use of unitialized value errors
+if ( $query eq 'svcnum' ) {
+  $sortby=\*svcnum_sort;
+  @svc_domain=qsearch('svc_domain',{});
+} elsif ( $query eq 'domain' ) {
+  $sortby=\*domain_sort;
+  @svc_domain=qsearch('svc_domain',{});
+} elsif ( $query eq 'UN_svcnum' ) {
+  $sortby=\*svcnum_sort;
+  @svc_domain = grep qsearchs('cust_svc',{
+      'svcnum' => $_->svcnum,
+      'pkgnum' => '',
+    }), qsearch('svc_domain',{});
+} elsif ( $query eq 'UN_domain' ) {
+  $sortby=\*domain_sort;
+  @svc_domain = grep qsearchs('cust_svc',{
+      'svcnum' => $_->svcnum,
+      'pkgnum' => '',
+    }), qsearch('svc_domain',{});
+} else {
+  $cgi->param('domain') =~ /^([\w\-\.]+)$/; 
+  my($domain)=$1;
+  #push @svc_domain, qsearchs('svc_domain',{'domain'=>$domain});
+  @svc_domain = qsearchs('svc_domain',{'domain'=>$domain});
+}
+
+if ( scalar(@svc_domain) == 1 ) {
+  print $cgi->redirect(popurl(2). "view/svc_domain.cgi?". $svc_domain[0]->svcnum);
+  exit;
+} elsif ( scalar(@svc_domain) == 0 ) {
+  eidiot "No matching domains found!\n";
+} else {
+
+  my($total)=scalar(@svc_domain);
+  print $cgi->header( '-expires' => 'now' ),
+        header("Domain Search Results",''), <<END;
+
+    $total matching domains found
+    <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
+      <TR>
+        <TH>Service #</TH>
+        <TH>Domain</TH>
+        <TH>Mail to<BR><FONT SIZE=-1>(click to view mail alias)</FONT></TH>
+        <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
+      </TR>
+END
+
+  my(%saw,$svc_domain);
+  my $p = popurl(2);
+  foreach $svc_domain (
+    sort $sortby grep(!$saw{$_->svcnum}++, @svc_domain)
+  ) {
+    my($svcnum,$domain)=(
+      $svc_domain->svcnum,
+      $svc_domain->domain,
+    );
+    #my($malias);
+    #if ( qsearch('svc_acct_sm',{'domsvc'=>$svcnum}) ) {
+    #  $malias=(
+    #    qq|<FORM ACTION="svc_acct_sm.cgi" METHOD="post">|.
+    #      qq|<INPUT TYPE="hidden" NAME="domuser" VALUE="">|.
+    #      qq|<INPUT TYPE="hidden" NAME="domain" VALUE="$domain">|.
+    #      qq|<INPUT TYPE="submit" VALUE="(mail aliases)">|.
+    #      qq|</FORM>|
+    #  );
+    #} else {
+    #  $malias='';
+    #}
+
+    my @svc_acct_sm=qsearch('svc_acct_sm',{'domsvc' => $svcnum});
+    my $rowspan = scalar(@svc_acct_sm) || 1;
+
+    print <<END;
+    <TR>
+      <TD ROWSPAN=$rowspan><A HREF="${p}view/svc_domain.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
+      <TD ROWSPAN=$rowspan>$domain</TD>
+END
+
+    my $n1 = '';
+    # false laziness: this was stolen from search/svc_acct_sm.cgi.  but the
+    # web interface in general needs to be rewritten in a mucho cleaner way
+    my($svc_acct_sm);
+    foreach $svc_acct_sm (@svc_acct_sm) {
+      my($svcnum,$domuser,$domuid,$domsvc)=(
+        $svc_acct_sm->svcnum,
+        $svc_acct_sm->domuser,
+        $svc_acct_sm->domuid,
+        $svc_acct_sm->domsvc,
+      );
+      #my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $domsvc } );
+      #if ( $svc_domain ) {
+      #  my $domain = $svc_domain->domain;
+
+        print qq!$n1<TD><A HREF="!. popurl(2). qq!view/svc_acct_sm.cgi?$svcnum">!,
+        #print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
+              ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ),
+              qq!\@$domain</A> </TD>!,
+        ;
+      #} else {
+      #  my $warning = "couldn't find svc_domain.svcnum $svcnum ( svc_acct_sm.svcnum $svcnum";
+      #  warn $warning;
+      #  print "$n1<TD>WARNING: $warning</TD>";
+      #}
+
+      my $svc_acct = qsearchs( 'svc_acct', { 'uid' => $domuid } );
+      if ( $svc_acct ) {
+        my $username = $svc_acct->username;
+        my $svc_acct_svcnum =$svc_acct->svcnum;
+        print qq!<TD><A HREF="!, popurl(2),
+              qq!view/svc_acct.cgi?$svc_acct_svcnum">$username\@$mydomain</A>!,
+              qq!</TD></TR>!
+        ;
+      } else {
+        my $warning = "couldn't find svc_acct.uid $domuid (svc_acct_sm.svcnum $svcnum)!";
+        warn $warning;
+        print "<TD>WARNING: $warning</TD>";
+      }
+      $n1 = "</TR><TR>";
+    }
+    #end of false laziness
+    print "</TR>";
+
+  }
+ 
+  print <<END;
+    </TABLE>
+  </BODY>
+</HTML>
+END
+
+}
+
+sub svcnum_sort {
+  $a->getfield('svcnum') <=> $b->getfield('svcnum');
+}
+
+sub domain_sort {
+  $a->getfield('domain') cmp $b->getfield('doimain');
+}
+
+
+%>
diff --git a/httemplate/search/svc_domain.html b/httemplate/search/svc_domain.html
new file mode 100755
index 000000000..533743ba2
--- /dev/null
+++ b/httemplate/search/svc_domain.html
@@ -0,0 +1,22 @@
+<HTML>
+  <HEAD>
+    <TITLE>Domain Search</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+      <H1>Domain Search</H1>
+    </CENTER>
+    <HR>
+    <FORM ACTION="svc_domain.cgi" METHOD="post">
+      Search for <B>domain</B>: 
+      <INPUT TYPE="text" NAME="domain">
+
+      <P><INPUT TYPE="submit" VALUE="Search">
+
+    </FORM>
+
+  <HR>
+
+  </BODY>
+</HTML>
+
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
new file mode 100755
index 000000000..24d67ddc6
--- /dev/null
+++ b/httemplate/view/cust_bill.cgi
@@ -0,0 +1,97 @@
+<%
+#
+# $Id: cust_bill.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# this is a quick & ugly hack which does little more than add some formatting to the ascii output from /dbin/print-invoice
+#
+# ivan@voicenet.com 96-dec-05
+#
+# added navigation bar
+# ivan@voicenet.com 97-jan-30
+#
+# now uses Invoice.pm
+# ivan@voicenet.com 97-jun-30
+#
+# what to do if cust_bill search errors?
+# ivan@voicenet.com 97-jul-7
+#
+# s/FS::Search/FS::Record/; $cgisuidsetup($cgi); ivan@sisd.com 98-mar-14
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# also print 'printed' field ivan@sisd.com 98-jul-10
+#
+# $Log: cust_bill.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.8  1999/02/28 00:03:58  ivan
+# removed misleading comments
+#
+# Revision 1.7  1999/01/25 12:26:03  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.6  1999/01/19 05:14:18  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:42  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/30 23:03:33  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.3  1998/12/23 03:07:49  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:57:20  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+
+use strict;
+use vars qw ( $cgi $query $invnum $cust_bill $custnum $printed $p );
+use IO::File;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl menubar);
+use FS::Record qw(qsearchs);
+use FS::cust_bill;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+#untaint invnum
+($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+$invnum = $1;
+
+$cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
+die "Invoice #$invnum not found!" unless $cust_bill;
+$custnum = $cust_bill->getfield('custnum');
+
+$printed = $cust_bill->printed;
+
+$p = popurl(2);
+print $cgi->header( '-expires' => 'now' ), header('Invoice View', menubar(
+  "Main Menu" => $p,
+  "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+)), <<END;
+      <A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) against this invoice</A>
+      <BR><A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>
+      <BR><BR>(Printed $printed times)
+    <PRE>
+END
+
+print $cust_bill->print_text;
+
+	#formatting
+	print <<END;
+    </PRE></FONT>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
new file mode 100755
index 000000000..6c260bb7d
--- /dev/null
+++ b/httemplate/view/cust_main.cgi
@@ -0,0 +1,398 @@
+<!-- $Id: cust_main.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $ -->
+<%
+
+use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
+              @packages $package @history @bills $bill @credits $credit
+              $balance $item @agents @referrals @invoicing_list $n1 $conf ); 
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use Date::Format;
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs qsearch);
+use FS::CGI qw(header menubar popurl table itable ntable);
+use FS::cust_credit;
+use FS::cust_pay;
+use FS::cust_bill;
+use FS::part_pkg;
+use FS::cust_pkg;
+use FS::part_referral;
+use FS::agent;
+use FS::cust_main;
+use FS::cust_refund;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+
+print $cgi->header( '-expires' => 'now' ), header("Customer View", menubar(
+  'Main Menu' => popurl(2)
+));
+
+die "No customer specified (bad URL)!" unless $cgi->keywords;
+($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
+$query =~ /^(\d+)$/;
+$custnum = $1;
+$cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
+die "Customer not found!" unless $cust_main;
+$hashref = $cust_main->hashref;
+
+print qq!<A HREF="!, popurl(2), 
+      qq!edit/cust_main.cgi?$custnum">Edit this customer</A>!;
+print qq! | <A HREF="!, popurl(2), 
+      qq!misc/delete-customer.cgi?$custnum"> Delete this customer</A>!
+  if $conf->exists('deletecustomers');
+print '<BR><BR>';
+
+print '<A NAME="cust_main"></A>';
+
+print &itable(), '<TR>';
+
+print '<TD VALIGN="top">';
+
+  print "Billing address", &ntable("#cccccc"), "<TR><TD>",
+        &ntable("#cccccc",2),
+    '<TR><TD ALIGN="right">Contact name</TD>',
+      '<TD COLSPAN=3 BGCOLOR="#ffffff">',
+      $cust_main->last, ', ', $cust_main->first,
+      '</TD><TD ALIGN="right">SS#</TD><TD BGCOLOR="#ffffff">',
+      $cust_main->ss || '&nbsp', '</TD></TR>',
+    '<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+      $cust_main->company,
+      '</TD></TR>',
+    '<TR><TD ALIGN="right">Address</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+      $cust_main->address1,
+      '</TD></TR>',
+  ;
+  print '<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+        $cust_main->address2, '</TD></TR>'
+    if $cust_main->address2;
+  print '<TR><TD ALIGN="right">City</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->city,
+          '</TD><TD ALIGN="right">State</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->state,
+          '</TD><TD ALIGN="right">Zip</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->zip, '</TD></TR>',
+        '<TR><TD ALIGN="right">Country</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->country,
+          '</TD></TR>',
+  ;
+  print '<TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+          $cust_main->daytime || '&nbsp', '</TD></TR>',
+       '<TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+          $cust_main->night || '&nbsp', '</TD></TR>',
+        '<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+          $cust_main->fax || '&nbsp', '</TD></TR>',
+        '</TABLE>', "</TD></TR></TABLE>"
+  ;
+
+  if ( defined $cust_main->dbdef_table->column('ship_last') ) {
+
+    my $pre = $cust_main->ship_last ? 'ship_' : '';
+
+    print "<BR>Service address", &ntable("#cccccc"), "<TR><TD>",
+          &ntable("#cccccc",2),
+      '<TR><TD ALIGN="right">Contact name</TD>',
+        '<TD COLSPAN=5 BGCOLOR="#ffffff">',
+        $cust_main->get("${$pre}last"), ', ', $cust_main->get("${$pre}first"),
+        '</TD></TR>',
+      '<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+        $cust_main->get("${$pre}company"),
+        '</TD></TR>',
+      '<TR><TD ALIGN="right">Address</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+        $cust_main->get("${$pre}address1"),
+        '</TD></TR>',
+    ;
+    print '<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+          $cust_main->get("${$pre}address2"), '</TD></TR>'
+      if $cust_main->get("${$pre}address2");
+    print '<TR><TD ALIGN="right">City</TD><TD BGCOLOR="#ffffff">',
+            $cust_main->get("${$pre}city"),
+            '</TD><TD ALIGN="right">State</TD><TD BGCOLOR="#ffffff">',
+            $cust_main->get("${$pre}state"),
+            '</TD><TD ALIGN="right">Zip</TD><TD BGCOLOR="#ffffff">',
+            $cust_main->get("${$pre}zip"), '</TD></TR>',
+          '<TR><TD ALIGN="right">Country</TD><TD BGCOLOR="#ffffff">',
+            $cust_main->get("${$pre}country"),
+            '</TD></TR>',
+    ;
+    print '<TR><TD ALIGN="right">Day Phone</TD>',
+          '<TD COLSPAN=5 BGCOLOR="#ffffff">',
+            $cust_main->get("${$pre}daytime") || '&nbsp', '</TD></TR>',
+          '<TR><TD ALIGN="right">Night Phone</TD>'.
+          '<TD COLSPAN=5 BGCOLOR="#ffffff">',
+            $cust_main->get("${$pre}night") || '&nbsp', '</TD></TR>',
+          '<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+            $cust_main->get("${$pre}fax") || '&nbsp', '</TD></TR>',
+          '</TABLE>', "</TD></TR></TABLE>"
+    ;
+
+  }
+
+print '</TD>';
+
+print '<TD VALIGN="top">';
+
+  print &ntable("#cccccc"), "<TR><TD>", &ntable("#cccccc",2),
+        '<TR><TD ALIGN="right">Customer number</TD><TD BGCOLOR="#ffffff">',
+        $custnum, '</TD></TR>',
+  ;
+
+  @agents = qsearch( 'agent', {} );
+  unless ( scalar(@agents) == 1 ) {
+    $agent = qsearchs('agent',{
+      'agentnum' => $cust_main->agentnum
+    } );
+    print '<TR><TD ALIGN="right">Agent</TD><TD BGCOLOR="#ffffff">',
+        $agent->agentnum, ": ", $agent->agent, '</TD></TR>';
+  }
+  @referrals = qsearch( 'part_referral', {} );
+  unless ( scalar(@referrals) == 1 ) {
+    my $referral = qsearchs('part_referral', {
+      'refnum' => $cust_main->refnum
+    } );
+    print '<TR><TD ALIGN="right">Referral</TD><TD BGCOLOR="#ffffff">',
+          $referral->refnum, ": ", $referral->referral, '</TD></TR>';
+  }
+  print '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
+    $cust_main->otaker, '</TD></TR>';
+
+  print '</TABLE></TD></TR></TABLE>';
+
+print '<BR>';
+
+  @invoicing_list = $cust_main->invoicing_list;
+  print "Billing information (",
+       qq!<A HREF="!, popurl(2), qq!/misc/bill.cgi?$custnum">!, "Bill now</A>)",
+        &ntable("#cccccc"), "<TR><TD>", &ntable("#cccccc",2),
+        '<TR><TD ALIGN="right">Tax exempt</TD><TD BGCOLOR="#ffffff">',
+        $cust_main->tax ? 'yes' : 'no',
+        '</TD></TR>',
+        '<TR><TD ALIGN="right">Postal invoices</TD><TD BGCOLOR="#ffffff">',
+        ( grep { $_ eq 'POST' } @invoicing_list ) ? 'yes' : 'no',
+        '</TD></TR>',
+        '<TR><TD ALIGN="right">Email invoices</TD><TD BGCOLOR="#ffffff">',
+        join(', ', grep { $_ ne 'POST' } @invoicing_list ) || 'no',
+        '</TD></TR>',
+        '<TR><TD ALIGN="right">Billing type</TD><TD BGCOLOR="#ffffff">',
+  ;
+
+  if ( $cust_main->payby eq 'CARD' ) {
+    print 'Credit card</TD></TR>',
+          '<TR><TD ALIGN="right">Card number</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->payinfo, '</TD></TR>',
+          '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->paydate, '</TD></TR>',
+          '<TR><TD ALIGN="right">Name on card</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->payname, '</TD></TR>'
+    ;
+  } elsif ( $cust_main->payby eq 'BILL' ) {
+    print 'Billing</TD></TR>';
+    print '<TR><TD ALIGN="right">P.O. </TD><TD BGCOLOR="#ffffff">',
+          $cust_main->payinfo, '</TD></TR>',
+      if $cust_main->payinfo;
+    print '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->paydate, '</TD></TR>',
+          '<TR><TD ALIGN="right">Attention</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->payname, '</TD></TR>',
+    ;
+  } elsif ( $cust_main->payby eq 'COMP' ) {
+    print 'Complimentary</TD></TR>',
+          '<TR><TD ALIGN="right">Authorized by</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->payinfo, '</TD></TR>',
+          '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->paydate, '</TD></TR>',
+    ;
+  }
+
+  print "</TABLE></TD></TR></TABLE>";
+
+print '</TD></TR></TABLE>';
+
+print qq!<BR><BR><A NAME="cust_pkg">Packages</A> !,
+#      qq!<BR>Click on package number to view/edit package.!,
+      qq!( <A HREF="!, popurl(2), qq!edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> (preserves services) )!,
+;
+
+#display packages
+
+#formatting
+print qq!!, &table(), "\n",
+      qq!<TR><TH COLSPAN=2 ROWSPAN=2>Package</TH><TH COLSPAN=5>!,
+      qq!Dates</TH><TH COLSPAN=2 ROWSPAN=2>Services</TH></TR>\n!,
+      qq!<TR><TH><FONT SIZE=-1>Setup</FONT></TH><TH>!,
+      qq!<FONT SIZE=-1>Next bill</FONT>!,
+      qq!</TH><TH><FONT SIZE=-1>Susp.</FONT></TH><TH><FONT SIZE=-1>Expire!,
+      qq!</FONT></TH>!,
+      qq!<TH><FONT SIZE=-1>Cancel</FONT></TH>!,
+      qq!</TR>\n!;
+
+#get package info
+if ( $conf->exists('hidecancelledpackages') ) {
+  @packages = $cust_main->ncancelled_pkgs;
+} else {
+  @packages = $cust_main->all_pkgs;
+}
+
+$n1 = '<TR>';
+foreach $package (@packages) {
+  my $pkgnum = $package->pkgnum;
+  my $pkg = $package->part_pkg->pkg;
+  my $comment = $package->part_pkg->comment;
+  my $pkgview = popurl(2). "view/cust_pkg.cgi?$pkgnum";
+  my @cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
+  my $rowspan = scalar(@cust_svc) || 1;
+
+  my $button_cgi = new CGI;
+  $button_cgi->param('clone', $package->part_pkg->pkgpart);
+  $button_cgi->param('pkgnum', $package->pkgnum);
+  my $button_url = popurl(2). "edit/part_pkg.cgi?". $button_cgi->query_string;
+
+  #print $n1, qq!<TD ROWSPAN=$rowspan><A HREF="$pkgview">$pkgnum</A></TD>!,
+  print $n1, qq!<TD ROWSPAN=$rowspan>$pkgnum</TD>!,
+        qq!<TD ROWSPAN=$rowspan><FONT SIZE=-1>!,
+        #qq!<A HREF="$pkgview">$pkg - $comment</A>!,
+        qq!$pkg - $comment!,
+        qq! ( <A HREF="$pkgview">Edit</A> | <A HREF="$button_url">Customize pricing</A> )</FONT></TD>!,
+  ;
+  for ( qw( setup bill susp expire cancel ) ) {
+    print "<TD ROWSPAN=$rowspan><FONT SIZE=-1>", ( $package->getfield($_)
+            ? time2str("%D", $package->getfield($_) )
+            :  '&nbsp'
+          ), '</FONT></TD>',
+    ;
+  }
+
+  my $n2 = '';
+  foreach my $cust_svc ( @cust_svc ) {
+     my($label, $value, $svcdb) = $cust_svc->label;
+     my($svcnum) = $cust_svc->svcnum;
+     my($sview) = popurl(2). "view";
+     print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
+           qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
+     $n2="</TR><TR>";
+  }
+  $n1="</TR><TR>";
+}  
+print "</TR>";
+
+#formatting
+print "</TABLE>";
+
+#formatting
+print qq!<BR><BR><A NAME="history">Payment History!,
+      qq!</A>!,
+      qq! ( Click on invoice to view invoice/enter payment. | !,
+      qq!<A HREF="!, popurl(2), qq!edit/cust_credit.cgi?$custnum">!,
+      qq!Post credit / refund</A> )!;
+
+#get payment history
+#
+# major problem: this whole thing is way too sloppy.
+# minor problem: the description lines need better formatting.
+
+@history = (); #needed for mod_perl :)
+
+@bills = qsearch('cust_bill',{'custnum'=>$custnum});
+foreach $bill (@bills) {
+  my($bref)=$bill->hashref;
+  push @history,
+    $bref->{_date} . qq!\t<A HREF="!. popurl(2). qq!view/cust_bill.cgi?! .
+    $bref->{invnum} . qq!">Invoice #! . $bref->{invnum} .
+    qq! (Balance \$! . $bill->owed . qq!)</A>\t! .
+    $bref->{charged} . qq!\t\t\t!;
+
+  my(@payments)=qsearch('cust_pay',{'invnum'=> $bref->{invnum} } );
+  my($payment);
+  foreach $payment (@payments) {
+    my($date,$invnum,$payby,$payinfo,$paid)=($payment->getfield('_date'),
+                                             $payment->getfield('invnum'),
+                                             $payment->getfield('payby'),
+                                             $payment->getfield('payinfo'),
+                                             $payment->getfield('paid'),
+                      );
+    push @history,
+      "$date\tPayment, Invoice #$invnum ($payby $payinfo)\t\t$paid\t\t";
+  }
+}
+
+@credits = qsearch('cust_credit',{'custnum'=>$custnum});
+foreach $credit (@credits) {
+  my($cref)=$credit->hashref;
+  push @history,
+    $cref->{_date} . "\tCredit #" . $cref->{crednum} . ", (Balance \$" .
+    $cref->{credited} . ") by " . $cref->{otaker} . " - " .
+    $cref->{reason} . "\t\t\t" . $cref->{amount} . "\t";
+
+  my(@refunds)=qsearch('cust_refund',{'crednum'=> $cref->{crednum} } );
+  my($refund);
+  foreach $refund (@refunds) {
+    my($rref)=$refund->hashref;
+    push @history,
+      $rref->{_date} . "\tRefund, Credit #" . $rref->{crednum} . " (" .
+      $rref->{payby} . " " . $rref->{payinfo} . ") by " .
+      $rref->{otaker} . " - ". $rref->{reason} . "\t\t\t\t" .
+      $rref->{refund};
+  }
+}
+
+        #formatting
+        print &table(), <<END;
+<TR>
+  <TH>Date</TH>
+  <TH>Description</TH>
+  <TH><FONT SIZE=-1>Charge</FONT></TH>
+  <TH><FONT SIZE=-1>Payment</FONT></TH>
+  <TH><FONT SIZE=-1>In-house<BR>Credit</FONT></TH>
+  <TH><FONT SIZE=-1>Refund</FONT></TH>
+  <TH><FONT SIZE=-1>Balance</FONT></TH>
+</TR>
+END
+
+#display payment history
+
+$balance = 0;
+foreach $item (sort keyfield_numerically @history) {
+  my($date,$desc,$charge,$payment,$credit,$refund)=split(/\t/,$item);
+  $charge ||= 0;
+  $payment ||= 0;
+  $credit ||= 0;
+  $refund ||= 0;
+  $balance += $charge - $payment;
+  $balance -= $credit - $refund;
+
+  print "<TR><TD><FONT SIZE=-1>",time2str("%D",$date),"</FONT></TD>",
+	"<TD><FONT SIZE=-1>$desc</FONT></TD>",
+	"<TD><FONT SIZE=-1>",
+        ( $charge ? "\$".sprintf("%.2f",$charge) : '' ),
+        "</FONT></TD>",
+	"<TD><FONT SIZE=-1>",
+        ( $payment ? "- \$".sprintf("%.2f",$payment) : '' ),
+        "</FONT></TD>",
+	"<TD><FONT SIZE=-1>",
+        ( $credit ? "- \$".sprintf("%.2f",$credit) : '' ),
+        "</FONT></TD>",
+	"<TD><FONT SIZE=-1>",
+        ( $refund ? "\$".sprintf("%.2f",$refund) : '' ),
+        "</FONT></TD>",
+	"<TD><FONT SIZE=-1>\$" . sprintf("%.2f",$balance),
+        "</FONT></TD>",
+        "\n";
+}
+
+#formatting
+print "</TABLE>";
+
+#end
+
+#formatting
+print <<END;
+
+  </BODY>
+</HTML>
+END
+
+#subroutiens
+sub keyfield_numerically { (split(/\t/,$a))[0] <=> (split(/\t/,$b))[0] ; }
+
+%>
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
new file mode 100755
index 000000000..5e733225b
--- /dev/null
+++ b/httemplate/view/cust_pkg.cgi
@@ -0,0 +1,210 @@
+<%
+#
+# $Id: cust_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: cust_pkg.cgi pkgnum
+#        http://server.name/path/cust_pkg.cgi?pkgnum
+#
+# ivan@voicenet.com 96-dec-15
+#
+# services section needs to be cleaned up, needs to display extraneous
+# entries in cust_pkg!
+# ivan@voicenet.com 96-dec-31
+#
+# added navigation bar
+# ivan@voicenet.com 97-jan-30
+#
+# changed and fixed up suspension and cancel stuff, now you can't add
+# services to a cancelled package
+# ivan@voicenet.com 97-feb-27
+#
+# rewrote for new API, still needs to be cleaned up!
+# ivan@voicenet.com 97-jul-29
+#
+# no FS::Search ivan@sisd.com 98-mar-7
+# 
+# $Log: cust_pkg.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.11  1999/04/09 04:22:34  ivan
+# also table()
+#
+# Revision 1.10  1999/04/09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.9  1999/04/08 12:00:19  ivan
+# aesthetic update
+#
+# Revision 1.8  1999/02/28 00:04:01  ivan
+# removed misleading comments
+#
+# Revision 1.7  1999/01/19 05:14:20  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6  1999/01/18 09:41:44  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1998/12/23 03:11:40  ivan
+# *** empty log message ***
+#
+# Revision 1.3  1998/12/17 09:57:22  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+# Revision 1.2  1998/11/13 09:56:49  ivan
+# change configuration file layout to support multiple distinct databases (with
+# own set of config files, export, etc.)
+#
+
+use strict;
+use vars qw ( $cgi %uiview %uiadd $part_svc $query $pkgnum $cust_pkg $part_pkg
+              $custnum $susp $cancel $expire $pkg $comment $setup $bill
+              $otaker );
+use Date::Format;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl header menubar ntable table);
+use FS::Record qw(qsearch qsearchs);
+use FS::part_svc;
+use FS::cust_pkg;
+use FS::part_pkg;
+use FS::pkg_svc;
+use FS::cust_svc;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+foreach $part_svc ( qsearch('part_svc',{}) ) {
+  $uiview{$part_svc->svcpart} = popurl(2). "view/". $part_svc->svcdb . ".cgi";
+  $uiadd{$part_svc->svcpart}= popurl(2). "edit/". $part_svc->svcdb . ".cgi";
+}
+
+($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+$pkgnum = $1;
+
+#get package record
+$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+die "No package!" unless $cust_pkg;
+$part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
+
+$custnum = $cust_pkg->getfield('custnum');
+print $cgi->header( '-expires' => 'now' ), header('Package View', menubar(
+  "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum",
+  'Main Menu' => popurl(2)
+));
+
+#print info
+($susp,$cancel,$expire)=(
+  $cust_pkg->getfield('susp'),
+  $cust_pkg->getfield('cancel'),
+  $cust_pkg->getfield('expire'),
+);
+($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment'));
+($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
+$otaker = $cust_pkg->getfield('otaker');
+
+print "Package information";
+print ' (<A HREF="'. popurl(2). 'misc/unsusp_pkg.cgi?'. $pkgnum.
+      '">unsuspend</A>)' if ( $susp && ! $cancel );
+print ' (<A HREF="'. popurl(2). 'misc/susp_pkg.cgi?'. $pkgnum.
+      '">suspend</A>)' unless ( $susp || $cancel );
+print ' (<A HREF="'. popurl(2). 'misc/cancel_pkg.cgi?'. $pkgnum.
+      '">cancel</A>)' unless $cancel;
+
+print &ntable("#cccccc"), '<TR><TD>', &ntable("#cccccc",2),
+      '<TR><TD ALIGN="right">Package number</TD><TD BGCOLOR="#ffffff">',
+      $pkgnum, '</TD></TR>',
+      '<TR><TD ALIGN="right">Package</TD><TD BGCOLOR="#ffffff">',
+      $pkg,  '</TD></TR>',
+      '<TR><TD ALIGN="right">Comment</TD><TD BGCOLOR="#ffffff">',
+      $comment,  '</TD></TR>',
+      '<TR><TD ALIGN="right">Setup date</TD><TD BGCOLOR="#ffffff">',
+      ( $setup ? time2str("%D",$setup) : "(Not setup)" ), '</TD></TR>',
+      '<TR><TD ALIGN="right">Next bill date</TD><TD BGCOLOR="#ffffff">',
+      ( $bill ? time2str("%D",$bill) : "&nbsp;" ), '</TD></TR>',
+;
+print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
+       time2str("%D",$susp), '</TD></TR>' if $susp;
+print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
+       time2str("%D",$expire), '</TD></TR>' if $expire;
+print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
+       time2str("%D",$cancel), '</TD></TR>' if $cancel;
+print  '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
+      $otaker,  '</TD></TR>',
+      '</TABLE></TD></TR></TABLE>'
+;
+
+#  print <<END;
+#<FORM ACTION="../misc/expire_pkg.cgi" METHOD="post">
+#<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
+#Expire (date): <INPUT TYPE="text" NAME="date" VALUE="" >
+#<INPUT TYPE="submit" VALUE="Cancel later">
+#END
+
+unless ($cancel) {
+
+  #services
+  print '<BR>Service Information', &table();
+
+  #list of services this pkgpart includes
+  my $pkg_svc;
+  my %pkg_svc = ();
+  foreach $pkg_svc ( qsearch('pkg_svc',{'pkgpart'=> $cust_pkg->pkgpart }) ) {
+    $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity if $pkg_svc->quantity;
+  }
+
+  #list of records from cust_svc
+  my $svcpart;
+  foreach $svcpart (sort {$a <=> $b} keys %pkg_svc) {
+
+    my($svc)=qsearchs('part_svc',{'svcpart'=>$svcpart})->getfield('svc');
+
+    my(@cust_svc)=qsearch('cust_svc',{'pkgnum'=>$pkgnum, 
+                                      'svcpart'=>$svcpart,
+                                     });
+
+    my($enum);
+    for $enum ( 1 .. $pkg_svc{$svcpart} ) {
+
+      my($cust_svc);
+      if ( $cust_svc=shift @cust_svc ) {
+        my($svcnum)=$cust_svc->svcnum;
+        my($label, $value, $svcdb) = $cust_svc->label;
+        print <<END;
+<TR><TD><A HREF="$uiview{$svcpart}?$svcnum">(View) $svc: $value<A></TD></TR>
+END
+      } else {
+        print <<END;
+<TR>
+  <TD><A HREF="$uiadd{$svcpart}?pkgnum$pkgnum-svcpart$svcpart">
+      (Add) $svc</A>
+   or <A HREF="../misc/link.cgi?pkgnum$pkgnum-svcpart$svcpart">
+      (Link to existing) $svc</A>
+  </TD>
+</TR>
+END
+      }
+
+    }
+    warn "WARNING: Leftover services pkgnum $pkgnum!" if @cust_svc;; 
+  }
+
+  print "</TABLE><FONT SIZE=-1>",
+        "Choose (View) to view or edit an existing service<BR>",
+        "Choose (Add) to setup a new service<BR>",
+        "Choose (Link to existing) to link to a legacy (pre-Freeside) service",
+        "</FONT>"
+  ;
+}
+
+#formatting
+print <<END;
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
new file mode 100755
index 000000000..f28bd9497
--- /dev/null
+++ b/httemplate/view/svc_acct.cgi
@@ -0,0 +1,181 @@
+<%
+#
+# $Id: svc_acct.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: svc_acct.cgi svcnum
+#        http://server.name/path/svc_acct.cgi?svcnum
+#
+# ivan@voicenet.com 96-dec-17
+#
+# added link to send info
+# ivan@voicenet.com 97-jan-4
+#
+# added navigation bar and ability to change username, etc.
+# ivan@voicenet.com 97-jan-30
+#
+# activate 800 service
+# ivan@voicenet.com 97-feb-10
+#
+# modified navbar code (should be a subroutine?), added link to cancel account (only if not audited)
+# ivan@voicenet.com 97-apr-16
+#
+# INCOMPLETELY rewrote some things for new API
+# ivan@voicenet.com 97-jul-29
+#
+# FS::Search became FS::Record, use strict, etc. ivan@sisd.com 98-mar-9
+#
+# Changes to allow page to work at a relative position in server
+# Changed 'password' to '_password' because Pg6.3 reserves the password word
+#       bmccane@maxbaud.net     98-apr-3
+#
+# /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
+#
+# displays arbitrary radius attributes ivan@sisd.com 98-aug-16
+#
+# $Log: svc_acct.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.12  2001/01/31 07:21:00  ivan
+# fix tyops
+#
+# Revision 1.11  2000/12/03 20:25:20  ivan
+# session monitor updates
+#
+# Revision 1.10  1999/04/14 11:27:06  ivan
+# showpasswords config option to show passwords
+#
+# Revision 1.9  1999/04/08 12:00:19  ivan
+# aesthetic update
+#
+# Revision 1.8  1999/02/28 00:04:02  ivan
+# removed misleading comments
+#
+# Revision 1.7  1999/01/19 05:14:21  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6  1999/01/18 09:41:45  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1999/01/18 09:22:36  ivan
+# changes to track email addresses for email invoicing
+#
+# Revision 1.4  1998/12/23 03:09:19  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 09:57:23  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+# Revision 1.2  1998/12/16 05:24:29  ivan
+# use FS::Conf;
+#
+
+use strict;
+use vars qw( $conf $cgi $mydomain $query $svcnum $svc_acct $cust_svc $pkgnum
+             $cust_pkg $custnum $part_svc $p $svc_acct_pop $password );
+use CGI;
+use CGI::Carp qw( fatalsToBrowser );
+use FS::UID qw( cgisuidsetup );
+use FS::CGI qw( header popurl menubar);
+use FS::Record qw( qsearchs fields );
+use FS::Conf;
+use FS::svc_acct;
+use FS::cust_svc;
+use FS::cust_pkg;
+use FS::part_svc;
+use FS::svc_acct_pop;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+$mydomain = $conf->config('domain');
+
+($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+$svcnum = $1;
+$svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
+die "Unknown svcnum" unless $svc_acct;
+
+$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+$pkgnum = $cust_svc->getfield('pkgnum');
+if ($pkgnum) {
+  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+  $custnum=$cust_pkg->getfield('custnum');
+} else {
+  $cust_pkg = '';
+  $custnum = '';
+}
+
+$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+die "Unknown svcpart" unless $part_svc;
+
+$p = popurl(2);
+print $cgi->header( '-expires' => 'now' ), header('Account View', menubar(
+  ( ( $pkgnum || $custnum )
+    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
+        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+      )
+    : ( "Cancel this (unaudited) account" =>
+          "${p}misc/cancel-unaudited.cgi?$svcnum" )
+  ),
+  "Main menu" => $p,
+));
+
+#print qq!<BR><A HREF="../misc/sendconfig.cgi?$svcnum">Send account information</A>!;
+
+print qq!<A HREF="${p}edit/svc_acct.cgi?$svcnum">Edit this information</A>!,
+      "<BR>Service #$svcnum",
+      "<BR>Service: <B>", $part_svc->svc, "</B>",
+      "<BR><BR>Username: <B>", $svc_acct->username, "</B>"
+;
+
+print "<BR>Password: ";
+$password = $svc_acct->_password;
+if ( $password =~ /^\*\w+\* (.*)$/ ) {
+  $password = $1;
+  print "<I>(login disabled)</I> ";
+}
+if ( $conf->exists('showpasswords') ) {
+  print "<B>$password</B>";
+} else {
+  print "<I>(hidden)</I>";
+}
+$password = '';
+
+$svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
+print "<BR>POP: <B>", $svc_acct_pop->city, ", ", $svc_acct_pop->state,
+      " (", $svc_acct_pop->ac, ")/", $svc_acct_pop->exch, "</B>"
+  if $svc_acct_pop;
+
+if ($svc_acct->uid ne '') {
+  print "<BR><BR>Uid: <B>", $svc_acct->uid, "</B>",
+        "<BR>Gid: <B>", $svc_acct->gid, "</B>",
+        "<BR>Finger name: <B>", $svc_acct->finger, "</B>",
+        "<BR>Home directory: <B>", $svc_acct->dir, "</B>",
+        "<BR>Shell: <B>", $svc_acct->shell, "</B>",
+        "<BR>Quota: <B>", $svc_acct->quota, "</B> <I>(unimplemented)</I>"
+  ;
+} else {
+  print "<BR><BR>(No shell account)";
+}
+
+if ($svc_acct->slipip) {
+  print "<BR><BR>IP address: <B>", ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' ) ? "<I>(Dynamic)</I>" : $svc_acct->slipip ,"</B>";
+  my($attribute);
+  foreach $attribute ( grep /^radius_/, fields('svc_acct') ) {
+    #warn $attribute;
+    $attribute =~ /^radius_(.*)$/;
+    my($pattribute) = ($1);
+    $pattribute =~ s/_/-/g;
+    print "<BR>Radius $pattribute: <B>". $svc_acct->getfield($attribute), "</B>";
+  }
+} else {
+  print "<BR><BR>(No SLIP/PPP account)";
+}
+
+print "</BODY></HTML>";
+
+%>
diff --git a/httemplate/view/svc_acct_sm.cgi b/httemplate/view/svc_acct_sm.cgi
new file mode 100755
index 000000000..9c6ca6e5c
--- /dev/null
+++ b/httemplate/view/svc_acct_sm.cgi
@@ -0,0 +1,132 @@
+<%
+#
+# $Id: svc_acct_sm.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: svc_acct_sm.cgi svcnum
+#        http://server.name/path/svc_acct_sm.cgi?svcnum
+#
+# based on view/svc_acct.cgi
+# 
+# ivan@voicenet.com 97-jan-5
+#
+# added navigation bar
+# ivan@voicenet.com 97-jan-30
+# 
+# rewrite ivan@sisd.com 98-mar-15
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
+#
+# $Log: svc_acct_sm.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.11  2000/07/17 10:58:42  ivan
+# better error messages if svc_acct or svc_domain records are missing
+#
+# Revision 1.10  1999/04/08 12:00:19  ivan
+# aesthetic update
+#
+# Revision 1.9  1999/02/28 00:04:03  ivan
+# removed misleading comments
+#
+# Revision 1.8  1999/02/09 09:23:00  ivan
+# visual and bugfixes
+#
+# Revision 1.7  1999/02/07 09:59:42  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.6  1999/01/19 05:14:22  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:46  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/23 03:09:52  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 09:57:24  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+# Revision 1.2  1998/12/16 05:24:30  ivan
+# use FS::Conf;
+#
+
+use strict;
+use vars qw($conf $cgi $mydomain $query $svcnum $svc_acct_sm $cust_svc
+            $pkgnum $cust_pkg $custnum $part_svc $p $domsvc $domuid $domuser
+            $svc $svc_domain $domain $svc_acct $username );
+use CGI;
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl menubar );
+use FS::Record qw(qsearchs);
+use FS::Conf;
+use FS::svc_acct_sm;
+use FS::cust_svc;
+use FS::cust_pkg;
+use FS::part_svc;
+use FS::svc_domain;
+use FS::svc_acct;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+$mydomain = $conf->config('domain');
+
+($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+$svcnum = $1;
+$svc_acct_sm = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum});
+die "Unknown svcnum" unless $svc_acct_sm;
+
+$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+$pkgnum = $cust_svc->getfield('pkgnum');
+if ($pkgnum) {
+  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+  $custnum=$cust_pkg->getfield('custnum');
+} else {
+  $cust_pkg = '';
+  $custnum = '';
+}
+
+$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
+  or die "Unkonwn svcpart";
+
+$p = popurl(2);
+print $cgi->header( '-expires' => 'now' ), header('Mail Alias View', menubar(
+  ( ( $pkgnum || $custnum )
+    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
+        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+      )
+    : ( "Cancel this (unaudited) account" =>
+          "${p}misc/cancel-unaudited.cgi?$svcnum" )
+  ),
+  "Main menu" => $p,
+));
+
+($domsvc,$domuid,$domuser) = (
+  $svc_acct_sm->domsvc,
+  $svc_acct_sm->domuid,
+  $svc_acct_sm->domuser,
+);
+$svc = $part_svc->svc;
+$svc_domain = qsearchs('svc_domain',{'svcnum'=>$domsvc})
+  or die "Corrupted database: no svc_domain.svcnum matching domsvc $domsvc";
+$domain = $svc_domain->domain;
+$svc_acct = qsearchs('svc_acct',{'uid'=>$domuid})
+  or die "Corrupted database: no svc_acct.uid matching domuid $domuid";
+$username = $svc_acct->username;
+
+print qq!<A HREF="${p}edit/svc_acct_sm.cgi?$svcnum">Edit this information</A>!,
+      "<BR>Service #$svcnum",
+      "<BR>Service: <B>$svc</B>",
+      qq!<BR>Mail to <B>!, ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ) , qq!</B>\@<B>$domain</B> forwards to <B>$username</B>\@$mydomain mailbox.!,
+      '</BODY></HTML>'
+;
+
+%>
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
new file mode 100755
index 000000000..f852400da
--- /dev/null
+++ b/httemplate/view/svc_domain.cgi
@@ -0,0 +1,106 @@
+<%
+#
+# $Id: svc_domain.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: svc_domain svcnum
+#        http://server.name/path/svc_domain.cgi?svcnum
+#
+# ivan@voicenet.com 97-jan-6
+#
+# rewrite ivan@sisd.com 98-mar-14
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: svc_domain.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.11  2000/12/03 15:14:00  ivan
+# bugfixes from Jeff Finucane <jeff@cmh.net>, thanks!
+#
+# Revision 1.10  1999/08/27 22:18:44  ivan
+# point to patrick instead of internic!
+#
+# Revision 1.9  1999/04/08 12:00:19  ivan
+# aesthetic update
+#
+# Revision 1.8  1999/02/28 00:04:04  ivan
+# removed misleading comments
+#
+# Revision 1.7  1999/02/23 08:09:25  ivan
+# beginnings of one-screen new customer entry and some other miscellania
+#
+# Revision 1.6  1999/01/19 05:14:23  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:47  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/23 03:10:19  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 09:57:25  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+# Revision 1.2  1998/11/13 09:56:50  ivan
+# change configuration file layout to support multiple distinct databases (with
+# own set of config files, export, etc.)
+#
+
+use strict;
+use vars qw( $cgi $query $svcnum $svc_domain $domain $cust_svc $pkgnum 
+             $cust_pkg $custnum $part_svc $p );
+use CGI;
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header menubar popurl menubar);
+use FS::Record qw(qsearchs);
+use FS::svc_domain;
+use FS::cust_svc;
+use FS::cust_pkg;
+use FS::part_svc;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+$svcnum = $1;
+$svc_domain = qsearchs('svc_domain',{'svcnum'=>$svcnum});
+die "Unknown svcnum" unless $svc_domain;
+
+$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+$pkgnum = $cust_svc->getfield('pkgnum');
+if ($pkgnum) {
+  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+  $custnum=$cust_pkg->getfield('custnum');
+} else {
+  $cust_pkg = '';
+  $custnum = '';
+}
+
+$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+die "Unkonwn svcpart" unless $part_svc;
+
+$domain = $svc_domain->domain;
+
+$p = popurl(2);
+print $cgi->header( '-expires' => 'now' ), header('Domain View', menubar(
+  ( ( $pkgnum || $custnum )
+    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
+        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+      )
+    : ( "Cancel this (unaudited) account" =>
+          "${p}misc/cancel-unaudited.cgi?$svcnum" )
+  ),
+  "Main menu" => $p,
+)),
+      "Service #$svcnum",
+      "<BR>Service: <B>", $part_svc->svc, "</B>",
+      "<BR>Domain name: <B>$domain</B>.",
+      qq!<BR><BR><A HREF="http://www.geektools.com/cgi-bin/proxy.cgi?query=$domain;targetnic=auto">View whois information.</A>!,
+      '</BODY></HTML>',
+;
+%>
-- 
cgit v1.2.1


From e8dd9b3bbf139e1a21180a1efc81129f01d2d18b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jul 2001 07:42:39 +0000
Subject: need an DBIx::DBSchema with delcolumn

---
 bin/fs-setup | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 1113966f8..9075ca2a9 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.38 2001-07-30 07:36:04 ivan Exp $
+# $Id: fs-setup,v 1.39 2001-07-30 07:42:39 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.38  2001-07-30 07:36:04  ivan
+# Revision 1.39  2001-07-30 07:42:39  ivan
+# need an DBIx::DBSchema with delcolumn
+#
+# Revision 1.38  2001/07/30 07:36:04  ivan
 # templates!!!
 #
 # Revision 1.37  2001/06/03 14:16:11  ivan
@@ -144,7 +147,7 @@ BEGIN { $FS::Record::setup_hack = 1; }
 
 use strict;
 use DBI;
-use DBIx::DBSchema;
+use DBIx::DBSchema 0.18;
 use DBIx::DBSchema::Table;
 use DBIx::DBSchema::Column;
 use DBIx::DBSchema::ColGroup::Unique;
-- 
cgit v1.2.1


From 46b8b49cb4691ef3d3dbe4042550d9ce9f49a156 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jul 2001 08:01:50 +0000
Subject: need this too!

---
 Makefile | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..869613c62
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,23 @@
+#!/usr/bin/make
+
+default:
+	@echo "supported targets: aspdocs masondocs clean"
+
+aspdocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
+	rm -rf aspdocs
+	cp -pr httemplate aspdocs
+	touch aspdocs
+
+masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
+	rm -rf masondocs
+	cp -pr httemplate masondocs
+	( cd masondocs; \
+	  ../bin/masonize; \
+	)
+	touch masondocs
+
+alldocs: aspdocs masondocs
+
+clean:
+	rm -rf aspdocs masondocs
+
-- 
cgit v1.2.1


From 31157731e271ad7c672ec09e756a73304f646b62 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jul 2001 08:02:51 +0000
Subject: template stuffs

---
 htetc/global.asa | 20 +++++++++++++++
 htetc/handler.pl | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 htetc/global.asa
 create mode 100644 htetc/handler.pl

diff --git a/htetc/global.asa b/htetc/global.asa
new file mode 100644
index 000000000..beb6d02f0
--- /dev/null
+++ b/htetc/global.asa
@@ -0,0 +1,20 @@
+use strict;
+use vars qw( $cgi $p );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::part_svc;
+use FS::CGI qw(header menubar popurl table);
+
+sub Script_OnStart {
+  $cgi = new CGI;
+  &cgisuidsetup($cgi);
+  $p = popurl(2);
+  #print $cgi->header( '-expires' => 'now' );
+}
+
+sub Script_OnFlush {
+  my $ref = $Response->{BinaryRef};
+  $$ref = $cgi->header( '-expires' => 'now' ) .$$ref;
+}
diff --git a/htetc/handler.pl b/htetc/handler.pl
new file mode 100644
index 000000000..145529a06
--- /dev/null
+++ b/htetc/handler.pl
@@ -0,0 +1,78 @@
+#!/usr/bin/perl
+#
+# This is a basic, fairly fuctional Mason handler.pl.
+#
+# For something a little more involved, check out session_handler.pl
+
+package HTML::Mason;
+
+# Bring in main Mason package.
+use HTML::Mason;
+
+# Bring in ApacheHandler, necessary for mod_perl integration.
+# Uncomment the second line (and comment the first) to use
+# Apache::Request instead of CGI.pm to parse arguments.
+use HTML::Mason::ApacheHandler;
+# use HTML::Mason::ApacheHandler (args_method=>'mod_perl');
+
+# Uncomment the next line if you plan to use the Mason previewer.
+#use HTML::Mason::Preview;
+
+use strict;
+
+# List of modules that you want to use from components (see Admin
+# manual for details)
+#{  package HTML::Mason::Commands;
+#   use CGI;
+#}
+
+# Create Mason objects
+#
+my $parser = new HTML::Mason::Parser;
+my $interp = new HTML::Mason::Interp (parser=>$parser,
+                                      comp_root=>'/var/www/masondocs',
+                                      data_dir=>'/home/ivan/freeside_current/masondata',
+                                      out_mode=>'stream',
+                                     );
+my $ah = new HTML::Mason::ApacheHandler (interp=>$interp);
+
+# Activate the following if running httpd as root (the normal case).
+# Resets ownership of all files created by Mason at startup.
+#
+chown (Apache->server->uid, Apache->server->gid, $interp->files_written);
+
+sub handler
+{
+    my ($r) = @_;
+
+    # If you plan to intermix images in the same directory as
+    # components, activate the following to prevent Mason from
+    # evaluating image files as components.
+    #
+    #return -1 if $r->content_type && $r->content_type !~ m|^text/|i;
+
+    #rar
+    { package HTML::Mason::Commands;
+      use strict;
+      use vars qw( $cgi $p );
+      use CGI;
+      #use CGI::Carp qw(fatalsToBrowser);
+      use FS::UID qw(cgisuidsetup);
+      use FS::Record qw(qsearch qsearchs fields);
+      use FS::part_svc;
+      use FS::CGI qw(header menubar popurl table);
+
+      $cgi = new CGI;
+      #&cgisuidsetup($cgi);
+      &cgisuidsetup($r);
+      $p = popurl(2);
+    }
+    $r->content_type('text/html');
+    #eorar
+    
+    my $status = $ah->handle_request($r);
+    
+    return $status;
+}
+
+1;
-- 
cgit v1.2.1


From a03e44937be8d6c2f99dc830ef2583cbbbb36dfc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jul 2001 08:03:17 +0000
Subject: forgotten files

---
 httemplate/.htaccess         |   3 +++
 httemplate/docs/overview.dia | Bin 0 -> 2800 bytes
 httemplate/docs/overview.png | Bin 0 -> 13064 bytes
 3 files changed, 3 insertions(+)
 create mode 100755 httemplate/.htaccess
 create mode 100644 httemplate/docs/overview.dia
 create mode 100644 httemplate/docs/overview.png

diff --git a/httemplate/.htaccess b/httemplate/.htaccess
new file mode 100755
index 000000000..f8c6b9c0c
--- /dev/null
+++ b/httemplate/.htaccess
@@ -0,0 +1,3 @@
+AuthName        Freeside
+AuthType        Basic
+require valid-user
diff --git a/httemplate/docs/overview.dia b/httemplate/docs/overview.dia
new file mode 100644
index 000000000..a0e34c30e
Binary files /dev/null and b/httemplate/docs/overview.dia differ
diff --git a/httemplate/docs/overview.png b/httemplate/docs/overview.png
new file mode 100644
index 000000000..bf2dbc26c
Binary files /dev/null and b/httemplate/docs/overview.png differ
-- 
cgit v1.2.1


From 5d2a3918043acd0d3ead743fc44a3a3a0fbc4aec Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jul 2001 09:53:54 +0000
Subject: Pg primary key upgrade fix (create fix in new DBIx::DBSchema)

---
 httemplate/docs/upgrade8.html | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index fdf91647f..dfeba6505 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -61,6 +61,34 @@ $ perl Makefile.PL
 $ make
 $ su
 # make install UNINST=1</pre>
+  <li>If you are using PostgreSQL, apply the following changes to your database:
+<pre>
+CREATE UNIQUE INDEX agent_pkey ON agent ( agentnum );
+CREATE UNIQUE INDEX agent_type_pkey agent_type ( typenum );
+CREATE UNIQUE INDEX cust_bill_pkey ON cust_bill ( invnum );
+CREATE UNIQUE INDEX cust_credit_pkey ON cust_credit ( crednum );
+CREATE UNIQUE INDEX cust_main_pkey ON cust_main ( custnum );
+CREATE UNIQUE INDEX cust_main_county_pkey ON cust_main_county ( taxnum );
+CREATE UNIQUE INDEX cust_main_invoice_pkey ON cust_main_invoice ( destnum );
+CREATE UNIQUE INDEX cust_pay_pkey ON cust_pay ( paynum );
+CREATE UNIQUE INDEX cust_pkg_pkey ON cust_pkg ( pkgnum );
+CREATE UNIQUE INDEX cust_refund_pkey ON cust_refund ( refundnum );
+CREATE UNIQUE INDEX cust_svc_pkey ON cust_svc ( svcnum );
+CREATE UNIQUE INDEX domain_record_pkey ON domain_record ( recnum );
+CREATE UNIQUE INDEX nas_pkey ON nas ( nasnum );
+CREATE UNIQUE INDEX part_pkg_pkey ON part_pkg ( pkgpart );
+CREATE UNIQUE INDEX part_referral_pkey ON part_referral ( refnum );
+CREATE UNIQUE INDEX part_svc_pkey ON part_svc ( svcpart );
+CREATE UNIQUE INDEX port_pkey ON port ( portnum );
+CREATE UNIQUE INDEX prepay_credit_pkey ON prepay_credit ( prepaynum );
+CREATE UNIQUE INDEX session_pkey ON session ( sessionnum );
+CREATE UNIQUE INDEX svc_acct_pkey ON svc_acct ( svcnum );
+CREATE UNIQUE INDEX svc_acct_pop_pkey ON svc_acct_pop ( popnum );
+CREATE UNIQUE INDEX svc_acct_sm_pkey ON svc_acct_sm ( svcnum );
+CREATE UNIQUE INDEX svc_domain_pkey ON svc_domain ( svcnum );
+CREATE UNIQUE INDEX svc_www_pkey ON svc_www ( svcnum );
+CREATE UNIQUE INDEX type_pkgs_pkey ON type_pkgs ( typenum );
+</pre>
   <li>If you wish to enable service/shipping addresses, apply the following
       changes to your database:
 <pre>
-- 
cgit v1.2.1


From 2066bf9d3ebb4e53c49ab8b4b447c4eb88e425a4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jul 2001 10:41:44 +0000
Subject: shipping address additions

---
 FS/FS/Record.pm                 |  36 +++++++++++-
 FS/FS/cust_main.pm              |  92 +++++++++++++++++++++++++++----
 httemplate/search/cust_main.cgi | 119 +++++++++++++---------------------------
 httemplate/view/cust_main.cgi   |  27 ++++-----
 4 files changed, 167 insertions(+), 107 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 646a57607..82f590f94 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -74,6 +74,7 @@ FS::Record - Database record objects
     $value = $record->ut_alphan('column');
     $value = $record->ut_phonen('column');
     $value = $record->ut_anythingn('column');
+    $value = $record->ut_name('column');
 
     $dbdef = reload_dbdef;
     $dbdef = reload_dbdef "/non/standard/filename";
@@ -789,8 +790,37 @@ sub ut_domain {
   '';
 }
 
+=item ut_name COLUMN
+
+Check/untaint proper names; allows alphanumerics, spaces and the following
+punctuation: , . - '
+
+May not be null.
+
+=cut
+
+sub ut_name {
+  my( $self, $field ) = @_;
+  $self->getfield($field) =~ /^([\w \,\.\-\']+)$/
+    or return "Illegal (name) $field: ". $self->getfield($field);
+  $self->setfield($field,$1);
+  '';
+}
+
+=item ut_zip COLUMN
+
+Check/untaint zip codes.
+
 =cut
 
+sub ut_zip {
+  my( $self, $field ) = @_;
+  $self->getfield($field) =~ /^\s*(\w[\w\-\s]{2,8}\w)\s*$/
+    or return "Illegal (zip) $field: ". $self->getfield($field);
+  $self->setfield($field,$1);
+  '';
+}
+
 =item ut_anything COLUMN
 
 Untaints arbitrary data.  Be careful.
@@ -919,7 +949,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.18 2001-07-30 07:33:08 ivan Exp $
+$Id: Record.pm,v 1.19 2001-07-30 10:41:44 ivan Exp $
 
 =head1 BUGS
 
@@ -949,7 +979,7 @@ The ut_money method assumes money has two decimal digits.
 
 The Pg money kludge in the new method only strips `$'.
 
-The ut_phonen method assumes US-style phone numbers.
+The ut_phonen method only checks US-style phone numbers.
 
 The _quote function should probably use ut_float instead of a regex.
 
@@ -962,6 +992,8 @@ As of 1.14, DBI fetchall_hashref( {} ) doesn't set fetchrow_hashref NAME_lc,
 or allow it to be set.  Working around it is ugly any way around - DBI should
 be fixed.  (only affects RDBMS which return uppercase column names)
 
+ut_zip should take an optional country like ut_phone.
+
 =head1 SEE ALSO
 
 L<DBIx::DBSchema>, L<FS::UID>, L<DBI>
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 2d7dae41f..e6b7531c4 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -149,6 +149,32 @@ FS::Record.  The following fields are currently supported:
 
 =item fax - phone (optional)
 
+=item ship_first - name
+
+=item ship_last - name
+
+=item ship_company - (optional)
+
+=item ship_address1
+
+=item ship_address2 - (optional)
+
+=item ship_city
+
+=item ship_county - (optional, see L<FS::cust_main_county>)
+
+=item ship_state - (see L<FS::cust_main_county>)
+
+=item ship_zip
+
+=item ship_country - (see L<FS::cust_main_county>)
+
+=item ship_daytime - phone (optional)
+
+=item ship_night - phone (optional)
+
+=item ship_fax - phone (optional)
+
 =item payby - `CARD' (credit cards), `BILL' (billing), `COMP' (free), or `PREPAY' (special billing type: applies a credit - see L<FS::prepay_credit> and sets billing type to BILL)
 
 =item payinfo - card number, P.O., comp issuer (4-8 lowercase alphanumerics; think username) or prepayment identifier (see L<FS::prepay_credit>)
@@ -386,6 +412,8 @@ sub check {
     $self->ut_numbern('custnum')
     || $self->ut_number('agentnum')
     || $self->ut_number('refnum')
+    || $self->ut_name('last')
+    || $self->ut_name('first')
     || $self->ut_textn('company')
     || $self->ut_text('address1')
     || $self->ut_textn('address2')
@@ -404,14 +432,6 @@ sub check {
   return "Unknown referral"
     unless qsearchs( 'part_referral', { 'refnum' => $self->refnum } );
 
-  $self->getfield('last') =~ /^([\w \,\.\-\']+)$/
-    or return "Illegal last name: ". $self->getfield('last');
-  $self->setfield('last',$1);
-
-  $self->first =~ /^([\w \,\.\-\']+)$/
-    or return "Illegal first name: ". $self->first;
-  $self->first($1);
-
   if ( $self->ss eq '' ) {
     $self->ss('');
   } else {
@@ -441,12 +461,60 @@ sub check {
     $self->ut_phonen('daytime', $self->country)
     || $self->ut_phonen('night', $self->country)
     || $self->ut_phonen('fax', $self->country)
+    || $self->ut_zip('zip', $self->country)
   ;
   return $error if $error;
 
-  $self->zip =~ /^\s*(\w[\w\-\s]{2,8}\w)\s*$/
-    or return "Illegal zip: ". $self->zip;
-  $self->zip($1);
+  if ( defined $self->dbdef_table->column('ship_last') ) {
+    if ( grep { $self->getfield($_) ne $self->getfield("ship_$_") }
+              qw( last first company address1 address2 city county state zip
+                  country daytime night fax )
+       ) # if any address fields differ
+    {
+      my $error =
+        $self->ut_name('ship_last')
+        || $self->ut_name('ship_first')
+        || $self->ut_textn('ship_company')
+        || $self->ut_text('ship_address1')
+        || $self->ut_textn('ship_address2')
+        || $self->ut_text('ship_city')
+        || $self->ut_textn('ship_county')
+        || $self->ut_textn('ship_state')
+      ;
+      return $error if $error;
+
+      #false laziness with above
+      $self->ship_country =~ /^(\w\w)$/
+        or return "Illegal ship_country: ". $self->ship_country;
+      $self->ship_country($1);
+      unless ( qsearchs('cust_main_county', {
+        'country' => $self->ship_country,
+        'state'   => '',
+       } ) ) {
+        return "Unknown ship_state/ship_county/ship_country: ".
+          $self->ship_state. "/". $self->ship_county. "/". $self->ship_country
+          unless qsearchs('cust_main_county',{
+            'state'   => $self->ship_state,
+            'county'  => $self->ship_county,
+            'country' => $self->ship_country,
+          } );
+      }
+      #eofalse
+
+      $error =
+        $self->ut_phonen('ship_daytime', $self->ship_country)
+        || $self->ut_phonen('ship_night', $self->ship_country)
+        || $self->ut_phonen('ship_fax', $self->ship_country)
+        || $self->ut_zip('ship_zip', $self->ship_country)
+      ;
+      return $error if $error;
+
+    } else { # ship_ info eq billing info, so don't store dup info in database
+      $self->setfield("ship_$_", '')
+        foreach qw( last first company address1 address2 city county state zip
+                    country daytime night fax );
+    }
+  }
 
   $self->payby =~ /^(CARD|BILL|COMP|PREPAY)$/
     or return "Illegal payby: ". $self->payby;
@@ -1125,7 +1193,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.14 2001-06-03 10:51:54 ivan Exp $
+$Id: cust_main.pm,v 1.15 2001-07-30 10:41:44 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 844bb98b8..86bca1fcf 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,81 +1,5 @@
 <%
-#
-# $Id: cust_main.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/cust_main.cgi
-#
-# ivan@voicenet.com 96-dec-12
-#
-# rewrite ivan@sisd.com 98-mar-4
-#
-# now does browsing too ivan@sisd.com 98-mar-6
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# display total, use FS::CGI ivan@sisd.com 98-jul-17
-#
-# $Log: cust_main.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.17  2001/04/23 16:07:54  ivan
-# fix
-# Insecure dependency in eval while running with -T switch at /usr/local/lib/site_perl/FS/Record.pm line 202.
-#
-# Revision 1.16  2001/02/07 19:45:45  ivan
-# tyop
-#
-# Revision 1.15  2000/07/17 16:45:41  ivan
-# first shot at invoice browsing and some other cleanups
-#
-# Revision 1.14  1999/08/12 04:45:21  ivan
-# typo - missed a paren
-#
-# Revision 1.13  1999/08/12 04:32:21  ivan
-# hidecancelledcustomers
-#
-# Revision 1.12  1999/07/17 10:38:52  ivan
-# scott nelson <scott@ultimanet.com> noticed this mod_perl-triggered bug and
-# gave me a great bugreport at the last rhythmethod
-#
-# Revision 1.11  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.10  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.9  1999/02/28 00:03:55  ivan
-# removed misleading comments
-#
-# Revision 1.8  1999/02/07 09:59:36  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.7  1999/01/25 12:19:11  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.6  1999/01/19 05:14:12  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:37  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1998/12/30 00:57:50  ivan
-# bug
-#
-# Revision 1.3  1998/12/17 09:41:08  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
-# Revision 1.2  1998/11/12 08:10:22  ivan
-# CGI.pm instead of CGI-modules
-# relative URLs using popurl
-# got rid of lots of little tables
-# s/agrep/String::Approx/;
-# bubble up packages and services and link (slow)
-#
+#<!-- $Id: cust_main.cgi,v 1.2 2001-07-30 10:41:44 ivan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
@@ -85,7 +9,7 @@ use CGI::Carp qw(fatalsToBrowser);
 use IO::Handle;
 use String::Approx qw(amatch);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
+use FS::Record qw(qsearch qsearchs dbdef);
 use FS::CGI qw(header menubar eidiot popurl table);
 use FS::cust_main;
 use FS::cust_svc;
@@ -137,8 +61,18 @@ if ( scalar(@cust_main) == 1 ) {
   )), "$total matching customers found<BR>", &table(), <<END;
       <TR>
         <TH></TH>
-        <TH>Contact name</TH>
-        <TH>Company</TH>
+        <TH>(bill) name</TH>
+        <TH>company</TH>
+END
+
+if ( defined dbdef->table('cust_main')->column('ship_last') ) {
+  print <<END;
+      <TH>(service) name</TH>
+      <TH>company</TH>
+END
+}
+
+print <<END;
         <TH>Packages</TH>
         <TH COLSPAN=2>Services</TH>
       </TR>
@@ -171,6 +105,17 @@ END
       <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$last, $first</FONT></A></TD>
       <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$company</FONT></A></TD>
 END
+    if ( defined dbdef->table('cust_main')->column('ship_last') ) {
+      my($ship_last,$ship_first,$ship_company)=(
+        $cust_main->ship_last || $cust_main->getfield('last'),
+        $cust_main->ship_last ? $cust_main->ship_first : $cust_main->first,
+        $cust_main->ship_last ? $cust_main->ship_company : $cust_main->company,
+      );
+print <<END;
+      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$ship_last, $ship_first</FONT></A></TD>
+      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$ship_company</FONT></A></TD>
+END
+    }
 
     my($n1)='';
     foreach ( @{$all_pkgs{$custnum}} ) {
@@ -250,11 +195,16 @@ sub lastsearch {
 
     push @cust_main, qsearch('cust_main',{'last'=>$last});
 
+    push @cust_main, qsearch('cust_main',{'ship_last'=>$last})
+      if defined dbdef->table('cust_main')->column('ship_last');
+
   } else {
 
     my(%last);
 
     my(@all_last)=map $_->getfield('last'), qsearch('cust_main',{});
+    push @all_last, grep $_, map $_->getfield('ship_last'), qsearch('cust_main',{})
+      if defined dbdef->table('cust_main')->column('ship_last');
     if ($last_type{'Fuzzy'}) { 
       foreach ( amatch($last, [ qw(i) ], @all_last) ) {
         $last{$_}++; 
@@ -266,6 +216,8 @@ sub lastsearch {
 
     foreach ( keys %last ) {
       push @cust_main, qsearch('cust_main',{'last'=>$_});
+      push @cust_main, qsearch('cust_main',{'ship_last'=>$_})
+        if defined dbdef->table('cust_main')->column('ship_last');
     }
 
   }
@@ -290,10 +242,15 @@ sub companysearch {
 
     push @cust_main, qsearch('cust_main',{'company'=>$company});
 
+    push @cust_main, qsearch('cust_main',{'ship_company'=>$company})
+      if defined dbdef->table('cust_main')->column('ship_last');
+
   } else {
 
     my(%company);
     my(@all_company)=map $_->company, qsearch('cust_main',{});
+    push @all_company, grep $_, map $_->getfield('ship_company'), qsearch('cust_main',{})
+      if defined dbdef->table('cust_main')->column('ship_last');
 
     if ($company_type{'Fuzzy'}) { 
       foreach ( amatch($company, [ qw(i) ], @all_company ) ) {
@@ -306,6 +263,8 @@ sub companysearch {
 
     foreach ( keys %company ) {
       push @cust_main, qsearch('cust_main',{'company'=>$_});
+      push @cust_main, qsearch('cust_main',{'ship_company'=>$_})
+        if defined dbdef->table('cust_main')->column('ship_last');
     }
 
   }
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 6c260bb7d..752896847 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,6 +1,7 @@
-<!-- $Id: cust_main.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $ -->
 <%
+#<!-- $Id: cust_main.cgi,v 1.2 2001-07-30 10:41:44 ivan Exp $ -->
 
+use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
               @packages $package @history @bills $bill @credits $credit
               $balance $item @agents @referrals @invoicing_list $n1 $conf ); 
@@ -94,36 +95,36 @@ print '<TD VALIGN="top">';
           &ntable("#cccccc",2),
       '<TR><TD ALIGN="right">Contact name</TD>',
         '<TD COLSPAN=5 BGCOLOR="#ffffff">',
-        $cust_main->get("${$pre}last"), ', ', $cust_main->get("${$pre}first"),
+        $cust_main->get("${pre}last"), ', ', $cust_main->get("${pre}first"),
         '</TD></TR>',
       '<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-        $cust_main->get("${$pre}company"),
+        $cust_main->get("${pre}company"),
         '</TD></TR>',
       '<TR><TD ALIGN="right">Address</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-        $cust_main->get("${$pre}address1"),
+        $cust_main->get("${pre}address1"),
         '</TD></TR>',
     ;
     print '<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-          $cust_main->get("${$pre}address2"), '</TD></TR>'
-      if $cust_main->get("${$pre}address2");
+          $cust_main->get("${pre}address2"), '</TD></TR>'
+      if $cust_main->get("${pre}address2");
     print '<TR><TD ALIGN="right">City</TD><TD BGCOLOR="#ffffff">',
-            $cust_main->get("${$pre}city"),
+            $cust_main->get("${pre}city"),
             '</TD><TD ALIGN="right">State</TD><TD BGCOLOR="#ffffff">',
-            $cust_main->get("${$pre}state"),
+            $cust_main->get("${pre}state"),
             '</TD><TD ALIGN="right">Zip</TD><TD BGCOLOR="#ffffff">',
-            $cust_main->get("${$pre}zip"), '</TD></TR>',
+            $cust_main->get("${pre}zip"), '</TD></TR>',
           '<TR><TD ALIGN="right">Country</TD><TD BGCOLOR="#ffffff">',
-            $cust_main->get("${$pre}country"),
+            $cust_main->get("${pre}country"),
             '</TD></TR>',
     ;
     print '<TR><TD ALIGN="right">Day Phone</TD>',
           '<TD COLSPAN=5 BGCOLOR="#ffffff">',
-            $cust_main->get("${$pre}daytime") || '&nbsp', '</TD></TR>',
+            $cust_main->get("${pre}daytime") || '&nbsp', '</TD></TR>',
           '<TR><TD ALIGN="right">Night Phone</TD>'.
           '<TD COLSPAN=5 BGCOLOR="#ffffff">',
-            $cust_main->get("${$pre}night") || '&nbsp', '</TD></TR>',
+            $cust_main->get("${pre}night") || '&nbsp', '</TD></TR>',
           '<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-            $cust_main->get("${$pre}fax") || '&nbsp', '</TD></TR>',
+            $cust_main->get("${pre}fax") || '&nbsp', '</TD></TR>',
           '</TABLE>', "</TD></TR></TABLE>"
     ;
 
-- 
cgit v1.2.1


From f7caf50929669fdf317f1ab51767ac93a1f743fc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jul 2001 10:43:58 +0000
Subject: Apache::ASP eidiot fix

---
 FS/FS/CGI.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 6078ad96b..98f26f383 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -43,7 +43,10 @@ Returns an HTML header.
 =cut
 
 sub header {
-  my($title,$menubar)=@_;
+  my($title,$menubar,$etc)=@_;
+  #use Carp;
+  #confess $etc if defined $etc;
+  $etc = '' unless defined $etc;
 
   my $x =  <<END;
     <HTML>
@@ -52,7 +55,7 @@ sub header {
           $title
         </TITLE>
       </HEAD>
-      <BODY BGCOLOR="#e8e8e8">
+      <BODY BGCOLOR="#e8e8e8"$etc>
           <FONT SIZE=7>
             $title
           </FONT>
@@ -124,6 +127,9 @@ sub eidiot {
   warn "eidiot depriciated";
   idiot(@_);
   if (exists $ENV{MOD_PERL}) {
+    $main::Response->End()
+      if defined $main::Response
+         && $main::Response->isa('Apache::ASP::Response');
     require Apache;
     Apache::exit();
   } else {
-- 
cgit v1.2.1


From 1dc0755721b4f5989f798df4d37842c70662cf9f Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Fri, 3 Aug 2001 20:34:28 +0000
Subject: added the tax method

---
 FS/FS/cust_bill.pm | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 8480ceadc..4ffb8e210 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -64,6 +64,8 @@ FS::cust_bill - Object methods for cust_bill records
 
   @cust_pay_objects = $cust_bill->cust_pay;
 
+  $tax_amount = $record->tax;
+
   @lines = $cust_bill->print_text;
   @lines = $cust_bill->print_text $time;
 
@@ -231,6 +233,21 @@ sub cust_pay {
   ;
 }
 
+=item tax
+
+Returns the tax amount (see L<FS::cust_bill_pkg>) for this invoice.
+
+=cut
+
+sub tax {
+  my $self = shift;
+  my $total = 0;
+  my @taxlines = qsearch( 'cust_bill_pkg', { 'invnum' => $self->invnum ,
+                                             'pkgnum' => 0 } );
+  foreach (@taxlines) { $total += $_->setup; }
+  $total;
+}
+
 =item owed
 
 Returns the amount owed (still outstanding) on this invoice, which is charged
@@ -424,7 +441,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.7 2001-04-09 23:05:15 ivan Exp $
+$Id: cust_bill.pm,v 1.8 2001-08-03 20:34:28 jeff Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From ec7fdeaf2806d896452e82233b1bc5f1901ed3cc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 8 Aug 2001 04:44:41 +0000
Subject: better error msg

---
 FS/FS/Record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 82f590f94..34d79066c 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -199,7 +199,7 @@ sub qsearch {
 
   $sth->execute( map $record->{$_},
     grep defined( $record->{$_} ) && $record->{$_} ne '', @fields
-  ) or croak $dbh->errstr;
+  ) or croak "Error executing \"$statement\": ". $dbh->errstr;
   $dbh->commit or croak $dbh->errstr if $FS::UID::AutoCommit;
 
   if ( eval 'scalar(@FS::'. $table. '::ISA);' ) {
@@ -949,7 +949,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.19 2001-07-30 10:41:44 ivan Exp $
+$Id: Record.pm,v 1.20 2001-08-08 04:44:41 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 12a063fdd97054b7bfd412f3e77691fe3f497bbc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 8 Aug 2001 09:47:35 +0000
Subject: doc clarification

---
 httemplate/docs/passwd.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/passwd.html b/httemplate/docs/passwd.html
index a8f8151e2..e5242c200 100755
--- a/httemplate/docs/passwd.html
+++ b/httemplate/docs/passwd.html
@@ -11,6 +11,6 @@ You may use fs_passwd/fs_passwd as a "passwd", "chfn" and "chsh" replacement on
   <li>Copy fs_passwd/fs_passwd to /usr/local/bin on the shell machine(s).  (chown freeside, chmod 4755).  You may link it to passwd, chfn and chsh as well.
   <li>Copy fs_passwd/fs_passwdd to /usr/local/sbin on the shell machine(s).  (chown freeside, chmod 500)
   <li>Create /usr/local/freeside on the shell machine(s). (chown freeside, chmod 700)
-  <li>Run an iteration of "fs_passwd/fs_passwd_server shell.machine" as the freeside user for each shell machine (this is a daemon process).
+  <li>Run an iteration of "fs_passwd/fs_passwd_server <i>user</i> shell.machine" as the freeside user for each shell machine (this is a daemon process).  <i>user</i> refers to the freeside user from the <a href="config.html">mapsecrets configuration file</a>.
 </ul>
 </body>
-- 
cgit v1.2.1


From f28fd9cd33b10ea314049ba8c4ea73a5717a1bba Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Aug 2001 00:01:39 +0000
Subject: "fixes"

Can't call method "username" on an undefined
value at /usr/lib/perl5/site_perl/5.6.0/FS/cust_main_invoice.pm line 162.

but cust_main_invoice records should probably be updated when svc_acct records
are deleted :/
---
 FS/FS/cust_main_invoice.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm
index 58542c688..eb0162f0e 100644
--- a/FS/FS/cust_main_invoice.pm
+++ b/FS/FS/cust_main_invoice.pm
@@ -158,8 +158,9 @@ Returns the literal email address for this record (or `POST').
 
 sub address {
   my $self = shift;
-  if ( $self->dest =~ /(\d+)$/ ) {
-    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $1 } );
+  if ( $self->dest =~ /^(\d+)$/ ) {
+    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $1 } )
+      or return undef;
     $svc_acct->username . '@' . $mydomain;
   } else {
     $self->dest;
@@ -170,7 +171,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.4 2001-07-27 17:16:25 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.5 2001-08-11 00:01:39 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 8748a199e18236d696115661a36e87f583481662 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Aug 2001 04:15:14 +0000
Subject: better docs

---
 httemplate/misc/delete-customer.cgi | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/httemplate/misc/delete-customer.cgi b/httemplate/misc/delete-customer.cgi
index cb5fc76b5..e1bcb8994 100755
--- a/httemplate/misc/delete-customer.cgi
+++ b/httemplate/misc/delete-customer.cgi
@@ -1,9 +1,12 @@
 <%
 #
-# $Id: delete-customer.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+# $Id: delete-customer.cgi,v 1.2 2001-08-11 04:15:14 ivan Exp $
 #
 # $Log: delete-customer.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
+# Revision 1.2  2001-08-11 04:15:14  ivan
+# better docs
+#
+# Revision 1.1  2001/07/30 07:36:04  ivan
 # templates!!!
 #
 # Revision 1.1  1999/04/15 16:44:36  ivan
@@ -53,7 +56,11 @@ if ( qsearch('cust_pkg', { 'custnum' => $custnum, 'cancel' => '' } ) ) {
 }
 
 print <<END;
-This will <b>completely remove</b> all traces of this customer record.
+This will <b>completely remove</b> all traces of this customer record.  This
+is <B>not</B> what you want if this is a real customer who has simply
+canceled service with you.  For that, cancel all of the customer's packages.
+(you can optionally hide cancelled customers with the <a href="../docs/config.html#hidecancelledcustomers">hidecancelledcustomers</a> configuration file)
+<br>
 <br>Are you <b>absolutely sure</b> you want to delete this customer?
 <br><input type="submit" value="Yes">
 </form></body></html>
-- 
cgit v1.2.1


From 706791990c8553ef96e5d468cc912f1b96a8bb8c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Aug 2001 04:29:56 +0000
Subject: that's what $etc is for!

---
 FS/FS/CGI.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 98f26f383..85b91eab2 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -43,9 +43,8 @@ Returns an HTML header.
 =cut
 
 sub header {
-  my($title,$menubar,$etc)=@_;
-  #use Carp;
-  #confess $etc if defined $etc;
+  my($title,$menubar,$etc)=@_; #$etc is for things like onLoad= etc.
+  use Carp;
   $etc = '' unless defined $etc;
 
   my $x =  <<END;
-- 
cgit v1.2.1


From 30d1e222f793498b0704de73b9d66edf3e1a6fb9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Aug 2001 04:55:03 +0000
Subject: don't have any other choices in svcdb dropdown for existing services,
 since you can't change it anyway

---
 httemplate/edit/part_svc.cgi | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index cc0ee6fd0..6617d25ed 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.2 2001-08-11 04:55:03 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -86,8 +86,11 @@ function changed(what) {
 <% } %>
 }
 </SCRIPT>
+<% my @dbs = $hashref->{svcdb}
+             ? ( $hashref->{svcdb} )
+             : qw( svc_acct svc_domain svc_acct_sm svc_www ); %>
 Table<SELECT NAME="svcdb" SIZE=1 onChange="changed(this)">
-<% foreach my $svcdb (qw( svc_acct svc_domain svc_acct_sm svc_www )) { %>
+<% foreach my $svcdb (@dbs) { %>
 <OPTION VALUE="<%= $svcdb %>" <%= ' SELECTED'x($svcdb eq $hashref->{svcdb}) %>><%= $svcdb %>
 <% } %>
 </SELECT>
-- 
cgit v1.2.1


From aff324b078531b8ab82e692a2c182d8f1ae0c932 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Aug 2001 05:50:52 +0000
Subject: allow newlines in ut_anything fields fix example for ut_anything

---
 FS/FS/Record.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 34d79066c..6409da33d 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -73,7 +73,7 @@ FS::Record - Database record objects
     $value = $record->ut_alpha('column');
     $value = $record->ut_alphan('column');
     $value = $record->ut_phonen('column');
-    $value = $record->ut_anythingn('column');
+    $value = $record->ut_anything('column');
     $value = $record->ut_name('column');
 
     $dbdef = reload_dbdef;
@@ -829,7 +829,7 @@ Untaints arbitrary data.  Be careful.
 
 sub ut_anything {
   my($self,$field)=@_;
-  $self->getfield($field) =~ /^(.*)$/
+  $self->getfield($field) =~ /^(.*)$/s
     or return "Illegal $field: ". $self->getfield($field);
   $self->setfield($field,$1);
   '';
@@ -949,7 +949,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.20 2001-08-08 04:44:41 ivan Exp $
+$Id: Record.pm,v 1.21 2001-08-11 05:50:52 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 251030ed112d091a77a71299043cf46d88914bc5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Aug 2001 05:51:24 +0000
Subject: better error msg

---
 FS/FS/part_svc.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 01487b75f..ccf0413b3 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -84,7 +84,7 @@ returns the error, otherwise returns false.
 sub replace {
   my ( $new, $old ) = ( shift, shift );
 
-  return "Can't change svcdb!"
+  return "Can't change svcdb for an existing service definition!"
     unless $old->svcdb eq $new->svcdb;
 
   $new->SUPER::replace( $old );
@@ -144,7 +144,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: part_svc.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: part_svc.pm,v 1.2 2001-08-11 05:51:24 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 6f36d35b9db86ad5b9e42edc27c14b14444771a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Aug 2001 05:52:15 +0000
Subject: add comments field, fix ship_ address handling (don't consider a
 value for ship_state field to mean something meaningful is in ship_*)

---
 FS/FS/cust_main.pm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index e6b7531c4..eb265820f 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -187,6 +187,8 @@ FS::Record.  The following fields are currently supported:
 
 =item otaker - order taker (assigned automatically, see L<FS::UID>)
 
+=item comments - comments (optional)
+
 =back
 
 =head1 METHODS
@@ -420,6 +422,7 @@ sub check {
     || $self->ut_text('city')
     || $self->ut_textn('county')
     || $self->ut_textn('state')
+    || $self->ut_anything('comments')
   ;
   #barf.  need message catalogs.  i18n.  etc.
   $error .= "Please select a referral."
@@ -465,11 +468,15 @@ sub check {
   ;
   return $error if $error;
 
+  my @addfields = qw(
+    last first company address1 address2 city county state zip
+    country daytime night fax
+  );
+
   if ( defined $self->dbdef_table->column('ship_last') ) {
-    if ( grep { $self->getfield($_) ne $self->getfield("ship_$_") }
-              qw( last first company address1 address2 city county state zip
-                  country daytime night fax )
-       ) # if any address fields differ
+    if ( grep { $self->getfield($_) ne $self->getfield("ship_$_") } @addfields
+         && grep $self->getfield("ship_$_"), grep $_ ne 'state', @addfields
+       )
     {
       my $error =
         $self->ut_name('ship_last')
@@ -1193,7 +1200,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.15 2001-07-30 10:41:44 ivan Exp $
+$Id: cust_main.pm,v 1.16 2001-08-11 05:52:15 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 3dddb60bd783aaf5fa1fda90a351f1e877b7e19b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Aug 2001 05:52:56 +0000
Subject: add customer comments fields

---
 httemplate/edit/cust_main.cgi |  9 ++++++++-
 httemplate/view/cust_main.cgi | 13 +++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 8902e3dce..2941acdf3 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.2 2001-08-11 05:52:56 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -355,6 +355,13 @@ for (qw(CARD BILL COMP)) {
 
 print "</TR></TABLE>$r required fields for each billing type";
 
+if ( defined $cust_main->dbdef_table->column('comments') ) {
+    print "<BR><BR>Comments", &itable("#cccccc"),
+          qq!<TR><TD><TEXTAREA COLS=80 ROWS=5 WRAP="HARD" NAME="comments">!,
+          $cust_main->comments, "</TEXTAREA>",
+          "</TD></TR></TABLE>";
+}
+
 unless ( $custnum ) {
   # pry the wrong place for this logic.  also pretty expensive
   #use FS::part_pkg;
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 752896847..8b6fb0c09 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.2 2001-07-30 10:41:44 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.3 2001-08-11 05:52:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
@@ -210,7 +210,16 @@ print '<BR>';
 
 print '</TD></TR></TABLE>';
 
-print qq!<BR><BR><A NAME="cust_pkg">Packages</A> !,
+if ( defined $cust_main->dbdef_table->column('comments') ) {
+  print "<BR>Comments", &ntable("#cccccc"), "<TR><TD>",
+        &ntable("#cccccc",2),
+        '<TR><TD BGCOLOR="#ffffff"><PRE>', $cust_main->comments,
+        '</PRE></TD></TR></TABLE></TABLE>';
+}
+
+print '</TD></TR></TABLE>';
+
+print qq!<BR><A NAME="cust_pkg">Packages</A> !,
 #      qq!<BR>Click on package number to view/edit package.!,
       qq!( <A HREF="!, popurl(2), qq!edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> (preserves services) )!,
 ;
-- 
cgit v1.2.1


From 1dd250b6ff2c32f0bb9b4db7606066f34721e7d9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Aug 2001 05:54:45 +0000
Subject: add comments field

---
 bin/fs-setup                  | 8 ++++++--
 httemplate/docs/upgrade8.html | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 9075ca2a9..314a7c234 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.39 2001-07-30 07:42:39 ivan Exp $
+# $Id: fs-setup,v 1.40 2001-08-11 05:53:42 ivan Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.39  2001-07-30 07:42:39  ivan
+# Revision 1.40  2001-08-11 05:53:42  ivan
+# add comments field
+#
+# Revision 1.39  2001/07/30 07:42:39  ivan
 # need an DBIx::DBSchema with delcolumn
 #
 # Revision 1.38  2001/07/30 07:36:04  ivan
@@ -498,6 +501,7 @@ sub tables_hash_hack {
         'tax',      'char', 'NULL', 1,
         'otaker',   'varchar', '',     8,
         'refnum',   'int',  '',     '',
+        'comments', 'varchar', 'NULL', '',
       ],
       'primary_key' => 'custnum',
       'unique' => [ [] ],
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index dfeba6505..702da5a1b 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -105,6 +105,11 @@ ALTER TABLE cust_main ADD COLUMN ship_country char(2) NULL;
 ALTER TABLE cust_main ADD COLUMN ship_daytime varchar(20) NULL;
 ALTER TABLE cust_main ADD COLUMN ship_night varchar(20) NULL;
 ALTER TABLE cust_main ADD COLUMN ship_fax varchar(12) NULL;
+</pre>
+  <li>If you wish to enable customer comments, apply the following change to
+      your database:
+<pre>
+ALTER TABLE cust_main ADD COLUMN comments varchar NULL;
 </pre>
   <li>Run bin/dbdef-create.
 </body>
-- 
cgit v1.2.1


From c473d21fdd01251030b0a90d67d85d1bedfd76ba Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Aug 2001 23:18:30 +0000
Subject: missed a variable interpolation

---
 httemplate/browse/part_svc.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 84d8a3566..145874774 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.1 2001-07-30 07:36:03 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.2 2001-08-11 23:18:30 ivan Exp $ -->
 <%= header('Service Part Listing', menubar( 'Main Menu' => $p) ) %>
 
     Services are items you offer to your customers.<BR><BR>
@@ -39,7 +39,7 @@
      foreach $row ( @rows ) {
        my($flag)=$part_svc->getfield($svcdb.'__'.$row.'_flag');
 %>
-     <%= $n1 %><TD>$row</TD><TD>
+     <%= $n1 %><TD><%= $row %></TD><TD>
 
 <%     if ( $flag eq "D" ) { print "Default"; }
          elsif ( $flag eq "F" ) { print "Fixed"; }
-- 
cgit v1.2.1


From 3d726debcb197b4304208eb758dc9ede7f619f86 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Aug 2001 23:19:09 +0000
Subject: better error checking, fix scalar context to $cgi->keywords

---
 httemplate/edit/part_svc.cgi | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 6617d25ed..7fadf000f 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.2 2001-08-11 04:55:03 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.3 2001-08-11 23:19:09 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -6,9 +6,10 @@
        map { $_, scalar($cgi->param($_)) } fields('part_svc')
      } );
    } elsif ( $cgi->keywords ) { #edit
-     my $query = $cgi->keywords;
-     $query =~ /^(\d+)$/;
-     $part_svc=qsearchs('part_svc',{'svcpart'=>$1});
+     my($query) = $cgi->keywords;
+     $query =~ /^(\d+)$/ or die "malformed query: $query";
+     $part_svc=qsearchs('part_svc', { 'svcpart'=>$1 } )
+       or die "unknown svcpart: $1";
    } else { #adding
      $part_svc = new FS::part_svc {};
    }
-- 
cgit v1.2.1


From 6b86dff993093cc34ca370ec8352103a7f3208f8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 12 Aug 2001 00:06:33 +0000
Subject: better error msgs

---
 FS/FS/cust_main_invoice.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm
index eb0162f0e..61a8f7534 100644
--- a/FS/FS/cust_main_invoice.pm
+++ b/FS/FS/cust_main_invoice.pm
@@ -133,13 +133,14 @@ sub checkdest {
   if ( $self->dest eq 'POST' ) {
     #contemplate our navel
   } elsif ( $self->dest =~ /^(\d+)$/ ) {
-    return "Unknown local account (specified by svcnum)"
+    return "Unknown local account (specified by svcnum: ". $self->dest. ")"
       unless qsearchs( 'svc_acct', { 'svcnum' => $self->dest } );
   } elsif ( $self->dest =~ /^([\w\.\-]+)\@(([\w\.\-]+\.)+\w+)$/ ) {
     my($user, $domain) = ($1, $2);
     if ( $domain eq $mydomain ) {
       my $svc_acct = qsearchs( 'svc_acct', { 'username' => $user } );
-      return "Unknown local account (specified literally)" unless $svc_acct;
+      return "Unknown local account: $user\@$domain (specified literally)"
+        unless $svc_acct;
       $svc_acct->svcnum =~ /^(\d+)$/ or die "Non-numeric svcnum?!";
       $self->dest($1);
     }
@@ -171,7 +172,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.5 2001-08-11 00:01:39 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.6 2001-08-12 00:06:33 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 738fe3e5e5944afa8a8b70c157141d8b09caf137 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 12 Aug 2001 00:07:00 +0000
Subject: transactional invoice_list setting yay!!!

---
 FS/FS/cust_main.pm | 83 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 75 insertions(+), 8 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index eb265820f..5804f6868 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -206,15 +206,16 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 sub table { 'cust_main'; }
 
-=item insert
+=item insert [ CUST_PKG_HASHREF [ , INVOICING_LIST_ARYREF ] ]
 
 Adds this customer to the database.  If there is an error, returns the error,
 otherwise returns false.
 
-There is a special insert mode in which you pass a data structure to the insert
-method containing FS::cust_pkg and FS::svc_I<tablename> objects.  When
-running under a transactional database, all records are inserted atomicly, or
-the transaction is rolled back.  There should be a better explanation of this,
+CUST_PKG_HASHREF: If you pass a Tie::RefHash data structure to the insert
+method containing FS::cust_pkg and FS::svc_I<tablename> objects, all records
+are inserted atomicly, or the transaction is rolled back (this requries a 
+transactional database).  Passing an empty hash reference is equivalent to
+not supplying this parameter.  There should be a better explanation of this,
 but until then, here's an example:
 
   use Tie::RefHash;
@@ -225,6 +226,15 @@ but until then, here's an example:
   );
   $cust_main->insert( \%hash );
 
+INVOICING_LIST_ARYREF: If you pass an arrarref to the insert method, it will
+be set as the invoicing list (see L<"invoicing_list">).  Errors return as
+expected and rollback the entire transaction; it is not necessary to call 
+check_invoicing_list first.  The invoicing_list is set after the records in the
+CUST_PKG_HASHREF above are inserted, so it is now possible set set an
+invoicing_list destination to the newly-created svc_acct.  Here's an example:
+
+  $cust_main->insert( {}, [ $email, 'POST' ] );
+
 =cut
 
 sub insert {
@@ -269,7 +279,7 @@ sub insert {
     return $error;
   }
 
-  if ( @param ) {
+  if ( @param ) { # CUST_PKG_HASHREF
     my $cust_pkgs = shift @param;
     foreach my $cust_pkg ( keys %$cust_pkgs ) {
       $cust_pkg->custnum( $self->custnum );
@@ -298,6 +308,16 @@ sub insert {
     return "No svc_acct record to apply pre-paid time";
   }
 
+  if ( @param ) { # INVOICING_LIST_ARYREF
+    my $invoicing_list = shift @param;
+    $error = $self->check_invoicing_list( $invoicing_list );
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+    $self->invoicing_list( $invoicing_list );
+  }
+
   if ( $amount ) {
     my $cust_credit = new FS::cust_credit {
       'custnum' => $self->custnum,
@@ -394,11 +414,58 @@ sub delete {
 
 }
 
-=item replace OLD_RECORD
+=item replace OLD_RECORD [ INVOICING_LIST_ARYREF ]
 
 Replaces the OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
+INVOICING_LIST_ARYREF: If you pass an arrarref to the insert method, it will
+be set as the invoicing list (see L<"invoicing_list">).  Errors return as
+expected and rollback the entire transaction; it is not necessary to call 
+check_invoicing_list first.  Here's an example:
+
+  $new_cust_main->replace( $old_cust_main, [ $email, 'POST' ] );
+
+=cut
+
+sub replace {
+  my $self = shift;
+  my $old = shift;
+  my @param = @_;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::replace($old);
+
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  if ( @param ) { # INVOICING_LIST_ARYREF
+    my $invoicing_list = shift @param;
+    $error = $self->check_invoicing_list( $invoicing_list );
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+    $self->invoicing_list( $invoicing_list );
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+
+}
+
 =item check
 
 Checks all fields to make sure this is a valid customer record.  If there is
@@ -1200,7 +1267,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.16 2001-08-11 05:52:15 ivan Exp $
+$Id: cust_main.pm,v 1.17 2001-08-12 00:07:00 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 77def6c1c51fc6f7273b7c23221f13850d6be1dd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 12 Aug 2001 00:07:55 +0000
Subject: use transactional invoice_list setting & eliminate non-sticky "first
 package"!

---
 httemplate/edit/cust_main.cgi         | 31 +++++++------
 httemplate/edit/process/cust_main.cgi | 85 +++++++----------------------------
 2 files changed, 32 insertions(+), 84 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 2941acdf3..f331e5321 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,11 +1,12 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.2 2001-08-11 05:52:56 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.3 2001-08-12 00:07:55 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
              $daytime $night $fax @invoicing_list $invoicing_list $payinfo
              $payname %payby %paybychecked $refnum $otaker $r );
-use vars qw ( $conf $pkgpart $username $password $popnum $ulen $ulen2 );
+use vars qw ( $conf $saved_pkgpart $username $password $popnum $ulen $ulen2 );
+use vars qw ( $error );
 #use CGI::Switch;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
@@ -32,16 +33,18 @@ $conf = new FS::Conf;
 
 #get record
 
+$error = '';
 if ( $cgi->param('error') ) {
+  $error = $cgi->param('error');
   $cust_main = new FS::cust_main ( {
     map { $_, scalar($cgi->param($_)) } fields('cust_main')
   } );
   $custnum = $cust_main->custnum;
-  $pkgpart = $cgi->param('pkgpart_svcpart') || '';
-  if ( $pkgpart =~ /^(\d+)_/ ) {
-    $pkgpart = $1;
+  $saved_pkgpart = $cgi->param('pkgpart_svcpart') || '';
+  if ( $saved_pkgpart =~ /^(\d+)_/ ) {
+    $saved_pkgpart = $1;
   } else {
-    $pkgpart = '';
+    $saved_pkgpart = '';
   }
   $username = $cgi->param('username');
   $password = $cgi->param('_password');
@@ -51,7 +54,7 @@ if ( $cgi->param('error') ) {
   $query =~ /^(\d+)$/;
   $custnum=$1;
   $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
-  $pkgpart = 0;
+  $saved_pkgpart = 0;
   $username = '';
   $password = '';
   $popnum = 0;
@@ -59,20 +62,20 @@ if ( $cgi->param('error') ) {
   $custnum='';
   $cust_main = new FS::cust_main ( {} );
   $cust_main->setfield('otaker',&getotaker);
-  $pkgpart = 0;
+  $saved_pkgpart = 0;
   $username = '';
   $password = '';
   $popnum = 0;
 }
+$cgi->delete_all();
 $action = $custnum ? 'Edit' : 'Add';
 
 # top
 
 $p1 = popurl(1);
 print $cgi->header( '-expires' => 'now' ), header("Customer $action", '');
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $error, "</FONT>"
+  if $error;
 
 print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST NAME="form1">!,
       qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!,
@@ -210,7 +213,7 @@ print <<END;
 END
 
   print '<BR>Service address ',
-        '(<INPUT TYPE="checkbox" NAME="same" onClick="samechanged(this)"';
+        '(<INPUT TYPE="checkbox" NAME="same" VALUE="Y" onClick="samechanged(this)"';
   unless ( $cust_main->ship_last ) {
     print ' CHECKED';
     foreach (
@@ -369,7 +372,7 @@ unless ( $custnum ) {
   #false laziness, copied from FS::cust_pkg::order
   my $pkgpart;
   if ( scalar(@agents) == 1 ) {
-    # $pkgpart->{PKGPART} is true iff $custnum may purchase $pkgpart
+    # $pkgpart->{PKGPART} is true iff $custnum may purchase PKGPART
     my($agent)=qsearchs('agent',{'agentnum'=> $agentnum });
     $pkgpart = $agent->pkgpart_hashref;
   } else {
@@ -397,7 +400,7 @@ unless ( $custnum ) {
       print qq!<OPTION VALUE="!,
 #              $part_pkg->pkgpart. "_". $pkgpart{ $part_pkg->pkgpart }, '"';
               $part_pkg->pkgpart. "_". $part_pkg->svcpart, '"';
-      print " SELECTED" if $pkgpart && ( $part_pkg->pkgpart == $pkgpart );
+      print " SELECTED" if $saved_pkgpart && ( $part_pkg->pkgpart == $saved_pkgpart );
       print ">", $part_pkg->pkg, " - ", $part_pkg->comment;
     }
     print "</SELECT></TD></TR>";
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 6c52113ba..1b916b00b 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -1,60 +1,5 @@
 <%
-#
-# $Id: cust_main.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/cust_main.cgi
-#
-# ivan@voicenet.com 96-dec-04
-#
-# added referral check
-# ivan@voicenet.com 97-jun-4
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-28
-#
-# same as above (again) and clean up some stuff ivan@sisd.com 98-feb-23
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'day' to 'daytime' because Pg6.3 reserves the day word
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cust_main.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.11  1999/08/10 12:54:06  ivan
-# use FS::cust_pkg::pkgpart_href
-#
-# Revision 1.10  1999/04/14 07:47:53  ivan
-# i18n fixes
-#
-# Revision 1.9  1999/04/07 15:22:19  ivan
-# don't use anchor in redirect
-#
-# Revision 1.8  1999/03/25 13:55:10  ivan
-# one-screen new customer entry (including package and service) for simple
-# packages with one svc_acct service
-#
-# Revision 1.7  1999/02/28 00:03:42  ivan
-# removed misleading comments
-#
-# Revision 1.6  1999/01/25 12:10:00  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:50  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:22:32  ivan
-# changes to track email addresses for email invoicing
-#
-# Revision 1.3  1998/12/17 08:40:19  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.2  1998/11/18 08:57:36  ivan
-# i18n, s/CGI-modules/CGI.pm/, FS::CGI::idiot instead of inline, FS::CGI::popurl
-#
+# $Id: cust_main.cgi,v 1.2 2001-08-12 00:07:55 ivan Exp $
 
 use strict;
 use vars qw( $cgi $payby @invoicing_list $new $custnum $error );
@@ -71,6 +16,8 @@ use FS::agent;
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
+$error = '';
+
 #unmunge stuff
 
 $cgi->param('tax','') unless defined($cgi->param('tax'));
@@ -106,10 +53,14 @@ $new = new FS::cust_main ( {
   } fields('cust_main')
 } );
 
-#perhaps the invocing_list magic should move to cust_main.pm?
-$error = $new->check_invoicing_list( \@invoicing_list );
+if ( defined($cgi->param('same')) && $cgi->param('same') eq "Y" ) {
+  $new->setfield("ship_$_", '') foreach qw(
+    last first company address1 address2 city county state zip
+    country daytime night fax
+  );
+}
 
-#perhaps this stuff should go to cust_main.pm as well
+#perhaps this stuff should go to cust_main.pm
 $cust_pkg = '';
 $svc_acct = '';
 if ( $new->custnum eq '' ) {
@@ -170,26 +121,20 @@ if ( $new->custnum eq '' ) {
     $error = "Can't assign username without a package!";
   }
 
-  $error ||= $new->insert;
-  if ( $cust_pkg && ! $error ) {
-    $cust_pkg->custnum( $new->custnum );
-    $error ||= $cust_pkg->insert; 
-    warn "WARNING: $error on pre-checked cust_pkg record!" if $error;
-    $svc_acct->pkgnum( $cust_pkg->pkgnum );
-    $error ||= $svc_acct->insert;
-    warn "WARNING: $error on pre-checked svc_acct record!" if $error;
-  }
+  use Tie::RefHash;
+  tie my %hash, 'Tie::RefHash';
+  %hash = ( $cust_pkg => [ $svc_acct ] );
+  $error ||= $new->insert( \%hash, \@invoicing_list );
 } else { #create old record object
   my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } ); 
   $error ||= "Old record not found!" unless $old;
-  $error ||= $new->replace($old);
+  $error ||= $new->replace($old, \@invoicing_list);
 }
 
 if ( $error ) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). "cust_main.cgi?". $cgi->query_string );
 } else { 
-  $new->invoicing_list( \@invoicing_list );
   $custnum = $new->custnum;
   print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
 } 
-- 
cgit v1.2.1


From 0189417cb97a59db6e071ae4efc0b5d1d02fc8df Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 12 Aug 2001 01:26:08 +0000
Subject: i did get it working

---
 httemplate/docs/postgresql.html | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/httemplate/docs/postgresql.html b/httemplate/docs/postgresql.html
index 151081176..1356739d6 100755
--- a/httemplate/docs/postgresql.html
+++ b/httemplate/docs/postgresql.html
@@ -13,11 +13,5 @@ engine, or recompile PostgreSQL with 64 character column names.
 Future versions of Freeside will keep all column names under 31 characters to
 avoid this problem.
 </p>
-<p>
-( I've personally been unable to get PostgreSQL working with larger column names,
-though the process does look like it should be straightforward.  If anyone is
-interested in assisting me with this, please get in touch.
- -Ivan <a href="mailto:ivan@sisd.com">&lt;ivan@sisd.com</a>&gt; )
-</p>
 </body>
 
-- 
cgit v1.2.1


From 67e59b7ab85227889ca127b875b4138f018c844d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 12 Aug 2001 08:56:42 +0000
Subject: don't use Apache::ASP-specific $Redirect object

---
 httemplate/edit/process/part_svc.cgi | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 4c972e4d7..093d86a75 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -21,10 +21,9 @@ if ( $svcpart ) {
 
 if ( $error ) {
   $cgi->param('error', $error);
-  $Response->Redirect(popurl(2). "part_svc.cgi?". $cgi->query_string );
+  print $cgi->redirect(popurl(2), "part_svc.cgi?". $cgi->query_string );
 } else {
-  warn "redirecting to ". popurl(3)."browse/part_svc.cgi via $Response";
-  $Response->Redirect(popurl(3)."browse/part_svc.cgi");
+  print $cgi->redirect(popurl(3)."browse/part_svc.cgi");
 }
 
 %>
-- 
cgit v1.2.1


From 4d513ff5a17bd3b697502b54c9516577a0a8d3e4 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sun, 12 Aug 2001 19:41:26 +0000
Subject: merging vpopmail support branch

---
 FS/FS/svc_acct.pm             |  12 +-
 FS/FS/svc_domain.pm           |   5 +-
 FS/FS/svc_forward.pm          | 255 ++++++++++++++++
 bin/fs-migrate-svc_acct_sm    | 242 ++++++++++++++++
 bin/fs-setup                  |  25 +-
 bin/svc_acct.export           | 654 ++++++++++++++++++++++++++++--------------
 bin/svc_acct_sm.export        | 254 ----------------
 htdocs/docs/config.html       |   2 +
 htdocs/docs/upgrade8.html     |  52 ++++
 httemplate/docs/config.html   |   3 +
 httemplate/docs/upgrade8.html |  27 ++
 11 files changed, 1055 insertions(+), 476 deletions(-)
 create mode 100644 FS/FS/svc_forward.pm
 create mode 100755 bin/fs-migrate-svc_acct_sm
 delete mode 100755 bin/svc_acct_sm.export
 create mode 100644 htdocs/docs/upgrade8.html

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 4b7ec98c4..83263b0e4 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -82,6 +82,10 @@ FS::svc_acct - Object methods for svc_acct records
 
   %hash = $record->radius;
 
+  %hash = $record->radius_reply;
+
+  %hash = $record->radius_check;
+
 =head1 DESCRIPTION
 
 An FS::svc_acct object represents an account.  FS::svc_acct inherits from
@@ -113,6 +117,8 @@ FS::svc_Common.  The following fields are currently supported:
 
 =item radius_I<Radius_Attribute> - I<Radius-Attribute>
 
+=item domsvc - service number of svc_domain with which to associate
+
 =back
 
 =head1 METHODS
@@ -169,7 +175,9 @@ sub insert {
   return $error if $error;
 
   return "Username ". $self->username. " in use"
-    if qsearchs( 'svc_acct', { 'username' => $self->username } );
+    if qsearchs( 'svc_acct', { 'username' => $self->username,
+                               'domsvc'   => $self->domsvc,
+                             } );
 
   my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
   return "Unknown svcpart" unless $part_svc;
@@ -544,7 +552,7 @@ sub radius_check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.19 2001-07-30 07:34:41 ivan Exp $
+$Id: svc_acct.pm,v 1.20 2001-08-12 19:41:24 jeff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 01aa21a6c..fcfcfa955 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -336,6 +336,9 @@ sub check {
   $recref->{action} =~ /^(M|N)$/ or return "Illegal action";
   $recref->{action} = $1;
 
+  my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $recref->{catchall} } );
+  return "Unknown catchall" unless $svc_acct || ! $recref->{catchall};
+
   $self->ut_textn('purpose');
 
 }
@@ -478,7 +481,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.12 2001-06-03 17:22:52 ivan Exp $
+$Id: svc_domain.pm,v 1.13 2001-08-12 19:41:24 jeff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
new file mode 100644
index 000000000..5264a60b1
--- /dev/null
+++ b/FS/FS/svc_forward.pm
@@ -0,0 +1,255 @@
+package FS::svc_forward;
+
+use strict;
+use vars qw( @ISA $nossh_hack $conf $shellmachine @qmailmachines @vpopmailmachines);
+use FS::Record qw( fields qsearch qsearchs );
+use FS::svc_Common;
+use FS::cust_svc;
+use Net::SSH qw(ssh);
+use FS::Conf;
+use FS::svc_acct;
+use FS::svc_domain;
+
+@ISA = qw( FS::svc_Common );
+
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::svc_forward'} = sub { 
+  $conf = new FS::Conf;
+  $shellmachine = $conf->exists('qmailmachines')
+                  ? $conf->config('shellmachine')
+                  : '';
+  if ( $conf->exists('vpopmailmachines') ) {
+    @vpopmailmachines = $conf->config('vpopmailmachines');
+  }
+};
+
+=head1 NAME
+
+FS::svc_forward - Object methods for svc_forward records
+
+=head1 SYNOPSIS
+
+  use FS::svc_forward;
+
+  $record = new FS::svc_forward \%hash;
+  $record = new FS::svc_forward { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $error = $record->suspend;
+
+  $error = $record->unsuspend;
+
+  $error = $record->cancel;
+
+=head1 DESCRIPTION
+
+An FS::svc_forward object represents a mail forwarding alias.  FS::svc_forward
+inherits from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item svcnum - primary key (assigned automatcially for new accounts)
+
+=item srcsvc - svcnum of the source of the forward (see L<FS::svc_acct>)
+
+=item dstsvc - svcnum of the destination of the forward (see L<FS::svc_acct>)
+
+=item dst - foreign destination (email address) - forward not local to freeside
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new mail forwarding alias.  To add the mail forwarding alias to the
+database, see L<"insert">.
+
+=cut
+
+sub table { 'svc_forward'; }
+
+=item insert
+
+Adds this mail forwarding alias to the database.  If there is an error, returns
+the error, otherwise returns false.
+
+The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
+defined.  An FS::cust_svc record will be created and inserted.
+
+If the configuration values (see L<FS::Conf>) vpopmailmachines exist, then
+the command:
+
+  [ -d /home/vpopmail/$vdomain/$source ] || {
+    echo "$destination" >> /home/vpopmail/$vdomain/$source/.$qmail
+    chown $vpopuid:$vpopgid /home/vpopmail/$vdomain/$source/.$qmail
+  }
+
+is executed on each vpopmailmachine via ssh (see L<dot-qmail/"EXTENSION ADDRESSES">).
+This behaviour can be surpressed by setting $FS::svc_forward::nossh_hack true.
+
+=cut
+
+sub insert {
+  my $self = shift;
+  my $error;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  $error=$self->check;
+  return $error if $error;
+
+  $error = $self->SUPER::insert;
+  return $error if $error;
+
+  my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->srcsvc } );
+  my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $svc_acct->domsvc } );
+  my $source = $svc_acct->username . $svc_domain->domain;
+  my $destination;
+  if ($self->dstdvc) {
+    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->dstsvc } );
+    my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $svc_acct->domsvc } );
+    $destination = $svc_acct->username . $svc_domain->domain;
+  } else {
+    $destination = $self->dst;
+  }
+    
+  my $vdomain = $svc_acct->domain;
+
+  foreach my $vpopmailmachine ( @vpopmailmachines ) {
+    my ($machine, $vpopdir, $vpopuid, $vpopgid) = split (/\s+/, $vpopmailmachine);
+
+    ssh("root\@$machine","[ -d $vpopdir/$vdomain/$source ] || { echo $destination >> $vpopdir/$vdomain/$source/.qmail; chown $vpopuid:$vpopgid $vpopdir/$vdomain/$source/.qmail; }")  
+      if ( ! $nossh_hack && $machine);
+  }
+
+  ''; #no error
+
+}
+
+=item delete
+
+Deletes this mail forwarding alias from the database.  If there is an error,
+returns the error, otherwise returns false.
+
+The corresponding FS::cust_svc record will be deleted as well.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my ( $new, $old ) = ( shift, shift );
+  my $error;
+
+ $new->SUPER::replace($old);
+
+}
+
+=item suspend
+
+Just returns false (no error) for now.
+
+Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item unsuspend
+
+Just returns false (no error) for now.
+
+Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item cancel
+
+Just returns false (no error) for now.
+
+Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item check
+
+Checks all fields to make sure this is a valid mail forwarding alias.  If there
+is an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+Sets any fixed values; see L<FS::part_svc>.
+
+=cut
+
+sub check {
+  my $self = shift;
+  my $error;
+
+  my $x = $self->setfixed;
+  return $x unless ref($x);
+  my $part_svc = $x;
+
+  my($recref) = $self->hashref;
+
+  $recref->{srcsvc} =~ /^(\d+)$/ or return "Illegal srcsvc";
+  $recref->{srcsvc} = $1;
+  my($svc_acct);
+  return "Unknown srcsvc" unless
+    $svc_acct=qsearchs('svc_acct',{'svcnum'=> $recref->{srcsvc} } );
+
+  return "Illegal use of dstsvc and dst" if
+    ($recref->{dstsvc} && $recref->{dst});
+
+  return "Illegal use of dstsvc and dst" if
+    (! $recref->{dstsvc} && ! $recref->{dst});
+
+  $recref->{dstsvc} =~ /^(\d+)$/ or return "Illegal dstsvc";
+  $recref->{dstsvc} = $1;
+
+  if ($recref->{dstsvc}) {
+    my($svc_acct);
+    return "Unknown dstsvc" unless
+      my $svc_domain=qsearchs('svc_acct',{'svcnum'=> $recref->{dstsvc} } );
+  }
+
+  if ($recref->{dst}) {
+    $recref->{dst} =~ /^(\w\.\-]+)\@(([\w\.\-]+\.)+\w+)$/
+       or return "Illegal dst";
+    $recref->{dst} = $1;
+  }
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: svc_forward.pm,v 1.2 2001-08-12 19:41:24 jeff Exp $
+
+=head1 BUGS
+
+The remote commands should be configurable.
+
+The $recref stuff in sub check should be cleaned up.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
+L<FS::svc_acct>, L<FS::svc_domain>, L<Net::SSH>, L<ssh>, L<dot-qmail>,
+schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/bin/fs-migrate-svc_acct_sm b/bin/fs-migrate-svc_acct_sm
new file mode 100755
index 000000000..d0d4a94b6
--- /dev/null
+++ b/bin/fs-migrate-svc_acct_sm
@@ -0,0 +1,242 @@
+#!/usr/bin/perl -Tw
+#
+# $Id: fs-migrate-svc_acct_sm,v 1.2 2001-08-12 19:41:25 jeff Exp $
+#
+# jeff@cmh.net 01-Jul-20
+#
+# $Log: fs-migrate-svc_acct_sm,v $
+# Revision 1.2  2001-08-12 19:41:25  jeff
+# merging vpopmail support branch
+#
+# Revision 1.1.2.1  2001/08/08 17:45:35  jeff
+# initial vpopmail support
+#
+#
+#
+#   Initial vpopmail changes
+#
+
+#to delay loading dbdef until we're ready
+#BEGIN { $FS::Record::setup_hack = 1; }
+
+use strict;
+use Term::Query qw(query);
+#use DBI;
+#use DBIx::DBSchema;
+#use DBIx::DBSchema::Table;
+#use DBIx::DBSchema::Column;
+#use DBIx::DBSchema::ColGroup::Unique;
+#use DBIx::DBSchema::ColGroup::Index;
+use FS::Conf;
+use FS::UID qw(adminsuidsetup datasrc checkeuid getsecrets);
+use FS::Record qw(qsearch qsearchs);
+use FS::svc_domain;
+use FS::svc_forward;
+use vars qw( $conf $old_default_domain %part_domain_svc %part_acct_svc %part_forward_svc $svc_acct $svc_acct_sm $error);
+
+die "Not running uid freeside!" unless checkeuid();
+
+my $user = shift or die &usage;
+getsecrets($user);
+
+$conf = new FS::Conf;
+$old_default_domain = $conf->config('domain');
+
+#needs to match FS::Record
+#my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;
+
+###
+# This section would be the appropriate place to manipulate
+# the schema & tables.
+###
+
+##  we need to add the domsvc to svc_acct
+##  we must add a svc_forward record....
+##  I am thinking that the fields  svcnum (int), destsvc (int), and
+##  dest (varchar (80))  are appropriate, with destsvc/dest an either/or
+##  much in the spirit of cust_main_invoice
+
+###
+# massage the data
+###
+
+my($dbh)=adminsuidsetup $user;
+
+$|=1;
+
+$FS::svc_acct::nossh_hack = 1;
+$FS::svc_forward::nossh_hack = 1;
+$FS::svc_domain::whois_hack = 1;
+
+%part_domain_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_domain'});
+%part_acct_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_acct'});
+%part_forward_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_forward'});
+
+die "No services with svcdb svc_domain!\n" unless %part_domain_svc;
+die "No services with svcdb svc_acct!\n" unless %part_acct_svc;
+die "No services with svcdb svc_forward!\n" unless %part_forward_svc;
+
+my($svc_domain) = qsearchs('svc_domain', { 'domain' => $old_default_domain });
+if (! $svc_domain || $svc_domain->domain != $old_default_domain) {
+   print <<EOF;
+
+Your database currently does not contain a svc_domain record for the
+domain $old_default_domain.  Would you like me to add one for you?
+EOF
+
+   my($response)=scalar(<STDIN>);
+   chop $response;
+   if ($response =~ /^[yY]/) {
+      print "\n\n", &menu_domain_svc, "\n", <<END;
+I need to create new domain accounts.  Which service shall I use for that?
+END
+      my($domain_svcpart)=&getdomainpart;
+
+      $svc_domain = new FS::svc_domain {
+        'domain' => $old_default_domain,
+        'svcpart' => $domain_svcpart,
+        'action' => 'M',
+       };
+#      $error=$svc_domain->insert && die "Error adding domain $old_default_domain: $error";
+      $error=$svc_domain->insert;
+      die "Error adding domain $old_default_domain: $error" if $error;
+   }else{
+      print <<EOF;
+
+  This program cannot function properly until a svc_domain record matching
+your conf_dir/domain file exists.
+EOF
+
+      exit 1;
+   }
+}
+
+print "\n\n", &menu_acct_svc, "\n", <<END;
+I may need to create some new pop accounts and set up forwarding to them
+for some users.  Which service shall I use for that?
+END
+my($pop_svcpart)=&getacctpart;
+
+print "\n\n", &menu_forward_svc, "\n", <<END;
+I may need to create some new forwarding for some users.  Which service
+shall I use for that?
+END
+my($forward_svcpart)=&getforwardpart;
+
+sub menu_domain_svc {
+  ( join "\n", map "$_: ".$part_domain_svc{$_}->svc, sort keys %part_domain_svc ). "\n";
+}
+sub menu_acct_svc {
+  ( join "\n", map "$_: ".$part_acct_svc{$_}->svc, sort keys %part_acct_svc ). "\n";
+}
+sub menu_forward_svc {
+  ( join "\n", map "$_: ".$part_forward_svc{$_}->svc, sort keys %part_forward_svc ). "\n";
+}
+sub getdomainpart {
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query "Enter part number:", 'irk', [ keys %part_domain_svc ];
+  $^W=1;
+  $return;
+}
+sub getacctpart {
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query "Enter part number:", 'irk', [ keys %part_acct_svc ];
+  $^W=1;
+  $return;
+}
+sub getforwardpart {
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query "Enter part number:", 'irk', [ keys %part_forward_svc ];
+  $^W=1;
+  $return;
+}
+
+
+#migrate data
+
+my(@svc_accts) = qsearch('svc_acct', {});
+foreach $svc_acct (@svc_accts) {
+  my(@svc_acct_sms) = qsearch('svc_acct_sm', {
+      domuid => $svc_acct->getfield('uid'),
+      }
+    );
+
+  #  Ok.. we've got the svc_acct record, and an array of svc_acct_sm's
+  #  What do we do from here?
+
+  #  The intuitive:
+  #    plop the svc_acct into the 'default domain'
+  #    and then represent the svc_acct_sm's with svc_forwards
+  #    they can be gussied up manually, later
+  #
+  #  Perhaps better:
+  #    when no svc_acct_sm exists, place svc_acct in 'default domain'
+  #    when one svc_acct_sm exists, place svc_acct in corresponding
+  #      domain & possibly create a svc_forward in 'default domain'
+  #    when multiple svc_acct_sm's exists (in different domains) we'd
+  #    better use the 'intuitive' approach.
+  #
+  #  Specific way:
+  #    as 'perhaps better,' but we may be able to guess which domain
+  #    is correct by comparing the svcnum of domains to the username
+  #    of the svc_acct
+  #
+
+  # The intuitive way:
+
+  my $def_acct = new FS::svc_acct ( { $svc_acct->hash } );
+  $def_acct->setfield('domsvc' => $svc_domain->getfield('svcnum'));
+  $error = $def_acct->replace($svc_acct);
+  die "Error replacing svc_acct for " . $def_acct->username . " : $error" if $error;
+
+  foreach $svc_acct_sm (@svc_acct_sms) {
+
+    my($domrec)=qsearchs('svc_domain', {
+      svcnum => $svc_acct_sm->getfield('domsvc'),
+    }) || die  "svc_acct_sm references invalid domsvc $svc_acct_sm->getfield('domsvc')\n";
+
+    if ($svc_acct_sm->getfield('domuser') =~ /^\*$/) {
+      
+      my($newdom) = new FS::svc_domain ( { $domrec->hash } );
+      $newdom->setfield('catchall', $svc_acct->svcnum);
+      $newdom->setfield('action', "M");
+      $error = $newdom->replace($domrec);
+      die "Error replacing svc_domain for (anything)@" . $domrec->domain . " : $error" if $error;
+
+    } else {
+
+      my($newacct) = new FS::svc_acct {
+        'svcpart'  => $pop_svcpart,
+        'username' => $svc_acct_sm->getfield('domuser'),
+        'domsvc'   => $svc_acct_sm->getfield('domsvc'),
+        'dir'      => '/dev/null',
+      };
+      $error = $newacct->insert;
+      die "Error adding svc_acct for " . $newacct->username . " : $error" if $error;
+     
+      my($newforward) = new FS::svc_forward {
+        'svcpart'  => $forward_svcpart, 
+        'srcsvc'   => $newacct->getfield('svcnum'),
+        'dstsvc'   => $def_acct->getfield('svcnum'),
+      };
+      $error = $newforward->insert;
+      die "Error adding svc_forward for " . $newacct->username ." : $error" if $error;
+    }
+     
+    $error = $svc_acct_sm->delete;
+    die "Error deleting svc_acct_sm for " . $svc_acct_sm->domuser ." : $error" if $error;
+
+  };
+
+};
+
+
+$dbh->commit or die $dbh->errstr;
+$dbh->disconnect or die $dbh->errstr;
+
+print "svc_acct_sm records sucessfully migrated\n";
+
+sub usage {
+  die "Usage:\n  fs-migrate-svc_acct_sm user\n"; 
+}
+
diff --git a/bin/fs-setup b/bin/fs-setup
index 314a7c234..a3e067bec 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.40 2001-08-11 05:53:42 ivan Exp $
+# $Id: fs-setup,v 1.41 2001-08-12 19:41:25 jeff Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.40  2001-08-11 05:53:42  ivan
+# Revision 1.41  2001-08-12 19:41:25  jeff
+# merging vpopmail support branch
+#
+# Revision 1.40  2001/08/11 05:53:42  ivan
 # add comments field
 #
 # Revision 1.39  2001/07/30 07:42:39  ivan
@@ -271,7 +274,7 @@ my($part_svc)=$dbdef->table('part_svc');
 #because of svc_acct_pop
 #foreach (grep /^svc_/, $dbdef->tables) { 
 #foreach (qw(svc_acct svc_acct_sm svc_charge svc_domain svc_wo)) {
-foreach (qw(svc_acct svc_acct_sm svc_domain svc_www)) {
+foreach (qw(svc_acct svc_acct_sm svc_domain svc_forward svc_www)) {
   my($table)=$dbdef->table($_);
   my($col);
   foreach $col ( $table->columns ) {
@@ -707,10 +710,11 @@ sub tables_hash_hack {
         'quota',     'varchar',   'NULL',   $char_d,
         'slipip',    'varchar',   'NULL',   15, #four TINYINTs, bah.
         'seconds',   'int', 'NULL',   '', #uhhhh
+        'domsvc',    'int', '',   '',
       ],
       'primary_key' => 'svcnum',
       'unique' => [ [] ],
-      'index' => [ ['username'] ],
+      'index' => [ ['username'], ['domsvc'] ],
     },
 
     'svc_acct_sm' => {
@@ -739,6 +743,7 @@ sub tables_hash_hack {
       'columns' => [
         'svcnum',    'int',    '',   '',
         'domain',    'varchar',    '',   $char_d,
+        'catchall',  'int',    '',    '',
       ],
       'primary_key' => 'svcnum',
       'unique' => [ ['domain'] ],
@@ -759,6 +764,18 @@ sub tables_hash_hack {
       'index'       => [ ['svcnum'] ],
     },
 
+    'svc_forward' => {
+      'columns' => [
+        'svcnum',   'int',    '',  '',
+        'srcsvc',   'int',    '',  '',
+        'dstsvc',   'int',    '',  '',
+        'dst',      'varchar',    'NULL',  $char_d,
+      ],
+      'primary_key' => 'svcnum',
+      'unique'      => [ [] ],
+      'index'       => [ ['srcsvc'], ['dstsvc'] ],
+    },
+
     'svc_www' => {
       'columns' => [
         'svcnum',   'int',    '',  '',
diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 7e92c61e8..a7a21b3e5 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,99 +1,42 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.21 2001-07-30 06:07:46 ivan Exp $
+# $Id: svc_acct.export,v 1.22 2001-08-12 19:41:25 jeff Exp $
 #
-# Create and export password files: passwd, passwd.adjunct, shadow,
-# acp_passwd, acp_userinfo, acp_dialup, users
+# Create and export password, radius and vpopmail password files:
+# passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
+# users/assign, domains/vdomain/vpasswd
+# Also export sendmail and qmail config files.
 #
-# ivan@voicenet.com late august/september 96
-# (the password encryption bits were from melody)
 #
-# use a temporary copy of svc_acct to minimize lock time on the real file,
-# and skip blank entries.
-#
-# ivan@voicenet.com 96-Oct-6
-#
-# change users / acp_dialup file formats
-# ivan@voicenet.com 97-jan-28-31
-#
-# change priority (after copies) to 19, not 10
-# ivan@voicenet.com 97-feb-5
-#
-# added exit if stuff is already locked 97-apr-15
-#
-# rewrite ivan@sisd.com 98-mar-9
-#
-# Changed 'password' to '_password' because Pg6.3 reserves this word
-# Added code to create a FreeBSD style master.passwd file
-#   bmccane@maxbaud.net 98-Apr-3
-#
-# don't export non-root 0 UID's, even if they get put in the database
-# ivan@sisd.com 98-jul-14
-#
-# Uses Idle_Timeout, Port_Limit, Framed_Netmask and Framed_Route if they
-# exist; need some way to support arbitrary radius fields.  also 
-# /var/spool/freeside/conf/ ivan@sisd.com 98-jul-26, aug-9
-#
-# OOPS!  added arbitrary radius fields (pry 98-aug-16) but forgot to say so.
-# ivan@sisd.com 98-sep-18
-# 
 # $Log: svc_acct.export,v $
-# Revision 1.21  2001-07-30 06:07:46  ivan
-# allow !! for locked accounts instead of changing to *SUSPENDED*
-#
-# Revision 1.20  2001/06/20 08:33:42  ivan
-# >     Use of uninitialized value in concatenation (.) at svc_acct.export line
-# > 276.
-#
-# Revision 1.19  2001/05/08 10:44:17  ivan
-# fix for OO Net::SCP
-#
-# Revision 1.18  2001/04/22 01:56:15  ivan
-# get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)
-#
-# Revision 1.17  2001/02/21 23:48:19  ivan
-# add icradius_secrets config file to export to a non-Freeside MySQL database for
-# ICRADIUS
-#
-# Revision 1.16  2000/07/06 13:23:29  ivan
-# tyop
+# Revision 1.22  2001-08-12 19:41:25  jeff
+# merging vpopmail support branch
 #
-# Revision 1.15  2000/07/06 08:57:28  ivan
-# support for radius check attributes (except importing).  poorly documented.
-#
-# Revision 1.14  2000/06/29 15:01:25  ivan
-# another silly typo in svc_acct.export
-#
-# Revision 1.13  2000/06/28 12:37:28  ivan
-# add support for config option textradiusprepend
-#
-# Revision 1.12  2000/06/15 14:07:02  ivan
-# added ICRADIUS radreply table support, courtesy of Kenny Elliott
-#
-# Revision 1.11  2000/03/06 16:00:39  ivan
-# sync up with working versoin
-#
-# Revision 1.2  1998/12/10 07:23:15  ivan
-# use FS::Conf, need user (for datasrc)
 #
 
 use strict;
 use vars qw($conf);
+use Archive::Tar;
 use Fcntl qw(:flock);
+use File::Path;
 use IO::Handle;
-use DBI;
 use FS::Conf;
 use Net::SSH qw(ssh);
 use Net::SCP qw(scp);
 use FS::UID qw(adminsuidsetup datasrc dbh);
-use FS::Record qw(qsearch fields);
+use FS::Record qw(qsearch qsearchs fields);
 use FS::svc_acct;
+use FS::svc_domain;
+use FS::svc_forward;
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
 
 $conf = new FS::Conf;
 
+my $userpolicy = $conf->config('username_policy')
+  if $conf->exists('username_policy');
+
 my @shellmachines = $conf->config('shellmachines')
   if $conf->exists('shellmachines');
 
@@ -130,6 +73,29 @@ my $textradiusprepend =
     ? $conf->config('textradiusprepend')
     : '';
 
+my @vpopmailmachines = $conf->config('vpopmailmachines')
+  if $conf->exists('vpopmailmachines');
+
+my ($machine, $vpopdir, $vpopuid, $vpopgid) = split (/\s+/, $vpopmailmachines[0]);
+
+my($shellmachine, @qmailmachines);
+if ( $conf->exists('qmailmachines') ) {
+  $shellmachine = $conf->config('shellmachine');
+  @qmailmachines = $conf->config('qmailmachines');
+}
+
+my(@sendmailmachines, $sendmailconfigpath, $sendmailrestart);
+if ( $conf->exists('sendmailmachines') ) {
+  @sendmailmachines = $conf->config('sendmailmachines');
+  $sendmailconfigpath = $conf->config('sendmailconfigpath') || '/etc';
+  $sendmailrestart = $conf->config('sendmailrestart');
+}
+
+my $mydomain = $conf->config('domain') if $conf->exists('domain');
+
+
+
+
 my(@saltset)= ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
 require 5.004; #srand(time|$$);
 
@@ -142,42 +108,81 @@ unless ( flock(EXPORT,LOCK_EX|LOCK_NB) ) {
   seek(EXPORT,0,0);
   my($pid)=<EXPORT>;
   chop($pid);
-  #no reason to start loct of blocking processes
+  #no reason to start lots of blocking processes
   die "Is another export process running under pid $pid?\n";
 }
 seek(EXPORT,0,0);
 print EXPORT $$,"\n";
 
-my(@svc_acct)=qsearch('svc_acct',{});
+my(@svc_domain)=qsearch('svc_domain',{});
 
 ( open(MASTER,">$spooldir/master.passwd")
-  and flock(MASTER,LOCK_EX|LOCK_NB)
-) or die "Can't open $spooldir/master.passwd: $!";
+  and flock(MASTER,LOCK_EX|LOCK_NB)  
+) or die "Can't open $spooldir/.master.passwd: $!";
 ( open(PASSWD,">$spooldir/passwd")
   and flock(PASSWD,LOCK_EX|LOCK_NB)  
 ) or die "Can't open $spooldir/passwd: $!";
 ( open(SHADOW,">$spooldir/shadow")
-  and flock(SHADOW,LOCK_EX|LOCK_NB) 
+  and flock(SHADOW,LOCK_EX|LOCK_NB)  
 ) or die "Can't open $spooldir/shadow: $!";
-( open(ACP_PASSWD,">$spooldir/acp_passwd") 
-  and flock (ACP_PASSWD,LOCK_EX|LOCK_NB)
+( open(ACP_PASSWD,">$spooldir/acp_passwd")
+  and flock(ACP_PASSWD,LOCK_EX|LOCK_NB)  
 ) or die "Can't open $spooldir/acp_passwd: $!";
-( open (ACP_DIALUP,">$spooldir/acp_dialup")
-  and flock(ACP_DIALUP,LOCK_EX|LOCK_NB)
+( open(ACP_DIALUP,">$spooldir/acp_dialup")
+  and flock(ACP_DIALUP,LOCK_EX|LOCK_NB)  
 ) or die "Can't open $spooldir/acp_dialup: $!";
-( open (USERS,">$spooldir/users")
-  and flock(USERS,LOCK_EX|LOCK_NB)
+( open(USERS,">$spooldir/users")
+  and flock(USERS,LOCK_EX|LOCK_NB)  
 ) or die "Can't open $spooldir/users: $!";
 
+( open(ASSIGN,">$spooldir/assign")
+  and flock(ASSIGN,LOCK_EX|LOCK_NB)  
+) or die "Can't open $spooldir/assign: $!";
+( open(RCPTHOSTS,">$spooldir/rcpthosts")
+  and flock(RCPTHOSTS,LOCK_EX|LOCK_NB) 
+) or die "Can't open $spooldir/rcpthosts: $!";
+( open(VPOPRCPTHOSTS,">$spooldir/vpoprcpthosts")
+  and flock(VPOPRCPTHOSTS,LOCK_EX|LOCK_NB) 
+) or die "Can't open $spooldir/rcpthosts: $!";
+( open(RECIPIENTMAP,">$spooldir/recipientmap") 
+  and flock(RECIPIENTMAP,LOCK_EX|LOCK_NB) 
+) or die "Can't open $spooldir/recipientmap: $!";
+( open(VIRTUALDOMAINS,">$spooldir/virtualdomains") 
+  and flock(VIRTUALDOMAINS,LOCK_EX|LOCK_NB)
+) or die "Can't open $spooldir/virtualdomains: $!";
+( open(VPOPVIRTUALDOMAINS,">$spooldir/vpopvirtualdomains") 
+  and flock(VPOPVIRTUALDOMAINS,LOCK_EX|LOCK_NB)
+) or die "Can't open $spooldir/virtualdomains: $!";
+( open(VIRTUSERTABLE,">$spooldir/virtusertable")
+  and flock(VIRTUSERTABLE,LOCK_EX|LOCK_NB)
+) or die "Can't open $spooldir/virtusertable: $!";
+( open(SENDMAIL_CW,">$spooldir/sendmail.cw")
+  and flock(SENDMAIL_CW,LOCK_EX|LOCK_NB)
+) or die "Can't open $spooldir/sendmail.cw: $!";
+
+
+
 chmod 0644, "$spooldir/passwd",
             "$spooldir/acp_dialup",
+            "$spooldir/assign",
+            "$spooldir/sendmail.cw",
+            "$spooldir/virtusertable",
+            "$spooldir/rcpthosts",
+            "$spooldir/vpoprcpthosts",
+            "$spooldir/recipientmap",
+            "$spooldir/virtualdomains",
+            "$spooldir/vpopvirtualdomains",
+
 ;
 chmod 0600, "$spooldir/master.passwd",
-	    "$spooldir/acp_passwd",
+            "$spooldir/acp_passwd",
             "$spooldir/shadow",
             "$spooldir/users",
 ;
 
+rmtree"$spooldir/domains", 0, 1;
+mkdir "$spooldir/domains", 0700;
+
 if ( $icradiusmachines ) {
   my $sth = $icradius_dbh->prepare("DELETE FROM radcheck");
   $sth->execute or die "Can't reset radcheck table: ". $sth->errstr;
@@ -187,168 +192,321 @@ if ( $icradiusmachines ) {
 
 setpriority(0,0,10);
 
-my($svc_acct);
-foreach $svc_acct (@svc_acct) {
-
-  my($password)=$svc_acct->getfield('_password');
-  my($cpassword,$rpassword);
-  if ( ( length($password) <= 8 )
-       && ( $password ne '*' )
-       && ( $password ne '!!' )
-       && ( $password ne '' )
-     ) {
-    $cpassword=crypt($password,
-                     $saltset[int(rand(64))].$saltset[int(rand(64))]
-    );
-    $rpassword=$password;
-  } else {
-    $cpassword=$password;
-    $rpassword='UNIX';
-  }
-
-  if ( $svc_acct->uid  =~ /^(\d+)$/ ) {
-
-    die "Non-root user ". $svc_acct->username. " has 0 UID!"
-      if $svc_acct->uid == 0 && $svc_acct->username ne 'root';
+my %usernames;  ## this hack helps keep the passwd files sane
+my @sendmail;
+
+my $svc_domain;
+foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) {
+
+  my($domain)=$svc_domain->domain;
+  print RCPTHOSTS "$domain\n.$domain\n";
+  print VPOPRCPTHOSTS "$domain\n";
+  print SENDMAIL_CW "$domain\n";
+
+  ###
+  # FORMAT OF THE ASSIGN/USERS FILE HERE
+  print ASSIGN join(":",
+    "+" . $domain . "-",
+    $domain,
+    $vpopuid,
+    $vpopgid,
+    $vpopdir . "/domains/" . $domain,
+    "-",
+    "",
+    "",
+  ), "\n";
+
+  (mkdir "$spooldir/domains/" . $domain, 0700)
+    or die "Can't create $spooldir/domains/" . $domain .": $!";
+
+  ( open(QMAILDEFAULT,">$spooldir/domains/" . $domain . "/.qmail-default")
+    and flock(QMAILDEFAULT,LOCK_EX|LOCK_NB)  
+  ) or die "Can't open $spooldir/domains/" . $domain . "/.qmail-default: $!";
+
+  ( open(VPASSWD,">$spooldir/domains/" . $domain . "/vpasswd")
+    and flock(VPASSWD,LOCK_EX|LOCK_NB)  
+  ) or die "Can't open $spooldir/domains/" . $domain . "/vpasswd: $!";
+
+  my ($svc_acct);
+
+  if ($svc_domain->catchall) {
+    $svc_acct = qsearchs('svc_acct', {'svcnum' => $svc_domain->catchall});
+    die "Cannot find catchall account for domain $domain\n" unless $svc_acct;
+
+    my $username = $svc_acct->username;
+    push @sendmail, "\@$domain\t$username\n";
+    print VIRTUALDOMAINS "$domain:$username-$domain\n",
+                         ".$domain:$username-$domain\n",
+    ;
 
     ###
-    # FORMAT OF FreeBSD MASTER PASSWD FILE HERE
-    print MASTER join(":",
-      $svc_acct->username,		# User name
-      $cpassword,			# Encrypted password
-      $svc_acct->uid,			# User ID
-      $svc_acct->gid,			# Group ID
-      "",				# Login Class
-      "0",				# Password Change Time
-      "0",				# Password Expiration Time
-      $svc_acct->finger,		# Users name
-      $svc_acct->dir,			# Users home directory
-      $svc_acct->shell,			# shell
-    ), "\n" ;
+    # FORMAT OF THE .QMAIL-DEFAULT FILE HERE
+    print QMAILDEFAULT "| $vpopdir/bin/vdelivermail \"\" $username\@$domain\n";
 
+  }else{
     ###
-    # FORMAT OF THE PASSWD FILE HERE
-    print PASSWD join(":",
-      $svc_acct->username,
-      'x', # "##". $svc_acct->$username,
-      $svc_acct->uid,
-      $svc_acct->gid,
-      $svc_acct->finger,
-      $svc_acct->dir,
-      $svc_acct->shell,
-    ), "\n";
-
-    ###
-    # FORMAT OF THE SHADOW FILE HERE
-    print SHADOW join(":",
-      $svc_acct->username,
-      $cpassword,
-      '',
-      '',
-      '',
-      '',
-      '',
-      '',
-      '',
-    ), "\n";
-
+    # FORMAT OF THE .QMAIL-DEFAULT FILE HERE
+    print QMAILDEFAULT "| $vpopdir/bin/vdelivermail \"\" bounce-no-mailbox\n";
   }
 
-  if ( $svc_acct->slipip ne '' ) {
+  print VPOPVIRTUALDOMAINS "$domain:$domain\n";
+
+  foreach $svc_acct (qsearch('svc_acct', {'domsvc' => $svc_domain->svcnum})) {
+    my($password)=$svc_acct->getfield('_password');
+    my($cpassword,$rpassword);
+    if ( ( length($password) <= 8 )
+         && ( $password ne '*' )
+         && ( $password ne '!!' )
+         && ( $password ne '' )
+       ) {
+      $cpassword=crypt($password,
+                       $saltset[int(rand(64))].$saltset[int(rand(64))]
+      );
+      $rpassword=$password;
+    } else {
+      $cpassword=$password;
+      $rpassword='UNIX';
+    }
+
+    my $username;
 
-    ###
-    # FORMAT OF THE ACP_* FILES HERE
-    print ACP_PASSWD join(":",
-      $svc_acct->username,
-      $cpassword,
-      "0",
-      "0",
-      "",
-      "",
-      "",
-    ), "\n";
-
-    my($ip)=$svc_acct->slipip;
-
-    unless ( $ip eq '0.0.0.0' || $svc_acct->slipip eq '0e0' ) {
-      print ACP_DIALUP $svc_acct->username, "\t*\t", $svc_acct->slipip, "\n";
+    if ($mydomain && ($mydomain eq $svc_domain->domain)) {
+      $username=$svc_acct->username;
+    } elsif ($userpolicy =~ /^prepend domsvc$/) {
+      $username=$svc_acct->domsvc . $svc_acct->username;
+    } elsif ($userpolicy =~ /^append domsvc$/) {
+      $username=$svc_acct->username . $svc_acct->domsvc;
+    } elsif ($userpolicy =~ /^append domain$/) {
+      $username=$svc_acct->username . $svc_domain->domain;
+    } else {
+      die "Unknown policy in username_policy\n";
     }
 
-    my %radreply = $svc_acct->radius_reply;
-    my %radcheck = $svc_acct->radius_check;
+    if ($svc_acct->dir ne '/dev/null' || $svc_acct->slipip ne '') {
+      if ($usernames{$username}++) {
+        die "Duplicate username detected: $username\n";
+      }
+    }
+            
+    if ( $svc_acct->uid  =~ /^(\d+)$/ ) {
+
+      die "Non-root user ". $svc_acct->username. " has 0 UID!"
+        if $svc_acct->uid == 0 && $svc_acct->username ne 'root';
+
+      if ( $svc_acct->dir ne "/dev/null") {
+
+        ###
+        # FORMAT OF FreeBSD MASTER PASSWD FILE HERE
+        print MASTER join(":",
+          $username,                        # User name
+          $cpassword,                       # Encrypted password
+          $svc_acct->uid,                   # User ID
+          $svc_acct->gid,                   # Group ID
+          "",                               # Login Class
+          "0",                              # Password Change Time
+          "0",                              # Password Expiration Time
+          $svc_acct->finger,                # Users name
+          $svc_acct->dir,                   # Users home directory
+          $svc_acct->shell,                 # shell
+        ), "\n" ;
+
+
+        ###
+        # FORMAT OF THE PASSWD FILE HERE
+        print PASSWD join(":",
+          $username,
+          'x', # "##". $username,
+          $svc_acct->uid,
+          $svc_acct->gid,
+          $svc_acct->finger,
+          $svc_acct->dir,
+          $svc_acct->shell,
+        ), "\n";
+
+        ###
+        # FORMAT OF THE SHADOW FILE HERE
+        print SHADOW join(":",
+          $username,
+          $cpassword,
+          '',
+          '',
+          '',
+          '',
+          '',
+          '',
+          '',
+        ), "\n";
+      }
 
-    my $radcheck = join ", ", map { qq($_ = "$radcheck{$_}") } keys %radcheck;
-    $radcheck .= ", " if $radcheck;
+      ###
+      # FORMAT OF THE VPASSWD FILE HERE
+      print VPASSWD join(":",
+        $svc_acct->username,
+        $cpassword,
+        '1',
+        '0',
+        $svc_acct->username,
+        "$vpopdir/domains/" . $svc_domain->domain ."/" . $svc_acct->username,
+        'NOQUOTA',
+      ), "\n";
 
-    ###
-    # FORMAT OF THE USERS FILE HERE
-    print USERS
-      $svc_acct->username,
-      qq(\t${textradiusprepend}),
-      $radcheck,
-      qq(Password = "$rpassword"\n\t),
-      join ",\n\t", map { qq($_ = "$radreply{$_}") } keys %radreply;
-    
-    if ( $ip && $ip ne '0e0' ) {
-      #print USERS qq(,\n\tFramed-Address = "$ip"\n\n);
-      print USERS qq(,\n\tFramed-IP-Address = "$ip"\n\n);
-    } else {
-      print USERS qq(\n\n);
     }
 
-    ###
-    # ICRADIUS export
-    if ( $icradiusmachines ) {
+    if ( $svc_acct->slipip ne '' ) {
 
-      my $sth = $icradius_dbh->prepare(
-        "INSERT INTO radcheck ( id, UserName, Attribute, Value ) VALUES ( ".
-        join(", ", map { $icradius_dbh->quote( $_ ) } (
-          '',
-          $svc_acct->username,
-          "Password",
-          $svc_acct->_password,
-        ) ). " )"
-      );
-      $sth->execute or die "Can't insert into radcheck table: ". $sth->errstr;
+      ###
+      # FORMAT OF THE ACP_* FILES HERE
+      print ACP_PASSWD join(":",
+        $username,
+        $cpassword,
+        "0",
+        "0",
+        "",
+        "",
+        "",
+      ), "\n";
 
-      foreach my $attribute ( keys %radcheck ) {
+      my($ip)=$svc_acct->slipip;
+
+      unless ( $ip eq '0.0.0.0' || $svc_acct->slipip eq '0e0' ) {
+        print ACP_DIALUP $username, "\t*\t", $svc_acct->slipip, "\n";
+      }
+
+      my %radreply = $svc_acct->radius_reply;
+      my %radcheck = $svc_acct->radius_check;
+
+      my $radcheck = join ", ", map { qq($_ = "$radcheck{$_}") } keys %radcheck;
+      $radcheck .= ", " if $radcheck;
+
+      ###
+      # FORMAT OF THE USERS FILE HERE
+      print USERS
+        $username,
+        qq(\t${textradiusprepend}),
+        $radcheck,
+        qq(Password = "$rpassword"\n\t),
+        join ",\n\t", map { qq($_ = "$radreply{$_}") } keys %radreply;
+
+      if ( $ip && $ip ne '0e0' ) {
+        #print USERS qq(,\n\tFramed-Address = "$ip"\n\n);
+        print USERS qq(,\n\tFramed-IP-Address = "$ip"\n\n);
+      } else {
+        print USERS qq(\n\n);
+      }
+
+      ###
+      # ICRADIUS export
+      if ( $icradiusmachines ) {
+  
         my $sth = $icradius_dbh->prepare(
           "INSERT INTO radcheck ( id, UserName, Attribute, Value ) VALUES ( ".
           join(", ", map { $icradius_dbh->quote( $_ ) } (
             '',
-            $svc_acct->username,
-            $attribute,
-            $radcheck{$attribute},
+            $username,
+            "Password",
+            $svc_acct->_password,
           ) ). " )"
         );
         $sth->execute or die "Can't insert into radcheck table: ". $sth->errstr;
+  
+        foreach my $attribute ( keys %radcheck ) {
+          my $sth = $icradius_dbh->prepare(
+            "INSERT INTO radcheck ( id, UserName, Attribute, Value ) VALUES ( ".
+            join(", ", map { $icradius_dbh->quote( $_ ) } (
+              '',
+              $username,
+              $attribute,
+              $radcheck{$attribute},
+            ) ). " )"
+          );
+          $sth->execute or die "Can't insert into radcheck table: ". $sth->errstr;      }
+  
+        foreach my $attribute ( keys %radreply ) {
+          my $sth = $icradius_dbh->prepare(
+            "INSERT INTO radreply (id, UserName, Attribute, Value) VALUES ( ".
+            join(", ", map { $icradius_dbh->quote( $_ ) } (
+              '',
+              $username,
+              $attribute,
+              $radreply{$attribute},
+            ) ). " )"
+          );
+          $sth->execute or die "Can't insert into radreply table: ". $sth->errstr;      }
       }
-
-      foreach my $attribute ( keys %radreply ) {
-        my $sth = $icradius_dbh->prepare(
-          "INSERT INTO radreply (id, UserName, Attribute, Value) VALUES ( ".
-          join(", ", map { $icradius_dbh->quote( $_ ) } (
-            '',
-            $svc_acct->username,
-            $attribute,
-            $radreply{$attribute},
-          ) ). " )"
-        );
-        $sth->execute or die "Can't insert into radreply table: ". $sth->errstr;
+    }
+  
+    ###
+    # vpopmail directory structure creation
+
+    (mkdir "$spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username, 0700)
+      or die "Can't create $spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . ": $!";
+    (mkdir "$spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . "/Maildir", 0700)
+      or die "Can't create $spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . " /Maildir: $!";
+    (mkdir "$spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . "/Maildir/cur", 0700)
+      or die "Can't create $spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . " /Maildir/cur: $!";
+    (mkdir "$spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . "/Maildir/new", 0700)
+      or die "Can't create $spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . " /Maildir/new: $!";
+    (mkdir "$spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . "/Maildir/tmp", 0700)
+      or die "Can't create $spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . " /Maildir/tmp: $!";
+
+    ( open(DOTQMAIL,">$spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . "/.qmail")
+      and flock(DOTQMAIL,LOCK_EX|LOCK_NB)  
+    ) or die "Can't open $spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . "/.qmail: $!";
+
+    my($svc_forward);
+    foreach $svc_forward (qsearch('svc_forward', {'srcsvc' => $svc_acct->svcnum})) {
+      my($destination);
+      if ($svc_forward->dstsvc) {
+        my $dst_acct = qsearchs('svc_acct', {'svcnum' => $svc_forward->dstsvc});
+        my $dst_domain = qsearchs('svc_domain', {'svcnum' => $dst_acct->domsvc});
+        $destination = $dst_acct->username . '@' . $dst_domain->domain;
+
+        if ($dst_domain->domain eq $mydomain) {
+          print VIRTUSERTABLE $svc_acct->username . "@" . $svc_domain->domain .
+            "\t" . $dst_acct->username . "\n";
+          print RECIPIENTMAP $svc_acct->username . "@" . $svc_domain->domain .
+            ":$destination\n";
+        }
+      } else {
+        $destination = $svc_forward->dst;
       }
-
+    
+      ###
+      # FORMAT OF .QMAIL FILES HERE
+      print DOTQMAIL "$destination\n";
     }
 
+    flock(DOTQMAIL,LOCK_UN);
+    close DOTQMAIL;
+
   }
 
+  flock(VPASSWD,LOCK_UN);
+  flock(QMAILDEFAULT,LOCK_UN);
+  close VPASSWD;
+  close QMAILDEFAULT;
+
 }
 
+###
+# FORMAT OF THE ASSIGN/USERS FILE FINAL LINE HERE
+print ASSIGN ".\n";
+
+print VIRTUSERTABLE @sendmail;
+
 flock(MASTER,LOCK_UN);
 flock(PASSWD,LOCK_UN);
 flock(SHADOW,LOCK_UN);
 flock(ACP_DIALUP,LOCK_UN);
 flock(ACP_PASSWD,LOCK_UN);
 flock(USERS,LOCK_UN);
+flock(ASSIGN,LOCK_UN);
+flock(SENDMAIL_CW,LOCK_UN);
+flock(VIRTUSERTABLE,LOCK_UN);
+flock(RCPTHOSTS,LOCK_UN);
+flock(VPOPRCPTHOSTS,LOCK_UN);
+flock(RECIPIENTMAP,LOCK_UN);
+flock(VPOPVIRTUALDOMAINS,LOCK_UN);
 
 close MASTER;
 close PASSWD;
@@ -356,19 +514,26 @@ close SHADOW;
 close ACP_DIALUP;
 close ACP_PASSWD;
 close USERS;
+close ASSIGN;
+close SENDMAIL_CW;
+close VIRTUSERTABLE;
+close RCPTHOSTS;
+close VPOPRCPTHOSTS;
+close RECIPIENTMAP;
+close VPOPVIRTUALDOMAINS;
 
 ###
 # export stuff
 #
 
-my($shellmachine);
-foreach $shellmachine (@shellmachines) {
+my($ashellmachine);
+foreach $ashellmachine (@shellmachines) {
   my $scp = new Net::SCP;
-  $scp->scp("$spooldir/passwd","root\@$shellmachine:/etc/passwd.new")
+  $scp->scp("$spooldir/passwd","root\@$ashellmachine:/etc/passwd.new")
     or die "scp error: ". $scp->{errstr};
-  $scp->scp("$spooldir/shadow","root\@$shellmachine:/etc/shadow.new")
+  $scp->scp("$spooldir/shadow","root\@$ashellmachine:/etc/shadow.new")
     or die "scp error: ". $scp->{errstr};
-  ssh("root\@$shellmachine",
+  ssh("root\@$ashellmachine",
     "( ".
       "mv /etc/passwd.new /etc/passwd; ".
       "mv /etc/shadow.new /etc/shadow; ".
@@ -457,6 +622,65 @@ foreach my $icradiusmachine ( @icradiusmachines ) {
   close WRITER;
 }
 
+my @args = ("/bin/tar", "c", "--force-local", "-C", "$spooldir", "-f", "$spooldir/vpoptarball", "domains");
+
+system {$args[0]} @args;
+
+my($vpopmailmachine);
+foreach $vpopmailmachine (@vpopmailmachines) {
+  my ($machine, $vpopdir, $vpopuid, $vpopgid) = split (/\s+/, $vpopmailmachine);
+  my $scp = new Net::SCP;
+  $scp->scp("$spooldir/vpoptarball","root\@$machine:vpoptarball")
+    or die "scp error: ". $scp->{errstr};
+  ssh("root\@$machine",
+    "( ".
+      "tar xf vpoptarball; ".
+      "chown -R $vpopuid:$vpopgid domains; ".
+      "tar cf vpoptarball domains; ".
+      "cd $vpopdir; ".
+      "tar xf ~/vpoptarball; ".
+    " )"
+  )
+    == 0 or die "ssh error: $!";
+
+  $scp->scp("$spooldir/assign","root\@$machine:/var/qmail/users/assign")
+    or die "scp error: ". $scp->{errstr};
+  $scp->scp("$spooldir/vpopvirtualdomains","root\@$machine:/var/qmail/control/virtualdomains")
+    or die "scp error: ". $scp->{errstr};
+  $scp->scp("$spooldir/vpoprcpthosts","root\@$machine:/var/qmail/control/rcpthosts")
+    or die "scp error: ". $scp->{errstr};
+}
+
+my($sendmailmachine);
+foreach $sendmailmachine (@sendmailmachines) {
+  my $scp = new Net::SCP;
+  $scp->scp("$spooldir/sendmail.cw","root\@$sendmailmachine:$sendmailconfigpath/sendmail.cw.new")
+    or die "scp error: ". $scp->{errstr};
+  $scp->scp("$spooldir/virtusertable","root\@$sendmailmachine:$sendmailconfigpath/virtusertable.new")
+    or die "scp error: ". $scp->{errstr};
+  ssh("root\@$sendmailmachine",
+    "( ".
+      "mv $sendmailconfigpath/sendmail.cw.new $sendmailconfigpath/sendmail.cw; ".
+      "mv $sendmailconfigpath/virtusertable.new $sendmailconfigpath/virtusertable; ".
+      $sendmailrestart.
+    " )"
+  )
+    == 0 or die "ssh error: $!";
+}
+
+my($qmailmachine);
+foreach $qmailmachine (@qmailmachines) {
+  my $scp = new Net::SCP;
+  $scp->scp("$spooldir/recipientmap","root\@$qmailmachine:/var/qmail/control/recipientmap")
+    or die "scp error: ". $scp->{errstr};
+  $scp->scp("$spooldir/virtualdomains","root\@$qmailmachine:/var/qmail/control/virtualdomains")
+    or die "scp error: ". $scp->{errstr};
+  $scp->scp("$spooldir/rcpthosts","root\@$qmailmachine:/var/qmail/control/rcpthosts")
+    or die "scp error: ". $scp->{errstr};
+  #ssh("root\@$qmailmachine","/etc/init.d/qmail restart")
+  #  == 0 or die "ssh error: $!";
+}
+
 unlink $spoollock;
 flock(EXPORT,LOCK_UN);
 close EXPORT;
diff --git a/bin/svc_acct_sm.export b/bin/svc_acct_sm.export
deleted file mode 100755
index d7a7840f1..000000000
--- a/bin/svc_acct_sm.export
+++ /dev/null
@@ -1,254 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: svc_acct_sm.export,v 1.10 2001-05-08 10:44:17 ivan Exp $
-# 
-# Create and export config files for sendmail, qmail
-#
-# (used to) Create and export VoiceNet_quasar.m4
-#
-# ivan@voicenet.com late oct 96
-#
-# change priority (after copies) to 19, not 10
-# ivan@voicenet.com 97-feb-5
-#
-# put file in different place and run different script, as per matt and
-# mohamed
-# ivan@voicenet.com 97-mar-10
-#
-# added exit if stuff is already locked ivan@voicenet.com 97-apr-15
-#
-# removed mail2
-# ivan@voicenet.com 97-jul-10
-#
-# rewrote lots of the bits, now exports qmail "virtualdomain",
-# "recipientmap" and "rcpthosts" files as well
-#
-# ivan@voicenet.com 97-sep-4
-#
-# adds ".extra" files
-#
-# ivan@voicenet.com 97-sep-29
-#
-# added ".pp" files, ugh.
-#
-# ivan@voicenet.com 97-oct-1
-#
-# rewrite ivan@sisd.com 98-mar-9
-#
-# now can create .qmail-default files ivan@sisd.com 98-mar-10
-#
-# put example $my_domain declaration in ivan@sisd.com 98-mar-23
-#
-# /var/spool/freeside/conf and sendmail updates ivan@sisd.com 98-aug-14
-#
-# $Log: svc_acct_sm.export,v $
-# Revision 1.10  2001-05-08 10:44:17  ivan
-# fix for OO Net::SCP
-#
-# Revision 1.9  2001/04/22 01:56:15  ivan
-# get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)
-#
-# Revision 1.8  2000/07/06 03:37:24  ivan
-# don't error out on invalid svc_acct_sm.domuid's that can't be matched in
-# svc_acct.uid - just warn.
-#
-# Revision 1.7  2000/07/03 09:13:10  ivan
-# get rid of double sendmailrestart invocation; no need for multiple sessions
-#
-# Revision 1.6  2000/07/03 09:09:14  ivan
-# typo
-#
-# Revision 1.5  2000/07/03 09:03:14  ivan
-# added sendmailrestart and sendmailconfigpath config files
-#
-# Revision 1.4  2000/06/29 14:02:29  ivan
-# add sendmailrestart configuration file
-#
-# Revision 1.3  2000/06/12 08:37:56  ivan
-# sendmail fix from Jeff Finucane
-#
-# Revision 1.2  1998/12/10 07:23:17  ivan
-# use FS::Conf, need user (for datasrc)
-#
-
-use strict;
-use vars qw($conf);
-use Fcntl qw(:flock);
-use Net::SSH qw(ssh);
-use Net::SCP qw(scp);
-use FS::UID qw(adminsuidsetup datasrc);
-use FS::Record qw(qsearch qsearchs);
-use FS::svc_acct;
-use FS::svc_acct_sm;
-use FS::svc_domain;
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-$conf = new FS::Conf;
-
-my($shellmachine, @qmailmachines);
-if ( $conf->exists('qmailmachines') ) {
-  $shellmachine = $conf->config('shellmachine');
-  @qmailmachines = $conf->config('qmailmachines');
-}
-
-my(@sendmailmachines, $sendmailconfigpath, $sendmailrestart);
-if ( $conf->exists('sendmailmachines') ) {
-  @sendmailmachines = $conf->config('sendmailmachines');
-  $sendmailconfigpath = $conf->config('sendmailconfigpath') || '/etc';
-  $sendmailrestart = $conf->config('sendmailrestart');
-}
-
-my $mydomain = $conf->config('domain');
-
-my $spooldir = "/usr/local/etc/freeside/export.". datasrc;
-my $spoollock = "/usr/local/etc/freeside/svc_acct_sm.export.lock.". datasrc;
-
-umask 066;
-
-open(EXPORT,"+>>$spoollock") or die "Can't open $spoollock: $!";
-select(EXPORT); $|=1; select(STDOUT);
-unless ( flock(EXPORT,LOCK_EX|LOCK_NB) ) {
-  seek(EXPORT,0,0);
-  my($pid)=<EXPORT>;
-  chop($pid);
-  #no reason to start locks of blocking processes
-  die "Is another export process running under pid $pid?\n";
-}
-seek(EXPORT,0,0);
-print EXPORT $$,"\n";
-
-( open(RCPTHOSTS,">$spooldir/rcpthosts")
-  and flock(RCPTHOSTS,LOCK_EX|LOCK_NB) 
-) or die "Can't open $spooldir/rcpthosts: $!";
-( open(RECIPIENTMAP,">$spooldir/recipientmap") 
-  and flock(RECIPIENTMAP,LOCK_EX|LOCK_NB) 
-) or die "Can't open $spooldir/recipientmap: $!";
-( open(VIRTUALDOMAINS,">$spooldir/virtualdomains") 
-  and flock(VIRTUALDOMAINS,LOCK_EX|LOCK_NB)
-) or die "Can't open $spooldir/virtualdomains: $!";
-( open(VIRTUSERTABLE,">$spooldir/virtusertable")
-  and flock(VIRTUSERTABLE,LOCK_EX|LOCK_NB)
-) or die "Can't open $spooldir/virtusertable: $!";
-( open(SENDMAIL_CW,">$spooldir/sendmail.cw")
-  and flock(SENDMAIL_CW,LOCK_EX|LOCK_NB)
-) or die "Can't open $spooldir/sendmail.cw: $!";
-
-setpriority(0,0,10);
-
-my($svc_domain,%domain);
-foreach $svc_domain ( qsearch('svc_domain',{}) ) {
-  my($domain)=$svc_domain->domain;
-  $domain{$svc_domain->svcnum}=$domain;
-  print RCPTHOSTS "$domain\n.$domain\n";
-  print SENDMAIL_CW "$domain\n";
-}
-
-my(@sendmail);
-
-my($svc_acct_sm);
-foreach $svc_acct_sm ( qsearch('svc_acct_sm') ) { 
-  my($domsvc,$domuid,$domuser)=(
-    $svc_acct_sm->domsvc,
-    $svc_acct_sm->domuid,
-    $svc_acct_sm->domuser,
-  );
-  my($domain)=$domain{$domsvc};
-  my($svc_acct)=qsearchs('svc_acct',{'uid'=>$domuid});
-  unless ( $svc_acct ) {
-    warn "WARNING: couldn't find svc_acct.uid $domuid (svc_acct_sm.svcnum ".
-         $svc_acct_sm->svcnum. ") - corruped database?\n";
-    next;
-  }
-  my($username,$dir,$uid,$gid)=(
-    $svc_acct->username,
-    $svc_acct->dir,
-    $svc_acct->uid,
-    $svc_acct->gid,
-  );
-  next unless $username && $domain && $domuser;
-
-  if ($domuser eq '*') {
-    push @sendmail, "\@$domain\t$username\n";
-    print VIRTUALDOMAINS "$domain:$username-$domain\n",
-                         ".$domain:$username-$domain\n",
-    ;
-    ###
-    # qmail
-    ssh("root\@$shellmachine",
-      "[ -e $dir/.qmail-default ] || { touch $dir/.qmail-default; chown $uid:$gid $dir/.qmail-default; }"
-    ) if ( $shellmachine && $dir && $uid );
-
-  } else {
-    print VIRTUSERTABLE "$domuser\@$domain\t$username\n";
-    print RECIPIENTMAP "$domuser\@$domain:$username\@$mydomain\n";
-  }
-
-}
-
-print VIRTUSERTABLE @sendmail;
-
-chmod 0644, "$spooldir/sendmail.cw",
-            "$spooldir/virtusertable",
-            "$spooldir/rcpthosts",
-            "$spooldir/recipientmap",
-            "$spooldir/virtualdomains",
-;
-
-flock(SENDMAIL_CW,LOCK_UN);
-flock(VIRTUSERTABLE,LOCK_UN);
-flock(RCPTHOSTS,LOCK_UN);
-flock(RECIPIENTMAP,LOCK_UN);
-flock(VIRTUALDOMAINS,LOCK_UN);
-
-close SENDMAIL_CW;
-close VIRTUSERTABLE;
-close RCPTHOSTS;
-close RECIPIENTMAP;
-close VIRTUALDOMAINS;
-
-###
-# export stuff
-#
-
-my($sendmailmachine);
-foreach $sendmailmachine (@sendmailmachines) {
-  my $scp = new Net::SCP;
-  $scp->scp("$spooldir/sendmail.cw","root\@$sendmailmachine:$sendmailconfigpath/sendmail.cw.new")
-    or die "scp error: ". $scp->{errstr};
-  $scp->scp("$spooldir/virtusertable","root\@$sendmailmachine:$sendmailconfigpath/virtusertable.new")
-    or die "scp error: ". $scp->{errstr};
-  ssh("root\@$sendmailmachine",
-    "( ".
-      "mv $sendmailconfigpath/sendmail.cw.new $sendmailconfigpath/sendmail.cw; ".
-      "mv $sendmailconfigpath/virtusertable.new $sendmailconfigpath/virtusertable; ".
-      $sendmailrestart.
-    " )"
-  )
-    == 0 or die "ssh error: $!";
-}
-
-my($qmailmachine);
-foreach $qmailmachine (@qmailmachines) {
-  my $scp = new Net::SCP;
-  $scp->scp("$spooldir/recipientmap","root\@$qmailmachine:/var/qmail/control/recipientmap")
-    or die "scp error: ". $scp->{errstr};
-  $scp->scp("$spooldir/virtualdomains","root\@$qmailmachine:/var/qmail/control/virtualdomains")
-    or die "scp error: ". $scp->{errstr};
-  $scp->scp("$spooldir/rcpthosts","root\@$qmailmachine:/var/qmail/control/rcpthosts")
-    or die "scp error: ". $scp->{errstr};
-  #ssh("root\@$qmailmachine","/etc/init.d/qmail restart")
-  #  == 0 or die "ssh error: $!";
-}
-
-unlink $spoollock;
-flock(EXPORT,LOCK_UN);
-close EXPORT;
-
-#
-
-sub usage {
-  die "Usage:\n\n  svc_acct.export user\n";
-}
-
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index 9282e826d..532a826be 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -100,6 +100,8 @@ All further configuration files and directories are located in
   <li><a name="usernamemax">usernamemax</a> - Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)
   <li><a name="usernamemax">username-letter</a> - The existance of this file will turn on the requirement that usernames contain at least one letter.
   <li><a name="usernamemax">username-letterfirst</a> - The existance of this file will turn on the requirement that usernames start with a letter.
+  <li><a name="username_policy">username_policy</a> - This file controls the mechanism for preventing duplicate usernames in passwd/radius files exported from svc_accts.  This should be one of 'prepend domsvc' 'append domsvc' or 'append domain'
+  <li><a name="vpopmailmachines">vpopmailmachines</a> - Your vpopmail pop toasters, one per line.  Each line is of the form "machinename vpopdir vpopuid vpopgid".  Eg: poptoaster.domain.tld /home/vpopmail 508 508 Note: vpopuid and vpopgid are values taken from the vpopmail machine's /etc/passwd
 </ul>
 </body>
 
diff --git a/htdocs/docs/upgrade8.html b/htdocs/docs/upgrade8.html
new file mode 100644
index 000000000..379892256
--- /dev/null
+++ b/htdocs/docs/upgrade8.html
@@ -0,0 +1,52 @@
+<head>
+  <title>Upgrading to 1.3.2</title>
+</head>
+<body>
+<h1>Upgrading to 1.3.2 from 1.3.1</h1>
+<ul>
+  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
+  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
+  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
+  <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
+  <li>If migrating from less than 1.2.3, see these <a href="upgrade5.html">instructions</a> first.
+  <li>If migrating from less than 1.3.0, see these <a href="upgrade6.html">instructions</a> first.
+  <li>If migrating from less than 1.3.1, see these <a href="upgrade7.html">instructions</a> first.
+  <li>Back up your data and current Freeside installation.
+  <li>Apply the following changes to your database:
+<pre>
+CREATE TABLE svc_forward (
+  svcnum int NOT NULL,
+  srcsvc int NOT NULL,
+  dstsvc int NOT NULL,
+  dst varchar(80),
+  PRIMARY KEY (svcnum)
+);
+ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
+ALTER TABLE svc_domain ADD catchall integer;
+ALTER TABLE part_svc ADD svc_acct__domsvc integer NULL;
+ALTER TABLE part_svc ADD svc_acct__domsvc_flag char(1) NULL;
+ALTER TABLE part_svc ADD svc_domain__catchall integer NULL;
+ALTER TABLE part_svc ADD svc_domain__catchall_flag char(1) NULL;
+ALTER TABLE part_svc ADD svc_forward__srcsvc integer NULL;
+ALTER TABLE part_svc ADD svc_forward__srcsvc_flag char(1) NULL;
+ALTER TABLE part_svc ADD svc_forward__dstsvc integer NULL;
+ALTER TABLE part_svc ADD svc_forward__dstsvc_flag char(1) NULL;
+ALTER TABLE part_svc ADD svc_forward__dst integer NULL;
+ALTER TABLE part_svc ADD svc_forward__dst_flag char(1) NULL;
+
+</pre>
+  <li>Copy or symlink htdocs to the new copy.
+  <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
+  <li>Change to the FS directory in the new tarball, and build and install the
+      Perl modules:
+    <pre>
+$ cd FS/
+$ perl Makefile.PL
+$ make
+$ su
+# make install</pre>
+  <li>Run bin/dbdef-create.
+  <li>create a service based on svc_forward
+  <li>Run bin/fs-migrate-svc_acct_sm
+  <li>create the conf.dbsrc/user_policy as appropriate for your site
+</body>
diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
index 49be7200b..9526f697e 100644
--- a/httemplate/docs/config.html
+++ b/httemplate/docs/config.html
@@ -101,6 +101,9 @@ All further configuration files and directories are located in
   <li><a name="usernamemax">usernamemax</a> - Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)
   <li><a name="usernamemax">username-letter</a> - The existance of this file will turn on the requirement that usernames contain at least one letter.
   <li><a name="usernamemax">username-letterfirst</a> - The existance of this file will turn on the requirement that usernames start with a letter.
+   <li><a name="username_policy">username_policy</a> - This file controls the mechanism for preventing duplicate usernames in passwd/radius files exported from svc_accts.  This should be one of 'prepend domsvc' 'append domsvc' or 'append domain'
+   <li><a name="vpopmailmachines">vpopmailmachines</a> - Your vpopmail pop toasters, one per line.  Each line is of the form "machinename vpopdir vpopuid vpopgid".  Eg: poptoaster.domain.tld /home/vpopmail 508 508 Note: vpopuid and vpopgid are values taken from the vpopmail machine's /etc/passwd
+
 </ul>
 </body>
 
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 702da5a1b..1a5c998c6 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -61,6 +61,30 @@ $ perl Makefile.PL
 $ make
 $ su
 # make install UNINST=1</pre>
+   <li>Apply the following changes to your database:
+<pre>
+CREATE TABLE svc_forward (
+  svcnum int NOT NULL,
+  srcsvc int NOT NULL,
+  dstsvc int NOT NULL,
+  dst varchar(80),
+  PRIMARY KEY (svcnum)
+);
+ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
+ALTER TABLE svc_domain ADD catchall integer;
+ALTER TABLE part_svc ADD svc_acct__domsvc integer NULL;
+ALTER TABLE part_svc ADD svc_acct__domsvc_flag char(1) NULL;
+ALTER TABLE part_svc ADD svc_domain__catchall integer NULL;
+ALTER TABLE part_svc ADD svc_domain__catchall_flag char(1) NULL;
+ALTER TABLE part_svc ADD svc_forward__srcsvc integer NULL;
+ALTER TABLE part_svc ADD svc_forward__srcsvc_flag char(1) NULL;
+ALTER TABLE part_svc ADD svc_forward__dstsvc integer NULL;
+ALTER TABLE part_svc ADD svc_forward__dstsvc_flag char(1) NULL;
+ALTER TABLE part_svc ADD svc_forward__dst integer NULL;
+ALTER TABLE part_svc ADD svc_forward__dst_flag char(1) NULL;
+
+</pre>
+
   <li>If you are using PostgreSQL, apply the following changes to your database:
 <pre>
 CREATE UNIQUE INDEX agent_pkey ON agent ( agentnum );
@@ -112,4 +136,7 @@ ALTER TABLE cust_main ADD COLUMN ship_fax varchar(12) NULL;
 ALTER TABLE cust_main ADD COLUMN comments varchar NULL;
 </pre>
   <li>Run bin/dbdef-create.
+  <li>create a service based on svc_forward
+  <li>Run bin/fs-migrate-svc_acct_sm
+  <li>create the conf.dbsrc/user_policy as appropriate for your site
 </body>
-- 
cgit v1.2.1


From bda1b3f43f3f7fe95c6ad221a2ae94bb47b8b9c7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 13 Aug 2001 00:19:02 +0000
Subject: depriciate svc_acct_sm, add unique index for username+domsvc on
 svc_acct, remove silly $Log$

---
 bin/fs-setup | 174 +++++------------------------------------------------------
 1 file changed, 14 insertions(+), 160 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index a3e067bec..ec8b75089 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,152 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.41 2001-08-12 19:41:25 jeff Exp $
-#
-# ivan@sisd.com 97-nov-8,9
-#
-# agent_type and type_pkgs added.
-# (index need to be declared, & primary keys shoudln't have mysql syntax)
-# ivan@sisd.com 97-nov-13
-#
-# pulled modified version back out of register.cgi ivan@sisd.com 98-feb-21
-#
-# removed extraneous sample data ivan@sisd.com 98-mar-23
-#
-# gained the big hash from dbdef.pm, dbdef.pm usage rewrite ivan@sisd.com
-# 98-apr-19 - 98-may-11 plus
-#
-# finished up ivan@sisd.com 98-jun-1
-#
-# part_svc fields are all forced NULL, not the opposite
-# hmm: also are forced varchar($char_d) as fixed '0' for things like
-# uid is Not Good.  will this break anything else?
-# ivan@sisd.com 98-jun-29
-#
-# ss is 11 chars ivan@sisd.com 98-jul-20
-#
-# setup of arbitrary radius fields ivan@sisd.com 98-aug-9
-#
-# ouch, removed index on company name that wasn't supposed to be there
-# ivan@sisd.com 98-sep-4
-#
-# fix radius attributes ivan@sisd.com 98-sep-27
-#
-# $Log: fs-setup,v $
-# Revision 1.41  2001-08-12 19:41:25  jeff
-# merging vpopmail support branch
-#
-# Revision 1.40  2001/08/11 05:53:42  ivan
-# add comments field
-#
-# Revision 1.39  2001/07/30 07:42:39  ivan
-# need an DBIx::DBSchema with delcolumn
-#
-# Revision 1.38  2001/07/30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.37  2001/06/03 14:16:11  ivan
-# allow empty refund reasons
-#
-# Revision 1.36  2001/04/15 12:56:31  ivan
-# s/dbdef/DBIx::DBSchema/
-#
-# Revision 1.35  2001/04/15 09:36:43  ivan
-# http://www.sisd.com/freeside/list-archive/msg01450.html
-#
-# Revision 1.34  2001/04/09 23:05:16  ivan
-# Transactions Part I!!!
-#
-# Revision 1.33  2001/02/03 14:03:50  ivan
-# time-based prepaid cards, session monitor.  woop!
-#
-# Revision 1.32  2000/12/04 00:13:02  ivan
-# fix nas.last type
-#
-# Revision 1.31  2000/12/01 18:34:53  ivan
-# another tyop
-#
-# Revision 1.30  2000/12/01 18:33:32  ivan
-# tyop
-#
-# Revision 1.29  2000/11/07 15:00:37  ivan
-# session monitor
-#
-# Revision 1.28  2000/10/30 10:47:26  ivan
-# nas.last can't be defined NULL if indexed
-#
-# Revision 1.26  2000/07/06 08:57:27  ivan
-# support for radius check attributes (except importing).  poorly documented.
-#
-# Revision 1.25  2000/06/29 12:00:49  ivan
-# support for pre-encrypted md5 passwords.
-#
-# Revision 1.24  2000/03/02 07:44:07  ivan
-# typo forgot closing '
-#
-# Revision 1.23  2000/02/03 05:16:52  ivan
-# beginning of DNS and Apache support
-#
-# Revision 1.22  2000/01/31 05:22:23  ivan
-# prepaid "internet cards"
-#
-# Revision 1.21  2000/01/30 06:03:26  ivan
-# postgres 6.5 finally supports decimal(10,2)
-#
-# Revision 1.20  2000/01/28 22:53:33  ivan
-# track full phone number
-#
-# Revision 1.19  1999/07/29 08:50:35  ivan
-# wrong type for cust_pay_batch.exp
-#
-# Revision 1.18  1999/04/15 22:46:30  ivan
-# TT isn't a state!
-#
-# Revision 1.17  1999/04/14 07:58:39  ivan
-# export getsecrets from FS::UID instead of calling it explicitly
-#
-# Revision 1.16  1999/02/28 19:44:16  ivan
-# constructors s/create/new/ pointed out by "Bao C. Ha" <bao@hacom.net>
-#
-# Revision 1.15  1999/02/27 21:06:21  ivan
-# cust_main.paydate should be varchar(10), not @date_type ; problem reported
-# by Ben Leibig <leibig@colorado.edu>
-#
-# Revision 1.14  1999/02/07 09:59:14  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.13  1999/02/04 06:09:23  ivan
-# add AU provences
-#
-# Revision 1.12  1999/02/03 10:42:27  ivan
-# *** empty log message ***
-#
-# Revision 1.11  1999/01/17 03:11:52  ivan
-# remove preliminary completehost changes
-#
-# Revision 1.10  1998/12/16 06:05:38  ivan
-# add table cust_main_invoice
-#
-# Revision 1.9  1998/12/15 04:36:29  ivan
-# s/croak/die/; #oops
-#
-# Revision 1.8  1998/12/15 04:33:27  ivan
-# dies if it isn't running as the freeside user
-#
-# Revision 1.7  1998/11/18 09:01:31  ivan
-# i18n! i18n!
-#
-# Revision 1.6  1998/11/15 13:18:02  ivan
-# remove debugging
-#
-# Revision 1.5  1998/11/15 09:43:03  ivan
-# update for new config file syntax, new adminsuidsetup
-#
-# Revision 1.4  1998/10/22 15:51:23  ivan
-# also varchar with no length specified - postgresql fix broke mysql.
-#
-# Revision 1.3  1998/10/22 15:46:28  ivan
-# now smallint is illegal, so remove that too.
-#
+# $Id: fs-setup,v 1.42 2001-08-13 00:19:02 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -274,7 +128,7 @@ my($part_svc)=$dbdef->table('part_svc');
 #because of svc_acct_pop
 #foreach (grep /^svc_/, $dbdef->tables) { 
 #foreach (qw(svc_acct svc_acct_sm svc_charge svc_domain svc_wo)) {
-foreach (qw(svc_acct svc_acct_sm svc_domain svc_forward svc_www)) {
+foreach (qw(svc_acct svc_domain svc_forward svc_www)) {
   my($table)=$dbdef->table($_);
   my($col);
   foreach $col ( $table->columns ) {
@@ -713,21 +567,21 @@ sub tables_hash_hack {
         'domsvc',    'int', '',   '',
       ],
       'primary_key' => 'svcnum',
-      'unique' => [ [] ],
+      'unique' => [ [ 'username', 'domsvc' ] ],
       'index' => [ ['username'], ['domsvc'] ],
     },
 
-    'svc_acct_sm' => {
-      'columns' => [
-        'svcnum',    'int',    '',   '',
-        'domsvc',    'int',    '',   '',
-        'domuid',    'int', '',   '',
-        'domuser',   'varchar',   '',   $char_d,
-      ],
-      'primary_key' => 'svcnum',
-      'unique' => [ [] ],
-      'index' => [ ['domsvc'], ['domuid'] ], 
-    },
+#    'svc_acct_sm' => {
+#      'columns' => [
+#        'svcnum',    'int',    '',   '',
+#        'domsvc',    'int',    '',   '',
+#        'domuid',    'int', '',   '',
+#        'domuser',   'varchar',   '',   $char_d,
+#      ],
+#      'primary_key' => 'svcnum',
+#      'unique' => [ [] ],
+#      'index' => [ ['domsvc'], ['domuid'] ], 
+#    },
 
     #'svc_charge' => {
     #  'columns' => [
-- 
cgit v1.2.1


From 60953c6f2f313949e5773350f0917b7d68ebd939 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 13 Aug 2001 00:21:54 +0000
Subject: untaint svcnum & domsvc

---
 FS/FS/svc_acct.pm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 83263b0e4..9f95f4007 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -381,6 +381,12 @@ Sets any fixed values; see L<FS::part_svc>.
 sub check {
   my $self = shift;
 
+  my $error = 
+    $self->ut_numbern('svcnum')
+    || $self->ut_number('domsvc')
+  ;
+  return $error if $error;
+
   my($recref) = $self->hashref;
 
   my $x = $self->setfixed;
@@ -416,8 +422,8 @@ sub check {
     return "Only root can have uid 0"
       if $recref->{uid} == 0 && $recref->{username} ne 'root';
 
-    my($error);
-    return $error if $error=$self->ut_textn('finger');
+    $error = $self->ut_textn('finger');
+    return $error if $error;
 
     $recref->{dir} =~ /^([\/\w\-]*)$/
       or return "Illegal directory";
@@ -552,7 +558,7 @@ sub radius_check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.20 2001-08-12 19:41:24 jeff Exp $
+$Id: svc_acct.pm,v 1.21 2001-08-13 00:21:54 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From e6cf4af2b9d3ffefebe1a3e358f0674f566b56bc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 13 Aug 2001 01:00:27 +0000
Subject: add svc_forward, depriciate svc_acct_sm

---
 httemplate/docs/schema.html | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index f68b9d257..61bc17b03 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -180,7 +180,7 @@
       <ul>
         <li>svcpart - primary key
         <li>svc - name of this service
-        <li>svcdb - table used for this service: svc_acct, svc_acct_sm, svc_domain, svc_charge or svc_wo
+        <li>svcdb - table used for this service: svc_acct, svc_acct_sm, svc_forward, svc_domain, svc_charge or svc_wo
         <li><i>table</i>__<i>field</i> - Default or fixed value for <i>field</i> in <i>table</i>
         <li><i>table</i>__<i>field</i>_flag - null, D or F
       </ul>
@@ -241,7 +241,7 @@
         <li>exch - exchange
         <li>loc - rest of number
       </ul>
-    <li><a name="svc_acct_sm">svc_acct_sm</a> - Domain mail aliases
+    <li><a name="svc_acct_sm">svc_acct_sm</a> - <b>DEPRICIATED</b> Domain mail aliases
       <ul>
         <li>svcnum - <a href="#cust_svc">primary key</a>
         <li>domsvc - <a href="#svc_domain">Domain</a> (by svcnum)
@@ -253,6 +253,13 @@
         <li>svcnum - <a href="#cust_svc">primary key</a>
         <li>domain
       </ul>
+    <li><a name="svc_forward>svc_forward</a> - Mail forwarding aliases
+      <ul>
+        <li>svcnum - <a href="#cust_svc">primary key</a>
+        <li>srcsvc - <a href="#svc_acct">svcnum of the source of this forward
+        <li>dstsvc - <a href="#svc_acct">svcnum of the destination of this forward
+        <li>dst - foreign destination (email address) - forward not local to freeside
+      </ul>
     <li><a name="domain_record">domain_record</a> - Domain zone detail
       <ul>
         <li>recnum - primary key
-- 
cgit v1.2.1


From 1d758388ce3b17b8de1ae1d3a8ec39c1026baefc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 13 Aug 2001 01:09:02 +0000
Subject: removing

---
 htdocs/.htaccess                                |   3 -
 htdocs/browse/agent.cgi                         | 134 ------
 htdocs/browse/agent_type.cgi                    | 105 -----
 htdocs/browse/cust_main_county.cgi              | 104 -----
 htdocs/browse/nas.cgi                           |  94 -----
 htdocs/browse/part_pkg.cgi                      | 110 -----
 htdocs/browse/part_referral.cgi                 |  88 ----
 htdocs/browse/part_svc.cgi                      | 118 ------
 htdocs/browse/svc_acct_pop.cgi                  |  97 -----
 htdocs/docs/admin.html                          |  59 ---
 htdocs/docs/billing.html                        |  67 ---
 htdocs/docs/config.html                         | 107 -----
 htdocs/docs/export.html                         |  41 --
 htdocs/docs/index.html                          |  31 --
 htdocs/docs/install.html                        |  86 ----
 htdocs/docs/legacy.html                         |  34 --
 htdocs/docs/man/FS.html                         | 138 -------
 htdocs/docs/man/FS/Bill.html                    |  32 --
 htdocs/docs/man/FS/CGI.html                     |  95 -----
 htdocs/docs/man/FS/CGIwrapper.html              |  16 -
 htdocs/docs/man/FS/Conf.html                    |  81 ----
 htdocs/docs/man/FS/Invoice.html                 |  32 --
 htdocs/docs/man/FS/Record.html                  | 342 ----------------
 htdocs/docs/man/FS/SSH.html                     | 104 -----
 htdocs/docs/man/FS/SessionClient.html           |  97 -----
 htdocs/docs/man/FS/SignupClient.html            | 125 ------
 htdocs/docs/man/FS/UI/Base.html                 | 100 -----
 htdocs/docs/man/FS/UI/CGI.html                  |  94 -----
 htdocs/docs/man/FS/UI/Gtk.html                  |  91 -----
 htdocs/docs/man/FS/UI/agent.html                |  16 -
 htdocs/docs/man/FS/UID.html                     | 142 -------
 htdocs/docs/man/FS/agent.html                   | 121 ------
 htdocs/docs/man/FS/agent_type.html              | 126 ------
 htdocs/docs/man/FS/cust_bill.html               | 161 --------
 htdocs/docs/man/FS/cust_bill_pkg.html           | 112 -----
 htdocs/docs/man/FS/cust_credit.html             | 118 ------
 htdocs/docs/man/FS/cust_main.html               | 252 ------------
 htdocs/docs/man/FS/cust_main_county.html        | 106 -----
 htdocs/docs/man/FS/cust_main_invoice.html       | 111 -----
 htdocs/docs/man/FS/cust_pay.html                | 108 -----
 htdocs/docs/man/FS/cust_pay_batch.html          | 132 ------
 htdocs/docs/man/FS/cust_pkg.html                | 205 ----------
 htdocs/docs/man/FS/cust_refund.html             | 108 -----
 htdocs/docs/man/FS/cust_svc.html                | 118 ------
 htdocs/docs/man/FS/dbdef.html                   |  97 -----
 htdocs/docs/man/FS/dbdef_colgroup.html          |  86 ----
 htdocs/docs/man/FS/dbdef_column.html            | 118 ------
 htdocs/docs/man/FS/dbdef_index.html             |  58 ---
 htdocs/docs/man/FS/dbdef_table.html             | 144 -------
 htdocs/docs/man/FS/dbdef_unique.html            |  58 ---
 htdocs/docs/man/FS/domain_record.html           | 122 ------
 htdocs/docs/man/FS/nas.html                     | 117 ------
 htdocs/docs/man/FS/part_pkg.html                | 138 -------
 htdocs/docs/man/FS/part_referral.html           | 100 -----
 htdocs/docs/man/FS/part_svc.html                | 110 -----
 htdocs/docs/man/FS/pkg_svc.html                 | 115 ------
 htdocs/docs/man/FS/port.html                    | 120 ------
 htdocs/docs/man/FS/prepay_credit.html           | 118 ------
 htdocs/docs/man/FS/session.html                 | 129 ------
 htdocs/docs/man/FS/svc_Common.html              |  94 -----
 htdocs/docs/man/FS/svc_acct.html                | 219 ----------
 htdocs/docs/man/FS/svc_acct_pop.html            | 107 -----
 htdocs/docs/man/FS/svc_acct_sm.html             | 141 -------
 htdocs/docs/man/FS/svc_domain.html              | 162 --------
 htdocs/docs/man/FS/svc_www.html                 | 150 -------
 htdocs/docs/man/FS/type_pkgs.html               | 100 -----
 htdocs/docs/overview.dia                        | Bin 2800 -> 0 bytes
 htdocs/docs/overview.png                        | Bin 13064 -> 0 bytes
 htdocs/docs/passwd.html                         |  16 -
 htdocs/docs/postgresql.html                     |  23 --
 htdocs/docs/schema.html                         | 264 ------------
 htdocs/docs/session.html                        |  54 ---
 htdocs/docs/signup.html                         |  57 ---
 htdocs/docs/trouble.html                        |  26 --
 htdocs/docs/upgrade.html                        |  24 --
 htdocs/docs/upgrade2.html                       |  11 -
 htdocs/docs/upgrade3.html                       |  40 --
 htdocs/docs/upgrade4.html                       |  27 --
 htdocs/docs/upgrade5.html                       |  34 --
 htdocs/docs/upgrade6.html                       |  66 ---
 htdocs/docs/upgrade7.html                       |  24 --
 htdocs/edit/agent.cgi                           | 108 -----
 htdocs/edit/agent_type.cgi                      | 124 ------
 htdocs/edit/cust_credit.cgi                     | 121 ------
 htdocs/edit/cust_main.cgi                       | 516 ------------------------
 htdocs/edit/cust_main_county-expand.cgi         |  88 ----
 htdocs/edit/cust_main_county.cgi                | 100 -----
 htdocs/edit/cust_pay.cgi                        |  97 -----
 htdocs/edit/cust_pkg.cgi                        | 167 --------
 htdocs/edit/part_pkg.cgi                        | 176 --------
 htdocs/edit/part_referral.cgi                   |  90 -----
 htdocs/edit/part_svc.cgi                        | 208 ----------
 htdocs/edit/process/agent.cgi                   |  69 ----
 htdocs/edit/process/agent_type.cgi              |  96 -----
 htdocs/edit/process/cust_credit.cgi             |  76 ----
 htdocs/edit/process/cust_main.cgi               | 192 ---------
 htdocs/edit/process/cust_main_county-expand.cgi | 100 -----
 htdocs/edit/process/cust_main_county.cgi        |  60 ---
 htdocs/edit/process/cust_pay.cgi                |  67 ---
 htdocs/edit/process/cust_pkg.cgi                |  80 ----
 htdocs/edit/process/part_pkg.cgi                | 148 -------
 htdocs/edit/process/part_referral.cgi           |  65 ---
 htdocs/edit/process/part_svc.cgi                |  69 ----
 htdocs/edit/process/svc_acct.cgi                |  96 -----
 htdocs/edit/process/svc_acct_pop.cgi            |  66 ---
 htdocs/edit/process/svc_acct_sm.cgi             |  83 ----
 htdocs/edit/process/svc_domain.cgi              |  80 ----
 htdocs/edit/svc_acct.cgi                        | 228 -----------
 htdocs/edit/svc_acct_pop.cgi                    | 102 -----
 htdocs/edit/svc_acct_sm.cgi                     | 247 ------------
 htdocs/edit/svc_domain.cgi                      | 164 --------
 htdocs/images/mid-logo.png                      | Bin 9727 -> 0 bytes
 htdocs/images/small-logo.png                    | Bin 4781 -> 0 bytes
 htdocs/index.html                               | 105 -----
 htdocs/misc/bill.cgi                            |  58 ---
 htdocs/misc/cancel-unaudited.cgi                |  93 -----
 htdocs/misc/cancel_pkg.cgi                      |  71 ----
 htdocs/misc/delete-customer.cgi                 |  58 ---
 htdocs/misc/expire_pkg.cgi                      |  61 ---
 htdocs/misc/link.cgi                            |  85 ----
 htdocs/misc/print-invoice.cgi                   |  51 ---
 htdocs/misc/process/delete-customer.cgi         |  46 ---
 htdocs/misc/process/link.cgi                    |  76 ----
 htdocs/misc/susp_pkg.cgi                        |  64 ---
 htdocs/misc/unsusp_pkg.cgi                      |  61 ---
 htdocs/search/cust_bill.cgi                     | 176 --------
 htdocs/search/cust_bill.html                    |  21 -
 htdocs/search/cust_main-payinfo.html            |  20 -
 htdocs/search/cust_main.cgi                     | 311 --------------
 htdocs/search/cust_main.html                    |  36 --
 htdocs/search/cust_pkg.cgi                      | 151 -------
 htdocs/search/svc_acct.cgi                      | 207 ----------
 htdocs/search/svc_acct.html                     |  21 -
 htdocs/search/svc_acct_sm.cgi                   | 140 -------
 htdocs/search/svc_acct_sm.html                  |  23 --
 htdocs/search/svc_domain.cgi                    | 210 ----------
 htdocs/search/svc_domain.html                   |  22 -
 htdocs/view/cust_bill.cgi                       |  93 -----
 htdocs/view/cust_main.cgi                       | 437 --------------------
 htdocs/view/cust_pkg.cgi                        | 206 ----------
 htdocs/view/svc_acct.cgi                        | 177 --------
 htdocs/view/svc_acct_sm.cgi                     | 128 ------
 htdocs/view/svc_domain.cgi                      | 102 -----
 143 files changed, 15023 deletions(-)
 delete mode 100644 htdocs/.htaccess
 delete mode 100755 htdocs/browse/agent.cgi
 delete mode 100755 htdocs/browse/agent_type.cgi
 delete mode 100755 htdocs/browse/cust_main_county.cgi
 delete mode 100755 htdocs/browse/nas.cgi
 delete mode 100755 htdocs/browse/part_pkg.cgi
 delete mode 100755 htdocs/browse/part_referral.cgi
 delete mode 100755 htdocs/browse/part_svc.cgi
 delete mode 100755 htdocs/browse/svc_acct_pop.cgi
 delete mode 100644 htdocs/docs/admin.html
 delete mode 100644 htdocs/docs/billing.html
 delete mode 100644 htdocs/docs/config.html
 delete mode 100644 htdocs/docs/export.html
 delete mode 100644 htdocs/docs/index.html
 delete mode 100644 htdocs/docs/install.html
 delete mode 100644 htdocs/docs/legacy.html
 delete mode 100644 htdocs/docs/man/FS.html
 delete mode 100644 htdocs/docs/man/FS/Bill.html
 delete mode 100644 htdocs/docs/man/FS/CGI.html
 delete mode 100644 htdocs/docs/man/FS/CGIwrapper.html
 delete mode 100644 htdocs/docs/man/FS/Conf.html
 delete mode 100644 htdocs/docs/man/FS/Invoice.html
 delete mode 100644 htdocs/docs/man/FS/Record.html
 delete mode 100644 htdocs/docs/man/FS/SSH.html
 delete mode 100644 htdocs/docs/man/FS/SessionClient.html
 delete mode 100644 htdocs/docs/man/FS/SignupClient.html
 delete mode 100644 htdocs/docs/man/FS/UI/Base.html
 delete mode 100644 htdocs/docs/man/FS/UI/CGI.html
 delete mode 100644 htdocs/docs/man/FS/UI/Gtk.html
 delete mode 100644 htdocs/docs/man/FS/UI/agent.html
 delete mode 100644 htdocs/docs/man/FS/UID.html
 delete mode 100644 htdocs/docs/man/FS/agent.html
 delete mode 100644 htdocs/docs/man/FS/agent_type.html
 delete mode 100644 htdocs/docs/man/FS/cust_bill.html
 delete mode 100644 htdocs/docs/man/FS/cust_bill_pkg.html
 delete mode 100644 htdocs/docs/man/FS/cust_credit.html
 delete mode 100644 htdocs/docs/man/FS/cust_main.html
 delete mode 100644 htdocs/docs/man/FS/cust_main_county.html
 delete mode 100644 htdocs/docs/man/FS/cust_main_invoice.html
 delete mode 100644 htdocs/docs/man/FS/cust_pay.html
 delete mode 100644 htdocs/docs/man/FS/cust_pay_batch.html
 delete mode 100644 htdocs/docs/man/FS/cust_pkg.html
 delete mode 100644 htdocs/docs/man/FS/cust_refund.html
 delete mode 100644 htdocs/docs/man/FS/cust_svc.html
 delete mode 100644 htdocs/docs/man/FS/dbdef.html
 delete mode 100644 htdocs/docs/man/FS/dbdef_colgroup.html
 delete mode 100644 htdocs/docs/man/FS/dbdef_column.html
 delete mode 100644 htdocs/docs/man/FS/dbdef_index.html
 delete mode 100644 htdocs/docs/man/FS/dbdef_table.html
 delete mode 100644 htdocs/docs/man/FS/dbdef_unique.html
 delete mode 100644 htdocs/docs/man/FS/domain_record.html
 delete mode 100644 htdocs/docs/man/FS/nas.html
 delete mode 100644 htdocs/docs/man/FS/part_pkg.html
 delete mode 100644 htdocs/docs/man/FS/part_referral.html
 delete mode 100644 htdocs/docs/man/FS/part_svc.html
 delete mode 100644 htdocs/docs/man/FS/pkg_svc.html
 delete mode 100644 htdocs/docs/man/FS/port.html
 delete mode 100644 htdocs/docs/man/FS/prepay_credit.html
 delete mode 100644 htdocs/docs/man/FS/session.html
 delete mode 100644 htdocs/docs/man/FS/svc_Common.html
 delete mode 100644 htdocs/docs/man/FS/svc_acct.html
 delete mode 100644 htdocs/docs/man/FS/svc_acct_pop.html
 delete mode 100644 htdocs/docs/man/FS/svc_acct_sm.html
 delete mode 100644 htdocs/docs/man/FS/svc_domain.html
 delete mode 100644 htdocs/docs/man/FS/svc_www.html
 delete mode 100644 htdocs/docs/man/FS/type_pkgs.html
 delete mode 100644 htdocs/docs/overview.dia
 delete mode 100644 htdocs/docs/overview.png
 delete mode 100644 htdocs/docs/passwd.html
 delete mode 100755 htdocs/docs/postgresql.html
 delete mode 100644 htdocs/docs/schema.html
 delete mode 100644 htdocs/docs/session.html
 delete mode 100644 htdocs/docs/signup.html
 delete mode 100644 htdocs/docs/trouble.html
 delete mode 100644 htdocs/docs/upgrade.html
 delete mode 100644 htdocs/docs/upgrade2.html
 delete mode 100644 htdocs/docs/upgrade3.html
 delete mode 100644 htdocs/docs/upgrade4.html
 delete mode 100644 htdocs/docs/upgrade5.html
 delete mode 100644 htdocs/docs/upgrade6.html
 delete mode 100644 htdocs/docs/upgrade7.html
 delete mode 100755 htdocs/edit/agent.cgi
 delete mode 100755 htdocs/edit/agent_type.cgi
 delete mode 100755 htdocs/edit/cust_credit.cgi
 delete mode 100755 htdocs/edit/cust_main.cgi
 delete mode 100755 htdocs/edit/cust_main_county-expand.cgi
 delete mode 100755 htdocs/edit/cust_main_county.cgi
 delete mode 100755 htdocs/edit/cust_pay.cgi
 delete mode 100755 htdocs/edit/cust_pkg.cgi
 delete mode 100755 htdocs/edit/part_pkg.cgi
 delete mode 100755 htdocs/edit/part_referral.cgi
 delete mode 100755 htdocs/edit/part_svc.cgi
 delete mode 100755 htdocs/edit/process/agent.cgi
 delete mode 100755 htdocs/edit/process/agent_type.cgi
 delete mode 100755 htdocs/edit/process/cust_credit.cgi
 delete mode 100755 htdocs/edit/process/cust_main.cgi
 delete mode 100755 htdocs/edit/process/cust_main_county-expand.cgi
 delete mode 100755 htdocs/edit/process/cust_main_county.cgi
 delete mode 100755 htdocs/edit/process/cust_pay.cgi
 delete mode 100755 htdocs/edit/process/cust_pkg.cgi
 delete mode 100755 htdocs/edit/process/part_pkg.cgi
 delete mode 100755 htdocs/edit/process/part_referral.cgi
 delete mode 100755 htdocs/edit/process/part_svc.cgi
 delete mode 100755 htdocs/edit/process/svc_acct.cgi
 delete mode 100755 htdocs/edit/process/svc_acct_pop.cgi
 delete mode 100755 htdocs/edit/process/svc_acct_sm.cgi
 delete mode 100755 htdocs/edit/process/svc_domain.cgi
 delete mode 100755 htdocs/edit/svc_acct.cgi
 delete mode 100755 htdocs/edit/svc_acct_pop.cgi
 delete mode 100755 htdocs/edit/svc_acct_sm.cgi
 delete mode 100755 htdocs/edit/svc_domain.cgi
 delete mode 100644 htdocs/images/mid-logo.png
 delete mode 100644 htdocs/images/small-logo.png
 delete mode 100755 htdocs/index.html
 delete mode 100755 htdocs/misc/bill.cgi
 delete mode 100755 htdocs/misc/cancel-unaudited.cgi
 delete mode 100755 htdocs/misc/cancel_pkg.cgi
 delete mode 100755 htdocs/misc/delete-customer.cgi
 delete mode 100755 htdocs/misc/expire_pkg.cgi
 delete mode 100755 htdocs/misc/link.cgi
 delete mode 100755 htdocs/misc/print-invoice.cgi
 delete mode 100755 htdocs/misc/process/delete-customer.cgi
 delete mode 100755 htdocs/misc/process/link.cgi
 delete mode 100755 htdocs/misc/susp_pkg.cgi
 delete mode 100755 htdocs/misc/unsusp_pkg.cgi
 delete mode 100755 htdocs/search/cust_bill.cgi
 delete mode 100755 htdocs/search/cust_bill.html
 delete mode 100755 htdocs/search/cust_main-payinfo.html
 delete mode 100755 htdocs/search/cust_main.cgi
 delete mode 100755 htdocs/search/cust_main.html
 delete mode 100755 htdocs/search/cust_pkg.cgi
 delete mode 100755 htdocs/search/svc_acct.cgi
 delete mode 100755 htdocs/search/svc_acct.html
 delete mode 100755 htdocs/search/svc_acct_sm.cgi
 delete mode 100755 htdocs/search/svc_acct_sm.html
 delete mode 100755 htdocs/search/svc_domain.cgi
 delete mode 100755 htdocs/search/svc_domain.html
 delete mode 100755 htdocs/view/cust_bill.cgi
 delete mode 100755 htdocs/view/cust_main.cgi
 delete mode 100755 htdocs/view/cust_pkg.cgi
 delete mode 100755 htdocs/view/svc_acct.cgi
 delete mode 100755 htdocs/view/svc_acct_sm.cgi
 delete mode 100755 htdocs/view/svc_domain.cgi

diff --git a/htdocs/.htaccess b/htdocs/.htaccess
deleted file mode 100644
index f8c6b9c0c..000000000
--- a/htdocs/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-AuthName        Freeside
-AuthType        Basic
-require valid-user
diff --git a/htdocs/browse/agent.cgi b/htdocs/browse/agent.cgi
deleted file mode 100755
index b73d17b76..000000000
--- a/htdocs/browse/agent.cgi
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: agent.cgi,v 1.13 1999-04-09 04:22:34 ivan Exp $
-#
-# ivan@sisd.com 97-dec-12
-#
-# changes to allow pages to load from a relative location in the web tree.
-#	bmccane@maxbaud.net	98-mar-25
-#
-# changed 'type' to 'atype' because type is reserved word in Pg6.3
-#	bmccane@maxbaud.net	98-apr-3
-#
-# agent type was linking to wrong cgi ivan@sisd.com 98-jul-18
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: agent.cgi,v $
-# Revision 1.13  1999-04-09 04:22:34  ivan
-# also table()
-#
-# Revision 1.12  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.11  1999/01/20 09:43:16  ivan
-# comment out future UI code (but look at it, it's neat!)
-#
-# Revision 1.10  1999/01/19 05:13:24  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.9  1999/01/18 09:41:14  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.8  1999/01/18 09:22:26  ivan
-# changes to track email addresses for email invoicing
-#
-# Revision 1.7  1998/12/17 05:25:16  ivan
-# fix visual and other bugs
-#
-# Revision 1.6  1998/11/23 05:29:46  ivan
-# use CGI::Carp
-#
-# Revision 1.5  1998/11/23 05:27:31  ivan
-# to eliminate warnings
-#
-# Revision 1.4  1998/11/20 08:50:36  ivan
-# s/CGI::Base/CGI.pm, visual fixes
-#
-# Revision 1.3  1998/11/08 10:11:02  ivan
-# CGI.pm
-#
-# Revision 1.2  1998/11/07 10:24:22  ivan
-# don't use depriciated FS::Bill and FS::Invoice, other miscellania
-#
-
-use strict;
-use vars qw( $ui $cgi $p $agent );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup swapuid);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar table popurl);
-use FS::agent;
-use FS::agent_type;
-
-#Begin silliness
-#
-#use FS::UI::CGI;
-#use FS::UI::agent;
-#
-#$ui = new FS::UI::agent;
-#$ui->browse;
-#exit;
-#__END__
-#End silliness
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
-
-print $cgi->header( '-expires' => 'now' ), header('Agent Listing', menubar(
-  'Main Menu'   => $p,
-  'Agent Types' => $p. 'browse/agent_type.cgi',
-#  'Add new agent' => '../edit/agent.cgi'
-)), <<END;
-Agents are resellers of your service. Agents may be limited to a subset of your
-full offerings (via their type).<BR><BR>
-END
-print &table(), <<END;
-      <TR>
-        <TH COLSPAN=2>Agent</TH>
-        <TH>Type</TH>
-        <TH><FONT SIZE=-1>Freq. (unimp.)</FONT></TH>
-        <TH><FONT SIZE=-1>Prog. (unimp.)</FONT></TH>
-      </TR>
-END
-#        <TH><FONT SIZE=-1>Agent #</FONT></TH>
-#        <TH>Agent</TH>
-
-foreach $agent ( sort { 
-  $a->getfield('agentnum') <=> $b->getfield('agentnum')
-} qsearch('agent',{}) ) {
-  my($hashref)=$agent->hashref;
-  my($typenum)=$hashref->{typenum};
-  my($agent_type)=qsearchs('agent_type',{'typenum'=>$typenum});
-  my($atype)=$agent_type->getfield('atype');
-  print <<END;
-      <TR>
-        <TD><A HREF="${p}edit/agent.cgi?$hashref->{agentnum}">
-          $hashref->{agentnum}</A></TD>
-        <TD><A HREF="${p}edit/agent.cgi?$hashref->{agentnum}">
-          $hashref->{agent}</A></TD>
-        <TD><A HREF="${p}edit/agent_type.cgi?$typenum">$atype</A></TD>
-        <TD>$hashref->{freq}</TD>
-        <TD>$hashref->{prog}</TD>
-      </TR>
-END
-
-}
-
-print <<END;
-      <TR>
-        <TD COLSPAN=2><A HREF="${p}edit/agent.cgi"><I>Add new agent</I></A></TD>
-        <TD><A HREF="${p}edit/agent_type.cgi"><I>Add new agent type</I></A></TD>
-      </TR>
-    </TABLE>
-
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/browse/agent_type.cgi b/htdocs/browse/agent_type.cgi
deleted file mode 100755
index 9d8687299..000000000
--- a/htdocs/browse/agent_type.cgi
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: agent_type.cgi,v 1.8 1999-04-09 04:22:34 ivan Exp $
-#
-# ivan@sisd.com 97-dec-10
-#
-# Changes to allow page to work at a relative position in server
-# Changes to make "Packages" display 2-wide in table (old way was too vertical)
-#	bmccane@maxbaud.net 98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: agent_type.cgi,v $
-# Revision 1.8  1999-04-09 04:22:34  ivan
-# also table()
-#
-# Revision 1.7  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.6  1999/04/07 11:10:46  ivan
-# harmless typo
-#
-# Revision 1.5  1999/01/19 05:13:25  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:15  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 05:25:17  ivan
-# fix visual and other bugs
-#
-# Revision 1.2  1998/11/21 07:39:52  ivan
-# visual
-#
-
-use strict;
-use vars qw( $cgi $p $agent_type );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup swapuid);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar popurl table);
-use FS::agent_type;
-use FS::type_pkgs;
-use FS::part_pkg;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
-print $cgi->header( '-expires' => 'now' ), header("Agent Type Listing", menubar(
-  'Main Menu' => $p,
-)), "Agent types define groups of packages that you can then assign to".
-    " particular agents.<BR><BR>", &table(), <<END;
-      <TR>
-        <TH COLSPAN=2>Agent Type</TH>
-        <TH COLSPAN="2">Packages</TH>
-      </TR>
-END
-
-foreach $agent_type ( sort { 
-  $a->getfield('typenum') <=> $b->getfield('typenum')
-} qsearch('agent_type',{}) ) {
-  my($hashref)=$agent_type->hashref;
-  my(@type_pkgs)=qsearch('type_pkgs',{'typenum'=> $hashref->{typenum} });
-  my($rowspan)=scalar(@type_pkgs);
-  $rowspan = int($rowspan/2+0.5) ;
-  print <<END;
-      <TR>
-        <TD ROWSPAN=$rowspan><A HREF="${p}edit/agent_type.cgi?$hashref->{typenum}">
-          $hashref->{typenum}
-        </A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="${p}edit/agent_type.cgi?$hashref->{typenum}">$hashref->{atype}</A></TD>
-END
-
-  my($type_pkgs);
-  my($tdcount) = -1 ;
-  foreach $type_pkgs ( @type_pkgs ) {
-    my($pkgpart)=$type_pkgs->getfield('pkgpart');
-    my($part_pkg) = qsearchs('part_pkg',{'pkgpart'=> $pkgpart });
-    print qq!<TR>! if ($tdcount == 0) ;
-    $tdcount = 0 if ($tdcount == -1) ;
-    print qq!<TD><A HREF="${p}edit/part_pkg.cgi?$pkgpart">!,
-          $part_pkg->getfield('pkg'),"</A></TD>";
-    $tdcount ++ ;
-    if ($tdcount == 2)
-    {
-	print qq!</TR>\n! ;
-	$tdcount = 0 ;
-    }
-  }
-
-  print "</TR>";
-}
-
-print <<END;
-  <TR><TD COLSPAN=2><I><A HREF="${p}edit/agent_type.cgi">Add new agent type</A></I></TD></TR>
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/browse/cust_main_county.cgi b/htdocs/browse/cust_main_county.cgi
deleted file mode 100755
index 5f2b13dc0..000000000
--- a/htdocs/browse/cust_main_county.cgi
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_main_county.cgi,v 1.7 1999-04-09 04:22:34 ivan Exp $
-#
-# ivan@sisd.com 97-dec-13
-#
-# Changes to allow page to work at a relative position in server
-#	bmccane@maxbaud.net	98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: cust_main_county.cgi,v $
-# Revision 1.7  1999-04-09 04:22:34  ivan
-# also table()
-#
-# Revision 1.6  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.5  1999/01/19 05:13:26  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:16  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 05:25:18  ivan
-# fix visual and other bugs
-#
-# Revision 1.2  1998/11/18 09:01:34  ivan
-# i18n! i18n!
-#
-
-use strict;
-use vars qw( $cgi $p $cust_main_county );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup swapuid);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar popurl table);
-use FS::cust_main_county;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
-
-print $cgi->header( '-expires' => 'now' ), header("Tax Rate Listing", menubar(
-  'Main Menu' => $p,
-  'Edit tax rates' => $p. "edit/cust_main_county.cgi",
-)),<<END;
-    Click on <u>expand country</u> to specify a country's tax rates by state.
-    <BR>Click on <u>expand state</u> to specify a state's tax rates by county.
-    <BR><BR>
-END
-print &table(), <<END;
-      <TR>
-        <TH><FONT SIZE=-1>Country</FONT></TH>
-        <TH><FONT SIZE=-1>State</FONT></TH>
-        <TH>County</TH>
-        <TH><FONT SIZE=-1>Tax</FONT></TH>
-      </TR>
-END
-
-foreach $cust_main_county ( qsearch('cust_main_county',{}) ) {
-  my($hashref)=$cust_main_county->hashref;
-  print <<END;
-      <TR>
-        <TD>$hashref->{country}</TD>
-END
-  print "<TD>", $hashref->{state}
-      ? $hashref->{state}
-      : qq!(ALL) <FONT SIZE=-1>!.
-        qq!<A HREF="${p}edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
-        qq!">expand country</A></FONT>!
-    , "</TD>";
-  print "<TD>";
-  if ( $hashref->{county} ) {
-    print $hashref->{county};
-  } else {
-    print "(ALL)";
-    if ( $hashref->{state} ) {
-      print qq!<FONT SIZE=-1>!.
-          qq!<A HREF="${p}edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
-          qq!">expand state</A></FONT>!;
-    }
-  }
-  print "</TD>";
-
-  print <<END;
-        <TD>$hashref->{tax}%</TD>
-      </TR>
-END
-
-}
-
-print <<END;
-    </TABLE>
-    </CENTER>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/browse/nas.cgi b/htdocs/browse/nas.cgi
deleted file mode 100755
index a65235b1e..000000000
--- a/htdocs/browse/nas.cgi
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use vars qw( $cgi $p );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch); # qsearchs);
-use FS::CGI qw(header menubar table popurl);
-use FS::nas;
-use FS::port;
-use FS::session;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$p=popurl(2);
-
-print $cgi->header( '-expires' => 'now' ), header('NAS ports', menubar(
-  'Main Menu' => $p,
-));
-
-my $now = time;
-
-foreach my $nas ( sort { $a->nasnum <=> $b->nasnum } qsearch( 'nas', {} ) ) {
-  print $nas->nasnum. ": ". $nas->nas. " ".
-        $nas->nasfqdn. " (". $nas->nasip. ") ".
-        "as of ". time2str("%c",$nas->last).
-        " (". &pretty_interval($now - $nas->last). " ago)<br>".
-        &table(). "<TR><TH>Nas<BR>Port #</TH><TH>Global<BR>Port #</BR></TH>".
-        "<TH>IP address</TH><TH>User</TH><TH>Since</TH><TH>Duration</TH><TR>",
-  ;
-  foreach my $port ( sort {
-    $a->nasport <=> $b->nasport || $a->portnum <=> $b->portnum
-  } qsearch( 'port', { 'nasnum' => $nas->nasnum } ) ) {
-    my $session = $port->session;
-    my($user, $since, $pretty_since, $duration);
-    if ( ! $session ) {
-      $user = "(empty)";
-      $since = 0;
-      $pretty_since = "(never)";
-      $duration = '';
-    } elsif ( $session->logout ) {
-      $user = "(empty)";
-      $since = $session->logout;
-    } else {
-      my $svc_acct = $session->svc_acct;
-      $user = "<A HREF=\"$p/view/svc_acct.cgi?". $svc_acct->svcnum. "\">".
-              $svc_acct->username. "</A>";
-      $since = $session->login;
-    }
-    $pretty_since = time2str("%c", $since) if $since;
-    $duration = pretty_interval( $now - $since ). " ago"
-      unless defined($duration);
-    print "<TR><TD>". $port->nasport. "</TD><TD>". $port->portnum. "</TD><TD>".
-          $port->ip. "</TD><TD>$user</TD><TD>$pretty_since".
-          "</TD><TD>$duration</TD></TR>"
-    ;
-  }
-  print "</TABLE><BR>";
-}
-
-sub pretty_interval {
-  my $interval = shift;
-  my %howlong = (
-    '604800' => 'week',
-    '86400'  => 'day',
-    '3600'   => 'hour',
-    '60'     => 'minute',
-    '1'      => 'second',
-  );
-
-  my $pretty = "";
-  foreach my $key ( sort { $b <=> $a } keys %howlong ) {
-    my $value = int( $interval / $key );
-    if ( $value  ) {
-      if ( $value == 1 ) {
-        $pretty .=
-          ( $howlong{$key} eq 'hour' ? 'an ' : 'a ' ). $howlong{$key}. " "
-      } else {
-        $pretty .= $value. ' '. $howlong{$key}. 's ';
-      }
-    }
-    $interval -= $value * $key;
-  }
-  $pretty =~ /^\s*(\S.*\S)\s*$/;
-  $1;
-} 
-
-#print &table(), <<END;
-#<TR>
-#  <TH>#</TH>
-#  <TH>NAS</
diff --git a/htdocs/browse/part_pkg.cgi b/htdocs/browse/part_pkg.cgi
deleted file mode 100755
index d4c359b28..000000000
--- a/htdocs/browse/part_pkg.cgi
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: part_pkg.cgi,v 1.8 1999-04-09 04:22:34 ivan Exp $
-#
-# ivan@sisd.com 97-dec-5,9
-#
-# Changes to allow page to work at a relative position in server
-#	bmccane@maxbaud.net	98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: part_pkg.cgi,v $
-# Revision 1.8  1999-04-09 04:22:34  ivan
-# also table()
-#
-# Revision 1.7  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.6  1999/01/19 05:13:27  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:17  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1998/12/17 05:25:19  ivan
-# fix visual and other bugs
-#
-# Revision 1.3  1998/11/21 07:23:45  ivan
-# visual
-#
-# Revision 1.2  1998/11/21 07:00:32  ivan
-# visual
-#
-
-use strict;
-use vars qw( $cgi $p $part_pkg );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup swapuid);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar popurl table);
-use FS::part_pkg;
-use FS::pkg_svc;
-use FS::part_svc;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
-
-print $cgi->header( '-expires' => 'now' ), header("Package Part Listing",menubar(
-  'Main Menu' => $p,
-)), "One or more services are grouped together into a package and given",
-  " pricing information. Customers purchase packages, not services.<BR><BR>", 
-  &table(), <<END;
-    <TABLE BORDER>
-      <TR>
-        <TH COLSPAN=2>Package</TH>
-        <TH>Comment</TH>
-        <TH><FONT SIZE=-1>Setup Fee</FONT></TH>
-        <TH><FONT SIZE=-1>Freq.</FONT></TH>
-        <TH><FONT SIZE=-1>Recur. Fee</FONT></TH>
-        <TH>Service</TH>
-        <TH><FONT SIZE=-1>Quan.</FONT></TH>
-      </TR>
-END
-
-foreach $part_pkg ( sort { 
-  $a->getfield('pkgpart') <=> $b->getfield('pkgpart')
-} qsearch('part_pkg',{}) ) {
-  my($hashref)=$part_pkg->hashref;
-  my(@pkg_svc)=grep $_->getfield('quantity'),
-    qsearch('pkg_svc',{'pkgpart'=> $hashref->{pkgpart} });
-  my($rowspan)=scalar(@pkg_svc);
-  print <<END;
-      <TR>
-        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">
-          $hashref->{pkgpart}
-        </A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">$hashref->{pkg}</A></TD>
-        <TD ROWSPAN=$rowspan>$hashref->{comment}</TD>
-        <TD ROWSPAN=$rowspan>$hashref->{setup}</TD>
-        <TD ROWSPAN=$rowspan>$hashref->{freq}</TD>
-        <TD ROWSPAN=$rowspan>$hashref->{recur}</TD>
-END
-
-  my($pkg_svc);
-  my($n)="";
-  foreach $pkg_svc ( @pkg_svc ) {
-    my($svcpart)=$pkg_svc->getfield('svcpart');
-    my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart });
-    print $n,qq!<TD><A HREF="${p}edit/part_svc.cgi?$svcpart">!,
-          $part_svc->getfield('svc'),"</A></TD><TD>",
-          $pkg_svc->getfield('quantity'),"</TD></TR>\n";
-    $n="<TR>";
-  }
-
-  print "</TR>";
-}
-
-print <<END;
-   <TR><TD COLSPAN=2><I><A HREF="${p}edit/part_pkg.cgi">Add new package</A></I></TD></TR>
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/browse/part_referral.cgi b/htdocs/browse/part_referral.cgi
deleted file mode 100755
index e4ca25a65..000000000
--- a/htdocs/browse/part_referral.cgi
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: part_referral.cgi,v 1.9 1999-04-09 04:22:34 ivan Exp $
-#
-# ivan@sisd.com 98-feb-23 
-#
-# Changes to allow page to work at a relative position in server
-#	bmccane@maxbaud.net	98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: part_referral.cgi,v $
-# Revision 1.9  1999-04-09 04:22:34  ivan
-# also table()
-#
-# Revision 1.8  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.7  1999/01/19 05:13:28  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.6  1999/01/18 09:41:18  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.5  1998/12/17 05:25:20  ivan
-# fix visual and other bugs
-#
-# Revision 1.4  1998/12/17 04:32:55  ivan
-# print $cgi->header
-#
-# Revision 1.3  1998/12/17 04:31:36  ivan
-# use CGI::Carp
-#
-# Revision 1.2  1998/12/17 04:26:04  ivan
-# use CGI; no relative URLs
-#
-
-use strict;
-use vars qw( $cgi $p $part_referral );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup swapuid);
-use FS::Record qw(qsearch);
-use FS::CGI qw(header menubar popurl table);
-use FS::part_referral;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
-
-print $cgi->header( '-expires' => 'now' ), header("Referral Listing", menubar(
-  'Main Menu' => $p,
-#  'Add new referral' => "../edit/part_referral.cgi",
-)), "Where a customer heard about your service. Tracked for informational purposes.<BR><BR>", &table(), <<END;
-      <TR>
-        <TH COLSPAN=2>Referral</TH>
-      </TR>
-END
-
-foreach $part_referral ( sort { 
-  $a->getfield('refnum') <=> $b->getfield('refnum')
-} qsearch('part_referral',{}) ) {
-  my($hashref)=$part_referral->hashref;
-  print <<END;
-      <TR>
-        <TD><A HREF="${p}edit/part_referral.cgi?$hashref->{refnum}">
-          $hashref->{refnum}</A></TD>
-        <TD><A HREF="${p}edit/part_referral.cgi?$hashref->{refnum}">
-          $hashref->{referral}</A></TD>
-      </TR>
-END
-
-}
-
-print <<END;
-      <TR>
-        <TD COLSPAN=2><A HREF="${p}edit/part_referral.cgi"><I>Add new referral</I></A></TD>
-      </TR>
-    </TABLE>
-    </CENTER>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/browse/part_svc.cgi b/htdocs/browse/part_svc.cgi
deleted file mode 100755
index 123cb7d2a..000000000
--- a/htdocs/browse/part_svc.cgi
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: part_svc.cgi,v 1.11 1999-04-09 04:22:34 ivan Exp $
-#
-# ivan@sisd.com 97-nov-14, 97-dec-9
-#
-# Changes to allow page to work at a relative position in server
-#	bmccane@maxbaud.net	98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: part_svc.cgi,v $
-# Revision 1.11  1999-04-09 04:22:34  ivan
-# also table()
-#
-# Revision 1.10  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.9  1999/01/19 05:13:29  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.8  1999/01/18 09:41:19  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.7  1998/12/30 23:06:22  ivan
-# typo
-#
-# Revision 1.6  1998/12/30 23:03:20  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.5  1998/12/17 05:25:21  ivan
-# fix visual and other bugs
-#
-# Revision 1.4  1998/11/21 02:26:22  ivan
-# visual
-#
-# Revision 1.3  1998/11/20 23:10:57  ivan
-# visual
-#
-# Revision 1.2  1998/11/20 08:50:37  ivan
-# s/CGI::Base/CGI.pm, visual fixes
-#
-
-use strict;
-use vars qw( $cgi $p $part_svc );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch fields);
-use FS::part_svc;
-use FS::CGI qw(header menubar popurl table);
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
-
-print $cgi->header( '-expires' => 'now' ), header('Service Part Listing', menubar(
-  'Main Menu' => $p,
-)),<<END;
-    Services are items you offer to your customers.<BR><BR>
-END
-print &table(), <<END;
-      <TR>
-        <TH COLSPAN=2>Service</TH>
-        <TH>Table</TH>
-        <TH>Field</TH>
-        <TH COLSPAN=2>Modifier</TH>
-      </TR>
-END
-
-foreach $part_svc ( sort {
-  $a->getfield('svcpart') <=> $b->getfield('svcpart')
-} qsearch('part_svc',{}) ) {
-  my($hashref)=$part_svc->hashref;
-  my($svcdb)=$hashref->{svcdb};
-  my(@rows)=
-    grep $hashref->{${svcdb}.'__'.$_.'_flag'},
-      map { /^${svcdb}__(.*)$/; $1 }
-        grep ! /_flag$/,
-          grep /^${svcdb}__/,
-            fields('part_svc')
-  ;
-  my($rowspan)=scalar(@rows) || 1;
-  print <<END;
-      <TR>
-        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_svc.cgi?$hashref->{svcpart}">
-          $hashref->{svcpart}</A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_svc.cgi?$hashref->{svcpart}">          $hashref->{svc}</A></TD>
-        <TD ROWSPAN=$rowspan>$hashref->{svcdb}</TD>
-END
-
-  my($n1)='';
-  my($row);
-  foreach $row ( @rows ) {
-    my($flag)=$part_svc->getfield($svcdb.'__'.$row.'_flag');
-    print $n1,"<TD>$row</TD><TD>";
-    if ( $flag eq "D" ) { print "Default"; }
-      elsif ( $flag eq "F" ) { print "Fixed"; }
-      else { print "(Unknown!)"; }
-    print "</TD><TD>",$part_svc->getfield($svcdb."__".$row),"</TD>";
-    $n1="</TR><TR>";
-  }
-print "</TR>";
-}
-
-print <<END;
-      <TR>
-        <TD COLSPAN=2><A HREF="${p}edit/part_svc.cgi"><I>Add new service</I></A></TD>
-      </TR>
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/browse/svc_acct_pop.cgi b/htdocs/browse/svc_acct_pop.cgi
deleted file mode 100755
index 8094a9fd1..000000000
--- a/htdocs/browse/svc_acct_pop.cgi
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: svc_acct_pop.cgi,v 1.8 2000-01-28 22:56:13 ivan Exp $
-#
-# ivan@sisd.com 98-mar-8
-#
-# Changes to allow page to work at a relative position in server
-#	bmccane@maxbaud.net	98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: svc_acct_pop.cgi,v $
-# Revision 1.8  2000-01-28 22:56:13  ivan
-# track full phone number
-#
-# Revision 1.7  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.6  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.5  1999/01/19 05:13:30  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:20  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 05:25:22  ivan
-# fix visual and other bugs
-#
-# Revision 1.2  1998/12/17 04:36:59  ivan
-# use CGI;, use CGI::Carp, visual changes, relative URLs
-#
-
-use strict;
-use vars qw( $cgi $p $svc_acct_pop );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup swapuid);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar table popurl);
-use FS::svc_acct_pop;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
-
-print $cgi->header( '-expires' => 'now' ), header('POP Listing', menubar(
-  'Main Menu' => $p,
-)), "Points of Presence<BR><BR>", &table(), <<END;
-      <TR>
-        <TH></TH>
-        <TH>City</TH>
-        <TH>State</TH>
-        <TH>Area code</TH>
-        <TH>Exchange</TH>
-        <TH>Local</TH>
-      </TR>
-END
-
-foreach $svc_acct_pop ( sort { 
-  $a->getfield('popnum') <=> $b->getfield('popnum')
-} qsearch('svc_acct_pop',{}) ) {
-  my($hashref)=$svc_acct_pop->hashref;
-  print <<END;
-      <TR>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{popnum}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{city}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{state}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{ac}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{exch}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{loc}</A></TD>
-      </TR>
-END
-
-}
-
-print <<END;
-      <TR>
-        <TD COLSPAN=5><A HREF="${p}edit/svc_acct_pop.cgi"><I>Add new POP</I></A></TD>
-      </TR>
-    </TABLE>
-    </CENTER>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/docs/admin.html b/htdocs/docs/admin.html
deleted file mode 100644
index be53c0950..000000000
--- a/htdocs/docs/admin.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<head>
-  <title>Administration</title>
-</head>
-<body>
-  <h1>Administration</h1>
-</body>
-<ul>
-  <li>Open up the root of the Freeside document tree in your web
-  browser.  For example, if you created the Freeside document tree in   
-  /home/httpd/html/freeside, and your web browser's DocumentRoot is
-  /home/httpd/html, open http://your_host/freeside/. Replace
-  "your_host" with the name or network address of your web server.
-
-  <li>Once in the Freeside web interface, you must first create a
-  service.  An example of a service would be a dial-up account or a
-  hosted virtual domain.
-
-  <li>After you create your first service or services, you must then
-  create a package of that service or services which you will sell to
-  your customer.  To allow flexibility in changing your service
-  offerings, Freeside requires that you bundle your services into a
-  package before customers may purchase them.  For instance, you could
-  create a leased line package which would consist of a one-time
-  charge for the customer premise equipment, the monthly service fee
-  for the leased line, a backup dial-up account, and a support
-  contract.  You could also create a leased line package which omits
-  the support contract simply by adding a new package that does not
-  include the support contract.
-  
-  <li>After you create your first package, then you must define who is
-  able to sell that package by creating an agent type.  An example of
-  an agent type would be an internal sales representitive which sells
-  regular and promotional packages, as opposed to an external sales
-  representitive which would only sell regular packages of services.
-
-  <li>After creating a new agent type, you must create an agent, and
-  assign the the agent type you just created to it.
-
-  <li>If the service you created was of type svc_acct, you may have to
-  create a POP from the main menu before you can create your first new
-  customer.
-
-  <li>If you are using Freeside to keep track of sales taxes, you must
-  define tax information for your locale by clicking on the "View/Edit  
-  locales and tax rates" link on the Freeside main menu.
-
-  <li>Finally, set up at least one referral by clicking on the
-  "View/Edit referrals" link in the Freeside main menu.  Referrals
-  will help you keep track of how effective your advertising is, by
-  helping you keep track of where customers heard of your service
-  offerings.  You must create at least one referral.  If you do not wish to
-  use the referral functionality, simply create a single referral only.
-  
-  <li>You should now be ready to sign up your first customer by
-  clicking on the "New Customer" link at the top of the Freeside main
-  menu.
-</ul>
-</body>
-</html>
diff --git a/htdocs/docs/billing.html b/htdocs/docs/billing.html
deleted file mode 100644
index ecb5e1799..000000000
--- a/htdocs/docs/billing.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<head>
-  <title>Billing</title>
-</head>
-<body>
-  <h1>Billing</h1>
-  <ul>
-    <li>To enable billing, you <b>must</b> create an <a href="config.html#invoice_template">invoice_template</a> configuration file.  An example file is available in the <i>conf/</i> directory of the distribution.  You also need to create an <a href="config.html#lpr">lpr</a> configuration file to enable postal invoices.
-    <ul>
-      <li>Optional: Invoice template customization
-        <ul>
-          <li>See the <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> documentation for details on the substitution language.
-          <li>You <b>must</b> call the invoice_lines() function at least once - pass it a number of lines, and it returns a list of array references, each of two elements: a service description column, and a price column.
-          <li>In addition, the following variables are available:
-            <ul>
-              <li>$invnum - invoice number
-              <li>$date - as a UNIX timestamp (see <a href="http://search.cpan.org/doc/GBARR/TimeDate-1.09/lib/Date/Format.pm">Date::Format</a> for conversion functions).
-              <li>$page - current page
-              <li>$total_pages - total pages
-              <li>@address - A six-element array containing the customer name, company, and address.
-              <li>$overdue - true if this invoice is overdue
-            </ul>
-        </ul>
-    </ul>
-    <li>You can bill individual customers by clicking on the <i>Bill now</i> link on the main customer view.
-    <li> The <b>freeside-bill</b> script can be run daily to bill all customers.  Usage:<pre>freeside-bill [ -c [ i ] ] [ -d <i>date</i> ] [ -b ] <i>user</i></pre>
-      <ul>
-        <li>-c: Turn on collecting (you probably want this).
-        <li>-i: Real-time billing (as opposed to bacth billing).  Only relevant for credit cards.
-        <li>-d: Pretend it is <i>date</i> (parsed by <a href="http://search.cpan.org/doc/GBARR/TimeDate-1.09/lib/Date/Parse.pm">Date::Parse</a>)
-        <li>-b: N/A
-      </ul>
-      <br><br>Batch credit card processing
-      <ul>
-        <li>After this script is run, a credit card batch will be in the <a href="schema.html#cust_pay_batch">cust_pay_batch</a> table.  Export this table to your credit card batching.
-        <li>When your batch completes, erase the cust_pay_batch records in that batch and add any necessary paymants to the <a href="schema.html#cust_pay">cust_pay</a> table.  Example code to add payments is:
-        <pre>use FS::cust_pay;
-
-# loop over all records in batch
-
-my $payment=create FS::cust_pay (
-  'invnum' => $invnum,
-  'paid' => $paid,
-  '_date' => $_date,
-  'payby' => $payby,
-  'payinfo' => $payinfo,
-  'paybatch' => $paybatch,
-);
-
-my $error=$payment->insert;
-if ( $error ) {
-  #process error
-}
-
-# end loop
-</pre>
-All fields except paybatch are contained in the cust_pay_batch table.  You can use paybatch field to track particular batches and/or particular transactions within a batch.<br><br>
-        <li>The <b>freeside-print-batch</b> script can print or email pending credit card batches for manual entry.  Usage: freeside-print-batch [-v] [-p] [-e] [-a] [-d] <i>user</i>
-          <ul>
-            <li>-v: Verbose - Prints records to STDOUT.
-            <li>-p: Print to printer lpr as found in the conf directory.
-            <li>-e: Email output to user found in the Conf email file.
-            <li>-a: Automatically pays all records in cust_pay_batch.  Use -d with this option usually.
-            <li>-d: Delete - Pays account and deletes record from cust_pay_batch.
-          </ul>
-      </ul>
-  </ul>
-</body>
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
deleted file mode 100644
index 532a826be..000000000
--- a/htdocs/docs/config.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<head>
-  <title>Configuration files</title>
-</head>
-<body>
-  <h1>Configuration files</h1>
-<ul>
-  <li>Create the <b>/usr/local/etc/freeside</b> directory to hold your configuration.
-  <li>Setting up <a href="http://www.apache.org/docs/misc/FAQ.html#user-authentication">Apache user authetication</a> is mandatory.
-  <li>Create the <b>/usr/local/etc/freeside/mapsecrets</b> file, which maps Apache users to a secrets file which contains a DBI data source, username and password.  Every
-line in <b>/usr/local/etc/freeside/mapsecrets</b> should contain a username and
-filename, separated by whitespace.  Note that these are not local usernames -
-they are passed from Apache.  <a href="http://www.apache.org/docs/misc/FAQ.html#user-authentication">
-Apache user authetication</a> is mandatory.  For example, if you had the Apache users admin,
-john, and sam,  
-you mapsecrets file might look like:
-<pre>
-admin secretfile
-john secretfile
-sam secretfile
-</pre>
-  <li>Next, the filename(s) referenced in <b>/usr/local/etc/freeside/mapsecrets</b> file should be created in the <b>/usr/local/etc/freeside/</b> directory.  Each file contains three lines: <a href="http://search.cpan.org/doc/TIMB/DBI-1.15/DBI.pm">DBI data source</a> (for example,
-  <tt>DBI:mysql:freeside</tt> or <tt>DBI:Pg:host=localhost;dbname=freeside</tt>), database username, and database password.
-  These files should not be world readable.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.15/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD">manpage for your DBD</a> for the exact syntax of a DBI data source.  In a normal installation such as the example above, a single file <b>/usr/local/etc/freeside/secretfile</b> would be created - for example:
-<pre>
-DBI:Pg:host=localhost;dbname=freeside
-dbusername
-dbpassword
-</pre>
-</ul>
-All further configuration files and directories are located in
-<tt>/usr/local/etc/freeside/conf.<i>datasource</i></tt>, for example, 
-<tt>/usr/local/etc/freeside/conf.DBI:Pg:host=localhost;dbname=freeside</tt> (remember to backslash-escape the ; character when creating directories in the shell: <tt>mkdir&nbsp;/usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=freeside</tt>).
-<ul>
-  <li><a name="address">address</a> - This configuration file is no longer used.  See <a href="#invoice_template">invoice_template</a> instead.
-  <li><a name="apacheroot">apacheroot</a> - The directory containing Apache virtual hosts
-  <li><a name="apachemachine">apachemachine</a> - A machine with the apacheroot directory and user home directories.  The existance of this file enables setup of virtual host directories, and, in conjunction with the `home' configuration file, symlinks into user home directories.
-  <li><a name="apachemachines">apachemachines</a> - Your Apache machines, one per line.  This enables export of `/etc/apache/vhosts.conf', which can be included in your Apache configuration via the <a href="http://www.apache.org/docs/mod/core.html#include">Include</a> directive.
-  <li><a name="bindprimary">bindprimary</a> - Your BIND primary nameserver.  This enables export of /var/named/named.conf and zone files into /var/named
-  <li><a name="bindsecondaries">bindsecondaries</a> - Your BIND secondary nameservers, one per line.  This enables export of /var/named/named.conf
-  <li><a name="bsdshellmachines">bsdshellmachines</a> - Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/master.passwd'.
-  <li><a name="countrydefault">countrydefault</a> - Default two-letter country code (if not supplied, the default is `US')
-  <li><a name="cybercash2">cybercash2</a> - <a href="http://www.cybercash.com/cybercash/services/cashreg214.html">CyberCash v2</a> support, four lines: paymentserverhost, paymentserverport, paymentserversecret, and transaction type (`mauthonly' or `mauthcapture').  CCLib.pm is required.
-  <li>cybercash3.2 - <a href="http://www.cybercash.com/cybercash/services/technology.html">CyberCash v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly' or `mauthcapture').  CCMckLib3_2.pm, CCMckDirectLib3_2.pm and CCMckErrno3_2 are required.
-  <li><a name="deletecustomers">deletecustomers</a> - The existance of this file will enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that this customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers' packages if they cancel service.
-  <li><a name="domain">domain</a> - Your domain name.
-  <li><a name="editreferrals">editreferrals</a> - The existance of this file will allow you to change the referral of existing customers.
-  <li><a name="erpcdmachines">erpcdmachines</a> - Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd' and `/usr/annex/acp_dialup'.
-  <li><a name="hidecancelledpackages">hidecancelledpackages</a> - The existance of this file will prevent cancelled packages from showing up in listings (though they will still be in the database)
-  <li><a name="hidecancelledcustomers">hidecancelledcustomers</a> - The existance of this file will prevent customers with only cancelled packages from showing up in listings (though they will still be in the database)
-  <li><a name="home">home</a> - For new users, prefixed to usrename to create a directory name.  Should have a leading but not a trailing slash.
-  <li><a name="icradiusmachines">icradiusmachines</a> - Your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines, one per line.  The existance of this file (even if empty) turns on radcheck table creation (in the freeside database - the radcheck table needs to be created manually).  Machines listed in this file will have the radcheck table exported to them.  Each line of this file should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: "<CODE>radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd</CODE>".  Note that to use ICRADIUS export you need to be using MySQL.
-  <li><a name="icradius_mysqldest">icradius_mysqldest</a> - Destination directory for the MySQL databases, on the ICRADIUS machines.  Defaults to "/usr/local/var/".
-  <li><a name="icradius_mysqlsource">icradius_mysqlsource</a> - Source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".
-  <li><a name="icradius_secrets">icradius_secrets</a> - Optionally specifies a MySQL database for ICRADIUS export, if you're not running MySQL for your Freeside database.  The database should be on the Freeside machine and store data in the <a href="#icradius_mysqlsource">icradius_mysqlsource</a> directory.  Three lines: DBI data source, username and password.  This file should not be world readable.
-  <li><a name="invoice_from">invoice_from</a> - Return address on email invoices.
-  <li><a name="invoice_template">invoice_template</a> - Required template file for invoices.  See the <a href="billing.html">section on billing</a> for details.
-  <li><a name="lpr">lpr</a> - Print command for paper invoices, for example `lpr -h'.
-  <li><a name="maildisablecatchall">maildisablecatchall</a> - The existance of this file will disable the requirement that each virtual domain have a catch-all mailbox.
-  <li><a name="money_char">money_char</a> - Currency symbol - defaults to `$'.
-  <li><a name="mxmachines">mxmachines</a> - MX entries for new domains, weight and machine, one per line, with trailing `.'
-  <li><a name="nsmachines">nsmachines</a> - NS nameservers for new domains, one per line, with trailing `.'
-  <li><a name="nismachines">nismachines</a> - Your NIS master (not slave master) machines, one per line.  This enables export of `/etc/global/passwd' and `/etc/global/shadow'.
-  <li><a name="passwordmin">passwordmin</a> - Minimum password length (default 6);
-  <li><a name="qmailmachines">qmailmachines</a> - Your qmail machines, one per line.  This enables export of `/var/qmail/control/virtualdomains', `/var/qmail/control/recipientmap', and `/var/qmail/control/rcpthosts'.  The existance of this file (even if empty) also turns on user `.qmail-extension' file maintenance in conjunction with `shellmachine'.
-  <li><a name="radiusmachines">radiusmachines</a> - Your RADIUS authentication machines, one per line.  This enables export of `/etc/raddb/users'.
-  <li><a name="referraldefault">referraldefault</a> - Default referral, specified by refnum.
-  <li><a name="registries">registries</a> - Directory which contains domain registry information.  Each registry is a directory.
-    <ul>
-      <li>registries/internic - Currently the only supported registry
-        <ul>
-          <li>registries/internic/from - Email address from which InterNIC domain registrations are sent.
-          <li>regestries/internic/nameservers - The nameservers for InterNIC domain registrations, one per line.  Each line contains an IP address and hostname, separated by whitespace.
-          <li>registries/internic/tech_contact - Technical contact NIC handle for domain registrations.
-          <li>registries/internic/template - Template for InterNIC domain registrations with special markup.  A suitable copy of the InterNIC domain template v4.0 is in `fs-x.y.z/etc/domain-template.txt'.
-          <li>registries/internic/to - Email address to which InterNIC domain registrations are sent.
-        </ul>
-    </ul>
-  <li><a name="sendmailconfigpath">sendmailconfigpath</a> - Sendmail configuration file path - defaults to `/etc'.  Many newer distributions use `/etc/mail'.
-  <li><a name="sendmailmachines">sendmailmachines</a> - Your sendmail machines, one per line.  This enables export of `/etc/virtusertable' and `/etc/sendmail.cw'.
-  <li><a name="sendmailrestart">sendmailrestart</a> - If defined, the command which is run on sendmail machines after files are copied.
-  <li><a name="session-start">session-start</a> - If defined, the command which is executed on the Freeside machine when a session begins.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
-  <li><a name="session-stop">session-stop</a> - If defined, the command which is executed on the Freeside machine when a session ends.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
-  <li><a name="shellmachine">shellmachine</a> - A single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines', it also enables `.qmail-extension' file maintenance.
-  <li>shellmachine-useradd - The command(s) to run on shellmachine when an account is created.  If this file does not exist, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If the file exists but is empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.
-  <li>shellmachine-userdel - The command(s) to run on shellmachine when an account is deleted.  If this file does not exist, <code>userdel $username</code> is the default.  If the file exists but is empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.
-  <li>shellmachine-usermod - The command(s) to run on shellmachine when an account is modified.  If this file does not exist or is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.
-  <li><a name="shellmachines">shellmachines</a> - Your Linux and System V flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/shadow' files.
-  <li><a name="shells">shells</a> - Legal shells (think /etc/shells).  You probably want to `cut -d: -f7 /etc/passwd | sort | uniq' initially so that importing doesn't fail with `Illegal shell' errors, then remove any special entries afterwords.  A blank line specifies that an empty shell is permitted.
-  <li><a name="showpasswords">showpasswords</a> - The existance of this file will allow unencrypted user passwords to be displayed.
-  <li><a name="smtpmachine">smtpmachine</a> - SMTP relay for Freeside's outgoing mail.
-  <li><a name="soadefaultttl">soadefaultttl</a> - SOA default TTL for new domains.
-  <li><a name="soaemail">soaemail</a> - SOA email for new domains, in BIND form (`.' instead of `@'), with trailing `.'
-  <li><a name="soaexpire">soaexpire</a> - SOA expire for new domains
-  <li><a name="soamachine">soamachine</a> - SOA machine for new domains, with trailing `.'
-  <li><a name="soarefresh">soarefresh</a> - SOA refresh for new domains
-  <li><a name="soaretry">soaretry</a> - SOA retry for new domains
-  <li><a name="statedefault">statedefault</a> - Default state or province (if not supplied, the default is `CA')
-  <li><a name="textradiusprepend">textradiusprepend</a> - The contents of this file will be prepended to the first line of a user's RADIUS entry in text exports.  If necessary, usually `Auth-Type = Local, '.
-  <li><a name="usernamemin">usernamemin</a> - Minimum username length (default 2);
-  <li><a name="usernamemax">usernamemax</a> - Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)
-  <li><a name="usernamemax">username-letter</a> - The existance of this file will turn on the requirement that usernames contain at least one letter.
-  <li><a name="usernamemax">username-letterfirst</a> - The existance of this file will turn on the requirement that usernames start with a letter.
-  <li><a name="username_policy">username_policy</a> - This file controls the mechanism for preventing duplicate usernames in passwd/radius files exported from svc_accts.  This should be one of 'prepend domsvc' 'append domsvc' or 'append domain'
-  <li><a name="vpopmailmachines">vpopmailmachines</a> - Your vpopmail pop toasters, one per line.  Each line is of the form "machinename vpopdir vpopuid vpopgid".  Eg: poptoaster.domain.tld /home/vpopmail 508 508 Note: vpopuid and vpopgid are values taken from the vpopmail machine's /etc/passwd
-</ul>
-</body>
-
diff --git a/htdocs/docs/export.html b/htdocs/docs/export.html
deleted file mode 100644
index d92eec346..000000000
--- a/htdocs/docs/export.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<head>
-  <title>File exporting</title>
-</head>
-<body>
-  <h1>File exporting</h1>
-  <ul>
-    <li>bin/svc_acct.export will create UNIX <b>passwd</b>, <b>shadow</b> and <b>master.passwd</b> files, ERPCD <b>acp_passwd</b> and <b>acp_dialup</b> files and a RADIUS <b>users</b> file in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Some RADIUS servers (such as <a href="http://www.open.com.au/radiator/">Radiator</a> and <a href="ftp://ftp.cheapnet.net/pub/icradius/">ICRADIUS</a>) will authenticate directly out of an SQL database.  In these cases,
-it is reccommended that you replicate the data to an external RADIUS machine rather than running the RADIUS server on your Freeside machine.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattended:
-      <ul>
-        <li>shellmachines - <b>passwd</b> and <b>shadow</b> are copied to the remote machine as <b>/etc/passwd.new</b> and <b>/etc/shadow.new</b> and then moved to <b>/etc/passwd</b> and <b>/etc/shadow</b> if no errors occur.
-        <li>bsdshellmachines - <b>passwd</b> and <b>master.passwd</b> are copied to the remote machine as <b>/etc/passwd.new</b> and <b>/etc/master.passwd.new</b> and moved to <b>/etc/passwd</b> and <b>/etc/master.passwd</b> if no errors occur.
-        <li>nismachines - <b>passwd</b> and <b>shadow</b> are copied to the <b>/etc/global</b> directory on the remote machine.  If no errors occur, the command <b>( cd /var/yp; make; )</b> is executed on the remote machine.
-        <li>erpcdmachines - <b>acp_passwd</b> and <b>acp_dialup</b> are copied to the <b>/usr/annex</b> directory on the remote machine.  If no errors occur, the command <b>( kill -USR1 `cat /usr/annex/erpcd.pid` )</b> is executed on the remote machine. 
-        <li>radiusmachines - <b>users</b> is copied to the <b>/etc/raddb</b> directory on the remote machine.  If no errors occur, the command <b>( builddbm )</b> is executed on the remote machine.
-        <li>icradiusmachines - Local radcheck and radreply tables will be created.  If any machines are specified, the remote MySQL database will be locked and the radcheck table will be copied to the those machines.  You may also need to set the <a href="config.html#icradius_mysqlsource">icradius_mysqlsource</a> and/or <a href="config.html#icradius_mysqldest">icradius_mysqldest</a> configuration files.  Currently you need to be running MySQL for your Freeside database to use this feature.
-      </ul>
-    <li>site_perl/svc_acct.pm - If a shellmachine is defined, users can be created, modified and deleted remotely; see below.
-      <ul>
-        <li>Account creation - If the <b>username</b>, <b>uid</b> and <b>dir</b> fields are defined for a new user, the command(s) specified in the <a href="config.html#shellmachine-useradd">shellmachine-useradd</a> configuration file are executed on shellmachine via ssh.  If this file does not exist, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If the file exists but is empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.
-        <li>Account deletion - The command(s) specified in the <a href="config.html#shellmachine-userdel">shellmachine-userdel</a> configuration file are executed on shellmachine via ssh.  If this file does not exist, <code>userdel $username</code> is the default.  If the file exists but is empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.
-        <li>Account modification - If a user's home directory changes, the command(s) specified in the <a href="config.html#shellmachine-usermod">shellmachine-usermod</a> configuration file are execute on shellmachine via ssh.  If this file does not exist or is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.
-      </ul>
-    <li>bin/svc_acct_sm.export will create <a href="http://www.qmail.org">Qmail</a> <b>rcpthosts</b>, <b>recipientmap</b> and <b>virtualdomains</b> files and <a href="http://www.sendmail.org">Sendmail</a> <b>virtusertable</b> and <b>sendmail.cw</b> files in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattemded:
-      <ul>
-        <li>qmailmachines - <b>recipientmap</b>, <b>virtualdomains</b> and <b>rcpthosts</b> are copied to the <b>/var/qmail/control</b> directory on the remote machine.  Note: If you <a href="legacy.html#svc_acct_sm">imported</a> qmail configuration files, run the generated <b>/usr/local/etc/freeside/export.<i>datasrc</i>/virtualdomains.FIX</b> on a machine with your user home directories before exporting qmail configuration files.
-        <li>shellmachine - The command <b>[ -e <i>homedir</i>/.qmail-default ] || { touch <i>homedir</i>/.qmail-default; chown <i>uid</i>.<i>gid</i> <i>homedir</i>/.qmail-default; }</b> will be run on this machine for users in the virtualdomains file.
-        <li>sendmailmachines - <b>sendmail.cw</b> and <b>virtusertable</b> are copied to the remote machine as <b>/etc/sendmail.cw.new</b> and <b>/etc/virtusertable.new</b>.  If no errors occur, they are moved to <b>/etc/sendmail.cw</b> and <b>/etc/virtusertable</b> and the command specified in the <a href="config.html#sendmailrestart">sendmailrestart</a> configuration file is executed.  (The path can be changed from the default <b>/etc</b> with the <a href="config.html#sendmailconfigpath">sendmailconfigpath</a> configuration file.)
-      </ul>
-    <li>site_perl/svc_acct_sm.pm - If the qmailmachines configuration file exists and a shellmachine is defined, user <b>.qmail-</b> files can be updated.
-      <ul>
-        <li>The command <b>[ -e <i>homedir</i>/.qmail-<i>domain</i>-default ] || { touch <i>homedir</i>/.qmail-<i>domain</i>-default; chown <i>uid</i>.<i>gid</i> <i>homedir</i>/.qmail-<i>domain</i>-default; }</b> is run.
-      </ul>
-  </ul>
-  <br><a name=ssh>Unattended remote login</a> - Freeside can login to remote machines unattended using SSH.  This can pose a security risk if not configured correctly, and will allow an intruder who breaks into your freeside machine full access to your remote machines.  <b>Do not use this feature unless you understand what you are doing!</b>
-    <ul>
-      <li>As the freeside user (on your freeside machine), generate an authentication key using <a href="http://www.tac.nyc.ny.us/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>.  Since this is for unattended operation, you need to use a blank passphrase.
-      <li>Append the newly-created identity.pub file to root's authorized_keys on the remote machine(s).
-    </ul>
-
-</body>
-
diff --git a/htdocs/docs/index.html b/htdocs/docs/index.html
deleted file mode 100644
index 83e3b3e02..000000000
--- a/htdocs/docs/index.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<head>
-  <title>Documentation</title>
-</head>
-<body bgcolor="#ffffff">
-  <h1>Documentation</h1>
-<img src="overview.png">
-<ul>
-  <li><a href="install.html">New Installation</a>
-  <li><a href="upgrade.html">Upgrading from 1.0.x to 1.1.x</a>
-  <li><a href="upgrade2.html">Upgrading from 1.1.x to 1.1.4</a>
-  <li><a href="upgrade3.html">Upgrading from 1.1.x to 1.2.x</a>
-  <li><a href="upgrade4.html">Upgrading from 1.2.x to 1.2.2</a>
-  <li><a href="upgrade5.html">Upgrading from 1.2.2 to 1.2.3</a>
-  <li><a href="upgrade6.html">Upgrading from 1.2.3 to 1.3.0</a>
-  <li><a href="upgrade7.html">Upgrading from 1.3.0 to 1.3.1</a>
-  <li><a href="config.html">Configuration files</a>
-  <li><a href="admin.html">Administration</a>
-<!--
-  <li><a href="../index.html#admin">Administration</a>
-!-->
-  <li><a href="legacy.html">Importing legacy data</a>
-  <li><a href="export.html">File exporting and remote setup</a>
-  <li><a href="passwd.html">fs_passwd</a>
-  <li><a href="signup.html">Signup server</a>
-  <li><a href="session.html">Session monitor</a>
-  <li><a href="billing.html">Billing</a>
-  <li><a href="trouble.html">Troubleshooting</a>
-  <li><a href="schema.html">Schema reference</a>
-  <li><a href="man/FS.html">Perl API</a>
-</ul>
-</body>
diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
deleted file mode 100644
index 8fadc1088..000000000
--- a/htdocs/docs/install.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<head>
-  <title>Installation</title>
-</head>
-<body>
-<h1>Installation</h1>
-Before installing, you need:
-<ul>
-  <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
-  <li><a href="http://www.openssh.com//">SSH</a>
-  <li><a href="http://www.perl.com/">Perl</a>  Don't enable experimental features like threads or the PerlIO abstraction layer.
-  <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.  <a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.  (see the <a href="postgresql.html">PostgreSQL notes</a>)  <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>.
-  <li>Perl modules (<a href="http://theoryx5.uwinnipeg.ca/CPAN/perl/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
-    <ul>
-      <li><a href="http://search.cpan.org/search?dist=Array-PrintCols">Array-PrintCols</a>
-      <li><a href="http://search.cpan.org/search?dist=Term-Query">Term-Query</a> (make test broken; install manually)
-      <li><a href="http://search.cpan.org/search?dist=MIME-Base64">MIME-Base64</a>
-      <li><a href="http://search.cpan.org/search?dist=Digest-MD5">Digest-MD5</a>
-      <li><a href="http://search.cpan.org/search?dist=URI">URI</a>
-      <li><a href="http://search.cpan.org/search?dist=HTML-Tagset">HTML-Tagset</a>
-      <li><a href="http://search.cpan.org/search?dist=HTML-Parser">HTML-Parser</a>
-      <li><a href="http://search.cpan.org/search?dist=libnet">libnet</a>
-      <li><a href="http://search.cpan.org/search?dist=Locale-Codes">Locale-Codes</a>
-      <li><a href="http://search.cpan.org/search?dist=Net-Whois">Net-Whois</a>
-      <li><a href="http://search.cpan.org/search?dist=libwww-perl">libwww-perl</a>
-      <li><a href="http://search.cpan.org/search?dist=Business-CreditCard">Business-CreditCard</a>
-      <li><a href="http://search.cpan.org/search?dist=Data-ShowTable">Data-ShowTable</a>
-      <li><a href="http://search.cpan.org/search?dist=MailTools">MailTools</a>
-      <li><a href="http://search.cpan.org/search?dist=TimeDate">TimeDate</a>
-      <li><a href="http://search.cpan.org/search?dist=DateManip">DateManip</a>
-      <li><a href="http://search.cpan.org/search?dist=File-CounterFile">File-CounterFile</a>
-      <li><a href="http://search.cpan.org/search?dist=FreezeThaw">FreezeThaw</a>
-      <li><a href="http://search.cpan.org/search?dist=String-Approx">String-Approx</a>
-      <li><a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>
-      <li><a href="http://search.cpan.org/search?dist=DBI">DBI</a>
-      <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a>
-      <li><a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>
-      <li><a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>
-      <li><a href="http://search.cpan.org/search?dist=String-ShellQuote">String-ShellQuote</a>
-      <li><a href="http://search.cpan.org/search?dist=Net-SCP">Net-SCP</a>
-    </ul>
-</ul>
-Install the Freeside distribution:
-<ul>
-  <li>Add the user `freeside' to your system.
-  <li>Allow the freeside user full access to the freeside database.
-    <ul>
-      <li> with <a href="http://www.mysql.com/Manual_chapter/manual_Privilege_system.html#Privilege_system">MySQL</a>:<pre>$ mysqladmin -u root password '<i>set_a_root_database_password</i>'
-$ mysql -u root -p
-mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* TO freeside@localhost IDENTIFIED BY '<i>set_a_freeside_database_password</i>';</pre>
-      <li> with <a href="http://postgresql.readysetnet.com/users-lounge/docs/7.1/postgres/user-manag.html#DATABASE-USERS">PostgreSQL</a>
-    </ul>
-  <li>Add the freeside database to your database engine.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Reference.html#CREATE_DATABASE">MySQL</a>) (with <a href="http://postgresql.readysetnet.com/users-lounge/docs/7.1/postgres/managing-databases.html#MANAGE-AG-CREATEDB">PostgreSQL</a>)
-  <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>
-  <li>Build and install the Perl libraries:
-    <pre>
-$ cd FS/
-$ perl Makefile.PL
-$ make
-$ su
-# make install UNINST=1</pre>
-  <li>Copy or link fs-x.y.z/htdocs to your web server's document space.  <pre>mkdir /usr/local/apache/htdocs/freeside
-cp -r fs-x.y.z/htdocs/* /usr/local/apache/htdocs/freeside</pre> or <pre>ln -s /full/path/to/fs-x.y.z/htdocs /usr/local/apache/htdocs/freeside</pre>
-  <li>Restrict access to this web interface.  (with <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache</a>)
-  <li>Enable CGI execution for files with the `.cgi' extension.  (with <a href="http://www.apache.org/docs/mod/mod_mime.html#addhandler">Apache</a>)
-  <li>Set ownership and permissions for the web interface.  The web interface needs to run as the freeside user - there are several ways to do this.
-    <ul>
-      <li>Use Perl's setuid emulation: see the <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">Security Bugs</a> section of the <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html">perlsec</a> manpage.
-<pre>cd /usr/local/apache/htdocs/freeside
-chown -R freeside .
-chmod 4755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.cgi search/*.cgi view/*.cgi</pre>
-      <li>Use Apache's <a href="http://www.apache.org/docs/suexec.html">suEXEC</a>.
-<pre>cd /usr/local/apache/htdocs/freeside
-chown -R freeside .
-chmod 755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.cgi search/*.cgi view/*.cgi</pre>
-      <li>Use <a href="http://perl.apache.org/">mod_perl</a>.  You should run a separate iteration of Apache[-SSL] as the freeside user.  (Warning:  The redirect method of CGI.pm 2.36 [as distributed with Perl 5.004_04] is broken under mod_perl.  Downlaod the current version from <a href="http://www.perl.com/CPAN/modules/by-module/CGI">CPAN</a>.  Apache 1.3.6 is also highly recommended because of signal handling problems in earlier versions.)
-<pre>cd /usr/local/apache/htdocs/freeside
-chown -R root .
-chmod 755 browse/*.cgi edit/*.cgi edit/process/*.cgi misc/*.cgi misc/process/*.cgi search/*.cgi view/*.cgi</pre>
-    </ul>
-<li>Create the necessary <a href="config.html">configuration files</a>.
-<li>Create the `/usr/local/etc/freeside/counters.<i>datasrc</i>', and 
-  `/usr/local/etc/freeside/export.<i>datasrc</i>' directories for each <i>datasrc</i> (owned by the freeside user).
-  <li>As the freeside user, run bin/fs-setup to create the database tables.
-  <li>Now proceed to the initial <a href="admin.html">administration</a> of your installation.
-</ul>
-</body>
diff --git a/htdocs/docs/legacy.html b/htdocs/docs/legacy.html
deleted file mode 100644
index 3ab21dab2..000000000
--- a/htdocs/docs/legacy.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<head>
-  <title>Importing legacy data</title>
-</head>
-<body>
-  <h1>Importing legacy data</h1>
-<ul>
-  <li><a name="svc_acct">bin/svc_acct.import</a> - Import `passwd', ( `shadow' or `master.passwd' ) and RADIUS `users'.  Before running bin/svc_acct.import, you need <a href="../browse/part_svc.cgi">services</a> (with table svc_acct) as follows:
-    <ul>
-      <li>Most accounts probably have entries in passwd and users (with Port-Limit nonexistant or 1)
-      <li>Some accounts have entries in passwd and users, but with Port-Limit 2 (or more)
-      <li>Some accounts might have entries in users only (Port-Limit 1)
-      <li>Some accounts might have entries in users only (Port-Limit >= 2)
-      <li>POP mail accounts have entries in passwd only, and have a particular shell.
-      <li>Everything else in passwd is a shell account.
-    </ul>
-  <li><a name="svc_acct_sm">bin/svc_acct_sm.import</a> - Import qmail ( `virtualdomains' and `rcpthosts' ), or sendmail ( `virtusertable' and `sendmail.cw' ) files.  Before running bin/svc_acct_sm.import, you need <a href="../browse/part_svc.cgi">services</a> as follows:
-    <ul>
-      <li>Domain (table svc_acct)
-      <li>Mail alias (table svc_acct_sm)
-    </ul>
-  <li><a name="cust_main">Importing customer data</a>
-    <ul>
-      <li>Manually
-        <ul>
-          <li>Add a <a href="../edit/cust_main.cgi">new customer</a>
-          <li>Add one or more packages for this customer
-          <li>Enter a package by clicking on the package number
-          <li>Pick the `Link to existing' option
-        </ul>
-      <li>Batch - You will need to write a script to import your particular legacy data.  You can use eg/TEMPLATE_cust_main.import as a starting point.
-    </ul>
-</ul>
-</body>
-
diff --git a/htdocs/docs/man/FS.html b/htdocs/docs/man/FS.html
deleted file mode 100644
index 3d07462af..000000000
--- a/htdocs/docs/man/FS.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS - Freeside Perl modules</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<UL>
-
-		<LI><A HREF="#utility classes">Utility classes</A></LI>
-		<LI><A HREF="#database record classes">Database record classes</A></LI>
-		<LI><A HREF="#user interface classes (under development; not yet usable)">User Interface classes (under development; not yet usable)</A></LI>
-		<LI><A HREF="#notes">Notes</A></LI>
-	</UL>
-
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#support">SUPPORT</A></LI>
-	<LI><A HREF="#author">AUTHOR</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS - Freeside Perl modules</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<P>FS is the unofficial (i.e. non-CPAN) prefix for the Perl module portion of the
-Freeside ISP billing software.  This includes:</P>
-<P>
-<H2><A NAME="utility classes">Utility classes</A></H2>
-<P><A HREF="././FS/Conf.html">the FS::Conf manpage</A> - Freeside configuration values</P>
-<P><A HREF="././FS/UID.html">the FS::UID manpage</A> - User class (not yet OO)</P>
-<P><A HREF="././FS/CGI.html">the FS::CGI manpage</A> - Non OO-subroutines for the web interface.  This is
-depriciated.  Future development will be focused on the FS::UI user-interface
-classes (see below).</P>
-<P>
-<H2><A NAME="database record classes">Database record classes</A></H2>
-<P><A HREF="././FS/Record.html">the FS::Record manpage</A> - Database record base class</P>
-<P><A HREF="././FS/svc_acct_pop.html">the FS::svc_acct_pop manpage</A> - POP (Point of Presence, not Post
-Office Protocol) class</P>
-<P><A HREF="././FS/part_referral.html">the FS::part_referral manpage</A> - Referral class</P>
-<P><A HREF="././FS/cust_main_county.html">the FS::cust_main_county manpage</A> - Locale (tax rate) class</P>
-<P><A HREF="././FS/svc_Common.html">the FS::svc_Common manpage</A> - Service base class</P>
-<P><A HREF="././FS/svc_acct.html">the FS::svc_acct manpage</A> - Account (shell, RADIUS, POP3) class</P>
-<P><A HREF="././FS/svc_domain.html">the FS::svc_domain manpage</A> - Domain class</P>
-<P><A HREF="././FS/domain_record.html">the FS::domain_record manpage</A> - DNS zone entries</P>
-<P><A HREF="././FS/svc_acct_sm.html">the FS::svc_acct_sm manpage</A> - Vitual mail alias class</P>
-<P><A HREF="././FS/svc_www.html">the FS::svc_www manpage</A> - Web virtual host class.</P>
-<P><A HREF="././FS/part_svc.html">the FS::part_svc manpage</A> - Service definition class</P>
-<P><A HREF="././FS/part_pkg.html">the FS::part_pkg manpage</A> - Package (billing item) definition class</P>
-<P><A HREF="././FS/pkg_svc.html">the FS::pkg_svc manpage</A> - Class linking package (billing item)
-definitions (see <A HREF="././FS/part_pkg.html">the FS::part_pkg manpage</A>) with service definitions
-(see <A HREF="././FS/part_svc.html">the FS::part_svc manpage</A>)</P>
-<P><A HREF="././FS/agent.html">the FS::agent manpage</A> - Agent (reseller) class</P>
-<P><A HREF="././FS/agent_type.html">the FS::agent_type manpage</A> - Agent type class</P>
-<P><A HREF="././FS/type_pkgs.html">the FS::type_pkgs manpage</A> - Class linking agent types (see
-<A HREF="././FS/agent_type.html">the FS::agent_type manpage</A>) with package (billing item) definitions
-(see <A HREF="././FS/part_pkg.html">the FS::part_pkg manpage</A>)</P>
-<P><A HREF="././FS/cust_svc.html">the FS::cust_svc manpage</A> - Service class</P>
-<P><A HREF="././FS/cust_pkg.html">the FS::cust_pkg manpage</A> - Package (billing item) class</P>
-<P><A HREF="././FS/cust_main.html">the FS::cust_main manpage</A> - Customer class</P>
-<P><A HREF="././FS/cust_main_invoice.html">the FS::cust_main_invoice manpage</A> - Invoice destination
-class</P>
-<P><A HREF="././FS/cust_bill.html">the FS::cust_bill manpage</A> - Invoice class</P>
-<P><A HREF="././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A> - Invoice line item class</P>
-<P><A HREF="././FS/cust_pay.html">the FS::cust_pay manpage</A> - Payment class</P>
-<P><A HREF="././FS/cust_credit.html">the FS::cust_credit manpage</A> - Credit class</P>
-<P><A HREF="././FS/cust_refund.html">the FS::cust_refund manpage</A> - Refund class</P>
-<P><A HREF="././FS/cust_pay_batch.html">the FS::cust_pay_batch manpage</A> - Credit card transaction queue class</P>
-<P><A HREF="././FS/prepay_credit.html">the FS::prepay_credit manpage</A> - Prepaid ``calling card'' credit class.</P>
-<P><A HREF="././FS/nas.html">the FS::nas manpage</A> - Network Access Server class</P>
-<P><A HREF="././FS/port.html">the FS::port manpage</A> - NAS port class</P>
-<P><A HREF="././FS/session.html">the FS::session manpage</A> - User login session class</P>
-<P>
-<H2><A NAME="user interface classes (under development; not yet usable)">User Interface classes (under development; not yet usable)</A></H2>
-<P><A HREF="././FS/UI/Base.html">the FS::UI::Base manpage</A> - User-interface base class</P>
-<P><A HREF="././FS/UI/Gtk.html">the FS::UI::Gtk manpage</A> - Gtk user-interface class</P>
-<P><A HREF="././FS/UI/CGI.html">the FS::UI::CGI manpage</A> - CGI (HTML) user-interface class</P>
-<P><A HREF="././FS/UI/agent.html">the FS::UI::agent manpage</A> - agent table user-interface class</P>
-<P>
-<H2><A NAME="notes">Notes</A></H2>
-<P>To quote perl(1), ``If you're intending to read these straight through for the
-first time, the suggested order will tend to reduce the number of forward
-references.''</P>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>Freeside is a billing and administration package for Internet Service
-Providers.</P>
-<P>The Freeside home page is at &lt;http://www.sisd.com/freeside&gt;.</P>
-<P>The main documentation is in htdocs/docs.</P>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: FS.html,v 1.3 2001-04-23 12:40:30 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="support">SUPPORT</A></H1>
-<P>A mailing list for users and developers is available.  Send a blank message to
-&lt;<A HREF="mailto:ivan-freeside-subscribe@sisd.com">ivan-freeside-subscribe@sisd.com</A>&gt; to subscribe.</P>
-<P>Commercial support is available; see
-&lt;http://www.sisd.com/freeside/commercial.html&gt;.</P>
-<P>
-<HR>
-<H1><A NAME="author">AUTHOR</A></H1>
-<P>Primarily Ivan Kohler &lt;<A HREF="mailto:ivan@sisd.com">ivan@sisd.com</A>&gt;, with help from many kind folks.</P>
-<P>See the CREDITS file in the Freeside distribution for a (hopefully) complete
-list and the individal files for details.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P>perl(1), main Freeside documentation in htdocs/docs/</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The version number of the FS Perl extension differs from the version of the
-Freeside distribution, which are both different from the CVS version tag for
-each file, which appears under the VERSION heading.</P>
-<P>Those modules which would be useful separately should be pulled out, 
-renamed appropriately and uploaded to CPAN.  So far: DBIx::DBSchema, Net::SSH
-and Net::SCP...</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/Bill.html b/htdocs/docs/man/FS/Bill.html
deleted file mode 100644
index cf996ae80..000000000
--- a/htdocs/docs/man/FS/Bill.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::Bill - Legacy stub</TITLE>
-<LINK REV="made" HREF="mailto:none">
-</HEAD>
-
-<BODY>
-
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::Bill - Legacy stub
-
-<P>
-<HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-The functionality of FS::Bill has been integrated into FS::cust_main.
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/CGI.html b/htdocs/docs/man/FS/CGI.html
deleted file mode 100644
index 05f7823b4..000000000
--- a/htdocs/docs/man/FS/CGI.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::CGI - Subroutines for the web interface</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::CGI - Subroutines for the web interface</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::CGI qw(header menubar idiot eidiot popurl);</PRE>
-<PRE>
-  print header( 'Title', '' );
-  print header( 'Title', menubar('item', 'URL', ... ) );</PRE>
-<PRE>
-  idiot &quot;error message&quot;; 
-  eidiot &quot;error message&quot;;</PRE>
-<PRE>
-  $url = popurl; #returns current url
-  $url = popurl(3); #three levels up</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>Provides a few common subroutines for the web interface.</P>
-<P>
-<HR>
-<H1><A NAME="subroutines">SUBROUTINES</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_header">header TITLE, MENUBAR</A></STRONG><BR>
-<DD>
-Returns an HTML header.
-<P></P>
-<DT><STRONG><A NAME="item_menubar_ITEM%2C_URL%2C_%2E%2E%2E">menubar ITEM, URL, ...</A></STRONG><BR>
-<DD>
-Returns an HTML menubar.
-<P></P>
-<DT><STRONG><A NAME="item_idiot">idiot ERROR</A></STRONG><BR>
-<DD>
-This is depriciated.  Don't use it.
-<P>Sends headers and an HTML error message.</P>
-<P></P>
-<DT><STRONG><A NAME="item_eidiot">eidiot ERROR</A></STRONG><BR>
-<DD>
-This is depriciated.  Don't use it.
-<P>Sends headers and an HTML error message, then exits.</P>
-<P></P>
-<DT><STRONG><A NAME="item_popurl">popurl LEVEL</A></STRONG><BR>
-<DD>
-Returns current URL with LEVEL levels of path removed from the end (default 0).
-<P></P>
-<DT><STRONG><A NAME="item_table">table</A></STRONG><BR>
-<DD>
-Returns HTML tag for beginning a table.
-<P></P>
-<DT><STRONG><A NAME="item_itable">itable</A></STRONG><BR>
-<DD>
-Returns HTML tag for beginning an (invisible) table.
-<P></P>
-<DT><STRONG><A NAME="item_ntable">ntable</A></STRONG><BR>
-<DD>
-This is getting silly.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>Not OO.</P>
-<P>Not complete.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/CGI.html">the CGI manpage</A>, <A HREF="../CGI/Base.html">the CGI::Base manpage</A></P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/CGIwrapper.html b/htdocs/docs/man/FS/CGIwrapper.html
deleted file mode 100644
index bab5e7f37..000000000
--- a/htdocs/docs/man/FS/CGIwrapper.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>./FS/FS/CGIwrapper.pm</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-<!-- INDEX END -->
-
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/Conf.html b/htdocs/docs/man/FS/Conf.html
deleted file mode 100644
index 7b1613efd..000000000
--- a/htdocs/docs/man/FS/Conf.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::Conf - Read access to Freeside configuration values</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::Conf - Read access to Freeside configuration values</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::Conf;</PRE>
-<PRE>
-  $conf = new FS::Conf &quot;/config/directory&quot;;</PRE>
-<PRE>
-  $FS::Conf::default_dir = &quot;/config/directory&quot;;
-  $conf = new FS::Conf;</PRE>
-<PRE>
-  $dir = $conf-&gt;dir;</PRE>
-<PRE>
-  $value = $conf-&gt;config('key');
-  @list  = $conf-&gt;config('key');
-  $bool  = $conf-&gt;exists('key');</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>Read access to Freeside configuration values.  Keys currently map to filenames,
-but this may change in the future.</P>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new_%5B_DIRECTORY_%5D">new [ DIRECTORY ]</A></STRONG><BR>
-<DD>
-Create a new configuration object.  A directory arguement is required if
-$FS::Conf::default_dir has not been set.
-<P></P>
-<DT><STRONG><A NAME="item_dir">dir</A></STRONG><BR>
-<DD>
-Returns the directory.
-<P></P>
-<DT><STRONG><A NAME="item_config">config</A></STRONG><BR>
-<DD>
-Returns the configuration value or values (depending on context) for key.
-<P></P>
-<DT><STRONG><A NAME="item_exists">exists</A></STRONG><BR>
-<DD>
-Returns true if the specified key exists, even if the corresponding value
-is undefined.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>Write access (with locking) should be implemented.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P>config.html from the base documentation contains a list of configuration files.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/Invoice.html b/htdocs/docs/man/FS/Invoice.html
deleted file mode 100644
index cc837be2e..000000000
--- a/htdocs/docs/man/FS/Invoice.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::Invoice - Legacy stub</TITLE>
-<LINK REV="made" HREF="mailto:none">
-</HEAD>
-
-<BODY>
-
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::Invoice - Legacy stub
-
-<P>
-<HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-The functionality of FS::Invoice has been integrated in FS::cust_bill.
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/Record.html b/htdocs/docs/man/FS/Record.html
deleted file mode 100644
index cc3d37795..000000000
--- a/htdocs/docs/man/FS/Record.html
+++ /dev/null
@@ -1,342 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::Record - Database record objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#constructors">CONSTRUCTORS</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::Record - Database record objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-    use FS::Record;
-    use FS::Record qw(dbh fields qsearch qsearchs dbdef);</PRE>
-<PRE>
-    $record = new FS::Record 'table', \%hash;
-    $record = new FS::Record 'table', { 'column' =&gt; 'value', ... };</PRE>
-<PRE>
-    $record  = qsearchs FS::Record 'table', \%hash;
-    $record  = qsearchs FS::Record 'table', { 'column' =&gt; 'value', ... };
-    @records = qsearch  FS::Record 'table', \%hash; 
-    @records = qsearch  FS::Record 'table', { 'column' =&gt; 'value', ... };</PRE>
-<PRE>
-    $table = $record-&gt;table;
-    $dbdef_table = $record-&gt;dbdef_table;</PRE>
-<PRE>
-    $value = $record-&gt;get('column');
-    $value = $record-&gt;getfield('column');
-    $value = $record-&gt;column;</PRE>
-<PRE>
-    $record-&gt;set( 'column' =&gt; 'value' );
-    $record-&gt;setfield( 'column' =&gt; 'value' );
-    $record-&gt;column('value');</PRE>
-<PRE>
-    %hash = $record-&gt;hash;</PRE>
-<PRE>
-    $hashref = $record-&gt;hashref;</PRE>
-<PRE>
-    $error = $record-&gt;insert;
-    #$error = $record-&gt;add; #depriciated</PRE>
-<PRE>
-    $error = $record-&gt;delete;
-    #$error = $record-&gt;del; #depriciated</PRE>
-<PRE>
-    $error = $new_record-&gt;replace($old_record);
-    #$error = $new_record-&gt;rep($old_record); #depriciated</PRE>
-<PRE>
-    $value = $record-&gt;unique('column');</PRE>
-<PRE>
-    $value = $record-&gt;ut_float('column');
-    $value = $record-&gt;ut_number('column');
-    $value = $record-&gt;ut_numbern('column');
-    $value = $record-&gt;ut_money('column');
-    $value = $record-&gt;ut_text('column');
-    $value = $record-&gt;ut_textn('column');
-    $value = $record-&gt;ut_alpha('column');
-    $value = $record-&gt;ut_alphan('column');
-    $value = $record-&gt;ut_phonen('column');
-    $value = $record-&gt;ut_anythingn('column');</PRE>
-<PRE>
-    $dbdef = reload_dbdef;
-    $dbdef = reload_dbdef &quot;/non/standard/filename&quot;;
-    $dbdef = dbdef;</PRE>
-<PRE>
-    $quoted_value = _quote($value,'table','field');</PRE>
-<PRE>
-    #depriciated
-    $fields = hfields('table');
-    if ( $fields-&gt;{Field} ) { # etc.</PRE>
-<PRE>
-    @fields = fields 'table'; #as a subroutine
-    @fields = $record-&gt;fields; #as a method call</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>(Mostly) object-oriented interface to database records.  Records are currently
-implemented on top of DBI.  FS::Record is intended as a base class for
-table-specific classes to inherit from, i.e. FS::cust_main.</P>
-<P>
-<HR>
-<H1><A NAME="constructors">CONSTRUCTORS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new_%5B_TABLE%2C_%5D_HASHREF">new [ TABLE, ] HASHREF</A></STRONG><BR>
-<DD>
-Creates a new record.  It doesn't store it in the database, though.  See
-<A HREF="#insert">insert</A> for that.
-<P>Note that the object stores this hash reference, not a distinct copy of the
-hash it points to.  You can ask the object for a copy with the <EM>hash</EM> 
-method.</P>
-<P>TABLE can only be omitted when a dervived class overrides the table method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_qsearch_TABLE%2C_HASHREF%2C_SELECT%2C_EXTRA_SQL">qsearch TABLE, HASHREF, SELECT, EXTRA_SQL</A></STRONG><BR>
-<DD>
-Searches the database for all records matching (at least) the key/value pairs
-in HASHREF.  Returns all the records found as `FS::TABLE' objects if that
-module is loaded (i.e. via `use FS::cust_main;'), otherwise returns FS::Record
-objects.
-<P>###oops, argh, FS::Record::new only lets us create database fields.
-#Normal behaviour if SELECT is not specified is `*', as in
-#<CODE>SELECT * FROM table WHERE ...</CODE>.  However, there is an experimental new
-#feature where you can specify SELECT - remember, the objects returned,
-#although blessed into the appropriate `FS::TABLE' package, will only have the
-#fields you specify.  This might have unwanted results if you then go calling
-#regular FS::TABLE methods
-#on it.</P>
-<P></P>
-<DT><STRONG><A NAME="item_qsearchs">qsearchs TABLE, HASHREF</A></STRONG><BR>
-<DD>
-Same as qsearch, except that if more than one record matches, it <STRONG>carp</STRONG>s but
-returns the first.  If this happens, you either made a logic error in asking
-for a single item, or your data is corrupted.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_table">table</A></STRONG><BR>
-<DD>
-Returns the table name.
-<P></P>
-<DT><STRONG><A NAME="item_dbdef_table">dbdef_table</A></STRONG><BR>
-<DD>
-Returns the FS::dbdef_table object for the table.
-<P></P>
-<DT><STRONG><A NAME="item_get%2C_getfield_COLUMN">get, getfield COLUMN</A></STRONG><BR>
-<DD>
-Returns the value of the column/field/key COLUMN.
-<P></P>
-<DT><STRONG><A NAME="item_set%2C_setfield_COLUMN%2C_VALUE">set, setfield COLUMN, VALUE</A></STRONG><BR>
-<DD>
-Sets the value of the column/field/key COLUMN to VALUE.  Returns VALUE.
-<P></P>
-<DT><STRONG><A NAME="item_AUTLOADED_METHODS">AUTLOADED METHODS</A></STRONG><BR>
-<DD>
-$record-&gt;column is a synonym for $record-&gt;get('column');
-<P>$record-&gt;<CODE>column('value')</CODE> is a synonym for $record-&gt;set('column','value');</P>
-<P></P>
-<DT><STRONG><A NAME="item_hash">hash</A></STRONG><BR>
-<DD>
-Returns a list of the column/value pairs, usually for assigning to a new hash.
-<P>To make a distinct duplicate of an FS::Record object, you can do:</P>
-<PRE>
-    $new = new FS::Record ( $old-&gt;table, { $old-&gt;hash } );</PRE>
-<P></P>
-<DT><STRONG><A NAME="item_hashref">hashref</A></STRONG><BR>
-<DD>
-Returns a reference to the column/value hash.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Inserts this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_add">add</A></STRONG><BR>
-<DD>
-Depriciated (use insert instead).
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Delete this record from the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_del">del</A></STRONG><BR>
-<DD>
-Depriciated (use delete instead).
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replace the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_rep">rep</A></STRONG><BR>
-<DD>
-Depriciated (use replace instead).
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Not yet implemented, croaks.  Derived classes should provide a check method.
-<P></P>
-<DT><STRONG><A NAME="item_unique">unique COLUMN</A></STRONG><BR>
-<DD>
-Replaces COLUMN in record with a unique number.  Called by the <STRONG>add</STRONG> method
-on primary keys and single-field unique columns (see <A HREF="../DBIx/DBSchema/Table.html">the DBIx::DBSchema::Table manpage</A>).
-Returns the new value.
-<P></P>
-<DT><STRONG><A NAME="item_ut_float_COLUMN">ut_float COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint floating point numeric data: 1.1, 1, 1.1e10, 1e10.  May not be
-null.  If there is an error, returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_ut_number_COLUMN">ut_number COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint simple numeric data (whole numbers).  May not be null.  If there
-is an error, returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_ut_numbern_COLUMN">ut_numbern COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint simple numeric data (whole numbers).  May be null.  If there is
-an error, returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_ut_money_COLUMN">ut_money COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint monetary numbers.  May be negative.  Set to 0 if null.  If there
-is an error, returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_ut_text_COLUMN">ut_text COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint text.  Alphanumerics, spaces, and the following punctuation
-symbols are currently permitted: ! @ # $ % &amp; ( ) - + ; : ' `` , . ? /
-May not be null.  If there is an error, returns the error, otherwise returns
-false.
-<P></P>
-<DT><STRONG><A NAME="item_ut_textn_COLUMN">ut_textn COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint text.  Alphanumerics, spaces, and the following punctuation
-symbols are currently permitted: ! @ # $ % &amp; ( ) - + ; : ' `` , . ? /
-May be null.  If there is an error, returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_ut_alpha_COLUMN">ut_alpha COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint alphanumeric strings (no spaces).  May not be null.  If there is
-an error, returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG>ut_alpha COLUMN</STRONG><BR>
-<DD>
-Check/untaint alphanumeric strings (no spaces).  May be null.  If there is an
-error, returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_ut_phonen_COLUMN_%5B_COUNTRY_%5D">ut_phonen COLUMN [ COUNTRY ]</A></STRONG><BR>
-<DD>
-Check/untaint phone numbers.  May be null.  If there is an error, returns
-the error, otherwise returns false.
-<P>Takes an optional two-letter ISO country code; without it or with unsupported
-countries, ut_phonen simply calls ut_alphan.</P>
-<P></P>
-<DT><STRONG><A NAME="item_ut_ip_COLUMN">ut_ip COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint ip addresses.  IPv4 only for now.
-<P></P>
-<DT><STRONG><A NAME="item_ut_ipn_COLUMN">ut_ipn COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint ip addresses.  IPv4 only for now.  May be null.
-<P></P>
-<DT><STRONG><A NAME="item_ut_domain_COLUMN">ut_domain COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint host and domain names.
-<P></P>
-<DT><STRONG><A NAME="item_ut_anything_COLUMN">ut_anything COLUMN</A></STRONG><BR>
-<DD>
-Untaints arbitrary data.  Be careful.
-<P></P>
-<DT><STRONG><A NAME="item_fields_%5B_TABLE_%5D">fields [ TABLE ]</A></STRONG><BR>
-<DD>
-This can be used as both a subroutine and a method call.  It returns a list
-of the columns in this record's table, or an explicitly specified table.
-(See <A HREF="../DBIx/DBSchema/Table.html">the DBIx::DBSchema::Table manpage</A>).
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="subroutines">SUBROUTINES</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_reload_dbdef"><CODE>reload_dbdef([FILENAME])</CODE></A></STRONG><BR>
-<DD>
-Load a database definition (see <A HREF="../DBIx/DBSchema.html">the DBIx::DBSchema manpage</A>), optionally from a
-non-default filename.  This command is executed at startup unless
-<EM>$FS::Record::setup_hack</EM> is true.  Returns a DBIx::DBSchema object.
-<P></P>
-<DT><STRONG><A NAME="item_dbdef">dbdef</A></STRONG><BR>
-<DD>
-Returns the current database definition.  See <A HREF="../FS/dbdef.html">the FS::dbdef manpage</A>.
-<P></P>
-<DT><STRONG><A NAME="item__quote_VALUE%2C_TABLE%2C_COLUMN">_quote VALUE, TABLE, COLUMN</A></STRONG><BR>
-<DD>
-This is an internal function used to construct SQL statements.  It returns
-VALUE DBI-quoted (see <EM>DBI/``quote''</EM>) unless VALUE is a number and the column
-type (see <A HREF="../FS/dbdef_column.html">the FS::dbdef_column manpage</A>) does not end in `char' or `binary'.
-<P></P>
-<DT><STRONG><A NAME="item_hfields">hfields TABLE</A></STRONG><BR>
-<DD>
-This is depriciated.  Don't use it.
-<P>It returns a hash-type list with the fields of this record's table set true.</P>
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: Record.html,v 1.3 2001-04-23 12:40:30 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>This module should probably be renamed, since much of the functionality is
-of general use.  It is not completely unlike Adapter::DBI (see below).</P>
-<P>Exported qsearch and qsearchs should be depriciated in favor of method calls
-(against an FS::Record object like the old search and searchs that qsearch
-and qsearchs were on top of.)</P>
-<P>The whole fields / hfields mess should be removed.</P>
-<P>The various WHERE clauses should be subroutined.</P>
-<P>table string should be depriciated in favor of FS::dbdef_table.</P>
-<P>No doubt we could benefit from a Tied hash.  Documenting how exists / defined
-true maps to the database (and WHERE clauses) would also help.</P>
-<P>The ut_ methods should ask the dbdef for a default length.</P>
-<P>ut_sqltype (like ut_varchar) should all be defined</P>
-<P>A fallback check method should be provided which uses the dbdef.</P>
-<P>The ut_money method assumes money has two decimal digits.</P>
-<P>The Pg money kludge in the new method only strips `$'.</P>
-<P>The ut_phonen method assumes US-style phone numbers.</P>
-<P>The _quote function should probably use ut_float instead of a regex.</P>
-<P>All the subroutines probably should be methods, here or elsewhere.</P>
-<P>Probably should borrow/use some dbdef methods where appropriate (like sub
-fields)</P>
-<P>As of 1.14, DBI fetchall_hashref( {} ) doesn't set fetchrow_hashref NAME_lc,
-or allow it to be set.  Working around it is ugly any way around - DBI should
-be fixed.  (only affects RDBMS which return uppercase column names)</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF="../DBIx/DBSchema.html">the DBIx::DBSchema manpage</A>, <A HREF=".././FS/UID.html">the FS::UID manpage</A>, <EM>DBI</EM></P>
-<P>Adapter::DBI from Ch. 11 of Advanced Perl Programming by Sriram Srinivasan.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/SSH.html b/htdocs/docs/man/FS/SSH.html
deleted file mode 100644
index 4368b8c11..000000000
--- a/htdocs/docs/man/FS/SSH.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::SSH - Subroutines to call ssh and scp</TITLE>
-<LINK REV="made" HREF="mailto:none">
-</HEAD>
-
-<BODY>
-
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#SUBROUTINES">SUBROUTINES</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::SSH - Subroutines to call ssh and scp
-
-<P>
-<HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::SSH qw(ssh scp issh iscp sshopen2 sshopen3);
-</PRE>
-<P>
-<PRE>  ssh($host, $command);
-</PRE>
-<P>
-<PRE>  issh($host, $command);
-</PRE>
-<P>
-<PRE>  scp($source, $destination);
-</PRE>
-<P>
-<PRE>  iscp($source, $destination);
-</PRE>
-<P>
-<PRE>  sshopen2($host, $reader, $writer, $command);
-</PRE>
-<P>
-<PRE>  sshopen3($host, $reader, $writer, $error, $command);
-</PRE>
-<P>
-<HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-<PRE>  Simple wrappers around ssh and scp commands.
-</PRE>
-<P>
-<HR>
-<H1><A NAME="SUBROUTINES">SUBROUTINES</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_ssh">ssh HOST, COMMAND</A></STRONG><DD>
-<P>
-Calls ssh in batch mode.
-
-<DT><STRONG><A NAME="item_issh">issh HOST, COMMAND</A></STRONG><DD>
-<P>
-Prints the ssh command to be executed, waits for the user to confirm, and
-(optionally) executes the command.
-
-<DT><STRONG><A NAME="item_scp">scp SOURCE, DESTINATION</A></STRONG><DD>
-<P>
-Calls scp in batch mode.
-
-<DT><STRONG><A NAME="item_iscp">iscp SOURCE, DESTINATION</A></STRONG><DD>
-<P>
-Prints the scp command to be executed, waits for the user to confirm, and
-(optionally) executes the command.
-
-<DT><STRONG><A NAME="item_sshopen2">sshopen2 HOST, READER, WRITER, COMMAND</A></STRONG><DD>
-<P>
-Connects the supplied filehandles to the ssh process (in batch mode).
-
-<DT><STRONG><A NAME="item_sshopen3">sshopen3 HOST, WRITER, READER, ERROR, COMMAND</A></STRONG><DD>
-<P>
-Connects the supplied filehandles to the ssh process (in batch mode).
-
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-Not OO.
-
-<P>
-scp stuff should transparantly use rsync-over-ssh instead.
-
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<EM>ssh</EM>, <EM>scp</EM>, <A HREF="../IPC/Open2.html">IPC::Open2</A>, <A HREF="../IPC/Open3.html">IPC::Open3</A>
-
-
-
-</DL>
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/SessionClient.html b/htdocs/docs/man/FS/SessionClient.html
deleted file mode 100644
index 5f180eee4..000000000
--- a/htdocs/docs/man/FS/SessionClient.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::SessionClient - Freeside session client API</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::SessionClient - Freeside session client API</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::SessionClient qw( login portnum logout );</PRE>
-<PRE>
-  $error = login ( {
-    'username' =&gt; $username,
-    'password' =&gt; $password,
-    'login'    =&gt; $timestamp,
-    'portnum'  =&gt; $portnum,
-  } );</PRE>
-<PRE>
-  $portnum = portnum( { 'ip' =&gt; $ip } ) or die &quot;unknown ip!&quot;
-  $portnum = portnum( { 'nasnum' =&gt; $nasnum, 'nasport' =&gt; $nasport } )
-    or die &quot;unknown nasnum/nasport&quot;;</PRE>
-<PRE>
-  $error = logout ( {
-    'username' =&gt; $username,
-    'password' =&gt; $password,
-    'logout'   =&gt; $timestamp,
-    'portnum'  =&gt; $portnum,
-  } );</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>This modules provides an API for a remote session application.</P>
-<P>It needs to be run as the freeside user.  Because of this, the program which
-calls these subroutines should be written very carefully.</P>
-<P>
-<HR>
-<H1><A NAME="subroutines">SUBROUTINES</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_login">login HASHREF</A></STRONG><BR>
-<DD>
-HASHREF should have the following keys: username, password, login and portnum.
-login is a UNIX timestamp; if not specified, will default to the current time.
-Starts a new session for the specified user and portnum.  The password is
-optional, but must be correct if specified.
-<P>Returns a scalar error message, or the empty string for success.</P>
-<P></P>
-<DT><STRONG><A NAME="item_portnum">portnum</A></STRONG><BR>
-<DD>
-HASHREF should contain a single key: ip, or the two keys: nasnum and nasport.
-Returns a portnum suitable for the login and logout subroutines, or false
-on error.
-<P></P>
-<DT><STRONG><A NAME="item_logout">logout HASHREF</A></STRONG><BR>
-<DD>
-HASHREF should have the following keys: usrename, password, logout and portnum.
-logout is a UNIX timestamp; if not specified, will default to the current time.
-Starts a new session for the specified user and portnum.  The password is
-optional, but must be correct if specified.
-<P>Returns a scalar error message, or the empty string for success.</P>
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: SessionClient.html,v 1.1 2001-04-25 01:06:09 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><EM>fs_sessiond</EM></P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/SignupClient.html b/htdocs/docs/man/FS/SignupClient.html
deleted file mode 100644
index 0c621edcb..000000000
--- a/htdocs/docs/man/FS/SignupClient.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::SignupClient - Freeside signup client API</TITLE>
-<LINK REV="made" HREF="mailto:none">
-</HEAD>
-
-<BODY>
-
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#SUBROUTINES">SUBROUTINES</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::SignupClient - Freeside signup client API
-
-<P>
-<HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::SignupClient qw( signup_info new_customer );
-</PRE>
-<P>
-<PRE>  ( $locales, $packages, $pops ) = signup_info;
-</PRE>
-<P>
-<PRE>  $error = new_customer ( {
-    'first'          =&gt; $first,
-    'last'           =&gt; $last,
-    'ss'             =&gt; $ss,
-    'comapny'        =&gt; $company,
-    'address1'       =&gt; $address1,
-    'address2'       =&gt; $address2,
-    'city'           =&gt; $city,
-    'county'         =&gt; $county,
-    'state'          =&gt; $state,
-    'zip'            =&gt; $zip,
-    'country'        =&gt; $country,
-    'daytime'        =&gt; $daytime,
-    'night'          =&gt; $night,
-    'fax'            =&gt; $fax,
-    'payby'          =&gt; $payby,
-    'payinfo'        =&gt; $payinfo,
-    'paydate'        =&gt; $paydate,
-    'payname'        =&gt; $payname,
-    'invoicing_list' =&gt; $invoicing_list,
-    'pkgpart'        =&gt; $pkgpart,
-    'username'       =&gt; $username,
-    '_password'       =&gt; $password,
-    'popnum'         =&gt; $popnum,
-  } );
-</PRE>
-<P>
-<HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-This module provides an API for a remote signup server.
-
-<P>
-It needs to be run as the freeside user. Because of this, the program which
-calls these subroutines should be written very carefully.
-
-<P>
-<HR>
-<H1><A NAME="SUBROUTINES">SUBROUTINES</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_signup_info">signup_info</A></STRONG><DD>
-<P>
-Returns three array references of hash references.
-
-<P>
-The first set of hash references is of allowable locales. Each hash
-reference has the following keys: taxnum state county country
-
-<P>
-The second set of hash references is of allowable packages. Each hash
-reference has the following keys: pkgpart pkg
-
-<P>
-The third set of hash references is of allowable POPs (Points Of Presence).
-Each hash reference has the following keys: popnum city state ac exch
-
-<DT><STRONG><A NAME="item_new_customer">new_customer HASHREF</A></STRONG><DD>
-<P>
-Adds a customer to the remote Freeside system. Requires a hash reference as
-a paramater with the following keys: first last ss comapny address1
-address2 city county state zip country daytime night fax payby payinfo
-paydate payname invoicing_list pkgpart username _password popnum
-
-<P>
-Returns a scalar error message, or the empty string for success.
-
-</DL>
-<P>
-<HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: SignupClient.html,v 1.1 2001-04-23 12:41:57 ivan Exp $
-
-<P>
-<HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<EM>fs_signupd</EM>, <A HREF="./htdocs/docs/man/FS/SignupServer.html">FS::SignupServer</A>, <A HREF="./htdocs/docs/man/FS/cust_main.html">FS::cust_main</A>
-
-
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/UI/Base.html b/htdocs/docs/man/FS/UI/Base.html
deleted file mode 100644
index 96c60847d..000000000
--- a/htdocs/docs/man/FS/UI/Base.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::UI::Base - Base class for all user-interface objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-	<LI><A HREF="#history">HISTORY</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::UI::Base - Base class for all user-interface objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::UI::SomeInterface;
-  use FS::UI::some_table;</PRE>
-<PRE>
-  $interface = new FS::UI::some_table;</PRE>
-<PRE>
-  $error = $interface-&gt;browse;
-  $error = $interface-&gt;search;
-  $error = $interface-&gt;view;
-  $error = $interface-&gt;edit;
-  $error = $interface-&gt;process;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::UI::Base object represents a user interface object.  FS::UI::Base
-is intended as a base class for table-specfic classes to inherit from, i.e.
-FS::UI::cust_main.  The simplest case, which will provide a default UI for your
-new table, is as follows:</P>
-<PRE>
-  package FS::UI::table_name;
-  use vars qw ( @ISA );
-  use FS::UI::Base;
-  @ISA = qw( FS::UI::Base );
-  sub db_table { 'table_name'; }</PRE>
-<P>Currently available interfaces are:
-  FS::UI::Gtk, an X-Windows UI implemented using the Gtk+ toolkit
-  FS::UI::CGI, a web interface implemented using CGI.pm, etc.</P>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_browse">browse</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_title">title</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_addwidget">addwidget</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: Base.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>This documentation is incomplete.</P>
-<P>There should be some sort of per-(freeside)-user preferences and the ability
-for specific FS::UI:: modules to put their own values there as well.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF="../.././FS/UI/Gtk.html">the FS::UI::Gtk manpage</A>, <A HREF="../.././FS/UI/CGI.html">the FS::UI::CGI manpage</A></P>
-<P>
-<HR>
-<H1><A NAME="history">HISTORY</A></H1>
-<P>$Log: Base.html,v $
-<P>Revision 1.3  2001-04-23 12:40:31  ivan
-<P>documentation and webdemo updates
-<P>
-Revision 1.1  1999/08/04 09:03:53  ivan
-initial checkin of module files for proper perl installation</P>
-<P>Revision 1.1  1999/01/20 09:30:36  ivan
-skeletal cross-UI UI code.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/UI/CGI.html b/htdocs/docs/man/FS/UI/CGI.html
deleted file mode 100644
index 49991f1aa..000000000
--- a/htdocs/docs/man/FS/UI/CGI.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::UI::CGI - Base class for CGI user-interface objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-	<LI><A HREF="#history">HISTORY</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::UI::CGI - Base class for CGI user-interface objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::UI::CGI;
-  use FS::UI::some_table;</PRE>
-<PRE>
-  $interface = new FS::UI::some_table;</PRE>
-<PRE>
-  $error = $interface-&gt;browse;
-  $error = $interface-&gt;search;
-  $error = $interface-&gt;view;
-  $error = $interface-&gt;edit;
-  $error = $interface-&gt;process;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::UI::CGI object represents a CGI interface object.</P>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item__header">_header</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item__footer">_footer</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_interface">interface</A></STRONG><BR>
-<DD>
-Returns the string `CGI'.  Useful for the author of a table-specific UI class
-to conditionally specify certain behaviour.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: CGI.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>This documentation is incomplete.</P>
-<P>In _Tableborder, headers should be links that sort on their fields.</P>
-<P>_Link uses a constant $BASE_URL</P>
-<P>_Link passes the arguments as a manually-constructed GET string instead
-of POSTing, for compatability while the web interface is upgraded.  Once
-this is done it should pass arguements properly (i.e. as a POST, 8-bit clean)</P>
-<P>Still some small bits of widget code same as FS::UI::Gtk.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF="../.././FS/UI/Base.html">the FS::UI::Base manpage</A></P>
-<P>
-<HR>
-<H1><A NAME="history">HISTORY</A></H1>
-<P>$Log: CGI.html,v $
-<P>Revision 1.3  2001-04-23 12:40:31  ivan
-<P>documentation and webdemo updates
-<P>
-Revision 1.1  1999/08/04 09:03:53  ivan
-initial checkin of module files for proper perl installation</P>
-<P>Revision 1.1  1999/01/20 09:30:36  ivan
-skeletal cross-UI UI code.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/UI/Gtk.html b/htdocs/docs/man/FS/UI/Gtk.html
deleted file mode 100644
index 24d620087..000000000
--- a/htdocs/docs/man/FS/UI/Gtk.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::UI::Gtk - Base class for Gtk user-interface objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-	<LI><A HREF="#history">HISTORY</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::UI::Gtk - Base class for Gtk user-interface objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::UI::Gtk;
-  use FS::UI::some_table;</PRE>
-<PRE>
-  $interface = new FS::UI::some_table;</PRE>
-<PRE>
-  $error = $interface-&gt;browse;
-  $error = $interface-&gt;search;
-  $error = $interface-&gt;view;
-  $error = $interface-&gt;edit;
-  $error = $interface-&gt;process;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::UI::Gtk object represents a Gtk user interface object.</P>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_interface">interface</A></STRONG><BR>
-<DD>
-Returns the string `Gtk'.  Useful for the author of a table-specific UI class
-to conditionally specify certain behaviour.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: Gtk.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>This documentation is incomplete.</P>
-<P>_Tableborder is just a _Table now.  _Tableborders should scroll (but not the
-headers) and need and need more decoration. (data in white section ala gtksql
-and sliding field widths) headers should be buttons that callback to sort on
-their fields.</P>
-<P>There should be a persistant, per-(freeside)-user store for window positions
-and sizes and sort fields etc (see <A HREF="../.././FS/UI/CGI.html#bugs">BUGS in the FS::UI::CGI manpage</A>.</P>
-<P>Still some small bits of widget code same as FS::UI::CGI.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF="../.././FS/UI/Base.html">the FS::UI::Base manpage</A></P>
-<P>
-<HR>
-<H1><A NAME="history">HISTORY</A></H1>
-<P>$Log: Gtk.html,v $
-<P>Revision 1.3  2001-04-23 12:40:31  ivan
-<P>documentation and webdemo updates
-<P>
-Revision 1.1  1999/08/04 09:03:53  ivan
-initial checkin of module files for proper perl installation</P>
-<P>Revision 1.1  1999/01/20 09:30:36  ivan
-skeletal cross-UI UI code.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/UI/agent.html b/htdocs/docs/man/FS/UI/agent.html
deleted file mode 100644
index 8608e4ef4..000000000
--- a/htdocs/docs/man/FS/UI/agent.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>./FS/FS/UI/agent.pm</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-<!-- INDEX END -->
-
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/UID.html b/htdocs/docs/man/FS/UID.html
deleted file mode 100644
index 9c4da492b..000000000
--- a/htdocs/docs/man/FS/UID.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::UID - Subroutines for database login and assorted other stuff</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
-	<LI><A HREF="#callbacks">CALLBACKS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::UID - Subroutines for database login and assorted other stuff</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::UID qw(adminsuidsetup cgisuidsetup dbh datasrc getotaker
-  checkeuid checkruid swapuid);</PRE>
-<PRE>
-  adminsuidsetup $user;</PRE>
-<PRE>
-  $cgi = new CGI;
-  $dbh = cgisuidsetup($cgi);</PRE>
-<PRE>
-  $dbh = dbh;</PRE>
-<PRE>
-  $datasrc = datasrc;</PRE>
-<PRE>
-  $driver_name = driver_name;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>Provides a hodgepodge of subroutines.</P>
-<P>
-<HR>
-<H1><A NAME="subroutines">SUBROUTINES</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_adminsuidsetup">adminsuidsetup USER</A></STRONG><BR>
-<DD>
-Sets the user to USER (see config.html from the base documentation).
-Cleans the environment.
-Make sure the script is running as freeside, or setuid freeside.
-Opens a connection to the database.
-Swaps real and effective UIDs.
-Runs any defined callbacks (see below).
-Returns the DBI database handle (usually you don't need this).
-<P></P>
-<DT><STRONG><A NAME="item_cgisuidsetup_CGI_object">cgisuidsetup CGI_object</A></STRONG><BR>
-<DD>
-Takes a single argument, which is a CGI (see <A HREF=".././FS/CGI.html">the CGI manpage</A>) or Apache (see <EM>Apache</EM>)
-object (CGI::Base is depriciated).  Runs cgisetotaker and then adminsuidsetup.
-<P></P>
-<DT><STRONG><A NAME="item_cgi">cgi</A></STRONG><BR>
-<DD>
-Returns the CGI (see <A HREF=".././FS/CGI.html">the CGI manpage</A>) object.
-<P></P>
-<DT><STRONG><A NAME="item_dbh">dbh</A></STRONG><BR>
-<DD>
-Returns the DBI database handle.
-<P></P>
-<DT><STRONG><A NAME="item_datasrc">datasrc</A></STRONG><BR>
-<DD>
-Returns the DBI data source.
-<P></P>
-<DT><STRONG><A NAME="item_driver_name">driver_name</A></STRONG><BR>
-<DD>
-Returns just the driver name portion of the DBI data source.
-<P></P>
-<DT><STRONG><A NAME="item_getotaker">getotaker</A></STRONG><BR>
-<DD>
-Returns the current Freeside user.
-<P></P>
-<DT><STRONG><A NAME="item_cgisetotaker">cgisetotaker</A></STRONG><BR>
-<DD>
-Sets and returns the CGI REMOTE_USER.  $cgi should be defined as a CGI.pm
-object (see <A HREF=".././FS/CGI.html">the CGI manpage</A>) or an Apache object (see <EM>Apache</EM>).  Support for CGI::Base
-and derived classes is depriciated.
-<P></P>
-<DT><STRONG><A NAME="item_checkeuid">checkeuid</A></STRONG><BR>
-<DD>
-Returns true if effective UID is that of the freeside user.
-<P></P>
-<DT><STRONG><A NAME="item_checkruid">checkruid</A></STRONG><BR>
-<DD>
-Returns true if the real UID is that of the freeside user.
-<P></P>
-<DT><STRONG><A NAME="item_swapuid">swapuid</A></STRONG><BR>
-<DD>
-Swaps real and effective UIDs.
-<P></P>
-<DT><STRONG><A NAME="item_getsecrets_%5B_USER_%5D">getsecrets [ USER ]</A></STRONG><BR>
-<DD>
-Sets the user to USER, if supplied.
-Sets and returns the DBI datasource, username and password for this user from
-the `/usr/local/etc/freeside/mapsecrets' file.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="callbacks">CALLBACKS</A></H1>
-<P>Warning: this interface is likely to change in future releases.</P>
-<P>A package can install a callback to be run in adminsuidsetup by putting a
-coderef into the hash %FS::UID::callback :</P>
-<PRE>
-    $coderef = sub { warn &quot;Hi, I'm returning your call!&quot; };
-    $FS::UID::callback{'Package::Name'};</PRE>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: UID.html,v 1.3 2001-04-23 12:40:30 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>Too many package-global variables.</P>
-<P>Not OO.</P>
-<P>No capabilities yet.  When mod_perl and Authen::DBI are implemented, 
-cgisuidsetup will go away as well.</P>
-<P>Goes through contortions to support non-OO syntax with multiple datasrc's.</P>
-<P>Callbacks are inelegant.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/CGI.html">the CGI manpage</A>, <EM>DBI</EM>, config.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/agent.html b/htdocs/docs/man/FS/agent.html
deleted file mode 100644
index 39d89a770..000000000
--- a/htdocs/docs/man/FS/agent.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::agent - Object methods for agent records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::agent - Object methods for agent records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::agent;</PRE>
-<PRE>
-  $record = new FS::agent \%hash;
-  $record = new FS::agent { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $agent_type = $record-&gt;agent_type;</PRE>
-<PRE>
-  $hashref = $record-&gt;pkgpart_hashref;
-  #may purchase $pkgpart if $hashref-&gt;{$pkgpart};</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::agent object represents an agent.  Every customer has an agent.  Agents
-can be used to track things like resellers or salespeople.  FS::agent inherits
-from FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">agemtnum - primary key (assigned automatically for new agents)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_agent_%2D_Text_name_of_this_agent">agent - Text name of this agent</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_typenum_%2D_Agent_type%2E_See_FS%3A%3Aagent_type">typenum - Agent type.  See <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A></A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_prog_%2D_For_future_use%2E">prog - For future use.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_freq_%2D_For_future_use%2E">freq - For future use.</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new agent.  To add the agent to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this agent to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this agent from the database.  Only agents with no customers can be
-deleted.  If there is an error, returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid agent.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-<P></P>
-<DT><STRONG><A NAME="item_agent_type">agent_type</A></STRONG><BR>
-<DD>
-Returns the FS::agent_type object (see <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A>) for this agent.
-<P></P>
-<DT><STRONG><A NAME="item_pkgpart_hashref">pkgpart_hashref</A></STRONG><BR>
-<DD>
-Returns a hash reference.  The keys of the hash are pkgparts.  The value is
-true if this agent may purchase the specified package definition.  See
-<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: agent.html,v 1.3 2001-04-23 12:40:30 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, 
-schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/agent_type.html b/htdocs/docs/man/FS/agent_type.html
deleted file mode 100644
index b34940752..000000000
--- a/htdocs/docs/man/FS/agent_type.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::agent_type - Object methods for agent_type records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::agent_type - Object methods for agent_type records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::agent_type;</PRE>
-<PRE>
-  $record = new FS::agent_type \%hash;
-  $record = new FS::agent_type { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $hashref = $record-&gt;pkgpart_hashref;
-  #may purchase $pkgpart if $hashref-&gt;{$pkgpart};</PRE>
-<PRE>
-  @type_pkgs = $record-&gt;type_pkgs;</PRE>
-<PRE>
-  @pkgparts = $record-&gt;pkgpart;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::agent_type object represents an agent type.  Every agent (see
-<A HREF=".././FS/agent.html">the FS::agent manpage</A>) has an agent type.  Agent types define which packages (see
-<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>) may be purchased by customers (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>), via 
-FS::type_pkgs records (see <A HREF=".././FS/type_pkgs.html">the FS::type_pkgs manpage</A>).  FS::agent_type inherits from
-FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">typenum - primary key (assigned automatically for new agent types)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_atype_%2D_Text_name_of_this_agent_type">atype - Text name of this agent type</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new agent type.  To add the agent type to the database, see
-<A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this agent type to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this agent type from the database.  Only agent types with no agents
-can be deleted.  If there is an error, returns the error, otherwise returns
-false.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid agent type.  If there is an
-error, returns the error, otherwise returns false.  Called by the insert and
-replace methods.
-<P></P>
-<DT><STRONG><A NAME="item_pkgpart_hashref">pkgpart_hashref</A></STRONG><BR>
-<DD>
-Returns a hash reference.  The keys of the hash are pkgparts.  The value is
-true iff this agent may purchase the specified package definition.  See
-<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>.
-<P></P>
-<DT><STRONG><A NAME="item_type_pkgs">type_pkgs</A></STRONG><BR>
-<DD>
-Returns all FS::type_pkgs objects (see <A HREF=".././FS/type_pkgs.html">the FS::type_pkgs manpage</A>) for this agent type.
-<P></P>
-<DT><STRONG><A NAME="item_pkgpart">pkgpart</A></STRONG><BR>
-<DD>
-Returns the pkgpart of all package definitions (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>) for this
-agent type.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: agent_type.html,v 1.3 2001-04-23 12:40:30 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/agent.html">the FS::agent manpage</A>, <A HREF=".././FS/type_pkgs.html">the FS::type_pkgs manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>,
-<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/cust_bill.html b/htdocs/docs/man/FS/cust_bill.html
deleted file mode 100644
index a59542c76..000000000
--- a/htdocs/docs/man/FS/cust_bill.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_bill - Object methods for cust_bill records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_bill - Object methods for cust_bill records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_bill;</PRE>
-<PRE>
-  $record = new FS::cust_bill \%hash;
-  $record = new FS::cust_bill { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  ( $total_previous_balance, @previous_cust_bill ) = $record-&gt;previous;</PRE>
-<PRE>
-  @cust_bill_pkg_objects = $cust_bill-&gt;cust_bill_pkg;</PRE>
-<PRE>
-  ( $total_previous_credits, @previous_cust_credit ) = $record-&gt;cust_credit;</PRE>
-<PRE>
-  @cust_pay_objects = $cust_bill-&gt;cust_pay;</PRE>
-<PRE>
-  @lines = $cust_bill-&gt;print_text;
-  @lines = $cust_bill-&gt;print_text $time;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_bill object represents an invoice; a declaration that a customer
-owes you money.  The specific charges are itemized as <STRONG>cust_bill_pkg</STRONG> records
-(see <A HREF=".././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A>).  FS::cust_bill inherits from FS::Record.  The
-following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">invnum - primary key (assigned automatically for new invoices)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_customer">custnum - customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item__date_%2D_specified_as_a_UNIX_timestamp%3B_see_per">_date - specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
-<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_charged_%2D_amount_of_this_invoice">charged - amount of this invoice</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_automatically">printed - how many times this invoice has been printed automatically
-(see <A HREF=".././FS/cust_main.html#collect">collect in the FS::cust_main manpage</A>).</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new invoice.  To add the invoice to the database, see <A HREF="#insert">insert</A>.
-Invoices are normally created by calling the bill method of a customer object
-(see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this invoice to the database (``Posts'' the invoice).  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Currently unimplemented.  I don't remove invoices because there would then be
-no record you ever posted this invoice (which is bad, no?)
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P>Only printed may be changed.  printed is normally updated by calling the
-collect method of a customer object (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid invoice.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-<P></P>
-<DT><STRONG><A NAME="item_previous">previous</A></STRONG><BR>
-<DD>
-Returns a list consisting of the total previous balance for this customer, 
-followed by the previous outstanding invoices (as FS::cust_bill objects also).
-<P></P>
-<DT><STRONG><A NAME="item_cust_bill_pkg">cust_bill_pkg</A></STRONG><BR>
-<DD>
-Returns the line items (see <A HREF=".././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A>) for this invoice.
-<P></P>
-<DT><STRONG><A NAME="item_cust_credit">cust_credit</A></STRONG><BR>
-<DD>
-Returns a list consisting of the total previous credited (see
-<A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>) for this customer, followed by the previous outstanding
-credits (FS::cust_credit objects).
-<P></P>
-<DT><STRONG><A NAME="item_cust_pay">cust_pay</A></STRONG><BR>
-<DD>
-Returns all payments (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>) for this invoice.
-<P></P>
-<DT><STRONG><A NAME="item_owed">owed</A></STRONG><BR>
-<DD>
-Returns the amount owed (still outstanding) on this invoice, which is charged
-minus all payments (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_print_text_%5BTIME%5D%3B">print_text [TIME];</A></STRONG><BR>
-<DD>
-Returns an text invoice, as a list of lines.
-<P>TIME an optional value used to control the printing of overdue messages.  The
-default is now.  It isn't the date of the invoice; that's the `_date' field.
-It is specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
-<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</P>
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_bill.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The delete method.</P>
-<P>print_text formatting (and some logic :/) is in source, but needs to be
-slurped in from a file.  Also number of lines ($=).</P>
-<P>missing print_ps for a nice postscript copy (maybe HylaFAX-cover-page-style
-or something similar so the look can be completely customized?)</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>, <A HREF=".././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A>,
-<A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/cust_bill_pkg.html b/htdocs/docs/man/FS/cust_bill_pkg.html
deleted file mode 100644
index 2cdd8952e..000000000
--- a/htdocs/docs/man/FS/cust_bill_pkg.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_bill_pkg - Object methods for cust_bill_pkg records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_bill_pkg - Object methods for cust_bill_pkg records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_bill_pkg;</PRE>
-<PRE>
-  $record = new FS::cust_bill_pkg \%hash;
-  $record = new FS::cust_bill_pkg { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_bill_pkg object represents an invoice line item.
-FS::cust_bill_pkg inherits from FS::Record.  The following fields are currently
-supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_invoice">invnum - invoice (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_package">pkgnum - package (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) or 0 for the special virtual sales tax package</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_setup_%2D_setup_fee">setup - setup fee</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_recur_%2D_recurring_fee">recur - recurring fee</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_sdate_%2D_starting_date_of_recurring_fee">sdate - starting date of recurring fee</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_edate_%2D_ending_date_of_recurring_fee">edate - ending date of recurring fee</A></STRONG><BR>
-<DD>
-</DL>
-<P>sdate and edate are specified as UNIX timestamps; see <EM>perlfunc/``time''</EM>.  Also
-see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</P>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new line item.  To add the line item to the database, see
-<A HREF="#insert">insert</A>.  Line items are normally created by calling the bill method of a
-customer object (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this line item to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Currently unimplemented.  I don't remove line items because there would then be
-no record the items ever existed (which is bad, no?)
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Currently unimplemented.  This would be even more of an accounting nightmare
-than deleteing the items.  Just don't do it.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid line item.  If there is an
-error, returns the error, otherwise returns false.  Called by the insert
-method.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_bill_pkg.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, schema.html
-from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/cust_credit.html b/htdocs/docs/man/FS/cust_credit.html
deleted file mode 100644
index f08424561..000000000
--- a/htdocs/docs/man/FS/cust_credit.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_credit - Object methods for cust_credit records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_credit - Object methods for cust_credit records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_credit;</PRE>
-<PRE>
-  $record = new FS::cust_credit \%hash;
-  $record = new FS::cust_credit { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_credit object represents a credit; the equivalent of a negative
-<STRONG>cust_bill</STRONG> record (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>).  FS::cust_credit inherits from
-FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">crednum - primary key (assigned automatically for new credits)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_customer">custnum - customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_amount_%2D_amount_of_the_credit">amount - amount of the credit</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item__date_%2D_specified_as_a_UNIX_timestamp%3B_see_per">_date - specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
-<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_reason_%2D_text">reason - text</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new credit.  To add the credit to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this credit to the database (``Posts'' the credit).  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Currently unimplemented.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Credits may not be modified; there would then be no record the credit was ever
-posted.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid credit.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-<P></P>
-<DT><STRONG><A NAME="item_cust_refund">cust_refund</A></STRONG><BR>
-<DD>
-Returns all refunds (see <A HREF=".././FS/cust_refund.html">the FS::cust_refund manpage</A>) for this credit.
-<P></P>
-<DT><STRONG><A NAME="item_credited">credited</A></STRONG><BR>
-<DD>
-Returns the amount of this credit that is still outstanding; which is
-amount minus all refunds (see <A HREF=".././FS/cust_refund.html">the FS::cust_refund manpage</A>).
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_credit.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The delete method.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_refund.html">the FS::cust_refund manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, schema.html from the base
-documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/cust_main.html b/htdocs/docs/man/FS/cust_main.html
deleted file mode 100644
index c5df1da12..000000000
--- a/htdocs/docs/man/FS/cust_main.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_main - Object methods for cust_main records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_main - Object methods for cust_main records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_main;</PRE>
-<PRE>
-  $record = new FS::cust_main \%hash;
-  $record = new FS::cust_main { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  @cust_pkg = $record-&gt;all_pkgs;</PRE>
-<PRE>
-  @cust_pkg = $record-&gt;ncancelled_pkgs;</PRE>
-<PRE>
-  $error = $record-&gt;bill;
-  $error = $record-&gt;bill %options;
-  $error = $record-&gt;bill 'time' =&gt; $time;</PRE>
-<PRE>
-  $error = $record-&gt;collect;
-  $error = $record-&gt;collect %options;
-  $error = $record-&gt;collect 'invoice_time'   =&gt; $time,
-                            'batch_card'     =&gt; 'yes',
-                            'report_badcard' =&gt; 'yes',
-                          ;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_main object represents a customer.  FS::cust_main inherits from 
-FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">custnum - primary key (assigned automatically for new customers)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_agent">agentnum - agent (see <A HREF=".././FS/agent.html">the FS::agent manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_referral">refnum - referral (see <A HREF=".././FS/part_referral.html">the FS::part_referral manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_first_%2D_name">first - name</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_last_%2D_name">last - name</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_number">ss - social security number (optional)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_company_%2D_%28optional%29">company - (optional)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_address1">address1</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_address2_%2D_%28optional%29">address2 - (optional)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_city">city</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_county_%2D_%28optional%2C_see_FS%3A%3Acust_main_co">county - (optional, see <A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_state_%2D_%28see_FS%3A%3Acust_main_county%29">state - (see <A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_zip">zip</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_country_%2D_%28see_FS%3A%3Acust_main_county%29">country - (see <A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_phone">daytime - phone (optional)</A></STRONG><BR>
-<DD>
-<DT><STRONG>night - phone (optional)</STRONG><BR>
-<DD>
-<DT><STRONG>fax - phone (optional)</STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_payby_%2D_%60CARD%27_%28credit_cards%29%2C_%60BILL">payby - `CARD' (credit cards), `BILL' (billing), `COMP' (free), or `PREPAY' (special billing type: applies a credit - see <A HREF=".././FS/prepay_credit.html">the FS::prepay_credit manpage</A> and sets billing type to BILL)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_issuer">payinfo - card number, P.O., comp issuer (4-8 lowercase alphanumerics; think username) or prepayment identifier (see <A HREF=".././FS/prepay_credit.html">the FS::prepay_credit manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_paydate_%2D_expiration_date%2C_mm%2Fyyyy%2C_m%2Fyy">paydate - expiration date, mm/yyyy, m/yyyy, mm/yy or m/yy</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_payname_%2D_name_on_card_or_billing_name">payname - name on card or billing name</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_tax_%2D_tax_exempt%2C_empty_or_%60Y%27">tax - tax exempt, empty or `Y'</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new customer.  To add the customer to the database, see <A HREF="#insert">insert</A>.
-<P>Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this customer to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P>There is a special insert mode in which you pass a data structure to the insert
-method containing FS::cust_pkg and FS::svc_<EM>tablename</EM> objects.  When
-running under a transactional database, all records are inserted atomicly, or
-the transaction is rolled back.  There should be a better explanation of this,
-but until then, here's an example:</P>
-<PRE>
-  use Tie::RefHash;
-  tie %hash, 'Tie::RefHash'; #this part is important
-  %hash = {
-    $cust_pkg =&gt; [ $svc_acct ],
-  };
-  $cust_main-&gt;insert( \%hash );</PRE>
-<P></P>
-<DT><STRONG><A NAME="item_delete_NEW_CUSTNUM">delete NEW_CUSTNUM</A></STRONG><BR>
-<DD>
-This deletes the customer.  If there is an error, returns the error, otherwise
-returns false.
-<P>This will completely remove all traces of the customer record.  This is not
-what you want when a customer cancels service; for that, cancel all of the
-customer's packages (see <A HREF=".././FS/cust_pkg.html#cancel">cancel in the FS::cust_pkg manpage</A>).</P>
-<P>If the customer has any packages, you need to pass a new (valid) customer
-number for those packages to be transferred to.</P>
-<P>You can't delete a customer with invoices (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>),
-or credits (see <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid customer record.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and repalce methods.
-<P></P>
-<DT><STRONG><A NAME="item_all_pkgs">all_pkgs</A></STRONG><BR>
-<DD>
-Returns all packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this customer.
-<P></P>
-<DT><STRONG><A NAME="item_ncancelled_pkgs">ncancelled_pkgs</A></STRONG><BR>
-<DD>
-Returns all non-cancelled packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this customer.
-<P></P>
-<DT><STRONG><A NAME="item_bill">bill OPTIONS</A></STRONG><BR>
-<DD>
-Generates invoices (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>) for this customer.  Usually used in
-conjunction with the collect method.
-<P>The only currently available option is `time', which bills the customer as if
-it were that time.  It is specified as a UNIX timestamp; see
-<EM>perlfunc/``time''</EM>).  Also see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion
-functions.</P>
-<P>If there is an error, returns the error, otherwise returns false.</P>
-<P></P>
-<DT><STRONG><A NAME="item_collect">collect OPTIONS</A></STRONG><BR>
-<DD>
-(Attempt to) collect money for this customer's outstanding invoices (see
-<A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>).  Usually used after the bill method.
-<P>Depending on the value of `payby', this may print an invoice (`BILL'), charge
-a credit card (`CARD'), or just add any necessary (pseudo-)payment (`COMP').</P>
-<P>If there is an error, returns the error, otherwise returns false.</P>
-<P>Currently available options are:</P>
-<P>invoice_time - Use this time when deciding when to print invoices and
-late notices on those invoices.  The default is now.  It is specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>).  Also see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A>
-for conversion functions.</P>
-<P>batch_card - Set this true to batch cards (see <A HREF=".././FS/cust_pay_batch.html">the cust_pay_batch manpage</A>).  By
-default, cards are processed immediately, which will generate an error if
-CyberCash is not installed.</P>
-<P>report_badcard - Set this true if you want bad card transactions to
-return an error.  By default, they don't.</P>
-<P></P>
-<DT><STRONG><A NAME="item_total_owed">total_owed</A></STRONG><BR>
-<DD>
-Returns the total owed for this customer on all invoices
-(see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_total_credited">total_credited</A></STRONG><BR>
-<DD>
-Returns the total credits (see <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>) for this customer.
-<P></P>
-<DT><STRONG><A NAME="item_balance">balance</A></STRONG><BR>
-<DD>
-Returns the balance for this customer (total owed minus total credited).
-<P></P>
-<DT><STRONG><A NAME="item_invoicing_list_%5B_ARRAYREF_%5D">invoicing_list [ ARRAYREF ]</A></STRONG><BR>
-<DD>
-If an arguement is given, sets these email addresses as invoice recipients
-(see <A HREF=".././FS/cust_main_invoice.html">the FS::cust_main_invoice manpage</A>).  Errors are not fatal and are not reported
-(except as warnings), so use check_invoicing_list first.
-<P>Returns a list of email addresses (with svcnum entries expanded).</P>
-<P>Note: You can clear the invoicing list by passing an empty ARRAYREF.  You can
-check it without disturbing anything by passing nothing.</P>
-<P>This interface may change in the future.</P>
-<P></P>
-<DT><STRONG><A NAME="item_check_invoicing_list_ARRAYREF">check_invoicing_list ARRAYREF</A></STRONG><BR>
-<DD>
-Checks these arguements as valid input for the invoicing_list method.  If there
-is an error, returns the error, otherwise returns false.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_main.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The delete method.</P>
-<P>The delete method should possibly take an FS::cust_main object reference
-instead of a scalar customer number.</P>
-<P>Bill and collect options should probably be passed as references instead of a
-list.</P>
-<P>CyberCash v2 forces us to define some variables in package main.</P>
-<P>There should probably be a configuration file with a list of allowed credit
-card types.</P>
-<P>CyberCash is the only processor.</P>
-<P>No multiple currency support (probably a larger project than just this module).</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>
-<A HREF=".././FS/cust_pay_batch.html">the FS::cust_pay_batch manpage</A>, <A HREF=".././FS/agent.html">the FS::agent manpage</A>, <A HREF=".././FS/part_referral.html">the FS::part_referral manpage</A>,
-<A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>, <A HREF=".././FS/cust_main_invoice.html">the FS::cust_main_invoice manpage</A>,
-<A HREF=".././FS/UID.html">the FS::UID manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/cust_main_county.html b/htdocs/docs/man/FS/cust_main_county.html
deleted file mode 100644
index 575eaedca..000000000
--- a/htdocs/docs/man/FS/cust_main_county.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_main_county - Object methods for cust_main_county objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_main_county - Object methods for cust_main_county objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_main_county;</PRE>
-<PRE>
-  $record = new FS::cust_main_county \%hash;
-  $record = new FS::cust_main_county { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_main_county object represents a tax rate, defined by locale.
-FS::cust_main_county inherits from FS::Record.  The following fields are
-currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">taxnum - primary key (assigned automatically for new tax rates)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_state">state</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_county">county</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_country">country</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_tax_%2D_percentage">tax - percentage</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new tax rate.  To add the tax rate to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this tax rate to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this tax rate from the database.  If there is an error, returns the
-error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid tax rate.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_main_county.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, schema.html from the base
-documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/cust_main_invoice.html b/htdocs/docs/man/FS/cust_main_invoice.html
deleted file mode 100644
index 7a3719711..000000000
--- a/htdocs/docs/man/FS/cust_main_invoice.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_main_invoice - Object methods for cust_main_invoice records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_main_invoice - Object methods for cust_main_invoice records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_main_invoice;</PRE>
-<PRE>
-  $record = new FS::cust_main_invoice \%hash;
-  $record = new FS::cust_main_invoice { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $email_address = $record-&gt;address;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_main_invoice object represents an invoice destination.  FS::cust_main_invoice inherits from
-FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_destnum_%2D_primary_key">destnum - primary key</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_customer">custnum - customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_svcnum">dest - Invoice destination: If numeric, a svcnum (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>), if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new invoice destination.  To add the invoice destination to the database, see <A HREF="#insert">insert</A>.
-<P>Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Delete this record from the database.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid invoice destination.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and repalce methods.
-<P></P>
-<DT><STRONG><A NAME="item_checkdest">checkdest</A></STRONG><BR>
-<DD>
-Checks the dest field only.
-<P></P>
-<DT><STRONG><A NAME="item_address">address</A></STRONG><BR>
-<DD>
-Returns the literal email address for this record (or `POST').
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_main_invoice.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A></P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/cust_pay.html b/htdocs/docs/man/FS/cust_pay.html
deleted file mode 100644
index dc7b54c8d..000000000
--- a/htdocs/docs/man/FS/cust_pay.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_pay - Object methods for cust_pay objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_pay - Object methods for cust_pay objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_pay;</PRE>
-<PRE>
-  $record = new FS::cust_pay \%hash;
-  $record = new FS::cust_pay { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_pay object represents a payment; the transfer of money from a
-customer.  FS::cust_pay inherits from FS::Record.  The following fields are
-currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">paynum - primary key (assigned automatically for new payments)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_Invoice">invnum - Invoice (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_paid_%2D_Amount_of_this_payment">paid - Amount of this payment</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item__date_%2D_specified_as_a_UNIX_timestamp%3B_see_per">_date - specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
-<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_payby_%2D_%60CARD%27_%28credit_cards%29%2C_%60BILL">payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_issuer">payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_paybatch_%2D_text_field_for_tracking_card_processi">paybatch - text field for tracking card processing</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new payment.  To add the payment to the databse, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this payment to the databse, and updates the invoice (see
-<A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Currently unimplemented (accounting reasons).
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Currently unimplemented (accounting reasons).
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid payment.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert method.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_pay.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>Delete and replace methods.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/cust_pay_batch.html b/htdocs/docs/man/FS/cust_pay_batch.html
deleted file mode 100644
index b7637bc6d..000000000
--- a/htdocs/docs/man/FS/cust_pay_batch.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_pay_batch - Object methods for batch cards</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_pay_batch - Object methods for batch cards</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_pay_batch;</PRE>
-<PRE>
-  $record = new FS::cust_pay_batch \%hash;
-  $record = new FS::cust_pay_batch { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_pay_batch object represents a credit card transaction ready to be
-batched (sent to a processor).  FS::cust_pay_batch inherits from FS::Record.  
-Typically called by the collect method of an FS::cust_main object.  The
-following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_trancode_%2D_77_for_charges">trancode - 77 for charges</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_cardnum">cardnum</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_exp_%2D_card_expiration">exp - card expiration</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_amount">amount</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_invnum_%2D_invoice">invnum - invoice</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_custnum_%2D_customer">custnum - customer</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_payname_%2D_name_on_card">payname - name on card</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_first_%2D_name">first - name</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_last_%2D_name">last - name</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_address1">address1</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_address2">address2</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_city">city</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_state">state</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_zip">zip</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_country">country</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new record.  To add the record to the database, see <A HREF="#insert">insert</A>.
-<P>Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Delete this record from the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-#inactive
-#
-#Replaces the OLD_RECORD with this one in the database.  If there is an error,
-#returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid transaction.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and repalce methods.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_pay_batch.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>There should probably be a configuration file with a list of allowed credit
-card types.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A></P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/cust_pkg.html b/htdocs/docs/man/FS/cust_pkg.html
deleted file mode 100644
index 19c8ff842..000000000
--- a/htdocs/docs/man/FS/cust_pkg.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_pkg - Object methods for cust_pkg objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_pkg - Object methods for cust_pkg objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_pkg;</PRE>
-<PRE>
-  $record = new FS::cust_pkg \%hash;
-  $record = new FS::cust_pkg { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $error = $record-&gt;cancel;</PRE>
-<PRE>
-  $error = $record-&gt;suspend;</PRE>
-<PRE>
-  $error = $record-&gt;unsuspend;</PRE>
-<PRE>
-  $part_pkg = $record-&gt;part_pkg;</PRE>
-<PRE>
-  @labels = $record-&gt;labels;</PRE>
-<PRE>
-  $error = FS::cust_pkg::order( $custnum, \@pkgparts );
-  $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_pkg object represents a customer billing item.  FS::cust_pkg
-inherits from FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">pkgnum - primary key (assigned automatically for new billing items)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_Customer">custnum - Customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_definition">pkgpart - Billing item definition (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_setup_%2D_date">setup - date</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_bill_%2D_date">bill - date</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_susp_%2D_date">susp - date</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_expire_%2D_date">expire - date</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_cancel_%2D_date">cancel - date</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically if null, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
-<DD>
-</DL>
-<P>Note: setup, bill, susp, expire and cancel are specified as UNIX timestamps;
-see <EM>perlfunc/``time''</EM>.  Also see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for
-conversion functions.</P>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Create a new billing item.  To add the item to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this billing item to the database (``Orders'' the item).  If there is an
-error, returns the error, otherwise returns false.
-<P>sub insert {
-  my $self = shift;</P>
-<PRE>
-  # custnum might not have have been defined in sub check (for one-shot new
-  # customers), so check it here instead</PRE>
-<PRE>
-  my $error = $self-&gt;ut_number('custnum');
-  return $error if $error</PRE>
-<PRE>
-  return &quot;Unknown customer&quot;
-    unless qsearchs( 'cust_main', { 'custnum' =&gt; $self-&gt;custnum } );</PRE>
-<PRE>
-  $self-&gt;SUPER::insert;</PRE>
-<P>}</P>
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Currently unimplemented.  You don't want to delete billing items, because there
-would then be no record the customer ever purchased the item.  Instead, see
-the cancel method.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P>Currently, custnum, setup, bill, susp, expire, and cancel may be changed.</P>
-<P>Changing pkgpart may have disasterous effects.  See the order subroutine.</P>
-<P>setup and bill are normally updated by calling the bill method of a customer
-object (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>).</P>
-<P>suspend is normally updated by the suspend and unsuspend methods.</P>
-<P>cancel is normally updated by the cancel method (and also the order subroutine
-in some cases).</P>
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid billing item.  If there is an
-error, returns the error, otherwise returns false.  Called by the insert and
-replace methods.
-<P></P>
-<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
-<DD>
-Cancels and removes all services (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A> and <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>)
-in this package, then cancels the package itself (sets the cancel field to
-now).
-<P>If there is an error, returns the error, otherwise returns false.</P>
-<P></P>
-<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
-<DD>
-Suspends all services (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A> and <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>) in this
-package, then suspends the package itself (sets the susp field to now).
-<P>If there is an error, returns the error, otherwise returns false.</P>
-<P></P>
-<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
-<DD>
-Unsuspends all services (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A> and <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>) in this
-package, then unsuspends the package itself (clears the susp field).
-<P>If there is an error, returns the error, otherwise returns false.</P>
-<P></P>
-<DT><STRONG><A NAME="item_part_pkg">part_pkg</A></STRONG><BR>
-<DD>
-Returns the definition for this billing item, as an FS::part_pkg object (see
-<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_labels">labels</A></STRONG><BR>
-<DD>
-Returns a list of lists, calling the label method for all services
-(see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) of this billing item.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="subroutines">SUBROUTINES</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_order_CUSTNUM%2C_PKGPARTS_ARYREF%2C_%5B_REMOVE_PKG">order CUSTNUM, PKGPARTS_ARYREF, [ REMOVE_PKGNUMS_ARYREF ]</A></STRONG><BR>
-<DD>
-CUSTNUM is a customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)
-<P>PKGPARTS is a list of pkgparts specifying the the billing item definitions (see
-<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>) to order for this customer.  Duplicates are of course
-permitted.</P>
-<P>REMOVE_PKGNUMS is an optional list of pkgnums specifying the billing items to
-remove for this customer.  The services (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) are moved to the
-new billing items.  An error is returned if this is not possible (see
-<A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>).</P>
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_pkg.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>sub order is not OO.  Perhaps it should be moved to FS::cust_main and made so?</P>
-<P>In sub order, the @pkgparts array (passed by reference) is clobbered.</P>
-<P>Also in sub order, no money is adjusted.  Once FS::part_pkg defines a standard
-method to pass dates to the recur_prog expression, it should do so.</P>
-<P>FS::svc_acct, FS::svc_acct_sm, and FS::svc_domain are loaded via 'use' at 
-compile time, rather than via 'require' in sub { setup, suspend, unsuspend,
-cancel } because they use %FS::UID::callback to load configuration values.
-Probably need a subroutine which decides what to do based on whether or not
-we've fetched the user yet, rather than a hash.  See FS::UID and the TODO.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>
-, <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>, schema.html from the base documentation</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/cust_refund.html b/htdocs/docs/man/FS/cust_refund.html
deleted file mode 100644
index 8162c0b78..000000000
--- a/htdocs/docs/man/FS/cust_refund.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_refund - Object method for cust_refund objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_refund - Object method for cust_refund objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_refund;</PRE>
-<PRE>
-  $record = new FS::cust_refund \%hash;
-  $record = new FS::cust_refund { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_refund represents a refund: the transfer of money to a customer;
-equivalent to a negative payment (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>).  FS::cust_refund
-inherits from FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">refundnum - primary key (assigned automatically for new refunds)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_Credit">crednum - Credit (see <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_refund_%2D_Amount_of_the_refund">refund - Amount of the refund</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item__date_%2D_specified_as_a_UNIX_timestamp%3B_see_per">_date - specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
-<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_payby_%2D_%60CARD%27_%28credit_cards%29%2C_%60BILL">payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_issuer">payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new refund.  To add the refund to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this refund to the database, and updates the credit (see
-<A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Currently unimplemented (accounting reasons).
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Currently unimplemented (accounting reasons).
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid refund.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert method.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_refund.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>Delete and replace methods.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/cust_svc.html b/htdocs/docs/man/FS/cust_svc.html
deleted file mode 100644
index 19416d5b7..000000000
--- a/htdocs/docs/man/FS/cust_svc.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_svc - Object method for cust_svc objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_svc - Object method for cust_svc objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_svc;</PRE>
-<PRE>
-  $record = new FS::cust_svc \%hash
-  $record = new FS::cust_svc { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  ($label, $value) = $record-&gt;label;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_svc represents a service.  FS::cust_svc inherits from FS::Record.
-The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">svcnum - primary key (assigned automatically for new services)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_Package">pkgnum - Package (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_definition">svcpart - Service definition (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>)</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new service.  To add the refund to the database, see <A HREF="#insert">insert</A>.
-Services are normally created by creating FS::svc_ objects (see
-<A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, and <A HREF=".././FS/svc_acct_sm.html">the FS::svc_acct_sm manpage</A>, among others).
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this service to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this service from the database.  If there is an error, returns the
-error, otherwise returns false.
-<P>Called by the cancel method of the package (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid service.  If there is an error,
-returns the error, otehrwise returns false.  Called by the insert and
-replace methods.
-<P></P>
-<DT><STRONG><A NAME="item_label">label</A></STRONG><BR>
-<DD>
-Returns a list consisting of:
-- The name of this service (from part_svc)
-- A meaningful identifier (username, domain, or mail alias)
-- The table name (i.e. svc_domain) for this service
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_svc.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>Behaviour of changing the svcpart of cust_svc records is undefined and should
-possibly be prohibited, and pkg_svc records are not checked.</P>
-<P>pkg_svc records are not checked in general (here).</P>
-<P>Deleting this record doesn't check or delete the svc_* record associated
-with this record.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>, 
-schema.html from the base documentation</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/dbdef.html b/htdocs/docs/man/FS/dbdef.html
deleted file mode 100644
index a986ad95b..000000000
--- a/htdocs/docs/man/FS/dbdef.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::dbdef - Database objects</TITLE>
-<LINK REV="made" HREF="mailto:none">
-</HEAD>
-
-<BODY>
-
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::dbdef - Database objects
-
-<P>
-<HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::dbdef;
-</PRE>
-<P>
-<PRE>  $dbdef = new FS::dbdef (@dbdef_table_objects);
-  $dbdef = load FS::dbdef &quot;filename&quot;;
-</PRE>
-<P>
-<PRE>  $dbdef-&gt;save(&quot;filename&quot;);
-</PRE>
-<P>
-<PRE>  $dbdef-&gt;addtable($dbdef_table_object);
-</PRE>
-<P>
-<PRE>  @table_names = $dbdef-&gt;tables;
-</PRE>
-<P>
-<PRE>  $FS_dbdef_table_object = $dbdef-&gt;table;
-</PRE>
-<P>
-<HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-FS::dbdef objects are collections of FS::dbdef_table objects and represnt a
-database (a collection of tables).
-
-<P>
-<HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new TABLE, TABLE, ...</A></STRONG><DD>
-<P>
-Creates a new FS::dbdef object
-
-<DT><STRONG><A NAME="item_load">load FILENAME</A></STRONG><DD>
-<P>
-Loads an FS::dbdef object from a file.
-
-<DT><STRONG><A NAME="item_save">save FILENAME</A></STRONG><DD>
-<P>
-Saves an FS::dbdef object to a file.
-
-<DT><STRONG><A NAME="item_addtable">addtable TABLE</A></STRONG><DD>
-<P>
-Adds this FS::dbdef_table object.
-
-<DT><STRONG><A NAME="item_tables">tables</A></STRONG><DD>
-<P>
-Returns the names of all tables.
-
-<DT><STRONG><A NAME="item_table">table TABLENAME</A></STRONG><DD>
-<P>
-Returns the named FS::dbdef_table object.
-
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-Each FS::dbdef object should have a name which corresponds to its name
-within the SQL database engine.
-
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/dbdef_table.html">FS::dbdef_table</A>, <A HREF="../FS/Record.html">FS::Record</A>,
-
-</DL>
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/dbdef_colgroup.html b/htdocs/docs/man/FS/dbdef_colgroup.html
deleted file mode 100644
index 8b9e12baf..000000000
--- a/htdocs/docs/man/FS/dbdef_colgroup.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::dbdef_colgroup - Column group objects</TITLE>
-<LINK REV="made" HREF="mailto:none">
-</HEAD>
-
-<BODY>
-
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::dbdef_colgroup - Column group objects
-
-<P>
-<HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::dbdef_colgroup;
-</PRE>
-<P>
-<PRE>  $colgroup = new FS::dbdef_colgroup ( $lol );
-  $colgroup = new FS::dbdef_colgroup (
-    [
-      [ 'single_column' ],
-      [ 'multiple_columns', 'another_column', ],
-    ]
-  );
-</PRE>
-<P>
-<PRE>  @sql_lists = $colgroup-&gt;sql_list;
-</PRE>
-<P>
-<PRE>  @singles = $colgroup-&gt;singles;
-</PRE>
-<P>
-<HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-FS::dbdef_colgroup objects represent sets of sets of columns.
-
-<P>
-<HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new</A></STRONG><DD>
-<P>
-Creates a new FS::dbdef_colgroup object.
-
-<DT><STRONG><A NAME="item_sql_list">sql_list</A></STRONG><DD>
-<P>
-Returns a flat list of comma-separated values, for SQL statements.
-
-<DT><STRONG><A NAME="item_singles">singles</A></STRONG><DD>
-<P>
-Returns a flat list of all single item lists.
-
-</DL>
-<P>
-<HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/dbdef_table.html">FS::dbdef_table</A>, <A HREF="../FS/dbdef_unique.html">FS::dbdef_unique</A>, <A HREF="../FS/dbdef_index.html">FS::dbdef_index</A>,
-<A HREF="../FS/dbdef_column.html">FS::dbdef_column</A>, <A HREF="../FS/dbdef.html">FS::dbdef</A>, <EM>perldsc</EM>
-
-
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/dbdef_column.html b/htdocs/docs/man/FS/dbdef_column.html
deleted file mode 100644
index 6a5ebc3c1..000000000
--- a/htdocs/docs/man/FS/dbdef_column.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::dbdef_column - Column object</TITLE>
-<LINK REV="made" HREF="mailto:none">
-</HEAD>
-
-<BODY>
-
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::dbdef_column - Column object
-
-<P>
-<HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::dbdef_column;
-</PRE>
-<P>
-<PRE>  $column_object = new FS::dbdef_column ( $name, $sql_type, '' );
-  $column_object = new FS::dbdef_column ( $name, $sql_type, 'NULL' );
-  $column_object = new FS::dbdef_column ( $name, $sql_type, '', $length );
-  $column_object = new FS::dbdef_column ( $name, $sql_type, 'NULL', $length );
-</PRE>
-<P>
-<PRE>  $name = $column_object-&gt;name;
-  $column_object-&gt;name ( 'name' );
-</PRE>
-<P>
-<PRE>  $name = $column_object-&gt;type;
-  $column_object-&gt;name ( 'sql_type' );
-</PRE>
-<P>
-<PRE>  $name = $column_object-&gt;null;
-  $column_object-&gt;name ( 'NOT NULL' );
-</PRE>
-<P>
-<PRE>  $name = $column_object-&gt;length;
-  $column_object-&gt;name ( $length );
-</PRE>
-<P>
-<PRE>  $sql_line = $column-&gt;line;
-  $sql_line = $column-&gt;line $datasrc;
-</PRE>
-<P>
-<HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-FS::dbdef::column objects represend columns in tables (see <A HREF="../FS/dbdef_table.html">FS::dbdef_table</A>).
-
-<P>
-<HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new</A></STRONG><DD>
-<P>
-Creates a new FS::dbdef_column object.
-
-<DT><STRONG><A NAME="item_name">name</A></STRONG><DD>
-<P>
-Returns or sets the column name.
-
-<DT><STRONG><A NAME="item_type">type</A></STRONG><DD>
-<P>
-Returns or sets the column type.
-
-<DT><STRONG><A NAME="item_null">null</A></STRONG><DD>
-<P>
-Returns or sets the column null flag.
-
-<DT><STRONG>type</STRONG><DD>
-<P>
-Returns or sets the column length.
-
-<DT><STRONG><A NAME="item_line">line [ $datasrc ]</A></STRONG><DD>
-<P>
-Returns an SQL column definition.
-
-<P>
-If passed a DBI <CODE>$datasrc</CODE> specifying <A HREF="../DBD/mysql.html">DBD::mysql</A> or <A HREF="../DBD/Pg.html">DBD::Pg</A>, will use engine-specific syntax.
-
-</DL>
-<P>
-<HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/dbdef_table.html">FS::dbdef_table</A>, <A HREF="../FS/dbdef.html">FS::dbdef</A>, <EM>DBI</EM>
-
-
-
-<P>
-<HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: dbdef_column.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/dbdef_index.html b/htdocs/docs/man/FS/dbdef_index.html
deleted file mode 100644
index 9d0d12a76..000000000
--- a/htdocs/docs/man/FS/dbdef_index.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::dbdef_unique.pm - Index object</TITLE>
-<LINK REV="made" HREF="mailto:none">
-</HEAD>
-
-<BODY>
-
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::dbdef_unique.pm - Index object
-
-<P>
-<HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::dbdef_index;
-</PRE>
-<P>
-<PRE>    # see FS::dbdef_colgroup methods
-</PRE>
-<P>
-<HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-FS::dbdef_unique objects represent the (non-unique) indices of a table (<A HREF="../FS/dbdef_table.html">FS::dbdef_table</A>). FS::dbdef_unique inherits from FS::dbdef_colgroup.
-
-<P>
-<HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-Is this empty subclass needed?
-
-<P>
-<HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/dbdef_colgroup.html">FS::dbdef_colgroup</A>, <A HREF="../FS/dbdef_record.html">FS::dbdef_record</A>, <A HREF="../FS/Record.html">FS::Record</A>
-
-
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/dbdef_table.html b/htdocs/docs/man/FS/dbdef_table.html
deleted file mode 100644
index a2442729f..000000000
--- a/htdocs/docs/man/FS/dbdef_table.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::dbdef_table - Table objects</TITLE>
-<LINK REV="made" HREF="mailto:none">
-</HEAD>
-
-<BODY>
-
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#METHODS">METHODS</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::dbdef_table - Table objects
-
-<P>
-<HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::dbdef_table;
-</PRE>
-<P>
-<PRE>  $dbdef_table = new FS::dbdef_table (
-    &quot;table_name&quot;,
-    &quot;primary_key&quot;,
-    $FS_dbdef_unique_object,
-    $FS_dbdef_index_object,
-    @FS_dbdef_column_objects,
-  );
-</PRE>
-<P>
-<PRE>  $dbdef_table-&gt;addcolumn ( $FS_dbdef_column_object );
-</PRE>
-<P>
-<PRE>  $table_name = $dbdef_table-&gt;name;
-  $dbdef_table-&gt;name (&quot;table_name&quot;);
-</PRE>
-<P>
-<PRE>  $table_name = $dbdef_table-&gt;primary_keye;
-  $dbdef_table-&gt;primary_key (&quot;primary_key&quot;);
-</PRE>
-<P>
-<PRE>  $FS_dbdef_unique_object = $dbdef_table-&gt;unique;
-  $dbdef_table-&gt;unique ( $FS_dbdef_unique_object );
-</PRE>
-<P>
-<PRE>  $FS_dbdef_index_object = $dbdef_table-&gt;index;
-  $dbdef_table-&gt;index ( $FS_dbdef_index_object );
-</PRE>
-<P>
-<PRE>  @column_names = $dbdef-&gt;columns;
-</PRE>
-<P>
-<PRE>  $FS_dbdef_column_object = $dbdef-&gt;column;
-</PRE>
-<P>
-<PRE>  @sql_statements = $dbdef-&gt;sql_create_table;
-  @sql_statements = $dbdef-&gt;sql_create_table $datasrc;
-</PRE>
-<P>
-<HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-FS::dbdef_table objects represent a single database table.
-
-<P>
-<HR>
-<H1><A NAME="METHODS">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new</A></STRONG><DD>
-<P>
-Creates a new FS::dbdef_table object.
-
-<DT><STRONG><A NAME="item_addcolumn">addcolumn</A></STRONG><DD>
-<P>
-Adds this FS::dbdef_column object. 
-
-<DT><STRONG><A NAME="item_name">name</A></STRONG><DD>
-<P>
-Returns or sets the table name.
-
-<DT><STRONG><A NAME="item_primary_key">primary_key</A></STRONG><DD>
-<P>
-Returns or sets the primary key.
-
-<DT><STRONG><A NAME="item_unique">unique</A></STRONG><DD>
-<P>
-Returns or sets the FS::dbdef_unique object.
-
-<DT><STRONG><A NAME="item_index">index</A></STRONG><DD>
-<P>
-Returns or sets the FS::dbdef_index object.
-
-<DT><STRONG><A NAME="item_columns">columns</A></STRONG><DD>
-<P>
-Returns a list consisting of the names of all columns.
-
-<DT><STRONG><A NAME="item_column">column &quot;column&quot;</A></STRONG><DD>
-<P>
-Returns the column object (see <A HREF="../FS/dbdef_column.html">FS::dbdef_column</A>) for ``column''.
-
-<DT><STRONG><A NAME="item_sql_create_table">sql_create_table [ $datasrc ]</A></STRONG><DD>
-<P>
-Returns an array of SQL statments to create this table.
-
-<P>
-If passed a DBI <CODE>$datasrc</CODE> specifying <A HREF="../DBD/mysql.html">DBD::mysql</A>, will use MySQL-specific syntax. Non-standard syntax for other engines (if
-applicable) may also be supported in the future.
-
-</DL>
-<P>
-<HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/dbdef.html">FS::dbdef</A>, <A HREF="../FS/dbdef_unique.html">FS::dbdef_unique</A>, <A HREF="../FS/dbdef_index.html">FS::dbdef_index</A>, <A HREF="../FS/dbdef_unique.html">FS::dbdef_unique</A>,
-<EM>DBI</EM>
-
-
-
-<P>
-<HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: dbdef_table.html,v 1.2 2000-03-03 18:22:43 ivan Exp $
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/dbdef_unique.html b/htdocs/docs/man/FS/dbdef_unique.html
deleted file mode 100644
index 201f3aa61..000000000
--- a/htdocs/docs/man/FS/dbdef_unique.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::dbdef_unique.pm - Unique object</TITLE>
-<LINK REV="made" HREF="mailto:none">
-</HEAD>
-
-<BODY>
-
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::dbdef_unique.pm - Unique object
-
-<P>
-<HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::dbdef_unique;
-</PRE>
-<P>
-<PRE>  # see FS::dbdef_colgroup methods
-</PRE>
-<P>
-<HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-FS::dbdef_unique objects represent the unique indices of a database table (<A HREF="../FS/dbdef_table.html">FS::dbdef_table</A>). FS::dbdef_unique inherits from FS::dbdef_colgroup.
-
-<P>
-<HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
-<P>
-Is this empty subclass needed?
-
-<P>
-<HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<A HREF="../FS/dbdef_colgroup.html">FS::dbdef_colgroup</A>, <A HREF="../FS/dbdef_record.html">FS::dbdef_record</A>, <A HREF="../FS/Record.html">FS::Record</A>
-
-
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/domain_record.html b/htdocs/docs/man/FS/domain_record.html
deleted file mode 100644
index 78601b4d0..000000000
--- a/htdocs/docs/man/FS/domain_record.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::domain_record - Object methods for domain_record records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-	<LI><A HREF="#history">HISTORY</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::domain_record - Object methods for domain_record records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::domain_record;</PRE>
-<PRE>
-  $record = new FS::domain_record \%hash;
-  $record = new FS::domain_record { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::domain_record object represents an entry in a DNS zone.
-FS::domain_record inherits from FS::Record.  The following fields are currently
-supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_recnum_%2D_primary_key">recnum - primary key</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_Domain">svcnum - Domain (see <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>) of this entry</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_partial">reczone - partial (or full) zone for this entry</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_recaf_%2D_address_family_for_this_entry%2C_current">recaf - address family for this entry, currently only `IN' is recognized.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_entry">rectype - record type for this entry (A, MX, etc.)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_recdata_%2D_data_for_this_entry">recdata - data for this entry</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new entry.  To add the example to the database, see <A HREF="#insert">insert</A>.
-<P>Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Delete this record from the database.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: domain_record.html,v 1.1 2001-04-23 12:41:57 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The data validation doesn't check everything it could.  In particular,
-there is no protection against bad data that passes the regex, duplicate
-SOA records, forgetting the trailing `.', impossible IP addersses, etc.  Of
-course, it's still better than editing the zone files directly.  :)</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
-<P>
-<HR>
-<H1><A NAME="history">HISTORY</A></H1>
-<P>$Log: domain_record.html,v $
-<P>Revision 1.1  2001-04-23 12:41:57  ivan
-<P>new API documentation
-<P>
-Revision 1.1  2000/02/03 05:16:52  ivan
-beginning of DNS and Apache support</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/nas.html b/htdocs/docs/man/FS/nas.html
deleted file mode 100644
index db704c777..000000000
--- a/htdocs/docs/man/FS/nas.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::nas - Object methods for nas records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::nas - Object methods for nas records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::nas;</PRE>
-<PRE>
-  $record = new FS::nas \%hash;
-  $record = new FS::nas {
-    'nasnum'  =&gt; 1,
-    'nasip'   =&gt; '10.4.20.23',
-    'nasfqdn' =&gt; 'box1.brc.nv.us.example.net',
-  };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $error = $record-&gt;heartbeat($timestamp);</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::nas object represents an Network Access Server on your network, such as
-a terminal server or equivalent.  FS::nas inherits from FS::Record.  The
-following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_nasnum_%2D_primary_key">nasnum - primary key</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_nas_%2D_NAS_name">nas - NAS name</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_nasip_%2D_NAS_ip_address">nasip - NAS ip address</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_nasfqdn_%2D_NAS_fully%2Dqualified_domain_name">nasfqdn - NAS fully-qualified domain name</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_state">last - timestamp indicating the last instant the NAS was in a known
-             state (used by the session monitoring).</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new NAS.  To add the NAS to the database, see <A HREF="#insert">insert</A>.
-<P>Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Delete this record from the database.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-<P></P>
-<DT><STRONG><A NAME="item_heartbeat">heartbeat TIMESTAMP</A></STRONG><BR>
-<DD>
-Updates the timestamp for this nas
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: nas.html,v 1.1 2001-04-23 12:41:57 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/part_pkg.html b/htdocs/docs/man/FS/part_pkg.html
deleted file mode 100644
index 4bf46742e..000000000
--- a/htdocs/docs/man/FS/part_pkg.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::part_pkg - Object methods for part_pkg objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::part_pkg - Object methods for part_pkg objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::part_pkg;</PRE>
-<PRE>
-  $record = new FS::part_pkg \%hash
-  $record = new FS::part_pkg { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $custom_record = $template_record-&gt;clone;</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  @pkg_svc = $record-&gt;pkg_svc;</PRE>
-<PRE>
-  $svcnum = $record-&gt;svcpart;
-  $svcnum = $record-&gt;svcpart( 'svc_acct' );</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::part_pkg object represents a billing item definition.  FS::part_pkg
-inherits from FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">pkgpart - primary key (assigned automatically for new billing item definitions)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_definition">pkg - Text name of this billing item definition (customer-viewable)</A></STRONG><BR>
-<DD>
-<DT><STRONG>comment - Text name of this billing item definition (non-customer-viewable)</STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_setup_%2D_Setup_fee">setup - Setup fee</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_freq_%2D_Frequency_of_recurring_fee">freq - Frequency of recurring fee</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_recur_%2D_Recurring_fee">recur - Recurring fee</A></STRONG><BR>
-<DD>
-</DL>
-<P>setup and recur are evaluated as Safe perl expressions.  You can use numbers
-just as you would normally.  More advanced semantics are not yet defined.</P>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new billing item definition.  To add the billing item definition to
-the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_clone">clone</A></STRONG><BR>
-<DD>
-An alternate constructor.  Creates a new billing item definition by duplicating
-an existing definition.  A new pkgpart is assigned and `(CUSTOM) ' is prepended
-to the comment field.  To add the billing item definition to the database, see
-<A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this billing item definition to the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Currently unimplemented.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid billing item definition.  If
-there is an error, returns the error, otherwise returns false.  Called by the
-insert and replace methods.
-<P></P>
-<DT><STRONG><A NAME="item_pkg_svc">pkg_svc</A></STRONG><BR>
-<DD>
-Returns all FS::pkg_svc objects (see <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>) for this package
-definition (with non-zero quantity).
-<P></P>
-<DT><STRONG><A NAME="item_svcpart_%5B_SVCDB_%5D">svcpart [ SVCDB ]</A></STRONG><BR>
-<DD>
-Returns the svcpart of a single service definition (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>)
-associated with this billing item definition (see <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>).  Returns
-false if there not exactly one service definition with quantity 1, or if 
-SVCDB is specified and does not match the svcdb of the service definition,
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: part_pkg.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The delete method is unimplemented.</P>
-<P>setup and recur semantics are not yet defined (and are implemented in
-FS::cust_bill.  hmm.).</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF=".././FS/type_pkgs.html">the FS::type_pkgs manpage</A>, <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>, <EM>Safe</EM>.
-schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/part_referral.html b/htdocs/docs/man/FS/part_referral.html
deleted file mode 100644
index 61f49de04..000000000
--- a/htdocs/docs/man/FS/part_referral.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::part_referral - Object methods for part_referral objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::part_referral - Object methods for part_referral objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::part_referral;</PRE>
-<PRE>
-  $record = new FS::part_referral \%hash
-  $record = new FS::part_referral { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::part_referral represents a referral - where a customer heard of your
-services.  This can be used to track the effectiveness of a particular piece of
-advertising, for example.  FS::part_referral inherits from FS::Record.  The
-following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">refnum - primary key (assigned automatically for new referrals)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_referral_%2D_Text_name_of_this_referral">referral - Text name of this referral</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new referral.  To add the referral to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this referral to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Currently unimplemented.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid referral.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: part_referral.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The delete method is unimplemented.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/part_svc.html b/htdocs/docs/man/FS/part_svc.html
deleted file mode 100644
index d5a521f5c..000000000
--- a/htdocs/docs/man/FS/part_svc.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::part_svc - Object methods for part_svc objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::part_svc - Object methods for part_svc objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::part_svc;</PRE>
-<PRE>
-  $record = new FS::part_referral \%hash
-  $record = new FS::part_referral { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::part_svc represents a service definition.  FS::part_svc inherits from
-FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">svcpart - primary key (assigned automatically for new service definitions)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_svc_%2D_text_name_of_this_service_definition">svc - text name of this service definition</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_svcdb_%2D_table_used_for_this_service%2E_See_FS%3A">svcdb - table used for this service.  See <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>,
-<A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, and <A HREF=".././FS/svc_acct_sm.html">the FS::svc_acct_sm manpage</A>, among others.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_svcdb__field_%2D_Default_or_fixed_value_for_field_"><EM>svcdb</EM>__<EM>field</EM> - Default or fixed value for <EM>field</EM> in <EM>svcdb</EM>.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_svcdb__field_flag_%2D_defines_svcdb__field_action%"><EM>svcdb</EM>__<EM>field</EM>_flag - defines <EM>svcdb</EM>__<EM>field</EM> action: null, `D' for default, or `F' for fixed</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new service definition.  To add the service definition to the
-database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this service definition to the database.  If there is an error, returns
-the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Currently unimplemented.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid service definition.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: part_svc.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>Delete is unimplemented.</P>
-<P>The list of svc_* tables is hardcoded.  When svc_acct_pop is renamed, this
-should be fixed.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
-<A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/svc_acct_sm.html">the FS::svc_acct_sm manpage</A>, <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, schema.html from the
-base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/pkg_svc.html b/htdocs/docs/man/FS/pkg_svc.html
deleted file mode 100644
index 31592d4bd..000000000
--- a/htdocs/docs/man/FS/pkg_svc.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::pkg_svc - Object methods for pkg_svc records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::pkg_svc - Object methods for pkg_svc records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::pkg_svc;</PRE>
-<PRE>
-  $record = new FS::pkg_svc \%hash;
-  $record = new FS::pkg_svc { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $part_pkg = $record-&gt;part_pkg;</PRE>
-<PRE>
-  $part_svc = $record-&gt;part_svc;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::pkg_svc record links a billing item definition (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>) to
-a service definition (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>).  FS::pkg_svc inherits from
-FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_definition">pkgpart - Billing item definition (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG>svcpart - Service definition (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>)</STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_quantity_%2D_Quantity_of_this_service_definition_t">quantity - Quantity of this service definition that this billing item
-definition includes</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Create a new record.  To add the record to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid record.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-<P></P>
-<DT><STRONG><A NAME="item_part_pkg">part_pkg</A></STRONG><BR>
-<DD>
-Returns the FS::part_pkg object (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_part_svc">part_svc</A></STRONG><BR>
-<DD>
-Returns the FS::part_svc object (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>).
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: pkg_svc.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, schema.html from the base
-documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/port.html b/htdocs/docs/man/FS/port.html
deleted file mode 100644
index b747f0ca3..000000000
--- a/htdocs/docs/man/FS/port.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::port - Object methods for port records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::port - Object methods for port records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::port;</PRE>
-<PRE>
-  $record = new FS::port \%hash;
-  $record = new FS::port { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $session = $port-&gt;session;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::port object represents an individual port on a NAS.  FS::port inherits
-from FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_portnum_%2D_primary_key">portnum - primary key</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_ip_%2D_IP_address_of_this_port">ip - IP address of this port</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_nasport_%2D_port_number_on_the_NAS">nasport - port number on the NAS</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_nasnum_%2D_NAS_this_port_is_on_%2D_see_FS%3A%3Anas">nasnum - NAS this port is on - see <A HREF=".././FS/nas.html">the FS::nas manpage</A></A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new port.  To add the example to the database, see <A HREF="#insert">insert</A>.
-<P>Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Delete this record from the database.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-<P></P>
-<DT><STRONG><A NAME="item_session">session</A></STRONG><BR>
-<DD>
-Returns the currently open session on this port, or if no session is currently
-open, the most recent session.  See <A HREF=".././FS/session.html">the FS::session manpage</A>.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: port.html,v 1.1 2001-04-23 12:41:57 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The author forgot to customize this manpage.</P>
-<P>The session method won't deal well if you have multiple open sessions on a
-port, for example if your RADIUS server drops <STRONG>stop</STRONG> records.  Suggestions for
-how to deal with this sort of lossage welcome; should we close the session
-when we get a new session on that port?  Tag it as invalid somehow?  Close it
-one second after it was opened?  *sigh*  Maybe FS::session shouldn't let you
-create overlapping sessions, at least folks will find out their logging is
-dropping records.</P>
-<P>If you think the above refers multiple user logins you need to read the
-manpages again.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/prepay_credit.html b/htdocs/docs/man/FS/prepay_credit.html
deleted file mode 100644
index 699b1c16f..000000000
--- a/htdocs/docs/man/FS/prepay_credit.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::prepay_credit - Object methods for prepay_credit records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-	<LI><A HREF="#history">HISTORY</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::prepay_credit - Object methods for prepay_credit records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::prepay_credit;</PRE>
-<PRE>
-  $record = new FS::prepay_credit \%hash;
-  $record = new FS::prepay_credit {
-    'identifier' =&gt; '4198123455512121'
-    'amount'     =&gt; '19.95',
-  };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::table_name object represents an pre--paid credit, such as a pre-paid
-``calling card''.  FS::prepay_credit inherits from FS::Record.  The following
-fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_field_%2D_description">field - description</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_identifier_%2D_identifier_entered_by_the_user_to_r">identifier - identifier entered by the user to receive the credit</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_amount_%2D_amount_of_the_credit">amount - amount of the credit</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new pre-paid credit.  To add the example to the database, see
-<A HREF="#insert">insert</A>.
-<P>Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Delete this record from the database.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid pre-paid credit.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: prepay_credit.html,v 1.1 2001-04-23 12:41:57 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
-<P>
-<HR>
-<H1><A NAME="history">HISTORY</A></H1>
-<P>$Log: prepay_credit.html,v $
-<P>Revision 1.1  2001-04-23 12:41:57  ivan
-<P>new API documentation
-<P>
-Revision 1.2  2000/02/02 20:22:18  ivan
-bugfix prepayment in signup server</P>
-<P>Revision 1.1  2000/01/31 05:22:23  ivan
-prepaid ``internet cards''</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/session.html b/htdocs/docs/man/FS/session.html
deleted file mode 100644
index c714337be..000000000
--- a/htdocs/docs/man/FS/session.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::session - Object methods for session records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::session - Object methods for session records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::session;</PRE>
-<PRE>
-  $record = new FS::session \%hash;
-  $record = new FS::session {
-    'portnum' =&gt; 1,
-    'svcnum'  =&gt; 2,
-    'login'   =&gt; $timestamp,
-    'logout'  =&gt; $timestamp,
-  };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $error = $record-&gt;nas_heartbeat($timestamp);</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::session object represents an user login session.  FS::session inherits
-from FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_sessionnum_%2D_primary_key">sessionnum - primary key</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_portnum_%2D_NAS_port_for_this_session_%2D_see_FS%3">portnum - NAS port for this session - see <A HREF=".././FS/port.html">the FS::port manpage</A></A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_svcnum_%2D_User_for_this_session_%2D_see_FS%3A%3As">svcnum - User for this session - see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A></A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_login_%2D_timestamp_indicating_the_beginning_of_th">login - timestamp indicating the beginning of this user session.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_logout_%2D_timestamp_indicating_the_end_of_this_us">logout - timestamp indicating the end of this user session.  May be null,
-               which indicates a currently open session.</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new session.  To add the session to the database, see <A HREF="#insert">insert</A>.
-<P>Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.  If the `login' field is empty, it is replaced with
-the current time.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Delete this record from the database.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.  If the `logout' field is empty,
-it is replaced with the current time.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid session.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-<P></P>
-<DT><STRONG><A NAME="item_nas_heartbeat">nas_heartbeat</A></STRONG><BR>
-<DD>
-Heartbeats the nas associated with this session (see <A HREF=".././FS/nas.html">the FS::nas manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_svc_acct">svc_acct</A></STRONG><BR>
-<DD>
-Returns the svc_acct record associated with this session (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>).
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: session.html,v 1.1 2001-04-23 12:41:57 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>Maybe you shouldn't be able to insert a session if there's currently an open
-session on that port.  Or maybe the open session on that port should be flagged
-as problematic?  autoclosed?  *sigh*</P>
-<P>Hmm, sessions refer to current svc_acct records... probably need to constrain
-deletions to svc_acct records such that no svc_acct records are deleted which
-have a session (even if long-closed).</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/svc_Common.html b/htdocs/docs/man/FS/svc_Common.html
deleted file mode 100644
index 7ce9ff36a..000000000
--- a/htdocs/docs/man/FS/svc_Common.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::svc_Common - Object method for all svc_ records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::svc_Common - Object method for all svc_ records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<P>use FS::svc_Common;</P>
-<P>@ISA = qw( FS::svc_Common );</P>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>FS::svc_Common is intended as a base class for table-specific classes to
-inherit from, i.e. FS::svc_acct.  FS::svc_Common inherits from FS::Record.</P>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P>The additional fields pkgnum and svcpart (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
-defined.  An FS::cust_svc record will be created and inserted.</P>
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this account from the database.  If there is an error, returns the
-error, otherwise returns false.
-<P>The corresponding FS::cust_svc record will be deleted as well.</P>
-<P></P>
-<DT><STRONG><A NAME="item_setfixed">setfixed</A></STRONG><BR>
-<DD>
-Sets any fixed fields for this service (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>).  If there is an
-error, returns the error, otherwise returns the FS::part_svc object (use <CODE>ref()</CODE>
-to test the return).  Usually called by the check method.
-<P></P>
-<DT><STRONG><A NAME="item_setdefault">setdefault</A></STRONG><BR>
-<DD>
-Sets all fields to their defaults (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>), overriding their
-current values.  If there is an error, returns the error, otherwise returns
-the FS::part_svc object (use <CODE>ref()</CODE> to test the return).
-<P></P>
-<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
-<DD>
-Stubs - return false (no error) so derived classes don't need to define these
-methods.  Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_Common.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The setfixed method return value.</P>
-<P>The new method should set defaults from part_svc (like the check method
-sets fixed values)?</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, schema.html
-from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/svc_acct.html b/htdocs/docs/man/FS/svc_acct.html
deleted file mode 100644
index 524fe3324..000000000
--- a/htdocs/docs/man/FS/svc_acct.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::svc_acct - Object methods for svc_acct records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::svc_acct - Object methods for svc_acct records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::svc_acct;</PRE>
-<PRE>
-  $record = new FS::svc_acct \%hash;
-  $record = new FS::svc_acct { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $error = $record-&gt;suspend;</PRE>
-<PRE>
-  $error = $record-&gt;unsuspend;</PRE>
-<PRE>
-  $error = $record-&gt;cancel;</PRE>
-<PRE>
-  %hash = $record-&gt;radius;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::svc_acct object represents an account.  FS::svc_acct inherits from
-FS::svc_Common.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">svcnum - primary key (assigned automatcially for new accounts)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_username">username</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item__password_%2D_generated_if_blank">_password - generated if blank</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_presence">popnum - Point of presence (see <A HREF=".././FS/svc_acct_pop.html">the FS::svc_acct_pop manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_uid">uid</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_gid">gid</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_finger_%2D_GECOS">finger - GECOS</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_blank">dir - set automatically if blank (and uid is not)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_shell">shell</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_quota_%2D_%28unimplementd%29">quota - (unimplementd)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_slipip_%2D_IP_address">slipip - IP address</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_radius_Radius_Attribute_%2D_Radius%2DAttribute">radius_<EM>Radius_Attribute</EM> - <EM>Radius-Attribute</EM></A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new account.  To add the account to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this account to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P>The additional fields pkgnum and svcpart (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
-defined.  An FS::cust_svc record will be created and inserted.</P>
-<P>If the configuration value (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine exists, and the 
-username, uid, and dir fields are defined, the <CODE>command(s)</CODE> specified in
-the shellmachine-useradd configuration are exectued on shellmachine via ssh.
-This behaviour can be surpressed by setting $FS::svc_acct::nossh_hack true.
-If the shellmachine-useradd configuration file does not exist,</P>
-<PRE>
-  useradd -d $dir -m -s $shell -u $uid $username</PRE>
-<P>is the default.  If the shellmachine-useradd configuration file exists but
-it empty,</P>
-<PRE>
-  cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</PRE>
-<P>is the default instead.  Otherwise the contents of the file are treated as
-a double-quoted perl string, with the following variables available:
-$username, $uid, $gid, $dir, and $shell.</P>
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this account from the database.  If there is an error, returns the
-error, otherwise returns false.
-<P>The corresponding FS::cust_svc record will be deleted as well.</P>
-<P>If the configuration value (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine exists, the
-<CODE>command(s)</CODE> specified in the shellmachine-userdel configuration file are
-executed on shellmachine via ssh.  This behavior can be surpressed by setting
-$FS::svc_acct::nossh_hack true.  If the shellmachine-userdel configuration
-file does not exist,</P>
-<PRE>
-  userdel $username</PRE>
-<P>is the default.  If the shellmachine-userdel configuration file exists but
-is empty,</P>
-<PRE>
-  rm -rf $dir</PRE>
-<P>is the default instead.  Otherwise the contents of the file are treated as a
-double-quoted perl string, with the following variables available:
-$username and $dir.</P>
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P>If the configuration value (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine exists, and the 
-dir field has changed, the <CODE>command(s)</CODE> specified in the shellmachine-usermod
-configuraiton file are executed on shellmachine via ssh.  This behavior can
-be surpressed by setting $FS::svc-acct::nossh_hack true.  If the
-shellmachine-userdel configuration file does not exist or is empty, :</P>
-<PRE>
-  [ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || (
-    chmod u+t $old_dir;
-    mkdir $new_dir;
-    cd $old_dir;
-    find . -depth -print | cpio -pdm $new_dir;
-    chmod u-t $new_dir;
-    chown -R $uid.$gid $new_dir;
-    rm -rf $old_dir
-  )</PRE>
-<P>is executed on shellmachine via ssh.  This behaviour can be surpressed by
-setting $FS::svc_acct::nossh_hack true.</P>
-<P></P>
-<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
-<DD>
-Suspends this account by prefixing *SUSPENDED* to the password.  If there is an
-error, returns the error, otherwise returns false.
-<P>Called by the suspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
-<DD>
-Unsuspends this account by removing *SUSPENDED* from the password.  If there is
-an error, returns the error, otherwise returns false.
-<P>Called by the unsuspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
-<DD>
-Just returns false (no error) for now.
-<P>Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid service.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-<P>Sets any fixed values; see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>.</P>
-<P></P>
-<DT><STRONG><A NAME="item_radius">radius</A></STRONG><BR>
-<DD>
-Depriciated, use radius_reply instead.
-<P></P>
-<DT><STRONG><A NAME="item_radius_reply">radius_reply</A></STRONG><BR>
-<DD>
-Returns key/value pairs, suitable for assigning to a hash, for any RADIUS
-reply attributes of this record.
-<P>Note that this is now the preferred method for reading RADIUS attributes - 
-accessing the columns directly is discouraged, as the column names are
-expected to change in the future.</P>
-<P></P>
-<DT><STRONG><A NAME="item_radius_check">radius_check</A></STRONG><BR>
-<DD>
-Returns key/value pairs, suitable for assigning to a hash, for any RADIUS
-check attributes of this record.
-<P>Accessing RADIUS attributes directly is not supported and will break in the
-future.</P>
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_acct.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The bits which ssh should fork before doing so (or maybe queue jobs for a
-daemon).</P>
-<P>The $recref stuff in sub check should be cleaned up.</P>
-<P>The suspend, unsuspend and cancel methods update the database, but not the
-current object.  This is probably a bug as it's unexpected and
-counterintuitive.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/svc_Common.html">the FS::svc_Common manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
-<A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF="../Net/SSH.html">the Net::SSH manpage</A>, <EM>ssh</EM>, <A HREF=".././FS/svc_acct_pop.html">the FS::svc_acct_pop manpage</A>,
-schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/svc_acct_pop.html b/htdocs/docs/man/FS/svc_acct_pop.html
deleted file mode 100644
index e8c6f35d5..000000000
--- a/htdocs/docs/man/FS/svc_acct_pop.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::svc_acct_pop - Object methods for svc_acct_pop records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::svc_acct_pop - Object methods for svc_acct_pop records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::svc_acct_pop;</PRE>
-<PRE>
-  $record = new FS::svc_acct_pop \%hash;
-  $record = new FS::svc_acct_pop { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::svc_acct object represents an point of presence.  FS::svc_acct_pop
-inherits from FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">popnum - primary key (assigned automatically for new accounts)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_city">city</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_state">state</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_ac_%2D_area_code">ac - area code</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_exch_%2D_exchange">exch - exchange</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_loc_%2D_rest_of_number">loc - rest of number</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new point of presence (if only it were that easy!).  To add the 
-point of presence to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this point of presence to the database.  If there is an error, returns the
-error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Removes this point of presence from the database.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid point of presence.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_acct_pop.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>It should be renamed to part_pop.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/svc_acct.html">the svc_acct manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/svc_acct_sm.html b/htdocs/docs/man/FS/svc_acct_sm.html
deleted file mode 100644
index 1f513536d..000000000
--- a/htdocs/docs/man/FS/svc_acct_sm.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::svc_acct_sm - Object methods for svc_acct_sm records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::svc_acct_sm - Object methods for svc_acct_sm records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::svc_acct_sm;</PRE>
-<PRE>
-  $record = new FS::svc_acct_sm \%hash;
-  $record = new FS::svc_acct_sm { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $error = $record-&gt;suspend;</PRE>
-<PRE>
-  $error = $record-&gt;unsuspend;</PRE>
-<PRE>
-  $error = $record-&gt;cancel;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::svc_acct object represents a virtual mail alias.  FS::svc_acct inherits
-from FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">svcnum - primary key (assigned automatcially for new accounts)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_domain">domsvc - svcnum of the virtual domain (see <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_account">domuid - uid of the target account (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_domuser_%2D_virtual_username">domuser - virtual username</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new virtual mail alias.  To add the virtual mail alias to the
-database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this virtual mail alias to the database.  If there is an error, returns
-the error, otherwise returns false.
-<P>The additional fields pkgnum and svcpart (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
-defined.  An FS::cust_svc record will be created and inserted.</P>
-<P>If the configuration values (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine and qmailmachines
-exist, and domuser is `*' (meaning a catch-all mailbox), the command:</P>
-<PRE>
-  [ -e $dir/.qmail-$qdomain-default ] || {
-    touch $dir/.qmail-$qdomain-default;
-    chown $uid:$gid $dir/.qmail-$qdomain-default;
-  }</PRE>
-<P>is executed on shellmachine via ssh (see <EM>dot-qmail/``EXTENSION ADDRESSES''</EM>).
-This behaviour can be surpressed by setting $FS::svc_acct_sm::nossh_hack true.</P>
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this virtual mail alias from the database.  If there is an error,
-returns the error, otherwise returns false.
-<P>The corresponding FS::cust_svc record will be deleted as well.</P>
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
-<DD>
-Just returns false (no error) for now.
-<P>Called by the suspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
-<DD>
-Just returns false (no error) for now.
-<P>Called by the unsuspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
-<DD>
-Just returns false (no error) for now.
-<P>Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid virtual mail alias.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert and
-replace methods.
-<P>Sets any fixed values; see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>.</P>
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_acct_sm.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The remote commands should be configurable.</P>
-<P>The $recref stuff in sub check should be cleaned up.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>,
-<A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, <A HREF="../Net/SSH.html">the Net::SSH manpage</A>, <EM>ssh</EM>, <EM>dot-qmail</EM>,
-schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/svc_domain.html b/htdocs/docs/man/FS/svc_domain.html
deleted file mode 100644
index 5c75ab221..000000000
--- a/htdocs/docs/man/FS/svc_domain.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::svc_domain - Object methods for svc_domain records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::svc_domain - Object methods for svc_domain records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::svc_domain;</PRE>
-<PRE>
-  $record = new FS::svc_domain \%hash;
-  $record = new FS::svc_domain { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $error = $record-&gt;suspend;</PRE>
-<PRE>
-  $error = $record-&gt;unsuspend;</PRE>
-<PRE>
-  $error = $record-&gt;cancel;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::svc_domain object represents a domain.  FS::svc_domain inherits from
-FS::svc_Common.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">svcnum - primary key (assigned automatically for new accounts)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_domain">domain</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new domain.  To add the domain to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this domain to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P>The additional fields <EM>pkgnum</EM> and <EM>svcpart</EM> (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
-defined.  An FS::cust_svc record will be created and inserted.</P>
-<P>The additional field <EM>action</EM> should be set to <EM>N</EM> for new domains or <EM>M</EM>
-for transfers.</P>
-<P>A registration or transfer email will be submitted unless
-$FS::svc_domain::whois_hack is true.</P>
-<P>The additional field <EM>email</EM> can be used to manually set the admin contact
-email address on this email.  Otherwise, the svc_acct records for this package 
-(see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) are searched.  If there is exactly one svc_acct record
-in the same package, it is automatically used.  Otherwise an error is returned.</P>
-<P>If any <EM>soamachine</EM> configuration file exists, an SOA record is added to
-the domain_record table (see &lt;FS::domain_record&gt;).</P>
-<P>If any machines are defined in the <EM>nsmachines</EM> configuration file, NS
-records are added to the domain_record table (see <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>).</P>
-<P>If any machines are defined in the <EM>mxmachines</EM> configuration file, MX
-records are added to the domain_record table (see <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>).</P>
-<P>Any problems adding FS::domain_record records will emit warnings, but will
-not return errors from this method.  If your configuration files are correct
-you shouln't have any problems.</P>
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this domain from the database.  If there is an error, returns the
-error, otherwise returns false.
-<P>The corresponding FS::cust_svc record will be deleted as well.</P>
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
-<DD>
-Just returns false (no error) for now.
-<P>Called by the suspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
-<DD>
-Just returns false (no error) for now.
-<P>Called by the unsuspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
-<DD>
-Just returns false (no error) for now.
-<P>Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid domain.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-<P>Sets any fixed values; see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>.</P>
-<P></P>
-<DT><STRONG><A NAME="item_whois">whois</A></STRONG><BR>
-<DD>
-Returns the Net::Whois::Domain object (see <A HREF="../Net/Whois.html">the Net::Whois manpage</A>) for this domain, or
-undef if the domain is not found in whois.
-<P>(If $FS::svc_domain::whois_hack is true, returns that in all cases instead.)</P>
-<P></P>
-<DT><STRONG><A NAME="item__whois">_whois</A></STRONG><BR>
-<DD>
-Depriciated.
-<P></P>
-<DT><STRONG><A NAME="item_submit_internic">submit_internic</A></STRONG><BR>
-<DD>
-Submits a registration email for this domain.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_domain.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>All BIND/DNS fields should be included (and exported).</P>
-<P>Delete doesn't send a registration template.</P>
-<P>All registries should be supported.</P>
-<P>Should change action to a real field.</P>
-<P>The $recref stuff in sub check should be cleaned up.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/svc_Common.html">the FS::svc_Common manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
-<A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF="../Net/Whois.html">the Net::Whois manpage</A>, <EM>ssh</EM>,
-<EM>dot-qmail</EM>, schema.html from the base documentation, config.html from the
-base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/svc_www.html b/htdocs/docs/man/FS/svc_www.html
deleted file mode 100644
index 8f3a99a64..000000000
--- a/htdocs/docs/man/FS/svc_www.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::svc_www - Object methods for svc_www records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-	<LI><A HREF="#history">HISTORY</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::svc_www - Object methods for svc_www records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::svc_www;</PRE>
-<PRE>
-  $record = new FS::svc_www \%hash;
-  $record = new FS::svc_www { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $error = $record-&gt;suspend;</PRE>
-<PRE>
-  $error = $record-&gt;unsuspend;</PRE>
-<PRE>
-  $error = $record-&gt;cancel;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::svc_www object represents an web virtual host.  FS::svc_www inherits
-from FS::svc_Common.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_svcnum_%2D_primary_key">svcnum - primary key</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_recnum_%2D_DNS_%60A%27_record_corresponding_to_thi">recnum - DNS `A' record corresponding to this web virtual host. (see <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_account">usersvc - account (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>) corresponding to this web virtual host.</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new web virtual host.  To add the record to the database, see
-<A HREF="#insert">insert</A>.
-<P>Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P>The additional fields pkgnum and svcpart (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
-defined.  An FS::cust_svc record will be created and inserted.</P>
-<P>If the configuration values (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) <EM>apachemachine</EM>, and
-<EM>apacheroot</EM> exist, the command:</P>
-<PRE>
-  mkdir $apacheroot/$zone;
-  chown $username $apacheroot/$zone;
-  ln -s $apacheroot/$zone $homedir/$zone</PRE>
-<P><EM>$zone</EM> is the DNS A record pointed to by <EM>recnum</EM>
-<EM>$username</EM> is the username pointed to by <EM>usersvc</EM>
-<EM>$homedir</EM> is that user's home directory</P>
-<P>is executed on <EM>apachemachine</EM> via ssh.  This behaviour can be surpressed by
-setting $FS::svc_www::nossh_hack true.</P>
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Delete this record from the database.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
-<DD>
-Called by the suspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
-<DD>
-Called by the unsuspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
-<DD>
-Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and repalce methods.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_www.html,v 1.1 2001-04-23 12:41:57 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/svc_Common.html">the FS::svc_Common manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
-<A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, schema.html from the base documentation.</P>
-<P>
-<HR>
-<H1><A NAME="history">HISTORY</A></H1>
-<P>$Log: svc_www.html,v $
-<P>Revision 1.1  2001-04-23 12:41:57  ivan
-<P>new API documentation
-<P>
-Revision 1.4  2001/04/22 01:56:15  ivan
-get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)</P>
-<P>Revision 1.3  2000/11/22 23:30:51  ivan
-tyop</P>
-<P>Revision 1.2  2000/03/01 08:13:59  ivan
-compilation bugfixes</P>
-<P>Revision 1.1  2000/02/03 05:16:52  ivan
-beginning of DNS and Apache support</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/man/FS/type_pkgs.html b/htdocs/docs/man/FS/type_pkgs.html
deleted file mode 100644
index 30b052b81..000000000
--- a/htdocs/docs/man/FS/type_pkgs.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::type_pkgs - Object methods for type_pkgs records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::type_pkgs - Object methods for type_pkgs records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::type_pkgs;</PRE>
-<PRE>
-  $record = new FS::type_pkgs \%hash;
-  $record = new FS::type_pkgs { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::type_pkgs record links an agent type (see <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A>) to a
-billing item definition (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>).  FS::type_pkgs inherits from
-FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_typenum_%2D_Agent_type%2C_see_FS%3A%3Aagent_type">typenum - Agent type, see <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A></A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_pkgpart_%2D_Billing_item_definition%2C_see_FS%3A%3">pkgpart - Billing item definition, see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A></A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Create a new record.  To add the record to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid record.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: type_pkgs.html,v 1.3 2001-04-23 12:40:31 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A>, <A HREF="../FS/part_pkgs.html">the FS::part_pkgs manpage</A>, schema.html from the base
-documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/htdocs/docs/overview.dia b/htdocs/docs/overview.dia
deleted file mode 100644
index a0e34c30e..000000000
Binary files a/htdocs/docs/overview.dia and /dev/null differ
diff --git a/htdocs/docs/overview.png b/htdocs/docs/overview.png
deleted file mode 100644
index bf2dbc26c..000000000
Binary files a/htdocs/docs/overview.png and /dev/null differ
diff --git a/htdocs/docs/passwd.html b/htdocs/docs/passwd.html
deleted file mode 100644
index a8f8151e2..000000000
--- a/htdocs/docs/passwd.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<head>
-  <title>fs_passwd</title>
-</head>
-<body>
-  <h1>fs_passwd</h1>
-You may use fs_passwd/fs_passwd as a "passwd", "chfn" and "chsh" replacement on your shell machine(s) to cause password, gecos and shell changes to update your freeside machine.  This can pose a security risk if not configured correctly.  <b>Do not use this feature unless you understand what you are doing!</b>
-<br><br>Currently it is assumed that the the crypt(3) function in the C library is the same on the Freeside machine as on the target machine.
-<ul>
-  <li>Create a freeside account on the shell machine(s).
-  <li>Append the identity.pub from the freeside user on your freeside machine to the authorized_keys file of the newly created freeside user on the shell machine(s).
-  <li>Copy fs_passwd/fs_passwd to /usr/local/bin on the shell machine(s).  (chown freeside, chmod 4755).  You may link it to passwd, chfn and chsh as well.
-  <li>Copy fs_passwd/fs_passwdd to /usr/local/sbin on the shell machine(s).  (chown freeside, chmod 500)
-  <li>Create /usr/local/freeside on the shell machine(s). (chown freeside, chmod 700)
-  <li>Run an iteration of "fs_passwd/fs_passwd_server shell.machine" as the freeside user for each shell machine (this is a daemon process).
-</ul>
-</body>
diff --git a/htdocs/docs/postgresql.html b/htdocs/docs/postgresql.html
deleted file mode 100755
index 151081176..000000000
--- a/htdocs/docs/postgresql.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<head>
-  <title>PostgreSQL notes</title>
-</head>
-<body>
-  <h1>PostgreSQL notes</h1>
-<p>
-PostgreSQL ships by default with a maximum of 31 character column names.  If
-you use arbitrary RADIUS attributes longer than 9 characters, fs-setup will
-fail with `duplicate column' errors (in the part_svc table).
-Solution: use a different database
-engine, or recompile PostgreSQL with 64 character column names.
-</p>
-Future versions of Freeside will keep all column names under 31 characters to
-avoid this problem.
-</p>
-<p>
-( I've personally been unable to get PostgreSQL working with larger column names,
-though the process does look like it should be straightforward.  If anyone is
-interested in assisting me with this, please get in touch.
- -Ivan <a href="mailto:ivan@sisd.com">&lt;ivan@sisd.com</a>&gt; )
-</p>
-</body>
-
diff --git a/htdocs/docs/schema.html b/htdocs/docs/schema.html
deleted file mode 100644
index a61000f1f..000000000
--- a/htdocs/docs/schema.html
+++ /dev/null
@@ -1,264 +0,0 @@
-<head>
-  <title>Schema reference</title>
-</head>
-<body>
-  <h1>Schema reference</h1>
-  <ul>
-    <li><a name="agent">agent</a> - Agents are resellers of your service.  Agents may be limited to a subset of your full offerings (via their agent type).
-      <ul>
-        <li>agentnum - primary key
-        <li>agent - name of this agent
-        <li>typenum - <a href="#agent_type">agent type</a>
-        <li>prog - (unimplemented)
-        <li>freq - (unimplemented)
-      </ul>
-    <li><a name="agent_type">agent_type</a> - Agent types define groups of packages that you can then assign to particular agents.
-      <ul>
-        <li>typenum - primary key
-        <li>atype - name of this agent type
-      </ul>
-    <li><a name="cust_bill">cust_bill</a> - Invoices.  Declarations that a customer owes you money.  The specific charges are itemized in <a href="#cust_billl_pkg">cust_bill_pkg</a>.
-      <ul>
-        <li>invnum - primary key
-        <li>custnum - <a href="#cust_main">customer</a>
-        <li>_date
-        <li>charged - amount of this invoice
-        <li>printed - how many times this invoice has been printed automatically
-      </ul>
-    <li><a name="cust_bill_pkg">cust_bill_pkg</a> - Invoice line items
-      <ul>
-        <li>invnum - (multiple) key
-        <li>pkgnum - <a href="#cust_pkg">package</a> or 0 for the special virtual sales tax package
-        <li>setup - setup fee 
-        <li>recur - recurring fee
-        <li>sdate - starting date
-        <li>edate - ending date
-      </ul>
-    <li><a name="cust_credit">cust_credit</a> - Credits.  The equivalent of a negative <a href="#cust_bill">cust_bill</a> record.
-      <ul>
-        <li>crednum - primary key
-        <li>custnum - <a href="#cust_main">customer</a>
-        <li>amount - amount credited
-        <li>_date
-        <li>otaker - order taker
-        <li>reason
-      </ul>
-    <li><a name="cust_main">cust_main</a> - Customers
-      <ul>
-        <li>custnum - primary key
-        <li>agentnum - <a href="#agent">agent</a>
-        <li>refnum - <a href="#part_referral">referral</a>
-        <li>titlenum - <a href="#part_title">title</a>
-        <li>first - name
-        <li>middle - name
-        <li>last - name
-        <li>ss - social security number
-        <li>company
-        <li>address1
-        <li>address2
-        <li>city
-        <li>county
-        <li>state
-        <li>zip
-        <li>country
-        <li>daytime - phone
-        <li>night - phone
-        <li>fax - phone
-        <li>payby - CARD, BILL, or COMP
-        <li>payinfo - card number, P.O.#, or comp issuer
-        <li>paydate - expiration date
-        <li>payname - billing name (name on card)
-        <li>tax - tax exempt, Y or null
-        <li>otaker - order taker
-      </ul>
-    <li><a name="cust_main_invoice">cust_main_invoice</a> - Invoice destinations for email invoices.  Note that a customer can have many email destinations for their invoice (either literal or via svcnum), but only one postal destination.
-      <ul>
-        <li>destnum - primary key
-        <li>custnum - <a href="#cust_main">customer</a>
-        <li>dest - Invoice destination.  Freeside supports three types of invoice delivery: send directly to a service defined in Freeside, send to an arbitrary email address, or print the invoice to a printer and have someone send it out via snail mail.  Freeside determines which method to use based on the contents of the dest field.  If the contents are numeric, a <a href="#svc_acct">svcnum</a> pointing to a valid service is expected in the field.  If the contents are a string, a literal email address is expected to be in the field.  If the special keyword `POST' is present, the snail mail method is used (which is the default if no cust_main_invoice records exist).  Snail mail invoices get their address information from <A name="#cust_main">cust_main</A> and are printed with the printer defined in the configuration files.
-      </ul>
-    <li><a name="cust_main_county">cust_main_county</a> - Tax rates
-      <ul>
-        <li>taxnum - primary key
-        <li>state
-        <li>county
-        <li>country
-        <li>tax - % rate
-      </ul>
-    <li><a name="cust_pay">cust_pay</a> - Payments.  Money being transferred from a customer.
-      <ul>
-        <li>paynum - primary key
-        <li>invnum - <a href="#cust_bill">invoice</a>
-        <li>paid - amount
-        <li>_date
-        <li>payby - CARD, BILL, or COMP
-        <li>payinfo - card number, P.O.#, or comp issuer
-        <li>paybatch - text field for tracking card processor batches
-      </ul>
-    <li><a name="cust_pay_batch">cust_pay_batch</a> - Pending batch
-      <ul>
-        <li>trancode - 77 for charges
-        <li>cardnum
-        <li>exp - card expiration
-        <li>amount
-        <li>invnum - <a href="#cust_bill">invoice</a>
-        <li>custnum - <a href="#cust_main">customer</a>
-        <li>payname - name on card
-        <li>first - name
-        <li>last - name
-        <li>address1
-        <li>address2
-        <li>city
-        <li>state
-        <li>zip
-        <li>country
-      </ul>
-    <li><a name="cust_pkg">cust_pkg</a> - Customer billing items
-      <ul>
-        <li>pkgnum - primary key
-        <li>custnum - <a href="#cust_main">customer</a>
-        <li>pkgpart - <a href="#part_pkg">Package definition</a>
-        <li>setup - date
-        <li>bill - next bill date
-        <li>susp - (past) suspension date
-        <li>expire - (future) cancellation date
-        <li>cancel - (past) cancellation date
-        <li>otaker - order taker
-      </ul>
-    <li><a name="cust_refund">cust_refund</a> - Refunds.  The transfer of money to a customer; equivalent to a negative <a href="#cust_pay">cust_pay</a> record.
-      <ul>
-        <li>refundnum - primary key
-        <li>crednum - <a href="#cust_credit">credit</a>
-        <li>refund - amount
-        <li>_date
-        <li>payby - CARD, BILL or COMP
-        <li>payinfo - card number, P.O.#, or comp issuer
-        <li>otaker - order taker
-      </ul>
-    <li><a name="cust_svc">cust_svc</a> - Customer services
-      <ul>
-        <li>svcnum - primary key
-        <li>pkgnum - <a href="#cust_pkg">package</a>
-        <li>svcpart - <a href="#part_svc">Service definition</a>
-      </ul>
-    <li><a name="nas">nas</a> - Network Access Server (terminal server)
-      <ul>
-        <li>nasnum - primary key
-        <li>nas - NAS name
-        <li>nasip - NAS ip address
-        <li>nasfqdn - NAS fully-qualified domain name
-        <li>last - timestamp indicating the last instant the NAS was in a known state (used by the session monitoring).
-      </ul>
-    <li><a name="part_pkg">part_pkg</a> - Package definitions
-      <ul>
-        <li>pkgpart - primary key
-        <li>pkg - package name
-        <li>comment - non-customer visable package comment
-        <li>setup - setup fee
-        <li>freq - recurring frequency (months)
-        <li>recur - recurring fee
-      </ul>
-    <li><a name="part_referral">part_referral</a> - Referral listing
-      <ul>
-        <li>refnum - primary key
-        <li>referral - referral
-      </ul>
-    <li><a name="part_svc">part_svc</a> - Service definitions
-      <ul>
-        <li>svcpart - primary key
-        <li>svc - name of this service
-        <li>svcdb - table used for this service: svc_acct, svc_acct_sm, svc_domain, svc_charge or svc_wo
-        <li><i>table</i>__<i>field</i> - Default or fixed value for <i>field</i> in <i>table</i>
-        <li><i>table</i>__<i>field</i>_flag - null, D or F
-      </ul>
-    <li><a name="part_title">part_title</a> - Personal titles
-      <ul>
-        <li>titlenum - primary key
-        <li>title - personal title (`Dr.' or `Mr.')
-      </ul>
-    <li><a name="pkg_svc">pkg_svc</a>
-      <ul>
-        <li>pkgpart - <a href="#part_pkg">Package definition</a>
-        <li>svcpart - <a href="#part_svc">Service definition</a>
-        <li>quantity - quantity of this service that this package includes
-      </ul>
-    <li><a name="port">port</a> - individual port on a <a href="#nas">nas</a>
-      <ul>
-        <li>portnum - primary key
-        <li>ip - IP address of this port
-        <li>nasport - port number on the NAS
-        <li>nasnum - <a href="#nas">NAS</a>
-      </ul>
-    <li><a name="prepay_credit">prepay_credit</a>
-      <ul>
-        <li>prepaynum - primary key
-        <li>identifier - text or numeric string used to receive this credit
-        <li>amount - amount of credit
-      </ul>
-    <li><a name="session">session</a>
-      <ul>
-        <li>sessionnum - primary key
-        <li>portnum - <a href="#port">Port</a>
-        <li>svcnum - <a href="#svc_acct">Account</a>
-        <li>login - timestamp indicating the beginning of this user session.
-        <li>logout - timestamp indicating the end of this user session.  May be null, which indicates a currently open session.
-      </ul>
-
-    <li><a name="svc_acct">svc_acct</a> - Accounts
-      <ul>
-        <li>svcnum - <a href="#cust_svc">primary key</a>
-        <li>username
-        <li>_password
-        <li>popnum - <a href="#svc_acct_pop">Point of Presence</a>
-        <li>uid
-        <li>gid
-        <li>finger - GECOS
-        <li>dir
-        <li>shell
-        <li>quota - (unimplementd)
-        <li>slipip - IP address
-        <li>radius_<i>Radius_Attribute</i> - Radius-Attribute
-      </ul>
-    <li><a name="svc_acct_pop">svc_acct_pop</a> - Points of Presence
-      <ul>
-        <li>popnum - primary key
-        <li>city
-        <li>state
-        <li>ac - area code
-        <li>exch - exchange
-        <li>loc - rest of number
-      </ul>
-    <li><a name="svc_acct_sm">svc_acct_sm</a> - Domain mail aliases
-      <ul>
-        <li>svcnum - <a href="#cust_svc">primary key</a>
-        <li>domsvc - <a href="#svc_domain">Domain</a> (by svcnum)
-        <li>domuid - <a href="#svc_acct">Account</a> (by uid)
-        <li>domuser - domuser @ <a href="#svc_domain">Domain</a> forwards to <a href="#svc_acct">Account</a>
-      </ul>
-    <li><a name="svc_domain">svc_domain</a> - Domains
-      <ul>
-        <li>svcnum - <a href="#cust_svc">primary key</a>
-        <li>domain
-      </ul>
-    <li><a name="domain_record">domain_record</a> - Domain zone detail
-      <ul>
-        <li>recnum - primary key
-        <li>svcnum - <a href="#svc_domain">Domain</a> (by svcnum)
-        <li>reczone - zone for this line
-        <li>recaf - address family, usually <b>IN</b>
-        <li>rectype - type for this record (<b>A</b>, <b>MX</b>, etc.)
-        <li>recdata - data for this record
-      </ul>
-    <li><a name="svc_www">svc_www</a>
-      <ul>
-       <li>svcnum - <a href="#cust-svc">primary key</a>
-       <li>recnum - <a href="#domain_record">host</a>
-       <li>usersvc - <a href="#svc_acct">account</a>
-      </ul>
-    <li><a name="type_pkgs">type_pkgs</a>
-      <ul>
-        <li>typenum - <a href="#agent_type">agent type</a>
-        <li>pkgpart - <a href="#part_pkg">Package definition</a>
-      </ul>
-  </ul>
-</body>
diff --git a/htdocs/docs/session.html b/htdocs/docs/session.html
deleted file mode 100644
index 7dac5fdf7..000000000
--- a/htdocs/docs/session.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<head>
-  <title>Session monitor</title>
-</head>
-<body>
-<h1>Session monitor</h1>
-<h2>Installation</h2>
-For security reasons, the client portion of the session montior may run on one
-or more external public machine(s).  On these machines, install:
-<ul>
-  <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at l
-east 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
-  <li><a href="man/FS/SessionClient.html">FS::SessionClient</a> (copy the fs_session/FS-SessionClient directory to the external machine, then: perl Makefile.PL; make; make install)
-</ul>
-Then:
-<ul>
-  <li>Add the user `freeside' to the the external machine.
-  <li>Create the /usr/local/freeside directory on the external machine (owned by the freeside user).
-  <li>touch /usr/local/freeside/fs_sessiond_socket; chown freeside /usr/local/freeside/fs_sessiond_socket; chmod 600 /usr/local/freeside/fs_sessiond_socket
-    <li>Append the identity.pub from the freeside user on your freeside machine to the authorized_keys file of the newly created freeside user on the external machine(s).
-  <li>Run <pre>fs_session_server <i>user</i> <i>machine</i></pre> on the Freeside machine.
-  <ul>
-    <li><i>user</i> is a user from the mapsecrets file.
-    <li><i>machine</i> is the name of the external machine.
-  </ul>
-</ul>
-<h2>Usage</h2>
-<ul>
-  <li>Web
-    <ul>
-      <li>Copy FS-SessionClient/cgi/login.cgi and logout.cgi to your web
-          server's document space.  
-      <li>Use <a href="http://www.apache.org/docs/suexec.html">suEXEC</a> or <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">setuid</a> (see <a href="install.html">install.html</a> for details) to run login.cgi and logout.cgi as the freeside user.
-    </ul>
-  <li>Command-line
-    <br><pre>freeside-login username ( portnum | ip | nasnum nasport )
-freeside-logout username ( portnum | ip | nasnum nasport )</pre>
-    <ul>
-      <li><i>username</i> is a customer username from the svc_acct table
-      <li><i>portnum</i>, <i>ip</i> or <i>nasport</i> and <i>nasnum</i> uniquely identify a port in the <a href="schema.html#port">port</a> database table.
-    </ul>
-  <li>RADIUS
-    <ul>
-      <li>Configure your RADIUS server's login and logout callbacks to use the command-line <tt>freeside-login</tt> and <tt>freeside-logout</tt> utilites.
-    </ul>
-</ul>
-<h2>Callbacks</h2>
-<ul>
-  <li>Sesstion start - The command(s) specified in the <a href="config.html#session-start">session-start</a> configuration file are executed on the Freeside machine.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
-  <li>Session end - The command(s) specified in the <a href="config.html#session-stop">session-stop</a> configuration file are executed on the Freeside machine.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
-</ul>
-<h2>Dropping expired users</h2>
-Run <pre>bin/freeside-session-kill username</pre> periodically from cron.
-</body>
-</html>
diff --git a/htdocs/docs/signup.html b/htdocs/docs/signup.html
deleted file mode 100644
index a40b1f963..000000000
--- a/htdocs/docs/signup.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<head>
-  <title>Signup server</title>
-</head>
-<body>
-  <h1>Signup server</h1>
-For security reasons, the signup server should run on an external public
-webserver.  On this machine, install:
-<ul>
-  <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
-  <li><a href="ftp://ftp.cs.hut.fi/pub/ssh/">SSH</a>
-  <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
-  <li><a href="http://www.perl.com/CPAN/modules/by-module/Text/">Text::Template</a>
-  <li><a href="http://www.sisd.com/useragent">HTTP::Headers::UserAgent</a> (version 2.0 or higher; not yet indexed correctly on CPAN)
-
-  <li><a href="man/FS/SignupClient.html">FS::SignupClient</a> (copy the fs_signup/FS-SignupClient directory to the external machine, then: perl Makefile.PL; make; make install)
-</ul>
-Then:
-<ul>
-  <li>Add the user `freeside' to the the external machine.
-  <li>Copy or symlink fs_signup/FS-SignupClient/cgi/signup.cgi into the web server's document space.
-  <li>Enable CGI execution for files with the `.cgi' extension.  (with <a href="http://www.apache.org/docs/mod/mod_mime.html#addhandler">Apache</a>)
-  <li>Create the /usr/local/freeside directory on the external machine (owned by the freeside user).
-  <li>touch /usr/local/freeside/fs_signupd_socket; chown freeside /usr/local/freeside/fs_signupd_socket; chmod 600 /usr/local/freeside/fs_signupd_socket
-  <li>Use <a href="http://www.apache.org/docs/suexec.html">suEXEC</a> or <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">setuid</a> (see <a href="install.html">install.html</a> for details) to run signup.cgi as the freeside user.
-  <li>Append the identity.pub from the freeside user on your freeside machine to the authorized_keys file of the newly created freeside user on the external machine(s).
-  <li>Run <pre>fs_signup_server <i>user</i> <i>machine</i> <i>agentnum</i> <i>refnum</i></pre> on the Freeside machine.
-  <ul>
-    <li><i>user</i> is a user from the mapsecrets file.
-    <li><i>machine</i> is the name of the external machine.
-    <li><i>agentnum</i> and <i>refnum</i> are the <a href="schema.html#agent">agent</a> and <a href="schema.html#part_referral">referral</a>, respectively, to use for customers who sign up via this signup server.
-  </ul>
-</ul>
-Optional:
-<ul>
-  <li>If you create a <b>/usr/local/freeside/ieak.template</b> file on the external machine, it will be sent to IE users with MIME type <i>application/x-Internet-signup</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the following variables available:
-  <ul>
-    <li>$ac - area code of selected POP
-    <li>$exch - exchange of selected POP
-    <li>$loc - local part of selected POP
-    <li>$username
-    <li>$password
-    <li>$email_name - first and last name
-  </ul>
-  (an example file is included as <b>fs_signup/ieak.template</b>)
-  <li>If you create a <b>/usr/local/freeside/cck.template</b> file on the external machine, the variables defined will be sent to Netscape users with MIME type <i>application/x-netscape-autoconfigure-dialer-v2</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the following variables available:
-  <ul>
-    <li>$ac - area code of selected POP
-    <li>$exch - exchange of selected POP
-    <li>$loc - local part of selected POP
-    <li>$username
-    <li>$password
-    <li>$email_name - first and last name
-  </ul>
-  (an example file is included as <b>fs_signup/cck.template</b>).  See the <a href="http://help.netscape.com/products/client/mc/acctproc4.html">Netscape documentation</a> for more information.
-  <li>If there are any entries in the <i>prepay_credit</i> table, a user can enter a string matching the <b>identifier</i> column to receive the credit specified in the <b>amount</b> column, and/or the time specified in the <b>seconds</b> column (for use with the <a href="session.html">session monitor</a>), after which that <b>identifier</b> is no longer valid.  This can be used to implement pre-paid "calling card" type signups.  The <i>bin/generate-prepay</i> script can be used to populate the <i>prepay_credit</i> table.
-</ul>
-</body>
diff --git a/htdocs/docs/trouble.html b/htdocs/docs/trouble.html
deleted file mode 100644
index fce743928..000000000
--- a/htdocs/docs/trouble.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<head>
-  <title>Troubleshooting</title>
-</head>
-<body>
-  <h1>Troubleshooting</h1>
-  <ul>
-    <li>When troubleshooting the web interface, helpful information is often in your web server's error log.
-    <li>If bin/svc_acct.import fails with an "Out of memory!" error using MySQL, upgrede MySQL and recompile the Perl DBD.  There was a memory leak in some older versions of MySQL.
-    <li>If you get tons of errors in your web server's error log like this:
-<pre>
-Ambiguous use of value => resolved to "value" =>
-at /usr/lib/perl5/site_perl/File/CounterFile.pm line 132.
-</pre>
-        This clutters up your log files but is otherwise harmless.  Upgrade to the latest File::CounterFile. 
-    <li>If you get errors like this:
-<pre>
-UID.pm: Can't open /var/spool/freeside/conf/secrets: Permission denied 
-at <i>/your/path</i>/site_perl/FS/UID.pm line 26.
-BEGIN failed--compilation aborted at
-<i>/your/path</i>/edit/process/part_svc.cgi line 15.
-</pre>
-        Then the scripts are not running as the freeside freeside user.  See
-the <a href="install.html">New Installation</a> section of the documentation.
-  <li>If you receive `can not connect to server' errors using MySQL on a system that doesn't support native threading, you may need to specify the full hostname in your DBI datasource.  See the <a href="http://www.mysql.com/Manual_chapter/manual_Problems.html#Can_not_connect_to_server">MySQL documentation</a>, DBI manpage and the DBD::mysql manpage for details.
-  </ul>
-</body>
diff --git a/htdocs/docs/upgrade.html b/htdocs/docs/upgrade.html
deleted file mode 100644
index d2201f601..000000000
--- a/htdocs/docs/upgrade.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<head>
-  <title>Upgrading to 1.1.x</title>
-</head>
-<body>
-<h1>Upgrading to 1.1.x</h1>
-<ul>
-  <li>Back up your data and current Freeside installation.
-  <li>Unpack a copy of the 1.0.0 distribution in a separate location.
-  <li>Diff your current installation against the 1.0.0 distribution.
-  <li>Apply all the diffs you found above, if applicable.
-  <li>Apply (at least) the following changes to your database:
-<pre>
-ALTER TABLE cust_main CHANGE ss ss char(11) NULL;
-ALTER TABLE cust_main CHANGE day daytime varchar(20) NULL;
-ALTER TABLE svc_acct CHANGE password _password varchar(25) NOT NULL;
-ALTER TABLE part_svc CHANGE svc_acct__password svc_acct___password varchar(25) NULL;
-ALTER TABLE part_svc CHANGE svc_acct__password_flag svc_acct___password_flag char(1) NULL;
-ALTER TABLE agent_type CHANGE type atype varchar(80) NOT NULL;
-</pre>
-  <li>Optionally change the field lengths and types to match a 1.1.x install; see `bin/fs-setup'.
-  <li>Create the necessary <a href="config.html">configuration files</a>,
-  <li>Copy or symlink htdocs and site_perl to the new 1.1.x copies.
-  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
-</body>
diff --git a/htdocs/docs/upgrade2.html b/htdocs/docs/upgrade2.html
deleted file mode 100644
index 7acae48f7..000000000
--- a/htdocs/docs/upgrade2.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<head>
-  <title>Upgrading to 1.1.4</title>
-</head>
-<body>
-<h1>Upgrading to 1.1.4 from 1.1.x</h1>
-<ul>
-  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
-  <li>Back up your data and current Freeside installation.
-  <li>If applicable, create the new <a href="config.html">configuration files</a>: lpr, cybercash2, cybercash3.2
-  <li>Copy or symlink htdocs and site_perl to the new copies.
-</body>
diff --git a/htdocs/docs/upgrade3.html b/htdocs/docs/upgrade3.html
deleted file mode 100644
index 0837e0207..000000000
--- a/htdocs/docs/upgrade3.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<head>
-  <title>Upgrading to 1.2.x</title>
-</head>
-<body>
-<h1>Upgrading to 1.2.x from 1.1.x</h1>
-<ul>
-  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
-  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
-  <li>Back up your data and current Freeside installation.
-  <li>Install the Perl module <a href="http://www.perl.com/CPAN/modules/by-module/String/">String-Approx</a>
-  <li><a href="config.html">Configuration file</a> location has changed!
-  <li>Move /var/spool/freeside/dbdef.<i>datasrc</i> to /usr/local/etc/freeside/dbdef.<i>datasrc</i>.
-  <li>Move /var/spool/freeside/counters to /usr/local/etc/freeside/counters.<i>datasrc</i>.
-  <li>Move /var/spool/freeside/export to /usr/local/etc/freeside/export.<i>datasrc</i>.
-  <li>Apply the following changes to your database:
-<pre>
-<!-- ALTER TABLE cust_main ADD middle varchar(80) NULL;
-ALTER TABLE cust_main ADD titlenum int NULL;
--->ALTER TABLE cust_main CHANGE state state varchar(80) NULL;
-ALTER TABLE cust_main_county CHANGE state state varchar(80) NULL;
-ALTER TABLE cust_main_county ADD country char(2);
-ALTER TABLE cust_main CHANGE paydate paydate varchar(10);
-UPDATE cust_main SET country = "US" where country IS NULL OR country = '';
-UPDATE cust_main_county SET country = "US" where country IS NULL OR country = "";
-<!--CREATE TABLE part_title (
-   titlenum int NOT NULL,
-   title varchar(80) NOT NULL,
-   PRIMARY KEY (titlenum)
-);
--->CREATE TABLE cust_main_invoice (
-   destnum int NOT NULL,
-   custnum int NOT NULL,
-   dest varchar(80) NOT NULL,
-   PRIMARY KEY (destnum),
-   INDEX ( custnum )
-);
-</pre>
-  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
-  <li>Copy or symlink htdocs and site_perl to the new copies.
-</body>
diff --git a/htdocs/docs/upgrade4.html b/htdocs/docs/upgrade4.html
deleted file mode 100644
index 1d70f8b73..000000000
--- a/htdocs/docs/upgrade4.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<head>
-  <title>Upgrading to 1.2.2</title>
-</head>
-<body>
-<h1>Upgrading to 1.2.2 from 1.2.x</h1>
-<ul>
-  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
-  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
-  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
-  <li>Back up your data and current Freeside installation.
-  <li>Install the Perl modules <a href="http://www.perl.com/CPAN/modules/by-module/Locale/">Locale-Codes</a> and <a href="http://www.perl.com/CPAN/modules/by-module/Net/">Net-Whois</a>.
-  <li>Apply the following changes to your database:
-<pre>
-ALTER TABLE cust_pay_batch CHANGE exp exp VARCHAR(11);
-</pre>
-  <li>Copy or symlink htdocs to the new copy.
-  <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
-  <li>Change to the FS directory in the new tarball, and build and install the
-      Perl modules:
-    <pre>
-$ cd FS/
-$ perl Makefile.PL
-$ make
-$ su
-# make install</pre>
-  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
-</body>
diff --git a/htdocs/docs/upgrade5.html b/htdocs/docs/upgrade5.html
deleted file mode 100644
index 3f3431653..000000000
--- a/htdocs/docs/upgrade5.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<head>
-  <title>Upgrading to 1.3.0</title>
-</head>
-<body>
-<h1>Upgrading to 1.2.3 from 1.2.2</h1>
-<ul>
-  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
-  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
-  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
-  <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
-  <li>Back up your data and current Freeside installation.
-  <li>Apply the following changes to your database:
-<pre>
-ALTER TABLE svc_acct_pop ADD loc CHAR(4);
-CREATE TABLE prepay_credit (
-  prepaynum int NOT NULL,
-  identifier varchar(80) NOT NULL,
-  amount decimal(10,2) NOT NULL,
-  PRIMARY KEY (prepaynum),
-  INDEX (identifier)
-);
-</pre>
-  <li>Copy or symlink htdocs to the new copy.
-  <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
-  <li>Change to the FS directory in the new tarball, and build and install the
-      Perl modules:
-    <pre>
-$ cd FS/
-$ perl Makefile.PL
-$ make
-$ su
-# make install</pre>
-  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
-</body>
diff --git a/htdocs/docs/upgrade6.html b/htdocs/docs/upgrade6.html
deleted file mode 100644
index dc82975f3..000000000
--- a/htdocs/docs/upgrade6.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<head>
-  <title>Upgrading to 1.3.0</title>
-</head>
-<body>
-<h1>Upgrading to 1.3.0 from 1.2.3</h1>
-<ul>
-  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
-  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
-  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
-  <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
-  <li>If migrating from less than 1.2.3, see these <a href="upgrade5.html">instructions</a> first.
-  <li>Back up your data and current Freeside installation.
-  <li>As 1.3.0 requires transactions, <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are no longer supported</b>.  Converting to <a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.  If you really want to use MySQL, convert your tables to one of the <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>.
-  <li>Copy the <i>invoice_template</i> file from the <i>conf/</i> directory in the distribution to your <a href="config.html">configuration directory</a>.
-  <li>Install the <a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>, <a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>, <a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>, <a href="http://search.cpan.org/search?dist=String-ShellQuote">String-ShellQuote</a> and <a href="http://search.cpan.org/search?dist=Net-SCP">Net-SCP</a> Perl modules.
-  <li>Apply the following changes to your database:
-<pre>
-CREATE TABLE domain_record (
-  recnum int NOT NULL,
-  svcnum int NOT NULL,
-  reczone varchar(80) NOT NULL,
-  recaf char(2) NOT NULL,
-  rectype char(5) NOT NULL,
-  recdata varchar(80) NOT NULL,
-  PRIMARY KEY (recnum)
-);
-CREATE TABLE svc_www (
-  svcnum int NOT NULL,
-  recnum int NOT NULL,
-  usersvc int NOT NULL,
-  PRIMARY KEY (svcnum)
-);
-ALTER TABLE part_svc ADD svc_www__recnum varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_www__recnum_flag char(1) NULL;
-ALTER TABLE part_svc ADD svc_www__usersvc varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_www__uesrsvc_flag char(1) NULL;
-ALTER TABLE svc_acct CHANGE _password _password varchar(50) NULL;
-ALTER TABLE svc_acct ADD seconds integer NULL;
-ALTER TABLE part_svc ADD svc_acct__seconds integer NULL;
-ALTER TABLE part_svc ADD svc_acct__seconds_flag char(1) NULL;
-ALTER TABLE prepay_credit ADD seconds integer NULL;
-
-</pre>
-  <li>If your database supports dropping columns:
-<pre>
-ALTER TABLE cust_bill DROP owed;
-ALTER TABLE cust_credit DROP credited;
-</pre>
-     Or, if your database does not support dropping columns, you can do this:
-<pre>
-ALTER TABLE cust_bill CHANGE owed depriciated decimal(10,2);
-ALTER TABLE cust_credit CHANGE credited depriciated2 decimal(10,2);
-</pre>
-
-  <li>Copy or symlink htdocs to the new copy.
-  <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
-  <li>Change to the FS directory in the new tarball, and build and install the
-      Perl modules:
-    <pre>
-$ cd FS/
-$ perl Makefile.PL
-$ make
-$ su
-# make install</pre>
-  <li>Run bin/dbdef-create.
-</body>
diff --git a/htdocs/docs/upgrade7.html b/htdocs/docs/upgrade7.html
deleted file mode 100644
index d9dcfe2ae..000000000
--- a/htdocs/docs/upgrade7.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<head>
-  <title>Upgrading to 1.3.1</title>
-</head>
-<body>
-<h1>Upgrading to 1.3.1 from 1.3.0</h1>
-<ul>
-  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
-  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
-  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
-  <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
-  <li>If migrating from less than 1.2.3, see these <a href="upgrade5.html">instructions</a> first.
-  <li>If migrating from less than 1.3.0, see these <a href="upgrade6.html">instructions</a> first.
-  <li>Back up your data and current Freeside installation.
-  <li>Copy or symlink htdocs to the new copy.
-  <li>Change to the FS directory in the new tarball, and build and install the
-      Perl modules:
-    <pre>
-$ cd FS/
-$ perl Makefile.PL
-$ make
-$ su
-# make install UNINST=1</pre>
-  <li>Run bin/dbdef-create.
-</body>
diff --git a/htdocs/edit/agent.cgi b/htdocs/edit/agent.cgi
deleted file mode 100755
index 5b42095b3..000000000
--- a/htdocs/edit/agent.cgi
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: agent.cgi,v 1.7 1999-04-07 11:27:50 ivan Exp $
-#
-# ivan@sisd.com 97-dec-12
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'type' to 'atype' because Pg6.3 reserves the type word
-#	bmccane@maxbaud.net	98-apr-3
-#
-# use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
-#
-# $Log: agent.cgi,v $
-# Revision 1.7  1999-04-07 11:27:50  ivan
-# avoid perl's silly arguement not numeric error
-#
-# Revision 1.6  1999/01/25 12:09:50  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:31  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:21  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 06:16:57  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.2  1998/11/23 07:52:08  ivan
-# *** empty log message ***
-#
-
-use strict;
-use vars qw ( $cgi $agent $action $hashref $p $agent_type );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header menubar popurl);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::agent;
-use FS::agent_type;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-if ( $cgi->param('error') ) {
-  $agent = new FS::agent ( {
-    map { $_, scalar($cgi->param($_)) } fields('agent')
-  } );
-} elsif ( $cgi->keywords ) {
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $agent = qsearchs( 'agent', { 'agentnum' => $1 } );
-} else { #adding
-  $agent = new FS::agent {};
-}
-$action = $agent->agentnum ? 'Edit' : 'Add';
-$hashref = $agent->hashref;
-
-$p = popurl(2);
-
-print $cgi->header( '-expires' => 'now' ), header("$action Agent", menubar(
-  'Main Menu' => $p,
-  'View all agents' => $p. 'browse/agent.cgi',
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print '<FORM ACTION="', popurl(1), 'process/agent.cgi" METHOD=POST>',
-      qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$hashref->{agentnum}">!,
-      "Agent #", $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)";
-
-print <<END;
-<PRE>
-Agent                     <INPUT TYPE="text" NAME="agent" SIZE=32 VALUE="$hashref->{agent}">
-Agent type                <SELECT NAME="typenum" SIZE=1>
-END
-
-foreach $agent_type (qsearch('agent_type',{})) {
-  print "<OPTION VALUE=". $agent_type->typenum;
-  print " SELECTED"
-    if $hashref->{typenum} && ( $hashref->{typenum} == $agent_type->typenum );
-  print ">", $agent_type->getfield('typenum'), ": ",
-        $agent_type->getfield('atype'),"\n";
-}
-
-print <<END;
-</SELECT>
-Frequency (unimplemented) <INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}">
-Program (unimplemented)   <INPUT TYPE="text" NAME="prog" VALUE="$hashref->{prog}">
-</PRE>
-END
-
-print qq!<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{agentnum} ? "Apply changes" : "Add agent",
-      qq!">!;
-
-print <<END;
-    </FORM>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/edit/agent_type.cgi b/htdocs/edit/agent_type.cgi
deleted file mode 100755
index bdf64c58f..000000000
--- a/htdocs/edit/agent_type.cgi
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: agent_type.cgi,v 1.11 1999-04-07 11:19:21 ivan Exp $
-#
-# agent_type.cgi: Add/Edit agent type (output form)
-#
-# ivan@sisd.com 97-dec-10
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'type' to 'atype' because Pg6.3 reserves the type word
-#	bmccane@maxbaud.net	98-apr-3
-#
-# use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
-#
-# $Log: agent_type.cgi,v $
-# Revision 1.11  1999-04-07 11:19:21  ivan
-# silly HTML typo
-#
-# Revision 1.10  1999/01/25 12:09:51  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.9  1999/01/19 05:13:32  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.8  1999/01/18 09:41:22  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.7  1999/01/18 09:22:29  ivan
-# changes to track email addresses for email invoicing
-#
-# Revision 1.6  1998/12/17 06:16:58  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.5  1998/11/21 07:58:27  ivan
-# package names link to them
-#
-# Revision 1.4  1998/11/21 07:45:19  ivan
-# visual, use FS::table_name when doing qsearch('table_name')
-#
-# Revision 1.3  1998/11/15 11:20:12  ivan
-# s/CGI-Base/CGI.pm/ causes s/QUERY_STRING/keywords/;
-#
-# Revision 1.2  1998/11/13 09:56:46  ivan
-# change configuration file layout to support multiple distinct databases (with
-# own set of config files, export, etc.)
-#
-
-use strict;
-use vars qw( $cgi $agent_type $action $hashref $p $part_pkg );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::agent_type;
-use FS::CGI qw(header menubar popurl);
-use FS::agent_type;
-use FS::part_pkg;
-use FS::type_pkgs;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-if ( $cgi->param('error') ) {
-  $agent_type = new FS::agent_type ( {
-    map { $_, scalar($cgi->param($_)) } fields('agent')
-  } );
-} elsif ( $cgi->keywords ) { #editing
-  my( $query ) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $agent_type=qsearchs('agent_type',{'typenum'=>$1});
-} else { #adding
-  $agent_type = new FS::agent_type {};
-}
-$action = $agent_type->typenum ? 'Edit' : 'Add';
-$hashref = $agent_type->hashref;
-
-$p = popurl(2);
-print $cgi->header( '-expires' => 'now' ), header("$action Agent Type", menubar(
-  'Main Menu' => "$p",
-  'View all agent types' => "${p}browse/agent_type.cgi",
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print '<FORM ACTION="', popurl(1), 'process/agent_type.cgi" METHOD=POST>',
-      qq!<INPUT TYPE="hidden" NAME="typenum" VALUE="$hashref->{typenum}">!,
-      "Agent Type #", $hashref->{typenum} ? $hashref->{typenum} : "(NEW)";
-
-print <<END;
-<BR><BR>Agent Type <INPUT TYPE="text" NAME="atype" SIZE=32 VALUE="$hashref->{atype}">
-<BR><BR>Select which packages agents of this type may sell to customers<BR>
-END
-
-foreach $part_pkg ( qsearch('part_pkg',{}) ) {
-  print qq!<BR><INPUT TYPE="checkbox" NAME="pkgpart!,
-        $part_pkg->getfield('pkgpart'), qq!" !,
-       # ( 'CHECKED 'x scalar(
-        qsearchs('type_pkgs',{
-          'typenum' => $agent_type->getfield('typenum'),
-          'pkgpart'  => $part_pkg->getfield('pkgpart'),
-        })
-          ? 'CHECKED '
-          : '',
-        qq!VALUE="ON"> !,
-    qq!<A HREF="${p}edit/part_pkg.cgi?!, $part_pkg->pkgpart, 
-    '">', $part_pkg->getfield('pkg'), '</A>',
-  ;
-}
-
-print qq!<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{typenum} ? "Apply changes" : "Add agent type",
-      qq!">!;
-
-print <<END;
-    </FORM>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/edit/cust_credit.cgi b/htdocs/edit/cust_credit.cgi
deleted file mode 100755
index 35c4d48fe..000000000
--- a/htdocs/edit/cust_credit.cgi
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_credit.cgi,v 1.7 1999-02-28 00:03:33 ivan Exp $
-#
-# Usage: cust_credit.cgi custnum [ -paybatch ]
-#        http://server.name/path/cust_credit?custnum [ -paybatch ]
-#
-# some hooks in here for modifications as well as additions, but needs (lots) more work.
-# also see process/cust_credit.cgi, the script that processes the form.
-#
-# ivan@voicenet.com 96-dec-05
-#
-# paybatch field, differentiates between credits & credits+refunds by commandline
-# ivan@voicenet.com 96-dec-08
-#
-# added (but commented out) sprintf("%.2f" in amount field.  Hmm.
-# ivan@voicenet.com 97-jan-3
-#
-# paybatch stuff thrown out - has checkbox now instead.  
-# (well, sort of.  still passed around for backward compatability and possible editing hook)
-# ivan@voicenet.com 97-apr-21
-#
-# rewrite ivan@sisd.com 98-mar-16
-#
-# $Log: cust_credit.cgi,v $
-# Revision 1.7  1999-02-28 00:03:33  ivan
-# removed misleading comments
-#
-# Revision 1.6  1999/01/25 12:09:52  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:33  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:23  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/23 02:26:06  ivan
-# *** empty log message ***
-#
-# Revision 1.2  1998/12/17 06:16:59  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-
-use strict;
-use vars qw( $cgi $query $custnum $otaker $p1 $crednum $_date $amount $reason );
-use Date::Format;
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(header popurl);
-use FS::Record qw(fields);
-#use FS::cust_credit;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-if ( $cgi->param('error') ) {
-  #$cust_credit = new FS::cust_credit ( {
-  #  map { $_, scalar($cgi->param($_)) } fields('cust_credit')
-  #} );
-  $custnum = $cgi->param('custnum');
-  $amount = $cgi->param('amount');
-  #$refund = $cgi->param('refund');
-  $reason = $cgi->param('reason');
-} else {
-  ($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $custnum = $1;
-  $amount = '';
-  #$refund = 'yes';
-  $reason = '';
-}
-$_date = time;
-
-$otaker = getotaker;
-
-$p1 = popurl(1);
-
-print $cgi->header( '-expires' => 'now' ), header("Post Credit", '');
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-print <<END;
-    <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>
-    <PRE>
-END
-
-$crednum = "";
-print qq!Credit #<B>!, $crednum ? $crednum : " <I>(NEW)</I>", qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
-
-print qq!\nCustomer #<B>$custnum</B><INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
-
-print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
-
-print qq!\nDate: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
-
-print qq!\nAmount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
-print qq!<INPUT TYPE="hidden" NAME="credited" VALUE="">!;
-
-#print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
-
-print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!;
-
-print qq!\nReason <INPUT TYPE="text" NAME="reason" VALUE="$reason" SIZE=72>!;
-
-print <<END;
-</PRE>
-<BR>
-<CENTER><INPUT TYPE="submit" VALUE="Post"></CENTER>
-END
-
-print <<END;
-
-    </FORM>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
deleted file mode 100755
index 9c61c654e..000000000
--- a/htdocs/edit/cust_main.cgi
+++ /dev/null
@@ -1,516 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_main.cgi,v 1.29 2001-05-23 13:47:07 ivan Exp $
-#
-# Usage: cust_main.cgi custnum
-#        http://server.name/path/cust_main.cgi?custnum
-#
-# ivan@voicenet.com 96-nov-29 -> 96-dec-04
-#
-# Blank custnum for new customer.
-# ivan@voicenet.com 96-dec-16
-#
-# referral defaults to blank, to force people to pick something
-# ivan@voicenet.com 97-jun-4
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-28
-#
-# new customer is null, not '#'
-# otaker gotten from &getotaker instead of $ENV{REMOTE_USER}
-# ivan@sisd.com 97-nov-12
-#
-# cgisuidsetup($cgi);
-# no need for old_ fields.
-# now state+county is a select field (took out PA hack)
-# used autoloaded $cust_main->field methods
-# ivan@sisd.com 97-dec-17
-#
-# fixed quoting problems ivan@sisd.com 98-feb-23
-#
-# paydate sql update ivan@sisd.com 98-mar-5
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'day' to 'daytime' because Pg6.3 reserves the day word
-# Added test for paydate in mm-dd-yyyy format for Pg6.3 default format
-#	bmccane@maxbaud.net	98-apr-3
-#
-# fixed one missed day->daytime ivan@sisd.com 98-jul-13
-#
-# $Log: cust_main.cgi,v $
-# Revision 1.29  2001-05-23 13:47:07  ivan
-# bugfix for defaultcountry
-#
-# Revision 1.28  2000/12/26 23:51:40  ivan
-# statedefault & referraldefault config files
-#
-# Revision 1.27  2000/12/03 13:45:15  ivan
-# patch from Jason Spence <thalakan@frys.com>: admin.html doc, autocapgen
-#
-# Revision 1.26  2000/06/27 12:15:50  ivan
-# i18n
-#
-# Revision 1.25  2000/03/02 08:09:38  ivan
-# still need to allow blank expiration dates
-#
-# Revision 1.24  2000/01/30 06:54:50  ivan
-# credit card expiration dates not sticky bug fixed?
-#
-# Revision 1.23  2000/01/27 00:53:14  ivan
-# 5.004_04 workaround
-#
-# Revision 1.22  1999/12/17 02:33:23  ivan
-# argh
-#
-# Revision 1.21  1999/08/23 07:40:38  ivan
-# missing </TD> flag
-#
-# Revision 1.20  1999/08/23 07:08:11  ivan
-# no CGI::Switch for now
-#
-# Revision 1.19  1999/08/21 02:14:25  ivan
-# better error message for no agents
-#
-# Revision 1.18  1999/08/11 15:38:33  ivan
-# fix for perl 5.004_04
-#
-# Revision 1.17  1999/08/10 11:15:45  ivan
-# corrected a misleading comment
-#
-# Revision 1.15  1999/04/14 13:14:54  ivan
-# configuration option to edit referrals of existing customers
-#
-# Revision 1.14  1999/04/14 07:47:53  ivan
-# i18n fixes
-#
-# Revision 1.13  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.12  1999/04/06 11:16:16  ivan
-# give a meaningful error message if you try to create a customer before you've
-# created an agent
-#
-# Revision 1.11  1999/03/25 13:55:10  ivan
-# one-screen new customer entry (including package and service) for simple
-# packages with one svc_acct service
-#
-# Revision 1.10  1999/02/28 00:03:34  ivan
-# removed misleading comments
-#
-# Revision 1.9  1999/02/23 08:09:20  ivan
-# beginnings of one-screen new customer entry and some other miscellania
-#
-# Revision 1.8  1999/01/25 12:09:53  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.7  1999/01/19 05:13:34  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.6  1999/01/18 09:41:24  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.5  1999/01/18 09:22:30  ivan
-# changes to track email addresses for email invoicing
-#
-# Revision 1.4  1998/12/23 08:08:15  ivan
-# fix typo
-#
-# Revision 1.3  1998/12/17 06:17:00  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-
-use strict;
-use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
-             $last $first $ss $company $address1 $address2 $city $zip 
-             $daytime $night $fax @invoicing_list $invoicing_list $payinfo
-             $payname %payby %paybychecked $refnum $otaker $r );
-use vars qw ( $conf $pkgpart $username $password $popnum $ulen $ulen2 );
-#use CGI::Switch;
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-#use FS::Record qw(qsearch qsearchs fields);
-use FS::Record qw(qsearch qsearchs fields dbdef);
-use FS::CGI qw(header popurl itable table);
-use FS::cust_main;
-use FS::agent;
-use FS::part_referral;
-use FS::cust_main_county;
-
-  #for misplaced logic below
-  use FS::part_pkg;
-
-  #for false laziness below
-  use FS::svc_acct_pop;
-
-  #for (other) false laziness below
-  use FS::agent;
-  use FS::type_pkgs;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-
-#get record
-
-if ( $cgi->param('error') ) {
-  $cust_main = new FS::cust_main ( {
-    map { $_, scalar($cgi->param($_)) } fields('cust_main')
-  } );
-  $custnum = $cust_main->custnum;
-  $pkgpart = $cgi->param('pkgpart_svcpart') || '';
-  if ( $pkgpart =~ /^(\d+)_/ ) {
-    $pkgpart = $1;
-  } else {
-    $pkgpart = '';
-  }
-  $username = $cgi->param('username');
-  $password = $cgi->param('_password');
-  $popnum = $cgi->param('popnum');
-} elsif ( $cgi->keywords ) { #editing
-  my( $query ) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $custnum=$1;
-  $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
-  $pkgpart = 0;
-  $username = '';
-  $password = '';
-  $popnum = 0;
-} else {
-  $custnum='';
-  $cust_main = new FS::cust_main ( {} );
-  $cust_main->setfield('otaker',&getotaker);
-  $pkgpart = 0;
-  $username = '';
-  $password = '';
-  $popnum = 0;
-}
-$action = $custnum ? 'Edit' : 'Add';
-
-# top
-
-$p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Customer $action", '');
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-# JRS: Javascript to set up the form for us
-    if ( $conf->exists('autocapnames') ) {
-      print <<END;
-<SCRIPT language="Javascript"><!--
-    
-function capName(name) {
-    var temp = new String();
-    var n = name.toString();
-    
-// Handle "Mc", "Mac", "Von", "Van", etc...
- 
-    if(n.substr(0,2).toLowerCase() == "mc") {
-     temp += "Mc";
-     temp += n.charAt(2).toUpperCase();
-     temp += n.substr(3).toLowerCase();
-     return temp;
-    }
-     
-    if(n.substr(0,3).toLowerCase() == "mac") {
-     temp += "Mac";
-     temp += n.charAt(3).toUpperCase();
-     temp += n.substr(4).toLowerCase();
-     return temp;
-    }
-    if(n.substr(0,3).toLowerCase() == "von") {
-     temp += "Von";
-     temp += n.charAt(3).toUpperCase();
-     temp += n.substr(4).toLowerCase();
-     return temp;
-    }
-    if(n.substr(0,3).toLowerCase() == "van") {
-     temp += "Van";
-     temp += n.charAt(3).toUpperCase();
-     temp += n.substr(4).toLowerCase();
-     return temp;
-    }
-    temp += n.charAt(0).toUpperCase();
-    temp += n.substr(1).toLowerCase();
-    return temp;
-}
-   
-//-->
-</SCRIPT>
-END
-}
-
-print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST NAME="form1">!,
-      qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!,
-      qq!Customer # !, ( $custnum ? $custnum : " (NEW)" ),
-      
-;
-
-# agent
-
-$r = qq!<font color="#ff0000">*</font>!;
-
-@agents = qsearch( 'agent', {} );
-#die "No agents created!" unless @agents;
-die "You have not created any agents.  You must create at least one agent before adding a customer.  Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents;
-$agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
-if ( scalar(@agents) == 1 ) {
-  print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!;
-} else {
-  print qq!<BR><BR>${r}Agent <SELECT NAME="agentnum" SIZE="1">!;
-  my $agent;
-  foreach $agent (sort {
-    $a->agent cmp $b->agent;
-  } @agents) {
-      print '<OPTION VALUE="', $agent->agentnum, '"',
-      " SELECTED"x($agent->agentnum==$agentnum),
-      ">", $agent->agentnum,": ", $agent->agent;
-  }
-  print "</SELECT>";
-}
-
-#referral
-
-$refnum = $cust_main->refnum || $conf->config('referraldefault') || 0;
-if ( $custnum && ! $conf->exists('editreferrals') ) {
-  print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
-} else {
-  my(@referrals) = qsearch('part_referral',{});
-  if ( scalar(@referrals) == 1 ) {
-    $refnum ||= $referrals[0]->refnum;
-    print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
-  } else {
-    print qq!<BR><BR>${r}Referral <SELECT NAME="refnum" SIZE="1">!;
-    print "<OPTION> " unless $refnum;
-    my($referral);
-    foreach $referral (sort {
-      $a->refnum <=> $b->refnum;
-    } @referrals) {
-      print "<OPTION" . " SELECTED"x($referral->refnum==$refnum),
-      ">", $referral->refnum, ": ", $referral->referral;
-    }
-    print "</SELECT>";
-  }
-}
-
-
-# contact info
-
-($last,$first,$ss,$company,$address1,$address2,$city,$zip)=(
-  $cust_main->last,
-  $cust_main->first,
-  $cust_main->ss,
-  $cust_main->company,
-  $cust_main->address1,
-  $cust_main->address2,
-  $cust_main->city,
-  $cust_main->zip,
-);
-
-print "<BR><BR>Contact information", &itable("#c0c0c0"), <<END;
-<TR><TH ALIGN="right">${r}Contact name<BR>(last, first)</TH><TD COLSPAN=3>
-END
-
-if ( $conf->exists('autocapnames') ) {
-  print <<END;
-<INPUT TYPE="text" NAME="last" VALUE="$last" onChange="updateUsername();">, 
-<INPUT TYPE="text" NAME="first" VALUE="$first" onChange="updateUsername();">
-END
-} else {
-  print <<END;
-<INPUT TYPE="text" NAME="last" VALUE="$last">, 
-<INPUT TYPE="text" NAME="first" VALUE="$first">
-END
-}
-
-print <<END;
-</TD><TD ALIGN="right">SS#</TD><TD><INPUT TYPE="text" NAME="ss" VALUE="$ss" SIZE=11></TD></TR>
-<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="company" VALUE="$company" SIZE=70></TD></TR>
-<TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=70></TD></TR>
-<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=70></TD></TR>
-<TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="state" SIZE="1">
-END
-
-$cust_main->country( $conf->config('countrydefault') || 'US' )
-  unless $cust_main->country;
-$cust_main->state( $conf->config('statedefault') || 'CA' )
-  unless $cust_main->state || $cust_main->country ne 'US';
-foreach ( qsearch('cust_main_county',{}) ) {
-  print "<OPTION";
-  print " SELECTED" if ( $cust_main->state eq $_->state
-                         && $cust_main->county eq $_->county 
-                         && $cust_main->country eq $_->country
-                       );
-  print ">",$_->state;
-  print " (",$_->county,")" if $_->county;
-  print " / ", $_->country;
-}
-print qq!</SELECT></TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10></TD></TR>!;
-
-($daytime,$night,$fax)=(
-  $cust_main->daytime,
-  $cust_main->night,
-  $cust_main->fax,
-);
-
-print <<END;
-<TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18></TD></TR>
-<TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18></TD></TR>
-<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12></TD></TR>
-END
-
-print "</TABLE>$r required fields<BR>";
-
-# billing info
-
-sub expselect {
-  my $prefix = shift;
-  my( $m, $y ) = (0, 0);
-  if ( scalar(@_) ) {
-    my $date = shift || '01-2000';
-    if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
-      ( $m, $y ) = ( $2, $1 );
-    } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-      ( $m, $y ) = ( $1, $3 );
-    } else {
-      die "unrecognized expiration date format: $date";
-    }
-  }
-
-  my $return = qq!<SELECT NAME="$prefix!. qq!_month" SIZE="1">!;
-  for ( 1 .. 12 ) {
-    $return .= "<OPTION";
-    $return .= " SELECTED" if $_ == $m;
-    $return .= ">$_";
-  }
-  $return .= qq!</SELECT>/<SELECT NAME="$prefix!. qq!_year" SIZE="1">!;
-  for ( 2001 .. 2037 ) {
-    $return .= "<OPTION";
-    $return .= " SELECTED" if $_ == $y;
-    $return .= ">$_";
-  }
-  $return .= "</SELECT>";
-
-  $return;
-}
-
-print "<BR>Billing information", &itable("#c0c0c0"),
-      qq!<TR><TD><INPUT TYPE="checkbox" NAME="tax" VALUE="Y"!;
-print qq! CHECKED! if $cust_main->tax eq "Y";
-print qq!>Tax Exempt</TD></TR>!;
-print qq!<TR><TD><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
-@invoicing_list = $cust_main->invoicing_list;
-print qq! CHECKED!
-  if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
-print qq!>Postal mail invoice</TD></TR>!;
-$invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
-print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
-
-print "<TR><TD>Billing type</TD></TR>",
-      "</TABLE>",
-      &table("#c0c0c0"), "<TR>";
-
-($payinfo, $payname)=(
-  $cust_main->payinfo,
-  $cust_main->payname,
-);
-
-%payby = (
-  'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>${r}Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
-  'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
-);
-%paybychecked = (
-  'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>${r}Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
-  'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
-);
-for (qw(CARD BILL COMP)) {
-  print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
-  if ($cust_main->payby eq "$_") {
-    print qq! CHECKED> $paybychecked{$_}</TD>!;
-  } else {
-    print qq!> $payby{$_}</TD>!;
-  }
-}
-
-print "</TR></TABLE>$r required fields for each billing type";
-
-unless ( $custnum ) {
-  # pry the wrong place for this logic.  also pretty expensive
-  #use FS::part_pkg;
-
-  #false laziness, copied from FS::cust_pkg::order
-  my $pkgpart;
-  if ( scalar(@agents) == 1 ) {
-    # $pkgpart->{PKGPART} is true iff $custnum may purchase $pkgpart
-    my($agent)=qsearchs('agent',{'agentnum'=> $agentnum });
-    $pkgpart = $agent->pkgpart_hashref;
-  } else {
-    #can't know (agent not chosen), so, allow all
-    my %typenum;
-    foreach my $agent ( @agents ) {
-      next if $typenum{$agent->typenum}++;
-      #fixed in 5.004_05 #$pkgpart->{$_}++ foreach keys %{ $agent->pkgpart_hashref }
-      foreach ( keys %{ $agent->pkgpart_hashref } ) { $pkgpart->{$_}++; } #5.004_04 workaround
-    }
-  }
-  #eslaf
-
-  my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } }
-    qsearch( 'part_pkg', {} );
-
-  if ( @part_pkg ) {
-
-    print "<BR><BR>First package", &itable("#c0c0c0"),
-          qq!<TR><TD COLSPAN=2><SELECT NAME="pkgpart_svcpart">!;
-
-    print qq!<OPTION VALUE="">(none)!;
-
-    foreach my $part_pkg ( @part_pkg ) {
-      print qq!<OPTION VALUE="!,
-#              $part_pkg->pkgpart. "_". $pkgpart{ $part_pkg->pkgpart }, '"';
-              $part_pkg->pkgpart. "_". $part_pkg->svcpart, '"';
-      print " SELECTED" if $pkgpart && ( $part_pkg->pkgpart == $pkgpart );
-      print ">", $part_pkg->pkg, " - ", $part_pkg->comment;
-    }
-    print "</SELECT></TD></TR>";
-
-    #false laziness: (mostly) copied from edit/svc_acct.cgi
-    #$ulen = $svc_acct->dbdef_table->column('username')->length;
-    $ulen = dbdef->table('svc_acct')->column('username')->length;
-    $ulen2 = $ulen+2;
-    print <<END;
-<TR><TD ALIGN="right">Username</TD>
-<TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
-<TR><TD ALIGN="right">Password</TD>
-<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8>
-(blank to generate)</TD></TR>
-END
-    print qq!<TR><TD ALIGN="right">POP</TD><TD><SELECT NAME="popnum" SIZE=1><OPTION> !;
-    my($svc_acct_pop);
-    foreach $svc_acct_pop ( qsearch ('svc_acct_pop',{} ) ) {
-    print qq!<OPTION VALUE="!, $svc_acct_pop->popnum, '"',
-          ( $popnum && $svc_acct_pop->popnum == $popnum ) ? ' SELECTED' : '', ">", 
-          $svc_acct_pop->popnum, ": ", 
-          $svc_acct_pop->city, ", ",
-          $svc_acct_pop->state,
-          " (", $svc_acct_pop->ac, ")/",
-          $svc_acct_pop->exch, "\n"
-        ;
-    }
-    print "</SELECT></TD></TR></TABLE>";
-  }
-}
-
-$otaker = $cust_main->otaker;
-print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!,
-      qq!<BR><BR><INPUT TYPE="submit" VALUE="!,
-      $custnum ?  "Apply Changes" : "Add Customer", qq!">!,
-      "</FORM></BODY></HTML>",
-;
-
diff --git a/htdocs/edit/cust_main_county-expand.cgi b/htdocs/edit/cust_main_county-expand.cgi
deleted file mode 100755
index 783e92826..000000000
--- a/htdocs/edit/cust_main_county-expand.cgi
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_main_county-expand.cgi,v 1.6 1999-01-25 12:09:54 ivan Exp $
-#
-# ivan@sisd.com 97-dec-16
-#
-# Changes to allow page to work at a relative position in server
-#	bmccane@maxbaud.net	98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: cust_main_county-expand.cgi,v $
-# Revision 1.6  1999-01-25 12:09:54  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:35  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:25  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 06:17:01  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.2  1998/11/18 09:01:38  ivan
-# i18n! i18n!
-#
-
-use strict;
-use vars qw( $cgi $taxnum $cust_main_county $p1 $delim $expansion );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar popurl);
-use FS::cust_main_county;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-if ( $cgi->param('error') ) {
-  $taxnum = $cgi->param('taxnum');
-  $delim = $cgi->param('delim');
-  $expansion = $cgi->param('expansion');
-} else {
-  my ($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/
-    or die "Illegal taxnum!";
-  $taxnum = $1;
-  $delim = 'n';
-  $expansion = '';
-}
-
-$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum});
-die "Can't expand entry!" if $cust_main_county->getfield('county');
-
-$p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Tax Rate (expand)", menubar(
-  'Main Menu' => popurl(2),
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print <<END;
-    <FORM ACTION="${p1}process/cust_main_county-expand.cgi" METHOD=POST>
-      <INPUT TYPE="hidden" NAME="taxnum" VALUE="$taxnum">
-      Separate by
-END
-print '<INPUT TYPE="radio" NAME="delim" VALUE="n"';
-print ' CHECKED' if $delim eq 'n';
-print '>line (rumor has it broken on some browsers) or',
-      '<INPUT TYPE="radio" NAME="delim" VALUE="s"';
-print ' CHECKED' if $delim eq 's';
-print '>whitespace.';
-print <<END;
-      <BR><INPUT TYPE="submit" VALUE="Submit">
-      <BR><TEXTAREA NAME="expansion" ROWS=100>$expansion</TEXTAREA>
-    </FORM>
-    </CENTER>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/edit/cust_main_county.cgi b/htdocs/edit/cust_main_county.cgi
deleted file mode 100755
index 747a63df6..000000000
--- a/htdocs/edit/cust_main_county.cgi
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_main_county.cgi,v 1.8 1999-04-09 04:22:34 ivan Exp $
-#
-# ivan@sisd.com 97-dec-13-16
-#
-# Changes to allow page to work at a relative position in server
-# Changed tax field to accept 6 chars (MO uses 6.1%)
-#	bmccane@maxbaud.net	98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-# 
-# $Log: cust_main_county.cgi,v $
-# Revision 1.8  1999-04-09 04:22:34  ivan
-# also table()
-#
-# Revision 1.7  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.6  1999/01/25 12:09:55  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:36  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:26  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 06:17:02  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.2  1998/11/18 09:01:39  ivan
-# i18n! i18n!
-#
-
-use strict;
-use vars qw( $cgi $cust_main_county );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar popurl table);
-use FS::cust_main_county;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-print $cgi->header( '-expires' => 'now' ), header("Edit tax rates", menubar(
-  'Main Menu' => popurl(2),
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print qq!<FORM ACTION="!, popurl(1),
-    qq!process/cust_main_county.cgi" METHOD=POST>!, &table(), <<END;
-      <TR>
-        <TH><FONT SIZE=-1>Country</FONT></TH>
-        <TH><FONT SIZE=-1>State</FONT></TH>
-        <TH>County</TH>
-        <TH><FONT SIZE=-1>Tax</FONT></TH>
-      </TR>
-END
-
-foreach $cust_main_county ( qsearch('cust_main_county',{}) ) {
-  my($hashref)=$cust_main_county->hashref;
-  print <<END;
-      <TR>
-        <TD>$hashref->{country}</TD>
-END
-
-  print "<TD>", $hashref->{state}
-      ? $hashref->{state}
-      : '(ALL)'
-    , "</TD>";
-
-  print "<TD>", $hashref->{county}
-      ? $hashref->{county}
-      : '(ALL)'
-    , "</TD>";
-
-  print qq!<TD><INPUT TYPE="text" NAME="tax!, $hashref->{taxnum},
-        qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6>%</TD></TR>!;
-END
-
-}
-
-print <<END;
-    </TABLE>
-    <INPUT TYPE="submit" VALUE="Apply changes">
-    </FORM>
-    </CENTER>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/edit/cust_pay.cgi b/htdocs/edit/cust_pay.cgi
deleted file mode 100755
index 5dee76ed9..000000000
--- a/htdocs/edit/cust_pay.cgi
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_pay.cgi,v 1.6 1999-02-28 00:03:35 ivan Exp $
-#
-# Usage: cust_pay.cgi invnum
-#        http://server.name/path/cust_pay.cgi?invnum
-#
-# some hooks for modifications as well as additions, but needs work.
-#
-# ivan@voicenet.com 96-dec-11
-#
-# rewrite ivan@sisd.com 98-mar-16
-#
-# $Log: cust_pay.cgi,v $
-# Revision 1.6  1999-02-28 00:03:35  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/01/25 12:09:56  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.4  1999/01/19 05:13:37  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 09:41:27  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.2  1998/12/17 06:17:03  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-
-use strict;
-use vars qw( $cgi $invnum $p1 $_date $payby $payinfo $paid );
-use Date::Format;
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl);
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-if ( $cgi->param('error') ) {
-  $invnum = $cgi->param('invnum');
-  $paid = $cgi->param('paid');
-  $payby = $cgi->param('payby');
-  $payinfo = $cgi->param('payinfo');
-} else {
-  my ($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $invnum = $1;
-  $paid = '';
-  $payby = "BILL";
-  $payinfo = "";
-}
-$_date = time;
-
-$p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Enter payment", '');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print <<END;
-    <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
-    <HR><PRE>
-END
-
-print qq!Invoice #<B>$invnum</B><INPUT TYPE="hidden" NAME="invnum" VALUE="$invnum">!;
-
-print qq!<BR>Date: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
-
-print qq!<BR>Amount \$<INPUT TYPE="text" NAME="paid" VALUE="$paid" SIZE=8 MAXLENGTH=8>!;
-
-print qq!<BR>Payby: <B>$payby</B><INPUT TYPE="hidden" NAME="payby" VALUE="$payby">!;
-
-#payinfo (check # now as payby="BILL" hardcoded.. what to do later?)
-print qq!<BR>Check #<INPUT TYPE="text" NAME="payinfo" VALUE="$payinfo">!;
-
-#paybatch
-print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
-
-print <<END;
-</PRE>
-<BR>
-<INPUT TYPE="submit" VALUE="Post payment">
-END
-
-print <<END;
-
-    </FORM>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/edit/cust_pkg.cgi b/htdocs/edit/cust_pkg.cgi
deleted file mode 100755
index b3c92249f..000000000
--- a/htdocs/edit/cust_pkg.cgi
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_pkg.cgi,v 1.8 1999-07-21 07:34:13 ivan Exp $
-#
-# this is for changing packages around, not editing things within the package
-#
-# Usage: cust_pkg.cgi custnum
-#        http://server.name/path/cust_pkg.cgi?custnum
-#
-# started with /sales/add/cust_pkg.cgi, which added packages
-# ivan@voicenet.com 97-jan-5, 97-mar-21
-#
-# Rewrote for new API
-# ivan@voicenet.com 97-jul-7
-#
-# FS::Search is no more, &cgisuidsetup needs $cgi, ivan@sisd.com 98-mar-7 
-#
-# Changes to allow page to work at a relative position in server
-# Changed to display packages 2-wide in a table
-#       bmccane@maxbaud.net     98-apr-3
-#
-# fixed a pretty cool bug from above which caused a visual glitch ivan@sisd.com
-# 98-jun-1
-#
-# $Log: cust_pkg.cgi,v $
-# Revision 1.8  1999-07-21 07:34:13  ivan
-# links to package browse and agent type edit if there aren't any packages to
-# order.  thanks to "Tech Account" <techy@orac.hq.org>
-#
-# Revision 1.7  1999/04/14 01:03:01  ivan
-# oops, in 1.2 tree, can't do searches until [cgi|admin]suidsetup,
-# bug is hidden by mod_perl persistance
-#
-# Revision 1.6  1999/02/28 00:03:36  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/02/07 09:59:18  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:13:38  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 09:41:28  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.2  1998/12/17 06:17:04  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-
-use strict;
-use vars qw( $cgi %pkg %comment $custnum $p1 @cust_pkg 
-             $cust_main $agent $type_pkgs $count %remove_pkg $pkgparts );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header popurl);
-use FS::part_pkg;
-use FS::type_pkgs;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-%pkg = ();
-%comment = ();
-foreach (qsearch('part_pkg', {})) {
-  $pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
-  $comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
-}
-
-if ( $cgi->param('error') ) {
-  $custnum = $cgi->param('custnum');
-  %remove_pkg = map { $_ => 1 } $cgi->param('remove_pkg');
-} else {
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $custnum = $1;
-  undef %remove_pkg;
-}
-
-$p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Add/Edit Packages", '');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print qq!<FORM ACTION="${p1}process/cust_pkg.cgi" METHOD=POST>!;
-
-print qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
-
-#current packages
-@cust_pkg = qsearch('cust_pkg',{ 'custnum' => $custnum, 'cancel' => '' } );
-
-if (@cust_pkg) {
-  print <<END;
-Current packages - select to remove (services are moved to a new package below)
-<BR><BR>
-END
-
-  my ($count) = 0 ;
-  print qq!<TABLE>! ;
-  foreach (@cust_pkg) {
-    print '<TR>' if $count == 0;
-    my($pkgnum,$pkgpart)=( $_->getfield('pkgnum'), $_->getfield('pkgpart') );
-    print qq!<TD><INPUT TYPE="checkbox" NAME="remove_pkg" VALUE="$pkgnum"!;
-    print " CHECKED" if $remove_pkg{$pkgnum};
-    print qq!>$pkgnum: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n!;
-    $count ++ ;
-    if ($count == 2)
-    {
-      $count = 0 ;
-      print qq!</TR>\n! ;
-    }
-  }
-  print qq!</TABLE><BR><BR>!;
-}
-
-print <<END;
-Order new packages<BR><BR>
-END
-
-$cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
-$agent = qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
-
-$count = 0;
-$pkgparts = 0;
-print qq!<TABLE>!;
-foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
-  $pkgparts++;
-  my($pkgpart)=$type_pkgs->pkgpart;
-  print qq!<TR>! if ( $count == 0 );
-  my $value = $cgi->param("pkg$pkgpart") || 0;
-  print <<END;
-  <TD>
-  <INPUT TYPE="text" NAME="pkg$pkgpart" VALUE="$value" SIZE="2" MAXLENGTH="2">
-  $pkgpart: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n
-END
-  $count ++ ;
-  if ( $count == 2 ) {
-    print qq!</TR>\n! ;
-    $count = 0;
-  }
-}
-print qq!</TABLE>!;
-
-unless ( $pkgparts ) {
-  my $p2 = popurl(2);
-  my $typenum = $agent->typenum;
-  my $agent_type = qsearchs( 'agent_type', { 'typenum' => $typenum } );
-  my $atype = $agent_type->atype;
-  print <<END;
-(No <a href="${p2}browse/part_pkg.cgi">package definitions</a>, or agent type
-<a href="${p2}edit/agent_type.cgi?$typenum">$atype</a> not allowed to purchase
-any packages.)
-END
-}
-
-#submit
-print <<END;
-<P><INPUT TYPE="submit" VALUE="Order">
-    </FORM>
-  </BODY>
-</HTML>
-END
diff --git a/htdocs/edit/part_pkg.cgi b/htdocs/edit/part_pkg.cgi
deleted file mode 100755
index f7ade88c8..000000000
--- a/htdocs/edit/part_pkg.cgi
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: part_pkg.cgi,v 1.9 1999-02-07 09:59:19 ivan Exp $
-#
-# part_pkg.cgi: Add/Edit package (output form)
-#
-# ivan@sisd.com 97-dec-10
-#
-# Changes to allow page to work at a relative position in server
-# Changed to display services 2-wide in table
-#       bmccane@maxbaud.net     98-apr-3
-#
-# use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
-#
-# $Log: part_pkg.cgi,v $
-# Revision 1.9  1999-02-07 09:59:19  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.8  1999/01/19 05:13:39  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.7  1999/01/18 09:41:29  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.6  1998/12/17 06:17:05  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.5  1998/11/21 07:12:26  ivan
-# *** empty log message ***
-#
-# Revision 1.4  1998/11/21 07:11:08  ivan
-# *** empty log message ***
-#
-# Revision 1.3  1998/11/21 07:07:40  ivan
-# popurl, bugfix
-#
-# Revision 1.2  1998/11/15 13:14:55  ivan
-# first pass as per-user custom pricing
-#
-
-use strict;
-use vars qw( $cgi $part_pkg $action $query $hashref $part_svc $count );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::part_pkg;
-use FS::part_svc;
-use FS::pkg_svc;
-use FS::CGI qw(header menubar popurl);
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
-  $cgi->param('clone', $1);
-} else {
-  $cgi->param('clone', '');
-}
-if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
-  $cgi->param('pkgnum', $1);
-} else {
-  $cgi->param('pkgnum', '');
-}
-
-($query) = $cgi->keywords;
-$action = '';
-$part_pkg = '';
-if ( $cgi->param('error') ) {
-  $part_pkg = new FS::part_pkg ( {
-    map { $_, scalar($cgi->param($_)) } fields('part_pkg')
-  } );
-}
-if ( $cgi->param('clone') ) {
-  $action='Custom Pricing';
-  my $old_part_pkg =
-    qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
-  $part_pkg ||= $old_part_pkg->clone;
-} elsif ( $query && $query =~ /^(\d+)$/ ) {
-  $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
-} else {
-  $part_pkg ||= new FS::part_pkg {};
-}
-$action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
-$hashref = $part_pkg->hashref;
-
-print $cgi->header( '-expires' => 'now' ), header("$action Package Definition", menubar(
-  'Main Menu' => popurl(2),
-  'View all packages' => popurl(2). 'browse/part_pkg.cgi',
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>';
-
-if ( $cgi->param('clone') ) {
-  print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
-}
-if ( $cgi->param('pkgnum') ) {
-  print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $cgi->param('pkgnum'), qq!">!;
-}
-
-print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
-      "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
-
-print <<END;
-<PRE>
-Package (customer-visable)          <INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}">
-Comment (customer-hidden)           <INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}">
-Setup fee for this package          <INPUT TYPE="text" NAME="setup" VALUE="$hashref->{setup}">
-Recurring fee for this package      <INPUT TYPE="text" NAME="recur" VALUE="$hashref->{recur}">
-Frequency (months) of recurring fee <INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}">
-
-</PRE>
-
-END
-
-unless ( $cgi->param('clone') ) {
-  print <<END;
-Enter the quantity of each service this package includes.<BR><BR>
-<TABLE BORDER><TR><TH><FONT SIZE=-1>Quan.</FONT></TH><TH>Service</TH>
-		  <TH><FONT SIZE=-1>Quan.</FONT></TH><TH>Service</TH></TR>
-END
-}
-
-$count = 0;
-foreach $part_svc ( ( qsearch( 'part_svc', {} ) ) ) {
-  my $svcpart = $part_svc->svcpart;
-  my $pkg_svc = qsearchs( 'pkg_svc', {
-    'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
-    'svcpart'  => $svcpart,
-  } ) || new FS::pkg_svc ( {
-    'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
-    'svcpart'  => $svcpart,
-    'quantity' => 0,
-  });
-  #? #next unless $pkg_svc;
-
-  unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) {
-    print '<TR>' if $count == 0 ;
-    print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=3 VALUE="!,
-          $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0,
-          qq!"></TD><TD><A HREF="part_svc.cgi?!,$part_svc->svcpart,
-          qq!">!, $part_svc->getfield('svc'), "</A></TD>";
-    $count++;
-    if ($count == 2)
-    {
-      print '</TR>';
-      $count = 0;
-    }
-  } else {
-    print qq!<INPUT TYPE="hidden" NAME="pkg_svc$svcpart" VALUE="!,
-          $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0, qq!">\n!;
-  }
-}
-
-unless ( $cgi->param('clone') ) {
-  print qq!</TR>! if ($count != 0) ;
-  print "</TABLE>";
-}
-
-print qq!<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{pkgpart} ? "Apply changes" : "Add package",
-      qq!">!;
-
-print <<END;
-    </FORM>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/edit/part_referral.cgi b/htdocs/edit/part_referral.cgi
deleted file mode 100755
index 24ac9dd82..000000000
--- a/htdocs/edit/part_referral.cgi
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: part_referral.cgi,v 1.6 1999-04-07 11:43:23 ivan Exp $
-#
-# ivan@sisd.com 98-feb-23
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# confisuing typo on submit button ivan@sisd.com 98-jun-14
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: part_referral.cgi,v $
-# Revision 1.6  1999-04-07 11:43:23  ivan
-# pick up errors right away, leave input
-#
-# Revision 1.5  1999/02/07 09:59:20  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:13:41  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 09:41:30  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.2  1998/12/17 06:17:06  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-
-use strict;
-use vars qw( $cgi $part_referral $action $hashref $p1 $query );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::part_referral;
-use FS::CGI qw(header menubar popurl);
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-if ( $cgi->param('error') ) {
-  $part_referral = new FS::part_referral ( {
-    map { $_, scalar($cgi->param($_)) } fields('part_referral')
-  } );
-} elsif ( $cgi->keywords ) {
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $part_referral = qsearchs( 'part_referral', { 'refnum' => $1 } );
-} else { #adding
-  $part_referral = new FS::part_referral {};
-}
-$action = $part_referral->refnum ? 'Edit' : 'Add';
-$hashref = $part_referral->hashref;
-
-$p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("$action Referral", menubar(
-  'Main Menu' => popurl(2),
-  'View all referrals' => popurl(2). "browse/part_referral.cgi",
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print qq!<FORM ACTION="${p1}process/part_referral.cgi" METHOD=POST>!;
-
-print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$hashref->{refnum}">!,
-      "Referral #", $hashref->{refnum} ? $hashref->{refnum} : "(NEW)";
-
-print <<END;
-<PRE>
-Referral   <INPUT TYPE="text" NAME="referral" SIZE=32 VALUE="$hashref->{referral}">
-</PRE>
-END
-
-print qq!<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{refnum} ? "Apply changes" : "Add referral",
-      qq!">!;
-
-print <<END;
-    </FORM>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/edit/part_svc.cgi b/htdocs/edit/part_svc.cgi
deleted file mode 100755
index e82306d74..000000000
--- a/htdocs/edit/part_svc.cgi
+++ /dev/null
@@ -1,208 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: part_svc.cgi,v 1.14 2001-05-30 14:42:11 ivan Exp $
-#
-# ivan@sisd.com 97-nov-14
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
-#
-# $Log: part_svc.cgi,v $
-# Revision 1.14  2001-05-30 14:42:11  ivan
-# Adam Rose <adamr@eaze.net>: "In the /edit/part_svc.cgi is there a need to add
-# another section for svc_www?".  Yes.  Thanks Adam.
-#
-# Revision 1.13  2000/06/15 11:10:31  ivan
-# update to the inline documentation, hopefully will make things more clear
-#
-# Revision 1.12  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.11  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.10  1999/04/08 13:01:50  ivan
-#  [ AND DOCUMENT! ] all svc_acct services should have a default
-#  or fixed shell
-#
-# Revision 1.9  1999/02/23 08:09:21  ivan
-# beginnings of one-screen new customer entry and some other miscellania
-#
-# Revision 1.8  1999/02/07 09:59:21  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.7  1999/01/19 05:13:42  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.6  1999/01/18 09:41:31  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.5  1998/12/30 23:03:21  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.4  1998/12/17 06:17:07  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.3  1998/11/21 06:43:26  ivan
-# visual
-#
-
-use strict;
-use vars qw( $cgi $part_svc $action $query $hashref $p %defs $svcdb );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs fields);
-use FS::part_svc;
-use FS::CGI qw(header menubar popurl table);
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-if ( $cgi->param('error') ) {
-  $part_svc = new FS::part_svc ( {
-    map { $_, scalar($cgi->param($_)) } fields('part_svc')
-  } );
-} elsif ( $cgi->keywords ) {
-  my ($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $part_svc=qsearchs('part_svc',{'svcpart'=>$1});
-} else { #adding
-  $part_svc = new  FS::part_svc {};
-}
-$action = $part_svc->svcpart ? 'Edit' : 'Add';
-$hashref = $part_svc->hashref;
-
-$p = popurl(2);
-print $cgi->header( '-expires' => 'now' ), header("$action Service Definition", menubar(
-  'Main Menu' => $p,
-  'View all services' => "${p}browse/part_svc.cgi",
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print '<FORM ACTION="', popurl(1), 'process/part_svc.cgi" METHOD=POST>';
-
-print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$hashref->{svcpart}">!,
-      "Service Part #", $hashref->{svcpart} ? $hashref->{svcpart} : "(NEW)";
-
-print <<END;
-<PRE>
-Service  <INPUT TYPE="text" NAME="svc" VALUE="$hashref->{svc}">
-</PRE>
-Services are items you offer to your customers.
-<UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
-    <LI>svc_domain - Virtual domains
-    <LI>svc_acct_sm - Virtual domain mail aliasing
-    <LI>svc_www - Virtual domain website
-END
-#    <LI>svc_charge - One-time charges (Partially unimplemented)
-#    <LI>svc_wo - Work orders (Partially unimplemented)
-print <<END;
-</UL>
-For the selected table, you can give fields default or fixed (unchangable)
-values.  For example, a SLIP/PPP account may have a default (or perhaps fixed)
-<B>slipip</B> of <B>0.0.0.0</B>, while a POP mailbox will probably have a fixed
-blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
-<B>/usr/bin/passwd</B>.
-<BR><BR>
-END
-print &table(), '<TR><TH>Table<SELECT NAME="svcdb" SIZE=1>',
-      map '<OPTION'. ' SELECTED'x($_ eq $hashref->{svcdb}). ">$_\n", qw(
-        svc_acct svc_domain svc_acct_sm svc_www
-      );
-      print "</SELECT>";
-#  svc_acct svc_domain svc_acct_sm svc_charge svc_wo
-
-print <<END;
-</TH><TH>Field</TH>
-<TH COLSPAN=2>Modifier</TH></TR>
-END
-
-#these might belong somewhere else for other user interfaces 
-#pry need to eventually create stuff that's shared amount UIs
-%defs = (
-  'svc_acct' => {
-    'dir'       => 'Home directory',
-    'uid'       => 'UID (set to fixed and blank for dial-only)',
-    'slipip'    => 'IP address (set to fixed and blank to disable dialin)',
-    'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
-    'username'  => 'Username',
-    'quota'     => '(unimplemented)',
-    '_password' => 'Password',
-    'gid'       => 'GID (when blank, defaults to UID)',
-    'shell'     => 'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file)',
-    'finger'    => 'GECOS',
-  },
-  'svc_domain' => {
-    'domain'    => 'Domain',
-  },
-  'svc_acct_sm' => {
-    'domuser'   => 'domuser@virtualdomain.com',
-    'domuid'    => 'UID where domuser@virtualdomain.com mail is forwarded',
-    'domsvc'    => 'svcnum from svc_domain for virtualdomain.com',
-  },
-  'svc_charge' => {
-    'amount'    => 'amount',
-  },
-  'svc_wo' => {
-    'worker'    => 'Worker',
-    '_date'      => 'Date',
-  },
-  'svc_www' => {
-    #'recnum' => '',
-    #'usersvc' => '',
-  },
-);
-
-#  svc_acct svc_domain svc_acct_sm svc_charge svc_wo
-foreach $svcdb ( qw(
-  svc_acct svc_domain svc_acct_sm svc_www
-) ) {
-
-  my(@rows)=map { /^${svcdb}__(.*)$/; $1 }
-    grep ! /_flag$/,
-      grep /^${svcdb}__/,
-        fields('part_svc');
-  my($rowspan)=scalar(@rows);
-
-  my($ptmp)="<TD ROWSPAN=$rowspan>$svcdb</TD>";
-  my($row);
-  foreach $row (@rows) {
-    my $value = $part_svc->getfield($svcdb. '__'. $row);
-    my $flag = $part_svc->getfield($svcdb. '__'. $row. '_flag');
-    print "<TR>$ptmp<TD>$row";
-    print "- <FONT SIZE=-1>$defs{$svcdb}{$row}</FONT>"
-      if defined $defs{$svcdb}{$row};
-    print "</TD>";
-    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE=""!.
-      ' CHECKED'x($flag eq ''). ">Off</TD>";
-    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE="D"!.
-      ' CHECKED'x($flag eq 'D'). ">Default ";
-    print qq!<INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE="F"!.
-      ' CHECKED'x($flag eq 'F'). ">Fixed ";
-    print qq!<INPUT TYPE="text" NAME="${svcdb}__${row}" VALUE="$value">!,
-      "</TD></TR>\n";
-    $ptmp='';
-  }
-}
-print "</TABLE>";
-
-print qq!\n<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{svcpart} ? "Apply changes" : "Add service",
-      qq!">!;
-
-print <<END;
-
-    </FORM>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/edit/process/agent.cgi b/htdocs/edit/process/agent.cgi
deleted file mode 100755
index c1b397aac..000000000
--- a/htdocs/edit/process/agent.cgi
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: agent.cgi,v 1.7 1999-01-25 12:09:57 ivan Exp $
-#
-# ivan@sisd.com 97-dec-12
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: agent.cgi,v $
-# Revision 1.7  1999-01-25 12:09:57  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.6  1999/01/19 05:13:47  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 22:47:49  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.4  1998/12/30 23:03:26  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.3  1998/12/17 08:40:16  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.2  1998/11/23 07:52:29  ivan
-# *** empty log message ***
-#
-
-use strict;
-use vars qw ( $cgi $agentnum $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::agent;
-use FS::CGI qw(popurl);
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$agentnum = $cgi->param('agentnum');
-
-$old = qsearchs('agent',{'agentnum'=>$agentnum}) if $agentnum;
-
-$new = new FS::agent ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('agent')
-} );
-
-if ( $agentnum ) {
-  $error=$new->replace($old);
-} else {
-  $error=$new->insert;
-  $agentnum=$new->getfield('agentnum');
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "agent.cgi?". $cgi->query_string );
-} else { 
-  print $cgi->redirect(popurl(3). "browse/agent.cgi");
-}
-
diff --git a/htdocs/edit/process/agent_type.cgi b/htdocs/edit/process/agent_type.cgi
deleted file mode 100755
index 99c54ab3b..000000000
--- a/htdocs/edit/process/agent_type.cgi
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: agent_type.cgi,v 1.7 1999-01-25 12:09:58 ivan Exp $
-#
-# ivan@sisd.com 97-dec-11
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: agent_type.cgi,v $
-# Revision 1.7  1999-01-25 12:09:58  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.6  1999/01/19 05:13:48  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 22:47:50  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.4  1998/12/30 23:03:27  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.3  1998/12/17 08:40:17  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.2  1998/11/21 07:49:20  ivan
-# s/CGI::Request/CGI.pm/
-#
-
-use strict;
-use vars qw ( $cgi $typenum $old $new $error $part_pkg );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::CGI qw( popurl);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::agent_type;
-use FS::type_pkgs;
-use FS::part_pkg;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$typenum = $cgi->param('typenum');
-$old = qsearchs('agent_type',{'typenum'=>$typenum}) if $typenum;
-
-$new = new FS::agent_type ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('agent_type')
-} );
-
-if ( $typenum ) {
-  $error=$new->replace($old);
-} else {
-  $error=$new->insert;
-  $typenum=$new->getfield('typenum');
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "agent_type.cgi?". $cgi->query_string );
-  exit;
-}
-
-foreach $part_pkg (qsearch('part_pkg',{})) {
-  my($pkgpart)=$part_pkg->getfield('pkgpart');
-
-  my($type_pkgs)=qsearchs('type_pkgs',{
-      'typenum' => $typenum,
-      'pkgpart' => $pkgpart,
-  });
-  if ( $type_pkgs && ! $cgi->param("pkgpart$pkgpart") ) {
-    my($d_type_pkgs)=$type_pkgs; #need to save $type_pkgs for below.
-    $error=$d_type_pkgs->delete;
-    die $error if $error;
-
-  } elsif ( $cgi->param("pkgpart$pkgpart")
-            && ! $type_pkgs
-  ) {
-    #ok to clobber it now (but bad form nonetheless?)
-    $type_pkgs=new FS::type_pkgs ({
-      'typenum' => $typenum,
-      'pkgpart' => $pkgpart,
-    });
-    $error= $type_pkgs->insert;
-    die $error if $error;
-  }
-
-}
-
-print $cgi->redirect(popurl(3). "browse/agent_type.cgi");
-
diff --git a/htdocs/edit/process/cust_credit.cgi b/htdocs/edit/process/cust_credit.cgi
deleted file mode 100755
index ea9c5a3a2..000000000
--- a/htdocs/edit/process/cust_credit.cgi
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_credit.cgi,v 1.7 1999-04-07 15:23:05 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/cust_credit.cgi
-#
-# ivan@voicenet.com 96-dec-05 -> 96-dec-08
-#
-# post a refund if $new_paybatch
-# ivan@voicenet.com 96-dec-08
-#
-# refunds are no longer applied against a specific payment (paybatch)
-# paybatch field removed
-# ivan@voicenet.com 97-apr-22
-#
-# rewrite ivan@sisd.com 98-mar-16
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cust_credit.cgi,v $
-# Revision 1.7  1999-04-07 15:23:05  ivan
-# don't use anchor in redirect
-#
-# Revision 1.6  1999/02/28 00:03:41  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/01/25 12:09:59  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.4  1999/01/19 05:13:49  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 22:47:51  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.2  1998/12/17 08:40:18  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-
-use strict;
-use vars qw( $cgi $custnum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(popurl);
-use FS::Record qw(fields);
-use FS::cust_credit;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-$cgi->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
-$custnum = $1;
-
-$cgi->param('otaker',getotaker);
-
-$new = new FS::cust_credit ( {
-  map {
-    $_, scalar($cgi->param($_));
-  #} qw(custnum _date amount otaker reason)
-  } fields('cust_credit')
-} );
-
-$error=$new->insert;
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "cust_credit.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
-}
-
-
diff --git a/htdocs/edit/process/cust_main.cgi b/htdocs/edit/process/cust_main.cgi
deleted file mode 100755
index 25dc0299b..000000000
--- a/htdocs/edit/process/cust_main.cgi
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_main.cgi,v 1.11 1999-08-10 12:54:06 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/cust_main.cgi
-#
-# ivan@voicenet.com 96-dec-04
-#
-# added referral check
-# ivan@voicenet.com 97-jun-4
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-28
-#
-# same as above (again) and clean up some stuff ivan@sisd.com 98-feb-23
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'day' to 'daytime' because Pg6.3 reserves the day word
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cust_main.cgi,v $
-# Revision 1.11  1999-08-10 12:54:06  ivan
-# use FS::cust_pkg::pkgpart_href
-#
-# Revision 1.10  1999/04/14 07:47:53  ivan
-# i18n fixes
-#
-# Revision 1.9  1999/04/07 15:22:19  ivan
-# don't use anchor in redirect
-#
-# Revision 1.8  1999/03/25 13:55:10  ivan
-# one-screen new customer entry (including package and service) for simple
-# packages with one svc_acct service
-#
-# Revision 1.7  1999/02/28 00:03:42  ivan
-# removed misleading comments
-#
-# Revision 1.6  1999/01/25 12:10:00  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:50  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:22:32  ivan
-# changes to track email addresses for email invoicing
-#
-# Revision 1.3  1998/12/17 08:40:19  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.2  1998/11/18 08:57:36  ivan
-# i18n, s/CGI-modules/CGI.pm/, FS::CGI::idiot instead of inline, FS::CGI::popurl
-#
-
-use strict;
-use vars qw( $cgi $payby @invoicing_list $new $custnum $error );
-use vars qw( $cust_pkg $cust_svc $svc_acct );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw( popurl );
-use FS::Record qw( qsearch qsearchs fields );
-use FS::cust_main;
-use FS::type_pkgs;
-use FS::agent;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-#unmunge stuff
-
-$cgi->param('tax','') unless defined($cgi->param('tax'));
-
-$cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
-
-$cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
-  or die "Oops, illegal \"state\" param: ". $cgi->param('state');
-$cgi->param('state', $1);
-$cgi->param('county', $3 || '');
-$cgi->param('country', $4);
-
-if ( $payby = $cgi->param('payby') ) {
-  $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
-  $cgi->param('paydate',
-  $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
-  $cgi->param('payname', $cgi->param( $payby. '_payname' ) );
-}
-
-$cgi->param('otaker', &getotaker );
-
-@invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
-push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
-
-#create new record object
-
-$new = new FS::cust_main ( {
-  map {
-    $_, scalar($cgi->param($_))
-#  } qw(custnum agentnum last first ss company address1 address2 city county
-#       state zip daytime night fax payby payinfo paydate payname tax
-#       otaker refnum)
-  } fields('cust_main')
-} );
-
-#perhaps the invocing_list magic should move to cust_main.pm?
-$error = $new->check_invoicing_list( \@invoicing_list );
-
-#perhaps this stuff should go to cust_main.pm as well
-$cust_pkg = '';
-$svc_acct = '';
-if ( $new->custnum eq '' ) {
-
-  if ( $cgi->param('pkgpart_svcpart') ) {
-    my $x = $cgi->param('pkgpart_svcpart');
-    $x =~ /^(\d+)_(\d+)$/;
-    my($pkgpart, $svcpart) = ($1, $2);
-    #false laziness: copied from FS::cust_pkg::order (which should become a
-    #FS::cust_main method)
-    my(%part_pkg);
-    # generate %part_pkg
-    # $part_pkg{$pkgpart} is true iff $custnum may purchase $pkgpart
-    my $agent = qsearchs('agent',{'agentnum'=> $new->agentnum });
-    	#my($type_pkgs);
-    	#foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
-    	#  my($pkgpart)=$type_pkgs->pkgpart;
-    	#  $part_pkg{$pkgpart}++;
-    	#}
-    # $pkgpart_href->{PKGPART} is true iff $custnum may purchase $pkgpart
-    my $pkgpart_href = $agent->pkgpart_hashref;
-    #eslaf
-
-    # this should wind up in FS::cust_pkg!
-    $error ||= "Agent ". $new->agentnum. " (type ". $agent->typenum. ") can't".
-               "purchase pkgpart ". $pkgpart
-      #unless $part_pkg{ $pkgpart };
-      unless $pkgpart_href->{ $pkgpart };
-
-    $cust_pkg = new FS::cust_pkg ( {
-      #later         'custnum' => $custnum,
-      'pkgpart' => $pkgpart,
-    } );
-    $error ||= $cust_pkg->check;
-
-    #$cust_svc = new FS::cust_svc ( { 'svcpart' => $svcpart } );
-
-    #$error ||= $cust_svc->check;
-
-    $svc_acct = new FS::svc_acct ( {
-                                     'svcpart'   => $svcpart,
-                                     'username'  => $cgi->param('username'),
-                                     '_password' => $cgi->param('_password'),
-                                     'popnum'    => $cgi->param('popnum'),
-                                   } );
-
-    my $y = $svc_acct->setdefault; # arguably should be in new method
-    $error ||= $y unless ref($y);
-    #and just in case you were silly
-    $svc_acct->svcpart($svcpart);
-    $svc_acct->username($cgi->param('username'));
-    $svc_acct->_password($cgi->param('_password'));
-    $svc_acct->popnum($cgi->param('popnum'));
-
-    $error ||= $svc_acct->check;
-
-  } elsif ( $cgi->param('username') ) { #good thing to catch
-    $error = "Can't assign username without a package!";
-  }
-
-  $error ||= $new->insert;
-  if ( $cust_pkg && ! $error ) {
-    $cust_pkg->custnum( $new->custnum );
-    $error ||= $cust_pkg->insert; 
-    warn "WARNING: $error on pre-checked cust_pkg record!" if $error;
-    $svc_acct->pkgnum( $cust_pkg->pkgnum );
-    $error ||= $svc_acct->insert;
-    warn "WARNING: $error on pre-checked svc_acct record!" if $error;
-  }
-} else { #create old record object
-  my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } ); 
-  $error ||= "Old record not found!" unless $old;
-  $error ||= $new->replace($old);
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "cust_main.cgi?". $cgi->query_string );
-} else { 
-  $new->invoicing_list( \@invoicing_list );
-  $custnum = $new->custnum;
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
-} 
diff --git a/htdocs/edit/process/cust_main_county-expand.cgi b/htdocs/edit/process/cust_main_county-expand.cgi
deleted file mode 100755
index a174a0a8e..000000000
--- a/htdocs/edit/process/cust_main_county-expand.cgi
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_main_county-expand.cgi,v 1.7 2000-12-21 05:22:30 ivan Exp $
-#
-# ivan@sisd.com 97-dec-16
-#
-# Changes to allow page to work at a relative position in server
-# Added import of datasrc from UID.pm for Pg6.3
-# Default tax to 0.0 if using Pg6.3
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI
-# undo default tax to 0.0 if using Pg6.3: comes from pre-expanded record
-# for that state
-# ivan@sisd.com 98-sep-2
-#
-# $Log: cust_main_county-expand.cgi,v $
-# Revision 1.7  2000-12-21 05:22:30  ivan
-# perldoc -f split
-#
-# Revision 1.6  1999/01/25 12:19:07  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:51  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 22:47:52  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.3  1998/12/17 08:40:20  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.2  1998/11/18 09:01:40  ivan
-# i18n! i18n!
-#
-
-use strict;
-use vars qw ( $cgi $taxnum $cust_main_county @expansion $expansion );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup datasrc);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(popurl);
-use FS::cust_main_county;
-use FS::cust_main;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
-$taxnum = $1;
-$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
-  or die ("Unknown taxnum!");
-
-if ( $cgi->param('delim') eq 'n' ) {
-  @expansion=split(/\n/,$cgi->param('expansion'));
-} elsif ( $cgi->param('delim') eq 's' ) {
-  @expansion=split(' ',$cgi->param('expansion'));
-} else {
-  die "Illegal delim!";
-}
-
-@expansion=map {
-  unless ( /^\s*([\w\- ]+)\s*$/ ) {
-    $cgi->param('error', "Illegal item in expansion");
-    print $cgi->redirect(popurl(2). "cust_main_county-expand.cgi?". $cgi->query_string );
-    exit;
-  }
-  $1;
-} @expansion;
-
-foreach ( @expansion) {
-  my(%hash)=$cust_main_county->hash;
-  my($new)=new FS::cust_main_county \%hash;
-  $new->setfield('taxnum','');
-  if ( ! $cust_main_county->state ) {
-    $new->setfield('state',$_);
-  } else {
-    $new->setfield('county',$_);
-  }
-  #if (datasrc =~ m/Pg/)
-  #{
-  #    $new->setfield('tax',0.0);
-  #}
-  my($error)=$new->insert;
-  die $error if $error;
-}
-
-unless ( qsearch('cust_main',{
-  'state'  => $cust_main_county->getfield('state'),
-  'county' => $cust_main_county->getfield('county'),
-  'country' =>  $cust_main_county->getfield('country'),
-} ) ) {
-  my($error)=($cust_main_county->delete);
-  die $error if $error;
-}
-
-print $cgi->redirect(popurl(3). "edit/cust_main_county.cgi");
-
diff --git a/htdocs/edit/process/cust_main_county.cgi b/htdocs/edit/process/cust_main_county.cgi
deleted file mode 100755
index 0fc1708c5..000000000
--- a/htdocs/edit/process/cust_main_county.cgi
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_main_county.cgi,v 1.6 1999-01-25 12:19:08 ivan Exp $
-#
-# ivan@sisd.com 97-dec-16
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: cust_main_county.cgi,v $
-# Revision 1.6  1999-01-25 12:19:08  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:52  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 22:47:53  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.3  1998/12/17 08:40:21  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.2  1998/11/18 09:01:41  ivan
-# i18n! i18n!
-#
-
-use strict;
-use vars qw( $cgi );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearch qsearchs);
-use FS::cust_main_county;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-foreach ( $cgi->param ) {
-  /^tax(\d+)$/ or die "Illegal form $_!";
-  my($taxnum)=$1;
-  my($old)=qsearchs('cust_main_county',{'taxnum'=>$taxnum})
-    or die "Couldn't find taxnum $taxnum!";
-  next unless $old->getfield('tax') ne $cgi->param("tax$taxnum");
-  my(%hash)=$old->hash;
-  $hash{tax}=$cgi->param("tax$taxnum");
-  my($new)=new FS::cust_main_county \%hash;
-  my($error)=$new->replace($old);
-  if ( $error ) {
-    $cgi->param('error', $error);
-    print $cgi->redirect(popurl(2). "cust_main_county.cgi?". $cgi->query_string );
-    exit;
-  }
-}
-
-print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi");
-
diff --git a/htdocs/edit/process/cust_pay.cgi b/htdocs/edit/process/cust_pay.cgi
deleted file mode 100755
index ca5029c3c..000000000
--- a/htdocs/edit/process/cust_pay.cgi
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_pay.cgi,v 1.7 1999-02-28 00:03:43 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/cust_pay.cgi
-#
-# ivan@voicenet.com 96-dec-11
-#
-# rewrite ivan@sisd.com 98-mar-16
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cust_pay.cgi,v $
-# Revision 1.7  1999-02-28 00:03:43  ivan
-# removed misleading comments
-#
-# Revision 1.6  1999/01/25 12:19:09  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:53  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 22:47:54  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.3  1998/12/30 23:03:28  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.2  1998/12/17 08:40:22  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-
-use strict;
-use vars qw( $cgi $invnum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::Record qw(fields);
-use FS::cust_pay;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$cgi->param('invnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$invnum = $1;
-
-$new = new FS::cust_pay ( {
-  map {
-    $_, scalar($cgi->param($_));
-  #} qw(invnum paid _date payby payinfo paybatch)
-  } fields('cust_pay')
-} );
-
-$error=$new->insert;
-
-if ($error) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). 'cust_pay.cgi?'. $cgi->query_string );
-  exit;
-} else {
-  print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$invnum");
-}
-
diff --git a/htdocs/edit/process/cust_pkg.cgi b/htdocs/edit/process/cust_pkg.cgi
deleted file mode 100755
index 9d82b3c24..000000000
--- a/htdocs/edit/process/cust_pkg.cgi
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_pkg.cgi,v 1.7 1999-04-07 15:24:06 ivan Exp $
-#
-# this is for changing packages around, not for editing things within the
-# package
-#
-# Usage: post form to:
-#        http://server.name/path/cust_pkg.cgi
-#
-# ivan@voicenet.com 97-mar-21 - 97-mar-24
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-7 - 15
-#
-# &cgisuidsetup($cgi) ivan@sisd.com 98-mar-7
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cust_pkg.cgi,v $
-# Revision 1.7  1999-04-07 15:24:06  ivan
-# don't use anchor in redirect
-#
-# Revision 1.6  1999/02/28 00:03:44  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/02/07 09:59:26  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.3  1999/01/19 05:13:54  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.2  1998/12/17 08:40:23  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-
-use strict;
-use vars qw( $cgi $custnum @remove_pkgnums @pkgparts $pkgpart $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::cust_pkg;
-
-$cgi = new CGI; # create form object
-&cgisuidsetup($cgi);
-$error = '';
-
-#untaint custnum
-$cgi->param('custnum') =~ /^(\d+)$/;
-$custnum = $1;
-
-@remove_pkgnums = map {
-  /^(\d+)$/ or die "Illegal remove_pkg value!";
-  $1;
-} $cgi->param('remove_pkg');
-
-foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
-  if ( $cgi->param("pkg$pkgpart") =~ /^(\d+)$/ ) {
-    my $num_pkgs = $1;
-    while ( $num_pkgs-- ) {
-      push @pkgparts,$pkgpart;
-    }
-  } else {
-    $error = "Illegal quantity";
-    last;
-  }
-}
-
-$error ||= FS::cust_pkg::order($custnum,\@pkgparts,\@remove_pkgnums);
-
-if ($error) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "cust_pkg.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
-}
-
diff --git a/htdocs/edit/process/part_pkg.cgi b/htdocs/edit/process/part_pkg.cgi
deleted file mode 100755
index 5af9055d6..000000000
--- a/htdocs/edit/process/part_pkg.cgi
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: part_pkg.cgi,v 1.9 2001-04-09 23:05:16 ivan Exp $
-#
-# process/part_pkg.cgi: Edit package definitions (process form)
-#
-# ivan@sisd.com 97-dec-10
-#
-# don't update non-changing records in part_svc (causing harmless but annoying
-# "Records identical" errors). ivan@sisd.com 98-feb-19
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# Added `|| 0 ' when getting quantity off web page ivan@sisd.com 98-jun-4
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: part_pkg.cgi,v $
-# Revision 1.9  2001-04-09 23:05:16  ivan
-# Transactions Part I!!!
-#
-# Revision 1.8  1999/02/07 09:59:27  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.7  1999/01/19 05:13:55  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.6  1999/01/18 22:47:56  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.5  1998/12/30 23:03:29  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.4  1998/12/17 08:40:24  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.3  1998/11/21 07:17:58  ivan
-# bugfix to work for regular aswell as custom pricing
-#
-# Revision 1.2  1998/11/15 13:16:15  ivan
-# first pass as per-user custom pricing
-#
-
-use strict;
-use vars qw( $cgi $pkgpart $old $new $part_svc $error $dbh );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::part_pkg;
-use FS::pkg_svc;
-use FS::cust_pkg;
-
-$cgi = new CGI;
-$dbh = &cgisuidsetup($cgi);
-
-$pkgpart = $cgi->param('pkgpart');
-
-$old = qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
-
-$new = new FS::part_pkg ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('part_pkg')
-} );
-
-#most of the stuff below should move to part_pkg.pm
-
-foreach $part_svc ( qsearch('part_svc', {} ) ) {
-  my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
-  unless ( $quantity =~ /^(\d+)$/ ) {
-    $cgi->param('error', "Illegal quantity" );
-    print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
-    exit;
-  }
-}
-
-local $SIG{HUP} = 'IGNORE';
-local $SIG{INT} = 'IGNORE';
-local $SIG{QUIT} = 'IGNORE';
-local $SIG{TERM} = 'IGNORE';
-local $SIG{TSTP} = 'IGNORE';
-local $SIG{PIPE} = 'IGNORE';
-
-local $FS::UID::AutoCommit = 0;
-
-if ( $pkgpart ) {
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-  $pkgpart=$new->pkgpart;
-}
-if ( $error ) {
-  $dbh->rollback;
-  $cgi->param('error', $error );
-  print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
-  exit;
-}
-
-foreach $part_svc (qsearch('part_svc',{})) {
-  my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
-  my $old_pkg_svc = qsearchs('pkg_svc', {
-    'pkgpart' => $pkgpart,
-    'svcpart' => $part_svc->svcpart,
-  } );
-  my $old_quantity = $old_pkg_svc ? $old_pkg_svc->quantity : 0;
-  next unless $old_quantity != $quantity; #!here
-  my $new_pkg_svc = new FS::pkg_svc( {
-    'pkgpart'  => $pkgpart,
-    'svcpart'  => $part_svc->svcpart,
-    'quantity' => $quantity, 
-  } );
-  if ( $old_pkg_svc ) {
-    my $myerror = $new_pkg_svc->replace($old_pkg_svc);
-    if ( $myerror ) {
-      $dbh->rollback;
-      die $myerror;
-    }
-  } else {
-    my $myerror = $new_pkg_svc->insert;
-    if ( $myerror ) {
-      $dbh->rollback;
-      die $myerror;
-    }
-  }
-}
-
-unless ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
-  $dbh->commit or die $dbh->errstr;
-  print $cgi->redirect(popurl(3). "browse/part_pkg.cgi");
-} else {
-  my($old_cust_pkg) = qsearchs( 'cust_pkg', { 'pkgnum' => $1 } );
-  my %hash = $old_cust_pkg->hash;
-  $hash{'pkgpart'} = $pkgpart;
-  my($new_cust_pkg) = new FS::cust_pkg \%hash;
-  my $myerror = $new_cust_pkg->replace($old_cust_pkg);
-  if ( $myerror ) {
-    $dbh->rollback;
-    die "Error modifying cust_pkg record: $myerror\n";
-  }
-
-  $dbh->commit or die $dbh->errstr;
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new_cust_pkg->custnum);
-}
-
diff --git a/htdocs/edit/process/part_referral.cgi b/htdocs/edit/process/part_referral.cgi
deleted file mode 100755
index cde27ede1..000000000
--- a/htdocs/edit/process/part_referral.cgi
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: part_referral.cgi,v 1.6 1999-02-07 09:59:28 ivan Exp $
-#
-# ivan@sisd.com 98-feb-23
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: part_referral.cgi,v $
-# Revision 1.6  1999-02-07 09:59:28  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.5  1999/01/19 05:13:56  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 22:47:57  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.3  1998/12/30 23:03:30  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.2  1998/12/17 08:40:25  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-
-use strict;
-use vars qw( $cgi $refnum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs fields);
-use FS::part_referral;
-use FS::CGI qw(popurl);
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$refnum = $cgi->param('refnum');
-
-$new = new FS::part_referral ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('part_referral')
-} );
-
-if ( $refnum ) {
-  my $old = qsearchs( 'part_referral', { 'refnum' =>$ refnum } );
-  die "(Old) Record not found!" unless $old;
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-}
-$refnum=$new->refnum;
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "part_referral.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "browse/part_referral.cgi");
-}
-
diff --git a/htdocs/edit/process/part_svc.cgi b/htdocs/edit/process/part_svc.cgi
deleted file mode 100755
index 0b3e2cd1c..000000000
--- a/htdocs/edit/process/part_svc.cgi
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: part_svc.cgi,v 1.7 1999-02-07 09:59:29 ivan Exp $
-#
-# ivan@sisd.com 97-nov-14
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: part_svc.cgi,v $
-# Revision 1.7  1999-02-07 09:59:29  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.6  1999/01/19 05:13:57  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 22:47:58  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.4  1998/12/30 23:03:31  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.3  1998/12/17 08:40:26  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.2  1998/11/21 06:43:08  ivan
-# s/CGI::Request/CGI.pm/
-#
-
-use strict;
-use vars qw ( $cgi $svcpart $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs fields);
-use FS::part_svc;
-use FS::CGI qw(popurl);
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$svcpart = $cgi->param('svcpart');
-
-$old = qsearchs('part_svc',{'svcpart'=>$svcpart}) if $svcpart;
-
-$new = new FS::part_svc ( {
-  map {
-    $_, scalar($cgi->param($_));
-#  } qw(svcpart svc svcdb)
-  } fields('part_svc')
-} );
-
-if ( $svcpart ) {
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-  $svcpart=$new->getfield('svcpart');
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "part_svc.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3)."browse/part_svc.cgi");
-}
-
diff --git a/htdocs/edit/process/svc_acct.cgi b/htdocs/edit/process/svc_acct.cgi
deleted file mode 100755
index 84f93abe8..000000000
--- a/htdocs/edit/process/svc_acct.cgi
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: svc_acct.cgi,v 1.7 1999-08-27 00:26:33 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_acct.cgi
-#
-# ivan@voicenet.com 96-dec-18
-#
-# Changed /u to /u2
-# ivan@voicenet.com 97-may-6
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-17 - 21
-#
-# no FS::Search, FS::svc_acct creates FS::cust_svc record, used for adding
-# and editing ivan@sisd.com 98-mar-8
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'password' to '_password' because Pg6.3 reserves the password word
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: svc_acct.cgi,v $
-# Revision 1.7  1999-08-27 00:26:33  ivan
-# better error messages
-#
-# Revision 1.6  1999/02/28 00:03:45  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/02/07 09:59:30  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:13:58  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 22:47:59  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.2  1998/12/17 08:40:27  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-
-use strict;
-use vars qw( $cgi $svcnum $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearchs fields);
-use FS::svc_acct;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$svcnum = $1;
-
-if ( $svcnum ) {
-  $old = qsearchs('svc_acct', { 'svcnum' => $svcnum } )
-    or die "fatal: can't find account (svcnum $svcnum)!";
-} else {
-  $old = '';
-}
-
-#unmunge popnum
-$cgi->param('popnum', (split(/:/, $cgi->param('popnum') ))[0] );
-
-#unmunge passwd
-if ( $cgi->param('_password') eq '*HIDDEN*' ) {
-  die "fatal: no previous account to recall hidden password from!" unless $old;
-  $cgi->param('_password',$old->getfield('_password'));
-}
-
-$new = new FS::svc_acct ( {
-  map {
-    $_, scalar($cgi->param($_));
-  #} qw(svcnum pkgnum svcpart username _password popnum uid gid finger dir
-  #  shell quota slipip)
-  } ( fields('svc_acct'), qw( pkgnum svcpart ) )
-} );
-
-if ( $svcnum ) {
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-  $svcnum = $new->svcnum;
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "svc_acct.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/svc_acct.cgi?" . $svcnum );
-}
-
diff --git a/htdocs/edit/process/svc_acct_pop.cgi b/htdocs/edit/process/svc_acct_pop.cgi
deleted file mode 100755
index 763bca4a8..000000000
--- a/htdocs/edit/process/svc_acct_pop.cgi
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: svc_acct_pop.cgi,v 1.6 1999-02-07 09:59:31 ivan Exp $
-#
-# ivan@sisd.com 98-mar-8
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: svc_acct_pop.cgi,v $
-# Revision 1.6  1999-02-07 09:59:31  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.5  1999/01/19 05:13:59  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 22:48:00  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.3  1998/12/30 23:03:32  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.2  1998/12/17 08:40:28  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-
-use strict;
-use vars qw( $cgi $popnum $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_acct_pop;
-use FS::CGI qw(popurl);
-
-$cgi = new CGI; # create form object
-
-&cgisuidsetup($cgi);
-
-$popnum = $cgi->param('popnum');
-
-$old = qsearchs('svc_acct_pop',{'popnum'=>$popnum}) if $popnum;
-
-$new = new FS::svc_acct_pop ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('svc_acct_pop')
-} );
-
-if ( $popnum ) {
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-  $popnum=$new->getfield('popnum');
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "svc_acct_pop.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "browse/svc_acct_pop.cgi");
-}
-
diff --git a/htdocs/edit/process/svc_acct_sm.cgi b/htdocs/edit/process/svc_acct_sm.cgi
deleted file mode 100755
index 9c39bb8e5..000000000
--- a/htdocs/edit/process/svc_acct_sm.cgi
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: svc_acct_sm.cgi,v 1.6 1999-02-28 00:03:46 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_acct_sm.cgi
-#
-# lots of crufty stuff from svc_acct still in here, and modifications are (unelegantly) disabled.
-#
-# ivan@voicenet.com 97-jan-6
-#
-# enabled modifications
-# 
-# ivan@voicenet.com 97-may-7
-#
-# fixed removal of cust_svc record on modifications!
-# ivan@voicenet.com 97-jun-5
-#
-# rewrite ivan@sisd.com 98-mar-15
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: svc_acct_sm.cgi,v $
-# Revision 1.6  1999-02-28 00:03:46  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/02/07 09:59:32  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:14:00  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 22:48:01  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.2  1998/12/17 08:40:29  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-
-use strict;
-use vars qw( $cgi $svcnum $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs fields);
-use FS::svc_acct_sm;
-use FS::CGI qw(popurl);
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$svcnum =$1;
-
-$old = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
-
-#unmunge domsvc and domuid
-#$cgi->param('domsvc',(split(/:/, $cgi->param('domsvc') ))[0] );
-#$cgi->param('domuid',(split(/:/, $cgi->param('domuid') ))[0] );
-
-$new = new FS::svc_acct_sm ( {
-  map {
-    ($_, scalar($cgi->param($_)));
-  #} qw(svcnum pkgnum svcpart domuser domuid domsvc)
-  } ( fields('svc_acct_sm'), qw( pkgnum svcpart ) )
-} );
-
-if ( $svcnum ) {
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-  $svcnum = $new->getfield('svcnum');
-} 
-
-if ($error) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "svc_acct_sm.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/svc_acct_sm.cgi?$svcnum");
-}
-
diff --git a/htdocs/edit/process/svc_domain.cgi b/htdocs/edit/process/svc_domain.cgi
deleted file mode 100755
index ad1892dd1..000000000
--- a/htdocs/edit/process/svc_domain.cgi
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: svc_domain.cgi,v 1.7 2001-04-23 07:12:44 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_domain.cgi
-#
-# lots of yucky stuff in this one... bleachlkjhui!
-#
-# ivan@voicenet.com 97-jan-6
-#
-# kludged for new domain template 3.5
-# ivan@voicenet.com 97-jul-24
-#
-# moved internic bits to svc_domain.pm ivan@sisd.com 98-mar-14
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: svc_domain.cgi,v $
-# Revision 1.7  2001-04-23 07:12:44  ivan
-# better error message (if kludgy) for no referral
-# remove outdated NSI foo from domain ordering.  also, fuck NSI.
-#
-# Revision 1.6  1999/02/28 00:03:47  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/02/07 09:59:33  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:14:01  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 22:48:02  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.2  1998/12/17 08:40:30  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-
-use strict;
-use vars qw( $cgi $svcnum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs fields);
-use FS::svc_domain;
-use FS::CGI qw(popurl);
-
-#remove this to actually test the domains!
-$FS::svc_domain::whois_hack = 1;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$svcnum = $1;
-
-$new = new FS::svc_domain ( {
-  map {
-    $_, scalar($cgi->param($_));
-  #} qw(svcnum pkgnum svcpart domain action purpose)
-  } ( fields('svc_domain'), qw( pkgnum svcpart action purpose ) )
-} );
-
-if ($cgi->param('svcnum')) {
-  $error="Can't modify a domain!";
-} else {
-  $error=$new->insert;
-  $svcnum=$new->svcnum;
-}
-
-if ($error) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "svc_domain.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/svc_domain.cgi?$svcnum");
-}
-
diff --git a/htdocs/edit/svc_acct.cgi b/htdocs/edit/svc_acct.cgi
deleted file mode 100755
index 963bc1edf..000000000
--- a/htdocs/edit/svc_acct.cgi
+++ /dev/null
@@ -1,228 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: svc_acct.cgi,v 1.10 1999-04-14 11:27:06 ivan Exp $
-#
-# Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
-#        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
-#
-# ivan@voicenet.com 96-dec-18
-#
-# rewrite ivan@sisd.com 98-mar-8
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'password' to '_password' because Pg6.3 reserves the password word
-#       bmccane@maxbaud.net     98-apr-3
-#
-# use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
-#
-# $Log: svc_acct.cgi,v $
-# Revision 1.10  1999-04-14 11:27:06  ivan
-# showpasswords config option to show passwords
-#
-# Revision 1.9  1999/02/28 00:03:37  ivan
-# removed misleading comments
-#
-# Revision 1.8  1999/02/23 08:09:22  ivan
-# beginnings of one-screen new customer entry and some other miscellania
-#
-# Revision 1.7  1999/02/07 09:59:22  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.6  1999/01/19 05:13:43  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:32  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1998/12/30 23:03:22  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.3  1998/12/17 06:17:08  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-
-use strict;
-use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
-             $part_svc $svc $otaker $username $password $ulen $ulen2 $p1
-             $popnum $uid $gid $finger $dir $shell $quota $slipip );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_acct;
-use FS::Conf;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-@shells = $conf->config('shells');
-
-if ( $cgi->param('error') ) {
-  $svc_acct = new FS::svc_acct ( {
-    map { $_, scalar($cgi->param($_)) } fields('svc_acct')
-  } );
-  $svcnum = $svc_acct->svcnum;
-  $pkgnum = $cgi->param('pkgnum');
-  $svcpart = $cgi->param('svcpart');
-  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  die "No part_svc entry!" unless $part_svc;
-} else {
-  my($query) = $cgi->keywords;
-  if ( $query =~ /^(\d+)$/ ) { #editing
-    $svcnum=$1;
-    $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svcnum})
-      or die "Unknown (svc_acct) svcnum!";
-
-    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-      or die "Unknown (cust_svc) svcnum!";
-
-    $pkgnum=$cust_svc->pkgnum;
-    $svcpart=$cust_svc->svcpart;
-
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
-
-  } else { #adding
-
-    $svc_acct = new FS::svc_acct({}); 
-
-    foreach $_ (split(/-/,$query)) {
-      $pkgnum=$1 if /^pkgnum(\d+)$/;
-      $svcpart=$1 if /^svcpart(\d+)$/;
-    }
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
-
-    $svcnum='';
-
-    #set gecos
-    my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-    if ($cust_pkg) {
-      my($cust_main)=qsearchs('cust_main',{'custnum'=> $cust_pkg->custnum } );
-      $svc_acct->setfield('finger',
-        $cust_main->getfield('first') . " " . $cust_main->getfield('last')
-      ) ;
-    }
-
-    #set fixed and default fields from part_svc
-    my($field);
-    foreach $field ( fields('svc_acct') ) {
-      if ( $part_svc->getfield('svc_acct__'. $field. '_flag') ne '' ) {
-        $svc_acct->setfield($field,$part_svc->getfield('svc_acct__'. $field) );
-      }
-    }
-
-  }
-}
-$action = $svcnum ? 'Edit' : 'Add';
-
-$svc = $part_svc->getfield('svc');
-
-$otaker = getotaker;
-
-$username = $svc_acct->username;
-if ( $svc_acct->_password ) {
-  if ( $conf->exists('showpasswords') ) {
-    $password = $svc_acct->_password;
-  } else {
-    $password = "*HIDDEN*";
-  }
-} else {
-  $password = '';
-}
-
-$ulen = $svc_acct->dbdef_table->column('username')->length;
-$ulen2 = $ulen+2;
-
-$p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("$action $svc account");
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print <<END;
-    <FORM ACTION="${p1}process/svc_acct.cgi" METHOD=POST>
-      <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
-      <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
-      <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
-Username: 
-<INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen>
-<BR>Password: 
-<INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8> 
-(blank to generate)
-END
-
-#pop
-$popnum = $svc_acct->popnum || 0;
-if ( $part_svc->svc_acct__popnum_flag eq "F" ) {
-  print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$popnum">!;
-} else { 
-  print qq!<BR>POP: <SELECT NAME="popnum" SIZE=1><OPTION>\n!;
-  my($svc_acct_pop);
-  foreach $svc_acct_pop ( qsearch ('svc_acct_pop',{} ) ) {
-  print "<OPTION", $svc_acct_pop->popnum == $popnum ? ' SELECTED' : '', ">", 
-        $svc_acct_pop->popnum, ": ", 
-        $svc_acct_pop->city, ", ",
-        $svc_acct_pop->state,
-        " (", $svc_acct_pop->ac, ")/",
-        $svc_acct_pop->exch, "\n"
-      ;
-  }
-  print "</SELECT>";
-}
-
-($uid,$gid,$finger,$dir)=(
-  $svc_acct->uid,
-  $svc_acct->gid,
-  $svc_acct->finger,
-  $svc_acct->dir,
-);
-
-print <<END;
-<INPUT TYPE="hidden" NAME="uid" VALUE="$uid">
-<INPUT TYPE="hidden" NAME="gid" VALUE="$gid">
-<BR>GECOS: <INPUT TYPE="text" NAME="finger" VALUE="$finger">
-<INPUT TYPE="hidden" NAME="dir" VALUE="$dir">
-END
-
-$shell = $svc_acct->shell;
-if ( $part_svc->svc_acct__shell_flag eq "F" ) {
-  print qq!<INPUT TYPE="hidden" NAME="shell" VALUE="$shell">!;
-} else {
-  print qq!<BR>Shell: <SELECT NAME="shell" SIZE=1>!;
-  my($etc_shell);
-  foreach $etc_shell (@shells) {
-    print "<OPTION", $etc_shell eq $shell ? ' SELECTED' : '', ">",
-          $etc_shell, "\n";
-  }
-  print "</SELECT>";
-}
-
-($quota,$slipip)=(
-  $svc_acct->quota,
-  $svc_acct->slipip,
-);
-
-print qq!<INPUT TYPE="hidden" NAME="quota" VALUE="$quota">!;
-
-if ( $part_svc->svc_acct__slipip_flag eq "F" ) {
-  print qq!<INPUT TYPE="hidden" NAME="slipip" VALUE="$slipip">!;
-} else {
-  print qq!<BR>IP: <INPUT TYPE="text" NAME="slipip" VALUE="$slipip">!;
-}
-
-#submit
-print qq!<P><INPUT TYPE="submit" VALUE="Submit">!; 
-
-print <<END;
-    </FORM>
-  </BODY>
-</HTML>
-END
-
-
diff --git a/htdocs/edit/svc_acct_pop.cgi b/htdocs/edit/svc_acct_pop.cgi
deleted file mode 100755
index 1797b2b8e..000000000
--- a/htdocs/edit/svc_acct_pop.cgi
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: svc_acct_pop.cgi,v 1.9 2000-01-28 23:02:48 ivan Exp $
-#
-# ivan@sisd.com 98-mar-8 
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: svc_acct_pop.cgi,v $
-# Revision 1.9  2000-01-28 23:02:48  ivan
-# track full phone number
-#
-# Revision 1.8  1999/02/23 08:09:23  ivan
-# beginnings of one-screen new customer entry and some other miscellania
-#
-# Revision 1.7  1999/02/07 09:59:23  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.6  1999/01/19 05:13:44  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:33  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1998/12/23 02:57:45  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.3  1998/12/17 06:17:10  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.2  1998/11/13 09:56:47  ivan
-# change configuration file layout to support multiple distinct databases (with
-# own set of config files, export, etc.)
-#
-
-use strict;
-use vars qw( $cgi $svc_acct_pop $action $query $hashref $p1 );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::CGI qw(header menubar popurl);
-use FS::svc_acct_pop;
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-if ( $cgi->param('error') ) {
-  $svc_acct_pop = new FS::svc_acct_pop ( {
-    map { $_, scalar($cgi->param($_)) } fields('svc_acct_pop')
-  } );
-} elsif ( $cgi->keywords ) { #editing
-  my($query)=$cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $svc_acct_pop=qsearchs('svc_acct_pop',{'popnum'=>$1});
-} else { #adding
-  $svc_acct_pop = new FS::svc_acct_pop {};
-}
-$action = $svc_acct_pop->popnum ? 'Edit' : 'Add';
-$hashref = $svc_acct_pop->hashref;
-
-$p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("$action POP", menubar(
-  'Main Menu' => popurl(2),
-  'View all POPs' => popurl(2). "browse/svc_acct_pop.cgi",
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print qq!<FORM ACTION="${p1}process/svc_acct_pop.cgi" METHOD=POST>!;
-
-#display
-
-print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$hashref->{popnum}">!,
-      "POP #", $hashref->{popnum} ? $hashref->{popnum} : "(NEW)";
-
-print <<END;
-<PRE>
-City      <INPUT TYPE="text" NAME="city" SIZE=32 VALUE="$hashref->{city}">
-State     <INPUT TYPE="text" NAME="state" SIZE=16 MAXLENGTH=16 VALUE="$hashref->{state}">
-Area Code <INPUT TYPE="text" NAME="ac" SIZE=4 MAXLENGTH=3 VALUE="$hashref->{ac}">
-Exchange  <INPUT TYPE="text" NAME="exch" SIZE=4 MAXLENGTH=3 VALUE="$hashref->{exch}">
-Local     <INPUT TYPE="text" NAME="loc" SIZE=5 MAXLENGTH=4 VALUE="$hashref->{loc}">
-</PRE>
-END
-
-print qq!<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{popnum} ? "Apply changes" : "Add POP",
-      qq!">!;
-
-print <<END;
-    </FORM>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/edit/svc_acct_sm.cgi b/htdocs/edit/svc_acct_sm.cgi
deleted file mode 100755
index cb7cbfae0..000000000
--- a/htdocs/edit/svc_acct_sm.cgi
+++ /dev/null
@@ -1,247 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: svc_acct_sm.cgi,v 1.9 1999-02-28 00:03:38 ivan Exp $
-#
-# Usage: svc_acct_sm.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
-#        http://server.name/path/svc_acct_sm.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
-#
-# use {svcnum} for edit, pkgnum{pkgnum}-svcpart{svcpart} for add
-#
-# should error out in a more CGI-friendly way, and should have more error checking (sigh).
-#
-# ivan@voicenet.com 97-jan-5
-#
-# added debugging code; fixed CPU-sucking problem with trying to edit an (unaudited) mail alias (no pkgnum)
-#
-# ivan@voicenet.com 97-may-7
-#
-# fixed uid selection
-# ivan@voicenet.com 97-jun-4
-#
-# uid selection across _CUSTOMER_, not just _PACKAGE_
-#
-# ( i need to be rewritten with fast searches)
-#
-# ivan@voicenet.com 97-oct-3
-#
-# added fast searches in some of the places where it is sorely needed...
-# I see DBI::mysql in your future...
-# ivan@voicenet.com 97-oct-23
-#
-# rewrite ivan@sisd.com 98-mar-15
-#
-# /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-26
-#
-# $Log: svc_acct_sm.cgi,v $
-# Revision 1.9  1999-02-28 00:03:38  ivan
-# removed misleading comments
-#
-# Revision 1.8  1999/02/07 09:59:24  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.7  1999/01/19 05:13:45  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.6  1999/01/18 09:41:34  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.5  1998/12/30 23:03:24  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.4  1998/12/23 02:58:45  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.3  1998/12/17 06:17:11  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.2  1998/12/16 05:19:15  ivan
-# use FS::Conf
-#
-
-use strict;
-use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
-             $part_svc $query %username %domain $p1 $domuser $domsvc $domuid );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_acct_sm;
-use FS::Conf;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$mydomain = $conf->config('domain');
-
-if ( $cgi->param('error') ) {
-  $svc_acct_sm = new FS::svc_acct_sm ( {
-    map { $_, scalar($cgi->param($_)) } fields('svc_acct_sm')
-  } );
-  $svcnum = $svc_acct_sm->svcnum;
-  $pkgnum = $cgi->param('pkgnum');
-  $svcpart = $cgi->param('svcpart');
-  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  die "No part_svc entry!" unless $part_svc;
-} else {
-  my($query) = $cgi->keywords;
-  if ( $query =~ /^(\d+)$/ ) { #editing
-    $svcnum=$1;
-    $svc_acct_sm=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum})
-      or die "Unknown (svc_acct_sm) svcnum!";
-
-    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-      or die "Unknown (cust_svc) svcnum!";
-
-    $pkgnum=$cust_svc->pkgnum;
-    $svcpart=$cust_svc->svcpart;
-  
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
-
-  } else { #adding
-
-    $svc_acct_sm = new FS::svc_acct_sm({});
-
-    foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
-      $pkgnum=$1 if /^pkgnum(\d+)$/;
-      $svcpart=$1 if /^svcpart(\d+)$/;
-    }
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
-
-    $svcnum='';
-
-    #set fixed and default fields from part_svc
-    my($field);
-    foreach $field ( fields('svc_acct_sm') ) {
-      if ( $part_svc->getfield('svc_acct_sm__'. $field. '_flag') ne '' ) {
-        $svc_acct_sm->setfield($field,$part_svc->getfield('svc_acct_sm__'. $field) );
-      }
-    }
-
-  }
-}
-$action = $svc_acct_sm->svcnum ? 'Edit' : 'Add';
-
-if ($pkgnum) {
-
-  #find all possible uids (and usernames)
-
-  my($u_part_svc,@u_acct_svcparts);
-  foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
-    push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
-  }
-
-  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-  my($custnum)=$cust_pkg->getfield('custnum');
-  my($i_cust_pkg);
-  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
-    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
-    my($acct_svcpart);
-    foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
-                                              #record(s) in cust_svc ( for this
-                                              #pkgnum ! )
-      my($i_cust_svc);
-      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
-        my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
-        $username{$svc_acct->getfield('uid')}=$svc_acct->getfield('username');
-      }  
-    }
-  }
-
-  #find all possible domains (and domsvc's)
-
-  my($d_part_svc,@d_acct_svcparts);
-  foreach $d_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_domain'}) ) {
-    push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
-  }
-
-  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
-    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
-    my($acct_svcpart);
-    foreach $acct_svcpart (@d_acct_svcparts) {
-      my($i_cust_svc);
-      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
-        my($svc_domain)=qsearch('svc_domain',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
-        $domain{$svc_domain->getfield('svcnum')}=$svc_domain->getfield('domain');
-      }
-    }
-  }
-
-} elsif ( $action eq 'Edit' ) {
-
-  my($svc_acct)=qsearchs('svc_acct',{'uid'=>$svc_acct_sm->domuid});
-  $username{$svc_acct_sm->uid} = $svc_acct->username;
-
-  my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$svc_acct_sm->domsvc});
-  $domain{$svc_acct_sm->domsvc} = $svc_domain->domain;
-
-} else {
-  die "\$action eq Add, but \$pkgnum is null!\n";
-}
-
-$p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Mail Alias $action", '');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print qq!<FORM ACTION="${p1}process/svc_acct_sm.cgi" METHOD=POST>!;
-
-#display
-
-	#formatting
-	print "<PRE>";
-
-#svcnum
-print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
-print qq!Service #<FONT SIZE=+1><B>!, $svcnum ? $svcnum : " (NEW)", "</B></FONT>";
-
-#pkgnum
-print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
- 
-#svcpart
-print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
-
-($domuser,$domsvc,$domuid)=(
-  $svc_acct_sm->domuser,
-  $svc_acct_sm->domsvc,
-  $svc_acct_sm->domuid,
-);
-
-#domuser
-print qq!\n\nMail to <INPUT TYPE="text" NAME="domuser" VALUE="$domuser"> <I>( * for anything )</I>!;
-
-#domsvc
-print qq! \@ <SELECT NAME="domsvc" SIZE=1>!;
-foreach $_ (keys %domain) {
-  print "<OPTION", $_ eq $domsvc ? " SELECTED" : "",
-        qq! VALUE="$_">$domain{$_}!;
-}
-print "</SELECT>";
-
-#uid
-print qq!\nforwards to <SELECT NAME="domuid" SIZE=1>!;
-foreach $_ (keys %username) {
-  print "<OPTION", ($_ eq $domuid) ? " SELECTED" : "",
-        qq! VALUE="$_">$username{$_}!;
-}
-print "</SELECT>\@$mydomain mailbox.";
-
-	#formatting
-	print "</PRE>\n";
-
-print qq!<CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>!;
-
-print <<END;
-
-    </FORM>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/edit/svc_domain.cgi b/htdocs/edit/svc_domain.cgi
deleted file mode 100755
index 49be88073..000000000
--- a/htdocs/edit/svc_domain.cgi
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: svc_domain.cgi,v 1.10 2001-04-23 07:12:44 ivan Exp $
-#
-# Usage: svc_domain.cgi pkgnum{pkgnum}-svcpart{svcpart}
-#        http://server.name/path/svc_domain.cgi?pkgnum{pkgnum}-svcpart{svcpart}
-#
-# ivan@voicenet.com 97-jan-5 -> 97-jan-6
-#
-# changes for domain template 3.5
-# ivan@voicenet.com 97-jul-24
-#
-# rewrite ivan@sisd.com 98-mar-14
-#
-# no GOV in instructions ivan@sisd.com 98-jul-17
-#
-# $Log: svc_domain.cgi,v $
-# Revision 1.10  2001-04-23 07:12:44  ivan
-# better error message (if kludgy) for no referral
-# remove outdated NSI foo from domain ordering.  also, fuck NSI.
-#
-# Revision 1.9  1999/02/28 00:03:39  ivan
-# removed misleading comments
-#
-# Revision 1.8  1999/02/07 09:59:25  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.7  1999/01/19 05:13:46  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.6  1999/01/18 09:41:35  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.5  1998/12/30 23:03:25  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.4  1998/12/23 03:00:16  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.3  1998/12/17 06:17:12  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.2  1998/11/13 09:56:48  ivan
-# change configuration file layout to support multiple distinct databases (with
-# own set of config files, export, etc.)
-#
-
-use strict;
-use vars qw( $cgi $action $svcnum $svc_domain $pkgnum $svcpart $part_svc
-             $svc $otaker $domain $p1 $kludge_action $purpose );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_domain;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-if ( $cgi->param('error') ) {
-  $svc_domain = new FS::svc_domain ( {
-    map { $_, scalar($cgi->param($_)) } fields('svc_domain')
-  } );
-  $svcnum = $svc_domain->svcnum;
-  $pkgnum = $cgi->param('pkgnum');
-  $svcpart = $cgi->param('svcpart');
-  $kludge_action = $cgi->param('action');
-  $purpose = $cgi->param('purpose');
-  $part_svc = qsearchs('part_svc', { 'svcpart' => $svcpart } );
-  die "No part_svc entry!" unless $part_svc;
-} else {
-  $kludge_action = '';
-  $purpose = '';
-  my($query) = $cgi->keywords;
-  if ( $query =~ /^(\d+)$/ ) { #editing
-    $svcnum=$1;
-    $svc_domain=qsearchs('svc_domain',{'svcnum'=>$svcnum})
-      or die "Unknown (svc_domain) svcnum!";
-
-    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-      or die "Unknown (cust_svc) svcnum!";
-
-    $pkgnum=$cust_svc->pkgnum;
-    $svcpart=$cust_svc->svcpart;
-
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
-
-  } else { #adding
-
-    $svc_domain = new FS::svc_domain({});
-  
-    foreach $_ (split(/-/,$query)) {
-      $pkgnum=$1 if /^pkgnum(\d+)$/;
-      $svcpart=$1 if /^svcpart(\d+)$/;
-    }
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
-
-    $svcnum='';
-
-    #set fixed and default fields from part_svc
-    my($field);
-    foreach $field ( fields('svc_domain') ) {
-      if ( $part_svc->getfield('svc_domain__'. $field. '_flag') ne '' ) {
-        $svc_domain->setfield($field,$part_svc->getfield('svc_domain__'. $field) );
-      }
-    }
-
-  }
-}
-$action = $svcnum ? 'Edit' : 'Add';
-
-$svc = $part_svc->getfield('svc');
-
-$otaker = getotaker;
-
-$domain = $svc_domain->domain;
-
-$p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("$action $svc", '');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print <<END;
-    <FORM ACTION="${p1}process/svc_domain.cgi" METHOD=POST>
-      <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
-      <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
-      <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
-END
-
-print qq!<INPUT TYPE="radio" NAME="action" VALUE="N"!;
-print ' CHECKED' if $kludge_action eq 'N';
-print qq!>New!;
-print qq!<BR><INPUT TYPE="radio" NAME="action" VALUE="M"!;
-print ' CHECKED' if $kludge_action eq 'M';
-print qq!>Transfer!;
-
-print <<END;
-<P>Domain <INPUT TYPE="text" NAME="domain" VALUE="$domain" SIZE=28 MAXLENGTH=26>
-<BR>Purpose/Description: <INPUT TYPE="text" NAME="purpose" VALUE="$purpose" SIZE=64>
-<P><CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>
-<UL>
-  <LI>COM is for commercial, for-profit organziations
-  <LI>ORG is for miscellaneous, usually, non-profit organizations
-  <LI>NET is for network infrastructure machines and organizations
-  <LI>EDU is for 4-year, degree granting institutions
-<!--  <LI>GOV is for United States federal government agencies
-!-->
-</UL>
-US state and local government agencies, schools, libraries, museums, and individuals should register under the US domain.  See RFC 1480 for a complete description of the US domain
-and registration procedures.
-<!--  <P>GOV registrations are limited to top-level US Federal Government agencies (see RFC 1816).
-!-->
-    </FORM>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/images/mid-logo.png b/htdocs/images/mid-logo.png
deleted file mode 100644
index d993419cc..000000000
Binary files a/htdocs/images/mid-logo.png and /dev/null differ
diff --git a/htdocs/images/small-logo.png b/htdocs/images/small-logo.png
deleted file mode 100644
index 406a36980..000000000
Binary files a/htdocs/images/small-logo.png and /dev/null differ
diff --git a/htdocs/index.html b/htdocs/index.html
deleted file mode 100755
index bee44a2f7..000000000
--- a/htdocs/index.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>
-      Freeside Main Menu
-    </TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#FFFFFF">
-  <table>
-    <tr><td>
-    <P ALIGN=CENTER>
-        <IMG BORDER=0 ALT="Silicon Interactive Software Design" SRC="images/small-logo.png">
-    </td><td>
-      <center><font color="#ff0000" size=7>freeside main menu</font></center>
-    </td></tr>
-  </table>
-      <A HREF="http://www.sisd.com/freeside">
-        Freeside home page
-      </A>
-      <BR><A HREF="docs/">
-        Documentation
-      </A>
-    </P>
-    <HR>
-    <ul>
-      <li><A HREF="edit/cust_main.cgi">New Customer</A>
-      <li><A NAME="search">Search</A>
-        <ul>
-        <LI><A HREF="search/cust_main.html">
-            customers (by last name and/or company)
-        </A>
-        <LI><A HREF="search/cust_main-payinfo.html">customers (by credit card number)</A>
-        <LI><A HREF="search/svc_acct.html">accounts (by username)</A>
-        <LI><A HREF="search/svc_domain.html">domains (by domain)</A>
-        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>
-        <LI><A HREF="search/cust_bill.html">invoices (by invoice number)</A>
-        </ul>
-      <li><A NAME="browse">Browse</A>
-        <ul>
-          <LI>customers (<A HREF="search/cust_main.cgi?custnum">by customer number</A>) (<A HREF="search/cust_main.cgi?last">by last name</A>) (<A HREF="search/cust_main.cgi?company">by company</A>)
-          <LI>invoices
-            <UL>
-              <LI>open invoices (<A HREF="search/cust_bill.cgi?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN_custnum">by customer number</A>)
-              <LI>30 day open invoices (<A HREF="search/cust_bill.cgi?OPEN30_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN30_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN30_custnum">by customer number</A>)
-              <LI>60 day open invoices (<A HREF="search/cust_bill.cgi?OPEN60_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN60_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN60_custnum">by customer number</A>)
-              <LI>90 day open invoices (<A HREF="search/cust_bill.cgi?OPEN90_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN90_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN90_custnum">by customer number</A>)
-              <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
-              <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
-            </UL>
-          <LI>packages
-            <UL>
-              <LI><A HREF="search/cust_pkg.cgi?pkgnum">packages (by package number)</A>
-              <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
-            </UL>
-          <LI>services
-            <UL>
-              <LI>accounts (<A HREF="search/svc_acct.cgi?svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?username">by username</A>) (<A HREF="search/svc_acct.cgi?uid">by uid</A>)
-              <LI>domains (<A HREF="search/svc_domain.cgi?svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?domain">by domain</A>)
-            </UL>
-          <LI>unlinked services
-            <UL>
-              <LI>unlinked accounts (<A HREF="search/svc_acct.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?UN_username">by username</A>) (<A HREF="search/svc_acct.cgi?UN_uid">by uid</A>)
-              <LI>unlinked domains (<A HREF="search/svc_domain.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?UN_domain">by domain</A>)
-            </UL>
-          <LI><A HREF="browse/nas.cgi">NAS ports</A>
-        </ul>
-      <li><A NAME="admin">Administration</a>
-        <ul>
-          <LI><A HREF="browse/part_svc.cgi">
-            View/Edit service definitions
-          </A>
-            - Services are items you offer to your customers.
-          <LI><A HREF="browse/part_pkg.cgi">
-            View/Edit package definitions
-          </A>
-            - One or more services are grouped together into a package and
-              given pricing information.  Customers purchase packages, not
-              services.
-          <LI><A HREF="browse/agent_type.cgi">
-            View/Edit agent types
-          </A>
-            - Agent types define groups of package definitions that you can
-              then assign to particular agents.
-          <LI><A HREF="browse/agent.cgi">
-            View/Edit agents
-          </A>
-            - Agents are resellers of your service.  Agents may be limited
-              to a subset of your full offerings (via their type).
-          <LI><A HREF="browse/part_referral.cgi">
-            View/Edit referrals
-          </A>
-            - Where a customer heard about your service.  Tracked for
-              informational purposes.
-          <LI><A HREF="browse/cust_main_county.cgi">
-            View/Edit locales and tax rates
-          </A>
-            - Change tax rates, or break down a country into states, or a state
-              into counties and assign different tax rates to each.
-          <LI><A HREF="browse/svc_acct_pop.cgi">
-            View/Edit POPs 
-          </A>
-            - Points of Presence 
-        </ul>
-      </ul>
-  </BODY>
-</HTML>
diff --git a/htdocs/misc/bill.cgi b/htdocs/misc/bill.cgi
deleted file mode 100755
index 52323ba59..000000000
--- a/htdocs/misc/bill.cgi
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: bill.cgi,v 1.5 1999-08-12 04:32:21 ivan Exp $
-#
-# s/FS:Search/FS::Record/ and cgisuidsetup($cgi) ivan@sisd.com 98-mar-13
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: bill.cgi,v $
-# Revision 1.5  1999-08-12 04:32:21  ivan
-# hidecancelledcustomers
-#
-# Revision 1.4  1999/01/19 05:14:02  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1998/12/23 03:01:13  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:12:41  ivan
-# s/CGI::(Request|Base)/CGI.pm/;
-#
-
-use strict;
-use vars qw( $cgi $query $custnum $cust_main $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl eidiot);
-use FS::Record qw(qsearchs);
-use FS::cust_main;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-#untaint custnum
-($query) = $cgi->keywords;
-$query =~ /^(\d*)$/;
-$custnum = $1;
-$cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
-die "Can't find customer!\n" unless $cust_main;
-
-$error = $cust_main->bill(
-#                          'time'=>$time
-                         );
-&eidiot($error) if $error;
-
-$error = $cust_main->collect(
-#                             'invoice-time'=>$time,
-#                             'batch_card'=> 'yes',
-                             'batch_card'=> 'no',
-                             'report_badcard'=> 'yes',
-                            );
-&eidiot($error) if $error;
-
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum");
-
diff --git a/htdocs/misc/cancel-unaudited.cgi b/htdocs/misc/cancel-unaudited.cgi
deleted file mode 100755
index 319ac5526..000000000
--- a/htdocs/misc/cancel-unaudited.cgi
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cancel-unaudited.cgi,v 1.8 2001-04-09 23:05:16 ivan Exp $
-#
-# Usage: cancel-unaudited.cgi svcnum
-#        http://server.name/path/cancel-unaudited.cgi pkgnum
-#
-# ivan@voicenet.com 97-apr-23
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-21
-#
-# Search->Record, cgisuidsetup($cgi) ivan@sids.com 98-mar-19
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cancel-unaudited.cgi,v $
-# Revision 1.8  2001-04-09 23:05:16  ivan
-# Transactions Part I!!!
-#
-# Revision 1.7  2000/06/15 12:30:37  ivan
-# bugfix from Jeff Finucane, thanks!
-#
-# Revision 1.6  1999/02/28 00:03:48  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/02/07 09:59:34  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:14:03  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1998/12/23 03:02:05  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:12:42  ivan
-# s/CGI::(Request|Base)/CGI.pm/;
-#
-
-use strict;
-use vars qw( $cgi $query $svcnum $svc_acct $cust_svc $error $dbh );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl eidiot);
-use FS::Record qw(qsearchs);
-use FS::cust_svc;
-use FS::svc_acct;
-
-$cgi = new CGI;
-$dbh = &cgisuidsetup($cgi);
- 
-#untaint svcnum
-($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-$svcnum = $1;
-
-$svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
-die "Unknown svcnum!" unless $svc_acct;
-
-$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-&eidiot(qq!This account has already been audited.  Cancel the 
-    <A HREF="!. popurl(2). qq!view/cust_pkg.cgi?! . $cust_svc->getfield('pkgnum') .
-    qq!pkgnum"> package</A> instead.!) 
-  if $cust_svc->pkgnum ne '' && $cust_svc->pkgnum ne '0';
-
-local $SIG{HUP} = 'IGNORE';
-local $SIG{INT} = 'IGNORE';
-local $SIG{QUIT} = 'IGNORE';
-local $SIG{TERM} = 'IGNORE';
-local $SIG{TSTP} = 'IGNORE';
-
-local $FS::UID::AutoCommit = 0;
-
-$error = $svc_acct->cancel;
-&myeidiot($error) if $error;
-$error = $svc_acct->delete;
-&myeidiot($error) if $error;
-
-$error = $cust_svc->delete;
-&myeidiot($error) if $error;
-
-$dbh->commit or die $dbh->errstr;
-
-print $cgi->redirect(popurl(2));
-
-sub myeidiot {
-  $dbh->rollback;
-  &eidiot(@_);
-}
-
diff --git a/htdocs/misc/cancel_pkg.cgi b/htdocs/misc/cancel_pkg.cgi
deleted file mode 100755
index 7bbcf6e7f..000000000
--- a/htdocs/misc/cancel_pkg.cgi
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cancel_pkg.cgi,v 1.6 1999-04-08 10:35:02 ivan Exp $
-#
-# Usage: cancel_pkg.cgi pkgnum
-#        http://server.name/path/cancel_pkg.cgi pkgnum
-#
-# IT DOESN'T RUN THE APPROPRIATE PROGRAMS YET!!!!
-#
-# probably should generalize this to do cancels, suspensions, unsuspensions, etc.
-#
-# ivan@voicenet.com 97-jan-2
-#
-# still kludgy, but now runs /dbin/cancel $pkgnum
-# ivan@voicenet.com 97-feb-27
-#
-# doesn't run if pkgnum doesn't match regex
-# ivan@voicenet.com 97-mar-6
-#
-# now redirects to enter comments
-# ivan@voicenet.com 97-may-8
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-21
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cancel_pkg.cgi,v $
-# Revision 1.6  1999-04-08 10:35:02  ivan
-# import necessary subroutines from FS::CGI
-#
-# Revision 1.5  1999/02/28 00:03:49  ivan
-# removed misleading comments
-#
-# Revision 1.4  1999/01/19 05:14:04  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1998/12/23 03:02:54  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:12:43  ivan
-# s/CGI::(Request|Base)/CGI.pm/;
-#
-
-use strict;
-use vars qw ( $cgi $query $pkgnum $cust_pkg $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(eidiot popurl);
-use FS::Record qw(qsearchs);
-use FS::CGI qw(popurl eidiot);
-use FS::cust_pkg;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
- 
-#untaint pkgnum
-($query) = $cgi->keywords;
-$query =~ /^(\d+)$/ || die "Illegal pkgnum";
-$pkgnum = $1;
-
-$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-
-$error = $cust_pkg->cancel;
-eidiot($error) if $error;
-
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
-
diff --git a/htdocs/misc/delete-customer.cgi b/htdocs/misc/delete-customer.cgi
deleted file mode 100755
index 8addbd657..000000000
--- a/htdocs/misc/delete-customer.cgi
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: delete-customer.cgi,v 1.1 1999-04-15 16:44:36 ivan Exp $
-#
-# $Log: delete-customer.cgi,v $
-# Revision 1.1  1999-04-15 16:44:36  ivan
-# delete customers
-#
-
-use strict;
-use vars qw( $cgi $conf $query $custnum $new_custnum $cust_main );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs);
-use FS::cust_main;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-die "Customer deletions not enabled" unless $conf->exists('deletecustomers');
-
-if ( $cgi->param('error') ) {
-  $custnum = $cgi->param('custnum');
-  $new_custnum = $cgi->param('new_custnum');
-} else {
-  ($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/ or die "Illegal query: $query";
-  $custnum = $1;
-  $new_custnum = '';
-}
-$cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } )
-  or die "Customer not found: $custnum";
-
-print $cgi->header ( '-expires' => 'now' ), header('Delete customer');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print 
-  qq!<form action="!, popurl(1), qq!process/delete-customer.cgi" method=post>!,
-  qq!<input type="hidden" name="custnum" value="$custnum">!;
-
-if ( qsearch('cust_pkg', { 'custnum' => $custnum, 'cancel' => '' } ) ) {
-  print "Move uncancelled packages to customer number ",
-        qq!<input type="text" name="new_custnum" value="$new_custnum"><br><br>!;
-}
-
-print <<END;
-This will <b>completely remove</b> all traces of this customer record.
-<br>Are you <b>absolutely sure</b> you want to delete this customer?
-<br><input type="submit" value="Yes">
-</form></body></html>
-END
-
diff --git a/htdocs/misc/expire_pkg.cgi b/htdocs/misc/expire_pkg.cgi
deleted file mode 100755
index cf1f23153..000000000
--- a/htdocs/misc/expire_pkg.cgi
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: expire_pkg.cgi,v 1.4 1999-02-28 00:03:50 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/expire_pkg.cgi
-#
-# based on susp_pkg
-# ivan@voicenet.com 97-jul-29
-#
-# ivan@sisd.com 98-mar-17 FS::Search->FS::Record
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-# 
-# $Log: expire_pkg.cgi,v $
-# Revision 1.4  1999-02-28 00:03:50  ivan
-# removed misleading comments
-#
-# Revision 1.3  1999/01/19 05:14:05  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.2  1998/12/17 09:12:44  ivan
-# s/CGI::(Request|Base)/CGI.pm/;
-#
-
-use strict;
-use vars qw ( $cgi $date $pkgnum $cust_pkg %hash $new $error );
-use Date::Parse;
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl eidiot);
-use FS::Record qw(qsearchs);
-use FS::cust_pkg;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-#untaint date & pkgnum
-
-if ( $cgi->param('date') ) {
-  str2time($cgi->param('date')) =~ /^(\d+)$/ or die "Illegal date";
-  $date=$1;
-} else {
-  $date='';
-}
-
-$cgi->param('pkgnum') =~ /^(\d+)$/ or die "Illegal pkgnum";
-$pkgnum = $1;
-
-$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-%hash = $cust_pkg->hash;
-$hash{expire}=$date;
-$new = new FS::cust_pkg ( \%hash );
-$error = $new->replace($cust_pkg);
-&eidiot($error) if $error;
-
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
-
diff --git a/htdocs/misc/link.cgi b/htdocs/misc/link.cgi
deleted file mode 100755
index eb1780711..000000000
--- a/htdocs/misc/link.cgi
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: link.cgi,v 1.7 1999-04-08 11:31:40 ivan Exp $
-#
-# ivan@voicenet.com 97-feb-5
-#
-# rewrite ivan@sisd.com 98-mar-17
-#
-# can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
-#
-# $Log: link.cgi,v $
-# Revision 1.7  1999-04-08 11:31:40  ivan
-# *** empty log message ***
-#
-# Revision 1.6  1999/02/28 00:03:51  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/01/19 05:14:06  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:36  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/23 03:03:39  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:12:45  ivan
-# s/CGI::(Request|Base)/CGI.pm/;
-#
-
-use strict;
-use vars qw ( %link_field $cgi $pkgnum $svcpart $query $part_svc $svc $svcdb 
-              $link_field );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl header);
-use FS::Record qw(qsearchs);
-
-%link_field = (
-  'svc_acct'    => 'username',
-  'svc_domain'  => 'domain',
-  'svc_acct_sm' => '',
-  'svc_charge'  => '',
-  'svc_wo'      => '',
-);
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-($query) = $cgi->keywords;
-foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
-  $pkgnum=$1 if /^pkgnum(\d+)$/;
-  $svcpart=$1 if /^svcpart(\d+)$/;
-}
-
-$part_svc = qsearchs('part_svc',{'svcpart'=>$svcpart});
-$svc = $part_svc->getfield('svc');
-$svcdb = $part_svc->getfield('svcdb');
-$link_field = $link_field{$svcdb};
-
-print $cgi->header( '-expires' => 'now' ), header("Link to existing $svc"),
-      qq!<FORM ACTION="!, popurl(1), qq!process/link.cgi" METHOD=POST>!;
-
-if ( $link_field ) { 
-  print <<END;
-  <INPUT TYPE="hidden" NAME="svcnum" VALUE="">
-  <INPUT TYPE="hidden" NAME="link_field" VALUE="$link_field">
-  $link_field of existing service: <INPUT TYPE="text" NAME="link_value">
-END
-} else {
-  print qq!Service # of existing service: <INPUT TYPE="text" NAME="svcnum" VALUE="">!;
-}
-
-print <<END;
-<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
-<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
-<P><CENTER><INPUT TYPE="submit" VALUE="Link"></CENTER>
-    </FORM>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/misc/print-invoice.cgi b/htdocs/misc/print-invoice.cgi
deleted file mode 100755
index 213f15406..000000000
--- a/htdocs/misc/print-invoice.cgi
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: print-invoice.cgi,v 1.4 1999-01-19 05:14:07 ivan Exp $
-#
-# just a kludge for now, since this duplicates in a way it shouldn't stuff from
-# Bill.pm (like $lpr) ivan@sisd.com 98-jun-16
-#
-# $Log: print-invoice.cgi,v $
-# Revision 1.4  1999-01-19 05:14:07  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1998/12/23 03:04:24  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:12:47  ivan
-# s/CGI::(Request|Base)/CGI.pm/;
-#
-
-use strict;
-use vars qw($conf $cgi $lpr $query $invnum $cust_bill $custnum );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearchs);
-use FS::cust_bill;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$lpr = $conf->config('lpr');
-
-#untaint invnum
-($query) = $cgi->keywords;
-$query =~ /^(\d*)$/;
-$invnum = $1;
-$cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
-die "Can't find invoice!\n" unless $cust_bill;
-
-        open(LPR,"|$lpr") or die "Can't open $lpr: $!";
-        print LPR $cust_bill->print_text; #( date )
-        close LPR
-          or die $! ? "Error closing $lpr: $!"
-                       : "Exit status $? from $lpr";
-
-$custnum = $cust_bill->getfield('custnum');
-
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum#history");
-
diff --git a/htdocs/misc/process/delete-customer.cgi b/htdocs/misc/process/delete-customer.cgi
deleted file mode 100755
index 0a939c559..000000000
--- a/htdocs/misc/process/delete-customer.cgi
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: delete-customer.cgi,v 1.1 1999-04-15 16:44:36 ivan Exp $
-#
-# $Log: delete-customer.cgi,v $
-# Revision 1.1  1999-04-15 16:44:36  ivan
-# delete customers
-#
-
-use strict;
-use vars qw ( $cgi $conf $custnum $new_custnum $cust_main $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs);
-use FS::CGI qw(popurl);
-use FS::cust_main;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-die "Customer deletions not enabled" unless $conf->exists('deletecustomers');
-
-$cgi->param('custnum') =~ /^(\d+)$/;
-$custnum = $1;
-if ( $cgi->param('new_custnum') ) {
-  $cgi->param('new_custnum') =~ /^(\d+)$/
-    or die "Illegal new customer number: ". $cgi->param('new_custnum');
-  $new_custnum = $1;
-} else {
-  $new_custnum = '';
-}
-$cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } )
-  or die "Customer not found: $custnum";
-
-$error = $cust_main->delete($new_custnum);
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "delete-customer.cgi?". $cgi->query_string );
-} elsif ( $new_custnum ) {
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$new_custnum");
-} else {
-  print $cgi->redirect(popurl(3));
-}
diff --git a/htdocs/misc/process/link.cgi b/htdocs/misc/process/link.cgi
deleted file mode 100755
index 7d6bd506f..000000000
--- a/htdocs/misc/process/link.cgi
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: link.cgi,v 1.6 2000-07-17 17:59:33 ivan Exp $
-#
-# ivan@voicenet.com 97-feb-5
-#
-# rewrite ivan@sisd.com 98-mar-18
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
-#
-# $Log: link.cgi,v $
-# Revision 1.6  2000-07-17 17:59:33  ivan
-# oops
-#
-# Revision 1.5  1999/04/15 14:09:17  ivan
-# get rid of top-level my() variables
-#
-# Revision 1.4  1999/02/07 09:59:35  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.3  1999/01/19 05:14:10  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.2  1998/12/17 09:15:00  ivan
-# s/CGI::Request/CGI.pm/;
-#
-
-use strict;
-use vars qw ( $cgi $old $new $error $pkgnum $svcpart $svcnum );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::CGI qw(popurl idiot eidiot);
-use FS::UID qw(cgisuidsetup);
-use FS::cust_svc;
-use FS::Record qw(qsearchs);
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-$cgi->param('pkgnum') =~ /^(\d+)$/;
-$pkgnum = $1;
-$cgi->param('svcpart') =~ /^(\d+)$/;
-$svcpart = $1;
-$cgi->param('svcnum') =~ /^(\d*)$/;
-$svcnum = $1;
-
-unless ( $svcnum ) {
-  my($part_svc) = qsearchs('part_svc',{'svcpart'=>$svcpart});
-  my($svcdb) = $part_svc->getfield('svcdb');
-  $cgi->param('link_field') =~ /^(\w+)$/; my($link_field)=$1;
-  my($svc_acct)=qsearchs($svcdb,{$link_field => $cgi->param('link_value') });
-  eidiot("$link_field not found!") unless $svc_acct;
-  $svcnum=$svc_acct->svcnum;
-}
-
-$old = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-die "svcnum not found!" unless $old;
-$new = new FS::cust_svc ({
-  'svcnum' => $svcnum,
-  'pkgnum' => $pkgnum,
-  'svcpart' => $svcpart,
-});
-
-$error = $new->replace($old);
-
-unless ($error) {
-  #no errors, so let's view this customer.
-  print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?$pkgnum");
-} else {
-  idiot($error);
-}
-
diff --git a/htdocs/misc/susp_pkg.cgi b/htdocs/misc/susp_pkg.cgi
deleted file mode 100755
index abe4f70b0..000000000
--- a/htdocs/misc/susp_pkg.cgi
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: susp_pkg.cgi,v 1.6 1999-04-08 10:35:02 ivan Exp $
-#
-# Usage: susp_pkg.cgi pkgnum
-#        http://server.name/path/susp_pkg.cgi pkgnum
-#
-# probably should generalize this to do cancels, suspensions, unsuspensions, etc.
-#
-# ivan@voicenet.com 97-feb-27
-#
-# now redirects to enter comments
-# ivan@voicenet.com 97-may-8
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-21
-#
-# FS::Search -> FS::Record ivan@sisd.com 98-mar-17
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: susp_pkg.cgi,v $
-# Revision 1.6  1999-04-08 10:35:02  ivan
-# import necessary subroutines from FS::CGI
-#
-# Revision 1.5  1999/02/28 00:03:52  ivan
-# removed misleading comments
-#
-# Revision 1.4  1999/01/19 05:14:08  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1998/12/23 03:04:56  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:12:48  ivan
-# s/CGI::(Request|Base)/CGI.pm/;
-#
-
-use strict;
-use vars qw( $cgi $query $pkgnum $cust_pkg $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs);
-use FS::CGI qw(popurl eidiot);
-use FS::cust_pkg;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
- 
-#untaint pkgnum
-($query) = $cgi->keywords;
-$query =~ /^(\d+)$/ || die "Illegal pkgnum";
-$pkgnum = $1;
-
-$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-
-$error = $cust_pkg->suspend;
-&eidiot($error) if $error;
-
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
-
diff --git a/htdocs/misc/unsusp_pkg.cgi b/htdocs/misc/unsusp_pkg.cgi
deleted file mode 100755
index 9e60064c3..000000000
--- a/htdocs/misc/unsusp_pkg.cgi
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: unsusp_pkg.cgi,v 1.5 1999-02-28 00:03:53 ivan Exp $
-#
-# Usage: susp_pkg.cgi pkgnum
-#        http://server.name/path/susp_pkg.cgi pkgnum
-#
-# probably should generalize this to do cancels, suspensions, unsuspensions, etc.
-#
-# ivan@voicenet.com 97-feb-27
-#
-# now redirects to enter comments
-# ivan@voicenet.com 97-may-8
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-21
-#
-# FS::Search -> FS::Record ivan@sisd.com 98-mar-17
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: unsusp_pkg.cgi,v $
-# Revision 1.5  1999-02-28 00:03:53  ivan
-# removed misleading comments
-#
-# Revision 1.4  1999/01/19 05:14:09  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1998/12/23 03:05:25  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:12:49  ivan
-# s/CGI::(Request|Base)/CGI.pm/;
-#
-
-use strict;
-use vars qw( $cgi $query $pkgnum $cust_pkg $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl eidiot);
-use FS::Record qw(qsearchs);
-use FS::cust_pkg;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
- 
-#untaint pkgnum
-($query) = $cgi->keywords;
-$query =~ /^(\d+)$/ || die "Illegal pkgnum";
-$pkgnum = $1;
-
-$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-
-$error = $cust_pkg->unsuspend;
-&eidiot($error) if $error;
-
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
-
diff --git a/htdocs/search/cust_bill.cgi b/htdocs/search/cust_bill.cgi
deleted file mode 100755
index 0645d1cc0..000000000
--- a/htdocs/search/cust_bill.cgi
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_bill.cgi,v 1.6 2001-04-22 01:38:39 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/cust_bill.cgi
-#
-# ivan@voicenet.com 97-apr-4
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cust_bill.cgi,v $
-# Revision 1.6  2001-04-22 01:38:39  ivan
-# svc_domain needs to import dbh sub from Record
-# view/cust_main.cgi needs to use ->owed method, not check (depriciated) owed field
-# search/cust_bill.cgi redirect error when there's only one invoice
-#
-# Revision 1.5  2000/07/17 16:45:41  ivan
-# first shot at invoice browsing and some other cleanups
-#
-# Revision 1.4  1999/02/28 00:03:54  ivan
-# removed misleading comments
-#
-# Revision 1.3  1999/01/19 05:14:11  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.2  1998/12/17 09:41:07  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
-
-use strict;
-use vars qw ( $cgi $invnum $query $sortby @cust_bill );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl header menubar eidiot table );
-use FS::Record qw(qsearch qsearchs);
-use FS::cust_bill;
-use FS::cust_main;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-if ( $cgi->keywords ) {
-  my($query) = $cgi->keywords;
-  if ( $query eq 'invnum' ) {
-    $sortby = \*invnum_sort;
-    @cust_bill = qsearch('cust_bill', {} );
-  } elsif ( $query eq 'date' ) {
-    $sortby = \*date_sort;
-    @cust_bill = qsearch('cust_bill', {} );
-  } elsif ( $query eq 'custnum' ) {
-    $sortby = \*custnum_sort;
-    @cust_bill = qsearch('cust_bill', {} );
-  } elsif ( $query eq 'OPEN_invnum' ) {
-    $sortby = \*invnum_sort;
-    @cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
-  } elsif ( $query eq 'OPEN_date' ) {
-    $sortby = \*date_sort;
-    @cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
-  } elsif ( $query eq 'OPEN_custnum' ) {
-    $sortby = \*custnum_sort;
-    @cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
-  } elsif ( $query =~ /^OPEN(\d+)_invnum$/ ) {
-    my $open = $1 * 86400;
-    $sortby = \*invnum_sort;
-    @cust_bill =
-      grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
-  } elsif ( $query =~ /^OPEN(\d+)_date$/ ) {
-    my $open = $1 * 86400;
-    $sortby = \*date_sort;
-    @cust_bill =
-      grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
-  } elsif ( $query =~ /^OPEN(\d+)_custnum$/ ) {
-    my $open = $1 * 86400;
-    $sortby = \*custnum_sort;
-    @cust_bill =
-      grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
-  } else {
-    die "unknown query string $query";
-  }
-} else {
-  $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
-  $invnum = $2;
-  @cust_bill = qsearchs('cust_bill', { 'invnum' => $invnum } );
-  $sortby = \*invnum_sort;
-}
-
-if ( scalar(@cust_bill) == 1 ) {
-  my $invnum = $cust_bill[0]->invnum;
-  print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
-} elsif ( scalar(@cust_bill) == 0 ) {
-  eidiot("Invoice not found.");
-} else {
-  my $total = scalar(@cust_bill);
-  print $cgi->header( '-expires' => 'now' ),
-        &header("Invoice Search Results", menubar(
-          'Main Menu', popurl(2)
-        )), "$total matching invoices found<BR>", &table(), <<END;
-      <TR>
-        <TH></TH>
-        <TH>Balance</TH>
-        <TH>Amount</TH>
-        <TH>Date</TH>
-        <TH>Contact name</TH>
-        <TH>Company</TH>
-      </TR>
-END
-
-  my(%saw, $cust_bill);
-  foreach $cust_bill (
-    sort $sortby grep(!$saw{$_->invnum}++, @cust_bill)
-  ) {
-    my($invnum, $owed, $charged, $date ) = (
-      $cust_bill->invnum,
-      $cust_bill->owed,
-      $cust_bill->charged,
-      $cust_bill->_date,
-    );
-    my $pdate = time2str("%b %d %Y", $date);
-
-    my $rowspan = 1;
-
-    my $view = popurl(2). "view/cust_bill.cgi?$invnum";
-    print <<END;
-      <TR>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$invnum</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>\$$owed</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>\$$charged</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$pdate</FONT></A></TD>
-END
-    my $custnum = $cust_bill->custnum;
-    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
-    if ( $cust_main ) {
-      my $cview = popurl(2). "view/cust_main.cgi?". $cust_main->custnum;
-      my ( $name, $company ) = (
-        $cust_main->last. ', '. $cust_main->first,
-        $cust_main->company,
-      );
-      print <<END;
-        <TD ROWSPAN=$rowspan><A HREF="$cview"><FONT SIZE=-1>$name</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$cview"><FONT SIZE=-1>$company</FONT></A></TD>
-END
-    } else {
-      print <<END
-        <TD ROWSPAN=$rowspan COLSPAN=2>WARNING: couldn't find cust_main.custnum $custnum (cust_bill.invnum $invnum)</TD>
-END
-    }
-
-    print "</TR>";
-  }
-
-  print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-}
-
-#
-
-sub invnum_sort {
-  $a->invnum <=> $b->invnum;
-}
-
-sub custnum_sort {
-  $a->custnum <=> $b->custnum || $a->invnum <=> $b->invnum;
-}
-
-sub date_sort {
-  $a->_date <=> $b->_date || $a->invnum <=> $b->invnum;
-}
diff --git a/htdocs/search/cust_bill.html b/htdocs/search/cust_bill.html
deleted file mode 100755
index 4adb40e4a..000000000
--- a/htdocs/search/cust_bill.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Invoice Search</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Invoice Search</H1>
-    </CENTER>
-    <HR>
-    <FORM ACTION="cust_bill.cgi" METHOD="post">
-      Search for <B>invoice #</B>: 
-      <INPUT TYPE="text" NAME="invnum">
-
-      <P><INPUT TYPE="submit" VALUE="Search">
-
-    </FORM>
-
-  <HR>
-  </BODY>
-</HTML>
-
diff --git a/htdocs/search/cust_main-payinfo.html b/htdocs/search/cust_main-payinfo.html
deleted file mode 100755
index 47bb83cbd..000000000
--- a/htdocs/search/cust_main-payinfo.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Customer Search</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#ffffff">
-    <FONT COLOR="#ff0000" SIZE=7>
-      Customer Search
-    </FONT>
-    <BR>
-    <FORM ACTION="cust_main.cgi" METHOD="post">
-      Search for <B>Credit card #</B>: 
-      <INPUT TYPE="hidden" NAME="card_on" VALUE="TRUE">
-      <INPUT TYPE="text" NAME="card">
-
-      <P><INPUT TYPE="submit" VALUE="Search">
-
-    </FORM>
-  </BODY>
-</HTML>
-
diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
deleted file mode 100755
index 1b4a5a54a..000000000
--- a/htdocs/search/cust_main.cgi
+++ /dev/null
@@ -1,311 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_main.cgi,v 1.17 2001-04-23 16:07:54 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/cust_main.cgi
-#
-# ivan@voicenet.com 96-dec-12
-#
-# rewrite ivan@sisd.com 98-mar-4
-#
-# now does browsing too ivan@sisd.com 98-mar-6
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# display total, use FS::CGI ivan@sisd.com 98-jul-17
-#
-# $Log: cust_main.cgi,v $
-# Revision 1.17  2001-04-23 16:07:54  ivan
-# fix
-# Insecure dependency in eval while running with -T switch at /usr/local/lib/site_perl/FS/Record.pm line 202.
-#
-# Revision 1.16  2001/02/07 19:45:45  ivan
-# tyop
-#
-# Revision 1.15  2000/07/17 16:45:41  ivan
-# first shot at invoice browsing and some other cleanups
-#
-# Revision 1.14  1999/08/12 04:45:21  ivan
-# typo - missed a paren
-#
-# Revision 1.13  1999/08/12 04:32:21  ivan
-# hidecancelledcustomers
-#
-# Revision 1.12  1999/07/17 10:38:52  ivan
-# scott nelson <scott@ultimanet.com> noticed this mod_perl-triggered bug and
-# gave me a great bugreport at the last rhythmethod
-#
-# Revision 1.11  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.10  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.9  1999/02/28 00:03:55  ivan
-# removed misleading comments
-#
-# Revision 1.8  1999/02/07 09:59:36  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.7  1999/01/25 12:19:11  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.6  1999/01/19 05:14:12  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:37  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1998/12/30 00:57:50  ivan
-# bug
-#
-# Revision 1.3  1998/12/17 09:41:08  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
-# Revision 1.2  1998/11/12 08:10:22  ivan
-# CGI.pm instead of CGI-modules
-# relative URLs using popurl
-# got rid of lots of little tables
-# s/agrep/String::Approx/;
-# bubble up packages and services and link (slow)
-#
-
-use strict;
-#use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
-use vars qw( $conf %all_pkgs $cgi @cust_main $sortby );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use IO::Handle;
-use String::Approx qw(amatch);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar eidiot popurl table);
-use FS::cust_main;
-use FS::cust_svc;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-
-if ( $cgi->keywords ) {
-  my($query)=$cgi->keywords;
-  if ( $query eq 'custnum' ) {
-    $sortby=\*custnum_sort;
-    @cust_main=qsearch('cust_main',{});  
-  } elsif ( $query eq 'last' ) {
-    $sortby=\*last_sort;
-    @cust_main=qsearch('cust_main',{});  
-  } elsif ( $query eq 'company' ) {
-    $sortby=\*company_sort;
-    @cust_main=qsearch('cust_main',{});
-  } else {
-    die "unknown query string $query";
-  }
-} else {
-  @cust_main=();
-  &cardsearch if ( $cgi->param('card_on') && $cgi->param('card') );
-  &lastsearch if ( $cgi->param('last_on') && $cgi->param('last_text') );
-  &companysearch if ( $cgi->param('company_on') && $cgi->param('company_text') );
-}
-
-@cust_main = grep { $_->ncancelled_pkgs || ! $_->all_pkgs } @cust_main
-  if $conf->exists('hidecancelledcustomers');
-if ( $conf->exists('hidecancelledpackages' ) ) {
-  %all_pkgs = map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
-} else {
-  %all_pkgs = map { $_->custnum => [ $_->all_pkgs ] } @cust_main;
-}
-
-if ( scalar(@cust_main) == 1 ) {
-  print $cgi->redirect(popurl(2). "view/cust_main.cgi?". $cust_main[0]->custnum);
-  exit;
-} elsif ( scalar(@cust_main) == 0 ) {
-  eidiot "No matching customers found!\n";
-} else { 
-
-  my($total)=scalar(@cust_main);
-  print $cgi->header( '-expires' => 'now' ), header("Customer Search Results",menubar(
-    'Main Menu', popurl(2)
-  )), "$total matching customers found<BR>", &table(), <<END;
-      <TR>
-        <TH></TH>
-        <TH>Contact name</TH>
-        <TH>Company</TH>
-        <TH>Packages</TH>
-        <TH COLSPAN=2>Services</TH>
-      </TR>
-END
-
-  my(%saw,$cust_main);
-  foreach $cust_main (
-    sort $sortby grep(!$saw{$_->custnum}++, @cust_main)
-  ) {
-    my($custnum,$last,$first,$company)=(
-      $cust_main->custnum,
-      $cust_main->getfield('last'),
-      $cust_main->getfield('first'),
-      $cust_main->company,
-    );
-
-    my(@lol_cust_svc);
-    my($rowspan)=0;#scalar( @{$all_pkgs{$custnum}} );
-    foreach ( @{$all_pkgs{$custnum}} ) {
-      my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
-      push @lol_cust_svc, \@cust_svc;
-      $rowspan += scalar(@cust_svc) || 1;
-    }
-
-    #my($rowspan) = scalar(@{$all_pkgs{$custnum}});
-    my($view) = popurl(2). "view/cust_main.cgi?$custnum";
-    print <<END;
-    <TR>
-      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$custnum</FONT></A></TD>
-      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$last, $first</FONT></A></TD>
-      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$company</FONT></A></TD>
-END
-
-    my($n1)='';
-    foreach ( @{$all_pkgs{$custnum}} ) {
-      my($pkgnum) = ($_->pkgnum);
-      my($pkg) = $_->part_pkg->pkg;
-      my $comment = $_->part_pkg->comment;
-      my($pkgview) = popurl(2). "/view/cust_pkg.cgi?$pkgnum";
-      #my(@cust_svc) = shift @lol_cust_svc;
-      my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
-      my($rowspan) = scalar(@cust_svc) || 1;
-
-      print $n1, qq!<TD ROWSPAN=$rowspan><A HREF="$pkgview"><FONT SIZE=-1>$pkg - $comment</FONT></A></TD>!;
-      my($n2)='';
-      foreach my $cust_svc ( @cust_svc ) {
-         my($label, $value, $svcdb) = $cust_svc->label;
-         my($svcnum) = $cust_svc->svcnum;
-         my($sview) = popurl(2). "/view";
-         print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
-               qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
-         $n2="</TR><TR>";
-      }
-      #print qq!</TR><TR>\n!;
-      $n1="</TR><TR>";
-    }
-    print "</TR>";
-  }
- 
-  print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-}
-
-#
-
-sub last_sort {
-  $a->getfield('last') cmp $b->getfield('last');
-}
-
-sub company_sort {
-  return -1 if $a->company && ! $b->company;
-  return 1 if ! $a->company && $b->company;
-  $a->getfield('company') cmp $b->getfield('company');
-}
-
-sub custnum_sort {
-  $a->getfield('custnum') <=> $b->getfield('custnum');
-}
-
-sub cardsearch {
-
-  my($card)=$cgi->param('card');
-  $card =~ s/\D//g;
-  $card =~ /^(\d{13,16})$/ or eidiot "Illegal card number\n";
-  my($payinfo)=$1;
-
-  push @cust_main, qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'CARD'});
-
-}
-
-sub lastsearch {
-  my(%last_type);
-  foreach ( $cgi->param('last_type') ) {
-    $last_type{$_}++;
-  }
-
-  $cgi->param('last_text') =~ /^([\w \,\.\-\']*)$/
-    or eidiot "Illegal last name";
-  my($last)=$1;
-
-  if ( $last_type{'Exact'}
-       && ! $last_type{'Fuzzy'} 
-     #  && ! $last_type{'Sound-alike'}
-  ) {
-
-    push @cust_main, qsearch('cust_main',{'last'=>$last});
-
-  } else {
-
-    my(%last);
-
-    my(@all_last)=map $_->getfield('last'), qsearch('cust_main',{});
-    if ($last_type{'Fuzzy'}) { 
-      foreach ( amatch($last, [ qw(i) ], @all_last) ) {
-        $last{$_}++; 
-      }
-    }
-
-    #if ($last_type{'Sound-alike'}) {
-    #}
-
-    foreach ( keys %last ) {
-      push @cust_main, qsearch('cust_main',{'last'=>$_});
-    }
-
-  }
-  $sortby=\*last_sort;
-}
-
-sub companysearch {
-
-  my(%company_type);
-  foreach ( $cgi->param('company_type') ) {
-    $company_type{$_}++ 
-  };
-
-  $cgi->param('company_text') =~ /^([\w \,\.\-\']*)$/
-    or eidiot "Illegal company";
-  my($company)=$1;
-
-  if ( $company_type{'Exact'}
-       && ! $company_type{'Fuzzy'} 
-     #  && ! $company_type{'Sound-alike'}
-  ) {
-
-    push @cust_main, qsearch('cust_main',{'company'=>$company});
-
-  } else {
-
-    my(%company);
-    my(@all_company)=map $_->company, qsearch('cust_main',{});
-
-    if ($company_type{'Fuzzy'}) { 
-      foreach ( amatch($company, [ qw(i) ], @all_company ) ) {
-        $company{$_}++;
-      }
-    }
-
-    #if ($company_type{'Sound-alike'}) {
-    #}
-
-    foreach ( keys %company ) {
-      push @cust_main, qsearch('cust_main',{'company'=>$_});
-    }
-
-  }
-  $sortby=\*company_sort;
-
-}
diff --git a/htdocs/search/cust_main.html b/htdocs/search/cust_main.html
deleted file mode 100755
index 3184698b4..000000000
--- a/htdocs/search/cust_main.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Customer Search</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#ffffff">
-    <FONT COLOR="#ff0000" SIZE=7>
-      Customer Search
-    </FONT>
-    <BR>
-    <FORM ACTION="cust_main.cgi" METHOD="post">
-      <INPUT TYPE="checkbox" NAME="last_on" CHECKED> Search for <B>last name</B>: 
-      <INPUT TYPE="text" NAME="last_text">
-      using search method: <SELECT NAME="last_type">
-        <OPTION SELECTED>Fuzzy
-        <OPTION>Exact
-      </SELECT>
-
-      <P><INPUT TYPE="checkbox" NAME="company_on" CHECKED> Search for <B>company</B>: 
-      <INPUT TYPE="text" NAME="company_text">
-      using search methods: <SELECT NAME="company_type">
-        <OPTION SELECTED>Fuzzy
-        <OPTION>Exact
-      </SELECT>
-
-      <P><INPUT TYPE="submit" VALUE="Search"> Note: Fuzzy searching can take a while.  Please be patient.
-
-    </FORM>
-
-  <HR>Explanation of search methods:
-  <UL>
-    <LI><B>Fuzzy</B> - Searches for matches that are close to your text.
-    <LI><B>Exact</B> - Finds exact matches only, but much faster than the other search methods.
-  </UL>
-  </BODY>
-</HTML>
-
diff --git a/htdocs/search/cust_pkg.cgi b/htdocs/search/cust_pkg.cgi
deleted file mode 100755
index b6439d654..000000000
--- a/htdocs/search/cust_pkg.cgi
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_pkg.cgi,v 1.11 2000-07-17 16:45:41 ivan Exp $
-#
-# based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
-#
-# $Log: cust_pkg.cgi,v $
-# Revision 1.11  2000-07-17 16:45:41  ivan
-# first shot at invoice browsing and some other cleanups
-#
-# Revision 1.10  2000/07/17 12:49:29  ivan
-# better error message if a package isn't linked to a customer (that shouldn't happen)
-#
-# Revision 1.9  1999/07/17 10:38:52  ivan
-# scott nelson <scott@ultimanet.com> noticed this mod_perl-triggered bug and
-# gave me a great bugreport at the last rhythmethod
-#
-# Revision 1.8  1999/02/09 09:22:57  ivan
-# visual and bugfixes
-#
-# Revision 1.7  1999/02/07 09:59:37  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.6  1999/01/19 05:14:13  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:38  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1999/01/18 09:22:33  ivan
-# changes to track email addresses for email invoicing
-#
-# Revision 1.3  1998/12/23 03:05:59  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:41:09  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
-
-use strict;
-use vars qw ( $cgi @cust_pkg $sortby $query );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header eidiot popurl);
-use FS::cust_pkg;
-use FS::pkg_svc;
-use FS::cust_svc;
-use FS::cust_main;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-($query) = $cgi->keywords;
-#this tree is a little bit redundant
-if ( $query eq 'pkgnum' ) {
-  $sortby=\*pkgnum_sort;
-  @cust_pkg=qsearch('cust_pkg',{});
-} elsif ( $query eq 'APKG_pkgnum' ) {
-  $sortby=\*pkgnum_sort;
-  @cust_pkg=();
-  #perhaps this should go in cust_pkg as a qsearch-like constructor?
-  my($cust_pkg);
-  foreach $cust_pkg (qsearch('cust_pkg',{})) {
-    my($flag)=0;
-    my($pkg_svc);
-    PKG_SVC: 
-    foreach $pkg_svc (qsearch('pkg_svc',{ 'pkgpart' => $cust_pkg->pkgpart })) {
-      if ( $pkg_svc->quantity 
-           > scalar(qsearch('cust_svc',{
-               'pkgnum' => $cust_pkg->pkgnum,
-               'svcpart' => $pkg_svc->svcpart,
-             }))
-         )
-      {
-        $flag=1;
-        last PKG_SVC;
-      }
-    }
-    push @cust_pkg, $cust_pkg if $flag;
-  }
-} else {
-  die "Empty QUERY_STRING!";
-}
-
-if ( scalar(@cust_pkg) == 1 ) {
-  my($pkgnum)=$cust_pkg[0]->pkgnum;
-  print $cgi->redirect(popurl(2). "view/cust_pkg.cgi?$pkgnum");
-  exit;
-} elsif ( scalar(@cust_pkg) == 0 ) { #error
-  eidiot("No packages found");
-} else {
-  my($total)=scalar(@cust_pkg);
-  print $cgi->header( '-expires' => 'now' ), header('Package Search Results',''), <<END;
-    $total matching packages found
-    <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
-      <TR>
-        <TH>Package #</TH>
-        <TH>Customer #</TH>
-        <TH>Contact name</TH>
-        <TH>Company</TH>
-      </TR>
-END
-
-  my(%saw,$cust_pkg);
-  foreach $cust_pkg (
-    sort $sortby grep(!$saw{$_->pkgnum}++, @cust_pkg)
-  ) {
-    my($cust_main)=qsearchs('cust_main',{'custnum'=>$cust_pkg->custnum});
-    my($pkgnum,$custnum,$name,$company)=(
-      $cust_pkg->pkgnum,
-      $cust_pkg->custnum,
-      $cust_main ? $cust_main->last. ', '. $cust_main->first : '',
-      $cust_main ? $cust_main->company : '',
-    );
-    my $p = popurl(2);
-    print <<END;
-    <TR>
-      <TD><A HREF="${p}view/cust_pkg.cgi?$pkgnum"><FONT SIZE=-1>$pkgnum</FONT></A></TD>
-END
-    if ( $cust_main ) {
-      print <<END;
-      <TD><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$custnum</A></FONT></TD>
-      <TD><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$name</A></FONT></TD>
-      <TD><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$company</A></FONT></TD>
-    </TR>
-END
-    } else {
-      print <<END;
-      <TD COLSPAN=3>WARNING: couldn't find cust_main.custnum $custnum (cust_pkg.pkgnum $pkgnum)</TD>
-    </TR>
-END
-    }
-  }
- 
-  print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
-  exit;
-
-}
-
-sub pkgnum_sort {
-  $a->getfield('pkgnum') <=> $b->getfield('pkgnum');
-}
-
diff --git a/htdocs/search/svc_acct.cgi b/htdocs/search/svc_acct.cgi
deleted file mode 100755
index 850865789..000000000
--- a/htdocs/search/svc_acct.cgi
+++ /dev/null
@@ -1,207 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: svc_acct.cgi,v 1.11 1999-04-14 11:25:33 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_acct.cgi
-#
-# Note: Should be run setuid freeside as user nobody.
-#
-# loosely (sp?) based on search/cust_main.cgi
-#
-# ivan@voicenet.com 96-jan-3 -> 96-jan-4
-#
-# rewrite (now does browsing too) ivan@sisd.com 98-mar-9
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# show unlinked accounts ivan@sisd.com 98-jun-22
-#
-# use FS::CGI, show total ivan@sisd.com 98-jul-17
-#
-# give service and customer info too ivan@sisd.com 98-aug-16
-#
-# $Log: svc_acct.cgi,v $
-# Revision 1.11  1999-04-14 11:25:33  ivan
-# *** empty log message ***
-#
-# Revision 1.10  1999/04/14 11:20:21  ivan
-# visual fix
-#
-# Revision 1.9  1999/04/10 01:53:18  ivan
-# oops, search usernames limited to 8 chars
-#
-# Revision 1.8  1999/04/09 23:43:29  ivan
-# just in case
-#
-# Revision 1.7  1999/02/07 09:59:38  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.6  1999/01/19 05:14:14  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:39  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1999/01/18 09:22:34  ivan
-# changes to track email addresses for email invoicing
-#
-# Revision 1.3  1998/12/23 03:06:28  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:41:10  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
-
-use strict;
-use vars qw( $cgi @svc_acct $sortby $query );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header eidiot popurl table);
-use FS::svc_acct;
-use FS::cust_main;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-($query)=$cgi->keywords;
-$query ||= ''; #to avoid use of unitialized value errors
-#this tree is a little bit redundant
-if ( $query eq 'svcnum' ) {
-  $sortby=\*svcnum_sort;
-  @svc_acct=qsearch('svc_acct',{});
-} elsif ( $query eq 'username' ) {
-  $sortby=\*username_sort;
-  @svc_acct=qsearch('svc_acct',{});
-} elsif ( $query eq 'uid' ) {
-  $sortby=\*uid_sort;
-  @svc_acct=grep $_->uid ne '', qsearch('svc_acct',{});
-} elsif ( $query eq 'UN_svcnum' ) {
-  $sortby=\*svcnum_sort;
-  @svc_acct = grep qsearchs('cust_svc',{
-      'svcnum' => $_->svcnum,
-      'pkgnum' => '',
-    }), qsearch('svc_acct',{});
-} elsif ( $query eq 'UN_username' ) {
-  $sortby=\*username_sort;
-  @svc_acct = grep qsearchs('cust_svc',{
-      'svcnum' => $_->svcnum,
-      'pkgnum' => '',
-    }), qsearch('svc_acct',{});
-} elsif ( $query eq 'UN_uid' ) {
-  $sortby=\*uid_sort;
-  @svc_acct = grep qsearchs('cust_svc',{
-      'svcnum' => $_->svcnum,
-      'pkgnum' => '',
-    }), qsearch('svc_acct',{});
-} else {
-  $sortby=\*uid_sort;
-  &usernamesearch;
-}
-
-if ( scalar(@svc_acct) == 1 ) {
-  my($svcnum)=$svc_acct[0]->svcnum;
-  print $cgi->redirect(popurl(2). "view/svc_acct.cgi?$svcnum");  #redirect
-  exit;
-} elsif ( scalar(@svc_acct) == 0 ) { #error
-  eidiot("Account not found");
-} else {
-  my($total)=scalar(@svc_acct);
-  print $cgi->header( '-expires' => 'now' ),
-        header("Account Search Results",''),
-        "$total matching accounts found",
-        &table(), <<END;
-      <TR>
-        <TH><FONT SIZE=-1>Service #</FONT></TH>
-        <TH><FONT SIZE=-1>Username</FONT></TH>
-        <TH><FONT SIZE=-1>UID</FONT></TH>
-        <TH><FONT SIZE=-1>Service</FONT></TH>
-        <TH><FONT SIZE=-1>Customer #</FONT></TH>
-        <TH><FONT SIZE=-1>Contact name</FONT></TH>
-        <TH><FONT SIZE=-1>Company</FONT></TH>
-      </TR>
-END
-
-  my(%saw,$svc_acct);
-  my $p = popurl(2);
-  foreach $svc_acct (
-    sort $sortby grep(!$saw{$_->svcnum}++, @svc_acct)
-  ) {
-    my $cust_svc = qsearchs('cust_svc', { 'svcnum' => $svc_acct->svcnum })
-      or die "No cust_svc record for svcnum ". $svc_acct->svcnum;
-    my $part_svc = qsearchs('part_svc', { 'svcpart' => $cust_svc->svcpart })
-      or die "No part_svc record for svcpart ". $cust_svc->svcpart;
-    my($cust_pkg,$cust_main);
-    if ( $cust_svc->pkgnum ) {
-      $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_svc->pkgnum })
-        or die "No cust_pkg record for pkgnum ". $cust_svc->pkgnum;
-      $cust_main = qsearchs('cust_main', { 'custnum' => $cust_pkg->custnum })
-        or die "No cust_main record for custnum ". $cust_pkg->custnum;
-    }
-    my($svcnum,$username,$uid,$svc,$custnum,$last,$first,$company)=(
-      $svc_acct->svcnum,
-      $svc_acct->getfield('username'),
-      $svc_acct->getfield('uid'),
-      $part_svc->svc,
-      $cust_svc->pkgnum ? $cust_main->custnum : '',
-      $cust_svc->pkgnum ? $cust_main->getfield('last') : '',
-      $cust_svc->pkgnum ? $cust_main->getfield('first') : '',
-      $cust_svc->pkgnum ? $cust_main->company : '',
-    );
-    my($pcustnum) = $custnum
-      ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\"><FONT SIZE=-1>$custnum</FONT></A>"
-      : "<I>(unlinked)</I>"
-    ;
-    my($pname) = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$last, $first</A>" : '';
-    my $pcompany = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$company</A>" : '';
-    print <<END;
-    <TR>
-      <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
-      <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$username</FONT></A></TD>
-      <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$uid</FONT></A></TD>
-      <TD><FONT SIZE=-1>$svc</FONT></TH>
-      <TD><FONT SIZE=-1>$pcustnum</FONT></TH>
-      <TD><FONT SIZE=-1>$pname<FONT></TH>
-      <TD><FONT SIZE=-1>$pcompany</FONT></TH>
-    </TR>
-END
-
-  }
- 
-  print <<END;
-    </TABLE>
-    </CENTER>
-  </BODY>
-</HTML>
-END
-  exit;
-
-}
-
-sub svcnum_sort {
-  $a->getfield('svcnum') <=> $b->getfield('svcnum');
-}
-
-sub username_sort {
-  $a->getfield('username') cmp $b->getfield('username');
-}
-
-sub uid_sort {
-  $a->getfield('uid') <=> $b->getfield('uid');
-}
-
-sub usernamesearch {
-
-  $cgi->param('username') =~ /^([\w\d\-]+)$/; #untaint username_text
-  my($username)=$1;
-
-  @svc_acct=qsearch('svc_acct',{'username'=>$username});
-
-}
-
-
diff --git a/htdocs/search/svc_acct.html b/htdocs/search/svc_acct.html
deleted file mode 100755
index 91291be99..000000000
--- a/htdocs/search/svc_acct.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Account Search</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Account Search</H1>
-    </CENTER>
-    <HR>
-    <FORM ACTION="svc_acct.cgi" METHOD="post">
-      Search for <B>username</B>: 
-      <INPUT TYPE="text" NAME="username">
-
-      <P><INPUT TYPE="submit" VALUE="Search">
-
-    </FORM>
-
-  <HR>
-  </BODY>
-</HTML>
-
diff --git a/htdocs/search/svc_acct_sm.cgi b/htdocs/search/svc_acct_sm.cgi
deleted file mode 100755
index ddf2a1f23..000000000
--- a/htdocs/search/svc_acct_sm.cgi
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: svc_acct_sm.cgi,v 1.10 1999-07-20 06:03:36 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_domain.cgi
-#
-# ivan@voicenet.com 96-mar-5
-#
-# need to look at table in results to make it more readable
-#
-# ivan@voicenet.com
-#
-# rewrite ivan@sisd.com 98-mar-15
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: svc_acct_sm.cgi,v $
-# Revision 1.10  1999-07-20 06:03:36  ivan
-# s/CGI::Request/CGI/; (how'd i miss that before?)
-#
-# Revision 1.9  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.8  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.7  1999/02/28 00:03:56  ivan
-# removed misleading comments
-#
-# Revision 1.6  1999/02/09 09:22:58  ivan
-# visual and bugfixes
-#
-# Revision 1.5  1999/01/19 05:14:16  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:40  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 09:41:11  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
-
-use strict;
-use vars qw( $conf $cgi $mydomain $domuser $svc_domain $domsvc @svc_acct_sm );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl idiot header table);
-use FS::Record qw(qsearch qsearchs);
-use FS::Conf;
-use FS::svc_domain;
-use FS::svc_acct_sm;
-use FS::svc_acct;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$mydomain = $conf->config('domain');
-
-$cgi->param('domuser') =~ /^([a-z0-9_\-]{0,32})$/;
-$domuser = $1;
-
-$cgi->param('domain') =~ /^([\w\-\.]+)$/ or die "Illegal domain";
-$svc_domain = qsearchs('svc_domain',{'domain'=>$1})
-  or die "Unknown domain";
-$domsvc = $svc_domain->svcnum;
-
-if ($domuser) {
-  @svc_acct_sm=qsearch('svc_acct_sm',{
-    'domuser' => $domuser,
-    'domsvc'  => $domsvc,
-  });
-} else {
-  @svc_acct_sm=qsearch('svc_acct_sm',{'domsvc' => $domsvc});
-}
-
-if ( scalar(@svc_acct_sm) == 1 ) {
-  my($svcnum)=$svc_acct_sm[0]->svcnum;
-  print $cgi->redirect(popurl(2). "view/svc_acct_sm.cgi?$svcnum");
-} elsif ( scalar(@svc_acct_sm) > 1 ) {
-  print $cgi->header( '-expires' => 'now' ),
-        header('Mail Alias Search Results'),
-        &table(), <<END;
-      <TR>
-        <TH>Mail to<BR><FONT SIZE=-1>(click to view mail alias)</FONT></TH>
-        <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
-      </TR>
-END
-
-  my($svc_acct_sm);
-  foreach $svc_acct_sm (@svc_acct_sm) {
-    my($svcnum,$domuser,$domuid,$domsvc)=(
-      $svc_acct_sm->svcnum,
-      $svc_acct_sm->domuser,
-      $svc_acct_sm->domuid,
-      $svc_acct_sm->domsvc,
-    );
-
-    my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $domsvc } );
-    if ( $svc_domain ) {
-      my $domain = $svc_domain->domain;
-
-      print qq!<TR><TD><A HREF="!. popurl(2). qq!view/svc_acct_sm.cgi?$svcnum">!,
-      #print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
-            ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ),
-            qq!\@$domain</A> </TD>!,
-      ;
-    } else {
-      my $warning = "couldn't find svc_domain.svcnum $svcnum ( svc_acct_sm.svcnum $svcnum";
-      warn $warning;
-      print "<TR><TD>WARNING: $warning</TD>";
-    }
-
-    my $svc_acct = qsearchs( 'svc_acct', { 'uid' => $domuid } );
-    if ( $svc_acct ) {
-      my $username = $svc_acct->username;
-      my $svc_acct_svcnum =$svc_acct->svcnum;
-      print qq!<TD><A HREF="!, popurl(2),
-            qq!view/svc_acct.cgi?$svc_acct_svcnum">$username\@$mydomain</A>!,
-            qq!</TD></TR>!
-      ;
-    } else {
-      my $warning = "couldn't find svc_acct.uid $domuid (svc_acct_sm.svcnum $svcnum)!";
-      warn $warning;
-      print "<TD>WARNING: $warning</TD></TR>";
-    }
-
-  }
-
-  print '</TABLE></BODY></HTML>';
-
-} else { #error
-  idiot("Mail Alias not found");
-}
-
diff --git a/htdocs/search/svc_acct_sm.html b/htdocs/search/svc_acct_sm.html
deleted file mode 100755
index 0719856db..000000000
--- a/htdocs/search/svc_acct_sm.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Mail Alias Search</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Mail Alias Search</H1>
-    </CENTER>
-    <HR>
-    <FORM ACTION="svc_acct_sm.cgi" METHOD="post">
-      Search for <B>mail alias</B>: 
-      <INPUT TYPE="text" NAME="domuser"><FONT SIZE=-1>(opt.)</FONT> @
-      <INPUT TYPE="text" NAME="domain"><FONT SIZE=-1>(req.)</FONT>
-
-      <P><INPUT TYPE="submit" VALUE="Search">
-
-    </FORM>
-
-  <HR>
-
-  </BODY>
-</HTML>
-
diff --git a/htdocs/search/svc_domain.cgi b/htdocs/search/svc_domain.cgi
deleted file mode 100755
index f1d4ae461..000000000
--- a/htdocs/search/svc_domain.cgi
+++ /dev/null
@@ -1,210 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: svc_domain.cgi,v 1.11 2000-03-03 18:22:44 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_domain.cgi
-#
-# ivan@voicenet.com 97-mar-5
-#
-# rewrite ivan@sisd.com 98-mar-14
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# display total, use FS::CGI now does browsing too ivan@sisd.com 98-jul-17
-#
-# $Log: svc_domain.cgi,v $
-# Revision 1.11  2000-03-03 18:22:44  ivan
-# changes from 1.2.3 release, fixes from webdemo
-#
-# Revision 1.10  1999/07/17 10:38:52  ivan
-# scott nelson <scott@ultimanet.com> noticed this mod_perl-triggered bug and
-# gave me a great bugreport at the last rhythmethod
-#
-# Revision 1.9  1999/04/15 13:39:16  ivan
-# $cgi->header( '-expires' => 'now' )
-#
-# Revision 1.8  1999/02/28 00:03:57  ivan
-# removed misleading comments
-#
-# Revision 1.7  1999/02/23 08:09:24  ivan
-# beginnings of one-screen new customer entry and some other miscellania
-#
-# Revision 1.6  1999/02/09 09:22:59  ivan
-# visual and bugfixes
-#
-# Revision 1.5  1999/02/07 09:59:39  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:14:17  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1998/12/23 03:06:50  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:41:12  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
-
-use strict;
-use vars qw ( $cgi @svc_domain $sortby $query $conf $mydomain );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header eidiot popurl);
-use FS::svc_domain;
-use FS::cust_svc;
-use FS::svc_acct_sm;
-use FS::svc_acct;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$mydomain = $conf->config('domain');
-
-($query)=$cgi->keywords;
-$query ||= ''; #to avoid use of unitialized value errors
-if ( $query eq 'svcnum' ) {
-  $sortby=\*svcnum_sort;
-  @svc_domain=qsearch('svc_domain',{});
-} elsif ( $query eq 'domain' ) {
-  $sortby=\*domain_sort;
-  @svc_domain=qsearch('svc_domain',{});
-} elsif ( $query eq 'UN_svcnum' ) {
-  $sortby=\*svcnum_sort;
-  @svc_domain = grep qsearchs('cust_svc',{
-      'svcnum' => $_->svcnum,
-      'pkgnum' => '',
-    }), qsearch('svc_domain',{});
-} elsif ( $query eq 'UN_domain' ) {
-  $sortby=\*domain_sort;
-  @svc_domain = grep qsearchs('cust_svc',{
-      'svcnum' => $_->svcnum,
-      'pkgnum' => '',
-    }), qsearch('svc_domain',{});
-} else {
-  $cgi->param('domain') =~ /^([\w\-\.]+)$/; 
-  my($domain)=$1;
-  #push @svc_domain, qsearchs('svc_domain',{'domain'=>$domain});
-  @svc_domain = qsearchs('svc_domain',{'domain'=>$domain});
-}
-
-if ( scalar(@svc_domain) == 1 ) {
-  print $cgi->redirect(popurl(2). "view/svc_domain.cgi?". $svc_domain[0]->svcnum);
-  exit;
-} elsif ( scalar(@svc_domain) == 0 ) {
-  eidiot "No matching domains found!\n";
-} else {
-
-  my($total)=scalar(@svc_domain);
-  print $cgi->header( '-expires' => 'now' ),
-        header("Domain Search Results",''), <<END;
-
-    $total matching domains found
-    <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
-      <TR>
-        <TH>Service #</TH>
-        <TH>Domain</TH>
-        <TH>Mail to<BR><FONT SIZE=-1>(click to view mail alias)</FONT></TH>
-        <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
-      </TR>
-END
-
-  my(%saw,$svc_domain);
-  my $p = popurl(2);
-  foreach $svc_domain (
-    sort $sortby grep(!$saw{$_->svcnum}++, @svc_domain)
-  ) {
-    my($svcnum,$domain)=(
-      $svc_domain->svcnum,
-      $svc_domain->domain,
-    );
-    #my($malias);
-    #if ( qsearch('svc_acct_sm',{'domsvc'=>$svcnum}) ) {
-    #  $malias=(
-    #    qq|<FORM ACTION="svc_acct_sm.cgi" METHOD="post">|.
-    #      qq|<INPUT TYPE="hidden" NAME="domuser" VALUE="">|.
-    #      qq|<INPUT TYPE="hidden" NAME="domain" VALUE="$domain">|.
-    #      qq|<INPUT TYPE="submit" VALUE="(mail aliases)">|.
-    #      qq|</FORM>|
-    #  );
-    #} else {
-    #  $malias='';
-    #}
-
-    my @svc_acct_sm=qsearch('svc_acct_sm',{'domsvc' => $svcnum});
-    my $rowspan = scalar(@svc_acct_sm) || 1;
-
-    print <<END;
-    <TR>
-      <TD ROWSPAN=$rowspan><A HREF="${p}view/svc_domain.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
-      <TD ROWSPAN=$rowspan>$domain</TD>
-END
-
-    my $n1 = '';
-    # false laziness: this was stolen from search/svc_acct_sm.cgi.  but the
-    # web interface in general needs to be rewritten in a mucho cleaner way
-    my($svc_acct_sm);
-    foreach $svc_acct_sm (@svc_acct_sm) {
-      my($svcnum,$domuser,$domuid,$domsvc)=(
-        $svc_acct_sm->svcnum,
-        $svc_acct_sm->domuser,
-        $svc_acct_sm->domuid,
-        $svc_acct_sm->domsvc,
-      );
-      #my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $domsvc } );
-      #if ( $svc_domain ) {
-      #  my $domain = $svc_domain->domain;
-
-        print qq!$n1<TD><A HREF="!. popurl(2). qq!view/svc_acct_sm.cgi?$svcnum">!,
-        #print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
-              ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ),
-              qq!\@$domain</A> </TD>!,
-        ;
-      #} else {
-      #  my $warning = "couldn't find svc_domain.svcnum $svcnum ( svc_acct_sm.svcnum $svcnum";
-      #  warn $warning;
-      #  print "$n1<TD>WARNING: $warning</TD>";
-      #}
-
-      my $svc_acct = qsearchs( 'svc_acct', { 'uid' => $domuid } );
-      if ( $svc_acct ) {
-        my $username = $svc_acct->username;
-        my $svc_acct_svcnum =$svc_acct->svcnum;
-        print qq!<TD><A HREF="!, popurl(2),
-              qq!view/svc_acct.cgi?$svc_acct_svcnum">$username\@$mydomain</A>!,
-              qq!</TD></TR>!
-        ;
-      } else {
-        my $warning = "couldn't find svc_acct.uid $domuid (svc_acct_sm.svcnum $svcnum)!";
-        warn $warning;
-        print "<TD>WARNING: $warning</TD>";
-      }
-      $n1 = "</TR><TR>";
-    }
-    #end of false laziness
-    print "</TR>";
-
-  }
- 
-  print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-}
-
-sub svcnum_sort {
-  $a->getfield('svcnum') <=> $b->getfield('svcnum');
-}
-
-sub domain_sort {
-  $a->getfield('domain') cmp $b->getfield('doimain');
-}
-
-
diff --git a/htdocs/search/svc_domain.html b/htdocs/search/svc_domain.html
deleted file mode 100755
index 533743ba2..000000000
--- a/htdocs/search/svc_domain.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Domain Search</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Domain Search</H1>
-    </CENTER>
-    <HR>
-    <FORM ACTION="svc_domain.cgi" METHOD="post">
-      Search for <B>domain</B>: 
-      <INPUT TYPE="text" NAME="domain">
-
-      <P><INPUT TYPE="submit" VALUE="Search">
-
-    </FORM>
-
-  <HR>
-
-  </BODY>
-</HTML>
-
diff --git a/htdocs/view/cust_bill.cgi b/htdocs/view/cust_bill.cgi
deleted file mode 100755
index 93a6f7a29..000000000
--- a/htdocs/view/cust_bill.cgi
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_bill.cgi,v 1.8 1999-02-28 00:03:58 ivan Exp $
-#
-# this is a quick & ugly hack which does little more than add some formatting to the ascii output from /dbin/print-invoice
-#
-# ivan@voicenet.com 96-dec-05
-#
-# added navigation bar
-# ivan@voicenet.com 97-jan-30
-#
-# now uses Invoice.pm
-# ivan@voicenet.com 97-jun-30
-#
-# what to do if cust_bill search errors?
-# ivan@voicenet.com 97-jul-7
-#
-# s/FS::Search/FS::Record/; $cgisuidsetup($cgi); ivan@sisd.com 98-mar-14
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# also print 'printed' field ivan@sisd.com 98-jul-10
-#
-# $Log: cust_bill.cgi,v $
-# Revision 1.8  1999-02-28 00:03:58  ivan
-# removed misleading comments
-#
-# Revision 1.7  1999/01/25 12:26:03  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.6  1999/01/19 05:14:18  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:42  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1998/12/30 23:03:33  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.3  1998/12/23 03:07:49  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:57:20  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
-
-use strict;
-use vars qw ( $cgi $query $invnum $cust_bill $custnum $printed $p );
-use IO::File;
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl menubar);
-use FS::Record qw(qsearchs);
-use FS::cust_bill;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-#untaint invnum
-($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-$invnum = $1;
-
-$cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
-die "Invoice #$invnum not found!" unless $cust_bill;
-$custnum = $cust_bill->getfield('custnum');
-
-$printed = $cust_bill->printed;
-
-$p = popurl(2);
-print $cgi->header( '-expires' => 'now' ), header('Invoice View', menubar(
-  "Main Menu" => $p,
-  "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-)), <<END;
-      <A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) against this invoice</A>
-      <BR><A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>
-      <BR><BR>(Printed $printed times)
-    <PRE>
-END
-
-print $cust_bill->print_text;
-
-	#formatting
-	print <<END;
-    </PRE></FONT>
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
deleted file mode 100755
index 7c96ddffa..000000000
--- a/htdocs/view/cust_main.cgi
+++ /dev/null
@@ -1,437 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_main.cgi,v 1.20 2001-06-03 11:40:48 ivan Exp $
-#
-# Usage: cust_main.cgi custnum
-#        http://server.name/path/cust_main.cgi?custnum
-#
-# the payment history section could use some work, see below
-# 
-# ivan@voicenet.com 96-nov-29 -> 96-dec-11
-#
-# added navigation bar (go to main menu ;)
-# ivan@voicenet.com 97-jan-30
-#
-# changes to the way credits/payments are applied (the links are here).
-# ivan@voicenet.com 97-apr-21
-#
-# added debugging code to diagnose CPU sucking problem.
-# ivan@voicenet.com 97-may-19
-#
-# CPU sucking problem was in comment code?  fixed?
-# ivan@voicenet.com 97-may-22
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-22
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'day' to 'daytime' because Pg6.3 reserves the day word
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: cust_main.cgi,v $
-# Revision 1.20  2001-06-03 11:40:48  ivan
-# inline doc clarification
-#
-# Revision 1.19  2001/04/22 01:38:39  ivan
-# svc_domain needs to import dbh sub from Record
-# view/cust_main.cgi needs to use ->owed method, not check (depriciated) owed field
-# search/cust_bill.cgi redirect error when there's only one invoice
-#
-# Revision 1.18  1999/08/12 04:16:01  ivan
-# hidecancelledpackages config option
-#
-# Revision 1.17  1999/04/15 16:44:36  ivan
-# delete customers
-#
-# Revision 1.16  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.15  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.14  1999/04/08 04:04:37  ivan
-# eliminate double // in links
-#
-# Revision 1.13  1999/02/28 00:04:00  ivan
-# removed misleading comments
-#
-# Revision 1.12  1999/02/07 09:59:40  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.11  1999/01/25 12:26:04  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.10  1999/01/19 05:14:19  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.9  1999/01/18 09:41:43  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.8  1999/01/18 09:22:35  ivan
-# changes to track email addresses for email invoicing
-#
-# Revision 1.7  1998/12/30 23:03:34  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.6  1998/12/23 02:42:33  ivan
-# remove double '/' in link urls
-#
-# Revision 1.5  1998/12/23 02:36:28  ivan
-# use FS::cust_refund; to eliminate warning
-#
-# Revision 1.4  1998/12/17 09:57:21  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
-# Revision 1.3  1998/11/15 13:14:20  ivan
-# first pass as per-customer custom pricing
-#
-# Revision 1.2  1998/11/13 11:28:08  ivan
-# s/CGI-modules/CGI.pm/;, relative URL's with popurl
-#
-
-use strict;
-use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
-              @packages $package @history @bills $bill @credits $credit
-              $balance $item @agents @referrals @invoicing_list $n1 $conf ); 
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs qsearch);
-use FS::CGI qw(header menubar popurl table itable ntable);
-use FS::cust_credit;
-use FS::cust_pay;
-use FS::cust_bill;
-use FS::part_pkg;
-use FS::cust_pkg;
-use FS::part_referral;
-use FS::agent;
-use FS::cust_main;
-use FS::cust_refund;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-
-print $cgi->header( '-expires' => 'now' ), header("Customer View", menubar(
-  'Main Menu' => popurl(2)
-));
-
-die "No customer specified (bad URL)!" unless $cgi->keywords;
-($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
-$query =~ /^(\d+)$/;
-$custnum = $1;
-$cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
-die "Customer not found!" unless $cust_main;
-$hashref = $cust_main->hashref;
-
-print &itable(), '<TR><TD><A NAME="cust_main"></A>';
-
-print qq!<A HREF="!, popurl(2), 
-      qq!edit/cust_main.cgi?$custnum">Edit this customer</A>!;
-print qq! | <A HREF="!, popurl(2), 
-      qq!misc/delete-customer.cgi?$custnum"> Delete this customer</A>!
-  if $conf->exists('deletecustomers');
-print &ntable("#c0c0c0"), "<TR><TD>", &ntable("#c0c0c0",2),
-      '<TR><TD ALIGN="right">Customer number</TD><TD BGCOLOR="#ffffff">',
-      $custnum, '</TD></TR>',
-;
-
-@agents = qsearch( 'agent', {} );
-unless ( scalar(@agents) == 1 ) {
-  $agent = qsearchs('agent',{
-    'agentnum' => $cust_main->agentnum
-  } );
-  print '<TR><TD ALIGN="right">Agent</TD><TD BGCOLOR="#ffffff">',
-        $agent->agentnum, ": ", $agent->agent, '</TD></TR>';
-}
-@referrals = qsearch( 'part_referral', {} );
-unless ( scalar(@referrals) == 1 ) {
-  my $referral = qsearchs('part_referral', {
-    'refnum' => $cust_main->refnum
-  } );
-  print '<TR><TD ALIGN="right">Referral</TD><TD BGCOLOR="#ffffff">',
-        $referral->refnum, ": ", $referral->referral, '</TD></TR>';
-}
-print '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
-  $cust_main->otaker, '</TD></TR>';
-
-print '</TABLE></TD></TR></TABLE>';
-
-print '</TD><TD ROWSPAN=2>';
-
-print "Contact information", &ntable("#c0c0c0"), "<TR><TD>",
-      &ntable("#c0c0c0",2),
-  '<TR><TD ALIGN="right">Contact name<BR>(last, first)</TD>',
-    '<TD COLSPAN=3 BGCOLOR="#ffffff">',
-    $cust_main->last, ', ', $cust_main->first,
-    '</TD><TD ALIGN="right">SS#</TD><TD BGCOLOR="#ffffff">',
-    $cust_main->ss || '&nbsp', '</TD></TR>',
-  '<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-    $cust_main->company,
-    '</TD></TR>',
-  '<TR><TD ALIGN="right">Address</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-    $cust_main->address1,
-    '</TD></TR>',
-;
-print '<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-      $cust_main->address2, '</TD></TR>'
-  if $cust_main->address2;
-print '<TR><TD ALIGN="right">City</TD><TD BGCOLOR="#ffffff">',
-        $cust_main->city,
-        '</TD><TD ALIGN="right">State</TD><TD BGCOLOR="#ffffff">',
-        $cust_main->state,
-        '</TD><TD ALIGN="right">Zip</TD><TD BGCOLOR="#ffffff">',
-        $cust_main->zip, '</TD></TR>',
-      '<TR><TD ALIGN="right">Country</TD><TD BGCOLOR="#ffffff">',
-        $cust_main->country,
-        '</TD></TR>',
-;
-print '<TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-        $cust_main->daytime || '&nbsp', '</TD></TR>',
-      '<TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-        $cust_main->night || '&nbsp', '</TD></TR>',
-      '<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-        $cust_main->fax || '&nbsp', '</TD></TR>',
-      '</TABLE>', "</TD></TR></TABLE>"
-;
-
-print '</TD></TR><TR><TD>';
-
-@invoicing_list = $cust_main->invoicing_list;
-print "Billing information (",
-      qq!<A HREF="!, popurl(2), qq!/misc/bill.cgi?$custnum">!, "Bill now</A>)",
-      &ntable("#c0c0c0"), "<TR><TD>", &ntable("#c0c0c0",2),
-      '<TR><TD ALIGN="right">Tax exempt</TD><TD BGCOLOR="#ffffff">',
-      $cust_main->tax ? 'yes' : 'no',
-      '</TD></TR>',
-      '<TR><TD ALIGN="right">Postal invoices</TD><TD BGCOLOR="#ffffff">',
-      ( grep { $_ eq 'POST' } @invoicing_list ) ? 'yes' : 'no',
-      '</TD></TR>',
-      '<TR><TD ALIGN="right">Email invoices</TD><TD BGCOLOR="#ffffff">',
-      join(', ', grep { $_ ne 'POST' } @invoicing_list ) || 'no',
-      '</TD></TR>',
-      '<TR><TD ALIGN="right">Billing type</TD><TD BGCOLOR="#ffffff">',
-;
-
-if ( $cust_main->payby eq 'CARD' ) {
-  print 'Credit card</TD></TR>',
-        '<TR><TD ALIGN="right">Card number</TD><TD BGCOLOR="#ffffff">',
-        $cust_main->payinfo, '</TD></TR>',
-        '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
-        $cust_main->paydate, '</TD></TR>',
-        '<TR><TD ALIGN="right">Name on card</TD><TD BGCOLOR="#ffffff">',
-        $cust_main->payname, '</TD></TR>'
-  ;
-} elsif ( $cust_main->payby eq 'BILL' ) {
-  print 'Billing</TD></TR>';
-  print '<TR><TD ALIGN="right">P.O. </TD><TD BGCOLOR="#ffffff">',
-        $cust_main->payinfo, '</TD></TR>',
-    if $cust_main->payinfo;
-  print '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
-        $cust_main->paydate, '</TD></TR>',
-        '<TR><TD ALIGN="right">Attention</TD><TD BGCOLOR="#ffffff">',
-        $cust_main->payname, '</TD></TR>',
-  ;
-} elsif ( $cust_main->payby eq 'COMP' ) {
-  print 'Complimentary</TD></TR>',
-        '<TR><TD ALIGN="right">Authorized by</TD><TD BGCOLOR="#ffffff">',
-        $cust_main->payinfo, '</TD></TR>',
-        '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
-        $cust_main->paydate, '</TD></TR>',
-  ;
-}
-
-print "</TABLE></TD></TR></TABLE></TD></TR></TABLE>";
-
-print qq!<BR><BR><A NAME="cust_pkg">Packages</A> !,
-#      qq!<BR>Click on package number to view/edit package.!,
-      qq!( <A HREF="!, popurl(2), qq!edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> (preserves services) )!,
-;
-
-#display packages
-
-#formatting
-print qq!!, &table(), "\n",
-      qq!<TR><TH COLSPAN=2 ROWSPAN=2>Package</TH><TH COLSPAN=5>!,
-      qq!Dates</TH><TH COLSPAN=2 ROWSPAN=2>Services</TH></TR>\n!,
-      qq!<TR><TH><FONT SIZE=-1>Setup</FONT></TH><TH>!,
-      qq!<FONT SIZE=-1>Next bill</FONT>!,
-      qq!</TH><TH><FONT SIZE=-1>Susp.</FONT></TH><TH><FONT SIZE=-1>Expire!,
-      qq!</FONT></TH>!,
-      qq!<TH><FONT SIZE=-1>Cancel</FONT></TH>!,
-      qq!</TR>\n!;
-
-#get package info
-if ( $conf->exists('hidecancelledpackages') ) {
-  @packages = $cust_main->ncancelled_pkgs;
-} else {
-  @packages = $cust_main->all_pkgs;
-}
-
-$n1 = '<TR>';
-foreach $package (@packages) {
-  my $pkgnum = $package->pkgnum;
-  my $pkg = $package->part_pkg->pkg;
-  my $comment = $package->part_pkg->comment;
-  my $pkgview = popurl(2). "view/cust_pkg.cgi?$pkgnum";
-  my @cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
-  my $rowspan = scalar(@cust_svc) || 1;
-
-  my $button_cgi = new CGI;
-  $button_cgi->param('clone', $package->part_pkg->pkgpart);
-  $button_cgi->param('pkgnum', $package->pkgnum);
-  my $button_url = popurl(2). "edit/part_pkg.cgi?". $button_cgi->query_string;
-
-  #print $n1, qq!<TD ROWSPAN=$rowspan><A HREF="$pkgview">$pkgnum</A></TD>!,
-  print $n1, qq!<TD ROWSPAN=$rowspan>$pkgnum</TD>!,
-        qq!<TD ROWSPAN=$rowspan><FONT SIZE=-1>!,
-        #qq!<A HREF="$pkgview">$pkg - $comment</A>!,
-        qq!$pkg - $comment!,
-        qq! ( <A HREF="$pkgview">Edit</A> | <A HREF="$button_url">Customize pricing</A> )</FONT></TD>!,
-  ;
-  for ( qw( setup bill susp expire cancel ) ) {
-    print "<TD ROWSPAN=$rowspan><FONT SIZE=-1>", ( $package->getfield($_)
-            ? time2str("%D", $package->getfield($_) )
-            :  '&nbsp'
-          ), '</FONT></TD>',
-    ;
-  }
-
-  my $n2 = '';
-  foreach my $cust_svc ( @cust_svc ) {
-     my($label, $value, $svcdb) = $cust_svc->label;
-     my($svcnum) = $cust_svc->svcnum;
-     my($sview) = popurl(2). "view";
-     print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
-           qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
-     $n2="</TR><TR>";
-  }
-  $n1="</TR><TR>";
-}  
-print "</TR>";
-
-#formatting
-print "</TABLE>";
-
-#formatting
-print qq!<BR><BR><A NAME="history">Payment History!,
-      qq!</A>!,
-      qq! ( Click on invoice to view invoice/enter payment. | !,
-      qq!<A HREF="!, popurl(2), qq!edit/cust_credit.cgi?$custnum">!,
-      qq!Post credit / refund</A> )!;
-
-#get payment history
-#
-# major problem: this whole thing is way too sloppy.
-# minor problem: the description lines need better formatting.
-
-@history = (); #needed for mod_perl :)
-
-@bills = qsearch('cust_bill',{'custnum'=>$custnum});
-foreach $bill (@bills) {
-  my($bref)=$bill->hashref;
-  push @history,
-    $bref->{_date} . qq!\t<A HREF="!. popurl(2). qq!view/cust_bill.cgi?! .
-    $bref->{invnum} . qq!">Invoice #! . $bref->{invnum} .
-    qq! (Balance \$! . $bill->owed . qq!)</A>\t! .
-    $bref->{charged} . qq!\t\t\t!;
-
-  my(@payments)=qsearch('cust_pay',{'invnum'=> $bref->{invnum} } );
-  my($payment);
-  foreach $payment (@payments) {
-    my($date,$invnum,$payby,$payinfo,$paid)=($payment->getfield('_date'),
-                                             $payment->getfield('invnum'),
-                                             $payment->getfield('payby'),
-                                             $payment->getfield('payinfo'),
-                                             $payment->getfield('paid'),
-                      );
-    push @history,
-      "$date\tPayment, Invoice #$invnum ($payby $payinfo)\t\t$paid\t\t";
-  }
-}
-
-@credits = qsearch('cust_credit',{'custnum'=>$custnum});
-foreach $credit (@credits) {
-  my($cref)=$credit->hashref;
-  push @history,
-    $cref->{_date} . "\tCredit #" . $cref->{crednum} . ", (Balance \$" .
-    $cref->{credited} . ") by " . $cref->{otaker} . " - " .
-    $cref->{reason} . "\t\t\t" . $cref->{amount} . "\t";
-
-  my(@refunds)=qsearch('cust_refund',{'crednum'=> $cref->{crednum} } );
-  my($refund);
-  foreach $refund (@refunds) {
-    my($rref)=$refund->hashref;
-    push @history,
-      $rref->{_date} . "\tRefund, Credit #" . $rref->{crednum} . " (" .
-      $rref->{payby} . " " . $rref->{payinfo} . ") by " .
-      $rref->{otaker} . " - ". $rref->{reason} . "\t\t\t\t" .
-      $rref->{refund};
-  }
-}
-
-        #formatting
-        print &table(), <<END;
-<TR>
-  <TH>Date</TH>
-  <TH>Description</TH>
-  <TH><FONT SIZE=-1>Charge</FONT></TH>
-  <TH><FONT SIZE=-1>Payment</FONT></TH>
-  <TH><FONT SIZE=-1>In-house<BR>Credit</FONT></TH>
-  <TH><FONT SIZE=-1>Refund</FONT></TH>
-  <TH><FONT SIZE=-1>Balance</FONT></TH>
-</TR>
-END
-
-#display payment history
-
-$balance = 0;
-foreach $item (sort keyfield_numerically @history) {
-  my($date,$desc,$charge,$payment,$credit,$refund)=split(/\t/,$item);
-  $charge ||= 0;
-  $payment ||= 0;
-  $credit ||= 0;
-  $refund ||= 0;
-  $balance += $charge - $payment;
-  $balance -= $credit - $refund;
-
-  print "<TR><TD><FONT SIZE=-1>",time2str("%D",$date),"</FONT></TD>",
-	"<TD><FONT SIZE=-1>$desc</FONT></TD>",
-	"<TD><FONT SIZE=-1>",
-        ( $charge ? "\$".sprintf("%.2f",$charge) : '' ),
-        "</FONT></TD>",
-	"<TD><FONT SIZE=-1>",
-        ( $payment ? "- \$".sprintf("%.2f",$payment) : '' ),
-        "</FONT></TD>",
-	"<TD><FONT SIZE=-1>",
-        ( $credit ? "- \$".sprintf("%.2f",$credit) : '' ),
-        "</FONT></TD>",
-	"<TD><FONT SIZE=-1>",
-        ( $refund ? "\$".sprintf("%.2f",$refund) : '' ),
-        "</FONT></TD>",
-	"<TD><FONT SIZE=-1>\$" . sprintf("%.2f",$balance),
-        "</FONT></TD>",
-        "\n";
-}
-
-#formatting
-print "</TABLE>";
-
-#end
-
-#formatting
-print <<END;
-
-  </BODY>
-</HTML>
-END
-
-#subroutiens
-sub keyfield_numerically { (split(/\t/,$a))[0] <=> (split(/\t/,$b))[0] ; }
-
diff --git a/htdocs/view/cust_pkg.cgi b/htdocs/view/cust_pkg.cgi
deleted file mode 100755
index 0054ee0fa..000000000
--- a/htdocs/view/cust_pkg.cgi
+++ /dev/null
@@ -1,206 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cust_pkg.cgi,v 1.11 1999-04-09 04:22:34 ivan Exp $
-#
-# Usage: cust_pkg.cgi pkgnum
-#        http://server.name/path/cust_pkg.cgi?pkgnum
-#
-# ivan@voicenet.com 96-dec-15
-#
-# services section needs to be cleaned up, needs to display extraneous
-# entries in cust_pkg!
-# ivan@voicenet.com 96-dec-31
-#
-# added navigation bar
-# ivan@voicenet.com 97-jan-30
-#
-# changed and fixed up suspension and cancel stuff, now you can't add
-# services to a cancelled package
-# ivan@voicenet.com 97-feb-27
-#
-# rewrote for new API, still needs to be cleaned up!
-# ivan@voicenet.com 97-jul-29
-#
-# no FS::Search ivan@sisd.com 98-mar-7
-# 
-# $Log: cust_pkg.cgi,v $
-# Revision 1.11  1999-04-09 04:22:34  ivan
-# also table()
-#
-# Revision 1.10  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.9  1999/04/08 12:00:19  ivan
-# aesthetic update
-#
-# Revision 1.8  1999/02/28 00:04:01  ivan
-# removed misleading comments
-#
-# Revision 1.7  1999/01/19 05:14:20  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.6  1999/01/18 09:41:44  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.5  1998/12/23 03:11:40  ivan
-# *** empty log message ***
-#
-# Revision 1.3  1998/12/17 09:57:22  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
-# Revision 1.2  1998/11/13 09:56:49  ivan
-# change configuration file layout to support multiple distinct databases (with
-# own set of config files, export, etc.)
-#
-
-use strict;
-use vars qw ( $cgi %uiview %uiadd $part_svc $query $pkgnum $cust_pkg $part_pkg
-              $custnum $susp $cancel $expire $pkg $comment $setup $bill
-              $otaker );
-use Date::Format;
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl header menubar ntable table);
-use FS::Record qw(qsearch qsearchs);
-use FS::part_svc;
-use FS::cust_pkg;
-use FS::part_pkg;
-use FS::pkg_svc;
-use FS::cust_svc;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-foreach $part_svc ( qsearch('part_svc',{}) ) {
-  $uiview{$part_svc->svcpart} = popurl(2). "view/". $part_svc->svcdb . ".cgi";
-  $uiadd{$part_svc->svcpart}= popurl(2). "edit/". $part_svc->svcdb . ".cgi";
-}
-
-($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-$pkgnum = $1;
-
-#get package record
-$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-die "No package!" unless $cust_pkg;
-$part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
-
-$custnum = $cust_pkg->getfield('custnum');
-print $cgi->header( '-expires' => 'now' ), header('Package View', menubar(
-  "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum",
-  'Main Menu' => popurl(2)
-));
-
-#print info
-($susp,$cancel,$expire)=(
-  $cust_pkg->getfield('susp'),
-  $cust_pkg->getfield('cancel'),
-  $cust_pkg->getfield('expire'),
-);
-($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment'));
-($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
-$otaker = $cust_pkg->getfield('otaker');
-
-print "Package information";
-print ' (<A HREF="'. popurl(2). 'misc/unsusp_pkg.cgi?'. $pkgnum.
-      '">unsuspend</A>)' if ( $susp && ! $cancel );
-print ' (<A HREF="'. popurl(2). 'misc/susp_pkg.cgi?'. $pkgnum.
-      '">suspend</A>)' unless ( $susp || $cancel );
-print ' (<A HREF="'. popurl(2). 'misc/cancel_pkg.cgi?'. $pkgnum.
-      '">cancel</A>)' unless $cancel;
-
-print &ntable("#c0c0c0"), '<TR><TD>', &ntable("#c0c0c0",2),
-      '<TR><TD ALIGN="right">Package number</TD><TD BGCOLOR="#ffffff">',
-      $pkgnum, '</TD></TR>',
-      '<TR><TD ALIGN="right">Package</TD><TD BGCOLOR="#ffffff">',
-      $pkg,  '</TD></TR>',
-      '<TR><TD ALIGN="right">Comment</TD><TD BGCOLOR="#ffffff">',
-      $comment,  '</TD></TR>',
-      '<TR><TD ALIGN="right">Setup date</TD><TD BGCOLOR="#ffffff">',
-      ( $setup ? time2str("%D",$setup) : "(Not setup)" ), '</TD></TR>',
-      '<TR><TD ALIGN="right">Next bill date</TD><TD BGCOLOR="#ffffff">',
-      ( $bill ? time2str("%D",$bill) : "&nbsp;" ), '</TD></TR>',
-;
-print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
-       time2str("%D",$susp), '</TD></TR>' if $susp;
-print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
-       time2str("%D",$expire), '</TD></TR>' if $expire;
-print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
-       time2str("%D",$cancel), '</TD></TR>' if $cancel;
-print  '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
-      $otaker,  '</TD></TR>',
-      '</TABLE></TD></TR></TABLE>'
-;
-
-#  print <<END;
-#<FORM ACTION="../misc/expire_pkg.cgi" METHOD="post">
-#<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
-#Expire (date): <INPUT TYPE="text" NAME="date" VALUE="" >
-#<INPUT TYPE="submit" VALUE="Cancel later">
-#END
-
-unless ($cancel) {
-
-  #services
-  print '<BR>Service Information', &table();
-
-  #list of services this pkgpart includes
-  my $pkg_svc;
-  my %pkg_svc = ();
-  foreach $pkg_svc ( qsearch('pkg_svc',{'pkgpart'=> $cust_pkg->pkgpart }) ) {
-    $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity if $pkg_svc->quantity;
-  }
-
-  #list of records from cust_svc
-  my $svcpart;
-  foreach $svcpart (sort {$a <=> $b} keys %pkg_svc) {
-
-    my($svc)=qsearchs('part_svc',{'svcpart'=>$svcpart})->getfield('svc');
-
-    my(@cust_svc)=qsearch('cust_svc',{'pkgnum'=>$pkgnum, 
-                                      'svcpart'=>$svcpart,
-                                     });
-
-    my($enum);
-    for $enum ( 1 .. $pkg_svc{$svcpart} ) {
-
-      my($cust_svc);
-      if ( $cust_svc=shift @cust_svc ) {
-        my($svcnum)=$cust_svc->svcnum;
-        my($label, $value, $svcdb) = $cust_svc->label;
-        print <<END;
-<TR><TD><A HREF="$uiview{$svcpart}?$svcnum">(View) $svc: $value<A></TD></TR>
-END
-      } else {
-        print <<END;
-<TR>
-  <TD><A HREF="$uiadd{$svcpart}?pkgnum$pkgnum-svcpart$svcpart">
-      (Add) $svc</A>
-   or <A HREF="../misc/link.cgi?pkgnum$pkgnum-svcpart$svcpart">
-      (Link to existing) $svc</A>
-  </TD>
-</TR>
-END
-      }
-
-    }
-    warn "WARNING: Leftover services pkgnum $pkgnum!" if @cust_svc;; 
-  }
-
-  print "</TABLE><FONT SIZE=-1>",
-        "Choose (View) to view or edit an existing service<BR>",
-        "Choose (Add) to setup a new service<BR>",
-        "Choose (Link to existing) to link to a legacy (pre-Freeside) service",
-        "</FONT>"
-  ;
-}
-
-#formatting
-print <<END;
-  </BODY>
-</HTML>
-END
-
diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi
deleted file mode 100755
index 40e3c2d15..000000000
--- a/htdocs/view/svc_acct.cgi
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: svc_acct.cgi,v 1.12 2001-01-31 07:21:00 ivan Exp $
-#
-# Usage: svc_acct.cgi svcnum
-#        http://server.name/path/svc_acct.cgi?svcnum
-#
-# ivan@voicenet.com 96-dec-17
-#
-# added link to send info
-# ivan@voicenet.com 97-jan-4
-#
-# added navigation bar and ability to change username, etc.
-# ivan@voicenet.com 97-jan-30
-#
-# activate 800 service
-# ivan@voicenet.com 97-feb-10
-#
-# modified navbar code (should be a subroutine?), added link to cancel account (only if not audited)
-# ivan@voicenet.com 97-apr-16
-#
-# INCOMPLETELY rewrote some things for new API
-# ivan@voicenet.com 97-jul-29
-#
-# FS::Search became FS::Record, use strict, etc. ivan@sisd.com 98-mar-9
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'password' to '_password' because Pg6.3 reserves the password word
-#       bmccane@maxbaud.net     98-apr-3
-#
-# /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
-#
-# displays arbitrary radius attributes ivan@sisd.com 98-aug-16
-#
-# $Log: svc_acct.cgi,v $
-# Revision 1.12  2001-01-31 07:21:00  ivan
-# fix tyops
-#
-# Revision 1.11  2000/12/03 20:25:20  ivan
-# session monitor updates
-#
-# Revision 1.10  1999/04/14 11:27:06  ivan
-# showpasswords config option to show passwords
-#
-# Revision 1.9  1999/04/08 12:00:19  ivan
-# aesthetic update
-#
-# Revision 1.8  1999/02/28 00:04:02  ivan
-# removed misleading comments
-#
-# Revision 1.7  1999/01/19 05:14:21  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.6  1999/01/18 09:41:45  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.5  1999/01/18 09:22:36  ivan
-# changes to track email addresses for email invoicing
-#
-# Revision 1.4  1998/12/23 03:09:19  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.3  1998/12/17 09:57:23  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
-# Revision 1.2  1998/12/16 05:24:29  ivan
-# use FS::Conf;
-#
-
-use strict;
-use vars qw( $conf $cgi $mydomain $query $svcnum $svc_acct $cust_svc $pkgnum
-             $cust_pkg $custnum $part_svc $p $svc_acct_pop $password );
-use CGI;
-use CGI::Carp qw( fatalsToBrowser );
-use FS::UID qw( cgisuidsetup );
-use FS::CGI qw( header popurl menubar);
-use FS::Record qw( qsearchs fields );
-use FS::Conf;
-use FS::svc_acct;
-use FS::cust_svc;
-use FS::cust_pkg;
-use FS::part_svc;
-use FS::svc_acct_pop;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$mydomain = $conf->config('domain');
-
-($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-$svcnum = $1;
-$svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
-die "Unknown svcnum" unless $svc_acct;
-
-$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-$pkgnum = $cust_svc->getfield('pkgnum');
-if ($pkgnum) {
-  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-  $custnum=$cust_pkg->getfield('custnum');
-} else {
-  $cust_pkg = '';
-  $custnum = '';
-}
-
-$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
-die "Unknown svcpart" unless $part_svc;
-
-$p = popurl(2);
-print $cgi->header( '-expires' => 'now' ), header('Account View', menubar(
-  ( ( $pkgnum || $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-      )
-    : ( "Cancel this (unaudited) account" =>
-          "${p}misc/cancel-unaudited.cgi?$svcnum" )
-  ),
-  "Main menu" => $p,
-));
-
-#print qq!<BR><A HREF="../misc/sendconfig.cgi?$svcnum">Send account information</A>!;
-
-print qq!<A HREF="${p}edit/svc_acct.cgi?$svcnum">Edit this information</A>!,
-      "<BR>Service #$svcnum",
-      "<BR>Service: <B>", $part_svc->svc, "</B>",
-      "<BR><BR>Username: <B>", $svc_acct->username, "</B>"
-;
-
-print "<BR>Password: ";
-$password = $svc_acct->_password;
-if ( $password =~ /^\*\w+\* (.*)$/ ) {
-  $password = $1;
-  print "<I>(login disabled)</I> ";
-}
-if ( $conf->exists('showpasswords') ) {
-  print "<B>$password</B>";
-} else {
-  print "<I>(hidden)</I>";
-}
-$password = '';
-
-$svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
-print "<BR>POP: <B>", $svc_acct_pop->city, ", ", $svc_acct_pop->state,
-      " (", $svc_acct_pop->ac, ")/", $svc_acct_pop->exch, "</B>"
-  if $svc_acct_pop;
-
-if ($svc_acct->uid ne '') {
-  print "<BR><BR>Uid: <B>", $svc_acct->uid, "</B>",
-        "<BR>Gid: <B>", $svc_acct->gid, "</B>",
-        "<BR>Finger name: <B>", $svc_acct->finger, "</B>",
-        "<BR>Home directory: <B>", $svc_acct->dir, "</B>",
-        "<BR>Shell: <B>", $svc_acct->shell, "</B>",
-        "<BR>Quota: <B>", $svc_acct->quota, "</B> <I>(unimplemented)</I>"
-  ;
-} else {
-  print "<BR><BR>(No shell account)";
-}
-
-if ($svc_acct->slipip) {
-  print "<BR><BR>IP address: <B>", ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' ) ? "<I>(Dynamic)</I>" : $svc_acct->slipip ,"</B>";
-  my($attribute);
-  foreach $attribute ( grep /^radius_/, fields('svc_acct') ) {
-    #warn $attribute;
-    $attribute =~ /^radius_(.*)$/;
-    my($pattribute) = ($1);
-    $pattribute =~ s/_/-/g;
-    print "<BR>Radius $pattribute: <B>". $svc_acct->getfield($attribute), "</B>";
-  }
-} else {
-  print "<BR><BR>(No SLIP/PPP account)";
-}
-
-print "</BODY></HTML>";
-
diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi
deleted file mode 100755
index 072c94d44..000000000
--- a/htdocs/view/svc_acct_sm.cgi
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: svc_acct_sm.cgi,v 1.11 2000-07-17 10:58:42 ivan Exp $
-#
-# Usage: svc_acct_sm.cgi svcnum
-#        http://server.name/path/svc_acct_sm.cgi?svcnum
-#
-# based on view/svc_acct.cgi
-# 
-# ivan@voicenet.com 97-jan-5
-#
-# added navigation bar
-# ivan@voicenet.com 97-jan-30
-# 
-# rewrite ivan@sisd.com 98-mar-15
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
-#
-# $Log: svc_acct_sm.cgi,v $
-# Revision 1.11  2000-07-17 10:58:42  ivan
-# better error messages if svc_acct or svc_domain records are missing
-#
-# Revision 1.10  1999/04/08 12:00:19  ivan
-# aesthetic update
-#
-# Revision 1.9  1999/02/28 00:04:03  ivan
-# removed misleading comments
-#
-# Revision 1.8  1999/02/09 09:23:00  ivan
-# visual and bugfixes
-#
-# Revision 1.7  1999/02/07 09:59:42  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.6  1999/01/19 05:14:22  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:46  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1998/12/23 03:09:52  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.3  1998/12/17 09:57:24  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
-# Revision 1.2  1998/12/16 05:24:30  ivan
-# use FS::Conf;
-#
-
-use strict;
-use vars qw($conf $cgi $mydomain $query $svcnum $svc_acct_sm $cust_svc
-            $pkgnum $cust_pkg $custnum $part_svc $p $domsvc $domuid $domuser
-            $svc $svc_domain $domain $svc_acct $username );
-use CGI;
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl menubar );
-use FS::Record qw(qsearchs);
-use FS::Conf;
-use FS::svc_acct_sm;
-use FS::cust_svc;
-use FS::cust_pkg;
-use FS::part_svc;
-use FS::svc_domain;
-use FS::svc_acct;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$mydomain = $conf->config('domain');
-
-($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-$svcnum = $1;
-$svc_acct_sm = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum});
-die "Unknown svcnum" unless $svc_acct_sm;
-
-$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-$pkgnum = $cust_svc->getfield('pkgnum');
-if ($pkgnum) {
-  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-  $custnum=$cust_pkg->getfield('custnum');
-} else {
-  $cust_pkg = '';
-  $custnum = '';
-}
-
-$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
-  or die "Unkonwn svcpart";
-
-$p = popurl(2);
-print $cgi->header( '-expires' => 'now' ), header('Mail Alias View', menubar(
-  ( ( $pkgnum || $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-      )
-    : ( "Cancel this (unaudited) account" =>
-          "${p}misc/cancel-unaudited.cgi?$svcnum" )
-  ),
-  "Main menu" => $p,
-));
-
-($domsvc,$domuid,$domuser) = (
-  $svc_acct_sm->domsvc,
-  $svc_acct_sm->domuid,
-  $svc_acct_sm->domuser,
-);
-$svc = $part_svc->svc;
-$svc_domain = qsearchs('svc_domain',{'svcnum'=>$domsvc})
-  or die "Corrupted database: no svc_domain.svcnum matching domsvc $domsvc";
-$domain = $svc_domain->domain;
-$svc_acct = qsearchs('svc_acct',{'uid'=>$domuid})
-  or die "Corrupted database: no svc_acct.uid matching domuid $domuid";
-$username = $svc_acct->username;
-
-print qq!<A HREF="${p}edit/svc_acct_sm.cgi?$svcnum">Edit this information</A>!,
-      "<BR>Service #$svcnum",
-      "<BR>Service: <B>$svc</B>",
-      qq!<BR>Mail to <B>!, ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ) , qq!</B>\@<B>$domain</B> forwards to <B>$username</B>\@$mydomain mailbox.!,
-      '</BODY></HTML>'
-;
-
diff --git a/htdocs/view/svc_domain.cgi b/htdocs/view/svc_domain.cgi
deleted file mode 100755
index 85c854ee0..000000000
--- a/htdocs/view/svc_domain.cgi
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: svc_domain.cgi,v 1.11 2000-12-03 15:14:00 ivan Exp $
-#
-# Usage: svc_domain svcnum
-#        http://server.name/path/svc_domain.cgi?svcnum
-#
-# ivan@voicenet.com 97-jan-6
-#
-# rewrite ivan@sisd.com 98-mar-14
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: svc_domain.cgi,v $
-# Revision 1.11  2000-12-03 15:14:00  ivan
-# bugfixes from Jeff Finucane <jeff@cmh.net>, thanks!
-#
-# Revision 1.10  1999/08/27 22:18:44  ivan
-# point to patrick instead of internic!
-#
-# Revision 1.9  1999/04/08 12:00:19  ivan
-# aesthetic update
-#
-# Revision 1.8  1999/02/28 00:04:04  ivan
-# removed misleading comments
-#
-# Revision 1.7  1999/02/23 08:09:25  ivan
-# beginnings of one-screen new customer entry and some other miscellania
-#
-# Revision 1.6  1999/01/19 05:14:23  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:47  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1998/12/23 03:10:19  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.3  1998/12/17 09:57:25  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
-# Revision 1.2  1998/11/13 09:56:50  ivan
-# change configuration file layout to support multiple distinct databases (with
-# own set of config files, export, etc.)
-#
-
-use strict;
-use vars qw( $cgi $query $svcnum $svc_domain $domain $cust_svc $pkgnum 
-             $cust_pkg $custnum $part_svc $p );
-use CGI;
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header menubar popurl menubar);
-use FS::Record qw(qsearchs);
-use FS::svc_domain;
-use FS::cust_svc;
-use FS::cust_pkg;
-use FS::part_svc;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-$svcnum = $1;
-$svc_domain = qsearchs('svc_domain',{'svcnum'=>$svcnum});
-die "Unknown svcnum" unless $svc_domain;
-
-$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-$pkgnum = $cust_svc->getfield('pkgnum');
-if ($pkgnum) {
-  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-  $custnum=$cust_pkg->getfield('custnum');
-} else {
-  $cust_pkg = '';
-  $custnum = '';
-}
-
-$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
-die "Unkonwn svcpart" unless $part_svc;
-
-$domain = $svc_domain->domain;
-
-$p = popurl(2);
-print $cgi->header( '-expires' => 'now' ), header('Domain View', menubar(
-  ( ( $pkgnum || $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-      )
-    : ( "Cancel this (unaudited) account" =>
-          "${p}misc/cancel-unaudited.cgi?$svcnum" )
-  ),
-  "Main menu" => $p,
-)),
-      "Service #$svcnum",
-      "<BR>Service: <B>", $part_svc->svc, "</B>",
-      "<BR>Domain name: <B>$domain</B>.",
-      qq!<BR><BR><A HREF="http://www.geektools.com/cgi-bin/proxy.cgi?query=$domain;targetnic=auto">View whois information.</A>!,
-      '</BODY></HTML>',
-;
-- 
cgit v1.2.1


From 092cdf2ba5fbd1c94305688dd7f7821d4dbf06d3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 13 Aug 2001 23:10:34 +0000
Subject: properly massage ship_state & work okay when no initial pkg is
 selected

---
 httemplate/edit/process/cust_main.cgi | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 1b916b00b..86e6abef6 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-# $Id: cust_main.cgi,v 1.2 2001-08-12 00:07:55 ivan Exp $
+# $Id: cust_main.cgi,v 1.3 2001-08-13 23:10:34 ivan Exp $
 
 use strict;
 use vars qw( $cgi $payby @invoicing_list $new $custnum $error );
@@ -30,6 +30,12 @@ $cgi->param('state', $1);
 $cgi->param('county', $3 || '');
 $cgi->param('country', $4);
 
+$cgi->param('ship_state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
+  or die "Oops, illegal \"ship_state\" param: ". $cgi->param('ship_state');
+$cgi->param('ship_state', $1);
+$cgi->param('ship_county', $3 || '');
+$cgi->param('ship_country', $4);
+
 if ( $payby = $cgi->param('payby') ) {
   $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
   $cgi->param('paydate',
@@ -123,7 +129,7 @@ if ( $new->custnum eq '' ) {
 
   use Tie::RefHash;
   tie my %hash, 'Tie::RefHash';
-  %hash = ( $cust_pkg => [ $svc_acct ] );
+  %hash = ( $cust_pkg => [ $svc_acct ] ) if $cust_pkg;
   $error ||= $new->insert( \%hash, \@invoicing_list );
 } else { #create old record object
   my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } ); 
-- 
cgit v1.2.1


From cad8a048ce2d89814d1d3b0783310191bc76684e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 13 Aug 2001 23:15:35 +0000
Subject: don't display empty comment box

---
 httemplate/view/cust_main.cgi | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 8b6fb0c09..088e2bb2f 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.3 2001-08-11 05:52:56 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.4 2001-08-13 23:15:35 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
@@ -210,7 +210,9 @@ print '<BR>';
 
 print '</TD></TR></TABLE>';
 
-if ( defined $cust_main->dbdef_table->column('comments') ) {
+if ( defined $cust_main->dbdef_table->column('comments')
+     && $cust_main->comments )
+{
   print "<BR>Comments", &ntable("#cccccc"), "<TR><TD>",
         &ntable("#cccccc",2),
         '<TR><TD BGCOLOR="#ffffff"><PRE>', $cust_main->comments,
-- 
cgit v1.2.1


From 926e9ed1c29c929e0f8c1b4dc57e02b21cf14598 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 15 Aug 2001 10:04:53 +0000
Subject: remove (some of the) bad direct exit; calls

---
 httemplate/search/cust_pkg.cgi | 44 +-----------------------------
 httemplate/search/svc_acct.cgi | 61 +-----------------------------------------
 2 files changed, 2 insertions(+), 103 deletions(-)

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index d63d2d188..50028e3e3 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,46 +1,5 @@
 <%
-#
-# $Id: cust_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
-#
-# $Log: cust_pkg.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.11  2000/07/17 16:45:41  ivan
-# first shot at invoice browsing and some other cleanups
-#
-# Revision 1.10  2000/07/17 12:49:29  ivan
-# better error message if a package isn't linked to a customer (that shouldn't happen)
-#
-# Revision 1.9  1999/07/17 10:38:52  ivan
-# scott nelson <scott@ultimanet.com> noticed this mod_perl-triggered bug and
-# gave me a great bugreport at the last rhythmethod
-#
-# Revision 1.8  1999/02/09 09:22:57  ivan
-# visual and bugfixes
-#
-# Revision 1.7  1999/02/07 09:59:37  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.6  1999/01/19 05:14:13  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:38  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1999/01/18 09:22:33  ivan
-# changes to track email addresses for email invoicing
-#
-# Revision 1.3  1998/12/23 03:05:59  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:41:09  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
+# <!-- $Id: cust_pkg.cgi,v 1.2 2001-08-15 10:04:53 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi @cust_pkg $sortby $query );
@@ -144,7 +103,6 @@ END
   </BODY>
 </HTML>
 END
-  exit;
 
 }
 
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 15f74ac20..bd89d768f 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,63 +1,5 @@
 <%
-#
-# $Id: svc_acct.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_acct.cgi
-#
-# Note: Should be run setuid freeside as user nobody.
-#
-# loosely (sp?) based on search/cust_main.cgi
-#
-# ivan@voicenet.com 96-jan-3 -> 96-jan-4
-#
-# rewrite (now does browsing too) ivan@sisd.com 98-mar-9
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# show unlinked accounts ivan@sisd.com 98-jun-22
-#
-# use FS::CGI, show total ivan@sisd.com 98-jul-17
-#
-# give service and customer info too ivan@sisd.com 98-aug-16
-#
-# $Log: svc_acct.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.11  1999/04/14 11:25:33  ivan
-# *** empty log message ***
-#
-# Revision 1.10  1999/04/14 11:20:21  ivan
-# visual fix
-#
-# Revision 1.9  1999/04/10 01:53:18  ivan
-# oops, search usernames limited to 8 chars
-#
-# Revision 1.8  1999/04/09 23:43:29  ivan
-# just in case
-#
-# Revision 1.7  1999/02/07 09:59:38  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.6  1999/01/19 05:14:14  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:39  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1999/01/18 09:22:34  ivan
-# changes to track email addresses for email invoicing
-#
-# Revision 1.3  1998/12/23 03:06:28  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:41:10  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
+# <!-- $Id: svc_acct.cgi,v 1.2 2001-08-15 10:04:53 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi @svc_acct $sortby $query );
@@ -182,7 +124,6 @@ END
   </BODY>
 </HTML>
 END
-  exit;
 
 }
 
-- 
cgit v1.2.1


From 35f71d9fa1c7304e4be260d5db28c0a8480b4750 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Aug 2001 10:52:54 +0000
Subject: fix email invoice to the being-creted-account bug

---
 fs_signup/fs_signup_server | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 03defd6f9..c6ee665fa 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -126,8 +126,6 @@ while (1) {
 
     my @invoicing_list = split( /\s*\,\s*/, $invoicing_list );
 
-    $error ||= $cust_main->check_invoicing_list( \@invoicing_list );
-
     my $part_pkg = qsearchs( 'part_pkg', { 'pkgpart' => $pkgpart } )
       or $error ||= "WARNING: unknown pkgpart $pkgpart";
     my $svcpart = $part_pkg->svcpart unless $error;
@@ -164,22 +162,11 @@ while (1) {
     use Tie::RefHash;
     tie my %hash, 'Tie::RefHash';
     %hash = ( $cust_pkg => [ $svc_acct ] );
-    $error ||= $cust_main->insert( \%hash );
-    #if ( $cust_pkg && ! $error ) { #in this case, $cust_pkg should always
-    #                               #be definied, but....
-    #  $cust_pkg->custnum( $cust_main->custnum );
-    #  $error ||= $cust_pkg->insert; 
-    #  warn "WARNING: $error on pre-checked cust_pkg record!" if $error;
-    #  $svc_acct->pkgnum( $cust_pkg->pkgnum );
-    #  $error ||= $svc_acct->insert;
-    #  warn "WARNING: $error on pre-checked svc_acct record!" if $error;
-    #}
+    $error ||= $cust_main->insert( \%hash, \@invoicing_list );
 
     warn "[fs_signup_server] Sending results...\n" if $Debug;
     print $writer $error, "\n";
 
-    $cust_main->invoicing_list( \@invoicing_list ) unless $error;
-
   }
   close $writer;
   close $reader;
-- 
cgit v1.2.1


From 52579cd417a8a7103a01b0b08945f648e8255707 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Aug 2001 10:53:09 +0000
Subject: thanks jeff!

---
 CREDITS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CREDITS b/CREDITS
index cf98b61d2..d46937d75 100644
--- a/CREDITS
+++ b/CREDITS
@@ -57,7 +57,8 @@ I'm forgetting.
 Jeff Finucane <jeff@cmh.net> send in a bunch of bugfixes (for the sendmail
 export, cancel-unaudited.cgi), patches to support billing date modification,
 and probably other things too (sorry if I forgot them).  And yet even more
-bug squashing, thanks!
+bug squashing, thanks!  *and* he single-handedly implemented all the necessary
+work to get rid of svc_acct_sm and the "default domain"  thanks!!
 
 Kenny Elliott <kenny@neoserve.com> contributed ICRADIUS radreply table support,
 allowing attributes with ICRADIUS, helped fix many bugs, and some
-- 
cgit v1.2.1


From fc4b3561a0e7ecf9cb18c9dae8814917cd741969 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Aug 2001 10:53:43 +0000
Subject: alldocs target

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 869613c62..7e7815fcd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 #!/usr/bin/make
 
 default:
-	@echo "supported targets: aspdocs masondocs clean"
+	@echo "supported targets: aspdocs masondocs alldocs clean"
 
 aspdocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
 	rm -rf aspdocs
-- 
cgit v1.2.1


From 7cb7cd1990ccd45f50eabce4ca8a57cf1eb69abd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Aug 2001 10:55:04 +0000
Subject: Business::OnlinePayment

---
 FS/FS/cust_main.pm          | 94 ++++++++++++++++++++++++++++++++++++++++++---
 httemplate/docs/config.html |  3 +-
 2 files changed, 91 insertions(+), 6 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 5804f6868..c3a3e3fc6 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -6,7 +6,8 @@ package FS::cust_main;
 
 use strict;
 use vars qw( @ISA $conf $lpr $processor $xaction $E_NoErr $invoice_from
-             $smtpmachine $Debug );
+             $smtpmachine $Debug $bop_processor $bop_login $bop_password
+             $bop_action @bop_options);
 use Safe;
 use Carp;
 use Time::Local;
@@ -71,6 +72,16 @@ $FS::UID::callback{'FS::cust_main'} = sub {
       $xaction,
     ) = $conf->config('cybercash2');
     $processor='cybercash2';
+  } elsif ( $conf->exists('business-onlinepayment') ) {
+    ( $bop_processor,
+      $bop_login,
+      $bop_password,
+      $bop_action,
+      @bop_options
+    ) = $conf->config('business-onlinepayment');
+    $bop_action ||= 'normal authorization';
+    eval "use Business::OnlinePayment";  
+    $processor="Business::OnlinePayment::$bop_processor";
   }
 };
 
@@ -1019,6 +1030,14 @@ sub collect {
           return "Real time card processing not enabled!";
         }
 
+        my $address = $self->address1;
+        $address .= ", ". $self->address2 if $self->address2;
+
+        #fix exp. date
+        #$self->paydate =~ /^(\d+)\/\d*(\d{2})$/;
+        $self->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
+        my $exp = "$2/$1";
+
         if ( $processor =~ /^cybercash/ ) {
 
           #fix exp. date for cybercash
@@ -1032,10 +1051,8 @@ sub collect {
           my $payname = $self->payname ||
                         $self->getfield('first'). ' '. $self->getfield('last');
 
-          my $address = $self->address1;
-          $address .= ", ". $self->address2 if $self->address2;
 
-          my $country = 'USA' if $self->country eq 'US';
+          my $country = $self->country eq 'US' ? 'USA' : $self->country;
 
           my @full_xaction = ( $xaction,
             'Order-ID'     => $paybatch,
@@ -1093,6 +1110,73 @@ sub collect {
             return '';
           }
 
+        } elsif ( $processor =~ /^Business::OnlinePayment::(.*)$/ ) {
+
+          my($payname, $payfirst, $paylast);
+          if ( $self->payname ) {
+            $payname = $self->payname;
+            $payname =~ /^\s*([\w \,\.\-\']*\w)?\s+([\w\,\.\-\']+)$/
+              or do {
+                      $dbh->rollback if $oldAutoCommit;
+                      return "Illegal payname $payname";
+                    };
+            ($payfirst, $paylast) = ($1, $2);
+          } else {
+            $payfirst = $self->getfield('first');
+            $paylast = $self->getfield('first');
+            $payname =  "$payfirst $paylast";
+          }
+        
+          my $transaction = new Business::OnlinePayment( $1, @bop_options );
+          $transaction->content(
+            'type'           => 'CC',
+            'login'          => $bop_login,
+            'password'       => $bop_password,
+            'action'         => $bop_action,
+            'amount'         => $amount,
+            'invoice_number' => $cust_bill->invnum,
+            'customer_id'    => $self->custnum,
+            'last_name'      => $paylast,
+            'first_name'     => $payfirst,
+            'name'           => $payname,
+            'address'        => $address,
+            'city'           => $self->city,
+            'state'          => $self->state,
+            'zip'            => $self->zip,
+            'country'        => $self->country,
+            'card_number'    => $self->payinfo,
+            'expiration'     => $exp,
+          );
+          $transaction->submit();
+
+          if ( $transaction->is_success()) {
+            my $cust_pay = new FS::cust_pay ( {
+               'invnum'   => $cust_bill->invnum,
+               'paid'     => $amount,
+               '_date'     => '',
+               'payby'    => 'CARD',
+               'payinfo'  => $self->payinfo,
+               'paybatch' => "$processor:". $transaction->authorization,
+            } );
+            my $error = $cust_pay->insert;
+            if ( $error ) {
+              # gah, even with transactions.
+              $dbh->commit if $oldAutoCommit; #well.
+              my $e = 'WARNING: Card debited but database not updated - '.
+                      'error applying payment, invnum #' . $cust_bill->invnum.
+                      " ($processor): $error";
+              warn $e;
+              return $e;
+            }
+          } elsif ( $options{'report_badcard'} ) {
+            $dbh->commit if $oldAutoCommit;
+            return "$processor error, invnum #". $cust_bill->invnum. ': '.
+                   $transaction->result_code. ": ". $transaction->error_message;
+          } else {
+            $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+            return ''
+          }
+
         } else {
           $dbh->rollback if $oldAutoCommit;
           return "Unknown real-time processor $processor\n";
@@ -1267,7 +1351,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.17 2001-08-12 00:07:00 ivan Exp $
+$Id: cust_main.pm,v 1.18 2001-08-17 10:55:04 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
index 9526f697e..0807ac7c7 100644
--- a/httemplate/docs/config.html
+++ b/httemplate/docs/config.html
@@ -38,6 +38,7 @@ All further configuration files and directories are located in
   <li><a name="autocapnames">autocapnames</a> - The presence of this file will cause Freeside to use Javascript in /htdocs/edit/cust_main.cgi to automatically capitalize the first and last names of customers.
   <li><a name="bindprimary">bindprimary</a> - Your BIND primary nameserver.  This enables export of /var/named/named.conf and zone files into /var/named
   <li><a name="bindsecondaries">bindsecondaries</a> - Your BIND secondary nameservers, one per line.  This enables export of /var/named/named.conf
+  <li><a name="business-onlinepayment">business-onlinepayment</a> - <a href="http://search.cpan.org/search?dist=Business-OnlinePayment">Business::OnlinePayment</a> support, at least three lines: processor, login, and password.  An optional fourth line specifies the action.  Optional additional lines are passed to Business::OnlinePayment as %processor_options.
   <li><a name="bsdshellmachines">bsdshellmachines</a> - Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/master.passwd'.
   <li><a name="countrydefault">countrydefault</a> - Default two-letter country code (if not supplied, the default is `US')
   <li><a name="cybercash2">cybercash2</a> - <a href="http://www.cybercash.com/cybercash/services/cashreg214.html">CyberCash v2</a> support, four lines: paymentserverhost, paymentserverport, paymentserversecret, and transaction type (`mauthonly' or `mauthcapture').  CCLib.pm is required.
@@ -96,7 +97,7 @@ All further configuration files and directories are located in
   <li><a name="soarefresh">soarefresh</a> - SOA refresh for new domains
   <li><a name="soaretry">soaretry</a> - SOA retry for new domains
   <li><a name="statedefault">statedefault</a> - Default state or province (if not supplied, the default is `CA')
-  <li><a name="textradiusprepend">textradiusprepend</a> - The contents of this file will be prepended to the first line of a user's RADIUS entry in text exports.  If necessary, usually `Auth-Type = Local, '.
+  <li><a name="textradiusprepend">textradiusprepend</a> - <b>depriciated<b>, use RADIUS check attributes instead.  The contents of this file will be prepended to the first line of a user's RADIUS entry in text exports.
   <li><a name="usernamemin">usernamemin</a> - Minimum username length (default 2);
   <li><a name="usernamemax">usernamemax</a> - Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)
   <li><a name="usernamemax">username-letter</a> - The existance of this file will turn on the requirement that usernames contain at least one letter.
-- 
cgit v1.2.1


From 2d9a46afc7a6f42d36d4a6b6fc63132c079ba39f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Aug 2001 10:57:23 +0000
Subject: document catchall and untaint everything

---
 FS/FS/svc_domain.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index fcfcfa955..fce6cf28d 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -93,6 +93,8 @@ FS::svc_Common.  The following fields are currently supported:
 
 =item domain
 
+=item catchall - optional svcnum of an svc_acct record, designating an email catchall account.
+
 =back
 
 =head1 METHODS
@@ -287,7 +289,11 @@ Sets any fixed values; see L<FS::part_svc>.
 
 sub check {
   my $self = shift;
-  my $error;
+  my $error =
+    $self->ut_numbern('svcnum')
+    || $self->ut_numbern('catchall')
+  ;
+  return $error if $error;
 
   my $x = $self->setfixed;
   return $x unless ref($x);
@@ -481,7 +487,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.13 2001-08-12 19:41:24 jeff Exp $
+$Id: svc_domain.pm,v 1.14 2001-08-17 10:57:23 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 55b29dc1d28b0c27e7f8271e7fe382a36d75d268 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Aug 2001 10:57:40 +0000
Subject: gah

---
 bin/dbdef-create    |  9 +++++++--
 bin/svc_acct.export | 11 +++--------
 bin/svc_acct.import |  9 ++++++---
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/bin/dbdef-create b/bin/dbdef-create
index 902f7f145..e71eb36b4 100755
--- a/bin/dbdef-create
+++ b/bin/dbdef-create
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: dbdef-create,v 1.3 2001-04-15 12:56:31 ivan Exp $
+# $Id: dbdef-create,v 1.4 2001-08-17 10:57:40 ivan Exp $
 #
 # create dbdef file for existing mySQL database (needs SHOW|DESCRIBE command
 # not in Pg) based on fs-setup
@@ -8,7 +8,10 @@
 # ivan@sisd.com 98-jun-2
 #
 # $Log: dbdef-create,v $
-# Revision 1.3  2001-04-15 12:56:31  ivan
+# Revision 1.4  2001-08-17 10:57:40  ivan
+# gah
+#
+# Revision 1.3  2001/04/15 12:56:31  ivan
 # s/dbdef/DBIx::DBSchema/
 #
 # Revision 1.2  1998/11/19 11:17:44  ivan
@@ -29,6 +32,8 @@ my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;
 
 my $dbdef = new_native DBIx::DBSchema $dbh;
 
+#print $dbdef->pretty_print;
+
 #important
 $dbdef->save($dbdef_file);
 
diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index a7a21b3e5..a5ec45d48 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,18 +1,11 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.22 2001-08-12 19:41:25 jeff Exp $
+# $Id: svc_acct.export,v 1.23 2001-08-17 10:57:40 ivan Exp $
 #
 # Create and export password, radius and vpopmail password files:
 # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
 # users/assign, domains/vdomain/vpasswd
 # Also export sendmail and qmail config files.
-#
-#
-# $Log: svc_acct.export,v $
-# Revision 1.22  2001-08-12 19:41:25  jeff
-# merging vpopmail support branch
-#
-#
 
 use strict;
 use vars qw($conf);
@@ -73,6 +66,8 @@ my $textradiusprepend =
     ? $conf->config('textradiusprepend')
     : '';
 
+warn "using depriciated textradiusprepend file" if $textradiusprepend;
+
 my @vpopmailmachines = $conf->config('vpopmailmachines')
   if $conf->exists('vpopmailmachines');
 
diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index eaf0c03c5..119f7705b 100755
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.import,v 1.15 2001-07-30 06:07:47 ivan Exp $
+# $Id: svc_acct.import,v 1.16 2001-08-17 10:57:40 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -17,7 +17,10 @@
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 #
 # $Log: svc_acct.import,v $
-# Revision 1.15  2001-07-30 06:07:47  ivan
+# Revision 1.16  2001-08-17 10:57:40  ivan
+# gah
+#
+# Revision 1.15  2001/07/30 06:07:47  ivan
 # allow !! for locked accounts instead of changing to *SUSPENDED*
 #
 # Revision 1.14  2001/05/07 15:24:15  ivan
@@ -166,7 +169,7 @@ while (<USERS>) {
   next if /^\s*$/;
   next if /^\s*#/;
   if ( /^\S/ ) {
-    /^(\w+)\s+(Auth-Type\s+=\s+Local,\s+)Password\s+=\s+"([^"]+)"(,\s+Expiration\s+=\s+"([^"]*")\s*)?$/
+    /^(\w+)\s+(Auth-Type\s+=\s+Local,\s+)?Password\s+=\s+"([^"]+)"(,\s+Expiration\s+=\s+"([^"]*")\s*)?$/
       or die "1Unexpected line in users.import: $_";
     my($password,$expiration);
     ($username,$password,$expiration)=(lc($1),$3,$5);
-- 
cgit v1.2.1


From 94d7e3f0d3431fc1a16afea163367a79ccc78d95 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Aug 2001 11:05:31 +0000
Subject: clean up tax rate editing:   sort by country->state->county,   add
 "collapse state" if the tax rates are the same statewide,   redirect "expand
 state" to the browse, not edit screen

---
 httemplate/browse/cust_main_county.cgi             | 94 ++++++++++++----------
 httemplate/edit/cust_main_county.cgi               | 15 +++-
 .../edit/process/cust_main_county-collapse.cgi     | 49 +++++++++++
 .../edit/process/cust_main_county-expand.cgi       | 41 +---------
 4 files changed, 115 insertions(+), 84 deletions(-)
 create mode 100755 httemplate/edit/process/cust_main_county-collapse.cgi

diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index 96541502c..9cce67da2 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -1,38 +1,5 @@
 <%
-#
-# $Id: cust_main_county.cgi,v 1.1 2001-07-30 07:36:03 ivan Exp $
-#
-# ivan@sisd.com 97-dec-13
-#
-# Changes to allow page to work at a relative position in server
-#	bmccane@maxbaud.net	98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: cust_main_county.cgi,v $
-# Revision 1.1  2001-07-30 07:36:03  ivan
-# templates!!!
-#
-# Revision 1.7  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.6  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.5  1999/01/19 05:13:26  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:16  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 05:25:18  ivan
-# fix visual and other bugs
-#
-# Revision 1.2  1998/11/18 09:01:34  ivan
-# i18n! i18n!
-#
+#<!-- $Id: cust_main_county.cgi,v 1.2 2001-08-17 11:05:31 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $cust_main_county );
@@ -66,18 +33,61 @@ print &table(), <<END;
       </TR>
 END
 
-foreach $cust_main_county ( qsearch('cust_main_county',{}) ) {
-  my($hashref)=$cust_main_county->hashref;
+my @regions = sort {    $a->country cmp $b->country
+                     or $a->state   cmp $b->state
+                     or $a->county  cmp $b->county
+                   } qsearch('cust_main_county',{});
+
+my $sup=0;
+#foreach $cust_main_county ( @regions ) {
+for ( my $i=0; $i<@regions; $i++ ) { 
+  my $cust_main_county = $regions[$i];
+  my $hashref = $cust_main_county->hashref;
   print <<END;
       <TR>
         <TD>$hashref->{country}</TD>
 END
-  print "<TD>", $hashref->{state}
-      ? $hashref->{state}
-      : qq!(ALL) <FONT SIZE=-1>!.
-        qq!<A HREF="${p}edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
-        qq!">expand country</A></FONT>!
-    , "</TD>";
+
+  my $j;
+  if ( $sup ) {
+    $sup--;
+  } else {
+
+    #lookahead
+    for ( $j=1; $i+$j<@regions; $j++ ) {
+      last if $hashref->{country} ne $regions[$i+$j]->country
+           || $hashref->{state} ne $regions[$i+$j]->state
+           || $hashref->{tax} != $regions[$i+$j]->tax;
+    }
+
+    my $newsup=0;
+    if ( $j>1 && $i+$j+1 < @regions
+         && ( $hashref->{state} ne $regions[$i+$j+1]->state 
+              || $hashref->{country} ne $regions[$i+$j+1]->country
+              )
+         && ( ! $i
+              || $hashref->{state} ne $regions[$i-1]->state 
+              || $hashref->{country} ne $regions[$i-1]->country
+              )
+       ) {
+       $sup = $j-1;
+    } else {
+      $j = 1;
+    }
+
+    print "<TD ROWSPAN=$j>", $hashref->{state}
+        ? $hashref->{state}
+        : qq!(ALL) <FONT SIZE=-1>!.
+          qq!<A HREF="${p}edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
+          qq!">expand country</A></FONT>!;
+
+    print qq! <FONT SIZE=-1><A HREF="${p}edit/process/cust_main_county-collapse.cgi?!. $hashref->{taxnum}. qq!">collapse state</A></FONT>! if $j>1;
+
+    print "</TD>";
+  }
+
+#  $sup=$newsup;
+
   print "<TD>";
   if ( $hashref->{county} ) {
     print $hashref->{county};
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index 38e6d6877..1b8e76fc7 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -1,6 +1,6 @@
 <%
 #
-# $Id: cust_main_county.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.2 2001-08-17 11:05:31 ivan Exp $
 #
 # ivan@sisd.com 97-dec-13-16
 #
@@ -11,7 +11,13 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 # 
 # $Log: cust_main_county.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
+# Revision 1.2  2001-08-17 11:05:31  ivan
+# clean up tax rate editing:
+#   sort by country->state->county,
+#   add "collapse state" if the tax rates are the same statewide,
+#   redirect "expand state" to the browse, not edit screen
+#
+# Revision 1.1  2001/07/30 07:36:04  ivan
 # templates!!!
 #
 # Revision 1.8  1999/04/09 04:22:34  ivan
@@ -69,7 +75,10 @@ print qq!<FORM ACTION="!, popurl(1),
       </TR>
 END
 
-foreach $cust_main_county ( qsearch('cust_main_county',{}) ) {
+foreach $cust_main_county ( sort {    $a->country cmp $b->country
+                                   or $a->state   cmp $b->state
+                                   or $a->county  cmp $b->county
+                                 } qsearch('cust_main_county',{}) ) {
   my($hashref)=$cust_main_county->hashref;
   print <<END;
       <TR>
diff --git a/httemplate/edit/process/cust_main_county-collapse.cgi b/httemplate/edit/process/cust_main_county-collapse.cgi
new file mode 100755
index 000000000..62c2ba753
--- /dev/null
+++ b/httemplate/edit/process/cust_main_county-collapse.cgi
@@ -0,0 +1,49 @@
+<%
+# <!-- $Id: cust_main_county-collapse.cgi,v 1.1 2001-08-17 11:05:31 ivan Exp $ -->
+
+use strict;
+use vars qw ( $cgi $taxnum $cust_main_county @expansion $expansion );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup datasrc);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(popurl);
+use FS::cust_main_county;
+use FS::cust_main;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ or die "Illegal taxnum!";
+$taxnum = $1;
+$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+  or die ("Unknown taxnum!");
+
+#really should do this in a .pm & start transaction
+
+foreach my $delete ( qsearch('cust_main_county', {
+                    'country' => $cust_main_county->country,
+                    'state' => $cust_main_county->state  
+                 } ) ) {
+#  unless ( qsearch('cust_main',{
+#    'state'  => $cust_main_county->getfield('state'),
+#    'county' => $cust_main_county->getfield('county'),
+#    'country' =>  $cust_main_county->getfield('country'),
+#  } ) ) {
+    my $error = $delete->delete;
+    die $error if $error;
+#  } else {
+    #should really fix the $cust_main record
+#  }
+
+}
+
+$cust_main_county->taxnum('');
+$cust_main_county->county('');
+my $error = $cust_main_county->insert;
+die $error if $error;
+
+print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi");
+
+%>
diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
index b7c4547f6..a0231b076 100755
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -1,42 +1,5 @@
 <%
-#
-# $Id: cust_main_county-expand.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 97-dec-16
-#
-# Changes to allow page to work at a relative position in server
-# Added import of datasrc from UID.pm for Pg6.3
-# Default tax to 0.0 if using Pg6.3
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI
-# undo default tax to 0.0 if using Pg6.3: comes from pre-expanded record
-# for that state
-# ivan@sisd.com 98-sep-2
-#
-# $Log: cust_main_county-expand.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  2000/12/21 05:22:30  ivan
-# perldoc -f split
-#
-# Revision 1.6  1999/01/25 12:19:07  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:51  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 22:47:52  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.3  1998/12/17 08:40:20  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.2  1998/11/18 09:01:40  ivan
-# i18n! i18n!
-#
+# <!-- $Id: cust_main_county-expand.cgi,v 1.2 2001-08-17 11:05:31 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $taxnum $cust_main_county @expansion $expansion );
@@ -99,6 +62,6 @@ unless ( qsearch('cust_main',{
   die $error if $error;
 }
 
-print $cgi->redirect(popurl(3). "edit/cust_main_county.cgi");
+print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi");
 
 %>
-- 
cgit v1.2.1


From 898aa3474d66a76b84cc9508f96618d2be1a27ed Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Aug 2001 11:28:03 +0000
Subject: canada has same phone# rules as US

---
 FS/FS/Record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 6409da33d..11255f4b0 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -730,7 +730,7 @@ sub ut_phonen {
   my $phonen = $self->getfield($field);
   if ( $phonen eq '' ) {
     $self->setfield($field,'');
-  } elsif ( $country eq 'US' ) {
+  } elsif ( $country eq 'US' || $country eq 'CA' ) {
     $phonen =~ s/\D//g;
     $phonen =~ /^(\d{3})(\d{3})(\d{4})(\d*)$/
       or return "Illegal (phone) $field: ". $self->getfield($field);
@@ -949,7 +949,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.21 2001-08-11 05:50:52 ivan Exp $
+$Id: Record.pm,v 1.22 2001-08-17 11:28:03 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From ab2a71970ac434c3bf628af426d23d9b992fd816 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Aug 2001 11:33:17 +0000
Subject: ut_phonen: fallback to ut_textn, instead of ut_alphan for non-US/CA
 phone numbers

---
 FS/FS/Record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 11255f4b0..cf902e6a1 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -739,7 +739,7 @@ sub ut_phonen {
     $self->setfield($field,$phonen);
   } else {
     warn "don't know how to check phone numbers for country $country";
-    return $self->ut_alphan($field);
+    return $self->ut_textn($field);
   }
   '';
 }
@@ -949,7 +949,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.22 2001-08-17 11:28:03 ivan Exp $
+$Id: Record.pm,v 1.23 2001-08-17 11:33:17 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From e7b0bcbf0b1feff0e0e38d5858f512286a4d0ba7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 19 Aug 2001 00:48:49 +0000
Subject: country fields will now accept names and change them to two-letter
 codes

---
 FS/FS/Record.pm    | 24 +++++++++++++++++++++++-
 FS/FS/cust_main.pm |  9 +++------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index cf902e6a1..8dbd4aff3 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -6,6 +6,7 @@ use subs qw(reload_dbdef);
 use Exporter;
 use Carp qw(carp cluck croak confess);
 use File::CounterFile;
+use Locale::Country;
 use DBIx::DBSchema;
 use FS::UID qw(dbh checkruid swapuid getotaker datasrc driver_name);
 
@@ -821,6 +822,27 @@ sub ut_zip {
   '';
 }
 
+=item ut_country COLUMN
+
+Check/untaint country codes.  Country names are changed to codes, if possible -
+see L<Locale::Country>.
+
+=cut
+
+sub ut_country {
+  my( $self, $field ) = @_;
+  unless ( $self->getfield($field) =~ /^(\w\w)$/ ) {
+    if ( $self->getfield($field) =~ /^([\w \,\.\(\)\']+)$/ 
+         && country2code($1) ) {
+      $self->setfield($field,uc(country2code($1)));
+    }
+  }
+  $self->getfield($field) =~ /^(\w\w)$/
+    or return "Illegal (country) $field: ". $self->getfield($field);
+  $self->setfield($field,uc($1));
+  '';
+}
+
 =item ut_anything COLUMN
 
 Untaints arbitrary data.  Be careful.
@@ -949,7 +971,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.23 2001-08-17 11:33:17 ivan Exp $
+$Id: Record.pm,v 1.24 2001-08-19 00:48:49 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index c3a3e3fc6..3084b9058 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -500,6 +500,7 @@ sub check {
     || $self->ut_text('city')
     || $self->ut_textn('county')
     || $self->ut_textn('state')
+    || $self->ut_country('country')
     || $self->ut_anything('comments')
   ;
   #barf.  need message catalogs.  i18n.  etc.
@@ -523,8 +524,6 @@ sub check {
     $self->ss("$1-$2-$3");
   }
 
-  $self->country =~ /^(\w\w)$/ or return "Illegal country: ". $self->country;
-  $self->country($1);
   unless ( qsearchs('cust_main_county', {
     'country' => $self->country,
     'state'   => '',
@@ -565,13 +564,11 @@ sub check {
         || $self->ut_text('ship_city')
         || $self->ut_textn('ship_county')
         || $self->ut_textn('ship_state')
+        || $self->ut_country('ship_country')
       ;
       return $error if $error;
 
       #false laziness with above
-      $self->ship_country =~ /^(\w\w)$/
-        or return "Illegal ship_country: ". $self->ship_country;
-      $self->ship_country($1);
       unless ( qsearchs('cust_main_county', {
         'country' => $self->ship_country,
         'state'   => '',
@@ -1351,7 +1348,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.18 2001-08-17 10:55:04 ivan Exp $
+$Id: cust_main.pm,v 1.19 2001-08-19 00:48:49 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From ddb8528c025f6bef778f08885ae1411122874207 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 19 Aug 2001 08:15:10 +0000
Subject: set fixed fields before checking domsvc

---
 FS/FS/svc_acct.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 9f95f4007..b0e007f6c 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -381,18 +381,18 @@ Sets any fixed values; see L<FS::part_svc>.
 sub check {
   my $self = shift;
 
-  my $error = 
-    $self->ut_numbern('svcnum')
-    || $self->ut_number('domsvc')
-  ;
-  return $error if $error;
-
   my($recref) = $self->hashref;
 
   my $x = $self->setfixed;
   return $x unless ref($x);
   my $part_svc = $x;
 
+  my $error = 
+    $self->ut_numbern('svcnum')
+    || $self->ut_number('domsvc')
+  ;
+  return $error if $error;
+
   my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;
   $recref->{username} =~ /^([a-z0-9_\-\.]{$usernamemin,$ulen})$/
     or return "Illegal username";
@@ -558,7 +558,7 @@ sub radius_check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.21 2001-08-13 00:21:54 ivan Exp $
+$Id: svc_acct.pm,v 1.22 2001-08-19 08:15:10 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From c2652bd1f1928b495e1dc5b4a43c46bffcc9022d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 19 Aug 2001 08:18:01 +0000
Subject: ->setfixed untaints svcnum

---
 FS/FS/svc_acct.pm   |  7 ++-----
 FS/FS/svc_domain.pm | 10 ++++------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index b0e007f6c..253d56c40 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -387,10 +387,7 @@ sub check {
   return $x unless ref($x);
   my $part_svc = $x;
 
-  my $error = 
-    $self->ut_numbern('svcnum')
-    || $self->ut_number('domsvc')
-  ;
+  my $error = $self->ut_number('domsvc');
   return $error if $error;
 
   my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;
@@ -558,7 +555,7 @@ sub radius_check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.22 2001-08-19 08:15:10 ivan Exp $
+$Id: svc_acct.pm,v 1.23 2001-08-19 08:18:01 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index fce6cf28d..b3b298b97 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -289,16 +289,14 @@ Sets any fixed values; see L<FS::part_svc>.
 
 sub check {
   my $self = shift;
-  my $error =
-    $self->ut_numbern('svcnum')
-    || $self->ut_numbern('catchall')
-  ;
-  return $error if $error;
 
   my $x = $self->setfixed;
   return $x unless ref($x);
   my $part_svc = $x;
 
+  my $error = $self->ut_numbern('catchall');
+  return $error if $error;
+
   #hmm
   my $pkgnum;
   if ( $self->svcnum ) {
@@ -487,7 +485,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.14 2001-08-17 10:57:23 ivan Exp $
+$Id: svc_domain.pm,v 1.15 2001-08-19 08:18:01 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From cb85608dc292b4693ccb80913fc5a1959d6e9afc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 19 Aug 2001 08:32:43 +0000
Subject: display bill and service name/company, and services

---
 httemplate/search/cust_pkg.cgi | 96 ++++++++++++++++++++++++++++++++----------
 1 file changed, 74 insertions(+), 22 deletions(-)

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 50028e3e3..2ab6e2b57 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,13 +1,13 @@
 <%
-# <!-- $Id: cust_pkg.cgi,v 1.2 2001-08-15 10:04:53 ivan Exp $ -->
+# <!-- $Id: cust_pkg.cgi,v 1.3 2001-08-19 08:32:43 ivan Exp $ -->
 
 use strict;
-use vars qw ( $cgi @cust_pkg $sortby $query );
+use vars qw ( $cgi @cust_pkg $sortby $query %part_pkg );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header eidiot popurl);
+use FS::Record qw(qsearch qsearchs dbdef);
+use FS::CGI qw(header eidiot popurl table);
 use FS::cust_pkg;
 use FS::pkg_svc;
 use FS::cust_svc;
@@ -16,6 +16,8 @@ use FS::cust_main;
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
+my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
+
 ($query) = $cgi->keywords;
 #this tree is a little bit redundant
 if ( $query eq 'pkgnum' ) {
@@ -56,47 +58,97 @@ if ( scalar(@cust_pkg) == 1 ) {
   eidiot("No packages found");
 } else {
   my($total)=scalar(@cust_pkg);
-  print $cgi->header( '-expires' => 'now' ), header('Package Search Results',''), <<END;
-    $total matching packages found
-    <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
+  print $cgi->header( '-expires' => 'now' ),
+        header('Package Search Results',''),
+        "$total matching packages found<BR>", &table(), <<END;
       <TR>
-        <TH>Package #</TH>
-        <TH>Customer #</TH>
-        <TH>Contact name</TH>
-        <TH>Company</TH>
+        <TH>Package</TH>
+        <TH><FONT SIZE=-1>Cust#</FONT></TH>
+        <TH>(bill) name</TH>
+        <TH>company</TH>
+END
+
+if ( defined dbdef->table('cust_main')->column('ship_last') ) {
+  print <<END;
+      <TH>(service) name</TH>
+      <TH>company</TH>
+END
+}
+
+print <<END;
+        <TH COLSPAN=2>Services</TH>
       </TR>
 END
 
+  my $n1 = '<TR>';
   my(%saw,$cust_pkg);
   foreach $cust_pkg (
     sort $sortby grep(!$saw{$_->pkgnum}++, @cust_pkg)
   ) {
     my($cust_main)=qsearchs('cust_main',{'custnum'=>$cust_pkg->custnum});
-    my($pkgnum,$custnum,$name,$company)=(
+    my($pkgnum, $custnum, $last, $first, $company,
+       $ship_last, $ship_first, $ship_company)=(
       $cust_pkg->pkgnum,
       $cust_pkg->custnum,
-      $cust_main ? $cust_main->last. ', '. $cust_main->first : '',
+      $cust_main ? $cust_main->last : '',
+      $cust_main ? $cust_main->first : '',
       $cust_main ? $cust_main->company : '',
+      $cust_main
+        ? ( $cust_main->ship_last || $cust_main->getfield('last') )
+        : '',
+      $cust_main 
+        ? ( $cust_main->ship_last
+            ? $cust_main->ship_first
+            : $cust_main->first )
+        : '',
+      $cust_main 
+        ? ( $cust_main->ship_last
+            ? $cust_main->ship_company
+            : $cust_main->company )
+        : '',
     );
+    my $pkg = $part_pkg{$cust_pkg->pkgpart}->pkg;
+    #$pkg .= ' - '. $part_pkg{$cust_pkg->pkgpart}->comment;
+    my @cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
+    my $rowspan = scalar(@cust_svc) || 1;
     my $p = popurl(2);
-    print <<END;
-    <TR>
-      <TD><A HREF="${p}view/cust_pkg.cgi?$pkgnum"><FONT SIZE=-1>$pkgnum</FONT></A></TD>
+    print $n1, <<END;
+      <TD ROWSPAN=$rowspan><A HREF="${p}view/cust_pkg.cgi?$pkgnum"><FONT SIZE=-1>$pkgnum - $pkg</FONT></A></TD>
 END
     if ( $cust_main ) {
       print <<END;
-      <TD><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$custnum</A></FONT></TD>
-      <TD><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$name</A></FONT></TD>
-      <TD><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$company</A></FONT></TD>
-    </TR>
+      <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$custnum</A></FONT></TD>
+      <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$last, $first</A></FONT></TD>
+      <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$company</A></FONT></TD>
 END
+      if ( defined dbdef->table('cust_main')->column('ship_last') ) {
+        print <<END;
+      <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$ship_last, $ship_first</A></FONT></TD>
+      <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$ship_company</A></FONT></TD>
+END
+      }
     } else {
+      my $colspan = defined dbdef->table('cust_main')->column('ship_last')
+                    ? 5 : 3;
       print <<END;
-      <TD COLSPAN=3>WARNING: couldn't find cust_main.custnum $custnum (cust_pkg.pkgnum $pkgnum)</TD>
-    </TR>
+      <TD ROWSPAN=$rowspan COLSPAN=$colspan>WARNING: couldn't find cust_main.custnum $custnum (cust_pkg.pkgnum $pkgnum)</TD>
 END
     }
+
+    my $n2 = '';
+    foreach my $cust_svc ( @cust_svc ) {
+      my($label, $value, $svcdb) = $cust_svc->label;
+      my $svcnum = $cust_svc->svcnum;
+      my $sview = $p. "view";
+      print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
+            qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
+      $n2="</TR><TR>";
+    }
+
+    $n1 = "</TR><TR>";
+
   }
+    print '</TR>';
  
   print <<END;
     </TABLE>
-- 
cgit v1.2.1


From 7ab7ab8ce4ce69456224fc70043b83d4fd2ace97 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 19 Aug 2001 09:08:18 +0000
Subject: this is what i fed to RT, might as well check it in.

no further modifications to TODO.  everything is in the ticketing system now.
---
 TODO | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 75 insertions(+), 25 deletions(-)

diff --git a/TODO b/TODO
index f9e685528..6aee3e790 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.66 2001-07-30 07:13:34 ivan Exp $
+$Id: TODO,v 1.67 2001-08-19 09:08:18 ivan Exp $
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
@@ -6,6 +6,58 @@ ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
 ---
 
+Does Freeside currently support notification to the customer that their
+credit card on file is about to expire? What about notification that their
+credit card was declined after they sign up, say like in 5 months when it
+fails? If not are these options being planned to be added in the next
+release? I think they would be nice options to see Freeside support.
+.
+Tim Jung
+System Admin
+Internet Gateway Inc.
+tjung@igateway.net
+
+deleting an account doesn't remove any references to it in cust_main_invoice.
+it should, or error perhaps?  ("this account is used as an invoice destination,
+remove that first?")  or the cust_main_invoice should be changed to literal.
+it'll bounce, but that seems reasonable...
+
+also cust_main_invoice uses `mydomain' in a way that will have to be changed
+when jeff's branch merges
+
+> I can't use the built in agent mechanism to do ACLs for things like
+> suspension and cancellation, but I can use it for selecting which
+> package types the marketing types are allowed to sign up.  Problem is,
+> I can't seem to figure out the rules as to how cust_main.cgi figures
+> out which packages to stick in the list of packages available for new
+> customers.
+.
+Currently, only packages with a single service with table `svc_acct'
+appear on the `New Customer' screen.  Other packages may be ordered from
+the `Order and cancel packages' link on the main `Customer View' screen.
+.
+Perhaps the `New Customer' UI could be changed like the new `Service Edit'
+screen in CVS, to support all available packages, not just those with a
+single service with table `svc_acct'.
+
+> +----------
+> | Thank you for the response.That being the case do you have any
+> | recommendations as to the most effective way to add prior balances?
+> +----------                                                          
+> 
+>   You could create a package called 'Starting Balance' and sell it
+> to them.  Adjust the price as neccessary.
+.
+Yes, this is what to do with the current system.
+.
+In the future, this is what the database would do internally, but
+eventually I'd like the user-interface and the Perl API to offer a
+one-step way to "add a starting balance" that does this underneath.
+.
+I'm also thinking it might be necessary for accouting reasons to add a
+flag to these charges and payments against them, so you can run totals and
+reports ignoring them.  Not sure about this.
+
 > Does Freeside currently support notification to the customer that their
 > credit card on file is about to expire?
 > What about notification that their
@@ -530,12 +582,12 @@ specify the password, then receive an error and are returned to the form?)
 
 more DOC:
 Thought some of you might be interested in this:
-  
+. 
 <ftp://ftp.minivend.com/pub> has CyberCash compatibility modules for 
 Paymentnet <http://www.paymentnet.com> and Authorizenet 
 <http://www.authorizenet.com> which should allow you process transactions
 using those services as well as CyberCash.
-
+.
 The files are named CCLib.pm.paymentnet and CCLib.pm_authorizenet,
 respectively, and are installed by renaming to CCLib.pm and moving to your
 site_perl directory.  Otherwise, follow the directions for Cybercash v2 in
@@ -658,7 +710,7 @@ statement!
     this if you are using it.
 
 > 2. can customers view their bills on-line.                                    
- 
+. 
 Not yet; it needs to be proxied from Freeside to a customer web server in
 a secure way using something not completely unlike the fs_passwd,
 fs_passwdd, fs_passwd_server trio.
@@ -666,10 +718,10 @@ fs_passwdd, fs_passwd_server trio.
 
 > Lastly, if someone over pays on an invoice, the credit part does not flow
 > over to other invoices..
-
+.
 The total balance flows over correctly, but individual payments don't.
 The code you're looking for is in FS::cust_pay::insert
-
+.
 The question of what to do with overpayments that don't have another 
 invoice to flow into (yet.. or possibly not) is still an open one.    The
 legacy system Freeside replaced long ago had a separate place for this
@@ -688,7 +740,7 @@ warn or complain or something when invoice_from is empty (and we use it)
 Right now Freeside uses the `freq' field of a package definition as a 
 number of months.  The specific section of code you're looking for is in  
 FS::cust_main::bill:
-        
+.       
         #change this bit to use Date::Manip?
         #$sdate=$cust_pkg->bill || time;
         #$sdate=$cust_pkg->bill || $time;
@@ -700,10 +752,10 @@ FS::cust_main::bill:
         $cust_pkg->setfield('bill',
           timelocal($sec,$min,$hour,$mday,$mon,$year));
         $cust_pkg_mod_flag = 1;
-  
+. 
 ..and when I went poking for this, looks like it tells us just what needs   
 to be done!  Hehehe...
-
+.
 Date::Manip can handle cool things like "+ 1 month" (actually the current
 case of /^(\d+)$/ would have to be added as a special case of "+ $1 
 month") and "+ 30 days" (what you need) and even "+ 5 business days" !
@@ -714,7 +766,7 @@ On Wed, Apr 28, 1999 at 08:38:16PM +0000, Kristian Hoffmann wrote:
 > understand, when you run svc_acct.export, it rewrites the /etc/passwd,
 > /etc/shadow, etc. files.  Is this only for initial setups with the
 > export hooks being in the pm's?
- 
+.
 You can use both, or just one method.  The configuration files control    
 this.  One of the things in the TODO is to take out the last few things   
 that aren't customizable wrt this and put them in config files.
@@ -768,8 +820,6 @@ hooks for arbitrary commands out of configuration files
 svc_acct.pm svc_acct_sm.pm etc.
 
 Add this to a FAQ, along with doing it for middle names:
-
-
 >  What I'm finding difficult is how to easily 
 > customize fields.  For example, I am trying to add a "middle name" field
 > to the Customer Edit, view, etc.  If I'm going about it right, it appears
@@ -783,7 +833,7 @@ You have the basic idea.  To implement that completely, I would:
 - Document the change in a new file, htdocs/docs/upgrade4.html
 * Run bin/dbdef-create
 * Add the new field to edit/cust_main.cgi and edit/process/cust_main.cgi
-
+.
 For bonus points, I'd grep around for the various bits which use "$first 
 $last" or "$last, $first" and replace them with a method call in cust_main.pm,
  , like search/cust_main.cgi
@@ -1281,23 +1331,23 @@ lease... probably doesn't make a difference in the ordering... but if you
 cancel a router lease the inventory should come back.  hmm.)
 
 -- Matt's wishlist ---
-
+.
 From matt@michweb.net Fri Feb 20 16:39:53 1998
 Date: Thu, 19 Feb 1998 23:20:11 -0500
 From: Matt Simerson <matt@michweb.net>
 Reply-To: quadran-developer@netgoth.com
 To: quadran-developer@netgoth.com
 Subject: Re: Welcome to quadran-developer
-
+.
 >Whats it based on and what is it supposed to do?  I'm interested, but
 >unfortunatly, I don't have that much time to help on the project (I'm busily
 >working on one of my own based around MySQL and Qt right now -- don't know
 >if it will be GPL'ed or not yet -- we'll probably just use it in house since
 >it is designed around our system)...
-
+.
 That's what I set out to find, but didn't find anything on the web site.
 I'm looking for something that will do the following:
-
+.
 Single point of entry for users on a secure system:
 	Creates account on user (public) systems
 		update /etc/passwd/master.passwd file
@@ -1307,7 +1357,7 @@ Single point of entry for users on a secure system:
 	Export of new user info to customizable report (for automated entry
 into
 		accounting software, etc...)
-
+.
 Automated billing:
 	Export credit card info for batch processing and have hooks built
 		in for other forms of electronic processing.
@@ -1316,13 +1366,13 @@ Automated billing:
 software
 	Email or laser print invoices
 	Sanity checks credit card numbers before processing (code available)
-
+.
 Simple method for disabling an account.
 	Arbitrary Expiration Dates (on a given day, in x days)
 	Remove from radius.
 	Changing password to '*'
 	Virtual customers disabling dns, http server, log processing, etc..
-
+.
 Billing for different account types:
 	Dialup monthly flat rate. Prorates for partial months.
 	Dialup monthly flat rate for x hours + hourly usage.
@@ -1333,17 +1383,17 @@ Billing for different account types:
 	Disk space used over quota.
 	Tech support minimum + hourly charges
 	Other for misc stuff (modem, RAM, etc...)
-
+.
 Per user definable RADIUS attributes (ties in with above)
 	Fixed IP
 	Simultaneous Use
 	IP filters (for dialup email only)
-
+.
 Keep logs of modem usage generated daily from radius accounting logs stored
 on multiple radius servers.
-
+.
 Keep logs of disk usage generated from quota.
-
+.
 Method of adding virtual domains to your system:
 	Automatically grabs an IP address from a preassigned pool.
 	Creates a domain.com database file from database fields
@@ -1363,7 +1413,7 @@ system...in bash. Shouldn't be hard for a perlmeister to convert. In fact,
 as long as all the info was stored in the database (username, domain name,
 and ip pool) this could easily just be run as an external script that the
 user tweaks to match his system.
-
+.
 We use a great accounting software (M.Y.O.B) that does all the AP, AR,
 Payroll, Tax stuff, and most everything else we could need. It's already
 set up for the type of checks we have, etc, etc... I just need something to
-- 
cgit v1.2.1


From b400f5e930df471ad42906ae118f0f3b00cec512 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 19 Aug 2001 10:25:44 +0000
Subject: add system shells to @FS::svc_acct:shells on the fly, fixes: ticket
 #88

---
 bin/svc_acct.import | 63 +++--------------------------------------------------
 1 file changed, 3 insertions(+), 60 deletions(-)

diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index 119f7705b..eb94e1c37 100755
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,64 +1,5 @@
 #!/usr/bin/perl -Tw
-#
-# $Id: svc_acct.import,v 1.16 2001-08-17 10:57:40 ivan Exp $
-#
-# ivan@sisd.com 98-mar-9
-#
-# changed 'password' field to '_password' because PgSQL 6.3 reserves this word
-#	bmccane@maxbaud.net  98-Apr-3
-#
-# generalized svcparts (still needs radius import) ivan@sisd.com 98-mar-23
-#
-# radius import, now an interactive script.  still needs erpcd import?
-# ivan@sisd.com 98-jun-24
-#
-# arbitrary radius attributes ivan@sisd.com 98-aug-9
-#
-# don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
-#
-# $Log: svc_acct.import,v $
-# Revision 1.16  2001-08-17 10:57:40  ivan
-# gah
-#
-# Revision 1.15  2001/07/30 06:07:47  ivan
-# allow !! for locked accounts instead of changing to *SUSPENDED*
-#
-# Revision 1.14  2001/05/07 15:24:15  ivan
-# s/!/*/
-#
-# Revision 1.13  2001/05/05 08:51:16  ivan
-# http://www.sisd.com/freeside/list-archive/msg01915.html
-#
-# Revision 1.12  2001/04/22 01:56:15  ivan
-# get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)
-#
-# Revision 1.11  2000/06/29 12:27:01  ivan
-# s/password/_password/ for PostgreSQL wasn't done in the import.
-#
-# Revision 1.10  2000/06/28 12:32:30  ivan
-# allow RADIUS lines with "Auth-Type = Local" too
-#
-# Revision 1.8  2000/02/03 05:16:52  ivan
-# beginning of DNS and Apache support
-#
-# Revision 1.7  1999/07/08 02:32:26  ivan
-# import fix, noticed by Ben Leibig and Joel Griffiths
-#
-# Revision 1.6  1999/07/08 01:49:00  ivan
-# updates to avoid -w warnings from Joel Griffiths <griff@aver-computer.com>
-#
-# Revision 1.5  1999/03/25 08:42:19  ivan
-# import stuff uses Term::Query and spits out (some kinds of) nonsensical input
-#
-# Revision 1.4  1999/03/24 00:43:38  ivan
-# die if no relevant services
-#
-# Revision 1.3  1998/12/10 07:23:16  ivan
-# use FS::Conf, need user (for datasrc)
-#
-# Revision 1.2  1998/10/13 12:07:51  ivan
-# Assigns password from the shadow file for RADIUS password "UNIX"
-#
+# $Id: svc_acct.import,v 1.17 2001-08-19 10:25:44 ivan Exp $
 
 use strict;
 use vars qw(%part_svc);
@@ -73,6 +14,8 @@ use FS::part_svc;
 my $user = shift or die &usage;
 adminsuidsetup $user;
 
+push @FS::svc_acct::shells, qw(/bin/sync /sbin/shuddown /bin/halt); #others?
+
 my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
 
 $FS::svc_acct::nossh_hack = 1;
-- 
cgit v1.2.1


From 8c7396531e6bf6f7c6cc4e5d19e2d381442223c5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 19 Aug 2001 13:50:47 +0000
Subject: indices on cust_main ship_last and ship_country

---
 bin/fs-setup                  | 11 ++++++-----
 httemplate/docs/upgrade8.html |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index ec8b75089..7056347e6 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.42 2001-08-13 00:19:02 ivan Exp $
+# $Id: fs-setup,v 1.43 2001-08-19 13:50:47 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -92,10 +92,11 @@ my($dbdef) = new DBIx::DBSchema ( map {
   );
 } (keys %tables) );
 
-#remove ship_ from cust_main
-unless ($ship) {
-  my $cust_main = $dbdef->table('cust_main');
+my $cust_main = $dbdef->table('cust_main');
+unless ($ship) { #remove ship_ from cust_main
   $cust_main->delcolumn($_) foreach ( grep /^ship_/, $cust_main->columns );
+} else { #add indices on ship_last and ship_company
+  push @{$cust_main->index->lol_ref}, ( ['ship_last'], ['ship_company'] ) 
 }
 
 #add radius attributes to svc_acct
@@ -363,7 +364,7 @@ sub tables_hash_hack {
       'primary_key' => 'custnum',
       'unique' => [ [] ],
       #'index' => [ ['last'], ['company'] ],
-      'index' => [ ['last'], ],
+      'index' => [ ['last'], [ 'company' ] ],
     },
 
     'cust_main_invoice' => {
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 1a5c998c6..60f8f1593 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -129,6 +129,8 @@ ALTER TABLE cust_main ADD COLUMN ship_country char(2) NULL;
 ALTER TABLE cust_main ADD COLUMN ship_daytime varchar(20) NULL;
 ALTER TABLE cust_main ADD COLUMN ship_night varchar(20) NULL;
 ALTER TABLE cust_main ADD COLUMN ship_fax varchar(12) NULL;
+CREATE INDEX cust_main1 ON cust_main ( ship_last );
+CREATE INDEX cust_main2 ON cust_main ( ship_company );
 </pre>
   <li>If you wish to enable customer comments, apply the following change to
       your database:
-- 
cgit v1.2.1


From 8a8c9386cbd3383b0134aae8e32b5995f8886fb2 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sun, 19 Aug 2001 15:53:36 +0000
Subject: added user interface for svc_forward and vpopmail support

---
 FS/FS/cust_svc.pm                       |  12 +-
 FS/FS/svc_acct.pm                       |  21 ++-
 FS/FS/svc_forward.pm                    |   5 +-
 FS/MANIFEST                             |   2 +
 httemplate/edit/part_svc.cgi            |  18 ++-
 httemplate/edit/process/svc_forward.cgi |  51 +++++++
 httemplate/edit/svc_acct.cgi            |  27 +++-
 httemplate/edit/svc_forward.cgi         | 242 ++++++++++++++++++++++++++++++++
 httemplate/misc/catchall.cgi            | 157 +++++++++++++++++++++
 httemplate/misc/process/catchall.cgi    |  55 ++++++++
 httemplate/search/svc_acct.cgi          |   9 +-
 httemplate/search/svc_domain.cgi        | 117 ++++++++-------
 httemplate/view/svc_acct.cgi            |  15 +-
 httemplate/view/svc_domain.cgi          |  19 ++-
 httemplate/view/svc_forward.cgi         |  91 ++++++++++++
 15 files changed, 766 insertions(+), 75 deletions(-)
 create mode 100755 httemplate/edit/process/svc_forward.cgi
 create mode 100755 httemplate/edit/svc_forward.cgi
 create mode 100755 httemplate/misc/catchall.cgi
 create mode 100755 httemplate/misc/process/catchall.cgi
 create mode 100755 httemplate/view/svc_forward.cgi

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index cbc4d91fa..3a83679fb 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -10,6 +10,7 @@ use FS::part_svc;
 use FS::svc_acct;
 use FS::svc_acct_sm;
 use FS::svc_domain;
+use FS::svc_forward;
 
 @ISA = qw( FS::Record );
 
@@ -131,6 +132,15 @@ sub label {
     my $svc_domain = qsearchs ( 'svc_domain', { 'svcnum' => $svc_x->domsvc } );
     my $domain = $svc_domain->domain;
     $tag = "$domuser\@$domain";
+  } elsif ( $svcdb eq 'svc_forward' ) {
+    my $svc_acct = qsearchs ( 'svc_acct', { 'svcnum' => $svc_x->srcsvc } );
+    $tag = $svc_acct->email . '->';
+    if ($svc_x->dstsvc) {
+      $svc_acct = qsearchs ( 'svc_acct', { 'svcnum' => $svc_x->dstsvc } );
+      $tag .= $svc_acct->email;
+    }else{
+      $tag .= $svc_x->dst;
+    }
   } elsif ( $svcdb eq 'svc_domain' ) {
     $tag = $svc_x->getfield('domain');
   } else {
@@ -144,7 +154,7 @@ sub label {
 
 =head1 VERSION
 
-$Id: cust_svc.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: cust_svc.pm,v 1.2 2001-08-19 15:53:34 jeff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 253d56c40..42eb7d9ee 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -551,11 +551,30 @@ sub radius_check {
   } grep { /^rc_/ && $self->getfield($_) } fields( $self->table );
 }
 
+=item email
+
+Returns an email address associated with the account.
+
+=cut
+
+sub email {
+  my $self = shift;
+  my $domain;
+  my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } );
+  if ($svc_domain) {
+    $domain=$svc_domain->domain;
+  }else{
+    warn "couldn't find svc_acct.domsvc " . $self->domsvc . "!";
+    $domain="unknown";
+  }
+  return $self->username . "@" . $domain;
+}
+
 =back
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.23 2001-08-19 08:18:01 ivan Exp $
+$Id: svc_acct.pm,v 1.24 2001-08-19 15:53:34 jeff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index 5264a60b1..db9180dbf 100644
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -223,9 +223,8 @@ sub check {
   }
 
   if ($recref->{dst}) {
-    $recref->{dst} =~ /^(\w\.\-]+)\@(([\w\.\-]+\.)+\w+)$/
+    $recref->{dst} =~ /^([\w\.\-]+)\@(([\w\.\-]+\.)+\w+)$/
        or return "Illegal dst";
-    $recref->{dst} = $1;
   }
 
   ''; #no error
@@ -235,7 +234,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_forward.pm,v 1.2 2001-08-12 19:41:24 jeff Exp $
+$Id: svc_forward.pm,v 1.3 2001-08-19 15:53:35 jeff Exp $
 
 =head1 BUGS
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 15245b8d4..fa51b21b6 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -40,8 +40,10 @@ Makefile.PL
 test.pl
 README
 bin/freeside-bill
+bin/freeside-email
 bin/freeside-print-batch
 FS/domain_record.pm
 FS/prepay_credit.pm
 FS/svc_www.pm
 FS/CGIwrapper.pm
+FS/svc_forward.pm
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 7fadf000f..b8715fb49 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.3 2001-08-11 23:19:09 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.4 2001-08-19 15:53:35 jeff Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -51,7 +51,8 @@ Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>">
 Services are items you offer to your customers.
 <UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
     <LI>svc_domain - Virtual domains
-    <LI>svc_acct_sm - Virtual domain mail aliasing
+    <LI>svc_acct_sm - Virtual domain mail aliasing (*depreciated*)
+    <LI>svc_forward - mail forwarding
     <LI>svc_www - Virtual domain website
 <!--   <LI>svc_charge - One-time charges (Partially unimplemented)
        <LI>svc_wo - Work orders (Partially unimplemented)
@@ -68,10 +69,10 @@ var svcdb = null;
 var something = null;
 function changed(what) {
   svcdb = what.options[what.selectedIndex].value;
-<% foreach my $svcdb ( qw( svc_acct svc_domain svc_acct_sm svc_www ) ) { %>
+<% foreach my $svcdb ( qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www ) ) { %>
   if (svcdb == "<%= $svcdb %>" ) {
     <% foreach my $not ( grep { $_ ne $svcdb } (
-                           qw(svc_acct svc_domain svc_acct_sm svc_www) ) ) { %>
+                           qw(svc_acct svc_domain svc_acct_sm svc_forward svc_www) ) ) { %>
       if (document.getElementById) {
         document.getElementById('d<%= $not %>').style.visibility = "hidden";
       } else {
@@ -89,7 +90,7 @@ function changed(what) {
 </SCRIPT>
 <% my @dbs = $hashref->{svcdb}
              ? ( $hashref->{svcdb} )
-             : qw( svc_acct svc_domain svc_acct_sm svc_www ); %>
+             : qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www ); %>
 Table<SELECT NAME="svcdb" SIZE=1 onChange="changed(this)">
 <% foreach my $svcdb (@dbs) { %>
 <OPTION VALUE="<%= $svcdb %>" <%= ' SELECTED'x($svcdb eq $hashref->{svcdb}) %>><%= $svcdb %>
@@ -120,6 +121,11 @@ my %defs = (
     'domuid'    => 'UID where domuser@virtualdomain.com mail is forwarded',
     'domsvc'    => 'svcnum from svc_domain for virtualdomain.com',
   },
+  'svc_forward' => {
+    'srcsvc'    => 'service from which mail is to be forwarded',
+    'dstsvc'    => 'service to which mail is to be forwarded',
+    'dst'       => 'someone@another.domain.com to use when dstsvc is 0',
+  },
   'svc_charge' => {
     'amount'    => 'amount',
   },
@@ -135,7 +141,7 @@ my %defs = (
 
 #  svc_acct svc_domain svc_acct_sm svc_charge svc_wo
 foreach my $svcdb ( qw(
-  konq_kludge svc_acct svc_domain svc_acct_sm svc_www
+  konq_kludge svc_acct svc_domain svc_acct_sm svc_forward svc_www
 ) ) {
 
   my(@rows)=map { /^${svcdb}__(.*)$/; $1 }
diff --git a/httemplate/edit/process/svc_forward.cgi b/httemplate/edit/process/svc_forward.cgi
new file mode 100755
index 000000000..bce70a140
--- /dev/null
+++ b/httemplate/edit/process/svc_forward.cgi
@@ -0,0 +1,51 @@
+<%
+#
+# $Id: svc_forward.cgi,v 1.1 2001-08-19 15:53:35 jeff Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/svc_forward.cgi
+#
+# $Log: svc_forward.cgi,v $
+# Revision 1.1  2001-08-19 15:53:35  jeff
+# added user interface for svc_forward and vpopmail support
+#
+#
+
+use strict;
+use vars qw( $cgi $svcnum $old $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs fields);
+use FS::svc_forward;
+use FS::CGI qw(popurl);
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$svcnum =$1;
+
+$old = qsearchs('svc_forward',{'svcnum'=>$svcnum}) if $svcnum;
+
+$new = new FS::svc_forward ( {
+  map {
+    ($_, scalar($cgi->param($_)));
+  } ( fields('svc_forward'), qw( pkgnum svcpart ) )
+} );
+
+if ( $svcnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $svcnum = $new->getfield('svcnum');
+} 
+
+if ($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_forward.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/svc_forward.cgi?$svcnum");
+}
+
+%>
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 7badfe696..063c41fa1 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,6 +1,6 @@
 <%
 #
-# $Id: svc_acct.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+# $Id: svc_acct.cgi,v 1.2 2001-08-19 15:53:35 jeff Exp $
 #
 # Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -16,7 +16,10 @@
 # use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
+# Revision 1.2  2001-08-19 15:53:35  jeff
+# added user interface for svc_forward and vpopmail support
+#
+# Revision 1.1  2001/07/30 07:36:04  ivan
 # templates!!!
 #
 # Revision 1.10  1999/04/14 11:27:06  ivan
@@ -49,7 +52,7 @@
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
              $part_svc $svc $otaker $username $password $ulen $ulen2 $p1
-             $popnum $uid $gid $finger $dir $shell $quota $slipip );
+             $popnum $domsvc $uid $gid $finger $dir $shell $quota $slipip );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
@@ -160,6 +163,24 @@ Username:
 (blank to generate)
 END
 
+#domain
+$domsvc = $svc_acct->domsvc || 0;
+if ( $part_svc->svc_acct__domsvc_flag eq "F" ) {
+  print qq!<INPUT TYPE="hidden" NAME="domsvc" VALUE="$domsvc">!;
+} else { 
+  print qq!<BR>Domain: <SELECT NAME="domsvc" SIZE=1>\n!;
+  my($svc_domain);
+  foreach $svc_domain
+    ( sort {$a->domain cmp $b->domain} (qsearch ('svc_domain',{} ) ) ) 
+  {
+    print qq!<OPTION VALUE="!, $svc_domain->svcnum, qq!"!,
+          $svc_domain->svcnum == $domsvc ? ' SELECTED' : '',
+          ">", $svc_domain->domain, "\n"
+      ;
+  }
+  print "</SELECT>";
+}
+
 #pop
 $popnum = $svc_acct->popnum || 0;
 if ( $part_svc->svc_acct__popnum_flag eq "F" ) {
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
new file mode 100755
index 000000000..f1aa1c628
--- /dev/null
+++ b/httemplate/edit/svc_forward.cgi
@@ -0,0 +1,242 @@
+<%
+#
+# $Id: svc_forward.cgi,v 1.1 2001-08-19 15:53:35 jeff Exp $
+#
+# Usage: svc_forward.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
+#        http://server.name/path/svc_forward.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
+#
+# use {svcnum} for edit, pkgnum{pkgnum}-svcpart{svcpart} for add
+#
+# should error out in a more CGI-friendly way, and should have more error checking (sigh).
+#
+# $Log: svc_forward.cgi,v $
+# Revision 1.1  2001-08-19 15:53:35  jeff
+# added user interface for svc_forward and vpopmail support
+#
+#
+
+use strict;
+use vars qw( $conf $cgi $mydomain $action $svcnum $svc_forward $pkgnum $svcpart
+             $part_svc $query %email $p1 $srcsvc $dstsvc $dst );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::svc_forward;
+use FS::Conf;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+$mydomain = $conf->config('domain');
+
+if ( $cgi->param('error') ) {
+  $svc_forward = new FS::svc_forward ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_forward')
+  } );
+  $svcnum = $svc_forward->svcnum;
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $svcnum=$1;
+    $svc_forward=qsearchs('svc_forward',{'svcnum'=>$svcnum})
+      or die "Unknown (svc_forward) svcnum!";
+
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+      or die "Unknown (cust_svc) svcnum!";
+
+    $pkgnum=$cust_svc->pkgnum;
+    $svcpart=$cust_svc->svcpart;
+  
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+  } else { #adding
+
+    $svc_forward = new FS::svc_forward({});
+
+    foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
+      $pkgnum=$1 if /^pkgnum(\d+)$/;
+      $svcpart=$1 if /^svcpart(\d+)$/;
+    }
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+    $svcnum='';
+
+    #set fixed and default fields from part_svc
+    my($field);
+    foreach $field ( fields('svc_forward') ) {
+      if ( $part_svc->getfield('svc_forward__'. $field. '_flag') ne '' ) {
+        $svc_forward->setfield($field,$part_svc->getfield('svc_forward__'. $field) );
+      }
+    }
+
+  }
+}
+$action = $svc_forward->svcnum ? 'Edit' : 'Add';
+
+if ($pkgnum) {
+
+  #find all possible user svcnums (and emails)
+
+  #starting with those currently attached
+  my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svc_forward->srcsvc});
+  $email{$svc_forward->srcsvc} = $svc_acct->email;
+
+  if ($svc_forward->dstsvc) {
+    $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svc_forward->dstsvc});
+    $email{$svc_forward->dstsvc} = $svc_acct->email;
+  }
+
+  #and including the rest for this customer
+  my($u_part_svc,@u_acct_svcparts);
+  foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
+    push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
+  }
+
+  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+  my($custnum)=$cust_pkg->getfield('custnum');
+  my($i_cust_pkg);
+  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
+    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
+    my($acct_svcpart);
+    foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
+                                              #record(s) in cust_svc ( for this
+                                              #pkgnum ! )
+      my($i_cust_svc);
+      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
+        $svc_acct=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
+        $email{$svc_acct->getfield('svcnum')}=$svc_acct->email;
+      }  
+    }
+  }
+
+} elsif ( $action eq 'Edit' ) {
+
+  my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svc_forward->srcsvc});
+  $email{$svc_forward->srcsvc} = $svc_acct->email;
+
+  $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svc_forward->dstsvc});
+  $email{$svc_forward->dstsvc} = $svc_acct->email;
+
+} else {
+  die "\$action eq Add, but \$pkgnum is null!\n";
+}
+
+($srcsvc,$dstsvc,$dst)=(
+  $svc_forward->srcsvc,
+  $svc_forward->dstsvc,
+  $svc_forward->dst,
+);
+
+#display
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("Mail Forward $action", '',
+      " onLoad=\"visualize()\"");
+
+%>
+
+<SCRIPT>
+function visualize(what){
+    if (document.getElementById) {
+      document.getElementById('dother').style.visibility = '<%= $dstsvc ? 'hidden' : 'visible' %>';
+    }
+}
+function fixup(what){
+    if (document.getElementById) {
+      if (document.getElementById('dother').style.visibility == 'hidden') {
+        what.dst.value='';
+      }
+    }
+}
+</SCRIPT>
+
+<%
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/svc_forward.cgi" onSubmit="fixup(this)" METHOD=POST>!;
+
+#svcnum
+print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
+print qq!Service #<FONT SIZE=+1><B>!, $svcnum ? $svcnum : " (NEW)", "</B></FONT>";
+print qq!<BR>!;
+
+#pkgnum
+print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
+ 
+#svcpart
+print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
+
+#srcsvc
+print qq!\n\nMail to <SELECT NAME="srcsvc" SIZE=1>!;
+foreach $_ (keys %email) {
+  print "<OPTION", $_ eq $srcsvc ? " SELECTED" : "",
+        qq! VALUE="$_">$email{$_}!;
+}
+print "</SELECT>";
+
+#dstsvc
+print qq! forwards to <SELECT NAME="dstsvc" SIZE=1 onChange="changed(this)">!;
+foreach $_ (keys %email) {
+  print "<OPTION", $_ eq $dstsvc ? " SELECTED" : "",
+        qq! VALUE="$_">$email{$_}!;
+}
+print "<OPTION", 0 eq $dstsvc ? " SELECTED" : "",
+      qq! VALUE="0">(other)!;
+print "</SELECT> mailbox.";
+
+%>
+
+<SCRIPT>
+var selectchoice = null;
+function changed(what) {
+  selectchoice = what.options[what.selectedIndex].value;
+  if (selectchoice == "0") {
+    if (document.getElementById) {
+      document.getElementById('dother').style.visibility = "visible";
+    }
+  }else{
+    if (document.getElementById) {
+      document.getElementById('dother').style.visibility = "hidden";
+    }
+  }
+}
+if (document.getElementById) {
+    document.write("<DIV ID=\"dother\" STYLE=\"visibility: hidden\">");
+}
+</SCRIPT>
+
+<%
+print qq! Other destination: <INPUT TYPE="text" NAME="dst" VALUE="$dst">!;
+%>
+
+<SCRIPT>
+if (document.getElementById) {
+    document.write("</DIV>");
+}
+</SCRIPT>
+
+<CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>
+</FORM>
+
+<TAG onLoad="
+    if (document.getElementById) {
+      document.getElementById('dother').style.visibility = '<%= $dstsvc ? 'hidden' : 'visible' %>';
+      document.getElementById('dlabel').style.visibility = '<%= $dstsvc ? 'hidden' : 'visible' %>';
+    }
+">
+
+
+  </BODY>
+</HTML>
diff --git a/httemplate/misc/catchall.cgi b/httemplate/misc/catchall.cgi
new file mode 100755
index 000000000..79b72565b
--- /dev/null
+++ b/httemplate/misc/catchall.cgi
@@ -0,0 +1,157 @@
+<%
+#
+# $Id: catchall.cgi,v 1.1 2001-08-19 15:53:35 jeff Exp $
+#
+# Usage: catchall.cgi {svcnum}
+#        http://server.name/path/catchall.cgi? {svcnum}
+#
+# $Log: catchall.cgi,v $
+# Revision 1.1  2001-08-19 15:53:35  jeff
+# added user interface for svc_forward and vpopmail support
+#
+#
+
+use strict;
+use vars qw( $conf $cgi $action $svcnum $svc_domain $pkgnum $svcpart
+             $part_svc $query %email $p1 $domain $catchall );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::svc_acct;
+use FS::svc_domain;
+use FS::svc_forward;
+use FS::Conf;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+
+if ( $cgi->param('error') ) {
+  $svc_domain = new FS::svc_domain ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_domain')
+  } );
+  $svcnum = $svc_domain->svcnum;
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $svcnum=$1;
+    $svc_domain=qsearchs('svc_domain',{'svcnum'=>$svcnum})
+      or die "Unknown (svc_domain) svcnum!";
+
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+      or die "Unknown (cust_svc) svcnum!";
+
+    $pkgnum=$cust_svc->pkgnum;
+    $svcpart=$cust_svc->svcpart;
+  
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+  } else { 
+
+    die "Invalid (svc_domain) svcnum!";
+
+  }
+}
+
+if ($pkgnum) {
+
+  #find all possible user svcnums (and emails)
+
+  #starting with that currently attached
+  if ($svc_domain->catchall) {
+    my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svc_domain->catchall});
+    $email{$svc_domain->catchall} = $svc_acct->email;
+  }
+
+  #and including the rest for this customer
+  my($u_part_svc,@u_acct_svcparts);
+  foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
+    push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
+  }
+
+  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+  my($custnum)=$cust_pkg->getfield('custnum');
+  my($i_cust_pkg);
+  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
+    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
+    my($acct_svcpart);
+    foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
+                                              #record(s) in cust_svc ( for this
+                                              #pkgnum ! )
+      my($i_cust_svc);
+      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
+        my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
+        $email{$svc_acct->getfield('svcnum')}=$svc_acct->email;
+      }  
+    }
+  }
+
+} else {
+
+  my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svc_domain->catchall});
+  $email{$svc_domain->catchall} = $svc_acct->email;
+}
+
+# add an absence of a catchall
+$email{0} = "(none)";
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("Domain Catchall Edit", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/catchall.cgi" METHOD=POST>!;
+
+#display
+
+	#formatting
+	print "<PRE>";
+
+#svcnum
+print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
+print qq!Service #<FONT SIZE=+1><B>!, $svcnum ? $svcnum : " (NEW)", "</B></FONT>";
+
+#pkgnum
+print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
+ 
+#svcpart
+print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
+
+($domain,$catchall)=(
+  $svc_domain->domain,
+  $svc_domain->catchall,
+);
+
+print qq!<INPUT TYPE="hidden" NAME="domain" VALUE="$domain">!;
+
+#catchall
+print qq!\n\nMail to <I>(anything)</I>@<B>$domain</B> forwards to <SELECT NAME="catchall" SIZE=1>!;
+foreach $_ (keys %email) {
+  print "<OPTION", $_ eq $catchall ? " SELECTED" : "",
+        qq! VALUE="$_">$email{$_}!;
+}
+print "</SELECT>";
+
+	#formatting
+	print "</PRE>\n";
+
+print qq!<CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>!;
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/misc/process/catchall.cgi b/httemplate/misc/process/catchall.cgi
new file mode 100755
index 000000000..0d84d7c4e
--- /dev/null
+++ b/httemplate/misc/process/catchall.cgi
@@ -0,0 +1,55 @@
+<%
+#
+# $Id: catchall.cgi,v 1.1 2001-08-19 15:53:35 jeff Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/catchall.cgi
+#
+# $Log: catchall.cgi,v $
+# Revision 1.1  2001-08-19 15:53:35  jeff
+# added user interface for svc_forward and vpopmail support
+#
+#
+
+use strict;
+use vars qw( $cgi $svcnum $old $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs fields);
+use FS::svc_domain;
+use FS::CGI qw(popurl);
+
+$FS::svc_domain::whois_hack=1;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$svcnum =$1;
+
+$old = qsearchs('svc_domain',{'svcnum'=>$svcnum}) if $svcnum;
+
+$new = new FS::svc_domain ( {
+  map {
+    ($_, scalar($cgi->param($_)));
+  } ( fields('svc_domain'), qw( pkgnum svcpart ) )
+} );
+
+$new->setfield('action' => 'M');
+
+if ( $svcnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $svcnum = $new->getfield('svcnum');
+} 
+
+if ($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "catchall.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/svc_domain.cgi?$svcnum");
+}
+
+%>
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index bd89d768f..dba5ac302 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_acct.cgi,v 1.2 2001-08-15 10:04:53 ivan Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.3 2001-08-19 15:53:35 jeff Exp $ -->
 
 use strict;
 use vars qw( $cgi @svc_acct $sortby $query );
@@ -64,6 +64,7 @@ if ( scalar(@svc_acct) == 1 ) {
       <TR>
         <TH><FONT SIZE=-1>Service #</FONT></TH>
         <TH><FONT SIZE=-1>Username</FONT></TH>
+        <TH><FONT SIZE=-1>Domain</FONT></TH>
         <TH><FONT SIZE=-1>UID</FONT></TH>
         <TH><FONT SIZE=-1>Service</FONT></TH>
         <TH><FONT SIZE=-1>Customer #</FONT></TH>
@@ -81,6 +82,8 @@ END
       or die "No cust_svc record for svcnum ". $svc_acct->svcnum;
     my $part_svc = qsearchs('part_svc', { 'svcpart' => $cust_svc->svcpart })
       or die "No part_svc record for svcpart ". $cust_svc->svcpart;
+    my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc })
+      or die "No svc_domain record for domsvc ". $cust_svc->domsvc;
     my($cust_pkg,$cust_main);
     if ( $cust_svc->pkgnum ) {
       $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_svc->pkgnum })
@@ -88,9 +91,10 @@ END
       $cust_main = qsearchs('cust_main', { 'custnum' => $cust_pkg->custnum })
         or die "No cust_main record for custnum ". $cust_pkg->custnum;
     }
-    my($svcnum,$username,$uid,$svc,$custnum,$last,$first,$company)=(
+    my($svcnum,$username,$domain,$uid,$svc,$custnum,$last,$first,$company)=(
       $svc_acct->svcnum,
       $svc_acct->getfield('username'),
+      $svc_domain->getfield('domain'),
       $svc_acct->getfield('uid'),
       $part_svc->svc,
       $cust_svc->pkgnum ? $cust_main->custnum : '',
@@ -108,6 +112,7 @@ END
     <TR>
       <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
       <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$username</FONT></A></TD>
+      <TD><FONT SIZE=-1>$domain</FONT></TD>
       <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$uid</FONT></A></TD>
       <TD><FONT SIZE=-1>$svc</FONT></TH>
       <TD><FONT SIZE=-1>$pcustnum</FONT></TH>
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index 8bcf4a694..4276976a1 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -1,6 +1,6 @@
 <%
 #
-# $Id: svc_domain.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+# $Id: svc_domain.cgi,v 1.2 2001-08-19 15:53:36 jeff Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -15,7 +15,10 @@
 # display total, use FS::CGI now does browsing too ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
+# Revision 1.2  2001-08-19 15:53:36  jeff
+# added user interface for svc_forward and vpopmail support
+#
+# Revision 1.1  2001/07/30 07:36:04  ivan
 # templates!!!
 #
 # Revision 1.11  2000/03/03 18:22:44  ivan
@@ -60,8 +63,8 @@ use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header eidiot popurl);
 use FS::svc_domain;
 use FS::cust_svc;
-use FS::svc_acct_sm;
 use FS::svc_acct;
+use FS::svc_forward;
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
@@ -112,15 +115,19 @@ if ( scalar(@svc_domain) == 1 ) {
       <TR>
         <TH>Service #</TH>
         <TH>Domain</TH>
-        <TH>Mail to<BR><FONT SIZE=-1>(click to view mail alias)</FONT></TH>
+        <TH>Mail to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
         <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
       </TR>
 END
 
-  my(%saw,$svc_domain);
+#  my(%saw);                 # if we've multiple domains with the same
+                             # svcnum, then we've a corrupt database
+
+  my($svc_domain);
   my $p = popurl(2);
   foreach $svc_domain (
-    sort $sortby grep(!$saw{$_->svcnum}++, @svc_domain)
+#    sort $sortby grep(!$saw{$_->svcnum}++, @svc_domain)
+    sort $sortby (@svc_domain)
   ) {
     my($svcnum,$domain)=(
       $svc_domain->svcnum,
@@ -139,57 +146,65 @@ END
     #  $malias='';
     #}
 
-    my @svc_acct_sm=qsearch('svc_acct_sm',{'domsvc' => $svcnum});
-    my $rowspan = scalar(@svc_acct_sm) || 1;
-
-    print <<END;
-    <TR>
-      <TD ROWSPAN=$rowspan><A HREF="${p}view/svc_domain.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
-      <TD ROWSPAN=$rowspan>$domain</TD>
-END
+    my @svc_acct=qsearch('svc_acct',{'domsvc' => $svcnum});
+    my $rowspan = 0;
 
     my $n1 = '';
-    # false laziness: this was stolen from search/svc_acct_sm.cgi.  but the
-    # web interface in general needs to be rewritten in a mucho cleaner way
-    my($svc_acct_sm);
-    foreach $svc_acct_sm (@svc_acct_sm) {
-      my($svcnum,$domuser,$domuid,$domsvc)=(
-        $svc_acct_sm->svcnum,
-        $svc_acct_sm->domuser,
-        $svc_acct_sm->domuid,
-        $svc_acct_sm->domsvc,
+    my($svc_acct, @rows);
+    foreach $svc_acct (
+      sort {$b->getfield('username') cmp $a->getfield('username')} (@svc_acct)
+    ) {
+
+      my (@forwards) = ();
+
+      my($svcnum,$username)=(
+        $svc_acct->svcnum,
+        $svc_acct->username,
       );
-      #my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $domsvc } );
-      #if ( $svc_domain ) {
-      #  my $domain = $svc_domain->domain;
-
-        print qq!$n1<TD><A HREF="!. popurl(2). qq!view/svc_acct_sm.cgi?$svcnum">!,
-        #print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
-              ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ),
-              qq!\@$domain</A> </TD>!,
-        ;
-      #} else {
-      #  my $warning = "couldn't find svc_domain.svcnum $svcnum ( svc_acct_sm.svcnum $svcnum";
-      #  warn $warning;
-      #  print "$n1<TD>WARNING: $warning</TD>";
-      #}
-
-      my $svc_acct = qsearchs( 'svc_acct', { 'uid' => $domuid } );
-      if ( $svc_acct ) {
-        my $username = $svc_acct->username;
-        my $svc_acct_svcnum =$svc_acct->svcnum;
-        print qq!<TD><A HREF="!, popurl(2),
-              qq!view/svc_acct.cgi?$svc_acct_svcnum">$username\@$mydomain</A>!,
-              qq!</TD></TR>!
-        ;
-      } else {
-        my $warning = "couldn't find svc_acct.uid $domuid (svc_acct_sm.svcnum $svcnum)!";
-        warn $warning;
-        print "<TD>WARNING: $warning</TD>";
+
+      my @svc_forward = qsearch( 'svc_forward', { 'srcsvc' => $svcnum } );
+      my $svc_forward;
+      foreach $svc_forward (@svc_forward) {
+        my($dstsvc,$dst) = (
+          $svc_forward->dstsvc,
+          $svc_forward->dst,
+        );
+        if ($dstsvc) {
+          my $dst_svc_acct=qsearchs( 'svc_acct', { 'svcnum' => $dstsvc } );
+          my $destination=$dst_svc_acct->email;
+          push @forwards, qq!<TD><A HREF="!, popurl(2),
+                qq!view/svc_acct.cgi?$dstsvc">$destination</A>!,
+                qq!</TD></TR>!
+          ;
+        }else{
+          push @forwards, qq!<TD>$dst</TD></TR>!
+          ;
+        }
       }
+
+      push @rows, qq!$n1<TD ROWSPAN=!, (scalar(@svc_forward) || 1),
+            qq!><A HREF="!. popurl(2). qq!view/svc_acct.cgi?$svcnum">!,
+      #print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
+            ( ($username eq '*') ? "<I>(anything)</I>" : $username ),
+            qq!\@$domain</A> </TD>!,
+      ;
+
+      push @rows, @forwards;
+
+      $rowspan += (scalar(@svc_forward) || 1);
       $n1 = "</TR><TR>";
     }
     #end of false laziness
+
+
+
+    print <<END;
+    <TR>
+      <TD ROWSPAN=$rowspan><A HREF="${p}view/svc_domain.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
+      <TD ROWSPAN=$rowspan>$domain</TD>
+END
+
+    print @rows;
     print "</TR>";
 
   }
@@ -207,7 +222,7 @@ sub svcnum_sort {
 }
 
 sub domain_sort {
-  $a->getfield('domain') cmp $b->getfield('doimain');
+  $a->getfield('domain') cmp $b->getfield('domain');
 }
 
 
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index f28bd9497..caa8ef00e 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,6 +1,6 @@
 <%
 #
-# $Id: svc_acct.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+# $Id: svc_acct.cgi,v 1.2 2001-08-19 15:53:36 jeff Exp $
 #
 # Usage: svc_acct.cgi svcnum
 #        http://server.name/path/svc_acct.cgi?svcnum
@@ -33,7 +33,10 @@
 # displays arbitrary radius attributes ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
+# Revision 1.2  2001-08-19 15:53:36  jeff
+# added user interface for svc_forward and vpopmail support
+#
+# Revision 1.1  2001/07/30 07:36:04  ivan
 # templates!!!
 #
 # Revision 1.12  2001/01/31 07:21:00  ivan
@@ -73,7 +76,7 @@
 #
 
 use strict;
-use vars qw( $conf $cgi $mydomain $query $svcnum $svc_acct $cust_svc $pkgnum
+use vars qw( $conf $cgi $svc_domain $query $svcnum $svc_acct $cust_svc $pkgnum
              $cust_pkg $custnum $part_svc $p $svc_acct_pop $password );
 use CGI;
 use CGI::Carp qw( fatalsToBrowser );
@@ -91,7 +94,6 @@ $cgi = new CGI;
 &cgisuidsetup($cgi);
 
 $conf = new FS::Conf;
-$mydomain = $conf->config('domain');
 
 ($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
@@ -112,6 +114,9 @@ if ($pkgnum) {
 $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unknown svcpart" unless $part_svc;
 
+$svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
+die "Unknown domain" unless $svc_domain;
+
 $p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header('Account View', menubar(
   ( ( $pkgnum || $custnum )
@@ -132,6 +137,8 @@ print qq!<A HREF="${p}edit/svc_acct.cgi?$svcnum">Edit this information</A>!,
       "<BR><BR>Username: <B>", $svc_acct->username, "</B>"
 ;
 
+print "<BR>Domain: <B>", $svc_domain->domain, "</B>";
+
 print "<BR>Password: ";
 $password = $svc_acct->_password;
 if ( $password =~ /^\*\w+\* (.*)$/ ) {
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index f852400da..5728e7dec 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -1,6 +1,6 @@
 <%
 #
-# $Id: svc_domain.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+# $Id: svc_domain.cgi,v 1.2 2001-08-19 15:53:36 jeff Exp $
 #
 # Usage: svc_domain svcnum
 #        http://server.name/path/svc_domain.cgi?svcnum
@@ -13,7 +13,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
+# Revision 1.2  2001-08-19 15:53:36  jeff
+# added user interface for svc_forward and vpopmail support
+#
+# Revision 1.1  2001/07/30 07:36:04  ivan
 # templates!!!
 #
 # Revision 1.11  2000/12/03 15:14:00  ivan
@@ -52,7 +55,7 @@
 
 use strict;
 use vars qw( $cgi $query $svcnum $svc_domain $domain $cust_svc $pkgnum 
-             $cust_pkg $custnum $part_svc $p );
+             $cust_pkg $custnum $part_svc $p $svc_acct $email);
 use CGI;
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(header menubar popurl menubar);
@@ -82,7 +85,13 @@ if ($pkgnum) {
 }
 
 $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
-die "Unkonwn svcpart" unless $part_svc;
+die "Unknown svcpart" unless $part_svc;
+
+if ($svc_domain->catchall) {
+  $svc_acct = qsearchs('svc_acct',{'svcnum'=> $svc_domain->catchall } );
+  die "Unknown svcpart" unless $svc_acct;
+  $email = $svc_acct->email;
+}
 
 $domain = $svc_domain->domain;
 
@@ -100,6 +109,8 @@ print $cgi->header( '-expires' => 'now' ), header('Domain View', menubar(
       "Service #$svcnum",
       "<BR>Service: <B>", $part_svc->svc, "</B>",
       "<BR>Domain name: <B>$domain</B>.",
+      qq!<BR>Catch all email <A HREF="${p}misc/catchall.cgi?$svcnum">(change)</A>:!,
+      $email ? "<B>$email</B>." : "<I>(none)<I>",
       qq!<BR><BR><A HREF="http://www.geektools.com/cgi-bin/proxy.cgi?query=$domain;targetnic=auto">View whois information.</A>!,
       '</BODY></HTML>',
 ;
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
new file mode 100755
index 000000000..7930ab5ec
--- /dev/null
+++ b/httemplate/view/svc_forward.cgi
@@ -0,0 +1,91 @@
+<%
+#
+# $Id: svc_forward.cgi,v 1.1 2001-08-19 15:53:36 jeff Exp $
+#
+# Usage: svc_forward.cgi svcnum
+#        http://server.name/path/svc_forward.cgi?svcnum
+#
+# based on view/svc_acct.cgi
+# 
+# $Log: svc_forward.cgi,v $
+# Revision 1.1  2001-08-19 15:53:36  jeff
+# added user interface for svc_forward and vpopmail support
+#
+#
+
+use strict;
+use vars qw($conf $cgi $query $svcnum $svc_forward $cust_svc
+            $pkgnum $cust_pkg $custnum $part_svc $p $srcsvc $dstsvc $dst
+            $svc $svc_acct $source $destination);
+use CGI;
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl menubar );
+use FS::Record qw(qsearchs);
+use FS::Conf;
+use FS::cust_svc;
+use FS::cust_pkg;
+use FS::part_svc;
+use FS::svc_acct;
+use FS::svc_forward;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+
+($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+$svcnum = $1;
+$svc_forward = qsearchs('svc_forward',{'svcnum'=>$svcnum});
+die "Unknown svcnum" unless $svc_forward;
+
+$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+$pkgnum = $cust_svc->getfield('pkgnum');
+if ($pkgnum) {
+  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+  $custnum=$cust_pkg->getfield('custnum');
+} else {
+  $cust_pkg = '';
+  $custnum = '';
+}
+
+$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
+  or die "Unkonwn svcpart";
+
+$p = popurl(2);
+print $cgi->header( '-expires' => 'now' ), header('Mail Forward View', menubar(
+  ( ( $pkgnum || $custnum )
+    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
+        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+      )
+    : ( "Cancel this (unaudited) account" =>
+          "${p}misc/cancel-unaudited.cgi?$svcnum" )
+  ),
+  "Main menu" => $p,
+));
+
+($srcsvc,$dstsvc,$dst) = (
+  $svc_forward->srcsvc,
+  $svc_forward->dstsvc,
+  $svc_forward->dst,
+);
+$svc = $part_svc->svc;
+$svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc})
+  or die "Corrupted database: no svc_acct.svcnum matching srcsvc $srcsvc";
+$source = $svc_acct->email;
+if ($dstsvc) {
+  $svc_acct = qsearchs('svc_acct',{'svcnum'=>$dstsvc})
+    or die "Corrupted database: no svc_acct.svcnum matching dstsvc $dstsvc";
+  $destination = $svc_acct->email;
+}else{
+  $destination = $dst;
+}
+
+print qq!<A HREF="${p}edit/svc_forward.cgi?$svcnum">Edit this information</A>!,
+      "<BR>Service #$svcnum",
+      "<BR>Service: <B>$svc</B>",
+      qq!<BR>Mail to <B>$source</B> forwards to <B>$destination</B> mailbox.!,
+      '</BODY></HTML>'
+;
+
+%>
-- 
cgit v1.2.1


From 0fd508f695b4f19a447eba7663f59dc7fb4033d3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Aug 2001 09:38:28 +0000
Subject: documentation updates

---
 httemplate/docs/config.html |  6 ++--
 httemplate/docs/export.html | 17 ++++++++----
 httemplate/docs/schema.html | 68 +++++++++++++++++++++------------------------
 3 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
index 0807ac7c7..64dbcfe3f 100644
--- a/httemplate/docs/config.html
+++ b/httemplate/docs/config.html
@@ -57,7 +57,7 @@ All further configuration files and directories are located in
   <li><a name="invoice_from">invoice_from</a> - Return address on email invoices.
   <li><a name="invoice_template">invoice_template</a> - Required template file for invoices.  See the <a href="billing.html">section on billing</a> for details.
   <li><a name="lpr">lpr</a> - Print command for paper invoices, for example `lpr -h'.
-  <li><a name="maildisablecatchall">maildisablecatchall</a> - The existance of this file will disable the requirement that each virtual domain have a catch-all mailbox.
+  <li><a name="maildisablecatchall">maildisablecatchall</a> - <b>DEPRECIATED</b>, now the default.  The existance of this file used to disable the requirement that each virtual domain have a catch-all mailbox.
   <li><a name="money_char">money_char</a> - Currency symbol - defaults to `$'.
   <li><a name="mxmachines">mxmachines</a> - MX entries for new domains, weight and machine, one per line, with trailing `.'
   <li><a name="nsmachines">nsmachines</a> - NS nameservers for new domains, one per line, with trailing `.'
@@ -97,13 +97,13 @@ All further configuration files and directories are located in
   <li><a name="soarefresh">soarefresh</a> - SOA refresh for new domains
   <li><a name="soaretry">soaretry</a> - SOA retry for new domains
   <li><a name="statedefault">statedefault</a> - Default state or province (if not supplied, the default is `CA')
-  <li><a name="textradiusprepend">textradiusprepend</a> - <b>depriciated<b>, use RADIUS check attributes instead.  The contents of this file will be prepended to the first line of a user's RADIUS entry in text exports.
+  <li><a name="textradiusprepend">textradiusprepend</a> - <b>DEPRECIATED</b>, use RADIUS check attributes instead.  This option will be removed soon.  The contents of this file will be prepended to the first line of a user's RADIUS entry in text exports.
   <li><a name="usernamemin">usernamemin</a> - Minimum username length (default 2);
   <li><a name="usernamemax">usernamemax</a> - Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)
   <li><a name="usernamemax">username-letter</a> - The existance of this file will turn on the requirement that usernames contain at least one letter.
   <li><a name="usernamemax">username-letterfirst</a> - The existance of this file will turn on the requirement that usernames start with a letter.
    <li><a name="username_policy">username_policy</a> - This file controls the mechanism for preventing duplicate usernames in passwd/radius files exported from svc_accts.  This should be one of 'prepend domsvc' 'append domsvc' or 'append domain'
-   <li><a name="vpopmailmachines">vpopmailmachines</a> - Your vpopmail pop toasters, one per line.  Each line is of the form "machinename vpopdir vpopuid vpopgid".  Eg: poptoaster.domain.tld /home/vpopmail 508 508 Note: vpopuid and vpopgid are values taken from the vpopmail machine's /etc/passwd
+   <li><a name="vpopmailmachines">vpopmailmachines</a> - Your vpopmail pop toasters, one per line.  Each line is of the form "machinename vpopdir vpopuid vpopgid".  For example: <code>poptoaster.domain.tld /home/vpopmail 508 508</code>  Note: vpopuid and vpopgid are values taken from the vpopmail machine's /etc/passwd
 
 </ul>
 </body>
diff --git a/httemplate/docs/export.html b/httemplate/docs/export.html
index d92eec346..7f3a07118 100755
--- a/httemplate/docs/export.html
+++ b/httemplate/docs/export.html
@@ -14,7 +14,7 @@ it is reccommended that you replicate the data to an external RADIUS machine rat
         <li>radiusmachines - <b>users</b> is copied to the <b>/etc/raddb</b> directory on the remote machine.  If no errors occur, the command <b>( builddbm )</b> is executed on the remote machine.
         <li>icradiusmachines - Local radcheck and radreply tables will be created.  If any machines are specified, the remote MySQL database will be locked and the radcheck table will be copied to the those machines.  You may also need to set the <a href="config.html#icradius_mysqlsource">icradius_mysqlsource</a> and/or <a href="config.html#icradius_mysqldest">icradius_mysqldest</a> configuration files.  Currently you need to be running MySQL for your Freeside database to use this feature.
       </ul>
-    <li>site_perl/svc_acct.pm - If a shellmachine is defined, users can be created, modified and deleted remotely; see below.
+    <li>svc_acct.pm - If a shellmachine is defined, users can be created, modified and deleted remotely; see below.
       <ul>
         <li>Account creation - If the <b>username</b>, <b>uid</b> and <b>dir</b> fields are defined for a new user, the command(s) specified in the <a href="config.html#shellmachine-useradd">shellmachine-useradd</a> configuration file are executed on shellmachine via ssh.  If this file does not exist, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If the file exists but is empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.
         <li>Account deletion - The command(s) specified in the <a href="config.html#shellmachine-userdel">shellmachine-userdel</a> configuration file are executed on shellmachine via ssh.  If this file does not exist, <code>userdel $username</code> is the default.  If the file exists but is empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.
@@ -26,15 +26,22 @@ it is reccommended that you replicate the data to an external RADIUS machine rat
         <li>shellmachine - The command <b>[ -e <i>homedir</i>/.qmail-default ] || { touch <i>homedir</i>/.qmail-default; chown <i>uid</i>.<i>gid</i> <i>homedir</i>/.qmail-default; }</b> will be run on this machine for users in the virtualdomains file.
         <li>sendmailmachines - <b>sendmail.cw</b> and <b>virtusertable</b> are copied to the remote machine as <b>/etc/sendmail.cw.new</b> and <b>/etc/virtusertable.new</b>.  If no errors occur, they are moved to <b>/etc/sendmail.cw</b> and <b>/etc/virtusertable</b> and the command specified in the <a href="config.html#sendmailrestart">sendmailrestart</a> configuration file is executed.  (The path can be changed from the default <b>/etc</b> with the <a href="config.html#sendmailconfigpath">sendmailconfigpath</a> configuration file.)
       </ul>
-    <li>site_perl/svc_acct_sm.pm - If the qmailmachines configuration file exists and a shellmachine is defined, user <b>.qmail-</b> files can be updated.
+    <li>svc_domain.pm - If the qmailmachines configuration file exists and a shellmachine is defined, user <b>.qmail-</b> files can be updated for catchall mailboxes.
       <ul>
-        <li>The command <b>[ -e <i>homedir</i>/.qmail-<i>domain</i>-default ] || { touch <i>homedir</i>/.qmail-<i>domain</i>-default; chown <i>uid</i>.<i>gid</i> <i>homedir</i>/.qmail-<i>domain</i>-default; }</b> is run.
+        <li>The command <pre>[ -e <i>homedir</i>/.qmail-<i>domain</i>-default ] || {
+    touch <i>homedir</i>/.qmail-<i>domain</i>-default;
+    chown <i>uid</i>.<i>gid</i> <i>homedir</i>/.qmail-<i>domain</i>-default;
+}</pre> is run.
       </ul>
+    <li>svc_forward.pm - Not yet documented; see manpage.
+    <li>svc_www.pm - Not yet documented; see manpage.
   </ul>
   <br><a name=ssh>Unattended remote login</a> - Freeside can login to remote machines unattended using SSH.  This can pose a security risk if not configured correctly, and will allow an intruder who breaks into your freeside machine full access to your remote machines.  <b>Do not use this feature unless you understand what you are doing!</b>
     <ul>
-      <li>As the freeside user (on your freeside machine), generate an authentication key using <a href="http://www.tac.nyc.ny.us/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>.  Since this is for unattended operation, you need to use a blank passphrase.
-      <li>Append the newly-created identity.pub file to root's authorized_keys on the remote machine(s).
+      <li>As the freeside user (on your freeside machine), generate an authentication key using <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>.  Since this is for unattended operation, use a blank passphrase.
+      <li>Append the newly-created <code>identity.pub</code> file to <code>~root/.ssh/authorized_keys</code> on the remote machine(s).
+      <li>Some new SSH v2 implementation accept v2 style keys only.  Use the <code>-t</code> option to <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>, and append the created <code>id_dsa.pub</code> or <code>id_rsa.pub</code> to <code>~root/.ssh/authorized_keys2</code> on the remote machine(s).
+      <li>You may need to set <code>PermitRootLogin without-password</code> (meaning with keys only) in your <code>sshd_config</code> file on the remote machine(s).
     </ul>
 
 </body>
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 61bc17b03..0da33a5c2 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -4,7 +4,7 @@
 <body>
   <h1>Schema reference</h1>
   <ul>
-    <li><a name="agent">agent</a> - Agents are resellers of your service.  Agents may be limited to a subset of your full offerings (via their agent type).
+    <li><a name="agent" href="man/FS/agent.html">agent</a> - Agents are resellers of your service.  Agents may be limited to a subset of your full offerings (via their agent type).
       <ul>
         <li>agentnum - primary key
         <li>agent - name of this agent
@@ -12,12 +12,12 @@
         <li>prog - (unimplemented)
         <li>freq - (unimplemented)
       </ul>
-    <li><a name="agent_type">agent_type</a> - Agent types define groups of packages that you can then assign to particular agents.
+    <li><a name="agent_type" href="man/FS/agent_type.html">agent_type</a> - Agent types define groups of packages that you can then assign to particular agents.
       <ul>
         <li>typenum - primary key
         <li>atype - name of this agent type
       </ul>
-    <li><a name="cust_bill">cust_bill</a> - Invoices.  Declarations that a customer owes you money.  The specific charges are itemized in <a href="#cust_billl_pkg">cust_bill_pkg</a>.
+    <li><a name="cust_bill" href="man/FS/cust_bill.html">cust_bill</a> - Invoices.  Declarations that a customer owes you money.  The specific charges are itemized in <a href="#cust_bill_pkg">cust_bill_pkg</a>.
       <ul>
         <li>invnum - primary key
         <li>custnum - <a href="#cust_main">customer</a>
@@ -25,7 +25,7 @@
         <li>charged - amount of this invoice
         <li>printed - how many times this invoice has been printed automatically
       </ul>
-    <li><a name="cust_bill_pkg">cust_bill_pkg</a> - Invoice line items
+    <li><a name="cust_bill_pkg" href="man/FS/cust_bill_pkg.html">cust_bill_pkg</a> - Invoice line items
       <ul>
         <li>invnum - (multiple) key
         <li>pkgnum - <a href="#cust_pkg">package</a> or 0 for the special virtual sales tax package
@@ -34,7 +34,7 @@
         <li>sdate - starting date
         <li>edate - ending date
       </ul>
-    <li><a name="cust_credit">cust_credit</a> - Credits.  The equivalent of a negative <a href="#cust_bill">cust_bill</a> record.
+    <li><a name="cust_credit" href="man/FS/cust_credit.html">cust_credit</a> - Credits.  The equivalent of a negative <a href="#cust_bill">cust_bill</a> record.
       <ul>
         <li>crednum - primary key
         <li>custnum - <a href="#cust_main">customer</a>
@@ -43,12 +43,11 @@
         <li>otaker - order taker
         <li>reason
       </ul>
-    <li><a name="cust_main">cust_main</a> - Customers
+    <li><a name="cust_main" href="man/FS/cust_main.html">cust_main</a> - Customers
       <ul>
         <li>custnum - primary key
         <li>agentnum - <a href="#agent">agent</a>
         <li>refnum - <a href="#part_referral">referral</a>
-        <li>titlenum - <a href="#part_title">title</a>
         <li>first - name
         <li>last - name
         <li>ss - social security number
@@ -84,13 +83,13 @@
         <li>otaker - order taker
       </ul>
       (columns in <i>italics</i> are optional)
-    <li><a name="cust_main_invoice">cust_main_invoice</a> - Invoice destinations for email invoices.  Note that a customer can have many email destinations for their invoice (either literal or via svcnum), but only one postal destination.
+    <li><a name="cust_main_invoice" href="man/FS/cust_main_invoice.html">cust_main_invoice</a> - Invoice destinations for email invoices.  Note that a customer can have many email destinations for their invoice (either literal or via svcnum), but only one postal destination.
       <ul>
         <li>destnum - primary key
         <li>custnum - <a href="#cust_main">customer</a>
         <li>dest - Invoice destination.  Freeside supports three types of invoice delivery: send directly to a service defined in Freeside, send to an arbitrary email address, or print the invoice to a printer and have someone send it out via snail mail.  Freeside determines which method to use based on the contents of the dest field.  If the contents are numeric, a <a href="#svc_acct">svcnum</a> pointing to a valid service is expected in the field.  If the contents are a string, a literal email address is expected to be in the field.  If the special keyword `POST' is present, the snail mail method is used (which is the default if no cust_main_invoice records exist).  Snail mail invoices get their address information from <A name="#cust_main">cust_main</A> and are printed with the printer defined in the configuration files.
       </ul>
-    <li><a name="cust_main_county">cust_main_county</a> - Tax rates
+    <li><a name="cust_main_county" href="man/FS/cust_main_county.html">cust_main_county</a> - Tax rates
       <ul>
         <li>taxnum - primary key
         <li>state
@@ -98,7 +97,7 @@
         <li>country
         <li>tax - % rate
       </ul>
-    <li><a name="cust_pay">cust_pay</a> - Payments.  Money being transferred from a customer.
+    <li><a name="cust_pay" href="man/FS/cust_pay.html">cust_pay</a> - Payments.  Money being transferred from a customer.
       <ul>
         <li>paynum - primary key
         <li>invnum - <a href="#cust_bill">invoice</a>
@@ -108,7 +107,7 @@
         <li>payinfo - card number, P.O.#, or comp issuer
         <li>paybatch - text field for tracking card processor batches
       </ul>
-    <li><a name="cust_pay_batch">cust_pay_batch</a> - Pending batch
+    <li><a name="cust_pay_batch" href="man/FS/cust_pay_batch.html">cust_pay_batch</a> - Pending batch
       <ul>
         <li>trancode - 77 for charges
         <li>cardnum
@@ -126,7 +125,7 @@
         <li>zip
         <li>country
       </ul>
-    <li><a name="cust_pkg">cust_pkg</a> - Customer billing items
+    <li><a name="cust_pkg" href="man/FS/cust_pkg.html">cust_pkg</a> - Customer billing items
       <ul>
         <li>pkgnum - primary key
         <li>custnum - <a href="#cust_main">customer</a>
@@ -138,7 +137,7 @@
         <li>cancel - (past) cancellation date
         <li>otaker - order taker
       </ul>
-    <li><a name="cust_refund">cust_refund</a> - Refunds.  The transfer of money to a customer; equivalent to a negative <a href="#cust_pay">cust_pay</a> record.
+    <li><a name="cust_refund" href="man/FS/cust_refund.html">cust_refund</a> - Refunds.  The transfer of money to a customer; equivalent to a negative <a href="#cust_pay">cust_pay</a> record.
       <ul>
         <li>refundnum - primary key
         <li>crednum - <a href="#cust_credit">credit</a>
@@ -148,13 +147,13 @@
         <li>payinfo - card number, P.O.#, or comp issuer
         <li>otaker - order taker
       </ul>
-    <li><a name="cust_svc">cust_svc</a> - Customer services
+    <li><a name="cust_svc" href="man/FS/cust_svc.html">cust_svc</a> - Customer services
       <ul>
         <li>svcnum - primary key
         <li>pkgnum - <a href="#cust_pkg">package</a>
         <li>svcpart - <a href="#part_svc">Service definition</a>
       </ul>
-    <li><a name="nas">nas</a> - Network Access Server (terminal server)
+    <li><a name="nas" href="man/FS/nas.html">nas</a> - Network Access Server (terminal server)
       <ul>
         <li>nasnum - primary key
         <li>nas - NAS name
@@ -162,7 +161,7 @@
         <li>nasfqdn - NAS fully-qualified domain name
         <li>last - timestamp indicating the last instant the NAS was in a known state (used by the session monitoring).
       </ul>
-    <li><a name="part_pkg">part_pkg</a> - Package definitions
+    <li><a name="part_pkg" href="man/FS/part_pkg.html">part_pkg</a> - Package definitions
       <ul>
         <li>pkgpart - primary key
         <li>pkg - package name
@@ -171,12 +170,12 @@
         <li>freq - recurring frequency (months)
         <li>recur - recurring fee
       </ul>
-    <li><a name="part_referral">part_referral</a> - Referral listing
+    <li><a name="part_referral" href="man/FS/part_referral.html">part_referral</a> - Referral listing
       <ul>
         <li>refnum - primary key
         <li>referral - referral
       </ul>
-    <li><a name="part_svc">part_svc</a> - Service definitions
+    <li><a name="part_svc" href="man/FS/part_svc.html">part_svc</a> - Service definitions
       <ul>
         <li>svcpart - primary key
         <li>svc - name of this service
@@ -184,31 +183,26 @@
         <li><i>table</i>__<i>field</i> - Default or fixed value for <i>field</i> in <i>table</i>
         <li><i>table</i>__<i>field</i>_flag - null, D or F
       </ul>
-    <li><a name="part_title">part_title</a> - Personal titles
-      <ul>
-        <li>titlenum - primary key
-        <li>title - personal title (`Dr.' or `Mr.')
-      </ul>
-    <li><a name="pkg_svc">pkg_svc</a>
+    <li><a name="pkg_svc" href="man/FS/pkg_svc.html">pkg_svc</a>
       <ul>
         <li>pkgpart - <a href="#part_pkg">Package definition</a>
         <li>svcpart - <a href="#part_svc">Service definition</a>
         <li>quantity - quantity of this service that this package includes
       </ul>
-    <li><a name="port">port</a> - individual port on a <a href="#nas">nas</a>
+    <li><a name="port" href="man/FS/port.html">port</a> - individual port on a <a href="#nas">nas</a>
       <ul>
         <li>portnum - primary key
         <li>ip - IP address of this port
         <li>nasport - port number on the NAS
         <li>nasnum - <a href="#nas">NAS</a>
       </ul>
-    <li><a name="prepay_credit">prepay_credit</a>
+    <li><a name="prepay_credit" href="man/FS/prepay_credit.html">prepay_credit</a>
       <ul>
         <li>prepaynum - primary key
         <li>identifier - text or numeric string used to receive this credit
         <li>amount - amount of credit
       </ul>
-    <li><a name="session">session</a>
+    <li><a name="session" href="man/FS/session.html">session</a>
       <ul>
         <li>sessionnum - primary key
         <li>portnum - <a href="#port">Port</a>
@@ -217,7 +211,7 @@
         <li>logout - timestamp indicating the end of this user session.  May be null, which indicates a currently open session.
       </ul>
 
-    <li><a name="svc_acct">svc_acct</a> - Accounts
+    <li><a name="svc_acct" href="man/FS/svc_acct.html">svc_acct</a> - Accounts
       <ul>
         <li>svcnum - <a href="#cust_svc">primary key</a>
         <li>username
@@ -232,7 +226,7 @@
         <li>slipip - IP address
         <li>radius_<i>Radius_Attribute</i> - Radius-Attribute
       </ul>
-    <li><a name="svc_acct_pop">svc_acct_pop</a> - Points of Presence
+    <li><a name="svc_acct_pop" href="man/FS/svc_acct_pop.html">svc_acct_pop</a> - Points of Presence
       <ul>
         <li>popnum - primary key
         <li>city
@@ -241,26 +235,26 @@
         <li>exch - exchange
         <li>loc - rest of number
       </ul>
-    <li><a name="svc_acct_sm">svc_acct_sm</a> - <b>DEPRICIATED</b> Domain mail aliases
+    <li><a name="svc_acct_sm" href="man/FS/svc_acct_sm.html">svc_acct_sm</a> - <b>DEPRECIATED</b> Domain mail aliases
       <ul>
         <li>svcnum - <a href="#cust_svc">primary key</a>
         <li>domsvc - <a href="#svc_domain">Domain</a> (by svcnum)
         <li>domuid - <a href="#svc_acct">Account</a> (by uid)
         <li>domuser - domuser @ <a href="#svc_domain">Domain</a> forwards to <a href="#svc_acct">Account</a>
       </ul>
-    <li><a name="svc_domain">svc_domain</a> - Domains
+    <li><a name="svc_domain" href="man/FS/svc_domain.html">svc_domain</a> - Domains
       <ul>
         <li>svcnum - <a href="#cust_svc">primary key</a>
         <li>domain
       </ul>
-    <li><a name="svc_forward>svc_forward</a> - Mail forwarding aliases
+    <li><a name="svc_forward" href="man/FS/svc_forward.html">svc_forward</a> - Mail forwarding aliases
       <ul>
         <li>svcnum - <a href="#cust_svc">primary key</a>
-        <li>srcsvc - <a href="#svc_acct">svcnum of the source of this forward
-        <li>dstsvc - <a href="#svc_acct">svcnum of the destination of this forward
+        <li>srcsvc - <a href="#svc_acct">svcnum of the source of this forward</a>
+        <li>dstsvc - <a href="#svc_acct">svcnum of the destination of this forward</a>
         <li>dst - foreign destination (email address) - forward not local to freeside
       </ul>
-    <li><a name="domain_record">domain_record</a> - Domain zone detail
+    <li><a name="domain_record" href="man/FS/domain_record.html">domain_record</a> - Domain zone detail
       <ul>
         <li>recnum - primary key
         <li>svcnum - <a href="#svc_domain">Domain</a> (by svcnum)
@@ -269,13 +263,13 @@
         <li>rectype - type for this record (<b>A</b>, <b>MX</b>, etc.)
         <li>recdata - data for this record
       </ul>
-    <li><a name="svc_www">svc_www</a>
+    <li><a name="svc_www" href="man/FS/svc_www.html">svc_www</a>
       <ul>
        <li>svcnum - <a href="#cust-svc">primary key</a>
        <li>recnum - <a href="#domain_record">host</a>
        <li>usersvc - <a href="#svc_acct">account</a>
       </ul>
-    <li><a name="type_pkgs">type_pkgs</a>
+    <li><a name="type_pkgs" href="man/FS/type_pkgs.html">type_pkgs</a>
       <ul>
         <li>typenum - <a href="#agent_type">agent type</a>
         <li>pkgpart - <a href="#part_pkg">Package definition</a>
-- 
cgit v1.2.1


From c6708c86785662d8f0c12e23936bf7b1916f411c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Aug 2001 09:41:52 +0000
Subject: dtrt when deleting accouts wrt forwards, catchalls & other references
 to svc_acct records

depreciate svc_acct_sm further; move qmail catchall handling to svc_domain
---
 FS/FS/svc_acct.pm    | 57 +++++++++++++++++++++++++++++++++++++++----
 FS/FS/svc_acct_sm.pm | 69 +++++++++++++++++++++++++++++-----------------------
 FS/FS/svc_domain.pm  | 60 +++++++++++++++++++++++++++++++++++++++------
 FS/FS/svc_forward.pm | 19 +++++++++------
 4 files changed, 155 insertions(+), 50 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 42eb7d9ee..6551d94af 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -13,6 +13,8 @@ use Net::SSH qw(ssh);
 use FS::part_svc;
 use FS::svc_acct_pop;
 use FS::svc_acct_sm;
+use FS::cust_main_invoice;
+use FS::svc_domain;
 
 @ISA = qw( FS::svc_Common );
 
@@ -232,11 +234,21 @@ $username and $dir.
 
 sub delete {
   my $self = shift;
-  my $error;
 
-  return "Can't delete an account which has mail aliases pointed to it!"
+  return "Can't delete an account which has (svc_acct_sm) mail aliases!"
     if $self->uid && qsearch( 'svc_acct_sm', { 'domuid' => $self->uid } );
 
+  return "Can't delete an account which is a (svc_forward) source!"
+    if qsearch( 'svc_forward', { 'srcsvc' => $self->svcnum } );
+
+  return "Can't delete an account which is a (svc_forward) destination!"
+    if qsearch( 'svc_forward', { 'dstsvc' => $self->svcnum } );
+
+  return "Can't delete an account with (svc_www) web service!"
+    if qsearch( 'svc_www', { 'usersvc' => $self->usersvc } );
+
+  # what about records in session ?
+
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE';
@@ -244,8 +256,43 @@ sub delete {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
-  $error = $self->SUPER::delete;
-  return $error if $error;
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  foreach my $cust_main_invoice (
+    qsearch( 'cust_main_invoice', { 'dest' => $self->svcnum } )
+  ) {
+    my %hash = $cust_main_invoice->hash;
+    $hash{'dest'} = $self->email;
+    my $new = new FS::cust_main_invoice \%hash;
+    my $error = $new->replace($cust_main_invoice);
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  foreach my $svc_domain (
+    qsearch( 'svc_domain', { 'catchall' => $self->svcnum } )
+  ) {
+    my %hash = new FS::svc_domain->hash;
+    $hash{'catchall'} = '';
+    my $new = new FS::svc_domain \%hash;
+    my $error = $new->replace($svc_domain);
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  my $error = $self->SUPER::delete;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   my( $username, $dir ) = (
     $self->username,
@@ -574,7 +621,7 @@ sub email {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.24 2001-08-19 15:53:34 jeff Exp $
+$Id: svc_acct.pm,v 1.25 2001-08-20 09:41:52 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct_sm.pm b/FS/FS/svc_acct_sm.pm
index 8cec60b69..7615c211d 100644
--- a/FS/FS/svc_acct_sm.pm
+++ b/FS/FS/svc_acct_sm.pm
@@ -13,12 +13,12 @@ use FS::svc_domain;
 @ISA = qw( FS::svc_Common );
 
 #ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::svc_acct_sm'} = sub { 
-  $conf = new FS::Conf;
-  $shellmachine = $conf->exists('qmailmachines')
-                  ? $conf->config('shellmachine')
-                  : '';
-};
+#$FS::UID::callback{'FS::svc_acct_sm'} = sub { 
+#  $conf = new FS::Conf;
+#  $shellmachine = $conf->exists('qmailmachines')
+#                  ? $conf->config('shellmachine')
+#                  : '';
+#};
 
 =head1 NAME
 
@@ -45,10 +45,15 @@ FS::svc_acct_sm - Object methods for svc_acct_sm records
 
   $error = $record->cancel;
 
+=head1 WARNING
+
+FS::svc_acct_sm is B<depreciated>.  This class is only included for migration
+purposes.  See L<FS::svc_forward>.
+
 =head1 DESCRIPTION
 
-An FS::svc_acct object represents a virtual mail alias.  FS::svc_acct inherits
-from FS::Record.  The following fields are currently supported:
+An FS::svc_acct_sm object represents a virtual mail alias.  FS::svc_acct_sm
+inherits from FS::Record.  The following fields are currently supported:
 
 =over 4
 
@@ -83,16 +88,16 @@ the error, otherwise returns false.
 The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
 defined.  An FS::cust_svc record will be created and inserted.
 
-If the configuration values (see L<FS::Conf>) shellmachine and qmailmachines
-exist, and domuser is `*' (meaning a catch-all mailbox), the command:
-
-  [ -e $dir/.qmail-$qdomain-default ] || {
-    touch $dir/.qmail-$qdomain-default;
-    chown $uid:$gid $dir/.qmail-$qdomain-default;
-  }
-
-is executed on shellmachine via ssh (see L<dot-qmail/"EXTENSION ADDRESSES">).
-This behaviour can be surpressed by setting $FS::svc_acct_sm::nossh_hack true.
+ #If the configuration values (see L<FS::Conf>) shellmachine and qmailmachines
+ #exist, and domuser is `*' (meaning a catch-all mailbox), the command:
+ #
+ #  [ -e $dir/.qmail-$qdomain-default ] || {
+ #    touch $dir/.qmail-$qdomain-default;
+ #    chown $uid:$gid $dir/.qmail-$qdomain-default;
+ #  }
+ #
+ #is executed on shellmachine via ssh (see L<dot-qmail/"EXTENSION ADDRESSES">).
+ #This behaviour can be surpressed by setting $FS::svc_acct_sm::nossh_hack true.
 
 =cut
 
@@ -124,18 +129,18 @@ sub insert {
   $error = $self->SUPER::insert;
   return $error if $error;
 
-  my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } );
-  my $svc_acct = qsearchs( 'svc_acct', { 'uid' => $self->domuid } );
-  my ( $uid, $gid, $dir, $domain ) = (
-    $svc_acct->uid,
-    $svc_acct->gid,
-    $svc_acct->dir,
-    $svc_domain->domain,
-  );
-  my $qdomain = $domain;
-  $qdomain =~ s/\./:/g; #see manpage for 'dot-qmail': EXTENSION ADDRESSES
-  ssh("root\@$shellmachine","[ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }")  
-    if ( ! $nossh_hack && $shellmachine && $dir && $self->domuser eq '*' );
+  #my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } );
+  #my $svc_acct = qsearchs( 'svc_acct', { 'uid' => $self->domuid } );
+  #my ( $uid, $gid, $dir, $domain ) = (
+  #  $svc_acct->uid,
+  #  $svc_acct->gid,
+  #  $svc_acct->dir,
+  #  $svc_domain->domain,
+  #);
+  #my $qdomain = $domain;
+  #$qdomain =~ s/\./:/g; #see manpage for 'dot-qmail': EXTENSION ADDRESSES
+  #ssh("root\@$shellmachine","[ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }")  
+  #  if ( ! $nossh_hack && $shellmachine && $dir && $self->domuser eq '*' );
 
   ''; #no error
 
@@ -233,7 +238,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_acct_sm.pm,v 1.3 2001-04-22 01:56:15 ivan Exp $
+$Id: svc_acct_sm.pm,v 1.4 2001-08-20 09:41:52 ivan Exp $
 
 =head1 BUGS
 
@@ -243,6 +248,8 @@ The $recref stuff in sub check should be cleaned up.
 
 =head1 SEE ALSO
 
+L<FS::svc_forward>
+
 L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
 L<FS::svc_acct>, L<FS::svc_domain>, L<Net::SSH>, L<ssh>, L<dot-qmail>,
 schema.html from the base documentation.
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index b3b298b97..06186049b 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -1,7 +1,7 @@
 package FS::svc_domain;
 
 use strict;
-use vars qw( @ISA $whois_hack $conf $mydomain $smtpmachine
+use vars qw( @ISA $whois_hack $conf $smtpmachine
   $tech_contact $from $to @nameservers @nameserver_ips @template
   @mxmachines @nsmachines $soadefaultttl $soaemail $soaexpire $soamachine
   $soarefresh $soaretry
@@ -11,6 +11,7 @@ use Mail::Internet;
 use Mail::Header;
 use Date::Format;
 use Net::Whois 1.0;
+use Net::SSH qw(ssh);
 use FS::Record qw(fields qsearch qsearchs dbh);
 use FS::Conf;
 use FS::svc_Common;
@@ -26,7 +27,6 @@ use FS::domain_record;
 $FS::UID::callback{'FS::domain'} = sub { 
   $conf = new FS::Conf;
 
-  $mydomain = $conf->config('domain');
   $smtpmachine = $conf->config('smtpmachine');
 
   my($internic)="/registries/internic";
@@ -55,6 +55,9 @@ $FS::UID::callback{'FS::domain'} = sub {
   $soarefresh    = $conf->config('soarefresh');
   $soaretry      = $conf->config('soaretry');
 
+  $qshellmachine = $conf->exists('qmailmachines')
+                   ? $conf->config('shellmachine')
+                   : '';
 };
 
 =head1 NAME
@@ -137,9 +140,20 @@ records are added to the domain_record table (see L<FS::domain_record>).
 If any machines are defined in the I<mxmachines> configuration file, MX
 records are added to the domain_record table (see L<FS::domain_record>).
 
-Any problems adding FS::domain_record records will emit warnings, but will
-not return errors from this method.  If your configuration files are correct
-you shouln't have any problems.
+If a machine is defined in the I<shellmachine> configuration value, the
+I<qmailmachines> configuration file exists, and the I<catchall> field points
+to an an account with a home directory (see L<FS::svc_acct>), the command:
+
+  [ -e $dir/.qmail-$qdomain-defualt ] || {
+    touch $dir/.qmail-$qdomain-default;
+    chown $uid:$gid $dir/.qmail-$qdomain-default;
+  }
+
+is executed on shellmachine via ssh (see L<dot-qmail/"EXTENSION ADDRESSES">).
+This behaviour can be supressed by setting $FS::svc_domain::nossh_hack true.
+
+a machine is defined
+in the 
 
 =cut
 
@@ -231,6 +245,21 @@ sub insert {
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
+  if ( $qshellmachine && $self->catchall && ! $nossh_hack ) {
+    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->catchall } )
+      or warn "WARNING: inserted unknown catchall: ". $self->catchall;
+    if ( $svc_acct && $svc_acct->dir ) {
+      my $qdomain = $self->domain;
+      $qdomain =~ s/\./:/g; #see manpage for 'dot-qmail': EXTENSION ADDRESSES
+      my ( $uid, $gid, $dir ) = (
+        $svc_acct->uid,
+        $svc_acct->gid,
+        $svc_acct->dir,
+      );
+      ssh("root\@$qshellmachine", "[ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }");
+    }
+  }
+
   ''; #no error
 }
 
@@ -241,6 +270,23 @@ error, otherwise returns false.
 
 The corresponding FS::cust_svc record will be deleted as well.
 
+=cut
+
+sub delete {
+  my $self = shift;
+
+  return "Can't delete a domain which has accounts!"
+    if qsearch( 'svc_acct', { 'domsvc' => $self->svcnum } );
+
+  return "Can't delete a domain with (svc_acct_sm) mail aliases!"
+    if qsearch('svc_acct_sm', { 'domsvc' => $self->svcnum } );
+
+  return "Can't delete a domain with (domain_record) zone entries!"
+    if qsearch('domain_record', { 'svcnum' => $self->svcnum } );
+
+  $self->SUPER::delete;
+}
+
 =item replace OLD_RECORD
 
 Replaces OLD_RECORD with this one in the database.  If there is an error,
@@ -321,7 +367,7 @@ sub check {
       } elsif ( scalar(@svc_acct) > 1 ) {
         return "More than one account in package ". $pkgnum. ": specify admin contact email";
       } else {
-        $self->email($svc_acct[0]->username. '@'. $mydomain);
+        $self->email($svc_acct[0]->email );
       }
     }
   }
@@ -485,7 +531,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.15 2001-08-19 08:18:01 ivan Exp $
+$Id: svc_domain.pm,v 1.16 2001-08-20 09:41:52 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index db9180dbf..b82ed2b85 100644
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -1,12 +1,13 @@
 package FS::svc_forward;
 
 use strict;
-use vars qw( @ISA $nossh_hack $conf $shellmachine @qmailmachines @vpopmailmachines);
+use vars qw( @ISA $nossh_hack $conf $shellmachine @qmailmachines
+             @vpopmailmachines );
+use Net::SSH qw(ssh);
+use FS::Conf;
 use FS::Record qw( fields qsearch qsearchs );
 use FS::svc_Common;
 use FS::cust_svc;
-use Net::SSH qw(ssh);
-use FS::Conf;
 use FS::svc_acct;
 use FS::svc_domain;
 
@@ -15,11 +16,15 @@ use FS::svc_domain;
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::svc_forward'} = sub { 
   $conf = new FS::Conf;
-  $shellmachine = $conf->exists('qmailmachines')
-                  ? $conf->config('shellmachine')
-                  : '';
+  if ( $conf->exists('qmailmachines') ) {
+    $shellmachine = $conf->config('shellmachine')
+  } else {
+    $shellmachine = '';
+  }
   if ( $conf->exists('vpopmailmachines') ) {
     @vpopmailmachines = $conf->config('vpopmailmachines');
+  } else {
+    @vpopmailmachines = ();
   }
 };
 
@@ -234,7 +239,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_forward.pm,v 1.3 2001-08-19 15:53:35 jeff Exp $
+$Id: svc_forward.pm,v 1.4 2001-08-20 09:41:52 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From a9ec5a5c02a137cadd9f2a522fba904d945ddbe3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Aug 2001 11:04:38 +0000
Subject: more svc_forward work

---
 FS/FS/svc_acct.pm    |  29 ++++++----
 FS/FS/svc_domain.pm  |   6 ++-
 FS/FS/svc_forward.pm | 150 +++++++++++++++++++++++++++++++++++----------------
 3 files changed, 126 insertions(+), 59 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 6551d94af..85b4888b2 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -434,7 +434,9 @@ sub check {
   return $x unless ref($x);
   my $part_svc = $x;
 
-  my $error = $self->ut_number('domsvc');
+  my $error = $self->ut_numbern('svcnum')
+              || $self->ut_number('domsvc')
+  ;
   return $error if $error;
 
   my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;
@@ -598,6 +600,19 @@ sub radius_check {
   } grep { /^rc_/ && $self->getfield($_) } fields( $self->table );
 }
 
+=item domain
+
+Returns the domain associated with this account.
+
+-cut
+
+sub domain {
+  my $self = shift;
+  my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } )
+    or die "svc_acct.domsvc ". $self->domsvc." not found in svc_domain.svcnum";
+  $svc_domain->domain;
+}
+
 =item email
 
 Returns an email address associated with the account.
@@ -606,22 +621,14 @@ Returns an email address associated with the account.
 
 sub email {
   my $self = shift;
-  my $domain;
-  my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } );
-  if ($svc_domain) {
-    $domain=$svc_domain->domain;
-  }else{
-    warn "couldn't find svc_acct.domsvc " . $self->domsvc . "!";
-    $domain="unknown";
-  }
-  return $self->username . "@" . $domain;
+  $self->username. '@'. $self->domain;
 }
 
 =back
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.25 2001-08-20 09:41:52 ivan Exp $
+$Id: svc_acct.pm,v 1.26 2001-08-20 11:04:38 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 06186049b..553025192 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -340,7 +340,9 @@ sub check {
   return $x unless ref($x);
   my $part_svc = $x;
 
-  my $error = $self->ut_numbern('catchall');
+  my $error = $self->ut_numbern('svcnum')
+              || $self->ut_numbern('catchall')
+  ;
   return $error if $error;
 
   #hmm
@@ -531,7 +533,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.16 2001-08-20 09:41:52 ivan Exp $
+$Id: svc_domain.pm,v 1.17 2001-08-20 11:04:38 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index b82ed2b85..9ff2b857a 100644
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -91,16 +91,16 @@ the error, otherwise returns false.
 The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
 defined.  An FS::cust_svc record will be created and inserted.
 
-If the configuration values (see L<FS::Conf>) vpopmailmachines exist, then
+If the configuration value (see L<FS::Conf>) vpopmailmachines exists, then
 the command:
 
-  [ -d /home/vpopmail/$vdomain/$source ] || {
-    echo "$destination" >> /home/vpopmail/$vdomain/$source/.$qmail
-    chown $vpopuid:$vpopgid /home/vpopmail/$vdomain/$source/.$qmail
+  [ -d $vpopdir/$domain/$source ] || {
+    echo "$destination" >> $vpopdir/$domain/$username/.$qmail
+    chown $vpopuid:$vpopgid $vpopdir/$domain/$username/.$qmail
   }
 
-is executed on each vpopmailmachine via ssh (see L<dot-qmail/"EXTENSION ADDRESSES">).
-This behaviour can be surpressed by setting $FS::svc_forward::nossh_hack true.
+is executed on each vpopmailmachine via ssh (see the vpopmail documentation).
+This behaviour can be supressed by setting $FS::svc_forward::nossh_hack true.
 
 =cut
 
@@ -115,31 +115,27 @@ sub insert {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
-  $error=$self->check;
+  $error = $self->check;
   return $error if $error;
 
   $error = $self->SUPER::insert;
   return $error if $error;
 
   my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->srcsvc } );
-  my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $svc_acct->domsvc } );
-  my $source = $svc_acct->username . $svc_domain->domain;
+  my $username = $svc_acct->username;
+  my $domain = $svc_acct->domain;
   my $destination;
-  if ($self->dstdvc) {
-    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->dstsvc } );
-    my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $svc_acct->domsvc } );
-    $destination = $svc_acct->username . $svc_domain->domain;
+  if ($self->dstsvc) {
+    my $dst_svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->dstsvc } );
+    $destination = $dst_svc_acct->email;
   } else {
     $destination = $self->dst;
   }
     
-  my $vdomain = $svc_acct->domain;
-
   foreach my $vpopmailmachine ( @vpopmailmachines ) {
-    my ($machine, $vpopdir, $vpopuid, $vpopgid) = split (/\s+/, $vpopmailmachine);
-
-    ssh("root\@$machine","[ -d $vpopdir/$vdomain/$source ] || { echo $destination >> $vpopdir/$vdomain/$source/.qmail; chown $vpopuid:$vpopgid $vpopdir/$vdomain/$source/.qmail; }")  
-      if ( ! $nossh_hack && $machine);
+    my($machine, $vpopdir, $vpopuid, $vpopgid) = split(/\s+/, $vpopmailmachine);
+    ssh("root\@$machine","[ -d $vpopdir/$domain/$username ] || { echo \"$destination\" >> $vpopdir/$domain/$username/.qmail; chown $vpopuid:$vpopgid $vpopdir/$domain/$username/.qmail; }") 
+      unless $nossh_hack;
   }
 
   ''; #no error
@@ -158,14 +154,80 @@ The corresponding FS::cust_svc record will be deleted as well.
 Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
+If srcsvc changes, and the configuration value vpopmailmachines exists, then
+the command:
+
+  rm $vpopdir/$domain/$username/.qmail
+
+is executed on each vpopmailmachine via ssh.  This behaviour can be supressed
+by setting $FS::svc_forward_nossh_hack true.
+
+If dstsvc changes (or dstsvc is 0 and dst changes), and the configuration value
+vpopmailmachines exists, then the command:
+
+  [ -d $vpopdir/$domain/$source ] || {
+    echo "$destination" >> $vpopdir/$domain/$username/.$qmail
+    chown $vpopuid:$vpopgid $vpopdir/$domain/$username/.$qmail
+  }
+
+is executed on each vpopmailmachine via ssh.  This behaviour can be supressed
+by setting $FS::svc_forward_nossh_hack true.
+
 =cut
 
 sub replace {
   my ( $new, $old ) = ( shift, shift );
-  my $error;
 
- $new->SUPER::replace($old);
+  if ( $new->srcsvc != $old->srcsvc
+       && ( $new->dstsvc != $old->dstsvc
+            || ! $new->dstsvc && $new->dst ne $old->dst 
+          )
+      ) {
+    return "Can't change both source and destination of a mail forward!"
+  }
 
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $error = $new->SUPER::replace($old);
+  return $error if $error;
+
+  if ( $new->srcsvc != $old->srcsvc ) {
+    my $old_svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $old->srcsvc } );
+    my $old_username = $old_svc_acct->username;
+    my $old_domain = $old_svc_acct->domain;
+    foreach my $vpopmailmachine ( @vpopmailmachines ) {
+      my($machine, $vpopdir, $vpopuid, $vpopgid) =
+        split(/\s+/, $vpopmailmachine);
+      ssh("root\@$machine","rm $vpopdir/$old_domain/$old_username/.qmail")
+        unless $nossh_hack;
+    }
+  }
+
+  #false laziness with stuff in insert, should subroutine
+  my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $new->srcsvc } );
+  my $username = $svc_acct->username;
+  my $domain = $svc_acct->domain;
+  my $destination;
+  if ($new->dstsvc) {
+    my $dst_svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $new->dstsvc } );
+    $destination = $dst_svc_acct->email;
+  } else {
+    $destination = $new->dst;
+  }
+  
+  foreach my $vpopmailmachine ( @vpopmailmachines ) {
+    my($machine, $vpopdir, $vpopuid, $vpopgid) = split(/\s+/, $vpopmailmachine);
+    ssh("root\@$machine","[ -d $vpopdir/$domain/$username ] || { echo \"$destination\" >> $vpopdir/$domain/$username/.qmail; chown $vpopuid:$vpopgid $vpopdir/$domain/$username/.qmail; }") 
+      unless $nossh_hack;
+  }
+  #end subroutinable bits
+  }
+  '';
 }
 
 =item suspend
@@ -198,38 +260,36 @@ Sets any fixed values; see L<FS::part_svc>.
 
 sub check {
   my $self = shift;
-  my $error;
 
   my $x = $self->setfixed;
   return $x unless ref($x);
   my $part_svc = $x;
 
-  my($recref) = $self->hashref;
-
-  $recref->{srcsvc} =~ /^(\d+)$/ or return "Illegal srcsvc";
-  $recref->{srcsvc} = $1;
-  my($svc_acct);
-  return "Unknown srcsvc" unless
-    $svc_acct=qsearchs('svc_acct',{'svcnum'=> $recref->{srcsvc} } );
+  my $error = $self->ut_numbern('svcnum')
+              || $self->ut_number('srcsvc')
+              || $self->ut_numbern('dstsvc')
+  ;
+  return $error if $error;
 
-  return "Illegal use of dstsvc and dst" if
-    ($recref->{dstsvc} && $recref->{dst});
+  return "Unknown srcsvc"
+    unless qsearchs('svc_acct', { 'svcnum' => $self->srcsvc } );
 
-  return "Illegal use of dstsvc and dst" if
-    (! $recref->{dstsvc} && ! $recref->{dst});
+  return "Both dstsvc and dst were defined; one one can be specified"
+    if $self->dstsvc && $self->dst;
 
-  $recref->{dstsvc} =~ /^(\d+)$/ or return "Illegal dstsvc";
-  $recref->{dstsvc} = $1;
+  return "one of dstsvc or dst is required"
+    unless $self->dstsvc || $self->dst;
 
-  if ($recref->{dstsvc}) {
-    my($svc_acct);
-    return "Unknown dstsvc" unless
-      my $svc_domain=qsearchs('svc_acct',{'svcnum'=> $recref->{dstsvc} } );
-  }
+  return "Unknown dstsvc"
+    unless qsearchs('svc_acct', { 'svcnum' => $self->dstsvc } )
+           || ! $self->dstsvc;
 
-  if ($recref->{dst}) {
-    $recref->{dst} =~ /^([\w\.\-]+)\@(([\w\.\-]+\.)+\w+)$/
-       or return "Illegal dst";
+  if ( $self->dst ) {
+    $self->dst =~ /^([\w\.\-]+)\@(([\w\-]+\.)+\w+)$/
+       or return "Illegal dst: ". $self->dst;
+    $self->dst("$1\@$2");
+  } else {
+    $self->dst('');
   }
 
   ''; #no error
@@ -239,14 +299,12 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_forward.pm,v 1.4 2001-08-20 09:41:52 ivan Exp $
+$Id: svc_forward.pm,v 1.5 2001-08-20 11:04:38 ivan Exp $
 
 =head1 BUGS
 
 The remote commands should be configurable.
 
-The $recref stuff in sub check should be cleaned up.
-
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
-- 
cgit v1.2.1


From 97034e45729605f81147c419d7a530e6591baa2d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Aug 2001 11:18:20 +0000
Subject: labels for svc_acct accounts are now fully qualified!

---
 FS/FS/cust_svc.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 3a83679fb..1708b1ce3 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -126,19 +126,19 @@ sub label {
   my $svc = $part_svc->svc;
   my $tag;
   if ( $svcdb eq 'svc_acct' ) {
-    $tag = $svc_x->getfield('username');
+    $tag = $svc_x->email;
   } elsif ( $svcdb eq 'svc_acct_sm' ) {
     my $domuser = $svc_x->domuser eq '*' ? '(anything)' : $svc_x->domuser;
     my $svc_domain = qsearchs ( 'svc_domain', { 'svcnum' => $svc_x->domsvc } );
     my $domain = $svc_domain->domain;
     $tag = "$domuser\@$domain";
   } elsif ( $svcdb eq 'svc_forward' ) {
-    my $svc_acct = qsearchs ( 'svc_acct', { 'svcnum' => $svc_x->srcsvc } );
-    $tag = $svc_acct->email . '->';
-    if ($svc_x->dstsvc) {
-      $svc_acct = qsearchs ( 'svc_acct', { 'svcnum' => $svc_x->dstsvc } );
+    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $svc_x->srcsvc } );
+    $tag = $svc_acct->email. '->';
+    if ( $svc_x->dstsvc ) {
+      $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $svc_x->dstsvc } );
       $tag .= $svc_acct->email;
-    }else{
+    } else {
       $tag .= $svc_x->dst;
     }
   } elsif ( $svcdb eq 'svc_domain' ) {
@@ -154,7 +154,7 @@ sub label {
 
 =head1 VERSION
 
-$Id: cust_svc.pm,v 1.2 2001-08-19 15:53:34 jeff Exp $
+$Id: cust_svc.pm,v 1.3 2001-08-20 11:18:20 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From eb75efa2c03350afff1fa29f8d4c8c6b3827900a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Aug 2001 12:13:09 +0000
Subject: only show domains associated with this customer.

---
 httemplate/edit/svc_acct.cgi | 72 +++++++++++---------------------------------
 1 file changed, 17 insertions(+), 55 deletions(-)

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 063c41fa1..584727001 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,58 +1,11 @@
 <%
-#
-# $Id: svc_acct.cgi,v 1.2 2001-08-19 15:53:35 jeff Exp $
-#
-# Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
-#        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
-#
-# ivan@voicenet.com 96-dec-18
-#
-# rewrite ivan@sisd.com 98-mar-8
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'password' to '_password' because Pg6.3 reserves the password word
-#       bmccane@maxbaud.net     98-apr-3
-#
-# use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
-#
-# $Log: svc_acct.cgi,v $
-# Revision 1.2  2001-08-19 15:53:35  jeff
-# added user interface for svc_forward and vpopmail support
-#
-# Revision 1.1  2001/07/30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.10  1999/04/14 11:27:06  ivan
-# showpasswords config option to show passwords
-#
-# Revision 1.9  1999/02/28 00:03:37  ivan
-# removed misleading comments
-#
-# Revision 1.8  1999/02/23 08:09:22  ivan
-# beginnings of one-screen new customer entry and some other miscellania
-#
-# Revision 1.7  1999/02/07 09:59:22  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.6  1999/01/19 05:13:43  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:32  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1998/12/30 23:03:22  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.3  1998/12/17 06:17:08  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
+<!-- $Id: svc_acct.cgi,v 1.3 2001-08-20 12:13:09 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
              $part_svc $svc $otaker $username $password $ulen $ulen2 $p1
-             $popnum $domsvc $uid $gid $finger $dir $shell $quota $slipip );
+             $popnum $domsvc $uid $gid $finger $dir $shell $quota $slipip
+             @svc_domain );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
@@ -168,11 +121,21 @@ $domsvc = $svc_acct->domsvc || 0;
 if ( $part_svc->svc_acct__domsvc_flag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="domsvc" VALUE="$domsvc">!;
 } else { 
+  my @svc_domain = ();
+  my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
+  if ($cust_pkg) {
+    my @cust_svc =
+      map { qsearch('cust_svc', { 'pkgnum' => $_->pkgnum } ) }
+          qsearch('cust_pkg', { 'custnum' => $cust_pkg->custnum } );
+    foreach my $cust_svc ( @cust_svc ) {
+      $svc_domain = qsearchs('svc_domain', { 'svcnum' => $_->svcnum } );
+      push @svc_domain, $svc_domain if $svc_domain;
+    }
+  } else {
+    @svc_domain = qsearch('svc_domain', {} );
+  }
   print qq!<BR>Domain: <SELECT NAME="domsvc" SIZE=1>\n!;
-  my($svc_domain);
-  foreach $svc_domain
-    ( sort {$a->domain cmp $b->domain} (qsearch ('svc_domain',{} ) ) ) 
-  {
+  foreach my $svc_domain ( sort { $a->domain cmp $b->domain } @svc_domain ) {
     print qq!<OPTION VALUE="!, $svc_domain->svcnum, qq!"!,
           $svc_domain->svcnum == $domsvc ? ' SELECTED' : '',
           ">", $svc_domain->domain, "\n"
@@ -249,5 +212,4 @@ print <<END;
 </HTML>
 END
 
-
 %>
-- 
cgit v1.2.1


From c0806ebf17ec0c4647915d5be09e35034171e2bf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Aug 2001 12:15:05 +0000
Subject: #

---
 httemplate/edit/svc_acct.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 584727001..26266957d 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-<!-- $Id: svc_acct.cgi,v 1.3 2001-08-20 12:13:09 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.4 2001-08-20 12:15:05 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
-- 
cgit v1.2.1


From d0f94919f1b0ab81c059740ea205ed40dabb7cda Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Aug 2001 13:10:31 +0000
Subject: use var

---
 FS/FS/svc_domain.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 553025192..82b1ef159 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw( @ISA $whois_hack $conf $smtpmachine
   $tech_contact $from $to @nameservers @nameserver_ips @template
   @mxmachines @nsmachines $soadefaultttl $soaemail $soaexpire $soamachine
-  $soarefresh $soaretry
+  $soarefresh $soaretry $qshellmachine
 );
 use Carp;
 use Mail::Internet;
@@ -533,7 +533,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.17 2001-08-20 11:04:38 ivan Exp $
+$Id: svc_domain.pm,v 1.18 2001-08-20 13:10:31 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From ed31fb25c5593920a0ae4a66822ffffb7347d409 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 20 Aug 2001 18:43:06 +0000
Subject: one that got away

---
 htdocs/docs/upgrade8.html | 52 -----------------------------------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 htdocs/docs/upgrade8.html

diff --git a/htdocs/docs/upgrade8.html b/htdocs/docs/upgrade8.html
deleted file mode 100644
index 379892256..000000000
--- a/htdocs/docs/upgrade8.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<head>
-  <title>Upgrading to 1.3.2</title>
-</head>
-<body>
-<h1>Upgrading to 1.3.2 from 1.3.1</h1>
-<ul>
-  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
-  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
-  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
-  <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
-  <li>If migrating from less than 1.2.3, see these <a href="upgrade5.html">instructions</a> first.
-  <li>If migrating from less than 1.3.0, see these <a href="upgrade6.html">instructions</a> first.
-  <li>If migrating from less than 1.3.1, see these <a href="upgrade7.html">instructions</a> first.
-  <li>Back up your data and current Freeside installation.
-  <li>Apply the following changes to your database:
-<pre>
-CREATE TABLE svc_forward (
-  svcnum int NOT NULL,
-  srcsvc int NOT NULL,
-  dstsvc int NOT NULL,
-  dst varchar(80),
-  PRIMARY KEY (svcnum)
-);
-ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
-ALTER TABLE svc_domain ADD catchall integer;
-ALTER TABLE part_svc ADD svc_acct__domsvc integer NULL;
-ALTER TABLE part_svc ADD svc_acct__domsvc_flag char(1) NULL;
-ALTER TABLE part_svc ADD svc_domain__catchall integer NULL;
-ALTER TABLE part_svc ADD svc_domain__catchall_flag char(1) NULL;
-ALTER TABLE part_svc ADD svc_forward__srcsvc integer NULL;
-ALTER TABLE part_svc ADD svc_forward__srcsvc_flag char(1) NULL;
-ALTER TABLE part_svc ADD svc_forward__dstsvc integer NULL;
-ALTER TABLE part_svc ADD svc_forward__dstsvc_flag char(1) NULL;
-ALTER TABLE part_svc ADD svc_forward__dst integer NULL;
-ALTER TABLE part_svc ADD svc_forward__dst_flag char(1) NULL;
-
-</pre>
-  <li>Copy or symlink htdocs to the new copy.
-  <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
-  <li>Change to the FS directory in the new tarball, and build and install the
-      Perl modules:
-    <pre>
-$ cd FS/
-$ perl Makefile.PL
-$ make
-$ su
-# make install</pre>
-  <li>Run bin/dbdef-create.
-  <li>create a service based on svc_forward
-  <li>Run bin/fs-migrate-svc_acct_sm
-  <li>create the conf.dbsrc/user_policy as appropriate for your site
-</body>
-- 
cgit v1.2.1


From 3d2530a7d08dfae1473015d96d7394dc15b86ce1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Aug 2001 00:39:07 +0000
Subject: fix some silly syntax errors

---
 FS/FS/svc_acct.pm    | 4 ++--
 FS/FS/svc_domain.pm  | 4 ++--
 FS/FS/svc_forward.pm | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 85b4888b2..97117b524 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -7,7 +7,7 @@ use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
              @saltset @pw_set);
 use Carp;
 use FS::Conf;
-use FS::Record qw( qsearch qsearchs fields );
+use FS::Record qw( qsearch qsearchs fields dbh );
 use FS::svc_Common;
 use Net::SSH qw(ssh);
 use FS::part_svc;
@@ -628,7 +628,7 @@ sub email {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.26 2001-08-20 11:04:38 ivan Exp $
+$Id: svc_acct.pm,v 1.27 2001-08-21 00:39:07 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 82b1ef159..4d652f8d3 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw( @ISA $whois_hack $conf $smtpmachine
   $tech_contact $from $to @nameservers @nameserver_ips @template
   @mxmachines @nsmachines $soadefaultttl $soaemail $soaexpire $soamachine
-  $soarefresh $soaretry $qshellmachine
+  $soarefresh $soaretry $qshellmachine $nossh_hack
 );
 use Carp;
 use Mail::Internet;
@@ -533,7 +533,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.18 2001-08-20 13:10:31 ivan Exp $
+$Id: svc_domain.pm,v 1.19 2001-08-21 00:39:07 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index 9ff2b857a..288ab3408 100644
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -226,7 +226,7 @@ sub replace {
       unless $nossh_hack;
   }
   #end subroutinable bits
-  }
+
   '';
 }
 
@@ -299,7 +299,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_forward.pm,v 1.5 2001-08-20 11:04:38 ivan Exp $
+$Id: svc_forward.pm,v 1.6 2001-08-21 00:39:07 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 75cbdf6ab6af5539382a63d21c8f4042d53ba6c1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Aug 2001 02:03:32 +0000
Subject: deal with databases w/o separate shipping address

---
 httemplate/search/cust_pkg.cgi | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 2ab6e2b57..8a0dfd132 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_pkg.cgi,v 1.3 2001-08-19 08:32:43 ivan Exp $ -->
+# <!-- $Id: cust_pkg.cgi,v 1.4 2001-08-21 02:03:32 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi @cust_pkg $sortby $query %part_pkg );
@@ -86,27 +86,31 @@ END
     sort $sortby grep(!$saw{$_->pkgnum}++, @cust_pkg)
   ) {
     my($cust_main)=qsearchs('cust_main',{'custnum'=>$cust_pkg->custnum});
-    my($pkgnum, $custnum, $last, $first, $company,
-       $ship_last, $ship_first, $ship_company)=(
+    my($pkgnum, $custnum, $last, $first, $company) = (
       $cust_pkg->pkgnum,
       $cust_pkg->custnum,
       $cust_main ? $cust_main->last : '',
       $cust_main ? $cust_main->first : '',
       $cust_main ? $cust_main->company : '',
-      $cust_main
-        ? ( $cust_main->ship_last || $cust_main->getfield('last') )
-        : '',
-      $cust_main 
-        ? ( $cust_main->ship_last
-            ? $cust_main->ship_first
-            : $cust_main->first )
-        : '',
-      $cust_main 
-        ? ( $cust_main->ship_last
-            ? $cust_main->ship_company
-            : $cust_main->company )
-        : '',
     );
+    my($ship_last, $ship_first, $ship_company);
+    if ( defined dbdef->table('cust_main')->column('ship_last') ) {
+      ($ship_last, $ship_first, $ship_company) = (
+        $cust_main
+          ? ( $cust_main->ship_last || $cust_main->getfield('last') )
+          : '',
+        $cust_main 
+          ? ( $cust_main->ship_last
+              ? $cust_main->ship_first
+              : $cust_main->first )
+          : '',
+        $cust_main 
+          ? ( $cust_main->ship_last
+              ? $cust_main->ship_company
+              : $cust_main->company )
+          : '',
+      );
+    }
     my $pkg = $part_pkg{$cust_pkg->pkgpart}->pkg;
     #$pkg .= ' - '. $part_pkg{$cust_pkg->pkgpart}->comment;
     my @cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
-- 
cgit v1.2.1


From 7d66bf30114486f1463b2899399364e780147b49 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Aug 2001 02:16:36 +0000
Subject: fix to work against 1.3.x databases, with a warning

---
 httemplate/search/svc_acct.cgi | 86 ++++++++++++++++++++++++++++++++----------
 1 file changed, 66 insertions(+), 20 deletions(-)

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index dba5ac302..dc4c4fdaa 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,12 +1,12 @@
 <%
-# <!-- $Id: svc_acct.cgi,v 1.3 2001-08-19 15:53:35 jeff Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.4 2001-08-21 02:16:36 ivan Exp $ -->
 
 use strict;
-use vars qw( $cgi @svc_acct $sortby $query );
+use vars qw( $cgi @svc_acct $sortby $query $mydomain );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
+use FS::Record qw(qsearch qsearchs dbdef);
 use FS::CGI qw(header eidiot popurl table);
 use FS::svc_acct;
 use FS::cust_main;
@@ -62,16 +62,22 @@ if ( scalar(@svc_acct) == 1 ) {
         "$total matching accounts found",
         &table(), <<END;
       <TR>
-        <TH><FONT SIZE=-1>Service #</FONT></TH>
+        <TH><FONT SIZE=-1>#</FONT></TH>
         <TH><FONT SIZE=-1>Username</FONT></TH>
         <TH><FONT SIZE=-1>Domain</FONT></TH>
         <TH><FONT SIZE=-1>UID</FONT></TH>
         <TH><FONT SIZE=-1>Service</FONT></TH>
-        <TH><FONT SIZE=-1>Customer #</FONT></TH>
-        <TH><FONT SIZE=-1>Contact name</FONT></TH>
-        <TH><FONT SIZE=-1>Company</FONT></TH>
-      </TR>
+        <TH><FONT SIZE=-1>Cust#</FONT></TH>
+        <TH><FONT SIZE=-1>(bill) name</FONT></TH>
+        <TH><FONT SIZE=-1>company</FONT></TH>
 END
+  if ( defined dbdef->table('cust_main')->column('ship_last') ) {
+    print <<END;
+        <TH><FONT SIZE=-1>(service) name</FONT></TH>
+        <TH><FONT SIZE=-1>company</FONT></TH>
+END
+  }
+  print "</TR>";
 
   my(%saw,$svc_acct);
   my $p = popurl(2);
@@ -82,8 +88,22 @@ END
       or die "No cust_svc record for svcnum ". $svc_acct->svcnum;
     my $part_svc = qsearchs('part_svc', { 'svcpart' => $cust_svc->svcpart })
       or die "No part_svc record for svcpart ". $cust_svc->svcpart;
-    my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc })
-      or die "No svc_domain record for domsvc ". $cust_svc->domsvc;
+
+    my $domain;
+    my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc });
+    if ( $svc_domain ) {
+      $domain = "<A HREF=\"${p}view/svc_domain.cgi?". $svc_domain->svcnum.
+                "\">". $svc_domain->domain. "</A>";
+    } else {
+      unless ( $mydomain ) {
+        my $conf = new FS::Conf;
+        unless ( $mydomain = $conf->config('domain') ) {
+          die "No legacy domain config file and no svc_domain.svcnum record ".
+              "for svc_acct.domsvc: ". $cust_svc->domsvc;
+        }
+      }
+      $domain = "<i>$mydomain</i><FONT COLOR=\"#FF0000\">*</FONT>";
+    }
     my($cust_pkg,$cust_main);
     if ( $cust_svc->pkgnum ) {
       $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_svc->pkgnum })
@@ -91,10 +111,9 @@ END
       $cust_main = qsearchs('cust_main', { 'custnum' => $cust_pkg->custnum })
         or die "No cust_main record for custnum ". $cust_pkg->custnum;
     }
-    my($svcnum,$username,$domain,$uid,$svc,$custnum,$last,$first,$company)=(
+    my($svcnum, $username, $uid, $svc, $custnum, $last, $first, $company) = (
       $svc_acct->svcnum,
       $svc_acct->getfield('username'),
-      $svc_domain->getfield('domain'),
       $svc_acct->getfield('uid'),
       $part_svc->svc,
       $cust_svc->pkgnum ? $cust_main->custnum : '',
@@ -106,8 +125,24 @@ END
       ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\"><FONT SIZE=-1>$custnum</FONT></A>"
       : "<I>(unlinked)</I>"
     ;
-    my($pname) = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$last, $first</A>" : '';
+    my $pname = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$last, $first</A>" : '';
     my $pcompany = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$company</A>" : '';
+    my($pship_name, $pship_company);
+    if ( defined dbdef->table('cust_main')->column('ship_last') ) {
+      my($ship_last, $ship_first, $ship_company) = (
+        $cust_svc->pkgnum ? ( $cust_main->ship_last || $last ) : '',
+        $cust_svc->pkgnum ? ( $cust_main->ship_last
+                              ? $cust_main->ship_first
+                              : $first
+                            ) : '',
+        $cust_svc->pkgnum ? ( $cust_main->ship_last
+                              ? $cust_main->ship_company
+                              : $company
+                            ) : '',
+      );
+      $pship_name = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$ship_last, $ship_first</A>" : '';
+      $pship_company = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$ship_company</A>" : '';
+    }
     print <<END;
     <TR>
       <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
@@ -118,17 +153,28 @@ END
       <TD><FONT SIZE=-1>$pcustnum</FONT></TH>
       <TD><FONT SIZE=-1>$pname<FONT></TH>
       <TD><FONT SIZE=-1>$pcompany</FONT></TH>
-    </TR>
 END
+    if ( defined dbdef->table('cust_main')->column('ship_last') ) {
+      print <<END;
+      <TD><FONT SIZE=-1>$pship_name<FONT></TH>
+      <TD><FONT SIZE=-1>$pship_company</FONT></TH>
+END
+    }
+    print "</TR>";
 
   }
  
-  print <<END;
-    </TABLE>
-    </CENTER>
-  </BODY>
-</HTML>
-END
+  print '</TABLE>';
+
+  if ( $mydomain ) {
+    print "<BR><FONT COLOR=\"#FF0000\">*</FONT> The <I>$mydomain</I> domain ".
+          "is contained in your legacy <CODE>domain</CODE> ".
+          "<A HREF=\"${p}docs/config.html#domain\">configuration file</A>.  ".
+          "You should run the <CODE>bin/fs-migrate-svc_acct_sm</CODE> script ".
+          "to create a proper svc_domain record for this domain."
+  }
+
+  print '</BODY></HTML>';
 
 }
 
-- 
cgit v1.2.1


From 3d671921441ba8422650b54435a1959ad1d4c71d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Aug 2001 02:31:57 +0000
Subject: remove $Log$ messages.  whew.

---
 httemplate/browse/agent.cgi                  | 58 +--------------------
 httemplate/browse/agent_type.cgi             | 39 +-------------
 httemplate/browse/part_pkg.cgi               | 39 +-------------
 httemplate/browse/part_referral.cgi          | 41 +--------------
 httemplate/browse/svc_acct_pop.cgi           | 38 +-------------
 httemplate/edit/agent.cgi                    | 36 +------------
 httemplate/edit/agent_type.cgi               | 51 +------------------
 httemplate/edit/cust_credit.cgi              | 48 +-----------------
 httemplate/edit/cust_main_county-expand.cgi  | 32 +-----------
 httemplate/edit/cust_main_county.cgi         | 45 +---------------
 httemplate/edit/cust_pay.cgi                 | 34 +------------
 httemplate/edit/cust_pkg.cgi                 | 53 +------------------
 httemplate/edit/part_pkg.cgi                 | 44 +---------------
 httemplate/edit/part_referral.cgi            | 34 +------------
 httemplate/edit/process/agent.cgi            | 34 +------------
 httemplate/edit/process/agent_type.cgi       | 34 +------------
 httemplate/edit/process/cust_credit.cgi      | 44 +---------------
 httemplate/edit/process/cust_main_county.cgi | 31 +-----------
 httemplate/edit/process/cust_pay.cgi         | 37 +-------------
 httemplate/edit/process/cust_pkg.cgi         | 40 +--------------
 httemplate/edit/process/part_pkg.cgi         | 47 +----------------
 httemplate/edit/process/part_referral.cgi    | 31 +-----------
 httemplate/edit/process/svc_acct.cgi         | 45 +---------------
 httemplate/edit/process/svc_acct_pop.cgi     | 31 +-----------
 httemplate/edit/process/svc_acct_sm.cgi      | 43 +---------------
 httemplate/edit/process/svc_domain.cgi       | 43 +---------------
 httemplate/edit/process/svc_forward.cgi      | 12 +----
 httemplate/edit/svc_acct_pop.cgi             | 42 +--------------
 httemplate/edit/svc_acct_sm.cgi              | 64 +----------------------
 httemplate/edit/svc_domain.cgi               | 51 +------------------
 httemplate/edit/svc_forward.cgi              | 16 +-----
 httemplate/misc/bill.cgi                     | 26 +---------
 httemplate/misc/cancel-unaudited.cgi         | 43 +---------------
 httemplate/misc/cancel_pkg.cgi               | 48 +-----------------
 httemplate/misc/catchall.cgi                 | 12 +----
 httemplate/misc/delete-customer.cgi          | 14 +----
 httemplate/misc/expire_pkg.cgi               | 29 +----------
 httemplate/misc/link.cgi                     | 34 +------------
 httemplate/misc/print-invoice.cgi            | 21 +-------
 httemplate/misc/process/catchall.cgi         | 12 +----
 httemplate/misc/process/delete-customer.cgi  | 11 +---
 httemplate/misc/process/link.cgi             | 33 +-----------
 httemplate/misc/susp_pkg.cgi                 | 42 +--------------
 httemplate/misc/unsusp_pkg.cgi               | 39 +-------------
 httemplate/search/cust_bill.cgi              | 34 +------------
 httemplate/search/svc_acct_sm.cgi            | 48 +-----------------
 httemplate/search/svc_domain.cgi             | 55 +-------------------
 httemplate/view/cust_bill.cgi                | 51 +------------------
 httemplate/view/cust_pkg.cgi                 | 59 +--------------------
 httemplate/view/svc_acct.cgi                 | 76 +---------------------------
 httemplate/view/svc_acct_sm.cgi              | 57 +--------------------
 httemplate/view/svc_domain.cgi               | 54 +-------------------
 httemplate/view/svc_forward.cgi              | 14 +----
 53 files changed, 53 insertions(+), 1996 deletions(-)

diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 209043744..23c8f7c5b 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -1,61 +1,5 @@
 <%
-#
-# $Id: agent.cgi,v 1.1 2001-07-30 07:36:03 ivan Exp $
-#
-# ivan@sisd.com 97-dec-12
-#
-# changes to allow pages to load from a relative location in the web tree.
-#	bmccane@maxbaud.net	98-mar-25
-#
-# changed 'type' to 'atype' because type is reserved word in Pg6.3
-#	bmccane@maxbaud.net	98-apr-3
-#
-# agent type was linking to wrong cgi ivan@sisd.com 98-jul-18
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: agent.cgi,v $
-# Revision 1.1  2001-07-30 07:36:03  ivan
-# templates!!!
-#
-# Revision 1.13  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.12  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.11  1999/01/20 09:43:16  ivan
-# comment out future UI code (but look at it, it's neat!)
-#
-# Revision 1.10  1999/01/19 05:13:24  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.9  1999/01/18 09:41:14  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.8  1999/01/18 09:22:26  ivan
-# changes to track email addresses for email invoicing
-#
-# Revision 1.7  1998/12/17 05:25:16  ivan
-# fix visual and other bugs
-#
-# Revision 1.6  1998/11/23 05:29:46  ivan
-# use CGI::Carp
-#
-# Revision 1.5  1998/11/23 05:27:31  ivan
-# to eliminate warnings
-#
-# Revision 1.4  1998/11/20 08:50:36  ivan
-# s/CGI::Base/CGI.pm, visual fixes
-#
-# Revision 1.3  1998/11/08 10:11:02  ivan
-# CGI.pm
-#
-# Revision 1.2  1998/11/07 10:24:22  ivan
-# don't use depriciated FS::Bill and FS::Invoice, other miscellania
-#
+#<!-- $Id: agent.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $ui $cgi $p $agent );
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index 9d51a37e6..0d7c11f3e 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -1,42 +1,5 @@
 <%
-#
-# $Id: agent_type.cgi,v 1.1 2001-07-30 07:36:03 ivan Exp $
-#
-# ivan@sisd.com 97-dec-10
-#
-# Changes to allow page to work at a relative position in server
-# Changes to make "Packages" display 2-wide in table (old way was too vertical)
-#	bmccane@maxbaud.net 98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: agent_type.cgi,v $
-# Revision 1.1  2001-07-30 07:36:03  ivan
-# templates!!!
-#
-# Revision 1.8  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.7  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.6  1999/04/07 11:10:46  ivan
-# harmless typo
-#
-# Revision 1.5  1999/01/19 05:13:25  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:15  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 05:25:17  ivan
-# fix visual and other bugs
-#
-# Revision 1.2  1998/11/21 07:39:52  ivan
-# visual
-#
+#<!-- $Id: agent_type.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $agent_type );
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 1d51f8145..ef6a44620 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,42 +1,5 @@
 <%
-#!/usr/bin/perl -Tw
-#
-# $Id: part_pkg.cgi,v 1.1 2001-07-30 07:36:03 ivan Exp $
-#
-# ivan@sisd.com 97-dec-5,9
-#
-# Changes to allow page to work at a relative position in server
-#	bmccane@maxbaud.net	98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: part_pkg.cgi,v $
-# Revision 1.1  2001-07-30 07:36:03  ivan
-# templates!!!
-#
-# Revision 1.8  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.7  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.6  1999/01/19 05:13:27  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:17  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1998/12/17 05:25:19  ivan
-# fix visual and other bugs
-#
-# Revision 1.3  1998/11/21 07:23:45  ivan
-# visual
-#
-# Revision 1.2  1998/11/21 07:00:32  ivan
-# visual
-#
+#<!-- $Id: part_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $part_pkg );
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index 408d63003..8c2e26321 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -1,44 +1,5 @@
 <%
-#
-# $Id: part_referral.cgi,v 1.1 2001-07-30 07:36:03 ivan Exp $
-#
-# ivan@sisd.com 98-feb-23 
-#
-# Changes to allow page to work at a relative position in server
-#	bmccane@maxbaud.net	98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: part_referral.cgi,v $
-# Revision 1.1  2001-07-30 07:36:03  ivan
-# templates!!!
-#
-# Revision 1.9  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.8  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.7  1999/01/19 05:13:28  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.6  1999/01/18 09:41:18  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.5  1998/12/17 05:25:20  ivan
-# fix visual and other bugs
-#
-# Revision 1.4  1998/12/17 04:32:55  ivan
-# print $cgi->header
-#
-# Revision 1.3  1998/12/17 04:31:36  ivan
-# use CGI::Carp
-#
-# Revision 1.2  1998/12/17 04:26:04  ivan
-# use CGI; no relative URLs
-#
+#<!-- $Id: part_referral.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $part_referral );
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index 05f8a3031..76baf8883 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -1,41 +1,5 @@
 <%
-#
-# $Id: svc_acct_pop.cgi,v 1.1 2001-07-30 07:36:03 ivan Exp $
-#
-# ivan@sisd.com 98-mar-8
-#
-# Changes to allow page to work at a relative position in server
-#	bmccane@maxbaud.net	98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: svc_acct_pop.cgi,v $
-# Revision 1.1  2001-07-30 07:36:03  ivan
-# templates!!!
-#
-# Revision 1.8  2000/01/28 22:56:13  ivan
-# track full phone number
-#
-# Revision 1.7  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.6  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.5  1999/01/19 05:13:30  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:20  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 05:25:22  ivan
-# fix visual and other bugs
-#
-# Revision 1.2  1998/12/17 04:36:59  ivan
-# use CGI;, use CGI::Carp, visual changes, relative URLs
-#
+#<!-- $Id: svc_acct_pop.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $svc_acct_pop );
diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index b4508da81..701715fe5 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,39 +1,5 @@
 <%
-#
-# $Id: agent.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 97-dec-12
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'type' to 'atype' because Pg6.3 reserves the type word
-#	bmccane@maxbaud.net	98-apr-3
-#
-# use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
-#
-# $Log: agent.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  1999/04/07 11:27:50  ivan
-# avoid perl's silly arguement not numeric error
-#
-# Revision 1.6  1999/01/25 12:09:50  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:31  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:21  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 06:16:57  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.2  1998/11/23 07:52:08  ivan
-# *** empty log message ***
-#
+#<!-- $Id: agent.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $agent $action $hashref $p $agent_type );
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 317fd60bc..4f1ad8b20 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,54 +1,5 @@
 <%
-#
-# $Id: agent_type.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# agent_type.cgi: Add/Edit agent type (output form)
-#
-# ivan@sisd.com 97-dec-10
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'type' to 'atype' because Pg6.3 reserves the type word
-#	bmccane@maxbaud.net	98-apr-3
-#
-# use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
-#
-# $Log: agent_type.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.11  1999/04/07 11:19:21  ivan
-# silly HTML typo
-#
-# Revision 1.10  1999/01/25 12:09:51  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.9  1999/01/19 05:13:32  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.8  1999/01/18 09:41:22  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.7  1999/01/18 09:22:29  ivan
-# changes to track email addresses for email invoicing
-#
-# Revision 1.6  1998/12/17 06:16:58  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.5  1998/11/21 07:58:27  ivan
-# package names link to them
-#
-# Revision 1.4  1998/11/21 07:45:19  ivan
-# visual, use FS::table_name when doing qsearch('table_name')
-#
-# Revision 1.3  1998/11/15 11:20:12  ivan
-# s/CGI-Base/CGI.pm/ causes s/QUERY_STRING/keywords/;
-#
-# Revision 1.2  1998/11/13 09:56:46  ivan
-# change configuration file layout to support multiple distinct databases (with
-# own set of config files, export, etc.)
-#
+#<!-- $Id: agent_type.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $agent_type $action $hashref $p $part_pkg );
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index d3d0dc15f..a95636662 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,51 +1,5 @@
 <%
-#
-# $Id: cust_credit.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: cust_credit.cgi custnum [ -paybatch ]
-#        http://server.name/path/cust_credit?custnum [ -paybatch ]
-#
-# some hooks in here for modifications as well as additions, but needs (lots) more work.
-# also see process/cust_credit.cgi, the script that processes the form.
-#
-# ivan@voicenet.com 96-dec-05
-#
-# paybatch field, differentiates between credits & credits+refunds by commandline
-# ivan@voicenet.com 96-dec-08
-#
-# added (but commented out) sprintf("%.2f" in amount field.  Hmm.
-# ivan@voicenet.com 97-jan-3
-#
-# paybatch stuff thrown out - has checkbox now instead.  
-# (well, sort of.  still passed around for backward compatability and possible editing hook)
-# ivan@voicenet.com 97-apr-21
-#
-# rewrite ivan@sisd.com 98-mar-16
-#
-# $Log: cust_credit.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  1999/02/28 00:03:33  ivan
-# removed misleading comments
-#
-# Revision 1.6  1999/01/25 12:09:52  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:33  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:23  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/23 02:26:06  ivan
-# *** empty log message ***
-#
-# Revision 1.2  1998/12/17 06:16:59  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
+#<!-- $Id: cust_credit.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $otaker $p1 $crednum $_date $amount $reason );
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index a7b0998df..6b422cca6 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,35 +1,5 @@
 <%
-#
-# $Id: cust_main_county-expand.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 97-dec-16
-#
-# Changes to allow page to work at a relative position in server
-#	bmccane@maxbaud.net	98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: cust_main_county-expand.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  1999/01/25 12:09:54  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:35  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:25  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 06:17:01  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.2  1998/11/18 09:01:38  ivan
-# i18n! i18n!
-#
+#<!-- $Id: cust_main_county-expand.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $taxnum $cust_main_county $p1 $delim $expansion );
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index 1b8e76fc7..6be349bc4 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -1,48 +1,5 @@
 <%
-#
-# $Id: cust_main_county.cgi,v 1.2 2001-08-17 11:05:31 ivan Exp $
-#
-# ivan@sisd.com 97-dec-13-16
-#
-# Changes to allow page to work at a relative position in server
-# Changed tax field to accept 6 chars (MO uses 6.1%)
-#	bmccane@maxbaud.net	98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-# 
-# $Log: cust_main_county.cgi,v $
-# Revision 1.2  2001-08-17 11:05:31  ivan
-# clean up tax rate editing:
-#   sort by country->state->county,
-#   add "collapse state" if the tax rates are the same statewide,
-#   redirect "expand state" to the browse, not edit screen
-#
-# Revision 1.1  2001/07/30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.8  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.7  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.6  1999/01/25 12:09:55  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:36  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:26  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 06:17:02  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.2  1998/11/18 09:01:39  ivan
-# i18n! i18n!
-#
+#<!-- $Id: cust_main_county.cgi,v 1.3 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $cust_main_county );
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 33320648c..d1823d4b3 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,37 +1,5 @@
 <%
-#
-# $Id: cust_pay.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: cust_pay.cgi invnum
-#        http://server.name/path/cust_pay.cgi?invnum
-#
-# some hooks for modifications as well as additions, but needs work.
-#
-# ivan@voicenet.com 96-dec-11
-#
-# rewrite ivan@sisd.com 98-mar-16
-#
-# $Log: cust_pay.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  1999/02/28 00:03:35  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/01/25 12:09:56  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.4  1999/01/19 05:13:37  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 09:41:27  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.2  1998/12/17 06:17:03  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
+#<!-- $Id: cust_pay.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $invnum $p1 $_date $payby $payinfo $paid );
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index 637023703..729fc7c98 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -1,56 +1,5 @@
 <%
-#
-# $Id: cust_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# this is for changing packages around, not editing things within the package
-#
-# Usage: cust_pkg.cgi custnum
-#        http://server.name/path/cust_pkg.cgi?custnum
-#
-# started with /sales/add/cust_pkg.cgi, which added packages
-# ivan@voicenet.com 97-jan-5, 97-mar-21
-#
-# Rewrote for new API
-# ivan@voicenet.com 97-jul-7
-#
-# FS::Search is no more, &cgisuidsetup needs $cgi, ivan@sisd.com 98-mar-7 
-#
-# Changes to allow page to work at a relative position in server
-# Changed to display packages 2-wide in a table
-#       bmccane@maxbaud.net     98-apr-3
-#
-# fixed a pretty cool bug from above which caused a visual glitch ivan@sisd.com
-# 98-jun-1
-#
-# $Log: cust_pkg.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.8  1999/07/21 07:34:13  ivan
-# links to package browse and agent type edit if there aren't any packages to
-# order.  thanks to "Tech Account" <techy@orac.hq.org>
-#
-# Revision 1.7  1999/04/14 01:03:01  ivan
-# oops, in 1.2 tree, can't do searches until [cgi|admin]suidsetup,
-# bug is hidden by mod_perl persistance
-#
-# Revision 1.6  1999/02/28 00:03:36  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/02/07 09:59:18  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:13:38  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 09:41:28  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.2  1998/12/17 06:17:04  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
+#<!-- $Id: cust_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi %pkg %comment $custnum $p1 @cust_pkg 
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 002d54139..4813fdf8b 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,47 +1,5 @@
 <%
-#
-# $Id: part_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# part_pkg.cgi: Add/Edit package (output form)
-#
-# ivan@sisd.com 97-dec-10
-#
-# Changes to allow page to work at a relative position in server
-# Changed to display services 2-wide in table
-#       bmccane@maxbaud.net     98-apr-3
-#
-# use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
-#
-# $Log: part_pkg.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.9  1999/02/07 09:59:19  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.8  1999/01/19 05:13:39  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.7  1999/01/18 09:41:29  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.6  1998/12/17 06:17:05  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.5  1998/11/21 07:12:26  ivan
-# *** empty log message ***
-#
-# Revision 1.4  1998/11/21 07:11:08  ivan
-# *** empty log message ***
-#
-# Revision 1.3  1998/11/21 07:07:40  ivan
-# popurl, bugfix
-#
-# Revision 1.2  1998/11/15 13:14:55  ivan
-# first pass as per-user custom pricing
-#
+#<!-- $Id: part_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $part_pkg $action $query $hashref $part_svc $count );
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index e7d76f7e4..9ed8977cd 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -1,37 +1,5 @@
 <%
-#
-# $Id: part_referral.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 98-feb-23
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# confisuing typo on submit button ivan@sisd.com 98-jun-14
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: part_referral.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  1999/04/07 11:43:23  ivan
-# pick up errors right away, leave input
-#
-# Revision 1.5  1999/02/07 09:59:20  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:13:41  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 09:41:30  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.2  1998/12/17 06:17:06  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
+#<!-- $Id: part_referral.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $part_referral $action $hashref $p1 $query );
diff --git a/httemplate/edit/process/agent.cgi b/httemplate/edit/process/agent.cgi
index 2b4991363..b93df48d1 100755
--- a/httemplate/edit/process/agent.cgi
+++ b/httemplate/edit/process/agent.cgi
@@ -1,37 +1,5 @@
 <%
-#
-# $Id: agent.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 97-dec-12
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: agent.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  1999/01/25 12:09:57  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.6  1999/01/19 05:13:47  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 22:47:49  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.4  1998/12/30 23:03:26  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.3  1998/12/17 08:40:16  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.2  1998/11/23 07:52:29  ivan
-# *** empty log message ***
-#
+#<!-- $Id: agent.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $agentnum $old $new $error );
diff --git a/httemplate/edit/process/agent_type.cgi b/httemplate/edit/process/agent_type.cgi
index 5c6b2b8e0..37a382e62 100755
--- a/httemplate/edit/process/agent_type.cgi
+++ b/httemplate/edit/process/agent_type.cgi
@@ -1,37 +1,5 @@
 <%
-#
-# $Id: agent_type.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 97-dec-11
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: agent_type.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  1999/01/25 12:09:58  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.6  1999/01/19 05:13:48  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 22:47:50  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.4  1998/12/30 23:03:27  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.3  1998/12/17 08:40:17  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.2  1998/11/21 07:49:20  ivan
-# s/CGI::Request/CGI.pm/
-#
+#<!-- $Id: agent_type.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $typenum $old $new $error $part_pkg );
diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
index 3cacab26e..b52d0bd46 100755
--- a/httemplate/edit/process/cust_credit.cgi
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -1,47 +1,5 @@
 <%
-#
-# $Id: cust_credit.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/cust_credit.cgi
-#
-# ivan@voicenet.com 96-dec-05 -> 96-dec-08
-#
-# post a refund if $new_paybatch
-# ivan@voicenet.com 96-dec-08
-#
-# refunds are no longer applied against a specific payment (paybatch)
-# paybatch field removed
-# ivan@voicenet.com 97-apr-22
-#
-# rewrite ivan@sisd.com 98-mar-16
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cust_credit.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  1999/04/07 15:23:05  ivan
-# don't use anchor in redirect
-#
-# Revision 1.6  1999/02/28 00:03:41  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/01/25 12:09:59  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.4  1999/01/19 05:13:49  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 22:47:51  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.2  1998/12/17 08:40:18  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
+#<!-- $Id: cust_credit.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $custnum $new $error );
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
index 1ff2047f1..158a0d09e 100755
--- a/httemplate/edit/process/cust_main_county.cgi
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -1,34 +1,5 @@
 <%
-#
-# $Id: cust_main_county.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 97-dec-16
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: cust_main_county.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  1999/01/25 12:19:08  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:52  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 22:47:53  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.3  1998/12/17 08:40:21  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.2  1998/11/18 09:01:41  ivan
-# i18n! i18n!
-#
+#<!-- $Id: cust_main_county.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi );
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index f21ff490a..fcdc233b9 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,40 +1,5 @@
 <%
-#
-# $Id: cust_pay.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/cust_pay.cgi
-#
-# ivan@voicenet.com 96-dec-11
-#
-# rewrite ivan@sisd.com 98-mar-16
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cust_pay.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  1999/02/28 00:03:43  ivan
-# removed misleading comments
-#
-# Revision 1.6  1999/01/25 12:19:09  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:53  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 22:47:54  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.3  1998/12/30 23:03:28  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.2  1998/12/17 08:40:22  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
+#<!-- $Id: cust_pay.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $invnum $new $error );
diff --git a/httemplate/edit/process/cust_pkg.cgi b/httemplate/edit/process/cust_pkg.cgi
index 0074466c8..ecaec9bcb 100755
--- a/httemplate/edit/process/cust_pkg.cgi
+++ b/httemplate/edit/process/cust_pkg.cgi
@@ -1,43 +1,5 @@
 <%
-#
-# $Id: cust_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# this is for changing packages around, not for editing things within the
-# package
-#
-# Usage: post form to:
-#        http://server.name/path/cust_pkg.cgi
-#
-# ivan@voicenet.com 97-mar-21 - 97-mar-24
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-7 - 15
-#
-# &cgisuidsetup($cgi) ivan@sisd.com 98-mar-7
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cust_pkg.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  1999/04/07 15:24:06  ivan
-# don't use anchor in redirect
-#
-# Revision 1.6  1999/02/28 00:03:44  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/02/07 09:59:26  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.3  1999/01/19 05:13:54  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.2  1998/12/17 08:40:23  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
+#<!-- $Id: cust_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $custnum @remove_pkgnums @pkgparts $pkgpart $error );
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 3e1c07d1e..5850599c8 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,50 +1,5 @@
 <%
-#
-# $Id: part_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# process/part_pkg.cgi: Edit package definitions (process form)
-#
-# ivan@sisd.com 97-dec-10
-#
-# don't update non-changing records in part_svc (causing harmless but annoying
-# "Records identical" errors). ivan@sisd.com 98-feb-19
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# Added `|| 0 ' when getting quantity off web page ivan@sisd.com 98-jun-4
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: part_pkg.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.9  2001/04/09 23:05:16  ivan
-# Transactions Part I!!!
-#
-# Revision 1.8  1999/02/07 09:59:27  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.7  1999/01/19 05:13:55  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.6  1999/01/18 22:47:56  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.5  1998/12/30 23:03:29  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.4  1998/12/17 08:40:24  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.3  1998/11/21 07:17:58  ivan
-# bugfix to work for regular aswell as custom pricing
-#
-# Revision 1.2  1998/11/15 13:16:15  ivan
-# first pass as per-user custom pricing
-#
+#<!-- $Id: part_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $pkgpart $old $new $part_svc $error $dbh );
diff --git a/httemplate/edit/process/part_referral.cgi b/httemplate/edit/process/part_referral.cgi
index c79ebb608..ff94e3955 100755
--- a/httemplate/edit/process/part_referral.cgi
+++ b/httemplate/edit/process/part_referral.cgi
@@ -1,34 +1,5 @@
 <%
-#
-# $Id: part_referral.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 98-feb-23
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: part_referral.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  1999/02/07 09:59:28  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.5  1999/01/19 05:13:56  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 22:47:57  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.3  1998/12/30 23:03:30  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.2  1998/12/17 08:40:25  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
+#<!-- $Id: part_referral.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $refnum $new $error );
diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi
index e895e5ddf..c500016e2 100755
--- a/httemplate/edit/process/svc_acct.cgi
+++ b/httemplate/edit/process/svc_acct.cgi
@@ -1,48 +1,5 @@
 <%
-#
-# $Id: svc_acct.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_acct.cgi
-#
-# ivan@voicenet.com 96-dec-18
-#
-# Changed /u to /u2
-# ivan@voicenet.com 97-may-6
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-17 - 21
-#
-# no FS::Search, FS::svc_acct creates FS::cust_svc record, used for adding
-# and editing ivan@sisd.com 98-mar-8
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'password' to '_password' because Pg6.3 reserves the password word
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: svc_acct.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  1999/08/27 00:26:33  ivan
-# better error messages
-#
-# Revision 1.6  1999/02/28 00:03:45  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/02/07 09:59:30  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:13:58  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 22:47:59  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.2  1998/12/17 08:40:27  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
+#<!-- $Id: svc_acct.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $svcnum $old $new $error );
diff --git a/httemplate/edit/process/svc_acct_pop.cgi b/httemplate/edit/process/svc_acct_pop.cgi
index 95415f201..2b870dc48 100755
--- a/httemplate/edit/process/svc_acct_pop.cgi
+++ b/httemplate/edit/process/svc_acct_pop.cgi
@@ -1,34 +1,5 @@
 <%
-#
-# $Id: svc_acct_pop.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 98-mar-8
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: svc_acct_pop.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  1999/02/07 09:59:31  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.5  1999/01/19 05:13:59  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 22:48:00  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.3  1998/12/30 23:03:32  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.2  1998/12/17 08:40:28  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
+#<!-- $Id: svc_acct_pop.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $popnum $old $new $error );
diff --git a/httemplate/edit/process/svc_acct_sm.cgi b/httemplate/edit/process/svc_acct_sm.cgi
index a68478898..10afcc1f9 100755
--- a/httemplate/edit/process/svc_acct_sm.cgi
+++ b/httemplate/edit/process/svc_acct_sm.cgi
@@ -1,46 +1,5 @@
 <%
-#
-# $Id: svc_acct_sm.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_acct_sm.cgi
-#
-# lots of crufty stuff from svc_acct still in here, and modifications are (unelegantly) disabled.
-#
-# ivan@voicenet.com 97-jan-6
-#
-# enabled modifications
-# 
-# ivan@voicenet.com 97-may-7
-#
-# fixed removal of cust_svc record on modifications!
-# ivan@voicenet.com 97-jun-5
-#
-# rewrite ivan@sisd.com 98-mar-15
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: svc_acct_sm.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  1999/02/28 00:03:46  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/02/07 09:59:32  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:14:00  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 22:48:01  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.2  1998/12/17 08:40:29  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
+#<!-- $Id: svc_acct_sm.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $svcnum $old $new $error );
diff --git a/httemplate/edit/process/svc_domain.cgi b/httemplate/edit/process/svc_domain.cgi
index 59a0c078f..e52b68a15 100755
--- a/httemplate/edit/process/svc_domain.cgi
+++ b/httemplate/edit/process/svc_domain.cgi
@@ -1,46 +1,5 @@
 <%
-#
-# $Id: svc_domain.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_domain.cgi
-#
-# lots of yucky stuff in this one... bleachlkjhui!
-#
-# ivan@voicenet.com 97-jan-6
-#
-# kludged for new domain template 3.5
-# ivan@voicenet.com 97-jul-24
-#
-# moved internic bits to svc_domain.pm ivan@sisd.com 98-mar-14
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: svc_domain.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  2001/04/23 07:12:44  ivan
-# better error message (if kludgy) for no referral
-# remove outdated NSI foo from domain ordering.  also, fuck NSI.
-#
-# Revision 1.6  1999/02/28 00:03:47  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/02/07 09:59:33  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:14:01  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 22:48:02  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.2  1998/12/17 08:40:30  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
+#<!-- $Id: svc_domain.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $svcnum $new $error );
diff --git a/httemplate/edit/process/svc_forward.cgi b/httemplate/edit/process/svc_forward.cgi
index bce70a140..b013bd15f 100755
--- a/httemplate/edit/process/svc_forward.cgi
+++ b/httemplate/edit/process/svc_forward.cgi
@@ -1,15 +1,5 @@
 <%
-#
-# $Id: svc_forward.cgi,v 1.1 2001-08-19 15:53:35 jeff Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_forward.cgi
-#
-# $Log: svc_forward.cgi,v $
-# Revision 1.1  2001-08-19 15:53:35  jeff
-# added user interface for svc_forward and vpopmail support
-#
-#
+#<!-- $Id: svc_forward.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $svcnum $old $new $error );
diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
index 016031f83..5f1d15e26 100755
--- a/httemplate/edit/svc_acct_pop.cgi
+++ b/httemplate/edit/svc_acct_pop.cgi
@@ -1,45 +1,5 @@
 <%
-#
-# $Id: svc_acct_pop.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 98-mar-8 
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: svc_acct_pop.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.9  2000/01/28 23:02:48  ivan
-# track full phone number
-#
-# Revision 1.8  1999/02/23 08:09:23  ivan
-# beginnings of one-screen new customer entry and some other miscellania
-#
-# Revision 1.7  1999/02/07 09:59:23  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.6  1999/01/19 05:13:44  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:33  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1998/12/23 02:57:45  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.3  1998/12/17 06:17:10  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.2  1998/11/13 09:56:47  ivan
-# change configuration file layout to support multiple distinct databases (with
-# own set of config files, export, etc.)
-#
+#<!-- $Id: svc_acct_pop.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $svc_acct_pop $action $query $hashref $p1 );
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index 891c3e1f6..34846f9f3 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,67 +1,5 @@
 <%
-#
-# $Id: svc_acct_sm.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: svc_acct_sm.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
-#        http://server.name/path/svc_acct_sm.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
-#
-# use {svcnum} for edit, pkgnum{pkgnum}-svcpart{svcpart} for add
-#
-# should error out in a more CGI-friendly way, and should have more error checking (sigh).
-#
-# ivan@voicenet.com 97-jan-5
-#
-# added debugging code; fixed CPU-sucking problem with trying to edit an (unaudited) mail alias (no pkgnum)
-#
-# ivan@voicenet.com 97-may-7
-#
-# fixed uid selection
-# ivan@voicenet.com 97-jun-4
-#
-# uid selection across _CUSTOMER_, not just _PACKAGE_
-#
-# ( i need to be rewritten with fast searches)
-#
-# ivan@voicenet.com 97-oct-3
-#
-# added fast searches in some of the places where it is sorely needed...
-# I see DBI::mysql in your future...
-# ivan@voicenet.com 97-oct-23
-#
-# rewrite ivan@sisd.com 98-mar-15
-#
-# /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-26
-#
-# $Log: svc_acct_sm.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.9  1999/02/28 00:03:38  ivan
-# removed misleading comments
-#
-# Revision 1.8  1999/02/07 09:59:24  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.7  1999/01/19 05:13:45  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.6  1999/01/18 09:41:34  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.5  1998/12/30 23:03:24  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.4  1998/12/23 02:58:45  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.3  1998/12/17 06:17:11  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.2  1998/12/16 05:19:15  ivan
-# use FS::Conf
-#
+#<!-- $Id: svc_acct_sm.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index dd8ad8532..8ffc9d789 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,54 +1,5 @@
 <%
-#
-# $Id: svc_domain.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: svc_domain.cgi pkgnum{pkgnum}-svcpart{svcpart}
-#        http://server.name/path/svc_domain.cgi?pkgnum{pkgnum}-svcpart{svcpart}
-#
-# ivan@voicenet.com 97-jan-5 -> 97-jan-6
-#
-# changes for domain template 3.5
-# ivan@voicenet.com 97-jul-24
-#
-# rewrite ivan@sisd.com 98-mar-14
-#
-# no GOV in instructions ivan@sisd.com 98-jul-17
-#
-# $Log: svc_domain.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.10  2001/04/23 07:12:44  ivan
-# better error message (if kludgy) for no referral
-# remove outdated NSI foo from domain ordering.  also, fuck NSI.
-#
-# Revision 1.9  1999/02/28 00:03:39  ivan
-# removed misleading comments
-#
-# Revision 1.8  1999/02/07 09:59:25  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.7  1999/01/19 05:13:46  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.6  1999/01/18 09:41:35  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.5  1998/12/30 23:03:25  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.4  1998/12/23 03:00:16  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.3  1998/12/17 06:17:12  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.2  1998/11/13 09:56:48  ivan
-# change configuration file layout to support multiple distinct databases (with
-# own set of config files, export, etc.)
-#
+#<!-- $Id: svc_domain.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $action $svcnum $svc_domain $pkgnum $svcpart $part_svc
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index f1aa1c628..86e2e9547 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,19 +1,5 @@
 <%
-#
-# $Id: svc_forward.cgi,v 1.1 2001-08-19 15:53:35 jeff Exp $
-#
-# Usage: svc_forward.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
-#        http://server.name/path/svc_forward.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
-#
-# use {svcnum} for edit, pkgnum{pkgnum}-svcpart{svcpart} for add
-#
-# should error out in a more CGI-friendly way, and should have more error checking (sigh).
-#
-# $Log: svc_forward.cgi,v $
-# Revision 1.1  2001-08-19 15:53:35  jeff
-# added user interface for svc_forward and vpopmail support
-#
-#
+# <!-- $Id: svc_forward.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_forward $pkgnum $svcpart
diff --git a/httemplate/misc/bill.cgi b/httemplate/misc/bill.cgi
index d09fc45dc..cc7938308 100755
--- a/httemplate/misc/bill.cgi
+++ b/httemplate/misc/bill.cgi
@@ -1,29 +1,5 @@
 <%
-#
-# $Id: bill.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# s/FS:Search/FS::Record/ and cgisuidsetup($cgi) ivan@sisd.com 98-mar-13
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: bill.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.5  1999/08/12 04:32:21  ivan
-# hidecancelledcustomers
-#
-# Revision 1.4  1999/01/19 05:14:02  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1998/12/23 03:01:13  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:12:41  ivan
-# s/CGI::(Request|Base)/CGI.pm/;
-#
+#<!-- $Id: bill.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $cust_main $error );
diff --git a/httemplate/misc/cancel-unaudited.cgi b/httemplate/misc/cancel-unaudited.cgi
index 5bad5e737..9b90967d9 100755
--- a/httemplate/misc/cancel-unaudited.cgi
+++ b/httemplate/misc/cancel-unaudited.cgi
@@ -1,46 +1,5 @@
 <%
-#
-# $Id: cancel-unaudited.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: cancel-unaudited.cgi svcnum
-#        http://server.name/path/cancel-unaudited.cgi pkgnum
-#
-# ivan@voicenet.com 97-apr-23
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-21
-#
-# Search->Record, cgisuidsetup($cgi) ivan@sids.com 98-mar-19
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cancel-unaudited.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.8  2001/04/09 23:05:16  ivan
-# Transactions Part I!!!
-#
-# Revision 1.7  2000/06/15 12:30:37  ivan
-# bugfix from Jeff Finucane, thanks!
-#
-# Revision 1.6  1999/02/28 00:03:48  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/02/07 09:59:34  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:14:03  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1998/12/23 03:02:05  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:12:42  ivan
-# s/CGI::(Request|Base)/CGI.pm/;
-#
+#<!-- $Id: cancel-unaudited.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $svcnum $svc_acct $cust_svc $error $dbh );
diff --git a/httemplate/misc/cancel_pkg.cgi b/httemplate/misc/cancel_pkg.cgi
index 99a09bbe3..8129463ae 100755
--- a/httemplate/misc/cancel_pkg.cgi
+++ b/httemplate/misc/cancel_pkg.cgi
@@ -1,51 +1,5 @@
 <%
-#
-# $Id: cancel_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: cancel_pkg.cgi pkgnum
-#        http://server.name/path/cancel_pkg.cgi pkgnum
-#
-# IT DOESN'T RUN THE APPROPRIATE PROGRAMS YET!!!!
-#
-# probably should generalize this to do cancels, suspensions, unsuspensions, etc.
-#
-# ivan@voicenet.com 97-jan-2
-#
-# still kludgy, but now runs /dbin/cancel $pkgnum
-# ivan@voicenet.com 97-feb-27
-#
-# doesn't run if pkgnum doesn't match regex
-# ivan@voicenet.com 97-mar-6
-#
-# now redirects to enter comments
-# ivan@voicenet.com 97-may-8
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-21
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cancel_pkg.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  1999/04/08 10:35:02  ivan
-# import necessary subroutines from FS::CGI
-#
-# Revision 1.5  1999/02/28 00:03:49  ivan
-# removed misleading comments
-#
-# Revision 1.4  1999/01/19 05:14:04  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1998/12/23 03:02:54  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:12:43  ivan
-# s/CGI::(Request|Base)/CGI.pm/;
-#
+#<!-- $Id: cancel_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $pkgnum $cust_pkg $error );
diff --git a/httemplate/misc/catchall.cgi b/httemplate/misc/catchall.cgi
index 79b72565b..9ebec6688 100755
--- a/httemplate/misc/catchall.cgi
+++ b/httemplate/misc/catchall.cgi
@@ -1,15 +1,5 @@
 <%
-#
-# $Id: catchall.cgi,v 1.1 2001-08-19 15:53:35 jeff Exp $
-#
-# Usage: catchall.cgi {svcnum}
-#        http://server.name/path/catchall.cgi? {svcnum}
-#
-# $Log: catchall.cgi,v $
-# Revision 1.1  2001-08-19 15:53:35  jeff
-# added user interface for svc_forward and vpopmail support
-#
-#
+#<!-- $Id: catchall.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $action $svcnum $svc_domain $pkgnum $svcpart
diff --git a/httemplate/misc/delete-customer.cgi b/httemplate/misc/delete-customer.cgi
index e1bcb8994..3a7330960 100755
--- a/httemplate/misc/delete-customer.cgi
+++ b/httemplate/misc/delete-customer.cgi
@@ -1,17 +1,5 @@
 <%
-#
-# $Id: delete-customer.cgi,v 1.2 2001-08-11 04:15:14 ivan Exp $
-#
-# $Log: delete-customer.cgi,v $
-# Revision 1.2  2001-08-11 04:15:14  ivan
-# better docs
-#
-# Revision 1.1  2001/07/30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.1  1999/04/15 16:44:36  ivan
-# delete customers
-#
+#<!-- $Id: delete-customer.cgi,v 1.3 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $conf $query $custnum $new_custnum $cust_main );
diff --git a/httemplate/misc/expire_pkg.cgi b/httemplate/misc/expire_pkg.cgi
index 7afa94267..21e220d18 100755
--- a/httemplate/misc/expire_pkg.cgi
+++ b/httemplate/misc/expire_pkg.cgi
@@ -1,32 +1,5 @@
 <%
-#
-# $Id: expire_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/expire_pkg.cgi
-#
-# based on susp_pkg
-# ivan@voicenet.com 97-jul-29
-#
-# ivan@sisd.com 98-mar-17 FS::Search->FS::Record
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-# 
-# $Log: expire_pkg.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.4  1999/02/28 00:03:50  ivan
-# removed misleading comments
-#
-# Revision 1.3  1999/01/19 05:14:05  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.2  1998/12/17 09:12:44  ivan
-# s/CGI::(Request|Base)/CGI.pm/;
-#
+#<!-- $Id: expire_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $date $pkgnum $cust_pkg %hash $new $error );
diff --git a/httemplate/misc/link.cgi b/httemplate/misc/link.cgi
index fee02ddb7..f4b70f76a 100755
--- a/httemplate/misc/link.cgi
+++ b/httemplate/misc/link.cgi
@@ -1,37 +1,5 @@
 <%
-#
-# $Id: link.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@voicenet.com 97-feb-5
-#
-# rewrite ivan@sisd.com 98-mar-17
-#
-# can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
-#
-# $Log: link.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  1999/04/08 11:31:40  ivan
-# *** empty log message ***
-#
-# Revision 1.6  1999/02/28 00:03:51  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/01/19 05:14:06  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:36  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/23 03:03:39  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:12:45  ivan
-# s/CGI::(Request|Base)/CGI.pm/;
-#
+#<!-- $Id: link.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( %link_field $cgi $pkgnum $svcpart $query $part_svc $svc $svcdb 
diff --git a/httemplate/misc/print-invoice.cgi b/httemplate/misc/print-invoice.cgi
index 1d35bc0f2..a6cb05230 100755
--- a/httemplate/misc/print-invoice.cgi
+++ b/httemplate/misc/print-invoice.cgi
@@ -1,24 +1,5 @@
 <%
-#
-# $Id: print-invoice.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# just a kludge for now, since this duplicates in a way it shouldn't stuff from
-# Bill.pm (like $lpr) ivan@sisd.com 98-jun-16
-#
-# $Log: print-invoice.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.4  1999/01/19 05:14:07  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1998/12/23 03:04:24  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:12:47  ivan
-# s/CGI::(Request|Base)/CGI.pm/;
-#
+#<!-- $Id: print-invoice.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw($conf $cgi $lpr $query $invnum $cust_bill $custnum );
diff --git a/httemplate/misc/process/catchall.cgi b/httemplate/misc/process/catchall.cgi
index 0d84d7c4e..6b1147633 100755
--- a/httemplate/misc/process/catchall.cgi
+++ b/httemplate/misc/process/catchall.cgi
@@ -1,15 +1,5 @@
 <%
-#
-# $Id: catchall.cgi,v 1.1 2001-08-19 15:53:35 jeff Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/catchall.cgi
-#
-# $Log: catchall.cgi,v $
-# Revision 1.1  2001-08-19 15:53:35  jeff
-# added user interface for svc_forward and vpopmail support
-#
-#
+#<!--$Id: catchall.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $svcnum $old $new $error );
diff --git a/httemplate/misc/process/delete-customer.cgi b/httemplate/misc/process/delete-customer.cgi
index b15ffef17..4be52004b 100755
--- a/httemplate/misc/process/delete-customer.cgi
+++ b/httemplate/misc/process/delete-customer.cgi
@@ -1,14 +1,5 @@
 <%
-#
-# $Id: delete-customer.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# $Log: delete-customer.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.1  1999/04/15 16:44:36  ivan
-# delete customers
-#
+#<!-- $Id: delete-customer.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $conf $custnum $new_custnum $cust_main $error );
diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
index 94afa289a..6b34e8a5d 100755
--- a/httemplate/misc/process/link.cgi
+++ b/httemplate/misc/process/link.cgi
@@ -1,36 +1,5 @@
 <%
-#
-# $Id: link.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@voicenet.com 97-feb-5
-#
-# rewrite ivan@sisd.com 98-mar-18
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
-#
-# $Log: link.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  2000/07/17 17:59:33  ivan
-# oops
-#
-# Revision 1.5  1999/04/15 14:09:17  ivan
-# get rid of top-level my() variables
-#
-# Revision 1.4  1999/02/07 09:59:35  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.3  1999/01/19 05:14:10  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.2  1998/12/17 09:15:00  ivan
-# s/CGI::Request/CGI.pm/;
-#
+#<!-- $Id: link.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $old $new $error $pkgnum $svcpart $svcnum );
diff --git a/httemplate/misc/susp_pkg.cgi b/httemplate/misc/susp_pkg.cgi
index 52e3ce788..602314436 100755
--- a/httemplate/misc/susp_pkg.cgi
+++ b/httemplate/misc/susp_pkg.cgi
@@ -1,45 +1,5 @@
 <%
-#
-# $Id: susp_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: susp_pkg.cgi pkgnum
-#        http://server.name/path/susp_pkg.cgi pkgnum
-#
-# probably should generalize this to do cancels, suspensions, unsuspensions, etc.
-#
-# ivan@voicenet.com 97-feb-27
-#
-# now redirects to enter comments
-# ivan@voicenet.com 97-may-8
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-21
-#
-# FS::Search -> FS::Record ivan@sisd.com 98-mar-17
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: susp_pkg.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  1999/04/08 10:35:02  ivan
-# import necessary subroutines from FS::CGI
-#
-# Revision 1.5  1999/02/28 00:03:52  ivan
-# removed misleading comments
-#
-# Revision 1.4  1999/01/19 05:14:08  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1998/12/23 03:04:56  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:12:48  ivan
-# s/CGI::(Request|Base)/CGI.pm/;
-#
+#<!-- $Id: susp_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $pkgnum $cust_pkg $error );
diff --git a/httemplate/misc/unsusp_pkg.cgi b/httemplate/misc/unsusp_pkg.cgi
index d7d651b6d..8e1b5261b 100755
--- a/httemplate/misc/unsusp_pkg.cgi
+++ b/httemplate/misc/unsusp_pkg.cgi
@@ -1,42 +1,5 @@
 <%
-#
-# $Id: unsusp_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: susp_pkg.cgi pkgnum
-#        http://server.name/path/susp_pkg.cgi pkgnum
-#
-# probably should generalize this to do cancels, suspensions, unsuspensions, etc.
-#
-# ivan@voicenet.com 97-feb-27
-#
-# now redirects to enter comments
-# ivan@voicenet.com 97-may-8
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-21
-#
-# FS::Search -> FS::Record ivan@sisd.com 98-mar-17
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: unsusp_pkg.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.5  1999/02/28 00:03:53  ivan
-# removed misleading comments
-#
-# Revision 1.4  1999/01/19 05:14:09  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1998/12/23 03:05:25  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:12:49  ivan
-# s/CGI::(Request|Base)/CGI.pm/;
-#
+#<!-- $Id: unsusp_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $pkgnum $cust_pkg $error );
diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 5550b5513..a961455be 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -1,37 +1,5 @@
 <%
-#
-# $Id: cust_bill.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/cust_bill.cgi
-#
-# ivan@voicenet.com 97-apr-4
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cust_bill.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  2001/04/22 01:38:39  ivan
-# svc_domain needs to import dbh sub from Record
-# view/cust_main.cgi needs to use ->owed method, not check (depriciated) owed field
-# search/cust_bill.cgi redirect error when there's only one invoice
-#
-# Revision 1.5  2000/07/17 16:45:41  ivan
-# first shot at invoice browsing and some other cleanups
-#
-# Revision 1.4  1999/02/28 00:03:54  ivan
-# removed misleading comments
-#
-# Revision 1.3  1999/01/19 05:14:11  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.2  1998/12/17 09:41:07  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
+#<!-- $Id: cust_bill.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $invnum $query $sortby @cust_bill );
diff --git a/httemplate/search/svc_acct_sm.cgi b/httemplate/search/svc_acct_sm.cgi
index 451e1fd3d..4350c320c 100755
--- a/httemplate/search/svc_acct_sm.cgi
+++ b/httemplate/search/svc_acct_sm.cgi
@@ -1,51 +1,5 @@
 <%
-#
-# $Id: svc_acct_sm.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_domain.cgi
-#
-# ivan@voicenet.com 96-mar-5
-#
-# need to look at table in results to make it more readable
-#
-# ivan@voicenet.com
-#
-# rewrite ivan@sisd.com 98-mar-15
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: svc_acct_sm.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.10  1999/07/20 06:03:36  ivan
-# s/CGI::Request/CGI/; (how'd i miss that before?)
-#
-# Revision 1.9  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.8  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.7  1999/02/28 00:03:56  ivan
-# removed misleading comments
-#
-# Revision 1.6  1999/02/09 09:22:58  ivan
-# visual and bugfixes
-#
-# Revision 1.5  1999/01/19 05:14:16  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:40  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 09:41:11  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
+#<!-- $Id: svc_acct_sm.cgi,v 1.2 2001-08-21 02:31:57 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $domuser $svc_domain $domsvc @svc_acct_sm );
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index 4276976a1..fb386e2cf 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -1,58 +1,5 @@
 <%
-#
-# $Id: svc_domain.cgi,v 1.2 2001-08-19 15:53:36 jeff Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_domain.cgi
-#
-# ivan@voicenet.com 97-mar-5
-#
-# rewrite ivan@sisd.com 98-mar-14
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# display total, use FS::CGI now does browsing too ivan@sisd.com 98-jul-17
-#
-# $Log: svc_domain.cgi,v $
-# Revision 1.2  2001-08-19 15:53:36  jeff
-# added user interface for svc_forward and vpopmail support
-#
-# Revision 1.1  2001/07/30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.11  2000/03/03 18:22:44  ivan
-# changes from 1.2.3 release, fixes from webdemo
-#
-# Revision 1.10  1999/07/17 10:38:52  ivan
-# scott nelson <scott@ultimanet.com> noticed this mod_perl-triggered bug and
-# gave me a great bugreport at the last rhythmethod
-#
-# Revision 1.9  1999/04/15 13:39:16  ivan
-# $cgi->header( '-expires' => 'now' )
-#
-# Revision 1.8  1999/02/28 00:03:57  ivan
-# removed misleading comments
-#
-# Revision 1.7  1999/02/23 08:09:24  ivan
-# beginnings of one-screen new customer entry and some other miscellania
-#
-# Revision 1.6  1999/02/09 09:22:59  ivan
-# visual and bugfixes
-#
-# Revision 1.5  1999/02/07 09:59:39  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:14:17  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1998/12/23 03:06:50  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:41:12  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
+# <!-- $Id: svc_domain.cgi,v 1.3 2001-08-21 02:31:57 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi @svc_domain $sortby $query $conf $mydomain );
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 24d67ddc6..12fe8578a 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,54 +1,5 @@
 <%
-#
-# $Id: cust_bill.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# this is a quick & ugly hack which does little more than add some formatting to the ascii output from /dbin/print-invoice
-#
-# ivan@voicenet.com 96-dec-05
-#
-# added navigation bar
-# ivan@voicenet.com 97-jan-30
-#
-# now uses Invoice.pm
-# ivan@voicenet.com 97-jun-30
-#
-# what to do if cust_bill search errors?
-# ivan@voicenet.com 97-jul-7
-#
-# s/FS::Search/FS::Record/; $cgisuidsetup($cgi); ivan@sisd.com 98-mar-14
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# also print 'printed' field ivan@sisd.com 98-jul-10
-#
-# $Log: cust_bill.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.8  1999/02/28 00:03:58  ivan
-# removed misleading comments
-#
-# Revision 1.7  1999/01/25 12:26:03  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.6  1999/01/19 05:14:18  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:42  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1998/12/30 23:03:33  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.3  1998/12/23 03:07:49  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.2  1998/12/17 09:57:20  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
+# <!-- $Id: cust_bill.cgi,v 1.2 2001-08-21 02:31:57 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $invnum $cust_bill $custnum $printed $p );
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index 5e733225b..b354318d4 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -1,62 +1,5 @@
 <%
-#
-# $Id: cust_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: cust_pkg.cgi pkgnum
-#        http://server.name/path/cust_pkg.cgi?pkgnum
-#
-# ivan@voicenet.com 96-dec-15
-#
-# services section needs to be cleaned up, needs to display extraneous
-# entries in cust_pkg!
-# ivan@voicenet.com 96-dec-31
-#
-# added navigation bar
-# ivan@voicenet.com 97-jan-30
-#
-# changed and fixed up suspension and cancel stuff, now you can't add
-# services to a cancelled package
-# ivan@voicenet.com 97-feb-27
-#
-# rewrote for new API, still needs to be cleaned up!
-# ivan@voicenet.com 97-jul-29
-#
-# no FS::Search ivan@sisd.com 98-mar-7
-# 
-# $Log: cust_pkg.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.11  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.10  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.9  1999/04/08 12:00:19  ivan
-# aesthetic update
-#
-# Revision 1.8  1999/02/28 00:04:01  ivan
-# removed misleading comments
-#
-# Revision 1.7  1999/01/19 05:14:20  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.6  1999/01/18 09:41:44  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.5  1998/12/23 03:11:40  ivan
-# *** empty log message ***
-#
-# Revision 1.3  1998/12/17 09:57:22  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
-# Revision 1.2  1998/11/13 09:56:49  ivan
-# change configuration file layout to support multiple distinct databases (with
-# own set of config files, export, etc.)
-#
+# <!-- $Id: cust_pkg.cgi,v 1.2 2001-08-21 02:31:57 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi %uiview %uiadd $part_svc $query $pkgnum $cust_pkg $part_pkg
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index caa8ef00e..3a222710f 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,79 +1,5 @@
 <%
-#
-# $Id: svc_acct.cgi,v 1.2 2001-08-19 15:53:36 jeff Exp $
-#
-# Usage: svc_acct.cgi svcnum
-#        http://server.name/path/svc_acct.cgi?svcnum
-#
-# ivan@voicenet.com 96-dec-17
-#
-# added link to send info
-# ivan@voicenet.com 97-jan-4
-#
-# added navigation bar and ability to change username, etc.
-# ivan@voicenet.com 97-jan-30
-#
-# activate 800 service
-# ivan@voicenet.com 97-feb-10
-#
-# modified navbar code (should be a subroutine?), added link to cancel account (only if not audited)
-# ivan@voicenet.com 97-apr-16
-#
-# INCOMPLETELY rewrote some things for new API
-# ivan@voicenet.com 97-jul-29
-#
-# FS::Search became FS::Record, use strict, etc. ivan@sisd.com 98-mar-9
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'password' to '_password' because Pg6.3 reserves the password word
-#       bmccane@maxbaud.net     98-apr-3
-#
-# /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
-#
-# displays arbitrary radius attributes ivan@sisd.com 98-aug-16
-#
-# $Log: svc_acct.cgi,v $
-# Revision 1.2  2001-08-19 15:53:36  jeff
-# added user interface for svc_forward and vpopmail support
-#
-# Revision 1.1  2001/07/30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.12  2001/01/31 07:21:00  ivan
-# fix tyops
-#
-# Revision 1.11  2000/12/03 20:25:20  ivan
-# session monitor updates
-#
-# Revision 1.10  1999/04/14 11:27:06  ivan
-# showpasswords config option to show passwords
-#
-# Revision 1.9  1999/04/08 12:00:19  ivan
-# aesthetic update
-#
-# Revision 1.8  1999/02/28 00:04:02  ivan
-# removed misleading comments
-#
-# Revision 1.7  1999/01/19 05:14:21  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.6  1999/01/18 09:41:45  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.5  1999/01/18 09:22:36  ivan
-# changes to track email addresses for email invoicing
-#
-# Revision 1.4  1998/12/23 03:09:19  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.3  1998/12/17 09:57:23  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
-# Revision 1.2  1998/12/16 05:24:29  ivan
-# use FS::Conf;
-#
+# <!-- $Id: svc_acct.cgi,v 1.3 2001-08-21 02:31:57 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $svc_domain $query $svcnum $svc_acct $cust_svc $pkgnum
diff --git a/httemplate/view/svc_acct_sm.cgi b/httemplate/view/svc_acct_sm.cgi
index 9c6ca6e5c..ff665d312 100755
--- a/httemplate/view/svc_acct_sm.cgi
+++ b/httemplate/view/svc_acct_sm.cgi
@@ -1,60 +1,5 @@
 <%
-#
-# $Id: svc_acct_sm.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: svc_acct_sm.cgi svcnum
-#        http://server.name/path/svc_acct_sm.cgi?svcnum
-#
-# based on view/svc_acct.cgi
-# 
-# ivan@voicenet.com 97-jan-5
-#
-# added navigation bar
-# ivan@voicenet.com 97-jan-30
-# 
-# rewrite ivan@sisd.com 98-mar-15
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
-#
-# $Log: svc_acct_sm.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.11  2000/07/17 10:58:42  ivan
-# better error messages if svc_acct or svc_domain records are missing
-#
-# Revision 1.10  1999/04/08 12:00:19  ivan
-# aesthetic update
-#
-# Revision 1.9  1999/02/28 00:04:03  ivan
-# removed misleading comments
-#
-# Revision 1.8  1999/02/09 09:23:00  ivan
-# visual and bugfixes
-#
-# Revision 1.7  1999/02/07 09:59:42  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.6  1999/01/19 05:14:22  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:46  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1998/12/23 03:09:52  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.3  1998/12/17 09:57:24  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
-# Revision 1.2  1998/12/16 05:24:30  ivan
-# use FS::Conf;
-#
+#<!-- $Id: svc_acct_sm.cgi,v 1.2 2001-08-21 02:31:57 ivan Exp $ -->
 
 use strict;
 use vars qw($conf $cgi $mydomain $query $svcnum $svc_acct_sm $cust_svc
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index 5728e7dec..cc60df68a 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -1,57 +1,5 @@
 <%
-#
-# $Id: svc_domain.cgi,v 1.2 2001-08-19 15:53:36 jeff Exp $
-#
-# Usage: svc_domain svcnum
-#        http://server.name/path/svc_domain.cgi?svcnum
-#
-# ivan@voicenet.com 97-jan-6
-#
-# rewrite ivan@sisd.com 98-mar-14
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: svc_domain.cgi,v $
-# Revision 1.2  2001-08-19 15:53:36  jeff
-# added user interface for svc_forward and vpopmail support
-#
-# Revision 1.1  2001/07/30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.11  2000/12/03 15:14:00  ivan
-# bugfixes from Jeff Finucane <jeff@cmh.net>, thanks!
-#
-# Revision 1.10  1999/08/27 22:18:44  ivan
-# point to patrick instead of internic!
-#
-# Revision 1.9  1999/04/08 12:00:19  ivan
-# aesthetic update
-#
-# Revision 1.8  1999/02/28 00:04:04  ivan
-# removed misleading comments
-#
-# Revision 1.7  1999/02/23 08:09:25  ivan
-# beginnings of one-screen new customer entry and some other miscellania
-#
-# Revision 1.6  1999/01/19 05:14:23  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:47  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1998/12/23 03:10:19  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.3  1998/12/17 09:57:25  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
-# Revision 1.2  1998/11/13 09:56:50  ivan
-# change configuration file layout to support multiple distinct databases (with
-# own set of config files, export, etc.)
-#
+# <!-- $Id: svc_domain.cgi,v 1.3 2001-08-21 02:31:57 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $svcnum $svc_domain $domain $cust_svc $pkgnum 
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index 7930ab5ec..e40935bc4 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -1,17 +1,5 @@
 <%
-#
-# $Id: svc_forward.cgi,v 1.1 2001-08-19 15:53:36 jeff Exp $
-#
-# Usage: svc_forward.cgi svcnum
-#        http://server.name/path/svc_forward.cgi?svcnum
-#
-# based on view/svc_acct.cgi
-# 
-# $Log: svc_forward.cgi,v $
-# Revision 1.1  2001-08-19 15:53:36  jeff
-# added user interface for svc_forward and vpopmail support
-#
-#
+# <!-- $Id: svc_forward.cgi,v 1.2 2001-08-21 02:31:57 ivan Exp $ -->
 
 use strict;
 use vars qw($conf $cgi $query $svcnum $svc_forward $cust_svc
-- 
cgit v1.2.1


From 6543a53f9d61dcfb0844a3dea480672565bc2cd2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Aug 2001 02:32:54 +0000
Subject: remove $Log$

---
 test/cgi-test | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/test/cgi-test b/test/cgi-test
index 5f2f07f97..2dda4849b 100755
--- a/test/cgi-test
+++ b/test/cgi-test
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cgi-test,v 1.2 1999-08-23 12:26:37 ivan Exp $
+# $Id: cgi-test,v 1.3 2001-08-21 02:32:54 ivan Exp $
 #
 # This is the beginning of a test suite for the web interface.
 # It's also excellent for populating your database with some meaningful test
@@ -10,14 +10,6 @@
 # Usage: cgi-test http://base.freeside.url/with/path/ username password
 # (Yes, if you were properly paranoid and are using SSL, you'll need to get
 #  libwww-perl working with SSL to use this.)
-#
-# $Log: cgi-test,v $
-# Revision 1.2  1999-08-23 12:26:37  ivan
-# need to untaint the command line
-#
-# Revision 1.1  1999/04/08 13:05:40  ivan
-# web interface tester / sample data creator
-#
 
 use strict;
 #use diagnostics;
-- 
cgit v1.2.1


From 4ac49026e732c19ef88103ab85536cea40cbc41c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Aug 2001 02:43:18 +0000
Subject: i think svc_acct_sm.import should go away, but...

---
 bin/dbdef-create           | 18 +-----------------
 bin/fs-migrate-svc_acct_sm | 14 +-------------
 bin/svc_acct_sm.import     | 41 +----------------------------------------
 3 files changed, 3 insertions(+), 70 deletions(-)

diff --git a/bin/dbdef-create b/bin/dbdef-create
index e71eb36b4..0b297b9e6 100755
--- a/bin/dbdef-create
+++ b/bin/dbdef-create
@@ -1,22 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: dbdef-create,v 1.4 2001-08-17 10:57:40 ivan Exp $
-#
-# create dbdef file for existing mySQL database (needs SHOW|DESCRIBE command
-# not in Pg) based on fs-setup
-#
-# ivan@sisd.com 98-jun-2
-#
-# $Log: dbdef-create,v $
-# Revision 1.4  2001-08-17 10:57:40  ivan
-# gah
-#
-# Revision 1.3  2001/04/15 12:56:31  ivan
-# s/dbdef/DBIx::DBSchema/
-#
-# Revision 1.2  1998/11/19 11:17:44  ivan
-# adminsuidsetup requires argument
-#
+# $Id: dbdef-create,v 1.5 2001-08-21 02:43:18 ivan Exp $
 
 use strict;
 use DBI;
diff --git a/bin/fs-migrate-svc_acct_sm b/bin/fs-migrate-svc_acct_sm
index d0d4a94b6..ae2dc764d 100755
--- a/bin/fs-migrate-svc_acct_sm
+++ b/bin/fs-migrate-svc_acct_sm
@@ -1,20 +1,8 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-migrate-svc_acct_sm,v 1.2 2001-08-12 19:41:25 jeff Exp $
+# $Id: fs-migrate-svc_acct_sm,v 1.3 2001-08-21 02:43:18 ivan Exp $
 #
 # jeff@cmh.net 01-Jul-20
-#
-# $Log: fs-migrate-svc_acct_sm,v $
-# Revision 1.2  2001-08-12 19:41:25  jeff
-# merging vpopmail support branch
-#
-# Revision 1.1.2.1  2001/08/08 17:45:35  jeff
-# initial vpopmail support
-#
-#
-#
-#   Initial vpopmail changes
-#
 
 #to delay loading dbdef until we're ready
 #BEGIN { $FS::Record::setup_hack = 1; }
diff --git a/bin/svc_acct_sm.import b/bin/svc_acct_sm.import
index 723fb029f..b668405f5 100755
--- a/bin/svc_acct_sm.import
+++ b/bin/svc_acct_sm.import
@@ -1,45 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.import,v 1.9 2001-04-22 01:56:15 ivan Exp $
-#
-# ivan@sisd.com 98-mar-9
-#
-# generalized svcparts ivan@sisd.com 98-mar-23
-
-# You really need to enable ssh into a shell machine as this needs to rename
-# .qmail-extension files.
-#
-# now an interactive script ivan@sisd.com 98-jun-30
-#
-# has an (untested) section for sendmail, s/warn/die/g and generates a program
-# to run on your mail machine _later_ instead of ssh'ing for each user
-# ivan@sisd.com 98-jul-13
-#
-# $Log: svc_acct_sm.import,v $
-# Revision 1.9  2001-04-22 01:56:15  ivan
-# get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)
-#
-# Revision 1.8  2000/12/03 15:14:00  ivan
-# bugfixes from Jeff Finucane <jeff@cmh.net>, thanks!
-#
-# Revision 1.7  2000/06/29 10:51:52  ivan
-# oops, silly mistake
-#
-# Revision 1.6  2000/06/29 10:48:25  ivan
-# make svc_acct_sm skip blank lines in sendmail import
-#
-# Revision 1.5  2000/02/03 05:16:52  ivan
-# beginning of DNS and Apache support
-#
-# Revision 1.4  1999/03/25 08:42:20  ivan
-# import stuff uses Term::Query and spits out (some kinds of) nonsensical input
-#
-# Revision 1.3  1999/03/24 00:51:55  ivan
-# die if no relevant services... cvspain
-#
-# Revision 1.2  1998/12/10 07:23:18  ivan
-# use FS::Conf, need user (for datasrc)
-#
+# $Id: svc_acct_sm.import,v 1.10 2001-08-21 02:43:18 ivan Exp $
 
 use strict;
 use vars qw(%d_part_svc %m_part_svc);
-- 
cgit v1.2.1


From 1da2eb3c205a088809fb8b72b42a454b94b74c43 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Aug 2001 02:44:47 +0000
Subject: remove $Log$

---
 FS/FS/domain_record.pm       | 12 +-----------
 FS/FS/prepay_credit.pm       | 12 +-----------
 FS/FS/svc_www.pm             | 18 +-----------------
 FS/bin/freeside-print-batch  | 15 +++------------
 eg/TEMPLATE_cust_main.import | 14 ++------------
 eg/table_template-svc.pm     | 17 +----------------
 6 files changed, 9 insertions(+), 79 deletions(-)

diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 743f43c56..0f634bff3 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -156,7 +156,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: domain_record.pm,v 1.2 2001-05-18 14:08:55 ivan Exp $
+$Id: domain_record.pm,v 1.3 2001-08-21 02:44:47 ivan Exp $
 
 =head1 BUGS
 
@@ -169,16 +169,6 @@ course, it's still better than editing the zone files directly.  :)
 
 L<FS::Record>, schema.html from the base documentation.
 
-=head1 HISTORY
-
-$Log: domain_record.pm,v $
-Revision 1.2  2001-05-18 14:08:55  ivan
-tyop
-
-Revision 1.1  2000/02/03 05:16:52  ivan
-beginning of DNS and Apache support
-
-
 =cut
 
 1;
diff --git a/FS/FS/prepay_credit.pm b/FS/FS/prepay_credit.pm
index 113cee823..f388b2312 100644
--- a/FS/FS/prepay_credit.pm
+++ b/FS/FS/prepay_credit.pm
@@ -107,7 +107,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: prepay_credit.pm,v 1.2 2000-02-02 20:22:18 ivan Exp $
+$Id: prepay_credit.pm,v 1.3 2001-08-21 02:44:47 ivan Exp $
 
 =head1 BUGS
 
@@ -115,16 +115,6 @@ $Id: prepay_credit.pm,v 1.2 2000-02-02 20:22:18 ivan Exp $
 
 L<FS::Record>, schema.html from the base documentation.
 
-=head1 HISTORY
-
-$Log: prepay_credit.pm,v $
-Revision 1.2  2000-02-02 20:22:18  ivan
-bugfix prepayment in signup server
-
-Revision 1.1  2000/01/31 05:22:23  ivan
-prepaid "internet cards"
-
-
 =cut
 
 1;
diff --git a/FS/FS/svc_www.pm b/FS/FS/svc_www.pm
index bce69d6a9..44d7487da 100644
--- a/FS/FS/svc_www.pm
+++ b/FS/FS/svc_www.pm
@@ -220,7 +220,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_www.pm,v 1.4 2001-04-22 01:56:15 ivan Exp $
+$Id: svc_www.pm,v 1.5 2001-08-21 02:44:47 ivan Exp $
 
 =head1 BUGS
 
@@ -229,22 +229,6 @@ $Id: svc_www.pm,v 1.4 2001-04-22 01:56:15 ivan Exp $
 L<FS::svc_Common>, L<FS::Record>, L<FS::domain_record>, L<FS::cust_svc>,
 L<FS::part_svc>, L<FS::cust_pkg>, schema.html from the base documentation.
 
-=head1 HISTORY
-
-$Log: svc_www.pm,v $
-Revision 1.4  2001-04-22 01:56:15  ivan
-get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)
-
-Revision 1.3  2000/11/22 23:30:51  ivan
-tyop
-
-Revision 1.2  2000/03/01 08:13:59  ivan
-compilation bugfixes
-
-Revision 1.1  2000/02/03 05:16:52  ivan
-beginning of DNS and Apache support
-
-
 =cut
 
 1;
diff --git a/FS/bin/freeside-print-batch b/FS/bin/freeside-print-batch
index 5efa4ccb3..baef43787 100755
--- a/FS/bin/freeside-print-batch
+++ b/FS/bin/freeside-print-batch
@@ -237,7 +237,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-print-batch,v 1.2 2001-02-21 01:48:07 ivan Exp $
+$Id: freeside-print-batch,v 1.3 2001-08-21 02:44:47 ivan Exp $
 
 =head1 BUGS
 
@@ -252,18 +252,9 @@ for more information regarding this license.
 
 L<FS::cust_main>, config.html from the base documentation
 
-=head1 HISTORY
-
-griff@aver-computer.com July 99
-
-$Log: freeside-print-batch,v $
-Revision 1.2  2001-02-21 01:48:07  ivan
-stupid pod errors
-
-Revision 1.1  2000/05/13 21:57:56  ivan
-add print_batch script from Joel Griffiths
+=head1 AUTHOR
 
+Joel Griffiths <griff@aver-computer.com> July 99
 
 =cut
 
-
diff --git a/eg/TEMPLATE_cust_main.import b/eg/TEMPLATE_cust_main.import
index 448186991..e91a2f1d2 100755
--- a/eg/TEMPLATE_cust_main.import
+++ b/eg/TEMPLATE_cust_main.import
@@ -1,18 +1,8 @@
 #!/usr/bin/perl -w
-
-# Template for importing legacy customer data
-#
-# $Id: TEMPLATE_cust_main.import,v 1.3 1999-03-26 13:15:56 ivan Exp $
 #
-# ivan@sisd.com 98-aug-17 - 20
-#
-# $Log: TEMPLATE_cust_main.import,v $
-# Revision 1.3  1999-03-26 13:15:56  ivan
-# s/create/new/, use all necessary FS::table_names to avoid warnings
-#
-# Revision 1.2  1998/12/16 05:29:45  ivan
-# adminsuidsetup now need user
+# Template for importing legacy customer data
 #
+# $Id: TEMPLATE_cust_main.import,v 1.4 2001-08-21 02:44:47 ivan Exp $
 
 use strict;
 use Date::Parse;
diff --git a/eg/table_template-svc.pm b/eg/table_template-svc.pm
index a4f5028f5..c5e8f9670 100644
--- a/eg/table_template-svc.pm
+++ b/eg/table_template-svc.pm
@@ -148,7 +148,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: table_template-svc.pm,v 1.1 1999-08-04 08:03:03 ivan Exp $
+$Id: table_template-svc.pm,v 1.2 2001-08-21 02:44:47 ivan Exp $
 
 =head1 BUGS
 
@@ -159,21 +159,6 @@ The author forgot to customize this manpage.
 L<FS::svc_Common>, L<FS::Record>, L<FS::cust_svc>, L<FS::part_svc>,
 L<FS::cust_pkg>, schema.html from the base documentation.
 
-=head1 HISTORY
-
-ivan@voicenet.com 97-jul-21
-
-$Log: table_template-svc.pm,v $
-Revision 1.1  1999-08-04 08:03:03  ivan
-move table subclass examples out of production directory
-
-Revision 1.4  1998/12/30 00:30:48  ivan
-svc_ stuff is more properly OO - has a common superclass FS::svc_Common
-
-Revision 1.2  1998/11/15 04:33:01  ivan
-updates for newest versoin
-
-
 =cut
 
 1;
-- 
cgit v1.2.1


From bfb8e18f5e245c3043ea44fad8fe3119ee73b37a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Aug 2001 03:03:36 +0000
Subject: fix domain method, and it works against old databases now too

---
 FS/FS/svc_acct.pm | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 97117b524..9c95b219e 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -3,7 +3,7 @@ package FS::svc_acct;
 use strict;
 use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
              $usernamemax $passwordmin $username_letter $username_letterfirst
-             $shellmachine $useradd $usermod $userdel 
+             $shellmachine $useradd $usermod $userdel $mydomain
              @saltset @pw_set);
 use Carp;
 use FS::Conf;
@@ -50,6 +50,7 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
   }
   $username_letter = $conf->exists('username-letter');
   $username_letterfirst = $conf->exists('username-letterfirst');
+  $mydomain = $conf->config('domain');
 };
 
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
@@ -604,13 +605,16 @@ sub radius_check {
 
 Returns the domain associated with this account.
 
--cut
+=cut
 
 sub domain {
   my $self = shift;
-  my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } )
-    or die "svc_acct.domsvc ". $self->domsvc." not found in svc_domain.svcnum";
-  $svc_domain->domain;
+  if ( $self->domsvc ) {
+    my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } );
+    $svc_domain->domain;
+  } else {
+    $mydomain or die "svc_acct.domsvc is null and no legacy domain config file";
+  }
 }
 
 =item email
@@ -628,7 +632,7 @@ sub email {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.27 2001-08-21 00:39:07 ivan Exp $
+$Id: svc_acct.pm,v 1.28 2001-08-21 03:03:36 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 6ef34dda51afba96d8dc6c4dd72427c3d4003945 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Aug 2001 09:34:13 +0000
Subject: no more &swapuid

---
 FS/FS/Record.pm                        |  6 ++----
 FS/FS/UID.pm                           | 18 +++---------------
 FS/bin/freeside-bill                   |  4 ++--
 htetc/global.asa                       | 16 ++++++++++++++--
 httemplate/browse/agent.cgi            |  4 ++--
 httemplate/browse/agent_type.cgi       |  4 ++--
 httemplate/browse/cust_main_county.cgi |  4 ++--
 httemplate/browse/part_pkg.cgi         |  4 ++--
 httemplate/browse/part_referral.cgi    |  4 ++--
 httemplate/browse/svc_acct_pop.cgi     |  4 ++--
 10 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 8dbd4aff3..2c745b413 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -8,7 +8,7 @@ use Carp qw(carp cluck croak confess);
 use File::CounterFile;
 use Locale::Country;
 use DBIx::DBSchema;
-use FS::UID qw(dbh checkruid swapuid getotaker datasrc driver_name);
+use FS::UID qw(dbh checkruid getotaker datasrc driver_name);
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(dbh fields hfields qsearch qsearchs dbdef);
@@ -566,7 +566,6 @@ sub unique {
   #warn "table $table is tainted" if is_tainted($table);
   #warn "field $field is tainted" if is_tainted($field);
 
-  &swapuid;
   my($counter) = new File::CounterFile "$table.$field",0;
 # hack for web demo
 #  getotaker() =~ /^([\w\-]{1,16})$/ or die "Illegal CGI REMOTE_USER!";
@@ -577,7 +576,6 @@ sub unique {
   my($index)=$counter->inc;
   $index=$counter->inc
     while qsearchs($table,{$field=>$index}); #just in case
-  &swapuid;
 
   $index =~ /^(\d*)$/;
   $index=$1;
@@ -971,7 +969,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.24 2001-08-19 00:48:49 ivan Exp $
+$Id: Record.pm,v 1.25 2001-08-21 09:34:13 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 7ebe592c3..3e71f09f1 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -15,7 +15,7 @@ use DBI;
 use FS::Conf;
 
 @ISA = qw(Exporter);
-@EXPORT_OK = qw(checkeuid checkruid swapuid cgisuidsetup
+@EXPORT_OK = qw(checkeuid checkruid cgisuidsetup
                 adminsuidsetup getotaker dbh datasrc getsecrets driver_name );
 
 $freeside_uid = scalar(getpwnam('freeside'));
@@ -31,7 +31,7 @@ FS::UID - Subroutines for database login and assorted other stuff
 =head1 SYNOPSIS
 
   use FS::UID qw(adminsuidsetup cgisuidsetup dbh datasrc getotaker
-  checkeuid checkruid swapuid);
+  checkeuid checkruid);
 
   adminsuidsetup $user;
 
@@ -84,8 +84,6 @@ sub adminsuidsetup {
                           'ChopBlanks' => 1,
   } ) or die "DBI->connect error: $DBI::errstr\n";
 
-  swapuid(); #go to non-privledged user if running setuid freeside
-
   foreach ( keys %callback ) {
     &{$callback{$_}};
   }
@@ -212,16 +210,6 @@ sub checkruid {
   ( $< == $freeside_uid );
 }
 
-=item swapuid
-
-Swaps real and effective UIDs.
-
-=cut
-
-sub swapuid {
-  ($<,$>) = ($>,$<) if $< != $>;
-}
-
 =item getsecrets [ USER ]
 
 Sets the user to USER, if supplied.
@@ -261,7 +249,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.7 2001-06-21 16:27:52 ivan Exp $
+$Id: UID.pm,v 1.8 2001-08-21 09:34:13 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill
index 42991c4f8..3462fa149 100755
--- a/FS/bin/freeside-bill
+++ b/FS/bin/freeside-bill
@@ -4,7 +4,7 @@ use strict;
 use Fcntl qw(:flock);
 use Date::Parse;
 use Getopt::Std;
-use FS::UID qw(adminsuidsetup swapuid);
+use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::cust_main;
 
@@ -114,7 +114,7 @@ customers.  Otherwise, bills all customers.
 
 =head1 VERSION
 
-$Id: freeside-bill,v 1.6 2000-06-24 00:28:30 ivan Exp $
+$Id: freeside-bill,v 1.7 2001-08-21 09:34:13 ivan Exp $
 
 =head1 BUGS
 
diff --git a/htetc/global.asa b/htetc/global.asa
index beb6d02f0..d6e0bbea2 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -2,7 +2,8 @@ use strict;
 use vars qw( $cgi $p );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
+use HTML::Entities;
+use FS::UID qw(cgisuidsetup dbh);
 use FS::Record qw(qsearch qsearchs fields);
 use FS::part_svc;
 use FS::CGI qw(header menubar popurl table);
@@ -16,5 +17,16 @@ sub Script_OnStart {
 
 sub Script_OnFlush {
   my $ref = $Response->{BinaryRef};
-  $$ref = $cgi->header( '-expires' => 'now' ) .$$ref;
+  $$ref = $cgi->header( '-expires' => 'now' ) . $$ref;
+#  if ( dbh->can('sprintProfile') ) {
+
+    $$ref =~ s/<\/BODY>[\s\n]*<\/HTML>[\s\n]*$//i
+      or warn "can't remove";
+  
+    $$ref .= '<PRE>'. encode_entities(dbh->sprintProfile()). '</PRE>';
+
+    $$ref .= '</BODY></HTML>';
+    
+    dbh->{'private_profile'} = {};
+#  }
 }
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 23c8f7c5b..138b61365 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -1,11 +1,11 @@
 <%
-#<!-- $Id: agent.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: agent.cgi,v 1.3 2001-08-21 09:34:13 ivan Exp $ -->
 
 use strict;
 use vars qw( $ui $cgi $p $agent );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup swapuid);
+use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header menubar table popurl);
 use FS::agent;
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index 0d7c11f3e..4917e77a2 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -1,11 +1,11 @@
 <%
-#<!-- $Id: agent_type.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: agent_type.cgi,v 1.3 2001-08-21 09:34:13 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $agent_type );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup swapuid);
+use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header menubar popurl table);
 use FS::agent_type;
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index 9cce67da2..f7c749c1f 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -1,11 +1,11 @@
 <%
-#<!-- $Id: cust_main_county.cgi,v 1.2 2001-08-17 11:05:31 ivan Exp $ -->
+#<!-- $Id: cust_main_county.cgi,v 1.3 2001-08-21 09:34:13 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $cust_main_county );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup swapuid);
+use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header menubar popurl table);
 use FS::cust_main_county;
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index ef6a44620..b6e47b171 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,11 +1,11 @@
 <%
-#<!-- $Id: part_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: part_pkg.cgi,v 1.3 2001-08-21 09:34:13 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $part_pkg );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup swapuid);
+use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header menubar popurl table);
 use FS::part_pkg;
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index 8c2e26321..ed3b7a0e4 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -1,11 +1,11 @@
 <%
-#<!-- $Id: part_referral.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: part_referral.cgi,v 1.3 2001-08-21 09:34:13 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $part_referral );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup swapuid);
+use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch);
 use FS::CGI qw(header menubar popurl table);
 use FS::part_referral;
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index 76baf8883..0e6937f6c 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -1,11 +1,11 @@
 <%
-#<!-- $Id: svc_acct_pop.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: svc_acct_pop.cgi,v 1.3 2001-08-21 09:34:13 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $svc_acct_pop );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup swapuid);
+use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header menubar table popurl);
 use FS::svc_acct_pop;
-- 
cgit v1.2.1


From 06d6c58f29564e0cbf92c6df01c7c0409a5c3097 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Aug 2001 10:27:11 +0000
Subject: fix these up, most everything is working svc_forward-wise now

---
 httemplate/edit/svc_acct.cgi    |  5 +++--
 httemplate/edit/svc_forward.cgi | 13 +++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 26266957d..2154bf22c 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.4 2001-08-20 12:15:05 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.5 2001-08-21 10:27:11 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
@@ -128,7 +128,8 @@ if ( $part_svc->svc_acct__domsvc_flag eq "F" ) {
       map { qsearch('cust_svc', { 'pkgnum' => $_->pkgnum } ) }
           qsearch('cust_pkg', { 'custnum' => $cust_pkg->custnum } );
     foreach my $cust_svc ( @cust_svc ) {
-      $svc_domain = qsearchs('svc_domain', { 'svcnum' => $_->svcnum } );
+      my $svc_domain =
+        qsearchs('svc_domain', { 'svcnum' => $cust_svc->svcnum } );
       push @svc_domain, $svc_domain if $svc_domain;
     }
   } else {
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 86e2e9547..de4c8cbc9 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_forward.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+# <!-- $Id: svc_forward.cgi,v 1.3 2001-08-21 10:27:11 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_forward $pkgnum $svcpart
@@ -73,11 +73,12 @@ if ($pkgnum) {
   #find all possible user svcnums (and emails)
 
   #starting with those currently attached
-  my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svc_forward->srcsvc});
-  $email{$svc_forward->srcsvc} = $svc_acct->email;
-
-  if ($svc_forward->dstsvc) {
-    $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svc_forward->dstsvc});
+  if ( $svc_forward->srcsvc ) {
+    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $svc_forward->srcsvc } );
+    $email{$svc_forward->srcsvc} = $svc_acct->email;
+  }
+  if ( $svc_forward->dstsvc ) {
+    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $svc_forward->dstsvc } );
     $email{$svc_forward->dstsvc} = $svc_acct->email;
   }
 
-- 
cgit v1.2.1


From 5a45d24c6015145d0592a947ae1b1e51de81e1d0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 23 Aug 2001 06:17:03 +0000
Subject: no need to be y1.9k complient

---
 FS/FS/cust_main.pm | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 3084b9058..23cae96ac 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -17,7 +17,7 @@ use Mail::Internet;
 use Mail::Header;
 use Business::CreditCard;
 use FS::UID qw( getotaker dbh );
-use FS::Record qw( qsearchs qsearch );
+use FS::Record qw( qsearchs qsearch dbdef );
 use FS::cust_pkg;
 use FS::cust_bill;
 use FS::cust_bill_pkg;
@@ -645,8 +645,6 @@ sub check {
       or return "Illegal expiration date: ". $self->paydate;
     if ( length($2) == 4 ) {
       $self->paydate("$2-$1-01");
-    } elsif ( $2 > 97 ) { #should pry change to check for "this year"
-      $self->paydate("19$2-$1-01");
     } else {
       $self->paydate("20$2-$1-01");
     }
@@ -1346,9 +1344,28 @@ sub check_invoicing_list {
 
 =back
 
+=head1 SUBROUTINES
+
+=over 4
+
+=item rebuild_fuzzyfile
+
+=cut
+
+sub rebuild_fuzzyfiles {
+  my @all_last = map $_->getfield('last'), qsearch('cust_main', {});
+  push @all_last,
+                 grep $_, map $_->getfield('ship_last'), qsearch('cust_main',{})
+      if defined dbdef->table('cust_main')->column('ship_last');
+#  open(
+
+}
+
+=back
+
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.19 2001-08-19 00:48:49 ivan Exp $
+$Id: cust_main.pm,v 1.20 2001-08-23 06:17:03 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 736949d1e55783b2403b6e959eae1cbce6bf56f6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 26 Aug 2001 05:05:25 +0000
Subject: reason can't be null

---
 FS/FS/cust_credit.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 7e55dca80..7ea088835 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -105,7 +105,7 @@ sub check {
     || $self->ut_number('custnum')
     || $self->ut_numbern('_date')
     || $self->ut_money('amount')
-    || $self->ut_textn('reason');
+    || $self->ut_text('reason');
   ;
   return $error if $error;
 
@@ -150,7 +150,7 @@ sub credited {
 
 =head1 VERSION
 
-$Id: cust_credit.pm,v 1.6 2001-04-23 19:50:07 ivan Exp $
+$Id: cust_credit.pm,v 1.7 2001-08-26 05:05:25 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From d36af3723e817c163383c36fa1e972c75a585e5a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 26 Aug 2001 05:06:19 +0000
Subject: brainfart

---
 FS/FS/cust_credit.pm |  4 ++--
 FS/FS/cust_main.pm   | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 7ea088835..d6de27c64 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -105,7 +105,7 @@ sub check {
     || $self->ut_number('custnum')
     || $self->ut_numbern('_date')
     || $self->ut_money('amount')
-    || $self->ut_text('reason');
+    || $self->ut_textn('reason');
   ;
   return $error if $error;
 
@@ -150,7 +150,7 @@ sub credited {
 
 =head1 VERSION
 
-$Id: cust_credit.pm,v 1.7 2001-08-26 05:05:25 ivan Exp $
+$Id: cust_credit.pm,v 1.8 2001-08-26 05:06:19 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 23cae96ac..ba4b94c7d 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -280,14 +280,14 @@ sub insert {
     my $error = $prepay_credit->delete;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
-      return $error;
+      return "removing prepay_credit (transaction rolled back): $error";
     }
   }
 
   my $error = $self->SUPER::insert;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
-    return $error;
+    return "inserting cust_main record (transaction rolled back): $error";
   }
 
   if ( @param ) { # CUST_PKG_HASHREF
@@ -297,7 +297,7 @@ sub insert {
       $error = $cust_pkg->insert;
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
-        return $error;
+        return "inserting cust_pkg (transaction rolled back): $error";
       }
       foreach my $svc_something ( @{$cust_pkgs->{$cust_pkg}} ) {
         $svc_something->pkgnum( $cust_pkg->pkgnum );
@@ -308,7 +308,7 @@ sub insert {
         $error = $svc_something->insert;
         if ( $error ) {
           $dbh->rollback if $oldAutoCommit;
-          return $error;
+          return "inserting svc_ (transaction rolled back): $error";
         }
       }
     }
@@ -324,7 +324,7 @@ sub insert {
     $error = $self->check_invoicing_list( $invoicing_list );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
-      return $error;
+      return "checking invoicing_list (transaction rolled back): $error";
     }
     $self->invoicing_list( $invoicing_list );
   }
@@ -337,7 +337,7 @@ sub insert {
     $error = $cust_credit->insert;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
-      return $error;
+      return "inserting credit (transaction rolled back): $error";
     }
   }
 
@@ -1365,7 +1365,7 @@ sub rebuild_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.20 2001-08-23 06:17:03 ivan Exp $
+$Id: cust_main.pm,v 1.21 2001-08-26 05:06:19 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From aa7b51c0794f6a61e522fbba978f6c64446d8696 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 28 Aug 2001 14:34:14 +0000
Subject: customer-to-customer referrals!

---
 FS/FS/cust_main.pm              | 35 +++++++++++++++++++++-
 httemplate/docs/config.html     |  1 +
 httemplate/docs/upgrade8.html   |  3 +-
 httemplate/edit/cust_main.cgi   | 21 +++++++++++--
 httemplate/search/cust_main.cgi | 65 +++++++++++++++++++++++++++++++++++++----
 httemplate/view/cust_main.cgi   | 30 +++++++++++++++++--
 6 files changed, 143 insertions(+), 12 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index ba4b94c7d..682b43d95 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -502,6 +502,7 @@ sub check {
     || $self->ut_textn('state')
     || $self->ut_country('country')
     || $self->ut_anything('comments')
+    || $self->ut_numbern('referral_custnum')
   ;
   #barf.  need message catalogs.  i18n.  etc.
   $error .= "Please select a referral."
@@ -514,6 +515,10 @@ sub check {
   return "Unknown referral"
     unless qsearchs( 'part_referral', { 'refnum' => $self->refnum } );
 
+  return "Unknown referring custnum ". $self->referral_custnum
+    unless ! $self->referral_custnum 
+           || qsearchs( 'cust_main', { 'custnum' => $self->referral_custnum } );
+
   if ( $self->ss eq '' ) {
     $self->ss('');
   } else {
@@ -1342,6 +1347,34 @@ sub check_invoicing_list {
   '';
 }
 
+=item referral_cust_main [ DEPTH [ EXCLUDE_HASHREF ] ]
+
+Returns an array of customers referred by this customer (referral_custnum set
+to this custnum).  If DEPTH is given, recurses up to the given depth, returning
+customers referred by customers referred by this customer and so on, inclusive.
+The default behavior is DEPTH 1 (no recursion).
+
+=cut
+
+sub referral_cust_main {
+  my $self = shift;
+  my $depth = @_ ? shift : 1;
+  my $exclude = @_ ? shift : {};
+
+  my @cust_main =
+    map { $exclude->{$_->custnum}++; $_; }
+      grep { ! $exclude->{ $_->custnum } }
+        qsearch( 'cust_main', { 'referral_custnum' => $self->custnum } );
+
+  if ( $depth > 1 ) {
+    push @cust_main,
+      map { $_->referral_cust_main($depth-1, $exclude) }
+        @cust_main;
+  }
+
+  @cust_main;
+}
+
 =back
 
 =head1 SUBROUTINES
@@ -1365,7 +1398,7 @@ sub rebuild_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.21 2001-08-26 05:06:19 ivan Exp $
+$Id: cust_main.pm,v 1.22 2001-08-28 14:34:14 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
index 64dbcfe3f..f26ff0f78 100644
--- a/httemplate/docs/config.html
+++ b/httemplate/docs/config.html
@@ -44,6 +44,7 @@ All further configuration files and directories are located in
   <li><a name="cybercash2">cybercash2</a> - <a href="http://www.cybercash.com/cybercash/services/cashreg214.html">CyberCash v2</a> support, four lines: paymentserverhost, paymentserverport, paymentserversecret, and transaction type (`mauthonly' or `mauthcapture').  CCLib.pm is required.
   <li>cybercash3.2 - <a href="http://www.cybercash.com/cybercash/services/technology.html">CyberCash v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly' or `mauthcapture').  CCMckLib3_2.pm, CCMckDirectLib3_2.pm and CCMckErrno3_2 are required.
   <li><a name="deletecustomers">deletecustomers</a> - The existance of this file will enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that this customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers' packages if they cancel service.
+  <li><a name="disable_customer_referrals">disable_customer_referrals</a> - The existance of this file will disable new customer-to-customer referrals in the web interface.
   <li><a name="domain">domain</a> - Your domain name.
   <li><a name="editreferrals">editreferrals</a> - The existance of this file will allow you to change the referral of existing customers.
   <li><a name="erpcdmachines">erpcdmachines</a> - Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd' and `/usr/annex/acp_dialup'.
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 60f8f1593..e2bb333d6 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -82,7 +82,8 @@ ALTER TABLE part_svc ADD svc_forward__dstsvc integer NULL;
 ALTER TABLE part_svc ADD svc_forward__dstsvc_flag char(1) NULL;
 ALTER TABLE part_svc ADD svc_forward__dst integer NULL;
 ALTER TABLE part_svc ADD svc_forward__dst_flag char(1) NULL;
-
+ALTER TABLE cust_main ADD referral_custnum integer NULL;
+CREATE INDEX cust_main3 ON cust_main ( referral_custnum );
 </pre>
 
   <li>If you are using PostgreSQL, apply the following changes to your database:
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index f331e5321..47e18d789 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.3 2001-08-12 00:07:55 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.4 2001-08-28 14:34:14 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -61,7 +61,8 @@ if ( $cgi->param('error') ) {
 } else {
   $custnum='';
   $cust_main = new FS::cust_main ( {} );
-  $cust_main->setfield('otaker',&getotaker);
+  $cust_main->otaker( &getotaker );
+  $cust_main->referral_custnum( $cgi->param('referral_custnum') );
   $saved_pkgpart = 0;
   $username = '';
   $password = '';
@@ -130,6 +131,22 @@ if ( $custnum && ! $conf->exists('editreferrals') ) {
   }
 }
 
+#referring customer
+
+print qq!<BR><BR>Referring Customer: !;
+if ( $cust_main->referral_custnum ) {
+  my $referring_cust_main =
+    qsearchs('cust_main', { custnum => $cust_main->referral_custnum } );
+  print '<A HREF="'. popurl(1). '/cust_main.cgi?'.
+        $cust_main->referral_custnum. '">'.
+        $cust_main->referral_custnum. ': '.
+        ( $referring_cust_main->company
+          || $referring_cust_main->last. ', '. $referring_cust_main->first ).
+        '</A><INPUT TYPE="hidden" NAME="referral_custnum" VALUE="'.
+        $cust_main->referral_custnum. '">';
+} else {
+  print '(none)<INPUT TYPE="hidden" NAME="referral_custnum" VALUE="">';
+}
 
 # contact info
 
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 86bca1fcf..d038896f6 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.2 2001-07-30 10:41:44 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.3 2001-08-28 14:34:14 ivan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
@@ -35,9 +35,10 @@ if ( $cgi->keywords ) {
   }
 } else {
   @cust_main=();
-  &cardsearch if ( $cgi->param('card_on') && $cgi->param('card') );
-  &lastsearch if ( $cgi->param('last_on') && $cgi->param('last_text') );
-  &companysearch if ( $cgi->param('company_on') && $cgi->param('company_text') );
+  &cardsearch if $cgi->param('card_on') && $cgi->param('card');
+  &lastsearch if $cgi->param('last_on') && $cgi->param('last_text');
+  &companysearch if $cgi->param('company_on') && $cgi->param('company_text');
+  &referralsearch if $cgi->param('referral_custnum');
 }
 
 @cust_main = grep { $_->ncancelled_pkgs || ! $_->all_pkgs } @cust_main
@@ -48,7 +49,7 @@ if ( $conf->exists('hidecancelledpackages' ) ) {
   %all_pkgs = map { $_->custnum => [ $_->all_pkgs ] } @cust_main;
 }
 
-if ( scalar(@cust_main) == 1 ) {
+if ( scalar(@cust_main) == 1 && ! $cgi->param('referral_custnum') ) {
   print $cgi->redirect(popurl(2). "view/cust_main.cgi?". $cust_main[0]->custnum);
   exit;
 } elsif ( scalar(@cust_main) == 0 ) {
@@ -58,7 +59,42 @@ if ( scalar(@cust_main) == 1 ) {
   my($total)=scalar(@cust_main);
   print $cgi->header( '-expires' => 'now' ), header("Customer Search Results",menubar(
     'Main Menu', popurl(2)
-  )), "$total matching customers found<BR>", &table(), <<END;
+  )), "$total matching customers found";
+  if ( $cgi->param('referral_custnum') ) {
+    $cgi->param('referral_custnum') =~ /^(\d+)$/
+      or eidiot "Illegal referral_custnum\n";
+    my $referral_custnum = $1;
+    my $cust_main = qsearchs('cust_main', { custnum => $referral_custnum } );
+    print '<FORM METHOD=POST>'.
+          qq!<INPUT TYPE="hidden" NAME="referral_custnum" VALUE="$referral_custnum">!.
+          'referrals of <A HREF="'. popurl(2).
+          "view/cust_main.cgi?$referral_custnum\">$referral_custnum: ".
+          ( $cust_main->company
+            || $cust_main->last. ', '. $cust_main->first ).
+          '</A>';
+    print "\n",<<END;
+      <SCRIPT>
+      function changed(what) {
+        what.form.submit();
+      }
+      </SCRIPT>
+END
+    print ' <SELECT NAME="referral_depth" SIZE="1" onChange="changed(this)">';
+    my $max = 8; #config file
+    $cgi->param('referral_depth') =~ /^(\d+)$/
+      or eidiot "Illegal referral_depth";
+    my $referral_depth = $1;
+
+    foreach my $depth ( 1 .. $max ) {
+      print '<OPTION',
+            ' SELECTED'x($depth == $referral_depth),
+            ">$depth";
+    }
+    print "</SELECT> levels deep".
+          '<NOSCRIPT> <INPUT TYPE="submit" VALUE="change"></NOSCRIPT>'.
+          '</FORM>';
+  }
+  print "<BR>", &table(), <<END;
       <TR>
         <TH></TH>
         <TH>(bill) name</TH>
@@ -175,7 +211,24 @@ sub cardsearch {
   my($payinfo)=$1;
 
   push @cust_main, qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'CARD'});
+  $sortby=\*last_sort;
+}
 
+sub referralsearch {
+  $cgi->param('referral_custnum') =~ /^(\d+)$/
+    or eidiot "Illegal referral_custnum";
+  my $cust_main = qsearchs('cust_main', { 'custnum' => $1 } )
+    or eidiot "Customer $1 not found";
+  my $depth;
+  if ( $cgi->param('referral_depth') ) {
+    $cgi->param('referral_depth') =~ /^(\d+)$/
+      or eidiot "Illegal referral_depth";
+    $depth = $1;
+  } else {
+    $depth = 1;
+  }
+  push @cust_main, $cust_main->referral_cust_main($depth);
+  $sortby=\*last_sort;
 }
 
 sub lastsearch {
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 088e2bb2f..cba702670 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.4 2001-08-13 23:15:35 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.5 2001-08-28 14:34:14 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
@@ -43,8 +43,18 @@ print qq!<A HREF="!, popurl(2),
 print qq! | <A HREF="!, popurl(2), 
       qq!misc/delete-customer.cgi?$custnum"> Delete this customer</A>!
   if $conf->exists('deletecustomers');
-print '<BR><BR>';
 
+unless ( $conf->exists('disable_customer_referrals') ) {
+  print qq! | <A HREF="!, popurl(2),
+        qq!edit/cust_main.cgi?referral_custnum=$custnum">!,
+        qq!Refer a new customer</A>!;
+
+  print qq! | <A HREF="!, popurl(2),
+        qq!search/cust_main.cgi?referral_custnum=$custnum">!,
+        qq!View this customer's referrals<A>!;
+}
+
+print '<BR><BR>';
 print '<A NAME="cust_main"></A>';
 
 print &itable(), '<TR>';
@@ -158,6 +168,22 @@ print '<TD VALIGN="top">';
   print '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
     $cust_main->otaker, '</TD></TR>';
 
+  print '<TR><TD ALIGN="right">Referring Customer</TD><TD BGCOLOR="#ffffff">';
+  my $referring_cust_main = '';
+  if ( $cust_main->referral_custnum
+       && ( $referring_cust_main =
+            qsearchs('cust_main', { custnum => $cust_main->referral_custnum } )
+          )
+     ) {
+    print '<A HREF="'. popurl(1). 'cust_main.cgi?'.
+          $cust_main->referral_custnum. '">'.
+          $cust_main->referral_custnum. ': '.
+          ( $referring_cust_main->company
+            || $referring_cust_main->last. ', '. $referring_cust_main->first ).
+          '</A>';
+  }
+  print '</TD></TR>';
+
   print '</TABLE></TD></TR></TABLE>';
 
 print '<BR>';
-- 
cgit v1.2.1


From 5e99168da38e7616fc726242ce7d85e140f22c6f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 28 Aug 2001 16:58:08 +0000
Subject: customer-to-customer referrals in singup server

---
 fs_signup/FS-SignupClient/SignupClient.pm | 60 ++++++++++++++++---------------
 fs_signup/FS-SignupClient/cgi/signup.cgi  | 58 ++++++++++++++++--------------
 fs_signup/FS-SignupClient/fs_signupd      | 10 +++---
 fs_signup/fs_signup_server                | 49 ++++++++++++-------------
 httemplate/docs/signup.html               |  1 +
 httemplate/docs/upgrade8.html             |  1 +
 httemplate/search/cust_main.cgi           |  4 +--
 7 files changed, 96 insertions(+), 87 deletions(-)

diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm
index 5769c18fc..d656d7528 100644
--- a/fs_signup/FS-SignupClient/SignupClient.pm
+++ b/fs_signup/FS-SignupClient/SignupClient.pm
@@ -7,7 +7,7 @@ use Socket;
 use FileHandle;
 use IO::Handle;
 
-$VERSION = '0.01';
+$VERSION = '0.02';
 
 @ISA = qw( Exporter );
 @EXPORT_OK = qw( signup_info new_customer );
@@ -35,29 +35,30 @@ FS::SignupClient - Freeside signup client API
   ( $locales, $packages, $pops ) = signup_info;
 
   $error = new_customer ( {
-    'first'          => $first,
-    'last'           => $last,
-    'ss'             => $ss,
-    'comapny'        => $company,
-    'address1'       => $address1,
-    'address2'       => $address2,
-    'city'           => $city,
-    'county'         => $county,
-    'state'          => $state,
-    'zip'            => $zip,
-    'country'        => $country,
-    'daytime'        => $daytime,
-    'night'          => $night,
-    'fax'            => $fax,
-    'payby'          => $payby,
-    'payinfo'        => $payinfo,
-    'paydate'        => $paydate,
-    'payname'        => $payname,
-    'invoicing_list' => $invoicing_list,
-    'pkgpart'        => $pkgpart,
-    'username'       => $username,
-    '_password'       => $password,
-    'popnum'         => $popnum,
+    'first'            => $first,
+    'last'             => $last,
+    'ss'               => $ss,
+    'comapny'          => $company,
+    'address1'         => $address1,
+    'address2'         => $address2,
+    'city'             => $city,
+    'county'           => $county,
+    'state'            => $state,
+    'zip'              => $zip,
+    'country'          => $country,
+    'daytime'          => $daytime,
+    'night'            => $night,
+    'fax'              => $fax,
+    'payby'            => $payby,
+    'payinfo'          => $payinfo,
+    'paydate'          => $paydate,
+    'payname'          => $payname,
+    'invoicing_list'   => $invoicing_list,
+    'referral_custnum' => $referral_custnum,
+    'pkgpart'          => $pkgpart,
+    'username'         => $username,
+    '_password'        => $password,
+    'popnum'           => $popnum,
   } );
 
 =head1 DESCRIPTION
@@ -173,6 +174,7 @@ a paramater with the following keys:
   paydate
   payname
   invoicing_list
+  referral_custnum
   pkgpart
   username
   _password
@@ -185,6 +187,10 @@ Returns a scalar error message, or the empty string for success.
 sub new_customer {
   my $hashref = shift;
 
+  #things that aren't necessary in base class, but are for signup server
+  return "Empty password" unless $hashref->{'_password'};
+  return "No POP selected" unless $hashref->{'popnum'};
+
   socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
   connect(SOCK, sockaddr_un($fs_signupd_socket)) or die "connect: $!";
   print SOCK "new_customer\n";
@@ -192,7 +198,7 @@ sub new_customer {
   print SOCK join("\n", map { $hashref->{$_} } qw(
     first last ss company address1 address2 city county state zip country
     daytime night fax payby payinfo paydate payname invoicing_list
-    pkgpart username _password popnum
+    referral_custnum pkgpart username _password popnum
   ) ), "\n";
   SOCK->flush;
 
@@ -202,10 +208,6 @@ sub new_customer {
 
 =back
 
-=head1 VERSION
-
-$Id: SignupClient.pm,v 1.3 2000-02-02 07:44:00 ivan Exp $
-
 =head1 BUGS
 
 =head1 SEE ALSO
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index a3fa9e788..5d024a812 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,12 +1,13 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.9 2000-12-03 14:29:15 ivan Exp $
+# $Id: signup.cgi,v 1.10 2001-08-28 16:58:08 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $r $error
              $last $first $ss $company $address1 $address2 $city $state $county
              $country $zip $daytime $night $fax $invoicing_list $payby $payinfo
-             $paydate $payname $pkgpart $username $password $popnum
+             $paydate $payname $referral_custnum
+             $pkgpart $username $password $popnum
              $ieak_file $ieak_template $cck_file $cck_template
              $ac $exch $loc
            );
@@ -15,7 +16,7 @@ use subs qw( print_form print_okay expselect );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use HTTP::Headers::UserAgent 2.00;
-use FS::SignupClient qw( signup_info new_customer );
+use FS::SignupClient 0.02 qw( signup_info new_customer );
 use Text::Template;
 
 #acceptable payment methods
@@ -75,29 +76,30 @@ if ( defined $cgi->param('magic') ) {
     }
 
     ( $error = new_customer ( {
-      'last'           => $last            = $cgi->param('last'),
-      'first'          => $first           = $cgi->param('first'),
-      'ss'             => $ss              = $cgi->param('ss'),
-      'company'        => $company         = $cgi->param('company'),
-      'address1'       => $address1        = $cgi->param('address1'),
-      'address2'       => $address2        = $cgi->param('address2'),
-      'city'           => $city            = $cgi->param('city'),
-      'county'         => $county,
-      'state'          => $state,
-      'zip'            => $zip             = $cgi->param('zip'),
-      'country'        => $country,
-      'daytime'        => $daytime         = $cgi->param('daytime'),
-      'night'          => $night           = $cgi->param('night'),
-      'fax'            => $fax             = $cgi->param('fax'),
-      'payby'          => $payby,
-      'payinfo'        => $payinfo,
-      'paydate'        => $paydate,
-      'payname'        => $payname,
-      'invoicing_list' => $invoicing_list,
-      'pkgpart'        => $pkgpart         = $cgi->param('pkgpart'),
-      'username'       => $username        = $cgi->param('username'),
-      '_password'      => $password        = $cgi->param('_password'),
-      'popnum'         => $popnum          = $cgi->param('popnum'),
+      'last'             => $last             = $cgi->param('last'),
+      'first'            => $first            = $cgi->param('first'),
+      'ss'               => $ss               = $cgi->param('ss'),
+      'company'          => $company          = $cgi->param('company'),
+      'address1'         => $address1         = $cgi->param('address1'),
+      'address2'         => $address2         = $cgi->param('address2'),
+      'city'             => $city             = $cgi->param('city'),
+      'county'           => $county,
+      'state'            => $state,
+      'zip'              => $zip              = $cgi->param('zip'),
+      'country'          => $country,
+      'daytime'          => $daytime          = $cgi->param('daytime'),
+      'night'            => $night            = $cgi->param('night'),
+      'fax'              => $fax              = $cgi->param('fax'),
+      'payby'            => $payby,
+      'payinfo'          => $payinfo,
+      'paydate'          => $paydate,
+      'payname'          => $payname,
+      'invoicing_list'   => $invoicing_list,
+      'referral_custnum' => $referral_custnum = $cgi->param('ref'),
+      'pkgpart'          => $pkgpart          = $cgi->param('pkgpart'),
+      'username'         => $username         = $cgi->param('username'),
+      '_password'        => $password         = $cgi->param('_password'),
+      'popnum'           => $popnum           = $cgi->param('popnum'),
     } ) )
       ? print_form()
       : print_okay();
@@ -129,13 +131,14 @@ if ( defined $cgi->param('magic') ) {
   $username = '';
   $password = '';
   $popnum = '';
-
+  $referral_custnum = $cgi->param('ref') || '';
   print_form;
 }
 
 sub print_form {
 
   my $r = qq!<font color="#ff0000">*</font>!;
+  $cgi->delete('ref');
   my $self_url = $cgi->self_url;
 
   print $cgi->header( '-expires' => 'now' ), <<END;
@@ -148,6 +151,7 @@ END
   print <<END;
 <FORM ACTION="$self_url" METHOD=POST>
 <INPUT TYPE="hidden" NAME="magic" VALUE="process">
+<INPUT TYPE="hidden" NAME="ref" VALUE="$referral_custnum">
 Contact Information
 <TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
 <TR>
diff --git a/fs_signup/FS-SignupClient/fs_signupd b/fs_signup/FS-SignupClient/fs_signupd
index f22ab15d4..8b3cdde53 100755
--- a/fs_signup/FS-SignupClient/fs_signupd
+++ b/fs_signup/FS-SignupClient/fs_signupd
@@ -116,16 +116,16 @@ for ( ; $paddr = accept(Client,Server); close Client) {
     my(
       $first, $last, $ss, $company, $address1, $address2, $city, $county,
       $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
-      $paydate, $payname, $invoicing_list, $pkgpart, $username, $password,
-      $popnum,
-    ) = map { scalar(<Client>) } ( 1 .. 23 );
+      $paydate, $payname, $invoicing_list, $referral_custnum,
+      $pkgpart, $username, $password, $popnum,
+    ) = map { scalar(<Client>) } ( 1 .. 24 );
 
     warn "[fs_signupd] sending customer data to remote server...\n" if $Debug;
     print 
       $first, $last, $ss, $company, $address1, $address2, $city, $county,
       $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
-      $paydate, $payname, $invoicing_list, $pkgpart, $username, $password,
-      $popnum,
+      $paydate, $payname, $invoicing_list, $referral_custnum,
+      $pkgpart, $username, $password, $popnum,
     ;
 
     warn "[fs_signupd] reading error from remote server...\n" if $Debug;
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index c6ee665fa..43683b01d 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -88,9 +88,9 @@ while (1) {
     chop( my(
       $first, $last, $ss, $company, $address1, $address2, $city, $county,
       $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
-      $paydate, $payname, $invoicing_list, $pkgpart, $username, $password,
-      $popnum,
-    ) = map { scalar(<$reader>) } ( 1 .. 23 ) );
+      $paydate, $payname, $invoicing_list, $referral_custnum,
+      $pkgpart, $username, $password, $popnum,
+    ) = map { scalar(<$reader>) } ( 1 .. 24 ) );
 
     warn "[fs_signup_server] Processing signup...\n" if $Debug;
 
@@ -99,27 +99,28 @@ while (1) {
     #shares some stuff with htdocs/edit/process/cust_main.cgi... take any
     # common that are still here and library them.
     my $cust_main = new FS::cust_main ( {
-      'custnum'  => '',
-      'agentnum' => $agentnum,
-      'refnum'   => $refnum,
-      'last'     => $last,
-      'first'    => $first,
-      'ss'       => $ss,
-      'company'  => $company,
-      'address1' => $address1,
-      'address2' => $address2,
-      'city'     => $city,
-      'county'   => $county,
-      'state'    => $state,
-      'zip'      => $zip,
-      'country'  => $country,
-      'daytime'  => $daytime,
-      'night'    => $night,
-      'fax'      => $fax,
-      'payby'    => $payby,
-      'payinfo'  => $payinfo,
-      'paydate'  => $paydate,
-      'payname'  => $payname,
+      'custnum'          => '',
+      'agentnum'         => $agentnum,
+      'refnum'           => $refnum,
+      'last'             => $last,
+      'first'            => $first,
+      'ss'               => $ss,
+      'company'          => $company,
+      'address1'         => $address1,
+      'address2'         => $address2,
+      'city'             => $city,
+      'county'           => $county,
+      'state'            => $state,
+      'zip'              => $zip,
+      'country'          => $country,
+      'daytime'          => $daytime,
+      'night'            => $night,
+      'fax'              => $fax,
+      'payby'            => $payby,
+      'payinfo'          => $payinfo,
+      'paydate'          => $paydate,
+      'payname'          => $payname,
+      'referral_custnum' => $referral_custnum,
     } );
 
     $error = "Illegal payment type" unless grep { $_ eq $payby } @payby;
diff --git a/httemplate/docs/signup.html b/httemplate/docs/signup.html
index a40b1f963..ae5f63f15 100644
--- a/httemplate/docs/signup.html
+++ b/httemplate/docs/signup.html
@@ -18,6 +18,7 @@ Then:
 <ul>
   <li>Add the user `freeside' to the the external machine.
   <li>Copy or symlink fs_signup/FS-SignupClient/cgi/signup.cgi into the web server's document space.
+  <li>When linking to signup.cgi, you can include a referring custnum in the URL as follows: <code>http://public.web.server/path/signup.cgi?ref=1542</code>
   <li>Enable CGI execution for files with the `.cgi' extension.  (with <a href="http://www.apache.org/docs/mod/mod_mime.html#addhandler">Apache</a>)
   <li>Create the /usr/local/freeside directory on the external machine (owned by the freeside user).
   <li>touch /usr/local/freeside/fs_signupd_socket; chown freeside /usr/local/freeside/fs_signupd_socket; chmod 600 /usr/local/freeside/fs_signupd_socket
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index e2bb333d6..dfbe6a253 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -138,6 +138,7 @@ CREATE INDEX cust_main2 ON cust_main ( ship_company );
 <pre>
 ALTER TABLE cust_main ADD COLUMN comments varchar NULL;
 </pre>
+  <li>If you are using the signup server, reinstall it according to the <a href="signup.html">instructions</a>.  The 1.3.x signup server is not compatible with 1.4.x.
   <li>Run bin/dbdef-create.
   <li>create a service based on svc_forward
   <li>Run bin/fs-migrate-svc_acct_sm
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index d038896f6..5defaf4af 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.3 2001-08-28 14:34:14 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.4 2001-08-28 16:58:08 ivan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
@@ -81,7 +81,7 @@ if ( scalar(@cust_main) == 1 && ! $cgi->param('referral_custnum') ) {
 END
     print ' <SELECT NAME="referral_depth" SIZE="1" onChange="changed(this)">';
     my $max = 8; #config file
-    $cgi->param('referral_depth') =~ /^(\d+)$/
+    $cgi->param('referral_depth') =~ /^(\d*)$/ 
       or eidiot "Illegal referral_depth";
     my $referral_depth = $1;
 
-- 
cgit v1.2.1


From 3ae5a3652e8d8270ba7d5b6cd061bf28fe629e61 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 29 Aug 2001 08:45:04 +0000
Subject: catchall *can* be NULL

---
 bin/fs-setup                  | 7 ++++---
 httemplate/docs/upgrade8.html | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 7056347e6..faa0e07f1 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.43 2001-08-19 13:50:47 ivan Exp $
+# $Id: fs-setup,v 1.44 2001-08-29 08:45:04 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -359,12 +359,13 @@ sub tables_hash_hack {
         'tax',      'char', 'NULL', 1,
         'otaker',   'varchar', '',     8,
         'refnum',   'int',  '',     '',
+        'referral_custnum', 'int',  'NULL', '',
         'comments', 'varchar', 'NULL', '',
       ],
       'primary_key' => 'custnum',
       'unique' => [ [] ],
       #'index' => [ ['last'], ['company'] ],
-      'index' => [ ['last'], [ 'company' ] ],
+      'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ] ],
     },
 
     'cust_main_invoice' => {
@@ -598,7 +599,7 @@ sub tables_hash_hack {
       'columns' => [
         'svcnum',    'int',    '',   '',
         'domain',    'varchar',    '',   $char_d,
-        'catchall',  'int',    '',    '',
+        'catchall',  'int', 'NULL',    '',
       ],
       'primary_key' => 'svcnum',
       'unique' => [ ['domain'] ],
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index dfbe6a253..3edc87864 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -71,7 +71,7 @@ CREATE TABLE svc_forward (
   PRIMARY KEY (svcnum)
 );
 ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
-ALTER TABLE svc_domain ADD catchall integer;
+ALTER TABLE svc_domain ADD catchall integer NULL;
 ALTER TABLE part_svc ADD svc_acct__domsvc integer NULL;
 ALTER TABLE part_svc ADD svc_acct__domsvc_flag char(1) NULL;
 ALTER TABLE part_svc ADD svc_domain__catchall integer NULL;
-- 
cgit v1.2.1


From cad67501e450c3216e403e645951fd3bec282c20 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 29 Aug 2001 09:11:30 +0000
Subject: ui

---
 httemplate/edit/agent.cgi | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index 701715fe5..236d05001 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,12 +1,12 @@
 <%
-#<!-- $Id: agent.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: agent.cgi,v 1.3 2001-08-29 09:11:30 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $agent $action $hashref $p $agent_type );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header menubar popurl);
+use FS::CGI qw(header menubar popurl ntable);
 use FS::Record qw(qsearch qsearchs fields);
 use FS::agent;
 use FS::agent_type;
@@ -44,10 +44,14 @@ print '<FORM ACTION="', popurl(1), 'process/agent.cgi" METHOD=POST>',
       qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$hashref->{agentnum}">!,
       "Agent #", $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)";
 
-print <<END;
-<PRE>
-Agent                     <INPUT TYPE="text" NAME="agent" SIZE=32 VALUE="$hashref->{agent}">
-Agent type                <SELECT NAME="typenum" SIZE=1>
+print &ntable("#cccccc", 2, ''), <<END;
+<TR>
+  <TH ALIGN="right">Agent</TH>
+  <TD><INPUT TYPE="text" NAME="agent" SIZE=32 VALUE="$hashref->{agent}"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right">Agent type</TH>
+  <TD><SELECT NAME="typenum" SIZE=1>
 END
 
 foreach $agent_type (qsearch('agent_type',{})) {
@@ -59,10 +63,17 @@ foreach $agent_type (qsearch('agent_type',{})) {
 }
 
 print <<END;
-</SELECT>
-Frequency (unimplemented) <INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}">
-Program (unimplemented)   <INPUT TYPE="text" NAME="prog" VALUE="$hashref->{prog}">
-</PRE>
+</SELECT></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Frequency (unimplemented)</TD>
+  <TD><INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Program (unimplemented)</TD>
+  <TD><INPUT TYPE="text" NAME="prog" VALUE="$hashref->{prog}"></TD>
+</TR>
+</TABLE>
 END
 
 print qq!<BR><INPUT TYPE="submit" VALUE="!,
-- 
cgit v1.2.1


From b752b1bede0539c9822b999e08e994f63036320d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 30 Aug 2001 15:30:26 +0000
Subject: slighly more docu

---
 httemplate/edit/part_svc.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index b8715fb49..5696e43f8 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.4 2001-08-19 15:53:35 jeff Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.5 2001-08-30 15:30:26 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -104,7 +104,7 @@ my %defs = (
   'svc_acct' => {
     'dir'       => 'Home directory',
     'uid'       => 'UID (set to fixed and blank for dial-only)',
-    'slipip'    => 'IP address (set to fixed and blank to disable dialin)',
+    'slipip'    => 'IP address (Set to fixed and blank to disable dialin, or, set a value to be exported to RADIUS Framed-IP-Address.  Use the special value <code>0e0</code> [zero e zero] to enable export to RADIUS without a Framed-IP-Address.)',
     'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
     'username'  => 'Username',
     'quota'     => '(unimplemented)',
@@ -112,6 +112,7 @@ my %defs = (
     'gid'       => 'GID (when blank, defaults to UID)',
     'shell'     => 'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file)',
     'finger'    => 'GECOS',
+    'domsvc'    => 'svcnum from svc_domain',
   },
   'svc_domain' => {
     'domain'    => 'Domain',
-- 
cgit v1.2.1


From 294b8c0914f497b7714bad51dfb000d33e843995 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 30 Aug 2001 16:23:32 +0000
Subject: update signup server: template form and success html, document

---
 fs_signup/FS-SignupClient/cgi/signup.cgi   | 382 ++++++++++++++++-------------
 fs_signup/FS-SignupClient/cgi/signup.html  | 149 +++++++++++
 fs_signup/FS-SignupClient/cgi/success.html |   4 +
 httemplate/docs/signup.html                |   2 +
 4 files changed, 367 insertions(+), 170 deletions(-)
 create mode 100755 fs_signup/FS-SignupClient/cgi/signup.html
 create mode 100644 fs_signup/FS-SignupClient/cgi/success.html

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 5d024a812..0da960579 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,18 +1,19 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.10 2001-08-28 16:58:08 ivan Exp $
+# $Id: signup.cgi,v 1.11 2001-08-30 16:23:32 ivan Exp $
 
 use strict;
-use vars qw( @payby $cgi $locales $packages $pops $r $error
+use vars qw( @payby $cgi $locales $packages $pops $error
              $last $first $ss $company $address1 $address2 $city $state $county
              $country $zip $daytime $night $fax $invoicing_list $payby $payinfo
              $paydate $payname $referral_custnum
              $pkgpart $username $password $popnum
              $ieak_file $ieak_template $cck_file $cck_template
+             $signup_html $signup_template $success_html $success_template
              $ac $exch $loc
+             $self_url
            );
-use subs qw( print_form print_okay expselect );
-
+use subs qw( print_form print_okay expselect signup_default success_default );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use HTTP::Headers::UserAgent 2.00;
@@ -28,6 +29,8 @@ use Text::Template;
 
 $ieak_file = '/usr/local/freeside/ieak.template';
 $cck_file = '/usr/local/freeside/cck.template';
+$signup_html = '/usr/local/freeside/signup.html';
+$success_html = '/usr/local/freeside/success.html';
 
 if ( -e $ieak_file ) {
   my $ieak_txt = Text::Template::_load_text($ieak_file)
@@ -39,6 +42,7 @@ if ( -e $ieak_file ) {
 } else {
   $ieak_template = '';
 }
+
 if ( -e $cck_file ) {
   my $cck_txt = Text::Template::_load_text($cck_file)
     or die $Text::Template::ERROR;
@@ -50,6 +54,42 @@ if ( -e $cck_file ) {
   $cck_template = '';
 }
 
+if ( -e $signup_html ) {
+  my $signup_txt = Text::Template::_load_text($signup_html)
+    or die $Text::Template::ERROR;
+  $signup_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
+  $signup_txt = $1;
+  $signup_template = new Text::Template ( TYPE => 'STRING',
+                                          SOURCE => $signup_txt,
+                                          DELIMITERS => [ '<%=', '%>' ]
+                                        )
+    or die $Text::Template::ERROR;
+} else {
+  $signup_template = new Text::Template ( TYPE => 'STRING',
+                                          SOURCE => &signup_default,
+                                          DELIMITERS => [ '<%=', '%>' ]
+                                        )
+    or die $Text::Template::ERROR;
+}
+
+if ( -e $success_html ) {
+  my $success_txt = Text::Template::_load_text($signup_html)
+    or die $Text::Template::ERROR;
+  $success_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
+  $success_txt = $1;
+  $success_template = new Text::Template ( TYPE => 'STRING',
+                                           SOURCE => $success_txt,
+                                           DELIMITERS => [ '<%=', '%>' ],
+                                         )
+    or die $Text::Template::ERROR;
+} else {
+  $success_template = new Text::Template ( TYPE => 'STRING',
+                                           SOURCE => &success_default,
+                                           DELIMITERS => [ '<%=', '%>' ],
+                                         )
+    or die $Text::Template::ERROR;
+}
+
 ( $locales, $packages, $pops ) = signup_info();
 
 $cgi = new CGI;
@@ -137,168 +177,13 @@ if ( defined $cgi->param('magic') ) {
 
 sub print_form {
 
-  my $r = qq!<font color="#ff0000">*</font>!;
   $cgi->delete('ref');
-  my $self_url = $cgi->self_url;
-
-  print $cgi->header( '-expires' => 'now' ), <<END;
-<HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>ISP Signup form</FONT><BR><BR>
-END
-
-  print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT>! if $error;
-
-  print <<END;
-<FORM ACTION="$self_url" METHOD=POST>
-<INPUT TYPE="hidden" NAME="magic" VALUE="process">
-<INPUT TYPE="hidden" NAME="ref" VALUE="$referral_custnum">
-Contact Information
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TH ALIGN="right">${r}Contact name<BR>(last, first)</TH>
-  <TD COLSPAN=3><INPUT TYPE="text" NAME="last" VALUE="$last">,
-                <INPUT TYPE="text" NAME="first" VALUE="$first"></TD>
-  <TD ALIGN="right">SS#</TD>
-  <TD><INPUT TYPE="text" NAME="ss" SIZE=11 VALUE="$ss"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Company</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="$company"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right">${r}Address</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="$address1"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">&nbsp;</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="$address2"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right">${r}City</TH>
-  <TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD>
-  <TH ALIGN="right">${r}State/Country</TH>
-  <TD><SELECT NAME="state" SIZE="1">
-END
-
-  foreach ( @{$locales} ) {
-    print "<OPTION";
-    print " SELECTED" if ( $state eq $_->{'state'}
-                           && $county eq $_->{'county'}
-                           && $country eq $_->{'country'}
-                         );
-    print ">", $_->{'state'};
-    print " (",$_->{'county'},")" if $_->{'county'};
-    print " / ", $_->{'country'};
-  }
-
-  print <<END;
-  </SELECT></TD>
-  <TH>${r}Zip</TH>
-  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="$zip"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Day Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Night Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Fax</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12></TD>
-</TR>
-</TABLE>$r required fields<BR>
-<BR>Billing information<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR><TD>
-END
-
-  print qq!<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
-  my @invoicing_list = split(', ', $invoicing_list );
-  print ' CHECKED'
-    if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
-  print '>Postal mail invoice</TD></TR><TR><TD>Email invoice ',
-         qq!<INPUT TYPE="text" NAME="invoicing_list" VALUE="!,
-         join(', ', grep { $_ ne 'POST' } @invoicing_list ),
-         qq!"></TD></TR>!;
-
-  print <<END;
-<TR><TD>Billing type</TD></TR></TABLE>
-<TABLE BGCOLOR="#c0c0c0" BORDER=1 WIDTH="100%">
-<TR>
-END
-
-  my %payby = (
-    'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>${r}Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
-    'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
-    'PREPAY' => qq!Prepaid card<BR>${r}<INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
-  );
-
-  my %paybychecked = (
-    'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $paydate). qq!<BR>${r}Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
-    'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $paydate),
-    'PREPAY' => qq!Prepaid card<BR>${r}<INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
-  );
-
-  for (@payby) {
-    print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
-    if ($payby eq $_) {
-      print qq! CHECKED> $paybychecked{$_}</TD>!;
-    } else {
-      print qq!> $payby{$_}</TD>!;
-    }
-  }
+  $self_url = $cgi->self_url;
 
-  print <<END;
-</TR></TABLE>$r required fields for each billing type
-<BR><BR>First package
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TD COLSPAN=2><SELECT NAME="pkgpart"><OPTION VALUE="">(none)
-END
-
-  foreach my $package ( @{$packages} ) {
-    print qq!<OPTION VALUE="!, $package->{'pkgpart'}, '"';
-    print " SELECTED" if $pkgpart && ( $package->{'pkgpart'} == $pkgpart );
-    print ">", $package->{'pkg'};
-  }
-
-  print <<END;
-  </SELECT></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Username</TD>
-  <TD><INPUT TYPE="text" NAME="username" VALUE="$username"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Password</TD>
-  <TD><INPUT TYPE="text" NAME="_password" VALUE="$password">
-  (blank to generate)</TD>
-</TR>
-<TR>
-  <TD ALIGN="right">POP</TD>
-  <TD><SELECT NAME="popnum" SIZE=1><OPTION> 
-END
+  $error = "Error: $error" if $error;
 
-  foreach my $pop ( @{$pops} ) {
-    print qq!<OPTION VALUE="!, $pop->{'popnum'}, '"',
-          ( $popnum && $pop->{'popnum'} == $popnum ) ? ' SELECTED' : '', ">", 
-          $pop->{'popnum'}, ": ", 
-          $pop->{'city'}, ", ",
-          $pop->{'state'},
-          " (", $pop->{'ac'}, ")/",
-          $pop->{'exch'}, "\n"
-        ;
-  }
-  print <<END;
-  </SELECT></TD>
-</TR>
-</TABLE>
-<BR><BR><INPUT TYPE="submit" VALUE="Signup">
-</FORM></BODY></HTML>
-END
+  print $cgi->header( '-expires' => 'now' ),
+        $signup_template->fill_in();
 
 }
 
@@ -341,13 +226,8 @@ sub print_okay {
           } split(/\n/, $cck_data);
 
   } else { #send a simple confirmation
-    print $cgi->header( '-expires' => 'now' ), <<END;
-<HTML><HEAD><TITLE>Signup successful</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Signup successful</FONT><BR><BR>
-blah blah blah
-</BODY>
-</HTML>
-END
+    print $cgi->header( '-expires' => 'now' ),
+          $success_template->fill_in();
   }
 }
 
@@ -386,3 +266,165 @@ sub expselect {
   $return;
 }
 
+sub success_default { #html to use if you don't specify a success file
+  <<'END';
+<HTML><HEAD><TITLE>Signup successful</TITLE></HEAD>
+<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Signup successful</FONT><BR><BR>
+Thanks for signing up!
+</BODY></HTML>
+END
+}
+
+sub signup_default { #html to use if you don't specify a template file
+  <<'END';
+<HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
+<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>ISP Signup form</FONT><BR><BR>
+<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
+<FORM ACTION="<%= $self_url %>" METHOD=POST>
+<INPUT TYPE="hidden" NAME="magic" VALUE="process">
+<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
+<INPUT TYPE="hidden" NAME="ss" VALUE="">
+Contact Information
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Contact name<BR>(last, first)</TH>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="last" VALUE="<%= $last %>">,
+                <INPUT TYPE="text" NAME="first" VALUE="<%= $first %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Company</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="<%= $company %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Address</TH>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="<%= $address1 %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">&nbsp;</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="<%= $address2 %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
+  <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
+  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
+  <TD><SELECT NAME="state" SIZE="1">
+
+  <%=
+    foreach ( @{$locales} ) {
+      $OUT .= '<OPTION';
+      $OUT .= ' SELECTED' if ( $state eq $_->{'state'}
+                               && $county eq $_->{'county'}
+                               && $country eq $_->{'country'}
+                             );
+      $OUT .= '>'. $_->{'state'};
+      $OUT .= ' ('. $_->{'county'}. ')' if $_->{'county'};
+      $OUT .= ' / '. $_->{'country'};
+    }
+  %>
+
+  </SELECT></TD>
+  <TH><font color="#ff0000">*</font>Zip</TH>
+  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Day Phone</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="<%= $daytime %>" SIZE=18></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Night Phone</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="<%= $night %>" SIZE=18></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Fax</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="<%= $fax %>" SIZE=12></TD>
+</TR>
+</TABLE><font color="#ff0000">*</font> required fields<BR>
+<BR>Billing information<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR><TD>
+
+  <%=
+    $OUT .= '<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"';
+    my @invoicing_list = split(', ', $invoicing_list );
+    $OUT .= ' CHECKED'
+      if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
+    $OUT .= '>';
+  %>
+
+  Postal mail invoice
+</TD></TR>
+<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="<%= join(', ', grep { $_ ne 'POST' } split(', ', $invoicing_list ) ) %>">
+</TD></TR>
+<TR><TD>Billing type</TD></TR></TABLE>
+<TABLE BGCOLOR="#c0c0c0" BORDER=1 WIDTH="100%">
+<TR>
+
+  <%=
+    my %payby = (
+      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", "12-2037"). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
+      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
+      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
+    );
+
+    my %paybychecked = (
+      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", $paydate). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
+      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
+    );
+
+    for (@payby) {
+      $OUT .= qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
+      if ($payby eq $_) {
+        $OUT .= qq! CHECKED> $paybychecked{$_}</TD>!;
+      } else {
+        $OUT .= qq!> $payby{$_}</TD>!;
+      }
+    }
+  %>
+
+</TR></TABLE><font color="#ff0000">*</font> required fields for each billing type
+<BR><BR>First package
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR>
+  <TD COLSPAN=2><SELECT NAME="pkgpart"><OPTION VALUE="">(none)
+
+  <%=
+    foreach my $package ( @{$packages} ) {
+      $OUT .= '<OPTION VALUE="'. $package->{'pkgpart'}. '"';
+      $OUT .= ' SELECTED' if $pkgpart && $package->{'pkgpart'} == $pkgpart;
+      $OUT .= '>'. $package->{'pkg'};
+    }
+  %>
+
+  </SELECT></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Username</TD>
+  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Password</TD>
+  <TD><INPUT TYPE="text" NAME="_password" VALUE="<%= $password %>">
+  (blank to generate)</TD>
+</TR>
+<TR>
+  <TD ALIGN="right">POP</TD>
+  <TD><SELECT NAME="popnum" SIZE=1><OPTION> 
+
+  <%=
+    foreach my $pop ( @{$pops} ) {
+      $OUT .= '<OPTION VALUE='. $pop->{'popnum'}. '"';
+      $OUT .= ' SELECTED' if $popnum && $pop->{'popnum'} == $popnum;
+      $OUT .= '>'. $pop->{'popnum'}. ': '. $pop->{'city'}. ', '.
+              $pop->{'state'}. ' ('. $pop->{'ac'}. ')/'. $pop->{'exch'}. "\n";
+    }
+  %>
+
+  </SELECT></TD>
+</TR>
+</TABLE>
+<BR><BR><INPUT TYPE="submit" VALUE="Signup">
+</FORM></BODY></HTML>
+END
+}
diff --git a/fs_signup/FS-SignupClient/cgi/signup.html b/fs_signup/FS-SignupClient/cgi/signup.html
new file mode 100755
index 000000000..bc02db230
--- /dev/null
+++ b/fs_signup/FS-SignupClient/cgi/signup.html
@@ -0,0 +1,149 @@
+<HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
+<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>ISP Signup form</FONT><BR><BR>
+<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
+<FORM ACTION="<%= $self_url %>" METHOD=POST>
+<INPUT TYPE="hidden" NAME="magic" VALUE="process">
+<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
+<INPUT TYPE="hidden" NAME="ss" VALUE="">
+Contact Information
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Contact name<BR>(last, first)</TH>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="last" VALUE="<%= $last %>">,
+                <INPUT TYPE="text" NAME="first" VALUE="<%= $first %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Company</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="<%= $company %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Address</TH>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="<%= $address1 %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">&nbsp;</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="<%= $address2 %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
+  <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
+  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
+  <TD><SELECT NAME="state" SIZE="1">
+
+  <%=
+    foreach ( @{$locales} ) {
+      $OUT .= '<OPTION';
+      $OUT .= ' SELECTED' if ( $state eq $_->{'state'}
+                               && $county eq $_->{'county'}
+                               && $country eq $_->{'country'}
+                             );
+      $OUT .= '>'. $_->{'state'};
+      $OUT .= ' ('. $_->{'county'}. ')' if $_->{'county'};
+      $OUT .= ' / '. $_->{'country'};
+    }
+  %>
+
+  </SELECT></TD>
+  <TH><font color="#ff0000">*</font>Zip</TH>
+  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Day Phone</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="<%= $daytime %>" SIZE=18></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Night Phone</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="<%= $night %>" SIZE=18></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Fax</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="<%= $fax %>" SIZE=12></TD>
+</TR>
+</TABLE><font color="#ff0000">*</font> required fields<BR>
+<BR>Billing information<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR><TD>
+
+  <%=
+    $OUT .= '<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"';
+    my @invoicing_list = split(', ', $invoicing_list );
+    $OUT .= ' CHECKED'
+      if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
+    $OUT .= '>';
+  %>
+
+  Postal mail invoice
+</TD></TR>
+<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="<%= join(', ', grep { $_ ne 'POST' } split(', ', $invoicing_list ) ) %>">
+</TD></TR>
+<TR><TD>Billing type</TD></TR></TABLE>
+<TABLE BGCOLOR="#c0c0c0" BORDER=1 WIDTH="100%">
+<TR>
+
+  <%=
+    my %payby = (
+      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", "12-2037"). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
+      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
+      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
+    );
+
+    my %paybychecked = (
+      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", $paydate). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
+      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
+    );
+
+    for (@payby) {
+      $OUT .= qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
+      if ($payby eq $_) {
+        $OUT .= qq! CHECKED> $paybychecked{$_}</TD>!;
+      } else {
+        $OUT .= qq!> $payby{$_}</TD>!;
+      }
+    }
+  %>
+
+</TR></TABLE><font color="#ff0000">*</font> required fields for each billing type
+<BR><BR>First package
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR>
+  <TD COLSPAN=2><SELECT NAME="pkgpart"><OPTION VALUE="">(none)
+
+  <%=
+    foreach my $package ( @{$packages} ) {
+      $OUT .= '<OPTION VALUE="'. $package->{'pkgpart'}. '"';
+      $OUT .= ' SELECTED' if $pkgpart && $package->{'pkgpart'} == $pkgpart;
+      $OUT .= '>'. $package->{'pkg'};
+    }
+  %>
+
+  </SELECT></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Username</TD>
+  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Password</TD>
+  <TD><INPUT TYPE="text" NAME="_password" VALUE="<%= $password %>">
+  (blank to generate)</TD>
+</TR>
+<TR>
+  <TD ALIGN="right">POP</TD>
+  <TD><SELECT NAME="popnum" SIZE=1><OPTION> 
+
+  <%=
+    foreach my $pop ( @{$pops} ) {
+      $OUT .= '<OPTION VALUE='. $pop->{'popnum'}. '"';
+      $OUT .= ' SELECTED' if $popnum && $pop->{'popnum'} == $popnum;
+      $OUT .= '>'. $pop->{'popnum'}. ': '. $pop->{'city'}. ', '.
+              $pop->{'state'}. ' ('. $pop->{'ac'}. ')/'. $pop->{'exch'}. "\n";
+    }
+  %>
+
+  </SELECT></TD>
+</TR>
+</TABLE>
+<BR><BR><INPUT TYPE="submit" VALUE="Signup">
+</FORM></BODY></HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/success.html b/fs_signup/FS-SignupClient/cgi/success.html
new file mode 100644
index 000000000..6bc2d1fd7
--- /dev/null
+++ b/fs_signup/FS-SignupClient/cgi/success.html
@@ -0,0 +1,4 @@
+<HTML><HEAD><TITLE>Signup successful</TITLE></HEAD>
+<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Signup successful</FONT><BR><BR>
+Thanks for signing up!
+</BODY></HTML>
diff --git a/httemplate/docs/signup.html b/httemplate/docs/signup.html
index ae5f63f15..f99b7ebb5 100644
--- a/httemplate/docs/signup.html
+++ b/httemplate/docs/signup.html
@@ -53,6 +53,8 @@ Optional:
     <li>$email_name - first and last name
   </ul>
   (an example file is included as <b>fs_signup/cck.template</b>).  See the <a href="http://help.netscape.com/products/client/mc/acctproc4.html">Netscape documentation</a> for more information.
+  <li>If you create a <b>/usr/local/freeside/signup.html</b> file on the external machine, it will be used as a template for the form HTML.  This requires the template to be constructed appropriately; probably best to start with the example file included as <b>fs_signup/FS-SignupClient/cgi/signup.html</b>.
+  <li>If you create a <b>/usr/local/freeside/success.html</b> file on the external machine, it will be used as the success HTML page.  Although template substiutions are available, a regular HTML file will work fine here, unlike signup.html.  An example file is included as <b>fs_signup/FS-SignupClient/cgi/success.html</b>
   <li>If there are any entries in the <i>prepay_credit</i> table, a user can enter a string matching the <b>identifier</i> column to receive the credit specified in the <b>amount</b> column, and/or the time specified in the <b>seconds</b> column (for use with the <a href="session.html">session monitor</a>), after which that <b>identifier</b> is no longer valid.  This can be used to implement pre-paid "calling card" type signups.  The <i>bin/generate-prepay</i> script can be used to populate the <i>prepay_credit</i> table.
 </ul>
 </body>
-- 
cgit v1.2.1


From 237bea175ad19676bda76c3ac756a4c0b5bd899a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 31 Aug 2001 07:17:33 +0000
Subject: fixes: > US UT expand state > Submit (no data entered) > US UT is
 gone frome the list.

---
 httemplate/edit/process/cust_main_county-expand.cgi | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
index a0231b076..5adffc62f 100755
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_main_county-expand.cgi,v 1.2 2001-08-17 11:05:31 ivan Exp $ -->
+# <!-- $Id: cust_main_county-expand.cgi,v 1.3 2001-08-31 07:17:33 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $taxnum $cust_main_county @expansion $expansion );
@@ -53,11 +53,13 @@ foreach ( @expansion) {
   die $error if $error;
 }
 
-unless ( qsearch('cust_main',{
-  'state'  => $cust_main_county->getfield('state'),
-  'county' => $cust_main_county->getfield('county'),
-  'country' =>  $cust_main_county->getfield('country'),
-} ) ) {
+unless ( qsearch( 'cust_main', {
+                                 'state'  => $cust_main_county->state,
+                                 'county' => $cust_main_county->county,
+                                 'country' =>  $cust_main_county->country,
+                               } )
+         || ! @expansion
+) {
   my($error)=($cust_main_county->delete);
   die $error if $error;
 }
-- 
cgit v1.2.1


From 7c49a7040bddba0f89d74e9166d38279a3c85b05 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 31 Aug 2001 07:28:00 +0000
Subject: better error message for nonexistant cust_main_county records

---
 httemplate/edit/cust_main_county-expand.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index 6b422cca6..4460ee8ad 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main_county-expand.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_main_county-expand.cgi,v 1.3 2001-08-31 07:28:00 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $taxnum $cust_main_county $p1 $delim $expansion );
@@ -27,7 +27,8 @@ if ( $cgi->param('error') ) {
   $expansion = '';
 }
 
-$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum});
+$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+  or die "cust_main_county.taxnum $taxnum not found";
 die "Can't expand entry!" if $cust_main_county->getfield('county');
 
 $p1 = popurl(1);
-- 
cgit v1.2.1


From 4ec61507a7b255c3f5e8a573eca18c48ddaaa2c1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 31 Aug 2001 08:43:41 +0000
Subject: > Order by City might be better state, city, then number

---
 httemplate/browse/svc_acct_pop.cgi | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index 0e6937f6c..c58ce3333 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_pop.cgi,v 1.3 2001-08-21 09:34:13 ivan Exp $ -->
+#<!-- $Id: svc_acct_pop.cgi,v 1.4 2001-08-31 08:43:41 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $svc_acct_pop );
@@ -30,7 +30,9 @@ print $cgi->header( '-expires' => 'now' ), header('POP Listing', menubar(
 END
 
 foreach $svc_acct_pop ( sort { 
-  $a->getfield('popnum') <=> $b->getfield('popnum')
+  #$a->getfield('popnum') <=> $b->getfield('popnum')
+  $a->state cmp $b->state || $a->city cmp $b->city
+    || $a->ac <=> $b->ac || $a->exch <=> $b->exch || $a->loc <=> $b->loc
 } qsearch('svc_acct_pop',{}) ) {
   my($hashref)=$svc_acct_pop->hashref;
   print <<END;
-- 
cgit v1.2.1


From e49fd9a1d93335d22174e47ccd547e47ccb17fe9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 31 Aug 2001 09:20:35 +0000
Subject: check US zips more strictly

---
 FS/FS/Record.pm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 2c745b413..9a532e3a0 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -813,10 +813,17 @@ Check/untaint zip codes.
 =cut
 
 sub ut_zip {
-  my( $self, $field ) = @_;
-  $self->getfield($field) =~ /^\s*(\w[\w\-\s]{2,8}\w)\s*$/
-    or return "Illegal (zip) $field: ". $self->getfield($field);
-  $self->setfield($field,$1);
+  my( $self, $field, $country ) = @_;
+  if ( $country eq 'US' ) {
+    $self->getfield($field) =~ /\s*(\d{5}(\-\d{4})?)\s*$/
+      or return "Illegal (zip) $field for country $country: ".
+                $self->getfield($field);
+    $self->setfield($field,$1);
+  } else {
+    $self->getfield($field) =~ /^\s*(\w[\w\-\s]{2,8}\w)\s*$/
+      or return "Illegal (zip) $field: ". $self->getfield($field);
+    $self->setfield($field,$1);
+  }
   '';
 }
 
@@ -969,7 +976,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.25 2001-08-21 09:34:13 ivan Exp $
+$Id: Record.pm,v 1.26 2001-08-31 09:20:35 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From d70e3f97ae64081dc724c77e64d71f3747fdddf1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 1 Sep 2001 12:35:39 +0000
Subject: totals

---
 httemplate/search/cust_bill.cgi | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index a961455be..d6d942b1b 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_bill.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_bill.cgi,v 1.3 2001-09-01 12:35:39 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $invnum $query $sortby @cust_bill );
@@ -82,25 +82,29 @@ if ( scalar(@cust_bill) == 1 ) {
 END
 
   my(%saw, $cust_bill);
+  my($tot_balance, $tot_amount) = (0, 0);
   foreach $cust_bill (
     sort $sortby grep(!$saw{$_->invnum}++, @cust_bill)
   ) {
     my($invnum, $owed, $charged, $date ) = (
       $cust_bill->invnum,
-      $cust_bill->owed,
-      $cust_bill->charged,
+      sprintf("%.2f", $cust_bill->owed),
+      sprintf("%.2f", $cust_bill->charged),
       $cust_bill->_date,
     );
     my $pdate = time2str("%b %d %Y", $date);
 
+    $tot_balance += $owed;
+    $tot_amount += $charged;
+
     my $rowspan = 1;
 
     my $view = popurl(2). "view/cust_bill.cgi?$invnum";
     print <<END;
       <TR>
         <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$invnum</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>\$$owed</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>\$$charged</FONT></A></TD>
+        <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view"><FONT SIZE=-1>\$$owed</FONT></A></TD>
+        <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view"><FONT SIZE=-1>\$$charged</FONT></A></TD>
         <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$pdate</FONT></A></TD>
 END
     my $custnum = $cust_bill->custnum;
@@ -123,8 +127,11 @@ END
 
     print "</TR>";
   }
-
+  $tot_balance = sprintf("%.2f", $tot_balance);
+  $tot_amount = sprintf("%.2f", $tot_amount);
   print <<END;
+      <TR><TD></TD><TH><FONT SIZE=-1>Total</FONT></TH><TH><FONT SIZE=-1>Total</FONT></TH></TR>
+      <TR><TD></TD><TD ALIGN="right"><FONT SIZE=-1>\$$tot_balance</FONT></TD><TD ALIGN="right"><FONT SIZE=-1>\$$tot_amount</FONT></TD></TD></TR>
     </TABLE>
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From cdd5aa1d86cd5b266e02bed58570c97c2d7698ba Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 1 Sep 2001 20:11:07 +0000
Subject: cust_bill_pay and cust_credit_refund. payments can apply to multiple
 invoices and refunds can apply to multiple credits.

---
 FS/FS/cust_bill_pay.pm      | 190 ++++++++++++++++++++++++++++++++++++++++++++
 FS/FS/cust_credit_refund.pm | 175 ++++++++++++++++++++++++++++++++++++++++
 FS/FS/cust_main.pm          |   4 +-
 FS/FS/cust_pay.pm           |  63 +++++++++++----
 FS/FS/cust_refund.pm        |  60 ++++++++++----
 bin/fs-setup                |  34 +++++++-
 httemplate/docs/schema.html |  18 ++++-
 7 files changed, 505 insertions(+), 39 deletions(-)
 create mode 100644 FS/FS/cust_bill_pay.pm
 create mode 100644 FS/FS/cust_credit_refund.pm

diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
new file mode 100644
index 000000000..045a9490b
--- /dev/null
+++ b/FS/FS/cust_bill_pay.pm
@@ -0,0 +1,190 @@
+package cust_bill_pay;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs dbh );
+#use FS::cust_bill
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::cust_bill_pay - Object methods for cust_bill_pay records
+
+=head1 SYNOPSIS 
+
+  use FS::cust_bill_pay;
+
+  $record = new FS::cust_bill_pay \%hash;
+  $record = new FS::cust_bill_pay { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_bill_pay object represents the application of a payment to a
+specific invoice.  FS::cust_bill_pay inherits from FS::Record.  The following
+fields are currently supported:
+
+=over 4
+
+=item billpaynum - primary key (assigned automatically)
+
+=item invnum - Invoice (see L<FS::cust_bill>)
+
+=item paynum - Payment (see L<FS::cust_pay>)
+
+=item amount - Amount of the payment to apply to the specific invoice.
+
+=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=back
+
+=head1 METHODS
+
+=over 4 
+
+=item new HASHREF
+
+Creates a new record.  To add the record to the database, see L<"insert">.
+
+=cut
+
+sub table { 'cust_bill_pay'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub insert {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->check;
+  return $error if $error;
+
+  $error = $self->SUPER::insert;
+
+  my $cust_pay = qsearchs('cust_pay', { 'paynum' => $self->paynum } ) or do {
+    $dbh->rollback if $oldAutoCommit;
+    return "unknown cust_pay.paynum: ". $self->paynum;
+  };
+
+  my $pay_total = 0;
+  $pay_total += $_ foreach map { $_->amount }
+    qsearch('cust_bill_pay', { 'paynum' => $self->paynum } );
+
+  if ( $pay_total > $cust_pay->paid ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "total cust_bill_pay.amount $pay_total for paynum ". $self->paynum.
+           " greater than cust_pay.paid ". $cust_pay->paid;
+  }
+
+  my $cust_bill = qsearchs('cust_bill', { 'invnum' => $self->invnum } ) or do {
+    $dbh->rollback if $oldAutoCommit;
+    return "unknown cust_bill.invnum: ". $self->invnum;
+  };
+
+  my $bill_total = 0;
+  $bill_total += foreach map { $_->amount }
+    qsearch('cust_bill_pay', { 'invnum' => $self->invnum } );
+#  $bill_total += foreach map { $_->amount } 
+#    qsearch('cust_credit_bill', { 'invnum' => $self->invnum } );
+  if ( $bill_total > $cust_bill->charged ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "total cust_bill_pay.amount and cust_credit_bill.amount $bill_total".
+           "for invnum ". $self->invnum.
+           " greater than cust_bill.charged ". $cust_bill->charged;
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+}
+
+=item delete
+
+Currently unimplemented (accounting reasons).
+
+=cut
+
+sub delete {
+  return "Can't (yet?) delete cust_bill_pay records!";
+}
+
+=item replace OLD_RECORD
+
+Currently unimplemented (accounting reasons).
+
+=cut
+
+sub replace {
+   return "Can't (yet?) modify cust_bill_pay records!";
+}
+
+=item check
+
+Checks all fields to make sure this is a valid payment.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert method.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('billpaynum')
+    || $self->ut_number('invnum')
+    || $self->ut_numner('paynum')
+    || $self->ut_money('amount')
+    || $self->ut_numbern('_date')
+  ;
+  return $error if $error;
+
+  $self->_date(time) unless $self->_date;
+
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: cust_bill_pay.pm,v 1.1 2001-09-01 20:11:07 ivan Exp $
+
+=head1 BUGS
+
+Delete and replace methods.
+
+cust_credit_bill isn't checked yet (uncomment around line 111)
+
+=head1 SEE ALSO
+
+L<FS::cust_pay>, L<FS::cust_bill>, L<FS::Record>, schema.html from the
+base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_credit_refund.pm b/FS/FS/cust_credit_refund.pm
new file mode 100644
index 000000000..f366eb147
--- /dev/null
+++ b/FS/FS/cust_credit_refund.pm
@@ -0,0 +1,175 @@
+package cust_credit_refund;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs dbh );
+#use FS::UID qw(getotaker);
+#use FS::cust_credit
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::cust_credit_refund - Object methods for cust_bill_pay records
+
+=head1 SYNOPSIS 
+
+  use FS::cust_credit_refund;
+
+  $record = new FS::cust_credit_refund \%hash;
+  $record = new FS::cust_credit_refund { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_credit_refund represents the application of a refund to a specific
+credit.  FS::cust_credit_refund inherits from FS::Record.  The following fields
+are currently supported:
+
+=over 4
+
+=item creditrefundnum - primary key (assigned automatically)
+
+=item crednum - Credit (see L<FS::cust_credit>)
+
+=item refundnum - Refund (see L<FS::cust_refund>)
+
+=item amount - Amount of the refund to apply to the specific credit.
+
+=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=back
+
+=head1 METHODS
+
+=over 4 
+
+=item new HASHREF
+
+Creates a new record.  To add the record to the database, see L<"insert">.
+
+sub table { 'cust_credit_refund'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub insert {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->check;
+  return $error if $error;
+
+  $error = $self->SUPER::insert;
+
+  my $cust_refund =
+    qsearchs('cust_refund', { 'refundnum' => $self->refundnum } )
+  or do {
+    $dbh->rollback if $oldAutoCommit;
+    return "unknown cust_refund.refundnum: ". $self->refundnum
+  };
+
+  my $refund_total = 0;
+  $refund_total += $_ foreach map { $_->amount }
+    qsearch('cust_credit_refund', { 'refundnum' => $self->refundnum } );
+
+  if ( $refund_total > $cust_refund->refund ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "total cust_credit_refund.amount $refund_total for refundnum ".
+           $self->refundnum.
+           " greater than cust_refund.refund ". $cust_refund->refund;
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+}
+
+=item delete
+
+Currently unimplemented (accounting reasons).
+
+=cut
+
+sub delete {
+  return "Can't (yet?) delete cust_credit_refund records!";
+}
+
+=item replace OLD_RECORD
+
+Currently unimplemented (accounting reasons).
+
+=cut
+
+sub replace {
+   return "Can't (yet?) modify cust_credit_refund records!";
+}
+
+=item check
+
+Checks all fields to make sure this is a valid payment.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert method.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('creditrefundnum')
+    || $self->ut_number('crednum')
+    || $self->ut_numner('refundnum')
+    || $self->ut_money('amount')
+    || $self->ut_numbern('_date')
+  ;
+  return $error if $error;
+
+  $self->_date(time) unless $self->_date;
+
+  return "unknown cust_credit.crednum: ". $self->crednum
+    unless qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: cust_credit_refund.pm,v 1.1 2001-09-01 20:11:07 ivan Exp $
+
+=head1 BUGS
+
+Delete and replace methods.
+
+=head1 SEE ALSO
+
+L<FS::cust_credit>, L<FS::cust_refund>, L<FS::Record>, schema.html from the
+base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 682b43d95..31f6d5e3e 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1398,7 +1398,7 @@ sub rebuild_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.22 2001-08-28 14:34:14 ivan Exp $
+$Id: cust_main.pm,v 1.23 2001-09-01 20:11:07 ivan Exp $
 
 =head1 BUGS
 
@@ -1415,8 +1415,6 @@ CyberCash v2 forces us to define some variables in package main.
 There should probably be a configuration file with a list of allowed credit
 card types.
 
-CyberCash is the only processor.
-
 No multiple currency support (probably a larger project than just this module).
 
 =head1 SEE ALSO
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index f0d945060..b1c35d76f 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -3,8 +3,9 @@ package FS::cust_pay;
 use strict;
 use vars qw( @ISA );
 use Business::CreditCard;
-use FS::Record qw( qsearchs );
+use FS::Record qw( dbh );
 use FS::cust_bill;
+use FS::cust_bill_pay;
 
 @ISA = qw( FS::Record );
 
@@ -37,8 +38,6 @@ currently supported:
 
 =item paynum - primary key (assigned automatically for new payments)
 
-=item invnum - Invoice (see L<FS::cust_bill>)
-
 =item paid - Amount of this payment
 
 =item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
@@ -66,21 +65,55 @@ sub table { 'cust_pay'; }
 
 =item insert
 
-Adds this payment to the databse, and updates the invoice (see
-L<FS::cust_bill>).
+Adds this payment to the database.
+
+For backwards-compatibility and convenience, if the additional field invnum
+is defined, an FS::cust_bill_pay record for the full amount of the payment
+will be created.
 
 =cut
 
 sub insert {
   my $self = shift;
 
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
   my $error = $self->check;
   return $error if $error;
 
-  my $old_cust_bill = qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
-  return "Unknown invnum" unless $old_cust_bill;
+  $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  if ( $self->invnum ) {
+    my $cust_bill_pay = new FS::cust_bill_pay {
+      'invnum' => $self->invnum,
+      'paynum' => $self->paynum,
+      'amount' => $self->paid,
+      '_date'  => $self->_date,
+    };
+    $error = $cust_bill_pay->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
 
-  $self->SUPER::insert;
 }
 
 =item delete
@@ -113,13 +146,11 @@ returns the error, otherwise returns false.  Called by the insert method.
 sub check {
   my $self = shift;
 
-  my $error;
-
-  $error =
+  my $error =
     $self->ut_numbern('paynum')
-    || $self->ut_number('invnum')
     || $self->ut_money('paid')
     || $self->ut_numbern('_date')
+    || $self->ut_textn('paybatch')
   ;
   return $error if $error;
 
@@ -147,9 +178,6 @@ sub check {
     return $error if $error;
   }
 
-  $error = $self->ut_textn('paybatch');
-  return $error if $error;
-
   ''; #no error
 
 }
@@ -158,7 +186,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.3 2001-04-09 23:05:15 ivan Exp $
+$Id: cust_pay.pm,v 1.4 2001-09-01 20:11:07 ivan Exp $
 
 =head1 BUGS
 
@@ -166,7 +194,8 @@ Delete and replace methods.
 
 =head1 SEE ALSO
 
-L<FS::Record>, L<FS::cust_bill>, schema.html from the base documentation.
+L<FS::cust_bill_pay>, L<FS::cust_bill>, L<FS::Record>, schema.html from the
+base documentation.
 
 =cut
 
diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 729dc02b0..8e4ef0d4e 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -3,9 +3,10 @@ package FS::cust_refund;
 use strict;
 use vars qw( @ISA );
 use Business::CreditCard;
-use FS::Record qw( qsearchs );
+use FS::Record qw( qsearchs dbh );
 use FS::UID qw(getotaker);
 use FS::cust_credit;
+use FS::cust_credit_refund;
 
 @ISA = qw( FS::Record );
 
@@ -38,8 +39,6 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item refundnum - primary key (assigned automatically for new refunds)
 
-=item crednum - Credit (see L<FS::cust_credit>)
-
 =item refund - Amount of the refund
 
 =item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
@@ -49,6 +48,8 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
 
+=item paybatch - text field for tracking card processing
+
 =item otaker - order taker (assigned automatically, see L<FS::UID>)
 
 =back
@@ -67,22 +68,55 @@ sub table { 'cust_refund'; }
 
 =item insert
 
-Adds this refund to the database, and updates the credit (see
-L<FS::cust_credit>).
+Adds this refund to the database.
+
+For backwards-compatibility and convenience, if the additional field crednum is
+defined, an FS::cust_credit_refund record for the full amount of the refund
+will be created.
 
 =cut
 
 sub insert {
   my $self = shift;
 
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
   my $error = $self->check;
   return $error if $error;
 
-  my $old_cust_credit =
-    qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
-  return "Unknown crednum" unless $old_cust_credit;
+  $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  if ( $self->crednum ) {
+    my $cust_credit_refund = new FS::cust_credit_refund {
+      'cred' => $self->cred,
+      'refundnum' => $self->refundnum,
+      'amount' => $self->refund,
+      '_date' => $self->_date,
+    };
+    $error = $cust_bill_pay->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
 
-  $self->SUPER::insert;
 }
 
 =item delete
@@ -115,13 +149,11 @@ returns the error, otherwise returns false.  Called by the insert method.
 sub check {
   my $self = shift;
 
-  my $error;
-
-  $error =
+  my $error =
     $self->ut_number('refundnum')
-    || $self->ut_number('crednum')
     || $self->ut_money('amount')
     || $self->ut_numbern('_date')
+    || $self->ut_textn('paybatch')
   ;
   return $error if $error;
 
@@ -157,7 +189,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.3 2001-04-09 23:05:15 ivan Exp $
+$Id: cust_refund.pm,v 1.4 2001-09-01 20:11:07 ivan Exp $
 
 =head1 BUGS
 
diff --git a/bin/fs-setup b/bin/fs-setup
index faa0e07f1..2cba840ef 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.44 2001-08-29 08:45:04 ivan Exp $
+# $Id: fs-setup,v 1.45 2001-09-01 20:11:07 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -398,7 +398,7 @@ sub tables_hash_hack {
     'cust_pay' => {
       'columns' => [
         'paynum',   'int',    '',   '',
-        'invnum',   'int',    '',   '',
+        #now cust_bill_pay #'invnum',   'int',    '',   '',
         'paid',     @money_type,
         '_date',    @date_type,
         'payby',    'char',   '',     4, # CARD/BILL/COMP, should be index into
@@ -411,6 +411,19 @@ sub tables_hash_hack {
       'index' => [ ['invnum'] ],
     },
 
+    'cust_bill_pay' => {
+      'column' => [
+        'billpaynum', 'int',     '',   '',
+        'invnum',  'int',     '',   '',
+        'paynum',  'int',     '',   '',
+        'amount',  @money_type,
+        '_date',   @date_type
+      ],
+      'primary_key' => 'billpaynum'
+      'unique' => [ [] ],
+      'index' => [ [ 'paynum', 'invnum' ] ],
+    },
+
     'cust_pay_batch' => { #what's this used for again?  list of customers
                           #in current CARD batch? (necessarily CARD?)
       'columns' => [
@@ -456,7 +469,7 @@ sub tables_hash_hack {
     'cust_refund' => {
       'columns' => [
         'refundnum',    'int',    '',   '',
-        'crednum',      'int',    '',   '',
+        #now cust_credit_refund #'crednum',      'int',    '',   '',
         '_date',        @date_type,
         'refund',       @money_type,
         'otaker',       'varchar',   '',   8,
@@ -464,12 +477,27 @@ sub tables_hash_hack {
         'payby',        'char',   '',     4, # CARD/BILL/COMP, should be index
                                              # into payment type table.
         'payinfo',      'varchar',   'NULL', 16,  #see cust_main above
+        'paybatch',     'varchar',   'NULL', $char_d,
       ],
       'primary_key' => 'refundnum',
       'unique' => [ [] ],
       'index' => [ ['crednum'] ],
     },
 
+    'cust_credit_refund' => {
+      'column' => [
+        'creditrefundnum', 'int',     '',   '',
+        'crednum',  'int',     '',   '',
+        'refundnum',  'int',     '',   '',
+        'amount',  @money_type,
+        '_date',   @date_type
+      ],
+      'primary_key' => 'creditrefundnum'
+      'unique' => [ [] ],
+      'index' => [ [ 'crednum', 'refundnum' ] ],
+    },
+
+
     'cust_svc' => {
       'columns' => [
         'svcnum',    'int',    '',   '',
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 0da33a5c2..818547e1c 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -100,13 +100,20 @@
     <li><a name="cust_pay" href="man/FS/cust_pay.html">cust_pay</a> - Payments.  Money being transferred from a customer.
       <ul>
         <li>paynum - primary key
-        <li>invnum - <a href="#cust_bill">invoice</a>
         <li>paid - amount
         <li>_date
         <li>payby - CARD, BILL, or COMP
         <li>payinfo - card number, P.O.#, or comp issuer
         <li>paybatch - text field for tracking card processor batches
       </ul>
+    <li><a name="cust_bill_pay" href="man/FS/cust_bill_pay.html">cust_bill_pay</a> - Applicaton of a payment to a specific invoice.
+      <ul>
+        <li>billpaynum
+        <li>invnum - <a href="#cust_bill">invoice</a>
+        <li>paynum - <a href="#cust_pay">payment</a>
+        <li>amount
+        <li>_date
+      </ul>
     <li><a name="cust_pay_batch" href="man/FS/cust_pay_batch.html">cust_pay_batch</a> - Pending batch
       <ul>
         <li>trancode - 77 for charges
@@ -140,13 +147,20 @@
     <li><a name="cust_refund" href="man/FS/cust_refund.html">cust_refund</a> - Refunds.  The transfer of money to a customer; equivalent to a negative <a href="#cust_pay">cust_pay</a> record.
       <ul>
         <li>refundnum - primary key
-        <li>crednum - <a href="#cust_credit">credit</a>
         <li>refund - amount
         <li>_date
         <li>payby - CARD, BILL or COMP
         <li>payinfo - card number, P.O.#, or comp issuer
         <li>otaker - order taker
       </ul>
+    <li><a name="cust_credit_refund" href="man/FS/cust_credit_refund.html">cust_credit_refund</a> - Applicaton of a refund to a specific credit.
+      <ul>
+        <li>creditrefundnum - primary key
+        <li>crednum - <a href="#cust_credit">credit</a>
+        <li>refundnum - <a href="#cust_refund">refund</a>
+        <li>amount
+        <li>_date
+      </ul>
     <li><a name="cust_svc" href="man/FS/cust_svc.html">cust_svc</a> - Customer services
       <ul>
         <li>svcnum - primary key
-- 
cgit v1.2.1


From 6412f71a3557249225abf5eb2096ebad1729c585 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sat, 1 Sep 2001 21:52:20 +0000
Subject: add cust_credit_bill relating multiple invoices to credits

---
 FS/FS/cust_bill.pm                           |  32 +++++-
 FS/FS/cust_credit.pm                         |  23 ++++-
 FS/FS/cust_credit_bill.pm                    | 146 +++++++++++++++++++++++++++
 FS/FS/cust_main.pm                           |   3 +-
 FS/MANIFEST                                  |   1 +
 bin/fs-setup                                 |  14 ++-
 httemplate/docs/upgrade8.html                |  10 ++
 httemplate/edit/cust_credit_bill.cgi         |  81 +++++++++++++++
 httemplate/edit/process/cust_credit_bill.cgi |  56 ++++++++++
 httemplate/view/cust_main.cgi                |  12 ++-
 10 files changed, 365 insertions(+), 13 deletions(-)
 create mode 100644 FS/FS/cust_credit_bill.pm
 create mode 100755 httemplate/edit/cust_credit_bill.cgi
 create mode 100755 httemplate/edit/process/cust_credit_bill.cgi

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 4ffb8e210..4c1617f0e 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -11,6 +11,7 @@ use FS::cust_bill_pkg;
 use FS::cust_credit;
 use FS::cust_pay;
 use FS::cust_pkg;
+use FS::cust_credit_bill;
 
 @ISA = qw( FS::Record );
 
@@ -204,8 +205,8 @@ sub cust_bill_pkg {
 =item cust_credit
 
 Returns a list consisting of the total previous credited (see
-L<FS::cust_credit>) for this customer, followed by the previous outstanding
-credits (FS::cust_credit objects).
+L<FS::cust_credit>) and unapplied for this customer, followed by the previous
+outstanding credits (FS::cust_credit objects).
 
 =cut
 
@@ -233,6 +234,19 @@ sub cust_pay {
   ;
 }
 
+=item cust_credited
+
+Returns all applied credits (see L<FS::cust_credit_bill>) for this invoice.
+
+=cut
+
+sub cust_credited {
+  my $self = shift;
+  sort { $a->_date <=> $b->_date }
+    qsearch( 'cust_credit_bill', { 'invnum' => $self->invnum } )
+  ;
+}
+
 =item tax
 
 Returns the tax amount (see L<FS::cust_bill_pkg>) for this invoice.
@@ -251,7 +265,8 @@ sub tax {
 =item owed
 
 Returns the amount owed (still outstanding) on this invoice, which is charged
-minus all payments (see L<FS::cust_pay>).
+minus all payments (see L<FS::cust_pay>) and applied credits
+(see L<FS::cust_credit_bill>).
 
 =cut
 
@@ -259,7 +274,8 @@ sub owed {
   my $self = shift;
   my $balance = $self->charged;
   $balance -= $_->paid foreach ( $self->cust_pay );
-  $balance;
+  $balance -= $_->amount foreach ( $self->cust_credited );
+  $balance = sprintf( "%.2f", $balance);
 }
 
 =item print_text [TIME];
@@ -349,6 +365,12 @@ sub print_text {
   push @buf,['',''];
 
   #credits
+  foreach ( $self->cust_credited ) {
+    push @buf,[
+      "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
+      $money_char. sprintf("%10.2f",$_->amount)
+    ];
+  }
   foreach ( @cr_cust_credit ) {
     push @buf,[
       "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
@@ -441,7 +463,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.8 2001-08-03 20:34:28 jeff Exp $
+$Id: cust_bill.pm,v 1.9 2001-09-01 21:52:19 jeff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index d6de27c64..ec3a7ce26 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -6,6 +6,7 @@ use FS::UID qw( getotaker );
 use FS::Record qw( qsearch qsearchs );
 use FS::cust_main;
 use FS::cust_refund;
+use FS::cust_credit_bill;
 
 @ISA = qw( FS::Record );
 
@@ -132,10 +133,25 @@ sub cust_refund {
   ;
 }
 
+=item cust_credit_bill
+
+Returns all application to invoices (see L<FS::cust_credit_bill>) for this
+credit.
+
+=cut
+
+sub cust_credit_bill {
+  my $self = shift;
+  sort { $a->_date <=> $b->_date }
+    qsearch( 'cust_credit_bill', { 'crednum' => $self->crednum } )
+  ;
+}
+
 =item credited
 
 Returns the amount of this credit that is still outstanding; which is
-amount minus all refunds (see L<FS::cust_refund>).
+amount minus all refunds (see L<FS::cust_refund>) and applications to
+invoices (see L<FS::cust_credit_bill>).
 
 =cut
 
@@ -143,14 +159,15 @@ sub credited {
   my $self = shift;
   my $amount = $self->amount;
   $amount -= $_->refund foreach ( $self->cust_refund );
-  $amount;
+  $amount -= $_->amount foreach ( $self->cust_credit_bill );
+  sprintf( "%.2f", $amount );
 }
 
 =back
 
 =head1 VERSION
 
-$Id: cust_credit.pm,v 1.8 2001-08-26 05:06:19 ivan Exp $
+$Id: cust_credit.pm,v 1.9 2001-09-01 21:52:19 jeff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_credit_bill.pm b/FS/FS/cust_credit_bill.pm
new file mode 100644
index 000000000..be3d54897
--- /dev/null
+++ b/FS/FS/cust_credit_bill.pm
@@ -0,0 +1,146 @@
+package FS::cust_credit_bill;
+
+use strict;
+use vars qw( @ISA );
+use FS::UID qw( getotaker );
+use FS::Record qw( qsearch qsearchs );
+use FS::cust_main;
+use FS::cust_refund;
+use FS::cust_credit;
+use FS::cust_bill;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::cust_credit_bill - Object methods for cust_credit_bill records
+
+=head1 SYNOPSIS
+
+  use FS::cust_credit_bill;
+
+  $record = new FS::cust_credit_bill \%hash;
+  $record = new FS::cust_credit_bill { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_credit_bill object represents application of a credit (see
+L<FS::cust_credit>) to a customer bill (see L<FS::cust_bill>).  FS::cust_credit
+inherits from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item crednum - primary key; credit being applied 
+
+=item invnum - invoice to which credit is applied (see L<FS::cust_bill>)
+
+=item amount - amount of the credit applied
+
+=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new cust_credit_bill.  To add the cust_credit_bill to the database,
+see L<"insert">.
+
+=cut
+
+sub table { 'cust_credit_bill'; }
+
+=item insert
+
+Adds this cust_credit_bill to the database ("Posts" all or part of a credit).
+If there is an error, returns the error, otherwise returns false.
+
+=item delete
+
+Currently unimplemented.
+
+=cut
+
+sub delete {
+  return "Can't unapply credit!"
+}
+
+=item replace OLD_RECORD
+
+Application of credits may not be modified.
+
+=cut
+
+sub replace {
+  return "Can't modify application of credit!"
+}
+
+=item check
+
+Checks all fields to make sure this is a valid credit application.  If there
+is an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error =
+    $self->ut_number('crednum')
+    || $self->ut_number('invnum')
+    || $self->ut_numbern('_date')
+    || $self->ut_money('amount')
+  ;
+  return $error if $error;
+
+  return "Unknown credit"
+    unless my $cust_credit = 
+      qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
+
+  return "Unknown invoice"
+    unless my $cust_bill =
+      qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
+
+  $self->_date(time) unless $self->_date;
+
+  return "Cannot apply more than remaining value of credit memo"
+    unless $self->amount <= $cust_credit->credited;
+
+  return "Cannot apply more than remaining value of invoice"
+    unless $self->amount <= $cust_bill->owed;
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: cust_credit_bill.pm,v 1.1 2001-09-01 21:52:19 jeff Exp $
+
+=head1 BUGS
+
+The delete method.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_refund>, L<FS::cust_bill>, schema.html from the base
+documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 31f6d5e3e..382cc492d 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -28,6 +28,7 @@ use FS::part_referral;
 use FS::cust_main_county;
 use FS::agent;
 use FS::cust_main_invoice;
+use FS::cust_credit_bill;
 use FS::prepay_credit;
 
 @ISA = qw( FS::Record );
@@ -1398,7 +1399,7 @@ sub rebuild_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.23 2001-09-01 20:11:07 ivan Exp $
+$Id: cust_main.pm,v 1.24 2001-09-01 21:52:20 jeff Exp $
 
 =head1 BUGS
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index fa51b21b6..a8c080b60 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -13,6 +13,7 @@ FS/agent_type.pm
 FS/cust_bill.pm
 FS/cust_bill_pkg.pm
 FS/cust_credit.pm
+FS/cust_credit_bill.pm
 FS/cust_main.pm
 FS/cust_main_county.pm
 FS/cust_main_invoice.pm
diff --git a/bin/fs-setup b/bin/fs-setup
index 2cba840ef..8fbc67ef3 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.45 2001-09-01 20:11:07 ivan Exp $
+# $Id: fs-setup,v 1.46 2001-09-01 21:52:20 jeff Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -317,6 +317,18 @@ sub tables_hash_hack {
       'index' => [ ['custnum'] ],
     },
 
+    'cust_credit_bill' => {
+      'columns' => [
+        'crednum',  'int', '', '',
+        'invnum',  'int', '', '',
+        '_date',    @date_type,
+        'amount',   @money_type,
+      ],
+      'primary_key' => 'crednum',
+      'unique' => [ [] ],
+      'index' => [ ['invnum'] ],
+    },
+
     'cust_main' => {
       'columns' => [
         'custnum',  'int',  '',     '',
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 3edc87864..b35194df2 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -70,6 +70,15 @@ CREATE TABLE svc_forward (
   dst varchar(80),
   PRIMARY KEY (svcnum)
 );
+
+CREATE TABLE cust_credit_bill (
+  crednum int not null,
+  invnum int not null,
+  _date timestamp not null,
+  amount decimal(10,2) not null,
+  PRIMARY KEY (crednum)
+);
+
 ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
 ALTER TABLE svc_domain ADD catchall integer NULL;
 ALTER TABLE part_svc ADD svc_acct__domsvc integer NULL;
@@ -84,6 +93,7 @@ ALTER TABLE part_svc ADD svc_forward__dst integer NULL;
 ALTER TABLE part_svc ADD svc_forward__dst_flag char(1) NULL;
 ALTER TABLE cust_main ADD referral_custnum integer NULL;
 CREATE INDEX cust_main3 ON cust_main ( referral_custnum );
+CREATE INDEX cust_credit_bill2 ON cust_credit_bill ( invnum );
 </pre>
 
   <li>If you are using PostgreSQL, apply the following changes to your database:
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
new file mode 100755
index 000000000..df495a668
--- /dev/null
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -0,0 +1,81 @@
+<%
+#<!-- $Id: cust_credit_bill.cgi,v 1.1 2001-09-01 21:52:20 jeff Exp $ -->
+
+use strict;
+use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $_date $amount $reason $cust_credit );
+use Date::Format;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(header popurl);
+use FS::Record qw(qsearch fields);
+use FS::cust_credit;
+use FS::cust_bill;
+
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  #$cust_credit_bill = new FS::cust_credit_bill ( {
+  #  map { $_, scalar($cgi->param($_)) } fields('cust_credit_bill')
+  #} );
+  $crednum = $cgi->param('crednum');
+  $amount = $cgi->param('amount');
+  #$refund = $cgi->param('refund');
+  $invnum = $cgi->param('invnum');
+} else {
+  ($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $crednum = $1;
+  $amount = '';
+  #$refund = 'yes';
+  $invnum = '';
+}
+$_date = time;
+
+$otaker = getotaker;
+
+$p1 = popurl(1);
+
+print $cgi->header( '-expires' => 'now' ), header("Apply Credit", '');
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+print <<END;
+    <FORM ACTION="${p1}process/cust_credit_bill.cgi" METHOD=POST>
+    <PRE>
+END
+
+die unless $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } );
+
+print qq!Credit #<B>!, $crednum, qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
+
+print qq!\nInvoice # <SELECT NAME="invnum" SIZE=1>!;
+foreach $_ (grep $_->owed, qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } ) ) {
+  print "<OPTION", (($_->invnum eq $invnum) ? " SELECTED" : ""),
+    qq! VALUE="! .$_->invnum. qq!">!. $_->invnum. qq! (! . $_->owed . qq!)!;
+}
+print qq!<OPTION VALUE="Refund">Refund!;
+print "</SELECT>";
+
+print qq!\nDate: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
+
+print qq!\nAmount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
+
+#print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
+
+print <<END;
+</PRE>
+<BR>
+<CENTER><INPUT TYPE="submit" VALUE="Post"></CENTER>
+END
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/process/cust_credit_bill.cgi b/httemplate/edit/process/cust_credit_bill.cgi
new file mode 100755
index 000000000..f838dff10
--- /dev/null
+++ b/httemplate/edit/process/cust_credit_bill.cgi
@@ -0,0 +1,56 @@
+<%
+#<!-- $Id: cust_credit_bill.cgi,v 1.1 2001-09-01 21:52:20 jeff Exp $ -->
+
+use strict;
+use vars qw( $cgi $custnum $crednum $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(popurl);
+use FS::Record qw(qsearchs fields);
+use FS::cust_credit;
+use FS::cust_credit_bill;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$cgi->param('crednum') =~ /^(\d*)$/ or die "Illegal crednum!";
+$crednum = $1;
+
+my $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } )
+  or die "No such crednum";
+
+my $cust_main = qsearchs('cust_main', { 'custnum' => $cust_credit->custnum } )
+  or die "Bogus credit:  not attached to customer";
+
+my $custnum = $cust_main->custnum;
+
+if ($cgi->param('invnum') =~ /^Refund$/) {
+  $new = new FS::cust_refund ( {
+    'reason'  => $cust_credit->reason,
+    'refund'  => $cgi->param('amount'),
+    'payby'   => 'BILL',
+    '_date'   => $cgi->param('_date'),
+    'payinfo' => 'Cash',
+    'crednum' => $crednum,
+  } );
+}else{
+  $new = new FS::cust_credit_bill ( {
+    map {
+      $_, scalar($cgi->param($_));
+    #} qw(custnum _date amount invnum)
+    } fields('cust_credit_bill')
+  } );
+}
+
+$error=$new->insert;
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "cust_credit_bill.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+}
+
+
+%>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index cba702670..492183d11 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.5 2001-08-28 14:34:14 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.6 2001-09-01 21:52:20 jeff Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
@@ -357,9 +357,15 @@ foreach $bill (@bills) {
 @credits = qsearch('cust_credit',{'custnum'=>$custnum});
 foreach $credit (@credits) {
   my($cref)=$credit->hashref;
+  my($credited)=$credit->credited;
   push @history,
-    $cref->{_date} . "\tCredit #" . $cref->{crednum} . ", (Balance \$" .
-    $cref->{credited} . ") by " . $cref->{otaker} . " - " .
+    $cref->{_date} . "\t" .
+    ($credited ?
+       (qq!<A HREF="! . popurl(2). qq!edit/cust_credit_bill.cgi?!. $cref->{crednum} . qq!">!) :
+       "") .
+    "Credit #" .
+    $cref->{crednum} . ", (Balance \$" .
+    $credited . ")" . ($credited ? "</A>" : "") .
     $cref->{reason} . "\t\t\t" . $cref->{amount} . "\t";
 
   my(@refunds)=qsearch('cust_refund',{'crednum'=> $cref->{crednum} } );
-- 
cgit v1.2.1


From 80e8925f41f10f9787fa4fe245dcd056ada7a71f Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sat, 1 Sep 2001 21:55:06 +0000
Subject: oops.. need this too

---
 FS/FS/cust_bill_pay.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index 045a9490b..e7040d96b 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -108,8 +108,8 @@ sub insert {
   my $bill_total = 0;
   $bill_total += foreach map { $_->amount }
     qsearch('cust_bill_pay', { 'invnum' => $self->invnum } );
-#  $bill_total += foreach map { $_->amount } 
-#    qsearch('cust_credit_bill', { 'invnum' => $self->invnum } );
+  $bill_total += foreach map { $_->amount } 
+    qsearch('cust_credit_bill', { 'invnum' => $self->invnum } );
   if ( $bill_total > $cust_bill->charged ) {
     $dbh->rollback if $oldAutoCommit;
     return "total cust_bill_pay.amount and cust_credit_bill.amount $bill_total".
@@ -171,7 +171,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_bill_pay.pm,v 1.1 2001-09-01 20:11:07 ivan Exp $
+$Id: cust_bill_pay.pm,v 1.2 2001-09-01 21:55:06 jeff Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From f918ef6adbc3c19e705e2f5fda1efe135f3554c8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 1 Sep 2001 22:01:21 +0000
Subject: cust_bill_pay & cust_credit_refund

---
 FS/MANIFEST | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/FS/MANIFEST b/FS/MANIFEST
index a8c080b60..f6b8abf2a 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -18,9 +18,11 @@ FS/cust_main.pm
 FS/cust_main_county.pm
 FS/cust_main_invoice.pm
 FS/cust_pay.pm
+FS/cust_bill_pay.pm
 FS/cust_pay_batch.pm
 FS/cust_pkg.pm
 FS/cust_refund.pm
+FS/cust_credit_refund.pm
 FS/cust_svc.pm
 FS/part_pkg.pm
 FS/part_referral.pm
-- 
cgit v1.2.1


From 60c10ab363668ec3016306e6069eaade9e04d544 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 1 Sep 2001 22:18:38 +0000
Subject: add primary key

---
 FS/FS/cust_credit_bill.pm | 9 +++++----
 bin/fs-setup              | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/FS/FS/cust_credit_bill.pm b/FS/FS/cust_credit_bill.pm
index be3d54897..d6c4f6c4b 100644
--- a/FS/FS/cust_credit_bill.pm
+++ b/FS/FS/cust_credit_bill.pm
@@ -99,7 +99,8 @@ sub check {
   my $self = shift;
 
   my $error =
-    $self->ut_number('crednum')
+    $self->ut_numbern('creditbillnum')
+    || $self->ut_number('crednum')
     || $self->ut_number('invnum')
     || $self->ut_numbern('_date')
     || $self->ut_money('amount')
@@ -129,7 +130,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_credit_bill.pm,v 1.1 2001-09-01 21:52:19 jeff Exp $
+$Id: cust_credit_bill.pm,v 1.2 2001-09-01 22:18:38 ivan Exp $
 
 =head1 BUGS
 
@@ -137,8 +138,8 @@ The delete method.
 
 =head1 SEE ALSO
 
-L<FS::Record>, L<FS::cust_refund>, L<FS::cust_bill>, schema.html from the base
-documentation.
+L<FS::Record>, L<FS::cust_refund>, L<FS::cust_bill>, L<cust_credit>,
+schema.html from the base documentation.
 
 =cut
 
diff --git a/bin/fs-setup b/bin/fs-setup
index 8fbc67ef3..71d53ef85 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.46 2001-09-01 21:52:20 jeff Exp $
+# $Id: fs-setup,v 1.47 2001-09-01 22:18:38 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -319,14 +319,15 @@ sub tables_hash_hack {
 
     'cust_credit_bill' => {
       'columns' => [
+        'creditbillnum', 'int', '', '',
         'crednum',  'int', '', '',
         'invnum',  'int', '', '',
         '_date',    @date_type,
         'amount',   @money_type,
       ],
-      'primary_key' => 'crednum',
+      'primary_key' => 'creditbillnum',
       'unique' => [ [] ],
-      'index' => [ ['invnum'] ],
+      'index' => [ ['crednum'], ['invnum'] ],
     },
 
     'cust_main' => {
@@ -420,7 +421,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'paynum',
       'unique' => [ [] ],
-      'index' => [ ['invnum'] ],
+      'index' => [ [] ],
     },
 
     'cust_bill_pay' => {
-- 
cgit v1.2.1


From 42ac86258bce00f5e7fa2db7e375c4a344295a15 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sat, 1 Sep 2001 22:28:51 +0000
Subject: haste makes waste... and left a method out

---
 FS/FS/cust_main.pm            | 53 ++++++++++++++++++++++++++++++++++++++++++-
 httemplate/docs/upgrade8.html |  4 ++--
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 382cc492d..bd1f212b3 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1239,6 +1239,57 @@ sub total_owed {
   sprintf( "%.2f", $total_bill );
 }
 
+=item apply_credits
+
+Applies (see L<FS::cust_credit_bill>) unapplied credits (see L<FS::cust_credit>)to outstanding invoice balances in cronological order and returns the value
+of any remaining unapplied credits available for refund (see L<FS::cust_refund>).
+
+=cut
+
+sub apply_credits {
+  my $self = shift;
+
+  return 0 unless $self->total_credited;
+
+  my @credits = sort { $b->_date <=> $a->_date} (grep { $_->credited > 0 }
+      qsearch('cust_credit', { 'custnum' => $self->custnum } ) );
+
+  my @invoices = sort { $a->_date <=> $b->_date} (grep { $_->owed > 0 }
+      qsearch('cust_bill', { 'custnum' => $self->custnum } ) );
+
+  my $credit;
+
+  foreach my $cust_bill ( @invoices ) {
+    my $amount;
+
+    if (!(defined $credit) || $credit->credited == 0) {
+      $credit = pop @credits;
+      last unless defined $credit;
+    }
+
+    if ($cust_bill->owed >= $credit->credited) {
+      $amount=$credit->credited;
+    }else{
+      $amount=$cust_bill->owed;
+    }
+    
+    my $cust_credit_bill = new FS::cust_credit_bill ( {
+      'crednum' => $credit->crednum,
+      'invnum'  => $cust_bill->invnum,
+      'amount'  => $amount,
+      '_date'   => time,
+    } );
+    my $error = $cust_credit_bill->insert;
+    die $error if $error;
+    
+    redo if ($cust_bill->owed > 0);
+
+  }
+
+  return $self->total_credited;
+}
+
+
 =item total_credited
 
 Returns the total credits (see L<FS::cust_credit>) for this customer.
@@ -1399,7 +1450,7 @@ sub rebuild_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.24 2001-09-01 21:52:20 jeff Exp $
+$Id: cust_main.pm,v 1.25 2001-09-01 22:28:51 jeff Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index b35194df2..765c2b8d5 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -75,8 +75,7 @@ CREATE TABLE cust_credit_bill (
   crednum int not null,
   invnum int not null,
   _date timestamp not null,
-  amount decimal(10,2) not null,
-  PRIMARY KEY (crednum)
+  amount decimal(10,2) not null
 );
 
 ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
@@ -93,6 +92,7 @@ ALTER TABLE part_svc ADD svc_forward__dst integer NULL;
 ALTER TABLE part_svc ADD svc_forward__dst_flag char(1) NULL;
 ALTER TABLE cust_main ADD referral_custnum integer NULL;
 CREATE INDEX cust_main3 ON cust_main ( referral_custnum );
+CREATE INDEX cust_credit_bill1 ON cust_credit_bill ( crednum );
 CREATE INDEX cust_credit_bill2 ON cust_credit_bill ( invnum );
 </pre>
 
-- 
cgit v1.2.1


From 98ddc878969bb39e576e3bd316f96ff7eeedb750 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 1 Sep 2001 23:41:51 +0000
Subject: cust_bill_pay and cust_credit_refund

---
 httemplate/docs/upgrade8.html | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 765c2b8d5..1e4064e8d 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -72,12 +72,30 @@ CREATE TABLE svc_forward (
 );
 
 CREATE TABLE cust_credit_bill (
+  creditbillnum int primary key,
   crednum int not null,
   invnum int not null,
-  _date timestamp not null,
+  _date int not null,
   amount decimal(10,2) not null
 );
 
+CREATE TABLE cust_bill_pay (
+  billpaynum int primary key,
+  invnum int not null,
+  paynum int not null,
+  _date int not null,
+  amount decimal(10,2) not null
+);
+
+CREATE TABLE cust_credit_refund (
+  creditrefundnum int primary key,
+  crednum int not null,
+  refundnum int not null,
+  _date int not null,
+  amount decimal(10,2) not null
+);
+
+
 ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
 ALTER TABLE svc_domain ADD catchall integer NULL;
 ALTER TABLE part_svc ADD svc_acct__domsvc integer NULL;
@@ -94,6 +112,10 @@ ALTER TABLE cust_main ADD referral_custnum integer NULL;
 CREATE INDEX cust_main3 ON cust_main ( referral_custnum );
 CREATE INDEX cust_credit_bill1 ON cust_credit_bill ( crednum );
 CREATE INDEX cust_credit_bill2 ON cust_credit_bill ( invnum );
+CREATE INDEX cust_bill_pay1 ON cust_bill_pay ( invnum );
+CREATE INDEX cust_bill_pay2 ON cust_bill_pay ( paynum );
+CREATE INDEX cust_credit_refund1 ON cust_credit_refund ( crednum );
+CREATE INDEX cust_credit_refund2 ON cust_credit_refund ( refundnum );
 </pre>
 
   <li>If you are using PostgreSQL, apply the following changes to your database:
@@ -152,5 +174,6 @@ ALTER TABLE cust_main ADD COLUMN comments varchar NULL;
   <li>Run bin/dbdef-create.
   <li>create a service based on svc_forward
   <li>Run bin/fs-migrate-svc_acct_sm
+  <li>Run bin/fs-migrate-payref
   <li>create the conf.dbsrc/user_policy as appropriate for your site
 </body>
-- 
cgit v1.2.1


From 51e148d543a59a3cdec24bfb5ffb839ee7b4ac72 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 2 Sep 2001 01:27:11 +0000
Subject: more udpates for the new world of unapplied stuff.  yay.

---
 FS/FS/cust_bill.pm          | 97 +++++++++++++++++++++++++++++----------------
 FS/FS/cust_bill_pay.pm      | 19 +++++++--
 FS/FS/cust_credit.pm        | 33 +++++++++++----
 FS/FS/cust_credit_bill.pm   | 15 ++++++-
 FS/FS/cust_credit_refund.pm | 19 ++++++++-
 FS/FS/cust_main.pm          |  5 ++-
 FS/FS/cust_refund.pm        |  4 +-
 7 files changed, 139 insertions(+), 53 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 4c1617f0e..2ca4b529a 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -204,34 +204,55 @@ sub cust_bill_pkg {
 
 =item cust_credit
 
-Returns a list consisting of the total previous credited (see
-L<FS::cust_credit>) and unapplied for this customer, followed by the previous
-outstanding credits (FS::cust_credit objects).
+Depreciated.  See the cust_credited method.
+
+ #Returns a list consisting of the total previous credited (see
+ #L<FS::cust_credit>) and unapplied for this customer, followed by the previous
+ #outstanding credits (FS::cust_credit objects).
 
 =cut
 
 sub cust_credit {
-  my $self = shift;
-  my $total = 0;
-  my @cust_credit = sort { $a->_date <=> $b->_date }
-    grep { $_->credited != 0 && $_->_date < $self->_date }
-      qsearch('cust_credit', { 'custnum' => $self->custnum } )
-  ;
-  foreach (@cust_credit) { $total += $_->credited; }
-  $total, @cust_credit;
+  use Carp;
+  croak "FS::cust_bill->cust_credit depreciated; see ".
+        "FS::cust_bill->cust_credit_bill";
+  #my $self = shift;
+  #my $total = 0;
+  #my @cust_credit = sort { $a->_date <=> $b->_date }
+  #  grep { $_->credited != 0 && $_->_date < $self->_date }
+  #    qsearch('cust_credit', { 'custnum' => $self->custnum } )
+  #;
+  #foreach (@cust_credit) { $total += $_->credited; }
+  #$total, @cust_credit;
 }
 
 =item cust_pay
 
-Returns all payments (see L<FS::cust_pay>) for this invoice.
+Depreciated.  See the cust_bill_pay method.
+
+#Returns all payments (see L<FS::cust_pay>) for this invoice.
 
 =cut
 
 sub cust_pay {
+  use Carp;
+  croak "FS::cust_bill->cust_pay depreciated; see FS::cust_bill->cust_bill_pay";
+  #my $self = shift;
+  #sort { $a->_date <=> $b->_date }
+  #  qsearch( 'cust_pay', { 'invnum' => $self->invnum } )
+  #;
+}
+
+=item cust_bill_pay
+
+Returns all payment applications (see L<FS::cust_bill_pay>) for this invoice.
+
+=cut
+
+sub cust_bill_pay {
   my $self = shift;
-  sort { $a->_date <=> $b->_date }
-    qsearch( 'cust_pay', { 'invnum' => $self->invnum } )
-  ;
+  sort { $a->_date <=> $b->date }
+    qsearch( 'cust_bill_pay', { 'invnum' => $self->invnum } );
 }
 
 =item cust_credited
@@ -265,15 +286,15 @@ sub tax {
 =item owed
 
 Returns the amount owed (still outstanding) on this invoice, which is charged
-minus all payments (see L<FS::cust_pay>) and applied credits
-(see L<FS::cust_credit_bill>).
+minus all payment applications (see L<FS::cust_bill_pay>) and credit
+applications (see L<FS::cust_credit_bill>).
 
 =cut
 
 sub owed {
   my $self = shift;
   my $balance = $self->charged;
-  $balance -= $_->paid foreach ( $self->cust_pay );
+  $balance -= $_->amount foreach ( $self->cust_bill_pay );
   $balance -= $_->amount foreach ( $self->cust_credited );
   $balance = sprintf( "%.2f", $balance);
 }
@@ -299,10 +320,9 @@ sub print_text {
     unless $cust_main->payname;
 
   my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
-  my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
-  my $balance_due = $self->owed + $pr_total - $cr_total;
-
-  #
+#  my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
+  #my $balance_due = $self->owed + $pr_total - $cr_total;
+  my $balance_due = $self->owed + $pr_total;
 
   #my @collect = ();
   #my($description,$amount);
@@ -366,22 +386,28 @@ sub print_text {
 
   #credits
   foreach ( $self->cust_credited ) {
+
+    #something more elaborate if $_->amount ne $_->cust_credit->credited ?
+
     push @buf,[
-      "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
+      "Credit #". $_->crednum. " (". time2str("%x",$_->cust_credit->_date) .")",
       $money_char. sprintf("%10.2f",$_->amount)
     ];
   }
-  foreach ( @cr_cust_credit ) {
-    push @buf,[
-      "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
-      $money_char. sprintf("%10.2f",$_->credited)
-    ];
-  }
+  #foreach ( @cr_cust_credit ) {
+  #  push @buf,[
+  #    "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
+  #    $money_char. sprintf("%10.2f",$_->credited)
+  #  ];
+  #}
 
   #get & print payments
-  foreach ( $self->cust_pay ) {
+  foreach ( $self->cust_bill_pay ) {
+
+    #something more elaborate if $_->amount ne ->cust_pay->paid ?
+
     push @buf,[
-      "Payment received ". time2str("%x",$_->_date ),
+      "Payment received ". time2str("%x",$_->cust_pay->_date ),
       $money_char. sprintf("%10.2f",$_->paid )
     ];
   }
@@ -389,7 +415,7 @@ sub print_text {
   #balance due
   push @buf,['','-----------'];
   push @buf,['Balance Due', $money_char. 
-    sprintf("%10.2f",$self->owed + $pr_total - $cr_total ) ];
+    sprintf("%10.2f", $balance_due ) ];
 
   #setup template variables
   
@@ -463,7 +489,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.9 2001-09-01 21:52:19 jeff Exp $
+$Id: cust_bill.pm,v 1.10 2001-09-02 01:27:10 ivan Exp $
 
 =head1 BUGS
 
@@ -477,8 +503,9 @@ or something similar so the look can be completely customized?)
 
 =head1 SEE ALSO
 
-L<FS::Record>, L<FS::cust_main>, L<FS::cust_pay>, L<FS::cust_bill_pkg>,
-L<FS::cust_credit>, schema.html from the base documentation.
+L<FS::Record>, L<FS::cust_main>, L<FS::cust_bill_pay>, L<FS:;cust_pay>,
+L<FS::cust_bill_pkg>, L<FS::cust_bill_credit>, schema.html from the base
+documentation.
 
 =cut
 
diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index e7040d96b..6d08b59c8 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -3,7 +3,8 @@ package cust_bill_pay;
 use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs dbh );
-#use FS::cust_bill
+use FS::cust_bill;
+use FS::cust_pay;
 
 @ISA = qw( FS::Record );
 
@@ -167,17 +168,29 @@ sub check {
   ''; #no error
 }
 
+=item cust_pay 
+
+Returns the payment (see L<FS::cust_pay>)
+
+=cut
+
+sub cust_pay {
+  my $self = shift;
+  qsearchs( 'cust_pay', { 'invnum' => $self->invnum } );
+}
+
 =back
 
 =head1 VERSION
 
-$Id: cust_bill_pay.pm,v 1.2 2001-09-01 21:55:06 jeff Exp $
+$Id: cust_bill_pay.pm,v 1.3 2001-09-02 01:27:11 ivan Exp $
 
 =head1 BUGS
 
 Delete and replace methods.
 
-cust_credit_bill isn't checked yet (uncomment around line 111)
+the checks for over-applied payments could be better done like the ones in
+cust_bill_credit
 
 =head1 SEE ALSO
 
diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index ec3a7ce26..1f792daa6 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -122,14 +122,32 @@ sub check {
 
 =item cust_refund
 
-Returns all refunds (see L<FS::cust_refund>) for this credit.
+Depreciated.  See the cust_credit_refund method.
+
+#Returns all refunds (see L<FS::cust_refund>) for this credit.
 
 =cut
 
 sub cust_refund {
+  use Carp;
+  croak "FS::cust_credit->cust_pay depreciated; see ".
+        "FS::cust_credit->cust_credit_refund";
+  #my $self = shift;
+  #sort { $a->_date <=> $b->_date }
+  #  qsearch( 'cust_refund', { 'crednum' => $self->crednum } )
+  #;
+}
+
+=item cust_credit_refund
+
+Returns all refund applications (see L<FS::cust_credit_refund>) for this credit.
+
+=cut
+
+sub cust_credit_refund {
   my $self = shift;
   sort { $a->_date <=> $b->_date }
-    qsearch( 'cust_refund', { 'crednum' => $self->crednum } )
+    qsearch( 'cust_credit_refund', { 'crednum' => $self->crednum } )
   ;
 }
 
@@ -150,15 +168,15 @@ sub cust_credit_bill {
 =item credited
 
 Returns the amount of this credit that is still outstanding; which is
-amount minus all refunds (see L<FS::cust_refund>) and applications to
-invoices (see L<FS::cust_credit_bill>).
+amount minus all refund applications (see L<FS::cust_credit_refund>) and
+applications to invoices (see L<FS::cust_credit_bill>).
 
 =cut
 
 sub credited {
   my $self = shift;
   my $amount = $self->amount;
-  $amount -= $_->refund foreach ( $self->cust_refund );
+  $amount -= $_->amount foreach ( $self->cust_credit_refund );
   $amount -= $_->amount foreach ( $self->cust_credit_bill );
   sprintf( "%.2f", $amount );
 }
@@ -167,7 +185,7 @@ sub credited {
 
 =head1 VERSION
 
-$Id: cust_credit.pm,v 1.9 2001-09-01 21:52:19 jeff Exp $
+$Id: cust_credit.pm,v 1.11 2001-09-02 07:49:52 ivan Exp $
 
 =head1 BUGS
 
@@ -175,7 +193,8 @@ The delete method.
 
 =head1 SEE ALSO
 
-L<FS::Record>, L<FS::cust_refund>, L<FS::cust_bill>, schema.html from the base
+L<FS::Record>, L<FS::cust_credit_refund>, L<FS::cust_refund>,
+L<FS::cust_credit_bill> L<FS::cust_bill>, schema.html from the base
 documentation.
 
 =cut
diff --git a/FS/FS/cust_credit_bill.pm b/FS/FS/cust_credit_bill.pm
index d6c4f6c4b..0892f7984 100644
--- a/FS/FS/cust_credit_bill.pm
+++ b/FS/FS/cust_credit_bill.pm
@@ -5,7 +5,7 @@ use vars qw( @ISA );
 use FS::UID qw( getotaker );
 use FS::Record qw( qsearch qsearchs );
 use FS::cust_main;
-use FS::cust_refund;
+#use FS::cust_refund;
 use FS::cust_credit;
 use FS::cust_bill;
 
@@ -126,11 +126,22 @@ sub check {
   ''; #no error
 }
 
+=item sub cust_credit
+
+Returns the credit (see L<FS::cust_credit>)
+
+=cut
+
+sub cust_credit {
+  my $self = shift;
+  qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
+}
+
 =back
 
 =head1 VERSION
 
-$Id: cust_credit_bill.pm,v 1.2 2001-09-01 22:18:38 ivan Exp $
+$Id: cust_credit_bill.pm,v 1.3 2001-09-02 01:27:11 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_credit_refund.pm b/FS/FS/cust_credit_refund.pm
index f366eb147..200e34e55 100644
--- a/FS/FS/cust_credit_refund.pm
+++ b/FS/FS/cust_credit_refund.pm
@@ -4,7 +4,8 @@ use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs dbh );
 #use FS::UID qw(getotaker);
-#use FS::cust_credit
+use FS::cust_credit;
+use FS::cust_refund;
 
 @ISA = qw( FS::Record );
 
@@ -154,16 +155,30 @@ sub check {
   ''; #no error
 }
 
+=item cust_refund
+
+Returns the refund (see L<FS::cust_refund>)
+
+=cut
+
+sub cust_refund {
+  my $self = shift;
+  qsearchs( 'cust_refund', { 'refundnum' => $self->refundnum } );
+}
+
 =back
 
 =head1 VERSION
 
-$Id: cust_credit_refund.pm,v 1.1 2001-09-01 20:11:07 ivan Exp $
+$Id: cust_credit_refund.pm,v 1.2 2001-09-02 01:27:11 ivan Exp $
 
 =head1 BUGS
 
 Delete and replace methods.
 
+the checks for over-applied refunds could be better done like the ones in
+cust_bill_credit
+
 =head1 SEE ALSO
 
 L<FS::cust_credit>, L<FS::cust_refund>, L<FS::Record>, schema.html from the
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index bd1f212b3..2158289d8 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -28,7 +28,7 @@ use FS::part_referral;
 use FS::cust_main_county;
 use FS::agent;
 use FS::cust_main_invoice;
-use FS::cust_credit_bill;
+#use FS::cust_credit_bill;
 use FS::prepay_credit;
 
 @ISA = qw( FS::Record );
@@ -956,6 +956,7 @@ sub collect {
 
     next unless $cust_bill->owed > 0;
 
+    # ??????????
     next if qsearchs( 'cust_pay_batch', { 'invnum' => $cust_bill->invnum } );
 
     warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ", amount $amount, total_owed $total_owed)" if $Debug;
@@ -1450,7 +1451,7 @@ sub rebuild_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.25 2001-09-01 22:28:51 jeff Exp $
+$Id: cust_main.pm,v 1.26 2001-09-02 01:27:11 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 8e4ef0d4e..7eeacbfce 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -3,7 +3,7 @@ package FS::cust_refund;
 use strict;
 use vars qw( @ISA );
 use Business::CreditCard;
-use FS::Record qw( qsearchs dbh );
+use FS::Record qw( dbh );
 use FS::UID qw(getotaker);
 use FS::cust_credit;
 use FS::cust_credit_refund;
@@ -189,7 +189,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.4 2001-09-01 20:11:07 ivan Exp $
+$Id: cust_refund.pm,v 1.5 2001-09-02 01:27:11 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 8c1f9804d9a02c0c054eededeb500c72a640249a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 2 Sep 2001 02:46:55 +0000
Subject: cust_refund and cust_pay get custnums

---
 FS/FS/cust_bill_pay.pm        | 15 ++++++++--
 FS/FS/cust_main.pm            | 64 ++++++++++++++++++++++++++++++++++++++-----
 FS/FS/cust_pay.pm             | 53 +++++++++++++++++++++++++++++------
 FS/FS/cust_refund.pm          | 31 +++++++++++++--------
 bin/fs-setup                  |  4 ++-
 httemplate/docs/schema.html   |  2 ++
 httemplate/docs/upgrade8.html |  2 ++
 7 files changed, 142 insertions(+), 29 deletions(-)

diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index 6d08b59c8..a7e2831ea 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -176,14 +176,25 @@ Returns the payment (see L<FS::cust_pay>)
 
 sub cust_pay {
   my $self = shift;
-  qsearchs( 'cust_pay', { 'invnum' => $self->invnum } );
+  qsearchs( 'cust_pay', { 'paynum' => $self->paynum } );
+}
+
+=item cust_bill 
+
+Returns the invoice (see L<FS::cust_bill>)
+
+=cut
+
+sub cust_bill {
+  my $self = shift;
+  qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
 }
 
 =back
 
 =head1 VERSION
 
-$Id: cust_bill_pay.pm,v 1.3 2001-09-02 01:27:11 ivan Exp $
+$Id: cust_bill_pay.pm,v 1.4 2001-09-02 02:46:55 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 2158289d8..c44c89377 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -28,7 +28,8 @@ use FS::part_referral;
 use FS::cust_main_county;
 use FS::agent;
 use FS::cust_main_invoice;
-#use FS::cust_credit_bill;
+use FS::cust_credit_bill;
+use FS::cust_bill_pay;
 use FS::prepay_credit;
 
 @ISA = qw( FS::Record );
@@ -1242,8 +1243,10 @@ sub total_owed {
 
 =item apply_credits
 
-Applies (see L<FS::cust_credit_bill>) unapplied credits (see L<FS::cust_credit>)to outstanding invoice balances in cronological order and returns the value
-of any remaining unapplied credits available for refund (see L<FS::cust_refund>).
+Applies (see L<FS::cust_credit_bill>) unapplied credits (see L<FS::cust_credit>)
+to outstanding invoice balances in chronological order and returns the value
+of any remaining unapplied credits available for refund
+(see L<FS::cust_refund>).
 
 =cut
 
@@ -1264,8 +1267,7 @@ sub apply_credits {
     my $amount;
 
     if (!(defined $credit) || $credit->credited == 0) {
-      $credit = pop @credits;
-      last unless defined $credit;
+      $credit = pop @credits or last;
     }
 
     if ($cust_bill->owed >= $credit->credited) {
@@ -1278,7 +1280,6 @@ sub apply_credits {
       'crednum' => $credit->crednum,
       'invnum'  => $cust_bill->invnum,
       'amount'  => $amount,
-      '_date'   => time,
     } );
     my $error = $cust_credit_bill->insert;
     die $error if $error;
@@ -1290,6 +1291,55 @@ sub apply_credits {
   return $self->total_credited;
 }
 
+=item apply_payments
+
+Applies (see L<FS::cust_bill_pay>) unapplied payments (see L<FS::cust_pay>)
+to outstanding invoice balances in chronological order.
+
+ #and returns the value of any remaining unapplied payments.
+
+=cut
+
+sub apply_payments {
+  my $self = shift;
+
+  #return 0 unless
+
+  my @payments = sort { $b->_date <=> $a->_date } ( grep { $_->unapplied > 0 }
+      qsearch('cust_pay', { 'custnum' => $self->custnum } ) );
+
+  my @invoices = sort { $a->_date <=> $b->_date} (grep { $_->owed > 0 }
+      qsearch('cust_bill', { 'custnum' => $self->custnum } ) );
+
+  my $payment;
+
+  foreach my $cust_bill ( @invoices ) {
+    my $amount;
+
+    if ( !defined $payment || $payment->unapplied = 0 ) {
+      $payment = pop @payments or last;
+    }
+
+    if ( $cust_bill->owed >= $payment->unapplied ) {
+      $amount = $payment->unapplied;
+    } else {
+      $amount = $payment->owed;
+    }
+
+    my $cust_bill_pay = new FS::cust_bill_pay ( {
+      'paynum' => $payment->paynum,
+      'invnum' => $cust_bill->invnum,
+      'amount' => $amount,
+    } );
+    my $error = $cust_bill_pay->insert;
+    die $error if $error;
+
+    redo if ( $cust_bill->owed > 0);
+
+  }
+
+  # return 0; 
+}
 
 =item total_credited
 
@@ -1451,7 +1501,7 @@ sub rebuild_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.26 2001-09-02 01:27:11 ivan Exp $
+$Id: cust_main.pm,v 1.27 2001-09-02 02:46:55 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index b1c35d76f..a70b7cb37 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -6,6 +6,7 @@ use Business::CreditCard;
 use FS::Record qw( dbh );
 use FS::cust_bill;
 use FS::cust_bill_pay;
+use FS::cust_main;
 
 @ISA = qw( FS::Record );
 
@@ -38,6 +39,8 @@ currently supported:
 
 =item paynum - primary key (assigned automatically for new payments)
 
+=item custnum - customer (see L<FS::cust_main>)
+
 =item paid - Amount of this payment
 
 =item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
@@ -69,7 +72,7 @@ Adds this payment to the database.
 
 For backwards-compatibility and convenience, if the additional field invnum
 is defined, an FS::cust_bill_pay record for the full amount of the payment
-will be created.
+will be created.  In this case, custnum is optional.
 
 =cut
 
@@ -90,12 +93,6 @@ sub insert {
   my $error = $self->check;
   return $error if $error;
 
-  $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
   if ( $self->invnum ) {
     my $cust_bill_pay = new FS::cust_bill_pay {
       'invnum' => $self->invnum,
@@ -108,6 +105,13 @@ sub insert {
       $dbh->rollback if $oldAutoCommit;
       return $error;
     }
+    $self->custnum($cust_bill_pay->cust_bill->custnum);
+  }
+
+  $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
   }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
@@ -148,12 +152,17 @@ sub check {
 
   my $error =
     $self->ut_numbern('paynum')
+    || $self->ut_number('custnum')
     || $self->ut_money('paid')
     || $self->ut_numbern('_date')
     || $self->ut_textn('paybatch')
   ;
   return $error if $error;
 
+  return "unknown cust_main.custnum: ". $self->custnum
+    unless $self->invnum
+           || qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+
   $self->_date(time) unless $self->_date;
 
   $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
@@ -182,11 +191,39 @@ sub check {
 
 }
 
+=item cust_bill_pay
+
+Returns all applications to invoices (see L<FS::cust_bill_pay>) for this
+payment.
+
+=cut
+
+sub cust_bill_pay {
+  my $self = shift;
+  sort { $a->_date <=> $b->_date }
+    qsearch( 'cust_bill_pay', { 'paynum' => $self->paynum } )
+  ;
+}
+
+=item unapplied
+
+Returns the amount of this payment that is still unapplied; which is
+paid minus all payment applications (see L<FS::cust_bill_pay>).
+
+=cut
+
+sub unapplied {
+  my $self = shift;
+  my $amount = $self->paid;
+  $amount -= $_->amount foreach ( $self->cust_bill_pay );
+  sprintf("%.2f", $amount );
+}
+
 =back
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.4 2001-09-01 20:11:07 ivan Exp $
+$Id: cust_pay.pm,v 1.5 2001-09-02 02:46:55 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 7eeacbfce..c216ec284 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -7,6 +7,7 @@ use FS::Record qw( dbh );
 use FS::UID qw(getotaker);
 use FS::cust_credit;
 use FS::cust_credit_refund;
+use FS::cust_main;
 
 @ISA = qw( FS::Record );
 
@@ -39,6 +40,8 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item refundnum - primary key (assigned automatically for new refunds)
 
+=item custnum - customer (see L<FS::cust_main>)
+
 =item refund - Amount of the refund
 
 =item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
@@ -72,7 +75,7 @@ Adds this refund to the database.
 
 For backwards-compatibility and convenience, if the additional field crednum is
 defined, an FS::cust_credit_refund record for the full amount of the refund
-will be created.
+will be created.  In this case, custnum is optional.
 
 =cut
 
@@ -93,24 +96,25 @@ sub insert {
   my $error = $self->check;
   return $error if $error;
 
-  $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
   if ( $self->crednum ) {
     my $cust_credit_refund = new FS::cust_credit_refund {
-      'cred' => $self->cred,
+      'cred'      => $self->cred,
       'refundnum' => $self->refundnum,
-      'amount' => $self->refund,
-      '_date' => $self->_date,
+      'amount'    => $self->refund,
+      '_date'     => $self->_date,
     };
     $error = $cust_bill_pay->insert;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return $error;
     }
+    $self->custnum($cust_credit_refund->cust_credit->custnum);
+  }
+
+  $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
   }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
@@ -151,6 +155,7 @@ sub check {
 
   my $error =
     $self->ut_number('refundnum')
+    || $self->ut_number('custnum')
     || $self->ut_money('amount')
     || $self->ut_numbern('_date')
     || $self->ut_textn('paybatch')
@@ -159,6 +164,10 @@ sub check {
 
   $self->_date(time) unless $self->_date;
 
+  return "unknown cust_main.custnum: ". $self->custnum
+    unless $self->invnum 
+           ||  qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+
   $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
   $self->payby($1);
 
@@ -189,7 +198,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.5 2001-09-02 01:27:11 ivan Exp $
+$Id: cust_refund.pm,v 1.6 2001-09-02 02:46:55 ivan Exp $
 
 =head1 BUGS
 
diff --git a/bin/fs-setup b/bin/fs-setup
index 71d53ef85..5e735294f 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.47 2001-09-01 22:18:38 ivan Exp $
+# $Id: fs-setup,v 1.48 2001-09-02 02:46:55 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -412,6 +412,7 @@ sub tables_hash_hack {
       'columns' => [
         'paynum',   'int',    '',   '',
         #now cust_bill_pay #'invnum',   'int',    '',   '',
+        'custnum',  'int',    '',   '',
         'paid',     @money_type,
         '_date',    @date_type,
         'payby',    'char',   '',     4, # CARD/BILL/COMP, should be index into
@@ -483,6 +484,7 @@ sub tables_hash_hack {
       'columns' => [
         'refundnum',    'int',    '',   '',
         #now cust_credit_refund #'crednum',      'int',    '',   '',
+        'custnum',  'int',    '',   '',
         '_date',        @date_type,
         'refund',       @money_type,
         'otaker',       'varchar',   '',   8,
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 818547e1c..c90f47641 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -100,6 +100,7 @@
     <li><a name="cust_pay" href="man/FS/cust_pay.html">cust_pay</a> - Payments.  Money being transferred from a customer.
       <ul>
         <li>paynum - primary key
+        <li>custnum - <a href="#cust_main">customer</a>
         <li>paid - amount
         <li>_date
         <li>payby - CARD, BILL, or COMP
@@ -147,6 +148,7 @@
     <li><a name="cust_refund" href="man/FS/cust_refund.html">cust_refund</a> - Refunds.  The transfer of money to a customer; equivalent to a negative <a href="#cust_pay">cust_pay</a> record.
       <ul>
         <li>refundnum - primary key
+        <li>custnum - <a href="#cust_main">customer</a>
         <li>refund - amount
         <li>_date
         <li>payby - CARD, BILL or COMP
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 1e4064e8d..573db3683 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -109,6 +109,8 @@ ALTER TABLE part_svc ADD svc_forward__dstsvc_flag char(1) NULL;
 ALTER TABLE part_svc ADD svc_forward__dst integer NULL;
 ALTER TABLE part_svc ADD svc_forward__dst_flag char(1) NULL;
 ALTER TABLE cust_main ADD referral_custnum integer NULL;
+ALTER TABLE cust_pay ADD custnum integer;
+ALTER TABLE cust_refund ADD custnum integer;
 CREATE INDEX cust_main3 ON cust_main ( referral_custnum );
 CREATE INDEX cust_credit_bill1 ON cust_credit_bill ( crednum );
 CREATE INDEX cust_credit_bill2 ON cust_credit_bill ( invnum );
-- 
cgit v1.2.1


From d938dd5cd86b7fd2d9041f929a371a5faf3b18ac Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sun, 2 Sep 2001 02:53:49 +0000
Subject: adding a credit apply utility

---
 FS/bin/freeside-apply-credits | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100755 FS/bin/freeside-apply-credits

diff --git a/FS/bin/freeside-apply-credits b/FS/bin/freeside-apply-credits
new file mode 100755
index 000000000..eb5c1f489
--- /dev/null
+++ b/FS/bin/freeside-apply-credits
@@ -0,0 +1,22 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use lib "/usr/lib/perl5/site_perl/5.005/FSTest2";
+use vars qw( $user $cust_main @customers );
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch);
+use FS::cust_main;
+
+$user = shift or die &usage;
+&adminsuidsetup( $user );
+
+my @customers = qsearch('cust_main', {} );
+die "No customers" unless (scalar(@customers) > 0);
+
+foreach $cust_main (@customers) {
+  print "Applying credits for customer #". $cust_main->custnum;
+  $cust_main->apply_credits;
+}
+
+
+
-- 
cgit v1.2.1


From 02b16ae5152826a2dfc3ec9a2e173198e2d013d3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 2 Sep 2001 03:20:45 +0000
Subject: upgrade

---
 httemplate/docs/upgrade8.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 573db3683..cd537119e 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -177,5 +177,19 @@ ALTER TABLE cust_main ADD COLUMN comments varchar NULL;
   <li>create a service based on svc_forward
   <li>Run bin/fs-migrate-svc_acct_sm
   <li>Run bin/fs-migrate-payref
+  <li><b>After running bin/fs-migrate-payref</b>, apply the following changes to your database:
+  <table border><tr><th>PostgreSQL</th><th>MySQL, others</th></tr>
+<tr><td>
+<font size=-1><pre>
+ALTER TABLE cust_pay RENAME COLUMN invnum TO depreciated;
+ALTER TABLE cust_refund RENAME COLUMN crednum TO depreciated;
+</pre></font>
+</td><td>
+<font size=-1><pre>
+ALTER TABLE cust_pay DROP COLUMN invnum;
+ALTER TABLE cust_refund DROP COLUMN crednum;
+</pre></font>
+</td></tr></table>
+  <li><b>IMPORTANT: After applying the second set of database changes</b>, run bin/dbdef-create again.
   <li>create the conf.dbsrc/user_policy as appropriate for your site
 </body>
-- 
cgit v1.2.1


From 29b94aeb1c3003f7a9bbfbe1a91a86f8b9edfbbc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 2 Sep 2001 03:42:32 +0000
Subject: really.  backup.

---
 httemplate/docs/upgrade8.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index cd537119e..6d5018816 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -5,7 +5,7 @@
 <h1>Upgrading to 1.4.0 from 1.3.1</h1>
 <ul>
   <li>If migrating from less than 1.3.1, see these <a href="upgrade7.html">instructions</a> first.
-  <li>Back up your data and current Freeside installation.
+  <li><font size="+2" color="#ff0000">Backup your database and current Freeside installation.</font> (with&nbsp;<a href="http://www.ca.postgresql.org/devel-corner/docs/postgres/backup.html">PostgreSQL</a>) (with&nbsp;<a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Backup">MySQL</a>)
   <li>Install <a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a>.
 </ul>
 <table>
-- 
cgit v1.2.1


From f1ee95396defc991301ac758b71bdda9df82984e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 2 Sep 2001 04:25:55 +0000
Subject: lame testsuite and the embarassing fixes in it found

---
 FS/FS.pm                  |  8 ++++++-
 FS/FS/cust_bill_pay.pm    |  6 +++---
 FS/FS/cust_main.pm        |  6 +++---
 FS/FS/cust_refund.pm      |  4 ++--
 FS/MANIFEST               | 53 ++++++++++++++++++++++++++++++++++++++++-------
 FS/t/CGI.t                |  5 +++++
 FS/t/CGIwrapper.t         |  5 +++++
 FS/t/Conf.t               |  5 +++++
 FS/t/Record.t             |  5 +++++
 FS/t/UID.t                |  5 +++++
 FS/t/agent.t              |  5 +++++
 FS/t/agent_type.t         |  5 +++++
 FS/t/cust_bill.t          |  5 +++++
 FS/t/cust_bill_pay.t      |  5 +++++
 FS/t/cust_bill_pkg.t      |  5 +++++
 FS/t/cust_credit.t        |  5 +++++
 FS/t/cust_credit_bill.t   |  5 +++++
 FS/t/cust_credit_refund.t |  5 +++++
 FS/t/cust_main.t          |  5 +++++
 FS/t/cust_main_county.t   |  5 +++++
 FS/t/cust_main_invoice.t  |  5 +++++
 FS/t/cust_pay.t           |  5 +++++
 FS/t/cust_pay_batch.t     |  5 +++++
 FS/t/cust_pkg.t           |  5 +++++
 FS/t/cust_refund.t        |  5 +++++
 FS/t/cust_svc.t           |  5 +++++
 FS/t/domain_record.t      |  5 +++++
 FS/t/nas.t                |  5 +++++
 FS/t/part_pkg.t           |  5 +++++
 FS/t/part_referral.t      |  5 +++++
 FS/t/part_svc.t           |  5 +++++
 FS/t/pkg_svc.t            |  5 +++++
 FS/t/port.t               |  5 +++++
 FS/t/prepay_credit.t      |  5 +++++
 FS/t/session.t            |  5 +++++
 FS/t/svc_Common.t         |  5 +++++
 FS/t/svc_acct.t           |  5 +++++
 FS/t/svc_acct_pop.t       |  5 +++++
 FS/t/svc_acct_sm.t        |  5 +++++
 FS/t/svc_domain.t         |  5 +++++
 FS/t/svc_forward.t        |  5 +++++
 FS/t/svc_www.t            |  5 +++++
 FS/t/type_pkgs.t          |  5 +++++
 FS/test.pl                | 20 ------------------
 44 files changed, 250 insertions(+), 37 deletions(-)
 create mode 100644 FS/t/CGI.t
 create mode 100644 FS/t/CGIwrapper.t
 create mode 100644 FS/t/Conf.t
 create mode 100644 FS/t/Record.t
 create mode 100644 FS/t/UID.t
 create mode 100644 FS/t/agent.t
 create mode 100644 FS/t/agent_type.t
 create mode 100644 FS/t/cust_bill.t
 create mode 100644 FS/t/cust_bill_pay.t
 create mode 100644 FS/t/cust_bill_pkg.t
 create mode 100644 FS/t/cust_credit.t
 create mode 100644 FS/t/cust_credit_bill.t
 create mode 100644 FS/t/cust_credit_refund.t
 create mode 100644 FS/t/cust_main.t
 create mode 100644 FS/t/cust_main_county.t
 create mode 100644 FS/t/cust_main_invoice.t
 create mode 100644 FS/t/cust_pay.t
 create mode 100644 FS/t/cust_pay_batch.t
 create mode 100644 FS/t/cust_pkg.t
 create mode 100644 FS/t/cust_refund.t
 create mode 100644 FS/t/cust_svc.t
 create mode 100644 FS/t/domain_record.t
 create mode 100644 FS/t/nas.t
 create mode 100644 FS/t/part_pkg.t
 create mode 100644 FS/t/part_referral.t
 create mode 100644 FS/t/part_svc.t
 create mode 100644 FS/t/pkg_svc.t
 create mode 100644 FS/t/port.t
 create mode 100644 FS/t/prepay_credit.t
 create mode 100644 FS/t/session.t
 create mode 100644 FS/t/svc_Common.t
 create mode 100644 FS/t/svc_acct.t
 create mode 100644 FS/t/svc_acct_pop.t
 create mode 100644 FS/t/svc_acct_sm.t
 create mode 100644 FS/t/svc_domain.t
 create mode 100644 FS/t/svc_forward.t
 create mode 100644 FS/t/svc_www.t
 create mode 100644 FS/t/type_pkgs.t
 delete mode 100644 FS/test.pl

diff --git a/FS/FS.pm b/FS/FS.pm
index ed61db4c8..652e458aa 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -81,10 +81,16 @@ L<FS::cust_bill_pkg> - Invoice line item class
 
 L<FS::cust_pay> - Payment class
 
+L<FS::cust_bill_pay> - Payment application class
+
 L<FS::cust_credit> - Credit class
 
 L<FS::cust_refund> - Refund class
 
+L<FS::cust_credit_refund> - Refund application class
+
+L<FS::cust_credit_bill> - Refund invoice application class
+
 L<FS::cust_pay_batch> - Credit card transaction queue class
 
 L<FS::prepay_credit> - Prepaid "calling card" credit class.
@@ -122,7 +128,7 @@ The main documentation is in htdocs/docs.
 
 =head1 VERSION
 
-$Id: FS.pm,v 1.5 2001-04-23 12:40:30 ivan Exp $
+$Id: FS.pm,v 1.6 2001-09-02 04:25:55 ivan Exp $
 
 =head1 SUPPORT
 
diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index a7e2831ea..fea6aee02 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -107,9 +107,9 @@ sub insert {
   };
 
   my $bill_total = 0;
-  $bill_total += foreach map { $_->amount }
+  $bill_total += $_ foreach map { $_->amount }
     qsearch('cust_bill_pay', { 'invnum' => $self->invnum } );
-  $bill_total += foreach map { $_->amount } 
+  $bill_total += $_ foreach map { $_->amount } 
     qsearch('cust_credit_bill', { 'invnum' => $self->invnum } );
   if ( $bill_total > $cust_bill->charged ) {
     $dbh->rollback if $oldAutoCommit;
@@ -194,7 +194,7 @@ sub cust_bill {
 
 =head1 VERSION
 
-$Id: cust_bill_pay.pm,v 1.4 2001-09-02 02:46:55 ivan Exp $
+$Id: cust_bill_pay.pm,v 1.5 2001-09-02 04:25:55 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index c44c89377..41ad21b72 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1266,7 +1266,7 @@ sub apply_credits {
   foreach my $cust_bill ( @invoices ) {
     my $amount;
 
-    if (!(defined $credit) || $credit->credited == 0) {
+    if ( !defined($credit) || $credit->credited == 0) {
       $credit = pop @credits or last;
     }
 
@@ -1316,7 +1316,7 @@ sub apply_payments {
   foreach my $cust_bill ( @invoices ) {
     my $amount;
 
-    if ( !defined $payment || $payment->unapplied = 0 ) {
+    if ( !defined($payment) || $payment->unapplied == 0 ) {
       $payment = pop @payments or last;
     }
 
@@ -1501,7 +1501,7 @@ sub rebuild_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.27 2001-09-02 02:46:55 ivan Exp $
+$Id: cust_main.pm,v 1.28 2001-09-02 04:25:55 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index c216ec284..89f8f68c5 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -103,7 +103,7 @@ sub insert {
       'amount'    => $self->refund,
       '_date'     => $self->_date,
     };
-    $error = $cust_bill_pay->insert;
+    $error = $cust_credit_refund->insert;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return $error;
@@ -198,7 +198,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.6 2001-09-02 02:46:55 ivan Exp $
+$Id: cust_refund.pm,v 1.7 2001-09-02 04:25:55 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index f6b8abf2a..209c93a10 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -1,4 +1,11 @@
 Changes
+MANIFEST
+MANIFEST.SKIP
+Makefile.PL
+README
+bin/freeside-bill
+bin/freeside-email
+bin/freeside-print-batch
 FS.pm
 FS/CGI.pm
 FS/Conf.pm
@@ -37,16 +44,46 @@ FS/type_pkgs.pm
 FS/nas.pm
 FS/port.pm
 FS/session.pm
-MANIFEST
-MANIFEST.SKIP
-Makefile.PL
-test.pl
-README
-bin/freeside-bill
-bin/freeside-email
-bin/freeside-print-batch
 FS/domain_record.pm
 FS/prepay_credit.pm
 FS/svc_www.pm
 FS/CGIwrapper.pm
 FS/svc_forward.pm
+t/agent.t
+t/agent_type.t
+t/CGI.t
+t/CGIwrapper.t
+t/Conf.t
+t/cust_bill.t
+t/cust_bill_pay.t
+t/cust_bill_pkg.t
+t/cust_credit.t
+t/cust_credit_bill.t
+t/cust_credit_refund.t
+t/cust_main.t
+t/cust_main_county.t
+t/cust_main_invoice.t
+t/cust_pay.t
+t/cust_pay_batch.t
+t/cust_pkg.t
+t/cust_refund.t
+t/cust_svc.t
+t/domain_record.t
+t/nas.t
+t/part_pkg.t
+t/part_referral.t
+t/part_svc.t
+t/pkg_svc.t
+t/port.t
+t/prepay_credit.t
+t/Record.t
+t/session.t
+t/svc_acct.t
+t/svc_acct_pop.t
+t/svc_acct_sm.t
+t/svc_Common.t
+t/svc_domain.t
+t/svc_forward.t
+t/svc_www.t
+t/type_pkgs.t
+t/UID.t
diff --git a/FS/t/CGI.t b/FS/t/CGI.t
new file mode 100644
index 000000000..1b4e238b6
--- /dev/null
+++ b/FS/t/CGI.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::CGI;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/CGIwrapper.t b/FS/t/CGIwrapper.t
new file mode 100644
index 000000000..06c741c3a
--- /dev/null
+++ b/FS/t/CGIwrapper.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::CGIwrapper;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/Conf.t b/FS/t/Conf.t
new file mode 100644
index 000000000..a9f7653b3
--- /dev/null
+++ b/FS/t/Conf.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::Conf;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/Record.t b/FS/t/Record.t
new file mode 100644
index 000000000..00de1eda3
--- /dev/null
+++ b/FS/t/Record.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::Record;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/UID.t b/FS/t/UID.t
new file mode 100644
index 000000000..9f7da4e89
--- /dev/null
+++ b/FS/t/UID.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::UID;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/agent.t b/FS/t/agent.t
new file mode 100644
index 000000000..769cce254
--- /dev/null
+++ b/FS/t/agent.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::agent;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/agent_type.t b/FS/t/agent_type.t
new file mode 100644
index 000000000..99c66a151
--- /dev/null
+++ b/FS/t/agent_type.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::agent_type;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/cust_bill.t b/FS/t/cust_bill.t
new file mode 100644
index 000000000..b43f08ee2
--- /dev/null
+++ b/FS/t/cust_bill.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_bill;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/cust_bill_pay.t b/FS/t/cust_bill_pay.t
new file mode 100644
index 000000000..001eed01e
--- /dev/null
+++ b/FS/t/cust_bill_pay.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_bill_pay;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/cust_bill_pkg.t b/FS/t/cust_bill_pkg.t
new file mode 100644
index 000000000..0e45bdb0c
--- /dev/null
+++ b/FS/t/cust_bill_pkg.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_bill_pkg;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/cust_credit.t b/FS/t/cust_credit.t
new file mode 100644
index 000000000..cddf75cff
--- /dev/null
+++ b/FS/t/cust_credit.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_credit;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/cust_credit_bill.t b/FS/t/cust_credit_bill.t
new file mode 100644
index 000000000..0ef54c3f1
--- /dev/null
+++ b/FS/t/cust_credit_bill.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_credit_bill;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/cust_credit_refund.t b/FS/t/cust_credit_refund.t
new file mode 100644
index 000000000..6b2b599f3
--- /dev/null
+++ b/FS/t/cust_credit_refund.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_credit_refund;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/cust_main.t b/FS/t/cust_main.t
new file mode 100644
index 000000000..b0ffbdb32
--- /dev/null
+++ b/FS/t/cust_main.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_main;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/cust_main_county.t b/FS/t/cust_main_county.t
new file mode 100644
index 000000000..dd6119911
--- /dev/null
+++ b/FS/t/cust_main_county.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_main_county;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/cust_main_invoice.t b/FS/t/cust_main_invoice.t
new file mode 100644
index 000000000..9661620e0
--- /dev/null
+++ b/FS/t/cust_main_invoice.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_main_invoice;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/cust_pay.t b/FS/t/cust_pay.t
new file mode 100644
index 000000000..f6d0b7571
--- /dev/null
+++ b/FS/t/cust_pay.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_pay;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/cust_pay_batch.t b/FS/t/cust_pay_batch.t
new file mode 100644
index 000000000..02b572c15
--- /dev/null
+++ b/FS/t/cust_pay_batch.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_pay_batch;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/cust_pkg.t b/FS/t/cust_pkg.t
new file mode 100644
index 000000000..c6a686061
--- /dev/null
+++ b/FS/t/cust_pkg.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_pkg;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/cust_refund.t b/FS/t/cust_refund.t
new file mode 100644
index 000000000..91583da28
--- /dev/null
+++ b/FS/t/cust_refund.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_refund;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/cust_svc.t b/FS/t/cust_svc.t
new file mode 100644
index 000000000..267d731db
--- /dev/null
+++ b/FS/t/cust_svc.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_svc;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/domain_record.t b/FS/t/domain_record.t
new file mode 100644
index 000000000..794518ccf
--- /dev/null
+++ b/FS/t/domain_record.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::domain_record;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/nas.t b/FS/t/nas.t
new file mode 100644
index 000000000..6f8ae36d2
--- /dev/null
+++ b/FS/t/nas.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::nas;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_pkg.t b/FS/t/part_pkg.t
new file mode 100644
index 000000000..fd96073f9
--- /dev/null
+++ b/FS/t/part_pkg.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_pkg;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_referral.t b/FS/t/part_referral.t
new file mode 100644
index 000000000..d20b97930
--- /dev/null
+++ b/FS/t/part_referral.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_referral;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_svc.t b/FS/t/part_svc.t
new file mode 100644
index 000000000..bdb2a7aca
--- /dev/null
+++ b/FS/t/part_svc.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_svc;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/pkg_svc.t b/FS/t/pkg_svc.t
new file mode 100644
index 000000000..77d34295a
--- /dev/null
+++ b/FS/t/pkg_svc.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::pkg_svc;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/port.t b/FS/t/port.t
new file mode 100644
index 000000000..46377aaf9
--- /dev/null
+++ b/FS/t/port.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::port;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/prepay_credit.t b/FS/t/prepay_credit.t
new file mode 100644
index 000000000..e7626bdf1
--- /dev/null
+++ b/FS/t/prepay_credit.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::prepay_credit;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/session.t b/FS/t/session.t
new file mode 100644
index 000000000..c4b714ea4
--- /dev/null
+++ b/FS/t/session.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::session;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/svc_Common.t b/FS/t/svc_Common.t
new file mode 100644
index 000000000..ed49e1e49
--- /dev/null
+++ b/FS/t/svc_Common.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::svc_Common;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/svc_acct.t b/FS/t/svc_acct.t
new file mode 100644
index 000000000..9ca78c9d1
--- /dev/null
+++ b/FS/t/svc_acct.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::svc_acct;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/svc_acct_pop.t b/FS/t/svc_acct_pop.t
new file mode 100644
index 000000000..e612c40af
--- /dev/null
+++ b/FS/t/svc_acct_pop.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::svc_acct_pop;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/svc_acct_sm.t b/FS/t/svc_acct_sm.t
new file mode 100644
index 000000000..1082f2cdb
--- /dev/null
+++ b/FS/t/svc_acct_sm.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::svc_acct_sm;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/svc_domain.t b/FS/t/svc_domain.t
new file mode 100644
index 000000000..4d91898ac
--- /dev/null
+++ b/FS/t/svc_domain.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::svc_domain;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/svc_forward.t b/FS/t/svc_forward.t
new file mode 100644
index 000000000..d653d34ef
--- /dev/null
+++ b/FS/t/svc_forward.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::svc_forward;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/svc_www.t b/FS/t/svc_www.t
new file mode 100644
index 000000000..eb4e83fbc
--- /dev/null
+++ b/FS/t/svc_www.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::svc_www;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/type_pkgs.t b/FS/t/type_pkgs.t
new file mode 100644
index 000000000..98401805c
--- /dev/null
+++ b/FS/t/type_pkgs.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::type_pkgs;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/test.pl b/FS/test.pl
deleted file mode 100644
index dc3726236..000000000
--- a/FS/test.pl
+++ /dev/null
@@ -1,20 +0,0 @@
-# Before `make install' is performed this script should be runnable with
-# `make test'. After `make install' it should work as `perl test.pl'
-
-######################### We start with some black magic to print on failure.
-
-# Change 1..1 below to 1..last_test_to_print .
-# (It may become useful if the test is moved to ./t subdirectory.)
-
-BEGIN { $| = 1; print "1..1\n"; }
-END {print "not ok 1\n" unless $loaded;}
-use FS;
-$loaded = 1;
-print "ok 1\n";
-
-######################### End of black magic.
-
-# Insert your test code below (better if it prints "ok 13"
-# (correspondingly "not ok 13") depending on the success of chunk 13
-# of the test code):
-
-- 
cgit v1.2.1


From 9b81123e5ff5825d2c3c000432e4dd18b5fd764f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 2 Sep 2001 04:51:11 +0000
Subject: better error msgs

---
 FS/FS/cust_svc.pm | 5 +++--
 FS/FS/svc_acct.pm | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 1708b1ce3..77151b80e 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -122,7 +122,8 @@ sub label {
   my $self = shift;
   my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
   my $svcdb = $part_svc->svcdb;
-  my $svc_x = qsearchs( $svcdb, { 'svcnum' => $self->svcnum } );
+  my $svc_x = qsearchs( $svcdb, { 'svcnum' => $self->svcnum } )
+    or die "can't find $svcdb.svcnum ". $self->svcnum;
   my $svc = $part_svc->svc;
   my $tag;
   if ( $svcdb eq 'svc_acct' ) {
@@ -154,7 +155,7 @@ sub label {
 
 =head1 VERSION
 
-$Id: cust_svc.pm,v 1.3 2001-08-20 11:18:20 ivan Exp $
+$Id: cust_svc.pm,v 1.4 2001-09-02 04:51:11 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 9c95b219e..7e27fd859 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -610,7 +610,8 @@ Returns the domain associated with this account.
 sub domain {
   my $self = shift;
   if ( $self->domsvc ) {
-    my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } );
+    my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } )
+      or die "no svc_domain.svcnum for svc_acct.domsvc ". $self->domsvc;
     $svc_domain->domain;
   } else {
     $mydomain or die "svc_acct.domsvc is null and no legacy domain config file";
@@ -632,7 +633,7 @@ sub email {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.28 2001-08-21 03:03:36 ivan Exp $
+$Id: svc_acct.pm,v 1.29 2001-09-02 04:51:11 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 4f8a0bb6d0c789c7e156a446dc61dbe27938a372 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 2 Sep 2001 05:38:13 +0000
Subject: migration.  ugh.

---
 FS/FS/cust_bill_pay.pm      |  6 ++---
 FS/FS/cust_credit_refund.pm |  6 ++---
 FS/FS/cust_pay.pm           | 57 +++++++++++++++++++++++++++++++++++++++++++--
 FS/FS/cust_refund.pm        | 55 +++++++++++++++++++++++++++++++++++++++++--
 bin/fs-migrate-payref       | 30 ++++++++++++++++++++++++
 5 files changed, 144 insertions(+), 10 deletions(-)
 create mode 100755 bin/fs-migrate-payref

diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index fea6aee02..ac82c542d 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -1,4 +1,4 @@
-package cust_bill_pay;
+package FS::cust_bill_pay;
 
 use strict;
 use vars qw( @ISA );
@@ -156,7 +156,7 @@ sub check {
   my $error = 
     $self->ut_numbern('billpaynum')
     || $self->ut_number('invnum')
-    || $self->ut_numner('paynum')
+    || $self->ut_number('paynum')
     || $self->ut_money('amount')
     || $self->ut_numbern('_date')
   ;
@@ -194,7 +194,7 @@ sub cust_bill {
 
 =head1 VERSION
 
-$Id: cust_bill_pay.pm,v 1.5 2001-09-02 04:25:55 ivan Exp $
+$Id: cust_bill_pay.pm,v 1.6 2001-09-02 05:38:13 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_credit_refund.pm b/FS/FS/cust_credit_refund.pm
index 200e34e55..4c5195717 100644
--- a/FS/FS/cust_credit_refund.pm
+++ b/FS/FS/cust_credit_refund.pm
@@ -1,4 +1,4 @@
-package cust_credit_refund;
+package FS::cust_credit_refund;
 
 use strict;
 use vars qw( @ISA );
@@ -141,7 +141,7 @@ sub check {
   my $error = 
     $self->ut_numbern('creditrefundnum')
     || $self->ut_number('crednum')
-    || $self->ut_numner('refundnum')
+    || $self->ut_number('refundnum')
     || $self->ut_money('amount')
     || $self->ut_numbern('_date')
   ;
@@ -170,7 +170,7 @@ sub cust_refund {
 
 =head1 VERSION
 
-$Id: cust_credit_refund.pm,v 1.2 2001-09-02 01:27:11 ivan Exp $
+$Id: cust_credit_refund.pm,v 1.3 2001-09-02 05:38:13 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index a70b7cb37..70d1b7314 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -105,6 +105,9 @@ sub insert {
       $dbh->rollback if $oldAutoCommit;
       return $error;
     }
+    warn $cust_bill_pay;
+    warn $cust_bill_pay->cust_bill;
+    warn $cust_bill_pay->cust_bill->custnum;
     $self->custnum($cust_bill_pay->cust_bill->custnum);
   }
 
@@ -120,6 +123,56 @@ sub insert {
 
 }
 
+sub upgrade_replace { #1.3.x->1.4.x
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->check;
+  return $error if $error;
+
+  my %new = $self->hash;
+  my $new = FS::cust_pay->new(\%new);
+
+  if ( $self->invnum ) {
+    my $cust_bill_pay = new FS::cust_bill_pay {
+      'invnum' => $self->invnum,
+      'paynum' => $self->paynum,
+      'amount' => $self->paid,
+      '_date'  => $self->_date,
+    };
+    $error = $cust_bill_pay->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+    $new->custnum($cust_bill_pay->cust_bill->custnum);
+  } else {
+    die;
+  }
+
+  $error = $new->SUPER::replace($self);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+
+
+}
+
 =item delete
 
 Currently unimplemented (accounting reasons).
@@ -152,7 +205,7 @@ sub check {
 
   my $error =
     $self->ut_numbern('paynum')
-    || $self->ut_number('custnum')
+    || $self->ut_numbern('custnum')
     || $self->ut_money('paid')
     || $self->ut_numbern('_date')
     || $self->ut_textn('paybatch')
@@ -223,7 +276,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.5 2001-09-02 02:46:55 ivan Exp $
+$Id: cust_pay.pm,v 1.6 2001-09-02 05:38:13 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 89f8f68c5..77bacdffb 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -96,9 +96,11 @@ sub insert {
   my $error = $self->check;
   return $error if $error;
 
+  die;
+
   if ( $self->crednum ) {
     my $cust_credit_refund = new FS::cust_credit_refund {
-      'cred'      => $self->cred,
+      'crednum'   => $self->crednum,
       'refundnum' => $self->refundnum,
       'amount'    => $self->refund,
       '_date'     => $self->_date,
@@ -123,6 +125,55 @@ sub insert {
 
 }
 
+sub upgrade_replace {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->check;
+  return $error if $error;
+
+  my %new = $self->hash;
+  my $new = FS::cust_refund->new(\%new);
+
+  if ( $self->crednum ) {
+    my $cust_credit_refund = new FS::cust_credit_refund {
+      'crednum'   => $self->crednum,
+      'refundnum' => $self->refundnum,
+      'amount'    => $self->refund,
+      '_date'     => $self->_date,
+    };
+    $error = $cust_credit_refund->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+    $new->custnum($cust_credit_refund->cust_credit->custnum);
+  } else {
+    die;
+  }
+
+  $error = $new->SUPER::insert($self);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+
+}
+
 =item delete
 
 Currently unimplemented (accounting reasons).
@@ -198,7 +249,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.7 2001-09-02 04:25:55 ivan Exp $
+$Id: cust_refund.pm,v 1.8 2001-09-02 05:38:13 ivan Exp $
 
 =head1 BUGS
 
diff --git a/bin/fs-migrate-payref b/bin/fs-migrate-payref
new file mode 100755
index 000000000..f1513112b
--- /dev/null
+++ b/bin/fs-migrate-payref
@@ -0,0 +1,30 @@
+#!/usr/bin/perl
+
+use strict;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch);
+use FS::cust_pay;
+use FS::cust_refund;
+
+my $user = shift or die &usage;
+my $dbh = adminsuidsetup $user;
+
+#local $FS::UID::AutoCommit = 0; #quelle hack, in this case
+# $FS::UID::AutoCommit = 0; #quelle hack, in this case
+
+# apply payments to invoices
+
+foreach my $cust_pay ( qsearch('cust_pay', {} ) ) {
+  my $error = $cust_pay->upgrade_replace;
+  warn $error if $error;
+}
+
+# apply refunds to credits
+
+foreach my $cust_refund ( qsearch('cust_refund') ) {
+  my $error = $cust_refund->upgrade_replace;
+  warn $error if $error;
+}
+
+# ? apply credits to invoices
+
-- 
cgit v1.2.1


From dbfb0ae501d5acba37f9348476d94b99a4c92450 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 2 Sep 2001 07:49:52 +0000
Subject: things are starting to work again, sorta.

---
 FS/FS/cust_bill_pay.pm               |  5 ++-
 FS/FS/cust_credit_bill.pm            |  4 +-
 FS/FS/cust_credit_refund.pm          |  4 +-
 httemplate/edit/cust_credit_bill.cgi |  6 +--
 httemplate/view/cust_main.cgi        | 76 ++++++++++++++++++++++++------------
 5 files changed, 62 insertions(+), 33 deletions(-)

diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index ac82c542d..921c0255c 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -162,8 +162,9 @@ sub check {
   ;
   return $error if $error;
 
-  $self->_date(time) unless $self->_date;
+  return "amount must be > 0" if $self->amount == 0;
 
+  $self->_date(time) unless $self->_date;
 
   ''; #no error
 }
@@ -194,7 +195,7 @@ sub cust_bill {
 
 =head1 VERSION
 
-$Id: cust_bill_pay.pm,v 1.6 2001-09-02 05:38:13 ivan Exp $
+$Id: cust_bill_pay.pm,v 1.7 2001-09-02 07:49:52 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_credit_bill.pm b/FS/FS/cust_credit_bill.pm
index 0892f7984..58cc78965 100644
--- a/FS/FS/cust_credit_bill.pm
+++ b/FS/FS/cust_credit_bill.pm
@@ -107,6 +107,8 @@ sub check {
   ;
   return $error if $error;
 
+  return "amount must be > 0" if $self->amount == 0;
+
   return "Unknown credit"
     unless my $cust_credit = 
       qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
@@ -141,7 +143,7 @@ sub cust_credit {
 
 =head1 VERSION
 
-$Id: cust_credit_bill.pm,v 1.3 2001-09-02 01:27:11 ivan Exp $
+$Id: cust_credit_bill.pm,v 1.4 2001-09-02 07:49:52 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_credit_refund.pm b/FS/FS/cust_credit_refund.pm
index 4c5195717..fb09a42d8 100644
--- a/FS/FS/cust_credit_refund.pm
+++ b/FS/FS/cust_credit_refund.pm
@@ -147,6 +147,8 @@ sub check {
   ;
   return $error if $error;
 
+  return "amount must be > 0" if $self->amount == 0;
+
   $self->_date(time) unless $self->_date;
 
   return "unknown cust_credit.crednum: ". $self->crednum
@@ -170,7 +172,7 @@ sub cust_refund {
 
 =head1 VERSION
 
-$Id: cust_credit_refund.pm,v 1.3 2001-09-02 05:38:13 ivan Exp $
+$Id: cust_credit_refund.pm,v 1.4 2001-09-02 07:49:52 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index df495a668..c4cd34eab 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.1 2001-09-01 21:52:20 jeff Exp $ -->
+#<!-- $Id: cust_credit_bill.cgi,v 1.2 2001-09-02 07:49:52 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $_date $amount $reason $cust_credit );
@@ -40,7 +40,7 @@ $p1 = popurl(1);
 
 print $cgi->header( '-expires' => 'now' ), header("Apply Credit", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
+      "</FONT><BR><BR>"
   if $cgi->param('error');
 print <<END;
     <FORM ACTION="${p1}process/cust_credit_bill.cgi" METHOD=POST>
@@ -52,7 +52,7 @@ die unless $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } );
 print qq!Credit #<B>!, $crednum, qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
 
 print qq!\nInvoice # <SELECT NAME="invnum" SIZE=1>!;
-foreach $_ (grep $_->owed, qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } ) ) {
+foreach $_ (grep $_->owed != 0, qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } ) ) {
   print "<OPTION", (($_->invnum eq $invnum) ? " SELECTED" : ""),
     qq! VALUE="! .$_->invnum. qq!">!. $_->invnum. qq! (! . $_->owed . qq!)!;
 }
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 492183d11..6ece5c2be 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.6 2001-09-01 21:52:20 jeff Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.7 2001-09-02 07:49:52 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
@@ -20,6 +20,8 @@ use FS::part_referral;
 use FS::agent;
 use FS::cust_main;
 use FS::cust_refund;
+use FS::cust_bill_pay;
+use FS::cust_credit_bill;
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
@@ -329,6 +331,8 @@ print qq!<BR><BR><A NAME="history">Payment History!,
 # major problem: this whole thing is way too sloppy.
 # minor problem: the description lines need better formatting.
 
+# SHOULD SHOW UNAPPLIED PAYMENTS (now show unapplied credits)
+
 @history = (); #needed for mod_perl :)
 
 @bills = qsearch('cust_bill',{'custnum'=>$custnum});
@@ -340,46 +344,66 @@ foreach $bill (@bills) {
     qq! (Balance \$! . $bill->owed . qq!)</A>\t! .
     $bref->{charged} . qq!\t\t\t!;
 
-  my(@payments)=qsearch('cust_pay',{'invnum'=> $bref->{invnum} } );
-  my($payment);
-  foreach $payment (@payments) {
-    my($date,$invnum,$payby,$payinfo,$paid)=($payment->getfield('_date'),
-                                             $payment->getfield('invnum'),
-                                             $payment->getfield('payby'),
-                                             $payment->getfield('payinfo'),
-                                             $payment->getfield('paid'),
+  my(@cust_bill_pay)=qsearch('cust_bill_pay',{'invnum'=> $bref->{invnum} } );
+#  my(@payments)=qsearch('cust_pay',{'invnum'=> $bref->{invnum} } );
+#  my($payment);
+#  foreach $payment (@payments) {
+  foreach my $cust_bill_pay (@cust_bill_pay) {
+    my $payment = $cust_bill_pay->cust_pay;
+    my($date,$invnum,$payby,$payinfo,$paid)=($payment->_date,
+                                             $cust_bill_pay->invnum,
+                                             $payment->payby,
+                                             $payment->payinfo,
+                                             $cust_bill_pay->amount,
                       );
     push @history,
       "$date\tPayment, Invoice #$invnum ($payby $payinfo)\t\t$paid\t\t";
   }
+
+  my(@cust_credit_bill)=
+    qsearch('cust_credit_bill', { 'invnum'=> $bref->{invnum} } );
+  foreach my $cust_credit_bill (@cust_credit_bill) {
+    my $cust_credit = $cust_credit_bill->cust_credit;
+    my($date, $invnum, $crednum, $amount, $reason ) = (
+      $cust_credit->_date,
+      $cust_credit_bill->invnum,
+      $cust_credit_bill->crednum,
+      $cust_credit_bill->amount,
+      $cust_credit->reason,
+    );
+    push @history,
+      "$date\tCredit #$crednum, Invoice #$invnum $reason\t\t\t$amount\t";
+  }
 }
 
-@credits = qsearch('cust_credit',{'custnum'=>$custnum});
+@credits = grep $_->credited, qsearch('cust_credit',{'custnum'=>$custnum});
 foreach $credit (@credits) {
   my($cref)=$credit->hashref;
-  my($credited)=$credit->credited;
   push @history,
     $cref->{_date} . "\t" .
-    ($credited ?
-       (qq!<A HREF="! . popurl(2). qq!edit/cust_credit_bill.cgi?!. $cref->{crednum} . qq!">!) :
-       "") .
-    "Credit #" .
+    qq!<A HREF="! . popurl(2). qq!edit/cust_credit_bill.cgi?!. $cref->{crednum} . qq!">!.
+    '<font color="#ff0000">Unapplied credit #' .
     $cref->{crednum} . ", (Balance \$" .
-    $credited . ")" . ($credited ? "</A>" : "") .
+    $credit->credited . ")</font></A> ".
     $cref->{reason} . "\t\t\t" . $cref->{amount} . "\t";
+}
 
-  my(@refunds)=qsearch('cust_refund',{'crednum'=> $cref->{crednum} } );
-  my($refund);
-  foreach $refund (@refunds) {
-    my($rref)=$refund->hashref;
-    push @history,
-      $rref->{_date} . "\tRefund, Credit #" . $rref->{crednum} . " (" .
-      $rref->{payby} . " " . $rref->{payinfo} . ") by " .
-      $rref->{otaker} . " - ". $rref->{reason} . "\t\t\t\t" .
-      $rref->{refund};
-  }
+my(@refunds)=qsearch('cust_refund',{'custnum'=> $custnum } );
+my($refund);
+foreach $refund (@refunds) {
+  my($rref)=$refund->hashref;
+  my($refundnum) = (
+    $refund->refundnum,
+  );
+
+  push @history,
+    $rref->{_date} . "\tRefund #$refundnum, (" .
+    $rref->{payby} . " " . $rref->{payinfo} . ") by " .
+    $rref->{otaker} . " - ". $rref->{reason} . "\t\t\t\t" .
+    $rref->{refund};
 }
 
+
         #formatting
         print &table(), <<END;
 <TR>
-- 
cgit v1.2.1


From a5876f5e6c47fd651af9cc648c4b150a0f81279d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 2 Sep 2001 07:57:32 +0000
Subject: gawl

---
 bin/generate-tests | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100755 bin/generate-tests

diff --git a/bin/generate-tests b/bin/generate-tests
new file mode 100755
index 000000000..73fd29ecb
--- /dev/null
+++ b/bin/generate-tests
@@ -0,0 +1,21 @@
+#!/usr/bin/perl
+@files = glob('FS/*.pm');
+foreach (@files) {
+#  warn $_;
+  chomp;
+  s/^FS\///;
+  $f=$_;
+  $f=~s/pm$/t/;
+  $m=$_;
+  $m=~s/\.pm$//;
+  open(TEST,">t/$f");
+  print "t/$f\n";
+  print TEST
+             'BEGIN { $| = 1; print "1..1\n" }'. "\n".
+             'END {print "not ok 1\n" unless $loaded;}'. "\n".
+             "use FS::$m;\n".
+             '$loaded=1;'. "\n".
+             'print "ok 1\n";'. "\n"
+             ;
+  close TEST;
+}
-- 
cgit v1.2.1


From 33204e66fb11e9e551b95e8656d088506745e361 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 2 Sep 2001 07:57:57 +0000
Subject: credito

---
 CREDITS | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/CREDITS b/CREDITS
index d46937d75..80de31ba7 100644
--- a/CREDITS
+++ b/CREDITS
@@ -74,10 +74,16 @@ remember.
 Brad Dameron <bdameron@tscnet.com> contributed code to do configurable state
 and referral defaults.
 
-Surf and Sip, Inc., <http://www.surfandsip.com> generously sponsored a
-long-requested feature - the session monitor and time-based prepaid cards.
+Surf and Sip, Inc., <http://www.surfandsip.com> sponsored a long-requested
+feature - the session monitor and time-based prepaid cards.
 Matt Peterson <matt@peterson.org> and Mack ? <mackn@mackn.net> tested
 the new features and contributed many bugfixes.
 
+Landel Telecom <http://www.landel.com/> sponsored shipping addresses and
+customer notes.
+
+nikotel, Inc. <http://www.nikojet.com> sponsored the inclusion of
+customer-to-customer referrals in the web interface and signup server.
+
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
-- 
cgit v1.2.1


From fbcb45dfe5a1bce7981fe4527176b9fdf2ec54b7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Sep 2001 22:07:39 +0000
Subject: fix more bugs

---
 FS/FS/cust_bill.pm                   |   4 +-
 FS/FS/cust_bill_pay.pm               |   4 +-
 FS/FS/cust_main.pm                   | 169 ++++++++++++++++++++++-------------
 FS/FS/cust_pay.pm                    |  31 ++++---
 FS/FS/cust_svc.pm                    |   4 +-
 FS/bin/freeside-bill                 |  19 ++--
 httemplate/docs/signup.html          |   2 +-
 httemplate/docs/upgrade8.html        |  30 ++++++-
 httemplate/edit/cust_credit.cgi      |  14 ++-
 httemplate/edit/cust_credit_bill.cgi |  66 ++++++++++----
 httemplate/edit/cust_pay.cgi         |  33 +++++--
 httemplate/edit/process/cust_pay.cgi |  26 ++++--
 httemplate/misc/bill.cgi             |   5 +-
 httemplate/view/cust_bill.cgi        |  12 ++-
 httemplate/view/cust_main.cgi        |  59 +++++++-----
 15 files changed, 321 insertions(+), 157 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 2ca4b529a..f61137f54 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -408,7 +408,7 @@ sub print_text {
 
     push @buf,[
       "Payment received ". time2str("%x",$_->cust_pay->_date ),
-      $money_char. sprintf("%10.2f",$_->paid )
+      $money_char. sprintf("%10.2f",$_->amount )
     ];
   }
 
@@ -489,7 +489,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.10 2001-09-02 01:27:10 ivan Exp $
+$Id: cust_bill.pm,v 1.11 2001-09-03 22:07:38 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index 921c0255c..5ef82d658 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -114,7 +114,7 @@ sub insert {
   if ( $bill_total > $cust_bill->charged ) {
     $dbh->rollback if $oldAutoCommit;
     return "total cust_bill_pay.amount and cust_credit_bill.amount $bill_total".
-           "for invnum ". $self->invnum.
+           " for invnum ". $self->invnum.
            " greater than cust_bill.charged ". $cust_bill->charged;
   }
 
@@ -195,7 +195,7 @@ sub cust_bill {
 
 =head1 VERSION
 
-$Id: cust_bill_pay.pm,v 1.7 2001-09-02 07:49:52 ivan Exp $
+$Id: cust_bill_pay.pm,v 1.8 2001-09-03 22:07:38 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 41ad21b72..b29e3852b 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -709,10 +709,16 @@ sub ncancelled_pkgs {
 Generates invoices (see L<FS::cust_bill>) for this customer.  Usually used in
 conjunction with the collect method.
 
+Options are passed as name-value pairs.
+
 The only currently available option is `time', which bills the customer as if
 it were that time.  It is specified as a UNIX timestamp; see
 L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse> for conversion
-functions.
+functions.  For example:
+
+ use Date::Parse;
+ ...
+ $cust_main->bill( 'time' => str2time('April 20th, 2001') );
 
 If there is an error, returns the error, otherwise returns false.
 
@@ -740,7 +746,7 @@ sub bill {
   # & generate invoice database.
  
   my( $total_setup, $total_recur ) = ( 0, 0 );
-  my @cust_bill_pkg;
+  my @cust_bill_pkg = ();
 
   foreach my $cust_pkg (
     qsearch('cust_pkg',{'custnum'=> $self->getfield('custnum') } )
@@ -763,20 +769,24 @@ sub bill {
     my $setup = 0;
     unless ( $cust_pkg->setup ) {
       my $setup_prog = $part_pkg->getfield('setup');
-      $setup_prog =~ /^(.*)$/ #presumably trusted
-        or die "Illegal setup for package ". $cust_pkg->pkgnum. ": $setup_prog";
+      $setup_prog =~ /^(.*)$/ or do {
+        $dbh->rollback if $oldAutoCommit;
+        return "Illegal setup for pkgpart ". $part_pkg->pkgpart.
+               ": $setup_prog";
+      };
       $setup_prog = $1;
+
       my $cpt = new Safe;
       #$cpt->permit(); #what is necessary?
       $cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
       $setup = $cpt->reval($setup_prog);
       unless ( defined($setup) ) {
-        warn "Error reval-ing part_pkg->setup pkgpart ", 
-             $part_pkg->pkgpart, ": $@";
-      } else {
-        $cust_pkg->setfield('setup',$time);
-        $cust_pkg_mod_flag=1; 
+        $dbh->rollback if $oldAutoCommit;
+        return "Error reval-ing part_pkg->setup pkgpart ". $part_pkg->pkgpart.
+               ": $@";
       }
+      $cust_pkg->setfield('setup',$time);
+      $cust_pkg_mod_flag=1; 
     }
 
     #bill recurring fee
@@ -787,43 +797,57 @@ sub bill {
          ( $cust_pkg->getfield('bill') || 0 ) < $time
     ) {
       my $recur_prog = $part_pkg->getfield('recur');
-      $recur_prog =~ /^(.*)$/ #presumably trusted
-        or die "Illegal recur for package ". $cust_pkg->pkgnum. ": $recur_prog";
+      $recur_prog =~ /^(.*)$/ or do {
+        $dbh->rollback if $oldAutoCommit;
+        return "Illegal recur for pkgpart ". $part_pkg->pkgpart.
+               ": $recur_prog";
+      };
       $recur_prog = $1;
+
       my $cpt = new Safe;
       #$cpt->permit(); #what is necessary?
       $cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
       $recur = $cpt->reval($recur_prog);
       unless ( defined($recur) ) {
-        warn "Error reval-ing part_pkg->recur pkgpart ",
-             $part_pkg->pkgpart, ": $@";
-      } else {
-        #change this bit to use Date::Manip? CAREFUL with timezones (see
-        # mailing list archive)
-        #$sdate=$cust_pkg->bill || time;
-        #$sdate=$cust_pkg->bill || $time;
-        $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
-        my ($sec,$min,$hour,$mday,$mon,$year) =
-          (localtime($sdate) )[0,1,2,3,4,5];
-        $mon += $part_pkg->getfield('freq');
-        until ( $mon < 12 ) { $mon -= 12; $year++; }
-        $cust_pkg->setfield('bill',
-          timelocal($sec,$min,$hour,$mday,$mon,$year));
-        $cust_pkg_mod_flag = 1; 
+        $dbh->rollback if $oldAutoCommit;
+        return "Error reval-ing part_pkg->recur pkgpart ".
+               $part_pkg->pkgpart. ": $@";
       }
+      #change this bit to use Date::Manip? CAREFUL with timezones (see
+      # mailing list archive)
+      #$sdate=$cust_pkg->bill || time;
+      #$sdate=$cust_pkg->bill || $time;
+      $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
+      my ($sec,$min,$hour,$mday,$mon,$year) =
+        (localtime($sdate) )[0,1,2,3,4,5];
+      $mon += $part_pkg->getfield('freq');
+      until ( $mon < 12 ) { $mon -= 12; $year++; }
+      $cust_pkg->setfield('bill',
+        timelocal($sec,$min,$hour,$mday,$mon,$year));
+      $cust_pkg_mod_flag = 1; 
     }
 
-    warn "setup is undefined" unless defined($setup);
-    warn "recur is undefined" unless defined($recur);
-    warn "cust_pkg bill is undefined" unless defined($cust_pkg->bill);
+    warn "\$setup is undefined" unless defined($setup);
+    warn "\$recur is undefined" unless defined($recur);
+    warn "\$cust_pkg->bill is undefined" unless defined($cust_pkg->bill);
 
     if ( $cust_pkg_mod_flag ) {
       $error=$cust_pkg->replace($old_cust_pkg);
       if ( $error ) { #just in case
-        warn "Error modifying pkgnum ", $cust_pkg->pkgnum, ": $error";
-      } else {
-        $setup = sprintf( "%.2f", $setup );
-        $recur = sprintf( "%.2f", $recur );
+        $dbh->rollback if $oldAutoCommit;
+        return "Error modifying pkgnum ". $cust_pkg->pkgnum. ": $error";
+      }
+      $setup = sprintf( "%.2f", $setup );
+      $recur = sprintf( "%.2f", $recur );
+      if ( $setup < 0 ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "negative setup $setup for pkgnum ". $cust_pkg->pkgnum;
+      }
+      if ( $recur < 0 ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "negative recur $recur for pkgnum ". $cust_pkg->pkgnum;
+      }
+      if ( $setup > 0 || $recur > 0 ) {
         my $cust_bill_pkg = new FS::cust_bill_pkg ({
           'pkgnum' => $cust_pkg->pkgnum,
           'setup'  => $setup,
@@ -844,11 +868,9 @@ sub bill {
   unless ( @cust_bill_pkg ) {
     $dbh->commit or die $dbh->errstr if $oldAutoCommit;
     return '';
-  }
+  } 
 
-  unless ( $self->getfield('tax') =~ /Y/i
-           || $self->getfield('payby') eq 'COMP'
-  ) {
+  unless ( $self->tax =~ /Y/i || $self->payby eq 'COMP' ) {
     my $cust_main_county = qsearchs('cust_main_county',{
         'state'   => $self->state,
         'county'  => $self->county,
@@ -870,25 +892,25 @@ sub bill {
   }
 
   my $cust_bill = new FS::cust_bill ( {
-    'custnum' => $self->getfield('custnum'),
-    '_date' => $time,
+    'custnum' => $self->custnum,
+    '_date'   => $time,
     'charged' => $charged,
   } );
   $error = $cust_bill->insert;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
-    return "$error for customer #". $self->custnum;
+    return "can't create invoice for customer #". $self->custnum. ": $error";
   }
 
   my $invnum = $cust_bill->invnum;
   my $cust_bill_pkg;
   foreach $cust_bill_pkg ( @cust_bill_pkg ) {
-    $cust_bill_pkg->setfield( 'invnum', $invnum );
+    warn $cust_bill_pkg->invnum($invnum);
     $error = $cust_bill_pkg->insert;
-    #shouldn't happen, but how else tohandle this?
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
-      return "$error for customer #". $self->custnum;
+      return "can't create invoice line item for customer #". $self->custnum.
+             ": $error";
     }
   }
   
@@ -906,6 +928,8 @@ a credit card (`CARD'), or just add any necessary (pseudo-)payment (`COMP').
 
 If there is an error, returns the error, otherwise returns false.
 
+Options are passed as name-value pairs.
+
 Currently available options are:
 
 invoice_time - Use this time when deciding when to print invoices and
@@ -937,10 +961,10 @@ sub collect {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  my $total_owed = $self->balance;
-  warn "collect: total owed $total_owed " if $Debug;
-  unless ( $total_owed > 0 ) { #redundant?????
-    $dbh->rollback if $oldAutoCommit;
+  my $balance = $self->balance;
+  warn "collect: balance $balance" if $Debug;
+  unless ( $balance > 0 ) { #redundant?????
+    $dbh->rollback if $oldAutoCommit; #hmm
     return '';
   }
 
@@ -949,18 +973,18 @@ sub collect {
   ) {
 
     #this has to be before next's
-    my $amount = sprintf( "%.2f", $total_owed < $cust_bill->owed
-                                  ? $total_owed
+    my $amount = sprintf( "%.2f", $balance < $cust_bill->owed
+                                  ? $balance
                                   : $cust_bill->owed
     );
-    $total_owed = sprintf( "%.2f", $total_owed - $amount );
+    $balance = sprintf( "%.2f", $balance - $amount );
 
     next unless $cust_bill->owed > 0;
 
-    # ??????????
+    # don't try to charge for the same invoice if it's already in a batch
     next if qsearchs( 'cust_pay_batch', { 'invnum' => $cust_bill->invnum } );
 
-    warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ", amount $amount, total_owed $total_owed)" if $Debug;
+    warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ", amount $amount, balance $balance)" if $Debug;
 
     next unless $amount > 0;
 
@@ -1115,6 +1139,8 @@ sub collect {
 
         } elsif ( $processor =~ /^Business::OnlinePayment::(.*)$/ ) {
 
+          my $bop_processor = $1;
+
           my($payname, $payfirst, $paylast);
           if ( $self->payname ) {
             $payname = $self->payname;
@@ -1130,7 +1156,8 @@ sub collect {
             $payname =  "$payfirst $paylast";
           }
         
-          my $transaction = new Business::OnlinePayment( $1, @bop_options );
+          my $transaction =
+            new Business::OnlinePayment( $bop_processor, @bop_options );
           $transaction->content(
             'type'           => 'CC',
             'login'          => $bop_login,
@@ -1177,7 +1204,7 @@ sub collect {
                    $transaction->result_code. ": ". $transaction->error_message;
           } else {
             $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-            return ''
+            #return '';
           }
 
         } else {
@@ -1226,7 +1253,7 @@ sub collect {
 =item total_owed
 
 Returns the total owed for this customer on all invoices
-(see L<FS::cust_bill>).
+(see L<FS::cust_bill/owed>).
 
 =cut
 
@@ -1323,7 +1350,7 @@ sub apply_payments {
     if ( $cust_bill->owed >= $payment->unapplied ) {
       $amount = $payment->unapplied;
     } else {
-      $amount = $payment->owed;
+      $amount = $cust_bill->owed;
     }
 
     my $cust_bill_pay = new FS::cust_bill_pay ( {
@@ -1343,7 +1370,8 @@ sub apply_payments {
 
 =item total_credited
 
-Returns the total credits (see L<FS::cust_credit>) for this customer.
+Returns the total outstanding credit (see L<FS::cust_credit>) for this
+customer.  See L<FS::cust_credit/credited>.
 
 =cut
 
@@ -1358,15 +1386,36 @@ sub total_credited {
   sprintf( "%.2f", $total_credit );
 }
 
+=item total_unapplied_payments
+
+Returns the total unapplied payments (see L<FS::cust_pay>) for this customer.
+See L<FS::cust_pay/unapplied>.
+
+=cut
+
+sub total_unapplied_payments {
+  my $self = shift;
+  my $total_unapplied = 0;
+  foreach my $cust_pay ( qsearch('cust_pay', {
+    'custnum' => $self->custnum,
+  } ) ) {
+    $total_unapplied += $cust_pay->unapplied;
+  }
+  sprintf( "%.2f", $total_unapplied );
+}
+
 =item balance
 
-Returns the balance for this customer (total owed minus total credited).
+Returns the balance for this customer (total_owed minus total_credited
+minus total_unapplied_payments).
 
 =cut
 
 sub balance {
   my $self = shift;
-  sprintf( "%.2f", $self->total_owed - $self->total_credited );
+  sprintf( "%.2f",
+    $self->total_owed - $self->total_credited - $self->total_unapplied_payments
+  );
 }
 
 =item invoicing_list [ ARRAYREF ]
@@ -1501,7 +1550,7 @@ sub rebuild_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.28 2001-09-02 04:25:55 ivan Exp $
+$Id: cust_main.pm,v 1.29 2001-09-03 22:07:38 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 70d1b7314..42ca0b0a5 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -3,7 +3,7 @@ package FS::cust_pay;
 use strict;
 use vars qw( @ISA );
 use Business::CreditCard;
-use FS::Record qw( dbh );
+use FS::Record qw( dbh qsearch qsearchs );
 use FS::cust_bill;
 use FS::cust_bill_pay;
 use FS::cust_main;
@@ -93,6 +93,21 @@ sub insert {
   my $error = $self->check;
   return $error if $error;
 
+  if ( $self->invnum ) {
+    my $cust_bill = qsearchs('cust_bill', { 'invnum' => $self->invnum } )
+      or do {
+        $dbh->rollback if $oldAutoCommit;
+        return "Unknown cust_bill.invnum: ". $self->invnum;
+      };
+    $self->custnum($cust_bill->custnum );
+  }
+
+  $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "error inserting $self: $error";
+  }
+
   if ( $self->invnum ) {
     my $cust_bill_pay = new FS::cust_bill_pay {
       'invnum' => $self->invnum,
@@ -103,18 +118,8 @@ sub insert {
     $error = $cust_bill_pay->insert;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
-      return $error;
+      return "error inserting $cust_bill_pay: $error";
     }
-    warn $cust_bill_pay;
-    warn $cust_bill_pay->cust_bill;
-    warn $cust_bill_pay->cust_bill->custnum;
-    $self->custnum($cust_bill_pay->cust_bill->custnum);
-  }
-
-  $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
   }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
@@ -276,7 +281,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.6 2001-09-02 05:38:13 ivan Exp $
+$Id: cust_pay.pm,v 1.7 2001-09-03 22:07:38 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 77151b80e..daec79fe8 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -58,7 +58,7 @@ The following fields are currently supported:
 
 Creates a new service.  To add the refund to the database, see L<"insert">.
 Services are normally created by creating FS::svc_ objects (see
-L<FS::svc_acct>, L<FS::svc_domain>, and L<FS::svc_acct_sm>, among others).
+L<FS::svc_acct>, L<FS::svc_domain>, and L<FS::svc_forward>, among others).
 
 =cut
 
@@ -155,7 +155,7 @@ sub label {
 
 =head1 VERSION
 
-$Id: cust_svc.pm,v 1.4 2001-09-02 04:51:11 ivan Exp $
+$Id: cust_svc.pm,v 1.5 2001-09-03 22:07:38 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill
index 3462fa149..1dce9a19b 100755
--- a/FS/bin/freeside-bill
+++ b/FS/bin/freeside-bill
@@ -55,15 +55,19 @@ foreach $cust_main (
   warn "Error billing,  customer #" . $cust_main->getfield('custnum') . 
     ":" . $error if $error;
 
+  if ($main::opt_p) {
+    $cust_main->apply_payments;
+    $error=$cust_main->apply_credits;
+  }
+
   if ($main::opt_c) {
     $error=$cust_main->collect('invoice_time'=>$time,
                                'batch_card' => $main::opt_i ? 'no' : 'yes',
                               );
-    warn "Error collecting customer #" . $cust_main->getfield('custnum') .
-      ":" . $error if $error;
-
-  #sleep 1;
+    warn "Error collecting from customer #" . $cust_main->gcustnum.  ":$error"
+      if $error;
 
+    #sleep 1;
   }
 
 }
@@ -89,7 +93,7 @@ freeside-bill - Command line (crontab, script) interface to customer billing.
 
 =head1 SYNOPSIS
 
-  freeside-bill [ -c [ -a ] [ -i ] ] [ -d 'date' ] user [ custnum custnum ... ]
+  freeside-bill [ -c [ -p ] [ -a ] [ -i ] ] [ -d 'date' ] user [ custnum custnum ... ]
 
 =head1 DESCRIPTION
 
@@ -98,6 +102,9 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
   -c: Turn on collecting (you probably want this).
 
+  -p: Apply unapplied payments and credits before collecting (you probably want
+      this too)
+
   -a: Call collect even if there isn't a new invoice (probably a bad idea for
       daily use)
 
@@ -114,7 +121,7 @@ customers.  Otherwise, bills all customers.
 
 =head1 VERSION
 
-$Id: freeside-bill,v 1.7 2001-08-21 09:34:13 ivan Exp $
+$Id: freeside-bill,v 1.8 2001-09-03 22:07:39 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/docs/signup.html b/httemplate/docs/signup.html
index f99b7ebb5..262b697bb 100644
--- a/httemplate/docs/signup.html
+++ b/httemplate/docs/signup.html
@@ -42,7 +42,7 @@ Optional:
     <li>$password
     <li>$email_name - first and last name
   </ul>
-  (an example file is included as <b>fs_signup/ieak.template</b>)
+  (an example file is included as <b>fs_signup/ieak.template</b>)  See the <a href="http://www.microsoft.com/windows/ieak/techinfo/deploy/60/en/toc.asp">IEAK documentation</a> for more information.
   <li>If you create a <b>/usr/local/freeside/cck.template</b> file on the external machine, the variables defined will be sent to Netscape users with MIME type <i>application/x-netscape-autoconfigure-dialer-v2</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the following variables available:
   <ul>
     <li>$ac - area code of selected POP
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 6d5018816..518d76168 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -181,8 +181,34 @@ ALTER TABLE cust_main ADD COLUMN comments varchar NULL;
   <table border><tr><th>PostgreSQL</th><th>MySQL, others</th></tr>
 <tr><td>
 <font size=-1><pre>
-ALTER TABLE cust_pay RENAME COLUMN invnum TO depreciated;
-ALTER TABLE cust_refund RENAME COLUMN crednum TO depreciated;
+CREATE TABLE cust_pay_temp (
+  paynum int primary key,
+  custnum int not null,
+  paid decimal(10,2) not null,
+  _date int null,
+  payby char(4) not null,
+  payinfo varchar(16) null,
+  paybatch varchar(80) null
+);
+INSERT INTO cust_pay_temp SELECT * from cust_pay;
+DROP TABLE cust_pay;
+ALTER TABLE cust_pay_temp RENAME TO cust_pay;
+CREATE UNIQUE INDEX cust_pay1 ON cust_pay paynum;
+CREATE TABLE cust_refund_temp (
+  refundnum int primary key,
+  custnum int not null,
+  _date int null,
+  refund decimal(10,2) not null,
+  otaker varchar(8) not null,
+  reason varchar(80) not null,
+  payby char(4) not null,
+  payinfo varchar(16) null,
+  paybatch varchar(80) null
+);
+INSERT INTO cust_refund_temp SELECT * from cust_refund;
+DROP TABLE cust_refund;
+ALTER TABLE cust_refund_temp RENAME TO cust_refund;
+CREATE UNIQUE INDEX cust_refund1 ON cust_refund refundnum;
 </pre></font>
 </td><td>
 <font size=-1><pre>
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index a95636662..9b215389a 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $otaker $p1 $crednum $_date $amount $reason );
@@ -42,31 +42,29 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
   if $cgi->param('error');
 print <<END;
     <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>
-    <PRE>
 END
 
 $crednum = "";
 print qq!Credit #<B>!, $crednum ? $crednum : " <I>(NEW)</I>", qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
 
-print qq!\nCustomer #<B>$custnum</B><INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
+print qq!<BR>Customer #<B>$custnum</B><INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
 
 print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
 
-print qq!\nDate: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
+print qq!<BR>Date: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
 
-print qq!\nAmount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
+print qq!<BR>Amount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
 print qq!<INPUT TYPE="hidden" NAME="credited" VALUE="">!;
 
 #print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
 
 print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!;
 
-print qq!\nReason <INPUT TYPE="text" NAME="reason" VALUE="$reason" SIZE=72>!;
+print qq!<BR>Reason <INPUT TYPE="text" NAME="reason" VALUE="$reason">!;
 
 print <<END;
-</PRE>
 <BR>
-<CENTER><INPUT TYPE="submit" VALUE="Post"></CENTER>
+<INPUT TYPE="submit" VALUE="Post">
 END
 
 print <<END;
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index c4cd34eab..13bad1852 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,11 +1,12 @@
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.2 2001-09-02 07:49:52 ivan Exp $ -->
+#<!-- $Id: cust_credit_bill.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
 
 use strict;
-use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $_date $amount $reason $cust_credit );
+use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $amount $reason $cust_credit );
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
+use Date::Format;
 use FS::UID qw(cgisuidsetup getotaker);
 use FS::CGI qw(header popurl);
 use FS::Record qw(qsearch fields);
@@ -32,7 +33,6 @@ if ( $cgi->param('error') ) {
   #$refund = 'yes';
   $invnum = '';
 }
-$_date = time;
 
 $otaker = getotaker;
 
@@ -44,31 +44,65 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
   if $cgi->param('error');
 print <<END;
     <FORM ACTION="${p1}process/cust_credit_bill.cgi" METHOD=POST>
-    <PRE>
 END
 
 die unless $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } );
 
-print qq!Credit #<B>!, $crednum, qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
+my $credited = $cust_credit->credited;
+
+print "Credit # <B>$crednum</B>".
+      qq!<INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!.
+      '<BR>Date: <B>'. time2str("%D", $cust_credit->_date). '</B>'.
+      '<BR>Amount: $<B>'. $cust_credit->amount. '</B>'.
+      "<BR>Unapplied amount: \$<B>$credited</B>".
+      '<BR>Reason: <B>'. $cust_credit->reason. '</B>'
+      ;
+
+my @cust_bill = grep $_->owed != 0,
+                qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } );
+
+print <<END;
+<SCRIPT>
+function changed(what) {
+  cust_bill = what.options[what.selectedIndex].value;
+END
 
-print qq!\nInvoice # <SELECT NAME="invnum" SIZE=1>!;
-foreach $_ (grep $_->owed != 0, qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } ) ) {
-  print "<OPTION", (($_->invnum eq $invnum) ? " SELECTED" : ""),
-    qq! VALUE="! .$_->invnum. qq!">!. $_->invnum. qq! (! . $_->owed . qq!)!;
+foreach my $cust_bill ( @cust_bill ) {
+  my $invnum = $cust_bill->invnum;
+  my $changeto = $cust_bill->owed < $cust_credit->credited
+                   ? $cust_bill->owed 
+                   : $cust_credit->credited;
+  print <<END;
+  if ( cust_bill == $invnum ) {
+    what.form.amount.value = "$changeto";
+  }
+END
 }
-print qq!<OPTION VALUE="Refund">Refund!;
-print "</SELECT>";
 
-print qq!\nDate: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
+print <<END;
+  if ( cust_bill == "Refund" ) {
+    what.form.amount.value = "$credited";
+  }
+}
+</SCRIPT>
+END
 
-print qq!\nAmount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
+print qq!<BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)">!,
+      '<OPTION VALUE="">';
+foreach my $cust_bill ( @cust_bill ) {
+  print '<OPTION'. ( $cust_bill->invnum eq $invnum ? ' SELECTED' : '' ).
+        ' VALUE="'. $cust_bill->invnum. '">'. $cust_bill->invnum.
+        ' -  '. time2str("%D",$cust_bill->_date).
+        ' - $'. $cust_bill->owed;
+}
+print qq!<OPTION VALUE="Refund">Refund!;
+print "</SELECT>";
 
-#print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
+print qq!<BR>Amount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
 
 print <<END;
-</PRE>
 <BR>
-<CENTER><INPUT TYPE="submit" VALUE="Post"></CENTER>
+<INPUT TYPE="submit" VALUE="Apply">
 END
 
 print <<END;
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index d1823d4b3..c83f585d1 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,8 +1,8 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
 
 use strict;
-use vars qw( $cgi $invnum $p1 $_date $payby $payinfo $paid );
+use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid );
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
@@ -13,17 +13,27 @@ $cgi = new CGI;
 cgisuidsetup($cgi);
 
 if ( $cgi->param('error') ) {
-  $invnum = $cgi->param('invnum');
+  $link = $cgi->param('link');
+  $linknum = $cgi->param('linknum');
   $paid = $cgi->param('paid');
   $payby = $cgi->param('payby');
   $payinfo = $cgi->param('payinfo');
-} else {
-  my ($query) = $cgi->keywords;
+} elsif ($cgi->keywords) {
+  my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/;
-  $invnum = $1;
+  $link = 'invnum';
+  $linknum = $1;
   $paid = '';
-  $payby = "BILL";
+  $payby = 'BILL';
   $payinfo = "";
+} elsif ( $cgi->param('custnum')  =~ /^(\d+)$/ ) {
+  $link = 'custnum';
+  $linknum = $1;
+  $paid = '';
+  $payby = 'BILL';
+  $payinfo = '';
+} else {
+  die "illegal query ". $cgi->keywords;
 }
 $_date = time;
 
@@ -36,10 +46,15 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
 
 print <<END;
     <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
-    <HR><PRE>
+    <INPUT TYPE="hidden" NAME="link" VALUE="$link">
+    <INPUT TYPE="hidden" NAME="linknum" VALUE="$linknum">
 END
 
-print qq!Invoice #<B>$invnum</B><INPUT TYPE="hidden" NAME="invnum" VALUE="$invnum">!;
+if ( $link eq 'invnum' ) {
+  print "Invoice #<B>$linknum</B>";
+} elsif ( $link eq 'custnum' ) {
+  print "Customer #<B>$linknum</B>";
+}
 
 print qq!<BR>Date: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
 
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index fcdc233b9..9be96505d 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,8 +1,8 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
 
 use strict;
-use vars qw( $cgi $invnum $new $error );
+use vars qw( $cgi $link $linknum $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -13,24 +13,32 @@ use FS::cust_pay;
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
-$cgi->param('invnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$invnum = $1;
+$cgi->param('linknum') =~ /^(\d+)$/
+  or die "Illegal linknum: ". $cgi->param('linknum');
+$linknum = $1;
+
+$cgi->param('link') =~ /^(custnum|invnum)$/
+  or die "Illegal link: ". $cgi->param('link');
+$link = $1;
 
 $new = new FS::cust_pay ( {
+  $link => $linknum,
   map {
     $_, scalar($cgi->param($_));
-  #} qw(invnum paid _date payby payinfo paybatch)
-  } fields('cust_pay')
+  } qw(paid _date payby payinfo paybatch)
+  #} fields('cust_pay')
 } );
 
-$error=$new->insert;
+$error = $new->insert;
 
 if ($error) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). 'cust_pay.cgi?'. $cgi->query_string );
   exit;
-} else {
-  print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$invnum");
+} elsif ( $link eq 'invnum' ) {
+  print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$linknum");
+} elsif ( $link eq 'custnum' ) {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$linknum");
 }
 
 %>
diff --git a/httemplate/misc/bill.cgi b/httemplate/misc/bill.cgi
index cc7938308..43c7c576d 100755
--- a/httemplate/misc/bill.cgi
+++ b/httemplate/misc/bill.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: bill.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: bill.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $cust_main $error );
@@ -25,6 +25,9 @@ $error = $cust_main->bill(
                          );
 &eidiot($error) if $error;
 
+$cust_main->apply_payments;
+$cust_main->apply_credits;
+
 $error = $cust_main->collect(
 #                             'invoice-time'=>$time,
 #                             'batch_card'=> 'yes',
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 12fe8578a..1e024f377 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_bill.cgi,v 1.2 2001-08-21 02:31:57 ivan Exp $ -->
+# <!-- $Id: cust_bill.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $invnum $cust_bill $custnum $printed $p );
@@ -29,9 +29,13 @@ $p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header('Invoice View', menubar(
   "Main Menu" => $p,
   "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-)), <<END;
-      <A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) against this invoice</A>
-      <BR><A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>
+));
+
+print qq!<A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) against this invoice</A> | !
+  if $cust_bill->owed > 0;
+
+print <<END;
+      <A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>
       <BR><BR>(Printed $printed times)
     <PRE>
 END
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 6ece5c2be..a32abc0e1 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.7 2001-09-02 07:49:52 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.8 2001-09-03 22:07:39 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
@@ -192,7 +192,7 @@ print '<BR>';
 
   @invoicing_list = $cust_main->invoicing_list;
   print "Billing information (",
-       qq!<A HREF="!, popurl(2), qq!/misc/bill.cgi?$custnum">!, "Bill now</A>)",
+       qq!<A HREF="!, popurl(2), qq!misc/bill.cgi?$custnum">!, "Bill now</A>)",
         &ntable("#cccccc"), "<TR><TD>", &ntable("#cccccc",2),
         '<TR><TD ALIGN="right">Tax exempt</TD><TD BGCOLOR="#ffffff">',
         $cust_main->tax ? 'yes' : 'no',
@@ -269,9 +269,9 @@ print qq!!, &table(), "\n",
 
 #get package info
 if ( $conf->exists('hidecancelledpackages') ) {
-  @packages = $cust_main->ncancelled_pkgs;
+  @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->ncancelled_pkgs);
 } else {
-  @packages = $cust_main->all_pkgs;
+  @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->all_pkgs);
 }
 
 $n1 = '<TR>';
@@ -320,28 +320,31 @@ print "</TR>";
 print "</TABLE>";
 
 #formatting
-print qq!<BR><BR><A NAME="history">Payment History!,
-      qq!</A>!,
-      qq! ( Click on invoice to view invoice/enter payment. | !,
-      qq!<A HREF="!, popurl(2), qq!edit/cust_credit.cgi?$custnum">!,
-      qq!Post credit / refund</A> )!;
+print qq!<BR><BR><A NAME="history">Payment History!.
+      qq!</A> ( !.
+      qq!<A HREF="!. popurl(2). qq!edit/cust_pay.cgi?custnum=$custnum">!.
+      qq!Post payment</A> | !.
+      qq!<A HREF="!. popurl(2). qq!edit/cust_credit.cgi?$custnum">!.
+      qq!Post credit</A> )!;
 
 #get payment history
 #
 # major problem: this whole thing is way too sloppy.
 # minor problem: the description lines need better formatting.
 
-# SHOULD SHOW UNAPPLIED PAYMENTS (now show unapplied credits)
-
 @history = (); #needed for mod_perl :)
 
 @bills = qsearch('cust_bill',{'custnum'=>$custnum});
 foreach $bill (@bills) {
   my($bref)=$bill->hashref;
+  my $bpre = ( $bill->owed > 0 )
+               ? '<b><font size="+1" color="#ff0000"> Open '
+               : '';
+  my $bpost = ( $bill->owed > 0 ) ? '</font></b>' : '';
   push @history,
     $bref->{_date} . qq!\t<A HREF="!. popurl(2). qq!view/cust_bill.cgi?! .
-    $bref->{invnum} . qq!">Invoice #! . $bref->{invnum} .
-    qq! (Balance \$! . $bill->owed . qq!)</A>\t! .
+    $bref->{invnum} . qq!">${bpre}Invoice #! . $bref->{invnum} .
+    qq! (Balance \$! . $bill->owed . qq!)$bpost</A>\t! .
     $bref->{charged} . qq!\t\t\t!;
 
   my(@cust_bill_pay)=qsearch('cust_bill_pay',{'invnum'=> $bref->{invnum} } );
@@ -356,6 +359,7 @@ foreach $bill (@bills) {
                                              $payment->payinfo,
                                              $cust_bill_pay->amount,
                       );
+    $payinfo = substr($payinfo,0,4). 'x'x(length($payinfo)-4) if $payby eq 'CARD';
     push @history,
       "$date\tPayment, Invoice #$invnum ($payby $payinfo)\t\t$paid\t\t";
   }
@@ -364,33 +368,34 @@ foreach $bill (@bills) {
     qsearch('cust_credit_bill', { 'invnum'=> $bref->{invnum} } );
   foreach my $cust_credit_bill (@cust_credit_bill) {
     my $cust_credit = $cust_credit_bill->cust_credit;
-    my($date, $invnum, $crednum, $amount, $reason ) = (
+    my($date, $invnum, $crednum, $amount, $reason, $app_date ) = (
       $cust_credit->_date,
       $cust_credit_bill->invnum,
       $cust_credit_bill->crednum,
       $cust_credit_bill->amount,
       $cust_credit->reason,
+      time2str("%D", $cust_credit_bill->_date),
     );
     push @history,
-      "$date\tCredit #$crednum, Invoice #$invnum $reason\t\t\t$amount\t";
+      "$date\tCredit #$crednum: $reason<BR>".
+      "(applied to invoice #$invnum on $app_date)\t\t\t$amount\t";
   }
 }
 
-@credits = grep $_->credited, qsearch('cust_credit',{'custnum'=>$custnum});
+@credits = grep { $_->credited > 0 }
+           qsearch('cust_credit',{'custnum'=>$custnum});
 foreach $credit (@credits) {
   my($cref)=$credit->hashref;
   push @history,
     $cref->{_date} . "\t" .
     qq!<A HREF="! . popurl(2). qq!edit/cust_credit_bill.cgi?!. $cref->{crednum} . qq!">!.
-    '<font color="#ff0000">Unapplied credit #' .
-    $cref->{crednum} . ", (Balance \$" .
-    $credit->credited . ")</font></A> ".
-    $cref->{reason} . "\t\t\t" . $cref->{amount} . "\t";
+    '<b><font size="+1" color="#ff0000">Unapplied credit #' .
+    $cref->{crednum} . "</font></b></A>: ".
+    $cref->{reason} . "\t\t\t" . $credit->credited . "\t";
 }
 
 my(@refunds)=qsearch('cust_refund',{'custnum'=> $custnum } );
-my($refund);
-foreach $refund (@refunds) {
+foreach my $refund (@refunds) {
   my($rref)=$refund->hashref;
   my($refundnum) = (
     $refund->refundnum,
@@ -403,6 +408,16 @@ foreach $refund (@refunds) {
     $rref->{refund};
 }
 
+my @unapplied_payments =
+  grep { $_->unapplied > 0 } qsearch('cust_pay', { 'custnum' => $custnum } );
+foreach my $payment (@unapplied_payments) {
+  push @history,
+    $payment->_date. "\t".
+    '<A HREF="'. popurl(2). 'edit/cust_bill_pay.cgi?'. $payment->paynum. '">'.
+    '<b><font size="+1" color="#ff0000">Unapplied payment #' .
+    $payment->paynum . "</font></b></A>".
+    "\t\t" . $payment->unapplied . "\t\t";
+}
 
         #formatting
         print &table(), <<END;
-- 
cgit v1.2.1


From a296741e258d3433ed44652903f2f47467c41d2c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Sep 2001 22:16:29 +0000
Subject: this too

---
 bin/fs-setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 5e735294f..6efdd65bb 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.48 2001-09-02 02:46:55 ivan Exp $
+# $Id: fs-setup,v 1.49 2001-09-03 22:16:29 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -496,7 +496,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'refundnum',
       'unique' => [ [] ],
-      'index' => [ ['crednum'] ],
+      'index' => [ [] ],
     },
 
     'cust_credit_refund' => {
-- 
cgit v1.2.1


From fa4ef69deac5cc5a181a3a71a630255a96ef5c03 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Sep 2001 09:54:43 +0000
Subject: hehe, this should help out everybody without DBIx::Profile (i.e.
 everybody)

---
 htetc/global.asa | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htetc/global.asa b/htetc/global.asa
index d6e0bbea2..00c6852fb 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -18,7 +18,7 @@ sub Script_OnStart {
 sub Script_OnFlush {
   my $ref = $Response->{BinaryRef};
   $$ref = $cgi->header( '-expires' => 'now' ) . $$ref;
-#  if ( dbh->can('sprintProfile') ) {
+  if ( dbh->can('sprintProfile') ) {
 
     $$ref =~ s/<\/BODY>[\s\n]*<\/HTML>[\s\n]*$//i
       or warn "can't remove";
@@ -28,5 +28,5 @@ sub Script_OnFlush {
     $$ref .= '</BODY></HTML>';
     
     dbh->{'private_profile'} = {};
-#  }
+  }
 }
-- 
cgit v1.2.1


From 8c8e1e437e684c54dfbd846fb0997b30f4993131 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Sep 2001 09:55:02 +0000
Subject: better installation instructions

---
 httemplate/docs/install.html | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index d61dc9dfa..f62ac4cf9 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -49,7 +49,7 @@ Install the Freeside distribution:
       <li> with <a href="http://www.mysql.com/Manual_chapter/manual_Privilege_system.html#Privilege_system">MySQL</a>:<pre>$ mysqladmin -u root password '<i>set_a_root_database_password</i>'
 $ mysql -u root -p
 mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* TO freeside@localhost IDENTIFIED BY '<i>set_a_freeside_database_password</i>';</pre>
-      <li> with <a href="http://postgresql.readysetnet.com/users-lounge/docs/7.1/postgres/user-manag.html#DATABASE-USERS">PostgreSQL</a>
+      <li> with <a href="http://www.postgresql.org/users-lounge/docs/7.1/postgres/user-manag.html#DATABASE-USERS">PostgreSQL</a>
     </ul>
   <li>Add the freeside database to your database engine.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Reference.html#CREATE_DATABASE">MySQL</a>) (with <a href="http://postgresql.readysetnet.com/users-lounge/docs/7.1/postgres/managing-databases.html#MANAGE-AG-CREATEDB">PostgreSQL</a>)
   <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>
@@ -60,11 +60,6 @@ $ perl Makefile.PL
 $ make
 $ su
 # make install UNINST=1</pre>
-  <li>Copy or link fs-x.y.z/htdocs to your web server's document space.  <pre>mkdir /usr/local/apache/htdocs/freeside
-cp -r fs-x.y.z/htdocs/* /usr/local/apache/htdocs/freeside</pre> or <pre>ln -s /full/path/to/fs-x.y.z/htdocs /usr/local/apache/htdocs/freeside</pre>
-  <li>Restrict access to this web interface.  (with <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache</a>)
-  <li>Enable CGI execution for files with the `.cgi' extension.  (with <a href="http://www.apache.org/docs/mod/mod_mime.html#addhandler">Apache</a>)
-  <li>Set ownership and permissions for the web interface.  The web interface needs to run as the freeside user - there are several ways to do this.
     <li>You should run a separate iteration of Apache[-SSL] with mod_perl enabled as the freeside user.
 </ul>
 <table>
@@ -112,6 +107,7 @@ require "/usr/local/apache/conf/handler.pl";
   </tr>
 </table>
 <ul>
+<li>Restrict access to this web interface.  (with <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache</a>)
 <li>Create the necessary <a href="config.html">configuration files</a>.
 <li>Create the `/usr/local/etc/freeside/counters.<i>datasrc</i>', and 
   `/usr/local/etc/freeside/export.<i>datasrc</i>' directories for each <i>datasrc</i> (owned by the freeside user).
-- 
cgit v1.2.1


From 2bad1d2cc99f713d10f447d018742eb03453d422 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Sep 2001 11:03:22 +0000
Subject: silly syntax error and doc updates

---
 bin/fs-setup                |  6 +++---
 httemplate/docs/config.html | 19 +++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 6efdd65bb..0c2b67dda 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.49 2001-09-03 22:16:29 ivan Exp $
+# $Id: fs-setup,v 1.50 2001-09-04 11:03:22 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -433,7 +433,7 @@ sub tables_hash_hack {
         'amount',  @money_type,
         '_date',   @date_type
       ],
-      'primary_key' => 'billpaynum'
+      'primary_key' => 'billpaynum',
       'unique' => [ [] ],
       'index' => [ [ 'paynum', 'invnum' ] ],
     },
@@ -507,7 +507,7 @@ sub tables_hash_hack {
         'amount',  @money_type,
         '_date',   @date_type
       ],
-      'primary_key' => 'creditrefundnum'
+      'primary_key' => 'creditrefundnum',
       'unique' => [ [] ],
       'index' => [ [ 'crednum', 'refundnum' ] ],
     },
diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
index f26ff0f78..deae044d2 100644
--- a/httemplate/docs/config.html
+++ b/httemplate/docs/config.html
@@ -29,13 +29,12 @@ dbpassword
 </ul>
 All further configuration files and directories are located in
 <tt>/usr/local/etc/freeside/conf.<i>datasource</i></tt>, for example, 
-<tt>/usr/local/etc/freeside/conf.DBI:Pg:host=localhost;dbname=freeside</tt> (remember to backslash-escape the ; character when creating directories in the shell: <tt>mkdir&nbsp;/usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=freeside</tt>).
+<tt>/usr/local/etc/freeside/conf.DBI:Pg:host=localhost;dbname=freeside</tt> (remember to backslash-escape the ; character when creating directories in the shell: <tt>mkdir&nbsp;/usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=freeside</tt>).  Files listed in <font color="#ff0000">red</font> are requried.
 <ul>
   <li><a name="address">address</a> - This configuration file is no longer used.  See <a href="#invoice_template">invoice_template</a> instead.
   <li><a name="apacheroot">apacheroot</a> - The directory containing Apache virtual hosts
   <li><a name="apachemachine">apachemachine</a> - A machine with the apacheroot directory and user home directories.  The existance of this file enables setup of virtual host directories, and, in conjunction with the `home' configuration file, symlinks into user home directories.
   <li><a name="apachemachines">apachemachines</a> - Your Apache machines, one per line.  This enables export of `/etc/apache/vhosts.conf', which can be included in your Apache configuration via the <a href="http://www.apache.org/docs/mod/core.html#include">Include</a> directive.
-  <li><a name="autocapnames">autocapnames</a> - The presence of this file will cause Freeside to use Javascript in /htdocs/edit/cust_main.cgi to automatically capitalize the first and last names of customers.
   <li><a name="bindprimary">bindprimary</a> - Your BIND primary nameserver.  This enables export of /var/named/named.conf and zone files into /var/named
   <li><a name="bindsecondaries">bindsecondaries</a> - Your BIND secondary nameservers, one per line.  This enables export of /var/named/named.conf
   <li><a name="business-onlinepayment">business-onlinepayment</a> - <a href="http://search.cpan.org/search?dist=Business-OnlinePayment">Business::OnlinePayment</a> support, at least three lines: processor, login, and password.  An optional fourth line specifies the action.  Optional additional lines are passed to Business::OnlinePayment as %processor_options.
@@ -45,19 +44,19 @@ All further configuration files and directories are located in
   <li>cybercash3.2 - <a href="http://www.cybercash.com/cybercash/services/technology.html">CyberCash v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly' or `mauthcapture').  CCMckLib3_2.pm, CCMckDirectLib3_2.pm and CCMckErrno3_2 are required.
   <li><a name="deletecustomers">deletecustomers</a> - The existance of this file will enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that this customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers' packages if they cancel service.
   <li><a name="disable_customer_referrals">disable_customer_referrals</a> - The existance of this file will disable new customer-to-customer referrals in the web interface.
-  <li><a name="domain">domain</a> - Your domain name.
+  <li><a name="domain"><font color="#ff0000">domain</font></a> - Your domain name.
   <li><a name="editreferrals">editreferrals</a> - The existance of this file will allow you to change the referral of existing customers.
   <li><a name="erpcdmachines">erpcdmachines</a> - Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd' and `/usr/annex/acp_dialup'.
   <li><a name="hidecancelledpackages">hidecancelledpackages</a> - The existance of this file will prevent cancelled packages from showing up in listings (though they will still be in the database)
   <li><a name="hidecancelledcustomers">hidecancelledcustomers</a> - The existance of this file will prevent customers with only cancelled packages from showing up in listings (though they will still be in the database)
-  <li><a name="home">home</a> - For new users, prefixed to usrename to create a directory name.  Should have a leading but not a trailing slash.
+  <li><a name="home"><font color="#ff0000">home</font></a> - For new users, prefixed to usrename to create a directory name.  Should have a leading but not a trailing slash.
   <li><a name="icradiusmachines">icradiusmachines</a> - Your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines, one per line.  The existance of this file (even if empty) turns on radcheck table creation (in the freeside database - the radcheck table needs to be created manually).  Machines listed in this file will have the radcheck table exported to them.  Each line of this file should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: "<CODE>radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd</CODE>".  Note that to use ICRADIUS export you need to be using MySQL.
   <li><a name="icradius_mysqldest">icradius_mysqldest</a> - Destination directory for the MySQL databases, on the ICRADIUS machines.  Defaults to "/usr/local/var/".
   <li><a name="icradius_mysqlsource">icradius_mysqlsource</a> - Source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".
   <li><a name="icradius_secrets">icradius_secrets</a> - Optionally specifies a MySQL database for ICRADIUS export, if you're not running MySQL for your Freeside database.  The database should be on the Freeside machine and store data in the <a href="#icradius_mysqlsource">icradius_mysqlsource</a> directory.  Three lines: DBI data source, username and password.  This file should not be world readable.
-  <li><a name="invoice_from">invoice_from</a> - Return address on email invoices.
-  <li><a name="invoice_template">invoice_template</a> - Required template file for invoices.  See the <a href="billing.html">section on billing</a> for details.
-  <li><a name="lpr">lpr</a> - Print command for paper invoices, for example `lpr -h'.
+  <li><a name="invoice_from"><font color="#ff0000">invoice_from</font></a> - Return address on email invoices.
+  <li><a name="invoice_template"><font color="#ff0000">invoice_template</font></a> - Required template file for invoices.  See the <a href="billing.html">section on billing</a> for details.
+  <li><a name="lpr"><font color="#ff0000">lpr</font></a> - Print command for paper invoices, for example `lpr -h'.
   <li><a name="maildisablecatchall">maildisablecatchall</a> - <b>DEPRECIATED</b>, now the default.  The existance of this file used to disable the requirement that each virtual domain have a catch-all mailbox.
   <li><a name="money_char">money_char</a> - Currency symbol - defaults to `$'.
   <li><a name="mxmachines">mxmachines</a> - MX entries for new domains, weight and machine, one per line, with trailing `.'
@@ -67,7 +66,7 @@ All further configuration files and directories are located in
   <li><a name="qmailmachines">qmailmachines</a> - Your qmail machines, one per line.  This enables export of `/var/qmail/control/virtualdomains', `/var/qmail/control/recipientmap', and `/var/qmail/control/rcpthosts'.  The existance of this file (even if empty) also turns on user `.qmail-extension' file maintenance in conjunction with `shellmachine'.
   <li><a name="radiusmachines">radiusmachines</a> - Your RADIUS authentication machines, one per line.  This enables export of `/etc/raddb/users'.
   <li><a name="referraldefault">referraldefault</a> - Default referral, specified by refnum.
-  <li><a name="registries">registries</a> - Directory which contains domain registry information.  Each registry is a directory.
+  <li><a name="registries"><font color="#ff0000">registries</font></a> - Directory which contains domain registry information.  Each registry is a directory.
     <ul>
       <li>registries/internic - Currently the only supported registry
         <ul>
@@ -88,9 +87,9 @@ All further configuration files and directories are located in
   <li>shellmachine-userdel - The command(s) to run on shellmachine when an account is deleted.  If this file does not exist, <code>userdel $username</code> is the default.  If the file exists but is empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.
   <li>shellmachine-usermod - The command(s) to run on shellmachine when an account is modified.  If this file does not exist or is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.
   <li><a name="shellmachines">shellmachines</a> - Your Linux and System V flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/shadow' files.
-  <li><a name="shells">shells</a> - Legal shells (think /etc/shells).  You probably want to `cut -d: -f7 /etc/passwd | sort | uniq' initially so that importing doesn't fail with `Illegal shell' errors, then remove any special entries afterwords.  A blank line specifies that an empty shell is permitted.
+  <li><a name="shells"><font color="#ff0000">shells</font></a> - Legal shells (think /etc/shells).  You probably want to `cut -d: -f7 /etc/passwd | sort | uniq' initially so that importing doesn't fail with `Illegal shell' errors, then remove any special entries afterwords.  A blank line specifies that an empty shell is permitted.
   <li><a name="showpasswords">showpasswords</a> - The existance of this file will allow unencrypted user passwords to be displayed.
-  <li><a name="smtpmachine">smtpmachine</a> - SMTP relay for Freeside's outgoing mail.
+  <li><a name="smtpmachine"><font color="#ff0000">smtpmachine</font></a> - SMTP relay for Freeside's outgoing mail.
   <li><a name="soadefaultttl">soadefaultttl</a> - SOA default TTL for new domains.
   <li><a name="soaemail">soaemail</a> - SOA email for new domains, in BIND form (`.' instead of `@'), with trailing `.'
   <li><a name="soaexpire">soaexpire</a> - SOA expire for new domains
-- 
cgit v1.2.1


From 7258cc4a7bf97ab2a0bca9dd2242e328e1a017ee Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Sep 2001 11:14:13 +0000
Subject: tyops

---
 bin/fs-setup | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 0c2b67dda..3d56d9f1f 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.50 2001-09-04 11:03:22 ivan Exp $
+# $Id: fs-setup,v 1.51 2001-09-04 11:14:13 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -79,6 +79,8 @@ my(%tables)=&tables_hash_hack;
 #turn it into objects
 my($dbdef) = new DBIx::DBSchema ( map {  
   my(@columns);
+  warn $_;
+  warn $tables{$_}{'columns'};
   while (@{$tables{$_}{'columns'}}) {
     my($name,$type,$null,$length)=splice @{$tables{$_}{'columns'}}, 0, 4;
     push @columns, new DBIx::DBSchema::Column ( $name,$type,$null,$length );
@@ -426,7 +428,7 @@ sub tables_hash_hack {
     },
 
     'cust_bill_pay' => {
-      'column' => [
+      'columns' => [
         'billpaynum', 'int',     '',   '',
         'invnum',  'int',     '',   '',
         'paynum',  'int',     '',   '',
@@ -500,7 +502,7 @@ sub tables_hash_hack {
     },
 
     'cust_credit_refund' => {
-      'column' => [
+      'columns' => [
         'creditrefundnum', 'int',     '',   '',
         'crednum',  'int',     '',   '',
         'refundnum',  'int',     '',   '',
-- 
cgit v1.2.1


From 895e5dd0c472e41875435cc625f1ca0a36bd2524 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Sep 2001 11:15:15 +0000
Subject: much better

---
 bin/fs-setup | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 3d56d9f1f..1c720e698 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.51 2001-09-04 11:14:13 ivan Exp $
+# $Id: fs-setup,v 1.52 2001-09-04 11:15:15 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -79,7 +79,6 @@ my(%tables)=&tables_hash_hack;
 #turn it into objects
 my($dbdef) = new DBIx::DBSchema ( map {  
   my(@columns);
-  warn $_;
   warn $tables{$_}{'columns'};
   while (@{$tables{$_}{'columns'}}) {
     my($name,$type,$null,$length)=splice @{$tables{$_}{'columns'}}, 0, 4;
-- 
cgit v1.2.1


From feafaf45ee709ef15b6cf7892abf89e4878c627b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Sep 2001 11:15:58 +0000
Subject: rar

---
 bin/fs-setup | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 1c720e698..5dc666a1e 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.52 2001-09-04 11:15:15 ivan Exp $
+# $Id: fs-setup,v 1.53 2001-09-04 11:15:58 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -79,7 +79,6 @@ my(%tables)=&tables_hash_hack;
 #turn it into objects
 my($dbdef) = new DBIx::DBSchema ( map {  
   my(@columns);
-  warn $tables{$_}{'columns'};
   while (@{$tables{$_}{'columns'}}) {
     my($name,$type,$null,$length)=splice @{$tables{$_}{'columns'}}, 0, 4;
     push @columns, new DBIx::DBSchema::Column ( $name,$type,$null,$length );
-- 
cgit v1.2.1


From 1e4aa8069f25e1b4101da20bb9e0d3f60357ea52 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Sep 2001 14:44:07 +0000
Subject: new admin documentation, quick one-pkg order

---
 FS/FS/cust_pkg.pm                          | 41 +++++++------
 httemplate/browse/agent.cgi                |  6 +-
 httemplate/browse/agent_type.cgi           |  4 +-
 httemplate/browse/part_pkg.cgi             |  6 +-
 httemplate/browse/part_referral.cgi        |  4 +-
 httemplate/browse/part_svc.cgi             |  6 +-
 httemplate/docs/admin.html                 | 96 ++++++++++++++++++------------
 httemplate/edit/part_svc.cgi               |  8 +--
 httemplate/edit/process/quick-cust_pkg.cgi | 34 +++++++++++
 httemplate/edit/svc_acct.cgi               | 14 ++++-
 httemplate/view/cust_main.cgi              | 23 +++++--
 11 files changed, 162 insertions(+), 80 deletions(-)
 create mode 100644 httemplate/edit/process/quick-cust_pkg.cgi

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 9705827e7..147a760d9 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -428,7 +428,7 @@ sub labels {
 
 =over 4
 
-=item order CUSTNUM, PKGPARTS_ARYREF, [ REMOVE_PKGNUMS_ARYREF ]
+=item order CUSTNUM, PKGPARTS_ARYREF, [ REMOVE_PKGNUMS_ARYREF [ RETURN_CUST_PKG_ARRAYREF ] ]
 
 CUSTNUM is a customer (see L<FS::cust_main>)
 
@@ -439,12 +439,17 @@ permitted.
 REMOVE_PKGNUMS is an optional list of pkgnums specifying the billing items to
 remove for this customer.  The services (see L<FS::cust_svc>) are moved to the
 new billing items.  An error is returned if this is not possible (see
-L<FS::pkg_svc>).
+L<FS::pkg_svc>).  An empty arrayref is equivalent to not specifying this
+parameter.
+
+RETURN_CUST_PKG_ARRAYREF, if specified, will be filled in with the
+newly-created cust_pkg objects.
 
 =cut
 
 sub order {
-  my($custnum,$pkgparts,$remove_pkgnums)=@_;
+  my($custnum, $pkgparts, $remove_pkgnums, $return_cust_pkg) = @_;
+  $remove_pkgnums = [] unless defined($remove_pkgnums);
 
   my $oldAutoCommit = $FS::UID::AutoCommit;
   local $FS::UID::AutoCommit = 0;
@@ -511,7 +516,7 @@ sub order {
     my($old) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
     unless ( $old ) {
       $dbh->rollback if $oldAutoCommit;
-      die "Package $pkgnum not found to remove!";
+      return "Package $pkgnum not found to remove!";
     }
     my(%hash) = $old->hash;
     $hash{'cancel'}=time;   
@@ -519,7 +524,7 @@ sub order {
     my($error)=$new->replace($old);
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
-      die "Couldn't update package $pkgnum: $error";
+      return "Couldn't update package $pkgnum: $error";
     }
   }
 
@@ -527,26 +532,26 @@ sub order {
 #  my($pkgpart);
   while ($pkgpart=shift @{$pkgparts} ) {
  
-    my($new) = new FS::cust_pkg ( {
-                                       'custnum' => $custnum,
-                                       'pkgpart' => $pkgpart,
-                                    } );
-    my($error) = $new->insert;
-   if ( $error ) {
+    my $new = new FS::cust_pkg {
+                                 'custnum' => $custnum,
+                                 'pkgpart' => $pkgpart,
+                               };
+    my $error = $new->insert;
+    if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
-      die "Couldn't insert new cust_pkg record: $error";
+      return "Couldn't insert new cust_pkg record: $error";
     }
-    my($pkgnum)=$new->getfield('pkgnum');
+    push @{$return_cust_pkg}, $new if $return_cust_pkg;
+    my $pkgnum = $new->pkgnum;
  
-    my($cust_svc);
-    foreach $cust_svc ( @{ shift @cust_svc } ) {
+    foreach my $cust_svc ( @{ shift @cust_svc } ) {
       my(%hash) = $cust_svc->hash;
       $hash{'pkgnum'}=$pkgnum;
       my($new) = new FS::cust_svc ( \%hash );
       my($error)=$new->replace($cust_svc);
-     if ( $error ) {
+      if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
-        die "Couldn't link old service to new package: $error";
+        return "Couldn't link old service to new package: $error";
       }
     }
   }  
@@ -560,7 +565,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.5 2001-04-09 23:05:15 ivan Exp $
+$Id: cust_pkg.pm,v 1.6 2001-09-04 14:44:06 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 138b61365..bb0ee2402 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent.cgi,v 1.3 2001-08-21 09:34:13 ivan Exp $ -->
+#<!-- $Id: agent.cgi,v 1.4 2001-09-04 14:44:06 ivan Exp $ -->
 
 use strict;
 use vars qw( $ui $cgi $p $agent );
@@ -70,8 +70,8 @@ END
 
 print <<END;
       <TR>
-        <TD COLSPAN=2><A HREF="${p}edit/agent.cgi"><I>Add new agent</I></A></TD>
-        <TD><A HREF="${p}edit/agent_type.cgi"><I>Add new agent type</I></A></TD>
+        <TD COLSPAN=2><A HREF="${p}edit/agent.cgi"><I>Add a new agent</I></A></TD>
+        <TD><A HREF="${p}edit/agent_type.cgi"><I>Add a new agent type</I></A></TD>
       </TR>
     </TABLE>
 
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index 4917e77a2..30b80000c 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent_type.cgi,v 1.3 2001-08-21 09:34:13 ivan Exp $ -->
+#<!-- $Id: agent_type.cgi,v 1.4 2001-09-04 14:44:06 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $agent_type );
@@ -63,7 +63,7 @@ END
 }
 
 print <<END;
-  <TR><TD COLSPAN=2><I><A HREF="${p}edit/agent_type.cgi">Add new agent type</A></I></TD></TR>
+  <TR><TD COLSPAN=2><I><A HREF="${p}edit/agent_type.cgi">Add a new agent type</A></I></TD></TR>
     </TABLE>
   </BODY>
 </HTML>
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index b6e47b171..1538a7127 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_pkg.cgi,v 1.3 2001-08-21 09:34:13 ivan Exp $ -->
+#<!-- $Id: part_pkg.cgi,v 1.4 2001-09-04 14:44:06 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $part_pkg );
@@ -18,7 +18,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( '-expires' => 'now' ), header("Package Part Listing",menubar(
+print $cgi->header( '-expires' => 'now' ), header("Package Definition Listing",menubar(
   'Main Menu' => $p,
 )), "One or more services are grouped together into a package and given",
   " pricing information. Customers purchase packages, not services.<BR><BR>", 
@@ -69,7 +69,7 @@ END
 }
 
 print <<END;
-   <TR><TD COLSPAN=2><I><A HREF="${p}edit/part_pkg.cgi">Add new package</A></I></TD></TR>
+   <TR><TD COLSPAN=8><I><A HREF="${p}edit/part_pkg.cgi">Add a new package definition</A></I></TD></TR>
     </TABLE>
   </BODY>
 </HTML>
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index ed3b7a0e4..f283ad419 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_referral.cgi,v 1.3 2001-08-21 09:34:13 ivan Exp $ -->
+#<!-- $Id: part_referral.cgi,v 1.4 2001-09-04 14:44:06 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $part_referral );
@@ -42,7 +42,7 @@ END
 
 print <<END;
       <TR>
-        <TD COLSPAN=2><A HREF="${p}edit/part_referral.cgi"><I>Add new referral</I></A></TD>
+        <TD COLSPAN=2><A HREF="${p}edit/part_referral.cgi"><I>Add a new referral</I></A></TD>
       </TR>
     </TABLE>
     </CENTER>
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 145874774..1306ac057 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -1,5 +1,5 @@
-<!-- $Id: part_svc.cgi,v 1.2 2001-08-11 23:18:30 ivan Exp $ -->
-<%= header('Service Part Listing', menubar( 'Main Menu' => $p) ) %>
+<!-- $Id: part_svc.cgi,v 1.3 2001-09-04 14:44:06 ivan Exp $ -->
+<%= header('Service Definition Listing', menubar( 'Main Menu' => $p) ) %>
 
     Services are items you offer to your customers.<BR><BR>
 <TABLE BORDER=1>
@@ -53,7 +53,7 @@
 <% } %>
 
   <TR>
-    <TD COLSPAN=2><A HREF="<%= $p %>edit/part_svc.cgi"><I>Add new service</I></A></TD>
+    <TD COLSPAN=6><A HREF="<%= $p %>edit/part_svc.cgi"><I>Add a new service definition</I></A></TD>
   </TR>
 </TABLE>
 </BODY>
diff --git a/httemplate/docs/admin.html b/httemplate/docs/admin.html
index be53c0950..7f053ed2f 100755
--- a/httemplate/docs/admin.html
+++ b/httemplate/docs/admin.html
@@ -8,52 +8,70 @@
   <li>Open up the root of the Freeside document tree in your web
   browser.  For example, if you created the Freeside document tree in   
   /home/httpd/html/freeside, and your web browser's DocumentRoot is
-  /home/httpd/html, open http://your_host/freeside/. Replace
+  /home/httpd/html, open https://your_host/freeside/. Replace
   "your_host" with the name or network address of your web server.
 
   <li>Once in the Freeside web interface, you must first create a
-  service.  An example of a service would be a dial-up account or a
-  hosted virtual domain.
-
-  <li>After you create your first service or services, you must then
-  create a package of that service or services which you will sell to
-  your customer.  To allow flexibility in changing your service
-  offerings, Freeside requires that you bundle your services into a
-  package before customers may purchase them.  For instance, you could
-  create a leased line package which would consist of a one-time
-  charge for the customer premise equipment, the monthly service fee
-  for the leased line, a backup dial-up account, and a support
-  contract.  You could also create a leased line package which omits
-  the support contract simply by adding a new package that does not
-  include the support contract.
-  
+  service definition.  An example of a service definition would be a dial-up
+  account or a domain.  For starters, it is necessary to create a domain
+  definition.  Click on <u>View/Edit service definitions</u> and
+  <u>Add a new service definition</u> with <i>Table</i> <b>svc_domain</b>
+  (and no modifiers).
+
+  <li>Now that you have created your first service, you must create a package
+  including this service which you can sell to customers.  Zero, one, or many
+  services are bundled into a package.  Click on <u>View/Edit package
+  definitions</u> and <u>Add a new package definition</u> which includes
+  quantity <b>1</b> of the svc_domain service you created above.
+
   <li>After you create your first package, then you must define who is
   able to sell that package by creating an agent type.  An example of
   an agent type would be an internal sales representitive which sells
   regular and promotional packages, as opposed to an external sales
-  representitive which would only sell regular packages of services.
-
-  <li>After creating a new agent type, you must create an agent, and
-  assign the the agent type you just created to it.
-
-  <li>If the service you created was of type svc_acct, you may have to
-  create a POP from the main menu before you can create your first new
-  customer.
-
-  <li>If you are using Freeside to keep track of sales taxes, you must
-  define tax information for your locale by clicking on the "View/Edit  
-  locales and tax rates" link on the Freeside main menu.
-
-  <li>Finally, set up at least one referral by clicking on the
-  "View/Edit referrals" link in the Freeside main menu.  Referrals
-  will help you keep track of how effective your advertising is, by
-  helping you keep track of where customers heard of your service
-  offerings.  You must create at least one referral.  If you do not wish to
-  use the referral functionality, simply create a single referral only.
-  
-  <li>You should now be ready to sign up your first customer by
-  clicking on the "New Customer" link at the top of the Freeside main
-  menu.
+  representitive which would only sell regular packages of services.  Click on
+  <u>View/Edit agent types</u> and <u>Add a new agent type</u>.  Allow this
+  agent type to sell the package you created above.
+
+  <li>After creating a new agent type, you must create an agent.  Click on
+  <u>View/Edit agents</u> and <u>Add a new agent</u>.
+
+  <li>Set up at least one referral.  Referrals will help you keep track of how
+  effective your advertising is, by helping you keep track of where customers
+  heard of your service offerings.  You must create at least one referral.  If
+  you do not wish to use the referral functionality, simply create a single
+  referral only.  Click on <u>View/Edit referrals</u> and <u>Add a new
+  referral</u>.
+
+  <li>Click on <u>New Customer</u> and create a new customer for your system
+  accounts with billing type <b>Complimentary</b>.  
+
+  <li>From the Customer View screen of the newly created customer, order the
+  package you defined above.
+
+  <li>From the Package View screen of the newly cretaed package, choose
+  <u>(Add)</u> to add the customer's service for this new package.
+
+  <li>Add your own domain, and note down the assigned <b>Service #</b>.
+
+  <li>Go back to <u>View/Edit service definitions</u> on the main menu, and
+  <u>Add a new service definition</u> with <i>Table</i> <b>svc_acct</b>.  Put
+  the <b>Service #</b> for your domain in the <b>domsvc</b> Modifier.  Set
+  <b>Fixed</b> to define a service locked-in to this domain, or <b>Default</b>
+  to define a service which may select from among this domain and the
+  customer's domains.
+
+  <li><table><tr>
+    <td> Create at least POP (Point of Presence) by selecting
+        <u>View/Edit POPs</u> from the main menu.</td>
+    <th align="left"> OR </th>
+    <td>If you are not doing dialup, set slipip to fixed and blank for all your
+        Service Definitions which have Table <b>svc_acct</b>.</td>
+  </tr></table>
+
+  <li>If you are using Freeside to keep track of sales taxes, define tax
+  information for your locales by clicking on the <u>View/Edit locales and tax
+  rates</b> on the main menu.
+
 </ul>
 </body>
 </html>
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 5696e43f8..01574e992 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.5 2001-08-30 15:30:26 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.6 2001-09-04 14:44:06 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -31,7 +31,7 @@ function visualize(what) {
 
 <%= header("$action Service Definition",
            menubar( 'Main Menu'         => $p,
-                    'View all services' => "${p}browse/part_svc.cgi"
+                    'View all service definitions' => "${p}browse/part_svc.cgi"
                   ),
            " onLoad=\"visualize()\""
            )
@@ -50,8 +50,8 @@ Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>">
 </PRE>
 Services are items you offer to your customers.
 <UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
-    <LI>svc_domain - Virtual domains
-    <LI>svc_acct_sm - Virtual domain mail aliasing (*depreciated*)
+    <LI>svc_domain - Domains
+    <LI>svc_acct_sm - <B>depreciated</B> (use svc_forward for new installations) Virtual domain mail aliasing.
     <LI>svc_forward - mail forwarding
     <LI>svc_www - Virtual domain website
 <!--   <LI>svc_charge - One-time charges (Partially unimplemented)
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
new file mode 100644
index 000000000..5ac315d87
--- /dev/null
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -0,0 +1,34 @@
+<%
+#<!-- $Id: quick-cust_pkg.cgi,v 1.1 2001-09-04 14:44:07 ivan Exp $ -->
+
+use strict;
+use vars qw( $cgi $custnum $pkgpart $error ); #@remove_pkgnums @pkgparts
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl);
+use FS::cust_pkg;
+
+$cgi = new CGI; # create form object
+&cgisuidsetup($cgi);
+$error = '';
+
+#untaint custnum
+$cgi->param('custnum') =~ /^(\d+)$/
+  or die 'illegal custnum '. $cgi->param('custnum');
+$custnum = $1;
+$cgi->param('pkgpart') =~ /^(\d+)$/
+  or die 'illegal pkgpart '. $cgi->param('pkgpart');
+$pkgpart = $1;
+
+my @cust_pkg = ();
+$error ||= FS::cust_pkg::order($custnum, [ $pkgpart ], [], \@cust_pkg, );
+
+if ($error) {
+  eidiot($error);
+} else {
+  print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?". $cust_pkg[0]->pkgnum );
+}
+
+%>
+
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 2154bf22c..8a2cb802e 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.5 2001-08-21 10:27:11 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.6 2001-09-04 14:44:06 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
@@ -118,10 +118,20 @@ END
 
 #domain
 $domsvc = $svc_acct->domsvc || 0;
-if ( $part_svc->svc_acct__domsvc_flag eq "F" ) {
+if ( $part_svc->svc_acct__domsvc_flag eq 'F' ) {
   print qq!<INPUT TYPE="hidden" NAME="domsvc" VALUE="$domsvc">!;
 } else { 
   my @svc_domain = ();
+  if ( $part_svc->svc_acct__domsvc_flag eq 'D' ) {
+    my $svc_domain =
+      qsearchs('svc_domain', { 'svcnum' => $part_svc->svc_acct__domsvc } );
+    if ( $svc_domain ) {
+      push @svc_domain, $svc_domain;
+    } else {
+      warn "unknown svc_domain.svcnum for part_svc.svc_acct__domsvc: ".
+           $part_svc->svc_acct__domsvc;
+    }
+  }
   my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
   if ($cust_pkg) {
     my @cust_svc =
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index a32abc0e1..b3ea336e9 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.8 2001-09-03 22:07:39 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.9 2001-09-04 14:44:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
@@ -153,11 +153,11 @@ print '<TD VALIGN="top">';
 
   @agents = qsearch( 'agent', {} );
   unless ( scalar(@agents) == 1 ) {
-    $agent = qsearchs('agent',{
-      'agentnum' => $cust_main->agentnum
-    } );
+    $agent = qsearchs('agent',{ 'agentnum' => $cust_main->agentnum } );
     print '<TR><TD ALIGN="right">Agent</TD><TD BGCOLOR="#ffffff">',
         $agent->agentnum, ": ", $agent->agent, '</TD></TR>';
+  } else {
+    $agent = $agents[0];
   }
   @referrals = qsearch( 'part_referral', {} );
   unless ( scalar(@referrals) == 1 ) {
@@ -249,6 +249,21 @@ if ( defined $cust_main->dbdef_table->column('comments')
 
 print '</TD></TR></TABLE>';
 
+print '<BR>'.
+  '<FORM ACTION="'.popurl(2).'edit/process/quick-cust_pkg.cgi" METHOD="POST">'.
+  qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
+  '<SELECT NAME="pkgpart"><OPTION>';
+
+foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
+  my $pkgpart = $type_pkgs->pkgpart;
+  my $part_pkg = qsearchs('part_pkg', { 'pkgpart' => $pkgpart } )
+    or do { warn "unknown type_pkgs.pkgpart $pkgpart"; next; };
+  print qq!<OPTION VALUE="$pkgpart">!. $part_pkg->pkg. ' - '.
+        $part_pkg->comment;
+}
+
+print '</SELECT><INPUT TYPE="submit" VALUE="Order Package"><BR>';
+
 print qq!<BR><A NAME="cust_pkg">Packages</A> !,
 #      qq!<BR>Click on package number to view/edit package.!,
       qq!( <A HREF="!, popurl(2), qq!edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> (preserves services) )!,
-- 
cgit v1.2.1


From f0915e1efec95afa1be6100c8d7e919fa0babc71 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Sep 2001 15:06:03 +0000
Subject: oops indeed

---
 httemplate/edit/agent_type.cgi        | 4 ++--
 httemplate/edit/process/cust_main.cgi | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 4f1ad8b20..ac41eec5c 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent_type.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: agent_type.cgi,v 1.3 2001-09-04 15:06:03 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $agent_type $action $hashref $p $part_pkg );
@@ -66,7 +66,7 @@ foreach $part_pkg ( qsearch('part_pkg',{}) ) {
   ;
 }
 
-print qq!<BR><INPUT TYPE="submit" VALUE="!,
+print qq!<BR><BR><INPUT TYPE="submit" VALUE="!,
       $hashref->{typenum} ? "Apply changes" : "Add agent type",
       qq!">!;
 
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 86e6abef6..cc5efd6b1 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-# $Id: cust_main.cgi,v 1.3 2001-08-13 23:10:34 ivan Exp $
+# $Id: cust_main.cgi,v 1.4 2001-09-04 15:06:03 ivan Exp $
 
 use strict;
 use vars qw( $cgi $payby @invoicing_list $new $custnum $error );
@@ -31,6 +31,7 @@ $cgi->param('county', $3 || '');
 $cgi->param('country', $4);
 
 $cgi->param('ship_state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
+  or $cgi->param('ship_state') =~ /^(((())))$/
   or die "Oops, illegal \"ship_state\" param: ". $cgi->param('ship_state');
 $cgi->param('ship_state', $1);
 $cgi->param('ship_county', $3 || '');
-- 
cgit v1.2.1


From db1b6ebfe35aba1f4d2580b13a0a74ac317784ba Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Sep 2001 15:12:29 +0000
Subject: tyop

---
 httemplate/docs/admin.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/admin.html b/httemplate/docs/admin.html
index 7f053ed2f..f137188f3 100755
--- a/httemplate/docs/admin.html
+++ b/httemplate/docs/admin.html
@@ -48,7 +48,7 @@
   <li>From the Customer View screen of the newly created customer, order the
   package you defined above.
 
-  <li>From the Package View screen of the newly cretaed package, choose
+  <li>From the Package View screen of the newly created package, choose
   <u>(Add)</u> to add the customer's service for this new package.
 
   <li>Add your own domain, and note down the assigned <b>Service #</b>.
-- 
cgit v1.2.1


From 57d69d5c1f98f778a0df82795ce21ee7bd21042a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Sep 2001 20:42:00 +0000
Subject: finally fix part_svc!!!

---
 FS/FS.pm                             |  11 ++-
 FS/FS/UID.pm                         |   4 +-
 FS/FS/part_svc.pm                    | 144 ++++++++++++++++++++++++++++-------
 FS/FS/svc_Common.pm                  |  10 ++-
 FS/FS/svc_acct.pm                    |   8 +-
 FS/FS/svc_acct_sm.pm                 |   4 +-
 FS/FS/svc_domain.pm                  |   4 +-
 FS/FS/svc_forward.pm                 |   4 +-
 FS/FS/svc_www.pm                     |   4 +-
 FS/MANIFEST                          |   2 +
 FS/t/part_svc_column.t               |   5 ++
 README.1.4.0pre2-3                   |  16 ++++
 bin/fs-migrate-part_svc              |  40 ++++++++++
 bin/fs-migrate-payref                |   7 +-
 bin/fs-radius-add-check              |   4 +-
 bin/fs-radius-add-reply              |   4 +-
 bin/fs-setup                         |  67 +++++++++-------
 httemplate/browse/part_svc.cgi       |  22 +++---
 httemplate/docs/schema.html          |  11 ++-
 httemplate/docs/upgrade8.html        |  20 ++---
 httemplate/edit/part_svc.cgi         |  37 ++++-----
 httemplate/edit/process/part_svc.cgi |   6 +-
 22 files changed, 310 insertions(+), 124 deletions(-)
 create mode 100644 FS/t/part_svc_column.t
 create mode 100644 README.1.4.0pre2-3
 create mode 100755 bin/fs-migrate-part_svc

diff --git a/FS/FS.pm b/FS/FS.pm
index 652e458aa..cd11e96d2 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -46,12 +46,16 @@ L<FS::svc_domain> - Domain class
 
 L<FS::domain_record> - DNS zone entries
 
-L<FS::svc_acct_sm> - Vitual mail alias class
+L<FS::svc_forward> - Mail forwarding class
+
+L<FS::svc_acct_sm> - (Depreciated) Vitual mail alias class
 
 L<FS::svc_www> - Web virtual host class.
 
 L<FS::part_svc> - Service definition class
 
+L<FS::part_svc_column> - Column constraint class
+
 L<FS::part_pkg> - Package (billing item) definition class
 
 L<FS::pkg_svc> - Class linking package (billing item)
@@ -117,6 +121,9 @@ To quote perl(1), "If you're intending to read these straight through for the
 first time, the suggested order will tend to reduce the number of forward
 references."
 
+If you've never used OO modules before,
+http://www.cpan.org/doc/FMTEYEWTK/easy_objects.html might help you out.
+
 =head1 DESCRIPTION
 
 Freeside is a billing and administration package for Internet Service
@@ -128,7 +135,7 @@ The main documentation is in htdocs/docs.
 
 =head1 VERSION
 
-$Id: FS.pm,v 1.6 2001-09-02 04:25:55 ivan Exp $
+$Id: FS.pm,v 1.7 2001-09-06 20:41:59 ivan Exp $
 
 =head1 SUPPORT
 
diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 3e71f09f1..f80156e97 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -118,7 +118,7 @@ Returns the CGI (see L<CGI>) object.
 =cut
 
 sub cgi {
-  carp "warning: \$FS::UID::cgi isa Apache" if $cgi->isa('Apache');
+  #carp "warning: \$FS::UID::cgi isa Apache" if $cgi->isa('Apache');
   $cgi;
 }
 
@@ -249,7 +249,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.8 2001-08-21 09:34:13 ivan Exp $
+$Id: UID.pm,v 1.9 2001-09-06 20:41:59 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index ccf0413b3..e64f09a70 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -2,7 +2,8 @@ package FS::part_svc;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw( fields );
+use FS::Record qw( qsearchs fields dbh );
+use FS::part_svc_column;
 
 @ISA = qw(FS::Record);
 
@@ -14,8 +15,8 @@ FS::part_svc - Object methods for part_svc objects
 
   use FS::part_svc;
 
-  $record = new FS::part_referral \%hash
-  $record = new FS::part_referral { 'column' => 'value' };
+  $record = new FS::part_svc \%hash
+  $record = new FS::part_svc { 'column' => 'value' };
 
   $error = $record->insert;
 
@@ -37,7 +38,7 @@ FS::Record.  The following fields are currently supported:
 =item svc - text name of this service definition
 
 =item svcdb - table used for this service.  See L<FS::svc_acct>,
-L<FS::svc_domain>, and L<FS::svc_acct_sm>, among others.
+L<FS::svc_domain>, and L<FS::svc_forward>, among others.
 
 =item I<svcdb>__I<field> - Default or fixed value for I<field> in I<svcdb>.
 
@@ -62,6 +63,73 @@ sub table { 'part_svc'; }
 
 Adds this service definition to the database.  If there is an error, returns
 the error, otherwise returns false.
+=item I<svcdb>__I<field> - Default or fixed value for I<field> in I<svcdb>.
+
+=item I<svcdb>__I<field>_flag - defines I<svcdb>__I<field> action: null, `D' for default, or `F' for fixed
+
+=cut
+
+sub insert {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  my $svcdb = $self->svcdb;
+#  my @rows = map { /^${svcdb}__(.*)$/; $1 }
+#    grep ! /_flag$/,
+#      grep /^${svcdb}__/,
+#        fields('part_svc');
+  foreach my $field (
+    grep { $_ ne 'svcnum'
+           && defined( $self->getfield($svcdb.'__'.$_.'_flag') )
+         } fields($svcdb)
+  ) {
+    my $part_svc_column = $self->part_svc_column($field);
+    my $previous = qsearchs('part_svc_column', {
+      'svcpart'    => $self->svcpart,
+      'columnname' => $field,
+    } );
+
+    my $flag = $self->getfield($svcdb.'__'.$field.'_flag');
+    if ( uc($flag) =~ /^([DF])$/ ) {
+      $part_svc_column->setfield('columnflag', $1);
+      $part_svc_column->setfield('columnvalue',
+        $self->getfield($svcdb.'__'.$field)
+      );
+      if ( $previous ) {
+        $error = $part_svc_column->replace($previous);
+      } else {
+        $error = $part_svc_column->insert;
+      }
+    } else {
+      $error = $part_svc_column->delete;
+    }
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+}
 
 =item delete
 
@@ -113,38 +181,58 @@ sub check {
   my @fields = eval { fields( $recref->{svcdb} ) }; #might die
   return "Unknown svcdb!" unless @fields;
 
-  my $svcdb;
-  foreach $svcdb ( qw(
-    svc_acct svc_acct_sm svc_domain
-  ) ) {
-    my @rows = map { /^${svcdb}__(.*)$/; $1 }
-      grep ! /_flag$/,
-        grep /^${svcdb}__/,
-          fields('part_svc');
-    foreach my $row (@rows) {
-      unless ( $svcdb eq $recref->{svcdb} ) {
-        $recref->{$svcdb.'__'.$row}='';
-        $recref->{$svcdb.'__'.$row.'_flag'}='';
-        next;
-      }
-      $recref->{$svcdb.'__'.$row.'_flag'} =~ /^([DF]?)$/
-        or return "Illegal flag for $svcdb $row";
-      $recref->{$svcdb.'__'.$row.'_flag'} = $1;
+#  my $svcdb;
+#  foreach $svcdb ( qw(
+#    svc_acct svc_acct_sm svc_domain
+#  ) ) {
+#    my @rows = map { /^${svcdb}__(.*)$/; $1 }
+#      grep ! /_flag$/,
+#        grep /^${svcdb}__/,
+#          fields('part_svc');
+#    foreach my $row (@rows) {
+#      unless ( $svcdb eq $recref->{svcdb} ) {
+#        $recref->{$svcdb.'__'.$row}='';
+#        $recref->{$svcdb.'__'.$row.'_flag'}='';
+#        next;
+#      }
+#      $recref->{$svcdb.'__'.$row.'_flag'} =~ /^([DF]?)$/
+#        or return "Illegal flag for $svcdb $row";
+#      $recref->{$svcdb.'__'.$row.'_flag'} = $1;
+#
+#      my $error = $self->ut_anything($svcdb.'__'.$row);
+#      return $error if $error;
+#
+#    }
+#  }
+
+  ''; #no error
+}
 
-      my $error = $self->ut_anything($svcdb.'__'.$row);
-      return $error if $error;
+=item part_svc_column COLUMNNAME
 
-    }
-  }
+Returns the part_svc_column object (see L<FS::part_svc_column>) for the given
+COLUMNNAME, or a new part_svc_column object if none exists.
 
-  ''; #no error
+=cut
+
+sub part_svc_column {
+  my $self = shift;
+  my $columnname = shift;
+  qsearchs('part_svc_column',  {
+                                 'svcpart'    => $self->svcpart,
+                                 'columnname' => $columnname,
+                               }
+  ) or new FS::part_svc_column {
+                                 'svcpart'    => $self->svcpart,
+                                 'columnname' => $columnname,
+                               };
 }
 
 =back
 
 =head1 VERSION
 
-$Id: part_svc.pm,v 1.2 2001-08-11 05:51:24 ivan Exp $
+$Id: part_svc.pm,v 1.3 2001-09-06 20:41:59 ivan Exp $
 
 =head1 BUGS
 
@@ -156,7 +244,7 @@ should be fixed.
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::part_pkg>, L<FS::pkg_svc>, L<FS::cust_svc>,
-L<FS::svc_acct>, L<FS::svc_acct_sm>, L<FS::svc_domain>, schema.html from the
+L<FS::svc_acct>, L<FS::svc_forward>, L<FS::svc_domain>, schema.html from the
 base documentation.
 
 =cut
diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index bc5b75640..c47cdbf8f 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -164,9 +164,11 @@ sub setx {
   return "Unkonwn svcpart" unless $part_svc;
 
   #set default/fixed/whatever fields from part_svc
-  foreach my $field ( fields('svc_acct') ) {
-    if ( $part_svc->getfield('svc_acct__'. $field. '_flag') eq $x ) {
-      $self->setfield( $field, $part_svc->getfield('svc_acct__'. $field) );
+  my $table = $self->table;
+  foreach my $field ( grep { $_ ne 'svcnum' } fields($table) ) {
+    my $part_svc_column = $part_svc->part_svc_column($field);
+    if ( $part_svc_column->columnflag eq $x ) {
+      $self->setfield( $field, $part_svc_column->columnvalue );
     }
   }
 
@@ -193,7 +195,7 @@ sub cancel { ''; }
 
 =head1 VERSION
 
-$Id: svc_Common.pm,v 1.4 2001-04-22 00:49:30 ivan Exp $
+$Id: svc_Common.pm,v 1.5 2001-09-06 20:41:59 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 7e27fd859..a4ce3f7c9 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -185,7 +185,7 @@ sub insert {
   my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
   return "Unknown svcpart" unless $part_svc;
   return "uid in use"
-    if $part_svc->svc_acct__uid_flag ne 'F'
+    if $part_svc->part_svc_column('uid')->columnflag ne 'F'
       && qsearchs( 'svc_acct', { 'uid' => $self->uid } )
       && $self->username !~ /^(hyla)?fax$/
     ;
@@ -456,7 +456,7 @@ sub check {
     ! $recref->{popnum} ||
     qsearchs('svc_acct_pop',{'popnum'=> $recref->{popnum} } );
 
-  unless ( $part_svc->getfield('svc_acct__uid_flag') eq 'F' ) {
+  unless ( $part_svc->part_svc_column('uid')->columnflag eq 'F' ) {
 
     $recref->{uid} =~ /^(\d*)$/ or return "Illegal uid";
     $recref->{uid} = $1 eq '' ? $self->unique('uid') : $1;
@@ -506,7 +506,7 @@ sub check {
       return "Can't have quota without uid" : ( $recref->{quota}='' );
   }
 
-  unless ( $part_svc->getfield('svc_acct__slipip_flag') eq 'F' ) {
+  unless ( $part_svc->part_svc_column('slipip')->columnflag eq 'F' ) {
     unless ( $recref->{slipip} eq '0e0' ) {
       $recref->{slipip} =~ /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/
         or return "Illegal slipip". $self->slipip;
@@ -633,7 +633,7 @@ sub email {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.29 2001-09-02 04:51:11 ivan Exp $
+$Id: svc_acct.pm,v 1.30 2001-09-06 20:41:59 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct_sm.pm b/FS/FS/svc_acct_sm.pm
index 7615c211d..c92f1421f 100644
--- a/FS/FS/svc_acct_sm.pm
+++ b/FS/FS/svc_acct_sm.pm
@@ -211,7 +211,7 @@ sub check {
 
   my $x = $self->setfixed;
   return $x unless ref($x);
-  my $part_svc = $x;
+  #my $part_svc = $x;
 
   my($recref) = $self->hashref;
 
@@ -238,7 +238,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_acct_sm.pm,v 1.4 2001-08-20 09:41:52 ivan Exp $
+$Id: svc_acct_sm.pm,v 1.5 2001-09-06 20:41:59 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 4d652f8d3..58c6423c3 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -338,7 +338,7 @@ sub check {
 
   my $x = $self->setfixed;
   return $x unless ref($x);
-  my $part_svc = $x;
+  #my $part_svc = $x;
 
   my $error = $self->ut_numbern('svcnum')
               || $self->ut_numbern('catchall')
@@ -533,7 +533,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.19 2001-08-21 00:39:07 ivan Exp $
+$Id: svc_domain.pm,v 1.20 2001-09-06 20:41:59 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index 288ab3408..6ee1d5b85 100644
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -263,7 +263,7 @@ sub check {
 
   my $x = $self->setfixed;
   return $x unless ref($x);
-  my $part_svc = $x;
+  #my $part_svc = $x;
 
   my $error = $self->ut_numbern('svcnum')
               || $self->ut_number('srcsvc')
@@ -299,7 +299,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_forward.pm,v 1.6 2001-08-21 00:39:07 ivan Exp $
+$Id: svc_forward.pm,v 1.7 2001-09-06 20:41:59 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_www.pm b/FS/FS/svc_www.pm
index 44d7487da..d4e398810 100644
--- a/FS/FS/svc_www.pm
+++ b/FS/FS/svc_www.pm
@@ -198,7 +198,7 @@ sub check {
 
   my $x = $self->setfixed;
   return $x unless ref($x);
-  my $part_svc = $x;
+  #my $part_svc = $x;
 
   my $error =
     $self->ut_numbern('svcnum')
@@ -220,7 +220,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_www.pm,v 1.5 2001-08-21 02:44:47 ivan Exp $
+$Id: svc_www.pm,v 1.6 2001-09-06 20:41:59 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 209c93a10..2db053d44 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -34,6 +34,7 @@ FS/cust_svc.pm
 FS/part_pkg.pm
 FS/part_referral.pm
 FS/part_svc.pm
+FS/part_svc_column.pm
 FS/pkg_svc.pm
 FS/svc_Common.pm
 FS/svc_acct.pm
@@ -73,6 +74,7 @@ t/nas.t
 t/part_pkg.t
 t/part_referral.t
 t/part_svc.t
+t/part_svc_column.t
 t/pkg_svc.t
 t/port.t
 t/prepay_credit.t
diff --git a/FS/t/part_svc_column.t b/FS/t/part_svc_column.t
new file mode 100644
index 000000000..467025c1e
--- /dev/null
+++ b/FS/t/part_svc_column.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_svc_column;
+$loaded=1;
+print "ok 1\n";
diff --git a/README.1.4.0pre2-3 b/README.1.4.0pre2-3
new file mode 100644
index 000000000..23b838e3b
--- /dev/null
+++ b/README.1.4.0pre2-3
@@ -0,0 +1,16 @@
+the following is necessary to upgrade from 1.4.0pre2 to pre3 or later.
+
+CREATE TABLE part_svc_column (
+  columnnum int primary key,
+  svcpart int not null,
+  columnname varchar(64) not null,
+  columnvalue varchar(80) null,
+  columnflag char(1) null
+);
+
+CREATE UNIQUE INDEX part_svc_column1 ON part_svc_column ( svcpart, columnname );
+
+Run bin/fs-migrate-part_svc
+
+Run bin/dbdef-create
+
diff --git a/bin/fs-migrate-part_svc b/bin/fs-migrate-part_svc
new file mode 100755
index 000000000..96332f72a
--- /dev/null
+++ b/bin/fs-migrate-part_svc
@@ -0,0 +1,40 @@
+#!/usr/bin/perl
+
+use strict;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearchs);
+use FS::part_svc
+
+my $user = shift or die &usage;
+my $dbh = adminsuidsetup $user;
+
+my $oldAutoCommit = $FS::UID::AutoCommit;
+local $FS::UID::AutoCommit = 0
+
+foreach my $part_svc ( qsearch('part_svc', {} ) ) {
+  foreach my $field (
+    grep { defined($part_svc->getfield($part_svc->svcdb.'__'.$field.'_flag') ) }
+      fields($self->svcdb)
+  ) {
+    my $flag = $self->getfield($part_svc->svcdb.'__'.$field.'_flag');
+    if ( uc($flag) =~ /^([DF])$/ ) {
+      $part_svc_column->setfield('columnflag', $1);
+      $part_svc_column->setfield('columnvalue',
+        $self->getfield($part_svc->svcdb.'__'.$field)
+      );
+      $error = $part_svc_column->insert;
+    } else {
+      $error = $part_svc_column->delete;
+    }
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      die $error;
+    }
+
+  }
+}
+
+sub usage {
+  die "Usage:\n  fs-migrate-part_svc user\n"; 
+}
+
diff --git a/bin/fs-migrate-payref b/bin/fs-migrate-payref
index f1513112b..158419706 100755
--- a/bin/fs-migrate-payref
+++ b/bin/fs-migrate-payref
@@ -9,9 +9,6 @@ use FS::cust_refund;
 my $user = shift or die &usage;
 my $dbh = adminsuidsetup $user;
 
-#local $FS::UID::AutoCommit = 0; #quelle hack, in this case
-# $FS::UID::AutoCommit = 0; #quelle hack, in this case
-
 # apply payments to invoices
 
 foreach my $cust_pay ( qsearch('cust_pay', {} ) ) {
@@ -28,3 +25,7 @@ foreach my $cust_refund ( qsearch('cust_refund') ) {
 
 # ? apply credits to invoices
 
+sub usage {
+  die "Usage:\n  fs-migrate-payref user\n"; 
+}
+
diff --git a/bin/fs-radius-add-check b/bin/fs-radius-add-check
index 92523eb95..fadba0165 100755
--- a/bin/fs-radius-add-check
+++ b/bin/fs-radius-add-check
@@ -35,8 +35,8 @@ my($char_d) = 80; #default maxlength for text fields
 foreach my $attribute ( @attributes ) {
   foreach my $statement ( 
     "ALTER TABLE svc_acct ADD rc_$attribute varchar($char_d) NULL",
-    "ALTER TABLE part_svc ADD svc_acct__rc_$attribute varchar($char_d) NULL;",
-    "ALTER TABLE part_svc ADD svc_acct__rc_${attribute}_flag char(1) NULL;",
+#    "ALTER TABLE part_svc ADD svc_acct__rc_$attribute varchar($char_d) NULL;",
+#    "ALTER TABLE part_svc ADD svc_acct__rc_${attribute}_flag char(1) NULL;",
   ) {
     $dbh->do( $statement ) or warn "Error executing $statement: ". $dbh->errstr;  }
 }
diff --git a/bin/fs-radius-add-reply b/bin/fs-radius-add-reply
index 7938feac6..997a8eac7 100755
--- a/bin/fs-radius-add-reply
+++ b/bin/fs-radius-add-reply
@@ -35,8 +35,8 @@ my($char_d) = 80; #default maxlength for text fields
 foreach my $attribute ( @attributes ) {
   foreach my $statement ( 
     "ALTER TABLE svc_acct ADD radius_$attribute varchar($char_d) NULL",
-    "ALTER TABLE part_svc ADD svc_acct__radius_$attribute varchar($char_d) NULL;",
-    "ALTER TABLE part_svc ADD svc_acct__radius_${attribute}_flag char(1) NULL;",
+#    "ALTER TABLE part_svc ADD svc_acct__radius_$attribute varchar($char_d) NULL;",
+#    "ALTER TABLE part_svc ADD svc_acct__radius_${attribute}_flag char(1) NULL;",
   ) {
     $dbh->do( $statement ) or warn "Error executing $statement: ". $dbh->errstr;  }
 }
diff --git a/bin/fs-setup b/bin/fs-setup
index 5dc666a1e..53d96f692 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.53 2001-09-04 11:15:58 ivan Exp $
+# $Id: fs-setup,v 1.54 2001-09-06 20:41:59 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -122,32 +122,32 @@ foreach $attribute (@check_attributes) {
   ));
 }
 
-#make part_svc table (but now as object)
-
-my($part_svc)=$dbdef->table('part_svc');
-
-#because of svc_acct_pop
-#foreach (grep /^svc_/, $dbdef->tables) { 
-#foreach (qw(svc_acct svc_acct_sm svc_charge svc_domain svc_wo)) {
-foreach (qw(svc_acct svc_domain svc_forward svc_www)) {
-  my($table)=$dbdef->table($_);
-  my($col);
-  foreach $col ( $table->columns ) {
-    next if $col =~ /^svcnum$/;
-    $part_svc->addcolumn( new DBIx::DBSchema::Column (
-      $table->name. '__' . $table->column($col)->name,
-      'varchar', #$table->column($col)->type, 
-      'NULL',
-      $char_d, #$table->column($col)->length,
-    ));
-    $part_svc->addcolumn ( new DBIx::DBSchema::Column (
-      $table->name. '__'. $table->column($col)->name . "_flag",
-      'char',
-      'NULL',
-      1,
-    ));
-  }
-}
+##make part_svc table (but now as object)
+#
+#my($part_svc)=$dbdef->table('part_svc');
+#
+##because of svc_acct_pop
+##foreach (grep /^svc_/, $dbdef->tables) { 
+##foreach (qw(svc_acct svc_acct_sm svc_charge svc_domain svc_wo)) {
+#foreach (qw(svc_acct svc_domain svc_forward svc_www)) {
+#  my($table)=$dbdef->table($_);
+#  my($col);
+#  foreach $col ( $table->columns ) {
+#    next if $col =~ /^svcnum$/;
+#    $part_svc->addcolumn( new DBIx::DBSchema::Column (
+#      $table->name. '__' . $table->column($col)->name,
+#      'varchar', #$table->column($col)->type, 
+#      'NULL',
+#      $char_d, #$table->column($col)->length,
+#    ));
+#    $part_svc->addcolumn ( new DBIx::DBSchema::Column (
+#      $table->name. '__'. $table->column($col)->name . "_flag",
+#      'char',
+#      'NULL',
+#      1,
+#    ));
+#  }
+#}
 
 #important
 $dbdef->save($dbdef_file);
@@ -580,6 +580,19 @@ sub tables_hash_hack {
       'index' => [ [] ],
     },
 
+    'part_svc_column' => {
+      'columns' => [
+        'columnnum',   'int',         '', '',
+        'svcpart',     'int',         '', '',
+        'columnname',  'varchar',     '', 64,
+        'columnvalue', 'varchar', 'NULL', $char_d,
+        'columnflag',  'char',    'NULL', 1, 
+      ],
+      'primary_key' => 'columnnum',
+      'unique' => [ [ 'svcpart', 'columnname' ] ],
+      'index' => [ [ 'svcpart' ] ],
+    }
+
     #(this should be renamed to part_pop)
     'svc_acct_pop' => {
       'columns' => [
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 1306ac057..cfb1ad82b 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.3 2001-09-04 14:44:06 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.4 2001-09-06 20:41:59 ivan Exp $ -->
 <%= header('Service Definition Listing', menubar( 'Main Menu' => $p) ) %>
 
     Services are items you offer to your customers.<BR><BR>
@@ -15,14 +15,11 @@
    } qsearch('part_svc',{}) ) {
      my($hashref)=$part_svc->hashref;
      my($svcdb)=$hashref->{svcdb};
-     my(@rows)=
-       grep $hashref->{${svcdb}.'__'.$_.'_flag'},
-         map { /^${svcdb}__(.*)$/; $1 }
-           grep ! /_flag$/,
-             grep /^${svcdb}__/,
-               fields('part_svc')
-     ;
-     my($rowspan)=scalar(@rows) || 1;
+     my @fields =
+       grep { $_ ne 'svcnum' && $part_svc->part_svc_column($_)->columnflag }
+            fields($svcdb);
+
+     my($rowspan)=scalar(@fields) || 1;
      my $url = "${p}edit/part_svc.cgi?$hashref->{svcpart}";
 %>
 
@@ -35,9 +32,8 @@
       <%= $hashref->{svcdb} %></TD>
 
 <%   my($n1)='';
-     my($row);
-     foreach $row ( @rows ) {
-       my($flag)=$part_svc->getfield($svcdb.'__'.$row.'_flag');
+     foreach my $field ( @fields ) {
+       my $flag = $part_svc->part_svc_column($field)->columnflag;
 %>
      <%= $n1 %><TD><%= $row %></TD><TD>
 
@@ -45,7 +41,7 @@
          elsif ( $flag eq "F" ) { print "Fixed"; }
          else { print "(Unknown!)"; }
 %>
-       </TD><TD><%= $part_svc->getfield($svcdb."__".$row) %></TD>
+       </TD><TD><%= $part_svc->part_svc_column($field)->columnvalue%></TD>
 <%     $n1="</TR><TR>";
      }
 %>
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index c90f47641..59d68b718 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -196,8 +196,17 @@
         <li>svcpart - primary key
         <li>svc - name of this service
         <li>svcdb - table used for this service: svc_acct, svc_acct_sm, svc_forward, svc_domain, svc_charge or svc_wo
-        <li><i>table</i>__<i>field</i> - Default or fixed value for <i>field</i> in <i>table</i>
+<!--        <li><i>table</i>__<i>field</i> - Default or fixed value for <i>field</i> in <i>table</i>
         <li><i>table</i>__<i>field</i>_flag - null, D or F
+-->
+      </ul>
+    <li><a name="part_svc_column" href="man/FS/part_svc_column.html">part_svc_column</a>
+      <ul>
+        <li>columnnum - primary key
+        <li>svcpart - <a href="#part_svc">Service definition</a>
+        <li>columnname - column name in part_svc.svcdb table
+        <li>columnvalue - default or fixed value for the column
+        <li>columnflag - null, D or F
       </ul>
     <li><a name="pkg_svc" href="man/FS/pkg_svc.html">pkg_svc</a>
       <ul>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 518d76168..67b0e5fe1 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -95,19 +95,17 @@ CREATE TABLE cust_credit_refund (
   amount decimal(10,2) not null
 );
 
+CREATE TABLE part_svc_column (
+  columnnum int primary key,
+  svcpart int not null,
+  columnname varchar(64) not null,
+  columnvalue varchar(80) null,
+  columnflag char(1) null
+);
+
 
 ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
 ALTER TABLE svc_domain ADD catchall integer NULL;
-ALTER TABLE part_svc ADD svc_acct__domsvc integer NULL;
-ALTER TABLE part_svc ADD svc_acct__domsvc_flag char(1) NULL;
-ALTER TABLE part_svc ADD svc_domain__catchall integer NULL;
-ALTER TABLE part_svc ADD svc_domain__catchall_flag char(1) NULL;
-ALTER TABLE part_svc ADD svc_forward__srcsvc integer NULL;
-ALTER TABLE part_svc ADD svc_forward__srcsvc_flag char(1) NULL;
-ALTER TABLE part_svc ADD svc_forward__dstsvc integer NULL;
-ALTER TABLE part_svc ADD svc_forward__dstsvc_flag char(1) NULL;
-ALTER TABLE part_svc ADD svc_forward__dst integer NULL;
-ALTER TABLE part_svc ADD svc_forward__dst_flag char(1) NULL;
 ALTER TABLE cust_main ADD referral_custnum integer NULL;
 ALTER TABLE cust_pay ADD custnum integer;
 ALTER TABLE cust_refund ADD custnum integer;
@@ -118,6 +116,7 @@ CREATE INDEX cust_bill_pay1 ON cust_bill_pay ( invnum );
 CREATE INDEX cust_bill_pay2 ON cust_bill_pay ( paynum );
 CREATE INDEX cust_credit_refund1 ON cust_credit_refund ( crednum );
 CREATE INDEX cust_credit_refund2 ON cust_credit_refund ( refundnum );
+CREATE UNIQUE INDEX part_svc_column1 ON part_svc_column ( svcpart, columnname );
 </pre>
 
   <li>If you are using PostgreSQL, apply the following changes to your database:
@@ -177,6 +176,7 @@ ALTER TABLE cust_main ADD COLUMN comments varchar NULL;
   <li>create a service based on svc_forward
   <li>Run bin/fs-migrate-svc_acct_sm
   <li>Run bin/fs-migrate-payref
+  <li>Run bin/fs-migrate-part_svc
   <li><b>After running bin/fs-migrate-payref</b>, apply the following changes to your database:
   <table border><tr><th>PostgreSQL</th><th>MySQL, others</th></tr>
 <tr><td>
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 01574e992..c0d632fa5 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.6 2001-09-04 14:44:06 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.7 2001-09-06 20:42:00 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -145,10 +145,9 @@ foreach my $svcdb ( qw(
   konq_kludge svc_acct svc_domain svc_acct_sm svc_forward svc_www
 ) ) {
 
-  my(@rows)=map { /^${svcdb}__(.*)$/; $1 }
-    grep ! /_flag$/,
-      grep /^${svcdb}__/,
-        fields('part_svc');
+  my(@fields) = $svcdb eq 'konq_kludge'
+                  ? ()
+                  : grep { $_ ne 'svcnum' } fields($svcdb) );
   #my($rowspan)=scalar(@rows);
 
   #my($ptmp)="<TD ROWSPAN=$rowspan>$svcdb</TD>";
@@ -177,22 +176,26 @@ function fixup(what) {
   print "$svcdb" unless $svcdb eq 'konq_kludge';
   print "<BR><TABLE BORDER=1><TH>Field</TH><TH COLSPAN=2>Modifier</TH>" unless $svcdb eq 'konq_kludge';
 
-  my($row);
-  foreach $row (@rows) {
-    my $value = $part_svc->getfield($svcdb. '__'. $row);
-    my $flag = $part_svc->getfield($svcdb. '__'. $row. '_flag');
-    #print "<TR>$ptmp<TD>$row";
-    print "<TR><TD>$row";
-    print "- <FONT SIZE=-1>$defs{$svcdb}{$row}</FONT>"
-      if defined $defs{$svcdb}{$row};
+  foreach my $field (@fields) {
+    my $part_svc_column = $part_svc->part_svc_column($field);
+    my $value = $cgi->param('error')
+                  ? $cgi->param("${svcdb}__${field}")
+                  : $$part_svc_column->columnvalue;
+    my $flag = $cgi->param('error')
+                 ? $cgi->param("${svcdb}__${field}_flag")
+                 : $part_svc_column->columnflag;
+    #print "<TR>$ptmp<TD>$field";
+    print "<TR><TD>$field";
+    print "- <FONT SIZE=-1>$defs{$svcdb}{$field}</FONT>"
+      if defined $defs{$svcdb}{$field};
     print "</TD>";
-    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE=""!.
+    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${field}_flag" VALUE=""!.
       ' CHECKED'x($flag eq ''). ">Off</TD>";
-    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE="D"!.
+    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${field}_flag" VALUE="D"!.
       ' CHECKED'x($flag eq 'D'). ">Default ";
-    print qq!<INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE="F"!.
+    print qq!<INPUT TYPE="radio" NAME="${svcdb}__${field}_flag" VALUE="F"!.
       ' CHECKED'x($flag eq 'F'). ">Fixed ";
-    print qq!<INPUT TYPE="text" NAME="${svcdb}__${row}" VALUE="$value">!,
+    print qq!<INPUT TYPE="text" NAME="${svcdb}__${field}" VALUE="$value">!,
       "</TD></TR>\n";
     #$ptmp='';
   }
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 093d86a75..5652c5805 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -8,7 +8,11 @@ my $new = new FS::part_svc ( {
   map {
     $_, scalar($cgi->param($_));
 #  } qw(svcpart svc svcdb)
-  } fields('part_svc')
+  } ( fields('part_svc'),
+      map { my $svcdb = $_;
+            map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  }
+              fields($svcdb)
+          } qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www ) )
 } );
 
 my $error;
-- 
cgit v1.2.1


From e9c47f5904df328e0ac6e8ab993927d9aab3867c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Sep 2001 21:20:58 +0000
Subject: doc

---
 FS/FS/svc_acct.pm           | 6 +++++-
 httemplate/docs/schema.html | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index a4ce3f7c9..8a4d69347 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -118,6 +118,10 @@ FS::svc_Common.  The following fields are currently supported:
 
 =item slipip - IP address
 
+=item seconds - 
+
+=item domsvc - svcnum from svc_domain
+
 =item radius_I<Radius_Attribute> - I<Radius-Attribute>
 
 =item domsvc - service number of svc_domain with which to associate
@@ -633,7 +637,7 @@ sub email {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.30 2001-09-06 20:41:59 ivan Exp $
+$Id: svc_acct.pm,v 1.31 2001-09-06 21:20:58 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 59d68b718..32c365ec3 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -249,7 +249,10 @@
         <li>shell
         <li>quota - (unimplementd)
         <li>slipip - IP address
-        <li>radius_<i>Radius_Attribute</i> - Radius-Attribute
+        <li>seconds
+        <li>domsvc
+        <li>radius_<i>Radius_Reply_Attribute</i> - Radius-Reply-Attribute
+        <li>rc_<i>Radius_Check_Attribute</i> - Radius-Check-Attribute
       </ul>
     <li><a name="svc_acct_pop" href="man/FS/svc_acct_pop.html">svc_acct_pop</a> - Points of Presence
       <ul>
-- 
cgit v1.2.1


From 34e22e18b050b9a507433d24eb7a896ce2182afd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Sep 2001 21:43:19 +0000
Subject: no more pg RADIUS silliness

---
 httemplate/docs/install.html    |  2 +-
 httemplate/docs/postgresql.html | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100755 httemplate/docs/postgresql.html

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index f62ac4cf9..1529c648e 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -9,7 +9,7 @@ Before installing, you need:
   <li><a href="http://perl.apache.org/">mod_perl</a>
   <li><a href="http://www.openssh.com//">SSH</a>
   <li><a href="http://www.perl.com/">Perl</a>  Don't enable experimental features like threads or the PerlIO abstraction layer.
-  <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.  <a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.  (see the <a href="postgresql.html">PostgreSQL notes</a>)  <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>.
+  <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.  <a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.  <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>.
   <li>Perl modules (<a href="http://theoryx5.uwinnipeg.ca/CPAN/perl/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
     <ul>
       <li><a href="http://search.cpan.org/search?dist=Array-PrintCols">Array-PrintCols</a>
diff --git a/httemplate/docs/postgresql.html b/httemplate/docs/postgresql.html
deleted file mode 100755
index 1356739d6..000000000
--- a/httemplate/docs/postgresql.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<head>
-  <title>PostgreSQL notes</title>
-</head>
-<body>
-  <h1>PostgreSQL notes</h1>
-<p>
-PostgreSQL ships by default with a maximum of 31 character column names.  If
-you use arbitrary RADIUS attributes longer than 9 characters, fs-setup will
-fail with `duplicate column' errors (in the part_svc table).
-Solution: use a different database
-engine, or recompile PostgreSQL with 64 character column names.
-</p>
-Future versions of Freeside will keep all column names under 31 characters to
-avoid this problem.
-</p>
-</body>
-
-- 
cgit v1.2.1


From 3beb58199322355f8caa166000bb94e9419b4232 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 7 Sep 2001 20:17:50 +0000
Subject: fix RADIUS attribute capitalization

---
 FS/FS/raddb.pm          | 1084 +++++++++++++++++++++++++++++++++++++++++++++++
 FS/FS/svc_acct.pm       |   11 +-
 FS/MANIFEST             |    2 +
 FS/t/raddb.t            |    5 +
 bin/fs-radius-add-check |    8 +-
 bin/fs-radius-add-reply |    8 +-
 bin/fs-setup            |   12 +-
 bin/generate-raddb      |   35 ++
 8 files changed, 1155 insertions(+), 10 deletions(-)
 create mode 100644 FS/FS/raddb.pm
 create mode 100644 FS/t/raddb.t
 create mode 100755 bin/generate-raddb

diff --git a/FS/FS/raddb.pm b/FS/FS/raddb.pm
new file mode 100644
index 000000000..3ccb0dc5b
--- /dev/null
+++ b/FS/FS/raddb.pm
@@ -0,0 +1,1084 @@
+package FS::raddb;
+use vars qw(%attrib);
+
+%attrib = (
+  'ascend_bi_directional_au' => 'Ascend-Bi-Directional-Auth'
+  'h323_connect_time' => 'h323-connect-time'
+  'connect_rate' => 'Connect-Rate'
+  'bind_auth_service_grp' => 'Bind_Auth_Service_Grp'
+  'usr_callback_type' => 'USR-Callback-Type'
+  'erx_primary_wins' => 'ERX-Primary-Wins'
+  'ascend_x25_x121_address' => 'Ascend-X25-X121-Address'
+  'usr_log_filter_packets' => 'USR-Log-Filter-Packets'
+  'annex_addr_resolution_pr' => 'Annex-Addr-Resolution-Protocol'
+  'usr_ip_rip_simple_auth_p' => 'USR-IP-RIP-Simple-Auth-Password'
+  'dialback_name' => 'Dialback-Name'
+  'x_ascend_fr_dce_n392' => 'X-Ascend-FR-DCE-N392'
+  'usr_host_type' => 'USR-Host-Type'
+  'le_modem_info' => 'LE-Modem-Info'
+  'x_ascend_menu_selector' => 'X-Ascend-Menu-Selector'
+  'x_ascend_fr_dce_n393' => 'X-Ascend-FR-DCE-N393'
+  'ascend_ip_direct' => 'Ascend-IP-Direct'
+  'x_ascend_pre_output_octe' => 'X-Ascend-Pre-Output-Octets'
+  'x_ascend_ft1_caller' => 'X-Ascend-FT1-Caller'
+  'usr_last_callers_number_' => 'USR-Last-Callers-Number-ANI'
+  'usr_rmmie_product_code' => 'USR-RMMIE-Product-Code'
+  'usr_igmp_robustness' => 'USR-IGMP-Robustness'
+  'ms_chap2_success' => 'MS-CHAP2-Success'
+  'ascend_home_agent_passwo' => 'Ascend-Home-Agent-Password'
+  'acc_bridging_support' => 'Acc-Bridging-Support'
+  'annex_transmit_speed' => 'Annex-Transmit-Speed'
+  'old_password' => 'Old-Password'
+  'x_ascend_metric' => 'X-Ascend-Metric'
+  'acc_clearing_location' => 'Acc-Clearing-Location'
+  'ascend_multilink_id' => 'Ascend-Multilink-ID'
+  'ascend_egress_enabled' => 'Ascend-Egress-Enabled'
+  'usr_bridging' => 'USR-Bridging'
+  'ascend_assign_ip_server' => 'Ascend-Assign-IP-Server'
+  'acc_dns_server_sec' => 'Acc-Dns-Server-Sec'
+  'ascend_home_agent_ip_add' => 'Ascend-Home-Agent-IP-Addr'
+  'usr_dnis_reauthenticatio' => 'USR-DNIS-ReAuthentication'
+  'acc_modem_error_protocol' => 'Acc-Modem-Error-Protocol'
+  'ascend_backup' => 'Ascend-Backup'
+  'usr_connect_time' => 'USR-Connect-Time'
+  'ascend_cbcp_mode' => 'Ascend-CBCP-Mode'
+  'usr_rmmie_x2_status' => 'USR-RMMIE-x2-Status'
+  'ascend_multicast_gleave_' => 'Ascend-Multicast-GLeave-Delay'
+  'erx_ingress_statistics' => 'ERX-Ingress-Statistics'
+  'cisco_nas_port' => 'Cisco-NAS-Port'
+  'le_admin_group' => 'LE-Admin-Group'
+  'annex_mrru' => 'Annex-MRRU'
+  'x_ascend_add_seconds' => 'X-Ascend-Add-Seconds'
+  'ascend_token_expiry' => 'Ascend-Token-Expiry'
+  'usr_igmp_maximum_respons' => 'USR-IGMP-Maximum-Response-Time'
+  'ascend_calling_id_presen' => 'Ascend-Calling-Id-Presentatn'
+  'connect_info' => 'Connect-Info'
+  'ascend_access_intercept_' => 'Ascend-Access-Intercept-LEA'
+  'x_ascend_dba_monitor' => 'X-Ascend-DBA-Monitor'
+  'client_dns_pri' => 'Client_DNS_Pri'
+  'ip_host_addr' => 'Ip_Host_Addr'
+  'callback_id' => 'Callback-Id'
+  'acct_mcast_out_octets' => 'Acct_Mcast_Out_Octets'
+  'acct_input_octets_64' => 'Acct_Input_Octets_64'
+  'tunnel_function' => 'Tunnel_Function'
+  'ascend_fr_direct_profile' => 'Ascend-FR-Direct-Profile'
+  'h323_incoming_conf_id' => 'h323-incoming-conf-id'
+  'ascend_ppp_vj_1172' => 'Ascend-PPP-VJ-1172'
+  'ms_new_arap_password' => 'MS-New-ARAP-Password'
+  'h323_voice_quality' => 'h323-voice-quality'
+  'framed_appletalk_network' => 'Framed-AppleTalk-Network'
+  'bind_int_interface_name' => 'Bind_Int_Interface_Name'
+  'event_timestamp' => 'Event-Timestamp'
+  'ascend_bir_enable' => 'Ascend-BIR-Enable'
+  'usr_fallback_enabled' => 'USR-Fallback-Enabled'
+  'ascend_dhcp_pool_number' => 'Ascend-DHCP-Pool-Number'
+  'acct_session_id' => 'Acct-Session-Id'
+  'ascend_private_route_req' => 'Ascend-Private-Route-Required'
+  'usr_rmmie_pwrlvl_farecho' => 'USR-RMMIE-PwrLvl-FarEcho-Canc'
+  'usr_at_input_filter' => 'USR-AT-Input-Filter'
+  'erx_egress_statistics' => 'ERX-Egress-Statistics'
+  'x_ascend_call_type' => 'X-Ascend-Call-Type'
+  'acct_tunnel_client_endpo' => 'Acct-Tunnel-Client-Endpoint'
+  'x_ascend_assign_ip_clien' => 'X-Ascend-Assign-IP-Client'
+  'ascend_if_netmask' => 'Ascend-IF-Netmask'
+  'ascend_dhcp_maximum_leas' => 'Ascend-DHCP-Maximum-Leases'
+  'usr_at_output_filter' => 'USR-AT-Output-Filter'
+  'usr_rad_dvmrp_metric' => 'USR-Rad-Dvmrp-Metric'
+  'rate_limit_rate' => 'Rate_Limit_Rate'
+  'prefix' => 'Prefix'
+  'ascend_x25_pad_banner' => 'Ascend-X25-Pad-Banner'
+  'usr_rmmie_rcv_pwrlvl_375' => 'USR-RMMIE-Rcv-PwrLvl-3750Hz'
+  'x_ascend_user_acct_key' => 'X-Ascend-User-Acct-Key'
+  'group_name' => 'Group-Name'
+  'ascend_receive_secret' => 'Ascend-Receive-Secret'
+  'reply_message' => 'Reply-Message'
+  'le_nat_sess_dir_fail_act' => 'LE-NAT-Sess-Dir-Fail-Action'
+  'framed_callback_id' => 'Framed-Callback-Id'
+  'cisco_disconnect_cause' => 'Cisco-Disconnect-Cause'
+  'stripped_user_name' => 'Stripped-User-Name'
+  'annex_keypress_timeout' => 'Annex-Keypress-Timeout'
+  'annex_receive_speed' => 'Annex-Receive-Speed'
+  'ms_chap_domain' => 'MS-CHAP-Domain'
+  'ascend_atm_connect_group' => 'Ascend-ATM-Connect-Group'
+  'usr_send_name' => 'USR-Send-Name'
+  'usr_local_framed_ip_addr' => 'USR-Local-Framed-IP-Addr'
+  'erx_alternate_cli_vroute' => 'ERX-Alternate-Cli-Vrouter-Name'
+  'usr_fallback_limit' => 'USR-Fallback-Limit'
+  'ascend_pri_number_type' => 'Ascend-PRI-Number-Type'
+  'x_ascend_minimum_channel' => 'X-Ascend-Minimum-Channels'
+  'x_ascend_fr_direct_dlci' => 'X-Ascend-FR-Direct-DLCI'
+  'ascend_fr_link_mgt' => 'Ascend-FR-Link-Mgt'
+  'annex_host_allow' => 'Annex-Host-Allow'
+  'x_ascend_force_56' => 'X-Ascend-Force-56'
+  'police_burst' => 'Police_Burst'
+  'pvc_profile_name' => 'PVC_Profile_Name'
+  'ms_filter' => 'MS-Filter'
+  'rate_limit_burst' => 'Rate_Limit_Burst'
+  'ascend_number_sessions' => 'Ascend-Number-Sessions'
+  'cisco_call_filter' => 'Cisco-Call-Filter'
+  'erx_igmp_enable' => 'ERX-Igmp-Enable'
+  'ascend_filter_required' => 'Ascend-Filter-Required'
+  'erx_cli_allow_all_vr_acc' => 'ERX-Cli-Allow-All-VR-Access'
+  'acc_callback_delay' => 'Acc-Callback-Delay'
+  'usr_default_dte_data_rat' => 'USR-Default-DTE-Data-Rate'
+  'le_ip_pool' => 'LE-IP-Pool'
+  'cisco_pre_output_packets' => 'Cisco-Pre-Output-Packets'
+  'x_ascend_group' => 'X-Ascend-Group'
+  'usr_channel_connected_to' => 'USR-Channel-Connected-To'
+  'usr_ipx_rip_output_filte' => 'USR-IPX-RIP-Output-Filter'
+  'usr_esn' => 'USR-ESN'
+  'annex_user_level' => 'Annex-User-Level'
+  'x_ascend_primary_home_ag' => 'X-Ascend-Primary-Home-Agent'
+  'no_such_attribute' => 'No-Such-Attribute'
+  'x_ascend_pri_number_type' => 'X-Ascend-PRI-Number-Type'
+  'ms_mppe_send_key' => 'MS-MPPE-Send-Key'
+  'usr_actual_voltage' => 'USR-Actual-Voltage'
+  'annex_acct_servers' => 'Annex-Acct-Servers'
+  'ascend_handle_ipx' => 'Ascend-Handle-IPX'
+  'cisco_xmit_rate' => 'Cisco-Xmit-Rate'
+  'acc_service_profile' => 'Acc-Service-Profile'
+  'x_ascend_ara_pw' => 'X-Ascend-Ara-PW'
+  'ascend_ckt_type' => 'Ascend-Ckt-Type'
+  'cisco_data_rate' => 'Cisco-Data-Rate'
+  'group' => 'Group'
+  'nas_port' => 'NAS-Port'
+  'usr_ipx_call_output_filt' => 'USR-IPX-Call-Output-Filter'
+  'tunnel_type' => 'Tunnel-Type'
+  'usr_rmmie_manufacturer_i' => 'USR-RMMIE-Manufacturer-ID'
+  'user_name_is_star' => 'User-Name-Is-Star'
+  'usr_call_arrival_in_gmt' => 'USR-Call-Arrival-in-GMT'
+  'x_ascend_number_sessions' => 'X-Ascend-Number-Sessions'
+  'ascend_send_auth' => 'Ascend-Send-Auth'
+  'user_service_type' => 'User-Service-Type'
+  'annex_cli_filter' => 'Annex-CLI-Filter'
+  'erx_cli_initial_access_l' => 'ERX-Cli-Initial-Access-Level'
+  'ascend_call_direction' => 'Ascend-Call-Direction'
+  'usr_chassis_temp_thresho' => 'USR-Chassis-Temp-Threshold'
+  'usr_pw_usr_ofilter_ipx' => 'USR-PW_USR_OFilter_IPX'
+  'tunnel_session_auth' => 'Tunnel_Session_Auth'
+  'x_ascend_connect_progres' => 'X-Ascend-Connect-Progress'
+  'ascend_atm_connect_vci' => 'Ascend-ATM-Connect-Vci'
+  'x_ascend_maximum_call_du' => 'X-Ascend-Maximum-Call-Duration'
+  'usr_rmmie_planned_discon' => 'USR-RMMIE-Planned-Disconnect'
+  'x_ascend_fr_dte_n392' => 'X-Ascend-FR-DTE-N392'
+  'login_host' => 'Login-Host'
+  'ascend_user_acct_host' => 'Ascend-User-Acct-Host'
+  'x_ascend_fr_dte_n393' => 'X-Ascend-FR-DTE-N393'
+  'acc_tunnel_secret' => 'Acc-Tunnel-Secret'
+  'usr_at_rtmp_input_filter' => 'USR-AT-RTMP-Input-Filter'
+  'framed_protocol' => 'Framed-Protocol'
+  'login_callback_number' => 'Login-Callback-Number'
+  'ascend_dsl_rate_type' => 'Ascend-Dsl-Rate-Type'
+  'ascend_pre_output_packet' => 'Ascend-Pre-Output-Packets'
+  'proxy_state' => 'Proxy-State'
+  'usr_pw_usr_ofilter_ip' => 'USR-PW_USR_OFilter_IP'
+  'cisco_data_filter' => 'Cisco-Data-Filter'
+  'cisco_target_util' => 'Cisco-Target-Util'
+  'usr_ids0_call_type' => 'USR-IDS0-Call-Type'
+  'usr_blocks_resent' => 'USR-Blocks-Resent'
+  'usr_terminal_type' => 'USR-Terminal-Type'
+  'ascend_history_weigh_typ' => 'Ascend-History-Weigh-Type'
+  'framed_routing' => 'Framed-Routing'
+  'ascend_client_assign_dns' => 'Ascend-Client-Assign-DNS'
+  'ascend_atm_group' => 'Ascend-ATM-Group'
+  'bind_bypass_bypass' => 'Bind_Bypass_Bypass'
+  'le_ip_gateway' => 'LE-IP-Gateway'
+  'cisco_ip_pool_definition' => 'Cisco-IP-Pool-Definition'
+  'x_ascend_maximum_time' => 'X-Ascend-Maximum-Time'
+  'usr_request_type' => 'USR-Request-Type'
+  'usr_call_arrival_time' => 'USR-Call-Arrival-Time'
+  'tunnel_domain' => 'Tunnel_Domain'
+  'ms_chap_nt_enc_pw' => 'MS-CHAP-NT-Enc-PW'
+  'shiva_calling_number' => 'Shiva-Calling-Number'
+  'ip_address_pool_name' => 'Ip_Address_Pool_Name'
+  'erx_secondary_dns' => 'ERX-Secondary-Dns'
+  'x_ascend_pre_input_octet' => 'X-Ascend-Pre-Input-Octets'
+  'ascend_home_agent_udp_po' => 'Ascend-Home-Agent-UDP-Port'
+  'le_nat_outsource_inmap' => 'LE-NAT-Outsource-Inmap'
+  'x_ascend_home_agent_pass' => 'X-Ascend-Home-Agent-Password'
+  'tunnel_password' => 'Tunnel-Password'
+  'usr_compression_type' => 'USR-Compression-Type'
+  'usr_connect_speed' => 'USR-Connect-Speed'
+  'usr_connect_time_limit' => 'USR-Connect-Time-Limit'
+  'arap_challenge_response' => 'ARAP-Challenge-Response'
+  'ms_link_utilization_thre' => 'MS-Link-Utilization-Threshold'
+  'usr_mp_edo' => 'USR-MP-EDO'
+  'usr_primary_nbns_server' => 'USR-Primary_NBNS_Server'
+  'usr_imsi' => 'USR-IMSI'
+  'ascend_fr_direct' => 'Ascend-FR-Direct'
+  'ascend_vrouter_name' => 'Ascend-VRouter-Name'
+  'ascend_preempt_limit' => 'Ascend-Preempt-Limit'
+  'ascend_ip_pool_definitio' => 'Ascend-IP-Pool-Definition'
+  'h323_gw_id' => 'h323-gw-id'
+  'usr_framed_ipx_route' => 'USR-Framed-IPX-Route'
+  'x_ascend_maximum_channel' => 'X-Ascend-Maximum-Channels'
+  'login_lat_node' => 'Login-LAT-Node'
+  'acct_session_time' => 'Acct-Session-Time'
+  'ascend_disconnect_cause' => 'Ascend-Disconnect-Cause'
+  'ms_mppe_encryption_polic' => 'MS-MPPE-Encryption-Policy'
+  'ms_ras_version' => 'MS-RAS-Version'
+  'class' => 'Class'
+  'caller_id' => 'Caller-ID'
+  'ascend_access_intercept_' => 'Ascend-Access-Intercept-Log'
+  'ascend_service_type' => 'Ascend-Service-Type'
+  'ascend_h323_dialed_time' => 'Ascend-H323-Dialed-Time'
+  'exec_program_wait' => 'Exec-Program-Wait'
+  'ascend_x25_nui_password_' => 'Ascend-X25-Nui-Password-Prompt'
+  'ascend_appletalk_peer_mo' => 'Ascend-Appletalk-Peer-Mode'
+  'login_lat_group' => 'Login-LAT-Group'
+  'strip_user_name' => 'Strip-User-Name'
+  'nas_ip_address' => 'NAS-IP-Address'
+  'ascend_maximum_time' => 'Ascend-Maximum-Time'
+  'erx_atm_pcr' => 'ERX-Atm-PCR'
+  'ascend_client_primary_dn' => 'Ascend-Client-Primary-DNS'
+  'auth_type' => 'Auth-Type'
+  'ascend_secondary_home_ag' => 'Ascend-Secondary-Home-Agent'
+  'x_ascend_idle_limit' => 'X-Ascend-Idle-Limit'
+  'ms_ras_vendor' => 'MS-RAS-Vendor'
+  'ascend_pre_input_packets' => 'Ascend-Pre-Input-Packets'
+  'ascend_bridge' => 'Ascend-Bridge'
+  'h323_redirect_number' => 'h323-redirect-number'
+  'usr_simplified_mnp_level' => 'USR-Simplified-MNP-Levels'
+  'annex_edo' => 'Annex-EDO'
+  'acc_nbns_server_sec' => 'Acc-Nbns-Server-Sec'
+  'ascend_cbcp_trunk_group' => 'Ascend-CBCP-Trunk-Group'
+  'x_ascend_data_svc' => 'X-Ascend-Data-Svc'
+  'le_terminate_detail' => 'LE-Terminate-Detail'
+  'acct_output_octets' => 'Acct-Output-Octets'
+  'usr_calling_party_number' => 'USR-Calling-Party-Number'
+  'x_ascend_dhcp_maximum_le' => 'X-Ascend-DHCP-Maximum-Leases'
+  'ascend_force_56' => 'Ascend-Force-56'
+  'shiva_acct_serv_switch' => 'Shiva-Acct-Serv-Switch'
+  'tunnel_algorithm' => 'Tunnel_Algorithm'
+  'usr_max_channels' => 'USR-Max-Channels'
+  'usr_port_tap_priority' => 'USR-Port-Tap-Priority'
+  'le_nat_outmap' => 'LE-NAT-Outmap'
+  'usr_call_connecting_time' => 'USR-Call-Connecting-Time'
+  'usr_supports_tags' => 'USR-Supports-Tags'
+  'idle_timeout' => 'Idle-Timeout'
+  'usr_ip_rip_input_filter' => 'USR-IP-RIP-Input-Filter'
+  'erx_ingress_policy_name' => 'ERX-Ingress-Policy-Name'
+  'usr_pw_cutoff' => 'USR-PW_Cutoff'
+  'usr_channel_expansion' => 'USR-Channel-Expansion'
+  'x_ascend_send_secret' => 'X-Ascend-Send-Secret'
+  'h323_call_origin' => 'h323-call-origin'
+  'h323_preferred_lang' => 'h323-preferred-lang'
+  'ascend_base_channel_coun' => 'Ascend-Base-Channel-Count'
+  'bind_auth_context' => 'Bind_Auth_Context'
+  'ascend_calling_id_number' => 'Ascend-Calling-Id-Number-Plan'
+  'ascend_modem_shelfno' => 'Ascend-Modem-ShelfNo'
+  'tunnel_police_burst' => 'Tunnel_Police_Burst'
+  'pvc_circuit_padding' => 'PVC_Circuit_Padding'
+  'acc_ml_call_threshold' => 'Acc-ML-Call-Threshold'
+  'usr_end_time' => 'USR-End-Time'
+  'usr_ipx' => 'USR-IPX'
+  'ms_primary_dns_server' => 'MS-Primary-DNS-Server'
+  'ascend_dsl_upstream_limi' => 'Ascend-Dsl-Upstream-Limit'
+  'usr_blocks_sent' => 'USR-Blocks-Sent'
+  'bind_dot1q_vlan_tag_id' => 'Bind_Dot1q_Vlan_Tag_Id'
+  'ascend_private_route' => 'Ascend-Private-Route'
+  'usr_back_channel_data_ra' => 'USR-Back-Channel-Data-Rate'
+  'ascend_dropped_packets' => 'Ascend-Dropped-Packets'
+  'cisco_route_ip' => 'Cisco-Route-IP'
+  'nas_identifier' => 'NAS-Identifier'
+  'ascend_presession_time' => 'Ascend-PreSession-Time'
+  'usr_call_type' => 'USR-Call-Type'
+  'usr_acct_reason_code' => 'USR-Acct-Reason-Code'
+  'acc_dialout_auth_passwor' => 'Acc-Dialout-Auth-Password'
+  'acc_connect_tx_speed' => 'Acc-Connect-Tx-Speed'
+  'cisco_pre_input_octets' => 'Cisco-Pre-Input-Octets'
+  'x_ascend_send_passwd' => 'X-Ascend-Send-Passwd'
+  'ascend_bir_bridge_group' => 'Ascend-BIR-Bridge-Group'
+  'ascend_fr_profile_name' => 'Ascend-FR-Profile-Name'
+  'ascend_group' => 'Ascend-Group'
+  'crypt_password' => 'Crypt-Password'
+  'usr_port_tap_address' => 'USR-Port-Tap-Address'
+  'le_nat_outsource_outmap' => 'LE-NAT-Outsource-Outmap'
+  'usr_vpn_encrypter' => 'USR-VPN-Encrypter'
+  'usr_blocks_received' => 'USR-Blocks-Received'
+  'tunnel_group' => 'Tunnel_Group'
+  'ascend_shared_profile_en' => 'Ascend-Shared-Profile-Enable'
+  'replicate_to_realm' => 'Replicate-To-Realm'
+  'usr_mobile_ip_address' => 'USR-Mobile-IP-Address'
+  'x_ascend_authen_alias' => 'X-Ascend-Authen-Alias'
+  'ascend_fr_linkup' => 'Ascend-FR-LinkUp'
+  'tunnel_rate_limit_rate' => 'Tunnel_Rate_Limit_Rate'
+  'acc_access_community' => 'Acc-Access-Community'
+  'x_ascend_presession_time' => 'X-Ascend-PreSession-Time'
+  'ms_chap_cpw_1' => 'MS-CHAP-CPW-1'
+  'ms_chap_cpw_2' => 'MS-CHAP-CPW-2'
+  'erx_primary_dns' => 'ERX-Primary-Dns'
+  'ascend_fr_circuit_name' => 'Ascend-FR-Circuit-Name'
+  'ascend_token_immediate' => 'Ascend-Token-Immediate'
+  'cisco_idle_limit' => 'Cisco-Idle-Limit'
+  'usr_speed_of_connection' => 'USR-Speed-Of-Connection'
+  'shiva_links_in_bundle' => 'Shiva-Links-In-Bundle'
+  'x_ascend_fr_profile_name' => 'X-Ascend-FR-Profile-Name'
+  'cisco_multilink_id' => 'Cisco-Multilink-ID'
+  'x_ascend_preempt_limit' => 'X-Ascend-Preempt-Limit'
+  'ascend_assign_ip_client' => 'Ascend-Assign-IP-Client'
+  'usr_iwf_ip_address' => 'USR-IWF-IP-Address'
+  'acct_unique_session_id' => 'Acct-Unique-Session-Id'
+  'framed_pool' => 'Framed-Pool'
+  'usr_igmp_version' => 'USR-IGMP-Version'
+  'tunnel_max_tunnels' => 'Tunnel_Max_Tunnels'
+  'annex_unauthenticated_ti' => 'Annex-Unauthenticated-Time'
+  'bg_path_cost' => 'BG_Path_Cost'
+  'ascend_client_assign_win' => 'Ascend-Client-Assign-WINS'
+  'x_ascend_dial_number' => 'X-Ascend-Dial-Number'
+  'cisco_maximum_channels' => 'Cisco-Maximum-Channels'
+  'usr_pw_framed_routing_v2' => 'USR-PW_Framed_Routing_V2'
+  'usr_channel_decrement' => 'USR-Channel-Decrement'
+  'x_ascend_route_ipx' => 'X-Ascend-Route-IPX'
+  'port_limit' => 'Port-Limit'
+  'ascend_dsl_downstream_li' => 'Ascend-Dsl-Downstream-Limit'
+  'ascend_ip_tos_precedence' => 'Ascend-IP-TOS-Precedence'
+  'usr_multicast_receive' => 'USR-Multicast-Receive'
+  'usr_auth_mode' => 'USR-Auth-Mode'
+  'expiration' => 'Expiration'
+  'x_ascend_fr_circuit_name' => 'X-Ascend-FR-Circuit-Name'
+  'x_ascend_token_immediate' => 'X-Ascend-Token-Immediate'
+  'ascend_ft1_caller' => 'Ascend-FT1-Caller'
+  'shiva_event_flags' => 'Shiva-Event-Flags'
+  'framed_netmask' => 'Framed-Netmask'
+  'ascend_minimum_channels' => 'Ascend-Minimum-Channels'
+  'acc_ml_damping_factor' => 'Acc-ML-Damping-Factor'
+  'bind_sub_password' => 'Bind_Sub_Password'
+  'ascend_ip_tos_apply_to' => 'Ascend-IP-TOS-Apply-To'
+  'x_ascend_home_agent_udp_' => 'X-Ascend-Home-Agent-UDP-Port'
+  'x_ascend_menu_item' => 'X-Ascend-Menu-Item'
+  'ascend_session_type' => 'Ascend-Session-Type'
+  'usr_pw_packet' => 'USR-PW_Packet'
+  'session' => 'Session'
+  'usr_mic' => 'USR-MIC'
+  'usr_line_reversals' => 'USR-Line-Reversals'
+  'assigned_ip_address' => 'Assigned_IP_Address'
+  'cisco_ip_direct' => 'Cisco-IP-Direct'
+  'le_ipsec_log_options' => 'LE-IPSec-Log-Options'
+  'tunnel_rate_limit_burst' => 'Tunnel_Rate_Limit_Burst'
+  'x_ascend_assign_ip_globa' => 'X-Ascend-Assign-IP-Global-Pool'
+  'x_ascend_inc_channel_cou' => 'X-Ascend-Inc-Channel-Count'
+  'h323_return_code' => 'h323-return-code'
+  'shiva_disconnect_reason' => 'Shiva-Disconnect-Reason'
+  'filter_id' => 'Filter-Id'
+  'usr_appletalk_network_ra' => 'USR-Appletalk-Network-Range'
+  'ascend_temporary_rtes' => 'Ascend-Temporary-Rtes'
+  'ascend_h323_conference_i' => 'Ascend-H323-Conference-Id'
+  'h323_billing_model' => 'h323-billing-model'
+  'usr_bearer_capabilities' => 'USR-Bearer-Capabilities'
+  'framed_appletalk_zone' => 'Framed-AppleTalk-Zone'
+  'usr_harc_disconnect_code' => 'USR-HARC-Disconnect-Code'
+  'usr_ipx_rip_input_filter' => 'USR-IPX-RIP-Input-Filter'
+  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Bound'
+  'ascend_pw_lifetime' => 'Ascend-PW-Lifetime'
+  'acc_dialout_auth_usernam' => 'Acc-Dialout-Auth-Username'
+  'ascend_x25_pad_x3_parame' => 'Ascend-X25-Pad-X3-Parameters'
+  'bind_dot1q_slot' => 'Bind_Dot1q_Slot'
+  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-RtLim'
+  'x_ascend_multicast_clien' => 'X-Ascend-Multicast-Client'
+  'ascend_authen_alias' => 'Ascend-Authen-Alias'
+  'ascend_dec_channel_count' => 'Ascend-Dec-Channel-Count'
+  'dhcp_max_leases' => 'DHCP_Max_Leases'
+  'shiva_called_number' => 'Shiva-Called-Number'
+  'annex_tunnel_authen_mode' => 'Annex-Tunnel-Authen-Mode'
+  'usr_call_error_code' => 'USR-Call-Error-Code'
+  'x_ascend_user_acct_type' => 'X-Ascend-User-Acct-Type'
+  'ascend_atm_connect_vpi' => 'Ascend-ATM-Connect-Vpi'
+  'ascend_x25_pad_x3_profil' => 'Ascend-X25-Pad-X3-Profile'
+  'usr_mobileip_home_agent_' => 'USR-MobileIP-Home-Agent-Address'
+  'suffix' => 'Suffix'
+  'bind_tun_context' => 'Bind_Tun_Context'
+  'x_ascend_ppp_address' => 'X-Ascend-PPP-Address'
+  'usr_dtr_false_timeout' => 'USR-DTR-False-Timeout'
+  'usr_final_rx_link_data_r' => 'USR-Final-Rx-Link-Data-Rate'
+  'ms_chap_error' => 'MS-CHAP-Error'
+  'x_ascend_home_agent_ip_a' => 'X-Ascend-Home-Agent-IP-Addr'
+  'ascend_data_svc' => 'Ascend-Data-Svc'
+  'usr_rmmie_pwrlvl_noise_l' => 'USR-RMMIE-PwrLvl-Noise-Lvl'
+  'usr_dtr_true_timeout' => 'USR-DTR-True-Timeout'
+  'context_name' => 'Context-Name'
+  'usr_card_type' => 'USR-Card-Type'
+  'ascend_fr_link_status_dl' => 'Ascend-FR-Link-Status-DLCI'
+  'annex_sec_profile_index' => 'Annex-Sec-Profile-Index'
+  'usr_pw_usr_ofilter_sap' => 'USR-PW_USR_OFilter_SAP'
+  'tunnel_medium_type' => 'Tunnel-Medium-Type'
+  'x_ascend_require_auth' => 'X-Ascend-Require-Auth'
+  'ascend_connect_progress' => 'Ascend-Connect-Progress'
+  'x_ascend_modem_shelfno' => 'X-Ascend-Modem-ShelfNo'
+  'cisco_pre_input_packets' => 'Cisco-Pre-Input-Packets'
+  'ascend_fr_dce_n392' => 'Ascend-FR-DCE-N392'
+  'ascend_fr_dce_n393' => 'Ascend-FR-DCE-N393'
+  'ascend_client_primary_wi' => 'Ascend-Client-Primary-WINS'
+  'shiva_link_protocol' => 'Shiva-Link-Protocol'
+  'bridge_group' => 'Bridge_Group'
+  'client_port_dnis' => 'Client-Port-DNIS'
+  'usr_mpip_tunnel_originat' => 'USR-MPIP-Tunnel-Originator'
+  'le_nat_log_options' => 'LE-NAT-Log-Options'
+  'usr_number_of_rings_limi' => 'USR-Number-of-Rings-Limit'
+  'usr_retrains_granted' => 'USR-Retrains-Granted'
+  'acc_ip_gateway_pri' => 'Acc-Ip-Gateway-Pri'
+  'usr_number_of_fallbacks' => 'USR-Number-of-Fallbacks'
+  'usr_tunnel_auth_hostname' => 'USR-Tunnel-Auth-Hostname'
+  'annex_filter' => 'Annex-Filter'
+  'ascend_mtu' => 'Ascend-MTU'
+  'ms_arap_pw_change_reason' => 'MS-ARAP-PW-Change-Reason'
+  'private_group_id' => 'Private-Group-Id'
+  'ascend_cache_time' => 'Ascend-Cache-Time'
+  'acc_ml_clear_threshold' => 'Acc-ML-Clear-Threshold'
+  'x_ascend_dhcp_reply' => 'X-Ascend-DHCP-Reply'
+  'ascend_h323_gatekeeper' => 'Ascend-H323-Gatekeeper'
+  'x_ascend_xmit_rate' => 'X-Ascend-Xmit-Rate'
+  'usr_last_number_dialed_o' => 'USR-Last-Number-Dialed-Out'
+  'acc_connect_rx_speed' => 'Acc-Connect-Rx-Speed'
+  'acc_clearing_cause' => 'Acc-Clearing-Cause'
+  'ascend_call_attempt_limi' => 'Ascend-Call-Attempt-Limit'
+  'x_ascend_data_rate' => 'X-Ascend-Data-Rate'
+  'termination_action' => 'Termination-Action'
+  'ascend_pre_input_octets' => 'Ascend-Pre-Input-Octets'
+  'x_ascend_ipx_route' => 'X-Ascend-IPX-Route'
+  'x_ascend_ts_idle_mode' => 'X-Ascend-TS-Idle-Mode'
+  'client_ip_address' => 'Client-IP-Address'
+  'ascend_add_seconds' => 'Ascend-Add-Seconds'
+  'login_ip_host' => 'Login-IP-Host'
+  'annex_sw_version' => 'Annex-SW-Version'
+  'huntgroup_name' => 'Huntgroup-Name'
+  'usr_pw_vpn_gateway' => 'USR-PW_VPN_Gateway'
+  'ascend_x25_reverse_charg' => 'Ascend-X25-Reverse-Charging'
+  'lac_real_port' => 'LAC_Real_Port'
+  'ascend_dba_monitor' => 'Ascend-DBA-Monitor'
+  'annex_user_server_locati' => 'Annex-User-Server-Location'
+  'ascend_h323_fegw_address' => 'Ascend-H323-Fegw-Address'
+  'acct_output_gigawords' => 'Acct-Output-Gigawords'
+  'bind_l2tp_tunnel_name' => 'Bind_L2TP_Tunnel_Name'
+  'x_ascend_token_idle' => 'X-Ascend-Token-Idle'
+  'acc_apsm_oversubscribed' => 'Acc-Apsm-Oversubscribed'
+  'ip_tos_field' => 'IP_TOS_Field'
+  'ascend_dsl_cir_xmit_limi' => 'Ascend-Dsl-CIR-Xmit-Limit'
+  'usr_number_of_link_naks' => 'USR-Number-of-Link-NAKs'
+  'framed_address' => 'Framed-Address'
+  'x_ascend_num_in_multilin' => 'X-Ascend-Num-In-Multilink'
+  'hint' => 'Hint'
+  'ascend_source_ip_check' => 'Ascend-Source-IP-Check'
+  'arap_zone_access' => 'ARAP-Zone-Access'
+  'x_ascend_fr_direct_profi' => 'X-Ascend-FR-Direct-Profile'
+  'x_ascend_bridge_address' => 'X-Ascend-Bridge-Address'
+  'usr_iwf_call_identifier' => 'USR-IWF-Call-Identifier'
+  'ascend_home_network_name' => 'Ascend-Home-Network-Name'
+  'ascend_require_auth' => 'Ascend-Require-Auth'
+  'source_validation' => 'Source_Validation'
+  'ms_primary_nbns_server' => 'MS-Primary-NBNS-Server'
+  'h323_setup_time' => 'h323-setup-time'
+  'tunnel_remote_name' => 'Tunnel_Remote_Name'
+  'ascend_maximum_channels' => 'Ascend-Maximum-Channels'
+  'ascend_tunneling_protoco' => 'Ascend-Tunneling-Protocol'
+  'arap_security_data' => 'ARAP-Security-Data'
+  'ascend_ipx_peer_mode' => 'Ascend-IPX-Peer-Mode'
+  'ascend_cir_timer' => 'Ascend-CIR-Timer'
+  'ascend_ts_idle_limit' => 'Ascend-TS-Idle-Limit'
+  'ascend_cache_refresh' => 'Ascend-Cache-Refresh'
+  'usr_rmmie_status' => 'USR-RMMIE-Status'
+  'annex_callback_portlist' => 'Annex-Callback-Portlist'
+  'usr_port_tap' => 'USR-Port-Tap'
+  'ascend_client_secondary_' => 'Ascend-Client-Secondary-DNS'
+  'x_ascend_first_dest' => 'X-Ascend-First-Dest'
+  'lac_port' => 'LAC_Port'
+  'acc_callback_cbcp_type' => 'Acc-Callback-CBCP-Type'
+  'usr_call_reference_numbe' => 'USR-Call-Reference-Number'
+  'mcast_receive' => 'Mcast_Receive'
+  'x_ascend_link_compressio' => 'X-Ascend-Link-Compression'
+  'ascend_inter_arrival_jit' => 'Ascend-Inter-Arrival-Jitter'
+  'x_ascend_assign_ip_pool' => 'X-Ascend-Assign-IP-Pool'
+  'usr_chassis_call_span' => 'USR-Chassis-Call-Span'
+  'arap_password' => 'ARAP-Password'
+  'usr_ip_default_route_opt' => 'USR-IP-Default-Route-Option'
+  'ascend_endpoint_disc' => 'Ascend-Endpoint-Disc'
+  'tunnel_dnis' => 'Tunnel_DNIS'
+  'ms_acct_auth_type' => 'MS-Acct-Auth-Type'
+  'ascend_ts_idle_mode' => 'Ascend-TS-Idle-Mode'
+  'shasta_service_profile' => 'Shasta-Service-Profile'
+  'usr_cdma_call_reference_' => 'USR-CDMA-Call-Reference-Number'
+  'usr_at_zip_input_filter' => 'USR-AT-Zip-Input-Filter'
+  'x_ascend_pw_warntime' => 'X-Ascend-PW-Warntime'
+  'ascend_fr_direct_dlci' => 'Ascend-FR-Direct-DLCI'
+  'usr_dte_ring_no_answer_l' => 'USR-DTE-Ring-No-Answer-Limit'
+  'ascend_multicast_rate_li' => 'Ascend-Multicast-Rate-Limit'
+  'usr_routing_protocol' => 'USR-Routing-Protocol'
+  'pam_auth' => 'Pam-Auth'
+  'client_dns_sec' => 'Client_DNS_Sec'
+  'bg_trans_bpdu' => 'BG_Trans_BPDU'
+  'police_rate' => 'Police_Rate'
+  'calling_station_id' => 'Calling-Station-Id'
+  'usr_called_party_number' => 'USR-Called-Party-Number'
+  'shiva_network_protocols' => 'Shiva-Network-Protocols'
+  'x_ascend_client_gateway' => 'X-Ascend-Client-Gateway'
+  'acct_input_octets' => 'Acct-Input-Octets'
+  'ascend_call_type' => 'Ascend-Call-Type'
+  'annex_product_name' => 'Annex-Product-Name'
+  'framed_compression' => 'Framed-Compression'
+  'ascend_atm_direct' => 'Ascend-ATM-Direct'
+  'x_ascend_remote_addr' => 'X-Ascend-Remote-Addr'
+  'usr_tunneled_mlpp' => 'USR-Tunneled-MLPP'
+  'le_ipsec_outsource_profi' => 'LE-IPSec-Outsource-Profile'
+  'ascend_atm_vci' => 'Ascend-ATM-Vci'
+  'usr_number_of_link_timeo' => 'USR-Number-of-Link-Timeouts'
+  'usr_et_bridge_input_filt' => 'USR-ET-Bridge-Input-Filter'
+  'x_ascend_fr_t391' => 'X-Ascend-FR-T391'
+  'x_ascend_fr_t392' => 'X-Ascend-FR-T392'
+  'h323_conf_id' => 'h323-conf-id'
+  'usr_call_end_date_time' => 'USR-Call-End-Date-Time'
+  'ascend_fr_t391' => 'Ascend-FR-T391'
+  'bg_aging_time' => 'BG_Aging_Time'
+  'x_ascend_pre_output_pack' => 'X-Ascend-Pre-Output-Packets'
+  'acc_dialout_auth_mode' => 'Acc-Dialout-Auth-Mode'
+  'ascend_calling_subaddres' => 'Ascend-Calling-Subaddress'
+  'ascend_fr_t392' => 'Ascend-FR-T392'
+  'acct_link_count' => 'Acct-Link-Count'
+  'usr_chassis_call_slot' => 'USR-Chassis-Call-Slot'
+  'h323_credit_time' => 'h323-credit-time'
+  'nas_port_id' => 'NAS-Port-Id'
+  'x_ascend_call_filter' => 'X-Ascend-Call-Filter'
+  'ascend_destination_nas_p' => 'Ascend-Destination-Nas-Port'
+  'arap_features' => 'ARAP-Features'
+  'x_ascend_history_weigh_t' => 'X-Ascend-History-Weigh-Type'
+  'annex_host_restrict' => 'Annex-Host-Restrict'
+  'usr_compression_reset_mo' => 'USR-Compression-Reset-Mode'
+  'cisco_maximum_time' => 'Cisco-Maximum-Time'
+  'tunnel_max_sessions' => 'Tunnel_Max_Sessions'
+  'bind_ses_context' => 'Bind_Ses_Context'
+  'x_ascend_ppp_vj_slot_com' => 'X-Ascend-PPP-VJ-Slot-Comp'
+  'usr_mobile_numbytes_rxed' => 'USR-Mobile-NumBytes-Rxed'
+  'usr_rmmie_last_update_ti' => 'USR-RMMIE-Last-Update-Time'
+  'ascend_atm_loopback_cell' => 'Ascend-ATM-Loopback-Cell-Loss'
+  'ascend_bir_proxy' => 'Ascend-BIR-Proxy'
+  'acct_mcast_in_packets' => 'Acct_Mcast_In_Packets'
+  'shiva_type_of_service' => 'Shiva-Type-Of-Service'
+  'ascend_fr_dte_n392' => 'Ascend-FR-DTE-N392'
+  'usr_at_call_input_filter' => 'USR-AT-Call-Input-Filter'
+  'ascend_fr_dte_n393' => 'Ascend-FR-DTE-N393'
+  'x_ascend_backup' => 'X-Ascend-Backup'
+  'char_noecho' => 'Char-Noecho'
+  'usr_rmmie_last_update_ev' => 'USR-RMMIE-Last-Update-Event'
+  'le_advice_of_charge' => 'LE-Advice-of-Charge'
+  'ascend_calling_id_type_o' => 'Ascend-Calling-Id-Type-Of-Num'
+  'ascend_pppoe_enable' => 'Ascend-PPPoE-Enable'
+  'usr_sync_async_mode' => 'USR-Sync-Async-Mode'
+  'state' => 'State'
+  'x_ascend_user_acct_base' => 'X-Ascend-User-Acct-Base'
+  'x_ascend_ipx_alias' => 'X-Ascend-IPX-Alias'
+  'ascend_ip_tos' => 'Ascend-IP-TOS'
+  'annex_secondary_dns_serv' => 'Annex-Secondary-DNS-Server'
+  'tunnel_session_auth_ctx' => 'Tunnel_Session_Auth_Ctx'
+  'usr_mbi_ct_pri_card_span' => 'USR-Mbi_Ct_PRI_Card_Span_Line'
+  'usr_call_event_code' => 'USR-Call-Event-Code'
+  'chap_password' => 'CHAP-Password'
+  'le_nat_tcp_session_timeo' => 'LE-NAT-TCP-Session-Timeout'
+  'usr_call_start_date_time' => 'USR-Call-Start-Date-Time'
+  'usr_multicast_forwarding' => 'USR-Multicast-Forwarding'
+  'client_id' => 'Client-Id'
+  'sql_user_name' => 'SQL-User-Name'
+  'x_ascend_billing_number' => 'X-Ascend-Billing-Number'
+  'ms_secondary_nbns_server' => 'MS-Secondary-NBNS-Server'
+  'cisco_num_in_multilink' => 'Cisco-Num-In-Multilink'
+  'x_ascend_client_assign_d' => 'X-Ascend-Client-Assign-DNS'
+  'x_ascend_user_acct_port' => 'X-Ascend-User-Acct-Port'
+  'usr_local_ip_address' => 'USR-Local-IP-Address'
+  'x_ascend_ip_pool_definit' => 'X-Ascend-IP-Pool-Definition'
+  'ascend_metric' => 'Ascend-Metric'
+  'x_ascend_bacp_enable' => 'X-Ascend-BACP-Enable'
+  'x_ascend_user_acct_time' => 'X-Ascend-User-Acct-Time'
+  'x_ascend_mpp_idle_percen' => 'X-Ascend-MPP-Idle-Percent'
+  'annex_authen_servers' => 'Annex-Authen-Servers'
+  'x_ascend_data_filter' => 'X-Ascend-Data-Filter'
+  'ascend_idle_limit' => 'Ascend-Idle-Limit'
+  'ldap_userdn' => 'Ldap-UserDn'
+  'x_ascend_target_util' => 'X-Ascend-Target-Util'
+  'shiva_connect_reason' => 'Shiva-Connect-Reason'
+  'usr_ds0' => 'USR-DS0'
+  'annex_re_chap_timeout' => 'Annex-Re-CHAP-Timeout'
+  'shasta_vpn_name' => 'Shasta-VPN-Name'
+  'acct_tunnel_connection_i' => 'Acct-Tunnel-Connection-Id'
+  'h323_prompt_id' => 'h323-prompt-id'
+  'x_ascend_ipx_peer_mode' => 'X-Ascend-IPX-Peer-Mode'
+  'ascend_numbering_plan_id' => 'Ascend-Numbering-Plan-ID'
+  'x_ascend_ts_idle_limit' => 'X-Ascend-TS-Idle-Limit'
+  'ascend_atm_fault_managem' => 'Ascend-ATM-Fault-Management'
+  'annex_primary_nbns_serve' => 'Annex-Primary-NBNS-Server'
+  'lac_port_type' => 'LAC_Port_Type'
+  'usr_initial_rx_link_data' => 'USR-Initial-Rx-Link-Data-Rate'
+  'usr_interface_index' => 'USR-Interface-Index'
+  'usr_expansion_algorithm' => 'USR-Expansion-Algorithm'
+  'ascend_tunnel_vrouter_na' => 'Ascend-Tunnel-VRouter-Name'
+  'usr_pw_vpn_neighbor' => 'USR-PW_VPN_Neighbor'
+  'bind_type' => 'Bind_Type'
+  'acc_ccp_option' => 'Acc-Ccp-Option'
+  'ascend_route_appletalk' => 'Ascend-Route-Appletalk'
+  'erx_alternate_cli_access' => 'ERX-Alternate-Cli-Access-Level'
+  'usr_at_rtmp_output_filte' => 'USR-AT-RTMP-Output-Filter'
+  'erx_atm_mbs' => 'ERX-Atm-MBS'
+  'usr_at_call_output_filte' => 'USR-AT-Call-Output-Filter'
+  'ms_old_arap_password' => 'MS-Old-ARAP-Password'
+  'x_ascend_client_primary_' => 'X-Ascend-Client-Primary-DNS'
+  'x_ascend_host_info' => 'X-Ascend-Host-Info'
+  'bind_auth_protocol' => 'Bind_Auth_Protocol'
+  'cisco_link_compression' => 'Cisco-Link-Compression'
+  'annex_syslog_tap' => 'Annex-Syslog-Tap'
+  'tunnel_window' => 'Tunnel_Window'
+  'usr_gateway_ip_address' => 'USR-Gateway-IP-Address'
+  'ascend_redirect_number' => 'Ascend-Redirect-Number'
+  'x_ascend_secondary_home_' => 'X-Ascend-Secondary-Home-Agent'
+  'usr_pw_index' => 'USR-PW_Index'
+  'le_multicast_client' => 'LE-Multicast-Client'
+  'annex_modem_disc_reason' => 'Annex-Modem-Disc-Reason'
+  'annex_primary_dns_server' => 'Annex-Primary-DNS-Server'
+  'erx_secondary_wins' => 'ERX-Secondary-Wins'
+  'fall_through' => 'Fall-Through'
+  'acct_mcast_out_packets' => 'Acct_Mcast_Out_Packets'
+  'x_ascend_transit_number' => 'X-Ascend-Transit-Number'
+  'usr_unauthenticated_time' => 'USR-Unauthenticated-Time'
+  'le_ipsec_active_profile' => 'LE-IPSec-Active-Profile'
+  'ascend_ip_pool_chaining' => 'Ascend-IP-Pool-Chaining'
+  'usr_syslog_tap' => 'USR-Syslog-Tap'
+  'ascend_multicast_client' => 'Ascend-Multicast-Client'
+  'usr_device_connected_to' => 'USR-Device-Connected-To'
+  'tunnel_l2f_second_passwo' => 'Tunnel_L2F_Second_Password'
+  'add_prefix' => 'Add-Prefix'
+  'tunnel_cmd_timeout' => 'Tunnel_Cmd_Timeout'
+  'x_ascend_remove_seconds' => 'X-Ascend-Remove-Seconds'
+  'acct_mcast_in_octets' => 'Acct_Mcast_In_Octets'
+  'ascend_appletalk_route' => 'Ascend-Appletalk-Route'
+  'ascend_fcp_parameter' => 'Ascend-FCP-Parameter'
+  'acc_ip_compression' => 'Acc-Ip-Compression'
+  'usr_modem_training_time' => 'USR-Modem-Training-Time'
+  'usr_primary_dns_server' => 'USR-Primary_DNS_Server'
+  'erx_egress_policy_name' => 'ERX-Egress-Policy-Name'
+  'x_ascend_base_channel_co' => 'X-Ascend-Base-Channel-Count'
+  'x_ascend_pre_input_packe' => 'X-Ascend-Pre-Input-Packets'
+  'password_retry' => 'Password-Retry'
+  'ascend_source_auth' => 'Ascend-Source-Auth'
+  'cisco_pw_lifetime' => 'Cisco-PW-Lifetime'
+  'acc_dns_server_pri' => 'Acc-Dns-Server-Pri'
+  'ascend_netware_timeout' => 'Ascend-Netware-timeout'
+  'ascend_ppp_async_map' => 'Ascend-PPP-Async-Map'
+  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Ttl'
+  'x_ascend_modem_slotno' => 'X-Ascend-Modem-SlotNo'
+  'x_ascend_ip_direct' => 'X-Ascend-IP-Direct'
+  'simultaneous_use' => 'Simultaneous-Use'
+  'erx_virtual_router_name' => 'ERX-Virtual-Router-Name'
+  'ascend_bridge_non_pppoe' => 'Ascend-Bridge-Non-PPPoE'
+  'ascend_fr_08_mode' => 'Ascend-FR-08-Mode'
+  'h323_call_type' => 'h323-call-type'
+  'tunnel_context' => 'Tunnel_Context'
+  'usr_transmit_acc_map' => 'USR-Transmit-Acc-Map'
+  'usr_ipx_wan' => 'USR-IPX-WAN'
+  'usr_ip_call_input_filter' => 'USR-IP-Call-Input-Filter'
+  'usr_call_connect_in_gmt' => 'USR-Call-Connect-in-GMT'
+  'acct_multi_session_id' => 'Acct-Multi-Session-Id'
+  'usr_reply_script1' => 'USR-Reply-Script1'
+  'cisco_ppp_vj_slot_comp' => 'Cisco-PPP-VJ-Slot-Comp'
+  'usr_reply_script2' => 'USR-Reply-Script2'
+  'usr_reply_script3' => 'USR-Reply-Script3'
+  'usr_reply_script4' => 'USR-Reply-Script4'
+  'usr_reply_script5' => 'USR-Reply-Script5'
+  'usr_reply_script6' => 'USR-Reply-Script6'
+  'user_category' => 'User-Category'
+  'mcast_send' => 'Mcast_Send'
+  'ascend_send_secret' => 'Ascend-Send-Secret'
+  'usr_tunnel_switch_endpoi' => 'USR-Tunnel-Switch-Endpoint'
+  'tunnel_retransmit' => 'Tunnel_Retransmit'
+  'add_port_to_ip_address' => 'Add-Port-To-IP-Address'
+  'ascend_ipx_node_addr' => 'Ascend-IPX-Node-Addr'
+  'x_ascend_netware_timeout' => 'X-Ascend-Netware-timeout'
+  'erx_sa_validate' => 'ERX-Sa-Validate'
+  'le_ipsec_passive_profile' => 'LE-IPSec-Passive-Profile'
+  'usr_chassis_slot' => 'USR-Chassis-Slot'
+  'usr_final_tx_link_data_r' => 'USR-Final-Tx-Link-Data-Rate'
+  'usr_nfas_id' => 'USR-NFAS-ID'
+  'called_station_id' => 'Called-Station-Id'
+  'login_lat_port' => 'Login-LAT-Port'
+  'ascend_dialed_number' => 'Ascend-Dialed-Number'
+  'h323_credit_amount' => 'h323-credit-amount'
+  'tunnel_local_name' => 'Tunnel_Local_Name'
+  'framed_ip_netmask' => 'Framed-IP-Netmask'
+  'client_port_id' => 'Client-Port-Id'
+  'bg_span_dis' => 'BG_Span_Dis'
+  'multi_link_flag' => 'Multi-Link-Flag'
+  'bind_sub_user_at_context' => 'Bind_Sub_User_At_Context'
+  'usr_ipx_routing' => 'USR-IPX-Routing'
+  'ascend_fr_nailed_grp' => 'Ascend-FR-Nailed-Grp'
+  'ascend_pre_output_octets' => 'Ascend-Pre-Output-Octets'
+  'pppoe_url' => 'PPPOE_URL'
+  'ascend_ara_pw' => 'Ascend-Ara-PW'
+  'acc_callback_mode' => 'Acc-Callback-Mode'
+  'usr_server_time' => 'USR-Server-Time'
+  'ascend_seconds_of_histor' => 'Ascend-Seconds-Of-History'
+  'ns_mta_md5_password' => 'NS-MTA-MD5-Password'
+  'tunnel_server_endpoint' => 'Tunnel-Server-Endpoint'
+  'usr_channel' => 'USR-Channel'
+  'ascend_dsl_cir_recv_limi' => 'Ascend-Dsl-CIR-Recv-Limit'
+  'acct_session_start_time' => 'Acct-Session-Start-Time'
+  'ascend_send_passwd' => 'Ascend-Send-Passwd'
+  'ascend_num_in_multilink' => 'Ascend-Num-In-Multilink'
+  'usr_ip_rip_policies' => 'USR-IP-RIP-Policies'
+  'vendor_specific' => 'Vendor-Specific'
+  'x_ascend_event_type' => 'X-Ascend-Event-Type'
+  'lac_real_port_type' => 'LAC_Real_Port_Type'
+  'x_ascend_modem_portno' => 'X-Ascend-Modem-PortNo'
+  'usr_originate_answer_mod' => 'USR-Originate-Answer-Mode'
+  'framed_ipx_network' => 'Framed-IPX-Network'
+  'ascend_modem_slotno' => 'Ascend-Modem-SlotNo'
+  'ms_mppe_encryption_type' => 'MS-MPPE-Encryption-Type'
+  'annex_cli_command' => 'Annex-CLI-Command'
+  'acct_status_type' => 'Acct-Status-Type'
+  'usr_et_bridge_call_outpu' => 'USR-ET-Bridge-Call-Output-Filte'
+  'usr_pw_vpn_id' => 'USR-PW_VPN_ID'
+  'usr_sap_filter_in' => 'USR-SAP-Filter-In'
+  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Proto'
+  'annex_audit_level' => 'Annex-Audit-Level'
+  'x_ascend_shared_profile_' => 'X-Ascend-Shared-Profile-Enable'
+  'ascend_dial_number' => 'Ascend-Dial-Number'
+  'ascend_link_compression' => 'Ascend-Link-Compression'
+  'usr_event_date_time' => 'USR-Event-Date-Time'
+  'usr_mp_edo_hiper' => 'USR-MP-EDO-HIPER'
+  'usr_re_chap_timeout' => 'USR-Re-Chap-Timeout'
+  'x_ascend_third_prompt' => 'X-Ascend-Third-Prompt'
+  'x_ascend_ppp_vj_1172' => 'X-Ascend-PPP-VJ-1172'
+  'annex_disconnect_reason' => 'Annex-Disconnect-Reason'
+  'ascend_fr_svc_addr' => 'Ascend-FR-SVC-Addr'
+  'nas_real_port' => 'NAS_Real_Port'
+  'usr_power_supply_number' => 'USR-Power-Supply-Number'
+  'ms_secondary_dns_server' => 'MS-Secondary-DNS-Server'
+  'ascend_port_redir_server' => 'Ascend-Port-Redir-Server'
+  'ascend_x25_pad_alias_1' => 'Ascend-X25-Pad-Alias-1'
+  'x_ascend_fcp_parameter' => 'X-Ascend-FCP-Parameter'
+  'ascend_x25_pad_alias_2' => 'Ascend-X25-Pad-Alias-2'
+  'ascend_ipsec_profile' => 'Ascend-IPSEC-Profile'
+  'ascend_x25_pad_alias_3' => 'Ascend-X25-Pad-Alias-3'
+  'usr_mobile_numbytes_txed' => 'USR-Mobile-NumBytes-Txed'
+  'ascend_atm_vpi' => 'Ascend-ATM-Vpi'
+  'annex_input_filter' => 'Annex-Input-Filter'
+  'menu' => 'Menu'
+  'x_ascend_route_ip' => 'X-Ascend-Route-IP'
+  'usr_rmmie_num_of_updates' => 'USR-RMMIE-Num-Of-Updates'
+  'acc_request_type' => 'Acc-Request-Type'
+  'ascend_dhcp_reply' => 'Ascend-DHCP-Reply'
+  'usr_number_of_upshifts' => 'USR-Number-of-Upshifts'
+  'usr_rmmie_firmware_versi' => 'USR-RMMIE-Firmware-Version'
+  'bind_bypass_context' => 'Bind_Bypass_Context'
+  'ascend_dialout_allowed' => 'Ascend-Dialout-Allowed'
+  'annex_tunnel_authen_type' => 'Annex-Tunnel-Authen-Type'
+  'x_ascend_bridge' => 'X-Ascend-Bridge'
+  'ascend_client_secondary_' => 'Ascend-Client-Secondary-WINS'
+  'erx_local_loopback_inter' => 'ERX-Local-Loopback-Interface'
+  'acct_input_gigawords' => 'Acct-Input-Gigawords'
+  'usr_equalization_type' => 'USR-Equalization-Type'
+  'usr_port_tap_format' => 'USR-Port-Tap-Format'
+  'x_ascend_ppp_async_map' => 'X-Ascend-PPP-Async-Map'
+  'acc_ipx_compression' => 'Acc-Ipx-Compression'
+  'ascend_nas_port_format' => 'Ascend-NAS-Port-Format'
+  'acc_modem_modulation_typ' => 'Acc-Modem-Modulation-Type'
+  'ascend_modem_portno' => 'Ascend-Modem-PortNo'
+  'usr_et_bridge_output_fil' => 'USR-ET-Bridge-Output-Filter'
+  'ascend_ipx_header_compre' => 'Ascend-IPX-Header-Compression'
+  'framed_appletalk_link' => 'Framed-AppleTalk-Link'
+  'x_ascend_receive_secret' => 'X-Ascend-Receive-Secret'
+  'ascend_route_ipx' => 'Ascend-Route-IPX'
+  'ascend_user_acct_type' => 'Ascend-User-Acct-Type'
+  'ascend_token_idle' => 'Ascend-Token-Idle'
+  'framed_ip_address' => 'Framed-IP-Address'
+  'ascend_call_block_durati' => 'Ascend-Call-Block-Duration'
+  'ascend_ppp_address' => 'Ascend-PPP-Address'
+  'usr_mbi_ct_pri_card_slot' => 'USR-Mbi_Ct_PRI_Card_Slot'
+  'x_ascend_dec_channel_cou' => 'X-Ascend-Dec-Channel-Count'
+  'x_ascend_send_auth' => 'X-Ascend-Send-Auth'
+  'usr_characters_received' => 'USR-Characters-Received'
+  'usr_pw_tunnel_authentica' => 'USR-PW_Tunnel_Authentication'
+  'usr_call_end_time' => 'USR-Call-End-Time'
+  'x_ascend_dialout_allowed' => 'X-Ascend-Dialout-Allowed'
+  'x_ascend_call_attempt_li' => 'X-Ascend-Call-Attempt-Limit'
+  'initial_modulation_type' => 'Initial-Modulation-Type'
+  'usr_packet_bus_session' => 'USR-Packet-Bus-Session'
+  'x_ascend_ipx_node_addr' => 'X-Ascend-IPX-Node-Addr'
+  'ascend_ppp_vj_slot_comp' => 'Ascend-PPP-VJ-Slot-Comp'
+  'ascend_menu_item' => 'Ascend-Menu-Item'
+  'x_ascend_fr_link_mgt' => 'X-Ascend-FR-Link-Mgt'
+  'usr_rmmie_serial_number' => 'USR-RMMIE-Serial-Number'
+  'message_authenticator' => 'Message-Authenticator'
+  'usr_dte_data_idle_timout' => 'USR-DTE-Data-Idle-Timout'
+  'usr_port_tap_facility' => 'USR-Port-Tap-Facility'
+  'acc_ml_mlx_admin_state' => 'Acc-ML-MLX-Admin-State'
+  'usr_modem_group' => 'USR-Modem-Group'
+  'x_ascend_callback' => 'X-Ascend-Callback'
+  'acct_input_packets_64' => 'Acct_Input_Packets_64'
+  'ascend_third_prompt' => 'Ascend-Third-Prompt'
+  'configuration_token' => 'Configuration-Token'
+  'x_ascend_fr_nailed_grp' => 'X-Ascend-FR-Nailed-Grp'
+  'acct_output_octets_64' => 'Acct_Output_Octets_64'
+  'h323_time_and_day' => 'h323-time-and-day'
+  'ascend_port_redir_portnu' => 'Ascend-Port-Redir-Portnum'
+  'acct_interim_interval' => 'Acct-Interim-Interval'
+  'ascend_uu_info' => 'Ascend-UU-Info'
+  'usr_pw_vpn_name' => 'USR-PW_VPN_Name'
+  'ascend_maximum_call_dura' => 'Ascend-Maximum-Call-Duration'
+  'ascend_atm_direct_profil' => 'Ascend-ATM-Direct-Profile'
+  'acc_input_errors' => 'Acc-Input-Errors'
+  'bind_dot1q_port' => 'Bind_Dot1q_Port'
+  'ascend_first_dest' => 'Ascend-First-Dest'
+  'x_ascend_if_netmask' => 'X-Ascend-IF-Netmask'
+  'tunnel_session_auth_serv' => 'Tunnel_Session_Auth_Service_Grp'
+  'annex_local_ip_address' => 'Annex-Local-IP-Address'
+  'termination_menu' => 'Termination-Menu'
+  'ms_chap2_cpw' => 'MS-CHAP2-CPW'
+  'ascend_mpp_idle_percent' => 'Ascend-MPP-Idle-Percent'
+  'usr_characters_sent' => 'USR-Characters-Sent'
+  'eap_message' => 'EAP-Message'
+  'acct_delay_time' => 'Acct-Delay-Time'
+  'ascend_remote_fw' => 'Ascend-Remote-FW'
+  'x_ascend_tunneling_proto' => 'X-Ascend-Tunneling-Protocol'
+  'shiva_session_id' => 'Shiva-Session-Id'
+  'usr_igmp_query_interval' => 'USR-IGMP-Query-Interval'
+  'usr_accm_type' => 'USR-ACCM-Type'
+  'usr_call_terminate_in_gm' => 'USR-Call-Terminate-in-GMT'
+  'usr_rad_location_type' => 'USR-Rad-Location-Type'
+  'ascend_filter' => 'Ascend-Filter'
+  'ascend_primary_home_agen' => 'Ascend-Primary-Home-Agent'
+  'x_ascend_user_acct_host' => 'X-Ascend-User-Acct-Host'
+  'chap_challenge' => 'CHAP-Challenge'
+  'acct_output_packets_64' => 'Acct_Output_Packets_64'
+  'bind_auth_max_sessions' => 'Bind_Auth_Max_Sessions'
+  'cisco_pre_output_octets' => 'Cisco-Pre-Output-Octets'
+  'x_ascend_fr_direct' => 'X-Ascend-FR-Direct'
+  'x_ascend_client_secondar' => 'X-Ascend-Client-Secondary-DNS'
+  'usr_rmmie_pwrlvl_nearech' => 'USR-RMMIE-PwrLvl-NearEcho-Canc'
+  'ascend_bridge_address' => 'Ascend-Bridge-Address'
+  'user_name' => 'User-Name'
+  'usr_rmmie_firmware_build' => 'USR-RMMIE-Firmware-Build-Date'
+  'ms_chap_mppe_keys' => 'MS-CHAP-MPPE-Keys'
+  'usr_number_of_characters' => 'USR-Number-Of-Characters-Lost'
+  'usr_physical_state' => 'USR-Physical-State'
+  'x_ascend_assign_ip_serve' => 'X-Ascend-Assign-IP-Server'
+  'bind_int_context' => 'Bind_Int_Context'
+  'erx_tunnel_virtual_route' => 'ERX-Tunnel-Virtual-Router'
+  'ascend_xmit_rate' => 'Ascend-Xmit-Rate'
+  'usr_secondary_dns_server' => 'USR-Secondary_DNS_Server'
+  'ascend_dsl_rate_mode' => 'Ascend-Dsl-Rate-Mode'
+  'ascend_data_rate' => 'Ascend-Data-Rate'
+  'realm' => 'Realm'
+  'usr_ipx_call_input_filte' => 'USR-IPX-Call-Input-Filter'
+  'ascend_ipx_route' => 'Ascend-IPX-Route'
+  'usr_failure_to_connect_r' => 'USR-Failure-to-Connect-Reason'
+  'x_ascend_home_network_na' => 'X-Ascend-Home-Network-Name'
+  'acc_nbns_server_pri' => 'Acc-Nbns-Server-Pri'
+  'usr_modulation_type' => 'USR-Modulation-Type'
+  'service_type' => 'Service-Type'
+  'ascend_callback_delay' => 'Ascend-Callback-Delay'
+  'ascend_owner_ip_addr' => 'Ascend-Owner-IP-Addr'
+  'x_ascend_handle_ipx' => 'X-Ascend-Handle-IPX'
+  'usr_connect_term_reason' => 'USR-Connect-Term-Reason'
+  'x_ascend_multicast_rate_' => 'X-Ascend-Multicast-Rate-Limit'
+  'h323_disconnect_time' => 'h323-disconnect-time'
+  'acc_ip_gateway_sec' => 'Acc-Ip-Gateway-Sec'
+  'usr_number_of_blers' => 'USR-Number-of-Blers'
+  'x_ascend_fr_type' => 'X-Ascend-FR-Type'
+  'ascend_assign_ip_pool' => 'Ascend-Assign-IP-Pool'
+  'ascend_qos_upstream' => 'Ascend-QOS-Upstream'
+  'usr_nas_type' => 'USR-NAS-Type'
+  'acc_dial_port_index' => 'Acc-Dial-Port-Index'
+  'usr_initial_tx_link_data' => 'USR-Initial-Tx-Link-Data-Rate'
+  'ascend_fr_type' => 'Ascend-FR-Type'
+  'usr_mbi_ct_tdm_time_slot' => 'USR-Mbi_Ct_TDM_Time_Slot'
+  'usr_rmmie_pwrlvl_xmit_lv' => 'USR-RMMIE-PwrLvl-Xmit-Lvl'
+  'erx_atm_service_category' => 'ERX-Atm-Service-Category'
+  'usr_appletalk' => 'USR-Appletalk'
+  'usr_send_script1' => 'USR-Send-Script1'
+  'usr_send_script2' => 'USR-Send-Script2'
+  'usr_send_script3' => 'USR-Send-Script3'
+  'usr_ospf_addressless_ind' => 'USR-OSPF-Addressless-Index'
+  'acct_input_packets' => 'Acct-Input-Packets'
+  'usr_send_script4' => 'USR-Send-Script4'
+  'usr_send_script5' => 'USR-Send-Script5'
+  'usr_send_script6' => 'USR-Send-Script6'
+  'usr_service_option' => 'USR-Service-Option'
+  'ascend_dropped_octets' => 'Ascend-Dropped-Octets'
+  'usr_ip' => 'USR-IP'
+  'usr_tunnel_security' => 'USR-Tunnel-Security'
+  'acc_acct_on_off_reason' => 'Acc-Acct-On-Off-Reason'
+  'shiva_compression_type' => 'Shiva-Compression-Type'
+  'ascend_pw_warntime' => 'Ascend-PW-Warntime'
+  'usr_security_resp_limit' => 'USR-Security-Resp-Limit'
+  'ascend_x25_pad_prompt' => 'Ascend-X25-Pad-Prompt'
+  'cisco_asing_ip_pool' => 'Cisco-Asing-IP-Pool'
+  'acc_route_policy' => 'Acc-Route-Policy'
+  'annex_local_username' => 'Annex-Local-Username'
+  'x_ascend_call_by_call' => 'X-Ascend-Call-By-Call'
+  'ascend_calling_id_screen' => 'Ascend-Calling-Id-Screening'
+  'x_ascend_dhcp_pool_numbe' => 'X-Ascend-DHCP-Pool-Number'
+  'nas_port_type' => 'NAS-Port-Type'
+  'ascend_route_ip' => 'Ascend-Route-IP'
+  'ascend_client_gateway' => 'Ascend-Client-Gateway'
+  'ascend_qos_downstream' => 'Ascend-QOS-Downstream'
+  'ms_bap_usage' => 'MS-BAP-Usage'
+  'usr_vts_session_key' => 'USR-VTS-Session-Key'
+  'usr_receive_acc_map' => 'USR-Receive-Acc-Map'
+  'ascend_expect_callback' => 'Ascend-Expect-Callback'
+  'password' => 'Password'
+  'packet_type' => 'Packet-Type'
+  'ascend_remote_addr' => 'Ascend-Remote-Addr'
+  'ascend_recv_name' => 'Ascend-Recv-Name'
+  'ms_acct_eap_type' => 'MS-Acct-EAP-Type'
+  'usr_filter_zones' => 'USR-Filter-Zones'
+  'annex_output_filter' => 'Annex-Output-Filter'
+  'usr_rmmie_rcv_tot_pwrlvl' => 'USR-RMMIE-Rcv-Tot-PwrLvl'
+  'usr_mp_mrru' => 'USR-MP-MRRU'
+  'ascend_call_filter' => 'Ascend-Call-Filter'
+  'usr_keypress_timeout' => 'USR-Keypress-Timeout'
+  'usr_modem_setup_time' => 'USR-Modem-Setup-Time'
+  'acct_authentic' => 'Acct-Authentic'
+  'pppoe_motm' => 'PPPOE_MOTM'
+  'x_ascend_expect_callback' => 'X-Ascend-Expect-Callback'
+  'erx_atm_scr' => 'ERX-Atm-SCR'
+  'erx_address_pool_name' => 'ERX-Address-Pool-Name'
+  'challenge_state' => 'Challenge-State'
+  'usr_multicast_proxy' => 'USR-Multicast-Proxy'
+  'framed_filter_id' => 'Framed-Filter-Id'
+  'add_suffix' => 'Add-Suffix'
+  'ascend_auth_type' => 'Ascend-Auth-Type'
+  'session_timeout' => 'Session-Timeout'
+  'ascend_callback' => 'Ascend-Callback'
+  'usr_chat_script_name' => 'USR-Chat-Script-Name'
+  'port_message' => 'Port-Message'
+  'acct_output_packets' => 'Acct-Output-Packets'
+  'ascend_session_svr_key' => 'Ascend-Session-Svr-Key'
+  'login_tcp_port' => 'Login-TCP-Port'
+  'erx_tunnel_password' => 'ERX-Tunnel-Password'
+  'shasta_user_privilege' => 'Shasta-User-Privilege'
+  'usr_secondary_nbns_serve' => 'USR-Secondary_NBNS_Server'
+  'usr_security_login_limit' => 'USR-Security-Login-Limit'
+  'usr_start_time' => 'USR-Start-Time'
+  'acc_access_partition' => 'Acc-Access-Partition'
+  'versanet_termination_cau' => 'Versanet-Termination-Cause'
+  'x_ascend_call_block_dura' => 'X-Ascend-Call-Block-Duration'
+  'mcast_maxgroups' => 'Mcast_MaxGroups'
+  'ascend_user_acct_base' => 'Ascend-User-Acct-Base'
+  'usr_vpn_gw_location_id' => 'USR-VPN-GW-Location-Id'
+  'usr_block_error_count_li' => 'USR-Block-Error-Count-Limit'
+  'ascend_telnet_profile' => 'Ascend-Telnet-Profile'
+  'ascend_port_redir_protoc' => 'Ascend-Port-Redir-Protocol'
+  'ascend_call_by_call' => 'Ascend-Call-By-Call'
+  'usr_disconnect_cause_ind' => 'USR-Disconnect-Cause-Indicator'
+  'x_ascend_fr_linkup' => 'X-Ascend-FR-LinkUp'
+  'ascend_billing_number' => 'Ascend-Billing-Number'
+  'usr_ds0s' => 'USR-DS0s'
+  'usr_at_zip_output_filter' => 'USR-AT-Zip-Output-Filter'
+  'ascend_user_acct_port' => 'Ascend-User-Acct-Port'
+  'login_port' => 'Login-Port'
+  'arap_security' => 'ARAP-Security'
+  'tunnel_deadtime' => 'Tunnel_Deadtime'
+  'ascend_user_acct_time' => 'Ascend-User-Acct-Time'
+  'ms_chap_challenge' => 'MS-CHAP-Challenge'
+  'ascend_x25_rpoa' => 'Ascend-X25-Rpoa'
+  'login_time' => 'Login-Time'
+  'current_time' => 'Current-Time'
+  'login_service' => 'Login-Service'
+  'ascend_menu_selector' => 'Ascend-Menu-Selector'
+  'ascend_bacp_enable' => 'Ascend-BACP-Enable'
+  'shiva_link_speed' => 'Shiva-Link-Speed'
+  'ascend_private_route_tab' => 'Ascend-Private-Route-Table-ID'
+  'x_ascend_session_svr_key' => 'X-Ascend-Session-Svr-Key'
+  'ascend_data_filter' => 'Ascend-Data-Filter'
+  'ascend_target_util' => 'Ascend-Target-Util'
+  'shiva_function' => 'Shiva-Function'
+  'usr_pw_usr_ifilter_ip' => 'USR-PW_USR_IFilter_IP'
+  'usr_igmp_routing' => 'USR-IGMP-Routing'
+  'acc_tunnel_port' => 'Acc-Tunnel-Port'
+  'x_ascend_fr_n391' => 'X-Ascend-FR-N391'
+  'medium_type' => 'Medium_Type'
+  'annex_domain_name' => 'Annex-Domain-Name'
+  'ascend_fr_n391' => 'Ascend-FR-N391'
+  'callback_number' => 'Callback-Number'
+  'usr_chassis_temperature' => 'USR-Chassis-Temperature'
+  'dialback_no' => 'Dialback-No'
+  'ms_mppe_recv_key' => 'MS-MPPE-Recv-Key'
+  'ascend_ipx_alias' => 'Ascend-IPX-Alias'
+  'le_nat_inmap' => 'LE-NAT-Inmap'
+  'tunnel_police_rate' => 'Tunnel_Police_Rate'
+  'acct_terminate_cause' => 'Acct-Terminate-Cause'
+  'le_nat_other_session_tim' => 'LE-NAT-Other-Session-Timeout'
+  'usr_ip_rip_output_filter' => 'USR-IP-RIP-Output-Filter'
+  'exec_program' => 'Exec-Program'
+  'h323_disconnect_cause' => 'h323-disconnect-cause'
+  'usr_chassis_call_channel' => 'USR-Chassis-Call-Channel'
+  'x_ascend_fr_dlci' => 'X-Ascend-FR-DLCI'
+  'ms_link_drop_time_limit' => 'MS-Link-Drop-Time-Limit'
+  'acc_callback_num_valid' => 'Acc-Callback-Num-Valid'
+  'cisco_presession_time' => 'Cisco-PreSession-Time'
+  'ms_chap_response' => 'MS-CHAP-Response'
+  'usr_spoofing' => 'USR-Spoofing'
+  'usr_num_fax_pages_proces' => 'USR-Num-Fax-Pages-Processed'
+  'ascend_x25_cug' => 'Ascend-X25-Cug'
+  'ascend_fr_dlci' => 'Ascend-FR-DLCI'
+  'shiva_user_attributes' => 'Shiva-User-Attributes'
+  'ms_chap_lm_enc_pw' => 'MS-CHAP-LM-Enc-PW'
+  'ascend_transit_number' => 'Ascend-Transit-Number'
+  'usr_last_number_dialed_i' => 'USR-Last-Number-Dialed-In-DNIS'
+  'usr_ip_saa_filter' => 'USR-IP-SAA-Filter'
+  'usr_pw_usr_ifilter_ipx' => 'USR-PW_USR_IFilter_IPX'
+  'ascend_remove_seconds' => 'Ascend-Remove-Seconds'
+  'le_connect_detail' => 'LE-Connect-Detail'
+  'ascend_assign_ip_global_' => 'Ascend-Assign-IP-Global-Pool'
+  'proxy_to_realm' => 'Proxy-To-Realm'
+  'usr_retrains_requested' => 'USR-Retrains-Requested'
+  'h323_remote_address' => 'h323-remote-address'
+  'ascend_x25_nui_prompt' => 'Ascend-X25-Nui-Prompt'
+  'acc_customer_id' => 'Acc-Customer-Id'
+  'ms_chap2_response' => 'MS-CHAP2-Response'
+  'ascend_host_info' => 'Ascend-Host-Info'
+  'annex_addr_resolution_se' => 'Annex-Addr-Resolution-Servers'
+  'x_ascend_multilink_id' => 'X-Ascend-Multilink-ID'
+  'login_lat_service' => 'Login-LAT-Service'
+  'usr_rmmie_rcv_pwrlvl_330' => 'USR-RMMIE-Rcv-PwrLvl-3300Hz'
+  'ascend_event_type' => 'Ascend-Event-Type'
+  'ascend_inc_channel_count' => 'Ascend-Inc-Channel-Count'
+  'cisco_ppp_async_map' => 'Cisco-PPP-Async-Map'
+  'usr_min_compression_size' => 'USR-Min-Compression-Size'
+  'ascend_traffic_shaper' => 'Ascend-Traffic-Shaper'
+  'ascend_user_acct_key' => 'Ascend-User-Acct-Key'
+  'usr_port_tap_output' => 'USR-Port-Tap-Output'
+  'ascend_x25_nui' => 'Ascend-X25-Nui'
+  'x_ascend_disconnect_caus' => 'X-Ascend-Disconnect-Cause'
+  'ascend_cbcp_enable' => 'Ascend-CBCP-Enable'
+  'usr_framed_ip_address_po' => 'USR-Framed_IP_Address_Pool_Name'
+  'ascend_x25_profile_name' => 'Ascend-X25-Profile-Name'
+  'usr_orig_nas_type' => 'USR-Orig-NAS-Type'
+  'acc_output_errors' => 'Acc-Output-Errors'
+  'h323_redirect_ip_address' => 'h323-redirect-ip-address'
+  'usr_ip_call_output_filte' => 'USR-IP-Call-Output-Filter'
+  'cisco_avpair' => 'Cisco-AVPair'
+  'usr_slot_connected_to' => 'USR-Slot-Connected-To'
+  'framed_route' => 'Framed-Route'
+  'ascend_global_call_id' => 'Ascend-Global-Call-Id'
+  'x_ascend_seconds_of_hist' => 'X-Ascend-Seconds-Of-History'
+  'x_ascend_temporary_rtes' => 'X-Ascend-Temporary-Rtes'
+  'h323_currency_type' => 'h323-currency-type'
+  'x_ascend_token_expiry' => 'X-Ascend-Token-Expiry'
+  'pvc_encapsulation_type' => 'PVC_Encapsulation_Type'
+  'x_ascend_pw_lifetime' => 'X-Ascend-PW-Lifetime'
+  'usr_expected_voltage' => 'USR-Expected-Voltage'
+  'usr_simplified_v42bis_us' => 'USR-Simplified-V42bis-Usage'
+  'shiva_customer_id' => 'Shiva-Customer-Id'
+  'usr_compression_algorith' => 'USR-Compression-Algorithm'
+  'annex_system_disc_reason' => 'Annex-System-Disc-Reason'
+  'annex_secondary_nbns_ser' => 'Annex-Secondary-NBNS-Server'
+  'usr_q931_call_reference_' => 'USR-Q931-Call-Reference-Value'
+  'usr_send_password' => 'USR-Send-Password'
+  'prompt' => 'Prompt'
+  'usr_cusr_hat_script_rule' => 'USR-CUSR-hat-Script-Rules'
+  'usr_event_id' => 'USR-Event-Id'
+  'usr_ccp_algorithm' => 'USR-CCP-Algorithm'
+  'usr_mbi_ct_bchannel_used' => 'USR-Mbi_Ct_BChannel_Used'
+  'ascend_svc_enabled' => 'Ascend-SVC-Enabled'
+  'framed_mtu' => 'Framed-MTU'
+  'acc_reason_code' => 'Acc-Reason-Code'
+  'bind_l2tp_flow_control' => 'Bind_L2TP_Flow_Control'
+  'ascend_cbcp_delay' => 'Ascend-CBCP-Delay'
+  'le_ipsec_deny_action' => 'LE-IPSec-Deny-Action'
+1;
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 8a4d69347..11e5a3ca4 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -15,6 +15,7 @@ use FS::svc_acct_pop;
 use FS::svc_acct_sm;
 use FS::cust_main_invoice;
 use FS::svc_domain;
+use FS::raddb;
 
 @ISA = qw( FS::svc_Common );
 
@@ -580,8 +581,8 @@ sub radius_reply {
   map {
     /^(radius_(.*))$/;
     my($column, $attrib) = ($1, $2);
-    $attrib =~ s/_/\-/g;
-    ( $attrib, $self->getfield($column) );
+    #$attrib =~ s/_/\-/g;
+    ( $FS::raddb::attrib{lc($attrib)}, $self->getfield($column) );
   } grep { /^radius_/ && $self->getfield($_) } fields( $self->table );
 }
 
@@ -600,8 +601,8 @@ sub radius_check {
   map {
     /^(rc_(.*))$/;
     my($column, $attrib) = ($1, $2);
-    $attrib =~ s/_/\-/g;
-    ( $attrib, $self->getfield($column) );
+    #$attrib =~ s/_/\-/g;
+    ( $FS::raddb:attrib{lc($attrib)}, $self->getfield($column) );
   } grep { /^rc_/ && $self->getfield($_) } fields( $self->table );
 }
 
@@ -637,7 +638,7 @@ sub email {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.31 2001-09-06 21:20:58 ivan Exp $
+$Id: svc_acct.pm,v 1.32 2001-09-07 20:17:49 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 2db053d44..672286aa1 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -50,6 +50,7 @@ FS/prepay_credit.pm
 FS/svc_www.pm
 FS/CGIwrapper.pm
 FS/svc_forward.pm
+FS/raddb.pm
 t/agent.t
 t/agent_type.t
 t/CGI.t
@@ -89,3 +90,4 @@ t/svc_forward.t
 t/svc_www.t
 t/type_pkgs.t
 t/UID.t
+t/raddb.pm
diff --git a/FS/t/raddb.t b/FS/t/raddb.t
new file mode 100644
index 000000000..ac28d0798
--- /dev/null
+++ b/FS/t/raddb.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::raddb;
+$loaded=1;
+print "ok 1\n";
diff --git a/bin/fs-radius-add-check b/bin/fs-radius-add-check
index fadba0165..eedd9b699 100755
--- a/bin/fs-radius-add-check
+++ b/bin/fs-radius-add-check
@@ -5,8 +5,13 @@
 use strict;
 use DBI;
 use FS::UID qw(adminsuidsetup checkeuid getsecrets);
+use FS::raddb;
+
 die "Not running uid freeside!" unless checkeuid();
 
+my %attrib2db =
+  map { $FS::raddb::attrib{lc($_)} => $_ } keys %FS::raddb::attrib;
+
 my $user = shift or die &usage;
 getsecrets($user);
 
@@ -18,7 +23,8 @@ print "\n\n", <<END, ":";
 Enter the additional RADIUS check attributes you need to track for
 each user, separated by whitespace.
 END
-my @attributes = map { s/\-/_/g; $_; } split(" ",&getvalue);
+my @attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
+                   split(" ",&getvalue);
 
 sub getvalue {
   my($x)=scalar(<STDIN>);
diff --git a/bin/fs-radius-add-reply b/bin/fs-radius-add-reply
index 997a8eac7..d2f2e11f0 100755
--- a/bin/fs-radius-add-reply
+++ b/bin/fs-radius-add-reply
@@ -5,8 +5,13 @@
 use strict;
 use DBI;
 use FS::UID qw(adminsuidsetup checkeuid getsecrets);
+use FS::raddb;
+
 die "Not running uid freeside!" unless checkeuid();
 
+my %attrib2db =
+  map { $FS::raddb::attrib{lc($_)} => $_ } keys %FS::raddb::attrib;
+
 my $user = shift or die &usage;
 getsecrets($user);
 
@@ -18,7 +23,8 @@ print "\n\n", <<END, ":";
 Enter the additional RADIUS reply attributes you need to track for
 each user, separated by whitespace.
 END
-my @attributes = map { s/\-/_/g; $_; } split(" ",&getvalue);
+my @attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
+                   split(" ",&getvalue);
 
 sub getvalue {
   my($x)=scalar(<STDIN>);
diff --git a/bin/fs-setup b/bin/fs-setup
index 53d96f692..dc597ccb4 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.54 2001-09-06 20:41:59 ivan Exp $
+# $Id: fs-setup,v 1.55 2001-09-07 20:17:50 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -15,9 +15,13 @@ use DBIx::DBSchema::ColGroup::Index;
 use FS::UID qw(adminsuidsetup datasrc checkeuid getsecrets);
 use FS::Record;
 use FS::cust_main_county;
+use FS::raddb;
 
 die "Not running uid freeside!" unless checkeuid();
 
+my %attrib2db =
+  map { $FS::raddb::attrib{lc($_)} => $_ } keys %FS::raddb::attrib;
+
 my $user = shift or die &usage;
 getsecrets($user);
 
@@ -35,13 +39,15 @@ reply attribute Framed-IP-Address for each user.  You can specify additional
 check and reply attributes.  First enter any additional RADIUS check attributes
 you need to track for each user, separated by whitespace.
 END
-my @check_attributes = map { s/\-/_/g; $_; } split(" ",&getvalue);
+my @check_attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
+                         split(" ",&getvalue);
 
 print "\n\n", <<END, ":";
 Now enter any additional reply attributes you need to track for each user,
 separated by whitespace.
 END
-my @attributes = map { s/\-/_/g; $_; } split(" ",&getvalue);
+my @attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
+                   split(" ",&getvalue);
 
 print "\n\n", <<END, ":";
 Do you wish to enable the tracking of a second, separate shipping/service
diff --git a/bin/generate-raddb b/bin/generate-raddb
new file mode 100755
index 000000000..e9580d645
--- /dev/null
+++ b/bin/generate-raddb
@@ -0,0 +1,35 @@
+#!/usr/bin/perl
+
+# usage: generate-raddb radius-server/raddb/dictionary* >raddb.pm
+#  i.e.: generate-raddb ~/src/freeradius-0.2/raddb/dictionary* >FS/raddb.pm
+
+print <<END;
+package FS::raddb;
+use vars qw(%attrib);
+
+%attrib = (
+END
+
+while (<>) {
+  next if /^(#|\s*$|\$INCLUDE\s+)/;
+  next if /^(VALUE|VENDOR|BEGIN\-VENDOR|END\-VENDOR)\s+/;
+  /^(ATTRIBUTE|ATTRIB_NMC)\s+([\w\-]+)\s+/ or die $_;
+  $attrib = $2;
+  $dbname = lc($2);
+  $dbname =~ s/\-/_/g;
+  $hash{$dbname} = $attrib;
+  #print "$2\n";
+}
+
+foreach ( keys %hash ) {
+#  print "$_\n" if length($_)>24;
+#  print substr($_,0,24),"\n" if length($_)>24; 
+#  $max = length($_) if length($_)>$max;
+#everything >24 is still unique, at least with freeradius comprehensive dataset
+  print "  '". substr($_,0,24). "' => '$hash{$_}'\n";
+}
+
+print <<END;
+1;
+END
+
-- 
cgit v1.2.1


From 244da3a0cb3e83a3cf9888d70e3ecc15dbe10e56 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 7 Sep 2001 20:19:27 +0000
Subject: tyop

---
 FS/MANIFEST | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 672286aa1..ae3e0b0e6 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -90,4 +90,4 @@ t/svc_forward.t
 t/svc_www.t
 t/type_pkgs.t
 t/UID.t
-t/raddb.pm
+t/raddb.t
-- 
cgit v1.2.1


From 7b9a325db80ce49e6bc71e7132cfdf9e900af9cc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 7 Sep 2001 20:26:33 +0000
Subject: tyops

---
 FS/FS/raddb.pm     | 2160 ++++++++++++++++++++++++++--------------------------
 FS/FS/svc_acct.pm  |    4 +-
 bin/generate-raddb |    4 +-
 3 files changed, 1086 insertions(+), 1082 deletions(-)

diff --git a/FS/FS/raddb.pm b/FS/FS/raddb.pm
index 3ccb0dc5b..04389c91b 100644
--- a/FS/FS/raddb.pm
+++ b/FS/FS/raddb.pm
@@ -2,1083 +2,1085 @@ package FS::raddb;
 use vars qw(%attrib);
 
 %attrib = (
-  'ascend_bi_directional_au' => 'Ascend-Bi-Directional-Auth'
-  'h323_connect_time' => 'h323-connect-time'
-  'connect_rate' => 'Connect-Rate'
-  'bind_auth_service_grp' => 'Bind_Auth_Service_Grp'
-  'usr_callback_type' => 'USR-Callback-Type'
-  'erx_primary_wins' => 'ERX-Primary-Wins'
-  'ascend_x25_x121_address' => 'Ascend-X25-X121-Address'
-  'usr_log_filter_packets' => 'USR-Log-Filter-Packets'
-  'annex_addr_resolution_pr' => 'Annex-Addr-Resolution-Protocol'
-  'usr_ip_rip_simple_auth_p' => 'USR-IP-RIP-Simple-Auth-Password'
-  'dialback_name' => 'Dialback-Name'
-  'x_ascend_fr_dce_n392' => 'X-Ascend-FR-DCE-N392'
-  'usr_host_type' => 'USR-Host-Type'
-  'le_modem_info' => 'LE-Modem-Info'
-  'x_ascend_menu_selector' => 'X-Ascend-Menu-Selector'
-  'x_ascend_fr_dce_n393' => 'X-Ascend-FR-DCE-N393'
-  'ascend_ip_direct' => 'Ascend-IP-Direct'
-  'x_ascend_pre_output_octe' => 'X-Ascend-Pre-Output-Octets'
-  'x_ascend_ft1_caller' => 'X-Ascend-FT1-Caller'
-  'usr_last_callers_number_' => 'USR-Last-Callers-Number-ANI'
-  'usr_rmmie_product_code' => 'USR-RMMIE-Product-Code'
-  'usr_igmp_robustness' => 'USR-IGMP-Robustness'
-  'ms_chap2_success' => 'MS-CHAP2-Success'
-  'ascend_home_agent_passwo' => 'Ascend-Home-Agent-Password'
-  'acc_bridging_support' => 'Acc-Bridging-Support'
-  'annex_transmit_speed' => 'Annex-Transmit-Speed'
-  'old_password' => 'Old-Password'
-  'x_ascend_metric' => 'X-Ascend-Metric'
-  'acc_clearing_location' => 'Acc-Clearing-Location'
-  'ascend_multilink_id' => 'Ascend-Multilink-ID'
-  'ascend_egress_enabled' => 'Ascend-Egress-Enabled'
-  'usr_bridging' => 'USR-Bridging'
-  'ascend_assign_ip_server' => 'Ascend-Assign-IP-Server'
-  'acc_dns_server_sec' => 'Acc-Dns-Server-Sec'
-  'ascend_home_agent_ip_add' => 'Ascend-Home-Agent-IP-Addr'
-  'usr_dnis_reauthenticatio' => 'USR-DNIS-ReAuthentication'
-  'acc_modem_error_protocol' => 'Acc-Modem-Error-Protocol'
-  'ascend_backup' => 'Ascend-Backup'
-  'usr_connect_time' => 'USR-Connect-Time'
-  'ascend_cbcp_mode' => 'Ascend-CBCP-Mode'
-  'usr_rmmie_x2_status' => 'USR-RMMIE-x2-Status'
-  'ascend_multicast_gleave_' => 'Ascend-Multicast-GLeave-Delay'
-  'erx_ingress_statistics' => 'ERX-Ingress-Statistics'
-  'cisco_nas_port' => 'Cisco-NAS-Port'
-  'le_admin_group' => 'LE-Admin-Group'
-  'annex_mrru' => 'Annex-MRRU'
-  'x_ascend_add_seconds' => 'X-Ascend-Add-Seconds'
-  'ascend_token_expiry' => 'Ascend-Token-Expiry'
-  'usr_igmp_maximum_respons' => 'USR-IGMP-Maximum-Response-Time'
-  'ascend_calling_id_presen' => 'Ascend-Calling-Id-Presentatn'
-  'connect_info' => 'Connect-Info'
-  'ascend_access_intercept_' => 'Ascend-Access-Intercept-LEA'
-  'x_ascend_dba_monitor' => 'X-Ascend-DBA-Monitor'
-  'client_dns_pri' => 'Client_DNS_Pri'
-  'ip_host_addr' => 'Ip_Host_Addr'
-  'callback_id' => 'Callback-Id'
-  'acct_mcast_out_octets' => 'Acct_Mcast_Out_Octets'
-  'acct_input_octets_64' => 'Acct_Input_Octets_64'
-  'tunnel_function' => 'Tunnel_Function'
-  'ascend_fr_direct_profile' => 'Ascend-FR-Direct-Profile'
-  'h323_incoming_conf_id' => 'h323-incoming-conf-id'
-  'ascend_ppp_vj_1172' => 'Ascend-PPP-VJ-1172'
-  'ms_new_arap_password' => 'MS-New-ARAP-Password'
-  'h323_voice_quality' => 'h323-voice-quality'
-  'framed_appletalk_network' => 'Framed-AppleTalk-Network'
-  'bind_int_interface_name' => 'Bind_Int_Interface_Name'
-  'event_timestamp' => 'Event-Timestamp'
-  'ascend_bir_enable' => 'Ascend-BIR-Enable'
-  'usr_fallback_enabled' => 'USR-Fallback-Enabled'
-  'ascend_dhcp_pool_number' => 'Ascend-DHCP-Pool-Number'
-  'acct_session_id' => 'Acct-Session-Id'
-  'ascend_private_route_req' => 'Ascend-Private-Route-Required'
-  'usr_rmmie_pwrlvl_farecho' => 'USR-RMMIE-PwrLvl-FarEcho-Canc'
-  'usr_at_input_filter' => 'USR-AT-Input-Filter'
-  'erx_egress_statistics' => 'ERX-Egress-Statistics'
-  'x_ascend_call_type' => 'X-Ascend-Call-Type'
-  'acct_tunnel_client_endpo' => 'Acct-Tunnel-Client-Endpoint'
-  'x_ascend_assign_ip_clien' => 'X-Ascend-Assign-IP-Client'
-  'ascend_if_netmask' => 'Ascend-IF-Netmask'
-  'ascend_dhcp_maximum_leas' => 'Ascend-DHCP-Maximum-Leases'
-  'usr_at_output_filter' => 'USR-AT-Output-Filter'
-  'usr_rad_dvmrp_metric' => 'USR-Rad-Dvmrp-Metric'
-  'rate_limit_rate' => 'Rate_Limit_Rate'
-  'prefix' => 'Prefix'
-  'ascend_x25_pad_banner' => 'Ascend-X25-Pad-Banner'
-  'usr_rmmie_rcv_pwrlvl_375' => 'USR-RMMIE-Rcv-PwrLvl-3750Hz'
-  'x_ascend_user_acct_key' => 'X-Ascend-User-Acct-Key'
-  'group_name' => 'Group-Name'
-  'ascend_receive_secret' => 'Ascend-Receive-Secret'
-  'reply_message' => 'Reply-Message'
-  'le_nat_sess_dir_fail_act' => 'LE-NAT-Sess-Dir-Fail-Action'
-  'framed_callback_id' => 'Framed-Callback-Id'
-  'cisco_disconnect_cause' => 'Cisco-Disconnect-Cause'
-  'stripped_user_name' => 'Stripped-User-Name'
-  'annex_keypress_timeout' => 'Annex-Keypress-Timeout'
-  'annex_receive_speed' => 'Annex-Receive-Speed'
-  'ms_chap_domain' => 'MS-CHAP-Domain'
-  'ascend_atm_connect_group' => 'Ascend-ATM-Connect-Group'
-  'usr_send_name' => 'USR-Send-Name'
-  'usr_local_framed_ip_addr' => 'USR-Local-Framed-IP-Addr'
-  'erx_alternate_cli_vroute' => 'ERX-Alternate-Cli-Vrouter-Name'
-  'usr_fallback_limit' => 'USR-Fallback-Limit'
-  'ascend_pri_number_type' => 'Ascend-PRI-Number-Type'
-  'x_ascend_minimum_channel' => 'X-Ascend-Minimum-Channels'
-  'x_ascend_fr_direct_dlci' => 'X-Ascend-FR-Direct-DLCI'
-  'ascend_fr_link_mgt' => 'Ascend-FR-Link-Mgt'
-  'annex_host_allow' => 'Annex-Host-Allow'
-  'x_ascend_force_56' => 'X-Ascend-Force-56'
-  'police_burst' => 'Police_Burst'
-  'pvc_profile_name' => 'PVC_Profile_Name'
-  'ms_filter' => 'MS-Filter'
-  'rate_limit_burst' => 'Rate_Limit_Burst'
-  'ascend_number_sessions' => 'Ascend-Number-Sessions'
-  'cisco_call_filter' => 'Cisco-Call-Filter'
-  'erx_igmp_enable' => 'ERX-Igmp-Enable'
-  'ascend_filter_required' => 'Ascend-Filter-Required'
-  'erx_cli_allow_all_vr_acc' => 'ERX-Cli-Allow-All-VR-Access'
-  'acc_callback_delay' => 'Acc-Callback-Delay'
-  'usr_default_dte_data_rat' => 'USR-Default-DTE-Data-Rate'
-  'le_ip_pool' => 'LE-IP-Pool'
-  'cisco_pre_output_packets' => 'Cisco-Pre-Output-Packets'
-  'x_ascend_group' => 'X-Ascend-Group'
-  'usr_channel_connected_to' => 'USR-Channel-Connected-To'
-  'usr_ipx_rip_output_filte' => 'USR-IPX-RIP-Output-Filter'
-  'usr_esn' => 'USR-ESN'
-  'annex_user_level' => 'Annex-User-Level'
-  'x_ascend_primary_home_ag' => 'X-Ascend-Primary-Home-Agent'
-  'no_such_attribute' => 'No-Such-Attribute'
-  'x_ascend_pri_number_type' => 'X-Ascend-PRI-Number-Type'
-  'ms_mppe_send_key' => 'MS-MPPE-Send-Key'
-  'usr_actual_voltage' => 'USR-Actual-Voltage'
-  'annex_acct_servers' => 'Annex-Acct-Servers'
-  'ascend_handle_ipx' => 'Ascend-Handle-IPX'
-  'cisco_xmit_rate' => 'Cisco-Xmit-Rate'
-  'acc_service_profile' => 'Acc-Service-Profile'
-  'x_ascend_ara_pw' => 'X-Ascend-Ara-PW'
-  'ascend_ckt_type' => 'Ascend-Ckt-Type'
-  'cisco_data_rate' => 'Cisco-Data-Rate'
-  'group' => 'Group'
-  'nas_port' => 'NAS-Port'
-  'usr_ipx_call_output_filt' => 'USR-IPX-Call-Output-Filter'
-  'tunnel_type' => 'Tunnel-Type'
-  'usr_rmmie_manufacturer_i' => 'USR-RMMIE-Manufacturer-ID'
-  'user_name_is_star' => 'User-Name-Is-Star'
-  'usr_call_arrival_in_gmt' => 'USR-Call-Arrival-in-GMT'
-  'x_ascend_number_sessions' => 'X-Ascend-Number-Sessions'
-  'ascend_send_auth' => 'Ascend-Send-Auth'
-  'user_service_type' => 'User-Service-Type'
-  'annex_cli_filter' => 'Annex-CLI-Filter'
-  'erx_cli_initial_access_l' => 'ERX-Cli-Initial-Access-Level'
-  'ascend_call_direction' => 'Ascend-Call-Direction'
-  'usr_chassis_temp_thresho' => 'USR-Chassis-Temp-Threshold'
-  'usr_pw_usr_ofilter_ipx' => 'USR-PW_USR_OFilter_IPX'
-  'tunnel_session_auth' => 'Tunnel_Session_Auth'
-  'x_ascend_connect_progres' => 'X-Ascend-Connect-Progress'
-  'ascend_atm_connect_vci' => 'Ascend-ATM-Connect-Vci'
-  'x_ascend_maximum_call_du' => 'X-Ascend-Maximum-Call-Duration'
-  'usr_rmmie_planned_discon' => 'USR-RMMIE-Planned-Disconnect'
-  'x_ascend_fr_dte_n392' => 'X-Ascend-FR-DTE-N392'
-  'login_host' => 'Login-Host'
-  'ascend_user_acct_host' => 'Ascend-User-Acct-Host'
-  'x_ascend_fr_dte_n393' => 'X-Ascend-FR-DTE-N393'
-  'acc_tunnel_secret' => 'Acc-Tunnel-Secret'
-  'usr_at_rtmp_input_filter' => 'USR-AT-RTMP-Input-Filter'
-  'framed_protocol' => 'Framed-Protocol'
-  'login_callback_number' => 'Login-Callback-Number'
-  'ascend_dsl_rate_type' => 'Ascend-Dsl-Rate-Type'
-  'ascend_pre_output_packet' => 'Ascend-Pre-Output-Packets'
-  'proxy_state' => 'Proxy-State'
-  'usr_pw_usr_ofilter_ip' => 'USR-PW_USR_OFilter_IP'
-  'cisco_data_filter' => 'Cisco-Data-Filter'
-  'cisco_target_util' => 'Cisco-Target-Util'
-  'usr_ids0_call_type' => 'USR-IDS0-Call-Type'
-  'usr_blocks_resent' => 'USR-Blocks-Resent'
-  'usr_terminal_type' => 'USR-Terminal-Type'
-  'ascend_history_weigh_typ' => 'Ascend-History-Weigh-Type'
-  'framed_routing' => 'Framed-Routing'
-  'ascend_client_assign_dns' => 'Ascend-Client-Assign-DNS'
-  'ascend_atm_group' => 'Ascend-ATM-Group'
-  'bind_bypass_bypass' => 'Bind_Bypass_Bypass'
-  'le_ip_gateway' => 'LE-IP-Gateway'
-  'cisco_ip_pool_definition' => 'Cisco-IP-Pool-Definition'
-  'x_ascend_maximum_time' => 'X-Ascend-Maximum-Time'
-  'usr_request_type' => 'USR-Request-Type'
-  'usr_call_arrival_time' => 'USR-Call-Arrival-Time'
-  'tunnel_domain' => 'Tunnel_Domain'
-  'ms_chap_nt_enc_pw' => 'MS-CHAP-NT-Enc-PW'
-  'shiva_calling_number' => 'Shiva-Calling-Number'
-  'ip_address_pool_name' => 'Ip_Address_Pool_Name'
-  'erx_secondary_dns' => 'ERX-Secondary-Dns'
-  'x_ascend_pre_input_octet' => 'X-Ascend-Pre-Input-Octets'
-  'ascend_home_agent_udp_po' => 'Ascend-Home-Agent-UDP-Port'
-  'le_nat_outsource_inmap' => 'LE-NAT-Outsource-Inmap'
-  'x_ascend_home_agent_pass' => 'X-Ascend-Home-Agent-Password'
-  'tunnel_password' => 'Tunnel-Password'
-  'usr_compression_type' => 'USR-Compression-Type'
-  'usr_connect_speed' => 'USR-Connect-Speed'
-  'usr_connect_time_limit' => 'USR-Connect-Time-Limit'
-  'arap_challenge_response' => 'ARAP-Challenge-Response'
-  'ms_link_utilization_thre' => 'MS-Link-Utilization-Threshold'
-  'usr_mp_edo' => 'USR-MP-EDO'
-  'usr_primary_nbns_server' => 'USR-Primary_NBNS_Server'
-  'usr_imsi' => 'USR-IMSI'
-  'ascend_fr_direct' => 'Ascend-FR-Direct'
-  'ascend_vrouter_name' => 'Ascend-VRouter-Name'
-  'ascend_preempt_limit' => 'Ascend-Preempt-Limit'
-  'ascend_ip_pool_definitio' => 'Ascend-IP-Pool-Definition'
-  'h323_gw_id' => 'h323-gw-id'
-  'usr_framed_ipx_route' => 'USR-Framed-IPX-Route'
-  'x_ascend_maximum_channel' => 'X-Ascend-Maximum-Channels'
-  'login_lat_node' => 'Login-LAT-Node'
-  'acct_session_time' => 'Acct-Session-Time'
-  'ascend_disconnect_cause' => 'Ascend-Disconnect-Cause'
-  'ms_mppe_encryption_polic' => 'MS-MPPE-Encryption-Policy'
-  'ms_ras_version' => 'MS-RAS-Version'
-  'class' => 'Class'
-  'caller_id' => 'Caller-ID'
-  'ascend_access_intercept_' => 'Ascend-Access-Intercept-Log'
-  'ascend_service_type' => 'Ascend-Service-Type'
-  'ascend_h323_dialed_time' => 'Ascend-H323-Dialed-Time'
-  'exec_program_wait' => 'Exec-Program-Wait'
-  'ascend_x25_nui_password_' => 'Ascend-X25-Nui-Password-Prompt'
-  'ascend_appletalk_peer_mo' => 'Ascend-Appletalk-Peer-Mode'
-  'login_lat_group' => 'Login-LAT-Group'
-  'strip_user_name' => 'Strip-User-Name'
-  'nas_ip_address' => 'NAS-IP-Address'
-  'ascend_maximum_time' => 'Ascend-Maximum-Time'
-  'erx_atm_pcr' => 'ERX-Atm-PCR'
-  'ascend_client_primary_dn' => 'Ascend-Client-Primary-DNS'
-  'auth_type' => 'Auth-Type'
-  'ascend_secondary_home_ag' => 'Ascend-Secondary-Home-Agent'
-  'x_ascend_idle_limit' => 'X-Ascend-Idle-Limit'
-  'ms_ras_vendor' => 'MS-RAS-Vendor'
-  'ascend_pre_input_packets' => 'Ascend-Pre-Input-Packets'
-  'ascend_bridge' => 'Ascend-Bridge'
-  'h323_redirect_number' => 'h323-redirect-number'
-  'usr_simplified_mnp_level' => 'USR-Simplified-MNP-Levels'
-  'annex_edo' => 'Annex-EDO'
-  'acc_nbns_server_sec' => 'Acc-Nbns-Server-Sec'
-  'ascend_cbcp_trunk_group' => 'Ascend-CBCP-Trunk-Group'
-  'x_ascend_data_svc' => 'X-Ascend-Data-Svc'
-  'le_terminate_detail' => 'LE-Terminate-Detail'
-  'acct_output_octets' => 'Acct-Output-Octets'
-  'usr_calling_party_number' => 'USR-Calling-Party-Number'
-  'x_ascend_dhcp_maximum_le' => 'X-Ascend-DHCP-Maximum-Leases'
-  'ascend_force_56' => 'Ascend-Force-56'
-  'shiva_acct_serv_switch' => 'Shiva-Acct-Serv-Switch'
-  'tunnel_algorithm' => 'Tunnel_Algorithm'
-  'usr_max_channels' => 'USR-Max-Channels'
-  'usr_port_tap_priority' => 'USR-Port-Tap-Priority'
-  'le_nat_outmap' => 'LE-NAT-Outmap'
-  'usr_call_connecting_time' => 'USR-Call-Connecting-Time'
-  'usr_supports_tags' => 'USR-Supports-Tags'
-  'idle_timeout' => 'Idle-Timeout'
-  'usr_ip_rip_input_filter' => 'USR-IP-RIP-Input-Filter'
-  'erx_ingress_policy_name' => 'ERX-Ingress-Policy-Name'
-  'usr_pw_cutoff' => 'USR-PW_Cutoff'
-  'usr_channel_expansion' => 'USR-Channel-Expansion'
-  'x_ascend_send_secret' => 'X-Ascend-Send-Secret'
-  'h323_call_origin' => 'h323-call-origin'
-  'h323_preferred_lang' => 'h323-preferred-lang'
-  'ascend_base_channel_coun' => 'Ascend-Base-Channel-Count'
-  'bind_auth_context' => 'Bind_Auth_Context'
-  'ascend_calling_id_number' => 'Ascend-Calling-Id-Number-Plan'
-  'ascend_modem_shelfno' => 'Ascend-Modem-ShelfNo'
-  'tunnel_police_burst' => 'Tunnel_Police_Burst'
-  'pvc_circuit_padding' => 'PVC_Circuit_Padding'
-  'acc_ml_call_threshold' => 'Acc-ML-Call-Threshold'
-  'usr_end_time' => 'USR-End-Time'
-  'usr_ipx' => 'USR-IPX'
-  'ms_primary_dns_server' => 'MS-Primary-DNS-Server'
-  'ascend_dsl_upstream_limi' => 'Ascend-Dsl-Upstream-Limit'
-  'usr_blocks_sent' => 'USR-Blocks-Sent'
-  'bind_dot1q_vlan_tag_id' => 'Bind_Dot1q_Vlan_Tag_Id'
-  'ascend_private_route' => 'Ascend-Private-Route'
-  'usr_back_channel_data_ra' => 'USR-Back-Channel-Data-Rate'
-  'ascend_dropped_packets' => 'Ascend-Dropped-Packets'
-  'cisco_route_ip' => 'Cisco-Route-IP'
-  'nas_identifier' => 'NAS-Identifier'
-  'ascend_presession_time' => 'Ascend-PreSession-Time'
-  'usr_call_type' => 'USR-Call-Type'
-  'usr_acct_reason_code' => 'USR-Acct-Reason-Code'
-  'acc_dialout_auth_passwor' => 'Acc-Dialout-Auth-Password'
-  'acc_connect_tx_speed' => 'Acc-Connect-Tx-Speed'
-  'cisco_pre_input_octets' => 'Cisco-Pre-Input-Octets'
-  'x_ascend_send_passwd' => 'X-Ascend-Send-Passwd'
-  'ascend_bir_bridge_group' => 'Ascend-BIR-Bridge-Group'
-  'ascend_fr_profile_name' => 'Ascend-FR-Profile-Name'
-  'ascend_group' => 'Ascend-Group'
-  'crypt_password' => 'Crypt-Password'
-  'usr_port_tap_address' => 'USR-Port-Tap-Address'
-  'le_nat_outsource_outmap' => 'LE-NAT-Outsource-Outmap'
-  'usr_vpn_encrypter' => 'USR-VPN-Encrypter'
-  'usr_blocks_received' => 'USR-Blocks-Received'
-  'tunnel_group' => 'Tunnel_Group'
-  'ascend_shared_profile_en' => 'Ascend-Shared-Profile-Enable'
-  'replicate_to_realm' => 'Replicate-To-Realm'
-  'usr_mobile_ip_address' => 'USR-Mobile-IP-Address'
-  'x_ascend_authen_alias' => 'X-Ascend-Authen-Alias'
-  'ascend_fr_linkup' => 'Ascend-FR-LinkUp'
-  'tunnel_rate_limit_rate' => 'Tunnel_Rate_Limit_Rate'
-  'acc_access_community' => 'Acc-Access-Community'
-  'x_ascend_presession_time' => 'X-Ascend-PreSession-Time'
-  'ms_chap_cpw_1' => 'MS-CHAP-CPW-1'
-  'ms_chap_cpw_2' => 'MS-CHAP-CPW-2'
-  'erx_primary_dns' => 'ERX-Primary-Dns'
-  'ascend_fr_circuit_name' => 'Ascend-FR-Circuit-Name'
-  'ascend_token_immediate' => 'Ascend-Token-Immediate'
-  'cisco_idle_limit' => 'Cisco-Idle-Limit'
-  'usr_speed_of_connection' => 'USR-Speed-Of-Connection'
-  'shiva_links_in_bundle' => 'Shiva-Links-In-Bundle'
-  'x_ascend_fr_profile_name' => 'X-Ascend-FR-Profile-Name'
-  'cisco_multilink_id' => 'Cisco-Multilink-ID'
-  'x_ascend_preempt_limit' => 'X-Ascend-Preempt-Limit'
-  'ascend_assign_ip_client' => 'Ascend-Assign-IP-Client'
-  'usr_iwf_ip_address' => 'USR-IWF-IP-Address'
-  'acct_unique_session_id' => 'Acct-Unique-Session-Id'
-  'framed_pool' => 'Framed-Pool'
-  'usr_igmp_version' => 'USR-IGMP-Version'
-  'tunnel_max_tunnels' => 'Tunnel_Max_Tunnels'
-  'annex_unauthenticated_ti' => 'Annex-Unauthenticated-Time'
-  'bg_path_cost' => 'BG_Path_Cost'
-  'ascend_client_assign_win' => 'Ascend-Client-Assign-WINS'
-  'x_ascend_dial_number' => 'X-Ascend-Dial-Number'
-  'cisco_maximum_channels' => 'Cisco-Maximum-Channels'
-  'usr_pw_framed_routing_v2' => 'USR-PW_Framed_Routing_V2'
-  'usr_channel_decrement' => 'USR-Channel-Decrement'
-  'x_ascend_route_ipx' => 'X-Ascend-Route-IPX'
-  'port_limit' => 'Port-Limit'
-  'ascend_dsl_downstream_li' => 'Ascend-Dsl-Downstream-Limit'
-  'ascend_ip_tos_precedence' => 'Ascend-IP-TOS-Precedence'
-  'usr_multicast_receive' => 'USR-Multicast-Receive'
-  'usr_auth_mode' => 'USR-Auth-Mode'
-  'expiration' => 'Expiration'
-  'x_ascend_fr_circuit_name' => 'X-Ascend-FR-Circuit-Name'
-  'x_ascend_token_immediate' => 'X-Ascend-Token-Immediate'
-  'ascend_ft1_caller' => 'Ascend-FT1-Caller'
-  'shiva_event_flags' => 'Shiva-Event-Flags'
-  'framed_netmask' => 'Framed-Netmask'
-  'ascend_minimum_channels' => 'Ascend-Minimum-Channels'
-  'acc_ml_damping_factor' => 'Acc-ML-Damping-Factor'
-  'bind_sub_password' => 'Bind_Sub_Password'
-  'ascend_ip_tos_apply_to' => 'Ascend-IP-TOS-Apply-To'
-  'x_ascend_home_agent_udp_' => 'X-Ascend-Home-Agent-UDP-Port'
-  'x_ascend_menu_item' => 'X-Ascend-Menu-Item'
-  'ascend_session_type' => 'Ascend-Session-Type'
-  'usr_pw_packet' => 'USR-PW_Packet'
-  'session' => 'Session'
-  'usr_mic' => 'USR-MIC'
-  'usr_line_reversals' => 'USR-Line-Reversals'
-  'assigned_ip_address' => 'Assigned_IP_Address'
-  'cisco_ip_direct' => 'Cisco-IP-Direct'
-  'le_ipsec_log_options' => 'LE-IPSec-Log-Options'
-  'tunnel_rate_limit_burst' => 'Tunnel_Rate_Limit_Burst'
-  'x_ascend_assign_ip_globa' => 'X-Ascend-Assign-IP-Global-Pool'
-  'x_ascend_inc_channel_cou' => 'X-Ascend-Inc-Channel-Count'
-  'h323_return_code' => 'h323-return-code'
-  'shiva_disconnect_reason' => 'Shiva-Disconnect-Reason'
-  'filter_id' => 'Filter-Id'
-  'usr_appletalk_network_ra' => 'USR-Appletalk-Network-Range'
-  'ascend_temporary_rtes' => 'Ascend-Temporary-Rtes'
-  'ascend_h323_conference_i' => 'Ascend-H323-Conference-Id'
-  'h323_billing_model' => 'h323-billing-model'
-  'usr_bearer_capabilities' => 'USR-Bearer-Capabilities'
-  'framed_appletalk_zone' => 'Framed-AppleTalk-Zone'
-  'usr_harc_disconnect_code' => 'USR-HARC-Disconnect-Code'
-  'usr_ipx_rip_input_filter' => 'USR-IPX-RIP-Input-Filter'
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Bound'
-  'ascend_pw_lifetime' => 'Ascend-PW-Lifetime'
-  'acc_dialout_auth_usernam' => 'Acc-Dialout-Auth-Username'
-  'ascend_x25_pad_x3_parame' => 'Ascend-X25-Pad-X3-Parameters'
-  'bind_dot1q_slot' => 'Bind_Dot1q_Slot'
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-RtLim'
-  'x_ascend_multicast_clien' => 'X-Ascend-Multicast-Client'
-  'ascend_authen_alias' => 'Ascend-Authen-Alias'
-  'ascend_dec_channel_count' => 'Ascend-Dec-Channel-Count'
-  'dhcp_max_leases' => 'DHCP_Max_Leases'
-  'shiva_called_number' => 'Shiva-Called-Number'
-  'annex_tunnel_authen_mode' => 'Annex-Tunnel-Authen-Mode'
-  'usr_call_error_code' => 'USR-Call-Error-Code'
-  'x_ascend_user_acct_type' => 'X-Ascend-User-Acct-Type'
-  'ascend_atm_connect_vpi' => 'Ascend-ATM-Connect-Vpi'
-  'ascend_x25_pad_x3_profil' => 'Ascend-X25-Pad-X3-Profile'
-  'usr_mobileip_home_agent_' => 'USR-MobileIP-Home-Agent-Address'
-  'suffix' => 'Suffix'
-  'bind_tun_context' => 'Bind_Tun_Context'
-  'x_ascend_ppp_address' => 'X-Ascend-PPP-Address'
-  'usr_dtr_false_timeout' => 'USR-DTR-False-Timeout'
-  'usr_final_rx_link_data_r' => 'USR-Final-Rx-Link-Data-Rate'
-  'ms_chap_error' => 'MS-CHAP-Error'
-  'x_ascend_home_agent_ip_a' => 'X-Ascend-Home-Agent-IP-Addr'
-  'ascend_data_svc' => 'Ascend-Data-Svc'
-  'usr_rmmie_pwrlvl_noise_l' => 'USR-RMMIE-PwrLvl-Noise-Lvl'
-  'usr_dtr_true_timeout' => 'USR-DTR-True-Timeout'
-  'context_name' => 'Context-Name'
-  'usr_card_type' => 'USR-Card-Type'
-  'ascend_fr_link_status_dl' => 'Ascend-FR-Link-Status-DLCI'
-  'annex_sec_profile_index' => 'Annex-Sec-Profile-Index'
-  'usr_pw_usr_ofilter_sap' => 'USR-PW_USR_OFilter_SAP'
-  'tunnel_medium_type' => 'Tunnel-Medium-Type'
-  'x_ascend_require_auth' => 'X-Ascend-Require-Auth'
-  'ascend_connect_progress' => 'Ascend-Connect-Progress'
-  'x_ascend_modem_shelfno' => 'X-Ascend-Modem-ShelfNo'
-  'cisco_pre_input_packets' => 'Cisco-Pre-Input-Packets'
-  'ascend_fr_dce_n392' => 'Ascend-FR-DCE-N392'
-  'ascend_fr_dce_n393' => 'Ascend-FR-DCE-N393'
-  'ascend_client_primary_wi' => 'Ascend-Client-Primary-WINS'
-  'shiva_link_protocol' => 'Shiva-Link-Protocol'
-  'bridge_group' => 'Bridge_Group'
-  'client_port_dnis' => 'Client-Port-DNIS'
-  'usr_mpip_tunnel_originat' => 'USR-MPIP-Tunnel-Originator'
-  'le_nat_log_options' => 'LE-NAT-Log-Options'
-  'usr_number_of_rings_limi' => 'USR-Number-of-Rings-Limit'
-  'usr_retrains_granted' => 'USR-Retrains-Granted'
-  'acc_ip_gateway_pri' => 'Acc-Ip-Gateway-Pri'
-  'usr_number_of_fallbacks' => 'USR-Number-of-Fallbacks'
-  'usr_tunnel_auth_hostname' => 'USR-Tunnel-Auth-Hostname'
-  'annex_filter' => 'Annex-Filter'
-  'ascend_mtu' => 'Ascend-MTU'
-  'ms_arap_pw_change_reason' => 'MS-ARAP-PW-Change-Reason'
-  'private_group_id' => 'Private-Group-Id'
-  'ascend_cache_time' => 'Ascend-Cache-Time'
-  'acc_ml_clear_threshold' => 'Acc-ML-Clear-Threshold'
-  'x_ascend_dhcp_reply' => 'X-Ascend-DHCP-Reply'
-  'ascend_h323_gatekeeper' => 'Ascend-H323-Gatekeeper'
-  'x_ascend_xmit_rate' => 'X-Ascend-Xmit-Rate'
-  'usr_last_number_dialed_o' => 'USR-Last-Number-Dialed-Out'
-  'acc_connect_rx_speed' => 'Acc-Connect-Rx-Speed'
-  'acc_clearing_cause' => 'Acc-Clearing-Cause'
-  'ascend_call_attempt_limi' => 'Ascend-Call-Attempt-Limit'
-  'x_ascend_data_rate' => 'X-Ascend-Data-Rate'
-  'termination_action' => 'Termination-Action'
-  'ascend_pre_input_octets' => 'Ascend-Pre-Input-Octets'
-  'x_ascend_ipx_route' => 'X-Ascend-IPX-Route'
-  'x_ascend_ts_idle_mode' => 'X-Ascend-TS-Idle-Mode'
-  'client_ip_address' => 'Client-IP-Address'
-  'ascend_add_seconds' => 'Ascend-Add-Seconds'
-  'login_ip_host' => 'Login-IP-Host'
-  'annex_sw_version' => 'Annex-SW-Version'
-  'huntgroup_name' => 'Huntgroup-Name'
-  'usr_pw_vpn_gateway' => 'USR-PW_VPN_Gateway'
-  'ascend_x25_reverse_charg' => 'Ascend-X25-Reverse-Charging'
-  'lac_real_port' => 'LAC_Real_Port'
-  'ascend_dba_monitor' => 'Ascend-DBA-Monitor'
-  'annex_user_server_locati' => 'Annex-User-Server-Location'
-  'ascend_h323_fegw_address' => 'Ascend-H323-Fegw-Address'
-  'acct_output_gigawords' => 'Acct-Output-Gigawords'
-  'bind_l2tp_tunnel_name' => 'Bind_L2TP_Tunnel_Name'
-  'x_ascend_token_idle' => 'X-Ascend-Token-Idle'
-  'acc_apsm_oversubscribed' => 'Acc-Apsm-Oversubscribed'
-  'ip_tos_field' => 'IP_TOS_Field'
-  'ascend_dsl_cir_xmit_limi' => 'Ascend-Dsl-CIR-Xmit-Limit'
-  'usr_number_of_link_naks' => 'USR-Number-of-Link-NAKs'
-  'framed_address' => 'Framed-Address'
-  'x_ascend_num_in_multilin' => 'X-Ascend-Num-In-Multilink'
-  'hint' => 'Hint'
-  'ascend_source_ip_check' => 'Ascend-Source-IP-Check'
-  'arap_zone_access' => 'ARAP-Zone-Access'
-  'x_ascend_fr_direct_profi' => 'X-Ascend-FR-Direct-Profile'
-  'x_ascend_bridge_address' => 'X-Ascend-Bridge-Address'
-  'usr_iwf_call_identifier' => 'USR-IWF-Call-Identifier'
-  'ascend_home_network_name' => 'Ascend-Home-Network-Name'
-  'ascend_require_auth' => 'Ascend-Require-Auth'
-  'source_validation' => 'Source_Validation'
-  'ms_primary_nbns_server' => 'MS-Primary-NBNS-Server'
-  'h323_setup_time' => 'h323-setup-time'
-  'tunnel_remote_name' => 'Tunnel_Remote_Name'
-  'ascend_maximum_channels' => 'Ascend-Maximum-Channels'
-  'ascend_tunneling_protoco' => 'Ascend-Tunneling-Protocol'
-  'arap_security_data' => 'ARAP-Security-Data'
-  'ascend_ipx_peer_mode' => 'Ascend-IPX-Peer-Mode'
-  'ascend_cir_timer' => 'Ascend-CIR-Timer'
-  'ascend_ts_idle_limit' => 'Ascend-TS-Idle-Limit'
-  'ascend_cache_refresh' => 'Ascend-Cache-Refresh'
-  'usr_rmmie_status' => 'USR-RMMIE-Status'
-  'annex_callback_portlist' => 'Annex-Callback-Portlist'
-  'usr_port_tap' => 'USR-Port-Tap'
-  'ascend_client_secondary_' => 'Ascend-Client-Secondary-DNS'
-  'x_ascend_first_dest' => 'X-Ascend-First-Dest'
-  'lac_port' => 'LAC_Port'
-  'acc_callback_cbcp_type' => 'Acc-Callback-CBCP-Type'
-  'usr_call_reference_numbe' => 'USR-Call-Reference-Number'
-  'mcast_receive' => 'Mcast_Receive'
-  'x_ascend_link_compressio' => 'X-Ascend-Link-Compression'
-  'ascend_inter_arrival_jit' => 'Ascend-Inter-Arrival-Jitter'
-  'x_ascend_assign_ip_pool' => 'X-Ascend-Assign-IP-Pool'
-  'usr_chassis_call_span' => 'USR-Chassis-Call-Span'
-  'arap_password' => 'ARAP-Password'
-  'usr_ip_default_route_opt' => 'USR-IP-Default-Route-Option'
-  'ascend_endpoint_disc' => 'Ascend-Endpoint-Disc'
-  'tunnel_dnis' => 'Tunnel_DNIS'
-  'ms_acct_auth_type' => 'MS-Acct-Auth-Type'
-  'ascend_ts_idle_mode' => 'Ascend-TS-Idle-Mode'
-  'shasta_service_profile' => 'Shasta-Service-Profile'
-  'usr_cdma_call_reference_' => 'USR-CDMA-Call-Reference-Number'
-  'usr_at_zip_input_filter' => 'USR-AT-Zip-Input-Filter'
-  'x_ascend_pw_warntime' => 'X-Ascend-PW-Warntime'
-  'ascend_fr_direct_dlci' => 'Ascend-FR-Direct-DLCI'
-  'usr_dte_ring_no_answer_l' => 'USR-DTE-Ring-No-Answer-Limit'
-  'ascend_multicast_rate_li' => 'Ascend-Multicast-Rate-Limit'
-  'usr_routing_protocol' => 'USR-Routing-Protocol'
-  'pam_auth' => 'Pam-Auth'
-  'client_dns_sec' => 'Client_DNS_Sec'
-  'bg_trans_bpdu' => 'BG_Trans_BPDU'
-  'police_rate' => 'Police_Rate'
-  'calling_station_id' => 'Calling-Station-Id'
-  'usr_called_party_number' => 'USR-Called-Party-Number'
-  'shiva_network_protocols' => 'Shiva-Network-Protocols'
-  'x_ascend_client_gateway' => 'X-Ascend-Client-Gateway'
-  'acct_input_octets' => 'Acct-Input-Octets'
-  'ascend_call_type' => 'Ascend-Call-Type'
-  'annex_product_name' => 'Annex-Product-Name'
-  'framed_compression' => 'Framed-Compression'
-  'ascend_atm_direct' => 'Ascend-ATM-Direct'
-  'x_ascend_remote_addr' => 'X-Ascend-Remote-Addr'
-  'usr_tunneled_mlpp' => 'USR-Tunneled-MLPP'
-  'le_ipsec_outsource_profi' => 'LE-IPSec-Outsource-Profile'
-  'ascend_atm_vci' => 'Ascend-ATM-Vci'
-  'usr_number_of_link_timeo' => 'USR-Number-of-Link-Timeouts'
-  'usr_et_bridge_input_filt' => 'USR-ET-Bridge-Input-Filter'
-  'x_ascend_fr_t391' => 'X-Ascend-FR-T391'
-  'x_ascend_fr_t392' => 'X-Ascend-FR-T392'
-  'h323_conf_id' => 'h323-conf-id'
-  'usr_call_end_date_time' => 'USR-Call-End-Date-Time'
-  'ascend_fr_t391' => 'Ascend-FR-T391'
-  'bg_aging_time' => 'BG_Aging_Time'
-  'x_ascend_pre_output_pack' => 'X-Ascend-Pre-Output-Packets'
-  'acc_dialout_auth_mode' => 'Acc-Dialout-Auth-Mode'
-  'ascend_calling_subaddres' => 'Ascend-Calling-Subaddress'
-  'ascend_fr_t392' => 'Ascend-FR-T392'
-  'acct_link_count' => 'Acct-Link-Count'
-  'usr_chassis_call_slot' => 'USR-Chassis-Call-Slot'
-  'h323_credit_time' => 'h323-credit-time'
-  'nas_port_id' => 'NAS-Port-Id'
-  'x_ascend_call_filter' => 'X-Ascend-Call-Filter'
-  'ascend_destination_nas_p' => 'Ascend-Destination-Nas-Port'
-  'arap_features' => 'ARAP-Features'
-  'x_ascend_history_weigh_t' => 'X-Ascend-History-Weigh-Type'
-  'annex_host_restrict' => 'Annex-Host-Restrict'
-  'usr_compression_reset_mo' => 'USR-Compression-Reset-Mode'
-  'cisco_maximum_time' => 'Cisco-Maximum-Time'
-  'tunnel_max_sessions' => 'Tunnel_Max_Sessions'
-  'bind_ses_context' => 'Bind_Ses_Context'
-  'x_ascend_ppp_vj_slot_com' => 'X-Ascend-PPP-VJ-Slot-Comp'
-  'usr_mobile_numbytes_rxed' => 'USR-Mobile-NumBytes-Rxed'
-  'usr_rmmie_last_update_ti' => 'USR-RMMIE-Last-Update-Time'
-  'ascend_atm_loopback_cell' => 'Ascend-ATM-Loopback-Cell-Loss'
-  'ascend_bir_proxy' => 'Ascend-BIR-Proxy'
-  'acct_mcast_in_packets' => 'Acct_Mcast_In_Packets'
-  'shiva_type_of_service' => 'Shiva-Type-Of-Service'
-  'ascend_fr_dte_n392' => 'Ascend-FR-DTE-N392'
-  'usr_at_call_input_filter' => 'USR-AT-Call-Input-Filter'
-  'ascend_fr_dte_n393' => 'Ascend-FR-DTE-N393'
-  'x_ascend_backup' => 'X-Ascend-Backup'
-  'char_noecho' => 'Char-Noecho'
-  'usr_rmmie_last_update_ev' => 'USR-RMMIE-Last-Update-Event'
-  'le_advice_of_charge' => 'LE-Advice-of-Charge'
-  'ascend_calling_id_type_o' => 'Ascend-Calling-Id-Type-Of-Num'
-  'ascend_pppoe_enable' => 'Ascend-PPPoE-Enable'
-  'usr_sync_async_mode' => 'USR-Sync-Async-Mode'
-  'state' => 'State'
-  'x_ascend_user_acct_base' => 'X-Ascend-User-Acct-Base'
-  'x_ascend_ipx_alias' => 'X-Ascend-IPX-Alias'
-  'ascend_ip_tos' => 'Ascend-IP-TOS'
-  'annex_secondary_dns_serv' => 'Annex-Secondary-DNS-Server'
-  'tunnel_session_auth_ctx' => 'Tunnel_Session_Auth_Ctx'
-  'usr_mbi_ct_pri_card_span' => 'USR-Mbi_Ct_PRI_Card_Span_Line'
-  'usr_call_event_code' => 'USR-Call-Event-Code'
-  'chap_password' => 'CHAP-Password'
-  'le_nat_tcp_session_timeo' => 'LE-NAT-TCP-Session-Timeout'
-  'usr_call_start_date_time' => 'USR-Call-Start-Date-Time'
-  'usr_multicast_forwarding' => 'USR-Multicast-Forwarding'
-  'client_id' => 'Client-Id'
-  'sql_user_name' => 'SQL-User-Name'
-  'x_ascend_billing_number' => 'X-Ascend-Billing-Number'
-  'ms_secondary_nbns_server' => 'MS-Secondary-NBNS-Server'
-  'cisco_num_in_multilink' => 'Cisco-Num-In-Multilink'
-  'x_ascend_client_assign_d' => 'X-Ascend-Client-Assign-DNS'
-  'x_ascend_user_acct_port' => 'X-Ascend-User-Acct-Port'
-  'usr_local_ip_address' => 'USR-Local-IP-Address'
-  'x_ascend_ip_pool_definit' => 'X-Ascend-IP-Pool-Definition'
-  'ascend_metric' => 'Ascend-Metric'
-  'x_ascend_bacp_enable' => 'X-Ascend-BACP-Enable'
-  'x_ascend_user_acct_time' => 'X-Ascend-User-Acct-Time'
-  'x_ascend_mpp_idle_percen' => 'X-Ascend-MPP-Idle-Percent'
-  'annex_authen_servers' => 'Annex-Authen-Servers'
-  'x_ascend_data_filter' => 'X-Ascend-Data-Filter'
-  'ascend_idle_limit' => 'Ascend-Idle-Limit'
-  'ldap_userdn' => 'Ldap-UserDn'
-  'x_ascend_target_util' => 'X-Ascend-Target-Util'
-  'shiva_connect_reason' => 'Shiva-Connect-Reason'
-  'usr_ds0' => 'USR-DS0'
-  'annex_re_chap_timeout' => 'Annex-Re-CHAP-Timeout'
-  'shasta_vpn_name' => 'Shasta-VPN-Name'
-  'acct_tunnel_connection_i' => 'Acct-Tunnel-Connection-Id'
-  'h323_prompt_id' => 'h323-prompt-id'
-  'x_ascend_ipx_peer_mode' => 'X-Ascend-IPX-Peer-Mode'
-  'ascend_numbering_plan_id' => 'Ascend-Numbering-Plan-ID'
-  'x_ascend_ts_idle_limit' => 'X-Ascend-TS-Idle-Limit'
-  'ascend_atm_fault_managem' => 'Ascend-ATM-Fault-Management'
-  'annex_primary_nbns_serve' => 'Annex-Primary-NBNS-Server'
-  'lac_port_type' => 'LAC_Port_Type'
-  'usr_initial_rx_link_data' => 'USR-Initial-Rx-Link-Data-Rate'
-  'usr_interface_index' => 'USR-Interface-Index'
-  'usr_expansion_algorithm' => 'USR-Expansion-Algorithm'
-  'ascend_tunnel_vrouter_na' => 'Ascend-Tunnel-VRouter-Name'
-  'usr_pw_vpn_neighbor' => 'USR-PW_VPN_Neighbor'
-  'bind_type' => 'Bind_Type'
-  'acc_ccp_option' => 'Acc-Ccp-Option'
-  'ascend_route_appletalk' => 'Ascend-Route-Appletalk'
-  'erx_alternate_cli_access' => 'ERX-Alternate-Cli-Access-Level'
-  'usr_at_rtmp_output_filte' => 'USR-AT-RTMP-Output-Filter'
-  'erx_atm_mbs' => 'ERX-Atm-MBS'
-  'usr_at_call_output_filte' => 'USR-AT-Call-Output-Filter'
-  'ms_old_arap_password' => 'MS-Old-ARAP-Password'
-  'x_ascend_client_primary_' => 'X-Ascend-Client-Primary-DNS'
-  'x_ascend_host_info' => 'X-Ascend-Host-Info'
-  'bind_auth_protocol' => 'Bind_Auth_Protocol'
-  'cisco_link_compression' => 'Cisco-Link-Compression'
-  'annex_syslog_tap' => 'Annex-Syslog-Tap'
-  'tunnel_window' => 'Tunnel_Window'
-  'usr_gateway_ip_address' => 'USR-Gateway-IP-Address'
-  'ascend_redirect_number' => 'Ascend-Redirect-Number'
-  'x_ascend_secondary_home_' => 'X-Ascend-Secondary-Home-Agent'
-  'usr_pw_index' => 'USR-PW_Index'
-  'le_multicast_client' => 'LE-Multicast-Client'
-  'annex_modem_disc_reason' => 'Annex-Modem-Disc-Reason'
-  'annex_primary_dns_server' => 'Annex-Primary-DNS-Server'
-  'erx_secondary_wins' => 'ERX-Secondary-Wins'
-  'fall_through' => 'Fall-Through'
-  'acct_mcast_out_packets' => 'Acct_Mcast_Out_Packets'
-  'x_ascend_transit_number' => 'X-Ascend-Transit-Number'
-  'usr_unauthenticated_time' => 'USR-Unauthenticated-Time'
-  'le_ipsec_active_profile' => 'LE-IPSec-Active-Profile'
-  'ascend_ip_pool_chaining' => 'Ascend-IP-Pool-Chaining'
-  'usr_syslog_tap' => 'USR-Syslog-Tap'
-  'ascend_multicast_client' => 'Ascend-Multicast-Client'
-  'usr_device_connected_to' => 'USR-Device-Connected-To'
-  'tunnel_l2f_second_passwo' => 'Tunnel_L2F_Second_Password'
-  'add_prefix' => 'Add-Prefix'
-  'tunnel_cmd_timeout' => 'Tunnel_Cmd_Timeout'
-  'x_ascend_remove_seconds' => 'X-Ascend-Remove-Seconds'
-  'acct_mcast_in_octets' => 'Acct_Mcast_In_Octets'
-  'ascend_appletalk_route' => 'Ascend-Appletalk-Route'
-  'ascend_fcp_parameter' => 'Ascend-FCP-Parameter'
-  'acc_ip_compression' => 'Acc-Ip-Compression'
-  'usr_modem_training_time' => 'USR-Modem-Training-Time'
-  'usr_primary_dns_server' => 'USR-Primary_DNS_Server'
-  'erx_egress_policy_name' => 'ERX-Egress-Policy-Name'
-  'x_ascend_base_channel_co' => 'X-Ascend-Base-Channel-Count'
-  'x_ascend_pre_input_packe' => 'X-Ascend-Pre-Input-Packets'
-  'password_retry' => 'Password-Retry'
-  'ascend_source_auth' => 'Ascend-Source-Auth'
-  'cisco_pw_lifetime' => 'Cisco-PW-Lifetime'
-  'acc_dns_server_pri' => 'Acc-Dns-Server-Pri'
-  'ascend_netware_timeout' => 'Ascend-Netware-timeout'
-  'ascend_ppp_async_map' => 'Ascend-PPP-Async-Map'
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Ttl'
-  'x_ascend_modem_slotno' => 'X-Ascend-Modem-SlotNo'
-  'x_ascend_ip_direct' => 'X-Ascend-IP-Direct'
-  'simultaneous_use' => 'Simultaneous-Use'
-  'erx_virtual_router_name' => 'ERX-Virtual-Router-Name'
-  'ascend_bridge_non_pppoe' => 'Ascend-Bridge-Non-PPPoE'
-  'ascend_fr_08_mode' => 'Ascend-FR-08-Mode'
-  'h323_call_type' => 'h323-call-type'
-  'tunnel_context' => 'Tunnel_Context'
-  'usr_transmit_acc_map' => 'USR-Transmit-Acc-Map'
-  'usr_ipx_wan' => 'USR-IPX-WAN'
-  'usr_ip_call_input_filter' => 'USR-IP-Call-Input-Filter'
-  'usr_call_connect_in_gmt' => 'USR-Call-Connect-in-GMT'
-  'acct_multi_session_id' => 'Acct-Multi-Session-Id'
-  'usr_reply_script1' => 'USR-Reply-Script1'
-  'cisco_ppp_vj_slot_comp' => 'Cisco-PPP-VJ-Slot-Comp'
-  'usr_reply_script2' => 'USR-Reply-Script2'
-  'usr_reply_script3' => 'USR-Reply-Script3'
-  'usr_reply_script4' => 'USR-Reply-Script4'
-  'usr_reply_script5' => 'USR-Reply-Script5'
-  'usr_reply_script6' => 'USR-Reply-Script6'
-  'user_category' => 'User-Category'
-  'mcast_send' => 'Mcast_Send'
-  'ascend_send_secret' => 'Ascend-Send-Secret'
-  'usr_tunnel_switch_endpoi' => 'USR-Tunnel-Switch-Endpoint'
-  'tunnel_retransmit' => 'Tunnel_Retransmit'
-  'add_port_to_ip_address' => 'Add-Port-To-IP-Address'
-  'ascend_ipx_node_addr' => 'Ascend-IPX-Node-Addr'
-  'x_ascend_netware_timeout' => 'X-Ascend-Netware-timeout'
-  'erx_sa_validate' => 'ERX-Sa-Validate'
-  'le_ipsec_passive_profile' => 'LE-IPSec-Passive-Profile'
-  'usr_chassis_slot' => 'USR-Chassis-Slot'
-  'usr_final_tx_link_data_r' => 'USR-Final-Tx-Link-Data-Rate'
-  'usr_nfas_id' => 'USR-NFAS-ID'
-  'called_station_id' => 'Called-Station-Id'
-  'login_lat_port' => 'Login-LAT-Port'
-  'ascend_dialed_number' => 'Ascend-Dialed-Number'
-  'h323_credit_amount' => 'h323-credit-amount'
-  'tunnel_local_name' => 'Tunnel_Local_Name'
-  'framed_ip_netmask' => 'Framed-IP-Netmask'
-  'client_port_id' => 'Client-Port-Id'
-  'bg_span_dis' => 'BG_Span_Dis'
-  'multi_link_flag' => 'Multi-Link-Flag'
-  'bind_sub_user_at_context' => 'Bind_Sub_User_At_Context'
-  'usr_ipx_routing' => 'USR-IPX-Routing'
-  'ascend_fr_nailed_grp' => 'Ascend-FR-Nailed-Grp'
-  'ascend_pre_output_octets' => 'Ascend-Pre-Output-Octets'
-  'pppoe_url' => 'PPPOE_URL'
-  'ascend_ara_pw' => 'Ascend-Ara-PW'
-  'acc_callback_mode' => 'Acc-Callback-Mode'
-  'usr_server_time' => 'USR-Server-Time'
-  'ascend_seconds_of_histor' => 'Ascend-Seconds-Of-History'
-  'ns_mta_md5_password' => 'NS-MTA-MD5-Password'
-  'tunnel_server_endpoint' => 'Tunnel-Server-Endpoint'
-  'usr_channel' => 'USR-Channel'
-  'ascend_dsl_cir_recv_limi' => 'Ascend-Dsl-CIR-Recv-Limit'
-  'acct_session_start_time' => 'Acct-Session-Start-Time'
-  'ascend_send_passwd' => 'Ascend-Send-Passwd'
-  'ascend_num_in_multilink' => 'Ascend-Num-In-Multilink'
-  'usr_ip_rip_policies' => 'USR-IP-RIP-Policies'
-  'vendor_specific' => 'Vendor-Specific'
-  'x_ascend_event_type' => 'X-Ascend-Event-Type'
-  'lac_real_port_type' => 'LAC_Real_Port_Type'
-  'x_ascend_modem_portno' => 'X-Ascend-Modem-PortNo'
-  'usr_originate_answer_mod' => 'USR-Originate-Answer-Mode'
-  'framed_ipx_network' => 'Framed-IPX-Network'
-  'ascend_modem_slotno' => 'Ascend-Modem-SlotNo'
-  'ms_mppe_encryption_type' => 'MS-MPPE-Encryption-Type'
-  'annex_cli_command' => 'Annex-CLI-Command'
-  'acct_status_type' => 'Acct-Status-Type'
-  'usr_et_bridge_call_outpu' => 'USR-ET-Bridge-Call-Output-Filte'
-  'usr_pw_vpn_id' => 'USR-PW_VPN_ID'
-  'usr_sap_filter_in' => 'USR-SAP-Filter-In'
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Proto'
-  'annex_audit_level' => 'Annex-Audit-Level'
-  'x_ascend_shared_profile_' => 'X-Ascend-Shared-Profile-Enable'
-  'ascend_dial_number' => 'Ascend-Dial-Number'
-  'ascend_link_compression' => 'Ascend-Link-Compression'
-  'usr_event_date_time' => 'USR-Event-Date-Time'
-  'usr_mp_edo_hiper' => 'USR-MP-EDO-HIPER'
-  'usr_re_chap_timeout' => 'USR-Re-Chap-Timeout'
-  'x_ascend_third_prompt' => 'X-Ascend-Third-Prompt'
-  'x_ascend_ppp_vj_1172' => 'X-Ascend-PPP-VJ-1172'
-  'annex_disconnect_reason' => 'Annex-Disconnect-Reason'
-  'ascend_fr_svc_addr' => 'Ascend-FR-SVC-Addr'
-  'nas_real_port' => 'NAS_Real_Port'
-  'usr_power_supply_number' => 'USR-Power-Supply-Number'
-  'ms_secondary_dns_server' => 'MS-Secondary-DNS-Server'
-  'ascend_port_redir_server' => 'Ascend-Port-Redir-Server'
-  'ascend_x25_pad_alias_1' => 'Ascend-X25-Pad-Alias-1'
-  'x_ascend_fcp_parameter' => 'X-Ascend-FCP-Parameter'
-  'ascend_x25_pad_alias_2' => 'Ascend-X25-Pad-Alias-2'
-  'ascend_ipsec_profile' => 'Ascend-IPSEC-Profile'
-  'ascend_x25_pad_alias_3' => 'Ascend-X25-Pad-Alias-3'
-  'usr_mobile_numbytes_txed' => 'USR-Mobile-NumBytes-Txed'
-  'ascend_atm_vpi' => 'Ascend-ATM-Vpi'
-  'annex_input_filter' => 'Annex-Input-Filter'
-  'menu' => 'Menu'
-  'x_ascend_route_ip' => 'X-Ascend-Route-IP'
-  'usr_rmmie_num_of_updates' => 'USR-RMMIE-Num-Of-Updates'
-  'acc_request_type' => 'Acc-Request-Type'
-  'ascend_dhcp_reply' => 'Ascend-DHCP-Reply'
-  'usr_number_of_upshifts' => 'USR-Number-of-Upshifts'
-  'usr_rmmie_firmware_versi' => 'USR-RMMIE-Firmware-Version'
-  'bind_bypass_context' => 'Bind_Bypass_Context'
-  'ascend_dialout_allowed' => 'Ascend-Dialout-Allowed'
-  'annex_tunnel_authen_type' => 'Annex-Tunnel-Authen-Type'
-  'x_ascend_bridge' => 'X-Ascend-Bridge'
-  'ascend_client_secondary_' => 'Ascend-Client-Secondary-WINS'
-  'erx_local_loopback_inter' => 'ERX-Local-Loopback-Interface'
-  'acct_input_gigawords' => 'Acct-Input-Gigawords'
-  'usr_equalization_type' => 'USR-Equalization-Type'
-  'usr_port_tap_format' => 'USR-Port-Tap-Format'
-  'x_ascend_ppp_async_map' => 'X-Ascend-PPP-Async-Map'
-  'acc_ipx_compression' => 'Acc-Ipx-Compression'
-  'ascend_nas_port_format' => 'Ascend-NAS-Port-Format'
-  'acc_modem_modulation_typ' => 'Acc-Modem-Modulation-Type'
-  'ascend_modem_portno' => 'Ascend-Modem-PortNo'
-  'usr_et_bridge_output_fil' => 'USR-ET-Bridge-Output-Filter'
-  'ascend_ipx_header_compre' => 'Ascend-IPX-Header-Compression'
-  'framed_appletalk_link' => 'Framed-AppleTalk-Link'
-  'x_ascend_receive_secret' => 'X-Ascend-Receive-Secret'
-  'ascend_route_ipx' => 'Ascend-Route-IPX'
-  'ascend_user_acct_type' => 'Ascend-User-Acct-Type'
-  'ascend_token_idle' => 'Ascend-Token-Idle'
-  'framed_ip_address' => 'Framed-IP-Address'
-  'ascend_call_block_durati' => 'Ascend-Call-Block-Duration'
-  'ascend_ppp_address' => 'Ascend-PPP-Address'
-  'usr_mbi_ct_pri_card_slot' => 'USR-Mbi_Ct_PRI_Card_Slot'
-  'x_ascend_dec_channel_cou' => 'X-Ascend-Dec-Channel-Count'
-  'x_ascend_send_auth' => 'X-Ascend-Send-Auth'
-  'usr_characters_received' => 'USR-Characters-Received'
-  'usr_pw_tunnel_authentica' => 'USR-PW_Tunnel_Authentication'
-  'usr_call_end_time' => 'USR-Call-End-Time'
-  'x_ascend_dialout_allowed' => 'X-Ascend-Dialout-Allowed'
-  'x_ascend_call_attempt_li' => 'X-Ascend-Call-Attempt-Limit'
-  'initial_modulation_type' => 'Initial-Modulation-Type'
-  'usr_packet_bus_session' => 'USR-Packet-Bus-Session'
-  'x_ascend_ipx_node_addr' => 'X-Ascend-IPX-Node-Addr'
-  'ascend_ppp_vj_slot_comp' => 'Ascend-PPP-VJ-Slot-Comp'
-  'ascend_menu_item' => 'Ascend-Menu-Item'
-  'x_ascend_fr_link_mgt' => 'X-Ascend-FR-Link-Mgt'
-  'usr_rmmie_serial_number' => 'USR-RMMIE-Serial-Number'
-  'message_authenticator' => 'Message-Authenticator'
-  'usr_dte_data_idle_timout' => 'USR-DTE-Data-Idle-Timout'
-  'usr_port_tap_facility' => 'USR-Port-Tap-Facility'
-  'acc_ml_mlx_admin_state' => 'Acc-ML-MLX-Admin-State'
-  'usr_modem_group' => 'USR-Modem-Group'
-  'x_ascend_callback' => 'X-Ascend-Callback'
-  'acct_input_packets_64' => 'Acct_Input_Packets_64'
-  'ascend_third_prompt' => 'Ascend-Third-Prompt'
-  'configuration_token' => 'Configuration-Token'
-  'x_ascend_fr_nailed_grp' => 'X-Ascend-FR-Nailed-Grp'
-  'acct_output_octets_64' => 'Acct_Output_Octets_64'
-  'h323_time_and_day' => 'h323-time-and-day'
-  'ascend_port_redir_portnu' => 'Ascend-Port-Redir-Portnum'
-  'acct_interim_interval' => 'Acct-Interim-Interval'
-  'ascend_uu_info' => 'Ascend-UU-Info'
-  'usr_pw_vpn_name' => 'USR-PW_VPN_Name'
-  'ascend_maximum_call_dura' => 'Ascend-Maximum-Call-Duration'
-  'ascend_atm_direct_profil' => 'Ascend-ATM-Direct-Profile'
-  'acc_input_errors' => 'Acc-Input-Errors'
-  'bind_dot1q_port' => 'Bind_Dot1q_Port'
-  'ascend_first_dest' => 'Ascend-First-Dest'
-  'x_ascend_if_netmask' => 'X-Ascend-IF-Netmask'
-  'tunnel_session_auth_serv' => 'Tunnel_Session_Auth_Service_Grp'
-  'annex_local_ip_address' => 'Annex-Local-IP-Address'
-  'termination_menu' => 'Termination-Menu'
-  'ms_chap2_cpw' => 'MS-CHAP2-CPW'
-  'ascend_mpp_idle_percent' => 'Ascend-MPP-Idle-Percent'
-  'usr_characters_sent' => 'USR-Characters-Sent'
-  'eap_message' => 'EAP-Message'
-  'acct_delay_time' => 'Acct-Delay-Time'
-  'ascend_remote_fw' => 'Ascend-Remote-FW'
-  'x_ascend_tunneling_proto' => 'X-Ascend-Tunneling-Protocol'
-  'shiva_session_id' => 'Shiva-Session-Id'
-  'usr_igmp_query_interval' => 'USR-IGMP-Query-Interval'
-  'usr_accm_type' => 'USR-ACCM-Type'
-  'usr_call_terminate_in_gm' => 'USR-Call-Terminate-in-GMT'
-  'usr_rad_location_type' => 'USR-Rad-Location-Type'
-  'ascend_filter' => 'Ascend-Filter'
-  'ascend_primary_home_agen' => 'Ascend-Primary-Home-Agent'
-  'x_ascend_user_acct_host' => 'X-Ascend-User-Acct-Host'
-  'chap_challenge' => 'CHAP-Challenge'
-  'acct_output_packets_64' => 'Acct_Output_Packets_64'
-  'bind_auth_max_sessions' => 'Bind_Auth_Max_Sessions'
-  'cisco_pre_output_octets' => 'Cisco-Pre-Output-Octets'
-  'x_ascend_fr_direct' => 'X-Ascend-FR-Direct'
-  'x_ascend_client_secondar' => 'X-Ascend-Client-Secondary-DNS'
-  'usr_rmmie_pwrlvl_nearech' => 'USR-RMMIE-PwrLvl-NearEcho-Canc'
-  'ascend_bridge_address' => 'Ascend-Bridge-Address'
-  'user_name' => 'User-Name'
-  'usr_rmmie_firmware_build' => 'USR-RMMIE-Firmware-Build-Date'
-  'ms_chap_mppe_keys' => 'MS-CHAP-MPPE-Keys'
-  'usr_number_of_characters' => 'USR-Number-Of-Characters-Lost'
-  'usr_physical_state' => 'USR-Physical-State'
-  'x_ascend_assign_ip_serve' => 'X-Ascend-Assign-IP-Server'
-  'bind_int_context' => 'Bind_Int_Context'
-  'erx_tunnel_virtual_route' => 'ERX-Tunnel-Virtual-Router'
-  'ascend_xmit_rate' => 'Ascend-Xmit-Rate'
-  'usr_secondary_dns_server' => 'USR-Secondary_DNS_Server'
-  'ascend_dsl_rate_mode' => 'Ascend-Dsl-Rate-Mode'
-  'ascend_data_rate' => 'Ascend-Data-Rate'
-  'realm' => 'Realm'
-  'usr_ipx_call_input_filte' => 'USR-IPX-Call-Input-Filter'
-  'ascend_ipx_route' => 'Ascend-IPX-Route'
-  'usr_failure_to_connect_r' => 'USR-Failure-to-Connect-Reason'
-  'x_ascend_home_network_na' => 'X-Ascend-Home-Network-Name'
-  'acc_nbns_server_pri' => 'Acc-Nbns-Server-Pri'
-  'usr_modulation_type' => 'USR-Modulation-Type'
-  'service_type' => 'Service-Type'
-  'ascend_callback_delay' => 'Ascend-Callback-Delay'
-  'ascend_owner_ip_addr' => 'Ascend-Owner-IP-Addr'
-  'x_ascend_handle_ipx' => 'X-Ascend-Handle-IPX'
-  'usr_connect_term_reason' => 'USR-Connect-Term-Reason'
-  'x_ascend_multicast_rate_' => 'X-Ascend-Multicast-Rate-Limit'
-  'h323_disconnect_time' => 'h323-disconnect-time'
-  'acc_ip_gateway_sec' => 'Acc-Ip-Gateway-Sec'
-  'usr_number_of_blers' => 'USR-Number-of-Blers'
-  'x_ascend_fr_type' => 'X-Ascend-FR-Type'
-  'ascend_assign_ip_pool' => 'Ascend-Assign-IP-Pool'
-  'ascend_qos_upstream' => 'Ascend-QOS-Upstream'
-  'usr_nas_type' => 'USR-NAS-Type'
-  'acc_dial_port_index' => 'Acc-Dial-Port-Index'
-  'usr_initial_tx_link_data' => 'USR-Initial-Tx-Link-Data-Rate'
-  'ascend_fr_type' => 'Ascend-FR-Type'
-  'usr_mbi_ct_tdm_time_slot' => 'USR-Mbi_Ct_TDM_Time_Slot'
-  'usr_rmmie_pwrlvl_xmit_lv' => 'USR-RMMIE-PwrLvl-Xmit-Lvl'
-  'erx_atm_service_category' => 'ERX-Atm-Service-Category'
-  'usr_appletalk' => 'USR-Appletalk'
-  'usr_send_script1' => 'USR-Send-Script1'
-  'usr_send_script2' => 'USR-Send-Script2'
-  'usr_send_script3' => 'USR-Send-Script3'
-  'usr_ospf_addressless_ind' => 'USR-OSPF-Addressless-Index'
-  'acct_input_packets' => 'Acct-Input-Packets'
-  'usr_send_script4' => 'USR-Send-Script4'
-  'usr_send_script5' => 'USR-Send-Script5'
-  'usr_send_script6' => 'USR-Send-Script6'
-  'usr_service_option' => 'USR-Service-Option'
-  'ascend_dropped_octets' => 'Ascend-Dropped-Octets'
-  'usr_ip' => 'USR-IP'
-  'usr_tunnel_security' => 'USR-Tunnel-Security'
-  'acc_acct_on_off_reason' => 'Acc-Acct-On-Off-Reason'
-  'shiva_compression_type' => 'Shiva-Compression-Type'
-  'ascend_pw_warntime' => 'Ascend-PW-Warntime'
-  'usr_security_resp_limit' => 'USR-Security-Resp-Limit'
-  'ascend_x25_pad_prompt' => 'Ascend-X25-Pad-Prompt'
-  'cisco_asing_ip_pool' => 'Cisco-Asing-IP-Pool'
-  'acc_route_policy' => 'Acc-Route-Policy'
-  'annex_local_username' => 'Annex-Local-Username'
-  'x_ascend_call_by_call' => 'X-Ascend-Call-By-Call'
-  'ascend_calling_id_screen' => 'Ascend-Calling-Id-Screening'
-  'x_ascend_dhcp_pool_numbe' => 'X-Ascend-DHCP-Pool-Number'
-  'nas_port_type' => 'NAS-Port-Type'
-  'ascend_route_ip' => 'Ascend-Route-IP'
-  'ascend_client_gateway' => 'Ascend-Client-Gateway'
-  'ascend_qos_downstream' => 'Ascend-QOS-Downstream'
-  'ms_bap_usage' => 'MS-BAP-Usage'
-  'usr_vts_session_key' => 'USR-VTS-Session-Key'
-  'usr_receive_acc_map' => 'USR-Receive-Acc-Map'
-  'ascend_expect_callback' => 'Ascend-Expect-Callback'
-  'password' => 'Password'
-  'packet_type' => 'Packet-Type'
-  'ascend_remote_addr' => 'Ascend-Remote-Addr'
-  'ascend_recv_name' => 'Ascend-Recv-Name'
-  'ms_acct_eap_type' => 'MS-Acct-EAP-Type'
-  'usr_filter_zones' => 'USR-Filter-Zones'
-  'annex_output_filter' => 'Annex-Output-Filter'
-  'usr_rmmie_rcv_tot_pwrlvl' => 'USR-RMMIE-Rcv-Tot-PwrLvl'
-  'usr_mp_mrru' => 'USR-MP-MRRU'
-  'ascend_call_filter' => 'Ascend-Call-Filter'
-  'usr_keypress_timeout' => 'USR-Keypress-Timeout'
-  'usr_modem_setup_time' => 'USR-Modem-Setup-Time'
-  'acct_authentic' => 'Acct-Authentic'
-  'pppoe_motm' => 'PPPOE_MOTM'
-  'x_ascend_expect_callback' => 'X-Ascend-Expect-Callback'
-  'erx_atm_scr' => 'ERX-Atm-SCR'
-  'erx_address_pool_name' => 'ERX-Address-Pool-Name'
-  'challenge_state' => 'Challenge-State'
-  'usr_multicast_proxy' => 'USR-Multicast-Proxy'
-  'framed_filter_id' => 'Framed-Filter-Id'
-  'add_suffix' => 'Add-Suffix'
-  'ascend_auth_type' => 'Ascend-Auth-Type'
-  'session_timeout' => 'Session-Timeout'
-  'ascend_callback' => 'Ascend-Callback'
-  'usr_chat_script_name' => 'USR-Chat-Script-Name'
-  'port_message' => 'Port-Message'
-  'acct_output_packets' => 'Acct-Output-Packets'
-  'ascend_session_svr_key' => 'Ascend-Session-Svr-Key'
-  'login_tcp_port' => 'Login-TCP-Port'
-  'erx_tunnel_password' => 'ERX-Tunnel-Password'
-  'shasta_user_privilege' => 'Shasta-User-Privilege'
-  'usr_secondary_nbns_serve' => 'USR-Secondary_NBNS_Server'
-  'usr_security_login_limit' => 'USR-Security-Login-Limit'
-  'usr_start_time' => 'USR-Start-Time'
-  'acc_access_partition' => 'Acc-Access-Partition'
-  'versanet_termination_cau' => 'Versanet-Termination-Cause'
-  'x_ascend_call_block_dura' => 'X-Ascend-Call-Block-Duration'
-  'mcast_maxgroups' => 'Mcast_MaxGroups'
-  'ascend_user_acct_base' => 'Ascend-User-Acct-Base'
-  'usr_vpn_gw_location_id' => 'USR-VPN-GW-Location-Id'
-  'usr_block_error_count_li' => 'USR-Block-Error-Count-Limit'
-  'ascend_telnet_profile' => 'Ascend-Telnet-Profile'
-  'ascend_port_redir_protoc' => 'Ascend-Port-Redir-Protocol'
-  'ascend_call_by_call' => 'Ascend-Call-By-Call'
-  'usr_disconnect_cause_ind' => 'USR-Disconnect-Cause-Indicator'
-  'x_ascend_fr_linkup' => 'X-Ascend-FR-LinkUp'
-  'ascend_billing_number' => 'Ascend-Billing-Number'
-  'usr_ds0s' => 'USR-DS0s'
-  'usr_at_zip_output_filter' => 'USR-AT-Zip-Output-Filter'
-  'ascend_user_acct_port' => 'Ascend-User-Acct-Port'
-  'login_port' => 'Login-Port'
-  'arap_security' => 'ARAP-Security'
-  'tunnel_deadtime' => 'Tunnel_Deadtime'
-  'ascend_user_acct_time' => 'Ascend-User-Acct-Time'
-  'ms_chap_challenge' => 'MS-CHAP-Challenge'
-  'ascend_x25_rpoa' => 'Ascend-X25-Rpoa'
-  'login_time' => 'Login-Time'
-  'current_time' => 'Current-Time'
-  'login_service' => 'Login-Service'
-  'ascend_menu_selector' => 'Ascend-Menu-Selector'
-  'ascend_bacp_enable' => 'Ascend-BACP-Enable'
-  'shiva_link_speed' => 'Shiva-Link-Speed'
-  'ascend_private_route_tab' => 'Ascend-Private-Route-Table-ID'
-  'x_ascend_session_svr_key' => 'X-Ascend-Session-Svr-Key'
-  'ascend_data_filter' => 'Ascend-Data-Filter'
-  'ascend_target_util' => 'Ascend-Target-Util'
-  'shiva_function' => 'Shiva-Function'
-  'usr_pw_usr_ifilter_ip' => 'USR-PW_USR_IFilter_IP'
-  'usr_igmp_routing' => 'USR-IGMP-Routing'
-  'acc_tunnel_port' => 'Acc-Tunnel-Port'
-  'x_ascend_fr_n391' => 'X-Ascend-FR-N391'
-  'medium_type' => 'Medium_Type'
-  'annex_domain_name' => 'Annex-Domain-Name'
-  'ascend_fr_n391' => 'Ascend-FR-N391'
-  'callback_number' => 'Callback-Number'
-  'usr_chassis_temperature' => 'USR-Chassis-Temperature'
-  'dialback_no' => 'Dialback-No'
-  'ms_mppe_recv_key' => 'MS-MPPE-Recv-Key'
-  'ascend_ipx_alias' => 'Ascend-IPX-Alias'
-  'le_nat_inmap' => 'LE-NAT-Inmap'
-  'tunnel_police_rate' => 'Tunnel_Police_Rate'
-  'acct_terminate_cause' => 'Acct-Terminate-Cause'
-  'le_nat_other_session_tim' => 'LE-NAT-Other-Session-Timeout'
-  'usr_ip_rip_output_filter' => 'USR-IP-RIP-Output-Filter'
-  'exec_program' => 'Exec-Program'
-  'h323_disconnect_cause' => 'h323-disconnect-cause'
-  'usr_chassis_call_channel' => 'USR-Chassis-Call-Channel'
-  'x_ascend_fr_dlci' => 'X-Ascend-FR-DLCI'
-  'ms_link_drop_time_limit' => 'MS-Link-Drop-Time-Limit'
-  'acc_callback_num_valid' => 'Acc-Callback-Num-Valid'
-  'cisco_presession_time' => 'Cisco-PreSession-Time'
-  'ms_chap_response' => 'MS-CHAP-Response'
-  'usr_spoofing' => 'USR-Spoofing'
-  'usr_num_fax_pages_proces' => 'USR-Num-Fax-Pages-Processed'
-  'ascend_x25_cug' => 'Ascend-X25-Cug'
-  'ascend_fr_dlci' => 'Ascend-FR-DLCI'
-  'shiva_user_attributes' => 'Shiva-User-Attributes'
-  'ms_chap_lm_enc_pw' => 'MS-CHAP-LM-Enc-PW'
-  'ascend_transit_number' => 'Ascend-Transit-Number'
-  'usr_last_number_dialed_i' => 'USR-Last-Number-Dialed-In-DNIS'
-  'usr_ip_saa_filter' => 'USR-IP-SAA-Filter'
-  'usr_pw_usr_ifilter_ipx' => 'USR-PW_USR_IFilter_IPX'
-  'ascend_remove_seconds' => 'Ascend-Remove-Seconds'
-  'le_connect_detail' => 'LE-Connect-Detail'
-  'ascend_assign_ip_global_' => 'Ascend-Assign-IP-Global-Pool'
-  'proxy_to_realm' => 'Proxy-To-Realm'
-  'usr_retrains_requested' => 'USR-Retrains-Requested'
-  'h323_remote_address' => 'h323-remote-address'
-  'ascend_x25_nui_prompt' => 'Ascend-X25-Nui-Prompt'
-  'acc_customer_id' => 'Acc-Customer-Id'
-  'ms_chap2_response' => 'MS-CHAP2-Response'
-  'ascend_host_info' => 'Ascend-Host-Info'
-  'annex_addr_resolution_se' => 'Annex-Addr-Resolution-Servers'
-  'x_ascend_multilink_id' => 'X-Ascend-Multilink-ID'
-  'login_lat_service' => 'Login-LAT-Service'
-  'usr_rmmie_rcv_pwrlvl_330' => 'USR-RMMIE-Rcv-PwrLvl-3300Hz'
-  'ascend_event_type' => 'Ascend-Event-Type'
-  'ascend_inc_channel_count' => 'Ascend-Inc-Channel-Count'
-  'cisco_ppp_async_map' => 'Cisco-PPP-Async-Map'
-  'usr_min_compression_size' => 'USR-Min-Compression-Size'
-  'ascend_traffic_shaper' => 'Ascend-Traffic-Shaper'
-  'ascend_user_acct_key' => 'Ascend-User-Acct-Key'
-  'usr_port_tap_output' => 'USR-Port-Tap-Output'
-  'ascend_x25_nui' => 'Ascend-X25-Nui'
-  'x_ascend_disconnect_caus' => 'X-Ascend-Disconnect-Cause'
-  'ascend_cbcp_enable' => 'Ascend-CBCP-Enable'
-  'usr_framed_ip_address_po' => 'USR-Framed_IP_Address_Pool_Name'
-  'ascend_x25_profile_name' => 'Ascend-X25-Profile-Name'
-  'usr_orig_nas_type' => 'USR-Orig-NAS-Type'
-  'acc_output_errors' => 'Acc-Output-Errors'
-  'h323_redirect_ip_address' => 'h323-redirect-ip-address'
-  'usr_ip_call_output_filte' => 'USR-IP-Call-Output-Filter'
-  'cisco_avpair' => 'Cisco-AVPair'
-  'usr_slot_connected_to' => 'USR-Slot-Connected-To'
-  'framed_route' => 'Framed-Route'
-  'ascend_global_call_id' => 'Ascend-Global-Call-Id'
-  'x_ascend_seconds_of_hist' => 'X-Ascend-Seconds-Of-History'
-  'x_ascend_temporary_rtes' => 'X-Ascend-Temporary-Rtes'
-  'h323_currency_type' => 'h323-currency-type'
-  'x_ascend_token_expiry' => 'X-Ascend-Token-Expiry'
-  'pvc_encapsulation_type' => 'PVC_Encapsulation_Type'
-  'x_ascend_pw_lifetime' => 'X-Ascend-PW-Lifetime'
-  'usr_expected_voltage' => 'USR-Expected-Voltage'
-  'usr_simplified_v42bis_us' => 'USR-Simplified-V42bis-Usage'
-  'shiva_customer_id' => 'Shiva-Customer-Id'
-  'usr_compression_algorith' => 'USR-Compression-Algorithm'
-  'annex_system_disc_reason' => 'Annex-System-Disc-Reason'
-  'annex_secondary_nbns_ser' => 'Annex-Secondary-NBNS-Server'
-  'usr_q931_call_reference_' => 'USR-Q931-Call-Reference-Value'
-  'usr_send_password' => 'USR-Send-Password'
-  'prompt' => 'Prompt'
-  'usr_cusr_hat_script_rule' => 'USR-CUSR-hat-Script-Rules'
-  'usr_event_id' => 'USR-Event-Id'
-  'usr_ccp_algorithm' => 'USR-CCP-Algorithm'
-  'usr_mbi_ct_bchannel_used' => 'USR-Mbi_Ct_BChannel_Used'
-  'ascend_svc_enabled' => 'Ascend-SVC-Enabled'
-  'framed_mtu' => 'Framed-MTU'
-  'acc_reason_code' => 'Acc-Reason-Code'
-  'bind_l2tp_flow_control' => 'Bind_L2TP_Flow_Control'
-  'ascend_cbcp_delay' => 'Ascend-CBCP-Delay'
-  'le_ipsec_deny_action' => 'LE-IPSec-Deny-Action'
+  'ascend_bi_directional_au' => 'Ascend-Bi-Directional-Auth',
+  'h323_connect_time' => 'h323-connect-time',
+  'connect_rate' => 'Connect-Rate',
+  'bind_auth_service_grp' => 'Bind_Auth_Service_Grp',
+  'usr_callback_type' => 'USR-Callback-Type',
+  'erx_primary_wins' => 'ERX-Primary-Wins',
+  'ascend_x25_x121_address' => 'Ascend-X25-X121-Address',
+  'usr_log_filter_packets' => 'USR-Log-Filter-Packets',
+  'annex_addr_resolution_pr' => 'Annex-Addr-Resolution-Protocol',
+  'usr_ip_rip_simple_auth_p' => 'USR-IP-RIP-Simple-Auth-Password',
+  'dialback_name' => 'Dialback-Name',
+  'x_ascend_fr_dce_n392' => 'X-Ascend-FR-DCE-N392',
+  'usr_host_type' => 'USR-Host-Type',
+  'le_modem_info' => 'LE-Modem-Info',
+  'x_ascend_menu_selector' => 'X-Ascend-Menu-Selector',
+  'x_ascend_fr_dce_n393' => 'X-Ascend-FR-DCE-N393',
+  'ascend_ip_direct' => 'Ascend-IP-Direct',
+  'x_ascend_pre_output_octe' => 'X-Ascend-Pre-Output-Octets',
+  'x_ascend_ft1_caller' => 'X-Ascend-FT1-Caller',
+  'usr_last_callers_number_' => 'USR-Last-Callers-Number-ANI',
+  'usr_rmmie_product_code' => 'USR-RMMIE-Product-Code',
+  'usr_igmp_robustness' => 'USR-IGMP-Robustness',
+  'ms_chap2_success' => 'MS-CHAP2-Success',
+  'ascend_home_agent_passwo' => 'Ascend-Home-Agent-Password',
+  'acc_bridging_support' => 'Acc-Bridging-Support',
+  'annex_transmit_speed' => 'Annex-Transmit-Speed',
+  'old_password' => 'Old-Password',
+  'x_ascend_metric' => 'X-Ascend-Metric',
+  'acc_clearing_location' => 'Acc-Clearing-Location',
+  'ascend_multilink_id' => 'Ascend-Multilink-ID',
+  'ascend_egress_enabled' => 'Ascend-Egress-Enabled',
+  'usr_bridging' => 'USR-Bridging',
+  'ascend_assign_ip_server' => 'Ascend-Assign-IP-Server',
+  'acc_dns_server_sec' => 'Acc-Dns-Server-Sec',
+  'ascend_home_agent_ip_add' => 'Ascend-Home-Agent-IP-Addr',
+  'usr_dnis_reauthenticatio' => 'USR-DNIS-ReAuthentication',
+  'acc_modem_error_protocol' => 'Acc-Modem-Error-Protocol',
+  'ascend_backup' => 'Ascend-Backup',
+  'usr_connect_time' => 'USR-Connect-Time',
+  'ascend_cbcp_mode' => 'Ascend-CBCP-Mode',
+  'usr_rmmie_x2_status' => 'USR-RMMIE-x2-Status',
+  'ascend_multicast_gleave_' => 'Ascend-Multicast-GLeave-Delay',
+  'erx_ingress_statistics' => 'ERX-Ingress-Statistics',
+  'cisco_nas_port' => 'Cisco-NAS-Port',
+  'le_admin_group' => 'LE-Admin-Group',
+  'annex_mrru' => 'Annex-MRRU',
+  'x_ascend_add_seconds' => 'X-Ascend-Add-Seconds',
+  'ascend_token_expiry' => 'Ascend-Token-Expiry',
+  'usr_igmp_maximum_respons' => 'USR-IGMP-Maximum-Response-Time',
+  'ascend_calling_id_presen' => 'Ascend-Calling-Id-Presentatn',
+  'connect_info' => 'Connect-Info',
+  'ascend_access_intercept_' => 'Ascend-Access-Intercept-LEA',
+  'x_ascend_dba_monitor' => 'X-Ascend-DBA-Monitor',
+  'client_dns_pri' => 'Client_DNS_Pri',
+  'ip_host_addr' => 'Ip_Host_Addr',
+  'callback_id' => 'Callback-Id',
+  'acct_mcast_out_octets' => 'Acct_Mcast_Out_Octets',
+  'acct_input_octets_64' => 'Acct_Input_Octets_64',
+  'tunnel_function' => 'Tunnel_Function',
+  'ascend_fr_direct_profile' => 'Ascend-FR-Direct-Profile',
+  'h323_incoming_conf_id' => 'h323-incoming-conf-id',
+  'ascend_ppp_vj_1172' => 'Ascend-PPP-VJ-1172',
+  'ms_new_arap_password' => 'MS-New-ARAP-Password',
+  'h323_voice_quality' => 'h323-voice-quality',
+  'framed_appletalk_network' => 'Framed-AppleTalk-Network',
+  'bind_int_interface_name' => 'Bind_Int_Interface_Name',
+  'event_timestamp' => 'Event-Timestamp',
+  'ascend_bir_enable' => 'Ascend-BIR-Enable',
+  'usr_fallback_enabled' => 'USR-Fallback-Enabled',
+  'ascend_dhcp_pool_number' => 'Ascend-DHCP-Pool-Number',
+  'acct_session_id' => 'Acct-Session-Id',
+  'ascend_private_route_req' => 'Ascend-Private-Route-Required',
+  'usr_rmmie_pwrlvl_farecho' => 'USR-RMMIE-PwrLvl-FarEcho-Canc',
+  'usr_at_input_filter' => 'USR-AT-Input-Filter',
+  'erx_egress_statistics' => 'ERX-Egress-Statistics',
+  'x_ascend_call_type' => 'X-Ascend-Call-Type',
+  'acct_tunnel_client_endpo' => 'Acct-Tunnel-Client-Endpoint',
+  'x_ascend_assign_ip_clien' => 'X-Ascend-Assign-IP-Client',
+  'ascend_if_netmask' => 'Ascend-IF-Netmask',
+  'ascend_dhcp_maximum_leas' => 'Ascend-DHCP-Maximum-Leases',
+  'usr_at_output_filter' => 'USR-AT-Output-Filter',
+  'usr_rad_dvmrp_metric' => 'USR-Rad-Dvmrp-Metric',
+  'rate_limit_rate' => 'Rate_Limit_Rate',
+  'prefix' => 'Prefix',
+  'ascend_x25_pad_banner' => 'Ascend-X25-Pad-Banner',
+  'usr_rmmie_rcv_pwrlvl_375' => 'USR-RMMIE-Rcv-PwrLvl-3750Hz',
+  'x_ascend_user_acct_key' => 'X-Ascend-User-Acct-Key',
+  'group_name' => 'Group-Name',
+  'ascend_receive_secret' => 'Ascend-Receive-Secret',
+  'reply_message' => 'Reply-Message',
+  'le_nat_sess_dir_fail_act' => 'LE-NAT-Sess-Dir-Fail-Action',
+  'framed_callback_id' => 'Framed-Callback-Id',
+  'cisco_disconnect_cause' => 'Cisco-Disconnect-Cause',
+  'stripped_user_name' => 'Stripped-User-Name',
+  'annex_keypress_timeout' => 'Annex-Keypress-Timeout',
+  'annex_receive_speed' => 'Annex-Receive-Speed',
+  'ms_chap_domain' => 'MS-CHAP-Domain',
+  'ascend_atm_connect_group' => 'Ascend-ATM-Connect-Group',
+  'usr_send_name' => 'USR-Send-Name',
+  'usr_local_framed_ip_addr' => 'USR-Local-Framed-IP-Addr',
+  'erx_alternate_cli_vroute' => 'ERX-Alternate-Cli-Vrouter-Name',
+  'usr_fallback_limit' => 'USR-Fallback-Limit',
+  'ascend_pri_number_type' => 'Ascend-PRI-Number-Type',
+  'x_ascend_minimum_channel' => 'X-Ascend-Minimum-Channels',
+  'x_ascend_fr_direct_dlci' => 'X-Ascend-FR-Direct-DLCI',
+  'ascend_fr_link_mgt' => 'Ascend-FR-Link-Mgt',
+  'annex_host_allow' => 'Annex-Host-Allow',
+  'x_ascend_force_56' => 'X-Ascend-Force-56',
+  'police_burst' => 'Police_Burst',
+  'pvc_profile_name' => 'PVC_Profile_Name',
+  'ms_filter' => 'MS-Filter',
+  'rate_limit_burst' => 'Rate_Limit_Burst',
+  'ascend_number_sessions' => 'Ascend-Number-Sessions',
+  'cisco_call_filter' => 'Cisco-Call-Filter',
+  'erx_igmp_enable' => 'ERX-Igmp-Enable',
+  'ascend_filter_required' => 'Ascend-Filter-Required',
+  'erx_cli_allow_all_vr_acc' => 'ERX-Cli-Allow-All-VR-Access',
+  'acc_callback_delay' => 'Acc-Callback-Delay',
+  'usr_default_dte_data_rat' => 'USR-Default-DTE-Data-Rate',
+  'le_ip_pool' => 'LE-IP-Pool',
+  'cisco_pre_output_packets' => 'Cisco-Pre-Output-Packets',
+  'x_ascend_group' => 'X-Ascend-Group',
+  'usr_channel_connected_to' => 'USR-Channel-Connected-To',
+  'usr_ipx_rip_output_filte' => 'USR-IPX-RIP-Output-Filter',
+  'usr_esn' => 'USR-ESN',
+  'annex_user_level' => 'Annex-User-Level',
+  'x_ascend_primary_home_ag' => 'X-Ascend-Primary-Home-Agent',
+  'no_such_attribute' => 'No-Such-Attribute',
+  'x_ascend_pri_number_type' => 'X-Ascend-PRI-Number-Type',
+  'ms_mppe_send_key' => 'MS-MPPE-Send-Key',
+  'usr_actual_voltage' => 'USR-Actual-Voltage',
+  'annex_acct_servers' => 'Annex-Acct-Servers',
+  'ascend_handle_ipx' => 'Ascend-Handle-IPX',
+  'cisco_xmit_rate' => 'Cisco-Xmit-Rate',
+  'acc_service_profile' => 'Acc-Service-Profile',
+  'x_ascend_ara_pw' => 'X-Ascend-Ara-PW',
+  'ascend_ckt_type' => 'Ascend-Ckt-Type',
+  'cisco_data_rate' => 'Cisco-Data-Rate',
+  'group' => 'Group',
+  'nas_port' => 'NAS-Port',
+  'usr_ipx_call_output_filt' => 'USR-IPX-Call-Output-Filter',
+  'tunnel_type' => 'Tunnel-Type',
+  'usr_rmmie_manufacturer_i' => 'USR-RMMIE-Manufacturer-ID',
+  'user_name_is_star' => 'User-Name-Is-Star',
+  'usr_call_arrival_in_gmt' => 'USR-Call-Arrival-in-GMT',
+  'x_ascend_number_sessions' => 'X-Ascend-Number-Sessions',
+  'ascend_send_auth' => 'Ascend-Send-Auth',
+  'user_service_type' => 'User-Service-Type',
+  'annex_cli_filter' => 'Annex-CLI-Filter',
+  'erx_cli_initial_access_l' => 'ERX-Cli-Initial-Access-Level',
+  'ascend_call_direction' => 'Ascend-Call-Direction',
+  'usr_chassis_temp_thresho' => 'USR-Chassis-Temp-Threshold',
+  'usr_pw_usr_ofilter_ipx' => 'USR-PW_USR_OFilter_IPX',
+  'tunnel_session_auth' => 'Tunnel_Session_Auth',
+  'x_ascend_connect_progres' => 'X-Ascend-Connect-Progress',
+  'ascend_atm_connect_vci' => 'Ascend-ATM-Connect-Vci',
+  'x_ascend_maximum_call_du' => 'X-Ascend-Maximum-Call-Duration',
+  'usr_rmmie_planned_discon' => 'USR-RMMIE-Planned-Disconnect',
+  'x_ascend_fr_dte_n392' => 'X-Ascend-FR-DTE-N392',
+  'login_host' => 'Login-Host',
+  'ascend_user_acct_host' => 'Ascend-User-Acct-Host',
+  'x_ascend_fr_dte_n393' => 'X-Ascend-FR-DTE-N393',
+  'acc_tunnel_secret' => 'Acc-Tunnel-Secret',
+  'usr_at_rtmp_input_filter' => 'USR-AT-RTMP-Input-Filter',
+  'framed_protocol' => 'Framed-Protocol',
+  'login_callback_number' => 'Login-Callback-Number',
+  'ascend_dsl_rate_type' => 'Ascend-Dsl-Rate-Type',
+  'ascend_pre_output_packet' => 'Ascend-Pre-Output-Packets',
+  'proxy_state' => 'Proxy-State',
+  'usr_pw_usr_ofilter_ip' => 'USR-PW_USR_OFilter_IP',
+  'cisco_data_filter' => 'Cisco-Data-Filter',
+  'cisco_target_util' => 'Cisco-Target-Util',
+  'usr_ids0_call_type' => 'USR-IDS0-Call-Type',
+  'usr_blocks_resent' => 'USR-Blocks-Resent',
+  'usr_terminal_type' => 'USR-Terminal-Type',
+  'ascend_history_weigh_typ' => 'Ascend-History-Weigh-Type',
+  'framed_routing' => 'Framed-Routing',
+  'ascend_client_assign_dns' => 'Ascend-Client-Assign-DNS',
+  'ascend_atm_group' => 'Ascend-ATM-Group',
+  'bind_bypass_bypass' => 'Bind_Bypass_Bypass',
+  'le_ip_gateway' => 'LE-IP-Gateway',
+  'cisco_ip_pool_definition' => 'Cisco-IP-Pool-Definition',
+  'x_ascend_maximum_time' => 'X-Ascend-Maximum-Time',
+  'usr_request_type' => 'USR-Request-Type',
+  'usr_call_arrival_time' => 'USR-Call-Arrival-Time',
+  'tunnel_domain' => 'Tunnel_Domain',
+  'ms_chap_nt_enc_pw' => 'MS-CHAP-NT-Enc-PW',
+  'shiva_calling_number' => 'Shiva-Calling-Number',
+  'ip_address_pool_name' => 'Ip_Address_Pool_Name',
+  'erx_secondary_dns' => 'ERX-Secondary-Dns',
+  'x_ascend_pre_input_octet' => 'X-Ascend-Pre-Input-Octets',
+  'ascend_home_agent_udp_po' => 'Ascend-Home-Agent-UDP-Port',
+  'le_nat_outsource_inmap' => 'LE-NAT-Outsource-Inmap',
+  'x_ascend_home_agent_pass' => 'X-Ascend-Home-Agent-Password',
+  'tunnel_password' => 'Tunnel-Password',
+  'usr_compression_type' => 'USR-Compression-Type',
+  'usr_connect_speed' => 'USR-Connect-Speed',
+  'usr_connect_time_limit' => 'USR-Connect-Time-Limit',
+  'arap_challenge_response' => 'ARAP-Challenge-Response',
+  'ms_link_utilization_thre' => 'MS-Link-Utilization-Threshold',
+  'usr_mp_edo' => 'USR-MP-EDO',
+  'usr_primary_nbns_server' => 'USR-Primary_NBNS_Server',
+  'usr_imsi' => 'USR-IMSI',
+  'ascend_fr_direct' => 'Ascend-FR-Direct',
+  'ascend_vrouter_name' => 'Ascend-VRouter-Name',
+  'ascend_preempt_limit' => 'Ascend-Preempt-Limit',
+  'ascend_ip_pool_definitio' => 'Ascend-IP-Pool-Definition',
+  'h323_gw_id' => 'h323-gw-id',
+  'usr_framed_ipx_route' => 'USR-Framed-IPX-Route',
+  'x_ascend_maximum_channel' => 'X-Ascend-Maximum-Channels',
+  'login_lat_node' => 'Login-LAT-Node',
+  'acct_session_time' => 'Acct-Session-Time',
+  'ascend_disconnect_cause' => 'Ascend-Disconnect-Cause',
+  'ms_mppe_encryption_polic' => 'MS-MPPE-Encryption-Policy',
+  'ms_ras_version' => 'MS-RAS-Version',
+  'class' => 'Class',
+  'caller_id' => 'Caller-ID',
+  'ascend_access_intercept_' => 'Ascend-Access-Intercept-Log',
+  'ascend_service_type' => 'Ascend-Service-Type',
+  'ascend_h323_dialed_time' => 'Ascend-H323-Dialed-Time',
+  'exec_program_wait' => 'Exec-Program-Wait',
+  'ascend_x25_nui_password_' => 'Ascend-X25-Nui-Password-Prompt',
+  'ascend_appletalk_peer_mo' => 'Ascend-Appletalk-Peer-Mode',
+  'login_lat_group' => 'Login-LAT-Group',
+  'strip_user_name' => 'Strip-User-Name',
+  'nas_ip_address' => 'NAS-IP-Address',
+  'ascend_maximum_time' => 'Ascend-Maximum-Time',
+  'erx_atm_pcr' => 'ERX-Atm-PCR',
+  'ascend_client_primary_dn' => 'Ascend-Client-Primary-DNS',
+  'auth_type' => 'Auth-Type',
+  'ascend_secondary_home_ag' => 'Ascend-Secondary-Home-Agent',
+  'x_ascend_idle_limit' => 'X-Ascend-Idle-Limit',
+  'ms_ras_vendor' => 'MS-RAS-Vendor',
+  'ascend_pre_input_packets' => 'Ascend-Pre-Input-Packets',
+  'ascend_bridge' => 'Ascend-Bridge',
+  'h323_redirect_number' => 'h323-redirect-number',
+  'usr_simplified_mnp_level' => 'USR-Simplified-MNP-Levels',
+  'annex_edo' => 'Annex-EDO',
+  'acc_nbns_server_sec' => 'Acc-Nbns-Server-Sec',
+  'ascend_cbcp_trunk_group' => 'Ascend-CBCP-Trunk-Group',
+  'x_ascend_data_svc' => 'X-Ascend-Data-Svc',
+  'le_terminate_detail' => 'LE-Terminate-Detail',
+  'acct_output_octets' => 'Acct-Output-Octets',
+  'usr_calling_party_number' => 'USR-Calling-Party-Number',
+  'x_ascend_dhcp_maximum_le' => 'X-Ascend-DHCP-Maximum-Leases',
+  'ascend_force_56' => 'Ascend-Force-56',
+  'shiva_acct_serv_switch' => 'Shiva-Acct-Serv-Switch',
+  'tunnel_algorithm' => 'Tunnel_Algorithm',
+  'usr_max_channels' => 'USR-Max-Channels',
+  'usr_port_tap_priority' => 'USR-Port-Tap-Priority',
+  'le_nat_outmap' => 'LE-NAT-Outmap',
+  'usr_call_connecting_time' => 'USR-Call-Connecting-Time',
+  'usr_supports_tags' => 'USR-Supports-Tags',
+  'idle_timeout' => 'Idle-Timeout',
+  'usr_ip_rip_input_filter' => 'USR-IP-RIP-Input-Filter',
+  'erx_ingress_policy_name' => 'ERX-Ingress-Policy-Name',
+  'usr_pw_cutoff' => 'USR-PW_Cutoff',
+  'usr_channel_expansion' => 'USR-Channel-Expansion',
+  'x_ascend_send_secret' => 'X-Ascend-Send-Secret',
+  'h323_call_origin' => 'h323-call-origin',
+  'h323_preferred_lang' => 'h323-preferred-lang',
+  'ascend_base_channel_coun' => 'Ascend-Base-Channel-Count',
+  'bind_auth_context' => 'Bind_Auth_Context',
+  'ascend_calling_id_number' => 'Ascend-Calling-Id-Number-Plan',
+  'ascend_modem_shelfno' => 'Ascend-Modem-ShelfNo',
+  'tunnel_police_burst' => 'Tunnel_Police_Burst',
+  'pvc_circuit_padding' => 'PVC_Circuit_Padding',
+  'acc_ml_call_threshold' => 'Acc-ML-Call-Threshold',
+  'usr_end_time' => 'USR-End-Time',
+  'usr_ipx' => 'USR-IPX',
+  'ms_primary_dns_server' => 'MS-Primary-DNS-Server',
+  'ascend_dsl_upstream_limi' => 'Ascend-Dsl-Upstream-Limit',
+  'usr_blocks_sent' => 'USR-Blocks-Sent',
+  'bind_dot1q_vlan_tag_id' => 'Bind_Dot1q_Vlan_Tag_Id',
+  'ascend_private_route' => 'Ascend-Private-Route',
+  'usr_back_channel_data_ra' => 'USR-Back-Channel-Data-Rate',
+  'ascend_dropped_packets' => 'Ascend-Dropped-Packets',
+  'cisco_route_ip' => 'Cisco-Route-IP',
+  'nas_identifier' => 'NAS-Identifier',
+  'ascend_presession_time' => 'Ascend-PreSession-Time',
+  'usr_call_type' => 'USR-Call-Type',
+  'usr_acct_reason_code' => 'USR-Acct-Reason-Code',
+  'acc_dialout_auth_passwor' => 'Acc-Dialout-Auth-Password',
+  'acc_connect_tx_speed' => 'Acc-Connect-Tx-Speed',
+  'cisco_pre_input_octets' => 'Cisco-Pre-Input-Octets',
+  'x_ascend_send_passwd' => 'X-Ascend-Send-Passwd',
+  'ascend_bir_bridge_group' => 'Ascend-BIR-Bridge-Group',
+  'ascend_fr_profile_name' => 'Ascend-FR-Profile-Name',
+  'ascend_group' => 'Ascend-Group',
+  'crypt_password' => 'Crypt-Password',
+  'usr_port_tap_address' => 'USR-Port-Tap-Address',
+  'le_nat_outsource_outmap' => 'LE-NAT-Outsource-Outmap',
+  'usr_vpn_encrypter' => 'USR-VPN-Encrypter',
+  'usr_blocks_received' => 'USR-Blocks-Received',
+  'tunnel_group' => 'Tunnel_Group',
+  'ascend_shared_profile_en' => 'Ascend-Shared-Profile-Enable',
+  'replicate_to_realm' => 'Replicate-To-Realm',
+  'usr_mobile_ip_address' => 'USR-Mobile-IP-Address',
+  'x_ascend_authen_alias' => 'X-Ascend-Authen-Alias',
+  'ascend_fr_linkup' => 'Ascend-FR-LinkUp',
+  'tunnel_rate_limit_rate' => 'Tunnel_Rate_Limit_Rate',
+  'acc_access_community' => 'Acc-Access-Community',
+  'x_ascend_presession_time' => 'X-Ascend-PreSession-Time',
+  'ms_chap_cpw_1' => 'MS-CHAP-CPW-1',
+  'ms_chap_cpw_2' => 'MS-CHAP-CPW-2',
+  'erx_primary_dns' => 'ERX-Primary-Dns',
+  'ascend_fr_circuit_name' => 'Ascend-FR-Circuit-Name',
+  'ascend_token_immediate' => 'Ascend-Token-Immediate',
+  'cisco_idle_limit' => 'Cisco-Idle-Limit',
+  'usr_speed_of_connection' => 'USR-Speed-Of-Connection',
+  'shiva_links_in_bundle' => 'Shiva-Links-In-Bundle',
+  'x_ascend_fr_profile_name' => 'X-Ascend-FR-Profile-Name',
+  'cisco_multilink_id' => 'Cisco-Multilink-ID',
+  'x_ascend_preempt_limit' => 'X-Ascend-Preempt-Limit',
+  'ascend_assign_ip_client' => 'Ascend-Assign-IP-Client',
+  'usr_iwf_ip_address' => 'USR-IWF-IP-Address',
+  'acct_unique_session_id' => 'Acct-Unique-Session-Id',
+  'framed_pool' => 'Framed-Pool',
+  'usr_igmp_version' => 'USR-IGMP-Version',
+  'tunnel_max_tunnels' => 'Tunnel_Max_Tunnels',
+  'annex_unauthenticated_ti' => 'Annex-Unauthenticated-Time',
+  'bg_path_cost' => 'BG_Path_Cost',
+  'ascend_client_assign_win' => 'Ascend-Client-Assign-WINS',
+  'x_ascend_dial_number' => 'X-Ascend-Dial-Number',
+  'cisco_maximum_channels' => 'Cisco-Maximum-Channels',
+  'usr_pw_framed_routing_v2' => 'USR-PW_Framed_Routing_V2',
+  'usr_channel_decrement' => 'USR-Channel-Decrement',
+  'x_ascend_route_ipx' => 'X-Ascend-Route-IPX',
+  'port_limit' => 'Port-Limit',
+  'ascend_dsl_downstream_li' => 'Ascend-Dsl-Downstream-Limit',
+  'ascend_ip_tos_precedence' => 'Ascend-IP-TOS-Precedence',
+  'usr_multicast_receive' => 'USR-Multicast-Receive',
+  'usr_auth_mode' => 'USR-Auth-Mode',
+  'expiration' => 'Expiration',
+  'x_ascend_fr_circuit_name' => 'X-Ascend-FR-Circuit-Name',
+  'x_ascend_token_immediate' => 'X-Ascend-Token-Immediate',
+  'ascend_ft1_caller' => 'Ascend-FT1-Caller',
+  'shiva_event_flags' => 'Shiva-Event-Flags',
+  'framed_netmask' => 'Framed-Netmask',
+  'ascend_minimum_channels' => 'Ascend-Minimum-Channels',
+  'acc_ml_damping_factor' => 'Acc-ML-Damping-Factor',
+  'bind_sub_password' => 'Bind_Sub_Password',
+  'ascend_ip_tos_apply_to' => 'Ascend-IP-TOS-Apply-To',
+  'x_ascend_home_agent_udp_' => 'X-Ascend-Home-Agent-UDP-Port',
+  'x_ascend_menu_item' => 'X-Ascend-Menu-Item',
+  'ascend_session_type' => 'Ascend-Session-Type',
+  'usr_pw_packet' => 'USR-PW_Packet',
+  'session' => 'Session',
+  'usr_mic' => 'USR-MIC',
+  'usr_line_reversals' => 'USR-Line-Reversals',
+  'assigned_ip_address' => 'Assigned_IP_Address',
+  'cisco_ip_direct' => 'Cisco-IP-Direct',
+  'le_ipsec_log_options' => 'LE-IPSec-Log-Options',
+  'tunnel_rate_limit_burst' => 'Tunnel_Rate_Limit_Burst',
+  'x_ascend_assign_ip_globa' => 'X-Ascend-Assign-IP-Global-Pool',
+  'x_ascend_inc_channel_cou' => 'X-Ascend-Inc-Channel-Count',
+  'h323_return_code' => 'h323-return-code',
+  'shiva_disconnect_reason' => 'Shiva-Disconnect-Reason',
+  'filter_id' => 'Filter-Id',
+  'usr_appletalk_network_ra' => 'USR-Appletalk-Network-Range',
+  'ascend_temporary_rtes' => 'Ascend-Temporary-Rtes',
+  'ascend_h323_conference_i' => 'Ascend-H323-Conference-Id',
+  'h323_billing_model' => 'h323-billing-model',
+  'usr_bearer_capabilities' => 'USR-Bearer-Capabilities',
+  'framed_appletalk_zone' => 'Framed-AppleTalk-Zone',
+  'usr_harc_disconnect_code' => 'USR-HARC-Disconnect-Code',
+  'usr_ipx_rip_input_filter' => 'USR-IPX-RIP-Input-Filter',
+  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Bound',
+  'ascend_pw_lifetime' => 'Ascend-PW-Lifetime',
+  'acc_dialout_auth_usernam' => 'Acc-Dialout-Auth-Username',
+  'ascend_x25_pad_x3_parame' => 'Ascend-X25-Pad-X3-Parameters',
+  'bind_dot1q_slot' => 'Bind_Dot1q_Slot',
+  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-RtLim',
+  'x_ascend_multicast_clien' => 'X-Ascend-Multicast-Client',
+  'ascend_authen_alias' => 'Ascend-Authen-Alias',
+  'ascend_dec_channel_count' => 'Ascend-Dec-Channel-Count',
+  'dhcp_max_leases' => 'DHCP_Max_Leases',
+  'shiva_called_number' => 'Shiva-Called-Number',
+  'annex_tunnel_authen_mode' => 'Annex-Tunnel-Authen-Mode',
+  'usr_call_error_code' => 'USR-Call-Error-Code',
+  'x_ascend_user_acct_type' => 'X-Ascend-User-Acct-Type',
+  'ascend_atm_connect_vpi' => 'Ascend-ATM-Connect-Vpi',
+  'ascend_x25_pad_x3_profil' => 'Ascend-X25-Pad-X3-Profile',
+  'usr_mobileip_home_agent_' => 'USR-MobileIP-Home-Agent-Address',
+  'suffix' => 'Suffix',
+  'bind_tun_context' => 'Bind_Tun_Context',
+  'x_ascend_ppp_address' => 'X-Ascend-PPP-Address',
+  'usr_dtr_false_timeout' => 'USR-DTR-False-Timeout',
+  'usr_final_rx_link_data_r' => 'USR-Final-Rx-Link-Data-Rate',
+  'ms_chap_error' => 'MS-CHAP-Error',
+  'x_ascend_home_agent_ip_a' => 'X-Ascend-Home-Agent-IP-Addr',
+  'ascend_data_svc' => 'Ascend-Data-Svc',
+  'usr_rmmie_pwrlvl_noise_l' => 'USR-RMMIE-PwrLvl-Noise-Lvl',
+  'usr_dtr_true_timeout' => 'USR-DTR-True-Timeout',
+  'context_name' => 'Context-Name',
+  'usr_card_type' => 'USR-Card-Type',
+  'ascend_fr_link_status_dl' => 'Ascend-FR-Link-Status-DLCI',
+  'annex_sec_profile_index' => 'Annex-Sec-Profile-Index',
+  'usr_pw_usr_ofilter_sap' => 'USR-PW_USR_OFilter_SAP',
+  'tunnel_medium_type' => 'Tunnel-Medium-Type',
+  'x_ascend_require_auth' => 'X-Ascend-Require-Auth',
+  'ascend_connect_progress' => 'Ascend-Connect-Progress',
+  'x_ascend_modem_shelfno' => 'X-Ascend-Modem-ShelfNo',
+  'cisco_pre_input_packets' => 'Cisco-Pre-Input-Packets',
+  'ascend_fr_dce_n392' => 'Ascend-FR-DCE-N392',
+  'ascend_fr_dce_n393' => 'Ascend-FR-DCE-N393',
+  'ascend_client_primary_wi' => 'Ascend-Client-Primary-WINS',
+  'shiva_link_protocol' => 'Shiva-Link-Protocol',
+  'bridge_group' => 'Bridge_Group',
+  'client_port_dnis' => 'Client-Port-DNIS',
+  'usr_mpip_tunnel_originat' => 'USR-MPIP-Tunnel-Originator',
+  'le_nat_log_options' => 'LE-NAT-Log-Options',
+  'usr_number_of_rings_limi' => 'USR-Number-of-Rings-Limit',
+  'usr_retrains_granted' => 'USR-Retrains-Granted',
+  'acc_ip_gateway_pri' => 'Acc-Ip-Gateway-Pri',
+  'usr_number_of_fallbacks' => 'USR-Number-of-Fallbacks',
+  'usr_tunnel_auth_hostname' => 'USR-Tunnel-Auth-Hostname',
+  'annex_filter' => 'Annex-Filter',
+  'ascend_mtu' => 'Ascend-MTU',
+  'ms_arap_pw_change_reason' => 'MS-ARAP-PW-Change-Reason',
+  'private_group_id' => 'Private-Group-Id',
+  'ascend_cache_time' => 'Ascend-Cache-Time',
+  'acc_ml_clear_threshold' => 'Acc-ML-Clear-Threshold',
+  'x_ascend_dhcp_reply' => 'X-Ascend-DHCP-Reply',
+  'ascend_h323_gatekeeper' => 'Ascend-H323-Gatekeeper',
+  'x_ascend_xmit_rate' => 'X-Ascend-Xmit-Rate',
+  'usr_last_number_dialed_o' => 'USR-Last-Number-Dialed-Out',
+  'acc_connect_rx_speed' => 'Acc-Connect-Rx-Speed',
+  'acc_clearing_cause' => 'Acc-Clearing-Cause',
+  'ascend_call_attempt_limi' => 'Ascend-Call-Attempt-Limit',
+  'x_ascend_data_rate' => 'X-Ascend-Data-Rate',
+  'termination_action' => 'Termination-Action',
+  'ascend_pre_input_octets' => 'Ascend-Pre-Input-Octets',
+  'x_ascend_ipx_route' => 'X-Ascend-IPX-Route',
+  'x_ascend_ts_idle_mode' => 'X-Ascend-TS-Idle-Mode',
+  'client_ip_address' => 'Client-IP-Address',
+  'ascend_add_seconds' => 'Ascend-Add-Seconds',
+  'login_ip_host' => 'Login-IP-Host',
+  'annex_sw_version' => 'Annex-SW-Version',
+  'huntgroup_name' => 'Huntgroup-Name',
+  'usr_pw_vpn_gateway' => 'USR-PW_VPN_Gateway',
+  'ascend_x25_reverse_charg' => 'Ascend-X25-Reverse-Charging',
+  'lac_real_port' => 'LAC_Real_Port',
+  'ascend_dba_monitor' => 'Ascend-DBA-Monitor',
+  'annex_user_server_locati' => 'Annex-User-Server-Location',
+  'ascend_h323_fegw_address' => 'Ascend-H323-Fegw-Address',
+  'acct_output_gigawords' => 'Acct-Output-Gigawords',
+  'bind_l2tp_tunnel_name' => 'Bind_L2TP_Tunnel_Name',
+  'x_ascend_token_idle' => 'X-Ascend-Token-Idle',
+  'acc_apsm_oversubscribed' => 'Acc-Apsm-Oversubscribed',
+  'ip_tos_field' => 'IP_TOS_Field',
+  'ascend_dsl_cir_xmit_limi' => 'Ascend-Dsl-CIR-Xmit-Limit',
+  'usr_number_of_link_naks' => 'USR-Number-of-Link-NAKs',
+  'framed_address' => 'Framed-Address',
+  'x_ascend_num_in_multilin' => 'X-Ascend-Num-In-Multilink',
+  'hint' => 'Hint',
+  'ascend_source_ip_check' => 'Ascend-Source-IP-Check',
+  'arap_zone_access' => 'ARAP-Zone-Access',
+  'x_ascend_fr_direct_profi' => 'X-Ascend-FR-Direct-Profile',
+  'x_ascend_bridge_address' => 'X-Ascend-Bridge-Address',
+  'usr_iwf_call_identifier' => 'USR-IWF-Call-Identifier',
+  'ascend_home_network_name' => 'Ascend-Home-Network-Name',
+  'ascend_require_auth' => 'Ascend-Require-Auth',
+  'source_validation' => 'Source_Validation',
+  'ms_primary_nbns_server' => 'MS-Primary-NBNS-Server',
+  'h323_setup_time' => 'h323-setup-time',
+  'tunnel_remote_name' => 'Tunnel_Remote_Name',
+  'ascend_maximum_channels' => 'Ascend-Maximum-Channels',
+  'ascend_tunneling_protoco' => 'Ascend-Tunneling-Protocol',
+  'arap_security_data' => 'ARAP-Security-Data',
+  'ascend_ipx_peer_mode' => 'Ascend-IPX-Peer-Mode',
+  'ascend_cir_timer' => 'Ascend-CIR-Timer',
+  'ascend_ts_idle_limit' => 'Ascend-TS-Idle-Limit',
+  'ascend_cache_refresh' => 'Ascend-Cache-Refresh',
+  'usr_rmmie_status' => 'USR-RMMIE-Status',
+  'annex_callback_portlist' => 'Annex-Callback-Portlist',
+  'usr_port_tap' => 'USR-Port-Tap',
+  'ascend_client_secondary_' => 'Ascend-Client-Secondary-DNS',
+  'x_ascend_first_dest' => 'X-Ascend-First-Dest',
+  'lac_port' => 'LAC_Port',
+  'acc_callback_cbcp_type' => 'Acc-Callback-CBCP-Type',
+  'usr_call_reference_numbe' => 'USR-Call-Reference-Number',
+  'mcast_receive' => 'Mcast_Receive',
+  'x_ascend_link_compressio' => 'X-Ascend-Link-Compression',
+  'ascend_inter_arrival_jit' => 'Ascend-Inter-Arrival-Jitter',
+  'x_ascend_assign_ip_pool' => 'X-Ascend-Assign-IP-Pool',
+  'usr_chassis_call_span' => 'USR-Chassis-Call-Span',
+  'arap_password' => 'ARAP-Password',
+  'usr_ip_default_route_opt' => 'USR-IP-Default-Route-Option',
+  'ascend_endpoint_disc' => 'Ascend-Endpoint-Disc',
+  'tunnel_dnis' => 'Tunnel_DNIS',
+  'ms_acct_auth_type' => 'MS-Acct-Auth-Type',
+  'ascend_ts_idle_mode' => 'Ascend-TS-Idle-Mode',
+  'shasta_service_profile' => 'Shasta-Service-Profile',
+  'usr_cdma_call_reference_' => 'USR-CDMA-Call-Reference-Number',
+  'usr_at_zip_input_filter' => 'USR-AT-Zip-Input-Filter',
+  'x_ascend_pw_warntime' => 'X-Ascend-PW-Warntime',
+  'ascend_fr_direct_dlci' => 'Ascend-FR-Direct-DLCI',
+  'usr_dte_ring_no_answer_l' => 'USR-DTE-Ring-No-Answer-Limit',
+  'ascend_multicast_rate_li' => 'Ascend-Multicast-Rate-Limit',
+  'usr_routing_protocol' => 'USR-Routing-Protocol',
+  'pam_auth' => 'Pam-Auth',
+  'client_dns_sec' => 'Client_DNS_Sec',
+  'bg_trans_bpdu' => 'BG_Trans_BPDU',
+  'police_rate' => 'Police_Rate',
+  'calling_station_id' => 'Calling-Station-Id',
+  'usr_called_party_number' => 'USR-Called-Party-Number',
+  'shiva_network_protocols' => 'Shiva-Network-Protocols',
+  'x_ascend_client_gateway' => 'X-Ascend-Client-Gateway',
+  'acct_input_octets' => 'Acct-Input-Octets',
+  'ascend_call_type' => 'Ascend-Call-Type',
+  'annex_product_name' => 'Annex-Product-Name',
+  'framed_compression' => 'Framed-Compression',
+  'ascend_atm_direct' => 'Ascend-ATM-Direct',
+  'x_ascend_remote_addr' => 'X-Ascend-Remote-Addr',
+  'usr_tunneled_mlpp' => 'USR-Tunneled-MLPP',
+  'le_ipsec_outsource_profi' => 'LE-IPSec-Outsource-Profile',
+  'ascend_atm_vci' => 'Ascend-ATM-Vci',
+  'usr_number_of_link_timeo' => 'USR-Number-of-Link-Timeouts',
+  'usr_et_bridge_input_filt' => 'USR-ET-Bridge-Input-Filter',
+  'x_ascend_fr_t391' => 'X-Ascend-FR-T391',
+  'x_ascend_fr_t392' => 'X-Ascend-FR-T392',
+  'h323_conf_id' => 'h323-conf-id',
+  'usr_call_end_date_time' => 'USR-Call-End-Date-Time',
+  'ascend_fr_t391' => 'Ascend-FR-T391',
+  'bg_aging_time' => 'BG_Aging_Time',
+  'x_ascend_pre_output_pack' => 'X-Ascend-Pre-Output-Packets',
+  'acc_dialout_auth_mode' => 'Acc-Dialout-Auth-Mode',
+  'ascend_calling_subaddres' => 'Ascend-Calling-Subaddress',
+  'ascend_fr_t392' => 'Ascend-FR-T392',
+  'acct_link_count' => 'Acct-Link-Count',
+  'usr_chassis_call_slot' => 'USR-Chassis-Call-Slot',
+  'h323_credit_time' => 'h323-credit-time',
+  'nas_port_id' => 'NAS-Port-Id',
+  'x_ascend_call_filter' => 'X-Ascend-Call-Filter',
+  'ascend_destination_nas_p' => 'Ascend-Destination-Nas-Port',
+  'arap_features' => 'ARAP-Features',
+  'x_ascend_history_weigh_t' => 'X-Ascend-History-Weigh-Type',
+  'annex_host_restrict' => 'Annex-Host-Restrict',
+  'usr_compression_reset_mo' => 'USR-Compression-Reset-Mode',
+  'cisco_maximum_time' => 'Cisco-Maximum-Time',
+  'tunnel_max_sessions' => 'Tunnel_Max_Sessions',
+  'bind_ses_context' => 'Bind_Ses_Context',
+  'x_ascend_ppp_vj_slot_com' => 'X-Ascend-PPP-VJ-Slot-Comp',
+  'usr_mobile_numbytes_rxed' => 'USR-Mobile-NumBytes-Rxed',
+  'usr_rmmie_last_update_ti' => 'USR-RMMIE-Last-Update-Time',
+  'ascend_atm_loopback_cell' => 'Ascend-ATM-Loopback-Cell-Loss',
+  'ascend_bir_proxy' => 'Ascend-BIR-Proxy',
+  'acct_mcast_in_packets' => 'Acct_Mcast_In_Packets',
+  'shiva_type_of_service' => 'Shiva-Type-Of-Service',
+  'ascend_fr_dte_n392' => 'Ascend-FR-DTE-N392',
+  'usr_at_call_input_filter' => 'USR-AT-Call-Input-Filter',
+  'ascend_fr_dte_n393' => 'Ascend-FR-DTE-N393',
+  'x_ascend_backup' => 'X-Ascend-Backup',
+  'char_noecho' => 'Char-Noecho',
+  'usr_rmmie_last_update_ev' => 'USR-RMMIE-Last-Update-Event',
+  'le_advice_of_charge' => 'LE-Advice-of-Charge',
+  'ascend_calling_id_type_o' => 'Ascend-Calling-Id-Type-Of-Num',
+  'ascend_pppoe_enable' => 'Ascend-PPPoE-Enable',
+  'usr_sync_async_mode' => 'USR-Sync-Async-Mode',
+  'state' => 'State',
+  'x_ascend_user_acct_base' => 'X-Ascend-User-Acct-Base',
+  'x_ascend_ipx_alias' => 'X-Ascend-IPX-Alias',
+  'ascend_ip_tos' => 'Ascend-IP-TOS',
+  'annex_secondary_dns_serv' => 'Annex-Secondary-DNS-Server',
+  'tunnel_session_auth_ctx' => 'Tunnel_Session_Auth_Ctx',
+  'usr_mbi_ct_pri_card_span' => 'USR-Mbi_Ct_PRI_Card_Span_Line',
+  'usr_call_event_code' => 'USR-Call-Event-Code',
+  'chap_password' => 'CHAP-Password',
+  'le_nat_tcp_session_timeo' => 'LE-NAT-TCP-Session-Timeout',
+  'usr_call_start_date_time' => 'USR-Call-Start-Date-Time',
+  'usr_multicast_forwarding' => 'USR-Multicast-Forwarding',
+  'client_id' => 'Client-Id',
+  'sql_user_name' => 'SQL-User-Name',
+  'x_ascend_billing_number' => 'X-Ascend-Billing-Number',
+  'ms_secondary_nbns_server' => 'MS-Secondary-NBNS-Server',
+  'cisco_num_in_multilink' => 'Cisco-Num-In-Multilink',
+  'x_ascend_client_assign_d' => 'X-Ascend-Client-Assign-DNS',
+  'x_ascend_user_acct_port' => 'X-Ascend-User-Acct-Port',
+  'usr_local_ip_address' => 'USR-Local-IP-Address',
+  'x_ascend_ip_pool_definit' => 'X-Ascend-IP-Pool-Definition',
+  'ascend_metric' => 'Ascend-Metric',
+  'x_ascend_bacp_enable' => 'X-Ascend-BACP-Enable',
+  'x_ascend_user_acct_time' => 'X-Ascend-User-Acct-Time',
+  'x_ascend_mpp_idle_percen' => 'X-Ascend-MPP-Idle-Percent',
+  'annex_authen_servers' => 'Annex-Authen-Servers',
+  'x_ascend_data_filter' => 'X-Ascend-Data-Filter',
+  'ascend_idle_limit' => 'Ascend-Idle-Limit',
+  'ldap_userdn' => 'Ldap-UserDn',
+  'x_ascend_target_util' => 'X-Ascend-Target-Util',
+  'shiva_connect_reason' => 'Shiva-Connect-Reason',
+  'usr_ds0' => 'USR-DS0',
+  'annex_re_chap_timeout' => 'Annex-Re-CHAP-Timeout',
+  'shasta_vpn_name' => 'Shasta-VPN-Name',
+  'acct_tunnel_connection_i' => 'Acct-Tunnel-Connection-Id',
+  'h323_prompt_id' => 'h323-prompt-id',
+  'x_ascend_ipx_peer_mode' => 'X-Ascend-IPX-Peer-Mode',
+  'ascend_numbering_plan_id' => 'Ascend-Numbering-Plan-ID',
+  'x_ascend_ts_idle_limit' => 'X-Ascend-TS-Idle-Limit',
+  'ascend_atm_fault_managem' => 'Ascend-ATM-Fault-Management',
+  'annex_primary_nbns_serve' => 'Annex-Primary-NBNS-Server',
+  'lac_port_type' => 'LAC_Port_Type',
+  'usr_initial_rx_link_data' => 'USR-Initial-Rx-Link-Data-Rate',
+  'usr_interface_index' => 'USR-Interface-Index',
+  'usr_expansion_algorithm' => 'USR-Expansion-Algorithm',
+  'ascend_tunnel_vrouter_na' => 'Ascend-Tunnel-VRouter-Name',
+  'usr_pw_vpn_neighbor' => 'USR-PW_VPN_Neighbor',
+  'bind_type' => 'Bind_Type',
+  'acc_ccp_option' => 'Acc-Ccp-Option',
+  'ascend_route_appletalk' => 'Ascend-Route-Appletalk',
+  'erx_alternate_cli_access' => 'ERX-Alternate-Cli-Access-Level',
+  'usr_at_rtmp_output_filte' => 'USR-AT-RTMP-Output-Filter',
+  'erx_atm_mbs' => 'ERX-Atm-MBS',
+  'usr_at_call_output_filte' => 'USR-AT-Call-Output-Filter',
+  'ms_old_arap_password' => 'MS-Old-ARAP-Password',
+  'x_ascend_client_primary_' => 'X-Ascend-Client-Primary-DNS',
+  'x_ascend_host_info' => 'X-Ascend-Host-Info',
+  'bind_auth_protocol' => 'Bind_Auth_Protocol',
+  'cisco_link_compression' => 'Cisco-Link-Compression',
+  'annex_syslog_tap' => 'Annex-Syslog-Tap',
+  'tunnel_window' => 'Tunnel_Window',
+  'usr_gateway_ip_address' => 'USR-Gateway-IP-Address',
+  'ascend_redirect_number' => 'Ascend-Redirect-Number',
+  'x_ascend_secondary_home_' => 'X-Ascend-Secondary-Home-Agent',
+  'usr_pw_index' => 'USR-PW_Index',
+  'le_multicast_client' => 'LE-Multicast-Client',
+  'annex_modem_disc_reason' => 'Annex-Modem-Disc-Reason',
+  'annex_primary_dns_server' => 'Annex-Primary-DNS-Server',
+  'erx_secondary_wins' => 'ERX-Secondary-Wins',
+  'fall_through' => 'Fall-Through',
+  'acct_mcast_out_packets' => 'Acct_Mcast_Out_Packets',
+  'x_ascend_transit_number' => 'X-Ascend-Transit-Number',
+  'usr_unauthenticated_time' => 'USR-Unauthenticated-Time',
+  'le_ipsec_active_profile' => 'LE-IPSec-Active-Profile',
+  'ascend_ip_pool_chaining' => 'Ascend-IP-Pool-Chaining',
+  'usr_syslog_tap' => 'USR-Syslog-Tap',
+  'ascend_multicast_client' => 'Ascend-Multicast-Client',
+  'usr_device_connected_to' => 'USR-Device-Connected-To',
+  'tunnel_l2f_second_passwo' => 'Tunnel_L2F_Second_Password',
+  'add_prefix' => 'Add-Prefix',
+  'tunnel_cmd_timeout' => 'Tunnel_Cmd_Timeout',
+  'x_ascend_remove_seconds' => 'X-Ascend-Remove-Seconds',
+  'acct_mcast_in_octets' => 'Acct_Mcast_In_Octets',
+  'ascend_appletalk_route' => 'Ascend-Appletalk-Route',
+  'ascend_fcp_parameter' => 'Ascend-FCP-Parameter',
+  'acc_ip_compression' => 'Acc-Ip-Compression',
+  'usr_modem_training_time' => 'USR-Modem-Training-Time',
+  'usr_primary_dns_server' => 'USR-Primary_DNS_Server',
+  'erx_egress_policy_name' => 'ERX-Egress-Policy-Name',
+  'x_ascend_base_channel_co' => 'X-Ascend-Base-Channel-Count',
+  'x_ascend_pre_input_packe' => 'X-Ascend-Pre-Input-Packets',
+  'password_retry' => 'Password-Retry',
+  'ascend_source_auth' => 'Ascend-Source-Auth',
+  'cisco_pw_lifetime' => 'Cisco-PW-Lifetime',
+  'acc_dns_server_pri' => 'Acc-Dns-Server-Pri',
+  'ascend_netware_timeout' => 'Ascend-Netware-timeout',
+  'ascend_ppp_async_map' => 'Ascend-PPP-Async-Map',
+  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Ttl',
+  'x_ascend_modem_slotno' => 'X-Ascend-Modem-SlotNo',
+  'x_ascend_ip_direct' => 'X-Ascend-IP-Direct',
+  'simultaneous_use' => 'Simultaneous-Use',
+  'erx_virtual_router_name' => 'ERX-Virtual-Router-Name',
+  'ascend_bridge_non_pppoe' => 'Ascend-Bridge-Non-PPPoE',
+  'ascend_fr_08_mode' => 'Ascend-FR-08-Mode',
+  'h323_call_type' => 'h323-call-type',
+  'tunnel_context' => 'Tunnel_Context',
+  'usr_transmit_acc_map' => 'USR-Transmit-Acc-Map',
+  'usr_ipx_wan' => 'USR-IPX-WAN',
+  'usr_ip_call_input_filter' => 'USR-IP-Call-Input-Filter',
+  'usr_call_connect_in_gmt' => 'USR-Call-Connect-in-GMT',
+  'acct_multi_session_id' => 'Acct-Multi-Session-Id',
+  'usr_reply_script1' => 'USR-Reply-Script1',
+  'cisco_ppp_vj_slot_comp' => 'Cisco-PPP-VJ-Slot-Comp',
+  'usr_reply_script2' => 'USR-Reply-Script2',
+  'usr_reply_script3' => 'USR-Reply-Script3',
+  'usr_reply_script4' => 'USR-Reply-Script4',
+  'usr_reply_script5' => 'USR-Reply-Script5',
+  'usr_reply_script6' => 'USR-Reply-Script6',
+  'user_category' => 'User-Category',
+  'mcast_send' => 'Mcast_Send',
+  'ascend_send_secret' => 'Ascend-Send-Secret',
+  'usr_tunnel_switch_endpoi' => 'USR-Tunnel-Switch-Endpoint',
+  'tunnel_retransmit' => 'Tunnel_Retransmit',
+  'add_port_to_ip_address' => 'Add-Port-To-IP-Address',
+  'ascend_ipx_node_addr' => 'Ascend-IPX-Node-Addr',
+  'x_ascend_netware_timeout' => 'X-Ascend-Netware-timeout',
+  'erx_sa_validate' => 'ERX-Sa-Validate',
+  'le_ipsec_passive_profile' => 'LE-IPSec-Passive-Profile',
+  'usr_chassis_slot' => 'USR-Chassis-Slot',
+  'usr_final_tx_link_data_r' => 'USR-Final-Tx-Link-Data-Rate',
+  'usr_nfas_id' => 'USR-NFAS-ID',
+  'called_station_id' => 'Called-Station-Id',
+  'login_lat_port' => 'Login-LAT-Port',
+  'ascend_dialed_number' => 'Ascend-Dialed-Number',
+  'h323_credit_amount' => 'h323-credit-amount',
+  'tunnel_local_name' => 'Tunnel_Local_Name',
+  'framed_ip_netmask' => 'Framed-IP-Netmask',
+  'client_port_id' => 'Client-Port-Id',
+  'bg_span_dis' => 'BG_Span_Dis',
+  'multi_link_flag' => 'Multi-Link-Flag',
+  'bind_sub_user_at_context' => 'Bind_Sub_User_At_Context',
+  'usr_ipx_routing' => 'USR-IPX-Routing',
+  'ascend_fr_nailed_grp' => 'Ascend-FR-Nailed-Grp',
+  'ascend_pre_output_octets' => 'Ascend-Pre-Output-Octets',
+  'pppoe_url' => 'PPPOE_URL',
+  'ascend_ara_pw' => 'Ascend-Ara-PW',
+  'acc_callback_mode' => 'Acc-Callback-Mode',
+  'usr_server_time' => 'USR-Server-Time',
+  'ascend_seconds_of_histor' => 'Ascend-Seconds-Of-History',
+  'ns_mta_md5_password' => 'NS-MTA-MD5-Password',
+  'tunnel_server_endpoint' => 'Tunnel-Server-Endpoint',
+  'usr_channel' => 'USR-Channel',
+  'ascend_dsl_cir_recv_limi' => 'Ascend-Dsl-CIR-Recv-Limit',
+  'acct_session_start_time' => 'Acct-Session-Start-Time',
+  'ascend_send_passwd' => 'Ascend-Send-Passwd',
+  'ascend_num_in_multilink' => 'Ascend-Num-In-Multilink',
+  'usr_ip_rip_policies' => 'USR-IP-RIP-Policies',
+  'vendor_specific' => 'Vendor-Specific',
+  'x_ascend_event_type' => 'X-Ascend-Event-Type',
+  'lac_real_port_type' => 'LAC_Real_Port_Type',
+  'x_ascend_modem_portno' => 'X-Ascend-Modem-PortNo',
+  'usr_originate_answer_mod' => 'USR-Originate-Answer-Mode',
+  'framed_ipx_network' => 'Framed-IPX-Network',
+  'ascend_modem_slotno' => 'Ascend-Modem-SlotNo',
+  'ms_mppe_encryption_type' => 'MS-MPPE-Encryption-Type',
+  'annex_cli_command' => 'Annex-CLI-Command',
+  'acct_status_type' => 'Acct-Status-Type',
+  'usr_et_bridge_call_outpu' => 'USR-ET-Bridge-Call-Output-Filte',
+  'usr_pw_vpn_id' => 'USR-PW_VPN_ID',
+  'usr_sap_filter_in' => 'USR-SAP-Filter-In',
+  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Proto',
+  'annex_audit_level' => 'Annex-Audit-Level',
+  'x_ascend_shared_profile_' => 'X-Ascend-Shared-Profile-Enable',
+  'ascend_dial_number' => 'Ascend-Dial-Number',
+  'ascend_link_compression' => 'Ascend-Link-Compression',
+  'usr_event_date_time' => 'USR-Event-Date-Time',
+  'usr_mp_edo_hiper' => 'USR-MP-EDO-HIPER',
+  'usr_re_chap_timeout' => 'USR-Re-Chap-Timeout',
+  'x_ascend_third_prompt' => 'X-Ascend-Third-Prompt',
+  'x_ascend_ppp_vj_1172' => 'X-Ascend-PPP-VJ-1172',
+  'annex_disconnect_reason' => 'Annex-Disconnect-Reason',
+  'ascend_fr_svc_addr' => 'Ascend-FR-SVC-Addr',
+  'nas_real_port' => 'NAS_Real_Port',
+  'usr_power_supply_number' => 'USR-Power-Supply-Number',
+  'ms_secondary_dns_server' => 'MS-Secondary-DNS-Server',
+  'ascend_port_redir_server' => 'Ascend-Port-Redir-Server',
+  'ascend_x25_pad_alias_1' => 'Ascend-X25-Pad-Alias-1',
+  'x_ascend_fcp_parameter' => 'X-Ascend-FCP-Parameter',
+  'ascend_x25_pad_alias_2' => 'Ascend-X25-Pad-Alias-2',
+  'ascend_ipsec_profile' => 'Ascend-IPSEC-Profile',
+  'ascend_x25_pad_alias_3' => 'Ascend-X25-Pad-Alias-3',
+  'usr_mobile_numbytes_txed' => 'USR-Mobile-NumBytes-Txed',
+  'ascend_atm_vpi' => 'Ascend-ATM-Vpi',
+  'annex_input_filter' => 'Annex-Input-Filter',
+  'menu' => 'Menu',
+  'x_ascend_route_ip' => 'X-Ascend-Route-IP',
+  'usr_rmmie_num_of_updates' => 'USR-RMMIE-Num-Of-Updates',
+  'acc_request_type' => 'Acc-Request-Type',
+  'ascend_dhcp_reply' => 'Ascend-DHCP-Reply',
+  'usr_number_of_upshifts' => 'USR-Number-of-Upshifts',
+  'usr_rmmie_firmware_versi' => 'USR-RMMIE-Firmware-Version',
+  'bind_bypass_context' => 'Bind_Bypass_Context',
+  'ascend_dialout_allowed' => 'Ascend-Dialout-Allowed',
+  'annex_tunnel_authen_type' => 'Annex-Tunnel-Authen-Type',
+  'x_ascend_bridge' => 'X-Ascend-Bridge',
+  'ascend_client_secondary_' => 'Ascend-Client-Secondary-WINS',
+  'erx_local_loopback_inter' => 'ERX-Local-Loopback-Interface',
+  'acct_input_gigawords' => 'Acct-Input-Gigawords',
+  'usr_equalization_type' => 'USR-Equalization-Type',
+  'usr_port_tap_format' => 'USR-Port-Tap-Format',
+  'x_ascend_ppp_async_map' => 'X-Ascend-PPP-Async-Map',
+  'acc_ipx_compression' => 'Acc-Ipx-Compression',
+  'ascend_nas_port_format' => 'Ascend-NAS-Port-Format',
+  'acc_modem_modulation_typ' => 'Acc-Modem-Modulation-Type',
+  'ascend_modem_portno' => 'Ascend-Modem-PortNo',
+  'usr_et_bridge_output_fil' => 'USR-ET-Bridge-Output-Filter',
+  'ascend_ipx_header_compre' => 'Ascend-IPX-Header-Compression',
+  'framed_appletalk_link' => 'Framed-AppleTalk-Link',
+  'x_ascend_receive_secret' => 'X-Ascend-Receive-Secret',
+  'ascend_route_ipx' => 'Ascend-Route-IPX',
+  'ascend_user_acct_type' => 'Ascend-User-Acct-Type',
+  'ascend_token_idle' => 'Ascend-Token-Idle',
+  'framed_ip_address' => 'Framed-IP-Address',
+  'ascend_call_block_durati' => 'Ascend-Call-Block-Duration',
+  'ascend_ppp_address' => 'Ascend-PPP-Address',
+  'usr_mbi_ct_pri_card_slot' => 'USR-Mbi_Ct_PRI_Card_Slot',
+  'x_ascend_dec_channel_cou' => 'X-Ascend-Dec-Channel-Count',
+  'x_ascend_send_auth' => 'X-Ascend-Send-Auth',
+  'usr_characters_received' => 'USR-Characters-Received',
+  'usr_pw_tunnel_authentica' => 'USR-PW_Tunnel_Authentication',
+  'usr_call_end_time' => 'USR-Call-End-Time',
+  'x_ascend_dialout_allowed' => 'X-Ascend-Dialout-Allowed',
+  'x_ascend_call_attempt_li' => 'X-Ascend-Call-Attempt-Limit',
+  'initial_modulation_type' => 'Initial-Modulation-Type',
+  'usr_packet_bus_session' => 'USR-Packet-Bus-Session',
+  'x_ascend_ipx_node_addr' => 'X-Ascend-IPX-Node-Addr',
+  'ascend_ppp_vj_slot_comp' => 'Ascend-PPP-VJ-Slot-Comp',
+  'ascend_menu_item' => 'Ascend-Menu-Item',
+  'x_ascend_fr_link_mgt' => 'X-Ascend-FR-Link-Mgt',
+  'usr_rmmie_serial_number' => 'USR-RMMIE-Serial-Number',
+  'message_authenticator' => 'Message-Authenticator',
+  'usr_dte_data_idle_timout' => 'USR-DTE-Data-Idle-Timout',
+  'usr_port_tap_facility' => 'USR-Port-Tap-Facility',
+  'acc_ml_mlx_admin_state' => 'Acc-ML-MLX-Admin-State',
+  'usr_modem_group' => 'USR-Modem-Group',
+  'x_ascend_callback' => 'X-Ascend-Callback',
+  'acct_input_packets_64' => 'Acct_Input_Packets_64',
+  'ascend_third_prompt' => 'Ascend-Third-Prompt',
+  'configuration_token' => 'Configuration-Token',
+  'x_ascend_fr_nailed_grp' => 'X-Ascend-FR-Nailed-Grp',
+  'acct_output_octets_64' => 'Acct_Output_Octets_64',
+  'h323_time_and_day' => 'h323-time-and-day',
+  'ascend_port_redir_portnu' => 'Ascend-Port-Redir-Portnum',
+  'acct_interim_interval' => 'Acct-Interim-Interval',
+  'ascend_uu_info' => 'Ascend-UU-Info',
+  'usr_pw_vpn_name' => 'USR-PW_VPN_Name',
+  'ascend_maximum_call_dura' => 'Ascend-Maximum-Call-Duration',
+  'ascend_atm_direct_profil' => 'Ascend-ATM-Direct-Profile',
+  'acc_input_errors' => 'Acc-Input-Errors',
+  'bind_dot1q_port' => 'Bind_Dot1q_Port',
+  'ascend_first_dest' => 'Ascend-First-Dest',
+  'x_ascend_if_netmask' => 'X-Ascend-IF-Netmask',
+  'tunnel_session_auth_serv' => 'Tunnel_Session_Auth_Service_Grp',
+  'annex_local_ip_address' => 'Annex-Local-IP-Address',
+  'termination_menu' => 'Termination-Menu',
+  'ms_chap2_cpw' => 'MS-CHAP2-CPW',
+  'ascend_mpp_idle_percent' => 'Ascend-MPP-Idle-Percent',
+  'usr_characters_sent' => 'USR-Characters-Sent',
+  'eap_message' => 'EAP-Message',
+  'acct_delay_time' => 'Acct-Delay-Time',
+  'ascend_remote_fw' => 'Ascend-Remote-FW',
+  'x_ascend_tunneling_proto' => 'X-Ascend-Tunneling-Protocol',
+  'shiva_session_id' => 'Shiva-Session-Id',
+  'usr_igmp_query_interval' => 'USR-IGMP-Query-Interval',
+  'usr_accm_type' => 'USR-ACCM-Type',
+  'usr_call_terminate_in_gm' => 'USR-Call-Terminate-in-GMT',
+  'usr_rad_location_type' => 'USR-Rad-Location-Type',
+  'ascend_filter' => 'Ascend-Filter',
+  'ascend_primary_home_agen' => 'Ascend-Primary-Home-Agent',
+  'x_ascend_user_acct_host' => 'X-Ascend-User-Acct-Host',
+  'chap_challenge' => 'CHAP-Challenge',
+  'acct_output_packets_64' => 'Acct_Output_Packets_64',
+  'bind_auth_max_sessions' => 'Bind_Auth_Max_Sessions',
+  'cisco_pre_output_octets' => 'Cisco-Pre-Output-Octets',
+  'x_ascend_fr_direct' => 'X-Ascend-FR-Direct',
+  'x_ascend_client_secondar' => 'X-Ascend-Client-Secondary-DNS',
+  'usr_rmmie_pwrlvl_nearech' => 'USR-RMMIE-PwrLvl-NearEcho-Canc',
+  'ascend_bridge_address' => 'Ascend-Bridge-Address',
+  'user_name' => 'User-Name',
+  'usr_rmmie_firmware_build' => 'USR-RMMIE-Firmware-Build-Date',
+  'ms_chap_mppe_keys' => 'MS-CHAP-MPPE-Keys',
+  'usr_number_of_characters' => 'USR-Number-Of-Characters-Lost',
+  'usr_physical_state' => 'USR-Physical-State',
+  'x_ascend_assign_ip_serve' => 'X-Ascend-Assign-IP-Server',
+  'bind_int_context' => 'Bind_Int_Context',
+  'erx_tunnel_virtual_route' => 'ERX-Tunnel-Virtual-Router',
+  'ascend_xmit_rate' => 'Ascend-Xmit-Rate',
+  'usr_secondary_dns_server' => 'USR-Secondary_DNS_Server',
+  'ascend_dsl_rate_mode' => 'Ascend-Dsl-Rate-Mode',
+  'ascend_data_rate' => 'Ascend-Data-Rate',
+  'realm' => 'Realm',
+  'usr_ipx_call_input_filte' => 'USR-IPX-Call-Input-Filter',
+  'ascend_ipx_route' => 'Ascend-IPX-Route',
+  'usr_failure_to_connect_r' => 'USR-Failure-to-Connect-Reason',
+  'x_ascend_home_network_na' => 'X-Ascend-Home-Network-Name',
+  'acc_nbns_server_pri' => 'Acc-Nbns-Server-Pri',
+  'usr_modulation_type' => 'USR-Modulation-Type',
+  'service_type' => 'Service-Type',
+  'ascend_callback_delay' => 'Ascend-Callback-Delay',
+  'ascend_owner_ip_addr' => 'Ascend-Owner-IP-Addr',
+  'x_ascend_handle_ipx' => 'X-Ascend-Handle-IPX',
+  'usr_connect_term_reason' => 'USR-Connect-Term-Reason',
+  'x_ascend_multicast_rate_' => 'X-Ascend-Multicast-Rate-Limit',
+  'h323_disconnect_time' => 'h323-disconnect-time',
+  'acc_ip_gateway_sec' => 'Acc-Ip-Gateway-Sec',
+  'usr_number_of_blers' => 'USR-Number-of-Blers',
+  'x_ascend_fr_type' => 'X-Ascend-FR-Type',
+  'ascend_assign_ip_pool' => 'Ascend-Assign-IP-Pool',
+  'ascend_qos_upstream' => 'Ascend-QOS-Upstream',
+  'usr_nas_type' => 'USR-NAS-Type',
+  'acc_dial_port_index' => 'Acc-Dial-Port-Index',
+  'usr_initial_tx_link_data' => 'USR-Initial-Tx-Link-Data-Rate',
+  'ascend_fr_type' => 'Ascend-FR-Type',
+  'usr_mbi_ct_tdm_time_slot' => 'USR-Mbi_Ct_TDM_Time_Slot',
+  'usr_rmmie_pwrlvl_xmit_lv' => 'USR-RMMIE-PwrLvl-Xmit-Lvl',
+  'erx_atm_service_category' => 'ERX-Atm-Service-Category',
+  'usr_appletalk' => 'USR-Appletalk',
+  'usr_send_script1' => 'USR-Send-Script1',
+  'usr_send_script2' => 'USR-Send-Script2',
+  'usr_send_script3' => 'USR-Send-Script3',
+  'usr_ospf_addressless_ind' => 'USR-OSPF-Addressless-Index',
+  'acct_input_packets' => 'Acct-Input-Packets',
+  'usr_send_script4' => 'USR-Send-Script4',
+  'usr_send_script5' => 'USR-Send-Script5',
+  'usr_send_script6' => 'USR-Send-Script6',
+  'usr_service_option' => 'USR-Service-Option',
+  'ascend_dropped_octets' => 'Ascend-Dropped-Octets',
+  'usr_ip' => 'USR-IP',
+  'usr_tunnel_security' => 'USR-Tunnel-Security',
+  'acc_acct_on_off_reason' => 'Acc-Acct-On-Off-Reason',
+  'shiva_compression_type' => 'Shiva-Compression-Type',
+  'ascend_pw_warntime' => 'Ascend-PW-Warntime',
+  'usr_security_resp_limit' => 'USR-Security-Resp-Limit',
+  'ascend_x25_pad_prompt' => 'Ascend-X25-Pad-Prompt',
+  'cisco_asing_ip_pool' => 'Cisco-Asing-IP-Pool',
+  'acc_route_policy' => 'Acc-Route-Policy',
+  'annex_local_username' => 'Annex-Local-Username',
+  'x_ascend_call_by_call' => 'X-Ascend-Call-By-Call',
+  'ascend_calling_id_screen' => 'Ascend-Calling-Id-Screening',
+  'x_ascend_dhcp_pool_numbe' => 'X-Ascend-DHCP-Pool-Number',
+  'nas_port_type' => 'NAS-Port-Type',
+  'ascend_route_ip' => 'Ascend-Route-IP',
+  'ascend_client_gateway' => 'Ascend-Client-Gateway',
+  'ascend_qos_downstream' => 'Ascend-QOS-Downstream',
+  'ms_bap_usage' => 'MS-BAP-Usage',
+  'usr_vts_session_key' => 'USR-VTS-Session-Key',
+  'usr_receive_acc_map' => 'USR-Receive-Acc-Map',
+  'ascend_expect_callback' => 'Ascend-Expect-Callback',
+  'password' => 'Password',
+  'packet_type' => 'Packet-Type',
+  'ascend_remote_addr' => 'Ascend-Remote-Addr',
+  'ascend_recv_name' => 'Ascend-Recv-Name',
+  'ms_acct_eap_type' => 'MS-Acct-EAP-Type',
+  'usr_filter_zones' => 'USR-Filter-Zones',
+  'annex_output_filter' => 'Annex-Output-Filter',
+  'usr_rmmie_rcv_tot_pwrlvl' => 'USR-RMMIE-Rcv-Tot-PwrLvl',
+  'usr_mp_mrru' => 'USR-MP-MRRU',
+  'ascend_call_filter' => 'Ascend-Call-Filter',
+  'usr_keypress_timeout' => 'USR-Keypress-Timeout',
+  'usr_modem_setup_time' => 'USR-Modem-Setup-Time',
+  'acct_authentic' => 'Acct-Authentic',
+  'pppoe_motm' => 'PPPOE_MOTM',
+  'x_ascend_expect_callback' => 'X-Ascend-Expect-Callback',
+  'erx_atm_scr' => 'ERX-Atm-SCR',
+  'erx_address_pool_name' => 'ERX-Address-Pool-Name',
+  'challenge_state' => 'Challenge-State',
+  'usr_multicast_proxy' => 'USR-Multicast-Proxy',
+  'framed_filter_id' => 'Framed-Filter-Id',
+  'add_suffix' => 'Add-Suffix',
+  'ascend_auth_type' => 'Ascend-Auth-Type',
+  'session_timeout' => 'Session-Timeout',
+  'ascend_callback' => 'Ascend-Callback',
+  'usr_chat_script_name' => 'USR-Chat-Script-Name',
+  'port_message' => 'Port-Message',
+  'acct_output_packets' => 'Acct-Output-Packets',
+  'ascend_session_svr_key' => 'Ascend-Session-Svr-Key',
+  'login_tcp_port' => 'Login-TCP-Port',
+  'erx_tunnel_password' => 'ERX-Tunnel-Password',
+  'shasta_user_privilege' => 'Shasta-User-Privilege',
+  'usr_secondary_nbns_serve' => 'USR-Secondary_NBNS_Server',
+  'usr_security_login_limit' => 'USR-Security-Login-Limit',
+  'usr_start_time' => 'USR-Start-Time',
+  'acc_access_partition' => 'Acc-Access-Partition',
+  'versanet_termination_cau' => 'Versanet-Termination-Cause',
+  'x_ascend_call_block_dura' => 'X-Ascend-Call-Block-Duration',
+  'mcast_maxgroups' => 'Mcast_MaxGroups',
+  'ascend_user_acct_base' => 'Ascend-User-Acct-Base',
+  'usr_vpn_gw_location_id' => 'USR-VPN-GW-Location-Id',
+  'usr_block_error_count_li' => 'USR-Block-Error-Count-Limit',
+  'ascend_telnet_profile' => 'Ascend-Telnet-Profile',
+  'ascend_port_redir_protoc' => 'Ascend-Port-Redir-Protocol',
+  'ascend_call_by_call' => 'Ascend-Call-By-Call',
+  'usr_disconnect_cause_ind' => 'USR-Disconnect-Cause-Indicator',
+  'x_ascend_fr_linkup' => 'X-Ascend-FR-LinkUp',
+  'ascend_billing_number' => 'Ascend-Billing-Number',
+  'usr_ds0s' => 'USR-DS0s',
+  'usr_at_zip_output_filter' => 'USR-AT-Zip-Output-Filter',
+  'ascend_user_acct_port' => 'Ascend-User-Acct-Port',
+  'login_port' => 'Login-Port',
+  'arap_security' => 'ARAP-Security',
+  'tunnel_deadtime' => 'Tunnel_Deadtime',
+  'ascend_user_acct_time' => 'Ascend-User-Acct-Time',
+  'ms_chap_challenge' => 'MS-CHAP-Challenge',
+  'ascend_x25_rpoa' => 'Ascend-X25-Rpoa',
+  'login_time' => 'Login-Time',
+  'current_time' => 'Current-Time',
+  'login_service' => 'Login-Service',
+  'ascend_menu_selector' => 'Ascend-Menu-Selector',
+  'ascend_bacp_enable' => 'Ascend-BACP-Enable',
+  'shiva_link_speed' => 'Shiva-Link-Speed',
+  'ascend_private_route_tab' => 'Ascend-Private-Route-Table-ID',
+  'x_ascend_session_svr_key' => 'X-Ascend-Session-Svr-Key',
+  'ascend_data_filter' => 'Ascend-Data-Filter',
+  'ascend_target_util' => 'Ascend-Target-Util',
+  'shiva_function' => 'Shiva-Function',
+  'usr_pw_usr_ifilter_ip' => 'USR-PW_USR_IFilter_IP',
+  'usr_igmp_routing' => 'USR-IGMP-Routing',
+  'acc_tunnel_port' => 'Acc-Tunnel-Port',
+  'x_ascend_fr_n391' => 'X-Ascend-FR-N391',
+  'medium_type' => 'Medium_Type',
+  'annex_domain_name' => 'Annex-Domain-Name',
+  'ascend_fr_n391' => 'Ascend-FR-N391',
+  'callback_number' => 'Callback-Number',
+  'usr_chassis_temperature' => 'USR-Chassis-Temperature',
+  'dialback_no' => 'Dialback-No',
+  'ms_mppe_recv_key' => 'MS-MPPE-Recv-Key',
+  'ascend_ipx_alias' => 'Ascend-IPX-Alias',
+  'le_nat_inmap' => 'LE-NAT-Inmap',
+  'tunnel_police_rate' => 'Tunnel_Police_Rate',
+  'acct_terminate_cause' => 'Acct-Terminate-Cause',
+  'le_nat_other_session_tim' => 'LE-NAT-Other-Session-Timeout',
+  'usr_ip_rip_output_filter' => 'USR-IP-RIP-Output-Filter',
+  'exec_program' => 'Exec-Program',
+  'h323_disconnect_cause' => 'h323-disconnect-cause',
+  'usr_chassis_call_channel' => 'USR-Chassis-Call-Channel',
+  'x_ascend_fr_dlci' => 'X-Ascend-FR-DLCI',
+  'ms_link_drop_time_limit' => 'MS-Link-Drop-Time-Limit',
+  'acc_callback_num_valid' => 'Acc-Callback-Num-Valid',
+  'cisco_presession_time' => 'Cisco-PreSession-Time',
+  'ms_chap_response' => 'MS-CHAP-Response',
+  'usr_spoofing' => 'USR-Spoofing',
+  'usr_num_fax_pages_proces' => 'USR-Num-Fax-Pages-Processed',
+  'ascend_x25_cug' => 'Ascend-X25-Cug',
+  'ascend_fr_dlci' => 'Ascend-FR-DLCI',
+  'shiva_user_attributes' => 'Shiva-User-Attributes',
+  'ms_chap_lm_enc_pw' => 'MS-CHAP-LM-Enc-PW',
+  'ascend_transit_number' => 'Ascend-Transit-Number',
+  'usr_last_number_dialed_i' => 'USR-Last-Number-Dialed-In-DNIS',
+  'usr_ip_saa_filter' => 'USR-IP-SAA-Filter',
+  'usr_pw_usr_ifilter_ipx' => 'USR-PW_USR_IFilter_IPX',
+  'ascend_remove_seconds' => 'Ascend-Remove-Seconds',
+  'le_connect_detail' => 'LE-Connect-Detail',
+  'ascend_assign_ip_global_' => 'Ascend-Assign-IP-Global-Pool',
+  'proxy_to_realm' => 'Proxy-To-Realm',
+  'usr_retrains_requested' => 'USR-Retrains-Requested',
+  'h323_remote_address' => 'h323-remote-address',
+  'ascend_x25_nui_prompt' => 'Ascend-X25-Nui-Prompt',
+  'acc_customer_id' => 'Acc-Customer-Id',
+  'ms_chap2_response' => 'MS-CHAP2-Response',
+  'ascend_host_info' => 'Ascend-Host-Info',
+  'annex_addr_resolution_se' => 'Annex-Addr-Resolution-Servers',
+  'x_ascend_multilink_id' => 'X-Ascend-Multilink-ID',
+  'login_lat_service' => 'Login-LAT-Service',
+  'usr_rmmie_rcv_pwrlvl_330' => 'USR-RMMIE-Rcv-PwrLvl-3300Hz',
+  'ascend_event_type' => 'Ascend-Event-Type',
+  'ascend_inc_channel_count' => 'Ascend-Inc-Channel-Count',
+  'cisco_ppp_async_map' => 'Cisco-PPP-Async-Map',
+  'usr_min_compression_size' => 'USR-Min-Compression-Size',
+  'ascend_traffic_shaper' => 'Ascend-Traffic-Shaper',
+  'ascend_user_acct_key' => 'Ascend-User-Acct-Key',
+  'usr_port_tap_output' => 'USR-Port-Tap-Output',
+  'ascend_x25_nui' => 'Ascend-X25-Nui',
+  'x_ascend_disconnect_caus' => 'X-Ascend-Disconnect-Cause',
+  'ascend_cbcp_enable' => 'Ascend-CBCP-Enable',
+  'usr_framed_ip_address_po' => 'USR-Framed_IP_Address_Pool_Name',
+  'ascend_x25_profile_name' => 'Ascend-X25-Profile-Name',
+  'usr_orig_nas_type' => 'USR-Orig-NAS-Type',
+  'acc_output_errors' => 'Acc-Output-Errors',
+  'h323_redirect_ip_address' => 'h323-redirect-ip-address',
+  'usr_ip_call_output_filte' => 'USR-IP-Call-Output-Filter',
+  'cisco_avpair' => 'Cisco-AVPair',
+  'usr_slot_connected_to' => 'USR-Slot-Connected-To',
+  'framed_route' => 'Framed-Route',
+  'ascend_global_call_id' => 'Ascend-Global-Call-Id',
+  'x_ascend_seconds_of_hist' => 'X-Ascend-Seconds-Of-History',
+  'x_ascend_temporary_rtes' => 'X-Ascend-Temporary-Rtes',
+  'h323_currency_type' => 'h323-currency-type',
+  'x_ascend_token_expiry' => 'X-Ascend-Token-Expiry',
+  'pvc_encapsulation_type' => 'PVC_Encapsulation_Type',
+  'x_ascend_pw_lifetime' => 'X-Ascend-PW-Lifetime',
+  'usr_expected_voltage' => 'USR-Expected-Voltage',
+  'usr_simplified_v42bis_us' => 'USR-Simplified-V42bis-Usage',
+  'shiva_customer_id' => 'Shiva-Customer-Id',
+  'usr_compression_algorith' => 'USR-Compression-Algorithm',
+  'annex_system_disc_reason' => 'Annex-System-Disc-Reason',
+  'annex_secondary_nbns_ser' => 'Annex-Secondary-NBNS-Server',
+  'usr_q931_call_reference_' => 'USR-Q931-Call-Reference-Value',
+  'usr_send_password' => 'USR-Send-Password',
+  'prompt' => 'Prompt',
+  'usr_cusr_hat_script_rule' => 'USR-CUSR-hat-Script-Rules',
+  'usr_event_id' => 'USR-Event-Id',
+  'usr_ccp_algorithm' => 'USR-CCP-Algorithm',
+  'usr_mbi_ct_bchannel_used' => 'USR-Mbi_Ct_BChannel_Used',
+  'ascend_svc_enabled' => 'Ascend-SVC-Enabled',
+  'framed_mtu' => 'Framed-MTU',
+  'acc_reason_code' => 'Acc-Reason-Code',
+  'bind_l2tp_flow_control' => 'Bind_L2TP_Flow_Control',
+  'ascend_cbcp_delay' => 'Ascend-CBCP-Delay',
+  'le_ipsec_deny_action' => 'LE-IPSec-Deny-Action',
+);
+
 1;
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 11e5a3ca4..fa055cfff 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -602,7 +602,7 @@ sub radius_check {
     /^(rc_(.*))$/;
     my($column, $attrib) = ($1, $2);
     #$attrib =~ s/_/\-/g;
-    ( $FS::raddb:attrib{lc($attrib)}, $self->getfield($column) );
+    ( $FS::raddb::attrib{lc($attrib)}, $self->getfield($column) );
   } grep { /^rc_/ && $self->getfield($_) } fields( $self->table );
 }
 
@@ -638,7 +638,7 @@ sub email {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.32 2001-09-07 20:17:49 ivan Exp $
+$Id: svc_acct.pm,v 1.33 2001-09-07 20:26:33 ivan Exp $
 
 =head1 BUGS
 
diff --git a/bin/generate-raddb b/bin/generate-raddb
index e9580d645..1d0053a2b 100755
--- a/bin/generate-raddb
+++ b/bin/generate-raddb
@@ -26,10 +26,12 @@ foreach ( keys %hash ) {
 #  print substr($_,0,24),"\n" if length($_)>24; 
 #  $max = length($_) if length($_)>$max;
 #everything >24 is still unique, at least with freeradius comprehensive dataset
-  print "  '". substr($_,0,24). "' => '$hash{$_}'\n";
+  print "  '". substr($_,0,24). "' => '$hash{$_}',\n";
 }
 
 print <<END;
+);
+
 1;
 END
 
-- 
cgit v1.2.1


From ef8f7ec6010ae0b9fd3e828dfd940a3a44039213 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 7 Sep 2001 20:49:15 +0000
Subject: oops, forgot to add this

---
 FS/FS/part_svc_column.pm | 118 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 FS/FS/part_svc_column.pm

diff --git a/FS/FS/part_svc_column.pm b/FS/FS/part_svc_column.pm
new file mode 100644
index 000000000..37e841e87
--- /dev/null
+++ b/FS/FS/part_svc_column.pm
@@ -0,0 +1,118 @@
+package FS::part_svc_column;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( fields );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::part_svc_column - Object methods for part_svc_column objects
+
+=head1 SYNOPSIS
+
+  use FS::part_svc_column;
+
+  $record = new FS::part_svc_column \%hash
+  $record = new FS::part_svc_column { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::part_svc_column record represents a service definition column
+constraint.  FS::part_svc_column inherits from FS::Record.  The following
+fields are currently supported:
+
+=over 4
+
+=item columnnum - primary key (assigned automatcially for new records)
+
+=item svcpart - service definition (see L<FS::part_svc>)
+
+=item columnname - column name in part_svc.svcdb table
+
+=item columnvalue - default or fixed value for the column
+
+=item columnflag - null, D or F
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new column constraint.  To add the column constraint to the database, see L<"insert">.
+
+=cut
+
+sub table { 'part_svc_column'; }
+
+=item insert
+
+Adds this service definition to the database.  If there is an error, returns
+the error, otherwise returns false.
+
+=item delete
+
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error =
+    $self->ut_numbern('columnnum')
+    || $self->ut_number('svcpart')
+    || $self->ut_alpha('columnname')
+    || $self->ut_anything('columnvalue')
+  ;
+  return $error if $error;
+
+  $self->columnflag =~ /^([DF])$/
+    or return "illegal columnflag ". $self->columnflag;
+  $self->columnflag(uc($1));
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: part_svc_column.pm,v 1.1 2001-09-07 20:49:15 ivan Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::part_svc>, L<FS::part_pkg>, L<FS::pkg_svc>,
+L<FS::cust_svc>, L<FS::svc_acct>, L<FS::svc_forward>, L<FS::svc_domain>,
+schema.html from the base documentation.
+
+=cut
+
+1;
+
-- 
cgit v1.2.1


From a594e8f54dd5582ac36eb9e6a2b260d63f3b91fa Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Sat, 8 Sep 2001 00:28:49 +0000
Subject: First post.  Sorry.  Missing comma.

---
 bin/fs-setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index dc597ccb4..03b5a04a9 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.55 2001-09-07 20:17:50 ivan Exp $
+# $Id: fs-setup,v 1.56 2001-09-08 00:28:49 khoff Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -597,7 +597,7 @@ sub tables_hash_hack {
       'primary_key' => 'columnnum',
       'unique' => [ [ 'svcpart', 'columnname' ] ],
       'index' => [ [ 'svcpart' ] ],
-    }
+    },
 
     #(this should be renamed to part_pop)
     'svc_acct_pop' => {
-- 
cgit v1.2.1


From 85e59606c0b5eed9780534ffaf554aa32bcf9baf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 00:07:30 +0000
Subject: fixing fs-migrate-part_svc updateing fs-setup for job queues
 freeside-init for starting freeside-queued

---
 bin/freeside-init       | 60 +++++++++++++++++++++++++++++++++++++++++++++++++
 bin/fs-migrate-part_svc | 37 +++++++++++++++---------------
 bin/fs-setup            | 24 +++++++++++++++++++-
 3 files changed, 102 insertions(+), 19 deletions(-)
 create mode 100755 bin/freeside-init

diff --git a/bin/freeside-init b/bin/freeside-init
new file mode 100755
index 000000000..fe12931fc
--- /dev/null
+++ b/bin/freeside-init
@@ -0,0 +1,60 @@
+#! /bin/sh
+#
+# start the freeside job queue daemon
+
+#PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/local/bin/freeside-queued
+NAME=freeside-queued
+DESC="freeside job queue daemon"
+USER="ivan"
+
+test -f $DAEMON || exit 0
+
+set -e
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+#	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid -b -m\
+#		--exec $DAEMON
+	$DAEMON $USER &
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
+		--exec $DAEMON
+	echo "$NAME."
+        rm /var/run/$NAME.pid
+	;;
+  #reload)
+	#
+	#	If the daemon can reload its config files on the fly
+	#	for example by sending it SIGHUP, do it here.
+	#
+	#	If the daemon responds to changes in its config file
+	#	directly anyway, make this a do-nothing entry.
+	#
+	# echo "Reloading $DESC configuration files."
+	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
+	#	/var/run/$NAME.pid --exec $DAEMON
+  #;;
+  restart|force-reload)
+	#
+	#	If the "reload" option is implemented, move the "force-reload"
+	#	option to the "reload" entry above. If not, "force-reload" is
+	#	just the same as "restart".
+	#
+        $0 stop
+	sleep 1
+        $0 start
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/bin/fs-migrate-part_svc b/bin/fs-migrate-part_svc
index 96332f72a..b0f3ac57e 100755
--- a/bin/fs-migrate-part_svc
+++ b/bin/fs-migrate-part_svc
@@ -2,38 +2,39 @@
 
 use strict;
 use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearchs);
-use FS::part_svc
+use FS::Record qw(qsearch fields);
+use FS::part_svc;
 
 my $user = shift or die &usage;
 my $dbh = adminsuidsetup $user;
 
 my $oldAutoCommit = $FS::UID::AutoCommit;
-local $FS::UID::AutoCommit = 0
+local $FS::UID::AutoCommit = 0;
 
 foreach my $part_svc ( qsearch('part_svc', {} ) ) {
   foreach my $field (
-    grep { defined($part_svc->getfield($part_svc->svcdb.'__'.$field.'_flag') ) }
-      fields($self->svcdb)
+    grep { defined($part_svc->getfield($part_svc->svcdb.'__'.$_.'_flag') ) }
+      fields($part_svc->svcdb)
   ) {
-    my $flag = $self->getfield($part_svc->svcdb.'__'.$field.'_flag');
+    my $flag = $part_svc->getfield($part_svc->svcdb.'__'.$field.'_flag');
     if ( uc($flag) =~ /^([DF])$/ ) {
-      $part_svc_column->setfield('columnflag', $1);
-      $part_svc_column->setfield('columnvalue',
-        $self->getfield($part_svc->svcdb.'__'.$field)
-      );
-      $error = $part_svc_column->insert;
-    } else {
-      $error = $part_svc_column->delete;
+      my $part_svc_column = new FS::part_svc_column {
+        'svcpart' => $part_svc->svcpart,
+        'columnname' => $field,
+        'columnflag' => $1,
+        'columnvalue' => $part_svc->getfield($part_svc->svcdb.'__'.$field),
+      };
+      my $error = $part_svc_column->insert;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        die $error;
+      }
     }
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      die $error;
-    }
-
   }
 }
 
+$dbh->commit or die $dbh->errstr;
+
 sub usage {
   die "Usage:\n  fs-migrate-part_svc user\n"; 
 }
diff --git a/bin/fs-setup b/bin/fs-setup
index 03b5a04a9..9534eb23f 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.56 2001-09-08 00:28:49 khoff Exp $
+# $Id: fs-setup,v 1.57 2001-09-11 00:07:30 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -768,6 +768,28 @@ sub tables_hash_hack {
       'index'       => [ [ 'portnum' ] ],
     },
 
+    'queue' => {
+      'columns' => [
+        'jobnum', 'int', '', '',
+        'job', 'varchar', '', '',
+        '_date', 'int', '', '',
+        'status', 'varchar', '', $char_d,
+      ],
+      'primary_key' => 'jobnum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'queue_arg' => {
+      'columns' => [
+        'argnum', 'int', '', '',
+        'jobnum', 'int', '', '',
+        'arg', 'varchar', 'NULL', '',
+      ],
+      'primary_key' => 'argnum',
+      'unique'      => [],
+      'index'       => [ [ 'jobnum' ] ],
+    },
   );
 
   %tables;
-- 
cgit v1.2.1


From f5266a4d07d116efd732f433d0f4f3a47b143a7d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 00:08:18 +0000
Subject: faster (cached) fuzzy searches prelim. job queues! fixed part_svc
 editing

---
 FS/FS.pm                             |   8 +-
 FS/FS/Record.pm                      |  21 ++++-
 FS/FS/cust_credit_bill.pm            |  10 +-
 FS/FS/cust_main.pm                   | 143 +++++++++++++++++++++++++++-
 FS/FS/part_svc.pm                    |  63 ++++++++++++-
 FS/FS/queue.pm                       | 174 +++++++++++++++++++++++++++++++++++
 FS/FS/queue_arg.pm                   | 121 ++++++++++++++++++++++++
 FS/MANIFEST                          |   5 +
 FS/bin/freeside-bill                 |   4 +-
 FS/bin/freeside-queued               | 145 +++++++++++++++++++++++++++++
 FS/t/queue.t                         |   5 +
 FS/t/queue_arg.t                     |   5 +
 README.1.4.0pre2-3                   |  21 +++++
 htetc/handler.pl                     |   4 +-
 httemplate/browse/part_svc.cgi       |   4 +-
 httemplate/docs/install.html         |   4 +-
 httemplate/docs/schema.html          |  23 +++++
 httemplate/docs/upgrade8.html        |  19 +++-
 httemplate/edit/part_svc.cgi         |   6 +-
 httemplate/edit/process/part_svc.cgi |   2 +-
 httemplate/index.html                |   1 +
 httemplate/search/cust_main.cgi      |  20 ++--
 22 files changed, 770 insertions(+), 38 deletions(-)
 create mode 100644 FS/FS/queue.pm
 create mode 100644 FS/FS/queue_arg.pm
 create mode 100644 FS/bin/freeside-queued
 create mode 100644 FS/t/queue.t
 create mode 100644 FS/t/queue_arg.t

diff --git a/FS/FS.pm b/FS/FS.pm
index cd11e96d2..d2f47d75a 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -93,7 +93,7 @@ L<FS::cust_refund> - Refund class
 
 L<FS::cust_credit_refund> - Refund application class
 
-L<FS::cust_credit_bill> - Refund invoice application class
+L<FS::cust_credit_bill> - Credit invoice application class
 
 L<FS::cust_pay_batch> - Credit card transaction queue class
 
@@ -105,6 +105,10 @@ L<FS::port> - NAS port class
 
 L<FS::session> - User login session class
 
+L<FS::queue> - Job queue
+
+L<FS::queue_arg> - Job arguments
+
 =head2 User Interface classes (under development; not yet usable)
 
 L<FS::UI::Base> - User-interface base class
@@ -135,7 +139,7 @@ The main documentation is in htdocs/docs.
 
 =head1 VERSION
 
-$Id: FS.pm,v 1.7 2001-09-06 20:41:59 ivan Exp $
+$Id: FS.pm,v 1.8 2001-09-11 00:08:18 ivan Exp $
 
 =head1 SUPPORT
 
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 9a532e3a0..b476df2c0 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -855,13 +855,30 @@ Untaints arbitrary data.  Be careful.
 =cut
 
 sub ut_anything {
-  my($self,$field)=@_;
+  my( $self, $field ) = @_;
   $self->getfield($field) =~ /^(.*)$/s
     or return "Illegal $field: ". $self->getfield($field);
   $self->setfield($field,$1);
   '';
 }
 
+=item ut_enum COLUMN CHOICES_ARRAYREF
+
+Check/untaint a column, supplying all possible choices, like the "enum" type.
+
+=cut
+
+sub ut_enum {
+  my( $self, $field, $choices ) = @_;
+  foreach my $choice ( @$choices ) {
+    if ( $self->getfield($field) eq $choice ) {
+      $self->setfield($choice);
+      return '';
+    }
+  }
+  return "Illegal (enum) field $field: ". $self->getfield($field);
+}
+
 =item fields [ TABLE ]
 
 This can be used as both a subroutine and a method call.  It returns a list
@@ -976,7 +993,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.26 2001-08-31 09:20:35 ivan Exp $
+$Id: Record.pm,v 1.27 2001-09-11 00:08:18 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_credit_bill.pm b/FS/FS/cust_credit_bill.pm
index 58cc78965..961340813 100644
--- a/FS/FS/cust_credit_bill.pm
+++ b/FS/FS/cust_credit_bill.pm
@@ -33,12 +33,14 @@ FS::cust_credit_bill - Object methods for cust_credit_bill records
 =head1 DESCRIPTION
 
 An FS::cust_credit_bill object represents application of a credit (see
-L<FS::cust_credit>) to a customer bill (see L<FS::cust_bill>).  FS::cust_credit
+L<FS::cust_credit>) to an invoice (see L<FS::cust_bill>).  FS::cust_credit
 inherits from FS::Record.  The following fields are currently supported:
 
 =over 4
 
-=item crednum - primary key; credit being applied 
+=item creditbillnum - primary key
+
+=item crednum - credit being applied 
 
 =item invnum - invoice to which credit is applied (see L<FS::cust_bill>)
 
@@ -119,7 +121,7 @@ sub check {
 
   $self->_date(time) unless $self->_date;
 
-  return "Cannot apply more than remaining value of credit memo"
+  return "Cannot apply more than remaining value of credit"
     unless $self->amount <= $cust_credit->credited;
 
   return "Cannot apply more than remaining value of invoice"
@@ -143,7 +145,7 @@ sub cust_credit {
 
 =head1 VERSION
 
-$Id: cust_credit_bill.pm,v 1.4 2001-09-02 07:49:52 ivan Exp $
+$Id: cust_credit_bill.pm,v 1.5 2001-09-11 00:08:18 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b29e3852b..e4f55cf27 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -31,6 +31,7 @@ use FS::cust_main_invoice;
 use FS::cust_credit_bill;
 use FS::cust_bill_pay;
 use FS::prepay_credit;
+use FS::queue;
 
 @ISA = qw( FS::Record );
 
@@ -343,6 +344,22 @@ sub insert {
     }
   }
 
+  my $queue = new FS::queue { 'job' => 'FS::cust_main::append_fuzzyfiles' };
+  $error = $queue->insert($self->getfield('last'), $self->company);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "queueing job (transaction rolled back): $error";
+  }
+
+  if ( defined $self->dbdef_table->column('ship_last') && $self->ship_last ) {
+    $queue = new FS::queue { 'job' => 'FS::cust_main::append_fuzzyfiles' };
+    $error = $queue->insert($self->getfield('last'), $self->company);
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
+  }
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 
@@ -1533,24 +1550,140 @@ sub referral_cust_main {
 
 =over 4
 
-=item rebuild_fuzzyfile
+=item check_and_rebuild_fuzzyfiles
+
+=cut
+
+sub check_and_rebuild_fuzzyfiles {
+  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
+  -e "$dir/cust_main.last" && -e "$dir/cust_main.company"
+    or &rebuild_fuzzyfiles;
+}
+
+=item rebuild_fuzzyfiles
 
 =cut
 
 sub rebuild_fuzzyfiles {
+
+  use Fcntl qw(:flock);
+
+  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
+
+  #last
+
+  open(LASTLOCK,">>$dir/cust_main.last")
+    or die "can't open $dir/cust_main.last: $!";
+  flock(LASTLOCK,LOCK_EX)
+    or die "can't lock $dir/cust_main.last: $!";
+
   my @all_last = map $_->getfield('last'), qsearch('cust_main', {});
   push @all_last,
                  grep $_, map $_->getfield('ship_last'), qsearch('cust_main',{})
-      if defined dbdef->table('cust_main')->column('ship_last');
-#  open(
+    if defined dbdef->table('cust_main')->column('ship_last');
+
+  open (LASTCACHE,">$dir/cust_main.last.tmp")
+    or die "can't open $dir/cust_main.last.tmp: $!";
+  print LASTCACHE join("\n", @all_last), "\n";
+  close LASTCACHE or die "can't close $dir/cust_main.last.tmp: $!";
+
+  rename "$dir/cust_main.last.tmp", "$dir/cust_main.last";
+  close LASTLOCK;
+
+  #company
+
+  open(COMPANYLOCK,">>$dir/cust_main.company")
+    or die "can't open $dir/cust_main.company: $!";
+  flock(COMPANYLOCK,LOCK_EX)
+    or die "can't lock $dir/cust_main.company: $!";
+
+  my @all_company = grep $_ ne '', map $_->company, qsearch('cust_main',{});
+  push @all_company,
+       grep $_ ne '', map $_->ship_company, qsearch('cust_main', {})
+    if defined dbdef->table('cust_main')->column('ship_last');
+
+  open (COMPANYCACHE,">$dir/cust_main.company.tmp")
+    or die "can't open $dir/cust_main.company.tmp: $!";
+  print COMPANYCACHE join("\n", @all_company), "\n";
+  close COMPANYCACHE or die "can't close $dir/cust_main.company.tmp: $!";
+
+  rename "$dir/cust_main.company.tmp", "$dir/cust_main.company";
+  close COMPANYLOCK;
 
 }
 
-=back
+=item all_last
+
+=cut
+
+sub all_last {
+  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
+  open(LASTCACHE,"<$dir/cust_main.last")
+    or die "can't open $dir/cust_main.last: $!";
+  my @array = split(/\n/, <LASTCACHE> );
+  close LASTCACHE;
+  \@array;
+}
+
+=item all_company
+
+=cut
+
+sub all_company {
+  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
+  open(COMPANYCACHE,"<$dir/cust_main.company")
+    or die "can't open $dir/cust_main.last: $!";
+  my @array = split(/\n/, <COMPANYCACHE> );
+  close COMPANYCACHE;
+  \@array;
+}
+
+=item append_fuzzyfiles LASTNAME COMPANY
+
+=cut
+
+sub append_fuzzyfiles {
+  my( $last, $company ) = @_;
+
+  use Fcntl qw(:flock);
+
+  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
+
+  if ( $last ) {
+
+    open(LAST,">>$dir/cust_main.last")
+      or die "can't open $dir/cust_main.last: $!";
+    flock(LAST,LOCK_EX)
+      or die "can't lock $dir/cust_main.last: $!";
+
+    print LAST "$last\n";
+
+    flock(LAST,LOCK_UN)
+      or die "can't unlock $dir/cust_main.last: $!";
+    close LAST;
+  }
+
+  if ( $company ) {
+
+    open(COMPANY,">>$dir/cust_main.company")
+      or die "can't open $dir/cust_main.company: $!";
+    flock(COMPANY,LOCK_EX)
+      or die "can't lock $dir/cust_main.company: $!";
+
+    print COMPANY "$company\n";
+
+    flock(COMPANY,LOCK_UN)
+      or die "can't unlock $dir/cust_main.company: $!";
+
+    close COMPANY;
+  }
+
+  1;
+}
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.29 2001-09-03 22:07:38 ivan Exp $
+$Id: cust_main.pm,v 1.30 2001-09-11 00:08:18 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index e64f09a70..f1e71ada8 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -117,7 +117,7 @@ sub insert {
         $error = $part_svc_column->insert;
       }
     } else {
-      $error = $part_svc_column->delete;
+      $error = $previous ? $previous->delete : '';
     }
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
@@ -155,7 +155,64 @@ sub replace {
   return "Can't change svcdb for an existing service definition!"
     unless $old->svcdb eq $new->svcdb;
 
-  $new->SUPER::replace( $old );
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $new->SUPER::replace( $old );
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  if ( @_ && $_[0] eq '1.3-COMPAT' ) {
+    my $svcdb = $new->svcdb;
+    foreach my $field (
+      grep { $_ ne 'svcnum'
+             && defined( $new->getfield($svcdb.'__'.$_.'_flag') )
+           } fields($svcdb)
+    ) {
+      my $part_svc_column = $new->part_svc_column($field);
+      my $previous = qsearchs('part_svc_column', {
+        'svcpart'    => $new->svcpart,
+        'columnname' => $field,
+      } );
+
+      my $flag = $new->getfield($svcdb.'__'.$field.'_flag');
+      if ( uc($flag) =~ /^([DF])$/ ) {
+        $part_svc_column->setfield('columnflag', $1);
+        $part_svc_column->setfield('columnvalue',
+          $new->getfield($svcdb.'__'.$field)
+        );
+        if ( $previous ) {
+          $error = $part_svc_column->replace($previous);
+        } else {
+          $error = $part_svc_column->insert;
+        }
+      } else {
+        $error = $previous ? $previous->delete : '';
+      }
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
+    }
+  } else {
+    $dbh->rollback if $oldAutoCommit;
+    return 'non-1.3-COMPAT interface not yet written';
+    #not yet implemented
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
 }
 
 =item check
@@ -232,7 +289,7 @@ sub part_svc_column {
 
 =head1 VERSION
 
-$Id: part_svc.pm,v 1.3 2001-09-06 20:41:59 ivan Exp $
+$Id: part_svc.pm,v 1.4 2001-09-11 00:08:18 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
new file mode 100644
index 000000000..51dd9affe
--- /dev/null
+++ b/FS/FS/queue.pm
@@ -0,0 +1,174 @@
+package FS::queue;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs dbh );
+use FS::queue_arg;
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::queue - Object methods for queue records
+
+=head1 SYNOPSIS
+
+  use FS::queue;
+
+  $record = new FS::queue \%hash;
+  $record = new FS::queue { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::queue object represents an queued job.  FS::queue inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item jobnum - primary key
+
+=item job - fully-qualified subroutine name
+
+=item status - job status
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new job.  To add the example to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'queue'; }
+
+=item insert [ ARGUMENT, ARGUMENT... ]
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+If any arguments are supplied, a queue_arg record for each argument is also
+created (see L<FS::queue_arg>).
+
+=cut
+
+sub insert {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  foreach my $arg ( @_ ) {
+    my $queue_arg = new FS::queue_arg ( {
+      'jobnum' => $self->jobnum,
+      'arg'    => $arg,
+    } );
+    $error = $queue_arg->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+
+}
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid job.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+  my $error =
+    $self->ut_numbern('jobnum')
+    || $self->ut_anything('job')
+    || $self->ut_numbern('_date')
+    || $self->ut_enum('status',['', qw( new locked failed )])
+  ;
+  return $error if $error;
+
+  $self->status('new') unless $self->status;
+  $self->_date(time) unless $self->_date;
+
+  ''; #no error
+}
+
+=item args
+
+=cut
+
+sub args {
+  my $self = shift;
+  map $_->arg, qsearch( 'queue_arg', { 'jobnum' => $self->jobnum } );
+}
+
+=back
+
+=head1 VERSION
+
+$Id: queue.pm,v 1.1 2001-09-11 00:08:18 ivan Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/queue_arg.pm b/FS/FS/queue_arg.pm
new file mode 100644
index 000000000..08fe47341
--- /dev/null
+++ b/FS/FS/queue_arg.pm
@@ -0,0 +1,121 @@
+package FS::queue_arg;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::queue_arg - Object methods for queue_arg records
+
+=head1 SYNOPSIS
+
+  use FS::queue_arg;
+
+  $record = new FS::queue_arg \%hash;
+  $record = new FS::queue_arg { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::queue_arg object represents job argument.  FS::queue_arg inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item argnum - primary key
+
+=item jobnum - see L<FS::queue>
+
+=item arg - argument
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new argument.  To add the example to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'queue_arg'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid argument.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+  my $error =
+    $self->ut_numbern('argnum')
+    || $self->ut_numbern('jobnum')
+    || $self->ut_anything('arg')
+  ;
+  return $error if $error;
+
+  ''; #no error
+}
+
+=back
+
+=head1 VERSION
+
+$Id: queue_arg.pm,v 1.1 2001-09-11 00:08:18 ivan Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::queue>, L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index ae3e0b0e6..69123dbfb 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -6,6 +6,7 @@ README
 bin/freeside-bill
 bin/freeside-email
 bin/freeside-print-batch
+bin/freeside-queued
 FS.pm
 FS/CGI.pm
 FS/Conf.pm
@@ -51,6 +52,8 @@ FS/svc_www.pm
 FS/CGIwrapper.pm
 FS/svc_forward.pm
 FS/raddb.pm
+FS/queue.pm
+FS/queue_arg.pm
 t/agent.t
 t/agent_type.t
 t/CGI.t
@@ -89,5 +92,7 @@ t/svc_domain.t
 t/svc_forward.t
 t/svc_www.t
 t/type_pkgs.t
+t/queue.t
+t/queue_arg.t
 t/UID.t
 t/raddb.t
diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill
index 1dce9a19b..82b3321e1 100755
--- a/FS/bin/freeside-bill
+++ b/FS/bin/freeside-bill
@@ -1,3 +1,5 @@
+#!/usr/bin/perl -w
+# don't take any world-facing input
 #!/usr/bin/perl -Tw
 
 use strict;
@@ -121,7 +123,7 @@ customers.  Otherwise, bills all customers.
 
 =head1 VERSION
 
-$Id: freeside-bill,v 1.8 2001-09-03 22:07:39 ivan Exp $
+$Id: freeside-bill,v 1.9 2001-09-11 00:08:18 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
new file mode 100644
index 000000000..5acffb52c
--- /dev/null
+++ b/FS/bin/freeside-queued
@@ -0,0 +1,145 @@
+#!/usr/bin/perl -w
+
+use strict;
+use Fcntl qw(:flock);
+use POSIX qw(setsid);
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearchs);
+use FS::queue;
+
+# no autoloading just yet
+use FS::cust_main;
+
+my $pid_file = '/var/run/freeside-queued.pid';
+
+$SIG{CHLD} = sub { wait }; #zombie prevention
+
+my $sigterm = 0;
+my $sigint = 0;
+$SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $sigint++; };
+$SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
+
+my $user = shift or die &usage;
+
+&daemonize;
+
+my $log_file = "/usr/local/etc/freeside/queuelog.";
+
+$> = $FS::UID::freeside_uid unless $>;
+adminsuidsetup $user;
+
+$log_file = "/usr/local/etc/freeside/queuelog.". $FS::UID::datasrc;
+
+$SIG{__DIE__} = \&_die;
+$SIG{__WARN__} = \&_logmsg;
+
+
+while (1) {
+
+  my $job = qsearchs(
+    'queue',
+    { 'status' => 'new' },
+    '',
+    'ORDER BY jobnum FOR UPDATE LIMIT 1'
+  ) or do {
+    sleep 5;
+    next;
+  };
+
+  my %hash = $job->hash;
+  $hash{'status'} = 'locked';
+  my $ljob = new FS::queue ( \%hash );
+  my $error = $ljob->replace($job);
+  die $error if $error;
+
+  my @args = $ljob->args;
+
+  #fork a child for each job (up to some maximum perhaps?)
+  #single-threaded for now.
+
+  my $eval = "&". $ljob->job. '(@args);';
+  warn "running $eval";
+  eval $eval;
+  if ( $@ ) {
+    warn "job $eval failed";
+    my $hash = $ljob->hash;
+    $hash{'status'} = 'failed';
+    my $fjob = new FS::queue( \%hash );
+    my $error = $fjob->replace($ljob);
+    die $error if $error;
+  } else {
+    $ljob->delete;
+  }
+
+} continue {
+  if ( $sigterm ) {
+    warn "received TERM signal; exiting\n";
+    exit;
+  }
+  if ( $sigint ) {
+    warn "received INT signal; exiting\n";
+    exit;
+  }
+}
+
+
+sub datestamp {
+  time2str("%m%d%Y", time);
+}
+
+sub _die {
+  my $msg = shift;
+  unlink $pid_file if -e $pid_file;
+  _logmsg($msg);
+}
+
+sub _logmsg {
+  chomp( my $msg = shift );
+  my $log = new IO::File ">>$log_file";
+  flock($log, LOCK_EX);
+  seek($log, 0, 2);
+  print $log "[". time2str("%a %b %e %T %Y",time). "] [$$] $msg\n";
+  flock($log, LOCK_UN);
+}
+
+sub daemonize {
+
+  chdir "/" or die "Can't chdir to /: $!";
+  open STDIN, '/dev/null'   or die "Can't read /dev/null: $!";
+  defined(my $pid = fork) or die "Can't fork: $!";
+  if ( $pid ) {
+    print "freeside-queued started with pid $pid\n"; #logging to $log_file\n";
+    exit unless $pid_file;
+    my $pidfh = new IO::File ">$pid_file" or exit;
+    print $pidfh "$pid\n";
+    exit;
+  }
+  open STDOUT, '>/dev/null'
+                            or die "Can't write to /dev/null: $!";
+  setsid                  or die "Can't start a new session: $!";
+  open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
+
+}
+
+=head1 NAME
+
+freeside-queued - Job queue daemon
+
+=head1 SYNOPSIS
+
+  freeside-queued user
+
+=head1 DESCRIPTION
+
+Job queue daemon.  Should be running at all times.
+
+user: from the mapsecrets file - see config.html from the base documentation
+
+=head1 VERSION
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+=cut
+
diff --git a/FS/t/queue.t b/FS/t/queue.t
new file mode 100644
index 000000000..43e33730e
--- /dev/null
+++ b/FS/t/queue.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::queue;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/queue_arg.t b/FS/t/queue_arg.t
new file mode 100644
index 000000000..cf3f91dfe
--- /dev/null
+++ b/FS/t/queue_arg.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::queue_arg;
+$loaded=1;
+print "ok 1\n";
diff --git a/README.1.4.0pre2-3 b/README.1.4.0pre2-3
index 23b838e3b..1de2a547f 100644
--- a/README.1.4.0pre2-3
+++ b/README.1.4.0pre2-3
@@ -10,7 +10,28 @@ CREATE TABLE part_svc_column (
 
 CREATE UNIQUE INDEX part_svc_column1 ON part_svc_column ( svcpart, columnname );
 
+CREATE TABLE queue (
+  jobnum int primary key,
+  job varchar not null,
+  _date int not null,
+  status varchar(80) not null
+);
+
+CREATE TABLE queue_arg (
+  argnum int primary key,
+  jobnum int not null,
+  arg varchar null
+);
+
+CREATE INDEX queue_arg1 ON queue_arg ( jobnum );
+
 Run bin/fs-migrate-part_svc
 
 Run bin/dbdef-create
 
+Create the `/usr/local/etc/freeside/cache.<i>datasrc</i>' directory
+  (ownded by the freeside user).
+
+freeside-queued was installed with the Perl modules.  Start it now and ensure
+that it is run upon system startup.
+
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 145529a06..b6f6c6975 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -63,8 +63,8 @@ sub handler
       use FS::CGI qw(header menubar popurl table);
 
       $cgi = new CGI;
-      #&cgisuidsetup($cgi);
-      &cgisuidsetup($r);
+      &cgisuidsetup($cgi);
+      #&cgisuidsetup($r);
       $p = popurl(2);
     }
     $r->content_type('text/html');
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index cfb1ad82b..8a564ba9a 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.4 2001-09-06 20:41:59 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.5 2001-09-11 00:08:18 ivan Exp $ -->
 <%= header('Service Definition Listing', menubar( 'Main Menu' => $p) ) %>
 
     Services are items you offer to your customers.<BR><BR>
@@ -35,7 +35,7 @@
      foreach my $field ( @fields ) {
        my $flag = $part_svc->part_svc_column($field)->columnflag;
 %>
-     <%= $n1 %><TD><%= $row %></TD><TD>
+     <%= $n1 %><TD><%= $field %></TD><TD>
 
 <%     if ( $flag eq "D" ) { print "Default"; }
          elsif ( $flag eq "F" ) { print "Fixed"; }
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 1529c648e..4bf7b44ea 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -109,9 +109,11 @@ require "/usr/local/apache/conf/handler.pl";
 <ul>
 <li>Restrict access to this web interface.  (with <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache</a>)
 <li>Create the necessary <a href="config.html">configuration files</a>.
-<li>Create the `/usr/local/etc/freeside/counters.<i>datasrc</i>', and 
+<li>Create the `/usr/local/etc/freeside/counters.<i>datasrc</i>', 
+  `/usr/local/etc/freeside/cache.<i>datasrc</i>', and 
   `/usr/local/etc/freeside/export.<i>datasrc</i>' directories for each <i>datasrc</i> (owned by the freeside user).
   <li>As the freeside user, run bin/fs-setup to create the database tables.
+  <li>freeside-queued was installed with the Perl modules.  Start it now and ensure that is run upon system startup.
   <li>Now proceed to the initial <a href="admin.html">administration</a> of your installation.
 </ul>
 </body>
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 32c365ec3..e3fe98096 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -43,6 +43,14 @@
         <li>otaker - order taker
         <li>reason
       </ul>
+    <li><a name="cust_credit_bill" href="man/FS/cust_credit_bill.html">cust_credit_bill</a> - Credit invoice application.  Links a credit to an invoice.
+      <ul>
+        <li>creditbillnum - primary key
+        <li>crednum - <a href="#cust_credit">credit</a> being applied
+        <li>invnum - <a href="#cust_bill">invoice</a> to which credit is applied
+        <li>amount - amount applied
+        <li>_date
+      </ul>
     <li><a name="cust_main" href="man/FS/cust_main.html">cust_main</a> - Customers
       <ul>
         <li>custnum - primary key
@@ -81,6 +89,8 @@
         <li>payname - billing name (name on card)
         <li>tax - tax exempt, Y or null
         <li>otaker - order taker
+        <li>referral_custnum
+        <li>comments
       </ul>
       (columns in <i>italics</i> are optional)
     <li><a name="cust_main_invoice" href="man/FS/cust_main_invoice.html">cust_main_invoice</a> - Invoice destinations for email invoices.  Note that a customer can have many email destinations for their invoice (either literal or via svcnum), but only one postal destination.
@@ -302,5 +312,18 @@
         <li>typenum - <a href="#agent_type">agent type</a>
         <li>pkgpart - <a href="#part_pkg">Package definition</a>
       </ul>
+    <li><a name="queue" href="man/FS/queue.html">queue</a> - job queue
+      <ul>
+        <li>jobnum - primary key
+        <li>job
+        <li>_date
+        <li>status
+      </ul>
+    <li><a name="queue_arg" href="man/FS/queue_arg.html">queue_arg</a> - job arguments
+      <ul>
+        <li>argnum - primary key
+        <li>jobnum - <a href="#queue">job</a>
+        <li>arg - argument
+      </ul>
   </ul>
 </body>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 67b0e5fe1..d86adc046 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -103,6 +103,19 @@ CREATE TABLE part_svc_column (
   columnflag char(1) null
 );
 
+CREATE TABLE queue (
+  jobnum int primary key,
+  job varchar not null,
+  _date int not null,
+  status varchar(80) not null
+);
+
+CREATE TABLE queue_arg (
+  argnum int primary key,
+  jobnum int not null,
+  arg varchar null
+);
+CREATE INDEX queue_arg1 ON queue_arg ( jobnum );
 
 ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
 ALTER TABLE svc_domain ADD catchall integer NULL;
@@ -217,5 +230,9 @@ ALTER TABLE cust_refund DROP COLUMN crednum;
 </pre></font>
 </td></tr></table>
   <li><b>IMPORTANT: After applying the second set of database changes</b>, run bin/dbdef-create again.
-  <li>create the conf.dbsrc/user_policy as appropriate for your site
+  <li>create the <a href="config.html#username_policy">user_policy configuration file</a> as appropriate for your site.
+  <li>Create the `/usr/local/etc/freeside/cache.<i>datasrc</i>' directory
+      (ownded by the freeside user).
+  <li>freeside-queued was installed with the Perl modules.  Start it now and ensure that is run upon system startup.
+</ul>
 </body>
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index c0d632fa5..c0a789667 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.7 2001-09-06 20:42:00 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.8 2001-09-11 00:08:18 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -147,7 +147,7 @@ foreach my $svcdb ( qw(
 
   my(@fields) = $svcdb eq 'konq_kludge'
                   ? ()
-                  : grep { $_ ne 'svcnum' } fields($svcdb) );
+                  : grep { $_ ne 'svcnum' } fields($svcdb);
   #my($rowspan)=scalar(@rows);
 
   #my($ptmp)="<TD ROWSPAN=$rowspan>$svcdb</TD>";
@@ -180,7 +180,7 @@ function fixup(what) {
     my $part_svc_column = $part_svc->part_svc_column($field);
     my $value = $cgi->param('error')
                   ? $cgi->param("${svcdb}__${field}")
-                  : $$part_svc_column->columnvalue;
+                  : $part_svc_column->columnvalue;
     my $flag = $cgi->param('error')
                  ? $cgi->param("${svcdb}__${field}_flag")
                  : $part_svc_column->columnflag;
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 5652c5805..937f7fb4c 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -17,7 +17,7 @@ my $new = new FS::part_svc ( {
 
 my $error;
 if ( $svcpart ) {
-  $error = $new->replace($old);
+  $error = $new->replace($old, '1.3-COMPAT');
 } else {
   $error = $new->insert;
   $svcpart=$new->getfield('svcpart');
diff --git a/httemplate/index.html b/httemplate/index.html
index f24d354b1..2fbc06221 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -60,6 +60,7 @@
               <LI>unlinked domains (<A HREF="search/svc_domain.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?UN_domain">by domain</A>)
             </UL>
           <LI><A HREF="browse/nas.cgi">NAS ports</A>
+          <LI><A HREF="browse/queue.cgi">Joe queue</A>
         </ul>
       <li><A NAME="admin">Administration</a>
         <ul>
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 5defaf4af..9dcada7c2 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.4 2001-08-28 16:58:08 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.5 2001-09-11 00:08:18 ivan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
@@ -253,13 +253,12 @@ sub lastsearch {
 
   } else {
 
-    my(%last);
+    &FS::cust_main::check_and_rebuild_fuzzyfiles;
+    my $all_last = &FS::cust_main::all_last;
 
-    my(@all_last)=map $_->getfield('last'), qsearch('cust_main',{});
-    push @all_last, grep $_, map $_->getfield('ship_last'), qsearch('cust_main',{})
-      if defined dbdef->table('cust_main')->column('ship_last');
+    my %last;
     if ($last_type{'Fuzzy'}) { 
-      foreach ( amatch($last, [ qw(i) ], @all_last) ) {
+      foreach ( amatch($last, [ qw(i) ], @$all_last) ) {
         $last{$_}++; 
       }
     }
@@ -300,13 +299,12 @@ sub companysearch {
 
   } else {
 
-    my(%company);
-    my(@all_company)=map $_->company, qsearch('cust_main',{});
-    push @all_company, grep $_, map $_->getfield('ship_company'), qsearch('cust_main',{})
-      if defined dbdef->table('cust_main')->column('ship_last');
+    &FS::cust_main::check_and_rebuild_fuzzyfiles;
+    my $all_company = &FS::cust_main::all_company;
 
+    my %company;
     if ($company_type{'Fuzzy'}) { 
-      foreach ( amatch($company, [ qw(i) ], @all_company ) ) {
+      foreach ( amatch($company, [ qw(i) ], @$all_company ) ) {
         $company{$_}++;
       }
     }
-- 
cgit v1.2.1


From 01ea770bbf69f2e31a2e74254ca931917f2ca1ef Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 01:09:56 +0000
Subject: working queued

---
 FS/bin/freeside-queued | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 5acffb52c..8ed989683 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -1,8 +1,12 @@
 #!/usr/bin/perl -w
 
 use strict;
+use vars qw( $log_file $sigterm $sigint );
+use subs qw( _die _logmsg );
 use Fcntl qw(:flock);
 use POSIX qw(setsid);
+use Date::Format;
+use IO::File;
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearchs);
 use FS::queue;
@@ -14,16 +18,14 @@ my $pid_file = '/var/run/freeside-queued.pid';
 
 $SIG{CHLD} = sub { wait }; #zombie prevention
 
-my $sigterm = 0;
-my $sigint = 0;
-$SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $sigint++; };
-$SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
-
 my $user = shift or die &usage;
 
 &daemonize;
 
-my $log_file = "/usr/local/etc/freeside/queuelog.";
+ $sigterm = 0;
+ $sigint = 0;
+$SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $sigint++; };
+$SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
 
 $> = $FS::UID::freeside_uid unless $>;
 adminsuidsetup $user;
@@ -33,6 +35,7 @@ $log_file = "/usr/local/etc/freeside/queuelog.". $FS::UID::datasrc;
 $SIG{__DIE__} = \&_die;
 $SIG{__WARN__} = \&_logmsg;
 
+warn "freesied-queued starting\n";
 
 while (1) {
 
@@ -82,11 +85,6 @@ while (1) {
   }
 }
 
-
-sub datestamp {
-  time2str("%m%d%Y", time);
-}
-
 sub _die {
   my $msg = shift;
   unlink $pid_file if -e $pid_file;
@@ -100,6 +98,7 @@ sub _logmsg {
   seek($log, 0, 2);
   print $log "[". time2str("%a %b %e %T %Y",time). "] [$$] $msg\n";
   flock($log, LOCK_UN);
+  close $log;
 }
 
 sub daemonize {
-- 
cgit v1.2.1


From 842df85f746a2e1b961d6c9e3a8c5cc3678ae6dd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 03:15:58 +0000
Subject: cyrus support

---
 FS/FS/cust_main.pm           |  28 +-------
 FS/FS/svc_acct.pm            | 151 ++++++++++++++++++++++++++++++++++++++-----
 FS/bin/freeside-queued       |   2 +
 README.1.4.0pre2-3           |   2 +
 httemplate/docs/config.html  |   2 +-
 httemplate/docs/export.html  |   6 ++
 httemplate/edit/part_svc.cgi |   4 +-
 7 files changed, 152 insertions(+), 43 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index e4f55cf27..633c6e3da 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1,7 +1,3 @@
-#this is so kludgy i'd be embarassed if it wasn't cybercash's fault
-package main;
-use vars qw($paymentserversecret $paymentserverport $paymentserverhost);
-
 package FS::cust_main;
 
 use strict;
@@ -66,15 +62,6 @@ $FS::UID::callback{'FS::cust_main'} = sub {
       die "CCMckLib3_2::InitConfig fatal error: $errmsg\n";
     }
     $processor='cybercash3.2';
-  } elsif ( $conf->exists('cybercash2') ) {
-    require CCLib;
-      #qw(sendmserver);
-    ( $main::paymentserverhost, 
-      $main::paymentserverport, 
-      $main::paymentserversecret,
-      $xaction,
-    ) = $conf->config('cybercash2');
-    $processor='cybercash2';
   } elsif ( $conf->exists('business-onlinepayment') ) {
     ( $bop_processor,
       $bop_login,
@@ -1082,7 +1069,7 @@ sub collect {
         $self->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
         my $exp = "$2/$1";
 
-        if ( $processor =~ /^cybercash/ ) {
+        if ( $processor eq 'cybercash3.2' ) {
 
           #fix exp. date for cybercash
           #$self->paydate =~ /^(\d+)\/\d*(\d{2})$/;
@@ -1112,16 +1099,7 @@ sub collect {
           );
 
           my %result;
-          if ( $processor eq 'cybercash2' ) {
-            $^W=0; #CCLib isn't -w safe, ugh!
-            %result = &CCLib::sendmserver(@full_xaction);
-            $^W=1;
-          } elsif ( $processor eq 'cybercash3.2' ) {
-            %result = &CCMckDirectLib3_2::SendCC2_1Server(@full_xaction);
-          } else {
-            $dbh->rollback if $oldAutoCommit;
-            return "Unknown real-time processor $processor";
-          }
+          %result = &CCMckDirectLib3_2::SendCC2_1Server(@full_xaction);
          
           #if ( $result{'MActionCode'} == 7 ) { #cybercash smps v.1.1.3
           #if ( $result{'action-code'} == 7 ) { #cybercash smps v.2.1
@@ -1683,7 +1661,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.30 2001-09-11 00:08:18 ivan Exp $
+$Id: cust_main.pm,v 1.31 2001-09-11 03:15:58 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index fa055cfff..926a9d344 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -4,6 +4,7 @@ use strict;
 use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
              $usernamemax $passwordmin $username_letter $username_letterfirst
              $shellmachine $useradd $usermod $userdel $mydomain
+             $cyrus_server $cyrus_admin_user $cyrus_admin_pass
              @saltset @pw_set);
 use Carp;
 use FS::Conf;
@@ -16,6 +17,7 @@ use FS::svc_acct_sm;
 use FS::cust_main_invoice;
 use FS::svc_domain;
 use FS::raddb;
+use FS::queue;
 
 @ISA = qw( FS::svc_Common );
 
@@ -52,6 +54,15 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
   $username_letter = $conf->exists('username-letter');
   $username_letterfirst = $conf->exists('username-letterfirst');
   $mydomain = $conf->config('domain');
+  if ( $conf->exists('cyrus') ) {
+    ($cyrus_server, $cyrus_admin_user, $cyrus_admin_pass) =
+      $conf->config('cyrus');
+    eval "use Cyrus::IMAP::Admin;"
+  } else {
+    $cyrus_server = '';
+    $cyrus_admin_user = '';
+    $cyrus_admin_pass = '';
+  }
 };
 
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
@@ -151,7 +162,8 @@ defined.  An FS::cust_svc record will be created and inserted.
 
 If the configuration value (see L<FS::Conf>) shellmachine exists, and the 
 username, uid, and dir fields are defined, the command(s) specified in
-the shellmachine-useradd configuration are exectued on shellmachine via ssh.
+the shellmachine-useradd configuration are added to the job queue (see
+L<FS::queue> and L<freeside-queued>) to be exectued on shellmachine via ssh.
 This behaviour can be surpressed by setting $FS::svc_acct::nossh_hack true.
 If the shellmachine-useradd configuration file does not exist,
 
@@ -166,6 +178,8 @@ is the default instead.  Otherwise the contents of the file are treated as
 a double-quoted perl string, with the following variables available:
 $username, $uid, $gid, $dir, and $shell.
 
+(TODOC: cyrus config file, L<FS::queue> and L<freeside-queued>)
+
 =cut
 
 sub insert {
@@ -179,6 +193,12 @@ sub insert {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $amount = 0;
+
   $error = $self->check;
   return $error if $error;
 
@@ -196,7 +216,10 @@ sub insert {
     ;
 
   $error = $self->SUPER::insert;
-  return $error if $error;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
 
   my( $username, $uid, $gid, $dir, $shell ) = (
     $self->username,
@@ -206,12 +229,54 @@ sub insert {
     $self->shell,
   );
   if ( $username && $uid && $dir && $shellmachine && ! $nossh_hack ) {
-    ssh("root\@$shellmachine", eval qq("$useradd") );
+    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh' };
+    $error = $queue->insert("root\@$shellmachine", eval qq("$useradd") );
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
   }
 
+  if ( $cyrus_server ) {
+    my $queue = new FS::queue { 'job' => 'FS::svc_acct::cyrus_insert' };
+    $error = $queue->insert($self->username, $self->quota);
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
 }
 
+sub cyrus_insert {
+  my( $username, $quota ) = 
+
+  my $client = Cyrus::IMAP::Admin->new($cyrus_server);
+  $client->authenticate(
+    -user      => $cyrus_admin_user,
+    -mechanism => "login",       
+    -password  => $cyrus_admin_pass
+  );
+
+  my $rc = $client->create("user.$username");
+  my $error = $client->error;
+  die $error if $error;
+
+  $rc = $client->setacl("user.$username", $username => 'all' );
+  $error = $client->error;
+  die $error if $error;
+
+  if ( $quota ) {
+    $rc = $client->setquota("user.$username", 'STORAGE' => $quota );
+    $error = $client->error;
+    die $error if $error;
+  }
+
+  1;
+}
+
 =item delete
 
 Deletes this account from the database.  If there is an error, returns the
@@ -221,7 +286,8 @@ The corresponding FS::cust_svc record will be deleted as well.
 
 If the configuration value (see L<FS::Conf>) shellmachine exists, the
 command(s) specified in the shellmachine-userdel configuration file are
-executed on shellmachine via ssh.  This behavior can be surpressed by setting
+added to the job queue (see L<FS::queue> and L<freeside-queued>) to be executed
+on shellmachine via ssh.  This behavior can be surpressed by setting
 $FS::svc_acct::nossh_hack true.  If the shellmachine-userdel configuration
 file does not exist,
 
@@ -236,6 +302,8 @@ is the default instead.  Otherwise the contents of the file are treated as a
 double-quoted perl string, with the following variables available:
 $username and $dir.
 
+(TODOC: cyrus config file)
+
 =cut
 
 sub delete {
@@ -298,19 +366,54 @@ sub delete {
     return $error;
   }
 
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
   my( $username, $dir ) = (
     $self->username,
     $self->dir,
   );
   if ( $username && $shellmachine && ! $nossh_hack ) {
-    ssh("root\@$shellmachine", eval qq("$userdel") );
+    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh' };
+    $error = $queue->insert("root\@$shellmachine", eval qq("$userdel") );
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
+
+  }
+
+  if ( $cyrus_server ) {
+    my $queue = new FS::queue { 'job' => 'FS::svc_acct::cyrus_delete' };
+    $error = $queue->insert($self->username);
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
   }
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 }
 
+sub cyrus_delete {
+  my( $username ) = shift; 
+
+  my $client = Cyrus::IMAP::Admin->new($cyrus_server);
+  $client->authenticate(
+    -user      => $cyrus_admin_user,
+    -mechanism => "login",       
+    -password  => $cyrus_admin_pass
+  );
+
+  my $rc = $client->setacl("user.$username", $cyrus_admin_user => 'all' );
+  my $error = $client->error;
+  die $error if $error;
+
+  $rc = $client->delete("user.$username");
+  $error = $client->error;
+  die $error if $error;
+
+  1;
+}
+
 =item replace OLD_RECORD
 
 Replaces OLD_RECORD with this one in the database.  If there is an error,
@@ -318,9 +421,10 @@ returns the error, otherwise returns false.
 
 If the configuration value (see L<FS::Conf>) shellmachine exists, and the 
 dir field has changed, the command(s) specified in the shellmachine-usermod
-configuraiton file are executed on shellmachine via ssh.  This behavior can
+configuraiton file are added to the job queue (see L<FS::queue> and
+L<freeside-queued>) to be executed on shellmachine via ssh.  This behavior can
 be surpressed by setting $FS::svc-acct::nossh_hack true.  If the
-shellmachine-userdel configuration file does not exist or is empty, :
+shellmachine-userdel configuration file does not exist or is empty,
 
   [ -d $old_dir ] && mv $old_dir $new_dir || (
     chmod u+t $old_dir;
@@ -332,8 +436,8 @@ shellmachine-userdel configuration file does not exist or is empty, :
     rm -rf $old_dir
   )
 
-is executed on shellmachine via ssh.  This behaviour can be surpressed by
-setting $FS::svc_acct::nossh_hack true.
+is the default.  This behaviour can be surpressed by setting
+$FS::svc_acct::nossh_hack true.
 
 =cut
 
@@ -347,6 +451,9 @@ sub replace {
 
   return "Can't change uid!" if $old->uid != $new->uid;
 
+  return "can't change username using Cyrus"
+    if $cyrus_server && $old->username ne $new->username;
+
   #change homdir when we change username
   $new->setfield('dir', '') if $old->username ne $new->username;
 
@@ -357,8 +464,15 @@ sub replace {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
   $error = $new->SUPER::replace($old);
-  return $error if $error;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error if $error;
+  }
 
   my ( $old_dir, $new_dir, $uid, $gid ) = (
     $old->getfield('dir'),
@@ -367,9 +481,15 @@ sub replace {
     $new->getfield('gid'),
   );
   if ( $old_dir && $new_dir && $old_dir ne $new_dir && ! $nossh_hack ) {
-    ssh("root\@$shellmachine", eval qq("$usermod") );
+    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh' };
+    $error = $queue->insert("root\@$shellmachine", eval qq("$usermod") );
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
   }
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
 }
 
@@ -638,7 +758,7 @@ sub email {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.33 2001-09-07 20:26:33 ivan Exp $
+$Id: svc_acct.pm,v 1.34 2001-09-11 03:15:58 ivan Exp $
 
 =head1 BUGS
 
@@ -654,7 +774,8 @@ counterintuitive.
 =head1 SEE ALSO
 
 L<FS::svc_Common>, L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>,
-L<FS::part_svc>, L<FS::cust_pkg>, L<Net::SSH>, L<ssh>, L<FS::svc_acct_pop>,
+L<FS::part_svc>, L<FS::cust_pkg>, L<FS::queue>, L<freeside-queued>),
+L<Net::SSH>, L<ssh>, L<FS::svc_acct_pop>,
 schema.html from the base documentation.
 
 =cut
diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 8ed989683..098e33f54 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -13,6 +13,8 @@ use FS::queue;
 
 # no autoloading just yet
 use FS::cust_main;
+use FS::svc_acct;
+use Net::SSH;
 
 my $pid_file = '/var/run/freeside-queued.pid';
 
diff --git a/README.1.4.0pre2-3 b/README.1.4.0pre2-3
index 1de2a547f..c8d99905e 100644
--- a/README.1.4.0pre2-3
+++ b/README.1.4.0pre2-3
@@ -1,5 +1,7 @@
 the following is necessary to upgrade from 1.4.0pre2 to pre3 or later.
 
+install the perl modules and httemplate as per install.html or upgrade8.html
+
 CREATE TABLE part_svc_column (
   columnnum int primary key,
   svcpart int not null,
diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
index deae044d2..ac7752e07 100644
--- a/httemplate/docs/config.html
+++ b/httemplate/docs/config.html
@@ -40,8 +40,8 @@ All further configuration files and directories are located in
   <li><a name="business-onlinepayment">business-onlinepayment</a> - <a href="http://search.cpan.org/search?dist=Business-OnlinePayment">Business::OnlinePayment</a> support, at least three lines: processor, login, and password.  An optional fourth line specifies the action.  Optional additional lines are passed to Business::OnlinePayment as %processor_options.
   <li><a name="bsdshellmachines">bsdshellmachines</a> - Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/master.passwd'.
   <li><a name="countrydefault">countrydefault</a> - Default two-letter country code (if not supplied, the default is `US')
-  <li><a name="cybercash2">cybercash2</a> - <a href="http://www.cybercash.com/cybercash/services/cashreg214.html">CyberCash v2</a> support, four lines: paymentserverhost, paymentserverport, paymentserversecret, and transaction type (`mauthonly' or `mauthcapture').  CCLib.pm is required.
   <li>cybercash3.2 - <a href="http://www.cybercash.com/cybercash/services/technology.html">CyberCash v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly' or `mauthcapture').  CCMckLib3_2.pm, CCMckDirectLib3_2.pm and CCMckErrno3_2 are required.
+  <li>cyrus</li> - Integration with <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a>, three lines: IMAP server, admin username, and admin password.  Cyrus::IMAP::Admin should be installed locally and the connection to the server secured.
   <li><a name="deletecustomers">deletecustomers</a> - The existance of this file will enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that this customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers' packages if they cancel service.
   <li><a name="disable_customer_referrals">disable_customer_referrals</a> - The existance of this file will disable new customer-to-customer referrals in the web interface.
   <li><a name="domain"><font color="#ff0000">domain</font></a> - Your domain name.
diff --git a/httemplate/docs/export.html b/httemplate/docs/export.html
index 7f3a07118..c7410a923 100755
--- a/httemplate/docs/export.html
+++ b/httemplate/docs/export.html
@@ -20,6 +20,12 @@ it is reccommended that you replicate the data to an external RADIUS machine rat
         <li>Account deletion - The command(s) specified in the <a href="config.html#shellmachine-userdel">shellmachine-userdel</a> configuration file are executed on shellmachine via ssh.  If this file does not exist, <code>userdel $username</code> is the default.  If the file exists but is empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.
         <li>Account modification - If a user's home directory changes, the command(s) specified in the <a href="config.html#shellmachine-usermod">shellmachine-usermod</a> configuration file are execute on shellmachine via ssh.  If this file does not exist or is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.
       </ul>
+    <li>svc_acct.pm - <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a> integration, enabled by the <a href="config.html#cyrus">cyrus configuration file</a>
+      <ul>
+        <li>Account creation - (Cyrus::IMAP::Admin should be installed locally)
+        <li>Account deletion - (Cyrus::IMAP::Admin should be installed locally)
+        <li>Account modification - (not yet implemented)
+      </ul>
     <li>bin/svc_acct_sm.export will create <a href="http://www.qmail.org">Qmail</a> <b>rcpthosts</b>, <b>recipientmap</b> and <b>virtualdomains</b> files and <a href="http://www.sendmail.org">Sendmail</a> <b>virtusertable</b> and <b>sendmail.cw</b> files in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattemded:
       <ul>
         <li>qmailmachines - <b>recipientmap</b>, <b>virtualdomains</b> and <b>rcpthosts</b> are copied to the <b>/var/qmail/control</b> directory on the remote machine.  Note: If you <a href="legacy.html#svc_acct_sm">imported</a> qmail configuration files, run the generated <b>/usr/local/etc/freeside/export.<i>datasrc</i>/virtualdomains.FIX</b> on a machine with your user home directories before exporting qmail configuration files.
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index c0a789667..0deed7b99 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.8 2001-09-11 00:08:18 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.9 2001-09-11 03:15:58 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -107,7 +107,7 @@ my %defs = (
     'slipip'    => 'IP address (Set to fixed and blank to disable dialin, or, set a value to be exported to RADIUS Framed-IP-Address.  Use the special value <code>0e0</code> [zero e zero] to enable export to RADIUS without a Framed-IP-Address.)',
     'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
     'username'  => 'Username',
-    'quota'     => '(unimplemented)',
+    'quota'     => '',
     '_password' => 'Password',
     'gid'       => 'GID (when blank, defaults to UID)',
     'shell'     => 'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file)',
-- 
cgit v1.2.1


From 8d6016abb9ca2e9d270d668e9607445921846aaa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 04:17:47 +0000
Subject: username-noperiod config file

---
 FS/FS/svc_acct.pm           | 7 ++++++-
 httemplate/docs/config.html | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 926a9d344..f7d2fd7db 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -3,6 +3,7 @@ package FS::svc_acct;
 use strict;
 use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
              $usernamemax $passwordmin $username_letter $username_letterfirst
+             $username_noperiod
              $shellmachine $useradd $usermod $userdel $mydomain
              $cyrus_server $cyrus_admin_user $cyrus_admin_pass
              @saltset @pw_set);
@@ -53,6 +54,7 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
   }
   $username_letter = $conf->exists('username-letter');
   $username_letterfirst = $conf->exists('username-letterfirst');
+  $username_noperiod = $conf->exists('username-noperiod');
   $mydomain = $conf->config('domain');
   if ( $conf->exists('cyrus') ) {
     ($cyrus_server, $cyrus_admin_user, $cyrus_admin_pass) =
@@ -574,6 +576,9 @@ sub check {
   } elsif ( $username_letter ) {
     $recref->{username} =~ /[a-z]/ or return "Illegal username";
   }
+  if ( $username_noperiod ) {
+    $recref->{username} =~ /\./ and return "Illegal username";
+  }
 
   $recref->{popnum} =~ /^(\d*)$/ or return "Illegal popnum: ".$recref->{popnum};
   $recref->{popnum} = $1;
@@ -758,7 +763,7 @@ sub email {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.34 2001-09-11 03:15:58 ivan Exp $
+$Id: svc_acct.pm,v 1.35 2001-09-11 04:17:47 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
index ac7752e07..84e9538f7 100644
--- a/httemplate/docs/config.html
+++ b/httemplate/docs/config.html
@@ -100,8 +100,9 @@ All further configuration files and directories are located in
   <li><a name="textradiusprepend">textradiusprepend</a> - <b>DEPRECIATED</b>, use RADIUS check attributes instead.  This option will be removed soon.  The contents of this file will be prepended to the first line of a user's RADIUS entry in text exports.
   <li><a name="usernamemin">usernamemin</a> - Minimum username length (default 2);
   <li><a name="usernamemax">usernamemax</a> - Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)
-  <li><a name="usernamemax">username-letter</a> - The existance of this file will turn on the requirement that usernames contain at least one letter.
-  <li><a name="usernamemax">username-letterfirst</a> - The existance of this file will turn on the requirement that usernames start with a letter.
+  <li><a name="username-letter">username-letter</a> - The existance of this file will turn on the requirement that usernames contain at least one letter.
+  <li><a name="username-letterfirst">username-letterfirst</a> - The existance of this file will turn on the requirement that usernames start with a letter.
+  <li><a name="username-noperiod">username-noperiod</a> - The existance of this file will disallow periods in usernames.
    <li><a name="username_policy">username_policy</a> - This file controls the mechanism for preventing duplicate usernames in passwd/radius files exported from svc_accts.  This should be one of 'prepend domsvc' 'append domsvc' or 'append domain'
    <li><a name="vpopmailmachines">vpopmailmachines</a> - Your vpopmail pop toasters, one per line.  Each line is of the form "machinename vpopdir vpopuid vpopgid".  For example: <code>poptoaster.domain.tld /home/vpopmail 508 508</code>  Note: vpopuid and vpopgid are values taken from the vpopmail machine's /etc/passwd
 
-- 
cgit v1.2.1


From 657f97bbcfd5c778aee1f1c1d82c48f4e0bc286f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 04:44:58 +0000
Subject: web queue view

---
 httemplate/browse/queue.cgi | 56 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100755 httemplate/browse/queue.cgi

diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
new file mode 100755
index 000000000..86d4a20f1
--- /dev/null
+++ b/httemplate/browse/queue.cgi
@@ -0,0 +1,56 @@
+<%
+#<!-- $Id: queue.cgi,v 1.1 2001-09-11 04:44:58 ivan Exp $ -->
+
+use strict;
+use vars qw( $cgi $p ); # $part_referral );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use Date::Format;
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch);
+use FS::CGI qw(header menubar popurl table);
+use FS::queue;
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+$p = popurl(2);
+
+print $cgi->header( '-expires' => 'now' ), header("Job Queue", menubar(
+  'Main Menu' => $p,
+#  'Add new referral' => "../edit/part_referral.cgi",
+)), &table(), <<END;
+      <TR>
+        <TH COLSPAN=2>Job</TH>
+        <TH>Args</TH>
+        <TH>Date</TH>
+        <TH>Status</TH>
+      </TR>
+END
+
+foreach my $queue ( sort { 
+  $a->getfield('jobnum') <=> $b->getfield('jobnum')
+} qsearch('queue',{}) ) {
+  my($hashref)=$queue->hashref;
+  my $args = join(' ', $queue->args);
+  my $date = time2str( "%a %b %e %T %Y", $queue->_date );
+  print <<END;
+      <TR>
+        <TD>$hashref->{jobnum}</TD>
+        <TD>$hashref->{job}</TD>
+        <TD>$args</TD>
+        <TD>$date</TD>
+        <TD>$hashref->{status}</TD>
+      </TR>
+END
+
+}
+
+print <<END;
+    </TABLE>
+  </BODY>
+</HTML>
+END
+
+%>
-- 
cgit v1.2.1


From 89301379ac6f1e2ebab203e458849001d3f8fb49 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 09:56:27 +0000
Subject: fix quick order

---
 README.1.4.0pre2-3                         | 4 ++--
 httemplate/edit/process/quick-cust_pkg.cgi | 4 ++--
 httemplate/view/cust_main.cgi              | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.1.4.0pre2-3 b/README.1.4.0pre2-3
index c8d99905e..eac5dae10 100644
--- a/README.1.4.0pre2-3
+++ b/README.1.4.0pre2-3
@@ -27,10 +27,10 @@ CREATE TABLE queue_arg (
 
 CREATE INDEX queue_arg1 ON queue_arg ( jobnum );
 
-Run bin/fs-migrate-part_svc
-
 Run bin/dbdef-create
 
+Run bin/fs-migrate-part_svc
+
 Create the `/usr/local/etc/freeside/cache.<i>datasrc</i>' directory
   (ownded by the freeside user).
 
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 5ac315d87..ff0c5b229 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -1,12 +1,12 @@
 <%
-#<!-- $Id: quick-cust_pkg.cgi,v 1.1 2001-09-04 14:44:07 ivan Exp $ -->
+#<!-- $Id: quick-cust_pkg.cgi,v 1.2 2001-09-11 09:56:27 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $custnum $pkgpart $error ); #@remove_pkgnums @pkgparts
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
+use FS::CGI qw(popurl eidiot);
 use FS::cust_pkg;
 
 $cgi = new CGI; # create form object
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index b3ea336e9..174c08760 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.9 2001-09-04 14:44:07 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.10 2001-09-11 09:56:27 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
@@ -252,7 +252,7 @@ print '</TD></TR></TABLE>';
 print '<BR>'.
   '<FORM ACTION="'.popurl(2).'edit/process/quick-cust_pkg.cgi" METHOD="POST">'.
   qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
-  '<SELECT NAME="pkgpart"><OPTION>';
+  '<SELECT NAME="pkgpart"><OPTION> ';
 
 foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
   my $pkgpart = $type_pkgs->pkgpart;
-- 
cgit v1.2.1


From 34678d474a3710a38e42fd681607fe98edb56658 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 10:05:30 +0000
Subject: s/die/ediot/

---
 httemplate/edit/process/quick-cust_pkg.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index ff0c5b229..c4f5172ad 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: quick-cust_pkg.cgi,v 1.2 2001-09-11 09:56:27 ivan Exp $ -->
+#<!-- $Id: quick-cust_pkg.cgi,v 1.3 2001-09-11 10:05:30 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $custnum $pkgpart $error ); #@remove_pkgnums @pkgparts
@@ -15,10 +15,10 @@ $error = '';
 
 #untaint custnum
 $cgi->param('custnum') =~ /^(\d+)$/
-  or die 'illegal custnum '. $cgi->param('custnum');
+  or eidiot 'illegal custnum '. $cgi->param('custnum');
 $custnum = $1;
 $cgi->param('pkgpart') =~ /^(\d+)$/
-  or die 'illegal pkgpart '. $cgi->param('pkgpart');
+  or eidiot 'illegal pkgpart '. $cgi->param('pkgpart');
 $pkgpart = $1;
 
 my @cust_pkg = ();
-- 
cgit v1.2.1


From fa0a72bfd08ec131523df6c40da96296ddadbb30 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 11:03:06 +0000
Subject: missing quote in new template

---
 fs_signup/FS-SignupClient/cgi/signup.cgi  | 4 ++--
 fs_signup/FS-SignupClient/cgi/signup.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 0da960579..4ed5bf7d9 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.11 2001-08-30 16:23:32 ivan Exp $
+# $Id: signup.cgi,v 1.12 2001-09-11 11:03:06 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $error
@@ -414,7 +414,7 @@ Contact Information
 
   <%=
     foreach my $pop ( @{$pops} ) {
-      $OUT .= '<OPTION VALUE='. $pop->{'popnum'}. '"';
+      $OUT .= '<OPTION VALUE="'. $pop->{'popnum'}. '"';
       $OUT .= ' SELECTED' if $popnum && $pop->{'popnum'} == $popnum;
       $OUT .= '>'. $pop->{'popnum'}. ': '. $pop->{'city'}. ', '.
               $pop->{'state'}. ' ('. $pop->{'ac'}. ')/'. $pop->{'exch'}. "\n";
diff --git a/fs_signup/FS-SignupClient/cgi/signup.html b/fs_signup/FS-SignupClient/cgi/signup.html
index bc02db230..fcedde3ab 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.html
+++ b/fs_signup/FS-SignupClient/cgi/signup.html
@@ -135,7 +135,7 @@ Contact Information
 
   <%=
     foreach my $pop ( @{$pops} ) {
-      $OUT .= '<OPTION VALUE='. $pop->{'popnum'}. '"';
+      $OUT .= '<OPTION VALUE="'. $pop->{'popnum'}. '"';
       $OUT .= ' SELECTED' if $popnum && $pop->{'popnum'} == $popnum;
       $OUT .= '>'. $pop->{'popnum'}. ': '. $pop->{'city'}. ', '.
               $pop->{'state'}. ' ('. $pop->{'ac'}. ')/'. $pop->{'exch'}. "\n";
-- 
cgit v1.2.1


From ed630f32767f9f495c3a6c98073feb41a5a98434 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 11:28:15 +0000
Subject: signup server fix!

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 4ed5bf7d9..f0d4620c5 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.12 2001-09-11 11:03:06 ivan Exp $
+# $Id: signup.cgi,v 1.13 2001-09-11 11:28:15 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $error
@@ -73,7 +73,7 @@ if ( -e $signup_html ) {
 }
 
 if ( -e $success_html ) {
-  my $success_txt = Text::Template::_load_text($signup_html)
+  my $success_txt = Text::Template::_load_text($success_html)
     or die $Text::Template::ERROR;
   $success_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
   $success_txt = $1;
@@ -115,7 +115,7 @@ if ( defined $cgi->param('magic') ) {
       $invoicing_list = 'POST';
     }
 
-    ( $error = new_customer ( {
+    $error = new_customer ( {
       'last'             => $last             = $cgi->param('last'),
       'first'            => $first            = $cgi->param('first'),
       'ss'               => $ss               = $cgi->param('ss'),
@@ -140,9 +140,12 @@ if ( defined $cgi->param('magic') ) {
       'username'         => $username         = $cgi->param('username'),
       '_password'        => $password         = $cgi->param('_password'),
       'popnum'           => $popnum           = $cgi->param('popnum'),
-    } ) )
-      ? print_form()
-      : print_okay();
+    } );
+    if ( $error ) {
+      print_form();
+    } else {
+      print_okay();
+    }
   } else {
     die "unrecognized magic: ". $cgi->param('magic');
   }
-- 
cgit v1.2.1


From 0ee3925f49c81dbabdd8042eba96fa55f8d3141e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 11:52:45 +0000
Subject: rar

---
 FS/bin/freeside-queued | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 098e33f54..d8af19866 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -67,7 +67,7 @@ while (1) {
   eval $eval;
   if ( $@ ) {
     warn "job $eval failed";
-    my $hash = $ljob->hash;
+    my %hash = $ljob->hash;
     $hash{'status'} = 'failed';
     my $fjob = new FS::queue( \%hash );
     my $error = $fjob->replace($ljob);
-- 
cgit v1.2.1


From 38e8651d6bf1b6a394bff792c92a83d88654c098 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 12:00:19 +0000
Subject: cyrus fix!

---
 FS/FS/svc_acct.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index f7d2fd7db..3988634b0 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -253,7 +253,7 @@ sub insert {
 }
 
 sub cyrus_insert {
-  my( $username, $quota ) = 
+  my( $username, $quota ) = @_;
 
   my $client = Cyrus::IMAP::Admin->new($cyrus_server);
   $client->authenticate(
@@ -396,7 +396,7 @@ sub delete {
 }
 
 sub cyrus_delete {
-  my( $username ) = shift; 
+  my $username = shift; 
 
   my $client = Cyrus::IMAP::Admin->new($cyrus_server);
   $client->authenticate(
@@ -763,7 +763,7 @@ sub email {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.35 2001-09-11 04:17:47 ivan Exp $
+$Id: svc_acct.pm,v 1.36 2001-09-11 12:00:19 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From e92e1a168b8fc6f6fcba9fd06f72e88ed9780457 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 12:06:57 +0000
Subject: better logging

---
 FS/FS/svc_acct.pm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 3988634b0..d7dbcfaf2 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -255,22 +255,30 @@ sub insert {
 sub cyrus_insert {
   my( $username, $quota ) = @_;
 
+  warn "cyrus_insert: starting for user $username, quota $quota\n";
+
+  warn "cyrus_insert: connecting to $cyrus_server\n";
   my $client = Cyrus::IMAP::Admin->new($cyrus_server);
+
+  warn "cyrus_insert: authentication as $cyrus_admin_user\n";
   $client->authenticate(
     -user      => $cyrus_admin_user,
     -mechanism => "login",       
     -password  => $cyrus_admin_pass
   );
 
+  warn "cyrus_insert: creating user.$username\n";
   my $rc = $client->create("user.$username");
   my $error = $client->error;
-  die $error if $error;
+  die "cyrus_insert: error creating user.$username: $error" if $error;
 
+  warn "cyrus_insert: setacl user.$username, $username => all\n";
   $rc = $client->setacl("user.$username", $username => 'all' );
   $error = $client->error;
   die $error if $error;
 
   if ( $quota ) {
+    warn "cyrus_insert: setquota user.$username, STORAGE => $quota\n";
     $rc = $client->setquota("user.$username", 'STORAGE' => $quota );
     $error = $client->error;
     die $error if $error;
@@ -763,7 +771,7 @@ sub email {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.36 2001-09-11 12:00:19 ivan Exp $
+$Id: svc_acct.pm,v 1.37 2001-09-11 12:06:57 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From b55c616066a2eabf78f2195572d52440e5669a3c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 12:10:56 +0000
Subject: fuzzyfix

---
 FS/FS/cust_main.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 633c6e3da..0b37a351e 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1623,6 +1623,8 @@ sub all_company {
 sub append_fuzzyfiles {
   my( $last, $company ) = @_;
 
+  &check_and_rebuild_fuzzyfiles;
+
   use Fcntl qw(:flock);
 
   my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
@@ -1661,7 +1663,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.31 2001-09-11 03:15:58 ivan Exp $
+$Id: cust_main.pm,v 1.32 2001-09-11 12:10:56 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 4c61cd25bdb4dfaeb083b3605ce3ef4d3157fe1b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 12:24:13 +0000
Subject: job queue fix

---
 FS/FS/queue.pm | 47 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index 51dd9affe..13e6f92c1 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -108,11 +108,46 @@ sub insert {
 
 =item delete
 
-Delete this record from the database.
+Delete this record from the database.  Any corresponding queue_arg records are
+deleted as well
 
 =cut
 
-# the delete method can be inherited from FS::Record
+sub delete {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my @args = $self->args;
+
+  my $error = $self->SUPER::delete;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  foreach my $arg ( @args ) {
+    $error = $arg->delete;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+
+}
 
 =item replace OLD_RECORD
 
@@ -153,14 +188,18 @@ sub check {
 
 sub args {
   my $self = shift;
-  map $_->arg, qsearch( 'queue_arg', { 'jobnum' => $self->jobnum } );
+  map $_->arg, qsearch( 'queue_arg',
+                        { 'jobnum' => $self->jobnum },
+                        '',
+                        'ORDER BY argnum'
+                      );
 }
 
 =back
 
 =head1 VERSION
 
-$Id: queue.pm,v 1.1 2001-09-11 00:08:18 ivan Exp $
+$Id: queue.pm,v 1.2 2001-09-11 12:24:13 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 148727c4b03abc9b73149c101afcc4f3fff57a73 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 12:25:55 +0000
Subject: queue clean fix

---
 FS/FS/queue.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index 13e6f92c1..09672480b 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -127,7 +127,7 @@ sub delete {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  my @args = $self->args;
+  my @args = qsearch( 'queue_arg', { 'jobnum' => $self->jobnum } );
 
   my $error = $self->SUPER::delete;
   if ( $error ) {
@@ -199,7 +199,7 @@ sub args {
 
 =head1 VERSION
 
-$Id: queue.pm,v 1.2 2001-09-11 12:24:13 ivan Exp $
+$Id: queue.pm,v 1.3 2001-09-11 12:25:55 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From a97f85810afbd1db0ffa0cf581d074f51ca13ef8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 12:42:54 +0000
Subject: fix service editing

---
 httemplate/edit/part_svc.cgi | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 0deed7b99..e16f48e3a 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.9 2001-09-11 03:15:58 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.10 2001-09-11 12:42:54 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -145,9 +145,13 @@ foreach my $svcdb ( qw(
   konq_kludge svc_acct svc_domain svc_acct_sm svc_forward svc_www
 ) ) {
 
-  my(@fields) = $svcdb eq 'konq_kludge'
-                  ? ()
-                  : grep { $_ ne 'svcnum' } fields($svcdb);
+#  my(@fields) = $svcdb eq 'konq_kludge'
+#                  ? ()
+#                  : grep { $_ ne 'svcnum' } fields($svcdb);
+  #yucky kludge
+  my(@fields) = defined( $FS::Record::dbdef->table($svcdb) )
+                  ? grep { $_ ne 'svcnum' } fields($svcdb)
+                  : ();
   #my($rowspan)=scalar(@rows);
 
   #my($ptmp)="<TD ROWSPAN=$rowspan>$svcdb</TD>";
-- 
cgit v1.2.1


From 17765dcdb928bbe90f7f4166950b5e61c678af36 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 12:46:17 +0000
Subject: more service edit fix

---
 httemplate/edit/process/part_svc.cgi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 937f7fb4c..97477d645 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -12,7 +12,9 @@ my $new = new FS::part_svc ( {
       map { my $svcdb = $_;
             map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  }
               fields($svcdb)
-          } qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www ) )
+          } grep defined( $FS::Record::dbdef->table($_) ),
+                 qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www )
+    )
 } );
 
 my $error;
-- 
cgit v1.2.1


From e9eba9d8d429675865a49af7008f3bdcca5ccb92 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 13:10:22 +0000
Subject: transactional job-queued icradius/freeradius export

---
 FS/FS/svc_acct.pm | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 71 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index d7dbcfaf2..74a5f311a 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -6,6 +6,7 @@ use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
              $username_noperiod
              $shellmachine $useradd $usermod $userdel $mydomain
              $cyrus_server $cyrus_admin_user $cyrus_admin_pass
+             $icradius_dbh
              @saltset @pw_set);
 use Carp;
 use FS::Conf;
@@ -65,6 +66,12 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
     $cyrus_admin_user = '';
     $cyrus_admin_pass = '';
   }
+  if ( $conf->exists('icradius_secrets') ) {
+    $icradius_dbh = DBI->connect($conf->config('icradius_secrets'))
+      or die $DBI::errstr;
+  } else {
+    $icradius_dbh = '';
+  }
 };
 
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
@@ -247,6 +254,17 @@ sub insert {
       return "queueing job (transaction rolled back): $error";
     }
   }
+  if ( $icradius_dbh ) {
+    my $queue = new FS::queue { 'job' => 'FS::svc_acct::icradius_rc_insert' };
+    $error = $queue->insert( $self->username,
+                             $self->_password,
+                             $self->radius_check
+                           );
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
+  }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
@@ -275,13 +293,43 @@ sub cyrus_insert {
   warn "cyrus_insert: setacl user.$username, $username => all\n";
   $rc = $client->setacl("user.$username", $username => 'all' );
   $error = $client->error;
-  die $error if $error;
+  die "cyrus_insert: error setacl user.$username: $error" if $error;
 
   if ( $quota ) {
     warn "cyrus_insert: setquota user.$username, STORAGE => $quota\n";
     $rc = $client->setquota("user.$username", 'STORAGE' => $quota );
     $error = $client->error;
-    die $error if $error;
+    die "cyrus_insert: error setquota user.$username: $error" if $error;
+  }
+
+  1;
+}
+
+sub icradius_rc_insert {
+  my( $username, $password, %radcheck ) = @_;
+  
+  my $sth = $icradius_dbh->prepare(
+    "INSERT INTO radcheck ( id, UserName, Attribute, Value ) VALUES ( ".
+    join(", ", map { $icradius_dbh->quote($_) } (
+      '',
+      $username,
+      "Password",
+      $password,
+    ) ). " )"
+  );
+  $sth->execute or die "can't insert into radcheck table: ". $sth->errstr;
+
+  foreach my $attribute ( keys %radcheck ) {
+    my $sth = $icradius_dbh->prepare(
+      "INSERT INTO radcheck ( id, UserName, Attribute, Value ) VALUES ( ".
+      join(", ", map { $icradius_dbh->quote($_) } (
+        '',
+        $username,
+        $attribute,
+        $radcheck{$attribute},
+      ) ). " )"
+    );
+    $sth->execute or die "can't insert into radcheck table: ". $sth->errstr;
   }
 
   1;
@@ -398,6 +446,14 @@ sub delete {
       return "queueing job (transaction rolled back): $error";
     }
   }
+  if ( $icradius_dbh ) {
+    my $queue = new FS::queue { 'job' => 'FS::svc_acct::icradius_rc_delete' };
+    $error = $queue->insert( $self->username );
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
+  }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
@@ -424,6 +480,18 @@ sub cyrus_delete {
   1;
 }
 
+sub icradius_rc_delete {
+  my $username = shift;
+  
+  my $sth = $icradius_dbh->prepare(
+    'DELETE FROM radcheck WHERE UserName = ?'
+  );
+  $sth->execute($username)
+    or die "can't delete from radcheck table: ". $sth->errstr;
+
+  1;
+}
+
 =item replace OLD_RECORD
 
 Replaces OLD_RECORD with this one in the database.  If there is an error,
@@ -771,7 +839,7 @@ sub email {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.37 2001-09-11 12:06:57 ivan Exp $
+$Id: svc_acct.pm,v 1.38 2001-09-11 13:10:22 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 58747692435f28de1c13496525af679659511b05 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 19:16:41 +0000
Subject: forgot closing form tag, breaks ie, others?

---
 httemplate/edit/part_svc.cgi | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index e16f48e3a..7797230e8 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.10 2001-09-11 12:42:54 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.11 2001-09-11 19:16:41 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -44,10 +44,9 @@ function visualize(what) {
 <FORM NAME="dummy">
 
       Service Part #<%= $part_svc->svcpart ? $part_svc->svcpart : "(NEW)" %>
-
-<PRE>
+<BR><BR>
 Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>">
-</PRE>
+<BR><BR>
 Services are items you offer to your customers.
 <UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
     <LI>svc_domain - Domains
@@ -95,7 +94,7 @@ Table<SELECT NAME="svcdb" SIZE=1 onChange="changed(this)">
 <% foreach my $svcdb (@dbs) { %>
 <OPTION VALUE="<%= $svcdb %>" <%= ' SELECTED'x($svcdb eq $hashref->{svcdb}) %>><%= $svcdb %>
 <% } %>
-</SELECT>
+</SELECT></FORM>
 
 <%
 #these might belong somewhere else for other user interfaces 
-- 
cgit v1.2.1


From 24c745d590061b45e9c902384289c5ec1271a858 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 20:44:08 +0000
Subject: getting "you should run the bin/fs-migrate-svc_acct_sm" message
 unexpectedly

---
 httemplate/search/svc_acct.cgi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index dc4c4fdaa..37aed6115 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_acct.cgi,v 1.4 2001-08-21 02:16:36 ivan Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.5 2001-09-11 20:44:08 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi @svc_acct $sortby $query $mydomain );
@@ -11,6 +11,8 @@ use FS::CGI qw(header eidiot popurl table);
 use FS::svc_acct;
 use FS::cust_main;
 
+$mydomain = '';
+
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
-- 
cgit v1.2.1


From c464a78c64f8a55eff61c205dc368482cdeba01d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 20:59:32 +0000
Subject: persistance problem not clearing variables between runs

---
 httemplate/edit/svc_acct_sm.cgi | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index 34846f9f3..4eb3d8333 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: svc_acct_sm.cgi,v 1.3 2001-09-11 20:59:32 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
@@ -72,15 +72,15 @@ if ($pkgnum) {
 
   #find all possible uids (and usernames)
 
-  my($u_part_svc,@u_acct_svcparts);
-  foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
+  my @u_acct_svcparts = ();
+  foreach my $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
     push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
   }
 
   my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
   my($custnum)=$cust_pkg->getfield('custnum');
-  my($i_cust_pkg);
-  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
+  %username = ();
+  foreach my $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
     my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
     my($acct_svcpart);
     foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
@@ -96,11 +96,12 @@ if ($pkgnum) {
 
   #find all possible domains (and domsvc's)
 
-  my($d_part_svc,@d_acct_svcparts);
-  foreach $d_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_domain'}) ) {
+  my @d_acct_svcparts = ();
+  foreach my $d_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_domain'}) ) {
     push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
   }
 
+  %domain = ();
   foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
     my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
     my($acct_svcpart);
-- 
cgit v1.2.1


From cb69afd435095144bea83565973561045e28c6a6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 21:58:43 +0000
Subject: usage sub

---
 FS/bin/freeside-queued | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index d8af19866..6fb294db8 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -87,6 +87,10 @@ while (1) {
   }
 }
 
+sub usage {
+  die "Usage:\n\n  freeside-queued user\n";
+}
+
 sub _die {
   my $msg = shift;
   unlink $pid_file if -e $pid_file;
-- 
cgit v1.2.1


From cf7ca698138c8708c68cb969cc843311e385a7a8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 22:20:28 +0000
Subject: fix radius attribute adding

---
 FS/FS/svc_Common.pm     |  5 +----
 bin/fs-radius-add-check | 17 +++++++++--------
 bin/fs-radius-add-reply | 16 +++++++++-------
 bin/fs-setup            |  4 ++--
 bin/svc_acct.export     |  4 ++--
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index c47cdbf8f..7e216461f 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -195,15 +195,12 @@ sub cancel { ''; }
 
 =head1 VERSION
 
-$Id: svc_Common.pm,v 1.5 2001-09-06 20:41:59 ivan Exp $
+$Id: svc_Common.pm,v 1.6 2001-09-11 22:20:28 ivan Exp $
 
 =head1 BUGS
 
 The setfixed method return value.
 
-The new method should set defaults from part_svc (like the check method
-sets fixed values)?
-
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>, schema.html
diff --git a/bin/fs-radius-add-check b/bin/fs-radius-add-check
index eedd9b699..ca0492f4c 100755
--- a/bin/fs-radius-add-check
+++ b/bin/fs-radius-add-check
@@ -10,7 +10,7 @@ use FS::raddb;
 die "Not running uid freeside!" unless checkeuid();
 
 my %attrib2db =
-  map { $FS::raddb::attrib{lc($_)} => $_ } keys %FS::raddb::attrib;
+  map { lc($FS::raddb::attrib{$_}) => $_ } keys %FS::raddb::attrib;
 
 my $user = shift or die &usage;
 getsecrets($user);
@@ -39,14 +39,16 @@ my($char_d) = 80; #default maxlength for text fields
 ###
 
 foreach my $attribute ( @attributes ) {
-  foreach my $statement ( 
-    "ALTER TABLE svc_acct ADD rc_$attribute varchar($char_d) NULL",
-#    "ALTER TABLE part_svc ADD svc_acct__rc_$attribute varchar($char_d) NULL;",
-#    "ALTER TABLE part_svc ADD svc_acct__rc_${attribute}_flag char(1) NULL;",
-  ) {
-    $dbh->do( $statement ) or warn "Error executing $statement: ". $dbh->errstr;  }
+  my $statement =
+    "ALTER TABLE svc_acct ADD COLUMN rc_$attribute varchar($char_d) NULL";
+  my $sth = $dbh->prepare( $statement )
+   or warn "Error preparing $statement: ". $dbh->errstr;
+  my $rc = $sth->execute
+    or warn "Error executing $statement: ". $sth->errstr;
 }
 
+$dbh->commit or die $dbh->errstr;
+
 $dbh->disconnect or die $dbh->errstr;
 
 print "\n\n", "Now you must run dbdef-create.\n\n";
@@ -55,4 +57,3 @@ sub usage {
   die "Usage:\n  fs-radius-add user\n"; 
 }
 
-
diff --git a/bin/fs-radius-add-reply b/bin/fs-radius-add-reply
index d2f2e11f0..2f38fbcf7 100755
--- a/bin/fs-radius-add-reply
+++ b/bin/fs-radius-add-reply
@@ -10,7 +10,7 @@ use FS::raddb;
 die "Not running uid freeside!" unless checkeuid();
 
 my %attrib2db =
-  map { $FS::raddb::attrib{lc($_)} => $_ } keys %FS::raddb::attrib;
+  map { lc($FS::raddb::attrib{$_}) => $_ } keys %FS::raddb::attrib;
 
 my $user = shift or die &usage;
 getsecrets($user);
@@ -39,14 +39,16 @@ my($char_d) = 80; #default maxlength for text fields
 ###
 
 foreach my $attribute ( @attributes ) {
-  foreach my $statement ( 
-    "ALTER TABLE svc_acct ADD radius_$attribute varchar($char_d) NULL",
-#    "ALTER TABLE part_svc ADD svc_acct__radius_$attribute varchar($char_d) NULL;",
-#    "ALTER TABLE part_svc ADD svc_acct__radius_${attribute}_flag char(1) NULL;",
-  ) {
-    $dbh->do( $statement ) or warn "Error executing $statement: ". $dbh->errstr;  }
+  my $statement =
+    "ALTER TABLE svc_acct ADD COLUMN radius_$attribute varchar($char_d) NULL";
+  my $sth = $dbh->prepare( $statement )
+    or warn "Error preparing $statement: ". $dbh->errstr;
+  $sth->execute
+    or warn "Error executing $statement: ". $sth->errstr;
 }
 
+$dbh->commit or die $dbh->errstr;
+
 $dbh->disconnect or die $dbh->errstr;
 
 print "\n\n", "Now you must run dbdef-create.\n\n";
diff --git a/bin/fs-setup b/bin/fs-setup
index 9534eb23f..e7dda8ed7 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.57 2001-09-11 00:07:30 ivan Exp $
+# $Id: fs-setup,v 1.58 2001-09-11 22:20:28 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -20,7 +20,7 @@ use FS::raddb;
 die "Not running uid freeside!" unless checkeuid();
 
 my %attrib2db =
-  map { $FS::raddb::attrib{lc($_)} => $_ } keys %FS::raddb::attrib;
+  map { lc($FS::raddb::attrib{$_}) => $_ } keys %FS::raddb::attrib;
 
 my $user = shift or die &usage;
 getsecrets($user);
diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index a5ec45d48..3b8853bb0 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.23 2001-08-17 10:57:40 ivan Exp $
+# $Id: svc_acct.export,v 1.24 2001-09-11 22:20:28 ivan Exp $
 #
 # Create and export password, radius and vpopmail password files:
 # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
@@ -56,7 +56,7 @@ my $icradius_mysqlsource =
 my $icradius_dbh;
 if ( $icradiusmachines && $conf->exists('icradius_secrets') ) {
   $icradius_dbh = DBI->connect($conf->config('icradius_secrets'))
-    or die $DBI::errstr;;
+    or die $DBI::errstr;
 } else {
   $icradius_dbh = dbh;
 }
-- 
cgit v1.2.1


From 844855ae401bc5a7167b5fa8898275f89719ed71 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 23:44:01 +0000
Subject: radius attributes & default/fixed values should work again now

---
 FS/FS/part_svc.pm               | 16 ++++++++++-----
 httemplate/edit/svc_acct.cgi    | 45 +++++++++++++++++++++++++++--------------
 httemplate/edit/svc_acct_sm.cgi | 13 ++++++------
 httemplate/edit/svc_domain.cgi  | 14 +++++++------
 httemplate/edit/svc_forward.cgi | 14 +++++++------
 httemplate/view/svc_acct.cgi    | 14 +++++++++----
 6 files changed, 74 insertions(+), 42 deletions(-)

diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index f1e71ada8..6f66ef960 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -40,10 +40,6 @@ FS::Record.  The following fields are currently supported:
 =item svcdb - table used for this service.  See L<FS::svc_acct>,
 L<FS::svc_domain>, and L<FS::svc_forward>, among others.
 
-=item I<svcdb>__I<field> - Default or fixed value for I<field> in I<svcdb>.
-
-=item I<svcdb>__I<field>_flag - defines I<svcdb>__I<field> action: null, `D' for default, or `F' for fixed
-
 =back
 
 =head1 METHODS
@@ -63,6 +59,7 @@ sub table { 'part_svc'; }
 
 Adds this service definition to the database.  If there is an error, returns
 the error, otherwise returns false.
+
 =item I<svcdb>__I<field> - Default or fixed value for I<field> in I<svcdb>.
 
 =item I<svcdb>__I<field>_flag - defines I<svcdb>__I<field> action: null, `D' for default, or `F' for fixed
@@ -285,11 +282,20 @@ sub part_svc_column {
                                };
 }
 
+=item all_part_svc_column
+
+=cut
+
+sub all_part_svc_column {
+  my $self = shift;
+  qsearch('part_svc_column', { 'svcpart' => $self->svcpart } );
+}
+
 =back
 
 =head1 VERSION
 
-$Id: part_svc.pm,v 1.4 2001-09-11 00:08:18 ivan Exp $
+$Id: part_svc.pm,v 1.5 2001-09-11 23:44:01 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 8a2cb802e..f594bd255 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.6 2001-09-04 14:44:06 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.7 2001-09-11 23:44:01 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
@@ -13,6 +13,7 @@ use FS::CGI qw(header popurl);
 use FS::Record qw(qsearch qsearchs fields);
 use FS::svc_acct;
 use FS::Conf;
+use FS::raddb;
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
@@ -68,11 +69,12 @@ if ( $cgi->param('error') ) {
     }
 
     #set fixed and default fields from part_svc
-    my($field);
-    foreach $field ( fields('svc_acct') ) {
-      if ( $part_svc->getfield('svc_acct__'. $field. '_flag') ne '' ) {
-        $svc_acct->setfield($field,$part_svc->getfield('svc_acct__'. $field) );
-      }
+    foreach my $part_svc_column (
+      grep { $_->columnflag } $part_svc->all_part_svc_column
+    ) {
+      $svc_acct->setfield( $part_svc_column->columnname,
+                           $part_svc_column->columnvalue,
+                         );
     }
 
   }
@@ -118,18 +120,19 @@ END
 
 #domain
 $domsvc = $svc_acct->domsvc || 0;
-if ( $part_svc->svc_acct__domsvc_flag eq 'F' ) {
+if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
   print qq!<INPUT TYPE="hidden" NAME="domsvc" VALUE="$domsvc">!;
 } else { 
   my @svc_domain = ();
-  if ( $part_svc->svc_acct__domsvc_flag eq 'D' ) {
-    my $svc_domain =
-      qsearchs('svc_domain', { 'svcnum' => $part_svc->svc_acct__domsvc } );
+  if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'D' ) {
+    my $svc_domain = qsearchs('svc_domain', {
+      'svcnum' => $part_svc->part_svc_column('domsvc')->columnvalue,
+    } );
     if ( $svc_domain ) {
       push @svc_domain, $svc_domain;
     } else {
-      warn "unknown svc_domain.svcnum for part_svc.svc_acct__domsvc: ".
-           $part_svc->svc_acct__domsvc;
+      warn "unknown svc_domain.svcnum for part_svc_column domsvc: ".
+           $part_svc->part_svc_column('domsvc')->columnvalue;
     }
   }
   my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
@@ -157,7 +160,7 @@ if ( $part_svc->svc_acct__domsvc_flag eq 'F' ) {
 
 #pop
 $popnum = $svc_acct->popnum || 0;
-if ( $part_svc->svc_acct__popnum_flag eq "F" ) {
+if ( $part_svc->part_svc_column('popnum')->columnflag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$popnum">!;
 } else { 
   print qq!<BR>POP: <SELECT NAME="popnum" SIZE=1><OPTION>\n!;
@@ -189,7 +192,7 @@ print <<END;
 END
 
 $shell = $svc_acct->shell;
-if ( $part_svc->svc_acct__shell_flag eq "F" ) {
+if ( $part_svc->part_svc_column('shell')->columnflag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="shell" VALUE="$shell">!;
 } else {
   print qq!<BR>Shell: <SELECT NAME="shell" SIZE=1>!;
@@ -208,12 +211,24 @@ if ( $part_svc->svc_acct__shell_flag eq "F" ) {
 
 print qq!<INPUT TYPE="hidden" NAME="quota" VALUE="$quota">!;
 
-if ( $part_svc->svc_acct__slipip_flag eq "F" ) {
+if ( $part_svc->part_svc_column('slipip')->columnflag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="slipip" VALUE="$slipip">!;
 } else {
   print qq!<BR>IP: <INPUT TYPE="text" NAME="slipip" VALUE="$slipip">!;
 }
 
+foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
+  $r =~ /^^r(adius|[cr])_(.+)$/ or next; #?
+  my $a = $2;
+  if ( $part_svc->part_svc_column($r)->columnflag eq 'F' ) {
+    print qq!<INPUT TYPE="hidden" NAME="$r" VALUE="!.
+          $svc_acct->getfield($r). '">';
+  } else {
+    print qq!<BR>$FS::raddb::attrib{$a}: <INPUT TYPE="text" NAME="$r" VALUE="!.
+          $svc_acct->getfield($r). '">';
+  }
+}
+
 #submit
 print qq!<P><INPUT TYPE="submit" VALUE="Submit">!; 
 
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index 4eb3d8333..21bd6a9ee 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.3 2001-09-11 20:59:32 ivan Exp $ -->
+#<!-- $Id: svc_acct_sm.cgi,v 1.4 2001-09-11 23:44:01 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
@@ -57,11 +57,12 @@ if ( $cgi->param('error') ) {
     $svcnum='';
 
     #set fixed and default fields from part_svc
-    my($field);
-    foreach $field ( fields('svc_acct_sm') ) {
-      if ( $part_svc->getfield('svc_acct_sm__'. $field. '_flag') ne '' ) {
-        $svc_acct_sm->setfield($field,$part_svc->getfield('svc_acct_sm__'. $field) );
-      }
+    foreach my $part_svc_column (
+      grep { $_->columnflag } $part_svc->all_part_svc_column
+    ) {
+      $svc_acct_sm->setfield( $part_svc_column->columnname,
+                              $part_svc_column->columnvalue,
+                            );
     }
 
   }
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index 8ffc9d789..7033c11f7 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_domain.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: svc_domain.cgi,v 1.3 2001-09-11 23:44:01 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $action $svcnum $svc_domain $pkgnum $svcpart $part_svc
@@ -57,13 +57,15 @@ if ( $cgi->param('error') ) {
     $svcnum='';
 
     #set fixed and default fields from part_svc
-    my($field);
-    foreach $field ( fields('svc_domain') ) {
-      if ( $part_svc->getfield('svc_domain__'. $field. '_flag') ne '' ) {
-        $svc_domain->setfield($field,$part_svc->getfield('svc_domain__'. $field) );
-      }
+    foreach my $part_svc_column (
+      grep { $_->columnflag } $part_svc->all_part_svc_column
+    ) {
+      $svc_domain->setfield( $part_svc_column->columnname,
+                             $part_svc_column->columnvalue,
+                           );
     }
 
+
   }
 }
 $action = $svcnum ? 'Edit' : 'Add';
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index de4c8cbc9..287833e53 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_forward.cgi,v 1.3 2001-08-21 10:27:11 ivan Exp $ -->
+# <!-- $Id: svc_forward.cgi,v 1.4 2001-09-11 23:44:01 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_forward $pkgnum $svcpart
@@ -57,13 +57,15 @@ if ( $cgi->param('error') ) {
     $svcnum='';
 
     #set fixed and default fields from part_svc
-    my($field);
-    foreach $field ( fields('svc_forward') ) {
-      if ( $part_svc->getfield('svc_forward__'. $field. '_flag') ne '' ) {
-        $svc_forward->setfield($field,$part_svc->getfield('svc_forward__'. $field) );
-      }
+    foreach my $part_svc_column (
+      grep { $_->columnflag } $part_svc->all_part_svc_column
+    ) {
+      $svc_forward->setfield( $part_svc_column->columnname,
+                              $part_svc_column->columnvalue,
+                            );
     }
 
+
   }
 }
 $action = $svc_forward->svcnum ? 'Edit' : 'Add';
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 3a222710f..ad7e6539d 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_acct.cgi,v 1.3 2001-08-21 02:31:57 ivan Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.4 2001-09-11 23:44:01 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $svc_domain $query $svcnum $svc_acct $cust_svc $pkgnum
@@ -15,6 +15,7 @@ use FS::cust_svc;
 use FS::cust_pkg;
 use FS::part_svc;
 use FS::svc_acct_pop;
+use FS::raddb;
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
@@ -101,9 +102,14 @@ if ($svc_acct->slipip) {
   foreach $attribute ( grep /^radius_/, fields('svc_acct') ) {
     #warn $attribute;
     $attribute =~ /^radius_(.*)$/;
-    my($pattribute) = ($1);
-    $pattribute =~ s/_/-/g;
-    print "<BR>Radius $pattribute: <B>". $svc_acct->getfield($attribute), "</B>";
+    my $pattribute = $FS::raddb::attrib{$1};
+    print "<BR>Radius (reply) $pattribute: <B>". $svc_acct->getfield($attribute), "</B>";
+  }
+  foreach $attribute ( grep /^rc_/, fields('svc_acct') ) {
+    #warn $attribute;
+    $attribute =~ /^rc_(.*)$/;
+    my $pattribute = $FS::raddb::attrib{$1};
+    print "<BR>Radius (check) $pattribute: <B>". $svc_acct->getfield($attribute), "</B>";
   }
 } else {
   print "<BR><BR>(No SLIP/PPP account)";
-- 
cgit v1.2.1


From 1f39b2ef4a95b6af3dd9d9a7e49c00527e0cfe03 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 Sep 2001 15:45:01 +0000
Subject: oops

---
 FS/FS/part_svc.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 6f66ef960..2b3f3f309 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -2,7 +2,7 @@ package FS::part_svc;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw( qsearchs fields dbh );
+use FS::Record qw( qsearch qsearchs fields dbh );
 use FS::part_svc_column;
 
 @ISA = qw(FS::Record);
@@ -295,7 +295,7 @@ sub all_part_svc_column {
 
 =head1 VERSION
 
-$Id: part_svc.pm,v 1.5 2001-09-11 23:44:01 ivan Exp $
+$Id: part_svc.pm,v 1.6 2001-09-12 15:45:01 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 04ac51dff5dd29a1c674168f5d3396acbb158dbc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 Sep 2001 15:54:25 +0000
Subject: mason warnings

---
 httemplate/docs/install.html  | 1 +
 httemplate/docs/upgrade8.html | 1 +
 2 files changed, 2 insertions(+)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 4bf7b44ea..c99a0f911 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -87,6 +87,7 @@ PerlSetVar Global /usr/local/etc/freeside/asp-global/
 </pre></font>
     </ul></td>
     <td><ul>
+      <li>NOTE: Mason support is still a bit buggy in the 1.4.0 prereleases.  This will be fixed before 1.4.0.  You have been warned.
       <li>Run <tt>make masondocs</tt>
       <li>Copy <tt>masondocs/</tt> to your web server's document space.
       <li>Copy <tt>htetc/handler.pl</tt> to your web server's configuration directory.
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index d86adc046..a179e96b4 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -33,6 +33,7 @@ PerlSetVar Global /usr/local/etc/freeside/asp-global/
 </pre></font>
     </ul></td>
     <td><ul>
+      <li>NOTE: Mason support is still a bit buggy in the 1.4.0 prereleases.  This will be fixed before 1.4.0.  You have been warned.
       <li>Run <tt>make masondocs</tt>
       <li>Copy <tt>masondocs/</tt> to your web server's document space.
       <li>Copy <tt>htetc/handler.pl</tt> to your web server's configuration directory.
-- 
cgit v1.2.1


From 9801653f4368761e7110c9c80cc37e7f1004302f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Sep 2001 18:05:16 +0000
Subject: s/croak/confess/

---
 FS/FS/Record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index b476df2c0..578904ed3 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -899,7 +899,7 @@ sub fields {
   }
   #croak "Usage: \@fields = fields(\$table)\n   or: \@fields = \$record->fields" unless $table;
   my($table_obj) = $dbdef->table($table);
-  croak "Unknown table $table" unless $table_obj;
+  confess "Unknown table $table" unless $table_obj;
   $table_obj->columns;
 }
 
@@ -993,7 +993,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.27 2001-09-11 00:08:18 ivan Exp $
+$Id: Record.pm,v 1.28 2001-09-14 18:05:16 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 5477d23b51bd3135893c4d79091a9e272a17f4f8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Sep 2001 19:54:22 +0000
Subject: fix for no svc_acct_sm!!!

---
 FS/FS/svc_acct.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 74a5f311a..e52cebf15 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -367,8 +367,10 @@ $username and $dir.
 sub delete {
   my $self = shift;
 
-  return "Can't delete an account which has (svc_acct_sm) mail aliases!"
-    if $self->uid && qsearch( 'svc_acct_sm', { 'domuid' => $self->uid } );
+  if ( defined( $FS::Record::dbdef->table('svc_acct_sm') ) ) {
+    return "Can't delete an account which has (svc_acct_sm) mail aliases!"
+      if $self->uid && qsearch( 'svc_acct_sm', { 'domuid' => $self->uid } );
+  }
 
   return "Can't delete an account which is a (svc_forward) source!"
     if qsearch( 'svc_forward', { 'srcsvc' => $self->svcnum } );
@@ -839,7 +841,7 @@ sub email {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.38 2001-09-11 13:10:22 ivan Exp $
+$Id: svc_acct.pm,v 1.39 2001-09-14 19:54:22 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 87661d51ce44b78c5b156f4ee7c52e75a9d38746 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 16 Sep 2001 12:45:35 +0000
Subject: fix oops in FS::cust_main_invoice::replace preventing package
 cancellation

add toggle switch to cust_main searching to show/hide cancelled customers.
hidecancelledcustomers config file is just which state it starts in.

add signupurl config file to enable showing of the customer's signup URL
on the view page.
---
 FS/FS/Record.pm                 |  5 +++--
 FS/FS/cust_main_invoice.pm      |  4 ++--
 FS/FS/svc_acct.pm               |  5 ++++-
 httemplate/docs/config.html     |  1 +
 httemplate/index.html           |  2 +-
 httemplate/search/cust_main.cgi | 25 +++++++++++++++++++------
 httemplate/view/cust_main.cgi   | 14 +++++++++++---
 7 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 578904ed3..333602c07 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -472,10 +472,11 @@ returns the error, otherwise returns false.
 
 sub replace {
   my ( $new, $old ) = ( shift, shift );
+  warn "[debug][FS::Record] $new ->replace $old\n" if $DEBUG;
 
   my @diff = grep $new->getfield($_) ne $old->getfield($_), $old->fields;
   unless ( @diff ) {
-    carp "warning: records identical";
+    carp "[warning][FS::Record] $new -> replace $old: records identical";
     return '';
   }
 
@@ -993,7 +994,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.28 2001-09-14 18:05:16 ivan Exp $
+$Id: Record.pm,v 1.29 2001-09-16 12:45:35 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm
index 61a8f7534..d6b4cd933 100644
--- a/FS/FS/cust_main_invoice.pm
+++ b/FS/FS/cust_main_invoice.pm
@@ -88,7 +88,7 @@ sub replace {
 
   return "Can't change custnum!" unless $old->custnum == $new->custnum;
 
-  $new->SUPER::replace;
+  $new->SUPER::replace($old);
 }
 
 
@@ -172,7 +172,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.6 2001-08-12 00:06:33 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.7 2001-09-16 12:45:35 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index e52cebf15..c6b65936a 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -397,6 +397,9 @@ sub delete {
   foreach my $cust_main_invoice (
     qsearch( 'cust_main_invoice', { 'dest' => $self->svcnum } )
   ) {
+    #next unless defined; #wtf is up with qsearch?
+    warn $cust_main_invoice;
+    next unless defined $cust_main_invoice;
     my %hash = $cust_main_invoice->hash;
     $hash{'dest'} = $self->email;
     my $new = new FS::cust_main_invoice \%hash;
@@ -841,7 +844,7 @@ sub email {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.39 2001-09-14 19:54:22 ivan Exp $
+$Id: svc_acct.pm,v 1.40 2001-09-16 12:45:35 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
index 84e9538f7..b985ebee9 100644
--- a/httemplate/docs/config.html
+++ b/httemplate/docs/config.html
@@ -89,6 +89,7 @@ All further configuration files and directories are located in
   <li><a name="shellmachines">shellmachines</a> - Your Linux and System V flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/shadow' files.
   <li><a name="shells"><font color="#ff0000">shells</font></a> - Legal shells (think /etc/shells).  You probably want to `cut -d: -f7 /etc/passwd | sort | uniq' initially so that importing doesn't fail with `Illegal shell' errors, then remove any special entries afterwords.  A blank line specifies that an empty shell is permitted.
   <li><a name="showpasswords">showpasswords</a> - The existance of this file will allow unencrypted user passwords to be displayed.
+  <li><a name="signupurl">signupurl</a> - if you are using customer-to-customer referrals, and you enter the URL of your <a href="signup.html">signup server CGI</a>, the customer view screen will display a customized link to the signup server with the appropriate customer as referral.
   <li><a name="smtpmachine"><font color="#ff0000">smtpmachine</font></a> - SMTP relay for Freeside's outgoing mail.
   <li><a name="soadefaultttl">soadefaultttl</a> - SOA default TTL for new domains.
   <li><a name="soaemail">soaemail</a> - SOA email for new domains, in BIND form (`.' instead of `@'), with trailing `.'
diff --git a/httemplate/index.html b/httemplate/index.html
index 2fbc06221..c45997608 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -34,7 +34,7 @@
         </ul>
       <li><A NAME="browse">Browse</A>
         <ul>
-          <LI>customers (<A HREF="search/cust_main.cgi?custnum">by customer number</A>) (<A HREF="search/cust_main.cgi?last">by last name</A>) (<A HREF="search/cust_main.cgi?company">by company</A>)
+          <LI>customers (<A HREF="search/cust_main.cgi?browse=custnum">by customer number</A>) (<A HREF="search/cust_main.cgi?browse=last">by last name</A>) (<A HREF="search/cust_main.cgi?browse=company">by company</A>)
           <LI>invoices
             <UL>
               <LI>open invoices (<A HREF="search/cust_bill.cgi?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN_custnum">by customer number</A>)
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 9dcada7c2..25dbe6964 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.5 2001-09-11 00:08:18 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.6 2001-09-16 12:45:35 ivan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
@@ -19,8 +19,8 @@ cgisuidsetup($cgi);
 
 $conf = new FS::Conf;
 
-if ( $cgi->keywords ) {
-  my($query)=$cgi->keywords;
+if ( $cgi->param('browse') ) {
+  my $query = $cgi->param('browse');
   if ( $query eq 'custnum' ) {
     $sortby=\*custnum_sort;
     @cust_main=qsearch('cust_main',{});  
@@ -31,7 +31,7 @@ if ( $cgi->keywords ) {
     $sortby=\*company_sort;
     @cust_main=qsearch('cust_main',{});
   } else {
-    die "unknown query string $query";
+    die "unknown browse field $query";
   }
 } else {
   @cust_main=();
@@ -42,7 +42,9 @@ if ( $cgi->keywords ) {
 }
 
 @cust_main = grep { $_->ncancelled_pkgs || ! $_->all_pkgs } @cust_main
-  if $conf->exists('hidecancelledcustomers');
+  if $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
+     || ( $conf->exists('hidecancelledcustomers')
+           && ! $cgi->param('showcancelledcustomers') );
 if ( $conf->exists('hidecancelledpackages' ) ) {
   %all_pkgs = map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
 } else {
@@ -59,7 +61,18 @@ if ( scalar(@cust_main) == 1 && ! $cgi->param('referral_custnum') ) {
   my($total)=scalar(@cust_main);
   print $cgi->header( '-expires' => 'now' ), header("Customer Search Results",menubar(
     'Main Menu', popurl(2)
-  )), "$total matching customers found";
+  )), "$total matching customers found ";
+  if ( $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
+       || ( $conf->exists('hidecancelledcustomers')
+            && ! $cgi->param('showcancelledcustomers')
+          )
+     ) {
+    $cgi->param('showcancelledcustomers', 1);
+    print qq!( <a href="!. $cgi->self_url. qq!">show cancelled customers</a> )!;
+  } else {
+    $cgi->param('showcancelledcustomers', 0);
+    print qq!( <a href="!. $cgi->self_url. qq!">hide cancelled customers</a> )!;
+  }
   if ( $cgi->param('referral_custnum') ) {
     $cgi->param('referral_custnum') =~ /^(\d+)$/
       or eidiot "Illegal referral_custnum\n";
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 174c08760..6df28c844 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,10 +1,11 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.10 2001-09-11 09:56:27 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.11 2001-09-16 12:45:35 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
               @packages $package @history @bills $bill @credits $credit
-              $balance $item @agents @referrals @invoicing_list $n1 $conf ); 
+              $balance $item @agents @referrals @invoicing_list $n1 $conf
+              $signupurl ); 
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use Date::Format;
@@ -53,10 +54,17 @@ unless ( $conf->exists('disable_customer_referrals') ) {
 
   print qq! | <A HREF="!, popurl(2),
         qq!search/cust_main.cgi?referral_custnum=$custnum">!,
-        qq!View this customer's referrals<A>!;
+        qq!View this customer's referrals</A>!;
 }
 
 print '<BR><BR>';
+
+my $signupurl = $conf->config('signupurl');
+if ( $signupurl ) {
+print "This customer's signup URL: ".
+      "<a href=\"$signupurl?ref=$custnum\">$signupurl?ref=$custnum</a><BR><BR>";
+}
+
 print '<A NAME="cust_main"></A>';
 
 print &itable(), '<TR>';
-- 
cgit v1.2.1


From a08088c61827caac7d518ffa771494f4eceb11a9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Sep 2001 00:24:27 +0000
Subject: icradius transactional password changes (suspensions, unsuspensions)

---
 FS/FS/svc_acct.pm | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index c6b65936a..fb773c09a 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -572,10 +572,33 @@ sub replace {
     }
   }
 
+  if ( $icradius_dbh ) {
+    my $queue = new FS::queue { 'job' => 'FS::svc_acct::icradius_rc_replace' };
+    $error = $queue->insert( $new->username,
+                             $new->_password,
+                           );
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
+  }
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
 }
 
+sub icradius_rc_replace {
+  my( $username, $new_password ) = @_;
+ 
+   my $sth = $icradius_dbh->prepare(
+     "UPDATE radcheck SET Value = ? WHERE UserName = ? and Attribute = ?"
+   );
+   $sth->execute($new_password, $username, 'Password' )
+     or die "can't update radcheck table: ". $sth->errstr;
+
+  1;
+}
+
 =item suspend
 
 Suspends this account by prefixing *SUSPENDED* to the password.  If there is an
@@ -844,7 +867,7 @@ sub email {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.40 2001-09-16 12:45:35 ivan Exp $
+$Id: svc_acct.pm,v 1.41 2001-09-19 00:24:27 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From aac06e1cc16840ca746bb222a5c29280453df27e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Sep 2001 19:00:06 +0000
Subject: set $ENV{HOME}

---
 FS/bin/freeside-queued | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 6fb294db8..04101bbc2 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -30,6 +30,7 @@ $SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $sigint++; };
 $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
 
 $> = $FS::UID::freeside_uid unless $>;
+$ENV{HOME} = (getpwuid($>))[7]; #for ssh
 adminsuidsetup $user;
 
 $log_file = "/usr/local/etc/freeside/queuelog.". $FS::UID::datasrc;
-- 
cgit v1.2.1


From cc1d28920f8df9cc31bb7d788f828e8597f465b6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Sep 2001 19:19:00 +0000
Subject: FS::svc_acct::ssh

---
 FS/FS/svc_acct.pm | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index fb773c09a..194c8b749 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -238,7 +238,7 @@ sub insert {
     $self->shell,
   );
   if ( $username && $uid && $dir && $shellmachine && ! $nossh_hack ) {
-    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh' };
+    my $queue = new FS::queue { 'job' => 'FS::svc_acct::ssh' };
     $error = $queue->insert("root\@$shellmachine", eval qq("$useradd") );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
@@ -434,7 +434,7 @@ sub delete {
     $self->dir,
   );
   if ( $username && $shellmachine && ! $nossh_hack ) {
-    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh' };
+    my $queue = new FS::queue { 'job' => 'FS::svc_acct::ssh' };
     $error = $queue->insert("root\@$shellmachine", eval qq("$userdel") );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
@@ -564,7 +564,7 @@ sub replace {
     $new->getfield('gid'),
   );
   if ( $old_dir && $new_dir && $old_dir ne $new_dir && ! $nossh_hack ) {
-    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh' };
+    my $queue = new FS::queue { 'job' => 'FS::svc_acct::ssh' };
     $error = $queue->insert("root\@$shellmachine", eval qq("$usermod") );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
@@ -863,11 +863,20 @@ sub email {
   $self->username. '@'. $self->domain;
 }
 
+=item ssh
+
+=cut
+
+sub ssh {
+  my @args = @_;
+  ssh(@args,">>/usr/local/etc/freeside/sshoutput 2>&1");
+}
+
 =back
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.41 2001-09-19 00:24:27 ivan Exp $
+$Id: svc_acct.pm,v 1.42 2001-09-19 19:19:00 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From bde088d345e93b12c88072c4a3fb5f021ffc9157 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Sep 2001 19:28:17 +0000
Subject: ;args

---
 FS/FS/svc_acct.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 194c8b749..4b902ffbd 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -12,7 +12,7 @@ use Carp;
 use FS::Conf;
 use FS::Record qw( qsearch qsearchs fields dbh );
 use FS::svc_Common;
-use Net::SSH qw(ssh);
+use Net::SSH;
 use FS::part_svc;
 use FS::svc_acct_pop;
 use FS::svc_acct_sm;
@@ -869,14 +869,14 @@ sub email {
 
 sub ssh {
   my @args = @_;
-  ssh(@args,">>/usr/local/etc/freeside/sshoutput 2>&1");
+  &Net::SSH::ssh(@args,">>/usr/local/etc/freeside/sshoutput 2>&1");
 }
 
 =back
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.42 2001-09-19 19:19:00 ivan Exp $
+$Id: svc_acct.pm,v 1.43 2001-09-19 19:28:17 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 14f855379a4022a283e21f3d6b52ebd4ac0b1a22 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Sep 2001 19:39:24 +0000
Subject: hopefully report some sort of ssh error

---
 FS/FS/svc_acct.pm | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 4b902ffbd..8e3c72936 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -868,15 +868,33 @@ sub email {
 =cut
 
 sub ssh {
-  my @args = @_;
-  &Net::SSH::ssh(@args,">>/usr/local/etc/freeside/sshoutput 2>&1");
+  my ( $host, @cmd_and_args ) = @_;
+
+  use IO::File;
+  my $reader = IO::File->new();
+  my $writer = IO::File->new();
+  my $error = IO::file->new();
+
+  &Net::SSH::sshopen3( $host, $reader, $writer, $error, @cmd_and_args) or die $!;
+
+  local $/ = undef;
+  my $output_stream = <$writer>;
+  my $error_stream = <$error>;
+  if ( length $error_stream ) {
+    warn "[FS::svc_acct::ssh] STDERR $error_stream";
+  }
+  if ( length $output_stream ) {
+    warn "[FS::svc_acct::ssh] STDOUT $output_stream";
+  }
+
+#  &Net::SSH::ssh(@args,">>/usr/local/etc/freeside/sshoutput 2>&1");
 }
 
 =back
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.43 2001-09-19 19:28:17 ivan Exp $
+$Id: svc_acct.pm,v 1.44 2001-09-19 19:39:24 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 091f86cf5f5da77e72ce5512c7ef61594c964929 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Sep 2001 19:41:28 +0000
Subject: tyop

---
 FS/FS/svc_acct.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 8e3c72936..a9c93afe3 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -873,7 +873,7 @@ sub ssh {
   use IO::File;
   my $reader = IO::File->new();
   my $writer = IO::File->new();
-  my $error = IO::file->new();
+  my $error = IO::File->new();
 
   &Net::SSH::sshopen3( $host, $reader, $writer, $error, @cmd_and_args) or die $!;
 
@@ -894,7 +894,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.44 2001-09-19 19:39:24 ivan Exp $
+$Id: svc_acct.pm,v 1.45 2001-09-19 19:41:28 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 310a027b9b72cf7d98c7f3e05b3bd1164077f2ab Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Sep 2001 21:06:17 +0000
Subject: directory hashing remove jeff's lib patch from freeside-apply-credits
 add freeside-apply-credits to MANIFEST README for pre3-4

---
 FS/FS/svc_acct.pm             | 24 +++++++++++++++++++-----
 FS/MANIFEST                   |  1 +
 FS/bin/freeside-apply-credits |  1 -
 README.1.4.0pre3-4            |  6 ++++++
 httemplate/docs/config.html   |  7 +++++++
 5 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 README.1.4.0pre3-4

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index a9c93afe3..46208aa22 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -6,6 +6,7 @@ use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
              $username_noperiod
              $shellmachine $useradd $usermod $userdel $mydomain
              $cyrus_server $cyrus_admin_user $cyrus_admin_pass
+             $dirhash
              $icradius_dbh
              @saltset @pw_set);
 use Carp;
@@ -72,6 +73,7 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
   } else {
     $icradius_dbh = '';
   }
+  $dirhash = $conf->config('dirhash') || 0;
 };
 
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
@@ -708,10 +710,21 @@ sub check {
 
     $recref->{dir} =~ /^([\/\w\-]*)$/
       or return "Illegal directory";
-    $recref->{dir} = $1 || 
-      $dir_prefix . '/' . $recref->{username}
-      #$dir_prefix . '/' . substr($recref->{username},0,1). '/' . $recref->{username}
+    $recref->{dir} = $1;
+    unless ( $recref->{dir} ) {
+      $recref->{dir} = $dir_prefix . '/';
+      if ( $dirhash > 0 ) {
+        for my $h ( 1 .. $dirhash ) {
+          $recref->{dir} .= substr($recref->{username}, $h-1, 1). '/';
+        }
+      } elsif ( $dirhash < 0 ) {
+        for my $h ( reverse $dirhash .. -1 ) {
+          $recref->{dir} .= substr($recref->{username}, $h, 1). '/';
+        }
+      }
+      $recref->{dir} .= $recref->{username};
     ;
+    }
 
     unless ( $recref->{username} eq 'sync' ) {
       if ( grep $_ eq $recref->{shell}, @shells ) {
@@ -881,7 +894,8 @@ sub ssh {
   my $output_stream = <$writer>;
   my $error_stream = <$error>;
   if ( length $error_stream ) {
-    warn "[FS::svc_acct::ssh] STDERR $error_stream";
+    #warn "[FS::svc_acct::ssh] STDERR $error_stream";
+    die "[FS::svc_acct::ssh] STDERR $error_stream";
   }
   if ( length $output_stream ) {
     warn "[FS::svc_acct::ssh] STDOUT $output_stream";
@@ -894,7 +908,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.45 2001-09-19 19:41:28 ivan Exp $
+$Id: svc_acct.pm,v 1.46 2001-09-19 21:06:17 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 69123dbfb..b99250d1b 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -7,6 +7,7 @@ bin/freeside-bill
 bin/freeside-email
 bin/freeside-print-batch
 bin/freeside-queued
+fin/freeside-apply-credits
 FS.pm
 FS/CGI.pm
 FS/Conf.pm
diff --git a/FS/bin/freeside-apply-credits b/FS/bin/freeside-apply-credits
index eb5c1f489..ea6a7bdd0 100755
--- a/FS/bin/freeside-apply-credits
+++ b/FS/bin/freeside-apply-credits
@@ -1,7 +1,6 @@
 #!/usr/bin/perl -Tw
 
 use strict;
-use lib "/usr/lib/perl5/site_perl/5.005/FSTest2";
 use vars qw( $user $cust_main @customers );
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearch);
diff --git a/README.1.4.0pre3-4 b/README.1.4.0pre3-4
new file mode 100644
index 000000000..d2fcf7f91
--- /dev/null
+++ b/README.1.4.0pre3-4
@@ -0,0 +1,6 @@
+the following is necessary to upgrade from 1.4.0pre3 to pre4 or later.
+
+install the perl modules and httemplate as per install.html or upgrade8.html
+
+Run bin/dbdef-create
+
diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
index b985ebee9..424985b7e 100644
--- a/httemplate/docs/config.html
+++ b/httemplate/docs/config.html
@@ -43,6 +43,13 @@ All further configuration files and directories are located in
   <li>cybercash3.2 - <a href="http://www.cybercash.com/cybercash/services/technology.html">CyberCash v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly' or `mauthcapture').  CCMckLib3_2.pm, CCMckDirectLib3_2.pm and CCMckErrno3_2 are required.
   <li>cyrus</li> - Integration with <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a>, three lines: IMAP server, admin username, and admin password.  Cyrus::IMAP::Admin should be installed locally and the connection to the server secured.
   <li><a name="deletecustomers">deletecustomers</a> - The existance of this file will enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that this customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers' packages if they cancel service.
+  <li><a name="dirhash">dirhash</a> - Optional numeric value to control director hashing.  If positive, hashes directories for the specified number of levels from the front of the username.  If negative, hashes directories for the specified number of levels from the end of the username.  Some examples:
+    <ul>
+      <li>1: user -> <a href="#home">/home</a>/u/user
+      <li>2: user -> <a href="#home">/home</a>/u/s/user
+      <li>-1: user -> <a href="#home">/home</a>/r/user
+      <li>-2: user -> <a href="#home">home</a>/r/e/user
+    </ul>
   <li><a name="disable_customer_referrals">disable_customer_referrals</a> - The existance of this file will disable new customer-to-customer referrals in the web interface.
   <li><a name="domain"><font color="#ff0000">domain</font></a> - Your domain name.
   <li><a name="editreferrals">editreferrals</a> - The existance of this file will allow you to change the referral of existing customers.
-- 
cgit v1.2.1


From a2952a41f31a392ce356a299f7edf03b265ddabf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Sep 2001 21:51:41 +0000
Subject: set real uid too.  whew.  ssh now working.

---
 FS/bin/freeside-queued | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 04101bbc2..42d638f4c 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -30,6 +30,7 @@ $SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $sigint++; };
 $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
 
 $> = $FS::UID::freeside_uid unless $>;
+$< = $>;
 $ENV{HOME} = (getpwuid($>))[7]; #for ssh
 adminsuidsetup $user;
 
-- 
cgit v1.2.1


From 32983e39a11291178cc7ed202b8f5140f24ad8aa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Sep 2001 00:10:51 +0000
Subject: fix fuzzy searching

---
 FS/FS/cust_main.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 0b37a351e..48c138467 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1598,7 +1598,7 @@ sub all_last {
   my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
   open(LASTCACHE,"<$dir/cust_main.last")
     or die "can't open $dir/cust_main.last: $!";
-  my @array = split(/\n/, <LASTCACHE> );
+  my @array = map chomp, <LASTCACHE>;
   close LASTCACHE;
   \@array;
 }
@@ -1611,7 +1611,7 @@ sub all_company {
   my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
   open(COMPANYCACHE,"<$dir/cust_main.company")
     or die "can't open $dir/cust_main.last: $!";
-  my @array = split(/\n/, <COMPANYCACHE> );
+  my @array = map chomp, <COMPANYCACHE>;
   close COMPANYCACHE;
   \@array;
 }
@@ -1663,7 +1663,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.32 2001-09-11 12:10:56 ivan Exp $
+$Id: cust_main.pm,v 1.33 2001-09-20 00:10:51 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From bb5702532b602019ca68c7b15f630cd1109192d4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Sep 2001 00:13:07 +0000
Subject: really fix fuzzy searching

---
 FS/FS/cust_main.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 48c138467..8b9dedb26 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1598,7 +1598,7 @@ sub all_last {
   my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
   open(LASTCACHE,"<$dir/cust_main.last")
     or die "can't open $dir/cust_main.last: $!";
-  my @array = map chomp, <LASTCACHE>;
+  my @array = map { chomp; $_; } <LASTCACHE>;
   close LASTCACHE;
   \@array;
 }
@@ -1611,7 +1611,7 @@ sub all_company {
   my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
   open(COMPANYCACHE,"<$dir/cust_main.company")
     or die "can't open $dir/cust_main.last: $!";
-  my @array = map chomp, <COMPANYCACHE>;
+  my @array = map { chomp; $_; } <COMPANYCACHE>;
   close COMPANYCACHE;
   \@array;
 }
@@ -1663,7 +1663,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.33 2001-09-20 00:10:51 ivan Exp $
+$Id: cust_main.pm,v 1.34 2001-09-20 00:13:07 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 6e66ba42e0a4ddd87e1491ad23a8fb4de0241ffd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Sep 2001 03:47:26 +0000
Subject: show company and name (instead of just company) for referring
 customers that have a company

---
 httemplate/view/cust_main.cgi | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 6df28c844..650c6cfeb 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.11 2001-09-16 12:45:35 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.12 2001-09-21 03:47:26 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
@@ -189,7 +189,11 @@ print '<TD VALIGN="top">';
           $cust_main->referral_custnum. '">'.
           $cust_main->referral_custnum. ': '.
           ( $referring_cust_main->company
-            || $referring_cust_main->last. ', '. $referring_cust_main->first ).
+              ? $referring_cust_main->company. ' ('.
+                  $referring_cust_main->last. ', '. $referring_cust_main->first.
+                  ')'
+              : $referring_cust_main->last. ', '. $referring_cust_main->first
+          ).
           '</A>';
   }
   print '</TD></TR>';
-- 
cgit v1.2.1


From a08b4d18bc28e44fe236f1060632ffefc773f78b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 24 Sep 2001 03:23:34 +0000
Subject: queue daemon forks now

---
 FS/FS/UID.pm           | 13 ++++++++-----
 FS/bin/freeside-queued | 50 ++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index f80156e97..f81d8dcdd 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -15,8 +15,8 @@ use DBI;
 use FS::Conf;
 
 @ISA = qw(Exporter);
-@EXPORT_OK = qw(checkeuid checkruid cgisuidsetup
-                adminsuidsetup getotaker dbh datasrc getsecrets driver_name );
+@EXPORT_OK = qw(checkeuid checkruid cgisuidsetup adminsuidsetup forksuidsetup
+                getotaker dbh datasrc getsecrets driver_name );
 
 $freeside_uid = scalar(getpwnam('freeside'));
 
@@ -65,7 +65,11 @@ Returns the DBI database handle (usually you don't need this).
 =cut
 
 sub adminsuidsetup {
+  $dbh->disconnect if $dbh;
+  &forksuidsetup(@_);
+}
 
+sub forksuidsetup {
   $user = shift;
   croak "fatal: adminsuidsetup called without arguements" unless $user;
 
@@ -78,7 +82,6 @@ sub adminsuidsetup {
 
   croak "Not running uid freeside!" unless checkeuid();
   getsecrets;
-  $dbh->disconnect if $dbh;
   $dbh = DBI->connect($datasrc,$db_user,$db_pass, {
                           'AutoCommit' => 0,
                           'ChopBlanks' => 1,
@@ -118,7 +121,7 @@ Returns the CGI (see L<CGI>) object.
 =cut
 
 sub cgi {
-  #carp "warning: \$FS::UID::cgi isa Apache" if $cgi->isa('Apache');
+  carp "warning: \$FS::UID::cgi isa Apache" if $cgi->isa('Apache');
   $cgi;
 }
 
@@ -249,7 +252,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.9 2001-09-06 20:41:59 ivan Exp $
+$Id: UID.pm,v 1.10 2001-09-24 03:23:34 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 42d638f4c..1eef00c5c 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -7,7 +7,7 @@ use Fcntl qw(:flock);
 use POSIX qw(setsid);
 use Date::Format;
 use IO::File;
-use FS::UID qw(adminsuidsetup);
+use FS::UID qw(adminsuidsetup forksuidsetup);
 use FS::Record qw(qsearchs);
 use FS::queue;
 
@@ -29,6 +29,9 @@ my $user = shift or die &usage;
 $SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $sigint++; };
 $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
 
+#pickup zombie status
+$SIG{CHLD} = sub { wait; };
+
 $> = $FS::UID::freeside_uid unless $>;
 $< = $>;
 $ENV{HOME} = (getpwuid($>))[7]; #for ssh
@@ -61,21 +64,40 @@ while (1) {
 
   my @args = $ljob->args;
 
-  #fork a child for each job (up to some maximum perhaps?)
-  #single-threaded for now.
-
-  my $eval = "&". $ljob->job. '(@args);';
-  warn "running $eval";
-  eval $eval;
-  if ( $@ ) {
-    warn "job $eval failed";
-    my %hash = $ljob->hash;
+  # number of children limit?
+  defined( my $pid = fork ) or do {
+    warn "WARNING: can't fork: $!\n";
+    my %hash = $job->hash;
     $hash{'status'} = 'failed';
-    my $fjob = new FS::queue( \%hash );
-    my $error = $fjob->replace($ljob);
+    my $ljob = new FS::queue ( \%hash );
+    my $error = $ljob->replace($job);
     die $error if $error;
-  } else {
-    $ljob->delete;
+  };
+
+  unless ( $pid ) { #kid time
+
+    #get new db handles
+    $FS::UID::dbh->{InactiveDestroy} = 1;
+    $FS::svc_acct::icradius_dbh->{InactiveDestroy}
+      if $FS::svc_acct::icradius_dbh;
+    forksuidsetup($user);
+
+    my $eval = "&". $ljob->job. '(@args);';
+    warn "running $eval";
+    eval $eval;
+    if ( $@ ) {
+      warn "job $eval failed";
+      my %hash = $ljob->hash;
+      $hash{'status'} = 'failed';
+      my $fjob = new FS::queue( \%hash );
+      my $error = $fjob->replace($ljob);
+      die $error if $error;
+    } else {
+      $ljob->delete;
+    }
+
+    exit;
+    #end-of-kid
   }
 
 } continue {
-- 
cgit v1.2.1


From 4ea8493d8422bd9b0d471da81e3c0cd164b9f12e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 25 Sep 2001 00:05:09 +0000
Subject: better REAPER

---
 FS/bin/freeside-queued | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 1eef00c5c..35728db53 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -18,20 +18,18 @@ use Net::SSH;
 
 my $pid_file = '/var/run/freeside-queued.pid';
 
-$SIG{CHLD} = sub { wait }; #zombie prevention
-
 my $user = shift or die &usage;
 
 &daemonize;
 
+sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; }
+$SIG{CHLD} =  \&REAPER;
+
  $sigterm = 0;
  $sigint = 0;
 $SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $sigint++; };
 $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
 
-#pickup zombie status
-$SIG{CHLD} = sub { wait; };
-
 $> = $FS::UID::freeside_uid unless $>;
 $< = $>;
 $ENV{HOME} = (getpwuid($>))[7]; #for ssh
-- 
cgit v1.2.1


From aadba4ddbf1a821d5523fdce4500b59b529aeee3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 25 Sep 2001 15:55:48 +0000
Subject: Business::OnlinePayment::BankOfAmerica

---
 FS/FS/cust_main.pm          | 41 ++++++++++++++++++++++++++++++++++++++---
 httemplate/docs/config.html |  2 +-
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 8b9dedb26..d66d08cb9 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1150,6 +1150,8 @@ sub collect {
             $paylast = $self->getfield('first');
             $payname =  "$payfirst $paylast";
           }
+
+          my( $action1, $action2 ) = split(/\s*\,\s*/, $bop_action );
         
           my $transaction =
             new Business::OnlinePayment( $bop_processor, @bop_options );
@@ -1157,7 +1159,8 @@ sub collect {
             'type'           => 'CC',
             'login'          => $bop_login,
             'password'       => $bop_password,
-            'action'         => $bop_action,
+            'action'         => $action1,
+            'description'    => 'Internet Services',
             'amount'         => $amount,
             'invoice_number' => $cust_bill->invnum,
             'customer_id'    => $self->custnum,
@@ -1171,10 +1174,42 @@ sub collect {
             'country'        => $self->country,
             'card_number'    => $self->payinfo,
             'expiration'     => $exp,
+            'referer'        => 'http://cleanwhisker.420.am/',
           );
           $transaction->submit();
 
-          if ( $transaction->is_success()) {
+          if ( $transaction->is_success() && $action2 ) {
+            my $auth = $transaction->authorization;
+            my $ordernum = $transaction->order_number;
+            #warn "********* $auth ***********\n";
+            #warn "********* $ordernum ***********\n";
+            my $capture =
+              new Business::OnlinePayment( $bop_processor, @bop_options );
+
+            $capture->content(
+              action         => $action2,
+              login          => $bop_login,
+              password       => $bop_password,
+              order_number   => $ordernum,
+              amount         => $amount,
+              authorization  => $auth,
+              description    => 'Internet Services',
+            );
+
+            $capture->submit();
+
+            unless ( $capture->is_success ) {
+              my $e = "Authorization sucessful but capture failed, invnum #".
+                      $cust_bill->invnum. ': '.  $capture->result_code.
+                      ": ". $capture->error_message;
+              warn $e;
+              return $e;
+            }
+
+          }
+
+          if ( $transaction->is_success() ) {
+
             my $cust_pay = new FS::cust_pay ( {
                'invnum'   => $cust_bill->invnum,
                'paid'     => $amount,
@@ -1663,7 +1698,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.34 2001-09-20 00:13:07 ivan Exp $
+$Id: cust_main.pm,v 1.35 2001-09-25 15:55:48 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
index 424985b7e..0e085b0fe 100644
--- a/httemplate/docs/config.html
+++ b/httemplate/docs/config.html
@@ -37,7 +37,7 @@ All further configuration files and directories are located in
   <li><a name="apachemachines">apachemachines</a> - Your Apache machines, one per line.  This enables export of `/etc/apache/vhosts.conf', which can be included in your Apache configuration via the <a href="http://www.apache.org/docs/mod/core.html#include">Include</a> directive.
   <li><a name="bindprimary">bindprimary</a> - Your BIND primary nameserver.  This enables export of /var/named/named.conf and zone files into /var/named
   <li><a name="bindsecondaries">bindsecondaries</a> - Your BIND secondary nameservers, one per line.  This enables export of /var/named/named.conf
-  <li><a name="business-onlinepayment">business-onlinepayment</a> - <a href="http://search.cpan.org/search?dist=Business-OnlinePayment">Business::OnlinePayment</a> support, at least three lines: processor, login, and password.  An optional fourth line specifies the action.  Optional additional lines are passed to Business::OnlinePayment as %processor_options.
+  <li><a name="business-onlinepayment">business-onlinepayment</a> - <a href="http://search.cpan.org/search?dist=Business-OnlinePayment">Business::OnlinePayment</a> support, at least three lines: processor, login, and password.  An optional fourth line specifies the action or actions (multiple actions are separated with `,': for example: `Authorization Only, Post Authorization').    Optional additional lines are passed to Business::OnlinePayment as %processor_options.
   <li><a name="bsdshellmachines">bsdshellmachines</a> - Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/master.passwd'.
   <li><a name="countrydefault">countrydefault</a> - Default two-letter country code (if not supplied, the default is `US')
   <li>cybercash3.2 - <a href="http://www.cybercash.com/cybercash/services/technology.html">CyberCash v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly' or `mauthcapture').  CCMckLib3_2.pm, CCMckDirectLib3_2.pm and CCMckErrno3_2 are required.
-- 
cgit v1.2.1


From 7edc02d950670623975f77c3037d4b9bb1af428a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 25 Sep 2001 18:01:19 +0000
Subject: add emailinvoiceonly config file and begin to use it

---
 FS/FS/cust_main.pm          | 28 +++++++++++++++++++++++++++-
 httemplate/docs/config.html |  1 +
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index d66d08cb9..2d94bbe59 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1151,6 +1151,13 @@ sub collect {
             $payname =  "$payfirst $paylast";
           }
 
+          my @invoicing_list = grep { $_ ne 'POST' } $self->invoicing_list;
+          if ( $conf->config('emailinvoiceonly') ) {
+            @invoicing_list = $self->default_invoicing_list
+              unless @invoicing_list;
+          }
+          my $email = $invoicing_list[0];
+
           my( $action1, $action2 ) = split(/\s*\,\s*/, $bop_action );
         
           my $transaction =
@@ -1175,6 +1182,7 @@ sub collect {
             'card_number'    => $self->payinfo,
             'expiration'     => $exp,
             'referer'        => 'http://cleanwhisker.420.am/',
+            'email'          => $email,
           );
           $transaction->submit();
 
@@ -1529,6 +1537,24 @@ sub check_invoicing_list {
   '';
 }
 
+=item default_invoicing_list
+
+=cut
+
+sub default_invoicing_list {
+  my $self = shift;
+  my @list = ();
+  foreach my $cust_pkg ( $self->all_pkgs ) {
+    my @cust_svc = qsearch('cust_svc', { 'pkgnum' => $cust_pkg->pkgnum } );
+    my @svc_acct =
+      map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
+        grep { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
+          @cust_svc;
+    push @list, map { $_->email } @svc_acct;
+  }
+  $self->invoicing_list(\@list);
+}
+
 =item referral_cust_main [ DEPTH [ EXCLUDE_HASHREF ] ]
 
 Returns an array of customers referred by this customer (referral_custnum set
@@ -1698,7 +1724,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.35 2001-09-25 15:55:48 ivan Exp $
+$Id: cust_main.pm,v 1.36 2001-09-25 18:01:19 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
index 0e085b0fe..2254b32ca 100644
--- a/httemplate/docs/config.html
+++ b/httemplate/docs/config.html
@@ -53,6 +53,7 @@ All further configuration files and directories are located in
   <li><a name="disable_customer_referrals">disable_customer_referrals</a> - The existance of this file will disable new customer-to-customer referrals in the web interface.
   <li><a name="domain"><font color="#ff0000">domain</font></a> - Your domain name.
   <li><a name="editreferrals">editreferrals</a> - The existance of this file will allow you to change the referral of existing customers.
+  <li><a name="emailinvoiceonly">emailinvoiceonly</a>
   <li><a name="erpcdmachines">erpcdmachines</a> - Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd' and `/usr/annex/acp_dialup'.
   <li><a name="hidecancelledpackages">hidecancelledpackages</a> - The existance of this file will prevent cancelled packages from showing up in listings (though they will still be in the database)
   <li><a name="hidecancelledcustomers">hidecancelledcustomers</a> - The existance of this file will prevent customers with only cancelled packages from showing up in listings (though they will still be in the database)
-- 
cgit v1.2.1


From fec5c7b3ffb749ad8658ea6f2366aa5c2be3d3fc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 25 Sep 2001 18:03:04 +0000
Subject: ror

---
 FS/FS/cust_main.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 2d94bbe59..d791c1345 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1152,7 +1152,7 @@ sub collect {
           }
 
           my @invoicing_list = grep { $_ ne 'POST' } $self->invoicing_list;
-          if ( $conf->config('emailinvoiceonly') ) {
+          if ( $conf->exists('emailinvoiceonly') ) {
             @invoicing_list = $self->default_invoicing_list
               unless @invoicing_list;
           }
@@ -1724,7 +1724,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.36 2001-09-25 18:01:19 ivan Exp $
+$Id: cust_main.pm,v 1.37 2001-09-25 18:03:04 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 8ca6f203e5dae208d7af581d68671fe47c5e1a1a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Sep 2001 09:17:06 +0000
Subject: add part_pop_local table

---
 FS/FS.pm                      |   4 +-
 FS/FS/cust_credit_bill.pm     |   4 +-
 FS/FS/cust_main.pm            |   4 +-
 FS/FS/part_pop_local.pm       | 116 ++++++++++++++++++++++++++++++++++++++++++
 FS/FS/svc_acct_pop.pm         |   5 +-
 FS/MANIFEST                   |   2 +
 FS/t/part_pop_local.t         |   5 ++
 README.1.4.0pre3-4            |  10 ++++
 bin/fs-setup                  |  18 ++++++-
 httemplate/docs/schema.html   |   9 ++++
 httemplate/docs/upgrade8.html |  10 ++++
 11 files changed, 178 insertions(+), 9 deletions(-)
 create mode 100644 FS/FS/part_pop_local.pm
 create mode 100644 FS/t/part_pop_local.t

diff --git a/FS/FS.pm b/FS/FS.pm
index d2f47d75a..d2c07e47c 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -34,6 +34,8 @@ L<FS::Record> - Database record base class
 L<FS::svc_acct_pop> - POP (Point of Presence, not Post
 Office Protocol) class
 
+L<FS::part_pop_local> - Local calling area class
+
 L<FS::part_referral> - Referral class
 
 L<FS::cust_main_county> - Locale (tax rate) class
@@ -139,7 +141,7 @@ The main documentation is in htdocs/docs.
 
 =head1 VERSION
 
-$Id: FS.pm,v 1.8 2001-09-11 00:08:18 ivan Exp $
+$Id: FS.pm,v 1.9 2001-09-26 09:17:06 ivan Exp $
 
 =head1 SUPPORT
 
diff --git a/FS/FS/cust_credit_bill.pm b/FS/FS/cust_credit_bill.pm
index 961340813..8f992b580 100644
--- a/FS/FS/cust_credit_bill.pm
+++ b/FS/FS/cust_credit_bill.pm
@@ -145,7 +145,7 @@ sub cust_credit {
 
 =head1 VERSION
 
-$Id: cust_credit_bill.pm,v 1.5 2001-09-11 00:08:18 ivan Exp $
+$Id: cust_credit_bill.pm,v 1.6 2001-09-26 09:17:06 ivan Exp $
 
 =head1 BUGS
 
@@ -153,7 +153,7 @@ The delete method.
 
 =head1 SEE ALSO
 
-L<FS::Record>, L<FS::cust_refund>, L<FS::cust_bill>, L<cust_credit>,
+L<FS::Record>, L<FS::cust_refund>, L<FS::cust_bill>, L<FS::cust_credit>,
 schema.html from the base documentation.
 
 =cut
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index d791c1345..0a7f1f7cb 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -940,7 +940,7 @@ invoice_time - Use this time when deciding when to print invoices and
 late notices on those invoices.  The default is now.  It is specified as a UNIX timestamp; see L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse>
 for conversion functions.
 
-batch_card - Set this true to batch cards (see L<cust_pay_batch>).  By
+batch_card - Set this true to batch cards (see L<FS::cust_pay_batch>).  By
 default, cards are processed immediately, which will generate an error if
 CyberCash is not installed.
 
@@ -1724,7 +1724,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.37 2001-09-25 18:03:04 ivan Exp $
+$Id: cust_main.pm,v 1.38 2001-09-26 09:17:06 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_pop_local.pm b/FS/FS/part_pop_local.pm
new file mode 100644
index 000000000..0b7cdf6c9
--- /dev/null
+++ b/FS/FS/part_pop_local.pm
@@ -0,0 +1,116 @@
+package FS::part_pop_local;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record; # qw( qsearchs );
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::part_pop_local - Object methods for part_pop_local records
+
+=head1 SYNOPSIS
+
+  use FS::part_pop_local;
+
+  $record = new FS::part_pop_local \%hash;
+  $record = new FS::part_pop_local { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::part_pop_local object represents a local call area.  Each
+FS::part_pop_local record maps a NPA/NXX (area code and exchange) to the POP
+(see L<FS::svc_acct_pop>) which is a local call.  FS::part_pop_local inherits
+from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item localnum - primary key (assigned automatically for new accounts)
+
+=item popnum - see L<FS::svc_acct_pop>
+
+=item city
+
+=item state
+
+=item npa - area code
+
+=item nxx - exchange
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new point of presence (if only it were that easy!).  To add the 
+point of presence to the database, see L<"insert">.
+
+=cut
+
+sub table { 'part_pop_local'; }
+
+=item insert
+
+Adds this point of presence to the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=item delete
+
+Removes this point of presence from the database.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid point of presence.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+    $self->ut_numbern('localnum')
+      or $self->ut_numbern('popnum')
+      or $self->ut_text('city')
+      or $self->ut_text('state')
+      or $self->ut_number('npa')
+      or $self->ut_number('nxx')
+  ;
+
+}
+
+=back
+
+=head1 VERSION
+
+$Id: part_pop_local.pm,v 1.1 2001-09-26 09:17:06 ivan Exp $
+
+=head1 BUGS
+
+US/CA-centric.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::svc_acct_pop>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/svc_acct_pop.pm b/FS/FS/svc_acct_pop.pm
index 5e755ef73..8ce551cef 100644
--- a/FS/FS/svc_acct_pop.pm
+++ b/FS/FS/svc_acct_pop.pm
@@ -98,7 +98,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_acct_pop.pm,v 1.2 2000-01-28 22:55:06 ivan Exp $
+$Id: svc_acct_pop.pm,v 1.3 2001-09-26 09:17:06 ivan Exp $
 
 =head1 BUGS
 
@@ -106,7 +106,8 @@ It should be renamed to part_pop.
 
 =head1 SEE ALSO
 
-L<FS::Record>, L<svc_acct>, schema.html from the base documentation.
+L<FS::Record>, L<FS::svc_acct>, L<FS::part_pop_local>, schema.html from the
+base documentation.
 
 =cut
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index b99250d1b..5af893a4d 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -34,6 +34,7 @@ FS/cust_refund.pm
 FS/cust_credit_refund.pm
 FS/cust_svc.pm
 FS/part_pkg.pm
+FS/part_pop_local.pm
 FS/part_referral.pm
 FS/part_svc.pm
 FS/part_svc_column.pm
@@ -77,6 +78,7 @@ t/cust_svc.t
 t/domain_record.t
 t/nas.t
 t/part_pkg.t
+t/part_pop_local.t
 t/part_referral.t
 t/part_svc.t
 t/part_svc_column.t
diff --git a/FS/t/part_pop_local.t b/FS/t/part_pop_local.t
new file mode 100644
index 000000000..4e4ad17f5
--- /dev/null
+++ b/FS/t/part_pop_local.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_pop_local;
+$loaded=1;
+print "ok 1\n";
diff --git a/README.1.4.0pre3-4 b/README.1.4.0pre3-4
index d2fcf7f91..0ac859137 100644
--- a/README.1.4.0pre3-4
+++ b/README.1.4.0pre3-4
@@ -2,5 +2,15 @@ the following is necessary to upgrade from 1.4.0pre3 to pre4 or later.
 
 install the perl modules and httemplate as per install.html or upgrade8.html
 
+CREATE TABLE part_pop_local (
+  localnum int primary key,
+  popnum int not null,
+  city varchar(80) null,
+  state char(2) null,
+  npa char(3) not null,
+  nxx char(3) not null
+);
+CREATE UNIQUE INDEX part_pop_local1 ON part_pop_local ( npa, nxx );
+
 Run bin/dbdef-create
 
diff --git a/bin/fs-setup b/bin/fs-setup
index e7dda8ed7..52a2505e5 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.58 2001-09-11 22:20:28 ivan Exp $
+# $Id: fs-setup,v 1.59 2001-09-26 09:17:06 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -611,7 +611,21 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'popnum',
       'unique' => [ [] ],
-      'index' => [ [] ],
+      'index' => [ [ 'state' ] ],
+    },
+
+    'part_pop_local' => {
+      'columns' => [
+        'localnum',  'int',     '',     '',
+        'popnum',    'int',     '',     '',
+        'city',      'varchar', 'NULL', $char_d,
+        'state',     'char',    'NULL', 2,
+        'npa',       'char',    '',     3,
+        'nxx',       'char',    '',     3,
+      ],
+      'primary_key' => 'popnum',
+      'unique' => [ [] ],
+      'index' => [ [ 'npa', 'nxx' ] ],
     },
 
     'svc_acct' => {
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index e3fe98096..c3cb51425 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -273,6 +273,15 @@
         <li>exch - exchange
         <li>loc - rest of number
       </ul>
+    <li><a name="part_pop_local" href="man/FS/part_pop_local.html">part_pop_local</a> - Local calling areas
+      <ul>
+        <li>localnum - primary key
+        <li>popnum - primary key
+        <li>city
+        <li>state
+        <li>npa - area code
+        <li>nxx - exchange
+      </ul>
     <li><a name="svc_acct_sm" href="man/FS/svc_acct_sm.html">svc_acct_sm</a> - <b>DEPRECIATED</b> Domain mail aliases
       <ul>
         <li>svcnum - <a href="#cust_svc">primary key</a>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index a179e96b4..747b8e29c 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -118,6 +118,16 @@ CREATE TABLE queue_arg (
 );
 CREATE INDEX queue_arg1 ON queue_arg ( jobnum );
 
+CREATE TABLE part_pop_local (
+  localnum int primary key,
+  popnum int not null,
+  city varchar(80) null,
+  state char(2) null,
+  npa char(3) not null,
+  nxx char(3) not null
+);
+CREATE UNIQUE INDEX part_pop_local1 ON part_pop_local ( npa, nxx );
+
 ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
 ALTER TABLE svc_domain ADD catchall integer NULL;
 ALTER TABLE cust_main ADD referral_custnum integer NULL;
-- 
cgit v1.2.1


From 324fdd88e14acf256111365eda52e8740d1060f7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Sep 2001 11:34:22 +0000
Subject: index oops

---
 README.1.4.0pre3-4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.1.4.0pre3-4 b/README.1.4.0pre3-4
index 0ac859137..6d3b0cd85 100644
--- a/README.1.4.0pre3-4
+++ b/README.1.4.0pre3-4
@@ -10,7 +10,7 @@ CREATE TABLE part_pop_local (
   npa char(3) not null,
   nxx char(3) not null
 );
-CREATE UNIQUE INDEX part_pop_local1 ON part_pop_local ( npa, nxx );
+CREATE INDEX part_pop_local1 ON part_pop_local ( npa, nxx );
 
 Run bin/dbdef-create
 
-- 
cgit v1.2.1


From cbf08fd900f3e1ddc82b2f4c4a5f753e951ff0a3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 Sep 2001 18:33:18 +0000
Subject: fix for pre-1.4.0 accounts with no domsvc

---
 httemplate/view/svc_acct.cgi | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index ad7e6539d..aacf8b139 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,9 +1,10 @@
 <%
-# <!-- $Id: svc_acct.cgi,v 1.4 2001-09-11 23:44:01 ivan Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.5 2001-09-27 18:33:18 ivan Exp $ -->
 
 use strict;
-use vars qw( $conf $cgi $svc_domain $query $svcnum $svc_acct $cust_svc $pkgnum
-             $cust_pkg $custnum $part_svc $p $svc_acct_pop $password );
+use vars qw( $conf $cgi $domain $query $svcnum $svc_acct $cust_svc $pkgnum
+             $cust_pkg $custnum $part_svc $p $svc_acct_pop $password
+             $mydomain );
 use CGI;
 use CGI::Carp qw( fatalsToBrowser );
 use FS::UID qw( cgisuidsetup );
@@ -41,8 +42,17 @@ if ($pkgnum) {
 $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unknown svcpart" unless $part_svc;
 
-$svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
-die "Unknown domain" unless $svc_domain;
+if ( $svc_acct->domsvc ) {
+  $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
+  die "Unknown domain" unless $svc_domain;
+  $domain = $svc_domain->domain;
+} else {
+  unless ( $mydomain = $conf->config('domain') ) {
+    die "No legacy domain config file and no svc_domain.svcnum record ".
+        "for svc_acct.domsvc: ". $cust_svc->domsvc;
+  }
+  $domain = $mydomain;
+}
 
 $p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header('Account View', menubar(
@@ -64,7 +74,7 @@ print qq!<A HREF="${p}edit/svc_acct.cgi?$svcnum">Edit this information</A>!,
       "<BR><BR>Username: <B>", $svc_acct->username, "</B>"
 ;
 
-print "<BR>Domain: <B>", $svc_domain->domain, "</B>";
+print "<BR>Domain: <B>", $domain, "</B>";
 
 print "<BR>Password: ";
 $password = $svc_acct->_password;
-- 
cgit v1.2.1


From 3eb749fd79fec377d4975f69b077b14e5aaf94dd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 Sep 2001 20:41:37 +0000
Subject: pop selector!

---
 FS/FS/svc_acct_pop.pm         | 92 +++++++++++++++++++++++++++++++++++++++++--
 httemplate/edit/cust_main.cgi | 27 +++++--------
 httemplate/edit/svc_acct.cgi  | 59 ++++++++++++++-------------
 httemplate/view/svc_acct.cgi  | 68 +++++++++++++++++++++-----------
 4 files changed, 171 insertions(+), 75 deletions(-)

diff --git a/FS/FS/svc_acct_pop.pm b/FS/FS/svc_acct_pop.pm
index 8ce551cef..3b8e9785a 100644
--- a/FS/FS/svc_acct_pop.pm
+++ b/FS/FS/svc_acct_pop.pm
@@ -1,10 +1,11 @@
 package FS::svc_acct_pop;
 
 use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs );
+use vars qw( @ISA @EXPORT_OK @svc_acct_pop %svc_acct_pop );
+use FS::Record qw( qsearch qsearchs );
 
-@ISA = qw( FS::Record );
+@ISA = qw( FS::Record Exporter );
+@EXPORT_OK = qw( popselector );
 
 =head1 NAME
 
@@ -25,6 +26,8 @@ FS::svc_acct_pop - Object methods for svc_acct_pop records
 
   $error = $record->check;
 
+  $html = FS::svc_acct_pop::popselector( $popnum, $state );
+
 =head1 DESCRIPTION
 
 An FS::svc_acct object represents an point of presence.  FS::svc_acct_pop
@@ -94,16 +97,97 @@ sub check {
 
 }
 
+=item text
+
+Returns:
+
+"$city, $state ($ac)/$exch"
+
+=cut
+
+sub text {
+  my $self = shift;
+  $self->city. ', '. $self->state. ' ('. $self->ac. ')/'. $self->exch;
+}
+
+=back
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item popselector [ POPNUM [ STATE ] ]
+
+=cut
+
+sub popselector {
+  my( $popnum, $state ) = @_;
+
+  unless ( @svc_acct_pop ) { #cache pop list
+    @svc_acct_pop = qsearch('svc_acct_pop', {} );
+    %svc_acct_pop = ();
+    push @{$svc_acct_pop{$_->state}}, $_ foreach @svc_acct_pop;
+  }
+
+  my $size = 0;
+  my $text = <<END;
+    <SCRIPT>
+    function opt(what,href,text) {
+      var optionName = new Option(text, href, false, false)
+      var length = what.length;
+      what.options[length] = optionName;
+    }
+    
+    function popstate_changed(what) {
+      state = what.options[what.selectedIndex].text;
+      for (var i = what.form.popnum.length;i > 0;i--)
+                what.form.popnum.options[i] = null;
+      what.form.popnum.options[0] = new Option("", "", false, true);
+END
+
+  foreach my $popstate ( sort { $a cmp $b } keys %svc_acct_pop ) {
+    $text .= "\nif ( state == \"$popstate\" ) {\n";
+
+    foreach my $pop ( @{$svc_acct_pop{$popstate}}) {
+      my $o_popnum = $pop->popnum;
+      my $poptext = $pop->text;
+      $size = length($poptext) if length($poptext) > $size;
+      $text .= "opt(what.form.popnum, \"$o_popnum\", \"$poptext\");\n"
+    }
+    $text .= "}\n";
+  }
+
+  $text .= "}\n</SCRIPT>\n";
+
+  $text .=
+    qq!<SELECT NAME="popstate" SIZE=1 onChange="popstate_changed(this)">!.
+    qq!<OPTION> !;
+  $text .= "<OPTION>$_" foreach sort { $a cmp $b } keys %svc_acct_pop;
+  $text .= '</SELECT>'; #callback? return 3 html pieces?  #'</TD><TD>';
+
+  $text .= qq!<SELECT NAME="popnum" SIZE=1><OPTION> !;
+  foreach my $pop ( @svc_acct_pop ) {
+    $text .= qq!<OPTION VALUE="!. $pop->popnum. '"'.
+             ( ( $popnum && $pop->popnum == $popnum ) ? ' SELECTED' : '' ). ">".
+             $pop->text;
+  }
+  $text .= '</SELECT>';
+
+}
+
 =back
 
 =head1 VERSION
 
-$Id: svc_acct_pop.pm,v 1.3 2001-09-26 09:17:06 ivan Exp $
+$Id: svc_acct_pop.pm,v 1.4 2001-09-27 20:41:37 ivan Exp $
 
 =head1 BUGS
 
 It should be renamed to part_pop.
 
+popselector?  putting web ui components in here?  they should probably live
+somewhere else...
+
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::svc_acct>, L<FS::part_pop_local>, schema.html from the
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 47e18d789..d5b0d0f41 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.4 2001-08-28 14:34:14 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.5 2001-09-27 20:41:36 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -22,7 +22,7 @@ use FS::cust_main_county;
   #for misplaced logic below
   use FS::part_pkg;
 
-  #for false laziness below
+  #for false laziness below (now more properly lazy)
   use FS::svc_acct_pop;
 
   #for (other) false laziness below
@@ -80,7 +80,7 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $error, "</FONT>"
 
 print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST NAME="form1">!,
       qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!,
-      qq!Customer # !, ( $custnum ? $custnum : " (NEW)" ),
+      qq!Customer # !, ( $custnum ? "<B>$custnum</B>" : " (NEW)" ),
       
 ;
 
@@ -408,7 +408,7 @@ unless ( $custnum ) {
 
   if ( @part_pkg ) {
 
-    print "<BR><BR>First package", &itable("#cccccc"),
+    print "<BR><BR>First package", &itable("#cccccc", "0 ALIGN=LEFT"), #apiabuse
           qq!<TR><TD COLSPAN=2><SELECT NAME="pkgpart_svcpart">!;
 
     print qq!<OPTION VALUE="">(none)!;
@@ -433,19 +433,12 @@ unless ( $custnum ) {
 <TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8>
 (blank to generate)</TD></TR>
 END
-    print qq!<TR><TD ALIGN="right">POP</TD><TD><SELECT NAME="popnum" SIZE=1><OPTION> !;
-    my($svc_acct_pop);
-    foreach $svc_acct_pop ( qsearch ('svc_acct_pop',{} ) ) {
-    print qq!<OPTION VALUE="!, $svc_acct_pop->popnum, '"',
-          ( $popnum && $svc_acct_pop->popnum == $popnum ) ? ' SELECTED' : '', ">", 
-          $svc_acct_pop->popnum, ": ", 
-          $svc_acct_pop->city, ", ",
-          $svc_acct_pop->state,
-          " (", $svc_acct_pop->ac, ")/",
-          $svc_acct_pop->exch, "\n"
-        ;
-    }
-    print "</SELECT></TD></TR></TABLE>";
+
+    print '<TR><TD ALIGN="right">POP</TD><TD WIDTH="100%">'
+          .
+          &FS::svc_acct_pop::popselector($popnum).
+          '</TD></TR></TABLE>'
+          ;
   }
 }
 
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index f594bd255..16b2957b0 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.7 2001-09-11 23:44:01 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.8 2001-09-27 20:41:36 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
@@ -9,9 +9,10 @@ use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(header popurl);
+use FS::CGI qw(header popurl itable);
 use FS::Record qw(qsearch qsearchs fields);
 use FS::svc_acct;
+use FS::svc_acct_pop qw(popselector);
 use FS::Conf;
 use FS::raddb;
 
@@ -103,19 +104,26 @@ $p1 = popurl(1);
 print $cgi->header( '-expires' => 'now' ), header("$action $svc account");
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
+      "</FONT><BR><BR>"
   if $cgi->param('error');
 
-print <<END;
+print 'Service # '. ( $svcnum ? "<B>$svcnum</B>" : " (NEW)" ). '<BR>'.
+      'Service: <B>'. $part_svc->svc. '</B><BR><BR>'.
+      <<END;
     <FORM ACTION="${p1}process/svc_acct.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
       <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
       <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
-Username: 
-<INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen>
-<BR>Password: 
-<INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8> 
-(blank to generate)
+END
+
+print &itable("#cccccc"), <<END;
+<TR><TD>
+<TR><TD ALIGN="right">Username</TD>
+<TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
+<TR><TD ALIGN="right">Password</TD>
+<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8>
+(blank to generate)</TD>
+</TR>
 END
 
 #domain
@@ -148,14 +156,15 @@ if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
   } else {
     @svc_domain = qsearch('svc_domain', {} );
   }
-  print qq!<BR>Domain: <SELECT NAME="domsvc" SIZE=1>\n!;
+  print qq!<TR><TD ALIGN="right">Domain</TD>!.
+        qq!<TD><SELECT NAME="domsvc" SIZE=1>\n!;
   foreach my $svc_domain ( sort { $a->domain cmp $b->domain } @svc_domain ) {
     print qq!<OPTION VALUE="!, $svc_domain->svcnum, qq!"!,
           $svc_domain->svcnum == $domsvc ? ' SELECTED' : '',
           ">", $svc_domain->domain, "\n"
       ;
   }
-  print "</SELECT>";
+  print "</SELECT></TD><TR>";
 }
 
 #pop
@@ -163,18 +172,8 @@ $popnum = $svc_acct->popnum || 0;
 if ( $part_svc->part_svc_column('popnum')->columnflag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$popnum">!;
 } else { 
-  print qq!<BR>POP: <SELECT NAME="popnum" SIZE=1><OPTION>\n!;
-  my($svc_acct_pop);
-  foreach $svc_acct_pop ( qsearch ('svc_acct_pop',{} ) ) {
-  print "<OPTION", $svc_acct_pop->popnum == $popnum ? ' SELECTED' : '', ">", 
-        $svc_acct_pop->popnum, ": ", 
-        $svc_acct_pop->city, ", ",
-        $svc_acct_pop->state,
-        " (", $svc_acct_pop->ac, ")/",
-        $svc_acct_pop->exch, "\n"
-      ;
-  }
-  print "</SELECT>";
+  print qq!<TR><TD ALIGN="right">Access number</TD>!.
+        qq!<TD>!. FS::svc_acct_pop::popselector($popnum). '</TD></TR>';
 }
 
 ($uid,$gid,$finger,$dir)=(
@@ -187,7 +186,7 @@ if ( $part_svc->part_svc_column('popnum')->columnflag eq "F" ) {
 print <<END;
 <INPUT TYPE="hidden" NAME="uid" VALUE="$uid">
 <INPUT TYPE="hidden" NAME="gid" VALUE="$gid">
-<BR>GECOS: <INPUT TYPE="text" NAME="finger" VALUE="$finger">
+<TR><TD ALIGN="right">GECOS</TD><TD><INPUT TYPE="text" NAME="finger" VALUE="$finger"></TD></TR>
 <INPUT TYPE="hidden" NAME="dir" VALUE="$dir">
 END
 
@@ -195,13 +194,13 @@ $shell = $svc_acct->shell;
 if ( $part_svc->part_svc_column('shell')->columnflag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="shell" VALUE="$shell">!;
 } else {
-  print qq!<BR>Shell: <SELECT NAME="shell" SIZE=1>!;
+  print qq!<TR><TD ALIGN="right">Shell</TD><TD><SELECT NAME="shell" SIZE=1>!;
   my($etc_shell);
   foreach $etc_shell (@shells) {
     print "<OPTION", $etc_shell eq $shell ? ' SELECTED' : '', ">",
           $etc_shell, "\n";
   }
-  print "</SELECT>";
+  print "</SELECT></TD></TR>";
 }
 
 ($quota,$slipip)=(
@@ -214,7 +213,7 @@ print qq!<INPUT TYPE="hidden" NAME="quota" VALUE="$quota">!;
 if ( $part_svc->part_svc_column('slipip')->columnflag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="slipip" VALUE="$slipip">!;
 } else {
-  print qq!<BR>IP: <INPUT TYPE="text" NAME="slipip" VALUE="$slipip">!;
+  print qq!<TR><TD ALIGN="right">IP</TD><TD><INPUT TYPE="text" NAME="slipip" VALUE="$slipip"></TD></TR>!;
 }
 
 foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
@@ -224,13 +223,13 @@ foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
     print qq!<INPUT TYPE="hidden" NAME="$r" VALUE="!.
           $svc_acct->getfield($r). '">';
   } else {
-    print qq!<BR>$FS::raddb::attrib{$a}: <INPUT TYPE="text" NAME="$r" VALUE="!.
-          $svc_acct->getfield($r). '">';
+    print qq!<TR><TD ALIGN="right">$FS::raddb::attrib{$a}</TD><TD><INPUT TYPE="text" NAME="$r" VALUE="!.
+          $svc_acct->getfield($r). '"></TD></TR>';
   }
 }
 
 #submit
-print qq!<P><INPUT TYPE="submit" VALUE="Submit">!; 
+print qq!</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">!; 
 
 print <<END;
     </FORM>
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index aacf8b139..01019c552 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,14 +1,14 @@
 <%
-# <!-- $Id: svc_acct.cgi,v 1.5 2001-09-27 18:33:18 ivan Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.6 2001-09-27 20:41:37 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $domain $query $svcnum $svc_acct $cust_svc $pkgnum
              $cust_pkg $custnum $part_svc $p $svc_acct_pop $password
-             $mydomain );
+             $mydomain $svc_domain );
 use CGI;
 use CGI::Carp qw( fatalsToBrowser );
 use FS::UID qw( cgisuidsetup );
-use FS::CGI qw( header popurl menubar);
+use FS::CGI qw( header popurl menubar ntable);
 use FS::Record qw( qsearchs fields );
 use FS::Conf;
 use FS::svc_acct;
@@ -68,63 +68,83 @@ print $cgi->header( '-expires' => 'now' ), header('Account View', menubar(
 
 #print qq!<BR><A HREF="../misc/sendconfig.cgi?$svcnum">Send account information</A>!;
 
-print qq!<A HREF="${p}edit/svc_acct.cgi?$svcnum">Edit this information</A>!,
-      "<BR>Service #$svcnum",
-      "<BR>Service: <B>", $part_svc->svc, "</B>",
-      "<BR><BR>Username: <B>", $svc_acct->username, "</B>"
+print qq!<A HREF="${p}edit/svc_acct.cgi?$svcnum">Edit this information</A><BR>!.
+      &ntable("#cccccc"). '<TR><TD>'. &ntable("#cccccc",2).
+      "<TR><TD ALIGN=\"right\">Service number</TD>".
+        "<TD BGCOLOR=\"#ffffff\">$svcnum</TD></TR>".
+      "<TR><TD ALIGN=\"right\">Service</TD>".
+        "<TD BGCOLOR=\"#ffffff\">". $part_svc->svc. "</TD></TR>".
+      "<TR><TD ALIGN=\"right\">Username</TD>".
+        "<TD BGCOLOR=\"#ffffff\">". $svc_acct->username. "</TD></TR>"
 ;
 
-print "<BR>Domain: <B>", $domain, "</B>";
+print "<TR><TD ALIGN=\"right\">Domain</TD>".
+        "<TD BGCOLOR=\"#ffffff\">". $domain, "</TD></TR>";
 
-print "<BR>Password: ";
+print "<TR><TD ALIGN=\"right\">Password</TD><TD BGCOLOR=\"#ffffff\">";
 $password = $svc_acct->_password;
 if ( $password =~ /^\*\w+\* (.*)$/ ) {
   $password = $1;
   print "<I>(login disabled)</I> ";
 }
 if ( $conf->exists('showpasswords') ) {
-  print "<B>$password</B>";
+  print "$password";
 } else {
   print "<I>(hidden)</I>";
 }
+print "</TR></TD>";
 $password = '';
 
 $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
-print "<BR>POP: <B>", $svc_acct_pop->city, ", ", $svc_acct_pop->state,
-      " (", $svc_acct_pop->ac, ")/", $svc_acct_pop->exch, "</B>"
+print "<TR><TD ALIGN=\"right\">Access number</TD>".
+      "<TD BGCOLOR=\"#ffffff\">". $svc_acct_pop->text. '</TD></TR>'
   if $svc_acct_pop;
 
 if ($svc_acct->uid ne '') {
-  print "<BR><BR>Uid: <B>", $svc_acct->uid, "</B>",
-        "<BR>Gid: <B>", $svc_acct->gid, "</B>",
-        "<BR>Finger name: <B>", $svc_acct->finger, "</B>",
-        "<BR>Home directory: <B>", $svc_acct->dir, "</B>",
-        "<BR>Shell: <B>", $svc_acct->shell, "</B>",
-        "<BR>Quota: <B>", $svc_acct->quota, "</B> <I>(unimplemented)</I>"
+  print "<TR><TD ALIGN=\"right\">Uid</TD>".
+          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->uid. "</TD></TR>",
+        "<TR><TD ALIGN=\"right\">Gid</TD>".
+          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->gid. "</TD></TR>",
+        "<TR><TD ALIGN=\"right\">GECOS</TD>".
+          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->finger. "</TD></TR>",
+        "<TR><TD ALIGN=\"right\">Home directory</TD>".
+          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->dir. "</TD></TR>",
+        "<TR><TD ALIGN=\"right\">Shell</TD>".
+          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->shell. "</TD></TR>",
+        "<TR><TD ALIGN=\"right\">Quota</TD>".
+          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->quota. "</TD></TR>"
   ;
 } else {
-  print "<BR><BR>(No shell account)";
+  print "<TR><TH COLSPAN=2>(No shell account)</TH></TR>";
 }
 
 if ($svc_acct->slipip) {
-  print "<BR><BR>IP address: <B>", ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' ) ? "<I>(Dynamic)</I>" : $svc_acct->slipip ,"</B>";
+  print "<TR><TD ALIGN=\"right\">IP address</TD><TD BGCOLOR=\"#ffffff\">".
+        ( ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' )
+          ? "<I>(Dynamic)</I>"
+          : $svc_acct->slipip
+        ). "</TD>";
   my($attribute);
   foreach $attribute ( grep /^radius_/, fields('svc_acct') ) {
     #warn $attribute;
     $attribute =~ /^radius_(.*)$/;
     my $pattribute = $FS::raddb::attrib{$1};
-    print "<BR>Radius (reply) $pattribute: <B>". $svc_acct->getfield($attribute), "</B>";
+    print "<TR><TD ALIGN=\"right\">Radius (reply) $pattribute</TD>".
+          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->getfield($attribute).
+          "</TD></TR>";
   }
   foreach $attribute ( grep /^rc_/, fields('svc_acct') ) {
     #warn $attribute;
     $attribute =~ /^rc_(.*)$/;
     my $pattribute = $FS::raddb::attrib{$1};
-    print "<BR>Radius (check) $pattribute: <B>". $svc_acct->getfield($attribute), "</B>";
+    print "<TR><TD ALIGN=\"right\">Radius (check) $pattribute: </TD>".
+          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->getfield($attribute).
+          "</TD></TR>";
   }
 } else {
-  print "<BR><BR>(No SLIP/PPP account)";
+  print "<TR><TH COLSPAN=2>(No SLIP/PPP account)</TH></TR>";
 }
 
-print "</BODY></HTML>";
+print "</TABLE></TD></TR></TABLE></BODY></HTML>";
 
 %>
-- 
cgit v1.2.1


From bc8a035db564658a7d9abdf3e141651c2de8082b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 Sep 2001 21:12:15 +0000
Subject: popSELECTOR

---
 httemplate/edit/cust_main.cgi |  4 ++--
 httemplate/edit/svc_acct.cgi  | 38 ++++++++++++++++++++++++++------------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index d5b0d0f41..4711cf587 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.5 2001-09-27 20:41:36 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.6 2001-09-27 21:12:15 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -434,7 +434,7 @@ unless ( $custnum ) {
 (blank to generate)</TD></TR>
 END
 
-    print '<TR><TD ALIGN="right">POP</TD><TD WIDTH="100%">'
+    print '<TR><TD ALIGN="right">Access number</TD><TD WIDTH="100%">'
           .
           &FS::svc_acct_pop::popselector($popnum).
           '</TD></TR></TABLE>'
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 16b2957b0..8646bb707 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,11 +1,11 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.8 2001-09-27 20:41:36 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.9 2001-09-27 21:12:15 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
              $part_svc $svc $otaker $username $password $ulen $ulen2 $p1
              $popnum $domsvc $uid $gid $finger $dir $shell $quota $slipip
-             @svc_domain );
+             %svc_domain );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
@@ -131,18 +131,29 @@ $domsvc = $svc_acct->domsvc || 0;
 if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
   print qq!<INPUT TYPE="hidden" NAME="domsvc" VALUE="$domsvc">!;
 } else { 
-  my @svc_domain = ();
+  my %svc_domain = ();
+
+  if ( $domsvc ) {
+    my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $domsvc, } );
+    if ( $svc_domain ) {
+      $svc_domain{$svc_domain->svcnum} = $svc_domain;
+    } else {
+      warn "unknown svc_domain.svcnum for svc_acct.domsvc: $domsvc";
+    }
+  }
+
   if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'D' ) {
     my $svc_domain = qsearchs('svc_domain', {
       'svcnum' => $part_svc->part_svc_column('domsvc')->columnvalue,
     } );
     if ( $svc_domain ) {
-      push @svc_domain, $svc_domain;
+      $svc_domain{$svc_domain->svcnum} = $svc_domain;
     } else {
       warn "unknown svc_domain.svcnum for part_svc_column domsvc: ".
            $part_svc->part_svc_column('domsvc')->columnvalue;
     }
   }
+
   my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
   if ($cust_pkg) {
     my @cust_svc =
@@ -151,20 +162,23 @@ if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
     foreach my $cust_svc ( @cust_svc ) {
       my $svc_domain =
         qsearchs('svc_domain', { 'svcnum' => $cust_svc->svcnum } );
-      push @svc_domain, $svc_domain if $svc_domain;
+     $svc_domain{$svc_domain->svcnum} = $svc_domain if $svc_domain;
     }
   } else {
-    @svc_domain = qsearch('svc_domain', {} );
+    %svc_domain = map { $_->svcnum => $_ } qsearch('svc_domain', {} );
   }
   print qq!<TR><TD ALIGN="right">Domain</TD>!.
         qq!<TD><SELECT NAME="domsvc" SIZE=1>\n!;
-  foreach my $svc_domain ( sort { $a->domain cmp $b->domain } @svc_domain ) {
-    print qq!<OPTION VALUE="!, $svc_domain->svcnum, qq!"!,
-          $svc_domain->svcnum == $domsvc ? ' SELECTED' : '',
-          ">", $svc_domain->domain, "\n"
-      ;
+  foreach my $svcnum (
+    sort { $svc_domain{$a}->domain cmp $svc_domain{$b}->domain }
+      keys %svc_domain
+  ) {
+    my $svc_domain = $svc_domain{$svcnum};
+    print qq!<OPTION VALUE="!. $svc_domain->svcnum. qq!"!.
+          ( $svc_domain->svcnum == $domsvc ? ' SELECTED' : '' ).
+          '>'. $svc_domain->domain. "\n" ;
   }
-  print "</SELECT></TD><TR>";
+  print "</SELECT></TD></TR>";
 }
 
 #pop
-- 
cgit v1.2.1


From 0df810cde18282c08271a87c50568dd75b61a578 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 Sep 2001 21:32:36 +0000
Subject: popSELECTOR!

---
 fs_signup/FS-SignupClient/cgi/signup.cgi  | 72 +++++++++++++++++++++++++------
 fs_signup/FS-SignupClient/cgi/signup.html | 15 +------
 2 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index f0d4620c5..573cf5d65 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.13 2001-09-11 11:28:15 ivan Exp $
+# $Id: signup.cgi,v 1.14 2001-09-27 21:32:36 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $error
@@ -243,6 +243,61 @@ sub pop_info {
   '';
 }
 
+#horrible false laziness with FS/FS/svc_acct_pop.pm::popselector
+sub popselector {
+  my( $popnum, $state ) = @_;
+
+  my %pop = ();
+  push @{ $pop{$_->{state}} }, $_ foreach @$pops;
+
+  my $text = <<END;
+    <SCRIPT>
+    function opt(what,href,text) {
+      var optionName = new Option(text, href, false, false)
+      var length = what.length;
+      what.options[length] = optionName;
+    }
+    
+    function popstate_changed(what) {
+      state = what.options[what.selectedIndex].text;
+      for (var i = what.form.popnum.length;i > 0;i--)
+                what.form.popnum.options[i] = null;
+      what.form.popnum.options[0] = new Option("", "", false, true);
+END
+
+  foreach my $popstate ( sort { $a cmp $b } keys %pop ) {
+    $text .= "\nif ( state == \"$popstate\" ) {\n";
+
+    foreach my $pop ( @{$pop{$popstate}}) {
+      my $o_popnum = $pop->{popnum};
+      my $poptext =  $pop->{city}. ', '. $pop->{state}.
+                     ' ('. $pop->{ac}. ')/'. $pop->{exch};
+
+      $text .= "opt(what.form.popnum, \"$o_popnum\", \"$poptext\");\n"
+    }
+    $text .= "}\n";
+  }
+
+  $text .= "}\n</SCRIPT>\n";
+
+  $text .=
+    qq!<SELECT NAME="popstate" SIZE=1 onChange="popstate_changed(this)">!.
+    qq!<OPTION> !;
+  $text .= "<OPTION>$_" foreach sort { $a cmp $b } keys %pop;
+  $text .= '</SELECT>'; #callback? return 3 html pieces?  #'</TD><TD>';
+
+  $text .= qq!<SELECT NAME="popnum" SIZE=1><OPTION> !;
+  foreach my $pop ( @$pops ) {
+    $text .= qq!<OPTION VALUE="!. $pop->{popnum}. '"'.
+             ( ( $popnum && $pop->{popnum} == $popnum ) ? ' SELECTED' : '' ). ">".
+             $pop->{city}. ', '. $pop->{state}.
+               ' ('. $pop->{ac}. ')/'. $pop->{exch};
+  }
+  $text .= '</SELECT>';
+
+  $text;
+}
+
 sub expselect {
   my $prefix = shift;
   my $date = shift || '';
@@ -412,19 +467,8 @@ Contact Information
   (blank to generate)</TD>
 </TR>
 <TR>
-  <TD ALIGN="right">POP</TD>
-  <TD><SELECT NAME="popnum" SIZE=1><OPTION> 
-
-  <%=
-    foreach my $pop ( @{$pops} ) {
-      $OUT .= '<OPTION VALUE="'. $pop->{'popnum'}. '"';
-      $OUT .= ' SELECTED' if $popnum && $pop->{'popnum'} == $popnum;
-      $OUT .= '>'. $pop->{'popnum'}. ': '. $pop->{'city'}. ', '.
-              $pop->{'state'}. ' ('. $pop->{'ac'}. ')/'. $pop->{'exch'}. "\n";
-    }
-  %>
-
-  </SELECT></TD>
+  <TD ALIGN="right">Access number</TD>
+  <TD><%= popselector($popnum) %></TD>
 </TR>
 </TABLE>
 <BR><BR><INPUT TYPE="submit" VALUE="Signup">
diff --git a/fs_signup/FS-SignupClient/cgi/signup.html b/fs_signup/FS-SignupClient/cgi/signup.html
index fcedde3ab..0f4742d20 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.html
+++ b/fs_signup/FS-SignupClient/cgi/signup.html
@@ -130,19 +130,8 @@ Contact Information
   (blank to generate)</TD>
 </TR>
 <TR>
-  <TD ALIGN="right">POP</TD>
-  <TD><SELECT NAME="popnum" SIZE=1><OPTION> 
-
-  <%=
-    foreach my $pop ( @{$pops} ) {
-      $OUT .= '<OPTION VALUE="'. $pop->{'popnum'}. '"';
-      $OUT .= ' SELECTED' if $popnum && $pop->{'popnum'} == $popnum;
-      $OUT .= '>'. $pop->{'popnum'}. ': '. $pop->{'city'}. ', '.
-              $pop->{'state'}. ' ('. $pop->{'ac'}. ')/'. $pop->{'exch'}. "\n";
-    }
-  %>
-
-  </SELECT></TD>
+  <TD ALIGN="right">Access number</TD>
+  <TD><%= popselector($popnum) %></TD>
 </TR>
 </TABLE>
 <BR><BR><INPUT TYPE="submit" VALUE="Signup">
-- 
cgit v1.2.1


From e8116f5d849f479f03294232e25c41c3d82b50f2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 Sep 2001 21:37:57 +0000
Subject: it's 2001 now.

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 573cf5d65..b236e6fb2 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.14 2001-09-27 21:32:36 ivan Exp $
+# $Id: signup.cgi,v 1.15 2001-09-27 21:37:57 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $error
@@ -314,7 +314,7 @@ sub expselect {
     $return .= ">$_";
   }
   $return .= qq!</SELECT>/<SELECT NAME="$prefix!. qq!_year" SIZE="1">!;
-  for ( 1999 .. 2037 ) {
+  for ( 2001 .. 2037 ) {
     $return .= "<OPTION";
     $return .= " SELECTED" if $_ == $y;
     $return .= ">$_";
-- 
cgit v1.2.1


From 2f33777f569ff435e4cc00769288b65f53fcfc0e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 Sep 2001 21:49:31 +0000
Subject: not used

---
 FS/FS/svc_acct_pop.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_acct_pop.pm b/FS/FS/svc_acct_pop.pm
index 3b8e9785a..243c18a8b 100644
--- a/FS/FS/svc_acct_pop.pm
+++ b/FS/FS/svc_acct_pop.pm
@@ -129,7 +129,6 @@ sub popselector {
     push @{$svc_acct_pop{$_->state}}, $_ foreach @svc_acct_pop;
   }
 
-  my $size = 0;
   my $text = <<END;
     <SCRIPT>
     function opt(what,href,text) {
@@ -151,7 +150,6 @@ END
     foreach my $pop ( @{$svc_acct_pop{$popstate}}) {
       my $o_popnum = $pop->popnum;
       my $poptext = $pop->text;
-      $size = length($poptext) if length($poptext) > $size;
       $text .= "opt(what.form.popnum, \"$o_popnum\", \"$poptext\");\n"
     }
     $text .= "}\n";
@@ -173,13 +171,15 @@ END
   }
   $text .= '</SELECT>';
 
+  $text;
+
 }
 
 =back
 
 =head1 VERSION
 
-$Id: svc_acct_pop.pm,v 1.4 2001-09-27 20:41:37 ivan Exp $
+$Id: svc_acct_pop.pm,v 1.5 2001-09-27 21:49:31 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 1477de361665cd03cb00bebac39a730d00398064 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Sep 2001 04:33:33 +0000
Subject: ssh recommendations

---
 httemplate/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index c99a0f911..069bdaf2e 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -7,7 +7,7 @@ Before installing, you need:
 <ul>
   <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
   <li><a href="http://perl.apache.org/">mod_perl</a>
-  <li><a href="http://www.openssh.com//">SSH</a>
+  <li><a href="http://www.openssh.com//">SSH</a> (<a href="http://www.openssh.com//">OpenSSH</a> is recommended.  SSH Communications Security commercial <a href="http://www.ssh.com/products/ssh/download.cfm">SSH version 3</a> has been reported incompatible with Freeside.)
   <li><a href="http://www.perl.com/">Perl</a>  Don't enable experimental features like threads or the PerlIO abstraction layer.
   <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.  <a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.  <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>.
   <li>Perl modules (<a href="http://theoryx5.uwinnipeg.ca/CPAN/perl/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
-- 
cgit v1.2.1


From 3919924e14e1d0fa70e0e194f8da045389f34e8e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 30 Sep 2001 07:55:52 +0000
Subject: purge message

---
 fs_webdemo/registerd.Pg | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs_webdemo/registerd.Pg b/fs_webdemo/registerd.Pg
index b1409a92c..8c8b94557 100755
--- a/fs_webdemo/registerd.Pg
+++ b/fs_webdemo/registerd.Pg
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: registerd.Pg,v 1.9 2001-04-26 02:28:40 ivan Exp $
+# $Id: registerd.Pg,v 1.10 2001-09-30 07:55:52 ivan Exp $
 
 use strict;
 use vars qw(
@@ -184,6 +184,8 @@ while ( 1 ) {
     "\n",
     "Your sample Freeside database has been setup.\n",
     "\n",
+    "Your login and database will be automatically deleted in 1-2 months.\n",
+    "\n",        
     "Point your web browswer at http://freeside.sisd.com/ and use the following\n",
     "authentication information:\n",
     "\n",
-- 
cgit v1.2.1


From d390ca47b755c896af0644ae83ec583973c319b6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 30 Sep 2001 20:30:09 +0000
Subject: username-uppercase config file

---
 FS/FS/svc_acct.pm           | 23 +++++++++++++++++------
 httemplate/docs/config.html |  1 +
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 46208aa22..3530001fd 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -3,7 +3,7 @@ package FS::svc_acct;
 use strict;
 use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
              $usernamemax $passwordmin $username_letter $username_letterfirst
-             $username_noperiod
+             $username_noperiod $username_uppercase
              $shellmachine $useradd $usermod $userdel $mydomain
              $cyrus_server $cyrus_admin_user $cyrus_admin_pass
              $dirhash
@@ -57,6 +57,7 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
   $username_letter = $conf->exists('username-letter');
   $username_letterfirst = $conf->exists('username-letterfirst');
   $username_noperiod = $conf->exists('username-noperiod');
+  $username_uppercase = $conf->exists('username-uppercase');
   $mydomain = $conf->config('domain');
   if ( $conf->exists('cyrus') ) {
     ($cyrus_server, $cyrus_admin_user, $cyrus_admin_pass) =
@@ -674,9 +675,15 @@ sub check {
   return $error if $error;
 
   my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;
-  $recref->{username} =~ /^([a-z0-9_\-\.]{$usernamemin,$ulen})$/
-    or return "Illegal username";
+  if ( $username_uppercase ) {
+    $recref->{username} =~ /^([a-z0-9_\-\.]{$usernamemin,$ulen})$/i
+      or return "Illegal username";
+  } else {
+    $recref->{username} =~ /^([a-z0-9_\-\.]{$usernamemin,$ulen})$/
+      or return "Illegal username";
+  }
   $recref->{username} = $1;
+
   if ( $username_letterfirst ) {
     $recref->{username} =~ /^[a-z]/ or return "Illegal username";
   } elsif ( $username_letter ) {
@@ -705,8 +712,12 @@ sub check {
     return "Only root can have uid 0"
       if $recref->{uid} == 0 && $recref->{username} ne 'root';
 
-    $error = $self->ut_textn('finger');
-    return $error if $error;
+#    $error = $self->ut_textn('finger');
+#    return $error if $error;
+    $self->getfield('finger') =~
+      /^([\w \t\!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\*]*)$/
+        or return "Illegal finger: ". $self->getfield('finger');
+    $self->setfield('finger', $1);
 
     $recref->{dir} =~ /^([\/\w\-]*)$/
       or return "Illegal directory";
@@ -908,7 +919,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.46 2001-09-19 21:06:17 ivan Exp $
+$Id: svc_acct.pm,v 1.47 2001-09-30 20:30:09 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
index 2254b32ca..0cafc8280 100644
--- a/httemplate/docs/config.html
+++ b/httemplate/docs/config.html
@@ -112,6 +112,7 @@ All further configuration files and directories are located in
   <li><a name="username-letter">username-letter</a> - The existance of this file will turn on the requirement that usernames contain at least one letter.
   <li><a name="username-letterfirst">username-letterfirst</a> - The existance of this file will turn on the requirement that usernames start with a letter.
   <li><a name="username-noperiod">username-noperiod</a> - The existance of this file will disallow periods in usernames.
+  <li><a name="username-uppercase">username-uppercase</a> - The existance of this file will allow uppercase characters in username.
    <li><a name="username_policy">username_policy</a> - This file controls the mechanism for preventing duplicate usernames in passwd/radius files exported from svc_accts.  This should be one of 'prepend domsvc' 'append domsvc' or 'append domain'
    <li><a name="vpopmailmachines">vpopmailmachines</a> - Your vpopmail pop toasters, one per line.  Each line is of the form "machinename vpopdir vpopuid vpopgid".  For example: <code>poptoaster.domain.tld /home/vpopmail 508 508</code>  Note: vpopuid and vpopgid are values taken from the vpopmail machine's /etc/passwd
 
-- 
cgit v1.2.1


From 4ff1dd39976ab5c7550081743ca89a741100cfa3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 30 Sep 2001 22:19:34 +0000
Subject: $1 doesn't seem to last very long...

---
 FS/FS/svc_acct.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 3530001fd..e46b4e5f3 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -676,13 +676,14 @@ sub check {
 
   my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;
   if ( $username_uppercase ) {
-    $recref->{username} =~ /^([a-z0-9_\-\.]{$usernamemin,$ulen})$/i
-      or return "Illegal username";
+    $recref->{username} =~ /^([a-z0-9_\-\.]{$usernamemin,$ulen})$/
+      or return "Illegal username: ". $recref->{username};
+    $recref->{username} = $1;
   } else {
     $recref->{username} =~ /^([a-z0-9_\-\.]{$usernamemin,$ulen})$/
-      or return "Illegal username";
+      or return "Illegal username: ". $recref->{username};
+    $recref->{username} = $1;
   }
-  $recref->{username} = $1;
 
   if ( $username_letterfirst ) {
     $recref->{username} =~ /^[a-z]/ or return "Illegal username";
@@ -919,7 +920,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.47 2001-09-30 20:30:09 ivan Exp $
+$Id: svc_acct.pm,v 1.48 2001-09-30 22:19:34 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From f832b7bf60eed131141facd8207a1c44a134d3ca Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 30 Sep 2001 22:35:34 +0000
Subject: arg

---
 FS/FS/svc_acct.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index e46b4e5f3..2390de02e 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -676,7 +676,7 @@ sub check {
 
   my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;
   if ( $username_uppercase ) {
-    $recref->{username} =~ /^([a-z0-9_\-\.]{$usernamemin,$ulen})$/
+    $recref->{username} =~ /^([a-z0-9_\-\.]{$usernamemin,$ulen})$/i
       or return "Illegal username: ". $recref->{username};
     $recref->{username} = $1;
   } else {
@@ -920,7 +920,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.48 2001-09-30 22:19:34 ivan Exp $
+$Id: svc_acct.pm,v 1.49 2001-09-30 22:35:34 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 1fd215138eeed664b07d4347ce18a7a1a616419b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 1 Oct 2001 10:31:08 +0000
Subject: oops

---
 FS/FS/cust_pkg.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 147a760d9..dff241393 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -100,6 +100,8 @@ sub table { 'cust_pkg'; }
 Adds this billing item to the database ("Orders" the item).  If there is an
 error, returns the error, otherwise returns false.
 
+=cut
+
 sub insert {
   my $self = shift;
 
@@ -565,7 +567,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.6 2001-09-04 14:44:06 ivan Exp $
+$Id: cust_pkg.pm,v 1.7 2001-10-01 10:31:08 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From fce8244a87d152312852eef77411c644f992314d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Oct 2001 11:10:19 +0000
Subject: allow some more characters in GECOS... showing up in fix.net's
 password files

---
 FS/FS/svc_acct.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 2390de02e..71c47d6cd 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -716,7 +716,7 @@ sub check {
 #    $error = $self->ut_textn('finger');
 #    return $error if $error;
     $self->getfield('finger') =~
-      /^([\w \t\!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\*]*)$/
+      /^([\w \t\!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\*\<\>]*)$/
         or return "Illegal finger: ". $self->getfield('finger');
     $self->setfield('finger', $1);
 
@@ -920,7 +920,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.49 2001-09-30 22:35:34 ivan Exp $
+$Id: svc_acct.pm,v 1.50 2001-10-02 11:10:19 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 44e51a5c50be350fa698bcdcf86ad5c01a7631a2 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 2 Oct 2001 16:00:31 +0000
Subject: add pkey to batch payments and fix a doc typo

---
 FS/FS/cust_pay_batch.pm       | 7 +++++--
 README.1.4.0pre3-4            | 3 +++
 bin/fs-setup                  | 5 +++--
 httemplate/docs/upgrade8.html | 4 +++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
index 0576cbefc..671cd710a 100644
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -35,6 +35,8 @@ following fields are currently supported:
 
 =over 4
 
+=item paybatchnum - primary key (automatically assigned)
+
 =item trancode - 77 for charges
 
 =item cardnum
@@ -117,7 +119,8 @@ sub check {
   my $self = shift;
 
   my $error = 
-      $self->ut_numbern('trancode')
+      $self->ut_numbern('paybatchnum')
+    || $self->ut_numbern('trancode')
     || $self->ut_number('cardnum') 
     || $self->ut_money('amount')
     || $self->ut_number('invnum')
@@ -188,7 +191,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_pay_batch.pm,v 1.2 2000-06-17 21:48:05 ivan Exp $
+$Id: cust_pay_batch.pm,v 1.3 2001-10-02 16:00:30 jeff Exp $
 
 =head1 BUGS
 
diff --git a/README.1.4.0pre3-4 b/README.1.4.0pre3-4
index 6d3b0cd85..9814a658a 100644
--- a/README.1.4.0pre3-4
+++ b/README.1.4.0pre3-4
@@ -12,5 +12,8 @@ CREATE TABLE part_pop_local (
 );
 CREATE INDEX part_pop_local1 ON part_pop_local ( npa, nxx );
 
+ALTER TABLE cust_pay_batch ADD paybatchnum integer;
+CREATE UNIQUE INDEX cust_pay_batch_pkey ON cust_pay_batch ( paybatchnum );
+
 Run bin/dbdef-create
 
diff --git a/bin/fs-setup b/bin/fs-setup
index 52a2505e5..476b84d87 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.59 2001-09-26 09:17:06 ivan Exp $
+# $Id: fs-setup,v 1.60 2001-10-02 16:00:30 jeff Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -447,6 +447,7 @@ sub tables_hash_hack {
     'cust_pay_batch' => { #what's this used for again?  list of customers
                           #in current CARD batch? (necessarily CARD?)
       'columns' => [
+        'paybatchnum',   'int',    '',   '',
         'invnum',   'int',    '',   '',
         'custnum',   'int',    '',   '',
         'last',     'varchar', '',     $char_d,
@@ -464,7 +465,7 @@ sub tables_hash_hack {
         'payname',  'varchar', 'NULL', $char_d,
         'amount',   @money_type,
       ],
-      'primary_key' => '',
+      'primary_key' => 'paybatchnum',
       'unique' => [ [] ],
       'index' => [ ['invnum'], ['custnum'] ],
     },
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 747b8e29c..6be51d664 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -132,6 +132,7 @@ ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
 ALTER TABLE svc_domain ADD catchall integer NULL;
 ALTER TABLE cust_main ADD referral_custnum integer NULL;
 ALTER TABLE cust_pay ADD custnum integer;
+ALTER TABLE cust_pay_batch ADD paybatchnum integer;
 ALTER TABLE cust_refund ADD custnum integer;
 CREATE INDEX cust_main3 ON cust_main ( referral_custnum );
 CREATE INDEX cust_credit_bill1 ON cust_credit_bill ( crednum );
@@ -140,13 +141,14 @@ CREATE INDEX cust_bill_pay1 ON cust_bill_pay ( invnum );
 CREATE INDEX cust_bill_pay2 ON cust_bill_pay ( paynum );
 CREATE INDEX cust_credit_refund1 ON cust_credit_refund ( crednum );
 CREATE INDEX cust_credit_refund2 ON cust_credit_refund ( refundnum );
+CREATE UNIQUE INDEX cust_pay_batch_pkey ON cust_pay_batch ( paybatchnum );
 CREATE UNIQUE INDEX part_svc_column1 ON part_svc_column ( svcpart, columnname );
 </pre>
 
   <li>If you are using PostgreSQL, apply the following changes to your database:
 <pre>
 CREATE UNIQUE INDEX agent_pkey ON agent ( agentnum );
-CREATE UNIQUE INDEX agent_type_pkey agent_type ( typenum );
+CREATE UNIQUE INDEX agent_type_pkey ON agent_type ( typenum );
 CREATE UNIQUE INDEX cust_bill_pkey ON cust_bill ( invnum );
 CREATE UNIQUE INDEX cust_credit_pkey ON cust_credit ( crednum );
 CREATE UNIQUE INDEX cust_main_pkey ON cust_main ( custnum );
-- 
cgit v1.2.1


From 2a716543d01f3298609b8ac4b1b3fac15ecfb3b1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Oct 2001 20:07:58 +0000
Subject: doc clarification (?)

---
 httemplate/docs/upgrade8.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 6be51d664..afb84296e 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -199,8 +199,11 @@ ALTER TABLE cust_main ADD COLUMN comments varchar NULL;
 </pre>
   <li>If you are using the signup server, reinstall it according to the <a href="signup.html">instructions</a>.  The 1.3.x signup server is not compatible with 1.4.x.
   <li>Run bin/dbdef-create.
-  <li>create a service based on svc_forward
-  <li>Run bin/fs-migrate-svc_acct_sm
+  <li>If you have svc_acct_sm records or service definitions:
+    <ul>
+      <li>Create a service definition with table svc_forward
+      <li>Run bin/fs-migrate-svc_acct_sm
+    </ul>
   <li>Run bin/fs-migrate-payref
   <li>Run bin/fs-migrate-part_svc
   <li><b>After running bin/fs-migrate-payref</b>, apply the following changes to your database:
-- 
cgit v1.2.1


From 058ad19b1b6e139df3a3cfbdbd02263099883907 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 9 Oct 2001 03:11:50 +0000
Subject: fix syntax error in newly-enabled insert sub, sheesh

---
 FS/FS/cust_pkg.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index dff241393..d2d74190d 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -107,11 +107,12 @@ sub insert {
 
   # custnum might not have have been defined in sub check (for one-shot new
   # customers), so check it here instead
+  # (is this still necessary with transactions?)
 
   my $error = $self->ut_number('custnum');
-  return $error if $error
+  return $error if $error;
 
-  return "Unknown customer"
+  return "Unknown customer ". $self->custnum
     unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
 
   $self->SUPER::insert;
@@ -567,7 +568,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.7 2001-10-01 10:31:08 ivan Exp $
+$Id: cust_pkg.pm,v 1.8 2001-10-09 03:11:50 ivan Exp $
 
 =head1 BUGS
 
@@ -584,6 +585,9 @@ cancel } because they use %FS::UID::callback to load configuration values.
 Probably need a subroutine which decides what to do based on whether or not
 we've fetched the user yet, rather than a hash.  See FS::UID and the TODO.
 
+Now that things are transactional should the check in the insert method be
+moved to check ?
+
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::cust_main>, L<FS::part_pkg>, L<FS::cust_svc>
-- 
cgit v1.2.1


From ebd1e74bc715300de23cbd64ac076beee2209f0b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 9 Oct 2001 07:16:57 +0000
Subject: that was a confusing bug to fix

---
 httemplate/edit/process/part_svc.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 97477d645..423db93b5 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -27,7 +27,7 @@ if ( $svcpart ) {
 
 if ( $error ) {
   $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2), "part_svc.cgi?". $cgi->query_string );
+  print $cgi->redirect(popurl(2). "part_svc.cgi?". $cgi->query_string );
 } else {
   print $cgi->redirect(popurl(3)."browse/part_svc.cgi");
 }
-- 
cgit v1.2.1


From 2e1ca65dcfcf6a8ef41a10e15e3d20200ffc871a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 9 Oct 2001 13:16:01 +0000
Subject: update mysql links

---
 httemplate/docs/install.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 069bdaf2e..53eb8f856 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -46,12 +46,12 @@ Install the Freeside distribution:
   <li>Add the user `freeside' to your system.
   <li>Allow the freeside user full access to the freeside database.
     <ul>
-      <li> with <a href="http://www.mysql.com/Manual_chapter/manual_Privilege_system.html#Privilege_system">MySQL</a>:<pre>$ mysqladmin -u root password '<i>set_a_root_database_password</i>'
+      <li> with <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#User_Account_Management">MySQL</a>:<pre>$ mysqladmin -u root password '<i>set_a_root_database_password</i>'
 $ mysql -u root -p
 mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* TO freeside@localhost IDENTIFIED BY '<i>set_a_freeside_database_password</i>';</pre>
       <li> with <a href="http://www.postgresql.org/users-lounge/docs/7.1/postgres/user-manag.html#DATABASE-USERS">PostgreSQL</a>
     </ul>
-  <li>Add the freeside database to your database engine.  (with <a href="http://www.mysql.com/Manual_chapter/manual_Reference.html#CREATE_DATABASE">MySQL</a>) (with <a href="http://postgresql.readysetnet.com/users-lounge/docs/7.1/postgres/managing-databases.html#MANAGE-AG-CREATEDB">PostgreSQL</a>)
+  <li>Add the freeside database to your database engine.  (with <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_Reference.html#CREATE_DATABASE">MySQL</a>) (with <a href="http://postgresql.readysetnet.com/users-lounge/docs/7.1/postgres/managing-databases.html#MANAGE-AG-CREATEDB">PostgreSQL</a>)
   <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>
   <li>Build and install the Perl libraries:
     <pre>
-- 
cgit v1.2.1


From 4bbf90e800406ff75a5fed09ba5cd71293cda542 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 9 Oct 2001 23:10:17 +0000
Subject: add `unsuspendauto' config file: enable the automatic unsuspension of
 suspended packages when a customer's balance due changes from positive to
 zero or negative as the result of a payment or credit

add cust_pkg.manual_flag to disable this behaviour per customer package (no UI
to set this yet)
---
 FS/FS/cust_credit.pm          | 56 ++++++++++++++++++++++++++++++++++--
 FS/FS/cust_main.pm            | 66 ++++++++++++++++++++++++++++++++++++++++++-
 FS/FS/cust_pay.pm             | 29 +++++++++++++++++--
 FS/FS/cust_pkg.pm             | 10 ++++++-
 README.1.4.0pre3-4            |  2 +-
 bin/fs-setup                  |  3 +-
 httemplate/docs/config.html   |  1 +
 httemplate/docs/install.html  |  2 +-
 httemplate/docs/schema.html   |  1 +
 httemplate/docs/upgrade8.html |  1 +
 10 files changed, 160 insertions(+), 11 deletions(-)

diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 1f792daa6..54c201ad4 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -1,8 +1,8 @@
 package FS::cust_credit;
 
 use strict;
-use vars qw( @ISA );
-use FS::UID qw( getotaker );
+use vars qw( @ISA $conf $unsuspendauto );
+use FS::UID qw( dbh getotaker );
 use FS::Record qw( qsearch qsearchs );
 use FS::cust_main;
 use FS::cust_refund;
@@ -10,6 +10,14 @@ use FS::cust_credit_bill;
 
 @ISA = qw( FS::Record );
 
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::cust_credit'} = sub { 
+
+  $conf = new FS::Conf;
+  $unsuspendauto = $conf->exists('unsuspendauto');
+
+};
+
 =head1 NAME
 
 FS::cust_credit - Object methods for cust_credit records
@@ -69,6 +77,48 @@ sub table { 'cust_credit'; }
 Adds this credit to the database ("Posts" the credit).  If there is an error,
 returns the error, otherwise returns false.
 
+=cut
+
+sub insert {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $cust_main = qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+  my $old_balance = $cust_main->balance;
+
+  my $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "error inserting $self: $error";
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  #false laziness w/ cust_credit::insert
+  if ( $unsuspendauto && $old_balance && $cust_main->balance <= 0 ) {
+    my @errors = $cust_main->unsuspend;
+    #return 
+    # side-fx with nested transactions?  upstack rolls back?
+    warn "WARNING:Errors unsuspending customer ". $cust_main->custnum. ": ".
+         join(' / ', @errors)
+      if @errors;
+  }
+  #eslaf
+
+  '';
+
+}
+
 =item delete
 
 Currently unimplemented.
@@ -185,7 +235,7 @@ sub credited {
 
 =head1 VERSION
 
-$Id: cust_credit.pm,v 1.11 2001-09-02 07:49:52 ivan Exp $
+$Id: cust_credit.pm,v 1.12 2001-10-09 23:10:16 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 0a7f1f7cb..d5beca92a 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -98,6 +98,8 @@ FS::cust_main - Object methods for cust_main records
 
   @cust_pkg = $record->ncancelled_pkgs;
 
+  @cust_pkg = $record->suspended_pkgs;
+
   $error = $record->bill;
   $error = $record->bill %options;
   $error = $record->bill 'time' => $time;
@@ -708,6 +710,68 @@ sub ncancelled_pkgs {
   ] };
 }
 
+=item suspended_pkgs
+
+Returns all suspended packages (see L<FS::cust_pkg>) for this customer.
+
+=cut
+
+sub suspended_pkgs {
+  my $self = shift;
+  grep { $_->susp } $self->ncancelled_pkgs;
+}
+
+=item unflagged_suspended_pkgs
+
+Returns all unflagged suspended packages (see L<FS::cust_pkg>) for this
+customer (thouse packages without the `manual_flag' set).
+
+=cut
+
+sub unflagged_suspended_pkgs {
+  my $self = shift;
+  return $self->suspended_pkgs
+    unless dbdef->table('cust_pkg')->column('manual_flag');
+  grep { ! $_->manual_flag } $self->suspended_pkgs;
+}
+
+=item unsuspended_pkgs
+
+Returns all unsuspended (and uncancelled) packages (see L<FS::cust_pkg>) for
+this customer.
+
+=cut
+
+sub unsuspended_pkgs {
+  my $self = shift;
+  grep { ! $_->susp } $self->ncancelled_pkgs;
+}
+
+=item unsuspend
+
+Unsuspends all unflagged suspended packages (see L</unflagged_suspended_pkgs>
+and L<FS::cust_pkg>) for this customer.  Always returns a list: an empty list
+on success or a list of errors.
+
+=cut
+
+sub unsuspend {
+  my $self = shift;
+  grep { $_->unsuspend } $self->suspended_pkgs;
+}
+
+=item suspend
+
+Suspends all unsuspended packages (see L<FS::cust_pkg>) for this customer.
+Always returns a list: an empty list on success or a list of errors.
+
+=cut
+
+sub suspend {
+  my $self = shift;
+  grep { $_->suspend } $self->unsuspended_pkgs;
+}
+
 =item bill OPTIONS
 
 Generates invoices (see L<FS::cust_bill>) for this customer.  Usually used in
@@ -1724,7 +1788,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.38 2001-09-26 09:17:06 ivan Exp $
+$Id: cust_main.pm,v 1.39 2001-10-09 23:10:16 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 42ca0b0a5..daf5b5263 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -1,15 +1,24 @@
 package FS::cust_pay;
 
 use strict;
-use vars qw( @ISA );
+use vars qw( @ISA $conf $unsuspendauto );
 use Business::CreditCard;
-use FS::Record qw( dbh qsearch qsearchs );
+use FS::UID qw( dbh );
+use FS::Record qw( dbh qsearch qsearchs dbh );
 use FS::cust_bill;
 use FS::cust_bill_pay;
 use FS::cust_main;
 
 @ISA = qw( FS::Record );
 
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::cust_pay'} = sub { 
+
+  $conf = new FS::Conf;
+  $unsuspendauto = $conf->exists('unsuspendauto');
+
+};
+
 =head1 NAME
 
 FS::cust_pay - Object methods for cust_pay objects
@@ -90,6 +99,9 @@ sub insert {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
+  my $cust_main = qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+  my $old_balance = $cust_main->balance;
+
   my $error = $self->check;
   return $error if $error;
 
@@ -124,6 +136,17 @@ sub insert {
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
+  #false laziness w/ cust_credit::insert
+  if ( $unsuspendauto && $old_balance && $cust_main->balance <= 0 ) {
+    my @errors = $cust_main->unsuspend;
+    #return 
+    # side-fx with nested transactions?  upstack rolls back?
+    warn "WARNING:Errors unsuspending customer ". $cust_main->custnum. ": ".
+         join(' / ', @errors)
+      if @errors;
+  }
+  #eslaf
+
   '';
 
 }
@@ -281,7 +304,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.7 2001-09-03 22:07:38 ivan Exp $
+$Id: cust_pay.pm,v 1.8 2001-10-09 23:10:16 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index d2d74190d..1bcf74f78 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -77,6 +77,9 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item otaker - order taker (assigned automatically if null, see L<FS::UID>)
 
+=item manual_flag - If this field is set to 1, disables the automatic
+unsuspensiond of this package when using the B<unsuspendauto> config file.
+
 =back
 
 Note: setup, bill, susp, expire and cancel are specified as UNIX timestamps;
@@ -197,6 +200,11 @@ sub check {
   $self->otaker =~ /^(\w{0,16})$/ or return "Illegal otaker";
   $self->otaker($1);
 
+  if ( $self->dbdef_table->column('manual_flag') ) {
+    $self->manual_flag =~ /^([01]?)$/ or return "Illegal manual_flag";
+    $self->manual_flag($1);
+  }
+
   ''; #no error
 }
 
@@ -568,7 +576,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.8 2001-10-09 03:11:50 ivan Exp $
+$Id: cust_pkg.pm,v 1.9 2001-10-09 23:10:16 ivan Exp $
 
 =head1 BUGS
 
diff --git a/README.1.4.0pre3-4 b/README.1.4.0pre3-4
index 9814a658a..102b57872 100644
--- a/README.1.4.0pre3-4
+++ b/README.1.4.0pre3-4
@@ -11,7 +11,7 @@ CREATE TABLE part_pop_local (
   nxx char(3) not null
 );
 CREATE INDEX part_pop_local1 ON part_pop_local ( npa, nxx );
-
+ALTER TABLE cust_pkg ADD manual_flag char(1) NULL;
 ALTER TABLE cust_pay_batch ADD paybatchnum integer;
 CREATE UNIQUE INDEX cust_pay_batch_pkey ON cust_pay_batch ( paybatchnum );
 
diff --git a/bin/fs-setup b/bin/fs-setup
index 476b84d87..edfc5ff1c 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.60 2001-10-02 16:00:30 jeff Exp $
+# $Id: fs-setup,v 1.61 2001-10-09 23:10:17 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -481,6 +481,7 @@ sub tables_hash_hack {
         'susp',      @date_type,
         'cancel',    @date_type,
         'expire',    @date_type,
+        'manual_flag', 'char', 'NULL', 1,
       ],
       'primary_key' => 'pkgnum',
       'unique' => [ [] ],
diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
index 0cafc8280..63f6baba9 100644
--- a/httemplate/docs/config.html
+++ b/httemplate/docs/config.html
@@ -107,6 +107,7 @@ All further configuration files and directories are located in
   <li><a name="soaretry">soaretry</a> - SOA retry for new domains
   <li><a name="statedefault">statedefault</a> - Default state or province (if not supplied, the default is `CA')
   <li><a name="textradiusprepend">textradiusprepend</a> - <b>DEPRECIATED</b>, use RADIUS check attributes instead.  This option will be removed soon.  The contents of this file will be prepended to the first line of a user's RADIUS entry in text exports.
+  <li><a name="unsuspendauto">unsuspendauto</a> _ The existance of this file will enable the automatic unsuspension of suspended packages when a customer's balance due changes from positive to zero or negative as the result of a payment or credit.
   <li><a name="usernamemin">usernamemin</a> - Minimum username length (default 2);
   <li><a name="usernamemax">usernamemax</a> - Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)
   <li><a name="username-letter">username-letter</a> - The existance of this file will turn on the requirement that usernames contain at least one letter.
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 53eb8f856..44644dc91 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -51,7 +51,7 @@ $ mysql -u root -p
 mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* TO freeside@localhost IDENTIFIED BY '<i>set_a_freeside_database_password</i>';</pre>
       <li> with <a href="http://www.postgresql.org/users-lounge/docs/7.1/postgres/user-manag.html#DATABASE-USERS">PostgreSQL</a>
     </ul>
-  <li>Add the freeside database to your database engine.  (with <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_Reference.html#CREATE_DATABASE">MySQL</a>) (with <a href="http://postgresql.readysetnet.com/users-lounge/docs/7.1/postgres/managing-databases.html#MANAGE-AG-CREATEDB">PostgreSQL</a>)
+  <li>Add the freeside database to your database engine.  (with <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_Reference.html#CREATE_DATABASE">MySQL</a>) (with <a href="http://www.postgresql.org/users-lounge/docs/7.1/postgres/managing-databases.html#MANAGE-AG-CREATEDB">PostgreSQL</a>)
   <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>
   <li>Build and install the Perl libraries:
     <pre>
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index c3cb51425..d831c59f4 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -154,6 +154,7 @@
         <li>expire - (future) cancellation date
         <li>cancel - (past) cancellation date
         <li>otaker - order taker
+        <li>manual_flag - If this field is set to 1, disables the automatic unsuspensiond of this package when using the <a href="config.html#unsuspendauto">unsuspendauto</a> config file.
       </ul>
     <li><a name="cust_refund" href="man/FS/cust_refund.html">cust_refund</a> - Refunds.  The transfer of money to a customer; equivalent to a negative <a href="#cust_pay">cust_pay</a> record.
       <ul>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index afb84296e..79eb6da3f 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -134,6 +134,7 @@ ALTER TABLE cust_main ADD referral_custnum integer NULL;
 ALTER TABLE cust_pay ADD custnum integer;
 ALTER TABLE cust_pay_batch ADD paybatchnum integer;
 ALTER TABLE cust_refund ADD custnum integer;
+ALTER TABLE cust_pkg ADD manual_flag char(1) NULL;
 CREATE INDEX cust_main3 ON cust_main ( referral_custnum );
 CREATE INDEX cust_credit_bill1 ON cust_credit_bill ( crednum );
 CREATE INDEX cust_credit_bill2 ON cust_credit_bill ( invnum );
-- 
cgit v1.2.1


From 672aab6658cf490d740b49336d16994072a0e506 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Oct 2001 05:24:25 +0000
Subject: embarassing doc fix, thanks jason

---
 FS/FS/Record.pm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 333602c07..a15aaba36 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -65,17 +65,17 @@ FS::Record - Database record objects
 
     $value = $record->unique('column');
 
-    $value = $record->ut_float('column');
-    $value = $record->ut_number('column');
-    $value = $record->ut_numbern('column');
-    $value = $record->ut_money('column');
-    $value = $record->ut_text('column');
-    $value = $record->ut_textn('column');
-    $value = $record->ut_alpha('column');
-    $value = $record->ut_alphan('column');
-    $value = $record->ut_phonen('column');
-    $value = $record->ut_anything('column');
-    $value = $record->ut_name('column');
+    $error = $record->ut_float('column');
+    $error = $record->ut_number('column');
+    $error = $record->ut_numbern('column');
+    $error = $record->ut_money('column');
+    $error = $record->ut_text('column');
+    $error = $record->ut_textn('column');
+    $error = $record->ut_alpha('column');
+    $error = $record->ut_alphan('column');
+    $error = $record->ut_phonen('column');
+    $error = $record->ut_anything('column');
+    $error = $record->ut_name('column');
 
     $dbdef = reload_dbdef;
     $dbdef = reload_dbdef "/non/standard/filename";
@@ -994,7 +994,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.29 2001-09-16 12:45:35 ivan Exp $
+$Id: Record.pm,v 1.30 2001-10-10 05:24:25 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 5424f0aac49ed570bec0fb3c3342c4d2893e737e Mon Sep 17 00:00:00 2001
From: thalakan <thalakan>
Date: Wed, 10 Oct 2001 05:33:43 +0000
Subject: Change to use ut_name instead.

---
 httemplate/search/cust_main.cgi | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 25dbe6964..7aa4021d6 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.6 2001-09-16 12:45:35 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.7 2001-10-10 05:33:43 thalakan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
@@ -9,7 +9,7 @@ use CGI::Carp qw(fatalsToBrowser);
 use IO::Handle;
 use String::Approx qw(amatch);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs dbdef);
+use FS::Record qw(qsearch qsearchs dbdef ut_name);
 use FS::CGI qw(header menubar eidiot popurl table);
 use FS::cust_main;
 use FS::cust_svc;
@@ -250,9 +250,8 @@ sub lastsearch {
     $last_type{$_}++;
   }
 
-  $cgi->param('last_text') =~ /^([\w \,\.\-\']*)$/
-    or eidiot "Illegal last name";
-  my($last)=$1;
+  my $error = ut_name($cgi->param('last_text'));
+  eidiot "Illegal last name" if $error;
 
   if ( $last_type{'Exact'}
        && ! $last_type{'Fuzzy'} 
-- 
cgit v1.2.1


From 38b4a18a459a4fba3c73d4b46b2a08875413fec6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Oct 2001 05:42:19 +0000
Subject: revert silly changes

---
 httemplate/search/cust_main.cgi | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 7aa4021d6..0744744e8 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.7 2001-10-10 05:33:43 thalakan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.8 2001-10-10 05:42:19 ivan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
@@ -9,7 +9,7 @@ use CGI::Carp qw(fatalsToBrowser);
 use IO::Handle;
 use String::Approx qw(amatch);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs dbdef ut_name);
+use FS::Record qw(qsearch qsearchs dbdef);
 use FS::CGI qw(header menubar eidiot popurl table);
 use FS::cust_main;
 use FS::cust_svc;
@@ -250,8 +250,9 @@ sub lastsearch {
     $last_type{$_}++;
   }
 
-  my $error = ut_name($cgi->param('last_text'));
-  eidiot "Illegal last name" if $error;
+  $cgi->param('last_text') =~ /^([\w \,\.\-\']*)$/
+    or eidiot "Illegal last name";
+  my($last)=$1;
 
   if ( $last_type{'Exact'}
        && ! $last_type{'Fuzzy'} 
-- 
cgit v1.2.1


From 5e3669b83521736b7add66986f36f9c3096d187f Mon Sep 17 00:00:00 2001
From: thalakan <thalakan>
Date: Wed, 10 Oct 2001 05:59:36 +0000
Subject: Stupid mistake.  Works now.

---
 httemplate/search/cust_main.cgi | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 0744744e8..0794ad0cb 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.8 2001-10-10 05:42:19 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.9 2001-10-10 05:59:36 thalakan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
@@ -250,9 +250,11 @@ sub lastsearch {
     $last_type{$_}++;
   }
 
-  $cgi->param('last_text') =~ /^([\w \,\.\-\']*)$/
-    or eidiot "Illegal last name";
-  my($last)=$1;
+  my $cust_obj = new FS::cust_main;
+  $cust_obj->setfield('last', $cgi->param('last_text'));
+  my $error = $cust_obj->ut_name('last');
+  eidiot "Illegal last name" if $error;
+  my($last) = $cust_obj->getfield('last');
 
   if ( $last_type{'Exact'}
        && ! $last_type{'Fuzzy'} 
-- 
cgit v1.2.1


From d0470bacdf52171067ccd5bb52d5a4c2993226dc Mon Sep 17 00:00:00 2001
From: thalakan <thalakan>
Date: Wed, 10 Oct 2001 06:22:22 +0000
Subject: Reverted.

---
 httemplate/search/cust_main.cgi | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 0794ad0cb..4a3782194 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.9 2001-10-10 05:59:36 thalakan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.10 2001-10-10 06:22:22 thalakan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
@@ -250,11 +250,9 @@ sub lastsearch {
     $last_type{$_}++;
   }
 
-  my $cust_obj = new FS::cust_main;
-  $cust_obj->setfield('last', $cgi->param('last_text'));
-  my $error = $cust_obj->ut_name('last');
-  eidiot "Illegal last name" if $error;
-  my($last) = $cust_obj->getfield('last');
+  $cgi->param('last_text') =~ /^([\w \,\.\-\']*)$/
+    or eidiot "Illegal last name";
+  my($last)=$1;
 
   if ( $last_type{'Exact'}
        && ! $last_type{'Fuzzy'} 
-- 
cgit v1.2.1


From 5820f3d7ca493e3e6318efe6e8e677b71b01c1ad Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Oct 2001 17:44:33 +0000
Subject: "price plans" UP support.CVS:
 ----------------------------------------------------------------------

---
 httemplate/edit/part_pkg.cgi | 218 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 181 insertions(+), 37 deletions(-)

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 4813fdf8b..b7707f3e8 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,16 +1,18 @@
+<!-- $Id: part_pkg.cgi,v 1.3 2001-10-11 17:44:33 ivan Exp $ -->
+
+<% my $plan = 'flat'; %>
+
+<SCRIPT>
+function visualize(what) {
+  if (document.getElementById) {
+    document.getElementById('d<%= $plan %>').style.visibility = "visible";
+  } else {
+    document.l<%= $plan %>.visibility = "visible";
+  }
+}
+</SCRIPT>
+
 <%
-#<!-- $Id: part_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $part_pkg $action $query $hashref $part_svc $count );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::part_pkg;
-use FS::part_svc;
-use FS::pkg_svc;
-use FS::CGI qw(header menubar popurl);
 
 $cgi = new CGI;
 
@@ -27,9 +29,9 @@ if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
   $cgi->param('pkgnum', '');
 }
 
-($query) = $cgi->keywords;
-$action = '';
-$part_pkg = '';
+my ($query) = $cgi->keywords;
+my $action = '';
+my $part_pkg = '';
 if ( $cgi->param('error') ) {
   $part_pkg = new FS::part_pkg ( {
     map { $_, scalar($cgi->param($_)) } fields('part_pkg')
@@ -46,9 +48,9 @@ if ( $cgi->param('clone') ) {
   $part_pkg ||= new FS::part_pkg {};
 }
 $action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
-$hashref = $part_pkg->hashref;
+my $hashref = $part_pkg->hashref;
 
-print $cgi->header( '-expires' => 'now' ), header("$action Package Definition", menubar(
+print header("$action Package Definition", menubar(
   'Main Menu' => popurl(2),
   'View all packages' => popurl(2). 'browse/part_pkg.cgi',
 ));
@@ -57,24 +59,24 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
   if $cgi->param('error');
 
-print '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>';
-
-if ( $cgi->param('clone') ) {
-  print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
-}
-if ( $cgi->param('pkgnum') ) {
-  print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $cgi->param('pkgnum'), qq!">!;
-}
+#print '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>';
+print '<FORM NAME="dummy">';
 
-print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
-      "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
+#if ( $cgi->param('clone') ) {
+#  print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
+#}
+#if ( $cgi->param('pkgnum') ) {
+#  print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $cgi->param('pkgnum'), qq!">!;
+#}
+#
+#print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
+print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
 
 print <<END;
 <PRE>
 Package (customer-visable)          <INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}">
 Comment (customer-hidden)           <INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}">
-Setup fee for this package          <INPUT TYPE="text" NAME="setup" VALUE="$hashref->{setup}">
-Recurring fee for this package      <INPUT TYPE="text" NAME="recur" VALUE="$hashref->{recur}">
+
 Frequency (months) of recurring fee <INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}">
 
 </PRE>
@@ -89,8 +91,9 @@ Enter the quantity of each service this package includes.<BR><BR>
 END
 }
 
-$count = 0;
-foreach $part_svc ( ( qsearch( 'part_svc', {} ) ) ) {
+my $count = 0;
+my @fixups = ();
+foreach my $part_svc ( ( qsearch( 'part_svc', {} ) ) ) {
   my $svcpart = $part_svc->svcpart;
   my $pkg_svc = qsearchs( 'pkg_svc', {
     'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
@@ -102,6 +105,8 @@ foreach $part_svc ( ( qsearch( 'part_svc', {} ) ) ) {
   });
   #? #next unless $pkg_svc;
 
+  push @fixups, "pkg_svc$svcpart";
+
   unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) {
     print '<TR>' if $count == 0 ;
     print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=3 VALUE="!,
@@ -125,14 +130,153 @@ unless ( $cgi->param('clone') ) {
   print "</TABLE>";
 }
 
+# prolly should be in database
+my %plans = (
+
+  'flat' => {
+    'name' => 'Flat rate',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package' },
+      'recur_fee' => { 'name' => 'Recurring fee for this package' },
+    },
+    'setup' => 'what.setup_fee.value',
+    'recur' => 'what.recur_fee.value',
+  },
+
+  'flat_comission' => {
+    'name' => 'Flat rate with recurring referral comission as credit',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package' },
+      'recur_fee' => { 'name' => 'Recurring fee for this package' },
+      'comission_amount' => { 'name' => 'Comission amount' },
+      'comission_depth' => { 'name' => 'Number of layers' },
+    },
+    'setup' => 'what.setup_fee.value',
+    'recur' => '\'$cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ) ; \' + what.recur_fee.value + \';\'',
+  },
+
+);
+
+%>
+
+<SCRIPT>
+var svcdb = null;
+var something = null;
+
+function changed(what) {
+  layer = what.options[what.selectedIndex].value;
+<% foreach my $layer ( keys %plans ) { %>
+  if (layer == "<%= $layer %>" ) {
+    <% foreach my $not ( grep { $_ ne $layer } keys %plans ) { %>
+      if (document.getElementById) {
+        document.getElementById('d<%= $not %>').style.visibility = "hidden";
+      } else {
+        document.l<%= $not %>.visibility = "hidden";
+      }
+    <% } %>
+    if (document.getElementById) {
+      document.getElementById('d<%= $layer %>').style.visibility = "visible";
+    } else {
+      document.l<%= $layer %>.visibility = "visible";
+    }
+  }
+<% } %>
+}
+
+</SCRIPT>
+<BR>
+Price plan <SELECT NAME="plan" SIZE=1 onChange="changed(this)">
+<% foreach my $layer (keys %plans ) { %>
+<OPTION VALUE="<%= $layer %>"<%= ' SELECTED'x($layer eq $plan) %>><%= $plans{$layer}->{'name'} %>
+<% } %>
+</SELECT></FORM>
+
+<SCRIPT>
+function fchanged(what) {
+  fixup(what.form);
+}
+
+function fixup(what) {
+<% foreach my $f ( qw( pkg comment freq ), @fixups ) { %>
+  what.<%= $f %>.value = document.dummy.<%= $f %>.value;
+<% } %>
+  what.plan.value = document.dummy.plan.options[document.dummy.plan.selectedIndex].value;
+<% foreach my $p ( keys %plans ) { %>
+  if ( what.plan.value == "<%= $p %>" ) {
+    what.setup.value = <%= $plans{$p}->{setup} %>;
+    what.recur.value = <%= $plans{$p}->{recur} %>;
+  }
+<% } %>
+}
+</SCRIPT>
+
+<% #foreach my $layer ( 'konq_kludge', keys %plans ) { 
+   foreach my $layer ( 'konq_kludge', keys %plans ) {
+     my $visibility = "hidden";
+%>
+<SCRIPT>
+if (document.getElementById) {
+    document.write("<DIV ID=\"d<%= $layer %>\" STYLE=\"visibility: <%= $visibility %>; position: absolute\">");
+} else {
+<% $visibility="show" if $visibility eq "visible"; %>
+    document.write("<LAYER ID=\"l<%= $layer %>\" VISIBILITY=\"<%= $visibility %>\">");
+}
+</SCRIPT>
+
+<FORM NAME="<%= $layer %>" ACTION="process/part_pkg.cgi" METHOD=POST onSubmit="fixup(this)">
+<INPUT TYPE="hidden" NAME="plan" VALUE="<%= $plan %>">
+<INPUT TYPE="hidden" NAME="pkg" VALUE="<%= $hashref->{pkg} %>">
+<INPUT TYPE="hidden" NAME="comment" VALUE="$<%= hashref->{comment} %>">
+<INPUT TYPE="hidden" NAME="freq" VALUE="<%= $hashref->{freq} %>">
+<% foreach my $f ( @fixups ) { %>
+<INPUT TYPE="hidden" NAME="<%= $f %>" VALUE="">
+<% } %>
+
+<%
+if ( $cgi->param('clone') ) {
+  print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
+}
+if ( $cgi->param('pkgnum') ) {
+  print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $cgi->param('pkgnum'), qq!">!;
+}
+print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
+%>
+
+<% my $href = $plans{$layer}->{'fields'};
+   foreach my $field ( keys %{ $href } ) { %>
+<%= $href->{$field}{'name'} %>: 
+<INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= $ref->{$field}{'default'} %>" onChange="fchanged(this)"><BR>
+<% } %>
+
+<FONT SIZE="-2">
+Setup expression                    <INPUT TYPE="text" NAME="setup" SIZE="100%" VALUE="<%= $hashref->{setup} %>"><BR>
+Recurring espression                <INPUT TYPE="text" NAME="recur" SIZE="100%" VALUE="<%= $hashref->{recur} %>"><BR>
+</FONT>
+
+<%
 print qq!<BR><INPUT TYPE="submit" VALUE="!,
       $hashref->{pkgpart} ? "Apply changes" : "Add package",
-      qq!">!;
+      qq!" onClick="fchanged(this)">!;
+%>
 
-print <<END;
-    </FORM>
+</FORM>
+
+<SCRIPT>
+if (document.getElementById) {
+  document.write("</DIV>");
+} else {
+  document.write("</LAYER>");
+}
+</SCRIPT>
+
+<% } %>
+
+<TAG onLoad="
+    if (document.getElementById) {
+      document.getElementById('d<%= $plan %>').style.visibility = 'visible';
+    } else {
+      document.l<%= $plan %>.visibility = 'visible';
+    }
+">
   </BODY>
 </HTML>
-END
-
-%>
-- 
cgit v1.2.1


From f8e860c838ee6a59eaefe261fa629825ffbec422 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Oct 2001 17:46:00 +0000
Subject: price plan uI!

---
 htetc/global.asa | 4 +++-
 htetc/handler.pl | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htetc/global.asa b/htetc/global.asa
index 00c6852fb..cb2a28037 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -1,11 +1,13 @@
 use strict;
 use vars qw( $cgi $p );
 use CGI;
-use CGI::Carp qw(fatalsToBrowser);
+#use CGI::Carp qw(fatalsToBrowser);
 use HTML::Entities;
 use FS::UID qw(cgisuidsetup dbh);
 use FS::Record qw(qsearch qsearchs fields);
 use FS::part_svc;
+use FS::part_pkg;
+use FS::pkg_svc;
 use FS::CGI qw(header menubar popurl table);
 
 sub Script_OnStart {
diff --git a/htetc/handler.pl b/htetc/handler.pl
index b6f6c6975..a06ebb180 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -60,6 +60,8 @@ sub handler
       use FS::UID qw(cgisuidsetup);
       use FS::Record qw(qsearch qsearchs fields);
       use FS::part_svc;
+      use FS::part_pkg;
+      use FS::pkg_svc;
       use FS::CGI qw(header menubar popurl table);
 
       $cgi = new CGI;
-- 
cgit v1.2.1


From 87b5424ee8f16f824865cd7dbf1efde8da3bd429 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 12 Oct 2001 15:26:22 +0000
Subject: add (as yet inactive) retry & remove links

---
 httemplate/browse/queue.cgi | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index 86d4a20f1..7a55cf3cf 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: queue.cgi,v 1.1 2001-09-11 04:44:58 ivan Exp $ -->
+#<!-- $Id: queue.cgi,v 1.2 2001-10-12 15:26:22 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p ); # $part_referral );
@@ -35,13 +35,19 @@ foreach my $queue ( sort {
   my($hashref)=$queue->hashref;
   my $args = join(' ', $queue->args);
   my $date = time2str( "%a %b %e %T %Y", $queue->_date );
+  my $status = $hashref->{status};
+  if ( $status eq 'failed' || $status eq 'locked' ) {
+    $status .=
+      qq! ( <A HREF="$p/edit/queue.cgi?jobnum=$jobnum&action=new">retry</A> |!.
+      qq! <A HREF="$p/edit/queue.cgi?jobnum$jobnum&action=del">remove </A> )';
+  }
   print <<END;
       <TR>
         <TD>$hashref->{jobnum}</TD>
         <TD>$hashref->{job}</TD>
         <TD>$args</TD>
         <TD>$date</TD>
-        <TD>$hashref->{status}</TD>
+        <TD>$status</TD>
       </TR>
 END
 
-- 
cgit v1.2.1


From a6d3e4dc73803cffad96fd4b6270b2fb5f4b0568 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 Oct 2001 10:42:29 +0000
Subject: price plans web gui 1st pass, oh my

---
 FS/FS/cust_main.pm                   | 73 ++++++++++++++++++++-------
 FS/FS/part_pkg.pm                    | 12 +++--
 README.1.4.0pre3-4                   |  2 +
 bin/fs-setup                         |  6 ++-
 httemplate/browse/part_pkg.cgi       | 20 ++++++--
 httemplate/docs/config.html          |  3 +-
 httemplate/docs/schema.html          |  6 ++-
 httemplate/docs/upgrade8.html        |  6 ++-
 httemplate/edit/part_pkg.cgi         | 96 ++++++++++++++++++++++--------------
 httemplate/edit/part_svc.cgi         |  3 +-
 httemplate/edit/process/part_pkg.cgi |  9 +++-
 11 files changed, 162 insertions(+), 74 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index d5beca92a..f99a15e69 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -216,10 +216,9 @@ otherwise returns false.
 
 CUST_PKG_HASHREF: If you pass a Tie::RefHash data structure to the insert
 method containing FS::cust_pkg and FS::svc_I<tablename> objects, all records
-are inserted atomicly, or the transaction is rolled back (this requries a 
-transactional database).  Passing an empty hash reference is equivalent to
-not supplying this parameter.  There should be a better explanation of this,
-but until then, here's an example:
+are inserted atomicly, or the transaction is rolled back.  Passing an empty
+hash reference is equivalent to not supplying this parameter.  There should be
+a better explanation of this, but until then, here's an example:
 
   use Tie::RefHash;
   tie %hash, 'Tie::RefHash'; #this part is important
@@ -233,7 +232,7 @@ INVOICING_LIST_ARYREF: If you pass an arrarref to the insert method, it will
 be set as the invoicing list (see L<"invoicing_list">).  Errors return as
 expected and rollback the entire transaction; it is not necessary to call 
 check_invoicing_list first.  The invoicing_list is set after the records in the
-CUST_PKG_HASHREF above are inserted, so it is now possible set set an
+CUST_PKG_HASHREF above are inserted, so it is now possible to set an
 invoicing_list destination to the newly-created svc_acct.  Here's an example:
 
   $cust_main->insert( {}, [ $email, 'POST' ] );
@@ -1216,9 +1215,9 @@ sub collect {
           }
 
           my @invoicing_list = grep { $_ ne 'POST' } $self->invoicing_list;
-          if ( $conf->exists('emailinvoiceonly') ) {
-            @invoicing_list = $self->default_invoicing_list
-              unless @invoicing_list;
+          if ( $conf->exists('emailinvoiceauto')
+               || ( $conf->exists('emailinvoiceonly') && ! @invoicing_list ) ) {
+            push @invoicing_list, $self->default_invoicing_list;
           }
           my $email = $invoicing_list[0];
 
@@ -1467,7 +1466,7 @@ sub apply_payments {
 
   }
 
-  # return 0; 
+  return $self->total_unapplied_payments;
 }
 
 =item total_credited
@@ -1559,15 +1558,17 @@ sub invoicing_list {
     } else {
       @cust_main_invoice = ();
     }
+    my %seen = map { $_->address => 1 } @cust_main_invoice;
     foreach my $address ( @{$arrayref} ) {
-      unless ( grep { $address eq $_->address } @cust_main_invoice ) {
-        my $cust_main_invoice = new FS::cust_main_invoice ( {
-          'custnum' => $self->custnum,
-          'dest'    => $address,
-        } );
-        my $error = $cust_main_invoice->insert;
-        warn $error if $error;
-      } 
+      #unless ( grep { $address eq $_->address } @cust_main_invoice ) {
+      next if exists $seen{$address} && $seen{$address};
+      $seen{$address} = 1;
+      my $cust_main_invoice = new FS::cust_main_invoice ( {
+        'custnum' => $self->custnum,
+        'dest'    => $address,
+      } );
+      my $error = $cust_main_invoice->insert;
+      warn $error if $error;
     }
   }
   if ( $self->custnum ) {
@@ -1603,6 +1604,8 @@ sub check_invoicing_list {
 
 =item default_invoicing_list
 
+Returns the email addresses of any 
+
 =cut
 
 sub default_invoicing_list {
@@ -1647,6 +1650,40 @@ sub referral_cust_main {
   @cust_main;
 }
 
+=item referral_cust_pkg [ DEPTH ]
+
+Like referral_cust_main, except returns a flat list of all unsuspended packages
+for each customer.  The number of items in this list may be useful for
+comission calculations (perhaps after a grep).
+
+=cut
+
+sub referral_cust_pkg {
+  my $self = shift;
+  my $depth = @_ ? shift : 1;
+
+  map { $_->unsuspended_pkgs }
+    grep { $_->unsuspended_pkgs }
+      $self->referral_cust_main($depth);
+}
+
+=item credit AMOUNT, REASON
+
+Applies a credit to this customer.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub credit {
+  my( $self, $amount, $reason ) = @_;
+  my $cust_credit = new FS::cust_credit {
+    'custnum' => $self->custnum,
+    'amount'  => $amount,
+    'reason'  => $reason,
+  };
+  $cust_credit->insert;
+}
+
 =back
 
 =head1 SUBROUTINES
@@ -1788,7 +1825,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.39 2001-10-09 23:10:16 ivan Exp $
+$Id: cust_main.pm,v 1.40 2001-10-15 10:42:28 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index d262a04e0..d84b9c5b7 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -46,11 +46,15 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item comment - Text name of this billing item definition (non-customer-viewable)
 
-=item setup - Setup fee
+=item setup - Setup fee expression
 
 =item freq - Frequency of recurring fee
 
-=item recur - Recurring fee
+=item recur - Recurring fee expression
+
+=item plan - Price plan
+
+=item plandata - Price plan data
 
 =back
 
@@ -128,6 +132,8 @@ sub check {
     || $self->ut_anything('setup')
     || $self->ut_number('freq')
     || $self->ut_anything('recur')
+    || $self->ut_alphan('plan')
+    || $self->ut_anything('plandata')
   ;
 }
 
@@ -166,7 +172,7 @@ sub svcpart {
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.2 1999-08-20 08:27:06 ivan Exp $
+$Id: part_pkg.pm,v 1.3 2001-10-15 10:42:28 ivan Exp $
 
 =head1 BUGS
 
diff --git a/README.1.4.0pre3-4 b/README.1.4.0pre3-4
index 102b57872..49ca5a4d0 100644
--- a/README.1.4.0pre3-4
+++ b/README.1.4.0pre3-4
@@ -14,6 +14,8 @@ CREATE INDEX part_pop_local1 ON part_pop_local ( npa, nxx );
 ALTER TABLE cust_pkg ADD manual_flag char(1) NULL;
 ALTER TABLE cust_pay_batch ADD paybatchnum integer;
 CREATE UNIQUE INDEX cust_pay_batch_pkey ON cust_pay_batch ( paybatchnum );
+ALTER TABLE part_pkg ADD plan varchar NULL;
+ALTER TABLE part_pkg ADD plandata varchar NULL;
 
 Run bin/dbdef-create
 
diff --git a/bin/fs-setup b/bin/fs-setup
index edfc5ff1c..96ec2b74b 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.61 2001-10-09 23:10:17 ivan Exp $
+# $Id: fs-setup,v 1.62 2001-10-15 10:42:28 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -73,7 +73,7 @@ my($char_d) = 80; #default maxlength for text fields
 
 #my(@date_type)  = ( 'timestamp', '', ''     );
 my(@date_type)  = ( 'int', 'NULL', ''     );
-my(@perl_type) = ( 'varchar', 'NULL', 255  ); 
+my(@perl_type) = ( 'varchar', 'NULL', ''  ); 
 my @money_type = ( 'decimal',   '', '10,2' );
 
 ###
@@ -540,6 +540,8 @@ sub tables_hash_hack {
         'setup',      @perl_type,
         'freq',       'int', '', '',  #billing frequency (months)
         'recur',      @perl_type,
+        'plan',       'varchar', 'NULL', '',
+        'plandata',   'varchar', 'NULL', '',
       ],
       'primary_key' => 'pkgpart',
       'unique' => [ [] ],
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 1538a7127..e20ba2404 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_pkg.cgi,v 1.4 2001-09-04 14:44:06 ivan Exp $ -->
+#<!-- $Id: part_pkg.cgi,v 1.5 2001-10-15 10:42:28 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $part_pkg );
@@ -27,9 +27,9 @@ print $cgi->header( '-expires' => 'now' ), header("Package Definition Listing",m
       <TR>
         <TH COLSPAN=2>Package</TH>
         <TH>Comment</TH>
-        <TH><FONT SIZE=-1>Setup Fee</FONT></TH>
         <TH><FONT SIZE=-1>Freq.</FONT></TH>
-        <TH><FONT SIZE=-1>Recur. Fee</FONT></TH>
+        <TH><FONT SIZE=-1>Plan</FONT></TH>
+        <TH><FONT SIZE=-1>Data</FONT></TH>
         <TH>Service</TH>
         <TH><FONT SIZE=-1>Quan.</FONT></TH>
       </TR>
@@ -42,6 +42,16 @@ foreach $part_pkg ( sort {
   my(@pkg_svc)=grep $_->getfield('quantity'),
     qsearch('pkg_svc',{'pkgpart'=> $hashref->{pkgpart} });
   my($rowspan)=scalar(@pkg_svc);
+  my $plandata;
+  if ( $hashref->{plan} ) {
+    $plandata = $hashref->{plandata};
+    $plandata =~ s/^(\w+)=/$1&nbsp;/mg;
+    $plandata =~ s/\n/<BR>/g;
+  } else {
+    $hashref->{plan} = "(legacy)";
+    $plandata = "Setup&nbsp;". $hashref->{setup}.
+                "<BR>Recur&nbsp;". $hashref->{recur};
+  }
   print <<END;
       <TR>
         <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">
@@ -49,9 +59,9 @@ foreach $part_pkg ( sort {
         </A></TD>
         <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">$hashref->{pkg}</A></TD>
         <TD ROWSPAN=$rowspan>$hashref->{comment}</TD>
-        <TD ROWSPAN=$rowspan>$hashref->{setup}</TD>
         <TD ROWSPAN=$rowspan>$hashref->{freq}</TD>
-        <TD ROWSPAN=$rowspan>$hashref->{recur}</TD>
+        <TD ROWSPAN=$rowspan>$hashref->{plan}</TD>
+        <TD ROWSPAN=$rowspan>$plandata</TD>
 END
 
   my($pkg_svc);
diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
index 63f6baba9..3c6fe0252 100644
--- a/httemplate/docs/config.html
+++ b/httemplate/docs/config.html
@@ -53,7 +53,8 @@ All further configuration files and directories are located in
   <li><a name="disable_customer_referrals">disable_customer_referrals</a> - The existance of this file will disable new customer-to-customer referrals in the web interface.
   <li><a name="domain"><font color="#ff0000">domain</font></a> - Your domain name.
   <li><a name="editreferrals">editreferrals</a> - The existance of this file will allow you to change the referral of existing customers.
-  <li><a name="emailinvoiceonly">emailinvoiceonly</a>
+  <li><a name="emailinvoiceonly">emailinvoiceonly</a> - Disables postal mail invoices.
+  <li><a name="emailinvoiceauto">emailinvoiceauto</a> - Automatically adds new accounts to the email invoice list upon customer creation.
   <li><a name="erpcdmachines">erpcdmachines</a> - Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd' and `/usr/annex/acp_dialup'.
   <li><a name="hidecancelledpackages">hidecancelledpackages</a> - The existance of this file will prevent cancelled packages from showing up in listings (though they will still be in the database)
   <li><a name="hidecancelledcustomers">hidecancelledcustomers</a> - The existance of this file will prevent customers with only cancelled packages from showing up in listings (though they will still be in the database)
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index d831c59f4..88b4cb2b1 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -193,9 +193,11 @@
         <li>pkgpart - primary key
         <li>pkg - package name
         <li>comment - non-customer visable package comment
-        <li>setup - setup fee
+        <li>setup - setup fee expression
         <li>freq - recurring frequency (months)
-        <li>recur - recurring fee
+        <li>recur - recurring fee expression
+        <li>plan - price plan
+        <li>plandata - additional price plan data
       </ul>
     <li><a name="part_referral" href="man/FS/part_referral.html">part_referral</a> - Referral listing
       <ul>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 79eb6da3f..c317e88c8 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -135,6 +135,8 @@ ALTER TABLE cust_pay ADD custnum integer;
 ALTER TABLE cust_pay_batch ADD paybatchnum integer;
 ALTER TABLE cust_refund ADD custnum integer;
 ALTER TABLE cust_pkg ADD manual_flag char(1) NULL;
+ALTER TABLE part_pkg ADD plan varchar NULL;
+ALTER TABLE part_pkg ADD plandata varchar NULL;
 CREATE INDEX cust_main3 ON cust_main ( referral_custnum );
 CREATE INDEX cust_credit_bill1 ON cust_credit_bill ( crednum );
 CREATE INDEX cust_credit_bill2 ON cust_credit_bill ( invnum );
@@ -223,7 +225,7 @@ CREATE TABLE cust_pay_temp (
 INSERT INTO cust_pay_temp SELECT * from cust_pay;
 DROP TABLE cust_pay;
 ALTER TABLE cust_pay_temp RENAME TO cust_pay;
-CREATE UNIQUE INDEX cust_pay1 ON cust_pay paynum;
+CREATE UNIQUE INDEX cust_pay1 ON cust_pay (paynum);
 CREATE TABLE cust_refund_temp (
   refundnum int primary key,
   custnum int not null,
@@ -238,7 +240,7 @@ CREATE TABLE cust_refund_temp (
 INSERT INTO cust_refund_temp SELECT * from cust_refund;
 DROP TABLE cust_refund;
 ALTER TABLE cust_refund_temp RENAME TO cust_refund;
-CREATE UNIQUE INDEX cust_refund1 ON cust_refund refundnum;
+CREATE UNIQUE INDEX cust_refund1 ON cust_refund (refundnum);
 </pre></font>
 </td><td>
 <font size=-1><pre>
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index b7707f3e8..a4123e137 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,23 +1,7 @@
-<!-- $Id: part_pkg.cgi,v 1.3 2001-10-11 17:44:33 ivan Exp $ -->
-
-<% my $plan = 'flat'; %>
-
-<SCRIPT>
-function visualize(what) {
-  if (document.getElementById) {
-    document.getElementById('d<%= $plan %>').style.visibility = "visible";
-  } else {
-    document.l<%= $plan %>.visibility = "visible";
-  }
-}
-</SCRIPT>
+<!-- $Id: part_pkg.cgi,v 1.4 2001-10-15 10:42:29 ivan Exp $ -->
 
 <%
 
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
 if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
   $cgi->param('clone', $1);
 } else {
@@ -44,16 +28,36 @@ if ( $cgi->param('clone') ) {
   $part_pkg ||= $old_part_pkg->clone;
 } elsif ( $query && $query =~ /^(\d+)$/ ) {
   $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
+  unless ( $part_pkg->plan ) {
+    $part_pkg->plan('flat');
+    $part_pkg->plandata("setup=". $part_pkg->setup. "\n".
+                        "recur=". $part_pkg->recur. "\n");
+  }
 } else {
   $part_pkg ||= new FS::part_pkg {};
+  $part_pkg->plan('flat');
 }
 $action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
 my $hashref = $part_pkg->hashref;
 
+%>
+
+<SCRIPT>
+function visualize(what) {
+  if (document.getElementById) {
+    document.getElementById('d<%= $part_pkg->plan %>').style.visibility = "visible";
+  } else {
+    document.l<%= $part_pkg->plan %>.visibility = "visible";
+  }
+}
+</SCRIPT>
+
+<% 
+
 print header("$action Package Definition", menubar(
   'Main Menu' => popurl(2),
   'View all packages' => popurl(2). 'browse/part_pkg.cgi',
-));
+), ' onLoad="visualize()"');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
@@ -136,8 +140,12 @@ my %plans = (
   'flat' => {
     'name' => 'Flat rate',
     'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package' },
-      'recur_fee' => { 'name' => 'Recurring fee for this package' },
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                      },
     },
     'setup' => 'what.setup_fee.value',
     'recur' => 'what.recur_fee.value',
@@ -146,13 +154,21 @@ my %plans = (
   'flat_comission' => {
     'name' => 'Flat rate with recurring referral comission as credit',
     'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package' },
-      'recur_fee' => { 'name' => 'Recurring fee for this package' },
-      'comission_amount' => { 'name' => 'Comission amount' },
-      'comission_depth' => { 'name' => 'Number of layers' },
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                     },
+      'comission_amount' => { 'name' => 'Comission amount',
+                              'default' => 0,
+                            },
+      'comission_depth'  => { 'name' => 'Number of layers',
+                              'default' => 1,
+                            },
     },
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'$cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ) ; \' + what.recur_fee.value + \';\'',
+    'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
   },
 
 );
@@ -160,8 +176,7 @@ my %plans = (
 %>
 
 <SCRIPT>
-var svcdb = null;
-var something = null;
+var layer = null;
 
 function changed(what) {
   layer = what.options[what.selectedIndex].value;
@@ -185,9 +200,10 @@ function changed(what) {
 
 </SCRIPT>
 <BR>
-Price plan <SELECT NAME="plan" SIZE=1 onChange="changed(this)">
+Price plan <SELECT NAME="plan" SIZE=1 onChange="changed(this);">
+<OPTION>
 <% foreach my $layer (keys %plans ) { %>
-<OPTION VALUE="<%= $layer %>"<%= ' SELECTED'x($layer eq $plan) %>><%= $plans{$layer}->{'name'} %>
+<OPTION VALUE="<%= $layer %>"<%= ' SELECTED'x($layer eq $part_pkg->plan) %>><%= $plans{$layer}->{'name'} %>
 <% } %>
 </SELECT></FORM>
 
@@ -197,6 +213,7 @@ function fchanged(what) {
 }
 
 function fixup(what) {
+alert(what);
 <% foreach my $f ( qw( pkg comment freq ), @fixups ) { %>
   what.<%= $f %>.value = document.dummy.<%= $f %>.value;
 <% } %>
@@ -210,7 +227,9 @@ function fixup(what) {
 }
 </SCRIPT>
 
-<% #foreach my $layer ( 'konq_kludge', keys %plans ) { 
+<% my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
+                    split("\n", $part_pkg->plandata );
+   #foreach my $layer ( 'konq_kludge', keys %plans ) { 
    foreach my $layer ( 'konq_kludge', keys %plans ) {
      my $visibility = "hidden";
 %>
@@ -224,9 +243,9 @@ if (document.getElementById) {
 </SCRIPT>
 
 <FORM NAME="<%= $layer %>" ACTION="process/part_pkg.cgi" METHOD=POST onSubmit="fixup(this)">
-<INPUT TYPE="hidden" NAME="plan" VALUE="<%= $plan %>">
+<INPUT TYPE="hidden" NAME="plan" VALUE="<%= $part_pkg->plan %>">
 <INPUT TYPE="hidden" NAME="pkg" VALUE="<%= $hashref->{pkg} %>">
-<INPUT TYPE="hidden" NAME="comment" VALUE="$<%= hashref->{comment} %>">
+<INPUT TYPE="hidden" NAME="comment" VALUE="$<%= $hashref->{comment} %>">
 <INPUT TYPE="hidden" NAME="freq" VALUE="<%= $hashref->{freq} %>">
 <% foreach my $f ( @fixups ) { %>
 <INPUT TYPE="hidden" NAME="<%= $f %>" VALUE="">
@@ -245,12 +264,13 @@ print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
 <% my $href = $plans{$layer}->{'fields'};
    foreach my $field ( keys %{ $href } ) { %>
 <%= $href->{$field}{'name'} %>: 
-<INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= $ref->{$field}{'default'} %>" onChange="fchanged(this)"><BR>
+<INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= exists($plandata{$field}) ? $plandata{$field} : $href->{$field}{'default'} %>" onChange="fchanged(this)"><BR>
 <% } %>
+<INPUT TYPE="hidden" NAME="plandata" VALUE="<%= join(',', keys %{ $href } ) %>">
 
-<FONT SIZE="-2">
-Setup expression                    <INPUT TYPE="text" NAME="setup" SIZE="100%" VALUE="<%= $hashref->{setup} %>"><BR>
-Recurring espression                <INPUT TYPE="text" NAME="recur" SIZE="100%" VALUE="<%= $hashref->{recur} %>"><BR>
+<FONT SIZE="1">
+Setup expression<BR><INPUT TYPE="text" NAME="setup" SIZE="160" VALUE="<%= $hashref->{setup} %>" onLoad="fchanged(this)"><BR>
+Recurring espression<BR><INPUT TYPE="text" NAME="recur" SIZE="160" VALUE="<%= $hashref->{recur} %>" onLoad="fchanged(this)"><BR>
 </FONT>
 
 <%
@@ -273,9 +293,9 @@ if (document.getElementById) {
 
 <TAG onLoad="
     if (document.getElementById) {
-      document.getElementById('d<%= $plan %>').style.visibility = 'visible';
+      document.getElementById('d<%= $part_pkg->plan %>').style.visibility = 'visible';
     } else {
-      document.l<%= $plan %>.visibility = 'visible';
+      document.l<%= $part_pkg->plan %>.visibility = 'visible';
     }
 ">
   </BODY>
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 7797230e8..29778567e 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.11 2001-09-11 19:16:41 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.12 2001-10-15 10:42:29 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -65,7 +65,6 @@ blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
 <BR><BR>
 <SCRIPT>
 var svcdb = null;
-var something = null;
 function changed(what) {
   svcdb = what.options[what.selectedIndex].value;
 <% foreach my $svcdb ( qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www ) ) { %>
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 5850599c8..6cfaa122e 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: part_pkg.cgi,v 1.3 2001-10-15 10:42:29 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $pkgpart $old $new $part_svc $error $dbh );
@@ -19,6 +19,13 @@ $pkgpart = $cgi->param('pkgpart');
 
 $old = qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
 
+#fixup plandata
+my $plandata = $cgi->param('plandata');
+my @plandata = split(',', $plandata);
+$cgi->param('plandata', 
+  join('', map { "$_=". $cgi->param($_). "\n" } @plandata )
+);
+
 $new = new FS::part_pkg ( {
   map {
     $_, scalar($cgi->param($_));
-- 
cgit v1.2.1


From 847206208c6ef5c4eb612f26d3b5c8c2c7716545 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 Oct 2001 11:35:28 +0000
Subject: visual fix

---
 httemplate/edit/cust_main.cgi | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 4711cf587..d271dad46 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.6 2001-09-27 21:12:15 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.7 2001-10-15 11:35:28 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -408,7 +408,9 @@ unless ( $custnum ) {
 
   if ( @part_pkg ) {
 
-    print "<BR><BR>First package", &itable("#cccccc", "0 ALIGN=LEFT"), #apiabuse
+#    print "<BR><BR>First package", &itable("#cccccc", "0 ALIGN=LEFT"),
+#apiabuse & undesirable wrapping
+    print "<BR><BR>First package", &itable("#cccccc"),
           qq!<TR><TD COLSPAN=2><SELECT NAME="pkgpart_svcpart">!;
 
     print qq!<OPTION VALUE="">(none)!;
@@ -444,7 +446,7 @@ END
 
 $otaker = $cust_main->otaker;
 print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!,
-      qq!<BR><BR><INPUT TYPE="submit" VALUE="!,
+      qq!<BR><INPUT TYPE="submit" VALUE="!,
       $custnum ?  "Apply Changes" : "Add Customer", qq!">!,
       "</FORM></BODY></HTML>",
 ;
-- 
cgit v1.2.1


From 05eafa5ab3ded207d716685b32edf6946187514a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 Oct 2001 11:39:29 +0000
Subject: remove errant javascript alert() plan ||= 'flat' for custom pricing
 9clone) package definitions too

---
 httemplate/edit/part_pkg.cgi | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index a4123e137..5eccc1e1e 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_pkg.cgi,v 1.4 2001-10-15 10:42:29 ivan Exp $ -->
+<!-- $Id: part_pkg.cgi,v 1.5 2001-10-15 11:39:29 ivan Exp $ -->
 
 <%
 
@@ -28,15 +28,15 @@ if ( $cgi->param('clone') ) {
   $part_pkg ||= $old_part_pkg->clone;
 } elsif ( $query && $query =~ /^(\d+)$/ ) {
   $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
-  unless ( $part_pkg->plan ) {
-    $part_pkg->plan('flat');
-    $part_pkg->plandata("setup=". $part_pkg->setup. "\n".
-                        "recur=". $part_pkg->recur. "\n");
-  }
 } else {
   $part_pkg ||= new FS::part_pkg {};
   $part_pkg->plan('flat');
 }
+unless ( $part_pkg->plan ) { #backwards-compat
+  $part_pkg->plan('flat');
+  $part_pkg->plandata("setup=". $part_pkg->setup. "\n".
+                      "recur=". $part_pkg->recur. "\n");
+}
 $action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
 my $hashref = $part_pkg->hashref;
 
@@ -213,7 +213,6 @@ function fchanged(what) {
 }
 
 function fixup(what) {
-alert(what);
 <% foreach my $f ( qw( pkg comment freq ), @fixups ) { %>
   what.<%= $f %>.value = document.dummy.<%= $f %>.value;
 <% } %>
-- 
cgit v1.2.1


From a984fa561b6493ae41215c3d26013767f9ce79cb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 Oct 2001 12:16:42 +0000
Subject: print reasons with credits on invoices

use straight eval, not Safe::reval in cust_main::bill for now, as i have no
  idea how to call methods on a share()'ed scalar.  hmm.

add cust_pkg::cust_main method

s/eidiot/idiot/ in httemplate/misc/bill.cgi
---
 FS/FS/cust_bill.pm       |  8 ++++++--
 FS/FS/cust_main.pm       | 20 +++++++++++---------
 FS/FS/cust_pkg.pm        | 23 ++++++++++++++++-------
 httemplate/misc/bill.cgi | 40 +++++++++++++++++++++++-----------------
 4 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index f61137f54..b65df89c4 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -389,8 +389,12 @@ sub print_text {
 
     #something more elaborate if $_->amount ne $_->cust_credit->credited ?
 
+    my $reason = substr($_->cust_credit->reason,0,32);
+    $reason .= '...' if length($reason) < length($_->cust_credit->reason);
+    $reason = " ($reason) " if $reason;
     push @buf,[
-      "Credit #". $_->crednum. " (". time2str("%x",$_->cust_credit->_date) .")",
+      "Credit #". $_->crednum. " (". time2str("%x",$_->cust_credit->_date) .")".
+        $reason,
       $money_char. sprintf("%10.2f",$_->amount)
     ];
   }
@@ -489,7 +493,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.11 2001-09-03 22:07:38 ivan Exp $
+$Id: cust_bill.pm,v 1.12 2001-10-15 12:16:41 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index f99a15e69..dce73c0ba 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -843,10 +843,11 @@ sub bill {
       };
       $setup_prog = $1;
 
-      my $cpt = new Safe;
-      #$cpt->permit(); #what is necessary?
-      $cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
-      $setup = $cpt->reval($setup_prog);
+        #my $cpt = new Safe;
+        ##$cpt->permit(); #what is necessary?
+        #$cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
+        #$setup = $cpt->reval($setup_prog);
+      $setup = eval $setup_prog;
       unless ( defined($setup) ) {
         $dbh->rollback if $oldAutoCommit;
         return "Error reval-ing part_pkg->setup pkgpart ". $part_pkg->pkgpart.
@@ -871,10 +872,11 @@ sub bill {
       };
       $recur_prog = $1;
 
-      my $cpt = new Safe;
-      #$cpt->permit(); #what is necessary?
-      $cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
-      $recur = $cpt->reval($recur_prog);
+        #my $cpt = new Safe;
+        ##$cpt->permit(); #what is necessary?
+        #$cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
+        #$recur = $cpt->reval($recur_prog);
+      $recur = eval $recur_prog;
       unless ( defined($recur) ) {
         $dbh->rollback if $oldAutoCommit;
         return "Error reval-ing part_pkg->recur pkgpart ".
@@ -1825,7 +1827,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.40 2001-10-15 10:42:28 ivan Exp $
+$Id: cust_main.pm,v 1.41 2001-10-15 12:16:42 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 1bcf74f78..cbf4ae50d 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -115,8 +115,7 @@ sub insert {
   my $error = $self->ut_number('custnum');
   return $error if $error;
 
-  return "Unknown customer ". $self->custnum
-    unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+  return "Unknown customer ". $self->custnum unless $self->cust_main;
 
   $self->SUPER::insert;
 
@@ -189,8 +188,7 @@ sub check {
   return $error if $error;
 
   if ( $self->custnum ) { 
-    return "Unknown customer"
-      unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+    return "Unknown customer ". $self->custnum unless $self->cust_main;
   }
 
   return "Unknown pkgpart"
@@ -433,6 +431,17 @@ sub labels {
   map { [ $_->label ] } qsearch ( 'cust_svc', { 'pkgnum' => $self->pkgnum } );
 }
 
+=item cust_main
+
+Returns the parent customer object (see L<FS::cust_main>).
+
+=cut
+
+sub cust_main {
+  my $self = shift;
+  qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+}
+
 =back
 
 =head1 SUBROUTINES
@@ -576,7 +585,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.9 2001-10-09 23:10:16 ivan Exp $
+$Id: cust_pkg.pm,v 1.10 2001-10-15 12:16:42 ivan Exp $
 
 =head1 BUGS
 
@@ -598,8 +607,8 @@ moved to check ?
 
 =head1 SEE ALSO
 
-L<FS::Record>, L<FS::cust_main>, L<FS::part_pkg>, L<FS::cust_svc>
-, L<FS::pkg_svc>, schema.html from the base documentation
+L<FS::Record>, L<FS::cust_main>, L<FS::part_pkg>, L<FS::cust_svc>,
+L<FS::pkg_svc>, schema.html from the base documentation
 
 =cut
 
diff --git a/httemplate/misc/bill.cgi b/httemplate/misc/bill.cgi
index 43c7c576d..48da25562 100755
--- a/httemplate/misc/bill.cgi
+++ b/httemplate/misc/bill.cgi
@@ -1,12 +1,13 @@
 <%
-#<!-- $Id: bill.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
+#<!-- $Id: bill.cgi,v 1.4 2001-10-15 12:16:42 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $cust_main $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl eidiot);
+#use FS::CGI qw(popurl eidiot);
+use FS::CGI qw(popurl idiot);
 use FS::Record qw(qsearchs);
 use FS::cust_main;
 
@@ -23,19 +24,24 @@ die "Can't find customer!\n" unless $cust_main;
 $error = $cust_main->bill(
 #                          'time'=>$time
                          );
-&eidiot($error) if $error;
-
-$cust_main->apply_payments;
-$cust_main->apply_credits;
-
-$error = $cust_main->collect(
-#                             'invoice-time'=>$time,
-#                             'batch_card'=> 'yes',
-                             'batch_card'=> 'no',
-                             'report_badcard'=> 'yes',
-                            );
-&eidiot($error) if $error;
-
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum");
-
+#&eidiot($error) if $error;
+
+unless ( $error ) {
+  $cust_main->apply_payments;
+  $cust_main->apply_credits;
+
+  $error = $cust_main->collect(
+  #                             'invoice-time'=>$time,
+  #                             'batch_card'=> 'yes',
+                               'batch_card'=> 'no',
+                               'report_badcard'=> 'yes',
+                              );
+}
+#&eidiot($error) if $error;
+
+if ( $error ) {
+  &idiot($error);
+} else {
+  print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum");
+}
 %>
-- 
cgit v1.2.1


From 9410e9f656b950a9d4b383a3992fa50bb7a270db Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 Oct 2001 14:58:03 +0000
Subject: date editing

---
 FS/FS/cust_pkg.pm                         | 11 +++--
 htetc/global.asa                          |  6 ++-
 htetc/handler.pl                          |  6 ++-
 httemplate/edit/REAL_cust_pkg.cgi         | 81 +++++++++++++++++++++++++++++++
 httemplate/edit/process/REAL_cust_pkg.cgi | 20 ++++++++
 httemplate/view/cust_pkg.cgi              | 27 +++++++++--
 6 files changed, 140 insertions(+), 11 deletions(-)
 create mode 100755 httemplate/edit/REAL_cust_pkg.cgi
 create mode 100755 httemplate/edit/process/REAL_cust_pkg.cgi

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index cbf4ae50d..069ac8cf7 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -157,9 +157,12 @@ sub replace {
 
   #return "Can't (yet?) change pkgpart!" if $old->pkgpart != $new->pkgpart;
   return "Can't change otaker!" if $old->otaker ne $new->otaker;
-  return "Can't change setup once it exists!"
-    if $old->getfield('setup') &&
-       $old->getfield('setup') != $new->getfield('setup');
+
+  #allow this *sigh*
+  #return "Can't change setup once it exists!"
+  #  if $old->getfield('setup') &&
+  #     $old->getfield('setup') != $new->getfield('setup');
+
   #some logic for bill, susp, cancel?
 
   $new->SUPER::replace($old);
@@ -585,7 +588,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.10 2001-10-15 12:16:42 ivan Exp $
+$Id: cust_pkg.pm,v 1.11 2001-10-15 14:58:03 ivan Exp $
 
 =head1 BUGS
 
diff --git a/htetc/global.asa b/htetc/global.asa
index cb2a28037..c3393ad67 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -3,12 +3,16 @@ use vars qw( $cgi $p );
 use CGI;
 #use CGI::Carp qw(fatalsToBrowser);
 use HTML::Entities;
+use Date::Format;
+use Date::Parse;
 use FS::UID qw(cgisuidsetup dbh);
 use FS::Record qw(qsearch qsearchs fields);
 use FS::part_svc;
 use FS::part_pkg;
 use FS::pkg_svc;
-use FS::CGI qw(header menubar popurl table);
+use FS::cust_pkg;
+use FS::cust_svc;
+use FS::CGI qw(header menubar popurl table ntable);
 
 sub Script_OnStart {
   $cgi = new CGI;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index a06ebb180..d747fe464 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -57,12 +57,16 @@ sub handler
       use vars qw( $cgi $p );
       use CGI;
       #use CGI::Carp qw(fatalsToBrowser);
+      use Date::Format;
+      use Date::Parse;
       use FS::UID qw(cgisuidsetup);
       use FS::Record qw(qsearch qsearchs fields);
       use FS::part_svc;
       use FS::part_pkg;
       use FS::pkg_svc;
-      use FS::CGI qw(header menubar popurl table);
+      use FS::cust_pkg;
+      use FS::cust_svc;
+      use FS::CGI qw(header menubar popurl table ntable);
 
       $cgi = new CGI;
       &cgisuidsetup($cgi);
diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
new file mode 100755
index 000000000..8ea0e084d
--- /dev/null
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -0,0 +1,81 @@
+<%
+# <!-- $Id: REAL_cust_pkg.cgi,v 1.1 2001-10-15 14:58:03 ivan Exp $ -->
+
+my $error ='';
+my $pkgnum = '';
+if ( $cgi->param('error') ) {
+  $error = $cgi->param('error');
+  $pkgnum = $cgi->param('pkgnum');
+} else {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/ or die "no pkgnum";
+  $pkgnum = $1;
+}
+
+#get package record
+my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+die "No package!" unless $cust_pkg;
+my $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
+
+if ( $error ) {
+  #$cust_pkg->$_(str2time($cgi->param($_)) foreach qw(setup bill);
+  $cust_pkg->setup(str2time($cgi->param('setup')));
+  $cust_pkg->bill(str2time($cgi->param('bill')));
+}
+
+#my $custnum = $cust_pkg->getfield('custnum');
+print header('Package Edit'); #, menubar(
+#  "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum",
+#  'Main Menu' => popurl(2)
+#));
+
+#print info
+my($susp,$cancel,$expire)=(
+  $cust_pkg->getfield('susp'),
+  $cust_pkg->getfield('cancel'),
+  $cust_pkg->getfield('expire'),
+);
+my($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment'));
+my($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
+my $otaker = $cust_pkg->getfield('otaker');
+
+print '<FORM NAME="formname" ACTION="process/REAL_cust_pkg.cgi" METHOD="POST">',      qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT>!
+  if $error;
+
+print &ntable("#cccccc"), '<TR><TD>', &ntable("#cccccc",2),
+      '<TR><TD ALIGN="right">Package number</TD><TD BGCOLOR="#ffffff">',
+      $pkgnum, '</TD></TR>',
+      '<TR><TD ALIGN="right">Package</TD><TD BGCOLOR="#ffffff">',
+      $pkg,  '</TD></TR>',
+      '<TR><TD ALIGN="right">Comment</TD><TD BGCOLOR="#ffffff">',
+      $comment,  '</TD></TR>',
+      '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
+      $otaker,  '</TD></TR>',
+      '<TR><TD ALIGN="right">Setup date</TD><TD>'.
+      '<INPUT TYPE="text" NAME="setup" SIZE=32 VALUE="',
+      ( $setup ? time2str("%c %z (%Z)",$setup) : "" ), '"></TD></TR>',
+      '<TR><TD ALIGN="right">Next bill date</TD><TD>',
+      '<INPUT TYPE="text" NAME="bill" SIZE=32 VALUE="',
+      ( $bill ? time2str("%c %z (%Z)",$bill) : "" ), '"></TD></TR>',
+;
+
+print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
+       time2str("%D",$susp), '</TD></TR>'
+  if $susp;
+
+print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
+       time2str("%D",$expire), '</TD></TR>'
+  if $expire;
+
+print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
+       time2str("%D",$cancel), '</TD></TR>'
+  if $cancel;
+
+%>
+</TABLE></TD></TR></TABLE>'.
+<BR><INPUT TYPE="submit" VALUE="Apply Changes">
+</FORM>
+</BODY>
+</HTML>
diff --git a/httemplate/edit/process/REAL_cust_pkg.cgi b/httemplate/edit/process/REAL_cust_pkg.cgi
new file mode 100755
index 000000000..4f33f6b38
--- /dev/null
+++ b/httemplate/edit/process/REAL_cust_pkg.cgi
@@ -0,0 +1,20 @@
+<%
+#<!-- $Id: REAL_cust_pkg.cgi,v 1.1 2001-10-15 14:58:03 ivan Exp $ -->
+
+my $pkgnum = $cgi->param('pkgnum') or die;
+my $old = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+my %hash = $old->hash;
+$hash{'setup'} = $cgi->param('setup') ? str2time($cgi->param('setup')) : '';
+$hash{'bill'} = $cgi->param('bill') ? str2time($cgi->param('bill')) : '';
+my $new = new FS::cust_pkg \%hash;
+
+my $error = $new->replace($old);
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "REAL_cust_pkg.cgi?". $cgi->query_string );
+} else { 
+  print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?". $pkgnum);
+}
+
+%>
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index b354318d4..6dd1d2455 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_pkg.cgi,v 1.2 2001-08-21 02:31:57 ivan Exp $ -->
+# <!-- $Id: cust_pkg.cgi,v 1.3 2001-10-15 14:58:03 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi %uiview %uiadd $part_svc $query $pkgnum $cust_pkg $part_pkg
@@ -50,13 +50,30 @@ print $cgi->header( '-expires' => 'now' ), header('Package View', menubar(
 ($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
 $otaker = $cust_pkg->getfield('otaker');
 
+print <<END;
+<SCRIPT>
+function areyousure(href) {
+    if (confirm("Permanantly delete included services and cancel this package?") == true)
+        window.location.href = href;
+}
+</SCRIPT>
+END
+
 print "Package information";
 print ' (<A HREF="'. popurl(2). 'misc/unsusp_pkg.cgi?'. $pkgnum.
-      '">unsuspend</A>)' if ( $susp && ! $cancel );
+      '">unsuspend</A>)'
+  if ( $susp && ! $cancel );
+
 print ' (<A HREF="'. popurl(2). 'misc/susp_pkg.cgi?'. $pkgnum.
-      '">suspend</A>)' unless ( $susp || $cancel );
-print ' (<A HREF="'. popurl(2). 'misc/cancel_pkg.cgi?'. $pkgnum.
-      '">cancel</A>)' unless $cancel;
+      '">suspend</A>)'
+  unless ( $susp || $cancel );
+
+print ' (<A HREF="javascript:areyousure(\''. popurl(2). 'misc/cancel_pkg.cgi?'.
+      $pkgnum.  '\')">cancel</A>)'
+  unless $cancel;
+
+print ' (<A HREF="'. popurl(2). 'edit/REAL_cust_pkg.cgi?'. $pkgnum.
+      '">edit dates</A>)';
 
 print &ntable("#cccccc"), '<TR><TD>', &ntable("#cccccc",2),
       '<TR><TD ALIGN="right">Package number</TD><TD BGCOLOR="#ffffff">',
-- 
cgit v1.2.1


From fcb5658290eb457f0b2493b405c152a9cc1ad5a4 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 16 Oct 2001 20:33:02 +0000
Subject: added slipip insertion for icradius and  vpopmail restart config

---
 bin/svc_acct.export | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 3b8853bb0..bc27f7f02 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.24 2001-09-11 22:20:28 ivan Exp $
+# $Id: svc_acct.export,v 1.25 2001-10-16 20:33:02 jeff Exp $
 #
 # Create and export password, radius and vpopmail password files:
 # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
@@ -48,7 +48,7 @@ my @radiusmachines = $conf->config('radiusmachines')
 my $icradiusmachines = $conf->exists('icradiusmachines');
 my @icradiusmachines = $conf->config('icradiusmachines') if $icradiusmachines;
 my $icradius_mysqldest =
-  $conf->config('icradius_mysqldest') || "/usr/local/var/"
+  $conf->config('icradius_mysqldest') || "/usr/local/var"
     if $icradiusmachines;
 my $icradius_mysqlsource =
   $conf->config('icradius_mysqlsource') || "/usr/local/var/freeside"
@@ -70,8 +70,11 @@ warn "using depriciated textradiusprepend file" if $textradiusprepend;
 
 my @vpopmailmachines = $conf->config('vpopmailmachines')
   if $conf->exists('vpopmailmachines');
+my $vpopmailrestart = '';
+$vpopmailrestart = $conf->config('vpopmailrestart')
+  if $conf->exists('vpopmailrestart');
 
-my ($machine, $vpopdir, $vpopuid, $vpopgid) = split (/\s+/, $vpopmailmachines[0]);
+my ($machine, $vpopdir, $vpopuid, $vpopgid) = split (/\s+/, $vpopmailmachines[0]) if $vpopmailmachines[0];
 
 my($shellmachine, @qmailmachines);
 if ( $conf->exists('qmailmachines') ) {
@@ -209,7 +212,7 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) {
     "-",
     "",
     "",
-  ), "\n";
+  ), "\n" if $vpopmailmachines[0];
 
   (mkdir "$spooldir/domains/" . $domain, 0700)
     or die "Can't create $spooldir/domains/" . $domain .": $!";
@@ -224,7 +227,7 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) {
 
   my ($svc_acct);
 
-  if ($svc_domain->catchall) {
+  if ($svc_domain->getfield('catchall')) {
     $svc_acct = qsearchs('svc_acct', {'svcnum' => $svc_domain->catchall});
     die "Cannot find catchall account for domain $domain\n" unless $svc_acct;
 
@@ -236,12 +239,14 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) {
 
     ###
     # FORMAT OF THE .QMAIL-DEFAULT FILE HERE
-    print QMAILDEFAULT "| $vpopdir/bin/vdelivermail \"\" $username\@$domain\n";
+    print QMAILDEFAULT "| $vpopdir/bin/vdelivermail \"\" " . $svc_acct->email . "\n"
+      if $vpopmailmachines[0];
 
   }else{
     ###
     # FORMAT OF THE .QMAIL-DEFAULT FILE HERE
-    print QMAILDEFAULT "| $vpopdir/bin/vdelivermail \"\" bounce-no-mailbox\n";
+    print QMAILDEFAULT "| $vpopdir/bin/vdelivermail \"\" bounce-no-mailbox\n"
+      if $vpopmailmachines[0];
   }
 
   print VPOPVIRTUALDOMAINS "$domain:$domain\n";
@@ -427,6 +432,18 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) {
             ) ). " )"
           );
           $sth->execute or die "Can't insert into radreply table: ". $sth->errstr;      }
+  
+        if ( $ip && $ip ne '0e0' ) {
+          my $sth = $icradius_dbh->prepare(
+            "INSERT INTO radreply (id, UserName, Attribute, Value) VALUES ( ".
+            join(", ", map { $icradius_dbh->quote( $_ ) } (
+              '',
+              $username,
+              'Framed-IP-Address',
+              $ip,
+            ) ). " )"
+          );
+          $sth->execute or die "Can't insert into radreply table: ". $sth->errstr;      }
       }
     }
   
@@ -644,6 +661,15 @@ foreach $vpopmailmachine (@vpopmailmachines) {
     or die "scp error: ". $scp->{errstr};
   $scp->scp("$spooldir/vpoprcpthosts","root\@$machine:/var/qmail/control/rcpthosts")
     or die "scp error: ". $scp->{errstr};
+
+  ssh("root\@$machine",
+    "( ".
+      $vpopmailrestart .
+    " )"
+  )
+    == 0 or die "ssh error: $!";
+
+
 }
 
 my($sendmailmachine);
-- 
cgit v1.2.1


From fba31d6a0954ccfbb1d491ec018f0513d2a4ee2a Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Thu, 18 Oct 2001 15:04:54 +0000
Subject: preliminary self administration

---
 fs_selfadmin/FS-MailAdminServer/MailAdminClient.pm | 541 ++++++++++++++++
 fs_selfadmin/FS-MailAdminServer/cgi/mailadmin.cgi  | 698 +++++++++++++++++++++
 fs_selfadmin/FS-MailAdminServer/fs_mailadmind      | 366 +++++++++++
 fs_selfadmin/fs_mailadmin_server                   | 642 +++++++++++++++++++
 4 files changed, 2247 insertions(+)
 create mode 100755 fs_selfadmin/FS-MailAdminServer/MailAdminClient.pm
 create mode 100755 fs_selfadmin/FS-MailAdminServer/cgi/mailadmin.cgi
 create mode 100755 fs_selfadmin/FS-MailAdminServer/fs_mailadmind
 create mode 100755 fs_selfadmin/fs_mailadmin_server

diff --git a/fs_selfadmin/FS-MailAdminServer/MailAdminClient.pm b/fs_selfadmin/FS-MailAdminServer/MailAdminClient.pm
new file mode 100755
index 000000000..46cde4c0d
--- /dev/null
+++ b/fs_selfadmin/FS-MailAdminServer/MailAdminClient.pm
@@ -0,0 +1,541 @@
+package FS::MailAdminClient;
+
+use strict;
+use vars qw($VERSION @ISA @EXPORT_OK $fs_mailadmind_socket);
+use Exporter;
+use Socket;
+use FileHandle;
+use IO::Handle;
+
+$VERSION = '0.01';
+
+@ISA = qw( Exporter );
+@EXPORT_OK = qw( signup_info authenticate list_packages list_mailboxes delete_mailbox password_mailbox add_mailbox list_forwards list_pkg_forwards delete_forward add_forward new_customer );
+
+$fs_mailadmind_socket = "/usr/local/freeside/fs_mailadmind_socket";
+
+$ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin';
+$ENV{'SHELL'} = '/bin/sh';
+$ENV{'IFS'} = " \t\n";
+$ENV{'CDPATH'} = '';
+$ENV{'ENV'} = '';
+$ENV{'BASH_ENV'} = '';
+
+my $freeside_uid = scalar(getpwnam('freeside'));
+die "not running as the freeside user\n" if $> != $freeside_uid;
+
+=head1 NAME
+
+FS::MailAdminClient - Freeside mail administration client API
+
+=head1 SYNOPSIS
+
+  use FS::MailAdminClient qw( signup_info list_mailboxes  new_customer );
+
+  ( $locales, $packages, $pops ) = signup_info;
+
+  ( $accounts ) = list_mailboxes;
+
+  $error = new_customer ( {
+    'first'          => $first,
+    'last'           => $last,
+    'ss'             => $ss,
+    'comapny'        => $company,
+    'address1'       => $address1,
+    'address2'       => $address2,
+    'city'           => $city,
+    'county'         => $county,
+    'state'          => $state,
+    'zip'            => $zip,
+    'country'        => $country,
+    'daytime'        => $daytime,
+    'night'          => $night,
+    'fax'            => $fax,
+    'payby'          => $payby,
+    'payinfo'        => $payinfo,
+    'paydate'        => $paydate,
+    'payname'        => $payname,
+    'invoicing_list' => $invoicing_list,
+    'pkgpart'        => $pkgpart,
+    'username'       => $username,
+    '_password'       => $password,
+    'popnum'         => $popnum,
+  } );
+
+=head1 DESCRIPTION
+
+This module provides an API for a remote mail administration server.
+
+It needs to be run as the freeside user.  Because of this, the program which
+calls these subroutines should be written very carefully.
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item signup_info
+
+Returns three array references of hash references.
+
+The first set of hash references is of allowable locales.  Each hash reference
+has the following keys:
+  taxnum
+  state
+  county
+  country
+
+The second set of hash references is of allowable packages.  Each hash
+reference has the following keys:
+  pkgpart
+  pkg
+
+The third set of hash references is of allowable POPs (Points Of Presence).
+Each hash reference has the following keys:
+  popnum
+  city
+  state
+  ac
+  exch
+
+=cut
+
+sub signup_info {
+  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
+  print SOCK "signup_info\n";
+  SOCK->flush;
+
+  chop ( my $n_cust_main_county = <SOCK> );
+  my @cust_main_county = map {
+    chop ( my $taxnum  = <SOCK> ); 
+    chop ( my $state   = <SOCK> ); 
+    chop ( my $county  = <SOCK> ); 
+    chop ( my $country = <SOCK> );
+    {
+      'taxnum'  => $taxnum,
+      'state'   => $state,
+      'county'  => $county,
+      'country' => $country,
+    };
+  } 1 .. $n_cust_main_county;
+
+  chop ( my $n_part_pkg = <SOCK> );
+  my @part_pkg = map {
+    chop ( my $pkgpart = <SOCK> ); 
+    chop ( my $pkg     = <SOCK> ); 
+    {
+      'pkgpart' => $pkgpart,
+      'pkg'     => $pkg,
+    };
+  } 1 .. $n_part_pkg;
+
+  chop ( my $n_svc_acct_pop = <SOCK> );
+  my @svc_acct_pop = map {
+    chop ( my $popnum = <SOCK> ); 
+    chop ( my $city   = <SOCK> ); 
+    chop ( my $state  = <SOCK> ); 
+    chop ( my $ac     = <SOCK> );
+    chop ( my $exch   = <SOCK> );
+    chop ( my $loc    = <SOCK> );
+    {
+      'popnum' => $popnum,
+      'city'   => $city,
+      'state'  => $state,
+      'ac'     => $ac,
+      'exch'   => $exch,
+      'loc'    => $loc,
+    };
+  } 1 .. $n_svc_acct_pop;
+
+  close SOCK;
+
+  \@cust_main_county, \@part_pkg, \@svc_acct_pop;
+}
+
+=item authenticate
+
+Authentictes against a service on the remote Freeside system.  Requires a hash
+reference as a parameter with the following keys:
+    authuser
+    _password
+
+Returns a scalar error message of the form "authuser OK|FAILED" or an error
+message.
+
+=cut
+
+sub authenticate {
+  my $hashref = shift;
+  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
+  print SOCK "authenticate", "\n";
+  SOCK->flush;
+
+  print SOCK join("\n", map { $hashref->{$_} } qw(
+    authuser _password
+  ) ), "\n";
+  SOCK->flush;
+
+  chop( my $error = <SOCK> );
+  close SOCK;
+
+  $error;
+}
+
+=item list_packages
+
+Returns one array reference of hash references.
+
+The set of hash references is of existing packages.  Each hash reference
+has the following keys:
+  pkgnum
+  domain
+  account
+
+=cut
+
+sub list_packages {
+  my $user = shift;
+  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
+  print SOCK "list_packages\n", $user, "\n";
+  SOCK->flush;
+
+  chop ( my $n_packages = <SOCK> );
+  my @packages = map {
+    chop ( my $pkgnum  = <SOCK> ); 
+    chop ( my $domain  = <SOCK> ); 
+    chop ( my $account = <SOCK> ); 
+    {
+      'pkgnum'  => $pkgnum,
+      'domain'  => $domain,
+      'account' => $account,
+    };
+  } 1 .. $n_packages;
+
+  close SOCK;
+
+  \@packages;
+}
+
+=item list_mailboxes
+
+Returns one array references of hash references.
+
+The set of hash references is of existing accounts.  Each hash reference
+has the following keys:
+  svcnum
+  username
+  _password
+
+=cut
+
+sub list_mailboxes {
+  my ($user, $package) = @_;
+  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
+  print SOCK "list_mailboxes\n", $user, "\n", $package, "\n";
+  SOCK->flush;
+
+  chop ( my $n_svc_acct = <SOCK> );
+  my @svc_acct = map {
+    chop ( my $svcnum  = <SOCK> ); 
+    chop ( my $username  = <SOCK> ); 
+    chop ( my $_password   = <SOCK> ); 
+    {
+      'svcnum'  => $svcnum,
+      'username'  => $username,
+      '_password'   => $_password,
+    };
+  } 1 .. $n_svc_acct;
+
+  close SOCK;
+
+  \@svc_acct;
+}
+
+=item delete_mailbox
+
+Deletes a mailbox service from the remote Freeside system.  Requires a hash
+reference as a paramater with the following keys:
+    authuser
+    account
+
+Returns a scalar error message, or the empty string for success.
+
+=cut
+
+sub delete_mailbox {
+  my $hashref = shift;
+  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
+  print SOCK "delete_mailbox", "\n";
+  SOCK->flush;
+
+  print SOCK join("\n", map { $hashref->{$_} } qw(
+    authuser account
+  ) ), "\n";
+  SOCK->flush;
+
+  chop( my $error = <SOCK> );
+  close SOCK;
+
+  $error;
+}
+
+=item password_mailbox
+
+Changes the password for a mailbox service on the remote Freeside system.
+  Requires a hash reference as a paramater with the following keys:
+    authuser
+    account
+    _password
+
+Returns a scalar error message, or the empty string for success.
+
+=cut
+
+sub password_mailbox {
+  my $hashref = shift;
+  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
+  print SOCK "password_mailbox", "\n";
+  SOCK->flush;
+
+  print SOCK join("\n", map { $hashref->{$_} } qw(
+    authuser account _password
+  ) ), "\n";
+  SOCK->flush;
+
+  chop( my $error = <SOCK> );
+  close SOCK;
+
+  $error;
+}
+
+=item add_mailbox
+
+Creates a mailbox service on the remote Freeside system.  Requires a hash
+reference as a parameter with the following keys:
+    authuser
+    package
+    account
+    _password
+
+Returns a scalar error message, or the empty string for success.
+
+=cut
+
+sub add_mailbox {
+  my $hashref = shift;
+  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
+  print SOCK "add_mailbox", "\n";
+  SOCK->flush;
+
+  print SOCK join("\n", map { $hashref->{$_} } qw(
+    authuser package account _password
+  ) ), "\n";
+  SOCK->flush;
+
+  chop( my $error = <SOCK> );
+  close SOCK;
+
+  $error;
+}
+
+=item list_forwards
+
+Returns one array references of hash references.
+
+The set of hash references is of existing forwards.  Each hash reference
+has the following keys:
+  svcnum
+  dest
+
+=cut
+
+sub list_forwards {
+  my ($user, $service) = @_;
+  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
+  print SOCK "list_forwards\n", $user, "\n", $service, "\n";
+  SOCK->flush;
+
+  chop ( my $n_svc_forward = <SOCK> );
+  my @svc_forward = map {
+    chop ( my $svcnum  = <SOCK> ); 
+    chop ( my $dest  = <SOCK> ); 
+    {
+      'svcnum'  => $svcnum,
+      'dest'  => $dest,
+    };
+  } 1 .. $n_svc_forward;
+
+  close SOCK;
+
+  \@svc_forward;
+}
+
+=item list_pkg_forwards
+
+Returns one array references of hash references.
+
+The set of hash references is of existing forwards.  Each hash reference
+has the following keys:
+  svcnum
+  srcsvc
+  dest
+
+=cut
+
+sub list_pkg_forwards {
+  my ($user, $package) = @_;
+  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
+  print SOCK "list_pkg_forwards\n", $user, "\n", $package, "\n";
+  SOCK->flush;
+
+  chop ( my $n_svc_forward = <SOCK> );
+  my @svc_forward = map {
+    chop ( my $svcnum  = <SOCK> ); 
+    chop ( my $srcsvc  = <SOCK> ); 
+    chop ( my $dest  = <SOCK> ); 
+    {
+      'svcnum'  => $svcnum,
+      'srcsvc'  => $srcsvc,
+      'dest'  => $dest,
+    };
+  } 1 .. $n_svc_forward;
+
+  close SOCK;
+
+  \@svc_forward;
+}
+
+=item delete_forward
+
+Deletes a forward service from the remote Freeside system.  Requires a hash
+reference as a paramater with the following keys:
+    authuser
+    svcnum
+
+Returns a scalar error message, or the empty string for success.
+
+=cut
+
+sub delete_forward {
+  my $hashref = shift;
+  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
+  print SOCK "delete_forward", "\n";
+  SOCK->flush;
+
+  print SOCK join("\n", map { $hashref->{$_} } qw(
+    authuser svcnum
+  ) ), "\n";
+  SOCK->flush;
+
+  chop( my $error = <SOCK> );
+  close SOCK;
+
+  $error;
+}
+
+=item add_forward
+
+Creates a forward service on the remote Freeside system.  Requires a hash
+reference as a parameter with the following keys:
+    authuser
+    package
+    source
+    dest
+
+Returns a scalar error message, or the empty string for success.
+
+=cut
+
+sub add_forward {
+  my $hashref = shift;
+  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
+  print SOCK "add_forward", "\n";
+  SOCK->flush;
+
+  print SOCK join("\n", map { $hashref->{$_} } qw(
+    authuser package source dest
+  ) ), "\n";
+  SOCK->flush;
+
+  chop( my $error = <SOCK> );
+  close SOCK;
+
+  $error;
+}
+
+=item new_customer HASHREF
+
+Adds a customer to the remote Freeside system.  Requires a hash reference as
+a paramater with the following keys:
+  first
+  last
+  ss
+  comapny
+  address1
+  address2
+  city
+  county
+  state
+  zip
+  country
+  daytime
+  night
+  fax
+  payby
+  payinfo
+  paydate
+  payname
+  invoicing_list
+  pkgpart
+  username
+  _password
+  popnum
+
+Returns a scalar error message, or the empty string for success.
+
+=cut
+
+sub new_customer {
+  my $hashref = shift;
+
+  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
+  print SOCK "new_customer\n";
+
+  print SOCK join("\n", map { $hashref->{$_} } qw(
+    first last ss company address1 address2 city county state zip country
+    daytime night fax payby payinfo paydate payname invoicing_list
+    pkgpart username _password popnum
+  ) ), "\n";
+  SOCK->flush;
+
+  chop( my $error = <SOCK> );
+  $error;
+}
+
+=back
+
+=head1 VERSION
+
+$Id: MailAdminClient.pm,v 1.1 2001-10-18 15:04:54 jeff Exp $
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<fs_signupd>, L<FS::SignupServer>, L<FS::cust_main>
+
+=cut
+
+1;
+
diff --git a/fs_selfadmin/FS-MailAdminServer/cgi/mailadmin.cgi b/fs_selfadmin/FS-MailAdminServer/cgi/mailadmin.cgi
new file mode 100755
index 000000000..82002169b
--- /dev/null
+++ b/fs_selfadmin/FS-MailAdminServer/cgi/mailadmin.cgi
@@ -0,0 +1,698 @@
+#!/usr/bin/perl
+########################################################################
+#                                                                      #
+#    mailadmin.cgi                NCI2000                              #
+#                                 Jeff Finucane <jeff@nci2000.net>     #
+#                                 26 April 2001                        #
+#                                                                      #
+########################################################################
+
+use DBI;
+use strict;
+use CGI;
+use FS::TestAdminClient qw(authenticate list_packages list_mailboxes delete_mailbox password_mailbox add_mailbox list_forwards list_pkg_forwards delete_forward add_forward);
+
+my $sessionfile = '/usr/local/apache/htdocs/mailadmin/adminsess';   # session file
+my $tmpdir = '/usr/local/apache/htdocs/mailadmin/tmp';		# Location to store temp files
+my $cookiedomain = ".your.dom";      # domain if THIS server, should prepend with a '.'
+my $cookieexpire = '+12h';              # expire the cookie session after this much idle time
+my $sessexpire = 43200;                 # expire session after this long of no use (in seconds)
+
+my $body = "<body bgcolor=dddddd>";
+
+#### Should not have to change anything under this line ####
+my $printmainpage = 1;
+my $i = 0;
+my $printheader = 1;
+my $query = new CGI;
+my $cgi = $query->url();
+my $now = getdatetime();
+my $current_package = 0;
+my $current_account = 0;
+my $current_domname = "";
+
+# if they are trying to login we wont check the session yet
+if ($query->param('login') eq '' && $query->param('action') ne 'login') {
+  checksession();
+  printheader();
+}
+
+if ($query->param('login') ne '') {
+
+   my $username = $query->param('username');
+   my $password = $query->param('password');
+
+   if (!checkuserpass($username, $password)) {
+      printheader();
+      error('not_admin');
+   }
+
+   my @alpha = ('A'..'Z', 'a'..'z', 0..9);
+   my $sessid = '';
+   for (my $i = 0; $i < 10; $i++) {
+       $sessid .= @alpha[rand(@alpha)];
+   }
+
+   my $cookie1 = $query->cookie(-name=>'username',
+				-value=>$username,
+				-expires=>$cookieexpire,
+				-domain=>$cookiedomain);
+
+   my $cookie2 = $query->cookie(-name=>'ma_sessionid',
+				-value=>$sessid,
+				-expires=>$cookieexpire,
+				-domain=>$cookiedomain);
+
+   my $now = time();
+   open(NEWSESS, ">>$sessionfile") || error('open');
+   print NEWSESS "$username $sessid $now 0 0\n";
+   close(NEWSESS);
+
+   print $query->header(-COOKIE=>[$cookie1, $cookie2]);
+ 
+   $printmainpage = 1;
+
+} elsif ($query->param('action') eq 'blankframe') {
+   
+  print "<html>$body</body></html>\n";
+   $printmainpage = 0;
+
+} elsif ($query->param('action') eq 'list_packages') {
+
+  my $username = $query->cookie(-name=>'username');  # session checked
+  my $list = list_packages($username);
+  print "<html>$body\n";
+  print "<center><table border=0>\n";
+  print "<tr><td></td><td><p>Package Number</td><td><p>Description</td></tr>\n";
+  foreach my $package ( @{$list} ) {
+    print "<tr>";
+    print "<td></td><td><p>$package->{'pkgnum'}</td><td><p>$package->{'domain'}</td>\n";
+    print "<td></td><td><a href=\"$cgi\?action=select&package=$package->{'pkgnum'}&account=$package->{'account'}&domname=$package->{'domain'}\" target=\"rightmainframe\">select</td>\n";
+    print "</tr>";
+  }
+  print "</table>\n";
+  print "</body></html>\n";
+  $printmainpage=0;
+
+} elsif ($query->param('action') eq 'list_mailboxes') {
+
+  my $username = $query->cookie(-name=>'username');  # session checked
+  select_package($username)  unless $current_package;
+  my $list = list_mailboxes($username, $current_package);
+  my $forwardlist = list_pkg_forwards($username, $current_package);
+  print "<html>$body\n";
+  print "<center><table border=0>\n";
+  print "<tr><td></td><td><p>Username</td><td><p>Password</td></tr>\n";
+  foreach my $account ( @{$list} ) {
+    print "<tr>";
+    print "<td></td><td><p>$account->{'username'}</td><td><p>$account->{'_password'}</td>\n";
+    print "<td></td><td><a href=\"$cgi\?action=change&account=$account->{'svcnum'}&mailbox=$account->{'username'}\" target=\"rightmainframe\">change</td>\n";
+    print "</tr>";
+
+#    my $forwardlist = list_forwards($username, $account->{'svcnum'});
+#    foreach my $forward ( @{$forwardlist} ) {
+#      my $label = qq!=> ! . $forward->{'dest'};
+#      print "<tr><td></td><td></td><td><p>$label</td></tr>\n";
+#    }
+    foreach my $forward ( @{$forwardlist} ) {
+      if ($forward->{'srcsvc'} == $account->{'svcnum'}) {
+        my $label = qq!=> ! . $forward->{'dest'};
+        print "<tr><td></td><td></td><td><p>$label</td></tr>\n";
+      }
+    }
+
+  }
+  print "</table>\n";
+  print "</body></html>\n";
+  $printmainpage=0;
+
+} elsif ($query->param('action') eq 'select') {
+
+  my $username = $query->cookie(-name=>'username');  # session checked
+  $current_package = $query->param('package');
+  $current_account = $query->param('account');
+  $current_domname = $query->param('domname');
+  set_package();
+  print "<html>$body\n";
+  print "<form name=form1 action=\"$cgi\" method=post target=\"rightmainframe\">\n";
+  print "<center>\n";
+  print "<p>Selected package $current_package\n";
+  print "</center>\n";
+  print "</form>\n";
+  print "</body></html>\n";
+  $printmainpage=0;
+
+} elsif ($query->param('action') eq 'change') {
+
+  my $username = $query->cookie(-name=>'username');  # session checked
+  select_package($username) unless $current_package;
+  my $account  = $query->param('account');
+  my $mailbox  = $query->param('mailbox');
+  my $list = list_forwards($username, $account);
+  print "<html>$body\n";
+  print "<form name=form1 action=\"$cgi\" method=post target=\"rightmainframe\">\n";
+  print "<center><table border=0>\n";
+  print "<tr><td></td><td><p>Username</td><td><p>$mailbox</td></tr>\n";
+  print "<input type=hidden name=\"account\" value=\"$account\">\n";
+  print "<input type=hidden name=\"mailbox\" value=\"$mailbox\">\n";
+  foreach my $forward ( @{$list} ) {
+    my $label = qq!=> ! . $forward->{'dest'};
+#    print "<tr><td></td><td></td><td><p>$label</td></tr>\n";
+    print "<tr><td></td><td></td><td><p>$label</td><td><a href=\"$cgi\?action=deleteforward&service=$forward->{'svcnum'}&mailbox=$mailbox&dest=$forward->{'dest'}\" target=\"rightmainframe\">remove</td></tr>\n";
+  }
+  print "<tr><td></td><td><p>Password</td><td><input type=text name=\"_password\" value=\"\"></td></tr>\n";
+  print "</table>\n";
+  print "<input type=submit name=\"deleteaccount\" value=\"Delete This User\">\n";
+  print "<input type=submit name=\"changepassword\" value=\"Change The Password\">\n";
+  print "<input type=submit name=\"addforward\" value=\"Add Forwarding\">\n";
+  print "</center>\n";
+  print "</form>\n";
+  print "<br>\n";
+  print "<p> You may delete this user and all mailforwarding by pressing <B>Delete This User</B>.\n";
+  print "<p> To set or change the password for this user, type the new password in the box next to <B>Password</B> and press <B>Change The Password</B>.\n";
+  print "<p> If you would like to have mail destined for this user forwarded to another email address then press the <B>Add Forwarding</B> button.\n";
+  print "</body></html>\n";
+  $printmainpage=0;
+
+} elsif ($query->param('deleteaccount') ne '') {
+
+  my $username = $query->cookie(-name=>'username');  # session checked
+  select_package($username) unless $current_package;
+  my $account  = $query->param('account');
+  my $mailbox  = $query->param('mailbox');
+  print "<html>$body\n";
+  print "<form name=form1 action=\"$cgi\" method=post target=\"rightmainframe\">\n";
+  print "<p>Are you certain you want to delete user $mailbox?\n";
+  print "<p><input type=hidden name=\"account\" value=\"$account\">\n";
+  print "<input type=submit name=\"deleteaccounty\" value=\"Confirm\">\n";
+  print "</body></html>\n";
+  $printmainpage=0;
+
+} elsif ($query->param('deleteaccounty') ne '') {
+
+  my $username = $query->cookie(-name=>'username');  # session checked
+  select_package($username) unless $current_package;
+  my $account  = $query->param('account');
+  
+  if  ( my $error = delete_mailbox ( {
+      'authuser'         => $username,
+      'account'          => $account,
+    } ) ) {
+    print "<html>$body\n";
+    print "<p>$error\n";
+    print "</body></html>\n";
+      
+  } else {
+    print "<html>$body\n";
+    print "<p>Deleted\n";
+    print "</body></html>\n";
+  }
+
+  $printmainpage=0;
+
+} elsif ($query->param('changepassword') ne '') {
+
+  my $username = $query->cookie(-name=>'username');  # session checked
+  select_package($username) unless $current_package;
+  my $account  = $query->param('account');
+  my $_password  = $query->param('_password');
+  
+  if  ( my $error = password_mailbox ( {
+      'authuser'         => $username,
+      'account'          => $account,
+      '_password'        => $_password,
+    } ) ) {
+    print "<html>$body\n";
+    print "<p>$error\n";
+    print "</body></html>\n";
+      
+  } else {
+    print "<html>$body\n";
+    print "<p>Changed\n";
+    print "</body></html>\n";
+  }
+
+  $printmainpage=0;
+
+} elsif ($query->param('action') eq 'newmailbox') {
+
+  my $username = $query->cookie(-name=>'username');  # session checked
+  select_package($username) unless $current_package;
+  print "<html>$body\n";
+  print "<form name=form1 action=\"$cgi\" method=post target=\"rightmainframe\">\n";
+  print "<center><table border=0>\n";
+  print "<tr><td></td><td><p>Username </td><td><input type=text name=\"account\" value=\"\"></td><td>@ " . $current_domname . "</td></tr>\n";
+  print "<tr><td></td><td><p>Password</td><td><input type=text name=\"_password\" value=\"\"></td></tr>\n";
+  print "</table>\n";
+  print "<input type=submit name=\"addmailbox\" value=\"Add This User\">\n";
+  print "</center>\n";
+  print "</form>\n";
+  print "<br>\n";
+  print "<p>Use this screen to add a new mailbox user.  If the domain name of the email address (the part after the <B>@</B> sign) is not what you expect then you may need to use <B>List Packages</B> to select the package with the correct domain.\n";
+  print "<p>Enter the first portion of the email address in the box adjacent to <B>Username</B> and enter the password for that user in the space next to <B>Password</B>.  Then press the button labeled <B>Add The User</B>.\n";
+  print "<p>If you do not want to add a new user at this time then select a choice from the menu at the left, such as <B>List Mailboxes</B>.\n";
+  print "</body></html>\n";
+  $printmainpage=0;
+
+} elsif ($query->param('addmailbox') ne '') {
+
+  my $username = $query->cookie(-name=>'username');  # session checked
+  select_package($username) unless $current_package;
+  my $account  = $query->param('account');
+  my $_password  = $query->param('_password');
+  
+  if  ( my $error = add_mailbox ( {
+      'authuser'         => $username,
+      'package'          => $current_package,
+      'account'          => $account,
+      '_password'        => $_password,
+    } ) ) {
+    print "<html>$body\n";
+    print "<p>$error\n";
+    print "</body></html>\n";
+      
+  } else {
+    print "<html>$body\n";
+    print "<p>Created\n";
+    print "</body></html>\n";
+  }
+
+  $printmainpage=0;
+
+} elsif ($query->param('action') eq 'deleteforward') {
+
+  my $username = $query->cookie(-name=>'username');  # session checked
+  select_package($username) unless $current_package;
+  my $svcnum   = $query->param('service');
+  my $mailbox  = $query->param('mailbox');
+  my $dest  = $query->param('dest');
+  print "<html>$body\n";
+  print "<form name=form1 action=\"$cgi\" method=post target=\"rightmainframe\">\n";
+  print "<p>Are you certain you want to remove the forwarding from $mailbox to $dest?\n";
+  print "<p><input type=hidden name=\"service\" value=\"$svcnum\">\n";
+  print "<input type=submit name=\"deleteforwardy\" value=\"Confirm\">\n";
+  print "</body></html>\n";
+  $printmainpage=0;
+
+} elsif ($query->param('deleteforwardy') ne '') {
+
+  my $username = $query->cookie(-name=>'username');  # session checked
+  select_package($username) unless $current_package;
+  my $service  = $query->param('service');
+  
+  if  ( my $error = delete_forward ( {
+      'authuser'        => $username,
+      'svcnum'          => $service,
+    } ) ) {
+    print "<html>$body\n";
+    print "<p>$error\n";
+    print "</body></html>\n";
+      
+  } else {
+    print "<html>$body\n";
+    print "<p>Forwarding Removed\n";
+    print "</body></html>\n";
+  }
+
+  $printmainpage=0;
+
+} elsif ($query->param('addforward') ne '') {
+
+  my $username = $query->cookie(-name=>'username');  # session checked
+  select_package($username) unless $current_package;
+  my $account  = $query->param('account');
+  my $mailbox  = $query->param('mailbox');
+  
+  print "<html>$body\n";
+  print "<form name=form1 action=\"$cgi\" method=post target=\"rightmainframe\">\n";
+  print "<center><table border=0>\n";
+  print "<input type=hidden name=\"account\" value=\"$account\">\n";
+  print "<input type=hidden name=\"mailbox\" value=\"$mailbox\">\n";
+  print "<tr><td>Forward mail from </td><td><p>$mailbox:</td><td> to </td></tr>\n";
+  print "<tr><td></td><td><p>Destination:</td><td><input type=text name=\"dest\" value=\"\"></td></tr>\n";
+  print "</table>\n";
+  print "<input type=submit name=\"addforwarddst\" value=\"Add the Forwarding\">\n";
+  print "</center>\n";
+  print "</form>\n";
+  print "<br>\n";
+  print "<p> If you would like mail originally destined for the above address to be forwarded to a different email address then type that email address in the box next to <B>Destination:</B> and press the <B>Add the Forwarding</B> button.\n";
+  print "<p> If you do not want to add mail forwarding then select a choice from the menu at the left, such as <B>List Accounts</B>.\n";
+
+  $printmainpage=0;
+
+} elsif ($query->param('addforwarddst') ne '') {
+
+  my $username = $query->cookie(-name=>'username');  # session checked
+  select_package($username) unless $current_package;
+  my $account  = $query->param('account');
+  my $dest  = $query->param('dest');
+  
+  if  ( my $error = add_forward ( {
+      'authuser'         => $username,
+      'package'          => $current_package,
+      'source'           => $account,
+      'dest'             => $dest,
+    } ) ) {
+    print "<html>$body\n";
+    print "<p>$error\n";
+    print "</body></html>\n";
+      
+  } else {
+    print "<html>$body\n";
+    print "<p>Forwarding Created\n";
+    print "</body></html>\n";
+  }
+
+  $printmainpage=0;
+
+} elsif ($query->param('action') eq 'navframe') {
+
+  print "<html><body bgcolor=bbbbbb>\n";
+  print "<center><h2>NCI2000 MAIL ADMIN Web Interface</h2></center>\n";
+
+  print "<br><center>Choose Action:</center><br>\n";
+  print "<center><table border=0>\n";
+  print "<ul>\n";
+  print "<tr><td><li><a href=\"$cgi\?action=logout\" target=\"_top\">Log Off</a></td><tr>\n";
+  print "<tr><td><li><a href=\"$cgi\?action=list_packages\" target=\"rightmainframe\">List Packages</a></td><tr>\n";
+  print "<tr><td><li><a href=\"$cgi\?action=list_mailboxes\" target=\"rightmainframe\">List Accounts</a></td><tr>\n";
+  print "<tr><td><li><a href=\"$cgi\?action=newmailbox\" target=\"rightmainframe\">Add Account</a></td><tr>\n";
+  print "</ul>\n";
+  print "</table></center>\n";
+
+  print "<br><br><br>\n";
+  print "</body></html>\n";
+
+  $printmainpage = 0;
+
+} elsif ($query->param('action') eq 'rightmainframe') {
+
+  print "<html>$body\n";
+  print "<br><br><br>\n";
+  print "<font size=4><----- Please choose function on the left menu</font>\n";
+  print "<br><br>\n";
+  print "<p> Choose <B>Log Off</B> when you are finished.  This helps prevent unauthorized access to your accounts.\n";
+  print "<p> Use <B>List Packages</B> when you administer multiple packages.  When you have multiple domains at NCI2000 you are likely to have multiple packages.  Use of <B>List Packages</B> is not necessary if administer only one package.\n";
+  print "<p> Use <B>List Accounts</B> to view your current arrangement of mailboxes.  From this list you my choose to make changes to existing mailboxes or delete mailboxes.  If you would like to modify the forwarding associated with a mailbox then choose it from this list.\n";
+  print "<p> Use <B>Add Account</B> when you would like an additional mailbox.  After you have added the mailbox you may choose to make additional changes from the list provided by <B>List Accounts<B>.\n";
+  print "</body></html>\n";
+
+  $printmainpage = 0;
+
+}
+
+
+if ($query->param('action') eq 'login') {
+
+    printheader();
+    printlogin();
+
+} elsif ($query->param('action') eq 'logout') {
+
+    destroysession();
+    printheader();
+    printlogin();
+
+} elsif ($printmainpage) {
+
+
+  print "<html><head><title>NCI2000 MAIL ADMIN Web Interface</title></head>\n";
+  print "<FRAMESET cols=\"160,*\" BORDER=\"3\">\n";
+  print "<FRAME NAME=\"navframe\" src=\"$cgi?action=navframe\">\n";
+  print "<FRAME NAME=\"rightmainframe\" src=\"$cgi?action=rightmainframe\">\n";
+  print "</FRAMESET>\n";
+  print "</html>\n";
+
+
+}
+
+sub getdatetime {
+  my $today = localtime(time());
+  my ($day,$mon,$dayofmon,$time,$year) = split(/\s+/,$today);
+  my @datemonths = ("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec");
+
+  my $numidx = "01";
+  my ($nummon);
+  foreach my $mons (@datemonths) {
+    if ($mon eq $mons) {
+     $nummon = $numidx;
+    }
+    $numidx++;
+  }
+
+  return "$year-$nummon-$dayofmon $time";
+
+}
+
+sub error {
+
+  my $error = shift;
+  my $arg1 = shift;
+
+   printheader();
+
+   if ($error eq 'not_admin') {
+     print "<html><head><title>Error!</title></head>\n";
+     print "$body\n";
+     print "<center><h1><font face=arial>Error!</font></h1></center>\n";
+     print "<font face=arial>Unauthorized attempt to access mail administration.</font>\n";
+     print "<br><font face=arial>Please login again if you think this is an error.</font>\n";
+     print "<form><input type=button value=\"<<Back\" OnClick=\"history.back()\"></form>\n";
+     print "</body></html>\n";
+   } elsif ($error eq 'exists') {
+     print "<html><head><title>Error!</title></head>\n";
+     print "$body\n";
+     print "<center><h1><font face=arial>Error!</font></h1></center>\n";
+     print "<font face=arial>The user you are trying to enter already exists. Please go back and enter a different username</font>\n";
+     print "</font></body></html>\n";
+   } elsif ($error eq 'ingroup') {
+     print "<html><head><title>Error!</title></head>\n";
+     print "$body\n";
+     print "<center><h1><font face=arial>Error!</font></h1></center>\n";
+     print "<font face=arial>This user is already in the group <i>$arg1</i>. Please go back and deselect group <i>$arg1</i> from the list.</font>\n";
+     print "<form><input type=button value=\"<<Back\" OnClick=\"history.back()\"></form>\n";
+     print "</font></body></html>\n";
+   } elsif ($error eq 'sess_expired') {
+     print "<html>$body\n";
+     print "<center><font size=4>Your session has expired.</font></center>\n";
+     print "<br><br><center>Please login again <a href=\"$cgi\?action=login\" target=\"_top\"> HERE</a></center>\n";
+     print "</body></html>\n";
+   } elsif ($error eq 'open') {
+     print "<html>$body\n";
+     print "<center><font size=4>Unable to open or rename file.</font></center>\n";
+     print "<br><br><center>If this continues, please contact your administrator</center>\n";
+     print "</body></html>\n";
+   }
+
+
+   exit;
+
+}
+
+
+#print a html header if not printed yet
+sub printheader {
+
+  if ($printheader) {
+     print "Content-Type: text/html\n\n";
+     $printheader = 0;
+  }
+
+}
+
+
+#verify user can access administration
+sub checksession {
+
+  my $username = $query->cookie(-name=>'username');
+  my $sessionid = $query->cookie(-name=>'ma_sessionid');
+
+  if ($sessionid eq '') {
+     printheader();
+     if ($query->param()) {
+        error('sess_expired');
+     } else {
+        printlogin();
+        exit;
+    }
+  }
+
+  my $now = time();
+  my $founduser = 0;
+  open(SESSFILE, "$sessionfile") || error('open');
+  error('open') if -l "$tmpdir/adminsess.$$";
+  open(NEWSESS, ">$tmpdir/adminsess.$$") || error('open');
+  while (<SESSFILE>) {
+	chomp();
+	my ($user, $sess, $time, $pkgnum, $svcdomain, $domname) = split(/\s+/);
+	next if $now - $sessexpire > $time;
+	if ($username eq $user && !$founduser) {
+		if ($sess eq $sessionid) {
+			$founduser = 1;
+			print NEWSESS "$user $sess $now $pkgnum $svcdomain $domname\n";
+                        $current_package=$pkgnum;
+                        $current_account=$svcdomain;
+                        $current_domname=$domname;
+			next;
+		}
+	}
+	print NEWSESS "$user $sess $time $pkgnum $svcdomain $domname\n";
+  }
+  close(SESSFILE);
+  close(NEWSESS);
+  system("mv $tmpdir/adminsess.$$ $sessionfile");
+  error('sess_expired') unless $founduser;
+
+  my $cookie1 = $query->cookie(-name=>'username',
+				-value=>$username,
+				-expires=>$cookieexpire,
+				-domain=>$cookiedomain);
+
+  my $cookie2 = $query->cookie(-name=>'ma_sessionid',
+				-value=>$sessionid,
+				-expires=>$cookieexpire,
+				-domain=>$cookiedomain);
+
+  print $query->header(-COOKIE=>[$cookie1, $cookie2]);
+  
+  $printheader = 0;
+
+  return 0;
+
+}
+
+sub destroysession {
+
+  my $username = $query->cookie(-name=>'username');
+  my $sessionid = $query->cookie(-name=>'ma_sessionid');
+
+  if ($sessionid eq '') {
+     printheader();
+     if ($query->param()) {
+        error('sess_expired');
+     } else {
+        printlogin();
+        exit;
+    }
+  }
+
+  my $now = time();
+  my $founduser = 0;
+  open(SESSFILE, "$sessionfile") || error('open');
+  error('open') if -l "$tmpdir/adminsess.$$";
+  open(NEWSESS, ">$tmpdir/adminsess.$$") || error('open');
+  while (<SESSFILE>) {
+	chomp();
+	my ($user, $sess, $time, $pkgnum, $svcdomain, $domname) = split(/\s+/);
+	next if $now - $sessexpire > $time;
+	if ($username eq $user && !$founduser) {
+		if ($sess eq $sessionid) {
+			$founduser = 1;
+			next;
+		}
+	}
+	print NEWSESS "$user $sess $time $pkgnum $svcdomain $domname\n";
+  }
+  close(SESSFILE);
+  close(NEWSESS);
+  system("mv $tmpdir/adminsess.$$ $sessionfile");
+  error('sess_expired') unless $founduser;
+
+  $printheader = 0;
+
+  return 0;
+
+}
+
+# checks the username and pass against the database
+sub checkuserpass {
+
+  my $username = shift;
+  my $password = shift;
+
+  my $error = authenticate ( {
+      'authuser'         => $username,
+      '_password'        => $password,
+    } ); 
+
+  if ($error eq "$username OK") {
+    return 1;
+  }else{
+    return 0;
+  }
+
+}
+
+#printlogin prints a login page
+sub printlogin {
+
+        print "<html>$body\n";
+        print "<center><font size=4>Please login to access MAIL ADMIN</font></center>\n";
+        print "<form action=\"$cgi\" method=post>\n";
+        print "<center>Email Address: &nbsp; <input type=text name=\"username\">\n";
+        print "<br>Email Password: <input type=password name=\"password\">\n";
+        print "<br><input type=submit name=\"login\" value=\"Login\">\n";
+        print "</form></center>\n";
+        print "</body></html>\n";
+}
+
+
+#select_package chooses a administrable package if more than one exists
+sub select_package {
+        my $user = shift;
+        my $packages = list_packages($user);
+        if (scalar(@{$packages}) eq 1) {
+          $current_package = @{$packages}[0]->{'pkgnum'};
+          set_package();
+        }
+        if (scalar(@{$packages}) > 1) {
+#          print $query->redirect("$cgi\?action=list_packages");
+           print "<p>No package selected.  You must first <a href=\"$cgi\?action=list_packages\" target=\"rightmainframe\">select a package</a>.\n";
+          exit;
+        }
+}
+
+sub set_package {
+
+  my $username = $query->cookie(-name=>'username');
+  my $sessionid = $query->cookie(-name=>'ma_sessionid');
+
+  if ($sessionid eq '') {
+     printheader();
+     if ($query->param()) {
+        error('sess_expired');
+     } else {
+        printlogin();
+        exit;
+    }
+  }
+
+  my $now = time();
+  my $founduser = 0;
+  open(SESSFILE, "$sessionfile") || error('open');
+  error('open') if -l "$tmpdir/adminsess.$$";
+  open(NEWSESS, ">$tmpdir/adminsess.$$") || error('open');
+  while (<SESSFILE>) {
+	chomp();
+	my ($user, $sess, $time, $pkgnum, $svcdomain, $domname) = split(/\s+/);
+	next if $now - $sessexpire > $time;
+	if ($username eq $user && !$founduser) {
+		if ($sess eq $sessionid) {
+			$founduser = 1;
+	                print NEWSESS "$user $sess $time $current_package $current_account $current_domname\n";
+			next;
+		}
+	}
+	print NEWSESS "$user $sess $time $pkgnum $svcdomain $domname\n";
+  }
+  close(SESSFILE);
+  close(NEWSESS);
+  system("mv $tmpdir/adminsess.$$ $sessionfile");
+  error('sess_expired') unless $founduser;
+
+  $printheader = 0;
+
+  return 0;
+
+}
+
diff --git a/fs_selfadmin/FS-MailAdminServer/fs_mailadmind b/fs_selfadmin/FS-MailAdminServer/fs_mailadmind
new file mode 100755
index 000000000..746d7822e
--- /dev/null
+++ b/fs_selfadmin/FS-MailAdminServer/fs_mailadmind
@@ -0,0 +1,366 @@
+#!/usr/bin/perl -Tw
+
+eval 'exec /usr/bin/perl -Tw -S $0 ${1+"$@"}'
+    if 0; # not running under some shell
+#
+# fs_mailadmind
+#
+# This is run REMOTELY over ssh by fs_mailadmin_server.
+#
+
+use strict;
+use Socket;
+
+use vars qw( $Debug );
+
+$Debug = 0;
+
+my($fs_mailadmind_socket)="/usr/local/freeside/fs_mailadmind_socket";
+
+$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
+$ENV{'SHELL'} = '/bin/sh';
+$ENV{'IFS'} = " \t\n";
+$ENV{'CDPATH'} = '';
+$ENV{'ENV'} = '';
+$ENV{'BASH_ENV'} = '';
+
+$|=1;
+
+warn "[fs_mailadmind] Reading locales...\n" if $Debug;
+chomp( my $n_cust_main_county = <STDIN> );
+my @cust_main_county = map {
+  chomp( my $taxnum = <STDIN> );
+  chomp( my $state = <STDIN> );
+  chomp( my $county = <STDIN> );
+  chomp( my $country = <STDIN> );
+  {
+    'taxnum'  => $taxnum,
+    'state'   => $state,
+    'county'  => $county,
+    'country' => $country,
+  };
+} ( 1 .. $n_cust_main_county );
+
+warn "[fs_mailadmind] Reading package definitions...\n" if $Debug;
+chomp( my $n_part_pkg = <STDIN> );
+my @part_pkg = map {
+  chomp( my $pkgpart = <STDIN> );
+  chomp( my $pkg = <STDIN> );
+  {
+    'pkgpart' => $pkgpart,
+    'pkg'     => $pkg,
+  };
+} ( 1 .. $n_part_pkg );
+
+warn "[fs_mailadmind] Reading POPs...\n" if $Debug;
+chomp( my $n_svc_acct_pop = <STDIN> );
+my @svc_acct_pop = map {
+  chomp( my $popnum = <STDIN> );
+  chomp( my $city = <STDIN> );
+  chomp( my $state = <STDIN> );
+  chomp( my $ac = <STDIN> );
+  chomp( my $exch = <STDIN> );
+  chomp( my $loc = <STDIN> );
+  {
+    'popnum' => $popnum,
+    'city'   => $city,
+    'state'  => $state,
+    'ac'     => $ac,
+    'exch'   => $exch,
+    'loc'    => $loc,
+  };
+} ( 1 .. $n_svc_acct_pop );
+
+warn "[fs_mailadmind] Creating $fs_mailadmind_socket\n" if $Debug;
+my $uaddr = sockaddr_un($fs_mailadmind_socket);
+my $proto = getprotobyname('tcp');
+socket(Server,PF_UNIX,SOCK_STREAM,0) or die "socket: $!";
+unlink($fs_mailadmind_socket);
+bind(Server, $uaddr) or die "bind: $!";
+listen(Server,SOMAXCONN) or die "listen: $!";
+
+warn "[fs_mailadmind] Entering main loop...\n" if $Debug;
+my $paddr;
+for ( ; $paddr = accept(Client,Server); close Client) {
+
+  chop( my $command = <Client> );
+
+  if ( $command eq "signup_info" ) {
+    warn "[fs_mailadmind] sending signup info...\n" if $Debug; 
+    print Client join("\n", $n_cust_main_county,
+      map {
+        $_->{taxnum},
+        $_->{state},
+        $_->{county},
+        $_->{country},
+      } @cust_main_county
+    ), "\n";
+
+    print Client join("\n", $n_part_pkg,
+      map {
+        $_->{pkgpart},
+        $_->{pkg},
+      } @part_pkg
+    ), "\n";
+
+    print Client join("\n", $n_svc_acct_pop,
+      map {
+        $_->{popnum},
+        $_->{city},
+        $_->{state},
+        $_->{ac},
+        $_->{exch},
+        $_->{loc},
+      } @svc_acct_pop
+    ), "\n";
+
+  } elsif ( $command eq "new_customer" ) {
+    warn "[fs_mailadmind] reading customer signup...\n" if $Debug;
+    my(
+      $first, $last, $ss, $company, $address1, $address2, $city, $county,
+      $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
+      $paydate, $payname, $invoicing_list, $pkgpart, $username, $password,
+      $popnum,
+    ) = map { scalar(<Client>) } ( 1 .. 23 );
+
+    warn "[fs_mailadmind] sending customer data to remote server...\n" if $Debug;
+    print 
+      $first, $last, $ss, $company, $address1, $address2, $city, $county,
+      $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
+      $paydate, $payname, $invoicing_list, $pkgpart, $username, $password,
+      $popnum,
+    ;
+
+    warn "[fs_mailadmind] reading error from remote server...\n" if $Debug;
+    my $error = <STDIN>;
+
+    warn "[fs_mailadmind] sending error to local client...\n" if $Debug;
+    print Client $error;
+
+  } elsif ( $command eq "authenticate" ) {
+    warn "[fs_mailadmind] reading user information to auth...\n" if $Debug;
+    chop( my $user = <Client> );
+    warn "[fs_mailadmind] reading authentication material...\n" if $Debug;
+    chop( my $password = <Client> );
+    warn "[fs_mailadmind] sending information to remote server...\n" if $Debug;
+    print "authenticate\n", $user, "\n", $password, "\n";
+
+    warn "[fs_mailadmind] reading error from remote server...\n" if $Debug;
+    my $error = <STDIN>;
+
+    warn "[fs_mailadmind] sending error to local client...\n" if $Debug;
+    print Client $error;
+    
+  } elsif ( $command eq "list_packages" ) {
+    warn "[fs_mailadmind] reading user information to list_packages...\n" if $Debug;
+    chop( my $user = <Client> );
+    warn "[fs_mailadmind] sending user information to remote server...\n" if $Debug;
+    print "list_packages\n", $user, "\n";
+
+    warn "[fs_mailadmind] reading data from remote server...\n" if $Debug;
+    chomp( my $n_packages = <STDIN> );
+    my @packages = map {
+      chomp( my $pkgnum  = <STDIN> );
+      chomp( my $domain  = <STDIN> );
+      chomp( my $account = <STDIN> );
+      {
+        'pkgnum'  => $pkgnum,
+        'domain'  => $domain,
+        'account' => $account,
+      };
+    } ( 1 .. $n_packages );
+
+    warn "[fs_mailadmind] sending data to local client...\n" if $Debug;
+
+    print Client join("\n", $n_packages,
+      map {
+        $_->{pkgnum},
+        $_->{domain},
+        $_->{account},
+      } @packages
+    ), "\n";
+
+  } elsif ( $command eq "list_mailboxes" ) {
+    warn "[fs_mailadmind] reading user information to list_mailboxes...\n" if $Debug;
+    chop( my $user = <Client> );
+    warn "[fs_mailadmind] reading package number to list_mailboxes...\n" if $Debug;
+    chop( my $package = <Client> );
+    warn "[fs_mailadmind] sending user information to remote server...\n" if $Debug;
+    print "list_mailboxes\n", $user, "\n", $package, "\n";
+
+    warn "[fs_mailadmind] reading data from remote server...\n" if $Debug;
+    chomp( my $n_svc_acct = <STDIN> );
+    my @svc_acct = map {
+      chomp( my $svcnum = <STDIN> );
+      chomp( my $username = <STDIN> );
+      chomp( my $_password = <STDIN> );
+      {
+        'svcnum' => $svcnum,
+        'username' => $username,
+        '_password'     => $_password,
+      };
+    } ( 1 .. $n_svc_acct );
+
+    warn "[fs_mailadmind] sending data to local client...\n" if $Debug;
+
+    print Client join("\n", $n_svc_acct,
+      map {
+        $_->{svcnum},
+        $_->{username},
+        $_->{_password},
+      } @svc_acct
+    ), "\n";
+
+  } elsif ( $command eq "delete_mailbox" ) {
+    warn "[fs_mailadmind] reading user information to auth...\n" if $Debug;
+    chop( my $user = <Client> );
+    warn "[fs_mailadmind] reading account information to delete...\n" if $Debug;
+    chop( my $account = <Client> );
+    warn "[fs_mailadmind] sending information to remote server...\n" if $Debug;
+    print "delete_mailbox\n", $user, "\n", $account, "\n";
+
+    warn "[fs_mailadmind] reading error from remote server...\n" if $Debug;
+    my $error = <STDIN>;
+
+    warn "[fs_mailadmind] sending error to local client...\n" if $Debug;
+    print Client $error;
+
+  } elsif ( $command eq "password_mailbox" ) {
+    warn "[fs_mailadmind] reading user information to auth...\n" if $Debug;
+    chop( my $user = <Client> );
+    warn "[fs_mailadmind] reading account information to password...\n" if $Debug;
+    my(
+      $account, $_password,
+    ) = map { scalar(<Client>) } ( 1 .. 2 );
+
+    warn "[fs_mailadmind] sending password data to remote server...\n" if $Debug;
+    print "password_mailbox", "\n";
+    print 
+      $user, "\n", $account, $_password,
+    ;
+
+    warn "[fs_mailadmind] reading error from remote server...\n" if $Debug;
+    my $error = <STDIN>;
+
+    warn "[fs_mailadmind] sending error to local client...\n" if $Debug;
+    print Client $error;
+
+  } elsif ( $command eq "add_mailbox" ) {
+    warn "[fs_mailadmind] reading user information to auth...\n" if $Debug;
+    chop( my $user = <Client> );
+    warn "[fs_mailadmind] reading account information to create...\n" if $Debug;
+    my(
+      $package, $account, $_password,
+    ) = map { scalar(<Client>) } ( 1 .. 3 );
+
+    warn "[fs_mailadmind] sending service data to remote server...\n" if $Debug;
+    print "add_mailbox", "\n";
+    print 
+      $user, "\n", $package, $account, $_password,
+    ;
+
+    warn "[fs_mailadmind] reading error from remote server...\n" if $Debug;
+    my $error = <STDIN>;
+
+    warn "[fs_mailadmind] sending error to local client...\n" if $Debug;
+    print Client $error;
+
+  } elsif ( $command eq "add_forward" ) {
+    warn "[fs_mailadmind] reading user information to auth...\n" if $Debug;
+    chop( my $user = <Client> );
+    warn "[fs_mailadmind] reading forward information to create...\n" if $Debug;
+    my(
+      $package, $source, $dest,
+    ) = map { scalar(<Client>) } ( 1 .. 3 );
+
+    warn "[fs_mailadmind] sending service data to remote server...\n" if $Debug;
+    print "add_forward", "\n";
+    print 
+      $user, "\n", $package, $source, $dest,
+    ;
+
+    warn "[fs_mailadmind] reading error from remote server...\n" if $Debug;
+    my $error = <STDIN>;
+
+    warn "[fs_mailadmind] sending error to local client...\n" if $Debug;
+    print Client $error;
+
+  } elsif ( $command eq "delete_forward" ) {
+    warn "[fs_mailadmind] reading user information to auth...\n" if $Debug;
+    chop( my $user = <Client> );
+    warn "[fs_mailadmind] reading forward information to delete...\n" if $Debug;
+    chop( my $service = <Client> );
+    warn "[fs_mailadmind] sending information to remote server...\n" if $Debug;
+    print "delete_forward\n", $user, "\n", $service, "\n";
+
+    warn "[fs_mailadmind] reading error from remote server...\n" if $Debug;
+    my $error = <STDIN>;
+
+    warn "[fs_mailadmind] sending error to local client...\n" if $Debug;
+    print Client $error;
+
+  } elsif ( $command eq "list_forwards" ) {
+    warn "[fs_mailadmind] reading user information to list_forwards...\n" if $Debug;
+    chop( my $user = <Client> );
+    warn "[fs_mailadmind] reading service number to list_forwards...\n" if $Debug;
+    chop( my $service = <Client> );
+    warn "[fs_mailadmind] sending user information to remote server...\n" if $Debug;
+    print "list_forwards\n", $user, "\n", $service, "\n";
+
+    warn "[fs_mailadmind] reading data from remote server...\n" if $Debug;
+    chomp( my $n_svc_forward = <STDIN> );
+    my @svc_forward = map {
+      chomp( my $svcnum = <STDIN> );
+      chomp( my $dest = <STDIN> );
+      {
+        'svcnum' => $svcnum,
+        'dest' => $dest,
+      };
+    } ( 1 .. $n_svc_forward );
+
+    warn "[fs_mailadmind] sending data to local client...\n" if $Debug;
+
+    print Client join("\n", $n_svc_forward,
+      map {
+        $_->{svcnum},
+        $_->{dest},
+      } @svc_forward
+    ), "\n";
+
+  } elsif ( $command eq "list_pkg_forwards" ) {
+    warn "[fs_mailadmind] reading user information to list_pkg_forwards...\n" if $Debug;
+    chop( my $user = <Client> );
+    warn "[fs_mailadmind] reading service number to list_forwards...\n" if $Debug;
+    chop( my $package = <Client> );
+    warn "[fs_mailadmind] sending user information to remote server...\n" if $Debug;
+    print "list_pkg_forwards\n", $user, "\n", $package, "\n";
+
+    warn "[fs_mailadmind] reading data from remote server...\n" if $Debug;
+    chomp( my $n_svc_forward = <STDIN> );
+    my @svc_forward = map {
+      chomp( my $svcnum = <STDIN> );
+      chomp( my $srcsvc = <STDIN> );
+      chomp( my $dest = <STDIN> );
+      {
+        'svcnum' => $svcnum,
+        'srcsvc' => $srcsvc,
+        'dest' => $dest,
+      };
+    } ( 1 .. $n_svc_forward );
+
+    warn "[fs_mailadmind] sending data to local client...\n" if $Debug;
+
+    print Client join("\n", $n_svc_forward,
+      map {
+        $_->{svcnum},
+        $_->{srcsvc},
+        $_->{dest},
+      } @svc_forward
+    ), "\n";
+
+  } else {
+    die "unexpected command from client: $command";
+  }
+
+}
+
diff --git a/fs_selfadmin/fs_mailadmin_server b/fs_selfadmin/fs_mailadmin_server
new file mode 100755
index 000000000..1bcc42e5d
--- /dev/null
+++ b/fs_selfadmin/fs_mailadmin_server
@@ -0,0 +1,642 @@
+#!/usr/bin/perl -Tw
+#
+# fs_mailadmin_server
+#
+
+use strict;
+use IO::Handle;
+use FS::SSH qw(sshopen2);
+use FS::UID qw(adminsuidsetup);
+use FS::Conf;
+use FS::Record qw( qsearch qsearchs );
+use FS::cust_main_county;
+use FS::cust_main;
+use FS::svc_acct_admin;
+
+use vars qw( $opt $Debug $conf $default_domain );
+
+$Debug = 1;
+
+my @payby = qw(CARD PREPAY);
+
+my $user = shift or die &usage;
+&adminsuidsetup( $user ); 
+
+$conf = new FS::Conf;
+$default_domain = $conf->config('domain');
+
+my $machine = shift or die &usage;
+
+my $agentnum = shift or die &usage;
+my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } ) or die &usage;
+my $pkgpart = $agent->pkgpart_hashref;
+
+my $refnum = shift or die &usage;
+
+#causing trouble for some folks
+#$SIG{CHLD} = sub { wait() };
+
+my($fs_mailadmind)=$conf->config('fs_mailadmind');
+
+while (1) {
+  my($reader,$writer)=(new IO::Handle, new IO::Handle);
+  $writer->autoflush(1);
+  warn "[fs_mailadmin_server] Connecting to $machine...\n" if $Debug;
+  sshopen2($machine,$reader,$writer,$fs_mailadmind);
+
+  my $data;
+
+  warn "[fs_mailadmin_server] Sending locales...\n" if $Debug;
+  my @cust_main_county = qsearch('cust_main_county', {} );
+  print $writer $data = join("\n",
+    ( scalar(@cust_main_county) || die "no tax rates (cust_main_county records)" ),
+    map {
+      $_->taxnum,
+      $_->state,
+      $_->county,
+      $_->country,
+    } @cust_main_county
+  ),"\n";
+  warn "[fs_mailadmin_server] $data\n" if $Debug > 2;
+
+  warn "[fs_mailadmin_server] Sending package definitions...\n" if $Debug;
+  my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } }
+    qsearch( 'part_pkg', {} );
+  print $writer $data = join("\n",
+    ( scalar(@part_pkg) || die "no usable package definitions, agent $agentnum" ),
+    map {
+      $_->pkgpart,
+      $_->pkg,
+    } @part_pkg
+  ), "\n";
+  warn "[fs_mailadmin_server] $data\n" if $Debug > 2;
+
+  warn "[fs_mailadmin_server] Sending POPs...\n" if $Debug;
+  my @svc_acct_pop = qsearch ('svc_acct_pop',{} );
+  print $writer $data = join("\n",
+    ( scalar(@svc_acct_pop) || die "No points of presence (svc_acct_pop records)" ),
+    map {
+      $_->popnum,
+      $_->city,
+      $_->state,
+      $_->ac,
+      $_->exch,
+      $_->loc,
+    } @svc_acct_pop
+  ), "\n";
+  warn "[fs_mailadmin_server] $data\n" if $Debug > 2;
+
+  warn "[fs_mailadmin_server] Entering main loop...\n" if $Debug;
+COMMAND:  while (1) {
+    warn "[fs_mailadmin_server] Reading (waiting for) command...\n" if $Debug;
+    chop( my($command, $user) = map { scalar(<$reader>) } ( 1 .. 2 ) );
+    my $domain = $default_domain;
+    $user =~ /^([\w\.\-]+)\@(([\w\-]+\.)+\w+)$/;
+    ($user, $domain) = ($1, $2);
+
+    if ($command eq 'authenticate'){
+      warn "[fs_mailadmin_server] Processing authenticate command for $user \n" if $Debug;
+      chop( my($password) = map { scalar(<$reader>) } ( 1 .. 1 ) );
+
+      my $error = '';
+
+      my @svc_domain = qsearchs('svc_domain', { 'domain'   => $domain });
+
+      if (scalar(@svc_domain) != 1) {
+        warn "Nonexistant or duplicate service account for \"$domain\"";
+        next COMMAND;
+      }
+
+      my @svc_acct = qsearchs('svc_acct', { 'username' => $user,
+                                            'domsvc'   => $svc_domain[0]->svcnum });
+      if (scalar(@svc_acct) != 1) {
+        die "Nonexistant or duplicate service account for \"$user\"";
+        next COMMAND;
+      }
+
+      if ($svc_acct[0]->_password eq $password) {
+        $error = "$user\@$domain OK";
+      }else{
+        $error = "$user\@$domain FAILED";
+      }
+      warn "[fs_mailadmin_server] Sending results...\n" if $Debug;
+      print $writer $error, "\n";
+    }
+    elsif ($command eq 'list_packages'){
+      warn "[fs_mailadmin_server] Processing list_packages command for $user \n" if $Debug;
+
+      my $error = '';
+
+      my @packages = eval {find_administrable_packages( $user, $domain )};
+      warn "$@" if $@; 
+
+      my %packages;
+      my %accounts;
+
+      foreach my $package (@packages) {
+        $packages{my $pkgnum = $package->getfield('pkgnum')} = $default_domain;
+        $accounts{$pkgnum} = 0;
+        my @services = qsearch('cust_svc', { 'pkgnum' => $pkgnum });
+        foreach my $service (@services) {
+          if ($service->getfield('svcpart') eq '4'){
+            my $account=qsearchs('svc_domain', { 'svcnum' => $service->getfield('svcnum') });
+            $packages{$pkgnum}=$account->getfield('domain');
+            $accounts{$pkgnum}=$account->getfield('svcnum');
+          }
+        }
+      }
+      
+      print $writer $data = join("\n",
+        ( scalar(keys(%packages)) ),
+        map {
+          $_,
+          $packages{$_},
+          $accounts{$_},
+        } keys(%packages)
+      ), "\n";
+      warn "[fs_mailadmin_server] $data\n" if $Debug > 2;
+
+    }elsif ($command eq 'list_mailboxes'){
+
+      warn "[fs_mailadmin_server] Processing list_mailboxes command for $user" if $Debug;
+      chop( my($pkgnum) = map { scalar(<$reader>) } ( 1 .. 1 ) );
+      warn "package $pkgnum \n" if $Debug;
+
+      my $error = '';
+
+      my @packages = eval {find_administrable_packages( $user, $domain )};
+      warn "$@" if $@; 
+
+      my @accounts;
+
+      foreach my $package (@packages) {
+        next unless ($pkgnum eq $package->getfield('pkgnum'));
+        my @services = qsearch('cust_svc', { 'pkgnum' => $package->getfield('pkgnum') });
+        foreach my $service (@services) {
+          if ($service->getfield('svcpart') eq '2'){
+            my $account=qsearchs('svc_acct', { 'svcnum' => $service->getfield('svcnum') });
+#           $accounts[$#accounts+1]=$account->getfield('username');
+            $accounts[$#accounts+1]=$account;
+          }
+        }
+      }
+      
+      print $writer $data = join("\n",
+#        ( scalar(@accounts) || die "No accounts (svc_acct records)" ),
+        ( scalar(@accounts) ),
+        map {
+          $_->svcnum,
+#          $_->username,
+          $_->email,
+#          $_->_password,
+          '*****',
+        } @accounts
+      ), "\n";
+      warn "[fs_mailadmin_server] $data\n" if $Debug > 2;
+
+      
+    } elsif ($command eq 'delete_mailbox'){
+      warn "[fs_mailadmin_server] Processing delete_mailbox command for $user " if $Debug;
+      chop( my($account) = map { scalar(<$reader>) } ( 1 .. 1 ) );
+      warn "account $account \n" if $Debug;
+
+      my $error = '';
+
+      my @packages = eval { find_administrable_packages($user, $domain) };
+      warn "$@" if $@; 
+      $error ||= "$@" if $@; 
+
+      my @svc_acct = qsearchs('svc_acct', { 'svcnum' => $account }) unless $error;
+      if (scalar(@svc_acct) != 1) { $error ||= 'Nonexistant or duplicate service account for user.' };
+      if (! $error && check_administrator(\@packages, $svc_acct[0])){
+# not sure about the next three lines... do we delete? or return error
+        foreach my $svc_forward (qsearch('svc_forward', { 'dstsvc' => $svc_acct[0]->getfield('svcnum') })) {
+          $error ||= $svc_forward->delete;
+        }
+        foreach my $svc_forward (qsearch('svc_forward', { 'srcsvc' => $svc_acct[0]->getfield('svcnum') })) {
+          $error ||= $svc_forward->delete;
+        }
+        $error ||= $svc_acct[0]->delete;
+      } else {
+        $error ||= "Illegal attempt to remove service";
+      }
+
+      
+      warn "[fs_mailadmin_server] Sending results...\n" if $Debug;
+      print $writer $error, "\n";
+      
+    } elsif ($command eq 'password_mailbox'){
+      warn "[fs_mailadmin_server] Processing password_mailbox command for $user " if $Debug;
+      chop( my($account, $_password) = map { scalar(<$reader>) } ( 1 .. 2 ) );
+      warn "account $account with password $_password \n" if $Debug;
+
+      my $error = '';
+
+      my @packages = eval { find_administrable_packages($user, $domain) };
+      warn "$@" if $@; 
+      $error ||= "$@" if $@; 
+
+      my @svc_acct = qsearchs('svc_acct', { 'svcnum' => $account }) unless $error;
+      if (scalar(@svc_acct) != 1) { $error ||= 'Nonexistant or duplicate service account.' };
+
+      if (! $error && check_administrator(\@packages, $svc_acct[0])){
+        my $new = new FS::svc_acct ({$svc_acct[0]->hash});
+        $new->setfield('_password' => $_password);
+        $error ||= $new->replace($svc_acct[0]);
+      } else {
+        $error ||= "Illegal attempt to change password";
+      }
+
+      
+      warn "[fs_mailadmin_server] Sending results...\n" if $Debug;
+      print $writer $error, "\n";
+      
+    } elsif ($command eq 'add_mailbox'){
+      warn "[fs_mailadmin_server] Processing add_mailbox command for $user " if $Debug;
+      chop( my($target_package, $account, $_password) = map { scalar(<$reader>) } ( 1 .. 3 ) );
+      warn "in package $target_package account $account with password $_password \n" if $Debug;
+
+      my $found_package;
+      my $domainsvc=0;
+      my $svcpart=2;    # this is 'email box'
+      my $svcpartsm=3;  # this is 'domain alias'
+      my $error = '';
+      my $found = 0;
+
+      my @packages = eval { find_administrable_packages($user, $domain) };
+      warn "$@" if $@; 
+      $error ||= "$@" if $@; 
+
+      foreach my $package (@packages) {
+        if ($package->getfield('pkgnum') eq $target_package) {
+          $found = 1;
+          $found_package=$package;
+          my @services = qsearch('cust_svc', { 'pkgnum' => $target_package });
+          foreach my $service (@services) {
+            if ($service->getfield('svcpart') eq '4'){
+              my @svc_domain=qsearchs('svc_domain', { 'svcnum' => $service->getfield('svcnum') });
+              if (scalar(@svc_domain) eq 1) {
+                $domainsvc=$svc_domain[0]->getfield('svcnum');
+              }
+            }
+          }
+          last;
+        }
+      }
+      warn "User $user does not have administration rights to package $target_package\n" unless $found;
+      $error ||= "User $user does not have administration rights to package $target_package\n" unless $found;
+
+      my $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$found_package->getfield('pkgpart')});
+
+      #list of services this pkgpart includes (although at the moment we only care
+      #  about $svcpart
+      my $pkg_svc;
+      my %pkg_svc = ();
+      foreach $pkg_svc ( qsearch('pkg_svc',{'pkgpart'=> $found_package->pkgpart }) ) {
+        $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity if $pkg_svc->quantity;
+      }
+
+      my @services = qsearch('cust_svc', {'pkgnum'  => $found_package->getfield('pkgnum'),
+                                          'svcpart' => $svcpart,
+                                         });
+
+      if (scalar(@services) >= $pkg_svc{$svcpart}) {
+        $error="Maximum allowed already reached.";
+      }
+      
+      my $svc_acct = new FS::svc_acct ( {
+        'pkgnum'    => $found_package->pkgnum,
+        'svcpart'   => $svcpart,
+        'username'  => $account,
+        'domsvc'    => $domainsvc,
+        '_password' => $_password,
+      } );
+
+      my $y = $svc_acct->setdefault; # arguably should be in new method
+      $error ||= $y unless ref($y);
+      #and just in case you were silly
+      $svc_acct->pkgnum($found_package->pkgnum);
+      $svc_acct->svcpart($svcpart);
+      $svc_acct->username($account);
+      $svc_acct->domsvc($domainsvc);
+      $svc_acct->_password($_password);
+
+      $error ||= $svc_acct->check;
+
+      if ( ! $error ) { #in this case, $cust_pkg should always
+                                     #be definied, but....
+        $error ||= $svc_acct->insert;
+        warn "WARNING: $error on pre-checked svc_acct record!" if $error;
+      }
+
+      warn "[fs_mailadmin_server] Sending results...\n" if $Debug;
+      print $writer $error, "\n";
+      
+    }elsif ($command eq 'list_forwards'){
+
+      warn "[fs_mailadmin_server] Processing list_forwards command for $user" if $Debug;
+      chop( my($svcnum) = map { scalar(<$reader>) } ( 1 .. 1 ) );
+      warn "service $svcnum \n" if $Debug;
+
+      my $error = '';
+
+      my @packages = eval {find_administrable_packages( $user, $domain )};
+      warn "$@" if $@; 
+
+      my @forwards;
+
+      foreach my $package (@packages) {
+#        next unless ($pkgnum eq $package->getfield('pkgnum'));
+        my @services = qsearch('cust_svc', { 'pkgnum' => $package->getfield('pkgnum') });
+        foreach my $service (@services) {
+          if ($service->getfield('svcpart') eq '10'){
+            my $forward=qsearchs('svc_forward', { 'svcnum' => $service->getfield('svcnum') });
+            $forwards[$#forwards+1]=$forward if ($forward->getfield('srcsvc') == $svcnum);
+          }
+        }
+      }
+      
+      print $writer $data = join("\n",
+        ( scalar(@forwards) ),
+        map {
+          $_->svcnum,
+          ($_->dstsvc ? qsearchs('svc_acct', {'svcnum' => $_->dstsvc})->email : $_->dst),
+        } @forwards
+      ), "\n";
+      warn "[fs_mailadmin_server] $data\n" if $Debug > 2;
+
+      
+    }elsif ($command eq 'list_pkg_forwards'){
+
+      warn "[fs_mailadmin_server] Processing list_pkg_forwards command for $user" if $Debug;
+      chop( my($pkgnum) = map { scalar(<$reader>) } ( 1 .. 1 ) );
+      warn "package $pkgnum \n" if $Debug;
+
+      my $error = '';
+
+      my @packages = eval {find_administrable_packages( $user, $domain )};
+      warn "$@" if $@; 
+
+      my @forwards;
+
+      foreach my $package (@packages) {
+        next unless ($pkgnum eq $package->getfield('pkgnum'));
+        my @services = qsearch('cust_svc', { 'pkgnum' => $package->getfield('pkgnum') });
+        foreach my $service (@services) {
+          if ($service->getfield('svcpart') eq '10'){
+            my $forward=qsearchs('svc_forward', { 'svcnum' => $service->getfield('svcnum') });
+            $forwards[$#forwards+1]=$forward;
+          }
+        }
+      }
+      
+      print $writer $data = join("\n",
+        ( scalar(@forwards) ),
+        map {
+          $_->svcnum,
+          $_->srcsvc,
+          ($_->dstsvc ? qsearchs('svc_acct', {'svcnum' => $_->dstsvc})->email : $_->dst),
+        } @forwards
+      ), "\n";
+      warn "[fs_mailadmin_server] $data\n" if $Debug > 2;
+
+      
+    } elsif ($command eq 'delete_forward'){
+      warn "[fs_mailadmin_server] Processing delete_forward command for $user " if $Debug;
+      chop( my($forward) = map { scalar(<$reader>) } ( 1 .. 1 ) );
+      warn "forward $forward \n" if $Debug;
+
+      my $error = '';
+
+      my @packages = eval { find_administrable_packages($user, $domain) };
+      warn "$@" if $@; 
+      $error ||= "$@" if $@; 
+
+      my @svc_forward = qsearchs('svc_forward', { 'svcnum' => $forward }) unless $error;
+      if (scalar(@svc_forward) != 1) { $error ||= 'Nonexistant or duplicate service account for user.' };
+      if (! $error && check_administrator(\@packages, $svc_forward[0])){
+# not sure about the next three lines... do we delete? or return error
+        $error ||= $svc_forward[0]->delete;
+      } else {
+        $error ||= "Illegal attempt to remove service";
+      }
+
+      
+      warn "[fs_mailadmin_server] Sending results...\n" if $Debug;
+      print $writer $error, "\n";
+      
+    } elsif ($command eq 'add_forward'){
+      warn "[fs_mailadmin_server] Processing add_forward command for $user " if $Debug;
+      chop( my($target_package, $source, $dest) = map { scalar(<$reader>) } ( 1 .. 3 ) );
+      warn "in package $target_package source $source with destination $dest \n" if $Debug;
+
+      my $found_package;
+      my $domainsvc=0;
+      my $svcpart=10;   # this is 'forward service'
+      my $error = '';
+      my $found = 0;
+
+      my @packages = eval { find_administrable_packages($user, $domain) };
+      warn "$@" if $@; 
+      $error ||= "$@" if $@; 
+
+      foreach my $package (@packages) {
+        if ($package->getfield('pkgnum') eq $target_package) {
+          $found = 1;
+          $found_package=$package;
+          last;
+        }
+      }
+      warn "User $user does not have administration rights to package $target_package\n" unless $found;
+      $error ||= "User $user does not have administration rights to package $target_package\n" unless $found;
+
+      my $svc_acct = qsearchs('svc_acct', { 'svcnum' => $source });
+      warn "Forwarding source $source does not exist.\n" unless $svc_acct;
+      $error ||= "Forwarding source $source does not exist.\n" unless $svc_acct;
+
+      my $cust_svc = qsearchs('cust_svc', { 'svcnum' => $source });
+      warn "Forwarding source $source not attached to any account.\n" unless $cust_svc;
+      $error ||= "Forwarding source $source not attached to any account.\n" unless $cust_svc;
+
+      if ( ! $error ) {
+        warn "Forwarding source $source is not in package $target_package\n"
+          unless ($cust_svc->getfield('pkgnum') == $target_package);
+        $error ||= "Forwarding source $source is not in package $target_package\n"
+          unless ($cust_svc->getfield('pkgnum') == $target_package);
+      }
+
+      my $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$found_package->getfield('pkgpart')});
+
+      #list of services this pkgpart includes (although at the moment we only care
+      #  about $svcpart
+      my $pkg_svc;
+      my %pkg_svc = ();
+      foreach $pkg_svc ( qsearch('pkg_svc',{'pkgpart'=> $found_package->pkgpart }) ) {
+        $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity if $pkg_svc->quantity;
+      }
+
+      my @services = qsearch('cust_svc', {'pkgnum'  => $found_package->getfield('pkgnum'),
+                                          'svcpart' => $svcpart,
+                                         });
+
+      if (scalar(@services) >= $pkg_svc{$svcpart}) {
+        $error="Maximum allowed already reached.";
+      }
+      
+      my $svc_forward = new FS::svc_forward ( {
+        'pkgnum'    => $found_package->pkgnum,
+        'svcpart'   => $svcpart,
+        'srcsvc'  => $source,
+        'dstsvc'    => 0,
+        'dst' => $dest,
+      } );
+
+      my $y = $svc_forward->setdefault; # arguably should be in new method
+      $error ||= $y unless ref($y);
+      #and just in case you were silly
+      $svc_forward->pkgnum($found_package->pkgnum);
+      $svc_forward->svcpart($svcpart);
+      $svc_forward->srcsvc($source);
+      $svc_forward->dstsvc(0);
+      $svc_forward->dst($dest);
+
+      $error ||= $svc_forward->check;
+
+      if ( ! $error ) { #in this case, $cust_pkg should always
+                                     #be definied, but....
+        $error ||= $svc_forward->insert;
+        warn "WARNING: $error on pre-checked svc_forward record!" if $error;
+      }
+
+      warn "[fs_mailadmin_server] Sending results...\n" if $Debug;
+      print $writer $error, "\n";
+      
+    } else {
+      warn "[fs_mailadmin_server] Bad command: $command \n" if $Debug;
+      print $writer "Bad command \n";
+    }
+  }
+  close $writer;
+  close $reader;
+  warn "connection to $machine lost!  waiting 60 seconds...\n";
+  sleep 60;
+  warn "reconnecting...\n";
+}
+
+sub usage {
+  die "Usage:\n\n  fs_mailadmin_server user machine agentnum refnum\n";
+}
+
+#sub find_administrable_packages {
+#      my $user = shift;
+#
+#      my $error = '';
+#
+#      my @svc_acct = qsearchs('svc_acct', { 'username' => $user });
+#      if (scalar(@svc_acct) != 1) {
+#        die "Nonexistant or duplicate service account for \"$user\"";
+#      }
+#
+#      my @cust_svc = qsearchs('cust_svc', { 'svcnum' => $svc_acct[0]->getfield('svcnum') });
+#      if (scalar(@cust_svc) != 1 ) {
+#        die "Nonexistant or duplicate customer service for \"$user\"";
+#      }
+#
+#      my @cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_svc[0]->getfield('pkgnum') });
+#      if (scalar(@cust_pkg) != 1) {
+#        die "Nonexistant or duplicate customer package for \"$user\"";
+#      }
+#
+#      my @cust_main = qsearchs('cust_main', { 'custnum' => $cust_pkg[0]->getfield('custnum') });
+#      if (scalar(@cust_main) != 1 ) {
+#        die "Nonexistant or duplicate customer for \"$user\"";
+#      }
+#
+#      my @packages = $cust_main[0]->ncancelled_pkgs;
+#}
+
+sub find_administrable_packages {
+      my $user = shift;
+      my $domain = shift;
+
+      my @packages;
+      my $error = '';
+
+      my @svc_domain = qsearchs('svc_domain', { 'domain'   => $domain });
+
+      if (scalar(@svc_domain) != 1) {
+        die "Nonexistant or duplicate service account for \"$domain\"";
+      }
+
+      my @svc_acct = qsearchs('svc_acct', { 'username' => $user,
+                                            'domsvc'   => $svc_domain[0]->svcnum });
+      if (scalar(@svc_acct) != 1) {
+        die "Nonexistant or duplicate service account for \"$user\"";
+      }
+
+      my @svc_acct_admin = qsearch('svc_acct_admin', {'adminsvc' => $svc_acct[0]->getfield('svcnum') });
+      die "Nonexistant or duplicate customer service for \"$user\"" unless scalar(@svc_acct_admin);
+
+      foreach my $svc_acct_admin (@svc_acct_admin) {
+        my @cust_svc = qsearchs('cust_svc', { 'svcnum' => $svc_acct_admin->getfield('svcnum') });
+        if (scalar(@cust_svc) != 1 ) {
+          die "Nonexistant or duplicate customer service for admin \"$svc_acct_admin->getfield('svcnum')\"";
+        }
+
+        my @cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_svc[0]->getfield('pkgnum') });
+        if (scalar(@cust_pkg) != 1) {
+          die "Nonexistant or duplicate customer package for admin \"$user\"";
+        }
+
+        push @packages, $cust_pkg[0] unless $cust_pkg[0]->getfield('cancel');
+
+      }
+      (@packages);
+}
+
+sub check_administrator {
+      my ($allowed_packages_aref, $svc_acct_ref) = @_;
+
+      my $error = '';
+      my $found = 0;
+
+      {
+        my @cust_svc = qsearchs('cust_svc', { 'svcnum' => $svc_acct_ref->getfield('svcnum') });
+        if (scalar(@cust_svc) != 1 ) {
+          warn "Nonexistant or duplicate customer service for \"$svc_acct_ref->getfield('username')\"";
+          last;
+        }
+
+        my @cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_svc[0]->getfield('pkgnum') });
+        if (scalar(@cust_pkg) != 1) {
+          warn "Nonexistant or duplicate customer package for \"$svc_acct_ref->getfield('username')\"";
+          last;
+        }
+
+        foreach my $package (@$allowed_packages_aref) {
+          if ($package->getfield('pkgnum') eq $cust_pkg[0]->getfield('pkgnum')) {
+            $found = 1;
+            last;
+          }
+        }
+      }
+
+      $found;
+}
+
+sub check_add {
+      my ($allowed_packages_aref, $target_package) = @_;
+
+      my $error = '';
+      my $found = 0;
+
+      foreach my $package (@$allowed_packages_aref) {
+        if ($package->getfield('pkgnum') eq $target_package) {
+          $found = 1;
+          last;
+        }
+      }
+
+      $found;
+}
+
-- 
cgit v1.2.1


From d80be4d3bb68c34eb4e90b5b137b0d42d73f78d8 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Thu, 18 Oct 2001 15:30:08 +0000
Subject: rudimentary self-admin instructions

---
 fs_selfadmin/README | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 fs_selfadmin/README

diff --git a/fs_selfadmin/README b/fs_selfadmin/README
new file mode 100644
index 000000000..d9857f054
--- /dev/null
+++ b/fs_selfadmin/README
@@ -0,0 +1,27 @@
+
+This collection of files implements a 'self-administered mail service.'
+Configuration is similar to fs_signupd
+
+Additionally you will need to modify the database:
+
+CREATE TABLE svc_acct_admin (
+  svcnum int primary key,
+  adminsvc int not null
+);
+
+creating both as keys might be good
+
+(and perform the dbdef-create)
+
+
+As it exists now, a package containing one svc_domain, at least one
+svc_acct_admin, and other services can have its svc_acct's and svc_forward's
+manipulated by the svc_acct referenced by a svc_acct_admin in the package.
+
+One svc_acct may be referenced as svc_acct_admin for multiple packages.
+
+fs_mailadmin_server contains hard coded references to service numbers which
+will require editing for your system.
+
+It's not a lot, but it might provide inspiration.
+
-- 
cgit v1.2.1


From c095a5391475464fa816b7732c40ffa7d293ac6d Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Thu, 18 Oct 2001 15:49:00 +0000
Subject: tyop ... or something

---
 fs_selfadmin/FS-MailAdminServer/cgi/mailadmin.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_selfadmin/FS-MailAdminServer/cgi/mailadmin.cgi b/fs_selfadmin/FS-MailAdminServer/cgi/mailadmin.cgi
index 82002169b..c26c3dc42 100755
--- a/fs_selfadmin/FS-MailAdminServer/cgi/mailadmin.cgi
+++ b/fs_selfadmin/FS-MailAdminServer/cgi/mailadmin.cgi
@@ -10,7 +10,7 @@
 use DBI;
 use strict;
 use CGI;
-use FS::TestAdminClient qw(authenticate list_packages list_mailboxes delete_mailbox password_mailbox add_mailbox list_forwards list_pkg_forwards delete_forward add_forward);
+use FS::MailAdminClient qw(authenticate list_packages list_mailboxes delete_mailbox password_mailbox add_mailbox list_forwards list_pkg_forwards delete_forward add_forward);
 
 my $sessionfile = '/usr/local/apache/htdocs/mailadmin/adminsess';   # session file
 my $tmpdir = '/usr/local/apache/htdocs/mailadmin/tmp';		# Location to store temp files
-- 
cgit v1.2.1


From 60c837e0aaf454dfa0b0c0283dc36928782d1b6c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 20 Oct 2001 12:18:00 +0000
Subject: setup and recurring fee tax exempt flags, UI to edit rework part_pkg
 editing UI some more

---
 FS/FS/cust_main.pm                    | 39 ++++++++++------
 FS/FS/part_pkg.pm                     | 17 ++++++-
 README.1.4.0pre3-4                    |  2 +
 bin/fs-setup                          |  4 +-
 htetc/global.asa                      |  2 +-
 htetc/handler.pl                      |  2 +-
 httemplate/browse/part_pkg.cgi        |  6 +--
 httemplate/docs/schema.html           |  2 +
 httemplate/docs/upgrade8.html         |  2 +
 httemplate/edit/part_pkg.cgi          | 83 +++++++++++++++++++++++------------
 httemplate/edit/process/cust_main.cgi |  4 +-
 httemplate/edit/process/part_pkg.cgi  |  8 +++-
 httemplate/edit/svc_acct.cgi          |  4 +-
 13 files changed, 121 insertions(+), 54 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index dce73c0ba..3895514d4 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -813,6 +813,7 @@ sub bill {
   # & generate invoice database.
  
   my( $total_setup, $total_recur ) = ( 0, 0 );
+  my( $taxable_setup, $taxable_recur ) = ( 0, 0 );
   my @cust_bill_pkg = ();
 
   foreach my $cust_pkg (
@@ -927,37 +928,49 @@ sub bill {
         push @cust_bill_pkg, $cust_bill_pkg;
         $total_setup += $setup;
         $total_recur += $recur;
+        $taxable_setup += $setup
+          unless $part_pkg->dbdef_table->column('setuptax')
+                 || $part_pkg->setuptax =~ /^Y$/i;
+        $taxable_recur += $recur
+          unless $part_pkg->dbdef_table->column('recurtax')
+                 || $part_pkg->recurtax =~ /^Y$/i;
       }
     }
 
   }
 
   my $charged = sprintf( "%.2f", $total_setup + $total_recur );
+  my $taxable_charged = sprintf( "%.2f", $taxable_setup + $taxable_recur );
 
   unless ( @cust_bill_pkg ) {
     $dbh->commit or die $dbh->errstr if $oldAutoCommit;
     return '';
   } 
 
-  unless ( $self->tax =~ /Y/i || $self->payby eq 'COMP' ) {
+  unless ( $self->tax =~ /Y/i
+           || $self->payby eq 'COMP'
+           || $taxable_charged == 0 ) {
     my $cust_main_county = qsearchs('cust_main_county',{
         'state'   => $self->state,
         'county'  => $self->county,
         'country' => $self->country,
     } );
     my $tax = sprintf( "%.2f",
-      $charged * ( $cust_main_county->getfield('tax') / 100 )
+      $taxable_charged * ( $cust_main_county->getfield('tax') / 100 )
     );
-    $charged = sprintf( "%.2f", $charged+$tax );
-
-    my $cust_bill_pkg = new FS::cust_bill_pkg ({
-      'pkgnum' => 0,
-      'setup'  => $tax,
-      'recur'  => 0,
-      'sdate'  => '',
-      'edate'  => '',
-    });
-    push @cust_bill_pkg, $cust_bill_pkg;
+
+    if ( $tax > 0 ) {
+      $charged = sprintf( "%.2f", $charged+$tax );
+
+      my $cust_bill_pkg = new FS::cust_bill_pkg ({
+        'pkgnum' => 0,
+        'setup'  => $tax,
+        'recur'  => 0,
+        'sdate'  => '',
+        'edate'  => '',
+      });
+      push @cust_bill_pkg, $cust_bill_pkg;
+    }
   }
 
   my $cust_bill = new FS::cust_bill ( {
@@ -1827,7 +1840,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.41 2001-10-15 12:16:42 ivan Exp $
+$Id: cust_main.pm,v 1.42 2001-10-20 12:17:59 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index d84b9c5b7..ceb2a0128 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -52,6 +52,10 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item recur - Recurring fee expression
 
+=item setuptax - Setup fee tax exempt flag, empty or `Y'
+
+=item recurtax - Recurring fee tax exempt flag, empty or `Y'
+
 =item plan - Price plan
 
 =item plandata - Price plan data
@@ -126,7 +130,7 @@ insert and replace methods.
 sub check {
   my $self = shift;
 
-  $self->ut_numbern('pkgpart')
+  my $error = $self->ut_numbern('pkgpart')
     || $self->ut_text('pkg')
     || $self->ut_text('comment')
     || $self->ut_anything('setup')
@@ -135,6 +139,15 @@ sub check {
     || $self->ut_alphan('plan')
     || $self->ut_anything('plandata')
   ;
+  return $error if $error;
+
+  $self->setuptax =~ /^(Y?)$/ or return "Illegal setuptax: ". $self->setuptax;
+  $self->setuptax($1);
+
+  $self->recurtax =~ /^(Y?)$/ or return "Illegal recrutax: ". $self->recurtax;
+  $self->recurtax($1);
+
+  '';
 }
 
 =item pkg_svc
@@ -172,7 +185,7 @@ sub svcpart {
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.3 2001-10-15 10:42:28 ivan Exp $
+$Id: part_pkg.pm,v 1.4 2001-10-20 12:17:59 ivan Exp $
 
 =head1 BUGS
 
diff --git a/README.1.4.0pre3-4 b/README.1.4.0pre3-4
index 49ca5a4d0..0027d3450 100644
--- a/README.1.4.0pre3-4
+++ b/README.1.4.0pre3-4
@@ -16,6 +16,8 @@ ALTER TABLE cust_pay_batch ADD paybatchnum integer;
 CREATE UNIQUE INDEX cust_pay_batch_pkey ON cust_pay_batch ( paybatchnum );
 ALTER TABLE part_pkg ADD plan varchar NULL;
 ALTER TABLE part_pkg ADD plandata varchar NULL;
+ALTER TABLE part_pkg ADD setuptax char(1) NULL;
+ALTER TABLE part_pkg ADD recurtax char(1) NULL;
 
 Run bin/dbdef-create
 
diff --git a/bin/fs-setup b/bin/fs-setup
index 96ec2b74b..5927f88f7 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.62 2001-10-15 10:42:28 ivan Exp $
+# $Id: fs-setup,v 1.63 2001-10-20 12:17:59 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -540,6 +540,8 @@ sub tables_hash_hack {
         'setup',      @perl_type,
         'freq',       'int', '', '',  #billing frequency (months)
         'recur',      @perl_type,
+        'setuptax',  'char', 'NULL', 1,
+        'recurtax',  'char', 'NULL', 1,
         'plan',       'varchar', 'NULL', '',
         'plandata',   'varchar', 'NULL', '',
       ],
diff --git a/htetc/global.asa b/htetc/global.asa
index c3393ad67..a5863c327 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -12,7 +12,7 @@ use FS::part_pkg;
 use FS::pkg_svc;
 use FS::cust_pkg;
 use FS::cust_svc;
-use FS::CGI qw(header menubar popurl table ntable);
+use FS::CGI qw(header menubar popurl table itable ntable);
 
 sub Script_OnStart {
   $cgi = new CGI;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index d747fe464..e537d26fc 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -66,7 +66,7 @@ sub handler
       use FS::pkg_svc;
       use FS::cust_pkg;
       use FS::cust_svc;
-      use FS::CGI qw(header menubar popurl table ntable);
+      use FS::CGI qw(header menubar popurl table itable ntable);
 
       $cgi = new CGI;
       &cgisuidsetup($cgi);
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index e20ba2404..30f994872 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_pkg.cgi,v 1.5 2001-10-15 10:42:28 ivan Exp $ -->
+#<!-- $Id: part_pkg.cgi,v 1.6 2001-10-20 12:17:59 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $part_pkg );
@@ -21,9 +21,9 @@ $p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header("Package Definition Listing",menubar(
   'Main Menu' => $p,
 )), "One or more services are grouped together into a package and given",
-  " pricing information. Customers purchase packages, not services.<BR><BR>", 
+  " pricing information. Customers purchase packages",
+  " rather than purchase services directly.<BR><BR>", 
   &table(), <<END;
-    <TABLE BORDER>
       <TR>
         <TH COLSPAN=2>Package</TH>
         <TH>Comment</TH>
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 88b4cb2b1..145d55fc2 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -196,6 +196,8 @@
         <li>setup - setup fee expression
         <li>freq - recurring frequency (months)
         <li>recur - recurring fee expression
+        <li>setuptax - Setup fee tax exempt flag, empty or `Y'
+        <li>recurtax - Recurring fee tax exempt flag, empty or `Y'
         <li>plan - price plan
         <li>plandata - additional price plan data
       </ul>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index c317e88c8..a368d4488 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -137,6 +137,8 @@ ALTER TABLE cust_refund ADD custnum integer;
 ALTER TABLE cust_pkg ADD manual_flag char(1) NULL;
 ALTER TABLE part_pkg ADD plan varchar NULL;
 ALTER TABLE part_pkg ADD plandata varchar NULL;
+ALTER TABLE part_pkg ADD setuptax char(1) NULL;
+ALTER TABLE part_pkg ADD recurtax char(1) NULL;
 CREATE INDEX cust_main3 ON cust_main ( referral_custnum );
 CREATE INDEX cust_credit_bill1 ON cust_credit_bill ( crednum );
 CREATE INDEX cust_credit_bill2 ON cust_credit_bill ( invnum );
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 5eccc1e1e..fee0b411e 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_pkg.cgi,v 1.5 2001-10-15 11:39:29 ivan Exp $ -->
+<!-- $Id: part_pkg.cgi,v 1.6 2001-10-20 12:17:59 ivan Exp $ -->
 
 <%
 
@@ -34,8 +34,8 @@ if ( $cgi->param('clone') ) {
 }
 unless ( $part_pkg->plan ) { #backwards-compat
   $part_pkg->plan('flat');
-  $part_pkg->plandata("setup=". $part_pkg->setup. "\n".
-                      "recur=". $part_pkg->recur. "\n");
+  $part_pkg->plandata("setup_fee=". $part_pkg->setup. "\n".
+                      "recur_fee=". $part_pkg->recur. "\n");
 }
 $action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
 my $hashref = $part_pkg->hashref;
@@ -76,28 +76,44 @@ print '<FORM NAME="dummy">';
 #print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
 print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
 
+print itable("#cccccc",2), <<END;
+<TR><TD ALIGN="right">Package (customer-visable)</TD><TD><INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}"></TD></TR>
+<TR><TD ALIGN="right">Comment (customer-hidden)</TD><TD><INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}"></TD></TR>
+<TR><TD ALIGN="right">Frequency (months) of recurring fee</TD><TD><INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}" SIZE=3></TD></TR>
+<TR><TD ALIGN="right">Setup fee tax exempt</TD><TD>
+END
+
+print '<INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y"';
+print ' CHECKED' if $hashref->{setuptax} eq "Y";
+print '>';
+
 print <<END;
-<PRE>
-Package (customer-visable)          <INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}">
-Comment (customer-hidden)           <INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}">
+</TD></TR>
+<TR><TD ALIGN="right">Recurring fee tax exempt</TD><TD>
+END
 
-Frequency (months) of recurring fee <INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}">
+print '<INPUT TYPE="checkbox" NAME="recurtax" VALUE="Y"';
+print ' CHECKED' if $hashref->{recurtax} eq "Y";
+print '>';
 
-</PRE>
+print '</TD></TR></TABLE>';
 
+my $thead =  "\n\n". ntable('#cccccc', 2). <<END;
+<TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH><TH BGCOLOR="#dcdcdc">Service</TH></TR>
 END
 
 unless ( $cgi->param('clone') ) {
-  print <<END;
-Enter the quantity of each service this package includes.<BR><BR>
-<TABLE BORDER><TR><TH><FONT SIZE=-1>Quan.</FONT></TH><TH>Service</TH>
-		  <TH><FONT SIZE=-1>Quan.</FONT></TH><TH>Service</TH></TR>
+  #print <<END, $thead;
+  print <<END, itable(), '<TR><TD VALIGN="top">', $thead;
+<BR><BR>Enter the quantity of each service this package includes.<BR><BR>
 END
 }
 
-my $count = 0;
 my @fixups = ();
-foreach my $part_svc ( ( qsearch( 'part_svc', {} ) ) ) {
+my $count = 0;
+my $columns = 3;
+my @part_svc = qsearch( 'part_svc', {} );
+foreach my $part_svc ( @part_svc ) {
   my $svcpart = $part_svc->svcpart;
   my $pkg_svc = qsearchs( 'pkg_svc', {
     'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
@@ -112,16 +128,16 @@ foreach my $part_svc ( ( qsearch( 'part_svc', {} ) ) ) {
   push @fixups, "pkg_svc$svcpart";
 
   unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) {
-    print '<TR>' if $count == 0 ;
-    print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=3 VALUE="!,
+    print '<TR>'; # if $count == 0 ;
+    print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=4 MAXLENGTH=3 VALUE="!,
           $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0,
           qq!"></TD><TD><A HREF="part_svc.cgi?!,$part_svc->svcpart,
-          qq!">!, $part_svc->getfield('svc'), "</A></TD>";
-    $count++;
-    if ($count == 2)
-    {
-      print '</TR>';
-      $count = 0;
+          qq!">!, $part_svc->getfield('svc'), "</A></TD></TR>";
+#    print "</TABLE></TD><TD>$thead" if ++$count == int(scalar(@part_svc) / 2);
+    $count+=1;
+    foreach ( 1 .. $columns-1 ) {
+      print "</TABLE></TD><TD VALIGN=\"top\">$thead"
+        if $count == int( $_ * scalar(@part_svc) / $columns );
     }
   } else {
     print qq!<INPUT TYPE="hidden" NAME="pkg_svc$svcpart" VALUE="!,
@@ -130,8 +146,8 @@ foreach my $part_svc ( ( qsearch( 'part_svc', {} ) ) ) {
 }
 
 unless ( $cgi->param('clone') ) {
-  print qq!</TR>! if ($count != 0) ;
-  print "</TABLE>";
+  print "</TR></TABLE></TD></TR></TABLE>";
+  #print "</TR></TABLE>";
 }
 
 # prolly should be in database
@@ -215,6 +231,12 @@ function fchanged(what) {
 function fixup(what) {
 <% foreach my $f ( qw( pkg comment freq ), @fixups ) { %>
   what.<%= $f %>.value = document.dummy.<%= $f %>.value;
+<% } %>
+<% foreach my $f ( qw( setuptax recurtax ) ) { %>
+  if (document.dummy.<%= $f %>.checked)
+    what.<%= $f %>.value = 'Y';
+  else
+    what.<%= $f %>.value = '';
 <% } %>
   what.plan.value = document.dummy.plan.options[document.dummy.plan.selectedIndex].value;
 <% foreach my $p ( keys %plans ) { %>
@@ -246,6 +268,8 @@ if (document.getElementById) {
 <INPUT TYPE="hidden" NAME="pkg" VALUE="<%= $hashref->{pkg} %>">
 <INPUT TYPE="hidden" NAME="comment" VALUE="$<%= $hashref->{comment} %>">
 <INPUT TYPE="hidden" NAME="freq" VALUE="<%= $hashref->{freq} %>">
+<INPUT TYPE="hidden" NAME="setuptax" VALUE="<%= $hashref->{setuptax} %>">
+<INPUT TYPE="hidden" NAME="recurtax" VALUE="<%= $hashref->{recurtax} %>">
 <% foreach my $f ( @fixups ) { %>
 <INPUT TYPE="hidden" NAME="<%= $f %>" VALUE="">
 <% } %>
@@ -257,17 +281,20 @@ if ( $cgi->param('clone') ) {
 if ( $cgi->param('pkgnum') ) {
   print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $cgi->param('pkgnum'), qq!">!;
 }
-print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
 %>
 
+<INPUT TYPE="hidden" NAME="pkgpart" VALUE="<%= $hashref->{pkgpart} %>">
+<%= itable("#cccccc",2) %>
+
 <% my $href = $plans{$layer}->{'fields'};
    foreach my $field ( keys %{ $href } ) { %>
-<%= $href->{$field}{'name'} %>: 
-<INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= exists($plandata{$field}) ? $plandata{$field} : $href->{$field}{'default'} %>" onChange="fchanged(this)"><BR>
+<TR><TD ALIGN="right"><%= $href->{$field}{'name'} %></TD>
+<TD><INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= exists($plandata{$field}) ? $plandata{$field} : $href->{$field}{'default'} %>" onChange="fchanged(this)"></TD></TR>
 <% } %>
+</TABLE>
 <INPUT TYPE="hidden" NAME="plandata" VALUE="<%= join(',', keys %{ $href } ) %>">
-
 <FONT SIZE="1">
+<BR><BR>
 Setup expression<BR><INPUT TYPE="text" NAME="setup" SIZE="160" VALUE="<%= $hashref->{setup} %>" onLoad="fchanged(this)"><BR>
 Recurring espression<BR><INPUT TYPE="text" NAME="recur" SIZE="160" VALUE="<%= $hashref->{recur} %>" onLoad="fchanged(this)"><BR>
 </FONT>
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index cc5efd6b1..625a85052 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-# $Id: cust_main.cgi,v 1.4 2001-09-04 15:06:03 ivan Exp $
+# $Id: cust_main.cgi,v 1.5 2001-10-20 12:18:00 ivan Exp $
 
 use strict;
 use vars qw( $cgi $payby @invoicing_list $new $custnum $error );
@@ -20,7 +20,7 @@ $error = '';
 
 #unmunge stuff
 
-$cgi->param('tax','') unless defined($cgi->param('tax'));
+$cgi->param('tax','') unless defined $cgi->param('tax');
 
 $cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
 
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 6cfaa122e..cd799b5b9 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_pkg.cgi,v 1.3 2001-10-15 10:42:29 ivan Exp $ -->
+#<!-- $Id: part_pkg.cgi,v 1.4 2001-10-20 12:18:00 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $pkgpart $old $new $part_svc $error $dbh );
@@ -26,12 +26,18 @@ $cgi->param('plandata',
   join('', map { "$_=". $cgi->param($_). "\n" } @plandata )
 );
 
+$cgi->param('setuptax','') unless defined $cgi->param('setuptax');
+$cgi->param('recurtax','') unless defined $cgi->param('recurtax');
+
 $new = new FS::part_pkg ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('part_pkg')
 } );
 
+warn "setuptax: ". $new->setuptax;
+warn "recurtax: ". $new->recurtax;
+
 #most of the stuff below should move to part_pkg.pm
 
 foreach $part_svc ( qsearch('part_svc', {} ) ) {
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 8646bb707..3d0bb0134 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.9 2001-09-27 21:12:15 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.10 2001-10-20 12:18:00 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
@@ -116,7 +116,7 @@ print 'Service # '. ( $svcnum ? "<B>$svcnum</B>" : " (NEW)" ). '<BR>'.
       <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
 END
 
-print &itable("#cccccc"), <<END;
+print &itable("#cccccc",2), <<END;
 <TR><TD>
 <TR><TD ALIGN="right">Username</TD>
 <TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
-- 
cgit v1.2.1


From fcf83b9d956af1049af0d13812cc6756c78308b5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Oct 2001 08:29:42 +0000
Subject: better delete customer code & warnings, delete package ability (&
 warning)

---
 FS/FS/cust_main.pm | 25 ++++++++++++++++++++-----
 FS/FS/cust_pkg.pm  | 15 ++++++++-------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 3895514d4..12be7aba9 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -362,11 +362,13 @@ This will completely remove all traces of the customer record.  This is not
 what you want when a customer cancels service; for that, cancel all of the
 customer's packages (see L<FS::cust_pkg/cancel>).
 
-If the customer has any packages, you need to pass a new (valid) customer
-number for those packages to be transferred to.
+If the customer has any uncancelled packages, you need to pass a new (valid)
+customer number for those packages to be transferred to.  Cancelled packages
+will be deleted.  Did I mention that this is NOT what you want when a customer
+cancels service and that you really should be looking see L<FS::cust_pkg/cancel>?
 
 You can't delete a customer with invoices (see L<FS::cust_bill>),
-or credits (see L<FS::cust_credit>).
+or credits (see L<FS::cust_credit>) or payments (see L<FS::cust_pay>).
 
 =cut
 
@@ -392,8 +394,12 @@ sub delete {
     $dbh->rollback if $oldAutoCommit;
     return "Can't delete a customer with credits";
   }
+  if ( qsearch( 'cust_pay', { 'custnum' => $self->custnum } ) ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "Can't delete a customer with payments";
+  }
 
-  my @cust_pkg = qsearch( 'cust_pkg', { 'custnum' => $self->custnum } );
+  my @cust_pkg = $self->ncancelled_pkgs;
   if ( @cust_pkg ) {
     my $new_custnum = shift;
     unless ( qsearchs( 'cust_main', { 'custnum' => $new_custnum } ) ) {
@@ -411,6 +417,15 @@ sub delete {
       }
     }
   }
+  my @cancelled_pkgs = $self->all_pkgs;
+  foreach my $cust_pkg ( @cancelled_cust_pkg ) {
+    my $error = $cust_pkg->delete;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
   foreach my $cust_main_invoice (
     qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } )
   ) {
@@ -1840,7 +1855,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.42 2001-10-20 12:17:59 ivan Exp $
+$Id: cust_main.pm,v 1.43 2001-10-22 08:29:42 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 069ac8cf7..7aee8d027 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -123,15 +123,16 @@ sub insert {
 
 =item delete
 
-Currently unimplemented.  You don't want to delete billing items, because there
-would then be no record the customer ever purchased the item.  Instead, see
-the cancel method.
+This method now works but you probably shouldn't use it.
+
+You don't want to delete billing items, because there would then be no record
+the customer ever purchased the item.  Instead, see the cancel method.
 
 =cut
 
-sub delete {
-  return "Can't delete cust_pkg records!";
-}
+#sub delete {
+#  return "Can't delete cust_pkg records!";
+#}
 
 =item replace OLD_RECORD
 
@@ -588,7 +589,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.11 2001-10-15 14:58:03 ivan Exp $
+$Id: cust_pkg.pm,v 1.12 2001-10-22 08:29:42 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 813696972eaf418cb94abca6aa2d4bfc4c67829a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Oct 2001 08:31:25 +0000
Subject: tyop

---
 FS/FS/cust_main.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 12be7aba9..dfb712502 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -417,7 +417,7 @@ sub delete {
       }
     }
   }
-  my @cancelled_pkgs = $self->all_pkgs;
+  my @cancelled_cust_pkg = $self->all_pkgs;
   foreach my $cust_pkg ( @cancelled_cust_pkg ) {
     my $error = $cust_pkg->delete;
     if ( $error ) {
@@ -1855,7 +1855,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.43 2001-10-22 08:29:42 ivan Exp $
+$Id: cust_main.pm,v 1.44 2001-10-22 08:31:25 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From f94ef1d2324d55293ba9efeb3a6156a488bbd39f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Oct 2001 12:22:03 +0000
Subject: fix delete method for new databases

---
 FS/FS/svc_domain.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 58c6423c3..8b8c35957 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -279,7 +279,8 @@ sub delete {
     if qsearch( 'svc_acct', { 'domsvc' => $self->svcnum } );
 
   return "Can't delete a domain with (svc_acct_sm) mail aliases!"
-    if qsearch('svc_acct_sm', { 'domsvc' => $self->svcnum } );
+    if defined( $FS::Record::dbdef->table('svc_acct_sm') )
+       && qsearch('svc_acct_sm', { 'domsvc' => $self->svcnum } );
 
   return "Can't delete a domain with (domain_record) zone entries!"
     if qsearch('domain_record', { 'svcnum' => $self->svcnum } );
@@ -533,7 +534,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.20 2001-09-06 20:41:59 ivan Exp $
+$Id: svc_domain.pm,v 1.21 2001-10-22 12:22:03 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From b7cdcea59f34c12f7d181c41014e0d2559bf983c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Oct 2001 14:48:28 +0000
Subject: fix dir check

---
 FS/FS/svc_acct.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 71c47d6cd..8e29cb739 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -720,9 +720,10 @@ sub check {
         or return "Illegal finger: ". $self->getfield('finger');
     $self->setfield('finger', $1);
 
-    $recref->{dir} =~ /^([\/\w\-]*)$/
+    $recref->{dir} =~ /^([\/\w\-\.]*)$/
       or return "Illegal directory";
     $recref->{dir} = $1;
+    return "Illegal directory" if $recref->{dir} =~ /\.\./; #no ..
     unless ( $recref->{dir} ) {
       $recref->{dir} = $dir_prefix . '/';
       if ( $dirhash > 0 ) {
@@ -920,7 +921,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.50 2001-10-02 11:10:19 ivan Exp $
+$Id: svc_acct.pm,v 1.51 2001-10-22 14:48:28 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 8e59cbe916e8d4127a83576f98ba2c23aa04ceaa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Oct 2001 18:15:06 +0000
Subject: mysql fixes

---
 bin/fs-setup | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 5927f88f7..3d76bf823 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.63 2001-10-20 12:17:59 ivan Exp $
+# $Id: fs-setup,v 1.64 2001-10-23 18:15:06 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -73,7 +73,7 @@ my($char_d) = 80; #default maxlength for text fields
 
 #my(@date_type)  = ( 'timestamp', '', ''     );
 my(@date_type)  = ( 'int', 'NULL', ''     );
-my(@perl_type) = ( 'varchar', 'NULL', ''  ); 
+my(@perl_type) = ( 'text', 'NULL', ''  ); 
 my @money_type = ( 'decimal',   '', '10,2' );
 
 ###
@@ -316,7 +316,7 @@ sub tables_hash_hack {
         '_date',    @date_type,
         'amount',   @money_type,
         'otaker',   'varchar', '', 8,
-        'reason',   'varchar', 'NULL', 255,
+        'reason',   'text', 'NULL', '',
       ],
       'primary_key' => 'crednum',
       'unique' => [ [] ],
@@ -379,7 +379,7 @@ sub tables_hash_hack {
         'otaker',   'varchar', '',     8,
         'refnum',   'int',  '',     '',
         'referral_custnum', 'int',  'NULL', '',
-        'comments', 'varchar', 'NULL', '',
+        'comments', 'text', 'NULL', '',
       ],
       'primary_key' => 'custnum',
       'unique' => [ [] ],
@@ -542,8 +542,8 @@ sub tables_hash_hack {
         'recur',      @perl_type,
         'setuptax',  'char', 'NULL', 1,
         'recurtax',  'char', 'NULL', 1,
-        'plan',       'varchar', 'NULL', '',
-        'plandata',   'varchar', 'NULL', '',
+        'plan',       'varchar', 'NULL', $char_d,
+        'plandata',   'text', 'NULL', '',
       ],
       'primary_key' => 'pkgpart',
       'unique' => [ [] ],
@@ -791,7 +791,7 @@ sub tables_hash_hack {
     'queue' => {
       'columns' => [
         'jobnum', 'int', '', '',
-        'job', 'varchar', '', '',
+        'job', 'text', '', '',
         '_date', 'int', '', '',
         'status', 'varchar', '', $char_d,
       ],
@@ -804,7 +804,7 @@ sub tables_hash_hack {
       'columns' => [
         'argnum', 'int', '', '',
         'jobnum', 'int', '', '',
-        'arg', 'varchar', 'NULL', '',
+        'arg', 'text', 'NULL', '',
       ],
       'primary_key' => 'argnum',
       'unique'      => [],
-- 
cgit v1.2.1


From 68a1b014aea963c2c94316fa34ec9a5dd135d102 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Oct 2001 18:57:45 +0000
Subject: document how to set MySQL with BDB default tables

---
 httemplate/docs/config.html  | 10 ++++++----
 httemplate/docs/install.html |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
index 3c6fe0252..75d3070d1 100644
--- a/httemplate/docs/config.html
+++ b/httemplate/docs/config.html
@@ -71,7 +71,8 @@ All further configuration files and directories are located in
   <li><a name="mxmachines">mxmachines</a> - MX entries for new domains, weight and machine, one per line, with trailing `.'
   <li><a name="nsmachines">nsmachines</a> - NS nameservers for new domains, one per line, with trailing `.'
   <li><a name="nismachines">nismachines</a> - Your NIS master (not slave master) machines, one per line.  This enables export of `/etc/global/passwd' and `/etc/global/shadow'.
-  <li><a name="passwordmin">passwordmin</a> - Minimum password length (default 6);
+  <li><a name="passwordmin">passwordmin</a> - Minimum password length (default 6)
+  <li><a name="passwordmax">passwordmax</a> - Maximum password length (default 8) (don't set this over 12 if you need to import or export crypt() passwords)
   <li><a name="qmailmachines">qmailmachines</a> - Your qmail machines, one per line.  This enables export of `/var/qmail/control/virtualdomains', `/var/qmail/control/recipientmap', and `/var/qmail/control/rcpthosts'.  The existance of this file (even if empty) also turns on user `.qmail-extension' file maintenance in conjunction with `shellmachine'.
   <li><a name="radiusmachines">radiusmachines</a> - Your RADIUS authentication machines, one per line.  This enables export of `/etc/raddb/users'.
   <li><a name="referraldefault">referraldefault</a> - Default referral, specified by refnum.
@@ -92,9 +93,9 @@ All further configuration files and directories are located in
   <li><a name="session-start">session-start</a> - If defined, the command which is executed on the Freeside machine when a session begins.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
   <li><a name="session-stop">session-stop</a> - If defined, the command which is executed on the Freeside machine when a session ends.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
   <li><a name="shellmachine">shellmachine</a> - A single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines', it also enables `.qmail-extension' file maintenance.
-  <li>shellmachine-useradd - The command(s) to run on shellmachine when an account is created.  If this file does not exist, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If the file exists but is empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.
-  <li>shellmachine-userdel - The command(s) to run on shellmachine when an account is deleted.  If this file does not exist, <code>userdel $username</code> is the default.  If the file exists but is empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.
-  <li>shellmachine-usermod - The command(s) to run on shellmachine when an account is modified.  If this file does not exist or is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.
+  <li><a name="shellmachine-useradd">shellmachine-useradd</a> - The command(s) to run on shellmachine when an account is created.  If this file does not exist, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If the file exists but is empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.
+  <li><a name="shellmachine-userdel">shellmachine-userdel</a> - The command(s) to run on shellmachine when an account is deleted.  If this file does not exist, <code>userdel $username</code> is the default.  If the file exists but is empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.
+  <li><a name="shellmachine-usermod">shellmachine-usermod</a> - The command(s) to run on shellmachine when an account is modified.  If this file does not exist or is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.
   <li><a name="shellmachines">shellmachines</a> - Your Linux and System V flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/shadow' files.
   <li><a name="shells"><font color="#ff0000">shells</font></a> - Legal shells (think /etc/shells).  You probably want to `cut -d: -f7 /etc/passwd | sort | uniq' initially so that importing doesn't fail with `Illegal shell' errors, then remove any special entries afterwords.  A blank line specifies that an empty shell is permitted.
   <li><a name="showpasswords">showpasswords</a> - The existance of this file will allow unencrypted user passwords to be displayed.
@@ -111,6 +112,7 @@ All further configuration files and directories are located in
   <li><a name="unsuspendauto">unsuspendauto</a> _ The existance of this file will enable the automatic unsuspension of suspended packages when a customer's balance due changes from positive to zero or negative as the result of a payment or credit.
   <li><a name="usernamemin">usernamemin</a> - Minimum username length (default 2);
   <li><a name="usernamemax">usernamemax</a> - Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)
+  <li><a name="username-ampersand">username-ampersand</a> - The existance of this file will allow the ampersand character (&amp;) in usernames.  Be careful when using this option in conjunction with <a href="#shellmachine-useradd">shellmachine-useradd</a> and other configuration options which execute shell commands, as the ampersand will be interpreted by the shell if not quoted.
   <li><a name="username-letter">username-letter</a> - The existance of this file will turn on the requirement that usernames contain at least one letter.
   <li><a name="username-letterfirst">username-letterfirst</a> - The existance of this file will turn on the requirement that usernames start with a letter.
   <li><a name="username-noperiod">username-noperiod</a> - The existance of this file will disallow periods in usernames.
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 44644dc91..6861a173e 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -7,9 +7,9 @@ Before installing, you need:
 <ul>
   <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
   <li><a href="http://perl.apache.org/">mod_perl</a>
-  <li><a href="http://www.openssh.com//">SSH</a> (<a href="http://www.openssh.com//">OpenSSH</a> is recommended.  SSH Communications Security commercial <a href="http://www.ssh.com/products/ssh/download.cfm">SSH version 3</a> has been reported incompatible with Freeside.)
+  <li><a href="http://www.openssh.com//">SSH</a> (<a href="http://www.openssh.com//">OpenSSH</a> is recommended.  SSH Communications Security <a href="http://www.ssh.com/products/ssh/download.cfm">commercial SSH version 3</a> has been reported incompatible with Freeside.)
   <li><a href="http://www.perl.com/">Perl</a>  Don't enable experimental features like threads or the PerlIO abstraction layer.
-  <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.  <a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.  <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>.
+  <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.  <a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.  <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=DBD</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
   <li>Perl modules (<a href="http://theoryx5.uwinnipeg.ca/CPAN/perl/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
     <ul>
       <li><a href="http://search.cpan.org/search?dist=Array-PrintCols">Array-PrintCols</a>
-- 
cgit v1.2.1


From 6f325cd8d38905b98c6f11a64701653bdd9f9fcf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Oct 2001 20:53:06 +0000
Subject: Pg: FOR UPDATE LIMIT 1 mysql: LIMIT 1 FOR UPDATE

greeeat.
---
 FS/bin/freeside-queued | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 35728db53..4e3724e6e 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -7,7 +7,7 @@ use Fcntl qw(:flock);
 use POSIX qw(setsid);
 use Date::Format;
 use IO::File;
-use FS::UID qw(adminsuidsetup forksuidsetup);
+use FS::UID qw(adminsuidsetup forksuidsetup driver_name);
 use FS::Record qw(qsearchs);
 use FS::queue;
 
@@ -48,7 +48,9 @@ while (1) {
     'queue',
     { 'status' => 'new' },
     '',
-    'ORDER BY jobnum FOR UPDATE LIMIT 1'
+    driver_name =~ /^mysql$/i
+      ? 'ORDER BY jobnum LIMIT 1 FOR UPDATE'
+      : 'ORDER BY jobnum FOR UPDATE LIMIT 1'
   ) or do {
     sleep 5;
     next;
@@ -76,7 +78,7 @@ while (1) {
 
     #get new db handles
     $FS::UID::dbh->{InactiveDestroy} = 1;
-    $FS::svc_acct::icradius_dbh->{InactiveDestroy}
+    $FS::svc_acct::icradius_dbh->{InactiveDestroy} = 1
       if $FS::svc_acct::icradius_dbh;
     forksuidsetup($user);
 
-- 
cgit v1.2.1


From 40927c9cd9472719a3720270256f4300b81ebc98 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Oct 2001 00:59:56 +0000
Subject: Can't find string terminator "!" anywhere before EOF at queue.cgi
 line 42

---
 httemplate/browse/queue.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index 7a55cf3cf..76eed136d 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: queue.cgi,v 1.2 2001-10-12 15:26:22 ivan Exp $ -->
+#<!-- $Id: queue.cgi,v 1.3 2001-10-24 00:59:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p ); # $part_referral );
@@ -39,7 +39,7 @@ foreach my $queue ( sort {
   if ( $status eq 'failed' || $status eq 'locked' ) {
     $status .=
       qq! ( <A HREF="$p/edit/queue.cgi?jobnum=$jobnum&action=new">retry</A> |!.
-      qq! <A HREF="$p/edit/queue.cgi?jobnum$jobnum&action=del">remove </A> )';
+      qq! <A HREF="$p/edit/queue.cgi?jobnum$jobnum&action=del">remove </A> )!;
   }
   print <<END;
       <TR>
-- 
cgit v1.2.1


From e6b57805f6b3e76448ab9b6d280f2c53bc1410f3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Oct 2001 15:29:31 +0000
Subject: preliminary web config editor

new config files: username-ampersand, passwordmax

fs-setup updates

get rid of old and crufty and unused registries/ config foo

documentation updates
---
 FS/FS.pm                              |   4 +-
 FS/FS/Conf.pm                         | 587 +++++++++++++++++++++++++++++++++-
 FS/FS/ConfItem.pm                     |  63 ++++
 FS/FS/svc_acct.pm                     |  26 +-
 FS/FS/svc_domain.pm                   | 124 +------
 FS/MANIFEST                           |   2 +
 FS/t/ConfItem.t                       |   5 +
 bin/fs-setup                          |  18 +-
 bin/svc_acct.export                   |   5 +-
 conf/registries/internic/from         |   1 -
 conf/registries/internic/nameservers  |   3 -
 conf/registries/internic/tech_contact |   1 -
 conf/registries/internic/template     | 231 -------------
 conf/registries/internic/to           |   1 -
 fs_webdemo/registerd.Pg               |  20 +-
 httemplate/config/config-process.cgi  |  44 +++
 httemplate/config/config-view.cgi     |  46 +++
 httemplate/docs/config.html           | 100 +-----
 httemplate/docs/install.html          |   6 +-
 httemplate/index.html                 |  27 +-
 httemplate/search/svc_acct.cgi        |   8 +-
 21 files changed, 820 insertions(+), 502 deletions(-)
 create mode 100644 FS/FS/ConfItem.pm
 create mode 100644 FS/t/ConfItem.t
 delete mode 100644 conf/registries/internic/from
 delete mode 100644 conf/registries/internic/nameservers
 delete mode 100644 conf/registries/internic/tech_contact
 delete mode 100644 conf/registries/internic/template
 delete mode 100644 conf/registries/internic/to
 create mode 100644 httemplate/config/config-process.cgi
 create mode 100644 httemplate/config/config-view.cgi

diff --git a/FS/FS.pm b/FS/FS.pm
index d2c07e47c..ca3330066 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -21,6 +21,8 @@ Freeside ISP billing software.  This includes:
 
 L<FS::Conf> - Freeside configuration values
 
+L<FS::ConfItem> - Freeside configuration option meta-data.
+
 L<FS::UID> - User class (not yet OO)
 
 L<FS::CGI> - Non OO-subroutines for the web interface.  This is
@@ -141,7 +143,7 @@ The main documentation is in htdocs/docs.
 
 =head1 VERSION
 
-$Id: FS.pm,v 1.9 2001-09-26 09:17:06 ivan Exp $
+$Id: FS.pm,v 1.10 2001-10-24 15:29:30 ivan Exp $
 
 =head1 SUPPORT
 
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 7c6105bdc..615fdcb72 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1,7 +1,10 @@
 package FS::Conf;
 
-use vars qw($default_dir);
+use vars qw($default_dir @config_items $DEBUG );
 use IO::File;
+use FS::ConfItem;
+
+$DEBUG = 0;
 
 =head1 NAME
 
@@ -22,6 +25,8 @@ FS::Conf - Read access to Freeside configuration values
   @list  = $conf->config('key');
   $bool  = $conf->exists('key');
 
+  @config_items = $conf->config_items;
+
 =head1 DESCRIPTION
 
 Read access to Freeside configuration values.  Keys currently map to filenames,
@@ -58,7 +63,8 @@ sub dir {
   -d $dir or die "FATAL: $dir isn't a directory!";
   -r $dir or die "FATAL: Can't read $dir!";
   -x $dir or die "FATAL: $dir not searchable (executable)!";
-  $dir;
+  $dir =~ /^(.*)$/;
+  $1;
 }
 
 =item config 
@@ -97,16 +103,589 @@ sub exists {
   -e "$dir/$file";
 }
 
+=item touch
+
+=cut
+
+sub touch {
+  my($self, $file) = @_;
+  my $dir = $self->dir;
+  unless ( $self->exists($file) ) {
+    warn "[FS::Conf] TOUCH $file\n" if $DEBUG;
+    system('touch', "$dir/$file");
+  }
+}
+
+=item set
+
+=cut
+
+sub set {
+  my($self, $file, $value) = @_;
+  my $dir = $self->dir;
+  $value =~ /^(.*)$/s;
+  $value = $1;
+  unless ( $self->config($file) eq $value ) {
+    warn "[FS::Conf] SET $file\n" if $DEBUG;
+    warn "$dir" if is_tainted($dir);
+    warn "$dir" if is_tainted($file);
+    my $fh = new IO::File ">$dir/$file" or return;
+    print $fh "$value\n";
+  }
+}
+sub is_tainted {
+             return ! eval { join('',@_), kill 0; 1; };
+         }
+
+=item delete
+
+=cut
+
+sub delete {
+  my($self, $file) = @_;
+  my $dir = $self->dir;
+  if ( $self->exists($file) ) {
+    warn "[FS::Conf] DELETE $file\n";
+    unlink "$dir/$file";
+  }
+}
+
+=item config_items
+
+Returns all of the possible configuration items as FS::ConfItem objects.  See
+L<FS::ConfItem>.
+
+=cut
+
+sub config_items {
+#  my $self = shift; 
+  @config_items;
+}
+
 =back
 
 =head1 BUGS
 
-Write access (with locking) should be implemented.
+Write access (touch, set, delete) should be documented.
+
+If this was more than just crud that will never be useful outside Freeside I'd
+worry that config_items is freeside-specific and icky.
 
 =head1 SEE ALSO
 
-config.html from the base documentation contains a list of configuration files.
+"Configuration" in the web interface (config/config.cgi).
+
+httemplate/docs/config.html
 
 =cut
 
+@config_items = map { new FS::ConfItem $_ } (
+
+  {
+    'key'         => 'address',
+    'section'     => 'depreciated',
+    'description' => 'This configuration file is no longer used.  See <a href="#invoice_template">invoice_template</a> instead.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'apacheroot',
+    'section'     => 'apache',
+    'description' => 'The directory containing Apache virtual hosts',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'apachemachine',
+    'section'     => 'apache',
+    'description' => 'A machine with the apacheroot directory and user home directories.  The existance of this file enables setup of virtual host directories, and, in conjunction with the `home\' configuration file, symlinks into user home directories.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'apachemachines',
+    'section'     => 'apache',
+    'description' => 'Your Apache machines, one per line.  This enables export of `/etc/apache/vhosts.conf\', which can be included in your Apache configuration via the <a href="http://www.apache.org/docs/mod/core.html#include">Include</a> directive.',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'bindprimary',
+    'section'     => 'BIND',
+    'description' => 'Your BIND primary nameserver.  This enables export of /var/named/named.conf and zone files into /var/named',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'bindsecondaries',
+    'section'     => 'BIND',
+    'description' => 'Your BIND secondary nameservers, one per line.  This enables export of /var/named/named.conf',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'business-onlinepayment',
+    'section'     => 'billing',
+    'description' => '<a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a> support, at least three lines: processor, login, and password.  An optional fourth line specifies the action or actions (multiple actions are separated with `,\': for example: `Authorization Only, Post Authorization\').    Optional additional lines are passed to Business::OnlinePayment as %processor_options.',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'bsdshellmachines',
+    'section'     => '',
+    'description' => 'Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd\' and `/etc/master.passwd\'.',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'countrydefault',
+    'section'     => 'UI',
+    'description' => 'Default two-letter country code (if not supplied, the default is `US\')',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'cybercash3.2',
+    'section'     => 'billing',
+    'description' => '<a href="http://www.cybercash.com/cashregister/">CyberCash Cashregister v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly\' or `mauthcapture\').',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'cyrus',
+    'section'     => '',
+    'description' => 'Integration with <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a>, three lines: IMAP server, admin username, and admin password.  Cyrus::IMAP::Admin should be installed locally and the connection to the server secured.',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'deletecustomers',
+    'section'     => 'UI',
+    'description' => 'The existance of this file will enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that this customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers\' packages if they cancel service.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'dirhash',
+    'section'     => 'shell',
+    'description' => 'Optional numeric value to control directory hashing.  If positive, hashes directories for the specified number of levels from the front of the username.  If negative, hashes directories for the specified number of levels from the end of the username.  Some examples: <ul><li>1: user -> <a href="#home">/home</a>/u/user<li>2: user -> <a href="#home">/home</a>/u/s/user<li>-1: user -> <a href="#home">/home</a>/r/user<li>-2: user -> <a href="#home">home</a>/r/e/user</ul>',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'disable_customer_referrals',
+    'section'     => 'UI',
+    'description' => 'The existance of this file will disable new customer-to-customer referrals in the web interface.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'domain',
+    'section'     => 'depreciated',
+    'description' => 'Your domain name.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'editreferrals',
+    'section'     => 'UI',
+    'description' => 'The existance of this file will allow you to change the referral of existing customers.',
+    'type'       => 'checkbox',
+  },
+
+  {
+    'key'         => 'emailinvoiceonly',
+    'section'     => 'billing',
+    'description' => 'Disables postal mail invoices.',
+    'type'       => 'checkbox',
+  },
+
+  {
+    'key'         => 'emailinvoiceauto',
+    'section'     => 'billing',
+    'description' => 'Automatically adds new accounts to the email invoice list upon customer creation.',
+    'type'       => 'checkbox',
+  },
+
+  {
+    'key'         => 'erpcdmachines',
+    'section'     => '',
+    'description' => 'Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd\' and `/usr/annex/acp_dialup\'.',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'hidecancelledpackages',
+    'section'     => 'UI',
+    'description' => 'The existance of this file will prevent cancelled packages from showing up in listings (though they will still be in the database)',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'hidecancelledcustomers',
+    'section'     => 'UI',
+    'description' => 'The existance of this file will prevent customers with only cancelled packages from showing up in listings (though they will still be in the database)',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'home',
+    'section'     => 'required',
+    'description' => 'For new users, prefixed to username to create a directory name.  Should have a leading but not a trailing slash.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'icradiusmachines',
+    'section'     => '',
+    'description' => 'Your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines, one per line.  The existance of this file (even if empty) turns on radcheck table creation (in the freeside database - the radcheck table needs to be created manually).  Machines listed in this file will have the radcheck table exported to them.  Each line of this file should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: "<CODE>radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd</CODE>".  You do not need to use MySQL for your Freeside database to export to an ICRADIUS mysql database with this option.',
+    'type'        => [qw( checkbox textarea )],
+  },
+
+  {
+    'key'         => 'icradius_mysqldest',
+    'section'     => '',
+    'description' => 'Destination directory for the MySQL databases, on the ICRADIUS machines.  Defaults to "/usr/local/var/".',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'icradius_mysqlsource',
+    'section'     => '',
+    'description' => 'Source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'icradius_secrets',
+    'section'     => '',
+    'description' => 'Optionally specifies a MySQL database for ICRADIUS export, if you\'re not running MySQL for your Freeside database.  The database should be on the Freeside machine and store data in the <a href="#icradius_mysqlsource">icradius_mysqlsource</a> directory.  Three lines: DBI data source, username and password.  This file should not be world readable.',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'invoice_from',
+    'section'     => 'required',
+    'description' => 'Return address on email invoices.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'invoice_template',
+    'section'     => 'required',
+    'description' => 'Required template file for invoices.  See the <a href="../docs/billing.html">billing documentation</a> for details.',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'lpr',
+    'section'     => 'required',
+    'description' => 'Print command for paper invoices, for example `lpr -h\'.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'maildisablecatchall',
+    'section'     => 'depreciated',
+    'description' => '<b>DEPRECIATED</b>, now the default.  The existance of this file used to disable the requirement that each virtual domain have a catch-all mailbox.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'money_char',
+    'section'     => '',
+    'description' => 'Currency symbol - defaults to `$\'.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'mxmachines',
+    'section'     => 'BIND',
+    'description' => 'MX entries for new domains, weight and machine, one per line, with trailing `.\'',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'nsmachines',
+    'section'     => 'BIND',
+    'description' => 'NS nameservers for new domains, one per line, with trailing `.\'',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'nismachines',
+    'section'     => '',
+    'description' => 'Your NIS master (not slave master) machines, one per line.  This enables export of `/etc/global/passwd\' and `/etc/global/shadow\'.',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'passwordmin',
+    'section'     => 'password',
+    'description' => 'Minimum password length (default 6)',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'passwordmax',
+    'section'     => 'password',
+    'description' => 'Maximum password length (default 8) (don\'t set this over 12 if you need to import or export crypt() passwords)',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'qmailmachines',
+    'section'     => '',
+    'description' => 'Your qmail machines, one per line.  This enables export of `/var/qmail/control/virtualdomains\', `/var/qmail/control/recipientmap\', and `/var/qmail/control/rcpthosts\'.  The existance of this file (even if empty) also turns on user `.qmail-extension\' file maintenance in conjunction with `shellmachine\'.',
+    'type'        => [qw( checkbox textarea )],
+  },
+
+  {
+    'key'         => 'radiusmachines',
+    'section'     => '',
+    'description' => 'Your RADIUS authentication machines, one per line.  This enables export of `/etc/raddb/users\'.',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'referraldefault',
+    'section'     => 'UI',
+    'description' => 'Default referral, specified by refnum.',
+    'type'        => 'text',
+  },
+
+#  {
+#    'key'         => 'registries',
+#    'section'     => 'required',
+#    'description' => 'Directory which contains domain registry information.  Each registry is a directory.',
+#  },
+
+  {
+    'key'         => 'sendmailconfigpath',
+    'section'     => '',
+    'description' => 'Sendmail configuration file path - defaults to `/etc\'.  Many newer distributions use `/etc/mail\'.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'sendmailmachines',
+    'section'     => '',
+    'description' => 'Your sendmail machines, one per line.  This enables export of `/etc/virtusertable\' and `/etc/sendmail.cw\'.',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'sendmailrestart',
+    'section'     => '',
+    'description' => 'If defined, the command which is run on sendmail machines after files are copied.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'session-start',
+    'section'     => 'session',
+    'description' => 'If defined, the command which is executed on the Freeside machine when a session begins.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'session-stop',
+    'section'     => 'session',
+    'description' => 'If defined, the command which is executed on the Freeside machine when a session ends.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'shellmachine',
+    'section'     => 'shell',
+    'description' => 'A single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines\', it also enables `.qmail-extension\' file maintenance.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'shellmachine-useradd',
+    'section'     => 'shell',
+    'description' => 'The command(s) to run on shellmachine when an account is created.  If this file does not exist, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If the file exists but is empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.',
+    'type'        => [qw( checkbox text )],
+  },
+
+  {
+    'key'         => 'shellmachine-userdel',
+    'section'     => 'shell',
+    'description' => 'The command(s) to run on shellmachine when an account is deleted.  If this file does not exist, <code>userdel $username</code> is the default.  If the file exists but is empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.',
+    'type'        => [qw( checkbox text )],
+  },
+
+  {
+    'key'         => 'shellmachine-usermod',
+    'section'     => 'shell',
+    'description' => 'The command(s) to run on shellmachine when an account is modified.  If this file does not exist or is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.',
+    'type'        => [qw( checkbox text )],
+  },
+
+  {
+    'key'         => 'shellmachines',
+    'section'     => 'shell',
+    'description' => 'Your Linux and System V flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd\' and `/etc/shadow\' files.',
+     'type'        => 'textarea',
+ },
+
+  {
+    'key'         => 'shells',
+    'section'     => 'required',
+    'description' => 'Legal shells (think /etc/shells).  You probably want to `cut -d: -f7 /etc/passwd | sort | uniq\' initially so that importing doesn\'t fail with `Illegal shell\' errors, then remove any special entries afterwords.  A blank line specifies that an empty shell is permitted.',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'showpasswords',
+    'section'     => 'UI',
+    'description' => 'The existance of this file will allow unencrypted user passwords to be displayed.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'signupurl',
+    'section'     => 'UI',
+    'description' => 'if you are using customer-to-customer referrals, and you enter the URL of your <a href="signup.html">signup server CGI</a>, the customer view screen will display a customized link to the signup server with the appropriate customer as referral.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'smtpmachine',
+    'section'     => 'required',
+    'description' => 'SMTP relay for Freeside\'s outgoing mail.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'soadefaultttl',
+    'section'     => 'BIND',
+    'description' => 'SOA default TTL for new domains.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'soaemail',
+    'section'     => 'BIND',
+    'description' => 'SOA email for new domains, in BIND form (`.\' instead of `@\'), with trailing `.\'',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'soaexpire',
+    'section'     => 'BIND',
+    'description' => 'SOA expire for new domains',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'soamachine',
+    'section'     => 'BIND',
+    'description' => 'SOA machine for new domains, with trailing `.\'',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'soarefresh',
+    'section'     => 'BIND',
+    'description' => 'SOA refresh for new domains',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'soaretry',
+    'section'     => 'BIND',
+    'description' => 'SOA retry for new domains',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'statedefault',
+    'section'     => 'UI',
+    'description' => 'Default state or province (if not supplied, the default is `CA\')',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'textradiusprepend',
+    'section'     => 'depreciated',
+    'description' => '<b>DEPRECIATED</b>, use RADIUS check attributes instead.  This option will be removed soon.  The contents of this file will be prepended to the first line of a user\'s RADIUS entry in text exports.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'unsuspendauto',
+    'section'     => 'billing',
+    'description' => 'The existance of this file will enable the automatic unsuspension of suspended packages when a customer\'s balance due changes from positive to zero or negative as the result of a payment or credit.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'usernamemin',
+    'section'     => 'username',
+    'description' => 'Minimum username length (default 2);',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'usernamemax',
+    'section'     => 'username',
+    'description' => 'Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'username-ampersand',
+    'section'     => 'username',
+    'description' => 'The existance of this file will allow the ampersand character (&amp;) in usernames.  Be careful when using this option in conjunction with <a href="#shellmachine-useradd">shellmachine-useradd</a> and other configuration options which execute shell commands, as the ampersand will be interpreted by the shell if not quoted.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'username-letter',
+    'section'     => 'username',
+    'description' => 'The existance of this file will turn on the requirement that usernames contain at least one letter.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'username-letterfirst',
+    'section'     => 'username',
+    'description' => 'The existance of this file will turn on the requirement that usernames start with a letter.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'username-noperiod',
+    'section'     => 'username',
+    'description' => 'The existance of this file will disallow periods in usernames.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'username-uppercase',
+    'section'     => 'username',
+    'description' => 'The existance of this file will allow uppercase characters in username.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'username_policy',
+    'section'     => '',
+    'description' => 'This file controls the mechanism for preventing duplicate usernames in passwd/radius files exported from svc_accts.  This should be one of \'prepend domsvc\' \'append domsvc\' or \'append domain\'',
+#    'type'        => 'select',
+    'type'        => '',
+  },
+
+  {
+    'key'         => 'vpopmailmachines',
+    'section'     => '',
+    'description' => 'Your vpopmail pop toasters, one per line.  Each line is of the form "machinename vpopdir vpopuid vpopgid".  For example: <code>poptoaster.domain.tld /home/vpopmail 508 508</code>  Note: vpopuid and vpopgid are values taken from the vpopmail machine\'s /etc/passwd',
+    'type'        => 'textarea',
+  },
+
+);
+
 1;
+
diff --git a/FS/FS/ConfItem.pm b/FS/FS/ConfItem.pm
new file mode 100644
index 000000000..83295b4fa
--- /dev/null
+++ b/FS/FS/ConfItem.pm
@@ -0,0 +1,63 @@
+package FS::ConfItem;
+
+=head1 NAME
+
+FS::ConfItem - Configutaion option meta-data.
+
+=head1 SYNOPSIS
+
+  use FS::Conf;
+  @config_items = $conf->config_items;
+
+  foreach $item ( @config_items ) {
+    $key = $item->key;
+    $section = $item->section;
+    $description = $item->description;
+  }
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=over 4
+
+=item new
+
+=cut
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = @_ ? shift : {};
+  bless ($self, $class);
+}
+
+=item key
+
+=item section
+
+=item description
+
+=cut
+
+sub AUTOLOAD {
+  my $self = shift;
+  my $field = $AUTOLOAD;
+  $field =~ s/.*://;
+  $self->{$field};
+}
+
+=back
+
+=head1 BUGS
+
+Terse docs.
+
+=head1 SEE ALSO
+
+L<FS::Conf>
+
+=cut
+
+1;
+
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 8e29cb739..3e7230f49 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -2,7 +2,8 @@ package FS::svc_acct;
 
 use strict;
 use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
-             $usernamemax $passwordmin $username_letter $username_letterfirst
+             $usernamemax $passwordmin $passwordmax
+             $username_ampersand $username_letter $username_letterfirst
              $username_noperiod $username_uppercase
              $shellmachine $useradd $usermod $userdel $mydomain
              $cyrus_server $cyrus_admin_user $cyrus_admin_pass
@@ -33,6 +34,7 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
   $usernamemin = $conf->config('usernamemin') || 2;
   $usernamemax = $conf->config('usernamemax');
   $passwordmin = $conf->config('passwordmin') || 6;
+  $passwordmax = $conf->config('passwordmax') || 8;
   if ( $shellmachine ) {
     if ( $conf->exists('shellmachine-useradd') ) {
       $useradd = join("\n", $conf->config('shellmachine-useradd') )
@@ -58,6 +60,7 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
   $username_letterfirst = $conf->exists('username-letterfirst');
   $username_noperiod = $conf->exists('username-noperiod');
   $username_uppercase = $conf->exists('username-uppercase');
+  $username_ampersand = $conf->exists('username-ampersand');
   $mydomain = $conf->config('domain');
   if ( $conf->exists('cyrus') ) {
     ($cyrus_server, $cyrus_admin_user, $cyrus_admin_pass) =
@@ -676,11 +679,11 @@ sub check {
 
   my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;
   if ( $username_uppercase ) {
-    $recref->{username} =~ /^([a-z0-9_\-\.]{$usernamemin,$ulen})$/i
+    $recref->{username} =~ /^([a-z0-9_\-\.\&]{$usernamemin,$ulen})$/i
       or return "Illegal username: ". $recref->{username};
     $recref->{username} = $1;
   } else {
-    $recref->{username} =~ /^([a-z0-9_\-\.]{$usernamemin,$ulen})$/
+    $recref->{username} =~ /^([a-z0-9_\-\.\&]{$usernamemin,$ulen})$/
       or return "Illegal username: ". $recref->{username};
     $recref->{username} = $1;
   }
@@ -693,6 +696,9 @@ sub check {
   if ( $username_noperiod ) {
     $recref->{username} =~ /\./ and return "Illegal username";
   }
+  unless ( $username_ampersand ) {
+    $recref->{username} =~ /\&/ and return "Illegal username";
+  }
 
   $recref->{popnum} =~ /^(\d*)$/ or return "Illegal popnum: ".$recref->{popnum};
   $recref->{popnum} = $1;
@@ -720,10 +726,13 @@ sub check {
         or return "Illegal finger: ". $self->getfield('finger');
     $self->setfield('finger', $1);
 
-    $recref->{dir} =~ /^([\/\w\-\.]*)$/
+    $recref->{dir} =~ /^([\/\w\-\.\&]*)$/
       or return "Illegal directory";
     $recref->{dir} = $1;
-    return "Illegal directory" if $recref->{dir} =~ /\.\./; #no ..
+    return "Illegal directory"
+      if $recref->{dir} =~ /(^|\/)\.+(\/|$)/; #no .. component
+    return "Illegal directory"
+      if $recref->{dir} =~ /\&/ && ! $username_ampersand;
     unless ( $recref->{dir} ) {
       $recref->{dir} = $dir_prefix . '/';
       if ( $dirhash > 0 ) {
@@ -787,7 +796,7 @@ sub check {
     unless ( $recref->{_password} );
 
   #if ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([^\t\n]{4,16})$/ ) {
-  if ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([^\t\n]{$passwordmin,8})$/ ) {
+  if ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([^\t\n]{$passwordmin,$passwordmax})$/ ) {
     $recref->{_password} = $1.$3;
     #uncomment this to encrypt password immediately upon entry, or run
     #bin/crypt_pw in cron to give new users a window during which their
@@ -803,7 +812,8 @@ sub check {
   } elsif ( $recref->{_password} eq '!!' ) {
     $recref->{_password} = '!!';
   } else {
-    return "Illegal password";
+    #return "Illegal password";
+    return "Illegal password: ". $recref->{_password};
   }
 
   ''; #no error
@@ -921,7 +931,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.51 2001-10-22 14:48:28 ivan Exp $
+$Id: svc_acct.pm,v 1.52 2001-10-24 15:29:30 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 8b8c35957..bc62ea7bc 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -2,7 +2,6 @@ package FS::svc_domain;
 
 use strict;
 use vars qw( @ISA $whois_hack $conf $smtpmachine
-  $tech_contact $from $to @nameservers @nameserver_ips @template
   @mxmachines @nsmachines $soadefaultttl $soaemail $soaexpire $soamachine
   $soarefresh $soaretry $qshellmachine $nossh_hack
 );
@@ -29,23 +28,6 @@ $FS::UID::callback{'FS::domain'} = sub {
 
   $smtpmachine = $conf->config('smtpmachine');
 
-  my($internic)="/registries/internic";
-  $tech_contact = $conf->config("$internic/tech_contact");
-  $from = $conf->config("$internic/from");
-  $to = $conf->config("$internic/to");
-  my(@ns) = $conf->config("$internic/nameservers");
-  @nameservers=map {
-    /^\s*\d+\.\d+\.\d+\.\d+\s+([^\s]+)\s*$/
-      or die "Illegal line in $internic/nameservers";
-    $1;
-  } @ns;
-  @nameserver_ips=map {
-    /^\s*(\d+\.\d+\.\d+\.\d+)\s+([^\s]+)\s*$/
-      or die "Illegal line in $internic/nameservers!";
-    $1;
-  } @ns;
-  @template = map { $_. "\n" } $conf->config("$internic/template");
-
   @mxmachines    = $conf->config('mxmachines');
   @nsmachines    = $conf->config('nsmachines');
   $soadefaultttl = $conf->config('soadefaultttl');
@@ -426,115 +408,15 @@ Submits a registration email for this domain.
 =cut
 
 sub submit_internic {
-  my $self = shift;
-
-  my $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
-  return unless $cust_pkg;
-  my $cust_main = qsearchs( 'cust_main', { 'custnum' => $cust_pkg->custnum } );
-  return unless $cust_main;
-
-  my %subs = (
-    'action'       => $self->action,
-    'purpose'      => $self->purpose,
-    'domain'       => $self->domain,
-    'company'      => $cust_main->company 
-                        || $cust_main->getfield('first'). ' '.
-                           $cust_main->getfield('last')
-                      ,
-    'city'         => $cust_main->city,
-    'state'        => $cust_main->state,
-    'zip'          => $cust_main->zip,
-    'country'      => $cust_main->country,
-    'last'         => $cust_main->getfield('last'),
-    'first'        => $cust_main->getfield('first'),
-    'daytime'      => $cust_main->daytime,
-    'fax'          => $cust_main->fax,
-    'email'        => $self->email,
-    'tech_contact' => $tech_contact,
-    'primary'      => shift @nameservers,
-    'primary_ip'   => shift @nameserver_ips,
-  );
-
-  #yuck
-  my @xtemplate = @template;
-  my @body;
-  my $line;
-  OLOOP: while ( defined( $line = shift @xtemplate ) ) {
-
-    if ( $line =~ /^###LOOP###$/ ) {
-      my(@buffer);
-      LOADBUF: while ( defined( $line = shift @xtemplate ) ) {
-        last LOADBUF if ( $line =~ /^###ENDLOOP###$/ );
-        push @buffer, $line;
-      }
-      my %lubs = (
-        'address'      => $cust_main->address2 
-                            ? [ $cust_main->address1, $cust_main->address2 ]
-                            : [ $cust_main->address1 ]
-                          ,
-        'secondary'    => [ @nameservers ],
-        'secondary_ip' => [ @nameserver_ips ],
-      );
-      LOOP: while (1) {
-        my @xbuffer = @buffer;
-        SUBLOOP: while ( defined( $line = shift @xbuffer ) ) {
-          if ( $line =~ /###(\w+)###/ ) {
-            #last LOOP unless my($lub)=shift@{$lubs{$1}};
-            next OLOOP unless my $lub = shift @{$lubs{$1}};
-            $line =~ s/###(\w+)###/$lub/e;
-            redo SUBLOOP;
-          } else {
-            push @body, $line;
-          }
-        } #SUBLOOP
-      } #LOOP
-
-    }
-
-    if ( $line =~ /###(\w+)###/ ) {
-      #$line =~ s/###(\w+)###/$subs{$1}/eg;
-      $line =~ s/###(\w+)###/$subs{$1}/e;
-      redo OLOOP;
-    } else {
-      push @body, $line;
-    }
-
-  } #OLOOP
-
-  my $subject;
-  if ( $self->action eq "M" ) {
-    $subject = "MODIFY DOMAIN ". $self->domain;
-  } elsif ( $self->action eq "N" ) { 
-    $subject = "NEW DOMAIN ". $self->domain;
-  } else {
-    croak "submit_internic called with action ". $self->action;
-  }
-
-  $ENV{SMTPHOSTS} = $smtpmachine;
-  $ENV{MAILADDRESS} = $from;
-  my $header = Mail::Header->new( [
-    "From: $from",
-    "To: $to",
-    "Sender: $from",
-    "Reply-To: $from",
-    "Date: ". time2str("%a, %d %b %Y %X %z", time),
-    "Subject: $subject",
-  ] );
-
-  my($msg)=Mail::Internet->new(
-    'Header' => $header,
-    'Body' => \@body,
-  );
-
-  $msg->smtpsend or die "Can't send registration email"; #die? warn?
-
+  #my $self = shift;
+  carp "submit_internic depreciated";
 }
 
 =back
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.21 2001-10-22 12:22:03 ivan Exp $
+$Id: svc_domain.pm,v 1.22 2001-10-24 15:29:30 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 5af893a4d..5de6977a1 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -11,6 +11,7 @@ fin/freeside-apply-credits
 FS.pm
 FS/CGI.pm
 FS/Conf.pm
+FS/ConfItem.pm
 FS/Record.pm
 FS/UI/Base.pm
 FS/UI/CGI.pm
@@ -61,6 +62,7 @@ t/agent_type.t
 t/CGI.t
 t/CGIwrapper.t
 t/Conf.t
+t/ConfItem.t
 t/cust_bill.t
 t/cust_bill_pay.t
 t/cust_bill_pkg.t
diff --git a/FS/t/ConfItem.t b/FS/t/ConfItem.t
new file mode 100644
index 000000000..c7932d7e3
--- /dev/null
+++ b/FS/t/ConfItem.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::ConfItem;
+$loaded=1;
+print "ok 1\n";
diff --git a/bin/fs-setup b/bin/fs-setup
index 3d76bf823..f3889f0dc 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,13 +1,13 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.64 2001-10-23 18:15:06 ivan Exp $
+# $Id: fs-setup,v 1.65 2001-10-24 15:29:30 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
 
 use strict;
 use DBI;
-use DBIx::DBSchema 0.18;
+use DBIx::DBSchema 0.19;
 use DBIx::DBSchema::Table;
 use DBIx::DBSchema::Column;
 use DBIx::DBSchema::ColGroup::Unique;
@@ -30,14 +30,18 @@ my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;
 
 ###
 
-print "\nEnter the maximum username length: ";
-my($username_len)=&getvalue;
+#print "\nEnter the maximum username length: ";
+#my($username_len)=&getvalue;
+my $username_len = 32; #usernamemax config file
 
 print "\n\n", <<END, ":";
-Freeside tracks the RADIUS attributes User-Name, check attribute Password and
+Freeside tracks the RADIUS User-Name, check attribute Password and
 reply attribute Framed-IP-Address for each user.  You can specify additional
-check and reply attributes.  First enter any additional RADIUS check attributes
-you need to track for each user, separated by whitespace.
+check and reply attributes (or you can add them later with the
+fs-radius-add-check and fs-radius-add-reply programs).
+
+First enter any additional RADIUS check attributes you need to track for each 
+user, separated by whitespace.
 END
 my @check_attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
                          split(" ",&getvalue);
diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index bc27f7f02..727186085 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.25 2001-10-16 20:33:02 jeff Exp $
+# $Id: svc_acct.export,v 1.26 2001-10-24 15:29:30 ivan Exp $
 #
 # Create and export password, radius and vpopmail password files:
 # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
@@ -254,7 +254,8 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) {
   foreach $svc_acct (qsearch('svc_acct', {'domsvc' => $svc_domain->svcnum})) {
     my($password)=$svc_acct->getfield('_password');
     my($cpassword,$rpassword);
-    if ( ( length($password) <= 8 )
+    #if ( ( length($password) <= 8 )
+    if ( ( length($password) <= 12 )
          && ( $password ne '*' )
          && ( $password ne '!!' )
          && ( $password ne '' )
diff --git a/conf/registries/internic/from b/conf/registries/internic/from
deleted file mode 100644
index dc36ae760..000000000
--- a/conf/registries/internic/from
+++ /dev/null
@@ -1 +0,0 @@
-domreg@domain.tld
diff --git a/conf/registries/internic/nameservers b/conf/registries/internic/nameservers
deleted file mode 100644
index e1aa999f5..000000000
--- a/conf/registries/internic/nameservers
+++ /dev/null
@@ -1,3 +0,0 @@
-192.168.1.1     ns1.domain.tld
-192.168.1.2     ns2.domain.tld
-192.168.1.3     ns3.domain.tld
diff --git a/conf/registries/internic/tech_contact b/conf/registries/internic/tech_contact
deleted file mode 100644
index 1e6fea0be..000000000
--- a/conf/registries/internic/tech_contact
+++ /dev/null
@@ -1 +0,0 @@
-A1
diff --git a/conf/registries/internic/template b/conf/registries/internic/template
deleted file mode 100644
index 8e4983ce2..000000000
--- a/conf/registries/internic/template
+++ /dev/null
@@ -1,231 +0,0 @@
-[ URL ftp://rs.internic.net/templates/domain-template.txt ] [ 03/98 ] 
-
-******* Please DO NOT REMOVE Version Number or Sections A-Q ********
-
-Domain Version Number: 4.0
-
-******* Email completed agreement to hostmaster@internic.net *******
-
-	NETWORK SOLUTIONS, INC.
-
-	DOMAIN NAME REGISTRATION AGREEMENT
-
-
-A.	Introduction. This domain name registration agreement
-("Registration Agreement") is submitted to NETWORK SOLUTIONS, INC.
-("NSI") for the purpose of applying for and registering a domain name
-on the Internet. If this Registration Agreement is accepted by NSI,
-and a domain name is registered in NSI's domain name database and
-assigned to the Registrant, Registrant ("Registrant") agrees to be
-bound by the terms of this Registration Agreement and the terms of
-NSI's Domain Name Dispute Policy ("Dispute Policy") which is
-incorporated herein by reference and made a part of this Registration
-Agreement. This Registration Agreement shall be accepted at the
-offices of NSI. 
-
-B. Fees and Payments.
-
-1) Registration or renewal (re-registration) date through March 31, 1998:
-Registrant agrees to pay a registration fee of One Hundred United States
-Dollars (US$100) as consideration for the registration of each new domain
-name or Fifty United States Dollars (US$50) to renew (re-register) an
-existing registration.
-2) Registration or renewal date on and after April 1, 1998:  Registrant
-agrees to pay a registration fee of Seventy United States Dollars (US$70) 
-as consideration for the registration of each new domain name or the 
-applicable renewal (re-registration) fee (currently Thirty-Five United 
-States Dollars (US$35)) at the time of renewal (re-registration).
-3) Period of Service:  The non-refundable fee covers a period of two (2)
-years for each new registration, and one (1) year for each renewal, 
-and includes any permitted modification(s) to the domain name record
-during the covered period.
-4) Payment:  Payment is due to Network Solutions within thirty (30) 
-days from the date of the invoice.
-
-C.	Dispute Policy. Registrant agrees, as a condition to
-submitting this Registration Agreement, and if the Registration
-Agreement is accepted by NSI, that the Registrant shall be bound by
-NSI's current Dispute Policy. The current version of the Dispute
-Policy may be found at the InterNIC Registration Services web site:
-"http://www.netsol.com/rs/dispute-policy.html". 
-
-D.	Dispute Policy Changes or Modifications. Registrant agrees
-that NSI, in its sole discretion, may change or modify the Dispute
-Policy, incorporated by reference herein, at any time. Registrant
-agrees that Registrant's maintaining the registration of a domain name
-after changes or modifications to the Dispute Policy become effective
-constitutes Registrant's continued acceptance of these changes or
-modifications. Registrant agrees that if Registrant considers any such
-changes or modifications to be unacceptable, Registrant may request
-that the domain name be deleted from the domain name database. 
-
-E.	Disputes. Registrant agrees that, if the registration of its
-domain name is challenged by any third party, the Registrant will be
-subject to the provisions specified in the Dispute Policy. 
-
-F.	Agents. Registrant agrees that if this Registration Agreement
-is completed by an agent for the Registrant, such as an ISP or
-Administrative Contact/Agent, the Registrant is nonetheless bound as a
-principal by all terms and conditions herein, including the Dispute
-Policy. 
-
-G.	Limitation of Liability. Registrant agrees that NSI shall have
-no liability to the Registrant for any loss Registrant may incur in
-connection with NSI's processing of this Registration Agreement, in
-connection with NSI's processing of any authorized modification to the
-domain name's record during the covered period, as a result of the
-Registrant's ISP's failure to pay either the initial registration fee
-or renewal fee, or as a result of the application of the provisions of
-the Dispute Policy. Registrant agrees that in no event shall the
-maximum liability of NSI under this Agreement for any matter exceed
-Five Hundred United States Dollars (US$500). 
-
-H.	Indemnity. Registrant agrees, in the event the Registration
-Agreement is accepted by NSI and a subsequent dispute arises with any
-third party, to indemnify and hold NSI harmless pursuant to the terms
-and conditions contained in the Dispute Policy. 
-
-I.	Breach. Registrant agrees that failure to abide by any
-provision of this Registration Agreement or the Dispute Policy may be
-considered by NSI to be a material breach and that NSI may provide a
-written notice, describing the breach, to the Registrant. If, within
-thirty (30) days of the date of mailing such notice, the Registrant
-fails to provide evidence, which is reasonably satisfactory to NSI,
-that it has not breached its obligations, then NSI may delete
-Registrant's registration of the domain name. Any such breach by a
-Registrant shall not be deemed to be excused simply because NSI did
-not act earlier in response to that, or any other, breach by the
-Registrant. 
-
-J.	No Guaranty. Registrant agrees that, by registration of a
-domain name, such registration does not confer immunity from objection
-to either the registration or use of the domain name. 
-
-K.	Warranty. Registrant warrants by submitting this Registration
-Agreement that, to the best of Registrant's knowledge and belief, the
-information submitted herein is true and correct, and that any future
-changes to this information will be provided to NSI in a timely manner
-according to the domain name modification procedures in place at that
-time. Breach of this warranty will constitute a material breach. 
-
-L.	Revocation. Registrant agrees that NSI may delete a
-Registrant's domain name if this Registration Agreement, or subsequent
-modification(s) thereto, contains false or misleading information, or
-conceals or omits any information NSI would likely consider material
-to its decision to approve this Registration Agreement. 
-
-M.	Right of Refusal. NSI, in its sole discretion, reserves the
-right to refuse to approve the Registration Agreement for any
-Registrant. Registrant agrees that the submission of this Registration
-Agreement does not obligate NSI to accept this Registration Agreement.
-Registrant agrees that NSI shall not be liable for loss or damages
-that may result from NSI's refusal to accept this Registration
-Agreement. 
-
-N.	Severability. Registrant agrees that the terms of this
-Registration Agreement are severable. If any term or provision is
-declared invalid, it shall not affect the remaining terms or
-provisions which shall continue to be binding. 
-
-O.	Entirety. Registrant agrees that this Registration Agreement
-and the Dispute Policy is the complete and exclusive agreement between
-Registrant and NSI regarding the registration of Registrant's domain
-name. This Registration Agreement and the Dispute Policy supersede all
-prior agreements and understandings, whether established by custom,
-practice, policy, or precedent. 
-
-P.	Governing Law. Registrant agrees that this Registration
-Agreement shall be governed in all respects by and construed in
-accordance with the laws of the Commonwealth of Virginia, United
-States of America. By submitting this Registration Agreement,
-Registrant consents to the exclusive jurisdiction and venue of the
-United States District Court for the Eastern District of Virginia,
-Alexandria Division. If there is no jurisdiction in the United States
-District Court for the Eastern District of Virginia, Alexandria
-Division, then jurisdiction shall be in the Circuit Court of Fairfax
-County, Fairfax, Virginia. 
-
-Q.	This is Domain Name Registration Agreement Version
-Number 4.0. This Registration Agreement is only for registrations
-under top-level domains: COM, ORG, NET, and EDU. By completing
-and submitting this Registration Agreement for consideration and
-acceptance by NSI, the Registrant agrees that he/she has read and
-agrees to be bound by A through P above. 
-
-
-Authorization
-0a.  (N)ew (M)odify (D)elete....:###action###
-0b.  Auth Scheme................: 
-0c.  Auth Info..................: 
-
-1.   Comments...................:###purpose###
-
-2.   Complete Domain Name.......:###domain###
-
-Organization Using Domain Name
-
-3a.  Organization Name..........:###company###
-###LOOP###
-3b.  Street Address.............:###address###
-###ENDLOOP###
-3c.  City.......................:###city###
-3d.  State......................:###state###
-3e.  Postal Code................:###zip###
-3f.  Country....................:###country###
-
-Administrative Contact
-4a.  NIC Handle (if known)......: 
-4b.  (I)ndividual (R)ole........:I
-4c.  Name (Last, First).........:###last###, ###first###
-4d.  Organization Name..........:###company###
-###LOOP###
-4e.  Street Address.............:###address###
-###ENDLOOP###
-4f.  City.......................:###city###
-4g.  State......................:###state###
-4h.  Postal Code................:###zip### 
-4i.  Country....................:###country###
-4j.  Phone Number...............:###daytime###
-4k.  Fax Number.................:###fax###
-4l.  E-Mailbox..................:###email###
-
-Technical Contact
-5a.  NIC Handle (if known)......:###tech_contact###
-5b.  (I)ndividual (R)ole........: 
-5c.  Name (Last, First).........: 
-5d.  Organization Name..........: 
-5e.  Street Address.............: 
-5f.  City.......................: 
-5g.  State......................: 
-5h.  Postal Code................: 
-5i.  Country....................: 
-5j.  Phone Number...............: 
-5k.  Fax Number.................: 
-5l.  E-Mailbox..................: 
-
-Billing Contact
-6a.  NIC Handle (if known)......: 
-6b.  (I)ndividual (R)ole........: 
-6c.  Name (Last, First).........: 
-6d.  Organization Name..........: 
-6e.  Street Address.............: 
-6f.  City.......................: 
-6g.  State......................:
-6h.  Postal Code................:
-6i.  Country....................:
-6j.  Phone Number...............:
-6k.  Fax Number.................: 
-6l.  E-Mailbox..................: 
-
-Prime Name Server
-7a.  Primary Server Hostname....:###primary###
-7b.  Primary Server Netaddress..:###primary_ip###
-
-Secondary Name Server(s)
-###LOOP###
-8a.  Secondary Server Hostname..:###secondary###
-8b.  Secondary Server Netaddress:###secondary_ip###
-###ENDLOOP###
-
-END OF AGREEMENT
-
diff --git a/conf/registries/internic/to b/conf/registries/internic/to
deleted file mode 100644
index c80f93c57..000000000
--- a/conf/registries/internic/to
+++ /dev/null
@@ -1 +0,0 @@
-hostmaster@internic.net
diff --git a/fs_webdemo/registerd.Pg b/fs_webdemo/registerd.Pg
index 8c8b94557..f166846b7 100755
--- a/fs_webdemo/registerd.Pg
+++ b/fs_webdemo/registerd.Pg
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: registerd.Pg,v 1.10 2001-09-30 07:55:52 ivan Exp $
+# $Id: registerd.Pg,v 1.11 2001-10-24 15:29:30 ivan Exp $
 
 use strict;
 use vars qw(
@@ -131,15 +131,15 @@ while ( 1 ) {
     print LPR "mail $email";
     close LPR;
 
-    open(FROM, ">${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/registries/internic/from")
-      or die "Can\'t open ${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/registries/internic/from: $!";
-    print FROM "$email\n";
-    close FROM;
-
-    open(TO, ">${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/registries/internic/to")
-      or die "Can\'t open ${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/registries/internic/to: $!";
-    print TO "$email\n";
-    close TO;
+#    open(FROM, ">${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/registries/internic/from")
+#      or die "Can\'t open ${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/registries/internic/from: $!";
+#    print FROM "$email\n";
+#    close FROM;
+#
+#    open(TO, ">${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/registries/internic/to")
+#      or die "Can\'t open ${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/registries/internic/to: $!";
+#    print TO "$email\n";
+#    close TO;
 
     open(SECRETS, ">${freeside_conf}secrets.demo_$username")
       or die "Can\'t open ${freeside_conf}secrets.demo_$username: $!";
diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
new file mode 100644
index 000000000..2dc4647ee
--- /dev/null
+++ b/httemplate/config/config-process.cgi
@@ -0,0 +1,44 @@
+<%
+  my $conf = new FS::Conf;
+  $FS::Conf::DEBUG = 1;
+  my @config_items = $conf->config_items;
+
+  foreach my $i ( @config_items ) {
+    my @touch = ();
+    my @delete = ();
+    my $n = 0;
+    foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
+      if ( $type eq '' ) {
+      } elsif ( $type eq 'textarea' ) {
+        if ( $cgi->param($i->key. $n) ) {
+          $conf->set($i->key, $cgi->param($i->key. $n));
+        } else {
+          $conf->delete($i->key);
+        }
+      } elsif ( $type eq 'checkbox' ) {
+#        if ( defined($cgi->param($i->key. $n)) && $cgi->param($i->key. $n) ) {
+        if ( defined $cgi->param($i->key. $n) ) {
+          #$conf->touch($i->key);
+          push @touch, $i->key;
+        } else {
+          #$conf->delete($i->key);
+          push @delete, $i->key;
+        }
+      } elsif ( $type eq 'text' )  {
+        if ( $cgi->param($i->key. $n) ) {
+          $conf->set($i->key, $cgi->param($i->key. $n));
+        } else {
+          $conf->delete($i->key);
+        }
+      } else {
+      }
+      $n++;
+    }
+   # warn @touch;
+    $conf->touch($_) foreach @touch;
+    $conf->delete($_) foreach @delete;
+  }
+
+%>
+<%= $cgi->redirect("config-view.cgi") %>
+
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
new file mode 100644
index 000000000..09e535b2f
--- /dev/null
+++ b/httemplate/config/config-view.cgi
@@ -0,0 +1,46 @@
+<%= header('View Configuration', menubar( 'Main Menu' => $p,
+                                     'Edit Configuration' => 'config.cgi' ) ) %>
+
+<% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
+
+<% foreach my $section ( qw(required billing username password UI session
+                            apache BIND shell
+                           ),
+                         '', 'depreciated') { %>
+  <%= table("#cccccc", 2) %>
+  <tr>
+    <th colspan="2" bgcolor="#dcdcdc">
+      <%= ucfirst($section || 'unclassified') %> configuration options
+    </th>
+  </tr>
+  <% foreach my $i (grep $_->section eq $section, @config_items) { %>
+    <tr>
+      <td><a name="<%= $i->key %>">
+        <b><%= $i->key %></b>&nbsp;-&nbsp;<%= $i->description %>
+      </a></td>
+      <td><table border=0>
+        <% foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
+             my $n = 0; %>
+          <% if ( $type eq '' ) { %>
+            <tr><td><font color="#ff0000">no type</font></td></tr>
+          <% } elsif ( $type eq 'textarea' ) { %>
+            <tr><td bgcolor="#ffffff">
+              <pre><%= join("\n", $conf->config($i->key) ) %></pre>
+            </td></tr>
+          <% } elsif ( $type eq 'checkbox' ) { %>
+            <tr><td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td></tr>
+          <% } elsif ( $type eq 'text' )  { %>
+            <tr><td bgcolor="#ffffff"><%=  $conf->exists($i->key) ? $conf->config($i->key) : '' %></td></tr>
+          <% } else { %>
+            <tr><td>
+              <font color="#ff0000">unknown type <%= $type %></font>
+            </td></tr>
+          <% } %>
+        <% $n++; } %>
+      </table></td>
+    </tr>
+  <% } %>
+  </table><br><br>
+<% } %>
+
+</body></html>
diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
index 75d3070d1..656723781 100644
--- a/httemplate/docs/config.html
+++ b/httemplate/docs/config.html
@@ -26,100 +26,10 @@ DBI:Pg:host=localhost;dbname=freeside
 dbusername
 dbpassword
 </pre>
-</ul>
-All further configuration files and directories are located in
-<tt>/usr/local/etc/freeside/conf.<i>datasource</i></tt>, for example, 
-<tt>/usr/local/etc/freeside/conf.DBI:Pg:host=localhost;dbname=freeside</tt> (remember to backslash-escape the ; character when creating directories in the shell: <tt>mkdir&nbsp;/usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=freeside</tt>).  Files listed in <font color="#ff0000">red</font> are requried.
-<ul>
-  <li><a name="address">address</a> - This configuration file is no longer used.  See <a href="#invoice_template">invoice_template</a> instead.
-  <li><a name="apacheroot">apacheroot</a> - The directory containing Apache virtual hosts
-  <li><a name="apachemachine">apachemachine</a> - A machine with the apacheroot directory and user home directories.  The existance of this file enables setup of virtual host directories, and, in conjunction with the `home' configuration file, symlinks into user home directories.
-  <li><a name="apachemachines">apachemachines</a> - Your Apache machines, one per line.  This enables export of `/etc/apache/vhosts.conf', which can be included in your Apache configuration via the <a href="http://www.apache.org/docs/mod/core.html#include">Include</a> directive.
-  <li><a name="bindprimary">bindprimary</a> - Your BIND primary nameserver.  This enables export of /var/named/named.conf and zone files into /var/named
-  <li><a name="bindsecondaries">bindsecondaries</a> - Your BIND secondary nameservers, one per line.  This enables export of /var/named/named.conf
-  <li><a name="business-onlinepayment">business-onlinepayment</a> - <a href="http://search.cpan.org/search?dist=Business-OnlinePayment">Business::OnlinePayment</a> support, at least three lines: processor, login, and password.  An optional fourth line specifies the action or actions (multiple actions are separated with `,': for example: `Authorization Only, Post Authorization').    Optional additional lines are passed to Business::OnlinePayment as %processor_options.
-  <li><a name="bsdshellmachines">bsdshellmachines</a> - Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/master.passwd'.
-  <li><a name="countrydefault">countrydefault</a> - Default two-letter country code (if not supplied, the default is `US')
-  <li>cybercash3.2 - <a href="http://www.cybercash.com/cybercash/services/technology.html">CyberCash v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly' or `mauthcapture').  CCMckLib3_2.pm, CCMckDirectLib3_2.pm and CCMckErrno3_2 are required.
-  <li>cyrus</li> - Integration with <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a>, three lines: IMAP server, admin username, and admin password.  Cyrus::IMAP::Admin should be installed locally and the connection to the server secured.
-  <li><a name="deletecustomers">deletecustomers</a> - The existance of this file will enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that this customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers' packages if they cancel service.
-  <li><a name="dirhash">dirhash</a> - Optional numeric value to control director hashing.  If positive, hashes directories for the specified number of levels from the front of the username.  If negative, hashes directories for the specified number of levels from the end of the username.  Some examples:
-    <ul>
-      <li>1: user -> <a href="#home">/home</a>/u/user
-      <li>2: user -> <a href="#home">/home</a>/u/s/user
-      <li>-1: user -> <a href="#home">/home</a>/r/user
-      <li>-2: user -> <a href="#home">home</a>/r/e/user
-    </ul>
-  <li><a name="disable_customer_referrals">disable_customer_referrals</a> - The existance of this file will disable new customer-to-customer referrals in the web interface.
-  <li><a name="domain"><font color="#ff0000">domain</font></a> - Your domain name.
-  <li><a name="editreferrals">editreferrals</a> - The existance of this file will allow you to change the referral of existing customers.
-  <li><a name="emailinvoiceonly">emailinvoiceonly</a> - Disables postal mail invoices.
-  <li><a name="emailinvoiceauto">emailinvoiceauto</a> - Automatically adds new accounts to the email invoice list upon customer creation.
-  <li><a name="erpcdmachines">erpcdmachines</a> - Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd' and `/usr/annex/acp_dialup'.
-  <li><a name="hidecancelledpackages">hidecancelledpackages</a> - The existance of this file will prevent cancelled packages from showing up in listings (though they will still be in the database)
-  <li><a name="hidecancelledcustomers">hidecancelledcustomers</a> - The existance of this file will prevent customers with only cancelled packages from showing up in listings (though they will still be in the database)
-  <li><a name="home"><font color="#ff0000">home</font></a> - For new users, prefixed to usrename to create a directory name.  Should have a leading but not a trailing slash.
-  <li><a name="icradiusmachines">icradiusmachines</a> - Your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines, one per line.  The existance of this file (even if empty) turns on radcheck table creation (in the freeside database - the radcheck table needs to be created manually).  Machines listed in this file will have the radcheck table exported to them.  Each line of this file should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: "<CODE>radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd</CODE>".  Note that to use ICRADIUS export you need to be using MySQL.
-  <li><a name="icradius_mysqldest">icradius_mysqldest</a> - Destination directory for the MySQL databases, on the ICRADIUS machines.  Defaults to "/usr/local/var/".
-  <li><a name="icradius_mysqlsource">icradius_mysqlsource</a> - Source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".
-  <li><a name="icradius_secrets">icradius_secrets</a> - Optionally specifies a MySQL database for ICRADIUS export, if you're not running MySQL for your Freeside database.  The database should be on the Freeside machine and store data in the <a href="#icradius_mysqlsource">icradius_mysqlsource</a> directory.  Three lines: DBI data source, username and password.  This file should not be world readable.
-  <li><a name="invoice_from"><font color="#ff0000">invoice_from</font></a> - Return address on email invoices.
-  <li><a name="invoice_template"><font color="#ff0000">invoice_template</font></a> - Required template file for invoices.  See the <a href="billing.html">section on billing</a> for details.
-  <li><a name="lpr"><font color="#ff0000">lpr</font></a> - Print command for paper invoices, for example `lpr -h'.
-  <li><a name="maildisablecatchall">maildisablecatchall</a> - <b>DEPRECIATED</b>, now the default.  The existance of this file used to disable the requirement that each virtual domain have a catch-all mailbox.
-  <li><a name="money_char">money_char</a> - Currency symbol - defaults to `$'.
-  <li><a name="mxmachines">mxmachines</a> - MX entries for new domains, weight and machine, one per line, with trailing `.'
-  <li><a name="nsmachines">nsmachines</a> - NS nameservers for new domains, one per line, with trailing `.'
-  <li><a name="nismachines">nismachines</a> - Your NIS master (not slave master) machines, one per line.  This enables export of `/etc/global/passwd' and `/etc/global/shadow'.
-  <li><a name="passwordmin">passwordmin</a> - Minimum password length (default 6)
-  <li><a name="passwordmax">passwordmax</a> - Maximum password length (default 8) (don't set this over 12 if you need to import or export crypt() passwords)
-  <li><a name="qmailmachines">qmailmachines</a> - Your qmail machines, one per line.  This enables export of `/var/qmail/control/virtualdomains', `/var/qmail/control/recipientmap', and `/var/qmail/control/rcpthosts'.  The existance of this file (even if empty) also turns on user `.qmail-extension' file maintenance in conjunction with `shellmachine'.
-  <li><a name="radiusmachines">radiusmachines</a> - Your RADIUS authentication machines, one per line.  This enables export of `/etc/raddb/users'.
-  <li><a name="referraldefault">referraldefault</a> - Default referral, specified by refnum.
-  <li><a name="registries"><font color="#ff0000">registries</font></a> - Directory which contains domain registry information.  Each registry is a directory.
-    <ul>
-      <li>registries/internic - Currently the only supported registry
-        <ul>
-          <li>registries/internic/from - Email address from which InterNIC domain registrations are sent.
-          <li>regestries/internic/nameservers - The nameservers for InterNIC domain registrations, one per line.  Each line contains an IP address and hostname, separated by whitespace.
-          <li>registries/internic/tech_contact - Technical contact NIC handle for domain registrations.
-          <li>registries/internic/template - Template for InterNIC domain registrations with special markup.  A suitable copy of the InterNIC domain template v4.0 is in `fs-x.y.z/etc/domain-template.txt'.
-          <li>registries/internic/to - Email address to which InterNIC domain registrations are sent.
-        </ul>
-    </ul>
-  <li><a name="sendmailconfigpath">sendmailconfigpath</a> - Sendmail configuration file path - defaults to `/etc'.  Many newer distributions use `/etc/mail'.
-  <li><a name="sendmailmachines">sendmailmachines</a> - Your sendmail machines, one per line.  This enables export of `/etc/virtusertable' and `/etc/sendmail.cw'.
-  <li><a name="sendmailrestart">sendmailrestart</a> - If defined, the command which is run on sendmail machines after files are copied.
-  <li><a name="session-start">session-start</a> - If defined, the command which is executed on the Freeside machine when a session begins.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
-  <li><a name="session-stop">session-stop</a> - If defined, the command which is executed on the Freeside machine when a session ends.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
-  <li><a name="shellmachine">shellmachine</a> - A single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines', it also enables `.qmail-extension' file maintenance.
-  <li><a name="shellmachine-useradd">shellmachine-useradd</a> - The command(s) to run on shellmachine when an account is created.  If this file does not exist, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If the file exists but is empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.
-  <li><a name="shellmachine-userdel">shellmachine-userdel</a> - The command(s) to run on shellmachine when an account is deleted.  If this file does not exist, <code>userdel $username</code> is the default.  If the file exists but is empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.
-  <li><a name="shellmachine-usermod">shellmachine-usermod</a> - The command(s) to run on shellmachine when an account is modified.  If this file does not exist or is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.
-  <li><a name="shellmachines">shellmachines</a> - Your Linux and System V flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/shadow' files.
-  <li><a name="shells"><font color="#ff0000">shells</font></a> - Legal shells (think /etc/shells).  You probably want to `cut -d: -f7 /etc/passwd | sort | uniq' initially so that importing doesn't fail with `Illegal shell' errors, then remove any special entries afterwords.  A blank line specifies that an empty shell is permitted.
-  <li><a name="showpasswords">showpasswords</a> - The existance of this file will allow unencrypted user passwords to be displayed.
-  <li><a name="signupurl">signupurl</a> - if you are using customer-to-customer referrals, and you enter the URL of your <a href="signup.html">signup server CGI</a>, the customer view screen will display a customized link to the signup server with the appropriate customer as referral.
-  <li><a name="smtpmachine"><font color="#ff0000">smtpmachine</font></a> - SMTP relay for Freeside's outgoing mail.
-  <li><a name="soadefaultttl">soadefaultttl</a> - SOA default TTL for new domains.
-  <li><a name="soaemail">soaemail</a> - SOA email for new domains, in BIND form (`.' instead of `@'), with trailing `.'
-  <li><a name="soaexpire">soaexpire</a> - SOA expire for new domains
-  <li><a name="soamachine">soamachine</a> - SOA machine for new domains, with trailing `.'
-  <li><a name="soarefresh">soarefresh</a> - SOA refresh for new domains
-  <li><a name="soaretry">soaretry</a> - SOA retry for new domains
-  <li><a name="statedefault">statedefault</a> - Default state or province (if not supplied, the default is `CA')
-  <li><a name="textradiusprepend">textradiusprepend</a> - <b>DEPRECIATED</b>, use RADIUS check attributes instead.  This option will be removed soon.  The contents of this file will be prepended to the first line of a user's RADIUS entry in text exports.
-  <li><a name="unsuspendauto">unsuspendauto</a> _ The existance of this file will enable the automatic unsuspension of suspended packages when a customer's balance due changes from positive to zero or negative as the result of a payment or credit.
-  <li><a name="usernamemin">usernamemin</a> - Minimum username length (default 2);
-  <li><a name="usernamemax">usernamemax</a> - Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)
-  <li><a name="username-ampersand">username-ampersand</a> - The existance of this file will allow the ampersand character (&amp;) in usernames.  Be careful when using this option in conjunction with <a href="#shellmachine-useradd">shellmachine-useradd</a> and other configuration options which execute shell commands, as the ampersand will be interpreted by the shell if not quoted.
-  <li><a name="username-letter">username-letter</a> - The existance of this file will turn on the requirement that usernames contain at least one letter.
-  <li><a name="username-letterfirst">username-letterfirst</a> - The existance of this file will turn on the requirement that usernames start with a letter.
-  <li><a name="username-noperiod">username-noperiod</a> - The existance of this file will disallow periods in usernames.
-  <li><a name="username-uppercase">username-uppercase</a> - The existance of this file will allow uppercase characters in username.
-   <li><a name="username_policy">username_policy</a> - This file controls the mechanism for preventing duplicate usernames in passwd/radius files exported from svc_accts.  This should be one of 'prepend domsvc' 'append domsvc' or 'append domain'
-   <li><a name="vpopmailmachines">vpopmailmachines</a> - Your vpopmail pop toasters, one per line.  Each line is of the form "machinename vpopdir vpopuid vpopgid".  For example: <code>poptoaster.domain.tld /home/vpopmail 508 508</code>  Note: vpopuid and vpopgid are values taken from the vpopmail machine's /etc/passwd
-
+<li>Create the <b>/usr/local/etc/freeside/conf.<i>datasource</i></b> directory, for example, <b>/usr/local/etc/freeside/conf.DBI:Pg:host=localhost;dbname=freeside</b> (remember to backslash-escape the ; character when creating directories in the shell:
+<pre>mkdir&nbsp;/usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=freeside
+</pre>
+<li>The rest of the configuration can be done with the web interface.  Select <u>Configuration</u> from the main menu and update your configuration values.
 </ul>
 </body>
-
+</html>
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 6861a173e..c26c9a701 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -9,7 +9,11 @@ Before installing, you need:
   <li><a href="http://perl.apache.org/">mod_perl</a>
   <li><a href="http://www.openssh.com//">SSH</a> (<a href="http://www.openssh.com//">OpenSSH</a> is recommended.  SSH Communications Security <a href="http://www.ssh.com/products/ssh/download.cfm">commercial SSH version 3</a> has been reported incompatible with Freeside.)
   <li><a href="http://www.perl.com/">Perl</a>  Don't enable experimental features like threads or the PerlIO abstraction layer.
-  <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.  <a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.  <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=DBD</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
+  <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.
+    <ul>
+      <li><a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.
+      <li>MySQL has been reported to work.  <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=DBD</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
+    </ul>
   <li>Perl modules (<a href="http://theoryx5.uwinnipeg.ca/CPAN/perl/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
     <ul>
       <li><a href="http://search.cpan.org/search?dist=Array-PrintCols">Array-PrintCols</a>
diff --git a/httemplate/index.html b/httemplate/index.html
index c45997608..236b72b20 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -5,22 +5,18 @@
     </TITLE>
   </HEAD>
   <BODY BGCOLOR="#FFFFFF">
-  <table>
+  <table width="100%">
     <tr><td>
-    <P ALIGN=CENTER>
         <IMG BORDER=0 ALT="Silicon Interactive Software Design" SRC="images/small-logo.png">
     </td><td>
-      <center><font color="#ff0000" size=7>freeside main menu</font></center>
+      <font color="#ff0000" size=7>freeside main menu</font>
+    </td><td align=right valign=bottom>
+      version 1.4.0
+      <BR><A HREF="http://www.sisd.com/freeside">Freeside home page</A>
+      <BR><A HREF="docs/">Documentation</A>
     </td></tr>
   </table>
-      <A HREF="http://www.sisd.com/freeside">
-        Freeside home page
-      </A>
-      <BR><A HREF="docs/">
-        Documentation
-      </A>
-    </P>
-    <HR>
+    <hr noshade>
     <ul>
       <li><A HREF="edit/cust_main.cgi">New Customer</A>
       <li><A NAME="search">Search</A>
@@ -29,7 +25,8 @@
         <LI><A HREF="search/cust_main-payinfo.html">customers (by credit card number)</A>
         <LI><A HREF="search/svc_acct.html">accounts (by username)</A>
         <LI><A HREF="search/svc_domain.html">domains (by domain)</A>
-        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>
+<!--        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>-->
+        <LI><A HREF="search/svc_forward.html">mail forwards (by ?)</A>
         <LI><A HREF="search/cust_bill.html">invoices (by invoice number)</A>
         </ul>
       <li><A NAME="browse">Browse</A>
@@ -52,16 +49,22 @@
           <LI>services
             <UL>
               <LI>accounts (<A HREF="search/svc_acct.cgi?svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?username">by username</A>) (<A HREF="search/svc_acct.cgi?uid">by uid</A>)
+              <LI>mail forwards (<A HREF="search/svc_forward.cgi?svcnum">by service number</A>) (by ?))
               <LI>domains (<A HREF="search/svc_domain.cgi?svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?domain">by domain</A>)
             </UL>
           <LI>unlinked services
             <UL>
               <LI>unlinked accounts (<A HREF="search/svc_acct.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?UN_username">by username</A>) (<A HREF="search/svc_acct.cgi?UN_uid">by uid</A>)
+              <LI>unlinked mail forwards (<A HREF="search/svc_forward.cgi?UN_svcnum">by service number</A>) (by ?))
               <LI>unlinked domains (<A HREF="search/svc_domain.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?UN_domain">by domain</A>)
             </UL>
           <LI><A HREF="browse/nas.cgi">NAS ports</A>
           <LI><A HREF="browse/queue.cgi">Joe queue</A>
         </ul>
+    </ul>
+    <hr noshade>
+    <ul>
+      <li><A NAME="config" HREF="config/config-view.cgi">Configuration</a><!-- - <font size="+2" color="#ff0000">start here</font> -->
       <li><A NAME="admin">Administration</a>
         <ul>
           <LI><A HREF="browse/part_svc.cgi">View/Edit service definitions</A>
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 37aed6115..64085ea93 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_acct.cgi,v 1.5 2001-09-11 20:44:08 ivan Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.6 2001-10-24 15:29:31 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi @svc_acct $sortby $query $mydomain );
@@ -7,7 +7,7 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs dbdef);
-use FS::CGI qw(header eidiot popurl table);
+use FS::CGI qw(header idiot popurl table);
 use FS::svc_acct;
 use FS::cust_main;
 
@@ -54,9 +54,9 @@ if ( $query eq 'svcnum' ) {
 if ( scalar(@svc_acct) == 1 ) {
   my($svcnum)=$svc_acct[0]->svcnum;
   print $cgi->redirect(popurl(2). "view/svc_acct.cgi?$svcnum");  #redirect
-  exit;
+  #exit;
 } elsif ( scalar(@svc_acct) == 0 ) { #error
-  eidiot("Account not found");
+  idiot("Account not found");
 } else {
   my($total)=scalar(@svc_acct);
   print $cgi->header( '-expires' => 'now' ),
-- 
cgit v1.2.1


From 4308bf79cf9f31b6ec471788c34cde9b92a3c29b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Oct 2001 15:45:29 +0000
Subject: correct for browser munching

---
 httemplate/config/config-process.cgi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
index 2dc4647ee..99957ebd9 100644
--- a/httemplate/config/config-process.cgi
+++ b/httemplate/config/config-process.cgi
@@ -11,7 +11,9 @@
       if ( $type eq '' ) {
       } elsif ( $type eq 'textarea' ) {
         if ( $cgi->param($i->key. $n) ) {
-          $conf->set($i->key, $cgi->param($i->key. $n));
+          my $value = $cgi->param($i->key. $n);
+          $value =~ s/\r\n/\n/g; #browsers?
+          $conf->set($i->key, $value);
         } else {
           $conf->delete($i->key);
         }
-- 
cgit v1.2.1


From 03fbdb67704c8b1afa696b1d7ff98fc005c05af4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Oct 2001 08:41:43 +0000
Subject: remove debugging cruft

---
 FS/FS/Conf.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 615fdcb72..fb8d13bae 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -127,15 +127,15 @@ sub set {
   $value = $1;
   unless ( $self->config($file) eq $value ) {
     warn "[FS::Conf] SET $file\n" if $DEBUG;
-    warn "$dir" if is_tainted($dir);
-    warn "$dir" if is_tainted($file);
+#    warn "$dir" if is_tainted($dir);
+#    warn "$dir" if is_tainted($file);
     my $fh = new IO::File ">$dir/$file" or return;
     print $fh "$value\n";
   }
 }
-sub is_tainted {
-             return ! eval { join('',@_), kill 0; 1; };
-         }
+#sub is_tainted {
+#             return ! eval { join('',@_), kill 0; 1; };
+#         }
 
 =item delete
 
-- 
cgit v1.2.1


From 76191674732cd788622f864d385187504a45f4ed Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Oct 2001 16:13:10 +0000
Subject: & in email addresses

---
 FS/FS/cust_main_invoice.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm
index d6b4cd933..3077d645a 100644
--- a/FS/FS/cust_main_invoice.pm
+++ b/FS/FS/cust_main_invoice.pm
@@ -135,7 +135,7 @@ sub checkdest {
   } elsif ( $self->dest =~ /^(\d+)$/ ) {
     return "Unknown local account (specified by svcnum: ". $self->dest. ")"
       unless qsearchs( 'svc_acct', { 'svcnum' => $self->dest } );
-  } elsif ( $self->dest =~ /^([\w\.\-]+)\@(([\w\.\-]+\.)+\w+)$/ ) {
+  } elsif ( $self->dest =~ /^([\w\.\-\&]+)\@(([\w\.\-]+\.)+\w+)$/ ) {
     my($user, $domain) = ($1, $2);
     if ( $domain eq $mydomain ) {
       my $svc_acct = qsearchs( 'svc_acct', { 'username' => $user } );
@@ -172,7 +172,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.7 2001-09-16 12:45:35 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.8 2001-10-25 16:13:10 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 8426653cbe5dfb78ad9b06b6d1e91bcdb4e7dae3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Oct 2001 21:24:12 +0000
Subject: remove ancient tld cruft

---
 httemplate/edit/svc_domain.cgi | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index 7033c11f7..a1a61723d 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_domain.cgi,v 1.3 2001-09-11 23:44:01 ivan Exp $ -->
+#<!-- $Id: svc_domain.cgi,v 1.4 2001-10-25 21:24:12 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $action $svcnum $svc_domain $pkgnum $svcpart $part_svc
@@ -100,19 +100,7 @@ print qq!>Transfer!;
 print <<END;
 <P>Domain <INPUT TYPE="text" NAME="domain" VALUE="$domain" SIZE=28 MAXLENGTH=26>
 <BR>Purpose/Description: <INPUT TYPE="text" NAME="purpose" VALUE="$purpose" SIZE=64>
-<P><CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>
-<UL>
-  <LI>COM is for commercial, for-profit organziations
-  <LI>ORG is for miscellaneous, usually, non-profit organizations
-  <LI>NET is for network infrastructure machines and organizations
-  <LI>EDU is for 4-year, degree granting institutions
-<!--  <LI>GOV is for United States federal government agencies
-!-->
-</UL>
-US state and local government agencies, schools, libraries, museums, and individuals should register under the US domain.  See RFC 1480 for a complete description of the US domain
-and registration procedures.
-<!--  <P>GOV registrations are limited to top-level US Federal Government agencies (see RFC 1816).
-!-->
+<P><INPUT TYPE="submit" VALUE="Submit">
     </FORM>
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From 1904d44bb20adf403e21513db7470153f751d605 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Oct 2001 09:50:21 +0000
Subject: otherwise people will have problems with `0' zero

---
 httemplate/config/config-process.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
index 99957ebd9..690512977 100644
--- a/httemplate/config/config-process.cgi
+++ b/httemplate/config/config-process.cgi
@@ -10,7 +10,7 @@
     foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
       if ( $type eq '' ) {
       } elsif ( $type eq 'textarea' ) {
-        if ( $cgi->param($i->key. $n) ) {
+        if ( $cgi->param($i->key. $n) ne '' ) {
           my $value = $cgi->param($i->key. $n);
           $value =~ s/\r\n/\n/g; #browsers?
           $conf->set($i->key, $value);
@@ -27,7 +27,7 @@
           push @delete, $i->key;
         }
       } elsif ( $type eq 'text' )  {
-        if ( $cgi->param($i->key. $n) ) {
+        if ( $cgi->param($i->key. $n) ne '' ) {
           $conf->set($i->key, $cgi->param($i->key. $n));
         } else {
           $conf->delete($i->key);
-- 
cgit v1.2.1


From 91387f8f489e561deaf1de052d80ef800a4970a3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Oct 2001 10:24:56 +0000
Subject: cache foo *sigh*

---
 FS/FS/CGI.pm                                | 18 +++++++++++-------
 htetc/global.asa                            |  2 +-
 htetc/handler.pl                            |  2 ++
 httemplate/browse/agent.cgi                 |  4 ++--
 httemplate/browse/agent_type.cgi            |  4 ++--
 httemplate/browse/cust_main_county.cgi      |  4 ++--
 httemplate/browse/nas.cgi                   |  2 +-
 httemplate/browse/part_pkg.cgi              |  4 ++--
 httemplate/browse/part_referral.cgi         |  4 ++--
 httemplate/browse/queue.cgi                 |  4 ++--
 httemplate/browse/svc_acct_pop.cgi          |  4 ++--
 httemplate/edit/agent.cgi                   |  4 ++--
 httemplate/edit/agent_type.cgi              |  4 ++--
 httemplate/edit/cust_credit.cgi             |  4 ++--
 httemplate/edit/cust_credit_bill.cgi        |  4 ++--
 httemplate/edit/cust_main.cgi               |  4 ++--
 httemplate/edit/cust_main_county-expand.cgi |  4 ++--
 httemplate/edit/cust_main_county.cgi        |  4 ++--
 httemplate/edit/cust_pay.cgi                |  4 ++--
 httemplate/edit/cust_pkg.cgi                |  4 ++--
 httemplate/edit/part_referral.cgi           |  4 ++--
 httemplate/edit/svc_acct.cgi                |  4 ++--
 httemplate/edit/svc_acct_pop.cgi            |  4 ++--
 httemplate/edit/svc_acct_sm.cgi             |  4 ++--
 httemplate/edit/svc_domain.cgi              |  4 ++--
 httemplate/edit/svc_forward.cgi             |  4 ++--
 httemplate/misc/catchall.cgi                |  4 ++--
 httemplate/misc/delete-customer.cgi         |  4 ++--
 httemplate/misc/link.cgi                    |  4 ++--
 httemplate/search/cust_bill.cgi             |  4 ++--
 httemplate/search/cust_main.cgi             |  4 ++--
 httemplate/search/cust_pkg.cgi              |  4 ++--
 httemplate/search/svc_acct.cgi              |  4 ++--
 httemplate/search/svc_acct_sm.cgi           |  4 ++--
 httemplate/search/svc_domain.cgi            |  4 ++--
 httemplate/view/cust_bill.cgi               |  4 ++--
 httemplate/view/cust_main.cgi               |  4 ++--
 httemplate/view/cust_pkg.cgi                |  4 ++--
 httemplate/view/svc_acct.cgi                |  4 ++--
 httemplate/view/svc_acct_sm.cgi             |  4 ++--
 httemplate/view/svc_domain.cgi              |  4 ++--
 httemplate/view/svc_forward.cgi             |  4 ++--
 42 files changed, 91 insertions(+), 85 deletions(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 85b91eab2..f0fec434d 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -1,7 +1,7 @@
 package FS::CGI;
 
 use strict;
-use vars qw(@EXPORT_OK @ISA);
+use vars qw(@EXPORT_OK @ISA @header);
 use Exporter;
 use CGI;
 use URI::URL;
@@ -11,6 +11,10 @@ use FS::UID;
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable);
 
+@header = ( '-Expires' => '-1',
+            '-Pragma' => 'no-cache',
+            '-Cache-Control' => 'no-cache' );
+
 =head1 NAME
 
 FS::CGI - Subroutines for the web interface
@@ -91,12 +95,12 @@ sub idiot {
   #warn "idiot depriciated";
   my($error)=@_;
   my $cgi = &FS::UID::cgi();
-  if ( $cgi->isa('CGI::Base') ) {
-    no strict 'subs';
-    &CGI::Base::SendHeaders;
-  } else {
-    print $cgi->header( '-expires' => 'now' );
-  }
+#  if ( $cgi->isa('CGI::Base') ) {
+#    no strict 'subs';
+#    &CGI::Base::SendHeaders;
+#  } else {
+    print $cgi->header( @FS::CGI::header );
+#  }
   print <<END;
 <HTML>
   <HEAD>
diff --git a/htetc/global.asa b/htetc/global.asa
index a5863c327..dc75822ff 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -23,7 +23,7 @@ sub Script_OnStart {
 
 sub Script_OnFlush {
   my $ref = $Response->{BinaryRef};
-  $$ref = $cgi->header( '-expires' => 'now' ) . $$ref;
+  $$ref = $cgi->header( @FS::CGI::header ) . $$ref;
   if ( dbh->can('sprintProfile') ) {
 
     $$ref =~ s/<\/BODY>[\s\n]*<\/HTML>[\s\n]*$//i
diff --git a/htetc/handler.pl b/htetc/handler.pl
index e537d26fc..f01d3cd0b 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -75,6 +75,8 @@ sub handler
     }
     $r->content_type('text/html');
     #eorar
+
+    # @FS::CGI::@headers or some other way to set no-cache headers!!!
     
     my $status = $ah->handle_request($r);
     
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index bb0ee2402..0f51d00de 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent.cgi,v 1.4 2001-09-04 14:44:06 ivan Exp $ -->
+#<!-- $Id: agent.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $ui $cgi $p $agent );
@@ -28,7 +28,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( '-expires' => 'now' ), header('Agent Listing', menubar(
+print $cgi->header( @FS::CGI::header ), header('Agent Listing', menubar(
   'Main Menu'   => $p,
   'Agent Types' => $p. 'browse/agent_type.cgi',
 #  'Add new agent' => '../edit/agent.cgi'
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index 30b80000c..d1f8c6e6e 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent_type.cgi,v 1.4 2001-09-04 14:44:06 ivan Exp $ -->
+#<!-- $Id: agent_type.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $agent_type );
@@ -17,7 +17,7 @@ $cgi = new CGI;
 &cgisuidsetup($cgi);
 
 $p = popurl(2);
-print $cgi->header( '-expires' => 'now' ), header("Agent Type Listing", menubar(
+print $cgi->header( @FS::CGI::header ), header("Agent Type Listing", menubar(
   'Main Menu' => $p,
 )), "Agent types define groups of packages that you can then assign to".
     " particular agents.<BR><BR>", &table(), <<END;
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index f7c749c1f..7db581f6c 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main_county.cgi,v 1.3 2001-08-21 09:34:13 ivan Exp $ -->
+#<!-- $Id: cust_main_county.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $cust_main_county );
@@ -16,7 +16,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( '-expires' => 'now' ), header("Tax Rate Listing", menubar(
+print $cgi->header( @FS::CGI::header ), header("Tax Rate Listing", menubar(
   'Main Menu' => $p,
   'Edit tax rates' => $p. "edit/cust_main_county.cgi",
 )),<<END;
diff --git a/httemplate/browse/nas.cgi b/httemplate/browse/nas.cgi
index 89d5e4650..5125bacb7 100755
--- a/httemplate/browse/nas.cgi
+++ b/httemplate/browse/nas.cgi
@@ -17,7 +17,7 @@ $cgi = new CGI;
 
 $p=popurl(2);
 
-print $cgi->header( '-expires' => 'now' ), header('NAS ports', menubar(
+print $cgi->header( @FS::CGI::header ), header('NAS ports', menubar(
   'Main Menu' => $p,
 ));
 
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 30f994872..9a699d5ef 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_pkg.cgi,v 1.6 2001-10-20 12:17:59 ivan Exp $ -->
+#<!-- $Id: part_pkg.cgi,v 1.7 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $part_pkg );
@@ -18,7 +18,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( '-expires' => 'now' ), header("Package Definition Listing",menubar(
+print $cgi->header( @FS::CGI::header ), header("Package Definition Listing",menubar(
   'Main Menu' => $p,
 )), "One or more services are grouped together into a package and given",
   " pricing information. Customers purchase packages",
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index f283ad419..6481b6668 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_referral.cgi,v 1.4 2001-09-04 14:44:06 ivan Exp $ -->
+#<!-- $Id: part_referral.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $part_referral );
@@ -16,7 +16,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( '-expires' => 'now' ), header("Referral Listing", menubar(
+print $cgi->header( @FS::CGI::header ), header("Referral Listing", menubar(
   'Main Menu' => $p,
 #  'Add new referral' => "../edit/part_referral.cgi",
 )), "Where a customer heard about your service. Tracked for informational purposes.<BR><BR>", &table(), <<END;
diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index 76eed136d..ba695738b 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: queue.cgi,v 1.3 2001-10-24 00:59:56 ivan Exp $ -->
+#<!-- $Id: queue.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p ); # $part_referral );
@@ -17,7 +17,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( '-expires' => 'now' ), header("Job Queue", menubar(
+print $cgi->header( @FS::CGI::header ), header("Job Queue", menubar(
   'Main Menu' => $p,
 #  'Add new referral' => "../edit/part_referral.cgi",
 )), &table(), <<END;
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index c58ce3333..e5a611763 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_pop.cgi,v 1.4 2001-08-31 08:43:41 ivan Exp $ -->
+#<!-- $Id: svc_acct_pop.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $svc_acct_pop );
@@ -16,7 +16,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( '-expires' => 'now' ), header('POP Listing', menubar(
+print $cgi->header( @FS::CGI::header ), header('POP Listing', menubar(
   'Main Menu' => $p,
 )), "Points of Presence<BR><BR>", &table(), <<END;
       <TR>
diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index 236d05001..ea68b4768 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent.cgi,v 1.3 2001-08-29 09:11:30 ivan Exp $ -->
+#<!-- $Id: agent.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $agent $action $hashref $p $agent_type );
@@ -31,7 +31,7 @@ $hashref = $agent->hashref;
 
 $p = popurl(2);
 
-print $cgi->header( '-expires' => 'now' ), header("$action Agent", menubar(
+print $cgi->header( @FS::CGI::header ), header("$action Agent", menubar(
   'Main Menu' => $p,
   'View all agents' => $p. 'browse/agent.cgi',
 ));
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index ac41eec5c..eba2c2305 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent_type.cgi,v 1.3 2001-09-04 15:06:03 ivan Exp $ -->
+#<!-- $Id: agent_type.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $agent_type $action $hashref $p $part_pkg );
@@ -32,7 +32,7 @@ $action = $agent_type->typenum ? 'Edit' : 'Add';
 $hashref = $agent_type->hashref;
 
 $p = popurl(2);
-print $cgi->header( '-expires' => 'now' ), header("$action Agent Type", menubar(
+print $cgi->header( @FS::CGI::header ), header("$action Agent Type", menubar(
   'Main Menu' => "$p",
   'View all agent types' => "${p}browse/agent_type.cgi",
 ));
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index 9b215389a..3bfbfc8c4 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $otaker $p1 $crednum $_date $amount $reason );
@@ -36,7 +36,7 @@ $otaker = getotaker;
 
 $p1 = popurl(1);
 
-print $cgi->header( '-expires' => 'now' ), header("Post Credit", '');
+print $cgi->header( @FS::CGI::header ), header("Post Credit", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
   if $cgi->param('error');
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index 13bad1852..d2d50cbf6 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
+#<!-- $Id: cust_credit_bill.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $amount $reason $cust_credit );
@@ -38,7 +38,7 @@ $otaker = getotaker;
 
 $p1 = popurl(1);
 
-print $cgi->header( '-expires' => 'now' ), header("Apply Credit", '');
+print $cgi->header( @FS::CGI::header ), header("Apply Credit", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT><BR><BR>"
   if $cgi->param('error');
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index d271dad46..f5662fd87 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.7 2001-10-15 11:35:28 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.8 2001-10-26 10:24:56 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -74,7 +74,7 @@ $action = $custnum ? 'Edit' : 'Add';
 # top
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Customer $action", '');
+print $cgi->header( @FS::CGI::header ), header("Customer $action", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $error, "</FONT>"
   if $error;
 
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index 4460ee8ad..c344e91ae 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main_county-expand.cgi,v 1.3 2001-08-31 07:28:00 ivan Exp $ -->
+#<!-- $Id: cust_main_county-expand.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $taxnum $cust_main_county $p1 $delim $expansion );
@@ -32,7 +32,7 @@ $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
 die "Can't expand entry!" if $cust_main_county->getfield('county');
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Tax Rate (expand)", menubar(
+print $cgi->header( @FS::CGI::header ), header("Tax Rate (expand)", menubar(
   'Main Menu' => popurl(2),
 ));
 
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index 6be349bc4..c25b6edd0 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main_county.cgi,v 1.3 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_main_county.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $cust_main_county );
@@ -14,7 +14,7 @@ $cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-print $cgi->header( '-expires' => 'now' ), header("Edit tax rates", menubar(
+print $cgi->header( @FS::CGI::header ), header("Edit tax rates", menubar(
   'Main Menu' => popurl(2),
 ));
 
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index c83f585d1..a9506c8ed 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid );
@@ -38,7 +38,7 @@ if ( $cgi->param('error') ) {
 $_date = time;
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Enter payment", '');
+print $cgi->header( @FS::CGI::header ), header("Enter payment", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index 729fc7c98..ea92ac05e 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_pkg.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi %pkg %comment $custnum $p1 @cust_pkg 
@@ -33,7 +33,7 @@ if ( $cgi->param('error') ) {
 }
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Add/Edit Packages", '');
+print $cgi->header( @FS::CGI::header ), header("Add/Edit Packages", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index 9ed8977cd..06f416903 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_referral.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: part_referral.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $part_referral $action $hashref $p1 $query );
@@ -29,7 +29,7 @@ $action = $part_referral->refnum ? 'Edit' : 'Add';
 $hashref = $part_referral->hashref;
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("$action Referral", menubar(
+print $cgi->header( @FS::CGI::header ), header("$action Referral", menubar(
   'Main Menu' => popurl(2),
   'View all referrals' => popurl(2). "browse/part_referral.cgi",
 ));
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 3d0bb0134..8a558613e 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.10 2001-10-20 12:18:00 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.11 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
@@ -101,7 +101,7 @@ $ulen = $svc_acct->dbdef_table->column('username')->length;
 $ulen2 = $ulen+2;
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("$action $svc account");
+print $cgi->header( @FS::CGI::header ), header("$action $svc account");
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT><BR><BR>"
diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
index 5f1d15e26..3ba0f1439 100755
--- a/httemplate/edit/svc_acct_pop.cgi
+++ b/httemplate/edit/svc_acct_pop.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_pop.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: svc_acct_pop.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $svc_acct_pop $action $query $hashref $p1 );
@@ -27,7 +27,7 @@ $action = $svc_acct_pop->popnum ? 'Edit' : 'Add';
 $hashref = $svc_acct_pop->hashref;
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("$action POP", menubar(
+print $cgi->header( @FS::CGI::header ), header("$action POP", menubar(
   'Main Menu' => popurl(2),
   'View all POPs' => popurl(2). "browse/svc_acct_pop.cgi",
 ));
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index 21bd6a9ee..4497b5f59 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.4 2001-09-11 23:44:01 ivan Exp $ -->
+#<!-- $Id: svc_acct_sm.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
@@ -128,7 +128,7 @@ if ($pkgnum) {
 }
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Mail Alias $action", '');
+print $cgi->header( @FS::CGI::header ), header("Mail Alias $action", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index a1a61723d..971088d21 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_domain.cgi,v 1.4 2001-10-25 21:24:12 ivan Exp $ -->
+#<!-- $Id: svc_domain.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $action $svcnum $svc_domain $pkgnum $svcpart $part_svc
@@ -77,7 +77,7 @@ $otaker = getotaker;
 $domain = $svc_domain->domain;
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("$action $svc", '');
+print $cgi->header( @FS::CGI::header ), header("$action $svc", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 287833e53..0529c2b86 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_forward.cgi,v 1.4 2001-09-11 23:44:01 ivan Exp $ -->
+# <!-- $Id: svc_forward.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_forward $pkgnum $svcpart
@@ -128,7 +128,7 @@ if ($pkgnum) {
 #display
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Mail Forward $action", '',
+print $cgi->header( @FS::CGI::header ), header("Mail Forward $action", '',
       " onLoad=\"visualize()\"");
 
 %>
diff --git a/httemplate/misc/catchall.cgi b/httemplate/misc/catchall.cgi
index 9ebec6688..7e90ac4e0 100755
--- a/httemplate/misc/catchall.cgi
+++ b/httemplate/misc/catchall.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: catchall.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: catchall.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $action $svcnum $svc_domain $pkgnum $svcpart
@@ -94,7 +94,7 @@ if ($pkgnum) {
 $email{0} = "(none)";
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Domain Catchall Edit", '');
+print $cgi->header( @FS::CGI::header ), header("Domain Catchall Edit", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/misc/delete-customer.cgi b/httemplate/misc/delete-customer.cgi
index 3a7330960..ec1f734f1 100755
--- a/httemplate/misc/delete-customer.cgi
+++ b/httemplate/misc/delete-customer.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: delete-customer.cgi,v 1.3 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: delete-customer.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $conf $query $custnum $new_custnum $cust_main );
@@ -28,7 +28,7 @@ if ( $cgi->param('error') ) {
 $cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } )
   or die "Customer not found: $custnum";
 
-print $cgi->header ( '-expires' => 'now' ), header('Delete customer');
+print $cgi->header ( @FS::CGI::header ), header('Delete customer');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/misc/link.cgi b/httemplate/misc/link.cgi
index f4b70f76a..cd873cc8d 100755
--- a/httemplate/misc/link.cgi
+++ b/httemplate/misc/link.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: link.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: link.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( %link_field $cgi $pkgnum $svcpart $query $part_svc $svc $svcdb 
@@ -32,7 +32,7 @@ $svc = $part_svc->getfield('svc');
 $svcdb = $part_svc->getfield('svcdb');
 $link_field = $link_field{$svcdb};
 
-print $cgi->header( '-expires' => 'now' ), header("Link to existing $svc"),
+print $cgi->header( @FS::CGI::header ), header("Link to existing $svc"),
       qq!<FORM ACTION="!, popurl(1), qq!process/link.cgi" METHOD=POST>!;
 
 if ( $link_field ) { 
diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index d6d942b1b..02dbf558f 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_bill.cgi,v 1.3 2001-09-01 12:35:39 ivan Exp $ -->
+#<!-- $Id: cust_bill.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $invnum $query $sortby @cust_bill );
@@ -67,7 +67,7 @@ if ( scalar(@cust_bill) == 1 ) {
   eidiot("Invoice not found.");
 } else {
   my $total = scalar(@cust_bill);
-  print $cgi->header( '-expires' => 'now' ),
+  print $cgi->header( @FS::CGI::header ),
         &header("Invoice Search Results", menubar(
           'Main Menu', popurl(2)
         )), "$total matching invoices found<BR>", &table(), <<END;
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 4a3782194..d8cd0a072 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.10 2001-10-10 06:22:22 thalakan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.11 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
@@ -59,7 +59,7 @@ if ( scalar(@cust_main) == 1 && ! $cgi->param('referral_custnum') ) {
 } else { 
 
   my($total)=scalar(@cust_main);
-  print $cgi->header( '-expires' => 'now' ), header("Customer Search Results",menubar(
+  print $cgi->header( @FS::CGI::header ), header("Customer Search Results",menubar(
     'Main Menu', popurl(2)
   )), "$total matching customers found ";
   if ( $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 8a0dfd132..f7cb50674 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_pkg.cgi,v 1.4 2001-08-21 02:03:32 ivan Exp $ -->
+# <!-- $Id: cust_pkg.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi @cust_pkg $sortby $query %part_pkg );
@@ -58,7 +58,7 @@ if ( scalar(@cust_pkg) == 1 ) {
   eidiot("No packages found");
 } else {
   my($total)=scalar(@cust_pkg);
-  print $cgi->header( '-expires' => 'now' ),
+  print $cgi->header( @FS::CGI::header ),
         header('Package Search Results',''),
         "$total matching packages found<BR>", &table(), <<END;
       <TR>
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 64085ea93..5fc815453 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_acct.cgi,v 1.6 2001-10-24 15:29:31 ivan Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.7 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi @svc_acct $sortby $query $mydomain );
@@ -59,7 +59,7 @@ if ( scalar(@svc_acct) == 1 ) {
   idiot("Account not found");
 } else {
   my($total)=scalar(@svc_acct);
-  print $cgi->header( '-expires' => 'now' ),
+  print $cgi->header( @FS::CGI::header ),
         header("Account Search Results",''),
         "$total matching accounts found",
         &table(), <<END;
diff --git a/httemplate/search/svc_acct_sm.cgi b/httemplate/search/svc_acct_sm.cgi
index 4350c320c..24b304051 100755
--- a/httemplate/search/svc_acct_sm.cgi
+++ b/httemplate/search/svc_acct_sm.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.2 2001-08-21 02:31:57 ivan Exp $ -->
+#<!-- $Id: svc_acct_sm.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $domuser $svc_domain $domsvc @svc_acct_sm );
@@ -40,7 +40,7 @@ if ( scalar(@svc_acct_sm) == 1 ) {
   my($svcnum)=$svc_acct_sm[0]->svcnum;
   print $cgi->redirect(popurl(2). "view/svc_acct_sm.cgi?$svcnum");
 } elsif ( scalar(@svc_acct_sm) > 1 ) {
-  print $cgi->header( '-expires' => 'now' ),
+  print $cgi->header( @FS::CGI::header ),
         header('Mail Alias Search Results'),
         &table(), <<END;
       <TR>
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index fb386e2cf..1b80e5b32 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_domain.cgi,v 1.3 2001-08-21 02:31:57 ivan Exp $ -->
+# <!-- $Id: svc_domain.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi @svc_domain $sortby $query $conf $mydomain );
@@ -54,7 +54,7 @@ if ( scalar(@svc_domain) == 1 ) {
 } else {
 
   my($total)=scalar(@svc_domain);
-  print $cgi->header( '-expires' => 'now' ),
+  print $cgi->header( @FS::CGI::header ),
         header("Domain Search Results",''), <<END;
 
     $total matching domains found
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 1e024f377..57193197e 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_bill.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
+# <!-- $Id: cust_bill.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $invnum $cust_bill $custnum $printed $p );
@@ -26,7 +26,7 @@ $custnum = $cust_bill->getfield('custnum');
 $printed = $cust_bill->printed;
 
 $p = popurl(2);
-print $cgi->header( '-expires' => 'now' ), header('Invoice View', menubar(
+print $cgi->header( @FS::CGI::header ), header('Invoice View', menubar(
   "Main Menu" => $p,
   "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
 ));
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 650c6cfeb..7deaeb9f4 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.12 2001-09-21 03:47:26 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.13 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
@@ -29,7 +29,7 @@ $cgi = new CGI;
 
 $conf = new FS::Conf;
 
-print $cgi->header( '-expires' => 'now' ), header("Customer View", menubar(
+print $cgi->header( @FS::CGI::header ), header("Customer View", menubar(
   'Main Menu' => popurl(2)
 ));
 
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index 6dd1d2455..5ddb17aee 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_pkg.cgi,v 1.3 2001-10-15 14:58:03 ivan Exp $ -->
+# <!-- $Id: cust_pkg.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi %uiview %uiadd $part_svc $query $pkgnum $cust_pkg $part_pkg
@@ -35,7 +35,7 @@ die "No package!" unless $cust_pkg;
 $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
 
 $custnum = $cust_pkg->getfield('custnum');
-print $cgi->header( '-expires' => 'now' ), header('Package View', menubar(
+print $cgi->header( @FS::CGI::header ), header('Package View', menubar(
   "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum",
   'Main Menu' => popurl(2)
 ));
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 01019c552..e4c328f1f 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_acct.cgi,v 1.6 2001-09-27 20:41:37 ivan Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.7 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $domain $query $svcnum $svc_acct $cust_svc $pkgnum
@@ -55,7 +55,7 @@ if ( $svc_acct->domsvc ) {
 }
 
 $p = popurl(2);
-print $cgi->header( '-expires' => 'now' ), header('Account View', menubar(
+print $cgi->header( @FS::CGI::header ), header('Account View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
         "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
diff --git a/httemplate/view/svc_acct_sm.cgi b/httemplate/view/svc_acct_sm.cgi
index ff665d312..2a69c858f 100755
--- a/httemplate/view/svc_acct_sm.cgi
+++ b/httemplate/view/svc_acct_sm.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.2 2001-08-21 02:31:57 ivan Exp $ -->
+#<!-- $Id: svc_acct_sm.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw($conf $cgi $mydomain $query $svcnum $svc_acct_sm $cust_svc
@@ -43,7 +43,7 @@ $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
   or die "Unkonwn svcpart";
 
 $p = popurl(2);
-print $cgi->header( '-expires' => 'now' ), header('Mail Alias View', menubar(
+print $cgi->header( @FS::CGI::header ), header('Mail Alias View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
         "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index cc60df68a..81b5922f8 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_domain.cgi,v 1.3 2001-08-21 02:31:57 ivan Exp $ -->
+# <!-- $Id: svc_domain.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $svcnum $svc_domain $domain $cust_svc $pkgnum 
@@ -44,7 +44,7 @@ if ($svc_domain->catchall) {
 $domain = $svc_domain->domain;
 
 $p = popurl(2);
-print $cgi->header( '-expires' => 'now' ), header('Domain View', menubar(
+print $cgi->header( @FS::CGI::header ), header('Domain View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
         "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index e40935bc4..4a636c60e 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_forward.cgi,v 1.2 2001-08-21 02:31:57 ivan Exp $ -->
+# <!-- $Id: svc_forward.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw($conf $cgi $query $svcnum $svc_forward $cust_svc
@@ -41,7 +41,7 @@ $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
   or die "Unkonwn svcpart";
 
 $p = popurl(2);
-print $cgi->header( '-expires' => 'now' ), header('Mail Forward View', menubar(
+print $cgi->header( @FS::CGI::header ), header('Mail Forward View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
         "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-- 
cgit v1.2.1


From f017443890cd20191a038d3c883811ced97e3361 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Oct 2001 17:17:58 +0000
Subject: automate a tiny bit more

---
 Makefile | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7e7815fcd..3f3779ec6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
 #!/usr/bin/make
 
-default:
-	@echo "supported targets: aspdocs masondocs alldocs clean"
+help:
+	@echo "supported targets: aspdocs masondocs alldocs perl-modules"
+	@echo "                   install-perl-modules install clean"
 
 aspdocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
 	rm -rf aspdocs
@@ -18,6 +19,26 @@ masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httem
 
 alldocs: aspdocs masondocs
 
+FS/Makefile:
+	cd FS
+	perl Makefile.PL
+
+perl-modules:
+	cd FS; \
+	[ -e Makefile ] || perl Makefile.PL; \
+	make
+
+install-perl-modules: perl-modules
+	cd FS; \
+	make install
+
+install: install-perl-modules
+
+deploy: install
+	/etc/init.d/apache restart
+
 clean:
 	rm -rf aspdocs masondocs
+	cd FS
+	make clean
 
-- 
cgit v1.2.1


From f242d4d58ce0980887df84be50112e47094d5e59 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Oct 2001 20:53:38 +0000
Subject: methods for getting the associated svc_acct records

---
 FS/FS/svc_forward.pm | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index 6ee1d5b85..1476dbf78 100644
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -271,8 +271,7 @@ sub check {
   ;
   return $error if $error;
 
-  return "Unknown srcsvc"
-    unless qsearchs('svc_acct', { 'svcnum' => $self->srcsvc } );
+  return "Unknown srcsvc" unless $self->srcsvc_acct;
 
   return "Both dstsvc and dst were defined; one one can be specified"
     if $self->dstsvc && $self->dst;
@@ -280,9 +279,7 @@ sub check {
   return "one of dstsvc or dst is required"
     unless $self->dstsvc || $self->dst;
 
-  return "Unknown dstsvc"
-    unless qsearchs('svc_acct', { 'svcnum' => $self->dstsvc } )
-           || ! $self->dstsvc;
+  return "Unknown dstsvc" unless $self->dstsvc_acct || ! $self->dstsvc;
 
   if ( $self->dst ) {
     $self->dst =~ /^([\w\.\-]+)\@(([\w\-]+\.)+\w+)$/
@@ -295,11 +292,32 @@ sub check {
   ''; #no error
 }
 
+=item srcsvc_acct
+
+Returns the FS::svc_acct object referenced by the srcsvc column.
+
+=cut
+
+sub srcsvc_acct {
+  my $self = shift;
+  qsearchs('svc_acct', { 'svcnum' => $self->srcsvc } );
+}
+
+=item dstsvc_acct
+
+Returns the FS::svc_acct object referenced by the srcsvc column, or false for
+forwards not local to freeside.
+
 =back
 
+sub dstsvc_acct {
+  my $self = shift;
+  qsearchs('svc_acct', { 'svcnum' => $self->dstsvc } );
+}
+
 =head1 VERSION
 
-$Id: svc_forward.pm,v 1.7 2001-09-06 20:41:59 ivan Exp $
+$Id: svc_forward.pm,v 1.8 2001-10-29 20:53:38 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 68d4bb2e760eb96a05753ad0abac78921edb47e1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Oct 2001 20:54:22 +0000
Subject: doc typo

---
 httemplate/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index c26c9a701..63c39d682 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -12,7 +12,7 @@ Before installing, you need:
   <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.
     <ul>
       <li><a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.
-      <li>MySQL has been reported to work.  <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=DBD</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
+      <li>MySQL has been reported to work.  <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
     </ul>
   <li>Perl modules (<a href="http://theoryx5.uwinnipeg.ca/CPAN/perl/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
     <ul>
-- 
cgit v1.2.1


From 08b30d24ab8e51606d19331d6732cd6b22a6d80e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Oct 2001 21:22:33 +0000
Subject: fix make clean

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3f3779ec6..7edc5aa13 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,6 @@ deploy: install
 
 clean:
 	rm -rf aspdocs masondocs
-	cd FS
+	cd FS; \
 	make clean
 
-- 
cgit v1.2.1


From 399377be683d60fd80690504103b809885b27903 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 10:20:32 +0000
Subject: setup/config updates.  getting easier...

---
 FS/FS/Conf.pm                |  4 +--
 FS/MANIFEST                  |  3 ++-
 FS/bin/freeside-adduser      | 52 +++++++++++++++++++++++++++++++++++++
 Makefile                     | 62 +++++++++++++++++++++++++++++++++++++++-----
 httemplate/docs/install.html | 12 ++++++++-
 5 files changed, 123 insertions(+), 10 deletions(-)
 create mode 100644 FS/bin/freeside-adduser

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index fb8d13bae..1c75954aa 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -8,7 +8,7 @@ $DEBUG = 0;
 
 =head1 NAME
 
-FS::Conf - Read access to Freeside configuration values
+FS::Conf - Freeside configuration values
 
 =head1 SYNOPSIS
 
@@ -29,7 +29,7 @@ FS::Conf - Read access to Freeside configuration values
 
 =head1 DESCRIPTION
 
-Read access to Freeside configuration values.  Keys currently map to filenames,
+Read and write Freeside configuration values.  Keys currently map to filenames,
 but this may change in the future.
 
 =head1 METHODS
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 5de6977a1..4254514a2 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -7,7 +7,8 @@ bin/freeside-bill
 bin/freeside-email
 bin/freeside-print-batch
 bin/freeside-queued
-fin/freeside-apply-credits
+bin/freeside-apply-credits
+bin/freeside-adduser
 FS.pm
 FS/CGI.pm
 FS/Conf.pm
diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
new file mode 100644
index 000000000..4517a83fa
--- /dev/null
+++ b/FS/bin/freeside-adduser
@@ -0,0 +1,52 @@
+#!/usr/bin/perl -w
+#
+# $Id: freeside-adduser,v 1.1 2001-10-30 10:20:32 ivan Exp $
+
+use strict;
+use vars qw($opt_h $opt_c);
+use Getopt::Std;
+
+my $FREESIDE_CONF = "/usr/local/etc/freeside";
+
+getopts("ch:");
+die &usage if $opt_c && ! $opt_h;
+my $secretfile = shift or die &usage;
+my $user = shift or die &usage;
+
+my @args = ( 'htpasswd' );
+push @args, '-c' if $opt_c;
+push @args, $opt_h, $user;
+system(@args) == 0 or die "htpasswd failed: $?";
+
+open(MAPSECRETS,">>$FREESIDE_CONF/mapsecrets")
+  or die "can't open $FREESIDE_CONF/mapsecrets: $!";
+print MAPSECRETS "$user $secretfile\n";
+close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
+
+sub usage {
+  die "Usage:\n\n  freeside-adduser [ -h htpasswd_file [ -c ] ] secretfile username"
+}
+
+=head1 NAME
+
+freeside-adduser - Command line interface to add (freeside) users.
+
+=head1 SYNOPSIS
+
+  freeside-adduser [ -h htpasswd_file [ -c ] ] username
+
+=head DESCRIPTION
+
+Adds a user to the Freeside billing system.  This is for adding users (internal
+sales/tech folks) to the web interface, not for adding customer accounts.
+
+  -h: Also call htpasswd for this user with the given filename
+
+  -c: Passed to htpasswd
+
+=head1 SEE ALSO
+
+L<htpasswd>, base Freeside documentation
+
+=cut
+
diff --git a/Makefile b/Makefile
index 7edc5aa13..90b6bf465 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,33 @@
 #!/usr/bin/make
 
+#Pg
+DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
+#pgsql on some systems; check /etc/passwd
+DB_ADMIN_USER = postgres
+DB_ADMIN_PASSWORD=
+
+#mysql
+#DATASOURCE=DBI:mysql:freeside
+#DB_ADMIN_USER=mysql
+#DB_ADMIN_PASSWORD=
+
+TEMPLATE = asp
+#mason's a bit dodgy stil
+#TEMPLATE = mason
+
+FREESIDE_DOCUMENT_ROOT = /var/www/freeside
+
+#---
+
+#not changable yet
+FREESIDE_CONF = /usr/local/etc/freeside
+
 help:
-	@echo "supported targets: aspdocs masondocs alldocs perl-modules"
-	@echo "                   install-perl-modules install clean"
+	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
+	@echo "                   perl-modules install-perl-modules"
+	@echo "                   install deploy"
+	@echo "                   create-database"
+	@echo "                   clean"
 
 aspdocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
 	rm -rf aspdocs
@@ -19,9 +44,11 @@ masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httem
 
 alldocs: aspdocs masondocs
 
-FS/Makefile:
-	cd FS
-	perl Makefile.PL
+docs:
+	make ${TEMPLATE}docs
+
+install-docs: docs
+	cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
 
 perl-modules:
 	cd FS; \
@@ -32,11 +59,34 @@ install-perl-modules: perl-modules
 	cd FS; \
 	make install
 
-install: install-perl-modules
+install: install-perl-modules install-docs
 
 deploy: install
 	/etc/init.d/apache restart
 
+create-database:
+	perl -e 'use DBIx::DataSource qw( create_database ); create_database( \'${DATASOURCE}\', \'${DB_ADMIN_USER}\', \'${DB_ADMIN_PASSWORD}\' ) or die $DBIx::DataSource::errstr;'
+
+create-config: install-perl-modules
+	[ -d ${FREESIDE_CONF} ] || mkdir ${FREESIDE_CONF}
+	chown freeside ${FREESIDE_CONF}
+
+	[ -d "${FREESIDE_CONF}/conf.${DATASOURCE}" ] \
+	  || mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
+	chown freeside "${FREESIDE_CONF/conf.${DATASOURCE}"
+
+	[ -d "${FREESIDE_CONF}/counters.${DATASOURCE}" ] \
+	  || mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"
+	chown freeside "${FREESIDE_CONF/counters.${DATASOURCE}"
+
+	[ -d "${FREESIDE_CONF}/cache.${DATASOURCE}" ] \
+	  || mkdir "${FREESIDE_CONF}/cache.${DATASOURCE}"
+	chown freeside "${FREESIDE_CONF/cache.${DATASOURCE}"
+
+	[ -d "${FREESIDE_CONF}/export.${DATASOURCE}" ] \
+	  || mkdir "${FREESIDE_CONF}/export.${DATASOURCE}"
+	chown freeside "${FREESIDE_CONF/export.${DATASOURCE}"
+
 clean:
 	rm -rf aspdocs masondocs
 	cd FS; \
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 63c39d682..3a14fa779 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -38,6 +38,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>
       <li><a href="http://search.cpan.org/search?dist=DBI">DBI</a>
       <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a>
+      <li><a href="http://search.cpan.org/search?dist=DBIx-DataSource">DBIx-DataSource</a>
       <li><a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>
       <li><a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>
       <li><a href="http://search.cpan.org/search?dist=String-ShellQuote">String-ShellQuote</a>
@@ -112,7 +113,16 @@ require "/usr/local/apache/conf/handler.pl";
   </tr>
 </table>
 <ul>
-<li>Restrict access to this web interface.  (with <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache</a>)
+<li>Restrict access to this web interface.  (with <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache</a>).    For example, to configure user authentication with flat files:
+<font size="-1"><pre>
+&lt;Directory /usr/local/apache/htdocs/freeside-asp&gt;
+PerlSetVar Global /usr/local/etc/freeside/asp-global/
+AuthName Freeside
+AuthType Basic
+AuthUserFile /usr/local/etc/apache/htpasswd
+require valid-user
+&lt;/Directory&gt;
+</pre>
 <li>Create the necessary <a href="config.html">configuration files</a>.
 <li>Create the `/usr/local/etc/freeside/counters.<i>datasrc</i>', 
   `/usr/local/etc/freeside/cache.<i>datasrc</i>', and 
-- 
cgit v1.2.1


From edda09a317f5dfef05fb8906f28531ec6f4b0927 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 11:47:54 +0000
Subject: whew more install docs and automation

---
 FS/bin/freeside-adduser      |  6 ++---
 Makefile                     | 16 ++++++-------
 httemplate/docs/admin.html   | 13 +++++-----
 httemplate/docs/config.html  |  5 ++--
 httemplate/docs/index.html   |  2 ++
 httemplate/docs/install.html | 57 +++++++++++++++++++++++++++++++-------------
 6 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index 4517a83fa..e66b0d012 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: freeside-adduser,v 1.1 2001-10-30 10:20:32 ivan Exp $
+# $Id: freeside-adduser,v 1.2 2001-10-30 11:47:54 ivan Exp $
 
 use strict;
 use vars qw($opt_h $opt_c);
@@ -33,9 +33,9 @@ freeside-adduser - Command line interface to add (freeside) users.
 
 =head1 SYNOPSIS
 
-  freeside-adduser [ -h htpasswd_file [ -c ] ] username
+  freeside-adduser [ -h htpasswd_file [ -c ] ] secretfile username
 
-=head DESCRIPTION
+=head1 DESCRIPTION
 
 Adds a user to the Freeside billing system.  This is for adding users (internal
 sales/tech folks) to the web interface, not for adding customer accounts.
diff --git a/Makefile b/Makefile
index 90b6bf465..3b0262523 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,11 @@
 #!/usr/bin/make
 
-#Pg
 DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
+#DATASOURCE=DBI:mysql:freeside
 #pgsql on some systems; check /etc/passwd
-DB_ADMIN_USER = postgres
-DB_ADMIN_PASSWORD=
 
-#mysql
-#DATASOURCE=DBI:mysql:freeside
-#DB_ADMIN_USER=mysql
-#DB_ADMIN_PASSWORD=
+DB_USER = freeside
+DB_PASSWORD=
 
 TEMPLATE = asp
 #mason's a bit dodgy stil
@@ -57,7 +53,7 @@ perl-modules:
 
 install-perl-modules: perl-modules
 	cd FS; \
-	make install
+	make install UNINST=1
 
 install: install-perl-modules install-docs
 
@@ -65,12 +61,14 @@ deploy: install
 	/etc/init.d/apache restart
 
 create-database:
-	perl -e 'use DBIx::DataSource qw( create_database ); create_database( \'${DATASOURCE}\', \'${DB_ADMIN_USER}\', \'${DB_ADMIN_PASSWORD}\' ) or die $DBIx::DataSource::errstr;'
+	perl -e 'use DBIx::DataSource qw( create_database ); create_database( \'${DATASOURCE}\', \'${DB_USER}\', \'${DB_PASSWORD}\' ) or die $DBIx::DataSource::errstr;'
 
 create-config: install-perl-modules
 	[ -d ${FREESIDE_CONF} ] || mkdir ${FREESIDE_CONF}
 	chown freeside ${FREESIDE_CONF}
 
+	echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets
+
 	[ -d "${FREESIDE_CONF}/conf.${DATASOURCE}" ] \
 	  || mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
 	chown freeside "${FREESIDE_CONF/conf.${DATASOURCE}"
diff --git a/httemplate/docs/admin.html b/httemplate/docs/admin.html
index f137188f3..1dab439e1 100755
--- a/httemplate/docs/admin.html
+++ b/httemplate/docs/admin.html
@@ -10,13 +10,12 @@
   /home/httpd/html/freeside, and your web browser's DocumentRoot is
   /home/httpd/html, open https://your_host/freeside/. Replace
   "your_host" with the name or network address of your web server.
-
-  <li>Once in the Freeside web interface, you must first create a
-  service definition.  An example of a service definition would be a dial-up
-  account or a domain.  For starters, it is necessary to create a domain
-  definition.  Click on <u>View/Edit service definitions</u> and
-  <u>Add a new service definition</u> with <i>Table</i> <b>svc_domain</b>
-  (and no modifiers).
+  <li>Select <u>Configuration</u> from the main menu and update your configuration values.
+  <li>Next you must create a service definition.  An example of a service
+  definition would be a dial-up account or a domain.  For starters, it is
+  necessary to create a domain definition.  Click on <u>View/Edit service
+  definitions</u> and <u>Add a new service definition</u> with <i>Table</i>
+  <b>svc_domain</b> (and no modifiers).
 
   <li>Now that you have created your first service, you must create a package
   including this service which you can sell to customers.  Zero, one, or many
diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
index 656723781..9caf3bb3a 100644
--- a/httemplate/docs/config.html
+++ b/httemplate/docs/config.html
@@ -3,6 +3,7 @@
 </head>
 <body>
   <h1>Configuration files</h1>
+<font size="+1" color="#ff0000">Configuration is now done by the top-level Makefile and web interface.  The instructions below are no longer necessary.</font>
 <ul>
   <li>Create the <b>/usr/local/etc/freeside</b> directory to hold your configuration.
   <li>Setting up <a href="http://www.apache.org/docs/misc/FAQ.html#user-authentication">Apache user authetication</a> is mandatory.
@@ -18,9 +19,9 @@ admin secretfile
 john secretfile
 sam secretfile
 </pre>
-  <li>Next, the filename(s) referenced in <b>/usr/local/etc/freeside/mapsecrets</b> file should be created in the <b>/usr/local/etc/freeside/</b> directory.  Each file contains three lines: <a href="http://search.cpan.org/doc/TIMB/DBI-1.15/DBI.pm">DBI data source</a> (for example,
+  <li>Next, the filename(s) referenced in <b>/usr/local/etc/freeside/mapsecrets</b> file should be created in the <b>/usr/local/etc/freeside/</b> directory.  Each file contains three lines: <a href="http://search.cpan.org/doc/TIMB/DBI-1.20/DBI.pm">DBI data source</a> (for example,
   <tt>DBI:mysql:freeside</tt> or <tt>DBI:Pg:host=localhost;dbname=freeside</tt>), database username, and database password.
-  These files should not be world readable.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.15/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD">manpage for your DBD</a> for the exact syntax of a DBI data source.  In a normal installation such as the example above, a single file <b>/usr/local/etc/freeside/secretfile</b> would be created - for example:
+  These files should not be world readable.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.20/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD">manpage for your DBD</a> for the exact syntax of a DBI data source.  In a normal installation such as the example above, a single file <b>/usr/local/etc/freeside/secretfile</b> would be created - for example:
 <pre>
 DBI:Pg:host=localhost;dbname=freeside
 dbusername
diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html
index 2d6bfe786..932df0549 100644
--- a/httemplate/docs/index.html
+++ b/httemplate/docs/index.html
@@ -14,7 +14,9 @@
   <li><a href="upgrade6.html">Upgrading from 1.2.3 to 1.3.0</a>
   <li><a href="upgrade7.html">Upgrading from 1.3.0 to 1.3.1</a>
   <li><a href="upgrade8.html">Upgrading from 1.3.1 to 1.4.0</a>
+<!--
   <li><a href="config.html">Configuration files</a>
+!-->
   <li><a href="admin.html">Administration</a>
 <!--
   <li><a href="../index.html#admin">Administration</a>
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 3a14fa779..f2db59f88 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -51,20 +51,35 @@ Install the Freeside distribution:
   <li>Add the user `freeside' to your system.
   <li>Allow the freeside user full access to the freeside database.
     <ul>
-      <li> with <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#User_Account_Management">MySQL</a>:<pre>$ mysqladmin -u root password '<i>set_a_root_database_password</i>'
+      <li> with <a href="http://www.postgresql.org/users-lounge/docs/7.1/postgres/user-manag.html#DATABASE-USERS">PostgreSQL</a>:
+        <pre>
+$ su freeside
+$ createuser -P freeside</pre>
+      <li> with <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#User_Account_Management">MySQL</a>:
+        <pre>
+$ mysqladmin -u root password '<i>set_a_root_database_password</i>'
 $ mysql -u root -p
 mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* TO freeside@localhost IDENTIFIED BY '<i>set_a_freeside_database_password</i>';</pre>
-      <li> with <a href="http://www.postgresql.org/users-lounge/docs/7.1/postgres/user-manag.html#DATABASE-USERS">PostgreSQL</a>
     </ul>
-  <li>Add the freeside database to your database engine.  (with <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_Reference.html#CREATE_DATABASE">MySQL</a>) (with <a href="http://www.postgresql.org/users-lounge/docs/7.1/postgres/managing-databases.html#MANAGE-AG-CREATEDB">PostgreSQL</a>)
   <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>
+  <li>Edit the top-level Makefile:
+    <ul>
+      <li>Set <tt>DATASOURCE</tt> to your <a href="http://search.cpan.org/doc/TIMB/DBI-1.20/DBI.pm">DBI data source</a>, for example, <tt>DBI:Pg:host=localhost;dbname=freeside</tt> for PostgresSQL or <tt>DBI:mysql:freeside</tt> for MySQL.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.20/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD">manpage for your DBD</a> for the exact syntax of a DBI data source.
+      <li>Set <tt>DB_ADMIN_PASSWORD</tt> to the freeside database user's password.
+    </ul>
+  <li>Add the freeside database to your database engine:
+    <pre>
+$ su
+# make create-database</pre>
   <li>Build and install the Perl libraries:
     <pre>
-$ cd FS/
-$ perl Makefile.PL
-$ make
+$ make perl-modules
+$ su
+# make install-perl-modules</pre>
+    <li>Create the necessary configuration files:<pre>
 $ su
-# make install UNINST=1</pre>
+# make create-config
+</pre>
     <li>You should run a separate iteration of Apache[-SSL] with mod_perl enabled as the freeside user.
 </ul>
 <table>
@@ -113,22 +128,32 @@ require "/usr/local/apache/conf/handler.pl";
   </tr>
 </table>
 <ul>
-<li>Restrict access to this web interface.  (with <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache</a>).    For example, to configure user authentication with flat files:
-<font size="-1"><pre>
+<li>Restrict access to this web interface - see the <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache documentation on user authentication</a>.    For example, to configure user authentication with <a href="http://httpd.apache.org/docs/mod/mod_auth.html">mod_auth</a> (flat files):
+<pre>
 &lt;Directory /usr/local/apache/htdocs/freeside-asp&gt;
 PerlSetVar Global /usr/local/etc/freeside/asp-global/
 AuthName Freeside
 AuthType Basic
-AuthUserFile /usr/local/etc/apache/htpasswd
+AuthUserFile /usr/local/etc/freeside/htpasswd
 require valid-user
 &lt;/Directory&gt;
 </pre>
-<li>Create the necessary <a href="config.html">configuration files</a>.
-<li>Create the `/usr/local/etc/freeside/counters.<i>datasrc</i>', 
-  `/usr/local/etc/freeside/cache.<i>datasrc</i>', and 
-  `/usr/local/etc/freeside/export.<i>datasrc</i>' directories for each <i>datasrc</i> (owned by the freeside user).
-  <li>As the freeside user, run bin/fs-setup to create the database tables.
-  <li>freeside-queued was installed with the Perl modules.  Start it now and ensure that is run upon system startup.
+  <li>Create one or more Freeside users (your internal sales/tech folks, not customer accounts).  These users are setup using using Apache authentication; they're not UNIX user accounts.  For example, using <a href="http://httpd.apache.org/docs/mod/mod_auth.html">mod_auth</a> (flat files):
+    <ul>
+      <li>First user:<font size="-1">
+<pre>$ su
+$ freeside-adduser -h /usr/local/etc/freeside/htpasswd -c /usr/local/etc/freeside/secrets <i>username</i></pre></font>
+      <li>Additional users:<font size="-1">
+<pre>$ su
+$ freeside-adduser -h /usr/local/etc/freeside/htpasswd /usr/local/etc/freeside/secrets <i>username</i></pre></font>
+    </ul>
+  <i>(using other auth types, add each user to your <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache authentication</a> yand then run: <tt>freeside-adduser /usr/local/etc/freeside/secrets <b>username</b></tt></i>
+  <li>As the freeside UNIX user, run <tt>bin/fs-setup <b>username</b></tt> to create the database tables, passing the username of a Freeside user you created above:
+<pre>
+$ su freeside
+$ bin/fs-setup <b>username</b>
+</pre>
+  <li><tt>freeside-queued</tt> was installed with the Perl modules.  Start it now and ensure that is run upon system startup.
   <li>Now proceed to the initial <a href="admin.html">administration</a> of your installation.
 </ul>
 </body>
-- 
cgit v1.2.1


From b934dd05b09dd3d7c72d1fc18b4f600fb3b86430 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 12:35:39 +0000
Subject: makefile typo

---
 Makefile                     | 12 ++++++------
 httemplate/docs/install.html |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 3b0262523..f3fa1e19d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,12 @@
 
 DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 #DATASOURCE=DBI:mysql:freeside
-#pgsql on some systems; check /etc/passwd
 
 DB_USER = freeside
 DB_PASSWORD=
 
 TEMPLATE = asp
-#mason's a bit dodgy stil
+#mason's a bit dodgy still
 #TEMPLATE = mason
 
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
@@ -44,6 +43,7 @@ docs:
 	make ${TEMPLATE}docs
 
 install-docs: docs
+	mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S`
 	cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
 
 perl-modules:
@@ -71,19 +71,19 @@ create-config: install-perl-modules
 
 	[ -d "${FREESIDE_CONF}/conf.${DATASOURCE}" ] \
 	  || mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
-	chown freeside "${FREESIDE_CONF/conf.${DATASOURCE}"
+	chown freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
 
 	[ -d "${FREESIDE_CONF}/counters.${DATASOURCE}" ] \
 	  || mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"
-	chown freeside "${FREESIDE_CONF/counters.${DATASOURCE}"
+	chown freeside "${FREESIDE_CONF}/counters.${DATASOURCE}"
 
 	[ -d "${FREESIDE_CONF}/cache.${DATASOURCE}" ] \
 	  || mkdir "${FREESIDE_CONF}/cache.${DATASOURCE}"
-	chown freeside "${FREESIDE_CONF/cache.${DATASOURCE}"
+	chown freeside "${FREESIDE_CONF}/cache.${DATASOURCE}"
 
 	[ -d "${FREESIDE_CONF}/export.${DATASOURCE}" ] \
 	  || mkdir "${FREESIDE_CONF}/export.${DATASOURCE}"
-	chown freeside "${FREESIDE_CONF/export.${DATASOURCE}"
+	chown freeside "${FREESIDE_CONF}/export.${DATASOURCE}"
 
 clean:
 	rm -rf aspdocs masondocs
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index f2db59f88..1d6022ba3 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -138,7 +138,7 @@ AuthUserFile /usr/local/etc/freeside/htpasswd
 require valid-user
 &lt;/Directory&gt;
 </pre>
-  <li>Create one or more Freeside users (your internal sales/tech folks, not customer accounts).  These users are setup using using Apache authentication; they're not UNIX user accounts.  For example, using <a href="http://httpd.apache.org/docs/mod/mod_auth.html">mod_auth</a> (flat files):
+  <li>Create one or more Freeside users (your internal sales/tech folks, not customer accounts).  These users are setup using using Apache authentication, not UNIX user accounts.  For example, using <a href="http://httpd.apache.org/docs/mod/mod_auth.html">mod_auth</a> (flat files):
     <ul>
       <li>First user:<font size="-1">
 <pre>$ su
-- 
cgit v1.2.1


From 56fc68db7603aaa06df25bb053d46cdfb2599c18 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 12:38:55 +0000
Subject: make

---
 Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index f3fa1e19d..ae385d85e 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,13 @@ create-config: install-perl-modules
 	[ -d ${FREESIDE_CONF} ] || mkdir ${FREESIDE_CONF}
 	chown freeside ${FREESIDE_CONF}
 
+	touch ${FREESIDE_CONF}/secrets
+	chown freeside ${FREESIDE_CONF}/secrets
+	chmod 600 ${FREESIDE_CONF}/secrets
+
 	echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets
+	chmod 600 ${FREESIDE_CONF}/secrets
+	chown freeside ${FREESIDE_CONF}/secrets
 
 	[ -d "${FREESIDE_CONF}/conf.${DATASOURCE}" ] \
 	  || mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
-- 
cgit v1.2.1


From a8989c556a7a1951a0b34942c6289f26395859d7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 13:47:07 +0000
Subject: `make create-config' installs default config (conf dir update)
 freeside-adduser uses default secrets file

---
 FS/bin/freeside-adduser      | 15 +++++++++------
 Makefile                     | 20 +++++++++-----------
 conf/address                 |  4 ----
 conf/domain                  |  1 -
 conf/secrets                 |  3 ---
 conf/shells                  |  5 ++++-
 conf/smtpmachine             |  2 +-
 httemplate/docs/install.html |  6 +++---
 8 files changed, 26 insertions(+), 30 deletions(-)
 delete mode 100644 conf/address
 delete mode 100644 conf/domain
 delete mode 100644 conf/secrets

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index e66b0d012..7fc5830db 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,16 +1,15 @@
 #!/usr/bin/perl -w
 #
-# $Id: freeside-adduser,v 1.2 2001-10-30 11:47:54 ivan Exp $
+# $Id: freeside-adduser,v 1.3 2001-10-30 13:47:07 ivan Exp $
 
 use strict;
-use vars qw($opt_h $opt_c);
+use vars qw($opt_h $opt_c $opt_s);
 use Getopt::Std;
 
 my $FREESIDE_CONF = "/usr/local/etc/freeside";
 
-getopts("ch:");
+getopts("ch:s:");
 die &usage if $opt_c && ! $opt_h;
-my $secretfile = shift or die &usage;
 my $user = shift or die &usage;
 
 my @args = ( 'htpasswd' );
@@ -18,13 +17,15 @@ push @args, '-c' if $opt_c;
 push @args, $opt_h, $user;
 system(@args) == 0 or die "htpasswd failed: $?";
 
+my $secretfile = $opt_s || 'secrets';
+
 open(MAPSECRETS,">>$FREESIDE_CONF/mapsecrets")
   or die "can't open $FREESIDE_CONF/mapsecrets: $!";
 print MAPSECRETS "$user $secretfile\n";
 close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
 
 sub usage {
-  die "Usage:\n\n  freeside-adduser [ -h htpasswd_file [ -c ] ] secretfile username"
+  die "Usage:\n\n  freeside-adduser [ -h htpasswd_file [ -c ] ] [ -s secretfile ] username"
 }
 
 =head1 NAME
@@ -33,7 +34,7 @@ freeside-adduser - Command line interface to add (freeside) users.
 
 =head1 SYNOPSIS
 
-  freeside-adduser [ -h htpasswd_file [ -c ] ] secretfile username
+  freeside-adduser [ -h htpasswd_file [ -c ] ] [ -s secretfile ] username
 
 =head1 DESCRIPTION
 
@@ -44,6 +45,8 @@ sales/tech folks) to the web interface, not for adding customer accounts.
 
   -c: Passed to htpasswd
 
+  -s: Specify an alternate secret file
+
 =head1 SEE ALSO
 
 L<htpasswd>, base Freeside documentation
diff --git a/Makefile b/Makefile
index ae385d85e..312609afd 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ docs:
 	make ${TEMPLATE}docs
 
 install-docs: docs
-	mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S`
+	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S`
 	cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
 
 perl-modules:
@@ -64,7 +64,8 @@ create-database:
 	perl -e 'use DBIx::DataSource qw( create_database ); create_database( \'${DATASOURCE}\', \'${DB_USER}\', \'${DB_PASSWORD}\' ) or die $DBIx::DataSource::errstr;'
 
 create-config: install-perl-modules
-	[ -d ${FREESIDE_CONF} ] || mkdir ${FREESIDE_CONF}
+	[ -e ${FREESIDE_CONF} ] || mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S`
+	mkdir ${FREESIDE_CONF}
 	chown freeside ${FREESIDE_CONF}
 
 	touch ${FREESIDE_CONF}/secrets
@@ -75,20 +76,17 @@ create-config: install-perl-modules
 	chmod 600 ${FREESIDE_CONF}/secrets
 	chown freeside ${FREESIDE_CONF}/secrets
 
-	[ -d "${FREESIDE_CONF}/conf.${DATASOURCE}" ] \
-	  || mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
-	chown freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
+	mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
+	cp conf/* "${FREESIDE_CONF}/conf.${DATASOURCE}"
+	chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
 
-	[ -d "${FREESIDE_CONF}/counters.${DATASOURCE}" ] \
-	  || mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"
+	mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"
 	chown freeside "${FREESIDE_CONF}/counters.${DATASOURCE}"
 
-	[ -d "${FREESIDE_CONF}/cache.${DATASOURCE}" ] \
-	  || mkdir "${FREESIDE_CONF}/cache.${DATASOURCE}"
+	mkdir "${FREESIDE_CONF}/cache.${DATASOURCE}"
 	chown freeside "${FREESIDE_CONF}/cache.${DATASOURCE}"
 
-	[ -d "${FREESIDE_CONF}/export.${DATASOURCE}" ] \
-	  || mkdir "${FREESIDE_CONF}/export.${DATASOURCE}"
+	mkdir "${FREESIDE_CONF}/export.${DATASOURCE}"
 	chown freeside "${FREESIDE_CONF}/export.${DATASOURCE}"
 
 clean:
diff --git a/conf/address b/conf/address
deleted file mode 100644
index 62ec516ea..000000000
--- a/conf/address
+++ /dev/null
@@ -1,4 +0,0 @@
-Silicon Interactive Software Design
-15 Skyview Way
-Newtown, PA  18940
-
diff --git a/conf/domain b/conf/domain
deleted file mode 100644
index b3cefaf74..000000000
--- a/conf/domain
+++ /dev/null
@@ -1 +0,0 @@
-domain.tld
diff --git a/conf/secrets b/conf/secrets
deleted file mode 100644
index 5843943ac..000000000
--- a/conf/secrets
+++ /dev/null
@@ -1,3 +0,0 @@
-DBI:mysql:freeside
-freeside
-put_your_password_here
diff --git a/conf/shells b/conf/shells
index 02d74f7fc..a41fc6209 100644
--- a/conf/shells
+++ b/conf/shells
@@ -1,2 +1,5 @@
-/bin/csh
+
 /bin/sh
+/bin/csh
+/bin/bash
+/bin/false
diff --git a/conf/smtpmachine b/conf/smtpmachine
index fa7963cc9..2fbb50c4a 100644
--- a/conf/smtpmachine
+++ b/conf/smtpmachine
@@ -1 +1 @@
-mail
+localhost
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 1d6022ba3..b5df9b1cc 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -142,12 +142,12 @@ require valid-user
     <ul>
       <li>First user:<font size="-1">
 <pre>$ su
-$ freeside-adduser -h /usr/local/etc/freeside/htpasswd -c /usr/local/etc/freeside/secrets <i>username</i></pre></font>
+$ freeside-adduser -c -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
       <li>Additional users:<font size="-1">
 <pre>$ su
-$ freeside-adduser -h /usr/local/etc/freeside/htpasswd /usr/local/etc/freeside/secrets <i>username</i></pre></font>
+$ freeside-adduser -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
     </ul>
-  <i>(using other auth types, add each user to your <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache authentication</a> yand then run: <tt>freeside-adduser /usr/local/etc/freeside/secrets <b>username</b></tt></i>
+  <i>(using other auth types, add each user to your <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache authentication</a> and then run: <tt>freeside-adduser <b>username</b></tt></i>
   <li>As the freeside UNIX user, run <tt>bin/fs-setup <b>username</b></tt> to create the database tables, passing the username of a Freeside user you created above:
 <pre>
 $ su freeside
-- 
cgit v1.2.1


From 618c19ca67cdf11fca914d75664dd6d1e546ad01 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 13:48:22 +0000
Subject: make

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 312609afd..c0a84fc43 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ create-database:
 	perl -e 'use DBIx::DataSource qw( create_database ); create_database( \'${DATASOURCE}\', \'${DB_USER}\', \'${DB_PASSWORD}\' ) or die $DBIx::DataSource::errstr;'
 
 create-config: install-perl-modules
-	[ -e ${FREESIDE_CONF} ] || mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S`
+	[ -e ${FREESIDE_CONF} ] && mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S`
 	mkdir ${FREESIDE_CONF}
 	chown freeside ${FREESIDE_CONF}
 
-- 
cgit v1.2.1


From 0ff607900727da25755f08101f557eeb469fe2bd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 13:49:24 +0000
Subject: work with CVS version too

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c0a84fc43..2e8fd1f2d 100644
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,7 @@ create-config: install-perl-modules
 	chown freeside ${FREESIDE_CONF}/secrets
 
 	mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
-	cp conf/* "${FREESIDE_CONF}/conf.${DATASOURCE}"
+	cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
 	chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
 
 	mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"
-- 
cgit v1.2.1


From c34e73e4a0f8ab38adc88829598207e219a86928 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 14:20:46 +0000
Subject: web config should workish now

---
 htetc/handler.pl                  |  1 +
 httemplate/config/config-view.cgi |  4 +++-
 httemplate/config/config.cgi      | 48 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 httemplate/config/config.cgi

diff --git a/htetc/handler.pl b/htetc/handler.pl
index f01d3cd0b..d10ecc918 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -59,6 +59,7 @@ sub handler
       #use CGI::Carp qw(fatalsToBrowser);
       use Date::Format;
       use Date::Parse;
+      use HTML::Entities;
       use FS::UID qw(cgisuidsetup);
       use FS::Record qw(qsearch qsearchs fields);
       use FS::part_svc;
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 09e535b2f..3c16c4815 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -25,7 +25,9 @@
             <tr><td><font color="#ff0000">no type</font></td></tr>
           <% } elsif ( $type eq 'textarea' ) { %>
             <tr><td bgcolor="#ffffff">
-              <pre><%= join("\n", $conf->config($i->key) ) %></pre>
+<pre>
+<%= encode_entities(join("\n", $conf->config($i->key) ) ) %>
+</pre>
             </td></tr>
           <% } elsif ( $type eq 'checkbox' ) { %>
             <tr><td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td></tr>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
new file mode 100644
index 000000000..32ddc043d
--- /dev/null
+++ b/httemplate/config/config.cgi
@@ -0,0 +1,48 @@
+<%= header('Edit Configuration', menubar( 'Main Menu' => $p ) ) %>
+
+<% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
+
+<form action="config-process.cgi">
+
+<% foreach my $section ( qw(required billing username password UI session
+                            apache BIND shell
+                           ),
+                         '', 'depreciated') { %>
+  <%= table("#cccccc", 2) %>
+  <tr>
+    <th colspan="2" bgcolor="#dcdcdc">
+      <%= ucfirst($section || 'unclassified') %> configuration options
+    </th>
+  </tr>
+  <% foreach my $i (grep $_->section eq $section, @config_items) { %>
+    <tr>
+      <td>
+        <% my $n = 0;
+           foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
+             #warn $i->key unless defined($type);
+        %>
+          <% if ( $type eq '' ) { %>
+            <font color="#ff0000">no type</font>
+          <% } elsif ( $type eq 'textarea' ) { %>
+            <textarea name="<%= $i->key. $n %>" rows=5><%= join("\n", $conf->config($i->key) ) %></textarea>
+          <% } elsif ( $type eq 'checkbox' ) { %>
+            <input name="<%= $i->key. $n %>" type="checkbox" value="1"<%= $conf->exists($i->key) ? ' CHECKED' : '' %>>
+          <% } elsif ( $type eq 'text' )  { %>
+            <input name="<%= $i->key. $n %>" type="<%= $type %>" value="<%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>">
+          <% } else { %>
+            <font color="#ff0000">unknown type <%= $type %></font>
+          <% } %>
+        <% $n++; } %>
+      </td>
+      <td><a name="<%= $i->key %>">
+        <b><%= $i->key %></b> - <%= $i->description %>
+      </a></td>
+    </tr>
+  <% } %>
+  </table><br><br>
+<% } %>
+
+<input type="submit" value="Apply changes">
+</form>
+
+</body></html>
-- 
cgit v1.2.1


From 160db3d20070241532162f8fa257e2ae4dd1f611 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 14:28:05 +0000
Subject: docu

---
 httemplate/docs/install.html  |  2 +-
 httemplate/docs/upgrade8.html | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index b5df9b1cc..efc1eb6bc 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -71,7 +71,7 @@ mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* T
     <pre>
 $ su
 # make create-database</pre>
-  <li>Build and install the Perl libraries:
+  <li>Build and install the Perl modules:
     <pre>
 $ make perl-modules
 $ su
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index a368d4488..94ca832ef 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -54,14 +54,10 @@ require "/usr/local/apache/conf/handler.pl";
   </tr>
 </table>
 <ul>
-  <li>Change to the FS directory in the new tarball, and build and install the
-      Perl modules:
+  <li>Build and install the Perl modules:
     <pre>
-$ cd FS/
-$ perl Makefile.PL
-$ make
 $ su
-# make install UNINST=1</pre>
+# make install-perl-modules</pre>
    <li>Apply the following changes to your database:
 <pre>
 CREATE TABLE svc_forward (
@@ -251,7 +247,7 @@ ALTER TABLE cust_refund DROP COLUMN crednum;
 </pre></font>
 </td></tr></table>
   <li><b>IMPORTANT: After applying the second set of database changes</b>, run bin/dbdef-create again.
-  <li>create the <a href="config.html#username_policy">user_policy configuration file</a> as appropriate for your site.
+  <li>set the <a href="../config/config.cgi#username_policy">user_policy configuration value</a> as appropriate for your site.
   <li>Create the `/usr/local/etc/freeside/cache.<i>datasrc</i>' directory
       (ownded by the freeside user).
   <li>freeside-queued was installed with the Perl modules.  Start it now and ensure that is run upon system startup.
-- 
cgit v1.2.1


From c14a267229fc0d6f2d2afdebab3bd34d825df2ef Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 14:54:07 +0000
Subject: get rid of header foo in individual templates

---
 htetc/handler.pl                            | 2 +-
 httemplate/browse/agent.cgi                 | 4 ++--
 httemplate/browse/agent_type.cgi            | 4 ++--
 httemplate/browse/cust_main_county.cgi      | 4 ++--
 httemplate/browse/nas.cgi                   | 2 +-
 httemplate/browse/part_pkg.cgi              | 4 ++--
 httemplate/browse/part_referral.cgi         | 4 ++--
 httemplate/browse/queue.cgi                 | 4 ++--
 httemplate/browse/svc_acct_pop.cgi          | 4 ++--
 httemplate/edit/agent.cgi                   | 4 ++--
 httemplate/edit/agent_type.cgi              | 4 ++--
 httemplate/edit/cust_credit.cgi             | 4 ++--
 httemplate/edit/cust_credit_bill.cgi        | 4 ++--
 httemplate/edit/cust_main.cgi               | 4 ++--
 httemplate/edit/cust_main_county-expand.cgi | 4 ++--
 httemplate/edit/cust_main_county.cgi        | 4 ++--
 httemplate/edit/cust_pay.cgi                | 4 ++--
 httemplate/edit/cust_pkg.cgi                | 4 ++--
 httemplate/edit/part_referral.cgi           | 4 ++--
 httemplate/edit/svc_acct.cgi                | 4 ++--
 httemplate/edit/svc_acct_pop.cgi            | 4 ++--
 httemplate/edit/svc_acct_sm.cgi             | 4 ++--
 httemplate/edit/svc_domain.cgi              | 4 ++--
 httemplate/edit/svc_forward.cgi             | 4 ++--
 httemplate/misc/catchall.cgi                | 4 ++--
 httemplate/misc/delete-customer.cgi         | 4 ++--
 httemplate/misc/link.cgi                    | 4 ++--
 httemplate/search/cust_bill.cgi             | 5 ++---
 httemplate/search/cust_main.cgi             | 4 ++--
 httemplate/search/cust_pkg.cgi              | 5 ++---
 httemplate/search/svc_acct.cgi              | 5 ++---
 httemplate/search/svc_acct_sm.cgi           | 6 ++----
 httemplate/search/svc_domain.cgi            | 5 ++---
 httemplate/view/cust_bill.cgi               | 4 ++--
 httemplate/view/cust_main.cgi               | 4 ++--
 httemplate/view/cust_pkg.cgi                | 4 ++--
 httemplate/view/svc_acct.cgi                | 4 ++--
 httemplate/view/svc_acct_sm.cgi             | 4 ++--
 httemplate/view/svc_domain.cgi              | 4 ++--
 httemplate/view/svc_forward.cgi             | 4 ++--
 40 files changed, 78 insertions(+), 84 deletions(-)

diff --git a/htetc/handler.pl b/htetc/handler.pl
index d10ecc918..e643559f0 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -77,7 +77,7 @@ sub handler
     $r->content_type('text/html');
     #eorar
 
-    # @FS::CGI::@headers or some other way to set no-cache headers!!!
+    # @FS::CGI::headers or some other way to set no-cache headers!!!
     
     my $status = $ah->handle_request($r);
     
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 0f51d00de..62004490f 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: agent.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $ui $cgi $p $agent );
@@ -28,7 +28,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( @FS::CGI::header ), header('Agent Listing', menubar(
+print header('Agent Listing', menubar(
   'Main Menu'   => $p,
   'Agent Types' => $p. 'browse/agent_type.cgi',
 #  'Add new agent' => '../edit/agent.cgi'
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index d1f8c6e6e..11ba20ac5 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent_type.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: agent_type.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $agent_type );
@@ -17,7 +17,7 @@ $cgi = new CGI;
 &cgisuidsetup($cgi);
 
 $p = popurl(2);
-print $cgi->header( @FS::CGI::header ), header("Agent Type Listing", menubar(
+print header("Agent Type Listing", menubar(
   'Main Menu' => $p,
 )), "Agent types define groups of packages that you can then assign to".
     " particular agents.<BR><BR>", &table(), <<END;
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index 7db581f6c..bbd75cc4a 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main_county.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_main_county.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $cust_main_county );
@@ -16,7 +16,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( @FS::CGI::header ), header("Tax Rate Listing", menubar(
+print header("Tax Rate Listing", menubar(
   'Main Menu' => $p,
   'Edit tax rates' => $p. "edit/cust_main_county.cgi",
 )),<<END;
diff --git a/httemplate/browse/nas.cgi b/httemplate/browse/nas.cgi
index 5125bacb7..6df40e049 100755
--- a/httemplate/browse/nas.cgi
+++ b/httemplate/browse/nas.cgi
@@ -17,7 +17,7 @@ $cgi = new CGI;
 
 $p=popurl(2);
 
-print $cgi->header( @FS::CGI::header ), header('NAS ports', menubar(
+print header('NAS ports', menubar(
   'Main Menu' => $p,
 ));
 
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 9a699d5ef..e0d25f67d 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_pkg.cgi,v 1.7 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: part_pkg.cgi,v 1.8 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $part_pkg );
@@ -18,7 +18,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( @FS::CGI::header ), header("Package Definition Listing",menubar(
+print header("Package Definition Listing",menubar(
   'Main Menu' => $p,
 )), "One or more services are grouped together into a package and given",
   " pricing information. Customers purchase packages",
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index 6481b6668..b82d4cba0 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_referral.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: part_referral.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $part_referral );
@@ -16,7 +16,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( @FS::CGI::header ), header("Referral Listing", menubar(
+print header("Referral Listing", menubar(
   'Main Menu' => $p,
 #  'Add new referral' => "../edit/part_referral.cgi",
 )), "Where a customer heard about your service. Tracked for informational purposes.<BR><BR>", &table(), <<END;
diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index ba695738b..72643eb47 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: queue.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: queue.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p ); # $part_referral );
@@ -17,7 +17,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( @FS::CGI::header ), header("Job Queue", menubar(
+print header("Job Queue", menubar(
   'Main Menu' => $p,
 #  'Add new referral' => "../edit/part_referral.cgi",
 )), &table(), <<END;
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index e5a611763..21cb95f89 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_pop.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: svc_acct_pop.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $svc_acct_pop );
@@ -16,7 +16,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( @FS::CGI::header ), header('POP Listing', menubar(
+print header('POP Listing', menubar(
   'Main Menu' => $p,
 )), "Points of Presence<BR><BR>", &table(), <<END;
       <TR>
diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index ea68b4768..a4dcda5e3 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: agent.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $agent $action $hashref $p $agent_type );
@@ -31,7 +31,7 @@ $hashref = $agent->hashref;
 
 $p = popurl(2);
 
-print $cgi->header( @FS::CGI::header ), header("$action Agent", menubar(
+print header("$action Agent", menubar(
   'Main Menu' => $p,
   'View all agents' => $p. 'browse/agent.cgi',
 ));
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index eba2c2305..849da8113 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent_type.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: agent_type.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $agent_type $action $hashref $p $part_pkg );
@@ -32,7 +32,7 @@ $action = $agent_type->typenum ? 'Edit' : 'Add';
 $hashref = $agent_type->hashref;
 
 $p = popurl(2);
-print $cgi->header( @FS::CGI::header ), header("$action Agent Type", menubar(
+print header("$action Agent Type", menubar(
   'Main Menu' => "$p",
   'View all agent types' => "${p}browse/agent_type.cgi",
 ));
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index 3bfbfc8c4..5d5f5b296 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $otaker $p1 $crednum $_date $amount $reason );
@@ -36,7 +36,7 @@ $otaker = getotaker;
 
 $p1 = popurl(1);
 
-print $cgi->header( @FS::CGI::header ), header("Post Credit", '');
+print header("Post Credit", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
   if $cgi->param('error');
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index d2d50cbf6..2b41cc216 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_credit_bill.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $amount $reason $cust_credit );
@@ -38,7 +38,7 @@ $otaker = getotaker;
 
 $p1 = popurl(1);
 
-print $cgi->header( @FS::CGI::header ), header("Apply Credit", '');
+print header("Apply Credit", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT><BR><BR>"
   if $cgi->param('error');
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index f5662fd87..d8191c7d6 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.8 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.9 2001-10-30 14:54:07 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -74,7 +74,7 @@ $action = $custnum ? 'Edit' : 'Add';
 # top
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Customer $action", '');
+print header("Customer $action", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $error, "</FONT>"
   if $error;
 
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index c344e91ae..f5dc32372 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main_county-expand.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_main_county-expand.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $taxnum $cust_main_county $p1 $delim $expansion );
@@ -32,7 +32,7 @@ $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
 die "Can't expand entry!" if $cust_main_county->getfield('county');
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Tax Rate (expand)", menubar(
+print header("Tax Rate (expand)", menubar(
   'Main Menu' => popurl(2),
 ));
 
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index c25b6edd0..f88601281 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main_county.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_main_county.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $cust_main_county );
@@ -14,7 +14,7 @@ $cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-print $cgi->header( @FS::CGI::header ), header("Edit tax rates", menubar(
+print header("Edit tax rates", menubar(
   'Main Menu' => popurl(2),
 ));
 
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index a9506c8ed..3c0dbb2fe 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid );
@@ -38,7 +38,7 @@ if ( $cgi->param('error') ) {
 $_date = time;
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Enter payment", '');
+print header("Enter payment", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index ea92ac05e..7d5bb3fd3 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pkg.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_pkg.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi %pkg %comment $custnum $p1 @cust_pkg 
@@ -33,7 +33,7 @@ if ( $cgi->param('error') ) {
 }
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Add/Edit Packages", '');
+print header("Add/Edit Packages", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index 06f416903..09344b956 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_referral.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: part_referral.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $part_referral $action $hashref $p1 $query );
@@ -29,7 +29,7 @@ $action = $part_referral->refnum ? 'Edit' : 'Add';
 $hashref = $part_referral->hashref;
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("$action Referral", menubar(
+print header("$action Referral", menubar(
   'Main Menu' => popurl(2),
   'View all referrals' => popurl(2). "browse/part_referral.cgi",
 ));
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 8a558613e..4911e0ffd 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.11 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.12 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
@@ -101,7 +101,7 @@ $ulen = $svc_acct->dbdef_table->column('username')->length;
 $ulen2 = $ulen+2;
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("$action $svc account");
+print header("$action $svc account");
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT><BR><BR>"
diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
index 3ba0f1439..23caa794b 100755
--- a/httemplate/edit/svc_acct_pop.cgi
+++ b/httemplate/edit/svc_acct_pop.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_pop.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: svc_acct_pop.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $svc_acct_pop $action $query $hashref $p1 );
@@ -27,7 +27,7 @@ $action = $svc_acct_pop->popnum ? 'Edit' : 'Add';
 $hashref = $svc_acct_pop->hashref;
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("$action POP", menubar(
+print header("$action POP", menubar(
   'Main Menu' => popurl(2),
   'View all POPs' => popurl(2). "browse/svc_acct_pop.cgi",
 ));
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index 4497b5f59..baf0a7eb2 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: svc_acct_sm.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
@@ -128,7 +128,7 @@ if ($pkgnum) {
 }
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Mail Alias $action", '');
+print header("Mail Alias $action", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index 971088d21..713b2ccd7 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_domain.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: svc_domain.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $action $svcnum $svc_domain $pkgnum $svcpart $part_svc
@@ -77,7 +77,7 @@ $otaker = getotaker;
 $domain = $svc_domain->domain;
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("$action $svc", '');
+print header("$action $svc", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 0529c2b86..caf6ee76d 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_forward.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: svc_forward.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_forward $pkgnum $svcpart
@@ -128,7 +128,7 @@ if ($pkgnum) {
 #display
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Mail Forward $action", '',
+print header("Mail Forward $action", '',
       " onLoad=\"visualize()\"");
 
 %>
diff --git a/httemplate/misc/catchall.cgi b/httemplate/misc/catchall.cgi
index 7e90ac4e0..3aafd0d49 100755
--- a/httemplate/misc/catchall.cgi
+++ b/httemplate/misc/catchall.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: catchall.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: catchall.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $action $svcnum $svc_domain $pkgnum $svcpart
@@ -94,7 +94,7 @@ if ($pkgnum) {
 $email{0} = "(none)";
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Domain Catchall Edit", '');
+print header("Domain Catchall Edit", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/misc/delete-customer.cgi b/httemplate/misc/delete-customer.cgi
index ec1f734f1..d3e7c798f 100755
--- a/httemplate/misc/delete-customer.cgi
+++ b/httemplate/misc/delete-customer.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: delete-customer.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: delete-customer.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $conf $query $custnum $new_custnum $cust_main );
@@ -28,7 +28,7 @@ if ( $cgi->param('error') ) {
 $cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } )
   or die "Customer not found: $custnum";
 
-print $cgi->header ( @FS::CGI::header ), header('Delete customer');
+print header('Delete customer');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/misc/link.cgi b/httemplate/misc/link.cgi
index cd873cc8d..801b92006 100755
--- a/httemplate/misc/link.cgi
+++ b/httemplate/misc/link.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: link.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: link.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( %link_field $cgi $pkgnum $svcpart $query $part_svc $svc $svcdb 
@@ -32,7 +32,7 @@ $svc = $part_svc->getfield('svc');
 $svcdb = $part_svc->getfield('svcdb');
 $link_field = $link_field{$svcdb};
 
-print $cgi->header( @FS::CGI::header ), header("Link to existing $svc"),
+print header("Link to existing $svc"),
       qq!<FORM ACTION="!, popurl(1), qq!process/link.cgi" METHOD=POST>!;
 
 if ( $link_field ) { 
diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 02dbf558f..41a4a546e 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_bill.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_bill.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $invnum $query $sortby @cust_bill );
@@ -67,8 +67,7 @@ if ( scalar(@cust_bill) == 1 ) {
   eidiot("Invoice not found.");
 } else {
   my $total = scalar(@cust_bill);
-  print $cgi->header( @FS::CGI::header ),
-        &header("Invoice Search Results", menubar(
+  print header("Invoice Search Results", menubar(
           'Main Menu', popurl(2)
         )), "$total matching invoices found<BR>", &table(), <<END;
       <TR>
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index d8cd0a072..a11892101 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.11 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.12 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
@@ -59,7 +59,7 @@ if ( scalar(@cust_main) == 1 && ! $cgi->param('referral_custnum') ) {
 } else { 
 
   my($total)=scalar(@cust_main);
-  print $cgi->header( @FS::CGI::header ), header("Customer Search Results",menubar(
+  print header("Customer Search Results",menubar(
     'Main Menu', popurl(2)
   )), "$total matching customers found ";
   if ( $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index f7cb50674..93ce7ae29 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_pkg.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: cust_pkg.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi @cust_pkg $sortby $query %part_pkg );
@@ -58,8 +58,7 @@ if ( scalar(@cust_pkg) == 1 ) {
   eidiot("No packages found");
 } else {
   my($total)=scalar(@cust_pkg);
-  print $cgi->header( @FS::CGI::header ),
-        header('Package Search Results',''),
+  print header('Package Search Results',''),
         "$total matching packages found<BR>", &table(), <<END;
       <TR>
         <TH>Package</TH>
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 5fc815453..fb970e966 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_acct.cgi,v 1.7 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.8 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi @svc_acct $sortby $query $mydomain );
@@ -59,8 +59,7 @@ if ( scalar(@svc_acct) == 1 ) {
   idiot("Account not found");
 } else {
   my($total)=scalar(@svc_acct);
-  print $cgi->header( @FS::CGI::header ),
-        header("Account Search Results",''),
+  print header("Account Search Results",''),
         "$total matching accounts found",
         &table(), <<END;
       <TR>
diff --git a/httemplate/search/svc_acct_sm.cgi b/httemplate/search/svc_acct_sm.cgi
index 24b304051..5250b5ca1 100755
--- a/httemplate/search/svc_acct_sm.cgi
+++ b/httemplate/search/svc_acct_sm.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: svc_acct_sm.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $domuser $svc_domain $domsvc @svc_acct_sm );
@@ -40,9 +40,7 @@ if ( scalar(@svc_acct_sm) == 1 ) {
   my($svcnum)=$svc_acct_sm[0]->svcnum;
   print $cgi->redirect(popurl(2). "view/svc_acct_sm.cgi?$svcnum");
 } elsif ( scalar(@svc_acct_sm) > 1 ) {
-  print $cgi->header( @FS::CGI::header ),
-        header('Mail Alias Search Results'),
-        &table(), <<END;
+  print header('Mail Alias Search Results'), &table(), <<END;
       <TR>
         <TH>Mail to<BR><FONT SIZE=-1>(click to view mail alias)</FONT></TH>
         <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index 1b80e5b32..b09c65a0b 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_domain.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: svc_domain.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi @svc_domain $sortby $query $conf $mydomain );
@@ -54,8 +54,7 @@ if ( scalar(@svc_domain) == 1 ) {
 } else {
 
   my($total)=scalar(@svc_domain);
-  print $cgi->header( @FS::CGI::header ),
-        header("Domain Search Results",''), <<END;
+  print header("Domain Search Results",''), <<END;
 
     $total matching domains found
     <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 57193197e..bbcf87fc2 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_bill.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: cust_bill.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $invnum $cust_bill $custnum $printed $p );
@@ -26,7 +26,7 @@ $custnum = $cust_bill->getfield('custnum');
 $printed = $cust_bill->printed;
 
 $p = popurl(2);
-print $cgi->header( @FS::CGI::header ), header('Invoice View', menubar(
+print header('Invoice View', menubar(
   "Main Menu" => $p,
   "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
 ));
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 7deaeb9f4..d43575a9a 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.13 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.14 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
@@ -29,7 +29,7 @@ $cgi = new CGI;
 
 $conf = new FS::Conf;
 
-print $cgi->header( @FS::CGI::header ), header("Customer View", menubar(
+print header("Customer View", menubar(
   'Main Menu' => popurl(2)
 ));
 
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index 5ddb17aee..c8b362cc3 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_pkg.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: cust_pkg.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi %uiview %uiadd $part_svc $query $pkgnum $cust_pkg $part_pkg
@@ -35,7 +35,7 @@ die "No package!" unless $cust_pkg;
 $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
 
 $custnum = $cust_pkg->getfield('custnum');
-print $cgi->header( @FS::CGI::header ), header('Package View', menubar(
+print header('Package View', menubar(
   "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum",
   'Main Menu' => popurl(2)
 ));
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index e4c328f1f..23205ece9 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_acct.cgi,v 1.7 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.8 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $domain $query $svcnum $svc_acct $cust_svc $pkgnum
@@ -55,7 +55,7 @@ if ( $svc_acct->domsvc ) {
 }
 
 $p = popurl(2);
-print $cgi->header( @FS::CGI::header ), header('Account View', menubar(
+print header('Account View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
         "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
diff --git a/httemplate/view/svc_acct_sm.cgi b/httemplate/view/svc_acct_sm.cgi
index 2a69c858f..366ee99f9 100755
--- a/httemplate/view/svc_acct_sm.cgi
+++ b/httemplate/view/svc_acct_sm.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: svc_acct_sm.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw($conf $cgi $mydomain $query $svcnum $svc_acct_sm $cust_svc
@@ -43,7 +43,7 @@ $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
   or die "Unkonwn svcpart";
 
 $p = popurl(2);
-print $cgi->header( @FS::CGI::header ), header('Mail Alias View', menubar(
+print header('Mail Alias View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
         "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index 81b5922f8..4add200b9 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_domain.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: svc_domain.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $svcnum $svc_domain $domain $cust_svc $pkgnum 
@@ -44,7 +44,7 @@ if ($svc_domain->catchall) {
 $domain = $svc_domain->domain;
 
 $p = popurl(2);
-print $cgi->header( @FS::CGI::header ), header('Domain View', menubar(
+print header('Domain View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
         "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index 4a636c60e..bb9587062 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_forward.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: svc_forward.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw($conf $cgi $query $svcnum $svc_forward $cust_svc
@@ -41,7 +41,7 @@ $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
   or die "Unkonwn svcpart";
 
 $p = popurl(2);
-print $cgi->header( @FS::CGI::header ), header('Mail Forward View', menubar(
+print header('Mail Forward View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
         "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-- 
cgit v1.2.1


From 14655eb7b88692104732988ee9aab14a855ff752 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 15:39:27 +0000
Subject: better ordering of state selection on new customer screen

---
 httemplate/edit/cust_main.cgi | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index d8191c7d6..cc692dd88 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.9 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.10 2001-10-30 15:39:27 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -178,11 +178,16 @@ print <<END;
 <TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="state" SIZE="1">
 END
 
-$cust_main->country( $conf->config('countrydefault') || 'US' )
-  unless $cust_main->country;
+my $countrydefault = $conf->config('countrydefault') || 'US';
+$cust_main->country( $countrydefault ) unless $cust_main->country;
 $cust_main->state( $conf->config('statedefault') || 'CA' )
   unless $cust_main->state || $cust_main->country ne 'US';
-foreach ( qsearch('cust_main_county',{}) ) {
+foreach ( sort {
+     $a->country eq $countrydefault <=> $b->country eq $countrydefault
+  or $a->country                    cmp $b->country
+  or $a->state                      cmp $b->state
+  or $a->county                     cmp $b->county
+} qsearch('cust_main_county',{}) ) {
   print "<OPTION";
   print " SELECTED" if ( $cust_main->state eq $_->state
                          && $cust_main->county eq $_->county 
-- 
cgit v1.2.1


From ef2e9712fbb5b4b1c5a681530c202498204220d8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 15:41:00 +0000
Subject: precedence oops

---
 httemplate/edit/cust_main.cgi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index cc692dd88..0a10c7ce1 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.10 2001-10-30 15:39:27 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.11 2001-10-30 15:41:00 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -183,10 +183,10 @@ $cust_main->country( $countrydefault ) unless $cust_main->country;
 $cust_main->state( $conf->config('statedefault') || 'CA' )
   unless $cust_main->state || $cust_main->country ne 'US';
 foreach ( sort {
-     $a->country eq $countrydefault <=> $b->country eq $countrydefault
-  or $a->country                    cmp $b->country
-  or $a->state                      cmp $b->state
-  or $a->county                     cmp $b->county
+     ( $a->country eq $countrydefault ) <=> ( $b->country eq $countrydefault )
+  or $a->country                        cmp $b->country
+  or $a->state                          cmp $b->state
+  or $a->county                         cmp $b->county
 } qsearch('cust_main_county',{}) ) {
   print "<OPTION";
   print " SELECTED" if ( $cust_main->state eq $_->state
-- 
cgit v1.2.1


From 57a1412bb70af3fdd7e3acd9e487c66260105776 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 15:42:33 +0000
Subject: put default country up top

---
 httemplate/edit/cust_main.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 0a10c7ce1..cfd99c824 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.11 2001-10-30 15:41:00 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.12 2001-10-30 15:42:33 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -183,7 +183,7 @@ $cust_main->country( $countrydefault ) unless $cust_main->country;
 $cust_main->state( $conf->config('statedefault') || 'CA' )
   unless $cust_main->state || $cust_main->country ne 'US';
 foreach ( sort {
-     ( $a->country eq $countrydefault ) <=> ( $b->country eq $countrydefault )
+     ( $b->country eq $countrydefault ) <=> ( $a->country eq $countrydefault )
   or $a->country                        cmp $b->country
   or $a->state                          cmp $b->state
   or $a->county                         cmp $b->county
-- 
cgit v1.2.1


From 20c1183d2673b62bd0e29eb65f0a9a2c974b8027 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 19:05:27 +0000
Subject: depriciate cust_pay_batch.trancode web interface to view pending
 batch

---
 FS/FS/cust_pay_batch.pm              |  6 ++--
 bin/fs-setup                         |  4 +--
 httemplate/browse/cust_pay_batch.cgi | 68 ++++++++++++++++++++++++++++++++++++
 httemplate/docs/schema.html          |  2 +-
 httemplate/index.html                |  1 +
 5 files changed, 74 insertions(+), 7 deletions(-)
 create mode 100755 httemplate/browse/cust_pay_batch.cgi

diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
index 671cd710a..6acb4fefb 100644
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -37,8 +37,6 @@ following fields are currently supported:
 
 =item paybatchnum - primary key (automatically assigned)
 
-=item trancode - 77 for charges
-
 =item cardnum
 
 =item exp - card expiration 
@@ -120,7 +118,7 @@ sub check {
 
   my $error = 
       $self->ut_numbern('paybatchnum')
-    || $self->ut_numbern('trancode')
+    || $self->ut_numbern('trancode') #depriciated
     || $self->ut_number('cardnum') 
     || $self->ut_money('amount')
     || $self->ut_number('invnum')
@@ -191,7 +189,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_pay_batch.pm,v 1.3 2001-10-02 16:00:30 jeff Exp $
+$Id: cust_pay_batch.pm,v 1.4 2001-10-30 19:05:27 ivan Exp $
 
 =head1 BUGS
 
diff --git a/bin/fs-setup b/bin/fs-setup
index f3889f0dc..4df3773af 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.65 2001-10-24 15:29:30 ivan Exp $
+# $Id: fs-setup,v 1.66 2001-10-30 19:05:27 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -462,7 +462,7 @@ sub tables_hash_hack {
         'state',    'varchar', '',     $char_d,
         'zip',      'varchar', '',     10,
         'country',  'char', '',     2,
-        'trancode', 'int', '', '',
+#        'trancode', 'int', '', '',
         'cardnum',  'varchar', '',     16,
         #'exp',      @date_type,
         'exp',      'varchar', '',     11,
diff --git a/httemplate/browse/cust_pay_batch.cgi b/httemplate/browse/cust_pay_batch.cgi
new file mode 100755
index 000000000..7779bd0c3
--- /dev/null
+++ b/httemplate/browse/cust_pay_batch.cgi
@@ -0,0 +1,68 @@
+<%
+#<!-- $Id: cust_pay_batch.cgi,v 1.1 2001-10-30 19:05:27 ivan Exp $ -->
+
+use strict;
+use vars qw( $cgi $p ); # $part_referral );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use Date::Format;
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch);
+use FS::CGI qw(header menubar popurl table);
+use FS::queue;
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+$p = popurl(2);
+
+print header("Pending credit card batch", menubar(
+  'Main Menu' => $p,
+#  'Add new referral' => "../edit/part_referral.cgi",
+)), &table(), <<END;
+      <TR>
+        <TH>#</TH>
+        <TH><font size=-1>inv#</font></TH>
+        <TH COLSPAN=2>Customer</TH>
+        <TH>Card name</TH>
+        <TH>Card</TH>
+        <TH>Exp</TH>
+        <TH>Amount</TH>
+      </TR>
+END
+
+foreach my $cust_pay_batch ( sort { 
+  $a->getfield('paybatchnum') <=> $b->getfield('paybatchnum')
+} qsearch('cust_pay_batch',{}) ) {
+#  my $date = time2str( "%a %b %e %T %Y", $queue->_date );
+#  my $status = $hashref->{status};
+#  if ( $status eq 'failed' || $status eq 'locked' ) {
+#    $status .=
+#      qq! ( <A HREF="$p/edit/cust_pay_batch.cgi?jobnum=$jobnum&action=new">retry</A> |!.
+#      qq! <A HREF="$p/edit/cust_pay_batch.cgi?jobnum$jobnum&action=del">remove </A> )!;
+#  }
+  my $cardnum = $cust_pay_batch->{cardnum};
+  $cardnum =~ s/.{4}$/xxxx/;
+  print <<END;
+      <TR>
+        <TD>$cust_pay_batch->{paybatchnum}</TD>
+        <TD><A HREF="../view/cust_bill.cgi?$cust_pay_batch->{invnum}">$cust_pay_batch->{invnum}</TD>
+        <TD><A HREF="../view/cust_main.cgi?$cust_pay_batch->{custnum}">$cust_pay_batch->{custnum}</TD>
+        <TD>$cust_pay_batch->{last}, $cust_pay_batch->{last}</TD>
+        <TD>$cust_pay_batch->{payname}</TD>
+        <TD>$cardnum</TD>
+        <TD>$cust_pay_batch->{exp}</TD>
+        <TD align="right">\$$cust_pay_batch->{amount}</TD>
+      </TR>
+END
+
+}
+
+print <<END;
+    </TABLE>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 145d55fc2..a5bf16c37 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -127,7 +127,7 @@
       </ul>
     <li><a name="cust_pay_batch" href="man/FS/cust_pay_batch.html">cust_pay_batch</a> - Pending batch
       <ul>
-        <li>trancode - 77 for charges
+        <li>paybatchnum
         <li>cardnum
         <li>exp - card expiration
         <li>amount
diff --git a/httemplate/index.html b/httemplate/index.html
index 236b72b20..97016e680 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -60,6 +60,7 @@
             </UL>
           <LI><A HREF="browse/nas.cgi">NAS ports</A>
           <LI><A HREF="browse/queue.cgi">Joe queue</A>
+          <LI><A HREF="browse/cust_pay_batch.cgi">Pending credit card batch</A>
         </ul>
     </ul>
     <hr noshade>
-- 
cgit v1.2.1


From 38d9d1a9023f3b52f7c88eb0e9b8ef43e6d54a19 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 31 Oct 2001 16:52:42 +0000
Subject: queue display works again, even if those links don't

---
 httemplate/browse/queue.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index 72643eb47..6b5237240 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: queue.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: queue.cgi,v 1.6 2001-10-31 16:52:42 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p ); # $part_referral );
@@ -33,6 +33,7 @@ foreach my $queue ( sort {
   $a->getfield('jobnum') <=> $b->getfield('jobnum')
 } qsearch('queue',{}) ) {
   my($hashref)=$queue->hashref;
+  my $jobnum = $hashref->{jobnum};
   my $args = join(' ', $queue->args);
   my $date = time2str( "%a %b %e %T %Y", $queue->_date );
   my $status = $hashref->{status};
@@ -43,7 +44,7 @@ foreach my $queue ( sort {
   }
   print <<END;
       <TR>
-        <TD>$hashref->{jobnum}</TD>
+        <TD>$jobnum</TD>
         <TD>$hashref->{job}</TD>
         <TD>$args</TD>
         <TD>$date</TD>
-- 
cgit v1.2.1


From 50c494e839fc0dd73ff986d04c54a8d508f5ede0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 1 Nov 2001 00:16:24 +0000
Subject: hit the database slightly less.  this page still takes forever with
 lots of customers.

---
 httemplate/search/cust_main.cgi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index a11892101..a52321de3 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.12 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.13 2001-11-01 00:16:24 ivan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
@@ -172,9 +172,9 @@ END
       my($pkg) = $_->part_pkg->pkg;
       my $comment = $_->part_pkg->comment;
       my($pkgview) = popurl(2). "/view/cust_pkg.cgi?$pkgnum";
-      #my(@cust_svc) = shift @lol_cust_svc;
-      my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
-      my($rowspan) = scalar(@cust_svc) || 1;
+      my @cust_svc = @{shift @lol_cust_svc};
+      #my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
+      my $rowspan = scalar(@cust_svc) || 1;
 
       print $n1, qq!<TD ROWSPAN=$rowspan><A HREF="$pkgview"><FONT SIZE=-1>$pkg - $comment</FONT></A></TD>!;
       my($n2)='';
-- 
cgit v1.2.1


From da6df9f67f3db20a41ad9244db3f829600f678fd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 2 Nov 2001 04:55:49 +0000
Subject: config web GUI updates.  almost usable now.

---
 FS/FS/Conf.pm                     | 99 ++++++++++++++++++++-------------------
 httemplate/config/config-view.cgi |  2 +-
 httemplate/config/config.cgi      |  2 +-
 3 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 1c75954aa..569eaabb5 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -184,7 +184,7 @@ httemplate/docs/config.html
   {
     'key'         => 'address',
     'section'     => 'depreciated',
-    'description' => 'This configuration file is no longer used.  See <a href="#invoice_template">invoice_template</a> instead.',
+    'description' => 'This configuration option is no longer used.  See <a href="#invoice_template">invoice_template</a> instead.',
     'type'        => 'text',
   },
 
@@ -232,7 +232,7 @@ httemplate/docs/config.html
 
   {
     'key'         => 'bsdshellmachines',
-    'section'     => '',
+    'section'     => 'shell',
     'description' => 'Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd\' and `/etc/master.passwd\'.',
     'type'        => 'textarea',
   },
@@ -253,7 +253,7 @@ httemplate/docs/config.html
 
   {
     'key'         => 'cyrus',
-    'section'     => '',
+    'section'     => 'mail',
     'description' => 'Integration with <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a>, three lines: IMAP server, admin username, and admin password.  Cyrus::IMAP::Admin should be installed locally and the connection to the server secured.',
     'type'        => 'textarea',
   },
@@ -261,7 +261,7 @@ httemplate/docs/config.html
   {
     'key'         => 'deletecustomers',
     'section'     => 'UI',
-    'description' => 'The existance of this file will enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that this customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers\' packages if they cancel service.',
+    'description' => 'Enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that this customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers\' packages if they cancel service.',
     'type'        => 'checkbox',
   },
 
@@ -275,7 +275,7 @@ httemplate/docs/config.html
   {
     'key'         => 'disable_customer_referrals',
     'section'     => 'UI',
-    'description' => 'The existance of this file will disable new customer-to-customer referrals in the web interface.',
+    'description' => 'Disable new customer-to-customer referrals in the web interface',
     'type'        => 'checkbox',
   },
 
@@ -289,42 +289,42 @@ httemplate/docs/config.html
   {
     'key'         => 'editreferrals',
     'section'     => 'UI',
-    'description' => 'The existance of this file will allow you to change the referral of existing customers.',
+    'description' => 'Enable referral modification for existing customers',
     'type'       => 'checkbox',
   },
 
   {
     'key'         => 'emailinvoiceonly',
     'section'     => 'billing',
-    'description' => 'Disables postal mail invoices.',
+    'description' => 'Disables postal mail invoices',
     'type'       => 'checkbox',
   },
 
   {
     'key'         => 'emailinvoiceauto',
     'section'     => 'billing',
-    'description' => 'Automatically adds new accounts to the email invoice list upon customer creation.',
+    'description' => 'Automatically adds new accounts to the email invoice list upon customer creation',
     'type'       => 'checkbox',
   },
 
   {
     'key'         => 'erpcdmachines',
     'section'     => '',
-    'description' => 'Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd\' and `/usr/annex/acp_dialup\'.',
+    'description' => 'Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd\' and `/usr/annex/acp_dialup\'',
     'type'        => 'textarea',
   },
 
   {
     'key'         => 'hidecancelledpackages',
     'section'     => 'UI',
-    'description' => 'The existance of this file will prevent cancelled packages from showing up in listings (though they will still be in the database)',
+    'description' => 'Prevent cancelled packages from showing up in listings (though they will still be in the database)',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'hidecancelledcustomers',
     'section'     => 'UI',
-    'description' => 'The existance of this file will prevent customers with only cancelled packages from showing up in listings (though they will still be in the database)',
+    'description' => 'Prevent customers with only cancelled packages from showing up in listings (though they will still be in the database)',
     'type'        => 'checkbox',
   },
 
@@ -337,36 +337,36 @@ httemplate/docs/config.html
 
   {
     'key'         => 'icradiusmachines',
-    'section'     => '',
-    'description' => 'Your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines, one per line.  The existance of this file (even if empty) turns on radcheck table creation (in the freeside database - the radcheck table needs to be created manually).  Machines listed in this file will have the radcheck table exported to them.  Each line of this file should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: "<CODE>radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd</CODE>".  You do not need to use MySQL for your Freeside database to export to an ICRADIUS mysql database with this option.',
+    'section'     => 'radius',
+    'description' => 'Your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines or <a href="http://www.freeradius.org/">FreeRADIUS</a> (with MySQL authentication) machines, one per line.  Turning this option on (even if empty) turns on radcheck table population (in the freeside database - the radcheck table needs to be created manually).  Machines listed in this file will have the radcheck table exported to them.  Each line should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: "<CODE>radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd</CODE>".  You do not need to use MySQL for your Freeside database to export to an ICRADIUS/FreeRADIUS mysql database with this option.',
     'type'        => [qw( checkbox textarea )],
   },
 
   {
     'key'         => 'icradius_mysqldest',
-    'section'     => '',
-    'description' => 'Destination directory for the MySQL databases, on the ICRADIUS machines.  Defaults to "/usr/local/var/".',
+    'section'     => 'radius',
+    'description' => 'Destination directory for the MySQL databases, on the ICRADIUS/FreeRADIUS machines.  Defaults to "/usr/local/var/".',
     'type'        => 'text',
   },
 
   {
     'key'         => 'icradius_mysqlsource',
-    'section'     => '',
+    'section'     => 'radius',
     'description' => 'Source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".',
     'type'        => 'text',
   },
 
   {
     'key'         => 'icradius_secrets',
-    'section'     => '',
-    'description' => 'Optionally specifies a MySQL database for ICRADIUS export, if you\'re not running MySQL for your Freeside database.  The database should be on the Freeside machine and store data in the <a href="#icradius_mysqlsource">icradius_mysqlsource</a> directory.  Three lines: DBI data source, username and password.  This file should not be world readable.',
+    'section'     => 'radius',
+    'description' => 'Optionally specifies a MySQL database for ICRADIUS/FreeRADIUS export, if you\'re not running MySQL for your Freeside database.  The database should be on the Freeside machine and store data in the <a href="#icradius_mysqlsource">icradius_mysqlsource</a> directory.  Three lines: DBI data source, username and password.',
     'type'        => 'textarea',
   },
 
   {
     'key'         => 'invoice_from',
     'section'     => 'required',
-    'description' => 'Return address on email invoices.',
+    'description' => 'Return address on email invoices',
     'type'        => 'text',
   },
 
@@ -380,21 +380,21 @@ httemplate/docs/config.html
   {
     'key'         => 'lpr',
     'section'     => 'required',
-    'description' => 'Print command for paper invoices, for example `lpr -h\'.',
+    'description' => 'Print command for paper invoices, for example `lpr -h\'',
     'type'        => 'text',
   },
 
   {
     'key'         => 'maildisablecatchall',
     'section'     => 'depreciated',
-    'description' => '<b>DEPRECIATED</b>, now the default.  The existance of this file used to disable the requirement that each virtual domain have a catch-all mailbox.',
+    'description' => '<b>DEPRECIATED</b>, now the default.  Turning this option on used to disable the requirement that each virtual domain have a catch-all mailbox.',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'money_char',
     'section'     => '',
-    'description' => 'Currency symbol - defaults to `$\'.',
+    'description' => 'Currency symbol - defaults to `$\'',
     'type'        => 'text',
   },
 
@@ -414,7 +414,7 @@ httemplate/docs/config.html
 
   {
     'key'         => 'nismachines',
-    'section'     => '',
+    'section'     => 'shell',
     'description' => 'Your NIS master (not slave master) machines, one per line.  This enables export of `/etc/global/passwd\' and `/etc/global/shadow\'.',
     'type'        => 'textarea',
   },
@@ -435,14 +435,14 @@ httemplate/docs/config.html
 
   {
     'key'         => 'qmailmachines',
-    'section'     => '',
-    'description' => 'Your qmail machines, one per line.  This enables export of `/var/qmail/control/virtualdomains\', `/var/qmail/control/recipientmap\', and `/var/qmail/control/rcpthosts\'.  The existance of this file (even if empty) also turns on user `.qmail-extension\' file maintenance in conjunction with `shellmachine\'.',
+    'section'     => 'mail',
+    'description' => 'Your qmail machines, one per line.  This enables export of `/var/qmail/control/virtualdomains\', `/var/qmail/control/recipientmap\', and `/var/qmail/control/rcpthosts\'.  Setting this option (even if empty) also turns on user `.qmail-extension\' file maintenance in conjunction with the <b>shellmachine</b> option.',
     'type'        => [qw( checkbox textarea )],
   },
 
   {
     'key'         => 'radiusmachines',
-    'section'     => '',
+    'section'     => 'radius',
     'description' => 'Your RADIUS authentication machines, one per line.  This enables export of `/etc/raddb/users\'.',
     'type'        => 'textarea',
   },
@@ -450,7 +450,7 @@ httemplate/docs/config.html
   {
     'key'         => 'referraldefault',
     'section'     => 'UI',
-    'description' => 'Default referral, specified by refnum.',
+    'description' => 'Default referral, specified by refnum',
     'type'        => 'text',
   },
 
@@ -462,21 +462,21 @@ httemplate/docs/config.html
 
   {
     'key'         => 'sendmailconfigpath',
-    'section'     => '',
-    'description' => 'Sendmail configuration file path - defaults to `/etc\'.  Many newer distributions use `/etc/mail\'.',
+    'section'     => 'mail',
+    'description' => 'Sendmail configuration file path.  Defaults to `/etc\'.  Many newer distributions use `/etc/mail\'.',
     'type'        => 'text',
   },
 
   {
     'key'         => 'sendmailmachines',
-    'section'     => '',
+    'section'     => 'mail',
     'description' => 'Your sendmail machines, one per line.  This enables export of `/etc/virtusertable\' and `/etc/sendmail.cw\'.',
     'type'        => 'textarea',
   },
 
   {
     'key'         => 'sendmailrestart',
-    'section'     => '',
+    'section'     => 'mail',
     'description' => 'If defined, the command which is run on sendmail machines after files are copied.',
     'type'        => 'text',
   },
@@ -505,22 +505,23 @@ httemplate/docs/config.html
   {
     'key'         => 'shellmachine-useradd',
     'section'     => 'shell',
-    'description' => 'The command(s) to run on shellmachine when an account is created.  If this file does not exist, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If the file exists but is empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.',
+    'description' => 'The command(s) to run on shellmachine when an account is created.  If the <b>shellmachine</b> option is set but this option is not, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If this option is set but empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.',
     'type'        => [qw( checkbox text )],
   },
 
   {
     'key'         => 'shellmachine-userdel',
     'section'     => 'shell',
-    'description' => 'The command(s) to run on shellmachine when an account is deleted.  If this file does not exist, <code>userdel $username</code> is the default.  If the file exists but is empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.',
+    'description' => 'The command(s) to run on shellmachine when an account is deleted.  If the <b>shellmachine</b> option is set but this option is not, <code>userdel $username</code> is the default.  If this option is set but empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.',
     'type'        => [qw( checkbox text )],
   },
 
   {
     'key'         => 'shellmachine-usermod',
     'section'     => 'shell',
-    'description' => 'The command(s) to run on shellmachine when an account is modified.  If this file does not exist or is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.',
-    'type'        => [qw( checkbox text )],
+    'description' => 'The command(s) to run on shellmachine when an account is modified.  If the <b>shellmachine</b> option is set but this option is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.',
+    #'type'        => [qw( checkbox text )],
+    'type'        => 'text',
   },
 
   {
@@ -540,21 +541,21 @@ httemplate/docs/config.html
   {
     'key'         => 'showpasswords',
     'section'     => 'UI',
-    'description' => 'The existance of this file will allow unencrypted user passwords to be displayed.',
+    'description' => 'Display unencrypted user passwords in the web interface',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'signupurl',
     'section'     => 'UI',
-    'description' => 'if you are using customer-to-customer referrals, and you enter the URL of your <a href="signup.html">signup server CGI</a>, the customer view screen will display a customized link to the signup server with the appropriate customer as referral.',
+    'description' => 'if you are using customer-to-customer referrals, and you enter the URL of your <a href="../docs/signup.html">signup server CGI</a>, the customer view screen will display a customized link to the signup server with the appropriate customer as referral',
     'type'        => 'text',
   },
 
   {
     'key'         => 'smtpmachine',
     'section'     => 'required',
-    'description' => 'SMTP relay for Freeside\'s outgoing mail.',
+    'description' => 'SMTP relay for Freeside\'s outgoing mail',
     'type'        => 'text',
   },
 
@@ -610,63 +611,63 @@ httemplate/docs/config.html
   {
     'key'         => 'textradiusprepend',
     'section'     => 'depreciated',
-    'description' => '<b>DEPRECIATED</b>, use RADIUS check attributes instead.  This option will be removed soon.  The contents of this file will be prepended to the first line of a user\'s RADIUS entry in text exports.',
+    'description' => '<b>DEPRECIATED</b>, use RADIUS check attributes instead.  This option will be removed soon.  The contents will be prepended to the first line of a user\'s RADIUS entry in text exports.',
     'type'        => 'text',
   },
 
   {
     'key'         => 'unsuspendauto',
     'section'     => 'billing',
-    'description' => 'The existance of this file will enable the automatic unsuspension of suspended packages when a customer\'s balance due changes from positive to zero or negative as the result of a payment or credit.',
+    'description' => 'Enables the automatic unsuspension of suspended packages when a customer\'s balance due changes from positive to zero or negative as the result of a payment or credit',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'usernamemin',
     'section'     => 'username',
-    'description' => 'Minimum username length (default 2);',
+    'description' => 'Minimum username length (default 2)',
     'type'        => 'text',
   },
 
   {
     'key'         => 'usernamemax',
     'section'     => 'username',
-    'description' => 'Maximum username length (default is the size of the SQL column, probably specified when fs-setup was run)',
+    'description' => 'Maximum username length',
     'type'        => 'text',
   },
 
   {
     'key'         => 'username-ampersand',
     'section'     => 'username',
-    'description' => 'The existance of this file will allow the ampersand character (&amp;) in usernames.  Be careful when using this option in conjunction with <a href="#shellmachine-useradd">shellmachine-useradd</a> and other configuration options which execute shell commands, as the ampersand will be interpreted by the shell if not quoted.',
+    'description' => 'Allow the ampersand character (&amp;) in usernames.  Be careful when using this option in conjunction with <a href="#shellmachine-useradd">shellmachine-useradd</a> and other configuration options which execute shell commands, as the ampersand will be interpreted by the shell if not quoted.',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'username-letter',
     'section'     => 'username',
-    'description' => 'The existance of this file will turn on the requirement that usernames contain at least one letter.',
+    'description' => 'Usernames must contain at least one letter',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'username-letterfirst',
     'section'     => 'username',
-    'description' => 'The existance of this file will turn on the requirement that usernames start with a letter.',
+    'description' => 'Usernames must start with a letter',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'username-noperiod',
     'section'     => 'username',
-    'description' => 'The existance of this file will disallow periods in usernames.',
+    'description' => 'Disallow periods in usernames',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'username-uppercase',
     'section'     => 'username',
-    'description' => 'The existance of this file will allow uppercase characters in username.',
+    'description' => 'Allow uppercase characters in usernames',
     'type'        => 'checkbox',
   },
 
@@ -675,12 +676,12 @@ httemplate/docs/config.html
     'section'     => '',
     'description' => 'This file controls the mechanism for preventing duplicate usernames in passwd/radius files exported from svc_accts.  This should be one of \'prepend domsvc\' \'append domsvc\' or \'append domain\'',
 #    'type'        => 'select',
-    'type'        => '',
+    'type'        => 'text',
   },
 
   {
     'key'         => 'vpopmailmachines',
-    'section'     => '',
+    'section'     => 'mail',
     'description' => 'Your vpopmail pop toasters, one per line.  Each line is of the form "machinename vpopdir vpopuid vpopgid".  For example: <code>poptoaster.domain.tld /home/vpopmail 508 508</code>  Note: vpopuid and vpopgid are values taken from the vpopmail machine\'s /etc/passwd',
     'type'        => 'textarea',
   },
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 3c16c4815..4b6684980 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -4,7 +4,7 @@
 <% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
 
 <% foreach my $section ( qw(required billing username password UI session
-                            apache BIND shell
+                            shell mail radius apache BIND
                            ),
                          '', 'depreciated') { %>
   <%= table("#cccccc", 2) %>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 32ddc043d..972ec06a4 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -5,7 +5,7 @@
 <form action="config-process.cgi">
 
 <% foreach my $section ( qw(required billing username password UI session
-                            apache BIND shell
+                            shell mail radius apache BIND
                            ),
                          '', 'depreciated') { %>
   <%= table("#cccccc", 2) %>
-- 
cgit v1.2.1


From 7b91bff5d59610bd53a8708fddc88ae279f6e662 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 2 Nov 2001 05:11:52 +0000
Subject: depend on DBIx::DBSchema 0.19

---
 FS/FS/Record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index a15aaba36..ec326458d 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -7,7 +7,7 @@ use Exporter;
 use Carp qw(carp cluck croak confess);
 use File::CounterFile;
 use Locale::Country;
-use DBIx::DBSchema;
+use DBIx::DBSchema 0.19;
 use FS::UID qw(dbh checkruid getotaker datasrc driver_name);
 
 @ISA = qw(Exporter);
@@ -994,7 +994,7 @@ sub DESTROY { return; }
 
 =head1 VERSION
 
-$Id: Record.pm,v 1.30 2001-10-10 05:24:25 ivan Exp $
+$Id: Record.pm,v 1.31 2001-11-02 05:11:52 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 762cb807561ae9805a3eac0616442012eced93b0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 2 Nov 2001 05:28:33 +0000
Subject: note config changes need apache/freeside-queued restart to take
 effect

---
 httemplate/config/config.cgi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 972ec06a4..f9d7297ec 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -42,6 +42,9 @@
   </table><br><br>
 <% } %>
 
+You may need to restart Apache and/or freeside-queued for configuration
+changes to take effect.<BR>
+
 <input type="submit" value="Apply changes">
 </form>
 
-- 
cgit v1.2.1


From 3802a0ac7cbbae87a45014b0968f0a4186876d52 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 2 Nov 2001 08:14:14 +0000
Subject: silence pod complaints

---
 FS/bin/freeside-print-batch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/bin/freeside-print-batch b/FS/bin/freeside-print-batch
index baef43787..da4ecf464 100755
--- a/FS/bin/freeside-print-batch
+++ b/FS/bin/freeside-print-batch
@@ -229,7 +229,7 @@ B<-p>: Print to printer lpr as found in the conf directory.
 
 B<-e>: Email output to user found in the Conf email file.
 
-B<-a>: Automatically pays all records in cust_pay_batch. Use -d with this option usually.
+B<-a>: Automatically pays all records in cust_pay_batch.  Usually used with the B<-d> option.
 
 B<-d>:	Delete - Pays account and deletes record from cust_pay_batch.
 
@@ -237,7 +237,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-print-batch,v 1.3 2001-08-21 02:44:47 ivan Exp $
+$Id: freeside-print-batch,v 1.4 2001-11-02 08:14:14 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From fd72d2af8120195f96826eb044e217dbfcaee1c7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 3 Nov 2001 17:49:52 +0000
Subject: new 'jsearch' call for big joined searches & caching support
 preliminary customer browse optimizations, much faster!

---
 FS/FS/Record.pm                 | 100 ++++++++++++++++++++++++++++++++--------
 FS/FS/SearchCache.pm            |  96 ++++++++++++++++++++++++++++++++++++++
 FS/FS/cust_main.pm              |  44 +++++++++++++-----
 FS/FS/cust_pkg.pm               |  46 ++++++++++++++++--
 FS/FS/cust_svc.pm               |  42 ++++++++++++++---
 FS/FS/svc_acct.pm               |  31 ++++++++++++-
 FS/MANIFEST                     |   1 +
 FS/t/SearchCache.t              |   5 ++
 httemplate/search/cust_main.cgi |  74 +++++++++++++++++++++++------
 9 files changed, 383 insertions(+), 56 deletions(-)
 create mode 100644 FS/FS/SearchCache.pm
 create mode 100644 FS/t/SearchCache.t

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index ec326458d..3c8e9bac6 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -9,9 +9,10 @@ use File::CounterFile;
 use Locale::Country;
 use DBIx::DBSchema 0.19;
 use FS::UID qw(dbh checkruid getotaker datasrc driver_name);
+use FS::SearchCache;
 
 @ISA = qw(Exporter);
-@EXPORT_OK = qw(dbh fields hfields qsearch qsearchs dbdef);
+@EXPORT_OK = qw(dbh fields hfields qsearch qsearchs dbdef jsearch);
 
 $DEBUG = 0;
 
@@ -135,9 +136,31 @@ sub new {
     }
   }
 
+  $self->_cache($hashref, shift) if $self->can('_cache') && @_;
+
   $self;
 }
 
+sub new_or_cached {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = {};
+  bless ($self, $class);
+
+  $self->{'Table'} = shift unless defined ( $self->table );
+
+  my $hashref = $self->{'Hash'} = shift;
+  my $cache = shift;
+  if ( defined( $cache->cache->{$hashref->{$cache->key}} ) ) {
+    my $obj = $cache->cache->{$hashref->{$cache->key}};
+    $obj->_cache($hashref, $cache) if $obj->can('_cache');
+    $obj;
+  } else {
+    $cache->cache->{$hashref->{$cache->key}} = $self->new($hashref, $cache);
+  }
+
+}
+
 sub create {
   my $proto = shift;
   my $class = ref($proto) || $proto;
@@ -170,15 +193,19 @@ objects.
 =cut
 
 sub qsearch {
-  my($table, $record, $select, $extra_sql ) = @_;
-  $table =~ /^([\w\_]+)$/ or die "Illegal table: $table";
-  $table = $1;
+  my($stable, $record, $select, $extra_sql, $cache ) = @_;
+  #$stable =~ /^([\w\_]+)$/ or die "Illegal table: $table";
+  #for jsearch
+  $stable =~ /^([\w\s\(\)\.\,\=]+)$/ or die "Illegal table: $stable";
+  $stable = $1;
   $select ||= '*';
   my $dbh = dbh;
 
+  my $table = $cache ? $cache->table : $stable;
+
   my @fields = grep exists($record->{$_}), fields($table);
 
-  my $statement = "SELECT $select FROM $table";
+  my $statement = "SELECT $select FROM $stable";
   if ( @fields ) {
     $statement .= ' WHERE '. join(' AND ', map {
       if ( ! defined( $record->{$_} ) || $record->{$_} eq '' ) {
@@ -206,9 +233,15 @@ sub qsearch {
   if ( eval 'scalar(@FS::'. $table. '::ISA);' ) {
     if ( eval 'FS::'. $table. '->can(\'new\')' eq \&new ) {
       #derivied class didn't override new method, so this optimization is safe
-      map {
-        new( "FS::$table", { %{$_} } )
-      } @{$sth->fetchall_arrayref( {} )};
+      if ( $cache ) {
+        map {
+          new_or_cached( "FS::$table", { %{$_} }, $cache )
+        } @{$sth->fetchall_arrayref( {} )};
+      } else {
+        map {
+          new( "FS::$table", { %{$_} } )
+        } @{$sth->fetchall_arrayref( {} )};
+      }
     } else {
       warn "untested code (class FS::$table uses custom new method)";
       map {
@@ -224,6 +257,25 @@ sub qsearch {
 
 }
 
+=item jsearch
+
+Experimental JOINed search method.  Using this method, you can execute a
+single SELECT spanning multiple tables, and cache the results for subsequent
+method calls.  Interface will almost definately change in an incompatible
+fashion.
+
+=cut
+
+sub jsearch {
+  my($table, $record, $select, $extra_sql, $ptable, $pkey ) = @_;
+  my $cache = FS::SearchCache->new( $ptable, $pkey );
+  my %saw;
+  ( $cache,
+    grep { !$saw{$_->getfield($pkey)}++ }
+      qsearch($table, $record, $select, $extra_sql, $cache )
+  );
+}
+
 =item qsearchs TABLE, HASHREF
 
 Same as qsearch, except that if more than one record matches, it B<carp>s but
@@ -312,16 +364,30 @@ $record->column('value') is a synonym for $record->set('column','value');
 
 =cut
 
+# readable/safe
+#sub AUTOLOAD {
+#  my($self,$value)=@_;
+#  my($field)=$AUTOLOAD;
+#  $field =~ s/.*://;
+#  if ( defined($value) ) {
+#    confess "errant AUTOLOAD $field for $self (arg $value)"
+#      unless $self->can('setfield');
+#    $self->setfield($field,$value);
+#  } else {
+#    confess "errant AUTOLOAD $field for $self (no args)"
+#      unless $self->can('getfield');
+#    $self->getfield($field);
+#  }    
+#}
+
+# efficient
 sub AUTOLOAD {
-  my($self,$value)=@_;
-  my($field)=$AUTOLOAD;
+  my $field = $AUTOLOAD;
   $field =~ s/.*://;
-  if ( defined($value) ) {
-    confess "errant AUTOLOAD $field for $self (arg $value)"
-      unless $self->can('setfield');
-    $self->setfield($field,$value);
+  if ( scalar(@_) == 2 ) {
+    $_[0]->setfield($field, $_[1]);
   } else {
-    $self->getfield($field);
+    $_[0]->getfield($field);
   }    
 }
 
@@ -992,10 +1058,6 @@ sub DESTROY { return; }
 
 =back
 
-=head1 VERSION
-
-$Id: Record.pm,v 1.31 2001-11-02 05:11:52 ivan Exp $
-
 =head1 BUGS
 
 This module should probably be renamed, since much of the functionality is
diff --git a/FS/FS/SearchCache.pm b/FS/FS/SearchCache.pm
new file mode 100644
index 000000000..4218acfb6
--- /dev/null
+++ b/FS/FS/SearchCache.pm
@@ -0,0 +1,96 @@
+package FS::SearchCache;
+
+use strict;
+use vars qw($DEBUG);
+#use Carp qw(carp cluck croak confess);
+
+$DEBUG = 0;
+
+=head1 NAME
+
+FS::SearchCache - cache
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=over 4
+
+=item new
+
+=cut
+
+sub new { 
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my( $table, $key ) = @_;
+  warn "table $table\n" if $DEBUG > 1;
+  warn "key $key\n" if $DEBUG > 1;
+  my $self = { 'table' => $table,
+               'key'   => $key,
+               'cache' => {},
+               'subcache' => {},
+             };
+  bless ($self, $class);
+
+  $self;
+}
+
+=item table
+
+=cut
+
+sub table { my $self = shift; $self->{table}; }
+
+=item key
+
+=cut
+
+sub key { my $self = shift; $self->{key}; }
+
+=item cache
+
+=cut
+
+sub cache { my $self = shift; $self->{cache}; }
+
+=item subcache
+
+=cut
+
+sub subcache {
+  my $self = shift;
+  my $col = shift;
+  my $table = shift;
+  my $keyval = shift;
+  if ( exists $self->{subcache}->{$col}->{$keyval} ) {
+    warn "returning existing subcache for $keyval ($col)".
+         "$self->{subcache}->{$col}->{$keyval}\n" if $DEBUG;
+    return $self->{subcache}->{$col}->{$keyval};
+  } else {
+    #my $tablekey = @_ ? shift : $col;
+    my $tablekey = $col;
+    my $subcache = ref($self)->new( $table, $tablekey );
+    $self->{subcache}->{$col}->{$keyval} = $subcache;
+    warn "creating new subcache $table $tablekey: $subcache\n" if $DEBUG;
+    $subcache;
+  }
+}
+
+=back
+
+=head1 BUGS
+
+Dismal documentation.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::cust_main>
+
+=cut
+
+1;
+
+
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index dfb712502..4c4fe8702 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -75,6 +75,18 @@ $FS::UID::callback{'FS::cust_main'} = sub {
   }
 };
 
+sub _cache {
+  my $self = shift;
+  my ( $hashref, $cache ) = @_;
+  if ( exists $hashref->{'pkgnum'} ) {
+#    #@{ $self->{'_pkgnum'} } = ();
+    my $subcache = $cache->subcache( 'pkgnum', 'cust_pkg', $hashref->{custnum});
+    $self->{'_pkgnum'} = $subcache;
+    #push @{ $self->{'_pkgnum'} },
+    FS::cust_pkg->new_or_cached($hashref, $subcache) if $hashref->{pkgnum};
+  }
+}
+
 =head1 NAME
 
 FS::cust_main - Object methods for cust_main records
@@ -701,7 +713,11 @@ Returns all packages (see L<FS::cust_pkg>) for this customer.
 
 sub all_pkgs {
   my $self = shift;
-  qsearch( 'cust_pkg', { 'custnum' => $self->custnum });
+  if ( $self->{'_pkgnum'} ) {
+    values %{ $self->{'_pkgnum'}->cache };
+  } else {
+    qsearch( 'cust_pkg', { 'custnum' => $self->custnum });
+  }
 }
 
 =item ncancelled_pkgs
@@ -712,16 +728,20 @@ Returns all non-cancelled packages (see L<FS::cust_pkg>) for this customer.
 
 sub ncancelled_pkgs {
   my $self = shift;
-  @{ [ # force list context
-    qsearch( 'cust_pkg', {
-      'custnum' => $self->custnum,
-      'cancel'  => '',
-    }),
-    qsearch( 'cust_pkg', {
-      'custnum' => $self->custnum,
-      'cancel'  => 0,
-    }),
-  ] };
+  if ( $self->{'_pkgnum'} ) {
+    grep { ! $_->getfield('cancel') } values %{ $self->{'_pkgnum'}->cache };
+  } else {
+    @{ [ # force list context
+      qsearch( 'cust_pkg', {
+        'custnum' => $self->custnum,
+        'cancel'  => '',
+      }),
+      qsearch( 'cust_pkg', {
+        'custnum' => $self->custnum,
+        'cancel'  => 0,
+      }),
+    ] };
+  }
 }
 
 =item suspended_pkgs
@@ -1855,7 +1875,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.44 2001-10-22 08:31:25 ivan Exp $
+$Id: cust_main.pm,v 1.45 2001-11-03 17:49:52 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 7aee8d027..19e1da356 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -20,6 +20,27 @@ use FS::svc_www;
 
 @ISA = qw( FS::Record );
 
+sub _cache {
+  my $self = shift;
+  my ( $hashref, $cache ) = @_;
+  #if ( $hashref->{'pkgpart'} ) {
+  if ( $hashref->{'pkg'} ) {
+    # #@{ $self->{'_pkgnum'} } = ();
+    # my $subcache = $cache->subcache('pkgpart', 'part_pkg');
+    # $self->{'_pkgpart'} = $subcache;
+    # #push @{ $self->{'_pkgnum'} },
+    #   FS::part_pkg->new_or_cached($hashref, $subcache);
+    $self->{'_pkgpart'} = FS::part_pkg->new($hashref);
+  }
+  if ( exists $hashref->{'svcnum'} ) {
+    #@{ $self->{'_pkgnum'} } = ();
+    my $subcache = $cache->subcache('svcnum', 'cust_svc', $hashref->{pkgnum});
+    $self->{'_svcnum'} = $subcache;
+    #push @{ $self->{'_pkgnum'} },
+    FS::cust_svc->new_or_cached($hashref, $subcache) if $hashref->{svcnum};
+  }
+}
+
 =head1 NAME
 
 FS::cust_pkg - Object methods for cust_pkg objects
@@ -420,7 +441,26 @@ L<FS::part_pkg>).
 
 sub part_pkg {
   my $self = shift;
-  qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
+  #exists( $self->{'_pkgpart'} )
+  $self->{'_pkgpart'}
+    ? $self->{'_pkgpart'}
+    : qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
+}
+
+=item cust_svc
+
+Returns the services for this package, as FS::cust_svc objects (see
+L<FS::cust_svc>)
+
+=cut
+
+sub cust_svc {
+  my $self = shift;
+  if ( $self->{'_svcnum'} ) {
+    values %{ $self->{'_svcnum'}->cache };
+  } else {
+    qsearch ( 'cust_svc', { 'pkgnum' => $self->pkgnum } );
+  }
 }
 
 =item labels
@@ -432,7 +472,7 @@ Returns a list of lists, calling the label method for all services
 
 sub labels {
   my $self = shift;
-  map { [ $_->label ] } qsearch ( 'cust_svc', { 'pkgnum' => $self->pkgnum } );
+  map { [ $_->label ] } $self->cust_svc;
 }
 
 =item cust_main
@@ -589,7 +629,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.12 2001-10-22 08:29:42 ivan Exp $
+$Id: cust_pkg.pm,v 1.13 2001-11-03 17:49:52 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index daec79fe8..c398e5ecd 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -14,6 +14,17 @@ use FS::svc_forward;
 
 @ISA = qw( FS::Record );
 
+sub _cache {
+  my $self = shift;
+  my ( $hashref, $cache ) = @_;
+  if ( $hashref->{'username'} ) {
+    $self->{'_svc_acct'} = FS::svc_acct->new($hashref, '');
+  }
+  if ( $hashref->{'svc'} ) {
+    $self->{'_svcpart'} = FS::part_svc->new($hashref);
+  }
+}
+
 =head1 NAME
 
 FS::cust_svc - Object method for cust_svc objects
@@ -109,6 +120,20 @@ sub check {
   ''; #no error
 }
 
+=item part_svc
+
+Returns the definition for this service, as a FS::part_svc object (see
+L<FS::part_svc>).
+
+=cut
+
+sub part_svc {
+  my $self = shift;
+  $self->{'_svcpart'}
+    ? $self->{'_svcpart'}
+    : qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
+}
+
 =item label
 
 Returns a list consisting of:
@@ -120,11 +145,14 @@ Returns a list consisting of:
 
 sub label {
   my $self = shift;
-  my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
-  my $svcdb = $part_svc->svcdb;
-  my $svc_x = qsearchs( $svcdb, { 'svcnum' => $self->svcnum } )
-    or die "can't find $svcdb.svcnum ". $self->svcnum;
-  my $svc = $part_svc->svc;
+  my $svcdb = $self->part_svc->svcdb;
+  my $svc_x;
+  if ( $svcdb eq 'svc_acct' && $self->{'_svc_acct'} ) {
+    $svc_x = $self->{'_svc_acct'};
+  } else {
+    $svc_x = qsearchs( $svcdb, { 'svcnum' => $self->svcnum } )
+      or die "can't find $svcdb.svcnum ". $self->svcnum;
+  }
   my $tag;
   if ( $svcdb eq 'svc_acct' ) {
     $tag = $svc_x->email;
@@ -148,14 +176,14 @@ sub label {
     cluck "warning: asked for label of unsupported svcdb; using svcnum";
     $tag = $svc_x->getfield('svcnum');
   }
-  $svc, $tag, $svcdb;
+  $self->part_svc->svc, $tag, $svcdb;
 }
 
 =back
 
 =head1 VERSION
 
-$Id: cust_svc.pm,v 1.5 2001-09-03 22:07:38 ivan Exp $
+$Id: cust_svc.pm,v 1.6 2001-11-03 17:49:52 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 3e7230f49..219d8d404 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -85,6 +85,18 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
 
 #not needed in 5.004 #srand($$|time);
 
+sub _cache {
+  my $self = shift;
+  my ( $hashref, $cache ) = @_;
+  if ( $hashref->{'svc_acct_svcnum'} ) {
+    $self->{'_domsvc'} = FS::svc_domain->new( {
+      'svcnum'   => $hashref->{'domsvc'},
+      'domain'   => $hashref->{'svc_acct_domain'},
+      'catchall' => $hashref->{'svc_acct_catchall'},
+    } );
+  }
+}
+
 =head1 NAME
 
 FS::svc_acct - Object methods for svc_acct records
@@ -880,7 +892,8 @@ Returns the domain associated with this account.
 sub domain {
   my $self = shift;
   if ( $self->domsvc ) {
-    my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } )
+    #$self->svc_domain->domain;
+    my $svc_domain = $self->svc_domain
       or die "no svc_domain.svcnum for svc_acct.domsvc ". $self->domsvc;
     $svc_domain->domain;
   } else {
@@ -888,6 +901,20 @@ sub domain {
   }
 }
 
+=item svc_domain
+
+Returns the FS::svc_domain record for this account's domain (see
+L<FS::svc_domain).
+
+=cut
+
+sub svc_domain {
+  my $self = shift;
+  $self->{'_domsvc'}
+    ? $self->{'_domsvc'}
+    : qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } );
+}
+
 =item email
 
 Returns an email address associated with the account.
@@ -931,7 +958,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.52 2001-10-24 15:29:30 ivan Exp $
+$Id: svc_acct.pm,v 1.53 2001-11-03 17:49:52 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 4254514a2..c83fad5c9 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -14,6 +14,7 @@ FS/CGI.pm
 FS/Conf.pm
 FS/ConfItem.pm
 FS/Record.pm
+FS/SearchCache.pm
 FS/UI/Base.pm
 FS/UI/CGI.pm
 FS/UI/Gtk.pm
diff --git a/FS/t/SearchCache.t b/FS/t/SearchCache.t
new file mode 100644
index 000000000..3c26f3528
--- /dev/null
+++ b/FS/t/SearchCache.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::SearchCache;
+$loaded=1;
+print "ok 1\n";
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index a52321de3..db33df784 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.13 2001-11-01 00:16:24 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.14 2001-11-03 17:49:52 ivan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
@@ -9,7 +9,7 @@ use CGI::Carp qw(fatalsToBrowser);
 use IO::Handle;
 use String::Approx qw(amatch);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs dbdef);
+use FS::Record qw(qsearch qsearchs dbdef jsearch);
 use FS::CGI qw(header menubar eidiot popurl table);
 use FS::cust_main;
 use FS::cust_svc;
@@ -19,17 +19,59 @@ cgisuidsetup($cgi);
 
 $conf = new FS::Conf;
 
+my $cache;
+
+#my $monsterjoin = <<END;
+#cust_main left outer join (
+#  ( cust_pkg left outer join part_pkg using(pkgpart)
+#  ) left outer join (
+#    (
+#      (
+#        ( cust_svc left outer join part_svc using (svcpart)
+#        ) left outer join svc_acct using (svcnum)
+#      ) left outer join svc_domain using(svcnum)
+#    ) left outer join svc_forward using(svcnum)
+#  ) using (pkgnum)
+#) using (custnum)
+#END
+
+my $monsterjoin = <<END;
+cust_main left outer join (
+  ( cust_pkg left outer join part_pkg using(pkgpart)
+  ) left outer join (
+    (
+      (
+        ( cust_svc left outer join part_svc using (svcpart)
+        ) left outer join (
+          svc_acct left outer join (
+            select svcnum, domain, catchall from svc_domain
+            ) as svc_acct_domsvc (
+              svc_acct_svcnum, svc_acct_domain, svc_acct_catchall
+          ) on svc_acct.domsvc = svc_acct_domsvc.svc_acct_svcnum
+        ) using (svcnum)
+      ) left outer join svc_domain using(svcnum)
+    ) left outer join svc_forward using(svcnum)
+  ) using (pkgnum)
+) using (custnum)
+END
+
 if ( $cgi->param('browse') ) {
   my $query = $cgi->param('browse');
   if ( $query eq 'custnum' ) {
     $sortby=\*custnum_sort;
-    @cust_main=qsearch('cust_main',{});  
+#    @cust_main=qsearch('cust_main',{});  
+    ( $cache, @cust_main ) =
+      jsearch($monsterjoin, {}, '', '', 'cust_main', 'custnum' );  
   } elsif ( $query eq 'last' ) {
     $sortby=\*last_sort;
-    @cust_main=qsearch('cust_main',{});  
+#    @cust_main=qsearch('cust_main',{});  
+    ( $cache, @cust_main ) =
+      jsearch($monsterjoin, {}, '', '', 'cust_main', 'custnum' );  
   } elsif ( $query eq 'company' ) {
     $sortby=\*company_sort;
-    @cust_main=qsearch('cust_main',{});
+#    @cust_main=qsearch('cust_main',{});
+    ( $cache, @cust_main ) =
+      jsearch($monsterjoin, {}, '', '', 'cust_main', 'custnum' );  
   } else {
     die "unknown browse field $query";
   }
@@ -50,6 +92,7 @@ if ( $conf->exists('hidecancelledpackages' ) ) {
 } else {
   %all_pkgs = map { $_->custnum => [ $_->all_pkgs ] } @cust_main;
 }
+#%all_pkgs = ();
 
 if ( scalar(@cust_main) == 1 && ! $cgi->param('referral_custnum') ) {
   print $cgi->redirect(popurl(2). "view/cust_main.cgi?". $cust_main[0]->custnum);
@@ -58,7 +101,7 @@ if ( scalar(@cust_main) == 1 && ! $cgi->param('referral_custnum') ) {
   eidiot "No matching customers found!\n";
 } else { 
 
-  my($total)=scalar(@cust_main);
+  my $total = scalar(@cust_main);
   print header("Customer Search Results",menubar(
     'Main Menu', popurl(2)
   )), "$total matching customers found ";
@@ -128,6 +171,7 @@ print <<END;
 END
 
   my(%saw,$cust_main);
+  my $p = popurl(2);
   foreach $cust_main (
     sort $sortby grep(!$saw{$_->custnum}++, @cust_main)
   ) {
@@ -141,13 +185,14 @@ END
     my(@lol_cust_svc);
     my($rowspan)=0;#scalar( @{$all_pkgs{$custnum}} );
     foreach ( @{$all_pkgs{$custnum}} ) {
-      my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
+      #my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
+      my @cust_svc = $_->cust_svc;
       push @lol_cust_svc, \@cust_svc;
       $rowspan += scalar(@cust_svc) || 1;
     }
 
     #my($rowspan) = scalar(@{$all_pkgs{$custnum}});
-    my($view) = popurl(2). "view/cust_main.cgi?$custnum";
+    my $view = $p. 'view/cust_main.cgi?'. $custnum;
     print <<END;
     <TR>
       <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$custnum</FONT></A></TD>
@@ -168,10 +213,13 @@ END
 
     my($n1)='';
     foreach ( @{$all_pkgs{$custnum}} ) {
-      my($pkgnum) = ($_->pkgnum);
-      my($pkg) = $_->part_pkg->pkg;
-      my $comment = $_->part_pkg->comment;
-      my($pkgview) = popurl(2). "/view/cust_pkg.cgi?$pkgnum";
+      my $pkgnum = $_->pkgnum;
+#      my $part_pkg = qsearchs( 'part_pkg', { pkgpart => $_->pkgpart } );
+      my $part_pkg = $_->part_pkg;
+
+      my $pkg = $part_pkg->pkg;
+      my $comment = $part_pkg->comment;
+      my $pkgview = $p. 'view/cust_pkg.cgi?'. $pkgnum;
       my @cust_svc = @{shift @lol_cust_svc};
       #my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
       my $rowspan = scalar(@cust_svc) || 1;
@@ -181,7 +229,7 @@ END
       foreach my $cust_svc ( @cust_svc ) {
          my($label, $value, $svcdb) = $cust_svc->label;
          my($svcnum) = $cust_svc->svcnum;
-         my($sview) = popurl(2). "/view";
+         my($sview) = $p.'view';
          print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
                qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
          $n2="</TR><TR>";
-- 
cgit v1.2.1


From 170cab94330f9a6c5daaee7072010b589f3ab64d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Nov 2001 11:55:04 +0000
Subject: better error messages for eval'ed setup/recur expressions remove
 debugging warn output

---
 FS/FS/cust_main.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 4c4fe8702..8911023cc 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -886,8 +886,8 @@ sub bill {
       $setup = eval $setup_prog;
       unless ( defined($setup) ) {
         $dbh->rollback if $oldAutoCommit;
-        return "Error reval-ing part_pkg->setup pkgpart ". $part_pkg->pkgpart.
-               ": $@";
+        return "Error eval-ing part_pkg->setup pkgpart ". $part_pkg->pkgpart.
+               "(expression $setup_prog): $@";
       }
       $cust_pkg->setfield('setup',$time);
       $cust_pkg_mod_flag=1; 
@@ -915,8 +915,8 @@ sub bill {
       $recur = eval $recur_prog;
       unless ( defined($recur) ) {
         $dbh->rollback if $oldAutoCommit;
-        return "Error reval-ing part_pkg->recur pkgpart ".
-               $part_pkg->pkgpart. ": $@";
+        return "Error eval-ing part_pkg->recur pkgpart ".  $part_pkg->pkgpart.
+               "(expression $recur_prog): $@";
       }
       #change this bit to use Date::Manip? CAREFUL with timezones (see
       # mailing list archive)
@@ -1022,7 +1022,7 @@ sub bill {
   my $invnum = $cust_bill->invnum;
   my $cust_bill_pkg;
   foreach $cust_bill_pkg ( @cust_bill_pkg ) {
-    warn $cust_bill_pkg->invnum($invnum);
+    #warn $cust_bill_pkg->invnum($invnum);
     $error = $cust_bill_pkg->insert;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
@@ -1875,7 +1875,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.45 2001-11-03 17:49:52 ivan Exp $
+$Id: cust_main.pm,v 1.46 2001-11-05 11:55:04 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 2893c82b194c167229b07bebe27a5979bff43018 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Nov 2001 12:07:10 +0000
Subject: this is unfinished and untested anyway, but this corrects a silly
 typo

---
 bin/svc_domain.import | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/svc_domain.import b/bin/svc_domain.import
index 3d3be9da5..10fe5b584 100644
--- a/bin/svc_domain.import
+++ b/bin/svc_domain.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_domain.import,v 1.2 2001-04-22 01:56:15 ivan Exp $
+# $Id: svc_domain.import,v 1.3 2001-11-05 12:07:10 ivan Exp $
 
 use strict;
 use vars qw( %d_part_svc );
@@ -56,7 +56,7 @@ while (<NAMED_CONF>) {
   last if /^\s*directory\s+\"([\/\w+]+)\";/;
 } 
 $directory = $1 or die "can't locate directory in named.conf!";
-whlie (<NAMED_CONF>) {
+while (<NAMED_CONF>) {
   next unless /^\s*zone\s+\"([\w\.\-]+)\"\s+\{/;
   my $zone = $1;
   while (<NAMED_CONF>) {
-- 
cgit v1.2.1


From b8e6793aff1a70bb437361af00a0b69026e56543 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Nov 2001 13:57:31 +0000
Subject: doc tyop

---
 FS/FS/svc_acct.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 219d8d404..e049af038 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -904,7 +904,7 @@ sub domain {
 =item svc_domain
 
 Returns the FS::svc_domain record for this account's domain (see
-L<FS::svc_domain).
+L<FS::svc_domain>.
 
 =cut
 
@@ -958,7 +958,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.53 2001-11-03 17:49:52 ivan Exp $
+$Id: svc_acct.pm,v 1.54 2001-11-05 13:57:31 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 33e4caaea5d17c9f39d8d006864f08c0e565db47 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Nov 2001 14:03:42 +0000
Subject: move sys-dependant stuff to vars

---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2e8fd1f2d..677dea933 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,9 @@ TEMPLATE = asp
 
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 
+HTTPD_RESTART = /etc/init.d/apache restart
+QUEUED_RESTART = /etc/init.d/freeside restart
+
 #---
 
 #not changable yet
@@ -58,7 +61,8 @@ install-perl-modules: perl-modules
 install: install-perl-modules install-docs
 
 deploy: install
-	/etc/init.d/apache restart
+	${HTTPD_RESTART}
+	${QUEUED_RESTART}
 
 create-database:
 	perl -e 'use DBIx::DataSource qw( create_database ); create_database( \'${DATASOURCE}\', \'${DB_USER}\', \'${DB_PASSWORD}\' ) or die $DBIx::DataSource::errstr;'
-- 
cgit v1.2.1


From e4c4a600a9f167f84c1a0663f73797ed18934e92 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Nov 2001 14:04:56 +0000
Subject: fixup getopt

---
 FS/bin/freeside-bill | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill
index 82b3321e1..7898936c5 100755
--- a/FS/bin/freeside-bill
+++ b/FS/bin/freeside-bill
@@ -11,8 +11,8 @@ use FS::Record qw(qsearch qsearchs);
 use FS::cust_main;
 
 &untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_a $opt_c $opt_i $opt_d);
-getopts("acid:");
+use vars qw($opt_a $opt_c $opt_i $opt_d $opt_p);
+getopts("acid:p");
 my $user = shift or die &usage;
 
 adminsuidsetup $user;
@@ -22,7 +22,7 @@ my %bill_only = map { $_ => 1 } (
 );
 
 #we're at now now (and later).
-my($time)= $main::opt_d ? str2time($main::opt_d) : $^T;
+my($time)= $opt_d ? str2time($opt_d) : $^T;
 
 # find packages w/ bill < time && cancel != '', and create corresponding
 # customer objects
@@ -34,7 +34,7 @@ foreach $cust_main (
       $saw{ $_->custnum } = 0; # to avoid 'use of uninitialized value' errors
     }
     if (
-      ( $main::opt_a || ( ( $_->getfield('bill') || 0 ) <= $time ) )
+      ( $opt_a || ( ( $_->getfield('bill') || 0 ) <= $time ) )
       && $bill_only{ $_->custnum }
       && !$saw{ $_->custnum }++
     ) {
@@ -57,14 +57,14 @@ foreach $cust_main (
   warn "Error billing,  customer #" . $cust_main->getfield('custnum') . 
     ":" . $error if $error;
 
-  if ($main::opt_p) {
+  if ($opt_p) {
     $cust_main->apply_payments;
     $error=$cust_main->apply_credits;
   }
 
-  if ($main::opt_c) {
+  if ($opt_c) {
     $error=$cust_main->collect('invoice_time'=>$time,
-                               'batch_card' => $main::opt_i ? 'no' : 'yes',
+                               'batch_card' => $opt_i ? 'no' : 'yes',
                               );
     warn "Error collecting from customer #" . $cust_main->gcustnum.  ":$error"
       if $error;
@@ -123,7 +123,7 @@ customers.  Otherwise, bills all customers.
 
 =head1 VERSION
 
-$Id: freeside-bill,v 1.9 2001-09-11 00:08:18 ivan Exp $
+$Id: freeside-bill,v 1.10 2001-11-05 14:04:56 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From dcdc515874c5db8e450550f41da21e9490709d5b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Nov 2001 16:42:19 +0000
Subject: AUTOLOAD optimizations broke things rather badly, oops

---
 FS/FS/Record.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 3c8e9bac6..9f3549468 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -384,7 +384,7 @@ $record->column('value') is a synonym for $record->set('column','value');
 sub AUTOLOAD {
   my $field = $AUTOLOAD;
   $field =~ s/.*://;
-  if ( scalar(@_) == 2 ) {
+  if ( defined($_[1]) ) {
     $_[0]->setfield($field, $_[1]);
   } else {
     $_[0]->getfield($field);
@@ -1036,12 +1036,12 @@ sub hfields {
   \%hash;
 }
 
-#sub _dump {
-#  my($self)=@_;
-#  join("\n", map {
-#    "$_: ". $self->getfield($_). "|"
-#  } (fields($self->table)) );
-#}
+sub _dump {
+  my($self)=@_;
+  join("\n", map {
+    "$_: ". $self->getfield($_). "|"
+  } (fields($self->table)) );
+}
 
 sub DESTROY { return; }
 
-- 
cgit v1.2.1


From 92eaaea542d3dfdcc1e258b50785f79d8e6aad8c Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 5 Nov 2001 17:00:41 +0000
Subject: improved svc_acct replacement

---
 FS/FS/svc_acct.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index e049af038..8f9216fb7 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -548,7 +548,9 @@ sub replace {
 
   return "Username in use"
     if $old->username ne $new->username &&
-      qsearchs( 'svc_acct', { 'username' => $new->username } );
+      qsearchs( 'svc_acct', { 'username' => $new->username,
+                               'domsvc'   => $new->domsvc,
+                             } );
 
   return "Can't change uid!" if $old->uid != $new->uid;
 
@@ -958,7 +960,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.54 2001-11-05 13:57:31 ivan Exp $
+$Id: svc_acct.pm,v 1.55 2001-11-05 17:00:41 jeff Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 3c95656e1308b5ebf155191badac19000f0e5b9f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Nov 2001 18:23:53 +0000
Subject: doc

---
 httemplate/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index efc1eb6bc..20d6e1456 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -53,7 +53,7 @@ Install the Freeside distribution:
     <ul>
       <li> with <a href="http://www.postgresql.org/users-lounge/docs/7.1/postgres/user-manag.html#DATABASE-USERS">PostgreSQL</a>:
         <pre>
-$ su freeside
+$ su postgres
 $ createuser -P freeside</pre>
       <li> with <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#User_Account_Management">MySQL</a>:
         <pre>
-- 
cgit v1.2.1


From 45b4365687be864c68b1daa0ee7787a6a0933589 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Nov 2001 20:12:07 +0000
Subject: makefile fixups

---
 FS/FS/Record.pm | 2 +-
 Makefile        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 9f3549468..6c7a321e6 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -804,7 +804,7 @@ sub ut_phonen {
     $phonen .= " x$4" if $4;
     $self->setfield($field,$phonen);
   } else {
-    warn "don't know how to check phone numbers for country $country";
+    warn "warning: don't know how to check phone numbers for country $country";
     return $self->ut_textn($field);
   }
   '';
diff --git a/Makefile b/Makefile
index 677dea933..1fb870cc8 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ deploy: install
 	${QUEUED_RESTART}
 
 create-database:
-	perl -e 'use DBIx::DataSource qw( create_database ); create_database( \'${DATASOURCE}\', \'${DB_USER}\', \'${DB_PASSWORD}\' ) or die $DBIx::DataSource::errstr;'
+	perl -e 'use DBIx::DataSource qw( create_database ); create_database( "${DATASOURCE}", "${DB_USER}", "${DB_PASSWORD}" ) or die \$DBIx::DataSource::errstr;'
 
 create-config: install-perl-modules
 	[ -e ${FREESIDE_CONF} ] && mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S`
-- 
cgit v1.2.1


From 81bf444ccd0787b8e1bd09cddcd94fbc9378aa93 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Nov 2001 21:24:35 +0000
Subject: make create-database fix

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1fb870cc8..71fb13e58 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ deploy: install
 	${QUEUED_RESTART}
 
 create-database:
-	perl -e 'use DBIx::DataSource qw( create_database ); create_database( "${DATASOURCE}", "${DB_USER}", "${DB_PASSWORD}" ) or die \$DBIx::DataSource::errstr;'
+	perl -e 'use DBIx::DataSource qw( create_database ); create_database( "${DATASOURCE}", "${DB_USER}", "${DB_PASSWORD}" ) or die $$DBIx::DataSource::errstr;'
 
 create-config: install-perl-modules
 	[ -e ${FREESIDE_CONF} ] && mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S`
-- 
cgit v1.2.1


From b335f3f1beb62e8c5022e0ea9e94a9c2f08fd4b6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Nov 2001 21:26:04 +0000
Subject: yet more Make

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 71fb13e58..260d0929b 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ create-database:
 	perl -e 'use DBIx::DataSource qw( create_database ); create_database( "${DATASOURCE}", "${DB_USER}", "${DB_PASSWORD}" ) or die $$DBIx::DataSource::errstr;'
 
 create-config: install-perl-modules
-	[ -e ${FREESIDE_CONF} ] && mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S`
+	[ -e ${FREESIDE_CONF} ] && mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S` || true
 	mkdir ${FREESIDE_CONF}
 	chown freeside ${FREESIDE_CONF}
 
-- 
cgit v1.2.1


From d738d0c6677d72f62a0c9fb2fc4446c07c6e8492 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Nov 2001 21:30:01 +0000
Subject: more fixes for fresh installation

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 260d0929b..15f8b85d8 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ docs:
 	make ${TEMPLATE}docs
 
 install-docs: docs
-	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S`
+	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
 	cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
 
 perl-modules:
-- 
cgit v1.2.1


From 9718b44594231631a1e045f17b6521881790b297 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Nov 2001 17:48:17 +0000
Subject: payinfo changed from length 16 to $char_d for future expansion

---
 bin/fs-setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 4df3773af..da6c167e9 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.66 2001-10-30 19:05:27 ivan Exp $
+# $Id: fs-setup,v 1.67 2001-11-06 17:48:17 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -375,7 +375,7 @@ sub tables_hash_hack {
         'ship_night',    'varchar', 'NULL', 20,
         'ship_fax',      'varchar', 'NULL', 12,
         'payby',    'char', '',     4,
-        'payinfo',  'varchar', 'NULL', 16,
+        'payinfo',  'varchar', 'NULL', $char_d,
         #'paydate',  @date_type,
         'paydate',  'varchar', 'NULL', 10,
         'payname',  'varchar', 'NULL', $char_d,
-- 
cgit v1.2.1


From bcb172a6ea2b9f3e645eed81896f960151267bf5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Nov 2001 17:58:08 +0000
Subject: fix error message for s/htdocs/httemplate/

---
 FS/FS/UID.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index f81d8dcdd..890e2988a 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -188,7 +188,7 @@ sub cgisetotaker {
     $user = lc ( $cgi->connection->user );
   } else {
     die "fatal: Can't get REMOTE_USER! for cgi $cgi - you need to setup ".
-        "Apache user authentication as documented in htdocs/docs/config.html";
+        "Apache user authentication as documented in httemplate/docs/config.html";
   }
   $user;
 }
@@ -252,7 +252,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.10 2001-09-24 03:23:34 ivan Exp $
+$Id: UID.pm,v 1.11 2001-11-06 17:58:08 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From ee35306e0c6757f68ae9120ca4fa52f410125847 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Nov 2001 18:22:26 +0000
Subject: make foo for htetc/global.asa

---
 Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile b/Makefile
index 15f8b85d8..54146b42c 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,8 @@ TEMPLATE = asp
 #mason's a bit dodgy still
 #TEMPLATE = mason
 
+ASP_GLOBAL = /usr/local/etc/freeside/asp-global
+
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 
 HTTPD_RESTART = /etc/init.d/apache restart
@@ -48,6 +50,9 @@ docs:
 install-docs: docs
 	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
 	cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
+	[ ${TEMPLATE} eq asp -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL}
+	[ ${TEMPLATE} eq asp ] && chown -R freeside ${ASP_GLOBAL}
+	[ ${TEMPLATE} eq asp ] && cp htetc/global.asa ${ASP_GLOBAL}
 
 perl-modules:
 	cd FS; \
-- 
cgit v1.2.1


From 5263c58d9163c0ff4a41e6a0233a67d40d50df9a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Nov 2001 18:34:54 +0000
Subject: i suck at Makefiles

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 54146b42c..b5943789f 100644
--- a/Makefile
+++ b/Makefile
@@ -50,9 +50,9 @@ docs:
 install-docs: docs
 	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
 	cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
-	[ ${TEMPLATE} eq asp -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL}
-	[ ${TEMPLATE} eq asp ] && chown -R freeside ${ASP_GLOBAL}
-	[ ${TEMPLATE} eq asp ] && cp htetc/global.asa ${ASP_GLOBAL}
+	[ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL}
+	[ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL}
+	[ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL}
 
 perl-modules:
 	cd FS; \
-- 
cgit v1.2.1


From 9637b3874beddf78dd8927f85179116b477a53a4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Nov 2001 18:35:51 +0000
Subject: i REALLY suck at Makefiles

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index b5943789f..121123287 100644
--- a/Makefile
+++ b/Makefile
@@ -50,9 +50,9 @@ docs:
 install-docs: docs
 	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
 	cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
-	[ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL}
-	[ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL}
-	[ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL}
+	[ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL} || true
+	[ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
+	[ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
 
 perl-modules:
 	cd FS; \
-- 
cgit v1.2.1


From 9a0b074f2b3fb4d819a6e10435ca1484929a81e2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Nov 2001 18:45:46 +0000
Subject: remove gratuitous warnings

---
 httemplate/edit/process/part_pkg.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index cd799b5b9..c64d49219 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_pkg.cgi,v 1.4 2001-10-20 12:18:00 ivan Exp $ -->
+#<!-- $Id: part_pkg.cgi,v 1.5 2001-11-06 18:45:46 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $pkgpart $old $new $part_svc $error $dbh );
@@ -35,8 +35,8 @@ $new = new FS::part_pkg ( {
   } fields('part_pkg')
 } );
 
-warn "setuptax: ". $new->setuptax;
-warn "recurtax: ". $new->recurtax;
+#warn "setuptax: ". $new->setuptax;
+#warn "recurtax: ". $new->recurtax;
 
 #most of the stuff below should move to part_pkg.pm
 
-- 
cgit v1.2.1


From 9fa3f18ba6b2e910601891a15fe30448d51d43f9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Nov 2001 15:26:44 +0000
Subject: harmless typo noticed by "Edward Shabotinsky" <lanshark@bsinet.net>,
 thanks

---
 FS/bin/freeside-queued | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 4e3724e6e..87e3cb422 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -40,7 +40,7 @@ $log_file = "/usr/local/etc/freeside/queuelog.". $FS::UID::datasrc;
 $SIG{__DIE__} = \&_die;
 $SIG{__WARN__} = \&_logmsg;
 
-warn "freesied-queued starting\n";
+warn "freeside-queued starting\n";
 
 while (1) {
 
-- 
cgit v1.2.1


From 70fa760135ca13a320a627d01e139f9ddb4d8689 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 Nov 2001 18:26:22 +0000
Subject: Pg7 dependancy

---
 httemplate/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 20d6e1456..60f549edb 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -11,7 +11,7 @@ Before installing, you need:
   <li><a href="http://www.perl.com/">Perl</a>  Don't enable experimental features like threads or the PerlIO abstraction layer.
   <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.
     <ul>
-      <li><a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.
+      <li><a href="http://www.postgresql.org/">PostgreSQL</a> (v7 or higher) is recommended.
       <li>MySQL has been reported to work.  <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
     </ul>
   <li>Perl modules (<a href="http://theoryx5.uwinnipeg.ca/CPAN/perl/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
-- 
cgit v1.2.1


From 3d801efe52697501ffbe673e58773f24eb56c6c8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Nov 2001 13:19:52 +0000
Subject: import hack to be less strict

---
 FS/FS/cust_main.pm | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 8911023cc..054175670 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -3,7 +3,7 @@ package FS::cust_main;
 use strict;
 use vars qw( @ISA $conf $lpr $processor $xaction $E_NoErr $invoice_from
              $smtpmachine $Debug $bop_processor $bop_login $bop_password
-             $bop_action @bop_options);
+             $bop_action @bop_options $import );
 use Safe;
 use Carp;
 use Time::Local;
@@ -34,6 +34,8 @@ use FS::queue;
 $Debug = 0;
 #$Debug = 1;
 
+$import = 0;
+
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::cust_main'} = sub { 
   $conf = new FS::Conf;
@@ -563,17 +565,19 @@ sub check {
     $self->ss("$1-$2-$3");
   }
 
-  unless ( qsearchs('cust_main_county', {
-    'country' => $self->country,
-    'state'   => '',
-   } ) ) {
-    return "Unknown state/county/country: ".
-      $self->state. "/". $self->county. "/". $self->country
-      unless qsearchs('cust_main_county',{
-        'state'   => $self->state,
-        'county'  => $self->county,
-        'country' => $self->country,
-      } );
+  unless ( $import ) {
+    unless ( qsearchs('cust_main_county', {
+      'country' => $self->country,
+      'state'   => '',
+     } ) ) {
+      return "Unknown state/county/country: ".
+        $self->state. "/". $self->county. "/". $self->country
+        unless qsearchs('cust_main_county',{
+          'state'   => $self->state,
+          'county'  => $self->county,
+          'country' => $self->country,
+        } );
+    }
   }
 
   $error =
@@ -1875,7 +1879,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.46 2001-11-05 11:55:04 ivan Exp $
+$Id: cust_main.pm,v 1.47 2001-11-12 13:19:52 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 82a77e8496deec74c06a941e6115d0f79c706241 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 13 Nov 2001 21:27:42 +0000
Subject: remove freeside-print-batch

---
 FS/MANIFEST                 |   1 -
 FS/bin/freeside-print-batch | 260 --------------------------------------------
 2 files changed, 261 deletions(-)
 delete mode 100755 FS/bin/freeside-print-batch

diff --git a/FS/MANIFEST b/FS/MANIFEST
index c83fad5c9..d4bac3d73 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -5,7 +5,6 @@ Makefile.PL
 README
 bin/freeside-bill
 bin/freeside-email
-bin/freeside-print-batch
 bin/freeside-queued
 bin/freeside-apply-credits
 bin/freeside-adduser
diff --git a/FS/bin/freeside-print-batch b/FS/bin/freeside-print-batch
deleted file mode 100755
index da4ecf464..000000000
--- a/FS/bin/freeside-print-batch
+++ /dev/null
@@ -1,260 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-#use Date::Format;
-use Time::Local;
-use Getopt::Std;
-use FS::Conf;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch);
-use FS::cust_pay;
-use FS::cust_pay_batch;
-
-# Get the currennt time and date
-my $time = time;
-my ($sec,$min,$hour,$mday,$mon,$year) =
-	(localtime($time) )[0,1,2,3,4,5]; 
-my $_date =
-	timelocal($sec,$min,$hour,$mday,$mon,$year);
-
-# Set the mail program
-my $mail_program = "/usr/sbin/sendmail -t -n"; 
-
-&untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_v $opt_p $opt_e $opt_a $opt_d);
-getopts("vpead");	#switches
-
-# Login to the database
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-# Get the needed configuration files
-my $conf = new FS::Conf;
-my $lpr = $conf->config('lpr');
-my $email = $conf->config('email');
-
-my(@batch)=qsearch('cust_pay_batch',{});
-if (scalar(@batch) == 0)
-{
-	exit 1;
-}
-
-# Open print and email pipes
-# $lpr and opt_p for printing
-# $email and opt_e for email
-# 
-if ($lpr && $main::opt_p)
-{
-	open(LPR, "|$lpr");
-	print LPR qq~C R E D I T  C A R D  P A Y M E N T S  D U E $mon/$mday/$year\n\n~;
-}
-
-if ($email && $main::opt_e)
-{
-	open (MAIL, "|$mail_program");
-	print MAIL <<END
-To: $email
-From: Account Processor
-Subject: CREDIT CARD PAYMENTS DUE
-
-
-C R E D I T  C A R D  P A Y M E N T S  D U E $mon/$mday/$year
-END
-}
-
-# Now I can start looping
-foreach my $cust_pay_batch (@batch)
-{
-	my $state = $cust_pay_batch->getfield('state');
-	my $zip = $cust_pay_batch->getfield('zip');
-	my $amount = $cust_pay_batch->getfield('amount');
-	my $last = $cust_pay_batch->getfield('last');
-	my $address1 = $cust_pay_batch->getfield('address1');
-	my $address2 = $cust_pay_batch->getfield('address2');
-	my $first = $cust_pay_batch->getfield('first');
-	my $city = $cust_pay_batch->getfield('city');
-	my $cardnum = $cust_pay_batch->getfield('cardnum');
-	my $payname = $cust_pay_batch->getfield('payname');
-	my $exp = $cust_pay_batch->getfield('exp');
-	my $invnum = $cust_pay_batch->getfield('invnum');
-	my $custnum = $cust_pay_batch->getfield('custnum');
-
-	# Need a carriage return in address before address2
-	# if it exists. Otherwise address will just be address1
-	my $address = $address1;
-	$address .= "\n$address2" if ($address2);
-
-	# Only print to the screen in verbose mode
-	if ($main::opt_v)
-	{
-		printf("Invoice %d for %s %s\tCustomer Number: %d\n",
-			$invnum,
-			$first,
-			$last,
-			$custnum);
-
-		printf("\t%s\n", $address);
-		printf("\t%s, %s, %s\n\n",
-			$city,
-			$state,
-			$zip);
-
-		printf("\tCard Number: %s\tExp:%s\n",
-			$cardnum,
-			$exp);
-		printf("\t\tName: %s\n", $payname);
-		printf("\t\tAmount: %.2f\n\n\n", $amount);
-	}
-
-	if ($lpr && $main::opt_p)
-	{
-		printf(LPR "Invoice %d for %s %s\tCustomer Number: %d\n",
-			$invnum,
-			$first,
-			$last,
-			$custnum);
-
-		printf(LPR "\t%s\n", $address);
-		printf(LPR "\t%s, %s, %s\n\n",
-			$city,
-			$state,
-			$zip);
-
-		printf(LPR "\tCard Number: %s\tExp:%s\n",
-			$cardnum,
-			$exp);
-		printf(LPR "\t\tName: %s\n", $payname);
-		printf(LPR "\t\tAmount: %.2f\n\n\n", $amount);
-	}
-
-	if ($email && $main::opt_e)
-	{
-		printf(MAIL "Invoice %d for %s %s\tCustomer Number: %d\n",
-			$invnum,
-			$first,
-			$last,
-			$custnum);
-
-		printf(MAIL "\t%s\n", $address);
-		printf(MAIL "\t%s, %s, %s\n\n",
-			$city,
-			$state,
-			$zip);
-
-		printf(MAIL "\tCard Number: %s\tExp:%s\n",
-			$cardnum,
-			$exp);
-		printf(MAIL "\t\tName: %s\n", $payname);
-		printf(MAIL "\t\tAmount: %.2f\n\n\n", $amount);
-	}
-
-	# Now I want to delete the records from cust_pay_batch
-	# and mark the records in cust_pay as paid today if
-	# the delete (-d) command line option is set.
-	if($main::opt_a)
-	{
-		my $payment=new FS::cust_pay {
-			'invnum' => $invnum,
-			'paid' => $amount,
-			'_date' => $_date,
-			'payby' => "CARD",
-			'payinfo' => $cardnum,
-			'paybatch' => "AUTO",
-		};
-		
-		my $pay_error=$payment->insert;
-		if ($pay_error)
-			{
-				# warn might be better if you get root's mail
-				# NEED TO TEST THIS BEFORE DELETE IF WARN IS USED
-				die "Could not update cust_pay for invnum $invnum. $pay_error\n";
-			}
-	}
-		
-	# This just deletes the records
-	# Must be last in the foreach loop
-	if($main::opt_d)
-	{
-		my $del_error = $cust_pay_batch->delete;
-		if ($del_error)
-		{
-			die "Could not delete cust_pay_batch for invnum $invnum. $del_error\n";
-		}
-	}
-
-}
-
-# Now I need to close LPR and EMAIL if they were open
-if($lpr && $main::opt_p)
-{
-	close LPR || die "Could not close printer: $lpr\n";
-}
-
-if($email && $main::opt_e)
-{
-	close MAIL || die "Could not close printer: $lpr\n";
-}
-
-
-# subroutines
-sub untaint_argv {
-  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    $ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
-    $ARGV[$_]=$1;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n  freeside-print-batch [-v] [-p] [-e] [-a] [-d] user\n";
-}
-
-=head1 NAME
-
-freeside-print-batch - Prints or emails cust_pay_batch. Also deletes
-              old records and adds payment to cust_pay.
-							Usually run after the bill command.
-
-=head1 SYNOPSIS
-
-  freeside-print-batch [-v] [-p] [-e] [-a] [-d] user
-
-=head1 DESCRIPTION
-
-Prints or emails cust_pay_batch. Can enter payment and delete
-printed records. Usually run as a cron job.
-
-B<-v>: Verbose - Prints records to STDOUT.
-
-B<-p>: Print to printer lpr as found in the conf directory.
-
-B<-e>: Email output to user found in the Conf email file.
-
-B<-a>: Automatically pays all records in cust_pay_batch.  Usually used with the B<-d> option.
-
-B<-d>:	Delete - Pays account and deletes record from cust_pay_batch.
-
-user: From the mapsecrets file - see config.html from the base documentation
-
-=head1 VERSION
-
-$Id: freeside-print-batch,v 1.4 2001-11-02 08:14:14 ivan Exp $
-
-=head1 BUGS
-
-Yes..... Use at your own risk. No guarantees or warrantees of any
-kind apply to this program. Parts of this program are hacked from
-other GNU licensed software created mainly by Ivan Kohler.
-
-This is released under the GNU Public License. See www.gnu.org
-for more information regarding this license.
-
-=head1 SEE ALSO
-
-L<FS::cust_main>, config.html from the base documentation
-
-=head1 AUTHOR
-
-Joel Griffiths <griff@aver-computer.com> July 99
-
-=cut
-
-- 
cgit v1.2.1


From 18ed1ed986d3a6d1b7529afa3d448b0e76618fee Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 16 Nov 2001 10:22:03 +0000
Subject: update link to Text::Template docs

---
 httemplate/docs/billing.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/billing.html b/httemplate/docs/billing.html
index 7841bf776..7dc9aef2d 100644
--- a/httemplate/docs/billing.html
+++ b/httemplate/docs/billing.html
@@ -8,7 +8,7 @@
     <ul>
       <li>Optional: Invoice template customization
         <ul>
-          <li>See the <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> documentation for details on the substitution language.
+          <li>See the <a href="http://search.cpan.org/doc/MJD/Text-Template-1.42/Template.pm">Text::Template</a> documentation for details on the substitution language.
           <li>You <b>must</b> call the invoice_lines() function at least once - pass it a number of lines, and it returns a list of array references, each of two elements: a service description column, and a price column.
           <li>In addition, the following variables are available:
             <ul>
-- 
cgit v1.2.1


From 685e4c619cadadba55590b04c44f563a925b6baa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Nov 2001 03:40:03 +0000
Subject: postalinvoicedefault config file

---
 FS/FS/Conf.pm                 | 7 +++++++
 httemplate/edit/cust_main.cgi | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 569eaabb5..bf27bf348 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -300,6 +300,13 @@ httemplate/docs/config.html
     'type'       => 'checkbox',
   },
 
+  {
+    'key'         => 'postalinvoicedefault',
+    'section'     => 'billing',
+    'description' => 'Disables postal mail invoices as the default option in the UI.  Be careful not to setup customers which are not sent invoices.  See <a href ="#emailinvoiceauto">emailinvoiceauto</a>.',
+    'type'       => 'checkbox',
+  },
+
   {
     'key'         => 'emailinvoiceauto',
     'section'     => 'billing',
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index cfd99c824..68765ca67 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.12 2001-10-30 15:42:33 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.13 2001-11-21 03:40:03 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -345,7 +345,8 @@ print qq!>Tax Exempt</TD></TR>!;
 print qq!<TR><TD><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
 @invoicing_list = $cust_main->invoicing_list;
 print qq! CHECKED!
-  if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
+  if ( ! @invoicing_list && ! $conf->exists('postalinvoicedefault') )
+     || grep { $_ eq 'POST' } @invoicing_list;
 print qq!>Postal mail invoice</TD></TR>!;
 $invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
 print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
-- 
cgit v1.2.1


From 09655ec6f1761d464a928f6aab88bb936999df25 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Nov 2001 03:42:13 +0000
Subject: a more reasonalbe name (!)

---
 FS/FS/Conf.pm                 | 2 +-
 httemplate/edit/cust_main.cgi | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index bf27bf348..0d04cc129 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -301,7 +301,7 @@ httemplate/docs/config.html
   },
 
   {
-    'key'         => 'postalinvoicedefault',
+    'key'         => 'disablepostalinvoicedefault',
     'section'     => 'billing',
     'description' => 'Disables postal mail invoices as the default option in the UI.  Be careful not to setup customers which are not sent invoices.  See <a href ="#emailinvoiceauto">emailinvoiceauto</a>.',
     'type'       => 'checkbox',
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 68765ca67..260d77e6c 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.13 2001-11-21 03:40:03 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.14 2001-11-21 03:42:13 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -345,7 +345,7 @@ print qq!>Tax Exempt</TD></TR>!;
 print qq!<TR><TD><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
 @invoicing_list = $cust_main->invoicing_list;
 print qq! CHECKED!
-  if ( ! @invoicing_list && ! $conf->exists('postalinvoicedefault') )
+  if ( ! @invoicing_list && ! $conf->exists('disablepostalinvoicedefault') )
      || grep { $_ eq 'POST' } @invoicing_list;
 print qq!>Postal mail invoice</TD></TR>!;
 $invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
-- 
cgit v1.2.1


From 5c0eff524454c3e66a0fbe90250884d0a7578284 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Nov 2001 00:04:38 +0000
Subject: more link methods

---
 FS/FS/cust_pkg.pm   |  4 ++--
 FS/FS/cust_svc.pm   | 14 +++++++++++++-
 FS/FS/svc_Common.pm | 18 +++++++++++++++---
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 19e1da356..c6fabe5cb 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -99,7 +99,7 @@ inherits from FS::Record.  The following fields are currently supported:
 =item otaker - order taker (assigned automatically if null, see L<FS::UID>)
 
 =item manual_flag - If this field is set to 1, disables the automatic
-unsuspensiond of this package when using the B<unsuspendauto> config file.
+unsuspension of this package when using the B<unsuspendauto> config file.
 
 =back
 
@@ -629,7 +629,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.13 2001-11-03 17:49:52 ivan Exp $
+$Id: cust_pkg.pm,v 1.14 2001-11-30 00:04:38 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index c398e5ecd..9bc563f40 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -134,6 +134,18 @@ sub part_svc {
     : qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
 }
 
+=item cust_pkg
+
+Returns the definition for this service, as a FS::part_svc object (see
+L<FS::part_svc>).
+
+=cut
+
+sub cust_pkg {
+  my $self = shift;
+  qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
+}
+
 =item label
 
 Returns a list consisting of:
@@ -183,7 +195,7 @@ sub label {
 
 =head1 VERSION
 
-$Id: cust_svc.pm,v 1.6 2001-11-03 17:49:52 ivan Exp $
+$Id: cust_svc.pm,v 1.7 2001-11-30 00:04:38 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 7e216461f..042c243fd 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -107,7 +107,7 @@ sub delete {
   $error = $self->SUPER::delete;
   return $error if $error;
 
-  my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );  
+  my $cust_svc = $self->cust_svc;
   $error = $cust_svc->delete;
   return $error if $error;
 
@@ -154,7 +154,7 @@ sub setx {
   #get part_svc
   my $svcpart;
   if ( $self->svcnum ) {
-    my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $self->svcnum } );
+    my $cust_svc = $self->cust_svc;
     return "Unknown svcnum" unless $cust_svc; 
     $svcpart = $cust_svc->svcpart;
   } else {
@@ -176,6 +176,18 @@ sub setx {
 
 }
 
+=item cust_svc
+
+Returns the cust_svc record associated with this svc_ record, as a FS::cust_svc
+object (see L<FS::cust_svc>).
+
+=cut
+
+sub cust_svc {
+  my $self = shift;
+  qsearchs('cust_svc', { 'svcnum' => $self->svcnum } );
+}
+
 =item suspend
 
 =item unsuspend
@@ -195,7 +207,7 @@ sub cancel { ''; }
 
 =head1 VERSION
 
-$Id: svc_Common.pm,v 1.6 2001-09-11 22:20:28 ivan Exp $
+$Id: svc_Common.pm,v 1.7 2001-11-30 00:04:38 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 4e5a0655072be725acf00394186b93c96bba17ee Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Dec 2001 08:41:43 +0000
Subject: maxsearchrecordsperpage config option paged implementation of
 customer browse!

---
 FS/FS/Conf.pm                   |   7 ++
 FS/FS/Record.pm                 |   6 +-
 conf/maxsearchrecordsperpage    |   1 +
 httemplate/search/cust_main.cgi | 150 ++++++++++++++++++++++++++++++++++------
 4 files changed, 139 insertions(+), 25 deletions(-)
 create mode 100644 conf/maxsearchrecordsperpage

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 0d04cc129..8195fc55e 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -467,6 +467,13 @@ httemplate/docs/config.html
 #    'description' => 'Directory which contains domain registry information.  Each registry is a directory.',
 #  },
 
+  {
+    'key'         => 'maxsearchrecordsperpage',
+    'section'     => 'UI',
+    'description' => 'If set, number of search records to return per page.',
+    'type'        => 'text',
+  },
+
   {
     'key'         => 'sendmailconfigpath',
     'section'     => 'mail',
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 6c7a321e6..a04ddb982 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -227,7 +227,7 @@ sub qsearch {
 
   $sth->execute( map $record->{$_},
     grep defined( $record->{$_} ) && $record->{$_} ne '', @fields
-  ) or croak "Error executing \"$statement\": ". $dbh->errstr;
+  ) or croak "Error executing \"$statement\": ". $sth->errstr;
   $dbh->commit or croak $dbh->errstr if $FS::UID::AutoCommit;
 
   if ( eval 'scalar(@FS::'. $table. '::ISA);' ) {
@@ -257,13 +257,15 @@ sub qsearch {
 
 }
 
-=item jsearch
+=item jsearch TABLE, HASHREF, SELECT, EXTRA_SQL, PRIMARY_TABLE, PRIMARY_KEY
 
 Experimental JOINed search method.  Using this method, you can execute a
 single SELECT spanning multiple tables, and cache the results for subsequent
 method calls.  Interface will almost definately change in an incompatible
 fashion.
 
+Arguments: 
+
 =cut
 
 sub jsearch {
diff --git a/conf/maxsearchrecordsperpage b/conf/maxsearchrecordsperpage
new file mode 100644
index 000000000..29d6383b5
--- /dev/null
+++ b/conf/maxsearchrecordsperpage
@@ -0,0 +1 @@
+100
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index db33df784..a139f0eed 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,14 +1,15 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.14 2001-11-03 17:49:52 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.15 2001-12-03 08:41:43 ivan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
-use vars qw( $conf %all_pkgs $cgi @cust_main $sortby );
+#use vars qw( $conf %all_pkgs $cgi @cust_main $sortby );
+use vars qw( $conf %all_pkgs $cgi @cust_main $sortby $orderby $maxrecords $limit $offset );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use IO::Handle;
 use String::Approx qw(amatch);
-use FS::UID qw(cgisuidsetup);
+use FS::UID qw(dbh cgisuidsetup);
 use FS::Record qw(qsearch qsearchs dbdef jsearch);
 use FS::CGI qw(header menubar eidiot popurl table);
 use FS::cust_main;
@@ -18,6 +19,7 @@ $cgi = new CGI;
 cgisuidsetup($cgi);
 
 $conf = new FS::Conf;
+$maxrecords = $conf->config('maxsearchrecordsperpage');
 
 my $cache;
 
@@ -35,6 +37,26 @@ my $cache;
 #) using (custnum)
 #END
 
+#my $monsterjoin = <<END;
+#cust_main left outer join (
+#  ( cust_pkg left outer join part_pkg using(pkgpart)
+#  ) left outer join (
+#    (
+#      (
+#        ( cust_svc left outer join part_svc using (svcpart)
+#        ) left outer join (
+#          svc_acct left outer join (
+#            select svcnum, domain, catchall from svc_domain
+#            ) as svc_acct_domsvc (
+#              svc_acct_svcnum, svc_acct_domain, svc_acct_catchall
+#          ) on svc_acct.domsvc = svc_acct_domsvc.svc_acct_svcnum
+#        ) using (svcnum)
+#      ) left outer join svc_domain using(svcnum)
+#    ) left outer join svc_forward using(svcnum)
+#  ) using (pkgnum)
+#) using (custnum)
+#END
+
 my $monsterjoin = <<END;
 cust_main left outer join (
   ( cust_pkg left outer join part_pkg using(pkgpart)
@@ -55,38 +77,93 @@ cust_main left outer join (
 ) using (custnum)
 END
 
+$orderby = ''; #removeme
+
+$limit = '';
+$limit .= "LIMIT $maxrecords" if $maxrecords;
+
+$offset = $cgi->param('offset') || 0;
+$limit .= " OFFSET $offset" if $offset;
+
+my $total;
+
 if ( $cgi->param('browse') ) {
   my $query = $cgi->param('browse');
   if ( $query eq 'custnum' ) {
     $sortby=\*custnum_sort;
-#    @cust_main=qsearch('cust_main',{});  
-    ( $cache, @cust_main ) =
-      jsearch($monsterjoin, {}, '', '', 'cust_main', 'custnum' );  
+    $orderby = 'ORDER BY custnum';
   } elsif ( $query eq 'last' ) {
     $sortby=\*last_sort;
-#    @cust_main=qsearch('cust_main',{});  
-    ( $cache, @cust_main ) =
-      jsearch($monsterjoin, {}, '', '', 'cust_main', 'custnum' );  
+    $orderby = 'ORDER BY last';
   } elsif ( $query eq 'company' ) {
     $sortby=\*company_sort;
-#    @cust_main=qsearch('cust_main',{});
-    ( $cache, @cust_main ) =
-      jsearch($monsterjoin, {}, '', '', 'cust_main', 'custnum' );  
+    $orderby = 'ORDER BY company';
   } else {
     die "unknown browse field $query";
   }
+
+  my $ncancelled = '';
+
+  if (  $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
+       || ( $conf->exists('hidecancelledcustomers')
+             && ! $cgi->param('showcancelledcustomers') )
+     ) {
+    #grep { $_->ncancelled_pkgs || ! $_->all_pkgs }
+    #needed for MySQL???    OR cust_pkg.cancel = \"\"
+    $ncancelled = "
+      WHERE 0 < ( SELECT COUNT(*) FROM cust_pkg
+                    WHERE cust_pkg.custnum = cust_main.custnum
+                      AND ( cust_pkg.cancel IS NULL
+                            OR cust_pkg.cancel = 0
+                          )
+                )
+         OR 0 = ( SELECT COUNT(*) FROM cust_pkg
+                    WHERE cust_pkg.custnum = cust_main.custnum
+                )
+    ";
+  }
+
+  my $statement = "SELECT COUNT(*) FROM cust_main $ncancelled";
+  my $sth = dbh->prepare($statement)
+    or die dbh->errstr. " doing $statement";
+  $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
+
+  $total = @{$sth->fetchrow_arrayref}[0];
+
+  my @just_cust_main = qsearch('cust_main',{}, '',
+    "$ncancelled $orderby $limit"
+  );    
+
+  @cust_main = @just_cust_main;
+
+#  foreach my $cust_main ( @just_cust_main ) {
+#
+#    my @one_cust_main;
+#    $FS::Record::DEBUG=1;
+#    ( $cache, @one_cust_main ) = jsearch(
+#      "$monsterjoin",
+#      { 'custnum' => $cust_main->custnum },
+#      '',
+#      '',
+#      'cust_main',
+#      'custnum',
+#    );
+#    push @cust_main, @one_cust_main;
+#  }
+
 } else {
   @cust_main=();
   &cardsearch if $cgi->param('card_on') && $cgi->param('card');
   &lastsearch if $cgi->param('last_on') && $cgi->param('last_text');
   &companysearch if $cgi->param('company_on') && $cgi->param('company_text');
   &referralsearch if $cgi->param('referral_custnum');
+
+  @cust_main = grep { $_->ncancelled_pkgs || ! $_->all_pkgs } @cust_main
+    if $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
+       || ( $conf->exists('hidecancelledcustomers')
+             && ! $cgi->param('showcancelledcustomers') );
 }
 
-@cust_main = grep { $_->ncancelled_pkgs || ! $_->all_pkgs } @cust_main
-  if $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
-     || ( $conf->exists('hidecancelledcustomers')
-           && ! $cgi->param('showcancelledcustomers') );
 if ( $conf->exists('hidecancelledpackages' ) ) {
   %all_pkgs = map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
 } else {
@@ -101,19 +178,47 @@ if ( scalar(@cust_main) == 1 && ! $cgi->param('referral_custnum') ) {
   eidiot "No matching customers found!\n";
 } else { 
 
-  my $total = scalar(@cust_main);
+  $total ||= scalar(@cust_main);
   print header("Customer Search Results",menubar(
     'Main Menu', popurl(2)
   )), "$total matching customers found ";
+
+  my $pager = '';
+  if ( $total != scalar(@cust_main) && $maxrecords ) {
+    unless ( $offset == 0 ) {
+      $cgi->param('offset', $offset - $maxrecords);
+      $pager .= '<A HREF="'. $cgi->self_url.
+                '"><B><FONT SIZE="+1">Previous</FONT></B></A> ';
+    }
+    my $poff;
+    my $page;
+    for ( $poff = 0; $poff < $total; $poff += $maxrecords ) {
+      $page++;
+      if ( $offset == $poff ) {
+        $pager .= qq!<FONT SIZE="+2">$page</FONT> !;
+      } else {
+        $cgi->param('offset', $poff);
+        $pager .= qq!<A HREF="!. $cgi->self_url. qq!">$page</A> !;
+      }
+    }
+    unless ( $offset + $maxrecords > $total ) {
+      $cgi->param('offset', $offset + $maxrecords);
+      $pager .= '<A HREF="'. $cgi->self_url.
+                '"><B><FONT SIZE="+1">Next</FONT></B></A> ';
+    }
+  }
+  
   if ( $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
        || ( $conf->exists('hidecancelledcustomers')
             && ! $cgi->param('showcancelledcustomers')
           )
      ) {
     $cgi->param('showcancelledcustomers', 1);
+    $cgi->param('offset', 0);
     print qq!( <a href="!. $cgi->self_url. qq!">show cancelled customers</a> )!;
   } else {
     $cgi->param('showcancelledcustomers', 0);
+    $cgi->param('offset', 0);
     print qq!( <a href="!. $cgi->self_url. qq!">hide cancelled customers</a> )!;
   }
   if ( $cgi->param('referral_custnum') ) {
@@ -150,7 +255,8 @@ END
           '<NOSCRIPT> <INPUT TYPE="submit" VALUE="change"></NOSCRIPT>'.
           '</FORM>';
   }
-  print "<BR>", &table(), <<END;
+
+  print "<BR><BR>". $pager. &table(). <<END;
       <TR>
         <TH></TH>
         <TH>(bill) name</TH>
@@ -240,14 +346,12 @@ END
     print "</TR>";
   }
  
-  print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
+  print "</TABLE>$pager</BODY></HTML>";
 
 }
 
+undef $cache; #does this help?
+
 #
 
 sub last_sort {
-- 
cgit v1.2.1


From 9bb09778b787ed8a69436c8da34616e80a9addf2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Dec 2001 08:43:46 +0000
Subject: paged customer browse!

---
 httemplate/search/cust_main.cgi | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index a139f0eed..b26889d0b 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.15 2001-12-03 08:41:43 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.16 2001-12-03 08:43:46 ivan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
@@ -21,7 +21,7 @@ cgisuidsetup($cgi);
 $conf = new FS::Conf;
 $maxrecords = $conf->config('maxsearchrecordsperpage');
 
-my $cache;
+#my $cache;
 
 #my $monsterjoin = <<END;
 #cust_main left outer join (
@@ -57,26 +57,6 @@ my $cache;
 #) using (custnum)
 #END
 
-my $monsterjoin = <<END;
-cust_main left outer join (
-  ( cust_pkg left outer join part_pkg using(pkgpart)
-  ) left outer join (
-    (
-      (
-        ( cust_svc left outer join part_svc using (svcpart)
-        ) left outer join (
-          svc_acct left outer join (
-            select svcnum, domain, catchall from svc_domain
-            ) as svc_acct_domsvc (
-              svc_acct_svcnum, svc_acct_domain, svc_acct_catchall
-          ) on svc_acct.domsvc = svc_acct_domsvc.svc_acct_svcnum
-        ) using (svcnum)
-      ) left outer join svc_domain using(svcnum)
-    ) left outer join svc_forward using(svcnum)
-  ) using (pkgnum)
-) using (custnum)
-END
-
 $orderby = ''; #removeme
 
 $limit = '';
@@ -350,7 +330,7 @@ END
 
 }
 
-undef $cache; #does this help?
+#undef $cache; #does this help?
 
 #
 
-- 
cgit v1.2.1


From 63ec39a8c2a32b5ac325c4973945a26398678347 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Dec 2001 10:59:25 +0000
Subject: paged package browse

---
 httemplate/search/cust_main.cgi |   8 ++-
 httemplate/search/cust_pkg.cgi  | 127 ++++++++++++++++++++++++++++++----------
 2 files changed, 101 insertions(+), 34 deletions(-)

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index b26889d0b..d5bc17aec 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,15 +1,17 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.16 2001-12-03 08:43:46 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.17 2001-12-03 10:59:25 ivan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
 #use vars qw( $conf %all_pkgs $cgi @cust_main $sortby );
-use vars qw( $conf %all_pkgs $cgi @cust_main $sortby $orderby $maxrecords $limit $offset );
+use vars qw( $conf %all_pkgs $cgi @cust_main $sortby
+             $orderby $maxrecords $limit $offset );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use IO::Handle;
 use String::Approx qw(amatch);
 use FS::UID qw(dbh cgisuidsetup);
+use FS::Conf;
 use FS::Record qw(qsearch qsearchs dbdef jsearch);
 use FS::CGI qw(header menubar eidiot popurl table);
 use FS::cust_main;
@@ -163,6 +165,7 @@ if ( scalar(@cust_main) == 1 && ! $cgi->param('referral_custnum') ) {
     'Main Menu', popurl(2)
   )), "$total matching customers found ";
 
+  #begin pager
   my $pager = '';
   if ( $total != scalar(@cust_main) && $maxrecords ) {
     unless ( $offset == 0 ) {
@@ -187,6 +190,7 @@ if ( scalar(@cust_main) == 1 && ! $cgi->param('referral_custnum') ) {
                 '"><B><FONT SIZE="+1">Next</FONT></B></A> ';
     }
   }
+  #end pager
   
   if ( $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
        || ( $conf->exists('hidecancelledcustomers')
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 93ce7ae29..e862cefab 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,11 +1,13 @@
 <%
-# <!-- $Id: cust_pkg.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
+# <!-- $Id: cust_pkg.cgi,v 1.7 2001-12-03 10:59:25 ivan Exp $ -->
 
 use strict;
-use vars qw ( $cgi @cust_pkg $sortby $query %part_pkg );
+use vars qw ( $cgi @cust_pkg $sortby $query %part_pkg
+              $conf $maxrecords $limit $offset );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
+use FS::UID qw(dbh cgisuidsetup);
+use FS::Conf;
 use FS::Record qw(qsearch qsearchs dbdef);
 use FS::CGI qw(header eidiot popurl table);
 use FS::cust_pkg;
@@ -16,40 +18,79 @@ use FS::cust_main;
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
+$conf = new FS::Conf;
+$maxrecords = $conf->config('maxsearchrecordsperpage');
+
 my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
 
+$limit = '';
+$limit .= "LIMIT $maxrecords" if $maxrecords;
+
+$offset = $cgi->param('offset') || 0;
+$limit .= " OFFSET $offset" if $offset;
+
+my $total;
+
 ($query) = $cgi->keywords;
+my $unconf = '';
 #this tree is a little bit redundant
 if ( $query eq 'pkgnum' ) {
   $sortby=\*pkgnum_sort;
-  @cust_pkg=qsearch('cust_pkg',{});
+
+
 } elsif ( $query eq 'APKG_pkgnum' ) {
+
   $sortby=\*pkgnum_sort;
-  @cust_pkg=();
-  #perhaps this should go in cust_pkg as a qsearch-like constructor?
-  my($cust_pkg);
-  foreach $cust_pkg (qsearch('cust_pkg',{})) {
-    my($flag)=0;
-    my($pkg_svc);
-    PKG_SVC: 
-    foreach $pkg_svc (qsearch('pkg_svc',{ 'pkgpart' => $cust_pkg->pkgpart })) {
-      if ( $pkg_svc->quantity 
-           > scalar(qsearch('cust_svc',{
-               'pkgnum' => $cust_pkg->pkgnum,
-               'svcpart' => $pkg_svc->svcpart,
-             }))
-         )
-      {
-        $flag=1;
-        last PKG_SVC;
-      }
-    }
-    push @cust_pkg, $cust_pkg if $flag;
-  }
+
+  $unconf = "
+    WHERE 0 <
+      ( SELECT count(*) FROM pkg_svc
+          WHERE pkg_svc.pkgpart = cust_pkg.pkgpart
+            AND pkg_svc.quantity > ( SELECT count(*) FROM cust_svc
+                                       WHERE cust_svc.pkgnum = cust_pkg.pkgnum
+                                         AND cust_svc.svcpart = pkg_svc.svcpart
+                                   )
+      )
+  ";
+
+  #@cust_pkg=();
+  ##perhaps this should go in cust_pkg as a qsearch-like constructor?
+  #my($cust_pkg);
+  #foreach $cust_pkg (
+  #  qsearch('cust_pkg',{}, '', "ORDER BY pkgnum $limit" )
+  #) {
+  #  my($flag)=0;
+  #  my($pkg_svc);
+  #  PKG_SVC: 
+  #  foreach $pkg_svc (qsearch('pkg_svc',{ 'pkgpart' => $cust_pkg->pkgpart })) {
+  #    if ( $pkg_svc->quantity 
+  #         > scalar(qsearch('cust_svc',{
+  #             'pkgnum' => $cust_pkg->pkgnum,
+  #             'svcpart' => $pkg_svc->svcpart,
+  #           }))
+  #       )
+  #    {
+  #      $flag=1;
+  #      last PKG_SVC;
+  #    }
+  #  }
+  #  push @cust_pkg, $cust_pkg if $flag;
+  #}
+  
 } else {
   die "Empty QUERY_STRING!";
 }
 
+my $statement = "SELECT COUNT(*) FROM cust_pkg $unconf";
+my $sth = dbh->prepare($statement)
+  or die dbh->errstr. " doing $statement";
+$sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
+
+$total = @{$sth->fetchrow_arrayref}[0];
+
+@cust_pkg = qsearch('cust_pkg',{}, '', "$unconf ORDER BY pkgnum $limit" );
+
+
 if ( scalar(@cust_pkg) == 1 ) {
   my($pkgnum)=$cust_pkg[0]->pkgnum;
   print $cgi->redirect(popurl(2). "view/cust_pkg.cgi?$pkgnum");
@@ -57,9 +98,35 @@ if ( scalar(@cust_pkg) == 1 ) {
 } elsif ( scalar(@cust_pkg) == 0 ) { #error
   eidiot("No packages found");
 } else {
-  my($total)=scalar(@cust_pkg);
+  $total ||= scalar(@cust_pkg);
+
+  my $pager = '';
+  if ( $total != scalar(@cust_pkg) && $maxrecords ) {
+    unless ( $offset == 0 ) {
+      $cgi->param('offset', $offset - $maxrecords);
+      $pager .= '<A HREF="'. $cgi->self_url.
+                '"><B><FONT SIZE="+1">Previous</FONT></B></A> ';
+    }
+    my $poff;
+    my $page;
+    for ( $poff = 0; $poff < $total; $poff += $maxrecords ) {
+      $page++;
+      if ( $offset == $poff ) {
+        $pager .= qq!<FONT SIZE="+2">$page</FONT> !;
+      } else {
+        $cgi->param('offset', $poff);
+        $pager .= qq!<A HREF="!. $cgi->self_url. qq!">$page</A> !;
+      }
+    }
+    unless ( $offset + $maxrecords > $total ) {
+      $cgi->param('offset', $offset + $maxrecords);
+      $pager .= '<A HREF="'. $cgi->self_url.
+                '"><B><FONT SIZE="+1">Next</FONT></B></A> ';
+    }
+  }
+  
   print header('Package Search Results',''),
-        "$total matching packages found<BR>", &table(), <<END;
+        "$total matching packages found<BR><BR>$pager", &table(), <<END;
       <TR>
         <TH>Package</TH>
         <TH><FONT SIZE=-1>Cust#</FONT></TH>
@@ -153,11 +220,7 @@ END
   }
     print '</TR>';
  
-  print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
+  print "</TABLE>$pager</BODY></HTML>";
 
 }
 
-- 
cgit v1.2.1


From 301ef098a56e1fc011d26d1f108a48e99ad701f4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Dec 2001 11:33:19 +0000
Subject: paged service browse!!

---
 httemplate/search/cust_main.cgi |   4 +-
 httemplate/search/cust_pkg.cgi  |  10 ++--
 httemplate/search/svc_acct.cgi  | 103 +++++++++++++++++++++++++++++-----------
 3 files changed, 83 insertions(+), 34 deletions(-)

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index d5bc17aec..b9b1d1fb2 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.17 2001-12-03 10:59:25 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.18 2001-12-03 11:33:19 ivan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
@@ -110,7 +110,7 @@ if ( $cgi->param('browse') ) {
     or die dbh->errstr. " doing $statement";
   $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
 
-  $total = @{$sth->fetchrow_arrayref}[0];
+  $total = $sth->fetchrow_arrayref->[0];
 
   my @just_cust_main = qsearch('cust_main',{}, '',
     "$ncancelled $orderby $limit"
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index e862cefab..9f13dbb33 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_pkg.cgi,v 1.7 2001-12-03 10:59:25 ivan Exp $ -->
+# <!-- $Id: cust_pkg.cgi,v 1.8 2001-12-03 11:33:19 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi @cust_pkg $sortby $query %part_pkg
@@ -31,13 +31,11 @@ $limit .= " OFFSET $offset" if $offset;
 
 my $total;
 
-($query) = $cgi->keywords;
 my $unconf = '';
-#this tree is a little bit redundant
+($query) = $cgi->keywords;
 if ( $query eq 'pkgnum' ) {
   $sortby=\*pkgnum_sort;
 
-
 } elsif ( $query eq 'APKG_pkgnum' ) {
 
   $sortby=\*pkgnum_sort;
@@ -86,7 +84,7 @@ my $sth = dbh->prepare($statement)
   or die dbh->errstr. " doing $statement";
 $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
 
-$total = @{$sth->fetchrow_arrayref}[0];
+$total = $sth->fetchrow_arrayref->[0];
 
 @cust_pkg = qsearch('cust_pkg',{}, '', "$unconf ORDER BY pkgnum $limit" );
 
@@ -100,6 +98,7 @@ if ( scalar(@cust_pkg) == 1 ) {
 } else {
   $total ||= scalar(@cust_pkg);
 
+  #begin pager
   my $pager = '';
   if ( $total != scalar(@cust_pkg) && $maxrecords ) {
     unless ( $offset == 0 ) {
@@ -124,6 +123,7 @@ if ( scalar(@cust_pkg) == 1 ) {
                 '"><B><FONT SIZE="+1">Next</FONT></B></A> ';
     }
   }
+  #end pager
   
   print header('Package Search Results',''),
         "$total matching packages found<BR><BR>$pager", &table(), <<END;
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index fb970e966..8f7126ea8 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,8 +1,9 @@
 <%
-# <!-- $Id: svc_acct.cgi,v 1.8 2001-10-30 14:54:07 ivan Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.9 2001-12-03 11:33:19 ivan Exp $ -->
 
 use strict;
-use vars qw( $cgi @svc_acct $sortby $query $mydomain );
+use vars qw( $cgi @svc_acct $sortby $query $mydomain
+             $conf $maxrecords $limit $offset );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -16,41 +17,61 @@ $mydomain = '';
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
+$conf = new FS::Conf;
+$maxrecords = $conf->config('maxsearchrecordsperpage');
+
+my $orderby = ''; #removeme
+
+$limit = '';
+$limit .= "LIMIT $maxrecords" if $maxrecords;
+
+$offset = $cgi->param('offset') || 0;
+$limit .= " OFFSET $offset" if $offset;
+
+my $total;
+
 ($query)=$cgi->keywords;
 $query ||= ''; #to avoid use of unitialized value errors
-#this tree is a little bit redundant
+
+my $unlinked = '';
+if ( $query =~ /^UN_(.*)$/ ) {
+  $query = $1;
+  $unlinked = '
+    WHERE 0 <
+      ( SELECT count(*) FROM cust_svc
+          WHERE cust_svc.svcnum = svc_acct.svcnum
+            AND pkgnum IS NULL
+      )
+  ';
+}
+
 if ( $query eq 'svcnum' ) {
   $sortby=\*svcnum_sort;
-  @svc_acct=qsearch('svc_acct',{});
+  $orderby = 'ORDER BY svcnum';
 } elsif ( $query eq 'username' ) {
   $sortby=\*username_sort;
-  @svc_acct=qsearch('svc_acct',{});
+  $orderby = 'ORDER BY username';
 } elsif ( $query eq 'uid' ) {
   $sortby=\*uid_sort;
-  @svc_acct=grep $_->uid ne '', qsearch('svc_acct',{});
-} elsif ( $query eq 'UN_svcnum' ) {
-  $sortby=\*svcnum_sort;
-  @svc_acct = grep qsearchs('cust_svc',{
-      'svcnum' => $_->svcnum,
-      'pkgnum' => '',
-    }), qsearch('svc_acct',{});
-} elsif ( $query eq 'UN_username' ) {
-  $sortby=\*username_sort;
-  @svc_acct = grep qsearchs('cust_svc',{
-      'svcnum' => $_->svcnum,
-      'pkgnum' => '',
-    }), qsearch('svc_acct',{});
-} elsif ( $query eq 'UN_uid' ) {
-  $sortby=\*uid_sort;
-  @svc_acct = grep qsearchs('cust_svc',{
-      'svcnum' => $_->svcnum,
-      'pkgnum' => '',
-    }), qsearch('svc_acct',{});
+  $orderby = ( $unlinked ? 'AND' : 'WHERE' ). 'uid IS NOT NULL ORDER BY uid';
 } else {
   $sortby=\*uid_sort;
   &usernamesearch;
 }
 
+if ( $query eq 'svcnum' || $query eq 'username' || $query eq 'uid' ) {
+
+  my $statement = "SELECT COUNT(*) FROM svc_acct $unlinked";
+  my $sth = dbh->prepare($statement)
+    or die dbh->errstr. " doing $statement";
+  $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
+
+  $total = $sth->fetchrow_arrayref->[0];
+
+  @svc_acct = qsearch('svc_acct', {}, '', "$unlinked $orderby $limit");
+
+}
+
 if ( scalar(@svc_acct) == 1 ) {
   my($svcnum)=$svc_acct[0]->svcnum;
   print $cgi->redirect(popurl(2). "view/svc_acct.cgi?$svcnum");  #redirect
@@ -58,9 +79,37 @@ if ( scalar(@svc_acct) == 1 ) {
 } elsif ( scalar(@svc_acct) == 0 ) { #error
   idiot("Account not found");
 } else {
-  my($total)=scalar(@svc_acct);
+  $total ||= scalar(@svc_acct);
+
+  #begin pager
+  my $pager = '';
+  if ( $total != scalar(@svc_acct) && $maxrecords ) {
+    unless ( $offset == 0 ) {
+      $cgi->param('offset', $offset - $maxrecords);
+      $pager .= '<A HREF="'. $cgi->self_url.
+                '"><B><FONT SIZE="+1">Previous</FONT></B></A> ';
+    }
+    my $poff;
+    my $page;
+    for ( $poff = 0; $poff < $total; $poff += $maxrecords ) {
+      $page++;
+      if ( $offset == $poff ) {
+        $pager .= qq!<FONT SIZE="+2">$page</FONT> !;
+      } else {
+        $cgi->param('offset', $poff);
+        $pager .= qq!<A HREF="!. $cgi->self_url. qq!">$page</A> !;
+      }
+    }
+    unless ( $offset + $maxrecords > $total ) {
+      $cgi->param('offset', $offset + $maxrecords);
+      $pager .= '<A HREF="'. $cgi->self_url.
+                '"><B><FONT SIZE="+1">Next</FONT></B></A> ';
+    }
+  }
+  #end pager
+
   print header("Account Search Results",''),
-        "$total matching accounts found",
+        "$total matching accounts found<BR><BR>$pager",
         &table(), <<END;
       <TR>
         <TH><FONT SIZE=-1>#</FONT></TH>
@@ -165,7 +214,7 @@ END
 
   }
  
-  print '</TABLE>';
+  print '</TABLE>$pager<BR>';
 
   if ( $mydomain ) {
     print "<BR><FONT COLOR=\"#FF0000\">*</FONT> The <I>$mydomain</I> domain ".
-- 
cgit v1.2.1


From b97e635c30397464a0161feb9f2aa1b472710410 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Dec 2001 13:10:16 +0000
Subject: from Dave Burgess <burgess@neonramp.com>:

 I had to change line 104 in /edit/svc_forward.cgi and add 'my' as the
 qualifier on the LHS of the assignment.  This also solves the
 problem with a similar error on the RHS of line 105.  It also seems to make
 the routine work fairly reliably (it has been problematic for me in the
 past).
---
 httemplate/edit/svc_forward.cgi | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index caf6ee76d..75cd9fc7f 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_forward.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
+# <!-- $Id: svc_forward.cgi,v 1.7 2001-12-04 13:10:16 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_forward $pkgnum $svcpart
@@ -99,10 +99,13 @@ if ($pkgnum) {
     foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
                                               #record(s) in cust_svc ( for this
                                               #pkgnum ! )
-      my($i_cust_svc);
-      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
-        $svc_acct=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
-        $email{$svc_acct->getfield('svcnum')}=$svc_acct->email;
+      foreach my $i_cust_svc (
+        qsearch( 'cust_svc', { 'pkgnum'  => $cust_pkgnum,
+                               'svcpart' => $acct_svcpart } )
+      ) {
+        my $svc_acct =
+          qsearchs( 'svc_acct', { 'svcnum' => $i_cust_svc->svcnum } );
+        $email{$svc_acct->svcnum} = $svc_acct->email;
       }  
     }
   }
-- 
cgit v1.2.1


From 05feb08987abb48996f97a4938a3ef507584ae23 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 8 Dec 2001 10:01:42 +0000
Subject: radiusprepend config file for DEFAULT entries etc.

---
 FS/FS/Conf.pm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 8195fc55e..4ce9da1de 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -129,7 +129,9 @@ sub set {
     warn "[FS::Conf] SET $file\n" if $DEBUG;
 #    warn "$dir" if is_tainted($dir);
 #    warn "$dir" if is_tainted($file);
+    chmod 0644, "$dir/$file";
     my $fh = new IO::File ">$dir/$file" or return;
+    chmod 0644, "$dir/$file";
     print $fh "$value\n";
   }
 }
@@ -622,6 +624,13 @@ httemplate/docs/config.html
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'radiusprepend',
+    'section'     => 'radius',
+    'description' => 'The contents will be prepended to the top of the RADIUS users file (text exports only).',
+    'type'        => 'textarea',
+  },
+
   {
     'key'         => 'textradiusprepend',
     'section'     => 'depreciated',
-- 
cgit v1.2.1


From 9368defd2eb92a3be0a2d6ddda712440c2d015ae Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 8 Dec 2001 10:03:11 +0000
Subject: fix logic error creating invoice line items

---
 FS/FS/cust_main.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 054175670..8a7d0ca30 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1026,7 +1026,8 @@ sub bill {
   my $invnum = $cust_bill->invnum;
   my $cust_bill_pkg;
   foreach $cust_bill_pkg ( @cust_bill_pkg ) {
-    #warn $cust_bill_pkg->invnum($invnum);
+    #warn $invnum;
+    $cust_bill_pkg->invnum($invnum);
     $error = $cust_bill_pkg->insert;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
@@ -1879,7 +1880,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.47 2001-11-12 13:19:52 ivan Exp $
+$Id: cust_main.pm,v 1.48 2001-12-08 10:03:11 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 357faffb9564be9d77815cde87645efd955adb4d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 8 Dec 2001 10:07:27 +0000
Subject: get custnum from invnum before trying to use custnum!

---
 FS/FS/cust_pay.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index daf5b5263..21365c1eb 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -99,12 +99,6 @@ sub insert {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  my $cust_main = qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
-  my $old_balance = $cust_main->balance;
-
-  my $error = $self->check;
-  return $error if $error;
-
   if ( $self->invnum ) {
     my $cust_bill = qsearchs('cust_bill', { 'invnum' => $self->invnum } )
       or do {
@@ -114,6 +108,12 @@ sub insert {
     $self->custnum($cust_bill->custnum );
   }
 
+  my $cust_main = qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+  my $old_balance = $cust_main->balance;
+
+  my $error = $self->check;
+  return $error if $error;
+
   $error = $self->SUPER::insert;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
@@ -304,7 +304,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.8 2001-10-09 23:10:16 ivan Exp $
+$Id: cust_pay.pm,v 1.9 2001-12-08 10:07:27 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From b6724f3cf6c4b77ab66d259920042f12e46cf924 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 8 Dec 2001 10:08:50 +0000
Subject: need a POST here; browsers (especially IE) are unhappy with the
 default GET

---
 httemplate/config/config.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index f9d7297ec..56da0698a 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -2,7 +2,7 @@
 
 <% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
 
-<form action="config-process.cgi">
+<form action="config-process.cgi" METHOD="POST">
 
 <% foreach my $section ( qw(required billing username password UI session
                             shell mail radius apache BIND
-- 
cgit v1.2.1


From d402957b601504e9f47fc2f4e6aebe80e015e3ef Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 9 Dec 2001 23:31:55 +0000
Subject: harmless? missing ;

---
 httemplate/search/svc_acct.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 8f7126ea8..f86794517 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_acct.cgi,v 1.9 2001-12-03 11:33:19 ivan Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.10 2001-12-09 23:31:55 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi @svc_acct $sortby $query $mydomain
@@ -221,7 +221,7 @@ END
           "is contained in your legacy <CODE>domain</CODE> ".
           "<A HREF=\"${p}docs/config.html#domain\">configuration file</A>.  ".
           "You should run the <CODE>bin/fs-migrate-svc_acct_sm</CODE> script ".
-          "to create a proper svc_domain record for this domain."
+          "to create a proper svc_domain record for this domain.";
   }
 
   print '</BODY></HTML>';
-- 
cgit v1.2.1


From 4ad85201c2e6af983cb986d542cff18f9ce4fe9d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 Dec 2001 00:44:56 +0000
Subject: visual glitch: oops, $pager wasn't getting substitued.

---
 httemplate/search/svc_acct.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index f86794517..1cb503103 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_acct.cgi,v 1.10 2001-12-09 23:31:55 ivan Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.11 2001-12-10 00:44:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi @svc_acct $sortby $query $mydomain
@@ -214,7 +214,7 @@ END
 
   }
  
-  print '</TABLE>$pager<BR>';
+  print "</TABLE>$pager<BR>";
 
   if ( $mydomain ) {
     print "<BR><FONT COLOR=\"#FF0000\">*</FONT> The <I>$mydomain</I> domain ".
-- 
cgit v1.2.1


From f80ce3a22396ec4290a6fdd8ae74cea05f335ec8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 Dec 2001 04:54:57 +0000
Subject: typo noticed by Dave Burgess <burgess@www.cynjut.net>, thanks.

---
 httemplate/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index 97016e680..85912c24f 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -59,7 +59,7 @@
               <LI>unlinked domains (<A HREF="search/svc_domain.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?UN_domain">by domain</A>)
             </UL>
           <LI><A HREF="browse/nas.cgi">NAS ports</A>
-          <LI><A HREF="browse/queue.cgi">Joe queue</A>
+          <LI><A HREF="browse/queue.cgi">Job queue</A>
           <LI><A HREF="browse/cust_pay_batch.cgi">Pending credit card batch</A>
         </ul>
     </ul>
-- 
cgit v1.2.1


From c88ce379ab3075629aed1c674124c8ca13ad7dbe Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 Dec 2001 12:18:53 +0000
Subject: Pg datatype pain

---
 FS/FS/Record.pm | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index a04ddb982..995e4bdc2 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -7,6 +7,7 @@ use Exporter;
 use Carp qw(carp cluck croak confess);
 use File::CounterFile;
 use Locale::Country;
+use DBI qw(:sql_types);
 use DBIx::DBSchema 0.19;
 use FS::UID qw(dbh checkruid getotaker datasrc driver_name);
 use FS::SearchCache;
@@ -225,9 +226,26 @@ sub qsearch {
   my $sth = $dbh->prepare($statement)
     or croak "$dbh->errstr doing $statement";
 
-  $sth->execute( map $record->{$_},
+  my $bind = 1;
+
+  foreach my $field (
     grep defined( $record->{$_} ) && $record->{$_} ne '', @fields
-  ) or croak "Error executing \"$statement\": ". $sth->errstr;
+  ) {
+    if ( $record->{$field} =~ /^\d+(\.\d+)?$/
+         && $dbdef->table($table)->column($field)->type =~ /(int)/i
+    ) {
+      $sth->bind_param($bind++, $record->{$field}, SQL_INTEGER );
+    } else {
+      $sth->bind_param($bind++, $record->{$field}, SQL_VARCHAR );
+    }
+  }
+
+#  $sth->execute( map $record->{$_},
+#    grep defined( $record->{$_} ) && $record->{$_} ne '', @fields
+#  ) or croak "Error executing \"$statement\": ". $sth->errstr;
+
+  $sth->execute or croak "Error executing \"$statement\": ". $sth->errstr;
+
   $dbh->commit or croak $dbh->errstr if $FS::UID::AutoCommit;
 
   if ( eval 'scalar(@FS::'. $table. '::ISA);' ) {
-- 
cgit v1.2.1


From 03dcc6e0f48fae0b892dbd36229884e684b94049 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Dec 2001 10:38:56 +0000
Subject: radiusprepend config file for export add Archive::Tar to docs

---
 bin/svc_acct.export          | 10 +++++++++-
 httemplate/docs/install.html |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 727186085..8c408a2e8 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.26 2001-10-24 15:29:30 ivan Exp $
+# $Id: svc_acct.export,v 1.27 2001-12-11 10:38:56 ivan Exp $
 #
 # Create and export password, radius and vpopmail password files:
 # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
@@ -68,6 +68,12 @@ my $textradiusprepend =
 
 warn "using depriciated textradiusprepend file" if $textradiusprepend;
 
+
+my $radiusprepend =
+  $conf->exists('radiusprepend')
+    ? $conf->config('radiusprepend')
+    : '';
+
 my @vpopmailmachines = $conf->config('vpopmailmachines')
   if $conf->exists('vpopmailmachines');
 my $vpopmailrestart = '';
@@ -190,6 +196,8 @@ if ( $icradiusmachines ) {
 
 setpriority(0,0,10);
 
+print USERS "$radiusprepend\n";
+
 my %usernames;  ## this hack helps keep the passwd files sane
 my @sendmail;
 
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 60f549edb..0bf2c1616 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -36,6 +36,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=FreezeThaw">FreezeThaw</a>
       <li><a href="http://search.cpan.org/search?dist=String-Approx">String-Approx</a>
       <li><a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>
+      <li><a href="http://search.cpan.org/search?dist=Archive-Tar">Archive-Tar</a>
       <li><a href="http://search.cpan.org/search?dist=DBI">DBI</a>
       <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a>
       <li><a href="http://search.cpan.org/search?dist=DBIx-DataSource">DBIx-DataSource</a>
-- 
cgit v1.2.1


From b5690431335934990ca157a885d5762f66728203 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Dec 2001 21:26:58 +0000
Subject: missing space in SQL, oops

---
 httemplate/search/svc_acct.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 1cb503103..c9d1eb6ca 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_acct.cgi,v 1.11 2001-12-10 00:44:56 ivan Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.12 2001-12-11 21:26:58 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi @svc_acct $sortby $query $mydomain
@@ -53,7 +53,7 @@ if ( $query eq 'svcnum' ) {
   $orderby = 'ORDER BY username';
 } elsif ( $query eq 'uid' ) {
   $sortby=\*uid_sort;
-  $orderby = ( $unlinked ? 'AND' : 'WHERE' ). 'uid IS NOT NULL ORDER BY uid';
+  $orderby = ( $unlinked ? 'AND' : 'WHERE' ). ' uid IS NOT NULL ORDER BY uid';
 } else {
   $sortby=\*uid_sort;
   &usernamesearch;
-- 
cgit v1.2.1


From aa858d1764680bb3a195a574e7daec0feb206dbf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 Dec 2001 07:59:33 +0000
Subject: use pwd_mkdb to install /etc/master.passwd.new instead of moving it
 into place

---
 bin/svc_acct.export | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 8c408a2e8..3ac7a4f8f 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.27 2001-12-11 10:38:56 ivan Exp $
+# $Id: svc_acct.export,v 1.28 2001-12-12 07:59:33 ivan Exp $
 #
 # Create and export password, radius and vpopmail password files:
 # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
@@ -573,7 +573,8 @@ foreach $bsdshellmachine (@bsdshellmachines) {
   ssh("root\@$bsdshellmachine",
     "( ".
       "mv /etc/passwd.new /etc/passwd; ".
-      "mv /etc/master.passwd.new /etc/master.passwd; ".
+      #"mv /etc/master.passwd.new /etc/master.passwd; ".
+      "pwd_mkdb /etc/master.passwd.new; ".
     " )"
   )
     == 0 or die "ssh error: $!";
-- 
cgit v1.2.1


From aa0a7b4128ed5cf56684378c9cb6ebc1c3ec8c1a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 Dec 2001 19:42:21 +0000
Subject: allow >8 character passwords in web interface

---
 httemplate/edit/cust_main.cgi |  6 ++++--
 httemplate/edit/svc_acct.cgi  | 10 +++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 260d77e6c..3a29e2579 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.14 2001-11-21 03:42:13 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.15 2001-12-12 19:42:21 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -434,11 +434,13 @@ unless ( $custnum ) {
     #$ulen = $svc_acct->dbdef_table->column('username')->length;
     $ulen = dbdef->table('svc_acct')->column('username')->length;
     $ulen2 = $ulen+2;
+    my $passwordmax = $conf->config('passwordmax') || 8;
+    my $pmax2 = $passwordmax + 2;
     print <<END;
 <TR><TD ALIGN="right">Username</TD>
 <TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
 <TR><TD ALIGN="right">Password</TD>
-<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8>
+<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=$pmax2 MAXLENGTH=$passwordmax>
 (blank to generate)</TD></TR>
 END
 
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 4911e0ffd..ec4f66e20 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,9 +1,10 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.12 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.13 2001-12-12 19:42:21 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
-             $part_svc $svc $otaker $username $password $ulen $ulen2 $p1
+             $part_svc $svc $otaker $username $password $ulen $ulen2 
+             $pmax $pmax2 $p1
              $popnum $domsvc $uid $gid $finger $dir $shell $quota $slipip
              %svc_domain );
 use CGI;
@@ -100,6 +101,9 @@ if ( $svc_acct->_password ) {
 $ulen = $svc_acct->dbdef_table->column('username')->length;
 $ulen2 = $ulen+2;
 
+$pmax = $conf->config('passwordmax') || 8;
+$pmax2 = $pmax+2;
+
 $p1 = popurl(1);
 print header("$action $svc account");
 
@@ -121,7 +125,7 @@ print &itable("#cccccc",2), <<END;
 <TR><TD ALIGN="right">Username</TD>
 <TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
 <TR><TD ALIGN="right">Password</TD>
-<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8>
+<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=$pmax2 MAXLENGTH=$pmax>
 (blank to generate)</TD>
 </TR>
 END
-- 
cgit v1.2.1


From 29acbc574cb1e29032c634e1f6ac63e92d14df3b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 13 Dec 2001 09:17:52 +0000
Subject: added util to set invoice destinations

---
 FS/bin/freeside-setinvoice | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 FS/bin/freeside-setinvoice

diff --git a/FS/bin/freeside-setinvoice b/FS/bin/freeside-setinvoice
new file mode 100644
index 000000000..aeaa0bb1b
--- /dev/null
+++ b/FS/bin/freeside-setinvoice
@@ -0,0 +1,42 @@
+#!/usr/bin/perl
+
+use strict;
+use FS::UID qw(adminsuidsetup);
+use FS::Conf;
+use FS::Record qw(qsearch);
+use FS::cust_main;
+use FS::svc_acct;
+
+&untaint_argv;  #what it sounds like  (eww)
+my $user = shift or die &usage;
+
+adminsuidsetup $user;
+
+foreach my $cust_main (
+   grep { ! scalar($_->invoicing_list) }
+     qsearch( 'cust_main', {} )
+) {
+  my @dest;
+  my @cust_pkg = $cust_main->ncancelled_pkgs;
+  foreach my $cust_pkg ( @cust_pkg ) {
+    foreach my $cust_svc ( $cust_pkg->cust_svc ) {
+      my $svc_acct = qsearchs( 'svc_acct', {} );
+      push @dest, $svc_acct->svcnum if $svc_acct;
+    }
+  }
+  push @dest, 'POST' unless @dest;
+  $cust_main->invoicing_list(@dest);
+}
+
+sub untaint_argv {
+  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
+    $ARGV[$_] =~ /^(.*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
+    $ARGV[$_]=$1;
+  }
+}
+
+sub usage {
+  die "Usage:\n\n  freeside-setinvoice user\n";
+}
+
+
-- 
cgit v1.2.1


From 156535a911a8ad4315dcdee397cf8aff2071b520 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 13 Dec 2001 17:52:37 +0000
Subject: fix setinvoice script

---
 FS/bin/freeside-setinvoice | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/bin/freeside-setinvoice b/FS/bin/freeside-setinvoice
index aeaa0bb1b..3eb75f8b7 100644
--- a/FS/bin/freeside-setinvoice
+++ b/FS/bin/freeside-setinvoice
@@ -3,7 +3,7 @@
 use strict;
 use FS::UID qw(adminsuidsetup);
 use FS::Conf;
-use FS::Record qw(qsearch);
+use FS::Record qw(qsearch qsearchs);
 use FS::cust_main;
 use FS::svc_acct;
 
@@ -20,7 +20,7 @@ foreach my $cust_main (
   my @cust_pkg = $cust_main->ncancelled_pkgs;
   foreach my $cust_pkg ( @cust_pkg ) {
     foreach my $cust_svc ( $cust_pkg->cust_svc ) {
-      my $svc_acct = qsearchs( 'svc_acct', {} );
+      my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $cust_svc->svcnum } );
       push @dest, $svc_acct->svcnum if $svc_acct;
     }
   }
-- 
cgit v1.2.1


From f78c8ea9034ef02671aa68512dc5458a0c693cc0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 13 Dec 2001 18:37:25 +0000
Subject: okay, it should really work now

---
 FS/bin/freeside-setinvoice | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-setinvoice b/FS/bin/freeside-setinvoice
index 3eb75f8b7..708e2fa30 100644
--- a/FS/bin/freeside-setinvoice
+++ b/FS/bin/freeside-setinvoice
@@ -25,7 +25,7 @@ foreach my $cust_main (
     }
   }
   push @dest, 'POST' unless @dest;
-  $cust_main->invoicing_list(@dest);
+  $cust_main->invoicing_list(\@dest);
 }
 
 sub untaint_argv {
-- 
cgit v1.2.1


From bca375bc3e1192968727473f4f59ba30ef034c3c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Dec 2001 00:17:38 +0000
Subject: style changes

---
 FS/FS/cust_main.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 8a7d0ca30..ad6d46e96 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -856,10 +856,10 @@ sub bill {
   my @cust_bill_pkg = ();
 
   foreach my $cust_pkg (
-    qsearch('cust_pkg',{'custnum'=> $self->getfield('custnum') } )
+    qsearch('cust_pkg', { 'custnum' => $self->custnum } )
   ) {
 
-    next if $cust_pkg->getfield('cancel');  
+    next if $cust_pkg->cancel;  
 
     #? to avoid use of uninitialized value errors... ?
     $cust_pkg->setfield('bill', '')
@@ -1880,7 +1880,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.48 2001-12-08 10:03:11 ivan Exp $
+$Id: cust_main.pm,v 1.49 2001-12-15 00:17:38 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From abb18df8aeb27dc49817045e217c61ba6c990ad6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Dec 2001 22:47:24 +0000
Subject: allow entering of referral customer by number as well as by link off
 the view page, courtesy of Dave Burgess <burgess@www.cynjut.net>

---
 httemplate/edit/cust_main.cgi | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 3a29e2579..6967a1e1b 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.15 2001-12-12 19:42:21 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.16 2001-12-15 22:47:24 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -133,19 +133,21 @@ if ( $custnum && ! $conf->exists('editreferrals') ) {
 
 #referring customer
 
-print qq!<BR><BR>Referring Customer: !;
+#print qq!<BR><BR>Referring Customer: !;
 if ( $cust_main->referral_custnum ) {
   my $referring_cust_main =
     qsearchs('cust_main', { custnum => $cust_main->referral_custnum } );
-  print '<A HREF="'. popurl(1). '/cust_main.cgi?'.
+  print '<BR><BR>Referring Customer: <A HREF="'. popurl(1). '/cust_main.cgi?'.
         $cust_main->referral_custnum. '">'.
         $cust_main->referral_custnum. ': '.
         ( $referring_cust_main->company
           || $referring_cust_main->last. ', '. $referring_cust_main->first ).
         '</A><INPUT TYPE="hidden" NAME="referral_custnum" VALUE="'.
         $cust_main->referral_custnum. '">';
+} elsif ( ! $conf->exists('disable_customer_referrals') ) {
+  print '<BR><BR>Referring customer number: <INPUT TYPE="text" NAME="referral_custnum" VALUE="">';
 } else {
-  print '(none)<INPUT TYPE="hidden" NAME="referral_custnum" VALUE="">';
+  print '<INPUT TYPE="hidden" NAME="referral_custnum" VALUE="">';
 }
 
 # contact info
-- 
cgit v1.2.1


From ff35c08c280ed66f88a23bd6122475362c0f8076 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Dec 2001 22:56:07 +0000
Subject: view svc_www.cgi from Dave Burgess <burgess@www.cynjut.net>, thanks

---
 httemplate/view/svc_www.cgi | 59 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 httemplate/view/svc_www.cgi

diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
new file mode 100644
index 000000000..ff9d57b5f
--- /dev/null
+++ b/httemplate/view/svc_www.cgi
@@ -0,0 +1,59 @@
+<%
+# <!-- $Id: svc_www.cgi,v 1.1 2001-12-15 22:56:07 ivan Exp $ -->
+
+use strict;
+use vars qw( $cgi $query $svcnum $svc_www $cust_svc $pkgnum
+             $cust_pkg $custnum $p $domain_record );
+             #$part_svc $p $svc_acct $email
+use CGI;
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header menubar popurl menubar);
+use FS::Record qw(qsearchs);
+use FS::svc_www;
+use FS::domain_record;
+use FS::cust_svc;
+#use FS::cust_pkg;
+#use FS::part_svc;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+$svcnum = $1;
+$svc_www = qsearchs( 'svc_www', { 'svcnum' => $svcnum } )
+  or die "svc_www: Unknown svcnum $svcnum";
+
+#false laziness w/all svc_*.cgi
+$cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } );
+$pkgnum = $cust_svc->getfield('pkgnum');
+if ($pkgnum) {
+  $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
+  $custnum = $cust_pkg->custnum;
+} else {
+  $cust_pkg = '';
+  $custnum = '';
+}
+#eofalse
+
+$domain_record = qsearchs( 'domain_record', { 'recnum' => $svc_www->recnum } )
+  or die "svc_www: Unknown recnum". $svc_www->recnum;
+
+my $www = $domain_record->reczone;
+
+$p = popurl(2);
+print header('Website View', menubar(
+  ( ( $custnum )
+    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
+        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+      )                                                                       
+    : ( "Cancel this (unaudited) website" =>
+          "${p}misc/cancel-unaudited.cgi?$svcnum" )
+  ),
+  "Main menu" => $p,
+)),
+      "Service #$svcnum",
+      "<BR>Website name: <B>$www</B>.",
+      '</BODY></HTML>',                
+;
+%>
-- 
cgit v1.2.1


From 968bee2fe4a8f00cc52525881032cf1575c640f4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Dec 2001 22:58:33 +0000
Subject: meaningful FS::cust_svc::label for svc_www records

---
 FS/FS/cust_svc.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 9bc563f40..5fca892cd 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -11,6 +11,7 @@ use FS::svc_acct;
 use FS::svc_acct_sm;
 use FS::svc_domain;
 use FS::svc_forward;
+use FS::domain_record;
 
 @ISA = qw( FS::Record );
 
@@ -184,6 +185,9 @@ sub label {
     }
   } elsif ( $svcdb eq 'svc_domain' ) {
     $tag = $svc_x->getfield('domain');
+  } elsif ( $svcdb eq 'svc_www' ) {
+    my $domain = qsearchs( 'domain_record', { 'recnum' => $svc_x->recnum } );
+    $tag = $domain->reczone;
   } else {
     cluck "warning: asked for label of unsupported svcdb; using svcnum";
     $tag = $svc_x->getfield('svcnum');
@@ -195,7 +199,7 @@ sub label {
 
 =head1 VERSION
 
-$Id: cust_svc.pm,v 1.7 2001-11-30 00:04:38 ivan Exp $
+$Id: cust_svc.pm,v 1.8 2001-12-15 22:58:33 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From b63544b9961e09bfc95908f867993f2c44139b42 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Dec 2001 22:59:35 +0000
Subject: style

---
 httemplate/view/svc_acct.cgi | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 23205ece9..7cebdf8da 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_acct.cgi,v 1.8 2001-10-30 14:54:07 ivan Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.9 2001-12-15 22:59:35 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $domain $query $svcnum $svc_acct $cust_svc $pkgnum
@@ -29,15 +29,17 @@ $svcnum = $1;
 $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
 die "Unknown svcnum" unless $svc_acct;
 
-$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+#false laziness w/all svc_*.cgi
+$cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );
 $pkgnum = $cust_svc->getfield('pkgnum');
 if ($pkgnum) {
-  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-  $custnum=$cust_pkg->getfield('custnum');
+  $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
+  $custnum = $cust_pkg->custnum;
 } else {
   $cust_pkg = '';
   $custnum = '';
 }
+#eofalse
 
 $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unknown svcpart" unless $part_svc;
-- 
cgit v1.2.1


From f1042452ad03c578088c7b43a5e8263770c365c5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 16 Dec 2001 00:55:53 +0000
Subject: fix weird rounding error: total cust_bill_pay.amount 39.9 for paynum
 240 greater than cust_pay.paid 39.90

---
 FS/FS/cust_bill_pay.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index 5ef82d658..3b95f45ab 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -95,7 +95,7 @@ sub insert {
   $pay_total += $_ foreach map { $_->amount }
     qsearch('cust_bill_pay', { 'paynum' => $self->paynum } );
 
-  if ( $pay_total > $cust_pay->paid ) {
+  if ( sprintf("%.2f", $pay_total) > sprintf("%.2f", $cust_pay->paid) ) {
     $dbh->rollback if $oldAutoCommit;
     return "total cust_bill_pay.amount $pay_total for paynum ". $self->paynum.
            " greater than cust_pay.paid ". $cust_pay->paid;
@@ -195,7 +195,7 @@ sub cust_bill {
 
 =head1 VERSION
 
-$Id: cust_bill_pay.pm,v 1.8 2001-09-03 22:07:38 ivan Exp $
+$Id: cust_bill_pay.pm,v 1.9 2001-12-16 00:55:53 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From d90a6a6e37b227e9265be011197ab20b56bfa7ca Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 16 Dec 2001 23:50:10 +0000
Subject: eek nasty bug

---
 FS/FS/cust_main.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index ad6d46e96..a36d125be 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -859,7 +859,8 @@ sub bill {
     qsearch('cust_pkg', { 'custnum' => $self->custnum } )
   ) {
 
-    next if $cust_pkg->cancel;  
+    #NO!! next if $cust_pkg->cancel;  
+    next if $cust_pkg->getfield('cancel');  
 
     #? to avoid use of uninitialized value errors... ?
     $cust_pkg->setfield('bill', '')
@@ -1880,7 +1881,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.49 2001-12-15 00:17:38 ivan Exp $
+$Id: cust_main.pm,v 1.50 2001-12-16 23:50:10 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From ff600bea7c4f34854be39bc4a6b56f20c1605c4d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 17 Dec 2001 23:59:56 +0000
Subject: fixes

 Argument "" isn't numeric in ncmp at
 /usr/local/lib/perl5/site_perl/5.005/FS/cust_bill.pm line 254.
---
 FS/FS/cust_bill.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index b65df89c4..1a2ecaf1d 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -251,7 +251,7 @@ Returns all payment applications (see L<FS::cust_bill_pay>) for this invoice.
 
 sub cust_bill_pay {
   my $self = shift;
-  sort { $a->_date <=> $b->date }
+  sort { $a->_date <=> $b->_date }
     qsearch( 'cust_bill_pay', { 'invnum' => $self->invnum } );
 }
 
@@ -493,7 +493,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.12 2001-10-15 12:16:41 ivan Exp $
+$Id: cust_bill.pm,v 1.13 2001-12-17 23:59:56 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From c52f29f23bed4af764c0a3deda0f43e2d40c8e51 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Dec 2001 01:49:35 +0000
Subject: add freeside-setinvoice to MANIFEST

fix warning:

FS::cust_main_invoice=HASH(0x90c86c4) at
/usr/local/lib/perl5/site_perl/5.005/FS/svc_acct.pm line 419.
---
 FS/FS/svc_acct.pm | 9 +++++----
 FS/MANIFEST       | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 8f9216fb7..382987e1b 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -415,9 +415,10 @@ sub delete {
   foreach my $cust_main_invoice (
     qsearch( 'cust_main_invoice', { 'dest' => $self->svcnum } )
   ) {
-    #next unless defined; #wtf is up with qsearch?
-    warn $cust_main_invoice;
-    next unless defined $cust_main_invoice;
+    unless ( defined($cust_main_invoice) ) {
+      warn "WARNING: something's wrong with qsearch";
+      next;
+    }
     my %hash = $cust_main_invoice->hash;
     $hash{'dest'} = $self->email;
     my $new = new FS::cust_main_invoice \%hash;
@@ -960,7 +961,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.55 2001-11-05 17:00:41 jeff Exp $
+$Id: svc_acct.pm,v 1.56 2001-12-18 01:49:35 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index d4bac3d73..b7804ccc3 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -8,6 +8,7 @@ bin/freeside-email
 bin/freeside-queued
 bin/freeside-apply-credits
 bin/freeside-adduser
+bin/freeside-setinvoice
 FS.pm
 FS/CGI.pm
 FS/Conf.pm
-- 
cgit v1.2.1


From 78a46db8485d62447891a73016bc0031f92adf63 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Dec 2001 06:29:30 +0000
Subject: full number in POP pulldown

---
 FS/FS/svc_acct_pop.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct_pop.pm b/FS/FS/svc_acct_pop.pm
index 243c18a8b..fa4f5c670 100644
--- a/FS/FS/svc_acct_pop.pm
+++ b/FS/FS/svc_acct_pop.pm
@@ -107,7 +107,8 @@ Returns:
 
 sub text {
   my $self = shift;
-  $self->city. ', '. $self->state. ' ('. $self->ac. ')/'. $self->exch;
+  $self->city. ', '. $self->state.
+    ' ('. $self->ac. ')/'. $self->exch. '-'. $self->loc;
 }
 
 =back
@@ -179,7 +180,7 @@ END
 
 =head1 VERSION
 
-$Id: svc_acct_pop.pm,v 1.5 2001-09-27 21:49:31 ivan Exp $
+$Id: svc_acct_pop.pm,v 1.6 2001-12-18 06:29:30 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 133be4f603b60052cb45a6e54104eed357df25df Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Dec 2001 06:38:25 +0000
Subject: show dates on package browse

---
 httemplate/search/cust_pkg.cgi | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 9f13dbb33..7426276bd 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_pkg.cgi,v 1.8 2001-12-03 11:33:19 ivan Exp $ -->
+# <!-- $Id: cust_pkg.cgi,v 1.9 2001-12-18 06:38:25 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi @cust_pkg $sortby $query %part_pkg
@@ -129,6 +129,11 @@ if ( scalar(@cust_pkg) == 1 ) {
         "$total matching packages found<BR><BR>$pager", &table(), <<END;
       <TR>
         <TH>Package</TH>
+        <TH><FONT SIZE=-1>Setup</FONT></TH>
+        <TH><FONT SIZE=-1>Next<BR>bill</FONT></TH>
+        <TH><FONT SIZE=-1>Susp.</FONT></TH>
+        <TH><FONT SIZE=-1>Expire</FONT></TH>
+        <TH><FONT SIZE=-1>Cancel</FONT></TH>
         <TH><FONT SIZE=-1>Cust#</FONT></TH>
         <TH>(bill) name</TH>
         <TH>company</TH>
@@ -154,6 +159,11 @@ END
     my($cust_main)=qsearchs('cust_main',{'custnum'=>$cust_pkg->custnum});
     my($pkgnum, $custnum, $last, $first, $company) = (
       $cust_pkg->pkgnum,
+      time2str("%D", $cust_pkg->setup ),
+      time2str("%D", $cust_pkg->bill ),
+      time2str("%D", $cust_pkg->susp ),
+      time2str("%D", $cust_pkg->expire ),
+      time2str("%D", $cust_pkg->cancel ),
       $cust_pkg->custnum,
       $cust_main ? $cust_main->last : '',
       $cust_main ? $cust_main->first : '',
-- 
cgit v1.2.1


From 428301a8083e09832ac414d2b89db26ba6ee5f4e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Dec 2001 06:45:32 +0000
Subject: oops.  *sigh*

---
 httemplate/search/cust_pkg.cgi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 7426276bd..070871e02 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_pkg.cgi,v 1.9 2001-12-18 06:38:25 ivan Exp $ -->
+# <!-- $Id: cust_pkg.cgi,v 1.10 2001-12-18 06:45:32 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi @cust_pkg $sortby $query %part_pkg
@@ -159,11 +159,11 @@ END
     my($cust_main)=qsearchs('cust_main',{'custnum'=>$cust_pkg->custnum});
     my($pkgnum, $custnum, $last, $first, $company) = (
       $cust_pkg->pkgnum,
-      time2str("%D", $cust_pkg->setup ),
-      time2str("%D", $cust_pkg->bill ),
-      time2str("%D", $cust_pkg->susp ),
-      time2str("%D", $cust_pkg->expire ),
-      time2str("%D", $cust_pkg->cancel ),
+      time2str("%D", $cust_pkg->getfield('setup') ),
+      time2str("%D", $cust_pkg->getfield('bill') ),
+      time2str("%D", $cust_pkg->getfield('susp') ),
+      time2str("%D", $cust_pkg->getfield('expire') ),
+      time2str("%D", $cust_pkg->getfield('cancel') ),
       $cust_pkg->custnum,
       $cust_main ? $cust_main->last : '',
       $cust_main ? $cust_main->first : '',
-- 
cgit v1.2.1


From a44aaabe9b21f0e474f7317852235600afcc5733 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Dec 2001 07:08:16 +0000
Subject: working dates on package browse

---
 httemplate/search/cust_pkg.cgi | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 070871e02..137dc5f19 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_pkg.cgi,v 1.10 2001-12-18 06:45:32 ivan Exp $ -->
+# <!-- $Id: cust_pkg.cgi,v 1.11 2001-12-18 07:08:16 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi @cust_pkg $sortby $query %part_pkg
@@ -157,13 +157,25 @@ END
     sort $sortby grep(!$saw{$_->pkgnum}++, @cust_pkg)
   ) {
     my($cust_main)=qsearchs('cust_main',{'custnum'=>$cust_pkg->custnum});
-    my($pkgnum, $custnum, $last, $first, $company) = (
+    my($pkgnum, $setup, $bill, $susp, $expire, $cancel,
+       $custnum, $last, $first, $company
+    ) = (
       $cust_pkg->pkgnum,
-      time2str("%D", $cust_pkg->getfield('setup') ),
-      time2str("%D", $cust_pkg->getfield('bill') ),
-      time2str("%D", $cust_pkg->getfield('susp') ),
-      time2str("%D", $cust_pkg->getfield('expire') ),
-      time2str("%D", $cust_pkg->getfield('cancel') ),
+      $cust_pkg->getfield('setup')
+        ? time2str("%D", $cust_pkg->getfield('setup') )
+        : '',
+      $cust_pkg->getfield('bill')
+        ? time2str("%D", $cust_pkg->getfield('bill') ),
+        : '',
+      $cust_pkg->getfield('susp')
+        ? time2str("%D", $cust_pkg->getfield('susp') ),
+        : '',
+      $cust_pkg->getfield('expire')
+        ? time2str("%D", $cust_pkg->getfield('expire') ),
+        : '',
+      $cust_pkg->getfield('cancel')
+        ? time2str("%D", $cust_pkg->getfield('cancel') ),
+        : '',
       $cust_pkg->custnum,
       $cust_main ? $cust_main->last : '',
       $cust_main ? $cust_main->first : '',
@@ -194,6 +206,11 @@ END
     my $p = popurl(2);
     print $n1, <<END;
       <TD ROWSPAN=$rowspan><A HREF="${p}view/cust_pkg.cgi?$pkgnum"><FONT SIZE=-1>$pkgnum - $pkg</FONT></A></TD>
+      <TD>$setup</TD>
+      <TD>$bill</TD>
+      <TD>$susp</TD>
+      <TD>$expire</TD>
+      <TD>$cancel</TD>
 END
     if ( $cust_main ) {
       print <<END;
-- 
cgit v1.2.1


From bcff88b04574a882c3b44f55f64d15a8f0136498 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Dec 2001 07:12:00 +0000
Subject: really working dates on package browse.  ouch.

---
 httemplate/search/cust_pkg.cgi | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 137dc5f19..dabcf46fb 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_pkg.cgi,v 1.11 2001-12-18 07:08:16 ivan Exp $ -->
+# <!-- $Id: cust_pkg.cgi,v 1.12 2001-12-18 07:12:00 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi @cust_pkg $sortby $query %part_pkg
@@ -158,23 +158,22 @@ END
   ) {
     my($cust_main)=qsearchs('cust_main',{'custnum'=>$cust_pkg->custnum});
     my($pkgnum, $setup, $bill, $susp, $expire, $cancel,
-       $custnum, $last, $first, $company
-    ) = (
+       $custnum, $last, $first, $company ) = (
       $cust_pkg->pkgnum,
       $cust_pkg->getfield('setup')
         ? time2str("%D", $cust_pkg->getfield('setup') )
         : '',
       $cust_pkg->getfield('bill')
-        ? time2str("%D", $cust_pkg->getfield('bill') ),
+        ? time2str("%D", $cust_pkg->getfield('bill') )
         : '',
       $cust_pkg->getfield('susp')
-        ? time2str("%D", $cust_pkg->getfield('susp') ),
+        ? time2str("%D", $cust_pkg->getfield('susp') )
         : '',
       $cust_pkg->getfield('expire')
-        ? time2str("%D", $cust_pkg->getfield('expire') ),
+        ? time2str("%D", $cust_pkg->getfield('expire') )
         : '',
       $cust_pkg->getfield('cancel')
-        ? time2str("%D", $cust_pkg->getfield('cancel') ),
+        ? time2str("%D", $cust_pkg->getfield('cancel') )
         : '',
       $cust_pkg->custnum,
       $cust_main ? $cust_main->last : '',
-- 
cgit v1.2.1


From 91135a208282b03644cc766ed917b64fe24f374c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Dec 2001 19:30:31 +0000
Subject: apply payment webinterface

---
 httemplate/edit/cust_bill_pay.cgi            | 109 +++++++++++++++++++++++++++
 httemplate/edit/cust_credit_bill.cgi         |   3 +-
 httemplate/edit/process/cust_bill_pay.cgi    |  46 +++++++++++
 httemplate/edit/process/cust_credit_bill.cgi |   6 +-
 4 files changed, 160 insertions(+), 4 deletions(-)
 create mode 100755 httemplate/edit/cust_bill_pay.cgi
 create mode 100755 httemplate/edit/process/cust_bill_pay.cgi

diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
new file mode 100755
index 000000000..a4ed94462
--- /dev/null
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -0,0 +1,109 @@
+<%
+#<!-- $Id: cust_bill_pay.cgi,v 1.1 2001-12-18 19:30:31 ivan Exp $ -->
+
+use strict;
+use vars qw( $cgi $query $custnum $paynum $amount $invnum $p1 $otaker ); # $reason $cust_credit );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use Date::Format;
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(header popurl);
+use FS::Record qw(qsearch fields);
+use FS::cust_pay;
+use FS::cust_bill;
+
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  $paynum = $cgi->param('paynum');
+  $amount = $cgi->param('amount');
+  $invnum = $cgi->param('invnum');
+} else {
+  ($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $paynum = $1;
+  $amount = '';
+  $invnum = '';
+}
+
+$otaker = getotaker;
+
+$p1 = popurl(1);
+
+print header("Apply Payment", '');
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT><BR><BR>"
+  if $cgi->param('error');
+print <<END;
+    <FORM ACTION="${p1}process/cust_bill_pay.cgi" METHOD=POST>
+END
+
+die unless $cust_pay = qsearchs('cust_pay', { 'paynum' => $paynum } );
+
+my $unapplied = $cust_pay->unapplied;
+
+print "Payment # <B>$paynum</B>".
+      qq!<INPUT TYPE="hidden" NAME="paynum" VALUE="$paynum">!.
+      '<BR>Date: <B>'. time2str("%D", $cust_pay->_date). '</B>'.
+      '<BR>Amount: $<B>'. $cust_pay->paid. '</B>'.
+      "<BR>Unapplied amount: \$<B>$unapplied</B>".
+      ;
+
+my @cust_bill = grep $_->owed != 0,
+                qsearch('cust_bill', { 'custnum' => $cust_pay->custnum } );
+
+print <<END;
+<SCRIPT>
+function changed(what) {
+  cust_bill = what.options[what.selectedIndex].value;
+END
+
+foreach my $cust_bill ( @cust_bill ) {
+  my $invnum = $cust_bill->invnum;
+  my $changeto = $cust_bill->owed < $unapplied
+                   ? $cust_bill->owed 
+                   : $unapplied
+  print <<END;
+  if ( cust_bill == $invnum ) {
+    what.form.amount.value = "$changeto";
+  }
+END
+}
+
+#print <<END;
+#  if ( cust_bill == "Refund" ) {
+#    what.form.amount.value = "$credited";
+#  }
+#}
+#</SCRIPT>
+#END
+print "</SCRIPT>\n";
+
+print qq!<BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)">!,
+      '<OPTION VALUE="">';
+foreach my $cust_bill ( @cust_bill ) {
+  print '<OPTION'. ( $cust_bill->invnum eq $invnum ? ' SELECTED' : '' ).
+        ' VALUE="'. $cust_bill->invnum. '">'. $cust_bill->invnum.
+        ' -  '. time2str("%D",$cust_bill->_date).
+        ' - $'. $cust_bill->owed;
+}
+#print qq!<OPTION VALUE="Refund">Refund!;
+print "</SELECT>";
+
+print qq!<BR>Amount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
+
+print <<END;
+<BR>
+<INPUT TYPE="submit" VALUE="Apply">
+END
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index 2b41cc216..a00734949 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,9 +1,8 @@
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: cust_credit_bill.cgi,v 1.6 2001-12-18 19:30:31 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $amount $reason $cust_credit );
-use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use Date::Format;
diff --git a/httemplate/edit/process/cust_bill_pay.cgi b/httemplate/edit/process/cust_bill_pay.cgi
new file mode 100755
index 000000000..f0d403331
--- /dev/null
+++ b/httemplate/edit/process/cust_bill_pay.cgi
@@ -0,0 +1,46 @@
+<%
+#<!-- $Id: cust_bill_pay.cgi,v 1.1 2001-12-18 19:30:31 ivan Exp $ -->
+
+use strict;
+use vars qw( $cgi $custnum $paynum $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(popurl);
+use FS::Record qw(qsearchs fields);
+use FS::cust_pay;
+use FS::cust_bill_pay;
+use FS::cust_main;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$cgi->param('paynum') =~ /^(\d*)$/ or die "Illegal paynum!";
+$paynum = $1;
+
+my $cust_pay = qsearchs('cust_pay', { 'paynum' => $paynum } )
+  or die "No such paynum";
+
+my $cust_main = qsearchs('cust_main', { 'custnum' => $cust_pay->custnum } )
+  or die "Bogus credit:  not attached to customer";
+
+my $custnum = $cust_main->custnum;
+
+$new = new FS::cust_bill_pay ( {
+  map {
+    $_, scalar($cgi->param($_));
+  #} qw(custnum _date amount invnum)
+  } fields('cust_bill_pay')
+} );
+
+$error=$new->insert;
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "cust_bill_pay.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+}
+
+
+%>
diff --git a/httemplate/edit/process/cust_credit_bill.cgi b/httemplate/edit/process/cust_credit_bill.cgi
index f838dff10..e84894b04 100755
--- a/httemplate/edit/process/cust_credit_bill.cgi
+++ b/httemplate/edit/process/cust_credit_bill.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.1 2001-09-01 21:52:20 jeff Exp $ -->
+#<!-- $Id: cust_credit_bill.cgi,v 1.2 2001-12-18 19:30:31 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $custnum $crednum $new $error );
@@ -10,6 +10,8 @@ use FS::CGI qw(popurl);
 use FS::Record qw(qsearchs fields);
 use FS::cust_credit;
 use FS::cust_credit_bill;
+use FS::cust_refund;
+use FS::cust_main;
 
 $cgi = new CGI;
 cgisuidsetup($cgi);
@@ -34,7 +36,7 @@ if ($cgi->param('invnum') =~ /^Refund$/) {
     'payinfo' => 'Cash',
     'crednum' => $crednum,
   } );
-}else{
+} else {
   $new = new FS::cust_credit_bill ( {
     map {
       $_, scalar($cgi->param($_));
-- 
cgit v1.2.1


From 355fe2160a24311e5d1faab56376c9a0781c6479 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Dec 2001 19:32:56 +0000
Subject: declar vars

---
 httemplate/edit/cust_bill_pay.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
index a4ed94462..46ca51e82 100755
--- a/httemplate/edit/cust_bill_pay.cgi
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -1,8 +1,8 @@
 <%
-#<!-- $Id: cust_bill_pay.cgi,v 1.1 2001-12-18 19:30:31 ivan Exp $ -->
+#<!-- $Id: cust_bill_pay.cgi,v 1.2 2001-12-18 19:32:56 ivan Exp $ -->
 
 use strict;
-use vars qw( $cgi $query $custnum $paynum $amount $invnum $p1 $otaker ); # $reason $cust_credit );
+use vars qw( $cgi $query $custnum $paynum $amount $invnum $p1 $otaker $cust_pay );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use Date::Format;
-- 
cgit v1.2.1


From 2d53ea6d86d638d65f0d14ef5921daf46981269e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Dec 2001 19:34:08 +0000
Subject: typo

---
 httemplate/edit/cust_bill_pay.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
index 46ca51e82..61c8a1785 100755
--- a/httemplate/edit/cust_bill_pay.cgi
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_bill_pay.cgi,v 1.2 2001-12-18 19:32:56 ivan Exp $ -->
+#<!-- $Id: cust_bill_pay.cgi,v 1.3 2001-12-18 19:34:08 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $paynum $amount $invnum $p1 $otaker $cust_pay );
@@ -64,7 +64,7 @@ foreach my $cust_bill ( @cust_bill ) {
   my $invnum = $cust_bill->invnum;
   my $changeto = $cust_bill->owed < $unapplied
                    ? $cust_bill->owed 
-                   : $unapplied
+                   : $unapplied;
   print <<END;
   if ( cust_bill == $invnum ) {
     what.form.amount.value = "$changeto";
-- 
cgit v1.2.1


From c980083d90ee8796d8241686390048aee6d4fff9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Dec 2001 19:36:21 +0000
Subject: another dum tyop

---
 httemplate/edit/cust_bill_pay.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
index 61c8a1785..793ed1009 100755
--- a/httemplate/edit/cust_bill_pay.cgi
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_bill_pay.cgi,v 1.3 2001-12-18 19:34:08 ivan Exp $ -->
+#<!-- $Id: cust_bill_pay.cgi,v 1.4 2001-12-18 19:36:21 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $paynum $amount $invnum $p1 $otaker $cust_pay );
@@ -48,7 +48,7 @@ print "Payment # <B>$paynum</B>".
       qq!<INPUT TYPE="hidden" NAME="paynum" VALUE="$paynum">!.
       '<BR>Date: <B>'. time2str("%D", $cust_pay->_date). '</B>'.
       '<BR>Amount: $<B>'. $cust_pay->paid. '</B>'.
-      "<BR>Unapplied amount: \$<B>$unapplied</B>".
+      "<BR>Unapplied amount: \$<B>$unapplied</B>"
       ;
 
 my @cust_bill = grep $_->owed != 0,
-- 
cgit v1.2.1


From 4a7a96cd297d390d7d58aafed554672ab949143e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Dec 2001 14:30:12 +0000
Subject: surpress warnings

---
 FS/FS/svc_acct.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 382987e1b..11f09a116 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -552,8 +552,10 @@ sub replace {
       qsearchs( 'svc_acct', { 'username' => $new->username,
                                'domsvc'   => $new->domsvc,
                              } );
-
-  return "Can't change uid!" if $old->uid != $new->uid;
+  {
+    no warnings 'numeric';
+    return "Can't change uid!" if $old->uid != $new->uid;
+  }
 
   return "can't change username using Cyrus"
     if $cyrus_server && $old->username ne $new->username;
@@ -961,7 +963,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.56 2001-12-18 01:49:35 ivan Exp $
+$Id: svc_acct.pm,v 1.57 2001-12-19 14:30:12 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From b1c7bf3ab64205054c5b677fa55d21049e7a4d26 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Dec 2001 14:33:48 +0000
Subject: alas, a 5.6-ism

---
 FS/FS/svc_acct.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 11f09a116..139303b3c 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -552,10 +552,10 @@ sub replace {
       qsearchs( 'svc_acct', { 'username' => $new->username,
                                'domsvc'   => $new->domsvc,
                              } );
-  {
-    no warnings 'numeric';
+#  {
+#    no warnings 'numeric';  #alas, a 5.006-ism
     return "Can't change uid!" if $old->uid != $new->uid;
-  }
+#  }
 
   return "can't change username using Cyrus"
     if $cyrus_server && $old->username ne $new->username;
@@ -963,7 +963,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.57 2001-12-19 14:30:12 ivan Exp $
+$Id: svc_acct.pm,v 1.58 2001-12-19 14:33:48 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 80fad8cc255a422c562e0b4f040bfce91f074adc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Dec 2001 02:07:04 +0000
Subject: quiet warnings

---
 FS/FS/svc_acct.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 139303b3c..ba8f32fdd 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -552,10 +552,11 @@ sub replace {
       qsearchs( 'svc_acct', { 'username' => $new->username,
                                'domsvc'   => $new->domsvc,
                              } );
-#  {
-#    no warnings 'numeric';  #alas, a 5.006-ism
+  {
+    #no warnings 'numeric';  #alas, a 5.006-ism
+    local($^W) = 0;
     return "Can't change uid!" if $old->uid != $new->uid;
-#  }
+  }
 
   return "can't change username using Cyrus"
     if $cyrus_server && $old->username ne $new->username;
@@ -963,7 +964,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.58 2001-12-19 14:33:48 ivan Exp $
+$Id: svc_acct.pm,v 1.59 2001-12-20 02:07:04 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 363349b93ce19e66749126bd14eed75710e57479 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Dec 2001 02:09:52 +0000
Subject: don't error trying to suspend accounts with '*' password

---
 FS/FS/svc_acct.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index ba8f32fdd..49a55e9cf 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -635,7 +635,9 @@ Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
 sub suspend {
   my $self = shift;
   my %hash = $self->hash;
-  unless ( $hash{_password} =~ /^\*SUSPENDED\* / ) {
+  unless ( $hash{_password} =~ /^\*SUSPENDED\* /
+           || $hash{_password} eq '*'
+         ) {
     $hash{_password} = '*SUSPENDED* '.$hash{_password};
     my $new = new FS::svc_acct ( \%hash );
     $new->replace($self);
@@ -964,7 +966,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.59 2001-12-20 02:07:04 ivan Exp $
+$Id: svc_acct.pm,v 1.60 2001-12-20 02:09:52 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 1d1703a3c1217c744d2393cbef19364fd595bcb0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Dec 2001 05:34:07 +0000
Subject: work better with DBIx::Profile

---
 FS/FS/Record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 995e4bdc2..38f4390db 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -234,9 +234,9 @@ sub qsearch {
     if ( $record->{$field} =~ /^\d+(\.\d+)?$/
          && $dbdef->table($table)->column($field)->type =~ /(int)/i
     ) {
-      $sth->bind_param($bind++, $record->{$field}, SQL_INTEGER );
+      $sth->bind_param($bind++, $record->{$field}, { TYPE => SQL_INTEGER } );
     } else {
-      $sth->bind_param($bind++, $record->{$field}, SQL_VARCHAR );
+      $sth->bind_param($bind++, $record->{$field}, { TYPE => SQL_VARCHAR } );
     }
   }
 
-- 
cgit v1.2.1


From 29a315f2dc4187e5558315f76c3d27d11e287620 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Dec 2001 20:55:35 +0000
Subject: fixes

  total cust_bill_pay.amount and cust_credit_bill.amount 19.95 for invnum 1659
  greater than cust_bill.charged 19.95 at
  /usr/local/lib/perl5/site_perl/5.005/FS/cust_main.pm line 1519.
---
 FS/FS/cust_bill_pay.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index 3b95f45ab..2b0105139 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -111,7 +111,7 @@ sub insert {
     qsearch('cust_bill_pay', { 'invnum' => $self->invnum } );
   $bill_total += $_ foreach map { $_->amount } 
     qsearch('cust_credit_bill', { 'invnum' => $self->invnum } );
-  if ( $bill_total > $cust_bill->charged ) {
+  if ( sprintf("%.2f", $bill_total) > sprintf("%.2f", $cust_bill->charged) ) {
     $dbh->rollback if $oldAutoCommit;
     return "total cust_bill_pay.amount and cust_credit_bill.amount $bill_total".
            " for invnum ". $self->invnum.
@@ -195,7 +195,7 @@ sub cust_bill {
 
 =head1 VERSION
 
-$Id: cust_bill_pay.pm,v 1.9 2001-12-16 00:55:53 ivan Exp $
+$Id: cust_bill_pay.pm,v 1.10 2001-12-21 20:55:35 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From c00273147a2d400779fcdaf34f171b2180faa453 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Dec 2001 21:40:24 +0000
Subject: add name/address to post payment screen

get rid of some $-0.00  yay for ieee fp
---
 FS/FS/cust_bill.pm            |   4 +-
 httemplate/edit/cust_pay.cgi  | 105 ++++++++++++++++++++++++++++++++++++++----
 httemplate/view/cust_main.cgi |   6 ++-
 3 files changed, 102 insertions(+), 13 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 1a2ecaf1d..fbccff1ff 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -297,6 +297,8 @@ sub owed {
   $balance -= $_->amount foreach ( $self->cust_bill_pay );
   $balance -= $_->amount foreach ( $self->cust_credited );
   $balance = sprintf( "%.2f", $balance);
+  $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
+  $balance;
 }
 
 =item print_text [TIME];
@@ -493,7 +495,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.13 2001-12-17 23:59:56 ivan Exp $
+$Id: cust_bill.pm,v 1.14 2001-12-21 21:40:24 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 3c0dbb2fe..6669b9de4 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,13 +1,18 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.6 2001-12-21 21:40:24 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid );
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
+use FS::Conf;
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl);
+use FS::CGI qw(header popurl ntable);
+
+my $conf = new FS::Conf;
+
+my $countrydefault = $conf->config('countrydefault') || 'US';
 
 $cgi = new CGI;
 cgisuidsetup($cgi);
@@ -44,32 +49,112 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
   if $cgi->param('error');
 
-print <<END;
+print <<END, ntable("#cccccc",2);
     <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
     <INPUT TYPE="hidden" NAME="link" VALUE="$link">
     <INPUT TYPE="hidden" NAME="linknum" VALUE="$linknum">
 END
 
+my $custnum;
 if ( $link eq 'invnum' ) {
-  print "Invoice #<B>$linknum</B>";
+
+  my $cust_bill = qsearchs('cust_bill', { 'invnum' => $linknum } )
+    or die "unknown invnum $linknum";
+  print "Invoice #<B>$linknum</B>". ntable("#cccccc",2).
+        '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
+        time2str("%D", $cust_bill->_date). '</TD></TR>'.
+        '<TR><TD ALIGN="right" VALIGN="top">Items</TD><TD BGCOLOR="#ffffff">';
+  foreach ( $cust_bill->cust_bill_pkg ) { #false laziness with FS::cust_bill
+    if ( $_->pkgnum ) {
+
+      my($cust_pkg)=qsearchs('cust_pkg', { 'pkgnum', $_->pkgnum } );
+      my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->pkgpart});
+      my($pkg)=$part_pkg->pkg;
+
+      if ( $_->setup != 0 ) {
+        print "$pkg Setup<BR>"; # $money_char. sprintf("%10.2f",$_->setup);
+        print join('<BR>',
+          map { "  ". $_->[0]. ": ". $_->[1] } $cust_pkg->labels
+        ). '<BR>';
+      }
+
+      if ( $_->recur != 0 ) {
+        print
+          "$pkg (" . time2str("%x",$_->sdate) . " - " .
+                                time2str("%x",$_->edate) . ")<BR>";
+          #$money_char. sprintf("%10.2f",$_->recur)
+        print join('<BR>',
+          map { '--->'. $_->[0]. ": ". $_->[1] } $cust_pkg->labels
+        ). '<BR>';
+      }
+
+    } else { #pkgnum Tax
+      print "Tax<BR>" # $money_char. sprintf("%10.2f",$_->setup)
+        if $_->setup != 0;
+    }
+
+  }
+  print '</TD></TR></TABLE>';
+
+  $custnum = $cust_bill->custnum;
+
 } elsif ( $link eq 'custnum' ) {
-  print "Customer #<B>$linknum</B>";
+  $custnum = $linknum;
 }
 
-print qq!<BR>Date: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
+print "<BR><BR>Customer #<B>$custnum</B>". ntable('#e8e8e8');
+my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+  or die "unknown custnum $custnum";
+
+print '<TR><TD>'. ntable("#cccccc",2).
+      '<TR><TD ALIGN="right" VALIGN="top">Billing</TD><TD BGCOLOR="#ffffff">'.
+      $cust_main->getfield('last'). ', '. $cust_main->first. '<BR>';
+print $cust_main->company. '<BR>' if $cust_main->company;
+print $cust_main->address1. '<BR>';
+print $cust_main->address2. '<BR>' if $cust_main->address2;
+print $cust_main->city. ', '. $cust_main->state. '  '. $cust_main->zip. '<BR>';
+print $cust_main->country. '<BR>' if $cust_main->country
+                                     && $cust_main->country ne $countrydefault;
+
+print '</TD>'.
+      '</TR></TABLE></TD>';
+
+if ( defined $cust_main->dbdef_table->column('ship_last') ) {
+
+  print '<TD>'. ntable("#cccccc",2).
+        '<TR><TD ALIGN="right" VALIGN="top">Service</TD><TD BGCOLOR="#ffffff">'.
+        $cust_main->getfield('ship_last'). ', '. $cust_main->ship_first. '<BR>';
+  print $cust_main->ship_company. '<BR>' if $cust_main->ship_company;
+  print $cust_main->ship_address1. '<BR>';
+  print $cust_main->ship_address2. '<BR>' if $cust_main->ship_address2;
+  print $cust_main->ship_city. ', '. $cust_main->ship_state. '  '. $cust_main->ship_zip. '<BR>';
+  print $cust_main->ship_country. '<BR>'
+    if $cust_main->ship_country && $cust_main->ship_country ne $countrydefault;
+
+  print '</TD>'.
+        '</TR></TABLE></TD>';
+}
+
+print '</TR></TABLE>';
+
+
+print '<BR><BR>Payment'. ntable("#cccccc", 2).
+      '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
+      time2str("%D",$_date).  '</TD></TR>'.
+      qq!<INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
 
-print qq!<BR>Amount \$<INPUT TYPE="text" NAME="paid" VALUE="$paid" SIZE=8 MAXLENGTH=8>!;
+print qq!<TR><TD ALIGN="right">Amount</TD><TD BGCOLOR="#ffffff">\$<INPUT TYPE="text" NAME="paid" VALUE="$paid" SIZE=8 MAXLENGTH=8></TD></TR>!;
 
-print qq!<BR>Payby: <B>$payby</B><INPUT TYPE="hidden" NAME="payby" VALUE="$payby">!;
+print qq!<TR><TD ALIGN="right">Payby</TD><TD BGCOLOR="#ffffff">$payby</TD></TR><INPUT TYPE="hidden" NAME="payby" VALUE="$payby">!;
 
 #payinfo (check # now as payby="BILL" hardcoded.. what to do later?)
-print qq!<BR>Check #<INPUT TYPE="text" NAME="payinfo" VALUE="$payinfo">!;
+print qq!<TR><TD ALIGN="right">Check #</TD><TD BGCOLOR="#ffffff"><INPUT TYPE="text" NAME="payinfo" VALUE="$payinfo"></TD></TR>!;
 
 #paybatch
 print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
 
 print <<END;
-</PRE>
+</TABLE>
 <BR>
 <INPUT TYPE="submit" VALUE="Post payment">
 END
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index d43575a9a..b17c9277a 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.14 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.15 2001-12-21 21:40:24 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
@@ -470,6 +470,8 @@ foreach $item (sort keyfield_numerically @history) {
   $refund ||= 0;
   $balance += $charge - $payment;
   $balance -= $credit - $refund;
+  $balance = sprintf("%.2f", $balance);
+  $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
 
   print "<TR><TD><FONT SIZE=-1>",time2str("%D",$date),"</FONT></TD>",
 	"<TD><FONT SIZE=-1>$desc</FONT></TD>",
@@ -485,7 +487,7 @@ foreach $item (sort keyfield_numerically @history) {
 	"<TD><FONT SIZE=-1>",
         ( $refund ? "\$".sprintf("%.2f",$refund) : '' ),
         "</FONT></TD>",
-	"<TD><FONT SIZE=-1>\$" . sprintf("%.2f",$balance),
+	"<TD><FONT SIZE=-1>\$" . $balance,
         "</FONT></TD>",
         "\n";
 }
-- 
cgit v1.2.1


From 381ea36d912fe0aec54918c03f3a88eacab64460 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 22 Dec 2001 02:41:39 +0000
Subject: doco on creating database manually

---
 httemplate/docs/install.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 0bf2c1616..8d5785f50 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -72,6 +72,13 @@ mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* T
     <pre>
 $ su
 # make create-database</pre>
+    (or manually, with Postgres:)
+    <pre>
+$ su freeside
+$ createdb freeside</pre>
+    (with MySQL:)
+    <pre>
+$ mysqladmin -u freeside -p create freeside </pre>
   <li>Build and install the Perl modules:
     <pre>
 $ make perl-modules
-- 
cgit v1.2.1


From c6b853b4f0516450b3e27acd281f667eadaec9f4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 02:33:30 +0000
Subject: fix service display for duplicates

---
 httemplate/edit/cust_pay.cgi | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 6669b9de4..dfef3c542 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.6 2001-12-21 21:40:24 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.7 2001-12-26 02:33:30 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid );
@@ -121,15 +121,23 @@ print '</TD>'.
 
 if ( defined $cust_main->dbdef_table->column('ship_last') ) {
 
+  my $pre = $cust_main->ship_last ? 'ship_' : '';
+
   print '<TD>'. ntable("#cccccc",2).
         '<TR><TD ALIGN="right" VALIGN="top">Service</TD><TD BGCOLOR="#ffffff">'.
-        $cust_main->getfield('ship_last'). ', '. $cust_main->ship_first. '<BR>';
-  print $cust_main->ship_company. '<BR>' if $cust_main->ship_company;
-  print $cust_main->ship_address1. '<BR>';
-  print $cust_main->ship_address2. '<BR>' if $cust_main->ship_address2;
-  print $cust_main->ship_city. ', '. $cust_main->ship_state. '  '. $cust_main->ship_zip. '<BR>';
-  print $cust_main->ship_country. '<BR>'
-    if $cust_main->ship_country && $cust_main->ship_country ne $countrydefault;
+        $cust_main->get("${pre}last"). ', '.
+        $cust_main->get("${pre}first"). '<BR>';
+  print $cust_main->get("${pre}company"). '<BR>'
+    if $cust_main->get("${pre}company");
+  print $cust_main->get("${pre}address1"). '<BR>';
+  print $cust_main->get("${pre}address2"). '<BR>'
+    if $cust_main->get("${pre}address2");
+  print $cust_main->get("${pre}city"). ', '.
+        $cust_main->get("${pre}state"). '  '.
+        $cust_main->get("${pre}ship_zip"). '<BR>';
+  print $cust_main->get("${pre}country"). '<BR>'
+    if $cust_main->get("${pre}country")
+       && $cust_main->get("${pre}country") ne $countrydefault;
 
   print '</TD>'.
         '</TR></TABLE></TD>';
-- 
cgit v1.2.1


From d0f483f47168e01eb6c28e8fc99a62050b245132 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 04:25:04 +0000
Subject: auto-apply payments and credits, post credit UI overhaul

---
 FS/FS/CGI.pm                            | 64 +++++++++++++++++++++++++++++++-
 httemplate/edit/cust_credit.cgi         | 40 ++++++++++----------
 httemplate/edit/cust_pay.cgi            | 66 ++++++---------------------------
 httemplate/edit/process/cust_credit.cgi |  7 +++-
 httemplate/edit/process/cust_pay.cgi    |  7 +++-
 5 files changed, 105 insertions(+), 79 deletions(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index f0fec434d..c66bfe3c2 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -9,7 +9,8 @@ use CGI::Carp qw(fatalsToBrowser);
 use FS::UID;
 
 @ISA = qw(Exporter);
-@EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable);
+@EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable
+                small_custview);
 
 @header = ( '-Expires' => '-1',
             '-Pragma' => 'no-cache',
@@ -206,6 +207,65 @@ sub ntable {
 
 }
 
+=item small_custview CUSTNUM || CUST_MAIN_OBJECT, COUNTRYDEFAULT
+
+Sheesh. I should just switch to Mason.
+
+=cut
+
+sub small_custview {
+  use FS::Record qw(qsearchs);
+  use FS::cust_main;
+
+  my $arg = shift;
+  my $countrydefault = shift || 'US';
+
+  my $cust_main = ref($arg) ? $arg
+                  : qsearchs('cust_main', { 'custnum' => $arg } )
+    or die "unknown custnum $arg";
+
+  my $html = 'Customer #<B>'. $cust_main->custnum. '</B>'.
+    ntable('#e8e8e8'). '<TR><TD>'. ntable("#cccccc",2).
+    '<TR><TD ALIGN="right" VALIGN="top">Billing</TD><TD BGCOLOR="#ffffff">'.
+    $cust_main->getfield('last'). ', '. $cust_main->first. '<BR>';
+
+  $html .= $cust_main->company. '<BR>' if $cust_main->company;
+  $html .= $cust_main->address1. '<BR>';
+  $html .= $cust_main->address2. '<BR>' if $cust_main->address2;
+  $html .= $cust_main->city. ', '. $cust_main->state. '  '. $cust_main->zip. '<BR>';
+  $html .= $cust_main->country. '<BR>'
+    if $cust_main->country && $cust_main->country ne $countrydefault;
+
+  $html .= '</TD></TR></TABLE></TD>';
+
+  if ( defined $cust_main->dbdef_table->column('ship_last') ) {
+
+    my $pre = $cust_main->ship_last ? 'ship_' : '';
+
+    $html .= '<TD>'. ntable("#cccccc",2).
+      '<TR><TD ALIGN="right" VALIGN="top">Service</TD><TD BGCOLOR="#ffffff">'.
+      $cust_main->get("${pre}last"). ', '.
+      $cust_main->get("${pre}first"). '<BR>';
+    $html .= $cust_main->get("${pre}company"). '<BR>'
+      if $cust_main->get("${pre}company");
+    $html .= $cust_main->get("${pre}address1"). '<BR>';
+    $html .= $cust_main->get("${pre}address2"). '<BR>'
+      if $cust_main->get("${pre}address2");
+    $html .= $cust_main->get("${pre}city"). ', '.
+             $cust_main->get("${pre}state"). '  '.
+             $cust_main->get("${pre}ship_zip"). '<BR>';
+    $html .= $cust_main->get("${pre}country"). '<BR>'
+      if $cust_main->get("${pre}country")
+         && $cust_main->get("${pre}country") ne $countrydefault;
+
+    $html .= '</TD></TR></TABLE></TD>';
+  }
+
+  $html .= '</TR></TABLE>';
+
+  $html;
+}
+
 =back
 
 =head1 BUGS
@@ -214,6 +274,8 @@ Not OO.
 
 Not complete.
 
+small_custview sooooo doesn't belong here.  i should just switch to Mason.
+
 =head1 SEE ALSO
 
 L<CGI>, L<CGI::Base>
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index 5d5f5b296..63732f86c 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,16 +1,18 @@
 <%
-#<!-- $Id: cust_credit.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.6 2001-12-26 04:25:04 ivan Exp $ -->
 
 use strict;
-use vars qw( $cgi $query $custnum $otaker $p1 $crednum $_date $amount $reason );
+use vars qw( $cgi $query $custnum $otaker $p1 $_date $amount $reason );
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(header popurl);
+use FS::CGI qw(header popurl small_custview);
 use FS::Record qw(fields);
 #use FS::cust_credit;
 
+my $conf = new FS::Conf;
+
 $cgi = new CGI;
 cgisuidsetup($cgi);
 
@@ -40,35 +42,31 @@ print header("Post Credit", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
   if $cgi->param('error');
-print <<END;
+print <<END, small_custview($custnum, $conf->config('countrydefault'));
     <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>
+    <INPUT TYPE="hidden" NAME="crednum" VALUE="">
+    <INPUT TYPE="hidden" NAME="paybatch" VALUE="">
+    <INPUT TYPE="hidden" NAME="_date" VALUE="$_date">
+    <INPUT TYPE="hidden" NAME="credited" VALUE="">
+    <INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">
 END
 
-$crednum = "";
-print qq!Credit #<B>!, $crednum ? $crednum : " <I>(NEW)</I>", qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
-
-print qq!<BR>Customer #<B>$custnum</B><INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
-
-print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
-
-print qq!<BR>Date: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
+print '<BR><BR>Credit'. ntable("#cccccc", 2).
+      '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
+      time2str("%D",$_date).  '</TD></TR>';
 
-print qq!<BR>Amount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
-print qq!<INPUT TYPE="hidden" NAME="credited" VALUE="">!;
+print qq!<TR><TD ALIGN="right">Amount</TD><TD BGCOLOR="#ffffff">\$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8></TD></TR>!;
 
 #print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
 
-print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!;
+print qq!<TR><TD ALIGN="right">Reason</TD><TD BGCOLOR="#ffffff"><INPUT TYPE="text" NAME="reason" VALUE="$reason"></TD></TR>!;
 
-print qq!<BR>Reason <INPUT TYPE="text" NAME="reason" VALUE="$reason">!;
+print qq!<TR><TD ALIGN="right">Auto-apply<BR>to invoices</TD><TD><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD>!;
 
 print <<END;
+</TABLE>
 <BR>
-<INPUT TYPE="submit" VALUE="Post">
-END
-
-print <<END;
-
+<INPUT TYPE="submit" VALUE="Post credit">
     </FORM>
   </BODY>
 </HTML>
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index dfef3c542..7f70802c3 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.7 2001-12-26 02:33:30 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.8 2001-12-26 04:25:04 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid );
@@ -8,12 +8,10 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::Conf;
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl ntable);
+use FS::CGI qw(header popurl ntable small_custview);
 
 my $conf = new FS::Conf;
 
-my $countrydefault = $conf->config('countrydefault') || 'US';
-
 $cgi = new CGI;
 cgisuidsetup($cgi);
 
@@ -43,10 +41,10 @@ if ( $cgi->param('error') ) {
 $_date = time;
 
 $p1 = popurl(1);
-print header("Enter payment", '');
+print header("Post payment", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
+      "</FONT><BR><BR>"
   if $cgi->param('error');
 
 print <<END, ntable("#cccccc",2);
@@ -102,62 +100,24 @@ if ( $link eq 'invnum' ) {
   $custnum = $linknum;
 }
 
-print "<BR><BR>Customer #<B>$custnum</B>". ntable('#e8e8e8');
-my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
-  or die "unknown custnum $custnum";
-
-print '<TR><TD>'. ntable("#cccccc",2).
-      '<TR><TD ALIGN="right" VALIGN="top">Billing</TD><TD BGCOLOR="#ffffff">'.
-      $cust_main->getfield('last'). ', '. $cust_main->first. '<BR>';
-print $cust_main->company. '<BR>' if $cust_main->company;
-print $cust_main->address1. '<BR>';
-print $cust_main->address2. '<BR>' if $cust_main->address2;
-print $cust_main->city. ', '. $cust_main->state. '  '. $cust_main->zip. '<BR>';
-print $cust_main->country. '<BR>' if $cust_main->country
-                                     && $cust_main->country ne $countrydefault;
-
-print '</TD>'.
-      '</TR></TABLE></TD>';
-
-if ( defined $cust_main->dbdef_table->column('ship_last') ) {
-
-  my $pre = $cust_main->ship_last ? 'ship_' : '';
-
-  print '<TD>'. ntable("#cccccc",2).
-        '<TR><TD ALIGN="right" VALIGN="top">Service</TD><TD BGCOLOR="#ffffff">'.
-        $cust_main->get("${pre}last"). ', '.
-        $cust_main->get("${pre}first"). '<BR>';
-  print $cust_main->get("${pre}company"). '<BR>'
-    if $cust_main->get("${pre}company");
-  print $cust_main->get("${pre}address1"). '<BR>';
-  print $cust_main->get("${pre}address2"). '<BR>'
-    if $cust_main->get("${pre}address2");
-  print $cust_main->get("${pre}city"). ', '.
-        $cust_main->get("${pre}state"). '  '.
-        $cust_main->get("${pre}ship_zip"). '<BR>';
-  print $cust_main->get("${pre}country"). '<BR>'
-    if $cust_main->get("${pre}country")
-       && $cust_main->get("${pre}country") ne $countrydefault;
-
-  print '</TD>'.
-        '</TR></TABLE></TD>';
-}
-
-print '</TR></TABLE>';
+print small_custview($custnum, $conf->config('countrydefault'));
 
+print qq!<INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
+print qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$payby">!;
 
 print '<BR><BR>Payment'. ntable("#cccccc", 2).
       '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
-      time2str("%D",$_date).  '</TD></TR>'.
-      qq!<INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
+      time2str("%D",$_date).  '</TD></TR>';
 
 print qq!<TR><TD ALIGN="right">Amount</TD><TD BGCOLOR="#ffffff">\$<INPUT TYPE="text" NAME="paid" VALUE="$paid" SIZE=8 MAXLENGTH=8></TD></TR>!;
 
-print qq!<TR><TD ALIGN="right">Payby</TD><TD BGCOLOR="#ffffff">$payby</TD></TR><INPUT TYPE="hidden" NAME="payby" VALUE="$payby">!;
+print qq!<TR><TD ALIGN="right">Payby</TD><TD BGCOLOR="#ffffff">$payby</TD></TR>!;
 
 #payinfo (check # now as payby="BILL" hardcoded.. what to do later?)
 print qq!<TR><TD ALIGN="right">Check #</TD><TD BGCOLOR="#ffffff"><INPUT TYPE="text" NAME="payinfo" VALUE="$payinfo"></TD></TR>!;
 
+print qq!<TR><TD ALIGN="right">Auto-apply<BR>to invoices</TD><TD><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD>!;
+
 #paybatch
 print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
 
@@ -165,10 +125,6 @@ print <<END;
 </TABLE>
 <BR>
 <INPUT TYPE="submit" VALUE="Post payment">
-END
-
-print <<END;
-
     </FORM>
   </BODY>
 </HTML>
diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
index b52d0bd46..2eb431bcc 100755
--- a/httemplate/edit/process/cust_credit.cgi
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.3 2001-12-26 04:25:04 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $custnum $new $error );
@@ -31,6 +31,11 @@ if ( $error ) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). "cust_credit.cgi?". $cgi->query_string );
 } else {
+  if ( $cgi->param('apply') eq 'yes' ) {
+    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum })
+      or die "unknown custnum $linknum";
+    $cust_main->apply_payments;
+  }
   print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
 }
 
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index 9be96505d..b2b3602db 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.4 2001-12-26 04:25:04 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $link $linknum $new $error );
@@ -38,6 +38,11 @@ if ($error) {
 } elsif ( $link eq 'invnum' ) {
   print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$linknum");
 } elsif ( $link eq 'custnum' ) {
+  if ( $cgi->param('apply') eq 'yes' ) {
+    my $cust_main = qsearchs('cust_main', { 'custnum' => $linknum })
+      or die "unknown custnum $linknum";
+    $cust_main->apply_payments;
+  }
   print $cgi->redirect(popurl(3). "view/cust_main.cgi?$linknum");
 }
 
-- 
cgit v1.2.1


From 37f9312b22a0bef8cd9f3a295ef2bffc3ca10364 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 04:52:59 +0000
Subject: same look as rest of search pages

---
 httemplate/search/cust_bill.html  | 12 +++++-------
 httemplate/search/cust_main.html  |  4 ++--
 httemplate/search/svc_acct.html   | 12 +++++-------
 httemplate/search/svc_domain.html | 13 +++++--------
 4 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index 4adb40e4a..36e8bc91b 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -2,11 +2,11 @@
   <HEAD>
     <TITLE>Invoice Search</TITLE>
   </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Invoice Search</H1>
-    </CENTER>
-    <HR>
+  <BODY BGCOLOR="#e8e8e8">
+    <FONT SIZE=7>
+      Invoice Search
+    </FONT>
+    <BR><BR>
     <FORM ACTION="cust_bill.cgi" METHOD="post">
       Search for <B>invoice #</B>: 
       <INPUT TYPE="text" NAME="invnum">
@@ -14,8 +14,6 @@
       <P><INPUT TYPE="submit" VALUE="Search">
 
     </FORM>
-
-  <HR>
   </BODY>
 </HTML>
 
diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html
index 3184698b4..12796c7b2 100755
--- a/httemplate/search/cust_main.html
+++ b/httemplate/search/cust_main.html
@@ -2,8 +2,8 @@
   <HEAD>
     <TITLE>Customer Search</TITLE>
   </HEAD>
-  <BODY BGCOLOR="#ffffff">
-    <FONT COLOR="#ff0000" SIZE=7>
+  <BODY BGCOLOR="#e8e8e8">
+    <FONT SIZE=7>
       Customer Search
     </FONT>
     <BR>
diff --git a/httemplate/search/svc_acct.html b/httemplate/search/svc_acct.html
index 91291be99..742360596 100755
--- a/httemplate/search/svc_acct.html
+++ b/httemplate/search/svc_acct.html
@@ -2,11 +2,11 @@
   <HEAD>
     <TITLE>Account Search</TITLE>
   </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Account Search</H1>
-    </CENTER>
-    <HR>
+  <BODY BGCOLOR="#e8e8e8">
+    <FONT SIZE=7>
+      Account Search
+    </FONT>
+    <BR><BR>
     <FORM ACTION="svc_acct.cgi" METHOD="post">
       Search for <B>username</B>: 
       <INPUT TYPE="text" NAME="username">
@@ -14,8 +14,6 @@
       <P><INPUT TYPE="submit" VALUE="Search">
 
     </FORM>
-
-  <HR>
   </BODY>
 </HTML>
 
diff --git a/httemplate/search/svc_domain.html b/httemplate/search/svc_domain.html
index 533743ba2..94bb9a66d 100755
--- a/httemplate/search/svc_domain.html
+++ b/httemplate/search/svc_domain.html
@@ -2,11 +2,11 @@
   <HEAD>
     <TITLE>Domain Search</TITLE>
   </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Domain Search</H1>
-    </CENTER>
-    <HR>
+  <BODY BGCOLOR="#e8e8e8">
+    <FONT SIZE=7>
+      Domain Search
+    </FONT>
+    <BR><BR>
     <FORM ACTION="svc_domain.cgi" METHOD="post">
       Search for <B>domain</B>: 
       <INPUT TYPE="text" NAME="domain">
@@ -14,9 +14,6 @@
       <P><INPUT TYPE="submit" VALUE="Search">
 
     </FORM>
-
-  <HR>
-
   </BODY>
 </HTML>
 
-- 
cgit v1.2.1


From 325a7d418b222bad6ea2ef772a53ea5914cae220 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 05:02:30 +0000
Subject: still missing tons of folks, i am sure

---
 CREDITS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CREDITS b/CREDITS
index 80de31ba7..6ad4a5f14 100644
--- a/CREDITS
+++ b/CREDITS
@@ -85,5 +85,11 @@ customer notes.
 nikotel, Inc. <http://www.nikojet.com> sponsored the inclusion of
 customer-to-customer referrals in the web interface and signup server.
 
+Three Bubba's Innanet <http://www.inna.net> sponsored expedited check entry,
+the "similar names warning" feature, and a number of other enhancements.
+
+Dave Burgess <burgess@neonramp.com> sent in a bunch of fixes and small changes
+and will doubtless send more once he's got his tree under control.
+
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
-- 
cgit v1.2.1


From f91771606ce8a2bb4f2fa44e7bf54c9b7c945db6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 05:19:01 +0000
Subject: expedited check entry

---
 httemplate/edit/cust_pay.cgi              |  8 +++++--
 httemplate/edit/process/cust_pay.cgi      |  8 +++++--
 httemplate/index.html                     |  6 ++++-
 httemplate/search/cust_main-payinfo.html  |  4 ++--
 httemplate/search/cust_main-quickpay.html | 37 +++++++++++++++++++++++++++++++
 httemplate/search/cust_main.cgi           | 15 ++++++++++---
 httemplate/search/cust_main.html          |  2 +-
 7 files changed, 69 insertions(+), 11 deletions(-)
 create mode 100755 httemplate/search/cust_main-quickpay.html

diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 7f70802c3..38654e98d 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,8 +1,8 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.8 2001-12-26 04:25:04 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.9 2001-12-26 05:19:01 ivan Exp $ -->
 
 use strict;
-use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid );
+use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid $quickpay );
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
@@ -21,6 +21,7 @@ if ( $cgi->param('error') ) {
   $paid = $cgi->param('paid');
   $payby = $cgi->param('payby');
   $payinfo = $cgi->param('payinfo');
+  $quickpay = $cgi->param('quickpay');
 } elsif ($cgi->keywords) {
   my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/;
@@ -29,12 +30,14 @@ if ( $cgi->param('error') ) {
   $paid = '';
   $payby = 'BILL';
   $payinfo = "";
+  $quickpay = '';
 } elsif ( $cgi->param('custnum')  =~ /^(\d+)$/ ) {
   $link = 'custnum';
   $linknum = $1;
   $paid = '';
   $payby = 'BILL';
   $payinfo = '';
+  $quickpay = $cgi->param('quickpay');
 } else {
   die "illegal query ". $cgi->keywords;
 }
@@ -51,6 +54,7 @@ print <<END, ntable("#cccccc",2);
     <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
     <INPUT TYPE="hidden" NAME="link" VALUE="$link">
     <INPUT TYPE="hidden" NAME="linknum" VALUE="$linknum">
+    <INPUT TYPE="hidden" NAME="quickpay" VALUE="$quickpay">
 END
 
 my $custnum;
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index b2b3602db..630e8fc1b 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.4 2001-12-26 04:25:04 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.5 2001-12-26 05:19:01 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $link $linknum $new $error );
@@ -43,7 +43,11 @@ if ($error) {
       or die "unknown custnum $linknum";
     $cust_main->apply_payments;
   }
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$linknum");
+  if ( $cgi->param('quickpay') eq 'yes' ) {
+    print $cgi->redirect(popurl(3). "search/cust_main-quickpay.html");
+  } else {
+    print $cgi->redirect(popurl(3). "view/cust_main.cgi?$linknum");
+  }
 }
 
 %>
diff --git a/httemplate/index.html b/httemplate/index.html
index 85912c24f..dcf513703 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -26,7 +26,7 @@
         <LI><A HREF="search/svc_acct.html">accounts (by username)</A>
         <LI><A HREF="search/svc_domain.html">domains (by domain)</A>
 <!--        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>-->
-        <LI><A HREF="search/svc_forward.html">mail forwards (by ?)</A>
+<!--        <LI><A HREF="search/svc_forward.html">mail forwards (by ?)</A>-->
         <LI><A HREF="search/cust_bill.html">invoices (by invoice number)</A>
         </ul>
       <li><A NAME="browse">Browse</A>
@@ -62,6 +62,10 @@
           <LI><A HREF="browse/queue.cgi">Job queue</A>
           <LI><A HREF="browse/cust_pay_batch.cgi">Pending credit card batch</A>
         </ul>
+      <li>Miscellaneous
+        <ul>
+          <li><A HREF="search/cust_main-quickpay.html">Quick payment entry</A>
+        </ul>
     </ul>
     <hr noshade>
     <ul>
diff --git a/httemplate/search/cust_main-payinfo.html b/httemplate/search/cust_main-payinfo.html
index 47bb83cbd..671b5ef08 100755
--- a/httemplate/search/cust_main-payinfo.html
+++ b/httemplate/search/cust_main-payinfo.html
@@ -2,8 +2,8 @@
   <HEAD>
     <TITLE>Customer Search</TITLE>
   </HEAD>
-  <BODY BGCOLOR="#ffffff">
-    <FONT COLOR="#ff0000" SIZE=7>
+  <BODY BGCOLOR="#e8e8e8">
+    <FONT SIZE=7>
       Customer Search
     </FONT>
     <BR>
diff --git a/httemplate/search/cust_main-quickpay.html b/httemplate/search/cust_main-quickpay.html
new file mode 100755
index 000000000..3f0ba0412
--- /dev/null
+++ b/httemplate/search/cust_main-quickpay.html
@@ -0,0 +1,37 @@
+<HTML>
+  <HEAD>
+    <TITLE>Quick payment entry</TITLE>
+  </HEAD>
+  <BODY BGCOLOR="#e8e8e8">
+    <FONT SIZE=7>
+      Quick payment entry
+    </FONT>
+    <BR><BR>
+    <FORM ACTION="cust_main.cgi" METHOD="post">
+      <INPUT TYPE="hidden" NAME="quickpay" VALUE="yes">
+      <INPUT TYPE="checkbox" NAME="last_on" CHECKED> Search for <B>last name</B>: 
+      <INPUT TYPE="text" NAME="last_text">
+      using search method: <SELECT NAME="last_type">
+        <OPTION SELECTED>Fuzzy
+        <OPTION>Exact
+      </SELECT>
+
+      <P><INPUT TYPE="checkbox" NAME="company_on" CHECKED> Search for <B>company</B>: 
+      <INPUT TYPE="text" NAME="company_text">
+      using search methods: <SELECT NAME="company_type">
+        <OPTION SELECTED>Fuzzy
+        <OPTION>Exact
+      </SELECT>
+
+      <P><INPUT TYPE="submit" VALUE="Search"> Note: Fuzzy searching can take a while.  Please be patient.
+
+    </FORM>
+
+  <HR>Explanation of search methods:
+  <UL>
+    <LI><B>Fuzzy</B> - Searches for matches that are close to your text.
+    <LI><B>Exact</B> - Finds exact matches only, but much faster than the other search methods.
+  </UL>
+  </BODY>
+</HTML>
+
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index b9b1d1fb2..4d3ec3564 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.18 2001-12-03 11:33:19 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.19 2001-12-26 05:19:01 ivan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
@@ -154,7 +154,11 @@ if ( $conf->exists('hidecancelledpackages' ) ) {
 #%all_pkgs = ();
 
 if ( scalar(@cust_main) == 1 && ! $cgi->param('referral_custnum') ) {
-  print $cgi->redirect(popurl(2). "view/cust_main.cgi?". $cust_main[0]->custnum);
+  if ( $cgi->param('quickpay') eq 'yes' ) {
+    print $cgi->redirect(popurl(2). "edit/cust_pay.cgi?quickpay=yes;custnum=". $cust_main[0]->custnum);
+  } else {
+    print $cgi->redirect(popurl(2). "view/cust_main.cgi?". $cust_main[0]->custnum);
+  }
   exit;
 } elsif ( scalar(@cust_main) == 0 ) {
   eidiot "No matching customers found!\n";
@@ -282,7 +286,12 @@ END
     }
 
     #my($rowspan) = scalar(@{$all_pkgs{$custnum}});
-    my $view = $p. 'view/cust_main.cgi?'. $custnum;
+    my $view;
+    if ( defined $cgi->param('quickpay') && $cgi->param('quickpay') eq 'yes' ) {
+      $view = $p. 'edit/cust_pay.cgi?quickpay=yes;custnum='. $custnum;
+    } else {
+      $view = $p. 'view/cust_main.cgi?'. $custnum;
+    }
     print <<END;
     <TR>
       <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$custnum</FONT></A></TD>
diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html
index 12796c7b2..1e91adee9 100755
--- a/httemplate/search/cust_main.html
+++ b/httemplate/search/cust_main.html
@@ -6,7 +6,7 @@
     <FONT SIZE=7>
       Customer Search
     </FONT>
-    <BR>
+    <BR><BR>
     <FORM ACTION="cust_main.cgi" METHOD="post">
       <INPUT TYPE="checkbox" NAME="last_on" CHECKED> Search for <B>last name</B>: 
       <INPUT TYPE="text" NAME="last_text">
-- 
cgit v1.2.1


From a34643588e65fc3272ec7bb2865aeb05a620dfc8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 06:02:48 +0000
Subject: UI

---
 httemplate/edit/cust_pay.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 38654e98d..83f3cb872 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.9 2001-12-26 05:19:01 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.10 2001-12-26 06:02:48 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid $quickpay );
@@ -96,7 +96,7 @@ if ( $link eq 'invnum' ) {
     }
 
   }
-  print '</TD></TR></TABLE>';
+  print '</TD></TR></TABLE><BR><BR>';
 
   $custnum = $cust_bill->custnum;
 
-- 
cgit v1.2.1


From 9958a1c7391840abd8085e6f781de988533942f2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 07:53:21 +0000
Subject: doc

---
 FS/FS/cust_pay.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 21365c1eb..ecd6ab24f 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -57,7 +57,7 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =item payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
 
-=item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
+=item payinfo - card number, check #, or comp issuer (4-8 lowercase alphanumerics; think username), respectively
 
 =item paybatch - text field for tracking card processing
 
@@ -304,7 +304,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.9 2001-12-08 10:07:27 ivan Exp $
+$Id: cust_pay.pm,v 1.10 2001-12-26 07:53:21 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 92c43e05cdc7dc5c5a4f8d6b0017f7d699cda90d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 09:18:18 +0000
Subject: search by check #

---
 httemplate/index.html           |   1 +
 httemplate/search/cust_pay.cgi  | 112 ++++++++++++++++++++++++++++++++++++++++
 httemplate/search/cust_pay.html |  18 +++++++
 httemplate/view/cust_main.cgi   |  32 +++++++++---
 4 files changed, 156 insertions(+), 7 deletions(-)
 create mode 100755 httemplate/search/cust_pay.cgi
 create mode 100755 httemplate/search/cust_pay.html

diff --git a/httemplate/index.html b/httemplate/index.html
index dcf513703..d1abd0d61 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -28,6 +28,7 @@
 <!--        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>-->
 <!--        <LI><A HREF="search/svc_forward.html">mail forwards (by ?)</A>-->
         <LI><A HREF="search/cust_bill.html">invoices (by invoice number)</A>
+        <LI><A HREF="search/cust_pay.html">checks (by check number)</A>
         </ul>
       <li><A NAME="browse">Browse</A>
         <ul>
diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi
new file mode 100755
index 000000000..68a17e7dc
--- /dev/null
+++ b/httemplate/search/cust_pay.cgi
@@ -0,0 +1,112 @@
+<%
+#<!-- $Id: cust_pay.cgi,v 1.1 2001-12-26 09:18:18 ivan Exp $ -->
+
+use strict;
+use vars qw( $cgi $sortby @cust_pay );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use Date::Format;
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl header menubar idiot table );
+use FS::Record qw(qsearch );
+use FS::cust_pay;
+use FS::cust_main;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$cgi->param('payinfo') =~ /^\s*(\d+)\s*$/ or die "illegal payinfo";
+my $payinfo = $1;
+$cgi->param('payby') =~ /^(\w+)$/ or die "illegal payby";
+my $payby = $1;
+@cust_pay = qsearch('cust_pay', { 'payinfo' => $payinfo,
+                                  'payby'   => $payby    } );
+$sortby = \*date_sort;
+
+if (0) {
+#if ( scalar(@cust_pay) == 1 ) {
+#  my $invnum = $cust_bill[0]->invnum;
+#  print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
+} elsif ( scalar(@cust_pay) == 0 ) {
+  idiot("Check # not found.");
+  #exit;
+} else {
+  my $total = scalar(@cust_pay);
+  my $s = $total > 1 ? 's' : '';
+  print header("Check # Search Results", menubar(
+          'Main Menu', popurl(2)
+        )), "$total matching check$s found<BR>", &table(), <<END;
+      <TR>
+        <TH></TH>
+        <TH>Amount</TH>
+        <TH>Date</TH>
+        <TH>Contact name</TH>
+        <TH>Company</TH>
+      </TR>
+END
+
+  my(%saw, $cust_pay);
+  foreach my $cust_pay (
+    sort $sortby grep(!$saw{$_->paynum}++, @cust_pay)
+  ) {
+    my($paynum, $custnum, $payinfo, $amount, $date ) = (
+      $cust_pay->paynum,
+      $cust_pay->custnum,
+      $cust_pay->payinfo,
+      sprintf("%.2f", $cust_pay->paid),
+      $cust_pay->_date,
+    );
+    my $pdate = time2str("%b %d %Y", $date);
+
+    my $rowspan = 1;
+
+    my $view = popurl(2). "view/cust_main.cgi?". $custnum. 
+               "#". $payby. $payinfo;
+
+    print <<END;
+      <TR>
+        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$payinfo</FONT></A></TD>
+        <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view"><FONT SIZE=-1>\$$amount</FONT></A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$pdate</FONT></A></TD>
+END
+    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
+    if ( $cust_main ) {
+      #my $cview = popurl(2). "view/cust_main.cgi?". $cust_main->custnum;
+      my ( $name, $company ) = (
+        $cust_main->last. ', '. $cust_main->first,
+        $cust_main->company,
+      );
+      print <<END;
+        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$name</FONT></A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$company</FONT></A></TD>
+END
+    } else {
+      print <<END
+        <TD ROWSPAN=$rowspan COLSPAN=2>WARNING: couldn't find cust_main.custnum $custnum (cust_pay.paynum $paynum)</TD>
+END
+    }
+
+    print "</TR>";
+  }
+  print <<END;
+    </TABLE>
+  </BODY>
+</HTML>
+END
+
+}
+
+#
+
+#sub invnum_sort {
+#  $a->invnum <=> $b->invnum;
+#}
+#
+#sub custnum_sort {
+#  $a->custnum <=> $b->custnum || $a->invnum <=> $b->invnum;
+#}
+
+sub date_sort {
+  $a->_date <=> $b->_date || $a->invnum <=> $b->invnum;
+}
+%>
diff --git a/httemplate/search/cust_pay.html b/httemplate/search/cust_pay.html
new file mode 100755
index 000000000..3848d66f7
--- /dev/null
+++ b/httemplate/search/cust_pay.html
@@ -0,0 +1,18 @@
+<HTML>
+  <HEAD>
+    <TITLE>Check # Search</TITLE>
+  </HEAD>
+  <BODY BGCOLOR="#e8e8e8">
+    <FONT SIZE=7>
+      Check # Search
+    </FONT>
+    <BR><BR>
+    <FORM ACTION="cust_pay.cgi" METHOD="post">
+      Search for <B>check #</B>:
+      <INPUT TYPE="text" NAME="payinfo">
+      <INPUT TYPE="hidden" NAME="payby" VALUE="BILL">
+      <BR><BR><INPUT TYPE="submit" VALUE="Search">
+    </FORM>
+  </BODY>
+</HTML>
+
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index b17c9277a..eea2403c4 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.15 2001-12-21 21:40:24 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.16 2001-12-26 09:18:18 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
@@ -361,6 +361,8 @@ print qq!<BR><BR><A NAME="history">Payment History!.
 
 @history = (); #needed for mod_perl :)
 
+my %target = ();
+
 @bills = qsearch('cust_bill',{'custnum'=>$custnum});
 foreach $bill (@bills) {
   my($bref)=$bill->hashref;
@@ -386,9 +388,13 @@ foreach $bill (@bills) {
                                              $payment->payinfo,
                                              $cust_bill_pay->amount,
                       );
-    $payinfo = substr($payinfo,0,4). 'x'x(length($payinfo)-4) if $payby eq 'CARD';
+    $payinfo = substr($payinfo,0,4). 'x'x(length($payinfo)-4)
+      if $payby eq 'CARD';
+    my $target = "$payby$payinfo";
+    $payby =~ s/^BILL$/Check #/ if $payinfo;
+    $payby =~ s/^(CARD|COMP)$/$1 /;
     push @history,
-      "$date\tPayment, Invoice #$invnum ($payby $payinfo)\t\t$paid\t\t";
+      "$date\tPayment, Invoice #$invnum ($payby$payinfo)\t\t$paid\t\t\t$target";
   }
 
   my(@cust_credit_bill)=
@@ -438,12 +444,20 @@ foreach my $refund (@refunds) {
 my @unapplied_payments =
   grep { $_->unapplied > 0 } qsearch('cust_pay', { 'custnum' => $custnum } );
 foreach my $payment (@unapplied_payments) {
+  my $payby = $payment->payby;
+  my $payinfo = $payment->payinfo;
+  #false laziness w/above
+  $payinfo = substr($payinfo,0,4). 'x'x(length($payinfo)-4)
+    if $payby eq 'CARD';
+  my $target = "$payby$payinfo";
+  $payby =~ s/^BILL$/Check #/ if $payinfo;
+  $payby =~ s/^(CARD|COMP)$/$1 /;
   push @history,
     $payment->_date. "\t".
     '<A HREF="'. popurl(2). 'edit/cust_bill_pay.cgi?'. $payment->paynum. '">'.
     '<b><font size="+1" color="#ff0000">Unapplied payment #' .
-    $payment->paynum . "</font></b></A>".
-    "\t\t" . $payment->unapplied . "\t\t";
+    $payment->paynum . " ($payby$payinfo)</font></b></A>".
+    "\t\t" . $payment->unapplied . "\t\t\t$target";
 }
 
         #formatting
@@ -463,7 +477,7 @@ END
 
 $balance = 0;
 foreach $item (sort keyfield_numerically @history) {
-  my($date,$desc,$charge,$payment,$credit,$refund)=split(/\t/,$item);
+  my($date,$desc,$charge,$payment,$credit,$refund,$target)=split(/\t/,$item);
   $charge ||= 0;
   $payment ||= 0;
   $credit ||= 0;
@@ -473,7 +487,11 @@ foreach $item (sort keyfield_numerically @history) {
   $balance = sprintf("%.2f", $balance);
   $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
 
-  print "<TR><TD><FONT SIZE=-1>",time2str("%D",$date),"</FONT></TD>",
+  print "<TR><TD><FONT SIZE=-1>";
+  print qq!<A NAME="$target">! unless $target{$target}++;
+  print time2str("%D",$date);
+  print '</A>' if $target{$target} == 1;
+  print "</FONT></TD>",
 	"<TD><FONT SIZE=-1>$desc</FONT></TD>",
 	"<TD><FONT SIZE=-1>",
         ( $charge ? "\$".sprintf("%.2f",$charge) : '' ),
-- 
cgit v1.2.1


From b6b291e9894efecc061aaef6d4af3c510bb32fad Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 11:17:49 +0000
Subject: (untested eek) freeside-overdue script & cust_main balance_date &
 total_owed_date methods

---
 FS/FS/cust_main.pm           |  43 +++++++++++--
 FS/bin/freeside-overdue      | 139 +++++++++++++++++++++++++++++++++++++++++++
 httemplate/docs/billing.html |   7 ++-
 3 files changed, 183 insertions(+), 6 deletions(-)
 create mode 100755 FS/bin/freeside-overdue

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index a36d125be..3995e6561 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1416,10 +1416,25 @@ Returns the total owed for this customer on all invoices
 
 sub total_owed {
   my $self = shift;
+  $self->total_owed_date(2145859200); #12/31/2037
+}
+
+=item total_owed_date TIME
+
+Returns the total owed for this customer on all invoices with date earlier than
+TIME.  TIME is specified as a UNIX timestamp; see L<perlfunc/"time">).  Also
+see L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=cut
+
+sub total_owed_date {
+  my $self = shift;
+  my $time = shift;
   my $total_bill = 0;
-  foreach my $cust_bill ( qsearch('cust_bill', {
-    'custnum' => $self->custnum,
-  } ) ) {
+  foreach my $cust_bill (
+    grep { $_->_date <= $time }
+      qsearch('cust_bill', { 'custnum' => $self->custnum, } )
+  ) {
     $total_bill += $cust_bill->owed;
   }
   sprintf( "%.2f", $total_bill );
@@ -1575,6 +1590,26 @@ sub balance {
   );
 }
 
+=item balance_date TIME
+
+Returns the balance for this customer, only considering invoices with date
+earlier than TIME (total_owed_date minus total_credited minus
+total_unapplied_payments).  TIME is specified as a UNIX timestamp; see
+L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse> for conversion
+functions.
+
+=cut
+
+sub balance_date {
+  my $self = shift;
+  my $time = shift;
+  sprintf( "%.2f",
+    $self->total_owed_date($time)
+      - $self->total_credited
+      - $self->total_unapplied_payments
+  );
+}
+
 =item invoicing_list [ ARRAYREF ]
 
 If an arguement is given, sets these email addresses as invoice recipients
@@ -1881,7 +1916,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.50 2001-12-16 23:50:10 ivan Exp $
+$Id: cust_main.pm,v 1.51 2001-12-26 11:17:49 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-overdue b/FS/bin/freeside-overdue
new file mode 100755
index 000000000..541b8be03
--- /dev/null
+++ b/FS/bin/freeside-overdue
@@ -0,0 +1,139 @@
+#!/usr/bin/perl
+
+use strict;
+use vars qw( $days_to_pay $cust_main $cust_pkg 
+             $cust_svc $svc_acct );
+use Getopt::Std;
+use FS::cust_main;
+use FS::cust_pkg;
+use FS::cust_svc;
+use FS::svc_acct;
+use FS::Record qw(qsearch qsearchs);
+use FS::UID qw(adminsuidsetup);
+
+&untaint_argv;
+my %opt;
+getopts('ed:qpsc', \%opt);
+my $user = shift or die &usage;
+
+adminsuidsetup $user;
+
+my $now = time;
+my ($sec,$min,$hour,$mday,$mon,$year) =
+  (localtime($now) )[0,1,2,3,4,5];
+$mon++;
+$year += 1900;
+
+foreach $cust_main ( qsearch('cust_main',{} ) ) {
+
+  my ( $eyear, $emon, $eday ) = ( 2037, 12, 31 );
+  if ( $cust_main->paydate =~ /^(\d{4})\-(\d{1,2})\-(\d{1,2})$/
+       && $cust_main->payby eq 'BILL') {
+    ( $eyear, $emon, $eday ) = ( $1, $2, $3 );
+  }
+
+  if ( ( $opt{d}
+           && $cust_main->balance_date(time - $opt{d} * 86400) > 0
+           && qsearchs( 'cust_pkg', { 'custnum' => $cust_main->custnum,
+                                      'susp' => "" } ) )
+       || ( $opt{e}
+            && $cust_main->payby eq 'BILL'
+            && ( $eyear < $year
+                 || ( $eyear == $year && $emon < $mon ) ) )
+  ) { 
+
+    unless ( $opt{q} ) {
+      print $cust_main->custnum, "\t",
+            $cust_main->last, "\t", $cust_main->first, "\t",
+            $cust_main->balance_date(time-$opt{d} * 86400);
+    }
+
+    foreach $cust_pkg ( qsearch( 'cust_pkg', 
+                                 { 'custnum' => $cust_main->custnum } ) ) {
+
+      if ($opt{p} && ! grep { $_ eq 'POST' } $cust_main->invoicing_list ) {
+        print "\n\tAdding postal invoicing" unless $opt{q};
+        my @invoicing_list = $cust_main->invoicing_list;
+        push @invoicing_list, 'POST';
+        $cust_main->invoicing_list(\@invoicing_list);
+      }
+
+      if ($opt{s}) {
+        print "\n\tSuspending pkgnum " . $cust_pkg->pkgnum unless $opt{q};
+        $cust_pkg->suspend;
+      }
+
+      if ($opt{c}) {
+        print "\n\tCancelling pkgnum " . $cust_pkg->pkgnum unless $opt{q};
+        $cust_pkg->cancel;
+      }
+
+    }
+
+    print "\n" unless $opt{q};
+
+  }
+
+}
+
+sub untaint_argv {
+  foreach $_ ( $[ .. $#ARGV ) { 
+    $ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
+    $ARGV[$_]=$1;
+  }
+}
+
+sub usage {
+  die "Usage:\n\n  freeside-overdue [ -e ] [ -d days ] [ -q ] [ -p ] [ -s ] [ -c ] user\n";
+}
+
+
+=head1 NAME
+
+freeside-overdue - Perform actions on overdue and/or expired accounts.
+
+=head1 SYNOPSIS
+
+  freeside-overdue [ -e ] [ -d days ] [ -q ] [ -p ] [ -s ] [ -c ] user
+
+=head1 DESCRIPTION
+
+Performs actions on overdue and/or expired accounts.
+
+Selection options (at least one selection option is required):
+
+  -d:	Customers with a balance due on invoices older than the supplied number
+        of days.  Requires an integer argument.
+
+  -e:   Customers with a billing expiration date in the past.
+
+Action options: 
+
+  -q:   Be quiet (by default, suspended accounts are printed).
+
+  -p:   Add postal invoicing to the relevant customers.
+
+  -s:	Suspend accounts.
+
+  -c:   Cancel accounts.
+
+  user: From the mapsecrets file - see config.html from the base documentation
+
+=head1 CRONTAB
+
+Example crontab entries:
+
+20 4,16 * * * freeside-overdue -e -s user
+20 4,16 * * * freeside-overdue -d 30 -p -q user
+20 4,16 * * * freeside-overdue -d 60 user
+20 4,16 * * * freeside-overdue -d 90 -s user
+20 4,16 * * * freeside-overdue -d 120 -c user
+
+=head1 ORIGINAL AUTHORS
+
+Original disable-overdue version by mw/kwh: Mark W.? and Kristian Hoffmann ?
+
+=cut
+
+1;
+
diff --git a/httemplate/docs/billing.html b/httemplate/docs/billing.html
index 7dc9aef2d..dcb90208a 100644
--- a/httemplate/docs/billing.html
+++ b/httemplate/docs/billing.html
@@ -22,12 +22,14 @@
         </ul>
     </ul>
     <li>You can bill individual customers by clicking on the <i>Bill now</i> link on the main customer view.
-    <li> The <b>freeside-bill</b> script can be run daily to bill all customers.  Usage:<pre>bill [ -c [ i ] ] [ -d <i>date</i> ] [ -b ] <i>user</i></pre>
+    <li> The <b>freeside-bill</b> script can be run daily to bill all customers. (link to manpage!)  Usage:<pre>freeside-bill [ -c [ -p ] [ -a ] [ -i ] ] [ -d <i>date</i> ] <i>user</i></pre>
       <ul>
         <li>-c: Turn on collecting (you probably want this).
+        <li>-p: Apply unapplied payments and credits before collecting (you probably want this too)
+        <li>-a: Call collect even if there isn't a new invoice (probably a bad idea for daily use)
         <li>-i: Real-time billing (as opposed to bacth billing).  Only relevant for credit cards.
         <li>-d: Pretend it is <i>date</i> (parsed by <a href="http://search.cpan.org/doc/GBARR/TimeDate-1.09/lib/Date/Parse.pm">Date::Parse</a>)
-        <li>-b: N/A
+        <li>user: as setup with freeside-adduser
       </ul>
       <br><br>Batch credit card processing
       <ul>
@@ -63,5 +65,6 @@ All fields except paybatch are contained in the cust_pay_batch table.  You can u
             <li>-d: Delete - Pays account and deletes record from cust_pay_batch.
           </ul>
       </ul>
+    <li>The <b>freeside-overdue</b> script can list, add postal invoicing, suspend or cancel overdue and/or expired accounts (link to manpage!).
   </ul>
 </body>
-- 
cgit v1.2.1


From d2f2a080fa2a94c0dd1535b87b3d8f6a59fb2bbb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 11:47:52 +0000
Subject: don't provide example crontabs that run at 4:20 _PM_

---
 FS/bin/freeside-overdue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/FS/bin/freeside-overdue b/FS/bin/freeside-overdue
index 541b8be03..45d534461 100755
--- a/FS/bin/freeside-overdue
+++ b/FS/bin/freeside-overdue
@@ -123,11 +123,11 @@ Action options:
 
 Example crontab entries:
 
-20 4,16 * * * freeside-overdue -e -s user
-20 4,16 * * * freeside-overdue -d 30 -p -q user
-20 4,16 * * * freeside-overdue -d 60 user
-20 4,16 * * * freeside-overdue -d 90 -s user
-20 4,16 * * * freeside-overdue -d 120 -c user
+20 4 * * * freeside-overdue -e -s user
+20 4 * * * freeside-overdue -d 30 -p -q user
+20 4 * * * freeside-overdue -d 60 user
+20 4 * * * freeside-overdue -d 90 -s user
+20 4 * * * freeside-overdue -d 120 -c user
 
 =head1 ORIGINAL AUTHORS
 
-- 
cgit v1.2.1


From 371e7a9c14b0feb83a802f624a8dceda5fecbcbf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 15:07:06 +0000
Subject: fix posting credit

---
 httemplate/edit/cust_credit.cgi         | 3 ++-
 httemplate/edit/process/cust_credit.cgi | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index 63732f86c..e61463e07 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit.cgi,v 1.6 2001-12-26 04:25:04 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.7 2001-12-26 15:07:06 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $otaker $p1 $_date $amount $reason );
@@ -45,6 +45,7 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
 print <<END, small_custview($custnum, $conf->config('countrydefault'));
     <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>
     <INPUT TYPE="hidden" NAME="crednum" VALUE="">
+    <INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">
     <INPUT TYPE="hidden" NAME="paybatch" VALUE="">
     <INPUT TYPE="hidden" NAME="_date" VALUE="$_date">
     <INPUT TYPE="hidden" NAME="credited" VALUE="">
diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
index 2eb431bcc..415000f88 100755
--- a/httemplate/edit/process/cust_credit.cgi
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit.cgi,v 1.3 2001-12-26 04:25:04 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.4 2001-12-26 15:07:06 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $custnum $new $error );
@@ -9,6 +9,7 @@ use FS::UID qw(cgisuidsetup getotaker);
 use FS::CGI qw(popurl);
 use FS::Record qw(fields);
 use FS::cust_credit;
+use FS::cust_main;
 
 $cgi = new CGI;
 cgisuidsetup($cgi);
@@ -33,7 +34,7 @@ if ( $error ) {
 } else {
   if ( $cgi->param('apply') eq 'yes' ) {
     my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum })
-      or die "unknown custnum $linknum";
+      or die "unknown custnum $custnum";
     $cust_main->apply_payments;
   }
   print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
-- 
cgit v1.2.1


From 854f8d1e160d394d5019292d7e7a9019f06cc1b9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 15:08:49 +0000
Subject: add freeside-overdue

---
 FS/MANIFEST             |  1 +
 FS/bin/freeside-overdue | 29 +++++++++++++++++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/FS/MANIFEST b/FS/MANIFEST
index b7804ccc3..23a27d1d3 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -9,6 +9,7 @@ bin/freeside-queued
 bin/freeside-apply-credits
 bin/freeside-adduser
 bin/freeside-setinvoice
+bin/freeside-overdue
 FS.pm
 FS/CGI.pm
 FS/Conf.pm
diff --git a/FS/bin/freeside-overdue b/FS/bin/freeside-overdue
index 45d534461..65941ce95 100755
--- a/FS/bin/freeside-overdue
+++ b/FS/bin/freeside-overdue
@@ -13,7 +13,7 @@ use FS::UID qw(adminsuidsetup);
 
 &untaint_argv;
 my %opt;
-getopts('ed:qpsc', \%opt);
+getopts('ed:qplsc', \%opt);
 my $user = shift or die &usage;
 
 adminsuidsetup $user;
@@ -48,10 +48,15 @@ foreach $cust_main ( qsearch('cust_main',{} ) ) {
             $cust_main->balance_date(time-$opt{d} * 86400);
     }
 
+    if ( $opt{l} ) {
+      print "\n\tCharging late fee of \$$opt{l}" unless $opt{q};
+
+    }
+
     foreach $cust_pkg ( qsearch( 'cust_pkg', 
                                  { 'custnum' => $cust_main->custnum } ) ) {
 
-      if ($opt{p} && ! grep { $_ eq 'POST' } $cust_main->invoicing_list ) {
+      if ( $opt{p} && ! grep { $_ eq 'POST' } $cust_main->invoicing_list ) {
         print "\n\tAdding postal invoicing" unless $opt{q};
         my @invoicing_list = $cust_main->invoicing_list;
         push @invoicing_list, 'POST';
@@ -84,7 +89,7 @@ sub untaint_argv {
 }
 
 sub usage {
-  die "Usage:\n\n  freeside-overdue [ -e ] [ -d days ] [ -q ] [ -p ] [ -s ] [ -c ] user\n";
+  die "Usage:\n\n  freeside-overdue [ -e ] [ -d days ] [ -q ] [ -p ] [ -l amount ] [ -s ] [ -c ] user\n";
 }
 
 
@@ -94,7 +99,7 @@ freeside-overdue - Perform actions on overdue and/or expired accounts.
 
 =head1 SYNOPSIS
 
-  freeside-overdue [ -e ] [ -d days ] [ -q ] [ -p ] [ -s ] [ -c ] user
+  freeside-overdue [ -e ] [ -d days ] [ -q ] [ -p ] [ -l amount ] [ -s ] [ -c ] user
 
 =head1 DESCRIPTION
 
@@ -109,10 +114,12 @@ Selection options (at least one selection option is required):
 
 Action options: 
 
-  -q:   Be quiet (by default, suspended accounts are printed).
+  -q:   Be quiet (by default, selected accounts are printed).
 
   -p:   Add postal invoicing to the relevant customers.
 
+  -l:   Add a charge of the given amount to the relevant customers.
+
   -s:	Suspend accounts.
 
   -c:   Cancel accounts.
@@ -123,11 +130,17 @@ Action options:
 
 Example crontab entries:
 
+# suspend expired accounts
 20 4 * * * freeside-overdue -e -s user
+
+# quietly add postal invoicing to customers over 30 days past due
 20 4 * * * freeside-overdue -d 30 -p -q user
-20 4 * * * freeside-overdue -d 60 user
-20 4 * * * freeside-overdue -d 90 -s user
-20 4 * * * freeside-overdue -d 120 -c user
+
+# suspend accounts and charge a $10.23 fee for customers over 60 days past due
+20 4 * * * freeside-overdue -d 60 -s -l 10.23 user
+
+# cancel accounts over 90 days past due
+20 4 * * * freeside-overdue -d 90 -c user
 
 =head1 ORIGINAL AUTHORS
 
-- 
cgit v1.2.1


From 85e18d1c25a16b3d37ff87484b36a9e17d17cbcf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 15:11:33 +0000
Subject: apply credits!!

---
 httemplate/edit/process/cust_credit.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
index 415000f88..3bbd749ce 100755
--- a/httemplate/edit/process/cust_credit.cgi
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit.cgi,v 1.4 2001-12-26 15:07:06 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.5 2001-12-26 15:11:33 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $custnum $new $error );
@@ -35,7 +35,7 @@ if ( $error ) {
   if ( $cgi->param('apply') eq 'yes' ) {
     my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum })
       or die "unknown custnum $custnum";
-    $cust_main->apply_payments;
+    $cust_main->apply_credits;
   }
   print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
 }
-- 
cgit v1.2.1


From e0d75192ce1eefb05689b08961f5009b71063466 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 15:41:02 +0000
Subject: remove warnings

---
 httemplate/view/cust_main.cgi | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index eea2403c4..e84fa0756 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.16 2001-12-26 09:18:18 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.17 2001-12-26 15:41:02 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
@@ -486,11 +486,12 @@ foreach $item (sort keyfield_numerically @history) {
   $balance -= $credit - $refund;
   $balance = sprintf("%.2f", $balance);
   $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
+  $target = '' unless defined $target;
 
   print "<TR><TD><FONT SIZE=-1>";
-  print qq!<A NAME="$target">! unless $target{$target}++;
+  print qq!<A NAME="$target">! unless $target && $target{$target}++;
   print time2str("%D",$date);
-  print '</A>' if $target{$target} == 1;
+  print '</A>' if $target && $target{$target} == 1;
   print "</FONT></TD>",
 	"<TD><FONT SIZE=-1>$desc</FONT></TD>",
 	"<TD><FONT SIZE=-1>",
-- 
cgit v1.2.1


From fee9bc7edcdd27e7a4e47bc313d05c66cd900073 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 23:59:33 +0000
Subject: doc

---
 httemplate/docs/install.html  | 1 +
 httemplate/docs/schema.html   | 2 ++
 httemplate/docs/upgrade8.html | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 8d5785f50..5e36d14a6 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -111,6 +111,7 @@ PerlHandler Apache::ASP
 $MLDBM::RemoveTaint = 1;
 &lt;/Perl&gt;
 PerlSetVar Global /usr/local/etc/freeside/asp-global/
+PerlSetVar Debug 2
 &lt;/Directory&gt;
 </pre></font>
     </ul></td>
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index a5bf16c37..9f00d48b1 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -200,6 +200,7 @@
         <li>recurtax - Recurring fee tax exempt flag, empty or `Y'
         <li>plan - price plan
         <li>plandata - additional price plan data
+        <li>disabled - Disabled flag, empty or `Y'
       </ul>
     <li><a name="part_referral" href="man/FS/part_referral.html">part_referral</a> - Referral listing
       <ul>
@@ -211,6 +212,7 @@
         <li>svcpart - primary key
         <li>svc - name of this service
         <li>svcdb - table used for this service: svc_acct, svc_acct_sm, svc_forward, svc_domain, svc_charge or svc_wo
+        <li>disabled - Disabled flag, empty or `Y'
 <!--        <li><i>table</i>__<i>field</i> - Default or fixed value for <i>field</i> in <i>table</i>
         <li><i>table</i>__<i>field</i>_flag - null, D or F
 -->
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 94ca832ef..0855e6dee 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -135,6 +135,8 @@ ALTER TABLE part_pkg ADD plan varchar NULL;
 ALTER TABLE part_pkg ADD plandata varchar NULL;
 ALTER TABLE part_pkg ADD setuptax char(1) NULL;
 ALTER TABLE part_pkg ADD recurtax char(1) NULL;
+ALTER TABLE part_pkg ADD disabled char(1) NULL;
+ALTER TABLE part_svc ADD disabled char(1) NULL;
 CREATE INDEX cust_main3 ON cust_main ( referral_custnum );
 CREATE INDEX cust_credit_bill1 ON cust_credit_bill ( crednum );
 CREATE INDEX cust_credit_bill2 ON cust_credit_bill ( invnum );
-- 
cgit v1.2.1


From cf16b23820da69e3c8d0156ae27e21c635bf1ec5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 Dec 2001 09:26:14 +0000
Subject: service and package disable!

---
 FS/FS/Record.pm                      |  2 +-
 FS/FS/part_pkg.pm                    |  7 +++++-
 FS/FS/part_svc.pm                    | 14 +++++++----
 FS/bin/freeside-overdue              | 10 ++++----
 README.1.4.0pre4567-8                | 11 +++++++++
 bin/fs-setup                         |  4 +++-
 fs_signup/fs_signup_server           |  2 +-
 htetc/global.asa                     |  2 +-
 httemplate/browse/part_pkg.cgi       | 46 +++++++++++++++++++++++++++++-------
 httemplate/browse/part_svc.cgi       | 30 ++++++++++++++++++++---
 httemplate/edit/agent_type.cgi       |  4 ++--
 httemplate/edit/cust_main.cgi        |  4 ++--
 httemplate/edit/cust_pkg.cgi         |  5 ++--
 httemplate/edit/part_pkg.cgi         | 17 +++++++++----
 httemplate/edit/part_svc.cgi         | 14 +++++++----
 httemplate/edit/process/part_pkg.cgi |  7 +++---
 httemplate/view/cust_main.cgi        |  9 ++++---
 17 files changed, 141 insertions(+), 47 deletions(-)
 create mode 100644 README.1.4.0pre4567-8

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 38f4390db..6c0f5f819 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -211,7 +211,7 @@ sub qsearch {
     $statement .= ' WHERE '. join(' AND ', map {
       if ( ! defined( $record->{$_} ) || $record->{$_} eq '' ) {
         if ( driver_name =~ /^Pg$/i ) {
-          "$_ IS NULL";
+          qq-( $_ IS NULL OR $_ = '' )-;
         } else {
           qq-( $_ IS NULL OR $_ = "" )-;
         }
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index ceb2a0128..be2ad935f 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -60,6 +60,8 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item plandata - Price plan data
 
+=item disabled - Disabled flag, empty or `Y'
+
 =back
 
 setup and recur are evaluated as Safe perl expressions.  You can use numbers
@@ -147,6 +149,9 @@ sub check {
   $self->recurtax =~ /^(Y?)$/ or return "Illegal recrutax: ". $self->recurtax;
   $self->recurtax($1);
 
+  $self->disabled =~ /^(Y?)$/ or return "Illegal disabled: ". $self->disabled;
+  $self->disabled($1);
+
   '';
 }
 
@@ -185,7 +190,7 @@ sub svcpart {
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.4 2001-10-20 12:17:59 ivan Exp $
+$Id: part_pkg.pm,v 1.5 2001-12-27 09:26:13 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 2b3f3f309..18760c39a 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -40,6 +40,8 @@ FS::Record.  The following fields are currently supported:
 =item svcdb - table used for this service.  See L<FS::svc_acct>,
 L<FS::svc_domain>, and L<FS::svc_forward>, among others.
 
+=item disabled - Disabled flag, empty or `Y'
+
 =back
 
 =head1 METHODS
@@ -235,6 +237,7 @@ sub check {
   my @fields = eval { fields( $recref->{svcdb} ) }; #might die
   return "Unknown svcdb!" unless @fields;
 
+##REPLACED BY part_svc_column
 #  my $svcdb;
 #  foreach $svcdb ( qw(
 #    svc_acct svc_acct_sm svc_domain
@@ -259,6 +262,9 @@ sub check {
 #    }
 #  }
 
+  $self->disabled =~ /^(Y?)$/ or return "Illegal disabled: ". $self->disabled;
+  $self->disabled($1);
+
   ''; #no error
 }
 
@@ -295,7 +301,7 @@ sub all_part_svc_column {
 
 =head1 VERSION
 
-$Id: part_svc.pm,v 1.6 2001-09-12 15:45:01 ivan Exp $
+$Id: part_svc.pm,v 1.7 2001-12-27 09:26:13 ivan Exp $
 
 =head1 BUGS
 
@@ -306,9 +312,9 @@ should be fixed.
 
 =head1 SEE ALSO
 
-L<FS::Record>, L<FS::part_pkg>, L<FS::pkg_svc>, L<FS::cust_svc>,
-L<FS::svc_acct>, L<FS::svc_forward>, L<FS::svc_domain>, schema.html from the
-base documentation.
+L<FS::Record>, L<FS::part_svc_column, L<FS::part_pkg>, L<FS::pkg_svc>,
+L<FS::cust_svc>, L<FS::svc_acct>, L<FS::svc_forward>, L<FS::svc_domain>,
+schema.html from the base documentation.
 
 =cut
 
diff --git a/FS/bin/freeside-overdue b/FS/bin/freeside-overdue
index 65941ce95..0c62b99c1 100755
--- a/FS/bin/freeside-overdue
+++ b/FS/bin/freeside-overdue
@@ -48,10 +48,10 @@ foreach $cust_main ( qsearch('cust_main',{} ) ) {
             $cust_main->balance_date(time-$opt{d} * 86400);
     }
 
-    if ( $opt{l} ) {
-      print "\n\tCharging late fee of \$$opt{l}" unless $opt{q};
-
-    }
+#    if ( $opt{l} ) {
+#      print "\n\tCharging late fee of \$$opt{l}" unless $opt{q};
+#
+#    }
 
     foreach $cust_pkg ( qsearch( 'cust_pkg', 
                                  { 'custnum' => $cust_main->custnum } ) ) {
@@ -83,7 +83,7 @@ foreach $cust_main ( qsearch('cust_main',{} ) ) {
 
 sub untaint_argv {
   foreach $_ ( $[ .. $#ARGV ) { 
-    $ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
+    $ARGV[$_] =~ /^([\w\-\/\.]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
     $ARGV[$_]=$1;
   }
 }
diff --git a/README.1.4.0pre4567-8 b/README.1.4.0pre4567-8
new file mode 100644
index 000000000..2e2138b37
--- /dev/null
+++ b/README.1.4.0pre4567-8
@@ -0,0 +1,11 @@
+the following is necessary to upgrade from 1.4.0pre (4 thru 7) to 1.4.0pre8
+
+install the perl modules and httemplate as per install.html or upgrade8.html
+
+ALTER TABLE part_pkg ADD disabled char(1) NULL;
+ALTER TABLE part_svc ADD disabled char(1) NULL;
+
+Run bin/dbdef-create
+
+Restart Apache and freeside-queued
+
diff --git a/bin/fs-setup b/bin/fs-setup
index da6c167e9..e7aa3b0d9 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.67 2001-11-06 17:48:17 ivan Exp $
+# $Id: fs-setup,v 1.68 2001-12-27 09:26:13 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -548,6 +548,7 @@ sub tables_hash_hack {
         'recurtax',  'char', 'NULL', 1,
         'plan',       'varchar', 'NULL', $char_d,
         'plandata',   'text', 'NULL', '',
+        'disabled',   'char', 'NULL', 1,
       ],
       'primary_key' => 'pkgpart',
       'unique' => [ [] ],
@@ -590,6 +591,7 @@ sub tables_hash_hack {
         'svcpart',    'int',    '',   '',
         'svc',        'varchar',   '',   $char_d,
         'svcdb',      'varchar',   '',   $char_d,
+        'disabled',   'char',  'NULL',   1,
       ],
       'primary_key' => 'svcpart',
       'unique' => [ [] ],
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 43683b01d..b0d28be8c 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -57,7 +57,7 @@ while (1) {
 
   warn "[fs_signup_server] Sending package definitions...\n" if $Debug;
   my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } }
-    qsearch( 'part_pkg', {} );
+    qsearch( 'part_pkg', { 'disabled' => '' } );
   print $writer $data = join("\n",
     ( scalar(@part_pkg) || die "no usable package definitions, agent $agentnum" ),
     map {
diff --git a/htetc/global.asa b/htetc/global.asa
index dc75822ff..c22afc132 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -29,7 +29,7 @@ sub Script_OnFlush {
     $$ref =~ s/<\/BODY>[\s\n]*<\/HTML>[\s\n]*$//i
       or warn "can't remove";
   
-    $$ref .= '<PRE>'. encode_entities(dbh->sprintProfile()). '</PRE>';
+    $$ref .= '<PRE>'. ("\n"x96). encode_entities(dbh->sprintProfile()). '</PRE>';
 
     $$ref .= '</BODY></HTML>';
     
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index e0d25f67d..d0b572aa4 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_pkg.cgi,v 1.8 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: part_pkg.cgi,v 1.9 2001-12-27 09:26:14 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $part_pkg );
@@ -18,12 +18,33 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
+my %search;
+if ( $cgi->param('showdisabled') ) {
+  %search = ();
+} else {
+  %search = ( 'disabled' => '' );
+}
+
+my @part_pkg = qsearch('part_pkg', \%search );
+my $total = scalar(@part_pkg);
+
 print header("Package Definition Listing",menubar(
   'Main Menu' => $p,
-)), "One or more services are grouped together into a package and given",
-  " pricing information. Customers purchase packages",
-  " rather than purchase services directly.<BR><BR>", 
-  &table(), <<END;
+)). "One or more services are grouped together into a package and given".
+  " pricing information. Customers purchase packages".
+  " rather than purchase services directly.<BR><BR>".
+  "$total packages ";
+
+if ( $cgi->param('showdisabled') ) {
+  $cgi->param('showdisabled', 0);
+  print qq!( <a href="!. $cgi->self_url. qq!">hide disabled packages</a> )!;
+} else {
+  $cgi->param('showdisabled', 1);
+  print qq!( <a href="!. $cgi->self_url. qq!">show disabled packages</a> )!;
+}
+
+my $colspan = $cgi->param('showdisabled') ? 2 : 3;
+print &table(), <<END;
       <TR>
         <TH COLSPAN=2>Package</TH>
         <TH>Comment</TH>
@@ -37,7 +58,7 @@ END
 
 foreach $part_pkg ( sort { 
   $a->getfield('pkgpart') <=> $b->getfield('pkgpart')
-} qsearch('part_pkg',{}) ) {
+} @part_pkg ) {
   my($hashref)=$part_pkg->hashref;
   my(@pkg_svc)=grep $_->getfield('quantity'),
     qsearch('pkg_svc',{'pkgpart'=> $hashref->{pkgpart} });
@@ -54,9 +75,16 @@ foreach $part_pkg ( sort {
   }
   print <<END;
       <TR>
-        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">
-          $hashref->{pkgpart}
-        </A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">$hashref->{pkgpart}</A></TD>
+END
+
+  unless ( $cgi->param('showdisabled') ) {
+    print "<TD ROWSPAN=$rowspan>";
+    print "DISABLED" if $hashref->{disabled};
+    print '</TD>';
+  }
+
+  print <<END;
         <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">$hashref->{pkg}</A></TD>
         <TD ROWSPAN=$rowspan>$hashref->{comment}</TD>
         <TD ROWSPAN=$rowspan>$hashref->{freq}</TD>
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 8a564ba9a..da523ca51 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -1,10 +1,30 @@
-<!-- $Id: part_svc.cgi,v 1.5 2001-09-11 00:08:18 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.6 2001-12-27 09:26:14 ivan Exp $ -->
+<% 
+
+my %search;
+if ( $cgi->param('showdisabled') ) {
+  %search = ();
+} else {
+  %search = ( 'disabled' => '' );
+}
+
+my @part_svc = qsearch('part_svc', \%search );
+my $total = scalar(@part_svc);
+
+%>
 <%= header('Service Definition Listing', menubar( 'Main Menu' => $p) ) %>
 
     Services are items you offer to your customers.<BR><BR>
+<%= $total %> services
+<%= $cgi->param('showdisabled')
+      ? do { $cgi->param('showdisabled', 0);
+             '( <a href="'. $cgi->self_url. '">hide disabled services</a> )'; }
+      : do { $cgi->param('showdisabled', 1);
+             '( <a href="'. $cgi->self_url. '">show disabled services</a> )'; }
+%>
 <TABLE BORDER=1>
   <TR>
-    <TH COLSPAN=2>Service</TH>
+    <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Service</TH>
     <TH>Table</TH>
     <TH>Field</TH>
     <TH COLSPAN=2>Modifier</TH>
@@ -12,7 +32,7 @@
 
 <% foreach my $part_svc ( sort {
      $a->getfield('svcpart') <=> $b->getfield('svcpart')
-   } qsearch('part_svc',{}) ) {
+   } @part_svc ) {
      my($hashref)=$part_svc->hashref;
      my($svcdb)=$hashref->{svcdb};
      my @fields =
@@ -26,6 +46,10 @@
   <TR>
     <TD ROWSPAN=<%= $rowspan %>><A HREF="<%= $url %>">
       <%= $hashref->{svcpart} %></A></TD>
+<% unless ( $cgi->param('showdisabled') ) { %>
+    <TD ROWSPAN=<%= $rowspan %>>
+      <%= $hashref->{disabled} ? 'DISABLED' : '' %></TD>
+<% } %>
     <TD ROWSPAN=<%= $rowspan %>><A HREF="<%= $url %>">
       <%= $hashref->{svc} %></A></TD>
     <TD ROWSPAN=<%= $rowspan %>>
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 849da8113..a2595bf41 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent_type.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: agent_type.cgi,v 1.6 2001-12-27 09:26:14 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $agent_type $action $hashref $p $part_pkg );
@@ -50,7 +50,7 @@ print <<END;
 <BR><BR>Select which packages agents of this type may sell to customers<BR>
 END
 
-foreach $part_pkg ( qsearch('part_pkg',{}) ) {
+foreach $part_pkg ( qsearch('part_pkg',{ 'disabled' => '' }) ) {
   print qq!<BR><INPUT TYPE="checkbox" NAME="pkgpart!,
         $part_pkg->getfield('pkgpart'), qq!" !,
        # ( 'CHECKED 'x scalar(
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 6967a1e1b..9588dcb3a 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.16 2001-12-15 22:47:24 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.17 2001-12-27 09:26:14 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -412,7 +412,7 @@ unless ( $custnum ) {
   #eslaf
 
   my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } }
-    qsearch( 'part_pkg', {} );
+    qsearch( 'part_pkg', { 'disabled' => '' } );
 
   if ( @part_pkg ) {
 
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index 7d5bb3fd3..73b190786 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pkg.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: cust_pkg.cgi,v 1.5 2001-12-27 09:26:14 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi %pkg %comment $custnum $p1 @cust_pkg 
@@ -17,7 +17,7 @@ $cgi = new CGI;
 
 %pkg = ();
 %comment = ();
-foreach (qsearch('part_pkg', {})) {
+foreach (qsearch('part_pkg', { 'disabled' => '' })) {
   $pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
   $comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
 }
@@ -83,6 +83,7 @@ print qq!<TABLE>!;
 foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
   $pkgparts++;
   my($pkgpart)=$type_pkgs->pkgpart;
+  next unless exists $pkg{$pkgpart}; #skip disabled ones
   print qq!<TR>! if ( $count == 0 );
   my $value = $cgi->param("pkg$pkgpart") || 0;
   print <<END;
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index fee0b411e..1618c5a99 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_pkg.cgi,v 1.6 2001-10-20 12:17:59 ivan Exp $ -->
+<!-- $Id: part_pkg.cgi,v 1.7 2001-12-27 09:26:14 ivan Exp $ -->
 
 <%
 
@@ -76,7 +76,7 @@ print '<FORM NAME="dummy">';
 #print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
 print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
 
-print itable("#cccccc",2), <<END;
+print ntable("#cccccc",2), <<END;
 <TR><TD ALIGN="right">Package (customer-visable)</TD><TD><INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}"></TD></TR>
 <TR><TD ALIGN="right">Comment (customer-hidden)</TD><TD><INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}"></TD></TR>
 <TR><TD ALIGN="right">Frequency (months) of recurring fee</TD><TD><INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}" SIZE=3></TD></TR>
@@ -96,6 +96,12 @@ print '<INPUT TYPE="checkbox" NAME="recurtax" VALUE="Y"';
 print ' CHECKED' if $hashref->{recurtax} eq "Y";
 print '>';
 
+print '</TD></TR>';
+
+print '<TR><TD ALIGN="right">Disable new orders</TD><TD>';
+print '<INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"';
+print ' CHECKED' if $hashref->{disabled} eq "Y";
+print '>';
 print '</TD></TR></TABLE>';
 
 my $thead =  "\n\n". ntable('#cccccc', 2). <<END;
@@ -112,7 +118,7 @@ END
 my @fixups = ();
 my $count = 0;
 my $columns = 3;
-my @part_svc = qsearch( 'part_svc', {} );
+my @part_svc = qsearch( 'part_svc', { 'disabled' => '' } );
 foreach my $part_svc ( @part_svc ) {
   my $svcpart = $part_svc->svcpart;
   my $pkg_svc = qsearchs( 'pkg_svc', {
@@ -232,7 +238,7 @@ function fixup(what) {
 <% foreach my $f ( qw( pkg comment freq ), @fixups ) { %>
   what.<%= $f %>.value = document.dummy.<%= $f %>.value;
 <% } %>
-<% foreach my $f ( qw( setuptax recurtax ) ) { %>
+<% foreach my $f ( qw( setuptax recurtax disabled ) ) { %>
   if (document.dummy.<%= $f %>.checked)
     what.<%= $f %>.value = 'Y';
   else
@@ -270,6 +276,7 @@ if (document.getElementById) {
 <INPUT TYPE="hidden" NAME="freq" VALUE="<%= $hashref->{freq} %>">
 <INPUT TYPE="hidden" NAME="setuptax" VALUE="<%= $hashref->{setuptax} %>">
 <INPUT TYPE="hidden" NAME="recurtax" VALUE="<%= $hashref->{recurtax} %>">
+<INPUT TYPE="hidden" NAME="disabled" VALUE="<%= $hashref->{disabled} %>">
 <% foreach my $f ( @fixups ) { %>
 <INPUT TYPE="hidden" NAME="<%= $f %>" VALUE="">
 <% } %>
@@ -284,7 +291,7 @@ if ( $cgi->param('pkgnum') ) {
 %>
 
 <INPUT TYPE="hidden" NAME="pkgpart" VALUE="<%= $hashref->{pkgpart} %>">
-<%= itable("#cccccc",2) %>
+<%= ntable("#cccccc",2) %>
 
 <% my $href = $plans{$layer}->{'fields'};
    foreach my $field ( keys %{ $href } ) { %>
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 29778567e..f2555a29f 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.12 2001-10-15 10:42:29 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.13 2001-12-27 09:26:14 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -45,8 +45,9 @@ function visualize(what) {
 
       Service Part #<%= $part_svc->svcpart ? $part_svc->svcpart : "(NEW)" %>
 <BR><BR>
-Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>">
-<BR><BR>
+Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>"><BR>
+Disable new orders <INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref->{disabled} eq 'Y' ? ' CHECKED' : '' %>><BR>
+<BR>
 Services are items you offer to your customers.
 <UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
     <LI>svc_domain - Domains
@@ -167,12 +168,17 @@ if (document.getElementById) {
 
 function fixup(what) {
   what.svc.value = document.dummy.svc.value;
-  what.svcdb.value = document.dummy.svcdb.options[document.dummy.svcdb.selectedIndex].value
+  what.svcdb.value = document.dummy.svcdb.options[document.dummy.svcdb.selectedIndex].value;
+  if (document.dummy.disabled.checked)
+    what.disabled.value = 'Y';
+  else
+    what.disabled.value = '';
 }
 </SCRIPT>
 <FORM NAME="<%= $svcdb %>" ACTION="process/part_svc.cgi" METHOD=POST onSubmit="fixup(this)">
 <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $hashref->{svcpart} %>">
 <INPUT TYPE="hidden" NAME="svc" VALUE="<%= $hashref->{svc} %>">
+<INPUT TYPE="hidden" NAME="disabled" VALUE="<%= $hashref->{disabled} %>">
 <INPUT TYPE="hidden" NAME="svcdb" VALUE="<%= $svcdb %>">
 <%
   print "$svcdb" unless $svcdb eq 'konq_kludge';
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index c64d49219..08bc9b723 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_pkg.cgi,v 1.5 2001-11-06 18:45:46 ivan Exp $ -->
+#<!-- $Id: part_pkg.cgi,v 1.6 2001-12-27 09:26:14 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $pkgpart $old $new $part_svc $error $dbh );
@@ -26,8 +26,9 @@ $cgi->param('plandata',
   join('', map { "$_=". $cgi->param($_). "\n" } @plandata )
 );
 
-$cgi->param('setuptax','') unless defined $cgi->param('setuptax');
-$cgi->param('recurtax','') unless defined $cgi->param('recurtax');
+foreach (qw( setuptax recurtax disabled )) {
+  $cgi->param($_, '') unless defined $cgi->param($_);
+}
 
 $new = new FS::part_pkg ( {
   map {
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index e84fa0756..8710dd19d 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.17 2001-12-26 15:41:02 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.18 2001-12-27 09:26:14 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
@@ -268,8 +268,11 @@ print '<BR>'.
 
 foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
   my $pkgpart = $type_pkgs->pkgpart;
-  my $part_pkg = qsearchs('part_pkg', { 'pkgpart' => $pkgpart } )
-    or do { warn "unknown type_pkgs.pkgpart $pkgpart"; next; };
+#  my $part_pkg = qsearchs('part_pkg', { 'pkgpart' => $pkgpart } )
+#    or do { warn "unknown type_pkgs.pkgpart $pkgpart"; next; };
+  my $part_pkg =
+    qsearchs('part_pkg', { 'pkgpart' => $pkgpart, 'disabled' => '' } )
+    or next;
   print qq!<OPTION VALUE="$pkgpart">!. $part_pkg->pkg. ' - '.
         $part_pkg->comment;
 }
-- 
cgit v1.2.1


From 5e25b996982d42eb2587ec54db0d5b39508aa730 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Dec 2001 14:40:35 +0000
Subject: add more options to freeside-overdue

add charge method to FS::cust_main

one-off packages default to disabled

billing payname defaults to first and last, not "Accounts Payable"
---
 FS/FS/cust_main.pm            | 26 ++++++++++++-
 FS/bin/freeside-bill          |  6 +--
 FS/bin/freeside-overdue       | 85 +++++++++++++++++++++++++++++++------------
 httemplate/edit/cust_main.cgi |  6 +--
 httemplate/edit/part_pkg.cgi  |  3 +-
 5 files changed, 95 insertions(+), 31 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 3995e6561..6c18f93a1 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -28,6 +28,7 @@ use FS::cust_credit_bill;
 use FS::cust_bill_pay;
 use FS::prepay_credit;
 use FS::queue;
+use FS::part_pkg;
 
 @ISA = qw( FS::Record );
 
@@ -1775,6 +1776,29 @@ sub credit {
   $cust_credit->insert;
 }
 
+=item charge AMOUNT PKG COMMENT
+
+Creates a one-time charge for this customer.  If there is an error, returns
+the error, otherwise returns false.
+
+=cut
+
+sub charge {
+  my ( $self, $amount, $pkg, $comment ) = @_;
+
+  my $part_pkg = new FS::part_pkg ( {
+    'pkg'      => $pkg || 'One-time charge',
+    'comment'  => $comment,
+    'setup'    => $amount,
+    'freq'     => 0,
+    'recur'    => '0',
+    'disabled' => 'Y',
+  } );
+
+  $part_pkg->insert;
+
+}
+
 =back
 
 =head1 SUBROUTINES
@@ -1916,7 +1940,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.51 2001-12-26 11:17:49 ivan Exp $
+$Id: cust_main.pm,v 1.52 2001-12-28 14:40:35 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill
index 7898936c5..49ec43c82 100755
--- a/FS/bin/freeside-bill
+++ b/FS/bin/freeside-bill
@@ -59,14 +59,14 @@ foreach $cust_main (
 
   if ($opt_p) {
     $cust_main->apply_payments;
-    $error=$cust_main->apply_credits;
+    $cust_main->apply_credits;
   }
 
   if ($opt_c) {
     $error=$cust_main->collect('invoice_time'=>$time,
                                'batch_card' => $opt_i ? 'no' : 'yes',
                               );
-    warn "Error collecting from customer #" . $cust_main->gcustnum.  ":$error"
+    warn "Error collecting from customer #" . $cust_main->custnum.  ":$error"
       if $error;
 
     #sleep 1;
@@ -123,7 +123,7 @@ customers.  Otherwise, bills all customers.
 
 =head1 VERSION
 
-$Id: freeside-bill,v 1.10 2001-11-05 14:04:56 ivan Exp $
+$Id: freeside-bill,v 1.11 2001-12-28 14:40:35 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-overdue b/FS/bin/freeside-overdue
index 0c62b99c1..8f7f872c8 100755
--- a/FS/bin/freeside-overdue
+++ b/FS/bin/freeside-overdue
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 
 use strict;
 use vars qw( $days_to_pay $cust_main $cust_pkg 
@@ -13,12 +13,12 @@ use FS::UID qw(adminsuidsetup);
 
 &untaint_argv;
 my %opt;
-getopts('ed:qplsc', \%opt);
+getopts('ed:qplscbyoi', \%opt);
 my $user = shift or die &usage;
 
 adminsuidsetup $user;
 
-my $now = time;
+my $now = time; #eventually take a time option like freeside-bill
 my ($sec,$min,$hour,$mday,$mon,$year) =
   (localtime($now) )[0,1,2,3,4,5];
 $mon++;
@@ -48,21 +48,23 @@ foreach $cust_main ( qsearch('cust_main',{} ) ) {
             $cust_main->balance_date(time-$opt{d} * 86400);
     }
 
-#    if ( $opt{l} ) {
-#      print "\n\tCharging late fee of \$$opt{l}" unless $opt{q};
-#
-#    }
+    if ( $opt{p} && ! grep { $_ eq 'POST' } $cust_main->invoicing_list ) {
+      print "\n\tAdding postal invoicing" unless $opt{q};
+      my @invoicing_list = $cust_main->invoicing_list;
+      push @invoicing_list, 'POST';
+      $cust_main->invoicing_list(\@invoicing_list);
+    }
+
+    if ( $opt{l} ) {
+      print "\n\tCharging late fee of \$$opt{l}" unless $opt{q};
+      my $error = $cust_main->charge($opt{l}, 'Late fee');
+      # comment or plandata with info so we don't redo the same late fee every
+      # day
+    }
 
     foreach $cust_pkg ( qsearch( 'cust_pkg', 
                                  { 'custnum' => $cust_main->custnum } ) ) {
 
-      if ( $opt{p} && ! grep { $_ eq 'POST' } $cust_main->invoicing_list ) {
-        print "\n\tAdding postal invoicing" unless $opt{q};
-        my @invoicing_list = $cust_main->invoicing_list;
-        push @invoicing_list, 'POST';
-        $cust_main->invoicing_list(\@invoicing_list);
-      }
-
       if ($opt{s}) {
         print "\n\tSuspending pkgnum " . $cust_pkg->pkgnum unless $opt{q};
         $cust_pkg->suspend;
@@ -72,7 +74,29 @@ foreach $cust_main ( qsearch('cust_main',{} ) ) {
         print "\n\tCancelling pkgnum " . $cust_pkg->pkgnum unless $opt{q};
         $cust_pkg->cancel;
       }
+      
+    }
+
+    if ( $opt{b} ) {
+      print "\n\tBilling" unless $opt{q};
+      my $error = $cust_main->bill('time'=>$now);
+      warn "Error billing,  customer #" . $cust_main->custnum . 
+        ":" . $error if $error;
+    }
 
+    if ( $opt{y} ) {
+      print "\n\tApplying outstanding payments and credits" unless $opt{q};
+      $cust_main->apply_payments;
+      $cust_main->apply_credits;
+    }
+
+    if ( $opt{o} ) {
+      print "\n\tCollecting" unless $opt{q};
+      my $error = $cust_main->collect( 'invoice_time'=>$now,
+                                       'batch_card' => $opt{i} ? 'no' : 'yes',
+                                     );
+      warn "Error collecting from customer #" . $cust_main->custnum.  ":$error"
+        if $error;
     }
 
     print "\n" unless $opt{q};
@@ -99,7 +123,7 @@ freeside-overdue - Perform actions on overdue and/or expired accounts.
 
 =head1 SYNOPSIS
 
-  freeside-overdue [ -e ] [ -d days ] [ -q ] [ -p ] [ -l amount ] [ -s ] [ -c ] user
+  freeside-overdue [ -e ] [ -d days ] [ -q ] [ -p ] [ -l amount ] [ -s ] [ -c ] [ -b ] [ -y ] [ -o [ -i ] ] user
 
 =head1 DESCRIPTION
 
@@ -107,22 +131,31 @@ Performs actions on overdue and/or expired accounts.
 
 Selection options (at least one selection option is required):
 
-  -d:	Customers with a balance due on invoices older than the supplied number
-        of days.  Requires an integer argument.
+  -d:  Customers with a balance due on invoices older than the supplied number
+       of days.  Requires an integer argument.
 
-  -e:   Customers with a billing expiration date in the past.
+  -e:  Customers with a billing expiration date in the past.
 
 Action options: 
 
-  -q:   Be quiet (by default, selected accounts are printed).
+  -q:  Be quiet (by default, selected accounts are printed).
+
+  -p:  Add postal invoicing to the relevant customers.
+
+  -l:  Add a charge of the given amount to the relevant customers.
+
+  -s:  Suspend accounts.
 
-  -p:   Add postal invoicing to the relevant customers.
+  -c:  Cancel accounts.
 
-  -l:   Add a charge of the given amount to the relevant customers.
+  -b:  Bill customers (create invoices)
 
-  -s:	Suspend accounts.
+  -y:  Apply unapplied payments and credits
 
-  -c:   Cancel accounts.
+  -o:  Collect from customers (charge cards, print invoices)
+
+    -i:  real-time billing (as opposed to batch billing).  only relevant
+         for credit cards.
 
   user: From the mapsecrets file - see config.html from the base documentation
 
@@ -146,6 +179,12 @@ Example crontab entries:
 
 Original disable-overdue version by mw/kwh: Mark W.? and Kristian Hoffmann ?
 
+Ivan seems to be turning it into the "do-everything" CLI.
+
+=head1 BUGS
+
+Hell now that this is the do-everything CLI it should have --longoptions
+
 =cut
 
 1;
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 9588dcb3a..d3251c2b9 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.17 2001-12-27 09:26:14 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.18 2001-12-28 14:40:35 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -364,12 +364,12 @@ print "<TR><TD>Billing type</TD></TR>",
 
 %payby = (
   'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>${r}Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
+  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
   'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
 );
 %paybychecked = (
   'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>${r}Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
   'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
 );
 for (qw(CARD BILL COMP)) {
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 1618c5a99..735f4f269 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_pkg.cgi,v 1.7 2001-12-27 09:26:14 ivan Exp $ -->
+<!-- $Id: part_pkg.cgi,v 1.8 2001-12-28 14:40:35 ivan Exp $ -->
 
 <%
 
@@ -26,6 +26,7 @@ if ( $cgi->param('clone') ) {
   my $old_part_pkg =
     qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
   $part_pkg ||= $old_part_pkg->clone;
+  $part_pkg->disabled('Y');
 } elsif ( $query && $query =~ /^(\d+)$/ ) {
   $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
 } else {
-- 
cgit v1.2.1


From 368fe197549dab5edf86cd37b64b9fdddbd07a65 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Dec 2001 15:14:01 +0000
Subject: force printing in freeside-overdue

---
 FS/FS/cust_main.pm      | 20 +++++++++++++-------
 FS/bin/freeside-overdue |  8 +++++---
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 6c18f93a1..3e92417c4 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1067,6 +1067,9 @@ CyberCash is not installed.
 report_badcard - Set this true if you want bad card transactions to
 return an error.  By default, they don't.
 
+force_print - force printing even if invoice has been printed more than once
+every 30 days, and don't increment the `printed' field.
+
 =cut
 
 sub collect {
@@ -1118,7 +1121,8 @@ sub collect {
       my $since = $invoice_time - ( $cust_bill->_date || 0 );
       #warn "$invoice_time ", $cust_bill->_date, " $since";
       if ( $since >= 0 #don't print future invoices
-           && ( $cust_bill->printed * 2592000 ) <= $since
+           && ( ( $cust_bill->printed * 2592000 ) <= $since
+                || $options{'force_print'} )
       ) {
 
         #my @print_text = $cust_bill->print_text; #( date )
@@ -1148,11 +1152,13 @@ sub collect {
                          : "Exit status $? from $lpr";
         }
 
-        my %hash = $cust_bill->hash;
-        $hash{'printed'}++;
-        my $new_cust_bill = new FS::cust_bill(\%hash);
-        my $error = $new_cust_bill->replace($cust_bill);
-        warn "Error updating $cust_bill->printed: $error" if $error;
+        unless ( $options{'force_print'} ) {
+          my %hash = $cust_bill->hash;
+          $hash{'printed'}++;
+          my $new_cust_bill = new FS::cust_bill(\%hash);
+          my $error = $new_cust_bill->replace($cust_bill);
+          warn "Error updating $cust_bill->printed: $error" if $error;
+        }
 
       }
 
@@ -1940,7 +1946,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.52 2001-12-28 14:40:35 ivan Exp $
+$Id: cust_main.pm,v 1.53 2001-12-28 15:14:01 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-overdue b/FS/bin/freeside-overdue
index 8f7f872c8..076330228 100755
--- a/FS/bin/freeside-overdue
+++ b/FS/bin/freeside-overdue
@@ -92,9 +92,11 @@ foreach $cust_main ( qsearch('cust_main',{} ) ) {
 
     if ( $opt{o} ) {
       print "\n\tCollecting" unless $opt{q};
-      my $error = $cust_main->collect( 'invoice_time'=>$now,
-                                       'batch_card' => $opt{i} ? 'no' : 'yes',
-                                     );
+      my $error = $cust_main->collect(
+        'invoice_time' => $now,
+        'batch_card'   => $opt{i} ? 'no' : 'yes',
+        'force_print'  => 'yes',
+      );
       warn "Error collecting from customer #" . $cust_main->custnum.  ":$error"
         if $error;
     }
-- 
cgit v1.2.1


From e3f87d761538a0a21d26fc86b5bce7c9d737d590 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Dec 2001 15:17:40 +0000
Subject: update usage message

---
 FS/bin/freeside-overdue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-overdue b/FS/bin/freeside-overdue
index 076330228..964321884 100755
--- a/FS/bin/freeside-overdue
+++ b/FS/bin/freeside-overdue
@@ -115,7 +115,7 @@ sub untaint_argv {
 }
 
 sub usage {
-  die "Usage:\n\n  freeside-overdue [ -e ] [ -d days ] [ -q ] [ -p ] [ -l amount ] [ -s ] [ -c ] user\n";
+  die "Usage:\n\n    freeside-overdue [ -e ] [ -d days ] [ -q ] [ -p ] [ -l amount ] [ -s ] [ -c ] [ -b ] [ -y ] [ -o [ -i ] ] user\n";
 }
 
 
-- 
cgit v1.2.1


From 69a0a7504f84aa9bb1f204d1f3522e1520e0885e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 3 Jan 2002 17:40:26 +0000
Subject: more schema changes:  part_bill_event and cust_bill_event tables

remove old 1.4.0pre READMEs
---
 FS/FS/cust_bill_event.pm      | 134 ++++++++++++++++++++++++++++++++++++++++++
 FS/FS/part_bill_event.pm      | 132 +++++++++++++++++++++++++++++++++++++++++
 FS/MANIFEST                   |   4 ++
 FS/t/cust_bill_event.t        |   5 ++
 FS/t/part_bill_event.t        |   5 ++
 README.1.4.0pre2-3            |  39 ------------
 README.1.4.0pre3-4            |  23 --------
 README.1.4.0pre4567-8         |  19 ++++++
 bin/fs-setup                  |  28 ++++++++-
 httemplate/docs/schema.html   |  16 +++++
 httemplate/docs/upgrade8.html |  19 ++++++
 11 files changed, 361 insertions(+), 63 deletions(-)
 create mode 100644 FS/FS/cust_bill_event.pm
 create mode 100644 FS/FS/part_bill_event.pm
 create mode 100644 FS/t/cust_bill_event.t
 create mode 100644 FS/t/part_bill_event.t
 delete mode 100644 README.1.4.0pre2-3
 delete mode 100644 README.1.4.0pre3-4

diff --git a/FS/FS/cust_bill_event.pm b/FS/FS/cust_bill_event.pm
new file mode 100644
index 000000000..910b4dead
--- /dev/null
+++ b/FS/FS/cust_bill_event.pm
@@ -0,0 +1,134 @@
+package FS::cust_bill_event;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::cust_bill_event - Object methods for cust_bill_event records
+
+=head1 SYNOPSIS
+
+  use FS::cust_bill_event;
+
+  $record = new FS::cust_bill_event \%hash;
+  $record = new FS::cust_bill_event { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_bill_event object represents an complete invoice event.
+FS::cust_bill_event inherits from FS::Record.  The following fields are
+currently supported:
+
+=over 4
+
+=item eventnum - primary key
+
+=item invnum - invoice (see L<FS::cust_bill>)
+
+=item eventpart - event definition (see L<FS::part_bill_event>)
+
+=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new completed invoice event.  To add the compelted invoice event to
+the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'cust_bill_event'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid completed invoice event.  If
+there is an error, returns the error, otherwise returns false.  Called by the
+insert and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = $self->ut_numbern('eventnum')
+    || $self->ut_number('invnum')
+    || $self->ut_number('eventpart')
+    || $self->ut_number('_date')
+  ;
+
+  return "Unknown invnum"
+    unless qsearchs( 'cust_bill' ,{ 'invnum' => $self->invnum } );
+
+  return "Unknown eventpart"
+    unless qsearchs( 'part_bill_event' ,{ 'eventpart' => $self->eventpart } );
+
+  ''; #no error
+}
+
+=back
+
+=head1 BUGS
+
+Far too early in the morning.
+
+=head1 SEE ALSO
+
+L<FS::part_bill_event>, L<FS::cust_bill>, L<FS::Record>, schema.html from the
+base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
new file mode 100644
index 000000000..fb2c06ad4
--- /dev/null
+++ b/FS/FS/part_bill_event.pm
@@ -0,0 +1,132 @@
+package FS::part_bill_event;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::part_bill_event - Object methods for part_bill_event records
+
+=head1 SYNOPSIS
+
+  use FS::part_bill_event;
+
+  $record = new FS::part_bill_event \%hash;
+  $record = new FS::part_bill_event { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::part_bill_event object represents an invoice event definition -
+a callback which is triggered when an invoice is a certain amount of time
+overdue.  FS::part_bill_event inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item eventpart - primary key
+
+=item payby - CARD, BILL, or COMP
+
+=item event - event name
+
+=item eventcode - event action
+
+=item seconds - how long after the invoice date events of this type are triggered
+
+=item disabled - Disabled flag, empty or `Y'
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new invoice event definition.  To add the example to the database,
+see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'part_bill_event'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid invoice event definition.  If
+there is an error, returns the error, otherwise returns false.  Called by the
+insert and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  $self->ut_numbern('eventpart')
+    || $self->ut_enum('payby', [qw( CARD BILL COMP )] )
+    || $self->ut_text('event')
+    || $self->ut_anything('eventcode')
+    || $self->ut_number('seconds')
+    || $self->ut_enum('disabled', [ '', 'Y' ] )
+  ;
+}
+
+=back
+
+=head1 BUGS
+
+Alas.
+
+=head1 SEE ALSO
+
+L<FS::cust_bill>, L<FS::cust_bill_event>, L<FS::Record>, schema.html from the
+base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 23a27d1d3..0a9205c7f 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -31,12 +31,14 @@ FS/cust_main.pm
 FS/cust_main_county.pm
 FS/cust_main_invoice.pm
 FS/cust_pay.pm
+FS/cust_bill_event.pm
 FS/cust_bill_pay.pm
 FS/cust_pay_batch.pm
 FS/cust_pkg.pm
 FS/cust_refund.pm
 FS/cust_credit_refund.pm
 FS/cust_svc.pm
+FS/part_bill_event.pm
 FS/part_pkg.pm
 FS/part_pop_local.pm
 FS/part_referral.pm
@@ -67,6 +69,7 @@ t/CGIwrapper.t
 t/Conf.t
 t/ConfItem.t
 t/cust_bill.t
+t/cust_bill_event.t
 t/cust_bill_pay.t
 t/cust_bill_pkg.t
 t/cust_credit.t
@@ -82,6 +85,7 @@ t/cust_refund.t
 t/cust_svc.t
 t/domain_record.t
 t/nas.t
+t/part_bill_event.t
 t/part_pkg.t
 t/part_pop_local.t
 t/part_referral.t
diff --git a/FS/t/cust_bill_event.t b/FS/t/cust_bill_event.t
new file mode 100644
index 000000000..0e2ca3e24
--- /dev/null
+++ b/FS/t/cust_bill_event.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_bill_event;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_bill_event.t b/FS/t/part_bill_event.t
new file mode 100644
index 000000000..5626a9f97
--- /dev/null
+++ b/FS/t/part_bill_event.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_bill_event;
+$loaded=1;
+print "ok 1\n";
diff --git a/README.1.4.0pre2-3 b/README.1.4.0pre2-3
deleted file mode 100644
index eac5dae10..000000000
--- a/README.1.4.0pre2-3
+++ /dev/null
@@ -1,39 +0,0 @@
-the following is necessary to upgrade from 1.4.0pre2 to pre3 or later.
-
-install the perl modules and httemplate as per install.html or upgrade8.html
-
-CREATE TABLE part_svc_column (
-  columnnum int primary key,
-  svcpart int not null,
-  columnname varchar(64) not null,
-  columnvalue varchar(80) null,
-  columnflag char(1) null
-);
-
-CREATE UNIQUE INDEX part_svc_column1 ON part_svc_column ( svcpart, columnname );
-
-CREATE TABLE queue (
-  jobnum int primary key,
-  job varchar not null,
-  _date int not null,
-  status varchar(80) not null
-);
-
-CREATE TABLE queue_arg (
-  argnum int primary key,
-  jobnum int not null,
-  arg varchar null
-);
-
-CREATE INDEX queue_arg1 ON queue_arg ( jobnum );
-
-Run bin/dbdef-create
-
-Run bin/fs-migrate-part_svc
-
-Create the `/usr/local/etc/freeside/cache.<i>datasrc</i>' directory
-  (ownded by the freeside user).
-
-freeside-queued was installed with the Perl modules.  Start it now and ensure
-that it is run upon system startup.
-
diff --git a/README.1.4.0pre3-4 b/README.1.4.0pre3-4
deleted file mode 100644
index 0027d3450..000000000
--- a/README.1.4.0pre3-4
+++ /dev/null
@@ -1,23 +0,0 @@
-the following is necessary to upgrade from 1.4.0pre3 to pre4 or later.
-
-install the perl modules and httemplate as per install.html or upgrade8.html
-
-CREATE TABLE part_pop_local (
-  localnum int primary key,
-  popnum int not null,
-  city varchar(80) null,
-  state char(2) null,
-  npa char(3) not null,
-  nxx char(3) not null
-);
-CREATE INDEX part_pop_local1 ON part_pop_local ( npa, nxx );
-ALTER TABLE cust_pkg ADD manual_flag char(1) NULL;
-ALTER TABLE cust_pay_batch ADD paybatchnum integer;
-CREATE UNIQUE INDEX cust_pay_batch_pkey ON cust_pay_batch ( paybatchnum );
-ALTER TABLE part_pkg ADD plan varchar NULL;
-ALTER TABLE part_pkg ADD plandata varchar NULL;
-ALTER TABLE part_pkg ADD setuptax char(1) NULL;
-ALTER TABLE part_pkg ADD recurtax char(1) NULL;
-
-Run bin/dbdef-create
-
diff --git a/README.1.4.0pre4567-8 b/README.1.4.0pre4567-8
index 2e2138b37..e567120a9 100644
--- a/README.1.4.0pre4567-8
+++ b/README.1.4.0pre4567-8
@@ -5,6 +5,25 @@ install the perl modules and httemplate as per install.html or upgrade8.html
 ALTER TABLE part_pkg ADD disabled char(1) NULL;
 ALTER TABLE part_svc ADD disabled char(1) NULL;
 
+CREATE TABLE cust_bill_events (
+  eventnum int primary key,
+  invnum int not null,
+  eventpart int not null,
+  _date int not null,
+);
+CREATE UNIQUE INDEX cust_bill_events1 ON cust_bill_events ( eventpart, invnum );
+CREATE INDEX cust_bill_events2 ON cust_bill_events ( invnum );
+
+CREATE TABLE part_bill_events (
+  eventpart int primary key,
+  payby char(4) not null,
+  event varchar(80) not null,
+  eventcode text null,
+  seconds int null,
+  disabled char(1) null,
+);
+CREATE INDEX part_bill_events1 ON part_bill_events ( payby );
+
 Run bin/dbdef-create
 
 Restart Apache and freeside-queued
diff --git a/bin/fs-setup b/bin/fs-setup
index e7aa3b0d9..c7335a8fb 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.68 2001-12-27 09:26:13 ivan Exp $
+# $Id: fs-setup,v 1.69 2002-01-03 17:40:26 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -299,6 +299,32 @@ sub tables_hash_hack {
       'index' => [ ['custnum'] ],
     },
 
+    'cust_bill_event' => {
+      'columns' => [
+        'eventnum',    'int',  '', '',
+        'invnum',   'int',  '', '',
+        'eventpart',   'int',  '', '',
+        '_date',     @date_type,
+      ],
+      'primary_key' => 'eventnum',
+      'unique' => [ [ 'eventpart', 'invnum' ] ],
+      'index' => [ ['invnum'] ],
+    },
+
+    'part_bill_event' => {
+      'columns' => [
+        'eventpart',    'int',  '', '',
+        'payby',       'int',  '', '',
+        'event',       'varchar',           '',     $char_d,
+        'eventcode',    @perl_type,
+        'seconds',     'int', 'NULL', '',
+        'disabled',     'char', 'NULL', 1,
+      ],
+      'primary_key' => 'eventpart',
+      'unique' => [ [] ],
+      'index' => [ ['payby'] ],
+    },
+
     'cust_bill_pkg' => {
       'columns' => [
         'pkgnum',  'int', '', '',
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 9f00d48b1..a51bf6e68 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -25,6 +25,22 @@
         <li>charged - amount of this invoice
         <li>printed - how many times this invoice has been printed automatically
       </ul>
+    <li><a name="cust_bill_event" href="man/FS/cust_bill_event.html">cust_bill_event</a> - Invoice event history
+      <ul>
+        <li>eventnum - primary key
+        <li>invnum - <a href="#cust_bill">invoice</a>
+        <li>eventpart - <a href="#part_bill_event">event definition</a>
+        <li>_date
+      </ul>
+    <li><a name="part_bill_event" href="man/FS/part_bill_event.html">part_bill_event</a> - Invoice event definitions
+      <ul>
+        <li>eventpart - primary key
+        <li>payby - CARD, BILL, or COMP
+        <li>event - event name
+        <li>eventcode - event action
+        <li>seconds - how long after the invoice date (<a href="#cust_bill">cust_bill</a>._date) events of this type are triggered
+        <li>disabled - Disabled flag, empty or `Y'
+      </ul>
     <li><a name="cust_bill_pkg" href="man/FS/cust_bill_pkg.html">cust_bill_pkg</a> - Invoice line items
       <ul>
         <li>invnum - (multiple) key
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 0855e6dee..13830dc6c 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -124,6 +124,25 @@ CREATE TABLE part_pop_local (
 );
 CREATE UNIQUE INDEX part_pop_local1 ON part_pop_local ( npa, nxx );
 
+CREATE TABLE cust_bill_event (
+  eventnum int primary key,
+  invnum int not null,
+  eventpart int not null,
+  _date int not null,
+);
+CREATE UNIQUE INDEX cust_bill_event1 ON cust_bill_event ( eventpart, invnum );
+CREATE INDEX cust_bill_event2 ON cust_bill_event ( invnum );
+
+CREATE TABLE part_bill_event (
+  eventpart int primary key,
+  payby char(4) not null,
+  event varchar(80) not null,
+  eventcode text null,
+  seconds int null,
+  disabled char(1) null,
+);
+CREATE INDEX part_bill_event1 ON part_bill_event ( payby );
+
 ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
 ALTER TABLE svc_domain ADD catchall integer NULL;
 ALTER TABLE cust_main ADD referral_custnum integer NULL;
-- 
cgit v1.2.1


From d73c1796de9df0ed14469f745d985cd706137d6d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Jan 2002 13:29:34 +0000
Subject: update fuzzy cache files on customer replace.

do an exact search along with the fuzzy search (webui)
---
 FS/FS/cust_main.pm              | 22 +++++++++++++++++++++-
 httemplate/search/cust_main.cgi | 24 +++++++++++++-----------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 3e92417c4..1a9d43e94 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -347,6 +347,7 @@ sub insert {
     }
   }
 
+  #false laziness with sub replace
   my $queue = new FS::queue { 'job' => 'FS::cust_main::append_fuzzyfiles' };
   $error = $queue->insert($self->getfield('last'), $self->company);
   if ( $error ) {
@@ -362,6 +363,7 @@ sub insert {
       return "queueing job (transaction rolled back): $error";
     }
   }
+  #eslaf
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
@@ -509,6 +511,24 @@ sub replace {
     $self->invoicing_list( $invoicing_list );
   }
 
+  #false laziness with sub insert
+  my $queue = new FS::queue { 'job' => 'FS::cust_main::append_fuzzyfiles' };
+  $error = $queue->insert($self->getfield('last'), $self->company);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "queueing job (transaction rolled back): $error";
+  }
+
+  if ( defined $self->dbdef_table->column('ship_last') && $self->ship_last ) {
+    $queue = new FS::queue { 'job' => 'FS::cust_main::append_fuzzyfiles' };
+    $error = $queue->insert($self->getfield('last'), $self->company);
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
+  }
+  #eslaf
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 
@@ -1946,7 +1966,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.53 2001-12-28 15:14:01 ivan Exp $
+$Id: cust_main.pm,v 1.54 2002-01-09 13:29:33 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 4d3ec3564..65db0a815 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.19 2001-12-26 05:19:01 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.20 2002-01-09 13:29:34 ivan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
@@ -399,17 +399,18 @@ sub lastsearch {
     or eidiot "Illegal last name";
   my($last)=$1;
 
-  if ( $last_type{'Exact'}
-       && ! $last_type{'Fuzzy'} 
-     #  && ! $last_type{'Sound-alike'}
-  ) {
+#  if ( $last_type{'Exact'}
+#       && ! $last_type{'Fuzzy'} 
+#     #  && ! $last_type{'Sound-alike'}
+#  ) {
 
     push @cust_main, qsearch('cust_main',{'last'=>$last});
 
     push @cust_main, qsearch('cust_main',{'ship_last'=>$last})
       if defined dbdef->table('cust_main')->column('ship_last');
 
-  } else {
+#  } else {
+  if ( $last_type{'Fuzzy'} ) {
 
     &FS::cust_main::check_and_rebuild_fuzzyfiles;
     my $all_last = &FS::cust_main::all_last;
@@ -445,17 +446,18 @@ sub companysearch {
     or eidiot "Illegal company";
   my($company)=$1;
 
-  if ( $company_type{'Exact'}
-       && ! $company_type{'Fuzzy'} 
-     #  && ! $company_type{'Sound-alike'}
-  ) {
+#  if ( $company_type{'Exact'}
+#       && ! $company_type{'Fuzzy'} 
+#     #  && ! $company_type{'Sound-alike'}
+#  ) {
 
     push @cust_main, qsearch('cust_main',{'company'=>$company});
 
     push @cust_main, qsearch('cust_main',{'ship_company'=>$company})
       if defined dbdef->table('cust_main')->column('ship_last');
 
-  } else {
+#  } else {
+  if ( $company_type{'Fuzzy'} ) {
 
     &FS::cust_main::check_and_rebuild_fuzzyfiles;
     my $all_company = &FS::cust_main::all_company;
-- 
cgit v1.2.1


From 17d52b98d95c3f5494fd890e1b0e41c6b34463eb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Jan 2002 07:23:16 +0000
Subject: fix upgrade8.html to be in agreement with fs-setup

---
 httemplate/docs/upgrade8.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 13830dc6c..904694879 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -102,7 +102,7 @@ CREATE TABLE part_svc_column (
 
 CREATE TABLE queue (
   jobnum int primary key,
-  job varchar not null,
+  job text not null,
   _date int not null,
   status varchar(80) not null
 );
@@ -110,7 +110,7 @@ CREATE TABLE queue (
 CREATE TABLE queue_arg (
   argnum int primary key,
   jobnum int not null,
-  arg varchar null
+  arg text null
 );
 CREATE INDEX queue_arg1 ON queue_arg ( jobnum );
 
@@ -150,8 +150,8 @@ ALTER TABLE cust_pay ADD custnum integer;
 ALTER TABLE cust_pay_batch ADD paybatchnum integer;
 ALTER TABLE cust_refund ADD custnum integer;
 ALTER TABLE cust_pkg ADD manual_flag char(1) NULL;
-ALTER TABLE part_pkg ADD plan varchar NULL;
-ALTER TABLE part_pkg ADD plandata varchar NULL;
+ALTER TABLE part_pkg ADD plan varchar(80) NULL;
+ALTER TABLE part_pkg ADD plandata text NULL;
 ALTER TABLE part_pkg ADD setuptax char(1) NULL;
 ALTER TABLE part_pkg ADD recurtax char(1) NULL;
 ALTER TABLE part_pkg ADD disabled char(1) NULL;
@@ -217,7 +217,7 @@ CREATE INDEX cust_main2 ON cust_main ( ship_company );
   <li>If you wish to enable customer comments, apply the following change to
       your database:
 <pre>
-ALTER TABLE cust_main ADD COLUMN comments varchar NULL;
+ALTER TABLE cust_main ADD COLUMN comments text NULL;
 </pre>
   <li>If you are using the signup server, reinstall it according to the <a href="signup.html">instructions</a>.  The 1.3.x signup server is not compatible with 1.4.x.
   <li>Run bin/dbdef-create.
-- 
cgit v1.2.1


From 947a8fac5088418d76d92494f810d6a3b3313595 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 14 Jan 2002 14:29:00 +0000
Subject: fix -l option

---
 FS/bin/freeside-overdue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-overdue b/FS/bin/freeside-overdue
index 964321884..db99e62b4 100755
--- a/FS/bin/freeside-overdue
+++ b/FS/bin/freeside-overdue
@@ -13,7 +13,7 @@ use FS::UID qw(adminsuidsetup);
 
 &untaint_argv;
 my %opt;
-getopts('ed:qplscbyoi', \%opt);
+getopts('ed:qpl:scbyoi', \%opt);
 my $user = shift or die &usage;
 
 adminsuidsetup $user;
-- 
cgit v1.2.1


From be58a1538ce963c4d3b6319c163960513703108d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 14 Jan 2002 20:28:17 +0000
Subject: pay some attention to 1.4 RADIUS SQL export

---
 FS/FS/Conf.pm               |  8 ++--
 FS/FS/svc_acct.pm           | 95 ++++++++++++++++++++++++++++++++++++++-------
 httemplate/docs/export.html | 18 ++++-----
 3 files changed, 93 insertions(+), 28 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 4ce9da1de..cc91e8292 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -347,28 +347,28 @@ httemplate/docs/config.html
   {
     'key'         => 'icradiusmachines',
     'section'     => 'radius',
-    'description' => 'Your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines or <a href="http://www.freeradius.org/">FreeRADIUS</a> (with MySQL authentication) machines, one per line.  Turning this option on (even if empty) turns on radcheck table population (in the freeside database - the radcheck table needs to be created manually).  Machines listed in this file will have the radcheck table exported to them.  Each line should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: "<CODE>radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd</CODE>".  You do not need to use MySQL for your Freeside database to export to an ICRADIUS/FreeRADIUS mysql database with this option.',
+    'description' => 'Turn this option on to enable radcheck and radreply table population - by default in the Freeside database, or in the database specified by the <a href="http://rootwood.haze.st/aspside/config/config-view.cgi#icradius_secrets">icradius_secrets</a> config option (the radcheck and radreply tables needs to be created manually).  You do not need to use MySQL for your Freeside database to export to an ICRADIUS/FreeRADIUS MySQL database with this option.  <blockquote><b>ADDITIONAL DEPRECATED FUNCTIONALITY</b> (instead use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or point icradius_secrets to the external database) - your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines or <a href="http://www.freeradius.org/">FreeRADIUS</a> (with MySQL authentication) machines, one per line.  Machines listed in this file will have the radcheck table exported to them.  Each line should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: <CODE>"radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd"</CODE></blockquote>',
     'type'        => [qw( checkbox textarea )],
   },
 
   {
     'key'         => 'icradius_mysqldest',
     'section'     => 'radius',
-    'description' => 'Destination directory for the MySQL databases, on the ICRADIUS/FreeRADIUS machines.  Defaults to "/usr/local/var/".',
+    'description' => '<b>DEPRECATED</b> (instead use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or point icradius_secrets to the external database) - Destination directory for the MySQL databases, on the ICRADIUS/FreeRADIUS machines.  Defaults to "/usr/local/var/".',
     'type'        => 'text',
   },
 
   {
     'key'         => 'icradius_mysqlsource',
     'section'     => 'radius',
-    'description' => 'Source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".',
+    'description' => '<b>DEPRECATED</b> (instead use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or point icradius_secrets to the external database) - Source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".',
     'type'        => 'text',
   },
 
   {
     'key'         => 'icradius_secrets',
     'section'     => 'radius',
-    'description' => 'Optionally specifies a MySQL database for ICRADIUS/FreeRADIUS export, if you\'re not running MySQL for your Freeside database.  The database should be on the Freeside machine and store data in the <a href="#icradius_mysqlsource">icradius_mysqlsource</a> directory.  Three lines: DBI data source, username and password.',
+    'description' => 'Optionally specifies a database for ICRADIUS/FreeRADIUS export.  Three lines: DBI data source, username and password.',
     'type'        => 'textarea',
   },
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 49a55e9cf..28c0f57a4 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -71,9 +71,15 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
     $cyrus_admin_user = '';
     $cyrus_admin_pass = '';
   }
-  if ( $conf->exists('icradius_secrets') ) {
-    $icradius_dbh = DBI->connect($conf->config('icradius_secrets'))
-      or die $DBI::errstr;
+  if ( $conf->exists('icradiusmachines') ) {
+    if ( $conf->exists('icradius_secrets') ) {
+      #need some sort of late binding so it's only connected to when
+      # actually used, hmm
+      $icradius_dbh = DBI->connect($conf->config('icradius_secrets'))
+        or die $DBI::errstr;
+    } else {
+      $icradius_dbh = dbh;
+    }
   } else {
     $icradius_dbh = '';
   }
@@ -273,15 +279,29 @@ sub insert {
     }
   }
   if ( $icradius_dbh ) {
-    my $queue = new FS::queue { 'job' => 'FS::svc_acct::icradius_rc_insert' };
-    $error = $queue->insert( $self->username,
-                             $self->_password,
-                             $self->radius_check
-                           );
+
+    my $radcheck_queue =
+      new FS::queue { 'job' => 'FS::svc_acct::icradius_rc_insert' };
+    $error = $radcheck_queue->insert( $self->username,
+                                      $self->_password,
+                                      $self->radius_check
+                                    );
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
+
+    my $radreply_queue =
+      new FS::queue { 'job' => 'FS::svc_acct::icradius_rr_insert' };
+    $error = $radreply_queue->insert( $self->username,
+                                      $self->_password,
+                                      $self->radius_reply
+                                    );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return "queueing job (transaction rolled back): $error";
     }
+
   }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
@@ -353,6 +373,25 @@ sub icradius_rc_insert {
   1;
 }
 
+sub icradius_rr_insert {
+  my( $username, $password, %radreply ) = @_;
+  
+  foreach my $attribute ( keys %radreply ) {
+    my $sth = $icradius_dbh->prepare(
+      "INSERT INTO radreply ( id, UserName, Attribute, Value ) VALUES ( ".
+      join(", ", map { $icradius_dbh->quote($_) } (
+        '',
+        $username,
+        $attribute,
+        $radreply{$attribute},
+      ) ). " )"
+    );
+    $sth->execute or die "can't insert into radreply table: ". $sth->errstr;
+  }
+
+  1;
+}
+
 =item delete
 
 Deletes this account from the database.  If there is an error, returns the
@@ -471,12 +510,21 @@ sub delete {
     }
   }
   if ( $icradius_dbh ) {
+
     my $queue = new FS::queue { 'job' => 'FS::svc_acct::icradius_rc_delete' };
     $error = $queue->insert( $self->username );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return "queueing job (transaction rolled back): $error";
     }
+
+    my $queue = new FS::queue { 'job' => 'FS::svc_acct::icradius_rr_delete' };
+    $error = $queue->insert( $self->username );
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
+
   }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
@@ -516,6 +564,18 @@ sub icradius_rc_delete {
   1;
 }
 
+sub icradius_rr_delete {
+  my $username = shift;
+  
+  my $sth = $icradius_dbh->prepare(
+    'DELETE FROM radreply WHERE UserName = ?'
+  );
+  $sth->execute($username)
+    or die "can't delete from radreply table: ". $sth->errstr;
+
+  1;
+}
+
 =item replace OLD_RECORD
 
 Replaces OLD_RECORD with this one in the database.  If there is an error,
@@ -863,12 +923,17 @@ expected to change in the future.
 
 sub radius_reply { 
   my $self = shift;
-  map {
-    /^(radius_(.*))$/;
-    my($column, $attrib) = ($1, $2);
-    #$attrib =~ s/_/\-/g;
-    ( $FS::raddb::attrib{lc($attrib)}, $self->getfield($column) );
-  } grep { /^radius_/ && $self->getfield($_) } fields( $self->table );
+  my %reply =
+    map {
+      /^(radius_(.*))$/;
+      my($column, $attrib) = ($1, $2);
+      #$attrib =~ s/_/\-/g;
+      ( $FS::raddb::attrib{lc($attrib)}, $self->getfield($column) );
+    } grep { /^radius_/ && $self->getfield($_) } fields( $self->table );
+  if ( $self->ip && $self->ip ne '0e0' ) {
+    $reply{Framed-IP-Address} = $self->ip;
+  }
+  %reply;
 }
 
 =item radius_check
@@ -966,7 +1031,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.60 2001-12-20 02:09:52 ivan Exp $
+$Id: svc_acct.pm,v 1.61 2002-01-14 20:28:17 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/docs/export.html b/httemplate/docs/export.html
index c7410a923..c7f1b4c9e 100755
--- a/httemplate/docs/export.html
+++ b/httemplate/docs/export.html
@@ -4,33 +4,33 @@
 <body>
   <h1>File exporting</h1>
   <ul>
-    <li>bin/svc_acct.export will create UNIX <b>passwd</b>, <b>shadow</b> and <b>master.passwd</b> files, ERPCD <b>acp_passwd</b> and <b>acp_dialup</b> files and a RADIUS <b>users</b> file in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Some RADIUS servers (such as <a href="http://www.open.com.au/radiator/">Radiator</a> and <a href="ftp://ftp.cheapnet.net/pub/icradius/">ICRADIUS</a>) will authenticate directly out of an SQL database.  In these cases,
-it is reccommended that you replicate the data to an external RADIUS machine rather than running the RADIUS server on your Freeside machine.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattended:
+    <li>bin/svc_acct.export will create UNIX <b>passwd</b>, <b>shadow</b> and <b>master.passwd</b> files, ERPCD <b>acp_passwd</b> and <b>acp_dialup</b> files and a RADIUS <b>users</b> file in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Some RADIUS servers (such as <a href="http://www.open.com.au/radiator/">Radiator</a>, <a href="ftp://ftp.cheapnet.net/pub/icradius/">ICRADIUS</a> and <a href="http://www.freeradius.org/">FreeRADIUS</a>) will authenticate directly out of an SQL database.  In these cases,
+it is reccommended that you replicate (<a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">Replication in MySQL</a>) the data to an external RADIUS machine or point icradius_secrets to the external machine rather than running the RADIUS server on your Freeside machine.  Using the appropriate <a href="../config/config-view.cgi">configuration settings</a>, you can export these files to your remote machines unattended:
       <ul>
         <li>shellmachines - <b>passwd</b> and <b>shadow</b> are copied to the remote machine as <b>/etc/passwd.new</b> and <b>/etc/shadow.new</b> and then moved to <b>/etc/passwd</b> and <b>/etc/shadow</b> if no errors occur.
         <li>bsdshellmachines - <b>passwd</b> and <b>master.passwd</b> are copied to the remote machine as <b>/etc/passwd.new</b> and <b>/etc/master.passwd.new</b> and moved to <b>/etc/passwd</b> and <b>/etc/master.passwd</b> if no errors occur.
         <li>nismachines - <b>passwd</b> and <b>shadow</b> are copied to the <b>/etc/global</b> directory on the remote machine.  If no errors occur, the command <b>( cd /var/yp; make; )</b> is executed on the remote machine.
         <li>erpcdmachines - <b>acp_passwd</b> and <b>acp_dialup</b> are copied to the <b>/usr/annex</b> directory on the remote machine.  If no errors occur, the command <b>( kill -USR1 `cat /usr/annex/erpcd.pid` )</b> is executed on the remote machine. 
         <li>radiusmachines - <b>users</b> is copied to the <b>/etc/raddb</b> directory on the remote machine.  If no errors occur, the command <b>( builddbm )</b> is executed on the remote machine.
-        <li>icradiusmachines - Local radcheck and radreply tables will be created.  If any machines are specified, the remote MySQL database will be locked and the radcheck table will be copied to the those machines.  You may also need to set the <a href="config.html#icradius_mysqlsource">icradius_mysqlsource</a> and/or <a href="config.html#icradius_mysqldest">icradius_mysqldest</a> configuration files.  Currently you need to be running MySQL for your Freeside database to use this feature.
+        <li>icradiusmachines - Turn this option on to enable radcheck table population - by default in the Freeside database, or in the database specified by the <a href="http://rootwood.haze.st/aspside/config/config-view.cgi#icradius_secrets">icradius_secrets</a> config option (the radcheck table needs to be created manually).  You do not need to use MySQL for your Freeside database to export to an ICRADIUS/FreeRADIUS MySQL database with this option.  <blockquote><b>ADDITIONAL DEPRECATED FUNCTIONALITY</b> (instead use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or point icradius_secrets to the external database) - your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines or <a href="http://www.freeradius.org/">FreeRADIUS</a> (with MySQL authentication) machines, one per line.  Machines listed in this file will have the radcheck table exported to them.  Each line should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: <CODE>"radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd"</CODE></blockquote>
       </ul>
     <li>svc_acct.pm - If a shellmachine is defined, users can be created, modified and deleted remotely; see below.
       <ul>
-        <li>Account creation - If the <b>username</b>, <b>uid</b> and <b>dir</b> fields are defined for a new user, the command(s) specified in the <a href="config.html#shellmachine-useradd">shellmachine-useradd</a> configuration file are executed on shellmachine via ssh.  If this file does not exist, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If the file exists but is empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.
-        <li>Account deletion - The command(s) specified in the <a href="config.html#shellmachine-userdel">shellmachine-userdel</a> configuration file are executed on shellmachine via ssh.  If this file does not exist, <code>userdel $username</code> is the default.  If the file exists but is empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.
-        <li>Account modification - If a user's home directory changes, the command(s) specified in the <a href="config.html#shellmachine-usermod">shellmachine-usermod</a> configuration file are execute on shellmachine via ssh.  If this file does not exist or is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.
+        <li>Account creation - If the <b>username</b>, <b>uid</b> and <b>dir</b> fields are defined for a new user, the command(s) specified in the <a href="../config/config-view.cgi#shellmachine-useradd">shellmachine-useradd</a> configuration file are executed on shellmachine via ssh.  If this file does not exist, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If the file exists but is empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.
+        <li>Account deletion - The command(s) specified in the <a href="../config/config-view.cgi#shellmachine-userdel">shellmachine-userdel</a> configuration file are executed on shellmachine via ssh.  If this file does not exist, <code>userdel $username</code> is the default.  If the file exists but is empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.
+        <li>Account modification - If a user's home directory changes, the command(s) specified in the <a href="../config/config-view.cgi#shellmachine-usermod">shellmachine-usermod</a> configuration file are execute on shellmachine via ssh.  If this file does not exist or is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.
       </ul>
-    <li>svc_acct.pm - <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a> integration, enabled by the <a href="config.html#cyrus">cyrus configuration file</a>
+    <li>svc_acct.pm - <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a> integration, enabled by the <a href="../config/config-view.cgi#cyrus">cyrus configuration file</a>
       <ul>
         <li>Account creation - (Cyrus::IMAP::Admin should be installed locally)
         <li>Account deletion - (Cyrus::IMAP::Admin should be installed locally)
         <li>Account modification - (not yet implemented)
       </ul>
-    <li>bin/svc_acct_sm.export will create <a href="http://www.qmail.org">Qmail</a> <b>rcpthosts</b>, <b>recipientmap</b> and <b>virtualdomains</b> files and <a href="http://www.sendmail.org">Sendmail</a> <b>virtusertable</b> and <b>sendmail.cw</b> files in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Using the appropriate <a href="config.html">configuration files</a>, you can export these files to your remote machines unattemded:
+    <li>bin/svc_acct_sm.export will create <a href="http://www.qmail.org">Qmail</a> <b>rcpthosts</b>, <b>recipientmap</b> and <b>virtualdomains</b> files and <a href="http://www.sendmail.org">Sendmail</a> <b>virtusertable</b> and <b>sendmail.cw</b> files in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Using the appropriate <a href="../config/config-view.cgi">configuration files</a>, you can export these files to your remote machines unattemded:
       <ul>
         <li>qmailmachines - <b>recipientmap</b>, <b>virtualdomains</b> and <b>rcpthosts</b> are copied to the <b>/var/qmail/control</b> directory on the remote machine.  Note: If you <a href="legacy.html#svc_acct_sm">imported</a> qmail configuration files, run the generated <b>/usr/local/etc/freeside/export.<i>datasrc</i>/virtualdomains.FIX</b> on a machine with your user home directories before exporting qmail configuration files.
         <li>shellmachine - The command <b>[ -e <i>homedir</i>/.qmail-default ] || { touch <i>homedir</i>/.qmail-default; chown <i>uid</i>.<i>gid</i> <i>homedir</i>/.qmail-default; }</b> will be run on this machine for users in the virtualdomains file.
-        <li>sendmailmachines - <b>sendmail.cw</b> and <b>virtusertable</b> are copied to the remote machine as <b>/etc/sendmail.cw.new</b> and <b>/etc/virtusertable.new</b>.  If no errors occur, they are moved to <b>/etc/sendmail.cw</b> and <b>/etc/virtusertable</b> and the command specified in the <a href="config.html#sendmailrestart">sendmailrestart</a> configuration file is executed.  (The path can be changed from the default <b>/etc</b> with the <a href="config.html#sendmailconfigpath">sendmailconfigpath</a> configuration file.)
+        <li>sendmailmachines - <b>sendmail.cw</b> and <b>virtusertable</b> are copied to the remote machine as <b>/etc/sendmail.cw.new</b> and <b>/etc/virtusertable.new</b>.  If no errors occur, they are moved to <b>/etc/sendmail.cw</b> and <b>/etc/virtusertable</b> and the command specified in the <a href="../config/config-view.cgi#sendmailrestart">sendmailrestart</a> configuration file is executed.  (The path can be changed from the default <b>/etc</b> with the <a href="../config/config-view.cgi#sendmailconfigpath">sendmailconfigpath</a> configuration file.)
       </ul>
     <li>svc_domain.pm - If the qmailmachines configuration file exists and a shellmachine is defined, user <b>.qmail-</b> files can be updated for catchall mailboxes.
       <ul>
-- 
cgit v1.2.1


From 52c1b2edef2c53822d8e67952710ba45dae1d293 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Jan 2002 15:37:42 +0000
Subject: doc

---
 FS/FS/svc_acct.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 28c0f57a4..3f97189e7 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1031,7 +1031,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.61 2002-01-14 20:28:17 ivan Exp $
+$Id: svc_acct.pm,v 1.62 2002-01-16 15:37:42 ivan Exp $
 
 =head1 BUGS
 
@@ -1046,9 +1046,10 @@ counterintuitive.
 
 =head1 SEE ALSO
 
-L<FS::svc_Common>, L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>,
-L<FS::part_svc>, L<FS::cust_pkg>, L<FS::queue>, L<freeside-queued>),
-L<Net::SSH>, L<ssh>, L<FS::svc_acct_pop>,
+L<FS::svc_Common>, edit/part_svc.cgi from an installed web interface,
+export.html from the base documentation, L<FS::Record>, L<FS::Conf>,
+L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>, L<FS::queue>,
+L<freeside-queued>), L<Net::SSH>, L<ssh>, L<FS::svc_acct_pop>,
 schema.html from the base documentation.
 
 =cut
-- 
cgit v1.2.1


From fb697ebf8016ab1fa33de81a2a6b46f2bc7f1c1d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 19 Jan 2002 15:16:22 +0000
Subject: error message update

---
 FS/FS/UID.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 890e2988a..78fe156c3 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -188,7 +188,7 @@ sub cgisetotaker {
     $user = lc ( $cgi->connection->user );
   } else {
     die "fatal: Can't get REMOTE_USER! for cgi $cgi - you need to setup ".
-        "Apache user authentication as documented in httemplate/docs/config.html";
+        "Apache user authentication as documented in httemplate/docs/install.html";
   }
   $user;
 }
@@ -252,7 +252,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.11 2001-11-06 17:58:08 ivan Exp $
+$Id: UID.pm,v 1.12 2002-01-19 15:16:22 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 002d821bb367e07902c987721737f62f280e03b9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Jan 2002 11:30:17 +0000
Subject: include FS::svc_forward in kludgy preload

---
 FS/FS/cust_pkg.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index c6fabe5cb..633b3224f 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -17,6 +17,7 @@ use FS::svc_acct;
 use FS::svc_acct_sm;
 use FS::svc_domain;
 use FS::svc_www;
+use FS::svc_forward;
 
 @ISA = qw( FS::Record );
 
@@ -629,7 +630,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.14 2001-11-30 00:04:38 ivan Exp $
+$Id: cust_pkg.pm,v 1.15 2002-01-21 11:30:17 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 6c9a1f16bd7e21219ffe3fe62d58c582ac05b50a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Jan 2002 14:42:26 +0000
Subject: remove old upgrade docs

---
 httemplate/docs/index.html    |  3 ---
 httemplate/docs/upgrade.html  | 24 ------------------------
 httemplate/docs/upgrade2.html | 11 -----------
 httemplate/docs/upgrade3.html | 40 ----------------------------------------
 4 files changed, 78 deletions(-)
 delete mode 100755 httemplate/docs/upgrade.html
 delete mode 100755 httemplate/docs/upgrade2.html
 delete mode 100644 httemplate/docs/upgrade3.html

diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html
index 932df0549..9e61d4f08 100644
--- a/httemplate/docs/index.html
+++ b/httemplate/docs/index.html
@@ -6,9 +6,6 @@
 <img src="overview.png">
 <ul>
   <li><a href="install.html">New Installation</a>
-  <li><a href="upgrade.html">Upgrading from 1.0.x to 1.1.x</a>
-  <li><a href="upgrade2.html">Upgrading from 1.1.x to 1.1.4</a>
-  <li><a href="upgrade3.html">Upgrading from 1.1.x to 1.2.x</a>
   <li><a href="upgrade4.html">Upgrading from 1.2.x to 1.2.2</a>
   <li><a href="upgrade5.html">Upgrading from 1.2.2 to 1.2.3</a>
   <li><a href="upgrade6.html">Upgrading from 1.2.3 to 1.3.0</a>
diff --git a/httemplate/docs/upgrade.html b/httemplate/docs/upgrade.html
deleted file mode 100755
index d2201f601..000000000
--- a/httemplate/docs/upgrade.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<head>
-  <title>Upgrading to 1.1.x</title>
-</head>
-<body>
-<h1>Upgrading to 1.1.x</h1>
-<ul>
-  <li>Back up your data and current Freeside installation.
-  <li>Unpack a copy of the 1.0.0 distribution in a separate location.
-  <li>Diff your current installation against the 1.0.0 distribution.
-  <li>Apply all the diffs you found above, if applicable.
-  <li>Apply (at least) the following changes to your database:
-<pre>
-ALTER TABLE cust_main CHANGE ss ss char(11) NULL;
-ALTER TABLE cust_main CHANGE day daytime varchar(20) NULL;
-ALTER TABLE svc_acct CHANGE password _password varchar(25) NOT NULL;
-ALTER TABLE part_svc CHANGE svc_acct__password svc_acct___password varchar(25) NULL;
-ALTER TABLE part_svc CHANGE svc_acct__password_flag svc_acct___password_flag char(1) NULL;
-ALTER TABLE agent_type CHANGE type atype varchar(80) NOT NULL;
-</pre>
-  <li>Optionally change the field lengths and types to match a 1.1.x install; see `bin/fs-setup'.
-  <li>Create the necessary <a href="config.html">configuration files</a>,
-  <li>Copy or symlink htdocs and site_perl to the new 1.1.x copies.
-  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
-</body>
diff --git a/httemplate/docs/upgrade2.html b/httemplate/docs/upgrade2.html
deleted file mode 100755
index 7acae48f7..000000000
--- a/httemplate/docs/upgrade2.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<head>
-  <title>Upgrading to 1.1.4</title>
-</head>
-<body>
-<h1>Upgrading to 1.1.4 from 1.1.x</h1>
-<ul>
-  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
-  <li>Back up your data and current Freeside installation.
-  <li>If applicable, create the new <a href="config.html">configuration files</a>: lpr, cybercash2, cybercash3.2
-  <li>Copy or symlink htdocs and site_perl to the new copies.
-</body>
diff --git a/httemplate/docs/upgrade3.html b/httemplate/docs/upgrade3.html
deleted file mode 100644
index 0837e0207..000000000
--- a/httemplate/docs/upgrade3.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<head>
-  <title>Upgrading to 1.2.x</title>
-</head>
-<body>
-<h1>Upgrading to 1.2.x from 1.1.x</h1>
-<ul>
-  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
-  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
-  <li>Back up your data and current Freeside installation.
-  <li>Install the Perl module <a href="http://www.perl.com/CPAN/modules/by-module/String/">String-Approx</a>
-  <li><a href="config.html">Configuration file</a> location has changed!
-  <li>Move /var/spool/freeside/dbdef.<i>datasrc</i> to /usr/local/etc/freeside/dbdef.<i>datasrc</i>.
-  <li>Move /var/spool/freeside/counters to /usr/local/etc/freeside/counters.<i>datasrc</i>.
-  <li>Move /var/spool/freeside/export to /usr/local/etc/freeside/export.<i>datasrc</i>.
-  <li>Apply the following changes to your database:
-<pre>
-<!-- ALTER TABLE cust_main ADD middle varchar(80) NULL;
-ALTER TABLE cust_main ADD titlenum int NULL;
--->ALTER TABLE cust_main CHANGE state state varchar(80) NULL;
-ALTER TABLE cust_main_county CHANGE state state varchar(80) NULL;
-ALTER TABLE cust_main_county ADD country char(2);
-ALTER TABLE cust_main CHANGE paydate paydate varchar(10);
-UPDATE cust_main SET country = "US" where country IS NULL OR country = '';
-UPDATE cust_main_county SET country = "US" where country IS NULL OR country = "";
-<!--CREATE TABLE part_title (
-   titlenum int NOT NULL,
-   title varchar(80) NOT NULL,
-   PRIMARY KEY (titlenum)
-);
--->CREATE TABLE cust_main_invoice (
-   destnum int NOT NULL,
-   custnum int NOT NULL,
-   dest varchar(80) NOT NULL,
-   PRIMARY KEY (destnum),
-   INDEX ( custnum )
-);
-</pre>
-  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
-  <li>Copy or symlink htdocs and site_perl to the new copies.
-</body>
-- 
cgit v1.2.1


From 3a625afa978c85a769c2a40b1bfaeb4aa9d1bc45 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Jan 2002 14:53:26 +0000
Subject: silly compilation problem

---
 FS/FS/svc_acct.pm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 3f97189e7..0340e7cc5 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -511,15 +511,17 @@ sub delete {
   }
   if ( $icradius_dbh ) {
 
-    my $queue = new FS::queue { 'job' => 'FS::svc_acct::icradius_rc_delete' };
-    $error = $queue->insert( $self->username );
+    my $radcheck_queue =
+      new FS::queue { 'job' => 'FS::svc_acct::icradius_rc_delete' };
+    $error = $radcheck_queue->insert( $self->username );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return "queueing job (transaction rolled back): $error";
     }
 
-    my $queue = new FS::queue { 'job' => 'FS::svc_acct::icradius_rr_delete' };
-    $error = $queue->insert( $self->username );
+    my $radreply_queue =
+      new FS::queue { 'job' => 'FS::svc_acct::icradius_rr_delete' };
+    $error = $radreply_queue->insert( $self->username );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return "queueing job (transaction rolled back): $error";
@@ -931,7 +933,7 @@ sub radius_reply {
       ( $FS::raddb::attrib{lc($attrib)}, $self->getfield($column) );
     } grep { /^radius_/ && $self->getfield($_) } fields( $self->table );
   if ( $self->ip && $self->ip ne '0e0' ) {
-    $reply{Framed-IP-Address} = $self->ip;
+    $reply{'Framed-IP-Address'} = $self->ip;
   }
   %reply;
 }
@@ -1031,7 +1033,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.62 2002-01-16 15:37:42 ivan Exp $
+$Id: svc_acct.pm,v 1.63 2002-01-22 14:53:26 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 4f391f615b2ea762783edc0fa796013c57e457e2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Jan 2002 14:55:25 +0000
Subject: docu

---
 FS/FS/part_svc.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 18760c39a..446d88c7e 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -301,7 +301,7 @@ sub all_part_svc_column {
 
 =head1 VERSION
 
-$Id: part_svc.pm,v 1.7 2001-12-27 09:26:13 ivan Exp $
+$Id: part_svc.pm,v 1.8 2002-01-22 14:55:25 ivan Exp $
 
 =head1 BUGS
 
@@ -312,7 +312,7 @@ should be fixed.
 
 =head1 SEE ALSO
 
-L<FS::Record>, L<FS::part_svc_column, L<FS::part_pkg>, L<FS::pkg_svc>,
+L<FS::Record>, L<FS::part_svc_column>, L<FS::part_pkg>, L<FS::pkg_svc>,
 L<FS::cust_svc>, L<FS::svc_acct>, L<FS::svc_forward>, L<FS::svc_domain>,
 schema.html from the base documentation.
 
-- 
cgit v1.2.1


From d89908c40c18df348f580852f906853184fabd3c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Jan 2002 15:57:33 +0000
Subject: don't allow $0.00 in credits/payments/refunds

---
 FS/FS/cust_credit.pm | 4 +++-
 FS/FS/cust_pay.pm    | 4 +++-
 FS/FS/cust_refund.pm | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 54c201ad4..278e6dedd 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -160,6 +160,8 @@ sub check {
   ;
   return $error if $error;
 
+  return "amount must be > 0 " if $self->amount == 0;
+
   return "Unknown customer"
     unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
 
@@ -235,7 +237,7 @@ sub credited {
 
 =head1 VERSION
 
-$Id: cust_credit.pm,v 1.12 2001-10-09 23:10:16 ivan Exp $
+$Id: cust_credit.pm,v 1.13 2002-01-22 15:57:33 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index ecd6ab24f..b96e29fbd 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -240,6 +240,8 @@ sub check {
   ;
   return $error if $error;
 
+  return "paid must be > 0 " if $self->paid == 0;
+
   return "unknown cust_main.custnum: ". $self->custnum
     unless $self->invnum
            || qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
@@ -304,7 +306,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.10 2001-12-26 07:53:21 ivan Exp $
+$Id: cust_pay.pm,v 1.11 2002-01-22 15:57:33 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 77bacdffb..7b8b29f5e 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -213,6 +213,8 @@ sub check {
   ;
   return $error if $error;
 
+  return "amount must be > 0 " if $self->amount == 0;
+
   $self->_date(time) unless $self->_date;
 
   return "unknown cust_main.custnum: ". $self->custnum
@@ -249,7 +251,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.8 2001-09-02 05:38:13 ivan Exp $
+$Id: cust_refund.pm,v 1.9 2002-01-22 15:57:33 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 579b08e47d45dec6ea0729164a6e24613c02be26 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Jan 2002 02:26:49 +0000
Subject: fix cust_refund::insert

---
 FS/FS/cust_refund.pm | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 7b8b29f5e..6bf2da595 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -93,10 +93,23 @@ sub insert {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
+  if ( $self->crednum ) {
+    my $cust_credit = qsearchs('cust_bill', { 'invnum' => $self->invnum } )
+      or do {
+        $dbh->rollback if $oldAutoCommit;
+        return "Unknown cust_credit.crednum: ". $self->crednum;
+      };
+    $self->custnum($cust_credit->custnum);
+  }
+
   my $error = $self->check;
   return $error if $error;
 
-  die;
+  $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
 
   if ( $self->crednum ) {
     my $cust_credit_refund = new FS::cust_credit_refund {
@@ -110,14 +123,9 @@ sub insert {
       $dbh->rollback if $oldAutoCommit;
       return $error;
     }
-    $self->custnum($cust_credit_refund->cust_credit->custnum);
+    #$self->custnum($cust_credit_refund->cust_credit->custnum);
   }
 
-  $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
@@ -206,7 +214,7 @@ sub check {
 
   my $error =
     $self->ut_number('refundnum')
-    || $self->ut_number('custnum')
+    || $self->ut_numbern('custnum')
     || $self->ut_money('amount')
     || $self->ut_numbern('_date')
     || $self->ut_textn('paybatch')
@@ -218,8 +226,8 @@ sub check {
   $self->_date(time) unless $self->_date;
 
   return "unknown cust_main.custnum: ". $self->custnum
-    unless $self->invnum 
-           ||  qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+    unless $self->crednum 
+           || qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
 
   $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
   $self->payby($1);
@@ -251,7 +259,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.9 2002-01-22 15:57:33 ivan Exp $
+$Id: cust_refund.pm,v 1.10 2002-01-24 02:26:49 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From f3d5a1bc3bf8ffe4b2fe6a0da3b201ba988b21a8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Jan 2002 06:46:29 +0000
Subject: more updates to cust_refund::update_replace

---
 FS/FS/cust_refund.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 6bf2da595..0f87679a0 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -133,7 +133,7 @@ sub insert {
 
 }
 
-sub upgrade_replace {
+sub upgrade_replace { #1.3.x->1.4.x
   my $self = shift;
 
   local $SIG{HUP} = 'IGNORE';
@@ -170,7 +170,7 @@ sub upgrade_replace {
     die;
   }
 
-  $error = $new->SUPER::insert($self);
+  $error = $new->SUPER::replace($self);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
@@ -259,7 +259,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.10 2002-01-24 02:26:49 ivan Exp $
+$Id: cust_refund.pm,v 1.11 2002-01-24 06:46:29 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 254ccae67eb65fe7d9320c121e76c447b937abd9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Jan 2002 06:52:44 +0000
Subject: from jeff@fix <rluser> in FS::cust_refund::check  'amount' should
 probably be replaced with +'refund' in two places

---
 FS/FS/cust_refund.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 0f87679a0..c7d8a6d62 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -215,13 +215,13 @@ sub check {
   my $error =
     $self->ut_number('refundnum')
     || $self->ut_numbern('custnum')
-    || $self->ut_money('amount')
+    || $self->ut_money('refund')
     || $self->ut_numbern('_date')
     || $self->ut_textn('paybatch')
   ;
   return $error if $error;
 
-  return "amount must be > 0 " if $self->amount == 0;
+  return "refund must be > 0 " if $self->refund == 0;
 
   $self->_date(time) unless $self->_date;
 
@@ -259,7 +259,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.11 2002-01-24 06:46:29 ivan Exp $
+$Id: cust_refund.pm,v 1.12 2002-01-24 06:52:44 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 9bf94801a1dd34dadf2862b52886e1257995ef08 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Jan 2002 11:43:39 +0000
Subject: <rluser> and it seems that cust_credit_refund::cust_credit should
 exist..

---
 FS/FS/cust_credit_refund.pm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_credit_refund.pm b/FS/FS/cust_credit_refund.pm
index fb09a42d8..cf16284bc 100644
--- a/FS/FS/cust_credit_refund.pm
+++ b/FS/FS/cust_credit_refund.pm
@@ -168,11 +168,23 @@ sub cust_refund {
   qsearchs( 'cust_refund', { 'refundnum' => $self->refundnum } );
 }
 
+=item cust_credit
+
+Returns the credit (see L<FS::cust_credit>)
+
+=cut
+
+sub cust_refund {
+  my $self = shift;
+  qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
+}
+
+
 =back
 
 =head1 VERSION
 
-$Id: cust_credit_refund.pm,v 1.4 2001-09-02 07:49:52 ivan Exp $
+$Id: cust_credit_refund.pm,v 1.5 2002-01-24 11:43:39 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From ef5490483c6b97512c4a1fe0ec841c2044e346af Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Jan 2002 11:52:02 +0000
Subject: jeff's on a bugfinding roll here, thanks!

---
 FS/FS/cust_credit_refund.pm | 3 +--
 FS/FS/cust_pay.pm           | 3 ++-
 FS/FS/cust_refund.pm        | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/FS/FS/cust_credit_refund.pm b/FS/FS/cust_credit_refund.pm
index cf16284bc..8b7d6dac3 100644
--- a/FS/FS/cust_credit_refund.pm
+++ b/FS/FS/cust_credit_refund.pm
@@ -179,12 +179,11 @@ sub cust_refund {
   qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
 }
 
-
 =back
 
 =head1 VERSION
 
-$Id: cust_credit_refund.pm,v 1.5 2002-01-24 11:43:39 ivan Exp $
+$Id: cust_credit_refund.pm,v 1.6 2002-01-24 11:52:02 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index b96e29fbd..00c6e1cfe 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -251,6 +251,7 @@ sub check {
   $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
   $self->payby($1);
 
+  #false laziness with cust_refund::check
   if ( $self->payby eq 'CARD' ) {
     my $payinfo = $self->payinfo;
     $payinfo =~ s/\D//g;
@@ -306,7 +307,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.11 2002-01-22 15:57:33 ivan Exp $
+$Id: cust_pay.pm,v 1.12 2002-01-24 11:52:02 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index c7d8a6d62..a1d1e594c 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -232,9 +232,11 @@ sub check {
   $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
   $self->payby($1);
 
+  #false laziness with cust_pay::check
   if ( $self->payby eq 'CARD' ) {
     my $payinfo = $self->payinfo;
-    $self->payinfo($payinfo =~ s/\D//g);
+    $payinfo =~ s/\D//g;
+    $self->payinfo($payinfo);
     if ( $self->payinfo ) {
       $self->payinfo =~ /^(\d{13,16})$/
         or return "Illegal (mistyped?) credit card number (payinfo)";
@@ -259,7 +261,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.12 2002-01-24 06:52:44 ivan Exp $
+$Id: cust_refund.pm,v 1.13 2002-01-24 11:52:02 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 0d2d5a1fdc65bc8511dcf9727e534e7e5da271f7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Jan 2002 16:54:53 +0000
Subject: stack traces help alot

---
 FS/FS/cust_credit_refund.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_credit_refund.pm b/FS/FS/cust_credit_refund.pm
index 8b7d6dac3..83f6e2f75 100644
--- a/FS/FS/cust_credit_refund.pm
+++ b/FS/FS/cust_credit_refund.pm
@@ -57,6 +57,8 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 Creates a new record.  To add the record to the database, see L<"insert">.
 
+=cut
+
 sub table { 'cust_credit_refund'; }
 
 =item insert
@@ -183,7 +185,7 @@ sub cust_refund {
 
 =head1 VERSION
 
-$Id: cust_credit_refund.pm,v 1.6 2002-01-24 11:52:02 ivan Exp $
+$Id: cust_credit_refund.pm,v 1.7 2002-01-24 16:54:53 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 243ec8f6a0ef59759f1398967faa561a43b1dff5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Jan 2002 16:58:47 +0000
Subject: <rluser> rather than == 0 in the ::check's .... <rluser> you might
 consider <= 0

---
 FS/FS/cust_bill_pay.pm      | 4 ++--
 FS/FS/cust_credit.pm        | 4 ++--
 FS/FS/cust_credit_bill.pm   | 4 ++--
 FS/FS/cust_credit_refund.pm | 4 ++--
 FS/FS/cust_pay.pm           | 4 ++--
 FS/FS/cust_refund.pm        | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index 2b0105139..1c838b932 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -162,7 +162,7 @@ sub check {
   ;
   return $error if $error;
 
-  return "amount must be > 0" if $self->amount == 0;
+  return "amount must be > 0" if $self->amount <= 0;
 
   $self->_date(time) unless $self->_date;
 
@@ -195,7 +195,7 @@ sub cust_bill {
 
 =head1 VERSION
 
-$Id: cust_bill_pay.pm,v 1.10 2001-12-21 20:55:35 ivan Exp $
+$Id: cust_bill_pay.pm,v 1.11 2002-01-24 16:58:47 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 278e6dedd..3044af7ea 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -160,7 +160,7 @@ sub check {
   ;
   return $error if $error;
 
-  return "amount must be > 0 " if $self->amount == 0;
+  return "amount must be > 0 " if $self->amount <= 0;
 
   return "Unknown customer"
     unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
@@ -237,7 +237,7 @@ sub credited {
 
 =head1 VERSION
 
-$Id: cust_credit.pm,v 1.13 2002-01-22 15:57:33 ivan Exp $
+$Id: cust_credit.pm,v 1.14 2002-01-24 16:58:47 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_credit_bill.pm b/FS/FS/cust_credit_bill.pm
index 8f992b580..62215419c 100644
--- a/FS/FS/cust_credit_bill.pm
+++ b/FS/FS/cust_credit_bill.pm
@@ -109,7 +109,7 @@ sub check {
   ;
   return $error if $error;
 
-  return "amount must be > 0" if $self->amount == 0;
+  return "amount must be > 0" if $self->amount <= 0;
 
   return "Unknown credit"
     unless my $cust_credit = 
@@ -145,7 +145,7 @@ sub cust_credit {
 
 =head1 VERSION
 
-$Id: cust_credit_bill.pm,v 1.6 2001-09-26 09:17:06 ivan Exp $
+$Id: cust_credit_bill.pm,v 1.7 2002-01-24 16:58:47 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_credit_refund.pm b/FS/FS/cust_credit_refund.pm
index 83f6e2f75..7079d28e9 100644
--- a/FS/FS/cust_credit_refund.pm
+++ b/FS/FS/cust_credit_refund.pm
@@ -149,7 +149,7 @@ sub check {
   ;
   return $error if $error;
 
-  return "amount must be > 0" if $self->amount == 0;
+  return "amount must be > 0" if $self->amount <= 0;
 
   $self->_date(time) unless $self->_date;
 
@@ -185,7 +185,7 @@ sub cust_refund {
 
 =head1 VERSION
 
-$Id: cust_credit_refund.pm,v 1.7 2002-01-24 16:54:53 ivan Exp $
+$Id: cust_credit_refund.pm,v 1.8 2002-01-24 16:58:47 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 00c6e1cfe..8f790a61a 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -240,7 +240,7 @@ sub check {
   ;
   return $error if $error;
 
-  return "paid must be > 0 " if $self->paid == 0;
+  return "paid must be > 0 " if $self->paid <= 0;
 
   return "unknown cust_main.custnum: ". $self->custnum
     unless $self->invnum
@@ -307,7 +307,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.12 2002-01-24 11:52:02 ivan Exp $
+$Id: cust_pay.pm,v 1.13 2002-01-24 16:58:47 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index a1d1e594c..2f7b3af4f 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -221,7 +221,7 @@ sub check {
   ;
   return $error if $error;
 
-  return "refund must be > 0 " if $self->refund == 0;
+  return "refund must be > 0 " if $self->refund <= 0;
 
   $self->_date(time) unless $self->_date;
 
@@ -261,7 +261,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.13 2002-01-24 11:52:02 ivan Exp $
+$Id: cust_refund.pm,v 1.14 2002-01-24 16:58:47 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 99e136cfed6e793e7f85b0916239416bf96acaf7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Jan 2002 17:02:53 +0000
Subject: emit a warning in this unlikely case again

---
 FS/FS/Record.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 6c0f5f819..5c828b7c6 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -122,7 +122,10 @@ sub new {
   my $self = {};
   bless ($self, $class);
 
-  $self->{'Table'} = shift unless defined ( $self->table );
+  unless defined ( $self->table ) {
+    $self->{'Table'} = shift;
+    carp "warning: FS::Record::new called with table name ". $self->{'Table'};
+  }
 
   my $hashref = $self->{'Hash'} = shift;
 
-- 
cgit v1.2.1


From a820cfffc9f5413be79409c915565689563dede3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 26 Jan 2002 01:52:31 +0000
Subject: another bug spotted by jeff

---
 FS/FS/cust_credit_refund.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_credit_refund.pm b/FS/FS/cust_credit_refund.pm
index 7079d28e9..cc3b32cdb 100644
--- a/FS/FS/cust_credit_refund.pm
+++ b/FS/FS/cust_credit_refund.pm
@@ -176,7 +176,7 @@ Returns the credit (see L<FS::cust_credit>)
 
 =cut
 
-sub cust_refund {
+sub cust_credit {
   my $self = shift;
   qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
 }
@@ -185,7 +185,7 @@ sub cust_refund {
 
 =head1 VERSION
 
-$Id: cust_credit_refund.pm,v 1.8 2002-01-24 16:58:47 ivan Exp $
+$Id: cust_credit_refund.pm,v 1.9 2002-01-26 01:52:31 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From b03df92e48df653460cb8b6034a06dd1de6f4095 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 28 Jan 2002 05:15:29 +0000
Subject: part_export schema changes

---
 FS/FS/part_export.pm          | 138 ++++++++++++++++++++++++++++++++++++++++++
 FS/FS/part_export_option.pm   | 134 ++++++++++++++++++++++++++++++++++++++++
 README.1.4.0pre4567-8         |  31 +++++++++-
 bin/fs-setup                  |  28 ++++++++-
 httemplate/docs/schema.html   |  15 +++++
 httemplate/docs/upgrade8.html |  19 ++++++
 6 files changed, 362 insertions(+), 3 deletions(-)
 create mode 100644 FS/FS/part_export.pm
 create mode 100644 FS/FS/part_export_option.pm

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
new file mode 100644
index 000000000..67371bc3b
--- /dev/null
+++ b/FS/FS/part_export.pm
@@ -0,0 +1,138 @@
+package FS::part_export;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+use FS::part_svc;
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::part_export - Object methods for part_export records
+
+=head1 SYNOPSIS
+
+  use FS::part_export;
+
+  $record = new FS::part_export \%hash;
+  $record = new FS::part_export { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::part_export object represents an export of Freeside data to an external
+provisioning system.  FS::part_export inherits from FS::Record.  The following
+fields are currently supported:
+
+=over 4
+
+=item eventpart - primary key
+
+=item svcpart - Service definition (see L<FS::part_svc>) to which this export applies
+
+=item machine - Machine name 
+
+=item exporttype - Export type
+
+=item nodomain - blank or "Y" : usernames are exported to this service with no domain
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new export.  To add the export to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'part_export'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid export.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+  my $error = 
+    $self->ut_numbern('exportnum')
+    || $self->ut_number('svcpart')
+    || $self->ut_alpha('exporttype')
+  ;
+  return $error if $error;
+
+  return "Unknown svcpart: ". $self->svcpart
+    unless qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
+
+  $self->machine =~ /^([\w\-\.]*)$/
+    or return "Illegal machine: ". $self->machine;
+  $self->machine($1);
+
+  $self->nodomain =~ /^(Y?)$/ or return "Illegal nodomain: ". $self->nodomain;
+  $self->nodomain($1);
+
+  #check exporttype?
+
+  ''; #no error
+}
+
+=back
+
+=head1 BUGS
+
+Probably.
+
+=head1 SEE ALSO
+
+L<FS::part_export_option>, L<FS::part_svc>, L<FS::svc_acct>, L<FS::svc_domain>,
+L<FS::svc_forward>, L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/part_export_option.pm b/FS/FS/part_export_option.pm
new file mode 100644
index 000000000..4ce70b4cd
--- /dev/null
+++ b/FS/FS/part_export_option.pm
@@ -0,0 +1,134 @@
+package FS::part_export_option;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+use FS::part_export;
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::part_export_option - Object methods for part_export_option records
+
+=head1 SYNOPSIS
+
+  use FS::part_export_option;
+
+  $record = new FS::part_export_option \%hash;
+  $record = new FS::part_export_option { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::part_export_option object represents an export option.
+FS::part_export_option inherits from FS::Record.  The following fields are
+currently supported:
+
+=over 4
+
+=item optionnum - primary key
+
+=item exportnum - export (see L<FS::part_export>)
+
+=item option - option name
+
+=item opeionvalue - option value
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new export option.  To add the export option to the database, see
+L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'part_export_option'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid export option.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('optionnum')
+    || $self->ut_number('exportnum')
+    || $self->ut_alpha('option')
+    || $self->ut_textn('optionvalue')
+  ;
+  return $error if $error;
+
+  return "Unknown exportnum: ". $self->exportnum
+    unless qsearchs('part_export', { 'exportnum' => $self->exportnum } );
+
+  #check options & values?
+
+  ''; #no error
+}
+
+=back
+
+=head1 BUGS
+
+Possibly.
+
+=head1 SEE ALSO
+
+L<FS::part_export>, L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/README.1.4.0pre4567-8 b/README.1.4.0pre4567-8
index e567120a9..57474fed0 100644
--- a/README.1.4.0pre4567-8
+++ b/README.1.4.0pre4567-8
@@ -1,11 +1,19 @@
 the following is necessary to upgrade from 1.4.0pre (4 thru 7) to 1.4.0pre8
 
+if you're upgrading from 1.3.1 follow the instructions in
+httemplate/docs/upgrade8.html instead
+
+if you're upgradeing from before 1.4.0pre4, see
+http://cleanwhisker.420.am/cgi-bin/cvsweb/freeside/Attic/
+
+-----
+
 install the perl modules and httemplate as per install.html or upgrade8.html
 
 ALTER TABLE part_pkg ADD disabled char(1) NULL;
 ALTER TABLE part_svc ADD disabled char(1) NULL;
 
-CREATE TABLE cust_bill_events (
+CREATE TABLE cust_bill_event (
   eventnum int primary key,
   invnum int not null,
   eventpart int not null,
@@ -14,7 +22,7 @@ CREATE TABLE cust_bill_events (
 CREATE UNIQUE INDEX cust_bill_events1 ON cust_bill_events ( eventpart, invnum );
 CREATE INDEX cust_bill_events2 ON cust_bill_events ( invnum );
 
-CREATE TABLE part_bill_events (
+CREATE TABLE part_bill_event (
   eventpart int primary key,
   payby char(4) not null,
   event varchar(80) not null,
@@ -24,6 +32,25 @@ CREATE TABLE part_bill_events (
 );
 CREATE INDEX part_bill_events1 ON part_bill_events ( payby );
 
+CREATE TABLE part_export (
+  exportnum int primary key,
+  svcpart int not null,
+  machine varchar(80) not null,
+  exporttype varchar(80) not null,
+  nodomain char(1) NULL
+);
+CREATE INDEX part_export1 ON part_export ( machine );
+CREATE INDEX part_export2 ON part_export ( exporttype );
+
+CREATE INDEX part_export_option (
+  optionnum int primary key,
+  exportnum int not null,
+  option varchar(80) not null,
+  optionvalue text NULL
+);
+CREATE INDEX part_export_option1 ON part_export ( exportnum );
+CREATE INDEX part_export_option2 ON part_export ( option );
+
 Run bin/dbdef-create
 
 Restart Apache and freeside-queued
diff --git a/bin/fs-setup b/bin/fs-setup
index c7335a8fb..5b82eaf86 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.69 2002-01-03 17:40:26 ivan Exp $
+# $Id: fs-setup,v 1.70 2002-01-28 05:15:28 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -842,6 +842,32 @@ sub tables_hash_hack {
       'unique'      => [],
       'index'       => [ [ 'jobnum' ] ],
     },
+
+    'part_export' => {
+      'columns' => [
+        'exportnum', 'int', '', '',
+        'svcpart',   'int', '', '',
+        'machine', 'varchar', '', $char_d,
+        'exporttype', 'varchar', '', $char_d,
+        'nodomain',     'char', 'NULL', 1,
+      ],
+      'primary_key' => 'exportnum',
+      'unique'      => [],
+      'index'       => [ [ 'machine' ], [ 'exporttype' ] ],
+    },
+
+    'part_export_option' => {
+      'columns' => [
+        'optionnum', 'int', '', '',
+        'exportnum', 'int', '', '',
+        'option', 'varchar', '', $char_d,
+        'optionvalue', 'text', 'NULL', '',
+      ],
+      'primary_key' => 'optionnum',
+      'unique'      => [],
+      'index'       => [ [ 'exportnum' ], [ 'option' ] ],
+    },
+
   );
 
   %tables;
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index a51bf6e68..3e9189b30 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -247,6 +247,21 @@
         <li>svcpart - <a href="#part_svc">Service definition</a>
         <li>quantity - quantity of this service that this package includes
       </ul>
+    <li><a name="part_export" href="man/FS/part_export.html">part_export</a> - Export to external provisioning
+      <ul>
+        <li>exportnum - primary key
+        <li>svcpart - <a href="#part_svc">Service definition</a>
+        <li>machine - Machine name 
+        <li>exporttype - Export type
+        <li>nodomain - blank or Y: usernames are exported to this service with no domain
+      </ul>
+    <li><a name="part_export_option" href="man/FS/part_export_option.html">part_export_option</a> - provisioning options
+      <ul>
+        <li>optionnum - primary key
+        <li>exportnum - <a href="#part_export">Export</a>
+        <li>option - option name
+        <li>optionvalue - option value
+      </ul>
     <li><a name="port" href="man/FS/port.html">port</a> - individual port on a <a href="#nas">nas</a>
       <ul>
         <li>portnum - primary key
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 904694879..144242b6a 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -143,6 +143,25 @@ CREATE TABLE part_bill_event (
 );
 CREATE INDEX part_bill_event1 ON part_bill_event ( payby );
 
+CREATE TABLE part_export (
+  exportnum int primary key,
+  svcpart int not null,
+  machine varchar(80) not null,
+  exporttype varchar(80) not null,
+  nodomain char(1) NULL
+);
+CREATE INDEX part_export1 ON part_export ( machine );
+CREATE INDEX part_export2 ON part_export ( exporttype );
+
+CREATE INDEX part_export_option (
+  optionnum int primary key,
+  exportnum int not null,
+  option varchar(80) not null,
+  optionvalue text NULL
+);
+CREATE INDEX part_export_option1 ON part_export ( exportnum );
+CREATE INDEX part_export_option2 ON part_export ( option );
+
 ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
 ALTER TABLE svc_domain ADD catchall integer NULL;
 ALTER TABLE cust_main ADD referral_custnum integer NULL;
-- 
cgit v1.2.1


From 1aa750eba2b9b73b4f09f28b9acd748ee3669bd4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 28 Jan 2002 06:57:23 +0000
Subject: book closing schema changes

---
 FS/FS/cust_bill.pm            |  9 +++++++--
 FS/FS/cust_credit.pm          | 11 ++++++++---
 FS/FS/cust_pay.pm             |  9 +++++++--
 FS/FS/cust_refund.pm          |  9 +++++++--
 FS/FS/part_pkg.pm             | 18 +++++-------------
 FS/FS/part_svc.pm             |  6 ++----
 README.1.4.0pre4567-8         |  5 +++++
 bin/fs-setup                  |  6 +++++-
 httemplate/docs/schema.html   |  4 ++++
 httemplate/docs/upgrade8.html |  4 ++++
 10 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index fbccff1ff..8b326a56f 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -91,6 +91,8 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 =item printed - how many times this invoice has been printed automatically
 (see L<FS::cust_main/"collect">).
 
+=item closed - books closed flag, empty or `Y'
+
 =back
 
 =head1 METHODS
@@ -120,7 +122,9 @@ no record you ever posted this invoice (which is bad, no?)
 =cut
 
 sub delete {
-  return "Can't remove invoice!"
+  my $self = shift;
+  return "Can't delete closed invoice" if $self->closed =~ /^Y/i;
+  $self->SUPER::delete(@_);
 }
 
 =item replace OLD_RECORD
@@ -160,6 +164,7 @@ sub check {
     || $self->ut_numbern('_date')
     || $self->ut_money('charged')
     || $self->ut_numbern('printed')
+    || $self->ut_enum('closed', [ '', 'Y' ])
   ;
   return $error if $error;
 
@@ -495,7 +500,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.14 2001-12-21 21:40:24 ivan Exp $
+$Id: cust_bill.pm,v 1.15 2002-01-28 06:57:23 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 3044af7ea..0ce5ac614 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -58,6 +58,8 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =item reason - text
 
+=item closed - books closed flag, empty or `Y'
+
 =back
 
 =head1 METHODS
@@ -126,7 +128,9 @@ Currently unimplemented.
 =cut
 
 sub delete {
-  return "Can't remove credit!"
+  my $self = shift;
+  return "Can't delete closed credit" if $self->closed =~ /^Y/i;
+  $self->SUPER::delete(@_);
 }
 
 =item replace OLD_RECORD
@@ -156,7 +160,8 @@ sub check {
     || $self->ut_number('custnum')
     || $self->ut_numbern('_date')
     || $self->ut_money('amount')
-    || $self->ut_textn('reason');
+    || $self->ut_textn('reason')
+    || $self->ut_enum('closed', [ '', 'Y' ])
   ;
   return $error if $error;
 
@@ -237,7 +242,7 @@ sub credited {
 
 =head1 VERSION
 
-$Id: cust_credit.pm,v 1.14 2002-01-24 16:58:47 ivan Exp $
+$Id: cust_credit.pm,v 1.15 2002-01-28 06:57:23 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 8f790a61a..3f811357a 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -61,6 +61,8 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =item paybatch - text field for tracking card processing
 
+=item closed - books closed flag, empty or `Y'
+
 =back
 
 =head1 METHODS
@@ -208,7 +210,9 @@ Currently unimplemented (accounting reasons).
 =cut
 
 sub delete {
-  return "Can't (yet?) delete cust_pay records!";
+  my $self = shift;
+  return "Can't delete closed payment" if $self->closed =~ /^Y/i;
+  $self->SUPER::delete(@_);
 }
 
 =item replace OLD_RECORD
@@ -237,6 +241,7 @@ sub check {
     || $self->ut_money('paid')
     || $self->ut_numbern('_date')
     || $self->ut_textn('paybatch')
+    || $self->ut_enum('closed', [ '', 'Y' ])
   ;
   return $error if $error;
 
@@ -307,7 +312,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.13 2002-01-24 16:58:47 ivan Exp $
+$Id: cust_pay.pm,v 1.14 2002-01-28 06:57:23 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 2f7b3af4f..3dbd4ef39 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -55,6 +55,8 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =item otaker - order taker (assigned automatically, see L<FS::UID>)
 
+=item closed - books closed flag, empty or `Y'
+
 =back
 
 =head1 METHODS
@@ -189,7 +191,9 @@ Currently unimplemented (accounting reasons).
 =cut
 
 sub delete {
-  return "Can't (yet?) delete cust_refund records!";
+  my $self = shift;
+  return "Can't delete closed refund" if $self->closed =~ /^Y/i;
+  $self->SUPER::delete(@_);
 }
 
 =item replace OLD_RECORD
@@ -218,6 +222,7 @@ sub check {
     || $self->ut_money('refund')
     || $self->ut_numbern('_date')
     || $self->ut_textn('paybatch')
+    || $self->ut_enum('closed', [ '', 'Y' ])
   ;
   return $error if $error;
 
@@ -261,7 +266,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.14 2002-01-24 16:58:47 ivan Exp $
+$Id: cust_refund.pm,v 1.15 2002-01-28 06:57:23 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index be2ad935f..29257c0cb 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -132,7 +132,7 @@ insert and replace methods.
 sub check {
   my $self = shift;
 
-  my $error = $self->ut_numbern('pkgpart')
+  $self->ut_numbern('pkgpart')
     || $self->ut_text('pkg')
     || $self->ut_text('comment')
     || $self->ut_anything('setup')
@@ -140,19 +140,11 @@ sub check {
     || $self->ut_anything('recur')
     || $self->ut_alphan('plan')
     || $self->ut_anything('plandata')
+    || $self->ut_enum('setuptax', [ '', 'Y' ] )
+    || $self->ut_enum('recurtax', [ '', 'Y' ] )
+    || $self->ut_enum('disabled', [ '', 'Y' ] )
   ;
-  return $error if $error;
 
-  $self->setuptax =~ /^(Y?)$/ or return "Illegal setuptax: ". $self->setuptax;
-  $self->setuptax($1);
-
-  $self->recurtax =~ /^(Y?)$/ or return "Illegal recrutax: ". $self->recurtax;
-  $self->recurtax($1);
-
-  $self->disabled =~ /^(Y?)$/ or return "Illegal disabled: ". $self->disabled;
-  $self->disabled($1);
-
-  '';
 }
 
 =item pkg_svc
@@ -190,7 +182,7 @@ sub svcpart {
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.5 2001-12-27 09:26:13 ivan Exp $
+$Id: part_pkg.pm,v 1.6 2002-01-28 06:57:23 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 446d88c7e..41ee21d31 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -231,6 +231,7 @@ sub check {
     $self->ut_numbern('svcpart')
     || $self->ut_text('svc')
     || $self->ut_alpha('svcdb')
+    || $self->ut_enum('disabled', [ '', 'Y' ] )
   ;
   return $error if $error;
 
@@ -262,9 +263,6 @@ sub check {
 #    }
 #  }
 
-  $self->disabled =~ /^(Y?)$/ or return "Illegal disabled: ". $self->disabled;
-  $self->disabled($1);
-
   ''; #no error
 }
 
@@ -301,7 +299,7 @@ sub all_part_svc_column {
 
 =head1 VERSION
 
-$Id: part_svc.pm,v 1.8 2002-01-22 14:55:25 ivan Exp $
+$Id: part_svc.pm,v 1.9 2002-01-28 06:57:23 ivan Exp $
 
 =head1 BUGS
 
diff --git a/README.1.4.0pre4567-8 b/README.1.4.0pre4567-8
index 57474fed0..1f7878395 100644
--- a/README.1.4.0pre4567-8
+++ b/README.1.4.0pre4567-8
@@ -51,6 +51,11 @@ CREATE INDEX part_export_option (
 CREATE INDEX part_export_option1 ON part_export ( exportnum );
 CREATE INDEX part_export_option2 ON part_export ( option );
 
+ALTER TABLE cust_bill ADD closed char(1) NULL;
+ALTER TABLE cust_pay ADD closed char(1) NULL;
+ALTER TABLE cust_credit ADD closed char(1) NULL;
+ALTER TABLE cust_refund ADD closed char(1) NULL;
+
 Run bin/dbdef-create
 
 Restart Apache and freeside-queued
diff --git a/bin/fs-setup b/bin/fs-setup
index 5b82eaf86..e3dd8b0ea 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.70 2002-01-28 05:15:28 ivan Exp $
+# $Id: fs-setup,v 1.71 2002-01-28 06:57:23 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -293,6 +293,7 @@ sub tables_hash_hack {
         '_date',     @date_type,
         'charged',   @money_type,
         'printed',   'int',  '', '',
+        'closed',    'char', 'NULL', 1,
       ],
       'primary_key' => 'invnum',
       'unique' => [ [] ],
@@ -347,6 +348,7 @@ sub tables_hash_hack {
         'amount',   @money_type,
         'otaker',   'varchar', '', 8,
         'reason',   'text', 'NULL', '',
+        'closed',    'char', 'NULL', 1,
       ],
       'primary_key' => 'crednum',
       'unique' => [ [] ],
@@ -455,6 +457,7 @@ sub tables_hash_hack {
                                          # payment type table.
         'payinfo',  'varchar',   'NULL', 16,  #see cust_main above
         'paybatch', 'varchar',   'NULL', $char_d, #for auditing purposes.
+        'closed',    'char', 'NULL', 1,
       ],
       'primary_key' => 'paynum',
       'unique' => [ [] ],
@@ -531,6 +534,7 @@ sub tables_hash_hack {
                                              # into payment type table.
         'payinfo',      'varchar',   'NULL', 16,  #see cust_main above
         'paybatch',     'varchar',   'NULL', $char_d,
+        'closed',    'char', 'NULL', 1,
       ],
       'primary_key' => 'refundnum',
       'unique' => [ [] ],
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 3e9189b30..21da3ecf6 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -24,6 +24,7 @@
         <li>_date
         <li>charged - amount of this invoice
         <li>printed - how many times this invoice has been printed automatically
+        <li>closed - books closed flag, empty or `Y'
       </ul>
     <li><a name="cust_bill_event" href="man/FS/cust_bill_event.html">cust_bill_event</a> - Invoice event history
       <ul>
@@ -58,6 +59,7 @@
         <li>_date
         <li>otaker - order taker
         <li>reason
+        <li>closed - books closed flag, empty or `Y'
       </ul>
     <li><a name="cust_credit_bill" href="man/FS/cust_credit_bill.html">cust_credit_bill</a> - Credit invoice application.  Links a credit to an invoice.
       <ul>
@@ -132,6 +134,7 @@
         <li>payby - CARD, BILL, or COMP
         <li>payinfo - card number, P.O.#, or comp issuer
         <li>paybatch - text field for tracking card processor batches
+        <li>closed - books closed flag, empty or `Y'
       </ul>
     <li><a name="cust_bill_pay" href="man/FS/cust_bill_pay.html">cust_bill_pay</a> - Applicaton of a payment to a specific invoice.
       <ul>
@@ -181,6 +184,7 @@
         <li>payby - CARD, BILL or COMP
         <li>payinfo - card number, P.O.#, or comp issuer
         <li>otaker - order taker
+        <li>closed - books closed flag, empty or `Y'
       </ul>
     <li><a name="cust_credit_refund" href="man/FS/cust_credit_refund.html">cust_credit_refund</a> - Applicaton of a refund to a specific credit.
       <ul>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 144242b6a..bbb528cda 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -175,6 +175,10 @@ ALTER TABLE part_pkg ADD setuptax char(1) NULL;
 ALTER TABLE part_pkg ADD recurtax char(1) NULL;
 ALTER TABLE part_pkg ADD disabled char(1) NULL;
 ALTER TABLE part_svc ADD disabled char(1) NULL;
+ALTER TABLE cust_bill ADD closed char(1) NULL;
+ALTER TABLE cust_pay ADD closed char(1) NULL;
+ALTER TABLE cust_credit ADD closed char(1) NULL;
+ALTER TABLE cust_refund ADD closed char(1) NULL;
 CREATE INDEX cust_main3 ON cust_main ( referral_custnum );
 CREATE INDEX cust_credit_bill1 ON cust_credit_bill ( crednum );
 CREATE INDEX cust_credit_bill2 ON cust_credit_bill ( invnum );
-- 
cgit v1.2.1


From f31f46f6f60c2a4d6b4f69694e020c2ec48ab807 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 28 Jan 2002 11:24:50 +0000
Subject: oops, syntax error in new() check for missing subclass table sub
 (eek)

---
 FS/FS/Record.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 5c828b7c6..6b7997f21 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -122,7 +122,7 @@ sub new {
   my $self = {};
   bless ($self, $class);
 
-  unless defined ( $self->table ) {
+  unless ( defined ( $self->table ) ) {
     $self->{'Table'} = shift;
     carp "warning: FS::Record::new called with table name ". $self->{'Table'};
   }
-- 
cgit v1.2.1


From f02dd9b0e5042ef000d9338089eed50988d48914 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 29 Jan 2002 11:11:06 +0000
Subject: oops bad column type for part_bill_event.payby

---
 bin/fs-setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index e3dd8b0ea..f3ff031d4 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.71 2002-01-28 06:57:23 ivan Exp $
+# $Id: fs-setup,v 1.72 2002-01-29 11:11:06 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -315,7 +315,7 @@ sub tables_hash_hack {
     'part_bill_event' => {
       'columns' => [
         'eventpart',    'int',  '', '',
-        'payby',       'int',  '', '',
+        'payby',       'char',  '', 4,
         'event',       'varchar',           '',     $char_d,
         'eventcode',    @perl_type,
         'seconds',     'int', 'NULL', '',
-- 
cgit v1.2.1


From 6991d4986df7fb3a6c7c49b5ae1b3713e87a16c4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 29 Jan 2002 16:33:16 +0000
Subject: - web interface for hourly account charges!   (FS::cust_pkg,
 FS::cust_svc and FS::svc_acct seconds_since methods) - Makefile target to
 regenerate HTML manpages on install - FS.pm doc update - $FS::Record::Debug
 now dumps all SQL - new FS::cust_main methods: ->cancel,
 ->invoicing_list_addpost - start of a billing event web interface -
 cust_pay::upgrade_replace doesn't error out if history includes   overapplied
 payments

---
 FS/FS.pm                                      |  53 ++++---
 FS/FS/Record.pm                               |  13 +-
 FS/FS/cust_main.pm                            |  31 ++++-
 FS/FS/cust_pay.pm                             |  12 +-
 FS/FS/cust_pkg.pm                             |  28 +++-
 FS/FS/cust_svc.pm                             |  51 +++++--
 FS/FS/svc_acct.pm                             |  35 ++++-
 Makefile                                      |  12 +-
 bin/pod2x                                     |  32 ++++-
 htetc/global.asa                              |   2 +
 htetc/handler.pl                              |   2 +
 httemplate/browse/part_bill_event.cgi         |  64 +++++++++
 httemplate/docs/install.html                  |   6 +-
 httemplate/docs/man/FS.html                   |  62 ++++++---
 httemplate/docs/man/FS/CGI.html               |   5 +
 httemplate/docs/man/FS/Conf.html              |  26 +++-
 httemplate/docs/man/FS/Record.html            |  56 +++++---
 httemplate/docs/man/FS/SessionClient.html     |   2 +-
 httemplate/docs/man/FS/SignupClient.html      | 193 +++++++++++++-------------
 httemplate/docs/man/FS/UID.html               |   8 +-
 httemplate/docs/man/FS/cust_bill.html         |  37 +++--
 httemplate/docs/man/FS/cust_credit.html       |  22 ++-
 httemplate/docs/man/FS/cust_main.html         | 174 ++++++++++++++++++++---
 httemplate/docs/man/FS/cust_main_invoice.html |   2 +-
 httemplate/docs/man/FS/cust_pay.html          |  27 +++-
 httemplate/docs/man/FS/cust_pay_batch.html    |   4 +-
 httemplate/docs/man/FS/cust_pkg.html          |  56 +++++---
 httemplate/docs/man/FS/cust_refund.html       |  14 +-
 httemplate/docs/man/FS/cust_svc.html          |  25 +++-
 httemplate/docs/man/FS/domain_record.html     |  14 +-
 httemplate/docs/man/FS/part_pkg.html          |  16 ++-
 httemplate/docs/man/FS/part_svc.html          |  32 +++--
 httemplate/docs/man/FS/prepay_credit.html     |  14 +-
 httemplate/docs/man/FS/svc_Common.html        |   9 +-
 httemplate/docs/man/FS/svc_acct.html          |  76 ++++++++--
 httemplate/docs/man/FS/svc_acct_pop.html      |  22 ++-
 httemplate/docs/man/FS/svc_acct_sm.html       |  31 +++--
 httemplate/docs/man/FS/svc_domain.html        |  19 ++-
 httemplate/docs/man/FS/svc_www.html           |  18 +--
 httemplate/edit/part_bill_event.cgi           | 131 +++++++++++++++++
 httemplate/edit/part_pkg.cgi                  |  71 ++++++++--
 httemplate/edit/process/part_bill_event.cgi   |  32 +++++
 httemplate/index.html                         |   1 +
 43 files changed, 1194 insertions(+), 346 deletions(-)
 create mode 100755 httemplate/browse/part_bill_event.cgi
 create mode 100755 httemplate/edit/part_bill_event.cgi
 create mode 100755 httemplate/edit/process/part_bill_event.cgi

diff --git a/FS/FS.pm b/FS/FS.pm
index ca3330066..60831ecd5 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -14,8 +14,7 @@ FS - Freeside Perl modules
 
 =head1 SYNOPSIS
 
-FS is the unofficial (i.e. non-CPAN) prefix for the Perl module portion of the
-Freeside ISP billing software.  This includes:
+Freeside perl modules and CLI utilities.
 
 =head2 Utility classes
 
@@ -25,9 +24,7 @@ L<FS::ConfItem> - Freeside configuration option meta-data.
 
 L<FS::UID> - User class (not yet OO)
 
-L<FS::CGI> - Non OO-subroutines for the web interface.  This is
-depriciated.  Future development will be focused on the FS::UI user-interface
-classes (see below).
+L<FS::CGI> - Non OO-subroutines for the web interface.
 
 =head2 Database record classes
 
@@ -60,6 +57,10 @@ L<FS::part_svc> - Service definition class
 
 L<FS::part_svc_column> - Column constraint class
 
+L<FS::part_export> - External provisioning export class
+
+L<FS::part_export_option> - Export option class
+
 L<FS::part_pkg> - Package (billing item) definition class
 
 L<FS::pkg_svc> - Class linking package (billing item)
@@ -87,6 +88,10 @@ L<FS::cust_bill> - Invoice class
 
 L<FS::cust_bill_pkg> - Invoice line item class
 
+L<FS::part_bill_event> - Invoice event definition class
+
+L<FS::cust_bill_event> - Completed invoice event class
+
 L<FS::cust_pay> - Payment class
 
 L<FS::cust_bill_pay> - Payment application class
@@ -113,7 +118,27 @@ L<FS::queue> - Job queue
 
 L<FS::queue_arg> - Job arguments
 
-=head2 User Interface classes (under development; not yet usable)
+=head1 Remote API modules
+
+L<FS::SignupClient>
+
+L<FS::SessionClient>
+
+L<FS::MailAdminServer>
+
+=head2 Command-line utilities
+
+L<freeside-email>
+
+L<freeside-queued>
+
+L<freeside-adduser>
+
+L<freeside-bill>
+
+L<freeside-overdue>
+
+=head2 User Interface classes (under (stalled) development; not yet usable)
 
 L<FS::UI::Base> - User-interface base class
 
@@ -139,17 +164,17 @@ Providers.
 
 The Freeside home page is at <http://www.sisd.com/freeside>.
 
-The main documentation is in htdocs/docs.
-
-=head1 VERSION
-
-$Id: FS.pm,v 1.10 2001-10-24 15:29:30 ivan Exp $
+The main documentation is in httemplate/docs.
 
 =head1 SUPPORT
 
-A mailing list for users and developers is available.  Send a blank message to
+A mailing list for users is available.  Send a blank message to
 <ivan-freeside-subscribe@sisd.com> to subscribe.
 
+A mailing list for developers is available.  It is intended to be lower volume
+and higher SNR than the users list.  Send a blank message to
+<ivan-freeside-devel-subscribe@sisd.com> to subscribe.
+
 Commercial support is available; see
 <http://www.sisd.com/freeside/commercial.html>.
 
@@ -166,10 +191,6 @@ perl(1), main Freeside documentation in htdocs/docs/
 
 =head1 BUGS
 
-The version number of the FS Perl extension differs from the version of the
-Freeside distribution, which are both different from the CVS version tag for
-each file, which appears under the VERSION heading.
-
 Those modules which would be useful separately should be pulled out, 
 renamed appropriately and uploaded to CPAN.  So far: DBIx::DBSchema, Net::SSH
 and Net::SCP...
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 6b7997f21..4286606f0 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1,7 +1,8 @@
 package FS::Record;
 
 use strict;
-use vars qw($dbdef_file $dbdef $setup_hack $AUTOLOAD @ISA @EXPORT_OK $DEBUG);
+use vars qw( $dbdef_file $dbdef $setup_hack $AUTOLOAD @ISA @EXPORT_OK $DEBUG
+             $me );
 use subs qw(reload_dbdef);
 use Exporter;
 use Carp qw(carp cluck croak confess);
@@ -16,6 +17,7 @@ use FS::SearchCache;
 @EXPORT_OK = qw(dbh fields hfields qsearch qsearchs dbdef jsearch);
 
 $DEBUG = 0;
+$me = '[FS::Record]';
 
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::Record'} = sub { 
@@ -225,7 +227,7 @@ sub qsearch {
   }
   $statement .= " $extra_sql" if defined($extra_sql);
 
-  warn $statement if $DEBUG;
+  warn "[debug]$me $statement\n" if $DEBUG;
   my $sth = $dbh->prepare($statement)
     or croak "$dbh->errstr doing $statement";
 
@@ -474,6 +476,7 @@ sub insert {
       join(', ',map(_quote($self->getfield($_),$self->table,$_), @fields)).
     ")"
   ;
+  warn "[debug]$me $statement\n" if $DEBUG;
   my $sth = dbh->prepare($statement) or return dbh->errstr;
 
   local $SIG{HUP} = 'IGNORE';
@@ -523,6 +526,7 @@ sub delete {
           ? ( $self->dbdef_table->primary_key)
           : $self->fields
   );
+  warn "[debug]$me $statement\n" if $DEBUG;
   my $sth = dbh->prepare($statement) or return dbh->errstr;
 
   local $SIG{HUP} = 'IGNORE';
@@ -561,11 +565,11 @@ returns the error, otherwise returns false.
 
 sub replace {
   my ( $new, $old ) = ( shift, shift );
-  warn "[debug][FS::Record] $new ->replace $old\n" if $DEBUG;
+  warn "[debug]$me $new ->replace $old\n" if $DEBUG;
 
   my @diff = grep $new->getfield($_) ne $old->getfield($_), $old->fields;
   unless ( @diff ) {
-    carp "[warning][FS::Record] $new -> replace $old: records identical";
+    carp "[warning]$me $new -> replace $old: records identical";
     return '';
   }
 
@@ -596,6 +600,7 @@ sub replace {
       } ( $primary_key ? ( $primary_key ) : $old->fields )
     )
   ;
+  warn "[debug]$me $statement\n" if $DEBUG;
   my $sth = dbh->prepare($statement) or return dbh->errstr;
 
   local $SIG{HUP} = 'IGNORE';
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 1a9d43e94..8a7a6f806 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -831,6 +831,18 @@ sub suspend {
   grep { $_->suspend } $self->unsuspended_pkgs;
 }
 
+=item cancel
+
+Cancels all uncancelled packages (see L<FS::cust_pkg>) for this customer.
+Always returns a list: an empty list on success or a list of errors.
+
+=cut
+
+sub cancel {
+  my $self = shift;
+  grep { $_->cancel } $self->ncancelled_pkgs;
+}
+
 =item bill OPTIONS
 
 Generates invoices (see L<FS::cust_bill>) for this customer.  Usually used in
@@ -1722,7 +1734,7 @@ sub check_invoicing_list {
 
 =item default_invoicing_list
 
-Returns the email addresses of any 
+Sets the invoicing list to all accounts associated with this customer.
 
 =cut
 
@@ -1740,6 +1752,21 @@ sub default_invoicing_list {
   $self->invoicing_list(\@list);
 }
 
+=item invoicing_list_addpost
+
+Adds postal invoicing to this customer.  If this customer is already configured
+to receive postal invoices, does nothing.
+
+=cut
+
+sub invoicing_list_addpost {
+  my $self = shift;
+  return if grep { $_ eq 'POST' } $self->invoicing_list;
+  my @invoicing_list = $self->invoicing_list;
+  push @invoicing_list, 'POST';
+  $self->invoicing_list(\@invoicing_list);
+}
+
 =item referral_cust_main [ DEPTH [ EXCLUDE_HASHREF ] ]
 
 Returns an array of customers referred by this customer (referral_custnum set
@@ -1966,7 +1993,7 @@ sub append_fuzzyfiles {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.54 2002-01-09 13:29:33 ivan Exp $
+$Id: cust_main.pm,v 1.55 2002-01-29 16:33:15 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 3f811357a..51c7b29e1 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -181,11 +181,17 @@ sub upgrade_replace { #1.3.x->1.4.x
       '_date'  => $self->_date,
     };
     $error = $cust_bill_pay->insert;
-    if ( $error ) {
+    if ( $error =~ 
+           /total cust_bill_pay.amount and cust_credit_bill.amount .* for invnum .* greater than cust_bill.charged/ ) {
+      #warn $error;
+      my $cust_bill = qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
+      $new->custnum($cust_bill->custnum);
+    } elsif ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return $error;
+    } else {
+      $new->custnum($cust_bill_pay->cust_bill->custnum);
     }
-    $new->custnum($cust_bill_pay->cust_bill->custnum);
   } else {
     die;
   }
@@ -312,7 +318,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.14 2002-01-28 06:57:23 ivan Exp $
+$Id: cust_pay.pm,v 1.15 2002-01-29 16:33:15 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 633b3224f..b241ecac2 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -71,6 +71,8 @@ FS::cust_pkg - Object methods for cust_pkg objects
 
   @labels = $record->labels;
 
+  $seconds = $record->seconds_since($timestamp);
+
   $error = FS::cust_pkg::order( $custnum, \@pkgparts );
   $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );
 
@@ -487,6 +489,30 @@ sub cust_main {
   qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
 }
 
+=item seconds_since TIMESTAMP
+
+Returns the number of seconds all accounts (see L<FS::svc_acct>) in this
+package have been online since TIMESTAMP.
+
+TIMESTAMP is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=cut
+
+sub seconds_since {
+  my($self, $since) = @_;
+  my $seconds = 0;
+
+  foreach my $cust_svc (
+    grep { $_->part_svc->svcdb eq 'svc_acct' } $self->cust_svc
+  ) {
+    $seconds += $cust_svc->seconds_since($since);
+  }
+
+  $seconds;
+
+}
+
 =back
 
 =head1 SUBROUTINES
@@ -630,7 +656,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.15 2002-01-21 11:30:17 ivan Exp $
+$Id: cust_pkg.pm,v 1.16 2002-01-29 16:33:15 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 5fca892cd..541f0c801 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -3,7 +3,7 @@ package FS::cust_svc;
 use strict;
 use vars qw( @ISA );
 use Carp qw( cluck );
-use FS::Record qw( qsearchs );
+use FS::Record qw( qsearchs dbh );
 use FS::cust_pkg;
 use FS::part_pkg;
 use FS::part_svc;
@@ -159,13 +159,8 @@ Returns a list consisting of:
 sub label {
   my $self = shift;
   my $svcdb = $self->part_svc->svcdb;
-  my $svc_x;
-  if ( $svcdb eq 'svc_acct' && $self->{'_svc_acct'} ) {
-    $svc_x = $self->{'_svc_acct'};
-  } else {
-    $svc_x = qsearchs( $svcdb, { 'svcnum' => $self->svcnum } )
-      or die "can't find $svcdb.svcnum ". $self->svcnum;
-  }
+  my $svc_x = $self->svc_x
+    or die "can't find $svcdb.svcnum ". $self->svcnum;
   my $tag;
   if ( $svcdb eq 'svc_acct' ) {
     $tag = $svc_x->email;
@@ -195,11 +190,49 @@ sub label {
   $self->part_svc->svc, $tag, $svcdb;
 }
 
+=item svc_x
+
+Returns the FS::svc_XXX object for this service (i.e. an FS::svc_acct object or
+FS::svc_domain object, etc.)
+
+=cut
+
+sub svc_x {
+  my $self = shift;
+  my $svcdb = $self->part_svc->svcdb;
+  if ( $svcdb eq 'svc_acct' && $self->{'_svc_acct'} ) {
+    $self->{'_svc_acct'};
+  } else {
+    qsearchs( $svcdb, { 'svcnum' => $self->svcnum } );
+  }
+}
+
+=item seconds_since TIMESTAMP
+
+See L<FS::svc_acct/seconds_since>.  Equivalent to
+$cust_svc->svc_x->seconds_since, but more efficient.  Meaningless for records
+where B<svcdb> is not "svc_acct".
+
+=cut
+
+#note: implementation here, POD in FS::svc_acct
+sub seconds_since {
+  my($self, $since) = @_;
+  my $dbh = dbh;
+  my $sth = $dbh->prepare(' SELECT SUM(logout-login) FROM session
+                              WHERE svcnum = ?
+                                AND login >= ?
+                                AND logout IS NOT NULL'
+  ) or die $dbh->errstr;
+  $sth->execute($self->svcnum, $since) or die $sth->errstr;
+  $sth->fetchrow_arrayref->[0];
+}
+
 =back
 
 =head1 VERSION
 
-$Id: cust_svc.pm,v 1.8 2001-12-15 22:58:33 ivan Exp $
+$Id: cust_svc.pm,v 1.9 2002-01-29 16:33:15 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 0340e7cc5..16270f9cc 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -134,6 +134,14 @@ FS::svc_acct - Object methods for svc_acct records
 
   %hash = $record->radius_check;
 
+  $domain = $record->domain;
+
+  $svc_domain = $record->svc_domain;
+
+  $email = $record->email;
+
+  $seconds_since = $record->seconds_since($timestamp);
+
 =head1 DESCRIPTION
 
 An FS::svc_acct object represents an account.  FS::svc_acct inherits from
@@ -990,6 +998,15 @@ sub svc_domain {
     : qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } );
 }
 
+=item cust_svc
+
+Returns the FS::cust_svc record for this account (see L<FS::cust_svc>).
+
+sub cust_svc {
+  my $self = shift;
+  qsearchs( 'cust_svc', { 'svcnum' => $self->svcnum } );
+}
+
 =item email
 
 Returns an email address associated with the account.
@@ -1001,6 +1018,22 @@ sub email {
   $self->username. '@'. $self->domain;
 }
 
+=item seconds_since TIMESTAMP
+
+Returns the number of seconds this account has been online since TIMESTAMP.
+See L<FS::session>
+
+TIMESTAMP is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=cut
+
+#note: POD here, implementation in FS::cust_svc
+sub seconds_since {
+  my $self = shift;
+  $self->cust_svc->seconds_since(@_);
+}
+
 =item ssh
 
 =cut
@@ -1033,7 +1066,7 @@ sub ssh {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.63 2002-01-22 14:53:26 ivan Exp $
+$Id: svc_acct.pm,v 1.64 2002-01-29 16:33:15 ivan Exp $
 
 =head1 BUGS
 
diff --git a/Makefile b/Makefile
index 121123287..6fa389355 100644
--- a/Makefile
+++ b/Makefile
@@ -24,17 +24,18 @@ FREESIDE_CONF = /usr/local/etc/freeside
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
+	@echo "                   htmlman"
 	@echo "                   perl-modules install-perl-modules"
 	@echo "                   install deploy"
 	@echo "                   create-database"
 	@echo "                   clean"
 
-aspdocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
+aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
 	rm -rf aspdocs
 	cp -pr httemplate aspdocs
 	touch aspdocs
 
-masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
+masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
 	rm -rf masondocs
 	cp -pr httemplate masondocs
 	( cd masondocs; \
@@ -47,6 +48,13 @@ alldocs: aspdocs masondocs
 docs:
 	make ${TEMPLATE}docs
 
+htmlman:
+	bin/pod2x
+
+upload-docs:
+	ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
+	scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs
+
 install-docs: docs
 	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
 	cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
diff --git a/bin/pod2x b/bin/pod2x
index 8c020062c..cbe142389 100755
--- a/bin/pod2x
+++ b/bin/pod2x
@@ -15,17 +15,41 @@ die "Can't find $site_perl" unless -d $site_perl;
 #die "Can't find $catman" unless -d $catman;
 die "Can't find $html" unless -d $html;
 
+#make some useless links
+foreach my $file (
+  glob("$site_perl/bin/freeside-*"),
+) {
+  next if $file =~ /\.pod$/;
+  #symlink $file, "$file.pod"; # or die "link $file to $file.pod: $!";
+  system("cp $file $file.pod");
+}
+
 foreach my $file (
   glob("$site_perl/*.pm"),
   glob("$site_perl/*/*.pm"),
-  glob("$site_perl/*/*/*.pm")
+  glob("$site_perl/*/*/*.pm"),
+  glob("$site_perl/bin/*.pod"),
+  glob("./fs_sesmon/FS-SessionClient/*.pm"),
+  glob("./fs_signup/FS-SignupClient/*.pm"),
+  glob("./fs_selfadmin/FS-MailAdminServer/*.pm"),
 ) {
   #$file =~ /\/([\w\-]+)\.pm$/ or die "oops file $file";
-  $file =~ /$site_perl\/(.*)\.pm$/ or die "oops file $file";
-  my $name = $1;
+  my $name;
+  if ( $file =~ /fs_\w+\/FS\-\w+\/(.*)\.pm$/ ) {
+    $name = "FS/$1";
+  } elsif ( $file =~ /$site_perl\/(.*)\.(pm|pod)$/ ) {
+    $name = $1;
+  } else {
+    die "oops file $file";
+  }
   print "$name\n";
   my $htmlroot = join('/', map '..',1..(scalar($file =~ tr/\///)-2)) || '.';
 #  system "pod2text $file >$catman/$name.txt"; 
-  system "pod2html --podroot=$site_perl --podpath=./FS:./FS/UI:. --norecurse --htmlroot=$htmlroot $file >$html/$name.html";
+  system "pod2html --podroot=$site_perl --podpath=./FS:./FS/UI:.:./bin --norecurse --htmlroot=$htmlroot $file >$html/$name.html";
+  #system "pod2html --podroot=$site_perl --htmlroot=$htmlroot $file >$html/$name.html";
 #  system "pod2html $file >$html/$name.html";
 }
+
+#remove the useless links
+unlink glob("$site_perl/bin/*.pod");
+
diff --git a/htetc/global.asa b/htetc/global.asa
index c22afc132..20ef1467d 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -5,6 +5,7 @@ use CGI;
 use HTML::Entities;
 use Date::Format;
 use Date::Parse;
+use Tie::IxHash;
 use FS::UID qw(cgisuidsetup dbh);
 use FS::Record qw(qsearch qsearchs fields);
 use FS::part_svc;
@@ -12,6 +13,7 @@ use FS::part_pkg;
 use FS::pkg_svc;
 use FS::cust_pkg;
 use FS::cust_svc;
+use FS::part_bill_event;
 use FS::CGI qw(header menubar popurl table itable ntable);
 
 sub Script_OnStart {
diff --git a/htetc/handler.pl b/htetc/handler.pl
index e643559f0..6ff9d436c 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -59,6 +59,7 @@ sub handler
       #use CGI::Carp qw(fatalsToBrowser);
       use Date::Format;
       use Date::Parse;
+      use Tie::IxHash;
       use HTML::Entities;
       use FS::UID qw(cgisuidsetup);
       use FS::Record qw(qsearch qsearchs fields);
@@ -67,6 +68,7 @@ sub handler
       use FS::pkg_svc;
       use FS::cust_pkg;
       use FS::cust_svc;
+      use FS::part_bill_event;
       use FS::CGI qw(header menubar popurl table itable ntable);
 
       $cgi = new CGI;
diff --git a/httemplate/browse/part_bill_event.cgi b/httemplate/browse/part_bill_event.cgi
new file mode 100755
index 000000000..f33997666
--- /dev/null
+++ b/httemplate/browse/part_bill_event.cgi
@@ -0,0 +1,64 @@
+<!-- $Id: part_bill_event.cgi,v 1.1 2002-01-29 16:33:15 ivan Exp $ -->
+<% 
+
+my %search;
+if ( $cgi->param('showdisabled') ) {
+  %search = ();
+} else {
+  %search = ( 'disabled' => '' );
+}
+
+my @part_bill_event = qsearch('part_bill_event', \%search );
+my $total = scalar(@part_bill_event);
+
+%>
+<%= header('Invoice Event Listing', menubar( 'Main Menu' => $p) ) %>
+
+    Invoice events are actions taken on overdue invoices.<BR><BR>
+<%= $total %> events
+<%= $cgi->param('showdisabled')
+      ? do { $cgi->param('showdisabled', 0);
+             '( <a href="'. $cgi->self_url. '">hide disabled events</a> )'; }
+      : do { $cgi->param('showdisabled', 1);
+             '( <a href="'. $cgi->self_url. '">show disabled events</a> )'; }
+%>
+<TABLE BORDER=1>
+  <TR>
+    <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Event</TH>
+    <TH>Payby</TH>
+    <TH>After</TH>
+    <TH>Code</TH>
+  </TR>
+
+<% foreach my $part_bill_event ( sort {    $a->payby     cmp $b->payby
+                                        || $a->seconds   <=> $b->seconds
+                                        || $a->eventpart <=> $b->eventpart
+                                      } @part_bill_event ) {
+     my $url = "${p}edit/part_bill_event.cgi?". $part_bill_event->eventpart;
+     use Time::Duration;
+     my $delay = duration_exact($hashref->{seconds});
+%>
+  <TR>
+    <TD><A HREF="<%= $url %>">
+      <%= $part_bill_event->eventpart %></A></TD>
+<% unless ( $cgi->param('showdisabled') ) { %>
+    <TD>
+      <%= $part_bill_event->disabled ? 'DISABLED' : '' %></TD>
+<% } %>
+    <TD><A HREF="<%= $url %>">
+      <%= $part_bill_event->event %></A></TD>
+    <TD>
+      <%= $part_bill_event->payby %></TD>
+    <TD>
+      <%= $delay %></TD>
+    <TD>
+      <%= $part_bill_event->eventcode %></TD>
+  </TR>
+<% } %>
+
+  <TR>
+    <TD COLSPAN=6><A HREF="<%= $p %>edit/part_bill_event.cgi"><I>Add a new billing event</I></A></TD>
+  </TR>
+</TABLE>
+</BODY>
+</HTML>
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 5e36d14a6..20bb168df 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -32,6 +32,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=MailTools">MailTools</a>
       <li><a href="http://search.cpan.org/search?dist=TimeDate">TimeDate</a>
       <li><a href="http://search.cpan.org/search?dist=DateManip">DateManip</a>
+      <li><a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>
       <li><a href="http://search.cpan.org/search?dist=File-CounterFile">File-CounterFile</a>
       <li><a href="http://search.cpan.org/search?dist=FreezeThaw">FreezeThaw</a>
       <li><a href="http://search.cpan.org/search?dist=String-Approx">String-Approx</a>
@@ -45,6 +46,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=String-ShellQuote">String-ShellQuote</a>
       <li><a href="http://search.cpan.org/search?dist=Net-SCP">Net-SCP</a>
       <li><a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a>
+      <li><a href="http;//search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a>
     </ul>
 </ul>
 Install the Freeside distribution:
@@ -151,10 +153,10 @@ require valid-user
     <ul>
       <li>First user:<font size="-1">
 <pre>$ su
-$ freeside-adduser -c -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
+$ <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -c -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
       <li>Additional users:<font size="-1">
 <pre>$ su
-$ freeside-adduser -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
+$ <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
     </ul>
   <i>(using other auth types, add each user to your <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache authentication</a> and then run: <tt>freeside-adduser <b>username</b></tt></i>
   <li>As the freeside UNIX user, run <tt>bin/fs-setup <b>username</b></tt> to create the database tables, passing the username of a Freeside user you created above:
diff --git a/httemplate/docs/man/FS.html b/httemplate/docs/man/FS.html
index 23e8ca42f..7db6bb9fd 100644
--- a/httemplate/docs/man/FS.html
+++ b/httemplate/docs/man/FS.html
@@ -17,12 +17,17 @@
 
 		<LI><A HREF="#utility classes">Utility classes</A></LI>
 		<LI><A HREF="#database record classes">Database record classes</A></LI>
-		<LI><A HREF="#user interface classes (under development; not yet usable)">User Interface classes (under development; not yet usable)</A></LI>
+	</UL>
+
+	<LI><A HREF="#remote api modules">Remote API modules</A></LI>
+	<UL>
+
+		<LI><A HREF="#commandline utilities">Command-line utilities</A></LI>
+		<LI><A HREF="#user interface classes (under (stalled) development; not yet usable)">User Interface classes (under (stalled) development; not yet usable)</A></LI>
 		<LI><A HREF="#notes">Notes</A></LI>
 	</UL>
 
 	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
 	<LI><A HREF="#support">SUPPORT</A></LI>
 	<LI><A HREF="#author">AUTHOR</A></LI>
 	<LI><A HREF="#see also">SEE ALSO</A></LI>
@@ -37,29 +42,32 @@
 <P>
 <HR>
 <H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<P>FS is the unofficial (i.e. non-CPAN) prefix for the Perl module portion of the
-Freeside ISP billing software.  This includes:</P>
+<P>Freeside perl modules and CLI utilities.</P>
 <P>
 <H2><A NAME="utility classes">Utility classes</A></H2>
 <P><A HREF="././FS/Conf.html">the FS::Conf manpage</A> - Freeside configuration values</P>
+<P><A HREF="././FS/ConfItem.html">the FS::ConfItem manpage</A> - Freeside configuration option meta-data.</P>
 <P><A HREF="././FS/UID.html">the FS::UID manpage</A> - User class (not yet OO)</P>
-<P><A HREF="././FS/CGI.html">the FS::CGI manpage</A> - Non OO-subroutines for the web interface.  This is
-depriciated.  Future development will be focused on the FS::UI user-interface
-classes (see below).</P>
+<P><A HREF="././FS/CGI.html">the FS::CGI manpage</A> - Non OO-subroutines for the web interface.</P>
 <P>
 <H2><A NAME="database record classes">Database record classes</A></H2>
 <P><A HREF="././FS/Record.html">the FS::Record manpage</A> - Database record base class</P>
 <P><A HREF="././FS/svc_acct_pop.html">the FS::svc_acct_pop manpage</A> - POP (Point of Presence, not Post
 Office Protocol) class</P>
+<P><A HREF="././FS/part_pop_local.html">the FS::part_pop_local manpage</A> - Local calling area class</P>
 <P><A HREF="././FS/part_referral.html">the FS::part_referral manpage</A> - Referral class</P>
 <P><A HREF="././FS/cust_main_county.html">the FS::cust_main_county manpage</A> - Locale (tax rate) class</P>
 <P><A HREF="././FS/svc_Common.html">the FS::svc_Common manpage</A> - Service base class</P>
 <P><A HREF="././FS/svc_acct.html">the FS::svc_acct manpage</A> - Account (shell, RADIUS, POP3) class</P>
 <P><A HREF="././FS/svc_domain.html">the FS::svc_domain manpage</A> - Domain class</P>
 <P><A HREF="././FS/domain_record.html">the FS::domain_record manpage</A> - DNS zone entries</P>
-<P><A HREF="././FS/svc_acct_sm.html">the FS::svc_acct_sm manpage</A> - Vitual mail alias class</P>
+<P><A HREF="././FS/svc_forward.html">the FS::svc_forward manpage</A> - Mail forwarding class</P>
+<P><A HREF="././FS/svc_acct_sm.html">the FS::svc_acct_sm manpage</A> - (Depreciated) Vitual mail alias class</P>
 <P><A HREF="././FS/svc_www.html">the FS::svc_www manpage</A> - Web virtual host class.</P>
 <P><A HREF="././FS/part_svc.html">the FS::part_svc manpage</A> - Service definition class</P>
+<P><A HREF="././FS/part_svc_column.html">the FS::part_svc_column manpage</A> - Column constraint class</P>
+<P><A HREF="././FS/part_export.html">the FS::part_export manpage</A> - External provisioning export class</P>
+<P><A HREF="././FS/part_export_option.html">the FS::part_export_option manpage</A> - Export option class</P>
 <P><A HREF="././FS/part_pkg.html">the FS::part_pkg manpage</A> - Package (billing item) definition class</P>
 <P><A HREF="././FS/pkg_svc.html">the FS::pkg_svc manpage</A> - Class linking package (billing item)
 definitions (see <A HREF="././FS/part_pkg.html">the FS::part_pkg manpage</A>) with service definitions
@@ -76,16 +84,36 @@ definitions (see <A HREF="././FS/part_pkg.html">the FS::part_pkg manpage</A>) wi
 class</P>
 <P><A HREF="././FS/cust_bill.html">the FS::cust_bill manpage</A> - Invoice class</P>
 <P><A HREF="././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A> - Invoice line item class</P>
+<P><A HREF="././FS/part_bill_event.html">the FS::part_bill_event manpage</A> - Invoice event definition class</P>
+<P><A HREF="././FS/cust_bill_event.html">the FS::cust_bill_event manpage</A> - Completed invoice event class</P>
 <P><A HREF="././FS/cust_pay.html">the FS::cust_pay manpage</A> - Payment class</P>
+<P><A HREF="././FS/cust_bill_pay.html">the FS::cust_bill_pay manpage</A> - Payment application class</P>
 <P><A HREF="././FS/cust_credit.html">the FS::cust_credit manpage</A> - Credit class</P>
 <P><A HREF="././FS/cust_refund.html">the FS::cust_refund manpage</A> - Refund class</P>
+<P><A HREF="././FS/cust_credit_refund.html">the FS::cust_credit_refund manpage</A> - Refund application class</P>
+<P><A HREF="././FS/cust_credit_bill.html">the FS::cust_credit_bill manpage</A> - Credit invoice application class</P>
 <P><A HREF="././FS/cust_pay_batch.html">the FS::cust_pay_batch manpage</A> - Credit card transaction queue class</P>
 <P><A HREF="././FS/prepay_credit.html">the FS::prepay_credit manpage</A> - Prepaid ``calling card'' credit class.</P>
 <P><A HREF="././FS/nas.html">the FS::nas manpage</A> - Network Access Server class</P>
 <P><A HREF="././FS/port.html">the FS::port manpage</A> - NAS port class</P>
 <P><A HREF="././FS/session.html">the FS::session manpage</A> - User login session class</P>
+<P><A HREF="././FS/queue.html">the FS::queue manpage</A> - Job queue</P>
+<P><A HREF="././FS/queue_arg.html">the FS::queue_arg manpage</A> - Job arguments</P>
 <P>
-<H2><A NAME="user interface classes (under development; not yet usable)">User Interface classes (under development; not yet usable)</A></H2>
+<HR>
+<H1><A NAME="remote api modules">Remote API modules</A></H1>
+<P><A HREF="./FS/SignupClient.html">the FS::SignupClient manpage</A></P>
+<P><A HREF="./FS/SessionClient.html">the FS::SessionClient manpage</A></P>
+<P><A HREF="./FS/MailAdminServer.html">the FS::MailAdminServer manpage</A></P>
+<P>
+<H2><A NAME="commandline utilities">Command-line utilities</A></H2>
+<P><A HREF="././bin/freeside-email.html">the freeside-email manpage</A></P>
+<P><A HREF="././bin/freeside-queued.html">the freeside-queued manpage</A></P>
+<P><A HREF="././bin/freeside-adduser.html">the freeside-adduser manpage</A></P>
+<P><A HREF="././bin/freeside-bill.html">the freeside-bill manpage</A></P>
+<P><A HREF="././bin/freeside-overdue.html">the freeside-overdue manpage</A></P>
+<P>
+<H2><A NAME="user interface classes (under (stalled) development; not yet usable)">User Interface classes (under (stalled) development; not yet usable)</A></H2>
 <P><A HREF="././FS/UI/Base.html">the FS::UI::Base manpage</A> - User-interface base class</P>
 <P><A HREF="././FS/UI/Gtk.html">the FS::UI::Gtk manpage</A> - Gtk user-interface class</P>
 <P><A HREF="././FS/UI/CGI.html">the FS::UI::CGI manpage</A> - CGI (HTML) user-interface class</P>
@@ -95,22 +123,23 @@ class</P>
 <P>To quote perl(1), ``If you're intending to read these straight through for the
 first time, the suggested order will tend to reduce the number of forward
 references.''</P>
+<P>If you've never used OO modules before,
+<A HREF="http://www.cpan.org/doc/FMTEYEWTK/easy_objects.html">http://www.cpan.org/doc/FMTEYEWTK/easy_objects.html</A> might help you out.</P>
 <P>
 <HR>
 <H1><A NAME="description">DESCRIPTION</A></H1>
 <P>Freeside is a billing and administration package for Internet Service
 Providers.</P>
 <P>The Freeside home page is at &lt;http://www.sisd.com/freeside&gt;.</P>
-<P>The main documentation is in htdocs/docs.</P>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: FS.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>The main documentation is in httemplate/docs.</P>
 <P>
 <HR>
 <H1><A NAME="support">SUPPORT</A></H1>
-<P>A mailing list for users and developers is available.  Send a blank message to
+<P>A mailing list for users is available.  Send a blank message to
 &lt;<A HREF="mailto:ivan-freeside-subscribe@sisd.com">ivan-freeside-subscribe@sisd.com</A>&gt; to subscribe.</P>
+<P>A mailing list for developers is available.  It is intended to be lower volume
+and higher SNR than the users list.  Send a blank message to
+&lt;<A HREF="mailto:ivan-freeside-devel-subscribe@sisd.com">ivan-freeside-devel-subscribe@sisd.com</A>&gt; to subscribe.</P>
 <P>Commercial support is available; see
 &lt;http://www.sisd.com/freeside/commercial.html&gt;.</P>
 <P>
@@ -126,9 +155,6 @@ list and the individal files for details.</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
-<P>The version number of the FS Perl extension differs from the version of the
-Freeside distribution, which are both different from the CVS version tag for
-each file, which appears under the VERSION heading.</P>
 <P>Those modules which would be useful separately should be pulled out, 
 renamed appropriately and uploaded to CPAN.  So far: DBIx::DBSchema, Net::SSH
 and Net::SCP...</P>
diff --git a/httemplate/docs/man/FS/CGI.html b/httemplate/docs/man/FS/CGI.html
index 05f7823b4..54a0bf39b 100644
--- a/httemplate/docs/man/FS/CGI.html
+++ b/httemplate/docs/man/FS/CGI.html
@@ -79,12 +79,17 @@ Returns HTML tag for beginning an (invisible) table.
 <DT><STRONG><A NAME="item_ntable">ntable</A></STRONG><BR>
 <DD>
 This is getting silly.
+<P></P>
+<DT><STRONG><A NAME="item_small_custview_CUSTNUM_%7C%7C_CUST_MAIN_OBJECT%2C_">small_custview CUSTNUM || CUST_MAIN_OBJECT, COUNTRYDEFAULT</A></STRONG><BR>
+<DD>
+Sheesh. I should just switch to Mason.
 <P></P></DL>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
 <P>Not OO.</P>
 <P>Not complete.</P>
+<P>small_custview sooooo doesn't belong here.  i should just switch to Mason.</P>
 <P>
 <HR>
 <H1><A NAME="see also">SEE ALSO</A></H1>
diff --git a/httemplate/docs/man/FS/Conf.html b/httemplate/docs/man/FS/Conf.html
index 7b1613efd..be49be31f 100644
--- a/httemplate/docs/man/FS/Conf.html
+++ b/httemplate/docs/man/FS/Conf.html
@@ -1,6 +1,6 @@
 <HTML>
 <HEAD>
-<TITLE>FS::Conf - Read access to Freeside configuration values</TITLE>
+<TITLE>FS::Conf - Freeside configuration values</TITLE>
 <LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
@@ -23,7 +23,7 @@
 <HR>
 <P>
 <H1><A NAME="name">NAME</A></H1>
-<P>FS::Conf - Read access to Freeside configuration values</P>
+<P>FS::Conf - Freeside configuration values</P>
 <P>
 <HR>
 <H1><A NAME="synopsis">SYNOPSIS</A></H1>
@@ -40,10 +40,12 @@
   $value = $conf-&gt;config('key');
   @list  = $conf-&gt;config('key');
   $bool  = $conf-&gt;exists('key');</PRE>
+<PRE>
+  @config_items = $conf-&gt;config_items;</PRE>
 <P>
 <HR>
 <H1><A NAME="description">DESCRIPTION</A></H1>
-<P>Read access to Freeside configuration values.  Keys currently map to filenames,
+<P>Read and write Freeside configuration values.  Keys currently map to filenames,
 but this may change in the future.</P>
 <P>
 <HR>
@@ -66,15 +68,29 @@ Returns the configuration value or values (depending on context) for key.
 <DD>
 Returns true if the specified key exists, even if the corresponding value
 is undefined.
+<P></P>
+<DT><STRONG><A NAME="item_touch">touch</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_set">set</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_config_items">config_items</A></STRONG><BR>
+<DD>
+Returns all of the possible configuration items as FS::ConfItem objects.  See
+<A HREF=".././FS/ConfItem.html">the FS::ConfItem manpage</A>.
 <P></P></DL>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
-<P>Write access (with locking) should be implemented.</P>
+<P>Write access (touch, set, delete) should be documented.</P>
+<P>If this was more than just crud that will never be useful outside Freeside I'd
+worry that config_items is freeside-specific and icky.</P>
 <P>
 <HR>
 <H1><A NAME="see also">SEE ALSO</A></H1>
-<P>config.html from the base documentation contains a list of configuration files.</P>
+<P>``Configuration'' in the web interface (config/config.cgi).</P>
+<P>httemplate/docs/config.html</P>
 
 </BODY>
 
diff --git a/httemplate/docs/man/FS/Record.html b/httemplate/docs/man/FS/Record.html
index 09304083f..108a84ad7 100644
--- a/httemplate/docs/man/FS/Record.html
+++ b/httemplate/docs/man/FS/Record.html
@@ -17,7 +17,6 @@
 	<LI><A HREF="#constructors">CONSTRUCTORS</A></LI>
 	<LI><A HREF="#methods">METHODS</A></LI>
 	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
 	<LI><A HREF="#bugs">BUGS</A></LI>
 	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
@@ -68,16 +67,17 @@
 <PRE>
     $value = $record-&gt;unique('column');</PRE>
 <PRE>
-    $value = $record-&gt;ut_float('column');
-    $value = $record-&gt;ut_number('column');
-    $value = $record-&gt;ut_numbern('column');
-    $value = $record-&gt;ut_money('column');
-    $value = $record-&gt;ut_text('column');
-    $value = $record-&gt;ut_textn('column');
-    $value = $record-&gt;ut_alpha('column');
-    $value = $record-&gt;ut_alphan('column');
-    $value = $record-&gt;ut_phonen('column');
-    $value = $record-&gt;ut_anythingn('column');</PRE>
+    $error = $record-&gt;ut_float('column');
+    $error = $record-&gt;ut_number('column');
+    $error = $record-&gt;ut_numbern('column');
+    $error = $record-&gt;ut_money('column');
+    $error = $record-&gt;ut_text('column');
+    $error = $record-&gt;ut_textn('column');
+    $error = $record-&gt;ut_alpha('column');
+    $error = $record-&gt;ut_alphan('column');
+    $error = $record-&gt;ut_phonen('column');
+    $error = $record-&gt;ut_anything('column');
+    $error = $record-&gt;ut_name('column');</PRE>
 <PRE>
     $dbdef = reload_dbdef;
     $dbdef = reload_dbdef &quot;/non/standard/filename&quot;;
@@ -125,6 +125,14 @@ objects.
 #regular FS::TABLE methods
 #on it.</P>
 <P></P>
+<DT><STRONG><A NAME="item_jsearch_TABLE%2C_HASHREF%2C_SELECT%2C_EXTRA_SQL%2C">jsearch TABLE, HASHREF, SELECT, EXTRA_SQL, PRIMARY_TABLE, PRIMARY_KEY</A></STRONG><BR>
+<DD>
+Experimental JOINed search method.  Using this method, you can execute a
+single SELECT spanning multiple tables, and cache the results for subsequent
+method calls.  Interface will almost definately change in an incompatible
+fashion.
+<P>Arguments:</P>
+<P></P>
 <DT><STRONG><A NAME="item_qsearchs">qsearchs TABLE, HASHREF</A></STRONG><BR>
 <DD>
 Same as qsearch, except that if more than one record matches, it <STRONG>carp</STRONG>s but
@@ -266,10 +274,29 @@ Check/untaint ip addresses.  IPv4 only for now.  May be null.
 <DD>
 Check/untaint host and domain names.
 <P></P>
+<DT><STRONG><A NAME="item_ut_name_COLUMN">ut_name COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint proper names; allows alphanumerics, spaces and the following
+punctuation: , . - '
+<P>May not be null.</P>
+<P></P>
+<DT><STRONG><A NAME="item_ut_zip_COLUMN">ut_zip COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint zip codes.
+<P></P>
+<DT><STRONG><A NAME="item_ut_country_COLUMN">ut_country COLUMN</A></STRONG><BR>
+<DD>
+Check/untaint country codes.  Country names are changed to codes, if possible -
+see <A HREF="../Locale/Country.html">the Locale::Country manpage</A>.
+<P></P>
 <DT><STRONG><A NAME="item_ut_anything_COLUMN">ut_anything COLUMN</A></STRONG><BR>
 <DD>
 Untaints arbitrary data.  Be careful.
 <P></P>
+<DT><STRONG><A NAME="item_ut_enum_COLUMN_CHOICES_ARRAYREF">ut_enum COLUMN CHOICES_ARRAYREF</A></STRONG><BR>
+<DD>
+Check/untaint a column, supplying all possible choices, like the ``enum'' type.
+<P></P>
 <DT><STRONG><A NAME="item_fields_%5B_TABLE_%5D">fields [ TABLE ]</A></STRONG><BR>
 <DD>
 This can be used as both a subroutine and a method call.  It returns a list
@@ -303,10 +330,6 @@ This is depriciated.  Don't use it.
 <P></P></DL>
 <P>
 <HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: Record.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
-<P>
-<HR>
 <H1><A NAME="bugs">BUGS</A></H1>
 <P>This module should probably be renamed, since much of the functionality is
 of general use.  It is not completely unlike Adapter::DBI (see below).</P>
@@ -323,7 +346,7 @@ true maps to the database (and WHERE clauses) would also help.</P>
 <P>A fallback check method should be provided which uses the dbdef.</P>
 <P>The ut_money method assumes money has two decimal digits.</P>
 <P>The Pg money kludge in the new method only strips `$'.</P>
-<P>The ut_phonen method assumes US-style phone numbers.</P>
+<P>The ut_phonen method only checks US-style phone numbers.</P>
 <P>The _quote function should probably use ut_float instead of a regex.</P>
 <P>All the subroutines probably should be methods, here or elsewhere.</P>
 <P>Probably should borrow/use some dbdef methods where appropriate (like sub
@@ -331,6 +354,7 @@ fields)</P>
 <P>As of 1.14, DBI fetchall_hashref( {} ) doesn't set fetchrow_hashref NAME_lc,
 or allow it to be set.  Working around it is ugly any way around - DBI should
 be fixed.  (only affects RDBMS which return uppercase column names)</P>
+<P>ut_zip should take an optional country like ut_phone.</P>
 <P>
 <HR>
 <H1><A NAME="see also">SEE ALSO</A></H1>
diff --git a/httemplate/docs/man/FS/SessionClient.html b/httemplate/docs/man/FS/SessionClient.html
index 615f35e0e..0abb2a6a1 100644
--- a/httemplate/docs/man/FS/SessionClient.html
+++ b/httemplate/docs/man/FS/SessionClient.html
@@ -83,7 +83,7 @@ optional, but must be correct if specified.
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: SessionClient.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: SessionClient.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
diff --git a/httemplate/docs/man/FS/SignupClient.html b/httemplate/docs/man/FS/SignupClient.html
index 844f64f33..3438c804a 100644
--- a/httemplate/docs/man/FS/SignupClient.html
+++ b/httemplate/docs/man/FS/SignupClient.html
@@ -1,124 +1,131 @@
 <HTML>
 <HEAD>
 <TITLE>FS::SignupClient - Freeside signup client API</TITLE>
-<LINK REV="made" HREF="mailto:none">
+<LINK REV="made" HREF="mailto:perl@packages.debian.org">
 </HEAD>
 
 <BODY>
 
+<A NAME="__index__"></A>
 <!-- INDEX BEGIN -->
 
 <UL>
 
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
-	<LI><A HREF="#SUBROUTINES">SUBROUTINES</A>
-	<LI><A HREF="#VERSION">VERSION</A>
-	<LI><A HREF="#BUGS">BUGS</A>
-	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+	<LI><A HREF="#name">NAME</A></LI>
+	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#description">DESCRIPTION</A></LI>
+	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
+	<LI><A HREF="#bugs">BUGS</A></LI>
+	<LI><A HREF="#see also">SEE ALSO</A></LI>
 </UL>
 <!-- INDEX END -->
 
 <HR>
 <P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::SignupClient - Freeside signup client API
-
+<H1><A NAME="name">NAME</A></H1>
+<P>FS::SignupClient - Freeside signup client API</P>
 <P>
 <HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-<PRE>  use FS::SignupClient qw( signup_info new_customer );
-</PRE>
-<P>
-<PRE>  ( $locales, $packages, $pops ) = signup_info;
-</PRE>
-<P>
-<PRE>  $error = new_customer ( {
-    'first'          =&gt; $first,
-    'last'           =&gt; $last,
-    'ss'             =&gt; $ss,
-    'comapny'        =&gt; $company,
-    'address1'       =&gt; $address1,
-    'address2'       =&gt; $address2,
-    'city'           =&gt; $city,
-    'county'         =&gt; $county,
-    'state'          =&gt; $state,
-    'zip'            =&gt; $zip,
-    'country'        =&gt; $country,
-    'daytime'        =&gt; $daytime,
-    'night'          =&gt; $night,
-    'fax'            =&gt; $fax,
-    'payby'          =&gt; $payby,
-    'payinfo'        =&gt; $payinfo,
-    'paydate'        =&gt; $paydate,
-    'payname'        =&gt; $payname,
-    'invoicing_list' =&gt; $invoicing_list,
-    'pkgpart'        =&gt; $pkgpart,
-    'username'       =&gt; $username,
-    '_password'       =&gt; $password,
-    'popnum'         =&gt; $popnum,
-  } );
-</PRE>
+<H1><A NAME="synopsis">SYNOPSIS</A></H1>
+<PRE>
+  use FS::SignupClient qw( signup_info new_customer );</PRE>
+<PRE>
+  ( $locales, $packages, $pops ) = signup_info;</PRE>
+<PRE>
+  $error = new_customer ( {
+    'first'            =&gt; $first,
+    'last'             =&gt; $last,
+    'ss'               =&gt; $ss,
+    'comapny'          =&gt; $company,
+    'address1'         =&gt; $address1,
+    'address2'         =&gt; $address2,
+    'city'             =&gt; $city,
+    'county'           =&gt; $county,
+    'state'            =&gt; $state,
+    'zip'              =&gt; $zip,
+    'country'          =&gt; $country,
+    'daytime'          =&gt; $daytime,
+    'night'            =&gt; $night,
+    'fax'              =&gt; $fax,
+    'payby'            =&gt; $payby,
+    'payinfo'          =&gt; $payinfo,
+    'paydate'          =&gt; $paydate,
+    'payname'          =&gt; $payname,
+    'invoicing_list'   =&gt; $invoicing_list,
+    'referral_custnum' =&gt; $referral_custnum,
+    'pkgpart'          =&gt; $pkgpart,
+    'username'         =&gt; $username,
+    '_password'        =&gt; $password,
+    'popnum'           =&gt; $popnum,
+  } );</PRE>
 <P>
 <HR>
-<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
-<P>
-This module provides an API for a remote signup server.
-
-<P>
-It needs to be run as the freeside user. Because of this, the program which
-calls these subroutines should be written very carefully.
-
+<H1><A NAME="description">DESCRIPTION</A></H1>
+<P>This module provides an API for a remote signup server.</P>
+<P>It needs to be run as the freeside user.  Because of this, the program which
+calls these subroutines should be written very carefully.</P>
 <P>
 <HR>
-<H1><A NAME="SUBROUTINES">SUBROUTINES</A></H1>
+<H1><A NAME="subroutines">SUBROUTINES</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_signup_info">signup_info</A></STRONG><DD>
-<P>
+<DT><STRONG><A NAME="item_signup_info">signup_info</A></STRONG><BR>
+<DD>
 Returns three array references of hash references.
-
-<P>
-The first set of hash references is of allowable locales. Each hash
-reference has the following keys: taxnum state county country
-
-<P>
-The second set of hash references is of allowable packages. Each hash
-reference has the following keys: pkgpart pkg
-
-<P>
-The third set of hash references is of allowable POPs (Points Of Presence).
-Each hash reference has the following keys: popnum city state ac exch
-
-<DT><STRONG><A NAME="item_new_customer">new_customer HASHREF</A></STRONG><DD>
-<P>
-Adds a customer to the remote Freeside system. Requires a hash reference as
-a paramater with the following keys: first last ss comapny address1
-address2 city county state zip country daytime night fax payby payinfo
-paydate payname invoicing_list pkgpart username _password popnum
-
-<P>
-Returns a scalar error message, or the empty string for success.
-
-</DL>
+<P>The first set of hash references is of allowable locales.  Each hash reference
+has the following keys:
+  taxnum
+  state
+  county
+  country</P>
+<P>The second set of hash references is of allowable packages.  Each hash
+reference has the following keys:
+  pkgpart
+  pkg</P>
+<P>The third set of hash references is of allowable POPs (Points Of Presence).
+Each hash reference has the following keys:
+  popnum
+  city
+  state
+  ac
+  exch</P>
+<P></P>
+<DT><STRONG><A NAME="item_new_customer_HASHREF">new_customer HASHREF</A></STRONG><BR>
+<DD>
+Adds a customer to the remote Freeside system.  Requires a hash reference as
+a paramater with the following keys:
+  first
+  last
+  ss
+  comapny
+  address1
+  address2
+  city
+  county
+  state
+  zip
+  country
+  daytime
+  night
+  fax
+  payby
+  payinfo
+  paydate
+  payname
+  invoicing_list
+  referral_custnum
+  pkgpart
+  username
+  _password
+  popnum
+<P>Returns a scalar error message, or the empty string for success.</P>
+<P></P></DL>
 <P>
 <HR>
-<H1><A NAME="VERSION">VERSION</A></H1>
-<P>
-$Id: SignupClient.html,v 1.1 2001-07-30 07:36:03 ivan Exp $
-
-<P>
-<HR>
-<H1><A NAME="BUGS">BUGS</A></H1>
+<H1><A NAME="bugs">BUGS</A></H1>
 <P>
 <HR>
-<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
-<P>
-<EM>fs_signupd</EM>, <A HREF="./htdocs/docs/man/FS/SignupServer.html">FS::SignupServer</A>, <A HREF="./htdocs/docs/man/FS/cust_main.html">FS::cust_main</A>
-
-
+<H1><A NAME="see also">SEE ALSO</A></H1>
+<P><EM>fs_signupd</EM>, <A HREF="../FS/SignupServer.html">the FS::SignupServer manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A></P>
 
 </BODY>
 
diff --git a/httemplate/docs/man/FS/UID.html b/httemplate/docs/man/FS/UID.html
index 9f4947765..3c28eebfd 100644
--- a/httemplate/docs/man/FS/UID.html
+++ b/httemplate/docs/man/FS/UID.html
@@ -31,7 +31,7 @@
 <H1><A NAME="synopsis">SYNOPSIS</A></H1>
 <PRE>
   use FS::UID qw(adminsuidsetup cgisuidsetup dbh datasrc getotaker
-  checkeuid checkruid swapuid);</PRE>
+  checkeuid checkruid);</PRE>
 <PRE>
   adminsuidsetup $user;</PRE>
 <PRE>
@@ -100,10 +100,6 @@ Returns true if effective UID is that of the freeside user.
 <DD>
 Returns true if the real UID is that of the freeside user.
 <P></P>
-<DT><STRONG><A NAME="item_swapuid">swapuid</A></STRONG><BR>
-<DD>
-Swaps real and effective UIDs.
-<P></P>
 <DT><STRONG><A NAME="item_getsecrets_%5B_USER_%5D">getsecrets [ USER ]</A></STRONG><BR>
 <DD>
 Sets the user to USER, if supplied.
@@ -122,7 +118,7 @@ coderef into the hash %FS::UID::callback :</P>
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: UID.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: UID.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
diff --git a/httemplate/docs/man/FS/cust_bill.html b/httemplate/docs/man/FS/cust_bill.html
index 2e2ad37fe..8bdb87b56 100644
--- a/httemplate/docs/man/FS/cust_bill.html
+++ b/httemplate/docs/man/FS/cust_bill.html
@@ -49,6 +49,8 @@
   ( $total_previous_credits, @previous_cust_credit ) = $record-&gt;cust_credit;</PRE>
 <PRE>
   @cust_pay_objects = $cust_bill-&gt;cust_pay;</PRE>
+<PRE>
+  $tax_amount = $record-&gt;tax;</PRE>
 <PRE>
   @lines = $cust_bill-&gt;print_text;
   @lines = $cust_bill-&gt;print_text $time;</PRE>
@@ -72,6 +74,8 @@ following fields are currently supported:</P>
 <DT><STRONG><A NAME="item_automatically">printed - how many times this invoice has been printed automatically
 (see <A HREF=".././FS/cust_main.html#collect">collect in the FS::cust_main manpage</A>).</A></STRONG><BR>
 <DD>
+<DT><STRONG><A NAME="item_closed_%2D_books_closed_flag%2C_empty_or_%60Y%27">closed - books closed flag, empty or `Y'</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
@@ -117,18 +121,34 @@ Returns the line items (see <A HREF=".././FS/cust_bill_pkg.html">the FS::cust_bi
 <P></P>
 <DT><STRONG><A NAME="item_cust_credit">cust_credit</A></STRONG><BR>
 <DD>
-Returns a list consisting of the total previous credited (see
-<A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>) for this customer, followed by the previous outstanding
-credits (FS::cust_credit objects).
+Depreciated.  See the cust_credited method.
+<PRE>
+ #Returns a list consisting of the total previous credited (see
+ #L&lt;FS::cust_credit&gt;) and unapplied for this customer, followed by the previous
+ #outstanding credits (FS::cust_credit objects).</PRE>
 <P></P>
 <DT><STRONG><A NAME="item_cust_pay">cust_pay</A></STRONG><BR>
 <DD>
-Returns all payments (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>) for this invoice.
+Depreciated.  See the cust_bill_pay method.
+<P>#Returns all payments (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>) for this invoice.</P>
+<P></P>
+<DT><STRONG><A NAME="item_cust_bill_pay">cust_bill_pay</A></STRONG><BR>
+<DD>
+Returns all payment applications (see <A HREF=".././FS/cust_bill_pay.html">the FS::cust_bill_pay manpage</A>) for this invoice.
+<P></P>
+<DT><STRONG><A NAME="item_cust_credited">cust_credited</A></STRONG><BR>
+<DD>
+Returns all applied credits (see <A HREF=".././FS/cust_credit_bill.html">the FS::cust_credit_bill manpage</A>) for this invoice.
+<P></P>
+<DT><STRONG><A NAME="item_tax">tax</A></STRONG><BR>
+<DD>
+Returns the tax amount (see <A HREF=".././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A>) for this invoice.
 <P></P>
 <DT><STRONG><A NAME="item_owed">owed</A></STRONG><BR>
 <DD>
 Returns the amount owed (still outstanding) on this invoice, which is charged
-minus all payments (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>).
+minus all payment applications (see <A HREF=".././FS/cust_bill_pay.html">the FS::cust_bill_pay manpage</A>) and credit
+applications (see <A HREF=".././FS/cust_credit_bill.html">the FS::cust_credit_bill manpage</A>).
 <P></P>
 <DT><STRONG><A NAME="item_print_text_%5BTIME%5D%3B">print_text [TIME];</A></STRONG><BR>
 <DD>
@@ -141,7 +161,7 @@ It is specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_bill.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: cust_bill.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
@@ -153,8 +173,9 @@ or something similar so the look can be completely customized?)</P>
 <P>
 <HR>
 <H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>, <A HREF=".././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A>,
-<A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>, schema.html from the base documentation.</P>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/cust_bill_pay.html">the FS::cust_bill_pay manpage</A>, <EM>FS:;cust_pay</EM>,
+<A HREF=".././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A>, <A HREF="../FS/cust_bill_credit.html">the FS::cust_bill_credit manpage</A>, schema.html from the base
+documentation.</P>
 
 </BODY>
 
diff --git a/httemplate/docs/man/FS/cust_credit.html b/httemplate/docs/man/FS/cust_credit.html
index 16caca60d..f30241371 100644
--- a/httemplate/docs/man/FS/cust_credit.html
+++ b/httemplate/docs/man/FS/cust_credit.html
@@ -61,6 +61,8 @@ FS::Record.  The following fields are currently supported:</P>
 <DD>
 <DT><STRONG><A NAME="item_reason_%2D_text">reason - text</A></STRONG><BR>
 <DD>
+<DT><STRONG><A NAME="item_closed_%2D_books_closed_flag%2C_empty_or_%60Y%27">closed - books closed flag, empty or `Y'</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
@@ -92,17 +94,28 @@ methods.
 <P></P>
 <DT><STRONG><A NAME="item_cust_refund">cust_refund</A></STRONG><BR>
 <DD>
-Returns all refunds (see <A HREF=".././FS/cust_refund.html">the FS::cust_refund manpage</A>) for this credit.
+Depreciated.  See the cust_credit_refund method.
+<P>#Returns all refunds (see <A HREF=".././FS/cust_refund.html">the FS::cust_refund manpage</A>) for this credit.</P>
+<P></P>
+<DT><STRONG><A NAME="item_cust_credit_refund">cust_credit_refund</A></STRONG><BR>
+<DD>
+Returns all refund applications (see <A HREF=".././FS/cust_credit_refund.html">the FS::cust_credit_refund manpage</A>) for this credit.
+<P></P>
+<DT><STRONG><A NAME="item_cust_credit_bill">cust_credit_bill</A></STRONG><BR>
+<DD>
+Returns all application to invoices (see <A HREF=".././FS/cust_credit_bill.html">the FS::cust_credit_bill manpage</A>) for this
+credit.
 <P></P>
 <DT><STRONG><A NAME="item_credited">credited</A></STRONG><BR>
 <DD>
 Returns the amount of this credit that is still outstanding; which is
-amount minus all refunds (see <A HREF=".././FS/cust_refund.html">the FS::cust_refund manpage</A>).
+amount minus all refund applications (see <A HREF=".././FS/cust_credit_refund.html">the FS::cust_credit_refund manpage</A>) and
+applications to invoices (see <A HREF=".././FS/cust_credit_bill.html">the FS::cust_credit_bill manpage</A>).
 <P></P></DL>
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_credit.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: cust_credit.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
@@ -110,7 +123,8 @@ amount minus all refunds (see <A HREF=".././FS/cust_refund.html">the FS::cust_re
 <P>
 <HR>
 <H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_refund.html">the FS::cust_refund manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, schema.html from the base
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_credit_refund.html">the FS::cust_credit_refund manpage</A>, <A HREF=".././FS/cust_refund.html">the FS::cust_refund manpage</A>,
+<A HREF=".././FS/cust_credit_bill.html">the FS::cust_credit_bill manpage</A> <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, schema.html from the base
 documentation.</P>
 
 </BODY>
diff --git a/httemplate/docs/man/FS/cust_main.html b/httemplate/docs/man/FS/cust_main.html
index f8e9a8cfb..86e659ad0 100644
--- a/httemplate/docs/man/FS/cust_main.html
+++ b/httemplate/docs/man/FS/cust_main.html
@@ -15,6 +15,7 @@
 	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
 	<LI><A HREF="#description">DESCRIPTION</A></LI>
 	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
 	<LI><A HREF="#version">VERSION</A></LI>
 	<LI><A HREF="#bugs">BUGS</A></LI>
 	<LI><A HREF="#see also">SEE ALSO</A></LI>
@@ -45,6 +46,8 @@
   @cust_pkg = $record-&gt;all_pkgs;</PRE>
 <PRE>
   @cust_pkg = $record-&gt;ncancelled_pkgs;</PRE>
+<PRE>
+  @cust_pkg = $record-&gt;suspended_pkgs;</PRE>
 <PRE>
   $error = $record-&gt;bill;
   $error = $record-&gt;bill %options;
@@ -134,6 +137,8 @@ FS::Record.  The following fields are currently supported:</P>
 <DD>
 <DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
 <DD>
+<DT><STRONG><A NAME="item_comments">comments - comments (optional)</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
@@ -145,15 +150,15 @@ Creates a new customer.  To add the customer to the database, see <A HREF="#inse
 <P>Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
 <P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
+<DT><STRONG><A NAME="item_insert_%5B_CUST_PKG_HASHREF_%5B_%2C_INVOICING_LIST">insert [ CUST_PKG_HASHREF [ , INVOICING_LIST_ARYREF ] ]</A></STRONG><BR>
 <DD>
 Adds this customer to the database.  If there is an error, returns the error,
 otherwise returns false.
-<P>There is a special insert mode in which you pass a data structure to the insert
-method containing FS::cust_pkg and FS::svc_<EM>tablename</EM> objects.  When
-running under a transactional database, all records are inserted atomicly, or
-the transaction is rolled back.  There should be a better explanation of this,
-but until then, here's an example:</P>
+<P>CUST_PKG_HASHREF: If you pass a Tie::RefHash data structure to the insert
+method containing FS::cust_pkg and FS::svc_<EM>tablename</EM> objects, all records
+are inserted atomicly, or the transaction is rolled back.  Passing an empty
+hash reference is equivalent to not supplying this parameter.  There should be
+a better explanation of this, but until then, here's an example:</P>
 <PRE>
   use Tie::RefHash;
   tie %hash, 'Tie::RefHash'; #this part is important
@@ -162,6 +167,14 @@ but until then, here's an example:</P>
     ...
   );
   $cust_main-&gt;insert( \%hash );</PRE>
+<P>INVOICING_LIST_ARYREF: If you pass an arrarref to the insert method, it will
+be set as the invoicing list (see <A HREF="#invoicing_list">invoicing_list</A>).  Errors return as
+expected and rollback the entire transaction; it is not necessary to call 
+check_invoicing_list first.  The invoicing_list is set after the records in the
+CUST_PKG_HASHREF above are inserted, so it is now possible to set an
+invoicing_list destination to the newly-created svc_acct.  Here's an example:</P>
+<PRE>
+  $cust_main-&gt;insert( {}, [ $email, 'POST' ] );</PRE>
 <P></P>
 <DT><STRONG><A NAME="item_delete_NEW_CUSTNUM">delete NEW_CUSTNUM</A></STRONG><BR>
 <DD>
@@ -170,15 +183,23 @@ returns false.
 <P>This will completely remove all traces of the customer record.  This is not
 what you want when a customer cancels service; for that, cancel all of the
 customer's packages (see <A HREF=".././FS/cust_pkg.html#cancel">cancel in the FS::cust_pkg manpage</A>).</P>
-<P>If the customer has any packages, you need to pass a new (valid) customer
-number for those packages to be transferred to.</P>
+<P>If the customer has any uncancelled packages, you need to pass a new (valid)
+customer number for those packages to be transferred to.  Cancelled packages
+will be deleted.  Did I mention that this is NOT what you want when a customer
+cancels service and that you really should be looking see <A HREF=".././FS/cust_pkg.html#cancel">cancel in the FS::cust_pkg manpage</A>?</P>
 <P>You can't delete a customer with invoices (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>),
-or credits (see <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>).</P>
+or credits (see <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>) or payments (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>).</P>
 <P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
+<DT><STRONG><A NAME="item_replace_OLD_RECORD_%5B_INVOICING_LIST_ARYREF_%5D">replace OLD_RECORD [ INVOICING_LIST_ARYREF ]</A></STRONG><BR>
 <DD>
 Replaces the OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
+<P>INVOICING_LIST_ARYREF: If you pass an arrarref to the insert method, it will
+be set as the invoicing list (see <A HREF="#invoicing_list">invoicing_list</A>).  Errors return as
+expected and rollback the entire transaction; it is not necessary to call 
+check_invoicing_list first.  Here's an example:</P>
+<PRE>
+  $new_cust_main-&gt;replace( $old_cust_main, [ $email, 'POST' ] );</PRE>
 <P></P>
 <DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
 <DD>
@@ -194,14 +215,49 @@ Returns all packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpa
 <DD>
 Returns all non-cancelled packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this customer.
 <P></P>
+<DT><STRONG><A NAME="item_suspended_pkgs">suspended_pkgs</A></STRONG><BR>
+<DD>
+Returns all suspended packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this customer.
+<P></P>
+<DT><STRONG><A NAME="item_unflagged_suspended_pkgs">unflagged_suspended_pkgs</A></STRONG><BR>
+<DD>
+Returns all unflagged suspended packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this
+customer (thouse packages without the `manual_flag' set).
+<P></P>
+<DT><STRONG><A NAME="item_unsuspended_pkgs">unsuspended_pkgs</A></STRONG><BR>
+<DD>
+Returns all unsuspended (and uncancelled) packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for
+this customer.
+<P></P>
+<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
+<DD>
+Unsuspends all unflagged suspended packages (see <A HREF="#unflagged_suspended_pkgs">unflagged_suspended_pkgs</A>
+and <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this customer.  Always returns a list: an empty list
+on success or a list of errors.
+<P></P>
+<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
+<DD>
+Suspends all unsuspended packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this customer.
+Always returns a list: an empty list on success or a list of errors.
+<P></P>
+<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
+<DD>
+Cancels all uncancelled packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this customer.
+Always returns a list: an empty list on success or a list of errors.
+<P></P>
 <DT><STRONG><A NAME="item_bill">bill OPTIONS</A></STRONG><BR>
 <DD>
 Generates invoices (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>) for this customer.  Usually used in
 conjunction with the collect method.
+<P>Options are passed as name-value pairs.</P>
 <P>The only currently available option is `time', which bills the customer as if
 it were that time.  It is specified as a UNIX timestamp; see
 <EM>perlfunc/``time''</EM>).  Also see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion
-functions.</P>
+functions.  For example:</P>
+<PRE>
+ use Date::Parse;
+ ...
+ $cust_main-&gt;bill( 'time' =&gt; str2time('April 20th, 2001') );</PRE>
 <P>If there is an error, returns the error, otherwise returns false.</P>
 <P></P>
 <DT><STRONG><A NAME="item_collect">collect OPTIONS</A></STRONG><BR>
@@ -211,28 +267,66 @@ functions.</P>
 <P>Depending on the value of `payby', this may print an invoice (`BILL'), charge
 a credit card (`CARD'), or just add any necessary (pseudo-)payment (`COMP').</P>
 <P>If there is an error, returns the error, otherwise returns false.</P>
+<P>Options are passed as name-value pairs.</P>
 <P>Currently available options are:</P>
 <P>invoice_time - Use this time when deciding when to print invoices and
 late notices on those invoices.  The default is now.  It is specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>).  Also see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A>
 for conversion functions.</P>
-<P>batch_card - Set this true to batch cards (see <A HREF=".././FS/cust_pay_batch.html">the cust_pay_batch manpage</A>).  By
+<P>batch_card - Set this true to batch cards (see <A HREF=".././FS/cust_pay_batch.html">the FS::cust_pay_batch manpage</A>).  By
 default, cards are processed immediately, which will generate an error if
 CyberCash is not installed.</P>
 <P>report_badcard - Set this true if you want bad card transactions to
 return an error.  By default, they don't.</P>
+<P>force_print - force printing even if invoice has been printed more than once
+every 30 days, and don't increment the `printed' field.</P>
 <P></P>
 <DT><STRONG><A NAME="item_total_owed">total_owed</A></STRONG><BR>
 <DD>
 Returns the total owed for this customer on all invoices
-(see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>).
+(see <A HREF=".././FS/cust_bill.html#owed">owed in the FS::cust_bill manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_total_owed_date_TIME">total_owed_date TIME</A></STRONG><BR>
+<DD>
+Returns the total owed for this customer on all invoices with date earlier than
+TIME.  TIME is specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>).  Also
+see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.
+<P></P>
+<DT><STRONG><A NAME="item_apply_credits">apply_credits</A></STRONG><BR>
+<DD>
+Applies (see <A HREF=".././FS/cust_credit_bill.html">the FS::cust_credit_bill manpage</A>) unapplied credits (see <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>)
+to outstanding invoice balances in chronological order and returns the value
+of any remaining unapplied credits available for refund
+(see <A HREF=".././FS/cust_refund.html">the FS::cust_refund manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_apply_payments">apply_payments</A></STRONG><BR>
+<DD>
+Applies (see <A HREF=".././FS/cust_bill_pay.html">the FS::cust_bill_pay manpage</A>) unapplied payments (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>)
+to outstanding invoice balances in chronological order.
+<PRE>
+ #and returns the value of any remaining unapplied payments.</PRE>
 <P></P>
 <DT><STRONG><A NAME="item_total_credited">total_credited</A></STRONG><BR>
 <DD>
-Returns the total credits (see <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>) for this customer.
+Returns the total outstanding credit (see <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>) for this
+customer.  See <A HREF=".././FS/cust_credit.html#credited">credited in the FS::cust_credit manpage</A>.
+<P></P>
+<DT><STRONG><A NAME="item_total_unapplied_payments">total_unapplied_payments</A></STRONG><BR>
+<DD>
+Returns the total unapplied payments (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>) for this customer.
+See <A HREF=".././FS/cust_pay.html#unapplied">unapplied in the FS::cust_pay manpage</A>.
 <P></P>
 <DT><STRONG><A NAME="item_balance">balance</A></STRONG><BR>
 <DD>
-Returns the balance for this customer (total owed minus total credited).
+Returns the balance for this customer (total_owed minus total_credited
+minus total_unapplied_payments).
+<P></P>
+<DT><STRONG><A NAME="item_balance_date_TIME">balance_date TIME</A></STRONG><BR>
+<DD>
+Returns the balance for this customer, only considering invoices with date
+earlier than TIME (total_owed_date minus total_credited minus
+total_unapplied_payments).  TIME is specified as a UNIX timestamp; see
+<EM>perlfunc/``time''</EM>).  Also see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion
+functions.
 <P></P>
 <DT><STRONG><A NAME="item_invoicing_list_%5B_ARRAYREF_%5D">invoicing_list [ ARRAYREF ]</A></STRONG><BR>
 <DD>
@@ -248,11 +342,58 @@ check it without disturbing anything by passing nothing.</P>
 <DD>
 Checks these arguements as valid input for the invoicing_list method.  If there
 is an error, returns the error, otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_default_invoicing_list">default_invoicing_list</A></STRONG><BR>
+<DD>
+Sets the invoicing list to all accounts associated with this customer.
+<P></P>
+<DT><STRONG><A NAME="item_invoicing_list_addpost">invoicing_list_addpost</A></STRONG><BR>
+<DD>
+Adds postal invoicing to this customer.  If this customer is already configured
+to receive postal invoices, does nothing.
+<P></P>
+<DT><STRONG><A NAME="item_referral_cust_main_%5B_DEPTH_%5B_EXCLUDE_HASHREF_%">referral_cust_main [ DEPTH [ EXCLUDE_HASHREF ] ]</A></STRONG><BR>
+<DD>
+Returns an array of customers referred by this customer (referral_custnum set
+to this custnum).  If DEPTH is given, recurses up to the given depth, returning
+customers referred by customers referred by this customer and so on, inclusive.
+The default behavior is DEPTH 1 (no recursion).
+<P></P>
+<DT><STRONG><A NAME="item_referral_cust_pkg_%5B_DEPTH_%5D">referral_cust_pkg [ DEPTH ]</A></STRONG><BR>
+<DD>
+Like referral_cust_main, except returns a flat list of all unsuspended packages
+for each customer.  The number of items in this list may be useful for
+comission calculations (perhaps after a grep).
+<P></P>
+<DT><STRONG><A NAME="item_credit">credit AMOUNT, REASON</A></STRONG><BR>
+<DD>
+Applies a credit to this customer.  If there is an error, returns the error,
+otherwise returns false.
+<P></P>
+<DT><STRONG><A NAME="item_charge">charge AMOUNT PKG COMMENT</A></STRONG><BR>
+<DD>
+Creates a one-time charge for this customer.  If there is an error, returns
+the error, otherwise returns false.
 <P></P></DL>
 <P>
 <HR>
+<H1><A NAME="subroutines">SUBROUTINES</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_check_and_rebuild_fuzzyfiles">check_and_rebuild_fuzzyfiles</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_rebuild_fuzzyfiles">rebuild_fuzzyfiles</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_all_last">all_last</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_all_company">all_company</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_append_fuzzyfiles_LASTNAME_COMPANY">append_fuzzyfiles LASTNAME COMPANY</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_main.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: cust_main.html,v 1.2 2002-01-29 16:33:15 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
@@ -264,7 +405,6 @@ list.</P>
 <P>CyberCash v2 forces us to define some variables in package main.</P>
 <P>There should probably be a configuration file with a list of allowed credit
 card types.</P>
-<P>CyberCash is the only processor.</P>
 <P>No multiple currency support (probably a larger project than just this module).</P>
 <P>
 <HR>
diff --git a/httemplate/docs/man/FS/cust_main_invoice.html b/httemplate/docs/man/FS/cust_main_invoice.html
index 6ab7fa289..a7929a943 100644
--- a/httemplate/docs/man/FS/cust_main_invoice.html
+++ b/httemplate/docs/man/FS/cust_main_invoice.html
@@ -100,7 +100,7 @@ Returns the literal email address for this record (or `POST').
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_main_invoice.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: cust_main_invoice.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
diff --git a/httemplate/docs/man/FS/cust_pay.html b/httemplate/docs/man/FS/cust_pay.html
index 803376260..ce057f068 100644
--- a/httemplate/docs/man/FS/cust_pay.html
+++ b/httemplate/docs/man/FS/cust_pay.html
@@ -50,7 +50,7 @@ currently supported:</P>
 <DL>
 <DT><STRONG><A NAME="item_key">paynum - primary key (assigned automatically for new payments)</A></STRONG><BR>
 <DD>
-<DT><STRONG><A NAME="item_Invoice">invnum - Invoice (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>)</A></STRONG><BR>
+<DT><STRONG><A NAME="item_customer">custnum - customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
 <DD>
 <DT><STRONG><A NAME="item_paid_%2D_Amount_of_this_payment">paid - Amount of this payment</A></STRONG><BR>
 <DD>
@@ -59,10 +59,12 @@ currently supported:</P>
 <DD>
 <DT><STRONG><A NAME="item_payby_%2D_%60CARD%27_%28credit_cards%29%2C_%60BILL">payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)</A></STRONG><BR>
 <DD>
-<DT><STRONG><A NAME="item_issuer">payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)</A></STRONG><BR>
+<DT><STRONG><A NAME="item_issuer">payinfo - card number, check #, or comp issuer (4-8 lowercase alphanumerics; think username), respectively</A></STRONG><BR>
 <DD>
 <DT><STRONG><A NAME="item_paybatch_%2D_text_field_for_tracking_card_processi">paybatch - text field for tracking card processing</A></STRONG><BR>
 <DD>
+<DT><STRONG><A NAME="item_closed_%2D_books_closed_flag%2C_empty_or_%60Y%27">closed - books closed flag, empty or `Y'</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
@@ -74,8 +76,10 @@ Creates a new payment.  To add the payment to the databse, see <A HREF="#insert"
 <P></P>
 <DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
 <DD>
-Adds this payment to the databse, and updates the invoice (see
-<A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>).
+Adds this payment to the database.
+<P>For backwards-compatibility and convenience, if the additional field invnum
+is defined, an FS::cust_bill_pay record for the full amount of the payment
+will be created.  In this case, custnum is optional.</P>
 <P></P>
 <DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
 <DD>
@@ -89,11 +93,21 @@ Currently unimplemented (accounting reasons).
 <DD>
 Checks all fields to make sure this is a valid payment.  If there is an error,
 returns the error, otherwise returns false.  Called by the insert method.
+<P></P>
+<DT><STRONG><A NAME="item_cust_bill_pay">cust_bill_pay</A></STRONG><BR>
+<DD>
+Returns all applications to invoices (see <A HREF=".././FS/cust_bill_pay.html">the FS::cust_bill_pay manpage</A>) for this
+payment.
+<P></P>
+<DT><STRONG><A NAME="item_unapplied">unapplied</A></STRONG><BR>
+<DD>
+Returns the amount of this payment that is still unapplied; which is
+paid minus all payment applications (see <A HREF=".././FS/cust_bill_pay.html">the FS::cust_bill_pay manpage</A>).
 <P></P></DL>
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_pay.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: cust_pay.html,v 1.2 2002-01-29 16:33:15 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
@@ -101,7 +115,8 @@ returns the error, otherwise returns false.  Called by the insert method.
 <P>
 <HR>
 <H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, schema.html from the base documentation.</P>
+<P><A HREF=".././FS/cust_bill_pay.html">the FS::cust_bill_pay manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the
+base documentation.</P>
 
 </BODY>
 
diff --git a/httemplate/docs/man/FS/cust_pay_batch.html b/httemplate/docs/man/FS/cust_pay_batch.html
index c1c73c301..052ccac39 100644
--- a/httemplate/docs/man/FS/cust_pay_batch.html
+++ b/httemplate/docs/man/FS/cust_pay_batch.html
@@ -49,7 +49,7 @@ batched (sent to a processor).  FS::cust_pay_batch inherits from FS::Record.
 Typically called by the collect method of an FS::cust_main object.  The
 following fields are currently supported:</P>
 <DL>
-<DT><STRONG><A NAME="item_trancode_%2D_77_for_charges">trancode - 77 for charges</A></STRONG><BR>
+<DT><STRONG><A NAME="item_key">paybatchnum - primary key (automatically assigned)</A></STRONG><BR>
 <DD>
 <DT><STRONG><A NAME="item_cardnum">cardnum</A></STRONG><BR>
 <DD>
@@ -116,7 +116,7 @@ and repalce methods.
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_pay_batch.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: cust_pay_batch.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
diff --git a/httemplate/docs/man/FS/cust_pkg.html b/httemplate/docs/man/FS/cust_pkg.html
index 459d1297c..9f1005da7 100644
--- a/httemplate/docs/man/FS/cust_pkg.html
+++ b/httemplate/docs/man/FS/cust_pkg.html
@@ -52,6 +52,8 @@
   $part_pkg = $record-&gt;part_pkg;</PRE>
 <PRE>
   @labels = $record-&gt;labels;</PRE>
+<PRE>
+  $seconds = $record-&gt;seconds_since($timestamp);</PRE>
 <PRE>
   $error = FS::cust_pkg::order( $custnum, \@pkgparts );
   $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );</PRE>
@@ -79,6 +81,9 @@ inherits from FS::Record.  The following fields are currently supported:</P>
 <DD>
 <DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically if null, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
 <DD>
+<DT><STRONG><A NAME="item_manual_flag_%2D_If_this_field_is_set_to_1%2C_disab">manual_flag - If this field is set to 1, disables the automatic
+unsuspension of this package when using the <STRONG>unsuspendauto</STRONG> config file.</A></STRONG><BR>
+<DD>
 </DL>
 <P>Note: setup, bill, susp, expire and cancel are specified as UNIX timestamps;
 see <EM>perlfunc/``time''</EM>.  Also see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for
@@ -95,26 +100,12 @@ Create a new billing item.  To add the item to the database, see <A HREF="#inser
 <DD>
 Adds this billing item to the database (``Orders'' the item).  If there is an
 error, returns the error, otherwise returns false.
-<P>sub insert {
-  my $self = shift;</P>
-<PRE>
-  # custnum might not have have been defined in sub check (for one-shot new
-  # customers), so check it here instead</PRE>
-<PRE>
-  my $error = $self-&gt;ut_number('custnum');
-  return $error if $error</PRE>
-<PRE>
-  return &quot;Unknown customer&quot;
-    unless qsearchs( 'cust_main', { 'custnum' =&gt; $self-&gt;custnum } );</PRE>
-<PRE>
-  $self-&gt;SUPER::insert;</PRE>
-<P>}</P>
 <P></P>
 <DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
 <DD>
-Currently unimplemented.  You don't want to delete billing items, because there
-would then be no record the customer ever purchased the item.  Instead, see
-the cancel method.
+This method now works but you probably shouldn't use it.
+<P>You don't want to delete billing items, because there would then be no record
+the customer ever purchased the item.  Instead, see the cancel method.</P>
 <P></P>
 <DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
 <DD>
@@ -158,16 +149,32 @@ package, then unsuspends the package itself (clears the susp field).
 Returns the definition for this billing item, as an FS::part_pkg object (see
 <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>).
 <P></P>
+<DT><STRONG><A NAME="item_cust_svc">cust_svc</A></STRONG><BR>
+<DD>
+Returns the services for this package, as FS::cust_svc objects (see
+<A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>)
+<P></P>
 <DT><STRONG><A NAME="item_labels">labels</A></STRONG><BR>
 <DD>
 Returns a list of lists, calling the label method for all services
 (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) of this billing item.
+<P></P>
+<DT><STRONG><A NAME="item_cust_main">cust_main</A></STRONG><BR>
+<DD>
+Returns the parent customer object (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_seconds_since_TIMESTAMP">seconds_since TIMESTAMP</A></STRONG><BR>
+<DD>
+Returns the number of seconds all accounts (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>) in this
+package have been online since TIMESTAMP.
+<P>TIMESTAMP is specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
+<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</P>
 <P></P></DL>
 <P>
 <HR>
 <H1><A NAME="subroutines">SUBROUTINES</A></H1>
 <DL>
-<DT><STRONG><A NAME="item_order_CUSTNUM%2C_PKGPARTS_ARYREF%2C_%5B_REMOVE_PKG">order CUSTNUM, PKGPARTS_ARYREF, [ REMOVE_PKGNUMS_ARYREF ]</A></STRONG><BR>
+<DT><STRONG><A NAME="item_order_CUSTNUM%2C_PKGPARTS_ARYREF%2C_%5B_REMOVE_PKG">order CUSTNUM, PKGPARTS_ARYREF, [ REMOVE_PKGNUMS_ARYREF [ RETURN_CUST_PKG_ARRAYREF ] ]</A></STRONG><BR>
 <DD>
 CUSTNUM is a customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)
 <P>PKGPARTS is a list of pkgparts specifying the the billing item definitions (see
@@ -176,12 +183,15 @@ permitted.</P>
 <P>REMOVE_PKGNUMS is an optional list of pkgnums specifying the billing items to
 remove for this customer.  The services (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) are moved to the
 new billing items.  An error is returned if this is not possible (see
-<A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>).</P>
+<A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>).  An empty arrayref is equivalent to not specifying this
+parameter.</P>
+<P>RETURN_CUST_PKG_ARRAYREF, if specified, will be filled in with the
+newly-created cust_pkg objects.</P>
 <P></P></DL>
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_pkg.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: cust_pkg.html,v 1.2 2002-01-29 16:33:15 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
@@ -194,11 +204,13 @@ compile time, rather than via 'require' in sub { setup, suspend, unsuspend,
 cancel } because they use %FS::UID::callback to load configuration values.
 Probably need a subroutine which decides what to do based on whether or not
 we've fetched the user yet, rather than a hash.  See FS::UID and the TODO.</P>
+<P>Now that things are transactional should the check in the insert method be
+moved to check ?</P>
 <P>
 <HR>
 <H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>
-, <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>, schema.html from the base documentation</P>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
+<A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>, schema.html from the base documentation</P>
 
 </BODY>
 
diff --git a/httemplate/docs/man/FS/cust_refund.html b/httemplate/docs/man/FS/cust_refund.html
index 39ed14de4..93bb07b2d 100644
--- a/httemplate/docs/man/FS/cust_refund.html
+++ b/httemplate/docs/man/FS/cust_refund.html
@@ -50,7 +50,7 @@ inherits from FS::Record.  The following fields are currently supported:</P>
 <DL>
 <DT><STRONG><A NAME="item_key">refundnum - primary key (assigned automatically for new refunds)</A></STRONG><BR>
 <DD>
-<DT><STRONG><A NAME="item_Credit">crednum - Credit (see <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>)</A></STRONG><BR>
+<DT><STRONG><A NAME="item_customer">custnum - customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
 <DD>
 <DT><STRONG><A NAME="item_refund_%2D_Amount_of_the_refund">refund - Amount of the refund</A></STRONG><BR>
 <DD>
@@ -61,8 +61,12 @@ inherits from FS::Record.  The following fields are currently supported:</P>
 <DD>
 <DT><STRONG><A NAME="item_issuer">payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)</A></STRONG><BR>
 <DD>
+<DT><STRONG><A NAME="item_paybatch_%2D_text_field_for_tracking_card_processi">paybatch - text field for tracking card processing</A></STRONG><BR>
+<DD>
 <DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
 <DD>
+<DT><STRONG><A NAME="item_closed_%2D_books_closed_flag%2C_empty_or_%60Y%27">closed - books closed flag, empty or `Y'</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
@@ -74,8 +78,10 @@ Creates a new refund.  To add the refund to the database, see <A HREF="#insert">
 <P></P>
 <DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
 <DD>
-Adds this refund to the database, and updates the credit (see
-<A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>).
+Adds this refund to the database.
+<P>For backwards-compatibility and convenience, if the additional field crednum is
+defined, an FS::cust_credit_refund record for the full amount of the refund
+will be created.  In this case, custnum is optional.</P>
 <P></P>
 <DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
 <DD>
@@ -93,7 +99,7 @@ returns the error, otherwise returns false.  Called by the insert method.
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_refund.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: cust_refund.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
diff --git a/httemplate/docs/man/FS/cust_svc.html b/httemplate/docs/man/FS/cust_svc.html
index c1ca2d700..97a299c52 100644
--- a/httemplate/docs/man/FS/cust_svc.html
+++ b/httemplate/docs/man/FS/cust_svc.html
@@ -64,7 +64,7 @@ The following fields are currently supported:</P>
 <DD>
 Creates a new service.  To add the refund to the database, see <A HREF="#insert">insert</A>.
 Services are normally created by creating FS::svc_ objects (see
-<A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, and <A HREF=".././FS/svc_acct_sm.html">the FS::svc_acct_sm manpage</A>, among others).
+<A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, and <A HREF=".././FS/svc_forward.html">the FS::svc_forward manpage</A>, among others).
 <P></P>
 <DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
 <DD>
@@ -88,17 +88,38 @@ Checks all fields to make sure this is a valid service.  If there is an error,
 returns the error, otehrwise returns false.  Called by the insert and
 replace methods.
 <P></P>
+<DT><STRONG><A NAME="item_part_svc">part_svc</A></STRONG><BR>
+<DD>
+Returns the definition for this service, as a FS::part_svc object (see
+<A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>).
+<P></P>
+<DT><STRONG><A NAME="item_cust_pkg">cust_pkg</A></STRONG><BR>
+<DD>
+Returns the definition for this service, as a FS::part_svc object (see
+<A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>).
+<P></P>
 <DT><STRONG><A NAME="item_label">label</A></STRONG><BR>
 <DD>
 Returns a list consisting of:
 - The name of this service (from part_svc)
 - A meaningful identifier (username, domain, or mail alias)
 - The table name (i.e. svc_domain) for this service
+<P></P>
+<DT><STRONG><A NAME="item_svc_x">svc_x</A></STRONG><BR>
+<DD>
+Returns the FS::svc_XXX object for this service (i.e. an FS::svc_acct object or
+FS::svc_domain object, etc.)
+<P></P>
+<DT><STRONG><A NAME="item_seconds_since_TIMESTAMP">seconds_since TIMESTAMP</A></STRONG><BR>
+<DD>
+See <A HREF=".././FS/svc_acct.html#seconds_since">seconds_since in the FS::svc_acct manpage</A>.  Equivalent to
+$cust_svc-&gt;svc_x-&gt;seconds_since, but more efficient.  Meaningless for records
+where <STRONG>svcdb</STRONG> is not ``svc_acct''.
 <P></P></DL>
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_svc.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: cust_svc.html,v 1.2 2002-01-29 16:33:16 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
diff --git a/httemplate/docs/man/FS/domain_record.html b/httemplate/docs/man/FS/domain_record.html
index 7a1bf3e32..0349f7b78 100644
--- a/httemplate/docs/man/FS/domain_record.html
+++ b/httemplate/docs/man/FS/domain_record.html
@@ -18,7 +18,6 @@
 	<LI><A HREF="#version">VERSION</A></LI>
 	<LI><A HREF="#bugs">BUGS</A></LI>
 	<LI><A HREF="#see also">SEE ALSO</A></LI>
-	<LI><A HREF="#history">HISTORY</A></LI>
 </UL>
 <!-- INDEX END -->
 
@@ -95,7 +94,7 @@ and replace methods.
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: domain_record.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: domain_record.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
@@ -107,17 +106,6 @@ course, it's still better than editing the zone files directly.  :)</P>
 <HR>
 <H1><A NAME="see also">SEE ALSO</A></H1>
 <P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
-<P>
-<HR>
-<H1><A NAME="history">HISTORY</A></H1>
-<P>$Log: domain_record.html,v $
-<P>Revision 1.1  2001-07-30 07:36:03  ivan
-<P>templates!!!
-<P>
-Revision 1.2  2001/05/18 14:08:55  ivan
-tyop</P>
-<P>Revision 1.1  2000/02/03 05:16:52  ivan
-beginning of DNS and Apache support</P>
 
 </BODY>
 
diff --git a/httemplate/docs/man/FS/part_pkg.html b/httemplate/docs/man/FS/part_pkg.html
index 9aeaa3d3d..e1e96b54c 100644
--- a/httemplate/docs/man/FS/part_pkg.html
+++ b/httemplate/docs/man/FS/part_pkg.html
@@ -60,11 +60,21 @@ inherits from FS::Record.  The following fields are currently supported:</P>
 <DD>
 <DT><STRONG>comment - Text name of this billing item definition (non-customer-viewable)</STRONG><BR>
 <DD>
-<DT><STRONG><A NAME="item_setup_%2D_Setup_fee">setup - Setup fee</A></STRONG><BR>
+<DT><STRONG><A NAME="item_setup_%2D_Setup_fee_expression">setup - Setup fee expression</A></STRONG><BR>
 <DD>
 <DT><STRONG><A NAME="item_freq_%2D_Frequency_of_recurring_fee">freq - Frequency of recurring fee</A></STRONG><BR>
 <DD>
-<DT><STRONG><A NAME="item_recur_%2D_Recurring_fee">recur - Recurring fee</A></STRONG><BR>
+<DT><STRONG><A NAME="item_recur_%2D_Recurring_fee_expression">recur - Recurring fee expression</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_setuptax_%2D_Setup_fee_tax_exempt_flag%2C_empty_or">setuptax - Setup fee tax exempt flag, empty or `Y'</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_recurtax_%2D_Recurring_fee_tax_exempt_flag%2C_empt">recurtax - Recurring fee tax exempt flag, empty or `Y'</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_plan_%2D_Price_plan">plan - Price plan</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_plandata_%2D_Price_plan_data">plandata - Price plan data</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_disabled_%2D_Disabled_flag%2C_empty_or_%60Y%27">disabled - Disabled flag, empty or `Y'</A></STRONG><BR>
 <DD>
 </DL>
 <P>setup and recur are evaluated as Safe perl expressions.  You can use numbers
@@ -120,7 +130,7 @@ SVCDB is specified and does not match the svcdb of the service definition,
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: part_pkg.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: part_pkg.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
diff --git a/httemplate/docs/man/FS/part_svc.html b/httemplate/docs/man/FS/part_svc.html
index ca0a5dc71..0f5126f81 100644
--- a/httemplate/docs/man/FS/part_svc.html
+++ b/httemplate/docs/man/FS/part_svc.html
@@ -31,8 +31,8 @@
 <PRE>
   use FS::part_svc;</PRE>
 <PRE>
-  $record = new FS::part_referral \%hash
-  $record = new FS::part_referral { 'column' =&gt; 'value' };</PRE>
+  $record = new FS::part_svc \%hash
+  $record = new FS::part_svc { 'column' =&gt; 'value' };</PRE>
 <PRE>
   $error = $record-&gt;insert;</PRE>
 <PRE>
@@ -52,11 +52,9 @@ FS::Record.  The following fields are currently supported:</P>
 <DT><STRONG><A NAME="item_svc_%2D_text_name_of_this_service_definition">svc - text name of this service definition</A></STRONG><BR>
 <DD>
 <DT><STRONG><A NAME="item_svcdb_%2D_table_used_for_this_service%2E_See_FS%3A">svcdb - table used for this service.  See <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>,
-<A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, and <A HREF=".././FS/svc_acct_sm.html">the FS::svc_acct_sm manpage</A>, among others.</A></STRONG><BR>
+<A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, and <A HREF=".././FS/svc_forward.html">the FS::svc_forward manpage</A>, among others.</A></STRONG><BR>
 <DD>
-<DT><STRONG><A NAME="item_svcdb__field_%2D_Default_or_fixed_value_for_field_"><EM>svcdb</EM>__<EM>field</EM> - Default or fixed value for <EM>field</EM> in <EM>svcdb</EM>.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_svcdb__field_flag_%2D_defines_svcdb__field_action%"><EM>svcdb</EM>__<EM>field</EM>_flag - defines <EM>svcdb</EM>__<EM>field</EM> action: null, `D' for default, or `F' for fixed</A></STRONG><BR>
+<DT><STRONG><A NAME="item_disabled_%2D_Disabled_flag%2C_empty_or_%60Y%27">disabled - Disabled flag, empty or `Y'</A></STRONG><BR>
 <DD>
 </DL>
 <P>
@@ -73,6 +71,10 @@ database, see <A HREF="#insert">insert</A>.
 Adds this service definition to the database.  If there is an error, returns
 the error, otherwise returns false.
 <P></P>
+<DT><STRONG><A NAME="item_svcdb__field_%2D_Default_or_fixed_value_for_field_"><EM>svcdb</EM>__<EM>field</EM> - Default or fixed value for <EM>field</EM> in <EM>svcdb</EM>.</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_svcdb__field_flag_%2D_defines_svcdb__field_action%"><EM>svcdb</EM>__<EM>field</EM>_flag - defines <EM>svcdb</EM>__<EM>field</EM> action: null, `D' for default, or `F' for fixed</A></STRONG><BR>
+<DD>
 <DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
 <DD>
 Currently unimplemented.
@@ -87,11 +89,19 @@ returns the error, otherwise returns false.
 Checks all fields to make sure this is a valid service definition.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
 and replace methods.
-<P></P></DL>
+<P></P>
+<DT><STRONG><A NAME="item_part_svc_column_COLUMNNAME">part_svc_column COLUMNNAME</A></STRONG><BR>
+<DD>
+Returns the part_svc_column object (see <A HREF=".././FS/part_svc_column.html">the FS::part_svc_column manpage</A>) for the given
+COLUMNNAME, or a new part_svc_column object if none exists.
+<P></P>
+<DT><STRONG><A NAME="item_all_part_svc_column">all_part_svc_column</A></STRONG><BR>
+<DD>
+</DL>
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: part_svc.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: part_svc.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
@@ -101,9 +111,9 @@ should be fixed.</P>
 <P>
 <HR>
 <H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
-<A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/svc_acct_sm.html">the FS::svc_acct_sm manpage</A>, <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, schema.html from the
-base documentation.</P>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/part_svc_column.html">the FS::part_svc_column manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>,
+<A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>, <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/svc_forward.html">the FS::svc_forward manpage</A>, <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>,
+schema.html from the base documentation.</P>
 
 </BODY>
 
diff --git a/httemplate/docs/man/FS/prepay_credit.html b/httemplate/docs/man/FS/prepay_credit.html
index 4e77897a3..bb0c281c2 100644
--- a/httemplate/docs/man/FS/prepay_credit.html
+++ b/httemplate/docs/man/FS/prepay_credit.html
@@ -18,7 +18,6 @@
 	<LI><A HREF="#version">VERSION</A></LI>
 	<LI><A HREF="#bugs">BUGS</A></LI>
 	<LI><A HREF="#see also">SEE ALSO</A></LI>
-	<LI><A HREF="#history">HISTORY</A></LI>
 </UL>
 <!-- INDEX END -->
 
@@ -93,7 +92,7 @@ and replace methods.
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: prepay_credit.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: prepay_credit.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
@@ -101,17 +100,6 @@ and replace methods.
 <HR>
 <H1><A NAME="see also">SEE ALSO</A></H1>
 <P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
-<P>
-<HR>
-<H1><A NAME="history">HISTORY</A></H1>
-<P>$Log: prepay_credit.html,v $
-<P>Revision 1.1  2001-07-30 07:36:03  ivan
-<P>templates!!!
-<P>
-Revision 1.2  2000/02/02 20:22:18  ivan
-bugfix prepayment in signup server</P>
-<P>Revision 1.1  2000/01/31 05:22:23  ivan
-prepaid ``internet cards''</P>
 
 </BODY>
 
diff --git a/httemplate/docs/man/FS/svc_Common.html b/httemplate/docs/man/FS/svc_Common.html
index 100aee880..ccac5efa0 100644
--- a/httemplate/docs/man/FS/svc_Common.html
+++ b/httemplate/docs/man/FS/svc_Common.html
@@ -64,6 +64,11 @@ Sets all fields to their defaults (see <A HREF=".././FS/part_svc.html">the FS::p
 current values.  If there is an error, returns the error, otherwise returns
 the FS::part_svc object (use <CODE>ref()</CODE> to test the return).
 <P></P>
+<DT><STRONG><A NAME="item_cust_svc">cust_svc</A></STRONG><BR>
+<DD>
+Returns the cust_svc record associated with this svc_ record, as a FS::cust_svc
+object (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>).
+<P></P>
 <DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
 <DD>
 <DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
@@ -76,13 +81,11 @@ methods.  Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_Common.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: svc_Common.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
 <P>The setfixed method return value.</P>
-<P>The new method should set defaults from part_svc (like the check method
-sets fixed values)?</P>
 <P>
 <HR>
 <H1><A NAME="see also">SEE ALSO</A></H1>
diff --git a/httemplate/docs/man/FS/svc_acct.html b/httemplate/docs/man/FS/svc_acct.html
index 81bc118df..9c41db3f0 100644
--- a/httemplate/docs/man/FS/svc_acct.html
+++ b/httemplate/docs/man/FS/svc_acct.html
@@ -49,6 +49,18 @@
   $error = $record-&gt;cancel;</PRE>
 <PRE>
   %hash = $record-&gt;radius;</PRE>
+<PRE>
+  %hash = $record-&gt;radius_reply;</PRE>
+<PRE>
+  %hash = $record-&gt;radius_check;</PRE>
+<PRE>
+  $domain = $record-&gt;domain;</PRE>
+<PRE>
+  $svc_domain = $record-&gt;svc_domain;</PRE>
+<PRE>
+  $email = $record-&gt;email;</PRE>
+<PRE>
+  $seconds_since = $record-&gt;seconds_since($timestamp);</PRE>
 <P>
 <HR>
 <H1><A NAME="description">DESCRIPTION</A></H1>
@@ -77,8 +89,14 @@ FS::svc_Common.  The following fields are currently supported:</P>
 <DD>
 <DT><STRONG><A NAME="item_slipip_%2D_IP_address">slipip - IP address</A></STRONG><BR>
 <DD>
+<DT><STRONG><A NAME="item_seconds_%2D">seconds -</A></STRONG><BR>
+<DD>
+<DT><STRONG><A NAME="item_domsvc_%2D_svcnum_from_svc_domain">domsvc - svcnum from svc_domain</A></STRONG><BR>
+<DD>
 <DT><STRONG><A NAME="item_radius_Radius_Attribute_%2D_Radius%2DAttribute">radius_<EM>Radius_Attribute</EM> - <EM>Radius-Attribute</EM></A></STRONG><BR>
 <DD>
+<DT><STRONG><A NAME="item_domsvc_%2D_service_number_of_svc_domain_with_which">domsvc - service number of svc_domain with which to associate</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
@@ -96,7 +114,8 @@ otherwise returns false.
 defined.  An FS::cust_svc record will be created and inserted.</P>
 <P>If the configuration value (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine exists, and the 
 username, uid, and dir fields are defined, the <CODE>command(s)</CODE> specified in
-the shellmachine-useradd configuration are exectued on shellmachine via ssh.
+the shellmachine-useradd configuration are added to the job queue (see
+<A HREF=".././FS/queue.html">the FS::queue manpage</A> and <A HREF=".././bin/freeside-queued.html">the freeside-queued manpage</A>) to be exectued on shellmachine via ssh.
 This behaviour can be surpressed by setting $FS::svc_acct::nossh_hack true.
 If the shellmachine-useradd configuration file does not exist,</P>
 <PRE>
@@ -108,6 +127,7 @@ it empty,</P>
 <P>is the default instead.  Otherwise the contents of the file are treated as
 a double-quoted perl string, with the following variables available:
 $username, $uid, $gid, $dir, and $shell.</P>
+<P>(TODOC: cyrus config file, <A HREF=".././FS/queue.html">the FS::queue manpage</A> and <A HREF=".././bin/freeside-queued.html">the freeside-queued manpage</A>)</P>
 <P></P>
 <DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
 <DD>
@@ -116,7 +136,8 @@ error, otherwise returns false.
 <P>The corresponding FS::cust_svc record will be deleted as well.</P>
 <P>If the configuration value (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine exists, the
 <CODE>command(s)</CODE> specified in the shellmachine-userdel configuration file are
-executed on shellmachine via ssh.  This behavior can be surpressed by setting
+added to the job queue (see <A HREF=".././FS/queue.html">the FS::queue manpage</A> and <A HREF=".././bin/freeside-queued.html">the freeside-queued manpage</A>) to be executed
+on shellmachine via ssh.  This behavior can be surpressed by setting
 $FS::svc_acct::nossh_hack true.  If the shellmachine-userdel configuration
 file does not exist,</P>
 <PRE>
@@ -128,6 +149,7 @@ is empty,</P>
 <P>is the default instead.  Otherwise the contents of the file are treated as a
 double-quoted perl string, with the following variables available:
 $username and $dir.</P>
+<P>(TODOC: cyrus config file)</P>
 <P></P>
 <DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
 <DD>
@@ -135,9 +157,10 @@ Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 <P>If the configuration value (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine exists, and the 
 dir field has changed, the <CODE>command(s)</CODE> specified in the shellmachine-usermod
-configuraiton file are executed on shellmachine via ssh.  This behavior can
+configuraiton file are added to the job queue (see <A HREF=".././FS/queue.html">the FS::queue manpage</A> and
+<A HREF=".././bin/freeside-queued.html">the freeside-queued manpage</A>) to be executed on shellmachine via ssh.  This behavior can
 be surpressed by setting $FS::svc-acct::nossh_hack true.  If the
-shellmachine-userdel configuration file does not exist or is empty, :</P>
+shellmachine-userdel configuration file does not exist or is empty,</P>
 <PRE>
   [ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || (
     chmod u+t $old_dir;
@@ -148,8 +171,8 @@ shellmachine-userdel configuration file does not exist or is empty, :</P>
     chown -R $uid.$gid $new_dir;
     rm -rf $old_dir
   )</PRE>
-<P>is executed on shellmachine via ssh.  This behaviour can be surpressed by
-setting $FS::svc_acct::nossh_hack true.</P>
+<P>is the default.  This behaviour can be surpressed by setting
+$FS::svc_acct::nossh_hack true.</P>
 <P></P>
 <DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
 <DD>
@@ -193,11 +216,42 @@ Returns key/value pairs, suitable for assigning to a hash, for any RADIUS
 check attributes of this record.
 <P>Accessing RADIUS attributes directly is not supported and will break in the
 future.</P>
-<P></P></DL>
+<P></P>
+<DT><STRONG><A NAME="item_domain">domain</A></STRONG><BR>
+<DD>
+Returns the domain associated with this account.
+<P></P>
+<DT><STRONG><A NAME="item_svc_domain">svc_domain</A></STRONG><BR>
+<DD>
+Returns the FS::svc_domain record for this account's domain (see
+<A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>.
+<P></P>
+<DT><STRONG><A NAME="item_cust_svc">cust_svc</A></STRONG><BR>
+<DD>
+Returns the FS::cust_svc record for this account (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>).
+<P>sub cust_svc {
+  my $self = shift;
+  qsearchs( 'cust_svc', { 'svcnum' =&gt; $self-&gt;svcnum } );
+}</P>
+<P></P>
+<DT><STRONG><A NAME="item_email">email</A></STRONG><BR>
+<DD>
+Returns an email address associated with the account.
+<P></P>
+<DT><STRONG><A NAME="item_seconds_since_TIMESTAMP">seconds_since TIMESTAMP</A></STRONG><BR>
+<DD>
+Returns the number of seconds this account has been online since TIMESTAMP.
+See <A HREF=".././FS/session.html">the FS::session manpage</A>
+<P>TIMESTAMP is specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
+<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</P>
+<P></P>
+<DT><STRONG><A NAME="item_ssh">ssh</A></STRONG><BR>
+<DD>
+</DL>
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_acct.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: svc_acct.html,v 1.2 2002-01-29 16:33:16 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
@@ -210,8 +264,10 @@ counterintuitive.</P>
 <P>
 <HR>
 <H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/svc_Common.html">the FS::svc_Common manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
-<A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF="../Net/SSH.html">the Net::SSH manpage</A>, <EM>ssh</EM>, <A HREF=".././FS/svc_acct_pop.html">the FS::svc_acct_pop manpage</A>,
+<P><A HREF=".././FS/svc_Common.html">the FS::svc_Common manpage</A>, edit/part_svc.cgi from an installed web interface,
+export.html from the base documentation, <A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>,
+<A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF=".././FS/queue.html">the FS::queue manpage</A>,
+<A HREF=".././bin/freeside-queued.html">the freeside-queued manpage</A>), <A HREF="../Net/SSH.html">the Net::SSH manpage</A>, <A HREF="#item_ssh">ssh</A>, <A HREF=".././FS/svc_acct_pop.html">the FS::svc_acct_pop manpage</A>,
 schema.html from the base documentation.</P>
 
 </BODY>
diff --git a/httemplate/docs/man/FS/svc_acct_pop.html b/httemplate/docs/man/FS/svc_acct_pop.html
index d65ca5778..80900627e 100644
--- a/httemplate/docs/man/FS/svc_acct_pop.html
+++ b/httemplate/docs/man/FS/svc_acct_pop.html
@@ -15,6 +15,7 @@
 	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
 	<LI><A HREF="#description">DESCRIPTION</A></LI>
 	<LI><A HREF="#methods">METHODS</A></LI>
+	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
 	<LI><A HREF="#version">VERSION</A></LI>
 	<LI><A HREF="#bugs">BUGS</A></LI>
 	<LI><A HREF="#see also">SEE ALSO</A></LI>
@@ -41,6 +42,8 @@
   $error = $record-&gt;delete;</PRE>
 <PRE>
   $error = $record-&gt;check;</PRE>
+<PRE>
+  $html = FS::svc_acct_pop::popselector( $popnum, $state );</PRE>
 <P>
 <HR>
 <H1><A NAME="description">DESCRIPTION</A></H1>
@@ -88,19 +91,34 @@ returns the error, otherwise returns false.
 Checks all fields to make sure this is a valid point of presence.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
 and replace methods.
+<P></P>
+<DT><STRONG><A NAME="item_text">text</A></STRONG><BR>
+<DD>
+Returns:
+<P>``$city, $state ($ac)/$exch''</P>
 <P></P></DL>
 <P>
 <HR>
+<H1><A NAME="subroutines">SUBROUTINES</A></H1>
+<DL>
+<DT><STRONG><A NAME="item_popselector_%5B_POPNUM_%5B_STATE_%5D_%5D">popselector [ POPNUM [ STATE ] ]</A></STRONG><BR>
+<DD>
+</DL>
+<P>
+<HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_acct_pop.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: svc_acct_pop.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
 <P>It should be renamed to part_pop.</P>
+<P>popselector?  putting web ui components in here?  they should probably live
+somewhere else...</P>
 <P>
 <HR>
 <H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/svc_acct.html">the svc_acct manpage</A>, schema.html from the base documentation.</P>
+<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/part_pop_local.html">the FS::part_pop_local manpage</A>, schema.html from the
+base documentation.</P>
 
 </BODY>
 
diff --git a/httemplate/docs/man/FS/svc_acct_sm.html b/httemplate/docs/man/FS/svc_acct_sm.html
index ca50e7202..86c7b8b3b 100644
--- a/httemplate/docs/man/FS/svc_acct_sm.html
+++ b/httemplate/docs/man/FS/svc_acct_sm.html
@@ -13,6 +13,7 @@
 
 	<LI><A HREF="#name">NAME</A></LI>
 	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
+	<LI><A HREF="#warning">WARNING</A></LI>
 	<LI><A HREF="#description">DESCRIPTION</A></LI>
 	<LI><A HREF="#methods">METHODS</A></LI>
 	<LI><A HREF="#version">VERSION</A></LI>
@@ -49,9 +50,14 @@
   $error = $record-&gt;cancel;</PRE>
 <P>
 <HR>
+<H1><A NAME="warning">WARNING</A></H1>
+<P>FS::svc_acct_sm is <STRONG>depreciated</STRONG>.  This class is only included for migration
+purposes.  See <A HREF=".././FS/svc_forward.html">the FS::svc_forward manpage</A>.</P>
+<P>
+<HR>
 <H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::svc_acct object represents a virtual mail alias.  FS::svc_acct inherits
-from FS::Record.  The following fields are currently supported:</P>
+<P>An FS::svc_acct_sm object represents a virtual mail alias.  FS::svc_acct_sm
+inherits from FS::Record.  The following fields are currently supported:</P>
 <DL>
 <DT><STRONG><A NAME="item_key">svcnum - primary key (assigned automatcially for new accounts)</A></STRONG><BR>
 <DD>
@@ -77,15 +83,17 @@ Adds this virtual mail alias to the database.  If there is an error, returns
 the error, otherwise returns false.
 <P>The additional fields pkgnum and svcpart (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
 defined.  An FS::cust_svc record will be created and inserted.</P>
-<P>If the configuration values (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine and qmailmachines
-exist, and domuser is `*' (meaning a catch-all mailbox), the command:</P>
 <PRE>
-  [ -e $dir/.qmail-$qdomain-default ] || {
-    touch $dir/.qmail-$qdomain-default;
-    chown $uid:$gid $dir/.qmail-$qdomain-default;
-  }</PRE>
-<P>is executed on shellmachine via ssh (see <EM>dot-qmail/``EXTENSION ADDRESSES''</EM>).
-This behaviour can be surpressed by setting $FS::svc_acct_sm::nossh_hack true.</P>
+ #If the configuration values (see L&lt;FS::Conf&gt;) shellmachine and qmailmachines
+ #exist, and domuser is `*' (meaning a catch-all mailbox), the command:
+ #
+ #  [ -e $dir/.qmail-$qdomain-default ] || {
+ #    touch $dir/.qmail-$qdomain-default;
+ #    chown $uid:$gid $dir/.qmail-$qdomain-default;
+ #  }
+ #
+ #is executed on shellmachine via ssh (see L&lt;dot-qmail/&quot;EXTENSION ADDRESSES&quot;&gt;).
+ #This behaviour can be surpressed by setting $FS::svc_acct_sm::nossh_hack true.</PRE>
 <P></P>
 <DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
 <DD>
@@ -123,7 +131,7 @@ replace methods.
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_acct_sm.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: svc_acct_sm.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
@@ -132,6 +140,7 @@ replace methods.
 <P>
 <HR>
 <H1><A NAME="see also">SEE ALSO</A></H1>
+<P><A HREF=".././FS/svc_forward.html">the FS::svc_forward manpage</A></P>
 <P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>,
 <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, <A HREF="../Net/SSH.html">the Net::SSH manpage</A>, <EM>ssh</EM>, <EM>dot-qmail</EM>,
 schema.html from the base documentation.</P>
diff --git a/httemplate/docs/man/FS/svc_domain.html b/httemplate/docs/man/FS/svc_domain.html
index ace3de154..266e0b355 100644
--- a/httemplate/docs/man/FS/svc_domain.html
+++ b/httemplate/docs/man/FS/svc_domain.html
@@ -57,6 +57,8 @@ FS::svc_Common.  The following fields are currently supported:</P>
 <DD>
 <DT><STRONG><A NAME="item_domain">domain</A></STRONG><BR>
 <DD>
+<DT><STRONG><A NAME="item_catchall_%2D_optional_svcnum_of_an_svc_acct_record">catchall - optional svcnum of an svc_acct record, designating an email catchall account.</A></STRONG><BR>
+<DD>
 </DL>
 <P>
 <HR>
@@ -86,9 +88,18 @@ the domain_record table (see &lt;FS::domain_record&gt;).</P>
 records are added to the domain_record table (see <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>).</P>
 <P>If any machines are defined in the <EM>mxmachines</EM> configuration file, MX
 records are added to the domain_record table (see <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>).</P>
-<P>Any problems adding FS::domain_record records will emit warnings, but will
-not return errors from this method.  If your configuration files are correct
-you shouln't have any problems.</P>
+<P>If a machine is defined in the <EM>shellmachine</EM> configuration value, the
+<EM>qmailmachines</EM> configuration file exists, and the <EM>catchall</EM> field points
+to an an account with a home directory (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>), the command:</P>
+<PRE>
+  [ -e $dir/.qmail-$qdomain-defualt ] || {
+    touch $dir/.qmail-$qdomain-default;
+    chown $uid:$gid $dir/.qmail-$qdomain-default;
+  }</PRE>
+<P>is executed on shellmachine via ssh (see <EM>dot-qmail/``EXTENSION ADDRESSES''</EM>).
+This behaviour can be supressed by setting $FS::svc_domain::nossh_hack true.</P>
+<P>a machine is defined
+in the</P>
 <P></P>
 <DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
 <DD>
@@ -140,7 +151,7 @@ Submits a registration email for this domain.
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_domain.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: svc_domain.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
diff --git a/httemplate/docs/man/FS/svc_www.html b/httemplate/docs/man/FS/svc_www.html
index e72b219be..0e7f4f197 100644
--- a/httemplate/docs/man/FS/svc_www.html
+++ b/httemplate/docs/man/FS/svc_www.html
@@ -18,7 +18,6 @@
 	<LI><A HREF="#version">VERSION</A></LI>
 	<LI><A HREF="#bugs">BUGS</A></LI>
 	<LI><A HREF="#see also">SEE ALSO</A></LI>
-	<LI><A HREF="#history">HISTORY</A></LI>
 </UL>
 <!-- INDEX END -->
 
@@ -120,7 +119,7 @@ and repalce methods.
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_www.html,v 1.1 2001-07-30 07:36:03 ivan Exp $</P>
+<P>$Id: svc_www.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
@@ -129,21 +128,6 @@ and repalce methods.
 <H1><A NAME="see also">SEE ALSO</A></H1>
 <P><A HREF=".././FS/svc_Common.html">the FS::svc_Common manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
 <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, schema.html from the base documentation.</P>
-<P>
-<HR>
-<H1><A NAME="history">HISTORY</A></H1>
-<P>$Log: svc_www.html,v $
-<P>Revision 1.1  2001-07-30 07:36:03  ivan
-<P>templates!!!
-<P>
-Revision 1.4  2001/04/22 01:56:15  ivan
-get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)</P>
-<P>Revision 1.3  2000/11/22 23:30:51  ivan
-tyop</P>
-<P>Revision 1.2  2000/03/01 08:13:59  ivan
-compilation bugfixes</P>
-<P>Revision 1.1  2000/02/03 05:16:52  ivan
-beginning of DNS and Apache support</P>
 
 </BODY>
 
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
new file mode 100755
index 000000000..41d6666dc
--- /dev/null
+++ b/httemplate/edit/part_bill_event.cgi
@@ -0,0 +1,131 @@
+<!-- $Id: part_bill_event.cgi,v 1.1 2002-01-29 16:33:16 ivan Exp $ -->
+
+<%
+
+if ( $cgi->param('eventnum') && $cgi->param('eventnum') =~ /^(\d+)$/ ) {
+  $cgi->param('eventnum', $1);
+} else {
+  $cgi->param('eventnum', '');
+}
+
+my ($query) = $cgi->keywords;
+my $action = '';
+my $part_bill_event = '';
+if ( $cgi->param('error') ) {
+  $part_bill_event = new FS::part_bill_event ( {
+    map { $_, scalar($cgi->param($_)) } fields('part_bill_event')
+  } );
+}
+if ( $query && $query =~ /^(\d+)$/ ) {
+  $part_bill_event ||= qsearchs('part_bill_event',{'eventpart'=>$1});
+} else {
+  $part_bill_event ||= new FS::part_bill_event {};
+}
+$action ||= $part_bill_event->pkgpart ? 'Edit' : 'Add';
+my $hashref = $part_bill_event->hashref;
+
+print header("$action Invoice Event Definition", menubar(
+  'Main Menu' => popurl(2),
+  'View all invoice events' => popurl(2). 'browse/part_bill_event.cgi',
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print '<FORM ACTION="', popurl(1), 'process/part_bill_event.cgi" METHOD=POST>';
+
+print "Invoice Event #", $hashref->{eventpart} ? $hashref->{eventpart} : "(NEW)";
+
+print ntable("#cccccc",2), <<END;
+<TR><TD ALIGN="right">Payby</TD><TD><SELECT NAME="payby">
+END
+
+for (qw(CARD BILL COMP)) {
+  print qq!<OPTION VALUE="$_"!;
+  if ($part_bill_event->payby eq $_) {
+    print " SELECTED> $_</OPTION>";
+  } else {
+    print ">$_</OPTION>";
+  }
+}
+
+my $days = $hashref->{seconds}/3600;
+
+print <<END;
+</SELECT></TD></TR>
+<TR><TD ALIGN="right">Event</TD><TD><INPUT TYPE="text" NAME="event" VALUE="$hashref->{event}"></TD></TR>
+<TR><TD ALIGN="right">After</TD><TD><INPUT TYPE="text" NAME="days" VALUE="$days"> days</TD></TR>
+END
+
+print '<TR><TD ALIGN="right">Disabled</TD><TD>';
+print '<INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"';
+print ' CHECKED' if $hashref->{disabled} eq "Y";
+print '>';
+print '</TD></TR>';
+
+print '<TR><TD ALIGN="right">Action</TD><TD>';
+
+#print ntable();
+
+#this is pretty kludgy right here.
+tie my %events, 'Tie::IxHash',
+
+  'Charge a fee' => {
+    'code' => '$cust_main->charge( %%%charge%%%, \'%%%reason%%%\' );',
+    'html' => 'Amount <INPUT TYPE="text" SIZE="7" NAME="charge"><BR>'.
+              'Reason <INPUT TYPE="text" NAME="reason">',
+  },
+  'Suspend accounts' => {
+    'code' => '$cust_main->suspend();',
+  },
+  'Cancel accounts' => {
+    'code' => '$cust_main->cancel();',
+  },
+
+  'Add postal invoicing' => {
+    'code' => '$cust_main->invoicing_list_addpost();',
+    'pad'  => 10,
+  },
+
+  'Generate invoices' => {
+    'code' => '$cust_main->bill();',
+    'pad'  => 20,
+  },
+
+  'Apply unapplied payments and credits' => {
+    'code' => '$cust_main->apply_payments; $cust_main->apply_credits;',
+    'pad'  => 30,
+  },
+
+  'Collect on invoices' => {
+    'code' => '$cust_main->collect();',
+    'pad'  => 40,
+  },
+
+;
+
+foreach my $event ( keys %events ) {
+  print ntable( "#cccccc", 2). qq!<TR><TD><INPUT TYPE="radio" NAME="eventcode" VALUE="!.
+        encode_entities($events{$event}{code}). qq!">$event</TD>!;
+  print '<TD>'. $events{$event}{html}. '</TD>' if exists $events{$event}{html};
+  print qq!</TR>!;
+  print '</TABLE>';
+}
+
+#print '</TABLE>';
+
+print <<END;
+</TD></TR>
+</TABLE>
+END
+
+print qq!<INPUT TYPE="submit" VALUE="!,
+      $hashref->{pkgpart} ? "Apply changes" : "Add invoice event",
+      qq!">!;
+%>
+
+    </FORM>
+  </BODY>
+</HTML>
+
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 735f4f269..ea3f62aa2 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_pkg.cgi,v 1.8 2001-12-28 14:40:35 ivan Exp $ -->
+<!-- $Id: part_pkg.cgi,v 1.9 2002-01-29 16:33:16 ivan Exp $ -->
 
 <%
 
@@ -158,8 +158,8 @@ unless ( $cgi->param('clone') ) {
 }
 
 # prolly should be in database
-my %plans = (
-
+use Tie::IxHash;
+tie my %plans, 'Tie::IxHash',
   'flat' => {
     'name' => 'Flat rate',
     'fields' => {
@@ -170,6 +170,7 @@ my %plans = (
                        'default' => 0,
                       },
     },
+    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
     'setup' => 'what.setup_fee.value',
     'recur' => 'what.recur_fee.value',
   },
@@ -190,11 +191,55 @@ my %plans = (
                               'default' => 1,
                             },
     },
+    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount' ],
     'setup' => 'what.setup_fee.value',
     'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
   },
 
-);
+  'sesmon_hour' => {
+    'name' => 'Base charge plus charge per-hour from the session monitor',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'recur_included_hours' => { 'name' => 'Hours included',
+                                  'default' => 0,
+                                },
+      'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
+                                 'default' => 0,
+                               },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ],
+    'setup' => 'what.setup_fee.value',
+    'recur' => '\'my $hours = $cust_pkg->seconds_since($cust_bkg->bill || 0) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
+  },
+
+  'sesmon_minute' => {
+    'name' => 'Base charge plus charge per-minute from the session monitor',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'recur_included_min' => { 'name' => 'Minutes included',
+                                'default' => 0,
+                                },
+      'recur_minly_charge' => { 'name' => 'Additional charge per minute',
+                                'default' => 0,
+                              },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_min', 'recur_minly_charge' ],
+    'setup' => 'what.setup_fee.value',
+    'recur' => '\'my $min = $cust_pkg->seconds_since($cust_bkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_flat.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
+
+  },
+
+;
 
 %>
 
@@ -295,24 +340,30 @@ if ( $cgi->param('pkgnum') ) {
 <%= ntable("#cccccc",2) %>
 
 <% my $href = $plans{$layer}->{'fields'};
-   foreach my $field ( keys %{ $href } ) { %>
+   foreach my $field ( exists($plans{$layer}->{'fieldorder'})
+                         ? @{$plans{$layer}->{'fieldorder'}}
+                         : keys %{ $href }
+                     ) {
+%>
 <TR><TD ALIGN="right"><%= $href->{$field}{'name'} %></TD>
 <TD><INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= exists($plandata{$field}) ? $plandata{$field} : $href->{$field}{'default'} %>" onChange="fchanged(this)"></TD></TR>
 <% } %>
 </TABLE>
 <INPUT TYPE="hidden" NAME="plandata" VALUE="<%= join(',', keys %{ $href } ) %>">
-<FONT SIZE="1">
 <BR><BR>
-Setup expression<BR><INPUT TYPE="text" NAME="setup" SIZE="160" VALUE="<%= $hashref->{setup} %>" onLoad="fchanged(this)"><BR>
-Recurring espression<BR><INPUT TYPE="text" NAME="recur" SIZE="160" VALUE="<%= $hashref->{recur} %>" onLoad="fchanged(this)"><BR>
-</FONT>
 
 <%
-print qq!<BR><INPUT TYPE="submit" VALUE="!,
+print qq!<INPUT TYPE="submit" VALUE="!,
       $hashref->{pkgpart} ? "Apply changes" : "Add package",
       qq!" onClick="fchanged(this)">!;
 %>
 
+<BR><BR>don't edit this unless you know what you're doing <INPUT TYPE="button" VALUE="refresh expressions" onClick="fchanged(this)"><%= ntable("#cccccc",2) %><TR><TD>
+<FONT SIZE="1">Setup expression<BR><INPUT TYPE="text" NAME="setup" SIZE="160" VALUE="<%= $hashref->{setup} %>" onLoad="fchanged(this)"></FONT><BR>
+<FONT SIZE="1">Recurring espression<BR><INPUT TYPE="text" NAME="recur" SIZE="160" VALUE="<%= $hashref->{recur} %>" onLoad="fchanged(this)"></FONT>
+</TR></TD>
+</TABLE>
+
 </FORM>
 
 <SCRIPT>
diff --git a/httemplate/edit/process/part_bill_event.cgi b/httemplate/edit/process/part_bill_event.cgi
new file mode 100755
index 000000000..eb7c53e5d
--- /dev/null
+++ b/httemplate/edit/process/part_bill_event.cgi
@@ -0,0 +1,32 @@
+<%
+
+my $eventpart = $cgi->param('eventpart');
+
+my $old = qsearchs('part_bill_event',{'eventpart'=>$eventpart}) if $eventpart;
+
+#s/days/seconds/
+$cgi->param('seconds', $cgi->param('days') * 3600 );
+
+my $new = new FS::part_bill_event ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('part_bill_event'),
+} );
+
+my $error;
+if ( $eventpart ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $eventpart = $new->getfield('eventpart');
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "part_bill_event.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3)."browse/part_bill_event.cgi");
+}
+
+%>
+
diff --git a/httemplate/index.html b/httemplate/index.html
index d1abd0d61..35ba8e85e 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -93,6 +93,7 @@
               into counties and assign different tax rates to each.
           <LI><A HREF="browse/svc_acct_pop.cgi">View/Edit POPs</A>
             - Points of Presence 
+          <LI><A HREF="browse/part_bill_event.cgi">View/Edit invoice events</A> - Actions for overdue invoices
         </ul>
       </ul>
   </BODY>
-- 
cgit v1.2.1


From c5c0ba135749164ec8ba75d18f76c29625e1bc7e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 29 Jan 2002 17:42:46 +0000
Subject: weight, plan and plandata fields in part_bill_event

---
 FS/FS/part_bill_event.pm              | 11 +++++++++++
 README.1.4.0pre4567-8                 | 11 ++++++++---
 bin/fs-setup                          |  5 ++++-
 httemplate/docs/man/FS/cust_main.html |  2 +-
 httemplate/docs/man/FS/cust_pay.html  |  2 +-
 httemplate/docs/man/FS/cust_pkg.html  |  2 +-
 httemplate/docs/man/FS/cust_svc.html  |  2 +-
 httemplate/docs/man/FS/svc_acct.html  |  2 +-
 httemplate/docs/schema.html           |  3 +++
 httemplate/docs/upgrade8.html         |  7 +++++--
 10 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
index fb2c06ad4..4a23315dd 100644
--- a/FS/FS/part_bill_event.pm
+++ b/FS/FS/part_bill_event.pm
@@ -44,6 +44,12 @@ FS::Record.  The following fields are currently supported:
 
 =item seconds - how long after the invoice date events of this type are triggered
 
+=item weight - ordering for events with identical seconds
+
+=item plan - eventcode plan
+
+=item plandata - additional plan data
+
 =item disabled - Disabled flag, empty or `Y'
 
 =back
@@ -106,12 +112,17 @@ insert and replace methods.
 sub check {
   my $self = shift;
 
+  $self->weight(0) unless $self->weight;
+
   $self->ut_numbern('eventpart')
     || $self->ut_enum('payby', [qw( CARD BILL COMP )] )
     || $self->ut_text('event')
     || $self->ut_anything('eventcode')
     || $self->ut_number('seconds')
     || $self->ut_enum('disabled', [ '', 'Y' ] )
+    || $self->ut_number('weight')
+    || $self->ut_alphan('plan')
+    || $self->ut_anything('plandata')
   ;
 }
 
diff --git a/README.1.4.0pre4567-8 b/README.1.4.0pre4567-8
index 1f7878395..11fc9c1db 100644
--- a/README.1.4.0pre4567-8
+++ b/README.1.4.0pre4567-8
@@ -8,7 +8,9 @@ http://cleanwhisker.420.am/cgi-bin/cvsweb/freeside/Attic/
 
 -----
 
-install the perl modules and httemplate as per install.html or upgrade8.html
+install Time::Duration and Tie::IxHash
+
+install the FS perl modules and httemplate as per install.html or upgrade8.html
 
 ALTER TABLE part_pkg ADD disabled char(1) NULL;
 ALTER TABLE part_svc ADD disabled char(1) NULL;
@@ -17,7 +19,7 @@ CREATE TABLE cust_bill_event (
   eventnum int primary key,
   invnum int not null,
   eventpart int not null,
-  _date int not null,
+  _date int not null
 );
 CREATE UNIQUE INDEX cust_bill_events1 ON cust_bill_events ( eventpart, invnum );
 CREATE INDEX cust_bill_events2 ON cust_bill_events ( invnum );
@@ -28,7 +30,10 @@ CREATE TABLE part_bill_event (
   event varchar(80) not null,
   eventcode text null,
   seconds int null,
-  disabled char(1) null,
+  weight int not null,
+  plan varchar(80) null,
+  plandata text null,
+  disabled char(1) null
 );
 CREATE INDEX part_bill_events1 ON part_bill_events ( payby );
 
diff --git a/bin/fs-setup b/bin/fs-setup
index f3ff031d4..7e043d238 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.72 2002-01-29 11:11:06 ivan Exp $
+# $Id: fs-setup,v 1.73 2002-01-29 17:42:46 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -319,6 +319,9 @@ sub tables_hash_hack {
         'event',       'varchar',           '',     $char_d,
         'eventcode',    @perl_type,
         'seconds',     'int', 'NULL', '',
+        'weight',      'int', '', '',
+        'plan',       'varchar', 'NULL', $char_d,
+        'plandata',   'text', 'NULL', '',
         'disabled',     'char', 'NULL', 1,
       ],
       'primary_key' => 'eventpart',
diff --git a/httemplate/docs/man/FS/cust_main.html b/httemplate/docs/man/FS/cust_main.html
index 86e659ad0..1fb339124 100644
--- a/httemplate/docs/man/FS/cust_main.html
+++ b/httemplate/docs/man/FS/cust_main.html
@@ -393,7 +393,7 @@ the error, otherwise returns false.
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_main.html,v 1.2 2002-01-29 16:33:15 ivan Exp $</P>
+<P>$Id: cust_main.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
diff --git a/httemplate/docs/man/FS/cust_pay.html b/httemplate/docs/man/FS/cust_pay.html
index ce057f068..a8c481fc0 100644
--- a/httemplate/docs/man/FS/cust_pay.html
+++ b/httemplate/docs/man/FS/cust_pay.html
@@ -107,7 +107,7 @@ paid minus all payment applications (see <A HREF=".././FS/cust_bill_pay.html">th
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_pay.html,v 1.2 2002-01-29 16:33:15 ivan Exp $</P>
+<P>$Id: cust_pay.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
diff --git a/httemplate/docs/man/FS/cust_pkg.html b/httemplate/docs/man/FS/cust_pkg.html
index 9f1005da7..76cb9e786 100644
--- a/httemplate/docs/man/FS/cust_pkg.html
+++ b/httemplate/docs/man/FS/cust_pkg.html
@@ -191,7 +191,7 @@ newly-created cust_pkg objects.</P>
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_pkg.html,v 1.2 2002-01-29 16:33:15 ivan Exp $</P>
+<P>$Id: cust_pkg.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
diff --git a/httemplate/docs/man/FS/cust_svc.html b/httemplate/docs/man/FS/cust_svc.html
index 97a299c52..55c90e28e 100644
--- a/httemplate/docs/man/FS/cust_svc.html
+++ b/httemplate/docs/man/FS/cust_svc.html
@@ -119,7 +119,7 @@ where <STRONG>svcdb</STRONG> is not ``svc_acct''.
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_svc.html,v 1.2 2002-01-29 16:33:16 ivan Exp $</P>
+<P>$Id: cust_svc.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
diff --git a/httemplate/docs/man/FS/svc_acct.html b/httemplate/docs/man/FS/svc_acct.html
index 9c41db3f0..93483f67d 100644
--- a/httemplate/docs/man/FS/svc_acct.html
+++ b/httemplate/docs/man/FS/svc_acct.html
@@ -251,7 +251,7 @@ See <A HREF=".././FS/session.html">the FS::session manpage</A>
 <P>
 <HR>
 <H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_acct.html,v 1.2 2002-01-29 16:33:16 ivan Exp $</P>
+<P>$Id: svc_acct.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
 <P>
 <HR>
 <H1><A NAME="bugs">BUGS</A></H1>
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 21da3ecf6..bdf3a500e 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -40,6 +40,9 @@
         <li>event - event name
         <li>eventcode - event action
         <li>seconds - how long after the invoice date (<a href="#cust_bill">cust_bill</a>._date) events of this type are triggered
+        <li>weight - ordering for events with identical seconds
+        <li>plan - eventcode plan
+        <li>plandata - additional plan data
         <li>disabled - Disabled flag, empty or `Y'
       </ul>
     <li><a name="cust_bill_pkg" href="man/FS/cust_bill_pkg.html">cust_bill_pkg</a> - Invoice line items
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index bbb528cda..c4d023a58 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -128,7 +128,7 @@ CREATE TABLE cust_bill_event (
   eventnum int primary key,
   invnum int not null,
   eventpart int not null,
-  _date int not null,
+  _date int not null
 );
 CREATE UNIQUE INDEX cust_bill_event1 ON cust_bill_event ( eventpart, invnum );
 CREATE INDEX cust_bill_event2 ON cust_bill_event ( invnum );
@@ -139,7 +139,10 @@ CREATE TABLE part_bill_event (
   event varchar(80) not null,
   eventcode text null,
   seconds int null,
-  disabled char(1) null,
+  weight int not null,
+  plan varchar(80) null,
+  plandata text null,
+  disabled char(1) null
 );
 CREATE INDEX part_bill_event1 ON part_bill_event ( payby );
 
-- 
cgit v1.2.1


From ea0d3938b57a079ce4aa6db0cae316e3ac6da654 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 29 Jan 2002 17:46:41 +0000
Subject: these are all auto-generated by the installation; don't check them
 into CVS (probably should generate them for a release tarball though)

---
 httemplate/docs/man/FS.html                   | 164 ----------
 httemplate/docs/man/FS/CGI.html               | 100 ------
 httemplate/docs/man/FS/CGIwrapper.html        |  16 -
 httemplate/docs/man/FS/Conf.html              |  97 ------
 httemplate/docs/man/FS/Record.html            | 366 ----------------------
 httemplate/docs/man/FS/SessionClient.html     |  97 ------
 httemplate/docs/man/FS/SignupClient.html      | 132 --------
 httemplate/docs/man/FS/UI/Base.html           | 100 ------
 httemplate/docs/man/FS/UI/CGI.html            |  94 ------
 httemplate/docs/man/FS/UI/Gtk.html            |  91 ------
 httemplate/docs/man/FS/UI/agent.html          |  16 -
 httemplate/docs/man/FS/UID.html               | 138 ---------
 httemplate/docs/man/FS/agent.html             | 121 --------
 httemplate/docs/man/FS/agent_type.html        | 126 --------
 httemplate/docs/man/FS/cust_bill.html         | 182 -----------
 httemplate/docs/man/FS/cust_bill_pkg.html     | 112 -------
 httemplate/docs/man/FS/cust_credit.html       | 132 --------
 httemplate/docs/man/FS/cust_main.html         | 419 --------------------------
 httemplate/docs/man/FS/cust_main_county.html  | 106 -------
 httemplate/docs/man/FS/cust_main_invoice.html | 114 -------
 httemplate/docs/man/FS/cust_pay.html          | 123 --------
 httemplate/docs/man/FS/cust_pay_batch.html    | 132 --------
 httemplate/docs/man/FS/cust_pkg.html          | 217 -------------
 httemplate/docs/man/FS/cust_refund.html       | 114 -------
 httemplate/docs/man/FS/cust_svc.html          | 139 ---------
 httemplate/docs/man/FS/domain_record.html     | 112 -------
 httemplate/docs/man/FS/nas.html               | 117 -------
 httemplate/docs/man/FS/part_pkg.html          | 148 ---------
 httemplate/docs/man/FS/part_referral.html     | 100 ------
 httemplate/docs/man/FS/part_svc.html          | 120 --------
 httemplate/docs/man/FS/pkg_svc.html           | 115 -------
 httemplate/docs/man/FS/port.html              | 120 --------
 httemplate/docs/man/FS/prepay_credit.html     | 106 -------
 httemplate/docs/man/FS/session.html           | 129 --------
 httemplate/docs/man/FS/svc_Common.html        |  97 ------
 httemplate/docs/man/FS/svc_acct.html          | 275 -----------------
 httemplate/docs/man/FS/svc_acct_pop.html      | 125 --------
 httemplate/docs/man/FS/svc_acct_sm.html       | 150 ---------
 httemplate/docs/man/FS/svc_domain.html        | 173 -----------
 httemplate/docs/man/FS/svc_www.html           | 134 --------
 httemplate/docs/man/FS/type_pkgs.html         | 100 ------
 41 files changed, 5569 deletions(-)
 delete mode 100644 httemplate/docs/man/FS.html
 delete mode 100644 httemplate/docs/man/FS/CGI.html
 delete mode 100644 httemplate/docs/man/FS/CGIwrapper.html
 delete mode 100644 httemplate/docs/man/FS/Conf.html
 delete mode 100644 httemplate/docs/man/FS/Record.html
 delete mode 100644 httemplate/docs/man/FS/SessionClient.html
 delete mode 100644 httemplate/docs/man/FS/SignupClient.html
 delete mode 100644 httemplate/docs/man/FS/UI/Base.html
 delete mode 100644 httemplate/docs/man/FS/UI/CGI.html
 delete mode 100644 httemplate/docs/man/FS/UI/Gtk.html
 delete mode 100644 httemplate/docs/man/FS/UI/agent.html
 delete mode 100644 httemplate/docs/man/FS/UID.html
 delete mode 100644 httemplate/docs/man/FS/agent.html
 delete mode 100644 httemplate/docs/man/FS/agent_type.html
 delete mode 100644 httemplate/docs/man/FS/cust_bill.html
 delete mode 100644 httemplate/docs/man/FS/cust_bill_pkg.html
 delete mode 100644 httemplate/docs/man/FS/cust_credit.html
 delete mode 100644 httemplate/docs/man/FS/cust_main.html
 delete mode 100644 httemplate/docs/man/FS/cust_main_county.html
 delete mode 100644 httemplate/docs/man/FS/cust_main_invoice.html
 delete mode 100644 httemplate/docs/man/FS/cust_pay.html
 delete mode 100644 httemplate/docs/man/FS/cust_pay_batch.html
 delete mode 100644 httemplate/docs/man/FS/cust_pkg.html
 delete mode 100644 httemplate/docs/man/FS/cust_refund.html
 delete mode 100644 httemplate/docs/man/FS/cust_svc.html
 delete mode 100644 httemplate/docs/man/FS/domain_record.html
 delete mode 100644 httemplate/docs/man/FS/nas.html
 delete mode 100644 httemplate/docs/man/FS/part_pkg.html
 delete mode 100644 httemplate/docs/man/FS/part_referral.html
 delete mode 100644 httemplate/docs/man/FS/part_svc.html
 delete mode 100644 httemplate/docs/man/FS/pkg_svc.html
 delete mode 100644 httemplate/docs/man/FS/port.html
 delete mode 100644 httemplate/docs/man/FS/prepay_credit.html
 delete mode 100644 httemplate/docs/man/FS/session.html
 delete mode 100644 httemplate/docs/man/FS/svc_Common.html
 delete mode 100644 httemplate/docs/man/FS/svc_acct.html
 delete mode 100644 httemplate/docs/man/FS/svc_acct_pop.html
 delete mode 100644 httemplate/docs/man/FS/svc_acct_sm.html
 delete mode 100644 httemplate/docs/man/FS/svc_domain.html
 delete mode 100644 httemplate/docs/man/FS/svc_www.html
 delete mode 100644 httemplate/docs/man/FS/type_pkgs.html

diff --git a/httemplate/docs/man/FS.html b/httemplate/docs/man/FS.html
deleted file mode 100644
index 7db6bb9fd..000000000
--- a/httemplate/docs/man/FS.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS - Freeside Perl modules</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<UL>
-
-		<LI><A HREF="#utility classes">Utility classes</A></LI>
-		<LI><A HREF="#database record classes">Database record classes</A></LI>
-	</UL>
-
-	<LI><A HREF="#remote api modules">Remote API modules</A></LI>
-	<UL>
-
-		<LI><A HREF="#commandline utilities">Command-line utilities</A></LI>
-		<LI><A HREF="#user interface classes (under (stalled) development; not yet usable)">User Interface classes (under (stalled) development; not yet usable)</A></LI>
-		<LI><A HREF="#notes">Notes</A></LI>
-	</UL>
-
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#support">SUPPORT</A></LI>
-	<LI><A HREF="#author">AUTHOR</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS - Freeside Perl modules</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<P>Freeside perl modules and CLI utilities.</P>
-<P>
-<H2><A NAME="utility classes">Utility classes</A></H2>
-<P><A HREF="././FS/Conf.html">the FS::Conf manpage</A> - Freeside configuration values</P>
-<P><A HREF="././FS/ConfItem.html">the FS::ConfItem manpage</A> - Freeside configuration option meta-data.</P>
-<P><A HREF="././FS/UID.html">the FS::UID manpage</A> - User class (not yet OO)</P>
-<P><A HREF="././FS/CGI.html">the FS::CGI manpage</A> - Non OO-subroutines for the web interface.</P>
-<P>
-<H2><A NAME="database record classes">Database record classes</A></H2>
-<P><A HREF="././FS/Record.html">the FS::Record manpage</A> - Database record base class</P>
-<P><A HREF="././FS/svc_acct_pop.html">the FS::svc_acct_pop manpage</A> - POP (Point of Presence, not Post
-Office Protocol) class</P>
-<P><A HREF="././FS/part_pop_local.html">the FS::part_pop_local manpage</A> - Local calling area class</P>
-<P><A HREF="././FS/part_referral.html">the FS::part_referral manpage</A> - Referral class</P>
-<P><A HREF="././FS/cust_main_county.html">the FS::cust_main_county manpage</A> - Locale (tax rate) class</P>
-<P><A HREF="././FS/svc_Common.html">the FS::svc_Common manpage</A> - Service base class</P>
-<P><A HREF="././FS/svc_acct.html">the FS::svc_acct manpage</A> - Account (shell, RADIUS, POP3) class</P>
-<P><A HREF="././FS/svc_domain.html">the FS::svc_domain manpage</A> - Domain class</P>
-<P><A HREF="././FS/domain_record.html">the FS::domain_record manpage</A> - DNS zone entries</P>
-<P><A HREF="././FS/svc_forward.html">the FS::svc_forward manpage</A> - Mail forwarding class</P>
-<P><A HREF="././FS/svc_acct_sm.html">the FS::svc_acct_sm manpage</A> - (Depreciated) Vitual mail alias class</P>
-<P><A HREF="././FS/svc_www.html">the FS::svc_www manpage</A> - Web virtual host class.</P>
-<P><A HREF="././FS/part_svc.html">the FS::part_svc manpage</A> - Service definition class</P>
-<P><A HREF="././FS/part_svc_column.html">the FS::part_svc_column manpage</A> - Column constraint class</P>
-<P><A HREF="././FS/part_export.html">the FS::part_export manpage</A> - External provisioning export class</P>
-<P><A HREF="././FS/part_export_option.html">the FS::part_export_option manpage</A> - Export option class</P>
-<P><A HREF="././FS/part_pkg.html">the FS::part_pkg manpage</A> - Package (billing item) definition class</P>
-<P><A HREF="././FS/pkg_svc.html">the FS::pkg_svc manpage</A> - Class linking package (billing item)
-definitions (see <A HREF="././FS/part_pkg.html">the FS::part_pkg manpage</A>) with service definitions
-(see <A HREF="././FS/part_svc.html">the FS::part_svc manpage</A>)</P>
-<P><A HREF="././FS/agent.html">the FS::agent manpage</A> - Agent (reseller) class</P>
-<P><A HREF="././FS/agent_type.html">the FS::agent_type manpage</A> - Agent type class</P>
-<P><A HREF="././FS/type_pkgs.html">the FS::type_pkgs manpage</A> - Class linking agent types (see
-<A HREF="././FS/agent_type.html">the FS::agent_type manpage</A>) with package (billing item) definitions
-(see <A HREF="././FS/part_pkg.html">the FS::part_pkg manpage</A>)</P>
-<P><A HREF="././FS/cust_svc.html">the FS::cust_svc manpage</A> - Service class</P>
-<P><A HREF="././FS/cust_pkg.html">the FS::cust_pkg manpage</A> - Package (billing item) class</P>
-<P><A HREF="././FS/cust_main.html">the FS::cust_main manpage</A> - Customer class</P>
-<P><A HREF="././FS/cust_main_invoice.html">the FS::cust_main_invoice manpage</A> - Invoice destination
-class</P>
-<P><A HREF="././FS/cust_bill.html">the FS::cust_bill manpage</A> - Invoice class</P>
-<P><A HREF="././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A> - Invoice line item class</P>
-<P><A HREF="././FS/part_bill_event.html">the FS::part_bill_event manpage</A> - Invoice event definition class</P>
-<P><A HREF="././FS/cust_bill_event.html">the FS::cust_bill_event manpage</A> - Completed invoice event class</P>
-<P><A HREF="././FS/cust_pay.html">the FS::cust_pay manpage</A> - Payment class</P>
-<P><A HREF="././FS/cust_bill_pay.html">the FS::cust_bill_pay manpage</A> - Payment application class</P>
-<P><A HREF="././FS/cust_credit.html">the FS::cust_credit manpage</A> - Credit class</P>
-<P><A HREF="././FS/cust_refund.html">the FS::cust_refund manpage</A> - Refund class</P>
-<P><A HREF="././FS/cust_credit_refund.html">the FS::cust_credit_refund manpage</A> - Refund application class</P>
-<P><A HREF="././FS/cust_credit_bill.html">the FS::cust_credit_bill manpage</A> - Credit invoice application class</P>
-<P><A HREF="././FS/cust_pay_batch.html">the FS::cust_pay_batch manpage</A> - Credit card transaction queue class</P>
-<P><A HREF="././FS/prepay_credit.html">the FS::prepay_credit manpage</A> - Prepaid ``calling card'' credit class.</P>
-<P><A HREF="././FS/nas.html">the FS::nas manpage</A> - Network Access Server class</P>
-<P><A HREF="././FS/port.html">the FS::port manpage</A> - NAS port class</P>
-<P><A HREF="././FS/session.html">the FS::session manpage</A> - User login session class</P>
-<P><A HREF="././FS/queue.html">the FS::queue manpage</A> - Job queue</P>
-<P><A HREF="././FS/queue_arg.html">the FS::queue_arg manpage</A> - Job arguments</P>
-<P>
-<HR>
-<H1><A NAME="remote api modules">Remote API modules</A></H1>
-<P><A HREF="./FS/SignupClient.html">the FS::SignupClient manpage</A></P>
-<P><A HREF="./FS/SessionClient.html">the FS::SessionClient manpage</A></P>
-<P><A HREF="./FS/MailAdminServer.html">the FS::MailAdminServer manpage</A></P>
-<P>
-<H2><A NAME="commandline utilities">Command-line utilities</A></H2>
-<P><A HREF="././bin/freeside-email.html">the freeside-email manpage</A></P>
-<P><A HREF="././bin/freeside-queued.html">the freeside-queued manpage</A></P>
-<P><A HREF="././bin/freeside-adduser.html">the freeside-adduser manpage</A></P>
-<P><A HREF="././bin/freeside-bill.html">the freeside-bill manpage</A></P>
-<P><A HREF="././bin/freeside-overdue.html">the freeside-overdue manpage</A></P>
-<P>
-<H2><A NAME="user interface classes (under (stalled) development; not yet usable)">User Interface classes (under (stalled) development; not yet usable)</A></H2>
-<P><A HREF="././FS/UI/Base.html">the FS::UI::Base manpage</A> - User-interface base class</P>
-<P><A HREF="././FS/UI/Gtk.html">the FS::UI::Gtk manpage</A> - Gtk user-interface class</P>
-<P><A HREF="././FS/UI/CGI.html">the FS::UI::CGI manpage</A> - CGI (HTML) user-interface class</P>
-<P><A HREF="././FS/UI/agent.html">the FS::UI::agent manpage</A> - agent table user-interface class</P>
-<P>
-<H2><A NAME="notes">Notes</A></H2>
-<P>To quote perl(1), ``If you're intending to read these straight through for the
-first time, the suggested order will tend to reduce the number of forward
-references.''</P>
-<P>If you've never used OO modules before,
-<A HREF="http://www.cpan.org/doc/FMTEYEWTK/easy_objects.html">http://www.cpan.org/doc/FMTEYEWTK/easy_objects.html</A> might help you out.</P>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>Freeside is a billing and administration package for Internet Service
-Providers.</P>
-<P>The Freeside home page is at &lt;http://www.sisd.com/freeside&gt;.</P>
-<P>The main documentation is in httemplate/docs.</P>
-<P>
-<HR>
-<H1><A NAME="support">SUPPORT</A></H1>
-<P>A mailing list for users is available.  Send a blank message to
-&lt;<A HREF="mailto:ivan-freeside-subscribe@sisd.com">ivan-freeside-subscribe@sisd.com</A>&gt; to subscribe.</P>
-<P>A mailing list for developers is available.  It is intended to be lower volume
-and higher SNR than the users list.  Send a blank message to
-&lt;<A HREF="mailto:ivan-freeside-devel-subscribe@sisd.com">ivan-freeside-devel-subscribe@sisd.com</A>&gt; to subscribe.</P>
-<P>Commercial support is available; see
-&lt;http://www.sisd.com/freeside/commercial.html&gt;.</P>
-<P>
-<HR>
-<H1><A NAME="author">AUTHOR</A></H1>
-<P>Primarily Ivan Kohler &lt;<A HREF="mailto:ivan@sisd.com">ivan@sisd.com</A>&gt;, with help from many kind folks.</P>
-<P>See the CREDITS file in the Freeside distribution for a (hopefully) complete
-list and the individal files for details.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P>perl(1), main Freeside documentation in htdocs/docs/</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>Those modules which would be useful separately should be pulled out, 
-renamed appropriately and uploaded to CPAN.  So far: DBIx::DBSchema, Net::SSH
-and Net::SCP...</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/CGI.html b/httemplate/docs/man/FS/CGI.html
deleted file mode 100644
index 54a0bf39b..000000000
--- a/httemplate/docs/man/FS/CGI.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::CGI - Subroutines for the web interface</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::CGI - Subroutines for the web interface</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::CGI qw(header menubar idiot eidiot popurl);</PRE>
-<PRE>
-  print header( 'Title', '' );
-  print header( 'Title', menubar('item', 'URL', ... ) );</PRE>
-<PRE>
-  idiot &quot;error message&quot;; 
-  eidiot &quot;error message&quot;;</PRE>
-<PRE>
-  $url = popurl; #returns current url
-  $url = popurl(3); #three levels up</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>Provides a few common subroutines for the web interface.</P>
-<P>
-<HR>
-<H1><A NAME="subroutines">SUBROUTINES</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_header">header TITLE, MENUBAR</A></STRONG><BR>
-<DD>
-Returns an HTML header.
-<P></P>
-<DT><STRONG><A NAME="item_menubar_ITEM%2C_URL%2C_%2E%2E%2E">menubar ITEM, URL, ...</A></STRONG><BR>
-<DD>
-Returns an HTML menubar.
-<P></P>
-<DT><STRONG><A NAME="item_idiot">idiot ERROR</A></STRONG><BR>
-<DD>
-This is depriciated.  Don't use it.
-<P>Sends headers and an HTML error message.</P>
-<P></P>
-<DT><STRONG><A NAME="item_eidiot">eidiot ERROR</A></STRONG><BR>
-<DD>
-This is depriciated.  Don't use it.
-<P>Sends headers and an HTML error message, then exits.</P>
-<P></P>
-<DT><STRONG><A NAME="item_popurl">popurl LEVEL</A></STRONG><BR>
-<DD>
-Returns current URL with LEVEL levels of path removed from the end (default 0).
-<P></P>
-<DT><STRONG><A NAME="item_table">table</A></STRONG><BR>
-<DD>
-Returns HTML tag for beginning a table.
-<P></P>
-<DT><STRONG><A NAME="item_itable">itable</A></STRONG><BR>
-<DD>
-Returns HTML tag for beginning an (invisible) table.
-<P></P>
-<DT><STRONG><A NAME="item_ntable">ntable</A></STRONG><BR>
-<DD>
-This is getting silly.
-<P></P>
-<DT><STRONG><A NAME="item_small_custview_CUSTNUM_%7C%7C_CUST_MAIN_OBJECT%2C_">small_custview CUSTNUM || CUST_MAIN_OBJECT, COUNTRYDEFAULT</A></STRONG><BR>
-<DD>
-Sheesh. I should just switch to Mason.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>Not OO.</P>
-<P>Not complete.</P>
-<P>small_custview sooooo doesn't belong here.  i should just switch to Mason.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/CGI.html">the CGI manpage</A>, <A HREF="../CGI/Base.html">the CGI::Base manpage</A></P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/CGIwrapper.html b/httemplate/docs/man/FS/CGIwrapper.html
deleted file mode 100644
index bab5e7f37..000000000
--- a/httemplate/docs/man/FS/CGIwrapper.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>./FS/FS/CGIwrapper.pm</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-<!-- INDEX END -->
-
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/Conf.html b/httemplate/docs/man/FS/Conf.html
deleted file mode 100644
index be49be31f..000000000
--- a/httemplate/docs/man/FS/Conf.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::Conf - Freeside configuration values</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::Conf - Freeside configuration values</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::Conf;</PRE>
-<PRE>
-  $conf = new FS::Conf &quot;/config/directory&quot;;</PRE>
-<PRE>
-  $FS::Conf::default_dir = &quot;/config/directory&quot;;
-  $conf = new FS::Conf;</PRE>
-<PRE>
-  $dir = $conf-&gt;dir;</PRE>
-<PRE>
-  $value = $conf-&gt;config('key');
-  @list  = $conf-&gt;config('key');
-  $bool  = $conf-&gt;exists('key');</PRE>
-<PRE>
-  @config_items = $conf-&gt;config_items;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>Read and write Freeside configuration values.  Keys currently map to filenames,
-but this may change in the future.</P>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new_%5B_DIRECTORY_%5D">new [ DIRECTORY ]</A></STRONG><BR>
-<DD>
-Create a new configuration object.  A directory arguement is required if
-$FS::Conf::default_dir has not been set.
-<P></P>
-<DT><STRONG><A NAME="item_dir">dir</A></STRONG><BR>
-<DD>
-Returns the directory.
-<P></P>
-<DT><STRONG><A NAME="item_config">config</A></STRONG><BR>
-<DD>
-Returns the configuration value or values (depending on context) for key.
-<P></P>
-<DT><STRONG><A NAME="item_exists">exists</A></STRONG><BR>
-<DD>
-Returns true if the specified key exists, even if the corresponding value
-is undefined.
-<P></P>
-<DT><STRONG><A NAME="item_touch">touch</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_set">set</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_config_items">config_items</A></STRONG><BR>
-<DD>
-Returns all of the possible configuration items as FS::ConfItem objects.  See
-<A HREF=".././FS/ConfItem.html">the FS::ConfItem manpage</A>.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>Write access (touch, set, delete) should be documented.</P>
-<P>If this was more than just crud that will never be useful outside Freeside I'd
-worry that config_items is freeside-specific and icky.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P>``Configuration'' in the web interface (config/config.cgi).</P>
-<P>httemplate/docs/config.html</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/Record.html b/httemplate/docs/man/FS/Record.html
deleted file mode 100644
index 108a84ad7..000000000
--- a/httemplate/docs/man/FS/Record.html
+++ /dev/null
@@ -1,366 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::Record - Database record objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#constructors">CONSTRUCTORS</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::Record - Database record objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-    use FS::Record;
-    use FS::Record qw(dbh fields qsearch qsearchs dbdef);</PRE>
-<PRE>
-    $record = new FS::Record 'table', \%hash;
-    $record = new FS::Record 'table', { 'column' =&gt; 'value', ... };</PRE>
-<PRE>
-    $record  = qsearchs FS::Record 'table', \%hash;
-    $record  = qsearchs FS::Record 'table', { 'column' =&gt; 'value', ... };
-    @records = qsearch  FS::Record 'table', \%hash; 
-    @records = qsearch  FS::Record 'table', { 'column' =&gt; 'value', ... };</PRE>
-<PRE>
-    $table = $record-&gt;table;
-    $dbdef_table = $record-&gt;dbdef_table;</PRE>
-<PRE>
-    $value = $record-&gt;get('column');
-    $value = $record-&gt;getfield('column');
-    $value = $record-&gt;column;</PRE>
-<PRE>
-    $record-&gt;set( 'column' =&gt; 'value' );
-    $record-&gt;setfield( 'column' =&gt; 'value' );
-    $record-&gt;column('value');</PRE>
-<PRE>
-    %hash = $record-&gt;hash;</PRE>
-<PRE>
-    $hashref = $record-&gt;hashref;</PRE>
-<PRE>
-    $error = $record-&gt;insert;
-    #$error = $record-&gt;add; #depriciated</PRE>
-<PRE>
-    $error = $record-&gt;delete;
-    #$error = $record-&gt;del; #depriciated</PRE>
-<PRE>
-    $error = $new_record-&gt;replace($old_record);
-    #$error = $new_record-&gt;rep($old_record); #depriciated</PRE>
-<PRE>
-    $value = $record-&gt;unique('column');</PRE>
-<PRE>
-    $error = $record-&gt;ut_float('column');
-    $error = $record-&gt;ut_number('column');
-    $error = $record-&gt;ut_numbern('column');
-    $error = $record-&gt;ut_money('column');
-    $error = $record-&gt;ut_text('column');
-    $error = $record-&gt;ut_textn('column');
-    $error = $record-&gt;ut_alpha('column');
-    $error = $record-&gt;ut_alphan('column');
-    $error = $record-&gt;ut_phonen('column');
-    $error = $record-&gt;ut_anything('column');
-    $error = $record-&gt;ut_name('column');</PRE>
-<PRE>
-    $dbdef = reload_dbdef;
-    $dbdef = reload_dbdef &quot;/non/standard/filename&quot;;
-    $dbdef = dbdef;</PRE>
-<PRE>
-    $quoted_value = _quote($value,'table','field');</PRE>
-<PRE>
-    #depriciated
-    $fields = hfields('table');
-    if ( $fields-&gt;{Field} ) { # etc.</PRE>
-<PRE>
-    @fields = fields 'table'; #as a subroutine
-    @fields = $record-&gt;fields; #as a method call</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>(Mostly) object-oriented interface to database records.  Records are currently
-implemented on top of DBI.  FS::Record is intended as a base class for
-table-specific classes to inherit from, i.e. FS::cust_main.</P>
-<P>
-<HR>
-<H1><A NAME="constructors">CONSTRUCTORS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new_%5B_TABLE%2C_%5D_HASHREF">new [ TABLE, ] HASHREF</A></STRONG><BR>
-<DD>
-Creates a new record.  It doesn't store it in the database, though.  See
-<A HREF="#insert">insert</A> for that.
-<P>Note that the object stores this hash reference, not a distinct copy of the
-hash it points to.  You can ask the object for a copy with the <EM>hash</EM> 
-method.</P>
-<P>TABLE can only be omitted when a dervived class overrides the table method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_qsearch_TABLE%2C_HASHREF%2C_SELECT%2C_EXTRA_SQL">qsearch TABLE, HASHREF, SELECT, EXTRA_SQL</A></STRONG><BR>
-<DD>
-Searches the database for all records matching (at least) the key/value pairs
-in HASHREF.  Returns all the records found as `FS::TABLE' objects if that
-module is loaded (i.e. via `use FS::cust_main;'), otherwise returns FS::Record
-objects.
-<P>###oops, argh, FS::Record::new only lets us create database fields.
-#Normal behaviour if SELECT is not specified is `*', as in
-#<CODE>SELECT * FROM table WHERE ...</CODE>.  However, there is an experimental new
-#feature where you can specify SELECT - remember, the objects returned,
-#although blessed into the appropriate `FS::TABLE' package, will only have the
-#fields you specify.  This might have unwanted results if you then go calling
-#regular FS::TABLE methods
-#on it.</P>
-<P></P>
-<DT><STRONG><A NAME="item_jsearch_TABLE%2C_HASHREF%2C_SELECT%2C_EXTRA_SQL%2C">jsearch TABLE, HASHREF, SELECT, EXTRA_SQL, PRIMARY_TABLE, PRIMARY_KEY</A></STRONG><BR>
-<DD>
-Experimental JOINed search method.  Using this method, you can execute a
-single SELECT spanning multiple tables, and cache the results for subsequent
-method calls.  Interface will almost definately change in an incompatible
-fashion.
-<P>Arguments:</P>
-<P></P>
-<DT><STRONG><A NAME="item_qsearchs">qsearchs TABLE, HASHREF</A></STRONG><BR>
-<DD>
-Same as qsearch, except that if more than one record matches, it <STRONG>carp</STRONG>s but
-returns the first.  If this happens, you either made a logic error in asking
-for a single item, or your data is corrupted.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_table">table</A></STRONG><BR>
-<DD>
-Returns the table name.
-<P></P>
-<DT><STRONG><A NAME="item_dbdef_table">dbdef_table</A></STRONG><BR>
-<DD>
-Returns the FS::dbdef_table object for the table.
-<P></P>
-<DT><STRONG><A NAME="item_get%2C_getfield_COLUMN">get, getfield COLUMN</A></STRONG><BR>
-<DD>
-Returns the value of the column/field/key COLUMN.
-<P></P>
-<DT><STRONG><A NAME="item_set%2C_setfield_COLUMN%2C_VALUE">set, setfield COLUMN, VALUE</A></STRONG><BR>
-<DD>
-Sets the value of the column/field/key COLUMN to VALUE.  Returns VALUE.
-<P></P>
-<DT><STRONG><A NAME="item_AUTLOADED_METHODS">AUTLOADED METHODS</A></STRONG><BR>
-<DD>
-$record-&gt;column is a synonym for $record-&gt;get('column');
-<P>$record-&gt;<CODE>column('value')</CODE> is a synonym for $record-&gt;set('column','value');</P>
-<P></P>
-<DT><STRONG><A NAME="item_hash">hash</A></STRONG><BR>
-<DD>
-Returns a list of the column/value pairs, usually for assigning to a new hash.
-<P>To make a distinct duplicate of an FS::Record object, you can do:</P>
-<PRE>
-    $new = new FS::Record ( $old-&gt;table, { $old-&gt;hash } );</PRE>
-<P></P>
-<DT><STRONG><A NAME="item_hashref">hashref</A></STRONG><BR>
-<DD>
-Returns a reference to the column/value hash.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Inserts this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_add">add</A></STRONG><BR>
-<DD>
-Depriciated (use insert instead).
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Delete this record from the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_del">del</A></STRONG><BR>
-<DD>
-Depriciated (use delete instead).
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replace the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_rep">rep</A></STRONG><BR>
-<DD>
-Depriciated (use replace instead).
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Not yet implemented, croaks.  Derived classes should provide a check method.
-<P></P>
-<DT><STRONG><A NAME="item_unique">unique COLUMN</A></STRONG><BR>
-<DD>
-Replaces COLUMN in record with a unique number.  Called by the <STRONG>add</STRONG> method
-on primary keys and single-field unique columns (see <A HREF="../DBIx/DBSchema/Table.html">the DBIx::DBSchema::Table manpage</A>).
-Returns the new value.
-<P></P>
-<DT><STRONG><A NAME="item_ut_float_COLUMN">ut_float COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint floating point numeric data: 1.1, 1, 1.1e10, 1e10.  May not be
-null.  If there is an error, returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_ut_number_COLUMN">ut_number COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint simple numeric data (whole numbers).  May not be null.  If there
-is an error, returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_ut_numbern_COLUMN">ut_numbern COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint simple numeric data (whole numbers).  May be null.  If there is
-an error, returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_ut_money_COLUMN">ut_money COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint monetary numbers.  May be negative.  Set to 0 if null.  If there
-is an error, returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_ut_text_COLUMN">ut_text COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint text.  Alphanumerics, spaces, and the following punctuation
-symbols are currently permitted: ! @ # $ % &amp; ( ) - + ; : ' `` , . ? /
-May not be null.  If there is an error, returns the error, otherwise returns
-false.
-<P></P>
-<DT><STRONG><A NAME="item_ut_textn_COLUMN">ut_textn COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint text.  Alphanumerics, spaces, and the following punctuation
-symbols are currently permitted: ! @ # $ % &amp; ( ) - + ; : ' `` , . ? /
-May be null.  If there is an error, returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_ut_alpha_COLUMN">ut_alpha COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint alphanumeric strings (no spaces).  May not be null.  If there is
-an error, returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG>ut_alpha COLUMN</STRONG><BR>
-<DD>
-Check/untaint alphanumeric strings (no spaces).  May be null.  If there is an
-error, returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_ut_phonen_COLUMN_%5B_COUNTRY_%5D">ut_phonen COLUMN [ COUNTRY ]</A></STRONG><BR>
-<DD>
-Check/untaint phone numbers.  May be null.  If there is an error, returns
-the error, otherwise returns false.
-<P>Takes an optional two-letter ISO country code; without it or with unsupported
-countries, ut_phonen simply calls ut_alphan.</P>
-<P></P>
-<DT><STRONG><A NAME="item_ut_ip_COLUMN">ut_ip COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint ip addresses.  IPv4 only for now.
-<P></P>
-<DT><STRONG><A NAME="item_ut_ipn_COLUMN">ut_ipn COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint ip addresses.  IPv4 only for now.  May be null.
-<P></P>
-<DT><STRONG><A NAME="item_ut_domain_COLUMN">ut_domain COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint host and domain names.
-<P></P>
-<DT><STRONG><A NAME="item_ut_name_COLUMN">ut_name COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint proper names; allows alphanumerics, spaces and the following
-punctuation: , . - '
-<P>May not be null.</P>
-<P></P>
-<DT><STRONG><A NAME="item_ut_zip_COLUMN">ut_zip COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint zip codes.
-<P></P>
-<DT><STRONG><A NAME="item_ut_country_COLUMN">ut_country COLUMN</A></STRONG><BR>
-<DD>
-Check/untaint country codes.  Country names are changed to codes, if possible -
-see <A HREF="../Locale/Country.html">the Locale::Country manpage</A>.
-<P></P>
-<DT><STRONG><A NAME="item_ut_anything_COLUMN">ut_anything COLUMN</A></STRONG><BR>
-<DD>
-Untaints arbitrary data.  Be careful.
-<P></P>
-<DT><STRONG><A NAME="item_ut_enum_COLUMN_CHOICES_ARRAYREF">ut_enum COLUMN CHOICES_ARRAYREF</A></STRONG><BR>
-<DD>
-Check/untaint a column, supplying all possible choices, like the ``enum'' type.
-<P></P>
-<DT><STRONG><A NAME="item_fields_%5B_TABLE_%5D">fields [ TABLE ]</A></STRONG><BR>
-<DD>
-This can be used as both a subroutine and a method call.  It returns a list
-of the columns in this record's table, or an explicitly specified table.
-(See <A HREF="../DBIx/DBSchema/Table.html">the DBIx::DBSchema::Table manpage</A>).
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="subroutines">SUBROUTINES</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_reload_dbdef"><CODE>reload_dbdef([FILENAME])</CODE></A></STRONG><BR>
-<DD>
-Load a database definition (see <A HREF="../DBIx/DBSchema.html">the DBIx::DBSchema manpage</A>), optionally from a
-non-default filename.  This command is executed at startup unless
-<EM>$FS::Record::setup_hack</EM> is true.  Returns a DBIx::DBSchema object.
-<P></P>
-<DT><STRONG><A NAME="item_dbdef">dbdef</A></STRONG><BR>
-<DD>
-Returns the current database definition.  See <A HREF="../FS/dbdef.html">the FS::dbdef manpage</A>.
-<P></P>
-<DT><STRONG><A NAME="item__quote_VALUE%2C_TABLE%2C_COLUMN">_quote VALUE, TABLE, COLUMN</A></STRONG><BR>
-<DD>
-This is an internal function used to construct SQL statements.  It returns
-VALUE DBI-quoted (see <EM>DBI/``quote''</EM>) unless VALUE is a number and the column
-type (see <A HREF="../FS/dbdef_column.html">the FS::dbdef_column manpage</A>) does not end in `char' or `binary'.
-<P></P>
-<DT><STRONG><A NAME="item_hfields">hfields TABLE</A></STRONG><BR>
-<DD>
-This is depriciated.  Don't use it.
-<P>It returns a hash-type list with the fields of this record's table set true.</P>
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>This module should probably be renamed, since much of the functionality is
-of general use.  It is not completely unlike Adapter::DBI (see below).</P>
-<P>Exported qsearch and qsearchs should be depriciated in favor of method calls
-(against an FS::Record object like the old search and searchs that qsearch
-and qsearchs were on top of.)</P>
-<P>The whole fields / hfields mess should be removed.</P>
-<P>The various WHERE clauses should be subroutined.</P>
-<P>table string should be depriciated in favor of FS::dbdef_table.</P>
-<P>No doubt we could benefit from a Tied hash.  Documenting how exists / defined
-true maps to the database (and WHERE clauses) would also help.</P>
-<P>The ut_ methods should ask the dbdef for a default length.</P>
-<P>ut_sqltype (like ut_varchar) should all be defined</P>
-<P>A fallback check method should be provided which uses the dbdef.</P>
-<P>The ut_money method assumes money has two decimal digits.</P>
-<P>The Pg money kludge in the new method only strips `$'.</P>
-<P>The ut_phonen method only checks US-style phone numbers.</P>
-<P>The _quote function should probably use ut_float instead of a regex.</P>
-<P>All the subroutines probably should be methods, here or elsewhere.</P>
-<P>Probably should borrow/use some dbdef methods where appropriate (like sub
-fields)</P>
-<P>As of 1.14, DBI fetchall_hashref( {} ) doesn't set fetchrow_hashref NAME_lc,
-or allow it to be set.  Working around it is ugly any way around - DBI should
-be fixed.  (only affects RDBMS which return uppercase column names)</P>
-<P>ut_zip should take an optional country like ut_phone.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF="../DBIx/DBSchema.html">the DBIx::DBSchema manpage</A>, <A HREF=".././FS/UID.html">the FS::UID manpage</A>, <EM>DBI</EM></P>
-<P>Adapter::DBI from Ch. 11 of Advanced Perl Programming by Sriram Srinivasan.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/SessionClient.html b/httemplate/docs/man/FS/SessionClient.html
deleted file mode 100644
index 0abb2a6a1..000000000
--- a/httemplate/docs/man/FS/SessionClient.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::SessionClient - Freeside session client API</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::SessionClient - Freeside session client API</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::SessionClient qw( login portnum logout );</PRE>
-<PRE>
-  $error = login ( {
-    'username' =&gt; $username,
-    'password' =&gt; $password,
-    'login'    =&gt; $timestamp,
-    'portnum'  =&gt; $portnum,
-  } );</PRE>
-<PRE>
-  $portnum = portnum( { 'ip' =&gt; $ip } ) or die &quot;unknown ip!&quot;
-  $portnum = portnum( { 'nasnum' =&gt; $nasnum, 'nasport' =&gt; $nasport } )
-    or die &quot;unknown nasnum/nasport&quot;;</PRE>
-<PRE>
-  $error = logout ( {
-    'username' =&gt; $username,
-    'password' =&gt; $password,
-    'logout'   =&gt; $timestamp,
-    'portnum'  =&gt; $portnum,
-  } );</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>This modules provides an API for a remote session application.</P>
-<P>It needs to be run as the freeside user.  Because of this, the program which
-calls these subroutines should be written very carefully.</P>
-<P>
-<HR>
-<H1><A NAME="subroutines">SUBROUTINES</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_login">login HASHREF</A></STRONG><BR>
-<DD>
-HASHREF should have the following keys: username, password, login and portnum.
-login is a UNIX timestamp; if not specified, will default to the current time.
-Starts a new session for the specified user and portnum.  The password is
-optional, but must be correct if specified.
-<P>Returns a scalar error message, or the empty string for success.</P>
-<P></P>
-<DT><STRONG><A NAME="item_portnum">portnum</A></STRONG><BR>
-<DD>
-HASHREF should contain a single key: ip, or the two keys: nasnum and nasport.
-Returns a portnum suitable for the login and logout subroutines, or false
-on error.
-<P></P>
-<DT><STRONG><A NAME="item_logout">logout HASHREF</A></STRONG><BR>
-<DD>
-HASHREF should have the following keys: usrename, password, logout and portnum.
-logout is a UNIX timestamp; if not specified, will default to the current time.
-Starts a new session for the specified user and portnum.  The password is
-optional, but must be correct if specified.
-<P>Returns a scalar error message, or the empty string for success.</P>
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: SessionClient.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><EM>fs_sessiond</EM></P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/SignupClient.html b/httemplate/docs/man/FS/SignupClient.html
deleted file mode 100644
index 3438c804a..000000000
--- a/httemplate/docs/man/FS/SignupClient.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::SignupClient - Freeside signup client API</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::SignupClient - Freeside signup client API</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::SignupClient qw( signup_info new_customer );</PRE>
-<PRE>
-  ( $locales, $packages, $pops ) = signup_info;</PRE>
-<PRE>
-  $error = new_customer ( {
-    'first'            =&gt; $first,
-    'last'             =&gt; $last,
-    'ss'               =&gt; $ss,
-    'comapny'          =&gt; $company,
-    'address1'         =&gt; $address1,
-    'address2'         =&gt; $address2,
-    'city'             =&gt; $city,
-    'county'           =&gt; $county,
-    'state'            =&gt; $state,
-    'zip'              =&gt; $zip,
-    'country'          =&gt; $country,
-    'daytime'          =&gt; $daytime,
-    'night'            =&gt; $night,
-    'fax'              =&gt; $fax,
-    'payby'            =&gt; $payby,
-    'payinfo'          =&gt; $payinfo,
-    'paydate'          =&gt; $paydate,
-    'payname'          =&gt; $payname,
-    'invoicing_list'   =&gt; $invoicing_list,
-    'referral_custnum' =&gt; $referral_custnum,
-    'pkgpart'          =&gt; $pkgpart,
-    'username'         =&gt; $username,
-    '_password'        =&gt; $password,
-    'popnum'           =&gt; $popnum,
-  } );</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>This module provides an API for a remote signup server.</P>
-<P>It needs to be run as the freeside user.  Because of this, the program which
-calls these subroutines should be written very carefully.</P>
-<P>
-<HR>
-<H1><A NAME="subroutines">SUBROUTINES</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_signup_info">signup_info</A></STRONG><BR>
-<DD>
-Returns three array references of hash references.
-<P>The first set of hash references is of allowable locales.  Each hash reference
-has the following keys:
-  taxnum
-  state
-  county
-  country</P>
-<P>The second set of hash references is of allowable packages.  Each hash
-reference has the following keys:
-  pkgpart
-  pkg</P>
-<P>The third set of hash references is of allowable POPs (Points Of Presence).
-Each hash reference has the following keys:
-  popnum
-  city
-  state
-  ac
-  exch</P>
-<P></P>
-<DT><STRONG><A NAME="item_new_customer_HASHREF">new_customer HASHREF</A></STRONG><BR>
-<DD>
-Adds a customer to the remote Freeside system.  Requires a hash reference as
-a paramater with the following keys:
-  first
-  last
-  ss
-  comapny
-  address1
-  address2
-  city
-  county
-  state
-  zip
-  country
-  daytime
-  night
-  fax
-  payby
-  payinfo
-  paydate
-  payname
-  invoicing_list
-  referral_custnum
-  pkgpart
-  username
-  _password
-  popnum
-<P>Returns a scalar error message, or the empty string for success.</P>
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><EM>fs_signupd</EM>, <A HREF="../FS/SignupServer.html">the FS::SignupServer manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A></P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/UI/Base.html b/httemplate/docs/man/FS/UI/Base.html
deleted file mode 100644
index 445fd0d0b..000000000
--- a/httemplate/docs/man/FS/UI/Base.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::UI::Base - Base class for all user-interface objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-	<LI><A HREF="#history">HISTORY</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::UI::Base - Base class for all user-interface objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::UI::SomeInterface;
-  use FS::UI::some_table;</PRE>
-<PRE>
-  $interface = new FS::UI::some_table;</PRE>
-<PRE>
-  $error = $interface-&gt;browse;
-  $error = $interface-&gt;search;
-  $error = $interface-&gt;view;
-  $error = $interface-&gt;edit;
-  $error = $interface-&gt;process;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::UI::Base object represents a user interface object.  FS::UI::Base
-is intended as a base class for table-specfic classes to inherit from, i.e.
-FS::UI::cust_main.  The simplest case, which will provide a default UI for your
-new table, is as follows:</P>
-<PRE>
-  package FS::UI::table_name;
-  use vars qw ( @ISA );
-  use FS::UI::Base;
-  @ISA = qw( FS::UI::Base );
-  sub db_table { 'table_name'; }</PRE>
-<P>Currently available interfaces are:
-  FS::UI::Gtk, an X-Windows UI implemented using the Gtk+ toolkit
-  FS::UI::CGI, a web interface implemented using CGI.pm, etc.</P>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_browse">browse</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_title">title</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_addwidget">addwidget</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: Base.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>This documentation is incomplete.</P>
-<P>There should be some sort of per-(freeside)-user preferences and the ability
-for specific FS::UI:: modules to put their own values there as well.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF="../.././FS/UI/Gtk.html">the FS::UI::Gtk manpage</A>, <A HREF="../.././FS/UI/CGI.html">the FS::UI::CGI manpage</A></P>
-<P>
-<HR>
-<H1><A NAME="history">HISTORY</A></H1>
-<P>$Log: Base.html,v $
-<P>Revision 1.3  2002-01-29 17:42:46  ivan
-<P>weight, plan and plandata fields in part_bill_event
-<P>
-Revision 1.1  1999/08/04 09:03:53  ivan
-initial checkin of module files for proper perl installation</P>
-<P>Revision 1.1  1999/01/20 09:30:36  ivan
-skeletal cross-UI UI code.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/UI/CGI.html b/httemplate/docs/man/FS/UI/CGI.html
deleted file mode 100644
index 22b6c76b8..000000000
--- a/httemplate/docs/man/FS/UI/CGI.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::UI::CGI - Base class for CGI user-interface objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-	<LI><A HREF="#history">HISTORY</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::UI::CGI - Base class for CGI user-interface objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::UI::CGI;
-  use FS::UI::some_table;</PRE>
-<PRE>
-  $interface = new FS::UI::some_table;</PRE>
-<PRE>
-  $error = $interface-&gt;browse;
-  $error = $interface-&gt;search;
-  $error = $interface-&gt;view;
-  $error = $interface-&gt;edit;
-  $error = $interface-&gt;process;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::UI::CGI object represents a CGI interface object.</P>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item__header">_header</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item__footer">_footer</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_interface">interface</A></STRONG><BR>
-<DD>
-Returns the string `CGI'.  Useful for the author of a table-specific UI class
-to conditionally specify certain behaviour.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: CGI.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>This documentation is incomplete.</P>
-<P>In _Tableborder, headers should be links that sort on their fields.</P>
-<P>_Link uses a constant $BASE_URL</P>
-<P>_Link passes the arguments as a manually-constructed GET string instead
-of POSTing, for compatability while the web interface is upgraded.  Once
-this is done it should pass arguements properly (i.e. as a POST, 8-bit clean)</P>
-<P>Still some small bits of widget code same as FS::UI::Gtk.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF="../.././FS/UI/Base.html">the FS::UI::Base manpage</A></P>
-<P>
-<HR>
-<H1><A NAME="history">HISTORY</A></H1>
-<P>$Log: CGI.html,v $
-<P>Revision 1.3  2002-01-29 17:42:46  ivan
-<P>weight, plan and plandata fields in part_bill_event
-<P>
-Revision 1.1  1999/08/04 09:03:53  ivan
-initial checkin of module files for proper perl installation</P>
-<P>Revision 1.1  1999/01/20 09:30:36  ivan
-skeletal cross-UI UI code.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/UI/Gtk.html b/httemplate/docs/man/FS/UI/Gtk.html
deleted file mode 100644
index 6f203c7bb..000000000
--- a/httemplate/docs/man/FS/UI/Gtk.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::UI::Gtk - Base class for Gtk user-interface objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-	<LI><A HREF="#history">HISTORY</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::UI::Gtk - Base class for Gtk user-interface objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::UI::Gtk;
-  use FS::UI::some_table;</PRE>
-<PRE>
-  $interface = new FS::UI::some_table;</PRE>
-<PRE>
-  $error = $interface-&gt;browse;
-  $error = $interface-&gt;search;
-  $error = $interface-&gt;view;
-  $error = $interface-&gt;edit;
-  $error = $interface-&gt;process;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::UI::Gtk object represents a Gtk user interface object.</P>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_interface">interface</A></STRONG><BR>
-<DD>
-Returns the string `Gtk'.  Useful for the author of a table-specific UI class
-to conditionally specify certain behaviour.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: Gtk.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>This documentation is incomplete.</P>
-<P>_Tableborder is just a _Table now.  _Tableborders should scroll (but not the
-headers) and need and need more decoration. (data in white section ala gtksql
-and sliding field widths) headers should be buttons that callback to sort on
-their fields.</P>
-<P>There should be a persistant, per-(freeside)-user store for window positions
-and sizes and sort fields etc (see <A HREF="../.././FS/UI/CGI.html#bugs">BUGS in the FS::UI::CGI manpage</A>.</P>
-<P>Still some small bits of widget code same as FS::UI::CGI.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF="../.././FS/UI/Base.html">the FS::UI::Base manpage</A></P>
-<P>
-<HR>
-<H1><A NAME="history">HISTORY</A></H1>
-<P>$Log: Gtk.html,v $
-<P>Revision 1.3  2002-01-29 17:42:46  ivan
-<P>weight, plan and plandata fields in part_bill_event
-<P>
-Revision 1.1  1999/08/04 09:03:53  ivan
-initial checkin of module files for proper perl installation</P>
-<P>Revision 1.1  1999/01/20 09:30:36  ivan
-skeletal cross-UI UI code.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/UI/agent.html b/httemplate/docs/man/FS/UI/agent.html
deleted file mode 100644
index 8608e4ef4..000000000
--- a/httemplate/docs/man/FS/UI/agent.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>./FS/FS/UI/agent.pm</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-<!-- INDEX END -->
-
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/UID.html b/httemplate/docs/man/FS/UID.html
deleted file mode 100644
index 3c28eebfd..000000000
--- a/httemplate/docs/man/FS/UID.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::UID - Subroutines for database login and assorted other stuff</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
-	<LI><A HREF="#callbacks">CALLBACKS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::UID - Subroutines for database login and assorted other stuff</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::UID qw(adminsuidsetup cgisuidsetup dbh datasrc getotaker
-  checkeuid checkruid);</PRE>
-<PRE>
-  adminsuidsetup $user;</PRE>
-<PRE>
-  $cgi = new CGI;
-  $dbh = cgisuidsetup($cgi);</PRE>
-<PRE>
-  $dbh = dbh;</PRE>
-<PRE>
-  $datasrc = datasrc;</PRE>
-<PRE>
-  $driver_name = driver_name;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>Provides a hodgepodge of subroutines.</P>
-<P>
-<HR>
-<H1><A NAME="subroutines">SUBROUTINES</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_adminsuidsetup">adminsuidsetup USER</A></STRONG><BR>
-<DD>
-Sets the user to USER (see config.html from the base documentation).
-Cleans the environment.
-Make sure the script is running as freeside, or setuid freeside.
-Opens a connection to the database.
-Swaps real and effective UIDs.
-Runs any defined callbacks (see below).
-Returns the DBI database handle (usually you don't need this).
-<P></P>
-<DT><STRONG><A NAME="item_cgisuidsetup_CGI_object">cgisuidsetup CGI_object</A></STRONG><BR>
-<DD>
-Takes a single argument, which is a CGI (see <A HREF=".././FS/CGI.html">the CGI manpage</A>) or Apache (see <EM>Apache</EM>)
-object (CGI::Base is depriciated).  Runs cgisetotaker and then adminsuidsetup.
-<P></P>
-<DT><STRONG><A NAME="item_cgi">cgi</A></STRONG><BR>
-<DD>
-Returns the CGI (see <A HREF=".././FS/CGI.html">the CGI manpage</A>) object.
-<P></P>
-<DT><STRONG><A NAME="item_dbh">dbh</A></STRONG><BR>
-<DD>
-Returns the DBI database handle.
-<P></P>
-<DT><STRONG><A NAME="item_datasrc">datasrc</A></STRONG><BR>
-<DD>
-Returns the DBI data source.
-<P></P>
-<DT><STRONG><A NAME="item_driver_name">driver_name</A></STRONG><BR>
-<DD>
-Returns just the driver name portion of the DBI data source.
-<P></P>
-<DT><STRONG><A NAME="item_getotaker">getotaker</A></STRONG><BR>
-<DD>
-Returns the current Freeside user.
-<P></P>
-<DT><STRONG><A NAME="item_cgisetotaker">cgisetotaker</A></STRONG><BR>
-<DD>
-Sets and returns the CGI REMOTE_USER.  $cgi should be defined as a CGI.pm
-object (see <A HREF=".././FS/CGI.html">the CGI manpage</A>) or an Apache object (see <EM>Apache</EM>).  Support for CGI::Base
-and derived classes is depriciated.
-<P></P>
-<DT><STRONG><A NAME="item_checkeuid">checkeuid</A></STRONG><BR>
-<DD>
-Returns true if effective UID is that of the freeside user.
-<P></P>
-<DT><STRONG><A NAME="item_checkruid">checkruid</A></STRONG><BR>
-<DD>
-Returns true if the real UID is that of the freeside user.
-<P></P>
-<DT><STRONG><A NAME="item_getsecrets_%5B_USER_%5D">getsecrets [ USER ]</A></STRONG><BR>
-<DD>
-Sets the user to USER, if supplied.
-Sets and returns the DBI datasource, username and password for this user from
-the `/usr/local/etc/freeside/mapsecrets' file.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="callbacks">CALLBACKS</A></H1>
-<P>Warning: this interface is likely to change in future releases.</P>
-<P>A package can install a callback to be run in adminsuidsetup by putting a
-coderef into the hash %FS::UID::callback :</P>
-<PRE>
-    $coderef = sub { warn &quot;Hi, I'm returning your call!&quot; };
-    $FS::UID::callback{'Package::Name'};</PRE>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: UID.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>Too many package-global variables.</P>
-<P>Not OO.</P>
-<P>No capabilities yet.  When mod_perl and Authen::DBI are implemented, 
-cgisuidsetup will go away as well.</P>
-<P>Goes through contortions to support non-OO syntax with multiple datasrc's.</P>
-<P>Callbacks are inelegant.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/CGI.html">the CGI manpage</A>, <EM>DBI</EM>, config.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/agent.html b/httemplate/docs/man/FS/agent.html
deleted file mode 100644
index a660ed427..000000000
--- a/httemplate/docs/man/FS/agent.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::agent - Object methods for agent records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::agent - Object methods for agent records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::agent;</PRE>
-<PRE>
-  $record = new FS::agent \%hash;
-  $record = new FS::agent { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $agent_type = $record-&gt;agent_type;</PRE>
-<PRE>
-  $hashref = $record-&gt;pkgpart_hashref;
-  #may purchase $pkgpart if $hashref-&gt;{$pkgpart};</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::agent object represents an agent.  Every customer has an agent.  Agents
-can be used to track things like resellers or salespeople.  FS::agent inherits
-from FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">agemtnum - primary key (assigned automatically for new agents)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_agent_%2D_Text_name_of_this_agent">agent - Text name of this agent</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_typenum_%2D_Agent_type%2E_See_FS%3A%3Aagent_type">typenum - Agent type.  See <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A></A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_prog_%2D_For_future_use%2E">prog - For future use.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_freq_%2D_For_future_use%2E">freq - For future use.</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new agent.  To add the agent to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this agent to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this agent from the database.  Only agents with no customers can be
-deleted.  If there is an error, returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid agent.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-<P></P>
-<DT><STRONG><A NAME="item_agent_type">agent_type</A></STRONG><BR>
-<DD>
-Returns the FS::agent_type object (see <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A>) for this agent.
-<P></P>
-<DT><STRONG><A NAME="item_pkgpart_hashref">pkgpart_hashref</A></STRONG><BR>
-<DD>
-Returns a hash reference.  The keys of the hash are pkgparts.  The value is
-true if this agent may purchase the specified package definition.  See
-<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: agent.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, 
-schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/agent_type.html b/httemplate/docs/man/FS/agent_type.html
deleted file mode 100644
index 40552d6d3..000000000
--- a/httemplate/docs/man/FS/agent_type.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::agent_type - Object methods for agent_type records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::agent_type - Object methods for agent_type records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::agent_type;</PRE>
-<PRE>
-  $record = new FS::agent_type \%hash;
-  $record = new FS::agent_type { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $hashref = $record-&gt;pkgpart_hashref;
-  #may purchase $pkgpart if $hashref-&gt;{$pkgpart};</PRE>
-<PRE>
-  @type_pkgs = $record-&gt;type_pkgs;</PRE>
-<PRE>
-  @pkgparts = $record-&gt;pkgpart;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::agent_type object represents an agent type.  Every agent (see
-<A HREF=".././FS/agent.html">the FS::agent manpage</A>) has an agent type.  Agent types define which packages (see
-<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>) may be purchased by customers (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>), via 
-FS::type_pkgs records (see <A HREF=".././FS/type_pkgs.html">the FS::type_pkgs manpage</A>).  FS::agent_type inherits from
-FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">typenum - primary key (assigned automatically for new agent types)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_atype_%2D_Text_name_of_this_agent_type">atype - Text name of this agent type</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new agent type.  To add the agent type to the database, see
-<A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this agent type to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this agent type from the database.  Only agent types with no agents
-can be deleted.  If there is an error, returns the error, otherwise returns
-false.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid agent type.  If there is an
-error, returns the error, otherwise returns false.  Called by the insert and
-replace methods.
-<P></P>
-<DT><STRONG><A NAME="item_pkgpart_hashref">pkgpart_hashref</A></STRONG><BR>
-<DD>
-Returns a hash reference.  The keys of the hash are pkgparts.  The value is
-true iff this agent may purchase the specified package definition.  See
-<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>.
-<P></P>
-<DT><STRONG><A NAME="item_type_pkgs">type_pkgs</A></STRONG><BR>
-<DD>
-Returns all FS::type_pkgs objects (see <A HREF=".././FS/type_pkgs.html">the FS::type_pkgs manpage</A>) for this agent type.
-<P></P>
-<DT><STRONG><A NAME="item_pkgpart">pkgpart</A></STRONG><BR>
-<DD>
-Returns the pkgpart of all package definitions (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>) for this
-agent type.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: agent_type.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/agent.html">the FS::agent manpage</A>, <A HREF=".././FS/type_pkgs.html">the FS::type_pkgs manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>,
-<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/cust_bill.html b/httemplate/docs/man/FS/cust_bill.html
deleted file mode 100644
index 8bdb87b56..000000000
--- a/httemplate/docs/man/FS/cust_bill.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_bill - Object methods for cust_bill records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_bill - Object methods for cust_bill records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_bill;</PRE>
-<PRE>
-  $record = new FS::cust_bill \%hash;
-  $record = new FS::cust_bill { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  ( $total_previous_balance, @previous_cust_bill ) = $record-&gt;previous;</PRE>
-<PRE>
-  @cust_bill_pkg_objects = $cust_bill-&gt;cust_bill_pkg;</PRE>
-<PRE>
-  ( $total_previous_credits, @previous_cust_credit ) = $record-&gt;cust_credit;</PRE>
-<PRE>
-  @cust_pay_objects = $cust_bill-&gt;cust_pay;</PRE>
-<PRE>
-  $tax_amount = $record-&gt;tax;</PRE>
-<PRE>
-  @lines = $cust_bill-&gt;print_text;
-  @lines = $cust_bill-&gt;print_text $time;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_bill object represents an invoice; a declaration that a customer
-owes you money.  The specific charges are itemized as <STRONG>cust_bill_pkg</STRONG> records
-(see <A HREF=".././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A>).  FS::cust_bill inherits from FS::Record.  The
-following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">invnum - primary key (assigned automatically for new invoices)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_customer">custnum - customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item__date_%2D_specified_as_a_UNIX_timestamp%3B_see_per">_date - specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
-<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_charged_%2D_amount_of_this_invoice">charged - amount of this invoice</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_automatically">printed - how many times this invoice has been printed automatically
-(see <A HREF=".././FS/cust_main.html#collect">collect in the FS::cust_main manpage</A>).</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_closed_%2D_books_closed_flag%2C_empty_or_%60Y%27">closed - books closed flag, empty or `Y'</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new invoice.  To add the invoice to the database, see <A HREF="#insert">insert</A>.
-Invoices are normally created by calling the bill method of a customer object
-(see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this invoice to the database (``Posts'' the invoice).  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Currently unimplemented.  I don't remove invoices because there would then be
-no record you ever posted this invoice (which is bad, no?)
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P>Only printed may be changed.  printed is normally updated by calling the
-collect method of a customer object (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid invoice.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-<P></P>
-<DT><STRONG><A NAME="item_previous">previous</A></STRONG><BR>
-<DD>
-Returns a list consisting of the total previous balance for this customer, 
-followed by the previous outstanding invoices (as FS::cust_bill objects also).
-<P></P>
-<DT><STRONG><A NAME="item_cust_bill_pkg">cust_bill_pkg</A></STRONG><BR>
-<DD>
-Returns the line items (see <A HREF=".././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A>) for this invoice.
-<P></P>
-<DT><STRONG><A NAME="item_cust_credit">cust_credit</A></STRONG><BR>
-<DD>
-Depreciated.  See the cust_credited method.
-<PRE>
- #Returns a list consisting of the total previous credited (see
- #L&lt;FS::cust_credit&gt;) and unapplied for this customer, followed by the previous
- #outstanding credits (FS::cust_credit objects).</PRE>
-<P></P>
-<DT><STRONG><A NAME="item_cust_pay">cust_pay</A></STRONG><BR>
-<DD>
-Depreciated.  See the cust_bill_pay method.
-<P>#Returns all payments (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>) for this invoice.</P>
-<P></P>
-<DT><STRONG><A NAME="item_cust_bill_pay">cust_bill_pay</A></STRONG><BR>
-<DD>
-Returns all payment applications (see <A HREF=".././FS/cust_bill_pay.html">the FS::cust_bill_pay manpage</A>) for this invoice.
-<P></P>
-<DT><STRONG><A NAME="item_cust_credited">cust_credited</A></STRONG><BR>
-<DD>
-Returns all applied credits (see <A HREF=".././FS/cust_credit_bill.html">the FS::cust_credit_bill manpage</A>) for this invoice.
-<P></P>
-<DT><STRONG><A NAME="item_tax">tax</A></STRONG><BR>
-<DD>
-Returns the tax amount (see <A HREF=".././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A>) for this invoice.
-<P></P>
-<DT><STRONG><A NAME="item_owed">owed</A></STRONG><BR>
-<DD>
-Returns the amount owed (still outstanding) on this invoice, which is charged
-minus all payment applications (see <A HREF=".././FS/cust_bill_pay.html">the FS::cust_bill_pay manpage</A>) and credit
-applications (see <A HREF=".././FS/cust_credit_bill.html">the FS::cust_credit_bill manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_print_text_%5BTIME%5D%3B">print_text [TIME];</A></STRONG><BR>
-<DD>
-Returns an text invoice, as a list of lines.
-<P>TIME an optional value used to control the printing of overdue messages.  The
-default is now.  It isn't the date of the invoice; that's the `_date' field.
-It is specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
-<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</P>
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_bill.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The delete method.</P>
-<P>print_text formatting (and some logic :/) is in source, but needs to be
-slurped in from a file.  Also number of lines ($=).</P>
-<P>missing print_ps for a nice postscript copy (maybe HylaFAX-cover-page-style
-or something similar so the look can be completely customized?)</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/cust_bill_pay.html">the FS::cust_bill_pay manpage</A>, <EM>FS:;cust_pay</EM>,
-<A HREF=".././FS/cust_bill_pkg.html">the FS::cust_bill_pkg manpage</A>, <A HREF="../FS/cust_bill_credit.html">the FS::cust_bill_credit manpage</A>, schema.html from the base
-documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/cust_bill_pkg.html b/httemplate/docs/man/FS/cust_bill_pkg.html
deleted file mode 100644
index 0557b4aee..000000000
--- a/httemplate/docs/man/FS/cust_bill_pkg.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_bill_pkg - Object methods for cust_bill_pkg records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_bill_pkg - Object methods for cust_bill_pkg records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_bill_pkg;</PRE>
-<PRE>
-  $record = new FS::cust_bill_pkg \%hash;
-  $record = new FS::cust_bill_pkg { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_bill_pkg object represents an invoice line item.
-FS::cust_bill_pkg inherits from FS::Record.  The following fields are currently
-supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_invoice">invnum - invoice (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_package">pkgnum - package (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) or 0 for the special virtual sales tax package</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_setup_%2D_setup_fee">setup - setup fee</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_recur_%2D_recurring_fee">recur - recurring fee</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_sdate_%2D_starting_date_of_recurring_fee">sdate - starting date of recurring fee</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_edate_%2D_ending_date_of_recurring_fee">edate - ending date of recurring fee</A></STRONG><BR>
-<DD>
-</DL>
-<P>sdate and edate are specified as UNIX timestamps; see <EM>perlfunc/``time''</EM>.  Also
-see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</P>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new line item.  To add the line item to the database, see
-<A HREF="#insert">insert</A>.  Line items are normally created by calling the bill method of a
-customer object (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this line item to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Currently unimplemented.  I don't remove line items because there would then be
-no record the items ever existed (which is bad, no?)
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Currently unimplemented.  This would be even more of an accounting nightmare
-than deleteing the items.  Just don't do it.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid line item.  If there is an
-error, returns the error, otherwise returns false.  Called by the insert
-method.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_bill_pkg.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, schema.html
-from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/cust_credit.html b/httemplate/docs/man/FS/cust_credit.html
deleted file mode 100644
index f30241371..000000000
--- a/httemplate/docs/man/FS/cust_credit.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_credit - Object methods for cust_credit records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_credit - Object methods for cust_credit records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_credit;</PRE>
-<PRE>
-  $record = new FS::cust_credit \%hash;
-  $record = new FS::cust_credit { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_credit object represents a credit; the equivalent of a negative
-<STRONG>cust_bill</STRONG> record (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>).  FS::cust_credit inherits from
-FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">crednum - primary key (assigned automatically for new credits)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_customer">custnum - customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_amount_%2D_amount_of_the_credit">amount - amount of the credit</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item__date_%2D_specified_as_a_UNIX_timestamp%3B_see_per">_date - specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
-<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_reason_%2D_text">reason - text</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_closed_%2D_books_closed_flag%2C_empty_or_%60Y%27">closed - books closed flag, empty or `Y'</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new credit.  To add the credit to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this credit to the database (``Posts'' the credit).  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Currently unimplemented.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Credits may not be modified; there would then be no record the credit was ever
-posted.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid credit.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-<P></P>
-<DT><STRONG><A NAME="item_cust_refund">cust_refund</A></STRONG><BR>
-<DD>
-Depreciated.  See the cust_credit_refund method.
-<P>#Returns all refunds (see <A HREF=".././FS/cust_refund.html">the FS::cust_refund manpage</A>) for this credit.</P>
-<P></P>
-<DT><STRONG><A NAME="item_cust_credit_refund">cust_credit_refund</A></STRONG><BR>
-<DD>
-Returns all refund applications (see <A HREF=".././FS/cust_credit_refund.html">the FS::cust_credit_refund manpage</A>) for this credit.
-<P></P>
-<DT><STRONG><A NAME="item_cust_credit_bill">cust_credit_bill</A></STRONG><BR>
-<DD>
-Returns all application to invoices (see <A HREF=".././FS/cust_credit_bill.html">the FS::cust_credit_bill manpage</A>) for this
-credit.
-<P></P>
-<DT><STRONG><A NAME="item_credited">credited</A></STRONG><BR>
-<DD>
-Returns the amount of this credit that is still outstanding; which is
-amount minus all refund applications (see <A HREF=".././FS/cust_credit_refund.html">the FS::cust_credit_refund manpage</A>) and
-applications to invoices (see <A HREF=".././FS/cust_credit_bill.html">the FS::cust_credit_bill manpage</A>).
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_credit.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The delete method.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_credit_refund.html">the FS::cust_credit_refund manpage</A>, <A HREF=".././FS/cust_refund.html">the FS::cust_refund manpage</A>,
-<A HREF=".././FS/cust_credit_bill.html">the FS::cust_credit_bill manpage</A> <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, schema.html from the base
-documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/cust_main.html b/httemplate/docs/man/FS/cust_main.html
deleted file mode 100644
index 1fb339124..000000000
--- a/httemplate/docs/man/FS/cust_main.html
+++ /dev/null
@@ -1,419 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_main - Object methods for cust_main records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_main - Object methods for cust_main records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_main;</PRE>
-<PRE>
-  $record = new FS::cust_main \%hash;
-  $record = new FS::cust_main { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  @cust_pkg = $record-&gt;all_pkgs;</PRE>
-<PRE>
-  @cust_pkg = $record-&gt;ncancelled_pkgs;</PRE>
-<PRE>
-  @cust_pkg = $record-&gt;suspended_pkgs;</PRE>
-<PRE>
-  $error = $record-&gt;bill;
-  $error = $record-&gt;bill %options;
-  $error = $record-&gt;bill 'time' =&gt; $time;</PRE>
-<PRE>
-  $error = $record-&gt;collect;
-  $error = $record-&gt;collect %options;
-  $error = $record-&gt;collect 'invoice_time'   =&gt; $time,
-                            'batch_card'     =&gt; 'yes',
-                            'report_badcard' =&gt; 'yes',
-                          ;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_main object represents a customer.  FS::cust_main inherits from 
-FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">custnum - primary key (assigned automatically for new customers)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_agent">agentnum - agent (see <A HREF=".././FS/agent.html">the FS::agent manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_referral">refnum - referral (see <A HREF=".././FS/part_referral.html">the FS::part_referral manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_first_%2D_name">first - name</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_last_%2D_name">last - name</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_number">ss - social security number (optional)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_company_%2D_%28optional%29">company - (optional)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_address1">address1</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_address2_%2D_%28optional%29">address2 - (optional)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_city">city</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_county_%2D_%28optional%2C_see_FS%3A%3Acust_main_co">county - (optional, see <A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_state_%2D_%28see_FS%3A%3Acust_main_county%29">state - (see <A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_zip">zip</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_country_%2D_%28see_FS%3A%3Acust_main_county%29">country - (see <A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_phone">daytime - phone (optional)</A></STRONG><BR>
-<DD>
-<DT><STRONG>night - phone (optional)</STRONG><BR>
-<DD>
-<DT><STRONG>fax - phone (optional)</STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_ship_first_%2D_name">ship_first - name</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_ship_last_%2D_name">ship_last - name</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_ship_company_%2D_%28optional%29">ship_company - (optional)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_ship_address1">ship_address1</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_ship_address2_%2D_%28optional%29">ship_address2 - (optional)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_ship_city">ship_city</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_ship_county_%2D_%28optional%2C_see_FS%3A%3Acust_ma">ship_county - (optional, see <A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_ship_state_%2D_%28see_FS%3A%3Acust_main_county%29">ship_state - (see <A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_ship_zip">ship_zip</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_ship_country_%2D_%28see_FS%3A%3Acust_main_county%2">ship_country - (see <A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG>ship_daytime - phone (optional)</STRONG><BR>
-<DD>
-<DT><STRONG>ship_night - phone (optional)</STRONG><BR>
-<DD>
-<DT><STRONG>ship_fax - phone (optional)</STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_payby_%2D_%60CARD%27_%28credit_cards%29%2C_%60BILL">payby - `CARD' (credit cards), `BILL' (billing), `COMP' (free), or `PREPAY' (special billing type: applies a credit - see <A HREF=".././FS/prepay_credit.html">the FS::prepay_credit manpage</A> and sets billing type to BILL)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_issuer">payinfo - card number, P.O., comp issuer (4-8 lowercase alphanumerics; think username) or prepayment identifier (see <A HREF=".././FS/prepay_credit.html">the FS::prepay_credit manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_paydate_%2D_expiration_date%2C_mm%2Fyyyy%2C_m%2Fyy">paydate - expiration date, mm/yyyy, m/yyyy, mm/yy or m/yy</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_payname_%2D_name_on_card_or_billing_name">payname - name on card or billing name</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_tax_%2D_tax_exempt%2C_empty_or_%60Y%27">tax - tax exempt, empty or `Y'</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_comments">comments - comments (optional)</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new customer.  To add the customer to the database, see <A HREF="#insert">insert</A>.
-<P>Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_insert_%5B_CUST_PKG_HASHREF_%5B_%2C_INVOICING_LIST">insert [ CUST_PKG_HASHREF [ , INVOICING_LIST_ARYREF ] ]</A></STRONG><BR>
-<DD>
-Adds this customer to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P>CUST_PKG_HASHREF: If you pass a Tie::RefHash data structure to the insert
-method containing FS::cust_pkg and FS::svc_<EM>tablename</EM> objects, all records
-are inserted atomicly, or the transaction is rolled back.  Passing an empty
-hash reference is equivalent to not supplying this parameter.  There should be
-a better explanation of this, but until then, here's an example:</P>
-<PRE>
-  use Tie::RefHash;
-  tie %hash, 'Tie::RefHash'; #this part is important
-  %hash = (
-    $cust_pkg =&gt; [ $svc_acct ],
-    ...
-  );
-  $cust_main-&gt;insert( \%hash );</PRE>
-<P>INVOICING_LIST_ARYREF: If you pass an arrarref to the insert method, it will
-be set as the invoicing list (see <A HREF="#invoicing_list">invoicing_list</A>).  Errors return as
-expected and rollback the entire transaction; it is not necessary to call 
-check_invoicing_list first.  The invoicing_list is set after the records in the
-CUST_PKG_HASHREF above are inserted, so it is now possible to set an
-invoicing_list destination to the newly-created svc_acct.  Here's an example:</P>
-<PRE>
-  $cust_main-&gt;insert( {}, [ $email, 'POST' ] );</PRE>
-<P></P>
-<DT><STRONG><A NAME="item_delete_NEW_CUSTNUM">delete NEW_CUSTNUM</A></STRONG><BR>
-<DD>
-This deletes the customer.  If there is an error, returns the error, otherwise
-returns false.
-<P>This will completely remove all traces of the customer record.  This is not
-what you want when a customer cancels service; for that, cancel all of the
-customer's packages (see <A HREF=".././FS/cust_pkg.html#cancel">cancel in the FS::cust_pkg manpage</A>).</P>
-<P>If the customer has any uncancelled packages, you need to pass a new (valid)
-customer number for those packages to be transferred to.  Cancelled packages
-will be deleted.  Did I mention that this is NOT what you want when a customer
-cancels service and that you really should be looking see <A HREF=".././FS/cust_pkg.html#cancel">cancel in the FS::cust_pkg manpage</A>?</P>
-<P>You can't delete a customer with invoices (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>),
-or credits (see <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>) or payments (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD_%5B_INVOICING_LIST_ARYREF_%5D">replace OLD_RECORD [ INVOICING_LIST_ARYREF ]</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P>INVOICING_LIST_ARYREF: If you pass an arrarref to the insert method, it will
-be set as the invoicing list (see <A HREF="#invoicing_list">invoicing_list</A>).  Errors return as
-expected and rollback the entire transaction; it is not necessary to call 
-check_invoicing_list first.  Here's an example:</P>
-<PRE>
-  $new_cust_main-&gt;replace( $old_cust_main, [ $email, 'POST' ] );</PRE>
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid customer record.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and repalce methods.
-<P></P>
-<DT><STRONG><A NAME="item_all_pkgs">all_pkgs</A></STRONG><BR>
-<DD>
-Returns all packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this customer.
-<P></P>
-<DT><STRONG><A NAME="item_ncancelled_pkgs">ncancelled_pkgs</A></STRONG><BR>
-<DD>
-Returns all non-cancelled packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this customer.
-<P></P>
-<DT><STRONG><A NAME="item_suspended_pkgs">suspended_pkgs</A></STRONG><BR>
-<DD>
-Returns all suspended packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this customer.
-<P></P>
-<DT><STRONG><A NAME="item_unflagged_suspended_pkgs">unflagged_suspended_pkgs</A></STRONG><BR>
-<DD>
-Returns all unflagged suspended packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this
-customer (thouse packages without the `manual_flag' set).
-<P></P>
-<DT><STRONG><A NAME="item_unsuspended_pkgs">unsuspended_pkgs</A></STRONG><BR>
-<DD>
-Returns all unsuspended (and uncancelled) packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for
-this customer.
-<P></P>
-<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
-<DD>
-Unsuspends all unflagged suspended packages (see <A HREF="#unflagged_suspended_pkgs">unflagged_suspended_pkgs</A>
-and <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this customer.  Always returns a list: an empty list
-on success or a list of errors.
-<P></P>
-<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
-<DD>
-Suspends all unsuspended packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this customer.
-Always returns a list: an empty list on success or a list of errors.
-<P></P>
-<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
-<DD>
-Cancels all uncancelled packages (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) for this customer.
-Always returns a list: an empty list on success or a list of errors.
-<P></P>
-<DT><STRONG><A NAME="item_bill">bill OPTIONS</A></STRONG><BR>
-<DD>
-Generates invoices (see <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>) for this customer.  Usually used in
-conjunction with the collect method.
-<P>Options are passed as name-value pairs.</P>
-<P>The only currently available option is `time', which bills the customer as if
-it were that time.  It is specified as a UNIX timestamp; see
-<EM>perlfunc/``time''</EM>).  Also see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion
-functions.  For example:</P>
-<PRE>
- use Date::Parse;
- ...
- $cust_main-&gt;bill( 'time' =&gt; str2time('April 20th, 2001') );</PRE>
-<P>If there is an error, returns the error, otherwise returns false.</P>
-<P></P>
-<DT><STRONG><A NAME="item_collect">collect OPTIONS</A></STRONG><BR>
-<DD>
-(Attempt to) collect money for this customer's outstanding invoices (see
-<A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>).  Usually used after the bill method.
-<P>Depending on the value of `payby', this may print an invoice (`BILL'), charge
-a credit card (`CARD'), or just add any necessary (pseudo-)payment (`COMP').</P>
-<P>If there is an error, returns the error, otherwise returns false.</P>
-<P>Options are passed as name-value pairs.</P>
-<P>Currently available options are:</P>
-<P>invoice_time - Use this time when deciding when to print invoices and
-late notices on those invoices.  The default is now.  It is specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>).  Also see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A>
-for conversion functions.</P>
-<P>batch_card - Set this true to batch cards (see <A HREF=".././FS/cust_pay_batch.html">the FS::cust_pay_batch manpage</A>).  By
-default, cards are processed immediately, which will generate an error if
-CyberCash is not installed.</P>
-<P>report_badcard - Set this true if you want bad card transactions to
-return an error.  By default, they don't.</P>
-<P>force_print - force printing even if invoice has been printed more than once
-every 30 days, and don't increment the `printed' field.</P>
-<P></P>
-<DT><STRONG><A NAME="item_total_owed">total_owed</A></STRONG><BR>
-<DD>
-Returns the total owed for this customer on all invoices
-(see <A HREF=".././FS/cust_bill.html#owed">owed in the FS::cust_bill manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_total_owed_date_TIME">total_owed_date TIME</A></STRONG><BR>
-<DD>
-Returns the total owed for this customer on all invoices with date earlier than
-TIME.  TIME is specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>).  Also
-see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.
-<P></P>
-<DT><STRONG><A NAME="item_apply_credits">apply_credits</A></STRONG><BR>
-<DD>
-Applies (see <A HREF=".././FS/cust_credit_bill.html">the FS::cust_credit_bill manpage</A>) unapplied credits (see <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>)
-to outstanding invoice balances in chronological order and returns the value
-of any remaining unapplied credits available for refund
-(see <A HREF=".././FS/cust_refund.html">the FS::cust_refund manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_apply_payments">apply_payments</A></STRONG><BR>
-<DD>
-Applies (see <A HREF=".././FS/cust_bill_pay.html">the FS::cust_bill_pay manpage</A>) unapplied payments (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>)
-to outstanding invoice balances in chronological order.
-<PRE>
- #and returns the value of any remaining unapplied payments.</PRE>
-<P></P>
-<DT><STRONG><A NAME="item_total_credited">total_credited</A></STRONG><BR>
-<DD>
-Returns the total outstanding credit (see <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>) for this
-customer.  See <A HREF=".././FS/cust_credit.html#credited">credited in the FS::cust_credit manpage</A>.
-<P></P>
-<DT><STRONG><A NAME="item_total_unapplied_payments">total_unapplied_payments</A></STRONG><BR>
-<DD>
-Returns the total unapplied payments (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>) for this customer.
-See <A HREF=".././FS/cust_pay.html#unapplied">unapplied in the FS::cust_pay manpage</A>.
-<P></P>
-<DT><STRONG><A NAME="item_balance">balance</A></STRONG><BR>
-<DD>
-Returns the balance for this customer (total_owed minus total_credited
-minus total_unapplied_payments).
-<P></P>
-<DT><STRONG><A NAME="item_balance_date_TIME">balance_date TIME</A></STRONG><BR>
-<DD>
-Returns the balance for this customer, only considering invoices with date
-earlier than TIME (total_owed_date minus total_credited minus
-total_unapplied_payments).  TIME is specified as a UNIX timestamp; see
-<EM>perlfunc/``time''</EM>).  Also see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion
-functions.
-<P></P>
-<DT><STRONG><A NAME="item_invoicing_list_%5B_ARRAYREF_%5D">invoicing_list [ ARRAYREF ]</A></STRONG><BR>
-<DD>
-If an arguement is given, sets these email addresses as invoice recipients
-(see <A HREF=".././FS/cust_main_invoice.html">the FS::cust_main_invoice manpage</A>).  Errors are not fatal and are not reported
-(except as warnings), so use check_invoicing_list first.
-<P>Returns a list of email addresses (with svcnum entries expanded).</P>
-<P>Note: You can clear the invoicing list by passing an empty ARRAYREF.  You can
-check it without disturbing anything by passing nothing.</P>
-<P>This interface may change in the future.</P>
-<P></P>
-<DT><STRONG><A NAME="item_check_invoicing_list_ARRAYREF">check_invoicing_list ARRAYREF</A></STRONG><BR>
-<DD>
-Checks these arguements as valid input for the invoicing_list method.  If there
-is an error, returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_default_invoicing_list">default_invoicing_list</A></STRONG><BR>
-<DD>
-Sets the invoicing list to all accounts associated with this customer.
-<P></P>
-<DT><STRONG><A NAME="item_invoicing_list_addpost">invoicing_list_addpost</A></STRONG><BR>
-<DD>
-Adds postal invoicing to this customer.  If this customer is already configured
-to receive postal invoices, does nothing.
-<P></P>
-<DT><STRONG><A NAME="item_referral_cust_main_%5B_DEPTH_%5B_EXCLUDE_HASHREF_%">referral_cust_main [ DEPTH [ EXCLUDE_HASHREF ] ]</A></STRONG><BR>
-<DD>
-Returns an array of customers referred by this customer (referral_custnum set
-to this custnum).  If DEPTH is given, recurses up to the given depth, returning
-customers referred by customers referred by this customer and so on, inclusive.
-The default behavior is DEPTH 1 (no recursion).
-<P></P>
-<DT><STRONG><A NAME="item_referral_cust_pkg_%5B_DEPTH_%5D">referral_cust_pkg [ DEPTH ]</A></STRONG><BR>
-<DD>
-Like referral_cust_main, except returns a flat list of all unsuspended packages
-for each customer.  The number of items in this list may be useful for
-comission calculations (perhaps after a grep).
-<P></P>
-<DT><STRONG><A NAME="item_credit">credit AMOUNT, REASON</A></STRONG><BR>
-<DD>
-Applies a credit to this customer.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_charge">charge AMOUNT PKG COMMENT</A></STRONG><BR>
-<DD>
-Creates a one-time charge for this customer.  If there is an error, returns
-the error, otherwise returns false.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="subroutines">SUBROUTINES</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_check_and_rebuild_fuzzyfiles">check_and_rebuild_fuzzyfiles</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_rebuild_fuzzyfiles">rebuild_fuzzyfiles</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_all_last">all_last</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_all_company">all_company</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_append_fuzzyfiles_LASTNAME_COMPANY">append_fuzzyfiles LASTNAME COMPANY</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_main.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The delete method.</P>
-<P>The delete method should possibly take an FS::cust_main object reference
-instead of a scalar customer number.</P>
-<P>Bill and collect options should probably be passed as references instead of a
-list.</P>
-<P>CyberCash v2 forces us to define some variables in package main.</P>
-<P>There should probably be a configuration file with a list of allowed credit
-card types.</P>
-<P>No multiple currency support (probably a larger project than just this module).</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>
-<A HREF=".././FS/cust_pay_batch.html">the FS::cust_pay_batch manpage</A>, <A HREF=".././FS/agent.html">the FS::agent manpage</A>, <A HREF=".././FS/part_referral.html">the FS::part_referral manpage</A>,
-<A HREF=".././FS/cust_main_county.html">the FS::cust_main_county manpage</A>, <A HREF=".././FS/cust_main_invoice.html">the FS::cust_main_invoice manpage</A>,
-<A HREF=".././FS/UID.html">the FS::UID manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/cust_main_county.html b/httemplate/docs/man/FS/cust_main_county.html
deleted file mode 100644
index 2c5dcd3fc..000000000
--- a/httemplate/docs/man/FS/cust_main_county.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_main_county - Object methods for cust_main_county objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_main_county - Object methods for cust_main_county objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_main_county;</PRE>
-<PRE>
-  $record = new FS::cust_main_county \%hash;
-  $record = new FS::cust_main_county { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_main_county object represents a tax rate, defined by locale.
-FS::cust_main_county inherits from FS::Record.  The following fields are
-currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">taxnum - primary key (assigned automatically for new tax rates)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_state">state</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_county">county</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_country">country</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_tax_%2D_percentage">tax - percentage</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new tax rate.  To add the tax rate to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this tax rate to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this tax rate from the database.  If there is an error, returns the
-error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid tax rate.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_main_county.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, schema.html from the base
-documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/cust_main_invoice.html b/httemplate/docs/man/FS/cust_main_invoice.html
deleted file mode 100644
index a7929a943..000000000
--- a/httemplate/docs/man/FS/cust_main_invoice.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_main_invoice - Object methods for cust_main_invoice records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_main_invoice - Object methods for cust_main_invoice records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_main_invoice;</PRE>
-<PRE>
-  $record = new FS::cust_main_invoice \%hash;
-  $record = new FS::cust_main_invoice { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $email_address = $record-&gt;address;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_main_invoice object represents an invoice destination.  FS::cust_main_invoice inherits from
-FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_destnum_%2D_primary_key">destnum - primary key</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_customer">custnum - customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_svcnum">dest - Invoice destination: If numeric, a svcnum (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>), if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new invoice destination.  To add the invoice destination to the database, see <A HREF="#insert">insert</A>.
-<P>Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Delete this record from the database.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid invoice destination.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and repalce methods.
-<P></P>
-<DT><STRONG><A NAME="item_checkdest">checkdest</A></STRONG><BR>
-<DD>
-Checks the dest field only.  If it finds that the account ends in the
-same domain configured as the <STRONG>domain</STRONG> configuration file, it will change the
-invoice destination from an email address to a service number (see
-<A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_address">address</A></STRONG><BR>
-<DD>
-Returns the literal email address for this record (or `POST').
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_main_invoice.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A></P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/cust_pay.html b/httemplate/docs/man/FS/cust_pay.html
deleted file mode 100644
index a8c481fc0..000000000
--- a/httemplate/docs/man/FS/cust_pay.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_pay - Object methods for cust_pay objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_pay - Object methods for cust_pay objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_pay;</PRE>
-<PRE>
-  $record = new FS::cust_pay \%hash;
-  $record = new FS::cust_pay { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_pay object represents a payment; the transfer of money from a
-customer.  FS::cust_pay inherits from FS::Record.  The following fields are
-currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">paynum - primary key (assigned automatically for new payments)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_customer">custnum - customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_paid_%2D_Amount_of_this_payment">paid - Amount of this payment</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item__date_%2D_specified_as_a_UNIX_timestamp%3B_see_per">_date - specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
-<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_payby_%2D_%60CARD%27_%28credit_cards%29%2C_%60BILL">payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_issuer">payinfo - card number, check #, or comp issuer (4-8 lowercase alphanumerics; think username), respectively</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_paybatch_%2D_text_field_for_tracking_card_processi">paybatch - text field for tracking card processing</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_closed_%2D_books_closed_flag%2C_empty_or_%60Y%27">closed - books closed flag, empty or `Y'</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new payment.  To add the payment to the databse, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this payment to the database.
-<P>For backwards-compatibility and convenience, if the additional field invnum
-is defined, an FS::cust_bill_pay record for the full amount of the payment
-will be created.  In this case, custnum is optional.</P>
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Currently unimplemented (accounting reasons).
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Currently unimplemented (accounting reasons).
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid payment.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert method.
-<P></P>
-<DT><STRONG><A NAME="item_cust_bill_pay">cust_bill_pay</A></STRONG><BR>
-<DD>
-Returns all applications to invoices (see <A HREF=".././FS/cust_bill_pay.html">the FS::cust_bill_pay manpage</A>) for this
-payment.
-<P></P>
-<DT><STRONG><A NAME="item_unapplied">unapplied</A></STRONG><BR>
-<DD>
-Returns the amount of this payment that is still unapplied; which is
-paid minus all payment applications (see <A HREF=".././FS/cust_bill_pay.html">the FS::cust_bill_pay manpage</A>).
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_pay.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>Delete and replace methods.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/cust_bill_pay.html">the FS::cust_bill_pay manpage</A>, <A HREF=".././FS/cust_bill.html">the FS::cust_bill manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the
-base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/cust_pay_batch.html b/httemplate/docs/man/FS/cust_pay_batch.html
deleted file mode 100644
index 052ccac39..000000000
--- a/httemplate/docs/man/FS/cust_pay_batch.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_pay_batch - Object methods for batch cards</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_pay_batch - Object methods for batch cards</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_pay_batch;</PRE>
-<PRE>
-  $record = new FS::cust_pay_batch \%hash;
-  $record = new FS::cust_pay_batch { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_pay_batch object represents a credit card transaction ready to be
-batched (sent to a processor).  FS::cust_pay_batch inherits from FS::Record.  
-Typically called by the collect method of an FS::cust_main object.  The
-following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">paybatchnum - primary key (automatically assigned)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_cardnum">cardnum</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_exp_%2D_card_expiration">exp - card expiration</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_amount">amount</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_invnum_%2D_invoice">invnum - invoice</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_custnum_%2D_customer">custnum - customer</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_payname_%2D_name_on_card">payname - name on card</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_first_%2D_name">first - name</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_last_%2D_name">last - name</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_address1">address1</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_address2">address2</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_city">city</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_state">state</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_zip">zip</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_country">country</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new record.  To add the record to the database, see <A HREF="#insert">insert</A>.
-<P>Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Delete this record from the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-#inactive
-#
-#Replaces the OLD_RECORD with this one in the database.  If there is an error,
-#returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid transaction.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and repalce methods.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_pay_batch.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>There should probably be a configuration file with a list of allowed credit
-card types.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A></P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/cust_pkg.html b/httemplate/docs/man/FS/cust_pkg.html
deleted file mode 100644
index 76cb9e786..000000000
--- a/httemplate/docs/man/FS/cust_pkg.html
+++ /dev/null
@@ -1,217 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_pkg - Object methods for cust_pkg objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_pkg - Object methods for cust_pkg objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_pkg;</PRE>
-<PRE>
-  $record = new FS::cust_pkg \%hash;
-  $record = new FS::cust_pkg { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $error = $record-&gt;cancel;</PRE>
-<PRE>
-  $error = $record-&gt;suspend;</PRE>
-<PRE>
-  $error = $record-&gt;unsuspend;</PRE>
-<PRE>
-  $part_pkg = $record-&gt;part_pkg;</PRE>
-<PRE>
-  @labels = $record-&gt;labels;</PRE>
-<PRE>
-  $seconds = $record-&gt;seconds_since($timestamp);</PRE>
-<PRE>
-  $error = FS::cust_pkg::order( $custnum, \@pkgparts );
-  $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_pkg object represents a customer billing item.  FS::cust_pkg
-inherits from FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">pkgnum - primary key (assigned automatically for new billing items)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_Customer">custnum - Customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_definition">pkgpart - Billing item definition (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_setup_%2D_date">setup - date</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_bill_%2D_date">bill - date</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_susp_%2D_date">susp - date</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_expire_%2D_date">expire - date</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_cancel_%2D_date">cancel - date</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically if null, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_manual_flag_%2D_If_this_field_is_set_to_1%2C_disab">manual_flag - If this field is set to 1, disables the automatic
-unsuspension of this package when using the <STRONG>unsuspendauto</STRONG> config file.</A></STRONG><BR>
-<DD>
-</DL>
-<P>Note: setup, bill, susp, expire and cancel are specified as UNIX timestamps;
-see <EM>perlfunc/``time''</EM>.  Also see <A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for
-conversion functions.</P>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Create a new billing item.  To add the item to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this billing item to the database (``Orders'' the item).  If there is an
-error, returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-This method now works but you probably shouldn't use it.
-<P>You don't want to delete billing items, because there would then be no record
-the customer ever purchased the item.  Instead, see the cancel method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P>Currently, custnum, setup, bill, susp, expire, and cancel may be changed.</P>
-<P>Changing pkgpart may have disasterous effects.  See the order subroutine.</P>
-<P>setup and bill are normally updated by calling the bill method of a customer
-object (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>).</P>
-<P>suspend is normally updated by the suspend and unsuspend methods.</P>
-<P>cancel is normally updated by the cancel method (and also the order subroutine
-in some cases).</P>
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid billing item.  If there is an
-error, returns the error, otherwise returns false.  Called by the insert and
-replace methods.
-<P></P>
-<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
-<DD>
-Cancels and removes all services (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A> and <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>)
-in this package, then cancels the package itself (sets the cancel field to
-now).
-<P>If there is an error, returns the error, otherwise returns false.</P>
-<P></P>
-<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
-<DD>
-Suspends all services (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A> and <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>) in this
-package, then suspends the package itself (sets the susp field to now).
-<P>If there is an error, returns the error, otherwise returns false.</P>
-<P></P>
-<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
-<DD>
-Unsuspends all services (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A> and <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>) in this
-package, then unsuspends the package itself (clears the susp field).
-<P>If there is an error, returns the error, otherwise returns false.</P>
-<P></P>
-<DT><STRONG><A NAME="item_part_pkg">part_pkg</A></STRONG><BR>
-<DD>
-Returns the definition for this billing item, as an FS::part_pkg object (see
-<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_cust_svc">cust_svc</A></STRONG><BR>
-<DD>
-Returns the services for this package, as FS::cust_svc objects (see
-<A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>)
-<P></P>
-<DT><STRONG><A NAME="item_labels">labels</A></STRONG><BR>
-<DD>
-Returns a list of lists, calling the label method for all services
-(see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) of this billing item.
-<P></P>
-<DT><STRONG><A NAME="item_cust_main">cust_main</A></STRONG><BR>
-<DD>
-Returns the parent customer object (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_seconds_since_TIMESTAMP">seconds_since TIMESTAMP</A></STRONG><BR>
-<DD>
-Returns the number of seconds all accounts (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>) in this
-package have been online since TIMESTAMP.
-<P>TIMESTAMP is specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
-<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</P>
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="subroutines">SUBROUTINES</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_order_CUSTNUM%2C_PKGPARTS_ARYREF%2C_%5B_REMOVE_PKG">order CUSTNUM, PKGPARTS_ARYREF, [ REMOVE_PKGNUMS_ARYREF [ RETURN_CUST_PKG_ARRAYREF ] ]</A></STRONG><BR>
-<DD>
-CUSTNUM is a customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)
-<P>PKGPARTS is a list of pkgparts specifying the the billing item definitions (see
-<A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>) to order for this customer.  Duplicates are of course
-permitted.</P>
-<P>REMOVE_PKGNUMS is an optional list of pkgnums specifying the billing items to
-remove for this customer.  The services (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) are moved to the
-new billing items.  An error is returned if this is not possible (see
-<A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>).  An empty arrayref is equivalent to not specifying this
-parameter.</P>
-<P>RETURN_CUST_PKG_ARRAYREF, if specified, will be filled in with the
-newly-created cust_pkg objects.</P>
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_pkg.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>sub order is not OO.  Perhaps it should be moved to FS::cust_main and made so?</P>
-<P>In sub order, the @pkgparts array (passed by reference) is clobbered.</P>
-<P>Also in sub order, no money is adjusted.  Once FS::part_pkg defines a standard
-method to pass dates to the recur_prog expression, it should do so.</P>
-<P>FS::svc_acct, FS::svc_acct_sm, and FS::svc_domain are loaded via 'use' at 
-compile time, rather than via 'require' in sub { setup, suspend, unsuspend,
-cancel } because they use %FS::UID::callback to load configuration values.
-Probably need a subroutine which decides what to do based on whether or not
-we've fetched the user yet, rather than a hash.  See FS::UID and the TODO.</P>
-<P>Now that things are transactional should the check in the insert method be
-moved to check ?</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
-<A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>, schema.html from the base documentation</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/cust_refund.html b/httemplate/docs/man/FS/cust_refund.html
deleted file mode 100644
index 93bb07b2d..000000000
--- a/httemplate/docs/man/FS/cust_refund.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_refund - Object method for cust_refund objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_refund - Object method for cust_refund objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_refund;</PRE>
-<PRE>
-  $record = new FS::cust_refund \%hash;
-  $record = new FS::cust_refund { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_refund represents a refund: the transfer of money to a customer;
-equivalent to a negative payment (see <A HREF=".././FS/cust_pay.html">the FS::cust_pay manpage</A>).  FS::cust_refund
-inherits from FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">refundnum - primary key (assigned automatically for new refunds)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_customer">custnum - customer (see <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_refund_%2D_Amount_of_the_refund">refund - Amount of the refund</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item__date_%2D_specified_as_a_UNIX_timestamp%3B_see_per">_date - specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
-<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_payby_%2D_%60CARD%27_%28credit_cards%29%2C_%60BILL">payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_issuer">payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_paybatch_%2D_text_field_for_tracking_card_processi">paybatch - text field for tracking card processing</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_taker">otaker - order taker (assigned automatically, see <A HREF=".././FS/UID.html">the FS::UID manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_closed_%2D_books_closed_flag%2C_empty_or_%60Y%27">closed - books closed flag, empty or `Y'</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new refund.  To add the refund to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this refund to the database.
-<P>For backwards-compatibility and convenience, if the additional field crednum is
-defined, an FS::cust_credit_refund record for the full amount of the refund
-will be created.  In this case, custnum is optional.</P>
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Currently unimplemented (accounting reasons).
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Currently unimplemented (accounting reasons).
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid refund.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert method.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_refund.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>Delete and replace methods.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_credit.html">the FS::cust_credit manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/cust_svc.html b/httemplate/docs/man/FS/cust_svc.html
deleted file mode 100644
index 55c90e28e..000000000
--- a/httemplate/docs/man/FS/cust_svc.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::cust_svc - Object method for cust_svc objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::cust_svc - Object method for cust_svc objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::cust_svc;</PRE>
-<PRE>
-  $record = new FS::cust_svc \%hash
-  $record = new FS::cust_svc { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  ($label, $value) = $record-&gt;label;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::cust_svc represents a service.  FS::cust_svc inherits from FS::Record.
-The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">svcnum - primary key (assigned automatically for new services)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_Package">pkgnum - Package (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_definition">svcpart - Service definition (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>)</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new service.  To add the refund to the database, see <A HREF="#insert">insert</A>.
-Services are normally created by creating FS::svc_ objects (see
-<A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, and <A HREF=".././FS/svc_forward.html">the FS::svc_forward manpage</A>, among others).
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this service to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this service from the database.  If there is an error, returns the
-error, otherwise returns false.
-<P>Called by the cancel method of the package (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid service.  If there is an error,
-returns the error, otehrwise returns false.  Called by the insert and
-replace methods.
-<P></P>
-<DT><STRONG><A NAME="item_part_svc">part_svc</A></STRONG><BR>
-<DD>
-Returns the definition for this service, as a FS::part_svc object (see
-<A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_cust_pkg">cust_pkg</A></STRONG><BR>
-<DD>
-Returns the definition for this service, as a FS::part_svc object (see
-<A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_label">label</A></STRONG><BR>
-<DD>
-Returns a list consisting of:
-- The name of this service (from part_svc)
-- A meaningful identifier (username, domain, or mail alias)
-- The table name (i.e. svc_domain) for this service
-<P></P>
-<DT><STRONG><A NAME="item_svc_x">svc_x</A></STRONG><BR>
-<DD>
-Returns the FS::svc_XXX object for this service (i.e. an FS::svc_acct object or
-FS::svc_domain object, etc.)
-<P></P>
-<DT><STRONG><A NAME="item_seconds_since_TIMESTAMP">seconds_since TIMESTAMP</A></STRONG><BR>
-<DD>
-See <A HREF=".././FS/svc_acct.html#seconds_since">seconds_since in the FS::svc_acct manpage</A>.  Equivalent to
-$cust_svc-&gt;svc_x-&gt;seconds_since, but more efficient.  Meaningless for records
-where <STRONG>svcdb</STRONG> is not ``svc_acct''.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: cust_svc.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>Behaviour of changing the svcpart of cust_svc records is undefined and should
-possibly be prohibited, and pkg_svc records are not checked.</P>
-<P>pkg_svc records are not checked in general (here).</P>
-<P>Deleting this record doesn't check or delete the svc_* record associated
-with this record.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>, 
-schema.html from the base documentation</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/domain_record.html b/httemplate/docs/man/FS/domain_record.html
deleted file mode 100644
index 0349f7b78..000000000
--- a/httemplate/docs/man/FS/domain_record.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::domain_record - Object methods for domain_record records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::domain_record - Object methods for domain_record records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::domain_record;</PRE>
-<PRE>
-  $record = new FS::domain_record \%hash;
-  $record = new FS::domain_record { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::domain_record object represents an entry in a DNS zone.
-FS::domain_record inherits from FS::Record.  The following fields are currently
-supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_recnum_%2D_primary_key">recnum - primary key</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_Domain">svcnum - Domain (see <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>) of this entry</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_partial">reczone - partial (or full) zone for this entry</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_recaf_%2D_address_family_for_this_entry%2C_current">recaf - address family for this entry, currently only `IN' is recognized.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_entry">rectype - record type for this entry (A, MX, etc.)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_recdata_%2D_data_for_this_entry">recdata - data for this entry</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new entry.  To add the example to the database, see <A HREF="#insert">insert</A>.
-<P>Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Delete this record from the database.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: domain_record.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The data validation doesn't check everything it could.  In particular,
-there is no protection against bad data that passes the regex, duplicate
-SOA records, forgetting the trailing `.', impossible IP addersses, etc.  Of
-course, it's still better than editing the zone files directly.  :)</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/nas.html b/httemplate/docs/man/FS/nas.html
deleted file mode 100644
index 5a55964e1..000000000
--- a/httemplate/docs/man/FS/nas.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::nas - Object methods for nas records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::nas - Object methods for nas records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::nas;</PRE>
-<PRE>
-  $record = new FS::nas \%hash;
-  $record = new FS::nas {
-    'nasnum'  =&gt; 1,
-    'nasip'   =&gt; '10.4.20.23',
-    'nasfqdn' =&gt; 'box1.brc.nv.us.example.net',
-  };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $error = $record-&gt;heartbeat($timestamp);</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::nas object represents an Network Access Server on your network, such as
-a terminal server or equivalent.  FS::nas inherits from FS::Record.  The
-following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_nasnum_%2D_primary_key">nasnum - primary key</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_nas_%2D_NAS_name">nas - NAS name</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_nasip_%2D_NAS_ip_address">nasip - NAS ip address</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_nasfqdn_%2D_NAS_fully%2Dqualified_domain_name">nasfqdn - NAS fully-qualified domain name</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_state">last - timestamp indicating the last instant the NAS was in a known
-             state (used by the session monitoring).</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new NAS.  To add the NAS to the database, see <A HREF="#insert">insert</A>.
-<P>Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Delete this record from the database.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-<P></P>
-<DT><STRONG><A NAME="item_heartbeat">heartbeat TIMESTAMP</A></STRONG><BR>
-<DD>
-Updates the timestamp for this nas
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: nas.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/part_pkg.html b/httemplate/docs/man/FS/part_pkg.html
deleted file mode 100644
index e1e96b54c..000000000
--- a/httemplate/docs/man/FS/part_pkg.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::part_pkg - Object methods for part_pkg objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::part_pkg - Object methods for part_pkg objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::part_pkg;</PRE>
-<PRE>
-  $record = new FS::part_pkg \%hash
-  $record = new FS::part_pkg { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $custom_record = $template_record-&gt;clone;</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  @pkg_svc = $record-&gt;pkg_svc;</PRE>
-<PRE>
-  $svcnum = $record-&gt;svcpart;
-  $svcnum = $record-&gt;svcpart( 'svc_acct' );</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::part_pkg object represents a billing item definition.  FS::part_pkg
-inherits from FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">pkgpart - primary key (assigned automatically for new billing item definitions)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_definition">pkg - Text name of this billing item definition (customer-viewable)</A></STRONG><BR>
-<DD>
-<DT><STRONG>comment - Text name of this billing item definition (non-customer-viewable)</STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_setup_%2D_Setup_fee_expression">setup - Setup fee expression</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_freq_%2D_Frequency_of_recurring_fee">freq - Frequency of recurring fee</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_recur_%2D_Recurring_fee_expression">recur - Recurring fee expression</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_setuptax_%2D_Setup_fee_tax_exempt_flag%2C_empty_or">setuptax - Setup fee tax exempt flag, empty or `Y'</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_recurtax_%2D_Recurring_fee_tax_exempt_flag%2C_empt">recurtax - Recurring fee tax exempt flag, empty or `Y'</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_plan_%2D_Price_plan">plan - Price plan</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_plandata_%2D_Price_plan_data">plandata - Price plan data</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_disabled_%2D_Disabled_flag%2C_empty_or_%60Y%27">disabled - Disabled flag, empty or `Y'</A></STRONG><BR>
-<DD>
-</DL>
-<P>setup and recur are evaluated as Safe perl expressions.  You can use numbers
-just as you would normally.  More advanced semantics are not yet defined.</P>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new billing item definition.  To add the billing item definition to
-the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_clone">clone</A></STRONG><BR>
-<DD>
-An alternate constructor.  Creates a new billing item definition by duplicating
-an existing definition.  A new pkgpart is assigned and `(CUSTOM) ' is prepended
-to the comment field.  To add the billing item definition to the database, see
-<A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this billing item definition to the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Currently unimplemented.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid billing item definition.  If
-there is an error, returns the error, otherwise returns false.  Called by the
-insert and replace methods.
-<P></P>
-<DT><STRONG><A NAME="item_pkg_svc">pkg_svc</A></STRONG><BR>
-<DD>
-Returns all FS::pkg_svc objects (see <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>) for this package
-definition (with non-zero quantity).
-<P></P>
-<DT><STRONG><A NAME="item_svcpart_%5B_SVCDB_%5D">svcpart [ SVCDB ]</A></STRONG><BR>
-<DD>
-Returns the svcpart of a single service definition (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>)
-associated with this billing item definition (see <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>).  Returns
-false if there not exactly one service definition with quantity 1, or if 
-SVCDB is specified and does not match the svcdb of the service definition,
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: part_pkg.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The delete method is unimplemented.</P>
-<P>setup and recur semantics are not yet defined (and are implemented in
-FS::cust_bill.  hmm.).</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF=".././FS/type_pkgs.html">the FS::type_pkgs manpage</A>, <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>, <EM>Safe</EM>.
-schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/part_referral.html b/httemplate/docs/man/FS/part_referral.html
deleted file mode 100644
index 815b15cf1..000000000
--- a/httemplate/docs/man/FS/part_referral.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::part_referral - Object methods for part_referral objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::part_referral - Object methods for part_referral objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::part_referral;</PRE>
-<PRE>
-  $record = new FS::part_referral \%hash
-  $record = new FS::part_referral { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::part_referral represents a referral - where a customer heard of your
-services.  This can be used to track the effectiveness of a particular piece of
-advertising, for example.  FS::part_referral inherits from FS::Record.  The
-following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">refnum - primary key (assigned automatically for new referrals)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_referral_%2D_Text_name_of_this_referral">referral - Text name of this referral</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new referral.  To add the referral to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this referral to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Currently unimplemented.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid referral.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: part_referral.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The delete method is unimplemented.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_main.html">the FS::cust_main manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/part_svc.html b/httemplate/docs/man/FS/part_svc.html
deleted file mode 100644
index 0f5126f81..000000000
--- a/httemplate/docs/man/FS/part_svc.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::part_svc - Object methods for part_svc objects</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::part_svc - Object methods for part_svc objects</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::part_svc;</PRE>
-<PRE>
-  $record = new FS::part_svc \%hash
-  $record = new FS::part_svc { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::part_svc represents a service definition.  FS::part_svc inherits from
-FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">svcpart - primary key (assigned automatically for new service definitions)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_svc_%2D_text_name_of_this_service_definition">svc - text name of this service definition</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_svcdb_%2D_table_used_for_this_service%2E_See_FS%3A">svcdb - table used for this service.  See <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>,
-<A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, and <A HREF=".././FS/svc_forward.html">the FS::svc_forward manpage</A>, among others.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_disabled_%2D_Disabled_flag%2C_empty_or_%60Y%27">disabled - Disabled flag, empty or `Y'</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new service definition.  To add the service definition to the
-database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this service definition to the database.  If there is an error, returns
-the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_svcdb__field_%2D_Default_or_fixed_value_for_field_"><EM>svcdb</EM>__<EM>field</EM> - Default or fixed value for <EM>field</EM> in <EM>svcdb</EM>.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_svcdb__field_flag_%2D_defines_svcdb__field_action%"><EM>svcdb</EM>__<EM>field</EM>_flag - defines <EM>svcdb</EM>__<EM>field</EM> action: null, `D' for default, or `F' for fixed</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Currently unimplemented.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid service definition.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-<P></P>
-<DT><STRONG><A NAME="item_part_svc_column_COLUMNNAME">part_svc_column COLUMNNAME</A></STRONG><BR>
-<DD>
-Returns the part_svc_column object (see <A HREF=".././FS/part_svc_column.html">the FS::part_svc_column manpage</A>) for the given
-COLUMNNAME, or a new part_svc_column object if none exists.
-<P></P>
-<DT><STRONG><A NAME="item_all_part_svc_column">all_part_svc_column</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: part_svc.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>Delete is unimplemented.</P>
-<P>The list of svc_* tables is hardcoded.  When svc_acct_pop is renamed, this
-should be fixed.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/part_svc_column.html">the FS::part_svc_column manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, <A HREF=".././FS/pkg_svc.html">the FS::pkg_svc manpage</A>,
-<A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>, <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/svc_forward.html">the FS::svc_forward manpage</A>, <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>,
-schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/pkg_svc.html b/httemplate/docs/man/FS/pkg_svc.html
deleted file mode 100644
index 44db9d5ff..000000000
--- a/httemplate/docs/man/FS/pkg_svc.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::pkg_svc - Object methods for pkg_svc records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::pkg_svc - Object methods for pkg_svc records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::pkg_svc;</PRE>
-<PRE>
-  $record = new FS::pkg_svc \%hash;
-  $record = new FS::pkg_svc { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $part_pkg = $record-&gt;part_pkg;</PRE>
-<PRE>
-  $part_svc = $record-&gt;part_svc;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::pkg_svc record links a billing item definition (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>) to
-a service definition (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>).  FS::pkg_svc inherits from
-FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_definition">pkgpart - Billing item definition (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG>svcpart - Service definition (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>)</STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_quantity_%2D_Quantity_of_this_service_definition_t">quantity - Quantity of this service definition that this billing item
-definition includes</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Create a new record.  To add the record to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid record.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-<P></P>
-<DT><STRONG><A NAME="item_part_pkg">part_pkg</A></STRONG><BR>
-<DD>
-Returns the FS::part_pkg object (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_part_svc">part_svc</A></STRONG><BR>
-<DD>
-Returns the FS::part_svc object (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>).
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: pkg_svc.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, schema.html from the base
-documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/port.html b/httemplate/docs/man/FS/port.html
deleted file mode 100644
index 3851390c8..000000000
--- a/httemplate/docs/man/FS/port.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::port - Object methods for port records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::port - Object methods for port records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::port;</PRE>
-<PRE>
-  $record = new FS::port \%hash;
-  $record = new FS::port { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $session = $port-&gt;session;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::port object represents an individual port on a NAS.  FS::port inherits
-from FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_portnum_%2D_primary_key">portnum - primary key</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_ip_%2D_IP_address_of_this_port">ip - IP address of this port</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_nasport_%2D_port_number_on_the_NAS">nasport - port number on the NAS</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_nasnum_%2D_NAS_this_port_is_on_%2D_see_FS%3A%3Anas">nasnum - NAS this port is on - see <A HREF=".././FS/nas.html">the FS::nas manpage</A></A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new port.  To add the example to the database, see <A HREF="#insert">insert</A>.
-<P>Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Delete this record from the database.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-<P></P>
-<DT><STRONG><A NAME="item_session">session</A></STRONG><BR>
-<DD>
-Returns the currently open session on this port, or if no session is currently
-open, the most recent session.  See <A HREF=".././FS/session.html">the FS::session manpage</A>.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: port.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The author forgot to customize this manpage.</P>
-<P>The session method won't deal well if you have multiple open sessions on a
-port, for example if your RADIUS server drops <STRONG>stop</STRONG> records.  Suggestions for
-how to deal with this sort of lossage welcome; should we close the session
-when we get a new session on that port?  Tag it as invalid somehow?  Close it
-one second after it was opened?  *sigh*  Maybe FS::session shouldn't let you
-create overlapping sessions, at least folks will find out their logging is
-dropping records.</P>
-<P>If you think the above refers multiple user logins you need to read the
-manpages again.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/prepay_credit.html b/httemplate/docs/man/FS/prepay_credit.html
deleted file mode 100644
index bb0c281c2..000000000
--- a/httemplate/docs/man/FS/prepay_credit.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::prepay_credit - Object methods for prepay_credit records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::prepay_credit - Object methods for prepay_credit records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::prepay_credit;</PRE>
-<PRE>
-  $record = new FS::prepay_credit \%hash;
-  $record = new FS::prepay_credit {
-    'identifier' =&gt; '4198123455512121'
-    'amount'     =&gt; '19.95',
-  };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::table_name object represents an pre--paid credit, such as a pre-paid
-``calling card''.  FS::prepay_credit inherits from FS::Record.  The following
-fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_field_%2D_description">field - description</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_identifier_%2D_identifier_entered_by_the_user_to_r">identifier - identifier entered by the user to receive the credit</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_amount_%2D_amount_of_the_credit">amount - amount of the credit</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new pre-paid credit.  To add the example to the database, see
-<A HREF="#insert">insert</A>.
-<P>Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Delete this record from the database.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid pre-paid credit.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: prepay_credit.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/session.html b/httemplate/docs/man/FS/session.html
deleted file mode 100644
index 571c2d44d..000000000
--- a/httemplate/docs/man/FS/session.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::session - Object methods for session records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::session - Object methods for session records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::session;</PRE>
-<PRE>
-  $record = new FS::session \%hash;
-  $record = new FS::session {
-    'portnum' =&gt; 1,
-    'svcnum'  =&gt; 2,
-    'login'   =&gt; $timestamp,
-    'logout'  =&gt; $timestamp,
-  };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $error = $record-&gt;nas_heartbeat($timestamp);</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::session object represents an user login session.  FS::session inherits
-from FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_sessionnum_%2D_primary_key">sessionnum - primary key</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_portnum_%2D_NAS_port_for_this_session_%2D_see_FS%3">portnum - NAS port for this session - see <A HREF=".././FS/port.html">the FS::port manpage</A></A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_svcnum_%2D_User_for_this_session_%2D_see_FS%3A%3As">svcnum - User for this session - see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A></A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_login_%2D_timestamp_indicating_the_beginning_of_th">login - timestamp indicating the beginning of this user session.</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_logout_%2D_timestamp_indicating_the_end_of_this_us">logout - timestamp indicating the end of this user session.  May be null,
-               which indicates a currently open session.</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new session.  To add the session to the database, see <A HREF="#insert">insert</A>.
-<P>Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.  If the `login' field is empty, it is replaced with
-the current time.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Delete this record from the database.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.  If the `logout' field is empty,
-it is replaced with the current time.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid session.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-<P></P>
-<DT><STRONG><A NAME="item_nas_heartbeat">nas_heartbeat</A></STRONG><BR>
-<DD>
-Heartbeats the nas associated with this session (see <A HREF=".././FS/nas.html">the FS::nas manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_svc_acct">svc_acct</A></STRONG><BR>
-<DD>
-Returns the svc_acct record associated with this session (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>).
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: session.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>Maybe you shouldn't be able to insert a session if there's currently an open
-session on that port.  Or maybe the open session on that port should be flagged
-as problematic?  autoclosed?  *sigh*</P>
-<P>Hmm, sessions refer to current svc_acct records... probably need to constrain
-deletions to svc_acct records such that no svc_acct records are deleted which
-have a session (even if long-closed).</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/svc_Common.html b/httemplate/docs/man/FS/svc_Common.html
deleted file mode 100644
index ccac5efa0..000000000
--- a/httemplate/docs/man/FS/svc_Common.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::svc_Common - Object method for all svc_ records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::svc_Common - Object method for all svc_ records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<P>use FS::svc_Common;</P>
-<P>@ISA = qw( FS::svc_Common );</P>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>FS::svc_Common is intended as a base class for table-specific classes to
-inherit from, i.e. FS::svc_acct.  FS::svc_Common inherits from FS::Record.</P>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P>The additional fields pkgnum and svcpart (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
-defined.  An FS::cust_svc record will be created and inserted.</P>
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this account from the database.  If there is an error, returns the
-error, otherwise returns false.
-<P>The corresponding FS::cust_svc record will be deleted as well.</P>
-<P></P>
-<DT><STRONG><A NAME="item_setfixed">setfixed</A></STRONG><BR>
-<DD>
-Sets any fixed fields for this service (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>).  If there is an
-error, returns the error, otherwise returns the FS::part_svc object (use <CODE>ref()</CODE>
-to test the return).  Usually called by the check method.
-<P></P>
-<DT><STRONG><A NAME="item_setdefault">setdefault</A></STRONG><BR>
-<DD>
-Sets all fields to their defaults (see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>), overriding their
-current values.  If there is an error, returns the error, otherwise returns
-the FS::part_svc object (use <CODE>ref()</CODE> to test the return).
-<P></P>
-<DT><STRONG><A NAME="item_cust_svc">cust_svc</A></STRONG><BR>
-<DD>
-Returns the cust_svc record associated with this svc_ record, as a FS::cust_svc
-object (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
-<DD>
-Stubs - return false (no error) so derived classes don't need to define these
-methods.  Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_Common.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The setfixed method return value.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, schema.html
-from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/svc_acct.html b/httemplate/docs/man/FS/svc_acct.html
deleted file mode 100644
index 93483f67d..000000000
--- a/httemplate/docs/man/FS/svc_acct.html
+++ /dev/null
@@ -1,275 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::svc_acct - Object methods for svc_acct records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::svc_acct - Object methods for svc_acct records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::svc_acct;</PRE>
-<PRE>
-  $record = new FS::svc_acct \%hash;
-  $record = new FS::svc_acct { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $error = $record-&gt;suspend;</PRE>
-<PRE>
-  $error = $record-&gt;unsuspend;</PRE>
-<PRE>
-  $error = $record-&gt;cancel;</PRE>
-<PRE>
-  %hash = $record-&gt;radius;</PRE>
-<PRE>
-  %hash = $record-&gt;radius_reply;</PRE>
-<PRE>
-  %hash = $record-&gt;radius_check;</PRE>
-<PRE>
-  $domain = $record-&gt;domain;</PRE>
-<PRE>
-  $svc_domain = $record-&gt;svc_domain;</PRE>
-<PRE>
-  $email = $record-&gt;email;</PRE>
-<PRE>
-  $seconds_since = $record-&gt;seconds_since($timestamp);</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::svc_acct object represents an account.  FS::svc_acct inherits from
-FS::svc_Common.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">svcnum - primary key (assigned automatcially for new accounts)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_username">username</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item__password_%2D_generated_if_blank">_password - generated if blank</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_presence">popnum - Point of presence (see <A HREF=".././FS/svc_acct_pop.html">the FS::svc_acct_pop manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_uid">uid</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_gid">gid</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_finger_%2D_GECOS">finger - GECOS</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_blank">dir - set automatically if blank (and uid is not)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_shell">shell</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_quota_%2D_%28unimplementd%29">quota - (unimplementd)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_slipip_%2D_IP_address">slipip - IP address</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_seconds_%2D">seconds -</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_domsvc_%2D_svcnum_from_svc_domain">domsvc - svcnum from svc_domain</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_radius_Radius_Attribute_%2D_Radius%2DAttribute">radius_<EM>Radius_Attribute</EM> - <EM>Radius-Attribute</EM></A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_domsvc_%2D_service_number_of_svc_domain_with_which">domsvc - service number of svc_domain with which to associate</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new account.  To add the account to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this account to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P>The additional fields pkgnum and svcpart (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
-defined.  An FS::cust_svc record will be created and inserted.</P>
-<P>If the configuration value (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine exists, and the 
-username, uid, and dir fields are defined, the <CODE>command(s)</CODE> specified in
-the shellmachine-useradd configuration are added to the job queue (see
-<A HREF=".././FS/queue.html">the FS::queue manpage</A> and <A HREF=".././bin/freeside-queued.html">the freeside-queued manpage</A>) to be exectued on shellmachine via ssh.
-This behaviour can be surpressed by setting $FS::svc_acct::nossh_hack true.
-If the shellmachine-useradd configuration file does not exist,</P>
-<PRE>
-  useradd -d $dir -m -s $shell -u $uid $username</PRE>
-<P>is the default.  If the shellmachine-useradd configuration file exists but
-it empty,</P>
-<PRE>
-  cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</PRE>
-<P>is the default instead.  Otherwise the contents of the file are treated as
-a double-quoted perl string, with the following variables available:
-$username, $uid, $gid, $dir, and $shell.</P>
-<P>(TODOC: cyrus config file, <A HREF=".././FS/queue.html">the FS::queue manpage</A> and <A HREF=".././bin/freeside-queued.html">the freeside-queued manpage</A>)</P>
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this account from the database.  If there is an error, returns the
-error, otherwise returns false.
-<P>The corresponding FS::cust_svc record will be deleted as well.</P>
-<P>If the configuration value (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine exists, the
-<CODE>command(s)</CODE> specified in the shellmachine-userdel configuration file are
-added to the job queue (see <A HREF=".././FS/queue.html">the FS::queue manpage</A> and <A HREF=".././bin/freeside-queued.html">the freeside-queued manpage</A>) to be executed
-on shellmachine via ssh.  This behavior can be surpressed by setting
-$FS::svc_acct::nossh_hack true.  If the shellmachine-userdel configuration
-file does not exist,</P>
-<PRE>
-  userdel $username</PRE>
-<P>is the default.  If the shellmachine-userdel configuration file exists but
-is empty,</P>
-<PRE>
-  rm -rf $dir</PRE>
-<P>is the default instead.  Otherwise the contents of the file are treated as a
-double-quoted perl string, with the following variables available:
-$username and $dir.</P>
-<P>(TODOC: cyrus config file)</P>
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P>If the configuration value (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) shellmachine exists, and the 
-dir field has changed, the <CODE>command(s)</CODE> specified in the shellmachine-usermod
-configuraiton file are added to the job queue (see <A HREF=".././FS/queue.html">the FS::queue manpage</A> and
-<A HREF=".././bin/freeside-queued.html">the freeside-queued manpage</A>) to be executed on shellmachine via ssh.  This behavior can
-be surpressed by setting $FS::svc-acct::nossh_hack true.  If the
-shellmachine-userdel configuration file does not exist or is empty,</P>
-<PRE>
-  [ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || (
-    chmod u+t $old_dir;
-    mkdir $new_dir;
-    cd $old_dir;
-    find . -depth -print | cpio -pdm $new_dir;
-    chmod u-t $new_dir;
-    chown -R $uid.$gid $new_dir;
-    rm -rf $old_dir
-  )</PRE>
-<P>is the default.  This behaviour can be surpressed by setting
-$FS::svc_acct::nossh_hack true.</P>
-<P></P>
-<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
-<DD>
-Suspends this account by prefixing *SUSPENDED* to the password.  If there is an
-error, returns the error, otherwise returns false.
-<P>Called by the suspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
-<DD>
-Unsuspends this account by removing *SUSPENDED* from the password.  If there is
-an error, returns the error, otherwise returns false.
-<P>Called by the unsuspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
-<DD>
-Just returns false (no error) for now.
-<P>Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid service.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-<P>Sets any fixed values; see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>.</P>
-<P></P>
-<DT><STRONG><A NAME="item_radius">radius</A></STRONG><BR>
-<DD>
-Depriciated, use radius_reply instead.
-<P></P>
-<DT><STRONG><A NAME="item_radius_reply">radius_reply</A></STRONG><BR>
-<DD>
-Returns key/value pairs, suitable for assigning to a hash, for any RADIUS
-reply attributes of this record.
-<P>Note that this is now the preferred method for reading RADIUS attributes - 
-accessing the columns directly is discouraged, as the column names are
-expected to change in the future.</P>
-<P></P>
-<DT><STRONG><A NAME="item_radius_check">radius_check</A></STRONG><BR>
-<DD>
-Returns key/value pairs, suitable for assigning to a hash, for any RADIUS
-check attributes of this record.
-<P>Accessing RADIUS attributes directly is not supported and will break in the
-future.</P>
-<P></P>
-<DT><STRONG><A NAME="item_domain">domain</A></STRONG><BR>
-<DD>
-Returns the domain associated with this account.
-<P></P>
-<DT><STRONG><A NAME="item_svc_domain">svc_domain</A></STRONG><BR>
-<DD>
-Returns the FS::svc_domain record for this account's domain (see
-<A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>.
-<P></P>
-<DT><STRONG><A NAME="item_cust_svc">cust_svc</A></STRONG><BR>
-<DD>
-Returns the FS::cust_svc record for this account (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>).
-<P>sub cust_svc {
-  my $self = shift;
-  qsearchs( 'cust_svc', { 'svcnum' =&gt; $self-&gt;svcnum } );
-}</P>
-<P></P>
-<DT><STRONG><A NAME="item_email">email</A></STRONG><BR>
-<DD>
-Returns an email address associated with the account.
-<P></P>
-<DT><STRONG><A NAME="item_seconds_since_TIMESTAMP">seconds_since TIMESTAMP</A></STRONG><BR>
-<DD>
-Returns the number of seconds this account has been online since TIMESTAMP.
-See <A HREF=".././FS/session.html">the FS::session manpage</A>
-<P>TIMESTAMP is specified as a UNIX timestamp; see <EM>perlfunc/``time''</EM>.  Also see
-<A HREF="../Time/Local.html">the Time::Local manpage</A> and <A HREF="../Date/Parse.html">the Date::Parse manpage</A> for conversion functions.</P>
-<P></P>
-<DT><STRONG><A NAME="item_ssh">ssh</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_acct.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The bits which ssh should fork before doing so (or maybe queue jobs for a
-daemon).</P>
-<P>The $recref stuff in sub check should be cleaned up.</P>
-<P>The suspend, unsuspend and cancel methods update the database, but not the
-current object.  This is probably a bug as it's unexpected and
-counterintuitive.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/svc_Common.html">the FS::svc_Common manpage</A>, edit/part_svc.cgi from an installed web interface,
-export.html from the base documentation, <A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>,
-<A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF=".././FS/queue.html">the FS::queue manpage</A>,
-<A HREF=".././bin/freeside-queued.html">the freeside-queued manpage</A>), <A HREF="../Net/SSH.html">the Net::SSH manpage</A>, <A HREF="#item_ssh">ssh</A>, <A HREF=".././FS/svc_acct_pop.html">the FS::svc_acct_pop manpage</A>,
-schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/svc_acct_pop.html b/httemplate/docs/man/FS/svc_acct_pop.html
deleted file mode 100644
index 80900627e..000000000
--- a/httemplate/docs/man/FS/svc_acct_pop.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::svc_acct_pop - Object methods for svc_acct_pop records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#subroutines">SUBROUTINES</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::svc_acct_pop - Object methods for svc_acct_pop records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::svc_acct_pop;</PRE>
-<PRE>
-  $record = new FS::svc_acct_pop \%hash;
-  $record = new FS::svc_acct_pop { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $html = FS::svc_acct_pop::popselector( $popnum, $state );</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::svc_acct object represents an point of presence.  FS::svc_acct_pop
-inherits from FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">popnum - primary key (assigned automatically for new accounts)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_city">city</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_state">state</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_ac_%2D_area_code">ac - area code</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_exch_%2D_exchange">exch - exchange</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_loc_%2D_rest_of_number">loc - rest of number</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new point of presence (if only it were that easy!).  To add the 
-point of presence to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this point of presence to the database.  If there is an error, returns the
-error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Removes this point of presence from the database.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid point of presence.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-<P></P>
-<DT><STRONG><A NAME="item_text">text</A></STRONG><BR>
-<DD>
-Returns:
-<P>``$city, $state ($ac)/$exch''</P>
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="subroutines">SUBROUTINES</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_popselector_%5B_POPNUM_%5B_STATE_%5D_%5D">popselector [ POPNUM [ STATE ] ]</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_acct_pop.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>It should be renamed to part_pop.</P>
-<P>popselector?  putting web ui components in here?  they should probably live
-somewhere else...</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/part_pop_local.html">the FS::part_pop_local manpage</A>, schema.html from the
-base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/svc_acct_sm.html b/httemplate/docs/man/FS/svc_acct_sm.html
deleted file mode 100644
index 86c7b8b3b..000000000
--- a/httemplate/docs/man/FS/svc_acct_sm.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::svc_acct_sm - Object methods for svc_acct_sm records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#warning">WARNING</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::svc_acct_sm - Object methods for svc_acct_sm records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::svc_acct_sm;</PRE>
-<PRE>
-  $record = new FS::svc_acct_sm \%hash;
-  $record = new FS::svc_acct_sm { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $error = $record-&gt;suspend;</PRE>
-<PRE>
-  $error = $record-&gt;unsuspend;</PRE>
-<PRE>
-  $error = $record-&gt;cancel;</PRE>
-<P>
-<HR>
-<H1><A NAME="warning">WARNING</A></H1>
-<P>FS::svc_acct_sm is <STRONG>depreciated</STRONG>.  This class is only included for migration
-purposes.  See <A HREF=".././FS/svc_forward.html">the FS::svc_forward manpage</A>.</P>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::svc_acct_sm object represents a virtual mail alias.  FS::svc_acct_sm
-inherits from FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">svcnum - primary key (assigned automatcially for new accounts)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_domain">domsvc - svcnum of the virtual domain (see <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_account">domuid - uid of the target account (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_domuser_%2D_virtual_username">domuser - virtual username</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new virtual mail alias.  To add the virtual mail alias to the
-database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this virtual mail alias to the database.  If there is an error, returns
-the error, otherwise returns false.
-<P>The additional fields pkgnum and svcpart (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
-defined.  An FS::cust_svc record will be created and inserted.</P>
-<PRE>
- #If the configuration values (see L&lt;FS::Conf&gt;) shellmachine and qmailmachines
- #exist, and domuser is `*' (meaning a catch-all mailbox), the command:
- #
- #  [ -e $dir/.qmail-$qdomain-default ] || {
- #    touch $dir/.qmail-$qdomain-default;
- #    chown $uid:$gid $dir/.qmail-$qdomain-default;
- #  }
- #
- #is executed on shellmachine via ssh (see L&lt;dot-qmail/&quot;EXTENSION ADDRESSES&quot;&gt;).
- #This behaviour can be surpressed by setting $FS::svc_acct_sm::nossh_hack true.</PRE>
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this virtual mail alias from the database.  If there is an error,
-returns the error, otherwise returns false.
-<P>The corresponding FS::cust_svc record will be deleted as well.</P>
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
-<DD>
-Just returns false (no error) for now.
-<P>Called by the suspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
-<DD>
-Just returns false (no error) for now.
-<P>Called by the unsuspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
-<DD>
-Just returns false (no error) for now.
-<P>Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid virtual mail alias.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert and
-replace methods.
-<P>Sets any fixed values; see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>.</P>
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_acct_sm.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>The remote commands should be configurable.</P>
-<P>The $recref stuff in sub check should be cleaned up.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/svc_forward.html">the FS::svc_forward manpage</A></P>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>, <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>,
-<A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>, <A HREF=".././FS/svc_domain.html">the FS::svc_domain manpage</A>, <A HREF="../Net/SSH.html">the Net::SSH manpage</A>, <EM>ssh</EM>, <EM>dot-qmail</EM>,
-schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/svc_domain.html b/httemplate/docs/man/FS/svc_domain.html
deleted file mode 100644
index 266e0b355..000000000
--- a/httemplate/docs/man/FS/svc_domain.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::svc_domain - Object methods for svc_domain records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::svc_domain - Object methods for svc_domain records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::svc_domain;</PRE>
-<PRE>
-  $record = new FS::svc_domain \%hash;
-  $record = new FS::svc_domain { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $error = $record-&gt;suspend;</PRE>
-<PRE>
-  $error = $record-&gt;unsuspend;</PRE>
-<PRE>
-  $error = $record-&gt;cancel;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::svc_domain object represents a domain.  FS::svc_domain inherits from
-FS::svc_Common.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_key">svcnum - primary key (assigned automatically for new accounts)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_domain">domain</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_catchall_%2D_optional_svcnum_of_an_svc_acct_record">catchall - optional svcnum of an svc_acct record, designating an email catchall account.</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new domain.  To add the domain to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this domain to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P>The additional fields <EM>pkgnum</EM> and <EM>svcpart</EM> (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
-defined.  An FS::cust_svc record will be created and inserted.</P>
-<P>The additional field <EM>action</EM> should be set to <EM>N</EM> for new domains or <EM>M</EM>
-for transfers.</P>
-<P>A registration or transfer email will be submitted unless
-$FS::svc_domain::whois_hack is true.</P>
-<P>The additional field <EM>email</EM> can be used to manually set the admin contact
-email address on this email.  Otherwise, the svc_acct records for this package 
-(see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>) are searched.  If there is exactly one svc_acct record
-in the same package, it is automatically used.  Otherwise an error is returned.</P>
-<P>If any <EM>soamachine</EM> configuration file exists, an SOA record is added to
-the domain_record table (see &lt;FS::domain_record&gt;).</P>
-<P>If any machines are defined in the <EM>nsmachines</EM> configuration file, NS
-records are added to the domain_record table (see <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>).</P>
-<P>If any machines are defined in the <EM>mxmachines</EM> configuration file, MX
-records are added to the domain_record table (see <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>).</P>
-<P>If a machine is defined in the <EM>shellmachine</EM> configuration value, the
-<EM>qmailmachines</EM> configuration file exists, and the <EM>catchall</EM> field points
-to an an account with a home directory (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>), the command:</P>
-<PRE>
-  [ -e $dir/.qmail-$qdomain-defualt ] || {
-    touch $dir/.qmail-$qdomain-default;
-    chown $uid:$gid $dir/.qmail-$qdomain-default;
-  }</PRE>
-<P>is executed on shellmachine via ssh (see <EM>dot-qmail/``EXTENSION ADDRESSES''</EM>).
-This behaviour can be supressed by setting $FS::svc_domain::nossh_hack true.</P>
-<P>a machine is defined
-in the</P>
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this domain from the database.  If there is an error, returns the
-error, otherwise returns false.
-<P>The corresponding FS::cust_svc record will be deleted as well.</P>
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
-<DD>
-Just returns false (no error) for now.
-<P>Called by the suspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
-<DD>
-Just returns false (no error) for now.
-<P>Called by the unsuspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
-<DD>
-Just returns false (no error) for now.
-<P>Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).</P>
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid domain.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-<P>Sets any fixed values; see <A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>.</P>
-<P></P>
-<DT><STRONG><A NAME="item_whois">whois</A></STRONG><BR>
-<DD>
-Returns the Net::Whois::Domain object (see <A HREF="../Net/Whois.html">the Net::Whois manpage</A>) for this domain, or
-undef if the domain is not found in whois.
-<P>(If $FS::svc_domain::whois_hack is true, returns that in all cases instead.)</P>
-<P></P>
-<DT><STRONG><A NAME="item__whois">_whois</A></STRONG><BR>
-<DD>
-Depriciated.
-<P></P>
-<DT><STRONG><A NAME="item_submit_internic">submit_internic</A></STRONG><BR>
-<DD>
-Submits a registration email for this domain.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_domain.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>All BIND/DNS fields should be included (and exported).</P>
-<P>Delete doesn't send a registration template.</P>
-<P>All registries should be supported.</P>
-<P>Should change action to a real field.</P>
-<P>The $recref stuff in sub check should be cleaned up.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/svc_Common.html">the FS::svc_Common manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
-<A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, <A HREF="../Net/Whois.html">the Net::Whois manpage</A>, <EM>ssh</EM>,
-<EM>dot-qmail</EM>, schema.html from the base documentation, config.html from the
-base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/svc_www.html b/httemplate/docs/man/FS/svc_www.html
deleted file mode 100644
index 0e7f4f197..000000000
--- a/httemplate/docs/man/FS/svc_www.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::svc_www - Object methods for svc_www records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::svc_www - Object methods for svc_www records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::svc_www;</PRE>
-<PRE>
-  $record = new FS::svc_www \%hash;
-  $record = new FS::svc_www { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<PRE>
-  $error = $record-&gt;suspend;</PRE>
-<PRE>
-  $error = $record-&gt;unsuspend;</PRE>
-<PRE>
-  $error = $record-&gt;cancel;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::svc_www object represents an web virtual host.  FS::svc_www inherits
-from FS::svc_Common.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_svcnum_%2D_primary_key">svcnum - primary key</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_recnum_%2D_DNS_%60A%27_record_corresponding_to_thi">recnum - DNS `A' record corresponding to this web virtual host. (see <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>)</A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_account">usersvc - account (see <A HREF=".././FS/svc_acct.html">the FS::svc_acct manpage</A>) corresponding to this web virtual host.</A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Creates a new web virtual host.  To add the record to the database, see
-<A HREF="#insert">insert</A>.
-<P>Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the <EM>hash</EM> method.</P>
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P>The additional fields pkgnum and svcpart (see <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>) should be 
-defined.  An FS::cust_svc record will be created and inserted.</P>
-<P>If the configuration values (see <A HREF=".././FS/Conf.html">the FS::Conf manpage</A>) <EM>apachemachine</EM>, and
-<EM>apacheroot</EM> exist, the command:</P>
-<PRE>
-  mkdir $apacheroot/$zone;
-  chown $username $apacheroot/$zone;
-  ln -s $apacheroot/$zone $homedir/$zone</PRE>
-<P><EM>$zone</EM> is the DNS A record pointed to by <EM>recnum</EM>
-<EM>$username</EM> is the username pointed to by <EM>usersvc</EM>
-<EM>$homedir</EM> is that user's home directory</P>
-<P>is executed on <EM>apachemachine</EM> via ssh.  This behaviour can be surpressed by
-setting $FS::svc_www::nossh_hack true.</P>
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Delete this record from the database.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_suspend">suspend</A></STRONG><BR>
-<DD>
-Called by the suspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_unsuspend">unsuspend</A></STRONG><BR>
-<DD>
-Called by the unsuspend method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_cancel">cancel</A></STRONG><BR>
-<DD>
-Called by the cancel method of FS::cust_pkg (see <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>).
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and repalce methods.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: svc_www.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/svc_Common.html">the FS::svc_Common manpage</A>, <A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/domain_record.html">the FS::domain_record manpage</A>, <A HREF=".././FS/cust_svc.html">the FS::cust_svc manpage</A>,
-<A HREF=".././FS/part_svc.html">the FS::part_svc manpage</A>, <A HREF=".././FS/cust_pkg.html">the FS::cust_pkg manpage</A>, schema.html from the base documentation.</P>
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/type_pkgs.html b/httemplate/docs/man/FS/type_pkgs.html
deleted file mode 100644
index ba258252f..000000000
--- a/httemplate/docs/man/FS/type_pkgs.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::type_pkgs - Object methods for type_pkgs records</TITLE>
-<LINK REV="made" HREF="mailto:perl@packages.debian.org">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#methods">METHODS</A></LI>
-	<LI><A HREF="#version">VERSION</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>FS::type_pkgs - Object methods for type_pkgs records</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-  use FS::type_pkgs;</PRE>
-<PRE>
-  $record = new FS::type_pkgs \%hash;
-  $record = new FS::type_pkgs { 'column' =&gt; 'value' };</PRE>
-<PRE>
-  $error = $record-&gt;insert;</PRE>
-<PRE>
-  $error = $new_record-&gt;replace($old_record);</PRE>
-<PRE>
-  $error = $record-&gt;delete;</PRE>
-<PRE>
-  $error = $record-&gt;check;</PRE>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>An FS::type_pkgs record links an agent type (see <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A>) to a
-billing item definition (see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A>).  FS::type_pkgs inherits from
-FS::Record.  The following fields are currently supported:</P>
-<DL>
-<DT><STRONG><A NAME="item_typenum_%2D_Agent_type%2C_see_FS%3A%3Aagent_type">typenum - Agent type, see <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A></A></STRONG><BR>
-<DD>
-<DT><STRONG><A NAME="item_pkgpart_%2D_Billing_item_definition%2C_see_FS%3A%3">pkgpart - Billing item definition, see <A HREF=".././FS/part_pkg.html">the FS::part_pkg manpage</A></A></STRONG><BR>
-<DD>
-</DL>
-<P>
-<HR>
-<H1><A NAME="methods">METHODS</A></H1>
-<DL>
-<DT><STRONG><A NAME="item_new">new HASHREF</A></STRONG><BR>
-<DD>
-Create a new record.  To add the record to the database, see <A HREF="#insert">insert</A>.
-<P></P>
-<DT><STRONG><A NAME="item_insert">insert</A></STRONG><BR>
-<DD>
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_delete">delete</A></STRONG><BR>
-<DD>
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_replace_OLD_RECORD">replace OLD_RECORD</A></STRONG><BR>
-<DD>
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-<P></P>
-<DT><STRONG><A NAME="item_check">check</A></STRONG><BR>
-<DD>
-Checks all fields to make sure this is a valid record.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-<P></P></DL>
-<P>
-<HR>
-<H1><A NAME="version">VERSION</A></H1>
-<P>$Id: type_pkgs.html,v 1.3 2002-01-29 17:42:46 ivan Exp $</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><A HREF=".././FS/Record.html">the FS::Record manpage</A>, <A HREF=".././FS/agent_type.html">the FS::agent_type manpage</A>, <A HREF="../FS/part_pkgs.html">the FS::part_pkgs manpage</A>, schema.html from the base
-documentation.</P>
-
-</BODY>
-
-</HTML>
-- 
cgit v1.2.1


From 1fd6d8cf5d7854860ef4fd10ed89828e0c04ec39 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 30 Jan 2002 14:18:09 +0000
Subject: remove   use Module; and   $cgi = new CGI;   &cgisuidsetup(); from
 all templates.  should work better under Mason.

---
 FS/FS/CGI.pm                                       |  6 +-
 htetc/global.asa                                   | 44 ++++++++++++---
 htetc/handler.pl                                   | 42 ++++++++++++--
 httemplate/browse/agent.cgi                        | 20 +------
 httemplate/browse/agent_type.cgi                   | 20 +------
 httemplate/browse/cust_main_county.cgi             | 17 +-----
 httemplate/browse/cust_pay_batch.cgi               | 18 +-----
 httemplate/browse/nas.cgi                          | 18 +-----
 httemplate/browse/part_bill_event.cgi              |  7 ++-
 httemplate/browse/part_pkg.cgi                     | 21 +------
 httemplate/browse/part_referral.cgi                | 19 +------
 httemplate/browse/part_svc.cgi                     |  4 +-
 httemplate/browse/queue.cgi                        | 18 +-----
 httemplate/browse/svc_acct_pop.cgi                 | 19 +------
 httemplate/docs/install.html                       |  2 +-
 httemplate/edit/agent.cgi                          | 25 ++-------
 httemplate/edit/agent_type.cgi                     | 26 ++-------
 httemplate/edit/cust_bill_pay.cgi                  | 27 +++------
 httemplate/edit/cust_credit.cgi                    | 25 ++-------
 httemplate/edit/cust_credit_bill.cgi               | 27 +++------
 httemplate/edit/cust_main.cgi                      | 65 ++++++++--------------
 httemplate/edit/cust_main_county-expand.cgi        | 20 ++-----
 httemplate/edit/cust_main_county.cgi               | 23 ++------
 httemplate/edit/cust_pay.cgi                       | 19 ++-----
 httemplate/edit/cust_pkg.cgi                       | 39 +++++--------
 httemplate/edit/part_bill_event.cgi                | 45 ++++++++++-----
 httemplate/edit/part_referral.cgi                  | 22 ++------
 httemplate/edit/part_svc.cgi                       |  8 +--
 httemplate/edit/process/agent.cgi                  | 22 ++------
 httemplate/edit/process/agent_type.cgi             | 25 ++-------
 httemplate/edit/process/cust_bill_pay.cgi          | 22 ++------
 httemplate/edit/process/cust_credit.cgi            | 21 ++-----
 httemplate/edit/process/cust_credit_bill.cgi       | 22 ++------
 httemplate/edit/process/cust_main.cgi              | 33 +++--------
 .../edit/process/cust_main_county-collapse.cgi     | 19 +------
 .../edit/process/cust_main_county-expand.cgi       | 20 ++-----
 httemplate/edit/process/cust_main_county.cgi       | 14 +----
 httemplate/edit/process/cust_pay.cgi               | 22 ++------
 httemplate/edit/process/cust_pkg.cgi               | 21 ++-----
 httemplate/edit/process/part_pkg.cgi               | 25 +++------
 httemplate/edit/process/part_referral.cgi          | 19 ++-----
 httemplate/edit/process/quick-cust_pkg.cgi         | 20 ++-----
 httemplate/edit/process/svc_acct.cgi               | 20 ++-----
 httemplate/edit/process/svc_acct_pop.cgi           | 22 ++------
 httemplate/edit/process/svc_acct_sm.cgi            | 21 ++-----
 httemplate/edit/process/svc_domain.cgi             | 19 ++-----
 httemplate/edit/process/svc_forward.cgi            | 21 ++-----
 httemplate/edit/svc_acct.cgi                       | 57 +++++++------------
 httemplate/edit/svc_acct_pop.cgi                   | 20 ++-----
 httemplate/edit/svc_acct_sm.cgi                    | 41 +++++---------
 httemplate/edit/svc_domain.cgi                     | 29 +++-------
 httemplate/edit/svc_forward.cgi                    | 33 ++++-------
 httemplate/misc/bill.cgi                           | 23 ++------
 httemplate/misc/cancel-unaudited.cgi               | 28 +++-------
 httemplate/misc/cancel_pkg.cgi                     | 25 ++-------
 httemplate/misc/catchall.cgi                       | 28 +++-------
 httemplate/misc/delete-customer.cgi                | 21 ++-----
 httemplate/misc/expire_pkg.cgi                     | 26 +++------
 httemplate/misc/link.cgi                           | 27 +++------
 httemplate/misc/print-invoice.cgi                  | 26 +++------
 httemplate/misc/process/catchall.cgi               | 21 ++-----
 httemplate/misc/process/delete-customer.cgi        | 23 ++------
 httemplate/misc/process/link.cgi                   | 26 +++------
 httemplate/misc/susp_pkg.cgi                       | 22 ++------
 httemplate/misc/unsusp_pkg.cgi                     | 22 ++------
 httemplate/search/cust_bill.cgi                    | 19 +------
 httemplate/search/cust_main.cgi                    | 65 ++++++++++------------
 httemplate/search/cust_pay.cgi                     | 22 ++------
 httemplate/search/cust_pkg.cgi                     | 32 +++--------
 httemplate/search/svc_acct.cgi                     | 34 ++++-------
 httemplate/search/svc_acct_sm.cgi                  | 28 +++-------
 httemplate/search/svc_domain.cgi                   | 32 +++--------
 httemplate/view/cust_bill.cgi                      | 26 ++-------
 httemplate/view/cust_main.cgi                      | 65 +++++++---------------
 httemplate/view/cust_pkg.cgi                       | 45 +++++----------
 httemplate/view/svc_acct.cgi                       | 48 +++++-----------
 httemplate/view/svc_acct_sm.cgi                    | 51 ++++++-----------
 httemplate/view/svc_domain.cgi                     | 36 ++++--------
 httemplate/view/svc_forward.cgi                    | 47 +++++-----------
 httemplate/view/svc_www.cgi                        | 33 +++--------
 80 files changed, 619 insertions(+), 1516 deletions(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index c66bfe3c2..40932147e 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -168,9 +168,9 @@ Returns HTML tag for beginning a table.
 sub table {
   my $col = shift;
   if ( $col ) {
-    qq!<TABLE BGCOLOR="$col" BORDER=1 WIDTH="100%">!;
+    qq!<TABLE BGCOLOR="$col" BORDER=1 WIDTH="100%" CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">!;
   } else { 
-    "<TABLE BORDER=1>";
+    '<TABLE BORDER=1 CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">';
   }
 }
 
@@ -202,7 +202,7 @@ sub ntable {
   if ( $col ) {
     qq!<TABLE BGCOLOR="$col" BORDER=0 CELLSPACING=$cellspacing>!;
   } else {
-    "<TABLE BORDER>";
+    '<TABLE BORDER CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">';
   }
 
 }
diff --git a/htetc/global.asa b/htetc/global.asa
index 20ef1467d..c4b4380d6 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -2,19 +2,49 @@ use strict;
 use vars qw( $cgi $p );
 use CGI;
 #use CGI::Carp qw(fatalsToBrowser);
-use HTML::Entities;
 use Date::Format;
 use Date::Parse;
 use Tie::IxHash;
-use FS::UID qw(cgisuidsetup dbh);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::part_svc;
-use FS::part_pkg;
-use FS::pkg_svc;
+use HTML::Entities;
+use IO::Handle;
+use IO::File;
+use String::Approx qw(amatch);
+use FS::UID qw(cgisuidsetup dbh getotaker datasrc);
+use FS::Record qw(qsearch qsearchs fields dbdef);
+use FS::Conf;
+use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
+               small_custview);
+
+use FS::agent;
+use FS::agent_type;
+use FS::domain_record;
+use FS::cust_bill;
+use FS::cust_bill_pay;
+use FS::cust_credit;
+use FS::cust_credit_bill;
+use FS::cust_main;
+use FS::cust_main_county;
+use FS::cust_pay;
 use FS::cust_pkg;
+use FS::cust_refund;
 use FS::cust_svc;
+use FS::nas;
 use FS::part_bill_event;
-use FS::CGI qw(header menubar popurl table itable ntable);
+use FS::part_pkg;
+use FS::part_referral;
+use FS::part_svc;
+use FS::pkg_svc;
+use FS::port;
+use FS::queue;
+use FS::raddb;
+use FS::session;
+use FS::svc_acct;
+use FS::svc_acct_pop qw(popselector);
+use FS::svc_acct_sm;
+use FS::svc_domain;
+use FS::svc_forward;
+use FS::svc_www;
+use FS::type_pkgs;
 
 sub Script_OnStart {
   $cgi = new CGI;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 6ff9d436c..f80c79e65 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -61,15 +61,45 @@ sub handler
       use Date::Parse;
       use Tie::IxHash;
       use HTML::Entities;
-      use FS::UID qw(cgisuidsetup);
-      use FS::Record qw(qsearch qsearchs fields);
-      use FS::part_svc;
-      use FS::part_pkg;
-      use FS::pkg_svc;
+      use IO::Handle;
+      use IO::File;
+      use String::Approx qw(amatch);
+      use FS::UID qw(cgisuidsetup dbh getotaker datasrc);
+      use FS::Record qw(qsearch qsearchs fields dbdef);
+      use FS::Conf;
+      use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
+                     small_custview);
+
+      use FS::agent;
+      use FS::agent_type;
+      use FS::domain_record;
+      use FS::cust_bill;
+      use FS::cust_bill_pay;
+      use FS::cust_credit;
+      use FS::cust_credit_bill;
+      use FS::cust_main;
+      use FS::cust_main_county;
+      use FS::cust_pay;
       use FS::cust_pkg;
+      use FS::cust_refund;
       use FS::cust_svc;
+      use FS::nas;
       use FS::part_bill_event;
-      use FS::CGI qw(header menubar popurl table itable ntable);
+      use FS::part_pkg;
+      use FS::part_referral;
+      use FS::part_svc;
+      use FS::pkg_svc;
+      use FS::port;
+      use FS::queue;
+      use FS::raddb;
+      use FS::session;
+      use FS::svc_acct;
+      use FS::svc_acct_pop qw(popselector);
+      use FS::svc_acct_sm;
+      use FS::svc_domain;
+      use FS::svc_forward;
+      use FS::svc_www;
+      use FS::type_pkgs;
 
       $cgi = new CGI;
       &cgisuidsetup($cgi);
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 62004490f..067a06b30 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -1,15 +1,5 @@
+<!-- $Id: agent.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: agent.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $ui $cgi $p $agent );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar table popurl);
-use FS::agent;
-use FS::agent_type;
 
 #Begin silliness
 #
@@ -22,12 +12,6 @@ use FS::agent_type;
 #__END__
 #End silliness
 
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
-
 print header('Agent Listing', menubar(
   'Main Menu'   => $p,
   'Agent Types' => $p. 'browse/agent_type.cgi',
@@ -47,7 +31,7 @@ END
 #        <TH><FONT SIZE=-1>Agent #</FONT></TH>
 #        <TH>Agent</TH>
 
-foreach $agent ( sort { 
+foreach my $agent ( sort { 
   $a->getfield('agentnum') <=> $b->getfield('agentnum')
 } qsearch('agent',{}) ) {
   my($hashref)=$agent->hashref;
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index 11ba20ac5..8321048e7 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -1,22 +1,6 @@
+<!-- $Id: agent_type.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: agent_type.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $p $agent_type );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar popurl table);
-use FS::agent_type;
-use FS::type_pkgs;
-use FS::part_pkg;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
 print header("Agent Type Listing", menubar(
   'Main Menu' => $p,
 )), "Agent types define groups of packages that you can then assign to".
@@ -27,7 +11,7 @@ print header("Agent Type Listing", menubar(
       </TR>
 END
 
-foreach $agent_type ( sort { 
+foreach my $agent_type ( sort { 
   $a->getfield('typenum') <=> $b->getfield('typenum')
 } qsearch('agent_type',{}) ) {
   my($hashref)=$agent_type->hashref;
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index bbd75cc4a..89b1bfd71 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -1,20 +1,5 @@
+<!-- $Id: cust_main_county.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_main_county.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $p $cust_main_county );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar popurl table);
-use FS::cust_main_county;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
 
 print header("Tax Rate Listing", menubar(
   'Main Menu' => $p,
diff --git a/httemplate/browse/cust_pay_batch.cgi b/httemplate/browse/cust_pay_batch.cgi
index 7779bd0c3..960843adf 100755
--- a/httemplate/browse/cust_pay_batch.cgi
+++ b/httemplate/browse/cust_pay_batch.cgi
@@ -1,21 +1,5 @@
+<!-- $Id: cust_pay_batch.cgi,v 1.2 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_pay_batch.cgi,v 1.1 2001-10-30 19:05:27 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $p ); # $part_referral );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch);
-use FS::CGI qw(header menubar popurl table);
-use FS::queue;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
 
 print header("Pending credit card batch", menubar(
   'Main Menu' => $p,
diff --git a/httemplate/browse/nas.cgi b/httemplate/browse/nas.cgi
index 6df40e049..b392dc083 100755
--- a/httemplate/browse/nas.cgi
+++ b/httemplate/browse/nas.cgi
@@ -1,22 +1,6 @@
+<!-- $Id -->
 <%
 
-use strict;
-use vars qw( $cgi $p );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch); # qsearchs);
-use FS::CGI qw(header menubar table popurl);
-use FS::nas;
-use FS::port;
-use FS::session;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$p=popurl(2);
-
 print header('NAS ports', menubar(
   'Main Menu' => $p,
 ));
diff --git a/httemplate/browse/part_bill_event.cgi b/httemplate/browse/part_bill_event.cgi
index f33997666..cd90bc1da 100755
--- a/httemplate/browse/part_bill_event.cgi
+++ b/httemplate/browse/part_bill_event.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_bill_event.cgi,v 1.1 2002-01-29 16:33:15 ivan Exp $ -->
+<!-- $Id: part_bill_event.cgi,v 1.2 2002-01-30 14:18:08 ivan Exp $ -->
 <% 
 
 my %search;
@@ -22,7 +22,7 @@ my $total = scalar(@part_bill_event);
       : do { $cgi->param('showdisabled', 1);
              '( <a href="'. $cgi->self_url. '">show disabled events</a> )'; }
 %>
-<TABLE BORDER=1>
+<%= table() %>
   <TR>
     <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Event</TH>
     <TH>Payby</TH>
@@ -32,11 +32,12 @@ my $total = scalar(@part_bill_event);
 
 <% foreach my $part_bill_event ( sort {    $a->payby     cmp $b->payby
                                         || $a->seconds   <=> $b->seconds
+                                        || $a->weight    <=> $b->weight
                                         || $a->eventpart <=> $b->eventpart
                                       } @part_bill_event ) {
      my $url = "${p}edit/part_bill_event.cgi?". $part_bill_event->eventpart;
      use Time::Duration;
-     my $delay = duration_exact($hashref->{seconds});
+     my $delay = duration_exact($part_bill_event->seconds);
 %>
   <TR>
     <TD><A HREF="<%= $url %>">
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index d0b572aa4..22d139c99 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,22 +1,5 @@
+<!-- $Id: part_pkg.cgi,v 1.10 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: part_pkg.cgi,v 1.9 2001-12-27 09:26:14 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $p $part_pkg );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar popurl table);
-use FS::part_pkg;
-use FS::pkg_svc;
-use FS::part_svc;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
 
 my %search;
 if ( $cgi->param('showdisabled') ) {
@@ -56,7 +39,7 @@ print &table(), <<END;
       </TR>
 END
 
-foreach $part_pkg ( sort { 
+foreach my $part_pkg ( sort { 
   $a->getfield('pkgpart') <=> $b->getfield('pkgpart')
 } @part_pkg ) {
   my($hashref)=$part_pkg->hashref;
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index b82d4cba0..82f42924f 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -1,20 +1,5 @@
+<!-- $Id: part_referral.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: part_referral.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $p $part_referral );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch);
-use FS::CGI qw(header menubar popurl table);
-use FS::part_referral;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
 
 print header("Referral Listing", menubar(
   'Main Menu' => $p,
@@ -25,7 +10,7 @@ print header("Referral Listing", menubar(
       </TR>
 END
 
-foreach $part_referral ( sort { 
+foreach my $part_referral ( sort { 
   $a->getfield('refnum') <=> $b->getfield('refnum')
 } qsearch('part_referral',{}) ) {
   my($hashref)=$part_referral->hashref;
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index da523ca51..54d4b083b 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.6 2001-12-27 09:26:14 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <% 
 
 my %search;
@@ -22,7 +22,7 @@ my $total = scalar(@part_svc);
       : do { $cgi->param('showdisabled', 1);
              '( <a href="'. $cgi->self_url. '">show disabled services</a> )'; }
 %>
-<TABLE BORDER=1>
+<%= table() %>
   <TR>
     <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Service</TH>
     <TH>Table</TH>
diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index 6b5237240..af8989b82 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,21 +1,5 @@
+<!-- $Id: queue.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: queue.cgi,v 1.6 2001-10-31 16:52:42 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $p ); # $part_referral );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch);
-use FS::CGI qw(header menubar popurl table);
-use FS::queue;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
 
 print header("Job Queue", menubar(
   'Main Menu' => $p,
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index 21cb95f89..a881b9a00 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -1,20 +1,5 @@
+<!-- $Id: svc_acct_pop.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct_pop.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $p $svc_acct_pop );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar table popurl);
-use FS::svc_acct_pop;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
 
 print header('POP Listing', menubar(
   'Main Menu' => $p,
@@ -29,7 +14,7 @@ print header('POP Listing', menubar(
       </TR>
 END
 
-foreach $svc_acct_pop ( sort { 
+foreach my $svc_acct_pop ( sort { 
   #$a->getfield('popnum') <=> $b->getfield('popnum')
   $a->state cmp $b->state || $a->city cmp $b->city
     || $a->ac <=> $b->ac || $a->exch <=> $b->exch || $a->loc <=> $b->loc
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 20bb168df..564dccaba 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -68,7 +68,7 @@ mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* T
   <li>Edit the top-level Makefile:
     <ul>
       <li>Set <tt>DATASOURCE</tt> to your <a href="http://search.cpan.org/doc/TIMB/DBI-1.20/DBI.pm">DBI data source</a>, for example, <tt>DBI:Pg:host=localhost;dbname=freeside</tt> for PostgresSQL or <tt>DBI:mysql:freeside</tt> for MySQL.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.20/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD">manpage for your DBD</a> for the exact syntax of a DBI data source.
-      <li>Set <tt>DB_ADMIN_PASSWORD</tt> to the freeside database user's password.
+      <li>Set <tt>DB_PASSWORD</tt> to the freeside database user's password.
     </ul>
   <li>Add the freeside database to your database engine:
     <pre>
diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index a4dcda5e3..f3864e6c2 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,20 +1,7 @@
+<!-- $Id: agent.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: agent.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw ( $cgi $agent $action $hashref $p $agent_type );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header menubar popurl ntable);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::agent;
-use FS::agent_type;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
 
+my $agent;
 if ( $cgi->param('error') ) {
   $agent = new FS::agent ( {
     map { $_, scalar($cgi->param($_)) } fields('agent')
@@ -26,10 +13,8 @@ if ( $cgi->param('error') ) {
 } else { #adding
   $agent = new FS::agent {};
 }
-$action = $agent->agentnum ? 'Edit' : 'Add';
-$hashref = $agent->hashref;
-
-$p = popurl(2);
+my $action = $agent->agentnum ? 'Edit' : 'Add';
+my $hashref = $agent->hashref;
 
 print header("$action Agent", menubar(
   'Main Menu' => $p,
@@ -54,7 +39,7 @@ print &ntable("#cccccc", 2, ''), <<END;
   <TD><SELECT NAME="typenum" SIZE=1>
 END
 
-foreach $agent_type (qsearch('agent_type',{})) {
+foreach my $agent_type (qsearch('agent_type',{})) {
   print "<OPTION VALUE=". $agent_type->typenum;
   print " SELECTED"
     if $hashref->{typenum} && ( $hashref->{typenum} == $agent_type->typenum );
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index a2595bf41..c3ff30ff6 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,22 +1,7 @@
+<!-- $Id: agent_type.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: agent_type.cgi,v 1.6 2001-12-27 09:26:14 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $agent_type $action $hashref $p $part_pkg );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::agent_type;
-use FS::CGI qw(header menubar popurl);
-use FS::agent_type;
-use FS::part_pkg;
-use FS::type_pkgs;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
 
+my($agent_type);
 if ( $cgi->param('error') ) {
   $agent_type = new FS::agent_type ( {
     map { $_, scalar($cgi->param($_)) } fields('agent')
@@ -28,10 +13,9 @@ if ( $cgi->param('error') ) {
 } else { #adding
   $agent_type = new FS::agent_type {};
 }
-$action = $agent_type->typenum ? 'Edit' : 'Add';
-$hashref = $agent_type->hashref;
+my $action = $agent_type->typenum ? 'Edit' : 'Add';
+my $hashref = $agent_type->hashref;
 
-$p = popurl(2);
 print header("$action Agent Type", menubar(
   'Main Menu' => "$p",
   'View all agent types' => "${p}browse/agent_type.cgi",
@@ -50,7 +34,7 @@ print <<END;
 <BR><BR>Select which packages agents of this type may sell to customers<BR>
 END
 
-foreach $part_pkg ( qsearch('part_pkg',{ 'disabled' => '' }) ) {
+foreach my $part_pkg ( qsearch('part_pkg',{ 'disabled' => '' }) ) {
   print qq!<BR><INPUT TYPE="checkbox" NAME="pkgpart!,
         $part_pkg->getfield('pkgpart'), qq!" !,
        # ( 'CHECKED 'x scalar(
diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
index 793ed1009..fd56b328a 100755
--- a/httemplate/edit/cust_bill_pay.cgi
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -1,36 +1,22 @@
+<!-- $Id: cust_bill_pay.cgi,v 1.5 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_bill_pay.cgi,v 1.4 2001-12-18 19:36:21 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $query $custnum $paynum $amount $invnum $p1 $otaker $cust_pay );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch fields);
-use FS::cust_pay;
-use FS::cust_bill;
-
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
+my($paynum, $amount, $invnum);
 if ( $cgi->param('error') ) {
   $paynum = $cgi->param('paynum');
   $amount = $cgi->param('amount');
   $invnum = $cgi->param('invnum');
 } else {
-  ($query) = $cgi->keywords;
+  my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/;
   $paynum = $1;
   $amount = '';
   $invnum = '';
 }
 
-$otaker = getotaker;
+my $otaker = getotaker;
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 
 print header("Apply Payment", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
@@ -40,7 +26,8 @@ print <<END;
     <FORM ACTION="${p1}process/cust_bill_pay.cgi" METHOD=POST>
 END
 
-die unless $cust_pay = qsearchs('cust_pay', { 'paynum' => $paynum } );
+my $cust_pay = qsearchs('cust_pay', { 'paynum' => $paynum } );
+die "payment $paynum not found!" unless $cust_pay;
 
 my $unapplied = $cust_pay->unapplied;
 
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index e61463e07..7c8a80c22 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,21 +1,8 @@
+<!-- $Id: cust_credit.cgi,v 1.8 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_credit.cgi,v 1.7 2001-12-26 15:07:06 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $query $custnum $otaker $p1 $_date $amount $reason );
-use Date::Format;
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(header popurl small_custview);
-use FS::Record qw(fields);
-#use FS::cust_credit;
 
 my $conf = new FS::Conf;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
+my($custnum, $amount, $reason);
 if ( $cgi->param('error') ) {
   #$cust_credit = new FS::cust_credit ( {
   #  map { $_, scalar($cgi->param($_)) } fields('cust_credit')
@@ -25,18 +12,18 @@ if ( $cgi->param('error') ) {
   #$refund = $cgi->param('refund');
   $reason = $cgi->param('reason');
 } else {
-  ($query) = $cgi->keywords;
+  my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/;
   $custnum = $1;
   $amount = '';
   #$refund = 'yes';
   $reason = '';
 }
-$_date = time;
+my $_date = time;
 
-$otaker = getotaker;
+my $otaker = getotaker;
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 
 print header("Post Credit", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index a00734949..3748202a5 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,21 +1,7 @@
+<!-- $Id: cust_credit_bill.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.6 2001-12-18 19:30:31 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $amount $reason $cust_credit );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch fields);
-use FS::cust_credit;
-use FS::cust_bill;
-
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
+my($crednum, $amount, $invnum);
 if ( $cgi->param('error') ) {
   #$cust_credit_bill = new FS::cust_credit_bill ( {
   #  map { $_, scalar($cgi->param($_)) } fields('cust_credit_bill')
@@ -25,7 +11,7 @@ if ( $cgi->param('error') ) {
   #$refund = $cgi->param('refund');
   $invnum = $cgi->param('invnum');
 } else {
-  ($query) = $cgi->keywords;
+  my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/;
   $crednum = $1;
   $amount = '';
@@ -33,9 +19,9 @@ if ( $cgi->param('error') ) {
   $invnum = '';
 }
 
-$otaker = getotaker;
+my $otaker = getotaker;
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 
 print header("Apply Credit", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
@@ -45,7 +31,8 @@ print <<END;
     <FORM ACTION="${p1}process/cust_credit_bill.cgi" METHOD=POST>
 END
 
-die unless $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } );
+my $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } );
+die "credit $crednum not found!" unless $cust_credit;
 
 my $credited = $cust_credit->credited;
 
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index d3251c2b9..fad4d9e6d 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,39 +1,22 @@
+<!-- $Id: cust_main.cgi,v 1.19 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_main.cgi,v 1.18 2001-12-28 14:40:35 ivan Exp $ -->
-
-use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
-             $last $first $ss $company $address1 $address2 $city $zip 
-             $daytime $night $fax @invoicing_list $invoicing_list $payinfo
-             $payname %payby %paybychecked $refnum $otaker $r );
-use vars qw ( $conf $saved_pkgpart $username $password $popnum $ulen $ulen2 );
-use vars qw ( $error );
-#use CGI::Switch;
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-#use FS::Record qw(qsearch qsearchs fields);
-use FS::Record qw(qsearch qsearchs fields dbdef);
-use FS::CGI qw(header popurl itable table);
-use FS::cust_main;
-use FS::agent;
-use FS::part_referral;
-use FS::cust_main_county;
 
   #for misplaced logic below
-  use FS::part_pkg;
+  #use FS::part_pkg;
 
   #for false laziness below (now more properly lazy)
-  use FS::svc_acct_pop;
+  #use FS::svc_acct_pop;
 
   #for (other) false laziness below
-  use FS::agent;
-  use FS::type_pkgs;
+  #use FS::agent;
+  #use FS::type_pkgs;
 
-$conf = new FS::Conf;
+my $conf = new FS::Conf;
 
 #get record
 
-$error = '';
+my $error = '';
+my($custnum, $username, $password, $popnum, $cust_main, $saved_pkgpart);
 if ( $cgi->param('error') ) {
   $error = $cgi->param('error');
   $cust_main = new FS::cust_main ( {
@@ -69,11 +52,11 @@ if ( $cgi->param('error') ) {
   $popnum = 0;
 }
 $cgi->delete_all();
-$action = $custnum ? 'Edit' : 'Add';
+my $action = $custnum ? 'Edit' : 'Add';
 
 # top
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("Customer $action", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $error, "</FONT>"
   if $error;
@@ -86,12 +69,12 @@ print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST NAME="form1">!,
 
 # agent
 
-$r = qq!<font color="#ff0000">*</font>!;
+my $r = qq!<font color="#ff0000">*</font>!;
 
-@agents = qsearch( 'agent', {} );
+my @agents = qsearch( 'agent', {} );
 #die "No agents created!" unless @agents;
 die "You have not created any agents.  You must create at least one agent before adding a customer.  Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents;
-$agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
+my $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
 if ( scalar(@agents) == 1 ) {
   print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!;
 } else {
@@ -109,7 +92,7 @@ if ( scalar(@agents) == 1 ) {
 
 #referral
 
-$refnum = $cust_main->refnum || $conf->config('referraldefault') || 0;
+my $refnum = $cust_main->refnum || $conf->config('referraldefault') || 0;
 if ( $custnum && ! $conf->exists('editreferrals') ) {
   print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
 } else {
@@ -152,7 +135,7 @@ if ( $cust_main->referral_custnum ) {
 
 # contact info
 
-($last,$first,$ss,$company,$address1,$address2,$city,$zip)=(
+my($last,$first,$ss,$company,$address1,$address2,$city,$zip)=(
   $cust_main->last,
   $cust_main->first,
   $cust_main->ss,
@@ -201,7 +184,7 @@ foreach ( sort {
 }
 print qq!</SELECT></TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10></TD></TR>!;
 
-($daytime,$night,$fax)=(
+my($daytime,$night,$fax)=(
   $cust_main->daytime,
   $cust_main->night,
   $cust_main->fax,
@@ -345,29 +328,29 @@ print "<BR>Billing information", &itable("#cccccc"),
 print qq! CHECKED! if $cust_main->tax eq "Y";
 print qq!>Tax Exempt</TD></TR>!;
 print qq!<TR><TD><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
-@invoicing_list = $cust_main->invoicing_list;
+my @invoicing_list = $cust_main->invoicing_list;
 print qq! CHECKED!
   if ( ! @invoicing_list && ! $conf->exists('disablepostalinvoicedefault') )
      || grep { $_ eq 'POST' } @invoicing_list;
 print qq!>Postal mail invoice</TD></TR>!;
-$invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
+my $invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
 print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
 
 print "<TR><TD>Billing type</TD></TR>",
       "</TABLE>",
       &table("#cccccc"), "<TR>";
 
-($payinfo, $payname)=(
+my($payinfo, $payname)=(
   $cust_main->payinfo,
   $cust_main->payname,
 );
 
-%payby = (
+my %payby = (
   'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
   'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
   'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
 );
-%paybychecked = (
+my %paybychecked = (
   'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
   'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
   'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
@@ -434,8 +417,8 @@ unless ( $custnum ) {
 
     #false laziness: (mostly) copied from edit/svc_acct.cgi
     #$ulen = $svc_acct->dbdef_table->column('username')->length;
-    $ulen = dbdef->table('svc_acct')->column('username')->length;
-    $ulen2 = $ulen+2;
+    my $ulen = dbdef->table('svc_acct')->column('username')->length;
+    my $ulen2 = $ulen+2;
     my $passwordmax = $conf->config('passwordmax') || 8;
     my $pmax2 = $passwordmax + 2;
     print <<END;
@@ -454,7 +437,7 @@ END
   }
 }
 
-$otaker = $cust_main->otaker;
+my $otaker = $cust_main->otaker;
 print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!,
       qq!<BR><INPUT TYPE="submit" VALUE="!,
       $custnum ?  "Apply Changes" : "Add Customer", qq!">!,
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index f5dc32372..092a2d068 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,19 +1,7 @@
+<!-- $Id: cust_main_county-expand.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_main_county-expand.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $taxnum $cust_main_county $p1 $delim $expansion );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar popurl);
-use FS::cust_main_county;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
 
+my($taxnum, $delim, $expansion );
 if ( $cgi->param('error') ) {
   $taxnum = $cgi->param('taxnum');
   $delim = $cgi->param('delim');
@@ -27,11 +15,11 @@ if ( $cgi->param('error') ) {
   $expansion = '';
 }
 
-$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
   or die "cust_main_county.taxnum $taxnum not found";
 die "Can't expand entry!" if $cust_main_county->getfield('county');
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("Tax Rate (expand)", menubar(
   'Main Menu' => popurl(2),
 ));
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index f88601281..69def0468 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -1,18 +1,5 @@
+<!-- $Id: cust_main_county.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_main_county.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $cust_main_county );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar popurl table);
-use FS::cust_main_county;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
 
 print header("Edit tax rates", menubar(
   'Main Menu' => popurl(2),
@@ -32,10 +19,10 @@ print qq!<FORM ACTION="!, popurl(1),
       </TR>
 END
 
-foreach $cust_main_county ( sort {    $a->country cmp $b->country
-                                   or $a->state   cmp $b->state
-                                   or $a->county  cmp $b->county
-                                 } qsearch('cust_main_county',{}) ) {
+foreach my $cust_main_county ( sort {    $a->country cmp $b->country
+                                      or $a->state   cmp $b->state
+                                      or $a->county  cmp $b->county
+                                    } qsearch('cust_main_county',{}) ) {
   my($hashref)=$cust_main_county->hashref;
   print <<END;
       <TR>
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 83f3cb872..2794e2218 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,20 +1,9 @@
+<!-- $Id: cust_pay.cgi,v 1.11 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_pay.cgi,v 1.10 2001-12-26 06:02:48 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid $quickpay );
-use Date::Format;
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::Conf;
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl ntable small_custview);
 
 my $conf = new FS::Conf;
 
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
+my($link, $linknum, $paid, $payby, $payinfo, $quickpay); 
 if ( $cgi->param('error') ) {
   $link = $cgi->param('link');
   $linknum = $cgi->param('linknum');
@@ -41,9 +30,9 @@ if ( $cgi->param('error') ) {
 } else {
   die "illegal query ". $cgi->keywords;
 }
-$_date = time;
+my $_date = time;
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("Post payment", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index 73b190786..c11a194b2 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -1,27 +1,14 @@
+<!-- $Id: cust_pkg.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_pkg.cgi,v 1.5 2001-12-27 09:26:14 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi %pkg %comment $custnum $p1 @cust_pkg 
-             $cust_main $agent $type_pkgs $count %remove_pkg $pkgparts );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header popurl);
-use FS::part_pkg;
-use FS::type_pkgs;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-%pkg = ();
-%comment = ();
+my %pkg = ();
+my %comment = ();
 foreach (qsearch('part_pkg', { 'disabled' => '' })) {
   $pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
   $comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
 }
 
+my($custnum, %remove_pkg);
 if ( $cgi->param('error') ) {
   $custnum = $cgi->param('custnum');
   %remove_pkg = map { $_ => 1 } $cgi->param('remove_pkg');
@@ -29,10 +16,10 @@ if ( $cgi->param('error') ) {
   my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/;
   $custnum = $1;
-  undef %remove_pkg;
+  %remove_pkg = ();
 }
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("Add/Edit Packages", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
@@ -44,7 +31,7 @@ print qq!<FORM ACTION="${p1}process/cust_pkg.cgi" METHOD=POST>!;
 print qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
 
 #current packages
-@cust_pkg = qsearch('cust_pkg',{ 'custnum' => $custnum, 'cancel' => '' } );
+my @cust_pkg = qsearch('cust_pkg',{ 'custnum' => $custnum, 'cancel' => '' } );
 
 if (@cust_pkg) {
   print <<END;
@@ -52,7 +39,7 @@ Current packages - select to remove (services are moved to a new package below)
 <BR><BR>
 END
 
-  my ($count) = 0 ;
+  my $count = 0 ;
   print qq!<TABLE>! ;
   foreach (@cust_pkg) {
     print '<TR>' if $count == 0;
@@ -74,13 +61,13 @@ print <<END;
 Order new packages<BR><BR>
 END
 
-$cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
-$agent = qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
+my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
+my $agent = qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
 
-$count = 0;
-$pkgparts = 0;
+my $count = 0;
+my $pkgparts = 0;
 print qq!<TABLE>!;
-foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
+foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
   $pkgparts++;
   my($pkgpart)=$type_pkgs->pkgpart;
   next unless exists $pkg{$pkgpart}; #skip disabled ones
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 41d6666dc..939eff360 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_bill_event.cgi,v 1.1 2002-01-29 16:33:16 ivan Exp $ -->
+<!-- $Id: part_bill_event.cgi,v 1.2 2002-01-30 14:18:08 ivan Exp $ -->
 
 <%
 
@@ -71,42 +71,57 @@ print '<TR><TD ALIGN="right">Action</TD><TD>';
 #this is pretty kludgy right here.
 tie my %events, 'Tie::IxHash',
 
-  'Charge a fee' => {
-    'code' => '$cust_main->charge( %%%charge%%%, \'%%%reason%%%\' );',
-    'html' => 'Amount <INPUT TYPE="text" SIZE="7" NAME="charge"><BR>'.
+  'fee' => {
+    'name'   => 'Late fee',
+    'code'   => '$cust_main->charge( %%%charge%%%, \'%%%reason%%%\' );',
+    'html'   => 'Amount <INPUT TYPE="text" SIZE="7" NAME="charge"><BR>'.
               'Reason <INPUT TYPE="text" NAME="reason">',
+    'weight' => 10,
   },
-  'Suspend accounts' => {
-    'code' => '$cust_main->suspend();',
+  'suspend' => {
+    'name'   => 'Suspend',
+    'code'   => '$cust_main->suspend();',
+    'weight' => 10,
   },
-  'Cancel accounts' => {
-    'code' => '$cust_main->cancel();',
+  'cancel' => {
+    'name'   => 'Cancel',
+    'code'   => '$cust_main->cancel();',
+    'weight' => 10,
   },
 
-  'Add postal invoicing' => {
+  'addpost' => {
+    'name' => 'Add postal invoicing',
     'code' => '$cust_main->invoicing_list_addpost();',
-    'pad'  => 10,
+    'pad'  => 20,
+  },
+
+  'send' => {
+    'name' => 'Send invoice (email/print)',
+    'code' => '',
+    'weight' => 30
   },
 
   'Generate invoices' => {
     'code' => '$cust_main->bill();',
-    'pad'  => 20,
+    'pad'  => 40,
   },
 
   'Apply unapplied payments and credits' => {
     'code' => '$cust_main->apply_payments; $cust_main->apply_credits;',
-    'pad'  => 30,
+    'pad'  => 50,
   },
 
   'Collect on invoices' => {
     'code' => '$cust_main->collect();',
-    'pad'  => 40,
+    'pad'  => 60,
   },
 
 ;
 
 foreach my $event ( keys %events ) {
-  print ntable( "#cccccc", 2). qq!<TR><TD><INPUT TYPE="radio" NAME="eventcode" VALUE="!.
+  print ntable( "#cccccc", 2).
+        qq!<TR><TD><INPUT TYPE="radio" NAME="eventcode" VALUE="!.
+        $events{$event}{weight}. ":".
         encode_entities($events{$event}{code}). qq!">$event</TD>!;
   print '<TD>'. $events{$event}{html}. '</TD>' if exists $events{$event}{html};
   print qq!</TR>!;
@@ -121,7 +136,7 @@ print <<END;
 END
 
 print qq!<INPUT TYPE="submit" VALUE="!,
-      $hashref->{pkgpart} ? "Apply changes" : "Add invoice event",
+      $hashref->{eventpart} ? "Apply changes" : "Add invoice event",
       qq!">!;
 %>
 
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index 09344b956..18f6aa938 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -1,19 +1,7 @@
+<!-- $Id: part_referral.cgi,v 1.5 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: part_referral.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $part_referral $action $hashref $p1 $query );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::part_referral;
-use FS::CGI qw(header menubar popurl);
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
 
+my $part_referral;
 if ( $cgi->param('error') ) {
   $part_referral = new FS::part_referral ( {
     map { $_, scalar($cgi->param($_)) } fields('part_referral')
@@ -25,10 +13,10 @@ if ( $cgi->param('error') ) {
 } else { #adding
   $part_referral = new FS::part_referral {};
 }
-$action = $part_referral->refnum ? 'Edit' : 'Add';
-$hashref = $part_referral->hashref;
+my $action = $part_referral->refnum ? 'Edit' : 'Add';
+my $hashref = $part_referral->hashref;
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("$action Referral", menubar(
   'Main Menu' => popurl(2),
   'View all referrals' => popurl(2). "browse/part_referral.cgi",
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index f2555a29f..39f49e14c 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.13 2001-12-27 09:26:14 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.14 2002-01-30 14:18:08 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -51,7 +51,7 @@ Disable new orders <INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref-
 Services are items you offer to your customers.
 <UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
     <LI>svc_domain - Domains
-    <LI>svc_acct_sm - <B>depreciated</B> (use svc_forward for new installations) Virtual domain mail aliasing.
+    <LI>svc_acct_sm - <B>deprecated</B> (use svc_forward for new installations) Virtual domain mail aliasing.
     <LI>svc_forward - mail forwarding
     <LI>svc_www - Virtual domain website
 <!--   <LI>svc_charge - One-time charges (Partially unimplemented)
@@ -181,8 +181,8 @@ function fixup(what) {
 <INPUT TYPE="hidden" NAME="disabled" VALUE="<%= $hashref->{disabled} %>">
 <INPUT TYPE="hidden" NAME="svcdb" VALUE="<%= $svcdb %>">
 <%
-  print "$svcdb" unless $svcdb eq 'konq_kludge';
-  print "<BR><TABLE BORDER=1><TH>Field</TH><TH COLSPAN=2>Modifier</TH>" unless $svcdb eq 'konq_kludge';
+  #print "$svcdb<BR>" unless $svcdb eq 'konq_kludge';
+  print table(). "<TH>Field</TH><TH COLSPAN=2>Modifier</TH>" unless $svcdb eq 'konq_kludge';
 
   foreach my $field (@fields) {
     my $part_svc_column = $part_svc->part_svc_column($field);
diff --git a/httemplate/edit/process/agent.cgi b/httemplate/edit/process/agent.cgi
index b93df48d1..93ce4f9f2 100755
--- a/httemplate/edit/process/agent.cgi
+++ b/httemplate/edit/process/agent.cgi
@@ -1,29 +1,17 @@
+<!-- $Id: agent.cgi,v 1.3 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: agent.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw ( $cgi $agentnum $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::agent;
-use FS::CGI qw(popurl);
+my $agentnum = $cgi->param('agentnum');
 
-$cgi = new CGI;
+my $old = qsearchs('agent',{'agentnum'=>$agentnum}) if $agentnum;
 
-&cgisuidsetup($cgi);
-
-$agentnum = $cgi->param('agentnum');
-
-$old = qsearchs('agent',{'agentnum'=>$agentnum}) if $agentnum;
-
-$new = new FS::agent ( {
+my $new = new FS::agent ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('agent')
 } );
 
+my $error;
 if ( $agentnum ) {
   $error=$new->replace($old);
 } else {
diff --git a/httemplate/edit/process/agent_type.cgi b/httemplate/edit/process/agent_type.cgi
index 37a382e62..2d1159708 100755
--- a/httemplate/edit/process/agent_type.cgi
+++ b/httemplate/edit/process/agent_type.cgi
@@ -1,29 +1,16 @@
+<!-- $Id: agent_type.cgi,v 1.3 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: agent_type.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw ( $cgi $typenum $old $new $error $part_pkg );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::CGI qw( popurl);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::agent_type;
-use FS::type_pkgs;
-use FS::part_pkg;
+my $typenum = $cgi->param('typenum');
+my $old = qsearchs('agent_type',{'typenum'=>$typenum}) if $typenum;
 
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$typenum = $cgi->param('typenum');
-$old = qsearchs('agent_type',{'typenum'=>$typenum}) if $typenum;
-
-$new = new FS::agent_type ( {
+my $new = new FS::agent_type ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('agent_type')
 } );
 
+my $error;
 if ( $typenum ) {
   $error=$new->replace($old);
 } else {
@@ -37,7 +24,7 @@ if ( $error ) {
   exit;
 }
 
-foreach $part_pkg (qsearch('part_pkg',{})) {
+foreach my $part_pkg (qsearch('part_pkg',{})) {
   my($pkgpart)=$part_pkg->getfield('pkgpart');
 
   my($type_pkgs)=qsearchs('type_pkgs',{
diff --git a/httemplate/edit/process/cust_bill_pay.cgi b/httemplate/edit/process/cust_bill_pay.cgi
index f0d403331..16d30bd4c 100755
--- a/httemplate/edit/process/cust_bill_pay.cgi
+++ b/httemplate/edit/process/cust_bill_pay.cgi
@@ -1,22 +1,8 @@
+<!-- $Id: cust_bill_pay.cgi,v 1.2 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_bill_pay.cgi,v 1.1 2001-12-18 19:30:31 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $custnum $paynum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearchs fields);
-use FS::cust_pay;
-use FS::cust_bill_pay;
-use FS::cust_main;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
 $cgi->param('paynum') =~ /^(\d*)$/ or die "Illegal paynum!";
-$paynum = $1;
+my $paynum = $1;
 
 my $cust_pay = qsearchs('cust_pay', { 'paynum' => $paynum } )
   or die "No such paynum";
@@ -26,14 +12,14 @@ my $cust_main = qsearchs('cust_main', { 'custnum' => $cust_pay->custnum } )
 
 my $custnum = $cust_main->custnum;
 
-$new = new FS::cust_bill_pay ( {
+my $new = new FS::cust_bill_pay ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(custnum _date amount invnum)
   } fields('cust_bill_pay')
 } );
 
-$error=$new->insert;
+my $error = $new->insert;
 
 if ( $error ) {
   $cgi->param('error', $error);
diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
index 3bbd749ce..51fca74e3 100755
--- a/httemplate/edit/process/cust_credit.cgi
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -1,32 +1,19 @@
+<!-- $Id: cust_credit.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_credit.cgi,v 1.5 2001-12-26 15:11:33 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $custnum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(popurl);
-use FS::Record qw(fields);
-use FS::cust_credit;
-use FS::cust_main;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
 $cgi->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
-$custnum = $1;
+my $custnum = $1;
 
 $cgi->param('otaker',getotaker);
 
-$new = new FS::cust_credit ( {
+my $new = new FS::cust_credit ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(custnum _date amount otaker reason)
   } fields('cust_credit')
 } );
 
-$error=$new->insert;
+my $error = $new->insert;
 
 if ( $error ) {
   $cgi->param('error', $error);
diff --git a/httemplate/edit/process/cust_credit_bill.cgi b/httemplate/edit/process/cust_credit_bill.cgi
index e84894b04..afe297308 100755
--- a/httemplate/edit/process/cust_credit_bill.cgi
+++ b/httemplate/edit/process/cust_credit_bill.cgi
@@ -1,23 +1,8 @@
+<!-- $Id: cust_credit_bill.cgi,v 1.3 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.2 2001-12-18 19:30:31 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $custnum $crednum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearchs fields);
-use FS::cust_credit;
-use FS::cust_credit_bill;
-use FS::cust_refund;
-use FS::cust_main;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
 $cgi->param('crednum') =~ /^(\d*)$/ or die "Illegal crednum!";
-$crednum = $1;
+my $crednum = $1;
 
 my $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } )
   or die "No such crednum";
@@ -27,6 +12,7 @@ my $cust_main = qsearchs('cust_main', { 'custnum' => $cust_credit->custnum } )
 
 my $custnum = $cust_main->custnum;
 
+my $new;
 if ($cgi->param('invnum') =~ /^Refund$/) {
   $new = new FS::cust_refund ( {
     'reason'  => $cust_credit->reason,
@@ -45,7 +31,7 @@ if ($cgi->param('invnum') =~ /^Refund$/) {
   } );
 }
 
-$error=$new->insert;
+my $error = $new->insert;
 
 if ( $error ) {
   $cgi->param('error', $error);
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 625a85052..fa50dc626 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -1,22 +1,7 @@
+<!-- $Id: cust_main.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# $Id: cust_main.cgi,v 1.5 2001-10-20 12:18:00 ivan Exp $
 
-use strict;
-use vars qw( $cgi $payby @invoicing_list $new $custnum $error );
-use vars qw( $cust_pkg $cust_svc $svc_acct );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw( popurl );
-use FS::Record qw( qsearch qsearchs fields );
-use FS::cust_main;
-use FS::type_pkgs;
-use FS::agent;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$error = '';
+my $error = '';
 
 #unmunge stuff
 
@@ -37,7 +22,8 @@ $cgi->param('ship_state', $1);
 $cgi->param('ship_county', $3 || '');
 $cgi->param('ship_country', $4);
 
-if ( $payby = $cgi->param('payby') ) {
+my $payby = $cgi->param('payby');
+if ( $payby ) {
   $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
   $cgi->param('paydate',
   $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
@@ -46,12 +32,12 @@ if ( $payby = $cgi->param('payby') ) {
 
 $cgi->param('otaker', &getotaker );
 
-@invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
+my @invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
 push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
 
 #create new record object
 
-$new = new FS::cust_main ( {
+my $new = new FS::cust_main ( {
   map {
     $_, scalar($cgi->param($_))
 #  } qw(custnum agentnum last first ss company address1 address2 city county
@@ -68,8 +54,8 @@ if ( defined($cgi->param('same')) && $cgi->param('same') eq "Y" ) {
 }
 
 #perhaps this stuff should go to cust_main.pm
-$cust_pkg = '';
-$svc_acct = '';
+my $cust_pkg = '';
+my $svc_acct = '';
 if ( $new->custnum eq '' ) {
 
   if ( $cgi->param('pkgpart_svcpart') ) {
@@ -142,7 +128,6 @@ if ( $error ) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). "cust_main.cgi?". $cgi->query_string );
 } else { 
-  $custnum = $new->custnum;
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new->custnum);
 } 
 %>
diff --git a/httemplate/edit/process/cust_main_county-collapse.cgi b/httemplate/edit/process/cust_main_county-collapse.cgi
index 62c2ba753..4888b781f 100755
--- a/httemplate/edit/process/cust_main_county-collapse.cgi
+++ b/httemplate/edit/process/cust_main_county-collapse.cgi
@@ -1,23 +1,10 @@
+<!-- $Id: cust_main_county-collapse.cgi,v 1.2 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# <!-- $Id: cust_main_county-collapse.cgi,v 1.1 2001-08-17 11:05:31 ivan Exp $ -->
-
-use strict;
-use vars qw ( $cgi $taxnum $cust_main_county @expansion $expansion );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup datasrc);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(popurl);
-use FS::cust_main_county;
-use FS::cust_main;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/ or die "Illegal taxnum!";
-$taxnum = $1;
-$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+my $taxnum = $1;
+my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
   or die ("Unknown taxnum!");
 
 #really should do this in a .pm & start transaction
diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
index 5adffc62f..b16fab4fe 100755
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -1,24 +1,12 @@
+<!-- $Id: cust_main_county-expand.cgi,v 1.4 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# <!-- $Id: cust_main_county-expand.cgi,v 1.3 2001-08-31 07:17:33 ivan Exp $ -->
-
-use strict;
-use vars qw ( $cgi $taxnum $cust_main_county @expansion $expansion );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup datasrc);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(popurl);
-use FS::cust_main_county;
-use FS::cust_main;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 $cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
-$taxnum = $1;
-$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+my $taxnum = $1;
+my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
   or die ("Unknown taxnum!");
 
+my @expansion;
 if ( $cgi->param('delim') eq 'n' ) {
   @expansion=split(/\n/,$cgi->param('expansion'));
 } elsif ( $cgi->param('delim') eq 's' ) {
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
index 158a0d09e..0f0246b73 100755
--- a/httemplate/edit/process/cust_main_county.cgi
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -1,17 +1,5 @@
+<!-- $Id: cust_main_county.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: cust_main_county.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearch qsearchs);
-use FS::cust_main_county;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 foreach ( $cgi->param ) {
   /^tax(\d+)$/ or die "Illegal form $_!";
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index 630e8fc1b..c75e53280 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,27 +1,15 @@
+<!-- $Id: cust_pay.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: cust_pay.cgi,v 1.5 2001-12-26 05:19:01 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $link $linknum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::Record qw(fields);
-use FS::cust_pay;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 $cgi->param('linknum') =~ /^(\d+)$/
   or die "Illegal linknum: ". $cgi->param('linknum');
-$linknum = $1;
+my $linknum = $1;
 
 $cgi->param('link') =~ /^(custnum|invnum)$/
   or die "Illegal link: ". $cgi->param('link');
-$link = $1;
+my $link = $1;
 
-$new = new FS::cust_pay ( {
+my $new = new FS::cust_pay ( {
   $link => $linknum,
   map {
     $_, scalar($cgi->param($_));
@@ -29,7 +17,7 @@ $new = new FS::cust_pay ( {
   #} fields('cust_pay')
 } );
 
-$error = $new->insert;
+my $error = $new->insert;
 
 if ($error) {
   $cgi->param('error', $error);
diff --git a/httemplate/edit/process/cust_pkg.cgi b/httemplate/edit/process/cust_pkg.cgi
index ecaec9bcb..25b320150 100755
--- a/httemplate/edit/process/cust_pkg.cgi
+++ b/httemplate/edit/process/cust_pkg.cgi
@@ -1,28 +1,19 @@
+<!-- $Id: cust_pkg.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: cust_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $custnum @remove_pkgnums @pkgparts $pkgpart $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::cust_pkg;
-
-$cgi = new CGI; # create form object
-&cgisuidsetup($cgi);
-$error = '';
+my $error = '';
 
 #untaint custnum
 $cgi->param('custnum') =~ /^(\d+)$/;
-$custnum = $1;
+my $custnum = $1;
 
-@remove_pkgnums = map {
+my @remove_pkgnums = map {
   /^(\d+)$/ or die "Illegal remove_pkg value!";
   $1;
 } $cgi->param('remove_pkg');
 
-foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
+my @pkgparts;
+foreach my $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
   if ( $cgi->param("pkg$pkgpart") =~ /^(\d+)$/ ) {
     my $num_pkgs = $1;
     while ( $num_pkgs-- ) {
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 08bc9b723..2ba1cbeb0 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,23 +1,11 @@
+<!-- $Id: part_pkg.cgi,v 1.7 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: part_pkg.cgi,v 1.6 2001-12-27 09:26:14 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $pkgpart $old $new $part_svc $error $dbh );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::part_pkg;
-use FS::pkg_svc;
-use FS::cust_pkg;
+my $dbh = dbh;
 
-$cgi = new CGI;
-$dbh = &cgisuidsetup($cgi);
+my $pkgpart = $cgi->param('pkgpart');
 
-$pkgpart = $cgi->param('pkgpart');
-
-$old = qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
+my $old = qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
 
 #fixup plandata
 my $plandata = $cgi->param('plandata');
@@ -30,7 +18,7 @@ foreach (qw( setuptax recurtax disabled )) {
   $cgi->param($_, '') unless defined $cgi->param($_);
 }
 
-$new = new FS::part_pkg ( {
+my $new = new FS::part_pkg ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('part_pkg')
@@ -41,7 +29,7 @@ $new = new FS::part_pkg ( {
 
 #most of the stuff below should move to part_pkg.pm
 
-foreach $part_svc ( qsearch('part_svc', {} ) ) {
+foreach my $part_svc ( qsearch('part_svc', {} ) ) {
   my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
   unless ( $quantity =~ /^(\d+)$/ ) {
     $cgi->param('error', "Illegal quantity" );
@@ -59,6 +47,7 @@ local $SIG{PIPE} = 'IGNORE';
 
 local $FS::UID::AutoCommit = 0;
 
+my $error;
 if ( $pkgpart ) {
   $error = $new->replace($old);
 } else {
diff --git a/httemplate/edit/process/part_referral.cgi b/httemplate/edit/process/part_referral.cgi
index ff94e3955..7e37db855 100755
--- a/httemplate/edit/process/part_referral.cgi
+++ b/httemplate/edit/process/part_referral.cgi
@@ -1,26 +1,15 @@
+<!-- $Id: part_referral.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: part_referral.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $refnum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs fields);
-use FS::part_referral;
-use FS::CGI qw(popurl);
+my $refnum = $cgi->param('refnum');
 
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$refnum = $cgi->param('refnum');
-
-$new = new FS::part_referral ( {
+my $new = new FS::part_referral ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('part_referral')
 } );
 
+my $error;
 if ( $refnum ) {
   my $old = qsearchs( 'part_referral', { 'refnum' =>$ refnum } );
   die "(Old) Record not found!" unless $old;
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index c4f5172ad..29a954cc9 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -1,28 +1,16 @@
+<!-- $Id: quick-cust_pkg.cgi,v 1.4 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: quick-cust_pkg.cgi,v 1.3 2001-09-11 10:05:30 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $custnum $pkgpart $error ); #@remove_pkgnums @pkgparts
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl eidiot);
-use FS::cust_pkg;
-
-$cgi = new CGI; # create form object
-&cgisuidsetup($cgi);
-$error = '';
 
 #untaint custnum
 $cgi->param('custnum') =~ /^(\d+)$/
   or eidiot 'illegal custnum '. $cgi->param('custnum');
-$custnum = $1;
+my $custnum = $1;
 $cgi->param('pkgpart') =~ /^(\d+)$/
   or eidiot 'illegal pkgpart '. $cgi->param('pkgpart');
-$pkgpart = $1;
+my $pkgpart = $1;
 
 my @cust_pkg = ();
-$error ||= FS::cust_pkg::order($custnum, [ $pkgpart ], [], \@cust_pkg, );
+my $error = FS::cust_pkg::order($custnum, [ $pkgpart ], [], \@cust_pkg, );
 
 if ($error) {
   eidiot($error);
diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi
index c500016e2..178d7d85a 100755
--- a/httemplate/edit/process/svc_acct.cgi
+++ b/httemplate/edit/process/svc_acct.cgi
@@ -1,21 +1,10 @@
+<!-- $Id: svc_acct.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $svcnum $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearchs fields);
-use FS::svc_acct;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$svcnum = $1;
+my $svcnum = $1;
 
+my $old;
 if ( $svcnum ) {
   $old = qsearchs('svc_acct', { 'svcnum' => $svcnum } )
     or die "fatal: can't find account (svcnum $svcnum)!";
@@ -32,7 +21,7 @@ if ( $cgi->param('_password') eq '*HIDDEN*' ) {
   $cgi->param('_password',$old->getfield('_password'));
 }
 
-$new = new FS::svc_acct ( {
+my $new = new FS::svc_acct ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(svcnum pkgnum svcpart username _password popnum uid gid finger dir
@@ -40,6 +29,7 @@ $new = new FS::svc_acct ( {
   } ( fields('svc_acct'), qw( pkgnum svcpart ) )
 } );
 
+my $error;
 if ( $svcnum ) {
   $error = $new->replace($old);
 } else {
diff --git a/httemplate/edit/process/svc_acct_pop.cgi b/httemplate/edit/process/svc_acct_pop.cgi
index 2b870dc48..5d699f2f5 100755
--- a/httemplate/edit/process/svc_acct_pop.cgi
+++ b/httemplate/edit/process/svc_acct_pop.cgi
@@ -1,29 +1,17 @@
+<!-- $Id: svc_acct_pop.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct_pop.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $popnum $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_acct_pop;
-use FS::CGI qw(popurl);
+my $popnum = $cgi->param('popnum');
 
-$cgi = new CGI; # create form object
+my $old = qsearchs('svc_acct_pop',{'popnum'=>$popnum}) if $popnum;
 
-&cgisuidsetup($cgi);
-
-$popnum = $cgi->param('popnum');
-
-$old = qsearchs('svc_acct_pop',{'popnum'=>$popnum}) if $popnum;
-
-$new = new FS::svc_acct_pop ( {
+my $new = new FS::svc_acct_pop ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('svc_acct_pop')
 } );
 
+my $error = '';
 if ( $popnum ) {
   $error = $new->replace($old);
 } else {
diff --git a/httemplate/edit/process/svc_acct_sm.cgi b/httemplate/edit/process/svc_acct_sm.cgi
index 10afcc1f9..25cd88d5a 100755
--- a/httemplate/edit/process/svc_acct_sm.cgi
+++ b/httemplate/edit/process/svc_acct_sm.cgi
@@ -1,34 +1,23 @@
+<!-- $Id: svc_acct_sm.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $svcnum $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs fields);
-use FS::svc_acct_sm;
-use FS::CGI qw(popurl);
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$svcnum =$1;
+my $svcnum =$1;
 
-$old = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
+my $old = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
 
 #unmunge domsvc and domuid
 #$cgi->param('domsvc',(split(/:/, $cgi->param('domsvc') ))[0] );
 #$cgi->param('domuid',(split(/:/, $cgi->param('domuid') ))[0] );
 
-$new = new FS::svc_acct_sm ( {
+my $new = new FS::svc_acct_sm ( {
   map {
     ($_, scalar($cgi->param($_)));
   #} qw(svcnum pkgnum svcpart domuser domuid domsvc)
   } ( fields('svc_acct_sm'), qw( pkgnum svcpart ) )
 } );
 
+my $error = '';
 if ( $svcnum ) {
   $error = $new->replace($old);
 } else {
diff --git a/httemplate/edit/process/svc_domain.cgi b/httemplate/edit/process/svc_domain.cgi
index e52b68a15..0b7ec4928 100755
--- a/httemplate/edit/process/svc_domain.cgi
+++ b/httemplate/edit/process/svc_domain.cgi
@@ -1,31 +1,20 @@
+<!-- $Id: svc_domain.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: svc_domain.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $svcnum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs fields);
-use FS::svc_domain;
-use FS::CGI qw(popurl);
 
 #remove this to actually test the domains!
 $FS::svc_domain::whois_hack = 1;
 
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$svcnum = $1;
+my $svcnum = $1;
 
-$new = new FS::svc_domain ( {
+my $new = new FS::svc_domain ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(svcnum pkgnum svcpart domain action purpose)
   } ( fields('svc_domain'), qw( pkgnum svcpart action purpose ) )
 } );
 
+my $error = '';
 if ($cgi->param('svcnum')) {
   $error="Can't modify a domain!";
 } else {
diff --git a/httemplate/edit/process/svc_forward.cgi b/httemplate/edit/process/svc_forward.cgi
index b013bd15f..5f0247fe5 100755
--- a/httemplate/edit/process/svc_forward.cgi
+++ b/httemplate/edit/process/svc_forward.cgi
@@ -1,29 +1,18 @@
+<!-- $Id: svc_forward.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: svc_forward.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $svcnum $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs fields);
-use FS::svc_forward;
-use FS::CGI qw(popurl);
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$svcnum =$1;
+my $svcnum =$1;
 
-$old = qsearchs('svc_forward',{'svcnum'=>$svcnum}) if $svcnum;
+my $old = qsearchs('svc_forward',{'svcnum'=>$svcnum}) if $svcnum;
 
-$new = new FS::svc_forward ( {
+my $new = new FS::svc_forward ( {
   map {
     ($_, scalar($cgi->param($_)));
   } ( fields('svc_forward'), qw( pkgnum svcpart ) )
 } );
 
+my $error = '';
 if ( $svcnum ) {
   $error = $new->replace($old);
 } else {
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index ec4f66e20..681d8b5d9 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,28 +1,10 @@
+<!-- $Id: svc_acct.cgi,v 1.14 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct.cgi,v 1.13 2001-12-12 19:42:21 ivan Exp $ -->
-
-use strict;
-use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
-             $part_svc $svc $otaker $username $password $ulen $ulen2 
-             $pmax $pmax2 $p1
-             $popnum $domsvc $uid $gid $finger $dir $shell $quota $slipip
-             %svc_domain );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(header popurl itable);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_acct;
-use FS::svc_acct_pop qw(popselector);
-use FS::Conf;
-use FS::raddb;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-@shells = $conf->config('shells');
 
+my $conf = new FS::Conf;
+my @shells = $conf->config('shells');
+
+my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct);
 if ( $cgi->param('error') ) {
   $svc_acct = new FS::svc_acct ( {
     map { $_, scalar($cgi->param($_)) } fields('svc_acct')
@@ -81,13 +63,14 @@ if ( $cgi->param('error') ) {
 
   }
 }
-$action = $svcnum ? 'Edit' : 'Add';
+my $action = $svcnum ? 'Edit' : 'Add';
 
-$svc = $part_svc->getfield('svc');
+my $svc = $part_svc->getfield('svc');
 
-$otaker = getotaker;
+my $otaker = getotaker;
 
-$username = $svc_acct->username;
+my $username = $svc_acct->username;
+my $password;
 if ( $svc_acct->_password ) {
   if ( $conf->exists('showpasswords') ) {
     $password = $svc_acct->_password;
@@ -98,13 +81,13 @@ if ( $svc_acct->_password ) {
   $password = '';
 }
 
-$ulen = $svc_acct->dbdef_table->column('username')->length;
-$ulen2 = $ulen+2;
+my $ulen = $svc_acct->dbdef_table->column('username')->length;
+my $ulen2 = $ulen+2;
 
-$pmax = $conf->config('passwordmax') || 8;
-$pmax2 = $pmax+2;
+my $pmax = $conf->config('passwordmax') || 8;
+my $pmax2 = $pmax+2;
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("$action $svc account");
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
@@ -131,7 +114,7 @@ print &itable("#cccccc",2), <<END;
 END
 
 #domain
-$domsvc = $svc_acct->domsvc || 0;
+my $domsvc = $svc_acct->domsvc || 0;
 if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
   print qq!<INPUT TYPE="hidden" NAME="domsvc" VALUE="$domsvc">!;
 } else { 
@@ -186,7 +169,7 @@ if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
 }
 
 #pop
-$popnum = $svc_acct->popnum || 0;
+my $popnum = $svc_acct->popnum || 0;
 if ( $part_svc->part_svc_column('popnum')->columnflag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$popnum">!;
 } else { 
@@ -194,7 +177,7 @@ if ( $part_svc->part_svc_column('popnum')->columnflag eq "F" ) {
         qq!<TD>!. FS::svc_acct_pop::popselector($popnum). '</TD></TR>';
 }
 
-($uid,$gid,$finger,$dir)=(
+my($uid,$gid,$finger,$dir)=(
   $svc_acct->uid,
   $svc_acct->gid,
   $svc_acct->finger,
@@ -208,7 +191,7 @@ print <<END;
 <INPUT TYPE="hidden" NAME="dir" VALUE="$dir">
 END
 
-$shell = $svc_acct->shell;
+my $shell = $svc_acct->shell;
 if ( $part_svc->part_svc_column('shell')->columnflag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="shell" VALUE="$shell">!;
 } else {
@@ -221,7 +204,7 @@ if ( $part_svc->part_svc_column('shell')->columnflag eq "F" ) {
   print "</SELECT></TD></TR>";
 }
 
-($quota,$slipip)=(
+my($quota,$slipip)=(
   $svc_acct->quota,
   $svc_acct->slipip,
 );
diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
index 23caa794b..c984ef9e8 100755
--- a/httemplate/edit/svc_acct_pop.cgi
+++ b/httemplate/edit/svc_acct_pop.cgi
@@ -1,17 +1,7 @@
+<!-- $Id: svc_acct_pop.cgi,v 1.5 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct_pop.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $svc_acct_pop $action $query $hashref $p1 );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::CGI qw(header menubar popurl);
-use FS::svc_acct_pop;
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
+my $svc_acct_pop;
 if ( $cgi->param('error') ) {
   $svc_acct_pop = new FS::svc_acct_pop ( {
     map { $_, scalar($cgi->param($_)) } fields('svc_acct_pop')
@@ -23,10 +13,10 @@ if ( $cgi->param('error') ) {
 } else { #adding
   $svc_acct_pop = new FS::svc_acct_pop {};
 }
-$action = $svc_acct_pop->popnum ? 'Edit' : 'Add';
-$hashref = $svc_acct_pop->hashref;
+my $action = $svc_acct_pop->popnum ? 'Edit' : 'Add';
+my $hashref = $svc_acct_pop->hashref;
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("$action POP", menubar(
   'Main Menu' => popurl(2),
   'View all POPs' => popurl(2). "browse/svc_acct_pop.cgi",
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index baf0a7eb2..62a041da9 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,23 +1,10 @@
+<!-- $Id: svc_acct_sm.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
-use strict;
-use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
-             $part_svc $query %username %domain $p1 $domuser $domsvc $domuid );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_acct_sm;
-use FS::Conf;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$mydomain = $conf->config('domain');
+my $conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
 
+my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct_sm );
 if ( $cgi->param('error') ) {
   $svc_acct_sm = new FS::svc_acct_sm ( {
     map { $_, scalar($cgi->param($_)) } fields('svc_acct_sm')
@@ -25,8 +12,8 @@ if ( $cgi->param('error') ) {
   $svcnum = $svc_acct_sm->svcnum;
   $pkgnum = $cgi->param('pkgnum');
   $svcpart = $cgi->param('svcpart');
-  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  die "No part_svc entry!" unless $part_svc;
+  #$part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  #die "No part_svc entry!" unless $part_svc;
 } else {
   my($query) = $cgi->keywords;
   if ( $query =~ /^(\d+)$/ ) { #editing
@@ -40,8 +27,8 @@ if ( $cgi->param('error') ) {
     $pkgnum=$cust_svc->pkgnum;
     $svcpart=$cust_svc->svcpart;
   
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
+    #$part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    #die "No part_svc entry!" unless $part_svc;
 
   } else { #adding
 
@@ -51,7 +38,7 @@ if ( $cgi->param('error') ) {
       $pkgnum=$1 if /^pkgnum(\d+)$/;
       $svcpart=$1 if /^svcpart(\d+)$/;
     }
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    my $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
     die "No part_svc entry!" unless $part_svc;
 
     $svcnum='';
@@ -67,8 +54,10 @@ if ( $cgi->param('error') ) {
 
   }
 }
-$action = $svc_acct_sm->svcnum ? 'Edit' : 'Add';
+my $action = $svc_acct_sm->svcnum ? 'Edit' : 'Add';
 
+my %username = ();
+my %domain = ();
 if ($pkgnum) {
 
   #find all possible uids (and usernames)
@@ -80,7 +69,6 @@ if ($pkgnum) {
 
   my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
   my($custnum)=$cust_pkg->getfield('custnum');
-  %username = ();
   foreach my $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
     my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
     my($acct_svcpart);
@@ -102,7 +90,6 @@ if ($pkgnum) {
     push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
   }
 
-  %domain = ();
   foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
     my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
     my($acct_svcpart);
@@ -127,7 +114,7 @@ if ($pkgnum) {
   die "\$action eq Add, but \$pkgnum is null!\n";
 }
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("Mail Alias $action", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
@@ -151,7 +138,7 @@ print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
 #svcpart
 print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
 
-($domuser,$domsvc,$domuid)=(
+my($domuser,$domsvc,$domuid)=(
   $svc_acct_sm->domuser,
   $svc_acct_sm->domsvc,
   $svc_acct_sm->domuid,
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index 713b2ccd7..57ee941f9 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,19 +1,8 @@
+<!-- $Id: svc_domain.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: svc_domain.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $action $svcnum $svc_domain $pkgnum $svcpart $part_svc
-             $svc $otaker $domain $p1 $kludge_action $purpose );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_domain;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
+my($svcnum, $pkgnum, $svcpart, $kludge_action, $purpose, $part_svc,
+   $svc_domain);
 if ( $cgi->param('error') ) {
   $svc_domain = new FS::svc_domain ( {
     map { $_, scalar($cgi->param($_)) } fields('svc_domain')
@@ -65,18 +54,18 @@ if ( $cgi->param('error') ) {
                            );
     }
 
-
   }
+
 }
-$action = $svcnum ? 'Edit' : 'Add';
+my $action = $svcnum ? 'Edit' : 'Add';
 
-$svc = $part_svc->getfield('svc');
+my $svc = $part_svc->getfield('svc');
 
-$otaker = getotaker;
+my $otaker = getotaker;
 
-$domain = $svc_domain->domain;
+my $domain = $svc_domain->domain;
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("$action $svc", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 75cd9fc7f..cda577b76 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,23 +1,10 @@
+<!-- $Id: svc_forward.cgi,v 1.8 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-# <!-- $Id: svc_forward.cgi,v 1.7 2001-12-04 13:10:16 ivan Exp $ -->
 
-use strict;
-use vars qw( $conf $cgi $mydomain $action $svcnum $svc_forward $pkgnum $svcpart
-             $part_svc $query %email $p1 $srcsvc $dstsvc $dst );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_forward;
-use FS::Conf;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$mydomain = $conf->config('domain');
+my $conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
 
+my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_forward);
 if ( $cgi->param('error') ) {
   $svc_forward = new FS::svc_forward ( {
     map { $_, scalar($cgi->param($_)) } fields('svc_forward')
@@ -28,7 +15,9 @@ if ( $cgi->param('error') ) {
   $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
   die "No part_svc entry!" unless $part_svc;
 } else {
+
   my($query) = $cgi->keywords;
+
   if ( $query =~ /^(\d+)$/ ) { #editing
     $svcnum=$1;
     $svc_forward=qsearchs('svc_forward',{'svcnum'=>$svcnum})
@@ -64,12 +53,12 @@ if ( $cgi->param('error') ) {
                               $part_svc_column->columnvalue,
                             );
     }
-
-
   }
+
 }
-$action = $svc_forward->svcnum ? 'Edit' : 'Add';
+my $action = $svc_forward->svcnum ? 'Edit' : 'Add';
 
+my %email;
 if ($pkgnum) {
 
   #find all possible user svcnums (and emails)
@@ -122,7 +111,7 @@ if ($pkgnum) {
   die "\$action eq Add, but \$pkgnum is null!\n";
 }
 
-($srcsvc,$dstsvc,$dst)=(
+my($srcsvc,$dstsvc,$dst)=(
   $svc_forward->srcsvc,
   $svc_forward->dstsvc,
   $svc_forward->dst,
@@ -130,7 +119,7 @@ if ($pkgnum) {
 
 #display
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("Mail Forward $action", '',
       " onLoad=\"visualize()\"");
 
diff --git a/httemplate/misc/bill.cgi b/httemplate/misc/bill.cgi
index 48da25562..731309585 100755
--- a/httemplate/misc/bill.cgi
+++ b/httemplate/misc/bill.cgi
@@ -1,27 +1,14 @@
+<!-- $Id: bill.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: bill.cgi,v 1.4 2001-10-15 12:16:42 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $query $custnum $cust_main $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-#use FS::CGI qw(popurl eidiot);
-use FS::CGI qw(popurl idiot);
-use FS::Record qw(qsearchs);
-use FS::cust_main;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 #untaint custnum
-($query) = $cgi->keywords;
+my($query) = $cgi->keywords;
 $query =~ /^(\d*)$/;
-$custnum = $1;
-$cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
+my $custnum = $1;
+my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
 die "Can't find customer!\n" unless $cust_main;
 
-$error = $cust_main->bill(
+my $error = $cust_main->bill(
 #                          'time'=>$time
                          );
 #&eidiot($error) if $error;
diff --git a/httemplate/misc/cancel-unaudited.cgi b/httemplate/misc/cancel-unaudited.cgi
index 9b90967d9..3e2bd07db 100755
--- a/httemplate/misc/cancel-unaudited.cgi
+++ b/httemplate/misc/cancel-unaudited.cgi
@@ -1,28 +1,16 @@
-<%
-#<!-- $Id: cancel-unaudited.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $query $svcnum $svc_acct $cust_svc $error $dbh );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl eidiot);
-use FS::Record qw(qsearchs);
-use FS::cust_svc;
-use FS::svc_acct;
-
-$cgi = new CGI;
-$dbh = &cgisuidsetup($cgi);
+<!-- $Id: cancel-unaudited.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
+
+my $dbh = dbh;
  
 #untaint svcnum
-($query) = $cgi->keywords;
+my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
-$svcnum = $1;
+my $svcnum = $1;
 
-$svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
+my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
 die "Unknown svcnum!" unless $svc_acct;
 
-$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
 &eidiot(qq!This account has already been audited.  Cancel the 
     <A HREF="!. popurl(2). qq!view/cust_pkg.cgi?! . $cust_svc->getfield('pkgnum') .
     qq!pkgnum"> package</A> instead.!) 
@@ -36,7 +24,7 @@ local $SIG{TSTP} = 'IGNORE';
 
 local $FS::UID::AutoCommit = 0;
 
-$error = $svc_acct->cancel;
+my $error = $svc_acct->cancel;
 &myeidiot($error) if $error;
 $error = $svc_acct->delete;
 &myeidiot($error) if $error;
diff --git a/httemplate/misc/cancel_pkg.cgi b/httemplate/misc/cancel_pkg.cgi
index 8129463ae..1513ef05e 100755
--- a/httemplate/misc/cancel_pkg.cgi
+++ b/httemplate/misc/cancel_pkg.cgi
@@ -1,29 +1,16 @@
+<!-- $Id: cancel_pkg.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: cancel_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw ( $cgi $query $pkgnum $cust_pkg $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(eidiot popurl);
-use FS::Record qw(qsearchs);
-use FS::CGI qw(popurl eidiot);
-use FS::cust_pkg;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
- 
 #untaint pkgnum
-($query) = $cgi->keywords;
+my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/ || die "Illegal pkgnum";
-$pkgnum = $1;
+my $pkgnum = $1;
 
-$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
 
-$error = $cust_pkg->cancel;
+my $error = $cust_pkg->cancel;
 eidiot($error) if $error;
 
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
+print $cgi->redirect($p. "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
 
 %>
diff --git a/httemplate/misc/catchall.cgi b/httemplate/misc/catchall.cgi
index 3aafd0d49..a8d865780 100755
--- a/httemplate/misc/catchall.cgi
+++ b/httemplate/misc/catchall.cgi
@@ -1,24 +1,9 @@
+<!-- $Id: catchall.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: catchall.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $conf $cgi $action $svcnum $svc_domain $pkgnum $svcpart
-             $part_svc $query %email $p1 $domain $catchall );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_acct;
-use FS::svc_domain;
-use FS::svc_forward;
-use FS::Conf;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
 
+my $conf = new FS::Conf;
+
+my($svc_domain, $svcnum, $pkgnum, $svcpart, $part_svc);
 if ( $cgi->param('error') ) {
   $svc_domain = new FS::svc_domain ( {
     map { $_, scalar($cgi->param($_)) } fields('svc_domain')
@@ -51,6 +36,7 @@ if ( $cgi->param('error') ) {
   }
 }
 
+my %email;
 if ($pkgnum) {
 
   #find all possible user svcnums (and emails)
@@ -93,7 +79,7 @@ if ($pkgnum) {
 # add an absence of a catchall
 $email{0} = "(none)";
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("Domain Catchall Edit", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
@@ -117,7 +103,7 @@ print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
 #svcpart
 print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
 
-($domain,$catchall)=(
+my($domain,$catchall)=(
   $svc_domain->domain,
   $svc_domain->catchall,
 );
diff --git a/httemplate/misc/delete-customer.cgi b/httemplate/misc/delete-customer.cgi
index d3e7c798f..18f6e8529 100755
--- a/httemplate/misc/delete-customer.cgi
+++ b/httemplate/misc/delete-customer.cgi
@@ -1,31 +1,20 @@
+<!-- $Id: delete-customer.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: delete-customer.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $conf $query $custnum $new_custnum $cust_main );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs);
-use FS::cust_main;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
+my $conf = new FS::Conf;
 die "Customer deletions not enabled" unless $conf->exists('deletecustomers');
 
+my($custnum, $new_custnum);
 if ( $cgi->param('error') ) {
   $custnum = $cgi->param('custnum');
   $new_custnum = $cgi->param('new_custnum');
 } else {
-  ($query) = $cgi->keywords;
+  my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/ or die "Illegal query: $query";
   $custnum = $1;
   $new_custnum = '';
 }
-$cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } )
+my $cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } )
   or die "Customer not found: $custnum";
 
 print header('Delete customer');
diff --git a/httemplate/misc/expire_pkg.cgi b/httemplate/misc/expire_pkg.cgi
index 21e220d18..739fb517f 100755
--- a/httemplate/misc/expire_pkg.cgi
+++ b/httemplate/misc/expire_pkg.cgi
@@ -1,21 +1,9 @@
+<!-- $Id: expire_pkg.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: expire_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw ( $cgi $date $pkgnum $cust_pkg %hash $new $error );
-use Date::Parse;
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl eidiot);
-use FS::Record qw(qsearchs);
-use FS::cust_pkg;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 #untaint date & pkgnum
 
+my $date;
 if ( $cgi->param('date') ) {
   str2time($cgi->param('date')) =~ /^(\d+)$/ or die "Illegal date";
   $date=$1;
@@ -24,13 +12,13 @@ if ( $cgi->param('date') ) {
 }
 
 $cgi->param('pkgnum') =~ /^(\d+)$/ or die "Illegal pkgnum";
-$pkgnum = $1;
+my $pkgnum = $1;
 
-$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-%hash = $cust_pkg->hash;
+my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+my %hash = $cust_pkg->hash;
 $hash{expire}=$date;
-$new = new FS::cust_pkg ( \%hash );
-$error = $new->replace($cust_pkg);
+my $new = new FS::cust_pkg ( \%hash );
+my $error = $new->replace($cust_pkg);
 &eidiot($error) if $error;
 
 print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
diff --git a/httemplate/misc/link.cgi b/httemplate/misc/link.cgi
index 801b92006..3bcb5d978 100755
--- a/httemplate/misc/link.cgi
+++ b/httemplate/misc/link.cgi
@@ -1,16 +1,7 @@
+<!-- $Id: link.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: link.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
-use strict;
-use vars qw ( %link_field $cgi $pkgnum $svcpart $query $part_svc $svc $svcdb 
-              $link_field );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl header);
-use FS::Record qw(qsearchs);
-
-%link_field = (
+my %link_field = (
   'svc_acct'    => 'username',
   'svc_domain'  => 'domain',
   'svc_acct_sm' => '',
@@ -18,19 +9,17 @@ use FS::Record qw(qsearchs);
   'svc_wo'      => '',
 );
 
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-($query) = $cgi->keywords;
+my($query) = $cgi->keywords;
+my($pkgnum, $svcpart) = ('', '');
 foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
   $pkgnum=$1 if /^pkgnum(\d+)$/;
   $svcpart=$1 if /^svcpart(\d+)$/;
 }
 
-$part_svc = qsearchs('part_svc',{'svcpart'=>$svcpart});
-$svc = $part_svc->getfield('svc');
-$svcdb = $part_svc->getfield('svcdb');
-$link_field = $link_field{$svcdb};
+my $part_svc = qsearchs('part_svc',{'svcpart'=>$svcpart});
+my $svc = $part_svc->getfield('svc');
+my $svcdb = $part_svc->getfield('svcdb');
+my $link_field = $link_field{$svcdb};
 
 print header("Link to existing $svc"),
       qq!<FORM ACTION="!, popurl(1), qq!process/link.cgi" METHOD=POST>!;
diff --git a/httemplate/misc/print-invoice.cgi b/httemplate/misc/print-invoice.cgi
index a6cb05230..aec7cb39c 100755
--- a/httemplate/misc/print-invoice.cgi
+++ b/httemplate/misc/print-invoice.cgi
@@ -1,26 +1,14 @@
+<!-- $Id: print-invoice.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: print-invoice.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw($conf $cgi $lpr $query $invnum $cust_bill $custnum );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearchs);
-use FS::cust_bill;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$lpr = $conf->config('lpr');
+my $conf = new FS::Conf;
+my $lpr = $conf->config('lpr');
 
 #untaint invnum
-($query) = $cgi->keywords;
+my($query) = $cgi->keywords;
 $query =~ /^(\d*)$/;
-$invnum = $1;
-$cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
+my $invnum = $1;
+my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Can't find invoice!\n" unless $cust_bill;
 
         open(LPR,"|$lpr") or die "Can't open $lpr: $!";
@@ -29,7 +17,7 @@ die "Can't find invoice!\n" unless $cust_bill;
           or die $! ? "Error closing $lpr: $!"
                        : "Exit status $? from $lpr";
 
-$custnum = $cust_bill->getfield('custnum');
+my $custnum = $cust_bill->getfield('custnum');
 
 print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum#history");
 
diff --git a/httemplate/misc/process/catchall.cgi b/httemplate/misc/process/catchall.cgi
index 6b1147633..cf6f8d751 100755
--- a/httemplate/misc/process/catchall.cgi
+++ b/httemplate/misc/process/catchall.cgi
@@ -1,26 +1,14 @@
+<!--$Id: catchall.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!--$Id: catchall.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $svcnum $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs fields);
-use FS::svc_domain;
-use FS::CGI qw(popurl);
 
 $FS::svc_domain::whois_hack=1;
 
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$svcnum =$1;
+my $svcnum =$1;
 
-$old = qsearchs('svc_domain',{'svcnum'=>$svcnum}) if $svcnum;
+my $old = qsearchs('svc_domain',{'svcnum'=>$svcnum}) if $svcnum;
 
-$new = new FS::svc_domain ( {
+my $new = new FS::svc_domain ( {
   map {
     ($_, scalar($cgi->param($_)));
   } ( fields('svc_domain'), qw( pkgnum svcpart ) )
@@ -28,6 +16,7 @@ $new = new FS::svc_domain ( {
 
 $new->setfield('action' => 'M');
 
+my $error;
 if ( $svcnum ) {
   $error = $new->replace($old);
 } else {
diff --git a/httemplate/misc/process/delete-customer.cgi b/httemplate/misc/process/delete-customer.cgi
index 4be52004b..6f26c8107 100755
--- a/httemplate/misc/process/delete-customer.cgi
+++ b/httemplate/misc/process/delete-customer.cgi
@@ -1,23 +1,12 @@
+<!-- $Id: delete-customer.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: delete-customer.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw ( $cgi $conf $custnum $new_custnum $cust_main $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs);
-use FS::CGI qw(popurl);
-use FS::cust_main;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
+my $conf = new FS::Conf;
 die "Customer deletions not enabled" unless $conf->exists('deletecustomers');
 
 $cgi->param('custnum') =~ /^(\d+)$/;
-$custnum = $1;
+my $custnum = $1;
+my $new_custnum;
 if ( $cgi->param('new_custnum') ) {
   $cgi->param('new_custnum') =~ /^(\d+)$/
     or die "Illegal new customer number: ". $cgi->param('new_custnum');
@@ -25,10 +14,10 @@ if ( $cgi->param('new_custnum') ) {
 } else {
   $new_custnum = '';
 }
-$cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } )
+my $cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } )
   or die "Customer not found: $custnum";
 
-$error = $cust_main->delete($new_custnum);
+my $error = $cust_main->delete($new_custnum);
 
 if ( $error ) {
   $cgi->param('error', $error);
diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
index 6b34e8a5d..80a5de81f 100755
--- a/httemplate/misc/process/link.cgi
+++ b/httemplate/misc/process/link.cgi
@@ -1,24 +1,12 @@
+<!-- $Id: link.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: link.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw ( $cgi $old $new $error $pkgnum $svcpart $svcnum );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::CGI qw(popurl idiot eidiot);
-use FS::UID qw(cgisuidsetup);
-use FS::cust_svc;
-use FS::Record qw(qsearchs);
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
 $cgi->param('pkgnum') =~ /^(\d+)$/;
-$pkgnum = $1;
+my $pkgnum = $1;
 $cgi->param('svcpart') =~ /^(\d+)$/;
-$svcpart = $1;
+my $svcpart = $1;
 $cgi->param('svcnum') =~ /^(\d*)$/;
-$svcnum = $1;
+my $svcnum = $1;
 
 unless ( $svcnum ) {
   my($part_svc) = qsearchs('part_svc',{'svcpart'=>$svcpart});
@@ -29,15 +17,15 @@ unless ( $svcnum ) {
   $svcnum=$svc_acct->svcnum;
 }
 
-$old = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+my $old = qsearchs('cust_svc',{'svcnum'=>$svcnum});
 die "svcnum not found!" unless $old;
-$new = new FS::cust_svc ({
+my $new = new FS::cust_svc ({
   'svcnum' => $svcnum,
   'pkgnum' => $pkgnum,
   'svcpart' => $svcpart,
 });
 
-$error = $new->replace($old);
+my $error = $new->replace($old);
 
 unless ($error) {
   #no errors, so let's view this customer.
diff --git a/httemplate/misc/susp_pkg.cgi b/httemplate/misc/susp_pkg.cgi
index 602314436..efc2f9bba 100755
--- a/httemplate/misc/susp_pkg.cgi
+++ b/httemplate/misc/susp_pkg.cgi
@@ -1,26 +1,14 @@
+<!-- $Id: susp_pkg.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: susp_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $query $pkgnum $cust_pkg $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs);
-use FS::CGI qw(popurl eidiot);
-use FS::cust_pkg;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
- 
 #untaint pkgnum
-($query) = $cgi->keywords;
+my ($query) = $cgi->keywords;
 $query =~ /^(\d+)$/ || die "Illegal pkgnum";
-$pkgnum = $1;
+my $pkgnum = $1;
 
-$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
 
-$error = $cust_pkg->suspend;
+my $error = $cust_pkg->suspend;
 &eidiot($error) if $error;
 
 print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
diff --git a/httemplate/misc/unsusp_pkg.cgi b/httemplate/misc/unsusp_pkg.cgi
index 8e1b5261b..00f3a08b3 100755
--- a/httemplate/misc/unsusp_pkg.cgi
+++ b/httemplate/misc/unsusp_pkg.cgi
@@ -1,26 +1,14 @@
+<!-- $Id: unsusp_pkg.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: unsusp_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $query $pkgnum $cust_pkg $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl eidiot);
-use FS::Record qw(qsearchs);
-use FS::cust_pkg;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
- 
 #untaint pkgnum
-($query) = $cgi->keywords;
+my ($query) = $cgi->keywords;
 $query =~ /^(\d+)$/ || die "Illegal pkgnum";
-$pkgnum = $1;
+my $pkgnum = $1;
 
-$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
 
-$error = $cust_pkg->unsuspend;
+my $error = $cust_pkg->unsuspend;
 &eidiot($error) if $error;
 
 print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 41a4a546e..755745fde 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -1,20 +1,7 @@
+<!-- $Id: cust_bill.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: cust_bill.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw ( $cgi $invnum $query $sortby @cust_bill );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl header menubar eidiot table );
-use FS::Record qw(qsearch qsearchs);
-use FS::cust_bill;
-use FS::cust_main;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
+my(@cust_bill, $sortby);
 if ( $cgi->keywords ) {
   my($query) = $cgi->keywords;
   if ( $query eq 'invnum' ) {
@@ -55,7 +42,7 @@ if ( $cgi->keywords ) {
   }
 } else {
   $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
-  $invnum = $2;
+  my $invnum = $2;
   @cust_bill = qsearchs('cust_bill', { 'invnum' => $invnum } );
   $sortby = \*invnum_sort;
 }
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 65db0a815..f21dd7ed1 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,27 +1,7 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.20 2002-01-09 13:29:34 ivan Exp $ -->
-
-use strict;
-#use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
-#use vars qw( $conf %all_pkgs $cgi @cust_main $sortby );
-use vars qw( $conf %all_pkgs $cgi @cust_main $sortby
-             $orderby $maxrecords $limit $offset );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use IO::Handle;
-use String::Approx qw(amatch);
-use FS::UID qw(dbh cgisuidsetup);
-use FS::Conf;
-use FS::Record qw(qsearch qsearchs dbdef jsearch);
-use FS::CGI qw(header menubar eidiot popurl table);
-use FS::cust_main;
-use FS::cust_svc;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$maxrecords = $conf->config('maxsearchrecordsperpage');
+
+my $conf = new FS::Conf;
+my $maxrecords = $conf->config('maxsearchrecordsperpage');
 
 #my $cache;
 
@@ -59,16 +39,15 @@ $maxrecords = $conf->config('maxsearchrecordsperpage');
 #) using (custnum)
 #END
 
-$orderby = ''; #removeme
-
-$limit = '';
+my $limit = '';
 $limit .= "LIMIT $maxrecords" if $maxrecords;
 
-$offset = $cgi->param('offset') || 0;
+my $offset = $cgi->param('offset') || 0;
 $limit .= " OFFSET $offset" if $offset;
 
 my $total;
 
+my(@cust_main, $sortby, $orderby);
 if ( $cgi->param('browse') ) {
   my $query = $cgi->param('browse');
   if ( $query eq 'custnum' ) {
@@ -135,10 +114,21 @@ if ( $cgi->param('browse') ) {
 
 } else {
   @cust_main=();
-  &cardsearch if $cgi->param('card_on') && $cgi->param('card');
-  &lastsearch if $cgi->param('last_on') && $cgi->param('last_text');
-  &companysearch if $cgi->param('company_on') && $cgi->param('company_text');
-  &referralsearch if $cgi->param('referral_custnum');
+  $sortby = \*last_sort;
+
+  push @cust_main, @{&cardsearch}
+    if $cgi->param('card_on') && $cgi->param('card');
+  push @cust_main, @{&lastsearch}
+    if $cgi->param('last_on') && $cgi->param('last_text');
+  push @cust_main, @{&companysearch}
+    if $cgi->param('company_on') && $cgi->param('company_text');
+  push @cust_main, @{&referralsearch}
+    if $cgi->param('referral_custnum');
+
+  if ( $cgi->param('company_on') && $cgi->param('company_text') ) {
+    $sortby = \*company_sort;
+    push @cust_main, @{&companysearch};
+  }
 
   @cust_main = grep { $_->ncancelled_pkgs || ! $_->all_pkgs } @cust_main
     if $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
@@ -146,6 +136,7 @@ if ( $cgi->param('browse') ) {
              && ! $cgi->param('showcancelledcustomers') );
 }
 
+my %all_pkgs;
 if ( $conf->exists('hidecancelledpackages' ) ) {
   %all_pkgs = map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
 } else {
@@ -368,8 +359,7 @@ sub cardsearch {
   $card =~ /^(\d{13,16})$/ or eidiot "Illegal card number\n";
   my($payinfo)=$1;
 
-  push @cust_main, qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'CARD'});
-  $sortby=\*last_sort;
+  [ qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'CARD'}) ];
 }
 
 sub referralsearch {
@@ -385,12 +375,12 @@ sub referralsearch {
   } else {
     $depth = 1;
   }
-  push @cust_main, $cust_main->referral_cust_main($depth);
-  $sortby=\*last_sort;
+  [ $cust_main->referral_cust_main($depth) ];
 }
 
 sub lastsearch {
   my(%last_type);
+  my @cust_main;
   foreach ( $cgi->param('last_type') ) {
     $last_type{$_}++;
   }
@@ -432,12 +422,13 @@ sub lastsearch {
     }
 
   }
-  $sortby=\*last_sort;
+  \@cust_main;
 }
 
 sub companysearch {
 
   my(%company_type);
+  my @cust_main;
   foreach ( $cgi->param('company_type') ) {
     $company_type{$_}++ 
   };
@@ -479,7 +470,7 @@ sub companysearch {
     }
 
   }
-  $sortby=\*company_sort;
 
+  \@cust_main;
 }
 %>
diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi
index 68a17e7dc..715e63e24 100755
--- a/httemplate/search/cust_pay.cgi
+++ b/httemplate/search/cust_pay.cgi
@@ -1,27 +1,13 @@
+<!-- $Id: cust_pay.cgi,v 1.2 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: cust_pay.cgi,v 1.1 2001-12-26 09:18:18 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $sortby @cust_pay );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl header menubar idiot table );
-use FS::Record qw(qsearch );
-use FS::cust_pay;
-use FS::cust_main;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
 $cgi->param('payinfo') =~ /^\s*(\d+)\s*$/ or die "illegal payinfo";
 my $payinfo = $1;
 $cgi->param('payby') =~ /^(\w+)$/ or die "illegal payby";
 my $payby = $1;
-@cust_pay = qsearch('cust_pay', { 'payinfo' => $payinfo,
-                                  'payby'   => $payby    } );
-$sortby = \*date_sort;
+my @cust_pay = qsearch('cust_pay', { 'payinfo' => $payinfo,
+                                     'payby'   => $payby    } );
+my $sortby = \*date_sort;
 
 if (0) {
 #if ( scalar(@cust_pay) == 1 ) {
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index dabcf46fb..9705bd658 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,38 +1,22 @@
+<!-- $Id: cust_pkg.cgi,v 1.13 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# <!-- $Id: cust_pkg.cgi,v 1.12 2001-12-18 07:12:00 ivan Exp $ -->
 
-use strict;
-use vars qw ( $cgi @cust_pkg $sortby $query %part_pkg
-              $conf $maxrecords $limit $offset );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(dbh cgisuidsetup);
-use FS::Conf;
-use FS::Record qw(qsearch qsearchs dbdef);
-use FS::CGI qw(header eidiot popurl table);
-use FS::cust_pkg;
-use FS::pkg_svc;
-use FS::cust_svc;
-use FS::cust_main;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$maxrecords = $conf->config('maxsearchrecordsperpage');
+my $conf = new FS::Conf;
+my $maxrecords = $conf->config('maxsearchrecordsperpage');
 
 my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
 
-$limit = '';
+my $limit = '';
 $limit .= "LIMIT $maxrecords" if $maxrecords;
 
-$offset = $cgi->param('offset') || 0;
+my $offset = $cgi->param('offset') || 0;
 $limit .= " OFFSET $offset" if $offset;
 
 my $total;
 
 my $unconf = '';
-($query) = $cgi->keywords;
+my($query) = $cgi->keywords;
+my $sortby;
 if ( $query eq 'pkgnum' ) {
   $sortby=\*pkgnum_sort;
 
@@ -86,7 +70,7 @@ $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
 
 $total = $sth->fetchrow_arrayref->[0];
 
-@cust_pkg = qsearch('cust_pkg',{}, '', "$unconf ORDER BY pkgnum $limit" );
+my @cust_pkg = qsearch('cust_pkg',{}, '', "$unconf ORDER BY pkgnum $limit" );
 
 
 if ( scalar(@cust_pkg) == 1 ) {
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index c9d1eb6ca..8d5329618 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,36 +1,22 @@
+<!-- $Id: svc_acct.cgi,v 1.13 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# <!-- $Id: svc_acct.cgi,v 1.12 2001-12-11 21:26:58 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi @svc_acct $sortby $query $mydomain
-             $conf $maxrecords $limit $offset );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs dbdef);
-use FS::CGI qw(header idiot popurl table);
-use FS::svc_acct;
-use FS::cust_main;
+my $mydomain = '';
 
-$mydomain = '';
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$maxrecords = $conf->config('maxsearchrecordsperpage');
+my $conf = new FS::Conf;
+my $maxrecords = $conf->config('maxsearchrecordsperpage');
 
 my $orderby = ''; #removeme
 
-$limit = '';
+my $limit = '';
 $limit .= "LIMIT $maxrecords" if $maxrecords;
 
-$offset = $cgi->param('offset') || 0;
+my $offset = $cgi->param('offset') || 0;
 $limit .= " OFFSET $offset" if $offset;
 
 my $total;
 
-($query)=$cgi->keywords;
+my($query)=$cgi->keywords;
 $query ||= ''; #to avoid use of unitialized value errors
 
 my $unlinked = '';
@@ -45,6 +31,7 @@ if ( $query =~ /^UN_(.*)$/ ) {
   ';
 }
 
+my(@svc_acct, $sortby);
 if ( $query eq 'svcnum' ) {
   $sortby=\*svcnum_sort;
   $orderby = 'ORDER BY svcnum';
@@ -56,7 +43,7 @@ if ( $query eq 'svcnum' ) {
   $orderby = ( $unlinked ? 'AND' : 'WHERE' ). ' uid IS NOT NULL ORDER BY uid';
 } else {
   $sortby=\*uid_sort;
-  &usernamesearch;
+  @svc_acct = @{&usernamesearch};
 }
 
 if ( $query eq 'svcnum' || $query eq 'username' || $query eq 'uid' ) {
@@ -245,9 +232,8 @@ sub usernamesearch {
   $cgi->param('username') =~ /^([\w\d\-]+)$/; #untaint username_text
   my($username)=$1;
 
-  @svc_acct=qsearch('svc_acct',{'username'=>$username});
+  [ qsearch('svc_acct',{'username'=>$username}) ];
 
 }
 
-
 %>
diff --git a/httemplate/search/svc_acct_sm.cgi b/httemplate/search/svc_acct_sm.cgi
index 5250b5ca1..1f1f770be 100755
--- a/httemplate/search/svc_acct_sm.cgi
+++ b/httemplate/search/svc_acct_sm.cgi
@@ -1,32 +1,18 @@
+<!-- $Id: svc_acct_sm.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
-use strict;
-use vars qw( $conf $cgi $mydomain $domuser $svc_domain $domsvc @svc_acct_sm );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl idiot header table);
-use FS::Record qw(qsearch qsearchs);
-use FS::Conf;
-use FS::svc_domain;
-use FS::svc_acct_sm;
-use FS::svc_acct;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$mydomain = $conf->config('domain');
+my $conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
 
 $cgi->param('domuser') =~ /^([a-z0-9_\-]{0,32})$/;
-$domuser = $1;
+my $domuser = $1;
 
 $cgi->param('domain') =~ /^([\w\-\.]+)$/ or die "Illegal domain";
-$svc_domain = qsearchs('svc_domain',{'domain'=>$1})
+my $svc_domain = qsearchs('svc_domain',{'domain'=>$1})
   or die "Unknown domain";
-$domsvc = $svc_domain->svcnum;
+my $domsvc = $svc_domain->svcnum;
 
+my @svc_acct_sm;
 if ($domuser) {
   @svc_acct_sm=qsearch('svc_acct_sm',{
     'domuser' => $domuser,
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index b09c65a0b..4ec5eb053 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -1,26 +1,12 @@
+<!-- $Id: svc_domain.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# <!-- $Id: svc_domain.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw ( $cgi @svc_domain $sortby $query $conf $mydomain );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header eidiot popurl);
-use FS::svc_domain;
-use FS::cust_svc;
-use FS::svc_acct;
-use FS::svc_forward;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$mydomain = $conf->config('domain');
-
-($query)=$cgi->keywords;
+
+my $conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
+
+my($query)=$cgi->keywords;
 $query ||= ''; #to avoid use of unitialized value errors
+my(@svc_domain,$sortby);
 if ( $query eq 'svcnum' ) {
   $sortby=\*svcnum_sort;
   @svc_domain=qsearch('svc_domain',{});
@@ -69,9 +55,7 @@ END
 #  my(%saw);                 # if we've multiple domains with the same
                              # svcnum, then we've a corrupt database
 
-  my($svc_domain);
-  my $p = popurl(2);
-  foreach $svc_domain (
+  foreach my $svc_domain (
 #    sort $sortby grep(!$saw{$_->svcnum}++, @svc_domain)
     sort $sortby (@svc_domain)
   ) {
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index bbcf87fc2..ef6d56611 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,31 +1,17 @@
+<!-- $Id: cust_bill.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# <!-- $Id: cust_bill.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw ( $cgi $query $invnum $cust_bill $custnum $printed $p );
-use IO::File;
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl menubar);
-use FS::Record qw(qsearchs);
-use FS::cust_bill;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 #untaint invnum
-($query) = $cgi->keywords;
+my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
-$invnum = $1;
+my $invnum = $1;
 
-$cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
+my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Invoice #$invnum not found!" unless $cust_bill;
-$custnum = $cust_bill->getfield('custnum');
+my $custnum = $cust_bill->getfield('custnum');
 
-$printed = $cust_bill->printed;
+my $printed = $cust_bill->printed;
 
-$p = popurl(2);
 print header('Invoice View', menubar(
   "Main Menu" => $p,
   "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 8710dd19d..9595a07e1 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,45 +1,18 @@
+<!-- $Id: cust_main.cgi,v 1.19 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: cust_main.cgi,v 1.18 2001-12-27 09:26:14 ivan Exp $ -->
-
-use strict;
-use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
-              @packages $package @history @bills $bill @credits $credit
-              $balance $item @agents @referrals @invoicing_list $n1 $conf
-              $signupurl ); 
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs qsearch);
-use FS::CGI qw(header menubar popurl table itable ntable);
-use FS::cust_credit;
-use FS::cust_pay;
-use FS::cust_bill;
-use FS::part_pkg;
-use FS::cust_pkg;
-use FS::part_referral;
-use FS::agent;
-use FS::cust_main;
-use FS::cust_refund;
-use FS::cust_bill_pay;
-use FS::cust_credit_bill;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
+
+my $conf = new FS::Conf;
 
 print header("Customer View", menubar(
   'Main Menu' => popurl(2)
 ));
 
 die "No customer specified (bad URL)!" unless $cgi->keywords;
-($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
+my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
 $query =~ /^(\d+)$/;
-$custnum = $1;
-$cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
+my $custnum = $1;
+my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
 die "Customer not found!" unless $cust_main;
-$hashref = $cust_main->hashref;
 
 print qq!<A HREF="!, popurl(2), 
       qq!edit/cust_main.cgi?$custnum">Edit this customer</A>!;
@@ -159,7 +132,8 @@ print '<TD VALIGN="top">';
         $custnum, '</TD></TR>',
   ;
 
-  @agents = qsearch( 'agent', {} );
+  my @agents = qsearch( 'agent', {} );
+  my $agent;
   unless ( scalar(@agents) == 1 ) {
     $agent = qsearchs('agent',{ 'agentnum' => $cust_main->agentnum } );
     print '<TR><TD ALIGN="right">Agent</TD><TD BGCOLOR="#ffffff">',
@@ -167,7 +141,7 @@ print '<TD VALIGN="top">';
   } else {
     $agent = $agents[0];
   }
-  @referrals = qsearch( 'part_referral', {} );
+  my @referrals = qsearch( 'part_referral', {} );
   unless ( scalar(@referrals) == 1 ) {
     my $referral = qsearchs('part_referral', {
       'refnum' => $cust_main->refnum
@@ -202,7 +176,7 @@ print '<TD VALIGN="top">';
 
 print '<BR>';
 
-  @invoicing_list = $cust_main->invoicing_list;
+  my @invoicing_list = $cust_main->invoicing_list;
   print "Billing information (",
        qq!<A HREF="!, popurl(2), qq!misc/bill.cgi?$custnum">!, "Bill now</A>)",
         &ntable("#cccccc"), "<TR><TD>", &ntable("#cccccc",2),
@@ -298,14 +272,15 @@ print qq!!, &table(), "\n",
       qq!</TR>\n!;
 
 #get package info
+my @packages;
 if ( $conf->exists('hidecancelledpackages') ) {
   @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->ncancelled_pkgs);
 } else {
   @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->all_pkgs);
 }
 
-$n1 = '<TR>';
-foreach $package (@packages) {
+my $n1 = '<TR>';
+foreach my $package (@packages) {
   my $pkgnum = $package->pkgnum;
   my $pkg = $package->part_pkg->pkg;
   my $comment = $package->part_pkg->comment;
@@ -362,12 +337,12 @@ print qq!<BR><BR><A NAME="history">Payment History!.
 # major problem: this whole thing is way too sloppy.
 # minor problem: the description lines need better formatting.
 
-@history = (); #needed for mod_perl :)
+my @history = (); #needed for mod_perl :)
 
 my %target = ();
 
-@bills = qsearch('cust_bill',{'custnum'=>$custnum});
-foreach $bill (@bills) {
+my @bills = qsearch('cust_bill',{'custnum'=>$custnum});
+foreach my $bill (@bills) {
   my($bref)=$bill->hashref;
   my $bpre = ( $bill->owed > 0 )
                ? '<b><font size="+1" color="#ff0000"> Open '
@@ -418,9 +393,9 @@ foreach $bill (@bills) {
   }
 }
 
-@credits = grep { $_->credited > 0 }
+my @credits = grep { $_->credited > 0 }
            qsearch('cust_credit',{'custnum'=>$custnum});
-foreach $credit (@credits) {
+foreach my $credit (@credits) {
   my($cref)=$credit->hashref;
   push @history,
     $cref->{_date} . "\t" .
@@ -478,8 +453,8 @@ END
 
 #display payment history
 
-$balance = 0;
-foreach $item (sort keyfield_numerically @history) {
+my $balance = 0;
+foreach my $item (sort keyfield_numerically @history) {
   my($date,$desc,$charge,$payment,$credit,$refund,$target)=split(/\t/,$item);
   $charge ||= 0;
   $payment ||= 0;
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index c8b362cc3..0e6773713 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -1,54 +1,37 @@
+<!-- $Id: cust_pkg.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# <!-- $Id: cust_pkg.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw ( $cgi %uiview %uiadd $part_svc $query $pkgnum $cust_pkg $part_pkg
-              $custnum $susp $cancel $expire $pkg $comment $setup $bill
-              $otaker );
-use Date::Format;
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl header menubar ntable table);
-use FS::Record qw(qsearch qsearchs);
-use FS::part_svc;
-use FS::cust_pkg;
-use FS::part_pkg;
-use FS::pkg_svc;
-use FS::cust_svc;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-foreach $part_svc ( qsearch('part_svc',{}) ) {
+
+my %uiview = ();
+my %uiadd = ();
+foreach my $part_svc ( qsearch('part_svc',{}) ) {
   $uiview{$part_svc->svcpart} = popurl(2). "view/". $part_svc->svcdb . ".cgi";
   $uiadd{$part_svc->svcpart}= popurl(2). "edit/". $part_svc->svcdb . ".cgi";
 }
 
-($query) = $cgi->keywords;
+my ($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
-$pkgnum = $1;
+my $pkgnum = $1;
 
 #get package record
-$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
 die "No package!" unless $cust_pkg;
-$part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
+my $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
 
-$custnum = $cust_pkg->getfield('custnum');
+my $custnum = $cust_pkg->getfield('custnum');
 print header('Package View', menubar(
   "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum",
   'Main Menu' => popurl(2)
 ));
 
 #print info
-($susp,$cancel,$expire)=(
+my ($susp,$cancel,$expire)=(
   $cust_pkg->getfield('susp'),
   $cust_pkg->getfield('cancel'),
   $cust_pkg->getfield('expire'),
 );
-($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment'));
-($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
-$otaker = $cust_pkg->getfield('otaker');
+my($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment'));
+my($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
+my $otaker = $cust_pkg->getfield('otaker');
 
 print <<END;
 <SCRIPT>
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 7cebdf8da..a4e377078 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,37 +1,19 @@
+<!-- $Id: svc_acct.cgi,v 1.10 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# <!-- $Id: svc_acct.cgi,v 1.9 2001-12-15 22:59:35 ivan Exp $ -->
 
-use strict;
-use vars qw( $conf $cgi $domain $query $svcnum $svc_acct $cust_svc $pkgnum
-             $cust_pkg $custnum $part_svc $p $svc_acct_pop $password
-             $mydomain $svc_domain );
-use CGI;
-use CGI::Carp qw( fatalsToBrowser );
-use FS::UID qw( cgisuidsetup );
-use FS::CGI qw( header popurl menubar ntable);
-use FS::Record qw( qsearchs fields );
-use FS::Conf;
-use FS::svc_acct;
-use FS::cust_svc;
-use FS::cust_pkg;
-use FS::part_svc;
-use FS::svc_acct_pop;
-use FS::raddb;
+my $conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
 
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-
-($query) = $cgi->keywords;
+my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
-$svcnum = $1;
-$svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
+my $svcnum = $1;
+my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
 die "Unknown svcnum" unless $svc_acct;
 
 #false laziness w/all svc_*.cgi
-$cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );
-$pkgnum = $cust_svc->getfield('pkgnum');
+my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );
+my $pkgnum = $cust_svc->getfield('pkgnum');
+my($cust_pkg, $custnum);
 if ($pkgnum) {
   $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
   $custnum = $cust_pkg->custnum;
@@ -41,22 +23,22 @@ if ($pkgnum) {
 }
 #eofalse
 
-$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unknown svcpart" unless $part_svc;
 
+my $domain;
 if ( $svc_acct->domsvc ) {
-  $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
+  my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
   die "Unknown domain" unless $svc_domain;
   $domain = $svc_domain->domain;
 } else {
-  unless ( $mydomain = $conf->config('domain') ) {
+  unless ( $mydomain ) {
     die "No legacy domain config file and no svc_domain.svcnum record ".
         "for svc_acct.domsvc: ". $cust_svc->domsvc;
   }
   $domain = $mydomain;
 }
 
-$p = popurl(2);
 print header('Account View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
@@ -84,7 +66,7 @@ print "<TR><TD ALIGN=\"right\">Domain</TD>".
         "<TD BGCOLOR=\"#ffffff\">". $domain, "</TD></TR>";
 
 print "<TR><TD ALIGN=\"right\">Password</TD><TD BGCOLOR=\"#ffffff\">";
-$password = $svc_acct->_password;
+my $password = $svc_acct->_password;
 if ( $password =~ /^\*\w+\* (.*)$/ ) {
   $password = $1;
   print "<I>(login disabled)</I> ";
@@ -97,7 +79,7 @@ if ( $conf->exists('showpasswords') ) {
 print "</TR></TD>";
 $password = '';
 
-$svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
+my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
 print "<TR><TD ALIGN=\"right\">Access number</TD>".
       "<TD BGCOLOR=\"#ffffff\">". $svc_acct_pop->text. '</TD></TR>'
   if $svc_acct_pop;
diff --git a/httemplate/view/svc_acct_sm.cgi b/httemplate/view/svc_acct_sm.cgi
index 366ee99f9..c8561caba 100755
--- a/httemplate/view/svc_acct_sm.cgi
+++ b/httemplate/view/svc_acct_sm.cgi
@@ -1,36 +1,18 @@
+<!-- $Id: svc_acct_sm.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
-use strict;
-use vars qw($conf $cgi $mydomain $query $svcnum $svc_acct_sm $cust_svc
-            $pkgnum $cust_pkg $custnum $part_svc $p $domsvc $domuid $domuser
-            $svc $svc_domain $domain $svc_acct $username );
-use CGI;
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl menubar );
-use FS::Record qw(qsearchs);
-use FS::Conf;
-use FS::svc_acct_sm;
-use FS::cust_svc;
-use FS::cust_pkg;
-use FS::part_svc;
-use FS::svc_domain;
-use FS::svc_acct;
+my $conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
 
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$mydomain = $conf->config('domain');
-
-($query) = $cgi->keywords;
+my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
-$svcnum = $1;
-$svc_acct_sm = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum});
+my $svcnum = $1;
+my $svc_acct_sm = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum});
 die "Unknown svcnum" unless $svc_acct_sm;
 
-$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-$pkgnum = $cust_svc->getfield('pkgnum');
+my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+my $pkgnum = $cust_svc->getfield('pkgnum');
+my($cust_pkg, $custnum);
 if ($pkgnum) {
   $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
   $custnum=$cust_pkg->getfield('custnum');
@@ -39,10 +21,9 @@ if ($pkgnum) {
   $custnum = '';
 }
 
-$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
+my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
   or die "Unkonwn svcpart";
 
-$p = popurl(2);
 print header('Mail Alias View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
@@ -54,18 +35,18 @@ print header('Mail Alias View', menubar(
   "Main menu" => $p,
 ));
 
-($domsvc,$domuid,$domuser) = (
+my($domsvc,$domuid,$domuser) = (
   $svc_acct_sm->domsvc,
   $svc_acct_sm->domuid,
   $svc_acct_sm->domuser,
 );
-$svc = $part_svc->svc;
-$svc_domain = qsearchs('svc_domain',{'svcnum'=>$domsvc})
+my $svc = $part_svc->svc;
+my $svc_domain = qsearchs('svc_domain',{'svcnum'=>$domsvc})
   or die "Corrupted database: no svc_domain.svcnum matching domsvc $domsvc";
-$domain = $svc_domain->domain;
-$svc_acct = qsearchs('svc_acct',{'uid'=>$domuid})
+my $domain = $svc_domain->domain;
+my $svc_acct = qsearchs('svc_acct',{'uid'=>$domuid})
   or die "Corrupted database: no svc_acct.uid matching domuid $domuid";
-$username = $svc_acct->username;
+my $username = $svc_acct->username;
 
 print qq!<A HREF="${p}edit/svc_acct_sm.cgi?$svcnum">Edit this information</A>!,
       "<BR>Service #$svcnum",
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index 4add200b9..c980b1c25 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -1,29 +1,15 @@
+<!-- $Id: svc_domain.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# <!-- $Id: svc_domain.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $query $svcnum $svc_domain $domain $cust_svc $pkgnum 
-             $cust_pkg $custnum $part_svc $p $svc_acct $email);
-use CGI;
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header menubar popurl menubar);
-use FS::Record qw(qsearchs);
-use FS::svc_domain;
-use FS::cust_svc;
-use FS::cust_pkg;
-use FS::part_svc;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-($query) = $cgi->keywords;
+my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
-$svcnum = $1;
-$svc_domain = qsearchs('svc_domain',{'svcnum'=>$svcnum});
+my $svcnum = $1;
+my $svc_domain = qsearchs('svc_domain',{'svcnum'=>$svcnum});
 die "Unknown svcnum" unless $svc_domain;
 
-$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-$pkgnum = $cust_svc->getfield('pkgnum');
+my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+my $pkgnum = $cust_svc->getfield('pkgnum');
+my($cust_pkg, $custnum);
 if ($pkgnum) {
   $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
   $custnum=$cust_pkg->getfield('custnum');
@@ -32,18 +18,18 @@ if ($pkgnum) {
   $custnum = '';
 }
 
-$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unknown svcpart" unless $part_svc;
 
+my $email = '';
 if ($svc_domain->catchall) {
-  $svc_acct = qsearchs('svc_acct',{'svcnum'=> $svc_domain->catchall } );
+  my $svc_acct = qsearchs('svc_acct',{'svcnum'=> $svc_domain->catchall } );
   die "Unknown svcpart" unless $svc_acct;
   $email = $svc_acct->email;
 }
 
-$domain = $svc_domain->domain;
+my $domain = $svc_domain->domain;
 
-$p = popurl(2);
 print header('Domain View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index bb9587062..fc465dbab 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -1,34 +1,17 @@
+<!-- $Id: svc_forward.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# <!-- $Id: svc_forward.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
-use strict;
-use vars qw($conf $cgi $query $svcnum $svc_forward $cust_svc
-            $pkgnum $cust_pkg $custnum $part_svc $p $srcsvc $dstsvc $dst
-            $svc $svc_acct $source $destination);
-use CGI;
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl menubar );
-use FS::Record qw(qsearchs);
-use FS::Conf;
-use FS::cust_svc;
-use FS::cust_pkg;
-use FS::part_svc;
-use FS::svc_acct;
-use FS::svc_forward;
+my $conf = new FS::Conf;
 
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-
-($query) = $cgi->keywords;
+my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
-$svcnum = $1;
-$svc_forward = qsearchs('svc_forward',{'svcnum'=>$svcnum});
+my $svcnum = $1;
+my $svc_forward = qsearchs('svc_forward',{'svcnum'=>$svcnum});
 die "Unknown svcnum" unless $svc_forward;
 
-$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-$pkgnum = $cust_svc->getfield('pkgnum');
+my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+my $pkgnum = $cust_svc->getfield('pkgnum');
+my($cust_pkg, $custnum);
 if ($pkgnum) {
   $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
   $custnum=$cust_pkg->getfield('custnum');
@@ -37,10 +20,9 @@ if ($pkgnum) {
   $custnum = '';
 }
 
-$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
+my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
   or die "Unkonwn svcpart";
 
-$p = popurl(2);
 print header('Mail Forward View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
@@ -52,17 +34,18 @@ print header('Mail Forward View', menubar(
   "Main menu" => $p,
 ));
 
-($srcsvc,$dstsvc,$dst) = (
+my($srcsvc,$dstsvc,$dst) = (
   $svc_forward->srcsvc,
   $svc_forward->dstsvc,
   $svc_forward->dst,
 );
-$svc = $part_svc->svc;
-$svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc})
+my $svc = $part_svc->svc;
+my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc})
   or die "Corrupted database: no svc_acct.svcnum matching srcsvc $srcsvc";
-$source = $svc_acct->email;
+my $source = $svc_acct->email;
+my $destination;
 if ($dstsvc) {
-  $svc_acct = qsearchs('svc_acct',{'svcnum'=>$dstsvc})
+  my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$dstsvc})
     or die "Corrupted database: no svc_acct.svcnum matching dstsvc $dstsvc";
   $destination = $svc_acct->email;
 }else{
diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index ff9d57b5f..bc605be24 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -1,32 +1,16 @@
+<!-- $Id: svc_www.cgi,v 1.2 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# <!-- $Id: svc_www.cgi,v 1.1 2001-12-15 22:56:07 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $query $svcnum $svc_www $cust_svc $pkgnum
-             $cust_pkg $custnum $p $domain_record );
-             #$part_svc $p $svc_acct $email
-use CGI;
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header menubar popurl menubar);
-use FS::Record qw(qsearchs);
-use FS::svc_www;
-use FS::domain_record;
-use FS::cust_svc;
-#use FS::cust_pkg;
-#use FS::part_svc;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-($query) = $cgi->keywords;
+my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
-$svcnum = $1;
-$svc_www = qsearchs( 'svc_www', { 'svcnum' => $svcnum } )
+my $svcnum = $1;
+my $svc_www = qsearchs( 'svc_www', { 'svcnum' => $svcnum } )
   or die "svc_www: Unknown svcnum $svcnum";
 
 #false laziness w/all svc_*.cgi
-$cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } );
-$pkgnum = $cust_svc->getfield('pkgnum');
+my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } );
+my $pkgnum = $cust_svc->getfield('pkgnum');
+my($cust_pkg, custnum);
 if ($pkgnum) {
   $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
   $custnum = $cust_pkg->custnum;
@@ -36,12 +20,11 @@ if ($pkgnum) {
 }
 #eofalse
 
-$domain_record = qsearchs( 'domain_record', { 'recnum' => $svc_www->recnum } )
+my $domain_record = qsearchs('domain_record', { 'recnum' => $svc_www->recnum } )
   or die "svc_www: Unknown recnum". $svc_www->recnum;
 
 my $www = $domain_record->reczone;
 
-$p = popurl(2);
 print header('Website View', menubar(
   ( ( $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-- 
cgit v1.2.1


From c7ff9a58360788ce776022606c4ec3496062013b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 30 Jan 2002 18:22:54 +0000
Subject: fully working invoice event web interface

---
 httemplate/browse/part_bill_event.cgi       | 14 ++++++--
 httemplate/edit/part_bill_event.cgi         | 53 ++++++++++++++++++-----------
 httemplate/edit/process/part_bill_event.cgi | 46 ++++++++++++++++++-------
 3 files changed, 79 insertions(+), 34 deletions(-)

diff --git a/httemplate/browse/part_bill_event.cgi b/httemplate/browse/part_bill_event.cgi
index cd90bc1da..7ec8a181a 100755
--- a/httemplate/browse/part_bill_event.cgi
+++ b/httemplate/browse/part_bill_event.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_bill_event.cgi,v 1.2 2002-01-30 14:18:08 ivan Exp $ -->
+<!-- $Id: part_bill_event.cgi,v 1.3 2002-01-30 18:22:54 ivan Exp $ -->
 <% 
 
 my %search;
@@ -27,6 +27,8 @@ my $total = scalar(@part_bill_event);
     <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Event</TH>
     <TH>Payby</TH>
     <TH>After</TH>
+    <TH>Action</TH>
+    <TH>Options</TH>
     <TH>Code</TH>
   </TR>
 
@@ -38,6 +40,8 @@ my $total = scalar(@part_bill_event);
      my $url = "${p}edit/part_bill_event.cgi?". $part_bill_event->eventpart;
      use Time::Duration;
      my $delay = duration_exact($part_bill_event->seconds);
+     my $plandata = $part_bill_event->plandata;
+     $plandata =~ s/\n/<BR>/go;
 %>
   <TR>
     <TD><A HREF="<%= $url %>">
@@ -53,12 +57,16 @@ my $total = scalar(@part_bill_event);
     <TD>
       <%= $delay %></TD>
     <TD>
-      <%= $part_bill_event->eventcode %></TD>
+      <%= $part_bill_event->plan %></TD>
+    <TD>
+      <%= $plandata %></TD>
+    <TD><FONT SIZE="-1">
+      <%= $part_bill_event->eventcode %></FONT></TD>
   </TR>
 <% } %>
 
   <TR>
-    <TD COLSPAN=6><A HREF="<%= $p %>edit/part_bill_event.cgi"><I>Add a new billing event</I></A></TD>
+    <TD COLSPAN=8><A HREF="<%= $p %>edit/part_bill_event.cgi"><I>Add a new billing event</I></A></TD>
   </TR>
 </TABLE>
 </BODY>
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 939eff360..c41cfe9cf 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -1,11 +1,11 @@
-<!-- $Id: part_bill_event.cgi,v 1.2 2002-01-30 14:18:08 ivan Exp $ -->
+<!-- $Id: part_bill_event.cgi,v 1.3 2002-01-30 18:22:54 ivan Exp $ -->
 
 <%
 
-if ( $cgi->param('eventnum') && $cgi->param('eventnum') =~ /^(\d+)$/ ) {
-  $cgi->param('eventnum', $1);
+if ( $cgi->param('eventpart') && $cgi->param('eventpart') =~ /^(\d+)$/ ) {
+  $cgi->param('eventpart', $1);
 } else {
-  $cgi->param('eventnum', '');
+  $cgi->param('eventpart', '');
 }
 
 my ($query) = $cgi->keywords;
@@ -33,8 +33,9 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
   if $cgi->param('error');
 
-print '<FORM ACTION="', popurl(1), 'process/part_bill_event.cgi" METHOD=POST>';
-
+print '<FORM ACTION="', popurl(1), 'process/part_bill_event.cgi" METHOD=POST>'.
+      '<INPUT TYPE="hidden" NAME="eventpart" VALUE="'.
+      $part_bill_event->eventpart  .'">';
 print "Invoice Event #", $hashref->{eventpart} ? $hashref->{eventpart} : "(NEW)";
 
 print ntable("#cccccc",2), <<END;
@@ -50,7 +51,7 @@ for (qw(CARD BILL COMP)) {
   }
 }
 
-my $days = $hashref->{seconds}/3600;
+my $days = $hashref->{seconds}/86400;
 
 print <<END;
 </SELECT></TD></TR>
@@ -74,8 +75,9 @@ tie my %events, 'Tie::IxHash',
   'fee' => {
     'name'   => 'Late fee',
     'code'   => '$cust_main->charge( %%%charge%%%, \'%%%reason%%%\' );',
-    'html'   => 'Amount <INPUT TYPE="text" SIZE="7" NAME="charge"><BR>'.
-              'Reason <INPUT TYPE="text" NAME="reason">',
+    'html'   => 
+      'Amount <INPUT TYPE="text" SIZE="7" NAME="charge" VALUE="%%%charge%%%">'.
+      '<BR>Reason <INPUT TYPE="text" NAME="reason" VALUE="%%%reason%%%">',
     'weight' => 10,
   },
   'suspend' => {
@@ -101,29 +103,42 @@ tie my %events, 'Tie::IxHash',
     'weight' => 30
   },
 
-  'Generate invoices' => {
+  'bill' => {
+    'name' => 'Generate invoices',
     'code' => '$cust_main->bill();',
-    'pad'  => 40,
+    'weight'  => 40,
   },
 
-  'Apply unapplied payments and credits' => {
+  'apply' => {
+    'name' => 'Apply unapplied payments and credits',
     'code' => '$cust_main->apply_payments; $cust_main->apply_credits;',
-    'pad'  => 50,
+    'weight'  => 50,
   },
 
-  'Collect on invoices' => {
+  'collect' => {
+    'name' => 'Collect on invoices',
     'code' => '$cust_main->collect();',
-    'pad'  => 60,
+    'weight'  => 60,
   },
 
 ;
 
 foreach my $event ( keys %events ) {
+  my %plandata = map { /^(\w+) (.*)$/; ($1, $2); }
+                   split(/\n/, $part_bill_event->plandata);
+  my $html = $events{$event}{html};
+  while ( $html =~ /%%%(\w+)%%%/ ) {
+    my $field = $1;
+    $html =~ s/%%%$field%%%/$plandata{$field}/;
+  }
+
   print ntable( "#cccccc", 2).
-        qq!<TR><TD><INPUT TYPE="radio" NAME="eventcode" VALUE="!.
-        $events{$event}{weight}. ":".
-        encode_entities($events{$event}{code}). qq!">$event</TD>!;
-  print '<TD>'. $events{$event}{html}. '</TD>' if exists $events{$event}{html};
+        qq!<TR><TD><INPUT TYPE="radio" NAME="plan_weight_eventcode" !;
+  print "CHECKED " if $event eq $part_bill_event->plan;
+  print qq!VALUE="!.  $event. ":". $events{$event}{weight}. ":".
+        encode_entities($events{$event}{code}).
+        qq!">$events{$event}{name}</TD>!;
+  print '<TD>'. $html. '</TD>' if $html;
   print qq!</TR>!;
   print '</TABLE>';
 }
diff --git a/httemplate/edit/process/part_bill_event.cgi b/httemplate/edit/process/part_bill_event.cgi
index eb7c53e5d..7c0b54d0d 100755
--- a/httemplate/edit/process/part_bill_event.cgi
+++ b/httemplate/edit/process/part_bill_event.cgi
@@ -5,21 +5,43 @@ my $eventpart = $cgi->param('eventpart');
 my $old = qsearchs('part_bill_event',{'eventpart'=>$eventpart}) if $eventpart;
 
 #s/days/seconds/
-$cgi->param('seconds', $cgi->param('days') * 3600 );
-
-my $new = new FS::part_bill_event ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('part_bill_event'),
-} );
+$cgi->param('seconds', $cgi->param('days') * 86400 );
 
 my $error;
-if ( $eventpart ) {
-  $error = $new->replace($old);
+if ( ! $cgi->param('plan_weight_eventcode') ) {
+  $error = "Must select an action";
 } else {
-  $error = $new->insert;
-  $eventpart = $new->getfield('eventpart');
-}
+
+  $cgi->param('plan_weight_eventcode') =~ /^(\w+):(\d+):(.*)$/
+    or die "illegal plan_weight_eventcode:".
+           $cgi->param('plan_weight_eventcode');
+  $cgi->param('plan', $1);
+  $cgi->param('weight', $2);
+  my $eventcode = $3;
+  my $plandata = '';
+  while ( $eventcode =~ /%%%(\w+)%%%/ ) {
+    my $field = $1;
+    my $value = $cgi->param($field);
+    $eventcode =~ s/%%%$field%%%/$value/;
+    $plandata .= "$field $value\n";
+  }
+  $cgi->param('eventcode', $eventcode);
+  $cgi->param('plandata', $plandata);
+
+  my $new = new FS::part_bill_event ( {
+    map {
+      $_, scalar($cgi->param($_));
+    } fields('part_bill_event'),
+  } );
+
+  my $error;
+  if ( $eventpart ) {
+    $error = $new->replace($old);
+  } else {
+    $error = $new->insert;
+    $eventpart = $new->getfield('eventpart');
+  }
+} 
 
 if ( $error ) {
   $cgi->param('error', $error);
-- 
cgit v1.2.1


From 8cbba53b09bb5b09355316b7ff8948500c3b4b76 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 4 Feb 2002 16:44:48 +0000
Subject: billing events!

---
 FS/FS/cust_bill.pm                  | 370 ++++++++++++++++++++++++++++++++-
 FS/FS/cust_main.pm                  | 402 ++++++------------------------------
 httemplate/docs/install.html        |   1 -
 httemplate/docs/upgrade8.html       |   2 +-
 httemplate/edit/part_bill_event.cgi |  44 +++-
 httemplate/view/cust_bill.cgi       |  13 +-
 6 files changed, 467 insertions(+), 365 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 8b326a56f..00135afa1 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2,8 +2,14 @@ package FS::cust_bill;
 
 use strict;
 use vars qw( @ISA $conf $invoice_template $money_char );
+use vars qw( $lpr $invoice_from $smtpmachine );
+use vars qw( $processor );
+use vars qw( $xaction $E_NoErr );
+use vars qw( $bop_processor $bop_login $bop_password $bop_action @bop_options );
 use vars qw( $invoice_lines @buf ); #yuck
 use Date::Format;
+use Mail::Internet;
+use Mail::Header;
 use Text::Template;
 use FS::Record qw( qsearch qsearchs );
 use FS::cust_main;
@@ -12,6 +18,7 @@ use FS::cust_credit;
 use FS::cust_pay;
 use FS::cust_pkg;
 use FS::cust_credit_bill;
+use FS::cust_pay_batch;
 
 @ISA = qw( FS::Record );
 
@@ -36,6 +43,44 @@ $FS::UID::callback{'FS::cust_bill'} = sub {
   ) or die "can't create new Text::Template object: $Text::Template::ERROR";
   $invoice_template->compile()
     or die "can't compile template: $Text::Template::ERROR";
+
+  $lpr = $conf->config('lpr');
+  $invoice_from = $conf->config('invoice_from');
+  $smtpmachine = $conf->config('smtpmachine');
+
+  if ( $conf->exists('cybercash3.2') ) {
+    require CCMckLib3_2;
+      #qw($MCKversion %Config InitConfig CCError CCDebug CCDebug2);
+    require CCMckDirectLib3_2;
+      #qw(SendCC2_1Server);
+    require CCMckErrno3_2;
+      #qw(MCKGetErrorMessage $E_NoErr);
+    import CCMckErrno3_2 qw($E_NoErr);
+
+    my $merchant_conf;
+    ($merchant_conf,$xaction)= $conf->config('cybercash3.2');
+    my $status = &CCMckLib3_2::InitConfig($merchant_conf);
+    if ( $status != $E_NoErr ) {
+      warn "CCMckLib3_2::InitConfig error:\n";
+      foreach my $key (keys %CCMckLib3_2::Config) {
+        warn "  $key => $CCMckLib3_2::Config{$key}\n"
+      }
+      my($errmsg) = &CCMckErrno3_2::MCKGetErrorMessage($status);
+      die "CCMckLib3_2::InitConfig fatal error: $errmsg\n";
+    }
+    $processor='cybercash3.2';
+  } elsif ( $conf->exists('business-onlinepayment') ) {
+    ( $bop_processor,
+      $bop_login,
+      $bop_password,
+      $bop_action,
+      @bop_options
+    ) = $conf->config('business-onlinepayment');
+    $bop_action ||= 'normal authorization';
+    eval "use Business::OnlinePayment";  
+    $processor="Business::OnlinePayment::$bop_processor";
+  }
+
 };
 
 =head1 NAME
@@ -88,8 +133,7 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =item charged - amount of this invoice
 
-=item printed - how many times this invoice has been printed automatically
-(see L<FS::cust_main/"collect">).
+=item printed - deprecated
 
 =item closed - books closed flag, empty or `Y'
 
@@ -207,6 +251,17 @@ sub cust_bill_pkg {
   qsearch( 'cust_bill_pkg', { 'invnum' => $self->invnum } );
 }
 
+=item cust_main
+
+Returns the customer (see L<FS::cust_main>) for this invoice.
+
+=cut
+
+sub cust_main {
+  my $self = shift;
+  qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+}
+
 =item cust_credit
 
 Depreciated.  See the cust_credited method.
@@ -306,6 +361,315 @@ sub owed {
   $balance;
 }
 
+=item send
+
+Sends this invoice to the destinations configured for this customer: send
+emails or print.  See L<FS::cust_main_invoice>.
+
+=cut
+
+sub send {
+  my $self = shift;
+
+  #my @print_text = $cust_bill->print_text; #( date )
+  my @invoicing_list = $self->cust_main->invoicing_list;
+  if ( grep { $_ ne 'POST' } @invoicing_list ) { #email invoice
+    $ENV{SMTPHOSTS} = $smtpmachine;
+    $ENV{MAILADDRESS} = $invoice_from;
+    my $header = new Mail::Header ( [
+      "From: $invoice_from",
+      "To: ". join(', ', grep { $_ ne 'POST' } @invoicing_list ),
+      "Sender: $invoice_from",
+      "Reply-To: $invoice_from",
+      "Date: ". time2str("%a, %d %b %Y %X %z", time),
+      "Subject: Invoice",
+    ] );
+    my $message = new Mail::Internet (
+      'Header' => $header,
+      'Body' => [ $self->print_text ], #( date)
+    );
+    $message->smtpsend
+      or return "Can't send invoice email to server $smtpmachine!";
+
+  #} elsif ( grep { $_ eq 'POST' } @invoicing_list ) {
+  } elsif ( ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list ) {
+    open(LPR, "|$lpr")
+      or return "Can't open pipe to $lpr: $!";
+    print LPR $self->print_text; #( date )
+    close LPR
+      or return $! ? "Error closing $lpr: $!"
+                   : "Exit status $? from $lpr";
+  }
+
+  '';
+
+}
+
+=item comp
+
+Pays this invoice with a compliemntary payment.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub comp {
+  my $self = shift;
+  my $cust_pay = new FS::cust_pay ( {
+    'invnum'   => $self->invnum,
+    'paid'     => $self->owed,
+    '_date'    => '',
+    'payby'    => 'COMP',
+    'payinfo'  => $self->cust_main->payinfo,
+    'paybatch' => '',
+  } );
+  $cust_pay->insert;
+}
+
+=item realtime_card
+
+Attempts to pay this invoice with a Business::OnlinePayment realtime gateway.
+See http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment
+for supproted processors.
+
+=cut
+
+sub realtime_card {
+  my $self = shift;
+  my $cust_main = $self->cust_main;
+  my $amount = $self->owed;
+
+  unless ( $processor =~ /^Business::OnlinePayment::(.*)$/ ) {
+    return "Real-time card processing not enabled (processor $processor)";
+  }
+  my $bop_processor = $1; #hmm?
+
+  my $address = $cust_main->address1;
+  $address .= ", ". $cust_main->address2 if $cust_main->address2;
+
+  #fix exp. date
+  #$cust_main->paydate =~ /^(\d+)\/\d*(\d{2})$/;
+  $cust_main->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
+  my $exp = "$2/$1";
+
+  my($payname, $payfirst, $paylast);
+  if ( $cust_main->payname ) {
+    $payname = $cust_main->payname;
+    $payname =~ /^\s*([\w \,\.\-\']*\w)?\s+([\w\,\.\-\']+)$/
+      or do {
+              #$dbh->rollback if $oldAutoCommit;
+              return "Illegal payname $payname";
+            };
+    ($payfirst, $paylast) = ($1, $2);
+  } else {
+    $payfirst = $cust_main->getfield('first');
+    $paylast = $cust_main->getfield('first');
+    $payname =  "$payfirst $paylast";
+  }
+
+  my @invoicing_list = grep { $_ ne 'POST' } $cust_main->invoicing_list;
+  if ( $conf->exists('emailinvoiceauto')
+       || ( $conf->exists('emailinvoiceonly') && ! @invoicing_list ) ) {
+    push @invoicing_list, $cust_main->default_invoicing_list;
+  }
+  my $email = $invoicing_list[0];
+
+  my( $action1, $action2 ) = split(/\s*\,\s*/, $bop_action );
+  
+  my $transaction =
+    new Business::OnlinePayment( $bop_processor, @bop_options );
+  $transaction->content(
+    'type'           => 'CC',
+    'login'          => $bop_login,
+    'password'       => $bop_password,
+    'action'         => $action1,
+    'description'    => 'Internet Services',
+    'amount'         => $amount,
+    'invoice_number' => $self->invnum,
+    'customer_id'    => $self->custnum,
+    'last_name'      => $paylast,
+    'first_name'     => $payfirst,
+    'name'           => $payname,
+    'address'        => $address,
+    'city'           => $cust_main->city,
+    'state'          => $cust_main->state,
+    'zip'            => $cust_main->zip,
+    'country'        => $cust_main->country,
+    'card_number'    => $cust_main->payinfo,
+    'expiration'     => $exp,
+    'referer'        => 'http://cleanwhisker.420.am/',
+    'email'          => $email,
+  );
+  $transaction->submit();
+
+  if ( $transaction->is_success() && $action2 ) {
+    my $auth = $transaction->authorization;
+    my $ordernum = $transaction->order_number;
+    #warn "********* $auth ***********\n";
+    #warn "********* $ordernum ***********\n";
+    my $capture =
+      new Business::OnlinePayment( $bop_processor, @bop_options );
+
+    $capture->content(
+      action         => $action2,
+      login          => $bop_login,
+      password       => $bop_password,
+      order_number   => $ordernum,
+      amount         => $amount,
+      authorization  => $auth,
+      description    => 'Internet Services',
+    );
+
+    $capture->submit();
+
+    unless ( $capture->is_success ) {
+      my $e = "Authorization sucessful but capture failed, invnum #".
+              $self->invnum. ': '.  $capture->result_code.
+              ": ". $capture->error_message;
+      warn $e;
+      return $e;
+    }
+
+  }
+
+  if ( $transaction->is_success() ) {
+
+    my $cust_pay = new FS::cust_pay ( {
+       'invnum'   => $self->invnum,
+       'paid'     => $amount,
+       '_date'     => '',
+       'payby'    => 'CARD',
+       'payinfo'  => $cust_main->payinfo,
+       'paybatch' => "$processor:". $transaction->authorization,
+    } );
+    my $error = $cust_pay->insert;
+    if ( $error ) {
+      # gah, even with transactions.
+      my $e = 'WARNING: Card debited but database not updated - '.
+              'error applying payment, invnum #' . $self->invnum.
+              " ($processor): $error";
+      warn $e;
+      return $e;
+    } else {
+      return '';
+    }
+  #} elsif ( $options{'report_badcard'} ) {
+  } else {
+    return "$processor error, invnum #". $self->invnum. ': '.
+           $transaction->result_code. ": ". $transaction->error_message;
+  }
+
+}
+
+=item realtime_card_cybercash
+
+Attempts to pay this invoice with the CyberCash CashRegister realtime gateway.
+
+=cut
+
+sub realtime_card_cybercash {
+  my $self = shift;
+  my $cust_main = $self->cust_main;
+  my $amount = $self->owed;
+
+  return "CyberCash CashRegister real-time card processing not enabled!"
+    unless $processor eq 'cybercash3.2';
+
+  my $address = $cust_main->address1;
+  $address .= ", ". $cust_main->address2 if $cust_main->address2;
+
+  #fix exp. date
+  #$cust_main->paydate =~ /^(\d+)\/\d*(\d{2})$/;
+  $cust_main->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
+  my $exp = "$2/$1";
+
+  #
+
+  my $paybatch = $self->invnum. 
+                  '-' . time2str("%y%m%d%H%M%S", time);
+
+  my $payname = $cust_main->payname ||
+                $cust_main->getfield('first').' '.$cust_main->getfield('last');
+
+  my $country = $cust_main->country eq 'US' ? 'USA' : $cust_main->country;
+
+  my @full_xaction = ( $xaction,
+    'Order-ID'     => $paybatch,
+    'Amount'       => "usd $amount",
+    'Card-Number'  => $cust_main->getfield('payinfo'),
+    'Card-Name'    => $payname,
+    'Card-Address' => $address,
+    'Card-City'    => $cust_main->getfield('city'),
+    'Card-State'   => $cust_main->getfield('state'),
+    'Card-Zip'     => $cust_main->getfield('zip'),
+    'Card-Country' => $country,
+    'Card-Exp'     => $exp,
+  );
+
+  my %result;
+  %result = &CCMckDirectLib3_2::SendCC2_1Server(@full_xaction);
+  
+  if ( $result{'MStatus'} eq 'success' ) { #cybercash smps v.2 or 3
+    my $cust_pay = new FS::cust_pay ( {
+       'invnum'   => $self->invnum,
+       'paid'     => $amount,
+       '_date'     => '',
+       'payby'    => 'CARD',
+       'payinfo'  => $cust_main->payinfo,
+       'paybatch' => "$processor:$paybatch",
+    } );
+    my $error = $cust_pay->insert;
+    if ( $error ) {
+      # gah, even with transactions.
+      my $e = 'WARNING: Card debited but database not updated - '.
+              'error applying payment, invnum #' . $self->invnum.
+              " (CyberCash Order-ID $paybatch): $error";
+      warn $e;
+      return $e;
+    } else {
+      return '';
+    }
+#  } elsif ( $result{'Mstatus'} ne 'failure-bad-money'
+#            || $options{'report_badcard'}
+#          ) {
+  } else {
+     return 'Cybercash error, invnum #' . 
+       $self->invnum. ':'. $result{'MErrMsg'};
+  }
+
+}
+
+=item batch_card
+
+Adds a payment for this invoice to the pending credit card batch (see
+L<FS::cust_pay_batch>).
+
+=cut
+
+sub batch_card {
+  my $self = shift;
+  my $cust_main = $self->cust_main;
+
+  my $cust_pay_batch = new FS::cust_pay_batch ( {
+    'invnum'   => $self->getfield('invnum'),
+    'custnum'  => $cust_main->getfield('custnum'),
+    'last'     => $cust_main->getfield('last'),
+    'first'    => $cust_main->getfield('first'),
+    'address1' => $cust_main->getfield('address1'),
+    'address2' => $cust_main->getfield('address2'),
+    'city'     => $cust_main->getfield('city'),
+    'state'    => $cust_main->getfield('state'),
+    'zip'      => $cust_main->getfield('zip'),
+    'country'  => $cust_main->getfield('country'),
+    'trancode' => 77,
+    'cardnum'  => $cust_main->getfield('payinfo'),
+    'exp'      => $cust_main->getfield('paydate'),
+    'payname'  => $cust_main->getfield('payname'),
+    'amount'   => $self->owed,
+  } );
+  $cust_pay_batch->insert;
+
+}
+
 =item print_text [TIME];
 
 Returns an text invoice, as a list of lines.
@@ -500,7 +864,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.15 2002-01-28 06:57:23 ivan Exp $
+$Id: cust_bill.pm,v 1.16 2002-02-04 16:44:48 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 8a7a6f806..62f61a689 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1,16 +1,12 @@
 package FS::cust_main;
 
 use strict;
-use vars qw( @ISA $conf $lpr $processor $xaction $E_NoErr $invoice_from
-             $smtpmachine $Debug $bop_processor $bop_login $bop_password
-             $bop_action @bop_options $import );
+use vars qw( @ISA $conf $Debug $import );
 use Safe;
 use Carp;
 use Time::Local;
 use Date::Format;
 #use Date::Manip;
-use Mail::Internet;
-use Mail::Header;
 use Business::CreditCard;
 use FS::UID qw( getotaker dbh );
 use FS::Record qw( qsearchs qsearch dbdef );
@@ -19,7 +15,6 @@ use FS::cust_bill;
 use FS::cust_bill_pkg;
 use FS::cust_pay;
 use FS::cust_credit;
-use FS::cust_pay_batch;
 use FS::part_referral;
 use FS::cust_main_county;
 use FS::agent;
@@ -29,6 +24,8 @@ use FS::cust_bill_pay;
 use FS::prepay_credit;
 use FS::queue;
 use FS::part_pkg;
+use FS::part_bill_event;
+use FS::cust_bill_event;
 
 @ISA = qw( FS::Record );
 
@@ -40,42 +37,7 @@ $import = 0;
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::cust_main'} = sub { 
   $conf = new FS::Conf;
-  $lpr = $conf->config('lpr');
-  $invoice_from = $conf->config('invoice_from');
-  $smtpmachine = $conf->config('smtpmachine');
-
-  if ( $conf->exists('cybercash3.2') ) {
-    require CCMckLib3_2;
-      #qw($MCKversion %Config InitConfig CCError CCDebug CCDebug2);
-    require CCMckDirectLib3_2;
-      #qw(SendCC2_1Server);
-    require CCMckErrno3_2;
-      #qw(MCKGetErrorMessage $E_NoErr);
-    import CCMckErrno3_2 qw($E_NoErr);
-
-    my $merchant_conf;
-    ($merchant_conf,$xaction)= $conf->config('cybercash3.2');
-    my $status = &CCMckLib3_2::InitConfig($merchant_conf);
-    if ( $status != $E_NoErr ) {
-      warn "CCMckLib3_2::InitConfig error:\n";
-      foreach my $key (keys %CCMckLib3_2::Config) {
-        warn "  $key => $CCMckLib3_2::Config{$key}\n"
-      }
-      my($errmsg) = &CCMckErrno3_2::MCKGetErrorMessage($status);
-      die "CCMckLib3_2::InitConfig fatal error: $errmsg\n";
-    }
-    $processor='cybercash3.2';
-  } elsif ( $conf->exists('business-onlinepayment') ) {
-    ( $bop_processor,
-      $bop_login,
-      $bop_password,
-      $bop_action,
-      @bop_options
-    ) = $conf->config('business-onlinepayment');
-    $bop_action ||= 'normal authorization';
-    eval "use Business::OnlinePayment";  
-    $processor="Business::OnlinePayment::$bop_processor";
-  }
+  #yes, need it for stuff below (prolly should be cached)
 };
 
 sub _cache {
@@ -385,7 +347,8 @@ will be deleted.  Did I mention that this is NOT what you want when a customer
 cancels service and that you really should be looking see L<FS::cust_pkg/cancel>?
 
 You can't delete a customer with invoices (see L<FS::cust_bill>),
-or credits (see L<FS::cust_credit>) or payments (see L<FS::cust_pay>).
+or credits (see L<FS::cust_credit>), payments (see L<FS::cust_pay>) or
+refunds (see L<FS::cust_refund>).
 
 =cut
 
@@ -415,6 +378,10 @@ sub delete {
     $dbh->rollback if $oldAutoCommit;
     return "Can't delete a customer with payments";
   }
+  if ( qsearch( 'cust_refund', { 'custnum' => $self->custnum } ) ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "Can't delete a customer with refunds";
+  }
 
   my @cust_pkg = $self->ncancelled_pkgs;
   if ( @cust_pkg ) {
@@ -443,7 +410,7 @@ sub delete {
     }
   }
 
-  foreach my $cust_main_invoice (
+  foreach my $cust_main_invoice ( #(email invoice destinations, not invoices)
     qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } )
   ) {
     my $error = $cust_main_invoice->delete;
@@ -1082,6 +1049,9 @@ L<FS::cust_bill>).  Usually used after the bill method.
 Depending on the value of `payby', this may print an invoice (`BILL'), charge
 a credit card (`CARD'), or just add any necessary (pseudo-)payment (`COMP').
 
+Most actions are now triggered by invoice events; see L<FS::part_bill_event>
+and the invoice events web interface.
+
 If there is an error, returns the error, otherwise returns false.
 
 Options are passed as name-value pairs.
@@ -1092,15 +1062,12 @@ invoice_time - Use this time when deciding when to print invoices and
 late notices on those invoices.  The default is now.  It is specified as a UNIX timestamp; see L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse>
 for conversion functions.
 
-batch_card - Set this true to batch cards (see L<FS::cust_pay_batch>).  By
-default, cards are processed immediately, which will generate an error if
-CyberCash is not installed.
+batch_card - This option is deprecated.  See the invoice events web interface
+to control whether cards are batched or run against a realtime gateway.
 
-report_badcard - Set this true if you want bad card transactions to
-return an error.  By default, they don't.
+report_badcard - This option is deprecated.
 
-force_print - force printing even if invoice has been printed more than once
-every 30 days, and don't increment the `printed' field.
+force_print - This option is deprecated; see the invoice events web interface.
 
 =cut
 
@@ -1141,306 +1108,62 @@ sub collect {
     next unless $cust_bill->owed > 0;
 
     # don't try to charge for the same invoice if it's already in a batch
-    next if qsearchs( 'cust_pay_batch', { 'invnum' => $cust_bill->invnum } );
+    #next if qsearchs( 'cust_pay_batch', { 'invnum' => $cust_bill->invnum } );
 
     warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ", amount $amount, balance $balance)" if $Debug;
 
     next unless $amount > 0;
 
-    if ( $self->payby eq 'BILL' ) {
-
-      #30 days 2592000
-      my $since = $invoice_time - ( $cust_bill->_date || 0 );
-      #warn "$invoice_time ", $cust_bill->_date, " $since";
-      if ( $since >= 0 #don't print future invoices
-           && ( ( $cust_bill->printed * 2592000 ) <= $since
-                || $options{'force_print'} )
-      ) {
-
-        #my @print_text = $cust_bill->print_text; #( date )
-        my @invoicing_list = $self->invoicing_list;
-        if ( grep { $_ ne 'POST' } @invoicing_list ) { #email invoice
-          $ENV{SMTPHOSTS} = $smtpmachine;
-          $ENV{MAILADDRESS} = $invoice_from;
-          my $header = new Mail::Header ( [
-            "From: $invoice_from",
-            "To: ". join(', ', grep { $_ ne 'POST' } @invoicing_list ),
-            "Sender: $invoice_from",
-            "Reply-To: $invoice_from",
-            "Date: ". time2str("%a, %d %b %Y %X %z", time),
-            "Subject: Invoice",
-          ] );
-          my $message = new Mail::Internet (
-            'Header' => $header,
-            'Body' => [ $cust_bill->print_text ], #( date)
-          );
-          $message->smtpsend or die "Can't send invoice email!"; #die?  warn?
-
-        } elsif ( ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list ) {
-          open(LPR, "|$lpr") or die "Can't open pipe to $lpr: $!";
-          print LPR $cust_bill->print_text; #( date )
-          close LPR
-            or die $! ? "Error closing $lpr: $!"
-                         : "Exit status $? from $lpr";
-        }
-
-        unless ( $options{'force_print'} ) {
-          my %hash = $cust_bill->hash;
-          $hash{'printed'}++;
-          my $new_cust_bill = new FS::cust_bill(\%hash);
-          my $error = $new_cust_bill->replace($cust_bill);
-          warn "Error updating $cust_bill->printed: $error" if $error;
-        }
-
-      }
+    foreach my $part_bill_event (
+      sort {    $a->seconds   <=> $b->seconds
+             || $a->weight    <=> $b->weight
+             || $a->eventpart <=> $b->eventpart }
+        grep { $_->seconds > ( $invoice_time - ( $cust_bill->_date || 0 ) )
+               && ! qsearchs( 'cust_bill_event', {
+                                'invnum'    => $cust_bill->invnum,
+                                'eventpart' => $_->eventpart       } )
+             }
+          qsearch('part_bill_event', { 'payby'    => $self->payby,
+                                       'disabled' => '',           } )
+    ) {
+      #run callback
+      my $cust_main = $self; #for callback
+      my $error = eval $part_bill_event->eventcode;
 
-    } elsif ( $self->payby eq 'COMP' ) {
-      my $cust_pay = new FS::cust_pay ( {
-         'invnum' => $cust_bill->invnum,
-         'paid' => $amount,
-         '_date' => '',
-         'payby' => 'COMP',
-         'payinfo' => $self->payinfo,
-         'paybatch' => ''
-      } );
-      my $error = $cust_pay->insert;
       if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return 'Error COMPing invnum #'. $cust_bill->invnum. ": $error";
-      }
-
 
-    } elsif ( $self->payby eq 'CARD' ) {
+        warn "Error running invoice event (". $part_bill_event->eventcode.
+             "): $error";
 
-      if ( $options{'batch_card'} ne 'yes' ) {
+      } else {
 
-        unless ( $processor ) {
-          $dbh->rollback if $oldAutoCommit;
-          return "Real time card processing not enabled!";
-        }
-
-        my $address = $self->address1;
-        $address .= ", ". $self->address2 if $self->address2;
-
-        #fix exp. date
-        #$self->paydate =~ /^(\d+)\/\d*(\d{2})$/;
-        $self->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
-        my $exp = "$2/$1";
-
-        if ( $processor eq 'cybercash3.2' ) {
-
-          #fix exp. date for cybercash
-          #$self->paydate =~ /^(\d+)\/\d*(\d{2})$/;
-          $self->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
-          my $exp = "$2/$1";
-
-          my $paybatch = $cust_bill->invnum. 
-                         '-' . time2str("%y%m%d%H%M%S", time);
-
-          my $payname = $self->payname ||
-                        $self->getfield('first'). ' '. $self->getfield('last');
-
-
-          my $country = $self->country eq 'US' ? 'USA' : $self->country;
-
-          my @full_xaction = ( $xaction,
-            'Order-ID'     => $paybatch,
-            'Amount'       => "usd $amount",
-            'Card-Number'  => $self->getfield('payinfo'),
-            'Card-Name'    => $payname,
-            'Card-Address' => $address,
-            'Card-City'    => $self->getfield('city'),
-            'Card-State'   => $self->getfield('state'),
-            'Card-Zip'     => $self->getfield('zip'),
-            'Card-Country' => $country,
-            'Card-Exp'     => $exp,
-          );
-
-          my %result;
-          %result = &CCMckDirectLib3_2::SendCC2_1Server(@full_xaction);
-         
-          #if ( $result{'MActionCode'} == 7 ) { #cybercash smps v.1.1.3
-          #if ( $result{'action-code'} == 7 ) { #cybercash smps v.2.1
-          if ( $result{'MStatus'} eq 'success' ) { #cybercash smps v.2 or 3
-            my $cust_pay = new FS::cust_pay ( {
-               'invnum'   => $cust_bill->invnum,
-               'paid'     => $amount,
-               '_date'     => '',
-               'payby'    => 'CARD',
-               'payinfo'  => $self->payinfo,
-               'paybatch' => "$processor:$paybatch",
-            } );
-            my $error = $cust_pay->insert;
-            if ( $error ) {
-              # gah, even with transactions.
-              $dbh->commit if $oldAutoCommit; #well.
-              my $e = 'WARNING: Card debited but database not updated - '.
-                      'error applying payment, invnum #' . $cust_bill->invnum.
-                      " (CyberCash Order-ID $paybatch): $error";
-              warn $e;
-              return $e;
-            }
-          } elsif ( $result{'Mstatus'} ne 'failure-bad-money'
-                 || $options{'report_badcard'} ) {
-             $dbh->commit if $oldAutoCommit;
-             return 'Cybercash error, invnum #' . 
-               $cust_bill->invnum. ':'. $result{'MErrMsg'};
-          } else {
-            $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-            return '';
-          }
-
-        } elsif ( $processor =~ /^Business::OnlinePayment::(.*)$/ ) {
-
-          my $bop_processor = $1;
-
-          my($payname, $payfirst, $paylast);
-          if ( $self->payname ) {
-            $payname = $self->payname;
-            $payname =~ /^\s*([\w \,\.\-\']*\w)?\s+([\w\,\.\-\']+)$/
-              or do {
-                      $dbh->rollback if $oldAutoCommit;
-                      return "Illegal payname $payname";
-                    };
-            ($payfirst, $paylast) = ($1, $2);
-          } else {
-            $payfirst = $self->getfield('first');
-            $paylast = $self->getfield('first');
-            $payname =  "$payfirst $paylast";
-          }
-
-          my @invoicing_list = grep { $_ ne 'POST' } $self->invoicing_list;
-          if ( $conf->exists('emailinvoiceauto')
-               || ( $conf->exists('emailinvoiceonly') && ! @invoicing_list ) ) {
-            push @invoicing_list, $self->default_invoicing_list;
-          }
-          my $email = $invoicing_list[0];
-
-          my( $action1, $action2 ) = split(/\s*\,\s*/, $bop_action );
-        
-          my $transaction =
-            new Business::OnlinePayment( $bop_processor, @bop_options );
-          $transaction->content(
-            'type'           => 'CC',
-            'login'          => $bop_login,
-            'password'       => $bop_password,
-            'action'         => $action1,
-            'description'    => 'Internet Services',
-            'amount'         => $amount,
-            'invoice_number' => $cust_bill->invnum,
-            'customer_id'    => $self->custnum,
-            'last_name'      => $paylast,
-            'first_name'     => $payfirst,
-            'name'           => $payname,
-            'address'        => $address,
-            'city'           => $self->city,
-            'state'          => $self->state,
-            'zip'            => $self->zip,
-            'country'        => $self->country,
-            'card_number'    => $self->payinfo,
-            'expiration'     => $exp,
-            'referer'        => 'http://cleanwhisker.420.am/',
-            'email'          => $email,
-          );
-          $transaction->submit();
-
-          if ( $transaction->is_success() && $action2 ) {
-            my $auth = $transaction->authorization;
-            my $ordernum = $transaction->order_number;
-            #warn "********* $auth ***********\n";
-            #warn "********* $ordernum ***********\n";
-            my $capture =
-              new Business::OnlinePayment( $bop_processor, @bop_options );
-
-            $capture->content(
-              action         => $action2,
-              login          => $bop_login,
-              password       => $bop_password,
-              order_number   => $ordernum,
-              amount         => $amount,
-              authorization  => $auth,
-              description    => 'Internet Services',
-            );
-
-            $capture->submit();
-
-            unless ( $capture->is_success ) {
-              my $e = "Authorization sucessful but capture failed, invnum #".
-                      $cust_bill->invnum. ': '.  $capture->result_code.
-                      ": ". $capture->error_message;
-              warn $e;
-              return $e;
-            }
-
-          }
-
-          if ( $transaction->is_success() ) {
-
-            my $cust_pay = new FS::cust_pay ( {
-               'invnum'   => $cust_bill->invnum,
-               'paid'     => $amount,
-               '_date'     => '',
-               'payby'    => 'CARD',
-               'payinfo'  => $self->payinfo,
-               'paybatch' => "$processor:". $transaction->authorization,
-            } );
-            my $error = $cust_pay->insert;
-            if ( $error ) {
-              # gah, even with transactions.
-              $dbh->commit if $oldAutoCommit; #well.
-              my $e = 'WARNING: Card debited but database not updated - '.
-                      'error applying payment, invnum #' . $cust_bill->invnum.
-                      " ($processor): $error";
-              warn $e;
-              return $e;
-            }
-          } elsif ( $options{'report_badcard'} ) {
-            $dbh->commit if $oldAutoCommit;
-            return "$processor error, invnum #". $cust_bill->invnum. ': '.
-                   $transaction->result_code. ": ". $transaction->error_message;
-          } else {
-            $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-            #return '';
-          }
-
-        } else {
-          $dbh->rollback if $oldAutoCommit;
-          return "Unknown real-time processor $processor\n";
+        #add cust_bill_event
+        my $cust_bill_event = new FS::cust_bill_event {
+          'invnum'    => $cust_bill->invnum,
+          'eventpart' => $part_bill_event->eventpart,
+          '_date'     => $invoice_time,
+        };
+        $cust_bill_event->insert;
+        if ( $error ) {
+          #$dbh->rollback if $oldAutoCommit;
+          #return "error: $error";
+
+          # gah, even with transactions.
+          $dbh->commit if $oldAutoCommit; #well.
+          my $e = 'WARNING: Event run but database not updated - '.
+                  'error inserting cust_bill_event, invnum #'. $cust_bill->invnum.
+                  ', eventpart '. $part_bill_event->eventpart.
+                  ": $error";
+          warn $e;
+          return $e;
         }
 
-      } else { #batch card
-
-       my $cust_pay_batch = new FS::cust_pay_batch ( {
-         'invnum'   => $cust_bill->getfield('invnum'),
-         'custnum'  => $self->getfield('custnum'),
-         'last'     => $self->getfield('last'),
-         'first'    => $self->getfield('first'),
-         'address1' => $self->getfield('address1'),
-         'address2' => $self->getfield('address2'),
-         'city'     => $self->getfield('city'),
-         'state'    => $self->getfield('state'),
-         'zip'      => $self->getfield('zip'),
-         'country'  => $self->getfield('country'),
-         'trancode' => 77,
-         'cardnum'  => $self->getfield('payinfo'),
-         'exp'      => $self->getfield('paydate'),
-         'payname'  => $self->getfield('payname'),
-         'amount'   => $amount,
-       } );
-       my $error = $cust_pay_batch->insert;
-       if ( $error ) {
-         $dbh->rollback if $oldAutoCommit;
-         return "Error adding to cust_pay_batch: $error";
-       }
-
       }
 
-    } else {
-      $dbh->rollback if $oldAutoCommit;
-      return "Unknown payment type ". $self->payby;
     }
 
   }
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 
@@ -1991,10 +1714,6 @@ sub append_fuzzyfiles {
   1;
 }
 
-=head1 VERSION
-
-$Id: cust_main.pm,v 1.55 2002-01-29 16:33:15 ivan Exp $
-
 =head1 BUGS
 
 The delete method.
@@ -2005,8 +1724,6 @@ instead of a scalar customer number.
 Bill and collect options should probably be passed as references instead of a
 list.
 
-CyberCash v2 forces us to define some variables in package main.
-
 There should probably be a configuration file with a list of allowed credit
 card types.
 
@@ -2015,9 +1732,8 @@ No multiple currency support (probably a larger project than just this module).
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::cust_pkg>, L<FS::cust_bill>, L<FS::cust_credit>
-L<FS::cust_pay_batch>, L<FS::agent>, L<FS::part_referral>,
-L<FS::cust_main_county>, L<FS::cust_main_invoice>,
-L<FS::UID>, schema.html from the base documentation.
+L<FS::agent>, L<FS::part_referral>, L<FS::cust_main_county>,
+L<FS::cust_main_invoice>, L<FS::UID>, schema.html from the base documentation.
 
 =cut
 
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 564dccaba..e719645a4 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -118,7 +118,6 @@ PerlSetVar Debug 2
 </pre></font>
     </ul></td>
     <td><ul>
-      <li>NOTE: Mason support is still a bit buggy in the 1.4.0 prereleases.  This will be fixed before 1.4.0.  You have been warned.
       <li>Run <tt>make masondocs</tt>
       <li>Copy <tt>masondocs/</tt> to your web server's document space.
       <li>Copy <tt>htetc/handler.pl</tt> to your web server's configuration directory.
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index c4d023a58..360fba691 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -6,6 +6,7 @@
 <ul>
   <li>If migrating from less than 1.3.1, see these <a href="upgrade7.html">instructions</a> first.
   <li><font size="+2" color="#ff0000">Backup your database and current Freeside installation.</font> (with&nbsp;<a href="http://www.ca.postgresql.org/devel-corner/docs/postgres/backup.html">PostgreSQL</a>) (with&nbsp;<a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Backup">MySQL</a>)
+  <li><a href="http://perl.apache.org/">mod_perl</a> is now required.
   <li>Install <a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a>.
 </ul>
 <table>
@@ -33,7 +34,6 @@ PerlSetVar Global /usr/local/etc/freeside/asp-global/
 </pre></font>
     </ul></td>
     <td><ul>
-      <li>NOTE: Mason support is still a bit buggy in the 1.4.0 prereleases.  This will be fixed before 1.4.0.  You have been warned.
       <li>Run <tt>make masondocs</tt>
       <li>Copy <tt>masondocs/</tt> to your web server's document space.
       <li>Copy <tt>htetc/handler.pl</tt> to your web server's configuration directory.
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index c41cfe9cf..70e953ca0 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_bill_event.cgi,v 1.3 2002-01-30 18:22:54 ivan Exp $ -->
+<!-- $Id: part_bill_event.cgi,v 1.4 2002-02-04 16:44:47 ivan Exp $ -->
 
 <%
 
@@ -93,32 +93,56 @@ tie my %events, 'Tie::IxHash',
 
   'addpost' => {
     'name' => 'Add postal invoicing',
-    'code' => '$cust_main->invoicing_list_addpost();',
+    'code' => '$cust_main->invoicing_list_addpost(); '';',
     'pad'  => 20,
   },
 
+  'comp' => {
+    'name' => 'Pay invoice with a complimentary "payment"',
+    'code' => '$cust_bill->comp();',
+    'weight' => 30,
+  },
+
+  'realtime-card' => {
+    'name' => 'Run card with a <a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a> realtime gateway',
+    'code' => '$cust_bill->realtime_card();',
+    'weight' => 30,
+  },
+
+  'realtime-card-cybercash' => {
+    'name' => '(<b>deprecated</b>) Run card with <a href="http://www.cybercash.com/cashregister">CyberCash CashRegister</a> realtime gateway',
+    'code' => '$cust_bill->realtime_card_cybercash();',
+    'weight => 30,
+  },
+
+  'batch-card' => {
+    'name' => 'Add card to the pending credit card batch',
+    'code' => '$cust_bill->batch_card();',
+    'weight' => 40,
+  },
+
   'send' => {
     'name' => 'Send invoice (email/print)',
-    'code' => '',
-    'weight' => 30
+    'code' => '$cust_bill->send();',
+    'weight' => 50,
   },
 
   'bill' => {
-    'name' => 'Generate invoices',
+    'name' => 'Generate invoices (normally only used with a <i>Late Fee</i> event)',
     'code' => '$cust_main->bill();',
-    'weight'  => 40,
+    'weight'  => 60,
   },
 
   'apply' => {
     'name' => 'Apply unapplied payments and credits',
-    'code' => '$cust_main->apply_payments; $cust_main->apply_credits;',
-    'weight'  => 50,
+    'code' => '$cust_main->apply_payments; $cust_main->apply_credits; '';',
+    'weight'  => 70,
   },
 
   'collect' => {
-    'name' => 'Collect on invoices',
+    'name' => 'Collect on invoices (normally only used with a <i>Late Fee</i> and <i>Generate Invoice</i> events)',
     'code' => '$cust_main->collect();',
-    'weight'  => 60,
+    'weight'  => 80,
   },
 
 ;
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index ef6d56611..6bc156816 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: cust_bill.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
+<!-- $Id: cust_bill.cgi,v 1.7 2002-02-04 16:44:47 ivan Exp $ -->
 <%
 
 #untaint invnum
@@ -10,7 +10,7 @@ my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Invoice #$invnum not found!" unless $cust_bill;
 my $custnum = $cust_bill->getfield('custnum');
 
-my $printed = $cust_bill->printed;
+#my $printed = $cust_bill->printed;
 
 print header('Invoice View', menubar(
   "Main Menu" => $p,
@@ -20,11 +20,10 @@ print header('Invoice View', menubar(
 print qq!<A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) against this invoice</A> | !
   if $cust_bill->owed > 0;
 
-print <<END;
-      <A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>
-      <BR><BR>(Printed $printed times)
-    <PRE>
-END
+print qq!<A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>!.
+#     "<BR><BR>(Printed $printed times)".
+#print cust_bill_events
+      '<PRE>'.
 
 print $cust_bill->print_text;
 
-- 
cgit v1.2.1


From 79f83ad93cc6f77a155528661a4681946fdd17a6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 4 Feb 2002 17:04:33 +0000
Subject: have fs-setup create the necessary "default" billing events
 documentation on necessary "default" billing events

---
 bin/fs-setup                        | 25 ++++++++++++++++++++++++-
 httemplate/docs/upgrade8.html       |  1 +
 httemplate/edit/part_bill_event.cgi | 10 +++++-----
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 7e043d238..912fc98fc 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.73 2002-01-29 17:42:46 ivan Exp $
+# $Id: fs-setup,v 1.74 2002-02-04 17:04:33 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -16,6 +16,7 @@ use FS::UID qw(adminsuidsetup datasrc checkeuid getsecrets);
 use FS::Record;
 use FS::cust_main_county;
 use FS::raddb;
+use FS::part_bill_invoice;
 
 die "Not running uid freeside!" unless checkeuid();
 
@@ -234,6 +235,28 @@ YE YU ZR ZM ZW
   die $error if $error;
 }
 
+#billing events
+foreach my $aref ( 
+  [ 'COMP', 'Comp invoice', '$cust_bill->comp();', 30, 'comp' ],
+  [ 'CARD', 'Batch card', '$cust_bill->batch_card();', 40, 'batch-card' ],
+  [ 'BILL', 'Send invoice', '$cust_bill->send();', 50, 'send' ],
+) {
+
+  my $part_bill_event = new FS::part_bill_event({
+    'payby' => $aref->[0],
+    'event' => $aref->[1],
+    'eventcode' => $aref->[2],
+    'seconds' => 0,
+    'weight' => $aref->[3],
+    'plan' => $aref->[4],
+  });
+  my($error);
+  $error=$part_bill_event->insert;
+  die $error if $error;
+
+}
+
+
 $dbh->disconnect or die $dbh->errstr;
 
 print "Freeside database initialized sucessfully\n";
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 360fba691..f0b16222c 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -298,5 +298,6 @@ ALTER TABLE cust_refund DROP COLUMN crednum;
   <li>Create the `/usr/local/etc/freeside/cache.<i>datasrc</i>' directory
       (ownded by the freeside user).
   <li>freeside-queued was installed with the Perl modules.  Start it now and ensure that is run upon system startup.
+  <li>Set appropriate <a href="../browse/part_bill_event.cgi">invoice events</a> for your site.  At the very least, you'll want to set some invoice events "<i>After 0 days</i>": a <i>BILL</i> invoice event to print invoices, a <i>CARD</i> invoice event to batch or run cards real-time, and a <i>COMP</i> invoice event to "pay" complimentary customers.
 </ul>
 </body>
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 70e953ca0..580e46734 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_bill_event.cgi,v 1.4 2002-02-04 16:44:47 ivan Exp $ -->
+<!-- $Id: part_bill_event.cgi,v 1.5 2002-02-04 17:04:33 ivan Exp $ -->
 
 <%
 
@@ -45,7 +45,7 @@ END
 for (qw(CARD BILL COMP)) {
   print qq!<OPTION VALUE="$_"!;
   if ($part_bill_event->payby eq $_) {
-    print " SELECTED> $_</OPTION>";
+    print " SELECTED>$_</OPTION>";
   } else {
     print ">$_</OPTION>";
   }
@@ -93,7 +93,7 @@ tie my %events, 'Tie::IxHash',
 
   'addpost' => {
     'name' => 'Add postal invoicing',
-    'code' => '$cust_main->invoicing_list_addpost(); '';',
+    'code' => '$cust_main->invoicing_list_addpost(); "";',
     'pad'  => 20,
   },
 
@@ -112,7 +112,7 @@ tie my %events, 'Tie::IxHash',
   'realtime-card-cybercash' => {
     'name' => '(<b>deprecated</b>) Run card with <a href="http://www.cybercash.com/cashregister">CyberCash CashRegister</a> realtime gateway',
     'code' => '$cust_bill->realtime_card_cybercash();',
-    'weight => 30,
+    'weight' => 30,
   },
 
   'batch-card' => {
@@ -135,7 +135,7 @@ tie my %events, 'Tie::IxHash',
 
   'apply' => {
     'name' => 'Apply unapplied payments and credits',
-    'code' => '$cust_main->apply_payments; $cust_main->apply_credits; '';',
+    'code' => '$cust_main->apply_payments; $cust_main->apply_credits; "";',
     'weight'  => 70,
   },
 
-- 
cgit v1.2.1


From cf65a8e43320c5db6aa147a14cef1b310c0628b1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 4 Feb 2002 17:06:18 +0000
Subject: 1.4.0pre8!

---
 Makefile              |  1 -
 README.1.4.0pre4567-8 | 67 ----------------------------------------------
 README.1.4.0pre8      | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 68 deletions(-)
 delete mode 100644 README.1.4.0pre4567-8
 create mode 100644 README.1.4.0pre8

diff --git a/Makefile b/Makefile
index 6fa389355..8d46b975c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ DB_USER = freeside
 DB_PASSWORD=
 
 TEMPLATE = asp
-#mason's a bit dodgy still
 #TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
diff --git a/README.1.4.0pre4567-8 b/README.1.4.0pre4567-8
deleted file mode 100644
index 11fc9c1db..000000000
--- a/README.1.4.0pre4567-8
+++ /dev/null
@@ -1,67 +0,0 @@
-the following is necessary to upgrade from 1.4.0pre (4 thru 7) to 1.4.0pre8
-
-if you're upgrading from 1.3.1 follow the instructions in
-httemplate/docs/upgrade8.html instead
-
-if you're upgradeing from before 1.4.0pre4, see
-http://cleanwhisker.420.am/cgi-bin/cvsweb/freeside/Attic/
-
------
-
-install Time::Duration and Tie::IxHash
-
-install the FS perl modules and httemplate as per install.html or upgrade8.html
-
-ALTER TABLE part_pkg ADD disabled char(1) NULL;
-ALTER TABLE part_svc ADD disabled char(1) NULL;
-
-CREATE TABLE cust_bill_event (
-  eventnum int primary key,
-  invnum int not null,
-  eventpart int not null,
-  _date int not null
-);
-CREATE UNIQUE INDEX cust_bill_events1 ON cust_bill_events ( eventpart, invnum );
-CREATE INDEX cust_bill_events2 ON cust_bill_events ( invnum );
-
-CREATE TABLE part_bill_event (
-  eventpart int primary key,
-  payby char(4) not null,
-  event varchar(80) not null,
-  eventcode text null,
-  seconds int null,
-  weight int not null,
-  plan varchar(80) null,
-  plandata text null,
-  disabled char(1) null
-);
-CREATE INDEX part_bill_events1 ON part_bill_events ( payby );
-
-CREATE TABLE part_export (
-  exportnum int primary key,
-  svcpart int not null,
-  machine varchar(80) not null,
-  exporttype varchar(80) not null,
-  nodomain char(1) NULL
-);
-CREATE INDEX part_export1 ON part_export ( machine );
-CREATE INDEX part_export2 ON part_export ( exporttype );
-
-CREATE INDEX part_export_option (
-  optionnum int primary key,
-  exportnum int not null,
-  option varchar(80) not null,
-  optionvalue text NULL
-);
-CREATE INDEX part_export_option1 ON part_export ( exportnum );
-CREATE INDEX part_export_option2 ON part_export ( option );
-
-ALTER TABLE cust_bill ADD closed char(1) NULL;
-ALTER TABLE cust_pay ADD closed char(1) NULL;
-ALTER TABLE cust_credit ADD closed char(1) NULL;
-ALTER TABLE cust_refund ADD closed char(1) NULL;
-
-Run bin/dbdef-create
-
-Restart Apache and freeside-queued
-
diff --git a/README.1.4.0pre8 b/README.1.4.0pre8
new file mode 100644
index 000000000..a6f591b93
--- /dev/null
+++ b/README.1.4.0pre8
@@ -0,0 +1,73 @@
+the following is necessary to upgrade from 1.4.0pre (4 thru 7) to 1.4.0pre8
+
+if you're upgrading from 1.3.1 follow the instructions in
+httemplate/docs/upgrade8.html instead
+
+if you're upgradeing from before 1.4.0pre4, see
+http://cleanwhisker.420.am/cgi-bin/cvsweb/freeside/Attic/
+
+-----
+
+install Time::Duration and Tie::IxHash
+
+install the FS perl modules and httemplate as per install.html or upgrade8.html
+
+ALTER TABLE part_pkg ADD disabled char(1) NULL;
+ALTER TABLE part_svc ADD disabled char(1) NULL;
+
+CREATE TABLE cust_bill_event (
+  eventnum int primary key,
+  invnum int not null,
+  eventpart int not null,
+  _date int not null
+);
+CREATE UNIQUE INDEX cust_bill_events1 ON cust_bill_events ( eventpart, invnum );
+CREATE INDEX cust_bill_events2 ON cust_bill_events ( invnum );
+
+CREATE TABLE part_bill_event (
+  eventpart int primary key,
+  payby char(4) not null,
+  event varchar(80) not null,
+  eventcode text null,
+  seconds int null,
+  weight int not null,
+  plan varchar(80) null,
+  plandata text null,
+  disabled char(1) null
+);
+CREATE INDEX part_bill_events1 ON part_bill_events ( payby );
+
+CREATE TABLE part_export (
+  exportnum int primary key,
+  svcpart int not null,
+  machine varchar(80) not null,
+  exporttype varchar(80) not null,
+  nodomain char(1) NULL
+);
+CREATE INDEX part_export1 ON part_export ( machine );
+CREATE INDEX part_export2 ON part_export ( exporttype );
+
+CREATE INDEX part_export_option (
+  optionnum int primary key,
+  exportnum int not null,
+  option varchar(80) not null,
+  optionvalue text NULL
+);
+CREATE INDEX part_export_option1 ON part_export ( exportnum );
+CREATE INDEX part_export_option2 ON part_export ( option );
+
+ALTER TABLE cust_bill ADD closed char(1) NULL;
+ALTER TABLE cust_pay ADD closed char(1) NULL;
+ALTER TABLE cust_credit ADD closed char(1) NULL;
+ALTER TABLE cust_refund ADD closed char(1) NULL;
+
+Run bin/dbdef-create
+
+Restart Apache and freeside-queued
+
+Go to the new "View/Edit Invoice events" in the web interface and add the
+appropriate events.  t the very least, you'll want to set some invoice events
+"After 0 days": a BILL invoice event to print invoices, a CARD invoice event to
+batch or run cards real-time, and a COMP invoice event to "pay" complimentary
+customers.
+
-- 
cgit v1.2.1


From 0b0a29bcdc6614efb752bd6663b3df2080a42bb1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 4 Feb 2002 17:12:05 +0000
Subject: ancient files

---
 httemplate/docs/man/FS/Bill.html    | 32 --------------------------------
 httemplate/docs/man/FS/Invoice.html | 32 --------------------------------
 2 files changed, 64 deletions(-)
 delete mode 100644 httemplate/docs/man/FS/Bill.html
 delete mode 100644 httemplate/docs/man/FS/Invoice.html

diff --git a/httemplate/docs/man/FS/Bill.html b/httemplate/docs/man/FS/Bill.html
deleted file mode 100644
index cf996ae80..000000000
--- a/httemplate/docs/man/FS/Bill.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::Bill - Legacy stub</TITLE>
-<LINK REV="made" HREF="mailto:none">
-</HEAD>
-
-<BODY>
-
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::Bill - Legacy stub
-
-<P>
-<HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-The functionality of FS::Bill has been integrated into FS::cust_main.
-
-</BODY>
-
-</HTML>
diff --git a/httemplate/docs/man/FS/Invoice.html b/httemplate/docs/man/FS/Invoice.html
deleted file mode 100644
index cc837be2e..000000000
--- a/httemplate/docs/man/FS/Invoice.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>FS::Invoice - Legacy stub</TITLE>
-<LINK REV="made" HREF="mailto:none">
-</HEAD>
-
-<BODY>
-
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#NAME">NAME</A>
-	<LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="NAME">NAME</A></H1>
-<P>
-FS::Invoice - Legacy stub
-
-<P>
-<HR>
-<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
-<P>
-The functionality of FS::Invoice has been integrated in FS::cust_bill.
-
-</BODY>
-
-</HTML>
-- 
cgit v1.2.1


From 1340e8879e31d3fcbe09b73477f3aac3dbf65113 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 4 Feb 2002 18:12:41 +0000
Subject: doc update

---
 httemplate/docs/install.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index e719645a4..749c4c77b 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -39,14 +39,15 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>
       <li><a href="http://search.cpan.org/search?dist=Archive-Tar">Archive-Tar</a>
       <li><a href="http://search.cpan.org/search?dist=DBI">DBI</a>
-      <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a>
+      <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a> (<a href="http://search.cpan.org/search?dist=DBD-Pg">DBD::Pg</a> for PostgreSQL, <a href="http://search.cpan.org/search?dist=DBD-mysql">DBD::mysql</a> for MySQL)
       <li><a href="http://search.cpan.org/search?dist=DBIx-DataSource">DBIx-DataSource</a>
       <li><a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>
       <li><a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>
       <li><a href="http://search.cpan.org/search?dist=String-ShellQuote">String-ShellQuote</a>
       <li><a href="http://search.cpan.org/search?dist=Net-SCP">Net-SCP</a>
       <li><a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a>
-      <li><a href="http;//search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a>
+      <li><a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a>
+      <li><a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>
     </ul>
 </ul>
 Install the Freeside distribution:
-- 
cgit v1.2.1


From d9d79aeecc2c0d79bd1d066a702252ffd683661e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Feb 2002 07:57:38 +0000
Subject: fix part_export_option indices

---
 README.1.4.0pre8              | 4 ++--
 httemplate/docs/upgrade8.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.1.4.0pre8 b/README.1.4.0pre8
index a6f591b93..6872bdd60 100644
--- a/README.1.4.0pre8
+++ b/README.1.4.0pre8
@@ -53,8 +53,8 @@ CREATE INDEX part_export_option (
   option varchar(80) not null,
   optionvalue text NULL
 );
-CREATE INDEX part_export_option1 ON part_export ( exportnum );
-CREATE INDEX part_export_option2 ON part_export ( option );
+CREATE INDEX part_export_option1 ON part_export_option ( exportnum );
+CREATE INDEX part_export_option2 ON part_export_option ( option );
 
 ALTER TABLE cust_bill ADD closed char(1) NULL;
 ALTER TABLE cust_pay ADD closed char(1) NULL;
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index f0b16222c..022d1f6ae 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -162,8 +162,8 @@ CREATE INDEX part_export_option (
   option varchar(80) not null,
   optionvalue text NULL
 );
-CREATE INDEX part_export_option1 ON part_export ( exportnum );
-CREATE INDEX part_export_option2 ON part_export ( option );
+CREATE INDEX part_export_option1 ON part_export_option ( exportnum );
+CREATE INDEX part_export_option2 ON part_export_option ( option );
 
 ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
 ALTER TABLE svc_domain ADD catchall integer NULL;
-- 
cgit v1.2.1


From 65f2a86b2c239782f209b481744915f858530598 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Feb 2002 09:46:07 +0000
Subject: doc

---
 httemplate/docs/install.html  | 1 -
 httemplate/docs/upgrade8.html | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 749c4c77b..1edd4b16c 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -32,7 +32,6 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=MailTools">MailTools</a>
       <li><a href="http://search.cpan.org/search?dist=TimeDate">TimeDate</a>
       <li><a href="http://search.cpan.org/search?dist=DateManip">DateManip</a>
-      <li><a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>
       <li><a href="http://search.cpan.org/search?dist=File-CounterFile">File-CounterFile</a>
       <li><a href="http://search.cpan.org/search?dist=FreezeThaw">FreezeThaw</a>
       <li><a href="http://search.cpan.org/search?dist=String-Approx">String-Approx</a>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 022d1f6ae..daf73a1a3 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -7,6 +7,7 @@
   <li>If migrating from less than 1.3.1, see these <a href="upgrade7.html">instructions</a> first.
   <li><font size="+2" color="#ff0000">Backup your database and current Freeside installation.</font> (with&nbsp;<a href="http://www.ca.postgresql.org/devel-corner/docs/postgres/backup.html">PostgreSQL</a>) (with&nbsp;<a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Backup">MySQL</a>)
   <li><a href="http://perl.apache.org/">mod_perl</a> is now required.
+  <li>Install <a href="http://search.cpan.org/search?dist=Archive-Tar">Archive-Tar</a>, <a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>, <a href="http://search.cpan.org/search?dist=DBIx-DataSource">DBIx-DataSource</a>, and <a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a>
   <li>Install <a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a>.
 </ul>
 <table>
-- 
cgit v1.2.1


From d7a54962112545979a1710f97dd5299fbd9c1aaf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Feb 2002 11:06:29 +0000
Subject: don't need DBIx::DataSource for upgrades

---
 httemplate/docs/upgrade8.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index daf73a1a3..0949315b9 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -7,7 +7,7 @@
   <li>If migrating from less than 1.3.1, see these <a href="upgrade7.html">instructions</a> first.
   <li><font size="+2" color="#ff0000">Backup your database and current Freeside installation.</font> (with&nbsp;<a href="http://www.ca.postgresql.org/devel-corner/docs/postgres/backup.html">PostgreSQL</a>) (with&nbsp;<a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Backup">MySQL</a>)
   <li><a href="http://perl.apache.org/">mod_perl</a> is now required.
-  <li>Install <a href="http://search.cpan.org/search?dist=Archive-Tar">Archive-Tar</a>, <a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>, <a href="http://search.cpan.org/search?dist=DBIx-DataSource">DBIx-DataSource</a>, and <a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a>
+  <li>Install <a href="http://search.cpan.org/search?dist=Archive-Tar">Archive-Tar</a>, <a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>, and <a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a>
   <li>Install <a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a>.
 </ul>
 <table>
-- 
cgit v1.2.1


From 2093701338cf6d4531a33466cd64ad48bbf88856 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Feb 2002 16:48:27 +0000
Subject: web-based password changer!

---
 fs_passwd/fs_passwd         |  2 +-
 fs_passwd/fs_passwd.cgi     | 57 +++++++++++++++++++++++++++++++++++++++++++++
 fs_passwd/fs_passwd.html    | 25 ++++++++++++++++++++
 httemplate/docs/passwd.html | 19 ++++++++++-----
 4 files changed, 96 insertions(+), 7 deletions(-)
 create mode 100755 fs_passwd/fs_passwd.cgi
 create mode 100644 fs_passwd/fs_passwd.html

diff --git a/fs_passwd/fs_passwd b/fs_passwd/fs_passwd
index bcf09f1fe..0b467aefc 100755
--- a/fs_passwd/fs_passwd
+++ b/fs_passwd/fs_passwd
@@ -20,7 +20,7 @@ use vars qw($opt_f $opt_s);
 my($fs_passwdd_socket)="/usr/local/freeside/fs_passwdd_socket";
 my($freeside_uid)=scalar(getpwnam('freeside'));
 
-$ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin';
+$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
 $ENV{'SHELL'} = '/bin/sh';
 $ENV{'IFS'} = " \t\n";
 $ENV{'CDPATH'} = '';
diff --git a/fs_passwd/fs_passwd.cgi b/fs_passwd/fs_passwd.cgi
new file mode 100755
index 000000000..df6c7c8bf
--- /dev/null
+++ b/fs_passwd/fs_passwd.cgi
@@ -0,0 +1,57 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use Getopt::Std;
+use Socket;
+use IO::Handle;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+
+my $fs_passwdd_socket = "/usr/local/freeside/fs_passwdd_socket";
+my $freeside_uid = scalar(getpwnam('freeside'));
+
+$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
+$ENV{'SHELL'} = '/bin/sh';
+$ENV{'IFS'} = " \t\n";
+$ENV{'CDPATH'} = '';
+$ENV{'ENV'} = '';
+$ENV{'BASH_ENV'} = '';
+
+die "fs_passwd.cgi isn't running as freeside user\n" if $> != $freeside_uid;
+
+my $cgi = new CGI;
+
+$cgi->param('username') =~ /^([^\n]{0,255}$)/ or die "Illegal username";
+my $me = $1;
+
+$cgi->param('old_password') =~ /^([^\n]{0,255}$)/ or die "Illegal old_password";
+my $old_password = $1;
+
+$cgi->param('new_password') =~ /^([^\n]{0,255}$)/ or die "Illegal new_password";
+my $new_password = $1;
+
+die "New passwords don't match"
+  unless $new_password eq $cgi->param('new_password2');
+
+socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+connect(SOCK, sockaddr_un($fs_passwdd_socket)) or die "connect: $!";
+print SOCK join("\n", $me, $old_password, $new_password, '', ''), "\n";
+SOCK->flush;
+my $error = <SOCK>;
+chomp $error;
+
+if ($error) {
+  die $error;
+} else {
+  print <<END;
+<html>
+  <head>
+    <title>Password changed</title>
+  </head>
+  <body bgcolor="#e8e8e8">
+    <h3>Password changed</h3>
+<br>Your password has been changed.
+  </body>
+</html>
+END
+}
diff --git a/fs_passwd/fs_passwd.html b/fs_passwd/fs_passwd.html
new file mode 100644
index 000000000..fadc4df8b
--- /dev/null
+++ b/fs_passwd/fs_passwd.html
@@ -0,0 +1,25 @@
+<html>
+  <head>
+    <title>Change password</title>
+  </head>
+  <body bgcolor="#e8e8e8">
+    <h3>Change password</h3>
+    <form action="/cgi-bin/fs_passwd.cgi" method="post">
+    <table bgcolor="#cccccc" border=0 cellspacing=2>
+      <tr><th align="right">Username</th>
+        <td><input type="text" name="username" size="18"></td>
+      </tr>
+      <tr><th align="right">Current password</th>
+        <td><input type="password" name="old_password" size="18"></td>
+      </tr>
+      <tr><th align="right">New password</th>
+        <td><input type="password" name="new_password" size="18"></td>
+      </tr>
+      <tr><th align="right">Re-enter new password</th>
+        <td><input type="password" name="new_password2" size="18"></td>
+      </tr>
+    </table>
+    <br><input type="submit" value="Change password">
+  </body>
+</html>
+
diff --git a/httemplate/docs/passwd.html b/httemplate/docs/passwd.html
index e5242c200..c4d91480c 100755
--- a/httemplate/docs/passwd.html
+++ b/httemplate/docs/passwd.html
@@ -3,14 +3,21 @@
 </head>
 <body>
   <h1>fs_passwd</h1>
-You may use fs_passwd/fs_passwd as a "passwd", "chfn" and "chsh" replacement on your shell machine(s) to cause password, gecos and shell changes to update your freeside machine.  This can pose a security risk if not configured correctly.  <b>Do not use this feature unless you understand what you are doing!</b>
+You may use fs_passwd/fs_passwd as a "passwd", "chfn" and "chsh" replacement on your shell machine(s) to cause password, gecos and shell changes to update your freeside machine.  You can also use the fs_passwd/fs_passwd.html and fs_passwd/fs_passwd.cgi to run a public password change CGI on a public web server.  This can pose a security risk if not configured correctly.  <b>Do not use this feature unless you understand what you are doing!</b>
 <br><br>Currently it is assumed that the the crypt(3) function in the C library is the same on the Freeside machine as on the target machine.
 <ul>
-  <li>Create a freeside account on the shell machine(s).
-  <li>Append the identity.pub from the freeside user on your freeside machine to the authorized_keys file of the newly created freeside user on the shell machine(s).
+  <li>Create a freeside account on the shell or web machine(s).
+  <li>Setup SSH keys:
+    <ul>
+      <li>As the freeside user (on your freeside machine), generate an authentication key using <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>.  Since this is for unattended operation, use a blank passphrase.
+      <li>Append the newly-created <code>identity.pub</code> file to <code>~root
+/.ssh/authorized_keys</code> on the shell or web machine(s).
+      <li>Some new SSH v2 implementation accept v2 style keys only.  Use the <code>-t</code> option to <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>, and append the created <code>id_dsa.pub</code> or <code>id_rsa.pub</code> to <code>~root/.ssh/authorized_keys2</code> on the remote machine(s).
+    </ul>
+  <li>Copy fs_passwd/fs_passwdd to /usr/local/sbin on the shell or web machine(s).  (chown freeside, chmod 500)
+  <li>Create /usr/local/freeside on the shell or web machine(s). (chown freeside, chmod 700)
+  <li>Run an iteration of "fs_passwd/fs_passwd_server <i>user</i> shell.machine" as the freeside user for each shell or web machine (this is a daemon process).  <i>user</i> refers to the freeside user from the <a href="config.html">mapsecrets configuration file</a>.
   <li>Copy fs_passwd/fs_passwd to /usr/local/bin on the shell machine(s).  (chown freeside, chmod 4755).  You may link it to passwd, chfn and chsh as well.
-  <li>Copy fs_passwd/fs_passwdd to /usr/local/sbin on the shell machine(s).  (chown freeside, chmod 500)
-  <li>Create /usr/local/freeside on the shell machine(s). (chown freeside, chmod 700)
-  <li>Run an iteration of "fs_passwd/fs_passwd_server <i>user</i> shell.machine" as the freeside user for each shell machine (this is a daemon process).  <i>user</i> refers to the freeside user from the <a href="config.html">mapsecrets configuration file</a>.
+  <li>Copy fs_passwd/fs_passwd.cgi to the cgi-bin directory on your web machine(s).  Use <a href="http://www.apache.org/docs/suexec.html">suEXEC</a> or <a href="http://www.perldoc.com/perl5.6.1/pod/perlsec.html">suidperl</a> to run fs_passwd.cgi as the freeside user.
 </ul>
 </body>
-- 
cgit v1.2.1


From e963a04493d15ac3e714a2cb95a28fe90a6239d9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Feb 2002 18:04:33 +0000
Subject: doc

---
 httemplate/docs/install.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 1edd4b16c..2a208c016 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -101,7 +101,10 @@ $ su
       <li>Run <tt>make aspdocs</tt>
       <li>Copy <tt>aspdocs/</tt> to your web server's document space.
       <li>Create a <a href="http://www.apache-asp.org/config.html#Global">Global</a> directory, such as <tt>/usr/local/etc/freeside/asp-global/</tt>
-      <li>Copy <tt>htetc/global.asa</tt> to the Global directory.
+      <li>Copy <tt>htetc/global.asa</tt> to the Global directory:
+<font size="-1"><pre>
+cp htetc/global.asa /usr/local/etc/freeside/asp-global/global.asa
+</pre></font>
       <li>Configure Apache for the Global directory and to execute .cgi files using Apache::ASP.  For example:
 <font size="-1"><pre>
 &lt;Directory /usr/local/apache/htdocs/freeside-asp&gt;
-- 
cgit v1.2.1


From 30f31aae2dee3bdbec04f107e9d8cbb96442852e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Feb 2002 18:24:13 +0000
Subject: &nbsp; for commands; confusing otherwise

---
 httemplate/docs/install.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 2a208c016..35caa0023 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -103,11 +103,11 @@ $ su
       <li>Create a <a href="http://www.apache-asp.org/config.html#Global">Global</a> directory, such as <tt>/usr/local/etc/freeside/asp-global/</tt>
       <li>Copy <tt>htetc/global.asa</tt> to the Global directory:
 <font size="-1"><pre>
-cp htetc/global.asa /usr/local/etc/freeside/asp-global/global.asa
+cp&nbsp;htetc/global.asa&nbsp;/usr/local/etc/freeside/asp-global/global.asa
 </pre></font>
       <li>Configure Apache for the Global directory and to execute .cgi files using Apache::ASP.  For example:
 <font size="-1"><pre>
-&lt;Directory /usr/local/apache/htdocs/freeside-asp&gt;
+&lt;Directory&nbsp;/usr/local/apache/htdocs/freeside-asp&gt;
 &lt;Files ~ (\.cgi)&gt;
 AddHandler perl-script .cgi
 PerlHandler Apache::ASP
@@ -115,7 +115,7 @@ PerlHandler Apache::ASP
 &lt;Perl&gt;
 $MLDBM::RemoveTaint = 1;
 &lt;/Perl&gt;
-PerlSetVar Global /usr/local/etc/freeside/asp-global/
+PerlSetVar&nbsp;Global&nbsp;/usr/local/etc/freeside/asp-global/
 PerlSetVar Debug 2
 &lt;/Directory&gt;
 </pre></font>
@@ -127,13 +127,13 @@ PerlSetVar Debug 2
       <li>Edit <tt>handler.pl</tt> and set an appropriate <tt>data_dir</tt>, such as <tt>/usr/local/etc/freeside/mason-data</tt>
       <li>Configure Apache to use the <tt>handler.pl</tt> file and to execute .cgi files using HTML::Mason.  For example:
 <font size="-1"><pre>
-&lt;Directory /usr/local/apache/htdocs/freeside-mason&gt;
+&lt;Directory&nbsp;/usr/local/apache/htdocs/freeside-mason&gt;
 &lt;Files ~ (\.cgi)&gt;
 AddHandler perl-script .cgi
 PerlHandler HTML::Mason
 &lt;/Files&gt;
 &lt;Perl&gt;
-require "/usr/local/apache/conf/handler.pl";
+require&nbsp;"/usr/local/apache/conf/handler.pl";
 &lt;/Perl&gt;
 &lt;/Directory&gt;
 </pre></font>
-- 
cgit v1.2.1


From b6c28c086832416944440cab39f3bffc9d3dd1f1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Feb 2002 20:25:32 +0000
Subject: better error messages if you haven't run fs-setup ?

---
 FS/FS/Record.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 4286606f0..755cef830 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1014,7 +1014,8 @@ I<$FS::Record::setup_hack> is true.  Returns a DBIx::DBSchema object.
 
 sub reload_dbdef {
   my $file = shift || $dbdef_file;
-  $dbdef = load DBIx::DBSchema $file;
+  $dbdef = load DBIx::DBSchema $file
+    or die "can't load database schema from $file";
 }
 
 =item dbdef
-- 
cgit v1.2.1


From 0144506246df56f2f705d4edc3cf29cd7dd0ed24 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 6 Feb 2002 14:58:05 +0000
Subject: fix for non-file auth

---
 FS/bin/freeside-adduser | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index 7fc5830db..9d424634b 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: freeside-adduser,v 1.3 2001-10-30 13:47:07 ivan Exp $
+# $Id: freeside-adduser,v 1.4 2002-02-06 14:58:05 ivan Exp $
 
 use strict;
 use vars qw($opt_h $opt_c $opt_s);
@@ -12,10 +12,12 @@ getopts("ch:s:");
 die &usage if $opt_c && ! $opt_h;
 my $user = shift or die &usage;
 
-my @args = ( 'htpasswd' );
-push @args, '-c' if $opt_c;
-push @args, $opt_h, $user;
-system(@args) == 0 or die "htpasswd failed: $?";
+if ( $opt_h ) {
+  my @args = ( 'htpasswd' );
+  push @args, '-c' if $opt_c;
+  push @args, $opt_h, $user;
+  system(@args) == 0 or die "htpasswd failed: $?";
+}
 
 my $secretfile = $opt_s || 'secrets';
 
-- 
cgit v1.2.1


From ce32d23f68c3137da0e0c43e14bea90c5eec9635 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 6 Feb 2002 15:07:49 +0000
Subject: tyop

---
 bin/fs-setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 912fc98fc..07c9709a1 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.74 2002-02-04 17:04:33 ivan Exp $
+# $Id: fs-setup,v 1.75 2002-02-06 15:07:49 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -16,7 +16,7 @@ use FS::UID qw(adminsuidsetup datasrc checkeuid getsecrets);
 use FS::Record;
 use FS::cust_main_county;
 use FS::raddb;
-use FS::part_bill_invoice;
+use FS::part_bill_event;
 
 die "Not running uid freeside!" unless checkeuid();
 
-- 
cgit v1.2.1


From e647329a15ecae064a3242f05f948658aeab9256 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 6 Feb 2002 15:36:40 +0000
Subject: part_bill_event.plan can contain punctuation

---
 FS/FS/part_bill_event.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
index 4a23315dd..fb1daa20b 100644
--- a/FS/FS/part_bill_event.pm
+++ b/FS/FS/part_bill_event.pm
@@ -121,7 +121,7 @@ sub check {
     || $self->ut_number('seconds')
     || $self->ut_enum('disabled', [ '', 'Y' ] )
     || $self->ut_number('weight')
-    || $self->ut_alphan('plan')
+    || $self->ut_textn('plan')
     || $self->ut_anything('plandata')
   ;
 }
-- 
cgit v1.2.1


From d815064689e78291069209fb4610f905449dcee6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 6 Feb 2002 15:49:04 +0000
Subject: documentation building Makefile patch

---
 Makefile                     | 4 ++++
 httemplate/docs/install.html | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8d46b975c..0f86b49d2 100644
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,10 @@ docs:
 	make ${TEMPLATE}docs
 
 htmlman:
+	[ -e ./httemplate/docs/man ] || mkdir httemplate/docs/man
+	[ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
+	[ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
+	[ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
 	bin/pod2x
 
 upload-docs:
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 35caa0023..0f3796c6c 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -57,7 +57,12 @@ Install the Freeside distribution:
       <li> with <a href="http://www.postgresql.org/users-lounge/docs/7.1/postgres/user-manag.html#DATABASE-USERS">PostgreSQL</a>:
         <pre>
 $ su postgres
-$ createuser -P freeside</pre>
+$ createuser -P freeside
+Enter password for user "freeside": 
+Enter it again: 
+Shall the new user be allowed to create databases? (y/n) y
+Shall the new user be allowed to create more new users? (y/n) n
+CREATE USER</pre>
       <li> with <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#User_Account_Management">MySQL</a>:
         <pre>
 $ mysqladmin -u root password '<i>set_a_root_database_password</i>'
-- 
cgit v1.2.1


From b9940d4c9565a0e399b156d527f7426fe1cd098b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 6 Feb 2002 15:50:54 +0000
Subject: pod typo

---
 FS/FS/cust_bill.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 00135afa1..ad2ae82d1 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -864,7 +864,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.16 2002-02-04 16:44:48 ivan Exp $
+$Id: cust_bill.pm,v 1.17 2002-02-06 15:50:54 ivan Exp $
 
 =head1 BUGS
 
@@ -878,7 +878,7 @@ or something similar so the look can be completely customized?)
 
 =head1 SEE ALSO
 
-L<FS::Record>, L<FS::cust_main>, L<FS::cust_bill_pay>, L<FS:;cust_pay>,
+L<FS::Record>, L<FS::cust_main>, L<FS::cust_bill_pay>, L<FS::cust_pay>,
 L<FS::cust_bill_pkg>, L<FS::cust_bill_credit>, schema.html from the base
 documentation.
 
-- 
cgit v1.2.1


From 88d4198ff452581be05e3018b3e23db564545525 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 6 Feb 2002 15:55:47 +0000
Subject: doc updates and pod2x fix to skip blib/ files

---
 FS/FS/cust_main.pm | 2 ++
 bin/pod2x          | 1 +
 2 files changed, 3 insertions(+)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 62f61a689..94fd97f39 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1714,6 +1714,8 @@ sub append_fuzzyfiles {
   1;
 }
 
+=back
+
 =head1 BUGS
 
 The delete method.
diff --git a/bin/pod2x b/bin/pod2x
index cbe142389..385c5db0a 100755
--- a/bin/pod2x
+++ b/bin/pod2x
@@ -33,6 +33,7 @@ foreach my $file (
   glob("./fs_signup/FS-SignupClient/*.pm"),
   glob("./fs_selfadmin/FS-MailAdminServer/*.pm"),
 ) {
+  next if $file =~ /^blib\//;
   #$file =~ /\/([\w\-]+)\.pm$/ or die "oops file $file";
   my $name;
   if ( $file =~ /fs_\w+\/FS\-\w+\/(.*)\.pm$/ ) {
-- 
cgit v1.2.1


From 69c6e80a7253f927af1780a3e0dd3fcf50110599 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 7 Feb 2002 22:29:35 +0000
Subject: delete payments

---
 FS/FS/Conf.pm                       |  7 +++++++
 FS/FS/cust_bill_pay.pm              | 10 +++++++---
 FS/FS/cust_pay.pm                   | 36 +++++++++++++++++++++++++++++++++---
 Makefile                            |  3 ++-
 httemplate/browse/agent_type.cgi    |  6 +++---
 httemplate/browse/nas.cgi           |  1 +
 httemplate/misc/delete-cust_pay.cgi | 17 +++++++++++++++++
 httemplate/view/cust_main.cgi       | 25 +++++++++++++++++++++----
 8 files changed, 91 insertions(+), 14 deletions(-)
 create mode 100755 httemplate/misc/delete-cust_pay.cgi

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index cc91e8292..873ee75a9 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -267,6 +267,13 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'deletepayments',
+    'section'     => 'UI',
+    'description' => 'Enable deletion of unclosed payments.  Be very careful!  Only delete payments that were data-entry errors, not adjustments.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'dirhash',
     'section'     => 'shell',
diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index 1c838b932..913704bef 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -125,12 +125,16 @@ sub insert {
 
 =item delete
 
-Currently unimplemented (accounting reasons).
+Deletes this payment application, unless the closed flag for the parent payment
+(see L<FS::cust_pay>) is set.
 
 =cut
 
 sub delete {
-  return "Can't (yet?) delete cust_bill_pay records!";
+  my $self = shift;
+  return "Can't delete application for closed payment"
+    if $self->cust_pay->closed =~ /^Y/i;
+  $self->SUPER::delete(@_);
 }
 
 =item replace OLD_RECORD
@@ -195,7 +199,7 @@ sub cust_bill {
 
 =head1 VERSION
 
-$Id: cust_bill_pay.pm,v 1.11 2002-01-24 16:58:47 ivan Exp $
+$Id: cust_bill_pay.pm,v 1.12 2002-02-07 22:29:34 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 51c7b29e1..839571a95 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -211,14 +211,44 @@ sub upgrade_replace { #1.3.x->1.4.x
 
 =item delete
 
-Currently unimplemented (accounting reasons).
+Deletes this payment and all associated applications (see L<FS::cust_bill_pay>),
+unless the closed flag is set.
 
 =cut
 
 sub delete {
   my $self = shift;
   return "Can't delete closed payment" if $self->closed =~ /^Y/i;
-  $self->SUPER::delete(@_);
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  foreach my $cust_bill_pay ( $self->cust_bill_pay ) {
+    my $error = $cust_bill_pay->delete;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  my $error = $self->SUPER::delete(@_);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+
 }
 
 =item replace OLD_RECORD
@@ -318,7 +348,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.15 2002-01-29 16:33:15 ivan Exp $
+$Id: cust_pay.pm,v 1.16 2002-02-07 22:29:34 ivan Exp $
 
 =head1 BUGS
 
diff --git a/Makefile b/Makefile
index 0f86b49d2..e5b6ad1ac 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,8 @@ aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/*
 	cp -pr httemplate aspdocs
 	touch aspdocs
 
-masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
+#masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
+masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
 	rm -rf masondocs
 	cp -pr httemplate masondocs
 	( cd masondocs; \
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index 8321048e7..d75c45081 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: agent_type.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
+<!-- $Id: agent_type.cgi,v 1.8 2002-02-07 22:29:34 ivan Exp $ -->
 <%
 
 print header("Agent Type Listing", menubar(
@@ -7,7 +7,7 @@ print header("Agent Type Listing", menubar(
     " particular agents.<BR><BR>", &table(), <<END;
       <TR>
         <TH COLSPAN=2>Agent Type</TH>
-        <TH COLSPAN="2">Packages</TH>
+        <TH COLSPAN=2>Packages</TH>
       </TR>
 END
 
@@ -47,7 +47,7 @@ END
 }
 
 print <<END;
-  <TR><TD COLSPAN=2><I><A HREF="${p}edit/agent_type.cgi">Add a new agent type</A></I></TD></TR>
+  <TR><TD COLSPAN=4><I><A HREF="${p}edit/agent_type.cgi">Add a new agent type</A></I></TD></TR>
     </TABLE>
   </BODY>
 </HTML>
diff --git a/httemplate/browse/nas.cgi b/httemplate/browse/nas.cgi
index b392dc083..2bac9909f 100755
--- a/httemplate/browse/nas.cgi
+++ b/httemplate/browse/nas.cgi
@@ -45,6 +45,7 @@ foreach my $nas ( sort { $a->nasnum <=> $b->nasnum } qsearch( 'nas', {} ) ) {
   print "</TABLE><BR>";
 }
 
+#Time::Duration??
 sub pretty_interval {
   my $interval = shift;
   my %howlong = (
diff --git a/httemplate/misc/delete-cust_pay.cgi b/httemplate/misc/delete-cust_pay.cgi
new file mode 100755
index 000000000..3fb786d7d
--- /dev/null
+++ b/httemplate/misc/delete-cust_pay.cgi
@@ -0,0 +1,17 @@
+<!-- $Id: delete-cust_pay.cgi,v 1.1 2002-02-07 22:29:35 ivan Exp $ -->
+<%
+
+#untaint paynum
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ || die "Illegal paynum";
+my $paynum = $1;
+
+my $cust_pay = qsearchs('cust_pay',{'paynum'=>$paynum});
+my $custnum = $cust_pay->custnum;
+
+my $error = $cust_pay->delete;
+eidiot($error) if $error;
+
+print $cgi->redirect($p. "view/cust_main.cgi?". $custnum);
+
+%>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 9595a07e1..dc4760d73 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: cust_main.cgi,v 1.19 2002-01-30 14:18:09 ivan Exp $ -->
+<!-- $Id: cust_main.cgi,v 1.20 2002-02-07 22:29:35 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
@@ -324,6 +324,16 @@ print "</TR>";
 #formatting
 print "</TABLE>";
 
+print <<END;
+<SCRIPT>
+function areyousure(href) {
+    if (confirm("Are you sure you want to delete this payment?")
+ == true)
+        window.location.href = href;
+}
+</SCRIPT>
+END
+
 #formatting
 print qq!<BR><BR><A NAME="history">Payment History!.
       qq!</A> ( !.
@@ -371,8 +381,11 @@ foreach my $bill (@bills) {
     my $target = "$payby$payinfo";
     $payby =~ s/^BILL$/Check #/ if $payinfo;
     $payby =~ s/^(CARD|COMP)$/$1 /;
+    my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
+                   ? qq! (<A HREF="javascript:areyousure('${p}misc/delete-cust_pay.cgi?!. $payment->paynum. qq!')">delete</A>)!
+                   : '';
     push @history,
-      "$date\tPayment, Invoice #$invnum ($payby$payinfo)\t\t$paid\t\t\t$target";
+      "$date\tPayment, Invoice #$invnum ($payby$payinfo)$delete\t\t$paid\t\t\t$target";
   }
 
   my(@cust_credit_bill)=
@@ -430,11 +443,15 @@ foreach my $payment (@unapplied_payments) {
   my $target = "$payby$payinfo";
   $payby =~ s/^BILL$/Check #/ if $payinfo;
   $payby =~ s/^(CARD|COMP)$/$1 /;
+  my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
+                 ? qq! (<A HREF="javascript:areyousure('${p}misc/delete-cust_pay.cgi?!. $payment->paynum. qq!')">delete</A>)!
+                 : '';
   push @history,
     $payment->_date. "\t".
-    '<A HREF="'. popurl(2). 'edit/cust_bill_pay.cgi?'. $payment->paynum. '">'.
     '<b><font size="+1" color="#ff0000">Unapplied payment #' .
-    $payment->paynum . " ($payby$payinfo)</font></b></A>".
+    $payment->paynum . " ($payby$payinfo)</font></b> ".
+    '(<A HREF="'. popurl(2). 'edit/cust_bill_pay.cgi?'. $payment->paynum. '">'.
+    "apply</A>)$delete".
     "\t\t" . $payment->unapplied . "\t\t\t$target";
 }
 
-- 
cgit v1.2.1


From 58b6cf13486080bae2136b13b421db6c9163368e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 7 Feb 2002 22:30:46 +0000
Subject: oops, reversing bad Makefile patch

---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index e5b6ad1ac..0f86b49d2 100644
--- a/Makefile
+++ b/Makefile
@@ -34,8 +34,7 @@ aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/*
 	cp -pr httemplate aspdocs
 	touch aspdocs
 
-#masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
-masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
+masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
 	rm -rf masondocs
 	cp -pr httemplate masondocs
 	( cd masondocs; \
-- 
cgit v1.2.1


From 5bb9eff0716710611f50071bec6167b4514edb48 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 9 Feb 2002 17:03:55 +0000
Subject: okay, both Apache::ASP and Mason should set no-cache headers now
 (closes: Bug#23)

---
 FS/FS/CGI.pm     | 18 ++++++++++--------
 htetc/global.asa |  4 ++++
 htetc/handler.pl |  5 ++++-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 40932147e..d1c56a254 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -12,10 +12,6 @@ use FS::UID;
 @EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable
                 small_custview);
 
-@header = ( '-Expires' => '-1',
-            '-Pragma' => 'no-cache',
-            '-Cache-Control' => 'no-cache' );
-
 =head1 NAME
 
 FS::CGI - Subroutines for the web interface
@@ -58,6 +54,9 @@ sub header {
         <TITLE>
           $title
         </TITLE>
+        <META HTTP-Equiv="Cache-Control" Content="no-cache">
+        <META HTTP-Equiv="Pragma" Content="no-cache">
+        <META HTTP-Equiv="Expires" Content="0"> 
       </HEAD>
       <BODY BGCOLOR="#e8e8e8"$etc>
           <FONT SIZE=7>
@@ -88,24 +87,27 @@ sub menubar { #$menubar=menubar('Main Menu', '../', 'Item', 'url', ... );
 
 This is depriciated.  Don't use it.
 
-Sends headers and an HTML error message.
+Sends an HTML error message.
 
 =cut
 
 sub idiot {
   #warn "idiot depriciated";
   my($error)=@_;
-  my $cgi = &FS::UID::cgi();
+#  my $cgi = &FS::UID::cgi();
 #  if ( $cgi->isa('CGI::Base') ) {
 #    no strict 'subs';
 #    &CGI::Base::SendHeaders;
 #  } else {
-    print $cgi->header( @FS::CGI::header );
+#    print $cgi->header( @FS::CGI::header );
 #  }
   print <<END;
 <HTML>
   <HEAD>
     <TITLE>Error processing your request</TITLE>
+    <META HTTP-Equiv="Cache-Control" Content="no-cache">
+    <META HTTP-Equiv="Pragma" Content="no-cache">
+    <META HTTP-Equiv="Expires" Content="0"> 
   </HEAD>
   <BODY>
     <CENTER>
@@ -123,7 +125,7 @@ END
 
 This is depriciated.  Don't use it.
 
-Sends headers and an HTML error message, then exits.
+Sends an HTML error message, then exits.
 
 =cut
 
diff --git a/htetc/global.asa b/htetc/global.asa
index c4b4380d6..cf6b0f679 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -47,6 +47,10 @@ use FS::svc_www;
 use FS::type_pkgs;
 
 sub Script_OnStart {
+  $Response->AddHeader('Pragma' => 'no-cache');
+  $Response->AddHeader('Cache-control' => 'no-cache');
+  $Response->AddHeader('Expires' => 0);
+
   $cgi = new CGI;
   &cgisuidsetup($cgi);
   $p = popurl(2);
diff --git a/htetc/handler.pl b/htetc/handler.pl
index f80c79e65..5be19c443 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -109,7 +109,10 @@ sub handler
     $r->content_type('text/html');
     #eorar
 
-    # @FS::CGI::headers or some other way to set no-cache headers!!!
+    my $headers = $r->headers_out;
+    $headers->{'Pragma'} = $headers->{'Cache-control'} = 'no-cache';
+    #$r->no_cache(1);
+    $headers->{'Expires'} = '0';
     
     my $status = $ah->handle_request($r);
     
-- 
cgit v1.2.1


From 4c18a45810f000bb013d23d4738cfca012794c4b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 9 Feb 2002 17:45:26 +0000
Subject: have FS::cust_svc::check look up & check pkg_svc.quantity like
 httemplate/view/cust_pkg.cgi (closes: Bug#43)

---
 FS/FS/cust_svc.pm                | 27 ++++++++++++++++++++-------
 httemplate/misc/process/link.cgi |  9 +++++----
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 541f0c801..a81e3bb32 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -7,6 +7,7 @@ use FS::Record qw( qsearchs dbh );
 use FS::cust_pkg;
 use FS::part_pkg;
 use FS::part_svc;
+use FS::pkg_svc;
 use FS::svc_acct;
 use FS::svc_acct_sm;
 use FS::svc_domain;
@@ -111,12 +112,24 @@ sub check {
   ;
   return $error if $error;
 
-  return "Unknown pkgnum"
-    unless ! $self->pkgnum
-      || qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
-
-  return "Unknown svcpart" unless
-    qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
+  my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
+  return "Unknown svcpart" unless $part_svc;
+
+  if ( $self->pkgnum ) {
+    my $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
+    return "Unknown pkgnum" unless $cust_pkg;
+    my $pkg_svc = qsearchs( 'pkg_svc', {
+      'pkgpart' => $cust_pkg->pkgpart,
+      'svcpart' => $self->svcpart,
+    });
+    my @cust_svc = qsearch('cust_svc', {
+      'pkgnum'  => $self->pkgnum,
+      'svcpart' => $self->svcpart,
+    });
+    return "Already ". scalar(@cust_svc). " ". $part_svc->svc.
+           " services for pkgnum ". $self->pkgnum
+      if $pkg_svc->quantity >= scalar(@cust_svc);
+  }
 
   ''; #no error
 }
@@ -232,7 +245,7 @@ sub seconds_since {
 
 =head1 VERSION
 
-$Id: cust_svc.pm,v 1.9 2002-01-29 16:33:15 ivan Exp $
+$Id: cust_svc.pm,v 1.10 2002-02-09 17:45:26 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
index 80a5de81f..f8b7812e1 100755
--- a/httemplate/misc/process/link.cgi
+++ b/httemplate/misc/process/link.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: link.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
+<!-- $Id: link.cgi,v 1.4 2002-02-09 17:45:26 ivan Exp $ -->
 <%
 
 $cgi->param('pkgnum') =~ /^(\d+)$/;
@@ -12,13 +12,14 @@ unless ( $svcnum ) {
   my($part_svc) = qsearchs('part_svc',{'svcpart'=>$svcpart});
   my($svcdb) = $part_svc->getfield('svcdb');
   $cgi->param('link_field') =~ /^(\w+)$/; my($link_field)=$1;
-  my($svc_acct)=qsearchs($svcdb,{$link_field => $cgi->param('link_value') });
-  eidiot("$link_field not found!") unless $svc_acct;
-  $svcnum=$svc_acct->svcnum;
+  my($svc_x)=qsearchs($svcdb,{$link_field => $cgi->param('link_value') });
+  eidiot("$link_field not found!") unless $svc_x;
+  $svcnum=$svc_x->svcnum;
 }
 
 my $old = qsearchs('cust_svc',{'svcnum'=>$svcnum});
 die "svcnum not found!" unless $old;
+#die "svcnum $svcnum already linked to package ". $old->pkgnum if $old->pkgnum;
 my $new = new FS::cust_svc ({
   'svcnum' => $svcnum,
   'pkgnum' => $pkgnum,
-- 
cgit v1.2.1


From 4609bb519b7fdf0eace6523fee49752cdb82a1ef Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 9 Feb 2002 18:09:30 +0000
Subject: okay all external export from .pm files is queued! (closes: Bug#249)

---
 FS/FS/svc_domain.pm | 41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index bc62ea7bc..d0f0e11a8 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -10,7 +10,7 @@ use Mail::Internet;
 use Mail::Header;
 use Date::Format;
 use Net::Whois 1.0;
-use Net::SSH qw(ssh);
+use Net::SSH;
 use FS::Record qw(fields qsearch qsearchs dbh);
 use FS::Conf;
 use FS::svc_Common;
@@ -19,6 +19,7 @@ use FS::svc_acct;
 use FS::cust_pkg;
 use FS::cust_main;
 use FS::domain_record;
+use FS::queue;
 
 @ISA = qw( FS::svc_Common );
 
@@ -228,6 +229,7 @@ sub insert {
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   if ( $qshellmachine && $self->catchall && ! $nossh_hack ) {
+
     my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->catchall } )
       or warn "WARNING: inserted unknown catchall: ". $self->catchall;
     if ( $svc_acct && $svc_acct->dir ) {
@@ -238,13 +240,46 @@ sub insert {
         $svc_acct->gid,
         $svc_acct->dir,
       );
-      ssh("root\@$qshellmachine", "[ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }");
+  
+    my $queue = new FS::queue { 'job' => 'FS::svc_domain::ssh' };
+    $error = $queue->insert("root\@$qshellmachine", "[ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }" );
+
     }
   }
 
   ''; #no error
 }
 
+=item ssh
+
+=cut
+
+#false laziness with FS::svc_acct::ssh
+sub ssh {
+  my ( $host, @cmd_and_args ) = @_;
+
+  use IO::File;
+  my $reader = IO::File->new();
+  my $writer = IO::File->new();
+  my $error = IO::File->new();
+
+  &Net::SSH::sshopen3( $host, $reader, $writer, $error, @cmd_and_args) or die $!;
+
+  local $/ = undef;
+  my $output_stream = <$writer>;
+  my $error_stream = <$error>;
+  if ( length $error_stream ) {
+    #warn "[FS::svc_acct::ssh] STDERR $error_stream";
+    die "[FS::svc_domain::ssh] STDERR $error_stream";
+  }
+  if ( length $output_stream ) {
+    warn "[FS::svc_domain::ssh] STDOUT $output_stream";
+  }
+
+#  &Net::SSH::ssh(@args,">>/usr/local/etc/freeside/sshoutput 2>&1");
+}
+
+
 =item delete
 
 Deletes this domain from the database.  If there is an error, returns the
@@ -416,7 +451,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.22 2001-10-24 15:29:30 ivan Exp $
+$Id: svc_domain.pm,v 1.23 2002-02-09 18:09:30 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 0bdec843e4a9bb7f947c9ba980a40f7bf37020fb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 9 Feb 2002 18:24:02 +0000
Subject: no more exit() in templates

---
 FS/FS/CGI.pm                                       | 14 +++++-
 htetc/global.asa                                   |  2 +-
 htetc/handler.pl                                   |  2 +-
 httemplate/edit/process/agent_type.cgi             | 52 +++++++++++-----------
 .../edit/process/cust_main_county-expand.cgi       |  4 +-
 httemplate/edit/process/cust_main_county.cgi       |  4 +-
 httemplate/edit/process/cust_pay.cgi               |  3 +-
 httemplate/edit/process/part_pkg.cgi               |  6 +--
 httemplate/search/cust_main.cgi                    |  2 +-
 httemplate/search/cust_pkg.cgi                     |  4 +-
 httemplate/search/svc_domain.cgi                   |  4 +-
 11 files changed, 54 insertions(+), 43 deletions(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index d1c56a254..35d2e2839 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -10,7 +10,7 @@ use FS::UID;
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable
-                small_custview);
+                small_custview myexit);
 
 =head1 NAME
 
@@ -132,6 +132,18 @@ Sends an HTML error message, then exits.
 sub eidiot {
   warn "eidiot depriciated";
   idiot(@_);
+  &myexit();
+}
+
+=item myexit
+
+You probably shouldn't use this; but if you must:
+
+If running under mod_perl, calles Apache::exit, otherwise, calls exit.
+
+=cut
+
+sub myexit {
   if (exists $ENV{MOD_PERL}) {
     $main::Response->End()
       if defined $main::Response
diff --git a/htetc/global.asa b/htetc/global.asa
index cf6b0f679..daf1c397f 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -13,7 +13,7 @@ use FS::UID qw(cgisuidsetup dbh getotaker datasrc);
 use FS::Record qw(qsearch qsearchs fields dbdef);
 use FS::Conf;
 use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
-               small_custview);
+               small_custview myexit);
 
 use FS::agent;
 use FS::agent_type;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 5be19c443..29e759a68 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -68,7 +68,7 @@ sub handler
       use FS::Record qw(qsearch qsearchs fields dbdef);
       use FS::Conf;
       use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
-                     small_custview);
+                     small_custviewm myexit);
 
       use FS::agent;
       use FS::agent_type;
diff --git a/httemplate/edit/process/agent_type.cgi b/httemplate/edit/process/agent_type.cgi
index 2d1159708..4e98cf113 100755
--- a/httemplate/edit/process/agent_type.cgi
+++ b/httemplate/edit/process/agent_type.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: agent_type.cgi,v 1.3 2002-01-30 14:18:08 ivan Exp $ -->
+<!-- $Id: agent_type.cgi,v 1.4 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 my $typenum = $cgi->param('typenum');
@@ -21,35 +21,35 @@ if ( $typenum ) {
 if ( $error ) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). "agent_type.cgi?". $cgi->query_string );
-  exit;
-}
+} else {
+
+  foreach my $part_pkg (qsearch('part_pkg',{})) {
+    my($pkgpart)=$part_pkg->getfield('pkgpart');
 
-foreach my $part_pkg (qsearch('part_pkg',{})) {
-  my($pkgpart)=$part_pkg->getfield('pkgpart');
-
-  my($type_pkgs)=qsearchs('type_pkgs',{
-      'typenum' => $typenum,
-      'pkgpart' => $pkgpart,
-  });
-  if ( $type_pkgs && ! $cgi->param("pkgpart$pkgpart") ) {
-    my($d_type_pkgs)=$type_pkgs; #need to save $type_pkgs for below.
-    $error=$d_type_pkgs->delete;
-    die $error if $error;
-
-  } elsif ( $cgi->param("pkgpart$pkgpart")
-            && ! $type_pkgs
-  ) {
-    #ok to clobber it now (but bad form nonetheless?)
-    $type_pkgs=new FS::type_pkgs ({
-      'typenum' => $typenum,
-      'pkgpart' => $pkgpart,
+    my($type_pkgs)=qsearchs('type_pkgs',{
+        'typenum' => $typenum,
+        'pkgpart' => $pkgpart,
     });
-    $error= $type_pkgs->insert;
-    die $error if $error;
+    if ( $type_pkgs && ! $cgi->param("pkgpart$pkgpart") ) {
+      my($d_type_pkgs)=$type_pkgs; #need to save $type_pkgs for below.
+      $error=$d_type_pkgs->delete;
+      die $error if $error;
+
+    } elsif ( $cgi->param("pkgpart$pkgpart")
+              && ! $type_pkgs
+    ) {
+      #ok to clobber it now (but bad form nonetheless?)
+      $type_pkgs=new FS::type_pkgs ({
+        'typenum' => $typenum,
+        'pkgpart' => $pkgpart,
+      });
+      $error= $type_pkgs->insert;
+      die $error if $error;
+    }
+
   }
 
+  print $cgi->redirect(popurl(3). "browse/agent_type.cgi");
 }
 
-print $cgi->redirect(popurl(3). "browse/agent_type.cgi");
-
 %>
diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
index b16fab4fe..342779048 100755
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: cust_main_county-expand.cgi,v 1.4 2002-01-30 14:18:09 ivan Exp $ -->
+<!-- $Id: cust_main_county-expand.cgi,v 1.5 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 $cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
@@ -19,7 +19,7 @@ if ( $cgi->param('delim') eq 'n' ) {
   unless ( /^\s*([\w\- ]+)\s*$/ ) {
     $cgi->param('error', "Illegal item in expansion");
     print $cgi->redirect(popurl(2). "cust_main_county-expand.cgi?". $cgi->query_string );
-    exit;
+    myexit();
   }
   $1;
 } @expansion;
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
index 0f0246b73..e9d130897 100755
--- a/httemplate/edit/process/cust_main_county.cgi
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: cust_main_county.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
+<!-- $Id: cust_main_county.cgi,v 1.4 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 foreach ( $cgi->param ) {
@@ -14,7 +14,7 @@ foreach ( $cgi->param ) {
   if ( $error ) {
     $cgi->param('error', $error);
     print $cgi->redirect(popurl(2). "cust_main_county.cgi?". $cgi->query_string );
-    exit;
+    myexit();
   }
 }
 
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index c75e53280..953ff3edb 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: cust_pay.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
+<!-- $Id: cust_pay.cgi,v 1.7 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 $cgi->param('linknum') =~ /^(\d+)$/
@@ -22,7 +22,6 @@ my $error = $new->insert;
 if ($error) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). 'cust_pay.cgi?'. $cgi->query_string );
-  exit;
 } elsif ( $link eq 'invnum' ) {
   print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$linknum");
 } elsif ( $link eq 'custnum' ) {
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 2ba1cbeb0..5240d8cc2 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_pkg.cgi,v 1.7 2002-01-30 14:18:09 ivan Exp $ -->
+<!-- $Id: part_pkg.cgi,v 1.8 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 my $dbh = dbh;
@@ -34,7 +34,7 @@ foreach my $part_svc ( qsearch('part_svc', {} ) ) {
   unless ( $quantity =~ /^(\d+)$/ ) {
     $cgi->param('error', "Illegal quantity" );
     print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
-    exit;
+    myexit();
   }
 }
 
@@ -58,7 +58,7 @@ if ( $error ) {
   $dbh->rollback;
   $cgi->param('error', $error );
   print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
-  exit;
+  myexit();
 }
 
 foreach $part_svc (qsearch('part_svc',{})) {
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index f21dd7ed1..89e325d09 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -150,7 +150,7 @@ if ( scalar(@cust_main) == 1 && ! $cgi->param('referral_custnum') ) {
   } else {
     print $cgi->redirect(popurl(2). "view/cust_main.cgi?". $cust_main[0]->custnum);
   }
-  exit;
+  #exit;
 } elsif ( scalar(@cust_main) == 0 ) {
   eidiot "No matching customers found!\n";
 } else { 
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 9705bd658..b2199e9dc 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: cust_pkg.cgi,v 1.13 2002-01-30 14:18:09 ivan Exp $ -->
+<!-- $Id: cust_pkg.cgi,v 1.14 2002-02-09 18:24:02 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
@@ -76,7 +76,7 @@ my @cust_pkg = qsearch('cust_pkg',{}, '', "$unconf ORDER BY pkgnum $limit" );
 if ( scalar(@cust_pkg) == 1 ) {
   my($pkgnum)=$cust_pkg[0]->pkgnum;
   print $cgi->redirect(popurl(2). "view/cust_pkg.cgi?$pkgnum");
-  exit;
+  #exit;
 } elsif ( scalar(@cust_pkg) == 0 ) { #error
   eidiot("No packages found");
 } else {
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index 4ec5eb053..c274750aa 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: svc_domain.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
+<!-- $Id: svc_domain.cgi,v 1.7 2002-02-09 18:24:02 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
@@ -34,7 +34,7 @@ if ( $query eq 'svcnum' ) {
 
 if ( scalar(@svc_domain) == 1 ) {
   print $cgi->redirect(popurl(2). "view/svc_domain.cgi?". $svc_domain[0]->svcnum);
-  exit;
+  #exit;
 } elsif ( scalar(@svc_domain) == 0 ) {
   eidiot "No matching domains found!\n";
 } else {
-- 
cgit v1.2.1


From 298b8d9a262265fe7106da1ff552ce6778237034 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 01:48:00 +0000
Subject: remove -i option from freeside-bill (obsoleted by invoice events)

---
 FS/bin/freeside-bill          | 17 ++++++-----------
 README.1.4.0pre8              |  3 ++-
 httemplate/docs/upgrade8.html |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill
index 49ec43c82..6ef344a50 100755
--- a/FS/bin/freeside-bill
+++ b/FS/bin/freeside-bill
@@ -11,8 +11,8 @@ use FS::Record qw(qsearch qsearchs);
 use FS::cust_main;
 
 &untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_a $opt_c $opt_i $opt_d $opt_p);
-getopts("acid:p");
+use vars qw($opt_a $opt_c $opt_d $opt_p);
+getopts("acd:p");
 my $user = shift or die &usage;
 
 adminsuidsetup $user;
@@ -63,9 +63,7 @@ foreach $cust_main (
   }
 
   if ($opt_c) {
-    $error=$cust_main->collect('invoice_time'=>$time,
-                               'batch_card' => $opt_i ? 'no' : 'yes',
-                              );
+    $error=$cust_main->collect( 'invoice_time' => $time);
     warn "Error collecting from customer #" . $cust_main->custnum.  ":$error"
       if $error;
 
@@ -86,7 +84,7 @@ sub untaint_argv {
 }
 
 sub usage {
-  die "Usage:\n\n  freeside-bill [ -c [ i ] ] [ -d 'date' ] [ -b ] user\n";
+  die "Usage:\n\n  freeside-bill [ -c [ -p ] ] [ -d 'date' ] user [ custnum custnum ... ]\n";
 }
 
 =head1 NAME
@@ -95,7 +93,7 @@ freeside-bill - Command line (crontab, script) interface to customer billing.
 
 =head1 SYNOPSIS
 
-  freeside-bill [ -c [ -p ] [ -a ] [ -i ] ] [ -d 'date' ] user [ custnum custnum ... ]
+  freeside-bill [ -c [ -p ] [ -a ] ] [ -d 'date' ] user [ custnum custnum ... ]
 
 =head1 DESCRIPTION
 
@@ -110,9 +108,6 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
   -a: Call collect even if there isn't a new invoice (probably a bad idea for
       daily use)
 
-  -i: real-time billing (as opposed to batch billing).  only relevant
-      for credit cards.
-
   -d: Pretend it's 'date'.  Date is in any format Date::Parse is happy with,
       but be careful.
 
@@ -123,7 +118,7 @@ customers.  Otherwise, bills all customers.
 
 =head1 VERSION
 
-$Id: freeside-bill,v 1.11 2001-12-28 14:40:35 ivan Exp $
+$Id: freeside-bill,v 1.12 2002-02-10 01:48:00 ivan Exp $
 
 =head1 BUGS
 
diff --git a/README.1.4.0pre8 b/README.1.4.0pre8
index 6872bdd60..4eccb203e 100644
--- a/README.1.4.0pre8
+++ b/README.1.4.0pre8
@@ -69,5 +69,6 @@ Go to the new "View/Edit Invoice events" in the web interface and add the
 appropriate events.  t the very least, you'll want to set some invoice events
 "After 0 days": a BILL invoice event to print invoices, a CARD invoice event to
 batch or run cards real-time, and a COMP invoice event to "pay" complimentary
-customers.
+customers.  If you were using the -i option to freeside-bill it should be
+removed.
 
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 0949315b9..b243eba75 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -299,6 +299,6 @@ ALTER TABLE cust_refund DROP COLUMN crednum;
   <li>Create the `/usr/local/etc/freeside/cache.<i>datasrc</i>' directory
       (ownded by the freeside user).
   <li>freeside-queued was installed with the Perl modules.  Start it now and ensure that is run upon system startup.
-  <li>Set appropriate <a href="../browse/part_bill_event.cgi">invoice events</a> for your site.  At the very least, you'll want to set some invoice events "<i>After 0 days</i>": a <i>BILL</i> invoice event to print invoices, a <i>CARD</i> invoice event to batch or run cards real-time, and a <i>COMP</i> invoice event to "pay" complimentary customers.
+  <li>Set appropriate <a href="../browse/part_bill_event.cgi">invoice events</a> for your site.  At the very least, you'll want to set some invoice events "<i>After 0 days</i>": a <i>BILL</i> invoice event to print invoices, a <i>CARD</i> invoice event to batch or run cards real-time, and a <i>COMP</i> invoice event to "pay" complimentary customers.  If you were using the <i>-i</i> option to <a href="man/bin/freeside-bill.html">freeside-bill</a> it should be removed.
 </ul>
 </body>
-- 
cgit v1.2.1


From c828daa905491e65deb30a2ed34af609cdb96b99 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 02:16:47 +0000
Subject: pro-rating w/ web interface, tested (closes: Bug#313).

view/cust_bill.cgi invoice view shows invoice events!

fix bug where adding events with no name silently failed instead of giving
an error

add new comission plans
---
 FS/FS/Conf.pm                               |  7 +++
 FS/FS/cust_bill.pm                          | 16 +++++-
 FS/FS/cust_bill_event.pm                    | 13 +++++
 FS/FS/cust_main.pm                          | 32 ++++++++---
 Makefile                                    |  2 +-
 htetc/handler.pl                            |  2 +-
 httemplate/browse/part_bill_event.cgi       |  4 +-
 httemplate/edit/part_pkg.cgi                | 88 +++++++++++++++++++++++++++--
 httemplate/edit/process/part_bill_event.cgi |  1 -
 httemplate/edit/process/part_pkg.cgi        |  4 +-
 httemplate/view/cust_bill.cgi               | 15 +++--
 11 files changed, 159 insertions(+), 25 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 873ee75a9..da6bf72ce 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -716,6 +716,13 @@ httemplate/docs/config.html
     'type'        => 'textarea',
   },
 
+  {
+    'key'         => 'safe-part_pkg',
+    'section'     => 'UI',
+    'description' => 'Validates package definition setup and recur expressions against a preset list.  Useful for webdemos, annoying to powerusers.',
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index ad2ae82d1..4306ea477 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -19,6 +19,7 @@ use FS::cust_pay;
 use FS::cust_pkg;
 use FS::cust_credit_bill;
 use FS::cust_pay_batch;
+use FS::cust_bill_event;
 
 @ISA = qw( FS::Record );
 
@@ -251,6 +252,19 @@ sub cust_bill_pkg {
   qsearch( 'cust_bill_pkg', { 'invnum' => $self->invnum } );
 }
 
+=item cust_bill_event
+
+Returns the completed invoice events (see L<FS::cust_bill_event>) for this
+invoice.
+
+=cut
+
+sub cust_bill_event {
+  my $self = shift;
+  qsearch( 'cust_bill_event', { 'invnum' => $self->invnum } );
+}
+
+
 =item cust_main
 
 Returns the customer (see L<FS::cust_main>) for this invoice.
@@ -864,7 +878,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.17 2002-02-06 15:50:54 ivan Exp $
+$Id: cust_bill.pm,v 1.18 2002-02-10 02:16:46 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_bill_event.pm b/FS/FS/cust_bill_event.pm
index 910b4dead..cc9ce7cb8 100644
--- a/FS/FS/cust_bill_event.pm
+++ b/FS/FS/cust_bill_event.pm
@@ -3,6 +3,7 @@ package FS::cust_bill_event;
 use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs );
+use FS::part_bill_event;
 
 @ISA = qw(FS::Record);
 
@@ -117,6 +118,18 @@ sub check {
   ''; #no error
 }
 
+=item part_bill_event
+
+Returns the invoice event definition (see L<FS::part_bill_event>) for this
+completed invoice event.
+
+=cut
+
+sub part_bill_event {
+  my $self = shift;
+  qsearchs( 'part_bill_event', { 'eventpart' => $self->eventpart } );
+}
+
 =back
 
 =head1 BUGS
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 94fd97f39..5cc6cfdfd 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -913,6 +913,9 @@ sub bill {
       };
       $recur_prog = $1;
 
+      # shared with $recur_prog
+      $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
+
         #my $cpt = new Safe;
         ##$cpt->permit(); #what is necessary?
         #$cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
@@ -925,11 +928,14 @@ sub bill {
       }
       #change this bit to use Date::Manip? CAREFUL with timezones (see
       # mailing list archive)
-      #$sdate=$cust_pkg->bill || time;
-      #$sdate=$cust_pkg->bill || $time;
-      $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
       my ($sec,$min,$hour,$mday,$mon,$year) =
         (localtime($sdate) )[0,1,2,3,4,5];
+
+      #pro-rating magic - if $recur_prog fiddles $sdate, want to use that
+      # only for figuring next bill date, nothing else, so, reset $sdate again
+      # here
+      $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
+
       $mon += $part_pkg->getfield('freq');
       until ( $mon < 12 ) { $mon -= 12; $year++; }
       $cust_pkg->setfield('bill',
@@ -1118,7 +1124,7 @@ sub collect {
       sort {    $a->seconds   <=> $b->seconds
              || $a->weight    <=> $b->weight
              || $a->eventpart <=> $b->eventpart }
-        grep { $_->seconds > ( $invoice_time - ( $cust_bill->_date || 0 ) )
+        grep { $_->seconds <= ( $invoice_time - $cust_bill->_date )
                && ! qsearchs( 'cust_bill_event', {
                                 'invnum'    => $cust_bill->invnum,
                                 'eventpart' => $_->eventpart       } )
@@ -1518,11 +1524,23 @@ sub referral_cust_main {
   @cust_main;
 }
 
+=item referral_cust_main_ncancelled
+
+Same as referral_cust_main, except only returns customers with uncancelled
+packages.
+
+=cut
+
+sub referral_cust_main_ncancelled {
+  my $self = shift;
+  grep { scalar($_->ncancelled_pkgs) } $self->referral_cust_main;
+}
+
 =item referral_cust_pkg [ DEPTH ]
 
-Like referral_cust_main, except returns a flat list of all unsuspended packages
-for each customer.  The number of items in this list may be useful for
-comission calculations (perhaps after a grep).
+Like referral_cust_main, except returns a flat list of all unsuspended (and
+uncancelled) packages for each customer.  The number of items in this list may
+be useful for comission calculations (perhaps after a C<grep { my $pkgpart = $_->pkgpart; grep { $_ == $pkgpart } @commission_worthy_pkgparts> } $cust_main-> ).
 
 =cut
 
diff --git a/Makefile b/Makefile
index 0f86b49d2..283981a87 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ htmlman:
 	[ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
 	[ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
 	[ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
-	bin/pod2x
+	[ -e DONT_REBUILD_DOCS ] || bin/pod2x
 
 upload-docs:
 	ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 29e759a68..37f2d3766 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -68,7 +68,7 @@ sub handler
       use FS::Record qw(qsearch qsearchs fields dbdef);
       use FS::Conf;
       use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
-                     small_custviewm myexit);
+                     small_custview myexit);
 
       use FS::agent;
       use FS::agent_type;
diff --git a/httemplate/browse/part_bill_event.cgi b/httemplate/browse/part_bill_event.cgi
index 7ec8a181a..81228f2ea 100755
--- a/httemplate/browse/part_bill_event.cgi
+++ b/httemplate/browse/part_bill_event.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_bill_event.cgi,v 1.3 2002-01-30 18:22:54 ivan Exp $ -->
+<!-- $Id: part_bill_event.cgi,v 1.4 2002-02-10 02:16:46 ivan Exp $ -->
 <% 
 
 my %search;
@@ -66,7 +66,7 @@ my $total = scalar(@part_bill_event);
 <% } %>
 
   <TR>
-    <TD COLSPAN=8><A HREF="<%= $p %>edit/part_bill_event.cgi"><I>Add a new billing event</I></A></TD>
+    <TD COLSPAN=8><A HREF="<%= $p %>edit/part_bill_event.cgi"><I>Add a new invoice event</I></A></TD>
   </TR>
 </TABLE>
 </BODY>
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index ea3f62aa2..bead1410a 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_pkg.cgi,v 1.9 2002-01-29 16:33:16 ivan Exp $ -->
+<!-- $Id: part_pkg.cgi,v 1.10 2002-02-10 02:16:47 ivan Exp $ -->
 
 <%
 
@@ -175,8 +175,44 @@ tie my %plans, 'Tie::IxHash',
     'recur' => 'what.recur_fee.value',
   },
 
+  'prorate' => {
+    'name' => 'First month pro-rated, then flat-rate',
+    'fields' =>  {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                      },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
+    'setup' => 'what.setup_fee.value',
+    'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; my $mstart = timelocal(0,0,0,1,$mon,$year); my $mend = timelocal(0,0,0,1, $mon == 11 ? 0 : $mon+1, $year+($mon==11)); $sdate = $mstart; ( $part_pkg->freq - 1 ) * \' + what.recur_fee.value + \' / $part_pkg->freq + \' + what.recur_fee.value + \' / $part_pkg->freq * ($mend-$mnow) / ($mend-$mstart) ; \'',
+  },
+
+  'flat_comission_cust' => {
+    'name' => 'Flat rate with recurring comission per active customer',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                     },
+      'comission_amount' => { 'name' => 'Comission amount per month (per active customer)',
+                              'default' => 0,
+                            },
+      'comission_depth'  => { 'name' => 'Number of layers',
+                              'default' => 1,
+                            },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount' ],
+    'setup' => 'what.setup_fee.value',
+    'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_main_ncancelled(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
+  },
+
   'flat_comission' => {
-    'name' => 'Flat rate with recurring referral comission as credit',
+    'name' => 'Flat rate with recurring comission per active package',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -184,7 +220,7 @@ tie my %plans, 'Tie::IxHash',
       'recur_fee' => { 'name' => 'Recurring fee for this package',
                        'default' => 0,
                      },
-      'comission_amount' => { 'name' => 'Comission amount',
+      'comission_amount' => { 'name' => 'Comission amount per month (per active package)',
                               'default' => 0,
                             },
       'comission_depth'  => { 'name' => 'Number of layers',
@@ -196,6 +232,36 @@ tie my %plans, 'Tie::IxHash',
     'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
   },
 
+  'flat_comission_pkg' => {
+    'name' => 'Flat rate with recurring comission per active (selected) package',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                     },
+      'comission_amount' => { 'name' => 'Comission amount per month (per uncancelled package)',
+                              'default' => 0,
+                            },
+      'comission_depth'  => { 'name' => 'Number of layers',
+                              'default' => 1,
+                            },
+      'comission_pkgpart' => { 'name' => 'Applicable packages<BR><FONT SIZE="-1">(hold <b>ctrl</b> to select multiple packages)</FONT>',
+                               'type' => 'select_multiple',
+                               'select_table' => 'part_pkg',
+                               'select_hash'  => { 'disabled' => '' } ,
+                               'select_key'   => 'pkgpart',
+                               'select_label' => 'pkg',
+                             },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount', 'comission_pkgpart' ],
+    'setup' => 'what.setup_fee.value',
+    'recur' => '""; var pkgparts = ""; for ( var c=0; c < document.flat_comission_pkg.comission_pkgpart.options.length; c++ ) { if (document.flat_comission_pkg.comission_pkgpart.options[c].selected) { pkgparts = pkgparts + document.flat_comission_pkg.comission_pkgpart.options[c].value + \', \'; } } what.recur.value = \'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar( grep { my $pkgpart = $_->pkgpart; grep { $_ == $pkgpart } ( \' + pkgparts + \'  ) } $cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
+  },
+
+
+
   'sesmon_hour' => {
     'name' => 'Base charge plus charge per-hour from the session monitor',
     'fields' => {
@@ -345,9 +411,21 @@ if ( $cgi->param('pkgnum') ) {
                          : keys %{ $href }
                      ) {
 %>
-<TR><TD ALIGN="right"><%= $href->{$field}{'name'} %></TD>
-<TD><INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= exists($plandata{$field}) ? $plandata{$field} : $href->{$field}{'default'} %>" onChange="fchanged(this)"></TD></TR>
+  <TR><TD ALIGN="right"><%= $href->{$field}{'name'} %></TD>
+  <TD>
+  <% if ( ! exists($href->{$field}{'type'}) ) { %>
+       <INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= exists($plandata{$field}) ? $plandata{$field} : $href->{$field}{'default'} %>" onChange="fchanged(this)">
+  <% } elsif ( $href->{$field}{'type'} eq 'select_multiple' ) { %>
+       <SELECT MULTIPLE NAME="<%= $field %>" onChange="fchanged(this)">
+       <% foreach $record ( qsearch( $href->{$field}{'select_table'}, $href->{$field}{'select_hash'} ) ) {
+          my $value = $record->getfield($href->{$field}{'select_key'}); %>
+         <OPTION VALUE="<%= $value %>"<%= $plandata{$field} =~ /(^|, *)$value *(,|$)/ ? ' SELECTED' : '' %>><%= $record->getfield($href->{$field}{'select_label'}) %>
+       <% } %>
+       </SELECT>
+  <% } %>
+  </TD></TR>
 <% } %>
+
 </TABLE>
 <INPUT TYPE="hidden" NAME="plandata" VALUE="<%= join(',', keys %{ $href } ) %>">
 <BR><BR>
diff --git a/httemplate/edit/process/part_bill_event.cgi b/httemplate/edit/process/part_bill_event.cgi
index 7c0b54d0d..1716c71b9 100755
--- a/httemplate/edit/process/part_bill_event.cgi
+++ b/httemplate/edit/process/part_bill_event.cgi
@@ -34,7 +34,6 @@ if ( ! $cgi->param('plan_weight_eventcode') ) {
     } fields('part_bill_event'),
   } );
 
-  my $error;
   if ( $eventpart ) {
     $error = $new->replace($old);
   } else {
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 5240d8cc2..9ad1527a1 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_pkg.cgi,v 1.8 2002-02-09 18:24:01 ivan Exp $ -->
+<!-- $Id: part_pkg.cgi,v 1.9 2002-02-10 02:16:47 ivan Exp $ -->
 <%
 
 my $dbh = dbh;
@@ -11,7 +11,7 @@ my $old = qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
 my $plandata = $cgi->param('plandata');
 my @plandata = split(',', $plandata);
 $cgi->param('plandata', 
-  join('', map { "$_=". $cgi->param($_). "\n" } @plandata )
+  join('', map { "$_=". join(', ', $cgi->param($_)). "\n" } @plandata )
 );
 
 foreach (qw( setuptax recurtax disabled )) {
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 6bc156816..5860ffd11 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: cust_bill.cgi,v 1.7 2002-02-04 16:44:47 ivan Exp $ -->
+<!-- $Id: cust_bill.cgi,v 1.8 2002-02-10 02:16:47 ivan Exp $ -->
 <%
 
 #untaint invnum
@@ -20,10 +20,15 @@ print header('Invoice View', menubar(
 print qq!<A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) against this invoice</A> | !
   if $cust_bill->owed > 0;
 
-print qq!<A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>!.
-#     "<BR><BR>(Printed $printed times)".
-#print cust_bill_events
-      '<PRE>'.
+print qq!<A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>!.      '<BR><BR>';
+
+foreach my $cust_bill_event (
+  sort { $a->_date <=> $b->_date } $cust_bill->cust_bill_event
+) {
+  print time2str("%a %b %e %T %Y", $cust_bill_event->_date). ' - '.
+        $cust_bill_event->part_bill_event->event. '<BR>';
+}
+print '<BR><PRE>';
 
 print $cust_bill->print_text;
 
-- 
cgit v1.2.1


From b4bce0bf487b4ee3620e13f1fdf56ecc1d001a42 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 02:28:28 +0000
Subject: hide SS# unless you turn it on via config file

---
 FS/FS/Conf.pm                 |  7 +++++++
 httemplate/edit/cust_main.cgi | 11 +++++++++--
 httemplate/view/cust_main.cgi | 10 +++++++---
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index da6bf72ce..20ec1380e 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -723,6 +723,13 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'show_ss',
+    'section'     => 'UI',
+    'description' => 'Turns on display/collection of SS# in the web interface.',
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index fad4d9e6d..5be6a3579 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: cust_main.cgi,v 1.19 2002-01-30 14:18:08 ivan Exp $ -->
+<!-- $Id: cust_main.cgi,v 1.20 2002-02-10 02:28:27 ivan Exp $ -->
 <%
 
   #for misplaced logic below
@@ -153,10 +153,17 @@ END
 print <<END;
 <INPUT TYPE="text" NAME="last" VALUE="$last"> , 
 <INPUT TYPE="text" NAME="first" VALUE="$first">
+</TD>
 END
 
+if ( $conf->exists('show_ss') ) {
+  print qq!<TD ALIGN="right">SS#</TD><TD><INPUT TYPE="text" NAME="ss" VALUE="$ss" SIZE=11></TD>!;
+} else {
+  print qq!<TD><INPUT TYPE="hidden" NAME="ss" VALUE="$ss"></TD>!;
+}
+
 print <<END;
-</TD><TD ALIGN="right">SS#</TD><TD><INPUT TYPE="text" NAME="ss" VALUE="$ss" SIZE=11></TD></TR>
+</TR>
 <TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="company" VALUE="$company" SIZE=70></TD></TR>
 <TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=70></TD></TR>
 <TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=70></TD></TR>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index dc4760d73..946fc63e4 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: cust_main.cgi,v 1.20 2002-02-07 22:29:35 ivan Exp $ -->
+<!-- $Id: cust_main.cgi,v 1.21 2002-02-10 02:28:28 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
@@ -49,8 +49,12 @@ print '<TD VALIGN="top">';
     '<TR><TD ALIGN="right">Contact name</TD>',
       '<TD COLSPAN=3 BGCOLOR="#ffffff">',
       $cust_main->last, ', ', $cust_main->first,
-      '</TD><TD ALIGN="right">SS#</TD><TD BGCOLOR="#ffffff">',
-      $cust_main->ss || '&nbsp', '</TD></TR>',
+      '</TD>';
+print '<TD ALIGN="right">SS#</TD><TD BGCOLOR="#ffffff">',
+      $cust_main->ss || '&nbsp', '</TD>'
+  if $conf->exists('show_ss');
+
+print '</TR>',
     '<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
       $cust_main->company,
       '</TD></TR>',
-- 
cgit v1.2.1


From 22a35047ecdffff80110e06cc08fc84f9ddba9b0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 13:21:31 +0000
Subject: removed <!-- $Id$ --> from all files to fix any redirects, whew

Mason handler.pl overrides CGI::redirect

fixed strict; problems in edit/part_pkg.cgi & edit/process/part_pkg.cgi
---
 htetc/handler.pl                                   | 23 +++++++++++++++++++---
 httemplate/browse/agent.cgi                        |  1 -
 httemplate/browse/agent_type.cgi                   |  1 -
 httemplate/browse/cust_main_county.cgi             |  1 -
 httemplate/browse/cust_pay_batch.cgi               |  1 -
 httemplate/browse/nas.cgi                          |  1 -
 httemplate/browse/part_bill_event.cgi              |  1 -
 httemplate/browse/part_pkg.cgi                     |  1 -
 httemplate/browse/part_referral.cgi                |  1 -
 httemplate/browse/part_svc.cgi                     |  1 -
 httemplate/browse/queue.cgi                        |  1 -
 httemplate/browse/svc_acct_pop.cgi                 |  1 -
 httemplate/edit/agent.cgi                          |  1 -
 httemplate/edit/agent_type.cgi                     |  1 -
 httemplate/edit/cust_bill_pay.cgi                  |  1 -
 httemplate/edit/cust_credit.cgi                    |  1 -
 httemplate/edit/cust_credit_bill.cgi               |  1 -
 httemplate/edit/cust_main.cgi                      |  1 -
 httemplate/edit/cust_main_county-expand.cgi        |  1 -
 httemplate/edit/cust_main_county.cgi               |  1 -
 httemplate/edit/cust_pay.cgi                       |  1 -
 httemplate/edit/cust_pkg.cgi                       |  1 -
 httemplate/edit/part_bill_event.cgi                |  2 --
 httemplate/edit/part_pkg.cgi                       |  4 +---
 httemplate/edit/part_referral.cgi                  |  1 -
 httemplate/edit/part_svc.cgi                       |  1 -
 httemplate/edit/process/REAL_cust_pkg.cgi          |  1 -
 httemplate/edit/process/agent.cgi                  |  1 -
 httemplate/edit/process/agent_type.cgi             |  1 -
 httemplate/edit/process/cust_bill_pay.cgi          |  1 -
 httemplate/edit/process/cust_credit.cgi            |  1 -
 httemplate/edit/process/cust_credit_bill.cgi       |  1 -
 httemplate/edit/process/cust_main.cgi              |  1 -
 .../edit/process/cust_main_county-collapse.cgi     |  1 -
 .../edit/process/cust_main_county-expand.cgi       |  1 -
 httemplate/edit/process/cust_main_county.cgi       |  1 -
 httemplate/edit/process/cust_pay.cgi               |  1 -
 httemplate/edit/process/cust_pkg.cgi               |  1 -
 httemplate/edit/process/part_pkg.cgi               |  3 +--
 httemplate/edit/process/part_referral.cgi          |  1 -
 httemplate/edit/process/quick-cust_pkg.cgi         |  1 -
 httemplate/edit/process/svc_acct.cgi               |  1 -
 httemplate/edit/process/svc_acct_pop.cgi           |  1 -
 httemplate/edit/process/svc_acct_sm.cgi            |  1 -
 httemplate/edit/process/svc_domain.cgi             |  1 -
 httemplate/edit/process/svc_forward.cgi            |  1 -
 httemplate/edit/svc_acct.cgi                       |  1 -
 httemplate/edit/svc_acct_pop.cgi                   |  1 -
 httemplate/edit/svc_acct_sm.cgi                    |  1 -
 httemplate/edit/svc_domain.cgi                     |  1 -
 httemplate/edit/svc_forward.cgi                    |  1 -
 httemplate/misc/bill.cgi                           |  1 -
 httemplate/misc/cancel-unaudited.cgi               |  2 +-
 httemplate/misc/cancel_pkg.cgi                     |  1 -
 httemplate/misc/catchall.cgi                       |  1 -
 httemplate/misc/delete-cust_pay.cgi                |  1 -
 httemplate/misc/delete-customer.cgi                |  1 -
 httemplate/misc/expire_pkg.cgi                     |  1 -
 httemplate/misc/link.cgi                           |  1 -
 httemplate/misc/print-invoice.cgi                  |  1 -
 httemplate/misc/process/catchall.cgi               |  1 -
 httemplate/misc/process/delete-customer.cgi        |  1 -
 httemplate/misc/process/link.cgi                   |  1 -
 httemplate/misc/susp_pkg.cgi                       |  1 -
 httemplate/misc/unsusp_pkg.cgi                     |  1 -
 httemplate/search/cust_bill.cgi                    |  1 -
 httemplate/search/cust_pay.cgi                     |  1 -
 httemplate/search/cust_pkg.cgi                     |  1 -
 httemplate/search/svc_acct.cgi                     |  1 -
 httemplate/search/svc_acct_sm.cgi                  |  1 -
 httemplate/search/svc_domain.cgi                   |  1 -
 httemplate/view/cust_bill.cgi                      |  1 -
 httemplate/view/cust_main.cgi                      |  1 -
 httemplate/view/cust_pkg.cgi                       |  1 -
 httemplate/view/svc_acct.cgi                       |  1 -
 httemplate/view/svc_acct_sm.cgi                    |  1 -
 httemplate/view/svc_domain.cgi                     |  1 -
 httemplate/view/svc_forward.cgi                    |  1 -
 httemplate/view/svc_www.cgi                        |  1 -
 79 files changed, 23 insertions(+), 85 deletions(-)

diff --git a/htetc/handler.pl b/htetc/handler.pl
index 37f2d3766..5544ebbe8 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -101,6 +101,24 @@ sub handler
       use FS::svc_www;
       use FS::type_pkgs;
 
+      *CGI::redirect = sub {
+        my( $self, $location ) = @_;
+
+        #http://www.masonhq.com/docs/faq/#how_do_i_do_an_external_redirect
+        $m->clear_buffer;
+        # The next two lines are necessary to stop Apache from re-reading
+        # POSTed data.
+        $r->method('GET');
+        $r->headers_in->unset('Content-length');
+        $r->content_type('text/html');
+        $r->err_header_out('Location' => $location);
+         $r->header_out('Content-Type' => 'text/html');
+         $m->abort(302);
+
+        '';
+    
+      };
+
       $cgi = new CGI;
       &cgisuidsetup($cgi);
       #&cgisuidsetup($r);
@@ -114,9 +132,8 @@ sub handler
     #$r->no_cache(1);
     $headers->{'Expires'} = '0';
     
-    my $status = $ah->handle_request($r);
-    
-    return $status;
+    $ah->handle_request($r);
+
 }
 
 1;
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 067a06b30..8079c722b 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: agent.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 #Begin silliness
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index d75c45081..ba74e0d4c 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: agent_type.cgi,v 1.8 2002-02-07 22:29:34 ivan Exp $ -->
 <%
 
 print header("Agent Type Listing", menubar(
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index 89b1bfd71..7273dd043 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main_county.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 print header("Tax Rate Listing", menubar(
diff --git a/httemplate/browse/cust_pay_batch.cgi b/httemplate/browse/cust_pay_batch.cgi
index 960843adf..220296724 100755
--- a/httemplate/browse/cust_pay_batch.cgi
+++ b/httemplate/browse/cust_pay_batch.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pay_batch.cgi,v 1.2 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 print header("Pending credit card batch", menubar(
diff --git a/httemplate/browse/nas.cgi b/httemplate/browse/nas.cgi
index 2bac9909f..f1057ced1 100755
--- a/httemplate/browse/nas.cgi
+++ b/httemplate/browse/nas.cgi
@@ -1,4 +1,3 @@
-<!-- $Id -->
 <%
 
 print header('NAS ports', menubar(
diff --git a/httemplate/browse/part_bill_event.cgi b/httemplate/browse/part_bill_event.cgi
index 81228f2ea..d850ae556 100755
--- a/httemplate/browse/part_bill_event.cgi
+++ b/httemplate/browse/part_bill_event.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_bill_event.cgi,v 1.4 2002-02-10 02:16:46 ivan Exp $ -->
 <% 
 
 my %search;
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 22d139c99..03326d039 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_pkg.cgi,v 1.10 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my %search;
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index 82f42924f..3ca36b244 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_referral.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 print header("Referral Listing", menubar(
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 54d4b083b..5bfb80343 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_svc.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <% 
 
 my %search;
diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index af8989b82..e38e40ba3 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: queue.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 print header("Job Queue", menubar(
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index a881b9a00..c6a661a98 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct_pop.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 print header('POP Listing', menubar(
diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index f3864e6c2..25e4765ba 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: agent.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $agent;
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index c3ff30ff6..8b729201d 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: agent_type.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my($agent_type);
diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
index fd56b328a..bfa2b3baf 100755
--- a/httemplate/edit/cust_bill_pay.cgi
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_bill_pay.cgi,v 1.5 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my($paynum, $amount, $invnum);
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index 7c8a80c22..316226500 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_credit.cgi,v 1.8 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index 3748202a5..7528d85fc 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_credit_bill.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my($crednum, $amount, $invnum);
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 5be6a3579..a0472bdf5 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main.cgi,v 1.20 2002-02-10 02:28:27 ivan Exp $ -->
 <%
 
   #for misplaced logic below
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index 092a2d068..05bfa6f0e 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main_county-expand.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my($taxnum, $delim, $expansion );
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index 69def0468..19368857c 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main_county.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 print header("Edit tax rates", menubar(
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 2794e2218..6738dcd38 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pay.cgi,v 1.11 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index c11a194b2..7fb88c3ce 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pkg.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my %pkg = ();
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 580e46734..25d9bc0ff 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -1,5 +1,3 @@
-<!-- $Id: part_bill_event.cgi,v 1.5 2002-02-04 17:04:33 ivan Exp $ -->
-
 <%
 
 if ( $cgi->param('eventpart') && $cgi->param('eventpart') =~ /^(\d+)$/ ) {
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index bead1410a..a98179e12 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,5 +1,3 @@
-<!-- $Id: part_pkg.cgi,v 1.10 2002-02-10 02:16:47 ivan Exp $ -->
-
 <%
 
 if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
@@ -417,7 +415,7 @@ if ( $cgi->param('pkgnum') ) {
        <INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= exists($plandata{$field}) ? $plandata{$field} : $href->{$field}{'default'} %>" onChange="fchanged(this)">
   <% } elsif ( $href->{$field}{'type'} eq 'select_multiple' ) { %>
        <SELECT MULTIPLE NAME="<%= $field %>" onChange="fchanged(this)">
-       <% foreach $record ( qsearch( $href->{$field}{'select_table'}, $href->{$field}{'select_hash'} ) ) {
+       <% foreach my $record ( qsearch( $href->{$field}{'select_table'}, $href->{$field}{'select_hash'} ) ) {
           my $value = $record->getfield($href->{$field}{'select_key'}); %>
          <OPTION VALUE="<%= $value %>"<%= $plandata{$field} =~ /(^|, *)$value *(,|$)/ ? ' SELECTED' : '' %>><%= $record->getfield($href->{$field}{'select_label'}) %>
        <% } %>
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index 18f6aa938..22277ce71 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_referral.cgi,v 1.5 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $part_referral;
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 39f49e14c..91995674a 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_svc.cgi,v 1.14 2002-01-30 14:18:08 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
diff --git a/httemplate/edit/process/REAL_cust_pkg.cgi b/httemplate/edit/process/REAL_cust_pkg.cgi
index 4f33f6b38..6bed85c19 100755
--- a/httemplate/edit/process/REAL_cust_pkg.cgi
+++ b/httemplate/edit/process/REAL_cust_pkg.cgi
@@ -1,5 +1,4 @@
 <%
-#<!-- $Id: REAL_cust_pkg.cgi,v 1.1 2001-10-15 14:58:03 ivan Exp $ -->
 
 my $pkgnum = $cgi->param('pkgnum') or die;
 my $old = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
diff --git a/httemplate/edit/process/agent.cgi b/httemplate/edit/process/agent.cgi
index 93ce4f9f2..182eeab41 100755
--- a/httemplate/edit/process/agent.cgi
+++ b/httemplate/edit/process/agent.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: agent.cgi,v 1.3 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $agentnum = $cgi->param('agentnum');
diff --git a/httemplate/edit/process/agent_type.cgi b/httemplate/edit/process/agent_type.cgi
index 4e98cf113..67aacfdd5 100755
--- a/httemplate/edit/process/agent_type.cgi
+++ b/httemplate/edit/process/agent_type.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: agent_type.cgi,v 1.4 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 my $typenum = $cgi->param('typenum');
diff --git a/httemplate/edit/process/cust_bill_pay.cgi b/httemplate/edit/process/cust_bill_pay.cgi
index 16d30bd4c..0c33506a8 100755
--- a/httemplate/edit/process/cust_bill_pay.cgi
+++ b/httemplate/edit/process/cust_bill_pay.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_bill_pay.cgi,v 1.2 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 $cgi->param('paynum') =~ /^(\d*)$/ or die "Illegal paynum!";
diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
index 51fca74e3..ac92631f8 100755
--- a/httemplate/edit/process/cust_credit.cgi
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_credit.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 $cgi->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
diff --git a/httemplate/edit/process/cust_credit_bill.cgi b/httemplate/edit/process/cust_credit_bill.cgi
index afe297308..4879b0eab 100755
--- a/httemplate/edit/process/cust_credit_bill.cgi
+++ b/httemplate/edit/process/cust_credit_bill.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_credit_bill.cgi,v 1.3 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 $cgi->param('crednum') =~ /^(\d*)$/ or die "Illegal crednum!";
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index fa50dc626..c8038ecf6 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $error = '';
diff --git a/httemplate/edit/process/cust_main_county-collapse.cgi b/httemplate/edit/process/cust_main_county-collapse.cgi
index 4888b781f..8e67140a8 100755
--- a/httemplate/edit/process/cust_main_county-collapse.cgi
+++ b/httemplate/edit/process/cust_main_county-collapse.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main_county-collapse.cgi,v 1.2 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my($query) = $cgi->keywords;
diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
index 342779048..64061deed 100755
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main_county-expand.cgi,v 1.5 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 $cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
index e9d130897..0800789b5 100755
--- a/httemplate/edit/process/cust_main_county.cgi
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main_county.cgi,v 1.4 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 foreach ( $cgi->param ) {
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index 953ff3edb..82442ae00 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pay.cgi,v 1.7 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 $cgi->param('linknum') =~ /^(\d+)$/
diff --git a/httemplate/edit/process/cust_pkg.cgi b/httemplate/edit/process/cust_pkg.cgi
index 25b320150..f8c9f5151 100755
--- a/httemplate/edit/process/cust_pkg.cgi
+++ b/httemplate/edit/process/cust_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pkg.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $error = '';
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 9ad1527a1..d489426f9 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_pkg.cgi,v 1.9 2002-02-10 02:16:47 ivan Exp $ -->
 <%
 
 my $dbh = dbh;
@@ -61,7 +60,7 @@ if ( $error ) {
   myexit();
 }
 
-foreach $part_svc (qsearch('part_svc',{})) {
+foreach my $part_svc (qsearch('part_svc',{})) {
   my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
   my $old_pkg_svc = qsearchs('pkg_svc', {
     'pkgpart' => $pkgpart,
diff --git a/httemplate/edit/process/part_referral.cgi b/httemplate/edit/process/part_referral.cgi
index 7e37db855..fd2c01506 100755
--- a/httemplate/edit/process/part_referral.cgi
+++ b/httemplate/edit/process/part_referral.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_referral.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $refnum = $cgi->param('refnum');
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 29a954cc9..5a4fb7797 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: quick-cust_pkg.cgi,v 1.4 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 #untaint custnum
diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi
index 178d7d85a..5e8a16f4a 100755
--- a/httemplate/edit/process/svc_acct.cgi
+++ b/httemplate/edit/process/svc_acct.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
diff --git a/httemplate/edit/process/svc_acct_pop.cgi b/httemplate/edit/process/svc_acct_pop.cgi
index 5d699f2f5..46ad74d62 100755
--- a/httemplate/edit/process/svc_acct_pop.cgi
+++ b/httemplate/edit/process/svc_acct_pop.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct_pop.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $popnum = $cgi->param('popnum');
diff --git a/httemplate/edit/process/svc_acct_sm.cgi b/httemplate/edit/process/svc_acct_sm.cgi
index 25cd88d5a..41d03fb92 100755
--- a/httemplate/edit/process/svc_acct_sm.cgi
+++ b/httemplate/edit/process/svc_acct_sm.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct_sm.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
diff --git a/httemplate/edit/process/svc_domain.cgi b/httemplate/edit/process/svc_domain.cgi
index 0b7ec4928..19f8eb4f8 100755
--- a/httemplate/edit/process/svc_domain.cgi
+++ b/httemplate/edit/process/svc_domain.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_domain.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 #remove this to actually test the domains!
diff --git a/httemplate/edit/process/svc_forward.cgi b/httemplate/edit/process/svc_forward.cgi
index 5f0247fe5..bb066d8a6 100755
--- a/httemplate/edit/process/svc_forward.cgi
+++ b/httemplate/edit/process/svc_forward.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_forward.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 681d8b5d9..fed39e7bc 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct.cgi,v 1.14 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
index c984ef9e8..97d42f5be 100755
--- a/httemplate/edit/svc_acct_pop.cgi
+++ b/httemplate/edit/svc_acct_pop.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct_pop.cgi,v 1.5 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $svc_acct_pop;
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index 62a041da9..0cb27b864 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct_sm.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index 57ee941f9..671a12db7 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_domain.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my($svcnum, $pkgnum, $svcpart, $kludge_action, $purpose, $part_svc,
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index cda577b76..88558ca90 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_forward.cgi,v 1.8 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/misc/bill.cgi b/httemplate/misc/bill.cgi
index 731309585..8c21fe1bb 100755
--- a/httemplate/misc/bill.cgi
+++ b/httemplate/misc/bill.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: bill.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 #untaint custnum
diff --git a/httemplate/misc/cancel-unaudited.cgi b/httemplate/misc/cancel-unaudited.cgi
index 3e2bd07db..a73b2ce97 100755
--- a/httemplate/misc/cancel-unaudited.cgi
+++ b/httemplate/misc/cancel-unaudited.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: cancel-unaudited.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
+<%
 
 my $dbh = dbh;
  
diff --git a/httemplate/misc/cancel_pkg.cgi b/httemplate/misc/cancel_pkg.cgi
index 1513ef05e..0487677df 100755
--- a/httemplate/misc/cancel_pkg.cgi
+++ b/httemplate/misc/cancel_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cancel_pkg.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 #untaint pkgnum
diff --git a/httemplate/misc/catchall.cgi b/httemplate/misc/catchall.cgi
index a8d865780..cc4adb88a 100755
--- a/httemplate/misc/catchall.cgi
+++ b/httemplate/misc/catchall.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: catchall.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/misc/delete-cust_pay.cgi b/httemplate/misc/delete-cust_pay.cgi
index 3fb786d7d..3efd918ab 100755
--- a/httemplate/misc/delete-cust_pay.cgi
+++ b/httemplate/misc/delete-cust_pay.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: delete-cust_pay.cgi,v 1.1 2002-02-07 22:29:35 ivan Exp $ -->
 <%
 
 #untaint paynum
diff --git a/httemplate/misc/delete-customer.cgi b/httemplate/misc/delete-customer.cgi
index 18f6e8529..0ed3d0194 100755
--- a/httemplate/misc/delete-customer.cgi
+++ b/httemplate/misc/delete-customer.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: delete-customer.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/misc/expire_pkg.cgi b/httemplate/misc/expire_pkg.cgi
index 739fb517f..9e4ce8b62 100755
--- a/httemplate/misc/expire_pkg.cgi
+++ b/httemplate/misc/expire_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: expire_pkg.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 #untaint date & pkgnum
diff --git a/httemplate/misc/link.cgi b/httemplate/misc/link.cgi
index 3bcb5d978..81e1bc448 100755
--- a/httemplate/misc/link.cgi
+++ b/httemplate/misc/link.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: link.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my %link_field = (
diff --git a/httemplate/misc/print-invoice.cgi b/httemplate/misc/print-invoice.cgi
index aec7cb39c..a5500bff2 100755
--- a/httemplate/misc/print-invoice.cgi
+++ b/httemplate/misc/print-invoice.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: print-invoice.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/misc/process/catchall.cgi b/httemplate/misc/process/catchall.cgi
index cf6f8d751..44a63f9f8 100755
--- a/httemplate/misc/process/catchall.cgi
+++ b/httemplate/misc/process/catchall.cgi
@@ -1,4 +1,3 @@
-<!--$Id: catchall.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 $FS::svc_domain::whois_hack=1;
diff --git a/httemplate/misc/process/delete-customer.cgi b/httemplate/misc/process/delete-customer.cgi
index 6f26c8107..16bdbaea8 100755
--- a/httemplate/misc/process/delete-customer.cgi
+++ b/httemplate/misc/process/delete-customer.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: delete-customer.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
index f8b7812e1..af96c0bcd 100755
--- a/httemplate/misc/process/link.cgi
+++ b/httemplate/misc/process/link.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: link.cgi,v 1.4 2002-02-09 17:45:26 ivan Exp $ -->
 <%
 
 $cgi->param('pkgnum') =~ /^(\d+)$/;
diff --git a/httemplate/misc/susp_pkg.cgi b/httemplate/misc/susp_pkg.cgi
index efc2f9bba..4a19fa830 100755
--- a/httemplate/misc/susp_pkg.cgi
+++ b/httemplate/misc/susp_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: susp_pkg.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 #untaint pkgnum
diff --git a/httemplate/misc/unsusp_pkg.cgi b/httemplate/misc/unsusp_pkg.cgi
index 00f3a08b3..500872983 100755
--- a/httemplate/misc/unsusp_pkg.cgi
+++ b/httemplate/misc/unsusp_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: unsusp_pkg.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 #untaint pkgnum
diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 755745fde..0c9f27f42 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_bill.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my(@cust_bill, $sortby);
diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi
index 715e63e24..8ebd65413 100755
--- a/httemplate/search/cust_pay.cgi
+++ b/httemplate/search/cust_pay.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pay.cgi,v 1.2 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 $cgi->param('payinfo') =~ /^\s*(\d+)\s*$/ or die "illegal payinfo";
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index b2199e9dc..6b25fec03 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pkg.cgi,v 1.14 2002-02-09 18:24:02 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 8d5329618..a3fed8384 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct.cgi,v 1.13 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $mydomain = '';
diff --git a/httemplate/search/svc_acct_sm.cgi b/httemplate/search/svc_acct_sm.cgi
index 1f1f770be..bcfe44cfc 100755
--- a/httemplate/search/svc_acct_sm.cgi
+++ b/httemplate/search/svc_acct_sm.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct_sm.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index c274750aa..334b6c0b7 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_domain.cgi,v 1.7 2002-02-09 18:24:02 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 5860ffd11..da79d79e4 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_bill.cgi,v 1.8 2002-02-10 02:16:47 ivan Exp $ -->
 <%
 
 #untaint invnum
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 946fc63e4..bc76301d4 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main.cgi,v 1.21 2002-02-10 02:28:28 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index 0e6773713..3cf908386 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pkg.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my %uiview = ();
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index a4e377078..31327a625 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct.cgi,v 1.10 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/view/svc_acct_sm.cgi b/httemplate/view/svc_acct_sm.cgi
index c8561caba..ccb81f178 100755
--- a/httemplate/view/svc_acct_sm.cgi
+++ b/httemplate/view/svc_acct_sm.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct_sm.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index c980b1c25..f4aa42bbc 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_domain.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my($query) = $cgi->keywords;
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index fc465dbab..a5096e92c 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_forward.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index bc605be24..2fc8ac459 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_www.cgi,v 1.2 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my($query) = $cgi->keywords;
-- 
cgit v1.2.1


From a4c96748eb6eab29a70f3a944c6520283a635c78 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 16:05:22 +0000
Subject: *finally* seems to be working under Mason.  sheesh. *finally* seems
 to be working under Mason.  sheesh. *finally* seems to be working under
 Mason.  sheesh. *finally* seems to be working under Mason.  sheesh. *finally*
 seems to be working under Mason.  sheesh. *finally* seems to be working under
 Mason.  sheesh. *finally* seems to be working under Mason.  sheesh. *finally*
 seems to be working under Mason.  sheesh.

---
 htetc/handler.pl                            | 16 +++++++++++-----
 httemplate/browse/agent.cgi                 |  1 +
 httemplate/browse/agent_type.cgi            |  1 +
 httemplate/browse/cust_main_county.cgi      |  1 +
 httemplate/browse/cust_pay_batch.cgi        |  1 +
 httemplate/browse/nas.cgi                   |  1 +
 httemplate/browse/part_bill_event.cgi       |  1 +
 httemplate/browse/part_pkg.cgi              |  1 +
 httemplate/browse/part_referral.cgi         |  1 +
 httemplate/browse/part_svc.cgi              |  1 +
 httemplate/browse/queue.cgi                 |  1 +
 httemplate/browse/svc_acct_pop.cgi          |  1 +
 httemplate/config/config-process.cgi        |  1 -
 httemplate/config/config-view.cgi           |  1 +
 httemplate/config/config.cgi                |  1 +
 httemplate/edit/REAL_cust_pkg.cgi           |  3 ++-
 httemplate/edit/agent.cgi                   |  1 +
 httemplate/edit/agent_type.cgi              |  1 +
 httemplate/edit/cust_bill_pay.cgi           |  1 +
 httemplate/edit/cust_credit.cgi             |  1 +
 httemplate/edit/cust_credit_bill.cgi        |  1 +
 httemplate/edit/cust_main.cgi               |  1 +
 httemplate/edit/cust_main_county-expand.cgi |  1 +
 httemplate/edit/cust_main_county.cgi        |  1 +
 httemplate/edit/cust_pay.cgi                |  1 +
 httemplate/edit/cust_pkg.cgi                |  1 +
 httemplate/edit/part_bill_event.cgi         |  1 +
 httemplate/edit/part_pkg.cgi                |  1 +
 httemplate/edit/part_referral.cgi           |  1 +
 httemplate/edit/part_svc.cgi                |  1 +
 httemplate/edit/process/quick-cust_pkg.cgi  |  3 +++
 httemplate/edit/svc_acct.cgi                |  1 +
 httemplate/edit/svc_acct_pop.cgi            |  1 +
 httemplate/edit/svc_acct_sm.cgi             |  1 +
 httemplate/edit/svc_domain.cgi              |  1 +
 httemplate/edit/svc_forward.cgi             |  1 +
 httemplate/misc/bill.cgi                    |  3 +++
 httemplate/misc/cancel-unaudited.cgi        | 15 +++++++++------
 httemplate/misc/catchall.cgi                |  1 +
 httemplate/misc/delete-customer.cgi         |  1 +
 httemplate/misc/link.cgi                    |  1 +
 httemplate/misc/process/link.cgi            |  3 +++
 httemplate/search/cust_bill.cgi             |  6 ++++++
 httemplate/search/cust_main.cgi             |  6 ++++++
 httemplate/search/cust_pay.cgi              |  6 ++++++
 httemplate/search/cust_pkg.cgi              |  6 ++++++
 httemplate/search/svc_acct.cgi              |  6 ++++++
 httemplate/search/svc_acct_sm.cgi           |  3 +++
 httemplate/search/svc_domain.cgi            |  7 ++++++-
 httemplate/view/cust_bill.cgi               |  1 +
 httemplate/view/cust_main.cgi               |  1 +
 httemplate/view/cust_pkg.cgi                |  1 +
 httemplate/view/svc_acct.cgi                |  1 +
 httemplate/view/svc_acct_sm.cgi             |  1 +
 httemplate/view/svc_domain.cgi              |  1 +
 httemplate/view/svc_forward.cgi             |  1 +
 httemplate/view/svc_www.cgi                 |  1 +
 57 files changed, 113 insertions(+), 14 deletions(-)

diff --git a/htetc/handler.pl b/htetc/handler.pl
index 5544ebbe8..cac90044d 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -34,7 +34,9 @@ my $interp = new HTML::Mason::Interp (parser=>$parser,
                                       data_dir=>'/home/ivan/freeside_current/masondata',
                                       out_mode=>'stream',
                                      );
-my $ah = new HTML::Mason::ApacheHandler (interp=>$interp);
+my $ah = new HTML::Mason::ApacheHandler ( interp => $interp,
+                                          #auto_send_headers => 0,
+                                        );
 
 # Activate the following if running httpd as root (the normal case).
 # Resets ownership of all files created by Mason at startup.
@@ -111,12 +113,12 @@ sub handler
         $r->method('GET');
         $r->headers_in->unset('Content-length');
         $r->content_type('text/html');
-        $r->err_header_out('Location' => $location);
+        #$r->err_header_out('Location' => $location);
+        $r->header_out('Location' => $location);
          $r->header_out('Content-Type' => 'text/html');
          $m->abort(302);
 
         '';
-    
       };
 
       $cgi = new CGI;
@@ -124,6 +126,7 @@ sub handler
       #&cgisuidsetup($r);
       $p = popurl(2);
     }
+
     $r->content_type('text/html');
     #eorar
 
@@ -131,9 +134,12 @@ sub handler
     $headers->{'Pragma'} = $headers->{'Cache-control'} = 'no-cache';
     #$r->no_cache(1);
     $headers->{'Expires'} = '0';
-    
-    $ah->handle_request($r);
 
+#    $r->send_http_header;
+
+    my $status = $ah->handle_request($r);
+
+    $status;
 }
 
 1;
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 8079c722b..ebec068fa 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 #Begin silliness
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index ba74e0d4c..eb20c6404 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 print header("Agent Type Listing", menubar(
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index 7273dd043..8fbd7faad 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 print header("Tax Rate Listing", menubar(
diff --git a/httemplate/browse/cust_pay_batch.cgi b/httemplate/browse/cust_pay_batch.cgi
index 220296724..608a58d0d 100755
--- a/httemplate/browse/cust_pay_batch.cgi
+++ b/httemplate/browse/cust_pay_batch.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 print header("Pending credit card batch", menubar(
diff --git a/httemplate/browse/nas.cgi b/httemplate/browse/nas.cgi
index f1057ced1..9ccbfe632 100755
--- a/httemplate/browse/nas.cgi
+++ b/httemplate/browse/nas.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 print header('NAS ports', menubar(
diff --git a/httemplate/browse/part_bill_event.cgi b/httemplate/browse/part_bill_event.cgi
index d850ae556..1d674f749 100755
--- a/httemplate/browse/part_bill_event.cgi
+++ b/httemplate/browse/part_bill_event.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <% 
 
 my %search;
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 03326d039..0af64e737 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my %search;
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index 3ca36b244..76cc22659 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 print header("Referral Listing", menubar(
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 5bfb80343..4590dc8b5 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <% 
 
 my %search;
diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index e38e40ba3..7fce1f5df 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 print header("Job Queue", menubar(
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index c6a661a98..f3b2966a6 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 print header('POP Listing', menubar(
diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
index 690512977..50f0d34ff 100644
--- a/httemplate/config/config-process.cgi
+++ b/httemplate/config/config-process.cgi
@@ -43,4 +43,3 @@
 
 %>
 <%= $cgi->redirect("config-view.cgi") %>
-
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 4b6684980..b041adaed 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%= header('View Configuration', menubar( 'Main Menu' => $p,
                                      'Edit Configuration' => 'config.cgi' ) ) %>
 
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 56da0698a..b9e84a8d5 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%= header('Edit Configuration', menubar( 'Main Menu' => $p ) ) %>
 
 <% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index 8ea0e084d..abfaac3fc 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -1,5 +1,6 @@
+<!-- mason kludge -->
 <%
-# <!-- $Id: REAL_cust_pkg.cgi,v 1.1 2001-10-15 14:58:03 ivan Exp $ -->
+# <!-- $Id: REAL_cust_pkg.cgi,v 1.2 2002-02-10 16:05:22 ivan Exp $ -->
 
 my $error ='';
 my $pkgnum = '';
diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index 25e4765ba..3fca34326 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $agent;
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 8b729201d..4a4cd9a47 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my($agent_type);
diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
index bfa2b3baf..d90659724 100755
--- a/httemplate/edit/cust_bill_pay.cgi
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my($paynum, $amount, $invnum);
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index 316226500..aae0df2fc 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index 7528d85fc..1a97e1312 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my($crednum, $amount, $invnum);
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index a0472bdf5..41643a37f 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
   #for misplaced logic below
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index 05bfa6f0e..66e8aaf9e 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my($taxnum, $delim, $expansion );
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index 19368857c..a11711770 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 print header("Edit tax rates", menubar(
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 6738dcd38..27d36eb54 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index 7fb88c3ce..d546f7409 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my %pkg = ();
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 25d9bc0ff..40016433d 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 if ( $cgi->param('eventpart') && $cgi->param('eventpart') =~ /^(\d+)$/ ) {
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index a98179e12..d32702668 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index 22277ce71..73be9e337 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $part_referral;
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 91995674a..63ec1dce1 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 5a4fb7797..c663dce32 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -12,6 +12,9 @@ my @cust_pkg = ();
 my $error = FS::cust_pkg::order($custnum, [ $pkgpart ], [], \@cust_pkg, );
 
 if ($error) {
+%>
+<!-- mason kludge -->
+<%
   eidiot($error);
 } else {
   print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?". $cust_pkg[0]->pkgnum );
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index fed39e7bc..73ecdd98d 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
index 97d42f5be..5db48a3f7 100755
--- a/httemplate/edit/svc_acct_pop.cgi
+++ b/httemplate/edit/svc_acct_pop.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $svc_acct_pop;
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index 0cb27b864..0fd5f7622 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index 671a12db7..d20e1f336 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my($svcnum, $pkgnum, $svcpart, $kludge_action, $purpose, $part_svc,
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 88558ca90..5f1466bbb 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/misc/bill.cgi b/httemplate/misc/bill.cgi
index 8c21fe1bb..6f523a52c 100755
--- a/httemplate/misc/bill.cgi
+++ b/httemplate/misc/bill.cgi
@@ -26,6 +26,9 @@ unless ( $error ) {
 #&eidiot($error) if $error;
 
 if ( $error ) {
+%>
+<!-- mason kludge -->
+<%
   &idiot($error);
 } else {
   print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum");
diff --git a/httemplate/misc/cancel-unaudited.cgi b/httemplate/misc/cancel-unaudited.cgi
index a73b2ce97..5d3c87316 100755
--- a/httemplate/misc/cancel-unaudited.cgi
+++ b/httemplate/misc/cancel-unaudited.cgi
@@ -30,15 +30,18 @@ $error = $svc_acct->delete;
 &myeidiot($error) if $error;
 
 $error = $cust_svc->delete;
-&myeidiot($error) if $error;
-
-$dbh->commit or die $dbh->errstr;
-
-print $cgi->redirect(popurl(2));
 
-sub myeidiot {
+if ( $error ) {
   $dbh->rollback;
+  %>
+<!-- mason kludge -->
+<%
   &eidiot(@_);
+} else {
+
+  $dbh->commit or die $dbh->errstr;
+
+  print $cgi->redirect(popurl(2));
 }
 
 %>
diff --git a/httemplate/misc/catchall.cgi b/httemplate/misc/catchall.cgi
index cc4adb88a..9aa84be18 100755
--- a/httemplate/misc/catchall.cgi
+++ b/httemplate/misc/catchall.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/misc/delete-customer.cgi b/httemplate/misc/delete-customer.cgi
index 0ed3d0194..5088fef7b 100755
--- a/httemplate/misc/delete-customer.cgi
+++ b/httemplate/misc/delete-customer.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/misc/link.cgi b/httemplate/misc/link.cgi
index 81e1bc448..efc762cc5 100755
--- a/httemplate/misc/link.cgi
+++ b/httemplate/misc/link.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my %link_field = (
diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
index af96c0bcd..4b220a867 100755
--- a/httemplate/misc/process/link.cgi
+++ b/httemplate/misc/process/link.cgi
@@ -31,6 +31,9 @@ unless ($error) {
   #no errors, so let's view this customer.
   print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?$pkgnum");
 } else {
+%>
+<!-- mason kludge -->
+<%
   idiot($error);
 }
 
diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 0c9f27f42..d83851804 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -50,8 +50,14 @@ if ( scalar(@cust_bill) == 1 ) {
   my $invnum = $cust_bill[0]->invnum;
   print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
 } elsif ( scalar(@cust_bill) == 0 ) {
+%>
+<!-- mason kludge -->
+<%
   eidiot("Invoice not found.");
 } else {
+%>
+<!-- mason kludge -->
+<%
   my $total = scalar(@cust_bill);
   print header("Invoice Search Results", menubar(
           'Main Menu', popurl(2)
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 89e325d09..b962c7c42 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -152,8 +152,14 @@ if ( scalar(@cust_main) == 1 && ! $cgi->param('referral_custnum') ) {
   }
   #exit;
 } elsif ( scalar(@cust_main) == 0 ) {
+%>
+<!-- mason kludge -->
+<%
   eidiot "No matching customers found!\n";
 } else { 
+%>
+<!-- mason kludge -->
+<%
 
   $total ||= scalar(@cust_main);
   print header("Customer Search Results",menubar(
diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi
index 8ebd65413..b5bdf8296 100755
--- a/httemplate/search/cust_pay.cgi
+++ b/httemplate/search/cust_pay.cgi
@@ -13,11 +13,17 @@ if (0) {
 #  my $invnum = $cust_bill[0]->invnum;
 #  print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
 } elsif ( scalar(@cust_pay) == 0 ) {
+%>
+<!-- mason kludge -->
+<%
   idiot("Check # not found.");
   #exit;
 } else {
   my $total = scalar(@cust_pay);
   my $s = $total > 1 ? 's' : '';
+%>
+<!-- mason kludge -->
+<%
   print header("Check # Search Results", menubar(
           'Main Menu', popurl(2)
         )), "$total matching check$s found<BR>", &table(), <<END;
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 6b25fec03..54e02ce9d 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -77,8 +77,14 @@ if ( scalar(@cust_pkg) == 1 ) {
   print $cgi->redirect(popurl(2). "view/cust_pkg.cgi?$pkgnum");
   #exit;
 } elsif ( scalar(@cust_pkg) == 0 ) { #error
+%>
+<!-- mason kludge -->
+<%
   eidiot("No packages found");
 } else {
+%>
+<!-- mason kludge -->
+<%
   $total ||= scalar(@cust_pkg);
 
   #begin pager
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index a3fed8384..0918275d7 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -63,8 +63,14 @@ if ( scalar(@svc_acct) == 1 ) {
   print $cgi->redirect(popurl(2). "view/svc_acct.cgi?$svcnum");  #redirect
   #exit;
 } elsif ( scalar(@svc_acct) == 0 ) { #error
+%>
+<!-- mason kludge -->
+<%
   idiot("Account not found");
 } else {
+%>
+<!-- mason kludge -->
+<%
   $total ||= scalar(@svc_acct);
 
   #begin pager
diff --git a/httemplate/search/svc_acct_sm.cgi b/httemplate/search/svc_acct_sm.cgi
index bcfe44cfc..4ee300612 100755
--- a/httemplate/search/svc_acct_sm.cgi
+++ b/httemplate/search/svc_acct_sm.cgi
@@ -25,6 +25,9 @@ if ( scalar(@svc_acct_sm) == 1 ) {
   my($svcnum)=$svc_acct_sm[0]->svcnum;
   print $cgi->redirect(popurl(2). "view/svc_acct_sm.cgi?$svcnum");
 } elsif ( scalar(@svc_acct_sm) > 1 ) {
+%>
+<!-- mason kludge -->
+<%
   print header('Mail Alias Search Results'), &table(), <<END;
       <TR>
         <TH>Mail to<BR><FONT SIZE=-1>(click to view mail alias)</FONT></TH>
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index 334b6c0b7..fb372db14 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -35,9 +35,14 @@ if ( scalar(@svc_domain) == 1 ) {
   print $cgi->redirect(popurl(2). "view/svc_domain.cgi?". $svc_domain[0]->svcnum);
   #exit;
 } elsif ( scalar(@svc_domain) == 0 ) {
+%>
+<!-- mason kludge -->
+<%
   eidiot "No matching domains found!\n";
 } else {
-
+%>
+<!-- mason kludge -->
+<%
   my($total)=scalar(@svc_domain);
   print header("Domain Search Results",''), <<END;
 
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index da79d79e4..7c2af06a7 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 #untaint invnum
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index bc76301d4..90299e4dd 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index 3cf908386..e9670cd22 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my %uiview = ();
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 31327a625..90ca1a240 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/view/svc_acct_sm.cgi b/httemplate/view/svc_acct_sm.cgi
index ccb81f178..4e5acc427 100755
--- a/httemplate/view/svc_acct_sm.cgi
+++ b/httemplate/view/svc_acct_sm.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index f4aa42bbc..f30211098 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my($query) = $cgi->keywords;
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index a5096e92c..cafb9e5b8 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index 2fc8ac459..bd8ae36a6 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my($query) = $cgi->keywords;
-- 
cgit v1.2.1


From 1eb7fd4c48cadb7a6c8e45c561cd16e01279a56a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 16:14:50 +0000
Subject: s/POP/Access Number/ in the webui

---
 Makefile                           | 4 ++--
 httemplate/browse/svc_acct_pop.cgi | 4 ++--
 httemplate/edit/svc_acct_pop.cgi   | 6 +++---
 httemplate/index.html              | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 283981a87..dd134ebfc 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-TEMPLATE = asp
-#TEMPLATE = mason
+#TEMPLATE = asp
+TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index f3b2966a6..fb42aa7e6 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -1,7 +1,7 @@
 <!-- mason kludge -->
 <%
 
-print header('POP Listing', menubar(
+print header('Access Number Listing', menubar(
   'Main Menu' => $p,
 )), "Points of Presence<BR><BR>", &table(), <<END;
       <TR>
@@ -41,7 +41,7 @@ END
 
 print <<END;
       <TR>
-        <TD COLSPAN=5><A HREF="${p}edit/svc_acct_pop.cgi"><I>Add new POP</I></A></TD>
+        <TD COLSPAN=5><A HREF="${p}edit/svc_acct_pop.cgi"><I>Add new Access Number</I></A></TD>
       </TR>
     </TABLE>
     </CENTER>
diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
index 5db48a3f7..399502a70 100755
--- a/httemplate/edit/svc_acct_pop.cgi
+++ b/httemplate/edit/svc_acct_pop.cgi
@@ -17,9 +17,9 @@ my $action = $svc_acct_pop->popnum ? 'Edit' : 'Add';
 my $hashref = $svc_acct_pop->hashref;
 
 my $p1 = popurl(1);
-print header("$action POP", menubar(
+print header("$action Access Number", menubar(
   'Main Menu' => popurl(2),
-  'View all POPs' => popurl(2). "browse/svc_acct_pop.cgi",
+  'View all Access Numbers' => popurl(2). "browse/svc_acct_pop.cgi",
 ));
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
@@ -44,7 +44,7 @@ Local     <INPUT TYPE="text" NAME="loc" SIZE=5 MAXLENGTH=4 VALUE="$hashref->{loc
 END
 
 print qq!<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{popnum} ? "Apply changes" : "Add POP",
+      $hashref->{popnum} ? "Apply changes" : "Add Access Number",
       qq!">!;
 
 print <<END;
diff --git a/httemplate/index.html b/httemplate/index.html
index 35ba8e85e..99bfeecec 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -91,7 +91,7 @@
           <LI><A HREF="browse/cust_main_county.cgi">View/Edit locales and tax rates</A>
             - Change tax rates, or break down a country into states, or a state
               into counties and assign different tax rates to each.
-          <LI><A HREF="browse/svc_acct_pop.cgi">View/Edit POPs</A>
+          <LI><A HREF="browse/svc_acct_pop.cgi">View/Edit Access Numbers</A>
             - Points of Presence 
           <LI><A HREF="browse/part_bill_event.cgi">View/Edit invoice events</A> - Actions for overdue invoices
         </ul>
-- 
cgit v1.2.1


From 0b0f8fb76939a617b142595672cc15e034ab7336 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 16:40:21 +0000
Subject: fix "no previous account to recall hidden password from" error when
 adding new accounts & get an error on first try

---
 Makefile                     | 4 ++--
 httemplate/edit/svc_acct.cgi | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index dd134ebfc..283981a87 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-#TEMPLATE = asp
-TEMPLATE = mason
+TEMPLATE = asp
+#TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 73ecdd98d..4bc81c9fd 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -72,7 +72,7 @@ my $otaker = getotaker;
 my $username = $svc_acct->username;
 my $password;
 if ( $svc_acct->_password ) {
-  if ( $conf->exists('showpasswords') ) {
+  if ( $conf->exists('showpasswords') || ! $svcnum ) {
     $password = $svc_acct->_password;
   } else {
     $password = "*HIDDEN*";
-- 
cgit v1.2.1


From 775d9fe6df79f88479998937d58ae2237a2525aa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 16:49:50 +0000
Subject: okay, for now, don't try to transform email addresses into
 svcnum-linked destinations

---
 FS/FS/cust_main_invoice.pm | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm
index 3077d645a..7d8a0725a 100644
--- a/FS/FS/cust_main_invoice.pm
+++ b/FS/FS/cust_main_invoice.pm
@@ -1,7 +1,7 @@
 package FS::cust_main_invoice;
 
 use strict;
-use vars qw(@ISA $conf $mydomain);
+use vars qw(@ISA $conf);
 use Exporter;
 use FS::Record qw( qsearchs );
 use FS::Conf;
@@ -10,12 +10,6 @@ use FS::svc_acct;
 
 @ISA = qw( FS::Record );
 
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::cust_main_invoice'} = sub { 
-  $conf = new FS::Conf;
-  $mydomain = $conf->config('domain');
-};
-
 =head1 NAME
 
 FS::cust_main_invoice - Object methods for cust_main_invoice records
@@ -137,13 +131,14 @@ sub checkdest {
       unless qsearchs( 'svc_acct', { 'svcnum' => $self->dest } );
   } elsif ( $self->dest =~ /^([\w\.\-\&]+)\@(([\w\.\-]+\.)+\w+)$/ ) {
     my($user, $domain) = ($1, $2);
-    if ( $domain eq $mydomain ) {
-      my $svc_acct = qsearchs( 'svc_acct', { 'username' => $user } );
-      return "Unknown local account: $user\@$domain (specified literally)"
-        unless $svc_acct;
-      $svc_acct->svcnum =~ /^(\d+)$/ or die "Non-numeric svcnum?!";
-      $self->dest($1);
-    }
+#    if ( $domain eq $mydomain ) {
+#      my $svc_acct = qsearchs( 'svc_acct', { 'username' => $user } );
+#      return "Unknown local account: $user\@$domain (specified literally)"
+#        unless $svc_acct;
+#      $svc_acct->svcnum =~ /^(\d+)$/ or die "Non-numeric svcnum?!";
+#      $self->dest($1);
+#    }
+    $self->dest("$1\@$2");
   } else {
     return "Illegal destination!";
   }
@@ -162,7 +157,7 @@ sub address {
   if ( $self->dest =~ /^(\d+)$/ ) {
     my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $1 } )
       or return undef;
-    $svc_acct->username . '@' . $mydomain;
+    $svc_acct->email;
   } else {
     $self->dest;
   }
@@ -172,7 +167,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.8 2001-10-25 16:13:10 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.9 2002-02-10 16:49:50 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From f726710e136944a42cf3ac405eb5d29637eb67a6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 17:02:37 +0000
Subject: allow + in email addresses

---
 FS/FS/cust_main_invoice.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm
index 7d8a0725a..ebbadc6d9 100644
--- a/FS/FS/cust_main_invoice.pm
+++ b/FS/FS/cust_main_invoice.pm
@@ -129,7 +129,7 @@ sub checkdest {
   } elsif ( $self->dest =~ /^(\d+)$/ ) {
     return "Unknown local account (specified by svcnum: ". $self->dest. ")"
       unless qsearchs( 'svc_acct', { 'svcnum' => $self->dest } );
-  } elsif ( $self->dest =~ /^([\w\.\-\&]+)\@(([\w\.\-]+\.)+\w+)$/ ) {
+  } elsif ( $self->dest =~ /^([\w\.\-\&\+]+)\@(([\w\.\-]+\.)+\w+)$/ ) {
     my($user, $domain) = ($1, $2);
 #    if ( $domain eq $mydomain ) {
 #      my $svc_acct = qsearchs( 'svc_acct', { 'username' => $user } );
@@ -167,7 +167,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.9 2002-02-10 16:49:50 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.10 2002-02-10 17:02:37 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From b05f4d252a27eab0a6fa8212abf920c0fa24a509 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 17:30:33 +0000
Subject: eliminate duplicate cusomters before figuring to display a list or
 redirect. eliiminates "2 matching found" displayed but only one in list.

---
 httemplate/search/cust_main.cgi | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index b962c7c42..1e28ad57d 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -45,7 +45,7 @@ $limit .= "LIMIT $maxrecords" if $maxrecords;
 my $offset = $cgi->param('offset') || 0;
 $limit .= " OFFSET $offset" if $offset;
 
-my $total;
+my $total = 0;
 
 my(@cust_main, $sortby, $orderby);
 if ( $cgi->param('browse') ) {
@@ -134,6 +134,9 @@ if ( $cgi->param('browse') ) {
     if $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
        || ( $conf->exists('hidecancelledcustomers')
              && ! $cgi->param('showcancelledcustomers') );
+
+  my %saw = ();
+  @cust_main = grep { !$saw{$_->custnum}++ } @cust_main;
 }
 
 my %all_pkgs;
-- 
cgit v1.2.1


From ddb53fcc9fc80561354b97e4e7803004990138d0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 18:56:49 +0000
Subject: use unique tokens to prevent double-submission of payments in the web
 UI (closes: Bug#320)

---
 FS/FS/cust_pay.pm             | 13 ++++++++++++-
 README.1.4.0pre9              | 19 +++++++++++++++++++
 bin/fs-setup                  |  4 ++--
 httemplate/docs/upgrade8.html |  3 +++
 httemplate/edit/cust_pay.cgi  |  7 +++++--
 5 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 README.1.4.0pre9

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 839571a95..6156eadeb 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -136,6 +136,17 @@ sub insert {
     }
   }
 
+  if ( $self->paybatch =~ /^webui-/ ) {
+    my @cust_pay = qsearch('cust_pay', {
+      'custnum' => $self->custnum,
+      'paybatch' => $self->paybatch,
+    } );
+    if ( scalar(@cust_pay) > 1 ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "a payment with webui token ". $self->paybatch. " already exists";
+    }
+  }
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   #false laziness w/ cust_credit::insert
@@ -348,7 +359,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.16 2002-02-07 22:29:34 ivan Exp $
+$Id: cust_pay.pm,v 1.17 2002-02-10 18:56:49 ivan Exp $
 
 =head1 BUGS
 
diff --git a/README.1.4.0pre9 b/README.1.4.0pre9
new file mode 100644
index 000000000..3ab2b4233
--- /dev/null
+++ b/README.1.4.0pre9
@@ -0,0 +1,19 @@
+the following is necessary to upgrade from 1.4.0pre8 to 1.4.0pre9
+
+if you're upgradeing from before 1.4.0pre8 see README.1.4.0pre8 first!
+
+if you're upgrading from 1.3.1 follow the instructions in
+httemplate/docs/upgrade8.html instead
+
+-----
+
+install the FS perl modules and httemplate as per install.html or upgrade8.html
+
+CREATE INDEX cust_pay2 ON cust_pay ( paynum );
+CREATE INDEX cust_pay3 ON cust_pay ( custnum );
+CREATE INDEX cust_pay4 ON cust_pay ( paybatch );
+
+Run bin/dbdef-create
+
+Restart Apache and freeside-queued
+
diff --git a/bin/fs-setup b/bin/fs-setup
index 07c9709a1..5f8059425 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.75 2002-02-06 15:07:49 ivan Exp $
+# $Id: fs-setup,v 1.76 2002-02-10 18:56:49 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -500,7 +500,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'billpaynum',
       'unique' => [ [] ],
-      'index' => [ [ 'paynum', 'invnum' ] ],
+      'index' => [ [ 'paynum' ], [ 'custnum' ], [ 'paybatch' ] ],
     },
 
     'cust_pay_batch' => { #what's this used for again?  list of customers
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index b243eba75..2c7008a6c 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -192,6 +192,9 @@ CREATE INDEX cust_credit_refund1 ON cust_credit_refund ( crednum );
 CREATE INDEX cust_credit_refund2 ON cust_credit_refund ( refundnum );
 CREATE UNIQUE INDEX cust_pay_batch_pkey ON cust_pay_batch ( paybatchnum );
 CREATE UNIQUE INDEX part_svc_column1 ON part_svc_column ( svcpart, columnname );
+CREATE INDEX cust_pay2 ON cust_pay ( paynum );
+CREATE INDEX cust_pay3 ON cust_pay ( custnum );
+CREATE INDEX cust_pay4 ON cust_pay ( paybatch );
 </pre>
 
   <li>If you are using PostgreSQL, apply the following changes to your database:
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 27d36eb54..f6ae7b299 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -32,6 +32,8 @@ if ( $cgi->param('error') ) {
 }
 my $_date = time;
 
+my $paybatch = "webui-$_date-$$-". rand() * 2**32;
+
 my $p1 = popurl(1);
 print header("Post payment", '');
 
@@ -111,11 +113,12 @@ print qq!<TR><TD ALIGN="right">Check #</TD><TD BGCOLOR="#ffffff"><INPUT TYPE="te
 
 print qq!<TR><TD ALIGN="right">Auto-apply<BR>to invoices</TD><TD><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD>!;
 
+print "</TABLE>";
+
 #paybatch
-print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
+print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="$paybatch">!;
 
 print <<END;
-</TABLE>
 <BR>
 <INPUT TYPE="submit" VALUE="Post payment">
     </FORM>
-- 
cgit v1.2.1


From 7e3eb82f87c371785544b706b7347c7edde2b593 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 19:58:43 +0000
Subject: update billing documentation for the new world of invoice events
 added freeside-daily replacing freeside-bill for the new world of invoice
 events

---
 FS/MANIFEST                                 |  1 +
 FS/bin/freeside-bill                        |  8 +--
 FS/bin/freeside-daily                       | 90 +++++++++++++++++++++++++++++
 httemplate/docs/billing.html                | 56 ++++++------------
 httemplate/docs/upgrade8.html               |  1 +
 httemplate/edit/process/part_bill_event.cgi |  2 +-
 6 files changed, 115 insertions(+), 43 deletions(-)
 create mode 100755 FS/bin/freeside-daily

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 0a9205c7f..85c09b465 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -4,6 +4,7 @@ MANIFEST.SKIP
 Makefile.PL
 README
 bin/freeside-bill
+bin/freeside-daily
 bin/freeside-email
 bin/freeside-queued
 bin/freeside-apply-credits
diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill
index 6ef344a50..49ad4a768 100755
--- a/FS/bin/freeside-bill
+++ b/FS/bin/freeside-bill
@@ -97,6 +97,8 @@ freeside-bill - Command line (crontab, script) interface to customer billing.
 
 =head1 DESCRIPTION
 
+This script is deprecated in 1.4.0.  You should use freeside-daily instead.
+
 Bills customers.  Searches for customers who are due for billing and calls
 the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
@@ -116,15 +118,11 @@ user: From the mapsecrets file - see config.html from the base documentation
 custnum: if one or more customer numbers are specified, only bills those
 customers.  Otherwise, bills all customers.
 
-=head1 VERSION
-
-$Id: freeside-bill,v 1.12 2002-02-10 01:48:00 ivan Exp $
-
 =head1 BUGS
 
 =head1 SEE ALSO
 
-L<FS::cust_main>, config.html from the base documentation
+L<freeside-daily>, L<FS::cust_main>, config.html from the base documentation
 
 =cut
 
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
new file mode 100755
index 000000000..8d839cb21
--- /dev/null
+++ b/FS/bin/freeside-daily
@@ -0,0 +1,90 @@
+#!/usr/bin/perl -w
+
+use strict;
+use Fcntl qw(:flock);
+use Date::Parse;
+use Getopt::Std;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::cust_main;
+
+&untaint_argv;	#what it sounds like  (eww)
+use vars qw($opt_d);
+getopts("d:");
+my $user = shift or die &usage;
+
+adminsuidsetup $user;
+
+my @cust_main = @ARGV
+  ? map { qsearchs('cust_main', { custnum => $_ } ) } @ARGV
+  : qsearch('cust_main', {} )
+;
+
+#we're at now now (and later).
+my($time)= $opt_d ? str2time($opt_d) : $^T;
+
+my($cust_main,%saw);
+foreach $cust_main ( @cust_main ) {
+
+  my $error;
+
+  $error = $cust_main->bill( 'time' => $time );
+  warn "Error billing, custnum ". $cust_main->custnum. ": $error" if $error;
+
+  $cust_main->apply_payments;
+  $cust_main->apply_credits;
+
+  $error=$cust_main->collect( 'invoice_time' => $time );
+  warn "Error collecting, custnum". $cust_main->custnum. ": $error" if $error;
+
+}
+
+# subroutines
+
+sub untaint_argv {
+  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
+    #$ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
+    # Date::Parse
+    $ARGV[$_] =~ /^(.*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
+    $ARGV[$_]=$1;
+  }
+}
+
+sub usage {
+  die "Usage:\n\n  freeside-daily [ -d 'date' ] user [ custnum custnum ... ]\n";
+}
+
+=head1 NAME
+
+freeside-daily - Run daily billing and invoice collection events.
+
+=head1 SYNOPSIS
+
+  freeside-daily [ -d 'date' ] user [ custnum custnum ... ]
+
+=head1 DESCRIPTION
+
+Bills customers and runs invoice collection events.  Should be run from
+crontab daily.
+
+This script replaces freeside-bill from 1.3.1.
+
+Bills customers.  Searches for customers who are due for billing and calls
+the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
+
+  -d: Pretend it's 'date'.  Date is in any format Date::Parse is happy with,
+      but be careful.
+
+user: From the mapsecrets file - see config.html from the base documentation
+
+custnum: if one or more customer numbers are specified, only bills those
+customers.  Otherwise, bills all customers.
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::cust_main>, config.html from the base documentation
+
+=cut
+
diff --git a/httemplate/docs/billing.html b/httemplate/docs/billing.html
index dcb90208a..de59fc60a 100644
--- a/httemplate/docs/billing.html
+++ b/httemplate/docs/billing.html
@@ -4,36 +4,26 @@
 <body>
   <h1>Billing</h1>
   <ul>
-    <li>To enable billing, you <b>must</b> create an <a href="config.html#invoice_template">invoice_template</a> configuration file.  An example file is available in the <i>conf/</i> directory of the distribution.  You also need to create an <a href="config.html#lpr">lpr</a> configuration file to enable postal invoices.
-    <ul>
-      <li>Optional: Invoice template customization
-        <ul>
-          <li>See the <a href="http://search.cpan.org/doc/MJD/Text-Template-1.42/Template.pm">Text::Template</a> documentation for details on the substitution language.
-          <li>You <b>must</b> call the invoice_lines() function at least once - pass it a number of lines, and it returns a list of array references, each of two elements: a service description column, and a price column.
-          <li>In addition, the following variables are available:
-            <ul>
-              <li>$invnum - invoice number
-              <li>$date - as a UNIX timestamp (see <a href="http://search.cpan.org/doc/GBARR/TimeDate-1.09/lib/Date/Format.pm">Date::Format</a> for conversion functions).
-              <li>$page - current page
-              <li>$total_pages - total pages
-              <li>@address - A six-element array containing the customer name, company, and address.
-              <li>$overdue - true if this invoice is overdue
-            </ul>
-        </ul>
-    </ul>
     <li>You can bill individual customers by clicking on the <i>Bill now</i> link on the main customer view.
-    <li> The <b>freeside-bill</b> script can be run daily to bill all customers. (link to manpage!)  Usage:<pre>freeside-bill [ -c [ -p ] [ -a ] [ -i ] ] [ -d <i>date</i> ] <i>user</i></pre>
+    <li>The <a href="man/bin/freeside-daily.html"><b>freeside-daily</b></a> script should be run daily to bill customers and run invoice collection events.
+    <li>Real-time credit card processing: Install the <a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a> module for your processor.  Configure the <a href="../config/config-view.cgi#business-onlinepayment">business-onlinepayment</a> configuration option.  Disable the default <b>Batch card</b> <a href="../browse/part_bill_event.cgi">invoice event</a> and add one for Business::OnlinePayment.
+    <li>Optional: Invoice template customization
       <ul>
-        <li>-c: Turn on collecting (you probably want this).
-        <li>-p: Apply unapplied payments and credits before collecting (you probably want this too)
-        <li>-a: Call collect even if there isn't a new invoice (probably a bad idea for daily use)
-        <li>-i: Real-time billing (as opposed to bacth billing).  Only relevant for credit cards.
-        <li>-d: Pretend it is <i>date</i> (parsed by <a href="http://search.cpan.org/doc/GBARR/TimeDate-1.09/lib/Date/Parse.pm">Date::Parse</a>)
-        <li>user: as setup with freeside-adduser
+        <li>See the <a href="http://search.cpan.org/doc/MJD/Text-Template-1.42/Template.pm">Text::Template</a> documentation for details on the substitution language.
+        <li>You <b>must</b> call the invoice_lines() function at least once - pass it a number of lines, and it returns a list of array references, each of two elements: a service description column, and a price column.
+        <li>In addition, the following variables are available:
+          <ul>
+            <li>$invnum - invoice number
+            <li>$date - as a UNIX timestamp (see <a href="http://search.cpan.org/doc/GBARR/TimeDate-1.09/lib/Date/Format.pm">Date::Format</a> for conversion functions).
+            <li>$page - current page
+            <li>$total_pages - total pages
+            <li>@address - A six-element array containing the customer name, company, and address.
+            <li>$overdue - true if this invoice is overdue
+          </ul>
       </ul>
-      <br><br>Batch credit card processing
+    <li>Batch credit card processing
       <ul>
-        <li>After this script is run, a credit card batch will be in the <a href="schema.html#cust_pay_batch">cust_pay_batch</a> table.  Export this table to your credit card batching.
+        <li>After <a href="man/bin/freeside-daily.html"><b>freeside-daily</b></a> is run, a credit card batch will be in the <a href="schema.html#cust_pay_batch">cust_pay_batch</a> table.  Export this table to your credit card batching.
         <li>When your batch completes, erase the cust_pay_batch records in that batch and add any necessary paymants to the <a href="schema.html#cust_pay">cust_pay</a> table.  Example code to add payments is:
         <pre>use FS::cust_pay;
 
@@ -55,16 +45,8 @@ if ( $error ) {
 
 # end loop
 </pre>
-All fields except paybatch are contained in the cust_pay_batch table.  You can use paybatch field to track particular batches and/or particular transactions within a batch.<br><br>
-        <li>The <b>freeside-print-batch</b> script can print or email pending credit card batches for manual entry.  Usage: freeside-print-batch [-v] [-p] [-e] [-a] [-d] <i>user</i>
-          <ul>
-            <li>-v: Verbose - Prints records to STDOUT.
-            <li>-p: Print to printer lpr as found in the conf directory.
-            <li>-e: Email output to user found in the Conf email file.
-            <li>-a: Automatically pays all records in cust_pay_batch.  Use -d with this option usually.
-            <li>-d: Delete - Pays account and deletes record from cust_pay_batch.
-          </ul>
-      </ul>
-    <li>The <b>freeside-overdue</b> script can list, add postal invoicing, suspend or cancel overdue and/or expired accounts (link to manpage!).
+All fields except paybatch are contained in the cust_pay_batch table.  You can use paybatch field to track particular batches and/or particular transactions within a batch.
+    </ul>
+      <li>The <a href="man/bin/freeside-print-batch.html"><b>freeside-print-batch</b></a> script can print or email pending credit card batches for manual entry.
   </ul>
 </body>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 2c7008a6c..61d956ce8 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -303,5 +303,6 @@ ALTER TABLE cust_refund DROP COLUMN crednum;
       (ownded by the freeside user).
   <li>freeside-queued was installed with the Perl modules.  Start it now and ensure that is run upon system startup.
   <li>Set appropriate <a href="../browse/part_bill_event.cgi">invoice events</a> for your site.  At the very least, you'll want to set some invoice events "<i>After 0 days</i>": a <i>BILL</i> invoice event to print invoices, a <i>CARD</i> invoice event to batch or run cards real-time, and a <i>COMP</i> invoice event to "pay" complimentary customers.  If you were using the <i>-i</i> option to <a href="man/bin/freeside-bill.html">freeside-bill</a> it should be removed.
+  <li>Use <a href="man/bin/freeside-daily.html">freeside-daily</a> instead of <a href="man/bin/freeside-bill.html">freeside-bill</a>.
 </ul>
 </body>
diff --git a/httemplate/edit/process/part_bill_event.cgi b/httemplate/edit/process/part_bill_event.cgi
index 1716c71b9..4049ade80 100755
--- a/httemplate/edit/process/part_bill_event.cgi
+++ b/httemplate/edit/process/part_bill_event.cgi
@@ -12,7 +12,7 @@ if ( ! $cgi->param('plan_weight_eventcode') ) {
   $error = "Must select an action";
 } else {
 
-  $cgi->param('plan_weight_eventcode') =~ /^(\w+):(\d+):(.*)$/
+  $cgi->param('plan_weight_eventcode') =~ /^([\w\-]+):(\d+):(.*)$/
     or die "illegal plan_weight_eventcode:".
            $cgi->param('plan_weight_eventcode');
   $cgi->param('plan', $1);
-- 
cgit v1.2.1


From 686c4dd420f19c596e7c4b1a3980e5121c007c32 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 21:30:05 +0000
Subject: add new package definitions to all agent types by default

config option to restore current behaviour (must explicitly add new
package definitions to each agent type)

closes: Bug#324
---
 FS/FS/Conf.pm         |  7 +++++++
 FS/FS/part_pkg.pm     | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
 conf/agent_defaultpkg |  0
 3 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 conf/agent_defaultpkg

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 20ec1380e..f68d84e8b 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -730,6 +730,13 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  { 
+    'key'         => 'agent_defaultpkg',
+    'section'     => 'UI',
+    'description' => 'Setting this option will cause new packages to be available to all agent types by default.',
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 29257c0cb..86af95432 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -2,8 +2,11 @@ package FS::part_pkg;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw( qsearch );
+use FS::Record qw( qsearch dbh );
 use FS::pkg_svc;
+use FS::agent_type;
+use FS::type_pkgs;
+use FS::Conf;
 
 @ISA = qw( FS::Record );
 
@@ -105,6 +108,49 @@ sub clone {
 Adds this billing item definition to the database.  If there is an error,
 returns the error, otherwise returns false.
 
+=cut
+
+sub insert {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  my $conf = new FS::Conf;
+
+  if ( $conf->exists('agent_defaultpkg') ) {
+    foreach my $agent_type ( qsearch('agent_type', {} ) ) {
+      my $type_pkgs = new FS::type_pkgs({
+        'typenum' => $agent_type->typenum,
+        'pkgpart' => $self->pkgpart,
+      });
+      my $error = $type_pkgs->insert;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+}
+
 =item delete
 
 Currently unimplemented.
@@ -182,7 +228,7 @@ sub svcpart {
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.6 2002-01-28 06:57:23 ivan Exp $
+$Id: part_pkg.pm,v 1.7 2002-02-10 21:30:05 ivan Exp $
 
 =head1 BUGS
 
diff --git a/conf/agent_defaultpkg b/conf/agent_defaultpkg
new file mode 100644
index 000000000..e69de29bb
-- 
cgit v1.2.1


From bb88a75467993505e2e3d37e8ce313f254ca5325 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 21:37:24 +0000
Subject: import qsearch() so the quantity checking works

---
 FS/FS/cust_svc.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index a81e3bb32..8a8dbe7c9 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -3,7 +3,7 @@ package FS::cust_svc;
 use strict;
 use vars qw( @ISA );
 use Carp qw( cluck );
-use FS::Record qw( qsearchs dbh );
+use FS::Record qw( qsearch qsearchs dbh );
 use FS::cust_pkg;
 use FS::part_pkg;
 use FS::part_svc;
@@ -245,7 +245,7 @@ sub seconds_since {
 
 =head1 VERSION
 
-$Id: cust_svc.pm,v 1.10 2002-02-09 17:45:26 ivan Exp $
+$Id: cust_svc.pm,v 1.11 2002-02-10 21:37:24 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 06a4d261c7b7c1d8692fd2dfd33b06e090c17d53 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 22:06:28 +0000
Subject: another bug in quantity checking

---
 FS/FS/cust_svc.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 8a8dbe7c9..3e38be39e 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -128,7 +128,7 @@ sub check {
     });
     return "Already ". scalar(@cust_svc). " ". $part_svc->svc.
            " services for pkgnum ". $self->pkgnum
-      if $pkg_svc->quantity >= scalar(@cust_svc);
+      if scalar(@cust_svc) >= $pkg_svc->quantity;
   }
 
   ''; #no error
@@ -245,7 +245,7 @@ sub seconds_since {
 
 =head1 VERSION
 
-$Id: cust_svc.pm,v 1.11 2002-02-10 21:37:24 ivan Exp $
+$Id: cust_svc.pm,v 1.12 2002-02-10 22:06:28 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 46477667466732de54a034fae994e71f9ca62b50 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 22:21:47 +0000
Subject: slighly different wording

---
 httemplate/edit/part_pkg.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index d32702668..f4ebd6770 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -211,7 +211,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'flat_comission' => {
-    'name' => 'Flat rate with recurring comission per active package',
+    'name' => 'Flat rate with recurring comission per (any) active package',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -232,7 +232,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'flat_comission_pkg' => {
-    'name' => 'Flat rate with recurring comission per active (selected) package',
+    'name' => 'Flat rate with recurring comission per (selected) active package',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
-- 
cgit v1.2.1


From 505345d25040f78a9fdffa5666cd6b9f41a117a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 22:31:14 +0000
Subject: ui

---
 httemplate/edit/svc_acct.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 4bc81c9fd..e42745cf7 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -81,7 +81,8 @@ if ( $svc_acct->_password ) {
   $password = '';
 }
 
-my $ulen = $svc_acct->dbdef_table->column('username')->length;
+my $ulen = $conf->config('usernamemax')
+           || $svc_acct->dbdef_table->column('username')->length;
 my $ulen2 = $ulen+2;
 
 my $pmax = $conf->config('passwordmax') || 8;
@@ -103,7 +104,7 @@ print 'Service # '. ( $svcnum ? "<B>$svcnum</B>" : " (NEW)" ). '<BR>'.
       <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
 END
 
-print &itable("#cccccc",2), <<END;
+print &ntable("#cccccc",2), <<END;
 <TR><TD>
 <TR><TD ALIGN="right">Username</TD>
 <TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
-- 
cgit v1.2.1


From f255042296a645e7d90c19ee6740796250cfb9f3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 11 Feb 2002 19:38:58 +0000
Subject: svc_www is working!

also auto-create and add A records if necessary using apacheip config file.

and show all domain_records on view/svc_domain.cgi page
---
 FS/FS/Conf.pm                       |  7 +++
 FS/FS/svc_www.pm                    | 89 ++++++++++++++++++++++++++++++++-----
 httemplate/edit/process/svc_www.cgi | 36 +++++++++++++++
 httemplate/edit/svc_acct.cgi        |  1 -
 httemplate/view/svc_domain.cgi      | 13 +++++-
 httemplate/view/svc_www.cgi         |  8 +++-
 6 files changed, 138 insertions(+), 16 deletions(-)
 create mode 100644 httemplate/edit/process/svc_www.cgi

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index f68d84e8b..3a4f5b9de 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -197,6 +197,13 @@ httemplate/docs/config.html
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'apacheip',
+    'section'     => 'apache',
+    'description' => 'The current IP address to assign to new virtual hosts',
+    'type'        => 'text',
+  },
+
   {
     'key'         => 'apachemachine',
     'section'     => 'apache',
diff --git a/FS/FS/svc_www.pm b/FS/FS/svc_www.pm
index d4e398810..f09a3f89d 100644
--- a/FS/FS/svc_www.pm
+++ b/FS/FS/svc_www.pm
@@ -1,13 +1,14 @@
 package FS::svc_www;
 
 use strict;
-use vars qw(@ISA $conf $apacheroot $apachemachine $nossh_hack );
+use vars qw(@ISA $conf $apacheroot $apachemachine $apacheip $nossh_hack );
 #use FS::Record qw( qsearch qsearchs );
-use FS::Record qw( qsearchs );
+use FS::Record qw( qsearchs dbh );
 use FS::svc_Common;
 use FS::cust_svc;
 use FS::domain_record;
 use FS::svc_acct;
+use FS::svc_domain;
 use Net::SSH qw(ssh);
 
 @ISA = qw( FS::svc_Common );
@@ -17,6 +18,7 @@ $FS::UID::callback{'FS::svc_www'} = sub {
   $conf = new FS::Conf;
   $apacheroot = $conf->config('apacheroot');
   $apachemachine = $conf->config('apachemachine');
+  $apacheip = $conf->config('apacheip');
 };
 
 =head1 NAME
@@ -101,11 +103,50 @@ setting $FS::svc_www::nossh_hack true.
 
 sub insert {
   my $self = shift;
-  my $error;
 
-  $error = $self->SUPER::insert;
+  my $error = $self->check;
   return $error if $error;
 
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  #if ( $self->recnum =~ /^([\w\-]+|\@)\.(([\w\.\-]+\.)+\w+)$/ ) {
+  if ( $self->recnum =~ /^([\w\-]+|\@)\.(\d+)$/ ) {
+    my( $reczone, $domain_svcnum ) = ( $1, $2 );
+    unless ( $apacheip ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "Configuration option apacheip not set; can't autocreate A record";
+             #"for $reczone". $svc_domain->domain;
+    }
+    my $domain_record = new FS::domain_record {
+      'svcnum'  => $domain_svcnum,
+      'reczone' => $reczone,
+      'recaf'   => 'IN',
+      'rectype' => 'A',
+      'recdata' => $apacheip,
+    };
+    $error = $domain_record->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+    $self->recnum($domain_record->recnum);
+  }
+
+  $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
   my $domain_record = qsearchs('domain_record', { 'recnum' => $self->recnum } );    # or die ?
   my $zone = $domain_record->reczone;
     # or die ?
@@ -137,6 +178,7 @@ sub insert {
     );
   }
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 }
 
@@ -187,7 +229,7 @@ Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
 
 =item check
 
-Checks all fields to make sure this is a valid example.  If there is
+Checks all fields to make sure this is a valid web virtual host.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
 and repalce methods.
 
@@ -202,13 +244,40 @@ sub check {
 
   my $error =
     $self->ut_numbern('svcnum')
-    || $self->ut_number('recnum')
+#    || $self->ut_number('recnum')
     || $self->ut_number('usersvc')
   ;
   return $error if $error;
 
-  return "Unknown recnum: ". $self->recnum
-    unless qsearchs('domain_record', { 'recnum' => $self->recnum } );
+  if ( $self->recnum =~ /^(\d+)$/ ) {
+  
+    $self->recnum($1);
+    return "Unknown recnum: ". $self->recnum
+      unless qsearchs('domain_record', { 'recnum' => $self->recnum } );
+
+  } elsif ( $self->recnum =~ /^([\w\-]+|\@)\.(([\w\.\-]+\.)+\w+)$/ ) {
+
+    my( $reczone, $domain ) = ( $1, $2 );
+
+    my $svc_domain = qsearchs( 'svc_domain', { 'domain' => $domain } )
+      or return "unknown domain $domain (recnum $1.$2)";
+
+    my $domain_record = qsearchs( 'domain_record', {
+      'reczone' => $reczone,
+      'svcnum' => $svc_domain->svcnum,
+    });
+
+    if ( $domain_record ) {
+      $self->recnum($domain_record->recnum);
+    } else {
+      #insert will create it
+      #$self->recnum("$reczone.$domain");
+      $self->recnum("$reczone.". $svc_domain->svcnum);
+    }
+
+  } else {
+    return "Illegal recnum: ". $self->recnum;
+  }
 
   return "Unknown usersvc (svc_acct.svcnum): ". $self->usersvc
     unless qsearchs('svc_acct', { 'svcnum' => $self->usersvc } );
@@ -218,10 +287,6 @@ sub check {
 
 =back
 
-=head1 VERSION
-
-$Id: svc_www.pm,v 1.6 2001-09-06 20:41:59 ivan Exp $
-
 =head1 BUGS
 
 =head1 SEE ALSO
diff --git a/httemplate/edit/process/svc_www.cgi b/httemplate/edit/process/svc_www.cgi
new file mode 100644
index 000000000..38d5e1c79
--- /dev/null
+++ b/httemplate/edit/process/svc_www.cgi
@@ -0,0 +1,36 @@
+<%
+
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+my $svcnum = $1;
+
+my $old;
+if ( $svcnum ) {
+  $old = qsearchs('svc_acct', { 'svcnum' => $svcnum } )
+    or die "fatal: can't find account (svcnum $svcnum)!";
+} else {
+  $old = '';
+}
+
+my $new = new FS::svc_www ( {
+  map {
+    ($_, scalar($cgi->param($_)));
+  #} qw(svcnum pkgnum svcpart recnum usersvc)
+  } ( fields('svc_www'), qw( pkgnum svcpart ) )
+} );
+
+my $error;
+if ( $svcnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $svcnum = $new->svcnum;
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_www.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/svc_www.cgi?" . $svcnum );
+}
+
+%>
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index e42745cf7..3fa7019eb 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -105,7 +105,6 @@ print 'Service # '. ( $svcnum ? "<B>$svcnum</B>" : " (NEW)" ). '<BR>'.
 END
 
 print &ntable("#cccccc",2), <<END;
-<TR><TD>
 <TR><TD ALIGN="right">Username</TD>
 <TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
 <TR><TD ALIGN="right">Password</TD>
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index f30211098..f086cda1a 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -46,6 +46,17 @@ print header('Domain View', menubar(
       qq!<BR>Catch all email <A HREF="${p}misc/catchall.cgi?$svcnum">(change)</A>:!,
       $email ? "<B>$email</B>." : "<I>(none)<I>",
       qq!<BR><BR><A HREF="http://www.geektools.com/cgi-bin/proxy.cgi?query=$domain;targetnic=auto">View whois information.</A>!,
-      '</BODY></HTML>',
+      '<BR><BR>', ntable("",2),
+      '<tr><th>Zone</th><th>Type</th><th>Data</th></tr>',
 ;
+
+foreach my $domain_record ( qsearch('domain_record', { svcnum => $svcnum } ) ) {
+  print '<tr><td>'. $domain_record->reczone. '</td>'.
+        '<td>'. $domain_record->recaf. ' '. $domain_record->rectype. '</td>'.
+        '<td>'. $domain_record->recdata. '</td></tr>';
+}
+print '</table>';
+
+print '</BODY></HTML>';
+
 %>
diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index bd8ae36a6..a82921f1b 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -10,7 +10,7 @@ my $svc_www = qsearchs( 'svc_www', { 'svcnum' => $svcnum } )
 #false laziness w/all svc_*.cgi
 my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } );
 my $pkgnum = $cust_svc->getfield('pkgnum');
-my($cust_pkg, custnum);
+my($cust_pkg, $custnum);
 if ($pkgnum) {
   $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
   $custnum = $cust_pkg->custnum;
@@ -24,6 +24,10 @@ my $domain_record = qsearchs('domain_record', { 'recnum' => $svc_www->recnum } )
   or die "svc_www: Unknown recnum". $svc_www->recnum;
 
 my $www = $domain_record->reczone;
+unless ( $www =~ /\.$/ ) {
+  my $svc_domain = qsearchs('svc_domain', { svcnum=>$domain_record->svcnum } );
+  $www .= '.'. $svc_domain->domain;
+}
 
 print header('Website View', menubar(
   ( ( $custnum )
@@ -36,7 +40,7 @@ print header('Website View', menubar(
   "Main menu" => $p,
 )),
       "Service #$svcnum",
-      "<BR>Website name: <B>$www</B>.",
+      qq!<BR>Website name: <B><A HREF="http://$www">$www</A></B>!,
       '</BODY></HTML>',                
 ;
 %>
-- 
cgit v1.2.1


From 268e2f7e607c5d7a4b22ebef71556783f2cd2dc2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 11 Feb 2002 21:51:39 +0000
Subject: don't display useless finger and shell fields if uid is set to fixed
 & blank in the service definition - causes: Error: Can't have finger-name
 without uid

---
 httemplate/edit/svc_acct.cgi | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 3fa7019eb..d147a1683 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -47,9 +47,11 @@ if ( $cgi->param('error') ) {
     my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
     if ($cust_pkg) {
       my($cust_main)=qsearchs('cust_main',{'custnum'=> $cust_pkg->custnum } );
-      $svc_acct->setfield('finger',
-        $cust_main->getfield('first') . " " . $cust_main->getfield('last')
-      ) ;
+      unless ( $part_svc->part_svc_column('uid')->columnflag eq 'F' ) {
+        $svc_acct->setfield('finger',
+          $cust_main->getfield('first') . " " . $cust_main->getfield('last')
+        );
+      }
     }
 
     #set fixed and default fields from part_svc
@@ -187,12 +189,20 @@ my($uid,$gid,$finger,$dir)=(
 print <<END;
 <INPUT TYPE="hidden" NAME="uid" VALUE="$uid">
 <INPUT TYPE="hidden" NAME="gid" VALUE="$gid">
-<TR><TD ALIGN="right">GECOS</TD><TD><INPUT TYPE="text" NAME="finger" VALUE="$finger"></TD></TR>
-<INPUT TYPE="hidden" NAME="dir" VALUE="$dir">
 END
 
+if ( !$finger && $part_svc->part_svc_column('uid')->columnflag eq 'F' ) {
+  print '<INPUT TYPE="hidden" NAME="finger" VALUE="">';
+} else {
+  print '<TR><TD ALIGN="right">GECOS</TD>'.
+        qq!<TD><INPUT TYPE="text" NAME="finger" VALUE="$finger"></TD></TR>!;
+}
+print qq!<INPUT TYPE="hidden" NAME="dir" VALUE="$dir">!;
+
 my $shell = $svc_acct->shell;
-if ( $part_svc->part_svc_column('shell')->columnflag eq "F" ) {
+if ( $part_svc->part_svc_column('shell')->columnflag eq "F"
+     || ( !$shell && $part_svc->part_svc_column('uid')->columnflag eq 'F' )
+   ) {
   print qq!<INPUT TYPE="hidden" NAME="shell" VALUE="$shell">!;
 } else {
   print qq!<TR><TD ALIGN="right">Shell</TD><TD><SELECT NAME="shell" SIZE=1>!;
-- 
cgit v1.2.1


From c4f0380bb9f5f7b497092c3d750953e2ef1562fa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 11 Feb 2002 22:57:52 +0000
Subject: remove bad doc link

---
 fs_signup/FS-SignupClient/SignupClient.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm
index d656d7528..bd917dae7 100644
--- a/fs_signup/FS-SignupClient/SignupClient.pm
+++ b/fs_signup/FS-SignupClient/SignupClient.pm
@@ -212,7 +212,7 @@ sub new_customer {
 
 =head1 SEE ALSO
 
-L<fs_signupd>, L<FS::SignupServer>, L<FS::cust_main>
+L<fs_signupd>, L<FS::cust_main>
 
 =cut
 
-- 
cgit v1.2.1


From ae01ce5a885b51179d78e200338ec87e945b98ae Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 11 Feb 2002 23:01:01 +0000
Subject: oops, code hidden by pod

---
 FS/FS/svc_forward.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index 1476dbf78..7fde3eeab 100644
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -308,16 +308,18 @@ sub srcsvc_acct {
 Returns the FS::svc_acct object referenced by the srcsvc column, or false for
 forwards not local to freeside.
 
-=back
+=cut
 
 sub dstsvc_acct {
   my $self = shift;
   qsearchs('svc_acct', { 'svcnum' => $self->dstsvc } );
 }
 
+=back
+
 =head1 VERSION
 
-$Id: svc_forward.pm,v 1.8 2001-10-29 20:53:38 ivan Exp $
+$Id: svc_forward.pm,v 1.9 2002-02-11 23:01:01 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 8fe3fe6ae4075fab902685fd145c48122baedfcb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 12 Feb 2002 01:13:23 +0000
Subject: service definition domsvc is now a domain pulldown closes: Bug#328

---
 httemplate/edit/part_svc.cgi | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 63ec1dce1..ee0457bae 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -111,7 +111,13 @@ my %defs = (
     'gid'       => 'GID (when blank, defaults to UID)',
     'shell'     => 'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file)',
     'finger'    => 'GECOS',
-    'domsvc'    => 'svcnum from svc_domain',
+    'domsvc'    => {
+                     desc =>'svcnum from svc_domain',
+                     type =>'select',
+                     select_table => 'svc_domain',
+                     select_key   => 'svcnum',
+                     select_label => 'domain',
+                   },
   },
   'svc_domain' => {
     'domain'    => 'Domain',
@@ -194,8 +200,10 @@ function fixup(what) {
                  : $part_svc_column->columnflag;
     #print "<TR>$ptmp<TD>$field";
     print "<TR><TD>$field";
-    print "- <FONT SIZE=-1>$defs{$svcdb}{$field}</FONT>"
-      if defined $defs{$svcdb}{$field};
+    my $def = $defs{$svcdb}{$field};
+    my $desc = ref($def) ? $def->{desc} : $def;
+    
+    print "- <FONT SIZE=-1>$desc</FONT>" if $desc;
     print "</TD>";
     print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${field}_flag" VALUE=""!.
       ' CHECKED'x($flag eq ''). ">Off</TD>";
@@ -203,8 +211,24 @@ function fixup(what) {
       ' CHECKED'x($flag eq 'D'). ">Default ";
     print qq!<INPUT TYPE="radio" NAME="${svcdb}__${field}_flag" VALUE="F"!.
       ' CHECKED'x($flag eq 'F'). ">Fixed ";
-    print qq!<INPUT TYPE="text" NAME="${svcdb}__${field}" VALUE="$value">!,
-      "</TD></TR>\n";
+    print '<BR>';
+    if ( ref($def) ) {
+      if ( $def->{type} eq 'select' ) {
+        print qq!<SELECT NAME="${svcdb}__${field}">!;
+        print '<OPTION>' unless $value;
+        foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
+          my $rvalue = $record->getfield($def->{select_key});
+          print qq!<OPTION VALUE="$rvalue"!.
+                ( $rvalue==$value ? ' SELECTED>' : '>' ).
+                $record->getfield($def->{select_label});
+        }
+      } else {
+        print 'UNKNOWN TYPE '. $def->{type};
+      }
+    } else {
+      print qq!<INPUT TYPE="text" NAME="${svcdb}__${field}" VALUE="$value">!;
+    }
+    print "</TD></TR>\n";
     #$ptmp='';
   }
   print "</TABLE>" unless $svcdb eq 'konq_kludge';
-- 
cgit v1.2.1


From 69569a366264e4114f37d0e1036b5a09ceb56fd7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 12 Feb 2002 01:25:06 +0000
Subject: red warning for unknown type :)

---
 httemplate/edit/part_svc.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index ee0457bae..c3a4942ea 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -223,7 +223,7 @@ function fixup(what) {
                 $record->getfield($def->{select_label});
         }
       } else {
-        print 'UNKNOWN TYPE '. $def->{type};
+        print '<font color="#ff0000">unknown type'. $def->{type};
       }
     } else {
       print qq!<INPUT TYPE="text" NAME="${svcdb}__${field}" VALUE="$value">!;
-- 
cgit v1.2.1


From a2c24812441a8f8ae3045a8c0c93c7f009d4f494 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 12 Feb 2002 02:06:39 +0000
Subject: that's not a bug anymore, don't list it in the BUGS section

---
 FS/FS/svc_acct.pm | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 16270f9cc..f3c2d76d3 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1064,15 +1064,8 @@ sub ssh {
 
 =back
 
-=head1 VERSION
-
-$Id: svc_acct.pm,v 1.64 2002-01-29 16:33:15 ivan Exp $
-
 =head1 BUGS
 
-The bits which ssh should fork before doing so (or maybe queue jobs for a
-daemon).
-
 The $recref stuff in sub check should be cleaned up.
 
 The suspend, unsuspend and cancel methods update the database, but not the
-- 
cgit v1.2.1


From ae23f6fe1ca915c995cfbf29bb39e7ed5e1cce2c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 12 Feb 2002 02:11:07 +0000
Subject: add username_policy "@append domain"

add "select" config type, mmm
---
 FS/FS/Conf.pm                |  7 ++++---
 bin/svc_acct.export          |  6 +++++-
 httemplate/config/config.cgi | 10 ++++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 3a4f5b9de..5de25510c 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -711,9 +711,10 @@ httemplate/docs/config.html
   {
     'key'         => 'username_policy',
     'section'     => '',
-    'description' => 'This file controls the mechanism for preventing duplicate usernames in passwd/radius files exported from svc_accts.  This should be one of \'prepend domsvc\' \'append domsvc\' or \'append domain\'',
-#    'type'        => 'select',
-    'type'        => 'text',
+    'description' => 'This file controls the mechanism for preventing duplicate usernames in passwd/radius files exported from svc_accts.  This should be one of \'prepend domsvc\' \'append domsvc\' \'append domain\' or \'append @domain\'',
+    'type'        => 'select',
+    'select_enum' => [ 'prepend domsvc', 'append domsvc', 'append domain', 'append @domain' ],
+    #'type'        => 'text',
   },
 
   {
diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 3ac7a4f8f..e28de4aa7 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.28 2001-12-12 07:59:33 ivan Exp $
+# $Id: svc_acct.export,v 1.29 2002-02-12 02:11:07 ivan Exp $
 #
 # Create and export password, radius and vpopmail password files:
 # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
@@ -287,6 +287,10 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) {
       $username=$svc_acct->username . $svc_acct->domsvc;
     } elsif ($userpolicy =~ /^append domain$/) {
       $username=$svc_acct->username . $svc_domain->domain;
+    } elsif ($userpolicy =~ /^append domain$/) {
+      $username=$svc_acct->username . $svc_domain->domain;
+    } elsif ($userpolicy =~ /^append @domain$/) {
+      $username=$svc_acct->username . '@'. $svc_domain->domain;
     } else {
       die "Unknown policy in username_policy\n";
     }
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index b9e84a8d5..f640d0b5e 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -30,6 +30,16 @@
             <input name="<%= $i->key. $n %>" type="checkbox" value="1"<%= $conf->exists($i->key) ? ' CHECKED' : '' %>>
           <% } elsif ( $type eq 'text' )  { %>
             <input name="<%= $i->key. $n %>" type="<%= $type %>" value="<%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>">
+          <% } elsif ( $type eq 'select' )  { %>
+            <select name="<%= $i->key. $n %>">
+              <% my %saw;
+                 foreach my $value ( "", @{$i->select_enum} ) {
+                    local($^W)=0; next if $saw{$value}++; %>
+                <option value="<%= $value %>"<%= $value eq $conf->config($i->key) ? ' SELECTED' : '' %>><%= $value %>
+              <% } %>
+              <% if ( $conf->exists($i->key) && $conf->config($i->key) && ! grep { $conf->config($i->key) eq $_ } @{$i->select_enum}) { %>
+                <option value=<%= $conf->config($i->key) %> SELECTED><%= conf->config($i->key) %>
+              <% } %>
           <% } else { %>
             <font color="#ff0000">unknown type <%= $type %></font>
           <% } %>
-- 
cgit v1.2.1


From f7c488b72340370a36ea77d5c580d7d21bdb962c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 12 Feb 2002 03:29:17 +0000
Subject: 1.4.0pre9!!!

---
 README.1.4.0pre8 | 10 +++++-----
 README.1.4.0pre9 |  4 ++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.1.4.0pre8 b/README.1.4.0pre8
index 4eccb203e..ef20b298f 100644
--- a/README.1.4.0pre8
+++ b/README.1.4.0pre8
@@ -21,8 +21,8 @@ CREATE TABLE cust_bill_event (
   eventpart int not null,
   _date int not null
 );
-CREATE UNIQUE INDEX cust_bill_events1 ON cust_bill_events ( eventpart, invnum );
-CREATE INDEX cust_bill_events2 ON cust_bill_events ( invnum );
+CREATE UNIQUE INDEX cust_bill_event1 ON cust_bill_event ( eventpart, invnum );
+CREATE INDEX cust_bill_event2 ON cust_bill_event ( invnum );
 
 CREATE TABLE part_bill_event (
   eventpart int primary key,
@@ -35,7 +35,7 @@ CREATE TABLE part_bill_event (
   plandata text null,
   disabled char(1) null
 );
-CREATE INDEX part_bill_events1 ON part_bill_events ( payby );
+CREATE INDEX part_bill_event1 ON part_bill_event ( payby );
 
 CREATE TABLE part_export (
   exportnum int primary key,
@@ -47,7 +47,7 @@ CREATE TABLE part_export (
 CREATE INDEX part_export1 ON part_export ( machine );
 CREATE INDEX part_export2 ON part_export ( exporttype );
 
-CREATE INDEX part_export_option (
+CREATE TABLE part_export_option (
   optionnum int primary key,
   exportnum int not null,
   option varchar(80) not null,
@@ -66,7 +66,7 @@ Run bin/dbdef-create
 Restart Apache and freeside-queued
 
 Go to the new "View/Edit Invoice events" in the web interface and add the
-appropriate events.  t the very least, you'll want to set some invoice events
+appropriate events.  At the very least, you'll want to set some invoice events
 "After 0 days": a BILL invoice event to print invoices, a CARD invoice event to
 batch or run cards real-time, and a COMP invoice event to "pay" complimentary
 customers.  If you were using the -i option to freeside-bill it should be
diff --git a/README.1.4.0pre9 b/README.1.4.0pre9
index 3ab2b4233..fa5c2c0da 100644
--- a/README.1.4.0pre9
+++ b/README.1.4.0pre9
@@ -17,3 +17,7 @@ Run bin/dbdef-create
 
 Restart Apache and freeside-queued
 
+Use freeside-daily instead of freeside-bill.
+
+Use invoice events instead of freeside-overdue.
+
-- 
cgit v1.2.1


From 543ed3f877829e4335eda48d7198d2f92d03545e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 12 Feb 2002 04:49:32 +0000
Subject: oops

---
 httemplate/edit/part_bill_event.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 40016433d..018fc94a4 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -93,7 +93,7 @@ tie my %events, 'Tie::IxHash',
   'addpost' => {
     'name' => 'Add postal invoicing',
     'code' => '$cust_main->invoicing_list_addpost(); "";',
-    'pad'  => 20,
+    'weight'  => 20,
   },
 
   'comp' => {
-- 
cgit v1.2.1


From 04ccbc0a0d5a09a8522427bcb278fa1b96826d74 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 12 Feb 2002 05:58:42 +0000
Subject: fixes: bug#331

---
 README.1.4.0pre9           |  5 ++---
 bin/fs-setup               |  6 +++---
 httemplate/docs/admin.html | 11 +++++------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/README.1.4.0pre9 b/README.1.4.0pre9
index fa5c2c0da..8ff1e61f2 100644
--- a/README.1.4.0pre9
+++ b/README.1.4.0pre9
@@ -9,9 +9,8 @@ httemplate/docs/upgrade8.html instead
 
 install the FS perl modules and httemplate as per install.html or upgrade8.html
 
-CREATE INDEX cust_pay2 ON cust_pay ( paynum );
-CREATE INDEX cust_pay3 ON cust_pay ( custnum );
-CREATE INDEX cust_pay4 ON cust_pay ( paybatch );
+CREATE INDEX cust_pay2 ON cust_pay ( custnum );
+CREATE INDEX cust_pay3 ON cust_pay ( paybatch );
 
 Run bin/dbdef-create
 
diff --git a/bin/fs-setup b/bin/fs-setup
index 5f8059425..7c716d35e 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.76 2002-02-10 18:56:49 ivan Exp $
+# $Id: fs-setup,v 1.77 2002-02-12 05:58:42 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -487,7 +487,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'paynum',
       'unique' => [ [] ],
-      'index' => [ [] ],
+      'index' => [ [ 'custnum' ], [ 'paybatch' ] ],
     },
 
     'cust_bill_pay' => {
@@ -500,7 +500,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'billpaynum',
       'unique' => [ [] ],
-      'index' => [ [ 'paynum' ], [ 'custnum' ], [ 'paybatch' ] ],
+      'index' => [ [ 'paynum' ], [ 'invnum' ] ],
     },
 
     'cust_pay_batch' => { #what's this used for again?  list of customers
diff --git a/httemplate/docs/admin.html b/httemplate/docs/admin.html
index 1dab439e1..16d492095 100755
--- a/httemplate/docs/admin.html
+++ b/httemplate/docs/admin.html
@@ -50,14 +50,13 @@
   <li>From the Package View screen of the newly created package, choose
   <u>(Add)</u> to add the customer's service for this new package.
 
-  <li>Add your own domain, and note down the assigned <b>Service #</b>.
+  <li>Add your own domain.
 
   <li>Go back to <u>View/Edit service definitions</u> on the main menu, and
-  <u>Add a new service definition</u> with <i>Table</i> <b>svc_acct</b>.  Put
-  the <b>Service #</b> for your domain in the <b>domsvc</b> Modifier.  Set
-  <b>Fixed</b> to define a service locked-in to this domain, or <b>Default</b>
-  to define a service which may select from among this domain and the
-  customer's domains.
+  <u>Add a new service definition</u> with <i>Table</i> <b>svc_acct</b>.
+  Select your domain in the <b>domsvc</b> Modifier.  Set <b>Fixed</b> to define
+  a service locked-in to this domain, or <b>Default</b> to define a service
+  which may select from among this domain and the customer's domains.
 
   <li><table><tr>
     <td> Create at least POP (Point of Presence) by selecting
-- 
cgit v1.2.1


From f3a66fc4b25eb9fcc74a9fea56c48a61a1eea012 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 12 Feb 2002 18:37:43 +0000
Subject: fixes:

In string, @domain now must be written as \@domain at ./svc_acct.export
line 292, near "^append @domain"
Global symbol "@domain" requires explicit package name at
./svc_acct.export line 292.
Execution of ./svc_acct.export aborted due to compilation errors.
---
 bin/svc_acct.export | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index e28de4aa7..3ea444df9 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.29 2002-02-12 02:11:07 ivan Exp $
+# $Id: svc_acct.export,v 1.30 2002-02-12 18:37:43 ivan Exp $
 #
 # Create and export password, radius and vpopmail password files:
 # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
@@ -289,7 +289,7 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) {
       $username=$svc_acct->username . $svc_domain->domain;
     } elsif ($userpolicy =~ /^append domain$/) {
       $username=$svc_acct->username . $svc_domain->domain;
-    } elsif ($userpolicy =~ /^append @domain$/) {
+    } elsif ($userpolicy =~ /^append \@domain$/) {
       $username=$svc_acct->username . '@'. $svc_domain->domain;
     } else {
       die "Unknown policy in username_policy\n";
-- 
cgit v1.2.1


From c493d99b65cf3b1cc05ea5d7a61214dba563569f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 12 Feb 2002 18:47:21 +0000
Subject: fixes:

Error running invoice event ($cust_main->charge( 10.00, 'Overdue Bill'
);): Illegal or empty (text) comment:  at
/usr/local/lib/perl5/site_perl/5.005/FS/cust_main.pm line 1141.
---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 5cc6cfdfd..b732218e7 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1582,7 +1582,7 @@ sub charge {
 
   my $part_pkg = new FS::part_pkg ( {
     'pkg'      => $pkg || 'One-time charge',
-    'comment'  => $comment,
+    'comment'  => $comment || '$'. sprintf("%.2f".$amount),
     'setup'    => $amount,
     'freq'     => 0,
     'recur'    => '0',
-- 
cgit v1.2.1


From 98c7a62610134dee28e0f3e7a3ab6cb3ac8de5ca Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 12 Feb 2002 18:56:16 +0000
Subject: more information in "cant send invoice email" error message

---
 FS/FS/cust_bill.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 4306ea477..943c7b3ec 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -403,7 +403,9 @@ sub send {
       'Body' => [ $self->print_text ], #( date)
     );
     $message->smtpsend
-      or return "Can't send invoice email to server $smtpmachine!";
+      or return "(customer # ". $self->custnum. ") can't send invoice email".
+                " for ". join(', ', grep { $_ ne 'POST' } @invoicing_list ).
+                " to server $smtpmachine!";
 
   #} elsif ( grep { $_ eq 'POST' } @invoicing_list ) {
   } elsif ( ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list ) {
@@ -878,7 +880,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.18 2002-02-10 02:16:46 ivan Exp $
+$Id: cust_bill.pm,v 1.19 2002-02-12 18:56:16 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From dd948355ef906c1f2e65e636b972f8028289c7e6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 14 Feb 2002 01:12:19 +0000
Subject: don't require state (i18n)

---
 FS/FS/cust_pay_batch.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
index 6acb4fefb..dfafb0a13 100644
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -126,7 +126,7 @@ sub check {
     || $self->ut_text('address1')
     || $self->ut_textn('address2')
     || $self->ut_text('city')
-    || $self->ut_text('state')
+    || $self->ut_textn('state')
   ;
 
   return $error if $error;
@@ -189,7 +189,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_pay_batch.pm,v 1.4 2001-10-30 19:05:27 ivan Exp $
+$Id: cust_pay_batch.pm,v 1.5 2002-02-14 01:12:19 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From c348097ed3e8864cfd7cc58c94c1457067a0bd2c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 14 Feb 2002 18:06:57 +0000
Subject: docs?  haha

---
 bin/fs-radius-add-check | 2 +-
 bin/fs-radius-add-reply | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/fs-radius-add-check b/bin/fs-radius-add-check
index ca0492f4c..35f4d3262 100755
--- a/bin/fs-radius-add-check
+++ b/bin/fs-radius-add-check
@@ -54,6 +54,6 @@ $dbh->disconnect or die $dbh->errstr;
 print "\n\n", "Now you must run dbdef-create.\n\n";
 
 sub usage {
-  die "Usage:\n  fs-radius-add user\n"; 
+  die "Usage:\n  fs-radius-add-check user\n"; 
 }
 
diff --git a/bin/fs-radius-add-reply b/bin/fs-radius-add-reply
index 2f38fbcf7..6b9a39e49 100755
--- a/bin/fs-radius-add-reply
+++ b/bin/fs-radius-add-reply
@@ -54,7 +54,7 @@ $dbh->disconnect or die $dbh->errstr;
 print "\n\n", "Now you must run dbdef-create.\n\n";
 
 sub usage {
-  die "Usage:\n  fs-radius-add user\n"; 
+  die "Usage:\n  fs-radius-add-reply user\n"; 
 }
 
 
-- 
cgit v1.2.1


From e72b1302bd8af9968a0520e1ab5f77d98571a4e6 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Thu, 14 Feb 2002 22:37:38 +0000
Subject: fix bug in multiline radiusprepend

---
 bin/svc_acct.export | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 3ea444df9..aeb49d2b1 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.30 2002-02-12 18:37:43 ivan Exp $
+# $Id: svc_acct.export,v 1.31 2002-02-14 22:37:38 jeff Exp $
 #
 # Create and export password, radius and vpopmail password files:
 # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
@@ -71,7 +71,7 @@ warn "using depriciated textradiusprepend file" if $textradiusprepend;
 
 my $radiusprepend =
   $conf->exists('radiusprepend')
-    ? $conf->config('radiusprepend')
+    ? join("\n", $conf->config('radiusprepend'))
     : '';
 
 my @vpopmailmachines = $conf->config('vpopmailmachines')
-- 
cgit v1.2.1


From 0dc8c09556f5e74b5a58931e40c2da06619a6be7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 15 Feb 2002 19:33:41 +0000
Subject: CP provisioning!!

---
 FS/FS/Conf.pm     |   7 +++
 FS/FS/svc_acct.pm | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile          |   4 +-
 3 files changed, 139 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 5de25510c..d5c00467d 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -267,6 +267,13 @@ httemplate/docs/config.html
     'type'        => 'textarea',
   },
 
+  {
+    'key'         => 'cp_app',
+    'section'     => 'mail',
+    'description' => 'Integration with <a href="http://www.cp.net/">Critial Path Account Provisioning Protocol</a>, four lines: "host:port", username, password, and workgroup (for new users).',
+    'type'        => 'textarea',
+  },
+
   {
     'key'         => 'deletecustomers',
     'section'     => 'UI',
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index f3c2d76d3..65a58fc98 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -7,6 +7,7 @@ use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
              $username_noperiod $username_uppercase
              $shellmachine $useradd $usermod $userdel $mydomain
              $cyrus_server $cyrus_admin_user $cyrus_admin_pass
+             $cp_server $cp_user $cp_pass $cp_workgroup
              $dirhash
              $icradius_dbh
              @saltset @pw_set);
@@ -71,6 +72,16 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
     $cyrus_admin_user = '';
     $cyrus_admin_pass = '';
   }
+  if ( $conf->exists('cp_app') ) {
+    ($cp_server, $cp_user, $cp_pass, $cp_workgroup) =
+      $conf->config('cp_app');
+    eval "use Net::APP;"
+  } else {
+    $cp_server = '';
+    $cp_user = '';
+    $cp_pass = '';
+    $cp_workgroup = '';
+  }
   if ( $conf->exists('icradiusmachines') ) {
     if ( $conf->exists('icradius_secrets') ) {
       #need some sort of late binding so it's only connected to when
@@ -286,6 +297,16 @@ sub insert {
       return "queueing job (transaction rolled back): $error";
     }
   }
+
+  if ( $cp_server ) {
+    my $queue = new FS::queue { 'job' => 'FS::svc_acct::cp_insert' };
+    $error = $queue->insert($self->username, $self->_password);
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
+  }
+  
   if ( $icradius_dbh ) {
 
     my $radcheck_queue =
@@ -351,6 +372,27 @@ sub cyrus_insert {
   1;
 }
 
+sub cp_insert {
+  my( $username, $password ) = @_;
+
+  my $app = new Net::APP ( $cp_server,
+                        User     => $cp_user,
+                        Password => $cp_pass,
+                        Domain   => $mydomain,
+                        Timeout  => 60,
+                        #Debug    => 1,
+                      ) or die $@;
+
+  $app->create_mailbox(
+                        Mailbox   => $username,
+                        Password  => $password,
+                        Workgroup => $cp_workgroup,
+                        Domain    => $mydomain,
+                      );
+
+  die $app->message unless $app->ok;
+}
+
 sub icradius_rc_insert {
   my( $username, $password, %radcheck ) = @_;
   
@@ -517,6 +559,16 @@ sub delete {
       return "queueing job (transaction rolled back): $error";
     }
   }
+  
+  if ( $cp_server ) {
+    my $queue = new FS::queue { 'job' => 'FS::svc_acct::cp_delete' };
+    $error = $queue->insert($self->username);
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
+  }
+
   if ( $icradius_dbh ) {
 
     my $radcheck_queue =
@@ -562,6 +614,24 @@ sub cyrus_delete {
   1;
 }
 
+sub cp_delete {
+  my( $username ) = @_;
+  my $app = new Net::APP ( $cp_server,
+                        User     => $cp_user,
+                        Password => $cp_pass,
+                        Domain   => $mydomain,
+                        Timeout  => 60,
+                        #Debug    => 1,
+                      ) or die $@;
+
+  $app->delete_mailbox(
+                        Mailbox   => $username,
+                        Domain    => $mydomain,
+                      );
+
+  die $app->message unless $app->ok;
+}
+
 sub icradius_rc_delete {
   my $username = shift;
   
@@ -666,6 +736,24 @@ sub replace {
     }
   }
 
+  if ( $cp_server && $old->username ne $new->username ) {
+    my $queue = new FS::queue { 'job' => 'FS::svc_acct::cp_rename' };
+    $error = $queue->insert( $old->username, $new->username );
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
+  }
+
+  if ( $cp_server && $old->_password ne $new->_password ) {
+    my $queue = new FS::queue { 'job' => 'FS::svc_acct::cp_change' };
+    $error = $queue->insert( $new->username, $new->_password );
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
+  }
+
   if ( $icradius_dbh ) {
     my $queue = new FS::queue { 'job' => 'FS::svc_acct::icradius_rc_replace' };
     $error = $queue->insert( $new->username,
@@ -693,6 +781,48 @@ sub icradius_rc_replace {
   1;
 }
 
+sub cp_rename {
+  my ( $old_username, $new_username );
+
+  my $app = new Net::APP ( $cp_server,
+                        User     => $cp_user,
+                        Password => $cp_pass,
+                        Domain   => $mydomain,
+                        Timeout  => 60,
+                        #Debug    => 1,
+                      ) or die $@;
+
+  $app->rename_mailbox(
+                        Domain        => $mydomain,
+                        Old_Mailbox   => $old_username,
+                        New_Mailbox   => $new_username,
+                      );
+
+  die $app->message unless $app->ok;
+
+}
+
+sub cp_change {
+  my ( $username, $password );
+
+  my $app = new Net::APP ( $cp_server,
+                        User     => $cp_user,
+                        Password => $cp_pass,
+                        Domain   => $mydomain,
+                        Timeout  => 60,
+                        #Debug    => 1,
+                      ) or die $@;
+
+  $app->change_mailbox(
+                        Domain    => $mydomain,
+                        Mailbox   => $username,
+                        Password  => $password,
+                      );
+
+  die $app->message unless $app->ok;
+
+}
+
 =item suspend
 
 Suspends this account by prefixing *SUSPENDED* to the password.  If there is an
diff --git a/Makefile b/Makefile
index 283981a87..dd134ebfc 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-TEMPLATE = asp
-#TEMPLATE = mason
+#TEMPLATE = asp
+TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
-- 
cgit v1.2.1


From cee9575a588e883d04b5e06b8fbc999e024331d2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 15 Feb 2002 19:34:12 +0000
Subject: keep accidentally checking in Makefile changes, gotta do something
 about that...

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index dd134ebfc..283981a87 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-#TEMPLATE = asp
-TEMPLATE = mason
+TEMPLATE = asp
+#TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
-- 
cgit v1.2.1


From 7a03e0f0cd9e1eae507be2ab17151059bcb1d3cb Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Fri, 15 Feb 2002 20:21:56 +0000
Subject: remove arbitary uid requirement for vpasswd generation

---
 bin/svc_acct.export | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index aeb49d2b1..cee63bcd5 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.31 2002-02-14 22:37:38 jeff Exp $
+# $Id: svc_acct.export,v 1.32 2002-02-15 20:21:56 jeff Exp $
 #
 # Create and export password, radius and vpopmail password files:
 # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
@@ -350,20 +350,20 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) {
           '',
         ), "\n";
       }
+    }
 
-      ###
-      # FORMAT OF THE VPASSWD FILE HERE
-      print VPASSWD join(":",
-        $svc_acct->username,
-        $cpassword,
-        '1',
-        '0',
-        $svc_acct->username,
-        "$vpopdir/domains/" . $svc_domain->domain ."/" . $svc_acct->username,
-        'NOQUOTA',
-      ), "\n";
+    ###
+    # FORMAT OF THE VPASSWD FILE HERE
+    print VPASSWD join(":",
+      $svc_acct->username,
+      $cpassword,
+      '1',
+      '0',
+      $svc_acct->username,
+      "$vpopdir/domains/" . $svc_domain->domain ."/" . $svc_acct->username,
+      'NOQUOTA',
+    ), "\n";
 
-    }
 
     if ( $svc_acct->slipip ne '' ) {
 
-- 
cgit v1.2.1


From d7a1a7154a401edfbc4844721c08cb6f483d59b7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 16 Feb 2002 07:27:52 +0000
Subject: install warnings about mysql

---
 httemplate/docs/install.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 0f3796c6c..b739af02c 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -12,7 +12,10 @@ Before installing, you need:
   <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.
     <ul>
       <li><a href="http://www.postgresql.org/">PostgreSQL</a> (v7 or higher) is recommended.
-      <li>MySQL has been reported to work.  <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
+      <li><b>MySQL does not work at this time.</b>
+        <i>The following information is provided for developers who wish to contribute MySQL support:</i> See tickets <a href="http://pouncequick.420.am/rt/Ticket/Display.html?id=300">#300</a> and <a href="http://pouncequick.420.am/rt/Ticket/Display.html?id=334">#334</a> in the bug-tracking system.
+      <!-- <li>MySQL has been reported to work.  -->
+        <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
     </ul>
   <li>Perl modules (<a href="http://theoryx5.uwinnipeg.ca/CPAN/perl/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
     <ul>
-- 
cgit v1.2.1


From 2be8d274de7dd4a600b2500cb36ca4272bfc0efa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 16 Feb 2002 18:14:23 +0000
Subject: now in RT2!

---
 TODO | 1423 +-----------------------------------------------------------------
 1 file changed, 4 insertions(+), 1419 deletions(-)

diff --git a/TODO b/TODO
index 6aee3e790..4c582c9d7 100644
--- a/TODO
+++ b/TODO
@@ -1,1424 +1,9 @@
-$Id: TODO,v 1.67 2001-08-19 09:08:18 ivan Exp $
+$Id: TODO,v 1.68 2002-02-16 18:14:23 ivan Exp $
+
+The TODO list / bug-tracking is now kept in a database.  See
+http://pouncequick.420.am/rt/
 
 If you are interested in helping with any of these, please join the
 *development* mailing list (send a blank message to
 ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
 
----
-
-Does Freeside currently support notification to the customer that their
-credit card on file is about to expire? What about notification that their
-credit card was declined after they sign up, say like in 5 months when it
-fails? If not are these options being planned to be added in the next
-release? I think they would be nice options to see Freeside support.
-.
-Tim Jung
-System Admin
-Internet Gateway Inc.
-tjung@igateway.net
-
-deleting an account doesn't remove any references to it in cust_main_invoice.
-it should, or error perhaps?  ("this account is used as an invoice destination,
-remove that first?")  or the cust_main_invoice should be changed to literal.
-it'll bounce, but that seems reasonable...
-
-also cust_main_invoice uses `mydomain' in a way that will have to be changed
-when jeff's branch merges
-
-> I can't use the built in agent mechanism to do ACLs for things like
-> suspension and cancellation, but I can use it for selecting which
-> package types the marketing types are allowed to sign up.  Problem is,
-> I can't seem to figure out the rules as to how cust_main.cgi figures
-> out which packages to stick in the list of packages available for new
-> customers.
-.
-Currently, only packages with a single service with table `svc_acct'
-appear on the `New Customer' screen.  Other packages may be ordered from
-the `Order and cancel packages' link on the main `Customer View' screen.
-.
-Perhaps the `New Customer' UI could be changed like the new `Service Edit'
-screen in CVS, to support all available packages, not just those with a
-single service with table `svc_acct'.
-
-> +----------
-> | Thank you for the response.That being the case do you have any
-> | recommendations as to the most effective way to add prior balances?
-> +----------                                                          
-> 
->   You could create a package called 'Starting Balance' and sell it
-> to them.  Adjust the price as neccessary.
-.
-Yes, this is what to do with the current system.
-.
-In the future, this is what the database would do internally, but
-eventually I'd like the user-interface and the Perl API to offer a
-one-step way to "add a starting balance" that does this underneath.
-.
-I'm also thinking it might be necessary for accouting reasons to add a
-flag to these charges and payments against them, so you can run totals and
-reports ignoring them.  Not sure about this.
-
-> Does Freeside currently support notification to the customer that their
-> credit card on file is about to expire?
-> What about notification that their
-> credit card was declined after they sign up, say like in 5 months when it
-> fails?
-
-
-random templating thoughts:
-for starters, read the "Template Syntax" section of Text::Template
-that sums up the starting philosophy pretty well
-> Text::Template is unsuitable because it's backwards, but don't worry about
-+that quite yet.  everything in that section applies
-..
-then ttp://forum.swarthmore.edu/epigone/modperl/frahthonbror/19990525144012.8806.qmail@plover.com
-..
-then: given that as background, freside will use a simple template syntax designed
-+to interact well with the webmonkey html editors, and will export to Mason
-+and Apache::ASP for starters, and eventually any "right-side-out" "eval"
-+templating system
-
-
-make svc_acct.import complain if you try to use a local file
-
-make the invoices configurable such that:
-> Also, Can you change FreeSide so that it says "GST" instead of TAX?
-
-"Andrew Wafula" <awafula2000@yahoo.co.uk>:
-> Following my recent questions on money_char, i would like to suggest that
-> money_char be used as well in cust_bill.cgi and cust_main.cgi so that the
-> charges are seen in whatever money_char is used in a particular country
-> instead of the default dollar currecny. This would make it such that the
-> system has one monetary unit in its entirety rather than only for the
-> invoicing part. I guess this would be something others would appreciate as
-> well.
-
-Things that would be nice but probably won't happen: testing with 
-MySQL+Sleepycat, a fix for the long-RADIUS-attributes-with Pg problem,    
-passive session monitoring with RADIUS (tailing a log file or monitoring a
-database, as opposed to using a RADIUS with proper callbacks).
-
-anything doing transactions in the web interface should likely move into *.pm.
-(transactions are here woo!)
-
-write some sample billing expressions with libcflow-perl :)
-
-(future templating)
-.
-(at least) These questions need to be answered for Mason, Apache::ASP and
-eperl.  If eperl becomes too much of a pain, I'm okay with forgetting 
-about it - it's not well-maintained.
-.
-How do you interpolate a value?
-mason: <% $value %>
-apache-asp(don't think there is a "with-escaping-HTML" way?): <%= $value %>
-.
-How do you interpolate a value without escaping HTML?
-mason: <% $value |n %>
-apache-asp??: <%= $value %> 
-.
-How do you interpolate a (possibly non-stand-alone, non-interpolated) 
-control structure?  With an inital % - for example:
-.     
-mason:
-        % foreach $value ( @values ) {
-        <OPTION><% $value %></OPTION>
-        % }
-apache-asp:
-        <% foreach $value ( @values ) { %>
-        <OPTION><%= $value %></OPTION>
-        <% } %>
-.     
-This is one of the things I worry that the webmonkey HTML editors will not
-like about Mason.  That and the <%INIT> and <%PERL> tags.
-
-
-in the context of a state machine (& MySQL and Pg locking) for LDAP export:
-.
-Also note that Pg locks are for the duration of the transaction, so 
-Freeside needs to start using transactions for this to happen.  
-FS::UID::adminsuidsetup should explicitly set AutoCommit false and export
-some functions to begin and end transactions on $FS::UID::dbh.  (Well,
-eventually FS::UID should be an overloaded subclass of a DBI handle, but
-we don't have to worry about that until perl threads + mod_perl + threaded
-Apache 2.0 is stable, i.e. quite some time).
-
-Postfix
-also supports virtual domains in a way that's somewhat similar (but not
-compatible with) the way sendmail does.  In the postfix world, all virtual
-domain info is contained in one file (similar to the virtusertable), but
-is formatted as such:
-bar.com         virtual
-foo@bar.com             some@other.net
-quux@bar.com    localuser1
-...
-and so on.  After the file is generated, it gets compiled into a hash db
-using, "postmap /etc/postfix/virtual".
-
-
-steal all the play-nice-with-cache stuff back from RT
-
-Use this for email checking:
-libemail-valid-perl - Check validity of Internet email addresses
-.                                                                
-This module determines whether an email address is well-formed, and 
-optionally, whether a mail host exists for the domain.
-
-
-wishlist from drenalin@ultimanet.com:
-* delete button for customers
-- 15th of the month billing
-- field for customer referrals (naming who it is) and automatically crediting
-+that account
-- ability to edit referrals
-- catch expired credit cards and notify via email when they are expiring
-* show passwords
-- set default shell to /bin/false when adding ppp account
-- import list of POPs from Megapop (see www.ultimanet.com and click on locations
-+from text in index page)
-
-
-wishlist wrt projects/consulting from jivko@ijs.com:
->The other thing, which is the serious part, is the following: We do not
->offer dial-up services and that part of the system does not have to work,
->but we have many customer, for which we do both hosting and consulting work.
-.
->The hosting can be handled by freeside fine, but in the little time I spent 
->on it I could not see how exactly to solve the consulting problem. What I
->would love to see there is a way to create 'projects' for each customer and
->ability to follow up on those (I mean to be able to add new comments,
->descriptions, progress updates etc.). You already have the feature, which
->allows multiple people to access the system with different access rights so
->it should be possible to make it keep track of who and when updated given
->'project' so we could have the developers access the database and update
->the projects they are working on.
-.
-Hmm.  Is this accurate:  Each project is related to a single customer, and
-zero or more packages (billing items).  Each project has a name, due date,    
-and zero or more log entries consisting of date, user, and a text field
-(for "new comments, descriptions, progress updates etc." - would you like
-anything more specific?)
-
-In conjunction with that it looks like you need the ability to create
-"one-off" packages on the fly for arbitrary charges.
-
-> Additionally it would be nice to have a page, where all open projects can
-> be listed and not only that but be able list them by date too. (Say I want
-> to find out which projects are due today or two days from today, or which
-> projects are running late)
-.
-Browse/search project by date and customer.
-.
-> Finally it would be real nice if the billing script could add the cost for
-> all completed projects (or work done by the hour) to the monthly bill along   
-> with the hosting information and using the description of the work from the
-> 'project' table. 
-.
-Can you be more specific about your needs here?
-.
-> This is a lot of work, unless you disagree :-), and I would not expect you
-> to do all of it - we can work on it too - but I would hope for you to lead 
-> the effort.
-.
-I'm trying to get a handle on specifically what you need.
-.
-> Oh, and there is one more thing, but that should be simple to do. I would
-> like to be able to give the customers access to selected information from
-> their account. I want them to be able to monitor the progress of their
-> projects and the status of their accounts. 
-.
-Ok.
-.
-> Does all this make sense? It must be close to what you need at your office
-> though or at least I think so.
-.
-Yes, but we're small and have been tracking projects manually.
-.
-.
->You may have this already .. what I have in mind is the following. Say you
->have a customer for which you do hosting and some consulting (CGI, JAVA
->etc) At the end of the month you need to bill the customer for the hosting,
->35hours of Java programming and 10 hours of HTML authoring. The last two
->are not because the project is over but because the work was done during
->that month.
->
->So the way I see it, and it could be wrong, is that during the month the
->people who work on particular project enter their comments and time spent
->on the project. At the end of the month the billing script generates
->invoices in which besides the hosting charges there are also charges for
->work done during the period.
->
->Currently we do this in a very stupid way by maintaining a customer file,
->in which a script saves things to be invoiced. At the end of the month a
->script goes through these files and generates invoices with all items from
->the files, which have not been flagged as 'paid'. The convenience of this
->is that no one needs to worry about the invoices containing the items they
->need to contain.
-
-
-
-first package select field in edit/cust_main.cgi isn't sticky on errors, yuck
-(also referral isn't sticky either?  yuck)
-
-> 1. A Web Form to the user get his account added automatically . The
-> /etc/raddb/users and /etc/passwd would be updated automatically (these
-> file are on the same machine Freeside is). I guess the the Add
-> Customer
-> page with some customization could be the work.
-> 2. A Canceling Account Web Form available to user cancel his account   
-> at
-> any time he wants.
-> 3. A Password Changing Web Form where the user could change your
-> password by sending your username, old and new password.
-> 4. Additional POP Accounts Creation where the user supply only his
-> main
-> username/password (probably provided from a PPP Account already
-> created)
-> and his POP username/password for this specific account.
-(actually need something more general i guess - probably need some way to say
-which accounts (svc_acct) can log in and make changes per customer (cust_main) )
-
-this is awfully vauge, perhaps email for more info?  don't want to alientate
-someone with accounting experience, but i just don't have time right now.
-.
-Hi Ivan,
-.
-Thanks for the information. It took me a little while to figure it out, but I
-+was
-able to create an invoice. As a lamer and an accountant, may I make a few
-suggestions?
-.
-On the Customer view page:
-1) Layout the information in the manner the invoicing process is conducted.
-    a) Customer information                                                
-    b) Package Ordering    
-    c)  Add a "Create & Edit Invoice" section - this allows auditing of  the
-invoice     before it is processed.
-    d) then put the billing section to actually process the invoice
-    e) then put payment history information                        
-.
-Thanks,
-Mark Roberts <mroberts@iopenenterprises.com>
-
-
-new overdue code might be overzealous.  test carefully.
-
-Port Freeside to use the modules that were abstracted from it:
-Net::SSH, Net::SCP, DBIx::DataSource and DBIx::DBSchema, at least.
-
-"first package" and email invoice (?) not sticky on errors in new/edit customer
-screen.
-
-http://www.ipmeter.com/ integration would be useful
-
-http://tangram.sourceforge.net/
-Tie::DBI
-
-mmm, http://pootpoot.com/~dlowe/DBIx-Table/
-
-The cybercash links in htdocs/docs/config.html are b0rken.
-
-Yes.  Which is what I've been trying to tell you.  (destination user,
-destination domainname) would be represented by the svcnum of a record in
-svc_acct.  (In retrospect, using the uid instead of the svcnum was a bad
-choice).  (domuser, domain name) would be part of the svc_acct_sm record,
-as domuser and domsvc.
-. 
-Upon further consideration, I'll probably eliminate the svc_acct_sm table
-completely, and just add a field for the svcnum of a domain and the svcnum
-of a destination mailbox to svc_acct (or perhaps a one-to-many
-relationship - multiple svcnum(s) for multiple destination mailboxes.
-hmm.)
-
-> > > > Longer-term, I need to do something about the length of the             
-> > > > column names -                                                          
-> > > > The SQL1992 standard defines 18 character column names,                 
-> > > > which would be a                                                        
-> > > > reasonable goal.                                                        
-> > >                                                                           
-> > > Maybe the thing to do would be to separate these out to separate          
-> > > tables.                                                                   
-> > > then we could simply use something like id, attrib_name,                  
-> > attrib_value                                                                
-> > > to                                                                        
-> > > store all of the radius values.                                           
-> >                                                                             
-> > Hmm, no, that's not quite right.  You don't want to store the actual        
-> > strings in the records for each account.  Probably need a table that        
-> > corresponds to the RADIUS dictionary file, with a list of                   
-> > attributes and                                                              
-> > attribute id's, then reference the attribute by id and not name.            
-> >                                                                             
-> > The more difficult bit is handling the service definitions                  
-> > correctly -                                                                 
-> > part_svc and it's effects.                                                  
->                                                                               
-> Yes that could be a bit tricky. Perhaps just one "radius" field in            
-> part_svc that held a list of id's from the radius table that applied          
-> that particular service?                                                      
-. 
-No, that wouldn't let you set defaults or fixed values for each attribute,
-like part_svc currently does.
- 
-
-
-hmm - if you delete an account in svc_acct somehow that a mail alias points to,
-svc_acct_sm.export will fail.  make sure this can't be done using
-the web interface.
-
-Bug: during the linking process apparantly you can link too many services to 
-a package.  *sigh*
-
-zip code i18n is not very good :( but at least US, CA, HU, ?
-
-ut_phonen doesn't check data length.  several
-orthogonal cleanup projects here.  *sigh*
-
-update the cybercash links in config.html and in the homepage.  add more explicit support for other payment types.  etc.
-
-From "Tim Jung" <tjung@igateway.net>
-.
-Automatic CC Decline Notices via email
-Block Time billing for prepaid internet cards (400 hours or whatever block
-time of hours)
-Trouble Ticket System with simple search function for Knowledge Base feature
-Employee Timecards
-Credit Card System support for Red Hat's CCVS, and other Linux credit card
-programs
-Contact Manager/Lead Tracking
-Pre-Sale Quotes
-Cisco NetFlow Account for IP traffic billing
-VoIP and FoIP billing
-Roaming per minute billing based on Radius Proxy support or number they
-dialed into from Radius logs (800# etc)
-Support for OpenSRS Domain Registration
-Support for TUCOWS signup CDs
-
-
-dbdef-create for postgres
-
-pro-rating, fiddling dates
-
-It looks like svc_acct.import doesn't deal well with comments and
-multi-attribute lines.
-
-ivan@rootwood:~/freeside_current$ rgrep -r domuid * | cut -d: -f1 | sort |
-uniq
-CVS/Base/TODO
-TODO
-bin/fs-setup
-bin/svc_acct_sm.export
-bin/svc_acct_sm.import
-htdocs/docs/man/svc_acct_sm.txt
-htdocs/docs/schema.html
-htdocs/edit/CVS/Base/part_svc.cgi
-htdocs/edit/part_svc.cgi
-htdocs/edit/process/svc_acct_sm.cgi
-htdocs/edit/svc_acct_sm.cgi
-htdocs/search/svc_acct_sm.cgi
-htdocs/view/svc_acct_sm.cgi
-site_perl/svc_acct_sm.pm
-
-rootwood:COMPLETEHOST/TODO
-
-Currently, you set a value in the %FS::UID::callback hash with a coderef  
-of the code you want to execute, but this was bad design and will shortly
-be changed to a subroutine to which you pass your coderef to register it.
-
-This is not a bug, it is how the system is currently designed.  After 
-defining a new package, you need to specifically allow agent types to
-purchase packages.  You can do this from the edit screen of the new agent
-type.
-.
-It wouldn't be a bad idea to add a configuration value that makes new
-packages available for all currently existing agent types automatically.
-.
-On Fri, Apr 07, 2000 at 10:50:35AM -0500, David Morton wrote:
-> For some reason, the type_pkgs table didn't get updated when I tried to
-> create a domain service and package...  insert into type_pkgs values   
-> (4,1);  fixed it up so that I could actually order the package.
-
-
-From: Chuck Cochems <zaphod@tdl.com>
-.
-1) automated generating of late notices.  So far the only way I know to
-generate one is to re-invoice manually.
-. 
-2) smart credit card rejection handling.  It should e-mail a note at
-least, explainig that it did't go through, and why.
-. 
-3)coment field in the main customer record.
-.
-4) streamlined payment entry feature. the current scheme has it fairly
-buried.
-. 
-5) queries to show al customers who owe money,and such stuff as that.
-
-
-credits aren't counted against past invoices?  hmm.  something needs to be
-done to "apply payment" genericly. and zero out invoices etc.
-
-more email which should make it into a more organized TODO list:
-.
-I would also love to see Freeside support bandwidth billing by reading the
-Cisco NetFlow Accounting data so we and other ISP's could automatically bill
-co-located servers and even potentially other virtually hosted sites like
-MUD, Palace Chat, IRC Chat, etc based on the bandwidth they use or average
-sustained rates or whatever. I'm not much of a programmer so I don't know
-what all this entails but I did download a NetFlow client agent/whatever for
-Linux though.
- .
-It would also be nice to see Freeside be able to read Apache log files and
-bill customers for web traffic that way as an option also. Plus an option to
-bill for excessive disk usage without having to use quotas if you didn't
-want to, would be a nice feature as well. So you could monitor with a script
-or something to see how much disk space a user was using then get some
-average and charge a certain amount for anything above some preset limit for
-that account type. I might be able to hack something like this up, but I'm
-not 100% sure where to start or if there is something out there that could
-be modified or not.
-.
-Do you think that you will ever support the HKS CCVS (Hell's Kitchen
-Software Credit Card Verification Software) since Red Hat bought them out
-and is going to be including that for credit card processing when you buy
-the professional version? What about possibly supporting the OpenCCVS which
-is a GNU/GPL version of a credit card program? I haven't had time to comb
-through the Freeside code to see how hard it would be to add support for
-these as externally called programs.
-.
-Also any thoughts on help desk, and knowledge base stuff? Any thoughts on
-this stuff, and how possible and what kinds of work or time frame would be
-involved?
-.
-Tim Jung
-System Admin
-Internet Gateway Inc.
-tjung@igateway.net
-
-
-
-           CVS via SSH (Score:1)
-           by platinum (jedgar at fxp dot org) on Thursday September 30, @07:13PM EDT (#4)
-           (User Info) http://www.fxp.org/~jedgar
-           The links above are your best bet for basic cvs server configuration. Once you have a pserver set up, you
-           may consider using cvs via ssh. All you need to do is the following: 
-
-           1) Have ssh and sshd set up on the client and server machines 
-           2) Set CVSROOT="joe@example.com:/home/ncvs" 
-           3) Set CVS_RSH="/usr/local/bin/ssh" 
-           4) Use cvs normally 
-           (Obviously, insert the proper host/paths above) 
-
-           You can also set up cvs/ssh to not need a password every time (similiar to an initial 'cvs login'): 
-
-           1) run ssh-keygen on client machine using no passphrase. 
-           2) copy/add ~/.ssh/identity.pub on the client to ~/.ssh/authorized_keys on the server 
-           (man ssh for more details) 
-
-           The main reason I mentio
-           CVS via SSH (Score:1)
-           by platinum (jedgar at fxp dot org) on Thursday September 30, @07:13PM EDT (#4)
-           (User Info) http://www.fxp.org/~jedgar
-
-
-There's no way to do this currently, though it would be pretty
-straightforward to modify the source - specifically, the _collect_
-subroutine in FS::cust_main.
->
-On Mon, Dec 13, 1999 at 04:05:32PM -0700, Jeff Garner wrote:
-> Freeside will e-mail my users when they are billed if they are setup as
-> billing.
->
-> When setup by credit card it does not e-mail them.  Is there a way to
-> turn on e-mail invoices for those who are billed via credit card?  Kind
-> of like a recipt of billing....
-
-
-doc: http://www.softagency.co.jp/mysql/qmail.en.html
-
-sql1992.txt standard is 18 character column names.  shoot for that, not just
-32 (postgresql default)
-
-Also note that (AFAIK) Freeside won't display any package that has more
-than one service on the "Add Customer" page.  The reason for this is
-because there's no way to dynamically alter the displayed html form
-based on which package is selected. One possible solution would be to
-make an additional page that's used in the signup process that would
-display the form for each package, like a MS-style "Wizard".  The first
-page lets you select the package, then the second page has the custom
-form with fields for each service in that package and a save button. Of
-course, that would require a little perl work.
-.
-Later,
-Scott Cruzen <sic@boernenet.com>
-
-
-Your suggested script with back up /usr/local/etc/freeside, but will miss
-any database not named `freeside'.  Both of our scripts are specific to
-MySQL.  If you're interested in contributing to Freeside, maybe you could
-work on a script which: reads the mapsecrets configuration file and then
-each secrets file to find out what specific database engine(s) (MySQL,
-PostgreSQL, etc.) and database(s) need to be backed up, then does so,
-serializing backups of the same engine, i.e. stop mysql, do all the mysql
-backups, start mysql, stop postgresql, do all the postgresql backups,
-start postgresql, etc.
-> #!/bin/sh                                                                     
-> apachectl stop                                                                
-> mysqldump -t freeside > fs-backup.sql                                         
-> apachectl start                                                               
-> tar -Pzcvf fs-backup-`date +%y%m%d%H%M%S`.tgz fs-backup.sql /usr/local/etc/freeside/                                                       
-> rm fs-backup.sql                                                              
-
-I chose to use counters in the filesystem because there is no standard way
-to get the value of an auto-incrementing keyfield which is common across  
-all databases (as seen through DBI/DBD).
-.
-It certainly wouldn't be a bad idea to use the database-specific methods,
-when available.
-
-htdocs/edit/svc_acct.cgi:
-(Does the `*HIDDEN*' show up when you are adding a new account, and 
-specify the password, then receive an error and are returned to the form?)
-
-more DOC:
-Thought some of you might be interested in this:
-. 
-<ftp://ftp.minivend.com/pub> has CyberCash compatibility modules for 
-Paymentnet <http://www.paymentnet.com> and Authorizenet 
-<http://www.authorizenet.com> which should allow you process transactions
-using those services as well as CyberCash.
-.
-The files are named CCLib.pm.paymentnet and CCLib.pm_authorizenet,
-respectively, and are installed by renaming to CCLib.pm and moving to your
-site_perl directory.  Otherwise, follow the directions for Cybercash v2 in
-htdocs/docs/config.html
-
-DOC:
-fs_passwd/ is a client-server replacement for the `passwd', `chfn' and    
-`chsh' commands that updates the Freeside database.  (so for that to be   
-useful, you'd have to be exporting that data periodically)
-  
-fs_radlog/ is a client-server RADIUS log parser that stuffs the data into
-SQL.  It isn't finished, and probably won't be unless someone who I can't
-convince to use one of the RADIUS daemons that logs to SQL directly pays  
-me money or something.
-  
-fs_signup/ is a client-server signup server.  i'm just finishing it up    
-now; probably isn't on your machine yet.
-
-
-http://www.sisd.com/freeside/list-archive/msg00812.html
-
-package definitions should be implicit allow wrt agent types, not implicit deny
-(with the old behavior possible via a config file)
-
-> So is there anyway it could be setup to allow you to select a "primary
-> service" from each package?  This service would be the one you were prompted
-> for.  Could the signup server then be expanded to allow users to go into
-> their package and "turn-on" the remaining non-primary services(using the
-> primary account.)
-
-take the GPL'ed whois proxy stuff at www.geektools.com and turn it into
-intelligence for Net::Whois.
-
-A web version of the fs_passwd stuff would be nifty.   
-
-If you have Cistron authenticating directly from MySQL, you can replicate
-in real-time instead of exporting periodically.  See 
-<http://www.mysql.com/Manual_chapter/manual_Common_problems.html#Replication>.
-
-these go in docs:
-<http://www.sisd.com/freeside/list-archive/msg00541.html> (was 546), and
-
-and http://www.sisd.com/freeside/list-archive/msg00421.html (was 423)
-
-> > 5: Is there anyway to get freeside to send a sysadmin a warning when a
-> > credit card has expired?
-No, but there should be.
-
-Put this in the doc (quoting Mark Wells <mark@pc-intouch.com>):
->Of course, thanks to the sheer coolness of SQL and MyODBC, you can do
->whatever reports you want in basically whatever application you want.
->There's no need for Freeside itself to do any reports at all.
-
-middle names and titles
-
-On Wed, Jul 07, 1999 at 01:11:40PM -0400, Frank Nazario wrote:
-> Playing and entering information to Freeside i encountered the following
-> missing reports:
-> 
-> View Customers by Agent
-> 
-> View Pending Invoices
-> 
-
-grep 'uncomment this to encrypt password immediately' site_perl/svc_acct.pm
-Not to say that it shouldn't be a configurable option.
-
-in site_perl/cust_main_invoice.pm (elsewhere?), error out if mydomain config file is gone
-(at least until the idea of a default domain goes away)
-
-FS::Record::qsearch does an eval every loop iteration (which is itself not
-guaranteed to work across all DBD's and should be fixed).  This has got to be
-slow.  Fix it.  (I think recent Perls might have a way to accept a variable
-there, no eval needed?)
-
-Could you have added /bin/sync, /sbin/shutdown, and /bin/halt to the
-`shells' configuration file before importing, and removed them afterwords?
-(even better if svc_acct.import did that automatically - it could just    
-munge and restore @FS::svc_acct::shells... hmm.)
-
-> BTW, Ivan, I am trying to verify in an additional database table that a
-> particular user doesn't exist. This database is used to store email aliases a$
-> additional POP boxes for our customers (kinda like AOL allows). I have toyed  
-> with the idea of just writing the aliases to an email only svc_acct that
-> doesn't write to the password file, but that isn't really how I want to do it.
-
-Actually, I think that's a pretty good way to do it.  Cerkit contributed
-support a little while back for svc_acct.pm and svc_acct.export for
-multiple export targets.  It needs to be cleaned up and documented, which
-I'll try to get to soon.  For this to work correctly, the svc_acct_sm
-table should go away, along with the concept of a "default" domain.  
-
-default setting for new packages should allow all agents to purchase them...
-with a config file for the old behaviour
-
-fix or replace Term::Query (Quiz::Question doesn't do what i need)
-
-Check config file reading stuff from CPAN
- 
-Authorizenet module from CPAN!
-
-<http://www.math.fu-berlin.de/~leitner/mutt/faq.html> has a good y2k complience
-statement!
-
-    I'm hoping Freeside can support arbitrailly complex pricing plans
-    because of a simple concept: all prices are perl expressions.  So if
-    you use `19.95' for example, perl evalates that to be `19.95'.  But if
-    you need to do a complex pricing scheme, you just need to write an
-    appropriate perl expression, which will most likely pull data from the
-    database to return pricing.  Some things will already log to SQL; for
-    example most RADIUS servers can or have a patch available.  Getting
-    Freeside to bill based on any sort of data then becomes a matter of
-    importing the data into the database.
- 
-    There are some issues involved with pro-rating, partial month charges,
-    that sort of thing.  Expressions will need a standard way to have the
-    applicable time/data ranges passed to them.  Also the expressions are
-    currently running under the Safe perl module, and the opmask might not
-    be right in all situations.  I'll try to spend some time working on
-    this if you are using it.
-
-> 2. can customers view their bills on-line.                                    
-. 
-Not yet; it needs to be proxied from Freeside to a customer web server in
-a secure way using something not completely unlike the fs_passwd,
-fs_passwdd, fs_passwd_server trio.
-
-
-> Lastly, if someone over pays on an invoice, the credit part does not flow
-> over to other invoices..
-.
-The total balance flows over correctly, but individual payments don't.
-The code you're looking for is in FS::cust_pay::insert
-.
-The question of what to do with overpayments that don't have another 
-invoice to flow into (yet.. or possibly not) is still an open one.    The
-legacy system Freeside replaced long ago had a separate place for this
-(payments waiting for an invoice) for each customer, and it gave our
-bookeeper fits.
-
-
-option to relax username uniqueness in favor of username+domain or mail/shell
-vs. radius to ease import for isp's with namespace problems or who buy others.
-
-do i have to store anything for radius realms besides regular radius attributes
-(which are handled fine now)?
-
-warn or complain or something when invoice_from is empty (and we use it)
-
-Right now Freeside uses the `freq' field of a package definition as a 
-number of months.  The specific section of code you're looking for is in  
-FS::cust_main::bill:
-.       
-        #change this bit to use Date::Manip?
-        #$sdate=$cust_pkg->bill || time;
-        #$sdate=$cust_pkg->bill || $time;
-        $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
-        my ($sec,$min,$hour,$mday,$mon,$year) =
-          (localtime($sdate) )[0,1,2,3,4,5];
-        $mon += $part_pkg->getfield('freq');
-        until ( $mon < 12 ) { $mon -= 12; $year++; }
-        $cust_pkg->setfield('bill',
-          timelocal($sec,$min,$hour,$mday,$mon,$year));
-        $cust_pkg_mod_flag = 1;
-. 
-..and when I went poking for this, looks like it tells us just what needs   
-to be done!  Hehehe...
-.
-Date::Manip can handle cool things like "+ 1 month" (actually the current
-case of /^(\d+)$/ would have to be added as a special case of "+ $1 
-month") and "+ 30 days" (what you need) and even "+ 5 business days" !
-
-
-On Wed, Apr 28, 1999 at 08:38:16PM +0000, Kristian Hoffmann wrote:
-> I can't quite seem to figure out how this exporting works.  From what I
-> understand, when you run svc_acct.export, it rewrites the /etc/passwd,
-> /etc/shadow, etc. files.  Is this only for initial setups with the
-> export hooks being in the pm's?
-.
-You can use both, or just one method.  The configuration files control    
-this.  One of the things in the TODO is to take out the last few things   
-that aren't customizable wrt this and put them in config files.
-
-http://www.daemonnews.org/199905/user-mgmt.html
-
-Term::Query doesn't install out of the box from CPAN.  Fix it (and get it 
-submitted upstream!), or remove requirement from bin/svc_acct.import and
-bin/svc_acct_sm.import and take it out of the install instructions.
-
-use this cool link to explain the Freeside API
-ftp://cpan.nas.nasa.gov/pub/perl/CPAN/doc/FMTEYEWTK/easy_objects.html
-
-Multiple tax rates by geographic region (county, state, and county) are   
-supported; just choose View/Edit tax rates from the main menu.
-
-Multiple tax rates by package are not (yet) supported.
-
-On Wed, Jul 07, 1999 at 12:13:36PM -0400, Shaun Batterton wrote:
-> How would you handle something like multiple tax rates and multiple   
-> states?  For example in Connecticut, they just changed computer and/or
-> data processing services to 3% (whatever that is), and everything else
-> is 6%.
-
-
-> Second, when trying to add a new user I get two types of errors; first one
-> is when I place an e-mail address and select the "submit," Freeside
-> complains with "Error: Unknown local account (specified literally)"
-.  
-You probably put a (local) email address in for email invoices.  Freeside
-stores these as references to the database records, so (for example) they
-follow username changes.
-.
-I'm guessing you put in the email address that you were creating, and got
-that error because it didn't exist yet.  Sounds like a buglet to me.  I'll
-try to fix that soon; in the meantime you can add the invoicing email 
-address afterwords.
-
-(workaround for postgres before 6.5) (unlikely to ever be implemented)
-In the mean-time, this could probably be fixed with the reverse of        
-the kludge in FS::Record::new.  This removes `$' and `,' from money fields
-coming out of the database.  Something which fixed up the data so Postgres
-was happy with it could go in FS::Record::_quote, for data going into the
-database.
-
-our data display problem might be a Freeside problem wrt not using 
-Oracle-compatible DBI syntax (fixed using the return value from $sth->execute
-as a number of rows - something else?).
-
-hooks for arbitrary commands out of configuration files
-svc_acct.pm svc_acct_sm.pm etc.
-
-Add this to a FAQ, along with doing it for middle names:
->  What I'm finding difficult is how to easily 
-> customize fields.  For example, I am trying to add a "middle name" field
-> to the Customer Edit, view, etc.  If I'm going about it right, it appears
-> I have to edit the cust_main.cgi under edit and edit/process and the
-> site_perl/cust_main.pm, as well as other things.  Perhaps you could shed
-> some light on the best way of doing this.
-
-You have the basic idea.  To implement that completely, I would:
-- Add the new field to bin/fs-setup for new users
-- Document the field in htdocs/docs/schema.html
-- Document the change in a new file, htdocs/docs/upgrade4.html
-* Run bin/dbdef-create
-* Add the new field to edit/cust_main.cgi and edit/process/cust_main.cgi
-.
-For bonus points, I'd grep around for the various bits which use "$first 
-$last" or "$last, $first" and replace them with a method call in cust_main.pm,
- , like search/cust_main.cgi
-
-document security model:
-Don't forget about Apache usernames - since, via the mapsecrets file, each
-user can login to the SQL database with a different username and
-password, you can utitilize the security model of the SQL database as
-well.  Also, each username here can point to a different configuration
-directory where you could store user-specific configuration info.  Then   
-you could link each username to one-to-many agents. 
-(The web demo works using a trivial version of this.)
-
-Yes, queue processing or the equivalent via checkpoint fields on various  
-talbes (which you pick up via a pretty simple SELECT) would be really 
-nice too.
-
-default (and ordering) state/county/country config file
-expand the
-cust_main_county table to provide a preferred ordering, so the most common
-entries would be at the top of the selection box.  automatically, based on
-recent selections?
-
-hmm... maybe svc_acct__shell should check off the legal shells list if
-applicable?  yeah... cool.
-
-payinfo field should me much larger than 16
-
-
-[Mon Apr 12 20:31:21 1999] [error] [Mon Apr 12 20:31:21 1999] null: Error closing true: Broken pipe at /usr/local/lib/site_perl/FS/cust_main.pm line 615.
-
-javascript (yuck!) "are you sure?" confirmation on cancelations, etc.
-(view/cust_pkg and view/svc_*)
-
-get rid of time2str("%D") which formats dates in a non-y2k-safe looking fashion
-(all the actual date handling uses UNIX timestamps and is fine)
-
-uncomment expire in view/cust_pkg.cgi and find the expire cron from fsold
-
-(Test this)
-one-time/per-customer/? changes in rates and descriptions ('remembered
-invoices'): implement by creating a new package on the fly... but it isn't 
-associated with any agent types so it won't show up for other customers to buy.
-(but also... make sure they go away when the customer does! - need this? :
- one-off package edits! : need a cust_pkgs or cust_part_pkgs or something table,
- with custnum and partpkg (like type_pkgs)
-(what happens if you hit "custom pricing" but the pricing is already custom?)
-
-Lay out any remaining ugly forms better.
-
-remove "records identical" warning?  gets in the way of more important stuff.
-or fix logic which tries to update identical records??
-1.2 should be quiet enough that the error log is useful, hopefully.
-
-Postgres has a maximum column length of 31 characters (but see NAMEDATALEN in
-postgres_ext.h).  part_svc has columns like: svc_acct__radius_Attribute_flag
-(22 characters!)  It seems that stuff over the limit is silently ignored,
-so we get 4 characters back.  So, Radius_Attributes are max 13 characters with
-stock Postgres.  see rfc2138 for what's affected
-What's a good fix?  (besides recompiling postgres with NAMEDATALEN 64)
-(mysql has a 64 character max column length.  others?)
-
-[Mon Mar 29 06:57:56 1999] -e: Use of uninitialized value at /usr/lib/perl5/Date/Format.pm line 333.
-(when sending mail in cust_main.pm::bill or svc_domain.pm)
-
-look at DBIx::Recordset!  (and Tie::DBI, and...)
-
-undefined conf/lpr gives this uninfomative error:
-[Fri Feb 26 16:42:36 1999] bill.cgi: Can't do bidirectional pipe at
-/usr/lib/per
-l5/site_perl/FS/cust_main.pm line 629.
-[Fri Feb 26 16:42:38 1999] bill.cgi: Error closing : Broken pipe at
-/usr/lib/per
-l5/site_perl/FS/cust_main.pm line 631.
-So give a meaningful error!
-
-password and slipip stuff in svc_acct.pm store need to be split into two fields or something, so the silliness in svc_acct.pm and svc_acct.export with looking at the data to decide what to do with it can be fixed
-
-i10n: Apache::Language
-
-Apache::Session?  Other useful Apache::* ?
-
-email invoices are only sent for the BILL payby.  If setup, should statements
-(since they're not invoices) be sent for COMP and CARD as well?
-
-$cgi->keywords is causing the (hard to trace) error:
-   	Use of uninitialized value at (eval 5) line 5
-
-edit/cust_main.cgi gives an uninformative error message:
-> Can't call method "agentnum" without a package or object reference at   
-> /usr/local/apache-ssl/htdocs/freeside/edit/cust_main.cgi line 116.
-if there are no agents.
-
-(is this missing on any web screens?  (easy with $cust_svc->label)
-Add the ability for services to filter information up to the package level
-for web screens, so you can select a particlar package based
-on username or domain name, etc.
-
-Allow a cancelled/suspended/active status from packages to bubble up to
-the customer lists.  Put active, then suspended, then cancelled accounts.
-Similar ordering on the package listing inside a single customer.
-
-false laziness: edit/cust_main.cgi got some parts copied from edit/svc_acct.cgi
-the web interface in general needs to be redone in a more abstract way.
-
-false laziness: some of search/svc_acct_sm.cgi was copied to search/svc_domain.cgi.  but web interface in general needs to be rewritten in a mucho cleaner way.
-
-subroutine the where clause (eventually all SQL) as OO perhaps (has anyone done this?)
-
-add a select method to FS::Record?
-
-one-time/per-customer/? changes in rates and descriptions ('remembered
-invoices'): implement by creating a new package on the fly... but it isn't 
-associated with any agent types so it won't show up for other customers to buy.
-(but also... make sure they go away when the customer does! - need this? :
- one-off package edits! : need a cust_pkgs or cust_part_pkgs or something table,
- with custnum and partpkg (like type_pkgs)
-(what happens if you hit "custom pricing" but the pricing is already custom?)
-
-You can't delete the stuff under administration yet.  Add this,
-_including_ making sure the thing you are deleting is not in use!
-
-add links on view/cust_main.cgi to setup services, like view/cust_pkg.cgi
-
-FS::cust_pkg _require_'s FS::$svc, but this won't work with %FS::UID::callback
-loading of configuration.  (pry need same idea, but will run immediately if
-context allows).  Looks like error is masked by 'use FS::cust_svc' which in
-turn 'use's FS::{svc_acct, svc_acct_sm, svc_domain}' which is now explicit
-w/comments in source
-
-Allow a cancelled/suspended/active status from packages to bubble up to
-the customer lists.  Put active, then suspended, then cancelled accounts.
-Similar ordering on the package listing inside a single customer.
-
-svc_domain.pm mail sending uses Date::Format which doesn't seem to pick up 
-correct timezone.
-
-view/svc_domain.cgi needs to know the domain might be unaudited (cosmetic)
-
-remove whois_hack set to 1 for svc_domain.pm?  add all known registries and
-whois accordingly.
-.us domains and others!
-site_perl/svc_domain.cgi (hmm... or maybe should have a button?  or maybe svc_domain.pm should handle this) should set $whois_hack for non-internic domains, so you can add them...
-
-turn on the depriciation warnings for [e]idiot in FS::CGI. Stop using [e]idiot
-the last places it is (htdocs/search/ htdocs/misc/ htdocs/misc/process)
-
-(test cust_main.pm with cybercash v2 and v3, especially with the callback
- stuff AND with mod_perl w/cybercash v2 kludge in package main)
-(callback stuff should be eliminated by now)
-
-bah, table/itable/*table in FS::CGI is silly.
-
-doc Apache::AuthDBI as well
-..
-Provide sample httpd.conf files.
-
-hey look: Tie::DBI!  Check that out.  Override its commit with something that
-does perl-side caching for ? a performance improvement and as an emulation
-layer to plug in f.ex mysql's atomic transactions
-..
-Record.pm uses does some non-portable DBI things.  MySQL and Pg seem fine.
-Fix it anyway unless we migrate to Tie::DBI.
-
-faq
-
-cust_bill.pm uses '==' comparison on dates because they're currently ints
-
-config file for allowed card types
-
-write instructions for adding new services w/svc_Common.pm.  Get rid of all
-places where svc_* tables are hardcoded (rename svc_acct_pop to part_pop so
-we can do that)
-
-test and document libapache-dbi-logger (woo!)
-
-radius logfile parsing and perl expression check.
-
-Fix in cust_bill BUGS: 
-There is an off-by-one error in print_text which causes a visual error (Page 1
-of 2 printed on some single-page invoices).
-
-fields should be a method against a FS::Record or derived object, as well as
-being something you can call as FS::Record::fields('tablename').  Might
-even be able to handle both in the same routine (that would be neato).
-
-Immediate removal of incorrectly entered check payments (can't take too
-long to do this, or accounting is fubared).
-
-Add code to move from one service to another (POP to SLIP/PPP, etc.).
-This _should_ be possible by working off the rules in part_svc rather than
-hardcoding anything in.  The rules in part_svc may need some elaboration,
-perhaps.
-
-Use ut_ FS::Record methods in all derived classes (possibly some from dbdef?... eventually all from dbdef??? - but then `dbdef-create' would be impossible as there would be metadata we couldn't ask the backend for.  hmm.)
-
-(bring back from fsold, ) Generalize config-sending stuff and make more configurable.
-Expand the HylaFAX interface (also possibly generalize for other fax
-softwar ie .comfaxe); allow things like arbitrary faxes of sales
-literature, specific troubleshooting documents and so on.  Maybe even
-allow users to do this (though that might not belong in Freeside).
-misc/sendconfig.cgi
-misc/process/sendconfig.cgi
-Configure fax recipients via a separate box rather than using the finger
-name or first+last from cust_main.
-
-move all phone number logic out of Freeside - let HylaFAX or whatever
-handle it.
-
-soundex searches for customer name and company?  where are free soundex tools? (standard Text::Soundex duh) - I could have sworn I saw Text::Soundex on CPAN?!
-
-should be able to link on some field in email alias (right now you can link
-on username or domain with a fallback to svcnum)
-
-generalize and make configurable new invoice printing scheme in FS::cust_main::collect (past due)
-
-deleting an svc_domain should delete all associated svc_acct_sm records.
-same with a svc_acct.
-
-periodic password encrypter
-
-Automated, configurable notification, suspension and cancellation of
-defunct accounts.
-...
-expire cron job
-...
-Allow for a future setup date on accounts.
-
-sub AUTOLOAD in FS::Record should warn? die? if used with a non-existant column
-name?
-
-edit (not just import, export and allow default/fixed) arbitrary radius stuff
-in svc_acct
-edit/svc_acct.cgi and edit/process/svc_acct.cgi should deal with arbitrary radius stuff
-
-radius import should take DEFAULT entry and put it in /var/spool/freeside/conf/radius-default ; svc_acct.export should use it (and doc)
-
-in UI, s/State/State\/Provence/go and s/County/County\/Locality/go
-
-what else (besides l10n) for i18n? (money!)
-
-audit htdocs/* for things that should be libraried and things that should be
-new methods on the objects (need to do this before implementing a new UI)
-all the big things are done
-
-some places we die() where we should &FS::CGI::idiot (and perhaps vice-versa).
-Decide based on whether or not the "error" should show up in logs.
-
-all .cgi's should use standard header/footer and idiot() subroutines.  maybe HTML:: perl modules
-for HTML creation.  Maybe Embperl or something along those lines.  ?
-
-When running bin/bill, Fix this (Annoying but harmless):
-Use of uninitialized value at /usr/local/lib/site_perl/FS/cust_pkg.pm line 99, <ADDRESS> chunk 4.
-Use of uninitialized value at /usr/local/lib/site_perl/FS/cust_pkg.pm line 102, <ADDRESS> chunk 4.
-Use of uninitialized value at /usr/local/lib/site_perl/FS/cust_pkg.pm line 105, <ADDRESS> chunk 4.
-
-all cgi (but internal to the isp) places where package names are listed should also have
-comment (like agent_type)
-
-clean up $recref and other silliness and use -> calls where possible, or
-one other alternative.  clean up everything else.
-should FS::Record use Tie::Hash?  That would be very clean, but where do we
-store the other information?  Maybe you could ask any FS::Record object for a
-tied hash?
-
-change all file access from regular open(FILE,) stuff to OO, because of 
-problems scoping and passing filehandles like that.
-
-the web interface should create a new object and use it instead of a blank
-form for new records.  the create method of svc_ objects should set defaults
-(from part_svc).
-
-sub check in man FS::table_name should be rewriteen.  Get rid of $recref
-stuff.  Make sure all fields that refer to other database are checked.
-
-Integration with signup disks (are there any free ones?  Netscape?).
-
-One-button cancel (+refund) for lusers who can't get online.
-
-Keep information on virtual web servers (hostname, IP, host machine,
-directory, etc.) and export this information for importation into the ISPs
-web farm. 
-
-Remove requirement that the first mail alias be the catchall?  Still make
-sure only one catchall per domain is defined in any case, of course. 
-
-Ability to move cust_pkg records from one customer to another? (proably
-will need to cancel the old and create a new like when we move services
-between packages). 
-
-Auto-increment expired cards one year, and try again?
-
-More non-US stuff - zip codes, country codes, foreign currencies, etc.
-
-cust_refund.{cgi.pm} need to do cards xaxtions.  (now we only have cust_credit)
-
-Nicer set of integrated reporting possibilities, like weekly sales totals
-by customer, package, agent, referral, etc., aging reports sorted by lots
-of different things, and so on.
-
-Client/server setup for users to modify their own passwords, shells, etc,
-via passwd or secure web interface (prelminary passwd/chfn/chsh
-replacement done).  Complicated by the fact that we don't want to allow
-incoming connections to the machine running Freeside, so we probably need
-to have a daemon on each external shell or web machine that is contacted
-by the Freeside machine.  Be very very careful for both traditional
-security issues and DoS problems. 
-
-An extension of the above to allow users to modify selected parts of their
-own information, order and cancel services.  A web interface for new
-customers.
-
-Expand domain name stuff to house all domain information.  Export
-named.boot/named.conf (primary and secondary) and named.{domain} files.
-Add more registries (not just InterNIC's com org net edu)
-
-Nice postscript paper invoices, rather than current ASCII invoices.
-
-think about race-condititions in FS::Record and derived ->check ->insert
-and so on, uid and username checks in svc_acct, etc.
-
-Move to rsync over ssh file exportation rather than scp.
-
-check 'n fix the proactive password checker. (cracklib?)
-
-refunds of "BILL" payments: generate pseudo-check.
-
-write batch senders and batch parsers for the different credit card processors
-people use/
-More CC processors/methods.
-
-you should be able to fiddle the setup date in cust_pkg. (at least initially)
-
-delete options in administration section
-
-write a generic batch senders and batch parsers.
-
-need a way to override svc_acct export on a per-machine basis; just use config files based on machine name i suppose; document that. (no, import desync_hosts
-type stuff from cerkit)
-...
-add a table with column of export services (passwd, shadow, master.passwd, .qmail file update, dns update, etc.) and rows machine groups and whether or not to export that (and any necessary parameters).  wasn't matt (vunderkid, not matt@michweb) working on this?  find him?  each machine goes in a group of its own as well as a group based on function.  add a table with only svcpart and machine group.  now, when you import from each machine, it can get its own accounts with one svcpart and universal accounts with another svcpart.  (though that does make the username duplicate checking more interesting)
-
-you should be able to get column types as a method against an FS::Record object
-as well as dbdef->table($table)->column($column)->type
-
-move to perl module for fuzzy and soundex searching.
-
-package view needs to list extraneous services; we need to prevent the
-creation of them so this never happens (and mark it as such in the source)
-(the creation problem should be fixed - though they will still happen if people
-fsck around in the data manually, so list them anyway)
-
-add attribute dictionary to fs-setup as a menu, plus analyze users file to
-decide automatically
-
-Check for and report on duplicate billing accounts (cust_main, though many
-will have a need for these so probably don't disable them outright.)
-
-create a ->warn as well as a ->check method for all FS::table classes?
-(see above)
-
-something to automate making a release and updating the web demo
-
-export a debian-style (also redhat and?) /etc/group file aswell!
-
-svc_acct_sm.import qmail import should pull in recipientmap people too.
-
-.pm's like svc_acct.pm which need to do time-consuming things like ssh remotely
-should fork and do them in a child.
-
-i18n/l10n: take ALL messages and catalog them in english.txt or in database or something, so we can eventually go int'l.  int'l currency support would be a help aswell.
-
-get some of { city, county, state, zip } from the missing bits if
-possible (where can i get the data to do this?  usps.gov?)
-
-additional interfaces (perltk?  java?)
-
-Put the GPL notice in all files.
-
-integrate w/IDEA's signup server
-
-$cust_bill->owed database field to be eliminated, replaced by a method call
-that calculates on the fly.  make sure to grep for ->(get|set)field('owed') 
-same for cust_credit->credited
-
-Export quota information.
-
-move all configuration to a central place.  maybe in blob's in the
-database.  maybe even things like the code to execute when a username is
-changed can be in there, so less of the distributed scripts change between
-different sites.
-
-Implement setup and recurring fees as Safe perl expressions rather than
-numbers, to allow for variable-rate services.  Backwards compatibility is
-obtained because { 43 } in perl is still 43.  :)  Define API to pass
-starting and ending dates and any other necessary data to expression
-(fees are currently evaluated as Safe expressions but more work needs to
-be done to define an opmask for various needs, write examples
-(usage-based billing, etc.) and so on).
-...
-Add the ability to modify the next billing date in cust_pkg, and take
-appropriate action.  This will allow the implementation of pro-rate/1st of
-the month billing as well as the ability to manually fiddle with
-anniversary dates in cust_pkg, so you can sync a customer's anniversary
-date even if you're using anniversary billing (manually or automatically).
-(now with above, we need to have a way to automatically pro-rate /^(\d+)$/
-charges - anything more complicated should figure it out itself given
-starting and ending dates [document that!])
-...
-Daily Radius log parsing into database; other logfile formats?
-...
-Callbacks to enforce hourly limits on accounts (suspend until the end of
-the billing period?), for those who limit customers rather than tack on
-extra charges.
-
-Flag packages (part_pkg) as taxable or non/taxable as some ISPs (for
-example) need to charge tax on equipment but not service (separate flags
-for setup and recurring fee... or perhaps a setup_tax, setup_notax,
-recur_tax and recur_notax fees, and possibly something more flexible if
-there is need).
-
-Allow for a variable number of invoices for customers who need multiple
-copies.
-
-Add a mail alias service with table svc_acct (not domain mail aliasing
-which is domain with svc_acct_sm)
-
-(bring back from fsold) Change customer comment field from its current kludge to something more
-workable.
-
-Better work orders with more information.  Should eventually open a ticket
-when we have such a thing.
-edit/svc_wo.cgi
-edit/process/svc_wo.cgi
-Call tracking and trouble tickets.
-
-More accoutability for complimentary accounts: approval, expiration, term
-(no more than x months in advance) and notification.
-Flag particular users (or all users, for that matter) as having their
-passwords hidden and/or locked from users of Freeside (maybe need Freeside
-security levels first?). 
-...
-Better Freeside-level configurable access, for those ISP's who have
-employees they can't trust.  Right now you're "stuck" with setting up
-.htaccess stuff yourself.  This should really just be integrated. 
-
-configuration/setup should get web interface
-...
-/usr/local/etc/freeside should be configurable
-...
-(probably as part of some automated installation process?)
-
-This requires some serious magic in FS::Record:
-ok, if date_type in fs-setup is to be something besides int,
-now we need to create wrappers
-for them so they behave identically across RDBMS's, ie date pops out as as
-UNIX timestamp (or an object of some sort? maybe even a blessed $obj which
-is a string not a hashref for backwards compatibility?) and so on. (remember
-to treat '0' as Not a Date instead of 1/1/70.
-
-Add Freeside-level transactions for RDBMS's which don't support
-transcations?  (Currently we assume a minimal RDBMS which has no rollback,
-transactions or atomic updates).  Or just require a RDBMS that supports
-rollback and/or atomic updates and get rid of the work-arounds?  The /rdb
-interface had this kludge on top of it but is a technical dead-end in most
-other ways, unless it can gain an SQL parser and DBD interface.
-...
-if i'm really bored, find the /rdb interface in fsold and port it to NoSQL,
-and while I'm add it add interfaces for AnyDBM_File tied hash.. hmm.  Shouldn't
-an FS::Record have something to do with a tied hash?  But we don't want
-performance to go gaga... maybe something with commit to help out here?
-...
-Ok: FS::Record gives you a tied hash, and you get methods for commit, etc.
-
-Better automated comparison of our CC records with processors (CyberCash,
-at least, has not always had 100% accuracy, though recent versions are
-much better) 
-
-Expect or other pty based login check, where we actually connect to a
-terminal server or shell machine and test logging in as the user (if we
-are keeping a cleartext password for that user)  (This is something tech
-support often needs for new customers)
-
-Use cust_main table for pre-sales tracking as well?
-
-Automatic commision report and check generation via freq and prog (to
-become a Safe perl expression) fields in agent table, and possibly others.
-
-Database and add a mailed-out date and method for disk/CD mailing, so a
-customer can call and you can say, "sent on xx/xx/xx via {US Mail, Fedex,
-UPS, etc}" 
-
-Inventory tracking for physical items such as routers (for sale or
-lease... probably doesn't make a difference in the ordering... but if you
-cancel a router lease the inventory should come back.  hmm.)
-
--- Matt's wishlist ---
-.
-From matt@michweb.net Fri Feb 20 16:39:53 1998
-Date: Thu, 19 Feb 1998 23:20:11 -0500
-From: Matt Simerson <matt@michweb.net>
-Reply-To: quadran-developer@netgoth.com
-To: quadran-developer@netgoth.com
-Subject: Re: Welcome to quadran-developer
-.
->Whats it based on and what is it supposed to do?  I'm interested, but
->unfortunatly, I don't have that much time to help on the project (I'm busily
->working on one of my own based around MySQL and Qt right now -- don't know
->if it will be GPL'ed or not yet -- we'll probably just use it in house since
->it is designed around our system)...
-.
-That's what I set out to find, but didn't find anything on the web site.
-I'm looking for something that will do the following:
-.
-Single point of entry for users on a secure system:
-	Creates account on user (public) systems
-		update /etc/passwd/master.passwd file
-		update radius database (if necessary)
-	Set up up disk quotas (although I hacked adduser to do this)
-	Option for adding user to a mailing list(s)
-	Export of new user info to customizable report (for automated entry
-into
-		accounting software, etc...)
-.
-Automated billing:
-	Export credit card info for batch processing and have hooks built
-		in for other forms of electronic processing.
-	Batch-Payment (apply payments from formatted text file).
-	Customizable reports for manual entry/importing into Accounting
-software
-	Email or laser print invoices
-	Sanity checks credit card numbers before processing (code available)
-.
-Simple method for disabling an account.
-	Arbitrary Expiration Dates (on a given day, in x days)
-	Remove from radius.
-	Changing password to '*'
-	Virtual customers disabling dns, http server, log processing, etc..
-.
-Billing for different account types:
-	Dialup monthly flat rate. Prorates for partial months.
-	Dialup monthly flat rate for x hours + hourly usage.
-	Dialup email only
-	Email only accounts
-	Virtual Web accounts - w/multiple mailboxes
-	Leased line accounts
-	Disk space used over quota.
-	Tech support minimum + hourly charges
-	Other for misc stuff (modem, RAM, etc...)
-.
-Per user definable RADIUS attributes (ties in with above)
-	Fixed IP
-	Simultaneous Use
-	IP filters (for dialup email only)
-.
-Keep logs of modem usage generated daily from radius accounting logs stored
-on multiple radius servers.
-.
-Keep logs of disk usage generated from quota.
-.
-Method of adding virtual domains to your system:
-	Automatically grabs an IP address from a preassigned pool.
-	Creates a domain.com database file from database fields
-	Updates /etc/named.conf or /etc/named.boot and reloads named.
-	Add's virtual.com to /etc/sendmail.cw or qmail control files.
-	Edits your web servers httpd.conf file and restarts http server.
-	An optional section for adding vif's can be added if the users OS
-		supports adding them on the fly. Otherwise it's up to the end
-		user. Make a hook that can run a custom script that the user
-		tweaks for his system.
-	Update or create the config file your web stats analyzer needs. I've
-		done this for analog (free) and http-analyze. Probably
-		should only officially support analog and let users hack
-		it to their hearts desire.
-I've already written scripts that do most of the virtual web stuff on my
-system...in bash. Shouldn't be hard for a perlmeister to convert. In fact,
-as long as all the info was stored in the database (username, domain name,
-and ip pool) this could easily just be run as an external script that the
-user tweaks to match his system.
-.
-We use a great accounting software (M.Y.O.B) that does all the AP, AR,
-Payroll, Tax stuff, and most everything else we could need. It's already
-set up for the type of checks we have, etc, etc... I just need something to
-do the billing part. I can import/export sales and payments directly once
-the billing part is done. You can't write accounting software as good as
-M.Y.O.B. for $120.
-
-
-- 
cgit v1.2.1


From b2860f4fe976d87f3efebc64021a9378185d3079 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 16 Feb 2002 21:47:32 +0000
Subject: work with current Apache::ASP

---
 htetc/global.asa | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htetc/global.asa b/htetc/global.asa
index daf1c397f..db37bf156 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -49,7 +49,8 @@ use FS::type_pkgs;
 sub Script_OnStart {
   $Response->AddHeader('Pragma' => 'no-cache');
   $Response->AddHeader('Cache-control' => 'no-cache');
-  $Response->AddHeader('Expires' => 0);
+#  $Response->AddHeader('Expires' => 0);
+  $Response->{Expires} = -36288000;
 
   $cgi = new CGI;
   &cgisuidsetup($cgi);
-- 
cgit v1.2.1


From 5e9885a92ecff7ba0475d206752ccfd261788508 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sun, 17 Feb 2002 19:07:32 +0000
Subject: queue svc_forward remote commands; better commands too

---
 FS/FS/svc_forward.pm | 184 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 152 insertions(+), 32 deletions(-)

diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index 7fde3eeab..7e0a4fd99 100644
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -5,7 +5,7 @@ use vars qw( @ISA $nossh_hack $conf $shellmachine @qmailmachines
              @vpopmailmachines );
 use Net::SSH qw(ssh);
 use FS::Conf;
-use FS::Record qw( fields qsearch qsearchs );
+use FS::Record qw( fields qsearch qsearchs dbh );
 use FS::svc_Common;
 use FS::cust_svc;
 use FS::svc_acct;
@@ -94,9 +94,9 @@ defined.  An FS::cust_svc record will be created and inserted.
 If the configuration value (see L<FS::Conf>) vpopmailmachines exists, then
 the command:
 
-  [ -d $vpopdir/$domain/$source ] || {
-    echo "$destination" >> $vpopdir/$domain/$username/.$qmail
-    chown $vpopuid:$vpopgid $vpopdir/$domain/$username/.$qmail
+  [ -d $vpopdir/domains/$domain/$source ] && {
+    echo "$destination" >> $vpopdir/domains/$domain/$username/.$qmail
+    chown $vpopuid:$vpopgid $vpopdir/domains/$domain/$username/.$qmail
   }
 
 is executed on each vpopmailmachine via ssh (see the vpopmail documentation).
@@ -115,29 +115,42 @@ sub insert {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
   $error = $self->check;
   return $error if $error;
 
   $error = $self->SUPER::insert;
-  return $error if $error;
+  if ($error) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
 
   my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->srcsvc } );
   my $username = $svc_acct->username;
   my $domain = $svc_acct->domain;
   my $destination;
   if ($self->dstsvc) {
-    my $dst_svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->dstsvc } );
-    $destination = $dst_svc_acct->email;
+    $destination = $self->dstsvc_acct->email;
   } else {
     $destination = $self->dst;
   }
     
   foreach my $vpopmailmachine ( @vpopmailmachines ) {
     my($machine, $vpopdir, $vpopuid, $vpopgid) = split(/\s+/, $vpopmailmachine);
-    ssh("root\@$machine","[ -d $vpopdir/$domain/$username ] || { echo \"$destination\" >> $vpopdir/$domain/$username/.qmail; chown $vpopuid:$vpopgid $vpopdir/$domain/$username/.qmail; }") 
+    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' };  # should be neater
+    my $error = $queue->insert("root\@$machine","[ -d $vpopdir/domains/$domain/$username ] && { echo \"$destination\" >> $vpopdir/domains/$domain/$username/.qmail; chown $vpopuid:$vpopgid $vpopdir/domains/$domain/$username/.qmail; }") 
       unless $nossh_hack;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
+
   }
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
 
 }
@@ -149,25 +162,99 @@ returns the error, otherwise returns false.
 
 The corresponding FS::cust_svc record will be deleted as well.
 
+If the configuration value vpopmailmachines exists, then the command:
+
+  { sed -e '/^$destination/d' < 
+      $vpopdir/domains/$srcdomain/$srcusername/.qmail >
+      $vpopdir/domains/$srcdomain/$srcusername/.qmail.temp;
+    mv $vpopdir/domains/$srcdomain/$srcusername/.qmail.temp
+      $vpopdir/domains/$srcdomain/$srcusername/.qmail;
+    chown $vpopuid.$vpopgid $vpopdir/domains/$srcdomain/$srcusername/.qmail; }
+    
+
+is executed on each vpopmailmachine via ssh.  This behaviour can be supressed
+by setting $FS::svc_forward_nossh_hack true.
+
+=cut
+
+sub delete {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::Autocommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::delete;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  my $svc_acct = $self->srcsvc_acct;
+  my $username = $svc_acct->username;
+  my $domain = $svc_acct->domain;
+  my $destination;
+  if ($self->dstsvc) {
+    $destination = $self->dstsvc_acct->email;
+  } else {
+    $destination = $self->dst;
+  }
+  foreach my $vpopmailmachine ( @vpopmailmachines ) {
+    my($machine, $vpopdir, $vpopuid, $vpopgid) =
+      split(/\s+/, $vpopmailmachine);
+    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' };  # should be neater
+    my $error = $queue->insert("root\@$machine",
+      "sed -e '/^$destination/d' " .
+        "< $vpopdir/domains/$domain/$username/.qmail" .
+        "> $vpopdir/domains/$domain/$username/.qmail.temp; " .
+      "mv $vpopdir/domains/$domain/$username/.qmail.temp " .
+        "$vpopdir/domains/$domain/$username/.qmail; " .
+      "chown $vpopuid.$vpopgid $vpopdir/domains/$domain/$username/.qmail;"
+    )
+      unless $nossh_hack;
+
+    if ($error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
+
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+}
+
+
 =item replace OLD_RECORD
 
 Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
-If srcsvc changes, and the configuration value vpopmailmachines exists, then
-the command:
+If the configuration value vpopmailmachines exists, then the command:
 
-  rm $vpopdir/$domain/$username/.qmail
+  { sed -e '/^$destination/d' < 
+      $vpopdir/domains/$srcdomain/$srcusername/.qmail >
+      $vpopdir/domains/$srcdomain/$srcusername/.qmail.temp;
+    mv $vpopdir/domains/$srcdomain/$srcusername/.qmail.temp
+      $vpopdir/domains/$srcdomain/$srcusername/.qmail; 
+    chown $vpopuid.$vpopgid $vpopdir/domains/$srcdomain/$srcusername/.qmail; }
+    
 
 is executed on each vpopmailmachine via ssh.  This behaviour can be supressed
 by setting $FS::svc_forward_nossh_hack true.
 
-If dstsvc changes (or dstsvc is 0 and dst changes), and the configuration value
-vpopmailmachines exists, then the command:
+Also, if the configuration value vpopmailmachines exists, then the command:
 
-  [ -d $vpopdir/$domain/$source ] || {
-    echo "$destination" >> $vpopdir/$domain/$username/.$qmail
-    chown $vpopuid:$vpopgid $vpopdir/$domain/$username/.$qmail
+  [ -d $vpopdir/domains/$domain/$source ] && {
+    echo "$destination" >> $vpopdir/domains/$domain/$username/.$qmail
+    chown $vpopuid:$vpopgid $vpopdir/domains/$domain/$username/.$qmail
   }
 
 is executed on each vpopmailmachine via ssh.  This behaviour can be supressed
@@ -193,18 +280,43 @@ sub replace {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
   my $error = $new->SUPER::replace($old);
-  return $error if $error;
+  if ($error) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  my $old_svc_acct = $old->srcsvc_acct;
+  my $old_username = $old_svc_acct->username;
+  my $old_domain = $old_svc_acct->domain;
+  my $destination;
+  if ($old->dstsvc) {
+    $destination = $old->dstsvc_acct->email;
+  } else {
+    $destination = $old->dst;
+  }
+  foreach my $vpopmailmachine ( @vpopmailmachines ) {
+    my($machine, $vpopdir, $vpopuid, $vpopgid) =
+      split(/\s+/, $vpopmailmachine);
+    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' };  # should be neater
+    my $error = $queue->insert("root\@$machine",
+      "sed -e '/^$destination/d' " .
+        "< $vpopdir/domains/$old_domain/$old_username/.qmail" .
+        "> $vpopdir/domains/$old_domain/$old_username/.qmail.temp; " .
+      "mv $vpopdir/domains/$old_domain/$old_username/.qmail.temp " .
+        "$vpopdir/domains/$old_domain/$old_username/.qmail; " .
+      "chown $vpopuid.$vpopgid " .
+        "$vpopdir/domains/$old_domain/$old_username/.qmail;"
+    )
+      unless $nossh_hack;
 
-  if ( $new->srcsvc != $old->srcsvc ) {
-    my $old_svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $old->srcsvc } );
-    my $old_username = $old_svc_acct->username;
-    my $old_domain = $old_svc_acct->domain;
-    foreach my $vpopmailmachine ( @vpopmailmachines ) {
-      my($machine, $vpopdir, $vpopuid, $vpopgid) =
-        split(/\s+/, $vpopmailmachine);
-      ssh("root\@$machine","rm $vpopdir/$old_domain/$old_username/.qmail")
-        unless $nossh_hack;
+    if ( $error ) {
+       $dbh->rollback if $oldAutoCommit;
+       return "queueing job (transaction rolled back): $error";
     }
   }
 
@@ -212,21 +324,25 @@ sub replace {
   my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $new->srcsvc } );
   my $username = $svc_acct->username;
   my $domain = $svc_acct->domain;
-  my $destination;
   if ($new->dstsvc) {
-    my $dst_svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $new->dstsvc } );
-    $destination = $dst_svc_acct->email;
+    $destination = $new->dstsvc_acct->email;
   } else {
     $destination = $new->dst;
   }
   
   foreach my $vpopmailmachine ( @vpopmailmachines ) {
     my($machine, $vpopdir, $vpopuid, $vpopgid) = split(/\s+/, $vpopmailmachine);
-    ssh("root\@$machine","[ -d $vpopdir/$domain/$username ] || { echo \"$destination\" >> $vpopdir/$domain/$username/.qmail; chown $vpopuid:$vpopgid $vpopdir/$domain/$username/.qmail; }") 
+    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' };  # should be neater
+    my $error = $queue->insert("root\@$machine","[ -d $vpopdir/domains/$domain/$username ] && { echo \"$destination\" >> $vpopdir/domains/$domain/$username/.qmail; chown $vpopuid:$vpopgid $vpopdir/domains/$domain/$username/.qmail; }") 
       unless $nossh_hack;
+    if ( $error ) {
+       $dbh->rollback if $oldAutoCommit;
+       return "queueing job (transaction rolled back): $error";
+    }
   }
   #end subroutinable bits
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 }
 
@@ -279,7 +395,11 @@ sub check {
   return "one of dstsvc or dst is required"
     unless $self->dstsvc || $self->dst;
 
-  return "Unknown dstsvc" unless $self->dstsvc_acct || ! $self->dstsvc;
+  #return "Unknown dstsvc: $dstsvc" unless $self->dstsvc_acct || ! $self->dstsvc;
+  return "Unknown dstsvc"
+    unless qsearchs('svc_acct', { 'svcnum' => $self->dstsvc } )
+           || ! $self->dstsvc;
+
 
   if ( $self->dst ) {
     $self->dst =~ /^([\w\.\-]+)\@(([\w\-]+\.)+\w+)$/
@@ -319,7 +439,7 @@ sub dstsvc_acct {
 
 =head1 VERSION
 
-$Id: svc_forward.pm,v 1.9 2002-02-11 23:01:01 ivan Exp $
+$Id: svc_forward.pm,v 1.10 2002-02-17 19:07:32 jeff Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 1d4951dbd6af315840a8a633bae5a5739ec5d82c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 17 Feb 2002 19:12:12 +0000
Subject: get ride of CGIwrapper.pm

---
 FS/FS/CGIwrapper.pm | 17 -----------------
 FS/MANIFEST         |  1 -
 FS/t/CGIwrapper.t   |  5 -----
 README.1.4.0pre9    |  2 +-
 4 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 FS/FS/CGIwrapper.pm
 delete mode 100644 FS/t/CGIwrapper.t

diff --git a/FS/FS/CGIwrapper.pm b/FS/FS/CGIwrapper.pm
deleted file mode 100644
index 863193e94..000000000
--- a/FS/FS/CGIwrapper.pm
+++ /dev/null
@@ -1,17 +0,0 @@
-package FS::CGIwrapper;
-
-use vars qw(@ISA);
-
-use CGI;
-
-@ISA = qw( CGI );
-
-sub header {
-  my $self = shift;
-  $self->SUPER::header(
-    @_,
-    '-expires'       => 'now',
-    '-pragma'        => 'No-Cache',
-    '-cache-control' => 'No-Cache',
-  );
-}
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 85c09b465..c6638c84b 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -58,7 +58,6 @@ FS/session.pm
 FS/domain_record.pm
 FS/prepay_credit.pm
 FS/svc_www.pm
-FS/CGIwrapper.pm
 FS/svc_forward.pm
 FS/raddb.pm
 FS/queue.pm
diff --git a/FS/t/CGIwrapper.t b/FS/t/CGIwrapper.t
deleted file mode 100644
index 06c741c3a..000000000
--- a/FS/t/CGIwrapper.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::CGIwrapper;
-$loaded=1;
-print "ok 1\n";
diff --git a/README.1.4.0pre9 b/README.1.4.0pre9
index 8ff1e61f2..6bd88f488 100644
--- a/README.1.4.0pre9
+++ b/README.1.4.0pre9
@@ -1,6 +1,6 @@
 the following is necessary to upgrade from 1.4.0pre8 to 1.4.0pre9
 
-if you're upgradeing from before 1.4.0pre8 see README.1.4.0pre8 first!
+if you're upgrading from before 1.4.0pre8 see README.1.4.0pre8 first!
 
 if you're upgrading from 1.3.1 follow the instructions in
 httemplate/docs/upgrade8.html instead
-- 
cgit v1.2.1


From 7158f85d129bdca437955fad1c4ca1df4718d7a2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 17 Feb 2002 21:01:50 +0000
Subject: removing CGIwrapper.pm

---
 FS/MANIFEST | 1 -
 1 file changed, 1 deletion(-)

diff --git a/FS/MANIFEST b/FS/MANIFEST
index c6638c84b..f7a5c1248 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -65,7 +65,6 @@ FS/queue_arg.pm
 t/agent.t
 t/agent_type.t
 t/CGI.t
-t/CGIwrapper.t
 t/Conf.t
 t/ConfItem.t
 t/cust_bill.t
-- 
cgit v1.2.1


From b35b650a6078d645d6f97620f3c79ae941915dd9 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 18 Feb 2002 00:13:58 +0000
Subject: trading in tar for rsync for improved vpopmail support

---
 FS/FS/Conf.pm       |  7 +++++++
 Makefile            |  6 ++++++
 bin/svc_acct.export | 39 ++++++++++++++++++++++++---------------
 eg/vpopmailrestart  | 11 +++++++++++
 4 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100755 eg/vpopmailrestart

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index d5c00467d..7a4a71966 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -731,6 +731,13 @@ httemplate/docs/config.html
     'type'        => 'textarea',
   },
 
+  {
+    'key'         => 'vpopmailrestart',
+    'section'     => 'mail',
+    'description' => 'If defined, the command which is run on vpopmail machines after files are copied.  An example can be found in eg/vpopmailrestart of the source distribution.',
+    'type'        => 'text',
+  },
+
   {
     'key'         => 'safe-part_pkg',
     'section'     => 'UI',
diff --git a/Makefile b/Makefile
index 283981a87..34259737b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,14 @@ DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
+<<<<<<< Makefile
+#TEMPLATE = asp
+#mason's a bit dodgy still
+TEMPLATE = mason
+=======
 TEMPLATE = asp
 #TEMPLATE = mason
+>>>>>>> 1.27
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index cee63bcd5..11178c962 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.32 2002-02-15 20:21:56 jeff Exp $
+# $Id: svc_acct.export,v 1.33 2002-02-18 00:13:57 jeff Exp $
 #
 # Create and export password, radius and vpopmail password files:
 # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
@@ -22,6 +22,9 @@ use FS::svc_acct;
 use FS::svc_domain;
 use FS::svc_forward;
 
+my $ssh='ssh';
+my $rsync='rsync';
+
 my $user = shift or die &usage;
 adminsuidsetup $user;
 
@@ -648,26 +651,32 @@ foreach my $icradiusmachine ( @icradiusmachines ) {
   close WRITER;
 }
 
-my @args = ("/bin/tar", "c", "--force-local", "-C", "$spooldir", "-f", "$spooldir/vpoptarball", "domains");
+#my @args = ("/bin/tar", "c", "--force-local", "-C", "$spooldir", "-f", "$spooldir/vpoptarball", "domains");
 
-system {$args[0]} @args;
+#system {$args[0]} @args;
 
 my($vpopmailmachine);
 foreach $vpopmailmachine (@vpopmailmachines) {
   my ($machine, $vpopdir, $vpopuid, $vpopgid) = split (/\s+/, $vpopmailmachine);
   my $scp = new Net::SCP;
-  $scp->scp("$spooldir/vpoptarball","root\@$machine:vpoptarball")
-    or die "scp error: ". $scp->{errstr};
-  ssh("root\@$machine",
-    "( ".
-      "tar xf vpoptarball; ".
-      "chown -R $vpopuid:$vpopgid domains; ".
-      "tar cf vpoptarball domains; ".
-      "cd $vpopdir; ".
-      "tar xf ~/vpoptarball; ".
-    " )"
-  )
-    == 0 or die "ssh error: $!";
+#  $scp->scp("$spooldir/vpoptarball","root\@$machine:vpoptarball")
+#    or die "scp error: ". $scp->{errstr};
+#  ssh("root\@$machine",
+#    "( ".
+#      "rm -rf domains; ".
+#      "tar xf vpoptarball; ".
+#      "chown -R $vpopuid:$vpopgid domains; ".
+#      "tar cf vpoptarball domains; ".
+#      "cd $vpopdir; ".
+#      "tar xf ~/vpoptarball; ".
+#    " )"
+#  )
+#    == 0 or die "ssh error: $!";
+
+  chdir $spooldir;
+  my @args = ("$rsync", "-rlpt", "-e", "$ssh", "domains/", "vpopmail\@$machine:$vpopdir/domains/");
+
+  system {$args[0]} @args;
 
   $scp->scp("$spooldir/assign","root\@$machine:/var/qmail/users/assign")
     or die "scp error: ". $scp->{errstr};
diff --git a/eg/vpopmailrestart b/eg/vpopmailrestart
new file mode 100755
index 000000000..c716e2e2b
--- /dev/null
+++ b/eg/vpopmailrestart
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+for domain in /home/vpopmail/domains/*
+do
+  /home/vpopmail/bin/vmkpasswd `/bin/basename $domain`
+done
+
+/var/qmail/bin/qmail-newu
+
+killall -HUP qmail-send
+
-- 
cgit v1.2.1


From 30bb7613086a767cc50089fd223d21646907359b Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 18 Feb 2002 00:21:43 +0000
Subject: keep accidentally checking in Makefile changes, gotta do something
 about that...

---
 Makefile | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Makefile b/Makefile
index 34259737b..283981a87 100644
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,8 @@ DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-<<<<<<< Makefile
-#TEMPLATE = asp
-#mason's a bit dodgy still
-TEMPLATE = mason
-=======
 TEMPLATE = asp
 #TEMPLATE = mason
->>>>>>> 1.27
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
-- 
cgit v1.2.1


From 968f75993d7ec66d743bd5ab5e43d1d46556c27c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Feb 2002 01:26:07 +0000
Subject: rsync docs

---
 README.1.4.0pre11             | 2 ++
 httemplate/docs/install.html  | 9 +++++----
 httemplate/docs/upgrade8.html | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 README.1.4.0pre11

diff --git a/README.1.4.0pre11 b/README.1.4.0pre11
new file mode 100644
index 000000000..c3a64d7b4
--- /dev/null
+++ b/README.1.4.0pre11
@@ -0,0 +1,2 @@
+install rsync
+
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index b739af02c..315ad8f50 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -5,10 +5,11 @@
 <h1>Installation</h1>
 Before installing, you need:
 <ul>
-  <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
-  <li><a href="http://perl.apache.org/">mod_perl</a>
-  <li><a href="http://www.openssh.com//">SSH</a> (<a href="http://www.openssh.com//">OpenSSH</a> is recommended.  SSH Communications Security <a href="http://www.ssh.com/products/ssh/download.cfm">commercial SSH version 3</a> has been reported incompatible with Freeside.)
   <li><a href="http://www.perl.com/">Perl</a>  Don't enable experimental features like threads or the PerlIO abstraction layer.
+  <li><a href="http://www.apache.org">Apache</a> (<a href="http://www.modssl.org/">mod_ssl</a> or <a href="http://www.apache-ssl.org">Apache-SSL</a> highly recommended)
+  <li><a href="http://perl.apache.org/">mod_perl</a>
+  <li><a href="http://www.openssh.com/">SSH</a> (<a href="http://www.openssh.com//">OpenSSH</a> is recommended.  SSH Communications Security <a href="http://www.ssh.com/products/ssh/download.cfm">commercial SSH version 3</a> has been reported incompatible with Freeside.)
+  <li><a href="http://rsync.samba.org/">rsync</a>
   <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.
     <ul>
       <li><a href="http://www.postgresql.org/">PostgreSQL</a> (v7 or higher) is recommended.
@@ -72,7 +73,7 @@ $ mysqladmin -u root password '<i>set_a_root_database_password</i>'
 $ mysql -u root -p
 mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* TO freeside@localhost IDENTIFIED BY '<i>set_a_freeside_database_password</i>';</pre>
     </ul>
-  <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>
+<!--  <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>-->
   <li>Edit the top-level Makefile:
     <ul>
       <li>Set <tt>DATASOURCE</tt> to your <a href="http://search.cpan.org/doc/TIMB/DBI-1.20/DBI.pm">DBI data source</a>, for example, <tt>DBI:Pg:host=localhost;dbname=freeside</tt> for PostgresSQL or <tt>DBI:mysql:freeside</tt> for MySQL.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.20/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD">manpage for your DBD</a> for the exact syntax of a DBI data source.
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 61d956ce8..85c33d649 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -9,6 +9,7 @@
   <li><a href="http://perl.apache.org/">mod_perl</a> is now required.
   <li>Install <a href="http://search.cpan.org/search?dist=Archive-Tar">Archive-Tar</a>, <a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>, and <a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a>
   <li>Install <a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a>.
+  <li>Install <a href="http://rsync.samba.org/">rsync</a>
 </ul>
 <table>
   <tr>
-- 
cgit v1.2.1


From 412e2892a324cdd838f4a790102359adcc9b7400 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Feb 2002 03:45:21 +0000
Subject: fix modified <SELECT>s under netcape4, use one for svc_acct.popnum
 too

---
 httemplate/edit/part_svc.cgi | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index c3a4942ea..918e6ab9c 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -104,7 +104,14 @@ my %defs = (
     'dir'       => 'Home directory',
     'uid'       => 'UID (set to fixed and blank for dial-only)',
     'slipip'    => 'IP address (Set to fixed and blank to disable dialin, or, set a value to be exported to RADIUS Framed-IP-Address.  Use the special value <code>0e0</code> [zero e zero] to enable export to RADIUS without a Framed-IP-Address.)',
-    'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
+#    'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
+    'popnum'    => {
+                     desc => 'Access number',
+                     type => 'select',
+                     select_table => 'svc_acct_pop',
+                     select_key   => 'popnum',
+                     select_label => 'city',
+                   },
     'username'  => 'Username',
     'quota'     => '',
     '_password' => 'Password',
@@ -215,13 +222,15 @@ function fixup(what) {
     if ( ref($def) ) {
       if ( $def->{type} eq 'select' ) {
         print qq!<SELECT NAME="${svcdb}__${field}">!;
-        print '<OPTION>' unless $value;
+        print '<OPTION> </OPTION>' unless $value;
         foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
+          warn $rvalue;
           my $rvalue = $record->getfield($def->{select_key});
           print qq!<OPTION VALUE="$rvalue"!.
                 ( $rvalue==$value ? ' SELECTED>' : '>' ).
-                $record->getfield($def->{select_label});
+                $record->getfield($def->{select_label}). '</OPTION>';
         }
+        print '</SELECT>';
       } else {
         print '<font color="#ff0000">unknown type'. $def->{type};
       }
-- 
cgit v1.2.1


From 32e8c2a2a58428acd539d880357c76720334c011 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Feb 2002 08:39:21 +0000
Subject: safe web demo operation!  closes: Bug#217

fix bug in edit/part_pkg: s/bkg/pkg/

edit/part_pkg.cgi - plan <SELECT> is now properly stick on errors, closes: Bug#323
---
 FS/FS/Conf.pm                | 11 ++++++--
 FS/FS/part_bill_event.pm     | 23 ++++++++++++++++
 FS/FS/part_pkg.pm            | 62 ++++++++++++++++++++++++++++++++++----------
 htetc/global.asa             |  4 ++-
 httemplate/edit/part_pkg.cgi | 10 ++++---
 5 files changed, 90 insertions(+), 20 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 7a4a71966..f8d646254 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -734,8 +734,8 @@ httemplate/docs/config.html
   {
     'key'         => 'vpopmailrestart',
     'section'     => 'mail',
-    'description' => 'If defined, the command which is run on vpopmail machines after files are copied.  An example can be found in eg/vpopmailrestart of the source distribution.',
-    'type'        => 'text',
+    'description' => 'If defined, the shell commands to run on vpopmail machines after files are copied.  An example can be found in eg/vpopmailrestart of the source distribution.',
+    'type'        => 'textarea',
   },
 
   {
@@ -745,6 +745,13 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'safe-part_bill_event',
+    'section'     => 'UI',
+    'description' => 'Validates invoice event expressions against a preset list.  Useful for webdemos, annoying to powerusers.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'show_ss',
     'section'     => 'UI',
diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
index fb1daa20b..70c8a56ec 100644
--- a/FS/FS/part_bill_event.pm
+++ b/FS/FS/part_bill_event.pm
@@ -3,6 +3,7 @@ package FS::part_bill_event;
 use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs );
+use FS::Conf;
 
 @ISA = qw(FS::Record);
 
@@ -114,6 +115,28 @@ sub check {
 
   $self->weight(0) unless $self->weight;
 
+  my $conf = new FS::Conf;
+  if ( $conf->exists('safe-part_bill_event') ) {
+    my $error = $self->ut_anything('eventcode');
+    return $error if $error;
+
+    my $c = $self->eventcode;
+
+    $c =~ /^\s*\$cust_main\->(suspend|cancel|invoicing_list_addpost|bill|collect)\(\);\s*("";)?\s*$/
+
+      or $c =~ /^\s*\$cust_bill\->(comp|realtime_card|realtime_card_cybercash|batch_card|send)\(\);\s*$/
+
+      or $c =~ /^\s*\$cust_main\->apply_payments; \$cust_main->apply_credits; "";\s*$/
+
+      or $c =~ /^\s*\$cust_main\->charge\( \s*\d*\.?\d*\s*,\s*\'[\w \!\@\#\$\%\&\(\)\-\+\;\:\"\,\.\?\/]*\'\s*\);\s*$/
+
+      or do {
+        #log
+        return "illegal eventcode: $c";
+      };
+
+  }
+
   $self->ut_numbern('eventpart')
     || $self->ut_enum('payby', [qw( CARD BILL COMP )] )
     || $self->ut_text('event')
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 86af95432..3d536e7d9 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -178,19 +178,55 @@ insert and replace methods.
 sub check {
   my $self = shift;
 
-  $self->ut_numbern('pkgpart')
-    || $self->ut_text('pkg')
-    || $self->ut_text('comment')
-    || $self->ut_anything('setup')
-    || $self->ut_number('freq')
-    || $self->ut_anything('recur')
-    || $self->ut_alphan('plan')
-    || $self->ut_anything('plandata')
-    || $self->ut_enum('setuptax', [ '', 'Y' ] )
-    || $self->ut_enum('recurtax', [ '', 'Y' ] )
-    || $self->ut_enum('disabled', [ '', 'Y' ] )
-  ;
+  my $conf = new FS::Conf;
+  if ( $conf->exists('safe-part_pkg') ) {
+
+    my $error = $self->ut_anything('setup')
+                || $self->ut_anything('recur');
+    return $error if $error;
+
+    my $s = $self->setup;
+
+    $s =~ /^\s*\d*\.?\d*\s*$/ or do {
+      #log!
+      return "illegal setup: $s";
+    };
+
+    my $r = $self->recur;
+
+    $r =~ /^\s*\d*\.?\d*\s*$/
+
+      or $r =~ /^my \$mnow = \$sdate; my \(\$sec,\$min,\$hour,\$mday,\$mon,\$year\) = \(localtime\(\$sdate\) \)\[0,1,2,3,4,5\]; my \$mstart = timelocal\(0,0,0,1,\$mon,\$year\); my \$mend = timelocal\(0,0,0,1, \$mon == 11 \? 0 : \$mon\+1, \$year\+\(\$mon==11\)\); \$sdate = \$mstart; \( \$part_pkg->freq \- 1 \) \* \d*\.?\d* \/ \$part_pkg\-\>freq \+ \d*\.?\d* \/ \$part_pkg\-\>freq \* \(\$mend\-\$mnow\) \/ \(\$mend\-\$mstart\) ;\s*$/
+
+      or $r =~ /^my \$error = \$cust_pkg\->cust_main\->credit\( \s*\d*\.?\d*\s* \* scalar\(\$cust_pkg\->cust_main\->referral_cust_main_ncancelled\(\s*\d+\s*\)\), "commission" \); die \$error if \$error; \s*\d*\.?\d*\s*;\s*$/
+
+      or $r =~ /^my \$error = \$cust_pkg\->cust_main\->credit\( \s*\d*\.?\d*\s* \* scalar\(\$cust_pkg\->cust_main->referral_cust_pkg\(\s*\d+\s*\)\), "commission" \); die \$error if \$error; \s*\d*\.?\d*\s*;\s*$/
+
+      or $r =~ /^my \$error = \$cust_pkg\->cust_main\->credit\( \s*\d*\.?\d*\s* \* scalar\( grep \{ my \$pkgpart = \$_\->pkgpart; grep \{ \$_ == \$pkgpart \} \(\s*(\s*\d+,\s*)*\s*\) \} \$cust_pkg\->cust_main->referral_cust_pkg\(\s*\d+\s*\)\), "commission" \); die \$error if \$error; \s*\d*\.?\d*\s*;\s*$/
+
+      or $r =~ /^my \$hours = \$cust_pkg\->seconds_since\(\$cust_pkg\->bill \|\| 0\) \/ 3600 \- \s*\d*\.?\d*\s*; \$hours = 0 if \$hours < 0; \s*\d*\.?\d*\s* \+ \s*\d*\.?\d*\s* \* \$hours;\s*$/
+
+      or $r =~ /^my \$min = \$cust_pkg\->seconds_since\(\$cust_pkg\->bill \|\| 0\) \/ 60 \- \s*\d*\.?\d*\s*; \$min = 0 if \$min < 0; \s*\d*\.?\d*\s* \+ \s*\d*\.?\d*\s* \* \$min;\s*$/
+
+      or do {
+        #log!
+        return "illegal recur: $r";
+      };
+
+  }
 
+    $self->ut_numbern('pkgpart')
+      || $self->ut_text('pkg')
+      || $self->ut_text('comment')
+      || $self->ut_anything('setup')
+      || $self->ut_number('freq')
+      || $self->ut_anything('recur')
+      || $self->ut_alphan('plan')
+      || $self->ut_anything('plandata')
+      || $self->ut_enum('setuptax', [ '', 'Y' ] )
+      || $self->ut_enum('recurtax', [ '', 'Y' ] )
+      || $self->ut_enum('disabled', [ '', 'Y' ] )
+    ;
 }
 
 =item pkg_svc
@@ -228,7 +264,7 @@ sub svcpart {
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.7 2002-02-10 21:30:05 ivan Exp $
+$Id: part_pkg.pm,v 1.8 2002-02-18 08:39:21 ivan Exp $
 
 =head1 BUGS
 
diff --git a/htetc/global.asa b/htetc/global.asa
index db37bf156..ce3bc27c8 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -66,7 +66,9 @@ sub Script_OnFlush {
     $$ref =~ s/<\/BODY>[\s\n]*<\/HTML>[\s\n]*$//i
       or warn "can't remove";
   
-    $$ref .= '<PRE>'. ("\n"x96). encode_entities(dbh->sprintProfile()). '</PRE>';
+    #$$ref .= '<PRE>'. ("\n"x96). encode_entities(dbh->sprintProfile()). '</PRE>';
+    #  wtf?  konqueror...
+    $$ref .= '<PRE>'. ("\n"x4096). encode_entities(dbh->sprintProfile()). '</PRE>';
 
     $$ref .= '</BODY></HTML>';
     
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index f4ebd6770..ae268811a 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -29,8 +29,10 @@ if ( $cgi->param('clone') ) {
 } elsif ( $query && $query =~ /^(\d+)$/ ) {
   $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
 } else {
-  $part_pkg ||= new FS::part_pkg {};
-  $part_pkg->plan('flat');
+  unless ( $part_pkg ) {
+    $part_pkg = new FS::part_pkg {};
+    $part_pkg->plan('flat');
+  }
 }
 unless ( $part_pkg->plan ) { #backwards-compat
   $part_pkg->plan('flat');
@@ -279,7 +281,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $hours = $cust_pkg->seconds_since($cust_bkg->bill || 0) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
+    'recur' => '\'my $hours = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
   },
 
   'sesmon_minute' => {
@@ -300,7 +302,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_min', 'recur_minly_charge' ],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $min = $cust_pkg->seconds_since($cust_bkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_flat.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
+    'recur' => '\'my $min = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_flat.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
 
   },
 
-- 
cgit v1.2.1


From d64192f83cc67eec19cdb96ab8db4fa2f59f4621 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Feb 2002 08:53:48 +0000
Subject: make release and make update-webdemo targets

---
 Makefile | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 283981a87..7596c5b7c 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,9 @@ QUEUED_RESTART = /etc/init.d/freeside restart
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
+VERSION="1.4.0pre11"
+TAG="1_4_0_PRE11"
+
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
 	@echo "                   htmlman"
@@ -54,9 +57,6 @@ htmlman:
 	[ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
 	[ -e DONT_REBUILD_DOCS ] || bin/pod2x
 
-upload-docs:
-	ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
-	scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs
 
 install-docs: docs
 	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
@@ -114,3 +114,24 @@ clean:
 	cd FS; \
 	make clean
 
+#these are probably only useful if you're me...
+
+upload-docs:
+	ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
+	scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs
+
+release: upload-docs
+	cd /home/ivan/freeside_current
+	cvs tag ${TAG}
+
+	cd /home/ivan
+	cvs export -r $TAG -d freeside-${VERSION} freeside
+	tar czvf freeside-${VERSION}.tar.gz freeside-${VERSION}
+
+	scp freeside-${VERSION} ivan@cleanwhisker.420.am:/var/www/sisd.420.am/freeside/
+
+update-webdemo:
+	ssh ivan@pouncequick.420.am '( cd freeside; cvs update -d -P )'
+	#ssh root@pouncequick.420.am '( cd /home/ivan/freeside; make clean; make deploy )'
+	ssh root@pouncequick.420.am '( cd /home/ivan/freeside; make deploy )'
+
-- 
cgit v1.2.1


From 1c98cb6461e83c28e14341de568ba33328048293 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Feb 2002 10:14:00 +0000
Subject: oops!

---
 httemplate/edit/svc_www.cgi | 179 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 179 insertions(+)
 create mode 100644 httemplate/edit/svc_www.cgi

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
new file mode 100644
index 000000000..e1a914f1a
--- /dev/null
+++ b/httemplate/edit/svc_www.cgi
@@ -0,0 +1,179 @@
+<!-- mason kludge -->
+<%
+
+my( $svcnum,  $pkgnum, $svcpart, $part_svc, $svc_www );
+if ( $cgi->param('error') ) {
+  $svc_www = new FS::svc_www ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_www')
+  } );
+  $svcnum = $svc_www->svcnum;
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $svcnum=$1;
+    $svc_www=qsearchs('svc_www',{'svcnum'=>$svcnum})
+      or die "Unknown (svc_www) svcnum!";
+
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+      or die "Unknown (cust_svc) svcnum!";
+
+    $pkgnum=$cust_svc->pkgnum;
+    $svcpart=$cust_svc->svcpart;
+  
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+  } else { #adding
+
+    $svc_www = new FS::svc_www({});
+
+    foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
+      $pkgnum=$1 if /^pkgnum(\d+)$/;
+      $svcpart=$1 if /^svcpart(\d+)$/;
+    }
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+    $svcnum='';
+
+    #set fixed and default fields from part_svc
+    foreach my $part_svc_column (
+      grep { $_->columnflag } $part_svc->all_part_svc_column
+    ) {
+      $svc_www->setfield( $part_svc_column->columnname,
+                          $part_svc_column->columnvalue,
+                        );
+    }
+
+  }
+}
+my $action = $svc_www->svcnum ? 'Edit' : 'Add';
+
+my( %username, %arec );
+if ($pkgnum) {
+
+  my($u_part_svc,@u_acct_svcparts);
+  foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
+    push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
+  }
+
+  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+  my($custnum)=$cust_pkg->getfield('custnum');
+  my($i_cust_pkg);
+  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
+    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
+    my($acct_svcpart);
+    foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
+                                              #record(s) in cust_svc ( for this
+                                              #pkgnum ! )
+      my($i_cust_svc);
+      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
+        my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
+        $username{$svc_acct->getfield('svcnum')}=$svc_acct->getfield('username');
+      }  
+    }
+  }
+
+
+  my($d_part_svc,@d_acct_svcparts);
+  foreach $d_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_domain'}) ) {
+    push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
+  }
+
+  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
+    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
+    my($acct_svcpart);
+    foreach $acct_svcpart (@d_acct_svcparts) {
+      my($i_cust_svc);
+      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
+        my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
+        my $domain_rec;
+        foreach $domain_rec ( qsearch('domain_record',{
+            'svcnum'  => $svc_domain->svcnum,
+            'rectype' => 'A' } ),
+        qsearch('domain_record',{
+            'svcnum'  => $svc_domain->svcnum,
+            'rectype' => 'CNAME'
+            } ) ) {
+          $arec{$domain_rec->recnum} =
+            $domain_rec->reczone eq '@'
+              ? $svc_domain->domain
+              : $domain_rec->reczone. '.'. $svc_domain->domain;
+        }
+        $arec{'@.'. $svc_domain->domain} = $svc_domain->domain
+          unless qsearchs('domain_record', { svcnum  => $svc_domain->svcnum,
+                                             reczone => '@',                } );
+        $arec{'www.'. $svc_domain->domain} = 'www.'. $svc_domain->domain
+          unless qsearchs('domain_record', { svcnum  => $svc_domain->svcnum,
+                                             reczone => 'www',              } );
+      }
+    }
+  }
+
+} elsif ( $action eq 'Edit' ) {
+
+  my($domain_rec) = qsearchs('domain_record', { 'recnum'=>$svc_www->recnum });
+  $arec{$svc_www->recnum} = join '.', $domain_rec->recdata, $domain_rec->reczone;
+
+} else {
+  die "\$action eq Add, but \$pkgnum is null!\n";
+}
+
+
+my $p1 = popurl(1);
+print header("Web Hosting $action", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/svc_www.cgi" METHOD=POST>!;
+
+#display
+
+ 
+
+#svcnum
+print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
+print qq!Service #<B>!, $svcnum ? $svcnum : "(NEW)", "</B><BR><BR>";
+
+#pkgnum
+print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
+ 
+#svcpart
+print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
+
+my($recnum,$usersvc)=(
+  $svc_www->recnum,
+  $svc_www->usersvc,
+);
+
+print &ntable("#cccccc",2),
+      '<TR><TD ALIGN="right">Zone</TD><TD><SELECT NAME="recnum" SIZE=1>';
+foreach $_ (keys %arec) {
+  print "<OPTION", $_ eq $recnum ? " SELECTED" : "",
+        qq! VALUE="$_">$arec{$_}!;
+}
+print "</SELECT></TD></TR>";
+
+print '<TR><TD ALIGN="right">Username</TD><TD><SELECT NAME="usersvc" SIZE=1>';
+foreach $_ (keys %username) {
+  print "<OPTION", ($_ eq $usersvc) ? " SELECTED" : "",
+        qq! VALUE="$_">$username{$_}!;
+}
+print "</SELECT></TD></TR>";
+
+print '</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">';
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+
-- 
cgit v1.2.1


From 6b9a7aefd98a10a0232e02d9fbbaffe30d4c6b97 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Feb 2002 18:07:59 +0000
Subject: document 'seconds'

---
 FS/FS/prepay_credit.pm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/FS/FS/prepay_credit.pm b/FS/FS/prepay_credit.pm
index f388b2312..7ed9b8344 100644
--- a/FS/FS/prepay_credit.pm
+++ b/FS/FS/prepay_credit.pm
@@ -21,6 +21,12 @@ FS::prepay_credit - Object methods for prepay_credit records
     'amount'     => '19.95',
   };
 
+  $record = new FS::prepay_credit {
+    'identifier' => '4198123455512121'
+    'seconds'    => '7200',
+  };
+
+
   $error = $record->insert;
 
   $error = $new_record->replace($old_record);
@@ -43,6 +49,8 @@ fields are currently supported:
 
 =item amount - amount of the credit
 
+=item seconds - time amount of credit (see L<FS::svc_acct/seconds>)
+
 =back
 
 =head1 METHODS
@@ -99,21 +107,18 @@ sub check {
   $self->ut_numbern('prepaynum')
   || $self->ut_alpha('identifier')
   || $self->ut_money('amount')
+  || $self->utnumbern('seconds')
   ;
 
 }
 
 =back
 
-=head1 VERSION
-
-$Id: prepay_credit.pm,v 1.3 2001-08-21 02:44:47 ivan Exp $
-
 =head1 BUGS
 
 =head1 SEE ALSO
 
-L<FS::Record>, schema.html from the base documentation.
+L<FS::svc_acct>, L<FS::Record>, schema.html from the base documentation.
 
 =cut
 
-- 
cgit v1.2.1


From 0ab8b21b9b39d9349c94e6cea10dbb006ff176a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Feb 2002 20:09:12 +0000
Subject: bad warning, causing errors with strict

---
 httemplate/edit/part_svc.cgi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 918e6ab9c..57ab3985e 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -224,7 +224,6 @@ function fixup(what) {
         print qq!<SELECT NAME="${svcdb}__${field}">!;
         print '<OPTION> </OPTION>' unless $value;
         foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
-          warn $rvalue;
           my $rvalue = $record->getfield($def->{select_key});
           print qq!<OPTION VALUE="$rvalue"!.
                 ( $rvalue==$value ? ' SELECTED>' : '>' ).
-- 
cgit v1.2.1


From b500b9de7f863e1a54fe117a565c04ef917109d8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Feb 2002 02:57:39 +0000
Subject: allow custom packages to edit service quantities also

---
 httemplate/edit/part_pkg.cgi  | 12 +++++++++---
 httemplate/view/cust_main.cgi |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index ae268811a..8e7a6c5cf 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -110,7 +110,9 @@ my $thead =  "\n\n". ntable('#cccccc', 2). <<END;
 <TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH><TH BGCOLOR="#dcdcdc">Service</TH></TR>
 END
 
-unless ( $cgi->param('clone') ) {
+#unless ( $cgi->param('clone') ) {
+#dunno why...
+unless ( 0 ) {
   #print <<END, $thead;
   print <<END, itable(), '<TR><TD VALIGN="top">', $thead;
 <BR><BR>Enter the quantity of each service this package includes.<BR><BR>
@@ -135,7 +137,9 @@ foreach my $part_svc ( @part_svc ) {
 
   push @fixups, "pkg_svc$svcpart";
 
-  unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) {
+  #unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) {
+  #dunno why...
+  unless ( 0 ) {
     print '<TR>'; # if $count == 0 ;
     print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=4 MAXLENGTH=3 VALUE="!,
           $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0,
@@ -153,7 +157,9 @@ foreach my $part_svc ( @part_svc ) {
   }
 }
 
-unless ( $cgi->param('clone') ) {
+#unless ( $cgi->param('clone') ) {
+#dunno why...
+unless ( 0 ) {
   print "</TR></TABLE></TD></TR></TABLE>";
   #print "</TR></TABLE>";
 }
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 90299e4dd..34e99cf3e 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -302,7 +302,7 @@ foreach my $package (@packages) {
         qq!<TD ROWSPAN=$rowspan><FONT SIZE=-1>!,
         #qq!<A HREF="$pkgview">$pkg - $comment</A>!,
         qq!$pkg - $comment!,
-        qq! ( <A HREF="$pkgview">Edit</A> | <A HREF="$button_url">Customize pricing</A> )</FONT></TD>!,
+        qq! (&nbsp;<A HREF="$pkgview">Edit</A>&nbsp;|&nbsp;<A HREF="$button_url">Customize</A>&nbsp;)</FONT></TD>!,
   ;
   for ( qw( setup bill susp expire cancel ) ) {
     print "<TD ROWSPAN=$rowspan><FONT SIZE=-1>", ( $package->getfield($_)
-- 
cgit v1.2.1


From 29050044f882f0169094e6bada1c98f974323cb9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Feb 2002 03:06:23 +0000
Subject: need to use FS::Record qw(qsearch) !

---
 FS/FS/cust_refund.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 3dbd4ef39..92b14b748 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -3,7 +3,7 @@ package FS::cust_refund;
 use strict;
 use vars qw( @ISA );
 use Business::CreditCard;
-use FS::Record qw( dbh );
+use FS::Record qw( qsearchs dbh );
 use FS::UID qw(getotaker);
 use FS::cust_credit;
 use FS::cust_credit_refund;
@@ -266,7 +266,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.15 2002-01-28 06:57:23 ivan Exp $
+$Id: cust_refund.pm,v 1.16 2002-02-19 03:06:23 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From aa69f07119fbed68a84f889fc4bea93790a9a628 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Feb 2002 03:15:11 +0000
Subject: <rluser> ut_number instead of ut_numbern

---
 FS/FS/cust_refund.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 92b14b748..3af8305a2 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -217,7 +217,7 @@ sub check {
   my $self = shift;
 
   my $error =
-    $self->ut_number('refundnum')
+    $self->ut_numbern('refundnum')
     || $self->ut_numbern('custnum')
     || $self->ut_money('refund')
     || $self->ut_numbern('_date')
@@ -266,7 +266,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.16 2002-02-19 03:06:23 ivan Exp $
+$Id: cust_refund.pm,v 1.17 2002-02-19 03:15:11 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From ed1503c6d45280adc4853219a2858194604b8732 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 19 Feb 2002 03:22:39 +0000
Subject: fix refund posting

---
 FS/FS/cust_refund.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 3af8305a2..8fe6876d3 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -96,7 +96,7 @@ sub insert {
   my $dbh = dbh;
 
   if ( $self->crednum ) {
-    my $cust_credit = qsearchs('cust_bill', { 'invnum' => $self->invnum } )
+    my $cust_credit = qsearchs('cust_credit', { 'crednum' => $self->crednum } )
       or do {
         $dbh->rollback if $oldAutoCommit;
         return "Unknown cust_credit.crednum: ". $self->crednum;
@@ -266,7 +266,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.17 2002-02-19 03:15:11 ivan Exp $
+$Id: cust_refund.pm,v 1.18 2002-02-19 03:22:39 jeff Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From c8ef41a7c63184ca2e696b88f303ff129662548b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Feb 2002 04:43:40 +0000
Subject: new main menu!

---
 httemplate/index.html | 164 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 119 insertions(+), 45 deletions(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index 99bfeecec..d423b842c 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -14,26 +14,50 @@
       version 1.4.0
       <BR><A HREF="http://www.sisd.com/freeside">Freeside home page</A>
       <BR><A HREF="docs/">Documentation</A>
+      <BR><A HREF="classic.html">Classic interface</A>
     </td></tr>
   </table>
-    <hr noshade>
-    <ul>
-      <li><A HREF="edit/cust_main.cgi">New Customer</A>
-      <li><A NAME="search">Search</A>
-        <ul>
-        <LI><A HREF="search/cust_main.html">customers (by last name and/or company)</A>
-        <LI><A HREF="search/cust_main-payinfo.html">customers (by credit card number)</A>
-        <LI><A HREF="search/svc_acct.html">accounts (by username)</A>
-        <LI><A HREF="search/svc_domain.html">domains (by domain)</A>
+
+<BR>
+[<A NAME="customer_service" style="background-color: #cccccc"> Sales / Customer service </A>]
+[ <A HREF="#bookkeeping">Bookkeeping / Collections</A> ]
+[ <A HREF="#reports">Reports</A> ]
+[ <A HREF="#sysadmin">Sysadmin</A> ]
+    <TABLE CELLSPACING=2 CELLPADDING=0 BORDERCOLOR="#000000" WIDTH="100%" BGCOLOR="#eeeeee">
+    <TR><TH BGCOLOR="#cccccc">Sales / Customer service</TH></TR>
+    <TR><TD>
+        <BR><FONT SIZE="+1"><A HREF="edit/cust_main.cgi">New Customer</A></FONT>
+        <BR>
+        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><INPUT TYPE="hidden" NAME="last_type" VALUE="Fuzzy"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A>
+        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><INPUT TYPE="hidden" NAME="company_type" VALUE="Fuzzy"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A>
+        <BR><FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A>
+        <BR><FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains
 <!--        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>-->
 <!--        <LI><A HREF="search/svc_forward.html">mail forwards (by ?)</A>-->
-        <LI><A HREF="search/cust_bill.html">invoices (by invoice number)</A>
-        <LI><A HREF="search/cust_pay.html">checks (by check number)</A>
-        </ul>
-      <li><A NAME="browse">Browse</A>
-        <ul>
-          <LI>customers (<A HREF="search/cust_main.cgi?browse=custnum">by customer number</A>) (<A HREF="search/cust_main.cgi?browse=last">by last name</A>) (<A HREF="search/cust_main.cgi?browse=company">by company</A>)
-          <LI>invoices
+      <BR><BR>
+    </TD></TR>
+    </TABLE>
+
+
+
+    <BR><BR><BR>
+
+
+[ <A HREF="#customer_service">Sales / Customer service</A> ]
+[<A NAME="bookkeeping" style="background-color: #cccccc"> Bookkeeping / Collections </A>]
+[ <A HREF="#reports">Reports</A> ]
+[ <A HREF="#sysadmin">Sysadmin</A> ]
+    <TABLE CELLSPACING=2 CELLPADDING=0 BORDERCOLOR="#000000" WIDTH="100%" BGCOLOR="#eeeeee">
+    <TR><TH BGCOLOR="#cccccc">Bookkeeping / Collections</TH></TR>
+    <TR><TD>
+      <BR><A HREF="search/cust_main-quickpay.html">Quick payment entry</A>
+      <BR>
+      <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST">Credit card # <INPUT TYPE="hidden" NAME="card_on" VALUE="1"><INPUT TYPE="text" NAME="card"><INPUT TYPE="submit" VALUE="Search">
+      <BR><FORM ACTION="search/cust_bill.cgi" METHOD="POST">Invoice # <INPUT TYPE="text" NAME="invnum" SIZE="8"><INPUT TYPE="submit" VALUE="Search">
+      <BR><FORM ACTION="search/cust_pay.cgi" METHOD="POST">Check # <INPUT TYPE="text" NAME="payinfo" SIZE="8"><INPUT TYPE="hidden" NAME="payby" VALUE="BILL"><INPUT TYPE="submit" VALUE="Search">
+      <BR>
+      <BR><A HREF="browse/cust_pay_batch.cgi">View pending credit card batch</A>
+      <BR><BR>Invoice reports
             <UL>
               <LI>open invoices (<A HREF="search/cust_bill.cgi?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN_custnum">by customer number</A>)
               <LI>30 day open invoices (<A HREF="search/cust_bill.cgi?OPEN30_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN30_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN30_custnum">by customer number</A>)
@@ -42,36 +66,76 @@
               <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
               <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
             </UL>
-          <LI>packages
-            <UL>
-              <LI><A HREF="search/cust_pkg.cgi?pkgnum">packages (by package number)</A>
-              <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
-            </UL>
-          <LI>services
-            <UL>
-              <LI>accounts (<A HREF="search/svc_acct.cgi?svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?username">by username</A>) (<A HREF="search/svc_acct.cgi?uid">by uid</A>)
-              <LI>mail forwards (<A HREF="search/svc_forward.cgi?svcnum">by service number</A>) (by ?))
-              <LI>domains (<A HREF="search/svc_domain.cgi?svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?domain">by domain</A>)
-            </UL>
-          <LI>unlinked services
-            <UL>
-              <LI>unlinked accounts (<A HREF="search/svc_acct.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?UN_username">by username</A>) (<A HREF="search/svc_acct.cgi?UN_uid">by uid</A>)
-              <LI>unlinked mail forwards (<A HREF="search/svc_forward.cgi?UN_svcnum">by service number</A>) (by ?))
-              <LI>unlinked domains (<A HREF="search/svc_domain.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?UN_domain">by domain</A>)
-            </UL>
-          <LI><A HREF="browse/nas.cgi">NAS ports</A>
-          <LI><A HREF="browse/queue.cgi">Job queue</A>
-          <LI><A HREF="browse/cust_pay_batch.cgi">Pending credit card batch</A>
-        </ul>
-      <li>Miscellaneous
+      <BR><CENTER><HR WIDTH="87%" NOSHADE></CENTER><BR>
+      <A NAME="admin">Administration</a>
         <ul>
-          <li><A HREF="search/cust_main-quickpay.html">Quick payment entry</A>
+          <LI><A HREF="browse/part_pkg.cgi">View/Edit package definitions</A>
+            - One or more services are grouped together into a package and
+              given pricing information.  Customers purchase packages, not
+              services.
+<!--          <LI><A HREF="browse/agent_type.cgi">View/Edit agent types</A>
+            - Agent types define groups of package definitions that you can
+              then assign to particular agents.
+          <LI><A HREF="browse/agent.cgi">View/Edit agents</A>
+            - Agents are resellers of your service.  Agents may be limited
+              to a subset of your full offerings (via their type).
+-->
+          <LI><A HREF="browse/cust_main_county.cgi">View/Edit locales and tax rates</A>
+            - Change tax rates, or break down a country into states, or a state
+              into counties and assign different tax rates to each.
+          <LI><A HREF="browse/part_bill_event.cgi">View/Edit invoice events</A> - Actions for overdue invoices
         </ul>
-    </ul>
-    <hr noshade>
-    <ul>
-      <li><A NAME="config" HREF="config/config-view.cgi">Configuration</a><!-- - <font size="+2" color="#ff0000">start here</font> -->
-      <li><A NAME="admin">Administration</a>
+      <BR>
+    </TD></TR>
+    </TABLE>
+
+
+
+    <BR><BR><BR>
+
+
+
+[ <A HREF="#customer_service">Sales / Customer service</A> ]
+[ <A HREF="#bookkeeping">Bookkeeping / Collections</A> ]
+[<A NAME="reports" style="background-color: #cccccc"> Reports </A>]
+[ <A HREF="#sysadmin">Sysadmin</A> ]
+    <TABLE CELLSPACING=2 CELLPADDING=0 BORDERCOLOR="#000000" WIDTH="100%" BGCOLOR="#eeeeee">
+    <TR><TH BGCOLOR="#cccccc">Reports</TH></TR>
+    <TR><TD>
+      <BR>
+      Auditing pre-Freeside services with no customer record
+      <UL>
+        <LI>unlinked accounts (<A HREF="search/svc_acct.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?UN_username">by username</A>) (<A HREF="search/svc_acct.cgi?UN_uid">by uid</A>)
+        <LI>unlinked mail forwards (<A HREF="search/svc_forward.cgi?UN_svcnum">by service number</A>) (by ?))
+        <LI>unlinked domains (<A HREF="search/svc_domain.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?UN_domain">by domain</A>)
+      </UL>
+      Packages
+      <UL>
+        <LI><A HREF="search/cust_pkg.cgi?pkgnum">packages (by package number)</A>
+        <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
+      </UL>
+      <BR>
+    </TD></TR>
+    </TABLE>
+
+
+
+    <BR><BR><BR>
+
+
+[ <A HREF="#customer_service">Sales / Customer service</A> ]
+[ <A HREF="#bookkeeping">Bookkeeping / Collections</A> ]
+[ <A HREF="#reports">Reports</A> ]
+[<A NAME="sysadmin" style="background-color: #cccccc"> Sysadmin </A>]
+    <TABLE CELLSPACING=2 CELLPADDING=0 BORDERCOLOR="#000000" WIDTH="100%" BGCOLOR="#eeeeee">
+    <TR><TH BGCOLOR="#cccccc">Sysadmin</TH></TR>
+    <TR><TD>
+      <BR>
+      <A HREF="browse/nas.cgi">View active NAS ports</A>
+      <BR><A HREF="browse/queue.cgi">View pending job queue</A>
+      <BR><BR><CENTER><HR WIDTH="87%" NOSHADE></CENTER><BR>
+      <A NAME="config" HREF="config/config-view.cgi">Configuration</a><!-- - <font size="+2" color="#ff0000">start here</font> -->
+      <BR><BR><A NAME="admin">Administration</a>
         <ul>
           <LI><A HREF="browse/part_svc.cgi">View/Edit service definitions</A>
             - Services are items you offer to your customers.
@@ -95,6 +159,16 @@
             - Points of Presence 
           <LI><A HREF="browse/part_bill_event.cgi">View/Edit invoice events</A> - Actions for overdue invoices
         </ul>
-      </ul>
+        <BR>
+      </TD></TR>
+      </TABLE>
+      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From f4724317a2d2c03c66da34270cf582918dcac9c5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Feb 2002 07:00:35 +0000
Subject: TMTOWTDI

---
 httemplate/classic.html | 101 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 httemplate/classic.html

diff --git a/httemplate/classic.html b/httemplate/classic.html
new file mode 100644
index 000000000..406852adf
--- /dev/null
+++ b/httemplate/classic.html
@@ -0,0 +1,101 @@
+<HTML>
+  <HEAD>
+    <TITLE>
+      Freeside Main Menu
+    </TITLE>
+  </HEAD>
+  <BODY BGCOLOR="#FFFFFF">
+  <table width="100%">
+    <tr><td>
+        <IMG BORDER=0 ALT="Silicon Interactive Software Design" SRC="images/small-logo.png">
+    </td><td>
+      <font color="#ff0000" size=7>freeside main menu</font>
+    </td><td align=right valign=bottom>
+      version 1.4.0
+      <BR><A HREF="http://www.sisd.com/freeside">Freeside home page</A>
+      <BR><A HREF="docs/">Documentation</A>
+      <BR><A HREF="index.html">New interface</A>
+    </td></tr>
+  </table>
+    <hr noshade>
+    <ul>
+      <li><A HREF="edit/cust_main.cgi">New Customer</A>
+      <li><A NAME="search">Search</A>
+        <ul>
+        <LI><A HREF="search/cust_main.html">customers (by last name and/or company)</A>
+        <LI><A HREF="search/cust_main-payinfo.html">customers (by credit card number)</A>
+        <LI><A HREF="search/svc_acct.html">accounts (by username)</A>
+        <LI><A HREF="search/svc_domain.html">domains (by domain)</A>
+<!--        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>-->
+<!--        <LI><A HREF="search/svc_forward.html">mail forwards (by ?)</A>-->
+        <LI><A HREF="search/cust_bill.html">invoices (by invoice number)</A>
+        <LI><A HREF="search/cust_pay.html">checks (by check number)</A>
+        </ul>
+      <li><A NAME="browse">Browse</A>
+        <ul>
+          <LI>customers (<A HREF="search/cust_main.cgi?browse=custnum">by customer number</A>) (<A HREF="search/cust_main.cgi?browse=last">by last name</A>) (<A HREF="search/cust_main.cgi?browse=company">by company</A>)
+          <LI>invoices
+            <UL>
+              <LI>open invoices (<A HREF="search/cust_bill.cgi?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN_custnum">by customer number</A>)
+              <LI>30 day open invoices (<A HREF="search/cust_bill.cgi?OPEN30_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN30_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN30_custnum">by customer number</A>)
+              <LI>60 day open invoices (<A HREF="search/cust_bill.cgi?OPEN60_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN60_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN60_custnum">by customer number</A>)
+              <LI>90 day open invoices (<A HREF="search/cust_bill.cgi?OPEN90_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN90_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN90_custnum">by customer number</A>)
+              <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
+              <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
+            </UL>
+          <LI>packages
+            <UL>
+              <LI><A HREF="search/cust_pkg.cgi?pkgnum">packages (by package number)</A>
+              <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
+            </UL>
+          <LI>services
+            <UL>
+              <LI>accounts (<A HREF="search/svc_acct.cgi?svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?username">by username</A>) (<A HREF="search/svc_acct.cgi?uid">by uid</A>)
+              <LI>mail forwards (<A HREF="search/svc_forward.cgi?svcnum">by service number</A>) (by ?))
+              <LI>domains (<A HREF="search/svc_domain.cgi?svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?domain">by domain</A>)
+            </UL>
+          <LI>unlinked services
+            <UL>
+              <LI>unlinked accounts (<A HREF="search/svc_acct.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?UN_username">by username</A>) (<A HREF="search/svc_acct.cgi?UN_uid">by uid</A>)
+              <LI>unlinked mail forwards (<A HREF="search/svc_forward.cgi?UN_svcnum">by service number</A>) (by ?))
+              <LI>unlinked domains (<A HREF="search/svc_domain.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?UN_domain">by domain</A>)
+            </UL>
+          <LI><A HREF="browse/nas.cgi">NAS ports</A>
+          <LI><A HREF="browse/queue.cgi">Job queue</A>
+          <LI><A HREF="browse/cust_pay_batch.cgi">Pending credit card batch</A>
+        </ul>
+      <li>Miscellaneous
+        <ul>
+          <li><A HREF="search/cust_main-quickpay.html">Quick payment entry</A>
+        </ul>
+    </ul>
+    <hr noshade>
+    <ul>
+      <li><A NAME="config" HREF="config/config-view.cgi">Configuration</a><!-- - <font size="+2" color="#ff0000">start here</font> -->
+      <li><A NAME="admin">Administration</a>
+        <ul>
+          <LI><A HREF="browse/part_svc.cgi">View/Edit service definitions</A>
+            - Services are items you offer to your customers.
+          <LI><A HREF="browse/part_pkg.cgi">View/Edit package definitions</A>
+            - One or more services are grouped together into a package and
+              given pricing information.  Customers purchase packages, not
+              services.
+          <LI><A HREF="browse/agent_type.cgi">View/Edit agent types</A>
+            - Agent types define groups of package definitions that you can
+              then assign to particular agents.
+          <LI><A HREF="browse/agent.cgi">View/Edit agents</A>
+            - Agents are resellers of your service.  Agents may be limited
+              to a subset of your full offerings (via their type).
+          <LI><A HREF="browse/part_referral.cgi">View/Edit referrals</A>
+            - Where a customer heard about your service.  Tracked for
+              informational purposes.
+          <LI><A HREF="browse/cust_main_county.cgi">View/Edit locales and tax rates</A>
+            - Change tax rates, or break down a country into states, or a state
+              into counties and assign different tax rates to each.
+          <LI><A HREF="browse/svc_acct_pop.cgi">View/Edit Access Numbers</A>
+            - Points of Presence 
+          <LI><A HREF="browse/part_bill_event.cgi">View/Edit invoice events</A> - Actions for overdue invoices
+        </ul>
+      </ul>
+  </BODY>
+</HTML>
-- 
cgit v1.2.1


From add1cb10ab3ee094b58d49d74daaabb464c71f04 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Feb 2002 07:51:35 +0000
Subject: oops

---
 httemplate/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index d423b842c..dd08c4fa7 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -31,7 +31,7 @@
         <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><INPUT TYPE="hidden" NAME="last_type" VALUE="Fuzzy"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A>
         <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><INPUT TYPE="hidden" NAME="company_type" VALUE="Fuzzy"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A>
         <BR><FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A>
-        <BR><FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains
+        <BR><FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A>
 <!--        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>-->
 <!--        <LI><A HREF="search/svc_forward.html">mail forwards (by ?)</A>-->
       <BR><BR>
-- 
cgit v1.2.1


From 47bc56487b4aebf3e415767a053dc049fe4a28d4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Feb 2002 23:43:54 +0000
Subject: set EVERYTHING=1 for your own mod_perl compile

---
 httemplate/docs/install.html  |  2 +-
 httemplate/docs/schema.html   |  4 +++-
 httemplate/docs/upgrade8.html | 10 +++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 315ad8f50..d8d02c1e7 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -7,7 +7,7 @@ Before installing, you need:
 <ul>
   <li><a href="http://www.perl.com/">Perl</a>  Don't enable experimental features like threads or the PerlIO abstraction layer.
   <li><a href="http://www.apache.org">Apache</a> (<a href="http://www.modssl.org/">mod_ssl</a> or <a href="http://www.apache-ssl.org">Apache-SSL</a> highly recommended)
-  <li><a href="http://perl.apache.org/">mod_perl</a>
+  <li><a href="http://perl.apache.org/">mod_perl</a> (if compiling your own mod_perl, make sure you set the <a href="http://perl.apache.org/guide/install.html#EVERYTHING">EVERYTHING</a>=1 compile-time option)
   <li><a href="http://www.openssh.com/">SSH</a> (<a href="http://www.openssh.com//">OpenSSH</a> is recommended.  SSH Communications Security <a href="http://www.ssh.com/products/ssh/download.cfm">commercial SSH version 3</a> has been reported incompatible with Freeside.)
   <li><a href="http://rsync.samba.org/">rsync</a>
   <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index bdf3a500e..8420161bf 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -266,7 +266,7 @@
       <ul>
         <li>optionnum - primary key
         <li>exportnum - <a href="#part_export">Export</a>
-        <li>option - option name
+        <li>optionname - option name
         <li>optionvalue - option value
       </ul>
     <li><a name="port" href="man/FS/port.html">port</a> - individual port on a <a href="#nas">nas</a>
@@ -372,6 +372,8 @@
         <li>job
         <li>_date
         <li>status
+        <li>statustext
+        <li>svcnum
       </ul>
     <li><a name="queue_arg" href="man/FS/queue_arg.html">queue_arg</a> - job arguments
       <ul>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 85c33d649..ac006d221 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -106,8 +106,12 @@ CREATE TABLE queue (
   jobnum int primary key,
   job text not null,
   _date int not null,
-  status varchar(80) not null
+  status varchar(80) not null,
+  statustext text null,
+  svcnum int null
 );
+CREATE INDEX queue1 ON queue ( svcnum );
+CREATE INDEX queue2 ON queue ( status );
 
 CREATE TABLE queue_arg (
   argnum int primary key,
@@ -161,11 +165,11 @@ CREATE INDEX part_export2 ON part_export ( exporttype );
 CREATE INDEX part_export_option (
   optionnum int primary key,
   exportnum int not null,
-  option varchar(80) not null,
+  optionname varchar(80) not null,
   optionvalue text NULL
 );
 CREATE INDEX part_export_option1 ON part_export_option ( exportnum );
-CREATE INDEX part_export_option2 ON part_export_option ( option );
+CREATE INDEX part_export_option2 ON part_export_option ( optionname );
 
 ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
 ALTER TABLE svc_domain ADD catchall integer NULL;
-- 
cgit v1.2.1


From 8f42b751aebda2e7dce2c363bed6f1e15b411b1d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Feb 2002 01:03:10 +0000
Subject: use Net::SSH::ssh_cmd for all job queueing rather than local
 duplicated ssh subs

queue daemon updates: retry & remove links work, bubble up error message
to webinterface, link to svcnum & have job listings on view/svc_* pages,
closes: Bug#280

s/option/optionname/ schema change, dumb mysql, closes: Bug#334
---
 CREDITS                         |  5 ++-
 FS/FS/CGI.pm                    |  4 +-
 FS/FS/Record.pm                 | 34 +++++++++++++--
 FS/FS/queue.pm                  | 92 ++++++++++++++++++++++++++++++++++++++++-
 FS/FS/svc_acct.pm               | 75 +++++++++++++++++----------------
 FS/FS/svc_domain.pm             | 37 +++--------------
 FS/FS/svc_forward.pm            | 23 ++++++++---
 FS/bin/freeside-queued          |  4 +-
 README.1.4.0pre11               | 33 ++++++++++++++-
 README.1.4.0pre8                |  4 +-
 bin/fs-setup                    | 10 +++--
 htetc/global.asa                |  2 +-
 htetc/handler.pl                |  2 +-
 httemplate/browse/queue.cgi     | 44 +-------------------
 httemplate/index.html           |  4 +-
 httemplate/misc/queue.cgi       | 25 +++++++++++
 httemplate/view/svc_acct.cgi    |  4 +-
 httemplate/view/svc_domain.cgi  |  6 +--
 httemplate/view/svc_forward.cgi |  9 ++--
 httemplate/view/svc_www.cgi     |  9 ++--
 20 files changed, 276 insertions(+), 150 deletions(-)
 create mode 100644 httemplate/misc/queue.cgi

diff --git a/CREDITS b/CREDITS
index 6ad4a5f14..2fd407853 100644
--- a/CREDITS
+++ b/CREDITS
@@ -58,7 +58,8 @@ Jeff Finucane <jeff@cmh.net> send in a bunch of bugfixes (for the sendmail
 export, cancel-unaudited.cgi), patches to support billing date modification,
 and probably other things too (sorry if I forgot them).  And yet even more
 bug squashing, thanks!  *and* he single-handedly implemented all the necessary
-work to get rid of svc_acct_sm and the "default domain"  thanks!!
+work to get rid of svc_acct_sm and the "default domain"  thanks!!  and rewrote
+the financials!  wow, thanks jeff!
 
 Kenny Elliott <kenny@neoserve.com> contributed ICRADIUS radreply table support,
 allowing attributes with ICRADIUS, helped fix many bugs, and some
@@ -80,7 +81,7 @@ Matt Peterson <matt@peterson.org> and Mack ? <mackn@mackn.net> tested
 the new features and contributed many bugfixes.
 
 Landel Telecom <http://www.landel.com/> sponsored shipping addresses and
-customer notes.
+customer notes, as well as an update of the CP provisioning.
 
 nikotel, Inc. <http://www.nikojet.com> sponsored the inclusion of
 customer-to-customer referrals in the web interface and signup server.
diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 35d2e2839..ee59b259f 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -5,7 +5,7 @@ use vars qw(@EXPORT_OK @ISA @header);
 use Exporter;
 use CGI;
 use URI::URL;
-use CGI::Carp qw(fatalsToBrowser);
+#use CGI::Carp qw(fatalsToBrowser);
 use FS::UID;
 
 @ISA = qw(Exporter);
@@ -45,7 +45,7 @@ Returns an HTML header.
 
 sub header {
   my($title,$menubar,$etc)=@_; #$etc is for things like onLoad= etc.
-  use Carp;
+  #use Carp;
   $etc = '' unless defined $etc;
 
   my $x =  <<END;
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 755cef830..020d14d8f 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -59,13 +59,13 @@ FS::Record - Database record objects
     $hashref = $record->hashref;
 
     $error = $record->insert;
-    #$error = $record->add; #depriciated
+    #$error = $record->add; #deprecated
 
     $error = $record->delete;
-    #$error = $record->del; #depriciated
+    #$error = $record->del; #deprecated
 
     $error = $new_record->replace($old_record);
-    #$error = $new_record->rep($old_record); #depriciated
+    #$error = $new_record->rep($old_record); #deprecated
 
     $value = $record->unique('column');
 
@@ -974,6 +974,34 @@ sub ut_enum {
   return "Illegal (enum) field $field: ". $self->getfield($field);
 }
 
+=item ut_foreign_key COLUMN FOREIGN_TABLE FOREIGN_COLUMN
+
+Check/untaint a foreign column key.  Call a regular ut_ method (like ut_number)
+on the column first.
+
+=cut
+
+sub ut_foreign_key {
+  my( $self, $field, $table, $foreign ) = @_;
+  qsearchs($table, { $foreign => $self->getfield($field) })
+    or return "Can't find $field ". $self->getfield($field).
+              " in $table.$foreign";
+  '';
+}
+
+=item ut_foreign_keyn COLUMN FOREIGN_TABLE FOREIGN_COLUMN
+
+Like ut_foreign_key, except the null value is also allowed.
+
+=cut
+
+sub ut_foreign_keyn {
+  my( $self, $field, $table, $foreign ) = @_;
+  $self->getfield($field)
+    ? $self->ut_foreign_key($field, $table, $foreign)
+    : '';
+}
+
 =item fields [ TABLE ]
 
 This can be used as both a subroutine and a method call.  It returns a list
diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index 09672480b..83ae17189 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -1,11 +1,15 @@
 package FS::queue;
 
 use strict;
-use vars qw( @ISA );
+use vars qw( @ISA @EXPORT_OK );
+use Exporter;
 use FS::Record qw( qsearch qsearchs dbh );
+#use FS::queue;
 use FS::queue_arg;
+use FS::cust_svc;
 
 @ISA = qw(FS::Record);
+@EXPORT_OK = qw( joblisting );
 
 =head1 NAME
 
@@ -39,6 +43,12 @@ FS::Record.  The following fields are currently supported:
 
 =item status - job status
 
+=item statustext - freeform text status message
+
+=item _date - UNIX timestamp
+
+=item svcnum - optional link to service (see L<FS::cust_svc>)
+
 =back
 
 =head1 METHODS
@@ -173,6 +183,9 @@ sub check {
     || $self->ut_anything('job')
     || $self->ut_numbern('_date')
     || $self->ut_enum('status',['', qw( new locked failed )])
+    || $self->ut_textn('statustext')
+    || $self->ut_numbern('svcnum')
+    || $self->ut_foreign_keyn('svcnum', 'cust_svc', 'svcnum')
   ;
   return $error if $error;
 
@@ -195,11 +208,86 @@ sub args {
                       );
 }
 
+=item cust_svc
+
+Returns the FS::cust_svc object associated with this job, if any.
+
+=cut
+
+sub cust_svc {
+  my $self = shift;
+  qsearchs('cust_svc', { 'svcnum' => $self->svcnum } );
+}
+
+=item joblisting HASHREF
+
+=cut
+
+sub joblisting {
+  my($hashref, $noactions) = @_;
+
+  use Date::Format;
+  use FS::CGI;
+
+  my $html = FS::CGI::table(). <<END;
+      <TR>
+        <TH COLSPAN=2>Job</TH>
+        <TH>Args</TH>
+        <TH>Date</TH>
+        <TH>Status</TH>
+        <TH>Account</TH>
+      </TR>
+END
+
+  my $p = FS::CGI::popurl(2);
+  foreach my $queue ( sort { 
+    $a->getfield('jobnum') <=> $b->getfield('jobnum')
+  } qsearch( 'queue', $hashref ) ) {
+    my $hashref = $queue->hashref;
+    my $jobnum = $queue->jobnum;
+    my $args = join(' ', $queue->args);
+    my $date = time2str( "%a %b %e %T %Y", $queue->_date );
+    my $status = $queue->status;
+    $status .= ': '. $queue->statustext if $queue->statustext;
+    if ( ! $noactions && $status =~ /^failed/ || $status =~ /^locked/ ) {
+      $status .=
+        qq! ( <A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=new">retry</A> |!.
+        qq! <A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=del">remove </A> )!;
+    }
+    my $cust_svc = $queue->cust_svc;
+    my $account;
+    if ( $cust_svc ) {
+      my $table = $cust_svc->part_svc->svcdb;
+      my $label = ( $cust_svc->label )[1];
+      $account = qq!<A HREF="../view/$table.cgi?!. $queue->svcnum.
+                 qq!">$label</A>!;
+    } else {
+      $account = '';
+    }
+    $html .= <<END;
+      <TR>
+        <TD>$jobnum</TD>
+        <TD>$hashref->{job}</TD>
+        <TD>$args</TD>
+        <TD>$date</TD>
+        <TD>$status</TD>
+        <TD>$account</TD>
+      </TR>
+END
+
+}
+
+  $html .= '</TABLE>';
+
+  $html;
+
+}
+
 =back
 
 =head1 VERSION
 
-$Id: queue.pm,v 1.3 2001-09-11 12:25:55 ivan Exp $
+$Id: queue.pm,v 1.4 2002-02-20 01:03:09 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 65a58fc98..2f327a3d3 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -281,7 +281,10 @@ sub insert {
     $self->shell,
   );
   if ( $username && $uid && $dir && $shellmachine && ! $nossh_hack ) {
-    my $queue = new FS::queue { 'job' => 'FS::svc_acct::ssh' };
+    my $queue = new FS::queue {
+      'svcnum' => $self->svcnum,
+      'job' => 'Net::SSH::ssh_cmd',
+    };
     $error = $queue->insert("root\@$shellmachine", eval qq("$useradd") );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
@@ -290,7 +293,10 @@ sub insert {
   }
 
   if ( $cyrus_server ) {
-    my $queue = new FS::queue { 'job' => 'FS::svc_acct::cyrus_insert' };
+    my $queue = new FS::queue {
+      'svcnum' => $self->svcnum,
+      'job'    => 'FS::svc_acct::cyrus_insert',
+    };
     $error = $queue->insert($self->username, $self->quota);
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
@@ -299,7 +305,10 @@ sub insert {
   }
 
   if ( $cp_server ) {
-    my $queue = new FS::queue { 'job' => 'FS::svc_acct::cp_insert' };
+    my $queue = new FS::queue {
+      'svcnum' => $self->svcnum,
+      'job'    => 'FS::svc_acct::cp_insert'
+    };
     $error = $queue->insert($self->username, $self->_password);
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
@@ -310,7 +319,10 @@ sub insert {
   if ( $icradius_dbh ) {
 
     my $radcheck_queue =
-      new FS::queue { 'job' => 'FS::svc_acct::icradius_rc_insert' };
+      new FS::queue {
+      'svcnum' => $self->svcnum,
+      'job' => 'FS::svc_acct::icradius_rc_insert'
+    };
     $error = $radcheck_queue->insert( $self->username,
                                       $self->_password,
                                       $self->radius_check
@@ -321,7 +333,10 @@ sub insert {
     }
 
     my $radreply_queue =
-      new FS::queue { 'job' => 'FS::svc_acct::icradius_rr_insert' };
+      new FS::queue { 
+      'svcnum' => $self->svcnum,
+      'job' => 'FS::svc_acct::icradius_rr_insert'
+    };
     $error = $radreply_queue->insert( $self->username,
                                       $self->_password,
                                       $self->radius_reply
@@ -542,7 +557,7 @@ sub delete {
     $self->dir,
   );
   if ( $username && $shellmachine && ! $nossh_hack ) {
-    my $queue = new FS::queue { 'job' => 'FS::svc_acct::ssh' };
+    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' };
     $error = $queue->insert("root\@$shellmachine", eval qq("$userdel") );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
@@ -728,7 +743,10 @@ sub replace {
     $new->getfield('gid'),
   );
   if ( $old_dir && $new_dir && $old_dir ne $new_dir && ! $nossh_hack ) {
-    my $queue = new FS::queue { 'job' => 'FS::svc_acct::ssh' };
+    my $queue = new FS::queue { 
+      'svcnum' => $new->svcnum,
+      'job' => 'Net::SSH::ssh_cmd'
+    };
     $error = $queue->insert("root\@$shellmachine", eval qq("$usermod") );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
@@ -737,7 +755,10 @@ sub replace {
   }
 
   if ( $cp_server && $old->username ne $new->username ) {
-    my $queue = new FS::queue { 'job' => 'FS::svc_acct::cp_rename' };
+    my $queue = new FS::queue { 
+      'svcnum' => $new->svcnum,
+      'job' => 'FS::svc_acct::cp_rename'
+    };
     $error = $queue->insert( $old->username, $new->username );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
@@ -746,7 +767,10 @@ sub replace {
   }
 
   if ( $cp_server && $old->_password ne $new->_password ) {
-    my $queue = new FS::queue { 'job' => 'FS::svc_acct::cp_change' };
+    my $queue = new FS::queue {  
+      'svcnum' => $new->svcnum,
+      'job' => 'FS::svc_acct::cp_change'
+    };
     $error = $queue->insert( $new->username, $new->_password );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
@@ -755,7 +779,10 @@ sub replace {
   }
 
   if ( $icradius_dbh ) {
-    my $queue = new FS::queue { 'job' => 'FS::svc_acct::icradius_rc_replace' };
+    my $queue = new FS::queue {  
+      'svcnum' => $new->svcnum,
+      'job' => 'FS::svc_acct::icradius_rc_replace'
+    };
     $error = $queue->insert( $new->username,
                              $new->_password,
                            );
@@ -1164,34 +1191,6 @@ sub seconds_since {
   $self->cust_svc->seconds_since(@_);
 }
 
-=item ssh
-
-=cut
-
-sub ssh {
-  my ( $host, @cmd_and_args ) = @_;
-
-  use IO::File;
-  my $reader = IO::File->new();
-  my $writer = IO::File->new();
-  my $error = IO::File->new();
-
-  &Net::SSH::sshopen3( $host, $reader, $writer, $error, @cmd_and_args) or die $!;
-
-  local $/ = undef;
-  my $output_stream = <$writer>;
-  my $error_stream = <$error>;
-  if ( length $error_stream ) {
-    #warn "[FS::svc_acct::ssh] STDERR $error_stream";
-    die "[FS::svc_acct::ssh] STDERR $error_stream";
-  }
-  if ( length $output_stream ) {
-    warn "[FS::svc_acct::ssh] STDOUT $output_stream";
-  }
-
-#  &Net::SSH::ssh(@args,">>/usr/local/etc/freeside/sshoutput 2>&1");
-}
-
 =back
 
 =head1 BUGS
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index d0f0e11a8..84a102911 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -241,7 +241,10 @@ sub insert {
         $svc_acct->dir,
       );
   
-    my $queue = new FS::queue { 'job' => 'FS::svc_domain::ssh' };
+    my $queue = new FS::queue {
+      'svcnum' => $self->svcnum,
+      'job'    => 'Net::SSH::ssh_cmd',
+    };
     $error = $queue->insert("root\@$qshellmachine", "[ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }" );
 
     }
@@ -250,36 +253,6 @@ sub insert {
   ''; #no error
 }
 
-=item ssh
-
-=cut
-
-#false laziness with FS::svc_acct::ssh
-sub ssh {
-  my ( $host, @cmd_and_args ) = @_;
-
-  use IO::File;
-  my $reader = IO::File->new();
-  my $writer = IO::File->new();
-  my $error = IO::File->new();
-
-  &Net::SSH::sshopen3( $host, $reader, $writer, $error, @cmd_and_args) or die $!;
-
-  local $/ = undef;
-  my $output_stream = <$writer>;
-  my $error_stream = <$error>;
-  if ( length $error_stream ) {
-    #warn "[FS::svc_acct::ssh] STDERR $error_stream";
-    die "[FS::svc_domain::ssh] STDERR $error_stream";
-  }
-  if ( length $output_stream ) {
-    warn "[FS::svc_domain::ssh] STDOUT $output_stream";
-  }
-
-#  &Net::SSH::ssh(@args,">>/usr/local/etc/freeside/sshoutput 2>&1");
-}
-
-
 =item delete
 
 Deletes this domain from the database.  If there is an error, returns the
@@ -451,7 +424,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.23 2002-02-09 18:09:30 ivan Exp $
+$Id: svc_domain.pm,v 1.24 2002-02-20 01:03:09 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index 7e0a4fd99..12f8b9236 100644
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -140,7 +140,11 @@ sub insert {
     
   foreach my $vpopmailmachine ( @vpopmailmachines ) {
     my($machine, $vpopdir, $vpopuid, $vpopgid) = split(/\s+/, $vpopmailmachine);
-    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' };  # should be neater
+    my $queue = new FS::queue {
+      'svcnum' => $self->svcnum,
+      'job'    => 'Net::SSH::ssh_cmd',
+    };
+    # should be neater
     my $error = $queue->insert("root\@$machine","[ -d $vpopdir/domains/$domain/$username ] && { echo \"$destination\" >> $vpopdir/domains/$domain/$username/.qmail; chown $vpopuid:$vpopgid $vpopdir/domains/$domain/$username/.qmail; }") 
       unless $nossh_hack;
     if ( $error ) {
@@ -209,7 +213,8 @@ sub delete {
   foreach my $vpopmailmachine ( @vpopmailmachines ) {
     my($machine, $vpopdir, $vpopuid, $vpopgid) =
       split(/\s+/, $vpopmailmachine);
-    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' };  # should be neater
+    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' };
+    # should be neater
     my $error = $queue->insert("root\@$machine",
       "sed -e '/^$destination/d' " .
         "< $vpopdir/domains/$domain/$username/.qmail" .
@@ -302,7 +307,11 @@ sub replace {
   foreach my $vpopmailmachine ( @vpopmailmachines ) {
     my($machine, $vpopdir, $vpopuid, $vpopgid) =
       split(/\s+/, $vpopmailmachine);
-    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' };  # should be neater
+    my $queue = new FS::queue {
+      'svcnum' => $new->svcnum,
+      'job'    => 'Net::SSH::ssh_cmd',
+    };
+    # should be neater
     my $error = $queue->insert("root\@$machine",
       "sed -e '/^$destination/d' " .
         "< $vpopdir/domains/$old_domain/$old_username/.qmail" .
@@ -332,7 +341,11 @@ sub replace {
   
   foreach my $vpopmailmachine ( @vpopmailmachines ) {
     my($machine, $vpopdir, $vpopuid, $vpopgid) = split(/\s+/, $vpopmailmachine);
-    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' };  # should be neater
+    my $queue = new FS::queue {
+      'svcnum' => $new->svcnum,
+      'job'    => 'Net::SSH::ssh_cmd',
+    };
+    # should be neater
     my $error = $queue->insert("root\@$machine","[ -d $vpopdir/domains/$domain/$username ] && { echo \"$destination\" >> $vpopdir/domains/$domain/$username/.qmail; chown $vpopuid:$vpopgid $vpopdir/domains/$domain/$username/.qmail; }") 
       unless $nossh_hack;
     if ( $error ) {
@@ -439,7 +452,7 @@ sub dstsvc_acct {
 
 =head1 VERSION
 
-$Id: svc_forward.pm,v 1.10 2002-02-17 19:07:32 jeff Exp $
+$Id: svc_forward.pm,v 1.11 2002-02-20 01:03:09 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 87e3cb422..56475d059 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -14,7 +14,7 @@ use FS::queue;
 # no autoloading just yet
 use FS::cust_main;
 use FS::svc_acct;
-use Net::SSH;
+use Net::SSH 0.05;
 
 my $pid_file = '/var/run/freeside-queued.pid';
 
@@ -69,6 +69,7 @@ while (1) {
     warn "WARNING: can't fork: $!\n";
     my %hash = $job->hash;
     $hash{'status'} = 'failed';
+    $hash{'statustext'} = "[freeside-queued] can't fork: $!";
     my $ljob = new FS::queue ( \%hash );
     my $error = $ljob->replace($job);
     die $error if $error;
@@ -89,6 +90,7 @@ while (1) {
       warn "job $eval failed";
       my %hash = $ljob->hash;
       $hash{'status'} = 'failed';
+      $hash{'statustext'} = $@;
       my $fjob = new FS::queue( \%hash );
       my $error = $fjob->replace($ljob);
       die $error if $error;
diff --git a/README.1.4.0pre11 b/README.1.4.0pre11
index c3a64d7b4..5a4bcedc7 100644
--- a/README.1.4.0pre11
+++ b/README.1.4.0pre11
@@ -1,2 +1,33 @@
-install rsync
+the following is necessary to upgrade from 1.4.0pre ( 9 or 10 )
+to 1.4.0pre11
+
+if you're upgrading from before 1.4.0pre11 see README.1.4.0pre9 first!
+
+if you're upgrading from 1.3.1 follow the instructions in
+httemplate/docs/upgrade8.html instead
+
+----
+
+install rsync <http://rsync.samba.org/>
+
+install the FS perl modules and httemplate as per install.html or upgrade8.html
+
+ALTER TABLE queue ADD svcnum int NULL;
+ALTER TABLE queue ADD statustext text NULL;
+CREATE INDEX queue1 ON queue ( svcnum );
+CREATE INDEX queue2 ON queue ( status );
+
+DROP TABLE part_export_option;
+CREATE TABLE part_export_option (
+  optionnum int primary key,
+  exportnum int not null,
+  optionname varchar(80) not null,
+  optionvalue text NULL
+);
+CREATE INDEX part_export_option1 ON part_export_option ( exportnum );
+CREATE INDEX part_export_option2 ON part_export_option ( optionname );
+
+Run bin/dbdef-create
+
+Restart Apache and freeside-queued
 
diff --git a/README.1.4.0pre8 b/README.1.4.0pre8
index ef20b298f..7ddd7e292 100644
--- a/README.1.4.0pre8
+++ b/README.1.4.0pre8
@@ -50,11 +50,11 @@ CREATE INDEX part_export2 ON part_export ( exporttype );
 CREATE TABLE part_export_option (
   optionnum int primary key,
   exportnum int not null,
-  option varchar(80) not null,
+  optionname varchar(80) not null,
   optionvalue text NULL
 );
 CREATE INDEX part_export_option1 ON part_export_option ( exportnum );
-CREATE INDEX part_export_option2 ON part_export_option ( option );
+CREATE INDEX part_export_option2 ON part_export_option ( optionname );
 
 ALTER TABLE cust_bill ADD closed char(1) NULL;
 ALTER TABLE cust_pay ADD closed char(1) NULL;
diff --git a/bin/fs-setup b/bin/fs-setup
index 7c716d35e..48d28c6f0 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.77 2002-02-12 05:58:42 ivan Exp $
+# $Id: fs-setup,v 1.78 2002-02-20 01:03:09 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -856,10 +856,12 @@ sub tables_hash_hack {
         'job', 'text', '', '',
         '_date', 'int', '', '',
         'status', 'varchar', '', $char_d,
+        'statustext', 'text', '', '',
+        'svcnum', 'int', '', '',
       ],
       'primary_key' => 'jobnum',
       'unique'      => [],
-      'index'       => [],
+      'index'       => [ [ 'svcnum' ], [ 'status' ] ],
     },
 
     'queue_arg' => {
@@ -890,12 +892,12 @@ sub tables_hash_hack {
       'columns' => [
         'optionnum', 'int', '', '',
         'exportnum', 'int', '', '',
-        'option', 'varchar', '', $char_d,
+        'optionname', 'varchar', '', $char_d,
         'optionvalue', 'text', 'NULL', '',
       ],
       'primary_key' => 'optionnum',
       'unique'      => [],
-      'index'       => [ [ 'exportnum' ], [ 'option' ] ],
+      'index'       => [ [ 'exportnum' ], [ 'optionname' ] ],
     },
 
   );
diff --git a/htetc/global.asa b/htetc/global.asa
index ce3bc27c8..339f01dae 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -35,7 +35,7 @@ use FS::part_referral;
 use FS::part_svc;
 use FS::pkg_svc;
 use FS::port;
-use FS::queue;
+use FS::queue qw(joblisting);
 use FS::raddb;
 use FS::session;
 use FS::svc_acct;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index cac90044d..680d11ec8 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -92,7 +92,7 @@ sub handler
       use FS::part_svc;
       use FS::pkg_svc;
       use FS::port;
-      use FS::queue;
+      use FS::queue qw(joblisting);
       use FS::raddb;
       use FS::session;
       use FS::svc_acct;
diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index 7fce1f5df..b53c1402d 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,47 +1,7 @@
 <!-- mason kludge -->
 <%
 
-print header("Job Queue", menubar(
-  'Main Menu' => $p,
-#  'Add new referral' => "../edit/part_referral.cgi",
-)), &table(), <<END;
-      <TR>
-        <TH COLSPAN=2>Job</TH>
-        <TH>Args</TH>
-        <TH>Date</TH>
-        <TH>Status</TH>
-      </TR>
-END
-
-foreach my $queue ( sort { 
-  $a->getfield('jobnum') <=> $b->getfield('jobnum')
-} qsearch('queue',{}) ) {
-  my($hashref)=$queue->hashref;
-  my $jobnum = $hashref->{jobnum};
-  my $args = join(' ', $queue->args);
-  my $date = time2str( "%a %b %e %T %Y", $queue->_date );
-  my $status = $hashref->{status};
-  if ( $status eq 'failed' || $status eq 'locked' ) {
-    $status .=
-      qq! ( <A HREF="$p/edit/queue.cgi?jobnum=$jobnum&action=new">retry</A> |!.
-      qq! <A HREF="$p/edit/queue.cgi?jobnum$jobnum&action=del">remove </A> )!;
-  }
-  print <<END;
-      <TR>
-        <TD>$jobnum</TD>
-        <TD>$hashref->{job}</TD>
-        <TD>$args</TD>
-        <TD>$date</TD>
-        <TD>$status</TD>
-      </TR>
-END
-
-}
-
-print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
+print header("Job Queue", menubar( 'Main Menu' => $p, )).
+      joblisting({}). '</BODY></HTML>';
 
 %>
diff --git a/httemplate/index.html b/httemplate/index.html
index dd08c4fa7..f4bb6581c 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -66,7 +66,7 @@
               <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
               <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
             </UL>
-      <BR><CENTER><HR WIDTH="87%" NOSHADE></CENTER><BR>
+      <BR><CENTER><HR WIDTH="94%" NOSHADE></CENTER><BR>
       <A NAME="admin">Administration</a>
         <ul>
           <LI><A HREF="browse/part_pkg.cgi">View/Edit package definitions</A>
@@ -133,7 +133,7 @@
       <BR>
       <A HREF="browse/nas.cgi">View active NAS ports</A>
       <BR><A HREF="browse/queue.cgi">View pending job queue</A>
-      <BR><BR><CENTER><HR WIDTH="87%" NOSHADE></CENTER><BR>
+      <BR><BR><CENTER><HR WIDTH="94%" NOSHADE></CENTER><BR>
       <A NAME="config" HREF="config/config-view.cgi">Configuration</a><!-- - <font size="+2" color="#ff0000">start here</font> -->
       <BR><BR><A NAME="admin">Administration</a>
         <ul>
diff --git a/httemplate/misc/queue.cgi b/httemplate/misc/queue.cgi
new file mode 100644
index 000000000..7e962d498
--- /dev/null
+++ b/httemplate/misc/queue.cgi
@@ -0,0 +1,25 @@
+<%
+
+$cgi->param('jobnum') =~ /^(\d+)$/ or die "Illegal jobnum";
+my $jobnum = $1;
+my $job = qsearchs('queue', { 'jobnum' => $1 })
+  or die "unknown jobnum $jobnum";
+
+$cgi->param('action') =~ /^(new|del)$/ or die "Illegal action";
+my $action = $1;
+
+if ( $action eq 'new' ) {
+  my %hash = $job->hash;
+  $hash{'status'} = 'new';
+  $hash{'statustext'} = '';
+  my $new = new FS::queue \%hash;
+  my $error = $new->replace($job);
+  die $error if $error;
+} elsif ( $action eq 'del' ) {
+  my $error = $job->delete;
+  die $error if $error;
+}
+
+print $cgi->redirect(popurl(2). "browse/queue.cgi");
+
+%>
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 90ca1a240..d1c61576d 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -129,6 +129,8 @@ if ($svc_acct->slipip) {
   print "<TR><TH COLSPAN=2>(No SLIP/PPP account)</TH></TR>";
 }
 
-print "</TABLE></TD></TR></TABLE></BODY></HTML>";
+print "</TABLE></TD></TR></TABLE>".
+      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
+      "</BODY></HTML>";
 
 %>
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index f086cda1a..61194a26d 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -55,8 +55,8 @@ foreach my $domain_record ( qsearch('domain_record', { svcnum => $svcnum } ) ) {
         '<td>'. $domain_record->recaf. ' '. $domain_record->rectype. '</td>'.
         '<td>'. $domain_record->recdata. '</td></tr>';
 }
-print '</table>';
-
-print '</BODY></HTML>';
+print '</table>'.
+      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
+      '</BODY></HTML>';
 
 %>
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index cafb9e5b8..8d2afc823 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -52,10 +52,11 @@ if ($dstsvc) {
   $destination = $dst;
 }
 
-print qq!<A HREF="${p}edit/svc_forward.cgi?$svcnum">Edit this information</A>!,
-      "<BR>Service #$svcnum",
-      "<BR>Service: <B>$svc</B>",
-      qq!<BR>Mail to <B>$source</B> forwards to <B>$destination</B> mailbox.!,
+print qq!<A HREF="${p}edit/svc_forward.cgi?$svcnum">Edit this information</A>!.
+      "<BR>Service #$svcnum".
+      "<BR>Service: <B>$svc</B>".
+      qq!<BR>Mail to <B>$source</B> forwards to <B>$destination</B> mailbox.!.
+      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
       '</BODY></HTML>'
 ;
 
diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index a82921f1b..70a7a1be4 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -38,9 +38,10 @@ print header('Website View', menubar(
           "${p}misc/cancel-unaudited.cgi?$svcnum" )
   ),
   "Main menu" => $p,
-)),
-      "Service #$svcnum",
-      qq!<BR>Website name: <B><A HREF="http://$www">$www</A></B>!,
-      '</BODY></HTML>',                
+)).
+      "Service #$svcnum".
+      qq!<BR>Website name: <B><A HREF="http://$www">$www</A></B>!.
+      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
+      '</BODY></HTML>'
 ;
 %>
-- 
cgit v1.2.1


From 09b365e315a7ba825c9e1e262c50b372cf2595a2 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Wed, 20 Feb 2002 03:17:13 +0000
Subject: correct sense of tax generation

---
 FS/FS/cust_main.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b732218e7..67b426b85 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -976,10 +976,10 @@ sub bill {
         $total_recur += $recur;
         $taxable_setup += $setup
           unless $part_pkg->dbdef_table->column('setuptax')
-                 || $part_pkg->setuptax =~ /^Y$/i;
+                 && $part_pkg->setuptax =~ /^Y$/i;
         $taxable_recur += $recur
           unless $part_pkg->dbdef_table->column('recurtax')
-                 || $part_pkg->recurtax =~ /^Y$/i;
+                 && $part_pkg->recurtax =~ /^Y$/i;
       }
     }
 
-- 
cgit v1.2.1


From 436df4de2b0cd4442eaf37f880f0ae017debeaf5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Feb 2002 09:44:28 +0000
Subject: don't display full card in webinterface

---
 httemplate/view/cust_main.cgi | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 34e99cf3e..8ae7ce295 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -197,9 +197,12 @@ print '<BR>';
   ;
 
   if ( $cust_main->payby eq 'CARD' ) {
+    my $payinfo = $cust_main->payinfo;
+    $payinfo = substr($payinfo,0,4). 'x'x(length($payinfo)-4);
+
     print 'Credit card</TD></TR>',
           '<TR><TD ALIGN="right">Card number</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->payinfo, '</TD></TR>',
+          $payinfo, '</TD></TR>',
           '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
           $cust_main->paydate, '</TD></TR>',
           '<TR><TD ALIGN="right">Name on card</TD><TD BGCOLOR="#ffffff">',
-- 
cgit v1.2.1


From b4d4e05b95414fc334bf80474a0c10f639ac4ba1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Feb 2002 10:39:53 +0000
Subject: fixes eidiot under Mason, closes: Bug#344

---
 FS/FS/CGI.pm | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index ee59b259f..190c0aa37 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -131,6 +131,8 @@ Sends an HTML error message, then exits.
 
 sub eidiot {
   warn "eidiot depriciated";
+  $HTML::Mason::Commands::r->send_http_header
+    if defined $HTML::Mason::Commands::r;
   idiot(@_);
   &myexit();
 }
@@ -145,11 +147,22 @@ If running under mod_perl, calles Apache::exit, otherwise, calls exit.
 
 sub myexit {
   if (exists $ENV{MOD_PERL}) {
-    $main::Response->End()
-      if defined $main::Response
-         && $main::Response->isa('Apache::ASP::Response');
-    require Apache;
-    Apache::exit();
+
+    if ( defined $main::Response
+         && $main::Response->isa('Apache::ASP::Response') ) {  #Apache::ASP
+      $main::Response->End();
+      require Apache;
+      Apache::exit();
+    } elsif ( defined $HTML::Mason::Commands::m  ) { #Mason
+      #$HTML::Mason::Commands::m->flush_buffer();
+      $HTML::Mason::Commands::m->abort();
+      die "shouldn't fall through to here (mason \$m->abort didn't)";
+    } else {
+      #??? well, it is $ENV{MOD_PERL}
+      warn "running under unknown mod_perl environment; trying Apache::exit()";
+      require Apache;
+      Apache::exit();
+    }
   } else {
     exit;
   }
-- 
cgit v1.2.1


From 3ee9cf763ae85effac0e99f9b09a080cfd29af6c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Feb 2002 22:03:17 +0000
Subject: invoice reports belong here too

---
 httemplate/index.html | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index f4bb6581c..921ddbea8 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -114,7 +114,16 @@
         <LI><A HREF="search/cust_pkg.cgi?pkgnum">packages (by package number)</A>
         <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
       </UL>
-      <BR>
+      Invoices
+      <UL>
+        <LI>open invoices (<A HREF="search/cust_bill.cgi?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN_custnum">by customer number</A>)
+        <LI>30 day open invoices (<A HREF="search/cust_bill.cgi?OPEN30_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN30_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN30_custnum">by customer number</A>)
+        <LI>60 day open invoices (<A HREF="search/cust_bill.cgi?OPEN60_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN60_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN60_custnum">by customer number</A>)
+        <LI>90 day open invoices (<A HREF="search/cust_bill.cgi?OPEN90_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN90_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN90_custnum">by customer number</A>)
+        <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
+        <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
+      </UL>
+    <BR>
     </TD></TR>
     </TABLE>
 
-- 
cgit v1.2.1


From 0ef5eb21cd3c5ed66216bc986c59a33383da746c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 21 Feb 2002 21:43:57 +0000
Subject: looks like statustext field is missing NULL flag in fs-setup

---
 bin/fs-setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 48d28c6f0..708bb9cd6 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.78 2002-02-20 01:03:09 ivan Exp $
+# $Id: fs-setup,v 1.79 2002-02-21 21:43:57 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -856,7 +856,7 @@ sub tables_hash_hack {
         'job', 'text', '', '',
         '_date', 'int', '', '',
         'status', 'varchar', '', $char_d,
-        'statustext', 'text', '', '',
+        'statustext', 'text', NULL, '',
         'svcnum', 'int', '', '',
       ],
       'primary_key' => 'jobnum',
-- 
cgit v1.2.1


From 33859df31410294de8c6d775f7e4f892534d4145 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 21 Feb 2002 23:17:06 +0000
Subject: queue.svcnum is nullable too, oops

---
 bin/fs-setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 708bb9cd6..5ec4204da 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.79 2002-02-21 21:43:57 ivan Exp $
+# $Id: fs-setup,v 1.80 2002-02-21 23:17:06 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -857,7 +857,7 @@ sub tables_hash_hack {
         '_date', 'int', '', '',
         'status', 'varchar', '', $char_d,
         'statustext', 'text', NULL, '',
-        'svcnum', 'int', '', '',
+        'svcnum', 'int', NULL, '',
       ],
       'primary_key' => 'jobnum',
       'unique'      => [],
-- 
cgit v1.2.1


From 4dbbbee37e78a035022974d19b3b80aeaead6049 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Feb 2002 01:07:23 +0000
Subject: UI work:

make all functions of view/cust_pkg.cgi available on view/cust_main.cgi
 - having them one link down in "Edit" is confusing.

closes: Bug#325
---
 FS/FS/Conf.pm                 |   7 +++
 httemplate/view/cust_main.cgi | 106 ++++++++++++++++++++++++++++++++++++------
 httemplate/view/cust_pkg.cgi  |  34 ++++++++------
 3 files changed, 117 insertions(+), 30 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index f8d646254..226702e5c 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -766,6 +766,13 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'legacy_link',
+    'section'     => 'UI',
+    'description' => 'Display options in the web interface to link legacy pre-Freeside services.',
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 8ae7ce295..1a04ff61c 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -3,6 +3,14 @@
 
 my $conf = new FS::Conf;
 
+#false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
+my %uiview = ();
+my %uiadd = ();
+foreach my $part_svc ( qsearch('part_svc',{}) ) {
+  $uiview{$part_svc->svcpart} = popurl(2). "view/". $part_svc->svcdb . ".cgi";
+  $uiadd{$part_svc->svcpart}= popurl(2). "edit/". $part_svc->svcdb . ".cgi";
+}
+
 print header("Customer View", menubar(
   'Main Menu' => popurl(2)
 ));
@@ -260,6 +268,15 @@ foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
 
 print '</SELECT><INPUT TYPE="submit" VALUE="Order Package"><BR>';
 
+print <<END;
+<SCRIPT>
+function cust_pkg_areyousure(href) {
+    if (confirm("Permanantly delete included services and cancel this package?") == true)
+        window.location.href = href;
+}
+</SCRIPT>
+END
+
 print qq!<BR><A NAME="cust_pkg">Packages</A> !,
 #      qq!<BR>Click on package number to view/edit package.!,
       qq!( <A HREF="!, popurl(2), qq!edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> (preserves services) )!,
@@ -292,8 +309,25 @@ foreach my $package (@packages) {
   my $pkg = $package->part_pkg->pkg;
   my $comment = $package->part_pkg->comment;
   my $pkgview = popurl(2). "view/cust_pkg.cgi?$pkgnum";
-  my @cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
-  my $rowspan = scalar(@cust_svc) || 1;
+
+  #my @cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
+  #my $rowspan = scalar(@cust_svc) || 1;
+  my @cust_svc = ();
+  my $rowspan = 0;
+  my %pkg_svc = ();
+  unless ( $package->getfield('cancel') ) {
+    foreach my $pkg_svc (
+      grep { $_->quantity }
+        qsearch('pkg_svc',{'pkgpart'=> $package->pkgpart })
+    ) {
+      $rowspan += ( $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity );
+    }
+  } else {
+    #@cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
+    @cust_svc = ();
+    $rowspan = scalar(@cust_svc) || 1;
+  }
+  $rowspan ||= 1;
 
   my $button_cgi = new CGI;
   $button_cgi->param('clone', $package->part_pkg->pkgpart);
@@ -304,9 +338,30 @@ foreach my $package (@packages) {
   print $n1, qq!<TD ROWSPAN=$rowspan>$pkgnum</TD>!,
         qq!<TD ROWSPAN=$rowspan><FONT SIZE=-1>!,
         #qq!<A HREF="$pkgview">$pkg - $comment</A>!,
-        qq!$pkg - $comment!,
-        qq! (&nbsp;<A HREF="$pkgview">Edit</A>&nbsp;|&nbsp;<A HREF="$button_url">Customize</A>&nbsp;)</FONT></TD>!,
-  ;
+        qq!$pkg - $comment (&nbsp;<a href="$pkgview">Details</a>&nbsp;)!;
+       # | !;
+
+  #false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
+  unless ( $package->getfield('cancel') ) {
+    print ' (&nbsp;';
+    if ( $package->getfield('susp') ) {
+      print qq!<A HREF="${p}misc/unsusp_pkg.cgi?$pkgnum">Unsuspend</A>!;
+    } else {
+      print qq!<A HREF="${p}misc/susp_pkg.cgi?$pkgnum">Suspend</A>!;
+    }
+    print '&nbsp;|&nbsp;<A HREF="javascript:cust_pkg_areyousure(\''. popurl(2).
+          'misc/cancel_pkg.cgi?'. $pkgnum.  '\')">Cancel</A>';
+  
+    print '&nbsp;) ';
+
+    print ' (&nbsp;<A HREF="'. popurl(2). 'edit/REAL_cust_pkg.cgi?'. $pkgnum.
+          '">Edit&nbsp;dates</A>&nbsp;|&nbsp;';
+        
+    print qq!<A HREF="$button_url">Customize</A>&nbsp;)!;
+
+  }
+  print '</FONT></TD>';
+
   for ( qw( setup bill susp expire cancel ) ) {
     print "<TD ROWSPAN=$rowspan><FONT SIZE=-1>", ( $package->getfield($_)
             ? time2str("%D", $package->getfield($_) )
@@ -316,14 +371,35 @@ foreach my $package (@packages) {
   }
 
   my $n2 = '';
-  foreach my $cust_svc ( @cust_svc ) {
-     my($label, $value, $svcdb) = $cust_svc->label;
-     my($svcnum) = $cust_svc->svcnum;
-     my($sview) = popurl(2). "view";
-     print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
-           qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
-     $n2="</TR><TR>";
+  #false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
+  #foreach my $cust_svc ( @cust_svc ) {
+  foreach my $svcpart ( sort { $a<=>$b } keys %pkg_svc ) {
+    my $svc = qsearchs('part_svc',{'svcpart'=>$svcpart})->getfield('svc');
+    my(@cust_svc)=qsearch('cust_svc',{'pkgnum'=>$pkgnum, 
+                                      'svcpart'=>$svcpart,
+                                    });
+    for my $enum ( 1 .. $pkg_svc{$svcpart} ) {
+      my $cust_svc;
+      if ( $cust_svc = shift @cust_svc ) {
+        my($label, $value, $svcdb) = $cust_svc->label;
+        my($svcnum) = $cust_svc->svcnum;
+        my($sview) = popurl(2). "view";
+        print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
+              qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
+      } else {
+        print $n2, qq!<TD COLSPAN=2><A HREF="$uiadd{$svcpart}?pkgnum$pkgnum-svcpart$svcpart"><b><font size="+1" color="#ff0000">!.
+              qq!Provision $svc</A></b></font>!;
+
+        print qq!<BR><A HREF="../misc/link.cgi?pkgnum$pkgnum-svcpart$svcpart">!.
+              qq!<b><font size="+1" color="#ff0000">Link to legacy $svc</A></b></font>!
+          if $conf->exists('legacy_link');
+
+        print '</TD>';
+      }
+      $n2="</TR><TR>";
+    }
   }
+
   $n1="</TR><TR>";
 }  
 print "</TR>";
@@ -333,7 +409,7 @@ print "</TABLE>";
 
 print <<END;
 <SCRIPT>
-function areyousure(href) {
+function cust_pay_areyousure(href) {
     if (confirm("Are you sure you want to delete this payment?")
  == true)
         window.location.href = href;
@@ -389,7 +465,7 @@ foreach my $bill (@bills) {
     $payby =~ s/^BILL$/Check #/ if $payinfo;
     $payby =~ s/^(CARD|COMP)$/$1 /;
     my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
-                   ? qq! (<A HREF="javascript:areyousure('${p}misc/delete-cust_pay.cgi?!. $payment->paynum. qq!')">delete</A>)!
+                   ? qq! (<A HREF="javascript:cust_pay_areyousure('${p}misc/delete-cust_pay.cgi?!. $payment->paynum. qq!')">delete</A>)!
                    : '';
     push @history,
       "$date\tPayment, Invoice #$invnum ($payby$payinfo)$delete\t\t$paid\t\t\t$target";
@@ -451,7 +527,7 @@ foreach my $payment (@unapplied_payments) {
   $payby =~ s/^BILL$/Check #/ if $payinfo;
   $payby =~ s/^(CARD|COMP)$/$1 /;
   my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
-                 ? qq! (<A HREF="javascript:areyousure('${p}misc/delete-cust_pay.cgi?!. $payment->paynum. qq!')">delete</A>)!
+                 ? qq! (<A HREF="javascript:cust_pay_areyousure('${p}misc/delete-cust_pay.cgi?!. $payment->paynum. qq!')">delete</A>)!
                  : '';
   push @history,
     $payment->_date. "\t".
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index e9670cd22..75fe983b4 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -1,6 +1,8 @@
 <!-- mason kludge -->
 <%
 
+my $conf = new FS::Conf;
+
 my %uiview = ();
 my %uiadd = ();
 foreach my $part_svc ( qsearch('part_svc',{}) ) {
@@ -118,18 +120,18 @@ unless ($cancel) {
         my($svcnum)=$cust_svc->svcnum;
         my($label, $value, $svcdb) = $cust_svc->label;
         print <<END;
-<TR><TD><A HREF="$uiview{$svcpart}?$svcnum">(View) $svc: $value<A></TD></TR>
+<TR><TD><A HREF="$uiview{$svcpart}?$svcnum">(View/Edit) $svc: $value<A></TD></TR>
 END
       } else {
-        print <<END;
-<TR>
-  <TD><A HREF="$uiadd{$svcpart}?pkgnum$pkgnum-svcpart$svcpart">
-      (Add) $svc</A>
-   or <A HREF="../misc/link.cgi?pkgnum$pkgnum-svcpart$svcpart">
-      (Link to existing) $svc</A>
-  </TD>
-</TR>
-END
+        print qq!<TR><TD>!.
+              qq!<A HREF="$uiadd{$svcpart}?pkgnum$pkgnum-svcpart$svcpart">!.
+              qq!(Provision) $svc</A>!;
+
+        print qq! or <A HREF="../misc/link.cgi?pkgnum$pkgnum-svcpart$svcpart">!.
+              qq!(Link to legacy) $svc</A>!
+          if $conf->exists('legacy_link');
+
+        print '</TD></TR>';
       }
 
     }
@@ -137,11 +139,13 @@ END
   }
 
   print "</TABLE><FONT SIZE=-1>",
-        "Choose (View) to view or edit an existing service<BR>",
-        "Choose (Add) to setup a new service<BR>",
-        "Choose (Link to existing) to link to a legacy (pre-Freeside) service",
-        "</FONT>"
-  ;
+        "Choose (View/Edit) to view or edit an existing service<BR>",
+        "Choose (Provision) to setup a new service<BR>";
+
+  print "Choose (Link to legacy) to link to a legacy (pre-Freeside) service"
+    if $conf->exists('legacy_link');
+
+  print "</FONT>";
 }
 
 #formatting
-- 
cgit v1.2.1


From ce4d2cc94fed25fc3b4aa85531022ae1e6eed778 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Feb 2002 05:56:48 +0000
Subject: fix bugs in CP mailbox changes: cp_change and cp_rename

---
 FS/FS/svc_acct.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 2f327a3d3..20db38b71 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -809,7 +809,7 @@ sub icradius_rc_replace {
 }
 
 sub cp_rename {
-  my ( $old_username, $new_username );
+  my ( $old_username, $new_username ) = @_;
 
   my $app = new Net::APP ( $cp_server,
                         User     => $cp_user,
@@ -830,7 +830,7 @@ sub cp_rename {
 }
 
 sub cp_change {
-  my ( $username, $password );
+  my ( $username, $password ) = @_;
 
   my $app = new Net::APP ( $cp_server,
                         User     => $cp_user,
-- 
cgit v1.2.1


From da4c9633b45d04091fc1b8d420e5d75e294ebf86 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Feb 2002 06:23:44 +0000
Subject: don't leak perl line numbers on cp provisioning errors

---
 FS/FS/svc_acct.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 20db38b71..2a0c90445 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -396,7 +396,7 @@ sub cp_insert {
                         Domain   => $mydomain,
                         Timeout  => 60,
                         #Debug    => 1,
-                      ) or die $@;
+                      ) or die "$@\n";
 
   $app->create_mailbox(
                         Mailbox   => $username,
@@ -405,7 +405,7 @@ sub cp_insert {
                         Domain    => $mydomain,
                       );
 
-  die $app->message unless $app->ok;
+  die $app->message."\n" unless $app->ok;
 }
 
 sub icradius_rc_insert {
@@ -637,14 +637,14 @@ sub cp_delete {
                         Domain   => $mydomain,
                         Timeout  => 60,
                         #Debug    => 1,
-                      ) or die $@;
+                      ) or die "$@\n";
 
   $app->delete_mailbox(
                         Mailbox   => $username,
                         Domain    => $mydomain,
                       );
 
-  die $app->message unless $app->ok;
+  die $app->message."\n" unless $app->ok;
 }
 
 sub icradius_rc_delete {
@@ -817,7 +817,7 @@ sub cp_rename {
                         Domain   => $mydomain,
                         Timeout  => 60,
                         #Debug    => 1,
-                      ) or die $@;
+                      ) or die "$@\n";
 
   $app->rename_mailbox(
                         Domain        => $mydomain,
@@ -825,7 +825,7 @@ sub cp_rename {
                         New_Mailbox   => $new_username,
                       );
 
-  die $app->message unless $app->ok;
+  die $app->message."\n" unless $app->ok;
 
 }
 
@@ -838,7 +838,7 @@ sub cp_change {
                         Domain   => $mydomain,
                         Timeout  => 60,
                         #Debug    => 1,
-                      ) or die $@;
+                      ) or die "$@\n";
 
   $app->change_mailbox(
                         Domain    => $mydomain,
@@ -846,7 +846,7 @@ sub cp_change {
                         Password  => $password,
                       );
 
-  die $app->message unless $app->ok;
+  die $app->message."\n" unless $app->ok;
 
 }
 
-- 
cgit v1.2.1


From dbb26e8eeae5866a4bb48f170229d019e32affef Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Feb 2002 06:39:23 +0000
Subject: don't error out on bad svcnum's, just silently remove them

---
 FS/FS/queue.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index 83ae17189..69dc71a0b 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -185,10 +185,12 @@ sub check {
     || $self->ut_enum('status',['', qw( new locked failed )])
     || $self->ut_textn('statustext')
     || $self->ut_numbern('svcnum')
-    || $self->ut_foreign_keyn('svcnum', 'cust_svc', 'svcnum')
   ;
   return $error if $error;
 
+  $error = $self->ut_foreign_keyn('svcnum', 'cust_svc', 'svcnum');
+  $self->svcnum('') if $error;
+
   $self->status('new') unless $self->status;
   $self->_date(time) unless $self->_date;
 
@@ -287,7 +289,7 @@ END
 
 =head1 VERSION
 
-$Id: queue.pm,v 1.4 2002-02-20 01:03:09 ivan Exp $
+$Id: queue.pm,v 1.5 2002-02-22 06:39:23 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 8f7906377ca3165cc2a398dfdff30531787d6368 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Feb 2002 06:42:28 +0000
Subject: UI in joblisting: don't split ( retry | remove ) links

---
 FS/FS/queue.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index 69dc71a0b..3260de20d 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -253,8 +253,8 @@ END
     $status .= ': '. $queue->statustext if $queue->statustext;
     if ( ! $noactions && $status =~ /^failed/ || $status =~ /^locked/ ) {
       $status .=
-        qq! ( <A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=new">retry</A> |!.
-        qq! <A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=del">remove </A> )!;
+        qq! (&nbsp;<A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=new">retry</A>&nbsp;|!.
+        qq!&nbsp;<A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=del">remove</A>&nbsp;)!;
     }
     my $cust_svc = $queue->cust_svc;
     my $account;
@@ -289,7 +289,7 @@ END
 
 =head1 VERSION
 
-$Id: queue.pm,v 1.5 2002-02-22 06:39:23 ivan Exp $
+$Id: queue.pm,v 1.6 2002-02-22 06:42:28 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 7738e200fa23a98b3b493d6e47d44615cd64828b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Feb 2002 07:50:19 +0000
Subject: doh

---
 bin/fs-setup | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 5ec4204da..3ad0bbdf6 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.80 2002-02-21 23:17:06 ivan Exp $
+# $Id: fs-setup,v 1.81 2002-02-22 07:50:19 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -856,8 +856,8 @@ sub tables_hash_hack {
         'job', 'text', '', '',
         '_date', 'int', '', '',
         'status', 'varchar', '', $char_d,
-        'statustext', 'text', NULL, '',
-        'svcnum', 'int', NULL, '',
+        'statustext', 'text', 'NULL', '',
+        'svcnum', 'int', 'NULL', '',
       ],
       'primary_key' => 'jobnum',
       'unique'      => [],
-- 
cgit v1.2.1


From 1cd0fc70e60e5ecccb10e2bd4dae112a53dde330 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Feb 2002 08:58:11 +0000
Subject: freeside *SUSPENDED* -> CP set_mailbox_status OTHER/OTHER_BOUNCE

---
 FS/FS/svc_acct.pm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 2a0c90445..314a7527b 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -840,12 +840,25 @@ sub cp_change {
                         #Debug    => 1,
                       ) or die "$@\n";
 
+  if ( $password =~ /^\*SUSPENDED\* (.*)$/ ) {
+    $password = $1;
+    $app->set_mailbox_status(
+                              Other => 'T',
+                              Other_Bounce => 'T',
+                            );
+  } else {
+    $app->set_mailbox_status(
+                              Other => 'F',
+                              Other_Bounce => 'F',
+                            );
+  }
+  die $app->message."\n" unless $app->ok;
+
   $app->change_mailbox(
                         Domain    => $mydomain,
                         Mailbox   => $username,
                         Password  => $password,
                       );
-
   die $app->message."\n" unless $app->ok;
 
 }
-- 
cgit v1.2.1


From f430dd9ec58e429c2ddc7c3c83aeaf8d8c74c4fd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Feb 2002 09:01:08 +0000
Subject: correctly disable/enable accounts @ CP

---
 FS/FS/svc_acct.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 314a7527b..b90cbe8d3 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -843,12 +843,16 @@ sub cp_change {
   if ( $password =~ /^\*SUSPENDED\* (.*)$/ ) {
     $password = $1;
     $app->set_mailbox_status(
-                              Other => 'T',
+                              Domain       => $mydomain,
+                              Mailbox      => $username,
+                              Other        => 'T',
                               Other_Bounce => 'T',
                             );
   } else {
     $app->set_mailbox_status(
-                              Other => 'F',
+                              Domain       => $mydomain,
+                              Mailbox      => $username,
+                              Other        => 'F',
                               Other_Bounce => 'F',
                             );
   }
-- 
cgit v1.2.1


From 51784f457196136430470212af7a40278c0f9c94 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Feb 2002 12:13:17 +0000
Subject: close </FORM> tags

---
 httemplate/index.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index 921ddbea8..386f6ec7c 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -28,10 +28,10 @@
     <TR><TD>
         <BR><FONT SIZE="+1"><A HREF="edit/cust_main.cgi">New Customer</A></FONT>
         <BR>
-        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><INPUT TYPE="hidden" NAME="last_type" VALUE="Fuzzy"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A>
-        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><INPUT TYPE="hidden" NAME="company_type" VALUE="Fuzzy"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A>
-        <BR><FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A>
-        <BR><FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A>
+        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><INPUT TYPE="hidden" NAME="last_type" VALUE="Fuzzy"><INPUT TYPE="submit" VALUE="Search"></FORM> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A>
+        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><INPUT TYPE="hidden" NAME="company_type" VALUE="Fuzzy"><INPUT TYPE="submit" VALUE="Search"></FORM> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A>
+        <BR><FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><INPUT TYPE="submit" VALUE="Search"></FORM> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A>
+        <BR><FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"></FORM> or <A HREF="search/svc_domain.cgi?domain">all domains</A>
 <!--        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>-->
 <!--        <LI><A HREF="search/svc_forward.html">mail forwards (by ?)</A>-->
       <BR><BR>
@@ -52,9 +52,9 @@
     <TR><TD>
       <BR><A HREF="search/cust_main-quickpay.html">Quick payment entry</A>
       <BR>
-      <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST">Credit card # <INPUT TYPE="hidden" NAME="card_on" VALUE="1"><INPUT TYPE="text" NAME="card"><INPUT TYPE="submit" VALUE="Search">
-      <BR><FORM ACTION="search/cust_bill.cgi" METHOD="POST">Invoice # <INPUT TYPE="text" NAME="invnum" SIZE="8"><INPUT TYPE="submit" VALUE="Search">
-      <BR><FORM ACTION="search/cust_pay.cgi" METHOD="POST">Check # <INPUT TYPE="text" NAME="payinfo" SIZE="8"><INPUT TYPE="hidden" NAME="payby" VALUE="BILL"><INPUT TYPE="submit" VALUE="Search">
+      <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST">Credit card # <INPUT TYPE="hidden" NAME="card_on" VALUE="1"><INPUT TYPE="text" NAME="card"><INPUT TYPE="submit" VALUE="Search"></FORM>
+      <BR><FORM ACTION="search/cust_bill.cgi" METHOD="POST">Invoice # <INPUT TYPE="text" NAME="invnum" SIZE="8"><INPUT TYPE="submit" VALUE="Search"></FORM>
+      <BR><FORM ACTION="search/cust_pay.cgi" METHOD="POST">Check # <INPUT TYPE="text" NAME="payinfo" SIZE="8"><INPUT TYPE="hidden" NAME="payby" VALUE="BILL"><INPUT TYPE="submit" VALUE="Search"></FORM>
       <BR>
       <BR><A HREF="browse/cust_pay_batch.cgi">View pending credit card batch</A>
       <BR><BR>Invoice reports
-- 
cgit v1.2.1


From eca2a638625ac22a64b9807d9c4c7ee9a5090ebb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Feb 2002 12:31:40 +0000
Subject: fixup <SELECT> configuration editing, fixes Bug#350

---
 httemplate/config/config-process.cgi | 2 +-
 httemplate/config/config-view.cgi    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
index 50f0d34ff..a296abfe4 100644
--- a/httemplate/config/config-process.cgi
+++ b/httemplate/config/config-process.cgi
@@ -26,7 +26,7 @@
           #$conf->delete($i->key);
           push @delete, $i->key;
         }
-      } elsif ( $type eq 'text' )  {
+      } elsif ( $type eq 'text' || $type eq 'select' )  {
         if ( $cgi->param($i->key. $n) ne '' ) {
           $conf->set($i->key, $cgi->param($i->key. $n));
         } else {
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index b041adaed..225c29507 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -32,7 +32,7 @@
             </td></tr>
           <% } elsif ( $type eq 'checkbox' ) { %>
             <tr><td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td></tr>
-          <% } elsif ( $type eq 'text' )  { %>
+          <% } elsif ( $type eq 'text' || $type eq 'select' )  { %>
             <tr><td bgcolor="#ffffff"><%=  $conf->exists($i->key) ? $conf->config($i->key) : '' %></td></tr>
           <% } else { %>
             <tr><td>
-- 
cgit v1.2.1


From 55e8ec50af441be65887fae5ffb866941620fe54 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Feb 2002 22:13:00 +0000
Subject: billing vs. shipping states weren't sorted in the same order.  UI
 glitch only

---
 httemplate/edit/cust_main.cgi | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 41643a37f..2798d5dde 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -170,6 +170,7 @@ print <<END;
 <TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="state" SIZE="1">
 END
 
+#false laziness with ship_state
 my $countrydefault = $conf->config('countrydefault') || 'US';
 $cust_main->country( $countrydefault ) unless $cust_main->country;
 $cust_main->state( $conf->config('statedefault') || 'CA' )
@@ -265,11 +266,17 @@ END
   <TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="ship_city" VALUE="$ship_city" onChange="changed(this)"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="ship_state" SIZE="1" onChange="changed(this)">
 END
 
+  #false laziness with regular state
   $cust_main->ship_country( $conf->config('countrydefault') || 'US' )
     unless $cust_main->ship_country;
   $cust_main->ship_state( $conf->config('statedefault') || 'CA' )
     unless $cust_main->ship_state || $cust_main->ship_country ne 'US';
-  foreach ( qsearch('cust_main_county',{}) ) {
+  foreach ( sort {
+       ( $b->country eq $countrydefault ) <=> ( $a->country eq $countrydefault )
+    or $a->country                        cmp $b->country
+    or $a->state                          cmp $b->state
+    or $a->county                         cmp $b->county
+  } qsearch('cust_main_county',{}) ) {
     print "<OPTION";
     print " SELECTED" if ( $cust_main->ship_state eq $_->state
                            && $cust_main->ship_county eq $_->county 
-- 
cgit v1.2.1


From f96fd39dcc9c2563f8ba2976f7b9d23c0b3fcc29 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Feb 2002 23:08:11 +0000
Subject: fix i18n zip

---
 FS/FS/cust_pay_batch.pm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
index dfafb0a13..c4427c387 100644
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -173,13 +173,16 @@ sub check {
     $self->payname($1);
   }
 
-  $self->zip =~ /^\s*(\w[\w\-\s]{3,8}\w)\s*$/
-    or return "Illegal zip: ". $self->zip;
-  $self->zip($1);
+  #$self->zip =~ /^\s*(\w[\w\-\s]{3,8}\w)\s*$/
+  #  or return "Illegal zip: ". $self->zip;
+  #$self->zip($1);
 
   $self->country =~ /^(\w\w)$/ or return "Illegal country: ". $self->country;
   $self->country($1);
 
+  $error = $self->ut_zip('zip', $self->country);
+  return $error if $error;
+
   #check invnum, custnum, ?
 
   ''; #no error
@@ -189,7 +192,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_pay_batch.pm,v 1.5 2002-02-14 01:12:19 ivan Exp $
+$Id: cust_pay_batch.pm,v 1.6 2002-02-22 23:08:11 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From b50b2e5f94774268c271484f9c07bfe316f95527 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Fri, 22 Feb 2002 23:18:34 +0000
Subject: add some reporting features

---
 FS/MANIFEST                              |   4 +
 FS/bin/freeside-cc-receipts-report       | 231 ++++++++++++++++++++++++++
 FS/bin/freeside-credit-report            | 184 +++++++++++++++++++++
 FS/bin/freeside-receivables-report       | 218 +++++++++++++++++++++++++
 FS/bin/freeside-tax-report               | 270 +++++++++++++++++++++++++++++++
 conf/report_template                     |  14 ++
 httemplate/classic.html                  |   7 +
 httemplate/index.html                    |   7 +
 httemplate/search/report_cc.cgi          |  94 +++++++++++
 httemplate/search/report_cc.html         |  23 +++
 httemplate/search/report_credit.cgi      |  97 +++++++++++
 httemplate/search/report_credit.html     |  23 +++
 httemplate/search/report_receivables.cgi |  26 +++
 httemplate/search/report_tax.cgi         |  94 +++++++++++
 httemplate/search/report_tax.html        |  23 +++
 15 files changed, 1315 insertions(+)
 create mode 100755 FS/bin/freeside-cc-receipts-report
 create mode 100755 FS/bin/freeside-credit-report
 create mode 100755 FS/bin/freeside-receivables-report
 create mode 100755 FS/bin/freeside-tax-report
 create mode 100644 conf/report_template
 create mode 100755 httemplate/search/report_cc.cgi
 create mode 100755 httemplate/search/report_cc.html
 create mode 100755 httemplate/search/report_credit.cgi
 create mode 100755 httemplate/search/report_credit.html
 create mode 100755 httemplate/search/report_receivables.cgi
 create mode 100755 httemplate/search/report_tax.cgi
 create mode 100755 httemplate/search/report_tax.html

diff --git a/FS/MANIFEST b/FS/MANIFEST
index f7a5c1248..28edf59c3 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -11,6 +11,10 @@ bin/freeside-apply-credits
 bin/freeside-adduser
 bin/freeside-setinvoice
 bin/freeside-overdue
+bin/freeside-receivables-report
+bin/freeside-tax-report
+bin/freeside-cc-receipts-report
+bin/freeside-credit-report
 FS.pm
 FS/CGI.pm
 FS/Conf.pm
diff --git a/FS/bin/freeside-cc-receipts-report b/FS/bin/freeside-cc-receipts-report
new file mode 100755
index 000000000..2713af397
--- /dev/null
+++ b/FS/bin/freeside-cc-receipts-report
@@ -0,0 +1,231 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use Date::Parse;
+use Time::Local;
+use Getopt::Std;
+use FS::Conf;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::cust_pay;
+use FS::cust_pay_batch;
+
+# Set the mail program
+my $mail_program = "/usr/sbin/sendmail -t -n"; 
+
+&untaint_argv;	#what it sounds like  (eww)
+use vars qw($opt_v $opt_p $opt_e $opt_d $opt_s);
+getopts("vped:s:");	#switches
+
+#we're at now now (and later).
+my($_enddate)= $main::opt_d ? str2time($main::opt_d) : $^T;
+my($_startdate)= $main::opt_d ? str2time($main::opt_s) : $^T;
+
+# Get the current month
+my ($ssec,$smin,$shour,$smday,$smon,$syear) =
+	(localtime($_startdate) )[0,1,2,3,4,5]; 
+$syear+=1900;
+$smon++;
+
+# Get the current month
+my ($esec,$emin,$ehour,$emday,$emon,$eyear) =
+	(localtime($_enddate) )[0,1,2,3,4,5]; 
+$eyear+=1900;
+$emon++;
+
+# Login to the database
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+# Get the needed configuration files
+my $conf = new FS::Conf;
+my $lpr = $conf->config('lpr');
+my $email = $conf->config('email');
+
+my(@cust_pays)=qsearch('cust_pay',{});
+if (scalar(@cust_pays) == 0)
+{
+	exit 1;
+}
+
+# Open print and email pipes
+# $lpr and opt_p for printing
+# $email and opt_e for email
+
+if ($lpr && $main::opt_p)
+{
+        open(LPR, "|$lpr");
+        print LPR qq~ C R E D I T  C A R D  R E C E I P T S  for period beginning: $smon/$smday/$syear and ending $emon/$emday/$eyear\n\n~;
+}
+
+if ($email && $main::opt_e)
+{
+	open (MAIL, "|$mail_program");
+	print MAIL <<END
+To: $email
+From: Account Processor
+Subject: Receivables
+
+
+C R E D I T  C A R D  R E C E I P T S  for period beginning: $smon/$smday/$syear and ending $emon/$emday/$eyear
+
+END
+}
+
+my $uninvoiced = 0;
+my $total = 0;
+my $taxed = 0;
+my $untaxed = 0;
+my $total_tax = 0;
+
+# Now I can start looping
+foreach my $cust_pay (@cust_pays)
+{
+	my $_date = $cust_pay->getfield('_date');
+	my $invnum = $cust_pay->getfield('invnum');
+	my $paid = $cust_pay->getfield('paid');
+	my $payby = $cust_pay->getfield('payby');
+	
+
+	if ($_date >= $_startdate && $_date <= $_enddate && $payby =~ 'CARD') {
+		$total += $paid;
+
+		$uninvoiced += $cust_pay->unapplied; 
+		my @cust_bill_pays = $cust_pay->cust_bill_pay;
+                foreach my $cust_bill_pay (@cust_bill_pays) {
+			my $invoice_amt =0;
+			my $invoice_tax =0;
+			my(@cust_bill_pkgs)= $cust_bill_pay->cust_bill->cust_bill_pkg;
+			foreach my $cust_bill_pkg (@cust_bill_pkgs) {
+
+				my $recur = $cust_bill_pkg->getfield('recur');
+				my $setup = $cust_bill_pkg->getfield('setup');
+				my $pkgnum = $cust_bill_pkg->getfield('pkgnum');
+			
+				if ($pkgnum == 0) {
+					$invoice_tax += $recur;
+					$invoice_tax += $setup;
+				} else {
+					$invoice_amt += $recur;
+					$invoice_amt += $setup;
+				}
+
+			}
+
+			if ($invoice_tax > 0) {
+				if ($invoice_amt != $paid) {
+					# attempt to prorate partially paid invoices
+					$total_tax += $paid / ($invoice_amt + $invoice_tax) * $invoice_tax;
+					$taxed += $paid / ($invoice_amt + $invoice_tax) * $invoice_amt;
+				} else {
+					$total_tax += $invoice_tax;
+					$taxed += $invoice_amt;
+				}
+			} else {
+				$untaxed += $paid;
+			}
+
+		}
+
+	}
+
+}
+
+if ($main::opt_v) {
+	printf(qq{\n%25s%14.2f\n}, "Uninvoiced", $uninvoiced);
+	printf(qq{%25s%14.2f\n}, "Untaxed", $untaxed);
+	printf(qq{%25s%14.2f\n}, "Taxed", $taxed);
+	printf(qq{%25s%14.2f\n}, "Tax", $total_tax);
+	printf(qq{\n%39s\n%39.2f\n}, "=========", $total);
+}
+
+# Now I need to close LPR and EMAIL if they were open
+if($lpr && $main::opt_p)
+{
+	printf(LPR qq{\n%25s%14.2f\n}, "Uninvoiced", $uninvoiced);
+	printf(LPR qq{%25s%14.2f\n}, "Untaxed", $untaxed);
+	printf(LPR qq{%25s%14.2f\n}, "Taxed", $taxed);
+	printf(LPR qq{%25s%14.2f\n}, "Tax", $total_tax);
+	printf(LPR qq{\n%39s\n%39.2f\n}, "=========", $total);
+	close LPR || die "Could not close printer: $lpr\n";
+}
+if($email && $main::opt_e)
+{
+	printf(MAIL qq{\n%25s%14.2f\n}, "Untaxed", $untaxed);
+	printf(MAIL qq{%25s%14.2f\n}, "Taxed", $taxed);
+	printf(MAIL qq{%25s%14.2f\n}, "Tax", $total_tax);
+	printf(MAIL qq{\n%39s\n%39.2f\n}, "=========", $total);
+	close MAIL || die "Could not close printer: $email\n";
+}
+
+
+# subroutines
+sub untaint_argv {
+  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
+    $ARGV[$_] =~ /^([\w\-\/ :]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
+    $ARGV[$_]=$1;
+  }
+}
+
+sub usage {
+  die "Usage:\n\n  freeside-tax-report [-v] [-p] [-e] user\n";
+}
+
+=head1 NAME
+
+freeside-tax-report - Prints or emails sales taxes invoiced in a given period.
+
+=head1 SYNOPSIS
+
+  freeside-tax-report [-v] [-p] [-e] user
+
+=head1 DESCRIPTION
+
+Prints or emails sales taxes invoiced in a given period.
+
+-v: Verbose - Prints records to STDOUT.
+
+-p: Print to printer lpr as found in the conf directory.
+
+-e: Email output to user found in the Conf email file.
+
+user: From the mapsecrets file - see config.html from the base documentation
+
+=head1 VERSION
+
+$Id: freeside-cc-receipts-report,v 1.1 2002-02-22 23:18:32 jeff Exp $
+
+=head1 BUGS
+
+Yes..... Use at your own risk. No guarantees or warrantees of any
+kind apply to this program. Parts of this program are hacked from
+other GNU licensed software created mainly by Ivan Kohler.
+
+This is released under the GNU Public License. See www.gnu.org
+for more information regarding this license.
+
+=head1 SEE ALSO
+
+L<FS::cust_main>, config.html from the base documentation
+
+=head1 HISTORY
+
+griff@aver-computer.com July 99
+
+$Log: freeside-cc-receipts-report,v $
+Revision 1.1  2002-02-22 23:18:32  jeff
+add some reporting features
+
+Revision 1.2  2002/02/19 14:24:53  jeff
+might be functional now
+
+Revision 1.1  2000/09/20 19:25:19  jeff
+local modifications
+
+Revision 1.1  2000/05/13 21:57:56  ivan
+add print_batch script from Joel Griffiths
+
+
+=cut
+
+
diff --git a/FS/bin/freeside-credit-report b/FS/bin/freeside-credit-report
new file mode 100755
index 000000000..4307a21b0
--- /dev/null
+++ b/FS/bin/freeside-credit-report
@@ -0,0 +1,184 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use Date::Parse;
+use Time::Local;
+use Getopt::Std;
+use FS::Conf;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch);
+use FS::cust_credit;
+
+# Set the mail program
+my $mail_program = "/usr/sbin/sendmail -t -n"; 
+
+&untaint_argv;	#what it sounds like  (eww)
+use vars qw($opt_v $opt_p $opt_e $opt_d $opt_s);
+getopts("vped:s:");	#switches
+
+#we're at now now (and later).
+my($_enddate)= $main::opt_d ? str2time($main::opt_d) : $^T;
+my($_startdate)= $main::opt_s ? str2time($main::opt_s) : $^T;
+
+# Get the current month
+my ($ssec,$smin,$shour,$smday,$smon,$syear) =
+	(localtime($_startdate) )[0,1,2,3,4,5]; 
+$syear+=1900;
+$smon++;
+
+# Get the current month
+my ($esec,$emin,$ehour,$emday,$emon,$eyear) =
+	(localtime($_enddate) )[0,1,2,3,4,5]; 
+$eyear+=1900;
+$emon++;
+
+# Login to the database
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+# Get the needed configuration files
+my $conf = new FS::Conf;
+my $lpr = $conf->config('lpr');
+my $email = $conf->config('email');
+
+my(@cust_credits)=qsearch('cust_credit',{});
+if (scalar(@cust_credits) == 0)
+{
+	exit 1;
+}
+
+# Open print and email pipes
+# $lpr and opt_p for printing
+# $email and opt_e for email
+
+if ($lpr && $main::opt_p)
+{
+        open(LPR, "|$lpr");
+        print LPR qq~ I N  H O U S E  C R E D I T S for period beginning: $smon/$smday/$syear and ending $emon/$emday/$eyear\n\n~;
+}
+
+if ($email && $main::opt_e)
+{
+	open (MAIL, "|$mail_program");
+	print MAIL <<END
+To: $email
+From: Account Processor
+Subject: In House Credits
+
+
+I N  H O U S E  C R E D I T S  for period beginning: $smon/$smday/$syear and ending $emon/$emday/$eyear
+
+END
+}
+
+my $total = 0;
+
+# Now I can start looping
+foreach my $cust_credit (@cust_credits)
+{
+	my $_date = $cust_credit->getfield('_date');
+	my $amount = $cust_credit->getfield('amount');
+	my $credited = $cust_credit->getfield('credited');
+	
+
+	if ($_date >= $_startdate && $_date <= $_enddate) {
+		$total += $amount;
+
+		my ($sec,$min,$hour,$mday,$mon,$year) =
+			(localtime($_date) )[0,1,2,3,4,5]; 
+		$mon++;
+
+	}
+
+}
+
+if ($main::opt_v) {
+	printf(qq{\n\n%25s%14.2f\n}, "Credits Offered", $total);
+	printf(qq{\n%39s\n%39.2f\n}, "=========", $total);
+}
+
+# Now I need to close LPR and EMAIL if they were open
+if($lpr && $main::opt_p)
+{
+	printf(LPR qq{\n\n%25s%14.2f\n}, "Credits Offered", $total);
+	printf(LPR qq{\n%39s\n%39.2f\n}, "=========", $total);
+	close LPR || die "Could not close printer: $lpr\n";
+}
+if($email && $main::opt_e)
+{
+	printf(MAIL qq{\n\n%25s%14.2f\n}, "Credits Offered", $total);
+	printf(MAIL qq{\n%39s\n%39.2f\n}, "=========", $total);
+	close MAIL || die "Could not close printer: $email\n";
+}
+
+
+# subroutines
+sub untaint_argv {
+  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
+    $ARGV[$_] =~ /^([\w\-\/ :]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
+    $ARGV[$_]=$1;
+  }
+}
+
+sub usage {
+  die "Usage:\n\n  freeside-credit-report [-v] [-p] [-e] user\n";
+}
+
+=head1 NAME
+
+freeside-credit-report - Prints or emails in house credits offered in a given period.
+
+=head1 SYNOPSIS
+
+  freeside-credit-report [-v] [-p] [-e] user
+
+=head1 DESCRIPTION
+
+Prints or emails in house credits offered in a given period.
+
+-v: Verbose - Prints records to STDOUT.
+
+-p: Print to printer lpr as found in the conf directory.
+
+-e: Email output to user found in the Conf email file.
+
+user: From the mapsecrets file - see config.html from the base documentation
+
+=head1 VERSION
+
+$Id: freeside-credit-report,v 1.1 2002-02-22 23:18:32 jeff Exp $
+
+=head1 BUGS
+
+Yes..... Use at your own risk. No guarantees or warrantees of any
+kind apply to this program. Parts of this program are hacked from
+other GNU licensed software created mainly by Ivan Kohler.
+
+This is released under the GNU Public License. See www.gnu.org
+for more information regarding this license.
+
+=head1 SEE ALSO
+
+L<FS::cust_main>, config.html from the base documentation
+
+=head1 HISTORY
+
+griff@aver-computer.com July 99
+
+$Log: freeside-credit-report,v $
+Revision 1.1  2002-02-22 23:18:32  jeff
+add some reporting features
+
+Revision 1.1  2002/02/19 14:24:53  jeff
+might be functional now
+
+Revision 1.1  2000/09/20 19:25:19  jeff
+local modifications
+
+Revision 1.1  2000/05/13 21:57:56  ivan
+add print_batch script from Joel Griffiths
+
+
+=cut
+
+
diff --git a/FS/bin/freeside-receivables-report b/FS/bin/freeside-receivables-report
new file mode 100755
index 000000000..cef652bfe
--- /dev/null
+++ b/FS/bin/freeside-receivables-report
@@ -0,0 +1,218 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use Date::Parse;
+use Time::Local;
+use Getopt::Std;
+use Text::Template;
+use FS::Conf;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch);
+use FS::cust_main;
+
+# Set the mail program
+my $mail_program = "/usr/sbin/sendmail -t -n"; 
+
+&untaint_argv;	#what it sounds like  (eww)
+use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $report_lines $report_template @buf);
+getopts("vpmet:");	#switches
+
+#we're at now now (and later).
+my($_date)= $^T;
+
+# Get the current month
+my ($sec,$min,$hour,$mday,$mon,$year) =
+	(localtime($_date) )[0,1,2,3,4,5]; 
+$mon++;
+$year += 1900;
+
+# Login to the database
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+# Get the needed configuration files
+my $conf = new FS::Conf;
+my $lpr = $conf->config('lpr');
+my $email = $conf->config('email');
+my @report_template = $conf->config('report_template')
+  or die "cannot load config file report_template";
+$report_lines = 0;
+  foreach ( grep /report_lines\(\d+\)/, @report_template ) { #kludgy :/
+  /report_lines\((\d+)\)/;
+  $report_lines += $1;
+}
+die "no report_lines() functions in template?" unless $report_lines;
+$report_template = new Text::Template (
+  TYPE   => 'ARRAY',
+  SOURCE => [ map "$_\n", @report_template ],
+) or die "can't create new Text::Template object: $Text::Template::ERROR";
+
+
+my(@customers)=qsearch('cust_main',{});
+if (scalar(@customers) == 0)
+{
+	exit 1;
+}
+
+# Open print and email pipes
+# $lpr and opt_p for printing
+# $email and opt_m for email
+
+if ($lpr && $opt_p)
+{
+        open(LPR, "|$lpr");
+}
+
+if ($email && $opt_m)
+{
+	open (MAIL, "|$mail_program");
+	print MAIL <<END
+To: $email
+From: Account Processor
+Subject: Receivables
+
+
+END
+}
+
+my $total = 0;
+
+
+# Now I can start looping
+foreach my $customer (@customers)
+{
+  my $custnum = $customer->getfield('custnum');
+  my $first = $customer->getfield('first');
+  my $last = $customer->getfield('last');
+  my $company = $customer->getfield('company');
+  my $daytime = $customer->getfield('daytime');
+  my $balance = $customer->balance;
+
+
+  if ($balance != 0) {
+    $total += $balance;
+    push @buf, sprintf(qq{%5d %-32.32s %12s %9.2f},
+      $custnum,
+      $first . " " . $last . "   " . $company,
+      $daytime,
+      $balance);
+
+  }
+
+}
+
+push @buf, ('', sprintf(qq{%61s}, "========="), sprintf(qq{%61.2f}, $total));
+
+sub FS::receivables_report::_template::report_lines {
+  my $lines = shift;
+  map {
+    scalar(@buf) ? shift @buf : '' ;
+  }
+  ( 1 .. $lines );
+}
+
+$FS::receivables_report::_template::title = " R E C E I V A B L E S ";
+$FS::receivables_report::_template::title = $opt_t if $opt_t;
+$FS::receivables_report::_template::page = 1;
+$FS::receivables_report::_template::date = $_date;
+$FS::receivables_report::_template::date = $_date;
+$FS::receivables_report::_template::total_pages = 
+  int( scalar(@buf) / $report_lines);
+$FS::receivables_report::_template::total_pages++ if scalar(@buf) % $report_lines;
+
+my @report;
+while (@buf) {
+  push @report, split("\n", 
+    $report_template->fill_in( PACKAGE => 'FS::receivables_report::_template' )
+  );
+  $FS::receivables_report::_template::page++;
+}
+
+if ($opt_v) {
+  print map "$_\n", @report;
+}
+if($lpr && $opt_p)
+{
+  print LPR map "$_\n", @report;
+  print LPR "\f" if $opt_e;
+  close LPR || die "Could not close printer: $lpr\n";
+}
+if($email && $opt_m)
+{
+  print MAIL map "$_\n", @report;
+  close MAIL || die "Could not close printer: $email\n";
+}
+
+
+# subroutines
+
+sub untaint_argv {
+  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
+    $ARGV[$_] =~ /^([\w\-\/ ]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
+    $ARGV[$_]=$1;
+  }
+}
+
+sub usage {
+  die "Usage:\n\n  freeside-receivables-report [-v] [-p] [-e] user\n";
+}
+
+=head1 NAME
+
+freeside-receivables-report - Prints or emails outstanding receivables.
+
+=head1 SYNOPSIS
+
+  freeside-receivables-report [-v] [-p] [-m] [-e] [-t "title"] user
+
+=head1 DESCRIPTION
+
+Prints or emails outstanding receivables
+
+-v: Verbose - Prints records to STDOUT.
+
+-p: Print to printer lpr as found in the conf directory.
+
+-m: Mail output to user found in the Conf email file.
+
+-e: Print a final form feed to the printer.
+
+-t: supply a title for the top of each page.
+
+user: From the mapsecrets file - see config.html from the base documentation
+
+=head1 VERSION
+
+$Id: freeside-receivables-report,v 1.1 2002-02-22 23:18:32 jeff Exp $
+
+=head1 BUGS
+
+Yes..... Use at your own risk. No guarantees or warrantees of any
+kind apply to this program. Parts of this program are hacked from
+other GNU licensed software created mainly by Ivan Kohler.
+
+This is released under the GNU Public License. See www.gnu.org
+for more information regarding this license.
+
+=head1 SEE ALSO
+
+L<FS::cust_main>, config.html from the base documentation
+
+=head1 HISTORY
+
+griff@aver-computer.com July 99
+
+$Log: freeside-receivables-report,v $
+Revision 1.1  2002-02-22 23:18:32  jeff
+add some reporting features
+
+Revision 1.1  2000/09/20 19:25:19  jeff
+local modifications
+
+Revision 1.1  2000/05/13 21:57:56  ivan
+add print_batch script from Joel Griffiths
+
+
+=cut
+
+
diff --git a/FS/bin/freeside-tax-report b/FS/bin/freeside-tax-report
new file mode 100755
index 000000000..334c4107b
--- /dev/null
+++ b/FS/bin/freeside-tax-report
@@ -0,0 +1,270 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use Date::Parse;
+use Time::Local;
+use Getopt::Std;
+use FS::Conf;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch);
+use FS::cust_pay;
+use FS::cust_pay_batch;
+
+# Set the mail program
+my $mail_program = "/usr/sbin/sendmail -t -n"; 
+
+&untaint_argv;	#what it sounds like  (eww)
+use vars qw($opt_v $opt_p $opt_e $opt_d $opt_s);
+getopts("vped:s:");	#switches
+
+#we're at now now (and later).
+my($_enddate)= $main::opt_d ? str2time($main::opt_d) : $^T;
+my($_startdate)= $main::opt_s ? str2time($main::opt_s) : $^T;
+
+# Get the current month
+my ($ssec,$smin,$shour,$smday,$smon,$syear) =
+	(localtime($_startdate) )[0,1,2,3,4,5]; 
+$smon++;
+$syear -= 100 if $syear >= 100;
+$syear = "0" . $syear if $syear < 10;
+
+# Get the current month
+my ($esec,$emin,$ehour,$emday,$emon,$eyear) =
+	(localtime($_enddate) )[0,1,2,3,4,5]; 
+$emon++;
+$eyear -= 100 if $eyear >= 100;
+$eyear = "0" . $eyear if $eyear < 10;
+
+# Login to the database
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+# Get the needed configuration files
+my $conf = new FS::Conf;
+my $lpr = $conf->config('lpr');
+my $email = $conf->config('email');
+
+my(@cust_bills)=qsearch('cust_bill',{});
+if (scalar(@cust_bills) == 0)
+{
+	exit 1;
+}
+
+if ($main::opt_v)
+{
+        print qq~ S A L E S  T A X E S  I N V O I C E D  for period beginning: $smon/$smday/$syear and ending $emon/$emday/$eyear\n\n~;
+}
+
+# Open print and email pipes
+# $lpr and opt_p for printing
+# $email and opt_e for email
+
+if ($lpr && $main::opt_p)
+{
+        open(LPR, "|$lpr");
+        print LPR qq~ S A L E S  T A X E S  I N V O I C E D  for period beginning: $smon/$smday/$syear and ending $emon/$emday/$eyear\n\n~;
+}
+
+if ($email && $main::opt_e)
+{
+	open (MAIL, "|$mail_program");
+	print MAIL <<END
+To: $email
+From: Account Processor
+Subject: Sales Taxes Invoiced
+
+
+S A L E S  T A X E S  I N V O I C E D  for period beginning: $smon/$smday/$syear and ending $emon/$emday/$eyear
+
+END
+}
+
+my $compped = 0;
+my $compped_tax = 0;
+my $other = 0;
+my $other_tax = 0;
+my $total = 0;
+my $taxed = 0;
+my $untaxed = 0;
+my $total_tax = 0;
+
+# Now I can start looping
+foreach my $cust_bill (@cust_bills)
+{
+	my $_date = $cust_bill->getfield('_date');
+	my $invnum = $cust_bill->getfield('invnum');
+	my $charged = $cust_bill->getfield('charged');
+	
+
+	if ($_date >= $_startdate && $_date <= $_enddate) {
+		$total += $charged;
+
+		# The following lines were used to produce rather verbose reports
+		#my ($sec,$min,$hour,$mday,$mon,$year) =
+		#	(localtime($_date) )[0,1,2,3,4,5]; 
+		#$mon++;
+		#$year -= 100 if $year >= 100;
+		#$year = "0" . $year if $year < 10;
+
+		my $invoice_amt =0;
+		my $invoice_tax =0;
+		my $invoice_compped =0;
+		my(@cust_bill_pkgs)= $cust_bill->cust_bill_pkg;
+		foreach my $cust_bill_pkg (@cust_bill_pkgs) {
+
+			my $recur = $cust_bill_pkg->getfield('recur');
+			my $setup = $cust_bill_pkg->getfield('setup');
+			my $pkgnum = $cust_bill_pkg->getfield('pkgnum');
+			
+			if ($pkgnum == 0) {
+				# The following line was used to produce rather verbose reports
+				# printf(MAIL qq{\n%10s%15s%14.2f}, "$mon/$mday/$year", "Tax $invnum", $recur+$setup);
+				$invoice_tax += $recur;
+				$invoice_tax += $setup;
+			} else {
+				# The following line was used to produce rather verbose reports
+				# printf(MAIL qq{\n%10s%15s%14.2f}, "$mon/$mday/$year", "Inv $invnum", $recur+$setup);
+				$invoice_amt += $recur;
+				$invoice_amt += $setup;
+			}
+
+		}
+
+		my(@cust_bill_pays)= $cust_bill->cust_bill_pay;
+		foreach my $cust_bill_pay (@cust_bill_pays) {
+			my $payby = $cust_bill_pay->cust_pay->payby;
+			my $paid = $cust_bill_pay->getfield('amount');
+			if ($payby =~ 'COMP') {
+				$invoice_compped += $paid;
+			}
+		}
+
+		if (abs($invoice_compped - ($invoice_amt + $invoice_tax)) < 0.0001){
+			$compped += $invoice_amt;
+			$compped_tax += $invoice_tax;
+		} elsif ($invoice_compped > 0) {
+			printf(qq{\nInvoice %10d has inexpliciable complimentary payments of %14.9f\n}, $invnum, $invoice_compped);
+			$other += $invoice_amt;
+			$other_tax += $invoice_tax;
+		} elsif ($invoice_tax > 0) {
+			$total_tax += $invoice_tax;
+			$taxed += $invoice_amt;
+		} else {
+			$untaxed += $invoice_amt;
+		}
+
+	}
+
+}
+
+if ($main::opt_v) {
+	printf(qq{\n\n%25s%14.2f\n}, "Complimentary", $compped);
+	printf(qq{%25s%14.2f\n}, "Complimentary Tax", $compped_tax);
+	printf(qq{%25s%14.2f\n}, "Other", $other);
+	printf(qq{%25s%14.2f\n}, "Other Tax", $other_tax);
+	printf(qq{%25s%14.2f\n}, "Untaxed", $untaxed);
+	printf(qq{%25s%14.2f\n}, "Taxed", $taxed);
+	printf(qq{%25s%14.2f\n}, "Tax", $total_tax);
+	printf(qq{\n%39s\n%39.2f\n}, "=========", $total);
+}
+
+# Now I need to close LPR and EMAIL if they were open
+if($lpr && $main::opt_p)
+{
+	printf(LPR qq{\n\n%25s%14.2f\n}, "Complimentary", $compped);
+	printf(LPR qq{%25s%14.2f\n}, "Complimentary Tax", $compped_tax);
+	printf(LPR qq{%25s%14.2f\n}, "Other", $other);
+	printf(LPR qq{%25s%14.2f\n}, "Other Tax", $other_tax);
+	printf(LPR qq{%25s%14.2f\n}, "Untaxed", $untaxed);
+	printf(LPR qq{%25s%14.2f\n}, "Taxed", $taxed);
+	printf(LPR qq{%25s%14.2f\n}, "Tax", $total_tax);
+	printf(LPR qq{\n%39s\n%39.2f\n}, "=========", $total);
+	close LPR || die "Could not close printer: $lpr\n";
+}
+if($email && $main::opt_e)
+{
+	printf(MAIL qq{\n\n%25s%14.2f\n}, "Complimentary", $compped);
+	printf(MAIL qq{%25s%14.2f\n}, "Complimentary Tax", $compped_tax);
+	printf(MAIL qq{%25s%14.2f\n}, "Other", $other);
+	printf(MAIL qq{%25s%14.2f\n}, "Other Tax", $other_tax);
+	printf(MAIL qq{%25s%14.2f\n}, "Untaxed", $untaxed);
+	printf(MAIL qq{%25s%14.2f\n}, "Taxed", $taxed);
+	printf(MAIL qq{%25s%14.2f\n}, "Tax", $total_tax);
+	printf(MAIL qq{\n%39s\n%39.2f\n}, "=========", $total);
+	close MAIL || die "Could not close printer: $email\n";
+}
+
+
+# subroutines
+sub untaint_argv {
+  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
+    $ARGV[$_] =~ /^([\w\-\/ :]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
+    $ARGV[$_]=$1;
+  }
+}
+
+sub usage {
+  die "Usage:\n\n  freeside-tax-report [-v] [-p] [-e] user\n";
+}
+
+=head1 NAME
+
+freeside-tax-report - Prints or emails sales taxes invoiced in a given period.
+
+=head1 SYNOPSIS
+
+  freeside-tax-report [-v] [-p] [-e] user
+
+=head1 DESCRIPTION
+
+Prints or emails sales taxes invoiced in a given period.
+
+-v: Verbose - Prints records to STDOUT.
+
+-p: Print to printer lpr as found in the conf directory.
+
+-e: Email output to user found in the Conf email file.
+
+user: From the mapsecrets file - see config.html from the base documentation
+
+=head1 VERSION
+
+$Id: freeside-tax-report,v 1.1 2002-02-22 23:18:32 jeff Exp $
+
+=head1 BUGS
+
+Yes..... Use at your own risk. No guarantees or warrantees of any
+kind apply to this program. Parts of this program are hacked from
+other GNU licensed software created mainly by Ivan Kohler.
+
+This is released under the GNU Public License. See www.gnu.org
+for more information regarding this license.
+
+=head1 SEE ALSO
+
+L<FS::cust_main>, config.html from the base documentation
+
+=head1 HISTORY
+
+griff@aver-computer.com July 99
+
+$Log: freeside-tax-report,v $
+Revision 1.1  2002-02-22 23:18:32  jeff
+add some reporting features
+
+Revision 1.3  2002/02/19 14:24:53  jeff
+might be functional now
+
+Revision 1.2  2001/08/20 18:31:49  jeff
+before-merge-to-freeside_1_4_0-pre1
+
+Revision 1.1  2000/09/20 19:25:19  jeff
+local modifications
+
+Revision 1.1  2000/05/13 21:57:56  ivan
+add print_batch script from Joel Griffiths
+
+
+=cut
+
+
diff --git a/conf/report_template b/conf/report_template
new file mode 100644
index 000000000..9c6bb2b4a
--- /dev/null
+++ b/conf/report_template
@@ -0,0 +1,14 @@
+{ sprintf("%-19s", "Page $page of $total_pages"); } { 
+ my $spacer = (40 - length($title) > 0) ? 40 - length($title) : 0;
+ $spacer = int($spacer / 2);
+ my $titlelen = 40 - $spacer;
+ sprintf("%*s%-*s", $spacer, " ", $titlelen, $title);
+ } { use Date::Format; time2str("%x %X", $date); } 
+
+
+{
+  join("\n", map { $_ } report_lines(57));
+}
+
+
+
diff --git a/httemplate/classic.html b/httemplate/classic.html
index 406852adf..e56d04d8d 100644
--- a/httemplate/classic.html
+++ b/httemplate/classic.html
@@ -43,6 +43,13 @@
               <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
               <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
             </UL>
+          <LI>financials
+            <UL>
+              <LI><A HREF="search/report_receivables.cgi">receivables report</A>
+              <LI><A HREF="search/report_tax.html">tax reports</A>
+              <LI><A HREF="search/report_cc.html">credit card receipts</A>
+              <LI><A HREF="search/report_credit.html">in house credits</A>
+            </UL>
           <LI>packages
             <UL>
               <LI><A HREF="search/cust_pkg.cgi?pkgnum">packages (by package number)</A>
diff --git a/httemplate/index.html b/httemplate/index.html
index 386f6ec7c..aea44ad73 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -66,6 +66,13 @@
               <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
               <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
             </UL>
+      <BR><BR>Financial reports
+            <UL>
+              <LI> <A HREF="search/report_receivables.cgi">current receivables</A>
+              <LI> <A HREF="search/report_tax.html">tax reports</A>
+              <LI> <A HREF="search/report_cc.html">credit card receipts</A>
+              <LI> <A HREF="search/report_credit.html">credit memos</A>
+            </UL>
       <BR><CENTER><HR WIDTH="94%" NOSHADE></CENTER><BR>
       <A NAME="admin">Administration</a>
         <ul>
diff --git a/httemplate/search/report_cc.cgi b/httemplate/search/report_cc.cgi
new file mode 100755
index 000000000..908ad35cd
--- /dev/null
+++ b/httemplate/search/report_cc.cgi
@@ -0,0 +1,94 @@
+<%
+#!/usr/bin/perl -Tw
+#
+# $Id: report_cc.cgi,v 1.1 2002-02-22 23:18:33 jeff Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/svc_domain.cgi
+#
+# ivan@voicenet.com 96-mar-5
+#
+# need to look at table in results to make it more readable
+#
+# ivan@voicenet.com
+#
+# rewrite ivan@sisd.com 98-mar-15
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: report_cc.cgi,v $
+# Revision 1.1  2002-02-22 23:18:33  jeff
+# add some reporting features
+#
+# Revision 1.1  2002/02/05 15:22:00  jeff
+# preserving state prior to 1.4.0pre7 upgrade
+#
+# Revision 1.2  2000/09/20 19:25:19  jeff
+# local modifications
+#
+# Revision 1.1.1.1  2000/09/18 06:26:58  jeff
+# Import of Freeside 1.2.3
+#
+# Revision 1.10  1999/07/20 06:03:36  ivan
+# s/CGI::Request/CGI/; (how'd i miss that before?)
+#
+# Revision 1.9  1999/04/09 04:22:34  ivan
+# also table()
+#
+# Revision 1.8  1999/04/09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.7  1999/02/28 00:03:56  ivan
+# removed misleading comments
+#
+# Revision 1.6  1999/02/09 09:22:58  ivan
+# visual and bugfixes
+#
+# Revision 1.5  1999/01/19 05:14:16  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:40  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 09:41:11  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+
+use strict;
+use vars qw( $conf $cgi $beginning $ending );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl idiot header table);
+use FS::Record qw(qsearch qsearchs);
+use FS::Conf;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+
+$cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
+$beginning = $1;
+
+$cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
+$ending = $1;
+
+  print $cgi->header( '-expires' => '-2m' ),
+        header('Credit Card Recipt Report Results');
+
+  open (REPORT, "/usr/bin/freeside-cc-receipts-report -v -s $beginning -d $ending freeside |");
+
+  print '<PRE>';
+  while(<REPORT>) {
+    print $_;
+  }
+  print '</PRE>';
+
+  print '</BODY></HTML>';
+
+%>
+
diff --git a/httemplate/search/report_cc.html b/httemplate/search/report_cc.html
new file mode 100755
index 000000000..a028a87df
--- /dev/null
+++ b/httemplate/search/report_cc.html
@@ -0,0 +1,23 @@
+<HTML>
+  <HEAD>
+    <TITLE>Credit Card Receipt Report Criteria</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+      <H1>Credit Card Receipt Report Criteria</H1>
+    </CENTER>
+    <HR>
+    <FORM ACTION="report_cc.cgi" METHOD="post">
+      Return <B>credit card receipt report</B> for period: 
+      from <INPUT TYPE="text" NAME="beginning"> 
+      to <INPUT TYPE="text" NAME="ending">
+
+      <P><INPUT TYPE="submit" VALUE="Get Report">
+
+    </FORM>
+
+  <HR>
+
+  </BODY>
+</HTML>
+
diff --git a/httemplate/search/report_credit.cgi b/httemplate/search/report_credit.cgi
new file mode 100755
index 000000000..8535e29cc
--- /dev/null
+++ b/httemplate/search/report_credit.cgi
@@ -0,0 +1,97 @@
+<%
+#!/usr/bin/perl -Tw
+#
+# $Id: report_credit.cgi,v 1.1 2002-02-22 23:18:33 jeff Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/svc_domain.cgi
+#
+# ivan@voicenet.com 96-mar-5
+#
+# need to look at table in results to make it more readable
+#
+# ivan@voicenet.com
+#
+# rewrite ivan@sisd.com 98-mar-15
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: report_credit.cgi,v $
+# Revision 1.1  2002-02-22 23:18:33  jeff
+# add some reporting features
+#
+# Revision 1.2  2002/02/19 14:24:53  jeff
+# might be functional now
+#
+# Revision 1.1  2002/02/05 15:22:00  jeff
+# preserving state prior to 1.4.0pre7 upgrade
+#
+# Revision 1.2  2000/09/20 19:25:19  jeff
+# local modifications
+#
+# Revision 1.1.1.1  2000/09/18 06:26:58  jeff
+# Import of Freeside 1.2.3
+#
+# Revision 1.10  1999/07/20 06:03:36  ivan
+# s/CGI::Request/CGI/; (how'd i miss that before?)
+#
+# Revision 1.9  1999/04/09 04:22:34  ivan
+# also table()
+#
+# Revision 1.8  1999/04/09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.7  1999/02/28 00:03:56  ivan
+# removed misleading comments
+#
+# Revision 1.6  1999/02/09 09:22:58  ivan
+# visual and bugfixes
+#
+# Revision 1.5  1999/01/19 05:14:16  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:40  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 09:41:11  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+
+use strict;
+use vars qw( $conf $cgi $beginning $ending );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl idiot header table);
+use FS::Record qw(qsearch qsearchs);
+use FS::Conf;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+
+$cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
+$beginning = $1;
+
+$cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
+$ending = $1;
+
+  print $cgi->header( '-expires' => '-2m' ),
+        header('In House Credit Report Results');
+
+  open (REPORT, "/usr/bin/freeside-credit-report -v -s $beginning -d $ending freeside |");
+
+  print '<PRE>';
+  while(<REPORT>) {
+    print $_;
+  }
+  print '</PRE>';
+
+  print '</BODY></HTML>';
+
+%>
+
diff --git a/httemplate/search/report_credit.html b/httemplate/search/report_credit.html
new file mode 100755
index 000000000..bda08e31d
--- /dev/null
+++ b/httemplate/search/report_credit.html
@@ -0,0 +1,23 @@
+<HTML>
+  <HEAD>
+    <TITLE>In House Credit Report Criteria</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+      <H1>In House Credit Report Criteria</H1>
+    </CENTER>
+    <HR>
+    <FORM ACTION="report_credit.cgi" METHOD="post">
+      Return <B>in house credit report</B> for period: 
+      from <INPUT TYPE="text" NAME="beginning"> 
+      to <INPUT TYPE="text" NAME="ending">
+
+      <P><INPUT TYPE="submit" VALUE="Get Report">
+
+    </FORM>
+
+  <HR>
+
+  </BODY>
+</HTML>
+
diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
new file mode 100755
index 000000000..7113ad5a7
--- /dev/null
+++ b/httemplate/search/report_receivables.cgi
@@ -0,0 +1,26 @@
+<%
+
+use strict;
+use vars qw( $cgi );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+print $cgi->header( '-expires' => '-2m' ),
+      header('Current Receivables Report Results');
+
+open (REPORT, "/usr/bin/freeside-receivables-report -v freeside |");
+
+print '<PRE>';
+while(<REPORT>) {
+  print $_;
+}
+print '</PRE>';
+
+print '</BODY></HTML>';
+
+%>
+
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
new file mode 100755
index 000000000..8062479b5
--- /dev/null
+++ b/httemplate/search/report_tax.cgi
@@ -0,0 +1,94 @@
+<%
+#!/usr/bin/perl -Tw
+#
+# $Id: report_tax.cgi,v 1.1 2002-02-22 23:18:34 jeff Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/svc_domain.cgi
+#
+# ivan@voicenet.com 96-mar-5
+#
+# need to look at table in results to make it more readable
+#
+# ivan@voicenet.com
+#
+# rewrite ivan@sisd.com 98-mar-15
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: report_tax.cgi,v $
+# Revision 1.1  2002-02-22 23:18:34  jeff
+# add some reporting features
+#
+# Revision 1.1  2002/02/05 15:22:00  jeff
+# preserving state prior to 1.4.0pre7 upgrade
+#
+# Revision 1.2  2000/09/20 19:25:19  jeff
+# local modifications
+#
+# Revision 1.1.1.1  2000/09/18 06:26:58  jeff
+# Import of Freeside 1.2.3
+#
+# Revision 1.10  1999/07/20 06:03:36  ivan
+# s/CGI::Request/CGI/; (how'd i miss that before?)
+#
+# Revision 1.9  1999/04/09 04:22:34  ivan
+# also table()
+#
+# Revision 1.8  1999/04/09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.7  1999/02/28 00:03:56  ivan
+# removed misleading comments
+#
+# Revision 1.6  1999/02/09 09:22:58  ivan
+# visual and bugfixes
+#
+# Revision 1.5  1999/01/19 05:14:16  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:40  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 09:41:11  ivan
+# s/CGI::(Base|Request)/CGI.pm/;
+#
+
+use strict;
+use vars qw( $conf $cgi $beginning $ending );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl idiot header table);
+use FS::Record qw(qsearch qsearchs);
+use FS::Conf;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+
+$cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
+$beginning = $1;
+
+$cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
+$ending = $1;
+
+  print $cgi->header( '-expires' => '-2m' ),
+        header('Tax Report Results');
+
+  open (REPORT, "/usr/bin/freeside-tax-report -v -s $beginning -d $ending freeside |");
+
+  print '<PRE>';
+  while(<REPORT>) {
+    print $_;
+  }
+  print '</PRE>';
+
+  print '</BODY></HTML>';
+
+%>
+
diff --git a/httemplate/search/report_tax.html b/httemplate/search/report_tax.html
new file mode 100755
index 000000000..a7beb2471
--- /dev/null
+++ b/httemplate/search/report_tax.html
@@ -0,0 +1,23 @@
+<HTML>
+  <HEAD>
+    <TITLE>Tax Report Criteria</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+      <H1>Tax Report Criteria</H1>
+    </CENTER>
+    <HR>
+    <FORM ACTION="report_tax.cgi" METHOD="post">
+      Return <B>tax report</B> for period: 
+      from <INPUT TYPE="text" NAME="beginning"> 
+      to <INPUT TYPE="text" NAME="ending">
+
+      <P><INPUT TYPE="submit" VALUE="Get Report">
+
+    </FORM>
+
+  <HR>
+
+  </BODY>
+</HTML>
+
-- 
cgit v1.2.1


From c82f33db5954253c96790918b7274566ac9182af Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 23 Feb 2002 02:02:36 +0000
Subject: UI work on main menu, remove Archive::Tar from docs

---
 httemplate/docs/install.html  |  3 +--
 httemplate/docs/upgrade8.html |  2 +-
 httemplate/index.html         | 19 +++++++++++++------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index d8d02c1e7..b2d735d12 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -14,7 +14,7 @@ Before installing, you need:
     <ul>
       <li><a href="http://www.postgresql.org/">PostgreSQL</a> (v7 or higher) is recommended.
       <li><b>MySQL does not work at this time.</b>
-        <i>The following information is provided for developers who wish to contribute MySQL support:</i> See tickets <a href="http://pouncequick.420.am/rt/Ticket/Display.html?id=300">#300</a> and <a href="http://pouncequick.420.am/rt/Ticket/Display.html?id=334">#334</a> in the bug-tracking system.
+        <i>The following information is provided for developers who wish to contribute MySQL support:</i> See ticket <a href="http://pouncequick.420.am/rt/Ticket/Display.html?id=300">#300</a> in the bug-tracking system.
       <!-- <li>MySQL has been reported to work.  -->
         <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
     </ul>
@@ -40,7 +40,6 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=FreezeThaw">FreezeThaw</a>
       <li><a href="http://search.cpan.org/search?dist=String-Approx">String-Approx</a>
       <li><a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>
-      <li><a href="http://search.cpan.org/search?dist=Archive-Tar">Archive-Tar</a>
       <li><a href="http://search.cpan.org/search?dist=DBI">DBI</a>
       <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a> (<a href="http://search.cpan.org/search?dist=DBD-Pg">DBD::Pg</a> for PostgreSQL, <a href="http://search.cpan.org/search?dist=DBD-mysql">DBD::mysql</a> for MySQL)
       <li><a href="http://search.cpan.org/search?dist=DBIx-DataSource">DBIx-DataSource</a>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index ac006d221..e11041682 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -7,7 +7,7 @@
   <li>If migrating from less than 1.3.1, see these <a href="upgrade7.html">instructions</a> first.
   <li><font size="+2" color="#ff0000">Backup your database and current Freeside installation.</font> (with&nbsp;<a href="http://www.ca.postgresql.org/devel-corner/docs/postgres/backup.html">PostgreSQL</a>) (with&nbsp;<a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Backup">MySQL</a>)
   <li><a href="http://perl.apache.org/">mod_perl</a> is now required.
-  <li>Install <a href="http://search.cpan.org/search?dist=Archive-Tar">Archive-Tar</a>, <a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>, and <a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a>
+  <li>Install <a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>, and <a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a>
   <li>Install <a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a>.
   <li>Install <a href="http://rsync.samba.org/">rsync</a>
 </ul>
diff --git a/httemplate/index.html b/httemplate/index.html
index aea44ad73..3f9273fb5 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -28,10 +28,10 @@
     <TR><TD>
         <BR><FONT SIZE="+1"><A HREF="edit/cust_main.cgi">New Customer</A></FONT>
         <BR>
-        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><INPUT TYPE="hidden" NAME="last_type" VALUE="Fuzzy"><INPUT TYPE="submit" VALUE="Search"></FORM> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A>
-        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><INPUT TYPE="hidden" NAME="company_type" VALUE="Fuzzy"><INPUT TYPE="submit" VALUE="Search"></FORM> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A>
-        <BR><FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><INPUT TYPE="submit" VALUE="Search"></FORM> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A>
-        <BR><FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"></FORM> or <A HREF="search/svc_domain.cgi?domain">all domains</A>
+        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><INPUT TYPE="hidden" NAME="last_type" VALUE="Fuzzy"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A></FORM>
+        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><INPUT TYPE="hidden" NAME="company_type" VALUE="Fuzzy"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A></FORM>
+        <BR><FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A></FORM>
+        <BR><FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
 <!--        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>-->
 <!--        <LI><A HREF="search/svc_forward.html">mail forwards (by ?)</A>-->
       <BR><BR>
@@ -66,14 +66,14 @@
               <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
               <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
             </UL>
-      <BR><BR>Financial reports
+      Financial reports
             <UL>
               <LI> <A HREF="search/report_receivables.cgi">current receivables</A>
               <LI> <A HREF="search/report_tax.html">tax reports</A>
               <LI> <A HREF="search/report_cc.html">credit card receipts</A>
               <LI> <A HREF="search/report_credit.html">credit memos</A>
             </UL>
-      <BR><CENTER><HR WIDTH="94%" NOSHADE></CENTER><BR>
+      <CENTER><HR WIDTH="94%" NOSHADE></CENTER><BR>
       <A NAME="admin">Administration</a>
         <ul>
           <LI><A HREF="browse/part_pkg.cgi">View/Edit package definitions</A>
@@ -130,6 +130,13 @@
         <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
         <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
       </UL>
+    Financial reports
+            <UL>
+              <LI> <A HREF="search/report_receivables.cgi">current receivables</A>
+              <LI> <A HREF="search/report_tax.html">tax reports</A>
+              <LI> <A HREF="search/report_cc.html">credit card receipts</A>
+              <LI> <A HREF="search/report_credit.html">credit memos</A>
+            </UL>
     <BR>
     </TD></TR>
     </TABLE>
-- 
cgit v1.2.1


From cefb9727ed4cdfacf3b967485d58b25fbea98c6b Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sat, 23 Feb 2002 02:14:26 +0000
Subject: report fixes and cruft removal

---
 FS/FS/UID.pm                             |  5 +-
 bin/svc_acct.export                      |  3 +-
 httemplate/search/report_cc.cgi          | 87 +++++-------------------------
 httemplate/search/report_credit.cgi      | 90 +++++---------------------------
 httemplate/search/report_receivables.cgi | 12 +++--
 httemplate/search/report_tax.cgi         | 87 +++++-------------------------
 6 files changed, 54 insertions(+), 230 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 78fe156c3..78910195a 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -73,6 +73,9 @@ sub forksuidsetup {
   $user = shift;
   croak "fatal: adminsuidsetup called without arguements" unless $user;
 
+  $user =~ /^([\w\-\.]+)/ or croak "fatal: illegal user $user";
+  $user = $1;
+
   $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
   $ENV{'SHELL'} = '/bin/sh';
   $ENV{'IFS'} = " \t\n";
@@ -252,7 +255,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.12 2002-01-19 15:16:22 ivan Exp $
+$Id: UID.pm,v 1.13 2002-02-23 02:14:25 jeff Exp $
 
 =head1 BUGS
 
diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 11178c962..82a8935b6 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.33 2002-02-18 00:13:57 jeff Exp $
+# $Id: svc_acct.export,v 1.34 2002-02-23 02:14:26 jeff Exp $
 #
 # Create and export password, radius and vpopmail password files:
 # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
@@ -9,7 +9,6 @@
 
 use strict;
 use vars qw($conf);
-use Archive::Tar;
 use Fcntl qw(:flock);
 use File::Path;
 use IO::Handle;
diff --git a/httemplate/search/report_cc.cgi b/httemplate/search/report_cc.cgi
index 908ad35cd..991c00831 100755
--- a/httemplate/search/report_cc.cgi
+++ b/httemplate/search/report_cc.cgi
@@ -1,75 +1,16 @@
 <%
-#!/usr/bin/perl -Tw
-#
-# $Id: report_cc.cgi,v 1.1 2002-02-22 23:18:33 jeff Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_domain.cgi
-#
-# ivan@voicenet.com 96-mar-5
-#
-# need to look at table in results to make it more readable
-#
-# ivan@voicenet.com
-#
-# rewrite ivan@sisd.com 98-mar-15
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: report_cc.cgi,v $
-# Revision 1.1  2002-02-22 23:18:33  jeff
-# add some reporting features
-#
-# Revision 1.1  2002/02/05 15:22:00  jeff
-# preserving state prior to 1.4.0pre7 upgrade
-#
-# Revision 1.2  2000/09/20 19:25:19  jeff
-# local modifications
-#
-# Revision 1.1.1.1  2000/09/18 06:26:58  jeff
-# Import of Freeside 1.2.3
-#
-# Revision 1.10  1999/07/20 06:03:36  ivan
-# s/CGI::Request/CGI/; (how'd i miss that before?)
-#
-# Revision 1.9  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.8  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.7  1999/02/28 00:03:56  ivan
-# removed misleading comments
-#
-# Revision 1.6  1999/02/09 09:22:58  ivan
-# visual and bugfixes
-#
-# Revision 1.5  1999/01/19 05:14:16  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:40  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 09:41:11  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
 
 use strict;
-use vars qw( $conf $cgi $beginning $ending );
+use vars qw( $cgi $user $beginning $ending );
 use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl idiot header table);
-use FS::Record qw(qsearch qsearchs);
-use FS::Conf;
+use CGI::Carp qw( fatalsToBrowser );
+use FS::UID qw( cgisuidsetup getotaker );
+use FS::CGI qw( header );
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
-$conf = new FS::Conf;
+$user = getotaker;
 
 $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
 $beginning = $1;
@@ -77,18 +18,18 @@ $beginning = $1;
 $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
 $ending = $1;
 
-  print $cgi->header( '-expires' => '-2m' ),
-        header('Credit Card Recipt Report Results');
+print $cgi->header( '-expires' => '-2m' ),
+  header('Credit Card Recipt Report Results');
 
-  open (REPORT, "/usr/bin/freeside-cc-receipts-report -v -s $beginning -d $ending freeside |");
+open (REPORT, "/usr/bin/freeside-cc-receipts-report -v -s $beginning -d $ending $user |");
 
-  print '<PRE>';
-  while(<REPORT>) {
-    print $_;
-  }
-  print '</PRE>';
+print '<PRE>';
+while(<REPORT>) {
+  print $_;
+}
+print '</PRE>';
 
-  print '</BODY></HTML>';
+print '</BODY></HTML>';
 
 %>
 
diff --git a/httemplate/search/report_credit.cgi b/httemplate/search/report_credit.cgi
index 8535e29cc..f4430c13f 100755
--- a/httemplate/search/report_credit.cgi
+++ b/httemplate/search/report_credit.cgi
@@ -1,78 +1,16 @@
 <%
-#!/usr/bin/perl -Tw
-#
-# $Id: report_credit.cgi,v 1.1 2002-02-22 23:18:33 jeff Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_domain.cgi
-#
-# ivan@voicenet.com 96-mar-5
-#
-# need to look at table in results to make it more readable
-#
-# ivan@voicenet.com
-#
-# rewrite ivan@sisd.com 98-mar-15
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: report_credit.cgi,v $
-# Revision 1.1  2002-02-22 23:18:33  jeff
-# add some reporting features
-#
-# Revision 1.2  2002/02/19 14:24:53  jeff
-# might be functional now
-#
-# Revision 1.1  2002/02/05 15:22:00  jeff
-# preserving state prior to 1.4.0pre7 upgrade
-#
-# Revision 1.2  2000/09/20 19:25:19  jeff
-# local modifications
-#
-# Revision 1.1.1.1  2000/09/18 06:26:58  jeff
-# Import of Freeside 1.2.3
-#
-# Revision 1.10  1999/07/20 06:03:36  ivan
-# s/CGI::Request/CGI/; (how'd i miss that before?)
-#
-# Revision 1.9  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.8  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.7  1999/02/28 00:03:56  ivan
-# removed misleading comments
-#
-# Revision 1.6  1999/02/09 09:22:58  ivan
-# visual and bugfixes
-#
-# Revision 1.5  1999/01/19 05:14:16  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:40  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 09:41:11  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
 
 use strict;
-use vars qw( $conf $cgi $beginning $ending );
+use vars qw( $cgi $user $beginning $ending );
 use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl idiot header table);
-use FS::Record qw(qsearch qsearchs);
-use FS::Conf;
+use CGI::Carp qw( fatalsToBrowser );
+use FS::UID qw( cgisuidsetup getotaker );
+use FS::CGI qw( header );
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
-$conf = new FS::Conf;
+$user = getotaker;
 
 $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
 $beginning = $1;
@@ -80,18 +18,18 @@ $beginning = $1;
 $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
 $ending = $1;
 
-  print $cgi->header( '-expires' => '-2m' ),
-        header('In House Credit Report Results');
+print $cgi->header( '-expires' => '-2m' ),
+  header('In House Credit Report Results');
 
-  open (REPORT, "/usr/bin/freeside-credit-report -v -s $beginning -d $ending freeside |");
+open (REPORT, "/usr/bin/freeside-credit-report -v -s $beginning -d $ending $user |");
 
-  print '<PRE>';
-  while(<REPORT>) {
-    print $_;
-  }
-  print '</PRE>';
+print '<PRE>';
+while(<REPORT>) {
+  print $_;
+}
+print '</PRE>';
 
-  print '</BODY></HTML>';
+print '</BODY></HTML>';
 
 %>
 
diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index 7113ad5a7..6b96ba7a5 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -1,18 +1,20 @@
 <%
 
 use strict;
-use vars qw( $cgi );
+use vars qw( $cgi $user );
 use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
+use CGI::Carp qw( fatalsToBrowser );
+use FS::UID qw( cgisuidsetup getotaker );
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
+$user = getotaker;
+
 print $cgi->header( '-expires' => '-2m' ),
-      header('Current Receivables Report Results');
+  header('Current Receivables Report Results');
 
-open (REPORT, "/usr/bin/freeside-receivables-report -v freeside |");
+open (REPORT, "/usr/bin/freeside-receivables-report -v $user |");
 
 print '<PRE>';
 while(<REPORT>) {
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 8062479b5..bedfdac5f 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -1,75 +1,16 @@
 <%
-#!/usr/bin/perl -Tw
-#
-# $Id: report_tax.cgi,v 1.1 2002-02-22 23:18:34 jeff Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_domain.cgi
-#
-# ivan@voicenet.com 96-mar-5
-#
-# need to look at table in results to make it more readable
-#
-# ivan@voicenet.com
-#
-# rewrite ivan@sisd.com 98-mar-15
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: report_tax.cgi,v $
-# Revision 1.1  2002-02-22 23:18:34  jeff
-# add some reporting features
-#
-# Revision 1.1  2002/02/05 15:22:00  jeff
-# preserving state prior to 1.4.0pre7 upgrade
-#
-# Revision 1.2  2000/09/20 19:25:19  jeff
-# local modifications
-#
-# Revision 1.1.1.1  2000/09/18 06:26:58  jeff
-# Import of Freeside 1.2.3
-#
-# Revision 1.10  1999/07/20 06:03:36  ivan
-# s/CGI::Request/CGI/; (how'd i miss that before?)
-#
-# Revision 1.9  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.8  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.7  1999/02/28 00:03:56  ivan
-# removed misleading comments
-#
-# Revision 1.6  1999/02/09 09:22:58  ivan
-# visual and bugfixes
-#
-# Revision 1.5  1999/01/19 05:14:16  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:40  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 09:41:11  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
 
 use strict;
-use vars qw( $conf $cgi $beginning $ending );
+use vars qw( $cgi $user $beginning $ending );
 use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl idiot header table);
-use FS::Record qw(qsearch qsearchs);
-use FS::Conf;
+use CGI::Carp qw( fatalsToBrowser );
+use FS::UID qw( cgisuidsetup getotaker );
+use FS::CGI qw( header );
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
-$conf = new FS::Conf;
+$user = getotaker;
 
 $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
 $beginning = $1;
@@ -77,18 +18,18 @@ $beginning = $1;
 $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
 $ending = $1;
 
-  print $cgi->header( '-expires' => '-2m' ),
-        header('Tax Report Results');
+print $cgi->header( '-expires' => '-2m' ),
+  header('Tax Report Results');
 
-  open (REPORT, "/usr/bin/freeside-tax-report -v -s $beginning -d $ending freeside |");
+open (REPORT, "/usr/bin/freeside-tax-report -v -s $beginning -d $ending $user |");
 
-  print '<PRE>';
-  while(<REPORT>) {
-    print $_;
-  }
-  print '</PRE>';
+print '<PRE>';
+while(<REPORT>) {
+  print $_;
+}
+print '</PRE>';
 
-  print '</BODY></HTML>';
+print '</BODY></HTML>';
 
 %>
 
-- 
cgit v1.2.1


From e7156eeb279a7f1318fa4c7a4cce937ae75719e6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 23 Feb 2002 07:00:21 +0000
Subject: nit

---
 FS/FS/UID.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 78910195a..d34d28e06 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -73,7 +73,7 @@ sub forksuidsetup {
   $user = shift;
   croak "fatal: adminsuidsetup called without arguements" unless $user;
 
-  $user =~ /^([\w\-\.]+)/ or croak "fatal: illegal user $user";
+  $user =~ /^([\w\-\.]+)$/ or croak "fatal: illegal user $user";
   $user = $1;
 
   $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
@@ -230,7 +230,7 @@ sub getsecrets {
   die "No user!" unless $user;
   my($conf) = new FS::Conf $conf_dir;
   my($line) = grep /^\s*$user\s/, $conf->config('mapsecrets');
-  die "User not found in mapsecrets!" unless $line;
+  die "User $user not found in mapsecrets!" unless $line;
   $line =~ /^\s*$user\s+(.*)$/;
   $secrets = $1;
   die "Illegal mapsecrets line for user?!" unless $secrets;
@@ -255,7 +255,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.13 2002-02-23 02:14:25 jeff Exp $
+$Id: UID.pm,v 1.14 2002-02-23 07:00:21 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 6caffaefb96e25c68866825e2211816355a656aa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 23 Feb 2002 07:32:11 +0000
Subject: UI nit fixes - misaligned columns when viewing disabled
 services/packages

---
 httemplate/browse/part_pkg.cgi | 4 ++--
 httemplate/browse/part_svc.cgi | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 0af64e737..707972ed7 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -29,7 +29,7 @@ if ( $cgi->param('showdisabled') ) {
 my $colspan = $cgi->param('showdisabled') ? 2 : 3;
 print &table(), <<END;
       <TR>
-        <TH COLSPAN=2>Package</TH>
+        <TH COLSPAN=$colspan>Package</TH>
         <TH>Comment</TH>
         <TH><FONT SIZE=-1>Freq.</FONT></TH>
         <TH><FONT SIZE=-1>Plan</FONT></TH>
@@ -90,7 +90,7 @@ END
 }
 
 print <<END;
-   <TR><TD COLSPAN=8><I><A HREF="${p}edit/part_pkg.cgi">Add a new package definition</A></I></TD></TR>
+   <TR><TD COLSPAN=<%= $cgi->param('showdisabled') ? 8 : 9 %>><I><A HREF="${p}edit/part_pkg.cgi">Add a new package definition</A></I></TD></TR>
     </TABLE>
   </BODY>
 </HTML>
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 4590dc8b5..07f197982 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -73,7 +73,7 @@ my $total = scalar(@part_svc);
 <% } %>
 
   <TR>
-    <TD COLSPAN=6><A HREF="<%= $p %>edit/part_svc.cgi"><I>Add a new service definition</I></A></TD>
+    <TD COLSPAN=<%= $cgi->param('showdisabled') ? 6 : 7 %>><A HREF="<%= $p %>edit/part_svc.cgi"><I>Add a new service definition</I></A></TD>
   </TR>
 </TABLE>
 </BODY>
-- 
cgit v1.2.1


From 71b05bcca672ea01074000eecd1b6cb93ee6c8f7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 23 Feb 2002 07:35:00 +0000
Subject: i really should just start moving things to templates

---
 httemplate/browse/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 707972ed7..d5cfeeada 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -90,7 +90,7 @@ END
 }
 
 print <<END;
-   <TR><TD COLSPAN=<%= $cgi->param('showdisabled') ? 8 : 9 %>><I><A HREF="${p}edit/part_pkg.cgi">Add a new package definition</A></I></TD></TR>
+   <TR><TD COLSPAN=${ $cgi->param('showdisabled') ? 8 : 9 }><I><A HREF="${p}edit/part_pkg.cgi">Add a new package definition</A></I></TD></TR>
     </TABLE>
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From 4617a171f36be96750db388334b614e6e5643104 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 23 Feb 2002 07:48:34 +0000
Subject: it's too late.

---
 httemplate/browse/part_pkg.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index d5cfeeada..c20811491 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -89,8 +89,9 @@ END
   print "</TR>";
 }
 
+$colspan = $cgi->param('showdisabled') ? 8 : 9;
 print <<END;
-   <TR><TD COLSPAN=${ $cgi->param('showdisabled') ? 8 : 9 }><I><A HREF="${p}edit/part_pkg.cgi">Add a new package definition</A></I></TD></TR>
+   <TR><TD COLSPAN=$colspan><I><A HREF="${p}edit/part_pkg.cgi">Add a new package definition</A></I></TD></TR>
     </TABLE>
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From a41efaf444c779d415fa3e443254bd13b6edf925 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 23 Feb 2002 11:46:08 +0000
Subject: silly html tweaking

---
 httemplate/index.html | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index 3f9273fb5..7b2970dc5 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -28,13 +28,13 @@
     <TR><TD>
         <BR><FONT SIZE="+1"><A HREF="edit/cust_main.cgi">New Customer</A></FONT>
         <BR>
-        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><INPUT TYPE="hidden" NAME="last_type" VALUE="Fuzzy"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A></FORM>
-        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><INPUT TYPE="hidden" NAME="company_type" VALUE="Fuzzy"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A></FORM>
-        <BR><FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A></FORM>
-        <BR><FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
+        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><INPUT TYPE="hidden" NAME="last_type" VALUE="All"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A></FORM>
+        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><INPUT TYPE="hidden" NAME="company_type" VALUE="All"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A></FORM>
+        <FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A></FORM>
+        <FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
 <!--        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>-->
 <!--        <LI><A HREF="search/svc_forward.html">mail forwards (by ?)</A>-->
-      <BR><BR>
+      <BR>
     </TD></TR>
     </TABLE>
 
@@ -53,9 +53,8 @@
       <BR><A HREF="search/cust_main-quickpay.html">Quick payment entry</A>
       <BR>
       <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST">Credit card # <INPUT TYPE="hidden" NAME="card_on" VALUE="1"><INPUT TYPE="text" NAME="card"><INPUT TYPE="submit" VALUE="Search"></FORM>
-      <BR><FORM ACTION="search/cust_bill.cgi" METHOD="POST">Invoice # <INPUT TYPE="text" NAME="invnum" SIZE="8"><INPUT TYPE="submit" VALUE="Search"></FORM>
-      <BR><FORM ACTION="search/cust_pay.cgi" METHOD="POST">Check # <INPUT TYPE="text" NAME="payinfo" SIZE="8"><INPUT TYPE="hidden" NAME="payby" VALUE="BILL"><INPUT TYPE="submit" VALUE="Search"></FORM>
-      <BR>
+      <FORM ACTION="search/cust_bill.cgi" METHOD="POST">Invoice # <INPUT TYPE="text" NAME="invnum" SIZE="8"><INPUT TYPE="submit" VALUE="Search"></FORM>
+      <FORM ACTION="search/cust_pay.cgi" METHOD="POST">Check # <INPUT TYPE="text" NAME="payinfo" SIZE="8"><INPUT TYPE="hidden" NAME="payby" VALUE="BILL"><INPUT TYPE="submit" VALUE="Search"></FORM>
       <BR><A HREF="browse/cust_pay_batch.cgi">View pending credit card batch</A>
       <BR><BR>Invoice reports
             <UL>
-- 
cgit v1.2.1


From 903b22b3da3e3ee493bb322854c6bc0b0085e0dd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 23 Feb 2002 11:56:55 +0000
Subject: case-insensitive and substring searching

---
 CREDITS                          |  2 +-
 FS/FS/Record.pm                  | 12 ++++++--
 httemplate/docs/index.html       |  1 -
 httemplate/search/cust_main.cgi  | 63 ++++++++++++++++++++++++++++------------
 httemplate/search/cust_main.html | 10 +++++--
 5 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/CREDITS b/CREDITS
index 2fd407853..f3396284a 100644
--- a/CREDITS
+++ b/CREDITS
@@ -59,7 +59,7 @@ export, cancel-unaudited.cgi), patches to support billing date modification,
 and probably other things too (sorry if I forgot them).  And yet even more
 bug squashing, thanks!  *and* he single-handedly implemented all the necessary
 work to get rid of svc_acct_sm and the "default domain"  thanks!!  and rewrote
-the financials!  wow, thanks jeff!
+the financials!  wow, thanks jeff!  and contributed financial reports!
 
 Kenny Elliott <kenny@neoserve.com> contributed ICRADIUS radreply table support,
 allowing attributes with ICRADIUS, helped fix many bugs, and some
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 020d14d8f..f30223351 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -180,7 +180,7 @@ sub create {
   }
 }
 
-=item qsearch TABLE, HASHREF, SELECT, EXTRA_SQL
+=item qsearch TABLE, HASHREF, SELECT, EXTRA_SQL, CACHE_OBJ
 
 Searches the database for all records matching (at least) the key/value pairs
 in HASHREF.  Returns all the records found as `FS::TABLE' objects if that
@@ -214,6 +214,14 @@ sub qsearch {
   my $statement = "SELECT $select FROM $stable";
   if ( @fields ) {
     $statement .= ' WHERE '. join(' AND ', map {
+
+      my $op = '=';
+      if ( ref($record->{$_}) ) {
+        $op = $record->{$_}{'op'} if $record->{$_}{'op'};
+        $op = 'LIKE' if $op =~ /^ILIKE$/i && driver_name !~ /^Pg$/i;
+        $record->{$_} = $record->{$_}{'value'}
+      }
+
       if ( ! defined( $record->{$_} ) || $record->{$_} eq '' ) {
         if ( driver_name =~ /^Pg$/i ) {
           qq-( $_ IS NULL OR $_ = '' )-;
@@ -221,7 +229,7 @@ sub qsearch {
           qq-( $_ IS NULL OR $_ = "" )-;
         }
       } else {
-        "$_ = ?";
+        "$_ $op ?";
       }
     } @fields );
   }
diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html
index 9e61d4f08..00c863b0c 100644
--- a/httemplate/docs/index.html
+++ b/httemplate/docs/index.html
@@ -24,7 +24,6 @@
   <li><a href="signup.html">Signup server</a>
   <li><a href="session.html">Session monitor</a>
   <li><a href="billing.html">Billing</a>
-  <li><a href="trouble.html">Troubleshooting</a>
   <li><a href="schema.html">Schema reference</a>
   <li><a href="man/FS.html">Perl API</a>
 </ul>
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 1e28ad57d..f153f02d4 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -398,24 +398,37 @@ sub lastsearch {
     or eidiot "Illegal last name";
   my($last)=$1;
 
-#  if ( $last_type{'Exact'}
-#       && ! $last_type{'Fuzzy'} 
-#     #  && ! $last_type{'Sound-alike'}
-#  ) {
+  if ( $last_type{'Exact'} || $last_type{'Fuzzy'} ) {
+    push @cust_main, qsearch( 'cust_main',
+                              { 'last' => { 'op'    => 'ILIKE',
+                                            'value' => $last    } } );
+
+    push @cust_main, qsearch( 'cust_main',
+                              { 'ship_last' => { 'op'    => 'ILIKE',
+                                                 'value' => $last    } } )
+      if defined dbdef->table('cust_main')->column('ship_last');
+  }
+
+  if ( $last_type{'Substring'} || $last_type{'All'} ) {
 
-    push @cust_main, qsearch('cust_main',{'last'=>$last});
+    push @cust_main, qsearch( 'cust_main',
+                              { 'last' => { 'op'    => 'ILIKE',
+                                            'value' => "%$last%" } } );
 
-    push @cust_main, qsearch('cust_main',{'ship_last'=>$last})
+    push @cust_main, qsearch( 'cust_main',
+                              { 'ship_last' => { 'op'    => 'ILIKE',
+                                                 'value' => "%$last%" } } )
       if defined dbdef->table('cust_main')->column('ship_last');
 
-#  } else {
-  if ( $last_type{'Fuzzy'} ) {
+  }
+
+  if ( $last_type{'Fuzzy'} || $last_type{'All'} ) {
 
     &FS::cust_main::check_and_rebuild_fuzzyfiles;
     my $all_last = &FS::cust_main::all_last;
 
     my %last;
-    if ($last_type{'Fuzzy'}) { 
+    if ( $last_type{'Fuzzy'} || $last_type{'All'} ) { 
       foreach ( amatch($last, [ qw(i) ], @$all_last) ) {
         $last{$_}++; 
       }
@@ -431,6 +444,7 @@ sub lastsearch {
     }
 
   }
+
   \@cust_main;
 }
 
@@ -446,24 +460,37 @@ sub companysearch {
     or eidiot "Illegal company";
   my($company)=$1;
 
-#  if ( $company_type{'Exact'}
-#       && ! $company_type{'Fuzzy'} 
-#     #  && ! $company_type{'Sound-alike'}
-#  ) {
+  if ( $company_type{'Exact'} || $company_type{'Fuzzy'} ) {
+    push @cust_main, qsearch( 'cust_main',
+                              { 'company' => { 'op'    => 'ILIKE',
+                                               'value' => $company } } );
 
-    push @cust_main, qsearch('cust_main',{'company'=>$company});
+    push @cust_main, qsearch( 'cust_main',
+                              { 'ship_company' => { 'op'    => 'ILIKE',
+                                                    'value' => $company } } )
+      if defined dbdef->table('cust_main')->column('ship_last');
+  }
+
+  if ( $company_type{'Substring'} || $company_type{'All'} ) {
 
-    push @cust_main, qsearch('cust_main',{'ship_company'=>$company})
+    push @cust_main, qsearch( 'cust_main',
+                              { 'company' => { 'op'    => 'ILIKE',
+                                               'value' => "%$company%" } } );
+
+    push @cust_main, qsearch( 'cust_main',
+                              { 'ship_company' => { 'op'    => 'ILIKE',
+                                                    'value' => "%$company%" } })
       if defined dbdef->table('cust_main')->column('ship_last');
 
-#  } else {
-  if ( $company_type{'Fuzzy'} ) {
+  }
+
+  if ( $company_type{'Fuzzy'} || $company_type{'All'} ) {
 
     &FS::cust_main::check_and_rebuild_fuzzyfiles;
     my $all_company = &FS::cust_main::all_company;
 
     my %company;
-    if ($company_type{'Fuzzy'}) { 
+    if ( $company_type{'Fuzzy'} || $company_type{'All'} ) { 
       foreach ( amatch($company, [ qw(i) ], @$all_company ) ) {
         $company{$_}++;
       }
diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html
index 1e91adee9..5a066e453 100755
--- a/httemplate/search/cust_main.html
+++ b/httemplate/search/cust_main.html
@@ -11,14 +11,18 @@
       <INPUT TYPE="checkbox" NAME="last_on" CHECKED> Search for <B>last name</B>: 
       <INPUT TYPE="text" NAME="last_text">
       using search method: <SELECT NAME="last_type">
-        <OPTION SELECTED>Fuzzy
+        <OPTION SELECTED>All
+        <OPTION>Fuzzy
+        <OPTION>Substring
         <OPTION>Exact
       </SELECT>
 
       <P><INPUT TYPE="checkbox" NAME="company_on" CHECKED> Search for <B>company</B>: 
       <INPUT TYPE="text" NAME="company_text">
       using search methods: <SELECT NAME="company_type">
-        <OPTION SELECTED>Fuzzy
+        <OPTION SELECTED>All
+        <OPTION>Fuzzy
+        <OPTION>Substring
         <OPTION>Exact
       </SELECT>
 
@@ -28,7 +32,9 @@
 
   <HR>Explanation of search methods:
   <UL>
+    <LI><B>All</B> - Try all search methods.
     <LI><B>Fuzzy</B> - Searches for matches that are close to your text.
+    <LI><B>Substring</B> - Searches for matches that contain your text.
     <LI><B>Exact</B> - Finds exact matches only, but much faster than the other search methods.
   </UL>
   </BODY>
-- 
cgit v1.2.1


From 00f2fdb5c3c9edfe446cf453ee33b9ebc7802925 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 23 Feb 2002 22:36:55 +0000
Subject: take hardcoded paths out of report cgis

---
 httemplate/search/report_cc.cgi          | 2 +-
 httemplate/search/report_credit.cgi      | 2 +-
 httemplate/search/report_receivables.cgi | 2 +-
 httemplate/search/report_tax.cgi         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/httemplate/search/report_cc.cgi b/httemplate/search/report_cc.cgi
index 991c00831..f1c3c962c 100755
--- a/httemplate/search/report_cc.cgi
+++ b/httemplate/search/report_cc.cgi
@@ -21,7 +21,7 @@ $ending = $1;
 print $cgi->header( '-expires' => '-2m' ),
   header('Credit Card Recipt Report Results');
 
-open (REPORT, "/usr/bin/freeside-cc-receipts-report -v -s $beginning -d $ending $user |");
+open (REPORT, "freeside-cc-receipts-report -v -s $beginning -d $ending $user |");
 
 print '<PRE>';
 while(<REPORT>) {
diff --git a/httemplate/search/report_credit.cgi b/httemplate/search/report_credit.cgi
index f4430c13f..e4a9bf241 100755
--- a/httemplate/search/report_credit.cgi
+++ b/httemplate/search/report_credit.cgi
@@ -21,7 +21,7 @@ $ending = $1;
 print $cgi->header( '-expires' => '-2m' ),
   header('In House Credit Report Results');
 
-open (REPORT, "/usr/bin/freeside-credit-report -v -s $beginning -d $ending $user |");
+open (REPORT, "freeside-credit-report -v -s $beginning -d $ending $user |");
 
 print '<PRE>';
 while(<REPORT>) {
diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index 6b96ba7a5..ba02eb720 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -14,7 +14,7 @@ $user = getotaker;
 print $cgi->header( '-expires' => '-2m' ),
   header('Current Receivables Report Results');
 
-open (REPORT, "/usr/bin/freeside-receivables-report -v $user |");
+open (REPORT, "freeside-receivables-report -v $user |");
 
 print '<PRE>';
 while(<REPORT>) {
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index bedfdac5f..bc683f8b7 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -21,7 +21,7 @@ $ending = $1;
 print $cgi->header( '-expires' => '-2m' ),
   header('Tax Report Results');
 
-open (REPORT, "/usr/bin/freeside-tax-report -v -s $beginning -d $ending $user |");
+open (REPORT, "freeside-tax-report -v -s $beginning -d $ending $user |");
 
 print '<PRE>';
 while(<REPORT>) {
-- 
cgit v1.2.1


From bc8ce86aaf207f2fb89054020873bbff79489642 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 25 Feb 2002 19:09:43 +0000
Subject: keith@landel:     We have users that have the character "." in their
 username     we can't search these customers by Username, can you please fix.

---
 httemplate/search/svc_acct.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 0918275d7..dd0221d9a 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -234,7 +234,7 @@ sub uid_sort {
 
 sub usernamesearch {
 
-  $cgi->param('username') =~ /^([\w\d\-]+)$/; #untaint username_text
+  $cgi->param('username') =~ /^([\w\-\.\&]+)$/; #untaint username_text
   my($username)=$1;
 
   [ qsearch('svc_acct',{'username'=>$username}) ];
-- 
cgit v1.2.1


From f856cb7523ad477d63040ff6294a99d7bbd1f2bb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Feb 2002 08:34:53 +0000
Subject: die with a better error message on bad locales

---
 FS/FS/cust_main.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 67b426b85..e0796f4f1 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1000,7 +1000,8 @@ sub bill {
         'state'   => $self->state,
         'county'  => $self->county,
         'country' => $self->country,
-    } );
+    } ) or die "fatal: can't find tax rate for state/county/country ".
+               $self->state. "/". $self->county. "/". $self->country. "\n";
     my $tax = sprintf( "%.2f",
       $taxable_charged * ( $cust_main_county->getfield('tax') / 100 )
     );
-- 
cgit v1.2.1


From 1da4dc7b91575649612e8f3f55283b5a8b2b8811 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Feb 2002 09:06:51 +0000
Subject: ugh, payname needs first/last i guess

---
 FS/FS/cust_bill.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 943c7b3ec..1ec9298f0 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -470,7 +470,7 @@ sub realtime_card {
   my($payname, $payfirst, $paylast);
   if ( $cust_main->payname ) {
     $payname = $cust_main->payname;
-    $payname =~ /^\s*([\w \,\.\-\']*\w)?\s+([\w\,\.\-\']+)$/
+    $payname =~ /^\s*([\w \,\.\-\']*)?\s+([\w\,\.\-\']+)$/
       or do {
               #$dbh->rollback if $oldAutoCommit;
               return "Illegal payname $payname";
@@ -880,7 +880,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.19 2002-02-12 18:56:16 ivan Exp $
+$Id: cust_bill.pm,v 1.20 2002-02-26 09:06:51 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 69044f612f6e9695b52fa922df0de0ea957fcafd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Feb 2002 11:11:56 +0000
Subject: fix a weird oops with service address editing UI that would leave
 some fields blank... ?

---
 httemplate/edit/cust_main.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 2798d5dde..89a946b0f 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -232,7 +232,8 @@ END
   unless ( $cust_main->ship_last ) {
     print ' CHECKED';
     foreach (
-      qw( last first company address1 address2 city state zip daytime night fax)
+      qw( last first company address1 address2 city county state zip country
+          daytime night fax )
     ) {
       $cust_main->set("ship_$_", $cust_main->get($_) );
     }
-- 
cgit v1.2.1


From 1fdd857c556d4e6ee7e2b577085ede891dd41506 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Feb 2002 11:30:25 +0000
Subject: fix nasty logic error triggered by changing a ship_ field from
 something TO identical to the corresponding non-ship_ field.  ouch.

---
 FS/FS/cust_main.pm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index e0796f4f1..125332c9d 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -512,6 +512,8 @@ and repalce methods.
 sub check {
   my $self = shift;
 
+  warn "BEFORE: \n". $self->_dump;
+
   my $error =
     $self->ut_numbern('custnum')
     || $self->ut_number('agentnum')
@@ -553,7 +555,9 @@ sub check {
     $self->ss("$1-$2-$3");
   }
 
-  unless ( $import ) {
+
+# bad idea to disable, causes billing to fail because of no tax rates later
+#  unless ( $import ) {
     unless ( qsearchs('cust_main_county', {
       'country' => $self->country,
       'state'   => '',
@@ -566,7 +570,7 @@ sub check {
           'country' => $self->country,
         } );
     }
-  }
+#  }
 
   $error =
     $self->ut_phonen('daytime', $self->country)
@@ -583,7 +587,7 @@ sub check {
 
   if ( defined $self->dbdef_table->column('ship_last') ) {
     if ( grep { $self->getfield($_) ne $self->getfield("ship_$_") } @addfields
-         && grep $self->getfield("ship_$_"), grep $_ ne 'state', @addfields
+         && grep { $self->getfield("ship_$_") ne '' } @addfields
        )
     {
       my $error =
@@ -694,6 +698,8 @@ sub check {
 
   $self->otaker(getotaker);
 
+  warn "AFTER: \n". $self->_dump;
+
   ''; #no error
 }
 
-- 
cgit v1.2.1


From fc0715ded1a4c1ace11f1ad1df7600f726206afc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Feb 2002 11:42:37 +0000
Subject: in Record.pm - call ->check **BEFORE** generating @diff for SQL. 
 causing weird effects with cust_main::check that modifies record (ship_ field
 weirdness)

fix nasty logic error triggered by changing a ship_ field from something TO
identical to the corresponding non-ship_ field.  ouch
---
 FS/FS/Record.pm    | 12 ++++++------
 FS/FS/cust_main.pm |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index f30223351..0aa010bbc 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -575,12 +575,6 @@ sub replace {
   my ( $new, $old ) = ( shift, shift );
   warn "[debug]$me $new ->replace $old\n" if $DEBUG;
 
-  my @diff = grep $new->getfield($_) ne $old->getfield($_), $old->fields;
-  unless ( @diff ) {
-    carp "[warning]$me $new -> replace $old: records identical";
-    return '';
-  }
-
   return "Records not in same table!" unless $new->table eq $old->table;
 
   my $primary_key = $old->dbdef_table->primary_key;
@@ -591,6 +585,12 @@ sub replace {
   my $error = $new->check;
   return $error if $error;
 
+  my @diff = grep $new->getfield($_) ne $old->getfield($_), $old->fields;
+  unless ( @diff ) {
+    carp "[warning]$me $new -> replace $old: records identical";
+    return '';
+  }
+
   my $statement = "UPDATE ". $old->table. " SET ". join(', ',
     map {
       "$_ = ". _quote($new->getfield($_),$old->table,$_) 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 125332c9d..cf5bd3314 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -512,7 +512,7 @@ and repalce methods.
 sub check {
   my $self = shift;
 
-  warn "BEFORE: \n". $self->_dump;
+  #warn "BEFORE: \n". $self->_dump;
 
   my $error =
     $self->ut_numbern('custnum')
@@ -698,7 +698,7 @@ sub check {
 
   $self->otaker(getotaker);
 
-  warn "AFTER: \n". $self->_dump;
+  #warn "AFTER: \n". $self->_dump;
 
   ''; #no error
 }
-- 
cgit v1.2.1


From ffc6bb4416bc6e0c29d0e38a389a948d38c5534c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Feb 2002 11:53:25 +0000
Subject: okay, finally fix all the weirdness with shipping adresses.  whew.

---
 FS/FS/cust_main.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index cf5bd3314..b6d3075e8 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -586,8 +586,9 @@ sub check {
   );
 
   if ( defined $self->dbdef_table->column('ship_last') ) {
-    if ( grep { $self->getfield($_) ne $self->getfield("ship_$_") } @addfields
-         && grep { $self->getfield("ship_$_") ne '' } @addfields
+    if ( scalar ( grep { $self->getfield($_) ne $self->getfield("ship_$_") }
+                       @addfields )
+         && scalar ( grep { $self->getfield("ship_$_") ne '' } @addfields )
        )
     {
       my $error =
-- 
cgit v1.2.1


From b717ff208f1593bc7d2021f17fbb63006e66e6ef Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Feb 2002 22:09:44 +0000
Subject: fixup reports for templated webUI

---
 httemplate/search/report_cc.cgi          | 20 +++++---------------
 httemplate/search/report_credit.cgi      | 20 +++++---------------
 httemplate/search/report_receivables.cgi | 15 +++------------
 httemplate/search/report_tax.cgi         | 20 +++++---------------
 4 files changed, 18 insertions(+), 57 deletions(-)

diff --git a/httemplate/search/report_cc.cgi b/httemplate/search/report_cc.cgi
index f1c3c962c..128565fce 100755
--- a/httemplate/search/report_cc.cgi
+++ b/httemplate/search/report_cc.cgi
@@ -1,25 +1,15 @@
+<!-- mason kludge -->
 <%
 
-use strict;
-use vars qw( $cgi $user $beginning $ending );
-use CGI;
-use CGI::Carp qw( fatalsToBrowser );
-use FS::UID qw( cgisuidsetup getotaker );
-use FS::CGI qw( header );
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$user = getotaker;
+my $user = getotaker;
 
 $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
-$beginning = $1;
+my $beginning = $1;
 
 $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
-$ending = $1;
+my $ending = $1;
 
-print $cgi->header( '-expires' => '-2m' ),
-  header('Credit Card Recipt Report Results');
+print header('Credit Card Recipt Report Results');
 
 open (REPORT, "freeside-cc-receipts-report -v -s $beginning -d $ending $user |");
 
diff --git a/httemplate/search/report_credit.cgi b/httemplate/search/report_credit.cgi
index e4a9bf241..fac6c8d0f 100755
--- a/httemplate/search/report_credit.cgi
+++ b/httemplate/search/report_credit.cgi
@@ -1,25 +1,15 @@
+<!-- mason kludge -->
 <%
 
-use strict;
-use vars qw( $cgi $user $beginning $ending );
-use CGI;
-use CGI::Carp qw( fatalsToBrowser );
-use FS::UID qw( cgisuidsetup getotaker );
-use FS::CGI qw( header );
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$user = getotaker;
+my $user = getotaker;
 
 $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
-$beginning = $1;
+my $beginning = $1;
 
 $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
-$ending = $1;
+my $ending = $1;
 
-print $cgi->header( '-expires' => '-2m' ),
-  header('In House Credit Report Results');
+print header('In House Credit Report Results');
 
 open (REPORT, "freeside-credit-report -v -s $beginning -d $ending $user |");
 
diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index ba02eb720..fdd3779a9 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -1,18 +1,9 @@
+<!-- mason kludge -->
 <%
 
-use strict;
-use vars qw( $cgi $user );
-use CGI;
-use CGI::Carp qw( fatalsToBrowser );
-use FS::UID qw( cgisuidsetup getotaker );
+my $user = getotaker;
 
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$user = getotaker;
-
-print $cgi->header( '-expires' => '-2m' ),
-  header('Current Receivables Report Results');
+print header('Current Receivables Report Results');
 
 open (REPORT, "freeside-receivables-report -v $user |");
 
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index bc683f8b7..79aa65c9a 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -1,25 +1,15 @@
+<!-- mason kludge -->
 <%
 
-use strict;
-use vars qw( $cgi $user $beginning $ending );
-use CGI;
-use CGI::Carp qw( fatalsToBrowser );
-use FS::UID qw( cgisuidsetup getotaker );
-use FS::CGI qw( header );
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$user = getotaker;
+my $user = getotaker;
 
 $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
-$beginning = $1;
+my $beginning = $1;
 
 $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
-$ending = $1;
+my $ending = $1;
 
-print $cgi->header( '-expires' => '-2m' ),
-  header('Tax Report Results');
+print header('Tax Report Results');
 
 open (REPORT, "freeside-tax-report -v -s $beginning -d $ending $user |");
 
-- 
cgit v1.2.1


From 69f252e5353483662c81b1d6d0e750ae08577649 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 27 Feb 2002 17:07:28 +0000
Subject: Should be "CREATE TABLE" not "CREATE INDEX" for part_export_option

---
 httemplate/docs/upgrade8.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index e11041682..3edf425bf 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -162,7 +162,7 @@ CREATE TABLE part_export (
 CREATE INDEX part_export1 ON part_export ( machine );
 CREATE INDEX part_export2 ON part_export ( exporttype );
 
-CREATE INDEX part_export_option (
+CREATE TABLE part_export_option (
   optionnum int primary key,
   exportnum int not null,
   optionname varchar(80) not null,
-- 
cgit v1.2.1


From 49bc2dac92d2bb60e000088449b27aa380cc3490 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 27 Feb 2002 21:57:24 +0000
Subject: better debugging

---
 FS/FS/cust_main.pm    | 10 ++++++++--
 FS/bin/freeside-daily |  6 ++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b6d3075e8..7445e35bb 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1102,7 +1102,7 @@ sub collect {
   my $dbh = dbh;
 
   my $balance = $self->balance;
-  warn "collect: balance $balance" if $Debug;
+  warn "collect customer". $self->custnum. ": balance $balance" if $Debug;
   unless ( $balance > 0 ) { #redundant?????
     $dbh->rollback if $oldAutoCommit; #hmm
     return '';
@@ -1140,10 +1140,16 @@ sub collect {
           qsearch('part_bill_event', { 'payby'    => $self->payby,
                                        'disabled' => '',           } )
     ) {
-      #run callback
+      warn "calling invoice event (". $part_bill_event->eventcode. ")\n"
+        if $Debug;
       my $cust_main = $self; #for callback
       my $error = eval $part_bill_event->eventcode;
 
+      if ( $@ ) {
+        warn "fatal error running invoice event (". part_bill_event->eventcode.
+             "): $@";
+      }
+
       if ( $error ) {
 
         warn "Error running invoice event (". $part_bill_event->eventcode.
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 8d839cb21..e6f02df33 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -9,12 +9,14 @@ use FS::Record qw(qsearch qsearchs);
 use FS::cust_main;
 
 &untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_d);
-getopts("d:");
+use vars qw($opt_d $opt_v);
+getopts("d:v");
 my $user = shift or die &usage;
 
 adminsuidsetup $user;
 
+$FS::cust_main::Debug = 1 if $opt_v;
+
 my @cust_main = @ARGV
   ? map { qsearchs('cust_main', { custnum => $_ } ) } @ARGV
   : qsearch('cust_main', {} )
-- 
cgit v1.2.1


From 9dacc694c1401117d7e34376aa4916f5a4810cab Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 27 Feb 2002 22:00:58 +0000
Subject: well, don't make things worse when debugging...

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 7445e35bb..ae6155a57 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1146,7 +1146,7 @@ sub collect {
       my $error = eval $part_bill_event->eventcode;
 
       if ( $@ ) {
-        warn "fatal error running invoice event (". part_bill_event->eventcode.
+        warn "fatal error running invoice event (". $part_bill_event->eventcode.
              "): $@";
       }
 
-- 
cgit v1.2.1


From 6a37289c12238d48ea864b8177216ca276b33a40 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 27 Feb 2002 22:39:14 +0000
Subject: add status and statustext fields to cust_bill_event

---
 FS/FS/cust_bill_event.pm      |  2 ++
 README.1.4.0pre12             | 19 +++++++++++++++++++
 bin/fs-setup                  |  6 ++++--
 httemplate/docs/schema.html   |  2 ++
 httemplate/docs/upgrade8.html |  2 ++
 httemplate/view/cust_bill.cgi | 10 +++++++---
 6 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 README.1.4.0pre12

diff --git a/FS/FS/cust_bill_event.pm b/FS/FS/cust_bill_event.pm
index cc9ce7cb8..242b39e26 100644
--- a/FS/FS/cust_bill_event.pm
+++ b/FS/FS/cust_bill_event.pm
@@ -107,6 +107,8 @@ sub check {
     || $self->ut_number('invnum')
     || $self->ut_number('eventpart')
     || $self->ut_number('_date')
+    || $self->ut_enum('status', [qw( done failed )]
+    || $self->ut_textn('statustext');
   ;
 
   return "Unknown invnum"
diff --git a/README.1.4.0pre12 b/README.1.4.0pre12
new file mode 100644
index 000000000..3f30aa48c
--- /dev/null
+++ b/README.1.4.0pre12
@@ -0,0 +1,19 @@
+the following is necessary to upgrade from 1.4.0pre11 to 1.4.0pre12
+
+if you're upgrading from before 1.4.0pre12 see README.1.4.0pre11 first!
+
+if you're upgrading from 1.3.1 follow the instructions in
+httemplate/docs/upgrade8.html instead
+
+----
+
+install the FS perl modules and httemplate as per install.html or upgrade8.html
+
+ALTER TABLE cust_bill_event ADD status varchar(80);
+ALTER TABLE cust_bill_event ADD statustext text NULL;
+UPDATE cust_bill_event SET status = 'done';
+
+Run bin/dbdef-create
+
+Restart Apache and freeside-queued
+
diff --git a/bin/fs-setup b/bin/fs-setup
index 3ad0bbdf6..62c2cd490 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.81 2002-02-22 07:50:19 ivan Exp $
+# $Id: fs-setup,v 1.82 2002-02-27 22:39:14 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -329,10 +329,12 @@ sub tables_hash_hack {
         'invnum',   'int',  '', '',
         'eventpart',   'int',  '', '',
         '_date',     @date_type,
+        'status', 'varchar', '', $char_d,
+        'statustext', 'text', 'NULL', '',
       ],
       'primary_key' => 'eventnum',
       'unique' => [ [ 'eventpart', 'invnum' ] ],
-      'index' => [ ['invnum'] ],
+      'index' => [ ['invnum'], ['status'] ],
     },
 
     'part_bill_event' => {
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 8420161bf..b828213ff 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -32,6 +32,8 @@
         <li>invnum - <a href="#cust_bill">invoice</a>
         <li>eventpart - <a href="#part_bill_event">event definition</a>
         <li>_date
+        <li>status
+        <li>statustext
       </ul>
     <li><a name="part_bill_event" href="man/FS/part_bill_event.html">part_bill_event</a> - Invoice event definitions
       <ul>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 3edf425bf..a4fb1762f 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -188,6 +188,8 @@ ALTER TABLE cust_bill ADD closed char(1) NULL;
 ALTER TABLE cust_pay ADD closed char(1) NULL;
 ALTER TABLE cust_credit ADD closed char(1) NULL;
 ALTER TABLE cust_refund ADD closed char(1) NULL;
+ALTER TABLE cust_bill_event ADD status varchar(80);
+ALTER TABLE cust_bill_event ADD statustext text NULL;
 CREATE INDEX cust_main3 ON cust_main ( referral_custnum );
 CREATE INDEX cust_credit_bill1 ON cust_credit_bill ( crednum );
 CREATE INDEX cust_credit_bill2 ON cust_credit_bill ( invnum );
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 7c2af06a7..95f1a0af8 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -22,13 +22,17 @@ print qq!<A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) aga
 
 print qq!<A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>!.      '<BR><BR>';
 
+print table(). '<TR><TH>Event</TH><TH>Date</TH><TH>Status</TH></TR>';
 foreach my $cust_bill_event (
   sort { $a->_date <=> $b->_date } $cust_bill->cust_bill_event
 ) {
-  print time2str("%a %b %e %T %Y", $cust_bill_event->_date). ' - '.
-        $cust_bill_event->part_bill_event->event. '<BR>';
+  my $status = $cust_bill_event->status;
+  $status .= ': '. $cust_bill_event->statustext if $cust_bill_event->statustext;
+  print '<TR><TD>'. $cust_bill_event->part_bill_event->event. '</TD><TD>'.
+        time2str("%a %b %e %T %Y", $cust_bill_event->_date). '</TD><TD>'.
+        $status. '</TD></TR>';
 }
-print '<BR><PRE>';
+print '</TABLE><BR><PRE>';
 
 print $cust_bill->print_text;
 
-- 
cgit v1.2.1


From ddd6429bd05b2854c88b734d859c659de5faf4c6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 27 Feb 2002 22:40:08 +0000
Subject: errant ;

---
 FS/FS/cust_bill_event.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_bill_event.pm b/FS/FS/cust_bill_event.pm
index 242b39e26..987e53e4b 100644
--- a/FS/FS/cust_bill_event.pm
+++ b/FS/FS/cust_bill_event.pm
@@ -108,7 +108,7 @@ sub check {
     || $self->ut_number('eventpart')
     || $self->ut_number('_date')
     || $self->ut_enum('status', [qw( done failed )]
-    || $self->ut_textn('statustext');
+    || $self->ut_textn('statustext')
   ;
 
   return "Unknown invnum"
-- 
cgit v1.2.1


From e78d63847de9fbcb78d22188a25b77b7678f1cee Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 27 Feb 2002 22:40:47 +0000
Subject: and missing ) *sigh*

---
 FS/FS/cust_bill_event.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_bill_event.pm b/FS/FS/cust_bill_event.pm
index 987e53e4b..146a30e02 100644
--- a/FS/FS/cust_bill_event.pm
+++ b/FS/FS/cust_bill_event.pm
@@ -107,7 +107,7 @@ sub check {
     || $self->ut_number('invnum')
     || $self->ut_number('eventpart')
     || $self->ut_number('_date')
-    || $self->ut_enum('status', [qw( done failed )]
+    || $self->ut_enum('status', [qw( done failed )])
     || $self->ut_textn('statustext')
   ;
 
-- 
cgit v1.2.1


From caff66abc3e2ccd9a9c26d4770fe4f4136a2e610 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 27 Feb 2002 23:03:10 +0000
Subject: bubble up billing event errors

---
 FS/FS/cust_main.pm | 63 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index ae6155a57..7c9bae3c3 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1135,7 +1135,9 @@ sub collect {
         grep { $_->seconds <= ( $invoice_time - $cust_bill->_date )
                && ! qsearchs( 'cust_bill_event', {
                                 'invnum'    => $cust_bill->invnum,
-                                'eventpart' => $_->eventpart       } )
+                                'eventpart' => $_->eventpart,
+                                'status'    => 'done',
+                                                                   } )
              }
           qsearch('part_bill_event', { 'payby'    => $self->payby,
                                        'disabled' => '',           } )
@@ -1145,41 +1147,42 @@ sub collect {
       my $cust_main = $self; #for callback
       my $error = eval $part_bill_event->eventcode;
 
+      my $status = '';
+      my $statustext = '';
       if ( $@ ) {
-        warn "fatal error running invoice event (". $part_bill_event->eventcode.
-             "): $@";
+        $status = 'failed';
+        $statustext = $@;
+      } elsif ( $error ) {
+        $status = 'done';
+        $statustext = $error;
+      } else {
+        $status = 'done'
       }
 
+      #add cust_bill_event
+      my $cust_bill_event = new FS::cust_bill_event {
+        'invnum'     => $cust_bill->invnum,
+        'eventpart'  => $part_bill_event->eventpart,
+        '_date'      => $invoice_time,
+        'status'     => $status,
+        'statustext' => $statustext,
+      };
+      $cust_bill_event->insert;
       if ( $error ) {
-
-        warn "Error running invoice event (". $part_bill_event->eventcode.
-             "): $error";
-
-      } else {
-
-        #add cust_bill_event
-        my $cust_bill_event = new FS::cust_bill_event {
-          'invnum'    => $cust_bill->invnum,
-          'eventpart' => $part_bill_event->eventpart,
-          '_date'     => $invoice_time,
-        };
-        $cust_bill_event->insert;
-        if ( $error ) {
-          #$dbh->rollback if $oldAutoCommit;
-          #return "error: $error";
-
-          # gah, even with transactions.
-          $dbh->commit if $oldAutoCommit; #well.
-          my $e = 'WARNING: Event run but database not updated - '.
-                  'error inserting cust_bill_event, invnum #'. $cust_bill->invnum.
-                  ', eventpart '. $part_bill_event->eventpart.
-                  ": $error";
-          warn $e;
-          return $e;
-        }
-
+        #$dbh->rollback if $oldAutoCommit;
+        #return "error: $error";
+
+        # gah, even with transactions.
+        $dbh->commit if $oldAutoCommit; #well.
+        my $e = 'WARNING: Event run but database not updated - '.
+                'error inserting cust_bill_event, invnum #'. $cust_bill->invnum.
+                ', eventpart '. $part_bill_event->eventpart.
+                ": $error";
+        warn $e;
+        return $e;
       }
 
+
     }
 
   }
-- 
cgit v1.2.1


From 2ffcf3ea48312f5b5fb5661e46f5f0b2339f5c4c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 27 Feb 2002 23:20:58 +0000
Subject: oops, spurious error messages

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 7c9bae3c3..9eb569f96 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1167,7 +1167,7 @@ sub collect {
         'status'     => $status,
         'statustext' => $statustext,
       };
-      $cust_bill_event->insert;
+      $error = $cust_bill_event->insert;
       if ( $error ) {
         #$dbh->rollback if $oldAutoCommit;
         #return "error: $error";
-- 
cgit v1.2.1


From 5a30e3a89e4e313a526a7f03afbe94282c715bdd Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Thu, 28 Feb 2002 00:28:02 +0000
Subject: improved vpopmail support for svc_acct records

---
 FS/FS/svc_acct.pm | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 168 insertions(+)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index b90cbe8d3..6ac2b9d75 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -11,7 +11,11 @@ use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
              $dirhash
              $icradius_dbh
              @saltset @pw_set);
+             $rsync $ssh);
 use Carp;
+use File::Path;
+use Fcntl qw(:flock);
+use FS::UID qw( datasrc );
 use FS::Conf;
 use FS::Record qw( qsearch qsearchs fields dbh );
 use FS::svc_Common;
@@ -28,6 +32,8 @@ use FS::queue;
 
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::svc_acct'} = sub { 
+  $rsync = "rsync";
+  $ssh = "ssh";
   $conf = new FS::Conf;
   $dir_prefix = $conf->config('home');
   @shells = $conf->config('shells');
@@ -95,6 +101,14 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
     $icradius_dbh = '';
   }
   $dirhash = $conf->config('dirhash') || 0;
+  $exportdir = "/usr/local/etc/freeside/export." . datasrc;
+  if ( $conf->exists('vpopmailmachines') ) {
+    my (@vpopmailmachines) = $conf->config('vpopmailmachines');
+    my ($machine, $dir, $uid, $gid) = split (/\s+/, $vpopmailmachines[0]);
+    $vpopdir = $dir;
+  } else {
+    $vpopdir = '';
+  }
 };
 
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
@@ -345,9 +359,28 @@ sub insert {
       $dbh->rollback if $oldAutoCommit;
       return "queueing job (transaction rolled back): $error";
     }
+  }
+
+  if ( $vpopdir ) {
+
+    my $vpopmail_queue =
+      new FS::queue { 
+      'svcnum' => $self->svcnum,
+      'job' => 'FS::svc_acct::vpopmail_insert'
+    };
+    $error = $vpopmail_queue->insert( $self->username,
+      crypt($self->_password,$saltset[int(rand(64))].$saltset[int(rand(64))]),
+                                      $self->domain,
+                                      $vpopdir,
+                                    );
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
 
   }
 
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
 }
@@ -457,6 +490,49 @@ sub icradius_rr_insert {
   1;
 }
 
+
+sub vpopmail_insert {
+  my( $username, $password, $domain, $vpopdir ) = @_;
+  
+  (open(VPASSWD, ">>$exportdir/domains/$domain/vpasswd")
+    and flock(VPASSWD,LOCK_EX|LOCK_NB)
+  ) or die "can't open vpasswd file for $username\@$domain: $exportdir/domains/$domain/vpasswd";
+  print VPASSWD join(":",
+    $username,
+    $password,
+    '1',
+    '0',
+    $username,
+    "$vpopdir/domains/$domain/$username",
+    'NOQUOTA',
+  ), "\n";
+
+  flock(VPASSWD,LOCK_UN);
+  close(VPASSWD);
+
+  mkdir "$exportdir/domains/$domain/$username", 0700  or die "can't create Maildir";
+  mkdir "$exportdir/domains/$domain/$username/Maildir", 0700 or die "can't create Maildir";
+  mkdir "$exportdir/domains/$domain/$username/Maildir/cur", 0700 or die "can't create Maildir";
+  mkdir "$exportdir/domains/$domain/$username/Maildir/new", 0700 or die "can't create Maildir";
+  mkdir "$exportdir/domains/$domain/$username/Maildir/tmp", 0700 or die "can't create Maildir";
+ 
+  my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_sync' };
+  $error = $queue->insert;
+
+  1;
+}
+
+sub vpopmail_sync {
+
+  my (@vpopmailmachines) = $conf->config('vpopmailmachines');
+  my ($machine, $dir, $uid, $gid) = split (/\s+/, $vpopmailmachines[0]);
+  
+  chdir $exportdir;
+  my @args = ("$rsync", "-rlpt", "-e", "$ssh", "domains/", "vpopmail\@$machine:$pdir/domains/")
+  system {$args[0]} @args;
+
+}
+
 =item delete
 
 Deletes this account from the database.  If there is an error, returns the
@@ -601,6 +677,14 @@ sub delete {
       $dbh->rollback if $oldAutoCommit;
       return "queueing job (transaction rolled back): $error";
     }
+  }
+  if ( $vpopdir ) {
+    my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_delete' };
+    $error = $queue->insert( $self->username, $self->domain );
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
 
   }
 
@@ -671,6 +755,33 @@ sub icradius_rr_delete {
   1;
 }
 
+sub vpopmail_delete {
+  my( $username, $domain ) = @_;
+  
+  (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
+    and flock(VPASSWD,LOCK_EX|LOCK_NB)
+  ) or die "can't open $exportdir/domains/$domain/vpasswd: $!";
+
+  open(VPASSWDTMP, ">$exportdir/domains/$domain/vpasswd.tmp")
+    or die "Can't open $exportdir/domains/$domain/vpasswd.tmp: $!";
+
+  while (<VPASSWD>) {
+    my ($mailbox, $rest) = split(':', $_);
+    print VPASSWDTMP $_ unless $username eq $mailbox;
+  }
+
+  close(VPASSWDTMP);
+
+  rename "$exportdir/domains/$domain/vpasswd.tmp", "$exportdir/domains/$domain/vpasswd"
+    or die "Can't rename $exportdir/domains/$domain/vpasswd.tmp: $!";
+
+  flock(VPASSWD,LOCK_UN);
+  close(VPASSWD);
+
+  rmtree "$exportdir/domains/$domain/$username" or die "can't destroy Maildir";+ 
+  1;
+}
+
 =item replace OLD_RECORD
 
 Replaces OLD_RECORD with this one in the database.  If there is an error,
@@ -791,6 +902,31 @@ sub replace {
       return "queueing job (transaction rolled back): $error";
     }
   }
+  if ( $vpopdir ) {
+    my $cpassword = crypt(
+      $new->_password,$saltset[int(rand(64))].$saltset[int(rand(64))]
+    );
+
+    if ($old->username ne $new->username || $old->domain ne $new->domain ) {
+      my $queue  = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_delete' };
+        $error = $queue->insert( $old->username, $old->domain );
+      my $queue2 = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_insert' };
+        $error = $queue2->insert( $new->username,
+                                  $cpassword,
+                                  $new->domain,
+                                  $vpopdir,
+                                )
+        unless $error;
+    } elsif ($old->_password ne $new->_password) {
+      my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_replace_password' };
+      $error = $queue->insert( $new->username, $cpassword, $new->domain );
+    }
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
+  }
+
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
@@ -867,6 +1003,38 @@ sub cp_change {
 
 }
 
+sub vpopmail_replace_password {
+  my( $username, $password, $domain ) = @_;
+  
+  (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
+    and flock(VPASSWD,LOCK_EX|LOCK_NB)
+  ) or die "can't open $exportdir/domains/$domain/vpasswd: $!";
+
+  open(VPASSWDTMP, ">$exportdir/domains/$domain/vpasswd.tmp")
+    or die "Can't open $exportdir/domains/$domain/vpasswd.tmp: $!";
+
+  while (<VPASSWD>) {
+    my ($mailbox, $pw, @rest) = split(':', $_);
+    print VPASSWDTMP $_ unless $username eq $mailbox;
+    print VPASSWDTMP join (':', ($mailbox, $password, @rest))
+      if $username eq $mailbox;
+  }
+
+  close(VPASSWDTMP);
+
+  rename "$exportdir/domains/$domain/vpasswd.tmp", "$exportdir/domains/$domain/vpasswd"
+    or die "Can't rename $exportdir/domains/$domain/vpasswd.tmp: $!";
+
+  flock(VPASSWD,LOCK_UN);
+  close(VPASSWD);
+
+  my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_sync' };
+  $error = $queue->insert;
+
+  1;
+}
+
+
 =item suspend
 
 Suspends this account by prefixing *SUSPENDED* to the password.  If there is an
-- 
cgit v1.2.1


From e8dc13cd1af07846cd3015986f3a3fd34cdcdaea Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 28 Feb 2002 22:05:31 +0000
Subject: s/depreciated/deprecated/

---
 FS/FS/Conf.pm                     | 12 ++++++------
 httemplate/config/config-view.cgi |  2 +-
 httemplate/config/config.cgi      |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 226702e5c..6fbd48732 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -185,7 +185,7 @@ httemplate/docs/config.html
 
   {
     'key'         => 'address',
-    'section'     => 'depreciated',
+    'section'     => 'deprecated',
     'description' => 'This configuration option is no longer used.  See <a href="#invoice_template">invoice_template</a> instead.',
     'type'        => 'text',
   },
@@ -304,7 +304,7 @@ httemplate/docs/config.html
 
   {
     'key'         => 'domain',
-    'section'     => 'depreciated',
+    'section'     => 'deprecated',
     'description' => 'Your domain name.',
     'type'        => 'text',
   },
@@ -416,8 +416,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'maildisablecatchall',
-    'section'     => 'depreciated',
-    'description' => '<b>DEPRECIATED</b>, now the default.  Turning this option on used to disable the requirement that each virtual domain have a catch-all mailbox.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, now the default.  Turning this option on used to disable the requirement that each virtual domain have a catch-all mailbox.',
     'type'        => 'checkbox',
   },
 
@@ -654,8 +654,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'textradiusprepend',
-    'section'     => 'depreciated',
-    'description' => '<b>DEPRECIATED</b>, use RADIUS check attributes instead.  This option will be removed soon.  The contents will be prepended to the first line of a user\'s RADIUS entry in text exports.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, use RADIUS check attributes instead.  This option will be removed soon.  The contents will be prepended to the first line of a user\'s RADIUS entry in text exports.',
     'type'        => 'text',
   },
 
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 225c29507..138ec4737 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -7,7 +7,7 @@
 <% foreach my $section ( qw(required billing username password UI session
                             shell mail radius apache BIND
                            ),
-                         '', 'depreciated') { %>
+                         '', 'deprecated') { %>
   <%= table("#cccccc", 2) %>
   <tr>
     <th colspan="2" bgcolor="#dcdcdc">
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index f640d0b5e..19775c7aa 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -8,7 +8,7 @@
 <% foreach my $section ( qw(required billing username password UI session
                             shell mail radius apache BIND
                            ),
-                         '', 'depreciated') { %>
+                         '', 'deprecated') { %>
   <%= table("#cccccc", 2) %>
   <tr>
     <th colspan="2" bgcolor="#dcdcdc">
-- 
cgit v1.2.1


From 8068d7c9cca24c3517ea46f1addf412a9d362de9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 28 Feb 2002 23:07:32 +0000
Subject: handle errors better

---
 httemplate/misc/cancel-unaudited.cgi | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/httemplate/misc/cancel-unaudited.cgi b/httemplate/misc/cancel-unaudited.cgi
index 5d3c87316..8f31db838 100755
--- a/httemplate/misc/cancel-unaudited.cgi
+++ b/httemplate/misc/cancel-unaudited.cgi
@@ -25,11 +25,8 @@ local $SIG{TSTP} = 'IGNORE';
 local $FS::UID::AutoCommit = 0;
 
 my $error = $svc_acct->cancel;
-&myeidiot($error) if $error;
-$error = $svc_acct->delete;
-&myeidiot($error) if $error;
-
-$error = $cust_svc->delete;
+$error ||= $svc_acct->delete;
+$error ||= $cust_svc->delete;
 
 if ( $error ) {
   $dbh->rollback;
-- 
cgit v1.2.1


From 7d6600bc5fe5703979f1e15682fe185aa65c4a4e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 28 Feb 2002 23:08:53 +0000
Subject: add main menu link

---
 httemplate/search/svc_acct.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index dd0221d9a..3a0e922ce 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -100,7 +100,7 @@ if ( scalar(@svc_acct) == 1 ) {
   }
   #end pager
 
-  print header("Account Search Results",''),
+  print header("Account Search Results",menubar('Main Menu'=>popurl(2)),
         "$total matching accounts found<BR><BR>$pager",
         &table(), <<END;
       <TR>
-- 
cgit v1.2.1


From 251540415dbf35a7c91e8338986ece244d77a987 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 28 Feb 2002 23:13:23 +0000
Subject: eek

---
 FS/FS/svc_acct.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 6ac2b9d75..89fb76c36 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -10,7 +10,7 @@ use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
              $cp_server $cp_user $cp_pass $cp_workgroup
              $dirhash
              $icradius_dbh
-             @saltset @pw_set);
+             @saltset @pw_set
              $rsync $ssh);
 use Carp;
 use File::Path;
-- 
cgit v1.2.1


From e296e99c38ed8fedae98bfd2b8ad063ae513583c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 28 Feb 2002 23:17:31 +0000
Subject: clean up mess

---
 FS/FS/svc_acct.pm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 89fb76c36..86132ffeb 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -11,7 +11,7 @@ use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
              $dirhash
              $icradius_dbh
              @saltset @pw_set
-             $rsync $ssh);
+             $rsync $ssh $exportdir $vpopdir);
 use Carp;
 use File::Path;
 use Fcntl qw(:flock);
@@ -495,7 +495,7 @@ sub vpopmail_insert {
   my( $username, $password, $domain, $vpopdir ) = @_;
   
   (open(VPASSWD, ">>$exportdir/domains/$domain/vpasswd")
-    and flock(VPASSWD,LOCK_EX|LOCK_NB)
+    and flock(VPASSWD,LOCK_EX)
   ) or die "can't open vpasswd file for $username\@$domain: $exportdir/domains/$domain/vpasswd";
   print VPASSWD join(":",
     $username,
@@ -517,7 +517,8 @@ sub vpopmail_insert {
   mkdir "$exportdir/domains/$domain/$username/Maildir/tmp", 0700 or die "can't create Maildir";
  
   my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_sync' };
-  $error = $queue->insert;
+  my $error = $queue->insert;
+  die $error if $error;
 
   1;
 }
@@ -528,7 +529,7 @@ sub vpopmail_sync {
   my ($machine, $dir, $uid, $gid) = split (/\s+/, $vpopmailmachines[0]);
   
   chdir $exportdir;
-  my @args = ("$rsync", "-rlpt", "-e", "$ssh", "domains/", "vpopmail\@$machine:$pdir/domains/")
+  my @args = ("$rsync", "-rlpt", "-e", "$ssh", "domains/", "vpopmail\@$machine:$vpoppdir/domains/");
   system {$args[0]} @args;
 
 }
@@ -759,7 +760,7 @@ sub vpopmail_delete {
   my( $username, $domain ) = @_;
   
   (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
-    and flock(VPASSWD,LOCK_EX|LOCK_NB)
+    and flock(VPASSWD,LOCK_EX)
   ) or die "can't open $exportdir/domains/$domain/vpasswd: $!";
 
   open(VPASSWDTMP, ">$exportdir/domains/$domain/vpasswd.tmp")
@@ -1007,7 +1008,7 @@ sub vpopmail_replace_password {
   my( $username, $password, $domain ) = @_;
   
   (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
-    and flock(VPASSWD,LOCK_EX|LOCK_NB)
+    and flock(VPASSWD,LOCK_EX)
   ) or die "can't open $exportdir/domains/$domain/vpasswd: $!";
 
   open(VPASSWDTMP, ">$exportdir/domains/$domain/vpasswd.tmp")
-- 
cgit v1.2.1


From e5b4bae07ce072ba1cc6997eadbe3f0c09ff7308 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 28 Feb 2002 23:18:46 +0000
Subject: clean up mess.  *sigh*

---
 FS/FS/svc_acct.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 86132ffeb..3c564ec9d 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -529,7 +529,7 @@ sub vpopmail_sync {
   my ($machine, $dir, $uid, $gid) = split (/\s+/, $vpopmailmachines[0]);
   
   chdir $exportdir;
-  my @args = ("$rsync", "-rlpt", "-e", "$ssh", "domains/", "vpopmail\@$machine:$vpoppdir/domains/");
+  my @args = ("$rsync", "-rlpt", "-e", "$ssh", "domains/", "vpopmail\@$machine:$vpopdir/domains/");
   system {$args[0]} @args;
 
 }
@@ -1030,7 +1030,8 @@ sub vpopmail_replace_password {
   close(VPASSWD);
 
   my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_sync' };
-  $error = $queue->insert;
+  my $error = $queue->insert;
+  die $error if $error;
 
   1;
 }
-- 
cgit v1.2.1


From 5b64b45f66ca639c0ff98f6903722022c30f5cc2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 28 Feb 2002 23:30:21 +0000
Subject: tyop

---
 httemplate/search/svc_acct.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 3a0e922ce..2666ef621 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -100,7 +100,7 @@ if ( scalar(@svc_acct) == 1 ) {
   }
   #end pager
 
-  print header("Account Search Results",menubar('Main Menu'=>popurl(2)),
+  print header("Account Search Results",menubar('Main Menu'=>popurl(2))),
         "$total matching accounts found<BR><BR>$pager",
         &table(), <<END;
       <TR>
-- 
cgit v1.2.1


From dac484e8356be5b235cacebe83059b7eb6588c13 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Mar 2002 23:46:45 +0000
Subject: docu

---
 httemplate/docs/install.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index b2d735d12..d7c014f4d 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -98,7 +98,7 @@ $ su
 $ su
 # make create-config
 </pre>
-    <li>You should run a separate iteration of Apache[-SSL] with mod_perl enabled as the freeside user.
+    <li>Run a <b>separate</b> iteration of Apache[-SSL] with mod_perl enabled <b>as the freeside user</b>.
 </ul>
 <table>
   <tr>
@@ -108,7 +108,11 @@ $ su
     <td><ul>
       <li>Run <tt>make aspdocs</tt>
       <li>Copy <tt>aspdocs/</tt> to your web server's document space.
-      <li>Create a <a href="http://www.apache-asp.org/config.html#Global">Global</a> directory, such as <tt>/usr/local/etc/freeside/asp-global/</tt>
+      <li>Create a <a href="http://www.apache-asp.org/config.html#Global">Global</a> directory, such as <tt>/usr/local/etc/freeside/asp-global/</tt>:
+<font size="-1"><pre>
+mkdir&nbsp;/usr/local/etc/freeside/asp-global/
+chown&nbsp;freeside&nbsp;/usr/local/etc/freeside/asp-global/
+</pre></font>
       <li>Copy <tt>htetc/global.asa</tt> to the Global directory:
 <font size="-1"><pre>
 cp&nbsp;htetc/global.asa&nbsp;/usr/local/etc/freeside/asp-global/global.asa
-- 
cgit v1.2.1


From 239484572a9191100993bb1e85ffe8834689feb0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 4 Mar 2002 12:48:49 +0000
Subject: *** empty log message ***

---
 FS/FS/Record.pm               | 54 ++++++++++++++++++++++++++----
 FS/FS/nas.pm                  |  4 ++-
 Makefile                      |  4 +--
 README.1.4.0pre12             |  4 +++
 bin/create-history-tables     | 78 +++++++++++++++++++++++++++++++++++++++++++
 bin/fs-radius-add-check       |  9 +++++
 bin/fs-radius-add-reply       | 11 +++++-
 bin/fs-setup                  | 59 +++++++++++++++++++++++++++++---
 httemplate/docs/upgrade8.html |  2 ++
 9 files changed, 209 insertions(+), 16 deletions(-)
 create mode 100755 bin/create-history-tables

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 0aa010bbc..7dc19ccac 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -344,7 +344,7 @@ sub table {
 
 =item dbdef_table
 
-Returns the FS::dbdef_table object for the table.
+Returns the DBIx::DBSchema::Table object for the table.
 
 =cut
 
@@ -473,20 +473,27 @@ sub insert {
   $self->unique($primary_key) 
     if $primary_key && ! $self->getfield($primary_key);
 
+  #false laziness w/delete
   my @fields =
     grep defined($self->getfield($_)) && $self->getfield($_) ne "",
     $self->fields
   ;
+  my @values = map { _quote( $self->getfield($_), $self->table, $_) } @fields;
+  #eslaf
 
   my $statement = "INSERT INTO ". $self->table. " ( ".
-      join(', ',@fields ).
+      join( ', ', @fields ).
     ") VALUES (".
-      join(', ',map(_quote($self->getfield($_),$self->table,$_), @fields)).
+      join( ', ', @values ).
     ")"
   ;
   warn "[debug]$me $statement\n" if $DEBUG;
   my $sth = dbh->prepare($statement) or return dbh->errstr;
 
+  my $h_statement = $self->_h_statement('insert');
+  warn "[debug]$me $h_statement\n" if $DEBUG;
+  my $h_sth = dbh->prepare($h_statement) or return dbh->errstr;
+
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE'; 
@@ -495,6 +502,7 @@ sub insert {
   local $SIG{PIPE} = 'IGNORE';
 
   $sth->execute or return $sth->errstr;
+  $h_sth->execute or return $h_sth->errstr;
   dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
 
   '';
@@ -521,7 +529,7 @@ otherwise returns false.
 sub delete {
   my $self = shift;
 
-  my($statement)="DELETE FROM ". $self->table. " WHERE ". join(' AND ',
+  my $statement = "DELETE FROM ". $self->table. " WHERE ". join(' AND ',
     map {
       $self->getfield($_) eq ''
         #? "( $_ IS NULL OR $_ = \"\" )"
@@ -537,6 +545,10 @@ sub delete {
   warn "[debug]$me $statement\n" if $DEBUG;
   my $sth = dbh->prepare($statement) or return dbh->errstr;
 
+  my $h_statement = $self->_h_statement('delete');
+  warn "[debug]$me $h_statement\n" if $DEBUG;
+  my $h_sth = dbh->prepare($h_statement) or return dbh->errstr;
+
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE'; 
@@ -546,6 +558,7 @@ sub delete {
 
   my $rc = $sth->execute or return $sth->errstr;
   #not portable #return "Record not found, statement:\n$statement" if $rc eq "0E0";
+  $h_sth->execute or return $h_sth->errstr;
   dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
 
   undef $self; #no need to keep object!
@@ -611,6 +624,14 @@ sub replace {
   warn "[debug]$me $statement\n" if $DEBUG;
   my $sth = dbh->prepare($statement) or return dbh->errstr;
 
+  my $h_old_statement = $old->_h_statement('replace_old');
+  warn "[debug]$me $h_old_statement\n" if $DEBUG;
+  my $h_old_sth = dbh->prepare($h_old_statement) or return dbh->errstr;
+
+  my $h_new_statement = $new->_h_statement('replace_new');
+  warn "[debug]$me $h_new_statement\n" if $DEBUG;
+  my $h_new_sth = dbh->prepare($h_new_statement) or return dbh->errstr;
+
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE'; 
@@ -620,6 +641,8 @@ sub replace {
 
   my $rc = $sth->execute or return $sth->errstr;
   #not portable #return "Record not found (or records identical)." if $rc eq "0E0";
+  $h_old_sth->execute or return $h_old_sth->errstr;
+  $h_new_sth->execute or return $h_new_sth->errstr;
   dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
 
   '';
@@ -647,6 +670,23 @@ sub check {
   confess "FS::Record::check not implemented; supply one in subclass!";
 }
 
+sub _h_statement {
+  my( $self, $action ) = @_;
+
+  my @fields =
+    grep defined($self->getfield($_)) && $self->getfield($_) ne "",
+    $self->fields
+  ;
+  my @values = map { _quote( $self->getfield($_), $self->table, $_) } @fields;
+
+  "INSERT INTO h_". $self->table. " ( ".
+      join(', ', qw(history_date history_user history_action), @fields ).
+    ") VALUES (".
+      join(', ', time, dbh->quote(getotaker()), dbh->quote($action), @values).
+    ")"
+  ;
+}
+
 =item unique COLUMN
 
 Replaces COLUMN in record with a unique number.  Called by the B<add> method
@@ -1056,7 +1096,7 @@ sub reload_dbdef {
 
 =item dbdef
 
-Returns the current database definition.  See L<FS::dbdef>.
+Returns the current database definition.  See L<DBIx::DBSchema>.
 
 =cut
 
@@ -1066,7 +1106,7 @@ sub dbdef { $dbdef; }
 
 This is an internal function used to construct SQL statements.  It returns
 VALUE DBI-quoted (see L<DBI/"quote">) unless VALUE is a number and the column
-type (see L<FS::dbdef_column>) does not end in `char' or `binary'.
+type (see L<DBIx::DBSchema::Column>) does not end in `char' or `binary'.
 
 =cut
 
@@ -1136,7 +1176,7 @@ The whole fields / hfields mess should be removed.
 
 The various WHERE clauses should be subroutined.
 
-table string should be depriciated in favor of FS::dbdef_table.
+table string should be depriciated in favor of DBIx::DBSchema::Table.
 
 No doubt we could benefit from a Tied hash.  Documenting how exists / defined
 true maps to the database (and WHERE clauses) would also help.
diff --git a/FS/FS/nas.pm b/FS/FS/nas.pm
index cb0c1b901..58c6827ea 100644
--- a/FS/FS/nas.pm
+++ b/FS/FS/nas.pm
@@ -136,10 +136,12 @@ sub heartbeat {
 
 =head1 VERSION
 
-$Id: nas.pm,v 1.5 2001-04-15 13:35:12 ivan Exp $
+$Id: nas.pm,v 1.6 2002-03-04 12:48:49 ivan Exp $
 
 =head1 BUGS
 
+heartbeat method uses SQL directly and doesn't update history tables.
+
 =head1 SEE ALSO
 
 L<FS::Record>, schema.html from the base documentation.
diff --git a/Makefile b/Makefile
index 7596c5b7c..8f577c579 100644
--- a/Makefile
+++ b/Makefile
@@ -21,8 +21,8 @@ QUEUED_RESTART = /etc/init.d/freeside restart
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION="1.4.0pre11"
-TAG="1_4_0_PRE11"
+VERSION="1.4.0pre12"
+TAG="1_4_0_PRE12"
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
diff --git a/README.1.4.0pre12 b/README.1.4.0pre12
index 3f30aa48c..aba8b7a37 100644
--- a/README.1.4.0pre12
+++ b/README.1.4.0pre12
@@ -15,5 +15,9 @@ UPDATE cust_bill_event SET status = 'done';
 
 Run bin/dbdef-create
 
+Run bin/create-history-tables
+
+Run bin/dbdef-create again
+
 Restart Apache and freeside-queued
 
diff --git a/bin/create-history-tables b/bin/create-history-tables
new file mode 100755
index 000000000..fb4c866c6
--- /dev/null
+++ b/bin/create-history-tables
@@ -0,0 +1,78 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use DBI;
+use DBIx::DBSchema 0.20;
+use DBIx::DBSchema::Table;
+use DBIx::DBSchema::Column;
+use DBIx::DBSchema::ColGroup::Unique;
+use DBIx::DBSchema::ColGroup::Index;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(dbdef);
+
+my $user = shift or die &usage;
+my $dbh = adminsuidsetup $user;
+
+my $schema = dbdef();
+
+#false laziness w/fs-setup
+foreach my $table ( grep { ! /^h_/ } $schema->tables ) {
+  my $tableobj = $schema->table($table);
+  my $h_tableobj = DBIx::DBSchema::Table->new( {
+    name        => "h_$table",
+    primary_key => 'historynum',
+    unique      => DBIx::DBSchema::ColGroup::Unique->new( [] ),
+    'index'     => DBIx::DBSchema::ColGroup::Index->new( [
+                     @{$tableobj->unique->lol_ref},
+                     @{$tableobj->index->lol_ref}
+                   ] ),
+    columns     => [
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'historynum',
+                       'type'    => 'serial',
+                       'null'    => 'NOT NULL',
+                       'length'  => '',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'history_date',
+                       'type'    => 'int',
+                       'null'    => 'NULL',
+                       'length'  => '',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'history_user',
+                       'type'    => 'varchar',
+                       'null'    => 'NOT NULL',
+                       'length'  => '80',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'history_action',
+                       'type'    => 'varchar',
+                       'null'    => 'NOT NULL',
+                       'length'  => '80',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     map { $tableobj->column($_) } $tableobj->columns
+                   ],
+  } );
+  foreach my $statement ( $h_tableobj->sql_create_table($dbh) ) {
+    $dbh->do( $statement )
+      or die "CREATE error: ". $dbh->errstr. "\ndoing statement: $statement";
+  }
+
+}
+
+$dbh->commit or die $dbh->errstr;
+$dbh->disconnect or die $dbh->errstr;
+
+sub usage {
+  die "Usage:\n  create-history-tables user\n";
+}
+
diff --git a/bin/fs-radius-add-check b/bin/fs-radius-add-check
index 35f4d3262..4e4769e58 100755
--- a/bin/fs-radius-add-check
+++ b/bin/fs-radius-add-check
@@ -39,12 +39,21 @@ my($char_d) = 80; #default maxlength for text fields
 ###
 
 foreach my $attribute ( @attributes ) {
+
   my $statement =
     "ALTER TABLE svc_acct ADD COLUMN rc_$attribute varchar($char_d) NULL";
   my $sth = $dbh->prepare( $statement )
    or warn "Error preparing $statement: ". $dbh->errstr;
   my $rc = $sth->execute
     or warn "Error executing $statement: ". $sth->errstr;
+
+  $statement =
+    "ALTER TABLE h_svc_acct ADD COLUMN rc_$attribute varchar($char_d) NULL";
+  $sth = $dbh->prepare( $statement )
+   or warn "Error preparing $statement: ". $dbh->errstr;
+  $rc = $sth->execute
+    or warn "Error executing $statement: ". $sth->errstr;
+
 }
 
 $dbh->commit or die $dbh->errstr;
diff --git a/bin/fs-radius-add-reply b/bin/fs-radius-add-reply
index 6b9a39e49..3de01374f 100755
--- a/bin/fs-radius-add-reply
+++ b/bin/fs-radius-add-reply
@@ -39,12 +39,21 @@ my($char_d) = 80; #default maxlength for text fields
 ###
 
 foreach my $attribute ( @attributes ) {
+
   my $statement =
     "ALTER TABLE svc_acct ADD COLUMN radius_$attribute varchar($char_d) NULL";
   my $sth = $dbh->prepare( $statement )
     or warn "Error preparing $statement: ". $dbh->errstr;
-  $sth->execute
+  my $rc = $sth->execute
     or warn "Error executing $statement: ". $sth->errstr;
+
+  $statement =
+    "ALTER TABLE h_svc_acct ADD COLUMN radius_$attribute varchar($char_d) NULL";
+  $sth = $dbh->prepare( $statement )
+    or warn "Error preparing $statement: ". $dbh->errstr;
+  $rc = $sth->execute
+    or warn "Error executing $statement: ". $sth->errstr;
+
 }
 
 $dbh->commit or die $dbh->errstr;
diff --git a/bin/fs-setup b/bin/fs-setup
index 62c2cd490..7ee04a5d8 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,13 +1,13 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.82 2002-02-27 22:39:14 ivan Exp $
+# $Id: fs-setup,v 1.83 2002-03-04 12:48:49 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
 
 use strict;
 use DBI;
-use DBIx::DBSchema 0.19;
+use DBIx::DBSchema 0.20;
 use DBIx::DBSchema::Table;
 use DBIx::DBSchema::Column;
 use DBIx::DBSchema::ColGroup::Unique;
@@ -160,6 +160,56 @@ foreach $attribute (@check_attributes) {
 #  }
 #}
 
+#create history tables (false laziness w/create-history-tables)
+foreach my $table ( grep { ! /^h_/ } $dbdef->tables ) {
+  my $tableobj = $dbdef->table($table);
+  my $h_tableobj = DBIx::DBSchema::Table->new( {
+    name        => "h_$table",
+    primary_key => 'historynum',
+    unique      => DBIx::DBSchema::ColGroup::Unique->new( [] ),
+    'index'     => DBIx::DBSchema::ColGroup::Index->new( [
+                     @{$tableobj->unique->lol_ref},
+                     @{$tableobj->index->lol_ref}
+                   ] ),
+    columns     => [
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'historynum',
+                       'type'    => 'serial',
+                       'null'    => 'NOT NULL',
+                       'length'  => '',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'history_date',
+                       'type'    => 'int',
+                       'null'    => 'NULL',
+                       'length'  => '',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'history_user',
+                       'type'    => 'varchar',
+                       'null'    => 'NOT NULL',
+                       'length'  => '80',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'history_action',
+                       'type'    => 'varchar',
+                       'null'    => 'NOT NULL',
+                       'length'  => '80',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     map { $tableobj->column($_) } $tableobj->columns
+                   ],
+  } );
+  $dbdef->addtable($h_tableobj);
+}
+
 #important
 $dbdef->save($dbdef_file);
 &FS::Record::reload_dbdef($dbdef_file);
@@ -173,10 +223,9 @@ my($dbh)=adminsuidsetup $user;
 #create tables
 $|=1;
 
-my @sql = $dbdef->sql($dbh);
 foreach my $statement ( $dbdef->sql($dbh) ) {
   $dbh->do( $statement )
-    or die "CREATE error: ",$dbh->errstr, "\ndoing statement: $statement";
+    or die "CREATE error: ". $dbh->errstr. "\ndoing statement: $statement";
 }
 
 #not really sample data (and shouldn't default to US)
@@ -256,7 +305,7 @@ foreach my $aref (
 
 }
 
-
+$dbh->commit or die $dbh->errstr;
 $dbh->disconnect or die $dbh->errstr;
 
 print "Freeside database initialized sucessfully\n";
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index a4fb1762f..874a9de7e 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -305,6 +305,8 @@ ALTER TABLE cust_refund DROP COLUMN crednum;
 </pre></font>
 </td></tr></table>
   <li><b>IMPORTANT: After applying the second set of database changes</b>, run bin/dbdef-create again.
+  <li><b>IMPORTANT</b>: run bin/create-history-tables
+  <li><b>IMPORTANT: After running bin/create-history-tables</b>, run bin/dbdef-create again.
   <li>set the <a href="../config/config.cgi#username_policy">user_policy configuration value</a> as appropriate for your site.
   <li>Create the `/usr/local/etc/freeside/cache.<i>datasrc</i>' directory
       (ownded by the freeside user).
-- 
cgit v1.2.1


From 0bb8360049c3ec543889d98a8d4ca27051139d68 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 4 Mar 2002 22:10:02 +0000
Subject: make history tables conditional

---
 FS/FS/Record.pm | 52 ++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 7dc19ccac..ea660d48a 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -490,9 +490,14 @@ sub insert {
   warn "[debug]$me $statement\n" if $DEBUG;
   my $sth = dbh->prepare($statement) or return dbh->errstr;
 
-  my $h_statement = $self->_h_statement('insert');
-  warn "[debug]$me $h_statement\n" if $DEBUG;
-  my $h_sth = dbh->prepare($h_statement) or return dbh->errstr;
+  my $h_sth;
+  if ( defined $dbdef->table('h_'. $self->table) ) {
+    my $h_statement = $self->_h_statement('insert');
+    warn "[debug]$me $h_statement\n" if $DEBUG;
+    $h_sth = dbh->prepare($h_statement) or return dbh->errstr;
+  } else {
+    $h_sth = '';
+  }
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -502,7 +507,7 @@ sub insert {
   local $SIG{PIPE} = 'IGNORE';
 
   $sth->execute or return $sth->errstr;
-  $h_sth->execute or return $h_sth->errstr;
+  $h_sth->execute or return $h_sth->errstr if $h_sth;
   dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
 
   '';
@@ -545,9 +550,14 @@ sub delete {
   warn "[debug]$me $statement\n" if $DEBUG;
   my $sth = dbh->prepare($statement) or return dbh->errstr;
 
-  my $h_statement = $self->_h_statement('delete');
-  warn "[debug]$me $h_statement\n" if $DEBUG;
-  my $h_sth = dbh->prepare($h_statement) or return dbh->errstr;
+  my $h_sth;
+  if ( defined $dbdef->table('h_'. $self->table) ) {
+    my $h_statement = $self->_h_statement('delete');
+    warn "[debug]$me $h_statement\n" if $DEBUG;
+    $h_sth = dbh->prepare($h_statement) or return dbh->errstr;
+  } else {
+    $h_sth = '';
+  }
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -558,7 +568,7 @@ sub delete {
 
   my $rc = $sth->execute or return $sth->errstr;
   #not portable #return "Record not found, statement:\n$statement" if $rc eq "0E0";
-  $h_sth->execute or return $h_sth->errstr;
+  $h_sth->execute or return $h_sth->errstr if $h_sth;
   dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
 
   undef $self; #no need to keep object!
@@ -624,13 +634,23 @@ sub replace {
   warn "[debug]$me $statement\n" if $DEBUG;
   my $sth = dbh->prepare($statement) or return dbh->errstr;
 
-  my $h_old_statement = $old->_h_statement('replace_old');
-  warn "[debug]$me $h_old_statement\n" if $DEBUG;
-  my $h_old_sth = dbh->prepare($h_old_statement) or return dbh->errstr;
+  my $h_old_sth;
+  if ( defined $dbdef->table('h_'. $old->table) ) {
+    my $h_old_statement = $old->_h_statement('replace_old');
+    warn "[debug]$me $h_old_statement\n" if $DEBUG;
+    $h_old_sth = dbh->prepare($h_old_statement) or return dbh->errstr;
+  } else {
+    $h_old_sth = '';
+  }
 
-  my $h_new_statement = $new->_h_statement('replace_new');
-  warn "[debug]$me $h_new_statement\n" if $DEBUG;
-  my $h_new_sth = dbh->prepare($h_new_statement) or return dbh->errstr;
+  my $h_new_sth;
+  if ( defined $dbdef->table('h_'. $new->table) ) {
+    my $h_new_statement = $new->_h_statement('replace_new');
+    warn "[debug]$me $h_new_statement\n" if $DEBUG;
+    $h_new_sth = dbh->prepare($h_new_statement) or return dbh->errstr;
+  } else {
+    $h_new_sth = '';
+  }
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -641,8 +661,8 @@ sub replace {
 
   my $rc = $sth->execute or return $sth->errstr;
   #not portable #return "Record not found (or records identical)." if $rc eq "0E0";
-  $h_old_sth->execute or return $h_old_sth->errstr;
-  $h_new_sth->execute or return $h_new_sth->errstr;
+  $h_old_sth->execute or return $h_old_sth->errstr if $h_old_sth;
+  $h_new_sth->execute or return $h_new_sth->errstr if $h_new_sth;
   dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
 
   '';
-- 
cgit v1.2.1


From f9734784e69f0a24e25fdeb6554d6563577e9296 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Mar 2002 09:44:09 +0000
Subject: yes i have crazy customers with 8-digit customer numbers

---
 FS/bin/freeside-receivables-report | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/FS/bin/freeside-receivables-report b/FS/bin/freeside-receivables-report
index cef652bfe..c4d188c4e 100755
--- a/FS/bin/freeside-receivables-report
+++ b/FS/bin/freeside-receivables-report
@@ -91,7 +91,7 @@ foreach my $customer (@customers)
 
   if ($balance != 0) {
     $total += $balance;
-    push @buf, sprintf(qq{%5d %-32.32s %12s %9.2f},
+    push @buf, sprintf(qq{%8d %-32.32s %12s %9.2f},
       $custnum,
       $first . " " . $last . "   " . $company,
       $daytime,
@@ -183,7 +183,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-receivables-report,v 1.1 2002-02-22 23:18:32 jeff Exp $
+$Id: freeside-receivables-report,v 1.2 2002-03-05 09:44:09 ivan Exp $
 
 =head1 BUGS
 
@@ -203,7 +203,10 @@ L<FS::cust_main>, config.html from the base documentation
 griff@aver-computer.com July 99
 
 $Log: freeside-receivables-report,v $
-Revision 1.1  2002-02-22 23:18:32  jeff
+Revision 1.2  2002-03-05 09:44:09  ivan
+yes i have crazy customers with 8-digit customer numbers
+
+Revision 1.1  2002/02/22 23:18:32  jeff
 add some reporting features
 
 Revision 1.1  2000/09/20 19:25:19  jeff
-- 
cgit v1.2.1


From 6c2f4c44fc083bde9dd055bd4db51e65fa377379 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 5 Mar 2002 23:13:24 +0000
Subject: consistency is nice

---
 FS/bin/freeside-cc-receipts-report  | 127 +++++++++++------
 FS/bin/freeside-credit-report       | 135 +++++++++++-------
 FS/bin/freeside-receivables-report  |  15 +-
 FS/bin/freeside-tax-report          | 273 +++++++++++++++++++-----------------
 httemplate/search/report_cc.cgi     |   2 +-
 httemplate/search/report_credit.cgi |   2 +-
 httemplate/search/report_tax.cgi    |   2 +-
 7 files changed, 321 insertions(+), 235 deletions(-)

diff --git a/FS/bin/freeside-cc-receipts-report b/FS/bin/freeside-cc-receipts-report
index 2713af397..5ea8cc5cb 100755
--- a/FS/bin/freeside-cc-receipts-report
+++ b/FS/bin/freeside-cc-receipts-report
@@ -1,9 +1,11 @@
 #!/usr/bin/perl -Tw
 
+
 use strict;
 use Date::Parse;
 use Time::Local;
 use Getopt::Std;
+use Text::Template;
 use FS::Conf;
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearch qsearchs);
@@ -14,24 +16,24 @@ use FS::cust_pay_batch;
 my $mail_program = "/usr/sbin/sendmail -t -n"; 
 
 &untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_v $opt_p $opt_e $opt_d $opt_s);
-getopts("vped:s:");	#switches
+use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $opt_s $opt_f $report_lines $report_template @buf);
+getopts("vpmef:s:");	#switches
 
 #we're at now now (and later).
-my($_enddate)= $main::opt_d ? str2time($main::opt_d) : $^T;
-my($_startdate)= $main::opt_d ? str2time($main::opt_s) : $^T;
+my($_finishdate)= $opt_f ? str2time($main::opt_f) : $^T;
+my($_startdate)= $opt_s ? str2time($main::opt_s) : $^T;
 
 # Get the current month
 my ($ssec,$smin,$shour,$smday,$smon,$syear) =
 	(localtime($_startdate) )[0,1,2,3,4,5]; 
-$syear+=1900;
 $smon++;
+$syear += 1900;
 
 # Get the current month
-my ($esec,$emin,$ehour,$emday,$emon,$eyear) =
-	(localtime($_enddate) )[0,1,2,3,4,5]; 
-$eyear+=1900;
-$emon++;
+my ($fsec,$fmin,$fhour,$fmday,$fmon,$fyear) =
+	(localtime($_finishdate) )[0,1,2,3,4,5]; 
+$fmon++;
+$fyear += 1900;
 
 # Login to the database
 my $user = shift or die &usage;
@@ -41,6 +43,19 @@ adminsuidsetup $user;
 my $conf = new FS::Conf;
 my $lpr = $conf->config('lpr');
 my $email = $conf->config('email');
+my @report_template = $conf->config('report_template')
+  or die "cannot load config file report_template";
+$report_lines = 0;
+foreach ( grep /report_lines\(\d+\)/, @report_template ) { #kludgy :/
+  /report_lines\((\d+)\)/;
+  $report_lines += $1;
+}
+die "no report_lines() functions in template?" unless $report_lines;
+$report_template = new Text::Template (
+  TYPE   => 'ARRAY',
+  SOURCE => [ map "$_\n", @report_template ],
+) or die "can't create new Text::Template object: $Text::Template::ERROR";
+
 
 my(@cust_pays)=qsearch('cust_pay',{});
 if (scalar(@cust_pays) == 0)
@@ -50,15 +65,14 @@ if (scalar(@cust_pays) == 0)
 
 # Open print and email pipes
 # $lpr and opt_p for printing
-# $email and opt_e for email
+# $email and opt_m for email
 
 if ($lpr && $main::opt_p)
 {
         open(LPR, "|$lpr");
-        print LPR qq~ C R E D I T  C A R D  R E C E I P T S  for period beginning: $smon/$smday/$syear and ending $emon/$emday/$eyear\n\n~;
 }
 
-if ($email && $main::opt_e)
+if ($email && $main::opt_m)
 {
 	open (MAIL, "|$mail_program");
 	print MAIL <<END
@@ -67,8 +81,6 @@ From: Account Processor
 Subject: Receivables
 
 
-C R E D I T  C A R D  R E C E I P T S  for period beginning: $smon/$smday/$syear and ending $emon/$emday/$eyear
-
 END
 }
 
@@ -87,7 +99,7 @@ foreach my $cust_pay (@cust_pays)
 	my $payby = $cust_pay->getfield('payby');
 	
 
-	if ($_date >= $_startdate && $_date <= $_enddate && $payby =~ 'CARD') {
+	if ($_date >= $_startdate && $_date <= $_finishdate && $payby =~ 'CARD') {
 		$total += $paid;
 
 		$uninvoiced += $cust_pay->unapplied; 
@@ -131,31 +143,54 @@ foreach my $cust_pay (@cust_pays)
 
 }
 
-if ($main::opt_v) {
-	printf(qq{\n%25s%14.2f\n}, "Uninvoiced", $uninvoiced);
-	printf(qq{%25s%14.2f\n}, "Untaxed", $untaxed);
-	printf(qq{%25s%14.2f\n}, "Taxed", $taxed);
-	printf(qq{%25s%14.2f\n}, "Tax", $total_tax);
-	printf(qq{\n%39s\n%39.2f\n}, "=========", $total);
+push @buf, sprintf(qq{\n%25s%14.2f\n}, "Uninvoiced", $uninvoiced);
+push @buf, sprintf(qq{%25s%14.2f\n}, "Untaxed", $untaxed);
+push @buf, sprintf(qq{%25s%14.2f\n}, "Taxed", $taxed);
+push @buf, sprintf(qq{%25s%14.2f\n}, "Tax", $total_tax);
+push @buf, sprintf(qq{\n%39s\n%39.2f\n}, "=========", $total);
+
+sub FS::cc_receipts_report::_template::report_lines {
+  my $lines = shift;
+  map {
+    scalar(@buf) ? shift @buf : '' ;
+  }
+  ( 1 .. $lines );
 }
 
-# Now I need to close LPR and EMAIL if they were open
-if($lpr && $main::opt_p)
+$FS::cc_receipts_report::_template::title = qq~CREDIT CARD RECEIPTS for period $smon/$smday/$syear through $fmon/$fmday/$fyear~;
+$FS::cc_receipts_report::_template::title = $opt_t if $opt_t;
+$FS::cc_receipts_report::_template::page = 1;
+$FS::cc_receipts_report::_template::date = $^T;
+$FS::cc_receipts_report::_template::date = $^T;
+$FS::cc_receipts_report::_template::fdate = $_finishdate;
+$FS::cc_receipts_report::_template::fdate = $_finishdate;
+$FS::cc_receipts_report::_template::sdate = $_startdate;
+$FS::cc_receipts_report::_template::sdate = $_startdate;
+$FS::cc_receipts_report::_template::total_pages = 
+  int( scalar(@buf) / $report_lines);
+$FS::cc_receipts_report::_template::total_pages++ if scalar(@buf) % $report_lines;
+
+my @report;
+while (@buf) {
+  push @report, split("\n", 
+    $report_template->fill_in( PACKAGE => 'FS::cc_receipts_report::_template' )
+  );
+  $FS::cc_receipts_report::_template::page++;
+}
+
+if ($opt_v) {
+  print map "$_\n", @report;
+}
+if($lpr && $opt_p)
 {
-	printf(LPR qq{\n%25s%14.2f\n}, "Uninvoiced", $uninvoiced);
-	printf(LPR qq{%25s%14.2f\n}, "Untaxed", $untaxed);
-	printf(LPR qq{%25s%14.2f\n}, "Taxed", $taxed);
-	printf(LPR qq{%25s%14.2f\n}, "Tax", $total_tax);
-	printf(LPR qq{\n%39s\n%39.2f\n}, "=========", $total);
-	close LPR || die "Could not close printer: $lpr\n";
+  print LPR map "$_\n", @report;
+  print LPR "\f" if $opt_e;
+  close LPR || die "Could not close printer: $lpr\n";
 }
-if($email && $main::opt_e)
+if($email && $opt_m)
 {
-	printf(MAIL qq{\n%25s%14.2f\n}, "Untaxed", $untaxed);
-	printf(MAIL qq{%25s%14.2f\n}, "Taxed", $taxed);
-	printf(MAIL qq{%25s%14.2f\n}, "Tax", $total_tax);
-	printf(MAIL qq{\n%39s\n%39.2f\n}, "=========", $total);
-	close MAIL || die "Could not close printer: $email\n";
+  print MAIL map "$_\n", @report;
+  close MAIL || die "Could not close printer: $email\n";
 }
 
 
@@ -168,16 +203,16 @@ sub untaint_argv {
 }
 
 sub usage {
-  die "Usage:\n\n  freeside-tax-report [-v] [-p] [-e] user\n";
+  die "Usage:\n\n  freeside-cc-receipts-report [-v] [-p] [-e] user\n";
 }
 
 =head1 NAME
 
-freeside-tax-report - Prints or emails sales taxes invoiced in a given period.
+freeside-cc-receipts-report - Prints or emails total credit card receipts in a given period.
 
 =head1 SYNOPSIS
 
-  freeside-tax-report [-v] [-p] [-e] user
+  freeside-cc-receipts-report [-v] [-p] [-m] [-e] [-t "title"] [-s date] [-f date] user
 
 =head1 DESCRIPTION
 
@@ -187,13 +222,21 @@ Prints or emails sales taxes invoiced in a given period.
 
 -p: Print to printer lpr as found in the conf directory.
 
--e: Email output to user found in the Conf email file.
+-m: Email output to user found in the Conf email file.
+
+-e: Print a final form feed to the printer.
+
+-t: supply a title for the top of each page.
+
+-s: starting date for inclusion
+
+-f: final date for inclusion
 
 user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-cc-receipts-report,v 1.1 2002-02-22 23:18:32 jeff Exp $
+$Id: freeside-cc-receipts-report,v 1.2 2002-03-05 23:13:23 jeff Exp $
 
 =head1 BUGS
 
@@ -213,8 +256,8 @@ L<FS::cust_main>, config.html from the base documentation
 griff@aver-computer.com July 99
 
 $Log: freeside-cc-receipts-report,v $
-Revision 1.1  2002-02-22 23:18:32  jeff
-add some reporting features
+Revision 1.2  2002-03-05 23:13:23  jeff
+consistency is nice
 
 Revision 1.2  2002/02/19 14:24:53  jeff
 might be functional now
diff --git a/FS/bin/freeside-credit-report b/FS/bin/freeside-credit-report
index 4307a21b0..92931bcee 100755
--- a/FS/bin/freeside-credit-report
+++ b/FS/bin/freeside-credit-report
@@ -1,9 +1,11 @@
 #!/usr/bin/perl -Tw
 
+
 use strict;
 use Date::Parse;
 use Time::Local;
 use Getopt::Std;
+use Text::Template;
 use FS::Conf;
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearch);
@@ -13,24 +15,24 @@ use FS::cust_credit;
 my $mail_program = "/usr/sbin/sendmail -t -n"; 
 
 &untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_v $opt_p $opt_e $opt_d $opt_s);
-getopts("vped:s:");	#switches
+use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $opt_s $opt_f $report_lines $report_template @buf);
+getopts("vpmef:s:");	#switches
 
 #we're at now now (and later).
-my($_enddate)= $main::opt_d ? str2time($main::opt_d) : $^T;
-my($_startdate)= $main::opt_s ? str2time($main::opt_s) : $^T;
+my($_finishdate)= $opt_f ? str2time($main::opt_f) : $^T;
+my($_startdate)= $opt_s ? str2time($main::opt_s) : $^T;
 
 # Get the current month
 my ($ssec,$smin,$shour,$smday,$smon,$syear) =
 	(localtime($_startdate) )[0,1,2,3,4,5]; 
-$syear+=1900;
 $smon++;
+$syear += 1900;
 
 # Get the current month
-my ($esec,$emin,$ehour,$emday,$emon,$eyear) =
-	(localtime($_enddate) )[0,1,2,3,4,5]; 
-$eyear+=1900;
-$emon++;
+my ($fsec,$fmin,$fhour,$fmday,$fmon,$fyear) =
+	(localtime($_finishdate) )[0,1,2,3,4,5]; 
+$fmon++;
+$fyear += 1900;
 
 # Login to the database
 my $user = shift or die &usage;
@@ -40,6 +42,19 @@ adminsuidsetup $user;
 my $conf = new FS::Conf;
 my $lpr = $conf->config('lpr');
 my $email = $conf->config('email');
+my @report_template = $conf->config('report_template')
+  or die "cannot load config file report_template";
+$report_lines = 0;
+foreach ( grep /report_lines\(\d+\)/, @report_template ) { #kludgy :/
+  /report_lines\((\d+)\)/;
+  $report_lines += $1;
+}
+die "no report_lines() functions in template?" unless $report_lines;
+$report_template = new Text::Template (
+  TYPE   => 'ARRAY',
+  SOURCE => [ map "$_\n", @report_template ],
+) or die "can't create new Text::Template object: $Text::Template::ERROR";
+
 
 my(@cust_credits)=qsearch('cust_credit',{});
 if (scalar(@cust_credits) == 0)
@@ -49,15 +64,14 @@ if (scalar(@cust_credits) == 0)
 
 # Open print and email pipes
 # $lpr and opt_p for printing
-# $email and opt_e for email
+# $email and opt_m for email
 
 if ($lpr && $main::opt_p)
 {
         open(LPR, "|$lpr");
-        print LPR qq~ I N  H O U S E  C R E D I T S for period beginning: $smon/$smday/$syear and ending $emon/$emday/$eyear\n\n~;
 }
 
-if ($email && $main::opt_e)
+if ($email && $main::opt_m)
 {
 	open (MAIL, "|$mail_program");
 	print MAIL <<END
@@ -66,49 +80,71 @@ From: Account Processor
 Subject: In House Credits
 
 
-I N  H O U S E  C R E D I T S  for period beginning: $smon/$smday/$syear and ending $emon/$emday/$eyear
-
 END
 }
 
+my $uninvoiced = 0;
 my $total = 0;
+my $taxed = 0;
+my $untaxed = 0;
+my $total_tax = 0;
 
 # Now I can start looping
 foreach my $cust_credit (@cust_credits)
 {
 	my $_date = $cust_credit->getfield('_date');
 	my $amount = $cust_credit->getfield('amount');
-	my $credited = $cust_credit->getfield('credited');
-	
 
-	if ($_date >= $_startdate && $_date <= $_enddate) {
+	if ($_date >= $_startdate && $_date <= $_finishdate) {
 		$total += $amount;
-
-		my ($sec,$min,$hour,$mday,$mon,$year) =
-			(localtime($_date) )[0,1,2,3,4,5]; 
-		$mon++;
-
 	}
+}
 
+push @buf, sprintf(qq{\n%25s%14.2f\n}, "Credits Offered", $total);
+push @buf, sprintf(qq{\n%39s\n%39.2f\n}, "=========", $total);
+
+sub FS::credit_report::_template::report_lines {
+  my $lines = shift;
+  map {
+    scalar(@buf) ? shift @buf : '' ;
+  }
+  ( 1 .. $lines );
 }
 
-if ($main::opt_v) {
-	printf(qq{\n\n%25s%14.2f\n}, "Credits Offered", $total);
-	printf(qq{\n%39s\n%39.2f\n}, "=========", $total);
+$FS::credit_report::_template::title = qq~IN HOUSE CREDITS for $smon/$smday/$syear through $fmon/$fmday/$fyear~;
+$FS::credit_report::_template::title = $opt_t if $opt_t;
+$FS::credit_report::_template::page = 1;
+$FS::credit_report::_template::date = $^T;
+$FS::credit_report::_template::date = $^T;
+$FS::credit_report::_template::fdate = $_finishdate;
+$FS::credit_report::_template::fdate = $_finishdate;
+$FS::credit_report::_template::sdate = $_startdate;
+$FS::credit_report::_template::sdate = $_startdate;
+$FS::credit_report::_template::total_pages = 
+  int( scalar(@buf) / $report_lines);
+$FS::credit_report::_template::total_pages++ if scalar(@buf) % $report_lines;
+
+my @report;
+while (@buf) {
+  push @report, split("\n", 
+    $report_template->fill_in( PACKAGE => 'FS::credit_report::_template' )
+  );
+  $FS::credit_report::_template::page++;
 }
 
-# Now I need to close LPR and EMAIL if they were open
-if($lpr && $main::opt_p)
+if ($opt_v) {
+  print map "$_\n", @report;
+}
+if($lpr && $opt_p)
 {
-	printf(LPR qq{\n\n%25s%14.2f\n}, "Credits Offered", $total);
-	printf(LPR qq{\n%39s\n%39.2f\n}, "=========", $total);
-	close LPR || die "Could not close printer: $lpr\n";
+  print LPR map "$_\n", @report;
+  print LPR "\f" if $opt_e;
+  close LPR || die "Could not close printer: $lpr\n";
 }
-if($email && $main::opt_e)
+if($email && $opt_m)
 {
-	printf(MAIL qq{\n\n%25s%14.2f\n}, "Credits Offered", $total);
-	printf(MAIL qq{\n%39s\n%39.2f\n}, "=========", $total);
-	close MAIL || die "Could not close printer: $email\n";
+  print MAIL map "$_\n", @report;
+  close MAIL || die "Could not close printer: $email\n";
 }
 
 
@@ -126,27 +162,35 @@ sub usage {
 
 =head1 NAME
 
-freeside-credit-report - Prints or emails in house credits offered in a given period.
+freeside-credit-report - Prints or emails total credit memos in a given period.
 
 =head1 SYNOPSIS
 
-  freeside-credit-report [-v] [-p] [-e] user
+  freeside-credit-report [-v] [-p] [-m] [-e] [-t "title"] [-s date] [-f date] user
 
 =head1 DESCRIPTION
 
-Prints or emails in house credits offered in a given period.
+Prints or emails total credit memos in a given period.
 
 -v: Verbose - Prints records to STDOUT.
 
 -p: Print to printer lpr as found in the conf directory.
 
--e: Email output to user found in the Conf email file.
+-m: Email output to user found in the Conf email file.
+
+-e: Print a final form feed to the printer.
+
+-t: supply a title for the top of each page.
+
+-s: starting date for inclusion
+
+-f: final date for inclusion
 
 user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-credit-report,v 1.1 2002-02-22 23:18:32 jeff Exp $
+$Id: freeside-credit-report,v 1.2 2002-03-05 23:13:23 jeff Exp $
 
 =head1 BUGS
 
@@ -166,17 +210,8 @@ L<FS::cust_main>, config.html from the base documentation
 griff@aver-computer.com July 99
 
 $Log: freeside-credit-report,v $
-Revision 1.1  2002-02-22 23:18:32  jeff
-add some reporting features
-
-Revision 1.1  2002/02/19 14:24:53  jeff
-might be functional now
-
-Revision 1.1  2000/09/20 19:25:19  jeff
-local modifications
-
-Revision 1.1  2000/05/13 21:57:56  ivan
-add print_batch script from Joel Griffiths
+Revision 1.2  2002-03-05 23:13:23  jeff
+consistency is nice
 
 
 =cut
diff --git a/FS/bin/freeside-receivables-report b/FS/bin/freeside-receivables-report
index c4d188c4e..6d04ba94c 100755
--- a/FS/bin/freeside-receivables-report
+++ b/FS/bin/freeside-receivables-report
@@ -183,7 +183,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-receivables-report,v 1.2 2002-03-05 09:44:09 ivan Exp $
+$Id: freeside-receivables-report,v 1.3 2002-03-05 23:13:23 jeff Exp $
 
 =head1 BUGS
 
@@ -203,17 +203,8 @@ L<FS::cust_main>, config.html from the base documentation
 griff@aver-computer.com July 99
 
 $Log: freeside-receivables-report,v $
-Revision 1.2  2002-03-05 09:44:09  ivan
-yes i have crazy customers with 8-digit customer numbers
-
-Revision 1.1  2002/02/22 23:18:32  jeff
-add some reporting features
-
-Revision 1.1  2000/09/20 19:25:19  jeff
-local modifications
-
-Revision 1.1  2000/05/13 21:57:56  ivan
-add print_batch script from Joel Griffiths
+Revision 1.3  2002-03-05 23:13:23  jeff
+consistency is nice
 
 
 =cut
diff --git a/FS/bin/freeside-tax-report b/FS/bin/freeside-tax-report
index 334c4107b..080b4dfa7 100755
--- a/FS/bin/freeside-tax-report
+++ b/FS/bin/freeside-tax-report
@@ -1,39 +1,40 @@
 #!/usr/bin/perl -Tw
 
+
 use strict;
 use Date::Parse;
 use Time::Local;
 use Getopt::Std;
+use Text::Template;
 use FS::Conf;
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearch);
+use FS::cust_bill;
+use FS::cust_bill_pay;
 use FS::cust_pay;
-use FS::cust_pay_batch;
 
 # Set the mail program
 my $mail_program = "/usr/sbin/sendmail -t -n"; 
 
 &untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_v $opt_p $opt_e $opt_d $opt_s);
-getopts("vped:s:");	#switches
+use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $opt_s $opt_f $report_lines $report_template @buf);
+getopts("vpmef:s:");	#switches
 
 #we're at now now (and later).
-my($_enddate)= $main::opt_d ? str2time($main::opt_d) : $^T;
-my($_startdate)= $main::opt_s ? str2time($main::opt_s) : $^T;
+my($_finishdate)= $opt_f ? str2time($main::opt_f) : $^T;
+my($_startdate)= $opt_s ? str2time($main::opt_s) : $^T;
 
 # Get the current month
 my ($ssec,$smin,$shour,$smday,$smon,$syear) =
 	(localtime($_startdate) )[0,1,2,3,4,5]; 
 $smon++;
-$syear -= 100 if $syear >= 100;
-$syear = "0" . $syear if $syear < 10;
+$syear += 1900;
 
 # Get the current month
-my ($esec,$emin,$ehour,$emday,$emon,$eyear) =
-	(localtime($_enddate) )[0,1,2,3,4,5]; 
-$emon++;
-$eyear -= 100 if $eyear >= 100;
-$eyear = "0" . $eyear if $eyear < 10;
+my ($fsec,$fmin,$fhour,$fmday,$fmon,$fyear) =
+	(localtime($_finishdate) )[0,1,2,3,4,5]; 
+$fmon++;
+$fyear += 1900;
 
 # Login to the database
 my $user = shift or die &usage;
@@ -43,6 +44,19 @@ adminsuidsetup $user;
 my $conf = new FS::Conf;
 my $lpr = $conf->config('lpr');
 my $email = $conf->config('email');
+my @report_template = $conf->config('report_template')
+  or die "cannot load config file report_template";
+$report_lines = 0;
+foreach ( grep /report_lines\(\d+\)/, @report_template ) { #kludgy :/
+  /report_lines\((\d+)\)/;
+  $report_lines += $1;
+}
+die "no report_lines() functions in template?" unless $report_lines;
+$report_template = new Text::Template (
+  TYPE   => 'ARRAY',
+  SOURCE => [ map "$_\n", @report_template ],
+) or die "can't create new Text::Template object: $Text::Template::ERROR";
+
 
 my(@cust_bills)=qsearch('cust_bill',{});
 if (scalar(@cust_bills) == 0)
@@ -50,22 +64,16 @@ if (scalar(@cust_bills) == 0)
 	exit 1;
 }
 
-if ($main::opt_v)
-{
-        print qq~ S A L E S  T A X E S  I N V O I C E D  for period beginning: $smon/$smday/$syear and ending $emon/$emday/$eyear\n\n~;
-}
-
 # Open print and email pipes
 # $lpr and opt_p for printing
-# $email and opt_e for email
+# $email and opt_m for email
 
 if ($lpr && $main::opt_p)
 {
         open(LPR, "|$lpr");
-        print LPR qq~ S A L E S  T A X E S  I N V O I C E D  for period beginning: $smon/$smday/$syear and ending $emon/$emday/$eyear\n\n~;
 }
 
-if ($email && $main::opt_e)
+if ($email && $main::opt_m)
 {
 	open (MAIL, "|$mail_program");
 	print MAIL <<END
@@ -74,13 +82,11 @@ From: Account Processor
 Subject: Sales Taxes Invoiced
 
 
-S A L E S  T A X E S  I N V O I C E D  for period beginning: $smon/$smday/$syear and ending $emon/$emday/$eyear
-
 END
 }
 
-my $compped = 0;
-my $compped_tax = 0;
+my $comped = 0;
+my $comped_tax = 0;
 my $other = 0;
 my $other_tax = 0;
 my $total = 0;
@@ -94,104 +100,119 @@ foreach my $cust_bill (@cust_bills)
 	my $_date = $cust_bill->getfield('_date');
 	my $invnum = $cust_bill->getfield('invnum');
 	my $charged = $cust_bill->getfield('charged');
-	
 
-	if ($_date >= $_startdate && $_date <= $_enddate) {
+	if ($_date >= $_startdate && $_date <= $_finishdate) {
 		$total += $charged;
 
-		# The following lines were used to produce rather verbose reports
-		#my ($sec,$min,$hour,$mday,$mon,$year) =
-		#	(localtime($_date) )[0,1,2,3,4,5]; 
-		#$mon++;
-		#$year -= 100 if $year >= 100;
-		#$year = "0" . $year if $year < 10;
-
-		my $invoice_amt =0;
-		my $invoice_tax =0;
-		my $invoice_compped =0;
-		my(@cust_bill_pkgs)= $cust_bill->cust_bill_pkg;
-		foreach my $cust_bill_pkg (@cust_bill_pkgs) {
-
-			my $recur = $cust_bill_pkg->getfield('recur');
-			my $setup = $cust_bill_pkg->getfield('setup');
-			my $pkgnum = $cust_bill_pkg->getfield('pkgnum');
-			
-			if ($pkgnum == 0) {
-				# The following line was used to produce rather verbose reports
-				# printf(MAIL qq{\n%10s%15s%14.2f}, "$mon/$mday/$year", "Tax $invnum", $recur+$setup);
-				$invoice_tax += $recur;
-				$invoice_tax += $setup;
-			} else {
-				# The following line was used to produce rather verbose reports
-				# printf(MAIL qq{\n%10s%15s%14.2f}, "$mon/$mday/$year", "Inv $invnum", $recur+$setup);
-				$invoice_amt += $recur;
-				$invoice_amt += $setup;
-			}
-
-		}
-
-		my(@cust_bill_pays)= $cust_bill->cust_bill_pay;
-		foreach my $cust_bill_pay (@cust_bill_pays) {
-			my $payby = $cust_bill_pay->cust_pay->payby;
-			my $paid = $cust_bill_pay->getfield('amount');
-			if ($payby =~ 'COMP') {
-				$invoice_compped += $paid;
-			}
-		}
-
-		if (abs($invoice_compped - ($invoice_amt + $invoice_tax)) < 0.0001){
-			$compped += $invoice_amt;
-			$compped_tax += $invoice_tax;
-		} elsif ($invoice_compped > 0) {
-			printf(qq{\nInvoice %10d has inexpliciable complimentary payments of %14.9f\n}, $invnum, $invoice_compped);
-			$other += $invoice_amt;
-			$other_tax += $invoice_tax;
-		} elsif ($invoice_tax > 0) {
-			$total_tax += $invoice_tax;
-			$taxed += $invoice_amt;
-		} else {
-			$untaxed += $invoice_amt;
-		}
-
-	}
+                # The following lines were used to produce rather verbose reports
+                #my ($sec,$min,$hour,$mday,$mon,$year) =
+                #       (localtime($_date) )[0,1,2,3,4,5]; 
+                #$mon++;
+                #$year -= 100 if $year >= 100;
+                #$year = "0" . $year if $year < 10;
+
+                my $invoice_amt =0;
+                my $invoice_tax =0;
+                my $invoice_comped =0;
+                my(@cust_bill_pkgs)= $cust_bill->cust_bill_pkg;
+                foreach my $cust_bill_pkg (@cust_bill_pkgs) {
+
+                        my $recur = $cust_bill_pkg->getfield('recur');
+                        my $setup = $cust_bill_pkg->getfield('setup');
+                        my $pkgnum = $cust_bill_pkg->getfield('pkgnum');
+                        
+                        if ($pkgnum == 0) {
+                                # The following line was used to produce rather verbose reports
+                                # push @buf, ('', sprintf(qq{%10s%15s%14.2f}, "$mon/$mday/$year", "Tax $invnum", $recur+$setup));
+                                $invoice_tax += $recur;
+                                $invoice_tax += $setup;
+                        } else {
+                                # The following line was used to produce rather verbose reports
+                                # push @buf, ('', sprintf(qq{%10s%15s%14.2f}, "$mon/$mday/$year", "Inv $invnum", $recur+$setup));
+                                $invoice_amt += $recur;
+                                $invoice_amt += $setup;
+                        }
+
+                }
+
+                my(@cust_bill_pays)= $cust_bill->cust_bill_pay;
+                foreach my $cust_bill_pay (@cust_bill_pays) {
+                        my $payby = $cust_bill_pay->cust_pay->payby;
+                        my $paid = $cust_bill_pay->getfield('amount');
+                        if ($payby =~ 'COMP') {
+                                $invoice_comped += $paid;
+                        }
+                }
+
+                if (abs($invoice_comped - ($invoice_amt + $invoice_tax)) < 0.0001){
+                        $comped += $invoice_amt;
+                        $comped_tax += $invoice_tax;
+                } elsif ($invoice_comped > 0) {
+                        push @buf, sprintf(qq{\nInvoice %10d has inexpliciable complimentary payments of %14.9f\n}, $invnum, $invoice_comped);
+                        $other += $invoice_amt;
+                        $other_tax += $invoice_tax;
+                } elsif ($invoice_tax > 0) {
+                        $total_tax += $invoice_tax;
+                        $taxed += $invoice_amt;
+                } else {
+                        $untaxed += $invoice_amt;
+                }
+
+        }
 
 }
 
-if ($main::opt_v) {
-	printf(qq{\n\n%25s%14.2f\n}, "Complimentary", $compped);
-	printf(qq{%25s%14.2f\n}, "Complimentary Tax", $compped_tax);
-	printf(qq{%25s%14.2f\n}, "Other", $other);
-	printf(qq{%25s%14.2f\n}, "Other Tax", $other_tax);
-	printf(qq{%25s%14.2f\n}, "Untaxed", $untaxed);
-	printf(qq{%25s%14.2f\n}, "Taxed", $taxed);
-	printf(qq{%25s%14.2f\n}, "Tax", $total_tax);
-	printf(qq{\n%39s\n%39.2f\n}, "=========", $total);
+push @buf, ('', sprintf(qq{%25s%14.2f}, "Complimentary", $comped));
+push @buf, sprintf(qq{%25s%14.2f}, "Complimentary Tax", $comped_tax);
+push @buf, sprintf(qq{%25s%14.2f}, "Other", $other);
+push @buf, sprintf(qq{%25s%14.2f}, "Other Tax", $other_tax);
+push @buf, sprintf(qq{%25s%14.2f}, "Untaxed", $untaxed);
+push @buf, sprintf(qq{%25s%14.2f}, "Taxed", $taxed);
+push @buf, sprintf(qq{%25s%14.2f}, "Tax", $total_tax);
+push @buf, ('', sprintf(qq{%39s}, "========="), sprintf(qq{%39.2f}, $total));
+
+sub FS::tax_report::_template::report_lines {
+  my $lines = shift;
+  map {
+    scalar(@buf) ? shift @buf : '' ;
+  }
+  ( 1 .. $lines );
+}
+
+$FS::tax_report::_template::title = qq~SALES TAXES INVOICED for $smon/$smday/$syear through $fmon/$fmday/$fyear~;
+$FS::tax_report::_template::title = $opt_t if $opt_t;
+$FS::tax_report::_template::page = 1;
+$FS::tax_report::_template::date = $^T;
+$FS::tax_report::_template::date = $^T;
+$FS::tax_report::_template::fdate = $_finishdate;
+$FS::tax_report::_template::fdate = $_finishdate;
+$FS::tax_report::_template::sdate = $_startdate;
+$FS::tax_report::_template::sdate = $_startdate;
+$FS::tax_report::_template::total_pages = 
+  int( scalar(@buf) / $report_lines);
+$FS::tax_report::_template::total_pages++ if scalar(@buf) % $report_lines;
+
+my @report;
+while (@buf) {
+  push @report, split("\n", 
+    $report_template->fill_in( PACKAGE => 'FS::tax_report::_template' )
+  );
+  $FS::tax_report::_template::page++;
 }
 
-# Now I need to close LPR and EMAIL if they were open
-if($lpr && $main::opt_p)
+if ($opt_v) {
+  print map "$_\n", @report;
+}
+if($lpr && $opt_p)
 {
-	printf(LPR qq{\n\n%25s%14.2f\n}, "Complimentary", $compped);
-	printf(LPR qq{%25s%14.2f\n}, "Complimentary Tax", $compped_tax);
-	printf(LPR qq{%25s%14.2f\n}, "Other", $other);
-	printf(LPR qq{%25s%14.2f\n}, "Other Tax", $other_tax);
-	printf(LPR qq{%25s%14.2f\n}, "Untaxed", $untaxed);
-	printf(LPR qq{%25s%14.2f\n}, "Taxed", $taxed);
-	printf(LPR qq{%25s%14.2f\n}, "Tax", $total_tax);
-	printf(LPR qq{\n%39s\n%39.2f\n}, "=========", $total);
-	close LPR || die "Could not close printer: $lpr\n";
+  print LPR map "$_\n", @report;
+  print LPR "\f" if $opt_e;
+  close LPR || die "Could not close printer: $lpr\n";
 }
-if($email && $main::opt_e)
+if($email && $opt_m)
 {
-	printf(MAIL qq{\n\n%25s%14.2f\n}, "Complimentary", $compped);
-	printf(MAIL qq{%25s%14.2f\n}, "Complimentary Tax", $compped_tax);
-	printf(MAIL qq{%25s%14.2f\n}, "Other", $other);
-	printf(MAIL qq{%25s%14.2f\n}, "Other Tax", $other_tax);
-	printf(MAIL qq{%25s%14.2f\n}, "Untaxed", $untaxed);
-	printf(MAIL qq{%25s%14.2f\n}, "Taxed", $taxed);
-	printf(MAIL qq{%25s%14.2f\n}, "Tax", $total_tax);
-	printf(MAIL qq{\n%39s\n%39.2f\n}, "=========", $total);
-	close MAIL || die "Could not close printer: $email\n";
+  print MAIL map "$_\n", @report;
+  close MAIL || die "Could not close printer: $email\n";
 }
 
 
@@ -213,7 +234,7 @@ freeside-tax-report - Prints or emails sales taxes invoiced in a given period.
 
 =head1 SYNOPSIS
 
-  freeside-tax-report [-v] [-p] [-e] user
+  freeside-tax-report [-v] [-p] [-m] [-e] [-t "title"] [-s date] [-f date] user
 
 =head1 DESCRIPTION
 
@@ -223,13 +244,21 @@ Prints or emails sales taxes invoiced in a given period.
 
 -p: Print to printer lpr as found in the conf directory.
 
--e: Email output to user found in the Conf email file.
+-m: Email output to user found in the Conf email file.
+
+-e: Print a final form feed to the printer.
+
+-t: supply a title for the top of each page.
+
+-s: starting date for inclusion
+
+-f: final date for inclusion
 
 user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-tax-report,v 1.1 2002-02-22 23:18:32 jeff Exp $
+$Id: freeside-tax-report,v 1.2 2002-03-05 23:13:23 jeff Exp $
 
 =head1 BUGS
 
@@ -249,20 +278,8 @@ L<FS::cust_main>, config.html from the base documentation
 griff@aver-computer.com July 99
 
 $Log: freeside-tax-report,v $
-Revision 1.1  2002-02-22 23:18:32  jeff
-add some reporting features
-
-Revision 1.3  2002/02/19 14:24:53  jeff
-might be functional now
-
-Revision 1.2  2001/08/20 18:31:49  jeff
-before-merge-to-freeside_1_4_0-pre1
-
-Revision 1.1  2000/09/20 19:25:19  jeff
-local modifications
-
-Revision 1.1  2000/05/13 21:57:56  ivan
-add print_batch script from Joel Griffiths
+Revision 1.2  2002-03-05 23:13:23  jeff
+consistency is nice
 
 
 =cut
diff --git a/httemplate/search/report_cc.cgi b/httemplate/search/report_cc.cgi
index 128565fce..c2ab726b6 100755
--- a/httemplate/search/report_cc.cgi
+++ b/httemplate/search/report_cc.cgi
@@ -11,7 +11,7 @@ my $ending = $1;
 
 print header('Credit Card Recipt Report Results');
 
-open (REPORT, "freeside-cc-receipts-report -v -s $beginning -d $ending $user |");
+open (REPORT, "freeside-cc-receipts-report -v -s $beginning -f $ending $user |");
 
 print '<PRE>';
 while(<REPORT>) {
diff --git a/httemplate/search/report_credit.cgi b/httemplate/search/report_credit.cgi
index fac6c8d0f..2adafc06e 100755
--- a/httemplate/search/report_credit.cgi
+++ b/httemplate/search/report_credit.cgi
@@ -11,7 +11,7 @@ my $ending = $1;
 
 print header('In House Credit Report Results');
 
-open (REPORT, "freeside-credit-report -v -s $beginning -d $ending $user |");
+open (REPORT, "freeside-credit-report -v -s $beginning -f $ending $user |");
 
 print '<PRE>';
 while(<REPORT>) {
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 79aa65c9a..ac76fad6e 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -11,7 +11,7 @@ my $ending = $1;
 
 print header('Tax Report Results');
 
-open (REPORT, "freeside-tax-report -v -s $beginning -d $ending $user |");
+open (REPORT, "freeside-tax-report -v -s $beginning -f $ending $user |");
 
 print '<PRE>';
 while(<REPORT>) {
-- 
cgit v1.2.1


From 8fd504d36e02fd1ac3d0d5c9d6dc723fdb419aa1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 6 Mar 2002 00:17:32 +0000
Subject: remove CVS Log tag

---
 FS/bin/freeside-cc-receipts-report | 21 ++++-----------------
 FS/bin/freeside-credit-report      | 12 ++++--------
 FS/bin/freeside-receivables-report | 22 +++++++++-------------
 FS/bin/freeside-tax-report         | 12 ++++--------
 4 files changed, 21 insertions(+), 46 deletions(-)

diff --git a/FS/bin/freeside-cc-receipts-report b/FS/bin/freeside-cc-receipts-report
index 5ea8cc5cb..48075a888 100755
--- a/FS/bin/freeside-cc-receipts-report
+++ b/FS/bin/freeside-cc-receipts-report
@@ -236,7 +236,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-cc-receipts-report,v 1.2 2002-03-05 23:13:23 jeff Exp $
+$Id: freeside-cc-receipts-report,v 1.3 2002-03-06 00:17:32 ivan Exp $
 
 =head1 BUGS
 
@@ -251,24 +251,11 @@ for more information regarding this license.
 
 L<FS::cust_main>, config.html from the base documentation
 
-=head1 HISTORY
+=head1 AUTHOR
 
-griff@aver-computer.com July 99
-
-$Log: freeside-cc-receipts-report,v $
-Revision 1.2  2002-03-05 23:13:23  jeff
-consistency is nice
-
-Revision 1.2  2002/02/19 14:24:53  jeff
-might be functional now
-
-Revision 1.1  2000/09/20 19:25:19  jeff
-local modifications
-
-Revision 1.1  2000/05/13 21:57:56  ivan
-add print_batch script from Joel Griffiths
+Jeff Finucane <jeff@cmh.net>
 
+based on print-batch by Joel Griffiths <griff@aver-computer.com>
 
 =cut
 
-
diff --git a/FS/bin/freeside-credit-report b/FS/bin/freeside-credit-report
index 92931bcee..c73988321 100755
--- a/FS/bin/freeside-credit-report
+++ b/FS/bin/freeside-credit-report
@@ -190,7 +190,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-credit-report,v 1.2 2002-03-05 23:13:23 jeff Exp $
+$Id: freeside-credit-report,v 1.3 2002-03-06 00:17:32 ivan Exp $
 
 =head1 BUGS
 
@@ -205,15 +205,11 @@ for more information regarding this license.
 
 L<FS::cust_main>, config.html from the base documentation
 
-=head1 HISTORY
+=head1 AUTHOR
 
-griff@aver-computer.com July 99
-
-$Log: freeside-credit-report,v $
-Revision 1.2  2002-03-05 23:13:23  jeff
-consistency is nice
+Jeff Finucane <jeff@cmh.net>
 
+based on print-batch by Joel Griffiths <griff@aver-computer.com>
 
 =cut
 
-
diff --git a/FS/bin/freeside-receivables-report b/FS/bin/freeside-receivables-report
index 6d04ba94c..781e23b18 100755
--- a/FS/bin/freeside-receivables-report
+++ b/FS/bin/freeside-receivables-report
@@ -169,21 +169,21 @@ freeside-receivables-report - Prints or emails outstanding receivables.
 
 Prints or emails outstanding receivables
 
--v: Verbose - Prints records to STDOUT.
+B<-v>: Verbose - Prints records to STDOUT.
 
--p: Print to printer lpr as found in the conf directory.
+B<-p>: Print to printer lpr as found in the conf directory.
 
--m: Mail output to user found in the Conf email file.
+B<-m>: Mail output to user found in the Conf email file.
 
--e: Print a final form feed to the printer.
+B<-e>: Print a final form feed to the printer.
 
--t: supply a title for the top of each page.
+B<-t>: supply a title for the top of each page.
 
 user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-receivables-report,v 1.3 2002-03-05 23:13:23 jeff Exp $
+$Id: freeside-receivables-report,v 1.4 2002-03-06 00:17:32 ivan Exp $
 
 =head1 BUGS
 
@@ -198,15 +198,11 @@ for more information regarding this license.
 
 L<FS::cust_main>, config.html from the base documentation
 
-=head1 HISTORY
+=head1 AUTHOR
 
-griff@aver-computer.com July 99
-
-$Log: freeside-receivables-report,v $
-Revision 1.3  2002-03-05 23:13:23  jeff
-consistency is nice
+Jeff Finucane <jeff@cmh.net>
 
+based on print-batch by Joel Griffiths <griff@aver-computer.com>
 
 =cut
 
-
diff --git a/FS/bin/freeside-tax-report b/FS/bin/freeside-tax-report
index 080b4dfa7..ec4b99f81 100755
--- a/FS/bin/freeside-tax-report
+++ b/FS/bin/freeside-tax-report
@@ -258,7 +258,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-tax-report,v 1.2 2002-03-05 23:13:23 jeff Exp $
+$Id: freeside-tax-report,v 1.3 2002-03-06 00:17:32 ivan Exp $
 
 =head1 BUGS
 
@@ -273,15 +273,11 @@ for more information regarding this license.
 
 L<FS::cust_main>, config.html from the base documentation
 
-=head1 HISTORY
+=head1 AUTHOR
 
-griff@aver-computer.com July 99
-
-$Log: freeside-tax-report,v $
-Revision 1.2  2002-03-05 23:13:23  jeff
-consistency is nice
+Jeff Finucane <jeff@cmh.net>
 
+based on print-batch by Joel Griffiths <griff@aver-computer.com>
 
 =cut
 
-
-- 
cgit v1.2.1


From a6aa711eb82626bfab39902a6c4d785f3f533ef4 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Wed, 6 Mar 2002 22:44:14 +0000
Subject: billing expiration alerts

---
 FS/FS/Conf.pm                      |  15 +++
 FS/MANIFEST                        |   1 +
 FS/bin/freeside-expiration-alerter | 209 +++++++++++++++++++++++++++++++++++++
 README.1.4.0pre12                  |   2 +
 conf/alerter_template              |  20 ++++
 httemplate/docs/admin.html         |   6 ++
 6 files changed, 253 insertions(+)
 create mode 100755 FS/bin/freeside-expiration-alerter
 create mode 100644 conf/alerter_template

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 6fbd48732..e8686b575 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -190,6 +190,13 @@ httemplate/docs/config.html
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'alerter_template',
+    'section'     => 'billing',
+    'description' => 'Template file for billing method expiration alerts.  See the <a href="../docs/billing.html#invoice_template">billing documentation</a> for details.',
+    'type'        => 'textarea',
+  },
+
   {
     'key'         => 'apacheroot',
     'section'     => 'apache',
@@ -490,6 +497,14 @@ httemplate/docs/config.html
 #    'description' => 'Directory which contains domain registry information.  Each registry is a directory.',
 #  },
 
+  {
+    'key'         => 'report_template',
+    'section'     => 'required',
+    'description' => 'Required template file for reports.  See the <a href="../docs/billing.html">billing documentation</a> for details.',
+    'type'        => 'textarea',
+  },
+
+
   {
     'key'         => 'maxsearchrecordsperpage',
     'section'     => 'UI',
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 28edf59c3..c1aa5ef1a 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -15,6 +15,7 @@ bin/freeside-receivables-report
 bin/freeside-tax-report
 bin/freeside-cc-receipts-report
 bin/freeside-credit-report
+bin/freeside-expiration-alerter
 FS.pm
 FS/CGI.pm
 FS/Conf.pm
diff --git a/FS/bin/freeside-expiration-alerter b/FS/bin/freeside-expiration-alerter
new file mode 100755
index 000000000..c3dc37b31
--- /dev/null
+++ b/FS/bin/freeside-expiration-alerter
@@ -0,0 +1,209 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use Date::Format;
+use Time::Local;
+use Text::Template;
+use Getopt::Std;
+use FS::Conf;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch);
+use FS::cust_main;
+
+use vars qw($smtpmachine);
+
+#hush, perl!
+$FS::alerter::_template::first = "";
+$FS::alerter::_template::last = "";
+$FS::alerter::_template::company = "";
+$FS::alerter::_template::payby = "";
+$FS::alerter::_template::expdate = "";
+
+# Set the mail program  and other variables
+my $mail_program = "/usr/sbin/sendmail -t -n"; 
+my $mail_sender = "billing\@mydomain.tld"; 
+my $default_mail_recipient = "postmaster";
+my $warning_time = 30 * 24 * 60 * 60;
+my $urgent_time = 15 * 24 * 60 * 60;
+my $panic_time = 5 * 24 * 60 * 60;
+my $window_time = 24 * 60 * 60;
+
+&untaint_argv;	#what it sounds like  (eww)
+
+#we're at now now (and later).
+my($_date)= $^T;
+
+# Get the current month
+my ($sec,$min,$hour,$mday,$mon,$year) =
+	(localtime($_date) )[0,1,2,3,4,5]; 
+$mon++;
+
+# Login to the database
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+# Get the needed configuration files
+my $conf = new FS::Conf;
+$smtpmachine = $conf->config('smtpmachine');
+
+my(@customers)=qsearch('cust_main',{});
+if (scalar(@customers) == 0)
+{
+  exit 1;
+}
+
+# Open email pipe
+
+open (MAIL, "|$mail_program");
+print MAIL <<END
+To: $default_mail_recipient
+From: Account Processor
+Subject: Unnotified Billing Arrangement Expirations
+
+
+END
+
+;
+
+my @alerter_template = $conf->config('alerter_template')
+  or die "cannot load config file alerter_template";
+
+my $alerter = new Text::Template (TYPE => 'ARRAY', SOURCE => [ map "$_\n", @alerter_template ])
+  or die "can't create new Text::Template object:  Text::Template::ERROR";
+$alerter->compile() or die "can't compile template:  Text::Template::ERROR";
+
+# Now I can start looping
+foreach my $customer (@customers)
+{
+  my $custnum = $customer->getfield('custnum');
+  my $first = $customer->getfield('first');
+  my $last = $customer->getfield('last');
+  my $company = $customer->getfield('company');
+  my $payby = $customer->getfield('payby');
+  my $payinfo = $customer->getfield('payinfo');
+  my $paydate = $customer->getfield('paydate');
+  my $daytime = $customer->getfield('daytime');
+  my $night = $customer->getfield('night');
+	
+  my ($payyear,$paymonth,$payday) = split (/-/,$paydate);
+
+  my $expire_time = timelocal(0,0,0,$payday,--$paymonth,$payyear);
+
+  #credit cards expire at the end of the month/year of their exp date
+  if ($payby eq 'CARD') {
+    ($paymonth < 11) ? $paymonth++ : ($paymonth=0, $payyear++);
+    $expire_time = timelocal(0,0,0,$payday,$paymonth,$payyear);
+    $expire_time--;
+  }
+
+  if (($expire_time < $_date + $warning_time &&
+    $expire_time > $_date + $warning_time - $window_time) ||
+      ($expire_time < $_date + $urgent_time &&
+       $expire_time > $_date + $urgent_time - $window_time) ||
+      ($expire_time < $_date + $panic_time &&
+       $expire_time > $_date + $panic_time - $window_time)) {
+
+
+
+    my @packages = $customer->ncancelled_pkgs;
+    if (scalar(@packages) != 0) {
+      my @invoicing_list = $customer->invoicing_list;
+      if ( grep { $_ ne 'POST' } @invoicing_list ) { 
+        $ENV{SMTPHOSTS} = $smtpmachine;
+        $ENV{MAILADDRESS} = $mail_sender;
+        my $header = new Mail::Header ( [
+          "From: $mail_sender",
+          "To: ". join(', ', grep { $_ ne 'POST' } @invoicing_list ),
+          "Sender: $mail_sender",
+          "Reply-To: $mail_sender",
+          "Date: ". time2str("%a, %d %b %Y %X %z", time),
+          "Subject: Billing Arrangement Expiration",
+        ] );
+        $FS::alerter::_template::first = $first;
+        $FS::alerter::_template::last = $last;
+        $FS::alerter::_template::company = $company;
+        if ($payby eq 'CARD') {
+          $FS::alerter::_template::payby = "credit card (" .
+            substr($payinfo, 0, 2) . "xxxxxxxxxx" .
+            substr($payinfo, -4) . ")";
+        }elsif ($payby eq 'COMP') {
+          $FS::alerter::_template::payby = "complimentary account";
+        }else{
+          $FS::alerter::_template::payby = "current method";
+        }
+        $FS::alerter::_template::expdate = $expire_time;
+
+        my $message = new Mail::Internet (
+          'Header' => $header,
+          'Body' => [ $alerter->fill_in( PACKAGE => 'FS::alerter::_template' ) ],
+        );
+        $message->smtpsend or die "Can't send invoice email!: $!"; #die?  warn?
+
+      } elsif ( ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list ) { 
+        printf(MAIL qq{%5d %-32.32s %4s %10s %12s %12s\n},
+          $custnum,
+          $first . " " . $last . "   " . $company,
+          $payby,
+          $paydate,
+          $daytime,
+          $night);
+      }
+    }
+  }
+}
+
+# Now I need to close EMAIL
+close MAIL || die "Could not close printer: $default_mail_recipient\n";
+
+
+# subroutines
+sub untaint_argv {
+  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
+    $ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
+    $ARGV[$_]=$1;
+  }
+}
+
+sub usage {
+  die "Usage:\n\n  freeside-expiration-alerter user\n";
+}
+
+=head1 NAME
+
+freeside-expiration-alerter - Emails notifications of credit card expirations.
+
+=head1 SYNOPSIS
+
+  freeside-expiration-alerter user
+
+=head1 DESCRIPTION
+
+Emails customers notice that their credit card or other billing arrangement
+is about to expire.  Usually run as a cron job.
+
+user: From the mapsecrets file - see config.html from the base documentation
+
+=head1 VERSION
+
+$Id: freeside-expiration-alerter,v 1.1 2002-03-06 22:44:13 jeff Exp $
+
+=head1 BUGS
+
+Yes..... Use at your own risk. No guarantees or warrantees of any
+kind apply to this program. Parts of this program are hacked from
+other GNU licensed software created mainly by Ivan Kohler.
+
+This is released under the GNU Public License. See www.gnu.org
+for more information regarding this license.
+
+=head1 SEE ALSO
+
+L<FS::cust_main>, config.html from the base documentation
+
+=head1 AUTHOR
+
+Jeff Finucane <jeff@cmh.net>
+
+=cut
+
+
diff --git a/README.1.4.0pre12 b/README.1.4.0pre12
index aba8b7a37..0b453a4e4 100644
--- a/README.1.4.0pre12
+++ b/README.1.4.0pre12
@@ -19,5 +19,7 @@ Run bin/create-history-tables
 
 Run bin/dbdef-create again
 
+Arrange for freeside-expiration-alerter to be run daily, if desired.
+
 Restart Apache and freeside-queued
 
diff --git a/conf/alerter_template b/conf/alerter_template
new file mode 100644
index 000000000..4d8a012ef
--- /dev/null
+++ b/conf/alerter_template
@@ -0,0 +1,20 @@
+
+
+Ivan Kohler
+1339 Hayes St.
+San Francisco, CA  94117
+
+
+{ $first; } { $last; }:
+
+  We thank you for your continuing patronage.  This notice is to remind you
+that your { $payby } used to pay SISD.COM for Internet
+service will expire on { use Date::Format; time2str("%x", $expdate); }.  Please provide us with new billing
+information so that we may continue your service uninterrupted.
+
+Very Truly Yours,
+
+  SISD Service Team
+
+
+
diff --git a/httemplate/docs/admin.html b/httemplate/docs/admin.html
index 16d492095..64da760f3 100755
--- a/httemplate/docs/admin.html
+++ b/httemplate/docs/admin.html
@@ -70,6 +70,12 @@
   information for your locales by clicking on the <u>View/Edit locales and tax
   rates</b> on the main menu.
 
+  <li>If you would like Freeside to notify your customers when their credit
+  cards and other billing arrangements are about to expire, arrange for
+  <b>freeside-expiration-alerter</b> to be run daily by cron or similar
+  facility.  The message it sends can be configured from the
+  <u>Configuration</u> choice of the main menu as <u>alerter_template</u>.
+
 </ul>
 </body>
 </html>
-- 
cgit v1.2.1


From 871947fde1e738eb6edadc39fc5fa7029060515a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 6 Mar 2002 23:31:24 +0000
Subject: add freeside-expiration-alerter to upgrade8.html

---
 httemplate/docs/upgrade8.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 874a9de7e..4b0c493f0 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -313,5 +313,10 @@ ALTER TABLE cust_refund DROP COLUMN crednum;
   <li>freeside-queued was installed with the Perl modules.  Start it now and ensure that is run upon system startup.
   <li>Set appropriate <a href="../browse/part_bill_event.cgi">invoice events</a> for your site.  At the very least, you'll want to set some invoice events "<i>After 0 days</i>": a <i>BILL</i> invoice event to print invoices, a <i>CARD</i> invoice event to batch or run cards real-time, and a <i>COMP</i> invoice event to "pay" complimentary customers.  If you were using the <i>-i</i> option to <a href="man/bin/freeside-bill.html">freeside-bill</a> it should be removed.
   <li>Use <a href="man/bin/freeside-daily.html">freeside-daily</a> instead of <a href="man/bin/freeside-bill.html">freeside-bill</a>.
+  <li>If you would like Freeside to notify your customers when their credit
+  cards and other billing arrangements are about to expire, arrange for
+  <b>freeside-expiration-alerter</b> to be run daily by cron or similar
+  facility.  The message it sends can be configured from the
+  <u>Configuration</u> choice of the main menu as <u>alerter_template</u>.
 </ul>
 </body>
-- 
cgit v1.2.1


From 1276050d030fdbbb7166f0b6de96fa4e935c81ae Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 6 Mar 2002 23:32:08 +0000
Subject: oops, missing invoice_from

---
 conf/invoice_from | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conf/invoice_from

diff --git a/conf/invoice_from b/conf/invoice_from
new file mode 100644
index 000000000..110ec8f41
--- /dev/null
+++ b/conf/invoice_from
@@ -0,0 +1 @@
+ivan-unconfigured-freeside-installation@420.am
-- 
cgit v1.2.1


From 9208e850bf047eb4a4438ad3958b7891370d2cb1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 7 Mar 2002 14:10:10 +0000
Subject: *** empty log message ***

---
 FS/FS/cust_bill.pm          | 15 ++++----
 FS/FS/part_export.pm        | 87 ++++++++++++++++++++++++++++++++++++++++++---
 FS/FS/part_export_option.pm |  4 +--
 FS/FS/queue.pm              |  3 +-
 4 files changed, 95 insertions(+), 14 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 1ec9298f0..6de88cc38 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -388,7 +388,7 @@ sub send {
   #my @print_text = $cust_bill->print_text; #( date )
   my @invoicing_list = $self->cust_main->invoicing_list;
   if ( grep { $_ ne 'POST' } @invoicing_list ) { #email invoice
-    $ENV{SMTPHOSTS} = $smtpmachine;
+    #$ENV{SMTPHOSTS} = $smtpmachine;
     $ENV{MAILADDRESS} = $invoice_from;
     my $header = new Mail::Header ( [
       "From: $invoice_from",
@@ -401,11 +401,14 @@ sub send {
     my $message = new Mail::Internet (
       'Header' => $header,
       'Body' => [ $self->print_text ], #( date)
+      #'Debug' => 1,
     );
-    $message->smtpsend
-      or return "(customer # ". $self->custnum. ") can't send invoice email".
-                " for ". join(', ', grep { $_ ne 'POST' } @invoicing_list ).
-                " to server $smtpmachine!";
+    $!=0;
+    $message->smtpsend( Host => $smtpmachine )
+      or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
+        or return "(customer # ". $self->custnum. ") can't send invoice email".
+                  " to ". join(', ', grep { $_ ne 'POST' } @invoicing_list ).
+                  " via server $smtpmachine with SMTP: $!";
 
   #} elsif ( grep { $_ eq 'POST' } @invoicing_list ) {
   } elsif ( ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list ) {
@@ -880,7 +883,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.20 2002-02-26 09:06:51 ivan Exp $
+$Id: cust_bill.pm,v 1.21 2002-03-07 14:10:10 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 67371bc3b..a0de03b63 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -2,8 +2,9 @@ package FS::part_export;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
+use FS::Record qw( qsearch qsearchs dbh );
 use FS::part_svc;
+use FS::part_export_option;
 
 @ISA = qw(FS::Record);
 
@@ -18,7 +19,10 @@ FS::part_export - Object methods for part_export records
   $record = new FS::part_export \%hash;
   $record = new FS::part_export { 'column' => 'value' };
 
-  $error = $record->insert;
+  ($new_record, $options) = $template_recored->clone( $svcpart );
+
+  $error = $record->insert( { 'option' => 'value' } );
+  $error = $record->insert( \$options );
 
   $error = $new_record->replace($old_record);
 
@@ -34,7 +38,7 @@ fields are currently supported:
 
 =over 4
 
-=item eventpart - primary key
+=item exportnum - primary key
 
 =item svcpart - Service definition (see L<FS::part_svc>) to which this export applies
 
@@ -63,14 +67,76 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 sub table { 'part_export'; }
 
-=item insert
+=item clone SVCPART
+
+An alternate constructor.  Creates a new export by duplicating an existing
+export.  The given svcpart is assigned to the new export.
+
+Returns a list consisting of the new export object and a hashref of options.
+
+=cut
+
+sub clone {
+  my $self = shift;
+  my $class = ref($self);
+  my %hash = $self->hash;
+  $hash{'exportnum'} = '';
+  $hash{'svcpart'} = shift;
+  ( $class->new( \%hash ),
+    { map { $_->optionname => $_->optionvalue }
+        qsearch('part_export_option', { 'exportnum' => $self->exportnum } )
+    }
+  );
+}
+
+=item insert HASHREF
 
 Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
 
+If a hash reference of options is supplied, part_export_option records are
+created (see L<FS::part_export_option>).
+
 =cut
 
-# the insert method can be inherited from FS::Record
+#false laziness w/queue.pm
+sub insert {
+  my $self = shift;
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  my $options = shift;
+  foreach my $optionname ( keys %{$options} ) {
+    my $part_export_option = new FS::part_export_option ( {
+      'optionname'  => $optionname,
+      'optionvalue' => $options->{$optionname},
+    } );
+    $error = $part_export_option->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+
+};
 
 =item delete
 
@@ -121,6 +187,17 @@ sub check {
   ''; #no error
 }
 
+=item part_svc
+
+Returns the service definition (see L<FS::part_svc>) for this export.
+
+=cut
+
+sub part_svc {
+  my $self = shift;
+  qsearchs('part_svc', { svcpart => $self->svcpart } );
+}
+
 =back
 
 =head1 BUGS
diff --git a/FS/FS/part_export_option.pm b/FS/FS/part_export_option.pm
index 4ce70b4cd..1ce0de65f 100644
--- a/FS/FS/part_export_option.pm
+++ b/FS/FS/part_export_option.pm
@@ -38,7 +38,7 @@ currently supported:
 
 =item exportnum - export (see L<FS::part_export>)
 
-=item option - option name
+=item optionname - option name
 
 =item opeionvalue - option value
 
@@ -105,7 +105,7 @@ sub check {
   my $error = 
     $self->ut_numbern('optionnum')
     || $self->ut_number('exportnum')
-    || $self->ut_alpha('option')
+    || $self->ut_alpha('optionname')
     || $self->ut_textn('optionvalue')
   ;
   return $error if $error;
diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index 3260de20d..a6d78e143 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -78,6 +78,7 @@ created (see L<FS::queue_arg>).
 
 =cut
 
+#false laziness w/part_export.pm
 sub insert {
   my $self = shift;
 
@@ -289,7 +290,7 @@ END
 
 =head1 VERSION
 
-$Id: queue.pm,v 1.6 2002-02-22 06:42:28 ivan Exp $
+$Id: queue.pm,v 1.7 2002-03-07 14:10:10 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 64ed7b8c527bcf3e689a3f61fcdb8b4185460936 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 7 Mar 2002 14:13:21 +0000
Subject: better error msgs for mail errors

---
 FS/FS/cust_bill.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 6de88cc38..c3524b984 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -401,7 +401,6 @@ sub send {
     my $message = new Mail::Internet (
       'Header' => $header,
       'Body' => [ $self->print_text ], #( date)
-      #'Debug' => 1,
     );
     $!=0;
     $message->smtpsend( Host => $smtpmachine )
@@ -883,7 +882,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.21 2002-03-07 14:10:10 ivan Exp $
+$Id: cust_bill.pm,v 1.22 2002-03-07 14:13:21 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 3e2e5fecb9ef3cf39a6ac098aacb76763edd3938 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Thu, 7 Mar 2002 19:50:24 +0000
Subject: less shelling, more perly - abolish some pipes to sendmail

---
 FS/bin/freeside-cc-receipts-report | 37 ++++++++++++++---------
 FS/bin/freeside-credit-report      | 37 ++++++++++++++---------
 FS/bin/freeside-expiration-alerter | 60 +++++++++++++++++++++++---------------
 FS/bin/freeside-receivables-report | 37 ++++++++++++++---------
 FS/bin/freeside-tax-report         | 37 ++++++++++++++---------
 5 files changed, 129 insertions(+), 79 deletions(-)

diff --git a/FS/bin/freeside-cc-receipts-report b/FS/bin/freeside-cc-receipts-report
index 48075a888..06e3aba81 100755
--- a/FS/bin/freeside-cc-receipts-report
+++ b/FS/bin/freeside-cc-receipts-report
@@ -6,17 +6,18 @@ use Date::Parse;
 use Time::Local;
 use Getopt::Std;
 use Text::Template;
+use Net::SMTP;
+use Mail::Header;
+use Mail::Internet;
 use FS::Conf;
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::cust_pay;
 use FS::cust_pay_batch;
 
-# Set the mail program
-my $mail_program = "/usr/sbin/sendmail -t -n"; 
 
 &untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $opt_s $opt_f $report_lines $report_template @buf);
+use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $opt_s $opt_f $report_lines $report_template @buf $header);
 getopts("vpmef:s:");	#switches
 
 #we're at now now (and later).
@@ -43,6 +44,9 @@ adminsuidsetup $user;
 my $conf = new FS::Conf;
 my $lpr = $conf->config('lpr');
 my $email = $conf->config('email');
+my $smtpmachine = $conf->config('smtpmachine');
+my $mail_sender = $conf->exists('invoice_from') ? $conf->config('invoice_from') :
+  'postmaster';
 my @report_template = $conf->config('report_template')
   or die "cannot load config file report_template";
 $report_lines = 0;
@@ -74,14 +78,14 @@ if ($lpr && $main::opt_p)
 
 if ($email && $main::opt_m)
 {
-	open (MAIL, "|$mail_program");
-	print MAIL <<END
-To: $email
-From: Account Processor
-Subject: Receivables
-
-
-END
+  $ENV{MAILADDRESS} = $mail_sender;
+  $header = new Mail::Header ( [
+    "From: Account Processor",
+    "To: $email",
+    "Sender: $mail_sender",
+    "Reply-To: $mail_sender",
+    "Subject: Credit Card Receipts",
+  ] );
 }
 
 my $uninvoiced = 0;
@@ -189,8 +193,13 @@ if($lpr && $opt_p)
 }
 if($email && $opt_m)
 {
-  print MAIL map "$_\n", @report;
-  close MAIL || die "Could not close printer: $email\n";
+  my $message = new Mail::Internet (
+    'Header' => $header,
+    'Body' => [ (@report) ],
+  );
+  $!=0;
+  $message->smtpsend( Host => "$smtpmachine" )
+    or die "can't send report to $email via $smtpmachine: $!";
 }
 
 
@@ -236,7 +245,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-cc-receipts-report,v 1.3 2002-03-06 00:17:32 ivan Exp $
+$Id: freeside-cc-receipts-report,v 1.4 2002-03-07 19:50:23 jeff Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-credit-report b/FS/bin/freeside-credit-report
index c73988321..7699daf4d 100755
--- a/FS/bin/freeside-credit-report
+++ b/FS/bin/freeside-credit-report
@@ -6,16 +6,17 @@ use Date::Parse;
 use Time::Local;
 use Getopt::Std;
 use Text::Template;
+use Net::SMTP;
+use Mail::Header;
+use Mail::Internet;
 use FS::Conf;
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearch);
 use FS::cust_credit;
 
-# Set the mail program
-my $mail_program = "/usr/sbin/sendmail -t -n"; 
 
 &untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $opt_s $opt_f $report_lines $report_template @buf);
+use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $opt_s $opt_f $report_lines $report_template @buf $header);
 getopts("vpmef:s:");	#switches
 
 #we're at now now (and later).
@@ -42,6 +43,9 @@ adminsuidsetup $user;
 my $conf = new FS::Conf;
 my $lpr = $conf->config('lpr');
 my $email = $conf->config('email');
+my $smtpmachine = $conf->config('smtpmachine');
+my $mail_sender = $conf->exists('invoice_from') ? $conf->config('invoice_from') :
+  'postmaster';
 my @report_template = $conf->config('report_template')
   or die "cannot load config file report_template";
 $report_lines = 0;
@@ -73,14 +77,14 @@ if ($lpr && $main::opt_p)
 
 if ($email && $main::opt_m)
 {
-	open (MAIL, "|$mail_program");
-	print MAIL <<END
-To: $email
-From: Account Processor
-Subject: In House Credits
-
-
-END
+  $ENV{MAILADDRESS} = $mail_sender;
+  $header = new Mail::Header ( [
+    "From: Account Processor",
+    "To: $email",
+    "Sender: $mail_sender",
+    "Reply-To: $mail_sender",
+    "Subject: In House Credits",
+  ] );
 }
 
 my $uninvoiced = 0;
@@ -143,8 +147,13 @@ if($lpr && $opt_p)
 }
 if($email && $opt_m)
 {
-  print MAIL map "$_\n", @report;
-  close MAIL || die "Could not close printer: $email\n";
+  my $message = new Mail::Internet (
+    'Header' => $header,
+    'Body' => [ (@report) ],
+  );
+  $!=0;
+  $message->smtpsend( Host => "$smtpmachine" )
+    or die "can't send report to $email via $smtpmachine: $!";
 }
 
 
@@ -190,7 +199,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-credit-report,v 1.3 2002-03-06 00:17:32 ivan Exp $
+$Id: freeside-credit-report,v 1.4 2002-03-07 19:50:24 jeff Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-expiration-alerter b/FS/bin/freeside-expiration-alerter
index c3dc37b31..365b96467 100755
--- a/FS/bin/freeside-expiration-alerter
+++ b/FS/bin/freeside-expiration-alerter
@@ -5,12 +5,15 @@ use Date::Format;
 use Time::Local;
 use Text::Template;
 use Getopt::Std;
+use Net::SMTP;
+use Mail::Header;
+use Mail::Internet;
 use FS::Conf;
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearch);
 use FS::cust_main;
 
-use vars qw($smtpmachine);
+use vars qw($smtpmachine @body);
 
 #hush, perl!
 $FS::alerter::_template::first = "";
@@ -20,9 +23,8 @@ $FS::alerter::_template::payby = "";
 $FS::alerter::_template::expdate = "";
 
 # Set the mail program  and other variables
-my $mail_program = "/usr/sbin/sendmail -t -n"; 
-my $mail_sender = "billing\@mydomain.tld"; 
-my $default_mail_recipient = "postmaster";
+my $mail_sender = "billing\@mydomain.tld";  # or invoice_from if available
+my $failure_recipient = "postmaster";       # or invoice_from if available
 my $warning_time = 30 * 24 * 60 * 60;
 my $urgent_time = 15 * 24 * 60 * 60;
 my $panic_time = 5 * 24 * 60 * 60;
@@ -45,6 +47,11 @@ adminsuidsetup $user;
 # Get the needed configuration files
 my $conf = new FS::Conf;
 $smtpmachine = $conf->config('smtpmachine');
+$mail_sender = $conf->config('invoice_from')
+  if $conf->exists('invoice_from');
+$failure_recipient = $conf->config('invoice_from')
+  if $conf->exists('invoice_from');
+
 
 my(@customers)=qsearch('cust_main',{});
 if (scalar(@customers) == 0)
@@ -52,18 +59,16 @@ if (scalar(@customers) == 0)
   exit 1;
 }
 
-# Open email pipe
-
-open (MAIL, "|$mail_program");
-print MAIL <<END
-To: $default_mail_recipient
-From: Account Processor
-Subject: Unnotified Billing Arrangement Expirations
-
+# Prepare for sending email
 
-END
-
-;
+$ENV{MAILADDRESS} = $mail_sender;
+my $header = new Mail::Header ( [
+  "From: Account Processor",
+  "To: $failure_recipient",
+  "Sender: $mail_sender",
+  "Reply-To: $mail_sender",
+  "Subject: Unnotified Billing Arrangement Expirations",
+] );
 
 my @alerter_template = $conf->config('alerter_template')
   or die "cannot load config file alerter_template";
@@ -109,8 +114,6 @@ foreach my $customer (@customers)
     if (scalar(@packages) != 0) {
       my @invoicing_list = $customer->invoicing_list;
       if ( grep { $_ ne 'POST' } @invoicing_list ) { 
-        $ENV{SMTPHOSTS} = $smtpmachine;
-        $ENV{MAILADDRESS} = $mail_sender;
         my $header = new Mail::Header ( [
           "From: $mail_sender",
           "To: ". join(', ', grep { $_ ne 'POST' } @invoicing_list ),
@@ -137,10 +140,12 @@ foreach my $customer (@customers)
           'Header' => $header,
           'Body' => [ $alerter->fill_in( PACKAGE => 'FS::alerter::_template' ) ],
         );
-        $message->smtpsend or die "Can't send invoice email!: $!"; #die?  warn?
+        $!=0;
+        $message->smtpsend( Host => $smtpmachine )
+          or die "Can't send expiration email!: $!"; #die?  warn?
 
       } elsif ( ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list ) { 
-        printf(MAIL qq{%5d %-32.32s %4s %10s %12s %12s\n},
+        push @body, sprintf(qq{%5d %-32.32s %4s %10s %12s %12s},
           $custnum,
           $first . " " . $last . "   " . $company,
           $payby,
@@ -152,9 +157,18 @@ foreach my $customer (@customers)
   }
 }
 
-# Now I need to close EMAIL
-close MAIL || die "Could not close printer: $default_mail_recipient\n";
-
+# Now I need to send EMAIL
+if (scalar(@body)) {
+  my $message = new Mail::Internet (
+    'Header' => $header,
+    'Body' => [ (@body) ],
+  );
+  $!=0;
+  $message->smtpsend( Host => $smtpmachine )
+    or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
+      or return "can't send alerter failure email to $failure_recipient".
+              " via server $smtpmachine with SMTP: $!";
+}
 
 # subroutines
 sub untaint_argv {
@@ -185,7 +199,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-expiration-alerter,v 1.1 2002-03-06 22:44:13 jeff Exp $
+$Id: freeside-expiration-alerter,v 1.2 2002-03-07 19:50:24 jeff Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-receivables-report b/FS/bin/freeside-receivables-report
index 781e23b18..b5a49031e 100755
--- a/FS/bin/freeside-receivables-report
+++ b/FS/bin/freeside-receivables-report
@@ -5,16 +5,17 @@ use Date::Parse;
 use Time::Local;
 use Getopt::Std;
 use Text::Template;
+use Net::SMTP;
+use Mail::Header;
+use Mail::Internet;
 use FS::Conf;
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearch);
 use FS::cust_main;
 
-# Set the mail program
-my $mail_program = "/usr/sbin/sendmail -t -n"; 
 
 &untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $report_lines $report_template @buf);
+use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $report_lines $report_template @buf $header);
 getopts("vpmet:");	#switches
 
 #we're at now now (and later).
@@ -34,6 +35,9 @@ adminsuidsetup $user;
 my $conf = new FS::Conf;
 my $lpr = $conf->config('lpr');
 my $email = $conf->config('email');
+my $smtpmachine = $conf->config('smtpmachine');
+my $mail_sender = $conf->exists('invoice_from') ? $conf->config('invoice_from') :
+  'postmaster';
 my @report_template = $conf->config('report_template')
   or die "cannot load config file report_template";
 $report_lines = 0;
@@ -65,14 +69,14 @@ if ($lpr && $opt_p)
 
 if ($email && $opt_m)
 {
-	open (MAIL, "|$mail_program");
-	print MAIL <<END
-To: $email
-From: Account Processor
-Subject: Receivables
-
-
-END
+  $ENV{MAILADDRESS} = $mail_sender;
+  $header = new Mail::Header ( [
+    "From: Account Processor",
+    "To: $email",
+    "Sender: $mail_sender",
+    "Reply-To: $mail_sender",
+    "Subject: Receivables",
+  ] );
 }
 
 my $total = 0;
@@ -139,8 +143,13 @@ if($lpr && $opt_p)
 }
 if($email && $opt_m)
 {
-  print MAIL map "$_\n", @report;
-  close MAIL || die "Could not close printer: $email\n";
+  my $message = new Mail::Internet (
+    'Header' => $header,
+    'Body' => [ (@report) ],
+  );
+  $!=0;
+  $message->smtpsend( Host => "$smtpmachine" )
+    or die "can't send report to $email via $smtpmachine: $!";
 }
 
 
@@ -183,7 +192,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-receivables-report,v 1.4 2002-03-06 00:17:32 ivan Exp $
+$Id: freeside-receivables-report,v 1.5 2002-03-07 19:50:24 jeff Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-tax-report b/FS/bin/freeside-tax-report
index ec4b99f81..8d5021358 100755
--- a/FS/bin/freeside-tax-report
+++ b/FS/bin/freeside-tax-report
@@ -6,6 +6,9 @@ use Date::Parse;
 use Time::Local;
 use Getopt::Std;
 use Text::Template;
+use Net::SMTP;
+use Mail::Header;
+use Mail::Internet;
 use FS::Conf;
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearch);
@@ -13,11 +16,9 @@ use FS::cust_bill;
 use FS::cust_bill_pay;
 use FS::cust_pay;
 
-# Set the mail program
-my $mail_program = "/usr/sbin/sendmail -t -n"; 
 
 &untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $opt_s $opt_f $report_lines $report_template @buf);
+use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $opt_s $opt_f $report_lines $report_template @buf $header);
 getopts("vpmef:s:");	#switches
 
 #we're at now now (and later).
@@ -44,6 +45,9 @@ adminsuidsetup $user;
 my $conf = new FS::Conf;
 my $lpr = $conf->config('lpr');
 my $email = $conf->config('email');
+my $smtpmachine = $conf->config('smtpmachine');
+my $mail_sender = $conf->exists('invoice_from') ? $conf->config('invoice_from') :
+  'postmaster';
 my @report_template = $conf->config('report_template')
   or die "cannot load config file report_template";
 $report_lines = 0;
@@ -75,14 +79,14 @@ if ($lpr && $main::opt_p)
 
 if ($email && $main::opt_m)
 {
-	open (MAIL, "|$mail_program");
-	print MAIL <<END
-To: $email
-From: Account Processor
-Subject: Sales Taxes Invoiced
-
-
-END
+  $ENV{MAILADDRESS} = $mail_sender;
+  $header = new Mail::Header ( [
+    "From: Account Processor",
+    "To: $email",
+    "Sender: $mail_sender",
+    "Reply-To: $mail_sender",
+    "Subject: Sales Taxes Invoiced",
+  ] );
 }
 
 my $comped = 0;
@@ -211,8 +215,13 @@ if($lpr && $opt_p)
 }
 if($email && $opt_m)
 {
-  print MAIL map "$_\n", @report;
-  close MAIL || die "Could not close printer: $email\n";
+  my $message = new Mail::Internet (
+    'Header' => $header,
+    'Body' => [ (@report) ],
+  );
+  $!=0;
+  $message->smtpsend( Host => "$smtpmachine" )
+    or die "can't send report to $email via $smtpmachine: $!";
 }
 
 
@@ -258,7 +267,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-tax-report,v 1.3 2002-03-06 00:17:32 ivan Exp $
+$Id: freeside-tax-report,v 1.4 2002-03-07 19:50:24 jeff Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 56ef0a8a658b8449d1125fe017b21e0c636a8b0c Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Sat, 9 Mar 2002 10:19:38 +0000
Subject: Support for default CNAME/A records

---
 FS/FS/Conf.pm       | 14 ++++++++++++++
 FS/FS/svc_domain.pm | 40 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e8686b575..5dba387fe 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -449,6 +449,20 @@ httemplate/docs/config.html
     'type'        => 'textarea',
   },
 
+  {
+    'key'         => 'arecords',
+    'section'     => 'BIND',
+    'description' => 'A list of tab seperated A records to add automatically when creating a domain',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'cnamerecords',
+    'section'     => 'BIND',
+    'description' => 'A list of tab seperated CNAME records to add automatically when creating a domain',
+    'type'        => 'textarea',
+  },
+
   {
     'key'         => 'nismachines',
     'section'     => 'shell',
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 84a102911..1e16ba87f 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -3,7 +3,7 @@ package FS::svc_domain;
 use strict;
 use vars qw( @ISA $whois_hack $conf $smtpmachine
   @mxmachines @nsmachines $soadefaultttl $soaemail $soaexpire $soamachine
-  $soarefresh $soaretry $qshellmachine $nossh_hack
+  $soarefresh $soaretry $qshellmachine $nossh_hack %arecords %cnamerecords
 );
 use Carp;
 use Mail::Internet;
@@ -29,6 +29,8 @@ $FS::UID::callback{'FS::domain'} = sub {
 
   $smtpmachine = $conf->config('smtpmachine');
 
+  %arecords      = map { split /\t/ } $conf->config('arecords');
+  %cnamerecords  = map { split /\t/ } $conf->config('cnamerecords');
   @mxmachines    = $conf->config('mxmachines');
   @nsmachines    = $conf->config('nsmachines');
   $soadefaultttl = $conf->config('soadefaultttl');
@@ -123,6 +125,10 @@ records are added to the domain_record table (see L<FS::domain_record>).
 If any machines are defined in the I<mxmachines> configuration file, MX
 records are added to the domain_record table (see L<FS::domain_record>).
 
+If the I<arecords> configuration file exits, A records are added to the
+domain_record table.  The I<cnamerecords> file does the same thing for
+CNAME records.
+
 If a machine is defined in the I<shellmachine> configuration value, the
 I<qmailmachines> configuration file exists, and the I<catchall> field points
 to an an account with a home directory (see L<FS::svc_acct>), the command:
@@ -224,6 +230,36 @@ sub insert {
       }
     }
 
+    foreach my $arecord ( keys %arecords ) {
+      my $arec = new FS::domain_record {
+        'svcnum'  => $self->svcnum,
+        'reczone' => $arecord,
+        'recaf'   => 'IN',
+        'rectype' => 'A',
+        'recdata' => $arecords{$arecord},
+      };
+      my $error = $arec->insert;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "WARNING: couldn't insert A record for new domain: $error";
+      }
+    }
+
+    foreach my $cnamerecord ( keys %cnamerecords ) {
+      my $cnamerec = new FS::domain_record {
+        'svcnum'  => $self->svcnum,
+        'reczone' => $cnamerecord,
+        'recaf'   => 'IN',
+        'rectype' => 'CNAME',
+        'recdata' => $cnamerecords{$cnamerecord},
+      };
+      my $error = $cnamerec->insert;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "WARNING: couldn't insert CNAME record for new domain: $error";
+      }
+    }
+
   }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
@@ -424,7 +460,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.24 2002-02-20 01:03:09 ivan Exp $
+$Id: svc_domain.pm,v 1.25 2002-03-09 10:19:38 khoff Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From f96adaf19c0097ef8c9d6f29a5541b75381cc05d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 12 Mar 2002 15:33:22 +0000
Subject: abstract stupid HTML layer trick out to HTML::Widgets::SelectLayers

---
 README.1.4.0pre12             |   2 +
 htetc/global.asa              |   3 +
 htetc/handler.pl              |   3 +
 httemplate/docs/install.html  |   1 +
 httemplate/docs/upgrade8.html |   2 +-
 httemplate/edit/part_pkg.cgi  | 256 ++++++++++++++++--------------------------
 httemplate/edit/part_svc.cgi  | 225 ++++++++++++-------------------------
 7 files changed, 177 insertions(+), 315 deletions(-)

diff --git a/README.1.4.0pre12 b/README.1.4.0pre12
index 0b453a4e4..824b7fd86 100644
--- a/README.1.4.0pre12
+++ b/README.1.4.0pre12
@@ -7,6 +7,8 @@ httemplate/docs/upgrade8.html instead
 
 ----
 
+install HTML-Widgets-SelectLayers from CPAN or http://www.420.am/selectlayers
+
 install the FS perl modules and httemplate as per install.html or upgrade8.html
 
 ALTER TABLE cust_bill_event ADD status varchar(80);
diff --git a/htetc/global.asa b/htetc/global.asa
index 339f01dae..083f2253d 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -9,6 +9,7 @@ use HTML::Entities;
 use IO::Handle;
 use IO::File;
 use String::Approx qw(amatch);
+use HTML::Widgets::SelectLayers;
 use FS::UID qw(cgisuidsetup dbh getotaker datasrc);
 use FS::Record qw(qsearch qsearchs fields dbdef);
 use FS::Conf;
@@ -45,6 +46,8 @@ use FS::svc_domain;
 use FS::svc_forward;
 use FS::svc_www;
 use FS::type_pkgs;
+use FS::part_export;
+#use FS::part_export_option;
 
 sub Script_OnStart {
   $Response->AddHeader('Pragma' => 'no-cache');
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 680d11ec8..5f244921e 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -66,6 +66,7 @@ sub handler
       use IO::Handle;
       use IO::File;
       use String::Approx qw(amatch);
+      use HTML::Widgets::SelectLayers;
       use FS::UID qw(cgisuidsetup dbh getotaker datasrc);
       use FS::Record qw(qsearch qsearchs fields dbdef);
       use FS::Conf;
@@ -102,6 +103,8 @@ sub handler
       use FS::svc_forward;
       use FS::svc_www;
       use FS::type_pkgs;
+      use FS::part_export;
+      #use FS::part_export_option;
 
       *CGI::redirect = sub {
         my( $self, $location ) = @_;
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index d7c014f4d..1a4942bc9 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -50,6 +50,7 @@ Before installing, you need:
       <li><a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a>
       <li><a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a>
       <li><a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>
+      <li><a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a>
     </ul>
 </ul>
 Install the Freeside distribution:
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 4b0c493f0..2640be419 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -7,7 +7,7 @@
   <li>If migrating from less than 1.3.1, see these <a href="upgrade7.html">instructions</a> first.
   <li><font size="+2" color="#ff0000">Backup your database and current Freeside installation.</font> (with&nbsp;<a href="http://www.ca.postgresql.org/devel-corner/docs/postgres/backup.html">PostgreSQL</a>) (with&nbsp;<a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Backup">MySQL</a>)
   <li><a href="http://perl.apache.org/">mod_perl</a> is now required.
-  <li>Install <a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>, and <a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a>
+  <li>Install <a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>, <a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a> and <a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a>.
   <li>Install <a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a>.
   <li>Install <a href="http://rsync.samba.org/">rsync</a>
 </ul>
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 8e7a6c5cf..d3213dd46 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -42,24 +42,12 @@ unless ( $part_pkg->plan ) { #backwards-compat
 $action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
 my $hashref = $part_pkg->hashref;
 
-%>
-
-<SCRIPT>
-function visualize(what) {
-  if (document.getElementById) {
-    document.getElementById('d<%= $part_pkg->plan %>').style.visibility = "visible";
-  } else {
-    document.l<%= $part_pkg->plan %>.visibility = "visible";
-  }
-}
-</SCRIPT>
-
-<% 
 
 print header("$action Package Definition", menubar(
   'Main Menu' => popurl(2),
   'View all packages' => popurl(2). 'browse/part_pkg.cgi',
-), ' onLoad="visualize()"');
+));
+#), ' onLoad="visualize()"');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
@@ -164,8 +152,12 @@ unless ( 0 ) {
   #print "</TR></TABLE>";
 }
 
+foreach my $f ( qw( clone pkgnum ) ) {
+  print qq!<INPUT TYPE="hidden" NAME="$f" VALUE="!. $cgi->param($f). '">';
+}
+print '<INPUT TYPE="hidden" NAME="pkgpart" VALUE="'. $part_pkg->pkgpart. '">';
+
 # prolly should be in database
-use Tie::IxHash;
 tie my %plans, 'Tie::IxHash',
   'flat' => {
     'name' => 'Flat rate',
@@ -314,159 +306,99 @@ tie my %plans, 'Tie::IxHash',
 
 ;
 
-%>
-
-<SCRIPT>
-var layer = null;
-
-function changed(what) {
-  layer = what.options[what.selectedIndex].value;
-<% foreach my $layer ( keys %plans ) { %>
-  if (layer == "<%= $layer %>" ) {
-    <% foreach my $not ( grep { $_ ne $layer } keys %plans ) { %>
-      if (document.getElementById) {
-        document.getElementById('d<%= $not %>').style.visibility = "hidden";
-      } else {
-        document.l<%= $not %>.visibility = "hidden";
-      }
-    <% } %>
-    if (document.getElementById) {
-      document.getElementById('d<%= $layer %>').style.visibility = "visible";
-    } else {
-      document.l<%= $layer %>.visibility = "visible";
-    }
-  }
-<% } %>
-}
-
-</SCRIPT>
-<BR>
-Price plan <SELECT NAME="plan" SIZE=1 onChange="changed(this);">
-<OPTION>
-<% foreach my $layer (keys %plans ) { %>
-<OPTION VALUE="<%= $layer %>"<%= ' SELECTED'x($layer eq $part_pkg->plan) %>><%= $plans{$layer}->{'name'} %>
-<% } %>
-</SELECT></FORM>
-
-<SCRIPT>
-function fchanged(what) {
-  fixup(what.form);
-}
-
-function fixup(what) {
-<% foreach my $f ( qw( pkg comment freq ), @fixups ) { %>
-  what.<%= $f %>.value = document.dummy.<%= $f %>.value;
-<% } %>
-<% foreach my $f ( qw( setuptax recurtax disabled ) ) { %>
-  if (document.dummy.<%= $f %>.checked)
-    what.<%= $f %>.value = 'Y';
-  else
-    what.<%= $f %>.value = '';
-<% } %>
-  what.plan.value = document.dummy.plan.options[document.dummy.plan.selectedIndex].value;
-<% foreach my $p ( keys %plans ) { %>
-  if ( what.plan.value == "<%= $p %>" ) {
-    what.setup.value = <%= $plans{$p}->{setup} %>;
-    what.recur.value = <%= $plans{$p}->{recur} %>;
-  }
-<% } %>
-}
-</SCRIPT>
-
-<% my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
+my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
                     split("\n", $part_pkg->plandata );
-   #foreach my $layer ( 'konq_kludge', keys %plans ) { 
-   foreach my $layer ( 'konq_kludge', keys %plans ) {
-     my $visibility = "hidden";
-%>
-<SCRIPT>
-if (document.getElementById) {
-    document.write("<DIV ID=\"d<%= $layer %>\" STYLE=\"visibility: <%= $visibility %>; position: absolute\">");
-} else {
-<% $visibility="show" if $visibility eq "visible"; %>
-    document.write("<LAYER ID=\"l<%= $layer %>\" VISIBILITY=\"<%= $visibility %>\">");
-}
-</SCRIPT>
-
-<FORM NAME="<%= $layer %>" ACTION="process/part_pkg.cgi" METHOD=POST onSubmit="fixup(this)">
-<INPUT TYPE="hidden" NAME="plan" VALUE="<%= $part_pkg->plan %>">
-<INPUT TYPE="hidden" NAME="pkg" VALUE="<%= $hashref->{pkg} %>">
-<INPUT TYPE="hidden" NAME="comment" VALUE="$<%= $hashref->{comment} %>">
-<INPUT TYPE="hidden" NAME="freq" VALUE="<%= $hashref->{freq} %>">
-<INPUT TYPE="hidden" NAME="setuptax" VALUE="<%= $hashref->{setuptax} %>">
-<INPUT TYPE="hidden" NAME="recurtax" VALUE="<%= $hashref->{recurtax} %>">
-<INPUT TYPE="hidden" NAME="disabled" VALUE="<%= $hashref->{disabled} %>">
-<% foreach my $f ( @fixups ) { %>
-<INPUT TYPE="hidden" NAME="<%= $f %>" VALUE="">
-<% } %>
 
-<%
-if ( $cgi->param('clone') ) {
-  print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
-}
-if ( $cgi->param('pkgnum') ) {
-  print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $cgi->param('pkgnum'), qq!">!;
-}
-%>
+tie my %options, 'Tie::IxHash', map { $_=>$plans{$_}->{'name'} } keys %plans;
+
+my $widget = new HTML::Widgets::SelectLayers(
+  'selected_layer' => $part_pkg->plan,
+  'options'        => \%options,
+  'form_name'      => 'dummy',
+  'form_action'    => 'process/part_pkg.cgi',
+  'form_text'      => [ qw(pkg comment freq clone pkgnum pkgpart), @fixups ],
+  'form_checkbox'  => [ qw(setuptax recurtax disabled) ],
+  'fixup_callback' => sub {
+                        #my $ = @_;
+                        my $html = '';
+                        for my $p ( keys %plans ) {
+                          $html .= "if ( what.plan.value == \"$p\" ) {
+                                      what.setup.value = $plans{$p}->{setup} ;
+                                      what.recur.value = $plans{$p}->{recur} ;
+                                    }\n";
+                        }
+                        $html;
+                      },
+  'layer_callback' => sub {
+    my $layer = shift;
+    my $html = qq!<INPUT TYPE="hidden" NAME="plan" VALUE="$layer">!.
+               ntable("#cccccc",2);
+    my $href = $plans{$layer}->{'fields'};
+    foreach my $field ( exists($plans{$layer}->{'fieldorder'})
+                          ? @{$plans{$layer}->{'fieldorder'}}
+                          : keys %{ $href }
+                      ) {
+
+      $html .= '<TR><TD ALIGN="right">'. $href->{$field}{'name'}. '</TD><TD>';
+
+      if ( ! exists($href->{$field}{'type'}) ) {
+        $html .= qq!<INPUT TYPE="text" NAME="$field" VALUE="!.
+                 ( exists($plandata{$field})
+                     ? $plandata{$field}
+                     : $href->{$field}{'default'} ).
+                 qq!" onChange="fchanged(this)">!;
+      } elsif ( $href->{$field}{'type'} eq 'select_multiple' ) {
+        $html .= qq!<SELECT MULTIPLE NAME="$field" onChange="fchanged(this)">!;
+        foreach my $record (
+          qsearch( $href->{$field}{'select_table'},
+                   $href->{$field}{'select_hash'}   )
+        ) {
+          my $value = $record->getfield($href->{$field}{'select_key'});
+          $html .= qq!<OPTION VALUE="$value"!.
+                   (  $plandata{$field} =~ /(^|, *)$value *(,|$)/
+                        ? ' SELECTED'
+                        : ''          ).
+                   '>'. $record->getfield($href->{$field}{'select_label'})
+        }
+        $html .= '</SELECT>';
+      }
 
-<INPUT TYPE="hidden" NAME="pkgpart" VALUE="<%= $hashref->{pkgpart} %>">
-<%= ntable("#cccccc",2) %>
+      $html .= '</TD></TR>';
+    }
+    $html .= '</TABLE>';
+
+    $html .= '<INPUT TYPE="hidden" NAME="plandata" VALUE="'.
+             join(',', keys %{ $href } ). '">'.
+             '<BR><BR>';
+             
+    $html .= '<INPUT TYPE="submit" VALUE="'.
+             ( $hashref->{pkgpart} ? "Apply changes" : "Add package" ).
+             '" onClick="fchanged(this)">';
+
+    $html .= '<BR><BR>don\'t edit this unless you know what you\'re doing '.
+             '<INPUT TYPE="button" VALUE="refresh expressions" '.
+               'onClick="fchanged(this)">'.
+             ntable("#cccccc",2).
+             '<TR><TD>'.
+             '<FONT SIZE="1">Setup expression<BR>'.
+             '<INPUT TYPE="text" NAME="setup" SIZE="160" VALUE="'.
+               $hashref->{setup}. '" onLoad="fchanged(this)">'.
+             '</FONT><BR>'.
+             '<FONT SIZE="1">Recurring espression<BR>'.
+             '<INPUT TYPE="text" NAME="recur" SIZE="160" VALUE="'.
+               $hashref->{recur}. '" onLoad="fchanged(this)">'.
+             '</FONT>'.
+             '</TR></TD>'.
+             '</TABLE>';
+
+    $html;
 
-<% my $href = $plans{$layer}->{'fields'};
-   foreach my $field ( exists($plans{$layer}->{'fieldorder'})
-                         ? @{$plans{$layer}->{'fieldorder'}}
-                         : keys %{ $href }
-                     ) {
-%>
-  <TR><TD ALIGN="right"><%= $href->{$field}{'name'} %></TD>
-  <TD>
-  <% if ( ! exists($href->{$field}{'type'}) ) { %>
-       <INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= exists($plandata{$field}) ? $plandata{$field} : $href->{$field}{'default'} %>" onChange="fchanged(this)">
-  <% } elsif ( $href->{$field}{'type'} eq 'select_multiple' ) { %>
-       <SELECT MULTIPLE NAME="<%= $field %>" onChange="fchanged(this)">
-       <% foreach my $record ( qsearch( $href->{$field}{'select_table'}, $href->{$field}{'select_hash'} ) ) {
-          my $value = $record->getfield($href->{$field}{'select_key'}); %>
-         <OPTION VALUE="<%= $value %>"<%= $plandata{$field} =~ /(^|, *)$value *(,|$)/ ? ' SELECTED' : '' %>><%= $record->getfield($href->{$field}{'select_label'}) %>
-       <% } %>
-       </SELECT>
-  <% } %>
-  </TD></TR>
-<% } %>
-
-</TABLE>
-<INPUT TYPE="hidden" NAME="plandata" VALUE="<%= join(',', keys %{ $href } ) %>">
-<BR><BR>
+  },
+);
 
-<%
-print qq!<INPUT TYPE="submit" VALUE="!,
-      $hashref->{pkgpart} ? "Apply changes" : "Add package",
-      qq!" onClick="fchanged(this)">!;
 %>
 
-<BR><BR>don't edit this unless you know what you're doing <INPUT TYPE="button" VALUE="refresh expressions" onClick="fchanged(this)"><%= ntable("#cccccc",2) %><TR><TD>
-<FONT SIZE="1">Setup expression<BR><INPUT TYPE="text" NAME="setup" SIZE="160" VALUE="<%= $hashref->{setup} %>" onLoad="fchanged(this)"></FONT><BR>
-<FONT SIZE="1">Recurring espression<BR><INPUT TYPE="text" NAME="recur" SIZE="160" VALUE="<%= $hashref->{recur} %>" onLoad="fchanged(this)"></FONT>
-</TR></TD>
-</TABLE>
-
-</FORM>
-
-<SCRIPT>
-if (document.getElementById) {
-  document.write("</DIV>");
-} else {
-  document.write("</LAYER>");
-}
-</SCRIPT>
-
-<% } %>
-
-<TAG onLoad="
-    if (document.getElementById) {
-      document.getElementById('d<%= $part_pkg->plan %>').style.visibility = 'visible';
-    } else {
-      document.l<%= $part_pkg->plan %>.visibility = 'visible';
-    }
-">
+<BR>
+Price plan <%= $widget->html %>
   </BODY>
 </HTML>
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 57ab3985e..3292a9b9b 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -15,25 +15,16 @@
    }
    my $action = $part_svc->svcpart ? 'Edit' : 'Add';
    my $hashref = $part_svc->hashref;
-   my $p_svcdb = $part_svc->svcdb || 'svc_acct';
+#   my $p_svcdb = $part_svc->svcdb || 'svc_acct';
 
-%>
 
-<SCRIPT>
-function visualize(what) {
-  if (document.getElementById) {
-    document.getElementById('d<%= $p_svcdb %>').style.visibility = "visible";
-  } else {
-    document.l<%= $p_svcdb %>.visibility = "visible";
-  }
-}
-</SCRIPT>
+           #" onLoad=\"visualize()\""
+%>
 
 <%= header("$action Service Definition",
            menubar( 'Main Menu'         => $p,
                     'View all service definitions' => "${p}browse/part_svc.cgi"
                   ),
-           " onLoad=\"visualize()\""
            )
 %>
 
@@ -47,6 +38,7 @@ function visualize(what) {
 <BR><BR>
 Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>"><BR>
 Disable new orders <INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref->{disabled} eq 'Y' ? ' CHECKED' : '' %>><BR>
+<INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $hashref->{svcpart} %>">
 <BR>
 Services are items you offer to your customers.
 <UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
@@ -64,37 +56,6 @@ values.  For example, a SLIP/PPP account may have a default (or perhaps fixed)
 blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
 <B>/usr/bin/passwd</B>.
 <BR><BR>
-<SCRIPT>
-var svcdb = null;
-function changed(what) {
-  svcdb = what.options[what.selectedIndex].value;
-<% foreach my $svcdb ( qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www ) ) { %>
-  if (svcdb == "<%= $svcdb %>" ) {
-    <% foreach my $not ( grep { $_ ne $svcdb } (
-                           qw(svc_acct svc_domain svc_acct_sm svc_forward svc_www) ) ) { %>
-      if (document.getElementById) {
-        document.getElementById('d<%= $not %>').style.visibility = "hidden";
-      } else {
-        document.l<%= $not %>.visibility = "hidden";
-      }
-    <% } %>
-    if (document.getElementById) {
-      document.getElementById('d<%= $svcdb %>').style.visibility = "visible";
-    } else {
-      document.l<%= $svcdb %>.visibility = "visible";
-    }
-  }
-<% } %>
-}
-</SCRIPT>
-<% my @dbs = $hashref->{svcdb}
-             ? ( $hashref->{svcdb} )
-             : qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www ); %>
-Table<SELECT NAME="svcdb" SIZE=1 onChange="changed(this)">
-<% foreach my $svcdb (@dbs) { %>
-<OPTION VALUE="<%= $svcdb %>" <%= ' SELECTED'x($svcdb eq $hashref->{svcdb}) %>><%= $svcdb %>
-<% } %>
-</SELECT></FORM>
 
 <%
 #these might belong somewhere else for other user interfaces 
@@ -152,121 +113,81 @@ my %defs = (
   },
 );
 
-#  svc_acct svc_domain svc_acct_sm svc_charge svc_wo
-foreach my $svcdb ( qw(
-  konq_kludge svc_acct svc_domain svc_acct_sm svc_forward svc_www
-) ) {
-
-#  my(@fields) = $svcdb eq 'konq_kludge'
-#                  ? ()
-#                  : grep { $_ ne 'svcnum' } fields($svcdb);
-  #yucky kludge
-  my(@fields) = defined( $FS::Record::dbdef->table($svcdb) )
-                  ? grep { $_ ne 'svcnum' } fields($svcdb)
-                  : ();
-  #my($rowspan)=scalar(@rows);
-
-  #my($ptmp)="<TD ROWSPAN=$rowspan>$svcdb</TD>";
-#  $visibility = $svcdb eq $part_svc->svcdb ? "SHOW" : "HIDDEN";
-#  $visibility = $svcdb eq $p_svcdb ? "visible" : "hidden";
-  my $visibility = "hidden";
-%>
-<SCRIPT>
-if (document.getElementById) {
-    document.write("<DIV ID=\"d<%= $svcdb %>\" STYLE=\"visibility: <%= $visibility %>; position: absolute\">");
-} else {
-<% $visibility="show" if $visibility eq "visible"; %>
-    document.write("<LAYER ID=\"l<%= $svcdb %>\" VISIBILITY=\"<%= $visibility %>\">");
-}
-
-function fixup(what) {
-  what.svc.value = document.dummy.svc.value;
-  what.svcdb.value = document.dummy.svcdb.options[document.dummy.svcdb.selectedIndex].value;
-  if (document.dummy.disabled.checked)
-    what.disabled.value = 'Y';
-  else
-    what.disabled.value = '';
-}
-</SCRIPT>
-<FORM NAME="<%= $svcdb %>" ACTION="process/part_svc.cgi" METHOD=POST onSubmit="fixup(this)">
-<INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $hashref->{svcpart} %>">
-<INPUT TYPE="hidden" NAME="svc" VALUE="<%= $hashref->{svc} %>">
-<INPUT TYPE="hidden" NAME="disabled" VALUE="<%= $hashref->{disabled} %>">
-<INPUT TYPE="hidden" NAME="svcdb" VALUE="<%= $svcdb %>">
-<%
-  #print "$svcdb<BR>" unless $svcdb eq 'konq_kludge';
-  print table(). "<TH>Field</TH><TH COLSPAN=2>Modifier</TH>" unless $svcdb eq 'konq_kludge';
-
-  foreach my $field (@fields) {
-    my $part_svc_column = $part_svc->part_svc_column($field);
-    my $value = $cgi->param('error')
-                  ? $cgi->param("${svcdb}__${field}")
-                  : $part_svc_column->columnvalue;
-    my $flag = $cgi->param('error')
-                 ? $cgi->param("${svcdb}__${field}_flag")
-                 : $part_svc_column->columnflag;
-    #print "<TR>$ptmp<TD>$field";
-    print "<TR><TD>$field";
-    my $def = $defs{$svcdb}{$field};
-    my $desc = ref($def) ? $def->{desc} : $def;
-    
-    print "- <FONT SIZE=-1>$desc</FONT>" if $desc;
-    print "</TD>";
-    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${field}_flag" VALUE=""!.
-      ' CHECKED'x($flag eq ''). ">Off</TD>";
-    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${field}_flag" VALUE="D"!.
-      ' CHECKED'x($flag eq 'D'). ">Default ";
-    print qq!<INPUT TYPE="radio" NAME="${svcdb}__${field}_flag" VALUE="F"!.
-      ' CHECKED'x($flag eq 'F'). ">Fixed ";
-    print '<BR>';
-    if ( ref($def) ) {
-      if ( $def->{type} eq 'select' ) {
-        print qq!<SELECT NAME="${svcdb}__${field}">!;
-        print '<OPTION> </OPTION>' unless $value;
-        foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
-          my $rvalue = $record->getfield($def->{select_key});
-          print qq!<OPTION VALUE="$rvalue"!.
-                ( $rvalue==$value ? ' SELECTED>' : '>' ).
-                $record->getfield($def->{select_label}). '</OPTION>';
+  my @dbs = $hashref->{svcdb}
+             ? ( $hashref->{svcdb} )
+             : qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www );
+
+  tie my %svcdb, 'Tie::IxHash', map { $_=>$_ } @dbs;
+  my $widget = new HTML::Widgets::SelectLayers(
+    #'selected_layer' => $p_svcdb,
+    'selected_layer' => $hashref->{svcdb} || 'svc_acct',
+    'options'        => \%svcdb,
+    'form_name'      => 'dummy',
+    'form_action'    => 'process/part_svc.cgi',
+    'form_text'      => [ qw( svc svcpart ) ],
+    'form_checkbox'  => [ 'disabled' ],
+    'layer_callback' => sub {
+      my $layer = shift;
+      my $html = qq!<INPUT TYPE="hidden" NAME="svcdb" VALUE="$layer">!.
+                 table(). "<TH>Field</TH><TH COLSPAN=2>Modifier</TH>";
+      #yucky kludge
+      my @fields = defined( $FS::Record::dbdef->table($layer) )
+                      ? grep { $_ ne 'svcnum' } fields($layer)
+                      : ();
+      foreach my $field (@fields) {
+        my $part_svc_column = $part_svc->part_svc_column($field);
+        my $value = $cgi->param('error')
+                      ? $cgi->param("${layer}__${field}")
+                      : $part_svc_column->columnvalue;
+        my $flag = $cgi->param('error')
+                     ? $cgi->param("${layer}__${field}_flag")
+                     : $part_svc_column->columnflag;
+        my $def = $defs{$layer}{$field};
+        my $desc = ref($def) ? $def->{desc} : $def;
+        
+        $html .= "<TR><TD>$field";
+        $html .= "- <FONT SIZE=-1>$desc</FONT>" if $desc;
+        $html .=  "</TD>";
+        $html .=
+          qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE=""!.
+          ' CHECKED'x($flag eq ''). ">Off</TD>".
+          qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="D"!.
+          ' CHECKED'x($flag eq 'D'). ">Default ".
+          qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="F"!.
+          ' CHECKED'x($flag eq 'F'). ">Fixed ".
+          '<BR>';
+        if ( ref($def) ) {
+          if ( $def->{type} eq 'select' ) {
+            $html .= qq!<SELECT NAME="${layer}__${field}">!;
+            $html .= '<OPTION> </OPTION>' unless $value;
+            foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
+              my $rvalue = $record->getfield($def->{select_key});
+              $html .= qq!<OPTION VALUE="$rvalue"!.
+                       ( $rvalue==$value ? ' SELECTED>' : '>' ).
+                       $record->getfield($def->{select_label}). '</OPTION>';
+            }
+            $html .= '</SELECT>';
+          } else {
+            $html .= '<font color="#ff0000">unknown type'. $def->{type};
+          }
+        } else {
+          $html .=
+            qq!<INPUT TYPE="text" NAME="${layer}__${field}" VALUE="$value">!;
         }
-        print '</SELECT>';
-      } else {
-        print '<font color="#ff0000">unknown type'. $def->{type};
+        $html .= "</TD></TR>\n";
       }
-    } else {
-      print qq!<INPUT TYPE="text" NAME="${svcdb}__${field}" VALUE="$value">!;
-    }
-    print "</TD></TR>\n";
-    #$ptmp='';
-  }
-  print "</TABLE>" unless $svcdb eq 'konq_kludge';
+      $html .= "</TABLE>";
 
-print qq!\n<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{svcpart} ? "Apply changes" : "Add service",
-      qq!">! unless $svcdb eq 'konq_kludge';
+      $html .= '<BR><INPUT TYPE="submit" VALUE="'.
+               ($hashref->{svcpart} ? 'Apply changes' : 'Add service'). '">';
 
-  print "</FORM>";
-  print <<END;
-    <SCRIPT>
-    if (document.getElementById) {
-      document.write("</DIV>");
-    } else {
-      document.write("</LAYER>");
-    }
-    </SCRIPT>
-END
-}
-#print "</TABLE>";
-%>
+      $html;
 
-<TAG onLoad="
-    if (document.getElementById) {
-      document.getElementById('d<%= $p_svcdb %>').style.visibility = 'visible';
-    } else {
-      document.l<%= $p_svcdb %>.visibility = 'visible';
-    }
-">
+    },
+  );
 
+%>
+Table <%= $widget->html %>
   </BODY>
 </HTML>
 
-- 
cgit v1.2.1


From 62a0a2a05de9f43e625357cc262312b86d178799 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 12 Mar 2002 18:45:36 +0000
Subject: print error message for failed cancels!

---
 httemplate/misc/cancel-unaudited.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/misc/cancel-unaudited.cgi b/httemplate/misc/cancel-unaudited.cgi
index 8f31db838..ecfaef29f 100755
--- a/httemplate/misc/cancel-unaudited.cgi
+++ b/httemplate/misc/cancel-unaudited.cgi
@@ -33,7 +33,7 @@ if ( $error ) {
   %>
 <!-- mason kludge -->
 <%
-  &eidiot(@_);
+  &eidiot($error);
 } else {
 
   $dbh->commit or die $dbh->errstr;
-- 
cgit v1.2.1


From 697dfd9ac2dfa36aa244e6d2d9f2e8f8a364a120 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 17 Mar 2002 08:33:39 +0000
Subject: new domain record editing foo

---
 httemplate/config/config-view.cgi | 15 ++++++-
 httemplate/config/config.cgi      | 95 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 108 insertions(+), 2 deletions(-)

diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 138ec4737..917cc7316 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -8,6 +8,19 @@
                             shell mail radius apache BIND
                            ),
                          '', 'deprecated') { %>
+  <FONT SIZE="-2">
+  <% foreach my $nav_section ( qw(required billing username password UI session
+                                  shell mail radius apache BIND
+                                 ),
+                               '', 'deprecated') { %>
+    <% if ( $section eq $nav_section ) { %>
+      [<A NAME="not<%= $nav_section || 'unclassified' %>" style="background-color: #cccccc"><%= ucfirst($nav_section || 'unclassified') %></A>]
+    <% } else { %>
+      [<A HREF="#<%= $nav_section %>"><%= ucfirst($nav_section || 'unclassified') %></A>]
+    <% } %>
+  <% } %>
+  </FONT><BR>
+  <A NAME="<%= $section || 'unclassified' %>"></A>
   <%= table("#cccccc", 2) %>
   <tr>
     <th colspan="2" bgcolor="#dcdcdc">
@@ -24,7 +37,7 @@
              my $n = 0; %>
           <% if ( $type eq '' ) { %>
             <tr><td><font color="#ff0000">no type</font></td></tr>
-          <% } elsif ( $type eq 'textarea' ) { %>
+          <% } elsif ( $type eq 'textarea' || $type eq 'editlist' ) { %>
             <tr><td bgcolor="#ffffff">
 <pre>
 <%= encode_entities(join("\n", $conf->config($i->key) ) ) %>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 19775c7aa..155dcfdbc 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -1,14 +1,39 @@
 <!-- mason kludge -->
 <%= header('Edit Configuration', menubar( 'Main Menu' => $p ) ) %>
+<SCRIPT>
+var gSafeOnload = new Array();
+window.onload = SafeOnload;
+function SafeAddOnLoad(f) {
+  gSafeOnload[gSafeOnload.length] = f;
+}
+function SafeOnload()
+{
+  for (var i=0;i<gSafeOnload.length;i++)
+    gSafeOnload[i]();
+}
+</SCRIPT>
 
 <% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
 
-<form action="config-process.cgi" METHOD="POST">
+<form name="OneTrueForm" action="config-process.cgi" METHOD="POST">
 
 <% foreach my $section ( qw(required billing username password UI session
                             shell mail radius apache BIND
                            ),
                          '', 'deprecated') { %>
+  <FONT SIZE="-2">
+  <% foreach my $nav_section ( qw(required billing username password UI session
+                                  shell mail radius apache BIND
+                                 ),
+                               '', 'deprecated') { %>
+    <% if ( $section eq $nav_section ) { %>
+      [<A NAME="not<%= $nav_section || 'unclassified' %>" style="background-color: #cccccc"><%= ucfirst($nav_section || 'unclassified') %></A>]
+    <% } else { %>
+      [<A HREF="#<%= $nav_section %>"><%= ucfirst($nav_section || 'unclassified') %></A>]
+    <% } %>
+  <% } %>
+  </FONT><BR>
+  <A NAME="<%= $section || 'unclassified' %>"></A>
   <%= table("#cccccc", 2) %>
   <tr>
     <th colspan="2" bgcolor="#dcdcdc">
@@ -40,6 +65,74 @@
               <% if ( $conf->exists($i->key) && $conf->config($i->key) && ! grep { $conf->config($i->key) eq $_ } @{$i->select_enum}) { %>
                 <option value=<%= $conf->config($i->key) %> SELECTED><%= conf->config($i->key) %>
               <% } %>
+          <% } elsif ( $type eq 'editlist' )  { %>
+            <script>
+              function doremove<%= $i->key. $n %>() {
+                fromObject = document.OneTrueForm.<%= $i->key. $n %>;
+                for (var i=fromObject.options.length-1;i>-1;i--) {
+                  if (fromObject.options[i].selected)
+                    deleteOption<%= $i->key. $n %>(fromObject,i);
+                }
+              }
+              function deleteOption<%= $i->key. $n %>(object,index) {
+                object.options[index] = null;
+              }
+              function doadd<%= $i->key. $n %>(object) {
+                var myvalue = "";
+                <% if ( defined($i->editlist_parts) ) { %>
+
+                  <% foreach my $pnum ( 0 .. scalar(@{$i->editlist_parts})-1 ) { %>
+
+                    if ( myvalue != "" ) { myvalue = myvalue + " "; }
+                    <% if ( $i->editlist_parts->[$pnum]{type} eq 'select' ) { %>
+                      myvalue = myvalue + object.add<%= $i->key. $n . "_$pnum" %>.options[object.add<%= $i->key. $n . "_$pnum" %>.selectedIndex].value;
+                      <!-- #RESET SELECT??  maybe not... -->
+                    <% } elsif ( $i->editlist_parts->[$pnum]{type} eq 'immutable' ) { %>
+                      myvalue = myvalue + object.add<%= $i->key. $n . "_$pnum" %>.value;
+                    <% } else { %>
+                      myvalue = myvalue + object.add<%= $i->key. $n . "_$pnum" %>.value;
+                      object.add<%= $i->key. $n. "_$pnum" %>.value = "";
+                    <% } %>
+
+
+                  <% } %>
+                <% } else { %>
+                  myvalue = object.add<%= $i->key. $n. "_1" %>.value;
+                <% } %>
+                var optionName = new Option(myvalue, myvalue);
+                var length = object.<%= $i->key. $n %>.length;
+                object.<%= $i->key. $n %>.options[length] = optionName;
+              }
+            </script>
+            <select multiple size=5 name="<%= $i->key. $n %>">
+            <option selected>--------------------------------</option>
+            <% foreach my $line ( $conf->config($i->key) ) { %>
+              <option value="$line">$line</option>
+            <% } %>
+            </select><br>
+            <input type="button" value="remove selected" onClick="doremove<%= $i->key. $n %>()">
+            <script>SafeAddOnLoad(doremove<%= $i->key. $n %>)</script>
+            <br>
+            <% if ( defined $i->editlist_parts ) { %>
+              <% my $pnum=0; foreach my $part ( @{$i->editlist_parts} ) { %>
+                <% if ( $part->{type} eq 'text' ) { %>
+                  <input type="text" name="add<%= $i->key. $n."_$pnum" %>">
+                <% } elsif ( $part->{type} eq 'immutable' ) { %>
+                  <%= $part->{value} %><input type="hidden" name="add<%= $i->key. $n. "_$pnum" %>" value="<%= $part->{value} %>">
+                <% } elsif ( $part->{type} eq 'select' ) { %>
+                  <select name="add<%= $i->key. $n. "_$pnum" %>">
+                  <% foreach my $key ( keys %{$part->{select_enum}} ) { %>
+                    <option value="<%= $key %>"><%= $part->{select_enum}{$key} %></option>
+                  <% } %>
+                  </select>
+                <% } else { %>
+                  <font color="#ff0000">unknown type <%= $part->type %></font>
+                <% } %>
+              <% $pnum++; } %>
+            <% } else { %>
+              <input type="text" name="add<%= $i->key. $n %>_0">
+            <% } %>
+            <input type="button" value="add" onClick="doadd<%= $i->key. $n %>(this.form)">
           <% } else { %>
             <font color="#ff0000">unknown type <%= $type %></font>
           <% } %>
-- 
cgit v1.2.1


From daac302e231e2e09b84e771c0413b0f2119c52e8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Mar 2002 09:10:12 +0000
Subject: new config value `defaultrecords', documentation, javascript config
 file editor

---
 FS/FS/Conf.pm                        | 22 +++++++---
 FS/FS/svc_domain.pm                  | 85 +++++++-----------------------------
 README.1.4.0pre12                    |  2 +
 httemplate/config/config-process.cgi |  6 +++
 httemplate/config/config-view.cgi    |  4 +-
 httemplate/config/config.cgi         | 51 +++++++++++++++-------
 httemplate/docs/upgrade8.html        |  3 +-
 7 files changed, 81 insertions(+), 92 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 5dba387fe..18725ced2 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -437,28 +437,40 @@ httemplate/docs/config.html
 
   {
     'key'         => 'mxmachines',
-    'section'     => 'BIND',
+    'section'     => 'deprecated',
     'description' => 'MX entries for new domains, weight and machine, one per line, with trailing `.\'',
     'type'        => 'textarea',
   },
 
   {
     'key'         => 'nsmachines',
-    'section'     => 'BIND',
+    'section'     => 'deprecated',
     'description' => 'NS nameservers for new domains, one per line, with trailing `.\'',
     'type'        => 'textarea',
   },
 
   {
-    'key'         => 'arecords',
+    'key'         => 'defaultrecords',
     'section'     => 'BIND',
-    'description' => 'A list of tab seperated A records to add automatically when creating a domain',
+    'description' => 'DNS entries add automatically when creating a domain',
+    'type'        => 'editlist',
+    'editlist_parts' => [ { type=>'text' },
+                          { type=>'immutable', value=>'IN' },
+                          { type=>'select',
+                            select_enum=>{ map { $_=>$_ } qw(A CNAME MX NS)} },
+                          { type=> 'text' }, ],
+  },
+
+  {
+    'key'         => 'arecords',
+    'section'     => 'deprecated',
+    'description' => 'A list of tab seperated CNAME records to add automatically when creating a domain',
     'type'        => 'textarea',
   },
 
   {
     'key'         => 'cnamerecords',
-    'section'     => 'BIND',
+    'section'     => 'deprecated',
     'description' => 'A list of tab seperated CNAME records to add automatically when creating a domain',
     'type'        => 'textarea',
   },
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 1e16ba87f..d01a403d1 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -2,8 +2,8 @@ package FS::svc_domain;
 
 use strict;
 use vars qw( @ISA $whois_hack $conf $smtpmachine
-  @mxmachines @nsmachines $soadefaultttl $soaemail $soaexpire $soamachine
-  $soarefresh $soaretry $qshellmachine $nossh_hack %arecords %cnamerecords
+  @defaultrecords $soadefaultttl $soaemail $soaexpire $soamachine
+  $soarefresh $soaretry $qshellmachine $nossh_hack 
 );
 use Carp;
 use Mail::Internet;
@@ -29,10 +29,7 @@ $FS::UID::callback{'FS::domain'} = sub {
 
   $smtpmachine = $conf->config('smtpmachine');
 
-  %arecords      = map { split /\t/ } $conf->config('arecords');
-  %cnamerecords  = map { split /\t/ } $conf->config('cnamerecords');
-  @mxmachines    = $conf->config('mxmachines');
-  @nsmachines    = $conf->config('nsmachines');
+  @defaultrecords = $conf->config('defaultrecords');
   $soadefaultttl = $conf->config('soadefaultttl');
   $soaemail      = $conf->config('soaemail');
   $soaexpire     = $conf->config('soaexpire');
@@ -119,15 +116,9 @@ in the same package, it is automatically used.  Otherwise an error is returned.
 If any I<soamachine> configuration file exists, an SOA record is added to
 the domain_record table (see <FS::domain_record>).
 
-If any machines are defined in the I<nsmachines> configuration file, NS
-records are added to the domain_record table (see L<FS::domain_record>).
-
-If any machines are defined in the I<mxmachines> configuration file, MX
-records are added to the domain_record table (see L<FS::domain_record>).
-
-If the I<arecords> configuration file exits, A records are added to the
-domain_record table.  The I<cnamerecords> file does the same thing for
-CNAME records.
+If any records are defined in the I<defaultrecords> configuration file,
+appropriate records are added to the domain_record table (see
+L<FS::domain_record>).
 
 If a machine is defined in the I<shellmachine> configuration value, the
 I<qmailmachines> configuration file exists, and the I<catchall> field points
@@ -200,63 +191,19 @@ sub insert {
       return "couldn't insert SOA record for new domain: $error";
     }
 
-    foreach my $nsmachine ( @nsmachines ) {
-      my $ns = new FS::domain_record {
-        'svcnum'  => $self->svcnum,
-        'reczone' => '@',
-        'recaf'   => 'IN',
-        'rectype' => 'NS',
-        'recdata' => $nsmachine,
-      };
-      my $error = $ns->insert;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "couldn't insert NS record for new domain: $error";
-      }
-    }
-
-    foreach my $mxmachine ( @mxmachines ) {
-      my $mx = new FS::domain_record {
-        'svcnum'  => $self->svcnum,
-        'reczone' => '@',
-        'recaf'   => 'IN',
-        'rectype' => 'MX',
-        'recdata' => $mxmachine,
-      };
-      my $error = $mx->insert;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "couldn't insert MX record for new domain: $error";
-      }
-    }
-
-    foreach my $arecord ( keys %arecords ) {
-      my $arec = new FS::domain_record {
-        'svcnum'  => $self->svcnum,
-        'reczone' => $arecord,
-        'recaf'   => 'IN',
-        'rectype' => 'A',
-        'recdata' => $arecords{$arecord},
-      };
-      my $error = $arec->insert;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "WARNING: couldn't insert A record for new domain: $error";
-      }
-    }
-
-    foreach my $cnamerecord ( keys %cnamerecords ) {
-      my $cnamerec = new FS::domain_record {
+    foreach my $record ( @defaultrecords ) {
+      my($zone,$af,$type,$data) = split(/\s+/,$record,4);
+      my $record = new FS::domain_record {
         'svcnum'  => $self->svcnum,
-        'reczone' => $cnamerecord,
-        'recaf'   => 'IN',
-        'rectype' => 'CNAME',
-        'recdata' => $cnamerecords{$cnamerecord},
+        'reczone' => $zone,
+        'recaf'   => $af,
+        'rectype' => $type,
+        'recdata' => $data,
       };
-      my $error = $cnamerec->insert;
+      my $error = $record->insert;
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
-        return "WARNING: couldn't insert CNAME record for new domain: $error";
+        return "couldn't insert record for new domain: $error";
       }
     }
 
@@ -460,7 +407,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.25 2002-03-09 10:19:38 khoff Exp $
+$Id: svc_domain.pm,v 1.26 2002-03-18 09:10:12 ivan Exp $
 
 =head1 BUGS
 
diff --git a/README.1.4.0pre12 b/README.1.4.0pre12
index 824b7fd86..c801a2604 100644
--- a/README.1.4.0pre12
+++ b/README.1.4.0pre12
@@ -25,3 +25,5 @@ Arrange for freeside-expiration-alerter to be run daily, if desired.
 
 Restart Apache and freeside-queued
 
+the mxmachines, nsmachines, arecords and cnamerecords configuration values have been deprecated.  Use the defaultrecords configuration value instead.
+
diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
index a296abfe4..38d9af0db 100644
--- a/httemplate/config/config-process.cgi
+++ b/httemplate/config/config-process.cgi
@@ -32,6 +32,12 @@
         } else {
           $conf->delete($i->key);
         }
+      } elsif ( $type eq 'editlist' || $type eq 'selectmultiple' )  {
+        if ( scalar(@{[ $cgi->param($i->key. $n) ]}) ) {
+          $conf->set($i->key, join("\n", $cgi->param($i->key. $n) ));
+        } else {
+          $conf->delete($i->key);
+        }
       } else {
       }
       $n++;
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 917cc7316..d40c4dc10 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -8,6 +8,7 @@
                             shell mail radius apache BIND
                            ),
                          '', 'deprecated') { %>
+  <A NAME="<%= $section || 'unclassified' %>"></A>
   <FONT SIZE="-2">
   <% foreach my $nav_section ( qw(required billing username password UI session
                                   shell mail radius apache BIND
@@ -16,11 +17,10 @@
     <% if ( $section eq $nav_section ) { %>
       [<A NAME="not<%= $nav_section || 'unclassified' %>" style="background-color: #cccccc"><%= ucfirst($nav_section || 'unclassified') %></A>]
     <% } else { %>
-      [<A HREF="#<%= $nav_section %>"><%= ucfirst($nav_section || 'unclassified') %></A>]
+      [<A HREF="#<%= $nav_section || 'unclassified' %>"><%= ucfirst($nav_section || 'unclassified') %></A>]
     <% } %>
   <% } %>
   </FONT><BR>
-  <A NAME="<%= $section || 'unclassified' %>"></A>
   <%= table("#cccccc", 2) %>
   <tr>
     <th colspan="2" bgcolor="#dcdcdc">
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 155dcfdbc..5013de0dc 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -2,25 +2,33 @@
 <%= header('Edit Configuration', menubar( 'Main Menu' => $p ) ) %>
 <SCRIPT>
 var gSafeOnload = new Array();
+var gSafeOnsubmit = new Array();
 window.onload = SafeOnload;
 function SafeAddOnLoad(f) {
   gSafeOnload[gSafeOnload.length] = f;
 }
-function SafeOnload()
-{
+function SafeOnload() {
   for (var i=0;i<gSafeOnload.length;i++)
     gSafeOnload[i]();
 }
+function SafeAddOnSubmit(f) {
+  gSafeOnsubmit[gSafeOnsubmit.length] = f;
+}
+function SafeOnsubmit() {
+  for (var i=0;i<gSafeOnsubmit.length;i++)
+    gSafeOnsubmit[i]();
+}
 </SCRIPT>
 
 <% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
 
-<form name="OneTrueForm" action="config-process.cgi" METHOD="POST">
+<form name="OneTrueForm" action="config-process.cgi" METHOD="POST" onSubmit="SafeOnsubmit()">
 
 <% foreach my $section ( qw(required billing username password UI session
                             shell mail radius apache BIND
                            ),
                          '', 'deprecated') { %>
+  <A NAME="<%= $section || 'unclassified' %>"></A>
   <FONT SIZE="-2">
   <% foreach my $nav_section ( qw(required billing username password UI session
                                   shell mail radius apache BIND
@@ -29,11 +37,10 @@ function SafeOnload()
     <% if ( $section eq $nav_section ) { %>
       [<A NAME="not<%= $nav_section || 'unclassified' %>" style="background-color: #cccccc"><%= ucfirst($nav_section || 'unclassified') %></A>]
     <% } else { %>
-      [<A HREF="#<%= $nav_section %>"><%= ucfirst($nav_section || 'unclassified') %></A>]
+      [<A HREF="#<%= $nav_section || 'unclassified' %>"><%= ucfirst($nav_section || 'unclassified') %></A>]
     <% } %>
   <% } %>
   </FONT><BR>
-  <A NAME="<%= $section || 'unclassified' %>"></A>
   <%= table("#cccccc", 2) %>
   <tr>
     <th colspan="2" bgcolor="#dcdcdc">
@@ -65,6 +72,7 @@ function SafeOnload()
               <% if ( $conf->exists($i->key) && $conf->config($i->key) && ! grep { $conf->config($i->key) eq $_ } @{$i->select_enum}) { %>
                 <option value=<%= $conf->config($i->key) %> SELECTED><%= conf->config($i->key) %>
               <% } %>
+            </select>
           <% } elsif ( $type eq 'editlist' )  { %>
             <script>
               function doremove<%= $i->key. $n %>() {
@@ -77,6 +85,12 @@ function SafeOnload()
               function deleteOption<%= $i->key. $n %>(object,index) {
                 object.options[index] = null;
               }
+              function selectall<%= $i->key. $n %>() {
+                fromObject = document.OneTrueForm.<%= $i->key. $n %>;
+                for (var i=fromObject.options.length-1;i>-1;i--) {
+                  fromObject.options[i].selected = true;
+                }
+              }
               function doadd<%= $i->key. $n %>(object) {
                 var myvalue = "";
                 <% if ( defined($i->editlist_parts) ) { %>
@@ -105,16 +119,19 @@ function SafeOnload()
               }
             </script>
             <select multiple size=5 name="<%= $i->key. $n %>">
-            <option selected>--------------------------------</option>
+            <option selected>----------------------------------------------------------------</option>
             <% foreach my $line ( $conf->config($i->key) ) { %>
-              <option value="$line">$line</option>
+              <option value="<%= $line %>"><%= $line %></option>
             <% } %>
             </select><br>
             <input type="button" value="remove selected" onClick="doremove<%= $i->key. $n %>()">
-            <script>SafeAddOnLoad(doremove<%= $i->key. $n %>)</script>
+            <script>SafeAddOnLoad(doremove<%= $i->key. $n %>);
+                    SafeAddOnSubmit(selectall<%= $i->key. $n %>);</script>
             <br>
+            <%= itable() %><tr>
             <% if ( defined $i->editlist_parts ) { %>
               <% my $pnum=0; foreach my $part ( @{$i->editlist_parts} ) { %>
+                <td>
                 <% if ( $part->{type} eq 'text' ) { %>
                   <input type="text" name="add<%= $i->key. $n."_$pnum" %>">
                 <% } elsif ( $part->{type} eq 'immutable' ) { %>
@@ -128,11 +145,13 @@ function SafeOnload()
                 <% } else { %>
                   <font color="#ff0000">unknown type <%= $part->type %></font>
                 <% } %>
+                </td>
               <% $pnum++; } %>
             <% } else { %>
-              <input type="text" name="add<%= $i->key. $n %>_0">
+              <td><input type="text" name="add<%= $i->key. $n %>_0"></td>
             <% } %>
-            <input type="button" value="add" onClick="doadd<%= $i->key. $n %>(this.form)">
+            <td><input type="button" value="add" onClick="doadd<%= $i->key. $n %>(this.form)"></td>
+            </tr></table>
           <% } else { %>
             <font color="#ff0000">unknown type <%= $type %></font>
           <% } %>
@@ -143,13 +162,15 @@ function SafeOnload()
       </a></td>
     </tr>
   <% } %>
-  </table><br><br>
-<% } %>
+  </table><br>
 
-You may need to restart Apache and/or freeside-queued for configuration
-changes to take effect.<BR>
+  You may need to restart Apache and/or freeside-queued for configuration
+  changes to take effect.<br>
+
+  <input type="submit" value="Apply changes"><br><br>
+
+<% } %>
 
-<input type="submit" value="Apply changes">
 </form>
 
 </body></html>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 2640be419..25e766b1e 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -308,8 +308,9 @@ ALTER TABLE cust_refund DROP COLUMN crednum;
   <li><b>IMPORTANT</b>: run bin/create-history-tables
   <li><b>IMPORTANT: After running bin/create-history-tables</b>, run bin/dbdef-create again.
   <li>set the <a href="../config/config.cgi#username_policy">user_policy configuration value</a> as appropriate for your site.
+  <li>the mxmachines, nsmachines, arecords and cnamerecords configuration values have been deprecated.  Set the <a href="../config/config.cgi#defaultrecords">defaultrecords configuration value</a> instead.
   <li>Create the `/usr/local/etc/freeside/cache.<i>datasrc</i>' directory
-      (ownded by the freeside user).
+      (owned by the freeside user).
   <li>freeside-queued was installed with the Perl modules.  Start it now and ensure that is run upon system startup.
   <li>Set appropriate <a href="../browse/part_bill_event.cgi">invoice events</a> for your site.  At the very least, you'll want to set some invoice events "<i>After 0 days</i>": a <i>BILL</i> invoice event to print invoices, a <i>CARD</i> invoice event to batch or run cards real-time, and a <i>COMP</i> invoice event to "pay" complimentary customers.  If you were using the <i>-i</i> option to <a href="man/bin/freeside-bill.html">freeside-bill</a> it should be removed.
   <li>Use <a href="man/bin/freeside-daily.html">freeside-daily</a> instead of <a href="man/bin/freeside-bill.html">freeside-bill</a>.
-- 
cgit v1.2.1


From d67496643d9a6b3366b57d614a4c18e37f723845 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Mar 2002 14:17:40 +0000
Subject: add noment-specific RADIUS attributes

---
 FS/FS/raddb.pm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/FS/FS/raddb.pm b/FS/FS/raddb.pm
index 04389c91b..497d98450 100644
--- a/FS/FS/raddb.pm
+++ b/FS/FS/raddb.pm
@@ -1081,6 +1081,11 @@ use vars qw(%attrib);
   'bind_l2tp_flow_control' => 'Bind_L2TP_Flow_Control',
   'ascend_cbcp_delay' => 'Ascend-CBCP-Delay',
   'le_ipsec_deny_action' => 'LE-IPSec-Deny-Action',
+
+  #NOMENT
+  'nomadix_bw_down' => 'Nomadix-Bw-Down',
+  'nomadix_bw_up' => 'Nomadix-Bw-Up',
+  'nomadix_ip_upsell' => 'Nomadix-IP-Upsell',
 );
 
 1;
-- 
cgit v1.2.1


From c2f8491538edaf54ed976c7a4f2c238eea1e3772 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Mar 2002 15:51:26 +0000
Subject: UI glitch; forgot ROWSPAN for export column

---
 httemplate/browse/part_svc.cgi | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 07f197982..cf0f0408c 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -26,6 +26,7 @@ my $total = scalar(@part_svc);
   <TR>
     <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Service</TH>
     <TH>Table</TH>
+    <TH>Export</TH>
     <TH>Field</TH>
     <TH COLSPAN=2>Modifier</TH>
   </TR>
@@ -54,6 +55,30 @@ my $total = scalar(@part_svc);
       <%= $hashref->{svc} %></A></TD>
     <TD ROWSPAN=<%= $rowspan %>>
       <%= $hashref->{svcdb} %></TD>
+    <TD ROWSPAN=<%= $rowspan %>><%= itable() %>
+<%
+  my @part_export = qsearch('part_export', { svcpart => $part_svc->svcpart } );
+  foreach my $part_export ( @part_export ) {
+%>
+      <TR>
+        <TD><%= $part_export->exporttype %> to <%= $part_export->machine %></TD>
+        <TD>(options)</TD>
+<%  } %>
+      </TR><TR><TD COLSPAN=2><A HREF="<%= $p %>edit/part_export.cgi?new_with_svcpart=<%= $part_svc->svcpart %>"><I>Add a new export</I><A></TD></TR>
+<% if (@part_export) { %>
+      <TR><TD COLSPAN=2>
+        <FORM METHOD="POST" ACTION="<%= $p %>edit/part_export.cgi">
+        <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $part_svc->svcpart %>">
+        <SELECT NAME="clone"><OPTION></OPTION>
+<%   foreach my $part_export ( @part_export ) { %>
+          <OPTION VALUE="<%= $part_export->exportnum %>">
+            <%= $part_export->exporttype %> to <%= $part_export->machine %>
+          </OPTION>
+<%   } %>
+        <INPUT TYPE="submit" VALUE="clone existing export">
+        </FORM></TD></TR>
+<% } %>
+      </TABLE></TD>
 
 <%   my($n1)='';
      foreach my $field ( @fields ) {
@@ -73,7 +98,7 @@ my $total = scalar(@part_svc);
 <% } %>
 
   <TR>
-    <TD COLSPAN=<%= $cgi->param('showdisabled') ? 6 : 7 %>><A HREF="<%= $p %>edit/part_svc.cgi"><I>Add a new service definition</I></A></TD>
+    <TD COLSPAN=<%= $cgi->param('showdisabled') ? 7 : 8 %>><A HREF="<%= $p %>edit/part_svc.cgi"><I>Add a new service definition</I></A></TD>
   </TR>
 </TABLE>
 </BODY>
-- 
cgit v1.2.1


From 14d6b3092a296ada5a0252752fd15a0087c63374 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Mar 2002 15:52:12 +0000
Subject: added (incomplete) export foo

---
 httemplate/edit/part_export.cgi         | 80 +++++++++++++++++++++++++++++++++
 httemplate/edit/process/part_export.cgi | 43 ++++++++++++++++++
 2 files changed, 123 insertions(+)
 create mode 100644 httemplate/edit/part_export.cgi
 create mode 100644 httemplate/edit/process/part_export.cgi

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
new file mode 100644
index 000000000..ffce0438f
--- /dev/null
+++ b/httemplate/edit/part_export.cgi
@@ -0,0 +1,80 @@
+<!-- mason kludge -->
+<%
+
+#if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
+#  $cgi->param('clone', $1);
+#} else {
+#  $cgi->param('clone', '');
+#}
+#if ( $cgi->param('svcpart') && $cgi->param('svcpart') =~ /^(\d+)$/ ) {
+#  $cgi->param('svcpart', $1);
+#} else {
+#  $cgi->param('svcpart', '');
+#}
+
+my($query) = $cgi->keywords;
+my $action = '';
+my $part_export = '';
+my $options = {};
+if ( $cgi->param('error') ) {
+  $part_export = new FS::part_export ( {
+    map { $_, scalar($cgi->param($_)) } fields('part_export')
+  } );
+}
+
+warn "***$query***";
+if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
+  $action = 'Add';
+  my $old_part_export = qsearchs('part_export', { 'exportnum' => $1 } );
+  unless ( $part_export ) {
+    ($part_export, $options) = $old_part_export->clone;
+  }
+} elsif ( $cgi->param('new_with_svcpart') 
+          && $cgi->param('new_with_svcpart') =~ /^(\d+)$/ ) {
+  $part_export ||= new FS::part_export ( { 'svcpart' => $1 } );
+} elsif ( $query =~ /^(\d+)$/ ) {
+  $part_export ||= qsearchs('part_export', { 'exportnum' => $1 } );
+}
+$action ||= $part_export->exportnum ? 'Edit' : 'Add';
+
+my @types = qw(shell bsdshell textradius sqlradius cp);
+
+%>
+<%= header("$action Export", menubar(
+  'Main Menu' => popurl(2),
+), ' onLoad="visualize()"')
+%>
+
+<% if ( $cgi->param('error') ) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+<% } %>
+
+<FORM ACTION="<%= popurl(1) %>process/part_export.cgi" METHOD=POST>
+<% #print '<FORM NAME="dummy">'; %>
+
+<%= ntable("#cccccc",2) %>
+<TR>
+  <TD ALIGN="right">Service</TD>
+  <TD BGCOLOR="#ffffff">
+    <%= $part_export->svcpart %> - <%= $part_export->part_svc->svc %>
+  </TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Export</TD>
+  <TD><SELECT NAME="exporttype"><OPTION></OPTION>
+<% foreach my $type ( @types ) { %>
+    <OPTION><%= $type %></OPTION>
+<% } %>
+  </SELECT></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Export host</TD>
+  <TD>
+    <INPUT TYPE="text" NAME="machine" VALUE="<%= $part_export->machine %>">
+  </TD>
+</TR>
+</TABLE>
+</FORM>
+</BODY>
+</HTML>
+
diff --git a/httemplate/edit/process/part_export.cgi b/httemplate/edit/process/part_export.cgi
new file mode 100644
index 000000000..9ee1c5974
--- /dev/null
+++ b/httemplate/edit/process/part_export.cgi
@@ -0,0 +1,43 @@
+<%
+
+my $dbh = dbh;
+
+my $exportnum = $cgi->param('exportnum');
+
+my $old = qsearchs('part_export', { 'exportnum'=>$exportnum } ) if $exportnum;
+
+my $new = new FS::part_export ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('part_export')
+} );
+
+local $SIG{HUP} = 'IGNORE';
+local $SIG{INT} = 'IGNORE';
+local $SIG{QUIT} = 'IGNORE';
+local $SIG{TERM} = 'IGNORE';
+local $SIG{TSTP} = 'IGNORE';
+local $SIG{PIPE} = 'IGNORE';
+
+local $FS::UID::AutoCommit = 0;
+
+my $error;
+if ( $exportnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $exportnum = $new->exportnum;
+}
+if ( $error ) {
+  $dbh->rollback;
+  $cgi->param('error', $error );
+  print $cgi->redirect(popurl(2). "part_export.cgi?". $cgi->query_string );
+  myexit();
+}
+
+#options
+
+$dbh->commit or die $dbh->errstr;
+print $cgi->redirect(popurl(3). "browse/part_svc.cgi");
+
+%>
-- 
cgit v1.2.1


From dd12d8bcbb33acb0ffa087a70c566e8328fbe9c3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Mar 2002 16:05:35 +0000
Subject: handle inserting cust_svc and svc_acct records separately also, to
 handle imports preserving svcnum

---
 FS/FS/svc_Common.pm | 10 +++++++++-
 FS/FS/svc_acct.pm   | 10 ++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 042c243fd..ee190fb8d 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -69,6 +69,14 @@ sub insert {
       return $error;
     }
     $svcnum = $self->svcnum($cust_svc->svcnum);
+  } else {
+    $cust_svc = qsearchs('cust_svc',{'svcnum'=>$self->svcnum});
+    unless ( $cust_svc ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "no cust_svc record found for svcnum ". $self->svcnum;
+    }
+    $self->pkgnum($cust_svc->pkgnum);
+    $self->svcpart($cust_svc->svcpart);
   }
 
   $error = $self->SUPER::insert;
@@ -207,7 +215,7 @@ sub cancel { ''; }
 
 =head1 VERSION
 
-$Id: svc_Common.pm,v 1.7 2001-11-30 00:04:38 ivan Exp $
+$Id: svc_Common.pm,v 1.8 2002-03-18 16:05:35 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 3c564ec9d..bb9fe67b3 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -273,6 +273,16 @@ sub insert {
                                'domsvc'   => $self->domsvc,
                              } );
 
+  if ( $self->svcnum ) {
+    my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$self->svcnum});
+    unless ( $cust_svc ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "no cust_svc record found for svcnum ". $self->svcnum;
+    }
+    $self->pkgnum($cust_svc->pkgnum);
+    $self->svcpart($cust_svc->svcpart);
+  }
+
   my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
   return "Unknown svcpart" unless $part_svc;
   return "uid in use"
-- 
cgit v1.2.1


From c6bc9049d8836fb3c362eb738f99ce238981fbcf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Mar 2002 16:07:04 +0000
Subject: removing backup-freeside script from here

---
 bin/backup-freeside | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 bin/backup-freeside

diff --git a/bin/backup-freeside b/bin/backup-freeside
deleted file mode 100644
index a39b04692..000000000
--- a/bin/backup-freeside
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-/etc/init.d/apache stop
-/etc/init.d/mysql stop
-tar czvf var-lib-mysql-`date +%y%m%d%H%M%S`.tar.gz /var/lib/mysql
-/etc/init.d/mysql start
-/etc/init.d/apache start
-- 
cgit v1.2.1


From f7e1679114d88fcb8499aafb5386616c93a7c9ee Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Mar 2002 17:50:54 +0000
Subject: fixes bug#367 (yay, that one was annoying):

in config editor, initial newlines in <textarea>s are lost.  even if
you didn't mean to edit them you remove that..
---
 httemplate/config/config.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 5013de0dc..4f19ee961 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -57,7 +57,7 @@ function SafeOnsubmit() {
           <% if ( $type eq '' ) { %>
             <font color="#ff0000">no type</font>
           <% } elsif ( $type eq 'textarea' ) { %>
-            <textarea name="<%= $i->key. $n %>" rows=5><%= join("\n", $conf->config($i->key) ) %></textarea>
+            <textarea name="<%= $i->key. $n %>" rows=5><%= "\n". join("\n", $conf->config($i->key) ) %></textarea>
           <% } elsif ( $type eq 'checkbox' ) { %>
             <input name="<%= $i->key. $n %>" type="checkbox" value="1"<%= $conf->exists($i->key) ? ' CHECKED' : '' %>>
           <% } elsif ( $type eq 'text' )  { %>
-- 
cgit v1.2.1


From d6b3ef73dad849de63c61472f00732e301482d13 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Mar 2002 19:40:53 +0000
Subject: update quickpay for current search capabilities

---
 httemplate/search/cust_main-quickpay.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/httemplate/search/cust_main-quickpay.html b/httemplate/search/cust_main-quickpay.html
index 3f0ba0412..9f39db914 100755
--- a/httemplate/search/cust_main-quickpay.html
+++ b/httemplate/search/cust_main-quickpay.html
@@ -12,14 +12,18 @@
       <INPUT TYPE="checkbox" NAME="last_on" CHECKED> Search for <B>last name</B>: 
       <INPUT TYPE="text" NAME="last_text">
       using search method: <SELECT NAME="last_type">
-        <OPTION SELECTED>Fuzzy
+        <OPTION SELECTED>All
+        <OPTION>Fuzzy
+        <OPTION>Substring
         <OPTION>Exact
       </SELECT>
 
       <P><INPUT TYPE="checkbox" NAME="company_on" CHECKED> Search for <B>company</B>: 
       <INPUT TYPE="text" NAME="company_text">
       using search methods: <SELECT NAME="company_type">
-        <OPTION SELECTED>Fuzzy
+        <OPTION SELECTED>All
+        <OPTION>Fuzzy
+        <OPTION>Substring
         <OPTION>Exact
       </SELECT>
 
@@ -29,7 +33,9 @@
 
   <HR>Explanation of search methods:
   <UL>
+    <LI><B>All</B> - Try all search methods.
     <LI><B>Fuzzy</B> - Searches for matches that are close to your text.
+    <LI><B>Substring</B> - Searches for matches that contain your text.
     <LI><B>Exact</B> - Finds exact matches only, but much faster than the other search methods.
   </UL>
   </BODY>
-- 
cgit v1.2.1


From d4dabf21a2c9022dfb7023fb5df49f1536b2f29a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Mar 2002 19:49:10 +0000
Subject: fixes: bug #348 - adds the ability to email on deleted payments.

---
 FS/FS/Conf.pm      |  4 ++--
 FS/FS/Record.pm    |  3 ++-
 FS/FS/cust_bill.pm |  3 ++-
 FS/FS/cust_pay.pm  | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 18725ced2..a3269b1c4 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -291,8 +291,8 @@ httemplate/docs/config.html
   {
     'key'         => 'deletepayments',
     'section'     => 'UI',
-    'description' => 'Enable deletion of unclosed payments.  Be very careful!  Only delete payments that were data-entry errors, not adjustments.',
-    'type'        => 'checkbox',
+    'description' => 'Enable deletion of unclosed payments.  Be very careful!  Only delete payments that were data-entry errors, not adjustments. Optionally specify one or more comma-separated email addresses to be notified when a payment is deleted.',
+    'type'        => [qw( checkbox text )],
   },
 
   {
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index ea660d48a..0bd7aeda4 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -571,7 +571,8 @@ sub delete {
   $h_sth->execute or return $h_sth->errstr if $h_sth;
   dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
 
-  undef $self; #no need to keep object!
+  #no need to needlessly destoy the data either
+  #undef $self; #no need to keep object!
 
   '';
 }
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index c3524b984..092c174b4 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -388,6 +388,7 @@ sub send {
   #my @print_text = $cust_bill->print_text; #( date )
   my @invoicing_list = $self->cust_main->invoicing_list;
   if ( grep { $_ ne 'POST' } @invoicing_list ) { #email invoice
+    #false laziness w/FS::cust_pay::delete
     #$ENV{SMTPHOSTS} = $smtpmachine;
     $ENV{MAILADDRESS} = $invoice_from;
     my $header = new Mail::Header ( [
@@ -882,7 +883,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.22 2002-03-07 14:13:21 ivan Exp $
+$Id: cust_bill.pm,v 1.23 2002-03-18 19:49:10 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 6156eadeb..421f0200e 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -1,7 +1,10 @@
 package FS::cust_pay;
 
 use strict;
-use vars qw( @ISA $conf $unsuspendauto );
+use vars qw( @ISA $conf $unsuspendauto $smtpmachine $invoice_from );
+use Date::Format;
+use Mail::Header;
+use Mail::Internet;
 use Business::CreditCard;
 use FS::UID qw( dbh );
 use FS::Record qw( dbh qsearch qsearchs dbh );
@@ -16,6 +19,8 @@ $FS::UID::callback{'FS::cust_pay'} = sub {
 
   $conf = new FS::Conf;
   $unsuspendauto = $conf->exists('unsuspendauto');
+  $smtpmachine = $conf->config('smtpmachine');
+  $invoice_from = $conf->config('invoice_from');
 
 };
 
@@ -256,6 +261,47 @@ sub delete {
     return $error;
   }
 
+  if ( $conf->config('deletepayments') ne '' ) {
+
+    my $cust_main = qsearchs('cust_main',{ 'custnum' => $self->custnum });
+    #false laziness w/FS::cust_bill::send
+    $ENV{MAILADDRESS} = $conf->config('invoice_from'); #??? well as good as any
+    my $header = new Mail::Header ( [
+      "From: $invoice_from",
+      "To: ". $conf->config('deletepayments'),
+      "Sender: $invoice_from",
+      "Reply-To: $invoice_from",
+      "Date: ". time2str("%a, %d %b %Y %X %z", time),
+      "Subject: FREESIDE NOTIFICATION: Payment deleted",
+    ] );
+    my $message = new Mail::Internet (
+      'Header' => $header,
+      'Body' => [ 
+        "This is an automatic message from your Freeside installation\n",
+        "informing you that the following payment has been deleted:\n",
+        "\n",
+        'paynum: '. $self->paynum. "\n",
+        'custnum: '. $self->custnum.
+          " (". $cust_main->last. ", ". $cust_main->first. ")\n",
+        'paid: $'. sprintf("%.2f", $self->paid). "\n",
+        'date: '. time2str("%a %b %e %T %Y", $self->_date). "\n",
+        'payby: '. $self->payby. "\n",
+        'payinfo: '. $self->payinfo. "\n",
+        'paybatch: '. $self->paybatch. "\n",
+      ],
+    );
+    $!=0;
+    $message->smtpsend( Host => $smtpmachine )
+      or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
+        or do {
+          $dbh->rollback if $oldAutoCommit;
+          return "(customer # ". $self->custnum.
+                 ") can't send payment deletion email to ".
+                 $conf->config('deletepayments').
+                 " via server $smtpmachine with SMTP: $!";
+        };
+  }
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   '';
@@ -359,7 +405,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.17 2002-02-10 18:56:49 ivan Exp $
+$Id: cust_pay.pm,v 1.18 2002-03-18 19:49:10 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 105c166a23234dd923757a477b4efcda65fb2881 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Mar 2002 20:51:09 +0000
Subject: okay, now you can specify an alternate invoice template, and it'll be
 auto-createad and added to the list of configuration options. closes: Bug#314

---
 FS/FS/Conf.pm                       | 36 +++++++++++++++++++++++++++---------
 FS/FS/part_bill_event.pm            | 19 ++++++++++++++++++-
 httemplate/edit/part_bill_event.cgi |  8 ++++++++
 3 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index a3269b1c4..e1384bd4c 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2,6 +2,7 @@ package FS::Conf;
 
 use vars qw($default_dir @config_items $DEBUG );
 use IO::File;
+use File::Basename;
 use FS::ConfItem;
 
 $DEBUG = 0;
@@ -25,6 +26,10 @@ FS::Conf - Freeside configuration values
   @list  = $conf->config('key');
   $bool  = $conf->exists('key');
 
+  $conf->touch('key');
+  $conf->set('key' => 'value');
+  $conf->delete('key');
+
   @config_items = $conf->config_items;
 
 =head1 DESCRIPTION
@@ -67,7 +72,7 @@ sub dir {
   $1;
 }
 
-=item config 
+=item config KEY
 
 Returns the configuration value or values (depending on context) for key.
 
@@ -90,7 +95,7 @@ sub config {
   }
 }
 
-=item exists
+=item exists KEY
 
 Returns true if the specified key exists, even if the corresponding value
 is undefined.
@@ -103,7 +108,9 @@ sub exists {
   -e "$dir/$file";
 }
 
-=item touch
+=item touch KEY
+
+Creates the specified configuration key if it does not exist.
 
 =cut
 
@@ -116,7 +123,9 @@ sub touch {
   }
 }
 
-=item set
+=item set KEY VALUE
+
+Sets the specified configuration key to the given value.
 
 =cut
 
@@ -139,7 +148,9 @@ sub set {
 #             return ! eval { join('',@_), kill 0; 1; };
 #         }
 
-=item delete
+=item delete KEY
+
+Deletes the specified configuration key.
 
 =cut
 
@@ -160,16 +171,23 @@ L<FS::ConfItem>.
 =cut
 
 sub config_items {
-#  my $self = shift; 
-  @config_items;
+  my $self = shift; 
+  #quelle kludge
+  @config_items,
+  map { new FS::ConfItem {
+                           'key'         => basename($_),
+                           'section'     => 'billing',
+                           'description' => 'Alternate template file for invoices.  See the <a href="../docs/billing.html">billing documentation</a> for details.',
+                           'type'        => 'textarea',
+                         }
+      } glob($self->dir. '/invoice_template_*')
+  ;
 }
 
 =back
 
 =head1 BUGS
 
-Write access (touch, set, delete) should be documented.
-
 If this was more than just crud that will never be useful outside Freeside I'd
 worry that config_items is freeside-specific and icky.
 
diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
index 70c8a56ec..40f7fc79d 100644
--- a/FS/FS/part_bill_event.pm
+++ b/FS/FS/part_bill_event.pm
@@ -126,6 +126,8 @@ sub check {
 
       or $c =~ /^\s*\$cust_bill\->(comp|realtime_card|realtime_card_cybercash|batch_card|send)\(\);\s*$/
 
+      or $c =~ /^\s*\$cust_bill\->send\(\'\w+\'\);\s*$/
+
       or $c =~ /^\s*\$cust_main\->apply_payments; \$cust_main->apply_credits; "";\s*$/
 
       or $c =~ /^\s*\$cust_main\->charge\( \s*\d*\.?\d*\s*,\s*\'[\w \!\@\#\$\%\&\(\)\-\+\;\:\"\,\.\?\/]*\'\s*\);\s*$/
@@ -137,7 +139,7 @@ sub check {
 
   }
 
-  $self->ut_numbern('eventpart')
+  my $error = $self->ut_numbern('eventpart')
     || $self->ut_enum('payby', [qw( CARD BILL COMP )] )
     || $self->ut_text('event')
     || $self->ut_anything('eventcode')
@@ -147,6 +149,21 @@ sub check {
     || $self->ut_textn('plan')
     || $self->ut_anything('plandata')
   ;
+  return $error if $error;
+
+  #quelle kludge
+  if ( $self->plandata =~ /^templatename\s+(.*)$/ ) {
+    my $name= $1;
+    unless ( $conf->config("invoice_template_$name") ) {
+      $conf->set(
+        "invoice_template_$name" =>
+          join("\n", $conf->config('invoice_template') )
+      );
+    }
+  }
+
+  '';
+
 }
 
 =back
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 018fc94a4..324daeb90 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -126,6 +126,14 @@ tie my %events, 'Tie::IxHash',
     'weight' => 50,
   },
 
+  'send_alternate' => {
+    'name' => 'Send invoice (email/print) with alternate template',
+    'code' => '$cust_bill->send(\'%%%templatename%%%\');',
+    'html' =>
+        '<INPUT TYPE="text" NAME="templatename" VALUE="%%%templatename%%%">',
+    'weight' => 50,
+  },
+
   'bill' => {
     'name' => 'Generate invoices (normally only used with a <i>Late Fee</i> event)',
     'code' => '$cust_main->bill();',
-- 
cgit v1.2.1


From d65d05b7aaa329fb6005fb7ed4a24daab4fa7941 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Mar 2002 21:40:17 +0000
Subject: bugfixes, closes Bug#314

---
 FS/FS/Conf.pm            |  8 +++++--
 FS/FS/cust_bill.pm       | 62 ++++++++++++++++++++++++++----------------------
 FS/FS/part_bill_event.pm |  2 +-
 3 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e1384bd4c..91fea7ef7 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -174,8 +174,12 @@ sub config_items {
   my $self = shift; 
   #quelle kludge
   @config_items,
-  map { new FS::ConfItem {
-                           'key'         => basename($_),
+  map { 
+        my $basename = basename($_);
+        $basename =~ /^(.*)$/;
+        $basename = $1;
+        new FS::ConfItem {
+                           'key'         => $basename,
                            'section'     => 'billing',
                            'description' => 'Alternate template file for invoices.  See the <a href="../docs/billing.html">billing documentation</a> for details.',
                            'type'        => 'textarea',
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 092c174b4..0a8d4a4ae 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1,7 +1,7 @@
 package FS::cust_bill;
 
 use strict;
-use vars qw( @ISA $conf $invoice_template $money_char );
+use vars qw( @ISA $conf $money_char );
 use vars qw( $lpr $invoice_from $smtpmachine );
 use vars qw( $processor );
 use vars qw( $xaction $E_NoErr );
@@ -30,21 +30,6 @@ $FS::UID::callback{'FS::cust_bill'} = sub {
 
   $money_char = $conf->config('money_char') || '$';  
 
-  my @invoice_template = $conf->config('invoice_template')
-    or die "cannot load config file invoice_template";
-  $invoice_lines = 0;
-  foreach ( grep /invoice_lines\(\d+\)/, @invoice_template ) { #kludgy
-    /invoice_lines\((\d+)\)/;
-    $invoice_lines += $1;
-  }
-  die "no invoice_lines() functions in template?" unless $invoice_lines;
-  $invoice_template = new Text::Template (
-    TYPE   => 'ARRAY',
-    SOURCE => [ map "$_\n", @invoice_template ],
-  ) or die "can't create new Text::Template object: $Text::Template::ERROR";
-  $invoice_template->compile()
-    or die "can't compile template: $Text::Template::ERROR";
-
   $lpr = $conf->config('lpr');
   $invoice_from = $conf->config('invoice_from');
   $smtpmachine = $conf->config('smtpmachine');
@@ -383,7 +368,7 @@ emails or print.  See L<FS::cust_main_invoice>.
 =cut
 
 sub send {
-  my $self = shift;
+  my($self,$template) = @_;
 
   #my @print_text = $cust_bill->print_text; #( date )
   my @invoicing_list = $self->cust_main->invoicing_list;
@@ -401,7 +386,7 @@ sub send {
     ] );
     my $message = new Mail::Internet (
       'Header' => $header,
-      'Body' => [ $self->print_text ], #( date)
+      'Body' => [ $self->print_text('', $template) ], #( date)
     );
     $!=0;
     $message->smtpsend( Host => $smtpmachine )
@@ -702,7 +687,7 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 sub print_text {
 
-  my( $self, $today ) = ( shift, shift );
+  my( $self, $today, $template ) = @_;
   $today ||= time;
 #  my $invnum = $self->invnum;
   my $cust_main = qsearchs('cust_main', { 'custnum', $self->custnum } );
@@ -811,8 +796,25 @@ sub print_text {
   push @buf,['Balance Due', $money_char. 
     sprintf("%10.2f", $balance_due ) ];
 
+  #create the template
+  my $templatefile = 'invoice_template';
+  $templatefile .= "_$template" if $template;
+  my @invoice_template = $conf->config($templatefile)
+  or die "cannot load config file $templatefile";
+  $invoice_lines = 0;
+  foreach ( grep /invoice_lines\(\d+\)/, @invoice_template ) { #kludgy
+    /invoice_lines\((\d+)\)/;
+    $invoice_lines += $1;
+  }
+  die "no invoice_lines() functions in template?" unless $invoice_lines;
+  my $invoice_template = new Text::Template (
+    TYPE   => 'ARRAY',
+    SOURCE => [ map "$_\n", @invoice_template ],
+  ) or die "can't create new Text::Template object: $Text::Template::ERROR";
+  $invoice_template->compile()
+    or die "can't compile template: $Text::Template::ERROR";
+
   #setup template variables
-  
   package FS::cust_bill::_template; #!
   use vars qw( $invnum $date $page $total_pages @address $overdue @buf );
 
@@ -847,13 +849,13 @@ sub print_text {
   $FS::cust_bill::_template::address[$l++] = $cust_main->country
     unless $cust_main->country eq 'US';
 
-  #overdue? (variable for the template)
-  $FS::cust_bill::_template::overdue = ( 
-    $balance_due > 0
-    && $today > $self->_date 
-#    && $self->printed > 1
-    && $self->printed > 0
-  );
+	#  #overdue? (variable for the template)
+	#  $FS::cust_bill::_template::overdue = ( 
+	#    $balance_due > 0
+	#    && $today > $self->_date 
+	##    && $self->printed > 1
+	#    && $self->printed > 0
+	#  );
 
   #and subroutine for the template
 
@@ -864,7 +866,9 @@ sub print_text {
     }
     ( 1 .. $lines );
   }
-    
+
+
+  #and fill it in
   $FS::cust_bill::_template::page = 1;
   my $lines;
   my @collect;
@@ -883,7 +887,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.23 2002-03-18 19:49:10 ivan Exp $
+$Id: cust_bill.pm,v 1.24 2002-03-18 21:40:17 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
index 40f7fc79d..a31b09b36 100644
--- a/FS/FS/part_bill_event.pm
+++ b/FS/FS/part_bill_event.pm
@@ -154,7 +154,7 @@ sub check {
   #quelle kludge
   if ( $self->plandata =~ /^templatename\s+(.*)$/ ) {
     my $name= $1;
-    unless ( $conf->config("invoice_template_$name") ) {
+    unless ( $conf->exists("invoice_template_$name") ) {
       $conf->set(
         "invoice_template_$name" =>
           join("\n", $conf->config('invoice_template') )
-- 
cgit v1.2.1


From cd2371a35a0c416366fa1822d99571ca68a5ad1e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Mar 2002 17:48:28 +0000
Subject: changes dum big "state/county/country" select to three, linked with
 javascript closes: Bug#353

---
 FS/FS/cust_main_county.pm             | 136 +++++++++++++++++++++++++++++++++-
 httemplate/edit/cust_main.cgi         |  79 +++++++++-----------
 httemplate/edit/process/cust_main.cgi |  13 ----
 3 files changed, 169 insertions(+), 59 deletions(-)

diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index 383360b7b..17fe164e4 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -1,10 +1,21 @@
 package FS::cust_main_county;
 
 use strict;
-use vars qw( @ISA );
-use FS::Record;
+use vars qw( @ISA @EXPORT_OK $conf
+             @cust_main_county %cust_main_county $countyflag );
+use Exporter;
+use FS::Record qw( qsearch );
 
 @ISA = qw( FS::Record );
+@EXPORT_OK = qw( regionselector );
+
+@cust_main_county = ();
+$countyflag = '';
+
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::cust_main_county'} = sub { 
+  $conf = new FS::Conf;
+};
 
 =head1 NAME
 
@@ -25,6 +36,9 @@ FS::cust_main_county - Object methods for cust_main_county objects
 
   $error = $record->check;
 
+  ($county_html, $state_html, $country_html) =
+    FS::cust_main_county::regionselector( $county, $state, $country );
+
 =head1 DESCRIPTION
 
 An FS::cust_main_county object represents a tax rate, defined by locale.
@@ -94,12 +108,126 @@ sub check {
 
 =back
 
-=head1 VERSION
+=head1 SUBROUTINES
 
-$Id: cust_main_county.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+=over 4
+
+=item regionselector [ COUNTY STATE COUNTRY [ PREFIX [ ONCHANGE ] ] ]
+
+=cut
+
+sub regionselector {
+  my ( $selected_county, $selected_state, $selected_country,
+       $prefix, $onchange ) = @_;
+  $countyflag=1 if $selected_county;
+
+  unless ( @cust_main_county ) { #cache 
+    @cust_main_county = qsearch('cust_main_county', {} );
+    foreach my $c ( @cust_main_county ) {
+      $countyflag=1 if $c->county;
+      push @{$cust_main_county{$c->country}{$c->state}}, $c->county;
+    }
+  }
+
+  my $script_html = <<END;
+    <SCRIPT>
+    function opt(what,value,text) {
+      var optionName = new Option(text, value, false, false);
+      var length = what.length;
+      what.options[length] = optionName;
+    }
+    function ${prefix}country_changed(what) {
+      country = what.options[what.selectedIndex].text;
+      for ( var i = what.form.${prefix}state.length; i >= 0; i-- )
+          what.form.${prefix}state.options[i] = null;
+END
+      #what.form.${prefix}state.options[0] = new Option('', '', false, true);
+
+  foreach my $country ( sort keys %cust_main_county ) {
+    $script_html .= "\nif ( country == \"$country\" ) {\n";
+    foreach my $state ( sort keys %{$cust_main_county{$country}} ) {
+      my $text = $state || '(n/a)';
+      $script_html .= qq!opt(what.form.${prefix}state, "$state", "$text");\n!;
+    }
+    $script_html .= "}\n";
+  }
+
+  $script_html .= <<END;
+    }
+    function ${prefix}state_changed(what) {
+END
+
+  if ( $countyflag ) {
+    $script_html .= <<END;
+      state = what.options[what.selectedIndex].text;
+      country = what.form.${prefix}country.options[what.form.${prefix}country.selectedIndex].text;
+      for ( var i = what.form.${prefix}county.length; i >= 0; i-- )
+          what.form.${prefix}county.options[i] = null;
+END
+
+    foreach my $country ( sort keys %cust_main_county ) {
+      $script_html .= "\nif ( country == \"$country\" ) {\n";
+      foreach my $state ( sort keys %{$cust_main_county{$country}} ) {
+        $script_html .= "\nif ( state == \"$state\" ) {\n";
+          foreach my $county ( sort @{$cust_main_county{$country}{$state}} ) {
+            my $text = $county || '(n/a)';
+            $script_html .=
+              qq!opt(what.form.${prefix}county, "$county", "$text");\n!;
+          }
+        $script_html .= "}\n";
+      }
+      $script_html .= "}\n";
+    }
+  }
+
+  $script_html .= <<END;
+    }
+    </SCRIPT>
+END
+
+  my $county_html = $script_html;
+  if ( $countyflag ) {
+    $county_html .= qq!<SELECT NAME="${prefix}county" onChange="$onchange">!;
+    $county_html .= '</SELECT>';
+  } else {
+    $county_html .=
+      qq!<INPUT TYPE="hidden" NAME="${prefix}county" VALUE="$selected_county">!;
+  }
+
+  my $state_html = qq!<SELECT NAME="${prefix}state" !.
+                   qq!onChange="${prefix}state_changed(this); $onchange">!;
+  foreach my $state ( sort keys %{ $cust_main_county{$selected_country} } ) {
+    my $text = $state || '(n/a)';
+    my $selected = $state eq $selected_state ? 'SELECTED' : '';
+    $state_html .= "\n<OPTION $selected VALUE=$state>$text</OPTION>"
+  }
+  $state_html .= '</SELECT>';
+
+  $state_html .= '</SELECT>';
+
+  my $country_html = qq!<SELECT NAME="${prefix}country" !.
+                     qq!onChange="${prefix}country_changed(this); $onchange">!;
+  my $countrydefault = $conf->config('countrydefault') || 'US';
+  foreach my $country (
+    sort { ($b eq $countrydefault) <=> ($a eq $countrydefault) or $a cmp $b }
+      keys %cust_main_county
+  ) {
+    my $selected = $country eq $selected_country ? ' SELECTED' : '';
+    $country_html .= "\n<OPTION$selected>$country</OPTION>"
+  }
+  $country_html .= '</SELECT>';
+
+  ($county_html, $state_html, $country_html);
+
+}
+
+=back
 
 =head1 BUGS
 
+regionseletor?  putting web ui components in here?  they should probably live
+somewhere else...
+
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::cust_main>, L<FS::cust_bill>, schema.html from the base
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 89a946b0f..39b6ca594 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -69,7 +69,7 @@ print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST NAME="form1">!,
 
 # agent
 
-my $r = qq!<font color="#ff0000">*</font>!;
+my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
 my @agents = qsearch( 'agent', {} );
 #die "No agents created!" unless @agents;
@@ -147,7 +147,7 @@ my($last,$first,$ss,$company,$address1,$address2,$city,$zip)=(
 );
 
 print "<BR><BR>Billing address", &itable("#cccccc"), <<END;
-<TR><TH ALIGN="right">${r}Contact name<BR>(last, first)</TH><TD COLSPAN=3>
+<TR><TH ALIGN="right">${r}Contact&nbsp;name<BR>(last,&nbsp;first)</TH><TD COLSPAN=3>
 END
 
 print <<END;
@@ -167,30 +167,24 @@ print <<END;
 <TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="company" VALUE="$company" SIZE=70></TD></TR>
 <TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=70></TD></TR>
 <TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=70></TD></TR>
-<TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="state" SIZE="1">
+<TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD><TH ALIGN="right">${r}State</TH><TD>
 END
 
-#false laziness with ship_state
+#false laziness with ship state
 my $countrydefault = $conf->config('countrydefault') || 'US';
 $cust_main->country( $countrydefault ) unless $cust_main->country;
+
 $cust_main->state( $conf->config('statedefault') || 'CA' )
   unless $cust_main->state || $cust_main->country ne 'US';
-foreach ( sort {
-     ( $b->country eq $countrydefault ) <=> ( $a->country eq $countrydefault )
-  or $a->country                        cmp $b->country
-  or $a->state                          cmp $b->state
-  or $a->county                         cmp $b->county
-} qsearch('cust_main_county',{}) ) {
-  print "<OPTION";
-  print " SELECTED" if ( $cust_main->state eq $_->state
-                         && $cust_main->county eq $_->county 
-                         && $cust_main->country eq $_->country
-                       );
-  print ">",$_->state;
-  print " (",$_->county,")" if $_->county;
-  print " / ", $_->country;
-}
-print qq!</SELECT></TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10></TD></TR>!;
+
+my($county_html, $state_html, $country_html) =
+  FS::cust_main_county::regionselector( $cust_main->county,
+                                        $cust_main->state,
+                                        $cust_main->country );
+
+print "$county_html $state_html";
+
+print qq!</TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10></TD></TR>!;
 
 my($daytime,$night,$fax)=(
   $cust_main->daytime,
@@ -199,12 +193,13 @@ my($daytime,$night,$fax)=(
 );
 
 print <<END;
+<TR><TH ALIGN="right">${r}Country</TH><TD>$country_html</TD></TR>
 <TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18></TD></TR>
 <TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18></TD></TR>
 <TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12></TD></TR>
 END
 
-print "</TABLE>$r required fields<BR>";
+print "</TABLE>${r}required fields<BR>";
 
 # service address
 
@@ -221,7 +216,11 @@ END
 print "      what.form.ship_$_.value = what.form.$_.value;\n"
   for (qw( last first company address1 address2 city zip daytime night fax ));
 print <<END;
+      what.form.ship_country.selectedIndex = what.form.country.selectedIndex;
+      ship_country_changed(what.form.ship_country);
       what.form.ship_state.selectedIndex = what.form.state.selectedIndex;
+      ship_state_changed(what.form.ship_state);
+      what.form.ship_county.selectedIndex = what.form.county.selectedIndex;
     }
   }
   </SCRIPT>
@@ -251,7 +250,7 @@ END
   );
 
   print &itable("#cccccc"), <<END;
-  <TR><TH ALIGN="right">${r}Contact name<BR>(last, first)</TH><TD COLSPAN=5>
+  <TR><TH ALIGN="right">${r}Contact&nbsp;name<BR>(last,&nbsp;first)</TH><TD COLSPAN=5>
 END
 
   print <<END;
@@ -264,30 +263,25 @@ END
   <TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_company" VALUE="$ship_company" SIZE=70 onChange="changed(this)"></TD></TR>
   <TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_address1" VALUE="$ship_address1" SIZE=70 onChange="changed(this)"></TD></TR>
   <TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_address2" VALUE="$ship_address2" SIZE=70 onChange="changed(this)"></TD></TR>
-  <TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="ship_city" VALUE="$ship_city" onChange="changed(this)"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="ship_state" SIZE="1" onChange="changed(this)">
+  <TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="ship_city" VALUE="$ship_city" onChange="changed(this)"></TD><TH ALIGN="right">${r}State</TH><TD>
 END
 
   #false laziness with regular state
-  $cust_main->ship_country( $conf->config('countrydefault') || 'US' )
-    unless $cust_main->ship_country;
+  $cust_main->ship_country( $countrydefault ) unless $cust_main->ship_country;
+
   $cust_main->ship_state( $conf->config('statedefault') || 'CA' )
     unless $cust_main->ship_state || $cust_main->ship_country ne 'US';
-  foreach ( sort {
-       ( $b->country eq $countrydefault ) <=> ( $a->country eq $countrydefault )
-    or $a->country                        cmp $b->country
-    or $a->state                          cmp $b->state
-    or $a->county                         cmp $b->county
-  } qsearch('cust_main_county',{}) ) {
-    print "<OPTION";
-    print " SELECTED" if ( $cust_main->ship_state eq $_->state
-                           && $cust_main->ship_county eq $_->county 
-                           && $cust_main->ship_country eq $_->country
-                         );
-    print ">",$_->state;
-    print " (",$_->county,")" if $_->county;
-    print " / ", $_->country;
-  }
-  print qq!</SELECT></TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="ship_zip" VALUE="$ship_zip" SIZE=10 onChange="changed(this)"></TD></TR>!;
+
+  my($ship_county_html, $ship_state_html, $ship_country_html) =
+    FS::cust_main_county::regionselector( $cust_main->ship_county,
+                                          $cust_main->ship_state,
+                                          $cust_main->ship_country,
+                                          'ship_',
+                                          'changed(this)', );
+
+  print "$ship_county_html $ship_state_html";
+
+  print qq!</TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="ship_zip" VALUE="$ship_zip" SIZE=10 onChange="changed(this)"></TD></TR>!;
 
   my($ship_daytime,$ship_night,$ship_fax)=(
     $cust_main->ship_daytime,
@@ -296,12 +290,13 @@ END
   );
 
   print <<END;
+  <TR><TH ALIGN="right">${r}Country</TH><TD>$ship_country_html</TD></TR>
   <TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_daytime" VALUE="$ship_daytime" SIZE=18 onChange="changed(this)"></TD></TR>
   <TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_night" VALUE="$ship_night" SIZE=18 onChange="changed(this)"></TD></TR>
   <TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_fax" VALUE="$ship_fax" SIZE=12 onChange="changed(this)"></TD></TR>
 END
 
-  print "</TABLE>$r required fields<BR>";
+  print "</TABLE>${r}required fields<BR>";
 
 }
 
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index c8038ecf6..6ce60d14a 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -8,19 +8,6 @@ $cgi->param('tax','') unless defined $cgi->param('tax');
 
 $cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
 
-$cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
-  or die "Oops, illegal \"state\" param: ". $cgi->param('state');
-$cgi->param('state', $1);
-$cgi->param('county', $3 || '');
-$cgi->param('country', $4);
-
-$cgi->param('ship_state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
-  or $cgi->param('ship_state') =~ /^(((())))$/
-  or die "Oops, illegal \"ship_state\" param: ". $cgi->param('ship_state');
-$cgi->param('ship_state', $1);
-$cgi->param('ship_county', $3 || '');
-$cgi->param('ship_country', $4);
-
 my $payby = $cgi->param('payby');
 if ( $payby ) {
   $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
-- 
cgit v1.2.1


From 74f795a943560dfc03f46642536386ce36355bb4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Mar 2002 07:37:05 +0000
Subject: disable region caching for now

---
 FS/FS/cust_main_county.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index 17fe164e4..95ed53dab 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -119,15 +119,17 @@ sub check {
 sub regionselector {
   my ( $selected_county, $selected_state, $selected_country,
        $prefix, $onchange ) = @_;
-  $countyflag=1 if $selected_county;
 
-  unless ( @cust_main_county ) { #cache 
+  $countyflag = 0;
+
+#  unless ( @cust_main_county ) { #cache 
     @cust_main_county = qsearch('cust_main_county', {} );
     foreach my $c ( @cust_main_county ) {
       $countyflag=1 if $c->county;
       push @{$cust_main_county{$c->country}{$c->state}}, $c->county;
     }
-  }
+#  }
+  $countyflag=1 if $selected_county;
 
   my $script_html = <<END;
     <SCRIPT>
-- 
cgit v1.2.1


From f1038a648b3d53db925b23519e7cd2a30c6837ed Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Mar 2002 21:31:49 +0000
Subject: new export!  infostreet and sqlradius provisioning switched over 
 (Bug #299 - doesn't close it, but all the groundwork is done)

also removes non-transactional ICRADIUS export from svc_acct.export
  (closes: Bug#347)
---
 FS/FS/Conf.pm                           |  12 +-
 FS/FS/part_export.pm                    | 427 +++++++++++++++++++++++++++++++-
 FS/FS/part_export_option.pm             |   2 +-
 FS/FS/part_svc.pm                       |  12 +-
 FS/FS/svc_acct.pm                       | 236 +++++-------------
 FS/bin/freeside-queued                  |   3 +-
 README.1.4.0pre12                       |  11 +-
 bin/icradius_reset                      |   7 +
 bin/svc_acct.export                     |  99 +-------
 htetc/global.asa                        |   2 +-
 htetc/handler.pl                        |   2 +-
 httemplate/docs/export.html             |   1 +
 httemplate/docs/upgrade8.html           |   6 +
 httemplate/edit/part_export.cgi         | 130 ++++++++--
 httemplate/edit/process/part_export.cgi |   3 +
 15 files changed, 654 insertions(+), 299 deletions(-)
 create mode 100644 bin/icradius_reset

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 91fea7ef7..645dbf1c4 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -396,29 +396,29 @@ httemplate/docs/config.html
 
   {
     'key'         => 'icradiusmachines',
-    'section'     => 'radius',
-    'description' => 'Turn this option on to enable radcheck and radreply table population - by default in the Freeside database, or in the database specified by the <a href="http://rootwood.haze.st/aspside/config/config-view.cgi#icradius_secrets">icradius_secrets</a> config option (the radcheck and radreply tables needs to be created manually).  You do not need to use MySQL for your Freeside database to export to an ICRADIUS/FreeRADIUS MySQL database with this option.  <blockquote><b>ADDITIONAL DEPRECATED FUNCTIONALITY</b> (instead use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or point icradius_secrets to the external database) - your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines or <a href="http://www.freeradius.org/">FreeRADIUS</a> (with MySQL authentication) machines, one per line.  Machines listed in this file will have the radcheck table exported to them.  Each line should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: <CODE>"radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd"</CODE></blockquote>',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add <i>sqlradius</i> exports to <a href="../browse/part_svc">Service definitions</a> instead.  This option used to enable radcheck and radreply table population - by default in the Freeside database, or in the database specified by the <a href="http://rootwood.haze.st/aspside/config/config-view.cgi#icradius_secrets">icradius_secrets</a> config option (the radcheck and radreply tables needs to be created manually).  You do not need to use MySQL for your Freeside database to export to an ICRADIUS/FreeRADIUS MySQL database with this option.  <blockquote><b>ADDITIONAL DEPRECATED FUNCTIONALITY</b> (instead use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or point icradius_secrets to the external database) - your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines or <a href="http://www.freeradius.org/">FreeRADIUS</a> (with MySQL authentication) machines, one per line.  Machines listed in this file will have the radcheck table exported to them.  Each line should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: <CODE>"radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd"</CODE></blockquote>',
     'type'        => [qw( checkbox textarea )],
   },
 
   {
     'key'         => 'icradius_mysqldest',
-    'section'     => 'radius',
+    'section'     => 'deprecated',
     'description' => '<b>DEPRECATED</b> (instead use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or point icradius_secrets to the external database) - Destination directory for the MySQL databases, on the ICRADIUS/FreeRADIUS machines.  Defaults to "/usr/local/var/".',
     'type'        => 'text',
   },
 
   {
     'key'         => 'icradius_mysqlsource',
-    'section'     => 'radius',
+    'section'     => 'deprecated',
     'description' => '<b>DEPRECATED</b> (instead use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or point icradius_secrets to the external database) - Source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".',
     'type'        => 'text',
   },
 
   {
     'key'         => 'icradius_secrets',
-    'section'     => 'radius',
-    'description' => 'Optionally specifies a database for ICRADIUS/FreeRADIUS export.  Three lines: DBI data source, username and password.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add <i>sqlradius</i> exports to <a href="../browse/part_svc">Service definitions</a> instead.  This option used to specify a database for ICRADIUS/FreeRADIUS export.  Three lines: DBI data source, username and password.',
     'type'        => 'textarea',
   },
 
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index a0de03b63..444e86aa0 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -122,6 +122,7 @@ sub insert {
   my $options = shift;
   foreach my $optionname ( keys %{$options} ) {
     my $part_export_option = new FS::part_export_option ( {
+      'exportnum'   => $self->exportnum,
       'optionname'  => $optionname,
       'optionvalue' => $options->{$optionname},
     } );
@@ -144,16 +145,92 @@ Delete this record from the database.
 
 =cut
 
-# the delete method can be inherited from FS::Record
+#foreign keys would make this much less tedious... grr dumb mysql
+sub delete {
+  my $self = shift;
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::delete;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  foreach my $part_export_option ( $self->part_export_option ) {
+    my $error = $part_export_option->delete;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
 
-=item replace OLD_RECORD
+}
+
+=item replace OLD_RECORD HASHREF
 
 Replaces the OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
+If a hash reference of options is supplied, part_export_option records are
+created or modified (see L<FS::part_export_option>).
+
 =cut
 
-# the replace method can be inherited from FS::Record
+sub replace {
+  my $self = shift;
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::replace;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  my $options = shift;
+  foreach my $optionname ( keys %{$options} ) {
+    my $old = qsearchs( 'part_export_option', {
+        'exportnum'   => $self->exportnum,
+        'optionname'  => $optionname,
+    } );
+    my $new = new FS::part_export_option ( {
+        'exportnum'   => $self->exportnum,
+        'optionname'  => $optionname,
+        'optionvalue' => $options->{$optionname},
+    } );
+    my $error = $old ? $new->replace($old) : $new->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+
+};
 
 =item check
 
@@ -198,12 +275,356 @@ sub part_svc {
   qsearchs('part_svc', { svcpart => $self->svcpart } );
 }
 
+=item part_export_option
+
+=cut
+
+sub part_export_option {
+  my $self = shift;
+  qsearch('part_export_option', { 'exportnum' => $self->exportnum } );
+}
+
+=item options 
+
+=cut
+
+sub options {
+  my $self = shift;
+  map { $_->optionname => $_->optionvalue } $self->part_export_option;
+}
+
+=item option
+
+=cut
+
+sub option {
+  my $self = shift;
+  my $part_export_option =
+    qsearchs('part_export_option', {
+      exportnum  => $self->exportnum,
+      optionname => shift,
+  } );
+  $part_export_option ? $part_export_option->optionvalue : '';
+}
+
+=item rebless
+
+=cut
+
+sub rebless {
+  my $self = shift;
+  my $exporttype = $self->exporttype;
+  my $class = ref($self);
+  bless($self, $class."::$exporttype");
+}
+
+=item export_insert SVC_OBJECT
+
+Calls the appropriate export_I<exporttype> for this object's exporttype.
+
+=cut
+
+sub export_insert {
+  my $self = shift;
+  $self->rebless;
+  $self->_export_insert(@_);
+}
+
+#sub AUTOLOAD {
+#  my $self = shift;
+#  $self->rebless;
+#  my $method = $AUTOLOAD;
+#  #$method =~ s/::(\w+)$/::_$1/; #infinite loop prevention
+#  $method =~ s/::(\w+)$/_$1/; #infinite loop prevention
+#  $self->$method(@_);
+#}
+
+=item export_replace
+
+=cut
+
+sub export_replace {
+  my $self = shift;
+  $self->rebless;
+  $self->_export_replace(@_);
+}
+
+=item export_delete
+
+=cut
+
+sub export_delete {
+  my $self = shift;
+  $self->rebless;
+  $self->_export_delete(@_);
+}
+
 =back
 
+#infostreet
+
+package FS::part_export::infostreet;
+use vars qw(@ISA);
+@ISA = qw(FS::part_export);
+
+sub _export_insert {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->infostreet_queue( $svc_acct->svcnum,
+    'createUser', $svc_acct->username, $svc_acct->password );
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = (shift, shift, shift);
+  return "can't change username with InfoStreet"
+    if $old->username ne $new->username;
+  return '' unless $old->_password ne $new->_password;
+  $self->infostreet_queue( $new->svcnum,
+    'passwd', $new->username, $new->password );
+}
+
+sub _export_delete {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->infostreet_queue( $svc_acct->svcnum,
+    'purgeAccount,releaseUsername', $svc_acct->username );
+}
+
+sub infostreet_queue {
+  my( $self, $svcnum, $method ) = (shift, shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => 'FS::part_export::infostreet::infostreet_command',
+  };
+  $queue->insert(
+    $self->option('url'),
+    $self->option('login'),
+    $self->option('password'),
+    $self->option('groupID'),
+    $method,
+    @_,
+  );
+}
+
+sub infostreet_command { #subroutine, not method
+  my($url, $username, $password, $groupID, $method, @args) = @_;
+
+  #quelle hack
+  if ( $method =~ /,/ ) {
+    foreach my $part ( split(/,\s*/, $method) ) {
+      infostreet_command($url, $username, $password, $groupID, $part, @args);
+    }
+    return;
+  }
+
+  eval "use Frontier::Client;";
+
+  my $conn = Frontier::Client->new( url => $url );
+  my $key_result = $conn->call( 'authenticate', $username, $password, $groupID);
+  my %key_result = _infostreet_parse($key_result);
+  die $key_result{error} unless $key_result{success};
+  my $key = $key_result{data};
+
+  my $result = $conn->call($opt{method}, $key, @{$opt{args}});
+  my %result = _infostreet_parse($result);
+  die $result{error} unless $result{success};
+
+}
+
+sub _infostreet_parse { #subroutine, not method
+  my $arg = shift;
+  map {
+    my $value = $arg->{$_};
+    #warn ref($value);
+    $value = $value->value()
+      if ref($value) && $value->isa('Frontier::RPC2::DataType');
+    $_=>$value;
+  } keys %$arg;
+}
+
+#sqlradius
+
+package FS::part_export::sqlradius;
+use vars qw(@ISA);
+@ISA = qw(FS::part_export);
+
+sub _export_insert {
+  my($self, $svc_acct) = (shift, shift);
+  $self->sqlradius_queue( $svc_acct->svcnum, 'insert',
+    'reply', $svc_acct->username, $svc_acct->radius_reply );
+  $self->sqlradius_queue( $svc_acct->svcnum, 'insert',
+    'check', $svc_acct->username, $svc_acct->radius_check );
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = (shift, shift, shift);
+
+  #return "can't (yet) change username with sqlradius"
+  #  if $old->username ne $new->username;
+  if ( $old->username ne $new->username ) {
+    my $error = $self->sqlradius_queue( $new->svcnum, 'rename',
+      $new->username, $old->username );
+    return $error if $error;
+  }
+
+  foreach my $table (qw(reply check)) {
+    my $method = "radius_$table";
+    my %new = $new->$method;
+    my %old = $old->$method;
+    if ( grep { !exists $old{$_} #new attributes
+                || $new{$n} ne $old{$n} #changed
+              } keys %new
+    ) {
+      my $error = $self->sqlradius_queue( $new->svcnum, 'insert'
+        $table, $new->username, %new );
+      return $error if $error;
+    }
+
+    my @del = grep { !exists $new{$_} } keys %old;
+    my $error = $self->sqlradius_queue( $new->svcnum, 'sqlradius_attrib_delete',
+      $table, $new->username, @del );
+    return $error if $error;
+  }
+
+  '';
+}
+
+sub _export_delete {
+  my( $self, $svc_something ) = (shift, shift);
+  $self->sqlradius_queue( $svc_acct->svcnum, 'delete',
+    $svc_something->username );
+}
+
+sub sqlradius_queue {
+  my( $self, $svcnum, $method ) = (shift, shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => "FS::part_export::sqlradius::sqlradius_$method",
+  };
+  $queue->insert(
+    $self->option('datasrc'),
+    $self->option('username'),
+    $self->option('password'),
+    @_,
+  );
+}
+
+sub sqlradius_insert { #subroutine, not method
+  my $dbh = sqlradius_connect(shift, shift, shift);
+  my( $replycheck, $username, %attributes ) = @_;
+
+  foreach my $attribute ( keys %attributes ) {
+    my $u_sth = $dbh->prepare(
+      "UPDATE rad$replycheck SET Value = ? WHERE UserName = ? AND Attribute = ?"    ) or die $dbh->errstr;
+    my $i_sth = $dbh->prepare(
+      "INSERT INTO rad$replycheck ( id, UserName, Attribute, Value ) ".
+        "VALUES ( ?, ?, ?, ? )" )
+      or die $dbh->errstr;
+    $u_sth->execute($attributes{$attribute}, $username, $attribute) > 0
+      or $i_sth->execute( '', $username, $attribute, $attributes{$attribute} )
+        or die "can't insert into rad$replycheck table: ". $i_sth->errstr;
+  }
+  $dbh->disconnect;
+}
+
+sub sqlradius_rename { #subroutine, not method
+  my $dbh = sqlradius_connect(shift, shift, shift);
+  my($new_username, $old_username) = @_;
+  foreach my $table (qw(radreply radcheck)) {
+    my $sth = $dbh->prepare("UPDATE $table SET Username = ? WHERE UserName = ?")
+      or die $dbh->errstr;
+    $sth->execute($new_username, $old_username)
+      or die "can't update $table: ". $sth->errstr;
+  }
+  $dbh->disconnect;
+}
+
+sub sqlradius_attrib_delete { #subroutine, not method
+  my $dbh = sqlradius_connect(shift, shift, shift);
+  my( $replycheck, $username, @attrib ) = @_;
+
+  foreach my $attribute ( @attrib ) {
+    my $sth = $dbh->prepare(
+        "DELETE FROM $table WHERE UserName = ? AND Attribute = ?" )
+      or die $dbh->errstr;
+    $sth->execute($username,$attribute)
+      or die "can't delete from $table table: ". $sth->errstr;
+  }
+  $dbh->disconnect;
+}
+
+sub sqlradius_delete { #subroutine, not method
+  my $dbh = sqlradius_connect(shift, shift, shift);
+  my $username = shift;
+
+  foreach my $table (qw( radcheck radreply )) {
+    my $sth = $dbh->prepare( "DELETE FROM $table WHERE UserName = ?" );
+    $sth->execute($username)
+      or die "can't delete from $table table: ". $sth->errstr;
+  }
+  $dbh->disconnect;
+}
+
+sub sqlradius_connect {
+  #my($datasrc, $username, $password) = @_;
+  #DBI->connect($datasrc, $username, $password) or die $DBI::errstr;
+  DBI->connect(@_) or die $DBI::errstr;
+}
+
+=head1 NOTES
+
+Writing a new export class:
+
+#myexport
+
+package FS::part_export::myexport;
+use vars qw(@ISA);
+@ISA = qw(FS::part_export);
+
+sub _export_insert {
+  my($self, $svc_something) = (shift, shift);
+  $self->myexport_queue( $svc_acct->svcnum, 'insert',
+    $svc_something->username, $svc_something->password );
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = (shift, shift, shift);
+  #return "can't change username with myexport"
+  #  if $old->username ne $new->username;
+  #return '' unless $old->_password ne $new->_password;
+  $self->myexport_queue( $new->svcnum,
+    'replace', $new->username, $new->password );
+}
+
+sub _export_delete {
+  my( $self, $svc_something ) = (shift, shift);
+  $self->myexport_queue( $svc_acct->svcnum,
+    'delete', $svc_something->username );
+}
+
+#a good idea to queue anything that could fail or take any time
+sub myexport_queue {
+  my( $self, $svcnum, $method ) = (shift, shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => "FS::part_export::myexport::myexport_$method",
+  };
+  $queue->insert( @_ );
+}
+
+sub myexport_insert { #subroutine, not method
+}
+sub myexport_replace { #subroutine, not method
+}
+sub myexport_delete { #subroutine, not method
+}
+
 =head1 BUGS
 
 Probably.
 
+Hmm, export code has wound up in here.  Move those sub-classes out into their
+own files, at least.  Also hmm... cust_export class (not necessarily a
+database table...) ... ?
+
 =head1 SEE ALSO
 
 L<FS::part_export_option>, L<FS::part_svc>, L<FS::svc_acct>, L<FS::svc_domain>,
diff --git a/FS/FS/part_export_option.pm b/FS/FS/part_export_option.pm
index 1ce0de65f..61ea956ae 100644
--- a/FS/FS/part_export_option.pm
+++ b/FS/FS/part_export_option.pm
@@ -40,7 +40,7 @@ currently supported:
 
 =item optionname - option name
 
-=item opeionvalue - option value
+=item optionvalue - option value
 
 =back
 
diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 41ee21d31..82935dd2b 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -295,11 +295,21 @@ sub all_part_svc_column {
   qsearch('part_svc_column', { 'svcpart' => $self->svcpart } );
 }
 
+=item part_export
+
+=cut
+
+sub part_export {
+  my $self = shift;
+  my %search = ( 'svcpart' => $self->svcpart );
+  qsearch('part_export', \%search);
+}
+
 =back
 
 =head1 VERSION
 
-$Id: part_svc.pm,v 1.9 2002-01-28 06:57:23 ivan Exp $
+$Id: part_svc.pm,v 1.10 2002-03-20 21:31:49 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index bb9fe67b3..2305aeb80 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1,7 +1,8 @@
 package FS::svc_acct;
 
 use strict;
-use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
+use vars qw( @ISA $nossh_hack $noexport_hack $conf
+             $dir_prefix @shells $usernamemin
              $usernamemax $passwordmin $passwordmax
              $username_ampersand $username_letter $username_letterfirst
              $username_noperiod $username_uppercase
@@ -9,7 +10,6 @@ use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
              $cyrus_server $cyrus_admin_user $cyrus_admin_pass
              $cp_server $cp_user $cp_pass $cp_workgroup
              $dirhash
-             $icradius_dbh
              @saltset @pw_set
              $rsync $ssh $exportdir $vpopdir);
 use Carp;
@@ -88,18 +88,7 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
     $cp_pass = '';
     $cp_workgroup = '';
   }
-  if ( $conf->exists('icradiusmachines') ) {
-    if ( $conf->exists('icradius_secrets') ) {
-      #need some sort of late binding so it's only connected to when
-      # actually used, hmm
-      $icradius_dbh = DBI->connect($conf->config('icradius_secrets'))
-        or die $DBI::errstr;
-    } else {
-      $icradius_dbh = dbh;
-    }
-  } else {
-    $icradius_dbh = '';
-  }
+
   $dirhash = $conf->config('dirhash') || 0;
   $exportdir = "/usr/local/etc/freeside/export." . datasrc;
   if ( $conf->exists('vpopmailmachines') ) {
@@ -246,6 +235,8 @@ $username, $uid, $gid, $dir, and $shell.
 
 (TODOC: cyrus config file, L<FS::queue> and L<freeside-queued>)
 
+(TODOC: new exports! $noexport_hack)
+
 =cut
 
 sub insert {
@@ -297,6 +288,20 @@ sub insert {
     return $error;
   }
 
+  #new-style exports!
+  unless ( $noexport_hack ) {
+    foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
+      my $error = $part_export->export_insert($self);
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "exporting to ". $part_export->exporttype.
+               " (transaction rolled back): $error";
+      }
+    }
+  }
+
+  #old-style exports
+
   my( $username, $uid, $gid, $dir, $shell ) = (
     $self->username,
     $self->uid,
@@ -340,37 +345,6 @@ sub insert {
     }
   }
   
-  if ( $icradius_dbh ) {
-
-    my $radcheck_queue =
-      new FS::queue {
-      'svcnum' => $self->svcnum,
-      'job' => 'FS::svc_acct::icradius_rc_insert'
-    };
-    $error = $radcheck_queue->insert( $self->username,
-                                      $self->_password,
-                                      $self->radius_check
-                                    );
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-
-    my $radreply_queue =
-      new FS::queue { 
-      'svcnum' => $self->svcnum,
-      'job' => 'FS::svc_acct::icradius_rr_insert'
-    };
-    $error = $radreply_queue->insert( $self->username,
-                                      $self->_password,
-                                      $self->radius_reply
-                                    );
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-  }
-
   if ( $vpopdir ) {
 
     my $vpopmail_queue =
@@ -390,6 +364,7 @@ sub insert {
 
   }
 
+  #end of old-style exports
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
@@ -451,56 +426,6 @@ sub cp_insert {
   die $app->message."\n" unless $app->ok;
 }
 
-sub icradius_rc_insert {
-  my( $username, $password, %radcheck ) = @_;
-  
-  my $sth = $icradius_dbh->prepare(
-    "INSERT INTO radcheck ( id, UserName, Attribute, Value ) VALUES ( ".
-    join(", ", map { $icradius_dbh->quote($_) } (
-      '',
-      $username,
-      "Password",
-      $password,
-    ) ). " )"
-  );
-  $sth->execute or die "can't insert into radcheck table: ". $sth->errstr;
-
-  foreach my $attribute ( keys %radcheck ) {
-    my $sth = $icradius_dbh->prepare(
-      "INSERT INTO radcheck ( id, UserName, Attribute, Value ) VALUES ( ".
-      join(", ", map { $icradius_dbh->quote($_) } (
-        '',
-        $username,
-        $attribute,
-        $radcheck{$attribute},
-      ) ). " )"
-    );
-    $sth->execute or die "can't insert into radcheck table: ". $sth->errstr;
-  }
-
-  1;
-}
-
-sub icradius_rr_insert {
-  my( $username, $password, %radreply ) = @_;
-  
-  foreach my $attribute ( keys %radreply ) {
-    my $sth = $icradius_dbh->prepare(
-      "INSERT INTO radreply ( id, UserName, Attribute, Value ) VALUES ( ".
-      join(", ", map { $icradius_dbh->quote($_) } (
-        '',
-        $username,
-        $attribute,
-        $radreply{$attribute},
-      ) ). " )"
-    );
-    $sth->execute or die "can't insert into radreply table: ". $sth->errstr;
-  }
-
-  1;
-}
-
-
 sub vpopmail_insert {
   my( $username, $password, $domain, $vpopdir ) = @_;
   
@@ -571,6 +496,8 @@ $username and $dir.
 
 (TODOC: cyrus config file)
 
+(TODOC: new exports! $noexport_hack)
+
 =cut
 
 sub delete {
@@ -590,7 +517,7 @@ sub delete {
   return "Can't delete an account with (svc_www) web service!"
     if qsearch( 'svc_www', { 'usersvc' => $self->usersvc } );
 
-  # what about records in session ?
+  # what about records in session ? (they should refer to history table)
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -639,6 +566,20 @@ sub delete {
     return $error;
   }
 
+  #new-style exports!
+  unless ( $noexport_hack ) {
+    foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
+      my $error = $part_export->export_delete($self);
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "exporting to ". $part_export->exporttype.
+               " (transaction rolled back): $error";
+      }
+    }
+  }
+
+  #old-style exports
+
   my( $username, $dir ) = (
     $self->username,
     $self->dir,
@@ -671,24 +612,6 @@ sub delete {
     }
   }
 
-  if ( $icradius_dbh ) {
-
-    my $radcheck_queue =
-      new FS::queue { 'job' => 'FS::svc_acct::icradius_rc_delete' };
-    $error = $radcheck_queue->insert( $self->username );
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-
-    my $radreply_queue =
-      new FS::queue { 'job' => 'FS::svc_acct::icradius_rr_delete' };
-    $error = $radreply_queue->insert( $self->username );
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-  }
   if ( $vpopdir ) {
     my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_delete' };
     $error = $queue->insert( $self->username, $self->domain );
@@ -699,6 +622,8 @@ sub delete {
 
   }
 
+  #end of old-style exports
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 }
@@ -742,30 +667,6 @@ sub cp_delete {
   die $app->message."\n" unless $app->ok;
 }
 
-sub icradius_rc_delete {
-  my $username = shift;
-  
-  my $sth = $icradius_dbh->prepare(
-    'DELETE FROM radcheck WHERE UserName = ?'
-  );
-  $sth->execute($username)
-    or die "can't delete from radcheck table: ". $sth->errstr;
-
-  1;
-}
-
-sub icradius_rr_delete {
-  my $username = shift;
-  
-  my $sth = $icradius_dbh->prepare(
-    'DELETE FROM radreply WHERE UserName = ?'
-  );
-  $sth->execute($username)
-    or die "can't delete from radreply table: ". $sth->errstr;
-
-  1;
-}
-
 sub vpopmail_delete {
   my( $username, $domain ) = @_;
   
@@ -858,6 +759,20 @@ sub replace {
     return $error if $error;
   }
 
+  #new-style exports!
+  unless ( $noexport_hack ) {
+    foreach my $part_export ( $new->cust_svc->part_svc->part_export ) {
+      my $error = $part_export->export_replace($new,$old);
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "exporting to ". $part_export->exporttype.
+               " (transaction rolled back): $error";
+      }
+    }
+  }
+
+  #old-style exports
+
   my ( $old_dir, $new_dir, $uid, $gid ) = (
     $old->getfield('dir'),
     $new->getfield('dir'),
@@ -900,19 +815,6 @@ sub replace {
     }
   }
 
-  if ( $icradius_dbh ) {
-    my $queue = new FS::queue {  
-      'svcnum' => $new->svcnum,
-      'job' => 'FS::svc_acct::icradius_rc_replace'
-    };
-    $error = $queue->insert( $new->username,
-                             $new->_password,
-                           );
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-  }
   if ( $vpopdir ) {
     my $cpassword = crypt(
       $new->_password,$saltset[int(rand(64))].$saltset[int(rand(64))]
@@ -938,23 +840,12 @@ sub replace {
     }
   }
 
+  #end of old-style exports
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
 }
 
-sub icradius_rc_replace {
-  my( $username, $new_password ) = @_;
- 
-   my $sth = $icradius_dbh->prepare(
-     "UPDATE radcheck SET Value = ? WHERE UserName = ? and Attribute = ?"
-   );
-   $sth->execute($new_password, $username, 'Password' )
-     or die "can't update radcheck table: ". $sth->errstr;
-
-  1;
-}
-
 sub cp_rename {
   my ( $old_username, $new_username ) = @_;
 
@@ -1305,19 +1196,22 @@ sub radius_reply {
 Returns key/value pairs, suitable for assigning to a hash, for any RADIUS
 check attributes of this record.
 
-Accessing RADIUS attributes directly is not supported and will break in the
-future.
+Note that this is now the preferred method for reading RADIUS attributes - 
+accessing the columns directly is discouraged, as the column names are
+expected to change in the future.
 
 =cut
 
 sub radius_check {
   my $self = shift;
-  map {
-    /^(rc_(.*))$/;
-    my($column, $attrib) = ($1, $2);
-    #$attrib =~ s/_/\-/g;
-    ( $FS::raddb::attrib{lc($attrib)}, $self->getfield($column) );
-  } grep { /^rc_/ && $self->getfield($_) } fields( $self->table );
+  ( 'Password' => $self->_password,
+    map {
+      /^(rc_(.*))$/;
+      my($column, $attrib) = ($1, $2);
+      #$attrib =~ s/_/\-/g;
+      ( $FS::raddb::attrib{lc($attrib)}, $self->getfield($column) );
+    } grep { /^rc_/ && $self->getfield($_) } fields( $self->table )
+  );
 }
 
 =item domain
diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 56475d059..c3c9240d2 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -15,6 +15,7 @@ use FS::queue;
 use FS::cust_main;
 use FS::svc_acct;
 use Net::SSH 0.05;
+use FS::part_export;
 
 my $pid_file = '/var/run/freeside-queued.pid';
 
@@ -85,7 +86,7 @@ while (1) {
 
     my $eval = "&". $ljob->job. '(@args);';
     warn "running $eval";
-    eval $eval;
+    eval $eval; #throw away return value?  suppose so
     if ( $@ ) {
       warn "job $eval failed";
       my %hash = $ljob->hash;
diff --git a/README.1.4.0pre12 b/README.1.4.0pre12
index c801a2604..d61656c38 100644
--- a/README.1.4.0pre12
+++ b/README.1.4.0pre12
@@ -21,9 +21,16 @@ Run bin/create-history-tables
 
 Run bin/dbdef-create again
 
+the mxmachines, nsmachines, arecords and cnamerecords configuration values have been deprecated.  Use the defaultrecords configuration value instead.
+
+New export code has landed!  If you were using the icradiusmachines,
+icradius_mysqldest, icradius_mysqlsource, or icradius_secrets files, see
+the "sqlradius" export instead.  Use MySQL replication 
+<http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication>
+or point the "sqlradius" export directly at your external ICRADIUS or
+FreeRADIUS (or through an SSL-encrypting proxy...)
+
 Arrange for freeside-expiration-alerter to be run daily, if desired.
 
 Restart Apache and freeside-queued
 
-the mxmachines, nsmachines, arecords and cnamerecords configuration values have been deprecated.  Use the defaultrecords configuration value instead.
-
diff --git a/bin/icradius_reset b/bin/icradius_reset
new file mode 100644
index 000000000..58663ee6b
--- /dev/null
+++ b/bin/icradius_reset
@@ -0,0 +1,7 @@
+
+  my $sth = $icradius_dbh->prepare("DELETE FROM radcheck");
+  $sth->execute or die "Can't reset radcheck table: ". $sth->errstr;
+  my $sth2 = $icradius_dbh->prepare("DELETE FROM radreply");
+  $sth2->execute or die "Can't reset radreply table: ". $sth2->errstr;
+
+
diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 82a8935b6..261f499da 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.34 2002-02-23 02:14:26 jeff Exp $
+# $Id: svc_acct.export,v 1.35 2002-03-20 21:31:49 ivan Exp $
 #
 # Create and export password, radius and vpopmail password files:
 # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
@@ -47,22 +47,6 @@ my @erpcdmachines = $conf->config('erpcdmachines')
 my @radiusmachines = $conf->config('radiusmachines')
   if $conf->exists('radiusmachines');
 
-my $icradiusmachines = $conf->exists('icradiusmachines');
-my @icradiusmachines = $conf->config('icradiusmachines') if $icradiusmachines;
-my $icradius_mysqldest =
-  $conf->config('icradius_mysqldest') || "/usr/local/var"
-    if $icradiusmachines;
-my $icradius_mysqlsource =
-  $conf->config('icradius_mysqlsource') || "/usr/local/var/freeside"
-    if $icradiusmachines;
-my $icradius_dbh;
-if ( $icradiusmachines && $conf->exists('icradius_secrets') ) {
-  $icradius_dbh = DBI->connect($conf->config('icradius_secrets'))
-    or die $DBI::errstr;
-} else {
-  $icradius_dbh = dbh;
-}
-
 my $textradiusprepend =
   $conf->exists('textradiusprepend')
     ? $conf->config('textradiusprepend')
@@ -189,13 +173,6 @@ chmod 0600, "$spooldir/master.passwd",
 rmtree"$spooldir/domains", 0, 1;
 mkdir "$spooldir/domains", 0700;
 
-if ( $icradiusmachines ) {
-  my $sth = $icradius_dbh->prepare("DELETE FROM radcheck");
-  $sth->execute or die "Can't reset radcheck table: ". $sth->errstr;
-  my $sth2 = $icradius_dbh->prepare("DELETE FROM radreply");
-  $sth2->execute or die "Can't reset radreply table: ". $sth2->errstr;
-}
-
 setpriority(0,0,10);
 
 print USERS "$radiusprepend\n";
@@ -399,7 +376,7 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) {
         $username,
         qq(\t${textradiusprepend}),
         $radcheck,
-        qq(Password = "$rpassword"\n\t),
+#        qq(Password = "$rpassword"\n\t),
         join ",\n\t", map { qq($_ = "$radreply{$_}") } keys %radreply;
 
       if ( $ip && $ip ne '0e0' ) {
@@ -409,57 +386,6 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) {
         print USERS qq(\n\n);
       }
 
-      ###
-      # ICRADIUS export
-      if ( $icradiusmachines ) {
-  
-        my $sth = $icradius_dbh->prepare(
-          "INSERT INTO radcheck ( id, UserName, Attribute, Value ) VALUES ( ".
-          join(", ", map { $icradius_dbh->quote( $_ ) } (
-            '',
-            $username,
-            "Password",
-            $svc_acct->_password,
-          ) ). " )"
-        );
-        $sth->execute or die "Can't insert into radcheck table: ". $sth->errstr;
-  
-        foreach my $attribute ( keys %radcheck ) {
-          my $sth = $icradius_dbh->prepare(
-            "INSERT INTO radcheck ( id, UserName, Attribute, Value ) VALUES ( ".
-            join(", ", map { $icradius_dbh->quote( $_ ) } (
-              '',
-              $username,
-              $attribute,
-              $radcheck{$attribute},
-            ) ). " )"
-          );
-          $sth->execute or die "Can't insert into radcheck table: ". $sth->errstr;      }
-  
-        foreach my $attribute ( keys %radreply ) {
-          my $sth = $icradius_dbh->prepare(
-            "INSERT INTO radreply (id, UserName, Attribute, Value) VALUES ( ".
-            join(", ", map { $icradius_dbh->quote( $_ ) } (
-              '',
-              $username,
-              $attribute,
-              $radreply{$attribute},
-            ) ). " )"
-          );
-          $sth->execute or die "Can't insert into radreply table: ". $sth->errstr;      }
-  
-        if ( $ip && $ip ne '0e0' ) {
-          my $sth = $icradius_dbh->prepare(
-            "INSERT INTO radreply (id, UserName, Attribute, Value) VALUES ( ".
-            join(", ", map { $icradius_dbh->quote( $_ ) } (
-              '',
-              $username,
-              'Framed-IP-Address',
-              $ip,
-            ) ). " )"
-          );
-          $sth->execute or die "Can't insert into radreply table: ". $sth->errstr;      }
-      }
     }
   
     ###
@@ -629,27 +555,6 @@ foreach $radiusmachine (@radiusmachines) {
     == 0 or die "ssh error: $!";
 }
 
-foreach my $icradiusmachine ( @icradiusmachines ) {
-  my( $machine, $db, $user, $pass ) = split(/\s+/, $icradiusmachine);
-  chdir $icradius_mysqlsource or die "Can't cd $icradius_mysqlsource: $!";
-  open(WRITER,"|ssh root\@$machine mysql -v --user=$user -p $db");
-  my $oldfh = select WRITER; $|=1; select $oldfh;
-  print WRITER "$pass\n";
-  sleep 2;
-  print WRITER "LOCK TABLES radcheck WRITE, radreply WRITE;\n";
-  foreach my $file ( glob("radcheck.*") ) {
-    my $scp = new Net::SCP;
-    $scp->scp($file,"root\@$machine:$icradius_mysqldest/$db/$file")
-      or die "scp error: ". $scp->{errstr};
-  }
-  foreach my $file ( glob("radreply.*") ) {
-    my $scp = new Net::SCP;
-    $scp->scp($file,"root\@$machine:$icradius_mysqldest/$db/$file")
-      or die "scp error: ". $scp->{errstr};
-  }
-  close WRITER;
-}
-
 #my @args = ("/bin/tar", "c", "--force-local", "-C", "$spooldir", "-f", "$spooldir/vpoptarball", "domains");
 
 #system {$args[0]} @args;
diff --git a/htetc/global.asa b/htetc/global.asa
index 083f2253d..94d6b7e3e 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -47,7 +47,7 @@ use FS::svc_forward;
 use FS::svc_www;
 use FS::type_pkgs;
 use FS::part_export;
-#use FS::part_export_option;
+use FS::part_export_option;
 
 sub Script_OnStart {
   $Response->AddHeader('Pragma' => 'no-cache');
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 5f244921e..8e097c656 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -104,7 +104,7 @@ sub handler
       use FS::svc_www;
       use FS::type_pkgs;
       use FS::part_export;
-      #use FS::part_export_option;
+      use FS::part_export_option;
 
       *CGI::redirect = sub {
         my( $self, $location ) = @_;
diff --git a/httemplate/docs/export.html b/httemplate/docs/export.html
index c7f1b4c9e..71e3acf1f 100755
--- a/httemplate/docs/export.html
+++ b/httemplate/docs/export.html
@@ -3,6 +3,7 @@
 </head>
 <body>
   <h1>File exporting</h1>
+  <font size="+2">NOTE: This file is OUT OF DATE with the landing of the new export code and is only here for reference.  DO NOT follow these instructions.  Instead use the new exports in the web interface.</font>
   <ul>
     <li>bin/svc_acct.export will create UNIX <b>passwd</b>, <b>shadow</b> and <b>master.passwd</b> files, ERPCD <b>acp_passwd</b> and <b>acp_dialup</b> files and a RADIUS <b>users</b> file in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Some RADIUS servers (such as <a href="http://www.open.com.au/radiator/">Radiator</a>, <a href="ftp://ftp.cheapnet.net/pub/icradius/">ICRADIUS</a> and <a href="http://www.freeradius.org/">FreeRADIUS</a>) will authenticate directly out of an SQL database.  In these cases,
 it is reccommended that you replicate (<a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">Replication in MySQL</a>) the data to an external RADIUS machine or point icradius_secrets to the external machine rather than running the RADIUS server on your Freeside machine.  Using the appropriate <a href="../config/config-view.cgi">configuration settings</a>, you can export these files to your remote machines unattended:
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 25e766b1e..e52b69ad3 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -319,5 +319,11 @@ ALTER TABLE cust_refund DROP COLUMN crednum;
   <b>freeside-expiration-alerter</b> to be run daily by cron or similar
   facility.  The message it sends can be configured from the
   <u>Configuration</u> choice of the main menu as <u>alerter_template</u>.
+  <li>Export has been rewritten.  If you were using the icradiusmachines,
+  icradius_mysqldest, icradius_mysqlsource, or icradius_secrets files, add
+  an appropriate "sqlradius" export to all relevant Service Definitions
+  instead.  Use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or
+  point the "sqlradius" export directly at your external ICRADIUS or FreeRADIUS
+  database (or through an SSL-necrypting proxy...)
 </ul>
 </body>
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index ffce0438f..a44bd39d5 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -22,7 +22,7 @@ if ( $cgi->param('error') ) {
   } );
 }
 
-warn "***$query***";
+#warn "***$query***";
 if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
   $action = 'Add';
   my $old_part_export = qsearchs('part_export', { 'exportnum' => $1 } );
@@ -37,7 +37,112 @@ if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
 }
 $action ||= $part_export->exportnum ? 'Edit' : 'Add';
 
-my @types = qw(shell bsdshell textradius sqlradius cp);
+my %exports = (
+  'svc_acct' => {
+    'sysvshell' => {
+      'desc' =>
+        'Batch export of /etc/passwd and /etc/shadow files (Linux/SysV)',
+      'options' => {},
+    },
+    'bsdshell' => {
+      'desc' =>
+        'Batch export of /etc/passwd and /etc/master.passwd files (BSD)',
+      'options' => {},
+    },
+#    'nis' => {
+#      'desc' =>
+#        'Batch export of /etc/global/passwd and /etc/global/shadow for NIS ',
+#      'options' => {},
+#    },
+    'bsdshell' => {
+      'desc' =>
+        'Batch export of /etc/passwd and /etc/master.passwd files (BSD)',
+      'options' => {},
+    },
+    'textradius' => {
+      'desc' => 'Batch export of a text /etc/raddb/users file (Livingston, Cistron)',
+    },
+    'sqlradius' => {
+      'desc' => 'Real-time export to SQL-backed RADIUS (ICRADIUS, FreeRADIUS)',
+      'options' => {
+        'datasrc'  => { label=>'DBI data source' },
+        'username' => { label=>'Database username' },
+        'password' => { label=>'Database password' },
+      },
+      'nodomain' => 'Y',
+      'notes' => 'Not specifying datasrc will export to the freeside database? (no...  notes on MySQL replication, etc., from Conf.pm && export.html etc.',
+    },
+    'cyrus' => {
+      'desc' => 'Real-time export to Cyrus IMAP server',
+    },
+    'cp' => {
+      'desc' => 'Real-time export to Critical Path Account Provisioning Protocol',
+    },
+    'infostreet' => {
+      'desc' => 'Real-time export to InfoStreet streetSmartAPI',
+      'options' => {
+        'url'      => { label=>'XML-RPC Access URL', },
+        'login'    => { label=>'InfoStreet login', },
+        'password' => { label=>'InfoStreet password', },
+        'groupID'  => { label=>'InfoStreet groupID', },
+      },
+      'nodomain' => 'Y',
+      'notes' => 'http://www.infostreet.com/ .... install Frontier::Client',
+    }
+  },
+
+  'svc_domain' => {},
+
+  'svc_acct_sm' => {},
+
+  'svc_forward' => {},
+
+  'svc_www' => {},
+
+);
+
+my $svcdb = $part_export->part_svc->svcdb;
+my %layers = map { $_ => "$_ - ". $exports{$svcdb}{$_}{desc} }
+               keys %{$exports{$svcdb}};
+$layers{''}='';
+
+my $widget = new HTML::Widgets::SelectLayers(
+  'selected_layer' => $part_export->exporttype,
+  'selected_layer' => $part_export->exporttype,
+  'options'        => \%layers,
+  'form_name'      => 'dummy',
+  'form_action'    => 'process/part_export.cgi',
+  'form_text'      => [qw( exportnum svcpart machine )],
+#  'form_checkbox'  => [qw()],
+  'html_between'    => "</TD></TR></TABLE>\n",
+  'layer_callback'  => sub {
+    my $layer = shift;
+    my $html = qq!<INPUT TYPE="hidden" NAME="exporttype" VALUE="$layer">!.
+               ntable("#cccccc",2);
+    foreach my $option ( keys %{$exports{$svcdb}->{$layer}{options}} ) {
+#    foreach my $option ( qw(url login password groupID ) ) {
+      my $optinfo = $exports{$svcdb}->{$layer}{options}{$option};
+      my $label = $optinfo->{label};
+      my $value = $part_export->option($option);
+      $html .= qq!<TR><TD ALIGN="right">$label</TD><TD>!.
+               qq!<TD><INPUT TYPE="text" NAME="$option" VALUE="$value"></TD>!.
+               '</TR>';
+    }
+    $html .= '</TABLE>';
+
+    $html .= '<INPUT TYPE="hidden" NAME="options" VALUE="'.
+             join(',', keys %{$exports{$svcdb}->{$layer}{options}} ). '">';
+
+    $html .= '<INPUT TYPE="hidden" NAME="nodomain" VALUE="'.
+             $exports{$svcdb}->{$layer}{nodomain}. '">';
+
+    $html .= '<INPUT TYPE="submit" VALUE="'.
+             ( $part_export->exportnum ? "Apply changes" : "Add export" ).
+             '">';
+
+    $html;
+  },
+);
 
 %>
 <%= header("$action Export", menubar(
@@ -46,35 +151,30 @@ my @types = qw(shell bsdshell textradius sqlradius cp);
 %>
 
 <% if ( $cgi->param('error') ) { %>
-<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+  <BR><BR>
 <% } %>
 
-<FORM ACTION="<%= popurl(1) %>process/part_export.cgi" METHOD=POST>
-<% #print '<FORM NAME="dummy">'; %>
+<FORM NAME="dummy">
+<INPUT TYPE="hidden" NAME="exportnum" VALUE="<%= $part_export->exportnum %>">
 
 <%= ntable("#cccccc",2) %>
 <TR>
   <TD ALIGN="right">Service</TD>
   <TD BGCOLOR="#ffffff">
     <%= $part_export->svcpart %> - <%= $part_export->part_svc->svc %>
+    <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $part_export->svcpart %>">
   </TD>
 </TR>
-<TR>
-  <TD ALIGN="right">Export</TD>
-  <TD><SELECT NAME="exporttype"><OPTION></OPTION>
-<% foreach my $type ( @types ) { %>
-    <OPTION><%= $type %></OPTION>
-<% } %>
-  </SELECT></TD>
-</TR>
 <TR>
   <TD ALIGN="right">Export host</TD>
   <TD>
     <INPUT TYPE="text" NAME="machine" VALUE="<%= $part_export->machine %>">
   </TD>
 </TR>
-</TABLE>
-</FORM>
+<TR>
+  <TD ALIGN="right">Export</TD>
+  <TD><%= $widget->html %>
 </BODY>
 </HTML>
 
diff --git a/httemplate/edit/process/part_export.cgi b/httemplate/edit/process/part_export.cgi
index 9ee1c5974..8160527f6 100644
--- a/httemplate/edit/process/part_export.cgi
+++ b/httemplate/edit/process/part_export.cgi
@@ -6,6 +6,9 @@ my $exportnum = $cgi->param('exportnum');
 
 my $old = qsearchs('part_export', { 'exportnum'=>$exportnum } ) if $exportnum;
 
+#fixup options
+my %options = map { $_=>$cgi->param($_) } $cgi->param('options');
+
 my $new = new FS::part_export ( {
   map {
     $_, scalar($cgi->param($_));
-- 
cgit v1.2.1


From 415150fe1997eb2688dfd492710f644574e29daf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 21 Mar 2002 06:57:20 +0000
Subject: more for the new world of export...

---
 FS/FS/part_export.pm                    | 119 +++++++++++++++++---------------
 httemplate/edit/part_export.cgi         |   2 +-
 httemplate/edit/process/part_export.cgi |  18 ++---
 3 files changed, 70 insertions(+), 69 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 444e86aa0..59024f651 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -22,7 +22,7 @@ FS::part_export - Object methods for part_export records
   ($new_record, $options) = $template_recored->clone( $svcpart );
 
   $error = $record->insert( { 'option' => 'value' } );
-  $error = $record->insert( \$options );
+  $error = $record->insert( \%options );
 
   $error = $new_record->replace($old_record);
 
@@ -226,6 +226,15 @@ sub replace {
     }
   }
 
+  #remove extraneous old options?  not necessary now, but...
+  #foreach my $opt ( grep { !exist $options->{$_->optionname} } $old->part_export_option ) {
+  #  my $error = $opt->delete;
+  #  if ( $error ) {
+  #    $dbh->rollback if $oldAutoCommit;
+  #    return $error;
+  #  }
+  #}
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   '';
@@ -320,8 +329,6 @@ sub rebless {
 
 =item export_insert SVC_OBJECT
 
-Calls the appropriate export_I<exporttype> for this object's exporttype.
-
 =cut
 
 sub export_insert {
@@ -361,6 +368,8 @@ sub export_delete {
 
 =back
 
+=cut
+
 #infostreet
 
 package FS::part_export::infostreet;
@@ -423,7 +432,7 @@ sub infostreet_command { #subroutine, not method
   die $key_result{error} unless $key_result{success};
   my $key = $key_result{data};
 
-  my $result = $conn->call($opt{method}, $key, @{$opt{args}});
+  my $result = $conn->call($method, $key, @args);
   my %result = _infostreet_parse($result);
   die $result{error} unless $result{success};
 
@@ -470,10 +479,10 @@ sub _export_replace {
     my %new = $new->$method;
     my %old = $old->$method;
     if ( grep { !exists $old{$_} #new attributes
-                || $new{$n} ne $old{$n} #changed
+                || $new{$_} ne $old{$_} #changed
               } keys %new
     ) {
-      my $error = $self->sqlradius_queue( $new->svcnum, 'insert'
+      my $error = $self->sqlradius_queue( $new->svcnum, 'insert',
         $table, $new->username, %new );
       return $error if $error;
     }
@@ -488,9 +497,9 @@ sub _export_replace {
 }
 
 sub _export_delete {
-  my( $self, $svc_something ) = (shift, shift);
+  my( $self, $svc_acct ) = (shift, shift);
   $self->sqlradius_queue( $svc_acct->svcnum, 'delete',
-    $svc_something->username );
+    $svc_acct->username );
 }
 
 sub sqlradius_queue {
@@ -543,10 +552,10 @@ sub sqlradius_attrib_delete { #subroutine, not method
 
   foreach my $attribute ( @attrib ) {
     my $sth = $dbh->prepare(
-        "DELETE FROM $table WHERE UserName = ? AND Attribute = ?" )
+        "DELETE FROM rad$replycheck WHERE UserName = ? AND Attribute = ?" )
       or die $dbh->errstr;
     $sth->execute($username,$attribute)
-      or die "can't delete from $table table: ". $sth->errstr;
+      or die "can't delete from rad$replycheck table: ". $sth->errstr;
   }
   $dbh->disconnect;
 }
@@ -569,53 +578,51 @@ sub sqlradius_connect {
   DBI->connect(@_) or die $DBI::errstr;
 }
 
-=head1 NOTES
-
-Writing a new export class:
-
-#myexport
-
-package FS::part_export::myexport;
-use vars qw(@ISA);
-@ISA = qw(FS::part_export);
-
-sub _export_insert {
-  my($self, $svc_something) = (shift, shift);
-  $self->myexport_queue( $svc_acct->svcnum, 'insert',
-    $svc_something->username, $svc_something->password );
-}
-
-sub _export_replace {
-  my( $self, $new, $old ) = (shift, shift, shift);
-  #return "can't change username with myexport"
-  #  if $old->username ne $new->username;
-  #return '' unless $old->_password ne $new->_password;
-  $self->myexport_queue( $new->svcnum,
-    'replace', $new->username, $new->password );
-}
-
-sub _export_delete {
-  my( $self, $svc_something ) = (shift, shift);
-  $self->myexport_queue( $svc_acct->svcnum,
-    'delete', $svc_something->username );
-}
-
-#a good idea to queue anything that could fail or take any time
-sub myexport_queue {
-  my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => "FS::part_export::myexport::myexport_$method",
-  };
-  $queue->insert( @_ );
-}
+=head1 NEW EXPORT CLASSES
 
-sub myexport_insert { #subroutine, not method
-}
-sub myexport_replace { #subroutine, not method
-}
-sub myexport_delete { #subroutine, not method
-}
+  #myexport
+  
+  package FS::part_export::myexport;
+  use vars qw(@ISA);
+  @ISA = qw(FS::part_export);
+  
+  sub _export_insert {
+    my($self, $svc_something) = (shift, shift);
+    $self->myexport_queue( $svc_acct->svcnum, 'insert',
+      $svc_something->username, $svc_something->password );
+  }
+  
+  sub _export_replace {
+    my( $self, $new, $old ) = (shift, shift, shift);
+    #return "can't change username with myexport"
+    #  if $old->username ne $new->username;
+    #return '' unless $old->_password ne $new->_password;
+    $self->myexport_queue( $new->svcnum,
+      'replace', $new->username, $new->password );
+  }
+  
+  sub _export_delete {
+    my( $self, $svc_something ) = (shift, shift);
+    $self->myexport_queue( $svc_acct->svcnum,
+      'delete', $svc_something->username );
+  }
+  
+  #a good idea to queue anything that could fail or take any time
+  sub myexport_queue {
+    my( $self, $svcnum, $method ) = (shift, shift, shift);
+    my $queue = new FS::queue {
+      'svcnum' => $svcnum,
+      'job'    => "FS::part_export::myexport::myexport_$method",
+    };
+    $queue->insert( @_ );
+  }
+  
+  sub myexport_insert { #subroutine, not method
+  }
+  sub myexport_replace { #subroutine, not method
+  }
+  sub myexport_delete { #subroutine, not method
+  }
 
 =head1 BUGS
 
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index a44bd39d5..7ba6fa12b 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -70,7 +70,7 @@ my %exports = (
         'password' => { label=>'Database password' },
       },
       'nodomain' => 'Y',
-      'notes' => 'Not specifying datasrc will export to the freeside database? (no...  notes on MySQL replication, etc., from Conf.pm && export.html etc.',
+      'notes' => 'Not specifying datasrc will export to the freeside database? (no...  notes on MySQL replication, DBI::Proxy, etc., from Conf.pm && export.html etc.',
     },
     'cyrus' => {
       'desc' => 'Real-time export to Cyrus IMAP server',
diff --git a/httemplate/edit/process/part_export.cgi b/httemplate/edit/process/part_export.cgi
index 8160527f6..b4ce0b352 100644
--- a/httemplate/edit/process/part_export.cgi
+++ b/httemplate/edit/process/part_export.cgi
@@ -1,7 +1,5 @@
 <%
 
-my $dbh = dbh;
-
 my $exportnum = $cgi->param('exportnum');
 
 my $old = qsearchs('part_export', { 'exportnum'=>$exportnum } ) if $exportnum;
@@ -26,21 +24,17 @@ local $FS::UID::AutoCommit = 0;
 
 my $error;
 if ( $exportnum ) {
-  $error = $new->replace($old);
+  $error = $new->replace($old,\%options);
 } else {
-  $error = $new->insert;
-  $exportnum = $new->exportnum;
+  $error = $new->insert,\%options);
+#  $exportnum = $new->exportnum;
 }
+
 if ( $error ) {
-  $dbh->rollback;
   $cgi->param('error', $error );
   print $cgi->redirect(popurl(2). "part_export.cgi?". $cgi->query_string );
-  myexit();
+} else {
+  print $cgi->redirect(popurl(3). "browse/part_svc.cgi");
 }
 
-#options
-
-$dbh->commit or die $dbh->errstr;
-print $cgi->redirect(popurl(3). "browse/part_svc.cgi");
-
 %>
-- 
cgit v1.2.1


From b159f42fa3f48cc2ca3b43773e7661e17d2fb072 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Mar 2002 12:49:43 +0000
Subject: more new export...

---
 FS/FS/Record.pm                         |  2 +-
 FS/FS/part_export.pm                    | 43 +++++++++++++++++++++++----------
 FS/MANIFEST                             |  2 ++
 FS/t/part_export.t                      |  5 ++++
 FS/t/part_export_option.t               |  5 ++++
 httemplate/browse/part_svc.cgi          | 21 +++++++++++++---
 httemplate/edit/part_export.cgi         |  2 +-
 httemplate/edit/process/part_export.cgi | 16 ++++--------
 httemplate/misc/delete-part_export.cgi  | 15 ++++++++++++
 9 files changed, 82 insertions(+), 29 deletions(-)
 create mode 100644 FS/t/part_export.t
 create mode 100644 FS/t/part_export_option.t
 create mode 100755 httemplate/misc/delete-part_export.cgi

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 0bd7aeda4..ff967817a 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -947,7 +947,7 @@ Check/untaint host and domain names.
 sub ut_domain {
   my( $self, $field ) = @_;
   #$self->getfield($field) =~/^(\w+\.)*\w+$/
-  $self->getfield($field) =~/^(\w+\.)*\w+$/
+  $self->getfield($field) =~/^([\w\-]+\.)*\w+$/
     or return "Illegal (domain) $field: ". $self->getfield($field);
   $self->setfield($field,$1);
   '';
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 59024f651..3f184be07 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -102,6 +102,7 @@ created (see L<FS::part_export_option>).
 #false laziness w/queue.pm
 sub insert {
   my $self = shift;
+  my $options = shift;
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE';
@@ -119,7 +120,6 @@ sub insert {
     return $error;
   }
 
-  my $options = shift;
   foreach my $optionname ( keys %{$options} ) {
     my $part_export_option = new FS::part_export_option ( {
       'exportnum'   => $self->exportnum,
@@ -191,6 +191,8 @@ created or modified (see L<FS::part_export_option>).
 
 sub replace {
   my $self = shift;
+  my $old = shift;
+  my $options = shift;
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE';
@@ -202,13 +204,12 @@ sub replace {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  my $error = $self->SUPER::replace;
+  my $error = $self->SUPER::replace($old);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
   }
 
-  my $options = shift;
   foreach my $optionname ( keys %{$options} ) {
     my $old = qsearchs( 'part_export_option', {
         'exportnum'   => $self->exportnum,
@@ -219,6 +220,7 @@ sub replace {
         'optionname'  => $optionname,
         'optionvalue' => $options->{$optionname},
     } );
+    $new->optionnum($old->optionnum) if $old;
     my $error = $old ? $new->replace($old) : $new->insert;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
@@ -226,14 +228,16 @@ sub replace {
     }
   }
 
-  #remove extraneous old options?  not necessary now, but...
-  #foreach my $opt ( grep { !exist $options->{$_->optionname} } $old->part_export_option ) {
-  #  my $error = $opt->delete;
-  #  if ( $error ) {
-  #    $dbh->rollback if $oldAutoCommit;
-  #    return $error;
-  #  }
-  #}
+  #remove extraneous old options
+  foreach my $opt (
+    grep { !exists $options->{$_->optionname} } $old->part_export_option
+  ) {
+    my $error = $opt->delete;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
@@ -253,6 +257,7 @@ sub check {
   my $self = shift;
   my $error = 
     $self->ut_numbern('exportnum')
+    || $self->ut_domain('machine')
     || $self->ut_number('svcpart')
     || $self->ut_alpha('exporttype')
   ;
@@ -286,6 +291,9 @@ sub part_svc {
 
 =item part_export_option
 
+Returns all options as FS::part_export_option objects (see
+L<FS::part_export_option>).
+
 =cut
 
 sub part_export_option {
@@ -295,6 +303,8 @@ sub part_export_option {
 
 =item options 
 
+Returns a list of option names and values suitable for assigning to a hash.
+
 =cut
 
 sub options {
@@ -302,7 +312,9 @@ sub options {
   map { $_->optionname => $_->optionvalue } $self->part_export_option;
 }
 
-=item option
+=item option OPTIONNAME
+
+Returns the option value for the given name, or the empty string.
 
 =cut
 
@@ -318,6 +330,11 @@ sub option {
 
 =item rebless
 
+Reblesses the object into the FS::part_export::EXPORTTYPE class, where
+EXPORTTYPE is the object's I<exporttype> field.  There should be better docs
+on how to create new exports (and they should live in their own files and be
+autoloaded-on-demand), but until then, see L</NEW EXPORT CLASSES>.
+
 =cut
 
 sub rebless {
@@ -346,7 +363,7 @@ sub export_insert {
 #  $self->$method(@_);
 #}
 
-=item export_replace
+=item export_replace NEW OLD
 
 =cut
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index c1aa5ef1a..19915cdc9 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -90,6 +90,8 @@ t/cust_svc.t
 t/domain_record.t
 t/nas.t
 t/part_bill_event.t
+t/part_export.t
+t/part_export_option.t
 t/part_pkg.t
 t/part_pop_local.t
 t/part_referral.t
diff --git a/FS/t/part_export.t b/FS/t/part_export.t
new file mode 100644
index 000000000..26b398791
--- /dev/null
+++ b/FS/t/part_export.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_export_option.t b/FS/t/part_export_option.t
new file mode 100644
index 000000000..13200c213
--- /dev/null
+++ b/FS/t/part_export_option.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export_option;
+$loaded=1;
+print "ok 1\n";
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index cf0f0408c..c66b8ac63 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -14,6 +14,13 @@ my $total = scalar(@part_svc);
 %>
 <%= header('Service Definition Listing', menubar( 'Main Menu' => $p) ) %>
 
+<SCRIPT>
+function part_export_areyousure(href) {
+  if (confirm("Are you sure you want to delete this export?") == true)
+    window.location.href = href;
+}
+</SCRIPT>
+
     Services are items you offer to your customers.<BR><BR>
 <%= $total %> services
 <%= $cgi->param('showdisabled')
@@ -61,10 +68,17 @@ my $total = scalar(@part_svc);
   foreach my $part_export ( @part_export ) {
 %>
       <TR>
-        <TD><%= $part_export->exporttype %> to <%= $part_export->machine %></TD>
-        <TD>(options)</TD>
+        <TD><%= $part_export->exporttype %> to <%= $part_export->machine %> (<A HREF="<%= $p %>edit/part_export.cgi?<%= $part_export->exportnum %>">edit</A>&nbsp;|&nbsp;<A HREF="javascript:part_export_areyousure('<%= $p %>misc/delete-part_export.cgi?<%= $part_export->exportnum %>')">delete</A>)</TD>
+        <TD>
+          <%= itable() %>
+          <% my %opt = $part_export->options;
+             foreach my $opt ( keys %opt ) { %>
+               <TR><TD><%= $opt %></TD><TD><%= $opt{$opt} %></TD></TR>
+          <% } %>
+          </TABLE>
+        </TD>
 <%  } %>
-      </TR><TR><TD COLSPAN=2><A HREF="<%= $p %>edit/part_export.cgi?new_with_svcpart=<%= $part_svc->svcpart %>"><I>Add a new export</I><A></TD></TR>
+      </TR><TR><TD COLSPAN=2><A HREF="<%= $p %>edit/part_export.cgi?new_with_svcpart=<%= $part_svc->svcpart %>"><I>Add a new export</I></A></TD></TR>
 <% if (@part_export) { %>
       <TR><TD COLSPAN=2>
         <FORM METHOD="POST" ACTION="<%= $p %>edit/part_export.cgi">
@@ -75,6 +89,7 @@ my $total = scalar(@part_svc);
             <%= $part_export->exporttype %> to <%= $part_export->machine %>
           </OPTION>
 <%   } %>
+        </SELECT>
         <INPUT TYPE="submit" VALUE="clone existing export">
         </FORM></TD></TR>
 <% } %>
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 7ba6fa12b..3d867f50a 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -27,7 +27,7 @@ if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
   $action = 'Add';
   my $old_part_export = qsearchs('part_export', { 'exportnum' => $1 } );
   unless ( $part_export ) {
-    ($part_export, $options) = $old_part_export->clone;
+    ($part_export, $options) = $old_part_export->clone($cgi->param('svcpart'));
   }
 } elsif ( $cgi->param('new_with_svcpart') 
           && $cgi->param('new_with_svcpart') =~ /^(\d+)$/ ) {
diff --git a/httemplate/edit/process/part_export.cgi b/httemplate/edit/process/part_export.cgi
index b4ce0b352..d0c87a02a 100644
--- a/httemplate/edit/process/part_export.cgi
+++ b/httemplate/edit/process/part_export.cgi
@@ -5,7 +5,8 @@ my $exportnum = $cgi->param('exportnum');
 my $old = qsearchs('part_export', { 'exportnum'=>$exportnum } ) if $exportnum;
 
 #fixup options
-my %options = map { $_=>$cgi->param($_) } $cgi->param('options');
+warn join('-', split(',',$cgi->param('options')));
+my %options = map { $_=>$cgi->param($_) } split(',',$cgi->param('options'));
 
 my $new = new FS::part_export ( {
   map {
@@ -13,20 +14,13 @@ my $new = new FS::part_export ( {
   } fields('part_export')
 } );
 
-local $SIG{HUP} = 'IGNORE';
-local $SIG{INT} = 'IGNORE';
-local $SIG{QUIT} = 'IGNORE';
-local $SIG{TERM} = 'IGNORE';
-local $SIG{TSTP} = 'IGNORE';
-local $SIG{PIPE} = 'IGNORE';
-
-local $FS::UID::AutoCommit = 0;
-
 my $error;
 if ( $exportnum ) {
+  warn $old;
+  warn $exportnum;
   $error = $new->replace($old,\%options);
 } else {
-  $error = $new->insert,\%options);
+  $error = $new->insert(\%options);
 #  $exportnum = $new->exportnum;
 }
 
diff --git a/httemplate/misc/delete-part_export.cgi b/httemplate/misc/delete-part_export.cgi
new file mode 100755
index 000000000..a5166d944
--- /dev/null
+++ b/httemplate/misc/delete-part_export.cgi
@@ -0,0 +1,15 @@
+<%
+
+#untaint paynum
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ || die "Illegal exportnum";
+my $exportnum = $1;
+
+my $part_export = qsearchs('part_export',{'exportnum'=>$exportnum});
+
+my $error = $part_export->delete;
+eidiot($error) if $error;
+
+print $cgi->redirect($p. "browse/part_svc.cgi");
+
+%>
-- 
cgit v1.2.1


From 20bb426a02c0ea54d8feaea7c5da51735ab70293 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Mar 2002 18:56:33 +0000
Subject: RADIUS groups on the way!

---
 FS/FS/cust_main_county.pm     |  2 +-
 FS/FS/svc_acct.pm             | 60 +++++++++++++++++++++++++++++++++++++++++++
 FS/MANIFEST                   |  4 ++-
 FS/t/radius_usergroup.t       |  5 ++++
 Makefile                      |  4 +--
 README.1.4.0pre12             |  8 ++++++
 bin/create-history-tables     | 11 +++++---
 bin/fs-setup                  | 13 +++++++++-
 httemplate/docs/schema.html   |  6 +++++
 httemplate/docs/upgrade8.html |  8 ++++++
 httemplate/edit/part_svc.cgi  |  4 +++
 httemplate/edit/svc_acct.cgi  |  4 +++
 httemplate/view/svc_acct.cgi  |  3 +++
 13 files changed, 124 insertions(+), 8 deletions(-)
 create mode 100644 FS/t/radius_usergroup.t

diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index 95ed53dab..56d29da94 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -227,7 +227,7 @@ END
 
 =head1 BUGS
 
-regionseletor?  putting web ui components in here?  they should probably live
+regionselector?  putting web ui components in here?  they should probably live
 somewhere else...
 
 =head1 SEE ALSO
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 2305aeb80..9da5a6671 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -27,6 +27,7 @@ use FS::cust_main_invoice;
 use FS::svc_domain;
 use FS::raddb;
 use FS::queue;
+use FS::radius_usergroup;
 
 @ISA = qw( FS::svc_Common );
 
@@ -1282,8 +1283,64 @@ sub seconds_since {
   $self->cust_svc->seconds_since(@_);
 }
 
+=item radius_groups
+
+Returns all RADIUS groups for this account (see L<FS::radius_usergroup>).
+
+=cut
+
+sub radius_groups {
+  my $self = shift;
+  map { $_->groupname }
+    qsearch('radius_usergroup', { 'svcnum' => $self->svcnum } );
+}
+
 =back
 
+=head1 SUBROUTINES
+
+=item radius_usergroup_selector GROUPS_ARRAYREF
+
+=cut
+
+sub radius_usergroup_selector {
+  my $sel_groups = shift;
+  my %sel_groups = map { $_=>1 } @$sel_groups;
+
+  my $selectname = shift || 'radius_usergroup';
+
+  my $dbh = dbh;
+  my $sth = $dbh->prepare(
+    'SELECT DISTINCT(groupname) FROM radius_usergroup ORDER BY groupname'
+  ) or die $dbh->errstr;
+  $sth->execute() or die $sth->errstr;
+  my @all_groups = map { $_->[0] } @{$sth->fetchall_arrayref};
+
+  my $html = <<END;
+    <SCRIPT>
+    function ${selectname}_doadd(object) {
+      var myvalue = object.${selectname}_add.value;
+      var optionName = new Option(myvalue,myvalue,false,true);
+      var length = object.$selectname.length;
+      object.$selectname.options[length] = optionName;
+    }
+    </SCRIPT>
+    <SELECT MULTIPLE NAME="$selectname">
+END
+
+  foreach my $group ( @all_groups ) {
+    $html .= '<OPTION';
+    $html .= ' SELECTED' if $sel_groups{$group};
+    $html .= ">$group</OPTION>\n";
+  }
+  $html .= '</SELECT>';
+
+  $html .= qq!<BR><INPUT TYPE="text" NAME="${selectname}_add">!.
+           qq!<INPUT TYPE="button" VALUE="Add new group" onClick="${selectname}_doadd(this.form)">!;
+
+  $html;
+}
+
 =head1 BUGS
 
 The $recref stuff in sub check should be cleaned up.
@@ -1292,6 +1349,9 @@ The suspend, unsuspend and cancel methods update the database, but not the
 current object.  This is probably a bug as it's unexpected and
 counterintuitive.
 
+radius_usergroup_selector?  putting web ui components in here?  they should
+probably live somewhere else...
+
 =head1 SEE ALSO
 
 L<FS::svc_Common>, edit/part_svc.cgi from an installed web interface,
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 19915cdc9..54aaaa19f 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -65,6 +65,7 @@ FS/prepay_credit.pm
 FS/svc_www.pm
 FS/svc_forward.pm
 FS/raddb.pm
+FS/radius_usergroup.pm
 FS/queue.pm
 FS/queue_arg.pm
 t/agent.t
@@ -72,6 +73,7 @@ t/agent_type.t
 t/CGI.t
 t/Conf.t
 t/ConfItem.t
+t/Record.t
 t/cust_bill.t
 t/cust_bill_event.t
 t/cust_bill_pay.t
@@ -100,7 +102,7 @@ t/part_svc_column.t
 t/pkg_svc.t
 t/port.t
 t/prepay_credit.t
-t/Record.t
+t/radius_usergroup.t
 t/session.t
 t/svc_acct.t
 t/svc_acct_pop.t
diff --git a/FS/t/radius_usergroup.t b/FS/t/radius_usergroup.t
new file mode 100644
index 000000000..325742cf5
--- /dev/null
+++ b/FS/t/radius_usergroup.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::radius_usergroup;
+$loaded=1;
+print "ok 1\n";
diff --git a/Makefile b/Makefile
index 8f577c579..21aeb4566 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-TEMPLATE = asp
-#TEMPLATE = mason
+#TEMPLATE = asp
+TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
diff --git a/README.1.4.0pre12 b/README.1.4.0pre12
index d61656c38..abbf6e55c 100644
--- a/README.1.4.0pre12
+++ b/README.1.4.0pre12
@@ -15,6 +15,14 @@ ALTER TABLE cust_bill_event ADD status varchar(80);
 ALTER TABLE cust_bill_event ADD statustext text NULL;
 UPDATE cust_bill_event SET status = 'done';
 
+CREATE TABLE radius_usergroup (
+  usergroupnum int primary key,
+  svcnum int not null,
+  groupname varchar(80) not null
+);
+CREATE INDEX radius_usergroup1 ON radius_usergroup ( svcnum );
+CREATE INDEX radius_usergroup2 ON radius_usergroup ( groupname );
+
 Run bin/dbdef-create
 
 Run bin/create-history-tables
diff --git a/bin/create-history-tables b/bin/create-history-tables
index fb4c866c6..9ed641efd 100755
--- a/bin/create-history-tables
+++ b/bin/create-history-tables
@@ -16,8 +16,13 @@ my $dbh = adminsuidsetup $user;
 my $schema = dbdef();
 
 #false laziness w/fs-setup
-foreach my $table ( grep { ! /^h_/ } $schema->tables ) {
-  my $tableobj = $schema->table($table);
+my @tables = scalar(@ARGV)
+               ? @ARGV
+               : grep { ! /^h_/ } $schema->tables;
+foreach my $table ( @tables ) {
+  warn "creating history table for $table\n";
+  my $tableobj = $schema->table($table)
+    or die "unknown talble $table (did you run dbdef-create?)\n";
   my $h_tableobj = DBIx::DBSchema::Table->new( {
     name        => "h_$table",
     primary_key => 'historynum',
@@ -73,6 +78,6 @@ $dbh->commit or die $dbh->errstr;
 $dbh->disconnect or die $dbh->errstr;
 
 sub usage {
-  die "Usage:\n  create-history-tables user\n";
+  die "Usage:\n  create-history-tables user [ table table ... ] \n";
 }
 
diff --git a/bin/fs-setup b/bin/fs-setup
index 7ee04a5d8..01e08f77d 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.83 2002-03-04 12:48:49 ivan Exp $
+# $Id: fs-setup,v 1.84 2002-03-22 18:56:32 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -951,6 +951,17 @@ sub tables_hash_hack {
       'index'       => [ [ 'exportnum' ], [ 'optionname' ] ],
     },
 
+    'radius_usergroup' => {
+      'columns' => [
+        'usergroupnum', 'int', '', '',
+        'svcnum',       'int', '', '',
+        'groupname',    'varchar', '', $char_d,
+      ],
+      'primary_key' => 'usergroupnum',
+      'unique'      => [],
+      'index'       => [ [ 'svcnum' ], [ 'groupname' ] ],
+    },
+
   );
 
   %tables;
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index b828213ff..192f56ba9 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -383,5 +383,11 @@
         <li>jobnum - <a href="#queue">job</a>
         <li>arg - argument
       </ul>
+    <li><a name="radius_usergroup" href="man/FS/radius_usergroup.html">radius_usergroup</a> - Link users to RADIUS groups.
+      <ul>
+        <li>usergroupnum - primary key
+        <li>svcnum - <a href="#svc_acct">account</a>
+        <li>groupname
+      </ul>
   </ul>
 </body>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index e52b69ad3..440024de2 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -171,6 +171,14 @@ CREATE TABLE part_export_option (
 CREATE INDEX part_export_option1 ON part_export_option ( exportnum );
 CREATE INDEX part_export_option2 ON part_export_option ( optionname );
 
+CREATE TABLE radius_usergroup (
+  usergroupnum int primary key,
+  svcnum int not null,
+  groupname varchar(80) not null
+);
+CREATE INDEX radius_usergroup1 ON radius_usergroup ( svcnum );
+CREATE INDEX radius_usergroup2 ON radius_usergroup ( groupname );
+
 ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
 ALTER TABLE svc_domain ADD catchall integer NULL;
 ALTER TABLE cust_main ADD referral_custnum integer NULL;
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 3292a9b9b..b1bb7f3d3 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -86,6 +86,10 @@ my %defs = (
                      select_key   => 'svcnum',
                      select_label => 'domain',
                    },
+    'radius_groups' => {
+                         desc =>'ICRADIUS/FreeRADIUS groups',
+                         type =>'radius_usergroup_selector',
+                       },
   },
   'svc_domain' => {
     'domain'    => 'Domain',
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index d147a1683..6846b5c93 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -239,6 +239,10 @@ foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
   }
 }
 
+print '<TR><TD ALIGN="right">RADIUS groups</TD><TD>'.
+      &FS::svc_acct::radius_usergroup_selector( [ $svc_acct->radius_groups ] ).
+      '</TD></TR>';
+
 #submit
 print qq!</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">!; 
 
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index d1c61576d..b779e8774 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -129,6 +129,9 @@ if ($svc_acct->slipip) {
   print "<TR><TH COLSPAN=2>(No SLIP/PPP account)</TH></TR>";
 }
 
+print '<TR><TD ALIGN="right">RADIUS groups</TD><TD BGCOLOR="#ffffff">'.
+      join('<BR>', $svc_acct->radius_groups). '</TD></TR>';
+
 print "</TABLE></TD></TR></TABLE>".
       '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
       "</BODY></HTML>";
-- 
cgit v1.2.1


From 4fb679b29788a552a1ce33a0cdf293d648e797bc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 23 Mar 2002 07:54:05 +0000
Subject: redirect STDOUT/STDERR a bit later for better error reporting

---
 FS/bin/freeside-queued | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index c3c9240d2..fff77f01b 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -21,7 +21,7 @@ my $pid_file = '/var/run/freeside-queued.pid';
 
 my $user = shift or die &usage;
 
-&daemonize;
+&daemonize1;
 
 sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; }
 $SIG{CHLD} =  \&REAPER;
@@ -38,6 +38,8 @@ adminsuidsetup $user;
 
 $log_file = "/usr/local/etc/freeside/queuelog.". $FS::UID::datasrc;
 
+&daemonize2;
+
 $SIG{__DIE__} = \&_die;
 $SIG{__WARN__} = \&_logmsg;
 
@@ -134,7 +136,7 @@ sub _logmsg {
   close $log;
 }
 
-sub daemonize {
+sub daemonize1 {
 
   chdir "/" or die "Can't chdir to /: $!";
   open STDIN, '/dev/null'   or die "Can't read /dev/null: $!";
@@ -146,11 +148,18 @@ sub daemonize {
     print $pidfh "$pid\n";
     exit;
   }
+  #open STDOUT, '>/dev/null'
+  #                          or die "Can't write to /dev/null: $!";
+  #setsid                  or die "Can't start a new session: $!";
+  #open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
+
+}
+
+sub daemonize2 {
   open STDOUT, '>/dev/null'
                             or die "Can't write to /dev/null: $!";
   setsid                  or die "Can't start a new session: $!";
   open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
-
 }
 
 =head1 NAME
-- 
cgit v1.2.1


From 8fe83dcb8807a86209625a5aab7e574073f0a907 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 23 Mar 2002 16:16:00 +0000
Subject: group editing seems to be working...  everything except defaults...
 oh and export...

---
 FS/FS/part_export.pm                 |  8 ++--
 FS/FS/queue.pm                       | 44 ++++++++++++---------
 FS/FS/svc_acct.pm                    | 76 ++++++++++++++++++++++++++++++++++--
 httemplate/edit/process/svc_acct.cgi |  5 ++-
 httemplate/edit/svc_acct.cgi         | 11 ++++--
 5 files changed, 115 insertions(+), 29 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 3f184be07..9aedd9f7a 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -505,9 +505,11 @@ sub _export_replace {
     }
 
     my @del = grep { !exists $new{$_} } keys %old;
-    my $error = $self->sqlradius_queue( $new->svcnum, 'sqlradius_attrib_delete',
-      $table, $new->username, @del );
-    return $error if $error;
+    if ( @del ) {
+      my $error = $self->sqlradius_queue( $new->svcnum, 'attrib_delete',
+        $table, $new->username, @del );
+      return $error if $error;
+    }
   }
 
   '';
diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index a6d78e143..7a38a6eef 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -222,7 +222,7 @@ sub cust_svc {
   qsearchs('cust_svc', { 'svcnum' => $self->svcnum } );
 }
 
-=item joblisting HASHREF
+=item joblisting HASHREF NOACTIONS
 
 =cut
 
@@ -232,21 +232,24 @@ sub joblisting {
   use Date::Format;
   use FS::CGI;
 
+  my @queue = qsearch( 'queue', $hashref );
+  return '' unless scalar(@queue);
+
   my $html = FS::CGI::table(). <<END;
       <TR>
         <TH COLSPAN=2>Job</TH>
         <TH>Args</TH>
         <TH>Date</TH>
         <TH>Status</TH>
-        <TH>Account</TH>
-      </TR>
 END
+  $html .= '<TH>Account</TH>' unless $hashref->{svcnum};
+  $html .= '</TR>';
 
   my $p = FS::CGI::popurl(2);
   foreach my $queue ( sort { 
     $a->getfield('jobnum') <=> $b->getfield('jobnum')
-  } qsearch( 'queue', $hashref ) ) {
-    my $hashref = $queue->hashref;
+  } @queue ) {
+    my $queue_hashref = $queue->hashref;
     my $jobnum = $queue->jobnum;
     my $args = join(' ', $queue->args);
     my $date = time2str( "%a %b %e %T %Y", $queue->_date );
@@ -258,26 +261,31 @@ END
         qq!&nbsp;<A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=del">remove</A>&nbsp;)!;
     }
     my $cust_svc = $queue->cust_svc;
-    my $account;
-    if ( $cust_svc ) {
-      my $table = $cust_svc->part_svc->svcdb;
-      my $label = ( $cust_svc->label )[1];
-      $account = qq!<A HREF="../view/$table.cgi?!. $queue->svcnum.
-                 qq!">$label</A>!;
-    } else {
-      $account = '';
-    }
+
     $html .= <<END;
       <TR>
         <TD>$jobnum</TD>
-        <TD>$hashref->{job}</TD>
+        <TD>$queue_hashref->{job}</TD>
         <TD>$args</TD>
         <TD>$date</TD>
         <TD>$status</TD>
-        <TD>$account</TD>
-      </TR>
 END
 
+    unless ( $hashref->{svcnum} ) {
+      my $account;
+      if ( $cust_svc ) {
+        my $table = $cust_svc->part_svc->svcdb;
+        my $label = ( $cust_svc->label )[1];
+        $account = qq!<A HREF="../view/$table.cgi?!. $queue->svcnum.
+                   qq!">$label</A>!;
+      } else {
+        $account = '';
+      }
+      $html .= "<TD>$account</TD>";
+    }
+
+    $html .= '</TR>';
+
 }
 
   $html .= '</TABLE>';
@@ -290,7 +298,7 @@ END
 
 =head1 VERSION
 
-$Id: queue.pm,v 1.7 2002-03-07 14:10:10 ivan Exp $
+$Id: queue.pm,v 1.8 2002-03-23 16:16:00 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 9da5a6671..bb6b9959b 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -192,8 +192,6 @@ FS::svc_Common.  The following fields are currently supported:
 
 =item radius_I<Radius_Attribute> - I<Radius-Attribute>
 
-=item domsvc - service number of svc_domain with which to associate
-
 =back
 
 =head1 METHODS
@@ -216,6 +214,10 @@ otherwise returns false.
 The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
 defined.  An FS::cust_svc record will be created and inserted.
 
+The additional field I<usergroup> can optionally be defined; if so it should
+contain an arrayref of group names.  See L<FS::radius_usergroup>.  (used in
+sqlradius export only)
+
 If the configuration value (see L<FS::Conf>) shellmachine exists, and the 
 username, uid, and dir fields are defined, the command(s) specified in
 the shellmachine-useradd configuration are added to the job queue (see
@@ -289,6 +291,20 @@ sub insert {
     return $error;
   }
 
+  if ( $self->usergroup ) {
+    foreach my $groupname ( @{$self->usergroup} ) {
+      my $radius_usergroup = new FS::radius_usergroup ( {
+        svcnum    => $self->svcnum,
+        groupname => $groupname,
+      } );
+      my $error = $radius_usergroup->insert;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
+    }
+  }
+
   #new-style exports!
   unless ( $noexport_hack ) {
     foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
@@ -561,6 +577,16 @@ sub delete {
     }
   }
 
+  foreach my $radius_usergroup (
+    qsearch('radius_usergroup', { 'svcnum' => $self->svcnum } )
+  ) {
+    my $error = $radius_usergroup->delete;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
   my $error = $self->SUPER::delete;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
@@ -700,6 +726,10 @@ sub vpopmail_delete {
 Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
+The additional field I<usergroup> can optionally be defined; if so it should
+contain an arrayref of group names.  See L<FS::radius_usergroup>.  (used in
+sqlradius export only)
+
 If the configuration value (see L<FS::Conf>) shellmachine exists, and the 
 dir field has changed, the command(s) specified in the shellmachine-usermod
 configuraiton file are added to the job queue (see L<FS::queue> and
@@ -760,6 +790,40 @@ sub replace {
     return $error if $error;
   }
 
+  $old->usergroup( [ $old->radius_groups ] );
+
+  if ( $new->usergroup ) {
+
+    foreach my $groupname ( @{$old->usergroup} ) {
+      if ( grep { $groupname eq $_ } @{$new->usergroup} ) {
+        $new->usergroup( [ grep { $groupname ne $_ } @{$new->usergroup} ] );
+        next;
+      }
+      my $radius_usergroup = qsearch('radius_usergroup', {
+        svcnum    => $old->svcnum,
+        groupname => $groupname,
+      } );
+      my $error = $radius_usergroup->delete;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "error deleting radius_usergroup $groupname: $error";
+      }
+    }
+
+    foreach my $groupname ( @{$new->usergroup} ) {
+      my $radius_usergroup = new FS::radius_usergroup ( {
+        svcnum    => $new->svcnum,
+        groupname => $groupname,
+      } );
+      my $error = $radius_usergroup->insert;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "error adding radius_usergroup $groupname: $error";
+      }
+    }
+
+  }
+
   #new-style exports!
   unless ( $noexport_hack ) {
     foreach my $part_export ( $new->cust_svc->part_svc->part_export ) {
@@ -1299,7 +1363,7 @@ sub radius_groups {
 
 =head1 SUBROUTINES
 
-=item radius_usergroup_selector GROUPS_ARRAYREF
+=item radius_usergroup_selector GROUPS_ARRAYREF [ SELECTNAME ]
 
 =cut
 
@@ -1323,6 +1387,7 @@ sub radius_usergroup_selector {
       var optionName = new Option(myvalue,myvalue,false,true);
       var length = object.$selectname.length;
       object.$selectname.options[length] = optionName;
+      object.${selectname}_add.value = "";
     }
     </SCRIPT>
     <SELECT MULTIPLE NAME="$selectname">
@@ -1330,9 +1395,12 @@ END
 
   foreach my $group ( @all_groups ) {
     $html .= '<OPTION';
-    $html .= ' SELECTED' if $sel_groups{$group};
+    $html .= ' SELECTED' if $sel_groups{$group}--;
     $html .= ">$group</OPTION>\n";
   }
+  foreach my $group ( grep { $sel_groups{$_} } keys %sel_groups ) {
+    $html .= "<OPTION SELECTED>$group</OPTION>\n";
+  };
   $html .= '</SELECT>';
 
   $html .= qq!<BR><INPUT TYPE="text" NAME="${selectname}_add">!.
diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi
index 5e8a16f4a..950a8602f 100755
--- a/httemplate/edit/process/svc_acct.cgi
+++ b/httemplate/edit/process/svc_acct.cgi
@@ -20,12 +20,15 @@ if ( $cgi->param('_password') eq '*HIDDEN*' ) {
   $cgi->param('_password',$old->getfield('_password'));
 }
 
+#unmunge usergroup
+$cgi->param('usergroup', [ $cgi->param('radius_usergroup') ] );
+
 my $new = new FS::svc_acct ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(svcnum pkgnum svcpart username _password popnum uid gid finger dir
   #  shell quota slipip)
-  } ( fields('svc_acct'), qw( pkgnum svcpart ) )
+  } ( fields('svc_acct'), qw( pkgnum svcpart usergroup ) )
 } );
 
 my $error;
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 6846b5c93..8a80d4c72 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -4,7 +4,7 @@
 my $conf = new FS::Conf;
 my @shells = $conf->config('shells');
 
-my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct);
+my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct, @groups);
 if ( $cgi->param('error') ) {
   $svc_acct = new FS::svc_acct ( {
     map { $_, scalar($cgi->param($_)) } fields('svc_acct')
@@ -14,6 +14,7 @@ if ( $cgi->param('error') ) {
   $svcpart = $cgi->param('svcpart');
   $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
   die "No part_svc entry!" unless $part_svc;
+  @groups = $cgi->param('radius_usergroup');
 } else {
   my($query) = $cgi->keywords;
   if ( $query =~ /^(\d+)$/ ) { #editing
@@ -30,6 +31,8 @@ if ( $cgi->param('error') ) {
     $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
     die "No part_svc entry!" unless $part_svc;
 
+    @groups = $svc_acct->radius_groups;
+
   } else { #adding
 
     $svc_acct = new FS::svc_acct({}); 
@@ -63,6 +66,8 @@ if ( $cgi->param('error') ) {
                          );
     }
 
+    #SET DEFAULT GROUP(S) FROM PART_SVC!!!!
+
   }
 }
 my $action = $svcnum ? 'Edit' : 'Add';
@@ -100,7 +105,7 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
 print 'Service # '. ( $svcnum ? "<B>$svcnum</B>" : " (NEW)" ). '<BR>'.
       'Service: <B>'. $part_svc->svc. '</B><BR><BR>'.
       <<END;
-    <FORM ACTION="${p1}process/svc_acct.cgi" METHOD=POST>
+    <FORM NAME="OneTrueForm" ACTION="${p1}process/svc_acct.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
       <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
       <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
@@ -240,7 +245,7 @@ foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
 }
 
 print '<TR><TD ALIGN="right">RADIUS groups</TD><TD>'.
-      &FS::svc_acct::radius_usergroup_selector( [ $svc_acct->radius_groups ] ).
+      &FS::svc_acct::radius_usergroup_selector( \@groups ).
       '</TD></TR>';
 
 #submit
-- 
cgit v1.2.1


From 74e64d70361848f089aad9a7881c2af9caf6e479 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 23 Mar 2002 17:49:01 +0000
Subject: okay group editing UI as well as part_svc group editing UI seem to be
 working

---
 FS/FS/part_svc.pm                    | 24 +++++++++++++++++++-----
 FS/FS/svc_acct.pm                    |  7 +++++--
 httemplate/browse/part_svc.cgi       | 10 ++++++----
 httemplate/edit/part_svc.cgi         | 12 ++++++++----
 httemplate/edit/process/part_svc.cgi | 12 ++++++++----
 5 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 82935dd2b..94f51fa98 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -57,19 +57,25 @@ database, see L<"insert">.
 
 sub table { 'part_svc'; }
 
-=item insert
+=item insert EXTRA_FIELDS_ARRAYREF
 
 Adds this service definition to the database.  If there is an error, returns
 the error, otherwise returns false.
 
+TODOC:
+
 =item I<svcdb>__I<field> - Default or fixed value for I<field> in I<svcdb>.
 
 =item I<svcdb>__I<field>_flag - defines I<svcdb>__I<field> action: null, `D' for default, or `F' for fixed
 
+TODOC: EXTRA_FIELDS_ARRAYREF
+
 =cut
 
 sub insert {
   my $self = shift;
+  my @fields = ();
+  @fields = @{shift(@_)} if @_;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -96,7 +102,7 @@ sub insert {
   foreach my $field (
     grep { $_ ne 'svcnum'
            && defined( $self->getfield($svcdb.'__'.$_.'_flag') )
-         } fields($svcdb)
+         } (fields($svcdb), @fields)
   ) {
     my $part_svc_column = $self->part_svc_column($field);
     my $previous = qsearchs('part_svc_column', {
@@ -141,11 +147,15 @@ sub delete {
 # check & make sure the svcpart isn't in cust_svc or pkg_svc (in any packages)?
 }
 
-=item replace OLD_RECORD
+=item replace OLD_RECORD [ '1.3-COMPAT' [ , EXTRA_FIELDS_ARRAYREF ] ]
 
 Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
+TODOC: 1.3-COMPAT
+
+TODOC: EXTRA_FIELDS_ARRAYREF
+
 =cut
 
 sub replace {
@@ -172,11 +182,15 @@ sub replace {
   }
 
   if ( @_ && $_[0] eq '1.3-COMPAT' ) {
+    shift;
+    my @fields = ();
+    @fields = @{shift(@_)} if @_;
+
     my $svcdb = $new->svcdb;
     foreach my $field (
       grep { $_ ne 'svcnum'
              && defined( $new->getfield($svcdb.'__'.$_.'_flag') )
-           } fields($svcdb)
+           } (fields($svcdb),@fields)
     ) {
       my $part_svc_column = $new->part_svc_column($field);
       my $previous = qsearchs('part_svc_column', {
@@ -309,7 +323,7 @@ sub part_export {
 
 =head1 VERSION
 
-$Id: part_svc.pm,v 1.10 2002-03-20 21:31:49 ivan Exp $
+$Id: part_svc.pm,v 1.11 2002-03-23 17:49:01 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index bb6b9959b..a3e97f74c 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -799,7 +799,7 @@ sub replace {
         $new->usergroup( [ grep { $groupname ne $_ } @{$new->usergroup} ] );
         next;
       }
-      my $radius_usergroup = qsearch('radius_usergroup', {
+      my $radius_usergroup = qsearchs('radius_usergroup', {
         svcnum    => $old->svcnum,
         groupname => $groupname,
       } );
@@ -1395,7 +1395,10 @@ END
 
   foreach my $group ( @all_groups ) {
     $html .= '<OPTION';
-    $html .= ' SELECTED' if $sel_groups{$group}--;
+    if ( $sel_groups{$group} ) {
+      $html .= ' SELECTED';
+      $sel_groups{$group} = 0;
+    }
     $html .= ">$group</OPTION>\n";
   }
   foreach my $group ( grep { $sel_groups{$_} } keys %sel_groups ) {
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index c66b8ac63..250b1ff4e 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -41,13 +41,15 @@ function part_export_areyousure(href) {
 <% foreach my $part_svc ( sort {
      $a->getfield('svcpart') <=> $b->getfield('svcpart')
    } @part_svc ) {
-     my($hashref)=$part_svc->hashref;
-     my($svcdb)=$hashref->{svcdb};
+     my $hashref = $part_svc->hashref;
+     my $svcdb = $hashref->{svcdb};
+     my @dfields = fields($svcdb);
+     push @dfields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
      my @fields =
        grep { $_ ne 'svcnum' && $part_svc->part_svc_column($_)->columnflag }
-            fields($svcdb);
+            @dfields;
 
-     my($rowspan)=scalar(@fields) || 1;
+     my $rowspan = scalar(@fields) || 1;
      my $url = "${p}edit/part_svc.cgi?$hashref->{svcpart}";
 %>
 
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index b1bb7f3d3..b4900a01c 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -86,10 +86,10 @@ my %defs = (
                      select_key   => 'svcnum',
                      select_label => 'domain',
                    },
-    'radius_groups' => {
-                         desc =>'ICRADIUS/FreeRADIUS groups',
-                         type =>'radius_usergroup_selector',
-                       },
+    'usergroup' => {
+                     desc =>'ICRADIUS/FreeRADIUS groups',
+                     type =>'radius_usergroup_selector',
+                   },
   },
   'svc_domain' => {
     'domain'    => 'Domain',
@@ -138,6 +138,7 @@ my %defs = (
       my @fields = defined( $FS::Record::dbdef->table($layer) )
                       ? grep { $_ ne 'svcnum' } fields($layer)
                       : ();
+      push @fields, 'usergroup' if $layer eq 'svc_acct'; #kludge
       foreach my $field (@fields) {
         my $part_svc_column = $part_svc->part_svc_column($field);
         my $value = $cgi->param('error')
@@ -171,6 +172,9 @@ my %defs = (
                        $record->getfield($def->{select_label}). '</OPTION>';
             }
             $html .= '</SELECT>';
+          } elsif ( $def->{type} eq 'radius_usergroup_selector' ) {
+            $html .= FS::svc_acct::radius_usergroup_selector(
+              [ split(',', $value) ], "${layer}__${field}" );
           } else {
             $html .= '<font color="#ff0000">unknown type'. $def->{type};
           }
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 423db93b5..31ab13438 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -4,14 +4,18 @@ my $svcpart = $cgi->param('svcpart');
 
 my $old = qsearchs('part_svc',{'svcpart'=>$svcpart}) if $svcpart;
 
+$cgi->param( 'svc_acct__usergroup',
+             join(',', $cgi->param('svc_acct__usergroup') ) );
+
 my $new = new FS::part_svc ( {
   map {
     $_, scalar($cgi->param($_));
 #  } qw(svcpart svc svcdb)
   } ( fields('part_svc'),
       map { my $svcdb = $_;
-            map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  }
-              fields($svcdb)
+            my @fields = fields($svcdb);
+            push @fields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
+            map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  } @fields;
           } grep defined( $FS::Record::dbdef->table($_) ),
                  qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www )
     )
@@ -19,9 +23,9 @@ my $new = new FS::part_svc ( {
 
 my $error;
 if ( $svcpart ) {
-  $error = $new->replace($old, '1.3-COMPAT');
+  $error = $new->replace($old, '1.3-COMPAT', [ 'usergroup' ] );
 } else {
-  $error = $new->insert;
+  $error = $new->insert( [ 'usergroup' ] );
   $svcpart=$new->getfield('svcpart');
 }
 
-- 
cgit v1.2.1


From 7dc23049c25d316da196647a8be1d74dfc09a02a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 24 Mar 2002 14:29:00 +0000
Subject: ICRADIUS groups all done!  UI and provisioning.  closes: Bug#362

fix some bugs in the export and add queue_dangerous_controls option too
---
 FS/FS/Conf.pm                |   7 +++
 FS/FS/part_export.pm         |  96 +++++++++++++++++++++++++++++---
 FS/FS/queue.pm               |  13 ++++-
 FS/FS/radius_usergroup.pm    | 130 +++++++++++++++++++++++++++++++++++++++++++
 FS/FS/svc_acct.pm            |  31 ++++++-----
 httemplate/edit/svc_acct.cgi |  22 +++++---
 6 files changed, 267 insertions(+), 32 deletions(-)
 create mode 100644 FS/FS/radius_usergroup.pm

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 645dbf1c4..2bc5e24c0 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -836,6 +836,13 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'queue_dangerous_controls',
+    'section'     => 'UI',
+    'description' => 'Enable queue modification controls on account pages and for new jobs.  Unless you are a developer working on new export code, you should probably leave this off to avoid causing provisioning problems.',
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 9aedd9f7a..eabcedec1 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -383,6 +383,22 @@ sub export_delete {
   $self->_export_delete(@_);
 }
 
+#fallbacks providing useful error messages intead of infinite loops
+sub _export_insert {
+  my $self = shift;
+  return "_export_insert: unknown export type ". $self->exporttype;
+}
+
+sub _export_replace {
+  my $self = shift;
+  return "_export_replace: unknown export type ". $self->exporttype;
+}
+
+sub _export_delete {
+  my $self = shift;
+  return "_export_delete: unknown export type ". $self->exporttype;
+}
+
 =back
 
 =cut
@@ -474,10 +490,22 @@ use vars qw(@ISA);
 
 sub _export_insert {
   my($self, $svc_acct) = (shift, shift);
-  $self->sqlradius_queue( $svc_acct->svcnum, 'insert',
-    'reply', $svc_acct->username, $svc_acct->radius_reply );
-  $self->sqlradius_queue( $svc_acct->svcnum, 'insert',
-    'check', $svc_acct->username, $svc_acct->radius_check );
+
+  foreach my $table (qw(reply check)) {
+    my $method = "radius_$table";
+    my %attrib = $svc_acct->$method;
+    next unless keys %attrib;
+    my $error = $self->sqlradius_queue( $svc_acct->svcnum, 'insert',
+      $table, $svc_acct->username, %attrib );
+    return $error if $error;
+  }
+  my @groups = $svc_acct->radius_groups;
+  if ( @groups ) {
+    my $error = $self->sqlradius_queue( $svc_acct->svcnum, 'usergroup_insert',
+      $svc_acct->username, @groups );
+    return $error if $error;
+  }
+  '';
 }
 
 sub _export_replace {
@@ -512,6 +540,30 @@ sub _export_replace {
     }
   }
 
+  # (sorta) false laziness with FS::svc_acct::replace
+  my @oldgroups = @{$old->usergroup}; #uuuh
+  my @newgroups = $new->radius_groups;
+  my @delgroups = ();
+  foreach my $oldgroup ( @oldgroups ) {
+    if ( grep { $oldgroup eq $_ } @newgroups ) {
+      @newgroups = grep { $oldgroup ne $_ } @newgroups;
+      next;
+    }
+    push @delgroups, $oldgroup;
+  }
+
+  if ( @delgroups ) {
+    my $error = $self->sqlradius_queue( $new->svcnum, 'usergroup_delete',
+      $new->username, @delgroups );
+    return $error if $error;
+  }
+
+  if ( @newgroups ) {
+    my $error = $self->sqlradius_queue( $new->svcnum, 'usergroup_insert',
+      $new->username, @newgroups );
+    return $error if $error;
+  }
+
   '';
 }
 
@@ -544,8 +596,8 @@ sub sqlradius_insert { #subroutine, not method
       "UPDATE rad$replycheck SET Value = ? WHERE UserName = ? AND Attribute = ?"    ) or die $dbh->errstr;
     my $i_sth = $dbh->prepare(
       "INSERT INTO rad$replycheck ( id, UserName, Attribute, Value ) ".
-        "VALUES ( ?, ?, ?, ? )" )
-      or die $dbh->errstr;
+        "VALUES ( ?, ?, ?, ? )"
+    ) or die $dbh->errstr;
     $u_sth->execute($attributes{$attribute}, $username, $attribute) > 0
       or $i_sth->execute( '', $username, $attribute, $attributes{$attribute} )
         or die "can't insert into rad$replycheck table: ". $i_sth->errstr;
@@ -553,10 +605,38 @@ sub sqlradius_insert { #subroutine, not method
   $dbh->disconnect;
 }
 
+sub sqlradius_usergroup_insert { #subroutine, not method
+  my $dbh = sqlradius_connect(shift, shift, shift);
+  my( $username, @groups ) = @_;
+
+  my $sth = $dbh->prepare( 
+    "INSERT INTO usergroup ( id, UserName, GroupName ) VALUES ( ?, ?, ? )"
+  ) or die $dbh->errstr;
+  foreach my $group ( @groups ) {
+    $sth->execute( '', $username, $group )
+      or die "can't insert into groupname table: ". $sth->errstr;
+  }
+  $dbh->disconnect;
+}
+
+sub sqlradius_usergroup_delete { #subroutine, not method
+  my $dbh = sqlradius_connect(shift, shift, shift);
+  my( $username, @groups ) = @_;
+
+  my $sth = $dbh->prepare( 
+    "DELETE FROM usergroup ( id, UserName, GroupName ) VALUES ( ?, ?, ? )"
+  ) or die $dbh->errstr;
+  foreach my $group ( @groups ) {
+    $sth->execute( '', $username, $group )
+      or die "can't delete from groupname table: ". $sth->errstr;
+  }
+  $dbh->disconnect;
+}
+
 sub sqlradius_rename { #subroutine, not method
   my $dbh = sqlradius_connect(shift, shift, shift);
   my($new_username, $old_username) = @_;
-  foreach my $table (qw(radreply radcheck)) {
+  foreach my $table (qw(radreply radcheck usergroup )) {
     my $sth = $dbh->prepare("UPDATE $table SET Username = ? WHERE UserName = ?")
       or die $dbh->errstr;
     $sth->execute($new_username, $old_username)
@@ -583,7 +663,7 @@ sub sqlradius_delete { #subroutine, not method
   my $dbh = sqlradius_connect(shift, shift, shift);
   my $username = shift;
 
-  foreach my $table (qw( radcheck radreply )) {
+  foreach my $table (qw( radcheck radreply usergroup )) {
     my $sth = $dbh->prepare( "DELETE FROM $table WHERE UserName = ?" );
     $sth->execute($username)
       or die "can't delete from $table table: ". $sth->errstr;
diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index 7a38a6eef..e5369cf82 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -1,8 +1,10 @@
 package FS::queue;
 
 use strict;
-use vars qw( @ISA @EXPORT_OK );
+use vars qw( @ISA @EXPORT_OK $conf );
 use Exporter;
+use FS::UID;
+use FS::Conf;
 use FS::Record qw( qsearch qsearchs dbh );
 #use FS::queue;
 use FS::queue_arg;
@@ -11,6 +13,10 @@ use FS::cust_svc;
 @ISA = qw(FS::Record);
 @EXPORT_OK = qw( joblisting );
 
+$FS::UID::callback{'FS::queue'} = sub {
+  $conf = new FS::Conf;
+};
+
 =head1 NAME
 
 FS::queue - Object methods for queue records
@@ -255,7 +261,8 @@ END
     my $date = time2str( "%a %b %e %T %Y", $queue->_date );
     my $status = $queue->status;
     $status .= ': '. $queue->statustext if $queue->statustext;
-    if ( ! $noactions && $status =~ /^failed/ || $status =~ /^locked/ ) {
+    if ( $conf->exists('queue_dangerous_controls')
+         || ( ! $noactions && $status =~ /^failed/ || $status =~ /^locked/ ) ) {
       $status .=
         qq! (&nbsp;<A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=new">retry</A>&nbsp;|!.
         qq!&nbsp;<A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=del">remove</A>&nbsp;)!;
@@ -298,7 +305,7 @@ END
 
 =head1 VERSION
 
-$Id: queue.pm,v 1.8 2002-03-23 16:16:00 ivan Exp $
+$Id: queue.pm,v 1.9 2002-03-24 14:29:00 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/radius_usergroup.pm b/FS/FS/radius_usergroup.pm
new file mode 100644
index 000000000..647621d28
--- /dev/null
+++ b/FS/FS/radius_usergroup.pm
@@ -0,0 +1,130 @@
+package FS::radius_usergroup;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+use FS::svc_acct;
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::radius_usergroup - Object methods for radius_usergroup records
+
+=head1 SYNOPSIS
+
+  use FS::radius_usergroup;
+
+  $record = new FS::radius_usergroup \%hash;
+  $record = new FS::radius_usergroup { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::radius_usergroup object links an account (see L<FS::svc_acct>) with a
+RADIUS group.  FS::radius_usergroup inherits from FS::Record.  The following
+fields are currently supported:
+
+=over 4
+
+=item usergroupnum - primary key
+
+=item svcnum - Account (see L<FS::svc_acct>).
+
+=item groupname - group name
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new record.  To add the record to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'radius_usergroup'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+#inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+#inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+#inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  $self->ut_numbern('usergroupnum')
+    || $self->ut_number('svcnum')
+    || $self->ut_foreign_key('svcnum','svc_acct','svcnum')
+    || $self->ut_text('groupname')
+  ;
+}
+
+=item svc_acct
+
+Returns the account associated with this record (see L<FS::svc_acct>).
+
+=cut
+
+sub svc_acct {
+  my $self = shift;
+  qsearchs('svc_acct', { svcnum => $self->svcnum } );
+}
+
+=back
+
+=head1 BUGS
+
+Don't let 'em get you down.
+
+=head1 SEE ALSO
+
+L<svc_acct>, L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index a3e97f74c..197eec1b5 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -257,8 +257,6 @@ sub insert {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  my $amount = 0;
-
   $error = $self->check;
   return $error if $error;
 
@@ -587,6 +585,8 @@ sub delete {
     }
   }
 
+  my $part_svc = $self->cust_svc->part_svc;
+
   my $error = $self->SUPER::delete;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
@@ -595,7 +595,7 @@ sub delete {
 
   #new-style exports!
   unless ( $noexport_hack ) {
-    foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
+    foreach my $part_export ( $part_svc->part_export ) {
       my $error = $part_export->export_delete($self);
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
@@ -791,34 +791,34 @@ sub replace {
   }
 
   $old->usergroup( [ $old->radius_groups ] );
-
   if ( $new->usergroup ) {
-
-    foreach my $groupname ( @{$old->usergroup} ) {
-      if ( grep { $groupname eq $_ } @{$new->usergroup} ) {
-        $new->usergroup( [ grep { $groupname ne $_ } @{$new->usergroup} ] );
+    #(sorta) false laziness with FS::part_export::sqlradius::_export_replace
+    my @newgroups = @{$new->usergroup};
+    foreach my $oldgroup ( @{$old->usergroup} ) {
+      if ( grep { $oldgroup eq $_ } @newgroups ) {
+        @newgroups = grep { $oldgroup ne $_ } @newgroups;
         next;
       }
       my $radius_usergroup = qsearchs('radius_usergroup', {
         svcnum    => $old->svcnum,
-        groupname => $groupname,
+        groupname => $oldgroup,
       } );
       my $error = $radius_usergroup->delete;
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
-        return "error deleting radius_usergroup $groupname: $error";
+        return "error deleting radius_usergroup $oldgroup: $error";
       }
     }
 
-    foreach my $groupname ( @{$new->usergroup} ) {
+    foreach my $newgroup ( @newgroups ) {
       my $radius_usergroup = new FS::radius_usergroup ( {
         svcnum    => $new->svcnum,
-        groupname => $groupname,
+        groupname => $newgroup,
       } );
       my $error = $radius_usergroup->insert;
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
-        return "error adding radius_usergroup $groupname: $error";
+        return "error adding radius_usergroup $newgroup: $error";
       }
     }
 
@@ -1072,6 +1072,11 @@ sub check {
   return $x unless ref($x);
   my $part_svc = $x;
 
+  if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) {
+    $self->usergroup(
+      [ split(',', $part_svc->part_svc_column('usergroup')->columnvalue) ] );
+  }
+
   my $error = $self->ut_numbern('svcnum')
               || $self->ut_number('domsvc')
   ;
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 8a80d4c72..723c91c29 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -61,13 +61,15 @@ if ( $cgi->param('error') ) {
     foreach my $part_svc_column (
       grep { $_->columnflag } $part_svc->all_part_svc_column
     ) {
-      $svc_acct->setfield( $part_svc_column->columnname,
-                           $part_svc_column->columnvalue,
-                         );
+      if ( $part_svc_column->columnname eq 'usergroup' ) {
+        @groups = split(',', $part_svc_column->columnvalue);
+      } else {
+        $svc_acct->setfield( $part_svc_column->columnname,
+                             $part_svc_column->columnvalue,
+                           );
+      }
     }
 
-    #SET DEFAULT GROUP(S) FROM PART_SVC!!!!
-
   }
 }
 my $action = $svcnum ? 'Edit' : 'Add';
@@ -244,9 +246,13 @@ foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
   }
 }
 
-print '<TR><TD ALIGN="right">RADIUS groups</TD><TD>'.
-      &FS::svc_acct::radius_usergroup_selector( \@groups ).
-      '</TD></TR>';
+print '<TR><TD ALIGN="right">RADIUS groups</TD>';
+if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) {
+  print '<TD BGCOLOR="#ffffff">'. join('<BR>', @groups);
+} else {
+  print '<TD>'. &FS::svc_acct::radius_usergroup_selector( \@groups );
+}
+print '</TD></TR>';
 
 #submit
 print qq!</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">!; 
-- 
cgit v1.2.1


From 1858140b774bfe3a694a2ededf70de797da31c51 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 24 Mar 2002 17:42:58 +0000
Subject: "subscription" price plan from "Luke Pfeifer" <freeside@globalli.com>

---
 CREDITS                      |  5 +++++
 FS/FS/part_pkg.pm            |  4 +++-
 httemplate/edit/part_pkg.cgi | 19 +++++++++++++++++--
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/CREDITS b/CREDITS
index f3396284a..13d286127 100644
--- a/CREDITS
+++ b/CREDITS
@@ -92,5 +92,10 @@ the "similar names warning" feature, and a number of other enhancements.
 Dave Burgess <burgess@neonramp.com> sent in a bunch of fixes and small changes
 and will doubtless send more once he's got his tree under control.
 
+Luke Pfeifer <freeside@globalli.com> contributed the "subscription" price plan.
+
+Noment Networks, LLC <http://www.noment.com/> sponsored ICRADIUS/FreeRADIUS
+groups.
+
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 3d536e7d9..00ce1d944 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -198,6 +198,8 @@ sub check {
 
       or $r =~ /^my \$mnow = \$sdate; my \(\$sec,\$min,\$hour,\$mday,\$mon,\$year\) = \(localtime\(\$sdate\) \)\[0,1,2,3,4,5\]; my \$mstart = timelocal\(0,0,0,1,\$mon,\$year\); my \$mend = timelocal\(0,0,0,1, \$mon == 11 \? 0 : \$mon\+1, \$year\+\(\$mon==11\)\); \$sdate = \$mstart; \( \$part_pkg->freq \- 1 \) \* \d*\.?\d* \/ \$part_pkg\-\>freq \+ \d*\.?\d* \/ \$part_pkg\-\>freq \* \(\$mend\-\$mnow\) \/ \(\$mend\-\$mstart\) ;\s*$/
 
+      or $r =~ /^my \$mnow = \$sdate; my \(\$sec,\$min,\$hour,\$mday,\$mon,\$year\) = \(localtime\(\$sdate\) \)\[0,1,2,3,4,5\]; \$sdate = timelocal\(0,0,0,1,\$mon,\$year\); \s*\d*\.?\d*\s*;\s*$/
+
       or $r =~ /^my \$error = \$cust_pkg\->cust_main\->credit\( \s*\d*\.?\d*\s* \* scalar\(\$cust_pkg\->cust_main\->referral_cust_main_ncancelled\(\s*\d+\s*\)\), "commission" \); die \$error if \$error; \s*\d*\.?\d*\s*;\s*$/
 
       or $r =~ /^my \$error = \$cust_pkg\->cust_main\->credit\( \s*\d*\.?\d*\s* \* scalar\(\$cust_pkg\->cust_main->referral_cust_pkg\(\s*\d+\s*\)\), "commission" \); die \$error if \$error; \s*\d*\.?\d*\s*;\s*$/
@@ -264,7 +266,7 @@ sub svcpart {
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.8 2002-02-18 08:39:21 ivan Exp $
+$Id: part_pkg.pm,v 1.9 2002-03-24 17:42:58 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index d3213dd46..60319f9d9 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -160,7 +160,7 @@ print '<INPUT TYPE="hidden" NAME="pkgpart" VALUE="'. $part_pkg->pkgpart. '">';
 # prolly should be in database
 tie my %plans, 'Tie::IxHash',
   'flat' => {
-    'name' => 'Flat rate',
+    'name' => 'Flat rate (anniversary billing)',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -175,7 +175,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'prorate' => {
-    'name' => 'First month pro-rated, then flat-rate',
+    'name' => 'First partial month pro-rated, then flat-rate (1st of month billing)',
     'fields' =>  {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -189,6 +189,21 @@ tie my %plans, 'Tie::IxHash',
     'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; my $mstart = timelocal(0,0,0,1,$mon,$year); my $mend = timelocal(0,0,0,1, $mon == 11 ? 0 : $mon+1, $year+($mon==11)); $sdate = $mstart; ( $part_pkg->freq - 1 ) * \' + what.recur_fee.value + \' / $part_pkg->freq + \' + what.recur_fee.value + \' / $part_pkg->freq * ($mend-$mnow) / ($mend-$mstart) ; \'',
   },
 
+  'subscription' => {
+    'name' => 'First partial month full charge, then flat-rate (1st of month billing)',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                      },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
+    'setup' => 'what.setup_fee.value',
+    'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; $sdate = timelocal(0,0,0,1,$mon,$year); \' + what.recur_fee.value',
+  },
+
   'flat_comission_cust' => {
     'name' => 'Flat rate with recurring comission per active customer',
     'fields' => {
-- 
cgit v1.2.1


From 0e475dcb559be6b39338a7070103527d9ae66e14 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 24 Mar 2002 18:23:47 +0000
Subject: tyop

---
 FS/FS/agent.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
index 1afe70641..f11a28db9 100644
--- a/FS/FS/agent.pm
+++ b/FS/FS/agent.pm
@@ -40,7 +40,7 @@ from FS::Record.  The following fields are currently supported:
 
 =over 4
 
-=item agemtnum - primary key (assigned automatically for new agents)
+=item agentnum - primary key (assigned automatically for new agents)
 
 =item agent - Text name of this agent
 
@@ -145,7 +145,7 @@ sub pkgpart_hashref {
 
 =head1 VERSION
 
-$Id: agent.pm,v 1.2 2000-12-03 13:45:15 ivan Exp $
+$Id: agent.pm,v 1.3 2002-03-24 18:23:47 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From f38abb144955686f880a528ed6fe4c9c5453517b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 24 Mar 2002 20:01:31 +0000
Subject: UI improvements for agents

---
 httemplate/browse/agent.cgi    | 3 ++-
 httemplate/edit/cust_main.cgi  | 3 ++-
 httemplate/search/svc_acct.cgi | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index ebec068fa..c74ef2b63 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -32,7 +32,8 @@ END
 #        <TH>Agent</TH>
 
 foreach my $agent ( sort { 
-  $a->getfield('agentnum') <=> $b->getfield('agentnum')
+  #$a->getfield('agentnum') <=> $b->getfield('agentnum')
+  $a->getfield('agent') cmp $b->getfield('agent')
 } qsearch('agent',{}) ) {
   my($hashref)=$agent->hashref;
   my($typenum)=$hashref->{typenum};
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 39b6ca594..33e72d864 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -85,7 +85,8 @@ if ( scalar(@agents) == 1 ) {
   } @agents) {
       print '<OPTION VALUE="', $agent->agentnum, '"',
       " SELECTED"x($agent->agentnum==$agentnum),
-      ">", $agent->agentnum,": ", $agent->agent;
+      ">". $agent->agent;
+      #">", $agent->agentnum,": ", $agent->agent;
   }
   print "</SELECT>";
 }
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 2666ef621..daf025a38 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -141,7 +141,7 @@ END
         my $conf = new FS::Conf;
         unless ( $mydomain = $conf->config('domain') ) {
           die "No legacy domain config file and no svc_domain.svcnum record ".
-              "for svc_acct.domsvc: ". $cust_svc->domsvc;
+              "for svc_acct.domsvc: ". $svc_acct->domsvc;
         }
       }
       $domain = "<i>$mydomain</i><FONT COLOR=\"#FF0000\">*</FONT>";
-- 
cgit v1.2.1


From 8932bfd9e536bc1e0c075500847e05f51f639a7a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 24 Mar 2002 23:16:56 +0000
Subject: s/icradius/sqlradius/

---
 bin/icradius_reset  |  7 -------
 bin/sqlradius_reset | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 7 deletions(-)
 delete mode 100644 bin/icradius_reset
 create mode 100644 bin/sqlradius_reset

diff --git a/bin/icradius_reset b/bin/icradius_reset
deleted file mode 100644
index 58663ee6b..000000000
--- a/bin/icradius_reset
+++ /dev/null
@@ -1,7 +0,0 @@
-
-  my $sth = $icradius_dbh->prepare("DELETE FROM radcheck");
-  $sth->execute or die "Can't reset radcheck table: ". $sth->errstr;
-  my $sth2 = $icradius_dbh->prepare("DELETE FROM radreply");
-  $sth2->execute or die "Can't reset radreply table: ". $sth2->errstr;
-
-
diff --git a/bin/sqlradius_reset b/bin/sqlradius_reset
new file mode 100644
index 000000000..fe31d67f9
--- /dev/null
+++ b/bin/sqlradius_reset
@@ -0,0 +1,46 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use FS::UID qw(adminsuidsetup);
+use FS::part_export;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+#my $machine = shift or die &usage;
+
+my @exports = qsearch('part_export', { 'exporttype' => 'sqlradius' } );
+
+foreach my $export ( @exports ) {
+  my $icradius_dbh = DBI->connect(
+    map { $export->option($_) } qw( datasrc username password )
+  ) or die $DBI::errstr;
+  for my $table (qw( radcheck radreply usergroup )) {
+    my $sth = $icradius_dbh->prepare("DELETE FROM $table");
+    $sth->execute or die "Can't reset $table table: ". $sth->errstr;
+  }
+}
+
+foreach my $export ( @exports ) {
+  my @svc_acct =
+    map { qsearchs{'svc_acct', { 'svcnum' => $_->svcnum } ) }
+      qsearch('cust_svc', { 'svcpart' => $export->part_svc->svcpart } );
+  foreach my $svc_acct ( @svc_acct ) {
+
+    #flase laziness with FS::svc_acct::insert (like it matters)
+    my $error = $part_export->export_insert($self);
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "exporting to ". $part_export->exporttype.
+             " (transaction rolled back): $error";
+    }
+
+  }
+}
+
+sub usage {
+  #die "Usage:\n\n  icradius_reset user machine\n";
+  die "Usage:\n\n  icradius_reset user\n";
+}
+
+
-- 
cgit v1.2.1


From 4ea362bfa2d2ea984996439e0c32cb4ea6dda7ee Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 25 Mar 2002 14:59:06 +0000
Subject: customers by otaker report (ugly search/cust_main.cgi mods; revert if
 they cause problems)

---
 httemplate/index.html                  |  4 +++
 httemplate/search/cust_main-otaker.cgi | 29 ++++++++++++++++
 httemplate/search/cust_main.cgi        | 63 ++++++++++++++++++++++++++--------
 3 files changed, 81 insertions(+), 15 deletions(-)
 create mode 100755 httemplate/search/cust_main-otaker.cgi

diff --git a/httemplate/index.html b/httemplate/index.html
index 7b2970dc5..4558a3289 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -136,6 +136,10 @@
               <LI> <A HREF="search/report_cc.html">credit card receipts</A>
               <LI> <A HREF="search/report_credit.html">credit memos</A>
             </UL>
+    Customers
+      <UL>
+        <LI><A HREF="search/cust_main-otaker.cgi">Search customers by otaker</A>
+      </UL>
     <BR>
     </TD></TR>
     </TABLE>
diff --git a/httemplate/search/cust_main-otaker.cgi b/httemplate/search/cust_main-otaker.cgi
new file mode 100755
index 000000000..b7173c49c
--- /dev/null
+++ b/httemplate/search/cust_main-otaker.cgi
@@ -0,0 +1,29 @@
+<HTML>
+  <HEAD>
+    <TITLE>Customer Search</TITLE>
+  </HEAD>
+  <BODY BGCOLOR="#e8e8e8">
+    <FONT SIZE=7>
+      Customer Search
+    </FONT>
+    <BR>
+    <FORM ACTION="cust_main.cgi" METHOD="post">
+      Search for <B>Order taker</B>: 
+      <INPUT TYPE="hidden" NAME="otaker_on" VALUE="TRUE">
+      <% my $dbh = dbh;
+         my $sth = dbh->prepare("SELECT DISTINCT otaker FROM cust_main")
+           or eidiot $dbh->errstr;
+         $sth->execute() or eidiot $sth->errstr;
+#         my @otakers = map { $_->[0] } @{$sth->selectall_arrayref};
+      %>
+      <SELECT NAME="otaker">
+      <% my $otaker; while ( $otaker = $sth->fetchrow_arrayref ) { %>
+        <OPTION><%= $otaker->[0] %></OTAKER>
+      <% } %>
+      </SELECT>
+      <P><INPUT TYPE="submit" VALUE="Search">
+
+    </FORM>
+  </BODY>
+</HTML>
+
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index f153f02d4..799569898 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -48,19 +48,34 @@ $limit .= " OFFSET $offset" if $offset;
 my $total = 0;
 
 my(@cust_main, $sortby, $orderby);
-if ( $cgi->param('browse') ) {
-  my $query = $cgi->param('browse');
-  if ( $query eq 'custnum' ) {
-    $sortby=\*custnum_sort;
-    $orderby = 'ORDER BY custnum';
-  } elsif ( $query eq 'last' ) {
-    $sortby=\*last_sort;
-    $orderby = 'ORDER BY last';
-  } elsif ( $query eq 'company' ) {
-    $sortby=\*company_sort;
-    $orderby = 'ORDER BY company';
+if ( $cgi->param('browse')
+     || $cgi->param('otaker_on')
+) {
+
+  my %search = ();
+  if ( $cgi->param('browse') ) {
+    my $query = $cgi->param('browse');
+    if ( $query eq 'custnum' ) {
+      $sortby=\*custnum_sort;
+      $orderby = 'ORDER BY custnum';
+    } elsif ( $query eq 'last' ) {
+      $sortby=\*last_sort;
+      $orderby = 'ORDER BY last';
+    } elsif ( $query eq 'company' ) {
+      $sortby=\*company_sort;
+      $orderby = 'ORDER BY company';
+    } else {
+      die "unknown browse field $query";
+    }
   } else {
-    die "unknown browse field $query";
+    $sortby = \*last_sort; #??
+    $orderby = 'ORDER BY last'; #??
+    if ( $cgi->param('otaker_on') ) {
+      $cgi->param('otaker') =~ /^(\w{1,32})$/ or eidiot "Illegal otaker\n";
+      $search{otaker} = $1;
+    } else {
+      die "unknown query...";
+    }
   }
 
   my $ncancelled = '';
@@ -72,7 +87,7 @@ if ( $cgi->param('browse') ) {
     #grep { $_->ncancelled_pkgs || ! $_->all_pkgs }
     #needed for MySQL???    OR cust_pkg.cancel = \"\"
     $ncancelled = "
-      WHERE 0 < ( SELECT COUNT(*) FROM cust_pkg
+       0 < ( SELECT COUNT(*) FROM cust_pkg
                     WHERE cust_pkg.custnum = cust_main.custnum
                       AND ( cust_pkg.cancel IS NULL
                             OR cust_pkg.cancel = 0
@@ -84,14 +99,32 @@ if ( $cgi->param('browse') ) {
     ";
   }
 
-  my $statement = "SELECT COUNT(*) FROM cust_main $ncancelled";
+  #EWWWWWW
+  my $qual = join(' AND ',
+            map { "$_ = ". dbh->quote($search{$_}) } keys %search );
+
+  if ( $ncancelled ) {
+    $qual .= ' AND ' if $qual;
+    $qual .= $ncancelled;
+  }
+    
+  $qual = " WHERE $qual" if $qual;
+
+  my $statement = "SELECT COUNT(*) FROM cust_main $qual";
   my $sth = dbh->prepare($statement)
     or die dbh->errstr. " doing $statement";
   $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
 
   $total = $sth->fetchrow_arrayref->[0];
 
-  my @just_cust_main = qsearch('cust_main',{}, '',
+  if ( $ncancelled ) {
+    if ( %search ) {
+      $ncancelled = " AND $ncancelled";
+    } else {
+      $ncancelled = " WHERE $ncancelled";
+    }
+  }
+  my @just_cust_main = qsearch('cust_main', \%search, '',
     "$ncancelled $orderby $limit"
   );    
 
-- 
cgit v1.2.1


From 79580638b7adc429cc57fc434d83f53e34df018d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Mar 2002 00:26:10 +0000
Subject: hhahah oops i _really_ ought to do something about that

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 21aeb4566..8f577c579 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-#TEMPLATE = asp
-TEMPLATE = mason
+TEMPLATE = asp
+#TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
-- 
cgit v1.2.1


From c6da895a2fb2c233716381b7e45ebbeb1c2f6aaa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Mar 2002 00:32:46 +0000
Subject: further export bugfixing add 10 kid limit to freeside-queued
 sqlradius_reset now works (closes: Bug#372)

---
 FS/FS/part_export.pm            |  8 +++++++-
 FS/bin/freeside-queued          | 28 +++++++++++++++++++++-------
 bin/sqlradius_reset             | 15 +++++++--------
 httemplate/edit/part_export.cgi |  2 +-
 4 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index eabcedec1..41dfe77a1 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -409,6 +409,8 @@ package FS::part_export::infostreet;
 use vars qw(@ISA);
 @ISA = qw(FS::part_export);
 
+sub rebless { shift; }
+
 sub _export_insert {
   my( $self, $svc_acct ) = (shift, shift);
   $self->infostreet_queue( $svc_acct->svcnum,
@@ -488,6 +490,8 @@ package FS::part_export::sqlradius;
 use vars qw(@ISA);
 @ISA = qw(FS::part_export);
 
+sub rebless { shift; }
+
 sub _export_insert {
   my($self, $svc_acct) = (shift, shift);
 
@@ -684,7 +688,9 @@ sub sqlradius_connect {
   package FS::part_export::myexport;
   use vars qw(@ISA);
   @ISA = qw(FS::part_export);
-  
+
+  sub rebless { shift; }
+
   sub _export_insert {
     my($self, $svc_something) = (shift, shift);
     $self->myexport_queue( $svc_acct->svcnum, 'insert',
diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index fff77f01b..f6226cca1 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use vars qw( $log_file $sigterm $sigint );
+use vars qw( $log_file $sigterm $sigint $kids $max_kids );
 use subs qw( _die _logmsg );
 use Fcntl qw(:flock);
 use POSIX qw(setsid);
@@ -19,15 +19,18 @@ use FS::part_export;
 
 my $pid_file = '/var/run/freeside-queued.pid';
 
+$max_kids = '10'; #guess it should be a config file...
+$kids = 0;
+
 my $user = shift or die &usage;
 
 &daemonize1;
 
-sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; }
+sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; $kids--; }
 $SIG{CHLD} =  \&REAPER;
 
- $sigterm = 0;
- $sigint = 0;
+$sigterm = 0;
+$sigint = 0;
 $SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $sigint++; };
 $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
 
@@ -45,8 +48,17 @@ $SIG{__WARN__} = \&_logmsg;
 
 warn "freeside-queued starting\n";
 
+my $warnkids=0;
 while (1) {
 
+  #prevent runaway forking
+  if ( $kids >= $max_kids ) {
+    warn "WARNING: maximum $kids children reached\n" unless $warnkids++;
+    sleep 1; #waiting for signals is cheap
+    next;
+  }
+  $warnkids=0;
+
   my $job = qsearchs(
     'queue',
     { 'status' => 'new' },
@@ -55,7 +67,7 @@ while (1) {
       ? 'ORDER BY jobnum LIMIT 1 FOR UPDATE'
       : 'ORDER BY jobnum FOR UPDATE LIMIT 1'
   ) or do {
-    sleep 5;
+    sleep 5; #connecting to db is expensive
     next;
   };
 
@@ -67,7 +79,6 @@ while (1) {
 
   my @args = $ljob->args;
 
-  # number of children limit?
   defined( my $pid = fork ) or do {
     warn "WARNING: can't fork: $!\n";
     my %hash = $job->hash;
@@ -76,9 +87,12 @@ while (1) {
     my $ljob = new FS::queue ( \%hash );
     my $error = $ljob->replace($job);
     die $error if $error;
+    next; #don't increment the kid counter
   };
 
-  unless ( $pid ) { #kid time
+  if ( $pid ) {
+    $kids++;
+  } else { #kid time
 
     #get new db handles
     $FS::UID::dbh->{InactiveDestroy} = 1;
diff --git a/bin/sqlradius_reset b/bin/sqlradius_reset
index fe31d67f9..501685449 100644
--- a/bin/sqlradius_reset
+++ b/bin/sqlradius_reset
@@ -2,7 +2,10 @@
 
 use strict;
 use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch qsearchs);
 use FS::part_export;
+use FS::svc_acct;
+use FS::cust_svc;
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
@@ -23,17 +26,13 @@ foreach my $export ( @exports ) {
 
 foreach my $export ( @exports ) {
   my @svc_acct =
-    map { qsearchs{'svc_acct', { 'svcnum' => $_->svcnum } ) }
+    map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
       qsearch('cust_svc', { 'svcpart' => $export->part_svc->svcpart } );
   foreach my $svc_acct ( @svc_acct ) {
 
-    #flase laziness with FS::svc_acct::insert (like it matters)
-    my $error = $part_export->export_insert($self);
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "exporting to ". $part_export->exporttype.
-             " (transaction rolled back): $error";
-    }
+    #false laziness with FS::svc_acct::insert (like it matters)
+    my $error = $export->export_insert($svc_acct);
+    die $error if $error;
 
   }
 }
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 3d867f50a..25e8f5be0 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -70,7 +70,7 @@ my %exports = (
         'password' => { label=>'Database password' },
       },
       'nodomain' => 'Y',
-      'notes' => 'Not specifying datasrc will export to the freeside database? (no...  notes on MySQL replication, DBI::Proxy, etc., from Conf.pm && export.html etc.',
+      'notes' => 'Not specifying datasrc will export to the freeside database? (no...  notes on MySQL replication, DBI::Proxy, etc., from Conf.pm && export.html etc., reset with bin/sqlradius_reset',
     },
     'cyrus' => {
       'desc' => 'Real-time export to Cyrus IMAP server',
-- 
cgit v1.2.1


From a04483b3b0114792e7ae73f28ae0d2e6ebe77e98 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Mar 2002 12:35:25 +0000
Subject: s/Add/Provision/

---
 httemplate/docs/admin.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/admin.html b/httemplate/docs/admin.html
index 64da760f3..17cd62a92 100755
--- a/httemplate/docs/admin.html
+++ b/httemplate/docs/admin.html
@@ -48,7 +48,7 @@
   package you defined above.
 
   <li>From the Package View screen of the newly created package, choose
-  <u>(Add)</u> to add the customer's service for this new package.
+  <u>(Provision)</u> to add the customer's service for this new package.
 
   <li>Add your own domain.
 
-- 
cgit v1.2.1


From 6fd7d458e1fcd100546168ec3992182d628d89ce Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Mar 2002 13:04:31 +0000
Subject: error message typo

---
 bin/create-history-tables | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/create-history-tables b/bin/create-history-tables
index 9ed641efd..d37d682d8 100755
--- a/bin/create-history-tables
+++ b/bin/create-history-tables
@@ -22,7 +22,7 @@ my @tables = scalar(@ARGV)
 foreach my $table ( @tables ) {
   warn "creating history table for $table\n";
   my $tableobj = $schema->table($table)
-    or die "unknown talble $table (did you run dbdef-create?)\n";
+    or die "unknown table $table (did you run dbdef-create?)\n";
   my $h_tableobj = DBIx::DBSchema::Table->new( {
     name        => "h_$table",
     primary_key => 'historynum',
-- 
cgit v1.2.1


From 4bbd7408eb5df140f492ab9fb225b212a6a551ba Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Mar 2002 13:20:55 +0000
Subject: doc

---
 httemplate/docs/passwd.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/passwd.html b/httemplate/docs/passwd.html
index c4d91480c..481e01896 100755
--- a/httemplate/docs/passwd.html
+++ b/httemplate/docs/passwd.html
@@ -16,7 +16,7 @@ You may use fs_passwd/fs_passwd as a "passwd", "chfn" and "chsh" replacement on
     </ul>
   <li>Copy fs_passwd/fs_passwdd to /usr/local/sbin on the shell or web machine(s).  (chown freeside, chmod 500)
   <li>Create /usr/local/freeside on the shell or web machine(s). (chown freeside, chmod 700)
-  <li>Run an iteration of "fs_passwd/fs_passwd_server <i>user</i> shell.machine" as the freeside user for each shell or web machine (this is a daemon process).  <i>user</i> refers to the freeside user from the <a href="config.html">mapsecrets configuration file</a>.
+  <li>Run an iteration of "fs_passwd/fs_passwd_server <i>user</i> shell.machine" as the freeside user for each shell or web machine (this is a daemon process).  <i>user</i> refers to a freeside user added by <a href="man/bin/freeside-adduser.html">freeside-adduser</a>.
   <li>Copy fs_passwd/fs_passwd to /usr/local/bin on the shell machine(s).  (chown freeside, chmod 4755).  You may link it to passwd, chfn and chsh as well.
   <li>Copy fs_passwd/fs_passwd.cgi to the cgi-bin directory on your web machine(s).  Use <a href="http://www.apache.org/docs/suexec.html">suEXEC</a> or <a href="http://www.perldoc.com/perl5.6.1/pod/perlsec.html">suidperl</a> to run fs_passwd.cgi as the freeside user.
 </ul>
-- 
cgit v1.2.1


From db81095a56b1e4504199c1983917a2e7a5e42a14 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Mar 2002 13:58:29 +0000
Subject: forgot to use FS::part_export to search on it

---
 FS/FS/part_svc.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 94f51fa98..7ef996f5f 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -4,6 +4,7 @@ use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs fields dbh );
 use FS::part_svc_column;
+use FS::part_export;
 
 @ISA = qw(FS::Record);
 
@@ -323,7 +324,7 @@ sub part_export {
 
 =head1 VERSION
 
-$Id: part_svc.pm,v 1.11 2002-03-23 17:49:01 ivan Exp $
+$Id: part_svc.pm,v 1.12 2002-03-26 13:58:29 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 081fd913aa0383c06425ca1a832d30f7f79e7a06 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Mar 2002 16:24:26 +0000
Subject: simple visual fix: &nbsp; for blank company column

---
 httemplate/search/cust_main.cgi | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 799569898..03997ee35 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -325,11 +325,14 @@ END
     } else {
       $view = $p. 'view/cust_main.cgi?'. $custnum;
     }
+    my $pcompany = $company
+      ? qq!<A HREF="$view"><FONT SIZE=-1>$company</FONT></A>!
+      : '<FONT SIZE=-1>&nbsp;</FONT>';
     print <<END;
     <TR>
       <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$custnum</FONT></A></TD>
       <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$last, $first</FONT></A></TD>
-      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$company</FONT></A></TD>
+      <TD ROWSPAN=$rowspan>$pcompany</TD>
 END
     if ( defined dbdef->table('cust_main')->column('ship_last') ) {
       my($ship_last,$ship_first,$ship_company)=(
@@ -337,9 +340,14 @@ END
         $cust_main->ship_last ? $cust_main->ship_first : $cust_main->first,
         $cust_main->ship_last ? $cust_main->ship_company : $cust_main->company,
       );
+    my $pship_company = $ship_company
+      ? qq!<A HREF="$view"><FONT SIZE=-1>$ship_company</FONT></A>!
+      : '<FONT SIZE=-1>&nbsp;</FONT>';
+    print <<END;
+
 print <<END;
       <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$ship_last, $ship_first</FONT></A></TD>
-      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$ship_company</FONT></A></TD>
+      <TD ROWSPAN=$rowspan>$pship_company</A></TD>
 END
     }
 
-- 
cgit v1.2.1


From 11f0302c9846fb763794f7383c3b1b65e6cb5d34 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Mar 2002 23:18:48 +0000
Subject: yay works now... just forgot to send http header

---
 fs_passwd/fs_passwd.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_passwd/fs_passwd.cgi b/fs_passwd/fs_passwd.cgi
index df6c7c8bf..3f676fff3 100755
--- a/fs_passwd/fs_passwd.cgi
+++ b/fs_passwd/fs_passwd.cgi
@@ -43,7 +43,7 @@ chomp $error;
 if ($error) {
   die $error;
 } else {
-  print <<END;
+  print $cgi->header(), <<END;
 <html>
   <head>
     <title>Password changed</title>
-- 
cgit v1.2.1


From 8ea299358401bea12bef7c2dd1841cef3cf45c20 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 27 Mar 2002 05:36:10 +0000
Subject: s/referral/advertising source/

yes, the name sucks.  got a better one?
---
 FS/FS/cust_main.pm                  |  6 +++---
 FS/FS/part_referral.pm              | 36 +++++++++++++++++++++---------------
 httemplate/browse/part_referral.cgi |  6 +++---
 httemplate/docs/admin.html          | 12 ++++++------
 httemplate/edit/part_referral.cgi   | 10 ++++------
 httemplate/index.html               |  2 +-
 6 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 9eb569f96..b59b0d1ac 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -99,7 +99,7 @@ FS::Record.  The following fields are currently supported:
 
 =item agentnum - agent (see L<FS::agent>)
 
-=item refnum - referral (see L<FS::part_referral>)
+=item refnum - Advertising source (see L<FS::part_referral>)
 
 =item first - name
 
@@ -531,14 +531,14 @@ sub check {
     || $self->ut_numbern('referral_custnum')
   ;
   #barf.  need message catalogs.  i18n.  etc.
-  $error .= "Please select a referral."
+  $error .= "Please select a advertising source."
     if $error =~ /^Illegal or empty \(numeric\) refnum: /;
   return $error if $error;
 
   return "Unknown agent"
     unless qsearchs( 'agent', { 'agentnum' => $self->agentnum } );
 
-  return "Unknown referral"
+  return "Unknown refnum"
     unless qsearchs( 'part_referral', { 'refnum' => $self->refnum } );
 
   return "Unknown referring custnum ". $self->referral_custnum
diff --git a/FS/FS/part_referral.pm b/FS/FS/part_referral.pm
index 3f0af4b8e..23885dffd 100644
--- a/FS/FS/part_referral.pm
+++ b/FS/FS/part_referral.pm
@@ -27,26 +27,32 @@ FS::part_referral - Object methods for part_referral objects
 
 =head1 DESCRIPTION
 
-An FS::part_referral represents a referral - where a customer heard of your
-services.  This can be used to track the effectiveness of a particular piece of
-advertising, for example.  FS::part_referral inherits from FS::Record.  The
-following fields are currently supported:
+An FS::part_referral represents a advertising source - where a customer heard
+of your services.  This can be used to track the effectiveness of a particular
+piece of advertising, for example.  FS::part_referral inherits from FS::Record.
+The following fields are currently supported:
 
 =over 4
 
 =item refnum - primary key (assigned automatically for new referrals)
 
-=item referral - Text name of this referral
+=item referral - Text name of this advertising source
 
 =back
 
+=head1 NOTE
+
+These were called B<referrals> before version 1.4.0 - the name was changed
+so as not to be confused with the new customer-to-customer referrals.
+
 =head1 METHODS
 
 =over 4
 
 =item new HASHREF
 
-Creates a new referral.  To add the referral to the database, see L<"insert">.
+Creates a new advertising source.  To add the referral to the database, see
+L<"insert">.
 
 =cut
 
@@ -54,8 +60,8 @@ sub table { 'part_referral'; }
 
 =item insert
 
-Adds this referral to the database.  If there is an error, returns the error,
-otherwise returns false.
+Adds this advertising source to the database.  If there is an error, returns
+the error, otherwise returns false.
 
 =item delete
 
@@ -76,9 +82,9 @@ returns the error, otherwise returns false.
 
 =item check
 
-Checks all fields to make sure this is a valid referral.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
+Checks all fields to make sure this is a valid advertising source.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert and
+replace methods.
 
 =cut
 
@@ -92,14 +98,14 @@ sub check {
 
 =back
 
-=head1 VERSION
-
-$Id: part_referral.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
-
 =head1 BUGS
 
 The delete method is unimplemented.
 
+`Advertising source'.  Yes, it's a sucky name.  The only other ones I could
+come up with were "Marketing channel" and "Heard Abouts" and those are
+definately both worse.
+
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::cust_main>, schema.html from the base documentation.
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index 76cc22659..bbae8d008 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -1,12 +1,12 @@
 <!-- mason kludge -->
 <%
 
-print header("Referral Listing", menubar(
+print header("Advertising source Listing", menubar(
   'Main Menu' => $p,
 #  'Add new referral' => "../edit/part_referral.cgi",
 )), "Where a customer heard about your service. Tracked for informational purposes.<BR><BR>", &table(), <<END;
       <TR>
-        <TH COLSPAN=2>Referral</TH>
+        <TH COLSPAN=2>Advertising source</TH>
       </TR>
 END
 
@@ -27,7 +27,7 @@ END
 
 print <<END;
       <TR>
-        <TD COLSPAN=2><A HREF="${p}edit/part_referral.cgi"><I>Add a new referral</I></A></TD>
+        <TD COLSPAN=2><A HREF="${p}edit/part_referral.cgi"><I>Add a new advertising source</I></A></TD>
       </TR>
     </TABLE>
     </CENTER>
diff --git a/httemplate/docs/admin.html b/httemplate/docs/admin.html
index 17cd62a92..0093fd2b7 100755
--- a/httemplate/docs/admin.html
+++ b/httemplate/docs/admin.html
@@ -34,12 +34,12 @@
   <li>After creating a new agent type, you must create an agent.  Click on
   <u>View/Edit agents</u> and <u>Add a new agent</u>.
 
-  <li>Set up at least one referral.  Referrals will help you keep track of how
-  effective your advertising is, by helping you keep track of where customers
-  heard of your service offerings.  You must create at least one referral.  If
-  you do not wish to use the referral functionality, simply create a single
-  referral only.  Click on <u>View/Edit referrals</u> and <u>Add a new
-  referral</u>.
+  <li>Set up at least one Advertising source.  Advertising sources will help
+  you keep track of how effective your advertising is, tracking where customers
+  heard of your service offerings.  You must create at least one advertising 
+  source.  If you do not wish to use the referral functionality, simply create
+  a single advertising source only.  Click on <u>View/Edit advertising
+  sources</u> and <u>Add a new advertising source</u>.
 
   <li>Click on <u>New Customer</u> and create a new customer for your system
   accounts with billing type <b>Complimentary</b>.  
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index 73be9e337..617f5dfca 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -17,9 +17,9 @@ my $action = $part_referral->refnum ? 'Edit' : 'Add';
 my $hashref = $part_referral->hashref;
 
 my $p1 = popurl(1);
-print header("$action Referral", menubar(
+print header("$action Advertising source", menubar(
   'Main Menu' => popurl(2),
-  'View all referrals' => popurl(2). "browse/part_referral.cgi",
+  'View all advertising sources' => popurl(2). "browse/part_referral.cgi",
 ));
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
@@ -32,13 +32,11 @@ print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$hashref->{refnum}">!,
       "Referral #", $hashref->{refnum} ? $hashref->{refnum} : "(NEW)";
 
 print <<END;
-<PRE>
-Referral   <INPUT TYPE="text" NAME="referral" SIZE=32 VALUE="$hashref->{referral}">
-</PRE>
+Advertising source <INPUT TYPE="text" NAME="referral" SIZE=32 VALUE="$hashref->{referral}">
 END
 
 print qq!<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{refnum} ? "Apply changes" : "Add referral",
+      $hashref->{refnum} ? "Apply changes" : "Add advertising source",
       qq!">!;
 
 print <<END;
diff --git a/httemplate/index.html b/httemplate/index.html
index 4558a3289..c44b8e3db 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -175,7 +175,7 @@
           <LI><A HREF="browse/agent.cgi">View/Edit agents</A>
             - Agents are resellers of your service.  Agents may be limited
               to a subset of your full offerings (via their type).
-          <LI><A HREF="browse/part_referral.cgi">View/Edit referrals</A>
+          <LI><A HREF="browse/part_referral.cgi">View/Edit advertising sources</A>
             - Where a customer heard about your service.  Tracked for
               informational purposes.
           <LI><A HREF="browse/cust_main_county.cgi">View/Edit locales and tax rates</A>
-- 
cgit v1.2.1


From ab4e2900dd300d5f6e55227cdabb3cf2bf5db7a7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 27 Mar 2002 07:08:08 +0000
Subject: don't show queue arguments (passwords!) on svc_* screens (unless
 queue_dangerous_options!)

---
 FS/FS/queue.pm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index e5369cf82..4b880a23c 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -251,17 +251,26 @@ END
   $html .= '<TH>Account</TH>' unless $hashref->{svcnum};
   $html .= '</TR>';
 
+  my $dangerous = $conf->exists('queue_dangerous_controls');
+
   my $p = FS::CGI::popurl(2);
   foreach my $queue ( sort { 
     $a->getfield('jobnum') <=> $b->getfield('jobnum')
   } @queue ) {
     my $queue_hashref = $queue->hashref;
     my $jobnum = $queue->jobnum;
-    my $args = join(' ', $queue->args);
+
+    my $args;
+    if ( $dangerous || $queue->job !~ /^FS::part_export::/ || !$noactions ) {
+      $args = join(' ', $queue->args);
+    } else {
+      $args = '';
+    }
+
     my $date = time2str( "%a %b %e %T %Y", $queue->_date );
     my $status = $queue->status;
     $status .= ': '. $queue->statustext if $queue->statustext;
-    if ( $conf->exists('queue_dangerous_controls')
+    if ( $dangerous
          || ( ! $noactions && $status =~ /^failed/ || $status =~ /^locked/ ) ) {
       $status .=
         qq! (&nbsp;<A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=new">retry</A>&nbsp;|!.
@@ -305,7 +314,7 @@ END
 
 =head1 VERSION
 
-$Id: queue.pm,v 1.9 2002-03-24 14:29:00 ivan Exp $
+$Id: queue.pm,v 1.10 2002-03-27 07:08:08 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 7eeed574765f53a3f279d1f5ba518f8c4cfaf386 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 28 Mar 2002 00:18:16 +0000
Subject: still pretty much just notes...

---
 ANNOUCE.1.4.0 | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 ANNOUCE.1.4.0

diff --git a/ANNOUCE.1.4.0 b/ANNOUCE.1.4.0
new file mode 100644
index 000000000..8bc16ad3d
--- /dev/null
+++ b/ANNOUCE.1.4.0
@@ -0,0 +1,119 @@
+templated web interface (start, anyway)
+separate billing and service addresses
+customer comments
+edit/part_svc.cgi
+svc_forward and better dealing with virtualdomains!  and realm export to RADIUS
+customer-to-customer referrals
+quick order
+no more single default domain
+
+no more postgres/RADIUS weirdness yay!, 31 character column names etc.
+PostgreSQL no longer needs to be recompiled for long RADIUS attributes.   
+RADIUS integration and RADIUS attribute defaults updated.
+
+Fuzzy searches on large data sets are much faster.
+     
+Job queues have been implemented.
+
+Integration with Cyrus IMAP server.
+
+Support for instant (previously only batch) update of an ICRADIUS or
+FreeRADIUS stored in a local or remote MySQL installation (separate from
+the Freeside database)
+
+1.4.0 has a new Authorize.Net interface, updated for Authorize.Net 3.0
+
+completely templated signup server
+
+items setup/recur tax exempt flag
+     
+jeff!
+
+Price plans.  For starters, multi-level customer-to-customer commissions
+in addition to flat rate pricing.  Price plans are written in Perl and
+it's straightforward to add new ones.  I'm expect we'll see plans for
+pro-rating, metered billing and the like soon.
+
+New UI for packages and price plans.
+
+Per-package tax exemption for setup and/or recurring fee         
+
+New UI in the signup server, new customer and new account pages that 
+breaks down access numbers by state and should be easier to use for a
+large number of dialup numbers.  (POPs)   
+
+Database support for local call mappin - the data on what exchanges
+can call which of your access numbers as a local call.
+
+easier installation/instructions & web configuration
+
+expedited payment-entry
+- a quick check entry tool for entering large numbers of checks as well
+  as customer information on the payment entry screen
+
+- automatic application of payments and credits to outstanding invoices
+  
+#freeside-overdue
+#- the `freeside-overdue' script to list, add postal invoicing, suspend,   
+#  or cancel overdue and/or expired accounts.
+
+- Payments and credits are applied against invoices when posted.
+
+- A bunch of UI fixes/tweaks: package browse, payment/credit entry, search
+  by check #, others
+
+  - Web interface for per-hour or per-minute account charges using the
+    session monitor.
+  
+  - Invoice events - set late fees, suspension, cancellation, etc. events
+    on overdue invoices.
+  
+  - Packages and service disable flags for a more manageable UI.
+
+HTML manpages now up-to-date and generated on install
+
+schema changes for more configurable export
+
+no mysql support :(
+
+invoice events work & show up on invoice view
+
+- Pro-rating price plan
+
+- svc_www for virtual host services
+-svc_www is here, better support for apache integration
+
+- fs_passwd/fs_passwd.cgi web-based password changer for users
+
+LinkPoint support
+
+Most notably, the main menu has gotten a significant facelift and should
+be easier to understand and use.
+
+New frequently-requested financial reports contributed by Jeff Finucane,
+thanks!
+
+The queue daemon web UI has been finished - you can now retry and remove
+jobs, error messages from failed jobs appear on the web interface, and
+account detail pages show any pending provisioning jobs for thsoe
+accounts.
+
+fs-setup should work under MySQL again.  The browse links are still broken
+("all customers", "all packages", "all accounts") but at least you should
+be able to get everything else working...
+
+Critical Path provisioning has been updated and can now username changes
+and suspension/unsuspension.
+
+-- 
+
+added case-insensitive and substring to default search
+
+full history tables (notification for deleted payments)
+
+alternate templates (late invoices!)
+
+new export! (well, almost)
+
+icradius groups (usergroup table if not radgroupreply & radgroupcheck)
+
-- 
cgit v1.2.1


From 12fca9ac80c2b0444a7916506f6e2a8fa98bc24d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 29 Mar 2002 17:27:18 +0000
Subject: fix unlinked svc browse!

---
 htetc/global.asa               | 2 +-
 htetc/handler.pl               | 2 +-
 httemplate/search/svc_acct.cgi | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htetc/global.asa b/htetc/global.asa
index 94d6b7e3e..48d0d6fcd 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -10,7 +10,7 @@ use IO::Handle;
 use IO::File;
 use String::Approx qw(amatch);
 use HTML::Widgets::SelectLayers;
-use FS::UID qw(cgisuidsetup dbh getotaker datasrc);
+use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
 use FS::Record qw(qsearch qsearchs fields dbdef);
 use FS::Conf;
 use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 8e097c656..1a746a552 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -67,7 +67,7 @@ sub handler
       use IO::File;
       use String::Approx qw(amatch);
       use HTML::Widgets::SelectLayers;
-      use FS::UID qw(cgisuidsetup dbh getotaker datasrc);
+      use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
       use FS::Record qw(qsearch qsearchs fields dbdef);
       use FS::Conf;
       use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index daf025a38..e28e00e61 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -21,13 +21,14 @@ $query ||= ''; #to avoid use of unitialized value errors
 my $unlinked = '';
 if ( $query =~ /^UN_(.*)$/ ) {
   $query = $1;
-  $unlinked = '
+  my $empty = driver_name =~ /^Pg$/i ? qq('') : qq("");
+  $unlinked = "
     WHERE 0 <
       ( SELECT count(*) FROM cust_svc
           WHERE cust_svc.svcnum = svc_acct.svcnum
-            AND pkgnum IS NULL
+            AND ( pkgnum IS NULL OR pkgnum = 0 OR pkgnum = $empty )
       )
-  ';
+  ";
 }
 
 my(@svc_acct, $sortby);
-- 
cgit v1.2.1


From 63df8b9db2932e2039c4268e90e1ff522ba0f61a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 30 Mar 2002 02:35:15 +0000
Subject: finish up s/referral/advertising source/

---
 httemplate/edit/part_referral.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index 617f5dfca..f784dfa3e 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -28,8 +28,8 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
 
 print qq!<FORM ACTION="${p1}process/part_referral.cgi" METHOD=POST>!;
 
-print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$hashref->{refnum}">!,
-      "Referral #", $hashref->{refnum} ? $hashref->{refnum} : "(NEW)";
+print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$hashref->{refnum}">!;
+#print "Referral #", $hashref->{refnum} ? $hashref->{refnum} : "(NEW)";
 
 print <<END;
 Advertising source <INPUT TYPE="text" NAME="referral" SIZE=32 VALUE="$hashref->{referral}">
-- 
cgit v1.2.1


From 92badebcb286260d7861bd09a2450eea18c4259e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Apr 2002 00:42:21 +0000
Subject: Checkin of disparate changes from working on the road: - generic SQL
 query - move exports out to their own files - small cleanup of selfadmin
 server

---
 FS/FS/part_export.pm             | 336 +--------------------------------------
 FS/FS/part_export/infostreet.pm  |  83 ++++++++++
 FS/FS/part_export/sqlradius.pm   | 198 +++++++++++++++++++++++
 FS/MANIFEST                      |   6 +
 fs_selfadmin/fs_mailadmin_server |   2 +-
 httemplate/docs/install.html     |   1 +
 httemplate/edit/part_export.cgi  |   2 +-
 httemplate/index.html            |   2 +
 8 files changed, 298 insertions(+), 332 deletions(-)
 create mode 100644 FS/FS/part_export/infostreet.pm
 create mode 100644 FS/FS/part_export/sqlradius.pm

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 41dfe77a1..a43c3844e 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -340,8 +340,9 @@ autoloaded-on-demand), but until then, see L</NEW EXPORT CLASSES>.
 sub rebless {
   my $self = shift;
   my $exporttype = $self->exporttype;
-  my $class = ref($self);
-  bless($self, $class."::$exporttype");
+  my $class = ref($self). "::$exporttype";
+  eval "use $class;";
+  bless($self, $class);
 }
 
 =item export_insert SVC_OBJECT
@@ -401,341 +402,16 @@ sub _export_delete {
 
 =back
 
-=cut
-
-#infostreet
-
-package FS::part_export::infostreet;
-use vars qw(@ISA);
-@ISA = qw(FS::part_export);
-
-sub rebless { shift; }
-
-sub _export_insert {
-  my( $self, $svc_acct ) = (shift, shift);
-  $self->infostreet_queue( $svc_acct->svcnum,
-    'createUser', $svc_acct->username, $svc_acct->password );
-}
-
-sub _export_replace {
-  my( $self, $new, $old ) = (shift, shift, shift);
-  return "can't change username with InfoStreet"
-    if $old->username ne $new->username;
-  return '' unless $old->_password ne $new->_password;
-  $self->infostreet_queue( $new->svcnum,
-    'passwd', $new->username, $new->password );
-}
-
-sub _export_delete {
-  my( $self, $svc_acct ) = (shift, shift);
-  $self->infostreet_queue( $svc_acct->svcnum,
-    'purgeAccount,releaseUsername', $svc_acct->username );
-}
-
-sub infostreet_queue {
-  my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => 'FS::part_export::infostreet::infostreet_command',
-  };
-  $queue->insert(
-    $self->option('url'),
-    $self->option('login'),
-    $self->option('password'),
-    $self->option('groupID'),
-    $method,
-    @_,
-  );
-}
-
-sub infostreet_command { #subroutine, not method
-  my($url, $username, $password, $groupID, $method, @args) = @_;
-
-  #quelle hack
-  if ( $method =~ /,/ ) {
-    foreach my $part ( split(/,\s*/, $method) ) {
-      infostreet_command($url, $username, $password, $groupID, $part, @args);
-    }
-    return;
-  }
-
-  eval "use Frontier::Client;";
-
-  my $conn = Frontier::Client->new( url => $url );
-  my $key_result = $conn->call( 'authenticate', $username, $password, $groupID);
-  my %key_result = _infostreet_parse($key_result);
-  die $key_result{error} unless $key_result{success};
-  my $key = $key_result{data};
-
-  my $result = $conn->call($method, $key, @args);
-  my %result = _infostreet_parse($result);
-  die $result{error} unless $result{success};
-
-}
-
-sub _infostreet_parse { #subroutine, not method
-  my $arg = shift;
-  map {
-    my $value = $arg->{$_};
-    #warn ref($value);
-    $value = $value->value()
-      if ref($value) && $value->isa('Frontier::RPC2::DataType');
-    $_=>$value;
-  } keys %$arg;
-}
-
-#sqlradius
-
-package FS::part_export::sqlradius;
-use vars qw(@ISA);
-@ISA = qw(FS::part_export);
-
-sub rebless { shift; }
-
-sub _export_insert {
-  my($self, $svc_acct) = (shift, shift);
-
-  foreach my $table (qw(reply check)) {
-    my $method = "radius_$table";
-    my %attrib = $svc_acct->$method;
-    next unless keys %attrib;
-    my $error = $self->sqlradius_queue( $svc_acct->svcnum, 'insert',
-      $table, $svc_acct->username, %attrib );
-    return $error if $error;
-  }
-  my @groups = $svc_acct->radius_groups;
-  if ( @groups ) {
-    my $error = $self->sqlradius_queue( $svc_acct->svcnum, 'usergroup_insert',
-      $svc_acct->username, @groups );
-    return $error if $error;
-  }
-  '';
-}
-
-sub _export_replace {
-  my( $self, $new, $old ) = (shift, shift, shift);
-
-  #return "can't (yet) change username with sqlradius"
-  #  if $old->username ne $new->username;
-  if ( $old->username ne $new->username ) {
-    my $error = $self->sqlradius_queue( $new->svcnum, 'rename',
-      $new->username, $old->username );
-    return $error if $error;
-  }
-
-  foreach my $table (qw(reply check)) {
-    my $method = "radius_$table";
-    my %new = $new->$method;
-    my %old = $old->$method;
-    if ( grep { !exists $old{$_} #new attributes
-                || $new{$_} ne $old{$_} #changed
-              } keys %new
-    ) {
-      my $error = $self->sqlradius_queue( $new->svcnum, 'insert',
-        $table, $new->username, %new );
-      return $error if $error;
-    }
-
-    my @del = grep { !exists $new{$_} } keys %old;
-    if ( @del ) {
-      my $error = $self->sqlradius_queue( $new->svcnum, 'attrib_delete',
-        $table, $new->username, @del );
-      return $error if $error;
-    }
-  }
-
-  # (sorta) false laziness with FS::svc_acct::replace
-  my @oldgroups = @{$old->usergroup}; #uuuh
-  my @newgroups = $new->radius_groups;
-  my @delgroups = ();
-  foreach my $oldgroup ( @oldgroups ) {
-    if ( grep { $oldgroup eq $_ } @newgroups ) {
-      @newgroups = grep { $oldgroup ne $_ } @newgroups;
-      next;
-    }
-    push @delgroups, $oldgroup;
-  }
-
-  if ( @delgroups ) {
-    my $error = $self->sqlradius_queue( $new->svcnum, 'usergroup_delete',
-      $new->username, @delgroups );
-    return $error if $error;
-  }
-
-  if ( @newgroups ) {
-    my $error = $self->sqlradius_queue( $new->svcnum, 'usergroup_insert',
-      $new->username, @newgroups );
-    return $error if $error;
-  }
-
-  '';
-}
-
-sub _export_delete {
-  my( $self, $svc_acct ) = (shift, shift);
-  $self->sqlradius_queue( $svc_acct->svcnum, 'delete',
-    $svc_acct->username );
-}
-
-sub sqlradius_queue {
-  my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => "FS::part_export::sqlradius::sqlradius_$method",
-  };
-  $queue->insert(
-    $self->option('datasrc'),
-    $self->option('username'),
-    $self->option('password'),
-    @_,
-  );
-}
-
-sub sqlradius_insert { #subroutine, not method
-  my $dbh = sqlradius_connect(shift, shift, shift);
-  my( $replycheck, $username, %attributes ) = @_;
-
-  foreach my $attribute ( keys %attributes ) {
-    my $u_sth = $dbh->prepare(
-      "UPDATE rad$replycheck SET Value = ? WHERE UserName = ? AND Attribute = ?"    ) or die $dbh->errstr;
-    my $i_sth = $dbh->prepare(
-      "INSERT INTO rad$replycheck ( id, UserName, Attribute, Value ) ".
-        "VALUES ( ?, ?, ?, ? )"
-    ) or die $dbh->errstr;
-    $u_sth->execute($attributes{$attribute}, $username, $attribute) > 0
-      or $i_sth->execute( '', $username, $attribute, $attributes{$attribute} )
-        or die "can't insert into rad$replycheck table: ". $i_sth->errstr;
-  }
-  $dbh->disconnect;
-}
-
-sub sqlradius_usergroup_insert { #subroutine, not method
-  my $dbh = sqlradius_connect(shift, shift, shift);
-  my( $username, @groups ) = @_;
-
-  my $sth = $dbh->prepare( 
-    "INSERT INTO usergroup ( id, UserName, GroupName ) VALUES ( ?, ?, ? )"
-  ) or die $dbh->errstr;
-  foreach my $group ( @groups ) {
-    $sth->execute( '', $username, $group )
-      or die "can't insert into groupname table: ". $sth->errstr;
-  }
-  $dbh->disconnect;
-}
-
-sub sqlradius_usergroup_delete { #subroutine, not method
-  my $dbh = sqlradius_connect(shift, shift, shift);
-  my( $username, @groups ) = @_;
-
-  my $sth = $dbh->prepare( 
-    "DELETE FROM usergroup ( id, UserName, GroupName ) VALUES ( ?, ?, ? )"
-  ) or die $dbh->errstr;
-  foreach my $group ( @groups ) {
-    $sth->execute( '', $username, $group )
-      or die "can't delete from groupname table: ". $sth->errstr;
-  }
-  $dbh->disconnect;
-}
-
-sub sqlradius_rename { #subroutine, not method
-  my $dbh = sqlradius_connect(shift, shift, shift);
-  my($new_username, $old_username) = @_;
-  foreach my $table (qw(radreply radcheck usergroup )) {
-    my $sth = $dbh->prepare("UPDATE $table SET Username = ? WHERE UserName = ?")
-      or die $dbh->errstr;
-    $sth->execute($new_username, $old_username)
-      or die "can't update $table: ". $sth->errstr;
-  }
-  $dbh->disconnect;
-}
-
-sub sqlradius_attrib_delete { #subroutine, not method
-  my $dbh = sqlradius_connect(shift, shift, shift);
-  my( $replycheck, $username, @attrib ) = @_;
-
-  foreach my $attribute ( @attrib ) {
-    my $sth = $dbh->prepare(
-        "DELETE FROM rad$replycheck WHERE UserName = ? AND Attribute = ?" )
-      or die $dbh->errstr;
-    $sth->execute($username,$attribute)
-      or die "can't delete from rad$replycheck table: ". $sth->errstr;
-  }
-  $dbh->disconnect;
-}
-
-sub sqlradius_delete { #subroutine, not method
-  my $dbh = sqlradius_connect(shift, shift, shift);
-  my $username = shift;
-
-  foreach my $table (qw( radcheck radreply usergroup )) {
-    my $sth = $dbh->prepare( "DELETE FROM $table WHERE UserName = ?" );
-    $sth->execute($username)
-      or die "can't delete from $table table: ". $sth->errstr;
-  }
-  $dbh->disconnect;
-}
-
-sub sqlradius_connect {
-  #my($datasrc, $username, $password) = @_;
-  #DBI->connect($datasrc, $username, $password) or die $DBI::errstr;
-  DBI->connect(@_) or die $DBI::errstr;
-}
-
 =head1 NEW EXPORT CLASSES
 
-  #myexport
-  
-  package FS::part_export::myexport;
-  use vars qw(@ISA);
-  @ISA = qw(FS::part_export);
-
-  sub rebless { shift; }
-
-  sub _export_insert {
-    my($self, $svc_something) = (shift, shift);
-    $self->myexport_queue( $svc_acct->svcnum, 'insert',
-      $svc_something->username, $svc_something->password );
-  }
-  
-  sub _export_replace {
-    my( $self, $new, $old ) = (shift, shift, shift);
-    #return "can't change username with myexport"
-    #  if $old->username ne $new->username;
-    #return '' unless $old->_password ne $new->_password;
-    $self->myexport_queue( $new->svcnum,
-      'replace', $new->username, $new->password );
-  }
-  
-  sub _export_delete {
-    my( $self, $svc_something ) = (shift, shift);
-    $self->myexport_queue( $svc_acct->svcnum,
-      'delete', $svc_something->username );
-  }
-  
-  #a good idea to queue anything that could fail or take any time
-  sub myexport_queue {
-    my( $self, $svcnum, $method ) = (shift, shift, shift);
-    my $queue = new FS::queue {
-      'svcnum' => $svcnum,
-      'job'    => "FS::part_export::myexport::myexport_$method",
-    };
-    $queue->insert( @_ );
-  }
-  
-  sub myexport_insert { #subroutine, not method
-  }
-  sub myexport_replace { #subroutine, not method
-  }
-  sub myexport_delete { #subroutine, not method
-  }
+Should be added to httemplate/edit/part_export.cgi and a module should
+be FS/FS/part_export/ (an example may be found in eg/export_template.pm)
 
 =head1 BUGS
 
 Probably.
 
-Hmm, export code has wound up in here.  Move those sub-classes out into their
-own files, at least.  Also hmm... cust_export class (not necessarily a
-database table...) ... ?
+Hmm... cust_export class (not necessarily a database table...) ... ?
 
 =head1 SEE ALSO
 
diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
new file mode 100644
index 000000000..c2386adb7
--- /dev/null
+++ b/FS/FS/part_export/infostreet.pm
@@ -0,0 +1,83 @@
+package FS::part_export::infostreet;
+
+use vars qw(@ISA);
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->infostreet_queue( $svc_acct->svcnum,
+    'createUser', $svc_acct->username, $svc_acct->password );
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = (shift, shift, shift);
+  return "can't change username with InfoStreet"
+    if $old->username ne $new->username;
+  return '' unless $old->_password ne $new->_password;
+  $self->infostreet_queue( $new->svcnum,
+    'passwd', $new->username, $new->password );
+}
+
+sub _export_delete {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->infostreet_queue( $svc_acct->svcnum,
+    'purgeAccount,releaseUsername', $svc_acct->username );
+}
+
+sub infostreet_queue {
+  my( $self, $svcnum, $method ) = (shift, shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => 'FS::part_export::infostreet::infostreet_command',
+  };
+  $queue->insert(
+    $self->option('url'),
+    $self->option('login'),
+    $self->option('password'),
+    $self->option('groupID'),
+    $method,
+    @_,
+  );
+}
+
+sub infostreet_command { #subroutine, not method
+  my($url, $username, $password, $groupID, $method, @args) = @_;
+
+  #quelle hack
+  if ( $method =~ /,/ ) {
+    foreach my $part ( split(/,\s*/, $method) ) {
+      infostreet_command($url, $username, $password, $groupID, $part, @args);
+    }
+    return;
+  }
+
+  eval "use Frontier::Client;";
+
+  my $conn = Frontier::Client->new( url => $url );
+  my $key_result = $conn->call( 'authenticate', $username, $password, $groupID);
+  my %key_result = _infostreet_parse($key_result);
+  die $key_result{error} unless $key_result{success};
+  my $key = $key_result{data};
+
+  my $result = $conn->call($method, $key, @args);
+  my %result = _infostreet_parse($result);
+  die $result{error} unless $result{success};
+
+}
+
+sub _infostreet_parse { #subroutine, not method
+  my $arg = shift;
+  map {
+    my $value = $arg->{$_};
+    #warn ref($value);
+    $value = $value->value()
+      if ref($value) && $value->isa('Frontier::RPC2::DataType');
+    $_=>$value;
+  } keys %$arg;
+}
+
+
diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
new file mode 100644
index 000000000..fa2153f31
--- /dev/null
+++ b/FS/FS/part_export/sqlradius.pm
@@ -0,0 +1,198 @@
+package FS::part_export::sqlradius;
+
+use vars qw(@ISA);
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my($self, $svc_acct) = (shift, shift);
+
+  foreach my $table (qw(reply check)) {
+    my $method = "radius_$table";
+    my %attrib = $svc_acct->$method;
+    next unless keys %attrib;
+    my $error = $self->sqlradius_queue( $svc_acct->svcnum, 'insert',
+      $table, $svc_acct->username, %attrib );
+    return $error if $error;
+  }
+  my @groups = $svc_acct->radius_groups;
+  if ( @groups ) {
+    my $error = $self->sqlradius_queue( $svc_acct->svcnum, 'usergroup_insert',
+      $svc_acct->username, @groups );
+    return $error if $error;
+  }
+  '';
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = (shift, shift, shift);
+
+  #return "can't (yet) change username with sqlradius"
+  #  if $old->username ne $new->username;
+  if ( $old->username ne $new->username ) {
+    my $error = $self->sqlradius_queue( $new->svcnum, 'rename',
+      $new->username, $old->username );
+    return $error if $error;
+  }
+
+  foreach my $table (qw(reply check)) {
+    my $method = "radius_$table";
+    my %new = $new->$method;
+    my %old = $old->$method;
+    if ( grep { !exists $old{$_} #new attributes
+                || $new{$_} ne $old{$_} #changed
+              } keys %new
+    ) {
+      my $error = $self->sqlradius_queue( $new->svcnum, 'insert',
+        $table, $new->username, %new );
+      return $error if $error;
+    }
+
+    my @del = grep { !exists $new{$_} } keys %old;
+    if ( @del ) {
+      my $error = $self->sqlradius_queue( $new->svcnum, 'attrib_delete',
+        $table, $new->username, @del );
+      return $error if $error;
+    }
+  }
+
+  # (sorta) false laziness with FS::svc_acct::replace
+  my @oldgroups = @{$old->usergroup}; #uuuh
+  my @newgroups = $new->radius_groups;
+  my @delgroups = ();
+  foreach my $oldgroup ( @oldgroups ) {
+    if ( grep { $oldgroup eq $_ } @newgroups ) {
+      @newgroups = grep { $oldgroup ne $_ } @newgroups;
+      next;
+    }
+    push @delgroups, $oldgroup;
+  }
+
+  if ( @delgroups ) {
+    my $error = $self->sqlradius_queue( $new->svcnum, 'usergroup_delete',
+      $new->username, @delgroups );
+    return $error if $error;
+  }
+
+  if ( @newgroups ) {
+    my $error = $self->sqlradius_queue( $new->svcnum, 'usergroup_insert',
+      $new->username, @newgroups );
+    return $error if $error;
+  }
+
+  '';
+}
+
+sub _export_delete {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->sqlradius_queue( $svc_acct->svcnum, 'delete',
+    $svc_acct->username );
+}
+
+sub sqlradius_queue {
+  my( $self, $svcnum, $method ) = (shift, shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => "FS::part_export::sqlradius::sqlradius_$method",
+  };
+  $queue->insert(
+    $self->option('datasrc'),
+    $self->option('username'),
+    $self->option('password'),
+    @_,
+  );
+}
+
+sub sqlradius_insert { #subroutine, not method
+  my $dbh = sqlradius_connect(shift, shift, shift);
+  my( $replycheck, $username, %attributes ) = @_;
+
+  foreach my $attribute ( keys %attributes ) {
+    my $u_sth = $dbh->prepare(
+      "UPDATE rad$replycheck SET Value = ? WHERE UserName = ? AND Attribute = ?"    ) or die $dbh->errstr;
+    my $i_sth = $dbh->prepare(
+      "INSERT INTO rad$replycheck ( id, UserName, Attribute, Value ) ".
+        "VALUES ( ?, ?, ?, ? )"
+    ) or die $dbh->errstr;
+    $u_sth->execute($attributes{$attribute}, $username, $attribute) > 0
+      or $i_sth->execute( '', $username, $attribute, $attributes{$attribute} )
+        or die "can't insert into rad$replycheck table: ". $i_sth->errstr;
+  }
+  $dbh->disconnect;
+}
+
+sub sqlradius_usergroup_insert { #subroutine, not method
+  my $dbh = sqlradius_connect(shift, shift, shift);
+  my( $username, @groups ) = @_;
+
+  my $sth = $dbh->prepare( 
+    "INSERT INTO usergroup ( id, UserName, GroupName ) VALUES ( ?, ?, ? )"
+  ) or die $dbh->errstr;
+  foreach my $group ( @groups ) {
+    $sth->execute( '', $username, $group )
+      or die "can't insert into groupname table: ". $sth->errstr;
+  }
+  $dbh->disconnect;
+}
+
+sub sqlradius_usergroup_delete { #subroutine, not method
+  my $dbh = sqlradius_connect(shift, shift, shift);
+  my( $username, @groups ) = @_;
+
+  my $sth = $dbh->prepare( 
+    "DELETE FROM usergroup ( id, UserName, GroupName ) VALUES ( ?, ?, ? )"
+  ) or die $dbh->errstr;
+  foreach my $group ( @groups ) {
+    $sth->execute( '', $username, $group )
+      or die "can't delete from groupname table: ". $sth->errstr;
+  }
+  $dbh->disconnect;
+}
+
+sub sqlradius_rename { #subroutine, not method
+  my $dbh = sqlradius_connect(shift, shift, shift);
+  my($new_username, $old_username) = @_;
+  foreach my $table (qw(radreply radcheck usergroup )) {
+    my $sth = $dbh->prepare("UPDATE $table SET Username = ? WHERE UserName = ?")
+      or die $dbh->errstr;
+    $sth->execute($new_username, $old_username)
+      or die "can't update $table: ". $sth->errstr;
+  }
+  $dbh->disconnect;
+}
+
+sub sqlradius_attrib_delete { #subroutine, not method
+  my $dbh = sqlradius_connect(shift, shift, shift);
+  my( $replycheck, $username, @attrib ) = @_;
+
+  foreach my $attribute ( @attrib ) {
+    my $sth = $dbh->prepare(
+        "DELETE FROM rad$replycheck WHERE UserName = ? AND Attribute = ?" )
+      or die $dbh->errstr;
+    $sth->execute($username,$attribute)
+      or die "can't delete from rad$replycheck table: ". $sth->errstr;
+  }
+  $dbh->disconnect;
+}
+
+sub sqlradius_delete { #subroutine, not method
+  my $dbh = sqlradius_connect(shift, shift, shift);
+  my $username = shift;
+
+  foreach my $table (qw( radcheck radreply usergroup )) {
+    my $sth = $dbh->prepare( "DELETE FROM $table WHERE UserName = ?" );
+    $sth->execute($username)
+      or die "can't delete from $table table: ". $sth->errstr;
+  }
+  $dbh->disconnect;
+}
+
+sub sqlradius_connect {
+  #my($datasrc, $username, $password) = @_;
+  #DBI->connect($datasrc, $username, $password) or die $DBI::errstr;
+  DBI->connect(@_) or die $DBI::errstr;
+}
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 54aaaa19f..8f7dfe591 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -45,6 +45,10 @@ FS/cust_refund.pm
 FS/cust_credit_refund.pm
 FS/cust_svc.pm
 FS/part_bill_event.pm
+FS/part_export.pm
+FS/part_export_option.pm
+FS/part_export/infostreet.pm
+FS/part_export/sqlradius.pm
 FS/part_pkg.pm
 FS/part_pop_local.pm
 FS/part_referral.pm
@@ -94,6 +98,8 @@ t/nas.t
 t/part_bill_event.t
 t/part_export.t
 t/part_export_option.t
+t/part_export-infostreet.t
+t/part_export-sqlradius.t
 t/part_pkg.t
 t/part_pop_local.t
 t/part_referral.t
diff --git a/fs_selfadmin/fs_mailadmin_server b/fs_selfadmin/fs_mailadmin_server
index 1bcc42e5d..ef4788543 100755
--- a/fs_selfadmin/fs_mailadmin_server
+++ b/fs_selfadmin/fs_mailadmin_server
@@ -17,7 +17,7 @@ use vars qw( $opt $Debug $conf $default_domain );
 
 $Debug = 1;
 
-my @payby = qw(CARD PREPAY);
+#my @payby = qw(CARD PREPAY);
 
 my $user = shift or die &usage;
 &adminsuidsetup( $user ); 
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 1a4942bc9..4370d9153 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -24,6 +24,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=Term-Query">Term-Query</a> (make test broken; install manually)
       <li><a href="http://search.cpan.org/search?dist=MIME-Base64">MIME-Base64</a>
       <li><a href="http://search.cpan.org/search?dist=Digest-MD5">Digest-MD5</a>
+      <li><a href="http://search.cpan.org/search?dist=MD5">MD5</a>
       <li><a href="http://search.cpan.org/search?dist=URI">URI</a>
       <li><a href="http://search.cpan.org/search?dist=HTML-Tagset">HTML-Tagset</a>
       <li><a href="http://search.cpan.org/search?dist=HTML-Parser">HTML-Parser</a>
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 25e8f5be0..0ca964e02 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -87,7 +87,7 @@ my %exports = (
         'groupID'  => { label=>'InfoStreet groupID', },
       },
       'nodomain' => 'Y',
-      'notes' => 'http://www.infostreet.com/ .... install Frontier::Client',
+      'notes' => 'Real-time export to <a href="http://www.infostreet.com/">InfoStreet</a> streetSmartAPI.  Requires installation of <a href="http://search.cpan.org/search?dist=Frontier-Client">Frontier::Client</a> from CPAN.',
     }
   },
 
diff --git a/httemplate/index.html b/httemplate/index.html
index c44b8e3db..fecd107cc 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -140,6 +140,8 @@
       <UL>
         <LI><A HREF="search/cust_main-otaker.cgi">Search customers by otaker</A>
       </UL>
+    <FORM ACTION="search/sql.cgi" METHOD="POST">SQL query: <TT>SELECT </TT><INPUT TYPE="text" NAME="sql" SIZE=32><INPUT TYPE="submit" VALUE="Query"></FORM>
+
     <BR>
     </TD></TR>
     </TABLE>
-- 
cgit v1.2.1


From 20d1b5c39c3674f3fdf5c0f784697a4442658648 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Apr 2002 16:37:42 +0000
Subject: oops forgot these from working on the road

---
 FS/t/part_export-infostreet.t |  5 +++
 FS/t/part_export-sqlradius.t  |  5 +++
 eg/export_template.pm         | 47 ++++++++++++++++++++++++++
 httemplate/search/sql.cgi     | 76 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 133 insertions(+)
 create mode 100644 FS/t/part_export-infostreet.t
 create mode 100644 FS/t/part_export-sqlradius.t
 create mode 100644 eg/export_template.pm
 create mode 100755 httemplate/search/sql.cgi

diff --git a/FS/t/part_export-infostreet.t b/FS/t/part_export-infostreet.t
new file mode 100644
index 000000000..1b3341825
--- /dev/null
+++ b/FS/t/part_export-infostreet.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::infostreet;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_export-sqlradius.t b/FS/t/part_export-sqlradius.t
new file mode 100644
index 000000000..5fb23a5a6
--- /dev/null
+++ b/FS/t/part_export-sqlradius.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::sqlradius;
+$loaded=1;
+print "ok 1\n";
diff --git a/eg/export_template.pm b/eg/export_template.pm
new file mode 100644
index 000000000..11e1c3b14
--- /dev/null
+++ b/eg/export_template.pm
@@ -0,0 +1,47 @@
+package FS::part_export::myexport;
+
+use vars qw(@ISA);
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my($self, $svc_something) = (shift, shift);
+  $self->myexport_queue( $svc_acct->svcnum, 'insert',
+    $svc_something->username, $svc_something->password );
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = (shift, shift, shift);
+  #return "can't change username with myexport"
+  #  if $old->username ne $new->username;
+  #return '' unless $old->_password ne $new->_password;
+  $self->myexport_queue( $new->svcnum,
+    'replace', $new->username, $new->password );
+}
+
+sub _export_delete {
+  my( $self, $svc_something ) = (shift, shift);
+  $self->myexport_queue( $svc_acct->svcnum,
+    'delete', $svc_something->username );
+}
+
+#a good idea to queue anything that could fail or take any time
+sub myexport_queue {
+  my( $self, $svcnum, $method ) = (shift, shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => "FS::part_export::myexport::myexport_$method",
+  };
+  $queue->insert( @_ );
+}
+
+sub myexport_insert { #subroutine, not method
+}
+sub myexport_replace { #subroutine, not method
+}
+sub myexport_delete { #subroutine, not method
+}
+
diff --git a/httemplate/search/sql.cgi b/httemplate/search/sql.cgi
new file mode 100755
index 000000000..b83ef039f
--- /dev/null
+++ b/httemplate/search/sql.cgi
@@ -0,0 +1,76 @@
+<%
+
+my $conf = new FS::Conf;
+my $maxrecords = $conf->config('maxsearchrecordsperpage');
+
+my $limit = '';
+$limit .= "LIMIT $maxrecords" if $maxrecords;
+
+my $offset = $cgi->param('offset') || 0;
+$limit .= " OFFSET $offset" if $offset;
+
+my $total;
+
+my $sql = $cgi->param('sql');
+$sql =~ s/^\s*SELECT//i;
+
+my $count_sql = $sql;
+$count_sql =~ s/^(.*)\s+FROM\s/COUNT(*) FROM /i;
+
+my $sth = dbh->prepare("SELECT $count_sql")
+  or eidiot dbh->errstr. " doing $count_sql\n";
+$sth->execute or eidiot "Error executing \"$count_sql\": ". $sth->errstr;
+
+$total = $sth->fetchrow_arrayref->[0];
+
+my $sth = dbh->prepare("SELECT $sql $limit")
+  or eidiot dbh->errstr. " doing $sql\n";
+$sth->execute or eidiot "Error executing \"$sql\": ". $sth->errstr;
+my $rows = $sth->fetchall_arrayref;
+
+%>
+<!-- mason kludge -->
+<%
+
+  #begin pager
+  my $pager = '';
+  if ( $total != scalar(@$rows) && $maxrecords ) {
+    unless ( $offset == 0 ) {
+      $cgi->param('offset', $offset - $maxrecords);
+      $pager .= '<A HREF="'. $cgi->self_url.
+                '"><B><FONT SIZE="+1">Previous</FONT></B></A> ';
+    }
+    my $poff;
+    my $page;
+    for ( $poff = 0; $poff < $total; $poff += $maxrecords ) {
+      $page++;
+      if ( $offset == $poff ) {
+        $pager .= qq!<FONT SIZE="+2">$page</FONT> !;
+      } else {
+        $cgi->param('offset', $poff);
+        $pager .= qq!<A HREF="!. $cgi->self_url. qq!">$page</A> !;
+      }
+    }
+    unless ( $offset + $maxrecords > $total ) {
+      $cgi->param('offset', $offset + $maxrecords);
+      $pager .= '<A HREF="'. $cgi->self_url.
+                '"><B><FONT SIZE="+1">Next</FONT></B></A> ';
+    }
+  }
+  #end pager
+
+  print header('Query Results', menubar('Main Menu'=>$p) ).
+        "$total total rows<BR><BR>$pager". table().
+        "<TR>";
+  print "<TH>$_</TH>" foreach @{$sth->{NAME}};
+  print "</TR>";
+
+  foreach $row ( @$rows ) {
+    print "<TR>";
+    print "<TD>$_</TD>" foreach @$row;
+    print "</TR>";
+  }
+
+  print "</TABLE>$pager</BODY></HTML>";
+
+%>
-- 
cgit v1.2.1


From 0bd54ce52909122fa729e12709f6f155dd39c09c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Apr 2002 20:52:59 +0000
Subject: don't specify date (not on submitting form)

---
 httemplate/edit/process/cust_credit_bill.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/process/cust_credit_bill.cgi b/httemplate/edit/process/cust_credit_bill.cgi
index 4879b0eab..23e2e6ce5 100755
--- a/httemplate/edit/process/cust_credit_bill.cgi
+++ b/httemplate/edit/process/cust_credit_bill.cgi
@@ -17,7 +17,7 @@ if ($cgi->param('invnum') =~ /^Refund$/) {
     'reason'  => $cust_credit->reason,
     'refund'  => $cgi->param('amount'),
     'payby'   => 'BILL',
-    '_date'   => $cgi->param('_date'),
+    #'_date'   => $cgi->param('_date'),
     'payinfo' => 'Cash',
     'crednum' => $crednum,
   } );
-- 
cgit v1.2.1


From ee037398ef051cca986f799c52e52c0114f897c9 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Fri, 5 Apr 2002 23:37:13 +0000
Subject: credit/refund display correction

---
 httemplate/view/cust_main.cgi | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 1a04ff61c..d960468a0 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -489,7 +489,28 @@ foreach my $bill (@bills) {
   }
 }
 
-my @credits = grep { $_->credited > 0 }
+my @credits = grep { scalar(my @array = $_->cust_credit_refund) }
+           qsearch('cust_credit',{'custnum'=>$custnum});
+foreach my $credit (@credits) {
+  my($cref)=$credit->hashref;
+  my(@cust_credit_refund)=
+    qsearch('cust_credit_refund', { 'crednum'=> $cref->{crednum} } );
+  foreach my $cust_credit_refund (@cust_credit_refund) {
+    my $cust_refund = $cust_credit_refund->cust_credit;
+    my($date, $crednum, $amount, $reason, $app_date ) = (
+      $credit->_date,
+      $credit->crednum,
+      $cust_credit_refund->amount,
+      $credit->reason,
+      time2str("%D", $cust_credit_refund->_date),
+    );
+    push @history,
+      "$date\tCredit #$crednum: $reason<BR>".
+      "(applied to refund on $app_date)\t\t\t$amount\t";
+  }
+}
+
+@credits = grep { $_->credited  > 0 }
            qsearch('cust_credit',{'custnum'=>$custnum});
 foreach my $credit (@credits) {
   my($cref)=$credit->hashref;
-- 
cgit v1.2.1


From 87af741da0dd5f6a76bbb566b4d6c54cd5b15315 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Apr 2002 23:51:18 +0000
Subject: - add message catalog table & beginning of web interface - add
 security_phrase and conf option to svc_acct.pm - random other stuff

---
 ANNOUCE.1.4.0                          |   2 +
 CREDITS                                |   2 +-
 FS/FS/Conf.pm                          |  15 +++
 FS/FS/msgcat.pm                        | 187 +++++++++++++++++++++++++++++++++
 FS/FS/svc_acct.pm                      |   1 +
 FS/MANIFEST                            |   2 +
 FS/t/msgcat.t                          |   5 +
 Makefile                               |   4 +-
 README.1.4.0pre12                      |  11 ++
 bin/freeside-session-kill              |   3 +
 bin/fs-setup                           |  15 ++-
 bin/populate-msgcat                    |  45 ++++++++
 bin/sqlradius_reset                    |   4 +-
 conf/locale                            |   1 +
 eg/table_template-svc.pm               |   4 -
 eg/table_template.pm                   |   4 -
 htetc/global.asa                       |   1 +
 htetc/handler.pl                       |   1 +
 httemplate/browse/cust_main_county.cgi |   1 -
 httemplate/browse/msgcat.cgi           |  50 +++++++++
 httemplate/browse/part_referral.cgi    |   1 -
 httemplate/browse/svc_acct_pop.cgi     |   1 -
 httemplate/docs/schema.html            |   8 ++
 httemplate/docs/upgrade8.html          |   9 ++
 httemplate/edit/svc_acct.cgi           |   9 ++
 httemplate/index.html                  |   1 +
 httemplate/view/svc_acct.cgi           |   6 ++
 27 files changed, 376 insertions(+), 17 deletions(-)
 create mode 100644 FS/FS/msgcat.pm
 create mode 100644 FS/t/msgcat.t
 create mode 100755 bin/populate-msgcat
 create mode 100644 conf/locale
 create mode 100755 httemplate/browse/msgcat.cgi

diff --git a/ANNOUCE.1.4.0 b/ANNOUCE.1.4.0
index 8bc16ad3d..c1da9dd4c 100644
--- a/ANNOUCE.1.4.0
+++ b/ANNOUCE.1.4.0
@@ -117,3 +117,5 @@ new export! (well, almost)
 
 icradius groups (usergroup table if not radgroupreply & radgroupcheck)
 
+message catalogs (infrastructure, anyway)
+
diff --git a/CREDITS b/CREDITS
index 13d286127..3a356f935 100644
--- a/CREDITS
+++ b/CREDITS
@@ -95,7 +95,7 @@ and will doubtless send more once he's got his tree under control.
 Luke Pfeifer <freeside@globalli.com> contributed the "subscription" price plan.
 
 Noment Networks, LLC <http://www.noment.com/> sponsored ICRADIUS/FreeRADIUS
-groups.
+groups, message catalogs, and signup server enhancements.
 
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 2bc5e24c0..bda19c0a2 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -843,6 +843,21 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'security_phrase',
+    'section'     => 'password',
+    'description' => 'Enable the tracking of a "security phrase" with each account.  Not recommended, as it is vulnerable to social engineering.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'locale',
+    'section'     => 'UI',
+    'description' => 'Message locale',
+    'type'        => 'select',
+    'select_enum' => [ qw(en_US) ],
+  },
+
 );
 
 1;
diff --git a/FS/FS/msgcat.pm b/FS/FS/msgcat.pm
new file mode 100644
index 000000000..53a7aeee6
--- /dev/null
+++ b/FS/FS/msgcat.pm
@@ -0,0 +1,187 @@
+package FS::msgcat;
+
+use strict;
+use vars qw( @ISA @EXPORT_OK $conf $locale );
+use Exporter;
+use FS::UID;
+use FS::Record qw( qsearchs );
+use FS::Conf;
+
+@ISA = qw(FS::Record);
+@EXPORT_OK = qw( gettext geterror );
+
+$FS::UID::callback{'msgcat'} = sub {
+  $conf = new FS::Conf;
+  $locale = $conf->config('locale') || 'en_US';
+};
+
+=head1 NAME
+
+FS::msgcat - Object methods for message catalog entries
+
+=head1 SYNOPSIS
+
+  use FS::msgcat qw(gettext);
+
+  #simple interface for retreiving messages...
+  $message = gettext('msgcode');
+  #or errors (includes the error code)
+  $message = geterror('msgcode');
+
+  #maintenance stuff
+  $record = new FS::msgcat \%hash;
+  $record = new FS::msgcat { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::msgcat object represents an message catalog entry.  FS::msgcat inherits 
+from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item msgnum - primary key
+
+=item msgcode - Error code
+
+=item locale - Locale
+
+=item msg - Message
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new example.  To add the example to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'msgcat'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error =
+    $self->ut_numbern('msgnum')
+    || $self->ut_text('msgcode')
+    || $self->ut_text('msg')
+  ;
+  return $error if $error;
+
+  $self->locale =~ /^([\w\@]+)$/ or return "illegal locale: ". $self->locale;
+  $self->locale($1);
+
+  ''; #no error
+}
+
+=back
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item gettext MSGCODE
+
+Returns the full message for the supplied message code.
+
+=cut
+
+sub gettext {
+  my $msgcode = shift;
+  my $msgcat = qsearchs('msgcat', {
+    'msgcode' => $msgcode,
+    'locale' => $locale
+  } );
+  if ( $msgcat ) {
+    $msgcat->msg;
+  } else {
+    warn "WARNING: message for msgcode $msgcode in locale $locale not found";
+    $msgcode;
+  }
+
+}
+
+=item geterror MSGCODE
+
+Returns the full message for the supplied message code, including the message
+code.
+
+=cut
+
+sub geterror {
+  my $msgcode = shift;
+  my $msg = gettext($msgcode);
+  if ( $msg eq $msgcode ) {
+    "Error code $msgcode (message for locale $locale not found)";
+  } else {
+    "$msg (error code $msgcode)";
+  }
+}
+
+=back
+
+=head1 BUGS
+
+i18n/l10n is a mess.
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 197eec1b5..8d22c21e0 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1079,6 +1079,7 @@ sub check {
 
   my $error = $self->ut_numbern('svcnum')
               || $self->ut_number('domsvc')
+              || $self->ut_textn('sec_phrase')
   ;
   return $error if $error;
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 8f7dfe591..dd9eb0906 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -72,6 +72,7 @@ FS/raddb.pm
 FS/radius_usergroup.pm
 FS/queue.pm
 FS/queue_arg.pm
+FS/msgcat.pm
 t/agent.t
 t/agent_type.t
 t/CGI.t
@@ -120,5 +121,6 @@ t/svc_www.t
 t/type_pkgs.t
 t/queue.t
 t/queue_arg.t
+t/msgcat.t
 t/UID.t
 t/raddb.t
diff --git a/FS/t/msgcat.t b/FS/t/msgcat.t
new file mode 100644
index 000000000..c38c63935
--- /dev/null
+++ b/FS/t/msgcat.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::msgcat;
+$loaded=1;
+print "ok 1\n";
diff --git a/Makefile b/Makefile
index 8f577c579..21aeb4566 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-TEMPLATE = asp
-#TEMPLATE = mason
+#TEMPLATE = asp
+TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
diff --git a/README.1.4.0pre12 b/README.1.4.0pre12
index abbf6e55c..72353ba4c 100644
--- a/README.1.4.0pre12
+++ b/README.1.4.0pre12
@@ -23,12 +23,23 @@ CREATE TABLE radius_usergroup (
 CREATE INDEX radius_usergroup1 ON radius_usergroup ( svcnum );
 CREATE INDEX radius_usergroup2 ON radius_usergroup ( groupname );
 
+ALTER TABLE svc_acct ADD sec_phrase varchar(80) NULL;
+CREATE TABLE msgcat (
+  msgnum int primary key,
+  msgcode varchar(80) not null,
+  locale varchar(16) not null,
+  msg text not null
+);
+CREATE INDEX msgcat1 ON msgcat ( msgcode, locale );
+
 Run bin/dbdef-create
 
 Run bin/create-history-tables
 
 Run bin/dbdef-create again
 
+Run bin/populate-msgcat
+
 the mxmachines, nsmachines, arecords and cnamerecords configuration values have been deprecated.  Use the defaultrecords configuration value instead.
 
 New export code has landed!  If you were using the icradiusmachines,
diff --git a/bin/freeside-session-kill b/bin/freeside-session-kill
index 9f11abd5b..d5fd703f6 100755
--- a/bin/freeside-session-kill
+++ b/bin/freeside-session-kill
@@ -98,3 +98,6 @@ foreach my $join ( @session ) {
 
 $dbh->commit or die $dbh->errstr;
 
+sub usage {
+  die "Usage:\n\n  freeside-session-kill user\n";
+}
diff --git a/bin/fs-setup b/bin/fs-setup
index 01e08f77d..55edeb6dd 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.84 2002-03-22 18:56:32 ivan Exp $
+# $Id: fs-setup,v 1.85 2002-04-05 23:51:17 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -752,6 +752,7 @@ sub tables_hash_hack {
         'svcnum',    'int',    '',   '',
         'username',  'varchar',   '',   $username_len, #unique (& remove dup code)
         '_password', 'varchar',   '',   50, #13 for encryped pw's plus ' *SUSPENDED* (mp5 passwords can be 34)
+        'sec_phrase', 'varchar',  'NULL',   $char_d,
         'popnum',    'int',    'NULL',   '',
         'uid',       'int', 'NULL',   '',
         'gid',       'int', 'NULL',   '',
@@ -962,6 +963,18 @@ sub tables_hash_hack {
       'index'       => [ [ 'svcnum' ], [ 'groupname' ] ],
     },
 
+    'msgcat' => {
+      'columns' => [
+        'msgnum', 'int', '', '',
+        'msgcode', 'varchar', '', $char_d,
+        'locale', 'varchar', '', 16,
+        'msg', 'text', '', '',
+      ],
+      'primary_key' => 'msgnum',
+      'unique'      => [ [ 'msgcode', 'locale' ] ],
+      'index'       => [],
+    },
+
   );
 
   %tables;
diff --git a/bin/populate-msgcat b/bin/populate-msgcat
new file mode 100755
index 000000000..fa88732ce
--- /dev/null
+++ b/bin/populate-msgcat
@@ -0,0 +1,45 @@
+#!/usr/bin/perl
+
+use FS::UID qw(adminsuidsetup);
+use FS::msgcat;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+foreach my $del_msgcat ( qsearchs('msgcat', {}) ) {
+  my $error = $del_msgcat->delete;
+  die $error if $error;
+}
+
+my %messages = messages();
+
+foreach $msgcode ( keys %messages ) {
+  foreach my $locale ( keys %{$messages{$msgcode}} ) {
+    my $msgcat = new FS::msgcat( {
+      'msgcode' => $msgcode,
+      'locale'  => $locale,
+    });
+    my $error = $msgcat->insert;
+    die $error if $error;
+  }
+}
+
+sub messages {
+
+  #  'msgcode' => {
+  #    'en_US' => 'Message',
+  #  },
+
+  (
+
+    'msgcode' => {
+      'en_US' => 'Message',
+    },
+
+  );
+}
+
+sub usage {
+  die "Usage:\n\n  populate-msgcat user\n";
+}
+
diff --git a/bin/sqlradius_reset b/bin/sqlradius_reset
index 501685449..da98fe6be 100644
--- a/bin/sqlradius_reset
+++ b/bin/sqlradius_reset
@@ -38,8 +38,8 @@ foreach my $export ( @exports ) {
 }
 
 sub usage {
-  #die "Usage:\n\n  icradius_reset user machine\n";
-  die "Usage:\n\n  icradius_reset user\n";
+  #die "Usage:\n\n  sqlradius_reset user machine\n";
+  die "Usage:\n\n  sqlradius_reset user\n";
 }
 
 
diff --git a/conf/locale b/conf/locale
new file mode 100644
index 000000000..7741b83a3
--- /dev/null
+++ b/conf/locale
@@ -0,0 +1 @@
+en_US
diff --git a/eg/table_template-svc.pm b/eg/table_template-svc.pm
index c5e8f9670..ebf7299d2 100644
--- a/eg/table_template-svc.pm
+++ b/eg/table_template-svc.pm
@@ -146,10 +146,6 @@ sub check {
 
 =back
 
-=head1 VERSION
-
-$Id: table_template-svc.pm,v 1.2 2001-08-21 02:44:47 ivan Exp $
-
 =head1 BUGS
 
 The author forgot to customize this manpage.
diff --git a/eg/table_template.pm b/eg/table_template.pm
index 2cc1e1d6e..d609bd544 100644
--- a/eg/table_template.pm
+++ b/eg/table_template.pm
@@ -98,10 +98,6 @@ sub check {
 
 =back
 
-=head1 VERSION
-
-$Id: table_template.pm,v 1.2 2000-10-27 20:15:50 ivan Exp $
-
 =head1 BUGS
 
 The author forgot to customize this manpage.
diff --git a/htetc/global.asa b/htetc/global.asa
index 48d0d6fcd..057695183 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -48,6 +48,7 @@ use FS::svc_www;
 use FS::type_pkgs;
 use FS::part_export;
 use FS::part_export_option;
+use FS::msgcat qw(gettext geterror);
 
 sub Script_OnStart {
   $Response->AddHeader('Pragma' => 'no-cache');
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 1a746a552..2f8146e3e 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -105,6 +105,7 @@ sub handler
       use FS::type_pkgs;
       use FS::part_export;
       use FS::part_export_option;
+      use FS::msgcat qw(gettext geterror);
 
       *CGI::redirect = sub {
         my( $self, $location ) = @_;
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index 8fbd7faad..5df8dfae6 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -95,7 +95,6 @@ END
 
 print <<END;
     </TABLE>
-    </CENTER>
   </BODY>
 </HTML>
 END
diff --git a/httemplate/browse/msgcat.cgi b/httemplate/browse/msgcat.cgi
new file mode 100755
index 000000000..5dab5cfc9
--- /dev/null
+++ b/httemplate/browse/msgcat.cgi
@@ -0,0 +1,50 @@
+<!-- mason kludge -->
+<%
+
+print header("Message catalog", menubar(
+  'Main Menu' => $p,
+  'Edit message catalog' => $p. "edit/msgcat.cgi",
+)), '<BR>';
+
+my $widget = new HTML::Widgets::SelectLayers(
+  'selected_layer' => 'en_US',
+  'options'        => { 'en_US'=>'en_US' },
+  'layer_callback' => sub {
+    my $layer = shift;
+    my $html = "<BR>Messages for locale $layer<BR>". table().
+               "<TR><TH COLSPAN=2>Code</TH>".
+               "<TH>Message</TH>";
+    $html .= "<TH>en_US Message</TH>" unless $layer eq 'en_US';
+    $html .= '</TR>';
+
+    #foreach my $msgcat ( sort { $a->msgcode cmp $b->msgcode }
+    #                       qsearchs('msgcat', { 'locale' => $layer } ) ) {
+    foreach my $msgcat ( qsearchs('msgcat', { 'locale' => $layer } ) ) {
+      $html .= '<TR><TD>'. $msgcat->msgnum. '</TD>'.
+               '<TD>'. $msgcat->msgcode. '</TD>'.
+               '<TD>'. $msgcat->msg. '</TD>';
+      unless ( $layer eq 'en_US' ) {
+        my $en_msgcat = qsearchs('msgcat', {
+          'locale'  => 'en_US',
+          'msgcode' => $msgcat->msgcode,
+        } );
+        $html .= '<TD>'. $en_msgcat->msg. '</TD>';
+      }
+      $html .= '</TR>';
+    }
+
+    $html .= '</TABLE>';
+    $html;
+  },
+
+);
+
+print $widget->html;
+
+print <<END;
+    </TABLE>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index bbae8d008..93a6976e1 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -30,7 +30,6 @@ print <<END;
         <TD COLSPAN=2><A HREF="${p}edit/part_referral.cgi"><I>Add a new advertising source</I></A></TD>
       </TR>
     </TABLE>
-    </CENTER>
   </BODY>
 </HTML>
 END
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index fb42aa7e6..f8ee58c05 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -44,7 +44,6 @@ print <<END;
         <TD COLSPAN=5><A HREF="${p}edit/svc_acct_pop.cgi"><I>Add new Access Number</I></A></TD>
       </TR>
     </TABLE>
-    </CENTER>
   </BODY>
 </HTML>
 END
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 192f56ba9..a7c21c7c9 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -298,6 +298,7 @@
         <li>svcnum - <a href="#cust_svc">primary key</a>
         <li>username
         <li>_password
+        <li>sec_phrase - security phrase
         <li>popnum - <a href="#svc_acct_pop">Point of Presence</a>
         <li>uid
         <li>gid
@@ -389,5 +390,12 @@
         <li>svcnum - <a href="#svc_acct">account</a>
         <li>groupname
       </ul>
+    <li><a name="msgcat" href="man/FS/msgcat.html">msgcat</a> - i18n message catalog
+      <ul>
+        <li>msgnum - primary key
+        <li>msgcode - message code
+        <li>locale - locale
+        <li>msg - Message text
+      </ul>
   </ul>
 </body>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 440024de2..a7b5853b3 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -179,6 +179,14 @@ CREATE TABLE radius_usergroup (
 CREATE INDEX radius_usergroup1 ON radius_usergroup ( svcnum );
 CREATE INDEX radius_usergroup2 ON radius_usergroup ( groupname );
 
+CREATE TABLE msgcat (
+  msgnum int primary key,
+  msgcode varchar(80) not null,
+  locale varchar(16) not null,
+  msg text not null
+);
+CREATE INDEX msgcat1 ON msgcat ( msgcode, locale );
+
 ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
 ALTER TABLE svc_domain ADD catchall integer NULL;
 ALTER TABLE cust_main ADD referral_custnum integer NULL;
@@ -198,6 +206,7 @@ ALTER TABLE cust_credit ADD closed char(1) NULL;
 ALTER TABLE cust_refund ADD closed char(1) NULL;
 ALTER TABLE cust_bill_event ADD status varchar(80);
 ALTER TABLE cust_bill_event ADD statustext text NULL;
+ALTER TABLE svc_acct ADD sec_phrase varchar(80) NULL;
 CREATE INDEX cust_main3 ON cust_main ( referral_custnum );
 CREATE INDEX cust_credit_bill1 ON cust_credit_bill ( crednum );
 CREATE INDEX cust_credit_bill2 ON cust_credit_bill ( invnum );
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 723c91c29..540d04c38 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -122,6 +122,15 @@ print &ntable("#cccccc",2), <<END;
 </TR>
 END
 
+if ( $conf->exists('security_phrase') ) {
+  print <<END;
+  <TR><TD ALIGN="right">Security phrase</TD>
+  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase" SIZE=32>
+    (for forgotten passwords)</TD>
+  </TD>
+END
+}
+
 #domain
 my $domsvc = $svc_acct->domsvc || 0;
 if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
diff --git a/httemplate/index.html b/httemplate/index.html
index fecd107cc..99d8df956 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -186,6 +186,7 @@
           <LI><A HREF="browse/svc_acct_pop.cgi">View/Edit Access Numbers</A>
             - Points of Presence 
           <LI><A HREF="browse/part_bill_event.cgi">View/Edit invoice events</A> - Actions for overdue invoices
+          <LI><A HREF="browse/msgcat.cgi">View/Edit message catalog</A> - Change error messages and other customizable labels.
         </ul>
         <BR>
       </TD></TR>
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index b779e8774..496dab366 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -79,6 +79,12 @@ if ( $conf->exists('showpasswords') ) {
 print "</TR></TD>";
 $password = '';
 
+if ( $conf->exists('security_phrase') ) {
+  my $sec_phrase = $svc_acct->sec_phrase;
+  print '<TR><TD ALIGN="right">Security phrase</TD><TD BGCOLOR="#ffffff">'.
+        $svc_acct->sec_phrase. '</TD></TR>;
+}
+
 my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
 print "<TR><TD ALIGN=\"right\">Access number</TD>".
       "<TD BGCOLOR=\"#ffffff\">". $svc_acct_pop->text. '</TD></TR>'
-- 
cgit v1.2.1


From 195652229909566ccb3a6ae249d8fa26f25da55a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Apr 2002 00:08:08 +0000
Subject: security phrase bug fixes

---
 FS/FS/svc_acct.pm            | 2 ++
 httemplate/edit/svc_acct.cgi | 3 +++
 httemplate/view/svc_acct.cgi | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 8d22c21e0..8e25f6afc 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -170,6 +170,8 @@ FS::svc_Common.  The following fields are currently supported:
 
 =item _password - generated if blank
 
+=item sec_phrase - security phrase
+
 =item popnum - Point of presence (see L<FS::svc_acct_pop>)
 
 =item uid
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 540d04c38..eca0a31cf 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -122,6 +122,7 @@ print &ntable("#cccccc",2), <<END;
 </TR>
 END
 
+my $sec_phrase = $svc_acct->sec_phrase;
 if ( $conf->exists('security_phrase') ) {
   print <<END;
   <TR><TD ALIGN="right">Security phrase</TD>
@@ -129,6 +130,8 @@ if ( $conf->exists('security_phrase') ) {
     (for forgotten passwords)</TD>
   </TD>
 END
+} else {
+  print qq!<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="$sec_phrase">!;
 }
 
 #domain
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 496dab366..fd2a32547 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -82,7 +82,7 @@ $password = '';
 if ( $conf->exists('security_phrase') ) {
   my $sec_phrase = $svc_acct->sec_phrase;
   print '<TR><TD ALIGN="right">Security phrase</TD><TD BGCOLOR="#ffffff">'.
-        $svc_acct->sec_phrase. '</TD></TR>;
+        $svc_acct->sec_phrase. '</TD></TR>';
 }
 
 my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
-- 
cgit v1.2.1


From 8fc4118f1f055195d280b3250b39a3b5fcdf13dc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Apr 2002 20:37:38 +0000
Subject: big signup server cleanups.  uses Storable for network protocol now.
 - makes Bugs 384 & 385 easier - closes: Bug#382

---
 fs_signup/FS-SignupClient/Makefile.PL     |   1 +
 fs_signup/FS-SignupClient/SignupClient.pm |  58 +++----------
 fs_signup/FS-SignupClient/cgi/signup.cgi  |  77 ++++++++++-------
 fs_signup/FS-SignupClient/cgi/signup.html |   5 ++
 fs_signup/FS-SignupClient/fs_signupd      |  99 ++++-----------------
 fs_signup/FS-SignupClient/test.pl         |   2 +-
 fs_signup/fs_signup_server                | 138 +++++++++++-------------------
 httemplate/docs/install.html              |   1 +
 httemplate/docs/signup.html               |   3 +-
 9 files changed, 138 insertions(+), 246 deletions(-)

diff --git a/fs_signup/FS-SignupClient/Makefile.PL b/fs_signup/FS-SignupClient/Makefile.PL
index 859d757c3..208e8507a 100644
--- a/fs_signup/FS-SignupClient/Makefile.PL
+++ b/fs_signup/FS-SignupClient/Makefile.PL
@@ -6,5 +6,6 @@ WriteMakefile(
     'VERSION_FROM'  => 'SignupClient.pm', # finds $VERSION
     'EXE_FILES'     => [ 'fs_signupd' ],
     'INSTALLSCRIPT' => '/usr/local/sbin',
+    'INSTALLSITEBIN' => '/usr/local/sbin',
     'PERM_RWX'      => '750',
 );
diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm
index bd917dae7..3933703ae 100644
--- a/fs_signup/FS-SignupClient/SignupClient.pm
+++ b/fs_signup/FS-SignupClient/SignupClient.pm
@@ -6,6 +6,7 @@ use Exporter;
 use Socket;
 use FileHandle;
 use IO::Handle;
+use Storable qw(nstore_fd fd_retrieve);
 
 $VERSION = '0.02';
 
@@ -58,6 +59,7 @@ FS::SignupClient - Freeside signup client API
     'pkgpart'          => $pkgpart,
     'username'         => $username,
     '_password'        => $password,
+    'sec_phrase'       => $sec_phrase,
     'popnum'           => $popnum,
   } );
 
@@ -104,51 +106,12 @@ sub signup_info {
   print SOCK "signup_info\n";
   SOCK->flush;
 
-  chop ( my $n_cust_main_county = <SOCK> );
-  my @cust_main_county = map {
-    chop ( my $taxnum  = <SOCK> ); 
-    chop ( my $state   = <SOCK> ); 
-    chop ( my $county  = <SOCK> ); 
-    chop ( my $country = <SOCK> );
-    {
-      'taxnum'  => $taxnum,
-      'state'   => $state,
-      'county'  => $county,
-      'country' => $country,
-    };
-  } 1 .. $n_cust_main_county;
-
-  chop ( my $n_part_pkg = <SOCK> );
-  my @part_pkg = map {
-    chop ( my $pkgpart = <SOCK> ); 
-    chop ( my $pkg     = <SOCK> ); 
-    {
-      'pkgpart' => $pkgpart,
-      'pkg'     => $pkg,
-    };
-  } 1 .. $n_part_pkg;
-
-  chop ( my $n_svc_acct_pop = <SOCK> );
-  my @svc_acct_pop = map {
-    chop ( my $popnum = <SOCK> ); 
-    chop ( my $city   = <SOCK> ); 
-    chop ( my $state  = <SOCK> ); 
-    chop ( my $ac     = <SOCK> );
-    chop ( my $exch   = <SOCK> );
-    chop ( my $loc    = <SOCK> );
-    {
-      'popnum' => $popnum,
-      'city'   => $city,
-      'state'  => $state,
-      'ac'     => $ac,
-      'exch'   => $exch,
-      'loc'    => $loc,
-    };
-  } 1 .. $n_svc_acct_pop;
-
+  my $init_data = fd_retrieve(\*SOCK);
   close SOCK;
 
-  \@cust_main_county, \@part_pkg, \@svc_acct_pop;
+  (map { $init_data->{$_} } qw( cust_main_county part_pkg svc_acct_pop ) ),
+  $init_data;
+
 }
 
 =item new_customer HASHREF
@@ -188,6 +151,8 @@ sub new_customer {
   my $hashref = shift;
 
   #things that aren't necessary in base class, but are for signup server
+#  return "Passwords don't match"
+#    if $hashref->{'_password'} ne $hashref->{'_password2'}
   return "Empty password" unless $hashref->{'_password'};
   return "No POP selected" unless $hashref->{'popnum'};
 
@@ -195,11 +160,14 @@ sub new_customer {
   connect(SOCK, sockaddr_un($fs_signupd_socket)) or die "connect: $!";
   print SOCK "new_customer\n";
 
-  print SOCK join("\n", map { $hashref->{$_} } qw(
+  my $signup_data = { map { $_ => $hashref->{$_} } qw(
     first last ss company address1 address2 city county state zip country
     daytime night fax payby payinfo paydate payname invoicing_list
     referral_custnum pkgpart username _password popnum
-  ) ), "\n";
+  ) };
+
+  #
+  nstore_fd($signup_data, \*SOCK) or die "can't send customer signup: $!";
   SOCK->flush;
 
   chop( my $error = <SOCK> );
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index b236e6fb2..d44782f9c 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,13 +1,13 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.15 2001-09-27 21:37:57 ivan Exp $
+# $Id: signup.cgi,v 1.16 2002-04-06 20:37:38 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $error
              $last $first $ss $company $address1 $address2 $city $state $county
              $country $zip $daytime $night $fax $invoicing_list $payby $payinfo
              $paydate $payname $referral_custnum
-             $pkgpart $username $password $popnum
+             $pkgpart $username $password $password2 $popnum
              $ieak_file $ieak_template $cck_file $cck_template
              $signup_html $signup_template $success_html $success_template
              $ac $exch $loc
@@ -115,37 +115,50 @@ if ( defined $cgi->param('magic') ) {
       $invoicing_list = 'POST';
     }
 
-    $error = new_customer ( {
-      'last'             => $last             = $cgi->param('last'),
-      'first'            => $first            = $cgi->param('first'),
-      'ss'               => $ss               = $cgi->param('ss'),
-      'company'          => $company          = $cgi->param('company'),
-      'address1'         => $address1         = $cgi->param('address1'),
-      'address2'         => $address2         = $cgi->param('address2'),
-      'city'             => $city             = $cgi->param('city'),
-      'county'           => $county,
-      'state'            => $state,
-      'zip'              => $zip              = $cgi->param('zip'),
-      'country'          => $country,
-      'daytime'          => $daytime          = $cgi->param('daytime'),
-      'night'            => $night            = $cgi->param('night'),
-      'fax'              => $fax              = $cgi->param('fax'),
-      'payby'            => $payby,
-      'payinfo'          => $payinfo,
-      'paydate'          => $paydate,
-      'payname'          => $payname,
-      'invoicing_list'   => $invoicing_list,
-      'referral_custnum' => $referral_custnum = $cgi->param('ref'),
-      'pkgpart'          => $pkgpart          = $cgi->param('pkgpart'),
-      'username'         => $username         = $cgi->param('username'),
-      '_password'        => $password         = $cgi->param('_password'),
-      'popnum'           => $popnum           = $cgi->param('popnum'),
-    } );
+    $error = '';
+
+    if ( $cgi->param('_password') ne $cgi->param('_password2') ) {
+      $error = "Passwords don't match";
+      $password  = '';
+      $password2 = '';
+    } else {
+      $password2 = $cgi->param('_password2');
+
+      $error = new_customer ( {
+        'last'             => $last             = $cgi->param('last'),
+        'first'            => $first            = $cgi->param('first'),
+        'ss'               => $ss               = $cgi->param('ss'),
+        'company'          => $company          = $cgi->param('company'),
+        'address1'         => $address1         = $cgi->param('address1'),
+        'address2'         => $address2         = $cgi->param('address2'),
+        'city'             => $city             = $cgi->param('city'),
+        'county'           => $county,
+        'state'            => $state,
+        'zip'              => $zip              = $cgi->param('zip'),
+        'country'          => $country,
+        'daytime'          => $daytime          = $cgi->param('daytime'),
+        'night'            => $night            = $cgi->param('night'),
+        'fax'              => $fax              = $cgi->param('fax'),
+        'payby'            => $payby,
+        'payinfo'          => $payinfo,
+        'paydate'          => $paydate,
+        'payname'          => $payname,
+        'invoicing_list'   => $invoicing_list,
+        'referral_custnum' => $referral_custnum = $cgi->param('ref'),
+        'pkgpart'          => $pkgpart          = $cgi->param('pkgpart'),
+        'username'         => $username         = $cgi->param('username'),
+        '_password'        => $password         = $cgi->param('_password'),
+        'popnum'           => $popnum           = $cgi->param('popnum'),
+      } );
+
+    }
+    
     if ( $error ) {
       print_form();
     } else {
       print_okay();
     }
+
   } else {
     die "unrecognized magic: ". $cgi->param('magic');
   }
@@ -173,6 +186,7 @@ if ( defined $cgi->param('magic') ) {
   $pkgpart = '';
   $username = '';
   $password = '';
+  $password2 = '';
   $popnum = '';
   $referral_custnum = $cgi->param('ref') || '';
   print_form;
@@ -463,9 +477,14 @@ Contact Information
 </TR>
 <TR>
   <TD ALIGN="right">Password</TD>
-  <TD><INPUT TYPE="text" NAME="_password" VALUE="<%= $password %>">
+  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>">
   (blank to generate)</TD>
 </TR>
+<TR>
+  <TD ALIGN="right">Re-enter Password</TD>
+  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>">
+  </TD>
+</TR>
 <TR>
   <TD ALIGN="right">Access number</TD>
   <TD><%= popselector($popnum) %></TD>
diff --git a/fs_signup/FS-SignupClient/cgi/signup.html b/fs_signup/FS-SignupClient/cgi/signup.html
index 0f4742d20..909d1fe5b 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.html
+++ b/fs_signup/FS-SignupClient/cgi/signup.html
@@ -129,6 +129,11 @@ Contact Information
   <TD><INPUT TYPE="text" NAME="_password" VALUE="<%= $password %>">
   (blank to generate)</TD>
 </TR>
+<TR>
+  <TD ALIGN="right">Re-enter Password</TD>
+  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>">
+  </TD>
+</TR>
 <TR>
   <TD ALIGN="right">Access number</TD>
   <TD><%= popselector($popnum) %></TD>
diff --git a/fs_signup/FS-SignupClient/fs_signupd b/fs_signup/FS-SignupClient/fs_signupd
index 8b3cdde53..e764f32b7 100755
--- a/fs_signup/FS-SignupClient/fs_signupd
+++ b/fs_signup/FS-SignupClient/fs_signupd
@@ -3,14 +3,15 @@
 # fs_signupd
 #
 # This is run REMOTELY over ssh by fs_signup_server.
-#
 
 use strict;
 use Socket;
+use Storable qw(nstore_fd fd_retrieve);
+use IO::Handle;
 
 use vars qw( $Debug );
 
-$Debug = 0;
+$Debug = 1;
 
 my($fs_signupd_socket)="/usr/local/freeside/fs_signupd_socket";
 
@@ -23,50 +24,8 @@ $ENV{'BASH_ENV'} = '';
 
 $|=1;
 
-warn "[fs_signupd] Reading locales...\n" if $Debug;
-chomp( my $n_cust_main_county = <STDIN> );
-my @cust_main_county = map {
-  chomp( my $taxnum = <STDIN> );
-  chomp( my $state = <STDIN> );
-  chomp( my $county = <STDIN> );
-  chomp( my $country = <STDIN> );
-  {
-    'taxnum'  => $taxnum,
-    'state'   => $state,
-    'county'  => $county,
-    'country' => $country,
-  };
-} ( 1 .. $n_cust_main_county );
-
-warn "[fs_signupd] Reading package definitions...\n" if $Debug;
-chomp( my $n_part_pkg = <STDIN> );
-my @part_pkg = map {
-  chomp( my $pkgpart = <STDIN> );
-  chomp( my $pkg = <STDIN> );
-  {
-    'pkgpart' => $pkgpart,
-    'pkg'     => $pkg,
-  };
-} ( 1 .. $n_part_pkg );
-
-warn "[fs_signupd] Reading POPs...\n" if $Debug;
-chomp( my $n_svc_acct_pop = <STDIN> );
-my @svc_acct_pop = map {
-  chomp( my $popnum = <STDIN> );
-  chomp( my $city = <STDIN> );
-  chomp( my $state = <STDIN> );
-  chomp( my $ac = <STDIN> );
-  chomp( my $exch = <STDIN> );
-  chomp( my $loc = <STDIN> );
-  {
-    'popnum' => $popnum,
-    'city'   => $city,
-    'state'  => $state,
-    'ac'     => $ac,
-    'exch'   => $exch,
-    'loc'    => $loc,
-  };
-} ( 1 .. $n_svc_acct_pop );
+warn "[fs_signupd] Reading init data...\n" if $Debug;
+my $init_data = fd_retrieve(\*STDIN);
 
 warn "[fs_signupd] Creating $fs_signupd_socket\n" if $Debug;
 my $uaddr = sockaddr_un($fs_signupd_socket);
@@ -83,56 +42,28 @@ for ( ; $paddr = accept(Client,Server); close Client) {
   chop( my $command = <Client> );
 
   if ( $command eq "signup_info" ) {
+
     warn "[fs_signupd] sending signup info...\n" if $Debug; 
-    print Client join("\n", $n_cust_main_county,
-      map {
-        $_->{taxnum},
-        $_->{state},
-        $_->{county},
-        $_->{country},
-      } @cust_main_county
-    ), "\n";
-
-    print Client join("\n", $n_part_pkg,
-      map {
-        $_->{pkgpart},
-        $_->{pkg},
-      } @part_pkg
-    ), "\n";
-
-    print Client join("\n", $n_svc_acct_pop,
-      map {
-        $_->{popnum},
-        $_->{city},
-        $_->{state},
-        $_->{ac},
-        $_->{exch},
-        $_->{loc},
-      } @svc_acct_pop
-    ), "\n";
+    nstore_fd($init_data, \*Client) or die "can't send init data: $!";
+    Client->flush;
 
   } elsif ( $command eq "new_customer" ) {
+
+    #inefficient...
+
     warn "[fs_signupd] reading customer signup...\n" if $Debug;
-    my(
-      $first, $last, $ss, $company, $address1, $address2, $city, $county,
-      $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
-      $paydate, $payname, $invoicing_list, $referral_custnum,
-      $pkgpart, $username, $password, $popnum,
-    ) = map { scalar(<Client>) } ( 1 .. 24 );
+    my $signup_data = fd_retrieve(\*Client);
 
     warn "[fs_signupd] sending customer data to remote server...\n" if $Debug;
-    print 
-      $first, $last, $ss, $company, $address1, $address2, $city, $county,
-      $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
-      $paydate, $payname, $invoicing_list, $referral_custnum,
-      $pkgpart, $username, $password, $popnum,
-    ;
+    nstore_fd($signup_data, \*STDOUT) or die "can't send signup data: $!";
+    STDOUT->flush;
 
     warn "[fs_signupd] reading error from remote server...\n" if $Debug;
     my $error = <STDIN>;
 
     warn "[fs_signupd] sending error to local client...\n" if $Debug;
     print Client $error;
+    Client->flush;
 
   } else {
     die "unexpected command from client: $command";
diff --git a/fs_signup/FS-SignupClient/test.pl b/fs_signup/FS-SignupClient/test.pl
index 690f5840e..b6136954d 100644
--- a/fs_signup/FS-SignupClient/test.pl
+++ b/fs_signup/FS-SignupClient/test.pl
@@ -8,7 +8,7 @@
 
 BEGIN { $| = 1; print "1..1\n"; }
 END {print "not ok 1\n" unless $loaded;}
-use FS::SignupClient;
+#blah#use FS::SignupClient;
 $loaded = 1;
 print "ok 1\n";
 
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index b0d28be8c..77f7f3056 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -5,6 +5,7 @@
 
 use strict;
 use IO::Handle;
+use Storable qw(nstore_fd fd_retrieve);
 use Tie::RefHash;
 use Net::SSH qw(sshopen2);
 use FS::UID qw(adminsuidsetup);
@@ -14,7 +15,7 @@ use FS::cust_main;
 
 use vars qw( $opt $Debug );
 
-$Debug = 0;
+$Debug = 2;
 
 my @payby = qw(CARD PREPAY);
 
@@ -25,7 +26,7 @@ my $machine = shift or die &usage;
 
 my $agentnum = shift or die &usage;
 my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } ) or die &usage;
-my $pkgpart = $agent->pkgpart_hashref;
+my $pkgpart_href = $agent->pkgpart_hashref;
 
 my $refnum = shift or die &usage;
 
@@ -36,61 +37,43 @@ my($fs_signupd)="/usr/local/sbin/fs_signupd";
 
 while (1) {
   my($reader,$writer)=(new IO::Handle, new IO::Handle);
-  $writer->autoflush(1);
+  #seems to be broken - calling ->flush explicitly# $writer->autoflush(1);
   warn "[fs_signup_server] Connecting to $machine...\n" if $Debug;
   sshopen2($machine,$reader,$writer,$fs_signupd);
 
-  my $data;
-
-  warn "[fs_signup_server] Sending locales...\n" if $Debug;
-  my @cust_main_county = qsearch('cust_main_county', {} );
-  print $writer $data = join("\n",
-    ( scalar(@cust_main_county) || die "no tax rates (cust_main_county records)" ),
-    map {
-      $_->taxnum,
-      $_->state,
-      $_->county,
-      $_->country,
-    } @cust_main_county
-  ),"\n";
-  warn "[fs_signup_server] $data\n" if $Debug > 2;
-
-  warn "[fs_signup_server] Sending package definitions...\n" if $Debug;
-  my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } }
-    qsearch( 'part_pkg', { 'disabled' => '' } );
-  print $writer $data = join("\n",
-    ( scalar(@part_pkg) || die "no usable package definitions, agent $agentnum" ),
-    map {
-      $_->pkgpart,
-      $_->pkg,
-    } @part_pkg
-  ), "\n";
-  warn "[fs_signup_server] $data\n" if $Debug > 2;
-
-  warn "[fs_signup_server] Sending POPs...\n" if $Debug;
-  my @svc_acct_pop = qsearch ('svc_acct_pop',{} );
-  print $writer $data = join("\n",
-    ( scalar(@svc_acct_pop) || die "No points of presence (svc_acct_pop records)" ),
-    map {
-      $_->popnum,
-      $_->city,
-      $_->state,
-      $_->ac,
-      $_->exch,
-      $_->loc,
-    } @svc_acct_pop
-  ), "\n";
-  warn "[fs_signup_server] $data\n" if $Debug > 2;
+  my $init_data = {
+
+    #'_protocol' => 'signup',
+    #'_version' => '0.1',
+    #'_packet' => 'init'
+  
+    'cust_main_county' =>
+      [ map { $_->hashref } qsearch('cust_main_county', {}) ],
+      
+    'part_pkg' =>
+      [
+        map { $_->hashref }
+          grep { $_->svcpart('svc_acct') && $pkgpart_href->{ $_->pkgpart } }
+            qsearch( 'part_pkg', { 'disabled' => '' } )
+      ],
+
+    'svc_acct_pop' => [ map { $_->hashref } qsearch ('svc_acct_pop',{} ) ],
+
+  };
+
+  warn "[fs_signup_server] Sending init data...\n" if $Debug;
+  nstore_fd($init_data, $writer) or die "can't send init data: $!";
+  $writer->flush;
 
   warn "[fs_signup_server] Entering main loop...\n" if $Debug;
   while (1) {
     warn "[fs_signup_server] Reading (waiting for) signup data...\n" if $Debug;
-    chop( my(
-      $first, $last, $ss, $company, $address1, $address2, $city, $county,
-      $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
-      $paydate, $payname, $invoicing_list, $referral_custnum,
-      $pkgpart, $username, $password, $popnum,
-    ) = map { scalar(<$reader>) } ( 1 .. 24 ) );
+    my $signup_data = fd_retrieve($reader);
+
+    if ( $Debug > 1 ) {
+      warn join('',
+        map { "  $_ => ". $signup_data->{$_}. "\n" } keys %$signup_data );
+    }
 
     warn "[fs_signup_server] Processing signup...\n" if $Debug;
 
@@ -99,64 +82,47 @@ while (1) {
     #shares some stuff with htdocs/edit/process/cust_main.cgi... take any
     # common that are still here and library them.
     my $cust_main = new FS::cust_main ( {
-      'custnum'          => '',
+      #'custnum'          => '',
       'agentnum'         => $agentnum,
       'refnum'           => $refnum,
-      'last'             => $last,
-      'first'            => $first,
-      'ss'               => $ss,
-      'company'          => $company,
-      'address1'         => $address1,
-      'address2'         => $address2,
-      'city'             => $city,
-      'county'           => $county,
-      'state'            => $state,
-      'zip'              => $zip,
-      'country'          => $country,
-      'daytime'          => $daytime,
-      'night'            => $night,
-      'fax'              => $fax,
-      'payby'            => $payby,
-      'payinfo'          => $payinfo,
-      'paydate'          => $paydate,
-      'payname'          => $payname,
-      'referral_custnum' => $referral_custnum,
+
+      map { $_ => $signup_data->{$_} } qw(
+        last first ss company address1 address2 city county state zip country
+        daytime night fax payby payinfo paydate payname referral_custnum
+      ),
+
     } );
 
-    $error = "Illegal payment type" unless grep { $_ eq $payby } @payby;
+    $error = "Illegal payment type"
+      unless grep { $_ eq $signup_data->{'payby'} } @payby;
 
-    my @invoicing_list = split( /\s*\,\s*/, $invoicing_list );
+    my @invoicing_list = split( /\s*\,\s*/, $signup_data->{'invoicing_list'} );
 
-    my $part_pkg = qsearchs( 'part_pkg', { 'pkgpart' => $pkgpart } )
-      or $error ||= "WARNING: unknown pkgpart $pkgpart";
+    my $part_pkg =
+      qsearchs( 'part_pkg', { 'pkgpart' => $signup_data->{'pkgpart'} } )
+        or $error ||= "WARNING: unknown pkgpart ". $signup_data->{pkgpart};
     my $svcpart = $part_pkg->svcpart unless $error;
 
     # this should wind up in FS::cust_pkg!
     my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } );
-    my $pkgpart_href = $agent->pkgpart_hashref;
-    $error ||= "WARNING: agent $agentnum can't purchase pkgpart $pkgpart"
-      unless $pkgpart_href->{ $pkgpart };
+    #my $pkgpart_href = $agent->pkgpart_hashref;
+    $error ||= "WARNING: agent $agentnum can't purchase pkgpart ".
+               $signup_data->{pkgpart}
+      unless $pkgpart_href->{ $signup_data->{pkgpart} };
 
     my $cust_pkg = new FS::cust_pkg ( {
       #later#'custnum' => $custnum,
-      'pkgpart' => $pkgpart,
+      'pkgpart' => $signup_data->{'pkgpart'},
     } );
     $error ||= $cust_pkg->check;
 
     my $svc_acct = new FS::svc_acct ( {
       'svcpart'   => $svcpart,
-      'username'  => $username,
-      '_password' => $password,
-      'popnum'    => $popnum,
+      map { $_ => $signup_data->{$_} } qw( username _password popnum ),
     } );
 
     my $y = $svc_acct->setdefault; # arguably should be in new method
     $error ||= $y unless ref($y);
-    #and just in case you were silly
-    $svc_acct->svcpart($svcpart);
-    $svc_acct->username($username);
-    $svc_acct->_password($password);
-    $svc_acct->popnum($popnum);
 
     $error ||= $svc_acct->check;
 
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 4370d9153..2ad75b15e 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -52,6 +52,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a>
       <li><a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>
       <li><a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a>
+      <li><a href="http://search.cpan.org/search?dist=Storable">Storable</a>
     </ul>
 </ul>
 Install the Freeside distribution:
diff --git a/httemplate/docs/signup.html b/httemplate/docs/signup.html
index 262b697bb..e7472158a 100644
--- a/httemplate/docs/signup.html
+++ b/httemplate/docs/signup.html
@@ -9,7 +9,8 @@ webserver.  On this machine, install:
   <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
   <li><a href="ftp://ftp.cs.hut.fi/pub/ssh/">SSH</a>
   <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
-  <li><a href="http://www.perl.com/CPAN/modules/by-module/Text/">Text::Template</a>
+  <li><a href="http://search.cpan.org/search?dist=Text-Template">Text::Template</a>
+  <li><a href="http://search.cpan.org/search?dist=Storable">Storable</a>
   <li><a href="http://www.sisd.com/useragent">HTTP::Headers::UserAgent</a> (version 2.0 or higher; not yet indexed correctly on CPAN)
 
   <li><a href="man/FS/SignupClient.html">FS::SignupClient</a> (copy the fs_signup/FS-SignupClient directory to the external machine, then: perl Makefile.PL; make; make install)
-- 
cgit v1.2.1


From 336d87dc8c7c105d3d9cd41c3590acc09964281d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Apr 2002 21:32:03 +0000
Subject: fix visual glitch

---
 httemplate/search/cust_main.cgi | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 03997ee35..63aa924b1 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -340,12 +340,10 @@ END
         $cust_main->ship_last ? $cust_main->ship_first : $cust_main->first,
         $cust_main->ship_last ? $cust_main->ship_company : $cust_main->company,
       );
-    my $pship_company = $ship_company
-      ? qq!<A HREF="$view"><FONT SIZE=-1>$ship_company</FONT></A>!
-      : '<FONT SIZE=-1>&nbsp;</FONT>';
-    print <<END;
-
-print <<END;
+      my $pship_company = $ship_company
+        ? qq!<A HREF="$view"><FONT SIZE=-1>$ship_company</FONT></A>!
+        : '<FONT SIZE=-1>&nbsp;</FONT>';
+      print <<END;
       <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$ship_last, $ship_first</FONT></A></TD>
       <TD ROWSPAN=$rowspan>$pship_company</A></TD>
 END
-- 
cgit v1.2.1


From 4fa13bb706c06379b76b085c5f4acdea42902f4f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Apr 2002 21:39:22 +0000
Subject: closes: bug#384 - adds security phrase to signup server also (already
 in regular interface)

---
 fs_signup/FS-SignupClient/SignupClient.pm | 14 +++++---------
 fs_signup/FS-SignupClient/cgi/signup.cgi  | 25 ++++++++++++++++++++-----
 fs_signup/FS-SignupClient/cgi/signup.html | 13 +++++++++++++
 fs_signup/fs_signup_server                | 16 ++++++++++++++--
 4 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm
index 3933703ae..7c9d46d9e 100644
--- a/fs_signup/FS-SignupClient/SignupClient.pm
+++ b/fs_signup/FS-SignupClient/SignupClient.pm
@@ -8,7 +8,7 @@ use FileHandle;
 use IO::Handle;
 use Storable qw(nstore_fd fd_retrieve);
 
-$VERSION = '0.02';
+$VERSION = '0.03';
 
 @ISA = qw( Exporter );
 @EXPORT_OK = qw( signup_info new_customer );
@@ -98,6 +98,8 @@ Each hash reference has the following keys:
   ac
   exch
 
+(Future expansion: fourth argument is the $init_data hash reference)
+
 =cut
 
 sub signup_info {
@@ -141,6 +143,7 @@ a paramater with the following keys:
   pkgpart
   username
   _password
+  sec_phrase
   popnum
 
 Returns a scalar error message, or the empty string for success.
@@ -150,12 +153,6 @@ Returns a scalar error message, or the empty string for success.
 sub new_customer {
   my $hashref = shift;
 
-  #things that aren't necessary in base class, but are for signup server
-#  return "Passwords don't match"
-#    if $hashref->{'_password'} ne $hashref->{'_password2'}
-  return "Empty password" unless $hashref->{'_password'};
-  return "No POP selected" unless $hashref->{'popnum'};
-
   socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
   connect(SOCK, sockaddr_un($fs_signupd_socket)) or die "connect: $!";
   print SOCK "new_customer\n";
@@ -163,10 +160,9 @@ sub new_customer {
   my $signup_data = { map { $_ => $hashref->{$_} } qw(
     first last ss company address1 address2 city county state zip country
     daytime night fax payby payinfo paydate payname invoicing_list
-    referral_custnum pkgpart username _password popnum
+    referral_custnum pkgpart username _password sec_phrase popnum
   ) };
 
-  #
   nstore_fd($signup_data, \*SOCK) or die "can't send customer signup: $!";
   SOCK->flush;
 
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index d44782f9c..0b2370aa6 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,13 +1,13 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.16 2002-04-06 20:37:38 ivan Exp $
+# $Id: signup.cgi,v 1.17 2002-04-06 21:39:22 ivan Exp $
 
 use strict;
-use vars qw( @payby $cgi $locales $packages $pops $error
+use vars qw( @payby $cgi $locales $packages $pops $init_data $error
              $last $first $ss $company $address1 $address2 $city $state $county
              $country $zip $daytime $night $fax $invoicing_list $payby $payinfo
              $paydate $payname $referral_custnum
-             $pkgpart $username $password $password2 $popnum
+             $pkgpart $username $password $password2 $sec_phrase $popnum
              $ieak_file $ieak_template $cck_file $cck_template
              $signup_html $signup_template $success_html $success_template
              $ac $exch $loc
@@ -17,7 +17,7 @@ use subs qw( print_form print_okay expselect signup_default success_default );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use HTTP::Headers::UserAgent 2.00;
-use FS::SignupClient 0.02 qw( signup_info new_customer );
+use FS::SignupClient 0.03 qw( signup_info new_customer );
 use Text::Template;
 
 #acceptable payment methods
@@ -90,7 +90,7 @@ if ( -e $success_html ) {
     or die $Text::Template::ERROR;
 }
 
-( $locales, $packages, $pops ) = signup_info();
+( $locales, $packages, $pops, $init_data ) = signup_info();
 
 $cgi = new CGI;
 
@@ -147,6 +147,7 @@ if ( defined $cgi->param('magic') ) {
         'referral_custnum' => $referral_custnum = $cgi->param('ref'),
         'pkgpart'          => $pkgpart          = $cgi->param('pkgpart'),
         'username'         => $username         = $cgi->param('username'),
+        'sec_phrase'       => $sec_phrase       = $cgi->param('sec_phrase'),
         '_password'        => $password         = $cgi->param('_password'),
         'popnum'           => $popnum           = $cgi->param('popnum'),
       } );
@@ -187,6 +188,7 @@ if ( defined $cgi->param('magic') ) {
   $username = '';
   $password = '';
   $password2 = '';
+  $sec_phrase = '';
   $popnum = '';
   $referral_custnum = $cgi->param('ref') || '';
   print_form;
@@ -485,6 +487,19 @@ Contact Information
   <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>">
   </TD>
 </TR>
+<%=
+  if ( $init_data->{'security_phrase'} ) {
+    $OUT .= <<ENDOUT;
+<TR>
+  <TD ALIGN="right">Security Phrase</TD>
+  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
+  </TD>
+</TR>
+ENDOUT
+  } else {
+    $OUT .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
+  }
+%>
 <TR>
   <TD ALIGN="right">Access number</TD>
   <TD><%= popselector($popnum) %></TD>
diff --git a/fs_signup/FS-SignupClient/cgi/signup.html b/fs_signup/FS-SignupClient/cgi/signup.html
index 909d1fe5b..b97511e97 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.html
+++ b/fs_signup/FS-SignupClient/cgi/signup.html
@@ -134,6 +134,19 @@ Contact Information
   <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>">
   </TD>
 </TR>
+<%=
+  if ( $init_data->{'security_phrase'} ) {
+    $OUT .= <<ENDOUT;
+<TR>
+  <TD ALIGN="right">Security Phrase</TD>
+  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
+  </TD>
+</TR>
+ENDOUT
+  } else {
+    $OUT .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
+  }
+%>
 <TR>
   <TD ALIGN="right">Access number</TD>
   <TD><%= popselector($popnum) %></TD>
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 77f7f3056..4c06946c6 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -9,6 +9,7 @@ use Storable qw(nstore_fd fd_retrieve);
 use Tie::RefHash;
 use Net::SSH qw(sshopen2);
 use FS::UID qw(adminsuidsetup);
+use FS::Conf;
 use FS::Record qw( qsearch qsearchs );
 use FS::cust_main_county;
 use FS::cust_main;
@@ -22,6 +23,8 @@ my @payby = qw(CARD PREPAY);
 my $user = shift or die &usage;
 &adminsuidsetup( $user ); 
 
+my $conf = new FS::Conf;
+
 my $machine = shift or die &usage;
 
 my $agentnum = shift or die &usage;
@@ -59,6 +62,8 @@ while (1) {
 
     'svc_acct_pop' => [ map { $_->hashref } qsearch ('svc_acct_pop',{} ) ],
 
+    'security_phrase' => $conf->exists('security_phrase'),
+
   };
 
   warn "[fs_signup_server] Sending init data...\n" if $Debug;
@@ -79,6 +84,12 @@ while (1) {
 
     my $error = '';
 
+    #things that aren't necessary in base class, but are for signup server
+      #return "Passwords don't match"
+      #  if $hashref->{'_password'} ne $hashref->{'_password2'}
+    $error ||= "Empty password" unless $signup_data->{'_password'};
+    $error ||= "No POP selected" unless $signup_data->{'popnum'};
+
     #shares some stuff with htdocs/edit/process/cust_main.cgi... take any
     # common that are still here and library them.
     my $cust_main = new FS::cust_main ( {
@@ -93,7 +104,7 @@ while (1) {
 
     } );
 
-    $error = "Illegal payment type"
+    $error ||= "Illegal payment type"
       unless grep { $_ eq $signup_data->{'payby'} } @payby;
 
     my @invoicing_list = split( /\s*\,\s*/, $signup_data->{'invoicing_list'} );
@@ -118,7 +129,8 @@ while (1) {
 
     my $svc_acct = new FS::svc_acct ( {
       'svcpart'   => $svcpart,
-      map { $_ => $signup_data->{$_} } qw( username _password popnum ),
+      map { $_ => $signup_data->{$_} }
+        qw( username _password sec_phrase popnum ),
     } );
 
     my $y = $svc_acct->setdefault; # arguably should be in new method
-- 
cgit v1.2.1


From 99a8652052e5b036e7db08c32603c0feadc60e85 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Apr 2002 22:32:43 +0000
Subject: add a config option to set the Business::OnlinePayment description
 field, and make some useful data available for the config option. closes:
 Bug#378

---
 FS/FS/Conf.pm          |  7 +++++++
 FS/FS/cust_bill.pm     | 19 ++++++++++++++++---
 FS/FS/cust_bill_pkg.pm | 13 ++++++++++++-
 FS/FS/cust_main.pm     | 11 +++++++++++
 4 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index bda19c0a2..74e28d8b1 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -268,6 +268,13 @@ httemplate/docs/config.html
     'type'        => 'textarea',
   },
 
+  {
+    'key'         => 'business-onlinepayment-description',
+    'section'     => 'billing',
+    'description' => 'String passed as the description field to <a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a>.  Evaluated as a double-quoted perl string, with the following variables available: <code>$agent</code> (the agent name), and <code>$pkgs</code> (a comma-separated list of packages to which the invoiced being charged applies)',
+    'type'        => 'textarea',
+  },
+
   {
     'key'         => 'bsdshellmachines',
     'section'     => 'shell',
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 0a8d4a4ae..2461e42f1 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -478,6 +478,19 @@ sub realtime_card {
   my $email = $invoicing_list[0];
 
   my( $action1, $action2 ) = split(/\s*\,\s*/, $bop_action );
+
+  my $description = 'Internet Services';
+  if ( $conf->exists('business-onlinepayment-description') ) {
+    my $dtempl = $conf->config('business-onlinepayment-description');
+
+    my $agent = $self->cust_main->agent->agent;
+    my $pkgs = join(', ',
+      map { $_->cust_pkg->part_pkg->pkg }
+        grep { $_->pkgnum } $self->cust_bill_pkg
+    );
+    $description = eval qq("$dtempl");
+
+  }
   
   my $transaction =
     new Business::OnlinePayment( $bop_processor, @bop_options );
@@ -486,7 +499,7 @@ sub realtime_card {
     'login'          => $bop_login,
     'password'       => $bop_password,
     'action'         => $action1,
-    'description'    => 'Internet Services',
+    'description'    => $description,
     'amount'         => $amount,
     'invoice_number' => $self->invnum,
     'customer_id'    => $self->custnum,
@@ -520,7 +533,7 @@ sub realtime_card {
       order_number   => $ordernum,
       amount         => $amount,
       authorization  => $auth,
-      description    => 'Internet Services',
+      description    => $description,
     );
 
     $capture->submit();
@@ -887,7 +900,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.24 2002-03-18 21:40:17 ivan Exp $
+$Id: cust_bill.pm,v 1.25 2002-04-06 22:32:43 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index b3d3fcde2..72f9ce4a9 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -125,11 +125,22 @@ sub check {
   ''; #no error
 }
 
+=item cust_pkg
+
+Returns the package (see L<FS::cust_pkg>) for this invoice line item.
+
+=cut
+
+sub cust_pkg {
+  my $self = shift;
+  qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
+}
+
 =back
 
 =head1 VERSION
 
-$Id: cust_bill_pkg.pm,v 1.2 2001-02-11 17:34:44 ivan Exp $
+$Id: cust_bill_pkg.pm,v 1.3 2002-04-06 22:32:43 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b59b0d1ac..499d149a6 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -817,6 +817,17 @@ sub cancel {
   grep { $_->cancel } $self->ncancelled_pkgs;
 }
 
+=item agent
+
+Returns the agent (see L<FS::agent>) for this customer.
+
+=cut
+
+sub agent {
+  my $self = shift;
+  qsearchs( 'agent', { 'agent' => $self->agentnum } );
+}
+
 =item bill OPTIONS
 
 Generates invoices (see L<FS::cust_bill>) for this customer.  Usually used in
-- 
cgit v1.2.1


From fca110eff969104793774ed717985e91c53f5318 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Apr 2002 00:00:41 +0000
Subject: - config option for signup server payment types - credit card type
 pulldown on signup server (closes: Bug#383)

---
 FS/FS/Conf.pm                             | 11 ++++++-
 fs_signup/FS-SignupClient/cgi/signup.cgi  | 51 ++++++++++++++++++++++++-------
 fs_signup/FS-SignupClient/cgi/signup.html | 38 ++++++++++++++++++-----
 fs_signup/fs_signup_server                |  7 +++--
 httemplate/config/config-process.cgi      |  2 +-
 httemplate/config/config-view.cgi         |  6 ++--
 httemplate/config/config.cgi              |  6 ++--
 httemplate/docs/signup.html               |  1 +
 8 files changed, 94 insertions(+), 28 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 74e28d8b1..b39c8217d 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -134,7 +134,7 @@ sub set {
   my $dir = $self->dir;
   $value =~ /^(.*)$/s;
   $value = $1;
-  unless ( $self->config($file) eq $value ) {
+  unless ( join("\n", @{[ $self->config($file) ]}) eq $value ) {
     warn "[FS::Conf] SET $file\n" if $DEBUG;
 #    warn "$dir" if is_tainted($dir);
 #    warn "$dir" if is_tainted($file);
@@ -865,6 +865,15 @@ httemplate/docs/config.html
     'select_enum' => [ qw(en_US) ],
   },
 
+  {
+    'key'         => 'signup_server-payby',
+    'section'     => '',
+    'description' => 'Acceptable payment types for the signup server',
+    'type'        => 'selectmultiple',
+    'select_enum' => [ qw(CARD PREPAY BILL COMP) ],
+  },
+
+
 );
 
 1;
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 0b2370aa6..7cf4230e6 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.17 2002-04-06 21:39:22 ivan Exp $
+# $Id: signup.cgi,v 1.18 2002-04-07 00:00:40 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -16,9 +16,10 @@ use vars qw( @payby $cgi $locales $packages $pops $init_data $error
 use subs qw( print_form print_okay expselect signup_default success_default );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
+use Text::Template;
+use Business::CreditCard;
 use HTTP::Headers::UserAgent 2.00;
 use FS::SignupClient 0.03 qw( signup_info new_customer );
-use Text::Template;
 
 #acceptable payment methods
 #
@@ -91,6 +92,7 @@ if ( -e $success_html ) {
 }
 
 ( $locales, $packages, $pops, $init_data ) = signup_info();
+@payby = @{$init_data->{'payby'}} if @{$init_data->{'payby'}};
 
 $cgi = new CGI;
 
@@ -118,13 +120,18 @@ if ( defined $cgi->param('magic') ) {
     $error = '';
 
     if ( $cgi->param('_password') ne $cgi->param('_password2') ) {
-      $error = "Passwords don't match";
+      $error = "Passwords don't match"; #msgcat
       $password  = '';
       $password2 = '';
     } else {
       $password2 = $cgi->param('_password2');
 
-      $error = new_customer ( {
+      if ( $payby eq 'CARD' && $cgi->param('CARD_type')
+           && cardtype($payinfo) ne $cgi->param('CARD_type') ) {
+        $error = 'Not an '. $cgi->param('CARD_type'). '| - is: |'. cardtype($payinfo). '|'; #msgcat
+      }
+
+      $error ||= new_customer ( {
         'last'             => $last             = $cgi->param('last'),
         'first'            => $first            = $cgi->param('first'),
         'ss'               => $ss               = $cgi->param('ss'),
@@ -428,31 +435,53 @@ Contact Information
 </TD></TR>
 <TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="<%= join(', ', grep { $_ ne 'POST' } split(', ', $invoicing_list ) ) %>">
 </TD></TR>
-<TR><TD>Billing type</TD></TR></TABLE>
+<%= scalar(@payby) > 1 ? '<TR><TD>Billing type</TD></TR>' : '' %>
+</TABLE>
 <TABLE BGCOLOR="#c0c0c0" BORDER=1 WIDTH="100%">
 <TR>
 
   <%=
+
+    my $cardselect = '<SELECT NAME="CARD_type"><OPTION></OPTION>';
+    my %types = (
+                  'VISA' => 'VISA card',
+                  'MasterCard' => 'MasterCard',
+                  'Discover' => 'Discover card',
+                  'American Express' => 'American Express card',
+                );
+    foreach ( keys %types ) {
+      $selected = $cgi->param('CARD_type') eq $types{$_} ? 'SELECTED' : '';
+      $cardselect .= qq!<OPTION $selected VALUE="$types{$_}">$_</OPTION>!;
+    }
+    $cardselect .= '</SELECT>';
+  
     my %payby = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
       'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", "12-2037"). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
       'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
       'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
     );
 
     my %paybychecked = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
       'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", $paydate). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
       'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
       'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
     );
 
     for (@payby) {
-      $OUT .= qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
-      if ($payby eq $_) {
-        $OUT .= qq! CHECKED> $paybychecked{$_}</TD>!;
+      if ( scalar(@payby) == 1) {
+        $OUT .= '<TD VALIGN=TOP>'.
+                qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$_">!.
+                "$paybychecked{$_}</TD>";
       } else {
-        $OUT .= qq!> $payby{$_}</TD>!;
+        $OUT .= qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
+        if ($payby eq $_) {
+          $OUT .= qq! CHECKED> $paybychecked{$_}</TD>!;
+        } else {
+          $OUT .= qq!> $payby{$_}</TD>!;
+        }
+
       }
     }
   %>
diff --git a/fs_signup/FS-SignupClient/cgi/signup.html b/fs_signup/FS-SignupClient/cgi/signup.html
index b97511e97..5d2f2d9c9 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.html
+++ b/fs_signup/FS-SignupClient/cgi/signup.html
@@ -75,31 +75,53 @@ Contact Information
 </TD></TR>
 <TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="<%= join(', ', grep { $_ ne 'POST' } split(', ', $invoicing_list ) ) %>">
 </TD></TR>
-<TR><TD>Billing type</TD></TR></TABLE>
+<%= scalar(@payby) > 1 ? '<TR><TD>Billing type</TD></TR>' : '' %>
+</TABLE>
 <TABLE BGCOLOR="#c0c0c0" BORDER=1 WIDTH="100%">
 <TR>
 
   <%=
+
+    my $cardselect = '<SELECT NAME="CARD_type"><OPTION></OPTION>';
+    my %types = (
+                  'VISA' => 'VISA card',
+                  'MasterCard' => 'MasterCard',
+                  'Discover' => 'Discover card',
+                  'American Express' => 'American Express card',
+                );
+    foreach ( keys %types ) {
+      $selected = $cgi->param('CARD_type') eq $types{$_} ? 'SELECTED' : '';
+      $cardselect .= qq!<OPTION $selected VALUE="$types{$_}">$_</OPTION>!;
+    }
+    $cardselect .= '</SELECT>';
+  
     my %payby = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
       'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", "12-2037"). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
       'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
       'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
     );
 
     my %paybychecked = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
       'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", $paydate). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
       'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
       'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
     );
 
     for (@payby) {
-      $OUT .= qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
-      if ($payby eq $_) {
-        $OUT .= qq! CHECKED> $paybychecked{$_}</TD>!;
+      if ( scalar(@payby) == 1) {
+        $OUT .= '<TD VALIGN=TOP>'.
+                qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$_">!.
+                "$paybychecked{$_}</TD>";
       } else {
-        $OUT .= qq!> $payby{$_}</TD>!;
+        $OUT .= qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
+        if ($payby eq $_) {
+          $OUT .= qq! CHECKED> $paybychecked{$_}</TD>!;
+        } else {
+          $OUT .= qq!> $payby{$_}</TD>!;
+        }
+
       }
     }
   %>
@@ -126,7 +148,7 @@ Contact Information
 </TR>
 <TR>
   <TD ALIGN="right">Password</TD>
-  <TD><INPUT TYPE="text" NAME="_password" VALUE="<%= $password %>">
+  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>">
   (blank to generate)</TD>
 </TR>
 <TR>
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 4c06946c6..b902d9ff4 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -18,13 +18,14 @@ use vars qw( $opt $Debug );
 
 $Debug = 2;
 
-my @payby = qw(CARD PREPAY);
-
 my $user = shift or die &usage;
 &adminsuidsetup( $user ); 
 
 my $conf = new FS::Conf;
 
+#my @payby = qw(CARD PREPAY);
+my @payby = $conf->config('signup_server-payby');
+
 my $machine = shift or die &usage;
 
 my $agentnum = shift or die &usage;
@@ -64,6 +65,8 @@ while (1) {
 
     'security_phrase' => $conf->exists('security_phrase'),
 
+    'payby' => [ $conf->config('signup_server-payby') ],
+
   };
 
   warn "[fs_signup_server] Sending init data...\n" if $Debug;
diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
index 38d9af0db..259713260 100644
--- a/httemplate/config/config-process.cgi
+++ b/httemplate/config/config-process.cgi
@@ -34,7 +34,7 @@
         }
       } elsif ( $type eq 'editlist' || $type eq 'selectmultiple' )  {
         if ( scalar(@{[ $cgi->param($i->key. $n) ]}) ) {
-          $conf->set($i->key, join("\n", $cgi->param($i->key. $n) ));
+          $conf->set($i->key, join("\n", @{[ $cgi->param($i->key. $n) ]} ));
         } else {
           $conf->delete($i->key);
         }
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index d40c4dc10..f0ae2b2fd 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -37,7 +37,9 @@
              my $n = 0; %>
           <% if ( $type eq '' ) { %>
             <tr><td><font color="#ff0000">no type</font></td></tr>
-          <% } elsif ( $type eq 'textarea' || $type eq 'editlist' ) { %>
+          <% } elsif (   $type eq 'textarea'
+                      || $type eq 'editlist'
+                      || $type eq 'selectmultiple' ) { %>
             <tr><td bgcolor="#ffffff">
 <pre>
 <%= encode_entities(join("\n", $conf->config($i->key) ) ) %>
@@ -46,7 +48,7 @@
           <% } elsif ( $type eq 'checkbox' ) { %>
             <tr><td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td></tr>
           <% } elsif ( $type eq 'text' || $type eq 'select' )  { %>
-            <tr><td bgcolor="#ffffff"><%=  $conf->exists($i->key) ? $conf->config($i->key) : '' %></td></tr>
+            <tr><td bgcolor="#ffffff"><%= $conf->exists($i->key) ? $conf->config($i->key) : '' %></td></tr>
           <% } else { %>
             <tr><td>
               <font color="#ff0000">unknown type <%= $type %></font>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 4f19ee961..2817e5f84 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -62,12 +62,12 @@ function SafeOnsubmit() {
             <input name="<%= $i->key. $n %>" type="checkbox" value="1"<%= $conf->exists($i->key) ? ' CHECKED' : '' %>>
           <% } elsif ( $type eq 'text' )  { %>
             <input name="<%= $i->key. $n %>" type="<%= $type %>" value="<%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>">
-          <% } elsif ( $type eq 'select' )  { %>
-            <select name="<%= $i->key. $n %>">
+          <% } elsif ( $type eq 'select' || $type eq 'selectmultiple' )  { %>
+            <select name="<%= $i->key. $n %>" <%= $type eq 'selectmultiple' ? 'MULTIPLE' : '' %>>
               <% my %saw;
                  foreach my $value ( "", @{$i->select_enum} ) {
                     local($^W)=0; next if $saw{$value}++; %>
-                <option value="<%= $value %>"<%= $value eq $conf->config($i->key) ? ' SELECTED' : '' %>><%= $value %>
+                <option value="<%= $value %>"<%= $value eq $conf->config($i->key) || ( $type eq 'selectmultiple' && grep { $_ eq $value } $conf->config($i->key) ) ? ' SELECTED' : '' %>><%= $value %>
               <% } %>
               <% if ( $conf->exists($i->key) && $conf->config($i->key) && ! grep { $conf->config($i->key) eq $_ } @{$i->select_enum}) { %>
                 <option value=<%= $conf->config($i->key) %> SELECTED><%= conf->config($i->key) %>
diff --git a/httemplate/docs/signup.html b/httemplate/docs/signup.html
index e7472158a..117cf2947 100644
--- a/httemplate/docs/signup.html
+++ b/httemplate/docs/signup.html
@@ -11,6 +11,7 @@ webserver.  On this machine, install:
   <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
   <li><a href="http://search.cpan.org/search?dist=Text-Template">Text::Template</a>
   <li><a href="http://search.cpan.org/search?dist=Storable">Storable</a>
+  <li><a href="http://search.cpan.org/search?dist=Business-CreditCard">Business-CreditCard</a>
   <li><a href="http://www.sisd.com/useragent">HTTP::Headers::UserAgent</a> (version 2.0 or higher; not yet indexed correctly on CPAN)
 
   <li><a href="man/FS/SignupClient.html">FS::SignupClient</a> (copy the fs_signup/FS-SignupClient directory to the external machine, then: perl Makefile.PL; make; make install)
-- 
cgit v1.2.1


From 44e3eff0aa6e7bdb7f4ecd9ee1ddf141e1b68af3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Apr 2002 05:56:09 +0000
Subject: working message catalogs (not used for enough yet) - almost (but not
 quite) closes Bug#385 - still have to catalog the   backend things triggered
 by signup server.

---
 FS/FS/Conf.pm                            |  6 ++++
 FS/FS/msgcat.pm                          | 11 ++++--
 bin/populate-msgcat                      | 25 +++++++++++---
 conf/show-msgcat-codes                   |  0
 fs_signup/FS-SignupClient/cgi/signup.cgi | 17 +++++++---
 fs_signup/fs_signup_server               |  5 +++
 httemplate/browse/msgcat.cgi             |  4 +--
 httemplate/docs/install.html             |  5 +++
 httemplate/edit/msgcat.cgi               | 57 ++++++++++++++++++++++++++++++++
 httemplate/edit/process/msgcat.cgi       | 19 +++++++++++
 10 files changed, 134 insertions(+), 15 deletions(-)
 create mode 100644 conf/show-msgcat-codes
 create mode 100755 httemplate/edit/msgcat.cgi
 create mode 100644 httemplate/edit/process/msgcat.cgi

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index b39c8217d..6e588208a 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -873,6 +873,12 @@ httemplate/docs/config.html
     'select_enum' => [ qw(CARD PREPAY BILL COMP) ],
   },
 
+  {
+    'key'         => 'show-msgcat-codes',
+    'section'     => 'UI',
+    'description' => 'Show msgcat codes in error messages.  Turn this option on before reporting errors to the mailing list.',
+    'type'        => 'checkbox',
+  },
 
 );
 
diff --git a/FS/FS/msgcat.pm b/FS/FS/msgcat.pm
index 53a7aeee6..3eca14b83 100644
--- a/FS/FS/msgcat.pm
+++ b/FS/FS/msgcat.pm
@@ -1,7 +1,7 @@
 package FS::msgcat;
 
 use strict;
-use vars qw( @ISA @EXPORT_OK $conf $locale );
+use vars qw( @ISA @EXPORT_OK $conf $locale $debug );
 use Exporter;
 use FS::UID;
 use FS::Record qw( qsearchs );
@@ -13,6 +13,7 @@ use FS::Conf;
 $FS::UID::callback{'msgcat'} = sub {
   $conf = new FS::Conf;
   $locale = $conf->config('locale') || 'en_US';
+  $debug = $conf->exists('show-msgcat-codes')
 };
 
 =head1 NAME
@@ -140,6 +141,10 @@ Returns the full message for the supplied message code.
 =cut
 
 sub gettext {
+  $debug ? geterror(@_) : _gettext(@_);
+}
+
+sub _gettext {
   my $msgcode = shift;
   my $msgcat = qsearchs('msgcat', {
     'msgcode' => $msgcode,
@@ -163,7 +168,7 @@ code.
 
 sub geterror {
   my $msgcode = shift;
-  my $msg = gettext($msgcode);
+  my $msg = _gettext($msgcode);
   if ( $msg eq $msgcode ) {
     "Error code $msgcode (message for locale $locale not found)";
   } else {
@@ -175,7 +180,7 @@ sub geterror {
 
 =head1 BUGS
 
-i18n/l10n is a mess.
+i18n/l10n, eek
 
 =head1 SEE ALSO
 
diff --git a/bin/populate-msgcat b/bin/populate-msgcat
index fa88732ce..51f04c10f 100755
--- a/bin/populate-msgcat
+++ b/bin/populate-msgcat
@@ -1,23 +1,26 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -Tw
 
+use strict;
 use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch);
 use FS::msgcat;
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
 
-foreach my $del_msgcat ( qsearchs('msgcat', {}) ) {
+foreach my $del_msgcat ( qsearch('msgcat', {}) ) {
   my $error = $del_msgcat->delete;
   die $error if $error;
 }
 
 my %messages = messages();
 
-foreach $msgcode ( keys %messages ) {
+foreach my $msgcode ( keys %messages ) {
   foreach my $locale ( keys %{$messages{$msgcode}} ) {
     my $msgcat = new FS::msgcat( {
       'msgcode' => $msgcode,
       'locale'  => $locale,
+      'msg'     => $messages{$msgcode}{$locale},
     });
     my $error = $msgcat->insert;
     die $error if $error;
@@ -32,8 +35,20 @@ sub messages {
 
   (
 
-    'msgcode' => {
-      'en_US' => 'Message',
+    'passwords_dont_match' => {
+      'en_US' => "Passwords don't match",
+    },
+
+    'invalid_card' => {
+      'en_US' => 'Invalid credit card number',
+    },
+
+    'unknown_card_type' => {
+      'en_US' => 'Unknown card type',
+    },
+
+    'not_a' => {
+      'en_US' => 'Not a ',
     },
 
   );
diff --git a/conf/show-msgcat-codes b/conf/show-msgcat-codes
new file mode 100644
index 000000000..e69de29bb
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 7cf4230e6..46621d1e8 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.18 2002-04-07 00:00:40 ivan Exp $
+# $Id: signup.cgi,v 1.19 2002-04-07 05:56:08 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -120,15 +120,22 @@ if ( defined $cgi->param('magic') ) {
     $error = '';
 
     if ( $cgi->param('_password') ne $cgi->param('_password2') ) {
-      $error = "Passwords don't match"; #msgcat
+      $error = $init_data->{msgcat}{passwords_dont_match}; #msgcat
       $password  = '';
       $password2 = '';
     } else {
       $password2 = $cgi->param('_password2');
 
-      if ( $payby eq 'CARD' && $cgi->param('CARD_type')
-           && cardtype($payinfo) ne $cgi->param('CARD_type') ) {
-        $error = 'Not an '. $cgi->param('CARD_type'). '| - is: |'. cardtype($payinfo). '|'; #msgcat
+      if ( $payby eq 'CARD' && $cgi->param('CARD_type') ) {
+        $payinfo =~ s/\D//g;
+
+        $payinfo =~ /^(\d{13,16})$/
+          or $error ||= $init_data->{msgcat}{invalid_card}; #. $self->payinfo;
+        $payinfo = $1;
+        validate($payinfo)
+          or $error ||= $init_data->{msgcat}{invalid_card}; #. $self->payinfo;
+        cardtype($payinfo) eq $cgi->param('CARD_type')
+          or $error ||= $init_data->{msgcat}{not_a}. $cgi->param('CARD_type');
       }
 
       $error ||= new_customer ( {
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index b902d9ff4..f3030e9ae 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -13,6 +13,7 @@ use FS::Conf;
 use FS::Record qw( qsearch qsearchs );
 use FS::cust_main_county;
 use FS::cust_main;
+use FS::msgcat qw(gettext);
 
 use vars qw( $opt $Debug );
 
@@ -67,6 +68,10 @@ while (1) {
 
     'payby' => [ $conf->config('signup_server-payby') ],
 
+    'msgcat' => { map { $_=>gettext($_) } qw(
+      passwords_dont_match invalid_card unknown_card_type not_a
+    ) }
+
   };
 
   warn "[fs_signup_server] Sending init data...\n" if $Debug;
diff --git a/httemplate/browse/msgcat.cgi b/httemplate/browse/msgcat.cgi
index 5dab5cfc9..774473b36 100755
--- a/httemplate/browse/msgcat.cgi
+++ b/httemplate/browse/msgcat.cgi
@@ -18,8 +18,8 @@ my $widget = new HTML::Widgets::SelectLayers(
     $html .= '</TR>';
 
     #foreach my $msgcat ( sort { $a->msgcode cmp $b->msgcode }
-    #                       qsearchs('msgcat', { 'locale' => $layer } ) ) {
-    foreach my $msgcat ( qsearchs('msgcat', { 'locale' => $layer } ) ) {
+    #                       qsearch('msgcat', { 'locale' => $layer } ) ) {
+    foreach my $msgcat ( qsearch('msgcat', { 'locale' => $layer } ) ) {
       $html .= '<TR><TD>'. $msgcat->msgnum. '</TD>'.
                '<TD>'. $msgcat->msgcode. '</TD>'.
                '<TD>'. $msgcat->msg. '</TD>';
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 2ad75b15e..4870c7db7 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -180,6 +180,11 @@ $ <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -h /usr/local/etc
 <pre>
 $ su freeside
 $ bin/fs-setup <b>username</b>
+</pre>
+  <li>As the freeside UNIX user, run <tt>bin/populate-msgcat <b>username</b></tt> to populate the message catalog, passing the username of a Freeside user you created above:
+<pre>
+$ su freeside
+$ bin/populate-msgcat <b>username</b>
 </pre>
   <li><tt>freeside-queued</tt> was installed with the Perl modules.  Start it now and ensure that is run upon system startup.
   <li>Now proceed to the initial <a href="admin.html">administration</a> of your installation.
diff --git a/httemplate/edit/msgcat.cgi b/httemplate/edit/msgcat.cgi
new file mode 100755
index 000000000..5d256c05b
--- /dev/null
+++ b/httemplate/edit/msgcat.cgi
@@ -0,0 +1,57 @@
+<!-- mason kludge -->
+<%
+
+print header("Message catalog", menubar(
+#  'Main Menu' => $p,
+)), '<BR>';
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !. $cgi->param('error')
+  if $cgi->param('error');
+
+my $widget = new HTML::Widgets::SelectLayers(
+  'selected_layer' => 'en_US',
+  'options'        => { 'en_US'=>'en_US' },
+  'form_action'    => 'process/msgcat.cgi',
+  'layer_callback' => sub {
+    my $layer = shift;
+    my $html = qq!<INPUT TYPE="hidden" NAME="locale" VALUE="$layer">!.
+               "<BR>Messages for locale $layer<BR>". table().
+               "<TR><TH COLSPAN=2>Code</TH>".
+               "<TH>Message</TH>";
+    $html .= "<TH>en_US Message</TH>" unless $layer eq 'en_US';
+    $html .= '</TR>';
+
+    #foreach my $msgcat ( sort { $a->msgcode cmp $b->msgcode }
+    #                       qsearch('msgcat', { 'locale' => $layer } ) ) {
+    foreach my $msgcat ( qsearch('msgcat', { 'locale' => $layer } ) ) {
+      $html .=
+        '<TR><TD>'. $msgcat->msgnum. '</TD><TD>'. $msgcat->msgcode. '</TD>'.
+        '<TD><INPUT TYPE="text" SIZE=32 '.
+        qq! NAME="!. $msgcat->msgnum. '" '.
+        qq!VALUE="!. $msgcat->msg. qq!"></TD>!;
+      unless ( $layer eq 'en_US' ) {
+        my $en_msgcat = qsearchs('msgcat', {
+          'locale'  => 'en_US',
+          'msgcode' => $msgcat->msgcode,
+        } );
+        $html .= '<TD>'. $en_msgcat->msg. '</TD>';
+      }
+      $html .= '</TR>';
+    }
+
+    $html .= '</TABLE><BR><INPUT TYPE="submit" VALUE="Apply changes">';
+
+    $html;
+  },
+
+);
+
+print $widget->html;
+
+print <<END;
+    </TABLE>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/process/msgcat.cgi b/httemplate/edit/process/msgcat.cgi
new file mode 100644
index 000000000..ab30f06b5
--- /dev/null
+++ b/httemplate/edit/process/msgcat.cgi
@@ -0,0 +1,19 @@
+<%
+
+my $error;
+foreach my $param ( grep { /^\d+$/ } $cgi->param ) {
+  my $old = qsearchs('msgcat', { msgnum=>$param } );
+  my $new = new FS::msgcat { $old->hash };
+  $new->msg($cgi->param($param));
+  $error = $new->replace($old);
+  last if $error;
+}
+
+if ( $error ) {
+  $cgi->param('error',$error);
+  print $cgi->redirect($p. "msgcat.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "browse/msgcat.cgi");
+}
+
+%>
-- 
cgit v1.2.1


From 17544eafba683f48cdc64fef09745d17be9b088a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Apr 2002 06:23:29 +0000
Subject: send email on signup server signups (closes: Bug#386)

---
 FS/FS/Conf.pm              |  8 ++++++++
 FS/FS/cust_bill.pm         |  4 ++--
 FS/FS/cust_pay.pm          |  6 +++---
 fs_signup/fs_signup_server | 38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 6e588208a..14dce1abf 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -873,6 +873,14 @@ httemplate/docs/config.html
     'select_enum' => [ qw(CARD PREPAY BILL COMP) ],
   },
 
+  {
+    'key'         => 'signup_server-email',
+    'section'     => '',
+    'description' => 'Comma-separated list of email addresses to receive notification of signups via the signup server.',
+    'type'        => 'text',
+  },
+
+
   {
     'key'         => 'show-msgcat-codes',
     'section'     => 'UI',
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 2461e42f1..1f402fca4 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -373,7 +373,7 @@ sub send {
   #my @print_text = $cust_bill->print_text; #( date )
   my @invoicing_list = $self->cust_main->invoicing_list;
   if ( grep { $_ ne 'POST' } @invoicing_list ) { #email invoice
-    #false laziness w/FS::cust_pay::delete
+    #false laziness w/FS::cust_pay::delete & fs_signup_server
     #$ENV{SMTPHOSTS} = $smtpmachine;
     $ENV{MAILADDRESS} = $invoice_from;
     my $header = new Mail::Header ( [
@@ -900,7 +900,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.25 2002-04-06 22:32:43 ivan Exp $
+$Id: cust_bill.pm,v 1.26 2002-04-07 06:23:29 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 421f0200e..ac60dc242 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -264,8 +264,8 @@ sub delete {
   if ( $conf->config('deletepayments') ne '' ) {
 
     my $cust_main = qsearchs('cust_main',{ 'custnum' => $self->custnum });
-    #false laziness w/FS::cust_bill::send
-    $ENV{MAILADDRESS} = $conf->config('invoice_from'); #??? well as good as any
+    #false laziness w/FS::cust_bill::send & fs_signup_server
+    $ENV{MAILADDRESS} = $invoice_from; #??? well as good as any
     my $header = new Mail::Header ( [
       "From: $invoice_from",
       "To: ". $conf->config('deletepayments'),
@@ -405,7 +405,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.18 2002-03-18 19:49:10 ivan Exp $
+$Id: cust_pay.pm,v 1.19 2002-04-07 06:23:29 ivan Exp $
 
 =head1 BUGS
 
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index f3030e9ae..871bbdf1b 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -26,6 +26,7 @@ my $conf = new FS::Conf;
 
 #my @payby = qw(CARD PREPAY);
 my @payby = $conf->config('signup_server-payby');
+my $smtpmachine = $conf->config('smtpmachine');
 
 my $machine = shift or die &usage;
 
@@ -154,6 +155,43 @@ while (1) {
     warn "[fs_signup_server] Sending results...\n" if $Debug;
     print $writer $error, "\n";
 
+    if ( $error && $conf->config('signup_server-email') ) {
+      warn "[fs_signup_server] Sending email...\n" if $Debug;
+
+      #false laziness w/FS::cust_bill::send & FS::cust_pay::delete
+      use Mail::Header;
+      use Mail::Internet;
+      my $from = $conf->config('invoice_from'); #??? as good as any
+      $ENV{MAILADDRESS} = $from;
+      my $header = new Mail::Header ( [
+        "From: $from",
+        "To: ". $conf->config('signup_server-email'),
+        "Sender: $from",
+        "Reply-To: $from",
+        "Date: ". time2str("%a, %d %b %Y %X %z", time),
+        "Subject: FREESIDE NOTIFICATION: Signup Server",
+      ] );
+      my $message = new Mail::Internet (
+        'Header' => $header,
+        'Body' => [ 
+          "This is an automatic message from your Freeside installation\n",
+          "informing you a customer has signed up via the signup server:\n",
+          "\n",
+          'custnum: '. $cust_main->custnum. "\n",
+          'Name   : '. $cust_main->last. ", ". $cust_main->first. "\n",
+          'Agent  : '. $cust_main->agent->agent. "\n",
+          "\n",
+        ],
+      );
+      $!=0;
+      $message->smtpsend( Host => $smtpmachine )
+        or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
+          or warn "[fs_signup_server] can't send email to ".
+                   $conf->config('signup_server-email').
+                   " via server $smtpmachine with SMTP: $!";
+      #end-of-send mail
+    }
+
   }
   close $writer;
   close $reader;
-- 
cgit v1.2.1


From fd597aef277c522889a849d78dc7dcae67d00d95 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Apr 2002 08:39:47 +0000
Subject: fix mistake in part_pop_local schema (not used by anyone really so no
 big deal)

---
 bin/fs-setup | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 55edeb6dd..2da0431bb 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.85 2002-04-05 23:51:17 ivan Exp $
+# $Id: fs-setup,v 1.86 2002-04-10 08:39:47 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -742,9 +742,9 @@ sub tables_hash_hack {
         'npa',       'char',    '',     3,
         'nxx',       'char',    '',     3,
       ],
-      'primary_key' => 'popnum',
+      'primary_key' => 'localnum',
       'unique' => [ [] ],
-      'index' => [ [ 'npa', 'nxx' ] ],
+      'index' => [ [ 'npa', 'nxx' ], [ 'popnum' ] ],
     },
 
     'svc_acct' => {
-- 
cgit v1.2.1


From 0b65ce59c7d2ee712389c27954382274ddf718a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Apr 2002 13:42:49 +0000
Subject: bulk checkin from working on the road:

- use msgcat for more error messages - should be all things that would come3
  back from the signup server normally now
- signup server: don't display access number <SELECT> if there's none or one
- signup_server-realtime config option to run billing for signup server
  signups immediately
- signup server: pkg available to success templates, better documentation on
  success templates
- httemplate/edit/msgcat.cgi fields are properly sticky on errors
- httemplate/edit/process/msgcat.cgi - don't update identical fields
---
 ANNOUCE.1.4.0                              |  3 +-
 FS/FS/Conf.pm                              | 11 +++++-
 FS/FS/Record.pm                            | 14 ++++----
 FS/FS/cust_main.pm                         | 13 ++++---
 FS/FS/cust_main_invoice.pm                 | 15 ++++----
 FS/FS/svc_acct.pm                          | 17 ++++-----
 FS/FS/svc_acct_pop.pm                      |  8 +++--
 README.1.4.0pre12                          |  2 ++
 bin/populate-msgcat                        | 51 +++++++++++++++++++++++++++
 fs_signup/FS-SignupClient/cgi/signup.cgi   | 39 +++++++++++++++------
 fs_signup/FS-SignupClient/cgi/signup.html  | 18 +++++-----
 fs_signup/FS-SignupClient/cgi/success.html |  7 ++++
 fs_signup/fs_signup_server                 | 55 +++++++++++++++++++++---------
 httemplate/browse/msgcat.cgi               |  2 +-
 httemplate/docs/signup.html                | 32 +++++++----------
 httemplate/docs/upgrade8.html              |  1 +
 httemplate/edit/msgcat.cgi                 |  7 ++--
 httemplate/edit/process/msgcat.cgi         |  1 +
 18 files changed, 210 insertions(+), 86 deletions(-)

diff --git a/ANNOUCE.1.4.0 b/ANNOUCE.1.4.0
index c1da9dd4c..86f48b6df 100644
--- a/ANNOUCE.1.4.0
+++ b/ANNOUCE.1.4.0
@@ -117,5 +117,6 @@ new export! (well, almost)
 
 icradius groups (usergroup table if not radgroupreply & radgroupcheck)
 
-message catalogs (infrastructure, anyway)
+message catalogs (infrastructure, anyway) & anything which gets sent to a
+customer from the signup server should use message catalog
 
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 14dce1abf..0c41980ea 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -272,7 +272,7 @@ httemplate/docs/config.html
     'key'         => 'business-onlinepayment-description',
     'section'     => 'billing',
     'description' => 'String passed as the description field to <a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a>.  Evaluated as a double-quoted perl string, with the following variables available: <code>$agent</code> (the agent name), and <code>$pkgs</code> (a comma-separated list of packages to which the invoiced being charged applies)',
-    'type'        => 'textarea',
+    'type'        => 'text',
   },
 
   {
@@ -888,6 +888,15 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'signup_server-realtime',
+    'section'     => '',
+    'description' => 'Run billing for signup server signups immediately, and suspend accounts which subsequently have a balance.',
+    'type'        => 'checkbox',
+  },
+
+
+
 );
 
 1;
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index ff967817a..acdebcadc 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -12,6 +12,7 @@ use DBI qw(:sql_types);
 use DBIx::DBSchema 0.19;
 use FS::UID qw(dbh checkruid getotaker datasrc driver_name);
 use FS::SearchCache;
+use FS::msgcat qw(gettext);
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(dbh fields hfields qsearch qsearchs dbdef jsearch);
@@ -825,7 +826,8 @@ false.
 sub ut_text {
   my($self,$field)=@_;
   $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/]+)$/
-    or return "Illegal or empty (text) $field: ". $self->getfield($field);
+    or return gettext('illegal_or_empty_text'). " $field: ".
+              $self->getfield($field);
   $self->setfield($field,$1);
   '';
 }
@@ -841,7 +843,7 @@ May be null.  If there is an error, returns the error, otherwise returns false.
 sub ut_textn {
   my($self,$field)=@_;
   $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/]*)$/
-    or return "Illegal (text) $field: ". $self->getfield($field);
+    or return gettext('illegal_text'). " $field: ". $self->getfield($field);
   $self->setfield($field,$1);
   '';
 }
@@ -896,7 +898,7 @@ sub ut_phonen {
   } elsif ( $country eq 'US' || $country eq 'CA' ) {
     $phonen =~ s/\D//g;
     $phonen =~ /^(\d{3})(\d{3})(\d{4})(\d*)$/
-      or return "Illegal (phone) $field: ". $self->getfield($field);
+      or return gettext('illegal_phone'). " $field: ". $self->getfield($field);
     $phonen = "$1-$2-$3";
     $phonen .= " x$4" if $4;
     $self->setfield($field,$phonen);
@@ -965,7 +967,7 @@ May not be null.
 sub ut_name {
   my( $self, $field ) = @_;
   $self->getfield($field) =~ /^([\w \,\.\-\']+)$/
-    or return "Illegal (name) $field: ". $self->getfield($field);
+    or return gettext('illegal_name'). " $field: ". $self->getfield($field);
   $self->setfield($field,$1);
   '';
 }
@@ -980,12 +982,12 @@ sub ut_zip {
   my( $self, $field, $country ) = @_;
   if ( $country eq 'US' ) {
     $self->getfield($field) =~ /\s*(\d{5}(\-\d{4})?)\s*$/
-      or return "Illegal (zip) $field for country $country: ".
+      or return gettext('illegal_zip'). " $field for country $country: ".
                 $self->getfield($field);
     $self->setfield($field,$1);
   } else {
     $self->getfield($field) =~ /^\s*(\w[\w\-\s]{2,8}\w)\s*$/
-      or return "Illegal (zip) $field: ". $self->getfield($field);
+      or return gettext('illegal_zip'). " $field: ". $self->getfield($field);
     $self->setfield($field,$1);
   }
   '';
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 499d149a6..e1a51732f 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -26,6 +26,7 @@ use FS::queue;
 use FS::part_pkg;
 use FS::part_bill_event;
 use FS::cust_bill_event;
+use FS::msgcat qw(gettext);
 
 @ISA = qw( FS::Record );
 
@@ -643,12 +644,13 @@ sub check {
     my $payinfo = $self->payinfo;
     $payinfo =~ s/\D//g;
     $payinfo =~ /^(\d{13,16})$/
-      or return "Illegal credit card number: ". $self->payinfo;
+      or return gettext('invalid_catd'); # . ": ". $self->payinfo;
     $payinfo = $1;
     $self->payinfo($payinfo);
     validate($payinfo)
-      or return "Illegal credit card number: ". $self->payinfo;
-    return "Unknown card type" if cardtype($self->payinfo) eq "Unknown";
+      or return gettext('invalid_catd'); # . ": ". $self->payinfo;
+    return gettext('unknown_card_type')
+      if cardtype($self->payinfo) eq "Unknown";
 
   } elsif ( $self->payby eq 'BILL' ) {
 
@@ -690,7 +692,7 @@ sub check {
     $self->payname( $self->first. " ". $self->getfield('last') );
   } else {
     $self->payname =~ /^([\w \,\.\-\']+)$/
-      or return "Illegal billing name: ". $self->payname;
+      or return gettext('illegal_name'). " payname: ". $self->payname;
     $self->payname($1);
   }
 
@@ -1153,6 +1155,9 @@ sub collect {
           qsearch('part_bill_event', { 'payby'    => $self->payby,
                                        'disabled' => '',           } )
     ) {
+
+      last unless $cust_bill->owed > 0; #don't run subsequent events if owed=0
+
       warn "calling invoice event (". $part_bill_event->eventcode. ")\n"
         if $Debug;
       my $cust_main = $self; #for callback
diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm
index ebbadc6d9..b82e2e732 100644
--- a/FS/FS/cust_main_invoice.pm
+++ b/FS/FS/cust_main_invoice.pm
@@ -7,6 +7,7 @@ use FS::Record qw( qsearchs );
 use FS::Conf;
 use FS::cust_main;
 use FS::svc_acct;
+use FS::msgcat qw(gettext);
 
 @ISA = qw( FS::Record );
 
@@ -111,10 +112,12 @@ sub check {
 
 =item checkdest
 
-Checks the dest field only.  If it finds that the account ends in the
-same domain configured as the B<domain> configuration file, it will change the
-invoice destination from an email address to a service number (see
-L<FS::svc_acct>).
+Checks the dest field only.
+
+#If it finds that the account ends in the
+#same domain configured as the B<domain> configuration file, it will change the
+#invoice destination from an email address to a service number (see
+#L<FS::svc_acct>).
 
 =cut
 
@@ -140,7 +143,7 @@ sub checkdest {
 #    }
     $self->dest("$1\@$2");
   } else {
-    return "Illegal destination!";
+    return gettext("illegal_email_invoice_address");
   }
 
   ''; #no error
@@ -167,7 +170,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.10 2002-02-10 17:02:37 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.11 2002-04-10 13:42:48 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 8e25f6afc..030ffbe19 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -28,6 +28,7 @@ use FS::svc_domain;
 use FS::raddb;
 use FS::queue;
 use FS::radius_usergroup;
+use FS::msgcat qw(gettext);
 
 @ISA = qw( FS::svc_Common );
 
@@ -262,7 +263,7 @@ sub insert {
   $error = $self->check;
   return $error if $error;
 
-  return "Username ". $self->username. " in use"
+  return gettext('username_in_use'). ": ". $self->username
     if qsearchs( 'svc_acct', { 'username' => $self->username,
                                'domsvc'   => $self->domsvc,
                              } );
@@ -1088,24 +1089,24 @@ sub check {
   my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;
   if ( $username_uppercase ) {
     $recref->{username} =~ /^([a-z0-9_\-\.\&]{$usernamemin,$ulen})$/i
-      or return "Illegal username: ". $recref->{username};
+      or return gettext('illegal_username'). ": ". $recref->{username};
     $recref->{username} = $1;
   } else {
     $recref->{username} =~ /^([a-z0-9_\-\.\&]{$usernamemin,$ulen})$/
-      or return "Illegal username: ". $recref->{username};
+      or return gettext('illegal_username'). ": ". $recref->{username};
     $recref->{username} = $1;
   }
 
   if ( $username_letterfirst ) {
-    $recref->{username} =~ /^[a-z]/ or return "Illegal username";
+    $recref->{username} =~ /^[a-z]/ or return gettext('illegal_username');
   } elsif ( $username_letter ) {
-    $recref->{username} =~ /[a-z]/ or return "Illegal username";
+    $recref->{username} =~ /[a-z]/ or return gettext('illegal_username');
   }
   if ( $username_noperiod ) {
-    $recref->{username} =~ /\./ and return "Illegal username";
+    $recref->{username} =~ /\./ and return gettext('illegal_username');
   }
   unless ( $username_ampersand ) {
-    $recref->{username} =~ /\&/ and return "Illegal username";
+    $recref->{username} =~ /\&/ and return gettext('illegal_username');
   }
 
   $recref->{popnum} =~ /^(\d*)$/ or return "Illegal popnum: ".$recref->{popnum};
@@ -1221,7 +1222,7 @@ sub check {
     $recref->{_password} = '!!';
   } else {
     #return "Illegal password";
-    return "Illegal password: ". $recref->{_password};
+    return gettext('illegal_password'). ": ". $recref->{_password};
   }
 
   ''; #no error
diff --git a/FS/FS/svc_acct_pop.pm b/FS/FS/svc_acct_pop.pm
index fa4f5c670..3c9ea0130 100644
--- a/FS/FS/svc_acct_pop.pm
+++ b/FS/FS/svc_acct_pop.pm
@@ -121,6 +121,8 @@ sub text {
 
 =cut
 
+#horrible false laziness with signup.cgi (pull special-case for 0 & 1
+# pop code out from signup.cgi??)
 sub popselector {
   my( $popnum, $state ) = @_;
 
@@ -180,14 +182,16 @@ END
 
 =head1 VERSION
 
-$Id: svc_acct_pop.pm,v 1.6 2001-12-18 06:29:30 ivan Exp $
+$Id: svc_acct_pop.pm,v 1.7 2002-04-10 13:42:48 ivan Exp $
 
 =head1 BUGS
 
 It should be renamed to part_pop.
 
 popselector?  putting web ui components in here?  they should probably live
-somewhere else...
+somewhere else...  
+
+popselector: pull special-case for 0 & 1 pop code out from signup.cgi
 
 =head1 SEE ALSO
 
diff --git a/README.1.4.0pre12 b/README.1.4.0pre12
index 72353ba4c..ea1f95229 100644
--- a/README.1.4.0pre12
+++ b/README.1.4.0pre12
@@ -40,6 +40,8 @@ Run bin/dbdef-create again
 
 Run bin/populate-msgcat
 
+Set the `locale' configuration option to `en_US'.
+
 the mxmachines, nsmachines, arecords and cnamerecords configuration values have been deprecated.  Use the defaultrecords configuration value instead.
 
 New export code has landed!  If you were using the icradiusmachines,
diff --git a/bin/populate-msgcat b/bin/populate-msgcat
index 51f04c10f..5d6e85aea 100755
--- a/bin/populate-msgcat
+++ b/bin/populate-msgcat
@@ -27,6 +27,8 @@ foreach my $msgcode ( keys %messages ) {
   }
 }
 
+print "Message catalog initialized sucessfully\n";
+
 sub messages {
 
   #  'msgcode' => {
@@ -51,6 +53,55 @@ sub messages {
       'en_US' => 'Not a ',
     },
 
+    'empty_password' => {
+      'en_US' => 'Empty password',
+    },
+
+    'no_access_number_selected' => {
+      'en_US' => 'No access number selected',
+    },
+
+    'illegal_text' => {
+      'en_US' => 'Illegal (text)',
+      #'en_US' => 'Only letters, numbers, spaces, and the following punctuation symbols are permitted: ! @ # $ % & ( ) - + ; : \' " , . ? / in field',
+    },
+
+    'illegal_or_empty_text' => {
+      'en_US' => 'Illegal or empty (text)',
+      #'en_US' => 'Only letters, numbers, spaces, and the following punctuation symbols are permitted: ! @ # $ % & ( ) - + ; : \' " , . ? / in required field',
+    },
+
+    'illegal_username' => {
+      'en_US' => 'Illegal username',
+    },
+
+    'illegal_password' => {
+      'en_US' => 'Illegal password',
+    },
+
+    'username_in_use' => {
+      'en_US' => 'Username in use',
+    },
+
+    'illegal_email_invoice_address' => {
+      'en_US' => 'Illegal email invoice address',
+    },
+
+    'illegal_name' => {
+      'en_US' => 'Illegal (name)',
+      #'en_US' => 'Only letters, numbers, spaces and the following punctuation symbols are permitted: , . - \' in field',
+    },
+
+    'illegal_phone' => {
+      'en_US' => 'Illegal (phone)',
+      #'en_US' => '',
+    },
+
+    'illegal_zip' => {
+      'en_US' => 'Illegal (zip)',
+      #'en_US' => '',
+    },
+
   );
 }
 
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 46621d1e8..284237dbc 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.19 2002-04-07 05:56:08 ivan Exp $
+# $Id: signup.cgi,v 1.20 2002-04-10 13:42:48 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -15,7 +15,7 @@ use vars qw( @payby $cgi $locales $packages $pops $init_data $error
            );
 use subs qw( print_form print_okay expselect signup_default success_default );
 use CGI;
-use CGI::Carp qw(fatalsToBrowser);
+#use CGI::Carp qw(fatalsToBrowser);
 use Text::Template;
 use Business::CreditCard;
 use HTTP::Headers::UserAgent 2.00;
@@ -230,13 +230,15 @@ sub print_okay {
     or die "fatal: invalid password got past FS::SignupClient::new_customer";
   my $password = $1;
   ( $cgi->param('first'). ' '. $cgi->param('last') ) =~ /^(.*)$/
-    or die "fatal: invalid email_name got past FS::SignupCLient::new_customer";
+    or die "fatal: invalid email_name got past FS::SignupClient::new_customer";
   my $email_name = $1;
 
   my $pop = pop_info($cgi->param('popnum'))
     or die "fatal: invalid popnum got past FS::SignupClient::new_customer";
   ( $ac, $exch, $loc ) = ( $pop->{'ac'}, $pop->{'exch'}, $pop->{'loc'} );
 
+  my $pkg = ( grep { $_->{'pkgpart'} eq $pkgpart } @$packages )[0]->{'pkg'};
+
   if ( $ieak_template
        && $user_agent->platform eq 'ia32'
        && $user_agent->os =~ /^win/
@@ -277,6 +279,12 @@ sub pop_info {
 sub popselector {
   my( $popnum, $state ) = @_;
 
+  return '<INPUT TYPE="hidden" NAME="popnum" VALUE="">' unless @$pops;
+  return $pops->[0]{city}. ', '. $pops->[0]{state}.
+         ' ('. $pops->[0]{ac}. ')/'. $pops->[0]{exch}.
+         '<INPUT TYPE="hidden" NAME="popnum" VALUE="'. $pops->[0]{popnum}. '">'
+    if scalar(@$pops) == 1;
+
   my %pop = ();
   push @{ $pop{$_->{state}} }, $_ foreach @$pops;
 
@@ -359,6 +367,13 @@ sub success_default { #html to use if you don't specify a success file
 <HTML><HEAD><TITLE>Signup successful</TITLE></HEAD>
 <BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Signup successful</FONT><BR><BR>
 Thanks for signing up!
+<BR><BR>
+Signup information for <%= $email_name %>:
+<BR><BR>
+Username: <%= $username %><BR>
+Password: <%= $password %><BR>
+Access number: (<%= $ac %>) / $exch - $local<BR>
+Package: <%= $pkg %><BR>
 </BODY></HTML>
 END
 }
@@ -515,13 +530,11 @@ Contact Information
 </TR>
 <TR>
   <TD ALIGN="right">Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>">
-  (blank to generate)</TD>
+  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>"></TD>
 </TR>
 <TR>
   <TD ALIGN="right">Re-enter Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>">
-  </TD>
+  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>"></TD>
 </TR>
 <%=
   if ( $init_data->{'security_phrase'} ) {
@@ -536,10 +549,14 @@ ENDOUT
     $OUT .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
   }
 %>
-<TR>
-  <TD ALIGN="right">Access number</TD>
-  <TD><%= popselector($popnum) %></TD>
-</TR>
+<%=
+  if ( scalar(@$pops) ) {
+    $OUT .= '<TR><TD ALIGN="right">Access number</TD><TD>'.
+            popselector($popnum). '</TD></TR>';
+  } else {
+    $OUT .= popselector($popnum);
+  }
+%>
 </TABLE>
 <BR><BR><INPUT TYPE="submit" VALUE="Signup">
 </FORM></BODY></HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/signup.html b/fs_signup/FS-SignupClient/cgi/signup.html
index 5d2f2d9c9..6c601410c 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.html
+++ b/fs_signup/FS-SignupClient/cgi/signup.html
@@ -148,13 +148,11 @@ Contact Information
 </TR>
 <TR>
   <TD ALIGN="right">Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>">
-  (blank to generate)</TD>
+  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>"></TD>
 </TR>
 <TR>
   <TD ALIGN="right">Re-enter Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>">
-  </TD>
+  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>"></TD>
 </TR>
 <%=
   if ( $init_data->{'security_phrase'} ) {
@@ -169,10 +167,14 @@ ENDOUT
     $OUT .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
   }
 %>
-<TR>
-  <TD ALIGN="right">Access number</TD>
-  <TD><%= popselector($popnum) %></TD>
-</TR>
+<%=
+  if ( scalar(@$pops) ) {
+    $OUT .= '<TR><TD ALIGN="right">Access number</TD><TD>'.
+            popselector($popnum). '</TD></TR>';
+  } else {
+    $OUT .= popselector($popnum);
+  }
+%>
 </TABLE>
 <BR><BR><INPUT TYPE="submit" VALUE="Signup">
 </FORM></BODY></HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/success.html b/fs_signup/FS-SignupClient/cgi/success.html
index 6bc2d1fd7..0119b3b5e 100644
--- a/fs_signup/FS-SignupClient/cgi/success.html
+++ b/fs_signup/FS-SignupClient/cgi/success.html
@@ -1,4 +1,11 @@
 <HTML><HEAD><TITLE>Signup successful</TITLE></HEAD>
 <BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Signup successful</FONT><BR><BR>
 Thanks for signing up!
+<BR><BR>
+Signup information for <%= $email_name %>:
+<BR><BR>
+Username: <%= $username %><BR>
+Password: <%= $password %><BR>
+Access number: (<%= $ac %>) / $exch - $local<BR>
+Package: <%= $pkg %><BR>
 </BODY></HTML>
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 871bbdf1b..ebf424cd7 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -47,6 +47,7 @@ while (1) {
   warn "[fs_signup_server] Connecting to $machine...\n" if $Debug;
   sshopen2($machine,$reader,$writer,$fs_signupd);
 
+  my @pops = qsearch('svc_acct_pop',{} );
   my $init_data = {
 
     #'_protocol' => 'signup',
@@ -63,7 +64,7 @@ while (1) {
             qsearch( 'part_pkg', { 'disabled' => '' } )
       ],
 
-    'svc_acct_pop' => [ map { $_->hashref } qsearch ('svc_acct_pop',{} ) ],
+    'svc_acct_pop' => [ map { $_->hashref } @pops ],
 
     'security_phrase' => $conf->exists('security_phrase'),
 
@@ -96,8 +97,9 @@ while (1) {
     #things that aren't necessary in base class, but are for signup server
       #return "Passwords don't match"
       #  if $hashref->{'_password'} ne $hashref->{'_password2'}
-    $error ||= "Empty password" unless $signup_data->{'_password'};
-    $error ||= "No POP selected" unless $signup_data->{'popnum'};
+    $error ||= gettext('empty_password') unless $signup_data->{'_password'};
+    $error ||= gettext('no_access_number_selected')
+      unless $signup_data->{'popnum'} || !scalar(@pops);
 
     #shares some stuff with htdocs/edit/process/cust_main.cgi... take any
     # common that are still here and library them.
@@ -150,11 +152,30 @@ while (1) {
     use Tie::RefHash;
     tie my %hash, 'Tie::RefHash';
     %hash = ( $cust_pkg => [ $svc_acct ] );
-    $error ||= $cust_main->insert( \%hash, \@invoicing_list );
+    $error ||= $cust_main->insert( \%hash, \@invoicing_list ); #msgcat
 
     warn "[fs_signup_server] Sending results...\n" if $Debug;
     print $writer $error, "\n";
 
+    if ( $conf->config('signup_server-realtime') ) {
+      
+      my $bill_error = $cust_main->bill;
+      warn "[fs_signup_server] error billing new customer: $bill_error"
+        if $bill_error;
+
+      $cust_main->apply_payments;
+      $cust_main->apply_credits;
+
+      $bill_error = $cust_main->collect;
+      warn "[fs_signup_server] error collecting from new customer: $bill_error"
+        if $bill_error;
+
+      if ( $cust_main->balance ) {
+        #should check list for errors...
+        $cust_main->suspend;
+      }
+    }
+
     if ( $error && $conf->config('signup_server-email') ) {
       warn "[fs_signup_server] Sending email...\n" if $Debug;
 
@@ -171,18 +192,20 @@ while (1) {
         "Date: ". time2str("%a, %d %b %Y %X %z", time),
         "Subject: FREESIDE NOTIFICATION: Signup Server",
       ] );
-      my $message = new Mail::Internet (
-        'Header' => $header,
-        'Body' => [ 
-          "This is an automatic message from your Freeside installation\n",
-          "informing you a customer has signed up via the signup server:\n",
-          "\n",
-          'custnum: '. $cust_main->custnum. "\n",
-          'Name   : '. $cust_main->last. ", ". $cust_main->first. "\n",
-          'Agent  : '. $cust_main->agent->agent. "\n",
-          "\n",
-        ],
-      );
+      my $body = [
+        "This is an automatic message from your Freeside installation\n",
+        "informing you a customer has signed up via the signup server:\n",
+        "\n",
+        'custnum: '. $cust_main->custnum. "\n",
+        'Name   : '. $cust_main->last. ", ". $cust_main->first. "\n",
+        'Agent  : '. $cust_main->agent->agent. "\n",
+        "\n",
+      ];
+      if ( $cust_main->balance ) {
+        push @$body,
+          "This customer has an outstanding balance and has been suspended.\n";
+      }
+      my $message = new Mail::Internet ( 'Header' => $header, 'Body' => $body );
       $!=0;
       $message->smtpsend( Host => $smtpmachine )
         or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
diff --git a/httemplate/browse/msgcat.cgi b/httemplate/browse/msgcat.cgi
index 774473b36..d4adf9f1a 100755
--- a/httemplate/browse/msgcat.cgi
+++ b/httemplate/browse/msgcat.cgi
@@ -1,7 +1,7 @@
 <!-- mason kludge -->
 <%
 
-print header("Message catalog", menubar(
+print header("View Message catalog", menubar(
   'Main Menu' => $p,
   'Edit message catalog' => $p. "edit/msgcat.cgi",
 )), '<BR>';
diff --git a/httemplate/docs/signup.html b/httemplate/docs/signup.html
index 117cf2947..5168f47d6 100644
--- a/httemplate/docs/signup.html
+++ b/httemplate/docs/signup.html
@@ -35,28 +35,22 @@ Then:
 </ul>
 Optional:
 <ul>
-  <li>If you create a <b>/usr/local/freeside/ieak.template</b> file on the external machine, it will be sent to IE users with MIME type <i>application/x-Internet-signup</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the following variables available:
-  <ul>
-    <li>$ac - area code of selected POP
-    <li>$exch - exchange of selected POP
-    <li>$loc - local part of selected POP
-    <li>$username
-    <li>$password
-    <li>$email_name - first and last name
-  </ul>
+  <li>If you create a <b>/usr/local/freeside/ieak.template</b> file on the external machine, it will be sent to IE users with MIME type <i>application/x-Internet-signup</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the variables listed below available.
   (an example file is included as <b>fs_signup/ieak.template</b>)  See the <a href="http://www.microsoft.com/windows/ieak/techinfo/deploy/60/en/toc.asp">IEAK documentation</a> for more information.
-  <li>If you create a <b>/usr/local/freeside/cck.template</b> file on the external machine, the variables defined will be sent to Netscape users with MIME type <i>application/x-netscape-autoconfigure-dialer-v2</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the following variables available:
-  <ul>
-    <li>$ac - area code of selected POP
-    <li>$exch - exchange of selected POP
-    <li>$loc - local part of selected POP
-    <li>$username
-    <li>$password
-    <li>$email_name - first and last name
-  </ul>
+  <li>If you create a <b>/usr/local/freeside/cck.template</b> file on the external machine, the variables defined will be sent to Netscape users with MIME type <i>application/x-netscape-autoconfigure-dialer-v2</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the variables listed below available.
   (an example file is included as <b>fs_signup/cck.template</b>).  See the <a href="http://help.netscape.com/products/client/mc/acctproc4.html">Netscape documentation</a> for more information.
-  <li>If you create a <b>/usr/local/freeside/signup.html</b> file on the external machine, it will be used as a template for the form HTML.  This requires the template to be constructed appropriately; probably best to start with the example file included as <b>fs_signup/FS-SignupClient/cgi/signup.html</b>.
   <li>If you create a <b>/usr/local/freeside/success.html</b> file on the external machine, it will be used as the success HTML page.  Although template substiutions are available, a regular HTML file will work fine here, unlike signup.html.  An example file is included as <b>fs_signup/FS-SignupClient/cgi/success.html</b>
+  <li>Variable substitutions available in <b>ieak.template</b>, <b>cck.template</b> and <b>success.html</b>:
+    <ul>
+      <li>$ac - area code of selected POP
+      <li>$exch - exchange of selected POP
+      <li>$loc - local part of selected POP
+      <li>$username
+      <li>$password
+      <li>$email_name - first and last name
+      <li>$pkg - package name
+    </ul>
+  <li>If you create a <b>/usr/local/freeside/signup.html</b> file on the external machine, it will be used as a template for the form HTML.  This requires the template to be constructed appropriately; probably best to start with the example file included as <b>fs_signup/FS-SignupClient/cgi/signup.html</b>.
   <li>If there are any entries in the <i>prepay_credit</i> table, a user can enter a string matching the <b>identifier</i> column to receive the credit specified in the <b>amount</b> column, and/or the time specified in the <b>seconds</b> column (for use with the <a href="session.html">session monitor</a>), after which that <b>identifier</b> is no longer valid.  This can be used to implement pre-paid "calling card" type signups.  The <i>bin/generate-prepay</i> script can be used to populate the <i>prepay_credit</i> table.
 </ul>
 </body>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index a7b5853b3..d1b13fe9c 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -325,6 +325,7 @@ ALTER TABLE cust_refund DROP COLUMN crednum;
   <li><b>IMPORTANT</b>: run bin/create-history-tables
   <li><b>IMPORTANT: After running bin/create-history-tables</b>, run bin/dbdef-create again.
   <li>set the <a href="../config/config.cgi#username_policy">user_policy configuration value</a> as appropriate for your site.
+  <li>set the <a href="../config/config.cgi#locale">locale configuration value</a> to en_US.
   <li>the mxmachines, nsmachines, arecords and cnamerecords configuration values have been deprecated.  Set the <a href="../config/config.cgi#defaultrecords">defaultrecords configuration value</a> instead.
   <li>Create the `/usr/local/etc/freeside/cache.<i>datasrc</i>' directory
       (owned by the freeside user).
diff --git a/httemplate/edit/msgcat.cgi b/httemplate/edit/msgcat.cgi
index 5d256c05b..ee9b1c6b3 100755
--- a/httemplate/edit/msgcat.cgi
+++ b/httemplate/edit/msgcat.cgi
@@ -1,11 +1,12 @@
 <!-- mason kludge -->
 <%
 
-print header("Message catalog", menubar(
+print header("Edit Message catalog", menubar(
 #  'Main Menu' => $p,
 )), '<BR>';
 
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !. $cgi->param('error')
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !. $cgi->param('error').
+      '</FONT><BR><BR>'
   if $cgi->param('error');
 
 my $widget = new HTML::Widgets::SelectLayers(
@@ -28,7 +29,7 @@ my $widget = new HTML::Widgets::SelectLayers(
         '<TR><TD>'. $msgcat->msgnum. '</TD><TD>'. $msgcat->msgcode. '</TD>'.
         '<TD><INPUT TYPE="text" SIZE=32 '.
         qq! NAME="!. $msgcat->msgnum. '" '.
-        qq!VALUE="!. $msgcat->msg. qq!"></TD>!;
+        qq!VALUE="!. ($cgi->param($msgcat->msgnum)||$msgcat->msg). qq!"></TD>!;
       unless ( $layer eq 'en_US' ) {
         my $en_msgcat = qsearchs('msgcat', {
           'locale'  => 'en_US',
diff --git a/httemplate/edit/process/msgcat.cgi b/httemplate/edit/process/msgcat.cgi
index ab30f06b5..1f94f6668 100644
--- a/httemplate/edit/process/msgcat.cgi
+++ b/httemplate/edit/process/msgcat.cgi
@@ -3,6 +3,7 @@
 my $error;
 foreach my $param ( grep { /^\d+$/ } $cgi->param ) {
   my $old = qsearchs('msgcat', { msgnum=>$param } );
+  next if $old->msg eq $cgi->param($param); #no need to update identical records
   my $new = new FS::msgcat { $old->hash };
   $new->msg($cgi->param($param));
   $error = $new->replace($old);
-- 
cgit v1.2.1


From 52a07a405e197fda1654fc61eefa538450f269e8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Apr 2002 22:04:56 +0000
Subject: use the AUTOLOAD that reports errors better & fix problems with
 ut_domain losing data

---
 FS/FS/Record.pm | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index acdebcadc..978ea72e7 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -399,32 +399,32 @@ $record->column('value') is a synonym for $record->set('column','value');
 =cut
 
 # readable/safe
-#sub AUTOLOAD {
-#  my($self,$value)=@_;
-#  my($field)=$AUTOLOAD;
-#  $field =~ s/.*://;
-#  if ( defined($value) ) {
-#    confess "errant AUTOLOAD $field for $self (arg $value)"
-#      unless $self->can('setfield');
-#    $self->setfield($field,$value);
-#  } else {
-#    confess "errant AUTOLOAD $field for $self (no args)"
-#      unless $self->can('getfield');
-#    $self->getfield($field);
-#  }    
-#}
-
-# efficient
 sub AUTOLOAD {
-  my $field = $AUTOLOAD;
+  my($self,$value)=@_;
+  my($field)=$AUTOLOAD;
   $field =~ s/.*://;
-  if ( defined($_[1]) ) {
-    $_[0]->setfield($field, $_[1]);
+  if ( defined($value) ) {
+    confess "errant AUTOLOAD $field for $self (arg $value)"
+      unless $self->can('setfield');
+    $self->setfield($field,$value);
   } else {
-    $_[0]->getfield($field);
+    confess "errant AUTOLOAD $field for $self (no args)"
+      unless $self->can('getfield');
+    $self->getfield($field);
   }    
 }
 
+# efficient
+#sub AUTOLOAD {
+#  my $field = $AUTOLOAD;
+#  $field =~ s/.*://;
+#  if ( defined($_[1]) ) {
+#    $_[0]->setfield($field, $_[1]);
+#  } else {
+#    $_[0]->getfield($field);
+#  }    
+#}
+
 =item hash
 
 Returns a list of the column/value pairs, usually for assigning to a new hash.
@@ -949,7 +949,7 @@ Check/untaint host and domain names.
 sub ut_domain {
   my( $self, $field ) = @_;
   #$self->getfield($field) =~/^(\w+\.)*\w+$/
-  $self->getfield($field) =~/^([\w\-]+\.)*\w+$/
+  $self->getfield($field) =~/^(([\w\-]+\.)*\w+)$/
     or return "Illegal (domain) $field: ". $self->getfield($field);
   $self->setfield($field,$1);
   '';
-- 
cgit v1.2.1


From a7c1b602f88c177db34477ed4cdc1f72603f8995 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Apr 2002 22:05:31 +0000
Subject: (almost) everything for bug#375 - create export_svc table - part_svc
 to part_export is now properly many-to-many, not one-to-many

still need to finish service editing (choosing exports) in
httemplate/edit/part_svc.cgi and httemplate/edti/process/part_svc.cgi

and do somethinga about that manual $svcdb = 'svc_acct' in
httemplate/edit/part_export.cgi (do part_export records need a svcdb?
probably not... should be able to just pass an svcdb on creation of new
exports, move the big %exports hash into part_export.pm and allow
httemplate/edit/part_svc.cgi to query it for exports that can apply to a given
svcdb....
---
 FS/FS.pm                                |   3 +
 FS/FS/export_svc.pm                     | 123 ++++++++++++++++++++++++++++++++
 FS/FS/part_export.pm                    |  89 +++++++++++++++--------
 FS/FS/part_svc.pm                       |   9 ++-
 FS/MANIFEST                             |   2 +
 FS/t/export_svc.t                       |   5 ++
 README.1.4.0pre12                       |  11 +++
 bin/fs-setup                            |  15 +++-
 bin/sqlradius_reset                     |   8 ++-
 httemplate/browse/part_export.cgi       |  42 +++++++++++
 httemplate/browse/part_svc.cgi          |  25 +------
 httemplate/docs/schema.html             |   7 +-
 httemplate/docs/upgrade8.html           |  10 ++-
 httemplate/edit/part_export.cgi         |  39 +++-------
 httemplate/edit/process/part_export.cgi |   3 +-
 httemplate/index.html                   |   2 +
 httemplate/misc/delete-part_export.cgi  |   2 +-
 17 files changed, 301 insertions(+), 94 deletions(-)
 create mode 100644 FS/FS/export_svc.pm
 create mode 100644 FS/t/export_svc.t
 create mode 100755 httemplate/browse/part_export.cgi

diff --git a/FS/FS.pm b/FS/FS.pm
index 60831ecd5..36fabcb8e 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -57,6 +57,9 @@ L<FS::part_svc> - Service definition class
 
 L<FS::part_svc_column> - Column constraint class
 
+L<FS::export_svc> - Class linking service definitions (see L<FS::part_svc>)
+with exports (see L<FS::part_export>)
+
 L<FS::part_export> - External provisioning export class
 
 L<FS::part_export_option> - Export option class
diff --git a/FS/FS/export_svc.pm b/FS/FS/export_svc.pm
new file mode 100644
index 000000000..da9ac698a
--- /dev/null
+++ b/FS/FS/export_svc.pm
@@ -0,0 +1,123 @@
+package FS::export_svc;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+use FS::part_export;
+use FS::part_svc;
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::export_svc - Object methods for export_svc records
+
+=head1 SYNOPSIS
+
+  use FS::export_svc;
+
+  $record = new FS::export_svc \%hash;
+  $record = new FS::export_svc { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::export_svc object links a service definition (see L<FS::part_svc>) to
+an export (see L<FS::part_export>).  FS::export_svc inherits from FS::Record.
+The following fields are currently supported:
+
+=over 4
+
+=item exportsvcnum - primary key
+
+=item exportnum - export (see L<FS::part_export>)
+
+=item svcpart - service definition (see L<FS::part_svc>)
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new record.  To add the record to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'export_svc'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  $self->ut_numbern('exportsvcnum')
+    || $self->ut_number('exportnum')
+    || $self->ut_foreign_key('exportnum', 'part_export', 'exportnum')
+    || $self->ut_number('svcpart')
+    || $self->ut_foreign_key('svcpart', 'part_svc', 'svcpart')
+  ;
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::part_export>, L<FS::part_svc>, L<FS::Record>, schema.html from the base
+documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index a43c3844e..8af413b1d 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -5,6 +5,7 @@ use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs dbh );
 use FS::part_svc;
 use FS::part_export_option;
+use FS::export_svc;
 
 @ISA = qw(FS::Record);
 
@@ -19,7 +20,7 @@ FS::part_export - Object methods for part_export records
   $record = new FS::part_export \%hash;
   $record = new FS::part_export { 'column' => 'value' };
 
-  ($new_record, $options) = $template_recored->clone( $svcpart );
+  #($new_record, $options) = $template_recored->clone( $svcpart );
 
   $error = $record->insert( { 'option' => 'value' } );
   $error = $record->insert( \%options );
@@ -40,8 +41,6 @@ fields are currently supported:
 
 =item exportnum - primary key
 
-=item svcpart - Service definition (see L<FS::part_svc>) to which this export applies
-
 =item machine - Machine name 
 
 =item exporttype - Export type
@@ -67,27 +66,29 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 sub table { 'part_export'; }
 
-=item clone SVCPART
-
-An alternate constructor.  Creates a new export by duplicating an existing
-export.  The given svcpart is assigned to the new export.
-
-Returns a list consisting of the new export object and a hashref of options.
-
 =cut
 
-sub clone {
-  my $self = shift;
-  my $class = ref($self);
-  my %hash = $self->hash;
-  $hash{'exportnum'} = '';
-  $hash{'svcpart'} = shift;
-  ( $class->new( \%hash ),
-    { map { $_->optionname => $_->optionvalue }
-        qsearch('part_export_option', { 'exportnum' => $self->exportnum } )
-    }
-  );
-}
+#=item clone SVCPART
+#
+#An alternate constructor.  Creates a new export by duplicating an existing
+#export.  The given svcpart is assigned to the new export.
+#
+#Returns a list consisting of the new export object and a hashref of options.
+#
+#=cut
+#
+#sub clone {
+#  my $self = shift;
+#  my $class = ref($self);
+#  my %hash = $self->hash;
+#  $hash{'exportnum'} = '';
+#  $hash{'svcpart'} = shift;
+#  ( $class->new( \%hash ),
+#    { map { $_->optionname => $_->optionvalue }
+#        qsearch('part_export_option', { 'exportnum' => $self->exportnum } )
+#    }
+#  );
+#}
 
 =item insert HASHREF
 
@@ -173,6 +174,14 @@ sub delete {
     }
   }
 
+  foreach my $export_svc ( $self->export_svc ) {
+    my $error = $export_svc->delete;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   '';
@@ -258,13 +267,11 @@ sub check {
   my $error = 
     $self->ut_numbern('exportnum')
     || $self->ut_domain('machine')
-    || $self->ut_number('svcpart')
     || $self->ut_alpha('exporttype')
   ;
   return $error if $error;
 
-  return "Unknown svcpart: ". $self->svcpart
-    unless qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
+  warn $self->machine. "!!!\n";
 
   $self->machine =~ /^([\w\-\.]*)$/
     or return "Illegal machine: ". $self->machine;
@@ -273,20 +280,39 @@ sub check {
   $self->nodomain =~ /^(Y?)$/ or return "Illegal nodomain: ". $self->nodomain;
   $self->nodomain($1);
 
+  $self->deprecated(1); #BLAH
+
   #check exporttype?
 
   ''; #no error
 }
 
-=item part_svc
+#=item part_svc
+#
+#Returns the service definition (see L<FS::part_svc>) for this export.
+#
+#=cut
+#
+#sub part_svc {
+#  my $self = shift;
+#  qsearchs('part_svc', { svcpart => $self->svcpart } );
+#}
+
+sub part_svc {
+  use Carp;
+  croak "FS::part_export::part_svc deprecated";
+  #confess "FS::part_export::part_svc deprecated";
+}
+
+=item export_svc
 
-Returns the service definition (see L<FS::part_svc>) for this export.
+Returns a list of associated FS::export_svc records.
 
 =cut
 
-sub part_svc {
+sub export_svc {
   my $self = shift;
-  qsearchs('part_svc', { svcpart => $self->svcpart } );
+  qsearch('export_svc', { 'exportnum' => $self->exportnum } );
 }
 
 =item part_export_option
@@ -413,9 +439,12 @@ Probably.
 
 Hmm... cust_export class (not necessarily a database table...) ... ?
 
+deprecated column...
+
 =head1 SEE ALSO
 
-L<FS::part_export_option>, L<FS::part_svc>, L<FS::svc_acct>, L<FS::svc_domain>,
+L<FS::part_export_option>, L<FS::export_svc>, L<FS::svc_acct>,
+L<FS::svc_domain>,
 L<FS::svc_forward>, L<FS::Record>, schema.html from the base documentation.
 
 =cut
diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 7ef996f5f..959a3f887 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -5,6 +5,7 @@ use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs fields dbh );
 use FS::part_svc_column;
 use FS::part_export;
+use FS::export_svc;
 
 @ISA = qw(FS::Record);
 
@@ -316,15 +317,15 @@ sub all_part_svc_column {
 
 sub part_export {
   my $self = shift;
-  my %search = ( 'svcpart' => $self->svcpart );
-  qsearch('part_export', \%search);
+  map { qsearchs('part_export', { 'exportnum' => $_->exportnum } ) }
+    qsearch('export_svc', { 'svcpart' => $self->svcpart } );
 }
 
 =back
 
 =head1 VERSION
 
-$Id: part_svc.pm,v 1.12 2002-03-26 13:58:29 ivan Exp $
+$Id: part_svc.pm,v 1.13 2002-04-11 22:05:31 ivan Exp $
 
 =head1 BUGS
 
@@ -333,6 +334,8 @@ Delete is unimplemented.
 The list of svc_* tables is hardcoded.  When svc_acct_pop is renamed, this
 should be fixed.
 
+all_part_svc_column and part_export methods should be documented
+
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::part_svc_column>, L<FS::part_pkg>, L<FS::pkg_svc>,
diff --git a/FS/MANIFEST b/FS/MANIFEST
index dd9eb0906..440c75565 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -45,6 +45,7 @@ FS/cust_refund.pm
 FS/cust_credit_refund.pm
 FS/cust_svc.pm
 FS/part_bill_event.pm
+FS/export_svc.pm
 FS/part_export.pm
 FS/part_export_option.pm
 FS/part_export/infostreet.pm
@@ -97,6 +98,7 @@ t/cust_svc.t
 t/domain_record.t
 t/nas.t
 t/part_bill_event.t
+t/export_svc.t
 t/part_export.t
 t/part_export_option.t
 t/part_export-infostreet.t
diff --git a/FS/t/export_svc.t b/FS/t/export_svc.t
new file mode 100644
index 000000000..773c5dea7
--- /dev/null
+++ b/FS/t/export_svc.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::export_svc;
+$loaded=1;
+print "ok 1\n";
diff --git a/README.1.4.0pre12 b/README.1.4.0pre12
index ea1f95229..e8fdd3070 100644
--- a/README.1.4.0pre12
+++ b/README.1.4.0pre12
@@ -32,6 +32,17 @@ CREATE TABLE msgcat (
 );
 CREATE INDEX msgcat1 ON msgcat ( msgcode, locale );
 
+CREATE TABLE export_svc (
+  exportsvcnum int primary key,
+  exportnum int not null,
+  svcpart int not null
+);
+CREATE UNIQUE INDEX export_svc1 ON export_svc ( exportnum, svcpart );
+CREATE INDEX export_svc2 ON export_svc ( exportnum );
+CREATE INDEX export_svc3 ON export_svc ( svcpart );
+
+ALTER TABLE part_export RENAME svcpart TO deprecated;
+
 Run bin/dbdef-create
 
 Run bin/create-history-tables
diff --git a/bin/fs-setup b/bin/fs-setup
index 2da0431bb..535408891 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.86 2002-04-10 08:39:47 ivan Exp $
+# $Id: fs-setup,v 1.87 2002-04-11 22:05:31 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -927,10 +927,21 @@ sub tables_hash_hack {
       'index'       => [ [ 'jobnum' ] ],
     },
 
+    'export_svc' => {
+      'columns' => [
+        'exportsvcnum' => 'int', '', '',
+        'exportnum'    => 'int', '', '',
+        'svcpart'      => 'int', '', '',
+      ]
+      'primary_key' => 'exportsvcnum',
+      'unique'      => [ [ 'exportnum', 'svcpart' ] ],
+      'index'       => [ [ 'exportnum' ], [ 'svcpart' ] ],
+    },
+
     'part_export' => {
       'columns' => [
         'exportnum', 'int', '', '',
-        'svcpart',   'int', '', '',
+        #'svcpart',   'int', '', '',
         'machine', 'varchar', '', $char_d,
         'exporttype', 'varchar', '', $char_d,
         'nodomain',     'char', 'NULL', 1,
diff --git a/bin/sqlradius_reset b/bin/sqlradius_reset
index da98fe6be..454043f54 100644
--- a/bin/sqlradius_reset
+++ b/bin/sqlradius_reset
@@ -25,9 +25,15 @@ foreach my $export ( @exports ) {
 }
 
 foreach my $export ( @exports ) {
+
+  #my @svcparts = map { $_->svcpart } $export->export_svc;
+
   my @svc_acct =
     map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
-      qsearch('cust_svc', { 'svcpart' => $export->part_svc->svcpart } );
+      map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+        grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+          $export->export_svc;
+
   foreach my $svc_acct ( @svc_acct ) {
 
     #false laziness with FS::svc_acct::insert (like it matters)
diff --git a/httemplate/browse/part_export.cgi b/httemplate/browse/part_export.cgi
new file mode 100755
index 000000000..e9d9fa3d4
--- /dev/null
+++ b/httemplate/browse/part_export.cgi
@@ -0,0 +1,42 @@
+<!-- mason kludge -->
+<%= header("Export Listing", menubar( 'Main Menu' => $p )) %>
+Provisioning services to external machines, databases and APIs.<BR><BR>
+
+<SCRIPT>
+function part_export_areyousure(href) {
+  if (confirm("Are you sure you want to delete this export?") == true)
+    window.location.href = href;
+}
+</SCRIPT>
+
+<%= table() %>
+  <TR>
+    <TH COLSPAN=2>Export</TH>
+    <TH>Options</TH>
+  </TR>
+
+<% foreach my $part_export ( sort { 
+     $a->getfield('exportnum') <=> $b->getfield('exportnum')
+   } qsearch('part_export',{}) ) {
+%>
+  <TR>
+    <TD><A HREF="<%= $p %>edit/part_export.cgi?<%= $part_export->exportnum %>"><%= $part_export->exportnum %></A></TD>
+    <TD><%= $part_export->exporttype %> to <%= $part_export->machine %> (<A HREF="<%= $p %>edit/part_export.cgi?<%= $part_export->exportnum %>">edit</A>&nbsp;|&nbsp;<A HREF="javascript:part_export_areyousure('<%= $p %>misc/delete-part_export.cgi?<%= $part_export->exportnum %>')">delete</A>)</TD>
+    <TD>
+      <%= itable() %>
+      <% my %opt = $part_export->options;
+         foreach my $opt ( keys %opt ) { %>
+           <TR><TD><%= $opt %></TD><TD><%= $opt{$opt} %></TD></TR>
+      <% } %>
+      </TABLE>
+    </TD>
+  </TR>
+
+<% } %>
+
+  <TR>
+    <TD COLSPAN=3><A HREF="<%= $p %>edit/part_export.cgi"><I>Add a new export</I></A></TD>
+  </TR>
+</TABLE>
+</BODY>
+</HTML>
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 250b1ff4e..c8adebcd6 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -70,31 +70,8 @@ function part_export_areyousure(href) {
   foreach my $part_export ( @part_export ) {
 %>
       <TR>
-        <TD><%= $part_export->exporttype %> to <%= $part_export->machine %> (<A HREF="<%= $p %>edit/part_export.cgi?<%= $part_export->exportnum %>">edit</A>&nbsp;|&nbsp;<A HREF="javascript:part_export_areyousure('<%= $p %>misc/delete-part_export.cgi?<%= $part_export->exportnum %>')">delete</A>)</TD>
-        <TD>
-          <%= itable() %>
-          <% my %opt = $part_export->options;
-             foreach my $opt ( keys %opt ) { %>
-               <TR><TD><%= $opt %></TD><TD><%= $opt{$opt} %></TD></TR>
-          <% } %>
-          </TABLE>
-        </TD>
+        <TD><A HREF="<%= $p %>edit/part_export.cgi?<%= $part_export->exportnum %>"><%= $part_export->exporttype %> to <%= $part_export->machine %></A></TD></TR>
 <%  } %>
-      </TR><TR><TD COLSPAN=2><A HREF="<%= $p %>edit/part_export.cgi?new_with_svcpart=<%= $part_svc->svcpart %>"><I>Add a new export</I></A></TD></TR>
-<% if (@part_export) { %>
-      <TR><TD COLSPAN=2>
-        <FORM METHOD="POST" ACTION="<%= $p %>edit/part_export.cgi">
-        <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $part_svc->svcpart %>">
-        <SELECT NAME="clone"><OPTION></OPTION>
-<%   foreach my $part_export ( @part_export ) { %>
-          <OPTION VALUE="<%= $part_export->exportnum %>">
-            <%= $part_export->exporttype %> to <%= $part_export->machine %>
-          </OPTION>
-<%   } %>
-        </SELECT>
-        <INPUT TYPE="submit" VALUE="clone existing export">
-        </FORM></TD></TR>
-<% } %>
       </TABLE></TD>
 
 <%   my($n1)='';
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index a7c21c7c9..6ed96d229 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -256,10 +256,15 @@
         <li>svcpart - <a href="#part_svc">Service definition</a>
         <li>quantity - quantity of this service that this package includes
       </ul>
+    <li><a name="export_svc" href="man/FS/export_svc.html">export_svc</a>
+      <ul>
+        <li>exportsvcnum - primary key
+        <li>svcpart - <a href="#part_svc">Service definition</a>
+        <li>exportnum - <a href="#exportnum">Export</a>
+      </ul>
     <li><a name="part_export" href="man/FS/part_export.html">part_export</a> - Export to external provisioning
       <ul>
         <li>exportnum - primary key
-        <li>svcpart - <a href="#part_svc">Service definition</a>
         <li>machine - Machine name 
         <li>exporttype - Export type
         <li>nodomain - blank or Y: usernames are exported to this service with no domain
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index d1b13fe9c..841a053ed 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -152,9 +152,17 @@ CREATE TABLE part_bill_event (
 );
 CREATE INDEX part_bill_event1 ON part_bill_event ( payby );
 
+CREATE TABLE export_svc (
+  exportsvcnum int primary key,
+  exportnum int not null,
+  svcpart int not null
+);
+CREATE UNIQUE INDEX export_svc1 ON export_svc ( exportnum, svcpart );
+CREATE INDEX export_svc2 ON export_svc ( exportnum );
+CREATE INDEX export_svc3 ON export_svc ( svcpart );
+
 CREATE TABLE part_export (
   exportnum int primary key,
-  svcpart int not null,
   machine varchar(80) not null,
   exporttype varchar(80) not null,
   nodomain char(1) NULL
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 0ca964e02..f3127403e 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -6,34 +6,18 @@
 #} else {
 #  $cgi->param('clone', '');
 #}
-#if ( $cgi->param('svcpart') && $cgi->param('svcpart') =~ /^(\d+)$/ ) {
-#  $cgi->param('svcpart', $1);
-#} else {
-#  $cgi->param('svcpart', '');
-#}
 
 my($query) = $cgi->keywords;
 my $action = '';
 my $part_export = '';
-my $options = {};
 if ( $cgi->param('error') ) {
   $part_export = new FS::part_export ( {
     map { $_, scalar($cgi->param($_)) } fields('part_export')
   } );
-}
-
-#warn "***$query***";
-if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
-  $action = 'Add';
-  my $old_part_export = qsearchs('part_export', { 'exportnum' => $1 } );
-  unless ( $part_export ) {
-    ($part_export, $options) = $old_part_export->clone($cgi->param('svcpart'));
-  }
-} elsif ( $cgi->param('new_with_svcpart') 
-          && $cgi->param('new_with_svcpart') =~ /^(\d+)$/ ) {
-  $part_export ||= new FS::part_export ( { 'svcpart' => $1 } );
 } elsif ( $query =~ /^(\d+)$/ ) {
-  $part_export ||= qsearchs('part_export', { 'exportnum' => $1 } );
+  $part_export = qsearchs('part_export', { 'exportnum' => $1 } );
+} else {
+  $part_export = new FS::part_export;
 }
 $action ||= $part_export->exportnum ? 'Edit' : 'Add';
 
@@ -101,18 +85,20 @@ my %exports = (
 
 );
 
-my $svcdb = $part_export->part_svc->svcdb;
+#my $svcdb = $part_export->part_svc->svcdb;
+#YUCK
+my $svcdb = 'svc_acct';
+
 my %layers = map { $_ => "$_ - ". $exports{$svcdb}{$_}{desc} }
                keys %{$exports{$svcdb}};
 $layers{''}='';
 
 my $widget = new HTML::Widgets::SelectLayers(
-  'selected_layer' => $part_export->exporttype,
   'selected_layer' => $part_export->exporttype,
   'options'        => \%layers,
   'form_name'      => 'dummy',
   'form_action'    => 'process/part_export.cgi',
-  'form_text'      => [qw( exportnum svcpart machine )],
+  'form_text'      => [qw( exportnum machine )],
 #  'form_checkbox'  => [qw()],
   'html_between'    => "</TD></TR></TABLE>\n",
   'layer_callback'  => sub {
@@ -123,7 +109,7 @@ my $widget = new HTML::Widgets::SelectLayers(
 #    foreach my $option ( qw(url login password groupID ) ) {
       my $optinfo = $exports{$svcdb}->{$layer}{options}{$option};
       my $label = $optinfo->{label};
-      my $value = $part_export->option($option);
+      my $value = $cgi->param($option) || $part_export->option($option);
       $html .= qq!<TR><TD ALIGN="right">$label</TD><TD>!.
                qq!<TD><INPUT TYPE="text" NAME="$option" VALUE="$value"></TD>!.
                '</TR>';
@@ -159,13 +145,6 @@ my $widget = new HTML::Widgets::SelectLayers(
 <INPUT TYPE="hidden" NAME="exportnum" VALUE="<%= $part_export->exportnum %>">
 
 <%= ntable("#cccccc",2) %>
-<TR>
-  <TD ALIGN="right">Service</TD>
-  <TD BGCOLOR="#ffffff">
-    <%= $part_export->svcpart %> - <%= $part_export->part_svc->svc %>
-    <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $part_export->svcpart %>">
-  </TD>
-</TR>
 <TR>
   <TD ALIGN="right">Export host</TD>
   <TD>
diff --git a/httemplate/edit/process/part_export.cgi b/httemplate/edit/process/part_export.cgi
index d0c87a02a..34eb699bf 100644
--- a/httemplate/edit/process/part_export.cgi
+++ b/httemplate/edit/process/part_export.cgi
@@ -18,6 +18,7 @@ my $error;
 if ( $exportnum ) {
   warn $old;
   warn $exportnum;
+  warn $new->machine;
   $error = $new->replace($old,\%options);
 } else {
   $error = $new->insert(\%options);
@@ -28,7 +29,7 @@ if ( $error ) {
   $cgi->param('error', $error );
   print $cgi->redirect(popurl(2). "part_export.cgi?". $cgi->query_string );
 } else {
-  print $cgi->redirect(popurl(3). "browse/part_svc.cgi");
+  print $cgi->redirect(popurl(3). "browse/part_export.cgi");
 }
 
 %>
diff --git a/httemplate/index.html b/httemplate/index.html
index 99d8df956..c638aec16 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -167,6 +167,8 @@
         <ul>
           <LI><A HREF="browse/part_svc.cgi">View/Edit service definitions</A>
             - Services are items you offer to your customers.
+          <LI><A HREF="browse/part_export.cgi">View/Edit exports</A>
+            - Provisioning services to external machines, databases and APIs.
           <LI><A HREF="browse/part_pkg.cgi">View/Edit package definitions</A>
             - One or more services are grouped together into a package and
               given pricing information.  Customers purchase packages, not
diff --git a/httemplate/misc/delete-part_export.cgi b/httemplate/misc/delete-part_export.cgi
index a5166d944..34ef06b96 100755
--- a/httemplate/misc/delete-part_export.cgi
+++ b/httemplate/misc/delete-part_export.cgi
@@ -10,6 +10,6 @@ my $part_export = qsearchs('part_export',{'exportnum'=>$exportnum});
 my $error = $part_export->delete;
 eidiot($error) if $error;
 
-print $cgi->redirect($p. "browse/part_svc.cgi");
+print $cgi->redirect($p. "browse/part_export.cgi");
 
 %>
-- 
cgit v1.2.1


From e6ea57971831f25d682d97a0ba508c39b66ecd8b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 12 Apr 2002 13:22:03 +0000
Subject: - should finish off the part_svc -> part_export
 s/one-to-many/many-to-many/   transition (closes: Bug#375) - fixes a nasty
 export scoping bug with message catalogs, whew

---
 FS/FS/Msgcat.pm                         |  98 +++++++++++++++++++++++++++
 FS/FS/Record.pm                         |   9 ++-
 FS/FS/cust_main.pm                      |   2 +-
 FS/FS/cust_main_invoice.pm              |   4 +-
 FS/FS/msgcat.pm                         |  70 ++-----------------
 FS/FS/part_export.pm                    | 116 +++++++++++++++++++++++++++++++-
 FS/FS/svc_acct.pm                       |   2 +-
 FS/MANIFEST                             |   4 +-
 FS/t/Msgcat.t                           |   5 ++
 fs_signup/fs_signup_server              |   2 +-
 htetc/global.asa                        |   4 +-
 htetc/handler.pl                        |   4 +-
 httemplate/browse/part_svc.cgi          |   8 ++-
 httemplate/edit/part_export.cgi         |  80 ++--------------------
 httemplate/edit/part_svc.cgi            |  26 ++++++-
 httemplate/edit/process/agent_type.cgi  |   1 +
 httemplate/edit/process/part_export.cgi |   8 +--
 httemplate/edit/process/part_svc.cgi    |  23 +++++++
 httemplate/misc/delete-customer.cgi     |  14 ++++
 19 files changed, 320 insertions(+), 160 deletions(-)
 create mode 100644 FS/FS/Msgcat.pm
 create mode 100644 FS/t/Msgcat.t

diff --git a/FS/FS/Msgcat.pm b/FS/FS/Msgcat.pm
new file mode 100644
index 000000000..625743dc0
--- /dev/null
+++ b/FS/FS/Msgcat.pm
@@ -0,0 +1,98 @@
+package FS::Msgcat;
+
+use strict;
+use vars qw( @ISA @EXPORT_OK $conf $locale $debug );
+use Exporter;
+use FS::UID;
+#use FS::Record qw( qsearchs ); # wtf?  won't import...
+use FS::Record;
+use FS::Conf;
+use FS::msgcat;
+
+@ISA = qw(Exporter);
+@EXPORT_OK = qw( gettext geterror );
+
+$FS::UID::callback{'Msgcat'} = sub {
+  $conf = new FS::Conf;
+  $locale = $conf->config('locale') || 'en_US';
+  $debug = $conf->exists('show-msgcat-codes')
+};
+
+=head1 NAME
+
+FS::Msgcat - Message catalog functions
+
+=head1 SYNOPSIS
+
+  use FS::Msgcat qw(gettext geterror);
+
+  #simple interface for retreiving messages...
+  $message = gettext('msgcode');
+  #or errors (includes the error code)
+  $message = geterror('msgcode');
+
+=head1 DESCRIPTION
+
+FS::Msgcat provides functions to use the message catalog.  If you want to
+maintain the message catalog database, see L<FS::msgcat> instead.
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item gettext MSGCODE
+
+Returns the full message for the supplied message code.
+
+=cut
+
+sub gettext {
+  $debug ? geterror(@_) : _gettext(@_);
+}
+
+sub _gettext {
+  my $msgcode = shift;
+  my $msgcat = FS::Record::qsearchs('msgcat', {
+    'msgcode' => $msgcode,
+    'locale' => $locale
+  } );
+  if ( $msgcat ) {
+    $msgcat->msg;
+  } else {
+    warn "WARNING: message for msgcode $msgcode in locale $locale not found";
+    $msgcode;
+  }
+
+}
+
+=item geterror MSGCODE
+
+Returns the full message for the supplied message code, including the message
+code.
+
+=cut
+
+sub geterror {
+  my $msgcode = shift;
+  my $msg = _gettext($msgcode);
+  if ( $msg eq $msgcode ) {
+    "Error code $msgcode (message for locale $locale not found)";
+  } else {
+    "$msg (error code $msgcode)";
+  }
+}
+
+=back
+
+=head1 BUGS
+
+i18n/l10n, eek
+
+=head1 SEE ALSO
+
+L<FS::msgcat>, L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 978ea72e7..cb42b266c 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -12,7 +12,7 @@ use DBI qw(:sql_types);
 use DBIx::DBSchema 0.19;
 use FS::UID qw(dbh checkruid getotaker datasrc driver_name);
 use FS::SearchCache;
-use FS::msgcat qw(gettext);
+use FS::Msgcat qw(gettext);
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(dbh fields hfields qsearch qsearchs dbdef jsearch);
@@ -572,7 +572,7 @@ sub delete {
   $h_sth->execute or return $h_sth->errstr if $h_sth;
   dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
 
-  #no need to needlessly destoy the data either
+  #no need to needlessly destoy the data either (causes problems actually)
   #undef $self; #no need to keep object!
 
   '';
@@ -825,9 +825,12 @@ false.
 
 sub ut_text {
   my($self,$field)=@_;
+  warn "msgcat ". \&msgcat. "\n";
+  warn "notexist ". \&notexist. "\n";
+  warn "AUTOLOAD ". \&AUTOLOAD. "\n";
   $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/]+)$/
     or return gettext('illegal_or_empty_text'). " $field: ".
-              $self->getfield($field);
+               $self->getfield($field);
   $self->setfield($field,$1);
   '';
 }
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index e1a51732f..fd1ccd772 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -26,7 +26,7 @@ use FS::queue;
 use FS::part_pkg;
 use FS::part_bill_event;
 use FS::cust_bill_event;
-use FS::msgcat qw(gettext);
+use FS::Msgcat qw(gettext);
 
 @ISA = qw( FS::Record );
 
diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm
index b82e2e732..a5533a088 100644
--- a/FS/FS/cust_main_invoice.pm
+++ b/FS/FS/cust_main_invoice.pm
@@ -7,7 +7,7 @@ use FS::Record qw( qsearchs );
 use FS::Conf;
 use FS::cust_main;
 use FS::svc_acct;
-use FS::msgcat qw(gettext);
+use FS::Msgcat qw(gettext);
 
 @ISA = qw( FS::Record );
 
@@ -170,7 +170,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.11 2002-04-10 13:42:48 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.12 2002-04-12 13:22:02 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/msgcat.pm b/FS/FS/msgcat.pm
index 3eca14b83..fa10d34fa 100644
--- a/FS/FS/msgcat.pm
+++ b/FS/FS/msgcat.pm
@@ -1,20 +1,12 @@
 package FS::msgcat;
 
 use strict;
-use vars qw( @ISA @EXPORT_OK $conf $locale $debug );
+use vars qw( @ISA );
 use Exporter;
 use FS::UID;
 use FS::Record qw( qsearchs );
-use FS::Conf;
 
 @ISA = qw(FS::Record);
-@EXPORT_OK = qw( gettext geterror );
-
-$FS::UID::callback{'msgcat'} = sub {
-  $conf = new FS::Conf;
-  $locale = $conf->config('locale') || 'en_US';
-  $debug = $conf->exists('show-msgcat-codes')
-};
 
 =head1 NAME
 
@@ -22,14 +14,8 @@ FS::msgcat - Object methods for message catalog entries
 
 =head1 SYNOPSIS
 
-  use FS::msgcat qw(gettext);
-
-  #simple interface for retreiving messages...
-  $message = gettext('msgcode');
-  #or errors (includes the error code)
-  $message = geterror('msgcode');
+  use FS::msgcat;
 
-  #maintenance stuff
   $record = new FS::msgcat \%hash;
   $record = new FS::msgcat { 'column' => 'value' };
 
@@ -58,6 +44,8 @@ from FS::Record.  The following fields are currently supported:
 
 =back
 
+If you just want to B<use> message catalogs, see L<FS::Msgcat>.
+
 =head1 METHODS
 
 =over 4
@@ -130,61 +118,13 @@ sub check {
 
 =back
 
-=head1 SUBROUTINES
-
-=over 4
-
-=item gettext MSGCODE
-
-Returns the full message for the supplied message code.
-
-=cut
-
-sub gettext {
-  $debug ? geterror(@_) : _gettext(@_);
-}
-
-sub _gettext {
-  my $msgcode = shift;
-  my $msgcat = qsearchs('msgcat', {
-    'msgcode' => $msgcode,
-    'locale' => $locale
-  } );
-  if ( $msgcat ) {
-    $msgcat->msg;
-  } else {
-    warn "WARNING: message for msgcode $msgcode in locale $locale not found";
-    $msgcode;
-  }
-
-}
-
-=item geterror MSGCODE
-
-Returns the full message for the supplied message code, including the message
-code.
-
-=cut
-
-sub geterror {
-  my $msgcode = shift;
-  my $msg = _gettext($msgcode);
-  if ( $msg eq $msgcode ) {
-    "Error code $msgcode (message for locale $locale not found)";
-  } else {
-    "$msg (error code $msgcode)";
-  }
-}
-
-=back
-
 =head1 BUGS
 
 i18n/l10n, eek
 
 =head1 SEE ALSO
 
-L<FS::Record>, schema.html from the base documentation.
+L<FS::Msgcat>, L<FS::Record>, schema.html from the base documentation.
 
 =cut
 
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 8af413b1d..835f5318f 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -1,13 +1,15 @@
 package FS::part_export;
 
 use strict;
-use vars qw( @ISA );
+use vars qw( @ISA @EXPORT_OK %exports );
+use Exporter;
 use FS::Record qw( qsearch qsearchs dbh );
 use FS::part_svc;
 use FS::part_export_option;
 use FS::export_svc;
 
 @ISA = qw(FS::Record);
+@EXPORT_OK = qw(export_info);
 
 =head1 NAME
 
@@ -428,10 +430,118 @@ sub _export_delete {
 
 =back
 
+=head1 SUBROUTINES
+
+=over 4
+
+=item export_info [ SVCDB ]
+
+Returns a hash reference of the exports for the given I<svcdb>, or if no
+I<svcdb> is specified, for all exports.  The keys of the hash are
+I<exporttype>s and the values are again hash references containing information
+on the export:
+
+  'desc'     => 'Description',
+  'options'  => {
+                  'option'  => { label=>'Option Label' },
+                  'option2' => { label=>'Another label' },
+                },
+  'nodomain' => 'Y', #or ''
+  'notes'    => 'Additional notes',
+
+=cut
+
+sub export_info {
+  #warn $_[0];
+  return $exports{$_[0]} if @_;
+  #{ map { %{$exports{$_}} } keys %exports };
+  my $r = { map { %{$exports{$_}} } keys %exports };
+}
+
+=item exporttype2svcdb EXPORTTYPE
+
+Returns the applicable I<svcdb> for an I<exporttype>.
+
+=cut
+
+sub exporttype2svcdb {
+  my $exporttype = $_[0];
+  foreach my $svcdb ( keys %exports ) {
+    return $svcdb if grep { $exporttype eq $_ } keys %{$exports{$svcdb}};
+  }
+  '';
+}
+
+%exports = (
+  'svc_acct' => {
+    'sysvshell' => {
+      'desc' =>
+        'Batch export of /etc/passwd and /etc/shadow files (Linux/SysV)',
+      'options' => {},
+    },
+    'bsdshell' => {
+      'desc' =>
+        'Batch export of /etc/passwd and /etc/master.passwd files (BSD)',
+      'options' => {},
+    },
+#    'nis' => {
+#      'desc' =>
+#        'Batch export of /etc/global/passwd and /etc/global/shadow for NIS ',
+#      'options' => {},
+#    },
+    'bsdshell' => {
+      'desc' =>
+        'Batch export of /etc/passwd and /etc/master.passwd files (BSD)',
+      'options' => {},
+    },
+    'textradius' => {
+      'desc' => 'Batch export of a text /etc/raddb/users file (Livingston, Cistron)',
+    },
+    'sqlradius' => {
+      'desc' => 'Real-time export to SQL-backed RADIUS (ICRADIUS, FreeRADIUS)',
+      'options' => {
+        'datasrc'  => { label=>'DBI data source' },
+        'username' => { label=>'Database username' },
+        'password' => { label=>'Database password' },
+      },
+      'nodomain' => 'Y',
+      'notes' => 'Not specifying datasrc will export to the freeside database? (no...  notes on MySQL replication, DBI::Proxy, etc., from Conf.pm && export.html etc., reset with bin/sqlradius_reset',
+    },
+    'cyrus' => {
+      'desc' => 'Real-time export to Cyrus IMAP server',
+    },
+    'cp' => {
+      'desc' => 'Real-time export to Critical Path Account Provisioning Protocol',
+    },
+    'infostreet' => {
+      'desc' => 'Real-time export to InfoStreet streetSmartAPI',
+      'options' => {
+        'url'      => { label=>'XML-RPC Access URL', },
+        'login'    => { label=>'InfoStreet login', },
+        'password' => { label=>'InfoStreet password', },
+        'groupID'  => { label=>'InfoStreet groupID', },
+      },
+      'nodomain' => 'Y',
+      'notes' => 'Real-time export to <a href="http://www.infostreet.com/">InfoStreet</a> streetSmartAPI.  Requires installation of <a href="http://search.cpan.org/search?dist=Frontier-Client">Frontier::Client</a> from CPAN.',
+    }
+  },
+
+  'svc_domain' => {},
+
+  'svc_acct_sm' => {},
+
+  'svc_forward' => {},
+
+  'svc_www' => {},
+
+);
+
+=back
+
 =head1 NEW EXPORT CLASSES
 
-Should be added to httemplate/edit/part_export.cgi and a module should
-be FS/FS/part_export/ (an example may be found in eg/export_template.pm)
+Should be added to the %export hash here, and a module should be added in
+FS/FS/part_export/ (an example may be found in eg/export_template.pm)
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 030ffbe19..38e24c110 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -28,7 +28,7 @@ use FS::svc_domain;
 use FS::raddb;
 use FS::queue;
 use FS::radius_usergroup;
-use FS::msgcat qw(gettext);
+use FS::Msgcat qw(gettext);
 
 @ISA = qw( FS::svc_Common );
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 440c75565..1c90dfc0e 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -27,6 +27,7 @@ FS/UI/CGI.pm
 FS/UI/Gtk.pm
 FS/UI/agent.pm
 FS/UID.pm
+FS/Msgcat.pm
 FS/agent.pm
 FS/agent_type.pm
 FS/cust_bill.pm
@@ -80,6 +81,8 @@ t/CGI.t
 t/Conf.t
 t/ConfItem.t
 t/Record.t
+t/UID.t
+t/Msgcat.t
 t/cust_bill.t
 t/cust_bill_event.t
 t/cust_bill_pay.t
@@ -124,5 +127,4 @@ t/type_pkgs.t
 t/queue.t
 t/queue_arg.t
 t/msgcat.t
-t/UID.t
 t/raddb.t
diff --git a/FS/t/Msgcat.t b/FS/t/Msgcat.t
new file mode 100644
index 000000000..29e71b33c
--- /dev/null
+++ b/FS/t/Msgcat.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::Msgcat;
+$loaded=1;
+print "ok 1\n";
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index ebf424cd7..41fed9a14 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -13,7 +13,7 @@ use FS::Conf;
 use FS::Record qw( qsearch qsearchs );
 use FS::cust_main_county;
 use FS::cust_main;
-use FS::msgcat qw(gettext);
+use FS::Msgcat qw(gettext);
 
 use vars qw( $opt $Debug );
 
diff --git a/htetc/global.asa b/htetc/global.asa
index 057695183..62f454475 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -15,6 +15,7 @@ use FS::Record qw(qsearch qsearchs fields dbdef);
 use FS::Conf;
 use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
                small_custview myexit);
+use FS::Msgcat qw(gettext geterror);
 
 use FS::agent;
 use FS::agent_type;
@@ -48,7 +49,8 @@ use FS::svc_www;
 use FS::type_pkgs;
 use FS::part_export;
 use FS::part_export_option;
-use FS::msgcat qw(gettext geterror);
+use FS::export_svc;
+use FS::msgcat;
 
 sub Script_OnStart {
   $Response->AddHeader('Pragma' => 'no-cache');
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 2f8146e3e..056efa88b 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -72,6 +72,7 @@ sub handler
       use FS::Conf;
       use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
                      small_custview myexit);
+      use FS::Msgcat qw(gettext geterror);
 
       use FS::agent;
       use FS::agent_type;
@@ -105,7 +106,8 @@ sub handler
       use FS::type_pkgs;
       use FS::part_export;
       use FS::part_export_option;
-      use FS::msgcat qw(gettext geterror);
+      use FS::export_svc;
+      use FS::msgcat;
 
       *CGI::redirect = sub {
         my( $self, $location ) = @_;
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index c8adebcd6..4c9b1bd95 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -66,8 +66,12 @@ function part_export_areyousure(href) {
       <%= $hashref->{svcdb} %></TD>
     <TD ROWSPAN=<%= $rowspan %>><%= itable() %>
 <%
-  my @part_export = qsearch('part_export', { svcpart => $part_svc->svcpart } );
-  foreach my $part_export ( @part_export ) {
+#  my @part_export =
+map { qsearchs('part_export', { exportnum => $_->exportnum } ) } qsearch('export_svc', { svcpart => $part_svc->svcpart } ) ;
+  foreach my $part_export (
+    map { qsearchs('part_export', { exportnum => $_->exportnum } ) } 
+      qsearch('export_svc', { svcpart => $part_svc->svcpart } )
+  ) {
 %>
       <TR>
         <TD><A HREF="<%= $p %>edit/part_export.cgi?<%= $part_export->exportnum %>"><%= $part_export->exporttype %> to <%= $part_export->machine %></A></TD></TR>
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index f3127403e..77b80d06f 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -21,76 +21,10 @@ if ( $cgi->param('error') ) {
 }
 $action ||= $part_export->exportnum ? 'Edit' : 'Add';
 
-my %exports = (
-  'svc_acct' => {
-    'sysvshell' => {
-      'desc' =>
-        'Batch export of /etc/passwd and /etc/shadow files (Linux/SysV)',
-      'options' => {},
-    },
-    'bsdshell' => {
-      'desc' =>
-        'Batch export of /etc/passwd and /etc/master.passwd files (BSD)',
-      'options' => {},
-    },
-#    'nis' => {
-#      'desc' =>
-#        'Batch export of /etc/global/passwd and /etc/global/shadow for NIS ',
-#      'options' => {},
-#    },
-    'bsdshell' => {
-      'desc' =>
-        'Batch export of /etc/passwd and /etc/master.passwd files (BSD)',
-      'options' => {},
-    },
-    'textradius' => {
-      'desc' => 'Batch export of a text /etc/raddb/users file (Livingston, Cistron)',
-    },
-    'sqlradius' => {
-      'desc' => 'Real-time export to SQL-backed RADIUS (ICRADIUS, FreeRADIUS)',
-      'options' => {
-        'datasrc'  => { label=>'DBI data source' },
-        'username' => { label=>'Database username' },
-        'password' => { label=>'Database password' },
-      },
-      'nodomain' => 'Y',
-      'notes' => 'Not specifying datasrc will export to the freeside database? (no...  notes on MySQL replication, DBI::Proxy, etc., from Conf.pm && export.html etc., reset with bin/sqlradius_reset',
-    },
-    'cyrus' => {
-      'desc' => 'Real-time export to Cyrus IMAP server',
-    },
-    'cp' => {
-      'desc' => 'Real-time export to Critical Path Account Provisioning Protocol',
-    },
-    'infostreet' => {
-      'desc' => 'Real-time export to InfoStreet streetSmartAPI',
-      'options' => {
-        'url'      => { label=>'XML-RPC Access URL', },
-        'login'    => { label=>'InfoStreet login', },
-        'password' => { label=>'InfoStreet password', },
-        'groupID'  => { label=>'InfoStreet groupID', },
-      },
-      'nodomain' => 'Y',
-      'notes' => 'Real-time export to <a href="http://www.infostreet.com/">InfoStreet</a> streetSmartAPI.  Requires installation of <a href="http://search.cpan.org/search?dist=Frontier-Client">Frontier::Client</a> from CPAN.',
-    }
-  },
-
-  'svc_domain' => {},
-
-  'svc_acct_sm' => {},
-
-  'svc_forward' => {},
-
-  'svc_www' => {},
-
-);
-
-#my $svcdb = $part_export->part_svc->svcdb;
-#YUCK
-my $svcdb = 'svc_acct';
+#my $exports = FS::part_export::export_info($svcdb);
+my $exports = FS::part_export::export_info();
 
-my %layers = map { $_ => "$_ - ". $exports{$svcdb}{$_}{desc} }
-               keys %{$exports{$svcdb}};
+my %layers = map { $_ => "$_ - ". $exports->{$_}{desc} } keys %$exports;
 $layers{''}='';
 
 my $widget = new HTML::Widgets::SelectLayers(
@@ -105,9 +39,9 @@ my $widget = new HTML::Widgets::SelectLayers(
     my $layer = shift;
     my $html = qq!<INPUT TYPE="hidden" NAME="exporttype" VALUE="$layer">!.
                ntable("#cccccc",2);
-    foreach my $option ( keys %{$exports{$svcdb}->{$layer}{options}} ) {
+    foreach my $option ( keys %{$exports->{$layer}{options}} ) {
 #    foreach my $option ( qw(url login password groupID ) ) {
-      my $optinfo = $exports{$svcdb}->{$layer}{options}{$option};
+      my $optinfo = $exports->{$layer}{options}{$option};
       my $label = $optinfo->{label};
       my $value = $cgi->param($option) || $part_export->option($option);
       $html .= qq!<TR><TD ALIGN="right">$label</TD><TD>!.
@@ -117,10 +51,10 @@ my $widget = new HTML::Widgets::SelectLayers(
     $html .= '</TABLE>';
 
     $html .= '<INPUT TYPE="hidden" NAME="options" VALUE="'.
-             join(',', keys %{$exports{$svcdb}->{$layer}{options}} ). '">';
+             join(',', keys %{$exports->{$layer}{options}} ). '">';
 
     $html .= '<INPUT TYPE="hidden" NAME="nodomain" VALUE="'.
-             $exports{$svcdb}->{$layer}{nodomain}. '">';
+             $exports->{$layer}{nodomain}. '">';
 
     $html .= '<INPUT TYPE="submit" VALUE="'.
              ( $part_export->exportnum ? "Apply changes" : "Add export" ).
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index b4900a01c..e9c571f9c 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -132,8 +132,30 @@ my %defs = (
     'form_checkbox'  => [ 'disabled' ],
     'layer_callback' => sub {
       my $layer = shift;
-      my $html = qq!<INPUT TYPE="hidden" NAME="svcdb" VALUE="$layer">!.
-                 table(). "<TH>Field</TH><TH COLSPAN=2>Modifier</TH>";
+      my $html = qq!<INPUT TYPE="hidden" NAME="svcdb" VALUE="$layer">!;
+
+      my $columns = 3;
+      my $count = 0;
+      my @part_export =
+        grep { $layer eq FS::part_export::exporttype2svcdb($_->exporttype) }
+          qsearch( 'part_export', {} );
+      $html .= '<BR><BR>'. table().
+               table(). "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
+      foreach my $part_export ( @part_export ) {
+        $html .= '<TD><INPUT TYPE="checkbox"'.
+                 ' NAME="exportnum'. $part_export->exportnum. '"  VALUE="1" ';
+        $html .= 'CHECKED'
+          if qsearchs( 'export_svc', {
+                                       exportnum => $part_export->exportnum,
+                                       svcpart   => $part_svc->svcpart       });
+        $html .= '> '. $part_export->exporttype. ' to '. $part_export->machine.
+                 '</TD>';
+        $count++;
+        $html .= '</TR><TR>' unless $count % $columns;
+      }
+      $html .= '</TR></TABLE><BR><BR>';
+
+      $html .=  table(). "<TH>Field</TH><TH COLSPAN=2>Modifier</TH>";
       #yucky kludge
       my @fields = defined( $FS::Record::dbdef->table($layer) )
                       ? grep { $_ ne 'svcnum' } fields($layer)
diff --git a/httemplate/edit/process/agent_type.cgi b/httemplate/edit/process/agent_type.cgi
index 67aacfdd5..516594573 100755
--- a/httemplate/edit/process/agent_type.cgi
+++ b/httemplate/edit/process/agent_type.cgi
@@ -22,6 +22,7 @@ if ( $error ) {
   print $cgi->redirect(popurl(2). "agent_type.cgi?". $cgi->query_string );
 } else {
 
+  #false laziness w/ edit/process/part_svc.cgi
   foreach my $part_pkg (qsearch('part_pkg',{})) {
     my($pkgpart)=$part_pkg->getfield('pkgpart');
 
diff --git a/httemplate/edit/process/part_export.cgi b/httemplate/edit/process/part_export.cgi
index 34eb699bf..6b4d007e4 100644
--- a/httemplate/edit/process/part_export.cgi
+++ b/httemplate/edit/process/part_export.cgi
@@ -5,7 +5,7 @@ my $exportnum = $cgi->param('exportnum');
 my $old = qsearchs('part_export', { 'exportnum'=>$exportnum } ) if $exportnum;
 
 #fixup options
-warn join('-', split(',',$cgi->param('options')));
+#warn join('-', split(',',$cgi->param('options')));
 my %options = map { $_=>$cgi->param($_) } split(',',$cgi->param('options'));
 
 my $new = new FS::part_export ( {
@@ -16,9 +16,9 @@ my $new = new FS::part_export ( {
 
 my $error;
 if ( $exportnum ) {
-  warn $old;
-  warn $exportnum;
-  warn $new->machine;
+  #warn $old;
+  #warn $exportnum;
+  #warn $new->machine;
   $error = $new->replace($old,\%options);
 } else {
   $error = $new->insert(\%options);
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 31ab13438..859670b17 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -33,6 +33,29 @@ if ( $error ) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). "part_svc.cgi?". $cgi->query_string );
 } else {
+
+  #false laziness w/ edit/process/agent_type.cgi
+  foreach my $part_export (qsearch('part_export',{})) {
+    my $exportnum = $part_export->exportnum;
+    my $export_svc = qsearchs('export_svc', {
+      'exportnum' => $part_export->exportnum,
+      'svcpart'   => $new->svcpart,
+    } );
+    if ( $export_svc && ! $cgi->param("exportnum". $part_export->exportnum) ) {
+      $error = $export_svc->delete;
+      die $error if $error;
+    } elsif ( $cgi->param("exportnum". $part_export->exportnum)
+              && ! $export_svc ) {
+      $export_svc = new FS::export_svc ( {
+        'exportnum' => $part_export->exportnum,
+        'svcpart'   => $new->svcpart,
+      } );
+      $error = $export_svc->insert;
+      die $error if $error;
+    }
+
+  }
+
   print $cgi->redirect(popurl(3)."browse/part_svc.cgi");
 }
 
diff --git a/httemplate/misc/delete-customer.cgi b/httemplate/misc/delete-customer.cgi
index 5088fef7b..7016c9166 100755
--- a/httemplate/misc/delete-customer.cgi
+++ b/httemplate/misc/delete-customer.cgi
@@ -43,4 +43,18 @@ canceled service with you.  For that, cancel all of the customer's packages.
 </form></body></html>
 END
 
+#Deleting a customer you have financial records on (i.e. credits) is
+#typically considered fraudulant bookkeeping.  Remember, deleting   
+#customers should ONLY be used for completely bogus records.  You should
+#NOT delete real customers who simply discontinue service.
+#
+#For real customers who simply discontinue service, cancel all of the
+#customer's packages.  Customers with all cancelled packages are not  
+#billed.  There is no need to take further action to prevent billing on
+#customers with all cancelled packages.
+#
+#Also see the "hidecancelledcustomers" and "hidecancelledpackages"
+#configuration options, which will allow you to surpress the display of
+#cancelled customers and packages, respectively.
+
 %>
-- 
cgit v1.2.1


From 81faa8d34d1287a61fd723d73ab02a022cf5d050 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 12 Apr 2002 15:14:58 +0000
Subject: fudge up FS::cust_pkg::order ("Order and cancel packages") to try to
 move services between svcparts as a last resort...

---
 FS/FS/cust_pkg.pm            | 59 ++++++++++++++++++++++++++++++++++----------
 FS/FS/cust_svc.pm            | 39 ++++++++++++++++++++++++++++-
 httemplate/edit/cust_pkg.cgi | 13 ++++++++--
 3 files changed, 95 insertions(+), 16 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index b241ecac2..f858a999d 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -556,23 +556,20 @@ sub order {
   my(%svcnum);
   # generate %svcnum
   # for those packages being removed:
-  #@{ $svcnum{$svcpart} } goes from a svcpart to a list of FS::Record
-  # objects (table eq 'cust_svc')
+  #@{ $svcnum{$svcpart} } goes from a svcpart to a list of FS::cust_svc objects
   my($pkgnum);
   foreach $pkgnum ( @{$remove_pkgnums} ) {
-    my($cust_svc);
-    foreach $cust_svc (qsearch('cust_svc',{'pkgnum'=>$pkgnum})) {
+    foreach my $cust_svc (qsearch('cust_svc',{'pkgnum'=>$pkgnum})) {
       push @{ $svcnum{$cust_svc->getfield('svcpart')} }, $cust_svc;
     }
   }
   
-  my(@cust_svc);
+  my @cust_svc;
   #generate @cust_svc
   # for those packages the customer is purchasing:
   # @{$pkgparts} is a list of said packages, by pkgpart
   # @cust_svc is a corresponding list of lists of FS::Record objects
-  my($pkgpart);
-  foreach $pkgpart ( @{$pkgparts} ) {
+  foreach my $pkgpart ( @{$pkgparts} ) {
     unless ( $part_pkg{$pkgpart} ) {
       $dbh->rollback if $oldAutoCommit;
       return "Customer not permitted to purchase pkgpart $pkgpart!";
@@ -584,6 +581,39 @@ sub order {
     ];
   }
 
+  #special-case until this can be handled better
+  # move services to new svcparts - even if the svcparts don't match (svcdb
+  # needs to...)
+  # looks like they're moved in no particular order, ewwwwwwww
+  # and looks like just one of each svcpart can be moved... o well
+
+  #start with still-leftover services
+  #foreach my $svcpart ( grep { scalar(@{ $svcnum{$_} }) } keys %svcnum ) {
+  foreach my $svcpart ( keys %svcnum ) {
+    next unless @{ $svcnum{$svcpart} };
+
+    my $svcdb = $svcnum{$svcpart}->[0]->part_svc->svcdb;
+
+    #find an empty place to put one
+    my $i = 0;
+    foreach my $pkgpart ( @{$pkgparts} ) {
+      my @pkg_svc = qsearch('pkg_svc', { pkgpart=>$pkgpart } );
+      if ( ! @{$cust_svc[$i]} #find an empty place to put them with 
+           && grep { $svcdb eq $_->part_svc->svcdb } #with appropriate svcdb
+                @pkg_svc
+      ) {
+        my $new_svcpart =
+          ( grep { $svcdb eq $_->part_svc->svcdb } @pkg_svc )[0]->svcpart; 
+        my $cust_svc = shift @{$svcnum{$svcpart}};
+        $cust_svc->svcpart($new_svcpart);
+        #warn "changing from $svcpart to $new_svcpart!!!\n";
+        $cust_svc[$i] = [ $cust_svc ];
+      }
+      $i++;
+    }
+
+  }
+  
   #check for leftover services
   foreach (keys %svcnum) {
     next unless @{ $svcnum{$_} };
@@ -602,8 +632,7 @@ sub order {
   local $SIG{PIPE} = 'IGNORE'; 
 
   #first cancel old packages
-#  my($pkgnum);
-  foreach $pkgnum ( @{$remove_pkgnums} ) {
+  foreach my $pkgnum ( @{$remove_pkgnums} ) {
     my($old) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
     unless ( $old ) {
       $dbh->rollback if $oldAutoCommit;
@@ -620,7 +649,7 @@ sub order {
   }
 
   #now add new packages, changing cust_svc records if necessary
-#  my($pkgpart);
+  my $pkgpart;
   while ($pkgpart=shift @{$pkgparts} ) {
  
     my $new = new FS::cust_pkg {
@@ -638,8 +667,12 @@ sub order {
     foreach my $cust_svc ( @{ shift @cust_svc } ) {
       my(%hash) = $cust_svc->hash;
       $hash{'pkgnum'}=$pkgnum;
-      my($new) = new FS::cust_svc ( \%hash );
-      my($error)=$new->replace($cust_svc);
+      my $new = new FS::cust_svc ( \%hash );
+
+      #avoid Record diffing missing changed svcpart field from above.
+      my $old = qsearchs('cust_svc', { 'svcnum' => $cust_svc->svcnum } );
+
+      my $error = $new->replace($old);
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
         return "Couldn't link old service to new package: $error";
@@ -656,7 +689,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.16 2002-01-29 16:33:15 ivan Exp $
+$Id: cust_pkg.pm,v 1.17 2002-04-12 15:14:58 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 3e38be39e..23a3980ef 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -94,6 +94,43 @@ Called by the cancel method of the package (see L<FS::cust_pkg>).
 Replaces the OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
+=cut
+
+sub replace {
+  my ( $new, $old ) = ( shift, shift );
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $new->SUPER::replace($old);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error if $error;
+  }
+
+  if ( $new->svcpart != $old->svcpart ) {
+    my $svc_x = $new->svc_x;
+    my $new_svc_x = ref($svc_x)->new({$svc_x->hash});
+    my $error = $new_svc_x->replace($svc_x);
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error if $error;
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  ''; #no error
+
+}
+
 =item check
 
 Checks all fields to make sure this is a valid service.  If there is an error,
@@ -245,7 +282,7 @@ sub seconds_since {
 
 =head1 VERSION
 
-$Id: cust_svc.pm,v 1.12 2002-02-10 22:06:28 ivan Exp $
+$Id: cust_svc.pm,v 1.13 2002-04-12 15:14:58 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index d546f7409..485d601eb 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -3,7 +3,16 @@
 
 my %pkg = ();
 my %comment = ();
-foreach (qsearch('part_pkg', { 'disabled' => '' })) {
+my %all_pkg = ();
+my %all_comment = ();
+#foreach (qsearch('part_pkg', { 'disabled' => '' })) {
+#  $pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
+#  $comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
+#}
+foreach (qsearch('part_pkg', {} )) {
+  $all_pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
+  $all_comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
+  next if $_->disabled;
   $pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
   $comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
 }
@@ -46,7 +55,7 @@ END
     my($pkgnum,$pkgpart)=( $_->getfield('pkgnum'), $_->getfield('pkgpart') );
     print qq!<TD><INPUT TYPE="checkbox" NAME="remove_pkg" VALUE="$pkgnum"!;
     print " CHECKED" if $remove_pkg{$pkgnum};
-    print qq!>$pkgnum: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n!;
+    print qq!>$pkgnum: $all_pkg{$pkgpart} - $all_comment{$pkgpart}</TD>\n!;
     $count ++ ;
     if ($count == 2)
     {
-- 
cgit v1.2.1


From f70985da9714a8a2c5dd87f56d891ed0197ef590 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 13 Apr 2002 08:51:54 +0000
Subject: bulk queue operations (closes: Bug#389)

---
 FS/FS/queue.pm            | 27 ++++++++++++++++++++++-----
 httemplate/misc/queue.cgi | 33 +++++++++++++++++++++++++++------
 2 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index 4b880a23c..5719eff70 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -241,7 +241,10 @@ sub joblisting {
   my @queue = qsearch( 'queue', $hashref );
   return '' unless scalar(@queue);
 
-  my $html = FS::CGI::table(). <<END;
+  my $p = FS::CGI::popurl(2);
+
+  my $html = qq!<FORM ACTION="$p/misc/queue.cgi" METHOD="POST">!.
+             FS::CGI::table(). <<END;
       <TR>
         <TH COLSPAN=2>Job</TH>
         <TH>Args</TH>
@@ -253,7 +256,8 @@ END
 
   my $dangerous = $conf->exists('queue_dangerous_controls');
 
-  my $p = FS::CGI::popurl(2);
+  my $areboxes = 0;
+
   foreach my $queue ( sort { 
     $a->getfield('jobnum') <=> $b->getfield('jobnum')
   } @queue ) {
@@ -270,8 +274,9 @@ END
     my $date = time2str( "%a %b %e %T %Y", $queue->_date );
     my $status = $queue->status;
     $status .= ': '. $queue->statustext if $queue->statustext;
-    if ( $dangerous
-         || ( ! $noactions && $status =~ /^failed/ || $status =~ /^locked/ ) ) {
+    my $changable = $dangerous
+         || ( ! $noactions && $status =~ /^failed/ || $status =~ /^locked/ );
+    if ( $changable ) {
       $status .=
         qq! (&nbsp;<A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=new">retry</A>&nbsp;|!.
         qq!&nbsp;<A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=del">remove</A>&nbsp;)!;
@@ -300,12 +305,24 @@ END
       $html .= "<TD>$account</TD>";
     }
 
+    if ( $changable ) {
+      $areboxes=1;
+      $html .=
+        qq!<TD><INPUT NAME="jobnum$jobnum" TYPE="checkbox" VALUE="1"></TD>!;
+
+    }
+
     $html .= '</TR>';
 
 }
 
   $html .= '</TABLE>';
 
+  if ( $areboxes ) {
+    $html .= '<BR><INPUT TYPE="submit" NAME="action" VALUE="retry selected">'.
+             '<INPUT TYPE="submit" NAME="action" VALUE="remove selected"><BR>';
+  }
+
   $html;
 
 }
@@ -314,7 +331,7 @@ END
 
 =head1 VERSION
 
-$Id: queue.pm,v 1.10 2002-03-27 07:08:08 ivan Exp $
+$Id: queue.pm,v 1.11 2002-04-13 08:51:54 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/misc/queue.cgi b/httemplate/misc/queue.cgi
index 7e962d498..8c1e5362d 100644
--- a/httemplate/misc/queue.cgi
+++ b/httemplate/misc/queue.cgi
@@ -1,13 +1,17 @@
 <%
 
-$cgi->param('jobnum') =~ /^(\d+)$/ or die "Illegal jobnum";
-my $jobnum = $1;
-my $job = qsearchs('queue', { 'jobnum' => $1 })
-  or die "unknown jobnum $jobnum";
-
-$cgi->param('action') =~ /^(new|del)$/ or die "Illegal action";
+$cgi->param('action') =~ /^(new|del|(retry|remove) selected)$/
+  or die "Illegal action";
 my $action = $1;
 
+my $job;
+if ( $action eq 'new' || $action eq 'del' ) {
+  $cgi->param('jobnum') =~ /^(\d+)$/ or die "Illegal jobnum";
+  my $jobnum = $1;
+  $job = qsearchs('queue', { 'jobnum' => $1 })
+    or die "unknown jobnum $jobnum";
+}
+
 if ( $action eq 'new' ) {
   my %hash = $job->hash;
   $hash{'status'} = 'new';
@@ -18,6 +22,23 @@ if ( $action eq 'new' ) {
 } elsif ( $action eq 'del' ) {
   my $error = $job->delete;
   die $error if $error;
+} elsif ( $action =~ /^(retry|remove) selected$/ ) {
+  foreach my $jobnum (
+    map { /^jobnum(\d+)$/; $1; } grep /^jobnum\d+$/, $cgi->param
+  ) {
+    my $job = qsearchs('queue', { 'jobnum' => $jobnum });
+    if ( $action eq 'retry selected' && $job ) { #new
+      my %hash = $job->hash;
+      $hash{'status'} = 'new';
+      $hash{'statustext'} = '';
+      my $new = new FS::queue \%hash;
+      my $error = $new->replace($job);
+      die $error if $error;
+    } elsif ( $action eq 'remove selected' && $job ) { #del
+      my $error = $job->delete;
+      die $error if $error;
+    }
+  }
 }
 
 print $cgi->redirect(popurl(2). "browse/queue.cgi");
-- 
cgit v1.2.1


From b6556f749fa0d341e161236f98f5d21358c9b8dd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 13 Apr 2002 09:14:07 +0000
Subject: allow invoice_lines(0) meaning no limit, no padding (see Bug#388)

---
 FS/FS/cust_bill.pm | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 1f402fca4..f157f86f6 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -815,11 +815,13 @@ sub print_text {
   my @invoice_template = $conf->config($templatefile)
   or die "cannot load config file $templatefile";
   $invoice_lines = 0;
+  my $wasfunc = 0;
   foreach ( grep /invoice_lines\(\d+\)/, @invoice_template ) { #kludgy
     /invoice_lines\((\d+)\)/;
     $invoice_lines += $1;
+    $wasfunc=1;
   }
-  die "no invoice_lines() functions in template?" unless $invoice_lines;
+  die "no invoice_lines() functions in template?" unless $wasfunc;
   my $invoice_template = new Text::Template (
     TYPE   => 'ARRAY',
     SOURCE => [ map "$_\n", @invoice_template ],
@@ -835,11 +837,14 @@ sub print_text {
   $date = $self->_date;
   $page = 1;
 
-  $total_pages =
-    int( scalar(@FS::cust_bill::buf) / $FS::cust_bill::invoice_lines );
-  $total_pages++
-    if scalar(@FS::cust_bill::buf) % $FS::cust_bill::invoice_lines;
-
+  if ( $FS::cust_bill::invoice_lines ) {
+    $total_pages =
+      int( scalar(@FS::cust_bill::buf) / $FS::cust_bill::invoice_lines );
+    $total_pages++
+      if scalar(@FS::cust_bill::buf) % $FS::cust_bill::invoice_lines;
+  } else {
+    $total_pages = 1;
+  }
 
   #format address (variable for the template)
   my $l = 0;
@@ -873,7 +878,7 @@ sub print_text {
   #and subroutine for the template
 
   sub FS::cust_bill::_template::invoice_lines {
-    my $lines = shift;
+    my $lines = shift or return @buf;
     map { 
       scalar(@buf) ? shift @buf : [ '', '' ];
     }
@@ -900,7 +905,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.26 2002-04-07 06:23:29 ivan Exp $
+$Id: cust_bill.pm,v 1.27 2002-04-13 09:14:07 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 8d77be096e5f1cec2d64182d1f95d13a1744a6d5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 13 Apr 2002 10:46:18 +0000
Subject: s/otaker/order-taker/

---
 httemplate/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index c638aec16..ce476c01c 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -138,7 +138,7 @@
             </UL>
     Customers
       <UL>
-        <LI><A HREF="search/cust_main-otaker.cgi">Search customers by otaker</A>
+        <LI><A HREF="search/cust_main-otaker.cgi">Search customers by order-taker</A>
       </UL>
     <FORM ACTION="search/sql.cgi" METHOD="POST">SQL query: <TT>SELECT </TT><INPUT TYPE="text" NAME="sql" SIZE=32><INPUT TYPE="submit" VALUE="Query"></FORM>
 
-- 
cgit v1.2.1


From 327df8aefdcf96c9c83805570abf4cc242cf46b9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 13 Apr 2002 13:36:26 +0000
Subject: - documentation updates - move Critical Path export to new-style
 export - bin/sqlradius_reset gets a manpage and becomes
 FS/bin/freeside-sqlradius-reset

---
 FS/FS.pm                        |  29 +++++++-
 FS/FS/Conf.pm                   |   6 +-
 FS/FS/part_export.pm            |  11 +++-
 FS/FS/part_export/cp.pm         | 117 +++++++++++++++++++++++++++++++++
 FS/FS/svc_acct.pm               | 142 ----------------------------------------
 FS/bin/freeside-overdue         |   3 +
 FS/bin/freeside-sqlradius-reset |  73 +++++++++++++++++++++
 bin/sqlradius_reset             |  51 ---------------
 httemplate/edit/part_export.cgi |   7 +-
 9 files changed, 239 insertions(+), 200 deletions(-)
 create mode 100644 FS/FS/part_export/cp.pm
 create mode 100755 FS/bin/freeside-sqlradius-reset
 delete mode 100644 bin/sqlradius_reset

diff --git a/FS/FS.pm b/FS/FS.pm
index 36fabcb8e..287e50c67 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -5,6 +5,9 @@ use vars qw($VERSION);
 
 $VERSION = '0.01';
 
+#find missing entries in this file with:
+# for a in `ls *pm | cut -d. -f1`; do grep 'L<FS::'$a'>' ../FS.pm >/dev/null || echo "missing $a" ; done
+
 1;
 __END__
 
@@ -26,6 +29,12 @@ L<FS::UID> - User class (not yet OO)
 
 L<FS::CGI> - Non OO-subroutines for the web interface.
 
+L<FS::Msgcat> - Message catalog
+
+L<FS::SearchCache> - Message catalog
+
+L<FS::raddb> - RADIUS dictionary
+
 =head2 Database record classes
 
 L<FS::Record> - Database record base class
@@ -43,6 +52,8 @@ L<FS::svc_Common> - Service base class
 
 L<FS::svc_acct> - Account (shell, RADIUS, POP3) class
 
+L<FS::radius_usergroup> - RADIUS groups
+
 L<FS::svc_domain> - Domain class
 
 L<FS::domain_record> - DNS zone entries
@@ -121,6 +132,8 @@ L<FS::queue> - Job queue
 
 L<FS::queue_arg> - Job arguments
 
+L<FS::msgcat> - Message catalogs
+
 =head1 Remote API modules
 
 L<FS::SignupClient>
@@ -131,11 +144,23 @@ L<FS::MailAdminServer>
 
 =head2 Command-line utilities
 
-L<freeside-email>
+L<freeside-adduser>
 
 L<freeside-queued>
 
-L<freeside-adduser>
+L<freeside-daily>
+
+L<freeside-expiration-alerter>
+
+L<freeside-email>
+
+L<freeside-cc-receipts-report>
+
+L<freeside-credit-report>
+
+L<freeside-receivables-report>
+
+L<freeside-tax-report>
 
 L<freeside-bill>
 
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 0c41980ea..b02913258 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -305,8 +305,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'cp_app',
-    'section'     => 'mail',
-    'description' => 'Integration with <a href="http://www.cp.net/">Critial Path Account Provisioning Protocol</a>, four lines: "host:port", username, password, and workgroup (for new users).',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add a <i>cp</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to integrate with <a href="http://www.cp.net/">Critial Path Account Provisioning Protocol</a>, four lines: "host:port", username, password, and workgroup (for new users).',
     'type'        => 'textarea',
   },
 
@@ -404,7 +404,7 @@ httemplate/docs/config.html
   {
     'key'         => 'icradiusmachines',
     'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add <i>sqlradius</i> exports to <a href="../browse/part_svc">Service definitions</a> instead.  This option used to enable radcheck and radreply table population - by default in the Freeside database, or in the database specified by the <a href="http://rootwood.haze.st/aspside/config/config-view.cgi#icradius_secrets">icradius_secrets</a> config option (the radcheck and radreply tables needs to be created manually).  You do not need to use MySQL for your Freeside database to export to an ICRADIUS/FreeRADIUS MySQL database with this option.  <blockquote><b>ADDITIONAL DEPRECATED FUNCTIONALITY</b> (instead use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or point icradius_secrets to the external database) - your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines or <a href="http://www.freeradius.org/">FreeRADIUS</a> (with MySQL authentication) machines, one per line.  Machines listed in this file will have the radcheck table exported to them.  Each line should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: <CODE>"radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd"</CODE></blockquote>',
+    'description' => '<b>DEPRECATED</b>, add a <i>sqlradius</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to enable radcheck and radreply table population - by default in the Freeside database, or in the database specified by the <a href="http://rootwood.haze.st/aspside/config/config-view.cgi#icradius_secrets">icradius_secrets</a> config option (the radcheck and radreply tables needs to be created manually).  You do not need to use MySQL for your Freeside database to export to an ICRADIUS/FreeRADIUS MySQL database with this option.  <blockquote><b>ADDITIONAL DEPRECATED FUNCTIONALITY</b> (instead use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or point icradius_secrets to the external database) - your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines or <a href="http://www.freeradius.org/">FreeRADIUS</a> (with MySQL authentication) machines, one per line.  Machines listed in this file will have the radcheck table exported to them.  Each line should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: <CODE>"radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd"</CODE></blockquote>',
     'type'        => [qw( checkbox textarea )],
   },
 
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 835f5318f..7ae00f00c 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -505,13 +505,22 @@ sub exporttype2svcdb {
         'password' => { label=>'Database password' },
       },
       'nodomain' => 'Y',
-      'notes' => 'Not specifying datasrc will export to the freeside database? (no...  notes on MySQL replication, DBI::Proxy, etc., from Conf.pm && export.html etc., reset with bin/sqlradius_reset',
+      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  Use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete and repopulate the tables from the Freeside database.',
     },
     'cyrus' => {
       'desc' => 'Real-time export to Cyrus IMAP server',
     },
     'cp' => {
       'desc' => 'Real-time export to Critical Path Account Provisioning Protocol',
+      'options' => {
+        'host'      => { label=>'Hostname' },
+        'port'      => { label=>'Port number' },
+        'username'  => { label=>'Username' },
+        'password'  => { label=>'Password' },
+        'domain'    => { label=>'Domain' },
+        'workgroup' => { label=>'Default Workgroup' },
+      },
+      'notes' => 'Real-time export to <a href="http://www.cp.net/">Critial Path Account Provisioning Protocol</a>.  Requires installation of <a href="http://search.cpan.org/search?dist=Net-APP">Net::APP</a> from CPAN.',
     },
     'infostreet' => {
       'desc' => 'Real-time export to InfoStreet streetSmartAPI',
diff --git a/FS/FS/part_export/cp.pm b/FS/FS/part_export/cp.pm
new file mode 100644
index 000000000..58ac85e8a
--- /dev/null
+++ b/FS/FS/part_export/cp.pm
@@ -0,0 +1,117 @@
+package FS::part_export::cp;
+
+use vars qw(@ISA);
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->cp_queue( $svc_acct->svcnum, 'create_mailbox',
+    Mailbox   => $svc_acct->username,
+    Password  => $svc_acct->_password,
+    Workgroup => $self->option('workgroup'),
+    Domain    => $svc_acct->domain,
+  );
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = (shift, shift, shift);
+  return "can't change domain with Critical Path"
+    if $old->domain ne $new->domain;
+  return '' unless $old->username  ne $new->username
+                || $old->_password ne $new->_password;
+  $self->cp_queue( $new->svcnum, 'replace', $new->domain,
+    $old->username, $new->username, $old->_password, $new->_password );
+}
+
+sub _export_delete {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->cp_queue( $svc_acct->svcnum, 'delete_mailbox',
+    Mailbox   => $svc_acct->username,
+    Domain    => $svc_acct->domain,
+  );
+}
+
+sub cp_queue {
+  my( $self, $svcnum, $method ) = (shift, shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => 'FS::part_export::cp::cp_command',
+  };
+  $queue->insert(
+    $self->option('host'),
+    $self->option('port'),
+    $self->option('username'),
+    $self->option('password'),
+    $self->option('domain'),
+    $method,
+    @_,
+  );
+}
+
+sub cp_command { #subroutine, not method
+  my($host, $port, $username, $password, $login_domain, $method, @args) = @_;
+
+  #quelle hack
+  if ( $method eq 'replace' ) {
+  
+    my( $domain, $old_username, $new_username, $old_password, $new_password)
+      = @args;
+
+    if ( $old_username ne $new_username ) {
+      cp_command($host, $port, $username, $password, 'rename_mailbox',
+        Domain        => $domain,
+        Old_Mailbox   => $old_username,
+        New_Mailbox   => $new_username,
+      );
+    }
+
+    if ( $new_password =~ /^\*SUSPENDED\* (.*)$/ ) {
+      $new_password = $1;
+      cp_command($host, $port, $username, $password, 'set_mailbox_status',
+        Domain       => $domain,
+        Mailbox      => $new_username,
+        Other        => 'T',
+        Other_Bounce => 'T',
+      );
+    } else {
+      cp_command($host, $port, $username, $password, 'set_mailbox_status',
+        Domain       => $domain,
+        Mailbox      => $new_username,
+        Other        => 'F',
+        Other_Bounce => 'F',
+      );
+    }
+
+    if ( $old_password ne $new_password ) {
+      cp_command($host, $port, $username, $password, 'change_mailbox',
+        Domain    => $domain,
+        Mailbox   => $new_username,
+        Password  => $new_password,
+      );
+    }
+
+    return;
+  }
+  #eof quelle hack
+
+  eval "use Net::APP;";
+
+  my $app = new Net::APP (
+    "$host:$port",
+    User     => $username,
+    Password => $password,
+    Domain   => $login_domain,
+    Timeout  => 60,
+    #Debug    => 1,
+  ) or die "$@\n";
+
+  $app->$method( @args );
+
+  die $app->message."\n" unless $app->ok;
+
+}
+
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 38e24c110..1e1cbb019 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -8,7 +8,6 @@ use vars qw( @ISA $nossh_hack $noexport_hack $conf
              $username_noperiod $username_uppercase
              $shellmachine $useradd $usermod $userdel $mydomain
              $cyrus_server $cyrus_admin_user $cyrus_admin_pass
-             $cp_server $cp_user $cp_pass $cp_workgroup
              $dirhash
              @saltset @pw_set
              $rsync $ssh $exportdir $vpopdir);
@@ -80,16 +79,6 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
     $cyrus_admin_user = '';
     $cyrus_admin_pass = '';
   }
-  if ( $conf->exists('cp_app') ) {
-    ($cp_server, $cp_user, $cp_pass, $cp_workgroup) =
-      $conf->config('cp_app');
-    eval "use Net::APP;"
-  } else {
-    $cp_server = '';
-    $cp_user = '';
-    $cp_pass = '';
-    $cp_workgroup = '';
-  }
 
   $dirhash = $conf->config('dirhash') || 0;
   $exportdir = "/usr/local/etc/freeside/export." . datasrc;
@@ -351,18 +340,6 @@ sub insert {
     }
   }
 
-  if ( $cp_server ) {
-    my $queue = new FS::queue {
-      'svcnum' => $self->svcnum,
-      'job'    => 'FS::svc_acct::cp_insert'
-    };
-    $error = $queue->insert($self->username, $self->_password);
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-  }
-  
   if ( $vpopdir ) {
 
     my $vpopmail_queue =
@@ -423,27 +400,6 @@ sub cyrus_insert {
   1;
 }
 
-sub cp_insert {
-  my( $username, $password ) = @_;
-
-  my $app = new Net::APP ( $cp_server,
-                        User     => $cp_user,
-                        Password => $cp_pass,
-                        Domain   => $mydomain,
-                        Timeout  => 60,
-                        #Debug    => 1,
-                      ) or die "$@\n";
-
-  $app->create_mailbox(
-                        Mailbox   => $username,
-                        Password  => $password,
-                        Workgroup => $cp_workgroup,
-                        Domain    => $mydomain,
-                      );
-
-  die $app->message."\n" unless $app->ok;
-}
-
 sub vpopmail_insert {
   my( $username, $password, $domain, $vpopdir ) = @_;
   
@@ -633,15 +589,6 @@ sub delete {
     }
   }
   
-  if ( $cp_server ) {
-    my $queue = new FS::queue { 'job' => 'FS::svc_acct::cp_delete' };
-    $error = $queue->insert($self->username);
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-  }
-
   if ( $vpopdir ) {
     my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_delete' };
     $error = $queue->insert( $self->username, $self->domain );
@@ -679,24 +626,6 @@ sub cyrus_delete {
   1;
 }
 
-sub cp_delete {
-  my( $username ) = @_;
-  my $app = new Net::APP ( $cp_server,
-                        User     => $cp_user,
-                        Password => $cp_pass,
-                        Domain   => $mydomain,
-                        Timeout  => 60,
-                        #Debug    => 1,
-                      ) or die "$@\n";
-
-  $app->delete_mailbox(
-                        Mailbox   => $username,
-                        Domain    => $mydomain,
-                      );
-
-  die $app->message."\n" unless $app->ok;
-}
-
 sub vpopmail_delete {
   my( $username, $domain ) = @_;
   
@@ -871,18 +800,6 @@ sub replace {
     }
   }
 
-  if ( $cp_server && $old->_password ne $new->_password ) {
-    my $queue = new FS::queue {  
-      'svcnum' => $new->svcnum,
-      'job' => 'FS::svc_acct::cp_change'
-    };
-    $error = $queue->insert( $new->username, $new->_password );
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-  }
-
   if ( $vpopdir ) {
     my $cpassword = crypt(
       $new->_password,$saltset[int(rand(64))].$saltset[int(rand(64))]
@@ -914,65 +831,6 @@ sub replace {
   ''; #no error
 }
 
-sub cp_rename {
-  my ( $old_username, $new_username ) = @_;
-
-  my $app = new Net::APP ( $cp_server,
-                        User     => $cp_user,
-                        Password => $cp_pass,
-                        Domain   => $mydomain,
-                        Timeout  => 60,
-                        #Debug    => 1,
-                      ) or die "$@\n";
-
-  $app->rename_mailbox(
-                        Domain        => $mydomain,
-                        Old_Mailbox   => $old_username,
-                        New_Mailbox   => $new_username,
-                      );
-
-  die $app->message."\n" unless $app->ok;
-
-}
-
-sub cp_change {
-  my ( $username, $password ) = @_;
-
-  my $app = new Net::APP ( $cp_server,
-                        User     => $cp_user,
-                        Password => $cp_pass,
-                        Domain   => $mydomain,
-                        Timeout  => 60,
-                        #Debug    => 1,
-                      ) or die "$@\n";
-
-  if ( $password =~ /^\*SUSPENDED\* (.*)$/ ) {
-    $password = $1;
-    $app->set_mailbox_status(
-                              Domain       => $mydomain,
-                              Mailbox      => $username,
-                              Other        => 'T',
-                              Other_Bounce => 'T',
-                            );
-  } else {
-    $app->set_mailbox_status(
-                              Domain       => $mydomain,
-                              Mailbox      => $username,
-                              Other        => 'F',
-                              Other_Bounce => 'F',
-                            );
-  }
-  die $app->message."\n" unless $app->ok;
-
-  $app->change_mailbox(
-                        Domain    => $mydomain,
-                        Mailbox   => $username,
-                        Password  => $password,
-                      );
-  die $app->message."\n" unless $app->ok;
-
-}
-
 sub vpopmail_replace_password {
   my( $username, $password, $domain ) = @_;
   
diff --git a/FS/bin/freeside-overdue b/FS/bin/freeside-overdue
index db99e62b4..116245f9c 100755
--- a/FS/bin/freeside-overdue
+++ b/FS/bin/freeside-overdue
@@ -129,6 +129,9 @@ freeside-overdue - Perform actions on overdue and/or expired accounts.
 
 =head1 DESCRIPTION
 
+This script is deprecated in 1.4.0.  You should use freeside-daily and invoice
+events instead.
+
 Performs actions on overdue and/or expired accounts.
 
 Selection options (at least one selection option is required):
diff --git a/FS/bin/freeside-sqlradius-reset b/FS/bin/freeside-sqlradius-reset
new file mode 100755
index 000000000..132be754a
--- /dev/null
+++ b/FS/bin/freeside-sqlradius-reset
@@ -0,0 +1,73 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::part_export;
+use FS::svc_acct;
+use FS::cust_svc;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+#my $machine = shift or die &usage;
+
+my @exports = qsearch('part_export', { 'exporttype' => 'sqlradius' } );
+
+foreach my $export ( @exports ) {
+  my $icradius_dbh = DBI->connect(
+    map { $export->option($_) } qw( datasrc username password )
+  ) or die $DBI::errstr;
+  for my $table (qw( radcheck radreply usergroup )) {
+    my $sth = $icradius_dbh->prepare("DELETE FROM $table");
+    $sth->execute or die "Can't reset $table table: ". $sth->errstr;
+  }
+}
+
+foreach my $export ( @exports ) {
+
+  #my @svcparts = map { $_->svcpart } $export->export_svc;
+
+  my @svc_acct =
+    map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
+      map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+        grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+          $export->export_svc;
+
+  foreach my $svc_acct ( @svc_acct ) {
+
+    #false laziness with FS::svc_acct::insert (like it matters)
+    my $error = $export->export_insert($svc_acct);
+    die $error if $error;
+
+  }
+}
+
+sub usage {
+  #die "Usage:\n\n  sqlradius_reset user machine\n";
+  die "Usage:\n\n  sqlradius_reset user\n";
+}
+
+=head1 NAME
+
+freeside-sqlradius-reset - Command line interface to reset and recreate RADIUS SQL tables
+
+=head1 SYNOPSIS
+
+  freeside-sqlradius-reset username
+
+=head1 DESCRIPTION
+
+Deletes the radcheck, radreply and usergroup tables and repopulates them from
+the Freeside database, for all sqlradius exports.
+
+B<username> is a username added by freeside-adduser.
+
+=head1 SEE ALSO
+
+<FS::part_export>, L<FS::part_export::sqlradius>
+
+=cut
+
+
+
diff --git a/bin/sqlradius_reset b/bin/sqlradius_reset
deleted file mode 100644
index 454043f54..000000000
--- a/bin/sqlradius_reset
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::part_export;
-use FS::svc_acct;
-use FS::cust_svc;
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-#my $machine = shift or die &usage;
-
-my @exports = qsearch('part_export', { 'exporttype' => 'sqlradius' } );
-
-foreach my $export ( @exports ) {
-  my $icradius_dbh = DBI->connect(
-    map { $export->option($_) } qw( datasrc username password )
-  ) or die $DBI::errstr;
-  for my $table (qw( radcheck radreply usergroup )) {
-    my $sth = $icradius_dbh->prepare("DELETE FROM $table");
-    $sth->execute or die "Can't reset $table table: ". $sth->errstr;
-  }
-}
-
-foreach my $export ( @exports ) {
-
-  #my @svcparts = map { $_->svcpart } $export->export_svc;
-
-  my @svc_acct =
-    map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
-      map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-        grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-          $export->export_svc;
-
-  foreach my $svc_acct ( @svc_acct ) {
-
-    #false laziness with FS::svc_acct::insert (like it matters)
-    my $error = $export->export_insert($svc_acct);
-    die $error if $error;
-
-  }
-}
-
-sub usage {
-  #die "Usage:\n\n  sqlradius_reset user machine\n";
-  die "Usage:\n\n  sqlradius_reset user\n";
-}
-
-
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 77b80d06f..b72b277c9 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -39,12 +39,17 @@ my $widget = new HTML::Widgets::SelectLayers(
     my $layer = shift;
     my $html = qq!<INPUT TYPE="hidden" NAME="exporttype" VALUE="$layer">!.
                ntable("#cccccc",2);
+
+    $html .= '<TR><TD ALIGN="right">Description</TD><TD BGCOLOR=#ffffff>'.
+             $exports->{$layer}{notes}. '</TD></TR>'
+      if $layer;
+
     foreach my $option ( keys %{$exports->{$layer}{options}} ) {
 #    foreach my $option ( qw(url login password groupID ) ) {
       my $optinfo = $exports->{$layer}{options}{$option};
       my $label = $optinfo->{label};
       my $value = $cgi->param($option) || $part_export->option($option);
-      $html .= qq!<TR><TD ALIGN="right">$label</TD><TD>!.
+      $html .= qq!<TR><TD ALIGN="right">$label</TD>!.
                qq!<TD><INPUT TYPE="text" NAME="$option" VALUE="$value"></TD>!.
                '</TR>';
     }
-- 
cgit v1.2.1


From 38616a70ddf2b60925af53b605a4ea40a1c51e09 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 14 Apr 2002 01:36:35 +0000
Subject: docu for invoice_lines(0) with no arguments

---
 httemplate/docs/billing.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/billing.html b/httemplate/docs/billing.html
index de59fc60a..4a5642af9 100644
--- a/httemplate/docs/billing.html
+++ b/httemplate/docs/billing.html
@@ -10,7 +10,7 @@
     <li>Optional: Invoice template customization
       <ul>
         <li>See the <a href="http://search.cpan.org/doc/MJD/Text-Template-1.42/Template.pm">Text::Template</a> documentation for details on the substitution language.
-        <li>You <b>must</b> call the invoice_lines() function at least once - pass it a number of lines, and it returns a list of array references, each of two elements: a service description column, and a price column.
+        <li>You <b>must</b> call the invoice_lines() function at least once - pass it a number of lines, and it returns a list of array references, each of two elements: a service description column, and a price column.  Alternatively, call invoice_lines() with no arguments, and pagination will be disabled - all invoice line items will print on one page, with no padding (recommended for email invoices).
         <li>In addition, the following variables are available:
           <ul>
             <li>$invnum - invoice number
-- 
cgit v1.2.1


From 9bf26ed4b065b12826fc2980ff277a2f3be25c1d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 14 Apr 2002 09:11:22 +0000
Subject: - move cyrus, shellcommands, CP exports exports to new-style -
 skeleton files for vpopmail exports - documentation updates - add big schema
 diagram to docs

---
 FS/FS/Conf.pm                      |  20 ++--
 FS/FS/part_export.pm               |  46 +++++++--
 FS/FS/part_export/cp.pm            |  21 ++---
 FS/FS/part_export/cyrus.pm         |  98 ++++++++++++++++++++
 FS/FS/part_export/infostreet.pm    |   4 +-
 FS/FS/part_export/shellcommands.pm |  59 ++++++++++++
 FS/FS/part_export/vpopmail.pm      |  47 ++++++++++
 FS/FS/svc_acct.pm                  | 185 +------------------------------------
 FS/MANIFEST                        |   8 ++
 FS/t/part_export-cp.t              |   5 +
 FS/t/part_export-cyrus.t           |   5 +
 FS/t/part_export-shellcommands.t   |   5 +
 FS/t/part_export-vpopmail.t        |   5 +
 eg/export_template.pm              |   4 +-
 httemplate/docs/billing.html       |   4 +-
 httemplate/docs/legacy.html        |   1 +
 httemplate/docs/schema.dia         | Bin 0 -> 10766 bytes
 httemplate/docs/schema.html        |   1 +
 httemplate/docs/schema.png         | Bin 0 -> 446146 bytes
 19 files changed, 301 insertions(+), 217 deletions(-)
 create mode 100644 FS/FS/part_export/cyrus.pm
 create mode 100644 FS/FS/part_export/shellcommands.pm
 create mode 100644 FS/FS/part_export/vpopmail.pm
 create mode 100644 FS/t/part_export-cp.t
 create mode 100644 FS/t/part_export-cyrus.t
 create mode 100644 FS/t/part_export-shellcommands.t
 create mode 100644 FS/t/part_export-vpopmail.t
 create mode 100644 httemplate/docs/schema.dia
 create mode 100644 httemplate/docs/schema.png

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index b02913258..d16dd9448 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -298,8 +298,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'cyrus',
-    'section'     => 'mail',
-    'description' => 'Integration with <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a>, three lines: IMAP server, admin username, and admin password.  Cyrus::IMAP::Admin should be installed locally and the connection to the server secured.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add a <i>cyrus</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to integrate with <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a>, three lines: IMAP server, admin username, and admin password.  Cyrus::IMAP::Admin should be installed locally and the connection to the server secured.',
     'type'        => 'textarea',
   },
 
@@ -604,29 +604,29 @@ httemplate/docs/config.html
 
   {
     'key'         => 'shellmachine',
-    'section'     => 'shell',
-    'description' => 'A single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines\', it also enables `.qmail-extension\' file maintenance.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add a <i>cp</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain a single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines\', it also enables `.qmail-extension\' file maintenance.',
     'type'        => 'text',
   },
 
   {
     'key'         => 'shellmachine-useradd',
-    'section'     => 'shell',
-    'description' => 'The command(s) to run on shellmachine when an account is created.  If the <b>shellmachine</b> option is set but this option is not, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If this option is set but empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add a <i>cp</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain command(s) to run on shellmachine when an account is created.  If the <b>shellmachine</b> option is set but this option is not, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If this option is set but empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.',
     'type'        => [qw( checkbox text )],
   },
 
   {
     'key'         => 'shellmachine-userdel',
-    'section'     => 'shell',
-    'description' => 'The command(s) to run on shellmachine when an account is deleted.  If the <b>shellmachine</b> option is set but this option is not, <code>userdel $username</code> is the default.  If this option is set but empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add a <i>cp</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain command(s) to run on shellmachine when an account is deleted.  If the <b>shellmachine</b> option is set but this option is not, <code>userdel $username</code> is the default.  If this option is set but empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.',
     'type'        => [qw( checkbox text )],
   },
 
   {
     'key'         => 'shellmachine-usermod',
-    'section'     => 'shell',
-    'description' => 'The command(s) to run on shellmachine when an account is modified.  If the <b>shellmachine</b> option is set but this option is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add a <i>cp</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain command(s) to run on shellmachine when an account is modified.  If the <b>shellmachine</b> option is set but this option is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.',
     #'type'        => [qw( checkbox text )],
     'type'        => 'text',
   },
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 7ae00f00c..82503c4ee 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -489,14 +489,37 @@ sub exporttype2svcdb {
 #        'Batch export of /etc/global/passwd and /etc/global/shadow for NIS ',
 #      'options' => {},
 #    },
-    'bsdshell' => {
-      'desc' =>
-        'Batch export of /etc/passwd and /etc/master.passwd files (BSD)',
-      'options' => {},
-    },
     'textradius' => {
       'desc' => 'Batch export of a text /etc/raddb/users file (Livingston, Cistron)',
     },
+
+    'shellcommands' => {
+      'desc' => 'Real-time export via arbitrary commands on a remote machine (i.e. useradd, userdel, etc.)',
+      'options' => {
+        'machine' => { label=>'Remote machine' },
+        'user' => { label=>'Remote username', default=>'root' },
+        'useradd' => { label=>'Insert command',
+                       default=>'useradd -d $dir -m -s $shell -u $uid $username'
+                      #default=>'cp -pr /etc/skel $dir; chown -R $uid.$gid $dir'
+                     },
+        'userdel' => { label=>'Delete command',
+                       default=>'userdel $username',
+                       #default=>'rm -rf $dir',
+                     },
+        'usermod' => { label=>'Modify command',
+                       default=>'usermod -d $new_dir -l $new_username -s $new_shell -u $new_uid $old_username',
+                      #default=>'[ -d $old_dir ] && mv $old_dir $new_dir || ( '.
+                       #  'chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; '.
+                       #  'find . -depth -print | cpio -pdm $new_dir; '.
+                       #  'chmod u-t $new_dir; chown -R $uid.$gid $new_dir; '.
+                       #  'rm -rf $old_dir'.
+                       #')'
+                     },
+      },
+      'nodomain' => 'Y',
+      'notes' => 'shellcommandsnotes... (this one is the nodomain one)',
+    },
+
     'sqlradius' => {
       'desc' => 'Real-time export to SQL-backed RADIUS (ICRADIUS, FreeRADIUS)',
       'options' => {
@@ -507,9 +530,18 @@ sub exporttype2svcdb {
       'nodomain' => 'Y',
       'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  Use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete and repopulate the tables from the Freeside database.',
     },
+
     'cyrus' => {
       'desc' => 'Real-time export to Cyrus IMAP server',
+      'options' => {
+        'server' => { label=>'IMAP server' },
+        'username' => { label=>'Admin username' },
+        'password' => { label=>'Admin password' },
+      },
+      'nodomain' => 'Y',
+      'notes' => 'Integration with <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a>.  Cyrus::IMAP::Admin should be installed locally and the connection to the server secured.  <B>svc_acct.quota</B> is used to set the Cyrus quota if available. '
     },
+
     'cp' => {
       'desc' => 'Real-time export to Critical Path Account Provisioning Protocol',
       'options' => {
@@ -522,6 +554,7 @@ sub exporttype2svcdb {
       },
       'notes' => 'Real-time export to <a href="http://www.cp.net/">Critial Path Account Provisioning Protocol</a>.  Requires installation of <a href="http://search.cpan.org/search?dist=Net-APP">Net::APP</a> from CPAN.',
     },
+    
     'infostreet' => {
       'desc' => 'Real-time export to InfoStreet streetSmartAPI',
       'options' => {
@@ -532,7 +565,8 @@ sub exporttype2svcdb {
       },
       'nodomain' => 'Y',
       'notes' => 'Real-time export to <a href="http://www.infostreet.com/">InfoStreet</a> streetSmartAPI.  Requires installation of <a href="http://search.cpan.org/search?dist=Frontier-Client">Frontier::Client</a> from CPAN.',
-    }
+    },
+
   },
 
   'svc_domain' => {},
diff --git a/FS/FS/part_export/cp.pm b/FS/FS/part_export/cp.pm
index 58ac85e8a..d998c1d95 100644
--- a/FS/FS/part_export/cp.pm
+++ b/FS/FS/part_export/cp.pm
@@ -69,22 +69,17 @@ sub cp_command { #subroutine, not method
       );
     }
 
+    my $other = 'F';
     if ( $new_password =~ /^\*SUSPENDED\* (.*)$/ ) {
       $new_password = $1;
-      cp_command($host, $port, $username, $password, 'set_mailbox_status',
-        Domain       => $domain,
-        Mailbox      => $new_username,
-        Other        => 'T',
-        Other_Bounce => 'T',
-      );
-    } else {
-      cp_command($host, $port, $username, $password, 'set_mailbox_status',
-        Domain       => $domain,
-        Mailbox      => $new_username,
-        Other        => 'F',
-        Other_Bounce => 'F',
-      );
+      $other = 'T';
     }
+    cp_command($host, $port, $username, $password, 'set_mailbox_status',
+      Domain       => $domain,
+      Mailbox      => $new_username,
+      Other        => $other,
+      Other_Bounce => $other,
+    );
 
     if ( $old_password ne $new_password ) {
       cp_command($host, $port, $username, $password, 'change_mailbox',
diff --git a/FS/FS/part_export/cyrus.pm b/FS/FS/part_export/cyrus.pm
new file mode 100644
index 000000000..110ff198f
--- /dev/null
+++ b/FS/FS/part_export/cyrus.pm
@@ -0,0 +1,98 @@
+package FS::part_export::cyrus;
+
+use vars qw(@ISA);
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my($self, $svc_acct) = (shift, shift);
+  $self->cyrus_queue( $svc_acct->svcnum, 'insert',
+    $svc_acct->username, $svc_acct->quota );
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = (shift, shift, shift);
+  return "can't change username using Cyrus"
+    if $old->username ne $new->username;
+  return '';
+#  #return '' unless $old->_password ne $new->_password;
+#  $self->cyrus_queue( $new->svcnum,
+#    'replace', $new->username, $new->_password );
+}
+
+sub _export_delete {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->cyrus_queue( $svc_acct->svcnum, 'delete',
+    $svc_acct->username );
+}
+
+#a good idea to queue anything that could fail or take any time
+sub cyrus_queue {
+  my( $self, $svcnum, $method ) = (shift, shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => "FS::part_export::cyrus::cyrus_$method",
+  };
+  $queue->insert(
+    $self->option('server'),
+    $self->option('username'),
+    $self->option('password'),
+    @_
+  );
+}
+
+sub cyrus_insert { #subroutine, not method
+  my $client = cyrus_connect(shift, shift, shift);
+  my( $username, $quota ) = @_;
+  my $rc = $client->create("user.$username");
+  my $error = $client->error;
+  die "creating user.$username: $error" if $error;
+
+  $rc = $client->setacl("user.$username", $username => 'all' );
+  $error = $client->error;
+  die "setacl user.$username: $error" if $error;
+
+  if ( $quota ) {
+    $rc = $client->setquota("user.$username", 'STORAGE' => $quota );
+    $error = $client->error;
+    die "setquota user.$username: $error" if $error;
+  }
+
+}
+
+sub cyrus_delete { #subroutine, not method
+  my ( $server, $admin_username, $password_username, $username ) = @_;
+  my $client = cyrus_connect($server, $admin_username, $password_username);
+
+  my $rc = $client->setacl("user.$username", $admin_username => 'all' );
+  my $error = $client->error;
+  die $error if $error;
+
+  $rc = $client->delete("user.$username");
+  $error = $client->error;
+  die $error if $error;
+}
+
+sub cyrus_connect {
+
+  my( $server, $admin_username, $admin_password ) = @_;
+
+  eval "use Cyrus::IMAP::Admin;";
+
+  my $client = Cyrus::IMAP::Admin->new($server);
+  $client->authenticate(
+    -user      => $admin_username,
+    -mechanism => "login",       
+    -password  => $admin_password,
+  );
+  $client;
+
+}
+
+#sub cyrus_replace { #subroutine, not method
+#}
+
+
diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
index c2386adb7..e86e82a66 100644
--- a/FS/FS/part_export/infostreet.pm
+++ b/FS/FS/part_export/infostreet.pm
@@ -10,7 +10,7 @@ sub rebless { shift; }
 sub _export_insert {
   my( $self, $svc_acct ) = (shift, shift);
   $self->infostreet_queue( $svc_acct->svcnum,
-    'createUser', $svc_acct->username, $svc_acct->password );
+    'createUser', $svc_acct->username, $svc_acct->_password );
 }
 
 sub _export_replace {
@@ -19,7 +19,7 @@ sub _export_replace {
     if $old->username ne $new->username;
   return '' unless $old->_password ne $new->_password;
   $self->infostreet_queue( $new->svcnum,
-    'passwd', $new->username, $new->password );
+    'passwd', $new->username, $new->_password );
 }
 
 sub _export_delete {
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
new file mode 100644
index 000000000..e99c382a4
--- /dev/null
+++ b/FS/FS/part_export/shellcommands.pm
@@ -0,0 +1,59 @@
+package FS::part_export::shellcommands;
+
+use vars qw(@ISA);
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my($self) = shift;
+  $self->_export_command($self, 'useradd', @_);
+}
+
+sub _export_delete {
+  my($self) = shift;
+  $self->_export_command($self, 'userdel', @_);
+}
+
+sub _export_command {
+  my ( $self, $action, $svc_acct) = (shift, shift, shift);
+  my $command = $self->option($action);
+  no strict 'refs';
+  ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
+  $self->shellcommands_queue(
+    $self->options('user')||'root'. "\@". $self->options('machine'),
+    eval(qq("$command"))
+  );
+}
+
+sub _export_replace {
+  my($self, $new, $old ) = (shift, shift, shift);
+  my $command = $self->option('usermod');
+  no strict 'refs';
+  ${"old_$_"} = $old->getfield($_) foreach $old->fields;
+  ${"new_$_"} = $new->getfield($_) foreach $new->fields;
+  $self->shellcommands_queue(
+    $self->options('user')||'root'. "\@". $self->options('machine'),
+    eval(qq("$command"))
+  );
+}
+
+#a good idea to queue anything that could fail or take any time
+sub shellcommands_queue {
+  my( $self, $svcnum ) = (shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => "Net::SSH::ssh_cmd", #freeside-queued pre-uses...
+  };
+  $queue->insert( @_ );
+}
+
+#sub shellcommands_insert { #subroutine, not method
+#}
+#sub shellcommands_replace { #subroutine, not method
+#}
+#sub shellcommands_delete { #subroutine, not method
+#}
+
diff --git a/FS/FS/part_export/vpopmail.pm b/FS/FS/part_export/vpopmail.pm
new file mode 100644
index 000000000..7a59f3259
--- /dev/null
+++ b/FS/FS/part_export/vpopmail.pm
@@ -0,0 +1,47 @@
+package FS::part_export::myexport;
+
+use vars qw(@ISA);
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my($self, $svc_acct) = (shift, shift);
+  $self->myexport_queue( $svc_acct->svcnum, 'insert',
+    $svc_acct->username, $svc_acct->_password );
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = (shift, shift, shift);
+  #return "can't change username with myexport"
+  #  if $old->username ne $new->username;
+  #return '' unless $old->_password ne $new->_password;
+  $self->myexport_queue( $new->svcnum,
+    'replace', $new->username, $new->_password );
+}
+
+sub _export_delete {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->myexport_queue( $svc_acct->svcnum,
+    'delete', $svc_acct->username );
+}
+
+#a good idea to queue anything that could fail or take any time
+sub myexport_queue {
+  my( $self, $svcnum, $method ) = (shift, shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => "FS::part_export::myexport::myexport_$method",
+  };
+  $queue->insert( @_ );
+}
+
+sub myexport_insert { #subroutine, not method
+}
+sub myexport_replace { #subroutine, not method
+}
+sub myexport_delete { #subroutine, not method
+}
+
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 1e1cbb019..ea1107823 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -6,8 +6,7 @@ use vars qw( @ISA $nossh_hack $noexport_hack $conf
              $usernamemax $passwordmin $passwordmax
              $username_ampersand $username_letter $username_letterfirst
              $username_noperiod $username_uppercase
-             $shellmachine $useradd $usermod $userdel $mydomain
-             $cyrus_server $cyrus_admin_user $cyrus_admin_pass
+             $mydomain
              $dirhash
              @saltset @pw_set
              $rsync $ssh $exportdir $vpopdir);
@@ -38,47 +37,16 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
   $conf = new FS::Conf;
   $dir_prefix = $conf->config('home');
   @shells = $conf->config('shells');
-  $shellmachine = $conf->config('shellmachine');
   $usernamemin = $conf->config('usernamemin') || 2;
   $usernamemax = $conf->config('usernamemax');
   $passwordmin = $conf->config('passwordmin') || 6;
   $passwordmax = $conf->config('passwordmax') || 8;
-  if ( $shellmachine ) {
-    if ( $conf->exists('shellmachine-useradd') ) {
-      $useradd = join("\n", $conf->config('shellmachine-useradd') )
-                 || 'cp -pr /etc/skel $dir; chown -R $uid.$gid $dir';
-    } else {
-      $useradd = 'useradd -d $dir -m -s $shell -u $uid $username';
-    }
-    if ( $conf->exists('shellmachine-userdel') ) {
-      $userdel = join("\n", $conf->config('shellmachine-userdel') )
-                 || 'rm -rf $dir';
-    } else {
-      $userdel = 'userdel $username';
-    }
-    $usermod = join("\n", $conf->config('shellmachine-usermod') )
-               || '[ -d $old_dir ] && mv $old_dir $new_dir || ( '.
-                    'chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; '.
-                    'find . -depth -print | cpio -pdm $new_dir; '.
-                    'chmod u-t $new_dir; chown -R $uid.$gid $new_dir; '.
-                    'rm -rf $old_dir'.
-                  ')';
-  }
   $username_letter = $conf->exists('username-letter');
   $username_letterfirst = $conf->exists('username-letterfirst');
   $username_noperiod = $conf->exists('username-noperiod');
   $username_uppercase = $conf->exists('username-uppercase');
   $username_ampersand = $conf->exists('username-ampersand');
   $mydomain = $conf->config('domain');
-  if ( $conf->exists('cyrus') ) {
-    ($cyrus_server, $cyrus_admin_user, $cyrus_admin_pass) =
-      $conf->config('cyrus');
-    eval "use Cyrus::IMAP::Admin;"
-  } else {
-    $cyrus_server = '';
-    $cyrus_admin_user = '';
-    $cyrus_admin_pass = '';
-  }
 
   $dirhash = $conf->config('dirhash') || 0;
   $exportdir = "/usr/local/etc/freeside/export." . datasrc;
@@ -94,8 +62,6 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
 @pw_set = ( 'a'..'z', 'A'..'Z', '0'..'9', '(', ')', '#', '!', '.', ',' );
 
-#not needed in 5.004 #srand($$|time);
-
 sub _cache {
   my $self = shift;
   my ( $hashref, $cache ) = @_;
@@ -228,7 +194,7 @@ is the default instead.  Otherwise the contents of the file are treated as
 a double-quoted perl string, with the following variables available:
 $username, $uid, $gid, $dir, and $shell.
 
-(TODOC: cyrus config file, L<FS::queue> and L<freeside-queued>)
+(TODOC: L<FS::queue> and L<freeside-queued>)
 
 (TODOC: new exports! $noexport_hack)
 
@@ -309,37 +275,6 @@ sub insert {
 
   #old-style exports
 
-  my( $username, $uid, $gid, $dir, $shell ) = (
-    $self->username,
-    $self->uid,
-    $self->gid,
-    $self->dir,
-    $self->shell,
-  );
-  if ( $username && $uid && $dir && $shellmachine && ! $nossh_hack ) {
-    my $queue = new FS::queue {
-      'svcnum' => $self->svcnum,
-      'job' => 'Net::SSH::ssh_cmd',
-    };
-    $error = $queue->insert("root\@$shellmachine", eval qq("$useradd") );
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-  }
-
-  if ( $cyrus_server ) {
-    my $queue = new FS::queue {
-      'svcnum' => $self->svcnum,
-      'job'    => 'FS::svc_acct::cyrus_insert',
-    };
-    $error = $queue->insert($self->username, $self->quota);
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-  }
-
   if ( $vpopdir ) {
 
     my $vpopmail_queue =
@@ -365,41 +300,6 @@ sub insert {
   ''; #no error
 }
 
-sub cyrus_insert {
-  my( $username, $quota ) = @_;
-
-  warn "cyrus_insert: starting for user $username, quota $quota\n";
-
-  warn "cyrus_insert: connecting to $cyrus_server\n";
-  my $client = Cyrus::IMAP::Admin->new($cyrus_server);
-
-  warn "cyrus_insert: authentication as $cyrus_admin_user\n";
-  $client->authenticate(
-    -user      => $cyrus_admin_user,
-    -mechanism => "login",       
-    -password  => $cyrus_admin_pass
-  );
-
-  warn "cyrus_insert: creating user.$username\n";
-  my $rc = $client->create("user.$username");
-  my $error = $client->error;
-  die "cyrus_insert: error creating user.$username: $error" if $error;
-
-  warn "cyrus_insert: setacl user.$username, $username => all\n";
-  $rc = $client->setacl("user.$username", $username => 'all' );
-  $error = $client->error;
-  die "cyrus_insert: error setacl user.$username: $error" if $error;
-
-  if ( $quota ) {
-    warn "cyrus_insert: setquota user.$username, STORAGE => $quota\n";
-    $rc = $client->setquota("user.$username", 'STORAGE' => $quota );
-    $error = $client->error;
-    die "cyrus_insert: error setquota user.$username: $error" if $error;
-  }
-
-  1;
-}
-
 sub vpopmail_insert {
   my( $username, $password, $domain, $vpopdir ) = @_;
   
@@ -468,8 +368,6 @@ is the default instead.  Otherwise the contents of the file are treated as a
 double-quoted perl string, with the following variables available:
 $username and $dir.
 
-(TODOC: cyrus config file)
-
 (TODOC: new exports! $noexport_hack)
 
 =cut
@@ -566,29 +464,6 @@ sub delete {
 
   #old-style exports
 
-  my( $username, $dir ) = (
-    $self->username,
-    $self->dir,
-  );
-  if ( $username && $shellmachine && ! $nossh_hack ) {
-    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' };
-    $error = $queue->insert("root\@$shellmachine", eval qq("$userdel") );
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-
-  }
-
-  if ( $cyrus_server ) {
-    my $queue = new FS::queue { 'job' => 'FS::svc_acct::cyrus_delete' };
-    $error = $queue->insert($self->username);
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-  }
-  
   if ( $vpopdir ) {
     my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_delete' };
     $error = $queue->insert( $self->username, $self->domain );
@@ -605,27 +480,6 @@ sub delete {
   '';
 }
 
-sub cyrus_delete {
-  my $username = shift; 
-
-  my $client = Cyrus::IMAP::Admin->new($cyrus_server);
-  $client->authenticate(
-    -user      => $cyrus_admin_user,
-    -mechanism => "login",       
-    -password  => $cyrus_admin_pass
-  );
-
-  my $rc = $client->setacl("user.$username", $cyrus_admin_user => 'all' );
-  my $error = $client->error;
-  die $error if $error;
-
-  $rc = $client->delete("user.$username");
-  $error = $client->error;
-  die $error if $error;
-
-  1;
-}
-
 sub vpopmail_delete {
   my( $username, $domain ) = @_;
   
@@ -649,7 +503,7 @@ sub vpopmail_delete {
   flock(VPASSWD,LOCK_UN);
   close(VPASSWD);
 
-  rmtree "$exportdir/domains/$domain/$username" or die "can't destroy Maildir";+ 
+  rmtree "$exportdir/domains/$domain/$username" or die "can't destroy Maildir"; 
   1;
 }
 
@@ -699,9 +553,6 @@ sub replace {
     return "Can't change uid!" if $old->uid != $new->uid;
   }
 
-  return "can't change username using Cyrus"
-    if $cyrus_server && $old->username ne $new->username;
-
   #change homdir when we change username
   $new->setfield('dir', '') if $old->username ne $new->username;
 
@@ -770,36 +621,6 @@ sub replace {
 
   #old-style exports
 
-  my ( $old_dir, $new_dir, $uid, $gid ) = (
-    $old->getfield('dir'),
-    $new->getfield('dir'),
-    $new->getfield('uid'),
-    $new->getfield('gid'),
-  );
-  if ( $old_dir && $new_dir && $old_dir ne $new_dir && ! $nossh_hack ) {
-    my $queue = new FS::queue { 
-      'svcnum' => $new->svcnum,
-      'job' => 'Net::SSH::ssh_cmd'
-    };
-    $error = $queue->insert("root\@$shellmachine", eval qq("$usermod") );
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-  }
-
-  if ( $cp_server && $old->username ne $new->username ) {
-    my $queue = new FS::queue { 
-      'svcnum' => $new->svcnum,
-      'job' => 'FS::svc_acct::cp_rename'
-    };
-    $error = $queue->insert( $old->username, $new->username );
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-  }
-
   if ( $vpopdir ) {
     my $cpassword = crypt(
       $new->_password,$saltset[int(rand(64))].$saltset[int(rand(64))]
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 1c90dfc0e..86516e3d9 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -51,6 +51,10 @@ FS/part_export.pm
 FS/part_export_option.pm
 FS/part_export/infostreet.pm
 FS/part_export/sqlradius.pm
+FS/part_export/cyrus.pm
+FS/part_export/cp.pm
+FS/part_export/shellcommands.pm
+FS/part_export/vpopmail.pm
 FS/part_pkg.pm
 FS/part_pop_local.pm
 FS/part_referral.pm
@@ -106,6 +110,10 @@ t/part_export.t
 t/part_export_option.t
 t/part_export-infostreet.t
 t/part_export-sqlradius.t
+t/part_export-cyrus.t
+t/part_export-cp.t
+t/part_export-shellcommands.t
+t/part_export-vpopmail.t
 t/part_pkg.t
 t/part_pop_local.t
 t/part_referral.t
diff --git a/FS/t/part_export-cp.t b/FS/t/part_export-cp.t
new file mode 100644
index 000000000..bbefa6c1b
--- /dev/null
+++ b/FS/t/part_export-cp.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::cp;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_export-cyrus.t b/FS/t/part_export-cyrus.t
new file mode 100644
index 000000000..e0b3f350e
--- /dev/null
+++ b/FS/t/part_export-cyrus.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::cyrus;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_export-shellcommands.t b/FS/t/part_export-shellcommands.t
new file mode 100644
index 000000000..7bb47d3f8
--- /dev/null
+++ b/FS/t/part_export-shellcommands.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::shellcommands;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_export-vpopmail.t b/FS/t/part_export-vpopmail.t
new file mode 100644
index 000000000..2e37114a2
--- /dev/null
+++ b/FS/t/part_export-vpopmail.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::vpopmail;
+$loaded=1;
+print "ok 1\n";
diff --git a/eg/export_template.pm b/eg/export_template.pm
index 11e1c3b14..f2a5a19f7 100644
--- a/eg/export_template.pm
+++ b/eg/export_template.pm
@@ -10,7 +10,7 @@ sub rebless { shift; }
 sub _export_insert {
   my($self, $svc_something) = (shift, shift);
   $self->myexport_queue( $svc_acct->svcnum, 'insert',
-    $svc_something->username, $svc_something->password );
+    $svc_something->username, $svc_something->_password );
 }
 
 sub _export_replace {
@@ -19,7 +19,7 @@ sub _export_replace {
   #  if $old->username ne $new->username;
   #return '' unless $old->_password ne $new->_password;
   $self->myexport_queue( $new->svcnum,
-    'replace', $new->username, $new->password );
+    'replace', $new->username, $new->_password );
 }
 
 sub _export_delete {
diff --git a/httemplate/docs/billing.html b/httemplate/docs/billing.html
index 4a5642af9..c6ef7a869 100644
--- a/httemplate/docs/billing.html
+++ b/httemplate/docs/billing.html
@@ -18,7 +18,7 @@
             <li>$page - current page
             <li>$total_pages - total pages
             <li>@address - A six-element array containing the customer name, company, and address.
-            <li>$overdue - true if this invoice is overdue
+<!--            <li>$overdue - true if this invoice is overdue -->
           </ul>
       </ul>
     <li>Batch credit card processing
@@ -47,6 +47,6 @@ if ( $error ) {
 </pre>
 All fields except paybatch are contained in the cust_pay_batch table.  You can use paybatch field to track particular batches and/or particular transactions within a batch.
     </ul>
-      <li>The <a href="man/bin/freeside-print-batch.html"><b>freeside-print-batch</b></a> script can print or email pending credit card batches for manual entry.
+<!--      <li>The <a href="man/bin/freeside-print-batch.html"><b>freeside-print-batch</b></a> script can print or email pending credit card batches for manual entry. -->
   </ul>
 </body>
diff --git a/httemplate/docs/legacy.html b/httemplate/docs/legacy.html
index 3ab21dab2..5f59bb83f 100755
--- a/httemplate/docs/legacy.html
+++ b/httemplate/docs/legacy.html
@@ -3,6 +3,7 @@
 </head>
 <body>
   <h1>Importing legacy data</h1>
+<font size="+2">NOTE: This file is OUT OF DATE with the landing of the new export code.  Importing your legacy data will most probably involve some hacking on the example scripts noted below.  Contributions to the import process are welcome.</font>
 <ul>
   <li><a name="svc_acct">bin/svc_acct.import</a> - Import `passwd', ( `shadow' or `master.passwd' ) and RADIUS `users'.  Before running bin/svc_acct.import, you need <a href="../browse/part_svc.cgi">services</a> (with table svc_acct) as follows:
     <ul>
diff --git a/httemplate/docs/schema.dia b/httemplate/docs/schema.dia
new file mode 100644
index 000000000..4a5465285
Binary files /dev/null and b/httemplate/docs/schema.dia differ
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 6ed96d229..07fcb908e 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -3,6 +3,7 @@
 </head>
 <body>
   <h1>Schema reference</h1>
+  Schema diagram: <a href="schema.png">as a giant .png</a> or <a href="schema.dia">dia source</a> (<a href="http://www.lysator.liu.se/~alla/dia/">dia homepage</a>).
   <ul>
     <li><a name="agent" href="man/FS/agent.html">agent</a> - Agents are resellers of your service.  Agents may be limited to a subset of your full offerings (via their agent type).
       <ul>
diff --git a/httemplate/docs/schema.png b/httemplate/docs/schema.png
new file mode 100644
index 000000000..b3f00375e
Binary files /dev/null and b/httemplate/docs/schema.png differ
-- 
cgit v1.2.1


From 3a549394ebffe37f496d0e004a0466b85aae6a98 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Apr 2002 00:02:26 +0000
Subject: allow signup to specify agentnum

---
 fs_signup/FS-SignupClient/SignupClient.pm | 3 +++
 fs_signup/FS-SignupClient/cgi/signup.cgi  | 4 +++-
 fs_signup/fs_signup_server                | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm
index 7c9d46d9e..de269e1c5 100644
--- a/fs_signup/FS-SignupClient/SignupClient.pm
+++ b/fs_signup/FS-SignupClient/SignupClient.pm
@@ -61,6 +61,7 @@ FS::SignupClient - Freeside signup client API
     '_password'        => $password,
     'sec_phrase'       => $sec_phrase,
     'popnum'           => $popnum,
+    'agentnum'         => $agentnum, #optional
   } );
 
 =head1 DESCRIPTION
@@ -163,6 +164,8 @@ sub new_customer {
     referral_custnum pkgpart username _password sec_phrase popnum
   ) };
 
+  $signup_data->{agentnum} = $hashref->{agentnum} if $hashref->{agentnum}
+
   nstore_fd($signup_data, \*SOCK) or die "can't send customer signup: $!";
   SOCK->flush;
 
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 284237dbc..f13dd437d 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.20 2002-04-10 13:42:48 ivan Exp $
+# $Id: signup.cgi,v 1.21 2002-04-16 00:02:26 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -8,6 +8,7 @@ use vars qw( @payby $cgi $locales $packages $pops $init_data $error
              $country $zip $daytime $night $fax $invoicing_list $payby $payinfo
              $paydate $payname $referral_custnum
              $pkgpart $username $password $password2 $sec_phrase $popnum
+             $agentnum
              $ieak_file $ieak_template $cck_file $cck_template
              $signup_html $signup_template $success_html $success_template
              $ac $exch $loc
@@ -164,6 +165,7 @@ if ( defined $cgi->param('magic') ) {
         'sec_phrase'       => $sec_phrase       = $cgi->param('sec_phrase'),
         '_password'        => $password         = $cgi->param('_password'),
         'popnum'           => $popnum           = $cgi->param('popnum'),
+        'agentnum'         => $agentnum         = $cgi->param('agentnum'),
       } );
 
     }
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 41fed9a14..12f1e5ef0 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -105,7 +105,7 @@ while (1) {
     # common that are still here and library them.
     my $cust_main = new FS::cust_main ( {
       #'custnum'          => '',
-      'agentnum'         => $agentnum,
+      'agentnum'         => $signup-data->{agentnum} || $agentnum,
       'refnum'           => $refnum,
 
       map { $_ => $signup_data->{$_} } qw(
-- 
cgit v1.2.1


From 993db36062c970439623b9b4e0cb7217a4acf9cc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Apr 2002 06:47:21 +0000
Subject: allow multiple search types on main menu... more confusing but
 default is *too* fuzzy

---
 httemplate/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index ce476c01c..934767dde 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -28,8 +28,8 @@
     <TR><TD>
         <BR><FONT SIZE="+1"><A HREF="edit/cust_main.cgi">New Customer</A></FONT>
         <BR>
-        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><INPUT TYPE="hidden" NAME="last_type" VALUE="All"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A></FORM>
-        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><INPUT TYPE="hidden" NAME="company_type" VALUE="All"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A></FORM>
+        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><SELECT NAME="last_type"><OPTION SELECTED>(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A></FORM>
+        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><SELECT NAME="last_type"><OPTION SELECTED>(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A></FORM>
         <FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A></FORM>
         <FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
 <!--        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>-->
-- 
cgit v1.2.1


From 1290c097176adcd62d48b1250233d53adb4b50a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Apr 2002 08:52:38 +0000
Subject: move the last of the real-time exports out of svc_acct.pm and into
 part_export

---
 FS/FS/Conf.pm                   |  12 +-
 FS/FS/part_export.pm            |  13 ++-
 FS/FS/part_export/vpopmail.pm   | 166 ++++++++++++++++++++++++---
 FS/FS/svc_acct.pm               | 241 +---------------------------------------
 httemplate/docs/passwd.html     |   4 +-
 httemplate/edit/part_export.cgi |   4 +-
 6 files changed, 174 insertions(+), 266 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index d16dd9448..f9a49ca04 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -605,28 +605,28 @@ httemplate/docs/config.html
   {
     'key'         => 'shellmachine',
     'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>cp</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain a single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines\', it also enables `.qmail-extension\' file maintenance.',
+    'description' => '<b>DEPRECATED</b>, add a <i>shellcommands</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain a single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines\', it also enables `.qmail-extension\' file maintenance.',
     'type'        => 'text',
   },
 
   {
     'key'         => 'shellmachine-useradd',
     'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>cp</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain command(s) to run on shellmachine when an account is created.  If the <b>shellmachine</b> option is set but this option is not, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If this option is set but empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.',
+    'description' => '<b>DEPRECATED</b>, add a <i>shellcommands</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain command(s) to run on shellmachine when an account is created.  If the <b>shellmachine</b> option is set but this option is not, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If this option is set but empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.',
     'type'        => [qw( checkbox text )],
   },
 
   {
     'key'         => 'shellmachine-userdel',
     'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>cp</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain command(s) to run on shellmachine when an account is deleted.  If the <b>shellmachine</b> option is set but this option is not, <code>userdel $username</code> is the default.  If this option is set but empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.',
+    'description' => '<b>DEPRECATED</b>, add a <i>shellcommands</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain command(s) to run on shellmachine when an account is deleted.  If the <b>shellmachine</b> option is set but this option is not, <code>userdel $username</code> is the default.  If this option is set but empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.',
     'type'        => [qw( checkbox text )],
   },
 
   {
     'key'         => 'shellmachine-usermod',
     'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>cp</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain command(s) to run on shellmachine when an account is modified.  If the <b>shellmachine</b> option is set but this option is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.',
+    'description' => '<b>DEPRECATED</b>, add a <i>shellcommands</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain command(s) to run on shellmachine when an account is modified.  If the <b>shellmachine</b> option is set but this option is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.',
     #'type'        => [qw( checkbox text )],
     'type'        => 'text',
   },
@@ -796,8 +796,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'vpopmailmachines',
-    'section'     => 'mail',
-    'description' => 'Your vpopmail pop toasters, one per line.  Each line is of the form "machinename vpopdir vpopuid vpopgid".  For example: <code>poptoaster.domain.tld /home/vpopmail 508 508</code>  Note: vpopuid and vpopgid are values taken from the vpopmail machine\'s /etc/passwd',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add a <i>cp</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain your vpopmail pop toasters, one per line.  Each line is of the form "machinename vpopdir vpopuid vpopgid".  For example: <code>poptoaster.domain.tld /home/vpopmail 508 508</code>  Note: vpopuid and vpopgid are values taken from the vpopmail machine\'s /etc/passwd',
     'type'        => 'textarea',
   },
 
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 82503c4ee..406b270ed 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -539,7 +539,7 @@ sub exporttype2svcdb {
         'password' => { label=>'Admin password' },
       },
       'nodomain' => 'Y',
-      'notes' => 'Integration with <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a>.  Cyrus::IMAP::Admin should be installed locally and the connection to the server secured.  <B>svc_acct.quota</B> is used to set the Cyrus quota if available. '
+      'notes' => 'Integration with <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a>.  Cyrus::IMAP::Admin should be installed locally and the connection to the server secured.  <B>svc_acct.quota</B>, if available, is used to set the Cyrus quota. '
     },
 
     'cp' => {
@@ -567,6 +567,17 @@ sub exporttype2svcdb {
       'notes' => 'Real-time export to <a href="http://www.infostreet.com/">InfoStreet</a> streetSmartAPI.  Requires installation of <a href="http://search.cpan.org/search?dist=Frontier-Client">Frontier::Client</a> from CPAN.',
     },
 
+    'vpopmail' => {
+      'desc' => 'Real-time export to vpopmail text files',
+      'options' => {
+        'machine' => { label=>'vpopmail machine', },
+        'dir'     => { label=>'directory', }, # ?more info? default?
+        'uid'     => { label=>'vpopmail uid' },
+        'gid'     => { label=>'vpopmail gid' },
+      },
+      'notes' => 'Real time export to <a href="http://inter7.com/vpopmail/">vpopmail</a> text files (...extended description from jeff?...)',
+    },
+
   },
 
   'svc_domain' => {},
diff --git a/FS/FS/part_export/vpopmail.pm b/FS/FS/part_export/vpopmail.pm
index 7a59f3259..6a486faa1 100644
--- a/FS/FS/part_export/vpopmail.pm
+++ b/FS/FS/part_export/vpopmail.pm
@@ -1,47 +1,179 @@
-package FS::part_export::myexport;
+package FS::part_export::vpopmail;
 
-use vars qw(@ISA);
+use vars qw(@ISA @saltset $exportdir $rsync $ssh);
+use File::Path;
+use FS::UID qw( datasrc );
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+
+$rsync = "rsync";
+$ssh = "ssh";
+
 sub rebless { shift; }
 
 sub _export_insert {
   my($self, $svc_acct) = (shift, shift);
-  $self->myexport_queue( $svc_acct->svcnum, 'insert',
-    $svc_acct->username, $svc_acct->_password );
+  $self->vpopmail_queue( $svc_acct->svcnum, 'insert',
+    $svc_acct->username,
+    crypt($svc_acct->_password,$saltset[int(rand(64))].$saltset[int(rand(64))]),
+    $svc_acct->domain,
+  );
 }
 
 sub _export_replace {
   my( $self, $new, $old ) = (shift, shift, shift);
-  #return "can't change username with myexport"
-  #  if $old->username ne $new->username;
-  #return '' unless $old->_password ne $new->_password;
-  $self->myexport_queue( $new->svcnum,
-    'replace', $new->username, $new->_password );
+
+  my $cpassword = crypt(
+    $new->_password, $saltset[int(rand(64))].$saltset[int(rand(64))]
+  );
+
+  return "can't change username with vpopmail"
+    if $old->username ne $new->username;
+
+  #no.... if mail can't be preserved, better to disallow username changes
+  #if ($old->username ne $new->username || $old->domain ne $new->domain ) {
+  #  vpopmail_queue( $svc_acct->svcnum, 'delete', 
+  #    $old->username, $old->domain
+  #  );
+  #  vpopmail_queue( $svc_acct->svcnum, 'insert', 
+  #    $new->username,
+  #    $cpassword,
+  #    $new->domain,
+  #  );
+
+  return '' unless $old->_password ne $new->_password;
+
+  $self->vpopmail_queue( $new->svcnum, 'replace',
+    $new->username, $cpassword, $new->domain );
 }
 
 sub _export_delete {
   my( $self, $svc_acct ) = (shift, shift);
-  $self->myexport_queue( $svc_acct->svcnum,
-    'delete', $svc_acct->username );
+  $self->vpopmail_queue( $svc_acct->svcnum, 'delete',
+    $svc_acct->username, $svc_acct->domain );
 }
 
 #a good idea to queue anything that could fail or take any time
-sub myexport_queue {
+sub vpopmail_queue {
   my( $self, $svcnum, $method ) = (shift, shift, shift);
+  my $exportdir = "/usr/local/etc/freeside/export." . datasrc;
   my $queue = new FS::queue {
     'svcnum' => $svcnum,
-    'job'    => "FS::part_export::myexport::myexport_$method",
+    'job'    => "FS::part_export::vpopmail::vpopmail_$method",
   };
-  $queue->insert( @_ );
+  $queue->insert(
+    $exportdir,
+    $self->option('machine'),
+    $self->option('dir'),
+    $self->option('uid'),
+    $self->option('gid'),
+    @_
+  );
 }
 
-sub myexport_insert { #subroutine, not method
+sub vpopmail_insert { #subroutine, not method
+  my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
+  my( $username, $password, $domain ) = @_;
+  
+  (open(VPASSWD, ">>$exportdir/domains/$domain/vpasswd")
+    and flock(VPASSWD,LOCK_EX)
+  ) or die "can't open vpasswd file for $username\@$domain: ".
+           "$exportdir/domains/$domain/vpasswd: $!";
+  print VPASSWD join(":",
+    $username,
+    $password,
+    '1',
+    '0',
+    $username,
+    "$dir/domains/$domain/$username",
+    'NOQUOTA',
+  ), "\n";
+
+  flock(VPASSWD,LOCK_UN);
+  close(VPASSWD);
+
+  for my $mkdir (
+    map { "$exportdir/domains/$domain/$username$_" }
+      ( '', qw( /Maildir /Maildir/cur /Maildir/new /Maildir/tmp ) )
+  ) {
+    mkdir $mkdir, 0700 or die "can't mkdir $mkdir: $!";
+  }
+
+  vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid );
+
+}
+
+sub vpopmail_replace { #subroutine, not method
+  my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
+  my( $username, $password, $domain ) = @_;
+  
+  (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
+    and flock(VPASSWD,LOCK_EX)
+  ) or die "can't open $exportdir/domains/$domain/vpasswd: $!";
+
+  open(VPASSWDTMP, ">$exportdir/domains/$domain/vpasswd.tmp")
+    or die "Can't open $exportdir/domains/$domain/vpasswd.tmp: $!";
+
+  while (<VPASSWD>) {
+    my ($mailbox, $pw, @rest) = split(':', $_);
+    print VPASSWDTMP $_ unless $username eq $mailbox;
+    print VPASSWDTMP join (':', ($mailbox, $password, @rest))
+      if $username eq $mailbox;
+  }
+
+  close(VPASSWDTMP);
+
+  rename "$exportdir/domains/$domain/vpasswd.tmp", "$exportdir/domains/$domain/vpasswd"
+    or die "Can't rename $exportdir/domains/$domain/vpasswd.tmp: $!";
+
+  flock(VPASSWD,LOCK_UN);
+  close(VPASSWD);
+
+  vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid );
+
 }
-sub myexport_replace { #subroutine, not method
+
+sub vpopmail_delete { #subroutine, not method
+  my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
+  my( $username, $domain ) = @_;
+  
+  (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
+    and flock(VPASSWD,LOCK_EX)
+  ) or die "can't open $exportdir/domains/$domain/vpasswd: $!";
+
+  open(VPASSWDTMP, ">$exportdir/domains/$domain/vpasswd.tmp")
+    or die "Can't open $exportdir/domains/$domain/vpasswd.tmp: $!";
+
+  while (<VPASSWD>) {
+    my ($mailbox, $rest) = split(':', $_);
+    print VPASSWDTMP $_ unless $username eq $mailbox;
+  }
+
+  close(VPASSWDTMP);
+
+  rename "$exportdir/domains/$domain/vpasswd.tmp",
+         "$exportdir/domains/$domain/vpasswd"
+    or die "Can't rename $exportdir/domains/$domain/vpasswd.tmp: $!";
+
+  flock(VPASSWD,LOCK_UN);
+  close(VPASSWD);
+
+  rmtree "$exportdir/domains/$domain/$username"
+    or die "can't rmtree $exportdir/domains/$domain/$username: $!";
+
+  vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid );
 }
-sub myexport_delete { #subroutine, not method
+
+sub vpopmail_sync {
+  my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
+  
+  chdir $exportdir;
+  my @args = ( $rsync, "-rlpt", "-e", $ssh, "domains/",
+               "vpopmail\@$machine:$dir/domains/"  );
+  system {$args[0]} @args;
 }
 
+
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index ea1107823..7fcfd35df 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1,17 +1,15 @@
 package FS::svc_acct;
 
 use strict;
-use vars qw( @ISA $nossh_hack $noexport_hack $conf
+use vars qw( @ISA $noexport_hack $conf
              $dir_prefix @shells $usernamemin
              $usernamemax $passwordmin $passwordmax
              $username_ampersand $username_letter $username_letterfirst
              $username_noperiod $username_uppercase
              $mydomain
              $dirhash
-             @saltset @pw_set
-             $rsync $ssh $exportdir $vpopdir);
+             @saltset @pw_set );
 use Carp;
-use File::Path;
 use Fcntl qw(:flock);
 use FS::UID qw( datasrc );
 use FS::Conf;
@@ -32,8 +30,6 @@ use FS::Msgcat qw(gettext);
 
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::svc_acct'} = sub { 
-  $rsync = "rsync";
-  $ssh = "ssh";
   $conf = new FS::Conf;
   $dir_prefix = $conf->config('home');
   @shells = $conf->config('shells');
@@ -49,14 +45,6 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
   $mydomain = $conf->config('domain');
 
   $dirhash = $conf->config('dirhash') || 0;
-  $exportdir = "/usr/local/etc/freeside/export." . datasrc;
-  if ( $conf->exists('vpopmailmachines') ) {
-    my (@vpopmailmachines) = $conf->config('vpopmailmachines');
-    my ($machine, $dir, $uid, $gid) = split (/\s+/, $vpopmailmachines[0]);
-    $vpopdir = $dir;
-  } else {
-    $vpopdir = '';
-  }
 };
 
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
@@ -176,24 +164,6 @@ The additional field I<usergroup> can optionally be defined; if so it should
 contain an arrayref of group names.  See L<FS::radius_usergroup>.  (used in
 sqlradius export only)
 
-If the configuration value (see L<FS::Conf>) shellmachine exists, and the 
-username, uid, and dir fields are defined, the command(s) specified in
-the shellmachine-useradd configuration are added to the job queue (see
-L<FS::queue> and L<freeside-queued>) to be exectued on shellmachine via ssh.
-This behaviour can be surpressed by setting $FS::svc_acct::nossh_hack true.
-If the shellmachine-useradd configuration file does not exist,
-
-  useradd -d $dir -m -s $shell -u $uid $username
-
-is the default.  If the shellmachine-useradd configuration file exists but
-it empty,
-
-  cp -pr /etc/skel $dir; chown -R $uid.$gid $dir
-
-is the default instead.  Otherwise the contents of the file are treated as
-a double-quoted perl string, with the following variables available:
-$username, $uid, $gid, $dir, and $shell.
-
 (TODOC: L<FS::queue> and L<freeside-queued>)
 
 (TODOC: new exports! $noexport_hack)
@@ -273,76 +243,10 @@ sub insert {
     }
   }
 
-  #old-style exports
-
-  if ( $vpopdir ) {
-
-    my $vpopmail_queue =
-      new FS::queue { 
-      'svcnum' => $self->svcnum,
-      'job' => 'FS::svc_acct::vpopmail_insert'
-    };
-    $error = $vpopmail_queue->insert( $self->username,
-      crypt($self->_password,$saltset[int(rand(64))].$saltset[int(rand(64))]),
-                                      $self->domain,
-                                      $vpopdir,
-                                    );
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-
-  }
-
-  #end of old-style exports
-
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
 }
 
-sub vpopmail_insert {
-  my( $username, $password, $domain, $vpopdir ) = @_;
-  
-  (open(VPASSWD, ">>$exportdir/domains/$domain/vpasswd")
-    and flock(VPASSWD,LOCK_EX)
-  ) or die "can't open vpasswd file for $username\@$domain: $exportdir/domains/$domain/vpasswd";
-  print VPASSWD join(":",
-    $username,
-    $password,
-    '1',
-    '0',
-    $username,
-    "$vpopdir/domains/$domain/$username",
-    'NOQUOTA',
-  ), "\n";
-
-  flock(VPASSWD,LOCK_UN);
-  close(VPASSWD);
-
-  mkdir "$exportdir/domains/$domain/$username", 0700  or die "can't create Maildir";
-  mkdir "$exportdir/domains/$domain/$username/Maildir", 0700 or die "can't create Maildir";
-  mkdir "$exportdir/domains/$domain/$username/Maildir/cur", 0700 or die "can't create Maildir";
-  mkdir "$exportdir/domains/$domain/$username/Maildir/new", 0700 or die "can't create Maildir";
-  mkdir "$exportdir/domains/$domain/$username/Maildir/tmp", 0700 or die "can't create Maildir";
- 
-  my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_sync' };
-  my $error = $queue->insert;
-  die $error if $error;
-
-  1;
-}
-
-sub vpopmail_sync {
-
-  my (@vpopmailmachines) = $conf->config('vpopmailmachines');
-  my ($machine, $dir, $uid, $gid) = split (/\s+/, $vpopmailmachines[0]);
-  
-  chdir $exportdir;
-  my @args = ("$rsync", "-rlpt", "-e", "$ssh", "domains/", "vpopmail\@$machine:$vpopdir/domains/");
-  system {$args[0]} @args;
-
-}
-
 =item delete
 
 Deletes this account from the database.  If there is an error, returns the
@@ -350,24 +254,6 @@ error, otherwise returns false.
 
 The corresponding FS::cust_svc record will be deleted as well.
 
-If the configuration value (see L<FS::Conf>) shellmachine exists, the
-command(s) specified in the shellmachine-userdel configuration file are
-added to the job queue (see L<FS::queue> and L<freeside-queued>) to be executed
-on shellmachine via ssh.  This behavior can be surpressed by setting
-$FS::svc_acct::nossh_hack true.  If the shellmachine-userdel configuration
-file does not exist,
-
-  userdel $username
-
-is the default.  If the shellmachine-userdel configuration file exists but
-is empty,
-
-  rm -rf $dir
-
-is the default instead.  Otherwise the contents of the file are treated as a
-double-quoted perl string, with the following variables available:
-$username and $dir.
-
 (TODOC: new exports! $noexport_hack)
 
 =cut
@@ -462,51 +348,10 @@ sub delete {
     }
   }
 
-  #old-style exports
-
-  if ( $vpopdir ) {
-    my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_delete' };
-    $error = $queue->insert( $self->username, $self->domain );
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-
-  }
-
-  #end of old-style exports
-
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 }
 
-sub vpopmail_delete {
-  my( $username, $domain ) = @_;
-  
-  (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
-    and flock(VPASSWD,LOCK_EX)
-  ) or die "can't open $exportdir/domains/$domain/vpasswd: $!";
-
-  open(VPASSWDTMP, ">$exportdir/domains/$domain/vpasswd.tmp")
-    or die "Can't open $exportdir/domains/$domain/vpasswd.tmp: $!";
-
-  while (<VPASSWD>) {
-    my ($mailbox, $rest) = split(':', $_);
-    print VPASSWDTMP $_ unless $username eq $mailbox;
-  }
-
-  close(VPASSWDTMP);
-
-  rename "$exportdir/domains/$domain/vpasswd.tmp", "$exportdir/domains/$domain/vpasswd"
-    or die "Can't rename $exportdir/domains/$domain/vpasswd.tmp: $!";
-
-  flock(VPASSWD,LOCK_UN);
-  close(VPASSWD);
-
-  rmtree "$exportdir/domains/$domain/$username" or die "can't destroy Maildir"; 
-  1;
-}
-
 =item replace OLD_RECORD
 
 Replaces OLD_RECORD with this one in the database.  If there is an error,
@@ -516,26 +361,6 @@ The additional field I<usergroup> can optionally be defined; if so it should
 contain an arrayref of group names.  See L<FS::radius_usergroup>.  (used in
 sqlradius export only)
 
-If the configuration value (see L<FS::Conf>) shellmachine exists, and the 
-dir field has changed, the command(s) specified in the shellmachine-usermod
-configuraiton file are added to the job queue (see L<FS::queue> and
-L<freeside-queued>) to be executed on shellmachine via ssh.  This behavior can
-be surpressed by setting $FS::svc-acct::nossh_hack true.  If the
-shellmachine-userdel configuration file does not exist or is empty,
-
-  [ -d $old_dir ] && mv $old_dir $new_dir || (
-    chmod u+t $old_dir;
-    mkdir $new_dir;
-    cd $old_dir;
-    find . -depth -print | cpio -pdm $new_dir;
-    chmod u-t $new_dir;
-    chown -R $uid.$gid $new_dir;
-    rm -rf $old_dir
-  )
-
-is the default.  This behaviour can be surpressed by setting
-$FS::svc_acct::nossh_hack true.
-
 =cut
 
 sub replace {
@@ -619,72 +444,10 @@ sub replace {
     }
   }
 
-  #old-style exports
-
-  if ( $vpopdir ) {
-    my $cpassword = crypt(
-      $new->_password,$saltset[int(rand(64))].$saltset[int(rand(64))]
-    );
-
-    if ($old->username ne $new->username || $old->domain ne $new->domain ) {
-      my $queue  = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_delete' };
-        $error = $queue->insert( $old->username, $old->domain );
-      my $queue2 = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_insert' };
-        $error = $queue2->insert( $new->username,
-                                  $cpassword,
-                                  $new->domain,
-                                  $vpopdir,
-                                )
-        unless $error;
-    } elsif ($old->_password ne $new->_password) {
-      my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_replace_password' };
-      $error = $queue->insert( $new->username, $cpassword, $new->domain );
-    }
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-  }
-
-  #end of old-style exports
-
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
 }
 
-sub vpopmail_replace_password {
-  my( $username, $password, $domain ) = @_;
-  
-  (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
-    and flock(VPASSWD,LOCK_EX)
-  ) or die "can't open $exportdir/domains/$domain/vpasswd: $!";
-
-  open(VPASSWDTMP, ">$exportdir/domains/$domain/vpasswd.tmp")
-    or die "Can't open $exportdir/domains/$domain/vpasswd.tmp: $!";
-
-  while (<VPASSWD>) {
-    my ($mailbox, $pw, @rest) = split(':', $_);
-    print VPASSWDTMP $_ unless $username eq $mailbox;
-    print VPASSWDTMP join (':', ($mailbox, $password, @rest))
-      if $username eq $mailbox;
-  }
-
-  close(VPASSWDTMP);
-
-  rename "$exportdir/domains/$domain/vpasswd.tmp", "$exportdir/domains/$domain/vpasswd"
-    or die "Can't rename $exportdir/domains/$domain/vpasswd.tmp: $!";
-
-  flock(VPASSWD,LOCK_UN);
-  close(VPASSWD);
-
-  my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_sync' };
-  my $error = $queue->insert;
-  die $error if $error;
-
-  1;
-}
-
-
 =item suspend
 
 Suspends this account by prefixing *SUSPENDED* to the password.  If there is an
diff --git a/httemplate/docs/passwd.html b/httemplate/docs/passwd.html
index 481e01896..fc1dde956 100755
--- a/httemplate/docs/passwd.html
+++ b/httemplate/docs/passwd.html
@@ -10,9 +10,9 @@ You may use fs_passwd/fs_passwd as a "passwd", "chfn" and "chsh" replacement on
   <li>Setup SSH keys:
     <ul>
       <li>As the freeside user (on your freeside machine), generate an authentication key using <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>.  Since this is for unattended operation, use a blank passphrase.
-      <li>Append the newly-created <code>identity.pub</code> file to <code>~root
+      <li>Append the newly-created <code>identity.pub</code> file to <code>~freeside
 /.ssh/authorized_keys</code> on the shell or web machine(s).
-      <li>Some new SSH v2 implementation accept v2 style keys only.  Use the <code>-t</code> option to <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>, and append the created <code>id_dsa.pub</code> or <code>id_rsa.pub</code> to <code>~root/.ssh/authorized_keys2</code> on the remote machine(s).
+      <li>Some new SSH v2 implementation accept v2 style keys only.  Use the <code>-t</code> option to <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>, and append the created <code>id_dsa.pub</code> or <code>id_rsa.pub</code> to <code>~freeside/.ssh/authorized_keys2</code> on the remote machine(s).
     </ul>
   <li>Copy fs_passwd/fs_passwdd to /usr/local/sbin on the shell or web machine(s).  (chown freeside, chmod 500)
   <li>Create /usr/local/freeside on the shell or web machine(s). (chown freeside, chmod 700)
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index b72b277c9..4affeb48f 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -48,7 +48,9 @@ my $widget = new HTML::Widgets::SelectLayers(
 #    foreach my $option ( qw(url login password groupID ) ) {
       my $optinfo = $exports->{$layer}{options}{$option};
       my $label = $optinfo->{label};
-      my $value = $cgi->param($option) || $part_export->option($option);
+      my $value = $cgi->param($option)
+                  || $part_export->option($option)
+                  || (exists $optinfo->{default} ? $optinfo->{default} : '');
       $html .= qq!<TR><TD ALIGN="right">$label</TD>!.
                qq!<TD><INPUT TYPE="text" NAME="$option" VALUE="$value"></TD>!.
                '</TR>';
-- 
cgit v1.2.1


From 17ddcceb66e4c5c45abe890403d2ca98b128d375 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Apr 2002 09:38:20 +0000
Subject: - send a notice to the customer when their card is declined - closes:
 Bug#351 - freeside-expiration-alerter works fine, closes: Bug#7

---
 FS/FS/Conf.pm                      | 12 ++++++++++
 FS/FS/cust_bill.pm                 | 47 ++++++++++++++++++++++++++++++++++----
 FS/bin/freeside-expiration-alerter |  9 ++++----
 conf/declinetemplate               | 10 ++++++++
 httemplate/docs/billing.html       |  2 ++
 5 files changed, 72 insertions(+), 8 deletions(-)
 create mode 100644 conf/declinetemplate

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index f9a49ca04..dc1cbb820 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -895,7 +895,19 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'declinetemplate'
+    'section'     => 'billing',
+    'description' => 'Template file for credit card decline emails.',
+    'type'        => 'textarea',
+  },
 
+  {
+    'key'         => 'emaildecline'
+    'section'     => 'billing',
+    'description' => 'Enable emailing of credit card decline notices.',
+    'type'        => 'checkbox',
+  },
 
 );
 
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index f157f86f6..cb2aa4629 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -373,7 +373,7 @@ sub send {
   #my @print_text = $cust_bill->print_text; #( date )
   my @invoicing_list = $self->cust_main->invoicing_list;
   if ( grep { $_ ne 'POST' } @invoicing_list ) { #email invoice
-    #false laziness w/FS::cust_pay::delete & fs_signup_server
+    #false laziness w/FS::cust_pay::delete & fs_signup_server && ::realtime_card
     #$ENV{SMTPHOSTS} = $smtpmachine;
     $ENV{MAILADDRESS} = $invoice_from;
     my $header = new Mail::Header ( [
@@ -571,8 +571,47 @@ sub realtime_card {
     }
   #} elsif ( $options{'report_badcard'} ) {
   } else {
-    return "$processor error, invnum #". $self->invnum. ': '.
-           $transaction->result_code. ": ". $transaction->error_message;
+
+    my $perror = "$processor error, invnum #". $self->invnum. ': '.
+                 $transaction->result_code. ": ". $transaction->error_message;
+
+    if ( $conf->exists('emaildecline')
+         && grep { $_ ne 'POST' } $cust_main->invoicing_list
+    ) {
+      my @templ = $conf->config('declinetemplate');
+      my $template = new Text::Template (
+        TYPE   => 'ARRAY',
+        SOURCE => [ map "$_\n", @templ ],
+      ) or die "($perror) can't create template: $Text::Template::ERROR";
+      $template->compile()
+        or die "($perror) can't compile template: $Text::Template::ERROR";
+
+      my $error = $transaction->error_message;
+
+      #false laziness w/FS::cust_pay::delete & fs_signup_server && ::send
+      $ENV{MAILADDRESS} = $invoice_from;
+      my $header = new Mail::Header ( [
+        "From: $invoice_from",
+        "To: ". join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list ),
+        "Sender: $invoice_from",
+        "Reply-To: $invoice_from",
+        "Date: ". time2str("%a, %d %b %Y %X %z", time),
+        "Subject: Your credit card could not be processed",
+      ] );
+      my $message = new Mail::Internet (
+        'Header' => $header,
+        'Body' => [ $template->fill_in() ],
+      );
+      $!=0;
+      $message->smtpsend( Host => $smtpmachine )
+        or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
+          or die "($perror) (customer # ". $self->custnum.
+            ") can't send card decline email to ".
+            join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list ).
+            " via server $smtpmachine with SMTP: $!";
+    }
+  
+    return $perror;
   }
 
 }
@@ -905,7 +944,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.27 2002-04-13 09:14:07 ivan Exp $
+$Id: cust_bill.pm,v 1.28 2002-04-16 09:38:19 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-expiration-alerter b/FS/bin/freeside-expiration-alerter
index 365b96467..ee3c1fb92 100755
--- a/FS/bin/freeside-expiration-alerter
+++ b/FS/bin/freeside-expiration-alerter
@@ -142,7 +142,8 @@ foreach my $customer (@customers)
         );
         $!=0;
         $message->smtpsend( Host => $smtpmachine )
-          or die "Can't send expiration email!: $!"; #die?  warn?
+          or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
+            or die "Can't send expiration email: $!";
 
       } elsif ( ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list ) { 
         push @body, sprintf(qq{%5d %-32.32s %4s %10s %12s %12s},
@@ -166,8 +167,8 @@ if (scalar(@body)) {
   $!=0;
   $message->smtpsend( Host => $smtpmachine )
     or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-      or return "can't send alerter failure email to $failure_recipient".
-              " via server $smtpmachine with SMTP: $!";
+      or die "can't send alerter failure email to $failure_recipient".
+             " via server $smtpmachine with SMTP: $!";
 }
 
 # subroutines
@@ -199,7 +200,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-expiration-alerter,v 1.2 2002-03-07 19:50:24 jeff Exp $
+$Id: freeside-expiration-alerter,v 1.3 2002-04-16 09:38:19 ivan Exp $
 
 =head1 BUGS
 
diff --git a/conf/declinetemplate b/conf/declinetemplate
new file mode 100644
index 000000000..9a356ea0f
--- /dev/null
+++ b/conf/declinetemplate
@@ -0,0 +1,10 @@
+Hi,
+
+Your credit card could not be processed for the following reason:
+  { $error }
+
+Please provide us with new billing infromation so that we may continue your
+service uninterrupted.
+
+Thanks.
+
diff --git a/httemplate/docs/billing.html b/httemplate/docs/billing.html
index c6ef7a869..c78a87f04 100644
--- a/httemplate/docs/billing.html
+++ b/httemplate/docs/billing.html
@@ -7,6 +7,8 @@
     <li>You can bill individual customers by clicking on the <i>Bill now</i> link on the main customer view.
     <li>The <a href="man/bin/freeside-daily.html"><b>freeside-daily</b></a> script should be run daily to bill customers and run invoice collection events.
     <li>Real-time credit card processing: Install the <a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a> module for your processor.  Configure the <a href="../config/config-view.cgi#business-onlinepayment">business-onlinepayment</a> configuration option.  Disable the default <b>Batch card</b> <a href="../browse/part_bill_event.cgi">invoice event</a> and add one for Business::OnlinePayment.
+    <li>Optional: Credit card expiration alerts: Customize <a href="../config/config.cgi#alerter_template">alerter_template</a> configuration option and run <a href="man/bin/freeside-expiration-alerter.html">freeside-expiration-alerter</a> daily.
+    <li>Credit card decline alerts: Customize the <a href="../config/config.cgi#declinetemplate">declinetemplate</a> configuration option and set the <a href="../config/config.cgi#emaildecline">emaildecline</a> configuration option.
     <li>Optional: Invoice template customization
       <ul>
         <li>See the <a href="http://search.cpan.org/doc/MJD/Text-Template-1.42/Template.pm">Text::Template</a> documentation for details on the substitution language.
-- 
cgit v1.2.1


From 4201aaaae8a957bc98ce345d3ee0e599da354766 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Apr 2002 10:47:35 +0000
Subject: report on failed billing events...

---
 FS/FS/Conf.pm                          |  4 +--
 FS/FS/cust_bill.pm                     |  8 ++---
 FS/FS/cust_bill_event.pm               | 11 ++++++
 httemplate/index.html                  |  2 ++
 httemplate/search/cust_bill_event.cgi  | 62 ++++++++++++++++++++++++++++++++++
 httemplate/search/cust_bill_event.html | 23 +++++++++++++
 httemplate/search/report_cc.html       |  4 +--
 httemplate/search/report_credit.html   |  4 +--
 httemplate/search/report_tax.html      |  4 +--
 httemplate/view/cust_bill.cgi          |  2 ++
 10 files changed, 112 insertions(+), 12 deletions(-)
 create mode 100644 httemplate/search/cust_bill_event.cgi
 create mode 100755 httemplate/search/cust_bill_event.html

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index dc1cbb820..6bcf9c43e 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -896,14 +896,14 @@ httemplate/docs/config.html
   },
 
   {
-    'key'         => 'declinetemplate'
+    'key'         => 'declinetemplate',
     'section'     => 'billing',
     'description' => 'Template file for credit card decline emails.',
     'type'        => 'textarea',
   },
 
   {
-    'key'         => 'emaildecline'
+    'key'         => 'emaildecline',
     'section'     => 'billing',
     'description' => 'Enable emailing of credit card decline notices.',
     'type'        => 'checkbox',
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index cb2aa4629..816553bda 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -582,9 +582,9 @@ sub realtime_card {
       my $template = new Text::Template (
         TYPE   => 'ARRAY',
         SOURCE => [ map "$_\n", @templ ],
-      ) or die "($perror) can't create template: $Text::Template::ERROR";
+      ) or return "($perror) can't create template: $Text::Template::ERROR";
       $template->compile()
-        or die "($perror) can't compile template: $Text::Template::ERROR";
+        or return "($perror) can't compile template: $Text::Template::ERROR";
 
       my $error = $transaction->error_message;
 
@@ -605,7 +605,7 @@ sub realtime_card {
       $!=0;
       $message->smtpsend( Host => $smtpmachine )
         or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-          or die "($perror) (customer # ". $self->custnum.
+          or return "($perror) (customer # ". $self->custnum.
             ") can't send card decline email to ".
             join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list ).
             " via server $smtpmachine with SMTP: $!";
@@ -944,7 +944,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.28 2002-04-16 09:38:19 ivan Exp $
+$Id: cust_bill.pm,v 1.29 2002-04-16 10:47:34 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_bill_event.pm b/FS/FS/cust_bill_event.pm
index 146a30e02..d5ca55f36 100644
--- a/FS/FS/cust_bill_event.pm
+++ b/FS/FS/cust_bill_event.pm
@@ -132,6 +132,17 @@ sub part_bill_event {
   qsearchs( 'part_bill_event', { 'eventpart' => $self->eventpart } );
 }
 
+=item cust_bill
+
+Returns the invoice (see L<FS::cust_bill>) for this completed invoice event.
+
+=cut
+
+sub cust_bill {
+  my $self = shift;
+  qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
+}
+
 =back
 
 =head1 BUGS
diff --git a/httemplate/index.html b/httemplate/index.html
index 934767dde..b562a2280 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -58,6 +58,7 @@
       <BR><A HREF="browse/cust_pay_batch.cgi">View pending credit card batch</A>
       <BR><BR>Invoice reports
             <UL>
+              <LI><a href="search/cust_bill_event.html">Invoice event errors (failed credit cards)</a>
               <LI>open invoices (<A HREF="search/cust_bill.cgi?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN_custnum">by customer number</A>)
               <LI>30 day open invoices (<A HREF="search/cust_bill.cgi?OPEN30_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN30_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN30_custnum">by customer number</A>)
               <LI>60 day open invoices (<A HREF="search/cust_bill.cgi?OPEN60_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN60_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN60_custnum">by customer number</A>)
@@ -122,6 +123,7 @@
       </UL>
       Invoices
       <UL>
+        <LI><a href="search/cust_bill_event.html">Invoice event errors (failed credit cards)</a>
         <LI>open invoices (<A HREF="search/cust_bill.cgi?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN_custnum">by customer number</A>)
         <LI>30 day open invoices (<A HREF="search/cust_bill.cgi?OPEN30_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN30_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN30_custnum">by customer number</A>)
         <LI>60 day open invoices (<A HREF="search/cust_bill.cgi?OPEN60_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN60_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN60_custnum">by customer number</A>)
diff --git a/httemplate/search/cust_bill_event.cgi b/httemplate/search/cust_bill_event.cgi
new file mode 100644
index 000000000..9cb36d28e
--- /dev/null
+++ b/httemplate/search/cust_bill_event.cgi
@@ -0,0 +1,62 @@
+<!-- mason kludge -->
+<%
+
+#false laziness with view/cust_bill.cgi
+
+$cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
+my $beginning = str2time($1);
+
+$cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
+my $ending = str2time($1) + 86400;
+
+my @cust_bill_event =
+  sort { $a->_date <=> $b->_date }
+    qsearch('cust_bill_event', {
+      _date => { op=> '>=', value=>$beginning },
+      statustext => { op=> '!=', value=>'' },
+# i wish...
+#      _date => { op=> '<=', value=>$ending },
+    }, '', "AND _date <= $ending");
+
+%>
+
+<%= header('Failed billing events') %>
+
+<%= table() %>
+<TR>
+  <TH>Event</TH>
+  <TH>Date</TH>
+  <TH>Status</TH>
+  <TH>Invoice</TH>
+  <TH>(bill) name</TH>
+  <TH>company</TH>
+<% if ( defined dbdef->table('cust_main')->column('ship_last') ) { %>
+  <TH>(service) name</TH>
+  <TH>company</TH>
+<% } %>
+</TR>
+
+<% foreach my $cust_bill_event ( @cust_bill_event ) {
+   my $status = $cust_bill_event->status;
+   $status .= ': '.$cust_bill_event->statustext if $cust_bill_event->statustext;
+   my $cust_bill = $cust_bill_event->cust_bill;
+   my $cust_main = $cust_bill->cust_main;
+   my $invlink = "${p}view/cust_bill.cgi?". $cust_bill->invnum;
+   my $custlink = "${p}view/cust_main.cgi?". $cust_main->custnum;
+%>
+<TR>
+  <TD><%= $cust_bill_event->part_bill_event->event %></TD>
+  <TD><%= time2str("%a %b %e %T %Y", $cust_bill_event->_date) %></TD>
+  <TD><%= $status %></TD>
+  <TD><A HREF="<%=$invlink%>">Invoice #<%= $cust_bill->invnum %> (<%= time2str("%D", $cust_bill->_date ) %>)</A></TD>
+  <TD><A HREF="<%=$custlink%>"><%= $cust_main->last. ', '. $cust_main->first %></A></TD>
+  <TD><A HREF="<%=$custlink%>"><%= $cust_main->company %></A></TD>
+  <% if ( defined dbdef->table('cust_main')->column('ship_last') ) { %>
+    <TD><A HREF="<%=$custlink%>"><%= $cust_main->ship_last. ', '. $cust_main->ship_first %></A></TD>
+    <TD><A HREF="<%=$custlink%>"><%= $cust_main->ship_company %></A></TD>
+  <% } %>
+</TR>
+<% } %>
+</TABLE>
+
+</BODY></HTML>
diff --git a/httemplate/search/cust_bill_event.html b/httemplate/search/cust_bill_event.html
new file mode 100755
index 000000000..d76ce3c8c
--- /dev/null
+++ b/httemplate/search/cust_bill_event.html
@@ -0,0 +1,23 @@
+<HTML>
+  <HEAD>
+    <TITLE>Failed billing events</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+      <H1>Failed billing events</H1>
+    </CENTER>
+    <HR>
+    <FORM ACTION="cust_bill_event.cgi" METHOD="post">
+      Return <B>failed billing events</B> for period: 
+      from <INPUT TYPE="text" NAME="beginning"> <i>m/d/y</i>
+      to <INPUT TYPE="text" NAME="ending"> <i>m/d/y</i>
+
+      <P><INPUT TYPE="submit" VALUE="Get Report">
+
+    </FORM>
+
+  <HR>
+
+  </BODY>
+</HTML>
+
diff --git a/httemplate/search/report_cc.html b/httemplate/search/report_cc.html
index a028a87df..8653dcc69 100755
--- a/httemplate/search/report_cc.html
+++ b/httemplate/search/report_cc.html
@@ -9,8 +9,8 @@
     <HR>
     <FORM ACTION="report_cc.cgi" METHOD="post">
       Return <B>credit card receipt report</B> for period: 
-      from <INPUT TYPE="text" NAME="beginning"> 
-      to <INPUT TYPE="text" NAME="ending">
+      from <INPUT TYPE="text" NAME="beginning"> <i>m/d/y</i>
+      to <INPUT TYPE="text" NAME="ending"> <i>m/d/y</i>
 
       <P><INPUT TYPE="submit" VALUE="Get Report">
 
diff --git a/httemplate/search/report_credit.html b/httemplate/search/report_credit.html
index bda08e31d..df9b9581f 100755
--- a/httemplate/search/report_credit.html
+++ b/httemplate/search/report_credit.html
@@ -9,8 +9,8 @@
     <HR>
     <FORM ACTION="report_credit.cgi" METHOD="post">
       Return <B>in house credit report</B> for period: 
-      from <INPUT TYPE="text" NAME="beginning"> 
-      to <INPUT TYPE="text" NAME="ending">
+      from <INPUT TYPE="text" NAME="beginning"> <i>m/d/y</i>
+      to <INPUT TYPE="text" NAME="ending"> <i>m/d/y</i>
 
       <P><INPUT TYPE="submit" VALUE="Get Report">
 
diff --git a/httemplate/search/report_tax.html b/httemplate/search/report_tax.html
index a7beb2471..7bf681b42 100755
--- a/httemplate/search/report_tax.html
+++ b/httemplate/search/report_tax.html
@@ -9,8 +9,8 @@
     <HR>
     <FORM ACTION="report_tax.cgi" METHOD="post">
       Return <B>tax report</B> for period: 
-      from <INPUT TYPE="text" NAME="beginning"> 
-      to <INPUT TYPE="text" NAME="ending">
+      from <INPUT TYPE="text" NAME="beginning"> <i>m/d/y</i>
+      to <INPUT TYPE="text" NAME="ending"> <i>m/d/y</i>
 
       <P><INPUT TYPE="submit" VALUE="Get Report">
 
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 95f1a0af8..53d7bc051 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -22,6 +22,8 @@ print qq!<A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) aga
 
 print qq!<A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>!.      '<BR><BR>';
 
+#false laziness with search/cust_bill_event.cgi
+
 print table(). '<TR><TH>Event</TH><TH>Date</TH><TH>Status</TH></TR>';
 foreach my $cust_bill_event (
   sort { $a->_date <=> $b->_date } $cust_bill->cust_bill_event
-- 
cgit v1.2.1


From 223aeed3d2aa6e3f7d01870e726935523c832437 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Apr 2002 19:50:42 +0000
Subject: exports, then services...

---
 httemplate/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index b562a2280..cd9ac4686 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -167,10 +167,10 @@
       <A NAME="config" HREF="config/config-view.cgi">Configuration</a><!-- - <font size="+2" color="#ff0000">start here</font> -->
       <BR><BR><A NAME="admin">Administration</a>
         <ul>
-          <LI><A HREF="browse/part_svc.cgi">View/Edit service definitions</A>
-            - Services are items you offer to your customers.
           <LI><A HREF="browse/part_export.cgi">View/Edit exports</A>
             - Provisioning services to external machines, databases and APIs.
+          <LI><A HREF="browse/part_svc.cgi">View/Edit service definitions</A>
+            - Services are items you offer to your customers.
           <LI><A HREF="browse/part_pkg.cgi">View/Edit package definitions</A>
             - One or more services are grouped together into a package and
               given pricing information.  Customers purchase packages, not
-- 
cgit v1.2.1


From 207b9834ab70d170865f1f8c7de5e43fc2c5b17d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Apr 2002 20:13:18 +0000
Subject: ui

---
 httemplate/browse/part_svc.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 4c9b1bd95..5c33e68a4 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -74,7 +74,7 @@ map { qsearchs('part_export', { exportnum => $_->exportnum } ) } qsearch('export
   ) {
 %>
       <TR>
-        <TD><A HREF="<%= $p %>edit/part_export.cgi?<%= $part_export->exportnum %>"><%= $part_export->exporttype %> to <%= $part_export->machine %></A></TD></TR>
+        <TD><A HREF="<%= $p %>edit/part_export.cgi?<%= $part_export->exportnum %>"><%= $part_export->exporttype %>&nbsp;to&nbsp;<%= $part_export->machine %></A></TD></TR>
 <%  } %>
       </TABLE></TD>
 
-- 
cgit v1.2.1


From 55dee0c595ea28dde3d2a30e1f238fc322e6e869 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Apr 2002 21:24:45 +0000
Subject: auto-use export classes

---
 FS/bin/freeside-queued | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index f6226cca1..49b532ec3 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -100,6 +100,22 @@ while (1) {
       if $FS::svc_acct::icradius_dbh;
     forksuidsetup($user);
 
+    #auto-use export classes...
+    if ( $ljob->job =~ /(FS::part_export::\w+)::/ ) {
+      my $class = $1;
+      eval "use $class;";
+      if ( $@ ) {
+        warn "job use $class failed";
+        my %hash = $ljob->hash;
+        $hash{'status'} = 'failed';
+        $hash{'statustext'} = $@;
+        my $fjob = new FS::queue( \%hash );
+        my $error = $fjob->replace($ljob);
+        die $error if $error;
+        exit; #end-of-kid
+      };
+    }
+
     my $eval = "&". $ljob->job. '(@args);';
     warn "running $eval";
     eval $eval; #throw away return value?  suppose so
-- 
cgit v1.2.1


From 9fd7ef9a57a7eb49c310ae90f080bd0bcb4f1d6d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Apr 2002 22:38:04 +0000
Subject: eek, problem with authorize.net description field

---
 FS/FS/cust_bill.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 816553bda..68ef094e3 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -483,7 +483,7 @@ sub realtime_card {
   if ( $conf->exists('business-onlinepayment-description') ) {
     my $dtempl = $conf->config('business-onlinepayment-description');
 
-    my $agent = $self->cust_main->agent->agent;
+    my $agent = $cust_main->agent->agent;
     my $pkgs = join(', ',
       map { $_->cust_pkg->part_pkg->pkg }
         grep { $_->pkgnum } $self->cust_bill_pkg
@@ -944,7 +944,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.29 2002-04-16 10:47:34 ivan Exp $
+$Id: cust_bill.pm,v 1.30 2002-04-16 22:38:04 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 95a40a1b8ebf86c76784c220d0d561f952d934ef Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Apr 2002 22:52:14 +0000
Subject: further authorize.net description debugging (agent??) and get rid of
 bad unique index on cust_bill_event

---
 FS/FS/Conf.pm      | 2 +-
 FS/FS/cust_bill.pm | 5 +++--
 README.1.4.0pre12  | 1 +
 bin/fs-setup       | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 6bcf9c43e..2a7a4c103 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -481,7 +481,7 @@ httemplate/docs/config.html
   {
     'key'         => 'defaultrecords',
     'section'     => 'BIND',
-    'description' => 'DNS entries add automatically when creating a domain',
+    'description' => 'DNS entries to add automatically when creating a domain',
     'type'        => 'editlist',
     'editlist_parts' => [ { type=>'text' },
                           { type=>'immutable', value=>'IN' },
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 68ef094e3..2c21f1e46 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -483,7 +483,8 @@ sub realtime_card {
   if ( $conf->exists('business-onlinepayment-description') ) {
     my $dtempl = $conf->config('business-onlinepayment-description');
 
-    my $agent = $cust_main->agent->agent;
+    my $agent_obj = $cust_main->agent;
+    my $agent = $agent_obj->agent;
     my $pkgs = join(', ',
       map { $_->cust_pkg->part_pkg->pkg }
         grep { $_->pkgnum } $self->cust_bill_pkg
@@ -944,7 +945,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.30 2002-04-16 22:38:04 ivan Exp $
+$Id: cust_bill.pm,v 1.31 2002-04-16 22:52:14 ivan Exp $
 
 =head1 BUGS
 
diff --git a/README.1.4.0pre12 b/README.1.4.0pre12
index e8fdd3070..7de0619cc 100644
--- a/README.1.4.0pre12
+++ b/README.1.4.0pre12
@@ -14,6 +14,7 @@ install the FS perl modules and httemplate as per install.html or upgrade8.html
 ALTER TABLE cust_bill_event ADD status varchar(80);
 ALTER TABLE cust_bill_event ADD statustext text NULL;
 UPDATE cust_bill_event SET status = 'done';
+DROP INDEX cust_bill_event1;
 
 CREATE TABLE radius_usergroup (
   usergroupnum int primary key,
diff --git a/bin/fs-setup b/bin/fs-setup
index 535408891..211c73fd2 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.87 2002-04-11 22:05:31 ivan Exp $
+# $Id: fs-setup,v 1.88 2002-04-16 22:52:14 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -382,7 +382,7 @@ sub tables_hash_hack {
         'statustext', 'text', 'NULL', '',
       ],
       'primary_key' => 'eventnum',
-      'unique' => [ [ 'eventpart', 'invnum' ] ],
+      #no... there are retries now #'unique' => [ [ 'eventpart', 'invnum' ] ],
       'index' => [ ['invnum'], ['status'] ],
     },
 
-- 
cgit v1.2.1


From dcea1a8d60c672a36f82dfb9da3c86223f6fd740 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Apr 2002 22:56:58 +0000
Subject: further debugging...

---
 FS/FS/cust_bill.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 2c21f1e46..a419ca8f9 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -483,7 +483,9 @@ sub realtime_card {
   if ( $conf->exists('business-onlinepayment-description') ) {
     my $dtempl = $conf->config('business-onlinepayment-description');
 
-    my $agent_obj = $cust_main->agent;
+    my $agent_obj = $cust_main->agent
+      or die "can't retreive agent for $cust_main (agentnum ".
+             $cust_main->agentnum. ")";
     my $agent = $agent_obj->agent;
     my $pkgs = join(', ',
       map { $_->cust_pkg->part_pkg->pkg }
@@ -945,7 +947,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.31 2002-04-16 22:52:14 ivan Exp $
+$Id: cust_bill.pm,v 1.32 2002-04-16 22:56:58 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From d33826efa91645efc00dc8a20e8d0bda8f87ecbd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Apr 2002 23:14:30 +0000
Subject: there it is!  fix bug with FS::cust_main::agent

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index fd1ccd772..66e032b0e 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -827,7 +827,7 @@ Returns the agent (see L<FS::agent>) for this customer.
 
 sub agent {
   my $self = shift;
-  qsearchs( 'agent', { 'agent' => $self->agentnum } );
+  qsearchs( 'agent', { 'agentnum' => $self->agentnum } );
 }
 
 =item bill OPTIONS
-- 
cgit v1.2.1


From 644260c472b6aaf40ab4cea714bed5e6bfe708c1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 00:25:58 +0000
Subject: better ordering in search results

---
 httemplate/search/cust_main.cgi | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 63aa924b1..2e255cfa2 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -57,19 +57,19 @@ if ( $cgi->param('browse')
     my $query = $cgi->param('browse');
     if ( $query eq 'custnum' ) {
       $sortby=\*custnum_sort;
-      $orderby = 'ORDER BY custnum';
+      $orderby = "ORDER BY custnum";
     } elsif ( $query eq 'last' ) {
       $sortby=\*last_sort;
-      $orderby = 'ORDER BY last';
+      $orderby = "ORDER BY LOWER(last || ' ' || first)";
     } elsif ( $query eq 'company' ) {
       $sortby=\*company_sort;
-      $orderby = 'ORDER BY company';
+      $orderby = "ORDER BY LOWER(company || ' ' || last || ' ' || first )";
     } else {
       die "unknown browse field $query";
     }
   } else {
     $sortby = \*last_sort; #??
-    $orderby = 'ORDER BY last'; #??
+    $orderby = "ORDER BY LOWER(last || ' ' || first)"; #??
     if ( $cgi->param('otaker_on') ) {
       $cgi->param('otaker') =~ /^(\w{1,32})$/ or eidiot "Illegal otaker\n";
       $search{otaker} = $1;
@@ -387,13 +387,16 @@ END
 #
 
 sub last_sort {
-  $a->getfield('last') cmp $b->getfield('last');
+  lc($a->getfield('last')) cmp lc($b->getfield('last'))
+  || lc($a->first) cmp lc($b->first);
 }
 
 sub company_sort {
   return -1 if $a->company && ! $b->company;
   return 1 if ! $a->company && $b->company;
-  $a->getfield('company') cmp $b->getfield('company');
+  lc($a->company) cmp lc($b->company)
+  || lc($a->getfield('last')) cmp lc($b->getfield('last'))
+  || lc($a->first) cmp lc($b->first);;
 }
 
 sub custnum_sort {
-- 
cgit v1.2.1


From 77fd19d72b3a974a05ae17be832c6433b53c5d25 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 01:14:32 +0000
Subject: kill off ssh kid on exit...

---
 fs_passwd/fs_passwd_server | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/fs_passwd/fs_passwd_server b/fs_passwd/fs_passwd_server
index f4b67ae98..a29b2c738 100755
--- a/fs_passwd/fs_passwd_server
+++ b/fs_passwd/fs_passwd_server
@@ -11,6 +11,8 @@
 # crypt-aware, s/password/_password/; ivan@sisd.com 98-aug-23
 
 use strict;
+use vars qw($pid);
+use subs qw(killssh);
 use IO::Handle;
 use Net::SSH qw(sshopen2);
 use FS::UID qw(adminsuidsetup);
@@ -25,12 +27,20 @@ my($shellmachine)=shift or die &usage;
 #causing trouble for some folks
 #$SIG{CHLD} = sub { wait() };
 
+$SIG{HUP} = \&killssh;
+$SIG{INT} = \&killssh;
+$SIG{QUIT} = \&killssh;
+$SIG{TERM} = \&killssh;
+$SIG{PIPE} = \&killssh;
+
+sub killssh { kill 'TERM', $pid if $pid; exit; };
+
 my($fs_passwdd)="/usr/local/sbin/fs_passwdd";
 
 while (1) {
   my($reader,$writer)=(new IO::Handle, new IO::Handle);
   $writer->autoflush(1);
-  sshopen2($shellmachine,$reader,$writer,$fs_passwdd);
+  $pid = sshopen2($shellmachine,$reader,$writer,$fs_passwdd);
   while (1) {
     my($username,$old_password,$new_password,$new_gecos,$new_shell);
     defined($username=<$reader>) or last;
-- 
cgit v1.2.1


From 5d1b7f1ec392d0c4a3c48c8fcd046f72c5d9b9b5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 01:17:50 +0000
Subject: kill ssh children on exit also, like password server

---
 fs_signup/fs_signup_server | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 12f1e5ef0..5dfa0e88f 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -4,6 +4,7 @@
 #
 
 use strict;
+use vars qw($pid);
 use IO::Handle;
 use Storable qw(nstore_fd fd_retrieve);
 use Tie::RefHash;
@@ -39,13 +40,20 @@ my $refnum = shift or die &usage;
 #causing trouble for some folks
 #$SIG{CHLD} = sub { wait() };
 
+$SIG{HUP} = \&killssh;
+$SIG{INT} = \&killssh;
+$SIG{QUIT} = \&killssh;
+$SIG{TERM} = \&killssh;
+$SIG{PIPE} = \&killssh;
+sub killssh { kill 'TERM', $pid if $pid; exit; };
+
 my($fs_signupd)="/usr/local/sbin/fs_signupd";
 
 while (1) {
   my($reader,$writer)=(new IO::Handle, new IO::Handle);
   #seems to be broken - calling ->flush explicitly# $writer->autoflush(1);
   warn "[fs_signup_server] Connecting to $machine...\n" if $Debug;
-  sshopen2($machine,$reader,$writer,$fs_signupd);
+  $pid = sshopen2($machine,$reader,$writer,$fs_signupd);
 
   my @pops = qsearch('svc_acct_pop',{} );
   my $init_data = {
-- 
cgit v1.2.1


From 92a72252a2340b013462d057a178f1681401b31c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 05:22:04 +0000
Subject: pid file foo

---
 fs_passwd/fs_passwdd | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/fs_passwd/fs_passwdd b/fs_passwd/fs_passwdd
index be7539984..3a2bd1d27 100755
--- a/fs_passwd/fs_passwdd
+++ b/fs_passwd/fs_passwdd
@@ -9,7 +9,8 @@
 use strict;
 use Socket;
 
-my($fs_passwdd_socket)="/usr/local/freeside/fs_passwdd_socket";
+my $fs_passwdd_socket = "/usr/local/freeside/fs_passwdd_socket";
+my $pid_file = "$fs_passwdd_socket.pid"
 
 $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
 $ENV{'SHELL'} = '/bin/sh';
@@ -28,6 +29,16 @@ unlink($fs_passwdd_socket);
 bind(Server, $uaddr) or die "bind: $!";
 listen(Server,SOMAXCONN) or die "listen: $!";
 
+if ( -e $pid_file ) {
+  open(PIDFILE,"<$pid_file");
+  chomp( my $old_pid = <$pid_file> );
+  close PIDFILE;
+  kill 'TERM', $pid_file;
+}
+open(PIDFILE,">$pid_file");
+print PIDFILE "$$\n";
+close PIDFILE;
+
 my($paddr);
 for ( ; $paddr = accept(Client,Server); close Client) {
   my($me,$old_password,$new_password,$new_gecos,$new_shell);
-- 
cgit v1.2.1


From 7452c669ea3a3ec09d907fd692759e71737b572a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 05:39:21 +0000
Subject: tyop

---
 fs_passwd/fs_passwdd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_passwd/fs_passwdd b/fs_passwd/fs_passwdd
index 3a2bd1d27..324524514 100755
--- a/fs_passwd/fs_passwdd
+++ b/fs_passwd/fs_passwdd
@@ -10,7 +10,7 @@ use strict;
 use Socket;
 
 my $fs_passwdd_socket = "/usr/local/freeside/fs_passwdd_socket";
-my $pid_file = "$fs_passwdd_socket.pid"
+my $pid_file = "$fs_passwdd_socket.pid";
 
 $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
 $ENV{'SHELL'} = '/bin/sh';
-- 
cgit v1.2.1


From c703114f17594eeece21b3a00048f9bc5efbe40d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 05:42:59 +0000
Subject: okay pid file has a change of working now

---
 fs_passwd/fs_passwdd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_passwd/fs_passwdd b/fs_passwd/fs_passwdd
index 324524514..e72ceb7db 100755
--- a/fs_passwd/fs_passwdd
+++ b/fs_passwd/fs_passwdd
@@ -31,7 +31,7 @@ listen(Server,SOMAXCONN) or die "listen: $!";
 
 if ( -e $pid_file ) {
   open(PIDFILE,"<$pid_file");
-  chomp( my $old_pid = <$pid_file> );
+  chomp( my $old_pid = <PIDFILE> );
   close PIDFILE;
   kill 'TERM', $pid_file;
 }
-- 
cgit v1.2.1


From a7cd626d75d613ce8a0fea5a9bb96ac3a7167275 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 05:44:45 +0000
Subject: *sigh*

---
 fs_passwd/fs_passwdd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_passwd/fs_passwdd b/fs_passwd/fs_passwdd
index e72ceb7db..38079da66 100755
--- a/fs_passwd/fs_passwdd
+++ b/fs_passwd/fs_passwdd
@@ -33,7 +33,7 @@ if ( -e $pid_file ) {
   open(PIDFILE,"<$pid_file");
   chomp( my $old_pid = <PIDFILE> );
   close PIDFILE;
-  kill 'TERM', $pid_file;
+  kill 'TERM', $old_pid;
 }
 open(PIDFILE,">$pid_file");
 print PIDFILE "$$\n";
-- 
cgit v1.2.1


From 1fb1f03d156cc44223dfdf0076c468ed011adf11 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 05:46:09 +0000
Subject: also untaint pid

---
 fs_passwd/fs_passwdd | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs_passwd/fs_passwdd b/fs_passwd/fs_passwdd
index 38079da66..43eb5db1f 100755
--- a/fs_passwd/fs_passwdd
+++ b/fs_passwd/fs_passwdd
@@ -31,9 +31,11 @@ listen(Server,SOMAXCONN) or die "listen: $!";
 
 if ( -e $pid_file ) {
   open(PIDFILE,"<$pid_file");
-  chomp( my $old_pid = <PIDFILE> );
+  #chomp( my $old_pid = <PIDFILE> );
+  my $old_pid = <PIDFILE>;
   close PIDFILE;
-  kill 'TERM', $old_pid;
+  $old_pid =~ /^(\d+)$/
+  kill 'TERM', $1;
 }
 open(PIDFILE,">$pid_file");
 print PIDFILE "$$\n";
-- 
cgit v1.2.1


From f49abe45eac46eb04adbe18696a941993d5e9757 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 05:48:47 +0000
Subject: forgotten semicolon

---
 fs_passwd/fs_passwdd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_passwd/fs_passwdd b/fs_passwd/fs_passwdd
index 43eb5db1f..cce98e787 100755
--- a/fs_passwd/fs_passwdd
+++ b/fs_passwd/fs_passwdd
@@ -34,7 +34,7 @@ if ( -e $pid_file ) {
   #chomp( my $old_pid = <PIDFILE> );
   my $old_pid = <PIDFILE>;
   close PIDFILE;
-  $old_pid =~ /^(\d+)$/
+  $old_pid =~ /^(\d+)$/;
   kill 'TERM', $1;
 }
 open(PIDFILE,">$pid_file");
-- 
cgit v1.2.1


From e6731f2dd2d04b93ef310922a71ff84f6df43fb6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 07:32:51 +0000
Subject: also don't leak processes, like fs_passwdd

---
 fs_signup/FS-SignupClient/fs_signupd | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/fs_signup/FS-SignupClient/fs_signupd b/fs_signup/FS-SignupClient/fs_signupd
index e764f32b7..85bd68a2f 100755
--- a/fs_signup/FS-SignupClient/fs_signupd
+++ b/fs_signup/FS-SignupClient/fs_signupd
@@ -13,7 +13,8 @@ use vars qw( $Debug );
 
 $Debug = 1;
 
-my($fs_signupd_socket)="/usr/local/freeside/fs_signupd_socket";
+my $fs_signupd_socket = "/usr/local/freeside/fs_signupd_socket";
+my $pid_file = "$fs_signupd_socket.pid";
 
 $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
 $ENV{'SHELL'} = '/bin/sh';
@@ -35,6 +36,18 @@ unlink($fs_signupd_socket);
 bind(Server, $uaddr) or die "bind: $!";
 listen(Server,SOMAXCONN) or die "listen: $!";
 
+if ( -e $pid_file ) {
+  open(PIDFILE,"<$pid_file");
+  #chomp( my $old_pid = <PIDFILE> );
+  my $old_pid = <PIDFILE>;
+  close PIDFILE;
+  $old_pid =~ /^(\d+)$/;
+  kill 'TERM', $1;
+}
+open(PIDFILE,">$pid_file");
+print PIDFILE "$$\n";
+close PIDFILE;
+
 warn "[fs_signupd] Entering main loop...\n" if $Debug;
 my $paddr;
 for ( ; $paddr = accept(Client,Server); close Client) {
-- 
cgit v1.2.1


From fd981fae382743704e39df5a32f69a06ab317258 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 11:17:02 +0000
Subject: typo adding agentnum setting possibility...

---
 fs_signup/FS-SignupClient/Makefile.PL     | 7 +++++++
 fs_signup/FS-SignupClient/SignupClient.pm | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/fs_signup/FS-SignupClient/Makefile.PL b/fs_signup/FS-SignupClient/Makefile.PL
index 208e8507a..e74051947 100644
--- a/fs_signup/FS-SignupClient/Makefile.PL
+++ b/fs_signup/FS-SignupClient/Makefile.PL
@@ -8,4 +8,11 @@ WriteMakefile(
     'INSTALLSCRIPT' => '/usr/local/sbin',
     'INSTALLSITEBIN' => '/usr/local/sbin',
     'PERM_RWX'      => '750',
+    'PREREQ_PM'     => {
+                         'Business::CreditCard' => 0,
+                         'HTTP::BrowserDetect' => 0,
+                         'HTTP::Headers::UserAgent' => 3,
+                         'Storable' => 0,
+                         'Text::Template' => 0,
+                       },
 );
diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm
index de269e1c5..0a6cbfba2 100644
--- a/fs_signup/FS-SignupClient/SignupClient.pm
+++ b/fs_signup/FS-SignupClient/SignupClient.pm
@@ -164,7 +164,7 @@ sub new_customer {
     referral_custnum pkgpart username _password sec_phrase popnum
   ) };
 
-  $signup_data->{agentnum} = $hashref->{agentnum} if $hashref->{agentnum}
+  $signup_data->{agentnum} = $hashref->{agentnum} if $hashref->{agentnum};
 
   nstore_fd($signup_data, \*SOCK) or die "can't send customer signup: $!";
   SOCK->flush;
-- 
cgit v1.2.1


From 6565b17f2bc8bff541854ad80578c502fd52134a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 11:29:55 +0000
Subject: small tyop

---
 fs_signup/fs_signup_server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 5dfa0e88f..69a07f9c7 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -113,7 +113,7 @@ while (1) {
     # common that are still here and library them.
     my $cust_main = new FS::cust_main ( {
       #'custnum'          => '',
-      'agentnum'         => $signup-data->{agentnum} || $agentnum,
+      'agentnum'         => $signup_data->{agentnum} || $agentnum,
       'refnum'           => $refnum,
 
       map { $_ => $signup_data->{$_} } qw(
-- 
cgit v1.2.1


From dd44a58b2e1eab60d856d7092748fde56f2d6dcc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 11:37:09 +0000
Subject: forgot to use Date::Format for sending email...

---
 fs_signup/fs_signup_server | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 69a07f9c7..14a6df479 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -190,6 +190,7 @@ while (1) {
       #false laziness w/FS::cust_bill::send & FS::cust_pay::delete
       use Mail::Header;
       use Mail::Internet;
+      use Date::Format;
       my $from = $conf->config('invoice_from'); #??? as good as any
       $ENV{MAILADDRESS} = $from;
       my $header = new Mail::Header ( [
-- 
cgit v1.2.1


From 62afa0957fd72ec52e9a8defbdbcc796bd04fb82 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 11:41:30 +0000
Subject: get rid of debugging cruft

---
 FS/FS/Record.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index cb42b266c..20da07e53 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -825,9 +825,9 @@ false.
 
 sub ut_text {
   my($self,$field)=@_;
-  warn "msgcat ". \&msgcat. "\n";
-  warn "notexist ". \&notexist. "\n";
-  warn "AUTOLOAD ". \&AUTOLOAD. "\n";
+  #warn "msgcat ". \&msgcat. "\n";
+  #warn "notexist ". \&notexist. "\n";
+  #warn "AUTOLOAD ". \&AUTOLOAD. "\n";
   $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/]+)$/
     or return gettext('illegal_or_empty_text'). " $field: ".
                $self->getfield($field);
-- 
cgit v1.2.1


From df8ea3edfbcb3b286e6dca5a98d697fe091be526 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 11:43:37 +0000
Subject: allow for the no-pop case

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index f13dd437d..1819e7c86 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.21 2002-04-16 00:02:26 ivan Exp $
+# $Id: signup.cgi,v 1.22 2002-04-17 11:43:37 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -235,9 +235,13 @@ sub print_okay {
     or die "fatal: invalid email_name got past FS::SignupClient::new_customer";
   my $email_name = $1;
 
-  my $pop = pop_info($cgi->param('popnum'))
-    or die "fatal: invalid popnum got past FS::SignupClient::new_customer";
-  ( $ac, $exch, $loc ) = ( $pop->{'ac'}, $pop->{'exch'}, $pop->{'loc'} );
+  my $pop = pop_info($cgi->param('popnum'));
+    #or die "fatal: invalid popnum got past FS::SignupClient::new_customer";
+  if ( $pop ) {
+    ( $ac, $exch, $loc ) = ( $pop->{'ac'}, $pop->{'exch'}, $pop->{'loc'} );
+  } else {
+    ( $ac, $exch, $loc ) = ( '', '', ''); #presumably you're not using them.
+  }
 
   my $pkg = ( grep { $_->{'pkgpart'} eq $pkgpart } @$packages )[0]->{'pkg'};
 
-- 
cgit v1.2.1


From 6f572b3cac49cee4d1f4e75c0474fe8a89ac24a9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 11:46:23 +0000
Subject: fix example success template

---
 fs_signup/FS-SignupClient/cgi/success.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_signup/FS-SignupClient/cgi/success.html b/fs_signup/FS-SignupClient/cgi/success.html
index 0119b3b5e..397cc6c30 100644
--- a/fs_signup/FS-SignupClient/cgi/success.html
+++ b/fs_signup/FS-SignupClient/cgi/success.html
@@ -6,6 +6,6 @@ Signup information for <%= $email_name %>:
 <BR><BR>
 Username: <%= $username %><BR>
 Password: <%= $password %><BR>
-Access number: (<%= $ac %>) / $exch - $local<BR>
+Access number: (<%= $ac %>) / <%= $exch %> - <%= $local %><BR>
 Package: <%= $pkg %><BR>
 </BODY></HTML>
-- 
cgit v1.2.1


From fbd352236545ea466d41e67a4251202d4f148560 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 11:53:15 +0000
Subject: fix signup_server-realtime

---
 fs_signup/fs_signup_server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 14a6df479..058388765 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -165,7 +165,7 @@ while (1) {
     warn "[fs_signup_server] Sending results...\n" if $Debug;
     print $writer $error, "\n";
 
-    if ( $conf->config('signup_server-realtime') ) {
+    if ( $conf->exists('signup_server-realtime') ) {
       
       my $bill_error = $cust_main->bill;
       warn "[fs_signup_server] error billing new customer: $bill_error"
-- 
cgit v1.2.1


From 4fefe9352f9da1e1dc42e4107fcab6a33ebf9d00 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 11:59:28 +0000
Subject: better debugging messages from signup server

---
 fs_signup/fs_signup_server | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 058388765..4abdafc46 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -165,8 +165,12 @@ while (1) {
     warn "[fs_signup_server] Sending results...\n" if $Debug;
     print $writer $error, "\n";
 
+    next if $error;
+
     if ( $conf->exists('signup_server-realtime') ) {
-      
+
+      warn "[fs_signup_server] Billing customer...\n" if $Debug;
+
       my $bill_error = $cust_main->bill;
       warn "[fs_signup_server] error billing new customer: $bill_error"
         if $bill_error;
@@ -184,7 +188,7 @@ while (1) {
       }
     }
 
-    if ( $error && $conf->config('signup_server-email') ) {
+    if ( $conf->config('signup_server-email') ) {
       warn "[fs_signup_server] Sending email...\n" if $Debug;
 
       #false laziness w/FS::cust_bill::send & FS::cust_pay::delete
-- 
cgit v1.2.1


From 9a99da945add49008fb6821ab037c204ad651e51 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 12:06:16 +0000
Subject: fix default searches

---
 httemplate/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index cd9ac4686..c764e7602 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -28,8 +28,8 @@
     <TR><TD>
         <BR><FONT SIZE="+1"><A HREF="edit/cust_main.cgi">New Customer</A></FONT>
         <BR>
-        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><SELECT NAME="last_type"><OPTION SELECTED>(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A></FORM>
-        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><SELECT NAME="last_type"><OPTION SELECTED>(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A></FORM>
+        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><SELECT NAME="last_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A></FORM>
+        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><SELECT NAME="last_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A></FORM>
         <FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A></FORM>
         <FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
 <!--        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>-->
-- 
cgit v1.2.1


From 11134a9f846c6101d373809f8a56c2b3986f7582 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 12:14:37 +0000
Subject: use signup.html and success.html from current dir...

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 1819e7c86..a7118ed2b 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.22 2002-04-17 11:43:37 ivan Exp $
+# $Id: signup.cgi,v 1.23 2002-04-17 12:14:37 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -31,8 +31,12 @@ use FS::SignupClient 0.03 qw( signup_info new_customer );
 
 $ieak_file = '/usr/local/freeside/ieak.template';
 $cck_file = '/usr/local/freeside/cck.template';
-$signup_html = '/usr/local/freeside/signup.html';
-$success_html = '/usr/local/freeside/success.html';
+$signup_html = -e 'signup.html'
+                 ? 'signup.html'
+                 : '/usr/local/freeside/signup.html';
+$success_html = -e 'success.html'
+                  ? 'success.html'
+                  : '/usr/local/freeside/success.html';
 
 if ( -e $ieak_file ) {
   my $ieak_txt = Text::Template::_load_text($ieak_file)
-- 
cgit v1.2.1


From f03d05cfbcc04564f8ce40e798c3d1a49dba71d8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 19:47:17 +0000
Subject: allow = in ut_text

---
 FS/FS/Record.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 20da07e53..ed87b0c19 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -817,7 +817,7 @@ sub ut_money {
 =item ut_text COLUMN
 
 Check/untaint text.  Alphanumerics, spaces, and the following punctuation
-symbols are currently permitted: ! @ # $ % & ( ) - + ; : ' " , . ? /
+symbols are currently permitted: ! @ # $ % & ( ) - + ; : ' " , . ? / =
 May not be null.  If there is an error, returns the error, otherwise returns
 false.
 
@@ -828,7 +828,7 @@ sub ut_text {
   #warn "msgcat ". \&msgcat. "\n";
   #warn "notexist ". \&notexist. "\n";
   #warn "AUTOLOAD ". \&AUTOLOAD. "\n";
-  $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/]+)$/
+  $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=]+)$/
     or return gettext('illegal_or_empty_text'). " $field: ".
                $self->getfield($field);
   $self->setfield($field,$1);
@@ -845,7 +845,7 @@ May be null.  If there is an error, returns the error, otherwise returns false.
 
 sub ut_textn {
   my($self,$field)=@_;
-  $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/]*)$/
+  $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=]*)$/
     or return gettext('illegal_text'). " $field: ". $self->getfield($field);
   $self->setfield($field,$1);
   '';
-- 
cgit v1.2.1


From 6866bdda26d1feb152af991388113e2e9309fafb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Apr 2002 20:43:45 +0000
Subject: fix usergroup_delete DELETE syntax

---
 FS/FS/part_export/sqlradius.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index fa2153f31..7337b5aa9 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -143,10 +143,10 @@ sub sqlradius_usergroup_delete { #subroutine, not method
   my( $username, @groups ) = @_;
 
   my $sth = $dbh->prepare( 
-    "DELETE FROM usergroup ( id, UserName, GroupName ) VALUES ( ?, ?, ? )"
+    "DELETE FROM usergroup WHERE UserName = ? AND GroupName = ?"
   ) or die $dbh->errstr;
   foreach my $group ( @groups ) {
-    $sth->execute( '', $username, $group )
+    $sth->execute( $username, $group )
       or die "can't delete from groupname table: ". $sth->errstr;
   }
   $dbh->disconnect;
-- 
cgit v1.2.1


From 98a73bb080f55f4f5d850102bcec6da2807e3d4f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Apr 2002 01:16:39 +0000
Subject: - add init file installation to Makefile, add unified init file - fix
 qsearch for op => '!=', value => '' searches - fix invalid_catd typo - add
 payby method to part_pkg and have fs_signup_server pass the data

---
 FS/FS/Record.pm            | 20 +++++++++++++---
 FS/FS/cust_main.pm         |  4 ++--
 FS/FS/part_pkg.pm          | 24 ++++++++++++++++++-
 Makefile                   | 11 ++++++---
 fs_signup/fs_signup_server |  3 ++-
 init.d/freeside-init       | 58 ++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 110 insertions(+), 10 deletions(-)
 create mode 100644 init.d/freeside-init

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index ed87b0c19..ac8117e70 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -224,10 +224,24 @@ sub qsearch {
       }
 
       if ( ! defined( $record->{$_} ) || $record->{$_} eq '' ) {
-        if ( driver_name =~ /^Pg$/i ) {
-          qq-( $_ IS NULL OR $_ = '' )-;
+        if ( $op eq '=' ) {
+          if ( driver_name =~ /^Pg$/i ) {
+            qq-( $_ IS NULL OR $_ = '' )-;
+          } else {
+            qq-( $_ IS NULL OR $_ = "" )-;
+          }
+        } elsif ( $op eq '!=' ) {
+          if ( driver_name =~ /^Pg$/i ) {
+            qq-( $_ IS NOT NULL AND $_ != '' )-;
+          } else {
+            qq-( $_ IS NOT NULL AND $_ != "" )-;
+          }
         } else {
-          qq-( $_ IS NULL OR $_ = "" )-;
+          if ( driver_name =~ /^Pg$/i ) {
+            qq-( $_ $op '' )-;
+          } else {
+            qq-( $_ $op "" )-;
+          }
         }
       } else {
         "$_ $op ?";
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 66e032b0e..445c6951a 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -644,11 +644,11 @@ sub check {
     my $payinfo = $self->payinfo;
     $payinfo =~ s/\D//g;
     $payinfo =~ /^(\d{13,16})$/
-      or return gettext('invalid_catd'); # . ": ". $self->payinfo;
+      or return gettext('invalid_card'); # . ": ". $self->payinfo;
     $payinfo = $1;
     $self->payinfo($payinfo);
     validate($payinfo)
-      or return gettext('invalid_catd'); # . ": ". $self->payinfo;
+      or return gettext('invalid_card'); # . ": ". $self->payinfo;
     return gettext('unknown_card_type')
       if cardtype($self->payinfo) eq "Unknown";
 
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 00ce1d944..e8cc67713 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -262,11 +262,33 @@ sub svcpart {
   $pkg_svc[0]->svcpart;
 }
 
+=item payby
+
+Returns a list of the acceptable payment types for this package.  Eventually
+this should come out of a database table and be editable, but currently has the
+following logic instead;
+
+If the package has B<0> setup and B<0> recur, the single item B<BILL> is
+returned, otherwise, the single item B<CARD> is returned.
+
+=cut
+
+sub payby {
+  my $self = shift;
+  #if ( $self->setup == 0 && $self->recur == 0 ) {
+  if (    $self->setup =~ /^\s*0+(\.0*)?\s*$/
+       && $self->recur =~ /^\s*0+(\.0*)?\s*$/ ) {
+    ( 'BILL' );
+  } else {
+    ( 'CARD' );
+  }
+}
+
 =back
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.9 2002-03-24 17:42:58 ivan Exp $
+$Id: part_pkg.pm,v 1.10 2002-04-19 01:16:39 ivan Exp $
 
 =head1 BUGS
 
diff --git a/Makefile b/Makefile
index 21aeb4566..315d43070 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,10 @@ ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 
+INIT_FILE = /etc/init.d/freeside
+
 HTTPD_RESTART = /etc/init.d/apache restart
-QUEUED_RESTART = /etc/init.d/freeside restart
+FREESIDE_RESTART = /etc/init.d/freeside restart
 
 #---
 
@@ -74,11 +76,14 @@ install-perl-modules: perl-modules
 	cd FS; \
 	make install UNINST=1
 
-install: install-perl-modules install-docs
+install-init:
+	[ -e ${INIT_FILE} ] || install -o root -g root -m 711 init.d/freeside-init ${INIT_FILE}
+
+install: install-perl-modules install-docs install-init
 
 deploy: install
 	${HTTPD_RESTART}
-	${QUEUED_RESTART}
+	${FREESIDE_RESTART}
 
 create-database:
 	perl -e 'use DBIx::DataSource qw( create_database ); create_database( "${DATASOURCE}", "${DB_USER}", "${DB_PASSWORD}" ) or die $$DBIx::DataSource::errstr;'
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 4abdafc46..1618cf1fe 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -67,7 +67,8 @@ while (1) {
       
     'part_pkg' =>
       [
-        map { $_->hashref }
+        #map { $_->hashref }
+        map { { 'payby' => [ $_->payby ], %{$_->hashref} } }
           grep { $_->svcpart('svc_acct') && $pkgpart_href->{ $_->pkgpart } }
             qsearch( 'part_pkg', { 'disabled' => '' } )
       ],
diff --git a/init.d/freeside-init b/init.d/freeside-init
new file mode 100644
index 000000000..fd9e9e71b
--- /dev/null
+++ b/init.d/freeside-init
@@ -0,0 +1,58 @@
+#! /bin/sh
+#
+# chkconfig: 345 86 16
+# description: Freeside daemons
+
+QUEUED_USER=ivan
+
+FREESIDE_PATH="/home/ivan/freeside_current"
+
+PASSWD_USER=ivan
+PASSWD_MACHINE=localhost
+
+SIGNUP_USER=ivan
+SIGNUP_MACHINE=localhost
+SIGNUP_AGENTNUM=2
+SIGNUP_REFNUM=2
+
+case "$1" in
+  start)
+        # Start daemons.
+        echo -n "Starting freeside-queued: "
+        freeside-queued $QUEUED_USER
+        echo "done."
+
+        echo -n "Starting fs_passwd_server: "
+        su freeside -c "$FREESIDE_PATH/fs_passwd/fs_passwd_server $PASSWD_USER $PASSWD_MACHINE" &
+        echo "done."
+
+        echo -n "Starting fs_signup_server: "
+        su freeside -c "$FREESIDE_PATH/fs_signup/fs_signup_server $SIGNUP_USER $SIGNUP_MACHINE $SIGNUP_AGENTNUM $SIGNUP_REFNUM" &
+        echo "done."
+        ;;
+  stop)
+        # Stop daemons.
+        echo -n "Stopping freeside-queued: "
+        kill `cat /var/run/freeside-queued.pid`
+        echo "done."
+
+        echo -n "Stopping fs_passwd_server: "
+        killall fs_passwd_server
+        echo "done."
+
+        echo -n "Stopping fs_passwd_server: "
+        killall fs_signup_server
+        echo "done."
+        ;;
+
+  restart)
+        $0 stop
+        $0 start
+        ;;
+  *)
+        echo "Usage: freeside {start|stop|restart}"
+        exit 1
+esac
+
+exit 0
+
-- 
cgit v1.2.1


From a28e2731a7febc2a96bb11ed4ce165808bd8b8d9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Apr 2002 13:17:56 +0000
Subject: signup server: FS::part_pkg->payby kludge & example template which
 uses   H:W:SelectLayers

---
 .../FS-SignupClient/cgi/signup-alternate.html      | 202 +++++++++++++++++++++
 fs_signup/FS-SignupClient/cgi/signup.cgi           |  12 +-
 fs_signup/fs_signup_server                         |  13 ++
 3 files changed, 225 insertions(+), 2 deletions(-)
 create mode 100755 fs_signup/FS-SignupClient/cgi/signup-alternate.html

diff --git a/fs_signup/FS-SignupClient/cgi/signup-alternate.html b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
new file mode 100755
index 000000000..668f124df
--- /dev/null
+++ b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
@@ -0,0 +1,202 @@
+<HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
+<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>ISP Signup form</FONT><BR><BR>
+<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
+<FORM NAME="dummy">
+<INPUT TYPE="hidden" NAME="magic" VALUE="process">
+<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
+<INPUT TYPE="hidden" NAME="ss" VALUE="">
+<INPUT TYPE="hidden" NAME="agentnum" VALUE="3">
+Contact Information
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Contact name<BR>(last, first)</TH>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="last" VALUE="<%= $last %>">,
+                <INPUT TYPE="text" NAME="first" VALUE="<%= $first %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Company</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="<%= $company %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Address</TH>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="<%= $address1 %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">&nbsp;</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="<%= $address2 %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
+  <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
+  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
+  <TD><SELECT NAME="state" SIZE="1">
+
+  <%=
+    foreach ( @{$locales} ) {
+      $OUT .= '<OPTION';
+      $OUT .= ' SELECTED' if ( $state eq $_->{'state'}
+                               && $county eq $_->{'county'}
+                               && $country eq $_->{'country'}
+                             );
+      $OUT .= '>'. $_->{'state'};
+      $OUT .= ' ('. $_->{'county'}. ')' if $_->{'county'};
+      $OUT .= ' / '. $_->{'country'};
+    }
+  %>
+
+  </SELECT></TD>
+  <TH><font color="#ff0000">*</font>Zip</TH>
+  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Day Phone</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="<%= $daytime %>" SIZE=18></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Night Phone</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="<%= $night %>" SIZE=18></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Fax</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="<%= $fax %>" SIZE=12></TD>
+</TR>
+</TABLE><font color="#ff0000">*</font> required fields<BR>
+
+<BR><BR>First package
+
+  <%= use Tie::IxHash;
+      my %pkgpart2payby = map { $_->{pkgpart} => $_->{payby}[0] } @{$packages};
+      tie my %options, 'Tie::IxHash',
+        '' => '(none)',
+        map { $_->{pkgpart} => $_->{pkg} } @{$packages} 
+      ;
+
+      use HTML::Widgets::SelectLayers;
+      my $widget = new HTML::Widgets::SelectLayers(
+        options => \%options,
+        selected_layer => $pkgpart,
+        form_name => 'dummy',
+        form_action => $self_url,
+        form_text => [qw( magic ref ss agentnum
+                          last first company address1 address2
+                          city state zip daytime night fax )], #county country
+        layer_callback => sub {
+          my $layer = shift;
+          my $html = <<ENDOUT;
+<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$layer">
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Username</TH>
+  <TD><INPUT TYPE="text" NAME="username" VALUE="$username"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Password</TH>
+  <TD><INPUT TYPE="password" NAME="_password" VALUE="$password"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Re-enter Password</TH>
+  <TD><INPUT TYPE="password" NAME="_password2" VALUE="$password2"></TD>
+</TR>
+ENDOUT
+          if ( $init_data->{'security_phrase'} ) {
+            $html .= <<ENDOUT;
+<TR>
+  <TD ALIGN="right">Security Phrase</TD>
+  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
+  </TD>
+</TR>
+ENDOUT
+          } else {
+            $html .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
+          }
+
+          if ( scalar(@$pops) ) {
+            $html .= '<TR><TD ALIGN="right">Access number</TD><TD>'.
+                     popselector($popnum). '</TD></TR>';
+          } else {
+            $html .= popselector($popnum);
+          }
+
+          $html .= '</TABLE><font color="#ff0000">*</font> required fields';
+
+          if ( $pkgpart2payby{$layer} eq 'BILL' ) {
+            $html .= <<ENDOUT;
+<INPUT TYPE="hidden" NAME="payby" VALUE="BILL">
+<INPUT TYPE="hidden" NAME="invoicing_list_POST" VALUE="">
+<INPUT TYPE="hidden" NAME="BILL_payinfo" VALUE="">
+<INPUT TYPE="hidden" NAME="BILL_month" VALUE="12">
+<INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">
+<INPUT TYPE="hidden" NAME="BILL_payname" VALUE="">
+<BR><BR><INPUT TYPE="submit" VALUE="Signup">
+ENDOUT
+          } elsif ( $pkgpart2payby{$layer} eq 'CARD' ) {
+            my $postal_checked = '';
+            my @invoicing_list = split(', ', $invoicing_list );
+            $postal_checked = 'CHECKED'
+              if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
+
+            $invoicing_list= join(', ', grep { $_ ne 'POST' } @invoicing_list );
+
+            my $expselect = expselect("CARD", $paydate);
+
+            my $cardselect = '<SELECT NAME="CARD_type"><OPTION></OPTION>';
+            my %types = (
+                          'VISA' => 'VISA card',
+                          'MasterCard' => 'MasterCard',
+                          'Discover' => 'Discover card',
+                          'American Express' => 'American Express card',
+                        );
+            foreach ( keys %types ) {
+              $selected =
+                $cgi->param('CARD_type') eq $types{$_} ? 'SELECTED' : '';
+              $cardselect .=
+                qq!<OPTION $selected VALUE="$types{$_}">$_</OPTION>!;
+            }
+            $cardselect .= '</SELECT>';
+
+            $html .= <<ENDOUT;
+<INPUT TYPE="hidden" NAME="payby" VALUE="CARD">
+<BR><BR>Billing information
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0>
+<INPUT TYPE="hidden" NAME="invoicing_list_POST" VALUE="">
+<TR>
+  <TD ALIGN="right">Email statement to </TD>
+  <TD><INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Credit card type</TH>
+  <TD>$cardselect</TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Card number</TH>
+  <TD><INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>*</font>Exp</TH>
+  <TD>$expselect</TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Name on card</TH>
+  <TD><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname"></TD>
+</TR>
+</TABLE>
+<font color="#ff0000">*</font> required fields
+<BR><BR><INPUT TYPE="submit" VALUE="Signup">
+ENDOUT
+          } else {
+            $html = <<ENDOUT;
+<BR>Please select a package.<BR>
+ENDOUT
+
+          }
+
+          $html;
+
+        },
+      );
+
+      $widget->html;
+
+
+ %>
+</BODY></HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index a7118ed2b..839d80421 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.23 2002-04-17 12:14:37 ivan Exp $
+# $Id: signup.cgi,v 1.24 2002-04-19 13:17:56 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -60,6 +60,7 @@ if ( -e $cck_file ) {
   $cck_template = '';
 }
 
+$agentnum = '';
 if ( -e $signup_html ) {
   my $signup_txt = Text::Template::_load_text($signup_html)
     or die $Text::Template::ERROR;
@@ -70,6 +71,11 @@ if ( -e $signup_html ) {
                                           DELIMITERS => [ '<%=', '%>' ]
                                         )
     or die $Text::Template::ERROR;
+  if ( $signup_txt =~
+         /<\s*INPUT TYPE="?hidden"?\s+NAME="?agentnum"?\s+VALUE="?(\d+)"?\s*>/si
+  ) {
+    $agentnum = $1;
+  }
 } else {
   $signup_template = new Text::Template ( TYPE => 'STRING',
                                           SOURCE => &signup_default,
@@ -96,8 +102,10 @@ if ( -e $success_html ) {
     or die $Text::Template::ERROR;
 }
 
+
 ( $locales, $packages, $pops, $init_data ) = signup_info();
 @payby = @{$init_data->{'payby'}} if @{$init_data->{'payby'}};
+$packages = $init_data->{agentnum2part_pkg}{$agentnum} if $agentnum;
 
 $cgi = new CGI;
 
@@ -169,7 +177,7 @@ if ( defined $cgi->param('magic') ) {
         'sec_phrase'       => $sec_phrase       = $cgi->param('sec_phrase'),
         '_password'        => $password         = $cgi->param('_password'),
         'popnum'           => $popnum           = $cgi->param('popnum'),
-        'agentnum'         => $agentnum         = $cgi->param('agentnum'),
+        'agentnum'         => $agentnum, #         = $cgi->param('agentnum'),
       } );
 
     }
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 1618cf1fe..38ad5583f 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -73,6 +73,19 @@ while (1) {
             qsearch( 'part_pkg', { 'disabled' => '' } )
       ],
 
+    'agentnum2part_pkg' =>
+      {
+        map {
+          my $href = $_->pkgpart_hashref;
+          $_->agentnum =>
+            [
+              map { { 'payby' => [ $_->payby ], %{$_->hashref} } }
+                grep { $_->svcpart('svc_acct') && $href->{ $_->pkgpart } }
+                  qsearch( 'part_pkg', { 'disabled' => '' } )
+            ];
+        } qsearch('agent', {} )
+      },
+
     'svc_acct_pop' => [ map { $_->hashref } @pops ],
 
     'security_phrase' => $conf->exists('security_phrase'),
-- 
cgit v1.2.1


From 1da06b18de4aee602da3fffb166da8d833343262 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Apr 2002 14:27:34 +0000
Subject: add phone to Business::OnlinePayment usage

---
 FS/FS/cust_bill.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index a419ca8f9..63a70cd5b 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -518,6 +518,7 @@ sub realtime_card {
     'expiration'     => $exp,
     'referer'        => 'http://cleanwhisker.420.am/',
     'email'          => $email,
+    'phone'          => $cust_main->daytime || $cust_main->night,
   );
   $transaction->submit();
 
@@ -947,7 +948,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.32 2002-04-16 22:56:58 ivan Exp $
+$Id: cust_bill.pm,v 1.33 2002-04-19 14:27:34 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 9520e932e86157fc21e0a3ec9533646f616fff0b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Apr 2002 22:09:29 +0000
Subject: fix silly problem in H:W:SelectLayers with moving SELECTs to the real
 form

---
 fs_signup/FS-SignupClient/cgi/signup-alternate.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup-alternate.html b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
index 668f124df..3535190d9 100755
--- a/fs_signup/FS-SignupClient/cgi/signup-alternate.html
+++ b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
@@ -71,7 +71,7 @@ Contact Information
         map { $_->{pkgpart} => $_->{pkg} } @{$packages} 
       ;
 
-      use HTML::Widgets::SelectLayers;
+      use HTML::Widgets::SelectLayers 0.02;
       my $widget = new HTML::Widgets::SelectLayers(
         options => \%options,
         selected_layer => $pkgpart,
@@ -79,7 +79,8 @@ Contact Information
         form_action => $self_url,
         form_text => [qw( magic ref ss agentnum
                           last first company address1 address2
-                          city state zip daytime night fax )], #county country
+                          city zip daytime night fax )],
+        form_select => [qw( state )], #county country
         layer_callback => sub {
           my $layer = shift;
           my $html = <<ENDOUT;
-- 
cgit v1.2.1


From e049a6780efd3682607715588a773c05be0c978f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Apr 2002 22:17:27 +0000
Subject: move username/password out of widget

---
 .../FS-SignupClient/cgi/signup-alternate.html      | 72 ++++++++++++----------
 1 file changed, 38 insertions(+), 34 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup-alternate.html b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
index 3535190d9..e57becc60 100755
--- a/fs_signup/FS-SignupClient/cgi/signup-alternate.html
+++ b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
@@ -62,6 +62,44 @@ Contact Information
 </TR>
 </TABLE><font color="#ff0000">*</font> required fields<BR>
 
+<BR><BR>
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Username</TH>
+  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Password</TH>
+  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Re-enter Password</TH>
+  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>"></TD>
+</TR>
+
+<%= if ( $init_data->{'security_phrase'} ) {
+      <<ENDOUT;
+<TR>
+  <TD ALIGN="right">Security Phrase</TD>
+  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
+  </TD>
+</TR>
+ENDOUT
+    } else {
+      '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
+    }
+%>
+
+<%= if ( scalar(@$pops) ) {
+      '<TR><TD ALIGN="right">Access number</TD><TD>'.
+           popselector($popnum). '</TD></TR>';
+    } else {
+      popselector($popnum);
+    }
+%>
+
+</TABLE><font color="#ff0000">*</font> required fields';
+
 <BR><BR>First package
 
   <%= use Tie::IxHash;
@@ -85,40 +123,6 @@ Contact Information
           my $layer = shift;
           my $html = <<ENDOUT;
 <INPUT TYPE="hidden" NAME="pkgpart" VALUE="$layer">
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Username</TH>
-  <TD><INPUT TYPE="text" NAME="username" VALUE="$username"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Password</TH>
-  <TD><INPUT TYPE="password" NAME="_password" VALUE="$password"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Re-enter Password</TH>
-  <TD><INPUT TYPE="password" NAME="_password2" VALUE="$password2"></TD>
-</TR>
-ENDOUT
-          if ( $init_data->{'security_phrase'} ) {
-            $html .= <<ENDOUT;
-<TR>
-  <TD ALIGN="right">Security Phrase</TD>
-  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
-  </TD>
-</TR>
-ENDOUT
-          } else {
-            $html .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
-          }
-
-          if ( scalar(@$pops) ) {
-            $html .= '<TR><TD ALIGN="right">Access number</TD><TD>'.
-                     popselector($popnum). '</TD></TR>';
-          } else {
-            $html .= popselector($popnum);
-          }
-
-          $html .= '</TABLE><font color="#ff0000">*</font> required fields';
 
           if ( $pkgpart2payby{$layer} eq 'BILL' ) {
             $html .= <<ENDOUT;
-- 
cgit v1.2.1


From a015d6d685dbea8147bded0ec6019358366c321c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Apr 2002 22:18:30 +0000
Subject: syntax error

---
 fs_signup/FS-SignupClient/cgi/signup-alternate.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup-alternate.html b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
index e57becc60..8b3b88eb2 100755
--- a/fs_signup/FS-SignupClient/cgi/signup-alternate.html
+++ b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
@@ -98,7 +98,7 @@ ENDOUT
     }
 %>
 
-</TABLE><font color="#ff0000">*</font> required fields';
+</TABLE><font color="#ff0000">*</font> required fields
 
 <BR><BR>First package
 
@@ -121,8 +121,7 @@ ENDOUT
         form_select => [qw( state )], #county country
         layer_callback => sub {
           my $layer = shift;
-          my $html = <<ENDOUT;
-<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$layer">
+          my $html = qq( <INPUT TYPE="hidden" NAME="pkgpart" VALUE="$layer">);
 
           if ( $pkgpart2payby{$layer} eq 'BILL' ) {
             $html .= <<ENDOUT;
-- 
cgit v1.2.1


From 3b84b516aa0e5e56d9fad2d7b0100ef2fd964d12 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Apr 2002 22:32:05 +0000
Subject: fix noment's signup template

---
 fs_signup/FS-SignupClient/cgi/signup-alternate.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup-alternate.html b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
index 8b3b88eb2..50b3f5674 100755
--- a/fs_signup/FS-SignupClient/cgi/signup-alternate.html
+++ b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
@@ -33,14 +33,16 @@ Contact Information
 
   <%=
     foreach ( @{$locales} ) {
-      $OUT .= '<OPTION';
+      my $value = $_->{'state'};
+      $value .= ' ('. $_->{'county'}. ')' if $_->{'county'};
+      $value .= ' / '. $_->{'country'};
+
+      $OUT .= qq(<OPTION VALUE="$value");
       $OUT .= ' SELECTED' if ( $state eq $_->{'state'}
                                && $county eq $_->{'county'}
                                && $country eq $_->{'country'}
                              );
-      $OUT .= '>'. $_->{'state'};
-      $OUT .= ' ('. $_->{'county'}. ')' if $_->{'county'};
-      $OUT .= ' / '. $_->{'country'};
+      $OUT .= ">$value</OPTION>";
     }
   %>
 
-- 
cgit v1.2.1


From ba7ccf1354799ac7324c4f91f41718dc028aaa9a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Apr 2002 22:34:59 +0000
Subject: okay finish moving usernames out of the widget, should finally work
 now

---
 fs_signup/FS-SignupClient/cgi/signup-alternate.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup-alternate.html b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
index 50b3f5674..6d2d4e741 100755
--- a/fs_signup/FS-SignupClient/cgi/signup-alternate.html
+++ b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
@@ -119,8 +119,9 @@ ENDOUT
         form_action => $self_url,
         form_text => [qw( magic ref ss agentnum
                           last first company address1 address2
-                          city zip daytime night fax )],
-        form_select => [qw( state )], #county country
+                          city zip daytime night fax
+                          username password sec_phrase )],
+        form_select => [qw( state popnum )], #county country
         layer_callback => sub {
           my $layer = shift;
           my $html = qq( <INPUT TYPE="hidden" NAME="pkgpart" VALUE="$layer">);
-- 
cgit v1.2.1


From 052bf748cb464e2fb8d5ea0188533bba829a725e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Apr 2002 22:56:50 +0000
Subject: okay _really_ this time username and password should be working
 outside the widget

---
 fs_signup/FS-SignupClient/cgi/signup-alternate.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup-alternate.html b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
index 6d2d4e741..19015213e 100755
--- a/fs_signup/FS-SignupClient/cgi/signup-alternate.html
+++ b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
@@ -120,7 +120,7 @@ ENDOUT
         form_text => [qw( magic ref ss agentnum
                           last first company address1 address2
                           city zip daytime night fax
-                          username password sec_phrase )],
+                          username _password _password2 sec_phrase )],
         form_select => [qw( state popnum )], #county country
         layer_callback => sub {
           my $layer = shift;
-- 
cgit v1.2.1


From 167292308b03b20e5e2ba790491ee28a3af85578 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Apr 2002 23:25:54 +0000
Subject: maybe just for debugging

---
 FS/FS/svc_acct.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 7fcfd35df..d3c415ce3 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -531,11 +531,11 @@ sub check {
   my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;
   if ( $username_uppercase ) {
     $recref->{username} =~ /^([a-z0-9_\-\.\&]{$usernamemin,$ulen})$/i
-      or return gettext('illegal_username'). ": ". $recref->{username};
+      or return gettext('illegal_username'). " ($usernamemin-$ulen): ". $recref->{username};
     $recref->{username} = $1;
   } else {
     $recref->{username} =~ /^([a-z0-9_\-\.\&]{$usernamemin,$ulen})$/
-      or return gettext('illegal_username'). ": ". $recref->{username};
+      or return gettext('illegal_username'). " ($usernamemin-$ulen): ". $recref->{username};
     $recref->{username} = $1;
   }
 
-- 
cgit v1.2.1


From 34852a680e9cbc0053683b93041240b7e98e2752 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Apr 2002 23:35:02 +0000
Subject: compare balance numerically to avoid spurious suspensions

---
 fs_signup/fs_signup_server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 38ad5583f..089cfdeb9 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -196,7 +196,7 @@ while (1) {
       warn "[fs_signup_server] error collecting from new customer: $bill_error"
         if $bill_error;
 
-      if ( $cust_main->balance ) {
+      if ( $cust_main->balance > 0 ) {
         #should check list for errors...
         $cust_main->suspend;
       }
-- 
cgit v1.2.1


From f9911ed31df63ac52ccc5b119388ea5b2dc24e58 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Apr 2002 23:44:22 +0000
Subject: deal with morphing popnum field in widget, eek

---
 fs_signup/FS-SignupClient/cgi/signup-alternate.html | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup-alternate.html b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
index 19015213e..bb013b9ab 100755
--- a/fs_signup/FS-SignupClient/cgi/signup-alternate.html
+++ b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
@@ -112,16 +112,23 @@ ENDOUT
       ;
 
       use HTML::Widgets::SelectLayers 0.02;
+      my @form_text = qw( magic ref ss agentnum
+                          last first company address1 address2
+                          city zip daytime night fax
+                          username _password _password2 sec_phrase );
+      my @form_select = qw( state ); #county country
+      if ( scalar(@$pops) == 0 or scalar(@$pops) == 1 ) {
+        push @form_text, 'popnum',
+      } else {
+        push @form_select, 'popnum',
+      }
       my $widget = new HTML::Widgets::SelectLayers(
         options => \%options,
         selected_layer => $pkgpart,
         form_name => 'dummy',
         form_action => $self_url,
-        form_text => [qw( magic ref ss agentnum
-                          last first company address1 address2
-                          city zip daytime night fax
-                          username _password _password2 sec_phrase )],
-        form_select => [qw( state popnum )], #county country
+        form_text => \@form_text,
+        form_select => \@form_select,
         layer_callback => sub {
           my $layer = shift;
           my $html = qq( <INPUT TYPE="hidden" NAME="pkgpart" VALUE="$layer">);
-- 
cgit v1.2.1


From 49e16e519aba0e1bab9c8cbd3a0a8bfc1a74277c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Apr 2002 23:50:37 +0000
Subject: make necessary stuff for success.html global

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 839d80421..e3d2d8c61 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.24 2002-04-19 13:17:56 ivan Exp $
+# $Id: signup.cgi,v 1.25 2002-04-19 23:50:37 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -12,6 +12,7 @@ use vars qw( @payby $cgi $locales $packages $pops $init_data $error
              $ieak_file $ieak_template $cck_file $cck_template
              $signup_html $signup_template $success_html $success_template
              $ac $exch $loc
+             $email_name $pkg
              $self_url
            );
 use subs qw( print_form print_okay expselect signup_default success_default );
@@ -245,7 +246,7 @@ sub print_okay {
   my $password = $1;
   ( $cgi->param('first'). ' '. $cgi->param('last') ) =~ /^(.*)$/
     or die "fatal: invalid email_name got past FS::SignupClient::new_customer";
-  my $email_name = $1;
+  $email_name = $1; #global for template
 
   my $pop = pop_info($cgi->param('popnum'));
     #or die "fatal: invalid popnum got past FS::SignupClient::new_customer";
@@ -255,7 +256,8 @@ sub print_okay {
     ( $ac, $exch, $loc ) = ( '', '', ''); #presumably you're not using them.
   }
 
-  my $pkg = ( grep { $_->{'pkgpart'} eq $pkgpart } @$packages )[0]->{'pkg'};
+  #global for template
+  $pkg = ( grep { $_->{'pkgpart'} eq $pkgpart } @$packages )[0]->{'pkg'};
 
   if ( $ieak_template
        && $user_agent->platform eq 'ia32'
-- 
cgit v1.2.1


From ad19e00a6f978d76fcb5e7f97b4169469c731c0f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 20 Apr 2002 00:48:17 +0000
Subject: fix signup.cgi to be sticky on *all* errors

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 65 ++++++++++++++++++++++----------
 1 file changed, 46 insertions(+), 19 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index e3d2d8c61..6ef535471 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.25 2002-04-19 23:50:37 ivan Exp $
+# $Id: signup.cgi,v 1.26 2002-04-20 00:48:17 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -133,6 +133,33 @@ if ( defined $cgi->param('magic') ) {
 
     $error = '';
 
+    $last             = $cgi->param('last');
+    $first            = $cgi->param('first');
+    $ss               = $cgi->param('ss');
+    $company          = $cgi->param('company');
+    $address1         = $cgi->param('address1');
+    $address2         = $cgi->param('address2');
+    $city             = $cgi->param('city');
+    #$county,
+    #$state,
+    $zip              = $cgi->param('zip');
+    #$country,
+    $daytime          = $cgi->param('daytime');
+    $night            = $cgi->param('night');
+    $fax              = $cgi->param('fax');
+    #$payby,
+    #$payinfo,
+    #$paydate,
+    #$payname,
+    #$invoicing_list,
+    $referral_custnum = $cgi->param('ref');
+    $pkgpart          = $cgi->param('pkgpart');
+    $username         = $cgi->param('username');
+    $sec_phrase       = $cgi->param('sec_phrase');
+    $password         = $cgi->param('_password');
+    $popnum           = $cgi->param('popnum');
+    #$agentnum, #         = $cgi->param('agentnum'),
+
     if ( $cgi->param('_password') ne $cgi->param('_password2') ) {
       $error = $init_data->{msgcat}{passwords_dont_match}; #msgcat
       $password  = '';
@@ -153,32 +180,32 @@ if ( defined $cgi->param('magic') ) {
       }
 
       $error ||= new_customer ( {
-        'last'             => $last             = $cgi->param('last'),
-        'first'            => $first            = $cgi->param('first'),
-        'ss'               => $ss               = $cgi->param('ss'),
-        'company'          => $company          = $cgi->param('company'),
-        'address1'         => $address1         = $cgi->param('address1'),
-        'address2'         => $address2         = $cgi->param('address2'),
-        'city'             => $city             = $cgi->param('city'),
+        'last'             => $last,
+        'first'            => $first,
+        'ss'               => $ss,
+        'company'          => $company,
+        'address1'         => $address1,
+        'address2'         => $address2,
+        'city'             => $city,
         'county'           => $county,
         'state'            => $state,
-        'zip'              => $zip              = $cgi->param('zip'),
+        'zip'              => $zip,
         'country'          => $country,
-        'daytime'          => $daytime          = $cgi->param('daytime'),
-        'night'            => $night            = $cgi->param('night'),
-        'fax'              => $fax              = $cgi->param('fax'),
+        'daytime'          => $daytime,
+        'night'            => $night,
+        'fax'              => $fax,
         'payby'            => $payby,
         'payinfo'          => $payinfo,
         'paydate'          => $paydate,
         'payname'          => $payname,
         'invoicing_list'   => $invoicing_list,
-        'referral_custnum' => $referral_custnum = $cgi->param('ref'),
-        'pkgpart'          => $pkgpart          = $cgi->param('pkgpart'),
-        'username'         => $username         = $cgi->param('username'),
-        'sec_phrase'       => $sec_phrase       = $cgi->param('sec_phrase'),
-        '_password'        => $password         = $cgi->param('_password'),
-        'popnum'           => $popnum           = $cgi->param('popnum'),
-        'agentnum'         => $agentnum, #         = $cgi->param('agentnum'),
+        'referral_custnum' => $referral_custnum,
+        'pkgpart'          => $pkgpart,
+        'username'         => $username,
+        'sec_phrase'       => $sec_phrase,
+        '_password'        => $password,
+        'popnum'           => $popnum,
+        'agentnum'         => $agentnum,
       } );
 
     }
-- 
cgit v1.2.1


From e5f29642854dbdb606aa5763213e944ca449fc8a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 20 Apr 2002 02:06:38 +0000
Subject: fix problem with edge case where there *is* a pkg_svc record with
 quantity 0, when changing packages and using the special case new service
 code

---
 FS/FS/cust_pkg.pm | 12 +++++++++---
 FS/FS/cust_svc.pm |  6 +++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index f858a999d..0fc21478a 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -577,7 +577,9 @@ sub order {
     push @cust_svc, [
       map {
         ( $svcnum{$_} && @{ $svcnum{$_} } ) ? shift @{ $svcnum{$_} } : ();
-      } map { $_->svcpart } qsearch('pkg_svc', { 'pkgpart' => $pkgpart })
+      } map { $_->svcpart }
+          qsearch('pkg_svc', { pkgpart  => $pkgpart,
+                               quantity => { op=>'>', value=>'0', } } )
     ];
   }
 
@@ -597,7 +599,11 @@ sub order {
     #find an empty place to put one
     my $i = 0;
     foreach my $pkgpart ( @{$pkgparts} ) {
-      my @pkg_svc = qsearch('pkg_svc', { pkgpart=>$pkgpart } );
+      my @pkg_svc =
+        qsearch('pkg_svc', { pkgpart  => $pkgpart,
+                             quantity => { op=>'>', value=>'0', } } );
+      #my @pkg_svc =
+      #  grep { $_->quantity > 0 } qsearch('pkg_svc', { pkgpart=>$pkgpart } );
       if ( ! @{$cust_svc[$i]} #find an empty place to put them with 
            && grep { $svcdb eq $_->part_svc->svcdb } #with appropriate svcdb
                 @pkg_svc
@@ -689,7 +695,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.17 2002-04-12 15:14:58 ivan Exp $
+$Id: cust_pkg.pm,v 1.18 2002-04-20 02:06:38 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 23a3980ef..e6194b5b7 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -159,6 +159,10 @@ sub check {
       'pkgpart' => $cust_pkg->pkgpart,
       'svcpart' => $self->svcpart,
     });
+    # or new FS::pkg_svc ( { 'pkgpart'  => $cust_pkg->pkgpart,
+    #                        'svcpart'  => $self->svcpart,
+    #                        'quantity' => 0                   } );
+
     my @cust_svc = qsearch('cust_svc', {
       'pkgnum'  => $self->pkgnum,
       'svcpart' => $self->svcpart,
@@ -282,7 +286,7 @@ sub seconds_since {
 
 =head1 VERSION
 
-$Id: cust_svc.pm,v 1.13 2002-04-12 15:14:58 ivan Exp $
+$Id: cust_svc.pm,v 1.14 2002-04-20 02:06:38 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From a649afbc9becb88b8ec516db2d5634cd45847c96 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 20 Apr 2002 06:33:03 +0000
Subject: fixup fs-setup

---
 bin/fs-setup | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 211c73fd2..37ecf1b87 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.88 2002-04-16 22:52:14 ivan Exp $
+# $Id: fs-setup,v 1.89 2002-04-20 06:33:03 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -162,7 +162,9 @@ foreach $attribute (@check_attributes) {
 
 #create history tables (false laziness w/create-history-tables)
 foreach my $table ( grep { ! /^h_/ } $dbdef->tables ) {
-  my $tableobj = $dbdef->table($table);
+  my $tableobj = $dbdef->table($table)
+    or die "unknown table $table";
+
   my $h_tableobj = DBIx::DBSchema::Table->new( {
     name        => "h_$table",
     primary_key => 'historynum',
@@ -383,6 +385,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'eventnum',
       #no... there are retries now #'unique' => [ [ 'eventpart', 'invnum' ] ],
+      'unique' => [],
       'index' => [ ['invnum'], ['status'] ],
     },
 
@@ -932,7 +935,7 @@ sub tables_hash_hack {
         'exportsvcnum' => 'int', '', '',
         'exportnum'    => 'int', '', '',
         'svcpart'      => 'int', '', '',
-      ]
+      ],
       'primary_key' => 'exportsvcnum',
       'unique'      => [ [ 'exportnum', 'svcpart' ] ],
       'index'       => [ [ 'exportnum' ], [ 'svcpart' ] ],
-- 
cgit v1.2.1


From 812b5eb3a85fcf221174838a549db5b7e82f145c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 20 Apr 2002 06:34:21 +0000
Subject: perms

---
 bin/populate-msgcat | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/populate-msgcat b/bin/populate-msgcat
index 5d6e85aea..64fa59a44 100755
--- a/bin/populate-msgcat
+++ b/bin/populate-msgcat
@@ -109,3 +109,4 @@ sub usage {
   die "Usage:\n\n  populate-msgcat user\n";
 }
 
+
-- 
cgit v1.2.1


From 0da1c2b1d5dbe10b304d131f6807b18a237b5d45 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 20 Apr 2002 10:09:42 +0000
Subject: allow uppercase zones...

---
 FS/FS/domain_record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 0f634bff3..9f0035689 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -107,7 +107,7 @@ sub check {
   return "Unknown svcnum (in svc_domain)"
     unless qsearchs('svc_domain', { 'svcnum' => $self->svcnum } );
 
-  $self->reczone =~ /^(@|[a-z0-9\.\-]+)$/
+  $self->reczone =~ /^(@|[a-zA-Z0-9\.\-]+)$/
     or return "Illegal reczone: ". $self->reczone;
   $self->reczone($1);
 
@@ -156,7 +156,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: domain_record.pm,v 1.3 2001-08-21 02:44:47 ivan Exp $
+$Id: domain_record.pm,v 1.4 2002-04-20 10:09:42 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 01d8a89e66c00077619e408ce8a79f847e32214c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 20 Apr 2002 10:12:26 +0000
Subject: allow uppercase in zone data.

---
 FS/FS/domain_record.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 9f0035689..23955b62e 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -107,7 +107,7 @@ sub check {
   return "Unknown svcnum (in svc_domain)"
     unless qsearchs('svc_domain', { 'svcnum' => $self->svcnum } );
 
-  $self->reczone =~ /^(@|[a-zA-Z0-9\.\-]+)$/
+  $self->reczone =~ /^(@|[a-z0-9\.\-]+)$/i
     or return "Illegal reczone: ". $self->reczone;
   $self->reczone($1);
 
@@ -122,15 +122,15 @@ sub check {
   if ( $self->rectype eq 'SOA' ) {
     my $recdata = $self->recdata;
     $recdata =~ s/\s+/ /g;
-    $recdata =~ /^([a-z0-9\.\-]+ [\w\-\+]+\.[a-z0-9\.\-]+ \( (\d+ ){5}\))$/
+    $recdata =~ /^([a-z0-9\.\-]+ [\w\-\+]+\.[a-z0-9\.\-]+ \( (\d+ ){5}\))$/i
       or return "Illegal data for SOA record: $recdata";
     $self->recdata($1);
   } elsif ( $self->rectype eq 'NS' ) {
-    $self->recdata =~ /^([a-z0-9\.\-]+)$/
+    $self->recdata =~ /^([a-z0-9\.\-]+)$/i
       or return "Illegal data for NS record: ". $self->recdata;
     $self->recdata($1);
   } elsif ( $self->rectype eq 'MX' ) {
-    $self->recdata =~ /^(\d+)\s+([a-z0-9\.\-]+)$/
+    $self->recdata =~ /^(\d+)\s+([a-z0-9\.\-]+)$/i
       or return "Illegal data for MX record: ". $self->recdata;
     $self->recdata("$1 $2");
   } elsif ( $self->rectype eq 'A' ) {
@@ -138,11 +138,11 @@ sub check {
       or return "Illegal data for A record: ". $self->recdata;
     $self->recdata($1);
   } elsif ( $self->rectype eq 'PTR' ) {
-    $self->recdata =~ /^([a-z0-9\.\-]+)$/
+    $self->recdata =~ /^([a-z0-9\.\-]+)$/i
       or return "Illegal data for PTR record: ". $self->recdata;
     $self->recdata($1);
   } elsif ( $self->rectype eq 'CNAME' ) {
-    $self->recdata =~ /^([a-z0-9\.\-]+)$/
+    $self->recdata =~ /^([a-z0-9\.\-]+)$/i
       or return "Illegal data for CNAME record: ". $self->recdata;
     $self->recdata($1);
   } else {
@@ -156,7 +156,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: domain_record.pm,v 1.4 2002-04-20 10:09:42 ivan Exp $
+$Id: domain_record.pm,v 1.5 2002-04-20 10:12:26 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From cb63b8c06cdf912ce61b4b459a238dadfd9c64fc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 20 Apr 2002 10:49:33 +0000
Subject: allow * MX records

---
 FS/FS/domain_record.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 23955b62e..24db4c2f4 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -107,7 +107,7 @@ sub check {
   return "Unknown svcnum (in svc_domain)"
     unless qsearchs('svc_domain', { 'svcnum' => $self->svcnum } );
 
-  $self->reczone =~ /^(@|[a-z0-9\.\-]+)$/i
+  $self->reczone =~ /^(@|[a-z0-9\.\-\*]+)$/i
     or return "Illegal reczone: ". $self->reczone;
   $self->reczone($1);
 
@@ -119,6 +119,9 @@ sub check {
               $self->rectype;
   $self->rectype($1);
 
+  return "Illegal reczone for ". $self->rectype. ": ". $self->reczone
+    if $self->rectype !~ /^MX$/i && $self->reczone =~ /\*/;
+
   if ( $self->rectype eq 'SOA' ) {
     my $recdata = $self->recdata;
     $recdata =~ s/\s+/ /g;
@@ -156,7 +159,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: domain_record.pm,v 1.5 2002-04-20 10:12:26 ivan Exp $
+$Id: domain_record.pm,v 1.6 2002-04-20 10:49:33 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 4d5485150720c91d9945c3ae3cad9427ece23833 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 20 Apr 2002 11:57:36 +0000
Subject: working BIND import

---
 FS/FS/domain_record.pm      |   7 +-
 FS/FS/part_export.pm        |   7 +-
 bin/passwd.import           | 110 ++++++++++++++++++++++++++++
 bin/svc_domain.erase        |  17 +++++
 bin/svc_domain.import       | 172 +++++++++++++++++++++++++++++++++-----------
 httemplate/docs/legacy.html |   4 +-
 6 files changed, 271 insertions(+), 46 deletions(-)
 create mode 100755 bin/passwd.import
 create mode 100755 bin/svc_domain.erase

diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 24db4c2f4..6f4dd0287 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -114,7 +114,7 @@ sub check {
   $self->recaf =~ /^(IN)$/ or return "Illegal recaf: ". $self->recaf;
   $self->recaf($1);
 
-  $self->rectype =~ /^(SOA|NS|MX|A|PTR|CNAME)$/
+  $self->rectype =~ /^(SOA|NS|MX|A|PTR|CNAME|_mstr)$/
     or return "Illegal rectype (only SOA NS MX A PTR CNAME recognized): ".
               $self->rectype;
   $self->rectype($1);
@@ -148,6 +148,9 @@ sub check {
     $self->recdata =~ /^([a-z0-9\.\-]+)$/i
       or return "Illegal data for CNAME record: ". $self->recdata;
     $self->recdata($1);
+  } elsif ( $self->rectype eq '_mstr' ) {
+    $self->recdata =~ /^((\d{1,3}\.){3}\d{1,3})$/
+      or return "Illegal data for _master pseudo-record: ". $self->recdata;
   } else {
     die "ack!";
   }
@@ -159,7 +162,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: domain_record.pm,v 1.6 2002-04-20 10:49:33 ivan Exp $
+$Id: domain_record.pm,v 1.7 2002-04-20 11:57:35 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 406b270ed..49e21307b 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -580,7 +580,12 @@ sub exporttype2svcdb {
 
   },
 
-  'svc_domain' => {},
+  'svc_domain' => {
+    'bind' => 'Batch export to BIND named',
+    'options' => {
+    },
+    'notes' => 'bind export notes',
+  },
 
   'svc_acct_sm' => {},
 
diff --git a/bin/passwd.import b/bin/passwd.import
new file mode 100755
index 000000000..8b5826bfe
--- /dev/null
+++ b/bin/passwd.import
@@ -0,0 +1,110 @@
+#!/usr/bin/perl -Tw
+# $Id: passwd.import,v 1.1 2002-04-20 11:57:35 ivan Exp $
+
+use strict;
+use vars qw(%part_svc);
+use Date::Parse;
+use Term::Query qw(query);
+use Net::SCP qw(iscp);
+use FS::UID qw(adminsuidsetup datasrc);
+use FS::Record qw(qsearch);
+use FS::svc_acct;
+use FS::part_svc;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+push @FS::svc_acct::shells, qw(/bin/sync /sbin/shuddown /bin/halt); #others?
+
+my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
+
+#$FS::svc_acct::nossh_hack = 1;
+$FS::svc_acct::noexport_hack = 1;
+
+###
+
+%part_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_acct'});
+
+die "No services with svcdb svc_acct!\n" unless %part_svc;
+
+print "\n\n", &menu_svc, "\n", <<END;
+Enter part number to import.
+END
+my($shell_svcpart)=&getpart;
+
+print "\n\n", <<END;
+Enter the location and name of your _user_ passwd file, for example
+"mail.isp.com:/etc/passwd" or "nis.isp.com:/etc/global/passwd"
+END
+my($loc_passwd)=&getvalue(":");
+iscp("root\@$loc_passwd", "$spooldir/passwd.import");
+
+print "\n\n", <<END;
+Enter the location and name of your _user_ shadow file, for example
+"mail.isp.com:/etc/shadow" or "bsd.isp.com:/etc/master.passwd"
+END
+my($loc_shadow)=&getvalue(":");
+iscp("root\@$loc_shadow", "$spooldir/shadow.import");
+
+sub menu_svc {
+  ( join "\n", map "$_: ".$part_svc{$_}->svc, sort keys %part_svc ). "\n";
+}
+sub getpart {
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query "Enter part number:", 'irk', [ keys %part_svc ];
+  $^W=1;
+  $return;
+}
+sub getvalue {
+  my $prompt = shift;
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query $prompt, '';
+  $^W=1;
+  $return;
+}
+
+print "\n\n";
+
+###
+
+open(PASSWD,"<$spooldir/passwd.import");
+open(SHADOW,"<$spooldir/shadow.import");
+
+my(%password);
+while (<SHADOW>) {
+  chop;
+  my($username,$password)=split(/:/);
+  #$password =~ s/^\!$/\*/;
+  #$password =~ s/\!+/\*SUSPENDED\* /;
+  $password{$username}=$password;
+}
+
+while (<PASSWD>) {
+  chop;
+  my($username,$x,$uid,$gid,$finger,$dir,$shell)=split(/:/);
+  my($password)=$upassword{$username} || $password{$username};
+
+  $svcpart = $shell_svcpart;
+
+  my($svc_acct) = new FS::svc_acct ({
+    'svcpart'   => $svcpart,
+    'username'  => $username,
+    '_password' => $password,
+    'uid'       => $uid,
+    'gid'       => $gid,
+    'finger'    => $finger,
+    'dir'       => $dir,
+    'shell'     => $shell,
+    %{$allparam{$username}},
+  });
+  my($error);
+  $error=$svc_acct->insert;
+  die $error if $error;
+
+  delete $upassword{$username};
+}
+
+sub usage {
+  die "Usage:\n\n  passwd.import user\n";
+}
+
diff --git a/bin/svc_domain.erase b/bin/svc_domain.erase
new file mode 100755
index 000000000..c0236614b
--- /dev/null
+++ b/bin/svc_domain.erase
@@ -0,0 +1,17 @@
+#!/usr/bin/perl -w
+#
+# $Id: svc_domain.erase,v 1.1 2002-04-20 11:57:35 ivan Exp $
+
+use strict;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch);
+
+use FS::domain_record;
+use FS::svc_domain;
+
+adminsuidsetup(shift @ARGV) or die "Usage: svc_domain.erase user\n";
+
+foreach my $record ( qsearch('domain_record',{}), qsearch('svc_domain', {} ) ) {
+  my $error = $record->delete;
+  die $error if $error;
+}
diff --git a/bin/svc_domain.import b/bin/svc_domain.import
index 10fe5b584..95d2ead78 100644
--- a/bin/svc_domain.import
+++ b/bin/svc_domain.import
@@ -1,13 +1,17 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_domain.import,v 1.3 2001-11-05 12:07:10 ivan Exp $
+# $Id: svc_domain.import,v 1.4 2002-04-20 11:57:35 ivan Exp $
 
 use strict;
 use vars qw( %d_part_svc );
 use Term::Query qw(query);
-use Net::SCP qw(iscp);
+#use BIND::Conf_Parser;
+#use DNS::ZoneParse;
+
+#use Net::SCP qw(iscp);
+use Net::SCP qw(scp);
 use FS::UID qw(adminsuidsetup datasrc);
-#use FS::Record qw(qsearch qsearchs);
+use FS::Record qw(qsearch); #qsearchs);
 #use FS::svc_acct_sm;
 use FS::svc_domain;
 use FS::domain_record;
@@ -17,7 +21,8 @@ use FS::domain_record;
 my $user = shift or die &usage;
 adminsuidsetup $user;
 
-my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
+use vars qw($spooldir);
+$spooldir = "/usr/local/etc/freeside/export.". datasrc;
 
 %d_part_svc =
   map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_domain'});
@@ -25,8 +30,9 @@ my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
 print "\n\n",
       ( join "\n", map "$_: ".$d_part_svc{$_}->svc, sort keys %d_part_svc ),
       "\n\n";
+use vars qw($domain_svcpart);
 $^W=0; #Term::Query isn't -w-safe
-my $domain_svcpart =
+$domain_svcpart =
   query "Enter part number for domains: ", 'irk', [ keys %d_part_svc ];
 $^W=1;
 
@@ -35,9 +41,19 @@ Enter the location and name of your primary named.conf file, for example
 "ns.isp.com:/var/named/named.conf"
 END
   my($named_conf)=&getvalue(":");
-  iscp("root\@$named_conf","$spooldir/named.conf.import");
-
-my $named_machine = (split(/:/, $named_conf))[0];
+  #iscp("root\@$named_conf","$spooldir/named.conf.import");
+  scp("root\@$named_conf","$spooldir/named.conf.import");
+
+use vars qw($named_machine);
+$named_machine = (split(/:/, $named_conf))[0];
+
+sub getvalue {
+  my $prompt = shift;
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query $prompt, '';
+  $^W=1;
+  $return;
+}
 
 print "\n\n";
 
@@ -45,48 +61,120 @@ print "\n\n";
 
 $FS::svc_domain::whois_hack=1;
 
-open(NAMED_CONF,"<$spooldir/named.conf.import")
-  or die "Can't open $spooldir/named.conf.import: $!";
+my $p = Parser->new;
+$p->parse_file("$spooldir/named.conf.import");
+
+print "\nBIND import completed.\n";
+
+##
 
-while (<NAMED_CONF>) {
-  next unless /^\s*options/;
+sub usage {
+  die "Usage:\n\n  svc_domain.import user\n";
 }
-my $directory;
-while (<NAMED_CONF>) {
-  last if /^\s*directory\s+\"([\/\w+]+)\";/;
-} 
-$directory = $1 or die "can't locate directory in named.conf!";
-while (<NAMED_CONF>) {
-  next unless /^\s*zone\s+\"([\w\.\-]+)\"\s+\{/;
-  my $zone = $1;
-  while (<NAMED_CONF>) {
-    my $type;
-    if ( /^\s*type\s+(master|slave)\s*\;/ ) {
-      $type = $1;
-    }
-    if ( /^\s*file\s+\"([\w\.\-]+)\"\s*\;/ && $type eq 'master' ) {
-
-      #
-      # (add svc_domain)
-      my $file = $1;
-      iscp("root\@$named_machine:$directory/$file","$spooldir/$file.import");
-      open(ZONE,"<$spooldir/$file.import")
-        or die "Can't open $spooldir/$file.import: $!";
-      while (<ZONE>) {
-        # (add domain_record)
+
+########
+BEGIN {
+  
+  package Parser;
+  use BIND::Conf_Parser;
+  use vars qw(@ISA $named_dir);
+  @ISA = qw(BIND::Conf_Parser);
+  
+  sub handle_option {
+    my($self, $option, $argument) = @_;
+    return unless $option eq "directory";
+    $named_dir = $argument;
+  }
+  
+  sub handle_zone {
+    my($self, $name, $class, $type, $options) = @_;
+    return unless $class eq 'in';
+
+    my $domain = new FS::svc_domain( {
+      svcpart => $main::domain_svcpart,
+      domain  => $name,
+      action  => 'N',
+    } );
+    my $error = $domain->insert;
+    die $error if $error;
+
+    if ( $type eq 'slave' ) {
+
+      #use Data::Dumper;
+      #print Dumper($options);
+      #exit;
+
+      foreach my $master ( @{ $options->{masters} } ) {
+        my $domain_record = new FS::domain_record( {
+          'svcnum'  => $domain->svcnum,
+          'reczone' => '@',
+          'recaf'   => 'IN',
+          'rectype' => '_mstr',
+          'recdata' => $master,
+        } );
+        my $error = $domain_record->insert;
+        die $error if $error;
       }
 
-      #
+    } elsif ( $type eq 'master' ) {
+
+      my $file = $options->{file};
+  
+      use File::Basename;
+      my $basefile = basename($file);
+      my $sourcefile = $file;
+      $sourcefile = "$named_dir/$sourcefile" unless $file =~ /^\//;
+      use Net::SCP qw(iscp scp);
+      scp("root\@$main::named_machine:$sourcefile",
+          "$main::spooldir/$basefile.import");
+    
+      use DNS::ZoneParse;
+      my $zone = DNS::ZoneParse->new("$main::spooldir/$basefile.import");
+    
+      my $dump = $zone->Dump;
+  
+      #use Data::Dumper;
+      #print "$name: ". Dumper($dump);
+      #exit;
+    
+      foreach my $rectype ( keys %$dump ) {
+        if ( $rectype =~ /^SOA$/i ) {
+          my $rec = $dump->{$rectype};
+          my $domain_record = new FS::domain_record( {
+            'svcnum'  => $domain->svcnum,
+            'reczone' => $rec->{origin},
+            'recaf'   => 'IN',
+            'rectype' => $rectype,
+            'recdata' =>
+              $rec->{primary}. ' '. $rec->{email}. ' ( '.
+             join(' ', map $rec->{$_},
+                           qw( serial refresh retry expire minimumTTL ) ).
+             ' )',
+          } );
+          my $error = $domain_record->insert;
+          die $error if $error;
+       } else {
+          #die $dump->{$rectype};
+          foreach my $rec ( @{ $dump->{$rectype} } ) {
+            my $domain_record = new FS::domain_record( {
+              'svcnum'  => $domain->svcnum,
+              'reczone' => $rec->{name},
+              'recaf'   => $rec->{class},
+              'rectype' => $rectype,
+              'recdata' => ( $rectype =~ /^MX$/i
+                               ? $rec->{priority}. ' '. $rec->{host}
+                               : $rec->{host}                      ),
+            } );
+            my $error = $domain_record->insert;
+            die $error if $error;
+          }
+        }
+      }
 
     }
     
-    last if /^\s*\}\s*\;/;
   }
-}
-
-##
 
-sub usage {
-  die "Usage:\n\n  svc_domain.import user\n";
 }
+#########
 
diff --git a/httemplate/docs/legacy.html b/httemplate/docs/legacy.html
index 5f59bb83f..cceeb05d0 100755
--- a/httemplate/docs/legacy.html
+++ b/httemplate/docs/legacy.html
@@ -3,8 +3,10 @@
 </head>
 <body>
   <h1>Importing legacy data</h1>
-<font size="+2">NOTE: This file is OUT OF DATE with the landing of the new export code.  Importing your legacy data will most probably involve some hacking on the example scripts noted below.  Contributions to the import process are welcome.</font>
+<font size="+2">In most cases, legacy data import all cases will require writing custom code to deal with your particular legacy data.  The example scripts here will not work "out-of-the-box".  Importing your legacy data will most probably involve some hacking on the example scripts noted below.  Contributions to the import process are welcome.</font>
 <ul>
+  <li><a name="svc_domain">bin/svc_domain.import</a> - Import domain information from BIND named
+  <li><a name="svc_acct">bin/passwd.import</a> - Just import `passwd' and `shadow' or `master.passwd', no RADIUS import.
   <li><a name="svc_acct">bin/svc_acct.import</a> - Import `passwd', ( `shadow' or `master.passwd' ) and RADIUS `users'.  Before running bin/svc_acct.import, you need <a href="../browse/part_svc.cgi">services</a> (with table svc_acct) as follows:
     <ul>
       <li>Most accounts probably have entries in passwd and users (with Port-Limit nonexistant or 1)
-- 
cgit v1.2.1


From ffe9f4473c5c9c7cb7caeaa5b39160d7b3e8d137 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 20 Apr 2002 12:37:23 +0000
Subject: bind export

---
 ANNOUCE.1.4.0                   |  6 ++++++
 FS/FS/part_export.pm            | 32 +++++++++++++++++++++++++++-----
 httemplate/edit/part_export.cgi |  2 +-
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/ANNOUCE.1.4.0 b/ANNOUCE.1.4.0
index 86f48b6df..63fd3fa95 100644
--- a/ANNOUCE.1.4.0
+++ b/ANNOUCE.1.4.0
@@ -120,3 +120,9 @@ icradius groups (usergroup table if not radgroupreply & radgroupcheck)
 message catalogs (infrastructure, anyway) & anything which gets sent to a
 customer from the signup server should use message catalog
 
+multi-agent signup server
+
+signup_server-realtime to run cards immediately
+
+and signup-alternate.html for free/paid packages on same signup
+
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 49e21307b..d1148fa0a 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -472,6 +472,7 @@ sub exporttype2svcdb {
   '';
 }
 
+#export names cannot have dashes...
 %exports = (
   'svc_acct' => {
     'sysvshell' => {
@@ -494,9 +495,9 @@ sub exporttype2svcdb {
     },
 
     'shellcommands' => {
-      'desc' => 'Real-time export via arbitrary commands on a remote machine (i.e. useradd, userdel, etc.)',
+      'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
       'options' => {
-        'machine' => { label=>'Remote machine' },
+        #'machine' => { label=>'Remote machine' },
         'user' => { label=>'Remote username', default=>'root' },
         'useradd' => { label=>'Insert command',
                        default=>'useradd -d $dir -m -s $shell -u $uid $username'
@@ -581,10 +582,31 @@ sub exporttype2svcdb {
   },
 
   'svc_domain' => {
-    'bind' => 'Batch export to BIND named',
-    'options' => {
+
+    'bind' => {
+      'desc' =>'Batch export to BIND named',
+      'options' => {
+        #'machine'    => { label=>'named machine' },
+        'named_conf' => { label  => 'named.conf location',
+                          default=> '/etc/bind/named.conf' },
+        'zonepath'   => { label => 'path to zone files',
+                          default=> '/etc/bind/', },
+      },
+      'notes' => 'bind export notes',
     },
-    'notes' => 'bind export notes',
+
+    'bind_slave' => {
+      'desc' =>'Batch export to slave BIND named',
+      'options' => {
+        #'machine'    => { label=> 'Slave machine' },
+        'master'     => { label=> 'Master IP address' },
+        'named_conf' => { label  => 'named.conf location',
+                          default=> '/etc/bind/named.conf' },
+      },
+      'notes' => 'bind export notes (secondary munge)',
+    },
+
+
   },
 
   'svc_acct_sm' => {},
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 4affeb48f..af89c4ead 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -52,7 +52,7 @@ my $widget = new HTML::Widgets::SelectLayers(
                   || $part_export->option($option)
                   || (exists $optinfo->{default} ? $optinfo->{default} : '');
       $html .= qq!<TR><TD ALIGN="right">$label</TD>!.
-               qq!<TD><INPUT TYPE="text" NAME="$option" VALUE="$value"></TD>!.
+               qq!<TD><INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64></TD>!.
                '</TR>';
     }
     $html .= '</TABLE>';
-- 
cgit v1.2.1


From 6fa9f6fe4cd0b090ea1f0b6236a00241070d0bdc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Apr 2002 20:47:21 +0000
Subject: - check agentnum ability to order packages in FS::cust_pkg, not
 signup server - order by recur price in signup-alternate template

---
 FS/FS/cust_pkg.pm                                   | 10 ++++++++--
 fs_signup/FS-SignupClient/cgi/signup-alternate.html |  4 +++-
 fs_signup/fs_signup_server                          |  7 -------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 0fc21478a..b7633c196 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -139,7 +139,13 @@ sub insert {
   my $error = $self->ut_number('custnum');
   return $error if $error;
 
-  return "Unknown customer ". $self->custnum unless $self->cust_main;
+  my $cust_main = $self->cust_main;
+  return "Unknown customer ". $self->custnum unless $cust_main;
+
+  my $agent = qsearchs( 'agent', { 'agentnum' => $cust_main->agentnum } );
+  my $pkgpart_href = $agent->pkgpart_hashref;
+  return "agent ". $agent->agentnum. " can't purchase pkgpart ". $self->pkgpart
+    unless $pkgpart_href->{ $self->{pkgpart} };
 
   $self->SUPER::insert;
 
@@ -695,7 +701,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.18 2002-04-20 02:06:38 ivan Exp $
+$Id: cust_pkg.pm,v 1.19 2002-04-22 20:47:21 ivan Exp $
 
 =head1 BUGS
 
diff --git a/fs_signup/FS-SignupClient/cgi/signup-alternate.html b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
index bb013b9ab..490cefa5e 100755
--- a/fs_signup/FS-SignupClient/cgi/signup-alternate.html
+++ b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
@@ -108,7 +108,9 @@ ENDOUT
       my %pkgpart2payby = map { $_->{pkgpart} => $_->{payby}[0] } @{$packages};
       tie my %options, 'Tie::IxHash',
         '' => '(none)',
-        map { $_->{pkgpart} => $_->{pkg} } @{$packages} 
+        map { $_->{pkgpart} => $_->{pkg} }
+          sort { $a->{recur} <=> $b->{recur} }
+            @{$packages} 
       ;
 
       use HTML::Widgets::SelectLayers 0.02;
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 089cfdeb9..b823d3032 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -147,13 +147,6 @@ while (1) {
         or $error ||= "WARNING: unknown pkgpart ". $signup_data->{pkgpart};
     my $svcpart = $part_pkg->svcpart unless $error;
 
-    # this should wind up in FS::cust_pkg!
-    my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } );
-    #my $pkgpart_href = $agent->pkgpart_hashref;
-    $error ||= "WARNING: agent $agentnum can't purchase pkgpart ".
-               $signup_data->{pkgpart}
-      unless $pkgpart_href->{ $signup_data->{pkgpart} };
-
     my $cust_pkg = new FS::cust_pkg ( {
       #later#'custnum' => $custnum,
       'pkgpart' => $signup_data->{'pkgpart'},
-- 
cgit v1.2.1


From 672600ec20269dad5ec798b4a62711bfb29e49c0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Apr 2002 21:18:10 +0000
Subject: add pkgpart to agent type listing

---
 httemplate/edit/agent_type.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 4a4cd9a47..637c710ab 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -46,7 +46,7 @@ foreach my $part_pkg ( qsearch('part_pkg',{ 'disabled' => '' }) ) {
           : '',
         qq!VALUE="ON"> !,
     qq!<A HREF="${p}edit/part_pkg.cgi?!, $part_pkg->pkgpart, 
-    '">', $part_pkg->getfield('pkg'), '</A>',
+    '">', $part_pkg->pkgpart. ": ". $part_pkg->getfield('pkg'), '</A>',
   ;
 }
 
-- 
cgit v1.2.1


From 280ec2e44b48809e0e0a472b31cfa49adce52d5c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Apr 2002 21:23:16 +0000
Subject: fix bug checking agents allowed to purchase packages (moved from
 signups server)

---
 FS/FS/cust_pkg.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index b7633c196..08c04a06b 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -145,7 +145,7 @@ sub insert {
   my $agent = qsearchs( 'agent', { 'agentnum' => $cust_main->agentnum } );
   my $pkgpart_href = $agent->pkgpart_hashref;
   return "agent ". $agent->agentnum. " can't purchase pkgpart ". $self->pkgpart
-    unless $pkgpart_href->{ $self->{pkgpart} };
+    unless $pkgpart_href->{ $self->pkgpart };
 
   $self->SUPER::insert;
 
@@ -701,7 +701,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.19 2002-04-22 20:47:21 ivan Exp $
+$Id: cust_pkg.pm,v 1.20 2002-04-22 21:23:16 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 3bc29c4f296049c223ded80aa69831b1db1ac428 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Apr 2002 21:36:05 +0000
Subject: don't show extended debugging in error messages that could end up on
 the signup server

---
 FS/FS/cust_main.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 445c6951a..6fefe0db3 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -256,7 +256,8 @@ sub insert {
   my $error = $self->SUPER::insert;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
-    return "inserting cust_main record (transaction rolled back): $error";
+    #return "inserting cust_main record (transaction rolled back): $error";
+    return $error;
   }
 
   if ( @param ) { # CUST_PKG_HASHREF
@@ -277,7 +278,8 @@ sub insert {
         $error = $svc_something->insert;
         if ( $error ) {
           $dbh->rollback if $oldAutoCommit;
-          return "inserting svc_ (transaction rolled back): $error";
+          #return "inserting svc_ (transaction rolled back): $error";
+          return $error;
         }
       }
     }
-- 
cgit v1.2.1


From b9c0e290993085518e2bae5fae90cff7e9f91974 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Apr 2002 22:45:34 +0000
Subject: use Tie::IxHash to present export options in a reasonable order

---
 FS/FS/part_export.pm | 149 +++++++++++++++++++++++++++++----------------------
 1 file changed, 85 insertions(+), 64 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index d1148fa0a..e3b2eb3fc 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -3,6 +3,7 @@ package FS::part_export;
 use strict;
 use vars qw( @ISA @EXPORT_OK %exports );
 use Exporter;
+use Tie::IxHash;
 use FS::Record qw( qsearch qsearchs dbh );
 use FS::part_svc;
 use FS::part_export_option;
@@ -472,6 +473,80 @@ sub exporttype2svcdb {
   '';
 }
 
+tie my %shellcommands_options, 'Tie::IxHash',
+  #'machine' => { label=>'Remote machine' },
+  'user' => { label=>'Remote username', default=>'root' },
+  'useradd' => { label=>'Insert command',
+                 default=>'useradd -d $dir -m -s $shell -u $uid $username'
+                #default=>'cp -pr /etc/skel $dir; chown -R $uid.$gid $dir'
+               },
+  'userdel' => { label=>'Delete command',
+                 default=>'userdel $username',
+                 #default=>'rm -rf $dir',
+               },
+  'usermod' => { label=>'Modify command',
+                 default=>'usermod -d $new_dir -l $new_username -s $new_shell -u $new_uid $old_username',
+                #default=>'[ -d $old_dir ] && mv $old_dir $new_dir || ( '.
+                 #  'chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; '.
+                 #  'find . -depth -print | cpio -pdm $new_dir; '.
+                 #  'chmod u-t $new_dir; chown -R $uid.$gid $new_dir; '.
+                 #  'rm -rf $old_dir'.
+                 #')'
+               },
+;
+
+tie my %sqlradius_options, 'Tie::IxHash',
+  'datasrc'  => { label=>'DBI data source' },
+  'username' => { label=>'Database username' },
+  'password' => { label=>'Database password' },
+;
+
+tie my %cyrus_options, 'Tie::IxHash',
+  'server' => { label=>'IMAP server' },
+  'username' => { label=>'Admin username' },
+  'password' => { label=>'Admin password' },
+;
+
+tie my %cp_options, 'Tie::IxHash',
+  'host'      => { label=>'Hostname' },
+  'port'      => { label=>'Port number' },
+  'username'  => { label=>'Username' },
+  'password'  => { label=>'Password' },
+  'domain'    => { label=>'Domain' },
+  'workgroup' => { label=>'Default Workgroup' },
+;
+
+tie my %infostreet_options, 'Tie::IxHash',
+  'url'      => { label=>'XML-RPC Access URL', },
+  'login'    => { label=>'InfoStreet login', },
+  'password' => { label=>'InfoStreet password', },
+  'groupID'  => { label=>'InfoStreet groupID', },
+;
+
+tie my %vpopmail_options, 'Tie::IxHash',
+  'machine' => { label=>'vpopmail machine', },
+  'dir'     => { label=>'directory', }, # ?more info? default?
+  'uid'     => { label=>'vpopmail uid' },
+  'gid'     => { label=>'vpopmail gid' },
+;
+
+tie my %bind_options, 'Tie::IxHash',
+  #'machine'    => { label=>'named machine' },
+  'named_conf' => { label  => 'named.conf location',
+                    default=> '/etc/bind/named.conf' },
+  'zonepath'   => { label => 'path to zone files',
+                    default=> '/etc/bind/', },
+;
+
+tie my %bind_slave_options, 'Tie::IxHash',
+  #'machine'    => { label=> 'Slave machine' },
+  'master'     => { label=> 'Master IP address' },
+  'named_conf' => { label  => 'named.conf location',
+                    default=> '/etc/bind/named.conf' },
+;
+
+
+
 #export names cannot have dashes...
 %exports = (
   'svc_acct' => {
@@ -492,90 +567,47 @@ sub exporttype2svcdb {
 #    },
     'textradius' => {
       'desc' => 'Batch export of a text /etc/raddb/users file (Livingston, Cistron)',
+      'options' => {},
     },
 
     'shellcommands' => {
       'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
-      'options' => {
-        #'machine' => { label=>'Remote machine' },
-        'user' => { label=>'Remote username', default=>'root' },
-        'useradd' => { label=>'Insert command',
-                       default=>'useradd -d $dir -m -s $shell -u $uid $username'
-                      #default=>'cp -pr /etc/skel $dir; chown -R $uid.$gid $dir'
-                     },
-        'userdel' => { label=>'Delete command',
-                       default=>'userdel $username',
-                       #default=>'rm -rf $dir',
-                     },
-        'usermod' => { label=>'Modify command',
-                       default=>'usermod -d $new_dir -l $new_username -s $new_shell -u $new_uid $old_username',
-                      #default=>'[ -d $old_dir ] && mv $old_dir $new_dir || ( '.
-                       #  'chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; '.
-                       #  'find . -depth -print | cpio -pdm $new_dir; '.
-                       #  'chmod u-t $new_dir; chown -R $uid.$gid $new_dir; '.
-                       #  'rm -rf $old_dir'.
-                       #')'
-                     },
-      },
+      'options' => \%shellcommands_options,
       'nodomain' => 'Y',
       'notes' => 'shellcommandsnotes... (this one is the nodomain one)',
     },
 
     'sqlradius' => {
       'desc' => 'Real-time export to SQL-backed RADIUS (ICRADIUS, FreeRADIUS)',
-      'options' => {
-        'datasrc'  => { label=>'DBI data source' },
-        'username' => { label=>'Database username' },
-        'password' => { label=>'Database password' },
-      },
+      'options' => \%sqlradius_options,
       'nodomain' => 'Y',
       'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  Use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete and repopulate the tables from the Freeside database.',
     },
 
     'cyrus' => {
       'desc' => 'Real-time export to Cyrus IMAP server',
-      'options' => {
-        'server' => { label=>'IMAP server' },
-        'username' => { label=>'Admin username' },
-        'password' => { label=>'Admin password' },
-      },
+      'options' => \%cyrus_options,
       'nodomain' => 'Y',
       'notes' => 'Integration with <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a>.  Cyrus::IMAP::Admin should be installed locally and the connection to the server secured.  <B>svc_acct.quota</B>, if available, is used to set the Cyrus quota. '
     },
 
     'cp' => {
       'desc' => 'Real-time export to Critical Path Account Provisioning Protocol',
-      'options' => {
-        'host'      => { label=>'Hostname' },
-        'port'      => { label=>'Port number' },
-        'username'  => { label=>'Username' },
-        'password'  => { label=>'Password' },
-        'domain'    => { label=>'Domain' },
-        'workgroup' => { label=>'Default Workgroup' },
-      },
+      'options' => \%cp_options,
       'notes' => 'Real-time export to <a href="http://www.cp.net/">Critial Path Account Provisioning Protocol</a>.  Requires installation of <a href="http://search.cpan.org/search?dist=Net-APP">Net::APP</a> from CPAN.',
     },
     
     'infostreet' => {
       'desc' => 'Real-time export to InfoStreet streetSmartAPI',
-      'options' => {
-        'url'      => { label=>'XML-RPC Access URL', },
-        'login'    => { label=>'InfoStreet login', },
-        'password' => { label=>'InfoStreet password', },
-        'groupID'  => { label=>'InfoStreet groupID', },
-      },
+      'options' => \%infostreet_options,
       'nodomain' => 'Y',
       'notes' => 'Real-time export to <a href="http://www.infostreet.com/">InfoStreet</a> streetSmartAPI.  Requires installation of <a href="http://search.cpan.org/search?dist=Frontier-Client">Frontier::Client</a> from CPAN.',
     },
 
     'vpopmail' => {
       'desc' => 'Real-time export to vpopmail text files',
-      'options' => {
-        'machine' => { label=>'vpopmail machine', },
-        'dir'     => { label=>'directory', }, # ?more info? default?
-        'uid'     => { label=>'vpopmail uid' },
-        'gid'     => { label=>'vpopmail gid' },
-      },
+      'options' => \%vpopmail_options,
+
       'notes' => 'Real time export to <a href="http://inter7.com/vpopmail/">vpopmail</a> text files (...extended description from jeff?...)',
     },
 
@@ -585,24 +617,13 @@ sub exporttype2svcdb {
 
     'bind' => {
       'desc' =>'Batch export to BIND named',
-      'options' => {
-        #'machine'    => { label=>'named machine' },
-        'named_conf' => { label  => 'named.conf location',
-                          default=> '/etc/bind/named.conf' },
-        'zonepath'   => { label => 'path to zone files',
-                          default=> '/etc/bind/', },
-      },
+      'options' => \%bind_options,
       'notes' => 'bind export notes',
     },
 
     'bind_slave' => {
       'desc' =>'Batch export to slave BIND named',
-      'options' => {
-        #'machine'    => { label=> 'Slave machine' },
-        'master'     => { label=> 'Master IP address' },
-        'named_conf' => { label  => 'named.conf location',
-                          default=> '/etc/bind/named.conf' },
-      },
+      'options' => \%bind_slave_options,
       'notes' => 'bind export notes (secondary munge)',
     },
 
-- 
cgit v1.2.1


From 62403391487a8e2d1518fa850ea27f15d466882b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Apr 2002 07:10:19 +0000
Subject: fixes inserting strings that end in numbers to TEXT columns... gah i
 hate SQL

---
 FS/FS/Record.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index ac8117e70..f7c3a41c8 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1155,7 +1155,7 @@ sub _quote {
   my($dbh)=dbh;
   if ( $value =~ /^\d+(\.\d+)?$/ && 
 #       ! ( datatype($table,$field) =~ /^char/ ) 
-       ! ( $dbdef->table($table)->column($field)->type =~ /(char|binary)$/i ) 
+       ! $dbdef->table($table)->column($field)->type =~ /(char|binary|text)$/i 
   ) {
     $value;
   } else {
-- 
cgit v1.2.1


From 91a5fe454cc6411bc0f8db545bc42f55fe2cd510 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Apr 2002 07:32:49 +0000
Subject: harmless ui glitch

---
 httemplate/edit/REAL_cust_pkg.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index abfaac3fc..580313e88 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -1,6 +1,6 @@
 <!-- mason kludge -->
 <%
-# <!-- $Id: REAL_cust_pkg.cgi,v 1.2 2002-02-10 16:05:22 ivan Exp $ -->
+# <!-- $Id: REAL_cust_pkg.cgi,v 1.3 2002-04-23 07:32:49 ivan Exp $ -->
 
 my $error ='';
 my $pkgnum = '';
@@ -75,7 +75,7 @@ print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
   if $cancel;
 
 %>
-</TABLE></TD></TR></TABLE>'.
+</TABLE></TD></TR></TABLE>
 <BR><INPUT TYPE="submit" VALUE="Apply Changes">
 </FORM>
 </BODY>
-- 
cgit v1.2.1


From f3d48cda02218523b2cafcc3c3edfe5771d8676e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Apr 2002 09:03:37 +0000
Subject: msgcat error for credit card expiration (closes: Bug#407)

---
 FS/FS/cust_main.pm  | 9 ++++-----
 bin/populate-msgcat | 4 ++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 6fefe0db3..4a6a95251 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -683,11 +683,10 @@ sub check {
   } else {
     $self->paydate =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/
       or return "Illegal expiration date: ". $self->paydate;
-    if ( length($2) == 4 ) {
-      $self->paydate("$2-$1-01");
-    } else {
-      $self->paydate("20$2-$1-01");
-    }
+    my $y = length($2) == 4 ? $2 : "20$2";
+    $self->paydate("$y-$1-01");
+    my($nowm,$nowy)=(localtime(time))[4,5]; $nowm++; $nowy+=1900;
+    return gettext('expired_card') if $y<$nowy || ( $y==$nowy && $1<$nowm );
   }
 
   if ( $self->payname eq '' ) {
diff --git a/bin/populate-msgcat b/bin/populate-msgcat
index 64fa59a44..506cf5f0b 100755
--- a/bin/populate-msgcat
+++ b/bin/populate-msgcat
@@ -102,6 +102,10 @@ sub messages {
       #'en_US' => '',
     },
 
+    'expired_card' => {
+      'en_US' => 'Expired card',
+    },
+
   );
 }
 
-- 
cgit v1.2.1


From 70e1035b6a95d2bb0b2bacc4316e9d0a973db813 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Apr 2002 09:09:36 +0000
Subject: require_cardname option

---
 FS/FS/Conf.pm      | 7 +++++++
 FS/FS/cust_main.pm | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 2a7a4c103..3565be965 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -909,6 +909,13 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'require_cardname',
+    'section'     => 'billing',
+    'description' => 'Require an "Exact name on card" to be entered explicitly; don\'t default to using the first and last name.',
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 4a6a95251..64e9b5f91 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -689,7 +689,7 @@ sub check {
     return gettext('expired_card') if $y<$nowy || ( $y==$nowy && $1<$nowm );
   }
 
-  if ( $self->payname eq '' ) {
+  if ( $self->payname eq '' && ! $conf->exists('require_cardname') ) {
     $self->payname( $self->first. " ". $self->getfield('last') );
   } else {
     $self->payname =~ /^([\w \,\.\-\']+)$/
-- 
cgit v1.2.1


From 1ea7e2f486cdd4596567b861cfe40fa691de8c17 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Apr 2002 22:14:45 +0000
Subject: fix suspending all accounts in signup server

---
 fs_signup/fs_signup_server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index b823d3032..b636b6981 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -221,7 +221,7 @@ while (1) {
         'Agent  : '. $cust_main->agent->agent. "\n",
         "\n",
       ];
-      if ( $cust_main->balance ) {
+      if ( $cust_main->balance > 0 ) {
         push @$body,
           "This customer has an outstanding balance and has been suspended.\n";
       }
-- 
cgit v1.2.1


From b5124265c3f3781d0f961b836cbf674fde12ce54 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Apr 2002 01:15:33 +0000
Subject: don't require_cardname for non-CARD payby's

---
 FS/FS/cust_main.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 64e9b5f91..4316988ca 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -689,7 +689,8 @@ sub check {
     return gettext('expired_card') if $y<$nowy || ( $y==$nowy && $1<$nowm );
   }
 
-  if ( $self->payname eq '' && ! $conf->exists('require_cardname') ) {
+  if ( $self->payname eq '' &&
+       ( ! $conf->exists('require_cardname') || $self->payby ne 'CARD' ) ) {
     $self->payname( $self->first. " ". $self->getfield('last') );
   } else {
     $self->payname =~ /^([\w \,\.\-\']+)$/
-- 
cgit v1.2.1


From a351f58cf394121aa1f72139356567c4785bf47f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Apr 2002 09:47:25 +0000
Subject: add flat_delayed plan

---
 FS/FS/part_pkg.pm            |  7 ++++++-
 httemplate/edit/part_pkg.cgi | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index e8cc67713..0cb766eef 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -59,6 +59,8 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item recurtax - Recurring fee tax exempt flag, empty or `Y'
 
+=item taxclass - Texas tax class flag, empty or "none", "access", or "hosting"
+
 =item plan - Price plan
 
 =item plandata - Price plan data
@@ -196,6 +198,8 @@ sub check {
 
     $r =~ /^\s*\d*\.?\d*\s*$/
 
+      or $r =~ /^\$sdate += 86400 \* \s*\d+\s*; \s*\d*\.?\d*\s*$/
+
       or $r =~ /^my \$mnow = \$sdate; my \(\$sec,\$min,\$hour,\$mday,\$mon,\$year\) = \(localtime\(\$sdate\) \)\[0,1,2,3,4,5\]; my \$mstart = timelocal\(0,0,0,1,\$mon,\$year\); my \$mend = timelocal\(0,0,0,1, \$mon == 11 \? 0 : \$mon\+1, \$year\+\(\$mon==11\)\); \$sdate = \$mstart; \( \$part_pkg->freq \- 1 \) \* \d*\.?\d* \/ \$part_pkg\-\>freq \+ \d*\.?\d* \/ \$part_pkg\-\>freq \* \(\$mend\-\$mnow\) \/ \(\$mend\-\$mstart\) ;\s*$/
 
       or $r =~ /^my \$mnow = \$sdate; my \(\$sec,\$min,\$hour,\$mday,\$mon,\$year\) = \(localtime\(\$sdate\) \)\[0,1,2,3,4,5\]; \$sdate = timelocal\(0,0,0,1,\$mon,\$year\); \s*\d*\.?\d*\s*;\s*$/
@@ -227,6 +231,7 @@ sub check {
       || $self->ut_anything('plandata')
       || $self->ut_enum('setuptax', [ '', 'Y' ] )
       || $self->ut_enum('recurtax', [ '', 'Y' ] )
+      || $self->ut_enum('texastax', [ '', 'none', 'access', 'hosting' ] )
       || $self->ut_enum('disabled', [ '', 'Y' ] )
     ;
 }
@@ -288,7 +293,7 @@ sub payby {
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.10 2002-04-19 01:16:39 ivan Exp $
+$Id: part_pkg.pm,v 1.11 2002-04-25 09:47:25 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 60319f9d9..dea02f1cc 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -174,6 +174,24 @@ tie my %plans, 'Tie::IxHash',
     'recur' => 'what.recur_fee.value',
   },
 
+  'flat_delayed' => {
+    'name' => 'Free for X days, then flat rate (anniversary billing)',
+    'fields' =>  {
+      'free_days' => { 'name' => 'Initial free days',
+                       'default' => 0,
+                     },
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                      },
+    },
+    'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee' ],
+    'setup' => 'what.setup_fee.value',
+    'recur' => '\'$sdate += 86400 * \' + what.free_days.value + \'; \' + what.recur_fee.value',
+  },
+
   'prorate' => {
     'name' => 'First partial month pro-rated, then flat-rate (1st of month billing)',
     'fields' =>  {
-- 
cgit v1.2.1


From 2a22a4862979750c1886ac8f125043854be47d58 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Apr 2002 10:37:08 +0000
Subject: free_delayed try #2

---
 FS/FS/part_pkg.pm            | 16 ++++++++++------
 httemplate/edit/part_pkg.cgi |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 0cb766eef..8ab8ad452 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -189,16 +189,20 @@ sub check {
 
     my $s = $self->setup;
 
-    $s =~ /^\s*\d*\.?\d*\s*$/ or do {
-      #log!
-      return "illegal setup: $s";
-    };
+    $s =~ /^\s*\d*\.?\d*\s*$/
+
+      or $s =~ /^my \$d = \$cust_pkg->bill || \$time; \$d += 86400 \* \s*\d+\s*; \$cust_pkg->bill\(\$d\); \$cust_pkg_mod_flag=1; \s*\d*\.?\d*\s*$/
+
+      or do {
+        #log!
+        return "illegal setup: $s";
+      };
 
     my $r = $self->recur;
 
     $r =~ /^\s*\d*\.?\d*\s*$/
 
-      or $r =~ /^\$sdate += 86400 \* \s*\d+\s*; \s*\d*\.?\d*\s*$/
+      #or $r =~ /^\$sdate += 86400 \* \s*\d+\s*; \s*\d*\.?\d*\s*$/
 
       or $r =~ /^my \$mnow = \$sdate; my \(\$sec,\$min,\$hour,\$mday,\$mon,\$year\) = \(localtime\(\$sdate\) \)\[0,1,2,3,4,5\]; my \$mstart = timelocal\(0,0,0,1,\$mon,\$year\); my \$mend = timelocal\(0,0,0,1, \$mon == 11 \? 0 : \$mon\+1, \$year\+\(\$mon==11\)\); \$sdate = \$mstart; \( \$part_pkg->freq \- 1 \) \* \d*\.?\d* \/ \$part_pkg\-\>freq \+ \d*\.?\d* \/ \$part_pkg\-\>freq \* \(\$mend\-\$mnow\) \/ \(\$mend\-\$mstart\) ;\s*$/
 
@@ -293,7 +297,7 @@ sub payby {
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.11 2002-04-25 09:47:25 ivan Exp $
+$Id: part_pkg.pm,v 1.12 2002-04-25 10:37:08 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index dea02f1cc..a63fc23fe 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -188,8 +188,8 @@ tie my %plans, 'Tie::IxHash',
                       },
     },
     'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'$sdate += 86400 * \' + what.free_days.value + \'; \' + what.recur_fee.value',
+    'setup' => '\'my $d = $cust_pkg->bill || $time; $d += 86400 * \' + what.free_days.value + \'; $cust_pkg->bill($d); $cust_pkg_mod_flag=1; \' + what.setup_fee.value',
+    'recur' => 'what.recur_fee.value',
   },
 
   'prorate' => {
-- 
cgit v1.2.1


From 1f93febd8c42aa344867d9f46601075ecf949ec4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Apr 2002 12:03:15 +0000
Subject: alternate decline handline (Bug #408)

---
 fs_signup/FS-SignupClient/cgi/decline.html |  5 +++
 fs_signup/FS-SignupClient/cgi/signup.cgi   | 50 +++++++++++++++++++++++++++---
 fs_signup/fs_signup_server                 | 17 +++++-----
 3 files changed, 61 insertions(+), 11 deletions(-)
 create mode 100644 fs_signup/FS-SignupClient/cgi/decline.html

diff --git a/fs_signup/FS-SignupClient/cgi/decline.html b/fs_signup/FS-SignupClient/cgi/decline.html
new file mode 100644
index 000000000..a37ba3ab6
--- /dev/null
+++ b/fs_signup/FS-SignupClient/cgi/decline.html
@@ -0,0 +1,5 @@
+<HTML><HEAD><TITLE>Processing error</TITLE></HEAD>
+<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Processing error</FONT><BR><BR>
+There has been an error processing your account.  Please contact customer
+support.
+</BODY></HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 6ef535471..009a63304 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.26 2002-04-20 00:48:17 ivan Exp $
+# $Id: signup.cgi,v 1.27 2002-04-25 12:03:15 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -10,12 +10,16 @@ use vars qw( @payby $cgi $locales $packages $pops $init_data $error
              $pkgpart $username $password $password2 $sec_phrase $popnum
              $agentnum
              $ieak_file $ieak_template $cck_file $cck_template
-             $signup_html $signup_template $success_html $success_template
+             $signup_html $signup_template
+             $success_html $success_template
+             $decline_html $decline_template
              $ac $exch $loc
              $email_name $pkg
              $self_url
            );
-use subs qw( print_form print_okay expselect signup_default success_default );
+use subs qw( print_form print_okay print_decline
+             signup_default success_default decline_default
+             expselect );
 use CGI;
 #use CGI::Carp qw(fatalsToBrowser);
 use Text::Template;
@@ -38,6 +42,9 @@ $signup_html = -e 'signup.html'
 $success_html = -e 'success.html'
                   ? 'success.html'
                   : '/usr/local/freeside/success.html';
+$decline_html = -e 'decline.html'
+                  ? 'decline.html'
+                  : '/usr/local/freeside/decline.html';
 
 if ( -e $ieak_file ) {
   my $ieak_txt = Text::Template::_load_text($ieak_file)
@@ -103,6 +110,24 @@ if ( -e $success_html ) {
     or die $Text::Template::ERROR;
 }
 
+if ( -e $decline_html ) {
+  my $decline_txt = Text::Template::_load_text($decline_html)
+    or die $Text::Template::ERROR;
+  $decline_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
+  $decline_txt = $1;
+  $decline_template = new Text::Template ( TYPE => 'STRING',
+                                           SOURCE => $decline_txt,
+                                           DELIMITERS => [ '<%=', '%>' ],
+                                         )
+    or die $Text::Template::ERROR;
+} else {
+  $decline_template = new Text::Template ( TYPE => 'STRING',
+                                           SOURCE => &decline_default,
+                                           DELIMITERS => [ '<%=', '%>' ],
+                                         )
+    or die $Text::Template::ERROR;
+}
+
 
 ( $locales, $packages, $pops, $init_data ) = signup_info();
 @payby = @{$init_data->{'payby'}} if @{$init_data->{'payby'}};
@@ -210,7 +235,9 @@ if ( defined $cgi->param('magic') ) {
 
     }
     
-    if ( $error ) {
+    if ( $error eq '_decline' ) {
+      print_decline();
+    } elsif ( $error ) {
       print_form();
     } else {
       print_okay();
@@ -262,6 +289,11 @@ sub print_form {
 
 }
 
+sub print_decline {
+  print $cgi->header( '-expires' => 'now' ),
+        $decline_template->fill_in();
+}
+
 sub print_okay {
   my $user_agent = new HTTP::Headers::UserAgent $ENV{HTTP_USER_AGENT};
 
@@ -425,6 +457,16 @@ Package: <%= $pkg %><BR>
 END
 }
 
+sub decline_default { #html to use if there is a decline
+  <<'END';
+<HTML><HEAD><TITLE>Processing error</TITLE></HEAD>
+<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Processing error</FONT><BR><BR>
+There has been an error processing your account.  Please contact customer
+support.
+</BODY></HTML>
+END
+}
+
 sub signup_default { #html to use if you don't specify a template file
   <<'END';
 <HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index b636b6981..e7b372a4e 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -169,12 +169,7 @@ while (1) {
     %hash = ( $cust_pkg => [ $svc_acct ] );
     $error ||= $cust_main->insert( \%hash, \@invoicing_list ); #msgcat
 
-    warn "[fs_signup_server] Sending results...\n" if $Debug;
-    print $writer $error, "\n";
-
-    next if $error;
-
-    if ( $conf->exists('signup_server-realtime') ) {
+    if ( ! $error && $conf->exists('signup_server-realtime') ) {
 
       warn "[fs_signup_server] Billing customer...\n" if $Debug;
 
@@ -191,10 +186,18 @@ while (1) {
 
       if ( $cust_main->balance > 0 ) {
         #should check list for errors...
-        $cust_main->suspend;
+        #$cust_main->suspend;
+        $cust_main->cancel;
       }
     }
 
+    $error ||= '_decline';
+
+    warn "[fs_signup_server] Sending results...\n" if $Debug;
+    print $writer $error, "\n";
+
+    next if $error;
+
     if ( $conf->config('signup_server-email') ) {
       warn "[fs_signup_server] Sending email...\n" if $Debug;
 
-- 
cgit v1.2.1


From ad10f79bef069f04afc7ebeffb98b26e7cd46c8f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Apr 2002 13:16:58 +0000
Subject: fix signup server realtime-card foo

---
 fs_signup/fs_signup_server | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index e7b372a4e..e8aa6ed64 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -188,11 +188,10 @@ while (1) {
         #should check list for errors...
         #$cust_main->suspend;
         $cust_main->cancel;
+        $error = '_decline';
       }
     }
 
-    $error ||= '_decline';
-
     warn "[fs_signup_server] Sending results...\n" if $Debug;
     print $writer $error, "\n";
 
-- 
cgit v1.2.1


From da1388d2f8196c2240ad0bc5debc925618d71806 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Apr 2002 11:14:37 +0000
Subject: add username-nounderscore and username-nodash config files

---
 FS/FS/Conf.pm     | 14 ++++++++++++++
 FS/FS/svc_acct.pm | 11 ++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 3565be965..6e45ec052 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -778,6 +778,20 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'username-nounderscore',
+    'section'     => 'username',
+    'description' => 'Disallow underscores in usernames',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'username-nodash',
+    'section'     => 'username',
+    'description' => 'Disallow dashes in usernames',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'username-uppercase',
     'section'     => 'username',
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index d3c415ce3..bb8c5e21e 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -5,7 +5,8 @@ use vars qw( @ISA $noexport_hack $conf
              $dir_prefix @shells $usernamemin
              $usernamemax $passwordmin $passwordmax
              $username_ampersand $username_letter $username_letterfirst
-             $username_noperiod $username_uppercase
+             $username_noperiod $username_nounderscore $username_nodash
+             $username_uppercase
              $mydomain
              $dirhash
              @saltset @pw_set );
@@ -40,6 +41,8 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
   $username_letter = $conf->exists('username-letter');
   $username_letterfirst = $conf->exists('username-letterfirst');
   $username_noperiod = $conf->exists('username-noperiod');
+  $username_nounderscore = $conf->exists('username-nounderscore');
+  $username_nodash = $conf->exists('username-nodash');
   $username_uppercase = $conf->exists('username-uppercase');
   $username_ampersand = $conf->exists('username-ampersand');
   $mydomain = $conf->config('domain');
@@ -547,6 +550,12 @@ sub check {
   if ( $username_noperiod ) {
     $recref->{username} =~ /\./ and return gettext('illegal_username');
   }
+  if ( $username_nounderscore ) {
+    $recref->{username} =~ /_/ and return gettext('illegal_username');
+  }
+  if ( $username_nodash ) {
+    $recref->{username} =~ /\-/ and return gettext('illegal_username');
+  }
   unless ( $username_ampersand ) {
     $recref->{username} =~ /\&/ and return gettext('illegal_username');
   }
-- 
cgit v1.2.1


From f363d77173f26ec00eb72ecd9a54374831e04dd0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Apr 2002 05:43:34 +0000
Subject: better BIND integration

---
 FS/FS/part_export.pm  |  6 +++---
 bin/svc_domain.import | 29 ++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index e3b2eb3fc..752bbb1d3 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -540,9 +540,9 @@ tie my %bind_options, 'Tie::IxHash',
 
 tie my %bind_slave_options, 'Tie::IxHash',
   #'machine'    => { label=> 'Slave machine' },
-  'master'     => { label=> 'Master IP address' },
-  'named_conf' => { label  => 'named.conf location',
-                    default=> '/etc/bind/named.conf' },
+  'master'      => { label=> 'Master IP address(s) (semicolon-separated)' },
+  'named_conf'  => { label   => 'named.conf location',
+                     default => '/etc/bind/named.conf' },
 ;
 
 
diff --git a/bin/svc_domain.import b/bin/svc_domain.import
index 95d2ead78..06dd12e08 100644
--- a/bin/svc_domain.import
+++ b/bin/svc_domain.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_domain.import,v 1.4 2002-04-20 11:57:35 ivan Exp $
+# $Id: svc_domain.import,v 1.5 2002-04-30 05:43:34 ivan Exp $
 
 use strict;
 use vars qw( %d_part_svc );
@@ -22,7 +22,8 @@ my $user = shift or die &usage;
 adminsuidsetup $user;
 
 use vars qw($spooldir);
-$spooldir = "/usr/local/etc/freeside/export.". datasrc;
+$spooldir = "/usr/local/etc/freeside/export.". datasrc. "/bind";
+mkdir $spooldir unless -d $spooldir;
 
 %d_part_svc =
   map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_domain'});
@@ -36,16 +37,20 @@ $domain_svcpart =
   query "Enter part number for domains: ", 'irk', [ keys %d_part_svc ];
 $^W=1;
 
-  print "\n\n", <<END;
+print "\n\n", <<END;
 Enter the location and name of your primary named.conf file, for example
 "ns.isp.com:/var/named/named.conf"
 END
-  my($named_conf)=&getvalue(":");
-  #iscp("root\@$named_conf","$spooldir/named.conf.import");
-  scp("root\@$named_conf","$spooldir/named.conf.import");
-
-use vars qw($named_machine);
+my($named_conf)=&getvalue(":");
+  
+use vars qw($named_machine $prefix);
 $named_machine = (split(/:/, $named_conf))[0];
+$prefix = "$spooldir/$named_machine";
+mkdir $prefix unless -d $prefix;
+
+#iscp("root\@$named_conf","$prefix/named.conf.import");
+scp("root\@$named_conf","$prefix/named.conf.import");
+
 
 sub getvalue {
   my $prompt = shift;
@@ -62,7 +67,7 @@ print "\n\n";
 $FS::svc_domain::whois_hack=1;
 
 my $p = Parser->new;
-$p->parse_file("$spooldir/named.conf.import");
+$p->parse_file("$prefix/named.conf.import");
 
 print "\nBIND import completed.\n";
 
@@ -89,6 +94,8 @@ BEGIN {
   sub handle_zone {
     my($self, $name, $class, $type, $options) = @_;
     return unless $class eq 'in';
+    return if grep { $name eq $_ }
+      ( qw( . localhost 127.in-addr.arpa 0.in-addr.arpa 255.in-addr.arpa ) );
 
     my $domain = new FS::svc_domain( {
       svcpart => $main::domain_svcpart,
@@ -126,10 +133,10 @@ BEGIN {
       $sourcefile = "$named_dir/$sourcefile" unless $file =~ /^\//;
       use Net::SCP qw(iscp scp);
       scp("root\@$main::named_machine:$sourcefile",
-          "$main::spooldir/$basefile.import");
+          "$main::prefix/$basefile.import");
     
       use DNS::ZoneParse;
-      my $zone = DNS::ZoneParse->new("$main::spooldir/$basefile.import");
+      my $zone = DNS::ZoneParse->new("$main::prefix/$basefile.import");
     
       my $dump = $zone->Dump;
   
-- 
cgit v1.2.1


From b697a86ff35212aaf5ab8cf06d05ab3f7c619d20 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 4 May 2002 00:32:21 +0000
Subject: lilunixbtch: trying to pull accounts based on next billdate
 tofu_beast420: hmm a report ordered by next bill date? tofu_beast420: i don't
 know how you'd do that per _customer_ since a customer could have lots of
 packages, but you could do a per-package report maybe?

---
 httemplate/search/cust_pkg.cgi  | 135 +++++++++++++++++++++++++---------------
 httemplate/search/cust_pkg.html |  24 +++++++
 2 files changed, 108 insertions(+), 51 deletions(-)
 create mode 100755 httemplate/search/cust_pkg.html

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 54e02ce9d..dee2fbdab 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -13,64 +13,93 @@ $limit .= " OFFSET $offset" if $offset;
 
 my $total;
 
-my $unconf = '';
 my($query) = $cgi->keywords;
 my $sortby;
-if ( $query eq 'pkgnum' ) {
-  $sortby=\*pkgnum_sort;
-
-} elsif ( $query eq 'APKG_pkgnum' ) {
-
-  $sortby=\*pkgnum_sort;
-
-  $unconf = "
-    WHERE 0 <
-      ( SELECT count(*) FROM pkg_svc
-          WHERE pkg_svc.pkgpart = cust_pkg.pkgpart
-            AND pkg_svc.quantity > ( SELECT count(*) FROM cust_svc
-                                       WHERE cust_svc.pkgnum = cust_pkg.pkgnum
-                                         AND cust_svc.svcpart = pkg_svc.svcpart
-                                   )
-      )
-  ";
-
-  #@cust_pkg=();
-  ##perhaps this should go in cust_pkg as a qsearch-like constructor?
-  #my($cust_pkg);
-  #foreach $cust_pkg (
-  #  qsearch('cust_pkg',{}, '', "ORDER BY pkgnum $limit" )
-  #) {
-  #  my($flag)=0;
-  #  my($pkg_svc);
-  #  PKG_SVC: 
-  #  foreach $pkg_svc (qsearch('pkg_svc',{ 'pkgpart' => $cust_pkg->pkgpart })) {
-  #    if ( $pkg_svc->quantity 
-  #         > scalar(qsearch('cust_svc',{
-  #             'pkgnum' => $cust_pkg->pkgnum,
-  #             'svcpart' => $pkg_svc->svcpart,
-  #           }))
-  #       )
-  #    {
-  #      $flag=1;
-  #      last PKG_SVC;
-  #    }
-  #  }
-  #  push @cust_pkg, $cust_pkg if $flag;
-  #}
+my @cust_pkg;
+
+if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
+  $sortby=\*bill_sort;
+  my($beginning, $ending) = (0, 0);
+  my $range = '';
+  if ( $cgi->param('beginning')
+       && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
+    my $beginning = str2time($1);
+    $range = " WHERE bill >= $beginning ";
+  } elsif ( $cgi->param('ending')
+            && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
+    $ending = str2time($1) + 86400;
+    $range = ( $range ? ' AND ' : ' WHERE ' ). " bill <= $ending ";
+  }
+
+  #false laziness with below
+  my $statement = "SELECT COUNT(*) FROM cust_pkg $range";
+  my $sth = dbh->prepare($statement)
+    or die dbh->errstr. " doing $statement";
+  $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
   
-} else {
-  die "Empty QUERY_STRING!";
-}
+  $total = $sth->fetchrow_arrayref->[0];
+  
+  @cust_pkg = qsearch('cust_pkg',{}, '', " $range ORDER BY bill $limit" );
 
-my $statement = "SELECT COUNT(*) FROM cust_pkg $unconf";
-my $sth = dbh->prepare($statement)
-  or die dbh->errstr. " doing $statement";
-$sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
+} else {
 
-$total = $sth->fetchrow_arrayref->[0];
+  my $unconf = '';
+  if ( $query eq 'pkgnum' ) {
+    $sortby=\*pkgnum_sort;
 
-my @cust_pkg = qsearch('cust_pkg',{}, '', "$unconf ORDER BY pkgnum $limit" );
+  } elsif ( $query eq 'APKG_pkgnum' ) {
+  
+    $sortby=\*pkgnum_sort;
+  
+    $unconf = "
+      WHERE 0 <
+        ( SELECT count(*) FROM pkg_svc
+            WHERE pkg_svc.pkgpart = cust_pkg.pkgpart
+              AND pkg_svc.quantity > ( SELECT count(*) FROM cust_svc
+                                         WHERE cust_svc.pkgnum = cust_pkg.pkgnum
+                                           AND cust_svc.svcpart = pkg_svc.svcpart
+                                     )
+        )
+    ";
+  
+    #@cust_pkg=();
+    ##perhaps this should go in cust_pkg as a qsearch-like constructor?
+    #my($cust_pkg);
+    #foreach $cust_pkg (
+    #  qsearch('cust_pkg',{}, '', "ORDER BY pkgnum $limit" )
+    #) {
+    #  my($flag)=0;
+    #  my($pkg_svc);
+    #  PKG_SVC: 
+    #  foreach $pkg_svc (qsearch('pkg_svc',{ 'pkgpart' => $cust_pkg->pkgpart })) {
+    #    if ( $pkg_svc->quantity 
+    #         > scalar(qsearch('cust_svc',{
+    #             'pkgnum' => $cust_pkg->pkgnum,
+    #             'svcpart' => $pkg_svc->svcpart,
+    #           }))
+    #       )
+    #    {
+    #      $flag=1;
+    #      last PKG_SVC;
+    #    }
+    #  }
+    #  push @cust_pkg, $cust_pkg if $flag;
+    #}
+    
+  } else {
+    die "Empty QUERY_STRING!";
+  }
+  
+  my $statement = "SELECT COUNT(*) FROM cust_pkg $unconf";
+  my $sth = dbh->prepare($statement)
+    or die dbh->errstr. " doing $statement";
+  $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
+  
+  $total = $sth->fetchrow_arrayref->[0];
+  
+  @cust_pkg = qsearch('cust_pkg',{}, '', "$unconf ORDER BY pkgnum $limit" );
 
+}
 
 if ( scalar(@cust_pkg) == 1 ) {
   my($pkgnum)=$cust_pkg[0]->pkgnum;
@@ -243,4 +272,8 @@ sub pkgnum_sort {
   $a->getfield('pkgnum') <=> $b->getfield('pkgnum');
 }
 
+sub bill_sort {
+  $a->getfield('bill') <=> $b->getfield('bill');
+}
+
 %>
diff --git a/httemplate/search/cust_pkg.html b/httemplate/search/cust_pkg.html
new file mode 100755
index 000000000..c69e8d711
--- /dev/null
+++ b/httemplate/search/cust_pkg.html
@@ -0,0 +1,24 @@
+<HTML>
+  <HEAD>
+    <TITLE>Packages</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+      <H1>Packages</H1>
+    </CENTER>
+    <HR>
+    <FORM ACTION="cust_bill_event.cgi" METHOD="post">
+    <INPUT TYPE="hidden" NAME="magic" VALUE="bill">
+      Return <B>packages</B> with next bill date: 
+      from <INPUT TYPE="text" NAME="beginning"> <i>m/d/y</i>
+      to <INPUT TYPE="text" NAME="ending"> <i>m/d/y</i>
+
+      <P><INPUT TYPE="submit" VALUE="Get Report">
+
+    </FORM>
+
+  <HR>
+
+  </BODY>
+</HTML>
+
-- 
cgit v1.2.1


From 99230201dec5366bf58b33b29fb2f7ab4724b764 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 4 May 2002 00:47:24 +0000
Subject: prevent stuff passed from template/user from being used in searches
 by signup server

---
 FS/FS/cust_pkg.pm          | 4 ++--
 fs_signup/fs_signup_server | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 08c04a06b..a4256ea1f 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -225,7 +225,7 @@ sub check {
     return "Unknown customer ". $self->custnum unless $self->cust_main;
   }
 
-  return "Unknown pkgpart"
+  return "Unknown pkgpart: ". $self->pkgpart
     unless qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
 
   $self->otaker(getotaker) unless $self->otaker;
@@ -701,7 +701,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.20 2002-04-22 21:23:16 ivan Exp $
+$Id: cust_pkg.pm,v 1.21 2002-05-04 00:47:24 ivan Exp $
 
 =head1 BUGS
 
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index e8aa6ed64..70045e63b 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -142,9 +142,12 @@ while (1) {
 
     my @invoicing_list = split( /\s*\,\s*/, $signup_data->{'invoicing_list'} );
 
+    $signup_data->{'pkgpart'} =~ /^(\d+)$/ or '' =~ /^()$/;
+    my $pkgpart = $1;
+
     my $part_pkg =
-      qsearchs( 'part_pkg', { 'pkgpart' => $signup_data->{'pkgpart'} } )
-        or $error ||= "WARNING: unknown pkgpart ". $signup_data->{pkgpart};
+      qsearchs( 'part_pkg', { 'pkgpart' => $pkgpart } )
+        or $error ||= "WARNING: unknown pkgpart: $pkgpart";
     my $svcpart = $part_pkg->svcpart unless $error;
 
     my $cust_pkg = new FS::cust_pkg ( {
-- 
cgit v1.2.1


From f15ded7fdcbe0869d1e51e2dab1cc4409c0ce92f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 4 May 2002 00:49:06 +0000
Subject: point at correct .cgi

---
 httemplate/search/cust_pkg.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/cust_pkg.html b/httemplate/search/cust_pkg.html
index c69e8d711..bb0a5407c 100755
--- a/httemplate/search/cust_pkg.html
+++ b/httemplate/search/cust_pkg.html
@@ -7,7 +7,7 @@
       <H1>Packages</H1>
     </CENTER>
     <HR>
-    <FORM ACTION="cust_bill_event.cgi" METHOD="post">
+    <FORM ACTION="cust_pkg.cgi" METHOD="post">
     <INPUT TYPE="hidden" NAME="magic" VALUE="bill">
       Return <B>packages</B> with next bill date: 
       from <INPUT TYPE="text" NAME="beginning"> <i>m/d/y</i>
-- 
cgit v1.2.1


From 1c773e927ea1bc90ec94873f801d9b3edb57acd7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 4 May 2002 00:59:08 +0000
Subject: fix ranges on cust_pkg search

---
 httemplate/search/cust_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index dee2fbdab..8c5d35be5 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -28,7 +28,7 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
   } elsif ( $cgi->param('ending')
             && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
     $ending = str2time($1) + 86400;
-    $range = ( $range ? ' AND ' : ' WHERE ' ). " bill <= $ending ";
+    $range .= ( $range ? ' AND ' : ' WHERE ' ). " bill <= $ending ";
   }
 
   #false laziness with below
-- 
cgit v1.2.1


From 8af9903c96ca6a3d78e7779cbc4c5e773aaf3ae0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 4 May 2002 01:11:04 +0000
Subject: add package search by next bill date to main menu

---
 httemplate/index.html          | 3 ++-
 httemplate/search/cust_pkg.cgi | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index c764e7602..3e657025f 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -55,7 +55,7 @@
       <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST">Credit card # <INPUT TYPE="hidden" NAME="card_on" VALUE="1"><INPUT TYPE="text" NAME="card"><INPUT TYPE="submit" VALUE="Search"></FORM>
       <FORM ACTION="search/cust_bill.cgi" METHOD="POST">Invoice # <INPUT TYPE="text" NAME="invnum" SIZE="8"><INPUT TYPE="submit" VALUE="Search"></FORM>
       <FORM ACTION="search/cust_pay.cgi" METHOD="POST">Check # <INPUT TYPE="text" NAME="payinfo" SIZE="8"><INPUT TYPE="hidden" NAME="payby" VALUE="BILL"><INPUT TYPE="submit" VALUE="Search"></FORM>
-      <BR><A HREF="browse/cust_pay_batch.cgi">View pending credit card batch</A>
+      <BR><A HREF="browse/cust_pay_batch.cgi">View pending credit card batch</A>      <BR><BR><A HREF="search/cust_pkg.html">Packages (by next bill date range)</A>
       <BR><BR>Invoice reports
             <UL>
               <LI><a href="search/cust_bill_event.html">Invoice event errors (failed credit cards)</a>
@@ -120,6 +120,7 @@
       <UL>
         <LI><A HREF="search/cust_pkg.cgi?pkgnum">packages (by package number)</A>
         <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
+        <LI><A HREF="search/cust_pkg.html">packages (by next bill date range)</A>
       </UL>
       Invoices
       <UL>
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 8c5d35be5..ec1bda900 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -19,20 +19,21 @@ my @cust_pkg;
 
 if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
   $sortby=\*bill_sort;
-  my($beginning, $ending) = (0, 0);
   my $range = '';
   if ( $cgi->param('beginning')
        && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
     my $beginning = str2time($1);
     $range = " WHERE bill >= $beginning ";
-  } elsif ( $cgi->param('ending')
+  }
+  if ( $cgi->param('ending')
             && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
-    $ending = str2time($1) + 86400;
+    my $ending = str2time($1) + 86400;
     $range .= ( $range ? ' AND ' : ' WHERE ' ). " bill <= $ending ";
   }
 
   #false laziness with below
   my $statement = "SELECT COUNT(*) FROM cust_pkg $range";
+  warn $statement;
   my $sth = dbh->prepare($statement)
     or die dbh->errstr. " doing $statement";
   $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
-- 
cgit v1.2.1


From f36b6a178c9811357ff5d5291874aa239d22bc2a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 4 May 2002 15:00:18 +0000
Subject: schema changes for proper texas tax

---
 FS/FS.pm                      |   2 +
 FS/FS/cust_main_county.pm     |   8 +++
 FS/FS/cust_tax_exempt.pm      | 131 ++++++++++++++++++++++++++++++++++++++++++
 FS/FS/part_pkg.pm             |   4 +-
 FS/MANIFEST                   |   2 +
 FS/t/cust_tax_exempt.pm       |   5 ++
 README.1.4.0pre12             |  15 +++++
 bin/fs-setup                  |  21 ++++++-
 httemplate/docs/admin.html    |   2 +-
 httemplate/docs/schema.dia    | Bin 10766 -> 11176 bytes
 httemplate/docs/schema.html   |  11 ++++
 httemplate/docs/upgrade8.html |  13 +++++
 12 files changed, 210 insertions(+), 4 deletions(-)
 create mode 100644 FS/FS/cust_tax_exempt.pm
 create mode 100644 FS/t/cust_tax_exempt.pm

diff --git a/FS/FS.pm b/FS/FS.pm
index 287e50c67..3a9c9f336 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -48,6 +48,8 @@ L<FS::part_referral> - Referral class
 
 L<FS::cust_main_county> - Locale (tax rate) class
 
+L<FS::cust_tax_exempt> - Tax exemption record class
+
 L<FS::svc_Common> - Service base class
 
 L<FS::svc_acct> - Account (shell, RADIUS, POP3) class
diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index 56d29da94..a9a4a85bd 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -57,6 +57,10 @@ currently supported:
 
 =item tax - percentage
 
+=item taxclass
+
+=item exempt_amount
+
 =back
 
 =head1 METHODS
@@ -97,11 +101,15 @@ methods.
 sub check {
   my $self = shift;
 
+  $self->amount(0) unless $self->amount;
+
   $self->ut_numbern('taxnum')
     || $self->ut_textn('state')
     || $self->ut_textn('county')
     || $self->ut_text('country')
     || $self->ut_float('tax')
+    || $self->ut_textn('taxclass') # ...
+    || $self->ut_money('amount')
   ;
 
 }
diff --git a/FS/FS/cust_tax_exempt.pm b/FS/FS/cust_tax_exempt.pm
new file mode 100644
index 000000000..ab873c0a7
--- /dev/null
+++ b/FS/FS/cust_tax_exempt.pm
@@ -0,0 +1,131 @@
+package FS::cust_tax_exempt;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::cust_tax_exempt - Object methods for cust_tax_exempt records
+
+=head1 SYNOPSIS
+
+  use FS::cust_tax_exempt;
+
+  $record = new FS::cust_tax_exempt \%hash;
+  $record = new FS::cust_tax_exempt { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_tax_exempt object represents a historical record of a customer tax
+exemption.  Currently this is only used for "texas tax".  FS::cust_tax_exempt
+inherits from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item exemptnum - primary key
+
+=item custnum - customer (see L<FS::cust_main>)
+
+=item taxnum - tax rate (see L<FS::cust_main_county>)
+
+=item year
+
+=item month
+
+=item amount
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new exemption record.  To add the example to the database, see
+L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'cust_tax_exempt'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  $self->ut_numbern('exemptnum')
+    || $self->ut_foreign_key('custnum', 'cust_main', 'custnum')
+    || $self->ut_foreign_key('taxnum', 'cust_main_county', 'taxnum')
+    || $self->ut_number('year') #check better
+    || $self->ut_number('month') #check better
+    || $self->ut_money('amount')
+  ;
+}
+
+=back
+
+=head1 BUGS
+
+Texas tax is a royal pain in the ass.
+
+=head1 SEE ALSO
+
+L<FS::cust_main_county>, L<FS::cust_main>, L<FS::Record>, schema.html from the
+base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 8ab8ad452..1f3106544 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -235,7 +235,7 @@ sub check {
       || $self->ut_anything('plandata')
       || $self->ut_enum('setuptax', [ '', 'Y' ] )
       || $self->ut_enum('recurtax', [ '', 'Y' ] )
-      || $self->ut_enum('texastax', [ '', 'none', 'access', 'hosting' ] )
+      || $self->ut_enum('taxclass', [ '', 'none', 'access', 'hosting' ] )
       || $self->ut_enum('disabled', [ '', 'Y' ] )
     ;
 }
@@ -297,7 +297,7 @@ sub payby {
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.12 2002-04-25 10:37:08 ivan Exp $
+$Id: part_pkg.pm,v 1.13 2002-05-04 15:00:18 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 86516e3d9..2e72d5af8 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -79,6 +79,7 @@ FS/radius_usergroup.pm
 FS/queue.pm
 FS/queue_arg.pm
 FS/msgcat.pm
+FS/cust_tax_exempt.pm
 t/agent.t
 t/agent_type.t
 t/CGI.t
@@ -136,3 +137,4 @@ t/queue.t
 t/queue_arg.t
 t/msgcat.t
 t/raddb.t
+t/cust_tax_exempt.t
diff --git a/FS/t/cust_tax_exempt.pm b/FS/t/cust_tax_exempt.pm
new file mode 100644
index 000000000..8af13e3aa
--- /dev/null
+++ b/FS/t/cust_tax_exempt.pm
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_tax_exempt;
+$loaded=1;
+print "ok 1\n";
diff --git a/README.1.4.0pre12 b/README.1.4.0pre12
index 7de0619cc..8b883d4df 100644
--- a/README.1.4.0pre12
+++ b/README.1.4.0pre12
@@ -44,6 +44,21 @@ CREATE INDEX export_svc3 ON export_svc ( svcpart );
 
 ALTER TABLE part_export RENAME svcpart TO deprecated;
 
+ALTER TABLE part_pkg ADD taxclass varchar(80) NULL;
+
+CREATE TABLE cust_tax_exempt (
+  exemptnum int primary key,
+  custnum int not null,
+  taxnum int not null,
+  year int not null,
+  month int not null,
+  amount decimal(10,2)
+);
+CREATE UNIQUE INDEX cust_tax_exempt1 ON cust_tax_exempt ( custnum, taxnum, year, month );
+
+ALTER TABLE cust_main_county ADD taxclass varchar(80) NULL;
+ALTER TABLE cust_main_county ADD exempt_amount decimal(10,2);
+
 Run bin/dbdef-create
 
 Run bin/create-history-tables
diff --git a/bin/fs-setup b/bin/fs-setup
index 37ecf1b87..e05d44531 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.89 2002-04-20 06:33:03 ivan Exp $
+# $Id: fs-setup,v 1.90 2002-05-04 15:00:18 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -518,6 +518,8 @@ sub tables_hash_hack {
         'state',    'varchar',  'NULL',    $char_d,
         'county',   'varchar',  'NULL',    $char_d,
         'country',  'char',  '', 2, 
+        'taxclass',   'varchar', 'NULL', $char_d,
+        'exempt_amount', @money_type,
         'tax',      'real',  '',    '', #tax %
       ],
       'primary_key' => 'taxnum',
@@ -659,6 +661,7 @@ sub tables_hash_hack {
         'plan',       'varchar', 'NULL', $char_d,
         'plandata',   'text', 'NULL', '',
         'disabled',   'char', 'NULL', 1,
+        'taxclass',   'varchar', 'NULL', $char_d,
       ],
       'primary_key' => 'pkgpart',
       'unique' => [ [] ],
@@ -989,6 +992,22 @@ sub tables_hash_hack {
       'index'       => [],
     },
 
+    'cust_tax_exempt' => {
+      'columns' => [
+        'exemptnum', 'int', '', '',
+        'custnum',   'int', '', '',
+        'taxnum',    'int', '', '',
+        'year',      'int', '', '',
+        'month',     'int', '', '',
+        'amount',   @money_type,
+      ],
+      'primary_key' => 'exemptnum',
+      'unique'      => [ [ 'custnum', 'taxnum', 'year', 'month' ] ],
+      'index'       => [],
+    },
+
+
+
   );
 
   %tables;
diff --git a/httemplate/docs/admin.html b/httemplate/docs/admin.html
index 0093fd2b7..50beafe78 100755
--- a/httemplate/docs/admin.html
+++ b/httemplate/docs/admin.html
@@ -12,7 +12,7 @@
   "your_host" with the name or network address of your web server.
   <li>Select <u>Configuration</u> from the main menu and update your configuration values.
   <li>Next you must create a service definition.  An example of a service
-  definition would be a dial-up account or a domain.  For starters, it is
+  definition would be a dial-up account or a domain.  First, it is
   necessary to create a domain definition.  Click on <u>View/Edit service
   definitions</u> and <u>Add a new service definition</u> with <i>Table</i>
   <b>svc_domain</b> (and no modifiers).
diff --git a/httemplate/docs/schema.dia b/httemplate/docs/schema.dia
index 4a5465285..148c1dfbc 100644
Binary files a/httemplate/docs/schema.dia and b/httemplate/docs/schema.dia differ
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 07fcb908e..3f627448f 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -47,6 +47,7 @@
         <li>plan - eventcode plan
         <li>plandata - additional plan data
         <li>disabled - Disabled flag, empty or `Y'
+        <li>taxclass - Texas tax class flag, empty or "none", "access", or "hosting"
       </ul>
     <li><a name="cust_bill_pkg" href="man/FS/cust_bill_pkg.html">cust_bill_pkg</a> - Invoice line items
       <ul>
@@ -130,6 +131,16 @@
         <li>county
         <li>country
         <li>tax - % rate
+        <li>taxclass
+        <li>exempt_amount
+      </ul>
+    <li><a name="cust_tax_exempt" href="man/FS/cust_tax_exempt.html">cust_tax_exempt</a> - Tax exemption record
+      <ul>
+        <li>exemptnum - primary key
+        <li>taxnum - <a href="#cust_main_county">tax rate</a>
+        <li>year
+        <li>month
+        <li>amount
       </ul>
     <li><a name="cust_pay" href="man/FS/cust_pay.html">cust_pay</a> - Payments.  Money being transferred from a customer.
       <ul>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 841a053ed..97758fdb2 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -195,6 +195,16 @@ CREATE TABLE msgcat (
 );
 CREATE INDEX msgcat1 ON msgcat ( msgcode, locale );
 
+CREATE TABLE cust_tax_exempt (
+  exemptnum int primary key,
+  custnum int not null,
+  taxnum int not null,
+  year int not null,
+  month int not null,
+  amount decimal(10,2)
+);
+CREATE UNIQUE INDEX cust_tax_exempt1 ON cust_tax_exempt ( taxnum, year, month );
+
 ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
 ALTER TABLE svc_domain ADD catchall integer NULL;
 ALTER TABLE cust_main ADD referral_custnum integer NULL;
@@ -215,6 +225,9 @@ ALTER TABLE cust_refund ADD closed char(1) NULL;
 ALTER TABLE cust_bill_event ADD status varchar(80);
 ALTER TABLE cust_bill_event ADD statustext text NULL;
 ALTER TABLE svc_acct ADD sec_phrase varchar(80) NULL;
+ALTER TABLE part_pkg ADD taxclass varchar(80) NULL;
+ALTER TABLE cust_main_county ADD taxclass varchar(80) NULL;
+ALTER TABLE cust_main_county ADD exempt_amount decimal(10,2);
 CREATE INDEX cust_main3 ON cust_main ( referral_custnum );
 CREATE INDEX cust_credit_bill1 ON cust_credit_bill ( crednum );
 CREATE INDEX cust_credit_bill2 ON cust_credit_bill ( invnum );
-- 
cgit v1.2.1


From e324bf00eaee9bd13702348b777642d7096b88a0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 6 May 2002 13:36:02 +0000
Subject: fixes gratuitous "Illegal payname" errors reported by noment

---
 FS/FS/cust_bill.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 63a70cd5b..449ab74b9 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -458,7 +458,7 @@ sub realtime_card {
   my($payname, $payfirst, $paylast);
   if ( $cust_main->payname ) {
     $payname = $cust_main->payname;
-    $payname =~ /^\s*([\w \,\.\-\']*)?\s+([\w\,\.\-\']+)$/
+    $payname =~ /^\s*([\w \,\.\-\']*)?\s+([\w\,\.\-\']+)\s*$/
       or do {
               #$dbh->rollback if $oldAutoCommit;
               return "Illegal payname $payname";
@@ -466,7 +466,7 @@ sub realtime_card {
     ($payfirst, $paylast) = ($1, $2);
   } else {
     $payfirst = $cust_main->getfield('first');
-    $paylast = $cust_main->getfield('first');
+    $paylast = $cust_main->getfield('last');
     $payname =  "$payfirst $paylast";
   }
 
@@ -948,7 +948,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.33 2002-04-19 14:27:34 ivan Exp $
+$Id: cust_bill.pm,v 1.34 2002-05-06 13:36:02 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From a63b2729682586d8860290576e9307629424dbe0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 May 2002 12:38:40 +0000
Subject: texas tax!

---
 FS/FS/Conf.pm                                      |   7 +
 FS/FS/cust_main.pm                                 | 160 +++++++++++++++------
 FS/FS/cust_main_county.pm                          |   4 +-
 FS/FS/part_pkg.pm                                  |   6 +-
 FS/t/cust_tax_exempt.t                             |   5 +
 htetc/global.asa                                   |   2 +-
 htetc/handler.pl                                   |   2 +-
 httemplate/browse/agent.cgi                        |   4 +-
 httemplate/browse/cust_main_county.cgi             |  59 +++++---
 httemplate/edit/agent.cgi                          |   8 +-
 httemplate/edit/cust_main.cgi                      |   4 +-
 httemplate/edit/cust_main_county-expand.cgi        |  15 +-
 httemplate/edit/cust_main_county.cgi               |  29 ++--
 httemplate/edit/part_pkg.cgi                       |  26 ++++
 .../edit/process/cust_main_county-expand.cgi       |   4 +-
 httemplate/edit/process/cust_main_county.cgi       |  11 +-
 16 files changed, 254 insertions(+), 92 deletions(-)
 create mode 100644 FS/t/cust_tax_exempt.t

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 6e45ec052..126461763 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -930,6 +930,13 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'enable_taxclasses',
+    'section'     => 'billing',
+    'description' => 'Enable per-package tax classes',
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 4316988ca..0faa60ca6 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -26,6 +26,7 @@ use FS::queue;
 use FS::part_pkg;
 use FS::part_bill_event;
 use FS::cust_bill_event;
+use FS::cust_tax_exempt;
 use FS::Msgcat qw(gettext);
 
 @ISA = qw( FS::Record );
@@ -874,8 +875,11 @@ sub bill {
   # & generate invoice database.
  
   my( $total_setup, $total_recur ) = ( 0, 0 );
-  my( $taxable_setup, $taxable_recur ) = ( 0, 0 );
+  #my( $taxable_setup, $taxable_recur ) = ( 0, 0 );
   my @cust_bill_pkg = ();
+  my $tax = 0;##
+  #my $taxable_charged = 0;##
+  #my $charged = 0;##
 
   foreach my $cust_pkg (
     qsearch('cust_pkg', { 'custnum' => $self->custnum } )
@@ -888,7 +892,7 @@ sub bill {
     $cust_pkg->setfield('bill', '')
       unless defined($cust_pkg->bill);
  
-    my $part_pkg = qsearchs( 'part_pkg', { 'pkgpart' => $cust_pkg->pkgpart } );
+    my $part_pkg = $cust_pkg->part_pkg;
 
     #so we don't modify cust_pkg record unnecessarily
     my $cust_pkg_mod_flag = 0;
@@ -958,7 +962,7 @@ sub bill {
       # here
       $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
 
-      $mon += $part_pkg->getfield('freq');
+      $mon += $part_pkg->freq;
       until ( $mon < 12 ) { $mon -= 12; $year++; }
       $cust_pkg->setfield('bill',
         timelocal($sec,$min,$hour,$mday,$mon,$year));
@@ -969,6 +973,7 @@ sub bill {
     warn "\$recur is undefined" unless defined($recur);
     warn "\$cust_pkg->bill is undefined" unless defined($cust_pkg->bill);
 
+    my $taxable_charged = 0;
     if ( $cust_pkg_mod_flag ) {
       $error=$cust_pkg->replace($old_cust_pkg);
       if ( $error ) { #just in case
@@ -996,51 +1001,126 @@ sub bill {
         push @cust_bill_pkg, $cust_bill_pkg;
         $total_setup += $setup;
         $total_recur += $recur;
-        $taxable_setup += $setup
-          unless $part_pkg->dbdef_table->column('setuptax')
-                 && $part_pkg->setuptax =~ /^Y$/i;
-        $taxable_recur += $recur
-          unless $part_pkg->dbdef_table->column('recurtax')
-                 && $part_pkg->recurtax =~ /^Y$/i;
-      }
-    }
-
-  }
+        $taxable_charged += $setup
+          unless $part_pkg->setuptax =~ /^Y$/i;
+        $taxable_charged += $recur
+          unless $part_pkg->recurtax =~ /^Y$/i;
+          
+        unless ( $self->tax =~ /Y/i
+                 || $self->payby eq 'COMP'
+                 || $taxable_charged == 0 ) {
+
+          my $cust_main_county =
+            qsearchs('cust_main_county',{
+              'state'    => $self->state,
+              'county'   => $self->county,
+              'country'  => $self->country,
+              'taxclass' => $part_pkg->taxclass,
+            } )
+            or qsearchs('cust_main_county',{
+              'state'    => $self->state,
+              'county'   => $self->county,
+              'country'  => $self->country,
+              'taxclass' => '',
+            } )
+            or do {
+              $dbh->rollback if $oldAutoCommit;
+              return
+                "fatal: can't find tax rate for state/county/country/taxclass ".
+                join('/', map $self->$_(), qw(state county country taxclass) ).
+                "\n";
+            };
+
+          if ( $cust_main_county->exempt_amount ) {
+            my ($mon,$year) = (localtime($sdate) )[4,5];
+            $mon++;
+            my $freq = $part_pkg->freq || 1;
+            my $taxable_per_month = sprintf("%.2f", $taxable_charged / $freq );
+            foreach my $which_month ( 1 .. $freq ) {
+              my %hash = (
+                'custnum' => $self->custnum,
+                'taxnum'  => $cust_main_county->taxnum,
+                'year'    => 1900+$year,
+                'month'   => $mon++,
+              );
+              #until ( $mon < 12 ) { $mon -= 12; $year++; }
+              until ( $mon < 13 ) { $mon -= 12; $year++; }
+              my $cust_tax_exempt =
+                qsearchs('cust_tax_exempt', \%hash)
+                || new FS::cust_tax_exempt( { %hash, 'amount' => 0 } );
+              my $remaining_exemption = sprintf("%.2f",
+                $cust_main_county->exempt_amount - $cust_tax_exempt->amount );
+              if ( $remaining_exemption > 0 ) {
+                my $addl = $remaining_exemption > $taxable_per_month
+                  ? $taxable_per_month
+                  : $remaining_exemption;
+                $taxable_charged -= $addl;
+                my $new_cust_tax_exempt = new FS::cust_tax_exempt ( {
+                  $cust_tax_exempt->hash,
+                  'amount' => sprintf("%.2f", $cust_tax_exempt->amount + $addl),
+                } );
+                $error = $new_cust_tax_exempt->exemptnum
+                  ? $new_cust_tax_exempt->replace($cust_tax_exempt)
+                  : $new_cust_tax_exempt->insert;
+                if ( $error ) {
+                  $dbh->rollback if $oldAutoCommit;
+                  return "fatal: can't update cust_tax_exempt: $error";
+                }
+
+              } # if $remaining_exemption > 0
+
+            } #foreach $which_month
+
+          } #if $cust_main_county->exempt_amount
+
+          $taxable_charged = sprintf( "%.2f", $taxable_charged);
+          $tax += $taxable_charged * $cust_main_county->tax / 100
+
+        } #unless $self->tax =~ /Y/i
+          #       || $self->payby eq 'COMP'
+          #       || $taxable_charged == 0
+
+      } #if $setup > 0 || $recur > 0
+      
+    } #if $cust_pkg_mod_flag
+
+  } #foreach my $cust_pkg
 
   my $charged = sprintf( "%.2f", $total_setup + $total_recur );
-  my $taxable_charged = sprintf( "%.2f", $taxable_setup + $taxable_recur );
+#  my $taxable_charged = sprintf( "%.2f", $taxable_setup + $taxable_recur );
 
-  unless ( @cust_bill_pkg ) {
+  unless ( @cust_bill_pkg ) { #don't create invoices with no line items
     $dbh->commit or die $dbh->errstr if $oldAutoCommit;
     return '';
   } 
 
-  unless ( $self->tax =~ /Y/i
-           || $self->payby eq 'COMP'
-           || $taxable_charged == 0 ) {
-    my $cust_main_county = qsearchs('cust_main_county',{
-        'state'   => $self->state,
-        'county'  => $self->county,
-        'country' => $self->country,
-    } ) or die "fatal: can't find tax rate for state/county/country ".
-               $self->state. "/". $self->county. "/". $self->country. "\n";
-    my $tax = sprintf( "%.2f",
-      $taxable_charged * ( $cust_main_county->getfield('tax') / 100 )
-    );
-
-    if ( $tax > 0 ) {
-      $charged = sprintf( "%.2f", $charged+$tax );
-
-      my $cust_bill_pkg = new FS::cust_bill_pkg ({
-        'pkgnum' => 0,
-        'setup'  => $tax,
-        'recur'  => 0,
-        'sdate'  => '',
-        'edate'  => '',
-      });
-      push @cust_bill_pkg, $cust_bill_pkg;
-    }
+#  unless ( $self->tax =~ /Y/i
+#           || $self->payby eq 'COMP'
+#           || $taxable_charged == 0 ) {
+#    my $cust_main_county = qsearchs('cust_main_county',{
+#        'state'   => $self->state,
+#        'county'  => $self->county,
+#        'country' => $self->country,
+#    } ) or die "fatal: can't find tax rate for state/county/country ".
+#               $self->state. "/". $self->county. "/". $self->country. "\n";
+#    my $tax = sprintf( "%.2f",
+#      $taxable_charged * ( $cust_main_county->getfield('tax') / 100 )
+#    );
+
+  $tax = sprintf("%.2f", $tax);
+  if ( $tax > 0 ) {
+    $charged = sprintf( "%.2f", $charged+$tax );
+
+    my $cust_bill_pkg = new FS::cust_bill_pkg ({
+      'pkgnum' => 0,
+      'setup'  => $tax,
+      'recur'  => 0,
+      'sdate'  => '',
+      'edate'  => '',
+    });
+    push @cust_bill_pkg, $cust_bill_pkg;
   }
+#  }
 
   my $cust_bill = new FS::cust_bill ( {
     'custnum' => $self->custnum,
diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index a9a4a85bd..8e83b1a1d 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -101,7 +101,7 @@ methods.
 sub check {
   my $self = shift;
 
-  $self->amount(0) unless $self->amount;
+  $self->exempt_amount(0) unless $self->exempt_amount;
 
   $self->ut_numbern('taxnum')
     || $self->ut_textn('state')
@@ -109,7 +109,7 @@ sub check {
     || $self->ut_text('country')
     || $self->ut_float('tax')
     || $self->ut_textn('taxclass') # ...
-    || $self->ut_money('amount')
+    || $self->ut_money('exempt_amount')
   ;
 
 }
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 1f3106544..9c33e9a3b 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -59,7 +59,7 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item recurtax - Recurring fee tax exempt flag, empty or `Y'
 
-=item taxclass - Texas tax class flag, empty or "none", "access", or "hosting"
+=item taxclass - Tax class flag
 
 =item plan - Price plan
 
@@ -235,7 +235,7 @@ sub check {
       || $self->ut_anything('plandata')
       || $self->ut_enum('setuptax', [ '', 'Y' ] )
       || $self->ut_enum('recurtax', [ '', 'Y' ] )
-      || $self->ut_enum('taxclass', [ '', 'none', 'access', 'hosting' ] )
+      || $self->ut_textn('taxclass')
       || $self->ut_enum('disabled', [ '', 'Y' ] )
     ;
 }
@@ -297,7 +297,7 @@ sub payby {
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.13 2002-05-04 15:00:18 ivan Exp $
+$Id: part_pkg.pm,v 1.14 2002-05-09 12:38:39 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/t/cust_tax_exempt.t b/FS/t/cust_tax_exempt.t
new file mode 100644
index 000000000..8af13e3aa
--- /dev/null
+++ b/FS/t/cust_tax_exempt.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_tax_exempt;
+$loaded=1;
+print "ok 1\n";
diff --git a/htetc/global.asa b/htetc/global.asa
index 62f454475..d04a5edbf 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -9,7 +9,7 @@ use HTML::Entities;
 use IO::Handle;
 use IO::File;
 use String::Approx qw(amatch);
-use HTML::Widgets::SelectLayers;
+use HTML::Widgets::SelectLayers 0.02;
 use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
 use FS::Record qw(qsearch qsearchs fields dbdef);
 use FS::Conf;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 056efa88b..49bcbc08c 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -66,7 +66,7 @@ sub handler
       use IO::Handle;
       use IO::File;
       use String::Approx qw(amatch);
-      use HTML::Widgets::SelectLayers;
+      use HTML::Widgets::SelectLayers 0.02;
       use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
       use FS::Record qw(qsearch qsearchs fields dbdef);
       use FS::Conf;
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index c74ef2b63..246500941 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -24,8 +24,8 @@ print &table(), <<END;
       <TR>
         <TH COLSPAN=2>Agent</TH>
         <TH>Type</TH>
-        <TH><FONT SIZE=-1>Freq. (unimp.)</FONT></TH>
-        <TH><FONT SIZE=-1>Prog. (unimp.)</FONT></TH>
+        <TH><FONT SIZE=-1>Freq.</FONT></TH>
+        <TH><FONT SIZE=-1>Prog.</FONT></TH>
       </TR>
 END
 #        <TH><FONT SIZE=-1>Agent #</FONT></TH>
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index 5df8dfae6..991606087 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -1,26 +1,36 @@
 <!-- mason kludge -->
 <%
 
+my $conf = new FS::Conf;
+my $enable_taxclasses = $conf->exists('enable_taxclasses');
+
 print header("Tax Rate Listing", menubar(
   'Main Menu' => $p,
   'Edit tax rates' => $p. "edit/cust_main_county.cgi",
 )),<<END;
     Click on <u>expand country</u> to specify a country's tax rates by state.
     <BR>Click on <u>expand state</u> to specify a state's tax rates by county.
-    <BR><BR>
 END
-print &table(), <<END;
+
+if ( $enable_taxclasses ) {
+  print '<BR>Click on <u>expand taxclasses</u> to specify tax classes';
+}
+
+print '<BR><BR>'. &table(). <<END;
       <TR>
         <TH><FONT SIZE=-1>Country</FONT></TH>
         <TH><FONT SIZE=-1>State</FONT></TH>
         <TH>County</TH>
+        <TH>Taxclass</TH>
         <TH><FONT SIZE=-1>Tax</FONT></TH>
+        <TH><FONT SIZE=-1>Exempt<BR>per<BR>month</TH>
       </TR>
 END
 
-my @regions = sort {    $a->country cmp $b->country
-                     or $a->state   cmp $b->state
-                     or $a->county  cmp $b->county
+my @regions = sort {    $a->country  cmp $b->country
+                     or $a->state    cmp $b->state
+                     or $a->county   cmp $b->county
+                     or $a->taxclass cmp $b->taxclass
                    } qsearch('cust_main_county',{});
 
 my $sup=0;
@@ -30,7 +40,7 @@ for ( my $i=0; $i<@regions; $i++ ) {
   my $hashref = $cust_main_county->hashref;
   print <<END;
       <TR>
-        <TD>$hashref->{country}</TD>
+        <TD BGCOLOR="#ffffff">$hashref->{country}</TD>
 END
 
   my $j;
@@ -42,7 +52,8 @@ END
     for ( $j=1; $i+$j<@regions; $j++ ) {
       last if $hashref->{country} ne $regions[$i+$j]->country
            || $hashref->{state} ne $regions[$i+$j]->state
-           || $hashref->{tax} != $regions[$i+$j]->tax;
+           || $hashref->{tax} != $regions[$i+$j]->tax
+           || $hashref->{exempt_amount} != $regions[$i+$j]->exempt_amount;
     }
 
     my $newsup=0;
@@ -60,9 +71,9 @@ END
       $j = 1;
     }
 
-    print "<TD ROWSPAN=$j>", $hashref->{state}
-        ? $hashref->{state}
-        : qq!(ALL) <FONT SIZE=-1>!.
+    print "<TD ROWSPAN=$j", $hashref->{state}
+        ? ' BGCOLOR="#ffffff">'. $hashref->{state}
+        : qq! BGCOLOR="#cccccc">(ALL) <FONT SIZE=-1>!.
           qq!<A HREF="${p}edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
           qq!">expand country</A></FONT>!;
 
@@ -73,11 +84,11 @@ END
 
 #  $sup=$newsup;
 
-  print "<TD>";
+  print "<TD";
   if ( $hashref->{county} ) {
-    print $hashref->{county};
+    print ' BGCOLOR="#ffffff">'. $hashref->{county};
   } else {
-    print "(ALL)";
+    print ' BGCOLOR="#cccccc">(ALL)';
     if ( $hashref->{state} ) {
       print qq!<FONT SIZE=-1>!.
           qq!<A HREF="${p}edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
@@ -86,10 +97,24 @@ END
   }
   print "</TD>";
 
-  print <<END;
-        <TD>$hashref->{tax}%</TD>
-      </TR>
-END
+  print "<TD";
+  if ( $hashref->{taxclass} ) {
+    print ' BGCOLOR="#ffffff">'. $hashref->{taxclass};
+  } else {
+    print ' BGCOLOR="#cccccc">(ALL)';
+    if ( $enable_taxclasses ) {
+      print qq!<FONT SIZE=-1>!.
+            qq!<A HREF="${p}edit/cust_main_county-expand.cgi?taxclass!.
+            $hashref->{taxnum}. qq!">expand taxclasses</A></FONT>!;
+    }
+
+  }
+  print "</TD>";
+
+  print "<TD BGCOLOR=\"#ffffff\">$hashref->{tax}%</TD>".
+        '<TD BGCOLOR="#ffffff">$'.
+          sprintf("%.2f", $hashref->{exempt_amount} || 0). '</TD>'.
+        '</TR>';
 
 }
 
diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index 3fca34326..449456cdd 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -51,12 +51,12 @@ print <<END;
 </SELECT></TD>
 </TR>
 <TR>
-  <TD ALIGN="right">Frequency (unimplemented)</TD>
-  <TD><INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}"></TD>
+  <TD ALIGN="right"><!--Frequency--></TD>
+  <TD><INPUT TYPE="hidden" NAME="freq" VALUE="$hashref->{freq}"></TD>
 </TR>
 <TR>
-  <TD ALIGN="right">Program (unimplemented)</TD>
-  <TD><INPUT TYPE="text" NAME="prog" VALUE="$hashref->{prog}"></TD>
+  <TD ALIGN="right"><!--Program--></TD>
+  <TD><INPUT TYPE="hidden" NAME="prog" VALUE="$hashref->{prog}"></TD>
 </TR>
 </TABLE>
 END
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 33e72d864..e92abefd7 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -98,7 +98,9 @@ if ( $custnum && ! $conf->exists('editreferrals') ) {
   print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
 } else {
   my(@referrals) = qsearch('part_referral',{});
-  if ( scalar(@referrals) == 1 ) {
+  if ( scalar(@referrals) == 0 ) {
+    die "You have not created any advertising sources.  You must create at least one advertising source before adding a customer.  Go to ". popurl(2). "browse/part_referral.cgi and create one or more advertising sources.";
+  } elsif ( scalar(@referrals) == 1 ) {
     $refnum ||= $referrals[0]->refnum;
     print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
   } else {
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index 66e8aaf9e..9f314a457 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,16 +1,18 @@
 <!-- mason kludge -->
 <%
 
-my($taxnum, $delim, $expansion );
+my($taxnum, $delim, $expansion, $taxclass );
+my($query) = $cgi->keywords;
 if ( $cgi->param('error') ) {
   $taxnum = $cgi->param('taxnum');
   $delim = $cgi->param('delim');
   $expansion = $cgi->param('expansion');
+  $taxclass = $cgi->param('taxclass');
 } else {
-  my ($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/
-    or die "Illegal taxnum!";
-  $taxnum = $1;
+  $query =~ /^(taxclass)?(\d+)$/
+    or die "Illegal taxnum (query $query)";
+  $taxclass = $1 ? 'taxclass' : '';
+  $taxnum = $2;
   $delim = 'n';
   $expansion = '';
 }
@@ -31,11 +33,12 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
 print <<END;
     <FORM ACTION="${p1}process/cust_main_county-expand.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="taxnum" VALUE="$taxnum">
+      <INPUT TYPE="hidden" NAME="taxclass" VALUE="$taxclass">
       Separate by
 END
 print '<INPUT TYPE="radio" NAME="delim" VALUE="n"';
 print ' CHECKED' if $delim eq 'n';
-print '>line (rumor has it broken on some browsers) or',
+print '>line (broken on some browsers) or',
       '<INPUT TYPE="radio" NAME="delim" VALUE="s"';
 print ' CHECKED' if $delim eq 's';
 print '>whitespace.';
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index a11711770..7ef37a48d 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -14,8 +14,10 @@ print qq!<FORM ACTION="!, popurl(1),
       <TR>
         <TH><FONT SIZE=-1>Country</FONT></TH>
         <TH><FONT SIZE=-1>State</FONT></TH>
-        <TH>County</TH>
+        <TH><FONT SIZE=-1>County</FONT></TH>
+        <TH><FONT SIZE=-1>Taxclass</FONT></TH>
         <TH><FONT SIZE=-1>Tax</FONT></TH>
+        <TH><FONT SIZE=-1>Exempt<BR>per<BR>month</TH>
       </TR>
 END
 
@@ -26,22 +28,29 @@ foreach my $cust_main_county ( sort {    $a->country cmp $b->country
   my($hashref)=$cust_main_county->hashref;
   print <<END;
       <TR>
-        <TD>$hashref->{country}</TD>
+        <TD BGCOLOR="#ffffff">$hashref->{country}</TD>
 END
 
-  print "<TD>", $hashref->{state}
-      ? $hashref->{state}
-      : '(ALL)'
+  print "<TD", $hashref->{state}
+      ? ' BGCOLOR="#ffffff">'.$hashref->{state}
+      : ' BGCOLOR="#cccccc">(ALL)'
     , "</TD>";
 
-  print "<TD>", $hashref->{county}
-      ? $hashref->{county}
-      : '(ALL)'
+  print "<TD", $hashref->{county}
+      ? ' BGCOLOR="#ffffff">'. $hashref->{county}
+      : ' BGCOLOR="#cccccc">(ALL)'
+    , "</TD>";
+
+  print "<TD", $hashref->{taxclass}
+      ? ' BGCOLOR="#ffffff">'. $hashref->{taxclass}
+      : ' BGCOLOR="#cccccc">(ALL)'
     , "</TD>";
 
   print qq!<TD><INPUT TYPE="text" NAME="tax!, $hashref->{taxnum},
-        qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6>%</TD></TR>!;
-END
+        qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6>%</TD>!;
+  print qq!<TD>\$<INPUT TYPE="text" NAME="exempt_amount!, $hashref->{taxnum},
+        qq!" VALUE="!, $hashref->{exempt_amount}||0, qq!" SIZE=6></TD>!;
+  print '</TR>';
 
 }
 
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index a63fc23fe..e03017db4 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -88,6 +88,23 @@ print '>';
 
 print '</TD></TR>';
 
+my $conf = new FS::Conf;
+if ( $conf->exists('enable_taxclasses') ) {
+  print '<TR><TD ALIGN="right">Tax class</TD><TD><SELECT NAME="taxclass">';
+  my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
+    or die dbh->errstr;
+  $sth->execute or die $sth->errstr;
+  foreach my $taxclass ( map $_->[0], @{$sth->fetchall_arrayref} ) {
+    print qq!<OPTION VALUE="$taxclass"!;
+    print ' SELECTED' if $taxclass eq $hashref->{taxclass};
+    print qq!>$taxclass</OPTION>!;
+  }
+  print '</SELECT></TD></TR>';
+} else {
+  print
+    '<INPUT TYPE="hidden" NAME="taxclass" VALUE="'. $hashref->{taxclass}. '">';
+}
+
 print '<TR><TD ALIGN="right">Disable new orders</TD><TD>';
 print '<INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"';
 print ' CHECKED' if $hashref->{disabled} eq "Y";
@@ -344,6 +361,14 @@ my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
 
 tie my %options, 'Tie::IxHash', map { $_=>$plans{$_}->{'name'} } keys %plans;
 
+my @form_select = ();
+if ( $conf->exists('enable_taxclasses') ) {
+  push @form_select, 'taxclass';
+} else {
+  push @fixups, 'taxclass'; #hidden
+}
+
+
 my $widget = new HTML::Widgets::SelectLayers(
   'selected_layer' => $part_pkg->plan,
   'options'        => \%options,
@@ -351,6 +376,7 @@ my $widget = new HTML::Widgets::SelectLayers(
   'form_action'    => 'process/part_pkg.cgi',
   'form_text'      => [ qw(pkg comment freq clone pkgnum pkgpart), @fixups ],
   'form_checkbox'  => [ qw(setuptax recurtax disabled) ],
+  'form_select'    => [ @form_select ],
   'fixup_callback' => sub {
                         #my $ = @_;
                         my $html = '';
diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
index 64061deed..a452711c1 100755
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -27,7 +27,9 @@ foreach ( @expansion) {
   my(%hash)=$cust_main_county->hash;
   my($new)=new FS::cust_main_county \%hash;
   $new->setfield('taxnum','');
-  if ( ! $cust_main_county->state ) {
+  if ( $cgi->param('taxclass') ) {
+    $new->setfield('taxclass', $_);
+  } elsif ( ! $cust_main_county->state ) {
     $new->setfield('state',$_);
   } else {
     $new->setfield('county',$_);
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
index 0800789b5..990a23919 100755
--- a/httemplate/edit/process/cust_main_county.cgi
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -1,13 +1,16 @@
 <%
 
-foreach ( $cgi->param ) {
+foreach ( grep { /^tax\d+$/ } $cgi->param ) {
   /^tax(\d+)$/ or die "Illegal form $_!";
   my($taxnum)=$1;
   my($old)=qsearchs('cust_main_county',{'taxnum'=>$taxnum})
     or die "Couldn't find taxnum $taxnum!";
-  next unless $old->getfield('tax') ne $cgi->param("tax$taxnum");
-  my(%hash)=$old->hash;
-  $hash{tax}=$cgi->param("tax$taxnum");
+  my $exempt_amount = $cgi->param("exempt_amount$taxnum");
+  next unless $old->tax ne $cgi->param("tax$taxnum")
+              || $old->exempt_amount ne $exempt_amount;
+  my %hash = $old->hash;
+  $hash{tax} = $cgi->param("tax$taxnum");
+  $hash{exempt_amount} = $exempt_amount;
   my($new)=new FS::cust_main_county \%hash;
   my($error)=$new->replace($old);
   if ( $error ) {
-- 
cgit v1.2.1


From 2d3b0ecdb9b1c6f39dcfb64757ed4b9d50abaae0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 May 2002 15:12:38 +0000
Subject: don't duplicate state/county/country pulldowns even with taxrates...

---
 FS/FS/cust_main_county.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index 8e83b1a1d..28f69c262 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -134,7 +134,8 @@ sub regionselector {
     @cust_main_county = qsearch('cust_main_county', {} );
     foreach my $c ( @cust_main_county ) {
       $countyflag=1 if $c->county;
-      push @{$cust_main_county{$c->country}{$c->state}}, $c->county;
+      #push @{$cust_main_county{$c->country}{$c->state}}, $c->county;
+      $cust_main_county{$c->country}{$c->state}{$c->county} = 1;
     }
 #  }
   $countyflag=1 if $selected_county;
@@ -179,7 +180,8 @@ END
       $script_html .= "\nif ( country == \"$country\" ) {\n";
       foreach my $state ( sort keys %{$cust_main_county{$country}} ) {
         $script_html .= "\nif ( state == \"$state\" ) {\n";
-          foreach my $county ( sort @{$cust_main_county{$country}{$state}} ) {
+          #foreach my $county ( sort @{$cust_main_county{$country}{$state}} ) {
+          foreach my $county ( sort keys %{$cust_main_county{$country}{$state}} ) {
             my $text = $county || '(n/a)';
             $script_html .=
               qq!opt(what.form.${prefix}county, "$county", "$text");\n!;
-- 
cgit v1.2.1


From c3256336de26feda8ad6c7e51b039249e147a30f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 May 2002 15:14:21 +0000
Subject: attempt to avoid people installing and asking for help with MySQL
 despite the VERY FUCKING CLEAR instructions that it isn't supported.

---
 httemplate/docs/install.html |  6 +++---
 httemplate/docs/mysql.html   | 13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 httemplate/docs/mysql.html

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 4870c7db7..5c13ac10d 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -13,10 +13,9 @@ Before installing, you need:
   <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.
     <ul>
       <li><a href="http://www.postgresql.org/">PostgreSQL</a> (v7 or higher) is recommended.
-      <li><b>MySQL does not work at this time.</b>
-        <i>The following information is provided for developers who wish to contribute MySQL support:</i> See ticket <a href="http://pouncequick.420.am/rt/Ticket/Display.html?id=300">#300</a> in the bug-tracking system.
+      <li><b>MySQL is NOT supported at this time.</b>  If you are a developer who wishes to contribute MySQL support, see the <a href="mysql.html">MySQL notes</a>.
       <!-- <li>MySQL has been reported to work.  -->
-        <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
+      <!--  <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.-->
     </ul>
   <li>Perl modules (<a href="http://theoryx5.uwinnipeg.ca/CPAN/perl/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
     <ul>
@@ -53,6 +52,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>
       <li><a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a>
       <li><a href="http://search.cpan.org/search?dist=Storable">Storable</a>
+      <li><a href="http://search.cpan.org/search?dist=Apache-DBI">Apache::DBI</a> <i>(optional but recommended for better webinterface performance)</i>
     </ul>
 </ul>
 Install the Freeside distribution:
diff --git a/httemplate/docs/mysql.html b/httemplate/docs/mysql.html
new file mode 100644
index 000000000..11af518e1
--- /dev/null
+++ b/httemplate/docs/mysql.html
@@ -0,0 +1,13 @@
+<head>
+  <title>MySQL notes</title>
+</head>
+<body>
+  <h1>MySQL notes</h1>
+<font size=+2><b>MySQL is NOT supported at this time.</b></font>
+<i>The following information is provided for developers who wish to contribute MySQL support.  Note that <b>ALL</b> of the items listed below need to be resolved to support MySQL.
+<ul>
+  <li>See ticket <a href="http://pouncequick.420.am/rt/Ticket/Display.html?id=300">#300</a> in the bug-tracking system.
+  <li><b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">My
+ISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  You need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
+</ul>
+</body>
-- 
cgit v1.2.1


From cab37352b30b0bb1318ff237fb4dda8482f4bfef Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 May 2002 15:21:00 +0000
Subject: s/Referral/Advertising source/

---
 httemplate/edit/cust_main.cgi | 2 +-
 httemplate/view/cust_main.cgi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index e92abefd7..cf8de2f13 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -104,7 +104,7 @@ if ( $custnum && ! $conf->exists('editreferrals') ) {
     $refnum ||= $referrals[0]->refnum;
     print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
   } else {
-    print qq!<BR><BR>${r}Referral <SELECT NAME="refnum" SIZE="1">!;
+    print qq!<BR><BR>${r}Advertising source <SELECT NAME="refnum" SIZE="1">!;
     print "<OPTION> " unless $refnum;
     my($referral);
     foreach $referral (sort {
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index d960468a0..52d85deff 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -158,7 +158,7 @@ print '<TD VALIGN="top">';
     my $referral = qsearchs('part_referral', {
       'refnum' => $cust_main->refnum
     } );
-    print '<TR><TD ALIGN="right">Referral</TD><TD BGCOLOR="#ffffff">',
+    print '<TR><TD ALIGN="right">Advertising source</TD><TD BGCOLOR="#ffffff">',
           $referral->refnum, ": ", $referral->referral, '</TD></TR>';
   }
   print '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
-- 
cgit v1.2.1


From 79359dfa599329e448a1614dac7dab01cfd1b3df Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 May 2002 15:22:30 +0000
Subject: make release target

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 315d43070..826e74f60 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,8 @@ FREESIDE_RESTART = /etc/init.d/freeside restart
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION="1.4.0pre12"
-TAG="1_4_0_PRE12"
+VERSION=1.4.0pre12
+TAG=freeside_1_4_0_pre12
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -130,7 +130,7 @@ release: upload-docs
 	cvs tag ${TAG}
 
 	cd /home/ivan
-	cvs export -r $TAG -d freeside-${VERSION} freeside
+	cvs export -r ${TAG} -d freeside-${VERSION} freeside
 	tar czvf freeside-${VERSION}.tar.gz freeside-${VERSION}
 
 	scp freeside-${VERSION} ivan@cleanwhisker.420.am:/var/www/sisd.420.am/freeside/
-- 
cgit v1.2.1


From 0163a36d1a8317f4c0a2a1f2c3b38c394f12945d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 May 2002 15:25:03 +0000
Subject: fix make release target

---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 826e74f60..01432623b 100644
--- a/Makefile
+++ b/Makefile
@@ -127,13 +127,14 @@ upload-docs:
 
 release: upload-docs
 	cd /home/ivan/freeside_current
-	cvs tag ${TAG}
+	#cvs tag ${TAG}
+	cvs tag -F ${TAG}
 
 	cd /home/ivan
 	cvs export -r ${TAG} -d freeside-${VERSION} freeside
 	tar czvf freeside-${VERSION}.tar.gz freeside-${VERSION}
 
-	scp freeside-${VERSION} ivan@cleanwhisker.420.am:/var/www/sisd.420.am/freeside/
+	scp freeside-${VERSION}.tar.gz ivan@cleanwhisker.420.am:/var/www/sisd.420.am/freeside/
 
 update-webdemo:
 	ssh ivan@pouncequick.420.am '( cd freeside; cvs update -d -P )'
-- 
cgit v1.2.1


From 8f136821c88849319e91c4482d18d5092ce5a5b2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 May 2002 15:26:35 +0000
Subject: final make release?

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 01432623b..9022d2b70 100644
--- a/Makefile
+++ b/Makefile
@@ -130,11 +130,12 @@ release: upload-docs
 	#cvs tag ${TAG}
 	cvs tag -F ${TAG}
 
-	cd /home/ivan
+	#cd /home/ivan
 	cvs export -r ${TAG} -d freeside-${VERSION} freeside
 	tar czvf freeside-${VERSION}.tar.gz freeside-${VERSION}
 
 	scp freeside-${VERSION}.tar.gz ivan@cleanwhisker.420.am:/var/www/sisd.420.am/freeside/
+	mv freeside-${VERSION} freeside-${VERSION}.tar.gz ..
 
 update-webdemo:
 	ssh ivan@pouncequick.420.am '( cd freeside; cvs update -d -P )'
-- 
cgit v1.2.1


From dac2cf0ad7e65ca013244cfb017952de1562d4e0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 May 2002 16:41:41 +0000
Subject: permissions

---
 bin/populate-msgcat | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/populate-msgcat b/bin/populate-msgcat
index 506cf5f0b..b50fc7ec3 100755
--- a/bin/populate-msgcat
+++ b/bin/populate-msgcat
@@ -113,4 +113,3 @@ sub usage {
   die "Usage:\n\n  populate-msgcat user\n";
 }
 
-
-- 
cgit v1.2.1


From 0c5d2706f6e199b309a130bd24ffdf4f3cea3834 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 10 May 2002 07:42:51 +0000
Subject: INSTALLGROUP

---
 Makefile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 9022d2b70..92ee0e270 100644
--- a/Makefile
+++ b/Makefile
@@ -18,13 +18,19 @@ INIT_FILE = /etc/init.d/freeside
 HTTPD_RESTART = /etc/init.d/apache restart
 FREESIDE_RESTART = /etc/init.d/freeside restart
 
+INSTALLGROUP = root
+
 #---
 
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.4.0pre12
-TAG=freeside_1_4_0_pre12
+#VERSION=1.4.0pre12
+#TAG=freeside_1_4_0_pre12
+VERSION=1.4.0pre13
+TAG=freeside_1_4_0_pre13
+#VERSION=1.4.0beta1
+#TAG=freeside_1_4_0_beta1
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -77,7 +83,7 @@ install-perl-modules: perl-modules
 	make install UNINST=1
 
 install-init:
-	[ -e ${INIT_FILE} ] || install -o root -g root -m 711 init.d/freeside-init ${INIT_FILE}
+	[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
 
 install: install-perl-modules install-docs install-init
 
-- 
cgit v1.2.1


From 91249e69d7126b456ba444686ab9f7485c121534 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 10 May 2002 07:45:29 +0000
Subject: bad reuse of variable

---
 FS/FS/svc_domain.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index d01a403d1..97c5b3147 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -193,14 +193,14 @@ sub insert {
 
     foreach my $record ( @defaultrecords ) {
       my($zone,$af,$type,$data) = split(/\s+/,$record,4);
-      my $record = new FS::domain_record {
+      my $domain_record = new FS::domain_record {
         'svcnum'  => $self->svcnum,
         'reczone' => $zone,
         'recaf'   => $af,
         'rectype' => $type,
         'recdata' => $data,
       };
-      my $error = $record->insert;
+      my $error = $domain_record->insert;
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
         return "couldn't insert record for new domain: $error";
@@ -407,7 +407,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.26 2002-03-18 09:10:12 ivan Exp $
+$Id: svc_domain.pm,v 1.27 2002-05-10 07:45:29 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From f221fec654d6d125d3ccb5aed5dce9f11fe8b99b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 10 May 2002 07:50:25 +0000
Subject: correct message

---
 init.d/freeside-init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/freeside-init b/init.d/freeside-init
index fd9e9e71b..46f133d59 100644
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -40,7 +40,7 @@ case "$1" in
         killall fs_passwd_server
         echo "done."
 
-        echo -n "Stopping fs_passwd_server: "
+        echo -n "Stopping fs_signup_server: "
         killall fs_signup_server
         echo "done."
         ;;
-- 
cgit v1.2.1


From 101f05b91c1c9b627d88a7e60347159781caed0b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 10 May 2002 07:54:11 +0000
Subject: always re-install init

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 92ee0e270..68ef79464 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,8 @@ install-perl-modules: perl-modules
 	make install UNINST=1
 
 install-init:
-	[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
+	#[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
+	install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
 
 install: install-perl-modules install-docs install-init
 
-- 
cgit v1.2.1


From 0eb4dc23ad6d145ee394884a95bad09e2668e74d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 14 May 2002 00:27:06 +0000
Subject: shellcomands oops

---
 FS/FS/part_export/shellcommands.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index e99c382a4..ccde72a68 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -9,12 +9,12 @@ sub rebless { shift; }
 
 sub _export_insert {
   my($self) = shift;
-  $self->_export_command($self, 'useradd', @_);
+  $self->_export_command('useradd', @_);
 }
 
 sub _export_delete {
   my($self) = shift;
-  $self->_export_command($self, 'userdel', @_);
+  $self->_export_command('userdel', @_);
 }
 
 sub _export_command {
-- 
cgit v1.2.1


From ce119821d508611bce8d2c62c3faec237faa6612 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 14 May 2002 07:36:47 +0000
Subject: don't use return value of UPDATE to decide whether or not to INSERT.

---
 FS/FS/part_export/sqlradius.pm | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index 7337b5aa9..fc680d41b 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -108,18 +108,34 @@ sub sqlradius_queue {
 
 sub sqlradius_insert { #subroutine, not method
   my $dbh = sqlradius_connect(shift, shift, shift);
-  my( $replycheck, $username, %attributes ) = @_;
+  my( $table, $username, %attributes ) = @_;
 
   foreach my $attribute ( keys %attributes ) {
-    my $u_sth = $dbh->prepare(
-      "UPDATE rad$replycheck SET Value = ? WHERE UserName = ? AND Attribute = ?"    ) or die $dbh->errstr;
-    my $i_sth = $dbh->prepare(
-      "INSERT INTO rad$replycheck ( id, UserName, Attribute, Value ) ".
-        "VALUES ( ?, ?, ?, ? )"
+  
+    my $s_sth = $dbh->prepare(
+      "SELECT COUNT(*) FROM rad$table WHERE UserName = ? AND Attribute = ?"
     ) or die $dbh->errstr;
-    $u_sth->execute($attributes{$attribute}, $username, $attribute) > 0
-      or $i_sth->execute( '', $username, $attribute, $attributes{$attribute} )
-        or die "can't insert into rad$replycheck table: ". $i_sth->errstr;
+    $s_sth->execute( $username, $attribute ) or die $s_sth->errstr;
+
+    if ( $s_sth->fetchrow_arrayref->[0] ) {
+
+      my $u_sth = $dbh->prepare(
+        "UPDATE rad$table SET Value = ? WHERE UserName = ? AND Attribute = ?"
+      ) or die $dbh->errstr;
+      $u_sth->execute($attributes{$attribute}, $username, $attribute)
+        or die $u_sth->errstr;
+
+    } else {
+
+      my $i_sth = $dbh->prepare(
+        "INSERT INTO rad$table ( id, UserName, Attribute, Value ) ".
+          "VALUES ( ?, ?, ?, ? )"
+      ) or die $dbh->errstr;
+      $i_sth->execute( '', $username, $attribute, $attributes{$attribute} )
+        or die $i_sth->errstr;
+
+    }
+
   }
   $dbh->disconnect;
 }
@@ -166,14 +182,14 @@ sub sqlradius_rename { #subroutine, not method
 
 sub sqlradius_attrib_delete { #subroutine, not method
   my $dbh = sqlradius_connect(shift, shift, shift);
-  my( $replycheck, $username, @attrib ) = @_;
+  my( $table, $username, @attrib ) = @_;
 
   foreach my $attribute ( @attrib ) {
     my $sth = $dbh->prepare(
-        "DELETE FROM rad$replycheck WHERE UserName = ? AND Attribute = ?" )
+        "DELETE FROM rad$table WHERE UserName = ? AND Attribute = ?" )
       or die $dbh->errstr;
     $sth->execute($username,$attribute)
-      or die "can't delete from rad$replycheck table: ". $sth->errstr;
+      or die "can't delete from rad$table table: ". $sth->errstr;
   }
   $dbh->disconnect;
 }
-- 
cgit v1.2.1


From eb7c552dd8290d6b33a4e026c5dc21ebf01105cf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 15 May 2002 13:24:26 +0000
Subject: queue dependancies

---
 ANNOUCE.1.4.0                  |  38 ++++++-------
 FS/FS.pm                       |   4 +-
 FS/FS/part_export/sqlradius.pm |  34 ++++++------
 FS/FS/queue.pm                 |  37 +++++++++++--
 FS/FS/queue_depend.pm          | 120 +++++++++++++++++++++++++++++++++++++++++
 FS/MANIFEST                    |   1 +
 FS/bin/freeside-queued         |  12 +++--
 FS/t/queue_depend.t            |   5 ++
 Makefile                       |   2 -
 README.1.4.0pre13              |  27 ++++++++++
 bin/fs-setup                   |  13 ++++-
 eg/export_template.pm          |  11 ++--
 httemplate/docs/install.html   |   2 +-
 httemplate/docs/schema.dia     | Bin 11176 -> 11452 bytes
 httemplate/docs/schema.html    |   6 +++
 httemplate/docs/schema.png     | Bin 446146 -> 496268 bytes
 httemplate/docs/upgrade8.html  |   8 +++
 17 files changed, 268 insertions(+), 52 deletions(-)
 create mode 100644 FS/FS/queue_depend.pm
 create mode 100644 FS/t/queue_depend.t
 create mode 100644 README.1.4.0pre13

diff --git a/ANNOUCE.1.4.0 b/ANNOUCE.1.4.0
index 63fd3fa95..a3d786508 100644
--- a/ANNOUCE.1.4.0
+++ b/ANNOUCE.1.4.0
@@ -107,22 +107,24 @@ and suspension/unsuspension.
 
 -- 
 
-added case-insensitive and substring to default search
-
-full history tables (notification for deleted payments)
-
-alternate templates (late invoices!)
-
-new export! (well, almost)
-
-icradius groups (usergroup table if not radgroupreply & radgroupcheck)
-
-message catalogs (infrastructure, anyway) & anything which gets sent to a
-customer from the signup server should use message catalog
-
-multi-agent signup server
-
-signup_server-realtime to run cards immediately
-
-and signup-alternate.html for free/paid packages on same signup
+- New export code!
+- Name and company searches:
+  - now case-insensative
+  - pulldown for search type
+- Email notification for deleted payments
+- History tables - complete history of all database changes
+- Alternate invoice templates for things like late noitces
+- ICRADIUS groups (usergroup table if not radgroupreply & radgroupcheck)
+- Signup server
+  - Error messages in message catalog
+  - Agent is now selectable (multiple signup servers for different agents
+    can now run on the same machine)
+  - signup_server-realtime configuration option to run cards immediately
+  - signup-alternate.html example for free and pay packages on the same
+    signup page
+- Texas tax
+
+schema diagram
+
+--
 
diff --git a/FS/FS.pm b/FS/FS.pm
index 3a9c9f336..963c73548 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -31,7 +31,7 @@ L<FS::CGI> - Non OO-subroutines for the web interface.
 
 L<FS::Msgcat> - Message catalog
 
-L<FS::SearchCache> - Message catalog
+L<FS::SearchCache> - Search cache
 
 L<FS::raddb> - RADIUS dictionary
 
@@ -134,6 +134,8 @@ L<FS::queue> - Job queue
 
 L<FS::queue_arg> - Job arguments
 
+L<FS::queue_depend> - Job dependencies
+
 L<FS::msgcat> - Message catalogs
 
 =head1 Remote API modules
diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index fc680d41b..51a828001 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -14,15 +14,16 @@ sub _export_insert {
     my $method = "radius_$table";
     my %attrib = $svc_acct->$method;
     next unless keys %attrib;
-    my $error = $self->sqlradius_queue( $svc_acct->svcnum, 'insert',
+    my $err_or_queue = $self->sqlradius_queue( $svc_acct->svcnum, 'insert',
       $table, $svc_acct->username, %attrib );
-    return $error if $error;
+    return $err_or_queue unless ref($err_or_queue);
   }
   my @groups = $svc_acct->radius_groups;
   if ( @groups ) {
-    my $error = $self->sqlradius_queue( $svc_acct->svcnum, 'usergroup_insert',
+    my $err_or_queue = $self->sqlradius_queue(
+      $svc_acct->svcnum, 'usergroup_insert',
       $svc_acct->username, @groups );
-    return $error if $error;
+    return $err_or_queue unless ref($err_or_queue);
   }
   '';
 }
@@ -33,9 +34,9 @@ sub _export_replace {
   #return "can't (yet) change username with sqlradius"
   #  if $old->username ne $new->username;
   if ( $old->username ne $new->username ) {
-    my $error = $self->sqlradius_queue( $new->svcnum, 'rename',
+    my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'rename',
       $new->username, $old->username );
-    return $error if $error;
+    return $err_or_queue unless ref($err_or_queue);
   }
 
   foreach my $table (qw(reply check)) {
@@ -46,16 +47,16 @@ sub _export_replace {
                 || $new{$_} ne $old{$_} #changed
               } keys %new
     ) {
-      my $error = $self->sqlradius_queue( $new->svcnum, 'insert',
+      my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'insert',
         $table, $new->username, %new );
-      return $error if $error;
+      return $err_or_queue unless ref($err_or_queue);
     }
 
     my @del = grep { !exists $new{$_} } keys %old;
     if ( @del ) {
-      my $error = $self->sqlradius_queue( $new->svcnum, 'attrib_delete',
+      my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'attrib_delete',
         $table, $new->username, @del );
-      return $error if $error;
+      return $err_or_queue unless ref($err_or_queue);
     }
   }
 
@@ -72,15 +73,15 @@ sub _export_replace {
   }
 
   if ( @delgroups ) {
-    my $error = $self->sqlradius_queue( $new->svcnum, 'usergroup_delete',
+    my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'usergroup_delete',
       $new->username, @delgroups );
-    return $error if $error;
+    return $err_or_queue unless ref($err_or_queue);
   }
 
   if ( @newgroups ) {
-    my $error = $self->sqlradius_queue( $new->svcnum, 'usergroup_insert',
+    my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'usergroup_insert',
       $new->username, @newgroups );
-    return $error if $error;
+    return $err_or_queue unless ref($err_or_queue);
   }
 
   '';
@@ -88,8 +89,9 @@ sub _export_replace {
 
 sub _export_delete {
   my( $self, $svc_acct ) = (shift, shift);
-  $self->sqlradius_queue( $svc_acct->svcnum, 'delete',
+  my $err_or_queue = $self->sqlradius_queue( $svc_acct->svcnum, 'delete',
     $svc_acct->username );
+  ref($err_or_queue) ? '' : $err_or_queue;
 }
 
 sub sqlradius_queue {
@@ -103,7 +105,7 @@ sub sqlradius_queue {
     $self->option('username'),
     $self->option('password'),
     @_,
-  );
+  ) or $queue;
 }
 
 sub sqlradius_insert { #subroutine, not method
diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index 5719eff70..c75f75874 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -8,6 +8,7 @@ use FS::Conf;
 use FS::Record qw( qsearch qsearchs dbh );
 #use FS::queue;
 use FS::queue_arg;
+use FS::queue_depend;
 use FS::cust_svc;
 
 @ISA = qw(FS::Record);
@@ -144,7 +145,8 @@ sub delete {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  my @args = qsearch( 'queue_arg', { 'jobnum' => $self->jobnum } );
+  my @del = qsearch( 'queue_arg', { 'jobnum' => $self->jobnum } );
+  push @del, qsearch( 'queue_depend', { 'depend_jobnum' => $self->jobnum } );
 
   my $error = $self->SUPER::delete;
   if ( $error ) {
@@ -152,8 +154,8 @@ sub delete {
     return $error;
   }
 
-  foreach my $arg ( @args ) {
-    $error = $arg->delete;
+  foreach my $del ( @del ) {
+    $error = $del->delete;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return $error;
@@ -206,6 +208,8 @@ sub check {
 
 =item args
 
+Returns a list of the arguments associated with this job.
+
 =cut
 
 sub args {
@@ -228,6 +232,31 @@ sub cust_svc {
   qsearchs('cust_svc', { 'svcnum' => $self->svcnum } );
 }
 
+=item depend_insert OTHER_JOBNUM
+
+Inserts a dependancy for this job.  If there is an error, returns the error,
+otherwise returns false.
+
+When using job dependancies, you should wrap the insertion of jobs in a
+database transaction.  
+
+=cut
+
+sub depend_insert {
+  my($self, $other_jobnum) = @_;
+  my $queue_depend = new FS::queue_depend (
+    'jobnum'        => $self->jobnum,
+    'depend_jobnum' => $other_jobnum,
+  );
+  $queue_depend->insert;
+}
+
+=back
+
+=head1 SUBROUTINES
+
+=over 4
+
 =item joblisting HASHREF NOACTIONS
 
 =cut
@@ -331,7 +360,7 @@ END
 
 =head1 VERSION
 
-$Id: queue.pm,v 1.11 2002-04-13 08:51:54 ivan Exp $
+$Id: queue.pm,v 1.12 2002-05-15 13:24:24 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/queue_depend.pm b/FS/FS/queue_depend.pm
new file mode 100644
index 000000000..4a4e3c55c
--- /dev/null
+++ b/FS/FS/queue_depend.pm
@@ -0,0 +1,120 @@
+package FS::queue_depend;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+use FS::queue;
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::queue_depend - Object methods for queue_depend records
+
+=head1 SYNOPSIS
+
+  use FS::queue_depend;
+
+  $record = new FS::queue_depend \%hash;
+  $record = new FS::queue_depend { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::queue_depend object represents an job dependancy.  FS::queue_depend
+inherits from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item dependnum - primary key
+
+=item jobnum - source jobnum (see L<FS::queue>).
+
+=item depend_jobnum - dependancy jobnum (see L<FS::queue>)
+
+=back
+
+The job specified by B<jobnum> depends on the job specified B<depend_jobnum> -
+the B<jobnum> job will not be run until the B<depend_jobnum> job has completed
+sucessfully (or manually removed).
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new dependancy.  To add the dependancy to the database, see
+L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'queue_depend'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid dependancy.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  $self->ut_numbern('dependnum')
+    || $self->ut_foreign_key('jobnum',        'queue', 'jobnum')
+    || $self->ut_foreign_key('depend_jobnum', 'queue', 'jobnum')
+  ;
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::queue>, L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 2e72d5af8..a95470bb4 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -78,6 +78,7 @@ FS/raddb.pm
 FS/radius_usergroup.pm
 FS/queue.pm
 FS/queue_arg.pm
+FS/queue_depend.pm
 FS/msgcat.pm
 FS/cust_tax_exempt.pm
 t/agent.t
diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 49b532ec3..1539a48af 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -59,13 +59,16 @@ while (1) {
   }
   $warnkids=0;
 
+  my $nodepend = 'AND 0 = ( SELECT COUNT(*) FROM queue_depend'.
+                          ' WHERE queue_depend.jobnum = queue.jobnum ) ';
+
   my $job = qsearchs(
     'queue',
     { 'status' => 'new' },
     '',
     driver_name =~ /^mysql$/i
-      ? 'ORDER BY jobnum LIMIT 1 FOR UPDATE'
-      : 'ORDER BY jobnum FOR UPDATE LIMIT 1'
+      ? "$nodepend ORDER BY jobnum LIMIT 1 FOR UPDATE"
+      : "$nodepend ORDER BY jobnum FOR UPDATE LIMIT 1"
   ) or do {
     sleep 5; #connecting to db is expensive
     next;
@@ -94,10 +97,9 @@ while (1) {
     $kids++;
   } else { #kid time
 
-    #get new db handles
+    #get new db handle
     $FS::UID::dbh->{InactiveDestroy} = 1;
-    $FS::svc_acct::icradius_dbh->{InactiveDestroy} = 1
-      if $FS::svc_acct::icradius_dbh;
+
     forksuidsetup($user);
 
     #auto-use export classes...
diff --git a/FS/t/queue_depend.t b/FS/t/queue_depend.t
new file mode 100644
index 000000000..8eaa2cdb3
--- /dev/null
+++ b/FS/t/queue_depend.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::queue_depend;
+$loaded=1;
+print "ok 1\n";
diff --git a/Makefile b/Makefile
index 68ef79464..be4e9db2a 100644
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,6 @@ INSTALLGROUP = root
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-#VERSION=1.4.0pre12
-#TAG=freeside_1_4_0_pre12
 VERSION=1.4.0pre13
 TAG=freeside_1_4_0_pre13
 #VERSION=1.4.0beta1
diff --git a/README.1.4.0pre13 b/README.1.4.0pre13
new file mode 100644
index 000000000..bd9fb7387
--- /dev/null
+++ b/README.1.4.0pre13
@@ -0,0 +1,27 @@
+the following is necessary to upgrade from 1.4.0pre12 to 1.4.0pre13
+
+if you're upgrading from before 1.4.0pre13 see README.1.4.0pre12 first!
+
+if you're upgrading from 1.3.1 follow the instructions in
+httemplate/docs/upgrade8.html instead
+
+----
+
+install the FS perl modules and httemplate as per install.html or upgrade8.html
+
+CREATE TABLE queue_depend (
+  dependnum int primary key,
+  jobnum int not null,
+  depend_jobnum int not null
+);
+CREATE INDEX queue_depend1 ON queue_depend ( jobnum );
+CREATE INDEX queue_depend2 ON queue_depend ( depend_jobnum );
+
+Run bin/dbdef-create
+
+Run bin/create-history-tables [username] queue_depend
+
+Run bin/dbdef-create again
+
+Restart Apache and freeside-queued
+
diff --git a/bin/fs-setup b/bin/fs-setup
index e05d44531..87921d74e 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.90 2002-05-04 15:00:18 ivan Exp $
+# $Id: fs-setup,v 1.91 2002-05-15 13:24:24 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -933,6 +933,17 @@ sub tables_hash_hack {
       'index'       => [ [ 'jobnum' ] ],
     },
 
+    'queue_depend' => {
+      'columns' => [
+        'dependnum', 'int', '', '',
+        'jobnum', 'int', '', '',
+        'depend_jobnum', 'int', '', '',
+      ],
+      'primary_key' => 'dependnum',
+      'unique'      => [],
+      'index'       => [ [ 'jobnum' ], [ 'depend_jobnum' ] ],
+    },
+
     'export_svc' => {
       'columns' => [
         'exportsvcnum' => 'int', '', '',
diff --git a/eg/export_template.pm b/eg/export_template.pm
index f2a5a19f7..1d441bda1 100644
--- a/eg/export_template.pm
+++ b/eg/export_template.pm
@@ -9,8 +9,9 @@ sub rebless { shift; }
 
 sub _export_insert {
   my($self, $svc_something) = (shift, shift);
-  $self->myexport_queue( $svc_acct->svcnum, 'insert',
+  $err_or_queue = $self->myexport_queue( $svc_acct->svcnum, 'insert',
     $svc_something->username, $svc_something->_password );
+  ref($err_or_queue) ? '' : $err_or_queue;
 }
 
 sub _export_replace {
@@ -18,14 +19,16 @@ sub _export_replace {
   #return "can't change username with myexport"
   #  if $old->username ne $new->username;
   #return '' unless $old->_password ne $new->_password;
-  $self->myexport_queue( $new->svcnum,
+  $err_or_queue = $self->myexport_queue( $new->svcnum,
     'replace', $new->username, $new->_password );
+  ref($err_or_queue) ? '' : $err_or_queue;
 }
 
 sub _export_delete {
   my( $self, $svc_something ) = (shift, shift);
-  $self->myexport_queue( $svc_acct->svcnum,
+  $err_or_queue = $self->myexport_queue( $svc_acct->svcnum,
     'delete', $svc_something->username );
+  ref($err_or_queue) ? '' : $err_or_queue;
 }
 
 #a good idea to queue anything that could fail or take any time
@@ -35,7 +38,7 @@ sub myexport_queue {
     'svcnum' => $svcnum,
     'job'    => "FS::part_export::myexport::myexport_$method",
   };
-  $queue->insert( @_ );
+  $queue->insert( @_ ) or $queue;
 }
 
 sub myexport_insert { #subroutine, not method
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 5c13ac10d..26fa34dd1 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -186,7 +186,7 @@ $ bin/fs-setup <b>username</b>
 $ su freeside
 $ bin/populate-msgcat <b>username</b>
 </pre>
-  <li><tt>freeside-queued</tt> was installed with the Perl modules.  Start it now and ensure that is run upon system startup.
+  <li><tt>freeside-queued</tt> was installed with the Perl modules.  Start it now and ensure that is run upon system startup (Do this manually, or, edit the top-level Makefile, replacing INIT_FILE with the appropriate location on your system, and run <tt>make install-init</tt>.
   <li>Now proceed to the initial <a href="admin.html">administration</a> of your installation.
 </ul>
 </body>
diff --git a/httemplate/docs/schema.dia b/httemplate/docs/schema.dia
index 148c1dfbc..c22a470e0 100644
Binary files a/httemplate/docs/schema.dia and b/httemplate/docs/schema.dia differ
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 3f627448f..2b8b3a132 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -401,6 +401,12 @@
         <li>jobnum - <a href="#queue">job</a>
         <li>arg - argument
       </ul>
+    <li><a name="queue_depend" href="man/FS/queue_depend.html">queue_depend</a> - job dependancies
+      <ul>
+        <li>dependnum - primary key
+        <li>jobnum - source jobnum
+        <li>depend_jobnum - dependancy jobnum
+      </ul>
     <li><a name="radius_usergroup" href="man/FS/radius_usergroup.html">radius_usergroup</a> - Link users to RADIUS groups.
       <ul>
         <li>usergroupnum - primary key
diff --git a/httemplate/docs/schema.png b/httemplate/docs/schema.png
index b3f00375e..ba22f59c2 100644
Binary files a/httemplate/docs/schema.png and b/httemplate/docs/schema.png differ
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 97758fdb2..e6184df14 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -120,6 +120,14 @@ CREATE TABLE queue_arg (
 );
 CREATE INDEX queue_arg1 ON queue_arg ( jobnum );
 
+CREATE TABLE queue_depend (
+  dependnum int primary key,
+  jobnum int not null,
+  depend_jobnum int not null
+);
+CREATE INDEX queue_depend1 ON queue_depend ( jobnum );
+CREATE INDEX queue_depend2 ON queue_depend ( depend_jobnum );
+
 CREATE TABLE part_pop_local (
   localnum int primary key,
   popnum int not null,
-- 
cgit v1.2.1


From b26a63c1a75b80652506f39a99a6786193d956bf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 15 May 2002 14:00:33 +0000
Subject: use job dependancies in FS::part_export::sqlradius.pm display job
 dependancies in FS::queue::joblisting

---
 FS/FS/part_export/sqlradius.pm | 71 +++++++++++++++++++++++++++++++++++++-----
 FS/FS/queue.pm                 | 28 ++++++++++++++---
 2 files changed, 87 insertions(+), 12 deletions(-)

diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index 51a828001..b31ec5cd3 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -1,6 +1,7 @@
 package FS::part_export::sqlradius;
 
 use vars qw(@ISA);
+use FS::Record qw( dbh );
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
@@ -31,12 +32,26 @@ sub _export_insert {
 sub _export_replace {
   my( $self, $new, $old ) = (shift, shift, shift);
 
-  #return "can't (yet) change username with sqlradius"
-  #  if $old->username ne $new->username;
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $jobnum = '';
   if ( $old->username ne $new->username ) {
     my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'rename',
       $new->username, $old->username );
-    return $err_or_queue unless ref($err_or_queue);
+    unless ( ref($err_or_queue) ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $err_or_queue;
+    }
+    $jobnum = $err_or_queue->jobnum;
   }
 
   foreach my $table (qw(reply check)) {
@@ -49,14 +64,34 @@ sub _export_replace {
     ) {
       my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'insert',
         $table, $new->username, %new );
-      return $err_or_queue unless ref($err_or_queue);
+      unless ( ref($err_or_queue) ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $err_or_queue;
+      }
+      if ( $jobnum ) {
+        my $error = $err_or_queue->depend_insert( $jobnum );
+        if ( $error ) {
+          $dbh->rollback if $oldAutoCommit;
+          return $error;
+        }
+      }
     }
 
     my @del = grep { !exists $new{$_} } keys %old;
     if ( @del ) {
       my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'attrib_delete',
         $table, $new->username, @del );
-      return $err_or_queue unless ref($err_or_queue);
+      unless ( ref($err_or_queue) ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $err_or_queue;
+      }
+      if ( $jobnum ) {
+        my $error = $err_or_queue->depend_insert( $jobnum );
+        if ( $error ) {
+          $dbh->rollback if $oldAutoCommit;
+          return $error;
+        }
+      }
     }
   }
 
@@ -75,15 +110,37 @@ sub _export_replace {
   if ( @delgroups ) {
     my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'usergroup_delete',
       $new->username, @delgroups );
-    return $err_or_queue unless ref($err_or_queue);
+    unless ( ref($err_or_queue) ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $err_or_queue;
+    }
+    if ( $jobnum ) {
+      my $error = $err_or_queue->depend_insert( $jobnum );
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
+    }
   }
 
   if ( @newgroups ) {
     my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'usergroup_insert',
       $new->username, @newgroups );
-    return $err_or_queue unless ref($err_or_queue);
+    unless ( ref($err_or_queue) ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $err_or_queue;
+    }
+    if ( $jobnum ) {
+      my $error = $err_or_queue->depend_insert( $jobnum );
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
+    }
   }
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
   '';
 }
 
diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index c75f75874..df92c5654 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -232,13 +232,26 @@ sub cust_svc {
   qsearchs('cust_svc', { 'svcnum' => $self->svcnum } );
 }
 
+=item queue_depend
+
+Returns the FS::queue_depend objects associated with this job, if any.
+
+=cut
+
+sub queue_depend {
+  my $self = shift;
+  qsearch('queue_depend', { 'jobnum' => $self->jobnum } );
+}
+
+
 =item depend_insert OTHER_JOBNUM
 
-Inserts a dependancy for this job.  If there is an error, returns the error,
-otherwise returns false.
+Inserts a dependancy for this job - it will not be run until the other job
+specified completes.  If there is an error, returns the error, otherwise
+returns false.
 
-When using job dependancies, you should wrap the insertion of jobs in a
-database transaction.  
+When using job dependancies, you should wrap the insertion of all relevant jobs
+in a database transaction.  
 
 =cut
 
@@ -303,6 +316,11 @@ END
     my $date = time2str( "%a %b %e %T %Y", $queue->_date );
     my $status = $queue->status;
     $status .= ': '. $queue->statustext if $queue->statustext;
+    my @queue_depend = $queue->queue_depend;
+    $status .= ' (waiting for '.
+               join(', ', map { $_->other_jobnum } @queue_depend ). 
+               ')'
+      if @queue_depend;
     my $changable = $dangerous
          || ( ! $noactions && $status =~ /^failed/ || $status =~ /^locked/ );
     if ( $changable ) {
@@ -360,7 +378,7 @@ END
 
 =head1 VERSION
 
-$Id: queue.pm,v 1.12 2002-05-15 13:24:24 ivan Exp $
+$Id: queue.pm,v 1.13 2002-05-15 14:00:32 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From ec43c49b63208a39acc00290992dbc47b2d5034b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 16 May 2002 07:53:39 +0000
Subject: upgrade docs: run populate-msgcat

---
 httemplate/docs/upgrade8.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index e6184df14..b0d1e3fe2 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -353,6 +353,13 @@ ALTER TABLE cust_refund DROP COLUMN crednum;
   <li><b>IMPORTANT: After applying the second set of database changes</b>, run bin/dbdef-create again.
   <li><b>IMPORTANT</b>: run bin/create-history-tables
   <li><b>IMPORTANT: After running bin/create-history-tables</b>, run bin/dbdef-create again.
+  <li>As the freeside UNIX user, run <tt>bin/populate-msgcat <b>username</b></tt
+> to populate the message catalog, passing the username of a Freeside user you c
+reated above:
+<pre>
+$ su freeside
+$ bin/populate-msgcat <b>username</b>
+</pre>
   <li>set the <a href="../config/config.cgi#username_policy">user_policy configuration value</a> as appropriate for your site.
   <li>set the <a href="../config/config.cgi#locale">locale configuration value</a> to en_US.
   <li>the mxmachines, nsmachines, arecords and cnamerecords configuration values have been deprecated.  Set the <a href="../config/config.cgi#defaultrecords">defaultrecords configuration value</a> instead.
-- 
cgit v1.2.1


From 7ccc8f47305f2bacb63b79dda665b2c7f5310ba5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 16 May 2002 13:42:30 +0000
Subject: allow freebsd `toor' root user

---
 FS/FS/svc_acct.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index bb8c5e21e..7ea4c10f8 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -577,7 +577,9 @@ sub check {
     #you can set a fixed gid in part_svc
 
     return "Only root can have uid 0"
-      if $recref->{uid} == 0 && $recref->{username} ne 'root';
+      if $recref->{uid} == 0
+         && $recref->{username} ne 'root'
+         && $recref->{username} ne 'toor';
 
 #    $error = $self->ut_textn('finger');
 #    return $error if $error;
-- 
cgit v1.2.1


From 3f9ac2ff50fff9d55ff5976ee1417dc6ba56f39e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 16 May 2002 13:42:54 +0000
Subject: service definition cloning

---
 httemplate/browse/part_svc.cgi | 17 ++++++++++++-----
 httemplate/edit/part_svc.cgi   | 13 +++++++++++--
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 5c33e68a4..933554cd5 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -8,7 +8,9 @@ if ( $cgi->param('showdisabled') ) {
   %search = ( 'disabled' => '' );
 }
 
-my @part_svc = qsearch('part_svc', \%search );
+my @part_svc =
+  sort { $a->getfield('svcpart') <=> $b->getfield('svcpart') }
+    qsearch('part_svc', \%search );
 my $total = scalar(@part_svc);
 
 %>
@@ -38,9 +40,7 @@ function part_export_areyousure(href) {
     <TH COLSPAN=2>Modifier</TH>
   </TR>
 
-<% foreach my $part_svc ( sort {
-     $a->getfield('svcpart') <=> $b->getfield('svcpart')
-   } @part_svc ) {
+<% foreach my $part_svc ( @part_svc ) {
      my $hashref = $part_svc->hashref;
      my $svcdb = $hashref->{svcdb};
      my @dfields = fields($svcdb);
@@ -96,7 +96,14 @@ map { qsearchs('part_export', { exportnum => $_->exportnum } ) } qsearch('export
 <% } %>
 
   <TR>
-    <TD COLSPAN=<%= $cgi->param('showdisabled') ? 7 : 8 %>><A HREF="<%= $p %>edit/part_svc.cgi"><I>Add a new service definition</I></A></TD>
+    <TD COLSPAN=<%= $cgi->param('showdisabled') ? 7 : 8 %>>
+      <FORM METHOD="POST" ACTION="<%= $p %>edit/part_svc.cgi"><A HREF="<%= $p %>edit/part_svc.cgi"><I>Add a new service definition</I></A>&nbsp;or&nbsp;<SELECT NAME="clone"><OPTION></OPTION>
+<% foreach my $part_svc ( @part_svc ) { %>
+  <OPTION VALUE="<%= $part_svc->svcpart %>"><%= $part_svc->svc %></OPTION>
+<% } %>
+      </SELECT><INPUT TYPE="submit" VALUE="Clone existing service">
+      </FORM>
+    </TD>
   </TR>
 </TABLE>
 </BODY>
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index e9c571f9c..f2073f935 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,10 +1,17 @@
 <!-- mason kludge -->
 <% 
    my $part_svc;
+   my $clone = '';
    if ( $cgi->param('error') ) { #error
      $part_svc = new FS::part_svc ( {
        map { $_, scalar($cgi->param($_)) } fields('part_svc')
      } );
+   } elsif ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {#clone
+     #$cgi->param('clone') =~ /^(\d+)$/ or die "malformed query: $query";
+     $part_svc = qsearchs('part_svc', { 'svcpart'=>$1 } )
+       or die "unknown svcpart: $1";
+     $clone = $part_svc->svcpart;
+     $part_svc->svcpart('');
    } elsif ( $cgi->keywords ) { #edit
      my($query) = $cgi->keywords;
      $query =~ /^(\d+)$/ or die "malformed query: $query";
@@ -146,8 +153,8 @@ my %defs = (
                  ' NAME="exportnum'. $part_export->exportnum. '"  VALUE="1" ';
         $html .= 'CHECKED'
           if qsearchs( 'export_svc', {
-                                       exportnum => $part_export->exportnum,
-                                       svcpart   => $part_svc->svcpart       });
+                                   exportnum => $part_export->exportnum,
+                                   svcpart   => $clone || $part_svc->svcpart });
         $html .= '> '. $part_export->exporttype. ' to '. $part_export->machine.
                  '</TD>';
         $count++;
@@ -161,6 +168,7 @@ my %defs = (
                       ? grep { $_ ne 'svcnum' } fields($layer)
                       : ();
       push @fields, 'usergroup' if $layer eq 'svc_acct'; #kludge
+      $part_svc->svcpart($clone) if $clone; #haha, undone below
       foreach my $field (@fields) {
         my $part_svc_column = $part_svc->part_svc_column($field);
         my $value = $cgi->param('error')
@@ -206,6 +214,7 @@ my %defs = (
         }
         $html .= "</TD></TR>\n";
       }
+      $part_svc->svcpart('') if $clone; #undone
       $html .= "</TABLE>";
 
       $html .= '<BR><INPUT TYPE="submit" VALUE="'.
-- 
cgit v1.2.1


From 6c22d1f804ed99ecae591af6483a326e1c825560 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 16 May 2002 14:21:20 +0000
Subject: force all infostreet arguments to be string type, fixes: "0 as first
 character in password" problem.  also see the Frontier::Client manpage

---
 FS/FS/part_export/infostreet.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
index e86e82a66..2ce556339 100644
--- a/FS/FS/part_export/infostreet.pm
+++ b/FS/FS/part_export/infostreet.pm
@@ -63,7 +63,8 @@ sub infostreet_command { #subroutine, not method
   die $key_result{error} unless $key_result{success};
   my $key = $key_result{data};
 
-  my $result = $conn->call($method, $key, @args);
+  #my $result = $conn->call($method, $key, @args);
+  my $result = $conn->call($method, $key, map { $conn->string($_) } @args);
   my %result = _infostreet_parse($result);
   die $result{error} unless $result{success};
 
-- 
cgit v1.2.1


From da311364707d64a2188cb959b3779178563d0ac8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 16 May 2002 14:27:58 +0000
Subject: add (stub) bsdshell and textradius exports

---
 FS/MANIFEST           | 16 ++++++++++------
 eg/export_template.pm |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/FS/MANIFEST b/FS/MANIFEST
index a95470bb4..4c6d243df 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -49,11 +49,13 @@ FS/part_bill_event.pm
 FS/export_svc.pm
 FS/part_export.pm
 FS/part_export_option.pm
-FS/part_export/infostreet.pm
-FS/part_export/sqlradius.pm
-FS/part_export/cyrus.pm
+FS/part_export/bsdshell.pm
 FS/part_export/cp.pm
+FS/part_export/cyrus.pm
+FS/part_export/infostreet.pm
 FS/part_export/shellcommands.pm
+FS/part_export/sqlradius.pm
+FS/part_export/textradius.pm
 FS/part_export/vpopmail.pm
 FS/part_pkg.pm
 FS/part_pop_local.pm
@@ -110,11 +112,13 @@ t/part_bill_event.t
 t/export_svc.t
 t/part_export.t
 t/part_export_option.t
-t/part_export-infostreet.t
-t/part_export-sqlradius.t
-t/part_export-cyrus.t
+t/part_export-bsdshell.t
 t/part_export-cp.t
+t/part_export-cyrus.t
+t/part_export-infostreet.t
 t/part_export-shellcommands.t
+t/part_export-sqlradius.t
+t/part_export-textradius.t
 t/part_export-vpopmail.t
 t/part_pkg.t
 t/part_pop_local.t
diff --git a/eg/export_template.pm b/eg/export_template.pm
index 1d441bda1..00942fd12 100644
--- a/eg/export_template.pm
+++ b/eg/export_template.pm
@@ -9,7 +9,7 @@ sub rebless { shift; }
 
 sub _export_insert {
   my($self, $svc_something) = (shift, shift);
-  $err_or_queue = $self->myexport_queue( $svc_acct->svcnum, 'insert',
+  $err_or_queue = $self->myexport_queue( $svc_something->svcnum, 'insert',
     $svc_something->username, $svc_something->_password );
   ref($err_or_queue) ? '' : $err_or_queue;
 }
@@ -26,7 +26,7 @@ sub _export_replace {
 
 sub _export_delete {
   my( $self, $svc_something ) = (shift, shift);
-  $err_or_queue = $self->myexport_queue( $svc_acct->svcnum,
+  $err_or_queue = $self->myexport_queue( $svc_something->svcnum,
     'delete', $svc_something->username );
   ref($err_or_queue) ? '' : $err_or_queue;
 }
-- 
cgit v1.2.1


From ac0647c2bacded54f476e7219b1dce05b8d3226c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 16 May 2002 14:28:35 +0000
Subject: ip address is added by radius_reply method already

---
 bin/svc_acct.export | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 261f499da..0bc370fc0 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.35 2002-03-20 21:31:49 ivan Exp $
+# $Id: svc_acct.export,v 1.36 2002-05-16 14:28:35 ivan Exp $
 #
 # Create and export password, radius and vpopmail password files:
 # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
@@ -379,12 +379,12 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) {
 #        qq(Password = "$rpassword"\n\t),
         join ",\n\t", map { qq($_ = "$radreply{$_}") } keys %radreply;
 
-      if ( $ip && $ip ne '0e0' ) {
-        #print USERS qq(,\n\tFramed-Address = "$ip"\n\n);
-        print USERS qq(,\n\tFramed-IP-Address = "$ip"\n\n);
-      } else {
+      #if ( $ip && $ip ne '0e0' ) {
+      #  #print USERS qq(,\n\tFramed-Address = "$ip"\n\n);
+      #  print USERS qq(,\n\tFramed-IP-Address = "$ip"\n\n);
+      #} else {
         print USERS qq(\n\n);
-      }
+      #}
 
     }
   
-- 
cgit v1.2.1


From 9554f2be960fdb511a4c9d8b519261614319f0aa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 16 May 2002 14:28:57 +0000
Subject: adding (stub) bsdshell and textradius exports

---
 FS/FS/part_export/bsdshell.pm   | 50 +++++++++++++++++++++++++++++++++++++++++
 FS/FS/part_export/textradius.pm | 50 +++++++++++++++++++++++++++++++++++++++++
 FS/t/part_export-bsdshell.t     |  5 +++++
 FS/t/part_export-textradius.t   |  5 +++++
 4 files changed, 110 insertions(+)
 create mode 100644 FS/FS/part_export/bsdshell.pm
 create mode 100644 FS/FS/part_export/textradius.pm
 create mode 100644 FS/t/part_export-bsdshell.t
 create mode 100644 FS/t/part_export-textradius.t

diff --git a/FS/FS/part_export/bsdshell.pm b/FS/FS/part_export/bsdshell.pm
new file mode 100644
index 000000000..4a890d051
--- /dev/null
+++ b/FS/FS/part_export/bsdshell.pm
@@ -0,0 +1,50 @@
+package FS::part_export::bsdshell;
+
+use vars qw(@ISA);
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my($self, $svc_acct) = (shift, shift);
+  $err_or_queue = $self->bsdshell_queue( $svc_acct->svcnum, 'insert',
+    $svc_acct->username, $svc_acct->_password );
+  ref($err_or_queue) ? '' : $err_or_queue;
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = (shift, shift, shift);
+  #return "can't change username with bsdshell"
+  #  if $old->username ne $new->username;
+  #return '' unless $old->_password ne $new->_password;
+  $err_or_queue = $self->bsdshell_queue( $new->svcnum,
+    'replace', $new->username, $new->_password );
+  ref($err_or_queue) ? '' : $err_or_queue;
+}
+
+sub _export_delete {
+  my( $self, $svc_acct ) = (shift, shift);
+  $err_or_queue = $self->bsdshell_queue( $svc_acct->svcnum,
+    'delete', $svc_acct->username );
+  ref($err_or_queue) ? '' : $err_or_queue;
+}
+
+#a good idea to queue anything that could fail or take any time
+sub bsdshell_queue {
+  my( $self, $svcnum, $method ) = (shift, shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => "FS::part_export::bsdshell::bsdshell_$method",
+  };
+  $queue->insert( @_ ) or $queue;
+}
+
+sub bsdshell_insert { #subroutine, not method
+}
+sub bsdshell_replace { #subroutine, not method
+}
+sub bsdshell_delete { #subroutine, not method
+}
+
diff --git a/FS/FS/part_export/textradius.pm b/FS/FS/part_export/textradius.pm
new file mode 100644
index 000000000..9a0468f6d
--- /dev/null
+++ b/FS/FS/part_export/textradius.pm
@@ -0,0 +1,50 @@
+package FS::part_export::textradius;
+
+use vars qw(@ISA);
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my($self, $svc_acct) = (shift, shift);
+  $err_or_queue = $self->textradius_queue( $svc_acct->svcnum, 'insert',
+    $svc_acct->username, $svc_acct->_password );
+  ref($err_or_queue) ? '' : $err_or_queue;
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = (shift, shift, shift);
+  #return "can't change username with textradius"
+  #  if $old->username ne $new->username;
+  #return '' unless $old->_password ne $new->_password;
+  $err_or_queue = $self->textradius_queue( $new->svcnum,
+    'replace', $new->username, $new->_password );
+  ref($err_or_queue) ? '' : $err_or_queue;
+}
+
+sub _export_delete {
+  my( $self, $svc_acct ) = (shift, shift);
+  $err_or_queue = $self->textradius_queue( $svc_acct->svcnum,
+    'delete', $svc_acct->username );
+  ref($err_or_queue) ? '' : $err_or_queue;
+}
+
+#a good idea to queue anything that could fail or take any time
+sub textradius_queue {
+  my( $self, $svcnum, $method ) = (shift, shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => "FS::part_export::textradius::textradius_$method",
+  };
+  $queue->insert( @_ ) or $queue;
+}
+
+sub textradius_insert { #subroutine, not method
+}
+sub textradius_replace { #subroutine, not method
+}
+sub textradius_delete { #subroutine, not method
+}
+
diff --git a/FS/t/part_export-bsdshell.t b/FS/t/part_export-bsdshell.t
new file mode 100644
index 000000000..eaf417a70
--- /dev/null
+++ b/FS/t/part_export-bsdshell.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::bsdshell;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_export-textradius.t b/FS/t/part_export-textradius.t
new file mode 100644
index 000000000..d8a48a0c8
--- /dev/null
+++ b/FS/t/part_export-textradius.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::textradius;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From 8203228392fc2f15f568dbdfdace2d70baad681c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 May 2002 03:47:06 +0000
Subject: freebsd `toor' user

---
 FS/FS/svc_acct.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 7ea4c10f8..17ae41583 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -212,6 +212,7 @@ sub insert {
     if $part_svc->part_svc_column('uid')->columnflag ne 'F'
       && qsearchs( 'svc_acct', { 'uid' => $self->uid } )
       && $self->username !~ /^(hyla)?fax$/
+      && $self->username !~ /^toor$/ #FreeBSD
     ;
 
   $error = $self->SUPER::insert;
-- 
cgit v1.2.1


From 88ad98c9bc5150a130c6df53132760152aa6a437 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 May 2002 13:51:50 +0000
Subject: tyop

---
 httemplate/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 26fa34dd1..355721821 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -52,7 +52,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>
       <li><a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a>
       <li><a href="http://search.cpan.org/search?dist=Storable">Storable</a>
-      <li><a href="http://search.cpan.org/search?dist=Apache-DBI">Apache::DBI</a> <i>(optional but recommended for better webinterface performance)</i>
+      <li><a href="http://search.cpan.org/search?dist=ApacheDBI">Apache::DBI</a> <i>(optional but recommended for better webinterface performance)</i>
     </ul>
 </ul>
 Install the Freeside distribution:
-- 
cgit v1.2.1


From a1e5529209c50a7b281e19c57f903f311e2adeef Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 18 May 2002 09:51:30 +0000
Subject: Mail::Internet 1.44

---
 FS/FS/cust_bill.pm         | 4 ++--
 FS/FS/cust_pay.pm          | 4 ++--
 FS/FS/svc_domain.pm        | 4 ++--
 fs_signup/fs_signup_server | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 449ab74b9..e2705fd83 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -8,7 +8,7 @@ use vars qw( $xaction $E_NoErr );
 use vars qw( $bop_processor $bop_login $bop_password $bop_action @bop_options );
 use vars qw( $invoice_lines @buf ); #yuck
 use Date::Format;
-use Mail::Internet;
+use Mail::Internet 1.44;
 use Mail::Header;
 use Text::Template;
 use FS::Record qw( qsearch qsearchs );
@@ -948,7 +948,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.34 2002-05-06 13:36:02 ivan Exp $
+$Id: cust_bill.pm,v 1.35 2002-05-18 09:51:30 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index ac60dc242..fcd902b1b 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw( @ISA $conf $unsuspendauto $smtpmachine $invoice_from );
 use Date::Format;
 use Mail::Header;
-use Mail::Internet;
+use Mail::Internet 1.44;
 use Business::CreditCard;
 use FS::UID qw( dbh );
 use FS::Record qw( dbh qsearch qsearchs dbh );
@@ -405,7 +405,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.19 2002-04-07 06:23:29 ivan Exp $
+$Id: cust_pay.pm,v 1.20 2002-05-18 09:51:30 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 97c5b3147..3dea7050f 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -6,7 +6,7 @@ use vars qw( @ISA $whois_hack $conf $smtpmachine
   $soarefresh $soaretry $qshellmachine $nossh_hack 
 );
 use Carp;
-use Mail::Internet;
+use Mail::Internet 1.44;
 use Mail::Header;
 use Date::Format;
 use Net::Whois 1.0;
@@ -407,7 +407,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.27 2002-05-10 07:45:29 ivan Exp $
+$Id: svc_domain.pm,v 1.28 2002-05-18 09:51:30 ivan Exp $
 
 =head1 BUGS
 
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 70045e63b..65d530e68 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -205,7 +205,7 @@ while (1) {
 
       #false laziness w/FS::cust_bill::send & FS::cust_pay::delete
       use Mail::Header;
-      use Mail::Internet;
+      use Mail::Internet 1.44;
       use Date::Format;
       my $from = $conf->config('invoice_from'); #??? as good as any
       $ENV{MAILADDRESS} = $from;
-- 
cgit v1.2.1


From 74a98a74f07bbcf05975fd444ed87baefae37e7d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 May 2002 11:02:47 +0000
Subject: *** empty log message ***

---
 bin/svc_domain.import | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/svc_domain.import b/bin/svc_domain.import
index 06dd12e08..8090b1e9b 100644
--- a/bin/svc_domain.import
+++ b/bin/svc_domain.import
@@ -1,6 +1,8 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_domain.import,v 1.5 2002-04-30 05:43:34 ivan Exp $
+# $Id: svc_domain.import,v 1.6 2002-05-20 11:02:47 ivan Exp $
+
+#need to manually put header in /usr/local/etc/freeside/export.<datasrc./bind/<machine>/named.conf.HEADER
 
 use strict;
 use vars qw( %d_part_svc );
-- 
cgit v1.2.1


From 9616707e5bfbad90aa63aaafffb6f47556f2adca Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 22 May 2002 02:09:32 +0000
Subject: 5.6-isms

---
 FS/FS/part_export/sqlradius.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index b31ec5cd3..3c781c043 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -13,7 +13,7 @@ sub _export_insert {
 
   foreach my $table (qw(reply check)) {
     my $method = "radius_$table";
-    my %attrib = $svc_acct->$method;
+    my %attrib = $svc_acct->$method();
     next unless keys %attrib;
     my $err_or_queue = $self->sqlradius_queue( $svc_acct->svcnum, 'insert',
       $table, $svc_acct->username, %attrib );
@@ -56,8 +56,8 @@ sub _export_replace {
 
   foreach my $table (qw(reply check)) {
     my $method = "radius_$table";
-    my %new = $new->$method;
-    my %old = $old->$method;
+    my %new = $new->$method();
+    my %old = $old->$method();
     if ( grep { !exists $old{$_} #new attributes
                 || $new{$_} ne $old{$_} #changed
               } keys %new
-- 
cgit v1.2.1


From bd5457be3b6422596cf43464decd5b696d886123 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 22 May 2002 10:53:14 +0000
Subject: bind export

---
 bin/bind.export | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 148 insertions(+)
 create mode 100755 bin/bind.export

diff --git a/bin/bind.export b/bin/bind.export
new file mode 100755
index 000000000..8d6f4e339
--- /dev/null
+++ b/bin/bind.export
@@ -0,0 +1,148 @@
+#!/usr/bin/perl -w
+
+use strict;
+use File::Path;
+use FS::UID qw(adminsuidsetup datasrc);
+use FS::Record qw(qsearch qsearchs);
+use FS::part_export;
+use FS::cust_pkg;
+use FS::cust_svc;
+use FS::svc_domain;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+my $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/bind";
+mkdir $spooldir unless -d $spooldir;
+
+my @exports = qsearch('part_export', { 'exporttype' => 'bind' } );
+my @sexports = qsearch('part_export', { 'exporttype' => 'bind_slave' } );
+
+foreach my $export ( @exports ) {
+
+  my $prefix = "$spooldir/". $export->machine;
+
+  #prevent old domain files from piling up
+  #rmtree "$prefix" or die "can't rmtree $prefix.db: $!";
+
+  mkdir $prefix unless -d $prefix;
+
+  open(NAMED_CONF,">$prefix/named.conf")
+    or die "can't open $prefix/named.conf: $!";
+
+  open(CONF_HEADER,"<$prefix/named.conf.HEADER"); #or die
+  while (<CONF_HEADER>) { print NAMED_CONF $_; }
+  close CONF_HEADER;
+
+  my $zonepath = $export->option('zonepath');
+  $zonepath =~ s/\/$//;
+
+  #false laziness with  freeside-sqlradius-reset 
+  my @svc_domain =
+    map { qsearchs('svc_domain', { 'svcnum' => $_->svcnum } ) }
+      map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+        grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+          $export->export_svc;
+
+  foreach my $svc_domain ( @svc_domain ) {
+    my $domain = $svc_domain->domain;
+    my @masters = qsearch('domain_record', {
+      'svcnum' => $svc_domain->svcnum,
+      'rectype' => '_mstr',
+    } );
+    if ( @masters ) {
+      my $masters = join('; ', map { $_->recdata } @masters );
+
+      print NAMED_CONF <<END;
+zone "$domain" {
+	type slave;
+	file "db.$domain";
+	masters { $masters; };
+};
+
+END
+
+    } else {
+
+      print NAMED_CONF <<END;
+zone "$domain" {
+	type master;
+	file "$zonepath/db.$domain";
+};
+
+END
+
+      open (DB_MASTER,">$prefix/db.$domain")
+        or die "can't open $prefix/db.$domain: $!";
+
+      my @domain_records =
+        qsearch('domain_record', { 'svcnum' => $svc_domain->svcnum } );
+      foreach my $domain_record (
+        sort { $b->rectype cmp $a->rectype } @domain_records
+      ) {
+        #if ( $domain_record->rectype eq 'SOA' ) {
+        #  print DB_MASTER join("\t", $domain_record-> reczone
+        #} else {
+          print DB_MASTER join("\t",
+            map { $domain_record->getfield($_) }
+              qw( reczone recaf rectype recdata )
+          ), "\n";
+        #}
+      }
+
+      close DB_MASTER;
+
+    }
+
+  }
+
+}
+close NAMED_CONF;
+
+foreach my $sexport ( @sexports ) { #false laziness with above
+
+  my $prefix = "$spooldir/". $sexport->machine;
+
+  #prevent old domain files from piling up
+  #rmtree "$prefix" or die "can't rmtree $prefix.db: $!";
+
+  mkdir $prefix unless -d $prefix;
+
+  open(NAMED_CONF,">$prefix/named.conf")
+    or die "can't open $prefix/named.conf: $!";
+
+  open(CONF_HEADER,"<$prefix/named.conf.HEADER"); #or die
+  while (<CONF_HEADER>) { print NAMED_CONF $_; }
+  close CONF_HEADER;
+
+  my $masters = $sexport->option('master');
+
+  #false laziness with  freeside-sqlradius-reset 
+  my @svc_domain =
+    map { qsearchs('svc_domain', { 'svcnum' => $_->svcnum } ) }
+      map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+        grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+          $sexport->export_svc;
+
+  foreach my $svc_domain ( @svc_domain ) {
+    my $domain = $svc_domain->domain;
+    print NAMED_CONF <<END;
+zone "$domain" {
+	type slave;
+	file "db.$domain";
+	masters { $masters; };
+};
+
+END
+
+  }
+
+}
+close NAMED_CONF;
+
+# -----
+
+sub usage {
+  die "Usage:\n  bind.export user\n"; 
+}
+
-- 
cgit v1.2.1


From e93c23ed5b4fc2fd81501b2371927e6cdfad7a65 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 22 May 2002 11:39:53 +0000
Subject: - remove some out of date documentation - die if an export class
 won't compile

---
 FS/FS/part_export.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 752bbb1d3..94b819d13 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -361,8 +361,7 @@ sub option {
 
 Reblesses the object into the FS::part_export::EXPORTTYPE class, where
 EXPORTTYPE is the object's I<exporttype> field.  There should be better docs
-on how to create new exports (and they should live in their own files and be
-autoloaded-on-demand), but until then, see L</NEW EXPORT CLASSES>.
+on how to create new exports, but until then, see L</NEW EXPORT CLASSES>.
 
 =cut
 
@@ -370,7 +369,7 @@ sub rebless {
   my $self = shift;
   my $exporttype = $self->exporttype;
   my $class = ref($self). "::$exporttype";
-  eval "use $class;";
+  eval "use $class;" or die $@;
   bless($self, $class);
 }
 
-- 
cgit v1.2.1


From a55f1c9e63b5428c55aa75d55ab4a280889be288 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 22 May 2002 12:17:06 +0000
Subject: move some code from FS::cust_pkg to FS::cust_svc, becomes the cancel
 method

---
 FS/FS/cust_pkg.pm | 28 +++---------------------
 FS/FS/cust_svc.pm | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 64 insertions(+), 28 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index a4256ea1f..8b65ac4bd 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -268,33 +268,11 @@ sub cancel {
   foreach my $cust_svc (
     qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum } )
   ) {
-    my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $cust_svc->svcpart } );
-
-    $part_svc->svcdb =~ /^([\w\-]+)$/ or do {
-      $dbh->rollback if $oldAutoCommit;
-      return "Illegal svcdb value in part_svc!";
-    };
-    my $svcdb = $1;
-    require "FS/$svcdb.pm";
-
-    my $svc = qsearchs( $svcdb, { 'svcnum' => $cust_svc->svcnum } );
-    if ($svc) {
-      $error = $svc->cancel;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "Error cancelling service: $error" 
-      }
-      $error = $svc->delete;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "Error deleting service: $error";
-      }
-    }
+    my $error = $cust_svc->cancel;
 
-    $error = $cust_svc->delete;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
-      return "Error deleting cust_svc: $error";
+      return "Error cancelling cust_svc: $error";
     }
 
   }
@@ -701,7 +679,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.21 2002-05-04 00:47:24 ivan Exp $
+$Id: cust_pkg.pm,v 1.22 2002-05-22 12:17:06 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index e6194b5b7..c7cc4b322 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -85,9 +85,67 @@ otherwise returns false.
 =item delete
 
 Deletes this service from the database.  If there is an error, returns the
-error, otherwise returns false.
+error, otherwise returns false.  Note that this only removes the cust_svc
+record - you should probably use the B<cancel> method instead.
 
-Called by the cancel method of the package (see L<FS::cust_pkg>).
+=item cancel
+
+Cancels the relevant service by calling the B<cancel> method of the associated
+FS::svc_XXX object (i.e. an FS::svc_acct object or FS::svc_domain object),
+deleting the FS::svc_XXX record and then deleting this record.
+
+If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub cancel {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE'; 
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $part_svc = $self->part_svc;
+
+  $part_svc->svcdb =~ /^([\w\-]+)$/ or do {
+    $dbh->rollback if $oldAutoCommit;
+    return "Illegal svcdb value in part_svc!";
+  };
+  my $svcdb = $1;
+  require "FS/$svcdb.pm";
+
+  my $svc = $self->svc_x;
+  if ($svc) {
+    my $error = $svc->cancel;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "Error canceling service: $error";
+    }
+    $error = $svc->delete;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "Error deleting service: $error";
+    }
+  }
+
+  my $error = $self->delete;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "Error deleting cust_svc: $error";
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  ''; #no errors
+
+}
 
 =item replace OLD_RECORD
 
@@ -286,7 +344,7 @@ sub seconds_since {
 
 =head1 VERSION
 
-$Id: cust_svc.pm,v 1.14 2002-04-20 02:06:38 ivan Exp $
+$Id: cust_svc.pm,v 1.15 2002-05-22 12:17:06 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 23186f0338ec248d930c85db08cc997bca42525b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 22 May 2002 18:44:01 +0000
Subject: bind export, editing zones, deleting unaudited domains, mmm

---
 FS/FS/domain_record.pm                    | 129 +++++++++++++++++++++++++++++-
 FS/FS/part_export.pm                      |  11 +--
 FS/FS/svc_domain.pm                       |  51 +++++++++++-
 bin/bind.export                           |  38 ++++++++-
 httemplate/edit/process/domain_record.cgi |  31 +++++++
 httemplate/misc/cancel-unaudited.cgi      |  11 ++-
 httemplate/misc/delete-domain_record.cgi  |  15 ++++
 httemplate/misc/delete-part_export.cgi    |   2 +-
 httemplate/view/svc_domain.cgi            |  31 +++++--
 9 files changed, 295 insertions(+), 24 deletions(-)
 create mode 100755 httemplate/edit/process/domain_record.cgi
 create mode 100755 httemplate/misc/delete-domain_record.cgi

diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 6f4dd0287..44e70ade1 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -3,7 +3,7 @@ package FS::domain_record;
 use strict;
 use vars qw( @ISA );
 #use FS::Record qw( qsearch qsearchs );
-use FS::Record qw( qsearchs );
+use FS::Record qw( qsearchs dbh );
 use FS::svc_domain;
 
 @ISA = qw(FS::Record);
@@ -71,12 +71,80 @@ otherwise returns false.
 
 =cut
 
+sub insert {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  unless ( $self->rectype =~ /^(SOA|_mstr)$/ ) {
+    my $error = $self->increment_serial;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+
+}
+
 =item delete
 
 Delete this record from the database.
 
 =cut
 
+sub delete {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::delete;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  unless ( $self->rectype =~ /^(SOA|_mstr)$/ ) {
+    my $error = $self->increment_serial;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+
+}
+
 =item replace OLD_RECORD
 
 Replaces the OLD_RECORD with this one in the database.  If there is an error,
@@ -84,6 +152,40 @@ returns the error, otherwise returns false.
 
 =cut
 
+sub replace {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::replace(@_);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  unless ( $self->rectype eq 'SOA' ) {
+    my $error = $self->increment_serial;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+
+}
+
 =item check
 
 Checks all fields to make sure this is a valid example.  If there is
@@ -158,11 +260,34 @@ sub check {
   ''; #no error
 }
 
+=item increment_serial
+
+=cut
+
+sub increment_serial {
+  my $self = shift;
+
+  my $soa = qsearchs('domain_record', {
+    svcnum  => $self->svcnum,
+    reczone => '@', #or full domain ?
+    recaf   => 'IN',
+    rectype => 'SOA', 
+  } ) or return "soa record not found; can't increment serial";
+
+  my $data = $soa->recdata;
+  $data =~ s/(\(\D*)(\d+)/$1.($2+1)/e; #well, it works.
+
+  my %hash = $soa->hash;
+  $hash{recdata} = $data;
+  my $new = new FS::domain_record \%hash;
+  $new->replace($soa);
+}
+
 =back
 
 =head1 VERSION
 
-$Id: domain_record.pm,v 1.7 2002-04-20 11:57:35 ivan Exp $
+$Id: domain_record.pm,v 1.8 2002-05-22 18:44:01 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 94b819d13..8a7ac8bf9 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -141,7 +141,7 @@ sub insert {
 
   '';
 
-};
+}
 
 =item delete
 
@@ -361,7 +361,8 @@ sub option {
 
 Reblesses the object into the FS::part_export::EXPORTTYPE class, where
 EXPORTTYPE is the object's I<exporttype> field.  There should be better docs
-on how to create new exports, but until then, see L</NEW EXPORT CLASSES>.
+on how to create new exports (and they should live in their own files and be
+autoloaded-on-demand), but until then, see L</NEW EXPORT CLASSES>.
 
 =cut
 
@@ -369,7 +370,7 @@ sub rebless {
   my $self = shift;
   my $exporttype = $self->exporttype;
   my $class = ref($self). "::$exporttype";
-  eval "use $class;" or die $@;
+  eval "use $class;";
   bless($self, $class);
 }
 
@@ -617,13 +618,13 @@ tie my %bind_slave_options, 'Tie::IxHash',
     'bind' => {
       'desc' =>'Batch export to BIND named',
       'options' => \%bind_options,
-      'notes' => 'bind export notes',
+      'notes' => 'bind export notes File::Rsync dependancy, run bind.export',
     },
 
     'bind_slave' => {
       'desc' =>'Batch export to slave BIND named',
       'options' => \%bind_slave_options,
-      'notes' => 'bind export notes (secondary munge)',
+      'notes' => 'bind export notes (secondary munge) File::Rsync dependancy, run bind.export',
     },
 
 
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 3dea7050f..a9a2fd0eb 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -255,10 +255,33 @@ sub delete {
     if defined( $FS::Record::dbdef->table('svc_acct_sm') )
        && qsearch('svc_acct_sm', { 'domsvc' => $self->svcnum } );
 
-  return "Can't delete a domain with (domain_record) zone entries!"
-    if qsearch('domain_record', { 'svcnum' => $self->svcnum } );
+  #return "Can't delete a domain with (domain_record) zone entries!"
+  #  if qsearch('domain_record', { 'svcnum' => $self->svcnum } );
 
-  $self->SUPER::delete;
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::delete;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  foreach my $domain_record ( reverse $self->domain_record ) {
+    my $error = $domain_record->delete;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
 }
 
 =item replace OLD_RECORD
@@ -369,6 +392,26 @@ sub check {
 
 }
 
+=item domain_record
+
+=cut
+
+sub domain_record {
+  my $self = shift;
+
+  my %order = (
+    SOA => 1,
+    NS => 2,
+    MX => 3,
+    CNAME => 4,
+    A => 5,
+  );
+
+  sort { $order{$a->rectype} <=> $order{$b->rectype} }
+    qsearch('domain_record', { svcnum => $self->svcnum } );
+
+}
+
 =item whois
 
 Returns the Net::Whois::Domain object (see L<Net::Whois>) for this domain, or
@@ -407,7 +450,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.28 2002-05-18 09:51:30 ivan Exp $
+$Id: svc_domain.pm,v 1.29 2002-05-22 18:44:01 ivan Exp $
 
 =head1 BUGS
 
diff --git a/bin/bind.export b/bin/bind.export
index 8d6f4e339..d49b3cf64 100755
--- a/bin/bind.export
+++ b/bin/bind.export
@@ -2,6 +2,8 @@
 
 use strict;
 use File::Path;
+use File::Rsync;
+use Net::SSH qw(ssh);
 use FS::UID qw(adminsuidsetup datasrc);
 use FS::Record qw(qsearch qsearchs);
 use FS::part_export;
@@ -18,9 +20,15 @@ mkdir $spooldir unless -d $spooldir;
 my @exports = qsearch('part_export', { 'exporttype' => 'bind' } );
 my @sexports = qsearch('part_export', { 'exporttype' => 'bind_slave' } );
 
+my $rsync = File::Rsync->new({
+  rsh     => 'ssh',
+#  dry_run => 1,
+});
+
 foreach my $export ( @exports ) {
 
-  my $prefix = "$spooldir/". $export->machine;
+  my $machine = $export->machine;
+  my $prefix = "$spooldir/$machine";
 
   #prevent old domain files from piling up
   #rmtree "$prefix" or die "can't rmtree $prefix.db: $!";
@@ -96,12 +104,30 @@ END
 
   }
 
+  $rsync->exec( {
+    src       => "$prefix/",
+    recursive => 1,
+    dest      => "root\@$machine:$zonepath/",
+    exclude   => [qw( *.import named.conf.HEADER named.conf )],
+  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
+ # warn $rsync->out;
+
+  $rsync->exec( {
+    src     => "$prefix/named.conf",
+    dest    => "root\@$machine:". $export->option('named_conf'),
+  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
+#  warn $rsync->out;
+
+  ssh("root\@$machine", 'ndc reload');
+
 }
+
 close NAMED_CONF;
 
 foreach my $sexport ( @sexports ) { #false laziness with above
 
-  my $prefix = "$spooldir/". $sexport->machine;
+  my $machine = $sexport->machine;
+  my $prefix = "$spooldir/$machine";
 
   #prevent old domain files from piling up
   #rmtree "$prefix" or die "can't rmtree $prefix.db: $!";
@@ -137,6 +163,14 @@ END
 
   }
 
+  $rsync->exec( {
+    src     => "$prefix/named.conf",
+    dest    => "root\@$machine:". $sexport->option('named_conf'),
+  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
+#  warn $rsync->out;
+
+  ssh("root\@$machine", 'ndc reload');
+
 }
 close NAMED_CONF;
 
diff --git a/httemplate/edit/process/domain_record.cgi b/httemplate/edit/process/domain_record.cgi
new file mode 100755
index 000000000..8fb0368f6
--- /dev/null
+++ b/httemplate/edit/process/domain_record.cgi
@@ -0,0 +1,31 @@
+<%
+
+my $recnum = $cgi->param('recnum');
+
+my $old = qsearchs('agent',{'recnum'=>$recnum}) if $recnum;
+
+my $new = new FS::domain_record ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('domain_record')
+} );
+
+my $error;
+if ( $recnum ) {
+  $error=$new->replace($old);
+} else {
+  $error=$new->insert;
+  $recnum=$new->getfield('recnum');
+}
+
+if ( $error ) {
+#  $cgi->param('error', $error);
+#  print $cgi->redirect(popurl(2). "agent.cgi?". $cgi->query_string );
+  #no edit screen to send them back to
+  eidiot($error);
+} else { 
+  my $svcnum = $new->svcnum;
+  print $cgi->redirect(popurl(3). "view/svc_domain.cgi?$svcnum");
+}
+
+%>
diff --git a/httemplate/misc/cancel-unaudited.cgi b/httemplate/misc/cancel-unaudited.cgi
index ecfaef29f..f1fb15341 100755
--- a/httemplate/misc/cancel-unaudited.cgi
+++ b/httemplate/misc/cancel-unaudited.cgi
@@ -7,15 +7,18 @@ my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
 my $svcnum = $1;
 
-my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
-die "Unknown svcnum!" unless $svc_acct;
+#my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
+#die "Unknown svcnum!" unless $svc_acct;
 
 my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+die "Unknown svcnum!" unless $cust_svc;
 &eidiot(qq!This account has already been audited.  Cancel the 
     <A HREF="!. popurl(2). qq!view/cust_pkg.cgi?! . $cust_svc->getfield('pkgnum') .
     qq!pkgnum"> package</A> instead.!) 
   if $cust_svc->pkgnum ne '' && $cust_svc->pkgnum ne '0';
 
+my $svc_x = $cust_svc->svc_x;
+
 local $SIG{HUP} = 'IGNORE';
 local $SIG{INT} = 'IGNORE';
 local $SIG{QUIT} = 'IGNORE';
@@ -24,8 +27,8 @@ local $SIG{TSTP} = 'IGNORE';
 
 local $FS::UID::AutoCommit = 0;
 
-my $error = $svc_acct->cancel;
-$error ||= $svc_acct->delete;
+my $error = $svc_x->cancel;
+$error ||= $svc_x->delete;
 $error ||= $cust_svc->delete;
 
 if ( $error ) {
diff --git a/httemplate/misc/delete-domain_record.cgi b/httemplate/misc/delete-domain_record.cgi
new file mode 100755
index 000000000..dcc2d5022
--- /dev/null
+++ b/httemplate/misc/delete-domain_record.cgi
@@ -0,0 +1,15 @@
+<%
+
+#untaint recnum
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ || die "Illegal recnum";
+my $recnum = $1;
+
+my $domain_record = qsearchs('domain_record',{'recnum'=>$recnum});
+
+my $error = $domain_record->delete;
+eidiot($error) if $error;
+
+print $cgi->redirect($p. "view/svc_domain.cgi?". $domain_record->svcnum);
+
+%>
diff --git a/httemplate/misc/delete-part_export.cgi b/httemplate/misc/delete-part_export.cgi
index 34ef06b96..7c4ab8b9d 100755
--- a/httemplate/misc/delete-part_export.cgi
+++ b/httemplate/misc/delete-part_export.cgi
@@ -1,6 +1,6 @@
 <%
 
-#untaint paynum
+#untaint exportnum
 my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/ || die "Illegal exportnum";
 my $exportnum = $1;
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index 61194a26d..28214f04e 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -35,7 +35,7 @@ print header('Domain View', menubar(
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
         "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )
-    : ( "Cancel this (unaudited) account" =>
+    : ( "Cancel this (unaudited) domain" =>
           "${p}misc/cancel-unaudited.cgi?$svcnum" )
   ),
   "Main menu" => $p,
@@ -46,17 +46,36 @@ print header('Domain View', menubar(
       qq!<BR>Catch all email <A HREF="${p}misc/catchall.cgi?$svcnum">(change)</A>:!,
       $email ? "<B>$email</B>." : "<I>(none)<I>",
       qq!<BR><BR><A HREF="http://www.geektools.com/cgi-bin/proxy.cgi?query=$domain;targetnic=auto">View whois information.</A>!,
-      '<BR><BR>', ntable("",2),
+      '<BR><BR>',
+      '<SCRIPT>function areyousure(href) {
+        if ( confirm("Remove this record?") == true )
+          window.location.href = href;
+        }
+        </SCRIPT>',
+      ntable("",2),
       '<tr><th>Zone</th><th>Type</th><th>Data</th></tr>',
 ;
 
-foreach my $domain_record ( qsearch('domain_record', { svcnum => $svcnum } ) ) {
+
+foreach my $domain_record ( $svc_domain->domain_record ) {
   print '<tr><td>'. $domain_record->reczone. '</td>'.
         '<td>'. $domain_record->recaf. ' '. $domain_record->rectype. '</td>'.
-        '<td>'. $domain_record->recdata. '</td></tr>';
+        '<td>'. $domain_record->recdata;
+  print qq! (<A HREF="javascript:areyousure('${p}misc/delete-domain_record.cgi?!
+        .$domain_record->recnum. qq!')">delete</A>)!
+    unless $domain_record->rectype eq 'SOA';
+  print '</td></tr>';
 }
-print '</table>'.
-      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
+print '</table><BR>'.
+      qq!<FORM METHOD="POST" ACTION="${p}edit/process/domain_record.cgi">!.
+      qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!.
+      '<INPUT TYPE="text" NAME="reczone"> '.
+      '<INPUT TYPE="hidden" NAME="recaf" VALUE="IN">IN '.
+      '<SELECT NAME="rectype">'.
+        join('', map qq!<OPTION VALUE="$_">$_</OPTION>!, qw(A NS CNAME MX) ).
+        '</SELECT>'.
+      ' <INPUT TYPE="text" NAME="recdata"> <INPUT TYPE="submit" VALUE="Add">'.
+      '<BR><BR>'. joblisting({'svcnum'=>$svcnum}, 1).
       '</BODY></HTML>';
 
 %>
-- 
cgit v1.2.1


From 4920ad2671d712afe23d731e25bc5b53955397b7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 23 May 2002 13:00:08 +0000
Subject: bind: allow adding slave domains too

---
 ANNOUCE.1.4.0                             |   4 +-
 FS/FS/domain_record.pm                    |  26 +++-
 bin/bind.import                           | 191 ++++++++++++++++++++++++++++++
 bin/svc_domain.import                     | 189 -----------------------------
 httemplate/edit/process/domain_record.cgi |   3 +
 httemplate/view/svc_domain.cgi            | 101 ++++++++++------
 6 files changed, 283 insertions(+), 231 deletions(-)
 create mode 100755 bin/bind.import
 delete mode 100644 bin/svc_domain.import

diff --git a/ANNOUCE.1.4.0 b/ANNOUCE.1.4.0
index a3d786508..a916076e9 100644
--- a/ANNOUCE.1.4.0
+++ b/ANNOUCE.1.4.0
@@ -105,8 +105,6 @@ be able to get everything else working...
 Critical Path provisioning has been updated and can now username changes
 and suspension/unsuspension.
 
--- 
-
 - New export code!
 - Name and company searches:
   - now case-insensative
@@ -128,3 +126,5 @@ schema diagram
 
 --
 
+complete bind import and export and edit of dns zone files
+
diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 44e70ade1..4ed713c77 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -1,7 +1,7 @@
 package FS::domain_record;
 
 use strict;
-use vars qw( @ISA );
+use vars qw( @ISA $noserial_hack );
 #use FS::Record qw( qsearch qsearchs );
 use FS::Record qw( qsearchs dbh );
 use FS::svc_domain;
@@ -85,6 +85,16 @@ sub insert {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
+  if ( $self->rectype eq '_mstr' ) { #delete all other records
+    foreach my $domain_record ( reverse $self->svc_domain->domain_record ) {
+      my $error = $domain_record->delete;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
+    }
+  }
+
   my $error = $self->SUPER::insert;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
@@ -265,6 +275,7 @@ sub check {
 =cut
 
 sub increment_serial {
+  return '' if $noserial_hack;
   my $self = shift;
 
   my $soa = qsearchs('domain_record', {
@@ -283,11 +294,22 @@ sub increment_serial {
   $new->replace($soa);
 }
 
+=item svc_domain
+
+Returns the domain (see L<FS::svc_domain) for this record.
+
+=cut
+
+sub svc_domain {
+  my $self = shift;
+  qsearchs('svc_domain', { svcnum => $self->svcnum } );
+}
+
 =back
 
 =head1 VERSION
 
-$Id: domain_record.pm,v 1.8 2002-05-22 18:44:01 ivan Exp $
+$Id: domain_record.pm,v 1.9 2002-05-23 13:00:08 ivan Exp $
 
 =head1 BUGS
 
diff --git a/bin/bind.import b/bin/bind.import
new file mode 100755
index 000000000..5c4149501
--- /dev/null
+++ b/bin/bind.import
@@ -0,0 +1,191 @@
+#!/usr/bin/perl -w
+#
+# $Id: bind.import,v 1.1 2002-05-23 13:00:08 ivan Exp $
+
+#need to manually put header in /usr/local/etc/freeside/export.<datasrc./bind/<machine>/named.conf.HEADER
+
+use strict;
+use vars qw( %d_part_svc );
+use Term::Query qw(query);
+#use BIND::Conf_Parser;
+#use DNS::ZoneParse;
+
+#use Net::SCP qw(iscp);
+use Net::SCP qw(scp);
+use FS::UID qw(adminsuidsetup datasrc);
+use FS::Record qw(qsearch); #qsearchs);
+#use FS::svc_acct_sm;
+use FS::svc_domain;
+use FS::domain_record;
+#use FS::svc_acct;
+#use FS::part_svc;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+$FS::domain_record::noserial_hack = 1;
+
+use vars qw($spooldir);
+$spooldir = "/usr/local/etc/freeside/export.". datasrc. "/bind";
+mkdir $spooldir unless -d $spooldir;
+
+%d_part_svc =
+  map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_domain'});
+
+print "\n\n",
+      ( join "\n", map "$_: ".$d_part_svc{$_}->svc, sort keys %d_part_svc ),
+      "\n\n";
+use vars qw($domain_svcpart);
+$^W=0; #Term::Query isn't -w-safe
+$domain_svcpart =
+  query "Enter part number for domains: ", 'irk', [ keys %d_part_svc ];
+$^W=1;
+
+print "\n\n", <<END;
+Enter the location and name of your primary named.conf file, for example
+"ns.isp.com:/var/named/named.conf"
+END
+my($named_conf)=&getvalue(":");
+  
+use vars qw($named_machine $prefix);
+$named_machine = (split(/:/, $named_conf))[0];
+$prefix = "$spooldir/$named_machine";
+mkdir $prefix unless -d $prefix;
+
+#iscp("root\@$named_conf","$prefix/named.conf.import");
+scp("root\@$named_conf","$prefix/named.conf.import");
+
+
+sub getvalue {
+  my $prompt = shift;
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query $prompt, '';
+  $^W=1;
+  $return;
+}
+
+print "\n\n";
+
+##
+
+$FS::svc_domain::whois_hack=1;
+
+my $p = Parser->new;
+$p->parse_file("$prefix/named.conf.import");
+
+print "\nBIND import completed.\n";
+
+##
+
+sub usage {
+  die "Usage:\n\n  svc_domain.import user\n";
+}
+
+########
+BEGIN {
+  
+  package Parser;
+  use BIND::Conf_Parser;
+  use vars qw(@ISA $named_dir);
+  @ISA = qw(BIND::Conf_Parser);
+  
+  sub handle_option {
+    my($self, $option, $argument) = @_;
+    return unless $option eq "directory";
+    $named_dir = $argument;
+  }
+  
+  sub handle_zone {
+    my($self, $name, $class, $type, $options) = @_;
+    return unless $class eq 'in';
+    return if grep { $name eq $_ }
+      ( qw( . localhost 127.in-addr.arpa 0.in-addr.arpa 255.in-addr.arpa ) );
+
+    my $domain = new FS::svc_domain( {
+      svcpart => $main::domain_svcpart,
+      domain  => $name,
+      action  => 'N',
+    } );
+    my $error = $domain->insert;
+    die $error if $error;
+
+    if ( $type eq 'slave' ) {
+
+      #use Data::Dumper;
+      #print Dumper($options);
+      #exit;
+
+      foreach my $master ( @{ $options->{masters} } ) {
+        my $domain_record = new FS::domain_record( {
+          'svcnum'  => $domain->svcnum,
+          'reczone' => '@',
+          'recaf'   => 'IN',
+          'rectype' => '_mstr',
+          'recdata' => $master,
+        } );
+        my $error = $domain_record->insert;
+        die $error if $error;
+      }
+
+    } elsif ( $type eq 'master' ) {
+
+      my $file = $options->{file};
+  
+      use File::Basename;
+      my $basefile = basename($file);
+      my $sourcefile = $file;
+      $sourcefile = "$named_dir/$sourcefile" unless $file =~ /^\//;
+      use Net::SCP qw(iscp scp);
+      scp("root\@$main::named_machine:$sourcefile",
+          "$main::prefix/$basefile.import");
+    
+      use DNS::ZoneParse;
+      my $zone = DNS::ZoneParse->new("$main::prefix/$basefile.import");
+    
+      my $dump = $zone->Dump;
+  
+      #use Data::Dumper;
+      #print "$name: ". Dumper($dump);
+      #exit;
+    
+      foreach my $rectype ( keys %$dump ) {
+        if ( $rectype =~ /^SOA$/i ) {
+          my $rec = $dump->{$rectype};
+          my $domain_record = new FS::domain_record( {
+            'svcnum'  => $domain->svcnum,
+            'reczone' => $rec->{origin},
+            'recaf'   => 'IN',
+            'rectype' => $rectype,
+            'recdata' =>
+              $rec->{primary}. ' '. $rec->{email}. ' ( '.
+             join(' ', map $rec->{$_},
+                           qw( serial refresh retry expire minimumTTL ) ).
+             ' )',
+          } );
+          my $error = $domain_record->insert;
+          die $error if $error;
+       } else {
+          #die $dump->{$rectype};
+          foreach my $rec ( @{ $dump->{$rectype} } ) {
+            my $domain_record = new FS::domain_record( {
+              'svcnum'  => $domain->svcnum,
+              'reczone' => $rec->{name},
+              'recaf'   => $rec->{class},
+              'rectype' => $rectype,
+              'recdata' => ( $rectype =~ /^MX$/i
+                               ? $rec->{priority}. ' '. $rec->{host}
+                               : $rec->{host}                      ),
+            } );
+            my $error = $domain_record->insert;
+            die $error if $error;
+          }
+        }
+      }
+
+    }
+    
+  }
+
+}
+#########
+
diff --git a/bin/svc_domain.import b/bin/svc_domain.import
deleted file mode 100644
index 8090b1e9b..000000000
--- a/bin/svc_domain.import
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/usr/bin/perl -w
-#
-# $Id: svc_domain.import,v 1.6 2002-05-20 11:02:47 ivan Exp $
-
-#need to manually put header in /usr/local/etc/freeside/export.<datasrc./bind/<machine>/named.conf.HEADER
-
-use strict;
-use vars qw( %d_part_svc );
-use Term::Query qw(query);
-#use BIND::Conf_Parser;
-#use DNS::ZoneParse;
-
-#use Net::SCP qw(iscp);
-use Net::SCP qw(scp);
-use FS::UID qw(adminsuidsetup datasrc);
-use FS::Record qw(qsearch); #qsearchs);
-#use FS::svc_acct_sm;
-use FS::svc_domain;
-use FS::domain_record;
-#use FS::svc_acct;
-#use FS::part_svc;
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-use vars qw($spooldir);
-$spooldir = "/usr/local/etc/freeside/export.". datasrc. "/bind";
-mkdir $spooldir unless -d $spooldir;
-
-%d_part_svc =
-  map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_domain'});
-
-print "\n\n",
-      ( join "\n", map "$_: ".$d_part_svc{$_}->svc, sort keys %d_part_svc ),
-      "\n\n";
-use vars qw($domain_svcpart);
-$^W=0; #Term::Query isn't -w-safe
-$domain_svcpart =
-  query "Enter part number for domains: ", 'irk', [ keys %d_part_svc ];
-$^W=1;
-
-print "\n\n", <<END;
-Enter the location and name of your primary named.conf file, for example
-"ns.isp.com:/var/named/named.conf"
-END
-my($named_conf)=&getvalue(":");
-  
-use vars qw($named_machine $prefix);
-$named_machine = (split(/:/, $named_conf))[0];
-$prefix = "$spooldir/$named_machine";
-mkdir $prefix unless -d $prefix;
-
-#iscp("root\@$named_conf","$prefix/named.conf.import");
-scp("root\@$named_conf","$prefix/named.conf.import");
-
-
-sub getvalue {
-  my $prompt = shift;
-  $^W=0; # Term::Query isn't -w-safe
-  my $return = query $prompt, '';
-  $^W=1;
-  $return;
-}
-
-print "\n\n";
-
-##
-
-$FS::svc_domain::whois_hack=1;
-
-my $p = Parser->new;
-$p->parse_file("$prefix/named.conf.import");
-
-print "\nBIND import completed.\n";
-
-##
-
-sub usage {
-  die "Usage:\n\n  svc_domain.import user\n";
-}
-
-########
-BEGIN {
-  
-  package Parser;
-  use BIND::Conf_Parser;
-  use vars qw(@ISA $named_dir);
-  @ISA = qw(BIND::Conf_Parser);
-  
-  sub handle_option {
-    my($self, $option, $argument) = @_;
-    return unless $option eq "directory";
-    $named_dir = $argument;
-  }
-  
-  sub handle_zone {
-    my($self, $name, $class, $type, $options) = @_;
-    return unless $class eq 'in';
-    return if grep { $name eq $_ }
-      ( qw( . localhost 127.in-addr.arpa 0.in-addr.arpa 255.in-addr.arpa ) );
-
-    my $domain = new FS::svc_domain( {
-      svcpart => $main::domain_svcpart,
-      domain  => $name,
-      action  => 'N',
-    } );
-    my $error = $domain->insert;
-    die $error if $error;
-
-    if ( $type eq 'slave' ) {
-
-      #use Data::Dumper;
-      #print Dumper($options);
-      #exit;
-
-      foreach my $master ( @{ $options->{masters} } ) {
-        my $domain_record = new FS::domain_record( {
-          'svcnum'  => $domain->svcnum,
-          'reczone' => '@',
-          'recaf'   => 'IN',
-          'rectype' => '_mstr',
-          'recdata' => $master,
-        } );
-        my $error = $domain_record->insert;
-        die $error if $error;
-      }
-
-    } elsif ( $type eq 'master' ) {
-
-      my $file = $options->{file};
-  
-      use File::Basename;
-      my $basefile = basename($file);
-      my $sourcefile = $file;
-      $sourcefile = "$named_dir/$sourcefile" unless $file =~ /^\//;
-      use Net::SCP qw(iscp scp);
-      scp("root\@$main::named_machine:$sourcefile",
-          "$main::prefix/$basefile.import");
-    
-      use DNS::ZoneParse;
-      my $zone = DNS::ZoneParse->new("$main::prefix/$basefile.import");
-    
-      my $dump = $zone->Dump;
-  
-      #use Data::Dumper;
-      #print "$name: ". Dumper($dump);
-      #exit;
-    
-      foreach my $rectype ( keys %$dump ) {
-        if ( $rectype =~ /^SOA$/i ) {
-          my $rec = $dump->{$rectype};
-          my $domain_record = new FS::domain_record( {
-            'svcnum'  => $domain->svcnum,
-            'reczone' => $rec->{origin},
-            'recaf'   => 'IN',
-            'rectype' => $rectype,
-            'recdata' =>
-              $rec->{primary}. ' '. $rec->{email}. ' ( '.
-             join(' ', map $rec->{$_},
-                           qw( serial refresh retry expire minimumTTL ) ).
-             ' )',
-          } );
-          my $error = $domain_record->insert;
-          die $error if $error;
-       } else {
-          #die $dump->{$rectype};
-          foreach my $rec ( @{ $dump->{$rectype} } ) {
-            my $domain_record = new FS::domain_record( {
-              'svcnum'  => $domain->svcnum,
-              'reczone' => $rec->{name},
-              'recaf'   => $rec->{class},
-              'rectype' => $rectype,
-              'recdata' => ( $rectype =~ /^MX$/i
-                               ? $rec->{priority}. ' '. $rec->{host}
-                               : $rec->{host}                      ),
-            } );
-            my $error = $domain_record->insert;
-            die $error if $error;
-          }
-        }
-      }
-
-    }
-    
-  }
-
-}
-#########
-
diff --git a/httemplate/edit/process/domain_record.cgi b/httemplate/edit/process/domain_record.cgi
index 8fb0368f6..b8c3f62a1 100755
--- a/httemplate/edit/process/domain_record.cgi
+++ b/httemplate/edit/process/domain_record.cgi
@@ -22,6 +22,9 @@ if ( $error ) {
 #  $cgi->param('error', $error);
 #  print $cgi->redirect(popurl(2). "agent.cgi?". $cgi->query_string );
   #no edit screen to send them back to
+%>
+<!-- mason kludge -->
+<%
   eidiot($error);
 } else { 
   my $svcnum = $new->svcnum;
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index 28214f04e..b70ac8f90 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -30,7 +30,9 @@ if ($svc_domain->catchall) {
 
 my $domain = $svc_domain->domain;
 
-print header('Domain View', menubar(
+%>
+
+<%= header('Domain View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
         "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
@@ -39,43 +41,66 @@ print header('Domain View', menubar(
           "${p}misc/cancel-unaudited.cgi?$svcnum" )
   ),
   "Main menu" => $p,
-)),
-      "Service #$svcnum",
-      "<BR>Service: <B>", $part_svc->svc, "</B>",
-      "<BR>Domain name: <B>$domain</B>.",
-      qq!<BR>Catch all email <A HREF="${p}misc/catchall.cgi?$svcnum">(change)</A>:!,
-      $email ? "<B>$email</B>." : "<I>(none)<I>",
-      qq!<BR><BR><A HREF="http://www.geektools.com/cgi-bin/proxy.cgi?query=$domain;targetnic=auto">View whois information.</A>!,
-      '<BR><BR>',
-      '<SCRIPT>function areyousure(href) {
-        if ( confirm("Remove this record?") == true )
-          window.location.href = href;
-        }
-        </SCRIPT>',
-      ntable("",2),
-      '<tr><th>Zone</th><th>Type</th><th>Data</th></tr>',
-;
+)) %>
 
+Service #<%= $svcnum %>
+<BR>Service: <B><%= $part_svc->svc %></B>
+<BR>Domain name: <B><%= $domain %></B>
+<BR>Catch all email <A HREF="${p}misc/catchall.cgi?<%= $svcnum %>">(change)</A>:
+<%= $email ? "<B>$email</B>" : "<I>(none)<I>" %>
+<BR><BR><A HREF="http://www.geektools.com/cgi-bin/proxy.cgi?query=<%=$domain%>;targetnic=auto">View whois information.</A>
+<BR><BR>
+<SCRIPT>
+  function areyousure(href) {
+    if ( confirm("Remove this record?") == true )
+      window.location.href = href;
+  }
+</SCRIPT>
 
-foreach my $domain_record ( $svc_domain->domain_record ) {
-  print '<tr><td>'. $domain_record->reczone. '</td>'.
-        '<td>'. $domain_record->recaf. ' '. $domain_record->rectype. '</td>'.
-        '<td>'. $domain_record->recdata;
-  print qq! (<A HREF="javascript:areyousure('${p}misc/delete-domain_record.cgi?!
-        .$domain_record->recnum. qq!')">delete</A>)!
-    unless $domain_record->rectype eq 'SOA';
-  print '</td></tr>';
-}
-print '</table><BR>'.
-      qq!<FORM METHOD="POST" ACTION="${p}edit/process/domain_record.cgi">!.
-      qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!.
-      '<INPUT TYPE="text" NAME="reczone"> '.
-      '<INPUT TYPE="hidden" NAME="recaf" VALUE="IN">IN '.
-      '<SELECT NAME="rectype">'.
-        join('', map qq!<OPTION VALUE="$_">$_</OPTION>!, qw(A NS CNAME MX) ).
-        '</SELECT>'.
-      ' <INPUT TYPE="text" NAME="recdata"> <INPUT TYPE="submit" VALUE="Add">'.
-      '<BR><BR>'. joblisting({'svcnum'=>$svcnum}, 1).
-      '</BODY></HTML>';
+<% my @records; if ( @records = $svc_domain->domain_record ) { %>
+  <%= ntable("",2) %>
+  <tr><th>Zone</th><th>Type</th><th>Data</th></tr>
 
-%>
+  <% foreach my $domain_record ( @records ) {
+       my $type = $domain_record->rectype eq '_mstr'
+                    ? "(slave)"
+                    : $domain_record->recaf. ' '. $domain_record->rectype;
+  %>
+
+    <tr><td><%= $domain_record->reczone %></td>
+    <td><%= $type %></td>
+    <td><%= $domain_record->recdata %>
+
+    <% unless ( $domain_record->rectype eq 'SOA' ) { %>
+      (<A HREF="javascript:areyousure('<%=$p%>misc/delete-domain_record.cgi?<%=$domain_record->recnum%>')">delete</A>)
+    <% } %>
+    </td></tr>
+  <% } %>
+  </table>
+<% } %>
+
+<BR>
+<FORM METHOD="POST" ACTION="<%=$p%>edit/process/domain_record.cgi">
+<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$svcnum%>">
+<INPUT TYPE="text" NAME="reczone"> 
+<INPUT TYPE="hidden" NAME="recaf" VALUE="IN"> IN 
+ <SELECT NAME="rectype">
+<% foreach (qw( A NS CNAME MX) ) { %>
+  <OPTION VALUE="<%=$_%>"><%=$_%></OPTION>
+<% } %>
+ </SELECT>
+<INPUT TYPE="text" NAME="recdata"> <INPUT TYPE="submit" VALUE="Add record">
+</FORM><BR><BR>or<BR><BR>
+<FORM METHOD="POST" ACTION="<%=$p%>edit/process/domain_record.cgi">
+<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$svcnum%>">
+
+<% if ( @records ) { %> Delete all records and <% } %>
+Slave from nameserver IP 
+<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$svcnum%>">
+<INPUT TYPE="hidden" NAME="reczone" VALUE="@"> 
+<INPUT TYPE="hidden" NAME="recaf" VALUE="IN">
+<INPUT TYPE="hidden" NAME="rectype" VALUE="_mstr">
+<INPUT TYPE="text" NAME="recdata"> <INPUT TYPE="submit" VALUE="Slave domain">
+</FORM>
+<BR><BR><%= joblisting({'svcnum'=>$svcnum}, 1) %>
+</BODY></HTML>
-- 
cgit v1.2.1


From e1be5ef574d0aa9fad3fda9828f3853d2444e9f7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 27 May 2002 06:53:06 +0000
Subject: fix javascript bug reported by baloo@gimpgirl.com, thanks

---
 httemplate/edit/cust_bill_pay.cgi | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
index d90659724..8cdf4509a 100755
--- a/httemplate/edit/cust_bill_pay.cgi
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -59,14 +59,13 @@ foreach my $cust_bill ( @cust_bill ) {
 END
 }
 
-#print <<END;
 #  if ( cust_bill == "Refund" ) {
 #    what.form.amount.value = "$credited";
 #  }
-#}
-#</SCRIPT>
-#END
-print "</SCRIPT>\n";
+print <<END;
+}
+</SCRIPT>
+END
 
 print qq!<BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)">!,
       '<OPTION VALUE="">';
-- 
cgit v1.2.1


From ee1a01a4d001bf993b9cce54e59f119db20e49f0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 28 May 2002 07:55:20 +0000
Subject: point people at DBI/DBD documentation for information on data
 sources.  *sigh*

---
 FS/FS/part_export.pm               | 4 ++--
 FS/FS/part_export/shellcommands.pm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 8a7ac8bf9..89625420e 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -496,7 +496,7 @@ tie my %shellcommands_options, 'Tie::IxHash',
 ;
 
 tie my %sqlradius_options, 'Tie::IxHash',
-  'datasrc'  => { label=>'DBI data source' },
+  'datasrc'  => { label=>'DBI data source ' },
   'username' => { label=>'Database username' },
   'password' => { label=>'Database password' },
 ;
@@ -581,7 +581,7 @@ tie my %bind_slave_options, 'Tie::IxHash',
       'desc' => 'Real-time export to SQL-backed RADIUS (ICRADIUS, FreeRADIUS)',
       'options' => \%sqlradius_options,
       'nodomain' => 'Y',
-      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  Use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete and repopulate the tables from the Freeside database.',
+      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  Use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.23/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.',
     },
 
     'cyrus' => {
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index ccde72a68..7a87bd3e0 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -22,7 +22,7 @@ sub _export_command {
   my $command = $self->option($action);
   no strict 'refs';
   ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
-  $self->shellcommands_queue(
+  $self->shellcommands_queue( $svc_acct->svcnum,
     $self->options('user')||'root'. "\@". $self->options('machine'),
     eval(qq("$command"))
   );
@@ -34,7 +34,7 @@ sub _export_replace {
   no strict 'refs';
   ${"old_$_"} = $old->getfield($_) foreach $old->fields;
   ${"new_$_"} = $new->getfield($_) foreach $new->fields;
-  $self->shellcommands_queue(
+  $self->shellcommands_queue( $new->svcnum,
     $self->options('user')||'root'. "\@". $self->options('machine'),
     eval(qq("$command"))
   );
-- 
cgit v1.2.1


From 97646ed2e0ad524f959f9dc2632fa2fea25f5010 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 28 May 2002 21:22:15 +0000
Subject: better error message for "Illegal password"

---
 FS/FS/svc_acct.pm   | 4 +++-
 bin/populate-msgcat | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 17ae41583..a43f97ab5 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -676,7 +676,9 @@ sub check {
     $recref->{_password} = '!!';
   } else {
     #return "Illegal password";
-    return gettext('illegal_password'). ": ". $recref->{_password};
+    return gettext('illegal_password'). "$passwordmin-$passwordmax".
+           FS::Msgcat::_gettext('illegal_password_characters').
+           ": ". $recref->{_password};
   }
 
   ''; #no error
diff --git a/bin/populate-msgcat b/bin/populate-msgcat
index b50fc7ec3..166f83720 100755
--- a/bin/populate-msgcat
+++ b/bin/populate-msgcat
@@ -76,7 +76,11 @@ sub messages {
     },
 
     'illegal_password' => {
-      'en_US' => 'Illegal password',
+      'en_US' => 'Illegal password (',
+    },
+
+    'illeggal_password_characters' => {
+      'en_US' => ' characters)',
     },
 
     'username_in_use' => {
-- 
cgit v1.2.1


From b4d172efa2225ef5070c1a6f168eb98fce8c5c62 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 29 May 2002 04:40:31 +0000
Subject: add fs_selfservice

---
 fs_selfservice/FS-SelfService/Changes        |   6 +
 fs_selfservice/FS-SelfService/MANIFEST       |   6 +
 fs_selfservice/FS-SelfService/Makefile.PL    |  15 ++
 fs_selfservice/FS-SelfService/SelfService.pm |  66 +++++++++
 fs_selfservice/FS-SelfService/test.pl        |  17 +++
 fs_selfservice/freeside-selfservice-server   | 198 +++++++++++++++++++++++++++
 6 files changed, 308 insertions(+)
 create mode 100644 fs_selfservice/FS-SelfService/Changes
 create mode 100644 fs_selfservice/FS-SelfService/MANIFEST
 create mode 100644 fs_selfservice/FS-SelfService/Makefile.PL
 create mode 100644 fs_selfservice/FS-SelfService/SelfService.pm
 create mode 100644 fs_selfservice/FS-SelfService/test.pl
 create mode 100644 fs_selfservice/freeside-selfservice-server

diff --git a/fs_selfservice/FS-SelfService/Changes b/fs_selfservice/FS-SelfService/Changes
new file mode 100644
index 000000000..b9e26b7dc
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/Changes
@@ -0,0 +1,6 @@
+Revision history for Perl extension FS::SelfService.
+
+0.01  Tue May 28 16:49:41 2002
+	- original version; created by h2xs 1.21 with options
+		-A -X -n FS::SelfService
+
diff --git a/fs_selfservice/FS-SelfService/MANIFEST b/fs_selfservice/FS-SelfService/MANIFEST
new file mode 100644
index 000000000..3c490e7dd
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/MANIFEST
@@ -0,0 +1,6 @@
+Changes
+Makefile.PL
+MANIFEST
+README
+SelfService.pm
+test.pl
diff --git a/fs_selfservice/FS-SelfService/Makefile.PL b/fs_selfservice/FS-SelfService/Makefile.PL
new file mode 100644
index 000000000..da0a0aa24
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/Makefile.PL
@@ -0,0 +1,15 @@
+use ExtUtils::MakeMaker;
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written.
+WriteMakefile(
+    'NAME'		=> 'FS::SelfService',
+    'VERSION_FROM'	=> 'SelfService.pm', # finds $VERSION
+    'EXE_FILES'         => [ 'freeside-selfservice-clientd' ],
+    'INSTALLSCRIPT'     => '/usr/local/sbin',
+    'INSTALLSITEBIN'    => '/usr/local/sbin',
+    'PERM_RWX'          => '750',
+    'PREREQ_PM'		=> {}, # e.g., Module::Name => 1.1
+    ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
+      (ABSTRACT_FROM => 'SelfService.pm', # retrieve abstract from module
+       AUTHOR     => 'Ivan Kohler <ivan-freeside-selfservice@420.am>') : ()),
+);
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
new file mode 100644
index 000000000..75e550a2d
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -0,0 +1,66 @@
+package FS::SelfService;
+
+use 5.006;
+use strict;
+use warnings;
+
+require Exporter;
+
+our @ISA = qw(Exporter);
+
+# Items to export into callers namespace by default. Note: do not export
+# names by default without a very good reason. Use EXPORT_OK instead.
+# Do not simply export all your public functions/methods/constants.
+
+# This allows declaration	use FS::SelfService ':all';
+# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
+# will save memory.
+our %EXPORT_TAGS = ( 'all' => [ qw(
+	
+) ] );
+
+our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+
+our @EXPORT = qw(
+	
+);
+our $VERSION = '0.01';
+
+
+# Preloaded methods go here.
+
+1;
+__END__
+# Below is stub documentation for your module. You better edit it!
+
+=head1 NAME
+
+FS::SelfService - Perl extension for blah blah blah
+
+=head1 SYNOPSIS
+
+  use FS::SelfService;
+  blah blah blah
+
+=head1 DESCRIPTION
+
+Stub documentation for FS::SelfService, created by h2xs. It looks like the
+author of the extension was negligent enough to leave the stub
+unedited.
+
+Blah blah blah.
+
+=head2 EXPORT
+
+None by default.
+
+
+=head1 AUTHOR
+
+A. U. Thor, E<lt>a.u.thor@a.galaxy.far.far.awayE<gt>
+
+=head1 SEE ALSO
+
+L<perl>.
+
+=cut
diff --git a/fs_selfservice/FS-SelfService/test.pl b/fs_selfservice/FS-SelfService/test.pl
new file mode 100644
index 000000000..7468ea471
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/test.pl
@@ -0,0 +1,17 @@
+# Before `make install' is performed this script should be runnable with
+# `make test'. After `make install' it should work as `perl test.pl'
+
+#########################
+
+# change 'tests => 1' to 'tests => last_test_to_print';
+
+use Test;
+BEGIN { plan tests => 1 };
+use FS::SelfService;
+ok(1); # If we made it this far, we're ok.
+
+#########################
+
+# Insert your test code below, the Test module is use()ed here so read
+# its man page ( perldoc Test ) for help writing this test script.
+
diff --git a/fs_selfservice/freeside-selfservice-server b/fs_selfservice/freeside-selfservice-server
new file mode 100644
index 000000000..6146d3752
--- /dev/null
+++ b/fs_selfservice/freeside-selfservice-server
@@ -0,0 +1,198 @@
+#!/usr/bin/perl -w
+#
+# freeside-selfservice-server
+
+# alas, much false laziness with freeside-queued and fs_signup_server.  at
+# least it is slated to replace fs_{signup,passwd,mailadmin}_server
+# should probably generalize the version in here, or better yet use
+# Proc::Daemon or somesuch
+
+use strict;
+use vars qw( $kids $max_kids $shutdown $log_file );
+use vars qw($ssh_pid);
+use Fcntl qw(:flock);
+use POSIX qw(setsid);
+use IO::Handle;
+use Storable qw(nstore_fd fd_retrieve);
+use Net::SSH qw(sshopen2);
+use FS::UID qw(adminsuidsetup);
+
+#use Tie::RefHash;
+#use FS::Conf;
+#use FS::Record qw( qsearch qsearchs );
+#use FS::cust_main_county;
+#use FS::cust_main;
+#use FS::Msgcat qw(gettext);
+
+$shutdown = 0;
+$max_kids = '10'; #?
+$kids = 0;
+
+my $user = shift or die &usage;
+my $machine = shift or die &usage;
+my $pid_file = "/var/run/freeside-selfservice-server.$user.pid";
+#my $pid_file = "/var/run/freeside-selfservice-server.$user.pid"; $FS::UID::datasrc not posible, but should include machine name at least, hmm
+
+&init($user);
+
+my $clientd = "/usr/local/sbin/freeside-selfservice-clientd"; #better name?
+
+my %dispatch = (
+  'signup' => \&signup,
+  #'signup_init' => 'signup_init',
+  'passwd' => \&passwd,
+
+);
+
+my $warnkids=0;
+while (1) {
+  my($reader, $writer) = (new IO::Handle, new IO::Handle);
+  warn "connecting to $machine";
+  $ssh_pid = sshopen2($machine,$reader,$writer,$clientd);
+
+  warn "entering main loop";
+  while (1) {
+
+    warn "waiting for packet from client";
+    my $packet = eval {
+      local $SIG{__DIE__};
+      local $SIG{ALRM} = sub { die "alarm\n" }; #NB: \n required
+      alarm 5;
+      my $p = fd_retrieve($reader);
+      alarm 0;
+      $p;
+    };
+    if ($@) {
+      die $@ unless $@ eq "alarm\n";
+      #timeout
+      next unless $shutdown;
+      &shutdown;
+    }
+    warn "packet received";
+
+    #prevent runaway forking
+    my $warnkids = 0;
+    while ( $kids >= $max_kids ) {
+      warn "WARNING: maximum $kids children reached" unless $warnkids++;
+      sleep 1;
+    }
+
+    warn "forking child";
+    defined( my $pid = fork ) or die "can't fork: $!";
+    if ( $pid ) {
+      warn "child $pid spawned";
+      $kids++;
+    } else { #kid time
+
+      #get new db handle
+      $FS::UID::dbh->{InactiveDestroy} = 1;
+      forksuidsetup($user);
+
+      my $sub = $dispatch{$packet->{_packet}};
+      my $rv;
+      if ( $sub ) {
+        warn "calling $sub handler"; 
+        $rv = &{$sub}($packet);
+      } else {
+        warn my $error = "WARNING: unknown packet type ". $packet->{_packet};
+        $rv = { _error => $error };
+      }
+      $rv->{_token} = $packet->{_token}; #identifier
+
+      warn "sending response";
+      flock($writer, LOCK_EX); #acquire write lock
+      nstore_fd($rv, $writer) or die "can't send response: $!";
+      $writer->flush;
+      flock($writer, LOCK_UN); #release write lock
+
+      warn "child exiting";
+      exit; #end-of-kid
+    }
+
+  }
+
+}
+
+###
+# utility subroutines
+###
+
+sub init {
+  my $user = shift;
+
+  chdir "/" or die "Can't chdir to /: $!";
+  open STDIN, '/dev/null'   or die "Can't read /dev/null: $!";
+  defined(my $pid = fork) or die "Can't fork: $!";
+  if ( $pid ) {
+    print "freeside-selfservice-server to $machine started with pid $pid\n"; #logging to $log_file
+    exit unless $pid_file;
+    my $pidfh = new IO::File ">$pid_file" or exit;
+    print $pidfh "$pid\n";
+    exit;
+  }
+
+  sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; $kids--; }
+  $SIG{CHLD} =  \&REAPER;
+
+  $shutdown = 0;
+  $SIG{HUP} = sub { warn "SIGHUP received; shutting down\n"; $shutdown++; };
+  $SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $shutdown++; };
+  $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $shutdown++; };
+  $SIG{QUIT} = sub { warn "SIGQUIT received; shutting down\n"; $shutdown++; };
+  $SIG{PIPE} = sub { warn "SIGPIPE received; shutting down\n"; $shutdown++; };
+
+  $> = $FS::UID::freeside_uid unless $>;
+  $< = $>;
+  $ENV{HOME} = (getpwuid($>))[7]; #for ssh
+  adminsuidsetup $user;
+
+  #$log_file = "/usr/local/etc/freeside/selfservice.". $FS::UID::datasrc; #MACHINE NAME
+  $log_file = "/usr/local/etc/freeside/selfservice.$machine.log";
+
+  open STDOUT, '>/dev/null'
+                            or die "Can't write to /dev/null: $!";
+  setsid                  or die "Can't start a new session: $!";
+  open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
+
+  $SIG{__DIE__} = \&_die;
+  $SIG{__WARN__} = \&_logmsg;
+
+  warn "freeside-selfservice-server starting\n";
+
+}
+
+sub shutdown {
+  my $wait = 12; #wait up to 1 minute
+  while ( $kids && $wait-- ) {
+    warn "waiting for $kids children to terminate";
+    sleep 5;
+  }
+  warn "abandoning $kids children" if $kids;
+  kill 'TERM', $ssh_pid if $ssh_pid;
+  die "exiting";
+}
+
+sub _die {
+  my $msg = shift;
+  unlink $pid_file if -e $pid_file;
+  _logmsg($msg);
+}
+
+sub _logmsg {
+  chomp( my $msg = shift );
+  my $log = new IO::File ">>$log_file";
+  flock($log, LOCK_EX);
+  seek($log, 0, 2);
+  print $log "[server] [". time2str("%a %b %e %T %Y",time). "] [$$] $msg\n";
+  flock($log, LOCK_UN);
+  close $log;
+}
+
+sub usage {
+  die "Usage:\n\n  fs_signup_server user machine\n";
+}
+
+###
+# handlers... should go in their own files eventually...
+###
+
-- 
cgit v1.2.1


From 23c7d48df691c406aecb84776437698447405518 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 29 May 2002 15:56:02 +0000
Subject: freeradius 0.5 doc

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 89625420e..1d4ec23cd 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -581,7 +581,7 @@ tie my %bind_slave_options, 'Tie::IxHash',
       'desc' => 'Real-time export to SQL-backed RADIUS (ICRADIUS, FreeRADIUS)',
       'options' => \%sqlradius_options,
       'nodomain' => 'Y',
-      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  Use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.23/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.',
+      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  Use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.23/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.  If using <a href="http://www.freeradius.org/">FreeRADIUS</a> 0.5 or above, make sure your <b>op</b> fields are set to allow NULL values.',
     },
 
     'cyrus' => {
-- 
cgit v1.2.1


From 4aaa65f643469cf2df1d97f5e12e05d0122d9570 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 29 May 2002 20:45:04 +0000
Subject: eliminate harmless "Database handle destroyed without explicit
 disconnect" errors

---
 FS/bin/freeside-sqlradius-reset | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/bin/freeside-sqlradius-reset b/FS/bin/freeside-sqlradius-reset
index 132be754a..41f3358f6 100755
--- a/FS/bin/freeside-sqlradius-reset
+++ b/FS/bin/freeside-sqlradius-reset
@@ -22,6 +22,7 @@ foreach my $export ( @exports ) {
     my $sth = $icradius_dbh->prepare("DELETE FROM $table");
     $sth->execute or die "Can't reset $table table: ". $sth->errstr;
   }
+  $icradius_dbh->disconnect;
 }
 
 foreach my $export ( @exports ) {
-- 
cgit v1.2.1


From 03809f7b4f5a7ff34adaba7dd5d4cdf1039fbd22 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 30 May 2002 17:49:18 +0000
Subject: GRRRRRRRRRRRRR

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 1d4ec23cd..08e436da0 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -370,7 +370,7 @@ sub rebless {
   my $self = shift;
   my $exporttype = $self->exporttype;
   my $class = ref($self). "::$exporttype";
-  eval "use $class;";
+  eval "use $class;" or die $@;
   bless($self, $class);
 }
 
-- 
cgit v1.2.1


From 68d29e0ca9fcfe6b68240d946c8bf71d7b31767a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 30 May 2002 21:51:48 +0000
Subject: point to correct place for hidecancelledcustomers config option

---
 httemplate/misc/delete-customer.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/misc/delete-customer.cgi b/httemplate/misc/delete-customer.cgi
index 7016c9166..430231737 100755
--- a/httemplate/misc/delete-customer.cgi
+++ b/httemplate/misc/delete-customer.cgi
@@ -36,7 +36,7 @@ print <<END;
 This will <b>completely remove</b> all traces of this customer record.  This
 is <B>not</B> what you want if this is a real customer who has simply
 canceled service with you.  For that, cancel all of the customer's packages.
-(you can optionally hide cancelled customers with the <a href="../docs/config.html#hidecancelledcustomers">hidecancelledcustomers</a> configuration file)
+(you can optionally hide cancelled customers with the <a href="../config/config-view.cgi#hidecancelledcustomers">hidecancelledcustomers</a> configuration option)
 <br>
 <br>Are you <b>absolutely sure</b> you want to delete this customer?
 <br><input type="submit" value="Yes">
-- 
cgit v1.2.1


From 19f8b2d8ef579c35a36b6e518d8c38afbcb1042e Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Thu, 30 May 2002 22:36:38 +0000
Subject: replace newlines with crlf here instead of escaping them in the
 template

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 009a63304..2fbac620e 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.27 2002-04-25 12:03:15 ivan Exp $
+# $Id: signup.cgi,v 1.28 2002-05-30 22:36:38 khoff Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -46,11 +46,13 @@ $decline_html = -e 'decline.html'
                   ? 'decline.html'
                   : '/usr/local/freeside/decline.html';
 
+
 if ( -e $ieak_file ) {
   my $ieak_txt = Text::Template::_load_text($ieak_file)
     or die $Text::Template::ERROR;
   $ieak_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
   $ieak_txt = $1;
+  $ieak_txt =~ s/\n/\r\n/g;
   $ieak_template = new Text::Template ( TYPE => 'STRING', SOURCE => $ieak_txt )
     or die $Text::Template::ERROR;
 } else {
-- 
cgit v1.2.1


From 8971ca50e9a854e626f9550ac1767c09400e0a10 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Thu, 30 May 2002 22:41:28 +0000
Subject: the \r's are annoying and for some reason weren't getting evaluated. 
 Text::Template is inconsistent about handling escaped characters between
 different versions.

---
 fs_signup/ieak.template | 80 ++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/fs_signup/ieak.template b/fs_signup/ieak.template
index 5da2a2036..52edaa951 100755
--- a/fs_signup/ieak.template
+++ b/fs_signup/ieak.template
@@ -1,40 +1,40 @@
-[Entry]\r
-Entry_Name = The Internet\r
-[Phone]\r
-Dial_As_Is=no\r
-Phone_Number = { $exch. $loc }\r
-Area_Code = { $ac }\r
-Country_Code = 1\r
-Country_Id = 1\r
-[Server]\r
-Type = PPP\r
-SW_Compress = Yes\r
-PW_Encrypt = Yes\r
-Negotiate_TCP/IP = Yes\r
-Disable_LCP = No\r
-[TCP/IP]\r
-Specify_IP_Address = No\r
-Specity_Server_Address = No\r
-IP_Header_Compress = Yes\r
-Gateway_On_Remote = Yes\r
-[User]\r
-Name = { $username }\r
-Password = { $password }\r
-Display_Password = Yes\r
-[Internet_Mail]\r
-Email_Name = { $email_name }\r
-Email_Address = { $username }\@domain.tld\r
-POP_Server = mail.domain.tld\r
-POP_Server_Port_Number = 110\r
-POP_Login_Name = { $username }\r
-POP_Login_Password = { $password }\r
-SMTP_Server = mail.domain.tld\r
-SMTP_Server_Port_Number = 25\r
-Install_Mail = 1\r
-[Internet_News]\r
-NNTP_Server = news.domain.tld\r
-NNTP_Server_Port_Number = 119\r
-Logon_Required = No\r
-Install_News = 1\r
-[Branding]\r
-Window_Title = The Internet\r
+[Entry]
+Entry_Name = The Internet
+[Phone]
+Dial_As_Is=no
+Phone_Number = { $exch. $loc }
+Area_Code = { $ac }
+Country_Code = 1
+Country_Id = 1
+[Server]
+Type = PPP
+SW_Compress = Yes
+PW_Encrypt = Yes
+Negotiate_TCP/IP = Yes
+Disable_LCP = No
+[TCP/IP]
+Specify_IP_Address = No
+Specity_Server_Address = No
+IP_Header_Compress = Yes
+Gateway_On_Remote = Yes
+[User]
+Name = { $username }
+Password = { $password }
+Display_Password = Yes
+[Internet_Mail]
+Email_Name = { $email_name }
+Email_Address = { $username }\@domain.tld
+POP_Server = mail.domain.tld
+POP_Server_Port_Number = 110
+POP_Login_Name = { $username }
+POP_Login_Password = { $password }
+SMTP_Server = mail.domain.tld
+SMTP_Server_Port_Number = 25
+Install_Mail = 1
+[Internet_News]
+NNTP_Server = news.domain.tld
+NNTP_Server_Port_Number = 119
+Logon_Required = No
+Install_News = 1
+[Branding]
+Window_Title = The Internet
-- 
cgit v1.2.1


From 269525075ed77bfcd0a26eda9c7244e816aba92d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 30 May 2002 22:45:20 +0000
Subject: don't double \r on old templates

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 2fbac620e..08d8a4d45 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.28 2002-05-30 22:36:38 khoff Exp $
+# $Id: signup.cgi,v 1.29 2002-05-30 22:45:20 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -52,6 +52,7 @@ if ( -e $ieak_file ) {
     or die $Text::Template::ERROR;
   $ieak_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
   $ieak_txt = $1;
+  $ieak_txt =~ s/\r//g; # don't double \r on old templates
   $ieak_txt =~ s/\n/\r\n/g;
   $ieak_template = new Text::Template ( TYPE => 'STRING', SOURCE => $ieak_txt )
     or die $Text::Template::ERROR;
-- 
cgit v1.2.1


From cf4a05afd3aea5747e16e8dcb426f9552aaef444 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Fri, 31 May 2002 00:18:57 +0000
Subject: Moved new-style export calls to svc_Common.

---
 FS/FS/svc_Common.pm | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 FS/FS/svc_acct.pm   | 36 ------------------------
 FS/FS/svc_domain.pm |  7 +++--
 3 files changed, 83 insertions(+), 41 deletions(-)

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index ee190fb8d..5cddb91cf 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -1,7 +1,7 @@
 package FS::svc_Common;
 
 use strict;
-use vars qw( @ISA );
+use vars qw( @ISA $noexport_hack );
 use FS::Record qw( qsearchs fields dbh );
 use FS::cust_svc;
 use FS::part_svc;
@@ -85,6 +85,18 @@ sub insert {
     return $error;
   }
 
+  #new-style exports!
+  unless ( $noexport_hack ) {
+    foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
+      my $error = $part_export->export_insert($self);
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "exporting to ". $part_export->exporttype.
+               " (transaction rolled back): $error";
+      }
+    }
+  }
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   '';
@@ -112,16 +124,81 @@ sub delete {
 
   my $svcnum = $self->svcnum;
 
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
   $error = $self->SUPER::delete;
   return $error if $error;
 
+  #new-style exports!
+  unless ( $noexport_hack ) {
+    foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
+      my $error = $part_export->export_delete($self);
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "exporting to ". $part_export->exporttype.
+               " (transaction rolled back): $error";
+      }
+    }
+  }
+
+  return $error if $error;
+
   my $cust_svc = $self->cust_svc;
   $error = $cust_svc->delete;
   return $error if $error;
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub replace {
+  my ($new, $old) = (shift, shift);
+  my $error;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $new->SUPER::replace($old);
+  if ($error) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  #new-style exports!
+  unless ( $noexport_hack ) {
+    foreach my $part_export ( $new->cust_svc->part_svc->part_export ) {
+      my $error = $part_export->export_replace($new,$old);
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "exporting to ". $part_export->exporttype.
+               " (transaction rolled back): $error";
+      }
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 }
 
+
 =item setfixed
 
 Sets any fixed fields for this service (see L<FS::part_svc>).  If there is an
@@ -215,7 +292,7 @@ sub cancel { ''; }
 
 =head1 VERSION
 
-$Id: svc_Common.pm,v 1.8 2002-03-18 16:05:35 ivan Exp $
+$Id: svc_Common.pm,v 1.9 2002-05-31 00:18:56 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index a43f97ab5..e3589d846 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -235,18 +235,6 @@ sub insert {
     }
   }
 
-  #new-style exports!
-  unless ( $noexport_hack ) {
-    foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
-      my $error = $part_export->export_insert($self);
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "exporting to ". $part_export->exporttype.
-               " (transaction rolled back): $error";
-      }
-    }
-  }
-
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
 }
@@ -340,18 +328,6 @@ sub delete {
     return $error;
   }
 
-  #new-style exports!
-  unless ( $noexport_hack ) {
-    foreach my $part_export ( $part_svc->part_export ) {
-      my $error = $part_export->export_delete($self);
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "exporting to ". $part_export->exporttype.
-               " (transaction rolled back): $error";
-      }
-    }
-  }
-
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 }
@@ -436,18 +412,6 @@ sub replace {
 
   }
 
-  #new-style exports!
-  unless ( $noexport_hack ) {
-    foreach my $part_export ( $new->cust_svc->part_svc->part_export ) {
-      my $error = $part_export->export_replace($new,$old);
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "exporting to ". $part_export->exporttype.
-               " (transaction rolled back): $error";
-      }
-    }
-  }
-
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
 }
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index a9a2fd0eb..fd57713c8 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -282,6 +282,7 @@ sub delete {
       return $error;
     }
   }
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 }
 
 =item replace OLD_RECORD
@@ -298,8 +299,8 @@ sub replace {
   return "Can't change domain - reorder."
     if $old->getfield('domain') ne $new->getfield('domain'); 
 
-  $new->SUPER::replace($old);
-
+  my $error = $new->SUPER::replace($old);
+  return $error if $error;
 }
 
 =item suspend
@@ -450,7 +451,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.29 2002-05-22 18:44:01 ivan Exp $
+$Id: svc_domain.pm,v 1.30 2002-05-31 00:18:57 khoff Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 3c3b524da13f32623eca3c0889350b912ec41605 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Fri, 31 May 2002 00:20:38 +0000
Subject: part_export module to export svc_acct, svc_domain, and svc_forward to
 an external database

---
 FS/FS/part_export/sqlmail.pm | 111 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 111 insertions(+)
 create mode 100644 FS/FS/part_export/sqlmail.pm

diff --git a/FS/FS/part_export/sqlmail.pm b/FS/FS/part_export/sqlmail.pm
new file mode 100644
index 000000000..4194daf0c
--- /dev/null
+++ b/FS/FS/part_export/sqlmail.pm
@@ -0,0 +1,111 @@
+package FS::part_export::sqlmail;
+
+use vars qw(@ISA %fs_mail_table %fields);
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+%fs_mail_table = ( svc_acct => 'user',
+                   svc_domain => 'domain' );
+
+# fields that need to be copied into the fs_mail tables
+$fields{user} = [qw(username _password finger domsvc svcnum )];
+$fields{domain} = [qw(domain svcnum catchall )];
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my($self, $svc) = (shift, shift);
+  # this is a svc_something.
+
+  my $table = $fs_mail_table{$svc->cust_svc->part_svc->svcdb};
+  my @attrib = map {$svc->$_} @{$fields{$table}};
+  my $error = $self->sqlmail_queue( $svc->svcnum, 'insert',
+      $table, @attrib );
+  return $error if $error;
+  '';
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = (shift, shift, shift);
+
+  my $table = $fs_mail_table{$new->cust_svc->part_svc->svcdb};
+
+  my @old = ($old->svcnum, 'delete', $table, $old->svcnum);
+  my @narf = map {$new->$_} @{$fields{$table}};
+  $self->sqlmail_queue($new->svcnum, 'replace', $table, 
+      $new->svcnum, @narf);
+
+  return $error if $error;
+  '';
+}
+
+sub _export_delete {
+  my( $self, $svc ) = (shift, shift);
+  my $table = $fs_mail_table{$new->cust_svc->part_svc->svcdb};
+  $self->sqlmail_queue( $svc->svcnum, 'delete', $table,
+    $svc->svcnum );
+}
+
+sub sqlmail_queue {
+  my( $self, $svcnum, $method, $table ) = (shift, shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => "FS::part_export::sqlmail::sqlmail_$method",
+  };
+  $queue->insert(
+    $self->option('datasrc'),
+    $self->option('username'),
+    $self->option('password'),
+    @_,
+  );
+}
+
+sub sqlmail_insert { #subroutine, not method
+  my $dbh = sqlmail_connect(shift, shift, shift);
+  my( $table, @attrib ) = @_;
+
+  my $sth = $dbh->prepare(
+    "INSERT INTO $table (" . join (',', @{$fields{$table}}) .
+    ") VALUES ('" . join ("','", @attrib) . "')"
+  ) or die $dbh->errstr;
+  $sth->execute() or die $sth->errstr;
+
+  $dbh->disconnect;
+}
+
+sub sqlmail_delete { #subroutine, not method
+  my $dbh = sqlmail_connect(shift, shift, shift);
+  my( $table, $svcnum ) = @_;
+
+  my $sth = $dbh->prepare(
+    "DELETE FROM $table WHERE svcnum = $svcnum"
+  ) or die $dbh->errstr;
+  $sth->execute() or die $sth->errstr;
+
+  $dbh->disconnect;
+}
+
+sub sqlmail_replace {
+  my $dbh = sqlmail_connect(shift, shift, shift);
+  my( $table, $svcnum, @attrib ) = @_;
+
+  my %data;
+  @data{@{$fields{$table}}} = @attrib;
+
+  my $sth = $dbh->prepare(
+    "UPDATE $table SET " .
+    ( join ',',  map {$_ . "='" . $data{$_} . "'"} keys(%data) ) .
+    " WHERE svcnum = $svcnum"
+    ) or die $dbh->errstr;
+  $sth->execute() or die $sth->errstr;
+
+  $dbh->disconnect;
+}
+
+sub sqlmail_connect {
+  #my($datasrc, $username, $password) = @_;
+  #DBI->connect($datasrc, $username, $password) or die $DBI::errstr;
+  DBI->connect(@_) or die $DBI::errstr;
+}
+
-- 
cgit v1.2.1


From bbbdd40d71fa66405224872a173a080a7a7dbfef Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Fri, 31 May 2002 00:22:09 +0000
Subject: updated hashes 'n stuff for FS::part_export::sqlmail

---
 FS/FS/part_export.pm | 40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 08e436da0..14e4676e9 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -370,7 +370,8 @@ sub rebless {
   my $self = shift;
   my $exporttype = $self->exporttype;
   my $class = ref($self). "::$exporttype";
-  eval "use $class;" or die $@;
+#  eval "use $class;" or die $@;
+  eval "use $class;";
   bless($self, $class);
 }
 
@@ -465,6 +466,12 @@ Returns the applicable I<svcdb> for an I<exporttype>.
 
 =cut
 
+# This subroutine should be modified or removed.  In its present form, it
+# imposes the arbitrary restriction that no export type can be associated 
+# with more than one svcdb.  The only place it's used is in edit/part_svc.cgi
+# to generate the list of allowed exports, which can be done more cleanly by 
+# export_info anyway.
+
 sub exporttype2svcdb {
   my $exporttype = $_[0];
   foreach my $svcdb ( keys %exports ) {
@@ -545,6 +552,11 @@ tie my %bind_slave_options, 'Tie::IxHash',
                      default => '/etc/bind/named.conf' },
 ;
 
+tie my %sqlmail_options, 'Tie::IxHash',
+  'datasrc'  => { label=>'DBI data source' },
+  'username' => { label=>'Database username' },
+  'password' => { label=>'Database password' },
+;
 
 
 #export names cannot have dashes...
@@ -584,6 +596,14 @@ tie my %bind_slave_options, 'Tie::IxHash',
       'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  Use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.23/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.  If using <a href="http://www.freeradius.org/">FreeRADIUS</a> 0.5 or above, make sure your <b>op</b> fields are set to allow NULL values.',
     },
 
+    'sqlmail' => {
+      'desc' => 'Real-time export to SQL-backed mail server',
+      'options' => \%sqlmail_options,
+      'nodomain' => 'Y',
+      'notes' => 'Database schema can be made to work with Courier IMAP and
+ Exim.  Others could work but are untested.',
+    },
+
     'cyrus' => {
       'desc' => 'Real-time export to Cyrus IMAP server',
       'options' => \%cyrus_options,
@@ -627,12 +647,28 @@ tie my %bind_slave_options, 'Tie::IxHash',
       'notes' => 'bind export notes (secondary munge) File::Rsync dependancy, run bind.export',
     },
 
+    'sqlmail' => {
+      'desc' => 'Real-time export to SQL-backed mail server',
+      'options' => \%sqlmail_options,
+      'nodomain' => 'Y',
+      'notes' => 'Database schema can be made to work with Courier IMAP and
+ Exim.  Others could work but are untested.',
+    },
+
 
   },
 
   'svc_acct_sm' => {},
 
-  'svc_forward' => {},
+  'svc_forward' => {
+    'sqlmail' => {
+      'desc' => 'Real-time export to SQL-backed mail server',
+      'options' => \%sqlmail_options,
+      'nodomain' => 'Y',
+      'notes' => 'Database schema can be made to work with Courier IMAP and
+ Exim.  Others could work but are untested.',
+    },
+  },
 
   'svc_www' => {},
 
-- 
cgit v1.2.1


From 6198edc29b71b77dfa6868f76effb4286579259e Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Fri, 31 May 2002 00:33:39 +0000
Subject: Added support for part_exports that are used with more than one
 svcdb.

---
 httemplate/edit/part_svc.cgi | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index f2073f935..36f764140 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -144,9 +144,11 @@ my %defs = (
       my $columns = 3;
       my $count = 0;
       my @part_export =
-        grep { $layer eq FS::part_export::exporttype2svcdb($_->exporttype) }
-          qsearch( 'part_export', {} );
-      $html .= '<BR><BR>'. table().
+#        grep { $layer eq FS::part_export::exporttype2svcdb($_->exporttype) }
+#          qsearch( 'part_export', {} );
+         map { qsearch( 'part_export', {exporttype => $_ } ) }
+           keys(%{FS::part_export::export_info($layer)});
+     $html .= '<BR><BR>'. table().
                table(). "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
       foreach my $part_export ( @part_export ) {
         $html .= '<TD><INPUT TYPE="checkbox"'.
-- 
cgit v1.2.1


From 19416b51cad45853a7cf620af6bbde7973bedbe5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 31 May 2002 02:13:23 +0000
Subject: no, actually throw an exception if an export class won't compile.

---
 FS/FS/part_export.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 14e4676e9..f4f46b0e9 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -370,8 +370,7 @@ sub rebless {
   my $self = shift;
   my $exporttype = $self->exporttype;
   my $class = ref($self). "::$exporttype";
-#  eval "use $class;" or die $@;
-  eval "use $class;";
+  eval "use $class;" or die $@;
   bless($self, $class);
 }
 
-- 
cgit v1.2.1


From 7c50e5b2a527bf475860d682826b8e7229af1c59 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 31 May 2002 17:50:37 +0000
Subject: typo noticed by <Kaa>

---
 FS/FS/svc_forward.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index 12f8b9236..1c5b5c40d 100644
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -402,7 +402,7 @@ sub check {
 
   return "Unknown srcsvc" unless $self->srcsvc_acct;
 
-  return "Both dstsvc and dst were defined; one one can be specified"
+  return "Both dstsvc and dst were defined; only one can be specified"
     if $self->dstsvc && $self->dst;
 
   return "one of dstsvc or dst is required"
@@ -452,7 +452,7 @@ sub dstsvc_acct {
 
 =head1 VERSION
 
-$Id: svc_forward.pm,v 1.11 2002-02-20 01:03:09 ivan Exp $
+$Id: svc_forward.pm,v 1.12 2002-05-31 17:50:37 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 9dbe1e81eaad947203f196165a5c10c7f40da8a8 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Fri, 31 May 2002 18:45:13 +0000
Subject: added sqlmail.pm and test

---
 FS/MANIFEST | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 4c6d243df..daf27b7e4 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -54,6 +54,7 @@ FS/part_export/cp.pm
 FS/part_export/cyrus.pm
 FS/part_export/infostreet.pm
 FS/part_export/shellcommands.pm
+FS/part_export/sqlmail.pm
 FS/part_export/sqlradius.pm
 FS/part_export/textradius.pm
 FS/part_export/vpopmail.pm
@@ -117,6 +118,7 @@ t/part_export-cp.t
 t/part_export-cyrus.t
 t/part_export-infostreet.t
 t/part_export-shellcommands.t
+t/part_export-sqlmail.t
 t/part_export-sqlradius.t
 t/part_export-textradius.t
 t/part_export-vpopmail.t
-- 
cgit v1.2.1


From 2b98ba63e33b3ab12d3561cf1179911eedcdbde4 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Fri, 31 May 2002 18:48:13 +0000
Subject: Don't ask me.  I just hacked Ivan's test.

---
 FS/t/part_export-sqlmail.t | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 FS/t/part_export-sqlmail.t

diff --git a/FS/t/part_export-sqlmail.t b/FS/t/part_export-sqlmail.t
new file mode 100644
index 000000000..b048a75a5
--- /dev/null
+++ b/FS/t/part_export-sqlmail.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::sqlmail;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From 439a47a6cfd81793c34bf5ded2cee3bb29becfe4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 31 May 2002 20:31:05 +0000
Subject: better error reporting

---
 FS/FS/cust_bill.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index e2705fd83..f67ef96aa 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -726,8 +726,10 @@ sub batch_card {
     'payname'  => $cust_main->getfield('payname'),
     'amount'   => $self->owed,
   } );
-  $cust_pay_batch->insert;
+  my $error = $cust_pay_batch->insert;
+  die $error if $error;
 
+  '';
 }
 
 =item print_text [TIME];
@@ -948,7 +950,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.35 2002-05-18 09:51:30 ivan Exp $
+$Id: cust_bill.pm,v 1.36 2002-05-31 20:31:05 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 0466aab2988c550d1ff76c0017059c06228c2045 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 31 May 2002 20:34:03 +0000
Subject: dammit i want to catch export subclass compilation problems

---
 FS/FS/part_export.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index f4f46b0e9..ae201464d 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -370,7 +370,8 @@ sub rebless {
   my $self = shift;
   my $exporttype = $self->exporttype;
   my $class = ref($self). "::$exporttype";
-  eval "use $class;" or die $@;
+  eval "use $class;";
+  die $@ if $@;
   bless($self, $class);
 }
 
-- 
cgit v1.2.1


From a973be68d5dc5947a343e7cb886307e903706240 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 31 May 2002 22:37:06 +0000
Subject: no state necessary in batch cards (i18n)

---
 bin/fs-setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 87921d74e..558a5fdd9 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.91 2002-05-15 13:24:24 ivan Exp $
+# $Id: fs-setup,v 1.92 2002-05-31 22:37:06 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -570,7 +570,7 @@ sub tables_hash_hack {
         'address1', 'varchar', '',     $char_d,
         'address2', 'varchar', 'NULL', $char_d,
         'city',     'varchar', '',     $char_d,
-        'state',    'varchar', '',     $char_d,
+        'state',    'varchar', 'NULL', $char_d,
         'zip',      'varchar', '',     10,
         'country',  'char', '',     2,
 #        'trancode', 'int', '', '',
-- 
cgit v1.2.1


From 27ac758cfda829b272238ab6819179dec1fef4e4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Jun 2002 13:46:06 +0000
Subject: misspelling

---
 conf/declinetemplate | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/declinetemplate b/conf/declinetemplate
index 9a356ea0f..14b8c60ec 100644
--- a/conf/declinetemplate
+++ b/conf/declinetemplate
@@ -3,7 +3,7 @@ Hi,
 Your credit card could not be processed for the following reason:
   { $error }
 
-Please provide us with new billing infromation so that we may continue your
+Please provide us with new billing information so that we may continue your
 service uninterrupted.
 
 Thanks.
-- 
cgit v1.2.1


From 7fc18b419e3cec20eb7c898017673b40a7424cde Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Jun 2002 14:02:18 +0000
Subject: mysql support!  thanks to Donald Greer <dgreer@austintx.com> for the
 SQL and Dale Hege <fhege@lumenexus.net> for the patches

---
 CREDITS                         |  4 ++
 httemplate/search/cust_main.cgi | 81 +++++++++++++++++++++++++++++++----------
 httemplate/search/cust_pkg.cgi  | 74 +++++++++++++++++++++++++++++--------
 httemplate/search/svc_acct.cgi  | 36 ++++++++++++------
 4 files changed, 149 insertions(+), 46 deletions(-)

diff --git a/CREDITS b/CREDITS
index 3a356f935..8f077cd8f 100644
--- a/CREDITS
+++ b/CREDITS
@@ -97,5 +97,9 @@ Luke Pfeifer <freeside@globalli.com> contributed the "subscription" price plan.
 Noment Networks, LLC <http://www.noment.com/> sponsored ICRADIUS/FreeRADIUS
 groups, message catalogs, and signup server enhancements.
 
+Donald Greer <dgreer@austintx.com> provided the SQL to work around MySQL's lack
+of subqueries, and Dale Hege <fhege@lumenexus.net> provided the patches.
+Thanks!
+
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 2e255cfa2..b4565601b 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -80,23 +80,52 @@ if ( $cgi->param('browse')
 
   my $ncancelled = '';
 
+  if ( driver_name eq 'mysql' ) {
+
+       my $query = "CREATE TEMPORARY TABLE temp1_$$ TYPE=MYISAM
+                      SELECT cust_pkg.custnum,COUNT(*) as count
+                        FROM cust_pkg,cust_main
+                          WHERE cust_pkg.custnum = cust_main.custnum
+                                AND ( cust_pkg.cancel IS NULL
+                                      OR cust_pkg.cancel = 0 )
+                          GROUP BY cust_pkg.custnum";
+       my $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
+       $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
+       $query = "CREATE TEMPORARY TABLE temp2_$$ TYPE=MYISAM
+                   SELECT cust_pkg.custnum,COUNT(*) as count
+                     FROM cust_pkg,cust_main
+                       WHERE cust_pkg.custnum = cust_main.custnum
+                       GROUP BY cust_pkg.custnum";
+       my $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
+       $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
+  }
+
   if (  $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
        || ( $conf->exists('hidecancelledcustomers')
              && ! $cgi->param('showcancelledcustomers') )
      ) {
     #grep { $_->ncancelled_pkgs || ! $_->all_pkgs }
-    #needed for MySQL???    OR cust_pkg.cancel = \"\"
-    $ncancelled = "
-       0 < ( SELECT COUNT(*) FROM cust_pkg
-                    WHERE cust_pkg.custnum = cust_main.custnum
-                      AND ( cust_pkg.cancel IS NULL
-                            OR cust_pkg.cancel = 0
-                          )
-                )
-         OR 0 = ( SELECT COUNT(*) FROM cust_pkg
-                    WHERE cust_pkg.custnum = cust_main.custnum
-                )
-    ";
+    if ( driver_name eq 'mysql' ) {
+       $ncancelled = "
+          temp1_$$.custnum = cust_main.custnum
+               AND temp2_$$.custnum = cust_main.custnum
+               AND (temp1_$$.count > 0
+                       OR temp2_$$.count = 0 )
+       ";
+    } else {
+       $ncancelled = "
+          0 < ( SELECT COUNT(*) FROM cust_pkg
+                       WHERE cust_pkg.custnum = cust_main.custnum
+                         AND ( cust_pkg.cancel IS NULL
+                               OR cust_pkg.cancel = 0
+                             )
+                   )
+            OR 0 = ( SELECT COUNT(*) FROM cust_pkg
+                       WHERE cust_pkg.custnum = cust_main.custnum
+                   )
+       ";
+    }
+
   }
 
   #EWWWWWW
@@ -109,10 +138,14 @@ if ( $cgi->param('browse')
   }
     
   $qual = " WHERE $qual" if $qual;
-
-  my $statement = "SELECT COUNT(*) FROM cust_main $qual";
-  my $sth = dbh->prepare($statement)
-    or die dbh->errstr. " doing $statement";
+  my $statement;
+  if ( driver_name eq 'mysql' ) {
+    $statement = "SELECT COUNT(*) FROM cust_main";
+    $statement .= ", temp1_$$, temp2_$$ $qual" if $qual;
+  } else {
+    $statement = "SELECT COUNT(*) FROM cust_main $qual";
+  }
+  my $sth = dbh->prepare($statement) or die dbh->errstr." preparing $statement";
   $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
 
   $total = $sth->fetchrow_arrayref->[0];
@@ -124,10 +157,20 @@ if ( $cgi->param('browse')
       $ncancelled = " WHERE $ncancelled";
     }
   }
-  my @just_cust_main = qsearch('cust_main', \%search, '',
-    "$ncancelled $orderby $limit"
-  );    
 
+  my @just_cust_main;
+  if ( driver_name eq /mysql/ ) {
+    @just_cust_main = qsearch('cust_main', \%search, 'cust_main.*',
+                              ",temp1_$$,temp2_$$ $ncancelled $orderby $limit");
+  } else {
+    @just_cust_main = qsearch('cust_main', \%search, '',   
+                              "$ncancelled $orderby $limit" );
+  }
+  if ( driver_name eq 'mysql' ) {
+    $query = "DROP TABLE temp1_$$,temp2_$$;";
+    my $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
+    $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
+  }
   @cust_main = @just_cust_main;
 
 #  foreach my $cust_main ( @just_cust_main ) {
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index ec1bda900..7dfacf189 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -34,8 +34,7 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
   #false laziness with below
   my $statement = "SELECT COUNT(*) FROM cust_pkg $range";
   warn $statement;
-  my $sth = dbh->prepare($statement)
-    or die dbh->errstr. " doing $statement";
+  my $sth = dbh->prepare($statement) or die dbh->errstr." preparing $statement";
   $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
   
   $total = $sth->fetchrow_arrayref->[0];
@@ -52,17 +51,6 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
   
     $sortby=\*pkgnum_sort;
   
-    $unconf = "
-      WHERE 0 <
-        ( SELECT count(*) FROM pkg_svc
-            WHERE pkg_svc.pkgpart = cust_pkg.pkgpart
-              AND pkg_svc.quantity > ( SELECT count(*) FROM cust_svc
-                                         WHERE cust_svc.pkgnum = cust_pkg.pkgnum
-                                           AND cust_svc.svcpart = pkg_svc.svcpart
-                                     )
-        )
-    ";
-  
     #@cust_pkg=();
     ##perhaps this should go in cust_pkg as a qsearch-like constructor?
     #my($cust_pkg);
@@ -86,20 +74,74 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
     #  }
     #  push @cust_pkg, $cust_pkg if $flag;
     #}
+
+    if ( driver_name eq 'mysql' ) {
+      #$query = "DROP TABLE temp1_$$,temp2_$$;";
+      #my $sth = dbh->prepare($query);
+      #$sth->execute;
+
+      $query = "CREATE TEMPORARY TABLE temp1_$$ TYPE=MYISAM
+                  SELECT cust_svc.pkgnum,cust_svc.svcpart,COUNT(*) as count
+                    FROM cust_pkg,cust_svc,pkg_svc
+                      WHERE cust_pkg.pkgnum = cust_svc.pkgnum
+                      AND cust_svc.svcpart = pkg_svc.svcpart
+                      AND cust_pkg.pkgpart = pkg_svc.pkgpart
+                      GROUP BY cust_svc.pkgnum,cust_svc.svcnum";
+      $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
+         
+      $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
+  
+      $query = "CREATE TEMPORARY TABLE temp2_$$ TYPE=MYISAM
+                  SELECT cust_pkg.pkgnum FROM cust_pkg
+                    LEFT JOIN pkg_svc ON (cust_pkg.pkgpart=pkg_svc.pkgpart)
+                    LEFT JOIN temp1_$$ ON (cust_pkg.pkgnum = temp1_$$.pkgnum
+                                           AND pkg_svc.svcpart=temp1_$$.svcpart)
+                    WHERE ( pkg_svc.quantity > temp1_$$.count
+                            OR temp1_$$.pkgnum IS NULL )
+                          AND pkg_svc.quantity != 0;";
+      $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";   
+      $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
+      $unconf = " LEFT JOIN temp2_$$ ON cust_pkg.pkgnum = temp2_$$.pkgnum
+                    WHERE temp2_$$.pkgnum IS NOT NULL";
+
+    } else {
+
+     $unconf = "
+       WHERE 0 <
+         ( SELECT count(*) FROM pkg_svc
+             WHERE pkg_svc.pkgpart = cust_pkg.pkgpart
+               AND pkg_svc.quantity > ( SELECT count(*) FROM cust_svc
+                                        WHERE cust_svc.pkgnum = cust_pkg.pkgnum
+                                          AND cust_svc.svcpart = pkg_svc.svcpart
+                                      )
+         )
+     ";
+
+    }
     
   } else {
     die "Empty QUERY_STRING!";
   }
   
   my $statement = "SELECT COUNT(*) FROM cust_pkg $unconf";
-  my $sth = dbh->prepare($statement)
-    or die dbh->errstr. " doing $statement";
+  my $sth = dbh->prepare($statement) or die dbh->errstr." preparing $statement";
   $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
   
   $total = $sth->fetchrow_arrayref->[0];
-  
+
+  #if ( driver_name eq 'mysql' ) { #remove ORDER BY for mysql?  hua?
+  #  @cust_pkg = qsearch('cust_pkg',{}, '', "$unconf $limit" );
+  #} else {
+  #  @cust_pkg = qsearch('cust_pkg',{}, '', "$unconf ORDER BY pkgnum $limit" );
+  #}                                            
   @cust_pkg = qsearch('cust_pkg',{}, '', "$unconf ORDER BY pkgnum $limit" );
 
+  if ( driver_name eq 'mysql' ) {
+    $query = "DROP TABLE temp1_$$,temp2_$$;";
+    my $sth = dbh->prepare($query) or die dbh->errstr. " doing $query";
+    $sth->execute; # or die "Error executing \"$query\": ". $sth->errstr;
+  }
+  
 }
 
 if ( scalar(@cust_pkg) == 1 ) {
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index e28e00e61..eba032d52 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -21,26 +21,35 @@ $query ||= ''; #to avoid use of unitialized value errors
 my $unlinked = '';
 if ( $query =~ /^UN_(.*)$/ ) {
   $query = $1;
-  my $empty = driver_name =~ /^Pg$/i ? qq('') : qq("");
-  $unlinked = "
-    WHERE 0 <
-      ( SELECT count(*) FROM cust_svc
-          WHERE cust_svc.svcnum = svc_acct.svcnum
-            AND ( pkgnum IS NULL OR pkgnum = 0 OR pkgnum = $empty )
-      )
-  ";
+  my $empty = driver_name eq 'Pg' ? qq('') : qq("");
+  if ( driver_name eq 'mysql' ) {
+    $unlinked = "LEFT JOIN cust_svc ON cust_svc.svcnum = svc_acct.svcnum
+                 WHERE cust_svc.pkgnum IS NULL
+                    OR cust_svc.pkgnum = 0
+                    OR cust_svc.pkgnum = $empty";
+  } else {
+    $unlinked = "
+      WHERE 0 <
+        ( SELECT count(*) FROM cust_svc
+            WHERE cust_svc.svcnum = svc_acct.svcnum
+              AND ( pkgnum IS NULL OR pkgnum = 0 OR pkgnum = $empty )
+        )
+    ";
+  }
 }
 
+my $tblname = driver_name eq 'mysql' ? 'svc_acct.' : '';
 my(@svc_acct, $sortby);
 if ( $query eq 'svcnum' ) {
   $sortby=\*svcnum_sort;
-  $orderby = 'ORDER BY svcnum';
+  $orderby = "ORDER BY ${tblname}svcnum";
 } elsif ( $query eq 'username' ) {
   $sortby=\*username_sort;
-  $orderby = 'ORDER BY username';
+  $orderby = "ORDER BY ${tblname}username";
 } elsif ( $query eq 'uid' ) {
   $sortby=\*uid_sort;
-  $orderby = ( $unlinked ? 'AND' : 'WHERE' ). ' uid IS NOT NULL ORDER BY uid';
+  $orderby = ( $unlinked ? 'AND' : 'WHERE' ).
+             " ${tblname}uid IS NOT NULL ORDER BY ${tblname}uid";
 } else {
   $sortby=\*uid_sort;
   @svc_acct = @{&usernamesearch};
@@ -55,6 +64,11 @@ if ( $query eq 'svcnum' || $query eq 'username' || $query eq 'uid' ) {
 
   $total = $sth->fetchrow_arrayref->[0];
 
+  #if ( driver_name eq 'mysql' ) { #remove ORDER BY for mysql?  hua?
+  #  @svc_acct = qsearch('svc_acct', {}, '', "$unlinked $limit");
+  #} else {
+  #  @svc_acct = qsearch('svc_acct', {}, '', "$unlinked $orderby $limit");
+  #}
   @svc_acct = qsearch('svc_acct', {}, '', "$unlinked $orderby $limit");
 
 }
-- 
cgit v1.2.1


From 0f298b30924be46dd3660ed0525f7b1b6f2d3353 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Jun 2002 14:35:52 +0000
Subject: fix unsuspendauto

---
 FS/FS/cust_credit.pm | 6 +++---
 FS/FS/cust_pay.pm    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 0ce5ac614..284d59de2 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -104,8 +104,6 @@ sub insert {
     return "error inserting $self: $error";
   }
 
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
   #false laziness w/ cust_credit::insert
   if ( $unsuspendauto && $old_balance && $cust_main->balance <= 0 ) {
     my @errors = $cust_main->unsuspend;
@@ -117,6 +115,8 @@ sub insert {
   }
   #eslaf
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
   '';
 
 }
@@ -242,7 +242,7 @@ sub credited {
 
 =head1 VERSION
 
-$Id: cust_credit.pm,v 1.15 2002-01-28 06:57:23 ivan Exp $
+$Id: cust_credit.pm,v 1.16 2002-06-04 14:35:52 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index fcd902b1b..98eba704b 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -152,8 +152,6 @@ sub insert {
     }
   }
 
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
   #false laziness w/ cust_credit::insert
   if ( $unsuspendauto && $old_balance && $cust_main->balance <= 0 ) {
     my @errors = $cust_main->unsuspend;
@@ -165,6 +163,8 @@ sub insert {
   }
   #eslaf
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
   '';
 
 }
@@ -405,7 +405,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.20 2002-05-18 09:51:30 ivan Exp $
+$Id: cust_pay.pm,v 1.21 2002-06-04 14:35:52 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From abc9411d7d7c54cf5c888e57c0aaf629a7d0c70a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Jun 2002 17:37:36 +0000
Subject: small doc patch from baloo@gimpgirl.org

---
 httemplate/docs/install.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 355721821..beb9a47d7 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -176,14 +176,16 @@ $ <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -c -h /usr/local/
 $ <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
     </ul>
   <i>(using other auth types, add each user to your <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache authentication</a> and then run: <tt>freeside-adduser <b>username</b></tt></i>
-  <li>As the freeside UNIX user, run <tt>bin/fs-setup <b>username</b></tt> to create the database tables, passing the username of a Freeside user you created above:
+  <li>As the freeside UNIX user, run <tt>bin/fs-setup <b>username</b></tt> (in the untar'ed freeside directory) to create the database tables, passing the username of a Freeside user you created above:
 <pre>
 $ su freeside
+$ cd <b>/path/to/freeside-1.4.0/</b>
 $ bin/fs-setup <b>username</b>
 </pre>
-  <li>As the freeside UNIX user, run <tt>bin/populate-msgcat <b>username</b></tt> to populate the message catalog, passing the username of a Freeside user you created above:
+  <li>As the freeside UNIX user, run <tt>bin/populate-msgcat <b>username</b></tt> (in the untar'ed freeside directory) to populate the message catalog, passing the username of a Freeside user you created above:
 <pre>
 $ su freeside
+$ cd <b>/path/to/freeside-1.4.0/</b>
 $ bin/populate-msgcat <b>username</b>
 </pre>
   <li><tt>freeside-queued</tt> was installed with the Perl modules.  Start it now and ensure that is run upon system startup (Do this manually, or, edit the top-level Makefile, replacing INIT_FILE with the appropriate location on your system, and run <tt>make install-init</tt>.
-- 
cgit v1.2.1


From c9b608b9c0df8921d30055f18c23fd2d030afb25 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 5 Jun 2002 22:46:26 +0000
Subject: more mysql goodness, thanks dale

---
 httemplate/search/cust_main.cgi |  2 +-
 httemplate/search/cust_pkg.cgi  | 11 ++++-------
 httemplate/search/svc_acct.cgi  |  5 -----
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index b4565601b..d9d4e657c 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -159,7 +159,7 @@ if ( $cgi->param('browse')
   }
 
   my @just_cust_main;
-  if ( driver_name eq /mysql/ ) {
+  if ( driver_name eq 'mysql' ) {
     @just_cust_main = qsearch('cust_main', \%search, 'cust_main.*',
                               ",temp1_$$,temp2_$$ $ncancelled $orderby $limit");
   } else {
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 7dfacf189..abf6eee4c 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -86,7 +86,7 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
                       WHERE cust_pkg.pkgnum = cust_svc.pkgnum
                       AND cust_svc.svcpart = pkg_svc.svcpart
                       AND cust_pkg.pkgpart = pkg_svc.pkgpart
-                      GROUP BY cust_svc.pkgnum,cust_svc.svcnum";
+                      GROUP BY cust_svc.pkgnum,cust_svc.svcpart";
       $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
          
       $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
@@ -129,12 +129,9 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
   
   $total = $sth->fetchrow_arrayref->[0];
 
-  #if ( driver_name eq 'mysql' ) { #remove ORDER BY for mysql?  hua?
-  #  @cust_pkg = qsearch('cust_pkg',{}, '', "$unconf $limit" );
-  #} else {
-  #  @cust_pkg = qsearch('cust_pkg',{}, '', "$unconf ORDER BY pkgnum $limit" );
-  #}                                            
-  @cust_pkg = qsearch('cust_pkg',{}, '', "$unconf ORDER BY pkgnum $limit" );
+  my $tblname = driver_name eq 'mysql' ? 'cust_pkg.' : '';
+  @cust_pkg =
+    qsearch('cust_pkg',{}, '', "$unconf ORDER BY ${tblname}pkgnum $limit" );
 
   if ( driver_name eq 'mysql' ) {
     $query = "DROP TABLE temp1_$$,temp2_$$;";
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index eba032d52..0a4338b52 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -64,11 +64,6 @@ if ( $query eq 'svcnum' || $query eq 'username' || $query eq 'uid' ) {
 
   $total = $sth->fetchrow_arrayref->[0];
 
-  #if ( driver_name eq 'mysql' ) { #remove ORDER BY for mysql?  hua?
-  #  @svc_acct = qsearch('svc_acct', {}, '', "$unlinked $limit");
-  #} else {
-  #  @svc_acct = qsearch('svc_acct', {}, '', "$unlinked $orderby $limit");
-  #}
   @svc_acct = qsearch('svc_acct', {}, '', "$unlinked $orderby $limit");
 
 }
-- 
cgit v1.2.1


From 0ada85923cfb057caf1d0e66b73a08b2700703bd Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Fri, 7 Jun 2002 20:33:27 +0000
Subject: Setup hash for CC failed Text::Template

---
 FS/FS/cust_bill.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index f67ef96aa..20755857b 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -525,6 +525,7 @@ sub realtime_card {
   if ( $transaction->is_success() && $action2 ) {
     my $auth = $transaction->authorization;
     my $ordernum = $transaction->order_number;
+
     #warn "********* $auth ***********\n";
     #warn "********* $ordernum ***********\n";
     my $capture =
@@ -590,7 +591,7 @@ sub realtime_card {
       $template->compile()
         or return "($perror) can't compile template: $Text::Template::ERROR";
 
-      my $error = $transaction->error_message;
+      my $templ_hash = { error => $transaction->error_message };
 
       #false laziness w/FS::cust_pay::delete & fs_signup_server && ::send
       $ENV{MAILADDRESS} = $invoice_from;
@@ -604,7 +605,7 @@ sub realtime_card {
       ] );
       my $message = new Mail::Internet (
         'Header' => $header,
-        'Body' => [ $template->fill_in() ],
+        'Body' => [ $template->fill_in(HASH => $templ_hash) ],
       );
       $!=0;
       $message->smtpsend( Host => $smtpmachine )
@@ -950,7 +951,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.36 2002-05-31 20:31:05 ivan Exp $
+$Id: cust_bill.pm,v 1.37 2002-06-07 20:33:27 khoff Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 0e8861ca6b3b04b99ea9477e8c1555561b21c929 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Sat, 8 Jun 2002 07:48:37 +0000
Subject: Default svcpart support for part_pkg.  Fixes 'bug' with new customer
 and online signup.

---
 FS/FS/part_pkg.pm              | 22 ++++++++++++++++++++--
 FS/FS/pkg_svc.pm               | 32 +++++++++++++++++++++++++++++---
 bin/fs-setup                   |  3 ++-
 httemplate/browse/part_pkg.cgi |  4 +++-
 httemplate/docs/schema.html    |  1 +
 httemplate/edit/part_pkg.cgi   | 17 +++++++++++++++--
 6 files changed, 70 insertions(+), 9 deletions(-)

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 9c33e9a3b..420ffcb3d 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -2,7 +2,7 @@ package FS::part_pkg;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw( qsearch dbh );
+use FS::Record qw( qsearch qsearchs dbh );
 use FS::pkg_svc;
 use FS::agent_type;
 use FS::type_pkgs;
@@ -225,6 +225,12 @@ sub check {
 
   }
 
+  if ($self->def_svcpart and my @pkg_svc = $self->pkg_svc) {
+    unless (grep { $_->svcpart == $self->def_svcpart } @pkg_svc) {
+      return "no svcparts for this package match def_svcpart ".$self->def_svcpart;
+    }
+  }
+
     $self->ut_numbern('pkgpart')
       || $self->ut_text('pkg')
       || $self->ut_text('comment')
@@ -259,11 +265,23 @@ associated with this billing item definition (see L<FS::pkg_svc>).  Returns
 false if there not exactly one service definition with quantity 1, or if 
 SVCDB is specified and does not match the svcdb of the service definition, 
 
+If the part_pkg has a nonzero def_svcpart, it takes precedence, even if it has 
+quantity > 1 and/or there are other service definitions, UNLESS SVCDB is specified 
+and doesn't match the svcdb of the def_svcpart.
+
 =cut
 
 sub svcpart {
   my $self = shift;
   my $svcdb = shift;
+
+  if ($self->def_svcpart) {
+    if ((not $svcdb) or qsearchs('part_svc', { svcpart => $self->def_svcpart,
+                                               svcdb   => $svcdb })) {
+      return $self->def_svcpart;
+    }
+  }
+
   my @pkg_svc = $self->pkg_svc;
   return '' if scalar(@pkg_svc) != 1
                || $pkg_svc[0]->quantity != 1
@@ -297,7 +315,7 @@ sub payby {
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.14 2002-05-09 12:38:39 ivan Exp $
+$Id: part_pkg.pm,v 1.15 2002-06-08 07:48:36 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/pkg_svc.pm b/FS/FS/pkg_svc.pm
index 1812dbf29..d64d10db2 100644
--- a/FS/FS/pkg_svc.pm
+++ b/FS/FS/pkg_svc.pm
@@ -67,8 +67,24 @@ otherwise returns false.
 
 =item delete
 
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
+Deletes this record from the database.  If this svcpart is also the default svcpart,
+we set part_pkg.def_svcpart to NULL.  If there is an error, returns the error,
+otherwise returns false.
+
+sub delete {
+  my $self = shift;
+  my $part_pkg = qsearchs( 'part_pkg', { pkgpart => $self->pkgpart } );
+
+  # Should this be wrapped in a transaction?
+  if ( $part_pkg->def_svcpart == $self->svcpart ) {
+    my $new = new FS::part_pkg $part_pkg->hash;
+    $new->def_svcpart = 0;
+    my $error = $new->replace($part_pkg);
+    return $error if $error;
+  }
+
+  $self->SUPER::delete;
+}
 
 =item replace OLD_RECORD
 
@@ -83,6 +99,16 @@ sub replace {
   return "Can't change pkgpart!" if $old->pkgpart != $new->pkgpart;
   return "Can't change svcpart!" if $old->svcpart != $new->svcpart;
 
+  my $part_pkg = qsearchs( 'part_pkg', { pkgpart => $new->pkgpart } );
+
+  # Should this be wrapped in a transaction?
+  if ( ($part_pkg->def_svcpart == $new->svcpart) && ($new->quantity == 0) ) {
+    my $new_part_pkg = new FS::part_pkg $part_pkg->hash;
+    $new_part_pkg->def_svcpart = 0;
+    my $error = $new_part_pkg->replace($part_pkg);
+    return $error if $error;
+  }
+
   $new->SUPER::replace($old);
 }
 
@@ -137,7 +163,7 @@ sub part_svc {
 
 =head1 VERSION
 
-$Id: pkg_svc.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: pkg_svc.pm,v 1.2 2002-06-08 07:48:37 khoff Exp $
 
 =head1 BUGS
 
diff --git a/bin/fs-setup b/bin/fs-setup
index 558a5fdd9..9b9ce8686 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.92 2002-05-31 22:37:06 ivan Exp $
+# $Id: fs-setup,v 1.93 2002-06-08 07:48:37 khoff Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -662,6 +662,7 @@ sub tables_hash_hack {
         'plandata',   'text', 'NULL', '',
         'disabled',   'char', 'NULL', 1,
         'taxclass',   'varchar', 'NULL', $char_d,
+        'def_svcpart','int', '', '',
       ],
       'primary_key' => 'pkgpart',
       'unique' => [ [] ],
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index c20811491..fd269bef1 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -81,7 +81,8 @@ END
     my($svcpart)=$pkg_svc->getfield('svcpart');
     my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart });
     print $n,qq!<TD><A HREF="${p}edit/part_svc.cgi?$svcpart">!,
-          $part_svc->getfield('svc'),"</A></TD><TD>",
+          $part_svc->getfield('svc'),"</A>",
+          (($hashref->{def_svcpart} == $svcpart) ? "*</TD><TD>" : "</TD><TD>"),
           $pkg_svc->getfield('quantity'),"</TD></TR>\n";
     $n="<TR>";
   }
@@ -93,6 +94,7 @@ $colspan = $cgi->param('showdisabled') ? 8 : 9;
 print <<END;
    <TR><TD COLSPAN=$colspan><I><A HREF="${p}edit/part_pkg.cgi">Add a new package definition</A></I></TD></TR>
     </TABLE>
+    &nbsp* - Default service
   </BODY>
 </HTML>
 END
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 2b8b3a132..e2a0f475a 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -238,6 +238,7 @@
         <li>plan - price plan
         <li>plandata - additional price plan data
         <li>disabled - Disabled flag, empty or `Y'
+        <li>def_svcpart - Default svcpart to use when ordering this part_pkg
       </ul>
     <li><a name="part_referral" href="man/FS/part_referral.html">part_referral</a> - Referral listing
       <ul>
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index e03017db4..770facb7e 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -112,7 +112,10 @@ print '>';
 print '</TD></TR></TABLE>';
 
 my $thead =  "\n\n". ntable('#cccccc', 2). <<END;
-<TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH><TH BGCOLOR="#dcdcdc">Service</TH></TR>
+<TR>
+<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH>
+<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Service</FONT></TH>
+</TR>
 END
 
 #unless ( $cgi->param('clone') ) {
@@ -169,6 +172,16 @@ unless ( 0 ) {
   #print "</TR></TABLE>";
 }
 
+print qq!Default service <SELECT NAME="def_svcpart" onChange="fchanged(this)">!,
+      qq!<OPTION VALUE="0">None!;
+foreach my $part_svc ( @part_svc ) {
+  print qq!<OPTION VALUE="!, $part_svc->svcpart, '"',
+        (($hashref->{def_svcpart} == $part_svc->svcpart) ? " SELECTED>" : ">"),
+        $part_svc->svc, qq!</OPTION>!;
+}
+print qq!</SELECT><BR>\n!;
+
+
 foreach my $f ( qw( clone pkgnum ) ) {
   print qq!<INPUT TYPE="hidden" NAME="$f" VALUE="!. $cgi->param($f). '">';
 }
@@ -376,7 +389,7 @@ my $widget = new HTML::Widgets::SelectLayers(
   'form_action'    => 'process/part_pkg.cgi',
   'form_text'      => [ qw(pkg comment freq clone pkgnum pkgpart), @fixups ],
   'form_checkbox'  => [ qw(setuptax recurtax disabled) ],
-  'form_select'    => [ @form_select ],
+  'form_select'    => [ qw(def_svcpart), @form_select ],
   'fixup_callback' => sub {
                         #my $ = @_;
                         my $html = '';
-- 
cgit v1.2.1


From 3162b06a6d3be9ddf4daea2c29cd94516ac40f68 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 10 Jun 2002 01:39:51 +0000
Subject: Rollback part_pkg.def_svcpart changes.

---
 FS/FS/part_pkg.pm              | 22 ++--------------------
 FS/FS/pkg_svc.pm               | 32 +++-----------------------------
 bin/fs-setup                   |  3 +--
 httemplate/browse/part_pkg.cgi |  4 +---
 httemplate/docs/schema.html    |  1 -
 httemplate/edit/part_pkg.cgi   | 17 ++---------------
 6 files changed, 9 insertions(+), 70 deletions(-)

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 420ffcb3d..e914636e4 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -2,7 +2,7 @@ package FS::part_pkg;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs dbh );
+use FS::Record qw( qsearch dbh );
 use FS::pkg_svc;
 use FS::agent_type;
 use FS::type_pkgs;
@@ -225,12 +225,6 @@ sub check {
 
   }
 
-  if ($self->def_svcpart and my @pkg_svc = $self->pkg_svc) {
-    unless (grep { $_->svcpart == $self->def_svcpart } @pkg_svc) {
-      return "no svcparts for this package match def_svcpart ".$self->def_svcpart;
-    }
-  }
-
     $self->ut_numbern('pkgpart')
       || $self->ut_text('pkg')
       || $self->ut_text('comment')
@@ -265,23 +259,11 @@ associated with this billing item definition (see L<FS::pkg_svc>).  Returns
 false if there not exactly one service definition with quantity 1, or if 
 SVCDB is specified and does not match the svcdb of the service definition, 
 
-If the part_pkg has a nonzero def_svcpart, it takes precedence, even if it has 
-quantity > 1 and/or there are other service definitions, UNLESS SVCDB is specified 
-and doesn't match the svcdb of the def_svcpart.
-
 =cut
 
 sub svcpart {
   my $self = shift;
   my $svcdb = shift;
-
-  if ($self->def_svcpart) {
-    if ((not $svcdb) or qsearchs('part_svc', { svcpart => $self->def_svcpart,
-                                               svcdb   => $svcdb })) {
-      return $self->def_svcpart;
-    }
-  }
-
   my @pkg_svc = $self->pkg_svc;
   return '' if scalar(@pkg_svc) != 1
                || $pkg_svc[0]->quantity != 1
@@ -315,7 +297,7 @@ sub payby {
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.15 2002-06-08 07:48:36 khoff Exp $
+$Id: part_pkg.pm,v 1.16 2002-06-10 01:39:50 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/pkg_svc.pm b/FS/FS/pkg_svc.pm
index d64d10db2..3c544ffd8 100644
--- a/FS/FS/pkg_svc.pm
+++ b/FS/FS/pkg_svc.pm
@@ -67,24 +67,8 @@ otherwise returns false.
 
 =item delete
 
-Deletes this record from the database.  If this svcpart is also the default svcpart,
-we set part_pkg.def_svcpart to NULL.  If there is an error, returns the error,
-otherwise returns false.
-
-sub delete {
-  my $self = shift;
-  my $part_pkg = qsearchs( 'part_pkg', { pkgpart => $self->pkgpart } );
-
-  # Should this be wrapped in a transaction?
-  if ( $part_pkg->def_svcpart == $self->svcpart ) {
-    my $new = new FS::part_pkg $part_pkg->hash;
-    $new->def_svcpart = 0;
-    my $error = $new->replace($part_pkg);
-    return $error if $error;
-  }
-
-  $self->SUPER::delete;
-}
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
 
 =item replace OLD_RECORD
 
@@ -99,16 +83,6 @@ sub replace {
   return "Can't change pkgpart!" if $old->pkgpart != $new->pkgpart;
   return "Can't change svcpart!" if $old->svcpart != $new->svcpart;
 
-  my $part_pkg = qsearchs( 'part_pkg', { pkgpart => $new->pkgpart } );
-
-  # Should this be wrapped in a transaction?
-  if ( ($part_pkg->def_svcpart == $new->svcpart) && ($new->quantity == 0) ) {
-    my $new_part_pkg = new FS::part_pkg $part_pkg->hash;
-    $new_part_pkg->def_svcpart = 0;
-    my $error = $new_part_pkg->replace($part_pkg);
-    return $error if $error;
-  }
-
   $new->SUPER::replace($old);
 }
 
@@ -163,7 +137,7 @@ sub part_svc {
 
 =head1 VERSION
 
-$Id: pkg_svc.pm,v 1.2 2002-06-08 07:48:37 khoff Exp $
+$Id: pkg_svc.pm,v 1.3 2002-06-10 01:39:50 khoff Exp $
 
 =head1 BUGS
 
diff --git a/bin/fs-setup b/bin/fs-setup
index 9b9ce8686..77f1452eb 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.93 2002-06-08 07:48:37 khoff Exp $
+# $Id: fs-setup,v 1.94 2002-06-10 01:39:50 khoff Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -662,7 +662,6 @@ sub tables_hash_hack {
         'plandata',   'text', 'NULL', '',
         'disabled',   'char', 'NULL', 1,
         'taxclass',   'varchar', 'NULL', $char_d,
-        'def_svcpart','int', '', '',
       ],
       'primary_key' => 'pkgpart',
       'unique' => [ [] ],
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index fd269bef1..c20811491 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -81,8 +81,7 @@ END
     my($svcpart)=$pkg_svc->getfield('svcpart');
     my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart });
     print $n,qq!<TD><A HREF="${p}edit/part_svc.cgi?$svcpart">!,
-          $part_svc->getfield('svc'),"</A>",
-          (($hashref->{def_svcpart} == $svcpart) ? "*</TD><TD>" : "</TD><TD>"),
+          $part_svc->getfield('svc'),"</A></TD><TD>",
           $pkg_svc->getfield('quantity'),"</TD></TR>\n";
     $n="<TR>";
   }
@@ -94,7 +93,6 @@ $colspan = $cgi->param('showdisabled') ? 8 : 9;
 print <<END;
    <TR><TD COLSPAN=$colspan><I><A HREF="${p}edit/part_pkg.cgi">Add a new package definition</A></I></TD></TR>
     </TABLE>
-    &nbsp* - Default service
   </BODY>
 </HTML>
 END
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index e2a0f475a..2b8b3a132 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -238,7 +238,6 @@
         <li>plan - price plan
         <li>plandata - additional price plan data
         <li>disabled - Disabled flag, empty or `Y'
-        <li>def_svcpart - Default svcpart to use when ordering this part_pkg
       </ul>
     <li><a name="part_referral" href="man/FS/part_referral.html">part_referral</a> - Referral listing
       <ul>
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 770facb7e..e03017db4 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -112,10 +112,7 @@ print '>';
 print '</TD></TR></TABLE>';
 
 my $thead =  "\n\n". ntable('#cccccc', 2). <<END;
-<TR>
-<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH>
-<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Service</FONT></TH>
-</TR>
+<TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH><TH BGCOLOR="#dcdcdc">Service</TH></TR>
 END
 
 #unless ( $cgi->param('clone') ) {
@@ -172,16 +169,6 @@ unless ( 0 ) {
   #print "</TR></TABLE>";
 }
 
-print qq!Default service <SELECT NAME="def_svcpart" onChange="fchanged(this)">!,
-      qq!<OPTION VALUE="0">None!;
-foreach my $part_svc ( @part_svc ) {
-  print qq!<OPTION VALUE="!, $part_svc->svcpart, '"',
-        (($hashref->{def_svcpart} == $part_svc->svcpart) ? " SELECTED>" : ">"),
-        $part_svc->svc, qq!</OPTION>!;
-}
-print qq!</SELECT><BR>\n!;
-
-
 foreach my $f ( qw( clone pkgnum ) ) {
   print qq!<INPUT TYPE="hidden" NAME="$f" VALUE="!. $cgi->param($f). '">';
 }
@@ -389,7 +376,7 @@ my $widget = new HTML::Widgets::SelectLayers(
   'form_action'    => 'process/part_pkg.cgi',
   'form_text'      => [ qw(pkg comment freq clone pkgnum pkgpart), @fixups ],
   'form_checkbox'  => [ qw(setuptax recurtax disabled) ],
-  'form_select'    => [ qw(def_svcpart), @form_select ],
+  'form_select'    => [ @form_select ],
   'fixup_callback' => sub {
                         #my $ = @_;
                         my $html = '';
-- 
cgit v1.2.1


From 663035e0075acc36364477579daaa3d42310643d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 Jun 2002 02:42:04 +0000
Subject: back to ASP for profiling...

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index be4e9db2a..48b7d7d73 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-#TEMPLATE = asp
-TEMPLATE = mason
+TEMPLATE = asp
+#TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
-- 
cgit v1.2.1


From 27fc2f8819d8f144efc7b131c5824cc73938d06c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 Jun 2002 02:51:53 +0000
Subject: unused global

---
 FS/FS/CGI.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 190c0aa37..28b3a06fa 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -1,7 +1,7 @@
 package FS::CGI;
 
 use strict;
-use vars qw(@EXPORT_OK @ISA @header);
+use vars qw(@EXPORT_OK @ISA);
 use Exporter;
 use CGI;
 use URI::URL;
-- 
cgit v1.2.1


From f6fcf4327c0d5efe31ce3717ba1dae5099eb50cd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 Jun 2002 02:52:20 +0000
Subject: silence undefined warnings

---
 FS/FS/cust_main_county.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index 28f69c262..e41564d21 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -128,6 +128,8 @@ sub regionselector {
   my ( $selected_county, $selected_state, $selected_country,
        $prefix, $onchange ) = @_;
 
+  $prefix = '' unless defined $prefix;
+
   $countyflag = 0;
 
 #  unless ( @cust_main_county ) { #cache 
-- 
cgit v1.2.1


From bdcc6cb95cadf46e4b71e3967de41ccd35f2f047 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 Jun 2002 02:52:48 +0000
Subject: re-my'ed var

---
 FS/FS/svc_Common.pm | 5 ++---
 FS/FS/svc_domain.pm | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 5cddb91cf..c804242de 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -163,7 +163,6 @@ otherwise returns false.
 
 sub replace {
   my ($new, $old) = (shift, shift);
-  my $error;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -188,7 +187,7 @@ sub replace {
       my $error = $part_export->export_replace($new,$old);
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
-        return "exporting to ". $part_export->exporttype.
+        return "error exporting to ". $part_export->exporttype.
                " (transaction rolled back): $error";
       }
     }
@@ -292,7 +291,7 @@ sub cancel { ''; }
 
 =head1 VERSION
 
-$Id: svc_Common.pm,v 1.9 2002-05-31 00:18:56 khoff Exp $
+$Id: svc_Common.pm,v 1.10 2002-06-10 02:52:37 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index fd57713c8..b06d03013 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -294,7 +294,6 @@ returns the error, otherwise returns false.
 
 sub replace {
   my ( $new, $old ) = ( shift, shift );
-  my $error;
 
   return "Can't change domain - reorder."
     if $old->getfield('domain') ne $new->getfield('domain'); 
@@ -451,7 +450,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.30 2002-05-31 00:18:57 khoff Exp $
+$Id: svc_domain.pm,v 1.31 2002-06-10 02:52:48 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 0fbc0c140e21f1d2d0b422607ab0754a07f3ef53 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 Jun 2002 19:30:06 +0000
Subject: add small time display to dates

---
 httemplate/view/cust_main.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 52d85deff..7beba8375 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -364,7 +364,8 @@ foreach my $package (@packages) {
 
   for ( qw( setup bill susp expire cancel ) ) {
     print "<TD ROWSPAN=$rowspan><FONT SIZE=-1>", ( $package->getfield($_)
-            ? time2str("%D", $package->getfield($_) )
+            ? time2str("%D<BR><FONT SIZE=-2>%r %z</FONT>",
+              $package->getfield($_) )
             :  '&nbsp'
           ), '</FONT></TD>',
     ;
-- 
cgit v1.2.1


From 0c9cafb680d1f2b19f7b9b45063e003228af7967 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 Jun 2002 19:41:48 +0000
Subject: fixup time display in packages

---
 httemplate/view/cust_main.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 7beba8375..5e672af3d 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -364,7 +364,7 @@ foreach my $package (@packages) {
 
   for ( qw( setup bill susp expire cancel ) ) {
     print "<TD ROWSPAN=$rowspan><FONT SIZE=-1>", ( $package->getfield($_)
-            ? time2str("%D<BR><FONT SIZE=-2>%r %z</FONT>",
+            ? time2str("%D<BR><FONT SIZE=-3>%l:%M:%S%P&nbsp;%z</FONT>",
               $package->getfield($_) )
             :  '&nbsp'
           ), '</FONT></TD>',
-- 
cgit v1.2.1


From 4a63d301b47a74ecd111166420a81cfe9a8fb874 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 Jun 2002 19:44:45 +0000
Subject: final visual update on package date view

---
 httemplate/view/cust_main.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 5e672af3d..c5a8c82dd 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -364,7 +364,7 @@ foreach my $package (@packages) {
 
   for ( qw( setup bill susp expire cancel ) ) {
     print "<TD ROWSPAN=$rowspan><FONT SIZE=-1>", ( $package->getfield($_)
-            ? time2str("%D<BR><FONT SIZE=-3>%l:%M:%S%P&nbsp;%z</FONT>",
+            ? time2str("%D</FONT><BR><FONT SIZE=-3>%l:%M:%S%P&nbsp;%z</FONT>",
               $package->getfield($_) )
             :  '&nbsp'
           ), '</FONT></TD>',
-- 
cgit v1.2.1


From 25354a69186b74866b163d2b5c2b3aa52aa5658c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 Jun 2002 22:07:24 +0000
Subject: retry realtime_card invoice events when a card changes (closes:
 Bug#417)

---
 FS/FS/cust_bill_event.pm | 15 +++++++++++++++
 FS/FS/cust_main.pm       | 48 +++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_bill_event.pm b/FS/FS/cust_bill_event.pm
index d5ca55f36..f631987aa 100644
--- a/FS/FS/cust_bill_event.pm
+++ b/FS/FS/cust_bill_event.pm
@@ -143,6 +143,21 @@ sub cust_bill {
   qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
 }
 
+=item retry
+
+Changes the status of this event from B<done> to B<failed>, allowing it to be
+retried.
+
+=cut
+
+sub retry {
+  my $self = shift;
+  return '' unless $self->status eq 'done';
+  my $old = ref($self)->new( { $self->hash } );
+  $self->status('failed');
+  $self->replace($old);
+}
+
 =back
 
 =head1 BUGS
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 0faa60ca6..8a0124a9b 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -482,6 +482,27 @@ sub replace {
     $self->invoicing_list( $invoicing_list );
   }
 
+  if ( $self->payby eq 'CARD' &&
+       grep { $self->get($_) ne $old->get($_) } qw(payinfo paydate payname) ) {
+    # card info has changed, want to retry realtime_card invoice events
+    foreach my $cust_bill_event (
+      grep {
+             #$_->part_bill_event->plan eq 'realtime-card'
+             $_->part_bill_event->eventcode eq '$cust_bill->realtime_card();'
+               && $_->status eq 'done'
+               && $_->statustext
+           }
+        $self->open_cust_bill->cust_bill_event
+    ) {
+      my $error = $cust_bill_event->retry;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "error scheduling invoice events for retry: $error";
+      }
+    }
+
+  }
+
   #false laziness with sub insert
   my $queue = new FS::queue { 'job' => 'FS::cust_main::append_fuzzyfiles' };
   $error = $queue->insert($self->getfield('last'), $self->company);
@@ -1203,9 +1224,7 @@ sub collect {
     return '';
   }
 
-  foreach my $cust_bill (
-    qsearch('cust_bill', { 'custnum' => $self->custnum, } )
-  ) {
+  foreach my $cust_bill ( $self->cust_bill ) {
 
     #this has to be before next's
     my $amount = sprintf( "%.2f", $balance < $cust_bill->owed
@@ -1708,6 +1727,29 @@ sub charge {
 
 }
 
+=item cust_bill
+
+Returns all the invoices (see L<FS::cust_bill>) for this customer.
+
+=cut
+
+sub cust_bill {
+  my $self = shift;
+  qsearch('cust_bill', { 'custnum' => $self->custnum, } )
+}
+
+=item open_cust_bill
+
+Returns all the open (owed > 0) invoices (see L<FS::cust_bill>) for this
+customer.
+
+=cut
+
+sub open_cust_bill {
+  my $self = shift;
+  grep { $_->owed > 0 } $self->cust_bill;
+}
+
 =back
 
 =head1 SUBROUTINES
-- 
cgit v1.2.1


From f21edcf70602d7f2ea314d65382bd8c40f51d530 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 Jun 2002 22:48:03 +0000
Subject: also retry cards when user clicks "Bill now" (closes: Bug#417)

---
 FS/FS/cust_main.pm       | 25 +++++++++++++++++++++++++
 httemplate/misc/bill.cgi |  7 ++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 8a0124a9b..b6600fb29 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -485,6 +485,7 @@ sub replace {
   if ( $self->payby eq 'CARD' &&
        grep { $self->get($_) ne $old->get($_) } qw(payinfo paydate payname) ) {
     # card info has changed, want to retry realtime_card invoice events
+    #false laziness w/collect
     foreach my $cust_bill_event (
       grep {
              #$_->part_bill_event->plan eq 'realtime-card'
@@ -500,6 +501,7 @@ sub replace {
         return "error scheduling invoice events for retry: $error";
       }
     }
+    #eslaf
 
   }
 
@@ -1192,6 +1194,8 @@ invoice_time - Use this time when deciding when to print invoices and
 late notices on those invoices.  The default is now.  It is specified as a UNIX timestamp; see L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse>
 for conversion functions.
 
+retry_card - Retry cards even when not scheduled by invoice events.
+
 batch_card - This option is deprecated.  See the invoice events web interface
 to control whether cards are batched or run against a realtime gateway.
 
@@ -1224,6 +1228,26 @@ sub collect {
     return '';
   }
 
+  if ( exists($options{'retry_card'}) && $options{'retry_card'} ) {
+    #false laziness w/replace
+    foreach my $cust_bill_event (
+      grep {
+             #$_->part_bill_event->plan eq 'realtime-card'
+             $_->part_bill_event->eventcode eq '$cust_bill->realtime_card();'
+               && $_->status eq 'done'
+               && $_->statustext
+           }
+        $self->open_cust_bill->cust_bill_event
+    ) {
+      my $error = $cust_bill_event->retry;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "error scheduling invoice events for retry: $error";
+      }
+    }
+    #eslaf
+  }
+
   foreach my $cust_bill ( $self->cust_bill ) {
 
     #this has to be before next's
@@ -1242,6 +1266,7 @@ sub collect {
 
     next unless $amount > 0;
 
+
     foreach my $part_bill_event (
       sort {    $a->seconds   <=> $b->seconds
              || $a->weight    <=> $b->weight
diff --git a/httemplate/misc/bill.cgi b/httemplate/misc/bill.cgi
index 6f523a52c..f048e5559 100755
--- a/httemplate/misc/bill.cgi
+++ b/httemplate/misc/bill.cgi
@@ -18,9 +18,10 @@ unless ( $error ) {
 
   $error = $cust_main->collect(
   #                             'invoice-time'=>$time,
-  #                             'batch_card'=> 'yes',
-                               'batch_card'=> 'no',
-                               'report_badcard'=> 'yes',
+                               #'batch_card'=> 'yes',
+                               #'batch_card'=> 'no',
+                               #'report_badcard'=> 'yes',
+                               'retry_card' => 'yes',
                               );
 }
 #&eidiot($error) if $error;
-- 
cgit v1.2.1


From 75f034098e0dc30b2a34ec4273a8f9fbe1147e5e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 Jun 2002 23:02:41 +0000
Subject: fix *** ERROR: unterminated L<...> at line 299 in file
 FS/domain_record.pm

---
 FS/FS/domain_record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 4ed713c77..03f9e10bb 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -296,7 +296,7 @@ sub increment_serial {
 
 =item svc_domain
 
-Returns the domain (see L<FS::svc_domain) for this record.
+Returns the domain (see L<FS::svc_domain>) for this record.
 
 =cut
 
@@ -309,7 +309,7 @@ sub svc_domain {
 
 =head1 VERSION
 
-$Id: domain_record.pm,v 1.9 2002-05-23 13:00:08 ivan Exp $
+$Id: domain_record.pm,v 1.10 2002-06-10 23:02:41 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From d42c7a08d933e3e91fcfa988c15cf1791b68ee85 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Jun 2002 00:58:03 +0000
Subject: dist fixes.  locate more stuff in Makefile.  whew.

---
 Makefile             | 25 +++++++++++++++++++++++++
 init.d/freeside-init | 16 ++++++++--------
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 48b7d7d73..0f7ff71c6 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,21 @@ FREESIDE_RESTART = /etc/init.d/freeside restart
 
 INSTALLGROUP = root
 
+#edit the stuff below to have the daemons start
+
+QUEUED_USER=ivan
+
+#eventually this shouldn't be needed
+FREESIDE_PATH = `pwd`
+
+PASSWD_USER = ivan
+PASSWD_MACHINE = localhost
+
+SIGNUP_USER = ivan
+SIGNUP_MACHINE = localhost
+SIGNUP_AGENTNUM = 2
+SIGNUP_REFNUM = 2
+
 #---
 
 #not changable yet
@@ -83,6 +98,16 @@ install-perl-modules: perl-modules
 install-init:
 	#[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
 	install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
+	perl -p -i -e "\
+	  s/%%%QUEUED_USER%%%/${QUEUED_USER}/g;\
+	  s'%%%FREESIDE_PATH%%%'${FREESIDE_PATH}'g;\
+	  s/%%%PASSWD_USER%%%/${PASSWD_USER}/g;\
+	  s/%%%PASSWD_MACHINE%%%/${PASSWD_MACHINE}/g;\
+	  s/%%%SIGNUP_USER%%%/${SIGNUP_USER}/g;\
+	  s/%%%SIGNUP_MACHINE%%%/${SIGNUP_MACHINE}/g;\
+	  s/%%%SIGNUP_AGENTNUM%%%/${SIGNUP_AGENTNUM}/g;\
+	  s/%%%SIGNUP_REFNUM%%%/${SIGNUP_REFNUM}/g;\
+	" ${INIT_FILE}
 
 install: install-perl-modules install-docs install-init
 
diff --git a/init.d/freeside-init b/init.d/freeside-init
index 46f133d59..d3016b289 100644
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -3,17 +3,17 @@
 # chkconfig: 345 86 16
 # description: Freeside daemons
 
-QUEUED_USER=ivan
+QUEUED_USER=%%%QUEUED_USER%%%
 
-FREESIDE_PATH="/home/ivan/freeside_current"
+FREESIDE_PATH="%%%FREESIDE_PATH%%%"
 
-PASSWD_USER=ivan
-PASSWD_MACHINE=localhost
+PASSWD_USER=%%%PASSWD_USER%%%
+PASSWD_MACHINE=%%%PASSWD_MACHINE%%%
 
-SIGNUP_USER=ivan
-SIGNUP_MACHINE=localhost
-SIGNUP_AGENTNUM=2
-SIGNUP_REFNUM=2
+SIGNUP_USER=%%%SIGNUP_USER%%%
+SIGNUP_MACHINE=%%%SIGNUP_MACHINE%%%
+SIGNUP_AGENTNUM=%%%SIGNUP_AGENTNUM%%%
+SIGNUP_REFNUM=%%%SIGNUP_REFNUM%%%
 
 case "$1" in
   start)
-- 
cgit v1.2.1


From 6a5e93685fe7d6d3ca00d389338487578a848b84 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Jun 2002 03:25:03 +0000
Subject: - add new suspend and unsuspend export hooks (with null defaults) -
 infostreet export: actually suspend/unsuspend at infostreet (closes: Bug#418)
 - infostreet export: set some contact fields @ infostreet (Bug#419)

---
 FS/FS/part_export.pm            | 34 ++++++++++++++++++
 FS/FS/part_export/infostreet.pm | 51 +++++++++++++++++++++++++--
 FS/FS/svc_Common.pm             | 76 ++++++++++++++++++++++++++++++++++++++---
 FS/FS/svc_acct.pm               | 14 ++++----
 4 files changed, 163 insertions(+), 12 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index ae201464d..bf6072089 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -414,6 +414,26 @@ sub export_delete {
   $self->_export_delete(@_);
 }
 
+=item export_suspend
+
+=cut
+
+sub export_suspend {
+  my $self = shift;
+  $self->rebless;
+  $self->_export_suspend(@_);
+}
+
+=item export_unsuspend
+
+=cut
+
+sub export_unsuspend {
+  my $self = shift;
+  $self->rebless;
+  $self->_export_unsuspend(@_);
+}
+
 #fallbacks providing useful error messages intead of infinite loops
 sub _export_insert {
   my $self = shift;
@@ -430,6 +450,20 @@ sub _export_delete {
   return "_export_delete: unknown export type ". $self->exporttype;
 }
 
+#fallbacks providing null operations
+
+sub _export_suspend {
+  my $self = shift;
+  #warn "warning: _export_suspened unimplemented for". ref($self);
+  '';
+}
+
+sub _export_unsuspend {
+  my $self = shift;
+  #warn "warning: _export_unsuspend unimplemented for ". ref($self);
+  '';
+}
+
 =back
 
 =head1 SUBROUTINES
diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
index 2ce556339..8bf227d82 100644
--- a/FS/FS/part_export/infostreet.pm
+++ b/FS/FS/part_export/infostreet.pm
@@ -1,16 +1,42 @@
 package FS::part_export::infostreet;
 
-use vars qw(@ISA);
+use vars qw(@ISA %infostreet2cust_main);
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+%infostreet2cust_main = (
+  'firstName'   => 'first',
+  'lastName'    => 'last',
+  'address1'    => 'address1',
+  'address2'    => 'address2',
+  'city'        => 'city',
+  'state'       => 'state',
+  'zipCode'     => 'zip',
+  'country'     => 'country',
+  'phoneNumber' => 'dayphone',
+);
+
 sub rebless { shift; }
 
 sub _export_insert {
   my( $self, $svc_acct ) = (shift, shift);
-  $self->infostreet_queue( $svc_acct->svcnum,
+  my $cust_main = $svc_acct->cust_svc->cust_pkg->cust_main;
+  my $accountID = $self->infostreet_queue( $svc_acct->svcnum,
     'createUser', $svc_acct->username, $svc_acct->_password );
+  foreach my $infostreet_field ( keys %infostreet2cust_main ) {
+    my $error = $self->infostreet_queue( $svc_acct->svcnum,
+      'setContactField', $accountID, $infostreet_field,
+        $cust_main->getfield( $infostreet2cust_main{$infostreet_field} ) );
+    return $error if $error;
+  }
+
+  $self->infostreet_queue( $svc_acct->svcnum,
+    'setContactField', $accountID, 'email', $cust_main->invoicing_list )
+  #this one is kinda noment-specific
+  || $self->infostreet_queue( $svc_acct->svcnum,
+         'setContactField', $accountID, 'title', $cust_main->agent->agent );
+
 }
 
 sub _export_replace {
@@ -28,6 +54,18 @@ sub _export_delete {
     'purgeAccount,releaseUsername', $svc_acct->username );
 }
 
+sub _export_suspend {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->infostreet_queue( $svc_acct->svcnum,
+    'setStatus', $svc_acct->username, 'DISABLED' );
+}
+
+sub _export_unsuspend {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->infostreet_queue( $svc_acct->svcnum,
+    'setStatus', $svc_acct->username, 'ACTIVE' );
+}
+
 sub infostreet_queue {
   my( $self, $svcnum, $method ) = (shift, shift, shift);
   my $queue = new FS::queue {
@@ -68,8 +106,17 @@ sub infostreet_command { #subroutine, not method
   my %result = _infostreet_parse($result);
   die $result{error} unless $result{success};
 
+  $result->{data};
+
 }
 
+#sub infostreet_command_byid { #subroutine, not method;
+#  my($url, $username, $password, $groupID, $method, @args ) = @_;
+#
+#  infostreet_command
+#
+#}
+
 sub _infostreet_parse { #subroutine, not method
   my $arg = shift;
   map {
diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index c804242de..cd278efb5 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -274,24 +274,92 @@ sub cust_svc {
 
 =item suspend
 
+Runs export_suspend callbacks.
+
+=cut
+
+sub suspend {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  #new-style exports!
+  unless ( $noexport_hack ) {
+    foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
+      my $error = $part_export->export_suspend($self);
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "error exporting to ". $part_export->exporttype.
+               " (transaction rolled back): $error";
+      }
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+
+}
+
 =item unsuspend
 
+Runs export_unsuspend callbacks.
+
+=cut
+
+sub unsuspend {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  #new-style exports!
+  unless ( $noexport_hack ) {
+    foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
+      my $error = $part_export->export_unsuspend($self);
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "error exporting to ". $part_export->exporttype.
+               " (transaction rolled back): $error";
+      }
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+
+}
+
 =item cancel
 
-Stubs - return false (no error) so derived classes don't need to define these
+Stub - returns false (no error) so derived classes don't need to define these
 methods.  Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
 
 =cut
 
-sub suspend { ''; }
-sub unsuspend { ''; }
 sub cancel { ''; }
 
 =back
 
 =head1 VERSION
 
-$Id: svc_Common.pm,v 1.10 2002-06-10 02:52:37 ivan Exp $
+$Id: svc_Common.pm,v 1.11 2002-06-11 03:25:03 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index e3589d846..f0b0abc2a 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -433,10 +433,11 @@ sub suspend {
          ) {
     $hash{_password} = '*SUSPENDED* '.$hash{_password};
     my $new = new FS::svc_acct ( \%hash );
-    $new->replace($self);
-  } else {
-    ''; #no error (already suspended)
+    my $error = $new->replace($self);
+    return $error if $error;
   }
+
+  $self->SUPER::suspend;
 }
 
 =item unsuspend
@@ -454,10 +455,11 @@ sub unsuspend {
   if ( $hash{_password} =~ /^\*SUSPENDED\* (.*)$/ ) {
     $hash{_password} = $1;
     my $new = new FS::svc_acct ( \%hash );
-    $new->replace($self);
-  } else {
-    ''; #no error (already unsuspended)
+    my $error = $new->replace($self);
+    return $error if $error;
   }
+
+  $self->SUPER::unsuspend;
 }
 
 =item cancel
-- 
cgit v1.2.1


From 0ff28424ec1178ba6369d643d3b5f43d51a17514 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Jun 2002 08:29:09 +0000
Subject: add crypt option to (bsd|sysv)shell export

---
 FS/FS/part_export.pm            | 26 ++++++++++++++++++++++----
 httemplate/edit/part_export.cgi | 23 +++++++++++++++++++----
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index bf6072089..7661d7e10 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -514,6 +514,20 @@ sub exporttype2svcdb {
   '';
 }
 
+tie my %sysvshell_options, 'Tie::IxHash',
+  'crypt' => { label=>'Password encryption',
+               type=>'select', options=>[qw(crypt md5)],
+               default=>'crypt',
+             },
+;
+
+tie my %bsdshell_options, 'Tie::IxHash', 
+  'crypt' => { label=>'Password encryption',
+               type=>'select', options=>[qw(crypt md5)],
+               default=>'crypt',
+             },
+;
+
 tie my %shellcommands_options, 'Tie::IxHash',
   #'machine' => { label=>'Remote machine' },
   'user' => { label=>'Remote username', default=>'root' },
@@ -599,12 +613,16 @@ tie my %sqlmail_options, 'Tie::IxHash',
     'sysvshell' => {
       'desc' =>
         'Batch export of /etc/passwd and /etc/shadow files (Linux/SysV)',
-      'options' => {},
+      'options' => \%sysvshell_options,
+      'nodomain' => 'Y',
+      'notes' => 'MD5 crypt requires installation of <a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a> from CPAN.',
     },
     'bsdshell' => {
       'desc' =>
         'Batch export of /etc/passwd and /etc/master.passwd files (BSD)',
-      'options' => {},
+      'options' => \%bsdshell_options,
+      'nodomain' => 'Y',
+      'notes' => 'MD5 crypt requires installation of <a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a> from CPAN.',
     },
 #    'nis' => {
 #      'desc' =>
@@ -614,6 +632,7 @@ tie my %sqlmail_options, 'Tie::IxHash',
     'textradius' => {
       'desc' => 'Batch export of a text /etc/raddb/users file (Livingston, Cistron)',
       'options' => {},
+      'notes' => 'unfinished...',
     },
 
     'shellcommands' => {
@@ -634,8 +653,7 @@ tie my %sqlmail_options, 'Tie::IxHash',
       'desc' => 'Real-time export to SQL-backed mail server',
       'options' => \%sqlmail_options,
       'nodomain' => 'Y',
-      'notes' => 'Database schema can be made to work with Courier IMAP and
- Exim.  Others could work but are untested.',
+      'notes' => 'Database schema can be made to work with Courier IMAP and Exim.  Others could work but are untested.',
     },
 
     'cyrus' => {
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index af89c4ead..fbc698e8b 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -45,15 +45,30 @@ my $widget = new HTML::Widgets::SelectLayers(
       if $layer;
 
     foreach my $option ( keys %{$exports->{$layer}{options}} ) {
-#    foreach my $option ( qw(url login password groupID ) ) {
       my $optinfo = $exports->{$layer}{options}{$option};
       my $label = $optinfo->{label};
+      my $type = defined($optinfo->{type}) ? $optinfo->{type} : 'text';
       my $value = $cgi->param($option)
                   || $part_export->option($option)
                   || (exists $optinfo->{default} ? $optinfo->{default} : '');
-      $html .= qq!<TR><TD ALIGN="right">$label</TD>!.
-               qq!<TD><INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64></TD>!.
-               '</TR>';
+      $html .= qq!<TR><TD ALIGN="right">$label</TD><TD>!;
+      if ( $type eq 'select' ) {
+        $html .= qq!<SELECT NAME="$option">!;
+        foreach my $select_option ( @{$optinfo->{options}} ) {
+          #if ( ref($select_option) ) {
+          #} else {
+            $selected = $select_option eq $value ? ' SELECTED' : '';
+            $html .= qq!<OPTION VALUE="$select_option"$selected>!.
+                     qq!$select_option</OPTION>!;
+          #}
+        }
+        $html .= '</SELECT>';
+      } elsif ( $type eq 'text' ) {
+        $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
+      } else {
+        $html .= "unknown type $type";
+      }
+      $html .= '</TD></TR>';
     }
     $html .= '</TABLE>';
 
-- 
cgit v1.2.1


From b475b428df20541c8f2dec5c9ef101ebb9f1cf94 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Jun 2002 09:14:02 +0000
Subject: export-based duplicate username checking!

---
 FS/FS/svc_acct.pm | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 63 insertions(+), 4 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index f0b0abc2a..03230dd06 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -25,6 +25,8 @@ use FS::svc_domain;
 use FS::raddb;
 use FS::queue;
 use FS::radius_usergroup;
+use FS::export_svc;
+use FS::part_export;
 use FS::Msgcat qw(gettext);
 
 @ISA = qw( FS::svc_Common );
@@ -191,10 +193,67 @@ sub insert {
   $error = $self->check;
   return $error if $error;
 
-  return gettext('username_in_use'). ": ". $self->username
-    if qsearchs( 'svc_acct', { 'username' => $self->username,
-                               'domsvc'   => $self->domsvc,
-                             } );
+  #no, duplicate checking just got a whole lot more complicated
+
+  #return gettext('username_in_use'). ": ". $self->username
+  #  if qsearchs( 'svc_acct', { 'username' => $self->username,
+  #                             'domsvc'   => $self->domsvc,
+  #                           } );
+
+  my @dup_user = qsearch( 'svc_acct', { 'username' => $self->username } );
+  my @dup_userdomain = qsearchs( 'svc_acct', { 'username' => $self->username,
+                                               'domsvc'   => $self->domsvc } );
+
+  if ( @dup_user || @dup_userdomain ) {
+    my $exports = FS::part_export::export_info('svc_acct');
+    my( %conflict_user_svcpart, %conflict_userdomain_svcpart );
+
+    foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
+
+      #this will catch to the same exact export
+      my @svcparts = map { $_->svcpart }
+        qsearch('export_svc', { 'exportnum' => $part_export->exportnum });
+
+      #this will catch exports w/same exporthost+type ???
+      #my @other_part_export = qsearch('part_export', {
+      #  'machine'    => $part_export->machine,
+      #  'exporttype' => $part_export->exporttype,
+      #} );
+      #foreach my $other_part_export ( @other_part_export ) {
+      #  push @svcparts, map { $_->svcpart }
+      #    qsearch('export_svc', { 'exportnum' => $part_export->exportnum });
+      #}
+
+      my $nodomain = $exports->{$part_export->exporttype}{'nodomain'};
+      if ( $nodomain =~ /^Y/i ) {
+        $conflict_user_svcpart{$_} = $part_export->exportnum
+          foreach @svcparts;
+      } else {
+        $conflict_userdomain_svcpart{$_} = $part_export->exportnum
+          foreach @svcparts;
+      }
+    }
+
+    foreach my $dup_user ( @dup_user ) {
+      my $dup_svcpart = $dup_user->cust_svc->svcpart;
+      if ( exists($conflict_user_svcpart{$dup_svcpart}) ) {
+        return "duplicate username: conflicts with svcnum ". $dup_user->svcnum.
+               " via exportnum ". $conflict_user_svcpart{$dup_svcpart};
+      }
+    }
+
+    foreach my $dup_userdomain ( @dup_userdomain ) {
+      my $dup_svcpart = $dup_userdomain->cust_svc->svcpart;
+      if ( exists($conflict_user_svcpart{$dup_svcpart}) ) {
+        return "duplicate username\@domain: conflicts with svcnum ".
+               $dup_userdomain->svcnum. " via exportnum ".
+               $conflict_user_svcpart{$dup_svcpart};
+      }
+    }
+
+  }
+
+  #see?  i told you it was more complicated
 
   if ( $self->svcnum ) {
     my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$self->svcnum});
-- 
cgit v1.2.1


From fe45096f26f6267607ffe63eb3003ef3450a2a87 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Jun 2002 09:46:40 +0000
Subject: add preliminary bsd shell export

---
 bin/bind.export  |   2 +-
 bin/shell.export | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100755 bin/shell.export

diff --git a/bin/bind.export b/bin/bind.export
index d49b3cf64..62b7abb51 100755
--- a/bin/bind.export
+++ b/bin/bind.export
@@ -45,7 +45,7 @@ foreach my $export ( @exports ) {
   my $zonepath = $export->option('zonepath');
   $zonepath =~ s/\/$//;
 
-  #false laziness with  freeside-sqlradius-reset 
+  #false laziness with  freeside-sqlradius-reset and shell.export
   my @svc_domain =
     map { qsearchs('svc_domain', { 'svcnum' => $_->svcnum } ) }
       map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
diff --git a/bin/shell.export b/bin/shell.export
new file mode 100755
index 000000000..3ccda3500
--- /dev/null
+++ b/bin/shell.export
@@ -0,0 +1,116 @@
+#!/usr/bin/perl -w
+
+# sysvshell and bsdshell export
+
+use strict;
+use File::Rsync;
+use Net::SSH qw(ssh);
+use FS::UID qw(adminsuidsetup datasrc);
+use FS::Record qw(qsearch qsearchs);
+use FS::part_export;
+
+my @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+my $spooldir = "/usr/local/etc/freeside/export.". datasrc;
+#my $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/shell";
+
+my @sysv_exports = qsearch('part_export', { 'exporttype' => 'sysvshell' } );
+my @bsd_exports = qsearch('part_export', { 'exporttype' => 'bsdshell' } );
+
+my $rsync = File::Rsync->new({
+  rsh     => 'ssh',
+#  dry_run => 1,
+});
+
+foreach my $export ( @sysv_exports ) {
+  my $machine = $export->machine;
+  my $prefix = "$spooldir/$machine";
+  mkdir $prefix unless -d $prefix;
+
+  #LOCKING!!!
+
+  ( open(MASTER,">$prefix/master.passwd")
+    #!!!  and flock(MASTER,LOCK_EX|LOCK_NB)
+  ) or die "Can't open $prefix/master.passwd: $!";
+  ( open(PASSWD,">$prefix/passwd")
+    #!!!  and flock(MASTER,LOCK_EX|LOCK_NB)
+  ) or die "Can't open $prefix/passwd: $!";
+
+  chmod 0644, "$spooldir/passwd";
+  chmod 0600, "$prefix/master.passwd";
+
+  #false laziness with  freeside-sqlradius-reset and bind.export
+  my @svc_acct = 
+    map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
+      map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+        grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+          $export->export_svc;
+
+  foreach my $svc_acct ( sort { $a->uid <=> $b->uid } @svc_acct ) {
+
+    my $password = $svc_acct->_password;
+    my $cpassword;
+    #if ( ( length($password) <= 8 )
+    if ( ( length($password) <= 12 )
+         && ( $password ne '*' )
+         && ( $password ne '!!' )
+         && ( $password ne '' )
+    ) {
+      $cpassword=crypt($password,
+                       $saltset[int(rand(64))].$saltset[int(rand(64))]
+      );
+      # MD5 !!!!
+    } else {
+      $cpassword=$password;
+    }
+
+    ###
+    # FORMAT OF THE PASSWD FILE HERE
+    print PASSWD join(":",
+      $svc_acct->username,
+      'x', # "##". $username,
+      $svc_acct->uid,
+      $svc_acct->gid,
+      $svc_acct->finger,
+      $svc_acct->dir,
+      $svc_acct->shell,
+    ), "\n";
+
+    ###
+    # FORMAT OF FreeBSD MASTER PASSWD FILE HERE
+    print MASTER join(":",
+      $svc_acct->username,              # User name
+      $cpassword,                       # Encrypted password
+      $svc_acct->uid,                   # User ID
+      $svc_acct->gid,                   # Group ID
+      "",                               # Login Class
+      "0",                              # Password Change Time
+      "0",                              # Password Expiration Time
+      $svc_acct->finger,                # Users name
+      $svc_acct->dir,                   # Users home directory
+      $svc_acct->shell,                 # shell
+    ), "\n" ;
+  
+  }
+
+  #!!! flock(MASTER,LOCK_UN);
+  #!!! flock(PASSWD,LOCK_UN);
+  close MASTER;
+  close PASSWD;
+
+  $rsync->exec( {
+    src  => "$prefix/passwd",
+    dest => "root\@$machine:/etc/passwd"
+  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
+
+  $rsync->exec( {
+    src  => "$prefix/master.passwd",
+    dest => "root\@$machine:/etc/master.passwd.new"
+  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
+  ssh("root\@$machine", "pwd_mkdb /etc/master.passwd.new");
+
+  # UNLOCK!!
+}
-- 
cgit v1.2.1


From 340906d63346ccf1cffe138e58feb5244e1aa0a2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Jun 2002 09:51:23 +0000
Subject: notes

---
 FS/FS/part_export.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 7661d7e10..52c8213a0 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -615,14 +615,14 @@ tie my %sqlmail_options, 'Tie::IxHash',
         'Batch export of /etc/passwd and /etc/shadow files (Linux/SysV)',
       'options' => \%sysvshell_options,
       'nodomain' => 'Y',
-      'notes' => 'MD5 crypt requires installation of <a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a> from CPAN.',
+      'notes' => 'MD5 crypt requires installation of <a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a> from CPAN.  Run shell.export, etc.',
     },
     'bsdshell' => {
       'desc' =>
         'Batch export of /etc/passwd and /etc/master.passwd files (BSD)',
       'options' => \%bsdshell_options,
       'nodomain' => 'Y',
-      'notes' => 'MD5 crypt requires installation of <a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a> from CPAN.',
+      'notes' => 'MD5 crypt requires installation of <a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a> from CPAN.  Run shell.export, etc.',
     },
 #    'nis' => {
 #      'desc' =>
-- 
cgit v1.2.1


From c189704fb7f1c2dce5362b5210fa957e274b3f55 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Jun 2002 18:20:38 +0000
Subject: perl 5.005 needs an explicit mask for mkdir

---
 bin/bind.export  | 6 +++---
 bin/shell.export | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/bind.export b/bin/bind.export
index 62b7abb51..7d1452dc6 100755
--- a/bin/bind.export
+++ b/bin/bind.export
@@ -15,7 +15,7 @@ my $user = shift or die &usage;
 adminsuidsetup $user;
 
 my $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/bind";
-mkdir $spooldir unless -d $spooldir;
+mkdir $spooldir, 0700 unless -d $spooldir;
 
 my @exports = qsearch('part_export', { 'exporttype' => 'bind' } );
 my @sexports = qsearch('part_export', { 'exporttype' => 'bind_slave' } );
@@ -33,7 +33,7 @@ foreach my $export ( @exports ) {
   #prevent old domain files from piling up
   #rmtree "$prefix" or die "can't rmtree $prefix.db: $!";
 
-  mkdir $prefix unless -d $prefix;
+  mkdir $prefix, 0700 unless -d $prefix;
 
   open(NAMED_CONF,">$prefix/named.conf")
     or die "can't open $prefix/named.conf: $!";
@@ -132,7 +132,7 @@ foreach my $sexport ( @sexports ) { #false laziness with above
   #prevent old domain files from piling up
   #rmtree "$prefix" or die "can't rmtree $prefix.db: $!";
 
-  mkdir $prefix unless -d $prefix;
+  mkdir $prefix, 0700 unless -d $prefix;
 
   open(NAMED_CONF,">$prefix/named.conf")
     or die "can't open $prefix/named.conf: $!";
diff --git a/bin/shell.export b/bin/shell.export
index 3ccda3500..064d56e63 100755
--- a/bin/shell.export
+++ b/bin/shell.export
@@ -28,7 +28,7 @@ my $rsync = File::Rsync->new({
 foreach my $export ( @sysv_exports ) {
   my $machine = $export->machine;
   my $prefix = "$spooldir/$machine";
-  mkdir $prefix unless -d $prefix;
+  mkdir $prefix, 0700 unless -d $prefix;
 
   #LOCKING!!!
 
-- 
cgit v1.2.1


From 50839c50d9ed12336cfc611775088347bccd62f0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Jun 2002 18:23:50 +0000
Subject: bsd only for now

---
 bin/shell.export | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/shell.export b/bin/shell.export
index 064d56e63..29b639058 100755
--- a/bin/shell.export
+++ b/bin/shell.export
@@ -26,6 +26,9 @@ my $rsync = File::Rsync->new({
 });
 
 foreach my $export ( @sysv_exports ) {
+}
+
+foreach my $export ( @bsd_exports ) {
   my $machine = $export->machine;
   my $prefix = "$spooldir/$machine";
   mkdir $prefix, 0700 unless -d $prefix;
-- 
cgit v1.2.1


From 76ce9aeaeb39f496797398e84bfdc20fbd817b4d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Jun 2002 18:25:53 +0000
Subject: use FS::cust_svc and FS::svc_acct

---
 bin/shell.export | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/shell.export b/bin/shell.export
index 29b639058..798bee3fe 100755
--- a/bin/shell.export
+++ b/bin/shell.export
@@ -8,6 +8,8 @@ use Net::SSH qw(ssh);
 use FS::UID qw(adminsuidsetup datasrc);
 use FS::Record qw(qsearch qsearchs);
 use FS::part_export;
+use FS::cust_svc;
+use FS::svc_acct;
 
 my @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
 
-- 
cgit v1.2.1


From 7f7fb08833dd4a006adc45fe5deb9931f3aee94e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Jun 2002 18:32:07 +0000
Subject: don't export empty files

---
 bin/shell.export | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/shell.export b/bin/shell.export
index 798bee3fe..146a0fd4e 100755
--- a/bin/shell.export
+++ b/bin/shell.export
@@ -54,6 +54,8 @@ foreach my $export ( @bsd_exports ) {
         grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
           $export->export_svc;
 
+  next unless @svc_acct;
+
   foreach my $svc_acct ( sort { $a->uid <=> $b->uid } @svc_acct ) {
 
     my $password = $svc_acct->_password;
-- 
cgit v1.2.1


From 1f637f27c25b2c402261e519094fb8b9d683935a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 Jun 2002 16:26:52 +0000
Subject: fix problems with code that resets invoice events

---
 FS/FS/cust_main.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b6600fb29..6be6cdb74 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -493,7 +493,10 @@ sub replace {
                && $_->status eq 'done'
                && $_->statustext
            }
-        $self->open_cust_bill->cust_bill_event
+        map { $_->cust_bill_event }
+          grep { $_->cust_bill_event }
+            $self->open_cust_bill
+
     ) {
       my $error = $cust_bill_event->retry;
       if ( $error ) {
@@ -1237,7 +1240,9 @@ sub collect {
                && $_->status eq 'done'
                && $_->statustext
            }
-        $self->open_cust_bill->cust_bill_event
+        map { $_->cust_bill_event }
+          grep { $_->cust_bill_event }
+            $self->open_cust_bill
     ) {
       my $error = $cust_bill_event->retry;
       if ( $error ) {
-- 
cgit v1.2.1


From 6bfaf79c950d6050412bbbf9f66861bd500c7a3f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 Jun 2002 17:29:13 +0000
Subject: fix company search

---
 httemplate/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index 3e657025f..daa890728 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -29,7 +29,7 @@
         <BR><FONT SIZE="+1"><A HREF="edit/cust_main.cgi">New Customer</A></FONT>
         <BR>
         <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><SELECT NAME="last_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A></FORM>
-        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><SELECT NAME="last_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A></FORM>
+        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><SELECT NAME="company_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A></FORM>
         <FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A></FORM>
         <FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
 <!--        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>-->
-- 
cgit v1.2.1


From 8646bec77602ba7b5b9928a8d408ff5bea5b0bc1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 Jun 2002 20:31:28 +0000
Subject: fix new duplicate username checking

---
 FS/FS/svc_acct.pm | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 03230dd06..ce76fe51b 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -194,12 +194,25 @@ sub insert {
   return $error if $error;
 
   #no, duplicate checking just got a whole lot more complicated
+  #(perhaps keep this check with a config option to turn on?)
 
   #return gettext('username_in_use'). ": ". $self->username
   #  if qsearchs( 'svc_acct', { 'username' => $self->username,
   #                             'domsvc'   => $self->domsvc,
   #                           } );
 
+  if ( $self->svcnum ) {
+    my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$self->svcnum});
+    unless ( $cust_svc ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "no cust_svc record found for svcnum ". $self->svcnum;
+    }
+    $self->pkgnum($cust_svc->pkgnum);
+    $self->svcpart($cust_svc->svcpart);
+  }
+
+  #new duplicate username checking
+
   my @dup_user = qsearch( 'svc_acct', { 'username' => $self->username } );
   my @dup_userdomain = qsearchs( 'svc_acct', { 'username' => $self->username,
                                                'domsvc'   => $self->domsvc } );
@@ -208,13 +221,19 @@ sub insert {
     my $exports = FS::part_export::export_info('svc_acct');
     my( %conflict_user_svcpart, %conflict_userdomain_svcpart );
 
-    foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
+    my $part_svc = qsearchs('part_svc', { 'svcpart' => $self->svcpart } );
+    unless ( $part_svc ) {
+      $dbh->rollback if $oldAutoCommit;
+      return 'unknown svcpart '. $self->svcpart;
+    }
+
+    foreach my $part_export ( $part_svc->part_export ) {
 
       #this will catch to the same exact export
       my @svcparts = map { $_->svcpart }
         qsearch('export_svc', { 'exportnum' => $part_export->exportnum });
 
-      #this will catch exports w/same exporthost+type ???
+      #this will catch to exports w/same exporthost+type ???
       #my @other_part_export = qsearch('part_export', {
       #  'machine'    => $part_export->machine,
       #  'exporttype' => $part_export->exporttype,
@@ -255,16 +274,6 @@ sub insert {
 
   #see?  i told you it was more complicated
 
-  if ( $self->svcnum ) {
-    my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$self->svcnum});
-    unless ( $cust_svc ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "no cust_svc record found for svcnum ". $self->svcnum;
-    }
-    $self->pkgnum($cust_svc->pkgnum);
-    $self->svcpart($cust_svc->svcpart);
-  }
-
   my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
   return "Unknown svcpart" unless $part_svc;
   return "uid in use"
@@ -379,8 +388,6 @@ sub delete {
     }
   }
 
-  my $part_svc = $self->cust_svc->part_svc;
-
   my $error = $self->SUPER::delete;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
-- 
cgit v1.2.1


From afe61aa1e4158a49ba67740d947a991e285d5fb1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 13 Jun 2002 00:53:26 +0000
Subject: search on customer number (Bug#422)

---
 httemplate/index.html           |  3 ++-
 httemplate/search/cust_main.cgi | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index daa890728..8ce12569e 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -28,7 +28,8 @@
     <TR><TD>
         <BR><FONT SIZE="+1"><A HREF="edit/cust_main.cgi">New Customer</A></FONT>
         <BR>
-        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><SELECT NAME="last_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A></FORM>
+        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="custnum_on" VALUE="1">Customer # <INPUT TYPE="text" NAME="custnum_text"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=custnum">all customers by customer number</A></FORM>
+        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><SELECT NAME="last_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A></FORM>
         <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><SELECT NAME="company_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A></FORM>
         <FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A></FORM>
         <FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index d9d4e657c..247cf8fd6 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -192,6 +192,8 @@ if ( $cgi->param('browse')
   @cust_main=();
   $sortby = \*last_sort;
 
+  push @cust_main, @{&custnumsearch}
+    if $cgi->param('custnum_on') && $cgi->param('custnum_text');
   push @cust_main, @{&cardsearch}
     if $cgi->param('card_on') && $cgi->param('card');
   push @cust_main, @{&lastsearch}
@@ -446,6 +448,16 @@ sub custnum_sort {
   $a->getfield('custnum') <=> $b->getfield('custnum');
 }
 
+sub custnumsearch {
+
+  my $custnum = $cgi->param('custnum_text');
+  $custnum =~ s/\D//g;
+  $custnum =~ /^(\d{1,23})$/ or eidiot "Illegal customer number\n";
+  my $custnum = $1;
+  
+  [ qsearchs('cust_main', { 'custnum' => $custnum } ) ];
+}
+
 sub cardsearch {
 
   my($card)=$cgi->param('card');
-- 
cgit v1.2.1


From 5364c3dfb131a502b0613eb59a0451165f09c267 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 13 Jun 2002 01:29:15 +0000
Subject: more information in signup email

---
 fs_signup/fs_signup_server | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 65d530e68..7f962e057 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -221,15 +221,30 @@ while (1) {
         "This is an automatic message from your Freeside installation\n",
         "informing you a customer has signed up via the signup server:\n",
         "\n",
-        'custnum: '. $cust_main->custnum. "\n",
-        'Name   : '. $cust_main->last. ", ". $cust_main->first. "\n",
-        'Agent  : '. $cust_main->agent->agent. "\n",
+        'custnum     : '. $cust_main->custnum. "\n",
+        'Name        : '. $cust_main->last. ", ". $cust_main->first. "\n",
+        'Agent       : '. $cust_main->agent->agent. "\n",
+        'Package     : '. $part_pkg->pkg. ' - '. $part_pkg->comment. "\n",
+        'Signup Date : '. time2str('%C', time). "\n",
+        'Username    : '. $svc_acct->username. "\n",
+        #'Password    : '. # config file to turn this on if noment insists
+        'Day phone   : '. $cust_main->daytime. "\n",
+        'Night phone : '. $cust_main->night. "\n",
+        'Address     : '. $cust_main->address1. "\n",
+        ( $cust_main->address2
+            ? '              '. $cust_main->address2. "\n"
+            : ''                                           ),
+        '              '. $cust_main->city. ', '. $cust_main->state. '  '.
+                          $cust_main->zip. "\n",
+        ( $cust_main->country eq 'US'
+            ? ''
+            : '              '. $cust_main->country. "\n" ),
         "\n",
       ];
-      if ( $cust_main->balance > 0 ) {
-        push @$body,
-          "This customer has an outstanding balance and has been suspended.\n";
-      }
+      #if ( $cust_main->balance > 0 ) {
+      #  push @$body,
+      #    "This customer has an outstanding balance and has been suspended.\n";
+      #}
       my $message = new Mail::Internet ( 'Header' => $header, 'Body' => $body );
       $!=0;
       $message->smtpsend( Host => $smtpmachine )
-- 
cgit v1.2.1


From 13f822a442f093f5658e5571c3d236b80be0113f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 13 Jun 2002 23:00:15 +0000
Subject: fuzzy username searching (Bug#422)

---
 FS/FS/svc_acct.pm              | 102 +++++++++++++++++++++++++++++++++++++++++
 httemplate/index.html          |   2 +-
 httemplate/search/svc_acct.cgi |  44 +++++++++++++++++-
 3 files changed, 145 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index ce76fe51b..aa089d065 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -303,6 +303,14 @@ sub insert {
     }
   }
 
+  #false laziness with sub replace (and cust_main)
+  my $queue = new FS::queue { 'job' => 'FS::svc_acct::append_fuzzyfiles' };
+  $error = $queue->insert($self->username);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "queueing job (transaction rolled back): $error";
+  }
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
 }
@@ -478,6 +486,15 @@ sub replace {
 
   }
 
+  #false laziness with sub insert (and cust_main)
+  my $queue = new FS::queue { 'job' => 'FS::svc_acct::append_fuzzyfiles' };
+  $error = $queue->insert($new->username);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "queueing job (transaction rolled back): $error";
+  }
+
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
 }
@@ -860,6 +877,89 @@ sub radius_groups {
 
 =head1 SUBROUTINES
 
+=over 4
+
+=item check_and_rebuild_fuzzyfiles
+
+=cut
+
+sub check_and_rebuild_fuzzyfiles {
+  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
+  -e "$dir/svc_acct.username"
+    or &rebuild_fuzzyfiles;
+}
+
+=item rebuild_fuzzyfiles
+
+=cut
+
+sub rebuild_fuzzyfiles {
+
+  use Fcntl qw(:flock);
+
+  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
+
+  #username
+
+  open(USERNAMELOCK,">>$dir/svc_acct.username")
+    or die "can't open $dir/svc_acct.username: $!";
+  flock(USERNAMELOCK,LOCK_EX)
+    or die "can't lock $dir/svc_acct.username: $!";
+
+  my @all_username = map $_->getfield('username'), qsearch('svc_acct', {});
+
+  open (USERNAMECACHE,">$dir/svc_acct.username.tmp")
+    or die "can't open $dir/svc_acct.username.tmp: $!";
+  print USERNAMECACHE join("\n", @all_username), "\n";
+  close USERNAMECACHE or die "can't close $dir/svc_acct.username.tmp: $!";
+
+  rename "$dir/svc_acct.username.tmp", "$dir/svc_acct.username";
+  close USERNAMELOCK;
+
+}
+
+=item all_username
+
+=cut
+
+sub all_username {
+  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
+  open(USERNAMECACHE,"<$dir/svc_acct.username")
+    or die "can't open $dir/svc_acct.username: $!";
+  my @array = map { chomp; $_; } <USERNAMECACHE>;
+  close USERNAMECACHE;
+  \@array;
+}
+
+=item append_fuzzyfiles USERNAME
+
+=cut
+
+sub append_fuzzyfiles {
+  my $username = shift;
+
+  &check_and_rebuild_fuzzyfiles;
+
+  use Fcntl qw(:flock);
+
+  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
+
+  open(USERNAME,">>$dir/svc_acct.username")
+    or die "can't open $dir/svc_acct.username: $!";
+  flock(USERNAME,LOCK_EX)
+    or die "can't lock $dir/svc_acct.username: $!";
+
+  print USERNAME "$username\n";
+
+  flock(USERNAME,LOCK_UN)
+    or die "can't unlock $dir/svc_acct.username: $!";
+  close USERNAME;
+
+  1;
+}
+
+
+
 =item radius_usergroup_selector GROUPS_ARRAYREF [ SELECTNAME ]
 
 =cut
@@ -909,6 +1009,8 @@ END
   $html;
 }
 
+=back
+
 =head1 BUGS
 
 The $recref stuff in sub check should be cleaned up.
diff --git a/httemplate/index.html b/httemplate/index.html
index 8ce12569e..5e47b9464 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -31,7 +31,7 @@
         <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="custnum_on" VALUE="1">Customer # <INPUT TYPE="text" NAME="custnum_text"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=custnum">all customers by customer number</A></FORM>
         <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><SELECT NAME="last_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A></FORM>
         <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><SELECT NAME="company_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A></FORM>
-        <FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A></FORM>
+        <FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><SELECT NAME="username_type"><OPTION VALUE="All">(all)</OPTION><OPTION>Fuzzy</OPTION><OPTION>Substring</OPTION><OPTION SELECTED>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A></FORM>
         <FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
 <!--        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>-->
 <!--        <LI><A HREF="search/svc_forward.html">mail forwards (by ?)</A>-->
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 0a4338b52..549231d3f 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -244,10 +244,50 @@ sub uid_sort {
 
 sub usernamesearch {
 
+  my @svc_acct;
+
+  my %username_type;
+  foreach ( $cgi->param('username_type') ) {
+    $username_type{$_}++;
+  }
+
   $cgi->param('username') =~ /^([\w\-\.\&]+)$/; #untaint username_text
-  my($username)=$1;
+  my $username = $1;
+
+  if ( $username_type{'Exact'} || $username_type{'Fuzzy'} ) {
+    push @svc_acct, qsearch( 'svc_acct',
+                             { 'username' => { 'op'    => 'ILIKE',
+                                               'value' => $username } } );
+  }
+
+  if ( $username_type{'Substring'} || $username_type{'All'} ) {
+    push @svc_acct, qsearch( 'svc_acct',
+                             { 'username' => { 'op'    => 'ILIKE',
+                                               'value' => "%$username%" } } );
+  }
+
+  if ( $username_type{'Fuzzy'} || $username_type{'All'} ) {
+    &FS::svc_acct::check_and_rebuild_fuzzyfiles;
+    my $all_username = &FS::svc_acct::all_username;
+
+    my %username;
+    if ( $username_type{'Fuzzy'} || $username_type{'All'} ) { 
+      foreach ( amatch($username, [ qw(i) ], @$all_username) ) {
+        $username{$_}++; 
+      }
+    }
+
+    #if ($username_type{'Sound-alike'}) {
+    #}
+
+    foreach ( keys %username ) {
+      push @svc_acct, qsearch('svc_acct',{'username'=>$_});
+    }
+
+  }
 
-  [ qsearch('svc_acct',{'username'=>$username}) ];
+  #[ qsearch('svc_acct',{'username'=>$username}) ];
+  \@svc_acct;
 
 }
 
-- 
cgit v1.2.1


From 141003fc6cab41daf1a4a697a610c953ec42906e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 13 Jun 2002 23:28:14 +0000
Subject: phone number search (Bug#422)

---
 httemplate/index.html           |  5 +++--
 httemplate/search/cust_main.cgi | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index 5e47b9464..c3e9ae45c 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -31,8 +31,9 @@
         <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="custnum_on" VALUE="1">Customer # <INPUT TYPE="text" NAME="custnum_text"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=custnum">all customers by customer number</A></FORM>
         <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><SELECT NAME="last_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A></FORM>
         <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><SELECT NAME="company_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A></FORM>
-        <FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><SELECT NAME="username_type"><OPTION VALUE="All">(all)</OPTION><OPTION>Fuzzy</OPTION><OPTION>Substring</OPTION><OPTION SELECTED>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A></FORM>
-        <FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
+        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="phone_on" VALUE="1">Phone # <INPUT TYPE="text" NAME="phone_text"><INPUT TYPE="submit" VALUE="Search"></FORM>
+        <BR><FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><SELECT NAME="username_type"><OPTION VALUE="All">(all)</OPTION><OPTION>Fuzzy</OPTION><OPTION>Substring</OPTION><OPTION SELECTED>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A></FORM>
+        <BR><FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
 <!--        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>-->
 <!--        <LI><A HREF="search/svc_forward.html">mail forwards (by ?)</A>-->
       <BR>
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 247cf8fd6..1bd5fb60a 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -200,6 +200,8 @@ if ( $cgi->param('browse')
     if $cgi->param('last_on') && $cgi->param('last_text');
   push @cust_main, @{&companysearch}
     if $cgi->param('company_on') && $cgi->param('company_text');
+  push @cust_main, @{&phonesearch}
+    if $cgi->param('phone_on') && $cgi->param('phone_text');
   push @cust_main, @{&referralsearch}
     if $cgi->param('referral_custnum');
 
@@ -606,4 +608,30 @@ sub companysearch {
 
   \@cust_main;
 }
+
+sub phonesearch {
+  my @cust_main;
+
+  my $phone = $cgi->param('phone_text');
+
+  #false laziness with Record::ut_phonen, only works with US/CA numbers...
+  $phone =~ s/\D//g;
+  $phone =~ /^(\d{3})(\d{3})(\d{4})(\d*)$/
+    or eidiot gettext('illegal_phone'). ": $phone";
+  $phone = "$1-$2-$3";
+  $phone .= " x$4" if $4;
+
+  my @fields = qw(daytime night fax);
+  push @fields, qw(ship_daytime ship_night ship_fax)
+    if defined dbdef->table('cust_main')->column('ship_last');
+
+  for my $field ( @fields ) {
+    push @cust_main, qsearch ( 'cust_main', 
+                               { $field => { 'op'    => 'LIKE',
+                                             'value' => "$phone%" } } );
+  }
+
+  \@cust_main;
+}
+
 %>
-- 
cgit v1.2.1


From 18f51a14e90cf1548326419120cdba1c33d99c63 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Jun 2002 00:12:49 +0000
Subject: search by for address2 (unit) - commented out in default index.html

---
 httemplate/index.html           |  1 +
 httemplate/search/cust_main.cgi | 28 +++++++++++++++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index c3e9ae45c..5b9b18a6f 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -31,6 +31,7 @@
         <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="custnum_on" VALUE="1">Customer # <INPUT TYPE="text" NAME="custnum_text"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=custnum">all customers by customer number</A></FORM>
         <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><SELECT NAME="last_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A></FORM>
         <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><SELECT NAME="company_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A></FORM>
+<!--        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="address2_on" VALUE="1">Unit <INPUT TYPE="text" NAME="address2_text"><INPUT TYPE="submit" VALUE="Search"></FORM>-->
         <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="phone_on" VALUE="1">Phone # <INPUT TYPE="text" NAME="phone_text"><INPUT TYPE="submit" VALUE="Search"></FORM>
         <BR><FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><SELECT NAME="username_type"><OPTION VALUE="All">(all)</OPTION><OPTION>Fuzzy</OPTION><OPTION>Substring</OPTION><OPTION SELECTED>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A></FORM>
         <BR><FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 1bd5fb60a..586f8d991 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -200,6 +200,8 @@ if ( $cgi->param('browse')
     if $cgi->param('last_on') && $cgi->param('last_text');
   push @cust_main, @{&companysearch}
     if $cgi->param('company_on') && $cgi->param('company_text');
+  push @cust_main, @{&address2search}
+    if $cgi->param('address2_on') && $cgi->param('address2_text');
   push @cust_main, @{&phonesearch}
     if $cgi->param('phone_on') && $cgi->param('phone_text');
   push @cust_main, @{&referralsearch}
@@ -555,9 +557,10 @@ sub companysearch {
     $company_type{$_}++ 
   };
 
-  $cgi->param('company_text') =~ /^([\w \,\.\-\']*)$/
-    or eidiot "Illegal company";
-  my($company)=$1;
+  $cgi->param('company_text') =~
+    /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=]*)$/
+      or eidiot "Illegal company";
+  my $company = $1;
 
   if ( $company_type{'Exact'} || $company_type{'Fuzzy'} ) {
     push @cust_main, qsearch( 'cust_main',
@@ -609,6 +612,25 @@ sub companysearch {
   \@cust_main;
 }
 
+sub address2search {
+  my @cust_main;
+
+  $cgi->param('address2_text') =~
+    /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=]*)$/
+      or eidiot "Illegal address2";
+  my $address2 = $1;
+
+  push @cust_main, qsearch( 'cust_main',
+                            { 'address2' => { 'op'    => 'ILIKE',
+                                              'value' => $address2 } } );
+  push @cust_main, qsearch( 'cust_main',
+                            { 'address2' => { 'op'    => 'ILIKE',
+                                              'value' => $address2 } } )
+    if defined dbdef->table('cust_main')->column('ship_last');
+
+  \@cust_main;
+}
+
 sub phonesearch {
   my @cust_main;
 
-- 
cgit v1.2.1


From 72afe3cf4a355a22e942fb59068815270538999f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Jun 2002 02:25:34 +0000
Subject: mysql compatibility?

---
 FS/bin/freeside-queued | 64 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 1539a48af..67e5e2bca 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -7,9 +7,10 @@ use Fcntl qw(:flock);
 use POSIX qw(setsid);
 use Date::Format;
 use IO::File;
-use FS::UID qw(adminsuidsetup forksuidsetup driver_name);
+use FS::UID qw(adminsuidsetup forksuidsetup driver_name dbh);
 use FS::Record qw(qsearchs);
 use FS::queue;
+use FS::queue_depend;
 
 # no autoloading just yet
 use FS::cust_main;
@@ -17,13 +18,14 @@ use FS::svc_acct;
 use Net::SSH 0.05;
 use FS::part_export;
 
-my $pid_file = '/var/run/freeside-queued.pid';
-
 $max_kids = '10'; #guess it should be a config file...
 $kids = 0;
 
 my $user = shift or die &usage;
 
+#my $pid_file = "/var/run/freeside-queued.$user.pid";
+my $pid_file = "/var/run/freeside-queued.pid";
+
 &daemonize1;
 
 sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; $kids--; }
@@ -59,26 +61,44 @@ while (1) {
   }
   $warnkids=0;
 
-  my $nodepend = 'AND 0 = ( SELECT COUNT(*) FROM queue_depend'.
-                          ' WHERE queue_depend.jobnum = queue.jobnum ) ';
-
-  my $job = qsearchs(
-    'queue',
-    { 'status' => 'new' },
-    '',
-    driver_name =~ /^mysql$/i
-      ? "$nodepend ORDER BY jobnum LIMIT 1 FOR UPDATE"
-      : "$nodepend ORDER BY jobnum FOR UPDATE LIMIT 1"
-  ) or do {
-    sleep 5; #connecting to db is expensive
-    next;
-  };
+  my $nodepend = driver name eq 'mysql'
+   ? ''
+   : 'AND 0 = ( SELECT COUNT(*) FROM queue_depend'.
+     ' WHERE queue_depend.jobnum = queue.jobnum ) ';
+
+  my($job, $ljob);
+  {
+    my $oldAutoCommit = $FS::UID::AutoCommit;
+    local $FS::UID::AutoCommit = 0;
+    my $dbh = dbh; 
+  
+    $job = qsearchs(
+      'queue',
+      { 'status' => 'new' },
+      '',
+      driver_name eq 'mysql'
+        ? "$nodepend ORDER BY jobnum LIMIT 1 FOR UPDATE"
+        : "$nodepend ORDER BY jobnum FOR UPDATE LIMIT 1"
+    ) or do {
+      $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+      sleep 5; #connecting to db is expensive
+      next;
+    };
+
+    if ( driver_name eq 'mysql'
+         && qsearch('queue_depend', { 'jobnum' => $job->jobnum } ) ) {
+      $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+      next;
+    }
+
+    my %hash = $job->hash;
+    $hash{'status'} = 'locked';
+    $ljob = new FS::queue ( \%hash );
+    my $error = $ljob->replace($job);
+    die $error if $error;
 
-  my %hash = $job->hash;
-  $hash{'status'} = 'locked';
-  my $ljob = new FS::queue ( \%hash );
-  my $error = $ljob->replace($job);
-  die $error if $error;
+    $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  } 
 
   my @args = $ljob->args;
 
-- 
cgit v1.2.1


From de0898ba517025f865f80b351440f77a422d5bad Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Jun 2002 02:52:36 +0000
Subject: mysql support!

---
 httemplate/docs/install.html |  7 +++----
 httemplate/docs/mysql.html   | 13 -------------
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 httemplate/docs/mysql.html

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index beb9a47d7..56cee80e5 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -13,9 +13,8 @@ Before installing, you need:
   <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.
     <ul>
       <li><a href="http://www.postgresql.org/">PostgreSQL</a> (v7 or higher) is recommended.
-      <li><b>MySQL is NOT supported at this time.</b>  If you are a developer who wishes to contribute MySQL support, see the <a href="mysql.html">MySQL notes</a>.
-      <!-- <li>MySQL has been reported to work.  -->
-      <!--  <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you really want to use MySQL, you need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.-->
+       <li>MySQL has been reported to work.
+         <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you want to use MySQL, you <b>must</b> use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a> or <a href="http://www.mysql.com/doc/I/n/InnoDB.html">InnoDB</a>, and set it as the default table type when running fs-setup using the <code>--default-table-type=BDB</code> or <code>--default-table-type=InnoDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> or <code>--default-table-type=InnoDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
     </ul>
   <li>Perl modules (<a href="http://theoryx5.uwinnipeg.ca/CPAN/perl/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
     <ul>
@@ -188,7 +187,7 @@ $ su freeside
 $ cd <b>/path/to/freeside-1.4.0/</b>
 $ bin/populate-msgcat <b>username</b>
 </pre>
-  <li><tt>freeside-queued</tt> was installed with the Perl modules.  Start it now and ensure that is run upon system startup (Do this manually, or, edit the top-level Makefile, replacing INIT_FILE with the appropriate location on your system, and run <tt>make install-init</tt>.
+  <li><tt>freeside-queued</tt> was installed with the Perl modules.  Start it now and ensure that is run upon system startup (Do this manually, or edit the top-level Makefile, replacing INIT_FILE with the appropriate location on your system, and run <tt>make install-init</tt>)
   <li>Now proceed to the initial <a href="admin.html">administration</a> of your installation.
 </ul>
 </body>
diff --git a/httemplate/docs/mysql.html b/httemplate/docs/mysql.html
deleted file mode 100644
index 11af518e1..000000000
--- a/httemplate/docs/mysql.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<head>
-  <title>MySQL notes</title>
-</head>
-<body>
-  <h1>MySQL notes</h1>
-<font size=+2><b>MySQL is NOT supported at this time.</b></font>
-<i>The following information is provided for developers who wish to contribute MySQL support.  Note that <b>ALL</b> of the items listed below need to be resolved to support MySQL.
-<ul>
-  <li>See ticket <a href="http://pouncequick.420.am/rt/Ticket/Display.html?id=300">#300</a> in the bug-tracking system.
-  <li><b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">My
-ISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  You need to use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
-</ul>
-</body>
-- 
cgit v1.2.1


From 65d83a3b7e962e9f98dfb9690c811ed2c6e54057 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Jun 2002 03:12:14 +0000
Subject: remove classic interface

---
 httemplate/classic.html | 108 ------------------------------------------------
 httemplate/index.html   |   1 -
 2 files changed, 109 deletions(-)
 delete mode 100644 httemplate/classic.html

diff --git a/httemplate/classic.html b/httemplate/classic.html
deleted file mode 100644
index e56d04d8d..000000000
--- a/httemplate/classic.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>
-      Freeside Main Menu
-    </TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#FFFFFF">
-  <table width="100%">
-    <tr><td>
-        <IMG BORDER=0 ALT="Silicon Interactive Software Design" SRC="images/small-logo.png">
-    </td><td>
-      <font color="#ff0000" size=7>freeside main menu</font>
-    </td><td align=right valign=bottom>
-      version 1.4.0
-      <BR><A HREF="http://www.sisd.com/freeside">Freeside home page</A>
-      <BR><A HREF="docs/">Documentation</A>
-      <BR><A HREF="index.html">New interface</A>
-    </td></tr>
-  </table>
-    <hr noshade>
-    <ul>
-      <li><A HREF="edit/cust_main.cgi">New Customer</A>
-      <li><A NAME="search">Search</A>
-        <ul>
-        <LI><A HREF="search/cust_main.html">customers (by last name and/or company)</A>
-        <LI><A HREF="search/cust_main-payinfo.html">customers (by credit card number)</A>
-        <LI><A HREF="search/svc_acct.html">accounts (by username)</A>
-        <LI><A HREF="search/svc_domain.html">domains (by domain)</A>
-<!--        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>-->
-<!--        <LI><A HREF="search/svc_forward.html">mail forwards (by ?)</A>-->
-        <LI><A HREF="search/cust_bill.html">invoices (by invoice number)</A>
-        <LI><A HREF="search/cust_pay.html">checks (by check number)</A>
-        </ul>
-      <li><A NAME="browse">Browse</A>
-        <ul>
-          <LI>customers (<A HREF="search/cust_main.cgi?browse=custnum">by customer number</A>) (<A HREF="search/cust_main.cgi?browse=last">by last name</A>) (<A HREF="search/cust_main.cgi?browse=company">by company</A>)
-          <LI>invoices
-            <UL>
-              <LI>open invoices (<A HREF="search/cust_bill.cgi?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN_custnum">by customer number</A>)
-              <LI>30 day open invoices (<A HREF="search/cust_bill.cgi?OPEN30_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN30_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN30_custnum">by customer number</A>)
-              <LI>60 day open invoices (<A HREF="search/cust_bill.cgi?OPEN60_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN60_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN60_custnum">by customer number</A>)
-              <LI>90 day open invoices (<A HREF="search/cust_bill.cgi?OPEN90_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN90_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN90_custnum">by customer number</A>)
-              <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
-              <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
-            </UL>
-          <LI>financials
-            <UL>
-              <LI><A HREF="search/report_receivables.cgi">receivables report</A>
-              <LI><A HREF="search/report_tax.html">tax reports</A>
-              <LI><A HREF="search/report_cc.html">credit card receipts</A>
-              <LI><A HREF="search/report_credit.html">in house credits</A>
-            </UL>
-          <LI>packages
-            <UL>
-              <LI><A HREF="search/cust_pkg.cgi?pkgnum">packages (by package number)</A>
-              <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
-            </UL>
-          <LI>services
-            <UL>
-              <LI>accounts (<A HREF="search/svc_acct.cgi?svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?username">by username</A>) (<A HREF="search/svc_acct.cgi?uid">by uid</A>)
-              <LI>mail forwards (<A HREF="search/svc_forward.cgi?svcnum">by service number</A>) (by ?))
-              <LI>domains (<A HREF="search/svc_domain.cgi?svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?domain">by domain</A>)
-            </UL>
-          <LI>unlinked services
-            <UL>
-              <LI>unlinked accounts (<A HREF="search/svc_acct.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?UN_username">by username</A>) (<A HREF="search/svc_acct.cgi?UN_uid">by uid</A>)
-              <LI>unlinked mail forwards (<A HREF="search/svc_forward.cgi?UN_svcnum">by service number</A>) (by ?))
-              <LI>unlinked domains (<A HREF="search/svc_domain.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?UN_domain">by domain</A>)
-            </UL>
-          <LI><A HREF="browse/nas.cgi">NAS ports</A>
-          <LI><A HREF="browse/queue.cgi">Job queue</A>
-          <LI><A HREF="browse/cust_pay_batch.cgi">Pending credit card batch</A>
-        </ul>
-      <li>Miscellaneous
-        <ul>
-          <li><A HREF="search/cust_main-quickpay.html">Quick payment entry</A>
-        </ul>
-    </ul>
-    <hr noshade>
-    <ul>
-      <li><A NAME="config" HREF="config/config-view.cgi">Configuration</a><!-- - <font size="+2" color="#ff0000">start here</font> -->
-      <li><A NAME="admin">Administration</a>
-        <ul>
-          <LI><A HREF="browse/part_svc.cgi">View/Edit service definitions</A>
-            - Services are items you offer to your customers.
-          <LI><A HREF="browse/part_pkg.cgi">View/Edit package definitions</A>
-            - One or more services are grouped together into a package and
-              given pricing information.  Customers purchase packages, not
-              services.
-          <LI><A HREF="browse/agent_type.cgi">View/Edit agent types</A>
-            - Agent types define groups of package definitions that you can
-              then assign to particular agents.
-          <LI><A HREF="browse/agent.cgi">View/Edit agents</A>
-            - Agents are resellers of your service.  Agents may be limited
-              to a subset of your full offerings (via their type).
-          <LI><A HREF="browse/part_referral.cgi">View/Edit referrals</A>
-            - Where a customer heard about your service.  Tracked for
-              informational purposes.
-          <LI><A HREF="browse/cust_main_county.cgi">View/Edit locales and tax rates</A>
-            - Change tax rates, or break down a country into states, or a state
-              into counties and assign different tax rates to each.
-          <LI><A HREF="browse/svc_acct_pop.cgi">View/Edit Access Numbers</A>
-            - Points of Presence 
-          <LI><A HREF="browse/part_bill_event.cgi">View/Edit invoice events</A> - Actions for overdue invoices
-        </ul>
-      </ul>
-  </BODY>
-</HTML>
diff --git a/httemplate/index.html b/httemplate/index.html
index 5b9b18a6f..8710b1798 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -14,7 +14,6 @@
       version 1.4.0
       <BR><A HREF="http://www.sisd.com/freeside">Freeside home page</A>
       <BR><A HREF="docs/">Documentation</A>
-      <BR><A HREF="classic.html">Classic interface</A>
     </td></tr>
   </table>
 
-- 
cgit v1.2.1


From fcc3d1c712ed1f50e9aaa79b764392e31359a825 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Jun 2002 03:26:00 +0000
Subject: s/svc_domain.import/bind.import/ to match reality

---
 httemplate/docs/legacy.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/docs/legacy.html b/httemplate/docs/legacy.html
index cceeb05d0..161690b62 100755
--- a/httemplate/docs/legacy.html
+++ b/httemplate/docs/legacy.html
@@ -5,8 +5,8 @@
   <h1>Importing legacy data</h1>
 <font size="+2">In most cases, legacy data import all cases will require writing custom code to deal with your particular legacy data.  The example scripts here will not work "out-of-the-box".  Importing your legacy data will most probably involve some hacking on the example scripts noted below.  Contributions to the import process are welcome.</font>
 <ul>
-  <li><a name="svc_domain">bin/svc_domain.import</a> - Import domain information from BIND named
-  <li><a name="svc_acct">bin/passwd.import</a> - Just import `passwd' and `shadow' or `master.passwd', no RADIUS import.
+  <li><a name="bind">bin/bind.import</a> - Import domain information from BIND named
+  <li><a name="passwd">bin/passwd.import</a> - Just import `passwd' and `shadow' or `master.passwd', no RADIUS import.
   <li><a name="svc_acct">bin/svc_acct.import</a> - Import `passwd', ( `shadow' or `master.passwd' ) and RADIUS `users'.  Before running bin/svc_acct.import, you need <a href="../browse/part_svc.cgi">services</a> (with table svc_acct) as follows:
     <ul>
       <li>Most accounts probably have entries in passwd and users (with Port-Limit nonexistant or 1)
-- 
cgit v1.2.1


From 251c436ab3d9b79d74ab4fc9af05aac4acf26489 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Jun 2002 09:19:33 +0000
Subject: only run callbacks once... should speed things up (no dbdef
 reloading)

---
 FS/FS/UID.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index d34d28e06..87830cb04 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -92,6 +92,7 @@ sub forksuidsetup {
 
   foreach ( keys %callback ) {
     &{$callback{$_}};
+    delete $callback{$_}; #run once
   }
 
   $dbh;
@@ -255,7 +256,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.14 2002-02-23 07:00:21 ivan Exp $
+$Id: UID.pm,v 1.15 2002-06-14 09:19:33 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From a930f5bc47c9c2de989074f1570beaa8f116bd22 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Jun 2002 11:22:53 +0000
Subject: working job dependancies FS::queue::joblisting html excapes &
 truncates long arguments welcome email (sheesh!) closes: Bug#420 (haha at
 4:20 am, too.  really!)

---
 FS/FS/Conf.pm          |  49 ++++++++++++++++++-----
 FS/FS/cust_main.pm     |  59 ++++++++++++++--------------
 FS/FS/queue.pm         |  21 +++++++---
 FS/FS/svc_Common.pm    |   9 ++++-
 FS/FS/svc_acct.pm      | 104 +++++++++++++++++++++++++++++++++++++++++++++++--
 FS/bin/freeside-queued |  66 ++++++++++++++++---------------
 6 files changed, 225 insertions(+), 83 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 126461763..dbb3682d0 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -249,15 +249,15 @@ httemplate/docs/config.html
 
   {
     'key'         => 'bindprimary',
-    'section'     => 'BIND',
-    'description' => 'Your BIND primary nameserver.  This enables export of /var/named/named.conf and zone files into /var/named',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add a <i>bind</i> <a href="../browse/part_export.cgi">export</a> instead.  Your BIND primary nameserver.  This enables export of /var/named/named.conf and zone files into /var/named',
     'type'        => 'text',
   },
 
   {
     'key'         => 'bindsecondaries',
-    'section'     => 'BIND',
-    'description' => 'Your BIND secondary nameservers, one per line.  This enables export of /var/named/named.conf',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add a <i>bind_slave</i> <a href="../browse/part_export.cgi">export</a> instead.  Your BIND secondary nameservers, one per line.  This enables export of /var/named/named.conf',
     'type'        => 'textarea',
   },
 
@@ -277,8 +277,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'bsdshellmachines',
-    'section'     => 'shell',
-    'description' => 'Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd\' and `/etc/master.passwd\'.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add a <i>bsdshell</i> <a href="../browse/part_export.cgi">export</a> instead.  Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd\' and `/etc/master.passwd\'.',
     'type'        => 'textarea',
   },
 
@@ -506,8 +506,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'nismachines',
-    'section'     => 'shell',
-    'description' => 'Your NIS master (not slave master) machines, one per line.  This enables export of `/etc/global/passwd\' and `/etc/global/shadow\'.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>.  Your NIS master (not slave master) machines, one per line.  This enables export of `/etc/global/passwd\' and `/etc/global/shadow\'.',
     'type'        => 'textarea',
   },
 
@@ -633,8 +633,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'shellmachines',
-    'section'     => 'shell',
-    'description' => 'Your Linux and System V flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd\' and `/etc/shadow\' files.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add a <i>sysvshell</i> <a href="../browse/part_export.cgi">export</a> instead.  Your Linux and System V flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd\' and `/etc/shadow\' files.',
      'type'        => 'textarea',
  },
 
@@ -937,6 +937,35 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'welcome_email',
+    'section'     => '',
+    'description' => 'Template file for welcome email.  Welcome emails are sent to the customer email invoice destination(s) each time a svc_acct record is created.  See the <a href="http://search.cpan.org/doc/MJD/Text-Template-1.42/Template.pm">Text::Template</a> documentation for details on the template substitution language.  The following variables are available: <code>$username</code>, <code>$password</code>, <code>$first</code>, <code>$last</code> and <code>$pkg</code>.',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'welcome_email-from',
+    'section'     => '',
+    'description' => 'From: address header for welcome email',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'welcome_email-subject',
+    'section'     => '',
+    'description' => 'Subject: header for welcome email',
+    'type'        => 'text',
+  },
+  
+  {
+    'key'         => 'welcome_email-mimetype',
+    'section'     => '',
+    'description' => 'MIME type for welcome email',
+    'type'        => 'select',
+    'select_enum' => [ 'text/plain', 'text/html' ],
+  },
+
 );
 
 1;
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 6be6cdb74..b39a77fd7 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -220,7 +220,8 @@ invoicing_list destination to the newly-created svc_acct.  Here's an example:
 
 sub insert {
   my $self = shift;
-  my @param = @_;
+  my $cust_pkgs = @_ ? shift : {};
+  my $invoicing_list = @_ ? shift : '';
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -261,27 +262,35 @@ sub insert {
     return $error;
   }
 
-  if ( @param ) { # CUST_PKG_HASHREF
-    my $cust_pkgs = shift @param;
-    foreach my $cust_pkg ( keys %$cust_pkgs ) {
-      $cust_pkg->custnum( $self->custnum );
-      $error = $cust_pkg->insert;
+  # invoicing list
+  if ( $invoicing_list ) {
+    $error = $self->check_invoicing_list( $invoicing_list );
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "checking invoicing_list (transaction rolled back): $error";
+    }
+    $self->invoicing_list( $invoicing_list );
+  }
+
+  # packages
+  foreach my $cust_pkg ( keys %$cust_pkgs ) {
+    $cust_pkg->custnum( $self->custnum );
+    $error = $cust_pkg->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "inserting cust_pkg (transaction rolled back): $error";
+    }
+    foreach my $svc_something ( @{$cust_pkgs->{$cust_pkg}} ) {
+      $svc_something->pkgnum( $cust_pkg->pkgnum );
+      if ( $seconds && $svc_something->isa('FS::svc_acct') ) {
+        $svc_something->seconds( $svc_something->seconds + $seconds );
+        $seconds = 0;
+      }
+      $error = $svc_something->insert;
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
-        return "inserting cust_pkg (transaction rolled back): $error";
-      }
-      foreach my $svc_something ( @{$cust_pkgs->{$cust_pkg}} ) {
-        $svc_something->pkgnum( $cust_pkg->pkgnum );
-        if ( $seconds && $svc_something->isa('FS::svc_acct') ) {
-          $svc_something->seconds( $svc_something->seconds + $seconds );
-          $seconds = 0;
-        }
-        $error = $svc_something->insert;
-        if ( $error ) {
-          $dbh->rollback if $oldAutoCommit;
-          #return "inserting svc_ (transaction rolled back): $error";
-          return $error;
-        }
+        #return "inserting svc_ (transaction rolled back): $error";
+        return $error;
       }
     }
   }
@@ -291,16 +300,6 @@ sub insert {
     return "No svc_acct record to apply pre-paid time";
   }
 
-  if ( @param ) { # INVOICING_LIST_ARYREF
-    my $invoicing_list = shift @param;
-    $error = $self->check_invoicing_list( $invoicing_list );
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "checking invoicing_list (transaction rolled back): $error";
-    }
-    $self->invoicing_list( $invoicing_list );
-  }
-
   if ( $amount ) {
     my $cust_credit = new FS::cust_credit {
       'custnum' => $self->custnum,
diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index df92c5654..1de19b7b5 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -1,7 +1,7 @@
 package FS::queue;
 
 use strict;
-use vars qw( @ISA @EXPORT_OK $conf );
+use vars qw( @ISA @EXPORT_OK $conf $jobnums);
 use Exporter;
 use FS::UID;
 use FS::Conf;
@@ -18,6 +18,8 @@ $FS::UID::callback{'FS::queue'} = sub {
   $conf = new FS::Conf;
 };
 
+$jobnums = '';
+
 =head1 NAME
 
 FS::queue - Object methods for queue records
@@ -118,6 +120,8 @@ sub insert {
     }
   }
 
+  push @$jobnums, $self->jobnum if $jobnums;
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   '';
@@ -257,10 +261,10 @@ in a database transaction.
 
 sub depend_insert {
   my($self, $other_jobnum) = @_;
-  my $queue_depend = new FS::queue_depend (
+  my $queue_depend = new FS::queue_depend ( {
     'jobnum'        => $self->jobnum,
     'depend_jobnum' => $other_jobnum,
-  );
+  } );
   $queue_depend->insert;
 }
 
@@ -278,6 +282,7 @@ sub joblisting {
   my($hashref, $noactions) = @_;
 
   use Date::Format;
+  use HTML::Entities;
   use FS::CGI;
 
   my @queue = qsearch( 'queue', $hashref );
@@ -308,7 +313,9 @@ END
 
     my $args;
     if ( $dangerous || $queue->job !~ /^FS::part_export::/ || !$noactions ) {
-      $args = join(' ', $queue->args);
+      $args = encode_entities( join(' ',
+        map { length($_)<54 ? $_ : substr($_,0,32)."..."  } $queue->args #1&g
+      ) );
     } else {
       $args = '';
     }
@@ -318,7 +325,7 @@ END
     $status .= ': '. $queue->statustext if $queue->statustext;
     my @queue_depend = $queue->queue_depend;
     $status .= ' (waiting for '.
-               join(', ', map { $_->other_jobnum } @queue_depend ). 
+               join(', ', map { $_->depend_jobnum } @queue_depend ). 
                ')'
       if @queue_depend;
     my $changable = $dangerous
@@ -378,10 +385,12 @@ END
 
 =head1 VERSION
 
-$Id: queue.pm,v 1.13 2002-05-15 14:00:32 ivan Exp $
+$Id: queue.pm,v 1.14 2002-06-14 11:22:53 ivan Exp $
 
 =head1 BUGS
 
+$jobnums global
+
 =head1 SEE ALSO
 
 L<FS::Record>, schema.html from the base documentation.
diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index cd278efb5..87b6097aa 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -5,6 +5,7 @@ use vars qw( @ISA $noexport_hack );
 use FS::Record qw( qsearchs fields dbh );
 use FS::cust_svc;
 use FS::part_svc;
+use FS::queue;
 
 @ISA = qw( FS::Record );
 
@@ -27,7 +28,7 @@ inherit from, i.e. FS::svc_acct.  FS::svc_Common inherits from FS::Record.
 
 =over 4
 
-=item insert
+=item insert [ JOBNUM_ARRAYREF ]
 
 Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
@@ -35,10 +36,14 @@ otherwise returns false.
 The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
 defined.  An FS::cust_svc record will be created and inserted.
 
+If an arrayref is passed as parameter, the B<jobnum>s of any export jobs will
+be added to the array.
+
 =cut
 
 sub insert {
   my $self = shift;
+  local $FS::queue::jobnums = shift if @_;
   my $error;
 
   local $SIG{HUP} = 'IGNORE';
@@ -359,7 +364,7 @@ sub cancel { ''; }
 
 =head1 VERSION
 
-$Id: svc_Common.pm,v 1.11 2002-06-11 03:25:03 ivan Exp $
+$Id: svc_Common.pm,v 1.12 2002-06-14 11:22:53 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index aa089d065..9186e8107 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -8,6 +8,8 @@ use vars qw( @ISA $noexport_hack $conf
              $username_noperiod $username_nounderscore $username_nodash
              $username_uppercase
              $mydomain
+             $welcome_template $welcome_from $welcome_subject $welcome_mimetype
+             $smtpmachine
              $dirhash
              @saltset @pw_set );
 use Carp;
@@ -48,8 +50,19 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
   $username_uppercase = $conf->exists('username-uppercase');
   $username_ampersand = $conf->exists('username-ampersand');
   $mydomain = $conf->config('domain');
-
   $dirhash = $conf->config('dirhash') || 0;
+  if ( $conf->exists('welcome_email') ) {
+    $welcome_template = new Text::Template (
+      TYPE   => 'ARRAY',
+      SOURCE => [ map "$_\n", $conf->config('welcome_email') ]
+    ) or warn "can't create welcome email template: $Text::Template::ERROR";
+    $welcome_from = $conf->config('welcome_email-from'); # || 'your-isp-is-dum'
+    $welcome_subject = $conf->config('welcome_email-subject') || 'Welcome';
+    $welcome_mimetype = $conf->config('welcome_email-mimetype') || 'text/plain';
+  } else {
+    $welcome_template = '';
+  }
+  $smtpmachine = $conf->config('smtpmachine');
 };
 
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
@@ -283,7 +296,8 @@ sub insert {
       && $self->username !~ /^toor$/ #FreeBSD
     ;
 
-  $error = $self->SUPER::insert;
+  my @jobnums;
+  $error = $self->SUPER::insert(\@jobnums);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
@@ -304,13 +318,58 @@ sub insert {
   }
 
   #false laziness with sub replace (and cust_main)
-  my $queue = new FS::queue { 'job' => 'FS::svc_acct::append_fuzzyfiles' };
+  my $queue = new FS::queue {
+    'svcnum' => $self->svcnum,
+    'job'    => 'FS::svc_acct::append_fuzzyfiles'
+  };
   $error = $queue->insert($self->username);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return "queueing job (transaction rolled back): $error";
   }
 
+  #welcome email
+  my $cust_pkg = $self->cust_svc->cust_pkg;
+  my( $cust_main, $to ) = ( '', '' );
+  if ( $welcome_template && $cust_pkg ) {
+    my $cust_main = $cust_pkg->cust_main;
+    my $to = join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list );
+    if ( $to ) {
+      my $wqueue = new FS::queue {
+        'svcnum' => $self->svcnum,
+        'job'    => 'FS::svc_acct::send_email'
+      };
+      warn "attempting to queue email to $to";
+      my $error = $wqueue->insert(
+        'to'       => $to,
+        'from'     => $welcome_from,
+        'subject'  => $welcome_subject,
+        'mimetype' => $welcome_mimetype,
+        'body'     => $welcome_template->fill_in( HASH => {
+                        'username' => $self->username,
+                        'password' => $self->_password,
+                        'first'    => $cust_main->first,
+                        'last'     => $cust_main->getfield('last'),
+                        'pkg'      => $cust_pkg->part_pkg->pkg,
+                      } ),
+      );
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "queuing welcome email: $error";
+      }
+  
+      foreach my $jobnum ( @jobnums ) {
+        my $error = $wqueue->depend_insert($jobnum);
+        if ( $error ) {
+          $dbh->rollback if $oldAutoCommit;
+          return "queuing welcome email job dependancy: $error";
+        }
+      }
+
+    }
+  
+  }
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
 }
@@ -487,7 +546,10 @@ sub replace {
   }
 
   #false laziness with sub insert (and cust_main)
-  my $queue = new FS::queue { 'job' => 'FS::svc_acct::append_fuzzyfiles' };
+  my $queue = new FS::queue {
+    'svcnum' => $new->svcnum,
+    'job'    => 'FS::svc_acct::append_fuzzyfiles'
+  };
   $error = $queue->insert($new->username);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
@@ -879,6 +941,40 @@ sub radius_groups {
 
 =over 4
 
+=item send_email
+
+=cut
+
+sub send_email {
+  my %opt = @_;
+
+  use Date::Format;
+  use Mail::Internet 1.44;
+  use Mail::Header;
+
+  $opt{mimetype} ||= 'text/plain';
+  $opt{mimetype} .= '; charset="iso-8859-1"' unless $opt{mimetype} =~ /charset/;
+
+  $ENV{MAILADDRESS} = $opt{from};
+  my $header = new Mail::Header ( [
+    "From: $opt{from}",
+    "To: $opt{to}",
+    "Sender: $opt{from}",
+    "Reply-To: $opt{from}",
+    "Date: ". time2str("%a, %d %b %Y %X %z", time),
+    "Subject: $opt{subject}",
+    "Content-Type: $opt{mimetype}",
+  ] );
+  my $message = new Mail::Internet (
+    'Header' => $header,
+    'Body' => [ map "$_\n", split("\n", $opt{body}) ],
+  );
+  $!=0;
+  $message->smtpsend( Host => $smtpmachine )
+    or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
+      or die "can't send email to $opt{to} via $smtpmachine with SMTP: $!";
+}
+
 =item check_and_rebuild_fuzzyfiles
 
 =cut
diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 67e5e2bca..846055dc3 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -61,44 +61,48 @@ while (1) {
   }
   $warnkids=0;
 
-  my $nodepend = driver name eq 'mysql'
+  my $nodepend = driver_name eq 'mysql'
    ? ''
    : 'AND 0 = ( SELECT COUNT(*) FROM queue_depend'.
      ' WHERE queue_depend.jobnum = queue.jobnum ) ';
 
-  my($job, $ljob);
-  {
-    my $oldAutoCommit = $FS::UID::AutoCommit;
-    local $FS::UID::AutoCommit = 0;
-    my $dbh = dbh; 
+  #my($job, $ljob);
+  #{
+  #  my $oldAutoCommit = $FS::UID::AutoCommit;
+  #  local $FS::UID::AutoCommit = 0;
+  $FS::UID::AutoCommit = 0;
+  my $dbh = dbh; 
   
-    $job = qsearchs(
-      'queue',
-      { 'status' => 'new' },
-      '',
-      driver_name eq 'mysql'
-        ? "$nodepend ORDER BY jobnum LIMIT 1 FOR UPDATE"
-        : "$nodepend ORDER BY jobnum FOR UPDATE LIMIT 1"
-    ) or do {
-      $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-      sleep 5; #connecting to db is expensive
-      next;
-    };
-
-    if ( driver_name eq 'mysql'
-         && qsearch('queue_depend', { 'jobnum' => $job->jobnum } ) ) {
-      $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-      next;
-    }
+  my $job = qsearchs(
+    'queue',
+    { 'status' => 'new' },
+    '',
+    driver_name eq 'mysql'
+      ? "$nodepend ORDER BY jobnum LIMIT 1 FOR UPDATE"
+      : "$nodepend ORDER BY jobnum FOR UPDATE LIMIT 1"
+  ) or do {
+    $dbh->commit or die $dbh->errstr; #if $oldAutoCommit;
+    sleep 5; #connecting to db is expensive
+    next;
+  };
 
-    my %hash = $job->hash;
-    $hash{'status'} = 'locked';
-    $ljob = new FS::queue ( \%hash );
-    my $error = $ljob->replace($job);
-    die $error if $error;
+  if ( driver_name eq 'mysql'
+       && qsearch('queue_depend', { 'jobnum' => $job->jobnum } ) ) {
+    $dbh->commit or die $dbh->errstr; #if $oldAutoCommit;
+    sleep 5; #would be better if mysql could do everything in query above
+    next;
+  }
+
+  my %hash = $job->hash;
+  $hash{'status'} = 'locked';
+  my $ljob = new FS::queue ( \%hash );
+  my $error = $ljob->replace($job);
+  die $error if $error;
+
+  $dbh->commit or die $dbh->errstr; #if $oldAutoCommit;
 
-    $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  } 
+  $FS::UID::AutoCommit = 1;
+  #} 
 
   my @args = $ljob->args;
 
-- 
cgit v1.2.1


From 529dbfb907ec2a08ebe2780944357cdf8f8b2a2b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Jun 2002 11:26:01 +0000
Subject: 1.4.0pre14

---
 ANNOUCE.1.4.0     |  7 +++++++
 Makefile          |  4 ++--
 README.1.4.0pre14 | 13 +++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 README.1.4.0pre14

diff --git a/ANNOUCE.1.4.0 b/ANNOUCE.1.4.0
index a916076e9..f719816e7 100644
--- a/ANNOUCE.1.4.0
+++ b/ANNOUCE.1.4.0
@@ -128,3 +128,10 @@ schema diagram
 
 complete bind import and export and edit of dns zone files
 
+card retry changes (ticket 417)
+
+working company search and job dependancies
+
+welcome emails
+
+MySQL!
diff --git a/Makefile b/Makefile
index 0f7ff71c6..19bc0f30c 100644
--- a/Makefile
+++ b/Makefile
@@ -40,8 +40,8 @@ SIGNUP_REFNUM = 2
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.4.0pre13
-TAG=freeside_1_4_0_pre13
+VERSION=1.4.0pre14
+TAG=freeside_1_4_0_pre14
 #VERSION=1.4.0beta1
 #TAG=freeside_1_4_0_beta1
 
diff --git a/README.1.4.0pre14 b/README.1.4.0pre14
new file mode 100644
index 000000000..6ea2f8046
--- /dev/null
+++ b/README.1.4.0pre14
@@ -0,0 +1,13 @@
+the following is necessary to upgrade from 1.4.0pre13 to 1.4.0pre14
+
+if you're upgrading from before 1.4.0pre14 see README.1.4.0pre13 first!
+
+if you're upgrading from 1.3.1 follow the instructions in
+httemplate/docs/upgrade8.html instead
+
+----
+
+install the FS perl modules and httemplate as per install.html or upgrade8.html
+
+Restart Apache and freeside-queued
+
-- 
cgit v1.2.1


From 6a724b70e321ef79e882b42ae3b909792352aaec Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Jun 2002 11:44:15 +0000
Subject: better releaes target?

---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 19bc0f30c..2937b2018 100644
--- a/Makefile
+++ b/Makefile
@@ -78,6 +78,12 @@ htmlman:
 	[ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
 	[ -e DONT_REBUILD_DOCS ] || bin/pod2x
 
+forcehtmlman:
+	[ -e ./httemplate/docs/man ] || mkdir httemplate/docs/man
+	[ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
+	[ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
+	[ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
+	bin/pod2x
 
 install-docs: docs
 	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
@@ -151,7 +157,7 @@ clean:
 
 #these are probably only useful if you're me...
 
-upload-docs:
+upload-docs: forcehtmlman
 	ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
 	scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs
 
-- 
cgit v1.2.1


From d7adf8a88198c98305dae4c5030bb82107595b43 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Jun 2002 21:35:44 +0000
Subject: freeside night to infostreet faxNumber (? dunno, what noment wants)

---
 FS/FS/part_export/infostreet.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
index 8bf227d82..40dee487a 100644
--- a/FS/FS/part_export/infostreet.pm
+++ b/FS/FS/part_export/infostreet.pm
@@ -14,7 +14,8 @@ use FS::part_export;
   'state'       => 'state',
   'zipCode'     => 'zip',
   'country'     => 'country',
-  'phoneNumber' => 'dayphone',
+  'phoneNumber' => 'daytime',
+  'faxNumber'   => 'night',
 );
 
 sub rebless { shift; }
-- 
cgit v1.2.1


From 19aebb0a743cf80a620f34fc7c6ad71f79764265 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Jun 2002 01:12:29 +0000
Subject: mark@pc-intouch.com: exporttype2svcdb removal

---
 FS/FS/part_export.pm         | 32 +++++++++++++-------------------
 httemplate/edit/part_svc.cgi |  6 ++----
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 52c8213a0..9af00174d 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -494,25 +494,19 @@ sub export_info {
   my $r = { map { %{$exports{$_}} } keys %exports };
 }
 
-=item exporttype2svcdb EXPORTTYPE
-
-Returns the applicable I<svcdb> for an I<exporttype>.
-
-=cut
-
-# This subroutine should be modified or removed.  In its present form, it
-# imposes the arbitrary restriction that no export type can be associated 
-# with more than one svcdb.  The only place it's used is in edit/part_svc.cgi
-# to generate the list of allowed exports, which can be done more cleanly by 
-# export_info anyway.
-
-sub exporttype2svcdb {
-  my $exporttype = $_[0];
-  foreach my $svcdb ( keys %exports ) {
-    return $svcdb if grep { $exporttype eq $_ } keys %{$exports{$svcdb}};
-  }
-  '';
-}
+#=item exporttype2svcdb EXPORTTYPE
+#
+#Returns the applicable I<svcdb> for an I<exporttype>.
+#
+#=cut
+#
+#sub exporttype2svcdb {
+#  my $exporttype = $_[0];
+#  foreach my $svcdb ( keys %exports ) {
+#    return $svcdb if grep { $exporttype eq $_ } keys %{$exports{$svcdb}};
+#  }
+#  '';
+#}
 
 tie my %sysvshell_options, 'Tie::IxHash',
   'crypt' => { label=>'Password encryption',
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 36f764140..4ccb770fb 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -144,10 +144,8 @@ my %defs = (
       my $columns = 3;
       my $count = 0;
       my @part_export =
-#        grep { $layer eq FS::part_export::exporttype2svcdb($_->exporttype) }
-#          qsearch( 'part_export', {} );
-         map { qsearch( 'part_export', {exporttype => $_ } ) }
-           keys(%{FS::part_export::export_info($layer)});
+        map { qsearch( 'part_export', {exporttype => $_ } ) }
+          keys %{FS::part_export::export_info($layer)};
      $html .= '<BR><BR>'. table().
                table(). "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
       foreach my $part_export ( @part_export ) {
-- 
cgit v1.2.1


From 967ff9a298e535bf3ad4611737a99932ed2f6e1a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Jun 2002 23:52:39 +0000
Subject: better error message

---
 httemplate/misc/queue.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/httemplate/misc/queue.cgi b/httemplate/misc/queue.cgi
index 8c1e5362d..ce9c8fbd3 100644
--- a/httemplate/misc/queue.cgi
+++ b/httemplate/misc/queue.cgi
@@ -9,7 +9,8 @@ if ( $action eq 'new' || $action eq 'del' ) {
   $cgi->param('jobnum') =~ /^(\d+)$/ or die "Illegal jobnum";
   my $jobnum = $1;
   $job = qsearchs('queue', { 'jobnum' => $1 })
-    or die "unknown jobnum $jobnum";
+    or die "unknown jobnum $jobnum - ".
+           "it probably completed normally or was removed by another user";
 }
 
 if ( $action eq 'new' ) {
-- 
cgit v1.2.1


From ef6202c5eded27360d058c84cb8cb2b5cf69478f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Jun 2002 00:58:57 +0000
Subject: fix problem provisioning RADIUS groups   caused by
 kristian/mark/pc-intouch's changes moving exports into svc_Common -   changed
 sequence of events such that groups were not provisioned when the   sqlradius
 export was run

---
 FS/FS/svc_acct.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 9186e8107..0be6e5b8d 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -931,8 +931,14 @@ Returns all RADIUS groups for this account (see L<FS::radius_usergroup>).
 
 sub radius_groups {
   my $self = shift;
-  map { $_->groupname }
-    qsearch('radius_usergroup', { 'svcnum' => $self->svcnum } );
+  if ( $self->usergroup ) {
+    #when provisioning records, export callback runs in svc_Common.pm before
+    #radius_usergroup records can be inserted...
+    @{$self->usergroup};
+  } else {
+    map { $_->groupname }
+      qsearch('radius_usergroup', { 'svcnum' => $self->svcnum } );
+  }
 }
 
 =back
-- 
cgit v1.2.1


From 0eea8f4255a5c65666db673b302de7585f6f06a1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Jun 2002 01:03:56 +0000
Subject: and the same for changes...

---
 FS/FS/svc_acct.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 0be6e5b8d..1d68fc99e 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -505,12 +505,6 @@ sub replace {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  $error = $new->SUPER::replace($old);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error if $error;
-  }
-
   $old->usergroup( [ $old->radius_groups ] );
   if ( $new->usergroup ) {
     #(sorta) false laziness with FS::part_export::sqlradius::_export_replace
@@ -545,6 +539,12 @@ sub replace {
 
   }
 
+  $error = $new->SUPER::replace($old);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error if $error;
+  }
+
   #false laziness with sub insert (and cust_main)
   my $queue = new FS::queue {
     'svcnum' => $new->svcnum,
-- 
cgit v1.2.1


From 88f0ff8531750c6eafd0495b7bbdc440d78db379 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Jun 2002 04:03:15 +0000
Subject: fix setContactField email

---
 FS/FS/part_export/infostreet.pm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
index 40dee487a..e6d68c1e2 100644
--- a/FS/FS/part_export/infostreet.pm
+++ b/FS/FS/part_export/infostreet.pm
@@ -32,11 +32,16 @@ sub _export_insert {
     return $error if $error;
   }
 
-  $self->infostreet_queue( $svc_acct->svcnum,
-    'setContactField', $accountID, 'email', $cust_main->invoicing_list )
+  my @emails = grep { $_ ne 'POST' } $cust_main->invoicing_list;
+  if ( @emails ) {
+    my $error = $self->infostreet_queue( $svc_acct->svcnum,
+      'setContactField', $accountID, 'email', $emails[0] );
+    return $error if $error;
+  }
+
   #this one is kinda noment-specific
-  || $self->infostreet_queue( $svc_acct->svcnum,
-         'setContactField', $accountID, 'title', $cust_main->agent->agent );
+  $self->infostreet_queue( $svc_acct->svcnum,
+    'setContactField', $accountID, 'title', $cust_main->agent->agent );
 
 }
 
-- 
cgit v1.2.1


From c5a358f8b8b0c7ac8f627f7042d81f4187bed57f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Jun 2002 04:54:04 +0000
Subject: pod build fix thanks to Stephen Bechard <steve@destek.net>

---
 Makefile  | 2 ++
 bin/pod2x | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2937b2018..66c83a0f5 100644
--- a/Makefile
+++ b/Makefile
@@ -76,6 +76,7 @@ htmlman:
 	[ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
 	[ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
 	[ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
+	[ -e ./httemplate/docs/man/FS/part_export ] || mkdir httemplate/docs/man/FS/part_export
 	[ -e DONT_REBUILD_DOCS ] || bin/pod2x
 
 forcehtmlman:
@@ -83,6 +84,7 @@ forcehtmlman:
 	[ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
 	[ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
 	[ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
+	[ -e ./httemplate/docs/man/FS/part_export ] || mkdir httemplate/docs/man/FS/part_export
 	bin/pod2x
 
 install-docs: docs
diff --git a/bin/pod2x b/bin/pod2x
index 385c5db0a..46ccc7743 100755
--- a/bin/pod2x
+++ b/bin/pod2x
@@ -33,7 +33,7 @@ foreach my $file (
   glob("./fs_signup/FS-SignupClient/*.pm"),
   glob("./fs_selfadmin/FS-MailAdminServer/*.pm"),
 ) {
-  next if $file =~ /^blib\//;
+  next if $file =~ /(^|\/)blib\//;
   #$file =~ /\/([\w\-]+)\.pm$/ or die "oops file $file";
   my $name;
   if ( $file =~ /fs_\w+\/FS\-\w+\/(.*)\.pm$/ ) {
-- 
cgit v1.2.1


From cf6020a0c273d549d33f3e9999bd8b68d9b6d133 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Jun 2002 01:29:21 +0000
Subject: shellcommands w/passwords

---
 FS/FS/part_export.pm                    | 16 ++++++++++++++--
 FS/FS/part_export/shellcommands.pm      | 21 ++++++++++++++++-----
 FS/bin/freeside-queued                  |  2 +-
 httemplate/edit/part_export.cgi         |  2 ++
 httemplate/edit/process/part_export.cgi |  6 +++++-
 5 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 9af00174d..20e3ab474 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -526,21 +526,33 @@ tie my %shellcommands_options, 'Tie::IxHash',
   #'machine' => { label=>'Remote machine' },
   'user' => { label=>'Remote username', default=>'root' },
   'useradd' => { label=>'Insert command',
-                 default=>'useradd -d $dir -m -s $shell -u $uid $username'
+                 default=>'useradd -d $dir -m -s $shell -u $uid $username; passwd $username'
                 #default=>'cp -pr /etc/skel $dir; chown -R $uid.$gid $dir'
                },
+  'useradd_stdin' => { label=>'Insert command STDIN',
+                       type =>'textarea',
+                       default=>'$_password\n$_password\n',
+                     },
   'userdel' => { label=>'Delete command',
                  default=>'userdel $username',
                  #default=>'rm -rf $dir',
                },
+  'userdel_stdin' => { label=>'Delete command STDIN',
+                       type =>'textarea',
+                       default=>'',
+                     },
   'usermod' => { label=>'Modify command',
-                 default=>'usermod -d $new_dir -l $new_username -s $new_shell -u $new_uid $old_username',
+                 default=>'usermod -d $new_dir -l $new_username -s $new_shell -u $new_uid $old_username; passwd $new_username',
                 #default=>'[ -d $old_dir ] && mv $old_dir $new_dir || ( '.
                  #  'chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; '.
                  #  'find . -depth -print | cpio -pdm $new_dir; '.
                  #  'chmod u-t $new_dir; chown -R $uid.$gid $new_dir; '.
                  #  'rm -rf $old_dir'.
                  #')'
+  'usermod_stdin' => { label=>'Modify command STDIN',
+                       type =>'textarea',
+                       default=>'$_password\n$_password\n',
+                     },
                },
 ;
 
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 7a87bd3e0..870d7f1ee 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -20,23 +20,29 @@ sub _export_delete {
 sub _export_command {
   my ( $self, $action, $svc_acct) = (shift, shift, shift);
   my $command = $self->option($action);
+  my $stdin = $self->option($action."_stdin");
   no strict 'refs';
   ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
   $self->shellcommands_queue( $svc_acct->svcnum,
-    $self->options('user')||'root'. "\@". $self->options('machine'),
-    eval(qq("$command"))
+    user         => $self->options('user')||'root',
+    host         => $self->options('machine'),
+    command      => eval(qq("$command")),
+    stdin_string => eval(qq("$stdin")),
   );
 }
 
 sub _export_replace {
   my($self, $new, $old ) = (shift, shift, shift);
   my $command = $self->option('usermod');
+  my $stdin = $self->option('usermod_stdin');
   no strict 'refs';
   ${"old_$_"} = $old->getfield($_) foreach $old->fields;
   ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   $self->shellcommands_queue( $new->svcnum,
-    $self->options('user')||'root'. "\@". $self->options('machine'),
-    eval(qq("$command"))
+    user         => $self->options('user')||'root',
+    host         => $self->options('machine'),
+    command      => eval(qq("$command")),
+    stdin_string => eval(qq("$stdin")),
   );
 }
 
@@ -45,11 +51,16 @@ sub shellcommands_queue {
   my( $self, $svcnum ) = (shift, shift);
   my $queue = new FS::queue {
     'svcnum' => $svcnum,
-    'job'    => "Net::SSH::ssh_cmd", #freeside-queued pre-uses...
+    'job'    => "FS::part_export::shellcommands::ssh_cmd",
   };
   $queue->insert( @_ );
 }
 
+sub ssh_cmd { #subroutine, not method
+  use Net::SSH '0.06';
+  &Net::SSH::ssh_cmd( { @_ } );
+}
+
 #sub shellcommands_insert { #subroutine, not method
 #}
 #sub shellcommands_replace { #subroutine, not method
diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 846055dc3..48d283a75 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -15,7 +15,7 @@ use FS::queue_depend;
 # no autoloading just yet
 use FS::cust_main;
 use FS::svc_acct;
-use Net::SSH 0.05;
+use Net::SSH 0.06;
 use FS::part_export;
 
 $max_kids = '10'; #guess it should be a config file...
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index fbc698e8b..486bd4300 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -63,6 +63,8 @@ my $widget = new HTML::Widgets::SelectLayers(
           #}
         }
         $html .= '</SELECT>';
+      } elsif ( $type eq 'textarea' ) {
+        $html .= qq!<TEXTAREA NAME="$option">$value</TEXTAREA>!;
       } elsif ( $type eq 'text' ) {
         $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
       } else {
diff --git a/httemplate/edit/process/part_export.cgi b/httemplate/edit/process/part_export.cgi
index 6b4d007e4..fa009edbb 100644
--- a/httemplate/edit/process/part_export.cgi
+++ b/httemplate/edit/process/part_export.cgi
@@ -6,7 +6,11 @@ my $old = qsearchs('part_export', { 'exportnum'=>$exportnum } ) if $exportnum;
 
 #fixup options
 #warn join('-', split(',',$cgi->param('options')));
-my %options = map { $_=>$cgi->param($_) } split(',',$cgi->param('options'));
+my %options = map {
+  my $value = $cgi->param($_);
+  $value =~ s/\r\n/\n/g; #browsers? (textarea)
+  $_ => $value;
+} split(',', $cgi->param('options'));
 
 my $new = new FS::part_export ( {
   map {
-- 
cgit v1.2.1


From 5bfc7cd4f5aac2905119ba076a23df1f13b58f7b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Jun 2002 22:31:46 +0000
Subject: doc

---
 httemplate/docs/install.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 56cee80e5..1f271e6d2 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -10,7 +10,7 @@ Before installing, you need:
   <li><a href="http://perl.apache.org/">mod_perl</a> (if compiling your own mod_perl, make sure you set the <a href="http://perl.apache.org/guide/install.html#EVERYTHING">EVERYTHING</a>=1 compile-time option)
   <li><a href="http://www.openssh.com/">SSH</a> (<a href="http://www.openssh.com//">OpenSSH</a> is recommended.  SSH Communications Security <a href="http://www.ssh.com/products/ssh/download.cfm">commercial SSH version 3</a> has been reported incompatible with Freeside.)
   <li><a href="http://rsync.samba.org/">rsync</a>
-  <li>A <b>transactional</b> database engine supported by Perl's <a href="http://www.hermetica.com/technologia/DBI/">DBI</a>.
+  <li>A <b>transactional</b> database engine <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">supported</a> by Perl's <a href="http://dbi.perl.org">DBI</a>.
     <ul>
       <li><a href="http://www.postgresql.org/">PostgreSQL</a> (v7 or higher) is recommended.
        <li>MySQL has been reported to work.
@@ -77,7 +77,7 @@ mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* T
 <!--  <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>-->
   <li>Edit the top-level Makefile:
     <ul>
-      <li>Set <tt>DATASOURCE</tt> to your <a href="http://search.cpan.org/doc/TIMB/DBI-1.20/DBI.pm">DBI data source</a>, for example, <tt>DBI:Pg:host=localhost;dbname=freeside</tt> for PostgresSQL or <tt>DBI:mysql:freeside</tt> for MySQL.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.20/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD">manpage for your DBD</a> for the exact syntax of a DBI data source.
+      <li>Set <tt>DATASOURCE</tt> to your <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI data source</a>, for example, <tt>DBI:Pg:host=localhost;dbname=freeside</tt> for PostgresSQL or <tt>DBI:mysql:freeside</tt> for MySQL.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">manpage for your DBD</a> for the exact syntax of your DBI data source.
       <li>Set <tt>DB_PASSWORD</tt> to the freeside database user's password.
     </ul>
   <li>Add the freeside database to your database engine:
-- 
cgit v1.2.1


From 29bb6991a3b7187784cd14a3806b0c9db38dd51b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Jun 2002 22:35:17 +0000
Subject: fix infostreet contact field foo

---
 FS/FS/part_export/infostreet.pm | 90 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 75 insertions(+), 15 deletions(-)

diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
index e6d68c1e2..8a68a2077 100644
--- a/FS/FS/part_export/infostreet.pm
+++ b/FS/FS/part_export/infostreet.pm
@@ -1,6 +1,7 @@
 package FS::part_export::infostreet;
 
 use vars qw(@ISA %infostreet2cust_main);
+use FS::UID qw(dbh);
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
@@ -15,7 +16,7 @@ use FS::part_export;
   'zipCode'     => 'zip',
   'country'     => 'country',
   'phoneNumber' => 'daytime',
-  'faxNumber'   => 'night',
+  'faxNumber'   => 'night', #noment-request...
 );
 
 sub rebless { shift; }
@@ -23,25 +24,41 @@ sub rebless { shift; }
 sub _export_insert {
   my( $self, $svc_acct ) = (shift, shift);
   my $cust_main = $svc_acct->cust_svc->cust_pkg->cust_main;
-  my $accountID = $self->infostreet_queue( $svc_acct->svcnum,
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $err_or_queue = $self->infostreet_err_or_queue( $svc_acct->svcnum,
     'createUser', $svc_acct->username, $svc_acct->_password );
-  foreach my $infostreet_field ( keys %infostreet2cust_main ) {
-    my $error = $self->infostreet_queue( $svc_acct->svcnum,
-      'setContactField', $accountID, $infostreet_field,
-        $cust_main->getfield( $infostreet2cust_main{$infostreet_field} ) );
-    return $error if $error;
-  }
+  return $err_or_queue unless ref($err_or_queue);
+  my $jobnum = $err_or_queue->jobnum;
+
+  my %contact_info = ( map {
+    $_ => $cust_main->getfield( $infostreet2cust_main{$_} );
+  } keys %infostreet2cust_main );
 
   my @emails = grep { $_ ne 'POST' } $cust_main->invoicing_list;
-  if ( @emails ) {
-    my $error = $self->infostreet_queue( $svc_acct->svcnum,
-      'setContactField', $accountID, 'email', $emails[0] );
-    return $error if $error;
-  }
+  $contact_info{'email'} = $emails[0] if @emails;
 
   #this one is kinda noment-specific
-  $self->infostreet_queue( $svc_acct->svcnum,
-    'setContactField', $accountID, 'title', $cust_main->agent->agent );
+  $contact_info{'title'} = $cust_main->agent->agent;
+
+  $err_or_queue = $self->infostreet_queueContact( $svc_acct->svcnum,
+    $svc_acct->username, %contact_info );
+  return $err_or_queue unless ref($err_or_queue);
+  my $error = $err_or_queue->depend_insert( $jobnum );
+  return $error if $error;
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
 
 }
 
@@ -88,6 +105,49 @@ sub infostreet_queue {
   );
 }
 
+#ick false laziness
+sub infostreet_err_or_queue {
+  my( $self, $svcnum, $method ) = (shift, shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => 'FS::part_export::infostreet::infostreet_command',
+  };
+  $queue->insert(
+    $self->option('url'),
+    $self->option('login'),
+    $self->option('password'),
+    $self->option('groupID'),
+    $method,
+    @_,
+  ) or $queue;
+}
+
+sub infostreet_queueContact {
+  my( $self, $svcnum ) = (shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => 'FS::part_export::infostreet::infostreet_setContact',
+  };
+  $queue->insert(
+    $self->option('url'),
+    $self->option('login'),
+    $self->option('password'),
+    $self->option('groupID'),
+    @_,
+  ) or $queue;
+}
+
+sub infostreet_setContact {
+  my($url, $is_username, $is_password, $groupID, $username, %contact_info) = @_;
+  my $accountID = infostreet_command($url, $is_username, $is_password, $groupID,
+    'getAccountID', $username);
+  foreach my $field ( %contact_info ) {
+    infostreet_command($url, $is_username, $is_password, $groupID,
+      'setContactField', $field, $contact_info{$field} );
+  }
+
+}
+
 sub infostreet_command { #subroutine, not method
   my($url, $username, $password, $groupID, $method, @args) = @_;
 
-- 
cgit v1.2.1


From fb98e91566e72bc3adb823b706529002af487c09 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Jun 2002 08:29:42 +0000
Subject: uid search on main menu, updated upgrade docs

---
 httemplate/docs/upgrade8.html | 46 ++++++++++++++++++-------------------------
 httemplate/index.html         |  2 +-
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index b0d1e3fe2..11b80e390 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -7,7 +7,7 @@
   <li>If migrating from less than 1.3.1, see these <a href="upgrade7.html">instructions</a> first.
   <li><font size="+2" color="#ff0000">Backup your database and current Freeside installation.</font> (with&nbsp;<a href="http://www.ca.postgresql.org/devel-corner/docs/postgres/backup.html">PostgreSQL</a>) (with&nbsp;<a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Backup">MySQL</a>)
   <li><a href="http://perl.apache.org/">mod_perl</a> is now required.
-  <li>Install <a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>, <a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a> and <a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a>.
+  <li>Install <a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>, <a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a> and <a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a> (minimum version 0.02).
   <li>Install <a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a>.
   <li>Install <a href="http://rsync.samba.org/">rsync</a>
 </ul>
@@ -216,6 +216,7 @@ CREATE UNIQUE INDEX cust_tax_exempt1 ON cust_tax_exempt ( taxnum, year, month );
 ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
 ALTER TABLE svc_domain ADD catchall integer NULL;
 ALTER TABLE cust_main ADD referral_custnum integer NULL;
+ALTER TABLE cust_main ADD comments text NULL;
 ALTER TABLE cust_pay ADD custnum integer;
 ALTER TABLE cust_pay_batch ADD paybatchnum integer;
 ALTER TABLE cust_refund ADD custnum integer;
@@ -276,7 +277,6 @@ CREATE UNIQUE INDEX svc_acct_pop_pkey ON svc_acct_pop ( popnum );
 CREATE UNIQUE INDEX svc_acct_sm_pkey ON svc_acct_sm ( svcnum );
 CREATE UNIQUE INDEX svc_domain_pkey ON svc_domain ( svcnum );
 CREATE UNIQUE INDEX svc_www_pkey ON svc_www ( svcnum );
-CREATE UNIQUE INDEX type_pkgs_pkey ON type_pkgs ( typenum );
 </pre>
   <li>If you wish to enable service/shipping addresses, apply the following
       changes to your database:
@@ -294,23 +294,18 @@ ALTER TABLE cust_main ADD COLUMN ship_country char(2) NULL;
 ALTER TABLE cust_main ADD COLUMN ship_daytime varchar(20) NULL;
 ALTER TABLE cust_main ADD COLUMN ship_night varchar(20) NULL;
 ALTER TABLE cust_main ADD COLUMN ship_fax varchar(12) NULL;
-CREATE INDEX cust_main1 ON cust_main ( ship_last );
-CREATE INDEX cust_main2 ON cust_main ( ship_company );
-</pre>
-  <li>If you wish to enable customer comments, apply the following change to
-      your database:
-<pre>
-ALTER TABLE cust_main ADD COLUMN comments text NULL;
+CREATE INDEX cust_main4 ON cust_main ( ship_last );
+CREATE INDEX cust_main5 ON cust_main ( ship_company );
 </pre>
   <li>If you are using the signup server, reinstall it according to the <a href="signup.html">instructions</a>.  The 1.3.x signup server is not compatible with 1.4.x.
-  <li>Run bin/dbdef-create.
+  <li>Run <tt>bin/dbdef-create <i>username</i></tt>
   <li>If you have svc_acct_sm records or service definitions:
     <ul>
       <li>Create a service definition with table svc_forward
-      <li>Run bin/fs-migrate-svc_acct_sm
+      <li>Run <tt>bin/fs-migrate-svc_acct_sm <i>username</i></tt>
     </ul>
-  <li>Run bin/fs-migrate-payref
-  <li>Run bin/fs-migrate-part_svc
+  <li>Run <tt>bin/fs-migrate-payref<i>username</i></tt>
+  <li>Run <tt>bin/fs-migrate-part_svc<i>username</i></tt>
   <li><b>After running bin/fs-migrate-payref</b>, apply the following changes to your database:
   <table border><tr><th>PostgreSQL</th><th>MySQL, others</th></tr>
 <tr><td>
@@ -322,9 +317,10 @@ CREATE TABLE cust_pay_temp (
   _date int null,
   payby char(4) not null,
   payinfo varchar(16) null,
-  paybatch varchar(80) null
+  paybatch varchar(80) null,
+  closed char(1) null
 );
-INSERT INTO cust_pay_temp SELECT * from cust_pay;
+INSERT INTO cust_pay_temp SELECT paynum, custnum, paid, _date, payby, payinfo, paybatch, closed FROM cust_pay;
 DROP TABLE cust_pay;
 ALTER TABLE cust_pay_temp RENAME TO cust_pay;
 CREATE UNIQUE INDEX cust_pay1 ON cust_pay (paynum);
@@ -337,9 +333,10 @@ CREATE TABLE cust_refund_temp (
   reason varchar(80) not null,
   payby char(4) not null,
   payinfo varchar(16) null,
-  paybatch varchar(80) null
+  paybatch varchar(80) null,
+  closed char(1) null
 );
-INSERT INTO cust_refund_temp SELECT * from cust_refund;
+INSERT INTO cust_refund_temp SELECT refundnum, custnum, _date, refund, otaker, reason, payby, payinfo, '', closed from cust_refund;
 DROP TABLE cust_refund;
 ALTER TABLE cust_refund_temp RENAME TO cust_refund;
 CREATE UNIQUE INDEX cust_refund1 ON cust_refund (refundnum);
@@ -350,16 +347,11 @@ ALTER TABLE cust_pay DROP COLUMN invnum;
 ALTER TABLE cust_refund DROP COLUMN crednum;
 </pre></font>
 </td></tr></table>
-  <li><b>IMPORTANT: After applying the second set of database changes</b>, run bin/dbdef-create again.
-  <li><b>IMPORTANT</b>: run bin/create-history-tables
-  <li><b>IMPORTANT: After running bin/create-history-tables</b>, run bin/dbdef-create again.
-  <li>As the freeside UNIX user, run <tt>bin/populate-msgcat <b>username</b></tt
-> to populate the message catalog, passing the username of a Freeside user you c
-reated above:
-<pre>
-$ su freeside
-$ bin/populate-msgcat <b>username</b>
-</pre>
+  <li><b>IMPORTANT: After applying the second set of database changes</b>, run <tt>bin/dbdef-create <i>username</i></tt> again.
+  <li><b>IMPORTANT</b>: run <tt>bin/create-history-tables <i>username</i></tt>
+  <li><b>IMPORTANT: After running bin/create-history-tables</b>, run <tt>bin/dbdef-create <i>username</i></tt> again.
+  <li>As the freeside UNIX user, run <tt>bin/populate-msgcat <i>username</i></tt
+> to populate the message catalog
   <li>set the <a href="../config/config.cgi#username_policy">user_policy configuration value</a> as appropriate for your site.
   <li>set the <a href="../config/config.cgi#locale">locale configuration value</a> to en_US.
   <li>the mxmachines, nsmachines, arecords and cnamerecords configuration values have been deprecated.  Set the <a href="../config/config.cgi#defaultrecords">defaultrecords configuration value</a> instead.
diff --git a/httemplate/index.html b/httemplate/index.html
index 8710b1798..29dd3b471 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -32,7 +32,7 @@
         <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><SELECT NAME="company_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A></FORM>
 <!--        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="address2_on" VALUE="1">Unit <INPUT TYPE="text" NAME="address2_text"><INPUT TYPE="submit" VALUE="Search"></FORM>-->
         <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="phone_on" VALUE="1">Phone # <INPUT TYPE="text" NAME="phone_text"><INPUT TYPE="submit" VALUE="Search"></FORM>
-        <BR><FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><SELECT NAME="username_type"><OPTION VALUE="All">(all)</OPTION><OPTION>Fuzzy</OPTION><OPTION>Substring</OPTION><OPTION SELECTED>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A></FORM>
+        <BR><FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><SELECT NAME="username_type"><OPTION VALUE="All">(all)</OPTION><OPTION>Fuzzy</OPTION><OPTION>Substring</OPTION><OPTION SELECTED>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A> or <A HREF="search/svc_acct.cgi?uid">uid</A></FORM>
         <BR><FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
 <!--        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>-->
 <!--        <LI><A HREF="search/svc_forward.html">mail forwards (by ?)</A>-->
-- 
cgit v1.2.1


From 45cf3a8cff466b4731a95e11ff7f4f76aee25d7c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Jun 2002 09:03:47 +0000
Subject: doc

---
 httemplate/docs/upgrade8.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 11b80e390..8ba3b5baf 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -213,7 +213,7 @@ CREATE TABLE cust_tax_exempt (
 );
 CREATE UNIQUE INDEX cust_tax_exempt1 ON cust_tax_exempt ( taxnum, year, month );
 
-ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
+ALTER TABLE svc_acct ADD domsvc integer NULL;
 ALTER TABLE svc_domain ADD catchall integer NULL;
 ALTER TABLE cust_main ADD referral_custnum integer NULL;
 ALTER TABLE cust_main ADD comments text NULL;
@@ -304,6 +304,12 @@ CREATE INDEX cust_main5 ON cust_main ( ship_company );
       <li>Create a service definition with table svc_forward
       <li>Run <tt>bin/fs-migrate-svc_acct_sm <i>username</i></tt>
     </ul>
+  <li>Or if you just have svc_acct records:
+    <ul>
+      <li>Order and provision a package for your default domain and note down the <b>Service #</b> or <i>svcnum</i>.
+      <li><tt>UPDATE svc_acct SET domsvc = </tt><i>svcnum</i>
+      <li>Update your service definitions to have default (or fixed) <b>domsvc</b>.
+    </ul>
   <li>Run <tt>bin/fs-migrate-payref<i>username</i></tt>
   <li>Run <tt>bin/fs-migrate-part_svc<i>username</i></tt>
   <li><b>After running bin/fs-migrate-payref</b>, apply the following changes to your database:
-- 
cgit v1.2.1


From 7f1985f56afc81912dbc86a1a3178cd128af76fe Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Jun 2002 09:11:09 +0000
Subject: tiny bit better passwd.import

---
 bin/passwd.import | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/bin/passwd.import b/bin/passwd.import
index 8b5826bfe..aa4f90f98 100755
--- a/bin/passwd.import
+++ b/bin/passwd.import
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -Tw
-# $Id: passwd.import,v 1.1 2002-04-20 11:57:35 ivan Exp $
+# $Id: passwd.import,v 1.2 2002-06-21 09:11:09 ivan Exp $
 
 use strict;
 use vars qw(%part_svc);
@@ -81,10 +81,15 @@ while (<SHADOW>) {
 
 while (<PASSWD>) {
   chop;
-  my($username,$x,$uid,$gid,$finger,$dir,$shell)=split(/:/);
-  my($password)=$upassword{$username} || $password{$username};
+  my($username,$x,$uid,$gid,$finger,$dir,$shell) = split(/:/);
+  my $password = $password{$username};
 
-  $svcpart = $shell_svcpart;
+  my $svcpart = $shell_svcpart;
+
+  if ( qsearchs('svc_acct', { 'username' => $username } ) ) {
+    warn "warning: $username already exists; skipping\n";
+    next;
+  }
 
   my($svc_acct) = new FS::svc_acct ({
     'svcpart'   => $svcpart,
@@ -95,13 +100,12 @@ while (<PASSWD>) {
     'finger'    => $finger,
     'dir'       => $dir,
     'shell'     => $shell,
-    %{$allparam{$username}},
+    #%{$allparam{$username}},
   });
   my($error);
   $error=$svc_acct->insert;
   die $error if $error;
 
-  delete $upassword{$username};
 }
 
 sub usage {
-- 
cgit v1.2.1


From 4bcab14cb3f0dbbe755bcaba4a979ec8e68db268 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Jun 2002 09:13:16 +0000
Subject: import fixes...

---
 bin/bind.import            | 3 ++-
 bin/fs-migrate-svc_acct_sm | 5 ++---
 bin/passwd.import          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/bind.import b/bin/bind.import
index 5c4149501..688e3222c 100755
--- a/bin/bind.import
+++ b/bin/bind.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: bind.import,v 1.1 2002-05-23 13:00:08 ivan Exp $
+# $Id: bind.import,v 1.2 2002-06-21 09:13:16 ivan Exp $
 
 #need to manually put header in /usr/local/etc/freeside/export.<datasrc./bind/<machine>/named.conf.HEADER
 
@@ -23,6 +23,7 @@ use FS::domain_record;
 my $user = shift or die &usage;
 adminsuidsetup $user;
 
+$FS::svc_Common::noexport_hack = 1;
 $FS::domain_record::noserial_hack = 1;
 
 use vars qw($spooldir);
diff --git a/bin/fs-migrate-svc_acct_sm b/bin/fs-migrate-svc_acct_sm
index ae2dc764d..e34b23596 100755
--- a/bin/fs-migrate-svc_acct_sm
+++ b/bin/fs-migrate-svc_acct_sm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-migrate-svc_acct_sm,v 1.3 2001-08-21 02:43:18 ivan Exp $
+# $Id: fs-migrate-svc_acct_sm,v 1.4 2002-06-21 09:13:16 ivan Exp $
 #
 # jeff@cmh.net 01-Jul-20
 
@@ -52,8 +52,7 @@ my($dbh)=adminsuidsetup $user;
 
 $|=1;
 
-$FS::svc_acct::nossh_hack = 1;
-$FS::svc_forward::nossh_hack = 1;
+$FS::svc_Common::noexport_hack = 1;
 $FS::svc_domain::whois_hack = 1;
 
 %part_domain_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_domain'});
diff --git a/bin/passwd.import b/bin/passwd.import
index aa4f90f98..09af6a3c7 100755
--- a/bin/passwd.import
+++ b/bin/passwd.import
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -Tw
-# $Id: passwd.import,v 1.2 2002-06-21 09:11:09 ivan Exp $
+# $Id: passwd.import,v 1.3 2002-06-21 09:13:16 ivan Exp $
 
 use strict;
 use vars qw(%part_svc);
@@ -19,7 +19,7 @@ push @FS::svc_acct::shells, qw(/bin/sync /sbin/shuddown /bin/halt); #others?
 my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
 
 #$FS::svc_acct::nossh_hack = 1;
-$FS::svc_acct::noexport_hack = 1;
+$FS::svc_Common::noexport_hack = 1;
 
 ###
 
-- 
cgit v1.2.1


From 4b5b2b8c46413b294d96e52469016eddb016a750 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Jun 2002 09:15:59 +0000
Subject: oops

---
 bin/passwd.import | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/passwd.import b/bin/passwd.import
index 09af6a3c7..d8fc01344 100755
--- a/bin/passwd.import
+++ b/bin/passwd.import
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -Tw
-# $Id: passwd.import,v 1.3 2002-06-21 09:13:16 ivan Exp $
+# $Id: passwd.import,v 1.4 2002-06-21 09:15:59 ivan Exp $
 
 use strict;
 use vars qw(%part_svc);
@@ -7,7 +7,7 @@ use Date::Parse;
 use Term::Query qw(query);
 use Net::SCP qw(iscp);
 use FS::UID qw(adminsuidsetup datasrc);
-use FS::Record qw(qsearch);
+use FS::Record qw(qsearch qsearchs);
 use FS::svc_acct;
 use FS::part_svc;
 
-- 
cgit v1.2.1


From 90a4aec660be666dda630895d4e96e87a7a04028 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Jun 2002 09:28:27 +0000
Subject: don't forget part_svc in upgrades

---
 httemplate/docs/upgrade8.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 8ba3b5baf..75155407c 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -69,6 +69,12 @@ CREATE TABLE svc_forward (
   dst varchar(80),
   PRIMARY KEY (svcnum)
 );
+ALTER TABLE part_svc ADD svc_forward__srcsvc varchar(80) NULL;
+ALTER TABLE part_svc ADD svc_forward__srcsvc_flag char(1) NULL;
+ALTER TABLE part_svc ADD svc_forward__dstsvc varchar(80) NULL;
+ALTER TABLE part_svc ADD svc_forward__dstsvc_flag char(1) NULL;
+ALTER TABLE part_svc ADD svc_forward__dst varchar(80) NULL;
+ALTER TABLE part_svc ADD svc_forward__dst_flag char(1) NULL;
 
 CREATE TABLE cust_credit_bill (
   creditbillnum int primary key,
@@ -214,6 +220,8 @@ CREATE TABLE cust_tax_exempt (
 CREATE UNIQUE INDEX cust_tax_exempt1 ON cust_tax_exempt ( taxnum, year, month );
 
 ALTER TABLE svc_acct ADD domsvc integer NULL;
+ALTER TABLE part_svc ADD svc_acct__domsvc varchar(80) NULL;
+ALTER TABLE part_svc ADD svc_acct__domsvc_flag char(1) NULL;
 ALTER TABLE svc_domain ADD catchall integer NULL;
 ALTER TABLE cust_main ADD referral_custnum integer NULL;
 ALTER TABLE cust_main ADD comments text NULL;
@@ -234,6 +242,8 @@ ALTER TABLE cust_refund ADD closed char(1) NULL;
 ALTER TABLE cust_bill_event ADD status varchar(80);
 ALTER TABLE cust_bill_event ADD statustext text NULL;
 ALTER TABLE svc_acct ADD sec_phrase varchar(80) NULL;
+ALTER TABLE part_svc ADD svc_acct__sec_phrase varchar(80) NULL;
+ALTER TABLE part_svc ADD svc_acct__sec_phrase_flag char(1) NULL;
 ALTER TABLE part_pkg ADD taxclass varchar(80) NULL;
 ALTER TABLE cust_main_county ADD taxclass varchar(80) NULL;
 ALTER TABLE cust_main_county ADD exempt_amount decimal(10,2);
-- 
cgit v1.2.1


From 78f11947cf539b3e258e7a7804c13dcd2a2f1160 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Jun 2002 09:56:08 +0000
Subject: better error messages on uid duplicates... uid stuff still needs to
 be rewritten for new exports

---
 FS/FS/svc_acct.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 1d68fc99e..e2ac18639 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -289,7 +289,7 @@ sub insert {
 
   my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
   return "Unknown svcpart" unless $part_svc;
-  return "uid in use"
+  return "uid ". $self->uid. " in use"
     if $part_svc->part_svc_column('uid')->columnflag ne 'F'
       && qsearchs( 'svc_acct', { 'uid' => $self->uid } )
       && $self->username !~ /^(hyla)?fax$/
-- 
cgit v1.2.1


From 1e14a5e07df71cf985921cefac53b8873e813bcb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Jun 2002 09:57:05 +0000
Subject: no, don't check for duplicates like this by default... not new-export
 style

---
 bin/passwd.import | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/passwd.import b/bin/passwd.import
index d8fc01344..fbf27370f 100755
--- a/bin/passwd.import
+++ b/bin/passwd.import
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -Tw
-# $Id: passwd.import,v 1.4 2002-06-21 09:15:59 ivan Exp $
+# $Id: passwd.import,v 1.5 2002-06-21 09:57:05 ivan Exp $
 
 use strict;
 use vars qw(%part_svc);
@@ -86,10 +86,10 @@ while (<PASSWD>) {
 
   my $svcpart = $shell_svcpart;
 
-  if ( qsearchs('svc_acct', { 'username' => $username } ) ) {
-    warn "warning: $username already exists; skipping\n";
-    next;
-  }
+  #if ( qsearchs('svc_acct', { 'username' => $username } ) ) {
+  #  warn "warning: $username already exists; skipping\n";
+  #  next;
+  #}
 
   my($svc_acct) = new FS::svc_acct ({
     'svcpart'   => $svcpart,
-- 
cgit v1.2.1


From 185eb6429f5ae208dfaf206395db4d3a16fe8ae3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Jun 2002 20:17:43 +0000
Subject: debugging option

---
 FS/FS/part_export/infostreet.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
index 8a68a2077..a2fc049f4 100644
--- a/FS/FS/part_export/infostreet.pm
+++ b/FS/FS/part_export/infostreet.pm
@@ -1,11 +1,13 @@
 package FS::part_export::infostreet;
 
-use vars qw(@ISA %infostreet2cust_main);
+use vars qw(@ISA %infostreet2cust_main $DEBUG);
 use FS::UID qw(dbh);
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+$DEBUG = 0;
+
 %infostreet2cust_main = (
   'firstName'   => 'first',
   'lastName'    => 'last',
@@ -151,6 +153,8 @@ sub infostreet_setContact {
 sub infostreet_command { #subroutine, not method
   my($url, $username, $password, $groupID, $method, @args) = @_;
 
+  warn "[FS::part_export::infostreet] $method ".join(' ', @args)."\n" if $DEBUG;
+
   #quelle hack
   if ( $method =~ /,/ ) {
     foreach my $part ( split(/,\s*/, $method) ) {
-- 
cgit v1.2.1


From 5939c0f1ae7bea08adde82f6d3578e6c5ac31248 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Jun 2002 20:26:14 +0000
Subject: fix infostreet contact field setting

---
 FS/FS/part_export/infostreet.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
index a2fc049f4..89ab06d22 100644
--- a/FS/FS/part_export/infostreet.pm
+++ b/FS/FS/part_export/infostreet.pm
@@ -143,9 +143,9 @@ sub infostreet_setContact {
   my($url, $is_username, $is_password, $groupID, $username, %contact_info) = @_;
   my $accountID = infostreet_command($url, $is_username, $is_password, $groupID,
     'getAccountID', $username);
-  foreach my $field ( %contact_info ) {
+  foreach my $field ( keys %contact_info ) {
     infostreet_command($url, $is_username, $is_password, $groupID,
-      'setContactField', $field, $contact_info{$field} );
+      'setContactField', $accountID, $field, $contact_info{$field} );
   }
 
 }
-- 
cgit v1.2.1


From 835228e1989d99fabc2689363aa174d41440188d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Jun 2002 21:49:25 +0000
Subject: s/title/organization/ at noment's request

---
 FS/FS/part_export/infostreet.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
index 89ab06d22..2464e5dee 100644
--- a/FS/FS/part_export/infostreet.pm
+++ b/FS/FS/part_export/infostreet.pm
@@ -50,7 +50,7 @@ sub _export_insert {
   $contact_info{'email'} = $emails[0] if @emails;
 
   #this one is kinda noment-specific
-  $contact_info{'title'} = $cust_main->agent->agent;
+  $contact_info{'organization'} = $cust_main->agent->agent;
 
   $err_or_queue = $self->infostreet_queueContact( $svc_acct->svcnum,
     $svc_acct->username, %contact_info );
-- 
cgit v1.2.1


From 551e695713ce31e4608a0a608a3941eaa7cdd64b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 23 Jun 2002 01:33:28 +0000
Subject: forgot %> when converting from CGI, works now, patch from "Stephen
 Bechard" <steve@destek.net>

---
 httemplate/edit/svc_www.cgi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index e1a914f1a..d2c9ade5c 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -175,5 +175,4 @@ print <<END;
   </BODY>
 </HTML>
 END
-
-
+%>
-- 
cgit v1.2.1


From 5086b5ee6ace8f535a1adb9a97cce4da87450cb1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 23 Jun 2002 01:36:19 +0000
Subject: forgot . between zone and domain, patch from "Stephen Bechard"
 <steve@destek.net>, thanks

---
 FS/FS/svc_www.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/svc_www.pm b/FS/FS/svc_www.pm
index f09a3f89d..6415a3012 100644
--- a/FS/FS/svc_www.pm
+++ b/FS/FS/svc_www.pm
@@ -154,7 +154,7 @@ sub insert {
     my $dom_svcnum = $domain_record->svcnum;
     my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $dom_svcnum } );
       # or die ?
-    $zone .= $svc_domain->domain;
+    $zone .= '.'. $svc_domain->domain;
   }
 
   my $svc_acct = qsearchs('svc_acct', { 'svcnum' => $self->usersvc } );
-- 
cgit v1.2.1


From 6e863af6c6c3ebda89f1da6ca9c3c52fb9b1a54a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 23 Jun 2002 05:43:08 +0000
Subject: add link to edit and format nicely

---
 httemplate/view/svc_www.cgi | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index 70a7a1be4..86f693201 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -39,8 +39,13 @@ print header('Website View', menubar(
   ),
   "Main menu" => $p,
 )).
-      "Service #$svcnum".
-      qq!<BR>Website name: <B><A HREF="http://$www">$www</A></B>!.
+      qq!<A HREF="${p}edit/svc_www.cgi?$svcnum">Edit this information</A><BR>!.
+      ntable("#cccccc"). '<TR><TD>'. ntable("#cccccc",2).
+      qq!<TR><TD ALIGN="right">Service number</TD>!.
+        qq!<TD BGCOLOR="#ffffff">$svcnum</TD></TR>!.
+      qq!<TR><TD ALIGN="right">Website name</TD>!.
+        qq!<TD BGCOLOR="#ffffff"><A HREF="http://$www">$www<A></TD></TR>!.
+      '</TABLE></TD></TR></TABLE>'.
       '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
       '</BODY></HTML>'
 ;
-- 
cgit v1.2.1


From 7283d56b43fad5d8c9d4b2f224f0e49201f9e901 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 23 Jun 2002 05:44:54 +0000
Subject: patch to get this working from Stephen Bechard <steve@destek.net>

---
 httemplate/edit/process/svc_www.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/process/svc_www.cgi b/httemplate/edit/process/svc_www.cgi
index 38d5e1c79..40913145a 100644
--- a/httemplate/edit/process/svc_www.cgi
+++ b/httemplate/edit/process/svc_www.cgi
@@ -5,8 +5,8 @@ my $svcnum = $1;
 
 my $old;
 if ( $svcnum ) {
-  $old = qsearchs('svc_acct', { 'svcnum' => $svcnum } )
-    or die "fatal: can't find account (svcnum $svcnum)!";
+  $old = qsearchs('svc_www', { 'svcnum' => $svcnum } )
+    or die "fatal: can't find website (svcnum $svcnum)!";
 } else {
   $old = '';
 }
-- 
cgit v1.2.1


From b32a862877102bd755bec2c83713b6f3ffb35dfa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 23 Jun 2002 19:16:45 +0000
Subject: domain_record records attached to svc_www records are no longer
 delete-able, patch from "Stephen Bechard" <steve@destek.net>, thanks! 
 closes: Bug#434

---
 FS/FS/domain_record.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 03f9e10bb..37cc6c9e8 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -5,6 +5,7 @@ use vars qw( @ISA $noserial_hack );
 #use FS::Record qw( qsearch qsearchs );
 use FS::Record qw( qsearchs dbh );
 use FS::svc_domain;
+use FS::svc_www;
 
 @ISA = qw(FS::Record);
 
@@ -124,6 +125,9 @@ Delete this record from the database.
 sub delete {
   my $self = shift;
 
+  return "Can't delete a domain record which has a website!"
+    if qsearchs( 'svc_www', { 'recnum' => $self->recnum } );
+
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE';
@@ -309,7 +313,7 @@ sub svc_domain {
 
 =head1 VERSION
 
-$Id: domain_record.pm,v 1.10 2002-06-10 23:02:41 ivan Exp $
+$Id: domain_record.pm,v 1.11 2002-06-23 19:16:45 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From fe610572852e2eb7c3458e77dc167c25a098c84a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 25 Jun 2002 07:18:40 +0000
Subject: might work again under mysql

---
 FS/bin/freeside-queued | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 48d283a75..42d00cebe 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -8,7 +8,7 @@ use POSIX qw(setsid);
 use Date::Format;
 use IO::File;
 use FS::UID qw(adminsuidsetup forksuidsetup driver_name dbh);
-use FS::Record qw(qsearchs);
+use FS::Record qw(qsearch qsearchs);
 use FS::queue;
 use FS::queue_depend;
 
-- 
cgit v1.2.1


From 765837b89aa3baa8466213111ec9484042fb9acb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 25 Jun 2002 23:27:23 +0000
Subject: add link to controlling account

---
 httemplate/view/svc_www.cgi | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index 86f693201..9fa9661b1 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -20,8 +20,13 @@ if ($pkgnum) {
 }
 #eofalse
 
+my $usersvc = $svc_www->usersvc;
+my $svc_acct = qsearchs('svc_acct', { 'svcnum' => $usersvc } )
+  or die "svc_www: Unknown usersvc $usersvc";
+my $email = $svc_acct->email;
+
 my $domain_record = qsearchs('domain_record', { 'recnum' => $svc_www->recnum } )
-  or die "svc_www: Unknown recnum". $svc_www->recnum;
+  or die "svc_www: Unknown recnum ". $svc_www->recnum;
 
 my $www = $domain_record->reczone;
 unless ( $www =~ /\.$/ ) {
@@ -45,6 +50,8 @@ print header('Website View', menubar(
         qq!<TD BGCOLOR="#ffffff">$svcnum</TD></TR>!.
       qq!<TR><TD ALIGN="right">Website name</TD>!.
         qq!<TD BGCOLOR="#ffffff"><A HREF="http://$www">$www<A></TD></TR>!.
+      qq!<TR><TD ALIGN="right">Account</TD>!.
+        qq!<TD BGCOLOR="#ffffff"><A HREF="${p}view/svc_acct.cgi?$usersvc">$email</A></TD></TR>!.
       '</TABLE></TD></TR></TABLE>'.
       '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
       '</BODY></HTML>'
-- 
cgit v1.2.1


From d17a7cdeed4fbd901084369347b56d3d4f02c11b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Jun 2002 00:41:03 +0000
Subject: ui

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index e03017db4..19545bd12 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -69,7 +69,7 @@ print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
 print ntable("#cccccc",2), <<END;
 <TR><TD ALIGN="right">Package (customer-visable)</TD><TD><INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}"></TD></TR>
 <TR><TD ALIGN="right">Comment (customer-hidden)</TD><TD><INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}"></TD></TR>
-<TR><TD ALIGN="right">Frequency (months) of recurring fee</TD><TD><INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}" SIZE=3></TD></TR>
+<TR><TD ALIGN="right">Frequency (months) of recurring fee</TD><TD><INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}" SIZE=3>&nbsp;&nbsp;<I>0=no recurring fee, 1=monthly, 3=quarterly, 12=yearly</TD></TR>
 <TR><TD ALIGN="right">Setup fee tax exempt</TD><TD>
 END
 
-- 
cgit v1.2.1


From ecb895ccbbf52ed2babc0885c9925022175e33a0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Jun 2002 01:35:08 +0000
Subject: working one-time charges

---
 FS/FS/cust_main.pm                         | 33 ++++++++++++++++++++++++++++--
 httemplate/edit/process/quick-charge.cgi   | 27 ++++++++++++++++++++++++
 httemplate/edit/process/quick-cust_pkg.cgi |  4 ++--
 httemplate/view/cust_main.cgi              |  7 +++++++
 4 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 httemplate/edit/process/quick-charge.cgi

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b39a77fd7..b68bf9e8f 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1743,16 +1743,45 @@ the error, otherwise returns false.
 sub charge {
   my ( $self, $amount, $pkg, $comment ) = @_;
 
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
   my $part_pkg = new FS::part_pkg ( {
     'pkg'      => $pkg || 'One-time charge',
-    'comment'  => $comment || '$'. sprintf("%.2f".$amount),
+    'comment'  => $comment || '$'. sprintf("%.2f",$amount),
     'setup'    => $amount,
     'freq'     => 0,
     'recur'    => '0',
     'disabled' => 'Y',
   } );
 
-  $part_pkg->insert;
+  my $error = $part_pkg->insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  my $cust_pkg = new FS::cust_pkg ( {
+    'custnum' => $self->custnum,
+    'pkgpart' => $part_pkg->pkgpart,
+  } );
+
+  $error = $cust_pkg->insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
 
 }
 
diff --git a/httemplate/edit/process/quick-charge.cgi b/httemplate/edit/process/quick-charge.cgi
new file mode 100644
index 000000000..49175d848
--- /dev/null
+++ b/httemplate/edit/process/quick-charge.cgi
@@ -0,0 +1,27 @@
+<%
+
+#untaint custnum
+$cgi->param('custnum') =~ /^(\d+)$/
+  or die 'illegal custnum '. $cgi->param('custnum');
+my $custnum = $1;
+
+$cgi->param('amount') =~ /^\s*(\d+(\.\d{1,2})?)\s*$/
+  or die 'illegal amount '. $cgi->param('amount');
+my $amount = $1;
+
+my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+  or die "unknown custnum $custnum";
+
+my $error = $cust_main->charge( $amount, $cgi->param('pkg') );
+
+if ($error) {
+%>
+<!-- mason kludge -->
+<%
+  eidiot($error);
+} else {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum" );
+}
+
+%>
+
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index c663dce32..a8f5b1453 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -2,10 +2,10 @@
 
 #untaint custnum
 $cgi->param('custnum') =~ /^(\d+)$/
-  or eidiot 'illegal custnum '. $cgi->param('custnum');
+  or die 'illegal custnum '. $cgi->param('custnum');
 my $custnum = $1;
 $cgi->param('pkgpart') =~ /^(\d+)$/
-  or eidiot 'illegal pkgpart '. $cgi->param('pkgpart');
+  or die 'illegal pkgpart '. $cgi->param('pkgpart');
 my $pkgpart = $1;
 
 my @cust_pkg = ();
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index c5a8c82dd..8e76619ae 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -268,6 +268,13 @@ foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
 
 print '</SELECT><INPUT TYPE="submit" VALUE="Order Package"><BR>';
 
+print '<BR>'.
+  qq!<FORM ACTION="${p}edit/process/quick-charge.cgi" METHOD="POST">!.
+  qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
+  qq!Description:<INPUT TYPE="text" NAME="pkg">!.
+  qq! Amount:<INPUT TYPE="text" NAME="amount" SIZE=6>!.
+  qq!&nbsp;<INPUT TYPE="submit" VALUE="One-time charge"><BR>!;
+
 print <<END;
 <SCRIPT>
 function cust_pkg_areyousure(href) {
-- 
cgit v1.2.1


From a4c1722b8da9045825692715e0c2f8dde2741080 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Jun 2002 02:37:48 +0000
Subject: fix not sending postal invoices to customers with email invoices too

---
 FS/FS/cust_bill.pm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 20755857b..5a9fdd09b 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -369,9 +369,9 @@ emails or print.  See L<FS::cust_main_invoice>.
 
 sub send {
   my($self,$template) = @_;
-
-  #my @print_text = $cust_bill->print_text; #( date )
+  my @print_text = $self->print_text('', $template);
   my @invoicing_list = $self->cust_main->invoicing_list;
+
   if ( grep { $_ ne 'POST' } @invoicing_list ) { #email invoice
     #false laziness w/FS::cust_pay::delete & fs_signup_server && ::realtime_card
     #$ENV{SMTPHOSTS} = $smtpmachine;
@@ -386,7 +386,7 @@ sub send {
     ] );
     my $message = new Mail::Internet (
       'Header' => $header,
-      'Body' => [ $self->print_text('', $template) ], #( date)
+      'Body' => [ @print_text ], #( date)
     );
     $!=0;
     $message->smtpsend( Host => $smtpmachine )
@@ -395,11 +395,12 @@ sub send {
                   " to ". join(', ', grep { $_ ne 'POST' } @invoicing_list ).
                   " via server $smtpmachine with SMTP: $!";
 
-  #} elsif ( grep { $_ eq 'POST' } @invoicing_list ) {
-  } elsif ( ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list ) {
+  }
+
+  if ( ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list ) { #postal
     open(LPR, "|$lpr")
       or return "Can't open pipe to $lpr: $!";
-    print LPR $self->print_text; #( date )
+    print LPR @print_text;
     close LPR
       or return $! ? "Error closing $lpr: $!"
                    : "Exit status $? from $lpr";
@@ -951,7 +952,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.37 2002-06-07 20:33:27 khoff Exp $
+$Id: cust_bill.pm,v 1.38 2002-06-26 02:37:48 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 3039741d0802064c9cd1daea38513ed9bf6bce0e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Jun 2002 03:53:33 +0000
Subject: export options can be anything

---
 FS/FS/part_export_option.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export_option.pm b/FS/FS/part_export_option.pm
index 61ea956ae..a0b19fde1 100644
--- a/FS/FS/part_export_option.pm
+++ b/FS/FS/part_export_option.pm
@@ -106,7 +106,7 @@ sub check {
     $self->ut_numbern('optionnum')
     || $self->ut_number('exportnum')
     || $self->ut_alpha('optionname')
-    || $self->ut_textn('optionvalue')
+    || $self->ut_anything('optionvalue')
   ;
   return $error if $error;
 
-- 
cgit v1.2.1


From e2b311688228cdb1d60f81da434418da81b3d8a3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Jun 2002 07:42:16 +0000
Subject: shell.export -> bsdshell.export & sysvshell.export

---
 bin/bsdshell.export  | 119 +++++++++++++++++++++++++++++++++++++++++++++++++
 bin/shell.export     | 123 ---------------------------------------------------
 bin/sysvshell.export | 117 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 236 insertions(+), 123 deletions(-)
 create mode 100755 bin/bsdshell.export
 delete mode 100755 bin/shell.export
 create mode 100755 bin/sysvshell.export

diff --git a/bin/bsdshell.export b/bin/bsdshell.export
new file mode 100755
index 000000000..10c27671e
--- /dev/null
+++ b/bin/bsdshell.export
@@ -0,0 +1,119 @@
+#!/usr/bin/perl -w
+
+# bsdshell export
+
+use strict;
+use File::Rsync;
+use Net::SSH qw(ssh);
+use FS::UID qw(adminsuidsetup datasrc);
+use FS::Record qw(qsearch qsearchs);
+use FS::part_export;
+use FS::cust_svc;
+use FS::svc_acct;
+
+my @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+my $spooldir = "/usr/local/etc/freeside/export.". datasrc;
+#my $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/shell";
+
+my @bsd_exports = qsearch('part_export', { 'exporttype' => 'bsdshell' } );
+
+my $rsync = File::Rsync->new({
+  rsh     => 'ssh',
+#  dry_run => 1,
+});
+
+foreach my $export ( @bsd_exports ) {
+  my $machine = $export->machine;
+  my $prefix = "$spooldir/$machine";
+  mkdir $prefix, 0700 unless -d $prefix;
+
+  #LOCKING!!!
+
+  ( open(MASTER,">$prefix/master.passwd")
+    #!!!  and flock(MASTER,LOCK_EX|LOCK_NB)
+  ) or die "Can't open $prefix/master.passwd: $!";
+  ( open(PASSWD,">$prefix/passwd")
+    #!!!  and flock(PASSWD,LOCK_EX|LOCK_NB)
+  ) or die "Can't open $prefix/passwd: $!";
+
+  chmod 0644, "$prefix/passwd";
+  chmod 0600, "$prefix/master.passwd";
+
+  #false laziness with  freeside-sqlradius-reset and bind.export
+  my @svc_acct = 
+    map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
+      map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+        grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+          $export->export_svc;
+
+  next unless @svc_acct;
+
+  foreach my $svc_acct ( sort { $a->uid <=> $b->uid } @svc_acct ) {
+
+    my $password = $svc_acct->_password;
+    my $cpassword;
+    #if ( ( length($password) <= 8 )
+    if ( ( length($password) <= 12 )
+         && ( $password ne '*' )
+         && ( $password ne '!!' )
+         && ( $password ne '' )
+    ) {
+      $cpassword=crypt($password,
+                       $saltset[int(rand(64))].$saltset[int(rand(64))]
+      );
+      # MD5 !!!!
+    } else {
+      $cpassword=$password;
+    }
+
+    ###
+    # FORMAT OF THE PASSWD FILE HERE
+    print PASSWD join(":",
+      $svc_acct->username,
+      'x', # "##". $username,
+      $svc_acct->uid,
+      $svc_acct->gid,
+      $svc_acct->finger,
+      $svc_acct->dir,
+      $svc_acct->shell,
+    ), "\n";
+
+    ###
+    # FORMAT OF FreeBSD MASTER PASSWD FILE HERE
+    print MASTER join(":",
+      $svc_acct->username,              # User name
+      $cpassword,                       # Encrypted password
+      $svc_acct->uid,                   # User ID
+      $svc_acct->gid,                   # Group ID
+      "",                               # Login Class
+      "0",                              # Password Change Time
+      "0",                              # Password Expiration Time
+      $svc_acct->finger,                # Users name
+      $svc_acct->dir,                   # Users home directory
+      $svc_acct->shell,                 # shell
+    ), "\n" ;
+  
+  }
+
+  #!!! flock(MASTER,LOCK_UN);
+  #!!! flock(PASSWD,LOCK_UN);
+  close MASTER;
+  close PASSWD;
+
+  $rsync->exec( {
+    src  => "$prefix/passwd",
+    dest => "root\@$machine:/etc/passwd"
+  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
+
+  $rsync->exec( {
+    src  => "$prefix/master.passwd",
+    dest => "root\@$machine:/etc/master.passwd.new"
+  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
+  ssh("root\@$machine", "pwd_mkdb /etc/master.passwd.new");
+
+  # UNLOCK!!
+}
diff --git a/bin/shell.export b/bin/shell.export
deleted file mode 100755
index 146a0fd4e..000000000
--- a/bin/shell.export
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/perl -w
-
-# sysvshell and bsdshell export
-
-use strict;
-use File::Rsync;
-use Net::SSH qw(ssh);
-use FS::UID qw(adminsuidsetup datasrc);
-use FS::Record qw(qsearch qsearchs);
-use FS::part_export;
-use FS::cust_svc;
-use FS::svc_acct;
-
-my @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-my $spooldir = "/usr/local/etc/freeside/export.". datasrc;
-#my $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/shell";
-
-my @sysv_exports = qsearch('part_export', { 'exporttype' => 'sysvshell' } );
-my @bsd_exports = qsearch('part_export', { 'exporttype' => 'bsdshell' } );
-
-my $rsync = File::Rsync->new({
-  rsh     => 'ssh',
-#  dry_run => 1,
-});
-
-foreach my $export ( @sysv_exports ) {
-}
-
-foreach my $export ( @bsd_exports ) {
-  my $machine = $export->machine;
-  my $prefix = "$spooldir/$machine";
-  mkdir $prefix, 0700 unless -d $prefix;
-
-  #LOCKING!!!
-
-  ( open(MASTER,">$prefix/master.passwd")
-    #!!!  and flock(MASTER,LOCK_EX|LOCK_NB)
-  ) or die "Can't open $prefix/master.passwd: $!";
-  ( open(PASSWD,">$prefix/passwd")
-    #!!!  and flock(MASTER,LOCK_EX|LOCK_NB)
-  ) or die "Can't open $prefix/passwd: $!";
-
-  chmod 0644, "$spooldir/passwd";
-  chmod 0600, "$prefix/master.passwd";
-
-  #false laziness with  freeside-sqlradius-reset and bind.export
-  my @svc_acct = 
-    map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
-      map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-        grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-          $export->export_svc;
-
-  next unless @svc_acct;
-
-  foreach my $svc_acct ( sort { $a->uid <=> $b->uid } @svc_acct ) {
-
-    my $password = $svc_acct->_password;
-    my $cpassword;
-    #if ( ( length($password) <= 8 )
-    if ( ( length($password) <= 12 )
-         && ( $password ne '*' )
-         && ( $password ne '!!' )
-         && ( $password ne '' )
-    ) {
-      $cpassword=crypt($password,
-                       $saltset[int(rand(64))].$saltset[int(rand(64))]
-      );
-      # MD5 !!!!
-    } else {
-      $cpassword=$password;
-    }
-
-    ###
-    # FORMAT OF THE PASSWD FILE HERE
-    print PASSWD join(":",
-      $svc_acct->username,
-      'x', # "##". $username,
-      $svc_acct->uid,
-      $svc_acct->gid,
-      $svc_acct->finger,
-      $svc_acct->dir,
-      $svc_acct->shell,
-    ), "\n";
-
-    ###
-    # FORMAT OF FreeBSD MASTER PASSWD FILE HERE
-    print MASTER join(":",
-      $svc_acct->username,              # User name
-      $cpassword,                       # Encrypted password
-      $svc_acct->uid,                   # User ID
-      $svc_acct->gid,                   # Group ID
-      "",                               # Login Class
-      "0",                              # Password Change Time
-      "0",                              # Password Expiration Time
-      $svc_acct->finger,                # Users name
-      $svc_acct->dir,                   # Users home directory
-      $svc_acct->shell,                 # shell
-    ), "\n" ;
-  
-  }
-
-  #!!! flock(MASTER,LOCK_UN);
-  #!!! flock(PASSWD,LOCK_UN);
-  close MASTER;
-  close PASSWD;
-
-  $rsync->exec( {
-    src  => "$prefix/passwd",
-    dest => "root\@$machine:/etc/passwd"
-  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
-
-  $rsync->exec( {
-    src  => "$prefix/master.passwd",
-    dest => "root\@$machine:/etc/master.passwd.new"
-  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
-  ssh("root\@$machine", "pwd_mkdb /etc/master.passwd.new");
-
-  # UNLOCK!!
-}
diff --git a/bin/sysvshell.export b/bin/sysvshell.export
new file mode 100755
index 000000000..859766103
--- /dev/null
+++ b/bin/sysvshell.export
@@ -0,0 +1,117 @@
+#!/usr/bin/perl -w
+
+# sysvshell export
+
+use strict;
+use File::Rsync;
+use Net::SSH qw(ssh);
+use FS::UID qw(adminsuidsetup datasrc);
+use FS::Record qw(qsearch qsearchs);
+use FS::part_export;
+use FS::cust_svc;
+use FS::svc_acct;
+
+my @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+my $spooldir = "/usr/local/etc/freeside/export.". datasrc;
+#my $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/shell";
+
+my @sysv_exports = qsearch('part_export', { 'exporttype' => 'sysvshell' } );
+
+my $rsync = File::Rsync->new({
+  rsh     => 'ssh',
+#  dry_run => 1,
+});
+
+foreach my $export ( @sysv_exports ) {
+  my $machine = $export->machine;
+  my $prefix = "$spooldir/$machine";
+  mkdir $prefix, 0700 unless -d $prefix;
+
+  #LOCKING!!!
+
+  ( open(SHADOW,">$prefix/shadow")
+    #!!!  and flock(SHADOW,LOCK_EX|LOCK_NB)
+  ) or die "Can't open $prefix/shadow: $!";
+  ( open(PASSWD,">$prefix/passwd")
+    #!!!  and flock(PASSWD,LOCK_EX|LOCK_NB)
+  ) or die "Can't open $prefix/passwd: $!";
+
+  chmod 0644, "$prefix/passwd";
+  chmod 0600, "$prefix/shadow";
+
+  #false laziness with  freeside-sqlradius-reset and bind.export
+  my @svc_acct = 
+    map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
+      map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+        grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+          $export->export_svc;
+
+  next unless @svc_acct;
+
+  foreach my $svc_acct ( sort { $a->uid <=> $b->uid } @svc_acct ) {
+
+    my $password = $svc_acct->_password;
+    my $cpassword;
+    #if ( ( length($password) <= 8 )
+    if ( ( length($password) <= 12 )
+         && ( $password ne '*' )
+         && ( $password ne '!!' )
+         && ( $password ne '' )
+    ) {
+      $cpassword=crypt($password,
+                       $saltset[int(rand(64))].$saltset[int(rand(64))]
+      );
+      # MD5 !!!!
+    } else {
+      $cpassword=$password;
+    }
+
+    ###
+    # FORMAT OF THE PASSWD FILE HERE
+    print PASSWD join(":",
+      $svc_acct->username,
+      'x', # "##". $username,
+      $svc_acct->uid,
+      $svc_acct->gid,
+      $svc_acct->finger,
+      $svc_acct->dir,
+      $svc_acct->shell,
+    ), "\n";
+
+    ###
+    # FORMAT OF THE SHADOW FILE HERE
+    print SHADOW join(":",
+      $svc_acct->username,
+      $cpassword,
+      '',
+      '',
+      '',
+      '',
+      '',
+      '',
+      '',
+    ), "\n";
+
+  }
+
+  #!!! flock(SHADOW,LOCK_UN);
+  #!!! flock(PASSWD,LOCK_UN);
+  close SHADOW;
+  close PASSWD;
+
+  $rsync->exec( {
+    src  => "$prefix/shadow",
+    dest => "root\@$machine:/etc/shadow"
+  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
+
+  $rsync->exec( {
+    src  => "$prefix/passwd",
+    dest => "root\@$machine:/etc/passwd"
+  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
+
+  # UNLOCK!!
+}
-- 
cgit v1.2.1


From 24df069082d9cf57ed6788c5e864f65f4170a83f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Jun 2002 08:05:42 +0000
Subject: close form tags

---
 httemplate/view/cust_main.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 8e76619ae..a5c735457 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -266,14 +266,14 @@ foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
         $part_pkg->comment;
 }
 
-print '</SELECT><INPUT TYPE="submit" VALUE="Order Package"><BR>';
+print '</SELECT><INPUT TYPE="submit" VALUE="Order Package"></FORM><BR>';
 
 print '<BR>'.
   qq!<FORM ACTION="${p}edit/process/quick-charge.cgi" METHOD="POST">!.
   qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
   qq!Description:<INPUT TYPE="text" NAME="pkg">!.
   qq! Amount:<INPUT TYPE="text" NAME="amount" SIZE=6>!.
-  qq!&nbsp;<INPUT TYPE="submit" VALUE="One-time charge"><BR>!;
+  qq!&nbsp;<INPUT TYPE="submit" VALUE="One-time charge"></FORM><BR>!;
 
 print <<END;
 <SCRIPT>
-- 
cgit v1.2.1


From 4329b50ca24073d39e16ce808ee49286309150e9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Jun 2002 08:12:52 +0000
Subject: add type_pkgs record if necessary for one-time charges

---
 FS/FS/cust_main.pm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b68bf9e8f..efe94027d 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -27,6 +27,7 @@ use FS::part_pkg;
 use FS::part_bill_event;
 use FS::cust_bill_event;
 use FS::cust_tax_exempt;
+use FS::type_pkgs;
 use FS::Msgcat qw(gettext);
 
 @ISA = qw( FS::Record );
@@ -1769,9 +1770,20 @@ sub charge {
     return $error;
   }
 
+  my $pkgpart = $part_pkg->pkgpart;
+  my %type_pkgs = ( 'typenum' => $self->agent->typenum, 'pkgpart' => $pkgpart );
+  unless ( qsearchs('type_pkgs', \%type_pkgs ) ) {
+    my $type_pkgs = new FS::type_pkgs \%type_pkgs;
+    $error = $type_pkgs->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
   my $cust_pkg = new FS::cust_pkg ( {
     'custnum' => $self->custnum,
-    'pkgpart' => $part_pkg->pkgpart,
+    'pkgpart' => $pkgpart,
   } );
 
   $error = $cust_pkg->insert;
-- 
cgit v1.2.1


From 1126f78d0ff7708ade671422d3e6ceae3411241e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Jun 2002 08:32:21 +0000
Subject: better export docs/defaults

---
 FS/FS/part_export.pm | 79 ++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 58 insertions(+), 21 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 20e3ab474..cbd1dc8bd 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -531,7 +531,7 @@ tie my %shellcommands_options, 'Tie::IxHash',
                },
   'useradd_stdin' => { label=>'Insert command STDIN',
                        type =>'textarea',
-                       default=>'$_password\n$_password\n',
+                       default=>"\$_password\n\$_password\n",
                      },
   'userdel' => { label=>'Delete command',
                  default=>'userdel $username',
@@ -549,11 +549,36 @@ tie my %shellcommands_options, 'Tie::IxHash',
                  #  'chmod u-t $new_dir; chown -R $uid.$gid $new_dir; '.
                  #  'rm -rf $old_dir'.
                  #')'
+               },
   'usermod_stdin' => { label=>'Modify command STDIN',
                        type =>'textarea',
-                       default=>'$_password\n$_password\n',
+                       default=>"\$_password\n\$_password\n",
+                     },
+;
+
+tie my %shellcommands_withdomain_options, 'Tie::IxHash',
+  'user' => { label=>'Remote username', default=>'root' },
+  'useradd' => { label=>'Insert command',
+                 #default=>''
+               },
+  'useradd_stdin' => { label=>'Insert command STDIN',
+                       type =>'textarea',
+                       #default=>"$_password\n$_password\n",
                      },
+  'userdel' => { label=>'Delete command',
+                 #default=>'',
                },
+  'userdel_stdin' => { label=>'Delete command STDIN',
+                       type =>'textarea',
+                       #default=>'',
+                     },
+  'usermod' => { label=>'Modify command',
+                 default=>'',
+               },
+  'usermod_stdin' => { label=>'Modify command STDIN',
+                       type =>'textarea',
+                       #default=>"$_password\n$_password\n",
+                     },
 ;
 
 tie my %sqlradius_options, 'Tie::IxHash',
@@ -618,17 +643,17 @@ tie my %sqlmail_options, 'Tie::IxHash',
   'svc_acct' => {
     'sysvshell' => {
       'desc' =>
-        'Batch export of /etc/passwd and /etc/shadow files (Linux/SysV)',
+        'Batch export of /etc/passwd and /etc/shadow files (Linux/SysV).',
       'options' => \%sysvshell_options,
       'nodomain' => 'Y',
-      'notes' => 'MD5 crypt requires installation of <a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a> from CPAN.  Run shell.export, etc.',
+      'notes' => 'MD5 crypt requires installation of <a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a> from CPAN.    Run bin/sysvshell.export to export the files.',
     },
     'bsdshell' => {
       'desc' =>
-        'Batch export of /etc/passwd and /etc/master.passwd files (BSD)',
+        'Batch export of /etc/passwd and /etc/master.passwd files (BSD).',
       'options' => \%bsdshell_options,
       'nodomain' => 'Y',
-      'notes' => 'MD5 crypt requires installation of <a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a> from CPAN.  Run shell.export, etc.',
+      'notes' => 'MD5 crypt requires installation of <a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a> from CPAN.  Run bin/bsdshell.export to export the files.',
     },
 #    'nis' => {
 #      'desc' =>
@@ -638,28 +663,35 @@ tie my %sqlmail_options, 'Tie::IxHash',
     'textradius' => {
       'desc' => 'Batch export of a text /etc/raddb/users file (Livingston, Cistron)',
       'options' => {},
-      'notes' => 'unfinished...',
+      'notes' => 'unfinished',
     },
 
     'shellcommands' => {
       'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
       'options' => \%shellcommands_options,
       'nodomain' => 'Y',
-      'notes' => 'shellcommandsnotes... (this one is the nodomain one)',
+      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).',
+    },
+
+    'shellcommands_withdomain' => {
+      'desc' => 'Real-time export via remote SSH,',
+      'options' => \%shellcommands_withdomain_options,
+      'nodomain' => 'Y',
+      'notes' => 'Run remote commands via SSH.  username@domain (rather than just usernames) are considered unique (also see shellcommands)',
     },
 
     'sqlradius' => {
       'desc' => 'Real-time export to SQL-backed RADIUS (ICRADIUS, FreeRADIUS)',
       'options' => \%sqlradius_options,
       'nodomain' => 'Y',
-      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  Use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.23/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.  If using <a href="http://www.freeradius.org/">FreeRADIUS</a> 0.5 or above, make sure your <b>op</b> fields are set to allow NULL values.',
+      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.23/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.  If using <a href="http://www.freeradius.org/">FreeRADIUS</a> 0.5 or above, make sure your <b>op</b> fields are set to allow NULL values.',
     },
 
     'sqlmail' => {
       'desc' => 'Real-time export to SQL-backed mail server',
       'options' => \%sqlmail_options,
       'nodomain' => 'Y',
-      'notes' => 'Database schema can be made to work with Courier IMAP and Exim.  Others could work but are untested.',
+      'notes' => 'Database schema can be made to work with Courier IMAP and Exim.  Others could work but are untested. (...extended description from pc-intouch?...)',
     },
 
     'cyrus' => {
@@ -685,7 +717,6 @@ tie my %sqlmail_options, 'Tie::IxHash',
     'vpopmail' => {
       'desc' => 'Real-time export to vpopmail text files',
       'options' => \%vpopmail_options,
-
       'notes' => 'Real time export to <a href="http://inter7.com/vpopmail/">vpopmail</a> text files (...extended description from jeff?...)',
     },
 
@@ -696,21 +727,20 @@ tie my %sqlmail_options, 'Tie::IxHash',
     'bind' => {
       'desc' =>'Batch export to BIND named',
       'options' => \%bind_options,
-      'notes' => 'bind export notes File::Rsync dependancy, run bind.export',
+      'notes' => 'Batch export of BIND zone and configuration files to primary nameserver.  <a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a> must be installed.  Run bin/bind.export to export the files.',
     },
 
     'bind_slave' => {
       'desc' =>'Batch export to slave BIND named',
       'options' => \%bind_slave_options,
-      'notes' => 'bind export notes (secondary munge) File::Rsync dependancy, run bind.export',
+      'notes' => 'Batch export of BIND configuration file to a secondary nameserver.  Zones are slaved from the listed masters.  <a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a> must be installed.  Run bin/bind.export to export the files.',
     },
 
     'sqlmail' => {
       'desc' => 'Real-time export to SQL-backed mail server',
       'options' => \%sqlmail_options,
-      'nodomain' => 'Y',
-      'notes' => 'Database schema can be made to work with Courier IMAP and
- Exim.  Others could work but are untested.',
+      #'nodomain' => 'Y',
+      'notes' => 'Database schema can be made to work with Courier IMAP and Exim.  Others could work but are untested. (...extended description from pc-intouch?...)',
     },
 
 
@@ -722,13 +752,19 @@ tie my %sqlmail_options, 'Tie::IxHash',
     'sqlmail' => {
       'desc' => 'Real-time export to SQL-backed mail server',
       'options' => \%sqlmail_options,
-      'nodomain' => 'Y',
-      'notes' => 'Database schema can be made to work with Courier IMAP and
- Exim.  Others could work but are untested.',
+      #'nodomain' => 'Y',
+      'notes' => 'Database schema can be made to work with Courier IMAP and Exim.  Others could work but are untested. (...extended description from pc-intouch?...)',
     },
   },
 
-  'svc_www' => {},
+  'svc_www' => {
+    'www_shellcommands' => {
+      'desc'    => 'www_shellcommands',
+      'options' => {}, # \%www_shellcommands_options,
+      'notes'   => 'svc_www commands',
+    },
+
+  },
 
 );
 
@@ -741,7 +777,8 @@ FS/FS/part_export/ (an example may be found in eg/export_template.pm)
 
 =head1 BUGS
 
-Probably.
+All the stuff in the %exports hash should be generated from the specific
+export modules.
 
 Hmm... cust_export class (not necessarily a database table...) ... ?
 
-- 
cgit v1.2.1


From a644b239bd83709b67b7b26f4af6e0cc8c172f37 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Jun 2002 08:36:12 +0000
Subject: tyop

---
 FS/FS/part_export.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index cbd1dc8bd..74f7006ca 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -674,9 +674,8 @@ tie my %sqlmail_options, 'Tie::IxHash',
     },
 
     'shellcommands_withdomain' => {
-      'desc' => 'Real-time export via remote SSH,',
+      'desc' => 'Real-time export via remote SSH.',
       'options' => \%shellcommands_withdomain_options,
-      'nodomain' => 'Y',
       'notes' => 'Run remote commands via SSH.  username@domain (rather than just usernames) are considered unique (also see shellcommands)',
     },
 
-- 
cgit v1.2.1


From 76e9abe03157deaa2a5ec7253624c9a59464b8fc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 Jun 2002 09:19:33 +0000
Subject: export updates

---
 FS/FS/part_export/bsdshell.pm          | 47 +----------------------
 FS/FS/part_export/null.pm              | 13 +++++++
 FS/FS/part_export/sysvshell.pm         |  7 ++++
 FS/FS/part_export/www_shellcommands.pm | 70 ++++++++++++++++++++++++++++++++++
 FS/t/part_export-null.t                |  5 +++
 FS/t/part_export-sysvshell.t           |  5 +++
 FS/t/part_export-www_shellcommands.t   |  5 +++
 7 files changed, 107 insertions(+), 45 deletions(-)
 create mode 100644 FS/FS/part_export/null.pm
 create mode 100644 FS/FS/part_export/sysvshell.pm
 create mode 100644 FS/FS/part_export/www_shellcommands.pm
 create mode 100644 FS/t/part_export-null.t
 create mode 100644 FS/t/part_export-sysvshell.t
 create mode 100644 FS/t/part_export-www_shellcommands.t

diff --git a/FS/FS/part_export/bsdshell.pm b/FS/FS/part_export/bsdshell.pm
index 4a890d051..06642097f 100644
--- a/FS/FS/part_export/bsdshell.pm
+++ b/FS/FS/part_export/bsdshell.pm
@@ -1,50 +1,7 @@
 package FS::part_export::bsdshell;
 
 use vars qw(@ISA);
-use FS::part_export;
+use FS::part_export::null;
 
-@ISA = qw(FS::part_export);
-
-sub rebless { shift; }
-
-sub _export_insert {
-  my($self, $svc_acct) = (shift, shift);
-  $err_or_queue = $self->bsdshell_queue( $svc_acct->svcnum, 'insert',
-    $svc_acct->username, $svc_acct->_password );
-  ref($err_or_queue) ? '' : $err_or_queue;
-}
-
-sub _export_replace {
-  my( $self, $new, $old ) = (shift, shift, shift);
-  #return "can't change username with bsdshell"
-  #  if $old->username ne $new->username;
-  #return '' unless $old->_password ne $new->_password;
-  $err_or_queue = $self->bsdshell_queue( $new->svcnum,
-    'replace', $new->username, $new->_password );
-  ref($err_or_queue) ? '' : $err_or_queue;
-}
-
-sub _export_delete {
-  my( $self, $svc_acct ) = (shift, shift);
-  $err_or_queue = $self->bsdshell_queue( $svc_acct->svcnum,
-    'delete', $svc_acct->username );
-  ref($err_or_queue) ? '' : $err_or_queue;
-}
-
-#a good idea to queue anything that could fail or take any time
-sub bsdshell_queue {
-  my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => "FS::part_export::bsdshell::bsdshell_$method",
-  };
-  $queue->insert( @_ ) or $queue;
-}
-
-sub bsdshell_insert { #subroutine, not method
-}
-sub bsdshell_replace { #subroutine, not method
-}
-sub bsdshell_delete { #subroutine, not method
-}
+@ISA = qw(FS::part_export::null);
 
diff --git a/FS/FS/part_export/null.pm b/FS/FS/part_export/null.pm
new file mode 100644
index 000000000..0145af3a4
--- /dev/null
+++ b/FS/FS/part_export/null.pm
@@ -0,0 +1,13 @@
+package FS::part_export::null;
+
+use vars qw(@ISA);
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+sub rebless { shift; }
+
+sub _export_insert {}
+sub _export_replace {}
+sub _export_delete {}
+
diff --git a/FS/FS/part_export/sysvshell.pm b/FS/FS/part_export/sysvshell.pm
new file mode 100644
index 000000000..f3f6b34b6
--- /dev/null
+++ b/FS/FS/part_export/sysvshell.pm
@@ -0,0 +1,7 @@
+package FS::part_export::sysvshell;
+
+use vars qw(@ISA);
+use FS::part_export::null;
+
+@ISA = qw(FS::part_export::null);
+
diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
new file mode 100644
index 000000000..870d7f1ee
--- /dev/null
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -0,0 +1,70 @@
+package FS::part_export::shellcommands;
+
+use vars qw(@ISA);
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my($self) = shift;
+  $self->_export_command('useradd', @_);
+}
+
+sub _export_delete {
+  my($self) = shift;
+  $self->_export_command('userdel', @_);
+}
+
+sub _export_command {
+  my ( $self, $action, $svc_acct) = (shift, shift, shift);
+  my $command = $self->option($action);
+  my $stdin = $self->option($action."_stdin");
+  no strict 'refs';
+  ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
+  $self->shellcommands_queue( $svc_acct->svcnum,
+    user         => $self->options('user')||'root',
+    host         => $self->options('machine'),
+    command      => eval(qq("$command")),
+    stdin_string => eval(qq("$stdin")),
+  );
+}
+
+sub _export_replace {
+  my($self, $new, $old ) = (shift, shift, shift);
+  my $command = $self->option('usermod');
+  my $stdin = $self->option('usermod_stdin');
+  no strict 'refs';
+  ${"old_$_"} = $old->getfield($_) foreach $old->fields;
+  ${"new_$_"} = $new->getfield($_) foreach $new->fields;
+  $self->shellcommands_queue( $new->svcnum,
+    user         => $self->options('user')||'root',
+    host         => $self->options('machine'),
+    command      => eval(qq("$command")),
+    stdin_string => eval(qq("$stdin")),
+  );
+}
+
+#a good idea to queue anything that could fail or take any time
+sub shellcommands_queue {
+  my( $self, $svcnum ) = (shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => "FS::part_export::shellcommands::ssh_cmd",
+  };
+  $queue->insert( @_ );
+}
+
+sub ssh_cmd { #subroutine, not method
+  use Net::SSH '0.06';
+  &Net::SSH::ssh_cmd( { @_ } );
+}
+
+#sub shellcommands_insert { #subroutine, not method
+#}
+#sub shellcommands_replace { #subroutine, not method
+#}
+#sub shellcommands_delete { #subroutine, not method
+#}
+
diff --git a/FS/t/part_export-null.t b/FS/t/part_export-null.t
new file mode 100644
index 000000000..055cdcee6
--- /dev/null
+++ b/FS/t/part_export-null.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::null;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_export-sysvshell.t b/FS/t/part_export-sysvshell.t
new file mode 100644
index 000000000..7fc24acb1
--- /dev/null
+++ b/FS/t/part_export-sysvshell.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::sysvshell;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_export-www_shellcommands.t b/FS/t/part_export-www_shellcommands.t
new file mode 100644
index 000000000..2ea79cf97
--- /dev/null
+++ b/FS/t/part_export-www_shellcommands.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::www_shellcommands;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From 4c7ddc2010ddeaca45d40140993b05d43b7fe030 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 Jun 2002 09:23:05 +0000
Subject: null bind exports

---
 FS/FS/part_export/bind.pm       | 7 +++++++
 FS/FS/part_export/bind_slave.pm | 7 +++++++
 FS/t/part_export-bind.t         | 5 +++++
 FS/t/part_export-bind_slave.t   | 5 +++++
 4 files changed, 24 insertions(+)
 create mode 100644 FS/FS/part_export/bind.pm
 create mode 100644 FS/FS/part_export/bind_slave.pm
 create mode 100644 FS/t/part_export-bind.t
 create mode 100644 FS/t/part_export-bind_slave.t

diff --git a/FS/FS/part_export/bind.pm b/FS/FS/part_export/bind.pm
new file mode 100644
index 000000000..b72c9bdb0
--- /dev/null
+++ b/FS/FS/part_export/bind.pm
@@ -0,0 +1,7 @@
+package FS::part_export::bind;
+
+use vars qw(@ISA);
+use FS::part_export::null;
+
+@ISA = qw(FS::part_export::null);
+
diff --git a/FS/FS/part_export/bind_slave.pm b/FS/FS/part_export/bind_slave.pm
new file mode 100644
index 000000000..ebb29c1d7
--- /dev/null
+++ b/FS/FS/part_export/bind_slave.pm
@@ -0,0 +1,7 @@
+package FS::part_export::bind_slave;
+
+use vars qw(@ISA);
+use FS::part_export::null;
+
+@ISA = qw(FS::part_export::null);
+
diff --git a/FS/t/part_export-bind.t b/FS/t/part_export-bind.t
new file mode 100644
index 000000000..d0c96be40
--- /dev/null
+++ b/FS/t/part_export-bind.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::bind;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_export-bind_slave.t b/FS/t/part_export-bind_slave.t
new file mode 100644
index 000000000..c6a038610
--- /dev/null
+++ b/FS/t/part_export-bind_slave.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::bind_slave;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From d16051449aa84da6705b46573ccd98abdcb7551b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Jun 2002 02:21:56 +0000
Subject: last 4 digits of card instead of first

---
 httemplate/view/cust_main.cgi | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index a5c735457..630d9e568 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -206,8 +206,7 @@ print '<BR>';
 
   if ( $cust_main->payby eq 'CARD' ) {
     my $payinfo = $cust_main->payinfo;
-    $payinfo = substr($payinfo,0,4). 'x'x(length($payinfo)-4);
-
+    $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
     print 'Credit card</TD></TR>',
           '<TR><TD ALIGN="right">Card number</TD><TD BGCOLOR="#ffffff">',
           $payinfo, '</TD></TR>',
@@ -467,7 +466,7 @@ foreach my $bill (@bills) {
                                              $payment->payinfo,
                                              $cust_bill_pay->amount,
                       );
-    $payinfo = substr($payinfo,0,4). 'x'x(length($payinfo)-4)
+    $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
       if $payby eq 'CARD';
     my $target = "$payby$payinfo";
     $payby =~ s/^BILL$/Check #/ if $payinfo;
-- 
cgit v1.2.1


From a9f62de2c99fea32f8a1b86e4da3766fc0ad2b53 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Jun 2002 03:09:10 +0000
Subject: more card display changes

---
 httemplate/view/cust_main.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 630d9e568..479648183 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -466,7 +466,7 @@ foreach my $bill (@bills) {
                                              $payment->payinfo,
                                              $cust_bill_pay->amount,
                       );
-    $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
+    $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
       if $payby eq 'CARD';
     my $target = "$payby$payinfo";
     $payby =~ s/^BILL$/Check #/ if $payinfo;
@@ -549,7 +549,7 @@ foreach my $payment (@unapplied_payments) {
   my $payby = $payment->payby;
   my $payinfo = $payment->payinfo;
   #false laziness w/above
-  $payinfo = substr($payinfo,0,4). 'x'x(length($payinfo)-4)
+  $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
     if $payby eq 'CARD';
   my $target = "$payby$payinfo";
   $payby =~ s/^BILL$/Check #/ if $payinfo;
-- 
cgit v1.2.1


From 25747983ac27c3b804a2f15312c8c7b59769e014 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Jun 2002 08:23:44 +0000
Subject: fix multi-database installs, while hopefully keeping performance
 improvement

---
 FS/FS/Record.pm | 8 +++++---
 FS/FS/UID.pm    | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index f7c3a41c8..7d5ff0582 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -2,7 +2,7 @@ package FS::Record;
 
 use strict;
 use vars qw( $dbdef_file $dbdef $setup_hack $AUTOLOAD @ISA @EXPORT_OK $DEBUG
-             $me );
+             $me %dbdef_cache );
 use subs qw(reload_dbdef);
 use Exporter;
 use Carp qw(carp cluck croak confess);
@@ -1130,8 +1130,10 @@ I<$FS::Record::setup_hack> is true.  Returns a DBIx::DBSchema object.
 
 sub reload_dbdef {
   my $file = shift || $dbdef_file;
-  $dbdef = load DBIx::DBSchema $file
-    or die "can't load database schema from $file";
+  $dbdef = exists $dbdef_cache{$file}
+    ? $dbdef_cache{$file}
+    : $dbdef_cache{$file} = DBIx::DBSchema->load( $file )
+                              or die "can't load database schema from $file";
 }
 
 =item dbdef
diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 87830cb04..b1e590f2f 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -92,7 +92,7 @@ sub forksuidsetup {
 
   foreach ( keys %callback ) {
     &{$callback{$_}};
-    delete $callback{$_}; #run once
+    # breaks multi-database installs # delete $callback{$_}; #run once
   }
 
   $dbh;
@@ -256,7 +256,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.15 2002-06-14 09:19:33 ivan Exp $
+$Id: UID.pm,v 1.16 2002-06-28 08:23:44 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 11deba5ca03afd00c0450bc4e0b9345e87e08829 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Jun 2002 10:49:05 +0000
Subject: remove extraneous check

---
 FS/FS/Record.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 7d5ff0582..10fff99dd 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -735,7 +735,7 @@ sub unique {
   my($self,$field) = @_;
   my($table)=$self->table;
 
-  croak("&FS::UID::checkruid failed") unless &checkruid;
+  #croak("&FS::UID::checkruid failed") unless &checkruid;
 
   croak "Unique called on field $field, but it is ",
         $self->getfield($field),
-- 
cgit v1.2.1


From 6d295788b1c6bfb1c96c8917043a1b209c8491e1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Jun 2002 20:21:35 +0000
Subject: better error message for missing tax classes

---
 FS/FS/cust_main.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index efe94027d..9ed3f2cab 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1053,8 +1053,8 @@ sub bill {
               $dbh->rollback if $oldAutoCommit;
               return
                 "fatal: can't find tax rate for state/county/country/taxclass ".
-                join('/', map $self->$_(), qw(state county country taxclass) ).
-                "\n";
+                join('/', ( map $self->$_(), qw(state county country) ),
+                          $part_pkg->taxclass ).  "\n";
             };
 
           if ( $cust_main_county->exempt_amount ) {
-- 
cgit v1.2.1


From b7e2cab3c9a31b4ed90794764cdba68c5797f864 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Jun 2002 20:23:54 +0000
Subject: not anymore...

---
 bin/fs-setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 77f1452eb..45cb07f47 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.94 2002-06-10 01:39:50 khoff Exp $
+# $Id: fs-setup,v 1.95 2002-06-28 20:23:54 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -771,7 +771,7 @@ sub tables_hash_hack {
         'domsvc',    'int', '',   '',
       ],
       'primary_key' => 'svcnum',
-      'unique' => [ [ 'username', 'domsvc' ] ],
+      #'unique' => [ [ 'username', 'domsvc' ] ],
       'index' => [ ['username'], ['domsvc'] ],
     },
 
-- 
cgit v1.2.1


From 87efb86d904887f9ee48dcf77fb1470d4c23a87f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Jun 2002 20:31:30 +0000
Subject: better error message for illegal password

---
 FS/FS/svc_acct.pm   | 2 +-
 bin/populate-msgcat | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index e2ac18639..2bbbdcbb7 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -787,7 +787,7 @@ sub check {
     $recref->{_password} = '!!';
   } else {
     #return "Illegal password";
-    return gettext('illegal_password'). "$passwordmin-$passwordmax".
+    return gettext('illegal_password'). " $passwordmin-$passwordmax ".
            FS::Msgcat::_gettext('illegal_password_characters').
            ": ". $recref->{_password};
   }
diff --git a/bin/populate-msgcat b/bin/populate-msgcat
index 166f83720..f8e23cfa0 100755
--- a/bin/populate-msgcat
+++ b/bin/populate-msgcat
@@ -79,7 +79,7 @@ sub messages {
       'en_US' => 'Illegal password (',
     },
 
-    'illeggal_password_characters' => {
+    'illegal_password_characters' => {
       'en_US' => ' characters)',
     },
 
-- 
cgit v1.2.1


From 078d8e27e079bb9568d632a33ef5a369d49c9c1d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 30 Jun 2002 01:18:37 +0000
Subject: adding

---
 httemplate/docs/ssh.html | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100755 httemplate/docs/ssh.html

diff --git a/httemplate/docs/ssh.html b/httemplate/docs/ssh.html
new file mode 100755
index 000000000..5503a242e
--- /dev/null
+++ b/httemplate/docs/ssh.html
@@ -0,0 +1,15 @@
+<head>
+  <title>Unattended SSH</title>
+</head>
+<body>
+  <h1>Unattended SSH</h1>
+  <br><a name=ssh>Unattended remote login</a> - Freeside can login to remote machines unattended using SSH.  This can pose a security risk if not configured correctly, and will allow an intruder who breaks into your freeside machine full access to your remote machines.  <b>Do not use this feature unless you understand what you are doing!</b>
+    <ul>
+      <li>As the freeside user (on your freeside machine), generate an authentication key using <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>.  Since this is for unattended operation, use a blank passphrase.
+      <li>Append the newly-created <code>identity.pub</code> file to <code>~root/.ssh/authorized_keys</code> on the remote machine(s).
+      <li>Some new SSH v2 implementation accept v2 style keys only.  Use the <code>-t</code> option to <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>, and append the created <code>id_dsa.pub</code> or <code>id_rsa.pub</code> to <code>~root/.ssh/authorized_keys2</code> on the remote machine(s).
+      <li>You may need to set <code>PermitRootLogin without-password</code> (meaning with keys only) in your <code>sshd_config</code> file on the remote machine(s).
+    </ul>
+
+</body>
+
-- 
cgit v1.2.1


From 87e22680728124c7d339a32d99f61442ccc204d7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 30 Jun 2002 02:13:33 +0000
Subject: export!

---
 FS/FS/part_export.pm                          | 15 ++++++++++-----
 FS/FS/part_export/shellcommands_withdomain.pm |  7 +++++++
 FS/MANIFEST                                   | 12 ++++++++++++
 FS/t/part_export-shellcommands_withdomain.t   |  5 +++++
 4 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 FS/FS/part_export/shellcommands_withdomain.pm
 create mode 100644 FS/t/part_export-shellcommands_withdomain.t

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 74f7006ca..23f948f6a 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -581,6 +581,11 @@ tie my %shellcommands_withdomain_options, 'Tie::IxHash',
                      },
 ;
 
+tie my %textradius_options, 'Tie::IxHash',
+  'user' => { label=>'Remote username', default=>'root' },
+  'users' => { label=>'users file location', default=>'/etc/raddb/users' },
+;
+
 tie my %sqlradius_options, 'Tie::IxHash',
   'datasrc'  => { label=>'DBI data source ' },
   'username' => { label=>'Database username' },
@@ -661,22 +666,22 @@ tie my %sqlmail_options, 'Tie::IxHash',
 #      'options' => {},
 #    },
     'textradius' => {
-      'desc' => 'Batch export of a text /etc/raddb/users file (Livingston, Cistron)',
-      'options' => {},
-      'notes' => 'unfinished',
+      'desc' => 'Real-time export to a text /etc/raddb/users file (Livingston, Cistron)',
+      'options' => \%textradius_options,
+      'notes' => 'This will edit a text RADIUS users file in place on a remote server.  Requires installation of <a href="http://search.cpan.org/search?dist=RADIUS-UserFile">RADIUS::UserFile</a> from CPAN.  If using RADIUS::UserFile 1.01, make sure to apply <a href="http://rt.cpan.org/NoAuth/Bug.html?id=1210">this patch</a>.  Also make sure <a href="http://rsync.samba.org/">rsync</a> is installed on the remote machine, and <a href="../docs/ssh.html">SSH is setup for unattended operation</a>.',
     },
 
     'shellcommands' => {
       'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
       'options' => \%shellcommands_options,
       'nodomain' => 'Y',
-      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).',
+      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.',
     },
 
     'shellcommands_withdomain' => {
       'desc' => 'Real-time export via remote SSH.',
       'options' => \%shellcommands_withdomain_options,
-      'notes' => 'Run remote commands via SSH.  username@domain (rather than just usernames) are considered unique (also see shellcommands)',
+      'notes' => 'Run remote commands via SSH.  username@domain (rather than just usernames) are considered unique (also see shellcommands).  You probably want this if the commands you are running will accept a domain as a parameter, and will allow the same username with different domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.',
     },
 
     'sqlradius' => {
diff --git a/FS/FS/part_export/shellcommands_withdomain.pm b/FS/FS/part_export/shellcommands_withdomain.pm
new file mode 100644
index 000000000..a15c24d88
--- /dev/null
+++ b/FS/FS/part_export/shellcommands_withdomain.pm
@@ -0,0 +1,7 @@
+package FS::part_export::shellcommands_withdomain;
+
+use vars qw(@ISA);
+use FS::part_export::shellcommands;
+
+@ISA = qw(FS::part_export::shellcommands);
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index daf27b7e4..c932f3aa0 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -49,15 +49,21 @@ FS/part_bill_event.pm
 FS/export_svc.pm
 FS/part_export.pm
 FS/part_export_option.pm
+FS/part_export/bind.pm
+FS/part_export/bind_slave.pm
 FS/part_export/bsdshell.pm
 FS/part_export/cp.pm
 FS/part_export/cyrus.pm
 FS/part_export/infostreet.pm
+FS/part_export/null.pm
 FS/part_export/shellcommands.pm
+FS/part_export/shellcommands_withdomain.pm
 FS/part_export/sqlmail.pm
 FS/part_export/sqlradius.pm
+FS/part_export/sysvshell.pm
 FS/part_export/textradius.pm
 FS/part_export/vpopmail.pm
+FS/part_export/www_shellcommands.pm
 FS/part_pkg.pm
 FS/part_pop_local.pm
 FS/part_referral.pm
@@ -113,15 +119,21 @@ t/part_bill_event.t
 t/export_svc.t
 t/part_export.t
 t/part_export_option.t
+t/part_export-bind.t
+t/part_export-bind_slave.t
 t/part_export-bsdshell.t
 t/part_export-cp.t
 t/part_export-cyrus.t
 t/part_export-infostreet.t
+t/part_export-null.t
 t/part_export-shellcommands.t
+t/part_export-shellcommands_withdomain.t
 t/part_export-sqlmail.t
 t/part_export-sqlradius.t
+t/part_export-sysvshell.t
 t/part_export-textradius.t
 t/part_export-vpopmail.t
+t/part_export-www_shellcommands.t
 t/part_pkg.t
 t/part_pop_local.t
 t/part_referral.t
diff --git a/FS/t/part_export-shellcommands_withdomain.t b/FS/t/part_export-shellcommands_withdomain.t
new file mode 100644
index 000000000..c0bd1bbb0
--- /dev/null
+++ b/FS/t/part_export-shellcommands_withdomain.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::shellcommands_withdomain;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From 6914db4bdd641adcab054b3aa0508d482f3dab9e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 30 Jun 2002 07:04:08 +0000
Subject: fix dbdef caching

---
 FS/FS/Record.pm | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 10fff99dd..5fa0a466a 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -250,7 +250,7 @@ sub qsearch {
   }
   $statement .= " $extra_sql" if defined($extra_sql);
 
-  warn "[debug]$me $statement\n" if $DEBUG;
+  warn "[debug]$me $statement\n" if $DEBUG > 1;
   my $sth = $dbh->prepare($statement)
     or croak "$dbh->errstr doing $statement";
 
@@ -502,13 +502,13 @@ sub insert {
       join( ', ', @values ).
     ")"
   ;
-  warn "[debug]$me $statement\n" if $DEBUG;
+  warn "[debug]$me $statement\n" if $DEBUG > 1;
   my $sth = dbh->prepare($statement) or return dbh->errstr;
 
   my $h_sth;
   if ( defined $dbdef->table('h_'. $self->table) ) {
     my $h_statement = $self->_h_statement('insert');
-    warn "[debug]$me $h_statement\n" if $DEBUG;
+    warn "[debug]$me $h_statement\n" if $DEBUG > 2;
     $h_sth = dbh->prepare($h_statement) or return dbh->errstr;
   } else {
     $h_sth = '';
@@ -562,13 +562,13 @@ sub delete {
           ? ( $self->dbdef_table->primary_key)
           : $self->fields
   );
-  warn "[debug]$me $statement\n" if $DEBUG;
+  warn "[debug]$me $statement\n" if $DEBUG > 1;
   my $sth = dbh->prepare($statement) or return dbh->errstr;
 
   my $h_sth;
   if ( defined $dbdef->table('h_'. $self->table) ) {
     my $h_statement = $self->_h_statement('delete');
-    warn "[debug]$me $h_statement\n" if $DEBUG;
+    warn "[debug]$me $h_statement\n" if $DEBUG > 2;
     $h_sth = dbh->prepare($h_statement) or return dbh->errstr;
   } else {
     $h_sth = '';
@@ -647,13 +647,13 @@ sub replace {
       } ( $primary_key ? ( $primary_key ) : $old->fields )
     )
   ;
-  warn "[debug]$me $statement\n" if $DEBUG;
+  warn "[debug]$me $statement\n" if $DEBUG > 1;
   my $sth = dbh->prepare($statement) or return dbh->errstr;
 
   my $h_old_sth;
   if ( defined $dbdef->table('h_'. $old->table) ) {
     my $h_old_statement = $old->_h_statement('replace_old');
-    warn "[debug]$me $h_old_statement\n" if $DEBUG;
+    warn "[debug]$me $h_old_statement\n" if $DEBUG > 2;
     $h_old_sth = dbh->prepare($h_old_statement) or return dbh->errstr;
   } else {
     $h_old_sth = '';
@@ -662,7 +662,7 @@ sub replace {
   my $h_new_sth;
   if ( defined $dbdef->table('h_'. $new->table) ) {
     my $h_new_statement = $new->_h_statement('replace_new');
-    warn "[debug]$me $h_new_statement\n" if $DEBUG;
+    warn "[debug]$me $h_new_statement\n" if $DEBUG > 2;
     $h_new_sth = dbh->prepare($h_new_statement) or return dbh->errstr;
   } else {
     $h_new_sth = '';
@@ -1130,10 +1130,15 @@ I<$FS::Record::setup_hack> is true.  Returns a DBIx::DBSchema object.
 
 sub reload_dbdef {
   my $file = shift || $dbdef_file;
-  $dbdef = exists $dbdef_cache{$file}
-    ? $dbdef_cache{$file}
-    : $dbdef_cache{$file} = DBIx::DBSchema->load( $file )
-                              or die "can't load database schema from $file";
+
+  unless ( exists $dbdef_cache{$file} ) {
+    warn "[debug]$me loading dbdef for $file\n" if $DEBUG;
+    $dbdef_cache{$file} = DBIx::DBSchema->load( $file )
+                            or die "can't load database schema from $file";
+  } else {
+    warn "[debug]$me re-using cached dbdef for $file\n" if $DEBUG;
+  }
+  $dbdef = $dbdef_cache{$file};
 }
 
 =item dbdef
-- 
cgit v1.2.1


From 33aa71dbc113342361b6872e9587945bbcfe88a3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 30 Jun 2002 07:16:29 +0000
Subject: get rid of unneeded Pg-cruft (don't use native Pg money type)

---
 FS/FS/Record.pm | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 5fa0a466a..3404a67fe 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -132,15 +132,8 @@ sub new {
 
   my $hashref = $self->{'Hash'} = shift;
 
-  foreach my $field ( $self->fields ) { 
-    $hashref->{$field}='' unless defined $hashref->{$field};
-    #trim the '$' and ',' from money fields for Pg (belong HERE?)
-    #(what about Pg i18n?)
-    if ( driver_name =~ /^Pg$/i
-         && $self->dbdef_table->column($field)->type eq 'money' ) {
-      ${$hashref}{$field} =~ s/^\$//;
-      ${$hashref}{$field} =~ s/\,//;
-    }
+  foreach my $field ( grep defined($hashref->{$_}), $self->fields ) { 
+    $hashref->{$field}='';
   }
 
   $self->_cache($hashref, shift) if $self->can('_cache') && @_;
-- 
cgit v1.2.1


From a486765cc7b6e1cb110720ba199788cf0f7c1280 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 30 Jun 2002 07:17:48 +0000
Subject: oops, very bad

---
 FS/FS/Record.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 3404a67fe..e6126a13b 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -132,7 +132,7 @@ sub new {
 
   my $hashref = $self->{'Hash'} = shift;
 
-  foreach my $field ( grep defined($hashref->{$_}), $self->fields ) { 
+  foreach my $field ( grep !defined($hashref->{$_}), $self->fields ) { 
     $hashref->{$field}='';
   }
 
-- 
cgit v1.2.1


From fdf946c73617e6b5b4aeccce1259601aef89eb5f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 30 Jun 2002 11:01:27 +0000
Subject: administrivia

---
 ANNOUCE.1.4.0 | 17 +++++++++++++----
 CREDITS       |  5 +++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ANNOUCE.1.4.0 b/ANNOUCE.1.4.0
index f719816e7..15069ee03 100644
--- a/ANNOUCE.1.4.0
+++ b/ANNOUCE.1.4.0
@@ -126,12 +126,21 @@ schema diagram
 
 --
 
-complete bind import and export and edit of dns zone files
+- MySQL is now supported
+
+- BIND import and export and web UI support for editing the zone files.
+  (apply the patch at http://rt.cpan.org/NoAuth/Bug.html?id=508 if 
+   importing zones until upstream release DNS::ZoneParse 0.9)
+
+- Welcome emails
+
+- Working company searches and job queue dependancies
 
 card retry changes (ticket 417)
 
-working company search and job dependancies
+--
+
+- real-time text radius export
 
-welcome emails
+- one-time charges
 
-MySQL!
diff --git a/CREDITS b/CREDITS
index 8f077cd8f..d89f4f564 100644
--- a/CREDITS
+++ b/CREDITS
@@ -101,5 +101,10 @@ Donald Greer <dgreer@austintx.com> provided the SQL to work around MySQL's lack
 of subqueries, and Dale Hege <fhege@lumenexus.net> provided the patches.
 Thanks!
 
+<baloo@gimpgirl.com> sent in several documentation patches.
+
+"Stephen Bechard" <steve@destek.net> sent in patches for svc_www services and
+other fixes.
+
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
-- 
cgit v1.2.1


From 6f8f8741b105fdc1fc005536e6ee0acbd5783793 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 1 Jul 2002 09:15:56 +0000
Subject: real-time! text radius export

---
 FS/FS/part_export/textradius.pm | 126 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 115 insertions(+), 11 deletions(-)

diff --git a/FS/FS/part_export/textradius.pm b/FS/FS/part_export/textradius.pm
index 9a0468f6d..691753f25 100644
--- a/FS/FS/part_export/textradius.pm
+++ b/FS/FS/part_export/textradius.pm
@@ -1,33 +1,37 @@
 package FS::part_export::textradius;
 
-use vars qw(@ISA);
+use vars qw(@ISA $prefix);
+use Fcntl qw(:flock);
+use FS::UID qw(datasrc);
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+$prefix = "/usr/local/etc/freeside/export.";
+
 sub rebless { shift; }
 
 sub _export_insert {
   my($self, $svc_acct) = (shift, shift);
   $err_or_queue = $self->textradius_queue( $svc_acct->svcnum, 'insert',
-    $svc_acct->username, $svc_acct->_password );
+    $svc_acct->username, $svc_acct->radius_check, '-', $svc_acct->radius_reply);
   ref($err_or_queue) ? '' : $err_or_queue;
 }
 
 sub _export_replace {
   my( $self, $new, $old ) = (shift, shift, shift);
-  #return "can't change username with textradius"
-  #  if $old->username ne $new->username;
+  return "can't (yet?) change username with textradius"
+    if $old->username ne $new->username;
   #return '' unless $old->_password ne $new->_password;
-  $err_or_queue = $self->textradius_queue( $new->svcnum,
-    'replace', $new->username, $new->_password );
+  $err_or_queue = $self->textradius_queue( $new->svcnum, 'insert',
+    $new->username, $new->radius_check, '-', $new->radius_reply);
   ref($err_or_queue) ? '' : $err_or_queue;
 }
 
 sub _export_delete {
   my( $self, $svc_acct ) = (shift, shift);
-  $err_or_queue = $self->textradius_queue( $svc_acct->svcnum,
-    'delete', $svc_acct->username );
+  $err_or_queue = $self->textradius_queue( $svc_acct->svcnum, 'delete',
+    $svc_acct->username );
   ref($err_or_queue) ? '' : $err_or_queue;
 }
 
@@ -38,13 +42,113 @@ sub textradius_queue {
     'svcnum' => $svcnum,
     'job'    => "FS::part_export::textradius::textradius_$method",
   };
-  $queue->insert( @_ ) or $queue;
+  $queue->insert(
+    $self->option('user'),
+    $self->machine,
+    $self->option('users'),
+    @_,
+  ) or $queue;
 }
 
 sub textradius_insert { #subroutine, not method
+  my( $user, $host, $users, $username, @attributes ) = @_;
+
+  #silly arg processing
+  my($att, @check);
+  push @check, $att while ($att=shift @attributes) ne '-';
+  my %check = @check;
+  my %reply = @attributes;
+
+  my $file = textradius_download($user, $host, $users);
+
+  eval "use RADIUS::UserFile;";
+  die $@ if $@;
+
+  my $userfile = new RADIUS::UserFile(
+    File        => $file,
+    Who         => [ $username ],
+    Check_Items => [ keys %check ],
+  ) or die "error parsing $file";
+
+  $userfile->remove($username);
+  $userfile->add(
+    Who        => $username,
+    Attributes => { %check, %reply },
+    Comment    => 'user added by Freeside',
+  ) or die "error adding to $file";
+
+  $userfile->update( Who => [ $username ] )
+    or die "error updating $file";
+
+  textradius_upload($user, $host, $users);
+
 }
-sub textradius_replace { #subroutine, not method
-}
+
 sub textradius_delete { #subroutine, not method
+  my( $user, $host, $users, $username ) = @_;
+
+  my $file = textradius_download($user, $host, $users);
+
+  eval "use RADIUS::UserFile;";
+  die $@ if $@;
+
+  my $userfile = new RADIUS::UserFile(
+    File        => $file,
+    Who         => [ $username ],
+  ) or die "error parsing $file";
+
+  $userfile->remove($username);
+
+  $userfile->update( Who => [ $username ] )
+    or die "error updating $file";
+
+  textradius_upload($user, $host, $users);
+}
+
+sub textradius_download {
+  my( $user, $host, $users ) = @_;
+
+  my $dir = $prefix. datasrc;
+  mkdir $dir, 0700 or die $! unless -d $dir;
+  $dir .= "/$host";
+  mkdir $dir, 0700 or die $! unless -d $dir;
+
+  my $dest = "$dir/users";
+
+  eval "use File::Rsync;";
+  die $@ if $@;
+  my $rsync = File::Rsync->new({ rsh => 'ssh' });
+
+  open(LOCK, "+>>$dest.lock")
+    and flock(LOCK,LOCK_EX)
+      or die "can't open $dest.lock: $!";
+
+  $rsync->exec( {
+    src  => "$user\@$host:$users",
+    dest => $dest,
+  } );
+
+  $dest;
+}
+
+sub textradius_upload {
+  my( $user, $host, $users ) = @_;
+
+  my $dir = $prefix. datasrc. "/$host";
+
+  eval "use File::Rsync;";
+  die $@ if $@;
+  my $rsync = File::Rsync->new({
+    rsh => 'ssh',
+    #dry_run => 1,
+  });
+  $rsync->exec( {
+    src  => "$dir/users",
+    dest => "$user\@$host:$users",
+  } );
+
+  flock(LOCK,LOCK_UN);
+  close LOCK;
+
 }
 
-- 
cgit v1.2.1


From 3b7715909d2f2983a077ff97ff66faac40cb9558 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 1 Jul 2002 22:38:21 +0000
Subject: prevent any possible infinite looping

---
 FS/FS/part_export/textradius.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export/textradius.pm b/FS/FS/part_export/textradius.pm
index 691753f25..de0158b50 100644
--- a/FS/FS/part_export/textradius.pm
+++ b/FS/FS/part_export/textradius.pm
@@ -55,7 +55,7 @@ sub textradius_insert { #subroutine, not method
 
   #silly arg processing
   my($att, @check);
-  push @check, $att while ($att=shift @attributes) ne '-';
+  push @check, $att while @attributes && ($att=shift @attributes) ne '-';
   my %check = @check;
   my %reply = @attributes;
 
-- 
cgit v1.2.1


From eb783504f4b23a30e2391269283e565e04e9aece Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Jul 2002 06:48:59 +0000
Subject: error messages can have other chars

---
 FS/FS/queue.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index 1de19b7b5..d35dc883f 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -196,7 +196,7 @@ sub check {
     || $self->ut_anything('job')
     || $self->ut_numbern('_date')
     || $self->ut_enum('status',['', qw( new locked failed )])
-    || $self->ut_textn('statustext')
+    || $self->ut_anything('statustext')
     || $self->ut_numbern('svcnum')
   ;
   return $error if $error;
@@ -385,7 +385,7 @@ END
 
 =head1 VERSION
 
-$Id: queue.pm,v 1.14 2002-06-14 11:22:53 ivan Exp $
+$Id: queue.pm,v 1.15 2002-07-02 06:48:59 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From b57dbad22a76abc65dc73745990dca5e8bfe9411 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Jul 2002 06:58:27 +0000
Subject: s/options/option/, oops, and machine isn't an option

---
 FS/FS/part_export/shellcommands.pm     | 8 ++++----
 FS/FS/part_export/www_shellcommands.pm | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 870d7f1ee..e95939b8c 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -24,8 +24,8 @@ sub _export_command {
   no strict 'refs';
   ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
   $self->shellcommands_queue( $svc_acct->svcnum,
-    user         => $self->options('user')||'root',
-    host         => $self->options('machine'),
+    user         => $self->option('user')||'root',
+    host         => $self->machine,
     command      => eval(qq("$command")),
     stdin_string => eval(qq("$stdin")),
   );
@@ -39,8 +39,8 @@ sub _export_replace {
   ${"old_$_"} = $old->getfield($_) foreach $old->fields;
   ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   $self->shellcommands_queue( $new->svcnum,
-    user         => $self->options('user')||'root',
-    host         => $self->options('machine'),
+    user         => $self->option('user')||'root',
+    host         => $self->machine,
     command      => eval(qq("$command")),
     stdin_string => eval(qq("$stdin")),
   );
diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index 870d7f1ee..e95939b8c 100644
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -24,8 +24,8 @@ sub _export_command {
   no strict 'refs';
   ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
   $self->shellcommands_queue( $svc_acct->svcnum,
-    user         => $self->options('user')||'root',
-    host         => $self->options('machine'),
+    user         => $self->option('user')||'root',
+    host         => $self->machine,
     command      => eval(qq("$command")),
     stdin_string => eval(qq("$stdin")),
   );
@@ -39,8 +39,8 @@ sub _export_replace {
   ${"old_$_"} = $old->getfield($_) foreach $old->fields;
   ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   $self->shellcommands_queue( $new->svcnum,
-    user         => $self->options('user')||'root',
-    host         => $self->options('machine'),
+    user         => $self->option('user')||'root',
+    host         => $self->machine,
     command      => eval(qq("$command")),
     stdin_string => eval(qq("$stdin")),
   );
-- 
cgit v1.2.1


From 6dcf9258234427eb6cd6ad3e9912c4f1dac91ceb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Jul 2002 07:13:28 +0000
Subject: better error reporting from rsync

---
 FS/FS/part_export/textradius.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/textradius.pm b/FS/FS/part_export/textradius.pm
index de0158b50..74807878b 100644
--- a/FS/FS/part_export/textradius.pm
+++ b/FS/FS/part_export/textradius.pm
@@ -126,7 +126,7 @@ sub textradius_download {
   $rsync->exec( {
     src  => "$user\@$host:$users",
     dest => $dest,
-  } );
+  } ) or die "error downloading $user\@$host:$users : ". $rsync->err;
 
   $dest;
 }
@@ -145,7 +145,7 @@ sub textradius_upload {
   $rsync->exec( {
     src  => "$dir/users",
     dest => "$user\@$host:$users",
-  } );
+  } ) or die "error uploading to $user\@$host:$users : ". $rsync->err;
 
   flock(LOCK,LOCK_UN);
   close LOCK;
-- 
cgit v1.2.1


From 4c9602a986e835d56471a090afe8e5bd8fae5108 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Jul 2002 07:31:42 +0000
Subject: working textradius

---
 FS/FS/part_export/textradius.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/FS/FS/part_export/textradius.pm b/FS/FS/part_export/textradius.pm
index 74807878b..c96bcfc48 100644
--- a/FS/FS/part_export/textradius.pm
+++ b/FS/FS/part_export/textradius.pm
@@ -43,7 +43,7 @@ sub textradius_queue {
     'job'    => "FS::part_export::textradius::textradius_$method",
   };
   $queue->insert(
-    $self->option('user'),
+    $self->option('user')||'root',
     $self->machine,
     $self->option('users'),
     @_,
@@ -126,7 +126,8 @@ sub textradius_download {
   $rsync->exec( {
     src  => "$user\@$host:$users",
     dest => $dest,
-  } ) or die "error downloading $user\@$host:$users : ". $rsync->err;
+  } ) or die "error downloading $user\@$host:$users : ".
+             join(" / ", $rsync->err);
 
   $dest;
 }
@@ -145,7 +146,8 @@ sub textradius_upload {
   $rsync->exec( {
     src  => "$dir/users",
     dest => "$user\@$host:$users",
-  } ) or die "error uploading to $user\@$host:$users : ". $rsync->err;
+  } ) or die "error uploading to $user\@$host:$users : ".
+             join(" / ", $rsync->err);
 
   flock(LOCK,LOCK_UN);
   close LOCK;
-- 
cgit v1.2.1


From 72395edddb5a3887092b51056d719584f7979005 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Jul 2002 09:39:04 +0000
Subject: freebsd is sofa king broken

---
 FS/bin/freeside-queued | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 42d00cebe..4ddc70a48 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -36,8 +36,13 @@ $sigint = 0;
 $SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $sigint++; };
 $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
 
-$> = $FS::UID::freeside_uid unless $>;
-$< = $>;
+$< = FS::UID::freeside_uid;
+
+#freebsd is sofa king broken, won't setuid()
+$> = $FS::UID::freeside_uid;
+($<,$>) = ($>,$<);
+$> = $FS::UID::freeside_uid;
+
 $ENV{HOME} = (getpwuid($>))[7]; #for ssh
 adminsuidsetup $user;
 
-- 
cgit v1.2.1


From cc9c574e5f772917515e85a5c07ce263a8552a03 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Jul 2002 09:42:38 +0000
Subject: fleabsd grr

---
 FS/bin/freeside-queued | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 4ddc70a48..46d39f2b0 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -36,7 +36,7 @@ $sigint = 0;
 $SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $sigint++; };
 $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
 
-$< = FS::UID::freeside_uid;
+$< = $FS::UID::freeside_uid;
 
 #freebsd is sofa king broken, won't setuid()
 $> = $FS::UID::freeside_uid;
-- 
cgit v1.2.1


From 26a45c49727ef4505a2f1875aa7dd04be9bbdceb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Jul 2002 10:01:00 +0000
Subject: freeside group

---
 httemplate/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 1f271e6d2..db2141619 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -56,7 +56,7 @@ Before installing, you need:
 </ul>
 Install the Freeside distribution:
 <ul>
-  <li>Add the user `freeside' to your system.
+  <li>Add the user and group `freeside' to your system.
   <li>Allow the freeside user full access to the freeside database.
     <ul>
       <li> with <a href="http://www.postgresql.org/users-lounge/docs/7.1/postgres/user-manag.html#DATABASE-USERS">PostgreSQL</a>:
-- 
cgit v1.2.1


From 00613fa78edb718fdc96640fe08d806079a81ad2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Jul 2002 10:14:45 +0000
Subject: grr old openssh grr freebsd

---
 FS/bin/freeside-queued | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 46d39f2b0..20a6ff9fb 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -36,10 +36,17 @@ $sigint = 0;
 $SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $sigint++; };
 $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
 
-$< = $FS::UID::freeside_uid;
+my $freeside_gid = scalar(getgrnam('freeside'))
+  or die "can't setgid to freeside group\n";
+$) = $freeside_gid;
+$( = $freeside_gid;
+#if freebsd can't setuid(), presumably it can't setgid() either.  grr fleabsd
+($<,$>) = ($>,$<);
+$> = $freeside_gid;
 
-#freebsd is sofa king broken, won't setuid()
 $> = $FS::UID::freeside_uid;
+$< = $FS::UID::freeside_uid;
+#freebsd is sofa king broken, won't setuid()
 ($<,$>) = ($>,$<);
 $> = $FS::UID::freeside_uid;
 
-- 
cgit v1.2.1


From 7308f9eeb141bab0f550cce772a42f18a5cc7319 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Jul 2002 11:27:53 +0000
Subject: useful shellcommands presets

---
 FS/FS/part_export.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 23f948f6a..072074b96 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -675,7 +675,7 @@ tie my %sqlmail_options, 'Tie::IxHash',
       'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
       'options' => \%shellcommands_options,
       'nodomain' => 'Y',
-      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.',
+      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -d $dir -m -s $shell -u $uid $username; passwd $username"; this.form.useradd_stdin.value = "$_password\n$_password\n"; this.form.userdel.value = "userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -d $new_dir -l $new_username -s $new_shell -u $new_uid $old_username; passwd $new_username"; this.form.usermod_stdin.value = "$_password\n$_password\n";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid; passwd $username"; this.form.useradd_stdin.value = "$_password\n$_password\n"; this.form.userdel.value = "userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -l $new_username -s $new_shell -u $new_uid; passwd $new_username"; this.form.usermod_stdin.value = "$_password\n$_password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>',
     },
 
     'shellcommands_withdomain' => {
@@ -765,7 +765,7 @@ tie my %sqlmail_options, 'Tie::IxHash',
     'www_shellcommands' => {
       'desc'    => 'www_shellcommands',
       'options' => {}, # \%www_shellcommands_options,
-      'notes'   => 'svc_www commands',
+      'notes'   => 'unfinished...',
     },
 
   },
-- 
cgit v1.2.1


From c0ab97dcaeae4c1f6426f8020f2d84639fa08bcd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Jul 2002 11:29:26 +0000
Subject: fix for freebsd presets

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 072074b96..e02575810 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -675,7 +675,7 @@ tie my %sqlmail_options, 'Tie::IxHash',
       'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
       'options' => \%shellcommands_options,
       'nodomain' => 'Y',
-      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -d $dir -m -s $shell -u $uid $username; passwd $username"; this.form.useradd_stdin.value = "$_password\n$_password\n"; this.form.userdel.value = "userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -d $new_dir -l $new_username -s $new_shell -u $new_uid $old_username; passwd $new_username"; this.form.usermod_stdin.value = "$_password\n$_password\n";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid; passwd $username"; this.form.useradd_stdin.value = "$_password\n$_password\n"; this.form.userdel.value = "userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -l $new_username -s $new_shell -u $new_uid; passwd $new_username"; this.form.usermod_stdin.value = "$_password\n$_password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>',
+      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -d $dir -m -s $shell -u $uid $username; passwd $username"; this.form.useradd_stdin.value = "$_password\n$_password\n"; this.form.userdel.value = "userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -d $new_dir -l $new_username -s $new_shell -u $new_uid $old_username; passwd $new_username"; this.form.usermod_stdin.value = "$_password\n$_password\n";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid; passwd $username"; this.form.useradd_stdin.value = "$_password\n$_password\n"; this.form.userdel.value = "pw userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -l $new_username -s $new_shell -u $new_uid; passwd $new_username"; this.form.usermod_stdin.value = "$_password\n$_password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>',
     },
 
     'shellcommands_withdomain' => {
-- 
cgit v1.2.1


From cd5d6c049041ee198e38687e7dd0a63f3d21b2ef Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Jul 2002 13:00:25 +0000
Subject: working linux and freebsd shellcommands

---
 FS/FS/part_export.pm               | 10 +++++-----
 FS/FS/part_export/shellcommands.pm |  8 +++++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index e02575810..157924813 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -526,12 +526,12 @@ tie my %shellcommands_options, 'Tie::IxHash',
   #'machine' => { label=>'Remote machine' },
   'user' => { label=>'Remote username', default=>'root' },
   'useradd' => { label=>'Insert command',
-                 default=>'useradd -d $dir -m -s $shell -u $uid $username; passwd $username'
+                 default=>'useradd -d $dir -m -s $shell -u $uid -p $crypt_password $username'
                 #default=>'cp -pr /etc/skel $dir; chown -R $uid.$gid $dir'
                },
   'useradd_stdin' => { label=>'Insert command STDIN',
                        type =>'textarea',
-                       default=>"\$_password\n\$_password\n",
+                       default=>"",
                      },
   'userdel' => { label=>'Delete command',
                  default=>'userdel $username',
@@ -542,7 +542,7 @@ tie my %shellcommands_options, 'Tie::IxHash',
                        default=>'',
                      },
   'usermod' => { label=>'Modify command',
-                 default=>'usermod -d $new_dir -l $new_username -s $new_shell -u $new_uid $old_username; passwd $new_username',
+                 default=>'usermod -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username',
                 #default=>'[ -d $old_dir ] && mv $old_dir $new_dir || ( '.
                  #  'chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; '.
                  #  'find . -depth -print | cpio -pdm $new_dir; '.
@@ -552,7 +552,7 @@ tie my %shellcommands_options, 'Tie::IxHash',
                },
   'usermod_stdin' => { label=>'Modify command STDIN',
                        type =>'textarea',
-                       default=>"\$_password\n\$_password\n",
+                       default=>"",
                      },
 ;
 
@@ -675,7 +675,7 @@ tie my %sqlmail_options, 'Tie::IxHash',
       'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
       'options' => \%shellcommands_options,
       'nodomain' => 'Y',
-      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -d $dir -m -s $shell -u $uid $username; passwd $username"; this.form.useradd_stdin.value = "$_password\n$_password\n"; this.form.userdel.value = "userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -d $new_dir -l $new_username -s $new_shell -u $new_uid $old_username; passwd $new_username"; this.form.usermod_stdin.value = "$_password\n$_password\n";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid; passwd $username"; this.form.useradd_stdin.value = "$_password\n$_password\n"; this.form.userdel.value = "pw userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -l $new_username -s $new_shell -u $new_uid; passwd $new_username"; this.form.usermod_stdin.value = "$_password\n$_password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>',
+      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = "";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "pw userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -h 0"; this.form.usermod_stdin.value = "$_password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>',
     },
 
     'shellcommands_withdomain' => {
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index e95939b8c..4e943605f 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -1,10 +1,12 @@
 package FS::part_export::shellcommands;
 
-use vars qw(@ISA);
+use vars qw(@ISA @saltset);
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+
 sub rebless { shift; }
 
 sub _export_insert {
@@ -23,6 +25,8 @@ sub _export_command {
   my $stdin = $self->option($action."_stdin");
   no strict 'refs';
   ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
+  $crypt_password = crypt( $svc_acct->_password,
+                           $saltset[int(rand(64))].$saltset[int(rand(64))] );
   $self->shellcommands_queue( $svc_acct->svcnum,
     user         => $self->option('user')||'root',
     host         => $self->machine,
@@ -38,6 +42,8 @@ sub _export_replace {
   no strict 'refs';
   ${"old_$_"} = $old->getfield($_) foreach $old->fields;
   ${"new_$_"} = $new->getfield($_) foreach $new->fields;
+  $new_crypt_password = crypt( $svc_acct->_password,
+                               $saltset[int(rand(64))].$saltset[int(rand(64))]);
   $self->shellcommands_queue( $new->svcnum,
     user         => $self->option('user')||'root',
     host         => $self->machine,
-- 
cgit v1.2.1


From 9db8ce085c415b8f3ea76cd7daf76723d0edb2a3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Jul 2002 13:04:57 +0000
Subject: no warnings

---
 FS/FS/part_export/shellcommands.pm | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 4e943605f..56cd569af 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -23,10 +23,13 @@ sub _export_command {
   my ( $self, $action, $svc_acct) = (shift, shift, shift);
   my $command = $self->option($action);
   my $stdin = $self->option($action."_stdin");
-  no strict 'refs';
-  ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
+  {
+    no strict 'refs';
+    ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
+  }
+  $crypt_password = ''; #surpress "used only once" warnings
   $crypt_password = crypt( $svc_acct->_password,
-                           $saltset[int(rand(64))].$saltset[int(rand(64))] );
+                             $saltset[int(rand(64))].$saltset[int(rand(64))] );
   $self->shellcommands_queue( $svc_acct->svcnum,
     user         => $self->option('user')||'root',
     host         => $self->machine,
@@ -39,10 +42,13 @@ sub _export_replace {
   my($self, $new, $old ) = (shift, shift, shift);
   my $command = $self->option('usermod');
   my $stdin = $self->option('usermod_stdin');
-  no strict 'refs';
-  ${"old_$_"} = $old->getfield($_) foreach $old->fields;
-  ${"new_$_"} = $new->getfield($_) foreach $new->fields;
-  $new_crypt_password = crypt( $svc_acct->_password,
+  {
+    no strict 'refs';
+    ${"old_$_"} = $old->getfield($_) foreach $old->fields;
+    ${"new_$_"} = $new->getfield($_) foreach $new->fields;
+  }
+  $new_crypt_password = ''; #surpress "used only once" warnings
+  $new_crypt_password = crypt( $new->_password,
                                $saltset[int(rand(64))].$saltset[int(rand(64))]);
   $self->shellcommands_queue( $new->svcnum,
     user         => $self->option('user')||'root',
-- 
cgit v1.2.1


From 7f287d73e800f953c98b51401aa286b173b4dbfe Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Jul 2002 13:22:08 +0000
Subject: ui s/ /&nbsp;

---
 httemplate/view/cust_main.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 479648183..98b6331ed 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -604,10 +604,10 @@ foreach my $item (sort keyfield_numerically @history) {
         ( $charge ? "\$".sprintf("%.2f",$charge) : '' ),
         "</FONT></TD>",
 	"<TD><FONT SIZE=-1>",
-        ( $payment ? "- \$".sprintf("%.2f",$payment) : '' ),
+        ( $payment ? "-&nbsp;\$".sprintf("%.2f",$payment) : '' ),
         "</FONT></TD>",
 	"<TD><FONT SIZE=-1>",
-        ( $credit ? "- \$".sprintf("%.2f",$credit) : '' ),
+        ( $credit ? "-&nbsp;\$".sprintf("%.2f",$credit) : '' ),
         "</FONT></TD>",
 	"<TD><FONT SIZE=-1>",
         ( $refund ? "\$".sprintf("%.2f",$refund) : '' ),
-- 
cgit v1.2.1


From 0d9e6fc32b9fc3b3a05c2bf0446ee57d484e79a9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Jul 2002 14:00:37 +0000
Subject: better diagnostics

---
 FS/FS/part_export/textradius.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/textradius.pm b/FS/FS/part_export/textradius.pm
index c96bcfc48..450a0e57b 100644
--- a/FS/FS/part_export/textradius.pm
+++ b/FS/FS/part_export/textradius.pm
@@ -127,7 +127,9 @@ sub textradius_download {
     src  => "$user\@$host:$users",
     dest => $dest,
   } ) or die "error downloading $user\@$host:$users : ".
-             join(" / ", $rsync->err);
+             'exit status: '. $rsync->status. ', '.
+             'STDERR: '. join(" / ", $rsync->err). ', '.
+             'STDOUT: '. join(" / ", $rsync->out);
 
   $dest;
 }
@@ -147,7 +149,9 @@ sub textradius_upload {
     src  => "$dir/users",
     dest => "$user\@$host:$users",
   } ) or die "error uploading to $user\@$host:$users : ".
-             join(" / ", $rsync->err);
+             'exit status: '. $rsync->status. ', '.
+             'STDERR: '. join(" / ", $rsync->err). ', '.
+             'STDOUT: '. join(" / ", $rsync->out);
 
   flock(LOCK,LOCK_UN);
   close LOCK;
-- 
cgit v1.2.1


From d5ae9f38bdea9e3de50f76aa8caf06956b4fb706 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Jul 2002 14:22:21 +0000
Subject: working textradius export

---
 FS/FS/part_export/textradius.pm | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/FS/FS/part_export/textradius.pm b/FS/FS/part_export/textradius.pm
index 450a0e57b..1492f2672 100644
--- a/FS/FS/part_export/textradius.pm
+++ b/FS/FS/part_export/textradius.pm
@@ -126,10 +126,13 @@ sub textradius_download {
   $rsync->exec( {
     src  => "$user\@$host:$users",
     dest => $dest,
-  } ) or die "error downloading $user\@$host:$users : ".
-             'exit status: '. $rsync->status. ', '.
-             'STDERR: '. join(" / ", $rsync->err). ', '.
-             'STDOUT: '. join(" / ", $rsync->out);
+  } ); # true/false return value from exec is not working, alas
+  if ( $rsync->err ) {
+    die "error downloading $user\@$host:$users : ".
+        'exit status: '. $rsync->status. ', '.
+        'STDERR: '. join(" / ", $rsync->err). ', '.
+        'STDOUT: '. join(" / ", $rsync->out);
+  }
 
   $dest;
 }
@@ -148,10 +151,13 @@ sub textradius_upload {
   $rsync->exec( {
     src  => "$dir/users",
     dest => "$user\@$host:$users",
-  } ) or die "error uploading to $user\@$host:$users : ".
-             'exit status: '. $rsync->status. ', '.
-             'STDERR: '. join(" / ", $rsync->err). ', '.
-             'STDOUT: '. join(" / ", $rsync->out);
+  } ); # true/false return value from exec is not working, alas
+  if ( $rsync->err ) {
+    die "error uploading to $user\@$host:$users : ".
+        'exit status: '. $rsync->status. ', '.
+        'STDERR: '. join(" / ", $rsync->err). ', '.
+        'STDOUT: '. join(" / ", $rsync->out);
+  }
 
   flock(LOCK,LOCK_UN);
   close LOCK;
-- 
cgit v1.2.1


From 0cea641b4403522b434d4fc30c6145f76d7d3333 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Jul 2002 14:37:48 +0000
Subject: beta1!!

---
 Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 66c83a0f5..3f5e18d47 100644
--- a/Makefile
+++ b/Makefile
@@ -27,10 +27,10 @@ QUEUED_USER=ivan
 #eventually this shouldn't be needed
 FREESIDE_PATH = `pwd`
 
-PASSWD_USER = ivan
+PASSWD_USER = nostart
 PASSWD_MACHINE = localhost
 
-SIGNUP_USER = ivan
+SIGNUP_USER = nostart
 SIGNUP_MACHINE = localhost
 SIGNUP_AGENTNUM = 2
 SIGNUP_REFNUM = 2
@@ -40,10 +40,10 @@ SIGNUP_REFNUM = 2
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.4.0pre14
-TAG=freeside_1_4_0_pre14
-#VERSION=1.4.0beta1
-#TAG=freeside_1_4_0_beta1
+#VERSION=1.4.0pre14
+#TAG=freeside_1_4_0_pre14
+VERSION=1.4.0beta1
+TAG=freeside_1_4_0_beta1
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
-- 
cgit v1.2.1


From 6f94603f9af13a868c52880357403dec0f88befd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Jul 2002 14:38:55 +0000
Subject: beta1!

---
 ANNOUCE.1.4.0 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ANNOUCE.1.4.0 b/ANNOUCE.1.4.0
index 15069ee03..8e6dd61a5 100644
--- a/ANNOUCE.1.4.0
+++ b/ANNOUCE.1.4.0
@@ -144,3 +144,9 @@ card retry changes (ticket 417)
 
 - one-time charges
 
+- found "must start freeside-queued as freeside" problem on freebsd.
+  freeside-queued now compatible with freebsd, old openssh, mysql...
+
+- shellcommands now works! has defaults for freebsd, linux, netbsd, just directories, etc.
+
+- real-time textradius export!
-- 
cgit v1.2.1


From ee94f6beec79b0b92ef05152ed3cca96e8b31cdc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Jul 2002 23:03:30 +0000
Subject: fix usermod commands for freebsd

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 157924813..d15a87986 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -675,7 +675,7 @@ tie my %sqlmail_options, 'Tie::IxHash',
       'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
       'options' => \%shellcommands_options,
       'nodomain' => 'Y',
-      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = "";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "pw userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -h 0"; this.form.usermod_stdin.value = "$_password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>',
+      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = "";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "pw userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -h 0"; this.form.usermod_stdin.value = "$new__password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>',
     },
 
     'shellcommands_withdomain' => {
-- 
cgit v1.2.1


From 96d1ff9741744ce60dbc123fa92ec794dbac2d17 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 01:01:26 +0000
Subject: fix usage message

---
 FS/bin/freeside-sqlradius-reset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-sqlradius-reset b/FS/bin/freeside-sqlradius-reset
index 41f3358f6..9cb2e2905 100755
--- a/FS/bin/freeside-sqlradius-reset
+++ b/FS/bin/freeside-sqlradius-reset
@@ -46,7 +46,7 @@ foreach my $export ( @exports ) {
 
 sub usage {
   #die "Usage:\n\n  sqlradius_reset user machine\n";
-  die "Usage:\n\n  sqlradius_reset user\n";
+  die "Usage:\n\n  freeside-sqlradius-reset user\n";
 }
 
 =head1 NAME
-- 
cgit v1.2.1


From 8b8a9f09b5072db2af7f08d49d916b91f0b1bac7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 01:05:24 +0000
Subject: pod

---
 FS/bin/freeside-sqlradius-reset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-sqlradius-reset b/FS/bin/freeside-sqlradius-reset
index 9cb2e2905..9d3a6a700 100755
--- a/FS/bin/freeside-sqlradius-reset
+++ b/FS/bin/freeside-sqlradius-reset
@@ -66,7 +66,7 @@ B<username> is a username added by freeside-adduser.
 
 =head1 SEE ALSO
 
-<FS::part_export>, L<FS::part_export::sqlradius>
+L<freeside-reexport>, L<FS::part_export>, L<FS::part_export::sqlradius>
 
 =cut
 
-- 
cgit v1.2.1


From b3ea4da977be6a246a61852be9cd40a5b0a11dfe Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 01:47:06 +0000
Subject: freeside-reexport

---
 FS/MANIFEST              |  1 +
 FS/bin/freeside-reexport | 62 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 FS/bin/freeside-reexport

diff --git a/FS/MANIFEST b/FS/MANIFEST
index c932f3aa0..d9860b15f 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -16,6 +16,7 @@ bin/freeside-tax-report
 bin/freeside-cc-receipts-report
 bin/freeside-credit-report
 bin/freeside-expiration-alerter
+bin/freeside-reexport
 FS.pm
 FS/CGI.pm
 FS/Conf.pm
diff --git a/FS/bin/freeside-reexport b/FS/bin/freeside-reexport
new file mode 100644
index 000000000..b5c50a422
--- /dev/null
+++ b/FS/bin/freeside-reexport
@@ -0,0 +1,62 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::part_export;
+use FS::svc_acct;
+use FS::cust_svc;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+my $export_x = shift or die &usage;
+my @part_export;
+if ( $export_x =~ /^(\d+)$/ ) {
+  @part_export = qsearchs('part_export', { exportnum=>$1 } )
+    or die "exportnum $export_x not found\n";
+} else {
+  @part_export = qsearch('part_export', { exporttype=>$export_x } )
+    or die "no exports of type $export_x found\n";
+}
+
+my $svc_something = shift or die &usage;
+my $svc_x;
+if ( $svc_something =~ /^(\d+)$/ ) {
+  my $cust_svc = qsearchs('cust_svc', { svcnum=>$1 } )
+    or die "svcnum $svc_something not found\n";
+  $svc_x = $cust_svc->svc_x;
+} else {
+  $svc_x = qsearchs('svc_acct', { username=>$svc_something } )
+    or die "username $svc_something not found\n";
+}
+
+foreach my $part_export ( @part_export ) {
+  my $error = $part_export->export_insert($svc_x);
+  die $error if $error;
+}
+
+
+sub usage {
+  die "Usage:\n\n  freeside-reexport user exportnum|exporttype svcnum|username\n";
+}
+
+=head1 NAME
+
+freeside-reexport - Command line tool to re-trigger export jobs for existing services
+
+=head1 SYNOPSIS
+
+  freeside-reexport user exportnum|exporttype svcnum|username
+
+=head1 DESCRIPTION
+
+  Re-queues the export job for the specified exportnum or exporttype(s) and
+  specified service (selected by svcnum or username).
+
+=head1 SEE ALSO
+
+L<freeside-sqlradius-reset>, L<FS::part_export>
+
+=cut
+
-- 
cgit v1.2.1


From e1ef1693e6942bbf82ee088f782d871a3b5eefee Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 02:26:00 +0000
Subject: deprecate text radius config options update config docs

---
 FS/FS/Conf.pm                     | 20 ++++++++++----------
 httemplate/config/config-view.cgi |  4 ++--
 httemplate/config/config.cgi      |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index dbb3682d0..25c674301 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -348,7 +348,7 @@ httemplate/docs/config.html
   {
     'key'         => 'editreferrals',
     'section'     => 'UI',
-    'description' => 'Enable referral modification for existing customers',
+    'description' => 'Enable advertising source modification for existing customers',
     'type'       => 'checkbox',
   },
 
@@ -404,28 +404,28 @@ httemplate/docs/config.html
   {
     'key'         => 'icradiusmachines',
     'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>sqlradius</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to enable radcheck and radreply table population - by default in the Freeside database, or in the database specified by the <a href="http://rootwood.haze.st/aspside/config/config-view.cgi#icradius_secrets">icradius_secrets</a> config option (the radcheck and radreply tables needs to be created manually).  You do not need to use MySQL for your Freeside database to export to an ICRADIUS/FreeRADIUS MySQL database with this option.  <blockquote><b>ADDITIONAL DEPRECATED FUNCTIONALITY</b> (instead use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or point icradius_secrets to the external database) - your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines or <a href="http://www.freeradius.org/">FreeRADIUS</a> (with MySQL authentication) machines, one per line.  Machines listed in this file will have the radcheck table exported to them.  Each line should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: <CODE>"radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd"</CODE></blockquote>',
+    'description' => '<b>DEPRECATED</b>, add an <i>sqlradius</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to enable radcheck and radreply table population - by default in the Freeside database, or in the database specified by the <a href="http://rootwood.haze.st/aspside/config/config-view.cgi#icradius_secrets">icradius_secrets</a> config option (the radcheck and radreply tables needs to be created manually).  You do not need to use MySQL for your Freeside database to export to an ICRADIUS/FreeRADIUS MySQL database with this option.  <blockquote><b>ADDITIONAL DEPRECATED FUNCTIONALITY</b> (instead use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or point icradius_secrets to the external database) - your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines or <a href="http://www.freeradius.org/">FreeRADIUS</a> (with MySQL authentication) machines, one per line.  Machines listed in this file will have the radcheck table exported to them.  Each line should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: <CODE>"radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd"</CODE></blockquote>',
     'type'        => [qw( checkbox textarea )],
   },
 
   {
     'key'         => 'icradius_mysqldest',
     'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b> (instead use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or point icradius_secrets to the external database) - Destination directory for the MySQL databases, on the ICRADIUS/FreeRADIUS machines.  Defaults to "/usr/local/var/".',
+    'description' => '<b>DEPRECATED</b>, add an <i>sqlradius</i> https://billing.crosswind.net/freeside/browse/part_export.cgi">export</a> instead.  Used to be the destination directory for the MySQL databases, on the ICRADIUS/FreeRADIUS machines.  Defaults to "/usr/local/var/".',
     'type'        => 'text',
   },
 
   {
     'key'         => 'icradius_mysqlsource',
     'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b> (instead use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or point icradius_secrets to the external database) - Source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".',
+    'description' => '<b>DEPRECATED</b>, add an <i>sqlradius</i> https://billing.crosswind.net/freeside/browse/part_export.cgi">export</a> instead.  Used to be the source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".',
     'type'        => 'text',
   },
 
   {
     'key'         => 'icradius_secrets',
     'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add <i>sqlradius</i> exports to <a href="../browse/part_svc">Service definitions</a> instead.  This option used to specify a database for ICRADIUS/FreeRADIUS export.  Three lines: DBI data source, username and password.',
+    'description' => '<b>DEPRECATED</b>, add an <i>sqlradius</i> https://billing.crosswind.net/freeside/browse/part_export.cgi">export</a> instead.  This option used to specify a database for ICRADIUS/FreeRADIUS export.  Three lines: DBI data source, username and password.',
     'type'        => 'textarea',
   },
 
@@ -534,8 +534,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'radiusmachines',
-    'section'     => 'radius',
-    'description' => 'Your RADIUS authentication machines, one per line.  This enables export of `/etc/raddb/users\'.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add an <i>sqlradius</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to export to be: your RADIUS authentication machines, one per line.  This enables export of `/etc/raddb/users\'.',
     'type'        => 'textarea',
   },
 
@@ -717,15 +717,15 @@ httemplate/docs/config.html
 
   {
     'key'         => 'radiusprepend',
-    'section'     => 'radius',
-    'description' => 'The contents will be prepended to the top of the RADIUS users file (text exports only).',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, real-time text radius now edits an existing file in place - just (turn off freeside-queued and) edit your RADIUS users file directly.  The contents used to be be prepended to the top of the RADIUS users file (text exports only).',
     'type'        => 'textarea',
   },
 
   {
     'key'         => 'textradiusprepend',
     'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, use RADIUS check attributes instead.  This option will be removed soon.  The contents will be prepended to the first line of a user\'s RADIUS entry in text exports.',
+    'description' => '<b>DEPRECATED</b>, use RADIUS check attributes instead.  The contents used to be prepended to the first line of a user\'s RADIUS entry in text exports.',
     'type'        => 'text',
   },
 
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index f0ae2b2fd..bafe5a8e7 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -5,13 +5,13 @@
 <% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
 
 <% foreach my $section ( qw(required billing username password UI session
-                            shell mail radius apache BIND
+                            shell mail apache BIND
                            ),
                          '', 'deprecated') { %>
   <A NAME="<%= $section || 'unclassified' %>"></A>
   <FONT SIZE="-2">
   <% foreach my $nav_section ( qw(required billing username password UI session
-                                  shell mail radius apache BIND
+                                  shell mail apache BIND
                                  ),
                                '', 'deprecated') { %>
     <% if ( $section eq $nav_section ) { %>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 2817e5f84..c050a19ab 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -25,13 +25,13 @@ function SafeOnsubmit() {
 <form name="OneTrueForm" action="config-process.cgi" METHOD="POST" onSubmit="SafeOnsubmit()">
 
 <% foreach my $section ( qw(required billing username password UI session
-                            shell mail radius apache BIND
+                            shell mail apache BIND
                            ),
                          '', 'deprecated') { %>
   <A NAME="<%= $section || 'unclassified' %>"></A>
   <FONT SIZE="-2">
   <% foreach my $nav_section ( qw(required billing username password UI session
-                                  shell mail radius apache BIND
+                                  shell mail apache BIND
                                  ),
                                '', 'deprecated') { %>
     <% if ( $section eq $nav_section ) { %>
-- 
cgit v1.2.1


From 2c9b97801b3981efaf6c65118e3cc1a0368e649c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 03:47:40 +0000
Subject: one-time charges with tax classes

---
 FS/FS/cust_main.pm                       | 12 ++++++++----
 httemplate/edit/part_pkg.cgi             |  1 +
 httemplate/edit/process/quick-charge.cgi |  7 ++++++-
 httemplate/view/cust_main.cgi            | 20 +++++++++++++++++++-
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 9ed3f2cab..6edb6ae8f 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1734,7 +1734,7 @@ sub credit {
   $cust_credit->insert;
 }
 
-=item charge AMOUNT PKG COMMENT
+=item charge AMOUNT [ PKG [ COMMENT [ TAXCLASS ] ] ]
 
 Creates a one-time charge for this customer.  If there is an error, returns
 the error, otherwise returns false.
@@ -1742,7 +1742,10 @@ the error, otherwise returns false.
 =cut
 
 sub charge {
-  my ( $self, $amount, $pkg, $comment ) = @_;
+  my ( $self, $amount ) = @_;
+  my $pkg      = @_ ? shift : 'One-time charge';
+  my $comment  = @_ ? shift : '$'. sprintf("%.2f",$amount);
+  my $taxclass = @_ ? shift : '';
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -1756,12 +1759,13 @@ sub charge {
   my $dbh = dbh;
 
   my $part_pkg = new FS::part_pkg ( {
-    'pkg'      => $pkg || 'One-time charge',
-    'comment'  => $comment || '$'. sprintf("%.2f",$amount),
+    'pkg'      => $pkg,
+    'comment'  => $comment,
     'setup'    => $amount,
     'freq'     => 0,
     'recur'    => '0',
     'disabled' => 'Y',
+    'taxclass' => $taxclass,
   } );
 
   my $error = $part_pkg->insert;
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 19545bd12..08d5dc906 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -89,6 +89,7 @@ print '>';
 print '</TD></TR>';
 
 my $conf = new FS::Conf;
+#false laziness w/ view/cust_main.cgi quick order
 if ( $conf->exists('enable_taxclasses') ) {
   print '<TR><TD ALIGN="right">Tax class</TD><TD><SELECT NAME="taxclass">';
   my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
diff --git a/httemplate/edit/process/quick-charge.cgi b/httemplate/edit/process/quick-charge.cgi
index 49175d848..477f58508 100644
--- a/httemplate/edit/process/quick-charge.cgi
+++ b/httemplate/edit/process/quick-charge.cgi
@@ -12,7 +12,12 @@ my $amount = $1;
 my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
   or die "unknown custnum $custnum";
 
-my $error = $cust_main->charge( $amount, $cgi->param('pkg') );
+my $error = $cust_main->charge(
+  $amount,
+  $cgi->param('pkg'),
+  '$'. sprintf("%.2f",$amount),
+  $cgi->param('taxclass')
+);
 
 if ($error) {
 %>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 98b6331ed..dfa32d3a5 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -272,7 +272,25 @@ print '<BR>'.
   qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
   qq!Description:<INPUT TYPE="text" NAME="pkg">!.
   qq! Amount:<INPUT TYPE="text" NAME="amount" SIZE=6>!.
-  qq!&nbsp;<INPUT TYPE="submit" VALUE="One-time charge"></FORM><BR>!;
+  qq!&nbsp;!;
+
+#false laziness w/ edit/part_pkg.cgi
+if ( $conf->exists('enable_taxclasses') ) {
+  print '<SELECT NAME="taxclass">';
+  my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
+    or die dbh->errstr;
+  $sth->execute or die $sth->errstr;
+  foreach my $taxclass ( map $_->[0], @{$sth->fetchall_arrayref} ) {
+    print qq!<OPTION VALUE="$taxclass"!;
+    #print ' SELECTED' if $taxclass eq $hashref->{taxclass};
+    print qq!>$taxclass</OPTION>!;
+  }
+  print '</SELECT>';
+} else {
+  print '<INPUT TYPE="hidden" NAME="taxclass" VALUE="">';
+}
+
+print qq!<INPUT TYPE="submit" VALUE="One-time charge"></FORM><BR>!;
 
 print <<END;
 <SCRIPT>
-- 
cgit v1.2.1


From d515768232afa35557496bb867f5708f279465e3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 03:52:23 +0000
Subject: ui

---
 httemplate/view/cust_main.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index dfa32d3a5..f0d342633 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -271,7 +271,7 @@ print '<BR>'.
   qq!<FORM ACTION="${p}edit/process/quick-charge.cgi" METHOD="POST">!.
   qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
   qq!Description:<INPUT TYPE="text" NAME="pkg">!.
-  qq! Amount:<INPUT TYPE="text" NAME="amount" SIZE=6>!.
+  qq!&nbsp;Amount:<INPUT TYPE="text" NAME="amount" SIZE=6>!.
   qq!&nbsp;!;
 
 #false laziness w/ edit/part_pkg.cgi
-- 
cgit v1.2.1


From e48985560b4c23e511658f2d638b762c061beee1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 03:57:08 +0000
Subject: working one-time charges again

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 6edb6ae8f..02e906aed 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1742,7 +1742,7 @@ the error, otherwise returns false.
 =cut
 
 sub charge {
-  my ( $self, $amount ) = @_;
+  my ( $self, $amount ) = ( shift, shift );
   my $pkg      = @_ ? shift : 'One-time charge';
   my $comment  = @_ ? shift : '$'. sprintf("%.2f",$amount);
   my $taxclass = @_ ? shift : '';
-- 
cgit v1.2.1


From 0da4c69a66e13410b0eff18966e13170d1306f22 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 10:33:37 +0000
Subject: preload all dbdefs

---
 FS/FS/InitHandler.pm | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 FS/MANIFEST          |  2 ++
 FS/t/InitHandler.t   |  5 ++++
 3 files changed, 82 insertions(+)
 create mode 100644 FS/FS/InitHandler.pm
 create mode 100644 FS/t/InitHandler.t

diff --git a/FS/FS/InitHandler.pm b/FS/FS/InitHandler.pm
new file mode 100644
index 000000000..9a2154aa1
--- /dev/null
+++ b/FS/FS/InitHandler.pm
@@ -0,0 +1,75 @@
+package FS::InitHandler;
+
+use strict;
+use FS::UID qw(adminsuidsetup);
+use FS::Record;
+
+sub handler {
+
+=pod
+
+  use Date::Format;
+  use Date::Parse;
+  use Tie::IxHash;
+  use HTML::Entities;
+  use IO::Handle;
+  use IO::File;
+  use String::Approx:
+  use HTML::Widgets::SelectLayers 0.02;
+  #use FS::UID;
+  #use FS::Record;
+  use FS::Conf;
+  use FS::CGI;
+  use FS::Msgcat;
+  
+  use FS::agent;
+  use FS::agent_type;
+  use FS::domain_record;
+  use FS::cust_bill;
+  use FS::cust_bill_pay;
+  use FS::cust_credit;
+  use FS::cust_credit_bill;
+  use FS::cust_main;
+  use FS::cust_main_county;
+  use FS::cust_pay;
+  use FS::cust_pkg;
+  use FS::cust_refund;
+  use FS::cust_svc;
+  use FS::nas;
+  use FS::part_bill_event;
+  use FS::part_pkg;
+  use FS::part_referral;
+  use FS::part_svc;
+  use FS::pkg_svc;
+  use FS::port;
+  use FS::queue qw(joblisting);
+  use FS::raddb;
+  use FS::session;
+  use FS::svc_acct;
+  use FS::svc_acct_pop qw(popselector);
+  use FS::svc_acct_sm;
+  use FS::svc_domain;
+  use FS::svc_forward;
+  use FS::svc_www;
+  use FS::type_pkgs;
+  use FS::part_export;
+  use FS::part_export_option;
+  use FS::export_svc;
+  use FS::msgcat;
+
+=cut
+
+  open(MAPSECRETS,"<$FS::UID::conf_dir/mapsecrets")
+    or die "can't read $FS::UID::conf_dir/mapsecrets: $!";
+
+  while (<MAPSECRETS>) {
+    /^([\w\-\.]+)\s/ or do { warn "strange line in mapsecrets: $_"; next; };
+    my $user = $1;
+    adminsuidsetup($user);
+  }
+
+  close MAPSECRETS;
+
+}
+
+1;
diff --git a/FS/MANIFEST b/FS/MANIFEST
index d9860b15f..da04b1d5c 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -19,6 +19,7 @@ bin/freeside-expiration-alerter
 bin/freeside-reexport
 FS.pm
 FS/CGI.pm
+FS/InitHandler.pm
 FS/Conf.pm
 FS/ConfItem.pm
 FS/Record.pm
@@ -94,6 +95,7 @@ FS/cust_tax_exempt.pm
 t/agent.t
 t/agent_type.t
 t/CGI.t
+t/InitHandler.t
 t/Conf.t
 t/ConfItem.t
 t/Record.t
diff --git a/FS/t/InitHandler.t b/FS/t/InitHandler.t
new file mode 100644
index 000000000..0ce60c833
--- /dev/null
+++ b/FS/t/InitHandler.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::InitHandler;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From e9af247503b619f0c61a3ba14481bc76752bdd8b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 10:48:05 +0000
Subject: debug

---
 FS/FS/InitHandler.pm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/FS/FS/InitHandler.pm b/FS/FS/InitHandler.pm
index 9a2154aa1..73697300e 100644
--- a/FS/FS/InitHandler.pm
+++ b/FS/FS/InitHandler.pm
@@ -1,9 +1,12 @@
 package FS::InitHandler;
 
 use strict;
+use vars qw($DEBUG);
 use FS::UID qw(adminsuidsetup);
 use FS::Record;
 
+$DEBUG = 1;
+
 sub handler {
 
 =pod
@@ -59,12 +62,18 @@ sub handler {
 
 =cut
 
+  warn "[FS::InitHandler] handler called\n" if $DEBUG;
+
   open(MAPSECRETS,"<$FS::UID::conf_dir/mapsecrets")
     or die "can't read $FS::UID::conf_dir/mapsecrets: $!";
 
+  my %seen;
   while (<MAPSECRETS>) {
-    /^([\w\-\.]+)\s/ or do { warn "strange line in mapsecrets: $_"; next; };
-    my $user = $1;
+    /^([\w\-\.]+)\s(.*)$/
+      or do { warn "strange line in mapsecrets: $_"; next; };
+    my($user, $datasrc) = ($1, $2);
+    next if $seen{$datasrc}++;
+    warn "[FS::InitHandler] preloading $datasrc for $user\n" if $DEBUG;
     adminsuidsetup($user);
   }
 
-- 
cgit v1.2.1


From ab33e906a196646c5351c21848b5d6f63b4400dd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 10:50:11 +0000
Subject: skip comment & blank lines

---
 FS/FS/InitHandler.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/FS/InitHandler.pm b/FS/FS/InitHandler.pm
index 73697300e..b1b9eaf03 100644
--- a/FS/FS/InitHandler.pm
+++ b/FS/FS/InitHandler.pm
@@ -69,6 +69,7 @@ sub handler {
 
   my %seen;
   while (<MAPSECRETS>) {
+    next if /^\s*(#|$)/;
     /^([\w\-\.]+)\s(.*)$/
       or do { warn "strange line in mapsecrets: $_"; next; };
     my($user, $datasrc) = ($1, $2);
-- 
cgit v1.2.1


From 98567e531e90ee1c7c195d5f1e708898d47a8452 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 11:10:12 +0000
Subject: allow InitHandler to work during apache startup

---
 FS/FS/UID.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index b1e590f2f..15f15a171 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -83,7 +83,7 @@ sub forksuidsetup {
   $ENV{'ENV'} = '';
   $ENV{'BASH_ENV'} = '';
 
-  croak "Not running uid freeside!" unless checkeuid();
+  croak "Not running uid freeside!" unless checkeuid() || !$>;
   getsecrets;
   $dbh = DBI->connect($datasrc,$db_user,$db_pass, {
                           'AutoCommit' => 0,
@@ -256,7 +256,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.16 2002-06-28 08:23:44 ivan Exp $
+$Id: UID.pm,v 1.17 2002-07-03 11:10:12 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 5786c8244a188823b01b87e2d7e9fd6bc72644b3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 11:23:25 +0000
Subject: fix to allow running during apache init

---
 FS/FS/InitHandler.pm | 7 +++++++
 FS/FS/UID.pm         | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/FS/FS/InitHandler.pm b/FS/FS/InitHandler.pm
index b1b9eaf03..31aacc731 100644
--- a/FS/FS/InitHandler.pm
+++ b/FS/FS/InitHandler.pm
@@ -64,6 +64,9 @@ sub handler {
 
   warn "[FS::InitHandler] handler called\n" if $DEBUG;
 
+  #this is sure to be broken on freebsd
+  $> = $FS::UID::freeside_uid;
+
   open(MAPSECRETS,"<$FS::UID::conf_dir/mapsecrets")
     or die "can't read $FS::UID::conf_dir/mapsecrets: $!";
 
@@ -80,6 +83,10 @@ sub handler {
 
   close MAPSECRETS;
 
+  #lalala probably broken on freebsd
+  ($<, $>) = ($>, $<);
+  $< = 0;
+
 }
 
 1;
diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 15f15a171..0b10612c5 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -83,7 +83,7 @@ sub forksuidsetup {
   $ENV{'ENV'} = '';
   $ENV{'BASH_ENV'} = '';
 
-  croak "Not running uid freeside!" unless checkeuid() || !$>;
+  croak "Not running uid freeside!" unless checkeuid();
   getsecrets;
   $dbh = DBI->connect($datasrc,$db_user,$db_pass, {
                           'AutoCommit' => 0,
@@ -256,7 +256,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.17 2002-07-03 11:10:12 ivan Exp $
+$Id: UID.pm,v 1.18 2002-07-03 11:23:25 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 62ab6a5c3fbececbc753691fa2288cfeb8531602 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 11:31:28 +0000
Subject: preload modules

---
 FS/FS/InitHandler.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/InitHandler.pm b/FS/FS/InitHandler.pm
index 31aacc731..45bf1acfa 100644
--- a/FS/FS/InitHandler.pm
+++ b/FS/FS/InitHandler.pm
@@ -9,7 +9,7 @@ $DEBUG = 1;
 
 sub handler {
 
-=pod
+#=pod
 
   use Date::Format;
   use Date::Parse;
-- 
cgit v1.2.1


From 5a4e653a8a08c5ddbc6e5ab984ff5a1a6e897cc9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 11:35:21 +0000
Subject: sacrifice memory for speed

---
 FS/FS/InitHandler.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/InitHandler.pm b/FS/FS/InitHandler.pm
index 45bf1acfa..e8177f8d7 100644
--- a/FS/FS/InitHandler.pm
+++ b/FS/FS/InitHandler.pm
@@ -17,7 +17,7 @@ sub handler {
   use HTML::Entities;
   use IO::Handle;
   use IO::File;
-  use String::Approx:
+  use String::Approx;
   use HTML::Widgets::SelectLayers 0.02;
   #use FS::UID;
   #use FS::Record;
-- 
cgit v1.2.1


From 65b084de4b964abf527f08b6b8359f68ae592679 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 11:37:45 +0000
Subject: 54

---
 FS/FS/InitHandler.pm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/FS/FS/InitHandler.pm b/FS/FS/InitHandler.pm
index e8177f8d7..87f507c22 100644
--- a/FS/FS/InitHandler.pm
+++ b/FS/FS/InitHandler.pm
@@ -9,8 +9,6 @@ $DEBUG = 1;
 
 sub handler {
 
-#=pod
-
   use Date::Format;
   use Date::Parse;
   use Tie::IxHash;
@@ -45,11 +43,11 @@ sub handler {
   use FS::part_svc;
   use FS::pkg_svc;
   use FS::port;
-  use FS::queue qw(joblisting);
+  use FS::queue;
   use FS::raddb;
   use FS::session;
   use FS::svc_acct;
-  use FS::svc_acct_pop qw(popselector);
+  use FS::svc_acct_pop;
   use FS::svc_acct_sm;
   use FS::svc_domain;
   use FS::svc_forward;
@@ -60,8 +58,6 @@ sub handler {
   use FS::export_svc;
   use FS::msgcat;
 
-=cut
-
   warn "[FS::InitHandler] handler called\n" if $DEBUG;
 
   #this is sure to be broken on freebsd
-- 
cgit v1.2.1


From 8bc1ee56aea60731d98efd0e2399b202e9969187 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 14:21:56 +0000
Subject: http export

---
 FS/FS/part_export.pm      | 37 ++++++++++++++++++++
 FS/FS/part_export/http.pm | 88 +++++++++++++++++++++++++++++++++++++++++++++++
 FS/MANIFEST               |  2 ++
 FS/t/part_export-http.t   |  5 +++
 4 files changed, 132 insertions(+)
 create mode 100644 FS/FS/part_export/http.pm
 create mode 100644 FS/t/part_export-http.t

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index d15a87986..15b207e03 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -636,6 +636,37 @@ tie my %bind_slave_options, 'Tie::IxHash',
                      default => '/etc/bind/named.conf' },
 ;
 
+tie my %http_options, 'Tie::IxHash',
+  'method' => { label   =>'Method',
+                type    =>'select',
+                #options =>[qw(POST GET)],
+                options =>[qw(POST)],
+                default =>'POST' },
+  'url'    => { label   => 'URL', default => 'http://', },
+  'insert_data' => {
+    label   => 'Insert data',
+    type    => 'textarea',
+    default => join("\n",
+      'DomainName $svc_x->domain',
+      'Email ( grep { $_ ne "POST" } $svc_x->cust_svc->cust_pkg->cust_main->invoicing_list)[0]',
+      'test 1',
+      'reseller $svc_x->cust_svc->cust_pkg->part_pkg->pkg =~ /reseller/i',
+    ),
+  },
+  'delete_data' => {
+    label   => 'Delete data',
+    type    => 'textarea',
+    default => join("\n",
+    ),
+  },
+  'replace_data' => {
+    label   => 'Replace data',
+    type    => 'textarea',
+    default => join("\n",
+    ),
+  },
+;
+
 tie my %sqlmail_options, 'Tie::IxHash',
   'datasrc'  => { label=>'DBI data source' },
   'username' => { label=>'Database username' },
@@ -740,6 +771,12 @@ tie my %sqlmail_options, 'Tie::IxHash',
       'notes' => 'Batch export of BIND configuration file to a secondary nameserver.  Zones are slaved from the listed masters.  <a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a> must be installed.  Run bin/bind.export to export the files.',
     },
 
+    'http' => {
+      'desc' => 'Send an HTTP or HTTPS GET or POST request',
+      'options' => \%http_options,
+      'notes' => 'Send an HTTP or HTTPS GET or POST to the specified URL.  <a href="http://search.cpan.org/search?dist=libwww-perl">libwww-perl</a> must be installed.  For HTTPS support, <a href="http://search.cpan.org/search?dist=Crypt-SSLeay">Crypt::SSLeay</a> or <a href="http://search.cpan.org/search?dist=IO-Socket-SSL">IO::Socket::SSL</a> is required.',
+    },
+
     'sqlmail' => {
       'desc' => 'Real-time export to SQL-backed mail server',
       'options' => \%sqlmail_options,
diff --git a/FS/FS/part_export/http.pm b/FS/FS/part_export/http.pm
new file mode 100644
index 000000000..0e02f0f8e
--- /dev/null
+++ b/FS/FS/part_export/http.pm
@@ -0,0 +1,88 @@
+package FS::part_export::http;
+
+use vars qw(@ISA);
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my $self = shift;
+  $self->_export_command('insert', @_);
+}
+
+sub _export_delete {
+  my $self = shift;
+  $self->_export_command('delete', @_);
+}
+
+sub _export_command {
+  my( $self, $action, $svc_x ) = ( shift, shift, shift );
+
+  return unless $self->option("${action}_data");
+
+  $self->http_queue( $svc_x->svcnum,
+    $self->option('method'),
+    $self->option('url'),
+    map {
+      /^\s*(\S+)\s+(.*)$/ or /()()/;
+      my( $field, $value_expression ) = ( $1, $2 );
+      my $value = eval $value_expression;
+      die $@ if $@;
+      ( $field, $value );
+    } split(/\n/, $self->option("${action}_data") )
+  );
+
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = ( shift, shift, shift );
+
+  return unless $self->option('replace_data');
+
+  $self->http_queue( $svc_x->svcnum,
+    $self->option('method'),
+    $self->option('url'),
+    map {
+      /^\s*(\S+)\s+(.*)$/ or /()()/;
+      my( $field, $value_expression ) = ( $1, $2 );
+      die $@ if $@;
+      ( $field, $value );
+    } split(/\n/, $self->option('replace_data') )
+  );
+
+}
+
+sub http_queue {
+  my($self, $svcnum) = (shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => "FS::part_export::http::http",
+  };
+  $queue->insert( @_ );
+}
+
+sub http {
+  my($method, $url, @data) = @_;
+
+  $method = lc($method);
+
+  eval "use LWP::UserAgent;";
+  die "using LWP::UserAgent: $@" if $@;
+  eval "use HTTP::Request::Common;";
+  die "using HTTP::Request::Common: $@" if $@;
+
+  my $ua = LWP::UserAgent->new;
+
+  #my $response = $ua->$method(
+  #  $url, \%data,
+  #  'Content-Type'=>'application/x-www-form-urlencoded'
+  #);
+  my $req = HTTP::Request::Common::POST( $url, \@data );
+  my $response = $ua->request($req);
+
+  die $response->error_as_HTML if $response->is_error;
+
+}
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index da04b1d5c..a6a8d935e 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -56,6 +56,7 @@ FS/part_export/bind_slave.pm
 FS/part_export/bsdshell.pm
 FS/part_export/cp.pm
 FS/part_export/cyrus.pm
+FS/part_export/http.pm
 FS/part_export/infostreet.pm
 FS/part_export/null.pm
 FS/part_export/shellcommands.pm
@@ -127,6 +128,7 @@ t/part_export-bind_slave.t
 t/part_export-bsdshell.t
 t/part_export-cp.t
 t/part_export-cyrus.t
+t/part_export-http.t
 t/part_export-infostreet.t
 t/part_export-null.t
 t/part_export-shellcommands.t
diff --git a/FS/t/part_export-http.t b/FS/t/part_export-http.t
new file mode 100644
index 000000000..ba7209d10
--- /dev/null
+++ b/FS/t/part_export-http.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::http_post;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From 50c327ded5ad9b96c5f5975643d46511abc01d49 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 14:45:59 +0000
Subject: s/_post//

---
 FS/t/part_export-http.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/t/part_export-http.t b/FS/t/part_export-http.t
index ba7209d10..ea41b939f 100644
--- a/FS/t/part_export-http.t
+++ b/FS/t/part_export-http.t
@@ -1,5 +1,5 @@
 BEGIN { $| = 1; print "1..1\n" }
 END {print "not ok 1\n" unless $loaded;}
-use FS::part_export::http_post;
+use FS::part_export::http;
 $loaded=1;
 print "ok 1\n";
-- 
cgit v1.2.1


From 6d02e527490b2f0cf080f7b519443caeecd76357 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 4 Jul 2002 10:35:43 +0000
Subject: move "add" links to the top

---
 httemplate/browse/agent.cgi           | 30 +++++++++++++-----------------
 httemplate/browse/agent_type.cgi      | 24 +++++++++++++-----------
 httemplate/browse/part_bill_event.cgi |  6 ++----
 httemplate/browse/part_export.cgi     |  7 ++-----
 httemplate/browse/part_pkg.cgi        | 17 ++++++++++-------
 httemplate/browse/part_referral.cgi   | 23 ++++++++++++-----------
 httemplate/browse/part_svc.cgi        | 19 ++++++++-----------
 httemplate/browse/svc_acct_pop.cgi    |  8 +++++---
 8 files changed, 65 insertions(+), 69 deletions(-)

diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 246500941..cff111ca4 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -1,6 +1,5 @@
 <!-- mason kludge -->
 <%
-
 #Begin silliness
 #
 #use FS::UI::CGI;
@@ -11,23 +10,25 @@
 #exit;
 #__END__
 #End silliness
+%>
 
-print header('Agent Listing', menubar(
+<%= header('Agent Listing', menubar(
   'Main Menu'   => $p,
   'Agent Types' => $p. 'browse/agent_type.cgi',
 #  'Add new agent' => '../edit/agent.cgi'
-)), <<END;
+)) %>
 Agents are resellers of your service. Agents may be limited to a subset of your
 full offerings (via their type).<BR><BR>
-END
-print &table(), <<END;
-      <TR>
-        <TH COLSPAN=2>Agent</TH>
-        <TH>Type</TH>
-        <TH><FONT SIZE=-1>Freq.</FONT></TH>
-        <TH><FONT SIZE=-1>Prog.</FONT></TH>
-      </TR>
-END
+<A HREF="<%= $p %>edit/agent.cgi"><I>Add a new agent</I></A><BR><BR>
+
+<%= table() %>
+<TR>
+  <TH COLSPAN=2>Agent</TH>
+  <TH>Type</TH>
+  <TH><FONT SIZE=-1>Freq.</FONT></TH>
+  <TH><FONT SIZE=-1>Prog.</FONT></TH>
+</TR>
+<% 
 #        <TH><FONT SIZE=-1>Agent #</FONT></TH>
 #        <TH>Agent</TH>
 
@@ -54,12 +55,7 @@ END
 }
 
 print <<END;
-      <TR>
-        <TD COLSPAN=2><A HREF="${p}edit/agent.cgi"><I>Add a new agent</I></A></TD>
-        <TD><A HREF="${p}edit/agent_type.cgi"><I>Add a new agent type</I></A></TD>
-      </TR>
     </TABLE>
-
   </BODY>
 </HTML>
 END
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index eb20c6404..5a8438589 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -1,16 +1,19 @@
 <!-- mason kludge -->
-<%
-
-print header("Agent Type Listing", menubar(
+<%= header("Agent Type Listing", menubar(
   'Main Menu' => $p,
-)), "Agent types define groups of packages that you can then assign to".
-    " particular agents.<BR><BR>", &table(), <<END;
-      <TR>
-        <TH COLSPAN=2>Agent Type</TH>
-        <TH COLSPAN=2>Packages</TH>
-      </TR>
-END
+  'Agents'    => $p. 'browse/agent.cgi',
+)) %>
+Agent types define groups of packages that you can then assign to particular
+agents.<BR><BR>
+<A HREF="<%= $p %>edit/agent_type.cgi"><I>Add a new agent type</I></A><BR><BR>
+
+<%= table() %>
+<TR>
+  <TH COLSPAN=2>Agent Type</TH>
+  <TH COLSPAN=2>Packages</TH>
+</TR>
 
+<% 
 foreach my $agent_type ( sort { 
   $a->getfield('typenum') <=> $b->getfield('typenum')
 } qsearch('agent_type',{}) ) {
@@ -47,7 +50,6 @@ END
 }
 
 print <<END;
-  <TR><TD COLSPAN=4><I><A HREF="${p}edit/agent_type.cgi">Add a new agent type</A></I></TD></TR>
     </TABLE>
   </BODY>
 </HTML>
diff --git a/httemplate/browse/part_bill_event.cgi b/httemplate/browse/part_bill_event.cgi
index 1d674f749..670474d48 100755
--- a/httemplate/browse/part_bill_event.cgi
+++ b/httemplate/browse/part_bill_event.cgi
@@ -15,6 +15,8 @@ my $total = scalar(@part_bill_event);
 <%= header('Invoice Event Listing', menubar( 'Main Menu' => $p) ) %>
 
     Invoice events are actions taken on overdue invoices.<BR><BR>
+<A HREF="<%= $p %>edit/part_bill_event.cgi"><I>Add a new invoice event</I></A>
+<BR><BR>
 <%= $total %> events
 <%= $cgi->param('showdisabled')
       ? do { $cgi->param('showdisabled', 0);
@@ -64,10 +66,6 @@ my $total = scalar(@part_bill_event);
       <%= $part_bill_event->eventcode %></FONT></TD>
   </TR>
 <% } %>
-
-  <TR>
-    <TD COLSPAN=8><A HREF="<%= $p %>edit/part_bill_event.cgi"><I>Add a new invoice event</I></A></TD>
-  </TR>
 </TABLE>
 </BODY>
 </HTML>
diff --git a/httemplate/browse/part_export.cgi b/httemplate/browse/part_export.cgi
index e9d9fa3d4..76662e0c9 100755
--- a/httemplate/browse/part_export.cgi
+++ b/httemplate/browse/part_export.cgi
@@ -1,7 +1,7 @@
 <!-- mason kludge -->
-<%= header("Export Listing", menubar( 'Main Menu' => $p )) %>
+<%= header("Export Listing", menubar( 'Main Menu' => "$p#sysadmin" )) %>
 Provisioning services to external machines, databases and APIs.<BR><BR>
-
+<A HREF="<%= $p %>edit/part_export.cgi"><I>Add a new export</I></A><BR><BR>
 <SCRIPT>
 function part_export_areyousure(href) {
   if (confirm("Are you sure you want to delete this export?") == true)
@@ -34,9 +34,6 @@ function part_export_areyousure(href) {
 
 <% } %>
 
-  <TR>
-    <TD COLSPAN=3><A HREF="<%= $p %>edit/part_export.cgi"><I>Add a new export</I></A></TD>
-  </TR>
 </TABLE>
 </BODY>
 </HTML>
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index c20811491..58422c67d 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -11,13 +11,16 @@ if ( $cgi->param('showdisabled') ) {
 my @part_pkg = qsearch('part_pkg', \%search );
 my $total = scalar(@part_pkg);
 
-print header("Package Definition Listing",menubar(
-  'Main Menu' => $p,
-)). "One or more services are grouped together into a package and given".
-  " pricing information. Customers purchase packages".
-  " rather than purchase services directly.<BR><BR>".
-  "$total packages ";
+%>
+<%= header("Package Definition Listing",menubar( 'Main Menu' => $p )) %>
+One or more services are grouped together into a package and given pricing
+information. Customers purchase packages rather than purchase services
+directly.<BR><BR>
+<A HREF="<%= $p %>edit/part_pkg.cgi"><I>Add a new package definition</I></A>
+<BR><BR>
 
+<%= $total %> packages
+<%
 if ( $cgi->param('showdisabled') ) {
   $cgi->param('showdisabled', 0);
   print qq!( <a href="!. $cgi->self_url. qq!">hide disabled packages</a> )!;
@@ -91,7 +94,7 @@ END
 
 $colspan = $cgi->param('showdisabled') ? 8 : 9;
 print <<END;
-   <TR><TD COLSPAN=$colspan><I><A HREF="${p}edit/part_pkg.cgi">Add a new package definition</A></I></TD></TR>
+
     </TABLE>
   </BODY>
 </HTML>
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index 93a6976e1..084c21bd0 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -1,15 +1,19 @@
 <!-- mason kludge -->
-<%
-
-print header("Advertising source Listing", menubar(
+<%= header("Advertising source Listing", menubar(
   'Main Menu' => $p,
 #  'Add new referral' => "../edit/part_referral.cgi",
-)), "Where a customer heard about your service. Tracked for informational purposes.<BR><BR>", &table(), <<END;
-      <TR>
-        <TH COLSPAN=2>Advertising source</TH>
-      </TR>
-END
+)) %>
+Where a customer heard about your service. Tracked for informational purposes.
+<BR><BR>
+<A HREF="<%= $p %>edit/part_referral.cgi"><I>Add a new advertising source</I></A>
+<BR><BR>
 
+<%= table() %>
+<TR>
+  <TH COLSPAN=2>Advertising source</TH>
+</TR>
+
+<%
 foreach my $part_referral ( sort { 
   $a->getfield('refnum') <=> $b->getfield('refnum')
 } qsearch('part_referral',{}) ) {
@@ -26,9 +30,6 @@ END
 }
 
 print <<END;
-      <TR>
-        <TD COLSPAN=2><A HREF="${p}edit/part_referral.cgi"><I>Add a new advertising source</I></A></TD>
-      </TR>
     </TABLE>
   </BODY>
 </HTML>
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 933554cd5..9fb359d1d 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -24,6 +24,14 @@ function part_export_areyousure(href) {
 </SCRIPT>
 
     Services are items you offer to your customers.<BR><BR>
+
+<FORM METHOD="POST" ACTION="<%= $p %>edit/part_svc.cgi"><A HREF="<%= $p %>edit/part_svc.cgi"><I>Add a new service definition</I></A>&nbsp;or&nbsp;<SELECT NAME="clone"><OPTION></OPTION>
+<% foreach my $part_svc ( @part_svc ) { %>
+  <OPTION VALUE="<%= $part_svc->svcpart %>"><%= $part_svc->svc %></OPTION>
+<% } %>
+</SELECT><INPUT TYPE="submit" VALUE="Clone existing service">
+</FORM><BR>
+
 <%= $total %> services
 <%= $cgi->param('showdisabled')
       ? do { $cgi->param('showdisabled', 0);
@@ -94,17 +102,6 @@ map { qsearchs('part_export', { exportnum => $_->exportnum } ) } qsearch('export
 %>
   </TR>
 <% } %>
-
-  <TR>
-    <TD COLSPAN=<%= $cgi->param('showdisabled') ? 7 : 8 %>>
-      <FORM METHOD="POST" ACTION="<%= $p %>edit/part_svc.cgi"><A HREF="<%= $p %>edit/part_svc.cgi"><I>Add a new service definition</I></A>&nbsp;or&nbsp;<SELECT NAME="clone"><OPTION></OPTION>
-<% foreach my $part_svc ( @part_svc ) { %>
-  <OPTION VALUE="<%= $part_svc->svcpart %>"><%= $part_svc->svc %></OPTION>
-<% } %>
-      </SELECT><INPUT TYPE="submit" VALUE="Clone existing service">
-      </FORM>
-    </TD>
-  </TR>
 </TABLE>
 </BODY>
 </HTML>
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index f8ee58c05..e890f07bf 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -3,7 +3,10 @@
 
 print header('Access Number Listing', menubar(
   'Main Menu' => $p,
-)), "Points of Presence<BR><BR>", &table(), <<END;
+)) %>
+Points of Presence<BR><BR>
+<A HREF="<%= $p %>edit/svc_acct_pop.cgi"><I>Add new Access Number</I></A><BR><BR>
+<%= table() %>
       <TR>
         <TH></TH>
         <TH>City</TH>
@@ -12,8 +15,8 @@ print header('Access Number Listing', menubar(
         <TH>Exchange</TH>
         <TH>Local</TH>
       </TR>
-END
 
+<%
 foreach my $svc_acct_pop ( sort { 
   #$a->getfield('popnum') <=> $b->getfield('popnum')
   $a->state cmp $b->state || $a->city cmp $b->city
@@ -41,7 +44,6 @@ END
 
 print <<END;
       <TR>
-        <TD COLSPAN=5><A HREF="${p}edit/svc_acct_pop.cgi"><I>Add new Access Number</I></A></TD>
       </TR>
     </TABLE>
   </BODY>
-- 
cgit v1.2.1


From 262928f0a043f1fd35bdf0df9a2fb1b1658c1dce Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Jul 2002 23:32:08 +0000
Subject: fix bug with config having a value not in the select

---
 httemplate/config/config.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index c050a19ab..fd9a82958 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -70,7 +70,7 @@ function SafeOnsubmit() {
                 <option value="<%= $value %>"<%= $value eq $conf->config($i->key) || ( $type eq 'selectmultiple' && grep { $_ eq $value } $conf->config($i->key) ) ? ' SELECTED' : '' %>><%= $value %>
               <% } %>
               <% if ( $conf->exists($i->key) && $conf->config($i->key) && ! grep { $conf->config($i->key) eq $_ } @{$i->select_enum}) { %>
-                <option value=<%= $conf->config($i->key) %> SELECTED><%= conf->config($i->key) %>
+                <option value=<%= $conf->config($i->key) %> SELECTED><%= $conf->config($i->key) %>
               <% } %>
             </select>
           <% } elsif ( $type eq 'editlist' )  { %>
-- 
cgit v1.2.1


From 1302ec4f2c77dbfd53d9e1c92decf40bfe9d2806 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Jul 2002 04:20:22 +0000
Subject: typo

---
 FS/FS/svc_acct.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 2bbbdcbb7..84faac338 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -876,7 +876,7 @@ sub domain {
 =item svc_domain
 
 Returns the FS::svc_domain record for this account's domain (see
-L<FS::svc_domain>.
+L<FS::svc_domain>).
 
 =cut
 
-- 
cgit v1.2.1


From 5c5006bb59066f59270cdb5b916c1f3d857e5782 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Jul 2002 07:30:38 +0000
Subject: move svc_www ssh jobs to the job queue & exports, and make them
 configurable

---
 FS/FS/Conf.pm                          |  8 ++--
 FS/FS/part_export.pm                   | 23 ++++++++---
 FS/FS/part_export/www_shellcommands.pm | 68 +++++++++++++++++++++++++------
 FS/FS/svc_www.pm                       | 74 ++++++++++++----------------------
 4 files changed, 102 insertions(+), 71 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 25c674301..e93eaf3fc 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -221,8 +221,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'apacheroot',
-    'section'     => 'apache',
-    'description' => 'The directory containing Apache virtual hosts',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add a <i>www_shellcommands</i> <a href="../browse/part_export.cgi">export</a> instead.  The directory containing Apache virtual hosts',
     'type'        => 'text',
   },
 
@@ -235,8 +235,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'apachemachine',
-    'section'     => 'apache',
-    'description' => 'A machine with the apacheroot directory and user home directories.  The existance of this file enables setup of virtual host directories, and, in conjunction with the `home\' configuration file, symlinks into user home directories.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add a <i>www_shellcommands</i> <a href="../browse/part_export.cgi">export</a> instead.  A machine with the apacheroot directory and user home directories.  The existance of this file enables setup of virtual host directories, and, in conjunction with the `home\' configuration file, symlinks into user home directories.',
     'type'        => 'text',
   },
 
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 15b207e03..3982168a5 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -531,7 +531,7 @@ tie my %shellcommands_options, 'Tie::IxHash',
                },
   'useradd_stdin' => { label=>'Insert command STDIN',
                        type =>'textarea',
-                       default=>"",
+                       default=>'',
                      },
   'userdel' => { label=>'Delete command',
                  default=>'userdel $username',
@@ -552,7 +552,7 @@ tie my %shellcommands_options, 'Tie::IxHash',
                },
   'usermod_stdin' => { label=>'Modify command STDIN',
                        type =>'textarea',
-                       default=>"",
+                       default=>'',
                      },
 ;
 
@@ -581,6 +581,19 @@ tie my %shellcommands_withdomain_options, 'Tie::IxHash',
                      },
 ;
 
+tie my %www_shellcommands_options, 'Tie::IxHash',
+  'user' => { lable=>'Remote username', default=>'root' },
+  'useradd' => { label=>'Insert command',
+                 default=>'mkdir /var/www/$zone; chown $username /var/www/$zone; ln -s /var/www/$zone $homedir/$zone',
+               },
+  'userdel'  => { label=>'Delete command',
+                  default=>'[ -n &quot;$zone&quot; ] && rm -rf /var/www/$zone; rm $homedir/$zone',
+                },
+  'usermod'  => { label=>'Modify command',
+                  default=>'[ -n &quot;$old_zone&quot; ] && rm $old_homedir/$old_zone; [ &quot;$old_zone&quot; != &quot;$new_zone&quot; -a -n &quot;$new_zone&quot; ] && mv /var/www/$old_zone /var/www/$new_zone; [ &quot;$old_username&quot; != &quot;$new_username&quot; ] && chown -R $new_username /var/www/$new_zone; ln -s /var/www/$new_zone $new_homedir/$new_zone',
+                },
+;
+
 tie my %textradius_options, 'Tie::IxHash',
   'user' => { label=>'Remote username', default=>'root' },
   'users' => { label=>'users file location', default=>'/etc/raddb/users' },
@@ -800,9 +813,9 @@ tie my %sqlmail_options, 'Tie::IxHash',
 
   'svc_www' => {
     'www_shellcommands' => {
-      'desc'    => 'www_shellcommands',
-      'options' => {}, # \%www_shellcommands_options,
-      'notes'   => 'unfinished...',
+      'desc' => 'Run remote commands via SSH, for virtual web sites.',
+      'options' => \%www_shellcommands_options,
+      'notes'    => 'Run remote commands via SSH, for virtual web sites.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.',
     },
 
   },
diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index e95939b8c..84c162761 100644
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -1,5 +1,6 @@
-package FS::part_export::shellcommands;
+package FS::part_export::www_shellcommands;
 
+use strict;
 use vars qw(@ISA);
 use FS::part_export;
 
@@ -18,31 +19,72 @@ sub _export_delete {
 }
 
 sub _export_command {
-  my ( $self, $action, $svc_acct) = (shift, shift, shift);
+  my ( $self, $action, $svc_www) = (shift, shift, shift);
   my $command = $self->option($action);
-  my $stdin = $self->option($action."_stdin");
-  no strict 'refs';
-  ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
-  $self->shellcommands_queue( $svc_acct->svcnum,
+
+  #set variable for the command
+  {
+    no strict 'refs';
+    ${$_} = $svc_www->getfield($_) foreach $svc_www->fields;
+  }
+  my $domain_record = $svc_www->domain_record; # or die ?
+  my $zone = $domain_record->reczone; # or die ?
+  unless ( $zone =~ /\.$/ ) {
+    my $svc_domain = $domain_record->svc_domain; # or die ?
+    $zone .= '.'. $svc_domain->domain;
+  }
+
+  my $svc_acct = $svc_www->svc_acct; # or die ?
+  my $username = $svc_acct->username;
+  my $homedir = $svc_acct->dir; # or die ?
+
+  #done setting variables for the command
+
+  $self->shellcommands_queue( $svc_www->svcnum,
     user         => $self->option('user')||'root',
     host         => $self->machine,
     command      => eval(qq("$command")),
-    stdin_string => eval(qq("$stdin")),
   );
 }
 
 sub _export_replace {
   my($self, $new, $old ) = (shift, shift, shift);
   my $command = $self->option('usermod');
-  my $stdin = $self->option('usermod_stdin');
-  no strict 'refs';
-  ${"old_$_"} = $old->getfield($_) foreach $old->fields;
-  ${"new_$_"} = $new->getfield($_) foreach $new->fields;
+  
+  #set variable for the command
+  {
+    no strict 'refs';
+    ${"old_$_"} = $old->getfield($_) foreach $old->fields;
+    ${"new_$_"} = $new->getfield($_) foreach $new->fields;
+  }
+  my $old_domain_record = $old->domain_record; # or die ?
+  my $old_zone = $old_domain_record->reczone; # or die ?
+  unless ( $old_zone =~ /\.$/ ) {
+    my $old_svc_domain = $old_domain_record->svc_domain; # or die ?
+    $old_zone .= '.'. $old_svc_domain->domain;
+  }
+
+  my $old_svc_acct = $old->svc_acct; # or die ?
+  my $old_username = $old_svc_acct->username;
+  my $old_homedir = $old_svc_acct->dir; # or die ?
+
+  my $new_domain_record = $new->domain_record; # or die ?
+  my $new_zone = $new_domain_record->reczone; # or die ?
+  unless ( $new_zone =~ /\.$/ ) {
+    my $new_svc_domain = $new_domain_record->svc_domain; # or die ?
+    $new_zone .= '.'. $new_svc_domain->domain;
+  }
+
+  my $new_svc_acct = $new->svc_acct; # or die ?
+  my $new_username = $new_svc_acct->username;
+  my $new_homedir = $new_svc_acct->dir; # or die ?
+
+  #done setting variables for the command
+
   $self->shellcommands_queue( $new->svcnum,
     user         => $self->option('user')||'root',
     host         => $self->machine,
     command      => eval(qq("$command")),
-    stdin_string => eval(qq("$stdin")),
   );
 }
 
@@ -51,7 +93,7 @@ sub shellcommands_queue {
   my( $self, $svcnum ) = (shift, shift);
   my $queue = new FS::queue {
     'svcnum' => $svcnum,
-    'job'    => "FS::part_export::shellcommands::ssh_cmd",
+    'job'    => "FS::part_export::www_shellcommands::ssh_cmd",
   };
   $queue->insert( @_ );
 }
diff --git a/FS/FS/svc_www.pm b/FS/FS/svc_www.pm
index 6415a3012..d7a42c8ae 100644
--- a/FS/FS/svc_www.pm
+++ b/FS/FS/svc_www.pm
@@ -1,7 +1,7 @@
 package FS::svc_www;
 
 use strict;
-use vars qw(@ISA $conf $apacheroot $apachemachine $apacheip $nossh_hack );
+use vars qw(@ISA $conf $apacheip);
 #use FS::Record qw( qsearch qsearchs );
 use FS::Record qw( qsearchs dbh );
 use FS::svc_Common;
@@ -9,15 +9,12 @@ use FS::cust_svc;
 use FS::domain_record;
 use FS::svc_acct;
 use FS::svc_domain;
-use Net::SSH qw(ssh);
 
 @ISA = qw( FS::svc_Common );
 
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::svc_www'} = sub { 
   $conf = new FS::Conf;
-  $apacheroot = $conf->config('apacheroot');
-  $apachemachine = $conf->config('apachemachine');
   $apacheip = $conf->config('apacheip');
 };
 
@@ -85,20 +82,6 @@ otherwise returns false.
 The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
 defined.  An FS::cust_svc record will be created and inserted.
 
-If the configuration values (see L<FS::Conf>) I<apachemachine>, and
-I<apacheroot> exist, the command:
-
-  mkdir $apacheroot/$zone;
-  chown $username $apacheroot/$zone;
-  ln -s $apacheroot/$zone $homedir/$zone
-
-I<$zone> is the DNS A record pointed to by I<recnum>
-I<$username> is the username pointed to by I<usersvc>
-I<$homedir> is that user's home directory
-
-is executed on I<apachemachine> via ssh.  This behaviour can be surpressed by
-setting $FS::svc_www::nossh_hack true.
-
 =cut
 
 sub insert {
@@ -147,37 +130,6 @@ sub insert {
     return $error;
   }
 
-  my $domain_record = qsearchs('domain_record', { 'recnum' => $self->recnum } );    # or die ?
-  my $zone = $domain_record->reczone;
-    # or die ?
-  unless ( $zone =~ /\.$/ ) {
-    my $dom_svcnum = $domain_record->svcnum;
-    my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $dom_svcnum } );
-      # or die ?
-    $zone .= '.'. $svc_domain->domain;
-  }
-
-  my $svc_acct = qsearchs('svc_acct', { 'svcnum' => $self->usersvc } );
-    # or die ?
-  my $username = $svc_acct->username;
-    # or die ?
-  my $homedir = $svc_acct->dir;
-    # or die ?
-
-  if ( $apachemachine
-       && $apacheroot
-       && $zone
-       && $username
-       && $homedir
-       && ! $nossh_hack
-  ) {
-    ssh("root\@$apachemachine",
-        "mkdir $apacheroot/$zone; ".
-        "chown $username $apacheroot/$zone; ".
-        "ln -s $apacheroot/$zone $homedir/$zone"
-    );
-  }
-
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 }
@@ -285,6 +237,30 @@ sub check {
   ''; #no error
 }
 
+=item domain_record
+
+Returns the FS::domain_record record for this web virtual host's zone (see
+L<FS::domain_record>).
+
+=cut
+
+sub domain_record {
+  my $self = shift;
+  qsearchs('domain_record', { 'recnum' => $self->recnum } );
+}
+
+=item svc_acct
+
+Returns the FS::svc_acct record for this web virtual host's owner (see
+L<FS::svc_acct>).
+
+=cut
+
+sub svc_acct {
+  my $self = shift;
+  qsearchs('svc_acct', { 'svcnum' => $self->usersvc } );
+}
+
 =back
 
 =head1 BUGS
-- 
cgit v1.2.1


From 77a635814175402564f16f1b6bc63e452479ac19 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Jul 2002 07:31:50 +0000
Subject: this file should probably go away soon...

---
 ANNOUCE.1.4.0 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ANNOUCE.1.4.0 b/ANNOUCE.1.4.0
index 8e6dd61a5..2b9ea20e5 100644
--- a/ANNOUCE.1.4.0
+++ b/ANNOUCE.1.4.0
@@ -74,8 +74,6 @@ HTML manpages now up-to-date and generated on install
 
 schema changes for more configurable export
 
-no mysql support :(
-
 invoice events work & show up on invoice view
 
 - Pro-rating price plan
-- 
cgit v1.2.1


From 5d65d52a1b53172da6bcaf37cc375a3f4f3edfd9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Jul 2002 07:32:20 +0000
Subject: fix speling

---
 httemplate/edit/part_pkg.cgi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 08d5dc906..b6ecff2d0 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -241,7 +241,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'flat_comission_cust' => {
-    'name' => 'Flat rate with recurring comission per active customer',
+    'name' => 'Flat rate with recurring commission per active customer',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -249,7 +249,7 @@ tie my %plans, 'Tie::IxHash',
       'recur_fee' => { 'name' => 'Recurring fee for this package',
                        'default' => 0,
                      },
-      'comission_amount' => { 'name' => 'Comission amount per month (per active customer)',
+      'comission_amount' => { 'name' => 'Commission amount per month (per active customer)',
                               'default' => 0,
                             },
       'comission_depth'  => { 'name' => 'Number of layers',
@@ -262,7 +262,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'flat_comission' => {
-    'name' => 'Flat rate with recurring comission per (any) active package',
+    'name' => 'Flat rate with recurring commission per (any) active package',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -270,7 +270,7 @@ tie my %plans, 'Tie::IxHash',
       'recur_fee' => { 'name' => 'Recurring fee for this package',
                        'default' => 0,
                      },
-      'comission_amount' => { 'name' => 'Comission amount per month (per active package)',
+      'comission_amount' => { 'name' => 'Commission amount per month (per active package)',
                               'default' => 0,
                             },
       'comission_depth'  => { 'name' => 'Number of layers',
@@ -283,7 +283,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'flat_comission_pkg' => {
-    'name' => 'Flat rate with recurring comission per (selected) active package',
+    'name' => 'Flat rate with recurring commission per (selected) active package',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -291,7 +291,7 @@ tie my %plans, 'Tie::IxHash',
       'recur_fee' => { 'name' => 'Recurring fee for this package',
                        'default' => 0,
                      },
-      'comission_amount' => { 'name' => 'Comission amount per month (per uncancelled package)',
+      'comission_amount' => { 'name' => 'Commission amount per month (per uncancelled package)',
                               'default' => 0,
                             },
       'comission_depth'  => { 'name' => 'Number of layers',
-- 
cgit v1.2.1


From 86bf1d97a86661716d2d0276b28985c24180153b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Jul 2002 08:32:22 +0000
Subject: speling

---
 httemplate/view/cust_main.cgi | 2 +-
 httemplate/view/cust_pkg.cgi  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index f0d342633..421bd98a4 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -295,7 +295,7 @@ print qq!<INPUT TYPE="submit" VALUE="One-time charge"></FORM><BR>!;
 print <<END;
 <SCRIPT>
 function cust_pkg_areyousure(href) {
-    if (confirm("Permanantly delete included services and cancel this package?") == true)
+    if (confirm("Permanently delete included services and cancel this package?") == true)
         window.location.href = href;
 }
 </SCRIPT>
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index 75fe983b4..09a2a7a8b 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -38,7 +38,7 @@ my $otaker = $cust_pkg->getfield('otaker');
 print <<END;
 <SCRIPT>
 function areyousure(href) {
-    if (confirm("Permanantly delete included services and cancel this package?") == true)
+    if (confirm("Permanently delete included services and cancel this package?") == true)
         window.location.href = href;
 }
 </SCRIPT>
-- 
cgit v1.2.1


From bc53d77e5cd5543a76bb38aa2acf96fbfa61714d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Jul 2002 08:50:48 +0000
Subject: add "are you sure?" javascript on view/svc_acct.cgi "cancel unaudited
 account" (closes: Bug#432)

---
 httemplate/view/svc_acct.cgi | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index fd2a32547..f6c1b026c 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -39,16 +39,27 @@ if ( $svc_acct->domsvc ) {
   $domain = $mydomain;
 }
 
-print header('Account View', menubar(
+%>
+
+<SCRIPT>
+function areyousure(href) {
+    if (confirm("Permanently delete this account?") == true)
+        window.location.href = href;
+}
+</SCRIPT>
+
+<%= header('Account View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
         "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )
     : ( "Cancel this (unaudited) account" =>
-          "${p}misc/cancel-unaudited.cgi?$svcnum" )
+          "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')" )
   ),
   "Main menu" => $p,
-));
+)) %>
+
+<%
 
 #print qq!<BR><A HREF="../misc/sendconfig.cgi?$svcnum">Send account information</A>!;
 
-- 
cgit v1.2.1


From 9b6e476ab5a9f42877543065eff960928df2304b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Jul 2002 11:08:48 +0000
Subject: fix UI for forwards - use HTML::Widgets::SelectLayers, closes:
 Bug#303

---
 httemplate/edit/svc_forward.cgi | 133 +++++++++++++---------------------------
 httemplate/view/svc_forward.cgi |  12 +++-
 2 files changed, 52 insertions(+), 93 deletions(-)

diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 5f1466bbb..bc19fe1de 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -119,105 +119,58 @@ my($srcsvc,$dstsvc,$dst)=(
 
 #display
 
-my $p1 = popurl(1);
-print header("Mail Forward $action", '',
-      " onLoad=\"visualize()\"");
-
 %>
 
-<SCRIPT>
-function visualize(what){
-    if (document.getElementById) {
-      document.getElementById('dother').style.visibility = '<%= $dstsvc ? 'hidden' : 'visible' %>';
-    }
-}
-function fixup(what){
-    if (document.getElementById) {
-      if (document.getElementById('dother').style.visibility == 'hidden') {
-        what.dst.value='';
-      }
-    }
-}
-</SCRIPT>
-
-<%
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
+<%= header("Mail Forward $action") %>
 
-print qq!<FORM ACTION="${p1}process/svc_forward.cgi" onSubmit="fixup(this)" METHOD=POST>!;
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+  <BR><BR>
+<% } %>
 
-#svcnum
-print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
-print qq!Service #<FONT SIZE=+1><B>!, $svcnum ? $svcnum : " (NEW)", "</B></FONT>";
-print qq!<BR>!;
+Service #<%= $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
+Service: <B><%= $part_svc->svc %></B><BR><BR>
 
-#pkgnum
-print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
- 
-#svcpart
-print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
-
-#srcsvc
-print qq!\n\nMail to <SELECT NAME="srcsvc" SIZE=1>!;
-foreach $_ (keys %email) {
-  print "<OPTION", $_ eq $srcsvc ? " SELECTED" : "",
-        qq! VALUE="$_">$email{$_}!;
-}
-print "</SELECT>";
+<FORM NAME="dummy">
 
-#dstsvc
-print qq! forwards to <SELECT NAME="dstsvc" SIZE=1 onChange="changed(this)">!;
-foreach $_ (keys %email) {
-  print "<OPTION", $_ eq $dstsvc ? " SELECTED" : "",
-        qq! VALUE="$_">$email{$_}!;
-}
-print "<OPTION", 0 eq $dstsvc ? " SELECTED" : "",
-      qq! VALUE="0">(other)!;
-print "</SELECT> mailbox.";
-
-%>
-
-<SCRIPT>
-var selectchoice = null;
-function changed(what) {
-  selectchoice = what.options[what.selectedIndex].value;
-  if (selectchoice == "0") {
-    if (document.getElementById) {
-      document.getElementById('dother').style.visibility = "visible";
-    }
-  }else{
-    if (document.getElementById) {
-      document.getElementById('dother').style.visibility = "hidden";
-    }
-  }
-}
-if (document.getElementById) {
-    document.write("<DIV ID=\"dother\" STYLE=\"visibility: hidden\">");
-}
-</SCRIPT>
+<%= ntable("#cccccc",2) %>
+<TR><TD ALIGN="right">Email to</TD><TD><SELECT NAME="srcsvc" SIZE=1>
+<% foreach $_ (keys %email) { %>
+  <OPTION<%= $_ eq $srcsvc ? " SELECTED" : "" %> VALUE="<%= $_ %>"><%= $email{$_} %></OPTION>
+<% } %>
+</SELECT></TD></TR>
 
 <%
-print qq! Other destination: <INPUT TYPE="text" NAME="dst" VALUE="$dst">!;
+  tie my %tied_email, 'Tie::IxHash',
+    ''  => 'SELECT DESTINATION',
+    %email,
+    '0' => '(other email address)';
+  my $widget = new HTML::Widgets::SelectLayers(
+    'selected_layer' => $dstsvc,
+    'options'        => \%tied_email,
+    'form_name'      => 'dummy',
+    'form_action'    => 'process/svc_forward.cgi',
+    'form_select'    => ['srcsvc'],
+    'html_between'   => '</TD></TR></TABLE>',
+    'layer_callback' => sub {
+      my $layer = shift;
+      my $html = qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!.
+                 qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!.
+                 qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!.
+                 qq!<INPUT TYPE="hidden" NAME="dstsvc" VALUE="$layer">!;
+      if ( $layer eq '0' ) {
+        $html .= ntable("#cccccc",2).
+                 '<TR><TD ALIGN="right">Destination email</TD>'.
+                 qq!<TD><INPUT TYPE="text" NAME="dst" VALUE="$dst"></TD>!.
+                 '</TR></TABLE>';
+      }
+      $html .= '<BR><INPUT TYPE="submit" VALUE="Submit">';
+      $html;
+    },
+  );
 %>
 
-<SCRIPT>
-if (document.getElementById) {
-    document.write("</DIV>");
-}
-</SCRIPT>
-
-<CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>
-</FORM>
-
-<TAG onLoad="
-    if (document.getElementById) {
-      document.getElementById('dother').style.visibility = '<%= $dstsvc ? 'hidden' : 'visible' %>';
-      document.getElementById('dlabel').style.visibility = '<%= $dstsvc ? 'hidden' : 'visible' %>';
-    }
-">
-
-
+<TR><TD ALIGN="right">Forwards to</TD>
+<TD><%= $widget->html %>
   </BODY>
 </HTML>
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index 8d2afc823..c8d1d6213 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -53,9 +53,15 @@ if ($dstsvc) {
 }
 
 print qq!<A HREF="${p}edit/svc_forward.cgi?$svcnum">Edit this information</A>!.
-      "<BR>Service #$svcnum".
-      "<BR>Service: <B>$svc</B>".
-      qq!<BR>Mail to <B>$source</B> forwards to <B>$destination</B> mailbox.!.
+      ntable("#cccccc",2).
+      '<TR><TD ALIGN="right">Service number</TD>'.
+        qq!<TD BGCOLOR="#ffffff">$svcnum</TD></TR>!.
+      '<TR><TD ALIGN="right">Service</TD>'.
+        qq!<TD BGCOLOR="#ffffff">$svc</TD></TR>!.
+      qq!<TR><TD ALIGN="right">Email to</TD>!.
+        qq!<TD BGCOLOR="#ffffff">$source</TD></TR>!.
+      qq!<TR><TD ALIGN="right">Forwards to </TD>!.
+        qq!<TD BGCOLOR="#ffffff">$destination</TD></TR></TABLE>!.
       '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
       '</BODY></HTML>'
 ;
-- 
cgit v1.2.1


From 418b71fd9ca58ec228ac641a634c4fa055ac12fd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Jul 2002 12:13:49 +0000
Subject: fix Can't use an undefined value as an ARRAY reference at ./fs-setup
 line 209, <STDIN> line 3.

---
 bin/fs-setup | 74 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 40 insertions(+), 34 deletions(-)

diff --git a/bin/fs-setup b/bin/fs-setup
index 45cb07f47..9522ce370 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.95 2002-06-28 20:23:54 ivan Exp $
+# $Id: fs-setup,v 1.96 2002-07-06 12:13:49 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -165,6 +165,11 @@ foreach my $table ( grep { ! /^h_/ } $dbdef->tables ) {
   my $tableobj = $dbdef->table($table)
     or die "unknown table $table";
 
+  die "unique->lol_ref undefined for $table"
+    unless defined $tableobj->unique->lol_ref;
+  die "index->lol_ref undefined for $table"
+    unless defined $tableobj->index->lol_ref;
+
   my $h_tableobj = DBIx::DBSchema::Table->new( {
     name        => "h_$table",
     primary_key => 'historynum',
@@ -336,7 +341,7 @@ sub tables_hash_hack {
         'prog',     @perl_type,
       ],
       'primary_key' => 'agentnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ ['typenum'] ],
     },
 
@@ -346,8 +351,8 @@ sub tables_hash_hack {
         'atype',     'varchar', '', $char_d,
       ],
       'primary_key' => 'typenum',
-      'unique' => [ [] ],
-      'index' => [ [] ],
+      'unique' => [],
+      'index' => [],
     },
 
     'type_pkgs' => {
@@ -370,7 +375,7 @@ sub tables_hash_hack {
         'closed',    'char', 'NULL', 1,
       ],
       'primary_key' => 'invnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ ['custnum'] ],
     },
 
@@ -402,7 +407,7 @@ sub tables_hash_hack {
         'disabled',     'char', 'NULL', 1,
       ],
       'primary_key' => 'eventpart',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ ['payby'] ],
     },
 
@@ -431,7 +436,7 @@ sub tables_hash_hack {
         'closed',    'char', 'NULL', 1,
       ],
       'primary_key' => 'crednum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ ['custnum'] ],
     },
 
@@ -444,7 +449,7 @@ sub tables_hash_hack {
         'amount',   @money_type,
       ],
       'primary_key' => 'creditbillnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ ['crednum'], ['invnum'] ],
     },
 
@@ -494,7 +499,7 @@ sub tables_hash_hack {
         'comments', 'text', 'NULL', '',
       ],
       'primary_key' => 'custnum',
-      'unique' => [ [] ],
+      'unique' => [],
       #'index' => [ ['last'], ['company'] ],
       'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ] ],
     },
@@ -506,7 +511,7 @@ sub tables_hash_hack {
         'dest',     'varchar', '',  $char_d,
       ],
       'primary_key' => 'destnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ ['custnum'], ],
     },
 
@@ -523,9 +528,9 @@ sub tables_hash_hack {
         'tax',      'real',  '',    '', #tax %
       ],
       'primary_key' => 'taxnum',
-      'unique' => [ [] ],
+      'unique' => [],
   #    'unique' => [ ['taxnum'], ['state', 'county'] ],
-      'index' => [ [] ],
+      'index' => [],
     },
 
     'cust_pay' => {
@@ -542,7 +547,7 @@ sub tables_hash_hack {
         'closed',    'char', 'NULL', 1,
       ],
       'primary_key' => 'paynum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ [ 'custnum' ], [ 'paybatch' ] ],
     },
 
@@ -555,7 +560,7 @@ sub tables_hash_hack {
         '_date',   @date_type
       ],
       'primary_key' => 'billpaynum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ [ 'paynum' ], [ 'invnum' ] ],
     },
 
@@ -581,7 +586,7 @@ sub tables_hash_hack {
         'amount',   @money_type,
       ],
       'primary_key' => 'paybatchnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ ['invnum'], ['custnum'] ],
     },
 
@@ -599,7 +604,7 @@ sub tables_hash_hack {
         'manual_flag', 'char', 'NULL', 1,
       ],
       'primary_key' => 'pkgnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ ['custnum'] ],
     },
 
@@ -619,8 +624,8 @@ sub tables_hash_hack {
         'closed',    'char', 'NULL', 1,
       ],
       'primary_key' => 'refundnum',
-      'unique' => [ [] ],
-      'index' => [ [] ],
+      'unique' => [],
+      'index' => [],
     },
 
     'cust_credit_refund' => {
@@ -632,7 +637,7 @@ sub tables_hash_hack {
         '_date',   @date_type
       ],
       'primary_key' => 'creditrefundnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ [ 'crednum', 'refundnum' ] ],
     },
 
@@ -644,7 +649,7 @@ sub tables_hash_hack {
         'svcpart',   'int',    '',   '',
       ],
       'primary_key' => 'svcnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ ['svcnum'], ['pkgnum'], ['svcpart'] ],
     },
 
@@ -664,8 +669,8 @@ sub tables_hash_hack {
         'taxclass',   'varchar', 'NULL', $char_d,
       ],
       'primary_key' => 'pkgpart',
-      'unique' => [ [] ],
-      'index' => [ [] ],
+      'unique' => [],
+      'index' => [],
     },
 
 #    'part_title' => {
@@ -695,8 +700,8 @@ sub tables_hash_hack {
         'referral', 'varchar',   '',   $char_d,
       ],
       'primary_key' => 'refnum',
-      'unique' => [ [] ],
-      'index' => [ [] ],
+      'unique' => [],
+      'index' => [],
     },
 
     'part_svc' => {
@@ -707,8 +712,8 @@ sub tables_hash_hack {
         'disabled',   'char',  'NULL',   1,
       ],
       'primary_key' => 'svcpart',
-      'unique' => [ [] ],
-      'index' => [ [] ],
+      'unique' => [],
+      'index' => [],
     },
 
     'part_svc_column' => {
@@ -735,7 +740,7 @@ sub tables_hash_hack {
         'loc',       'char',   'NULL',   4, #NULL for legacy purposes
       ],
       'primary_key' => 'popnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ [ 'state' ] ],
     },
 
@@ -749,7 +754,7 @@ sub tables_hash_hack {
         'nxx',       'char',    '',     3,
       ],
       'primary_key' => 'localnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ [ 'npa', 'nxx' ], [ 'popnum' ] ],
     },
 
@@ -772,6 +777,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'svcnum',
       #'unique' => [ [ 'username', 'domsvc' ] ],
+      'unique' => [],
       'index' => [ ['username'], ['domsvc'] ],
     },
 
@@ -805,7 +811,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'svcnum',
       'unique' => [ ['domain'] ],
-      'index' => [ [] ],
+      'index' => [],
     },
 
     'domain_record' => {
@@ -818,7 +824,7 @@ sub tables_hash_hack {
         'recdata',   'varchar', '',  $char_d,
       ],
       'primary_key' => 'recnum',
-      'unique'      => [ [] ],
+      'unique'      => [],
       'index'       => [ ['svcnum'] ],
     },
 
@@ -830,7 +836,7 @@ sub tables_hash_hack {
         'dst',      'varchar',    'NULL',  $char_d,
       ],
       'primary_key' => 'svcnum',
-      'unique'      => [ [] ],
+      'unique'      => [],
       'index'       => [ ['srcsvc'], ['dstsvc'] ],
     },
 
@@ -841,8 +847,8 @@ sub tables_hash_hack {
         'usersvc',  'int',    '',  '',
       ],
       'primary_key' => 'svcnum',
-      'unique'      => [ [] ],
-      'index'       => [ [] ],
+      'unique'      => [],
+      'index'       => [],
     },
 
     #'svc_wo' => {
@@ -867,7 +873,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'prepaynum',
       'unique'      => [ ['identifier'] ],
-      'index'       => [ [] ],
+      'index'       => [],
     },
 
     'port' => {
-- 
cgit v1.2.1


From 849e3e44a7fc2f6c353273b6e94a8c2a627ff561 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Jul 2002 12:15:50 +0000
Subject: beta2

---
 Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 3f5e18d47..30c165483 100644
--- a/Makefile
+++ b/Makefile
@@ -40,10 +40,8 @@ SIGNUP_REFNUM = 2
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-#VERSION=1.4.0pre14
-#TAG=freeside_1_4_0_pre14
-VERSION=1.4.0beta1
-TAG=freeside_1_4_0_beta1
+VERSION=1.4.0beta2
+TAG=freeside_1_4_0_beta2
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
-- 
cgit v1.2.1


From 0b8f79a88503618bca0e18d02aeebdbb1e3b47ba Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Jul 2002 12:53:22 +0000
Subject: new!  improved!  now even more idiot-proof!

---
 httemplate/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index db2141619..c593c956b 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -187,7 +187,7 @@ $ su freeside
 $ cd <b>/path/to/freeside-1.4.0/</b>
 $ bin/populate-msgcat <b>username</b>
 </pre>
-  <li><tt>freeside-queued</tt> was installed with the Perl modules.  Start it now and ensure that is run upon system startup (Do this manually, or edit the top-level Makefile, replacing INIT_FILE with the appropriate location on your system, and run <tt>make install-init</tt>)
+  <li><tt>freeside-queued</tt> was installed with the Perl modules.  Start it now and ensure that is run upon system startup (Do this manually, or edit the top-level Makefile, replacing INIT_FILE with the appropriate location on your systemand QUEUED_USER with the username of a Freeside user you created above, and run <tt>make install-init</tt>)
   <li>Now proceed to the initial <a href="admin.html">administration</a> of your installation.
 </ul>
 </body>
-- 
cgit v1.2.1


From 73233cfa60984978f1593bf86c248c0bab3620a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Jul 2002 11:03:08 +0000
Subject: move query logic from perl to sql for scalability

---
 httemplate/search/cust_bill.cgi | 65 ++++++++++++++++++++++++++++++++---------
 1 file changed, 52 insertions(+), 13 deletions(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index d83851804..dbe7e7dcd 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -1,44 +1,83 @@
 <%
 
+my $conf = new FS::Conf;
+my $maxrecords = $conf->config('maxsearchrecordsperpage');
+
+my $orderby = ''; #removeme
+
+my $limit = '';
+$limit .= "LIMIT $maxrecords" if $maxrecords;
+
+my $offset = $cgi->param('offset') || 0;
+$limit .= " OFFSET $offset" if $offset;
+
+my $total;
+
 my(@cust_bill, $sortby);
 if ( $cgi->keywords ) {
   my($query) = $cgi->keywords;
+  my $open_sql =
+    "having 0 != charged - coalesce(sum(cust_bill_pay.amount),0)
+                         - coalesce(sum(cust_credit_bill.amount),0)";
+  my $having = '';
+  my $where = '';
   if ( $query eq 'invnum' ) {
     $sortby = \*invnum_sort;
-    @cust_bill = qsearch('cust_bill', {} );
+    #@cust_bill = qsearch('cust_bill', {} );
   } elsif ( $query eq 'date' ) {
     $sortby = \*date_sort;
-    @cust_bill = qsearch('cust_bill', {} );
+    #@cust_bill = qsearch('cust_bill', {} );
   } elsif ( $query eq 'custnum' ) {
     $sortby = \*custnum_sort;
-    @cust_bill = qsearch('cust_bill', {} );
+    #@cust_bill = qsearch('cust_bill', {} );
   } elsif ( $query eq 'OPEN_invnum' ) {
     $sortby = \*invnum_sort;
-    @cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+    #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+    $having = $open_sql;
   } elsif ( $query eq 'OPEN_date' ) {
     $sortby = \*date_sort;
-    @cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+    #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+    $having = $open_sql;
   } elsif ( $query eq 'OPEN_custnum' ) {
     $sortby = \*custnum_sort;
-    @cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+    #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+    $having = $open_sql;
   } elsif ( $query =~ /^OPEN(\d+)_invnum$/ ) {
     my $open = $1 * 86400;
     $sortby = \*invnum_sort;
-    @cust_bill =
-      grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+    #@cust_bill =
+    #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+    $having = $open_sql;
+    $where = "where cust_bill._date < ". (time-$open);
   } elsif ( $query =~ /^OPEN(\d+)_date$/ ) {
     my $open = $1 * 86400;
     $sortby = \*date_sort;
-    @cust_bill =
-      grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+    #@cust_bill =
+    #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+    $having = $open_sql;
+    $where = "where cust_bill._date < ". (time-$open);
   } elsif ( $query =~ /^OPEN(\d+)_custnum$/ ) {
     my $open = $1 * 86400;
     $sortby = \*custnum_sort;
-    @cust_bill =
-      grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+    #@cust_bill =
+    #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+    $having = $open_sql;
+    $where = "where cust_bill._date < ". (time-$open);
   } else {
     die "unknown query string $query";
   }
+  @cust_bill = qsearch(
+    'cust_bill',
+    {},
+    'cust_bill.*,
+     charged - coalesce(sum(cust_bill_pay.amount),0)
+              - coalesce(sum(cust_credit_bill.amount),0) as owed',
+    "left outer join cust_bill_pay using ( invnum )
+     left outer join cust_credit_bill using ( invnum )
+     $where
+     group by ". join(', ', map "cust_bill.$_", fields('cust_bill') ). ' '.
+     $having
+  );
 } else {
   $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
   my $invnum = $2;
@@ -58,7 +97,7 @@ if ( scalar(@cust_bill) == 1 ) {
 %>
 <!-- mason kludge -->
 <%
-  my $total = scalar(@cust_bill);
+  $total = scalar(@cust_bill);
   print header("Invoice Search Results", menubar(
           'Main Menu', popurl(2)
         )), "$total matching invoices found<BR>", &table(), <<END;
-- 
cgit v1.2.1


From d83a273f3ac71431f5b007bb83fb55d7c83eae5c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Jul 2002 11:30:07 +0000
Subject: invoice search with possibly working pager

---
 httemplate/search/cust_bill.cgi | 60 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index dbe7e7dcd..d6492fe49 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -66,26 +66,38 @@ if ( $cgi->keywords ) {
   } else {
     die "unknown query string $query";
   }
+
+  my $extra_sql = "
+    left outer join cust_bill_pay using ( invnum )
+    left outer join cust_credit_bill using ( invnum )
+    $where
+    group by ". join(', ', map "cust_bill.$_", fields('cust_bill') ). ' '.
+    $having;
+
+  my $statement = "SELECT COUNT(*) FROM cust_bill $extra_sql";
+  my $sth = dbh->prepare($statement) or die dbh->errstr. " doing $statement";
+  $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
+
+  $total = $sth->fetchrow_arrayref->[0];
+
   @cust_bill = qsearch(
     'cust_bill',
     {},
     'cust_bill.*,
      charged - coalesce(sum(cust_bill_pay.amount),0)
               - coalesce(sum(cust_credit_bill.amount),0) as owed',
-    "left outer join cust_bill_pay using ( invnum )
-     left outer join cust_credit_bill using ( invnum )
-     $where
-     group by ". join(', ', map "cust_bill.$_", fields('cust_bill') ). ' '.
-     $having
+    "$extra_sql $orderby $limit"
   );
 } else {
   $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
   my $invnum = $2;
   @cust_bill = qsearchs('cust_bill', { 'invnum' => $invnum } );
   $sortby = \*invnum_sort;
+  $total = scalar(@cust_bill);
 }
 
-if ( scalar(@cust_bill) == 1 ) {
+#if ( scalar(@cust_bill) == 1 ) {
+if ( $total == 1 ) {
   my $invnum = $cust_bill[0]->invnum;
   print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
 } elsif ( scalar(@cust_bill) == 0 ) {
@@ -97,10 +109,38 @@ if ( scalar(@cust_bill) == 1 ) {
 %>
 <!-- mason kludge -->
 <%
-  $total = scalar(@cust_bill);
+  #$total = scalar(@cust_bill);
+
+  #begin pager
+  my $pager = '';
+  if ( $total != scalar(@cust_bill) && $maxrecords ) {
+    unless ( $offset == 0 ) {
+      $cgi->param('offset', $offset - $maxrecords);
+      $pager .= '<A HREF="'. $cgi->self_url.
+                '"><B><FONT SIZE="+1">Previous</FONT></B></A> ';
+    }
+    my $poff;
+    my $page;
+    for ( $poff = 0; $poff < $total; $poff += $maxrecords ) {
+      $page++;
+      if ( $offset == $poff ) {
+        $pager .= qq!<FONT SIZE="+2">$page</FONT> !;
+      } else {
+        $cgi->param('offset', $poff);
+        $pager .= qq!<A HREF="!. $cgi->self_url. qq!">$page</A> !;
+      }
+    }
+    unless ( $offset + $maxrecords > $total ) {
+      $cgi->param('offset', $offset + $maxrecords);
+      $pager .= '<A HREF="'. $cgi->self_url.
+                '"><B><FONT SIZE="+1">Next</FONT></B></A> ';
+    }
+  }
+  #end pager
+
   print header("Invoice Search Results", menubar(
           'Main Menu', popurl(2)
-        )), "$total matching invoices found<BR>", &table(), <<END;
+        )), "$total matching invoices found<BR><BR>$pager", &table(), <<END;
       <TR>
         <TH></TH>
         <TH>Balance</TH>
@@ -112,7 +152,7 @@ if ( scalar(@cust_bill) == 1 ) {
 END
 
   my(%saw, $cust_bill);
-  my($tot_balance, $tot_amount) = (0, 0);
+  my($tot_balance, $tot_amount) = (0, 0); #BOGUS
   foreach $cust_bill (
     sort $sortby grep(!$saw{$_->invnum}++, @cust_bill)
   ) {
@@ -162,7 +202,7 @@ END
   print <<END;
       <TR><TD></TD><TH><FONT SIZE=-1>Total</FONT></TH><TH><FONT SIZE=-1>Total</FONT></TH></TR>
       <TR><TD></TD><TD ALIGN="right"><FONT SIZE=-1>\$$tot_balance</FONT></TD><TD ALIGN="right"><FONT SIZE=-1>\$$tot_amount</FONT></TD></TD></TR>
-    </TABLE>
+    </TABLE>$pager
   </BODY>
 </HTML>
 END
-- 
cgit v1.2.1


From 589e9de82292f85a9f09b3075375342db42a0614 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Jul 2002 11:45:39 +0000
Subject: wtf?

---
 httemplate/search/cust_bill.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index d6492fe49..b49296b80 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -97,7 +97,8 @@ if ( $cgi->keywords ) {
 }
 
 #if ( scalar(@cust_bill) == 1 ) {
-if ( $total == 1 ) {
+if ( scalar(@cust_bill) == 1 && $total == 1) {
+#if ( $total == 1 ) {
   my $invnum = $cust_bill[0]->invnum;
   print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
 } elsif ( scalar(@cust_bill) == 0 ) {
-- 
cgit v1.2.1


From c89d696aae0a695b107e7c20ac06aa4b5e69cdac Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Jul 2002 13:23:57 +0000
Subject: try for working paged invoices, this time with subqueries

---
 httemplate/search/cust_bill.cgi | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index b49296b80..6eba4bd49 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -16,11 +16,11 @@ my $total;
 my(@cust_bill, $sortby);
 if ( $cgi->keywords ) {
   my($query) = $cgi->keywords;
-  my $open_sql =
-    "having 0 != charged - coalesce(sum(cust_bill_pay.amount),0)
-                         - coalesce(sum(cust_credit_bill.amount),0)";
-  my $having = '';
-  my $where = '';
+  my $owed = "charged - ( select coalesce(sum(amount),0) from cust_bill_pay
+                          where cust_bill_pay.invnum = cust_bill.invnum )
+                      - ( select coalesce(sum(amount),0) from cust_credit_bill
+                          where cust_credit_bill.invnum = cust_bill.invnum )";
+  my @where;
   if ( $query eq 'invnum' ) {
     $sortby = \*invnum_sort;
     #@cust_bill = qsearch('cust_bill', {} );
@@ -33,46 +33,42 @@ if ( $cgi->keywords ) {
   } elsif ( $query eq 'OPEN_invnum' ) {
     $sortby = \*invnum_sort;
     #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
-    $having = $open_sql;
+    push @where, "0 != $owed";
   } elsif ( $query eq 'OPEN_date' ) {
     $sortby = \*date_sort;
     #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
-    $having = $open_sql;
+    push @where, "0 != $owed";
   } elsif ( $query eq 'OPEN_custnum' ) {
     $sortby = \*custnum_sort;
     #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
-    $having = $open_sql;
+    push @where, "0 != $owed";
   } elsif ( $query =~ /^OPEN(\d+)_invnum$/ ) {
     my $open = $1 * 86400;
     $sortby = \*invnum_sort;
     #@cust_bill =
     #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
-    $having = $open_sql;
-    $where = "where cust_bill._date < ". (time-$open);
+    push @where, "0 != $owed".
+                 "cust_bill._date < ". (time-$open);
   } elsif ( $query =~ /^OPEN(\d+)_date$/ ) {
     my $open = $1 * 86400;
     $sortby = \*date_sort;
     #@cust_bill =
     #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
-    $having = $open_sql;
-    $where = "where cust_bill._date < ". (time-$open);
+    push @where, "0 != $owed".
+                 "cust_bill._date < ". (time-$open);
+
   } elsif ( $query =~ /^OPEN(\d+)_custnum$/ ) {
     my $open = $1 * 86400;
     $sortby = \*custnum_sort;
     #@cust_bill =
     #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
-    $having = $open_sql;
-    $where = "where cust_bill._date < ". (time-$open);
+    push @where, "0 != $owed".
+                 "cust_bill._date < ". (time-$open);
   } else {
     die "unknown query string $query";
   }
 
-  my $extra_sql = "
-    left outer join cust_bill_pay using ( invnum )
-    left outer join cust_credit_bill using ( invnum )
-    $where
-    group by ". join(', ', map "cust_bill.$_", fields('cust_bill') ). ' '.
-    $having;
+  my $extra_sql = scalar(@where) ? join(' AND ', @where) : '';
 
   my $statement = "SELECT COUNT(*) FROM cust_bill $extra_sql";
   my $sth = dbh->prepare($statement) or die dbh->errstr. " doing $statement";
-- 
cgit v1.2.1


From 6a22335d0376846dfbbfda0bb952719b30ce2d30 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Jul 2002 13:25:12 +0000
Subject: don't forget to where the where clause

---
 httemplate/search/cust_bill.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 6eba4bd49..f4ead7042 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -68,7 +68,7 @@ if ( $cgi->keywords ) {
     die "unknown query string $query";
   }
 
-  my $extra_sql = scalar(@where) ? join(' AND ', @where) : '';
+  my $extra_sql = scalar(@where) ? 'WHERE '. join(' AND ', @where) : '';
 
   my $statement = "SELECT COUNT(*) FROM cust_bill $extra_sql";
   my $sth = dbh->prepare($statement) or die dbh->errstr. " doing $statement";
-- 
cgit v1.2.1


From 32b6d9deddc928f98dcad15ff306015d7e0070c5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Jul 2002 13:30:02 +0000
Subject: calculate owed as subquery here too

---
 httemplate/search/cust_bill.cgi | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index f4ead7042..d2a3573d4 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -79,9 +79,7 @@ if ( $cgi->keywords ) {
   @cust_bill = qsearch(
     'cust_bill',
     {},
-    'cust_bill.*,
-     charged - coalesce(sum(cust_bill_pay.amount),0)
-              - coalesce(sum(cust_credit_bill.amount),0) as owed',
+    "cust_bill.*, $owed as owed"
     "$extra_sql $orderby $limit"
   );
 } else {
-- 
cgit v1.2.1


From 6e80f8889a13c47343d81de796f2a7ed4f036803 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Jul 2002 13:31:14 +0000
Subject: comma

---
 httemplate/search/cust_bill.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index d2a3573d4..cb358f9e9 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -79,7 +79,7 @@ if ( $cgi->keywords ) {
   @cust_bill = qsearch(
     'cust_bill',
     {},
-    "cust_bill.*, $owed as owed"
+    "cust_bill.*, $owed as owed",
     "$extra_sql $orderby $limit"
   );
 } else {
-- 
cgit v1.2.1


From f9bab439b413fa0c9a3f495da090ce1c67f6e654 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Jul 2002 13:52:07 +0000
Subject: don't recalculate owed

---
 httemplate/search/cust_bill.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index cb358f9e9..3b6b8fad9 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -147,13 +147,13 @@ if ( scalar(@cust_bill) == 1 && $total == 1) {
 END
 
   my(%saw, $cust_bill);
-  my($tot_balance, $tot_amount) = (0, 0); #BOGUS
+#  my($tot_balance, $tot_amount) = (0, 0); #BOGUS
   foreach $cust_bill (
     sort $sortby grep(!$saw{$_->invnum}++, @cust_bill)
   ) {
     my($invnum, $owed, $charged, $date ) = (
       $cust_bill->invnum,
-      sprintf("%.2f", $cust_bill->owed),
+      sprintf("%.2f", $cust_bill->getfield('owed')),
       sprintf("%.2f", $cust_bill->charged),
       $cust_bill->_date,
     );
-- 
cgit v1.2.1


From 012523fcc0f3bc9994a429eb96b32eab6b3c04ce Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Jul 2002 14:00:49 +0000
Subject: try for correct totals

---
 httemplate/search/cust_bill.cgi | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 3b6b8fad9..6d00593bd 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -70,11 +70,13 @@ if ( $cgi->keywords ) {
 
   my $extra_sql = scalar(@where) ? 'WHERE '. join(' AND ', @where) : '';
 
-  my $statement = "SELECT COUNT(*) FROM cust_bill $extra_sql";
+  my $statement = "SELECT COUNT(*), sum(charged), sum($owed)
+                   FROM cust_bill $extra_sql";
   my $sth = dbh->prepare($statement) or die dbh->errstr. " doing $statement";
   $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
 
-  $total = $sth->fetchrow_arrayref->[0];
+  #$total = $sth->fetchrow_arrayref->[0];
+  ( $total, $tot_amount, $tot_balance ) = @{$sth->fetchrow_arrayref};
 
   @cust_bill = qsearch(
     'cust_bill',
@@ -91,8 +93,7 @@ if ( $cgi->keywords ) {
 }
 
 #if ( scalar(@cust_bill) == 1 ) {
-if ( scalar(@cust_bill) == 1 && $total == 1) {
-#if ( $total == 1 ) {
+if ( $total == 1 ) {
   my $invnum = $cust_bill[0]->invnum;
   print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
 } elsif ( scalar(@cust_bill) == 0 ) {
@@ -159,8 +160,8 @@ END
     );
     my $pdate = time2str("%b %d %Y", $date);
 
-    $tot_balance += $owed;
-    $tot_amount += $charged;
+    #$tot_balance += $owed;
+    #$tot_amount += $charged;
 
     my $rowspan = 1;
 
-- 
cgit v1.2.1


From 4cf0547217f3ccbca2aa9024ab0b396aef8bab5c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Jul 2002 14:12:53 +0000
Subject: totals and order by

---
 httemplate/search/cust_bill.cgi | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 6d00593bd..45ff9f157 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -23,28 +23,35 @@ if ( $cgi->keywords ) {
   my @where;
   if ( $query eq 'invnum' ) {
     $sortby = \*invnum_sort;
+    $orderby = "ORDER BY cust_bill.invnum";
     #@cust_bill = qsearch('cust_bill', {} );
   } elsif ( $query eq 'date' ) {
     $sortby = \*date_sort;
+    $orderby = "ORDER BY cust_bill._date";
     #@cust_bill = qsearch('cust_bill', {} );
   } elsif ( $query eq 'custnum' ) {
     $sortby = \*custnum_sort;
+    $orderby = "ORDER BY cust_bill.custnum";
     #@cust_bill = qsearch('cust_bill', {} );
   } elsif ( $query eq 'OPEN_invnum' ) {
     $sortby = \*invnum_sort;
+    $orderby = "ORDER BY cust_bill.invnum";
     #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
     push @where, "0 != $owed";
   } elsif ( $query eq 'OPEN_date' ) {
     $sortby = \*date_sort;
+    $orderby = "ORDER BY cust_bill._date";
     #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
     push @where, "0 != $owed";
   } elsif ( $query eq 'OPEN_custnum' ) {
     $sortby = \*custnum_sort;
+    $orderby = "ORDER BY cust_bill.custnum";
     #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
     push @where, "0 != $owed";
   } elsif ( $query =~ /^OPEN(\d+)_invnum$/ ) {
     my $open = $1 * 86400;
     $sortby = \*invnum_sort;
+    $orderby = "ORDER BY cust_bill.invnum";
     #@cust_bill =
     #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
     push @where, "0 != $owed".
@@ -52,6 +59,7 @@ if ( $cgi->keywords ) {
   } elsif ( $query =~ /^OPEN(\d+)_date$/ ) {
     my $open = $1 * 86400;
     $sortby = \*date_sort;
+    $orderby = "ORDER BY cust_bill._date";
     #@cust_bill =
     #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
     push @where, "0 != $owed".
@@ -60,6 +68,7 @@ if ( $cgi->keywords ) {
   } elsif ( $query =~ /^OPEN(\d+)_custnum$/ ) {
     my $open = $1 * 86400;
     $sortby = \*custnum_sort;
+    $orderby = "ORDER BY cust_bill.custnum";
     #@cust_bill =
     #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
     push @where, "0 != $owed".
@@ -136,7 +145,11 @@ if ( $total == 1 ) {
 
   print header("Invoice Search Results", menubar(
           'Main Menu', popurl(2)
-        )), "$total matching invoices found<BR><BR>$pager", &table(), <<END;
+        )).
+        "$total matching invoices found<BR>".
+        "\$$tot_balance total balance<BR>".
+        "\$$tot_amount total amount<BR>".
+        "<BR>$pager". table(). <<END;
       <TR>
         <TH></TH>
         <TH>Balance</TH>
@@ -148,7 +161,6 @@ if ( $total == 1 ) {
 END
 
   my(%saw, $cust_bill);
-#  my($tot_balance, $tot_amount) = (0, 0); #BOGUS
   foreach $cust_bill (
     sort $sortby grep(!$saw{$_->invnum}++, @cust_bill)
   ) {
@@ -160,9 +172,6 @@ END
     );
     my $pdate = time2str("%b %d %Y", $date);
 
-    #$tot_balance += $owed;
-    #$tot_amount += $charged;
-
     my $rowspan = 1;
 
     my $view = popurl(2). "view/cust_bill.cgi?$invnum";
@@ -195,10 +204,10 @@ END
   }
   $tot_balance = sprintf("%.2f", $tot_balance);
   $tot_amount = sprintf("%.2f", $tot_amount);
-  print <<END;
-      <TR><TD></TD><TH><FONT SIZE=-1>Total</FONT></TH><TH><FONT SIZE=-1>Total</FONT></TH></TR>
+  print "</TABLE>$pager<BR><BR>". table(). <<END;
+      <TR><TD>-----</TD><TH><FONT SIZE=-1>Total<BR>Balance</FONT></TH><TH><FONT SIZE=-1>Total<BR>Amount</FONT></TH></TR>
       <TR><TD></TD><TD ALIGN="right"><FONT SIZE=-1>\$$tot_balance</FONT></TD><TD ALIGN="right"><FONT SIZE=-1>\$$tot_amount</FONT></TD></TD></TR>
-    </TABLE>$pager
+    </TABLE>
   </BODY>
 </HTML>
 END
-- 
cgit v1.2.1


From 9b76e0bd55bb4df1b9cad6d717bf0b27af72736c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Jul 2002 14:14:32 +0000
Subject: UI

---
 httemplate/search/cust_bill.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 45ff9f157..1ce25d591 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -204,8 +204,8 @@ END
   }
   $tot_balance = sprintf("%.2f", $tot_balance);
   $tot_amount = sprintf("%.2f", $tot_amount);
-  print "</TABLE>$pager<BR><BR>". table(). <<END;
-      <TR><TD>-----</TD><TH><FONT SIZE=-1>Total<BR>Balance</FONT></TH><TH><FONT SIZE=-1>Total<BR>Amount</FONT></TH></TR>
+  print "</TABLE>$pager<BR>". table(). <<END;
+      <TR><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TH><FONT SIZE=-1>Total<BR>Balance</FONT></TH><TH><FONT SIZE=-1>Total<BR>Amount</FONT></TH></TR>
       <TR><TD></TD><TD ALIGN="right"><FONT SIZE=-1>\$$tot_balance</FONT></TD><TD ALIGN="right"><FONT SIZE=-1>\$$tot_amount</FONT></TD></TD></TR>
     </TABLE>
   </BODY>
-- 
cgit v1.2.1


From 508721f2941f287c841f57e6b3077aa90265826c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Jul 2002 14:18:58 +0000
Subject: fix 30/60/90/120 browses

---
 httemplate/search/cust_bill.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 1ce25d591..6b6158943 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -54,7 +54,7 @@ if ( $cgi->keywords ) {
     $orderby = "ORDER BY cust_bill.invnum";
     #@cust_bill =
     #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
-    push @where, "0 != $owed".
+    push @where, "0 != $owed",
                  "cust_bill._date < ". (time-$open);
   } elsif ( $query =~ /^OPEN(\d+)_date$/ ) {
     my $open = $1 * 86400;
@@ -62,7 +62,7 @@ if ( $cgi->keywords ) {
     $orderby = "ORDER BY cust_bill._date";
     #@cust_bill =
     #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
-    push @where, "0 != $owed".
+    push @where, "0 != $owed",
                  "cust_bill._date < ". (time-$open);
 
   } elsif ( $query =~ /^OPEN(\d+)_custnum$/ ) {
@@ -71,7 +71,7 @@ if ( $cgi->keywords ) {
     $orderby = "ORDER BY cust_bill.custnum";
     #@cust_bill =
     #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
-    push @where, "0 != $owed".
+    push @where, "0 != $owed",
                  "cust_bill._date < ". (time-$open);
   } else {
     die "unknown query string $query";
-- 
cgit v1.2.1


From cec3bd39647288b37e32d63ff17c54917ebfe72f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Jul 2002 14:24:54 +0000
Subject: that would be nice...

---
 httemplate/search/cust_bill.cgi | 110 +++++++++++++++++++++-------------------
 1 file changed, 58 insertions(+), 52 deletions(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 6b6158943..6e5d20100 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -21,58 +21,64 @@ if ( $cgi->keywords ) {
                       - ( select coalesce(sum(amount),0) from cust_credit_bill
                           where cust_credit_bill.invnum = cust_bill.invnum )";
   my @where;
-  if ( $query eq 'invnum' ) {
-    $sortby = \*invnum_sort;
-    $orderby = "ORDER BY cust_bill.invnum";
-    #@cust_bill = qsearch('cust_bill', {} );
-  } elsif ( $query eq 'date' ) {
-    $sortby = \*date_sort;
-    $orderby = "ORDER BY cust_bill._date";
-    #@cust_bill = qsearch('cust_bill', {} );
-  } elsif ( $query eq 'custnum' ) {
-    $sortby = \*custnum_sort;
-    $orderby = "ORDER BY cust_bill.custnum";
-    #@cust_bill = qsearch('cust_bill', {} );
-  } elsif ( $query eq 'OPEN_invnum' ) {
-    $sortby = \*invnum_sort;
-    $orderby = "ORDER BY cust_bill.invnum";
-    #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
-    push @where, "0 != $owed";
-  } elsif ( $query eq 'OPEN_date' ) {
-    $sortby = \*date_sort;
-    $orderby = "ORDER BY cust_bill._date";
-    #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
-    push @where, "0 != $owed";
-  } elsif ( $query eq 'OPEN_custnum' ) {
-    $sortby = \*custnum_sort;
-    $orderby = "ORDER BY cust_bill.custnum";
-    #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
-    push @where, "0 != $owed";
-  } elsif ( $query =~ /^OPEN(\d+)_invnum$/ ) {
-    my $open = $1 * 86400;
-    $sortby = \*invnum_sort;
-    $orderby = "ORDER BY cust_bill.invnum";
-    #@cust_bill =
-    #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
-    push @where, "0 != $owed",
-                 "cust_bill._date < ". (time-$open);
-  } elsif ( $query =~ /^OPEN(\d+)_date$/ ) {
-    my $open = $1 * 86400;
-    $sortby = \*date_sort;
-    $orderby = "ORDER BY cust_bill._date";
-    #@cust_bill =
-    #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
-    push @where, "0 != $owed",
-                 "cust_bill._date < ". (time-$open);
-
-  } elsif ( $query =~ /^OPEN(\d+)_custnum$/ ) {
-    my $open = $1 * 86400;
-    $sortby = \*custnum_sort;
-    $orderby = "ORDER BY cust_bill.custnum";
-    #@cust_bill =
-    #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
-    push @where, "0 != $owed",
-                 "cust_bill._date < ". (time-$open);
+  if ( $query =~ /^(OPEN(\d*)_)?(invnum|date|custnum)$/ ) {
+    my($open, $days, $field) = ($1, $2, $3);
+    $field = "_date" if $field eq 'date';
+    $orderby = "ORDER BY cust_bill.$field";
+    push @where, "0 != $owed" if $open;
+    push @where, "cust_bill._date < ". (time-86400*days) if $days;
+#  if ( $query eq 'invnum' ) {
+#    $sortby = \*invnum_sort;
+#    $orderby = "ORDER BY cust_bill.invnum";
+#    #@cust_bill = qsearch('cust_bill', {} );
+#  } elsif ( $query eq 'date' ) {
+#    $sortby = \*date_sort;
+#    $orderby = "ORDER BY cust_bill._date";
+#    #@cust_bill = qsearch('cust_bill', {} );
+#  } elsif ( $query eq 'custnum' ) {
+#    $sortby = \*custnum_sort;
+#    $orderby = "ORDER BY cust_bill.custnum";
+#    #@cust_bill = qsearch('cust_bill', {} );
+#  } elsif ( $query eq 'OPEN_invnum' ) {
+#    $sortby = \*invnum_sort;
+#    $orderby = "ORDER BY cust_bill.invnum";
+#    #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+#    push @where, "0 != $owed";
+#  } elsif ( $query eq 'OPEN_date' ) {
+#    $sortby = \*date_sort;
+#    $orderby = "ORDER BY cust_bill._date";
+#    #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+#    push @where, "0 != $owed";
+#  } elsif ( $query eq 'OPEN_custnum' ) {
+#    $sortby = \*custnum_sort;
+#    $orderby = "ORDER BY cust_bill.custnum";
+#    #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+#    push @where, "0 != $owed";
+#  } elsif ( $query =~ /^OPEN(\d+)_invnum$/ ) {
+#    my $open = $1 * 86400;
+#    $sortby = \*invnum_sort;
+#    $orderby = "ORDER BY cust_bill.invnum";
+#    #@cust_bill =
+#    #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+#    push @where, "0 != $owed",
+#                 "cust_bill._date < ". (time-$open);
+#  } elsif ( $query =~ /^OPEN(\d+)_date$/ ) {
+#    my $open = $1 * 86400;
+#    $sortby = \*date_sort;
+#    $orderby = "ORDER BY cust_bill._date";
+#    #@cust_bill =
+#    #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+#    push @where, "0 != $owed",
+#                 "cust_bill._date < ". (time-$open);
+#
+#  } elsif ( $query =~ /^OPEN(\d+)_custnum$/ ) {
+#    my $open = $1 * 86400;
+#    $sortby = \*custnum_sort;
+#    $orderby = "ORDER BY cust_bill.custnum";
+#    #@cust_bill =
+#    #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+#    push @where, "0 != $owed",
+#                 "cust_bill._date < ". (time-$open);
   } else {
     die "unknown query string $query";
   }
-- 
cgit v1.2.1


From 9ab3b58fe7df492c72959a40cf9c070e10995333 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Jul 2002 14:26:17 +0000
Subject: just might work

---
 httemplate/search/cust_bill.cgi | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 6e5d20100..a5d3842b9 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -103,7 +103,7 @@ if ( $cgi->keywords ) {
   $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
   my $invnum = $2;
   @cust_bill = qsearchs('cust_bill', { 'invnum' => $invnum } );
-  $sortby = \*invnum_sort;
+#  $sortby = \*invnum_sort;
   $total = scalar(@cust_bill);
 }
 
@@ -166,10 +166,11 @@ if ( $total == 1 ) {
       </TR>
 END
 
-  my(%saw, $cust_bill);
-  foreach $cust_bill (
-    sort $sortby grep(!$saw{$_->invnum}++, @cust_bill)
-  ) {
+#  my(%saw, $cust_bill);
+#  foreach $cust_bill (
+#    sort $sortby grep(!$saw{$_->invnum}++, @cust_bill)
+#  ) {
+  foreach my $cust_bill ( @cust_bill ) {
     my($invnum, $owed, $charged, $date ) = (
       $cust_bill->invnum,
       sprintf("%.2f", $cust_bill->getfield('owed')),
-- 
cgit v1.2.1


From e96628dfc2204658ed879e2858d4f49bd6b1d0f2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Jul 2002 14:28:13 +0000
Subject: fixing 30/60/90/120...

---
 httemplate/search/cust_bill.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index a5d3842b9..89c91f576 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -26,7 +26,7 @@ if ( $cgi->keywords ) {
     $field = "_date" if $field eq 'date';
     $orderby = "ORDER BY cust_bill.$field";
     push @where, "0 != $owed" if $open;
-    push @where, "cust_bill._date < ". (time-86400*days) if $days;
+    push @where, "cust_bill._date < ". (time-86400*$days) if $days;
 #  if ( $query eq 'invnum' ) {
 #    $sortby = \*invnum_sort;
 #    $orderby = "ORDER BY cust_bill.invnum";
-- 
cgit v1.2.1


From 91c1b8e16502b31bf824a010a4e2ad1dcf247ec4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Jul 2002 14:33:12 +0000
Subject: clean up after rewrite... turned out rather nice

---
 httemplate/search/cust_bill.cgi | 61 +----------------------------------------
 1 file changed, 1 insertion(+), 60 deletions(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 89c91f576..d1b054dcd 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -13,7 +13,7 @@ $limit .= " OFFSET $offset" if $offset;
 
 my $total;
 
-my(@cust_bill, $sortby);
+my(@cust_bill);
 if ( $cgi->keywords ) {
   my($query) = $cgi->keywords;
   my $owed = "charged - ( select coalesce(sum(amount),0) from cust_bill_pay
@@ -27,58 +27,6 @@ if ( $cgi->keywords ) {
     $orderby = "ORDER BY cust_bill.$field";
     push @where, "0 != $owed" if $open;
     push @where, "cust_bill._date < ". (time-86400*$days) if $days;
-#  if ( $query eq 'invnum' ) {
-#    $sortby = \*invnum_sort;
-#    $orderby = "ORDER BY cust_bill.invnum";
-#    #@cust_bill = qsearch('cust_bill', {} );
-#  } elsif ( $query eq 'date' ) {
-#    $sortby = \*date_sort;
-#    $orderby = "ORDER BY cust_bill._date";
-#    #@cust_bill = qsearch('cust_bill', {} );
-#  } elsif ( $query eq 'custnum' ) {
-#    $sortby = \*custnum_sort;
-#    $orderby = "ORDER BY cust_bill.custnum";
-#    #@cust_bill = qsearch('cust_bill', {} );
-#  } elsif ( $query eq 'OPEN_invnum' ) {
-#    $sortby = \*invnum_sort;
-#    $orderby = "ORDER BY cust_bill.invnum";
-#    #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
-#    push @where, "0 != $owed";
-#  } elsif ( $query eq 'OPEN_date' ) {
-#    $sortby = \*date_sort;
-#    $orderby = "ORDER BY cust_bill._date";
-#    #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
-#    push @where, "0 != $owed";
-#  } elsif ( $query eq 'OPEN_custnum' ) {
-#    $sortby = \*custnum_sort;
-#    $orderby = "ORDER BY cust_bill.custnum";
-#    #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
-#    push @where, "0 != $owed";
-#  } elsif ( $query =~ /^OPEN(\d+)_invnum$/ ) {
-#    my $open = $1 * 86400;
-#    $sortby = \*invnum_sort;
-#    $orderby = "ORDER BY cust_bill.invnum";
-#    #@cust_bill =
-#    #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
-#    push @where, "0 != $owed",
-#                 "cust_bill._date < ". (time-$open);
-#  } elsif ( $query =~ /^OPEN(\d+)_date$/ ) {
-#    my $open = $1 * 86400;
-#    $sortby = \*date_sort;
-#    $orderby = "ORDER BY cust_bill._date";
-#    #@cust_bill =
-#    #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
-#    push @where, "0 != $owed",
-#                 "cust_bill._date < ". (time-$open);
-#
-#  } elsif ( $query =~ /^OPEN(\d+)_custnum$/ ) {
-#    my $open = $1 * 86400;
-#    $sortby = \*custnum_sort;
-#    $orderby = "ORDER BY cust_bill.custnum";
-#    #@cust_bill =
-#    #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
-#    push @where, "0 != $owed",
-#                 "cust_bill._date < ". (time-$open);
   } else {
     die "unknown query string $query";
   }
@@ -90,7 +38,6 @@ if ( $cgi->keywords ) {
   my $sth = dbh->prepare($statement) or die dbh->errstr. " doing $statement";
   $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
 
-  #$total = $sth->fetchrow_arrayref->[0];
   ( $total, $tot_amount, $tot_balance ) = @{$sth->fetchrow_arrayref};
 
   @cust_bill = qsearch(
@@ -103,7 +50,6 @@ if ( $cgi->keywords ) {
   $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
   my $invnum = $2;
   @cust_bill = qsearchs('cust_bill', { 'invnum' => $invnum } );
-#  $sortby = \*invnum_sort;
   $total = scalar(@cust_bill);
 }
 
@@ -120,7 +66,6 @@ if ( $total == 1 ) {
 %>
 <!-- mason kludge -->
 <%
-  #$total = scalar(@cust_bill);
 
   #begin pager
   my $pager = '';
@@ -166,10 +111,6 @@ if ( $total == 1 ) {
       </TR>
 END
 
-#  my(%saw, $cust_bill);
-#  foreach $cust_bill (
-#    sort $sortby grep(!$saw{$_->invnum}++, @cust_bill)
-#  ) {
   foreach my $cust_bill ( @cust_bill ) {
     my($invnum, $owed, $charged, $date ) = (
       $cust_bill->invnum,
-- 
cgit v1.2.1


From 0d14601b500fee8a808f1fff59e622a332b0e5a1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Jul 2002 17:49:47 +0000
Subject: rewrite uid-dup checking to be new-export-aware, closes: #431

---
 FS/FS/svc_acct.pm | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 84faac338..bd01adfdc 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -226,20 +226,27 @@ sub insert {
 
   #new duplicate username checking
 
+  my $part_svc = qsearchs('part_svc', { 'svcpart' => $self->svcpart } );
+  unless ( $part_svc ) {
+    $dbh->rollback if $oldAutoCommit;
+    return 'unknown svcpart '. $self->svcpart;
+  }
+
   my @dup_user = qsearch( 'svc_acct', { 'username' => $self->username } );
   my @dup_userdomain = qsearchs( 'svc_acct', { 'username' => $self->username,
                                                'domsvc'   => $self->domsvc } );
+  my @dup_uid;
+  if ( $part_svc->part_svc_column('uid')->columnflag ne 'F'
+       && $self->username !~ /^(toor|(hyla)?fax)$/          ) {
+    @dup_uid = qsearch( 'svc_acct', { 'uid' => $self->uid } );
+  } else {
+    @dup_uid = ();
+  }
 
-  if ( @dup_user || @dup_userdomain ) {
+  if ( @dup_user || @dup_userdomain || @dup_uid ) {
     my $exports = FS::part_export::export_info('svc_acct');
     my( %conflict_user_svcpart, %conflict_userdomain_svcpart );
 
-    my $part_svc = qsearchs('part_svc', { 'svcpart' => $self->svcpart } );
-    unless ( $part_svc ) {
-      $dbh->rollback if $oldAutoCommit;
-      return 'unknown svcpart '. $self->svcpart;
-    }
-
     foreach my $part_export ( $part_svc->part_export ) {
 
       #this will catch to the same exact export
@@ -276,10 +283,20 @@ sub insert {
 
     foreach my $dup_userdomain ( @dup_userdomain ) {
       my $dup_svcpart = $dup_userdomain->cust_svc->svcpart;
-      if ( exists($conflict_user_svcpart{$dup_svcpart}) ) {
+      if ( exists($conflict_userdomain_svcpart{$dup_svcpart}) ) {
         return "duplicate username\@domain: conflicts with svcnum ".
                $dup_userdomain->svcnum. " via exportnum ".
-               $conflict_user_svcpart{$dup_svcpart};
+               $conflict_userdomain_svcpart{$dup_svcpart};
+      }
+    }
+
+    foreach my $dup_uid ( @dup_uid ) {
+      my $dup_svcpart = $dup_uid->cust_svc->svcpart;
+      if ( exists($conflict_user_svcpart{$dup_svcpart})
+           || exists($conflict_userdomain_svcpart{$dup_svcpart}) ) {
+        return "duplicate uid: conflicts with svcnum". $dup_uid->svcnum.
+               "via exportnum ". $conflict_user_svcpart{$dup_svcpart}
+                                 || $conflict_userdomain_svcpart{$dup_svcpart};
       }
     }
 
@@ -287,15 +304,6 @@ sub insert {
 
   #see?  i told you it was more complicated
 
-  my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
-  return "Unknown svcpart" unless $part_svc;
-  return "uid ". $self->uid. " in use"
-    if $part_svc->part_svc_column('uid')->columnflag ne 'F'
-      && qsearchs( 'svc_acct', { 'uid' => $self->uid } )
-      && $self->username !~ /^(hyla)?fax$/
-      && $self->username !~ /^toor$/ #FreeBSD
-    ;
-
   my @jobnums;
   $error = $self->SUPER::insert(\@jobnums);
   if ( $error ) {
-- 
cgit v1.2.1


From e8f33bb58dd26e2db301cc65144d269b877eac59 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 8 Jul 2002 08:39:49 +0000
Subject: new and improved instructions!  now even more idiot proof!

---
 httemplate/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index c593c956b..800ee01c6 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -14,7 +14,7 @@ Before installing, you need:
     <ul>
       <li><a href="http://www.postgresql.org/">PostgreSQL</a> (v7 or higher) is recommended.
        <li>MySQL has been reported to work.
-         <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you want to use MySQL, you <b>must</b> use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a> or <a href="http://www.mysql.com/doc/I/n/InnoDB.html">InnoDB</a>, and set it as the default table type when running fs-setup using the <code>--default-table-type=BDB</code> or <code>--default-table-type=InnoDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> or <code>--default-table-type=InnoDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
+         <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you want to use MySQL, you <b>must</b> use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a> or <a href="http://www.mysql.com/doc/I/n/InnoDB.html">InnoDB</a>, and set it as the default table type <!-- when running fs-setup --> using the <code>--default-table-type=BDB</code> or <code>--default-table-type=InnoDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> or <code>default-table-type=InnoDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
     </ul>
   <li>Perl modules (<a href="http://theoryx5.uwinnipeg.ca/CPAN/perl/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
     <ul>
-- 
cgit v1.2.1


From 98d6bdc2b96ad27bc1bfa30721715e3f33f5c717 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 8 Jul 2002 10:01:03 +0000
Subject: default linux/netbsd shellcommand userdel should remove home
 directories

---
 FS/FS/part_export.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 3982168a5..0597cddf2 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -534,7 +534,7 @@ tie my %shellcommands_options, 'Tie::IxHash',
                        default=>'',
                      },
   'userdel' => { label=>'Delete command',
-                 default=>'userdel $username',
+                 default=>'userdel -r $username',
                  #default=>'rm -rf $dir',
                },
   'userdel_stdin' => { label=>'Delete command STDIN',
@@ -719,7 +719,7 @@ tie my %sqlmail_options, 'Tie::IxHash',
       'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
       'options' => \%shellcommands_options,
       'nodomain' => 'Y',
-      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = "";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "pw userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -h 0"; this.form.usermod_stdin.value = "$new__password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>',
+      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = "";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "pw userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -h 0"; this.form.usermod_stdin.value = "$new__password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>',
     },
 
     'shellcommands_withdomain' => {
-- 
cgit v1.2.1


From e61703420a7eaef1f16ad4251cc7733e7a35604f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 8 Jul 2002 10:52:47 +0000
Subject: remove perl-side sort routines, no longer needed

---
 httemplate/search/cust_bill.cgi | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index d1b054dcd..586399a41 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -162,17 +162,4 @@ END
 
 }
 
-#
-
-sub invnum_sort {
-  $a->invnum <=> $b->invnum;
-}
-
-sub custnum_sort {
-  $a->custnum <=> $b->custnum || $a->invnum <=> $b->invnum;
-}
-
-sub date_sort {
-  $a->_date <=> $b->_date || $a->invnum <=> $b->invnum;
-}
 %>
-- 
cgit v1.2.1


From 1f8d7610c245ecb21667aa656ce083420e5bb797 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 8 Jul 2002 13:07:40 +0000
Subject: edit expiration dates

---
 httemplate/edit/REAL_cust_pkg.cgi         | 19 +++++++++++++------
 httemplate/edit/process/REAL_cust_pkg.cgi |  1 +
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index 580313e88..0d2f1c238 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -1,6 +1,6 @@
 <!-- mason kludge -->
 <%
-# <!-- $Id: REAL_cust_pkg.cgi,v 1.3 2002-04-23 07:32:49 ivan Exp $ -->
+# <!-- $Id: REAL_cust_pkg.cgi,v 1.4 2002-07-08 13:07:40 ivan Exp $ -->
 
 my $error ='';
 my $pkgnum = '';
@@ -45,7 +45,7 @@ print '<FORM NAME="formname" ACTION="process/REAL_cust_pkg.cgi" METHOD="POST">',
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT>!
   if $error;
 
-print &ntable("#cccccc"), '<TR><TD>', &ntable("#cccccc",2),
+print ntable("#cccccc",2),
       '<TR><TD ALIGN="right">Package number</TD><TD BGCOLOR="#ffffff">',
       $pkgnum, '</TD></TR>',
       '<TR><TD ALIGN="right">Package</TD><TD BGCOLOR="#ffffff">',
@@ -66,16 +66,23 @@ print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
        time2str("%D",$susp), '</TD></TR>'
   if $susp;
 
-print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
-       time2str("%D",$expire), '</TD></TR>'
-  if $expire;
+#print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
+#       time2str("%D",$expire), '</TD></TR>'
+#  if $expire;
+print '<TR><TD ALIGN="right">Expiration date'.
+      '</TD><TD>',
+      '<INPUT TYPE="text" NAME="expire" SIZE=32 VALUE="',
+      ( $expire ? time2str("%c %z (%Z)",$expire) : "" ), '">'.
+      '<BR><FONT SIZE=-1>(will <b>cancel</b> this package'.
+      ' when the date is reached)</FONT>'.
+      '</TD></TR>';
 
 print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
        time2str("%D",$cancel), '</TD></TR>'
   if $cancel;
 
 %>
-</TABLE></TD></TR></TABLE>
+</TABLE>
 <BR><INPUT TYPE="submit" VALUE="Apply Changes">
 </FORM>
 </BODY>
diff --git a/httemplate/edit/process/REAL_cust_pkg.cgi b/httemplate/edit/process/REAL_cust_pkg.cgi
index 6bed85c19..2e0352c76 100755
--- a/httemplate/edit/process/REAL_cust_pkg.cgi
+++ b/httemplate/edit/process/REAL_cust_pkg.cgi
@@ -5,6 +5,7 @@ my $old = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
 my %hash = $old->hash;
 $hash{'setup'} = $cgi->param('setup') ? str2time($cgi->param('setup')) : '';
 $hash{'bill'} = $cgi->param('bill') ? str2time($cgi->param('bill')) : '';
+$hash{'expire'} = $cgi->param('expire') ? str2time($cgi->param('expire')) : '';
 my $new = new FS::cust_pkg \%hash;
 
 my $error = $new->replace($old);
-- 
cgit v1.2.1


From 6f697cb59812d287079190681d3fc7330f29b960 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 8 Jul 2002 15:56:32 +0000
Subject: better error message

---
 httemplate/edit/svc_acct.cgi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index eca0a31cf..90b26324a 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -12,8 +12,8 @@ if ( $cgi->param('error') ) {
   $svcnum = $svc_acct->svcnum;
   $pkgnum = $cgi->param('pkgnum');
   $svcpart = $cgi->param('svcpart');
-  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  die "No part_svc entry!" unless $part_svc;
+  $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
+  die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
   @groups = $cgi->param('radius_usergroup');
 } else {
   my($query) = $cgi->keywords;
@@ -28,8 +28,8 @@ if ( $cgi->param('error') ) {
     $pkgnum=$cust_svc->pkgnum;
     $svcpart=$cust_svc->svcpart;
 
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
+    $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
+    die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
 
     @groups = $svc_acct->radius_groups;
 
@@ -41,8 +41,8 @@ if ( $cgi->param('error') ) {
       $pkgnum=$1 if /^pkgnum(\d+)$/;
       $svcpart=$1 if /^svcpart(\d+)$/;
     }
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
+    $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
+    die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
 
     $svcnum='';
 
-- 
cgit v1.2.1


From fc99564551bfb9c5dbb1f6e6f8e751d6124e001a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 8 Jul 2002 17:14:23 +0000
Subject: oops, fix for bug only surfacing with different freeside uid/gid

---
 FS/bin/freeside-queued | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 20a6ff9fb..83074b9e4 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -41,8 +41,8 @@ my $freeside_gid = scalar(getgrnam('freeside'))
 $) = $freeside_gid;
 $( = $freeside_gid;
 #if freebsd can't setuid(), presumably it can't setgid() either.  grr fleabsd
-($<,$>) = ($>,$<);
-$> = $freeside_gid;
+($(,$)) = ($),$();
+$) = $freeside_gid;
 
 $> = $FS::UID::freeside_uid;
 $< = $FS::UID::freeside_uid;
-- 
cgit v1.2.1


From 768935cdc63dd2071941a26959a710bce3ba1de3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 9 Jul 2002 02:23:36 +0000
Subject: new schema diagram

---
 httemplate/docs/schema.dia | Bin 11452 -> 14414 bytes
 httemplate/docs/schema.png | Bin 496268 -> 681043 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/httemplate/docs/schema.dia b/httemplate/docs/schema.dia
index c22a470e0..092d2f88b 100644
Binary files a/httemplate/docs/schema.dia and b/httemplate/docs/schema.dia differ
diff --git a/httemplate/docs/schema.png b/httemplate/docs/schema.png
index ba22f59c2..d0392e76f 100644
Binary files a/httemplate/docs/schema.png and b/httemplate/docs/schema.png differ
-- 
cgit v1.2.1


From b58821fcd50e52ae726834ef3863b85ed293379f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Jul 2002 13:52:39 +0000
Subject: finally working async framework

---
 fs_selfservice/DEPLOY                              |   8 +
 fs_selfservice/FS-SelfService/MANIFEST             |   2 +-
 fs_selfservice/FS-SelfService/SelfService.pm       | 103 ++++++----
 .../FS-SelfService/freeside-selfservice-clientd    | 222 +++++++++++++++++++++
 fs_selfservice/freeside-selfservice-server         | 115 +++++++++--
 fs_selfservice/fs_passwd_test                      |  14 ++
 6 files changed, 409 insertions(+), 55 deletions(-)
 create mode 100755 fs_selfservice/DEPLOY
 create mode 100644 fs_selfservice/FS-SelfService/freeside-selfservice-clientd
 create mode 100755 fs_selfservice/fs_passwd_test

diff --git a/fs_selfservice/DEPLOY b/fs_selfservice/DEPLOY
new file mode 100755
index 000000000..9b03bf259
--- /dev/null
+++ b/fs_selfservice/DEPLOY
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+cd FS-SelfService
+perl Makefile.PL && make && make install
+
+cd ..
+kill `cat /var/run/freeside-selfservice-server.ivan.pid`; sleep 3
+./freeside-selfservice-server ivan localhost
diff --git a/fs_selfservice/FS-SelfService/MANIFEST b/fs_selfservice/FS-SelfService/MANIFEST
index 3c490e7dd..ebd0d3b1a 100644
--- a/fs_selfservice/FS-SelfService/MANIFEST
+++ b/fs_selfservice/FS-SelfService/MANIFEST
@@ -1,6 +1,6 @@
 Changes
 Makefile.PL
 MANIFEST
-README
 SelfService.pm
 test.pl
+freeside-selfservice-clientd
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 75e550a2d..3cd4fd94e 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -1,66 +1,95 @@
 package FS::SelfService;
 
-use 5.006;
 use strict;
-use warnings;
+use vars qw($VERSION @ISA @EXPORT_OK $socket);
+use Exporter;
+use Socket;
+use FileHandle;
+#use IO::Handle;
+use IO::Select;
+use Storable qw(nstore_fd fd_retrieve);
 
-require Exporter;
+$VERSION = '0.03';
 
-our @ISA = qw(Exporter);
+@ISA = qw( Exporter );
+@EXPORT_OK = qw( passwd );
 
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
+$socket =  "/usr/local/freeside/selfservice_socket";
 
-# This allows declaration	use FS::SelfService ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = ( 'all' => [ qw(
-	
-) ] );
+$ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin';
+$ENV{'SHELL'} = '/bin/sh';
+$ENV{'IFS'} = " \t\n";
+$ENV{'CDPATH'} = '';
+$ENV{'ENV'} = '';
+$ENV{'BASH_ENV'} = '';
 
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+my $freeside_uid = scalar(getpwnam('freeside'));
+die "not running as the freeside user\n" if $> != $freeside_uid;
 
-our @EXPORT = qw(
-	
-);
-our $VERSION = '0.01';
+=head1 NAME
 
+FS::SelfService - Freeside self-service API
 
-# Preloaded methods go here.
+=head1 SYNOPSIS
 
-1;
-__END__
-# Below is stub documentation for your module. You better edit it!
+=head1 DESCRIPTION
 
-=head1 NAME
+Use this API to implement your own client "self-service" module.
 
-FS::SelfService - Perl extension for blah blah blah
+If you just want to customize the look of the existing "self-service" module,
+see XXXX instead.
 
-=head1 SYNOPSIS
+=head1 FUNCTIONS
 
-  use FS::SelfService;
-  blah blah blah
+=over 4
 
-=head1 DESCRIPTION
+=item passwd
 
-Stub documentation for FS::SelfService, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
+Returns the empty value on success, or an error message on errors.
 
-Blah blah blah.
+=cut
 
-=head2 EXPORT
+sub passwd {
+  my $param;
+  if ( ref($_[0]) ) {
+    $param = shift;
+  } else {
+    $param = { @_ };
+  }
 
-None by default.
+  $param->{_packet} = 'passwd';
 
+  simple_packet($param);
+}
 
-=head1 AUTHOR
+sub simple_packet {
+  my $packet = shift;
+  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+  connect(SOCK, sockaddr_un($socket)) or die "connect: $!";
+  nstore_fd($packet, \*SOCK) or die "can't send packet: $!";
+  SOCK->flush;
 
-A. U. Thor, E<lt>a.u.thor@a.galaxy.far.far.awayE<gt>
+  #shoudl trap: Magic number checking on storable file failed at blib/lib/Storable.pm (autosplit into blib/lib/auto/Storable/fd_retrieve.al) line 337, at /usr/local/share/perl/5.6.1/FS/SelfService.pm line 71
+
+  #block until there is a message on socket
+#  my $w = new IO::Select;
+#  $w->add(\*SOCK);
+#  my @wait = $w->can_read;
+  my $return = fd_retrieve(\*SOCK) or die "error reading result: $!";
+  die $return->{'_error'} if defined $return->{_error} && $return->{_error};
+
+  $return->{'error'};
+}
+
+=back
+
+=head1 BUGS
 
 =head1 SEE ALSO
 
-L<perl>.
+L<freeside-selfservice-clientd>, L<freeside-selfservice-server>
 
 =cut
+
+1;
+
diff --git a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
new file mode 100644
index 000000000..149f894e0
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
@@ -0,0 +1,222 @@
+#!/usr/bin/perl -w
+#
+# freeside-selfservice-clientd
+#
+# This is run REMOTELY over ssh by freeside-selfservice-server
+
+use strict;
+use subs qw(spawn logmsg);
+use Fcntl qw(:flock);
+use Socket;
+use Storable qw(nstore_fd fd_retrieve);
+use IO::Handle;
+use IO::Select;
+use IPC::Open2;
+
+use LockFile::Simple qw(lock unlock);
+
+use vars qw( $Debug );
+$Debug = 2;
+
+my $socket = "/usr/local/freeside/selfservice_socket";
+my $pid_file = "$socket.pid";
+my $lock_file = "$socket.lock";
+unlink $lock_file;
+
+my $me = '[client]';
+
+$|=1;
+
+#read data to be cached or something
+#warn "$me Reading init data\n" if $Debug;
+#my $signup_init = 
+
+warn "[client] Creating $socket\n" if $Debug;
+my $uaddr = sockaddr_un($socket);
+my $proto = getprotobyname('tcp');
+socket(Server,PF_UNIX,SOCK_STREAM,0) or die "socket: $!";
+unlink($socket);
+bind(Server, $uaddr) or die "bind: $!";
+listen(Server,SOMAXCONN) or die "listen: $!";
+
+if ( -e $pid_file ) {
+  open(PIDFILE,"<$pid_file");
+  #chomp( my $old_pid = <PIDFILE> );
+  my $old_pid = <PIDFILE>;
+  close PIDFILE;
+  $old_pid =~ /^(\d+)$/;
+  kill 'TERM', $1;
+}
+open(PIDFILE,">$pid_file");
+print PIDFILE "$$\n";
+close PIDFILE;
+
+#my $waitedpid;
+#sub REAPER { $waitedpid = wait; $SIG{CHLD} = \&REAPER; }
+#$SIG{CHLD} =  \&REAPER;
+
+warn "[client] entering main loop\n" if $Debug;
+
+#sub spawn;
+#sub logmsg;
+
+my %kids;
+
+  #    my $gar = <STDIN>;
+
+#my $s = new IO::Select;
+#$s->add(\*STDIN);
+#$s->add(\*Server);
+
+#for ( $waitedpid = 0;
+#      accept(Client,Server) || $waitedpid;
+#      $waitedpid = 0, close Client)
+#{
+#  next if $waitedpid;
+
+#$SIG{PIPE} = sub { warn "SIGPIPE received" };
+#$SIG{CHLD} = sub { warn "SIGCHLD received" };
+
+sub REAPER { warn "SIGCHLD received"; my $pid = wait; $SIG{CHLD} = \&REAPER; }
+#sub REAPER { my $pid = wait; delete $kids{$pid}; $SIG{CHLD} = \&REAPER; }
+$SIG{CHLD} =  \&REAPER;
+
+warn "[client] creating IO::Select\n" if $Debug;
+my $s = new IO::Select;
+$s->add(\*STDIN);
+$s->add(\*Server);
+
+while (1) {
+
+warn "[client] waiting for connection or token\n" if $Debug;
+while ( my @handles = $s->can_read ) {
+
+  foreach my $handle ( @handles ) {
+
+    if ( $handle == \*STDIN ) {
+
+#      my $gar = <STDIN>;
+#      die $gar;
+
+      my $packet = fd_retrieve(\*STDIN);
+      my $token = $packet->{'_token'};
+      warn "[client] received packet with token $token\n".
+           join('', map { " $_=>$packet->{$_}\n" } keys %$packet )
+        if $Debug;
+     if ( exists($kids{$token}) ) {
+        warn "[client] sending return packet to $token via $kids{$token}\n"
+          if $Debug;
+        nstore_fd($packet, $kids{$token});
+        warn "[client] flushing $kids{$token}\n" if $Debug;
+        $kids{$token}->flush;
+        #eval { $kids{$token}->flush; };
+        #die "error flushing?!?!? $@\n" if $@ ne '';
+        #warn "[client] closing $kids{$token}\n";
+        #close $kids{$token};
+        #warn "[client] deleting $kids{$token}\n";
+        #delete $kids{$token};
+        warn "[client] done with $token\n" if $Debug;
+      } else {
+        warn "[client] WARNING: unknown token $token, discarding message";
+        #die "[client] FATAL: unknown token $token, discarding message";
+      }
+
+    } elsif ( $handle == \*Server ) {
+
+      warn "[client] received local connection; forking\n" if $Debug;
+
+      accept(Client, Server);
+
+      spawn sub { #child
+        warn "[client-$$] reading packet from local client" if $Debug > 1;
+        my $packet = fd_retrieve(\*Client);
+        warn "[client-$$] packet received:\n".
+             join('', map { " $_=>$packet->{$_}\n" } keys %$packet )
+          if $Debug > 1;
+        my $command = $packet->{'command'};
+        #handle some commands weirdly?
+        $packet->{_token}=$$; #??
+
+        warn "[client-$$] sending packet to remote server" if $Debug > 1;
+        flock(STDOUT, LOCK_EX); #acquire write lock
+        #lock($lock_file);
+        nstore_fd($packet, \*STDOUT);
+        STDOUT->flush;
+        #unlock($lock_file);
+        flock(STDOUT, LOCK_UN); #release write lock
+
+        warn "[client-$$] waiting for response from parent" if $Debug > 1;
+
+        #block until parent has a message
+        my $w = new IO::Select;
+        $w->add(\*STDIN);
+        my @wait = $w->can_read;
+        my $rv = fd_retrieve(\*STDIN);
+
+        #close STDIN;
+
+        warn "[client-$$] sending response to local client" if $Debug > 1;
+
+        #send message to local client
+        nstore_fd($rv, \*Client);
+        Client->flush;
+
+        close Client;
+
+        warn "[client-$$] child exiting" if $Debug > 1;
+
+        #while (1) { sleep 5 };
+        #sleep 5;
+        exit;
+
+      }; #eo child
+
+      #close Client; #in parent, right?
+
+    } else {
+      die "wtf?  $handle";
+    }
+
+  }
+
+  warn "[client] done handling messages; returning to wait-state" if $Debug;;
+
+}
+
+#die "[client] died unexpectedly: $!\n";
+warn "[client] fell-through unexpectedly: $!\n" if $Debug;
+
+} #WTF?
+
+sub spawn {
+    my $coderef = shift;
+
+    unless (@_ == 0 && $coderef && ref($coderef) eq 'CODE') {
+        use Carp;
+        confess "usage: spawn CODEREF";
+    }
+
+    my $pid;
+    #if (!defined($pid = fork)) {
+    my $kid = new IO::Handle;
+    if (!defined($pid = open($kid, '|-'))) {
+        logmsg "WARNING: cannot fork: $!";
+        return;
+    } elsif ($pid) {
+        logmsg "begat $pid" if $Debug;
+        $kids{$pid} = $kid;
+        #$kids{$pid}->autoflush;
+        return; # I'm the parent
+    }
+    # else I'm the child -- go spawn
+
+#    open(STDIN,  "<&Client")   || die "can't dup client to stdin";
+#    open(STDOUT, ">&Client")   || die "can't dup client to stdout";
+    ## open(STDERR, ">&STDOUT") || die "can't dup stdout to stderr";
+    exit &$coderef();
+}
+
+#sub logmsg { print "$0 $$: @_ at ", scalar localtime, "\n" }
+#DON'T PRINT!!!!!
+sub logmsg { warn "[client] $0 $$: @_ at ", scalar localtime, "\n" }
+
diff --git a/fs_selfservice/freeside-selfservice-server b/fs_selfservice/freeside-selfservice-server
index 6146d3752..7b4a88166 100644
--- a/fs_selfservice/freeside-selfservice-server
+++ b/fs_selfservice/freeside-selfservice-server
@@ -12,10 +12,13 @@ use vars qw( $kids $max_kids $shutdown $log_file );
 use vars qw($ssh_pid);
 use Fcntl qw(:flock);
 use POSIX qw(setsid);
+use Date::Format;
 use IO::Handle;
 use Storable qw(nstore_fd fd_retrieve);
 use Net::SSH qw(sshopen2);
-use FS::UID qw(adminsuidsetup);
+use FS::UID qw(adminsuidsetup forksuidsetup);
+
+use LockFile::Simple qw(lock unlock);
 
 #use Tie::RefHash;
 #use FS::Conf;
@@ -32,6 +35,8 @@ my $user = shift or die &usage;
 my $machine = shift or die &usage;
 my $pid_file = "/var/run/freeside-selfservice-server.$user.pid";
 #my $pid_file = "/var/run/freeside-selfservice-server.$user.pid"; $FS::UID::datasrc not posible, but should include machine name at least, hmm
+my $lock_file = "/usr/local/etc/freeside/freeside-selfservice-server.$user.lock";
+unlink $lock_file;
 
 &init($user);
 
@@ -47,51 +52,64 @@ my %dispatch = (
 my $warnkids=0;
 while (1) {
   my($reader, $writer) = (new IO::Handle, new IO::Handle);
-  warn "connecting to $machine";
+  warn "connecting to $machine\n";
   $ssh_pid = sshopen2($machine,$reader,$writer,$clientd);
 
-  warn "entering main loop";
+#  nstore_fd(\*writer, {'hi'=>'there'});
+
+  warn "entering main loop\n";
+  my $undisp = 0;
   while (1) {
 
-    warn "waiting for packet from client";
+    warn "waiting for packet from client\n" unless $undisp;
+    $undisp = 1;
     my $packet = eval {
       local $SIG{__DIE__};
-      local $SIG{ALRM} = sub { die "alarm\n" }; #NB: \n required
+      local $SIG{ALRM} = sub { local $SIG{__DIE__};die "MyAlarm\n" }; #NB: \n required
       alarm 5;
+      #my $string = <$reader>;
+      #die $string;
       my $p = fd_retrieve($reader);
       alarm 0;
       $p;
     };
     if ($@) {
-      die $@ unless $@ eq "alarm\n";
+      &shutdown if $shutdown && $@;
+      die "Fatal error receiving packet from client: $@" if $@ !~ /^MyAlarm/;
+      #die $@ unless $@ eq "alarm\n" || $@ eq 'Alarm'; #?????
       #timeout
       next unless $shutdown;
       &shutdown;
     }
-    warn "packet received";
+    warn "packet received\n".
+         join('', map { " $_=>$packet->{$_}\n" } keys %$packet );
+
+    $undisp = 0;
 
     #prevent runaway forking
     my $warnkids = 0;
     while ( $kids >= $max_kids ) {
-      warn "WARNING: maximum $kids children reached" unless $warnkids++;
+      warn "WARNING: maximum $kids children reached\n" unless $warnkids++;
       sleep 1;
     }
 
-    warn "forking child";
+    warn "forking child\n";
     defined( my $pid = fork ) or die "can't fork: $!";
     if ( $pid ) {
-      warn "child $pid spawned";
+      warn "child $pid spawned\n";
       $kids++;
     } else { #kid time
 
+      #local($SIG{PIPE});
+
       #get new db handle
-      $FS::UID::dbh->{InactiveDestroy} = 1;
+      #$FS::UID::dbh->{InactiveDestroy} = 1;
       forksuidsetup($user);
 
       my $sub = $dispatch{$packet->{_packet}};
       my $rv;
       if ( $sub ) {
-        warn "calling $sub handler"; 
+        warn "calling $sub handler\n"; 
         $rv = &{$sub}($packet);
       } else {
         warn my $error = "WARNING: unknown packet type ". $packet->{_packet};
@@ -99,13 +117,15 @@ while (1) {
       }
       $rv->{_token} = $packet->{_token}; #identifier
 
-      warn "sending response";
+      warn "sending response\n";
       flock($writer, LOCK_EX); #acquire write lock
+      #lock($lock_file);
       nstore_fd($rv, $writer) or die "can't send response: $!";
       $writer->flush;
+      #unlock($lock_file);
       flock($writer, LOCK_UN); #release write lock
-
-      warn "child exiting";
+#
+      warn "child exiting\n";
       exit; #end-of-kid
     }
 
@@ -113,6 +133,50 @@ while (1) {
 
 }
 
+###
+# dispatch subroutines (should live elsewhere eventually)
+###
+
+sub passwd {
+  #sleep 3;
+  use FS::Record qw(qsearchs);
+  use FS::svc_acct;
+  #use FS::svc_domain;
+
+  my $packet = shift;
+
+  #my $domain = qsearchs('svc_domain', { 'domain' => $packet->{'domain'} } )
+  #  or return { error => "Domain $domain not found" };
+
+  my $old_password = $packet->{'old_password'};
+  my $new_password = $packet->{'new_password'};
+  my $new_gecos = $packet->{'new_gecos'};
+  my $new_shell = $packet->{'new_shell'};
+
+  my $svc_acct =
+    ( length($old_password) < 13
+      && qsearchs( 'svc_acct', { 'username'  => $packet->{'username'},
+                                 #'domsvc'    => $svc_domain->domsvc,
+                                 '_password' => $old_password } )
+    )
+    || qsearchs( 'svc_acct', { 'username'  => $packet->{'username'},
+                               #'domsvc'    => $svc_domain->domsvc,
+                               '_password' => $old_password } );
+
+  unless ( $svc_acct ) { return { error => 'Incorrect password.' } }
+
+  my %hash = $svc_acct->hash;
+  my $new_svc_acct = new FS::svc_acct ( \%hash );
+  $new_svc_acct->setfield('_password', $new_password ) 
+    if $new_password && $new_password ne $old_password;
+  $new_svc_acct->setfield('finger',$new_gecos) if $new_gecos;
+  $new_svc_acct->setfield('shell',$new_shell) if $new_shell;
+  my $error = $new_svc_acct->replace($svc_acct);
+
+  return { error => $error };
+
+}
+
 ###
 # utility subroutines
 ###
@@ -143,6 +207,23 @@ sub init {
 
   $> = $FS::UID::freeside_uid unless $>;
   $< = $>;
+
+  #false laziness w/freeside-queued
+  my $freeside_gid = scalar(getgrnam('freeside'))
+    or die "can't setgid to freeside group\n";
+  $) = $freeside_gid;
+  $( = $freeside_gid;
+  #if freebsd can't setuid(), presumably it can't setgid() either.  grr fleabsd
+  ($(,$)) = ($),$();
+  $) = $freeside_gid;
+
+  $> = $FS::UID::freeside_uid;
+  $< = $FS::UID::freeside_uid;
+  #freebsd is sofa king broken, won't setuid()
+  ($<,$>) = ($>,$<);
+  $> = $FS::UID::freeside_uid;
+  #eslaf
+
   $ENV{HOME} = (getpwuid($>))[7]; #for ssh
   adminsuidsetup $user;
 
@@ -152,7 +233,7 @@ sub init {
   open STDOUT, '>/dev/null'
                             or die "Can't write to /dev/null: $!";
   setsid                  or die "Can't start a new session: $!";
-  open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
+#  open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
 
   $SIG{__DIE__} = \&_die;
   $SIG{__WARN__} = \&_logmsg;
@@ -163,7 +244,7 @@ sub init {
 
 sub shutdown {
   my $wait = 12; #wait up to 1 minute
-  while ( $kids && $wait-- ) {
+  while ( $kids > 0 && $wait-- ) {
     warn "waiting for $kids children to terminate";
     sleep 5;
   }
diff --git a/fs_selfservice/fs_passwd_test b/fs_selfservice/fs_passwd_test
new file mode 100755
index 000000000..77782e651
--- /dev/null
+++ b/fs_selfservice/fs_passwd_test
@@ -0,0 +1,14 @@
+#!/usr/bin/perl -w
+
+use strict;
+use FS::SelfService qw(passwd);
+
+my $error = passwd(
+  'username' => 'ivan',
+  'old_password' => 'heyhoo',
+  'new_password' => 'haloo',
+);
+
+die $error if $error;
+
+print "password changed sucessfully\n";
-- 
cgit v1.2.1


From 6fb47adef49450c1fb237251aae911b0825e6869 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 14 Jul 2002 00:28:23 +0000
Subject: no mason 1.1x yet :(

---
 httemplate/docs/install.html  | 3 ++-
 httemplate/docs/upgrade8.html | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 800ee01c6..e8e80baf6 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -46,7 +46,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>
       <li><a href="http://search.cpan.org/search?dist=String-ShellQuote">String-ShellQuote</a>
       <li><a href="http://search.cpan.org/search?dist=Net-SCP">Net-SCP</a>
-      <li><a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a>
+      <li><a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a> (use version 1.0x - Freeside is not yet compatible with version 1.1x)
       <li><a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a>
       <li><a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>
       <li><a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a>
@@ -135,6 +135,7 @@ PerlSetVar Debug 2
 </pre></font>
     </ul></td>
     <td><ul>
+      <li>(use version 1.0x - Freeside is not yet compatible with version 1.1x)
       <li>Run <tt>make masondocs</tt>
       <li>Copy <tt>masondocs/</tt> to your web server's document space.
       <li>Copy <tt>htetc/handler.pl</tt> to your web server's configuration directory.
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 75155407c..0210430ef 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -8,7 +8,7 @@
   <li><font size="+2" color="#ff0000">Backup your database and current Freeside installation.</font> (with&nbsp;<a href="http://www.ca.postgresql.org/devel-corner/docs/postgres/backup.html">PostgreSQL</a>) (with&nbsp;<a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Backup">MySQL</a>)
   <li><a href="http://perl.apache.org/">mod_perl</a> is now required.
   <li>Install <a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>, <a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a> and <a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a> (minimum version 0.02).
-  <li>Install <a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a>.
+  <li>Install <a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a> (use version 1.0x - Freeside is not yet compatible with version 1.1x).
   <li>Install <a href="http://rsync.samba.org/">rsync</a>
 </ul>
 <table>
@@ -36,6 +36,7 @@ PerlSetVar Global /usr/local/etc/freeside/asp-global/
 </pre></font>
     </ul></td>
     <td><ul>
+      <li>(use version 1.0x - Freeside is not yet compatible with version 1.1x)
       <li>Run <tt>make masondocs</tt>
       <li>Copy <tt>masondocs/</tt> to your web server's document space.
       <li>Copy <tt>htetc/handler.pl</tt> to your web server's configuration directory.
-- 
cgit v1.2.1


From d9eabfe79d568b4b6e346f2e935df6ebcd232278 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 Jul 2002 01:44:23 +0000
Subject: finally a working DNS::ZoneParse

---
 bin/bind.import | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/bind.import b/bin/bind.import
index 688e3222c..57eca2b63 100755
--- a/bin/bind.import
+++ b/bin/bind.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: bind.import,v 1.2 2002-06-21 09:13:16 ivan Exp $
+# $Id: bind.import,v 1.3 2002-07-15 01:44:23 ivan Exp $
 
 #need to manually put header in /usr/local/etc/freeside/export.<datasrc./bind/<machine>/named.conf.HEADER
 
@@ -8,7 +8,7 @@ use strict;
 use vars qw( %d_part_svc );
 use Term::Query qw(query);
 #use BIND::Conf_Parser;
-#use DNS::ZoneParse;
+#use DNS::ZoneParse 0.81;
 
 #use Net::SCP qw(iscp);
 use Net::SCP qw(scp);
@@ -140,7 +140,7 @@ BEGIN {
       scp("root\@$main::named_machine:$sourcefile",
           "$main::prefix/$basefile.import");
     
-      use DNS::ZoneParse;
+      use DNS::ZoneParse 0.81;
       my $zone = DNS::ZoneParse->new("$main::prefix/$basefile.import");
     
       my $dump = $zone->Dump;
-- 
cgit v1.2.1


From 0393935877eebdd5bc0932d5ba0ef030bc46d167 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 Jul 2002 08:28:18 +0000
Subject: working framework, no hung clients, whew

---
 .../FS-SelfService/freeside-selfservice-clientd    | 174 +++++++++++----------
 fs_selfservice/freeside-selfservice-server         | 121 +++++++-------
 fs_selfservice/fs_passwd_test                      |   8 +-
 3 files changed, 158 insertions(+), 145 deletions(-)

diff --git a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
index 149f894e0..319d4254f 100644
--- a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
+++ b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
@@ -7,31 +7,35 @@
 use strict;
 use subs qw(spawn logmsg);
 use Fcntl qw(:flock);
+use POSIX qw(:sys_wait_h);
 use Socket;
 use Storable qw(nstore_fd fd_retrieve);
-use IO::Handle;
+use IO::Handle qw(_IONBF);
 use IO::Select;
-use IPC::Open2;
+use IO::File;
 
-use LockFile::Simple qw(lock unlock);
+STDOUT->setbuf('');
 
 use vars qw( $Debug );
-$Debug = 2;
+$Debug = 2; #2 will turn on child logging, 3 will log packet contents,
+            #including potentially compromising information
 
 my $socket = "/usr/local/freeside/selfservice_socket";
 my $pid_file = "$socket.pid";
-my $lock_file = "$socket.lock";
-unlink $lock_file;
 
-my $me = '[client]';
+my $log_file = "/usr/local/freeside/selfservice.log";
+
+#my $me = '[client]';
 
 $|=1;
 
+$SIG{__WARN__} = \&_logmsg;
+
 #read data to be cached or something
 #warn "$me Reading init data\n" if $Debug;
 #my $signup_init = 
 
-warn "[client] Creating $socket\n" if $Debug;
+warn "Creating $socket\n" if $Debug;
 my $uaddr = sockaddr_un($socket);
 my $proto = getprotobyname('tcp');
 socket(Server,PF_UNIX,SOCK_STREAM,0) or die "socket: $!";
@@ -41,7 +45,6 @@ listen(Server,SOMAXCONN) or die "listen: $!";
 
 if ( -e $pid_file ) {
   open(PIDFILE,"<$pid_file");
-  #chomp( my $old_pid = <PIDFILE> );
   my $old_pid = <PIDFILE>;
   close PIDFILE;
   $old_pid =~ /^(\d+)$/;
@@ -55,18 +58,13 @@ close PIDFILE;
 #sub REAPER { $waitedpid = wait; $SIG{CHLD} = \&REAPER; }
 #$SIG{CHLD} =  \&REAPER;
 
-warn "[client] entering main loop\n" if $Debug;
-
-#sub spawn;
-#sub logmsg;
+warn "entering main loop\n" if $Debug;
 
 my %kids;
 
-  #    my $gar = <STDIN>;
-
-#my $s = new IO::Select;
-#$s->add(\*STDIN);
-#$s->add(\*Server);
+my $s = new IO::Select;
+$s->add(\*STDIN);
+$s->add(\*Server);
 
 #for ( $waitedpid = 0;
 #      accept(Client,Server) || $waitedpid;
@@ -77,116 +75,117 @@ my %kids;
 #$SIG{PIPE} = sub { warn "SIGPIPE received" };
 #$SIG{CHLD} = sub { warn "SIGCHLD received" };
 
-sub REAPER { warn "SIGCHLD received"; my $pid = wait; $SIG{CHLD} = \&REAPER; }
+#sub REAPER { warn "SIGCHLD received"; my $pid = wait; $SIG{CHLD} = \&REAPER; }
+#sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; }
 #sub REAPER { my $pid = wait; delete $kids{$pid}; $SIG{CHLD} = \&REAPER; }
-$SIG{CHLD} =  \&REAPER;
-
-warn "[client] creating IO::Select\n" if $Debug;
-my $s = new IO::Select;
-$s->add(\*STDIN);
-$s->add(\*Server);
+#$SIG{CHLD} =  \&REAPER;
 
+my $undisp = 0;
 while (1) {
 
-warn "[client] waiting for connection or token\n" if $Debug;
-while ( my @handles = $s->can_read ) {
+  &reap_kids;
+
+  warn "waiting for connection\n" if $Debug && !$undisp;
 
+  #my @handles = $s->can_read();
+  my @handles = $s->can_read(5);
+  $undisp = !scalar(@handles);
   foreach my $handle ( @handles ) {
 
     if ( $handle == \*STDIN ) {
 
-#      my $gar = <STDIN>;
-#      die $gar;
+      warn "receiving packet from server\n" if $Debug;
 
       my $packet = fd_retrieve(\*STDIN);
       my $token = $packet->{'_token'};
-      warn "[client] received packet with token $token\n".
-           join('', map { " $_=>$packet->{$_}\n" } keys %$packet )
+      warn "received packet from server with token $token\n".
+           ( $Debug > 2
+             ? join('', map { " $_=>$packet->{$_}\n" } keys %$packet )
+             : '' )
         if $Debug;
+
      if ( exists($kids{$token}) ) {
-        warn "[client] sending return packet to $token via $kids{$token}\n"
+        warn "sending return packet to $token via $kids{$token}\n"
           if $Debug;
         nstore_fd($packet, $kids{$token});
-        warn "[client] flushing $kids{$token}\n" if $Debug;
-        $kids{$token}->flush;
-        #eval { $kids{$token}->flush; };
-        #die "error flushing?!?!? $@\n" if $@ ne '';
-        #warn "[client] closing $kids{$token}\n";
-        #close $kids{$token};
-        #warn "[client] deleting $kids{$token}\n";
-        #delete $kids{$token};
-        warn "[client] done with $token\n" if $Debug;
+        warn "flushing to $token\n" if $Debug;
+        until ( $kids{$token}->flush ) {
+          warn "WARNING: error flushing: $!";
+          sleep 1;
+        }
+        #no close or delete here - will block waiting for child
+        warn "done with $token\n" if $Debug;
       } else {
-        warn "[client] WARNING: unknown token $token, discarding message";
-        #die "[client] FATAL: unknown token $token, discarding message";
+        warn "WARNING: unknown token $token, discarding message";
       }
 
     } elsif ( $handle == \*Server ) {
 
-      warn "[client] received local connection; forking\n" if $Debug;
+      until ( accept(Client, Server) ) {
+        warn "WARNING: accept failed: $!";
+        next;
+      }
 
-      accept(Client, Server);
+      warn "received local connection; forking\n" if $Debug;
 
       spawn sub { #child
-        warn "[client-$$] reading packet from local client" if $Debug > 1;
+        warn "[child-$$] reading packet from local client" if $Debug > 1;
         my $packet = fd_retrieve(\*Client);
-        warn "[client-$$] packet received:\n".
+        warn "[child-$$] packet received:\n".
              join('', map { " $_=>$packet->{$_}\n" } keys %$packet )
-          if $Debug > 1;
+          if $Debug > 2;
         my $command = $packet->{'command'};
         #handle some commands weirdly?
-        $packet->{_token}=$$; #??
-
-        warn "[client-$$] sending packet to remote server" if $Debug > 1;
-        flock(STDOUT, LOCK_EX); #acquire write lock
-        #lock($lock_file);
-        nstore_fd($packet, \*STDOUT);
-        STDOUT->flush;
-        #unlock($lock_file);
-        flock(STDOUT, LOCK_UN); #release write lock
+        $packet->{_token}=$$;
 
-        warn "[client-$$] waiting for response from parent" if $Debug > 1;
+        warn "[child-$$] sending packet to remote server" if $Debug > 1;
+        flock(STDOUT, LOCK_EX) or die "FATAL: can't lock write stream: $!";
+        nstore_fd($packet, \*STDOUT) or die "FATAL: can't send response: $!";
+        STDOUT->flush or die "FATAL: can't flush: $!";
+        flock(STDOUT, LOCK_UN) or die "FATAL: can't release write lock: $!";
+        close STDOUT or die "FATAL: can't close write stream: $!"; #??!
 
-        #block until parent has a message
+        warn "[child-$$] waiting for response from parent" if $Debug > 1;
         my $w = new IO::Select;
         $w->add(\*STDIN);
-        my @wait = $w->can_read;
+        until ( $w->can_read ) {
+          warn "[child-$$] WARNING: interrupted select: $!\n";
+        }
         my $rv = fd_retrieve(\*STDIN);
 
         #close STDIN;
 
-        warn "[client-$$] sending response to local client" if $Debug > 1;
-
-        #send message to local client
+        warn "[child-$$] sending response to local client" if $Debug > 1;
         nstore_fd($rv, \*Client);
-        Client->flush;
-
-        close Client;
+        Client->flush or die "FATAL: can't flush to local client: $!";
+        close Client or die "FATAL: can't close connection to local client: $!";
 
-        warn "[client-$$] child exiting" if $Debug > 1;
-
-        #while (1) { sleep 5 };
-        #sleep 5;
+        warn "[child-$$] child exiting" if $Debug > 1;
         exit;
 
       }; #eo child
 
-      #close Client; #in parent, right?
+      #close Client;
 
     } else {
       die "wtf?  $handle";
     }
 
   }
-
-  warn "[client] done handling messages; returning to wait-state" if $Debug;;
-
+  
 }
 
-#die "[client] died unexpectedly: $!\n";
-warn "[client] fell-through unexpectedly: $!\n" if $Debug;
-
-} #WTF?
+sub reap_kids {
+  #warn "reaping kids\n";
+  foreach my $pid ( keys %kids ) {
+    my $kid = waitpid($pid, WNOHANG);
+    if ( $kid > 0 ) {
+      close $kids{$kid};
+      delete $kids{$kid};
+    }
+  }
+  #warn "done reaping\n";
+}
 
 sub spawn {
     my $coderef = shift;
@@ -200,10 +199,10 @@ sub spawn {
     #if (!defined($pid = fork)) {
     my $kid = new IO::Handle;
     if (!defined($pid = open($kid, '|-'))) {
-        logmsg "WARNING: cannot fork: $!";
+        warn "WARNING: cannot fork: $!";
         return;
     } elsif ($pid) {
-        logmsg "begat $pid" if $Debug;
+        warn "begat $pid" if $Debug;
         $kids{$pid} = $kid;
         #$kids{$pid}->autoflush;
         return; # I'm the parent
@@ -212,11 +211,16 @@ sub spawn {
 
 #    open(STDIN,  "<&Client")   || die "can't dup client to stdin";
 #    open(STDOUT, ">&Client")   || die "can't dup client to stdout";
-    ## open(STDERR, ">&STDOUT") || die "can't dup stdout to stderr";
+#     open(STDERR, ">&STDOUT") || die "can't dup stdout to stderr";
     exit &$coderef();
 }
 
-#sub logmsg { print "$0 $$: @_ at ", scalar localtime, "\n" }
-#DON'T PRINT!!!!!
-sub logmsg { warn "[client] $0 $$: @_ at ", scalar localtime, "\n" }
-
+sub _logmsg {
+  chomp( my $msg = shift );
+  my $log = new IO::File ">>$log_file";
+  flock($log, LOCK_EX);
+  seek($log, 0, 2);
+  print $log "[client] [". scalar(localtime). "] [$$] $msg\n";
+  flock($log, LOCK_UN);
+  close $log;
+}
diff --git a/fs_selfservice/freeside-selfservice-server b/fs_selfservice/freeside-selfservice-server
index 7b4a88166..0e1c75e43 100644
--- a/fs_selfservice/freeside-selfservice-server
+++ b/fs_selfservice/freeside-selfservice-server
@@ -8,17 +8,16 @@
 # Proc::Daemon or somesuch
 
 use strict;
-use vars qw( $kids $max_kids $shutdown $log_file );
-use vars qw($ssh_pid);
+use vars qw( $Debug %kids $kids $max_kids $shutdown $log_file $ssh_pid );
 use Fcntl qw(:flock);
-use POSIX qw(setsid);
-use Date::Format;
+use POSIX qw(:sys_wait_h setsid);
 use IO::Handle;
+use IO::Select;
+use IO::File;
 use Storable qw(nstore_fd fd_retrieve);
 use Net::SSH qw(sshopen2);
-use FS::UID qw(adminsuidsetup forksuidsetup);
 
-use LockFile::Simple qw(lock unlock);
+use FS::UID qw(adminsuidsetup forksuidsetup);
 
 #use Tie::RefHash;
 #use FS::Conf;
@@ -27,6 +26,9 @@ use LockFile::Simple qw(lock unlock);
 #use FS::cust_main;
 #use FS::Msgcat qw(gettext);
 
+$Debug = 1; # >= 2 will log packet contents, including potentially compromising
+            # information
+
 $shutdown = 0;
 $max_kids = '10'; #?
 $kids = 0;
@@ -35,8 +37,6 @@ my $user = shift or die &usage;
 my $machine = shift or die &usage;
 my $pid_file = "/var/run/freeside-selfservice-server.$user.pid";
 #my $pid_file = "/var/run/freeside-selfservice-server.$user.pid"; $FS::UID::datasrc not posible, but should include machine name at least, hmm
-my $lock_file = "/usr/local/etc/freeside/freeside-selfservice-server.$user.lock";
-unlink $lock_file;
 
 &init($user);
 
@@ -51,65 +51,61 @@ my %dispatch = (
 
 my $warnkids=0;
 while (1) {
-  my($reader, $writer) = (new IO::Handle, new IO::Handle);
-  warn "connecting to $machine\n";
+  my($writer,$reader,$error) = (new IO::Handle, new IO::Handle, new IO::Handle);
+  warn "connecting to $machine\n" if $Debug;
+
   $ssh_pid = sshopen2($machine,$reader,$writer,$clientd);
 
 #  nstore_fd(\*writer, {'hi'=>'there'});
 
-  warn "entering main loop\n";
+  warn "entering main loop\n" if $Debug;
   my $undisp = 0;
+  my $s = IO::Select->new( $reader );
   while (1) {
 
-    warn "waiting for packet from client\n" unless $undisp;
+    &reap_kids;
+
+    warn "waiting for packet from client\n" if $Debug && !$undisp;
     $undisp = 1;
-    my $packet = eval {
-      local $SIG{__DIE__};
-      local $SIG{ALRM} = sub { local $SIG{__DIE__};die "MyAlarm\n" }; #NB: \n required
-      alarm 5;
-      #my $string = <$reader>;
-      #die $string;
-      my $p = fd_retrieve($reader);
-      alarm 0;
-      $p;
-    };
-    if ($@) {
-      &shutdown if $shutdown && $@;
-      die "Fatal error receiving packet from client: $@" if $@ !~ /^MyAlarm/;
-      #die $@ unless $@ eq "alarm\n" || $@ eq 'Alarm'; #?????
-      #timeout
-      next unless $shutdown;
-      &shutdown;
+    my @handles = $s->can_read(5);
+    unless ( @handles ) {
+      &shutdown if $shutdown;
+      next;
     }
-    warn "packet received\n".
-         join('', map { " $_=>$packet->{$_}\n" } keys %$packet );
 
     $undisp = 0;
 
+    warn "receiving packet from client\n" if $Debug;
+
+    my $packet = fd_retrieve($reader);
+    warn "packet received\n".
+         join('', map { " $_=>$packet->{$_}\n" } keys %$packet )
+      if $Debug > 1;
+
     #prevent runaway forking
     my $warnkids = 0;
     while ( $kids >= $max_kids ) {
       warn "WARNING: maximum $kids children reached\n" unless $warnkids++;
+      &reap_kids;
       sleep 1;
     }
 
-    warn "forking child\n";
+    warn "forking child\n" if $Debug;
     defined( my $pid = fork ) or die "can't fork: $!";
     if ( $pid ) {
-      warn "child $pid spawned\n";
       $kids++;
+      $kids{$pid} = 1;
+      warn "child $pid spawned\n" if $Debug;
     } else { #kid time
 
-      #local($SIG{PIPE});
-
       #get new db handle
-      #$FS::UID::dbh->{InactiveDestroy} = 1;
+      $FS::UID::dbh->{InactiveDestroy} = 1;
       forksuidsetup($user);
 
       my $sub = $dispatch{$packet->{_packet}};
       my $rv;
       if ( $sub ) {
-        warn "calling $sub handler\n"; 
+        warn "calling $sub handler\n" if $Debug; 
         $rv = &{$sub}($packet);
       } else {
         warn my $error = "WARNING: unknown packet type ". $packet->{_packet};
@@ -117,15 +113,13 @@ while (1) {
       }
       $rv->{_token} = $packet->{_token}; #identifier
 
-      warn "sending response\n";
-      flock($writer, LOCK_EX); #acquire write lock
-      #lock($lock_file);
-      nstore_fd($rv, $writer) or die "can't send response: $!";
-      $writer->flush;
-      #unlock($lock_file);
-      flock($writer, LOCK_UN); #release write lock
-#
-      warn "child exiting\n";
+      warn "sending response\n" if $Debug;
+      flock($writer, LOCK_EX) or die "FATAL: can't lock write stream: $!";
+      nstore_fd($rv, $writer) or die "FATAL: can't send response: $!";
+      $writer->flush or die "FATAL: can't flush: $!";
+      flock($writer, LOCK_UN) or die "WARNING: can't release write lock: $!";
+
+      warn "child exiting\n" if $Debug;
       exit; #end-of-kid
     }
 
@@ -181,11 +175,23 @@ sub passwd {
 # utility subroutines
 ###
 
+sub reap_kids {
+  #warn "reaping kids\n";
+  foreach my $pid ( keys %kids ) {
+    my $kid = waitpid($pid, WNOHANG);
+    if ( $kid > 0 ) {
+      $kids--;
+      delete $kids{$kid};
+    }
+  }
+  #warn "done reaping\n";
+}
+
 sub init {
   my $user = shift;
 
   chdir "/" or die "Can't chdir to /: $!";
-  open STDIN, '/dev/null'   or die "Can't read /dev/null: $!";
+  open STDIN, '/dev/null' or die "Can't read /dev/null: $!";
   defined(my $pid = fork) or die "Can't fork: $!";
   if ( $pid ) {
     print "freeside-selfservice-server to $machine started with pid $pid\n"; #logging to $log_file
@@ -195,8 +201,9 @@ sub init {
     exit;
   }
 
-  sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; $kids--; }
-  $SIG{CHLD} =  \&REAPER;
+#  sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; $kids--; }
+#  #sub REAPER { my $pid = wait; $kids--; $SIG{CHLD} = \&REAPER; }
+#  $SIG{CHLD} =  \&REAPER;
 
   $shutdown = 0;
   $SIG{HUP} = sub { warn "SIGHUP received; shutting down\n"; $shutdown++; };
@@ -205,9 +212,6 @@ sub init {
   $SIG{QUIT} = sub { warn "SIGQUIT received; shutting down\n"; $shutdown++; };
   $SIG{PIPE} = sub { warn "SIGPIPE received; shutting down\n"; $shutdown++; };
 
-  $> = $FS::UID::freeside_uid unless $>;
-  $< = $>;
-
   #false laziness w/freeside-queued
   my $freeside_gid = scalar(getgrnam('freeside'))
     or die "can't setgid to freeside group\n";
@@ -233,7 +237,7 @@ sub init {
   open STDOUT, '>/dev/null'
                             or die "Can't write to /dev/null: $!";
   setsid                  or die "Can't start a new session: $!";
-#  open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
+  open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
 
   $SIG{__DIE__} = \&_die;
   $SIG{__WARN__} = \&_logmsg;
@@ -260,11 +264,16 @@ sub _die {
 }
 
 sub _logmsg {
+  chomp( my $msg = shift );
+  _do_logmsg( "[server] [". scalar(localtime). "] [$$] $msg\n" );
+}
+
+sub _do_logmsg {
   chomp( my $msg = shift );
   my $log = new IO::File ">>$log_file";
   flock($log, LOCK_EX);
   seek($log, 0, 2);
-  print $log "[server] [". time2str("%a %b %e %T %Y",time). "] [$$] $msg\n";
+  print $log "$msg\n";
   flock($log, LOCK_UN);
   close $log;
 }
@@ -273,7 +282,3 @@ sub usage {
   die "Usage:\n\n  fs_signup_server user machine\n";
 }
 
-###
-# handlers... should go in their own files eventually...
-###
-
diff --git a/fs_selfservice/fs_passwd_test b/fs_selfservice/fs_passwd_test
index 77782e651..c6a297968 100755
--- a/fs_selfservice/fs_passwd_test
+++ b/fs_selfservice/fs_passwd_test
@@ -9,6 +9,10 @@ my $error = passwd(
   'new_password' => 'haloo',
 );
 
-die $error if $error;
+if ( $error eq 'Incorrect password.' ) {
+  exit;
+} else {
+  die $error if $error;
+  die "no error";
+}
 
-print "password changed sucessfully\n";
-- 
cgit v1.2.1


From 46b6aae489f468a46be6c66f8ae6da48b41fe70c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Jul 2002 03:47:34 +0000
Subject: fix XML-RPC weirdness

---
 FS/FS/part_export/infostreet.pm | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
index 2464e5dee..fbf58bd60 100644
--- a/FS/FS/part_export/infostreet.pm
+++ b/FS/FS/part_export/infostreet.pm
@@ -145,7 +145,7 @@ sub infostreet_setContact {
     'getAccountID', $username);
   foreach my $field ( keys %contact_info ) {
     infostreet_command($url, $is_username, $is_password, $groupID,
-      'setContactField', $accountID, $field, $contact_info{$field} );
+      'setContactField', [ 'int'=>$accountID ], $field, $contact_info{$field} );
   }
 
 }
@@ -165,6 +165,13 @@ sub infostreet_command { #subroutine, not method
 
   eval "use Frontier::Client;";
 
+  eval 'sub Frontier::RPC2::String::repr {
+    my $self = shift
+    my $value = $$self;
+    $value =~ s/([&<>\"])/$Frontier::RPC2::char_entities{$1}/ge;
+    $value;
+  }';
+
   my $conn = Frontier::Client->new( url => $url );
   my $key_result = $conn->call( 'authenticate', $username, $password, $groupID);
   my %key_result = _infostreet_parse($key_result);
@@ -172,7 +179,15 @@ sub infostreet_command { #subroutine, not method
   my $key = $key_result{data};
 
   #my $result = $conn->call($method, $key, @args);
-  my $result = $conn->call($method, $key, map { $conn->string($_) } @args);
+  my $result = $conn->call( $method, $key,
+                            map {
+                                  if ( ref($_) ) {
+                                    my( $type, $value) = @{$_};
+                                    $conn->$type($value);
+                                  } else {
+                                    $conn->string($_);
+                                  }
+                                } @args );
   my %result = _infostreet_parse($result);
   die $result{error} unless $result{success};
 
-- 
cgit v1.2.1


From 0d0bee036173beccb207f11712830f083b4eb2bc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Jul 2002 03:56:16 +0000
Subject: better error handling

---
 FS/FS/part_export/infostreet.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
index fbf58bd60..0f478d254 100644
--- a/FS/FS/part_export/infostreet.pm
+++ b/FS/FS/part_export/infostreet.pm
@@ -164,6 +164,7 @@ sub infostreet_command { #subroutine, not method
   }
 
   eval "use Frontier::Client;";
+  die $@ if $@;
 
   eval 'sub Frontier::RPC2::String::repr {
     my $self = shift
@@ -171,6 +172,7 @@ sub infostreet_command { #subroutine, not method
     $value =~ s/([&<>\"])/$Frontier::RPC2::char_entities{$1}/ge;
     $value;
   }';
+  die $@ if $@;
 
   my $conn = Frontier::Client->new( url => $url );
   my $key_result = $conn->call( 'authenticate', $username, $password, $groupID);
-- 
cgit v1.2.1


From 2db0b73231b1cc8b9203d8c482ea9da2973f2768 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Jul 2002 03:57:57 +0000
Subject: missing ; in eval'ed sub

---
 FS/FS/part_export/infostreet.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
index 0f478d254..f2d519932 100644
--- a/FS/FS/part_export/infostreet.pm
+++ b/FS/FS/part_export/infostreet.pm
@@ -167,7 +167,7 @@ sub infostreet_command { #subroutine, not method
   die $@ if $@;
 
   eval 'sub Frontier::RPC2::String::repr {
-    my $self = shift
+    my $self = shift;
     my $value = $$self;
     $value =~ s/([&<>\"])/$Frontier::RPC2::char_entities{$1}/ge;
     $value;
-- 
cgit v1.2.1


From 6ff02eb18af2dd61ce2dca064414ca183fa02e6e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Jul 2002 12:28:02 +0000
Subject: invoice viewing...

---
 fs_selfservice/DEPLOY                              |   7 ++
 fs_selfservice/FS-SelfService/SelfService.pm       |  41 +++++---
 fs_selfservice/FS-SelfService/cgi/login.html       |  23 +++++
 fs_selfservice/FS-SelfService/cgi/myaccount.html   |  47 +++++++++
 fs_selfservice/FS-SelfService/cgi/selfservice.cgi  | 109 +++++++++++++++++++++
 .../FS-SelfService/cgi/view_invoice.html           |  21 ++++
 .../FS-SelfService/freeside-selfservice-clientd    |   2 +-
 fs_selfservice/freeside-selfservice-server         |  74 ++------------
 fs_selfservice/fs_passwd_test                      |   3 +-
 9 files changed, 246 insertions(+), 81 deletions(-)
 create mode 100644 fs_selfservice/FS-SelfService/cgi/login.html
 create mode 100644 fs_selfservice/FS-SelfService/cgi/myaccount.html
 create mode 100644 fs_selfservice/FS-SelfService/cgi/selfservice.cgi
 create mode 100644 fs_selfservice/FS-SelfService/cgi/view_invoice.html

diff --git a/fs_selfservice/DEPLOY b/fs_selfservice/DEPLOY
index 9b03bf259..7c68e78ec 100755
--- a/fs_selfservice/DEPLOY
+++ b/fs_selfservice/DEPLOY
@@ -1,8 +1,15 @@
 #!/bin/sh
 
+( cd ..; make deploy; cd fs_selfservice )
+
 cd FS-SelfService
 perl Makefile.PL && make && make install
 
 cd ..
 kill `cat /var/run/freeside-selfservice-server.ivan.pid`; sleep 3
 ./freeside-selfservice-server ivan localhost
+
+cp /home/ivan/freeside_current/fs_selfservice/FS-SelfService/cgi/* /var/www/MyAccount
+chown freeside /var/www/MyAccount/selfservice.cgi
+chmod 4755 /var/www/MyAccount/selfservice.cgi
+ln -s /var/www/MyAccount/selfservice.cgi /var/www/MyAccount/index.cgi
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 3cd4fd94e..9019ea4f8 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -1,7 +1,7 @@
 package FS::SelfService;
 
 use strict;
-use vars qw($VERSION @ISA @EXPORT_OK $socket);
+use vars qw($VERSION @ISA @EXPORT_OK $socket %autoload );
 use Exporter;
 use Socket;
 use FileHandle;
@@ -12,10 +12,19 @@ use Storable qw(nstore_fd fd_retrieve);
 $VERSION = '0.03';
 
 @ISA = qw( Exporter );
-@EXPORT_OK = qw( passwd );
 
 $socket =  "/usr/local/freeside/selfservice_socket";
 
+%autoload = (
+  'passwd'        => 'passwd/passwd',
+  'chfn'          => 'passwd/passwd',
+  'chsh'          => 'passwd/passwd',
+  'login'         => 'MyAccount/login',
+  'customer_info' => 'MyAccount/customer_info',
+  'invoice'       => 'MyAccount/invoice',
+);
+@EXPORT_OK = keys %autoload;
+
 $ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin';
 $ENV{'SHELL'} = '/bin/sh';
 $ENV{'IFS'} = " \t\n";
@@ -49,17 +58,25 @@ Returns the empty value on success, or an error message on errors.
 
 =cut
 
-sub passwd {
-  my $param;
-  if ( ref($_[0]) ) {
-    $param = shift;
-  } else {
-    $param = { @_ };
-  }
+foreach my $autoload ( keys %autoload ) {
+
+  my $eval =
+  "sub $autoload { ". '
+                   my $param;
+                   if ( ref($_[0]) ) {
+                     $param = shift;
+                   } else {
+                     $param = { @_ };
+                   }
+
+                   $param->{_packet} = \''. $autoload{$autoload}. '\';
+
+                   simple_packet($param);
+                 }';
 
-  $param->{_packet} = 'passwd';
+  eval $eval;
+  die $@ if $@;
 
-  simple_packet($param);
 }
 
 sub simple_packet {
@@ -78,7 +95,7 @@ sub simple_packet {
   my $return = fd_retrieve(\*SOCK) or die "error reading result: $!";
   die $return->{'_error'} if defined $return->{_error} && $return->{_error};
 
-  $return->{'error'};
+  $return;
 }
 
 =back
diff --git a/fs_selfservice/FS-SelfService/cgi/login.html b/fs_selfservice/FS-SelfService/cgi/login.html
new file mode 100644
index 000000000..dfbd0137a
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/login.html
@@ -0,0 +1,23 @@
+<HTML><HEAD><TITLE>Login</TITLE></HEAD>
+<BODY BGCOLOR="#e8e8e8"><FONT SIZE=5>Login</FONT><BR><BR>
+<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
+<FORM ACTION="<%= $self_url %>" METHOD=POST>
+<INPUT TYPE="hidden" NAME="session" VALUE="login">
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=2 CELLPADDING=0>
+<TR>
+  <TH ALIGN="right">Username </TH>
+  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right">Domain </TH>
+  <TD><INPUT TYPE="text" NAME="domain" VALUE="<%= $domain %>"></TD>
+</TR>
+<!--<INPUT TYPE="hidden" NAME="domain" VALUE="myisp.com">-->
+<TR>
+  <TH ALIGN="right">Password </TH>
+  <TD><INPUT TYPE="password" NAME="password"></TD>
+</TR>
+</TABLE>
+<BR><BR><INPUT TYPE="submit" VALUE="Login">
+</FORM></BODY></HTML>
+
diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount.html b/fs_selfservice/FS-SelfService/cgi/myaccount.html
new file mode 100644
index 000000000..f8a916eea
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount.html
@@ -0,0 +1,47 @@
+<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
+<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
+<%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<TABLE BORDER=0 CELLPADDING=4><TR><TD VALIGN="top" HEIGHT=384 BGCOLOR="#dddddd">
+<A HREF="<%= $url %>myaccount">MyAccount</A><BR>
+<A HREF="<%= $url %>other">SomethingElse</A><BR>
+</TD><TD VALIGN="top">
+
+Hello <%= $name %>!<BR><BR>
+Your customer number is <%= $custnum %><BR><BR>
+Your contact information<BR><%= $small_custview %>
+Your outstanding balance is $<%= $balance %><BR><BR>
+<!--<TABLE BORDER=1 CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">
+<TR><TH>Invoice</TH><TH>Date</TH><TH>Owed</TH></TR>-->
+<%=
+  if ( @open_invoices ) {
+    $OUT .= '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 BGCOLOR="#eeeeee">'.
+            '<TR><TH BGCOLOR="#ff3333" COLSPAN=5>Open Invoices</TH><TD>';
+    my $link = qq!<A HREF="<%= $selfurl %>?session=<%= $session_id %>;action=myaccount!;
+    my $col1 = "ffffff";
+    my $col2 = "dddddd";
+    my $col = $col1;
+
+    foreach my $invoice ( @open_invoices ) {
+      my $td = qq!<TD BGCOLOR="#$col">!;
+      my $a=qq!<A HREF="${url}view_invoice;invnum=!. $invoice->{'invnum'}. '">';
+      $OUT .=
+        "<TR>$td${a}Invoice #". $invoice->{'invnum'}. "</A></TD>$td</TD>".
+        "$td$a". $invoice->{'date'}. "</A></TD>$td</TD>".
+        qq!<TD BGCOLOR="#$col" ALIGN="right">$a\$!. $invoice->{'owed'}.
+          '</A></TD>'.
+        '</TR>';
+      $col = $col eq $col1 ? $col2 : $col1;
+    }
+    $OUT .= '</TABLE>';
+  } else {
+    $OUT .= 'You have no outstanding invoices.<BR><BR>';
+  }
+%>
+
+</TD></TR></TABLE>
+<HR>
+<FONT SIZE="-2">small text</FONT>
+</BODY></HTML>
+
+
+
diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
new file mode 100644
index 000000000..eae373931
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -0,0 +1,109 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use vars qw($cgi $session_id $form_max $template_dir);
+use subs qw(do_template);
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use Text::Template;
+use FS::SelfService qw(login customer_info invoice);
+
+$template_dir = '.';
+
+$form_max = 255;
+
+$cgi = new CGI;
+
+unless ( defined $cgi->param('session') ) {
+  do_template('login',{});
+  exit;
+}
+
+if ( $cgi->param('session') eq 'login' ) {
+
+  $cgi->param('username') =~ /^\s*([a-z0-9_\-\.\&]{0,$form_max})\s*$/i
+    or die "illegal username";
+  my $username = $1;
+
+  $cgi->param('domain') =~ /^\s*([\w\-\.]{0,$form_max})\s*$/
+    or die "illegal domain";
+  my $domain = $1;
+
+  $cgi->param('password') =~ /^(.{0,$form_max})$/
+    or die "illegal password";
+  my $password = $1;
+
+  my $rv = login(
+    'username' => $username,
+    'domain'   => $domain,
+    'password' => $password,
+  );
+  if ( $rv->{error} ) {
+    do_template('login', {
+      'error'    => $rv->{error},
+      'username' => $username,
+      'domain'   => $domain,
+    } );
+    exit;
+  } else {
+    $cgi->param('session' => $rv->{session_id} );
+    $cgi->param('action'  => 'myaccount' );
+  }
+}
+
+$session_id = $cgi->param('session');
+
+$cgi->param('action') =~ /^(myaccount|view_invoice)$/
+  or die "unknown action ". $cgi->param('action');
+my $action = $1;
+
+my $result = eval "&$action();";
+die $@ if $@;
+
+if ( $result->{error} eq "Can't resume session" ) { #ick
+  do_template('login',{});
+  exit;
+}
+
+#warn $result->{'open_invoices'};
+#warn scalar(@{$result->{'open_invoices'}});
+
+do_template($action, {
+  'session_id' => $session_id,
+  %{$result}
+});
+
+#--
+
+sub myaccount { customer_info( 'session_id' => $session_id ); }
+
+sub view_invoice {
+
+  $cgi->param('invnum') =~ /^(\d+)$/ or die "illegal invnum";
+  my $invnum = $1;
+
+  invoice( 'session_id' => $session_id,
+           'invnum'     => $invnum,
+         );
+
+}
+
+#--
+
+sub do_template {
+  my $name = shift;
+  my $fill_in = shift;
+
+  $cgi->delete_all();
+  $fill_in->{'self_url'} = $cgi->self_url;
+
+  my $template = new Text::Template( TYPE    => 'FILE',
+                                     SOURCE  => "$template_dir/$name.html",
+                                     DELIMITERS => [ '<%=', '%>' ],
+                                     UNTAINT => 1,                    )
+    or die $Text::Template::ERROR;
+
+  print $cgi->header( '-expires' => 'now' ),
+        $template->fill_in( HASH => $fill_in );
+}
+
diff --git a/fs_selfservice/FS-SelfService/cgi/view_invoice.html b/fs_selfservice/FS-SelfService/cgi/view_invoice.html
new file mode 100644
index 000000000..33388de99
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/view_invoice.html
@@ -0,0 +1,21 @@
+<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
+<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
+<%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<TABLE BORDER=0 CELLPADDING=4><TR><TD VALIGN="top" HEIGHT=384 BGCOLOR="#dddddd">
+<A HREF="<%= $url %>myaccount">MyAccount</A><BR>
+<A HREF="<%= $url %>other">SomethingElse</A><BR>
+</TD><TD VALIGN="top">
+
+<A HREF="<%= $url %>myaccount"><-- back to MyAccount</A><BR><BR>
+
+<FONT SIZE="-1"><PRE>
+<%= $invoice_text %>
+</FONT></PRE>
+
+</TD></TR></TABLE>
+<HR>
+<FONT SIZE="-2">small text</FONT>
+</BODY></HTML>
+
+
+
diff --git a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
index 319d4254f..0c25c3407 100644
--- a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
+++ b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
@@ -17,7 +17,7 @@ use IO::File;
 STDOUT->setbuf('');
 
 use vars qw( $Debug );
-$Debug = 2; #2 will turn on child logging, 3 will log packet contents,
+$Debug = 3; #2 will turn on child logging, 3 will log packet contents,
             #including potentially compromising information
 
 my $socket = "/usr/local/freeside/selfservice_socket";
diff --git a/fs_selfservice/freeside-selfservice-server b/fs_selfservice/freeside-selfservice-server
index 0e1c75e43..e55ca4984 100644
--- a/fs_selfservice/freeside-selfservice-server
+++ b/fs_selfservice/freeside-selfservice-server
@@ -16,17 +16,10 @@ use IO::Select;
 use IO::File;
 use Storable qw(nstore_fd fd_retrieve);
 use Net::SSH qw(sshopen2);
-
 use FS::UID qw(adminsuidsetup forksuidsetup);
+use FS::ClientAPI;
 
-#use Tie::RefHash;
-#use FS::Conf;
-#use FS::Record qw( qsearch qsearchs );
-#use FS::cust_main_county;
-#use FS::cust_main;
-#use FS::Msgcat qw(gettext);
-
-$Debug = 1; # >= 2 will log packet contents, including potentially compromising
+$Debug = 2; # >= 2 will log packet contents, including potentially compromising
             # information
 
 $shutdown = 0;
@@ -42,13 +35,6 @@ my $pid_file = "/var/run/freeside-selfservice-server.$user.pid";
 
 my $clientd = "/usr/local/sbin/freeside-selfservice-clientd"; #better name?
 
-my %dispatch = (
-  'signup' => \&signup,
-  #'signup_init' => 'signup_init',
-  'passwd' => \&passwd,
-
-);
-
 my $warnkids=0;
 while (1) {
   my($writer,$reader,$error) = (new IO::Handle, new IO::Handle, new IO::Handle);
@@ -102,13 +88,11 @@ while (1) {
       $FS::UID::dbh->{InactiveDestroy} = 1;
       forksuidsetup($user);
 
-      my $sub = $dispatch{$packet->{_packet}};
-      my $rv;
-      if ( $sub ) {
-        warn "calling $sub handler\n" if $Debug; 
-        $rv = &{$sub}($packet);
-      } else {
-        warn my $error = "WARNING: unknown packet type ". $packet->{_packet};
+      my $type = $packet->{_packet};
+      warn "calling $type handler\n" if $Debug; 
+      my $rv = eval { FS::ClientAPI->dispatch($type, $packet); };
+      if ( $@ ) {
+        warn my $error = "WARNING: error dispatching $type: $@";
         $rv = { _error => $error };
       }
       $rv->{_token} = $packet->{_token}; #identifier
@@ -127,50 +111,6 @@ while (1) {
 
 }
 
-###
-# dispatch subroutines (should live elsewhere eventually)
-###
-
-sub passwd {
-  #sleep 3;
-  use FS::Record qw(qsearchs);
-  use FS::svc_acct;
-  #use FS::svc_domain;
-
-  my $packet = shift;
-
-  #my $domain = qsearchs('svc_domain', { 'domain' => $packet->{'domain'} } )
-  #  or return { error => "Domain $domain not found" };
-
-  my $old_password = $packet->{'old_password'};
-  my $new_password = $packet->{'new_password'};
-  my $new_gecos = $packet->{'new_gecos'};
-  my $new_shell = $packet->{'new_shell'};
-
-  my $svc_acct =
-    ( length($old_password) < 13
-      && qsearchs( 'svc_acct', { 'username'  => $packet->{'username'},
-                                 #'domsvc'    => $svc_domain->domsvc,
-                                 '_password' => $old_password } )
-    )
-    || qsearchs( 'svc_acct', { 'username'  => $packet->{'username'},
-                               #'domsvc'    => $svc_domain->domsvc,
-                               '_password' => $old_password } );
-
-  unless ( $svc_acct ) { return { error => 'Incorrect password.' } }
-
-  my %hash = $svc_acct->hash;
-  my $new_svc_acct = new FS::svc_acct ( \%hash );
-  $new_svc_acct->setfield('_password', $new_password ) 
-    if $new_password && $new_password ne $old_password;
-  $new_svc_acct->setfield('finger',$new_gecos) if $new_gecos;
-  $new_svc_acct->setfield('shell',$new_shell) if $new_shell;
-  my $error = $new_svc_acct->replace($svc_acct);
-
-  return { error => $error };
-
-}
-
 ###
 # utility subroutines
 ###
diff --git a/fs_selfservice/fs_passwd_test b/fs_selfservice/fs_passwd_test
index c6a297968..4f8b8a888 100755
--- a/fs_selfservice/fs_passwd_test
+++ b/fs_selfservice/fs_passwd_test
@@ -3,11 +3,12 @@
 use strict;
 use FS::SelfService qw(passwd);
 
-my $error = passwd(
+my $rv = passwd(
   'username' => 'ivan',
   'old_password' => 'heyhoo',
   'new_password' => 'haloo',
 );
+my $error = $rv->{error};
 
 if ( $error eq 'Incorrect password.' ) {
   exit;
-- 
cgit v1.2.1


From f22694a83b1acce62cdc10cf91884274af0e40a2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Jul 2002 12:29:05 +0000
Subject: ClientAPI

---
 FS/FS/ClientAPI.pm           |  44 ++++++++++++++
 FS/FS/ClientAPI/MyAccount.pm | 136 +++++++++++++++++++++++++++++++++++++++++++
 FS/FS/ClientAPI/passwd.pm    |  56 ++++++++++++++++++
 FS/MANIFEST                  |   4 ++
 4 files changed, 240 insertions(+)
 create mode 100644 FS/FS/ClientAPI.pm
 create mode 100644 FS/FS/ClientAPI/MyAccount.pm
 create mode 100644 FS/FS/ClientAPI/passwd.pm

diff --git a/FS/FS/ClientAPI.pm b/FS/FS/ClientAPI.pm
new file mode 100644
index 000000000..f7b8eb028
--- /dev/null
+++ b/FS/FS/ClientAPI.pm
@@ -0,0 +1,44 @@
+package FS::ClientAPI;
+
+use strict;
+use vars qw(%handler);
+
+%handler = ();
+
+#find modules
+foreach my $INC ( @INC ) {
+  foreach my $file ( glob("$INC/FS/ClientAPI/*") ) {
+    $file =~ /\/(\w+)\.pm$/ or do {
+      warn "unrecognized ClientAPI file: $file";
+      next
+    };
+    my $mod = $1;
+    #warn "using FS::ClientAPI::$mod";
+    eval "use FS::ClientAPI::$mod;";
+    die "error using FS::ClientAPI::$mod: $@" if $@;
+  }
+}
+
+#(sub for modules)
+sub register_handlers {
+  my $self = shift;
+  my %new_handlers = @_;
+  foreach my $key ( keys %new_handlers ) {
+    warn "WARNING: redefining sub $key" if exists $handler{$key};
+    #warn "registering $key";
+    $handler{$key} = $new_handlers{$key};
+  }
+}
+
+#---
+
+sub dispatch {
+  my ( $self, $name ) = ( shift, shift );
+  my $sub = $handler{$name}
+    or die "unknown FS::ClientAPI sub $name (known: ". join(" ", keys %handler );
+    #or die "unknown FS::ClientAPI sub $name";
+  &{$sub}(@_);
+}
+
+1;
+
diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
new file mode 100644
index 000000000..674785524
--- /dev/null
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -0,0 +1,136 @@
+package FS::ClientAPI::MyAccount;
+
+use strict;
+use vars qw($cache);
+use Digest::MD5 qw(md5_hex);
+use Date::Format;
+use Cache::SharedMemoryCache; #store in db?
+use FS::CGI qw(small_custview); #doh
+use FS::Conf;
+use FS::Record qw(qsearchs);
+use FS::svc_acct;
+use FS::svc_domain;
+use FS::cust_main;
+use FS::cust_bill;
+
+use FS::ClientAPI; #hmm
+FS::ClientAPI->register_handlers(
+  'MyAccount/login'         => \&login,
+  'MyAccount/customer_info' => \&customer_info,
+  'MyAccount/invoice'       => \&invoice,
+);
+
+#store in db?
+my $cache = new Cache::SharedMemoryCache();
+
+#false laziness w/FS::ClientAPI::passwd::passwd (needs to handle encrypted pw)
+sub login {
+  my $p = shift;
+
+  my $svc_domain = qsearchs('svc_domain', { 'domain' => $p->{'domain'} } )
+    or return { error => "Domain not found" };
+
+  my $svc_acct =
+    ( length($p->{'password'}) < 13
+      && qsearchs( 'svc_acct', { 'username'  => $p->{'username'},
+                                 'domsvc'    => $svc_domain->svcnum,
+                                 '_password' => $p->{'password'}     } )
+    )
+    || qsearchs( 'svc_acct', { 'username'  => $p->{'username'},
+                               'domsvc'    => $svc_domain->svcnum,
+                               '_password' => $p->{'password'}     } );
+
+  unless ( $svc_acct ) { return { error => 'Incorrect password.' } }
+
+  my $session = {
+    'svcnum' => $svc_acct->svcnum,
+  };
+
+  my $cust_pkg = $svc_acct->cust_svc->cust_pkg;
+  if ( $cust_pkg ) {
+    my $cust_main = $cust_pkg->cust_main;
+    $session->{'custnum'} = $cust_main->custnum;
+  }
+
+  my $session_id;
+  do {
+    $session_id = md5_hex(md5_hex(time(). {}. rand(). $$))
+  } until ( ! defined $cache->get($session_id) ); #just in case
+
+  $cache->set( $session_id, $session, '1 hour' );
+
+  return { 'error'      => '',
+           'session_id' => $session_id,
+         };
+}
+
+sub customer_info {
+  my $p = shift;
+  my $session = $cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  my %return;
+
+  my $custnum = $session->{'custnum'};
+
+  if ( $custnum ) { #customer record
+
+    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+      or return { 'error' => "unknown custnum $custnum" };
+
+    $return{balance} = $cust_main->balance;
+
+    my @open = map {
+                     {
+                       invnum => $_->invnum,
+                       date   => time2str("%b %o, %Y", $_->_date),
+                       owed   => $_->owed,
+                     };
+                   } $cust_main->open_cust_bill;
+    $return{open_invoices} = \@open;
+
+    my $conf = new FS::Conf;
+    $return{small_custview} =
+      small_custview( $cust_main, $conf->config('defaultcountry') );
+
+    $return{name} = $cust_main->first. ' '. $cust_main->get('last');
+
+  } else { #no customer record
+
+    my $svc_acct = qsearchs('svc_acct', { 'svcnum' => $session->{'svcnum'} } )
+      or die "unknown svcnum";
+    $return{name} = $svc_acct->email;
+
+  }
+
+
+  return { 'error'          => '',
+           'custnum'        => $custnum,
+           %return,
+         };
+
+}
+
+sub invoice {
+  my $p = shift;
+  my $session = $cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  my $custnum = $session->{'custnum'};
+
+  my $invnum = $p->{'invnum'};
+
+  my $cust_bill = qsearchs('cust_bill', { 'invnum'  => $invnum,
+                                          'custnum' => $custnum } )
+    or return { 'error' => "Can't find invnum" };
+
+  #my %return;
+
+  return { 'error'        => '',
+           'invnum'       => $invnum,
+           'invoice_text' => join('', $cust_bill->print_text ),
+         };
+
+}
+
+
diff --git a/FS/FS/ClientAPI/passwd.pm b/FS/FS/ClientAPI/passwd.pm
new file mode 100644
index 000000000..29606227d
--- /dev/null
+++ b/FS/FS/ClientAPI/passwd.pm
@@ -0,0 +1,56 @@
+package FS::ClientAPI::passwd;
+
+use strict;
+use FS::Record qw(qsearchs);
+use FS::svc_acct;
+#use FS::svc_domain;
+
+use FS::ClientAPI; #hmm
+FS::ClientAPI->register_handlers(
+  'passwd/passwd' => \&passwd,
+  'passwd/chfn' => \&chfn,
+  'passwd/chsh' => \&chsh,
+);
+
+sub passwd {
+  my $packet = shift;
+
+  #my $domain = qsearchs('svc_domain', { 'domain' => $packet->{'domain'} } )
+  #  or return { error => "Domain $domain not found" };
+
+  my $old_password = $packet->{'old_password'};
+  my $new_password = $packet->{'new_password'};
+  my $new_gecos = $packet->{'new_gecos'};
+  my $new_shell = $packet->{'new_shell'};
+
+#false laziness w/FS::ClientAPI::MyAccount::login (needs to handle encrypted pw)
+  my $svc_acct =
+    ( length($old_password) < 13
+      && qsearchs( 'svc_acct', { 'username'  => $packet->{'username'},
+                                 #'domsvc'    => $svc_domain->svcnum,
+                                 '_password' => $old_password } )
+    )
+    || qsearchs( 'svc_acct', { 'username'  => $packet->{'username'},
+                               #'domsvc'    => $svc_domain->svcnum,
+                               '_password' => $old_password } );
+
+  unless ( $svc_acct ) { return { error => 'Incorrect password.' } }
+
+  my %hash = $svc_acct->hash;
+  my $new_svc_acct = new FS::svc_acct ( \%hash );
+  $new_svc_acct->setfield('_password', $new_password ) 
+    if $new_password && $new_password ne $old_password;
+  $new_svc_acct->setfield('finger',$new_gecos) if $new_gecos;
+  $new_svc_acct->setfield('shell',$new_shell) if $new_shell;
+  my $error = $new_svc_acct->replace($svc_acct);
+
+  return { error => $error };
+
+}
+
+sub chfn {}
+
+sub chsh {}
+
+1;
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index a6a8d935e..8355e40fb 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -20,6 +20,9 @@ bin/freeside-reexport
 FS.pm
 FS/CGI.pm
 FS/InitHandler.pm
+FS/ClientAPI.pm
+FS/ClientAPI/passwd.pm
+FS/ClientAPI/MyAccount.pm
 FS/Conf.pm
 FS/ConfItem.pm
 FS/Record.pm
@@ -97,6 +100,7 @@ t/agent.t
 t/agent_type.t
 t/CGI.t
 t/InitHandler.t
+t/ClientAPI.t
 t/Conf.t
 t/ConfItem.t
 t/Record.t
-- 
cgit v1.2.1


From c8c220ea0d5776aaf42581a0e3e61336a8d798f3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Jul 2002 10:18:44 +0000
Subject: sort bills by date

---
 FS/FS/cust_main.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 02e906aed..eb468d981 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1809,7 +1809,8 @@ Returns all the invoices (see L<FS::cust_bill>) for this customer.
 
 sub cust_bill {
   my $self = shift;
-  qsearch('cust_bill', { 'custnum' => $self->custnum, } )
+  sort { $a->_date <=> $b->_date }
+    qsearch('cust_bill', { 'custnum' => $self->custnum, } )
 }
 
 =item open_cust_bill
-- 
cgit v1.2.1


From 5e4671b1c30d8f6d68a770c7ad2dd40462ed6f2b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Jul 2002 10:18:56 +0000
Subject: UI

---
 FS/FS/CGI.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 28b3a06fa..e44ebcc0a 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -253,7 +253,7 @@ sub small_custview {
 
   my $html = 'Customer #<B>'. $cust_main->custnum. '</B>'.
     ntable('#e8e8e8'). '<TR><TD>'. ntable("#cccccc",2).
-    '<TR><TD ALIGN="right" VALIGN="top">Billing</TD><TD BGCOLOR="#ffffff">'.
+    '<TR><TD ALIGN="right" VALIGN="top">Billing<BR>Address</TD><TD BGCOLOR="#ffffff">'.
     $cust_main->getfield('last'). ', '. $cust_main->first. '<BR>';
 
   $html .= $cust_main->company. '<BR>' if $cust_main->company;
@@ -270,7 +270,7 @@ sub small_custview {
     my $pre = $cust_main->ship_last ? 'ship_' : '';
 
     $html .= '<TD>'. ntable("#cccccc",2).
-      '<TR><TD ALIGN="right" VALIGN="top">Service</TD><TD BGCOLOR="#ffffff">'.
+      '<TR><TD ALIGN="right" VALIGN="top">Service<BR>Address</TD><TD BGCOLOR="#ffffff">'.
       $cust_main->get("${pre}last"). ', '.
       $cust_main->get("${pre}first"). '<BR>';
     $html .= $cust_main->get("${pre}company"). '<BR>'
-- 
cgit v1.2.1


From 49d66b48cf9da1b22dea587d4001d41c497c43b6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Jul 2002 10:20:34 +0000
Subject: 1.4.0

---
 ANNOUCE.1.4.0     | 166 +++++++++++-------------------------------------------
 Makefile          |   4 +-
 README.1.4.0pre11 |  33 -----------
 README.1.4.0pre12 |  84 ---------------------------
 README.1.4.0pre13 |  27 ---------
 README.1.4.0pre14 |  13 -----
 README.1.4.0pre8  |  74 ------------------------
 README.1.4.0pre9  |  22 --------
 8 files changed, 35 insertions(+), 388 deletions(-)
 delete mode 100644 README.1.4.0pre11
 delete mode 100644 README.1.4.0pre12
 delete mode 100644 README.1.4.0pre13
 delete mode 100644 README.1.4.0pre14
 delete mode 100644 README.1.4.0pre8
 delete mode 100644 README.1.4.0pre9

diff --git a/ANNOUCE.1.4.0 b/ANNOUCE.1.4.0
index 2b9ea20e5..d110c6f3a 100644
--- a/ANNOUCE.1.4.0
+++ b/ANNOUCE.1.4.0
@@ -1,150 +1,50 @@
-templated web interface (start, anyway)
-separate billing and service addresses
-customer comments
-edit/part_svc.cgi
-svc_forward and better dealing with virtualdomains!  and realm export to RADIUS
-customer-to-customer referrals
-quick order
-no more single default domain
+Hi,
 
-no more postgres/RADIUS weirdness yay!, 31 character column names etc.
-PostgreSQL no longer needs to be recompiled for long RADIUS attributes.   
-RADIUS integration and RADIUS attribute defaults updated.
+I'm pleased to announce the first beta release of Freeside 1.4.0.
+Freeside is a web-based, open-source billing and account administration
+package for ISPs, web hosts, and similar businesses.
 
-Fuzzy searches on large data sets are much faster.
-     
-Job queues have been implemented.
+You can see a web demo, read the documentation, and download the new beta
+at <http://www.sisd.com/freeside/>.
 
-Integration with Cyrus IMAP server.
+Although Freeside is free software, it is supported commercially with
+installation, customization, training and support services.  Please
+consider our services and help support the development of the software!
 
-Support for instant (previously only batch) update of an ICRADIUS or
-FreeRADIUS stored in a local or remote MySQL installation (separate from
-the Freeside database)
 
-1.4.0 has a new Authorize.Net interface, updated for Authorize.Net 3.0
+Major new features in 1.4.0 include:
 
-completely templated signup server
+- Billing engine has been rewritten and now has support for easily added
+  "price plans".  Included price plans include anniversary billing,
+  1st-of-the-month billing (pro-rated and subscription), free for N days,
+  commissions for referrals and per-minute/per-hour charges.
 
-items setup/recur tax exempt flag
-     
-jeff!
+- Customer-to-customer referrals, tracking and commissions.
 
-Price plans.  For starters, multi-level customer-to-customer commissions
-in addition to flat rate pricing.  Price plans are written in Perl and
-it's straightforward to add new ones.  I'm expect we'll see plans for
-pro-rating, metered billing and the like soon.
+- Configurable invoice events triggered for delinquent customers can
+  re-send invoices, suspend accounts, charge late fees, and so on.
 
-New UI for packages and price plans.
+- Export and provisioning system has been rewritten.  New provisioning
+  methods can now be "plugged-in" for any service type.  Included exports
+  include BSD and Linux password files, configurable shell commands,
+  RADIUS (both text and SQL, including groups), BIND configuration files,
+  Cyrus, vpopmail, and many others.
 
-Per-package tax exemption for setup and/or recurring fee         
+- Complete set of history tables tracking all changes to the database.
 
-New UI in the signup server, new customer and new account pages that 
-breaks down access numbers by state and should be easier to use for a
-large number of dialup numbers.  (POPs)   
+- Job queue with display and retry for provisioning tasks.
 
-Database support for local call mappin - the data on what exchanges
-can call which of your access numbers as a local call.
+- UI overhaul - easier to navigate and use.  Quick package order and
+  one-time charges.  Separate billing and service contact information.
+  Customer comments.
 
-easier installation/instructions & web configuration
+- Performance optimizations.
 
-expedited payment-entry
-- a quick check entry tool for entering large numbers of checks as well
-  as customer information on the payment entry screen
+- Financials have been rewritten.  Apply payments and credits against
+  specific invoices (in whole or in part), or have the system apply
+  automatically.
 
-- automatic application of payments and credits to outstanding invoices
-  
-#freeside-overdue
-#- the `freeside-overdue' script to list, add postal invoicing, suspend,   
-#  or cancel overdue and/or expired accounts.
+- Texas tax.
 
-- Payments and credits are applied against invoices when posted.
+- Improved documentation and easier install.
 
-- A bunch of UI fixes/tweaks: package browse, payment/credit entry, search
-  by check #, others
-
-  - Web interface for per-hour or per-minute account charges using the
-    session monitor.
-  
-  - Invoice events - set late fees, suspension, cancellation, etc. events
-    on overdue invoices.
-  
-  - Packages and service disable flags for a more manageable UI.
-
-HTML manpages now up-to-date and generated on install
-
-schema changes for more configurable export
-
-invoice events work & show up on invoice view
-
-- Pro-rating price plan
-
-- svc_www for virtual host services
--svc_www is here, better support for apache integration
-
-- fs_passwd/fs_passwd.cgi web-based password changer for users
-
-LinkPoint support
-
-Most notably, the main menu has gotten a significant facelift and should
-be easier to understand and use.
-
-New frequently-requested financial reports contributed by Jeff Finucane,
-thanks!
-
-The queue daemon web UI has been finished - you can now retry and remove
-jobs, error messages from failed jobs appear on the web interface, and
-account detail pages show any pending provisioning jobs for thsoe
-accounts.
-
-fs-setup should work under MySQL again.  The browse links are still broken
-("all customers", "all packages", "all accounts") but at least you should
-be able to get everything else working...
-
-Critical Path provisioning has been updated and can now username changes
-and suspension/unsuspension.
-
-- New export code!
-- Name and company searches:
-  - now case-insensative
-  - pulldown for search type
-- Email notification for deleted payments
-- History tables - complete history of all database changes
-- Alternate invoice templates for things like late noitces
-- ICRADIUS groups (usergroup table if not radgroupreply & radgroupcheck)
-- Signup server
-  - Error messages in message catalog
-  - Agent is now selectable (multiple signup servers for different agents
-    can now run on the same machine)
-  - signup_server-realtime configuration option to run cards immediately
-  - signup-alternate.html example for free and pay packages on the same
-    signup page
-- Texas tax
-
-schema diagram
-
---
-
-- MySQL is now supported
-
-- BIND import and export and web UI support for editing the zone files.
-  (apply the patch at http://rt.cpan.org/NoAuth/Bug.html?id=508 if 
-   importing zones until upstream release DNS::ZoneParse 0.9)
-
-- Welcome emails
-
-- Working company searches and job queue dependancies
-
-card retry changes (ticket 417)
-
---
-
-- real-time text radius export
-
-- one-time charges
-
-- found "must start freeside-queued as freeside" problem on freebsd.
-  freeside-queued now compatible with freebsd, old openssh, mysql...
-
-- shellcommands now works! has defaults for freebsd, linux, netbsd, just directories, etc.
-
-- real-time textradius export!
diff --git a/Makefile b/Makefile
index 30c165483..a3f61585a 100644
--- a/Makefile
+++ b/Makefile
@@ -40,8 +40,8 @@ SIGNUP_REFNUM = 2
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.4.0beta2
-TAG=freeside_1_4_0_beta2
+VERSION=1.4.0
+TAG=freeside_1_4_0
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
diff --git a/README.1.4.0pre11 b/README.1.4.0pre11
deleted file mode 100644
index 5a4bcedc7..000000000
--- a/README.1.4.0pre11
+++ /dev/null
@@ -1,33 +0,0 @@
-the following is necessary to upgrade from 1.4.0pre ( 9 or 10 )
-to 1.4.0pre11
-
-if you're upgrading from before 1.4.0pre11 see README.1.4.0pre9 first!
-
-if you're upgrading from 1.3.1 follow the instructions in
-httemplate/docs/upgrade8.html instead
-
-----
-
-install rsync <http://rsync.samba.org/>
-
-install the FS perl modules and httemplate as per install.html or upgrade8.html
-
-ALTER TABLE queue ADD svcnum int NULL;
-ALTER TABLE queue ADD statustext text NULL;
-CREATE INDEX queue1 ON queue ( svcnum );
-CREATE INDEX queue2 ON queue ( status );
-
-DROP TABLE part_export_option;
-CREATE TABLE part_export_option (
-  optionnum int primary key,
-  exportnum int not null,
-  optionname varchar(80) not null,
-  optionvalue text NULL
-);
-CREATE INDEX part_export_option1 ON part_export_option ( exportnum );
-CREATE INDEX part_export_option2 ON part_export_option ( optionname );
-
-Run bin/dbdef-create
-
-Restart Apache and freeside-queued
-
diff --git a/README.1.4.0pre12 b/README.1.4.0pre12
deleted file mode 100644
index 8b883d4df..000000000
--- a/README.1.4.0pre12
+++ /dev/null
@@ -1,84 +0,0 @@
-the following is necessary to upgrade from 1.4.0pre11 to 1.4.0pre12
-
-if you're upgrading from before 1.4.0pre12 see README.1.4.0pre11 first!
-
-if you're upgrading from 1.3.1 follow the instructions in
-httemplate/docs/upgrade8.html instead
-
-----
-
-install HTML-Widgets-SelectLayers from CPAN or http://www.420.am/selectlayers
-
-install the FS perl modules and httemplate as per install.html or upgrade8.html
-
-ALTER TABLE cust_bill_event ADD status varchar(80);
-ALTER TABLE cust_bill_event ADD statustext text NULL;
-UPDATE cust_bill_event SET status = 'done';
-DROP INDEX cust_bill_event1;
-
-CREATE TABLE radius_usergroup (
-  usergroupnum int primary key,
-  svcnum int not null,
-  groupname varchar(80) not null
-);
-CREATE INDEX radius_usergroup1 ON radius_usergroup ( svcnum );
-CREATE INDEX radius_usergroup2 ON radius_usergroup ( groupname );
-
-ALTER TABLE svc_acct ADD sec_phrase varchar(80) NULL;
-CREATE TABLE msgcat (
-  msgnum int primary key,
-  msgcode varchar(80) not null,
-  locale varchar(16) not null,
-  msg text not null
-);
-CREATE INDEX msgcat1 ON msgcat ( msgcode, locale );
-
-CREATE TABLE export_svc (
-  exportsvcnum int primary key,
-  exportnum int not null,
-  svcpart int not null
-);
-CREATE UNIQUE INDEX export_svc1 ON export_svc ( exportnum, svcpart );
-CREATE INDEX export_svc2 ON export_svc ( exportnum );
-CREATE INDEX export_svc3 ON export_svc ( svcpart );
-
-ALTER TABLE part_export RENAME svcpart TO deprecated;
-
-ALTER TABLE part_pkg ADD taxclass varchar(80) NULL;
-
-CREATE TABLE cust_tax_exempt (
-  exemptnum int primary key,
-  custnum int not null,
-  taxnum int not null,
-  year int not null,
-  month int not null,
-  amount decimal(10,2)
-);
-CREATE UNIQUE INDEX cust_tax_exempt1 ON cust_tax_exempt ( custnum, taxnum, year, month );
-
-ALTER TABLE cust_main_county ADD taxclass varchar(80) NULL;
-ALTER TABLE cust_main_county ADD exempt_amount decimal(10,2);
-
-Run bin/dbdef-create
-
-Run bin/create-history-tables
-
-Run bin/dbdef-create again
-
-Run bin/populate-msgcat
-
-Set the `locale' configuration option to `en_US'.
-
-the mxmachines, nsmachines, arecords and cnamerecords configuration values have been deprecated.  Use the defaultrecords configuration value instead.
-
-New export code has landed!  If you were using the icradiusmachines,
-icradius_mysqldest, icradius_mysqlsource, or icradius_secrets files, see
-the "sqlradius" export instead.  Use MySQL replication 
-<http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication>
-or point the "sqlradius" export directly at your external ICRADIUS or
-FreeRADIUS (or through an SSL-encrypting proxy...)
-
-Arrange for freeside-expiration-alerter to be run daily, if desired.
-
-Restart Apache and freeside-queued
-
diff --git a/README.1.4.0pre13 b/README.1.4.0pre13
deleted file mode 100644
index bd9fb7387..000000000
--- a/README.1.4.0pre13
+++ /dev/null
@@ -1,27 +0,0 @@
-the following is necessary to upgrade from 1.4.0pre12 to 1.4.0pre13
-
-if you're upgrading from before 1.4.0pre13 see README.1.4.0pre12 first!
-
-if you're upgrading from 1.3.1 follow the instructions in
-httemplate/docs/upgrade8.html instead
-
-----
-
-install the FS perl modules and httemplate as per install.html or upgrade8.html
-
-CREATE TABLE queue_depend (
-  dependnum int primary key,
-  jobnum int not null,
-  depend_jobnum int not null
-);
-CREATE INDEX queue_depend1 ON queue_depend ( jobnum );
-CREATE INDEX queue_depend2 ON queue_depend ( depend_jobnum );
-
-Run bin/dbdef-create
-
-Run bin/create-history-tables [username] queue_depend
-
-Run bin/dbdef-create again
-
-Restart Apache and freeside-queued
-
diff --git a/README.1.4.0pre14 b/README.1.4.0pre14
deleted file mode 100644
index 6ea2f8046..000000000
--- a/README.1.4.0pre14
+++ /dev/null
@@ -1,13 +0,0 @@
-the following is necessary to upgrade from 1.4.0pre13 to 1.4.0pre14
-
-if you're upgrading from before 1.4.0pre14 see README.1.4.0pre13 first!
-
-if you're upgrading from 1.3.1 follow the instructions in
-httemplate/docs/upgrade8.html instead
-
-----
-
-install the FS perl modules and httemplate as per install.html or upgrade8.html
-
-Restart Apache and freeside-queued
-
diff --git a/README.1.4.0pre8 b/README.1.4.0pre8
deleted file mode 100644
index 7ddd7e292..000000000
--- a/README.1.4.0pre8
+++ /dev/null
@@ -1,74 +0,0 @@
-the following is necessary to upgrade from 1.4.0pre (4 thru 7) to 1.4.0pre8
-
-if you're upgrading from 1.3.1 follow the instructions in
-httemplate/docs/upgrade8.html instead
-
-if you're upgradeing from before 1.4.0pre4, see
-http://cleanwhisker.420.am/cgi-bin/cvsweb/freeside/Attic/
-
------
-
-install Time::Duration and Tie::IxHash
-
-install the FS perl modules and httemplate as per install.html or upgrade8.html
-
-ALTER TABLE part_pkg ADD disabled char(1) NULL;
-ALTER TABLE part_svc ADD disabled char(1) NULL;
-
-CREATE TABLE cust_bill_event (
-  eventnum int primary key,
-  invnum int not null,
-  eventpart int not null,
-  _date int not null
-);
-CREATE UNIQUE INDEX cust_bill_event1 ON cust_bill_event ( eventpart, invnum );
-CREATE INDEX cust_bill_event2 ON cust_bill_event ( invnum );
-
-CREATE TABLE part_bill_event (
-  eventpart int primary key,
-  payby char(4) not null,
-  event varchar(80) not null,
-  eventcode text null,
-  seconds int null,
-  weight int not null,
-  plan varchar(80) null,
-  plandata text null,
-  disabled char(1) null
-);
-CREATE INDEX part_bill_event1 ON part_bill_event ( payby );
-
-CREATE TABLE part_export (
-  exportnum int primary key,
-  svcpart int not null,
-  machine varchar(80) not null,
-  exporttype varchar(80) not null,
-  nodomain char(1) NULL
-);
-CREATE INDEX part_export1 ON part_export ( machine );
-CREATE INDEX part_export2 ON part_export ( exporttype );
-
-CREATE TABLE part_export_option (
-  optionnum int primary key,
-  exportnum int not null,
-  optionname varchar(80) not null,
-  optionvalue text NULL
-);
-CREATE INDEX part_export_option1 ON part_export_option ( exportnum );
-CREATE INDEX part_export_option2 ON part_export_option ( optionname );
-
-ALTER TABLE cust_bill ADD closed char(1) NULL;
-ALTER TABLE cust_pay ADD closed char(1) NULL;
-ALTER TABLE cust_credit ADD closed char(1) NULL;
-ALTER TABLE cust_refund ADD closed char(1) NULL;
-
-Run bin/dbdef-create
-
-Restart Apache and freeside-queued
-
-Go to the new "View/Edit Invoice events" in the web interface and add the
-appropriate events.  At the very least, you'll want to set some invoice events
-"After 0 days": a BILL invoice event to print invoices, a CARD invoice event to
-batch or run cards real-time, and a COMP invoice event to "pay" complimentary
-customers.  If you were using the -i option to freeside-bill it should be
-removed.
-
diff --git a/README.1.4.0pre9 b/README.1.4.0pre9
deleted file mode 100644
index 6bd88f488..000000000
--- a/README.1.4.0pre9
+++ /dev/null
@@ -1,22 +0,0 @@
-the following is necessary to upgrade from 1.4.0pre8 to 1.4.0pre9
-
-if you're upgrading from before 1.4.0pre8 see README.1.4.0pre8 first!
-
-if you're upgrading from 1.3.1 follow the instructions in
-httemplate/docs/upgrade8.html instead
-
------
-
-install the FS perl modules and httemplate as per install.html or upgrade8.html
-
-CREATE INDEX cust_pay2 ON cust_pay ( custnum );
-CREATE INDEX cust_pay3 ON cust_pay ( paybatch );
-
-Run bin/dbdef-create
-
-Restart Apache and freeside-queued
-
-Use freeside-daily instead of freeside-bill.
-
-Use invoice events instead of freeside-overdue.
-
-- 
cgit v1.2.1


From 5b78ae987febe0f160c06d0592c4b4920e5fe010 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Jul 2002 10:41:21 +0000
Subject: no mysql in 1.4.0 release.  hopefully 1.4.1

---
 httemplate/docs/install.html | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index e8e80baf6..3c96814da 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -13,8 +13,9 @@ Before installing, you need:
   <li>A <b>transactional</b> database engine <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">supported</a> by Perl's <a href="http://dbi.perl.org">DBI</a>.
     <ul>
       <li><a href="http://www.postgresql.org/">PostgreSQL</a> (v7 or higher) is recommended.
-       <li>MySQL has been reported to work.
-         <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you want to use MySQL, you <b>must</b> use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a> or <a href="http://www.mysql.com/doc/I/n/InnoDB.html">InnoDB</a>, and set it as the default table type <!-- when running fs-setup --> using the <code>--default-table-type=BDB</code> or <code>--default-table-type=InnoDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> or <code>default-table-type=InnoDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
+      <li>MySQL versions before 4.1 do not support standard SQL subqueries and are <b>NOT SUPPORTED</b>.  If you are a developer who wishes to contribute MySQL 3.x/4.0 support, see <a href=="http://pouncequick.420.am/rt/Ticket/Display.html?id=438">ticket #438</a> in the bug-tracking system and ask on the -devel mailing list.
+<!--       <li>MySQL has been reported to work.
+         <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you want to use MySQL, you <b>must</b> use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a> or <a href="http://www.mysql.com/doc/I/n/InnoDB.html">InnoDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> or <code>--default-table-type=InnoDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> or <code>default-table-type=InnoDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>. -->
     </ul>
   <li>Perl modules (<a href="http://theoryx5.uwinnipeg.ca/CPAN/perl/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
     <ul>
@@ -40,7 +41,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=String-Approx">String-Approx</a>
       <li><a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>
       <li><a href="http://search.cpan.org/search?dist=DBI">DBI</a>
-      <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a> (<a href="http://search.cpan.org/search?dist=DBD-Pg">DBD::Pg</a> for PostgreSQL, <a href="http://search.cpan.org/search?dist=DBD-mysql">DBD::mysql</a> for MySQL)
+      <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a> (<a href="http://search.cpan.org/search?dist=DBD-Pg">DBD::Pg</a> for PostgreSQL<!--, <a href="http://search.cpan.org/search?dist=DBD-mysql">DBD::mysql</a> for MySQL)-->
       <li><a href="http://search.cpan.org/search?dist=DBIx-DataSource">DBIx-DataSource</a>
       <li><a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>
       <li><a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>
@@ -51,6 +52,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>
       <li><a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a>
       <li><a href="http://search.cpan.org/search?dist=Storable">Storable</a>
+      <li><a href="http://search.cpan.org/search?dist=Cache-Cache">Cache::Cache</a>
       <li><a href="http://search.cpan.org/search?dist=ApacheDBI">Apache::DBI</a> <i>(optional but recommended for better webinterface performance)</i>
     </ul>
 </ul>
@@ -68,16 +70,17 @@ Enter it again:
 Shall the new user be allowed to create databases? (y/n) y
 Shall the new user be allowed to create more new users? (y/n) n
 CREATE USER</pre>
-      <li> with <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#User_Account_Management">MySQL</a>:
+<!--      <li> with <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#User_Account_Management">MySQL</a>:
         <pre>
 $ mysqladmin -u root password '<i>set_a_root_database_password</i>'
 $ mysql -u root -p
 mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* TO freeside@localhost IDENTIFIED BY '<i>set_a_freeside_database_password</i>';</pre>
+-->
     </ul>
 <!--  <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>-->
   <li>Edit the top-level Makefile:
     <ul>
-      <li>Set <tt>DATASOURCE</tt> to your <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI data source</a>, for example, <tt>DBI:Pg:host=localhost;dbname=freeside</tt> for PostgresSQL or <tt>DBI:mysql:freeside</tt> for MySQL.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">manpage for your DBD</a> for the exact syntax of your DBI data source.
+      <li>Set <tt>DATASOURCE</tt> to your <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI data source</a>, for example, <tt>DBI:Pg:host=localhost;dbname=freeside</tt> for PostgresSQL<!-- or <tt>DBI:mysql:freeside</tt> for MySQL-->.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">manpage for your DBD</a> for the exact syntax of your DBI data source.
       <li>Set <tt>DB_PASSWORD</tt> to the freeside database user's password.
     </ul>
   <li>Add the freeside database to your database engine:
@@ -88,9 +91,10 @@ $ su
     <pre>
 $ su freeside
 $ createdb freeside</pre>
-    (with MySQL:)
+<!--    (with MySQL:)
     <pre>
 $ mysqladmin -u freeside -p create freeside </pre>
+-->
   <li>Build and install the Perl modules:
     <pre>
 $ make perl-modules
-- 
cgit v1.2.1


From 920c0d8dea4535893157a547c87dda63dca64599 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Jul 2002 10:51:22 +0000
Subject: adding

---
 FS/t/ClientAPI.t                              |  5 +++++
 fs_selfservice/FS-SelfService/cgi/passwd.html | 25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 FS/t/ClientAPI.t
 create mode 100644 fs_selfservice/FS-SelfService/cgi/passwd.html

diff --git a/FS/t/ClientAPI.t b/FS/t/ClientAPI.t
new file mode 100644
index 000000000..973d8dada
--- /dev/null
+++ b/FS/t/ClientAPI.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::ClientAPI;
+$loaded=1;
+print "ok 1\n";
diff --git a/fs_selfservice/FS-SelfService/cgi/passwd.html b/fs_selfservice/FS-SelfService/cgi/passwd.html
new file mode 100644
index 000000000..fadc4df8b
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/passwd.html
@@ -0,0 +1,25 @@
+<html>
+  <head>
+    <title>Change password</title>
+  </head>
+  <body bgcolor="#e8e8e8">
+    <h3>Change password</h3>
+    <form action="/cgi-bin/fs_passwd.cgi" method="post">
+    <table bgcolor="#cccccc" border=0 cellspacing=2>
+      <tr><th align="right">Username</th>
+        <td><input type="text" name="username" size="18"></td>
+      </tr>
+      <tr><th align="right">Current password</th>
+        <td><input type="password" name="old_password" size="18"></td>
+      </tr>
+      <tr><th align="right">New password</th>
+        <td><input type="password" name="new_password" size="18"></td>
+      </tr>
+      <tr><th align="right">Re-enter new password</th>
+        <td><input type="password" name="new_password2" size="18"></td>
+      </tr>
+    </table>
+    <br><input type="submit" value="Change password">
+  </body>
+</html>
+
-- 
cgit v1.2.1


From bcaf38373e4a191dacca83b4dae24e521908819b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Jul 2002 12:37:51 +0000
Subject: fix small bugs in duplicate username checking

---
 FS/FS/svc_acct.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index bd01adfdc..878d76b9d 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -19,6 +19,7 @@ use FS::Conf;
 use FS::Record qw( qsearch qsearchs fields dbh );
 use FS::svc_Common;
 use Net::SSH;
+use FS::cust_svc;
 use FS::part_svc;
 use FS::svc_acct_pop;
 use FS::svc_acct_sm;
@@ -233,8 +234,8 @@ sub insert {
   }
 
   my @dup_user = qsearch( 'svc_acct', { 'username' => $self->username } );
-  my @dup_userdomain = qsearchs( 'svc_acct', { 'username' => $self->username,
-                                               'domsvc'   => $self->domsvc } );
+  my @dup_userdomain = qsearch( 'svc_acct', { 'username' => $self->username,
+                                              'domsvc'   => $self->domsvc } );
   my @dup_uid;
   if ( $part_svc->part_svc_column('uid')->columnflag ne 'F'
        && $self->username !~ /^(toor|(hyla)?fax)$/          ) {
@@ -276,6 +277,7 @@ sub insert {
     foreach my $dup_user ( @dup_user ) {
       my $dup_svcpart = $dup_user->cust_svc->svcpart;
       if ( exists($conflict_user_svcpart{$dup_svcpart}) ) {
+        $dbh->rollback if $oldAutoCommit;
         return "duplicate username: conflicts with svcnum ". $dup_user->svcnum.
                " via exportnum ". $conflict_user_svcpart{$dup_svcpart};
       }
@@ -284,6 +286,7 @@ sub insert {
     foreach my $dup_userdomain ( @dup_userdomain ) {
       my $dup_svcpart = $dup_userdomain->cust_svc->svcpart;
       if ( exists($conflict_userdomain_svcpart{$dup_svcpart}) ) {
+        $dbh->rollback if $oldAutoCommit;
         return "duplicate username\@domain: conflicts with svcnum ".
                $dup_userdomain->svcnum. " via exportnum ".
                $conflict_userdomain_svcpart{$dup_svcpart};
@@ -294,6 +297,7 @@ sub insert {
       my $dup_svcpart = $dup_uid->cust_svc->svcpart;
       if ( exists($conflict_user_svcpart{$dup_svcpart})
            || exists($conflict_userdomain_svcpart{$dup_svcpart}) ) {
+        $dbh->rollback if $oldAutoCommit;
         return "duplicate uid: conflicts with svcnum". $dup_uid->svcnum.
                "via exportnum ". $conflict_user_svcpart{$dup_svcpart}
                                  || $conflict_userdomain_svcpart{$dup_svcpart};
-- 
cgit v1.2.1


From cff1c159f7c895fc0dd39754d762e90d283888a7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Jul 2002 01:31:53 +0000
Subject: tyop

---
 httemplate/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 3c96814da..cf3f6d555 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -13,7 +13,7 @@ Before installing, you need:
   <li>A <b>transactional</b> database engine <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">supported</a> by Perl's <a href="http://dbi.perl.org">DBI</a>.
     <ul>
       <li><a href="http://www.postgresql.org/">PostgreSQL</a> (v7 or higher) is recommended.
-      <li>MySQL versions before 4.1 do not support standard SQL subqueries and are <b>NOT SUPPORTED</b>.  If you are a developer who wishes to contribute MySQL 3.x/4.0 support, see <a href=="http://pouncequick.420.am/rt/Ticket/Display.html?id=438">ticket #438</a> in the bug-tracking system and ask on the -devel mailing list.
+      <li>MySQL versions before 4.1 do not support standard SQL subqueries and are <b>NOT SUPPORTED</b>.  If you are a developer who wishes to contribute MySQL 3.x/4.0 support, see <a href="http://pouncequick.420.am/rt/Ticket/Display.html?id=438">ticket #438</a> in the bug-tracking system and ask on the -devel mailing list.
 <!--       <li>MySQL has been reported to work.
          <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you want to use MySQL, you <b>must</b> use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a> or <a href="http://www.mysql.com/doc/I/n/InnoDB.html">InnoDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> or <code>--default-table-type=InnoDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> or <code>default-table-type=InnoDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>. -->
     </ul>
-- 
cgit v1.2.1


From e87b9a0b4b7eab8e258b7fac7cb6182ee0f6c7ea Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Jul 2002 01:38:29 +0000
Subject: tyop

---
 httemplate/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index cf3f6d555..262088716 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -41,7 +41,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=String-Approx">String-Approx</a>
       <li><a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>
       <li><a href="http://search.cpan.org/search?dist=DBI">DBI</a>
-      <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a> (<a href="http://search.cpan.org/search?dist=DBD-Pg">DBD::Pg</a> for PostgreSQL<!--, <a href="http://search.cpan.org/search?dist=DBD-mysql">DBD::mysql</a> for MySQL)-->
+      <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a> (<a href="http://search.cpan.org/search?dist=DBD-Pg">DBD::Pg</a> for PostgreSQL<!--, <a href="http://search.cpan.org/search?dist=DBD-mysql">DBD::mysql</a> for MySQL-->)
       <li><a href="http://search.cpan.org/search?dist=DBIx-DataSource">DBIx-DataSource</a>
       <li><a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>
       <li><a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>
-- 
cgit v1.2.1


From dba4eeaf3610792b0ed1149723a8383cc4a6fef1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Jul 2002 02:33:27 +0000
Subject: shellcommands edit gecos field too

---
 FS/FS/part_export.pm               | 2 +-
 FS/FS/part_export/shellcommands.pm | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 0597cddf2..64d21d723 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -719,7 +719,7 @@ tie my %sqlmail_options, 'Tie::IxHash',
       'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
       'options' => \%shellcommands_options,
       'nodomain' => 'Y',
-      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = "";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "pw userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -h 0"; this.form.usermod_stdin.value = "$new__password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>',
+      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = "";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -c $finger -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "pw userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0"; this.form.usermod_stdin.value = "$new__password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>',
     },
 
     'shellcommands_withdomain' => {
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 56cd569af..e4005761b 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -1,6 +1,7 @@
 package FS::part_export::shellcommands;
 
 use vars qw(@ISA @saltset);
+use String::ShellQuote;
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
@@ -27,6 +28,7 @@ sub _export_command {
     no strict 'refs';
     ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
   }
+  $finger = shell_quote $finger;
   $crypt_password = ''; #surpress "used only once" warnings
   $crypt_password = crypt( $svc_acct->_password,
                              $saltset[int(rand(64))].$saltset[int(rand(64))] );
@@ -47,6 +49,7 @@ sub _export_replace {
     ${"old_$_"} = $old->getfield($_) foreach $old->fields;
     ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   }
+  $new_finger = shell_quote $new_finger;
   $new_crypt_password = ''; #surpress "used only once" warnings
   $new_crypt_password = crypt( $new->_password,
                                $saltset[int(rand(64))].$saltset[int(rand(64))]);
-- 
cgit v1.2.1


From 6414c4c23d3fac2012d1524f17c0aae5e5012935 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 27 Jul 2002 02:47:12 +0000
Subject: vacuum pg databases daily

---
 FS/bin/freeside-daily | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index e6f02df33..142b0c73a 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -4,7 +4,7 @@ use strict;
 use Fcntl qw(:flock);
 use Date::Parse;
 use Getopt::Std;
-use FS::UID qw(adminsuidsetup);
+use FS::UID qw(adminsuidsetup driver_name dbh);
 use FS::Record qw(qsearch qsearchs);
 use FS::cust_main;
 
@@ -41,6 +41,13 @@ foreach $cust_main ( @cust_main ) {
 
 }
 
+if ( driver_name eq 'Pg' ) {
+  foreach my $statement ( 'vacuum', 'vacuum analyze' ) {
+    my $sth = dbh->prepare($statement) or die dbh->errstr;
+    $sth->execute or die $sth->errstr;
+  }
+}
+
 # subroutines
 
 sub untaint_argv {
-- 
cgit v1.2.1


From 21b3f9beaa73e13f7d5499c4852192594d20f5fb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 27 Jul 2002 03:56:44 +0000
Subject: move transaction from web interface to lib code

---
 httemplate/misc/cancel-unaudited.cgi | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/httemplate/misc/cancel-unaudited.cgi b/httemplate/misc/cancel-unaudited.cgi
index f1fb15341..11cde968d 100755
--- a/httemplate/misc/cancel-unaudited.cgi
+++ b/httemplate/misc/cancel-unaudited.cgi
@@ -17,30 +17,14 @@ die "Unknown svcnum!" unless $cust_svc;
     qq!pkgnum"> package</A> instead.!) 
   if $cust_svc->pkgnum ne '' && $cust_svc->pkgnum ne '0';
 
-my $svc_x = $cust_svc->svc_x;
-
-local $SIG{HUP} = 'IGNORE';
-local $SIG{INT} = 'IGNORE';
-local $SIG{QUIT} = 'IGNORE';
-local $SIG{TERM} = 'IGNORE';
-local $SIG{TSTP} = 'IGNORE';
-
-local $FS::UID::AutoCommit = 0;
-
-my $error = $svc_x->cancel;
-$error ||= $svc_x->delete;
-$error ||= $cust_svc->delete;
+my $error = $cust_svc->cancel;
 
 if ( $error ) {
-  $dbh->rollback;
   %>
 <!-- mason kludge -->
 <%
   &eidiot($error);
 } else {
-
-  $dbh->commit or die $dbh->errstr;
-
   print $cgi->redirect(popurl(2));
 }
 
-- 
cgit v1.2.1


From 4d49d138a801dd653ab73004144afe64961042f6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 31 Jul 2002 13:18:03 +0000
Subject: fix bug with static IP addresses

---
 FS/FS/svc_acct.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 878d76b9d..c95df94cf 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -838,8 +838,8 @@ sub radius_reply {
       #$attrib =~ s/_/\-/g;
       ( $FS::raddb::attrib{lc($attrib)}, $self->getfield($column) );
     } grep { /^radius_/ && $self->getfield($_) } fields( $self->table );
-  if ( $self->ip && $self->ip ne '0e0' ) {
-    $reply{'Framed-IP-Address'} = $self->ip;
+  if ( $self->slipip && $self->slipip ne '0e0' ) {
+    $reply{'Framed-IP-Address'} = $self->slipip;
   }
   %reply;
 }
-- 
cgit v1.2.1


From ababd9b098c0a91383aff1df8a0a24492b58aba7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 31 Jul 2002 18:55:04 +0000
Subject: delete directories when deleting users on freebsd

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 64d21d723..4f45fbeec 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -719,7 +719,7 @@ tie my %sqlmail_options, 'Tie::IxHash',
       'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
       'options' => \%shellcommands_options,
       'nodomain' => 'Y',
-      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = "";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -c $finger -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "pw userdel $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0"; this.form.usermod_stdin.value = "$new__password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>',
+      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = "";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -c $finger -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "pw userdel $username -r"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0"; this.form.usermod_stdin.value = "$new__password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>',
     },
 
     'shellcommands_withdomain' => {
-- 
cgit v1.2.1


From 030438c9cb1c12ccb79130979ef0922097b4311a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 3 Aug 2002 00:39:31 +0000
Subject: remove some extra modules from install doc

---
 httemplate/docs/install.html | 10 +++++-----
 httemplate/docs/legacy.html  |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 262088716..75f039dd1 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -19,11 +19,11 @@ Before installing, you need:
     </ul>
   <li>Perl modules (<a href="http://theoryx5.uwinnipeg.ca/CPAN/perl/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
     <ul>
-      <li><a href="http://search.cpan.org/search?dist=Array-PrintCols">Array-PrintCols</a>
-      <li><a href="http://search.cpan.org/search?dist=Term-Query">Term-Query</a> (make test broken; install manually)
+<!--      <li><a href="http://search.cpan.org/search?dist=Array-PrintCols">Array-PrintCols</a>
+      <li><a href="http://search.cpan.org/search?dist=Term-Query">Term-Query</a> (make test broken; install manually) -->
       <li><a href="http://search.cpan.org/search?dist=MIME-Base64">MIME-Base64</a>
       <li><a href="http://search.cpan.org/search?dist=Digest-MD5">Digest-MD5</a>
-      <li><a href="http://search.cpan.org/search?dist=MD5">MD5</a>
+<!--      <li><a href="http://search.cpan.org/search?dist=MD5">MD5</a> -->
       <li><a href="http://search.cpan.org/search?dist=URI">URI</a>
       <li><a href="http://search.cpan.org/search?dist=HTML-Tagset">HTML-Tagset</a>
       <li><a href="http://search.cpan.org/search?dist=HTML-Parser">HTML-Parser</a>
@@ -32,7 +32,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=Net-Whois">Net-Whois</a>
       <li><a href="http://search.cpan.org/search?dist=libwww-perl">libwww-perl</a>
       <li><a href="http://search.cpan.org/search?dist=Business-CreditCard">Business-CreditCard</a>
-      <li><a href="http://search.cpan.org/search?dist=Data-ShowTable">Data-ShowTable</a>
+<!--      <li><a href="http://search.cpan.org/search?dist=Data-ShowTable">Data-ShowTable</a> -->
       <li><a href="http://search.cpan.org/search?dist=MailTools">MailTools</a>
       <li><a href="http://search.cpan.org/search?dist=TimeDate">TimeDate</a>
       <li><a href="http://search.cpan.org/search?dist=DateManip">DateManip</a>
@@ -52,7 +52,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>
       <li><a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a>
       <li><a href="http://search.cpan.org/search?dist=Storable">Storable</a>
-      <li><a href="http://search.cpan.org/search?dist=Cache-Cache">Cache::Cache</a>
+<!-- MyAccounts, maybe only for dev     <li><a href="http://search.cpan.org/search?dist=Cache-Cache">Cache::Cache</a> -->
       <li><a href="http://search.cpan.org/search?dist=ApacheDBI">Apache::DBI</a> <i>(optional but recommended for better webinterface performance)</i>
     </ul>
 </ul>
diff --git a/httemplate/docs/legacy.html b/httemplate/docs/legacy.html
index 161690b62..2db9edb0f 100755
--- a/httemplate/docs/legacy.html
+++ b/httemplate/docs/legacy.html
@@ -4,6 +4,7 @@
 <body>
   <h1>Importing legacy data</h1>
 <font size="+2">In most cases, legacy data import all cases will require writing custom code to deal with your particular legacy data.  The example scripts here will not work "out-of-the-box".  Importing your legacy data will most probably involve some hacking on the example scripts noted below.  Contributions to the import process are welcome.</font>
+<br><br><i>Some import scripts may require installation of the <a href="http://search.cpan.org/search?dist=Array-PrintCols">Array-PrintCols</a> and <a href="http://search.cpan.org/search?dist=Term-Query">Term-Query</a> (make test broken; install manually) modules.</i><br>
 <ul>
   <li><a name="bind">bin/bind.import</a> - Import domain information from BIND named
   <li><a name="passwd">bin/passwd.import</a> - Just import `passwd' and `shadow' or `master.passwd', no RADIUS import.
-- 
cgit v1.2.1


From 3ef62a0570055da710328937e7f65dbb2c027c62 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Aug 2002 06:17:09 +0000
Subject: import rt 2.0.14

---
 rt/COPYING                                        |   339 +
 rt/ChangeLog                                      | 16016 ++++++++++++++++++++
 rt/Makefile                                       |   418 +
 rt/README                                         |   336 +
 rt/TODO                                           |     9 +
 rt/bin/initacls.Oracle                            |    26 +
 rt/bin/initacls.Pg                                |    28 +
 rt/bin/initacls.mysql                             |    20 +
 rt/bin/mason_handler.fcgi                         |   221 +
 rt/bin/mason_handler.scgi                         |   193 +
 rt/bin/rt                                         |  1391 ++
 rt/bin/rt-mailgate                                |   367 +
 rt/bin/rtadmin                                    |  1040 ++
 rt/bin/webmux.pl                                  |   177 +
 rt/docs/README.docs                               |     2 +
 rt/docs/Security                                  |    25 +
 rt/docs/design_docs/CARS                          |    66 +
 rt/docs/design_docs/TransactionTypes.txt          |    48 +
 rt/docs/design_docs/acls                          |   206 +
 rt/docs/design_docs/basic-definitions.txt         |    54 +
 rt/docs/design_docs/cli_spec                      |   354 +
 rt/docs/design_docs/cvs_integration               |   164 +
 rt/docs/design_docs/evil_plans                    |   167 +
 rt/docs/design_docs/link-definitions.txt          |   143 +
 rt/docs/design_docs/local_hacking                 |    32 +
 rt/docs/design_docs/subscription-definitions.txt  |   113 +
 rt/docs/design_docs/users                         |    14 +
 rt/docs/rt.gif                                    |   Bin 0 -> 8811 bytes
 rt/etc/acl.Oracle                                 |     9 +
 rt/etc/acl.Pg                                     |    39 +
 rt/etc/acl.mysql                                  |     4 +
 rt/etc/config.pm                                  |   473 +
 rt/etc/rt.spec                                    |   137 +
 rt/etc/schema.Oracle                              |   287 +
 rt/etc/schema.Pg                                  |   267 +
 rt/etc/schema.mysql                               |   267 +
 rt/etc/schema.pm                                  |   349 +
 rt/lib/MANIFEST                                   |    57 +
 rt/lib/MANIFEST.SKIP                              |     1 +
 rt/lib/Makefile.PL                                |    49 +
 rt/lib/RT.pm                                      |   155 +
 rt/lib/RT/ACE.pm                                  |   774 +
 rt/lib/RT/ACL.pm                                  |   308 +
 rt/lib/RT/Action/Autoreply.pm                     |    64 +
 rt/lib/RT/Action/Generic.pm                       |   155 +
 rt/lib/RT/Action/Notify.pm                        |    99 +
 rt/lib/RT/Action/NotifyAsComment.pm               |    25 +
 rt/lib/RT/Action/OpenDependent.pm                 |    55 +
 rt/lib/RT/Action/ResolveMembers.pm                |    57 +
 rt/lib/RT/Action/SendEmail.pm                     |   468 +
 rt/lib/RT/Action/SendPasswordEmail.pm             |   170 +
 rt/lib/RT/Action/StallDependent.pm                |    68 +
 rt/lib/RT/Attachment.pm                           |   423 +
 rt/lib/RT/Attachments.pm                          |    99 +
 rt/lib/RT/Condition/AnyTransaction.pm             |    23 +
 rt/lib/RT/Condition/Generic.pm                    |   170 +
 rt/lib/RT/Condition/NewDependency.pm              |     0
 rt/lib/RT/Condition/StatusChange.pm               |    30 +
 rt/lib/RT/CurrentUser.pm                          |   270 +
 rt/lib/RT/Date.pm                                 |   436 +
 rt/lib/RT/EasySearch.pm                           |   115 +
 rt/lib/RT/Group.pm                                |   364 +
 rt/lib/RT/GroupMember.pm                          |   136 +
 rt/lib/RT/GroupMembers.pm                         |    73 +
 rt/lib/RT/Groups.pm                               |   100 +
 rt/lib/RT/Handle.pm                               |    53 +
 rt/lib/RT/Interface/CLI.pm                        |   224 +
 rt/lib/RT/Interface/Email.pm                      |   581 +
 rt/lib/RT/Interface/Web.pm                        |  1287 ++
 rt/lib/RT/Keyword.pm                              |   446 +
 rt/lib/RT/KeywordSelect.pm                        |   452 +
 rt/lib/RT/KeywordSelects.pm                       |   143 +
 rt/lib/RT/Keywords.pm                             |   106 +
 rt/lib/RT/Link.pm                                 |   373 +
 rt/lib/RT/Links.pm                                |    90 +
 rt/lib/RT/ObjectKeyword.pm                        |   192 +
 rt/lib/RT/ObjectKeywords.pm                       |   234 +
 rt/lib/RT/Queue.pm                                |   944 ++
 rt/lib/RT/Queues.pm                               |   123 +
 rt/lib/RT/Record.pm                               |   345 +
 rt/lib/RT/Scrip.pm                                |   372 +
 rt/lib/RT/ScripAction.pm                          |   200 +
 rt/lib/RT/ScripActions.pm                         |    70 +
 rt/lib/RT/ScripCondition.pm                       |   192 +
 rt/lib/RT/ScripConditions.pm                      |    69 +
 rt/lib/RT/Scrips.pm                               |   127 +
 rt/lib/RT/Template.pm                             |   395 +
 rt/lib/RT/Templates.pm                            |   122 +
 rt/lib/RT/TestHarness.pm                          |    14 +
 rt/lib/RT/Ticket.pm                               |  3004 ++++
 rt/lib/RT/Tickets.pm                              |  1789 +++
 rt/lib/RT/Transaction.pm                          |   783 +
 rt/lib/RT/Transactions.pm                         |    78 +
 rt/lib/RT/User.pm                                 |  1222 ++
 rt/lib/RT/Users.pm                                |   281 +
 rt/lib/RT/Watcher.pm                              |   313 +
 rt/lib/RT/Watchers.pm                             |   226 +
 rt/lib/test.pl                                    |    52 +
 rt/tools/cpan2rpm                                 |   299 +
 rt/tools/initdb                                   |   216 +
 rt/tools/insertdata                               |   618 +
 rt/tools/testdeps                                 |   115 +
 rt/webrt/Admin/Elements/CreateQueueCalled         |     3 +
 rt/webrt/Admin/Elements/CreateUserCalled          |     3 +
 rt/webrt/Admin/Elements/EditUserComments          |     9 +
 rt/webrt/Admin/Elements/GrantQueueRightsTo        |    30 +
 rt/webrt/Admin/Elements/GroupTabs                 |    18 +
 rt/webrt/Admin/Elements/Header                    |     5 +
 rt/webrt/Admin/Elements/ListGlobalKeywordSelects  |    15 +
 rt/webrt/Admin/Elements/ListGlobalScrips          |    10 +
 rt/webrt/Admin/Elements/ModifyKeyword             |    95 +
 rt/webrt/Admin/Elements/ModifyKeywordSelect       |   120 +
 rt/webrt/Admin/Elements/ModifyQueue               |    56 +
 rt/webrt/Admin/Elements/ModifyTemplate            |    78 +
 rt/webrt/Admin/Elements/ModifyUser                |    77 +
 rt/webrt/Admin/Elements/QueueRightsForUser        |    17 +
 rt/webrt/Admin/Elements/QueueTabs                 |    36 +
 rt/webrt/Admin/Elements/SelectKeywordSelect       |    22 +
 rt/webrt/Admin/Elements/SelectModifyGroup         |    10 +
 rt/webrt/Admin/Elements/SelectModifyKeyword       |    13 +
 rt/webrt/Admin/Elements/SelectModifyKeywordSelect |    13 +
 rt/webrt/Admin/Elements/SelectModifyQueue         |    10 +
 rt/webrt/Admin/Elements/SelectModifyUser          |    26 +
 rt/webrt/Admin/Elements/SelectQueueRights         |    29 +
 rt/webrt/Admin/Elements/SelectRights              |    58 +
 rt/webrt/Admin/Elements/SelectScrip               |    25 +
 rt/webrt/Admin/Elements/SelectScripAction         |    25 +
 rt/webrt/Admin/Elements/SelectScripCondition      |    25 +
 rt/webrt/Admin/Elements/SelectSingleOrMultiple    |    20 +
 rt/webrt/Admin/Elements/SelectTemplate            |    37 +
 rt/webrt/Admin/Elements/SelectUsers               |    17 +
 rt/webrt/Admin/Elements/SystemTabs                |    31 +
 rt/webrt/Admin/Elements/Tabs                      |    31 +
 rt/webrt/Admin/Elements/UserTabs                  |    21 +
 rt/webrt/Admin/Global/GroupRights.html            |    78 +
 rt/webrt/Admin/Global/Keywords.html               |    97 +
 rt/webrt/Admin/Global/Scrips.html                 |    95 +
 rt/webrt/Admin/Global/Template.html               |    66 +
 rt/webrt/Admin/Global/Templates.html              |    24 +
 rt/webrt/Admin/Global/UserRights.html             |    42 +
 rt/webrt/Admin/Global/index.html                  |     2 +
 rt/webrt/Admin/Groups/Members.html                |    76 +
 rt/webrt/Admin/Groups/Modify.html                 |    83 +
 rt/webrt/Admin/Groups/Rights.html                 |     1 +
 rt/webrt/Admin/Groups/index.html                  |    33 +
 rt/webrt/Admin/KeywordSelects/Modify.html         |    17 +
 rt/webrt/Admin/KeywordSelects/index.html          |   137 +
 rt/webrt/Admin/Keywords/Modify.html               |    96 +
 rt/webrt/Admin/Keywords/index.html                |   110 +
 rt/webrt/Admin/Queues/Create.html                 |    13 +
 rt/webrt/Admin/Queues/GroupRights.html            |   103 +
 rt/webrt/Admin/Queues/Keywords.html               |   114 +
 rt/webrt/Admin/Queues/Modify.html                 |   137 +
 rt/webrt/Admin/Queues/People.html                 |   161 +
 rt/webrt/Admin/Queues/Scrips.html                 |   111 +
 rt/webrt/Admin/Queues/Template.html               |    68 +
 rt/webrt/Admin/Queues/Templates.html              |    24 +
 rt/webrt/Admin/Queues/UserRights.html             |    72 +
 rt/webrt/Admin/Queues/index.html                  |    52 +
 rt/webrt/Admin/Users/Modify.html                  |   259 +
 rt/webrt/Admin/Users/Prefs.html                   |    97 +
 rt/webrt/Admin/Users/Rights.html                  |     1 +
 rt/webrt/Admin/Users/index.html                   |    71 +
 rt/webrt/Admin/index.html                         |     4 +
 rt/webrt/Elements/Checkbox                        |    17 +
 rt/webrt/Elements/CreateTicket                    |     1 +
 rt/webrt/Elements/CustomHomepageHeader            |     0
 rt/webrt/Elements/Error                           |    23 +
 rt/webrt/Elements/Footer                          |    10 +
 rt/webrt/Elements/GotoTicket                      |     1 +
 rt/webrt/Elements/Header                          |    61 +
 rt/webrt/Elements/ListActions                     |    14 +
 rt/webrt/Elements/Login                           |    69 +
 rt/webrt/Elements/MessageBox                      |    30 +
 rt/webrt/Elements/MyRequests                      |    45 +
 rt/webrt/Elements/MyTickets                       |    43 +
 rt/webrt/Elements/Quicksearch                     |    41 +
 rt/webrt/Elements/Refresh                         |    22 +
 rt/webrt/Elements/Section                         |    11 +
 rt/webrt/Elements/SelectBoolean                   |    24 +
 rt/webrt/Elements/SelectDate                      |    25 +
 rt/webrt/Elements/SelectDateRelation              |    14 +
 rt/webrt/Elements/SelectDateType                  |    12 +
 rt/webrt/Elements/SelectEqualityOperator          |    18 +
 rt/webrt/Elements/SelectKeyword                   |    38 +
 rt/webrt/Elements/SelectKeywordOptions            |    18 +
 rt/webrt/Elements/SelectLinkType                  |    16 +
 rt/webrt/Elements/SelectMatch                     |    31 +
 rt/webrt/Elements/SelectNewTicketQueue            |     9 +
 rt/webrt/Elements/SelectOwner                     |    22 +
 rt/webrt/Elements/SelectQueue                     |    38 +
 rt/webrt/Elements/SelectResultsPerPage            |    22 +
 rt/webrt/Elements/SelectSortOrder                 |    18 +
 rt/webrt/Elements/SelectStatus                    |    17 +
 rt/webrt/Elements/SelectTicketSortBy              |    15 +
 rt/webrt/Elements/SelectUsers                     |     8 +
 rt/webrt/Elements/SelectWatcherType               |    26 +
 rt/webrt/Elements/ShadedBox                       |     5 +
 rt/webrt/Elements/Submit                          |    44 +
 rt/webrt/Elements/Tabs                            |   133 +
 rt/webrt/Elements/TitleBoxEnd                     |    10 +
 rt/webrt/Elements/TitleBoxStart                   |    20 +
 rt/webrt/Elements/ViewUser                        |    29 +
 rt/webrt/Elements/dayMenu                         |    19 +
 rt/webrt/Elements/monthMenu                       |    37 +
 rt/webrt/Elements/yearMenu                        |    24 +
 rt/webrt/NoAuth/Logout.html                       |    22 +
 rt/webrt/NoAuth/Reminder.html                     |     3 +
 rt/webrt/NoAuth/images/rt.jpg                     |   Bin 0 -> 917 bytes
 rt/webrt/NoAuth/images/spacer.gif                 |   Bin 0 -> 43 bytes
 rt/webrt/NoAuth/webrt.css                         |   102 +
 rt/webrt/Search/Bulk.html                         |   186 +
 rt/webrt/Search/Listing.html                      |   134 +
 rt/webrt/Search/PickRestriction                   |   112 +
 rt/webrt/Search/RestrictSearch.html               |     3 +
 rt/webrt/Search/TicketCell                        |    28 +
 rt/webrt/SelfService/Attachment/dhandler          |    27 +
 rt/webrt/SelfService/Closed.html                  |     4 +
 rt/webrt/SelfService/Create.html                  |    63 +
 rt/webrt/SelfService/Display.html                 |   190 +
 rt/webrt/SelfService/Elements/GotoTicket          |     1 +
 rt/webrt/SelfService/Elements/Header              |    55 +
 rt/webrt/SelfService/Elements/MyRequests          |    41 +
 rt/webrt/SelfService/Elements/Tabs                |    49 +
 rt/webrt/SelfService/Error.html                   |    22 +
 rt/webrt/SelfService/Prefs.html                   |    51 +
 rt/webrt/SelfService/Update.html                  |    40 +
 rt/webrt/SelfService/index.html                   |     3 +
 rt/webrt/Ticket/Attachment/dhandler               |    27 +
 rt/webrt/Ticket/Create.html                       |   199 +
 rt/webrt/Ticket/Display.html                      |   152 +
 rt/webrt/Ticket/Elements/AddWatchers              |    54 +
 rt/webrt/Ticket/Elements/EditBasics               |    62 +
 rt/webrt/Ticket/Elements/EditDates                |    46 +
 rt/webrt/Ticket/Elements/EditKeywordSelects       |    45 +
 rt/webrt/Ticket/Elements/EditLinks                |   109 +
 rt/webrt/Ticket/Elements/EditPeople               |    37 +
 rt/webrt/Ticket/Elements/EditWatchers             |    46 +
 rt/webrt/Ticket/Elements/ShowBasics               |    29 +
 rt/webrt/Ticket/Elements/ShowDates                |    54 +
 rt/webrt/Ticket/Elements/ShowDependencies         |    18 +
 rt/webrt/Ticket/Elements/ShowHistory              |    43 +
 rt/webrt/Ticket/Elements/ShowKeywordSelects       |    26 +
 rt/webrt/Ticket/Elements/ShowLinks                |    61 +
 rt/webrt/Ticket/Elements/ShowMemberOf             |    12 +
 rt/webrt/Ticket/Elements/ShowMembers              |    22 +
 rt/webrt/Ticket/Elements/ShowPeople               |    12 +
 rt/webrt/Ticket/Elements/ShowReferences           |    27 +
 rt/webrt/Ticket/Elements/ShowRequestor            |    35 +
 rt/webrt/Ticket/Elements/ShowSummary              |    61 +
 rt/webrt/Ticket/Elements/ShowTransaction          |   162 +
 rt/webrt/Ticket/Elements/Tabs                     |   126 +
 rt/webrt/Ticket/Elements/ToolBar                  |     3 +
 rt/webrt/Ticket/History.html                      |    30 +
 rt/webrt/Ticket/Modify.html                       |    39 +
 rt/webrt/Ticket/ModifyAll.html                    |   124 +
 rt/webrt/Ticket/ModifyDates.html                  |    26 +
 rt/webrt/Ticket/ModifyLinks.html                  |    31 +
 rt/webrt/Ticket/ModifyPeople.html                 |    38 +
 rt/webrt/Ticket/Update.html                       |   110 +
 rt/webrt/User/Prefs.html                          |    53 +
 rt/webrt/autohandler                              |    73 +
 rt/webrt/index.html                               |    25 +
 263 files changed, 52157 insertions(+)
 create mode 100755 rt/COPYING
 create mode 100644 rt/ChangeLog
 create mode 100644 rt/Makefile
 create mode 100755 rt/README
 create mode 100755 rt/TODO
 create mode 100644 rt/bin/initacls.Oracle
 create mode 100755 rt/bin/initacls.Pg
 create mode 100755 rt/bin/initacls.mysql
 create mode 100755 rt/bin/mason_handler.fcgi
 create mode 100755 rt/bin/mason_handler.scgi
 create mode 100755 rt/bin/rt
 create mode 100755 rt/bin/rt-mailgate
 create mode 100644 rt/bin/rtadmin
 create mode 100755 rt/bin/webmux.pl
 create mode 100755 rt/docs/README.docs
 create mode 100644 rt/docs/Security
 create mode 100755 rt/docs/design_docs/CARS
 create mode 100755 rt/docs/design_docs/TransactionTypes.txt
 create mode 100644 rt/docs/design_docs/acls
 create mode 100644 rt/docs/design_docs/basic-definitions.txt
 create mode 100644 rt/docs/design_docs/cli_spec
 create mode 100644 rt/docs/design_docs/cvs_integration
 create mode 100644 rt/docs/design_docs/evil_plans
 create mode 100644 rt/docs/design_docs/link-definitions.txt
 create mode 100644 rt/docs/design_docs/local_hacking
 create mode 100755 rt/docs/design_docs/subscription-definitions.txt
 create mode 100644 rt/docs/design_docs/users
 create mode 100755 rt/docs/rt.gif
 create mode 100644 rt/etc/acl.Oracle
 create mode 100755 rt/etc/acl.Pg
 create mode 100755 rt/etc/acl.mysql
 create mode 100755 rt/etc/config.pm
 create mode 100644 rt/etc/rt.spec
 create mode 100644 rt/etc/schema.Oracle
 create mode 100755 rt/etc/schema.Pg
 create mode 100755 rt/etc/schema.mysql
 create mode 100644 rt/etc/schema.pm
 create mode 100644 rt/lib/MANIFEST
 create mode 100644 rt/lib/MANIFEST.SKIP
 create mode 100644 rt/lib/Makefile.PL
 create mode 100644 rt/lib/RT.pm
 create mode 100755 rt/lib/RT/ACE.pm
 create mode 100755 rt/lib/RT/ACL.pm
 create mode 100755 rt/lib/RT/Action/Autoreply.pm
 create mode 100755 rt/lib/RT/Action/Generic.pm
 create mode 100755 rt/lib/RT/Action/Notify.pm
 create mode 100755 rt/lib/RT/Action/NotifyAsComment.pm
 create mode 100644 rt/lib/RT/Action/OpenDependent.pm
 create mode 100644 rt/lib/RT/Action/ResolveMembers.pm
 create mode 100755 rt/lib/RT/Action/SendEmail.pm
 create mode 100755 rt/lib/RT/Action/SendPasswordEmail.pm
 create mode 100644 rt/lib/RT/Action/StallDependent.pm
 create mode 100755 rt/lib/RT/Attachment.pm
 create mode 100755 rt/lib/RT/Attachments.pm
 create mode 100644 rt/lib/RT/Condition/AnyTransaction.pm
 create mode 100755 rt/lib/RT/Condition/Generic.pm
 create mode 100644 rt/lib/RT/Condition/NewDependency.pm
 create mode 100644 rt/lib/RT/Condition/StatusChange.pm
 create mode 100755 rt/lib/RT/CurrentUser.pm
 create mode 100644 rt/lib/RT/Date.pm
 create mode 100755 rt/lib/RT/EasySearch.pm
 create mode 100755 rt/lib/RT/Group.pm
 create mode 100755 rt/lib/RT/GroupMember.pm
 create mode 100755 rt/lib/RT/GroupMembers.pm
 create mode 100755 rt/lib/RT/Groups.pm
 create mode 100644 rt/lib/RT/Handle.pm
 create mode 100644 rt/lib/RT/Interface/CLI.pm
 create mode 100755 rt/lib/RT/Interface/Email.pm
 create mode 100644 rt/lib/RT/Interface/Web.pm
 create mode 100644 rt/lib/RT/Keyword.pm
 create mode 100644 rt/lib/RT/KeywordSelect.pm
 create mode 100644 rt/lib/RT/KeywordSelects.pm
 create mode 100644 rt/lib/RT/Keywords.pm
 create mode 100644 rt/lib/RT/Link.pm
 create mode 100644 rt/lib/RT/Links.pm
 create mode 100644 rt/lib/RT/ObjectKeyword.pm
 create mode 100644 rt/lib/RT/ObjectKeywords.pm
 create mode 100755 rt/lib/RT/Queue.pm
 create mode 100755 rt/lib/RT/Queues.pm
 create mode 100755 rt/lib/RT/Record.pm
 create mode 100755 rt/lib/RT/Scrip.pm
 create mode 100755 rt/lib/RT/ScripAction.pm
 create mode 100755 rt/lib/RT/ScripActions.pm
 create mode 100755 rt/lib/RT/ScripCondition.pm
 create mode 100755 rt/lib/RT/ScripConditions.pm
 create mode 100755 rt/lib/RT/Scrips.pm
 create mode 100755 rt/lib/RT/Template.pm
 create mode 100755 rt/lib/RT/Templates.pm
 create mode 100644 rt/lib/RT/TestHarness.pm
 create mode 100755 rt/lib/RT/Ticket.pm
 create mode 100755 rt/lib/RT/Tickets.pm
 create mode 100755 rt/lib/RT/Transaction.pm
 create mode 100755 rt/lib/RT/Transactions.pm
 create mode 100755 rt/lib/RT/User.pm
 create mode 100755 rt/lib/RT/Users.pm
 create mode 100755 rt/lib/RT/Watcher.pm
 create mode 100755 rt/lib/RT/Watchers.pm
 create mode 100644 rt/lib/test.pl
 create mode 100644 rt/tools/cpan2rpm
 create mode 100644 rt/tools/initdb
 create mode 100755 rt/tools/insertdata
 create mode 100644 rt/tools/testdeps
 create mode 100755 rt/webrt/Admin/Elements/CreateQueueCalled
 create mode 100755 rt/webrt/Admin/Elements/CreateUserCalled
 create mode 100755 rt/webrt/Admin/Elements/EditUserComments
 create mode 100755 rt/webrt/Admin/Elements/GrantQueueRightsTo
 create mode 100755 rt/webrt/Admin/Elements/GroupTabs
 create mode 100755 rt/webrt/Admin/Elements/Header
 create mode 100644 rt/webrt/Admin/Elements/ListGlobalKeywordSelects
 create mode 100755 rt/webrt/Admin/Elements/ListGlobalScrips
 create mode 100644 rt/webrt/Admin/Elements/ModifyKeyword
 create mode 100644 rt/webrt/Admin/Elements/ModifyKeywordSelect
 create mode 100755 rt/webrt/Admin/Elements/ModifyQueue
 create mode 100755 rt/webrt/Admin/Elements/ModifyTemplate
 create mode 100755 rt/webrt/Admin/Elements/ModifyUser
 create mode 100644 rt/webrt/Admin/Elements/QueueRightsForUser
 create mode 100755 rt/webrt/Admin/Elements/QueueTabs
 create mode 100644 rt/webrt/Admin/Elements/SelectKeywordSelect
 create mode 100644 rt/webrt/Admin/Elements/SelectModifyGroup
 create mode 100644 rt/webrt/Admin/Elements/SelectModifyKeyword
 create mode 100644 rt/webrt/Admin/Elements/SelectModifyKeywordSelect
 create mode 100755 rt/webrt/Admin/Elements/SelectModifyQueue
 create mode 100755 rt/webrt/Admin/Elements/SelectModifyUser
 create mode 100755 rt/webrt/Admin/Elements/SelectQueueRights
 create mode 100644 rt/webrt/Admin/Elements/SelectRights
 create mode 100755 rt/webrt/Admin/Elements/SelectScrip
 create mode 100644 rt/webrt/Admin/Elements/SelectScripAction
 create mode 100644 rt/webrt/Admin/Elements/SelectScripCondition
 create mode 100644 rt/webrt/Admin/Elements/SelectSingleOrMultiple
 create mode 100755 rt/webrt/Admin/Elements/SelectTemplate
 create mode 100644 rt/webrt/Admin/Elements/SelectUsers
 create mode 100755 rt/webrt/Admin/Elements/SystemTabs
 create mode 100755 rt/webrt/Admin/Elements/Tabs
 create mode 100755 rt/webrt/Admin/Elements/UserTabs
 create mode 100755 rt/webrt/Admin/Global/GroupRights.html
 create mode 100644 rt/webrt/Admin/Global/Keywords.html
 create mode 100755 rt/webrt/Admin/Global/Scrips.html
 create mode 100755 rt/webrt/Admin/Global/Template.html
 create mode 100755 rt/webrt/Admin/Global/Templates.html
 create mode 100755 rt/webrt/Admin/Global/UserRights.html
 create mode 100755 rt/webrt/Admin/Global/index.html
 create mode 100644 rt/webrt/Admin/Groups/Members.html
 create mode 100644 rt/webrt/Admin/Groups/Modify.html
 create mode 100644 rt/webrt/Admin/Groups/Rights.html
 create mode 100644 rt/webrt/Admin/Groups/index.html
 create mode 100644 rt/webrt/Admin/KeywordSelects/Modify.html
 create mode 100644 rt/webrt/Admin/KeywordSelects/index.html
 create mode 100644 rt/webrt/Admin/Keywords/Modify.html
 create mode 100644 rt/webrt/Admin/Keywords/index.html
 create mode 100755 rt/webrt/Admin/Queues/Create.html
 create mode 100755 rt/webrt/Admin/Queues/GroupRights.html
 create mode 100644 rt/webrt/Admin/Queues/Keywords.html
 create mode 100755 rt/webrt/Admin/Queues/Modify.html
 create mode 100755 rt/webrt/Admin/Queues/People.html
 create mode 100755 rt/webrt/Admin/Queues/Scrips.html
 create mode 100755 rt/webrt/Admin/Queues/Template.html
 create mode 100755 rt/webrt/Admin/Queues/Templates.html
 create mode 100755 rt/webrt/Admin/Queues/UserRights.html
 create mode 100755 rt/webrt/Admin/Queues/index.html
 create mode 100755 rt/webrt/Admin/Users/Modify.html
 create mode 100755 rt/webrt/Admin/Users/Prefs.html
 create mode 100644 rt/webrt/Admin/Users/Rights.html
 create mode 100755 rt/webrt/Admin/Users/index.html
 create mode 100755 rt/webrt/Admin/index.html
 create mode 100755 rt/webrt/Elements/Checkbox
 create mode 100644 rt/webrt/Elements/CreateTicket
 create mode 100644 rt/webrt/Elements/CustomHomepageHeader
 create mode 100755 rt/webrt/Elements/Error
 create mode 100755 rt/webrt/Elements/Footer
 create mode 100644 rt/webrt/Elements/GotoTicket
 create mode 100755 rt/webrt/Elements/Header
 create mode 100755 rt/webrt/Elements/ListActions
 create mode 100755 rt/webrt/Elements/Login
 create mode 100644 rt/webrt/Elements/MessageBox
 create mode 100644 rt/webrt/Elements/MyRequests
 create mode 100644 rt/webrt/Elements/MyTickets
 create mode 100644 rt/webrt/Elements/Quicksearch
 create mode 100644 rt/webrt/Elements/Refresh
 create mode 100755 rt/webrt/Elements/Section
 create mode 100755 rt/webrt/Elements/SelectBoolean
 create mode 100755 rt/webrt/Elements/SelectDate
 create mode 100755 rt/webrt/Elements/SelectDateRelation
 create mode 100755 rt/webrt/Elements/SelectDateType
 create mode 100755 rt/webrt/Elements/SelectEqualityOperator
 create mode 100644 rt/webrt/Elements/SelectKeyword
 create mode 100644 rt/webrt/Elements/SelectKeywordOptions
 create mode 100644 rt/webrt/Elements/SelectLinkType
 create mode 100644 rt/webrt/Elements/SelectMatch
 create mode 100755 rt/webrt/Elements/SelectNewTicketQueue
 create mode 100755 rt/webrt/Elements/SelectOwner
 create mode 100755 rt/webrt/Elements/SelectQueue
 create mode 100644 rt/webrt/Elements/SelectResultsPerPage
 create mode 100644 rt/webrt/Elements/SelectSortOrder
 create mode 100755 rt/webrt/Elements/SelectStatus
 create mode 100644 rt/webrt/Elements/SelectTicketSortBy
 create mode 100755 rt/webrt/Elements/SelectUsers
 create mode 100644 rt/webrt/Elements/SelectWatcherType
 create mode 100755 rt/webrt/Elements/ShadedBox
 create mode 100755 rt/webrt/Elements/Submit
 create mode 100755 rt/webrt/Elements/Tabs
 create mode 100755 rt/webrt/Elements/TitleBoxEnd
 create mode 100755 rt/webrt/Elements/TitleBoxStart
 create mode 100644 rt/webrt/Elements/ViewUser
 create mode 100755 rt/webrt/Elements/dayMenu
 create mode 100755 rt/webrt/Elements/monthMenu
 create mode 100755 rt/webrt/Elements/yearMenu
 create mode 100755 rt/webrt/NoAuth/Logout.html
 create mode 100755 rt/webrt/NoAuth/Reminder.html
 create mode 100644 rt/webrt/NoAuth/images/rt.jpg
 create mode 100644 rt/webrt/NoAuth/images/spacer.gif
 create mode 100755 rt/webrt/NoAuth/webrt.css
 create mode 100755 rt/webrt/Search/Bulk.html
 create mode 100755 rt/webrt/Search/Listing.html
 create mode 100755 rt/webrt/Search/PickRestriction
 create mode 100755 rt/webrt/Search/RestrictSearch.html
 create mode 100644 rt/webrt/Search/TicketCell
 create mode 100644 rt/webrt/SelfService/Attachment/dhandler
 create mode 100644 rt/webrt/SelfService/Closed.html
 create mode 100755 rt/webrt/SelfService/Create.html
 create mode 100755 rt/webrt/SelfService/Display.html
 create mode 100755 rt/webrt/SelfService/Elements/GotoTicket
 create mode 100755 rt/webrt/SelfService/Elements/Header
 create mode 100644 rt/webrt/SelfService/Elements/MyRequests
 create mode 100644 rt/webrt/SelfService/Elements/Tabs
 create mode 100755 rt/webrt/SelfService/Error.html
 create mode 100755 rt/webrt/SelfService/Prefs.html
 create mode 100755 rt/webrt/SelfService/Update.html
 create mode 100644 rt/webrt/SelfService/index.html
 create mode 100644 rt/webrt/Ticket/Attachment/dhandler
 create mode 100755 rt/webrt/Ticket/Create.html
 create mode 100755 rt/webrt/Ticket/Display.html
 create mode 100755 rt/webrt/Ticket/Elements/AddWatchers
 create mode 100755 rt/webrt/Ticket/Elements/EditBasics
 create mode 100755 rt/webrt/Ticket/Elements/EditDates
 create mode 100644 rt/webrt/Ticket/Elements/EditKeywordSelects
 create mode 100755 rt/webrt/Ticket/Elements/EditLinks
 create mode 100755 rt/webrt/Ticket/Elements/EditPeople
 create mode 100755 rt/webrt/Ticket/Elements/EditWatchers
 create mode 100755 rt/webrt/Ticket/Elements/ShowBasics
 create mode 100755 rt/webrt/Ticket/Elements/ShowDates
 create mode 100755 rt/webrt/Ticket/Elements/ShowDependencies
 create mode 100755 rt/webrt/Ticket/Elements/ShowHistory
 create mode 100644 rt/webrt/Ticket/Elements/ShowKeywordSelects
 create mode 100755 rt/webrt/Ticket/Elements/ShowLinks
 create mode 100755 rt/webrt/Ticket/Elements/ShowMemberOf
 create mode 100755 rt/webrt/Ticket/Elements/ShowMembers
 create mode 100755 rt/webrt/Ticket/Elements/ShowPeople
 create mode 100755 rt/webrt/Ticket/Elements/ShowReferences
 create mode 100644 rt/webrt/Ticket/Elements/ShowRequestor
 create mode 100755 rt/webrt/Ticket/Elements/ShowSummary
 create mode 100755 rt/webrt/Ticket/Elements/ShowTransaction
 create mode 100755 rt/webrt/Ticket/Elements/Tabs
 create mode 100755 rt/webrt/Ticket/Elements/ToolBar
 create mode 100755 rt/webrt/Ticket/History.html
 create mode 100755 rt/webrt/Ticket/Modify.html
 create mode 100755 rt/webrt/Ticket/ModifyAll.html
 create mode 100755 rt/webrt/Ticket/ModifyDates.html
 create mode 100755 rt/webrt/Ticket/ModifyLinks.html
 create mode 100755 rt/webrt/Ticket/ModifyPeople.html
 create mode 100755 rt/webrt/Ticket/Update.html
 create mode 100755 rt/webrt/User/Prefs.html
 create mode 100755 rt/webrt/autohandler
 create mode 100644 rt/webrt/index.html

diff --git a/rt/COPYING b/rt/COPYING
new file mode 100755
index 000000000..e77696ae8
--- /dev/null
+++ b/rt/COPYING
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    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., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/rt/ChangeLog b/rt/ChangeLog
new file mode 100644
index 000000000..549a5cac7
--- /dev/null
+++ b/rt/ChangeLog
@@ -0,0 +1,16016 @@
+2002-07-19 22:47  jesse
+
+	* README:
+
+	Fixed the readme about fastcgi
+	
+2002-07-19 22:42  jesse
+
+	* Makefile:
+
+	Bumped the version to 2.0.14
+	
+2002-07-19 01:22  jesse
+
+	* Makefile, bin/rt, webrt/Search/Bulk.html:
+
+	RT-Ticket: 1547
+	
+	Bumping the version to 2.0.14-pre4
+	Fixing a typo that pdh caught in Tickets/Bulk.html
+	
+2002-07-13 00:22  jesse
+
+	* Makefile:
+
+	Bumped to 2.0.14-pre3
+	
+2002-07-13 00:19  jesse
+
+	* bin/webmux.pl:
+
+	modperl handler now speaks Mason 1.11 properly.
+	
+2002-07-13 00:00  jesse
+
+	* etc/config.pm:
+
+	Shifted some config defaults to make things easier for newbie users
+	
+2002-07-12 13:31  jesse
+
+	* lib/RT/Interface/Web.pm:
+
+	Now we properly strip long pathnames from attachments uploaded from windows boxes.
+	
+2002-07-11 01:41  jesse
+
+	* lib/RT/Interface/Web.pm:
+
+	Fixing a typo in the mason 11 handler
+	
+2002-07-10 14:41  jesse
+
+	* Makefile:
+
+	Bumping the version to 2.0.14-pre2
+	
+2002-07-10 14:36  jesse
+
+	* lib/RT/User.pm:
+
+	[no log message]
+	
+2002-07-10 14:35  jesse
+
+	* lib/RT/: Queue.pm, Ticket.pm:
+
+	RT-Ticket: 1418
+	RT-Status: resolved
+	
+	minor perldoc cleanups from pdh@snapgear
+	
+2002-07-10 14:32  jesse
+
+	* bin/rt-mailgate, lib/RT/Action/SendEmail.pm:
+
+	RT-Ticket: 1425
+	RT-Status: resolved
+	RT-Milestone: 2.0.x
+	RT-Subsystem: Mail Sending
+	
+	Fixes to create more proper message ids.
+	
+2002-07-10 14:28  jesse
+
+	* lib/RT/Ticket.pm:
+
+	RT-Ticket: 1431
+	RT-Status: resolved
+	
+	Importing tickets now lets you set the "Resolved" date
+	
+2002-07-10 14:17  jesse
+
+	* lib/RT/Tickets.pm:
+
+	RT-Ticket: 1434
+	RT-Status: resolved
+	RT-Subsystem: Core
+	RT-Milestone: 2.0.x
+	
+	RT is now smarter about letting you do "or" searches on single-value
+	keyword selections. Thanks to sam hartman.
+	
+2002-07-10 14:15  jesse
+
+	* webrt/Ticket/: Display.html, ModifyAll.html:
+
+	RT-Ticket: 1433
+	RT-Status: resolved
+	RT-Milestone: 2.0.x
+	RT-Subsystem: HTML::Mason frontend
+	RT-Severity: Nice to have
+	RT-Broken In: 2.0.13
+	RT-Broken In: 2.0.12
+	RT-Broken In: 2.0.11
+	RT-Broken In: 2.0.10
+	RT-Broken In: 2.0.0
+	RT-Broken In: 2.0.1
+	RT-Broken In: 2.0.2
+	RT-Broken In: 2.0.3
+	RT-Broken In: 2.0.4
+	RT-Broken In: 2.0.5
+	RT-Broken In: 2.0.6
+	RT-Broken In: 2.0.7
+	RT-Broken In: 2.0.8
+	RT-Broken In: 2.0.9
+	
+	Some signatures weren't setting off the "don't record comments if the update
+	is only a signature" code. Fixed.
+	
+2002-07-10 13:59  jesse
+
+	* lib/RT/Transaction.pm:
+
+	RT-Ticket: 1501
+	RT-Status: resolved
+	
+	Fixing docs in Transaction.pm's Message method
+	
+2002-07-10 13:19  jesse
+
+	* bin/rt:
+
+	RT-Ticket: 1528
+	RT-Milestone: 2.0.x
+	RT-Subsystem: CLI
+	RT-Severity: Normal
+	RT-Status: resolved
+	
+	Fixed docs for cli to say that --limit-status=dead isn't a valid option
+	
+2002-06-26 15:22  jesse
+
+	* lib/RT/Interface/Web.pm:
+
+	support for mason 1.1
+	
+2002-06-26 15:19  jesse
+
+	* Makefile, bin/mason_handler.fcgi, bin/webmux.pl,
+	webrt/Admin/Queues/GroupRights.html,
+	webrt/Admin/Queues/UserRights.html, webrt/Elements/ListActions,
+	webrt/Ticket/Elements/ShowBasics, webrt/Ticket/Elements/ToolBar:
+
+	Adding support for mason 1.10
+	
+2002-06-26 15:15  jesse
+
+	* lib/RT/Action/Notify.pm:
+
+	Fixed notify cc behavior
+	
+2002-06-26 15:13  jesse
+
+	* lib/RT/Action/SendEmail.pm:
+
+	Fixed pseudo-list syntax in To: lines
+	
+2002-06-26 15:09  jesse
+
+	* webrt/Search/Bulk.html:
+
+	Added support for bulk comment/reply
+	
+2002-05-03 02:07  jesse
+
+	* lib/RT/Ticket.pm:
+
+	RT-Ticket: 1369
+	RT-Status: resolved
+	
+	When a ticket has another merged into it, it now has its "LastUpdated" date
+	updated
+	
+2002-05-03 01:58  jesse
+
+	* lib/RT/Ticket.pm:
+
+	RT-Ticket: 1412
+	RT-status: resolved
+	
+	Fixed a docs bug in Ticket->Import which didn't make it clear that Import
+	took an "Id" parameter and "Create" didn't.
+	
+2002-05-03 01:54  jesse
+
+	* webrt/autohandler:
+
+	rt-ticket: 1410
+	rt-status: resolved
+	
+	Applied a patch from rich lafferty which prevented NoAuth from not
+	requiring authentication on some fastcgi setups.
+	
+	A similar bug bit SelfService.
+	
+	This commit fixes that one too.
+	
+2002-05-03 01:51  jesse
+
+	* Makefile:
+
+	RT-Ticket: 1272
+	rt-status: resolved
+	
+	Applied a patch from Ilya Martynov which allows make insert to work
+	in a scenario where DESTDIR is being set to something funny This may be necessary when installing into AFS
+	
+2002-05-03 01:36  jesse
+
+	* lib/RT/Action/SendEmail.pm:
+
+	RT-Ticket: 1367
+	RT-Status: resolved
+	
+	Added a check which only sets precedence to bulk if it's not already set,
+	say by a template.
+	
+2002-05-03 01:30  jesse
+
+	* lib/RT/Interface/Email.pm:
+
+	RT-Ticket: 1370
+	RT-Status: resolved
+	
+	From: Jason Edgecombe <jedgecombe@carolina.rr.com>
+	To: rt-devel@lists.fsck.com
+	Subject: [rt-devel] An oversite in Interface/Email.pm
+	
+	Hi,
+	
+	   I found an problem in Interface/Email.pm when I was modifying
+	   enhanced mailgate. I have attached a diff of the modifications.
+	
+	   In the function MailError, it assumes MIMIEOBJ is defined. I added a
+	   simple "if" test to only run $MIMEOBJ->sync_headers if $MIMEOBJ is defined.
+	
+2002-05-03 01:24  jesse
+
+	* lib/RT/Action/SendEmail.pm:
+
+	RT-Ticket: 1348
+	RT-Status: resolved
+	
+	Fixed a bug in mail sending that improperly quoted the usernames of users
+	who had " in their names
+	
+2002-04-29 00:39  jesse
+
+	* lib/RT.pm:
+
+	Fixed a tiny typo
+	
+2002-04-28 23:46  jesse
+
+	* lib/RT.pm:
+
+	Fixed up the rt log messages.
+	
+2002-04-21 02:14  jesse
+
+	* lib/RT/Interface/Web.pm:
+
+	Fixed a couple bugs in setting owners that were only revealed by the poor data
+	validation on rt.cpan.org
+	
+2002-04-21 02:06  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Fixed a couple bugs in setting owners that were only revealed by the poor data
+	validation on rt.cpan.org
+	
+2002-04-19 00:32  jesse
+
+	* Makefile:
+
+	Adding a new Makefile target to ease packaging.
+	
+2002-04-18 12:47  jesse
+
+	* lib/RT/GroupMember.pm:
+
+	RT-Ticket: 1385
+	RT-Broken-In: 2.0.0
+	RT-Broken-In: 2.0.1
+	RT-Broken-In: 2.0.2
+	RT-Broken-In: 2.0.3
+	RT-Broken-In: 2.0.4
+	RT-Broken-In: 2.0.5
+	RT-Broken-In: 2.0.6
+	RT-Broken-In: 2.0.7
+	RT-Broken-In: 2.0.8
+	RT-Broken-In: 2.0.9
+	RT-Broken-In: 2.0.10
+	RT-Broken-In: 2.0.11
+	RT-Broken-In: 2.0.12
+	RT-Broken-In: 2.0.13
+	RT-Status: resolved
+	
+	GroupMemmber was looking for the "ModifyGroups" right, when it should have
+	been looking for the "AdminGroups" right
+	
+2002-04-05 10:24  jesse
+
+	* webrt/Ticket/Update.html:
+
+	RT-Ticket: 1330
+	RT-Status: Resolved
+	
+	Fixed an html escaping bug in Ticket/Update.html
+	
+2002-03-27 22:59  jesse
+
+	* Makefile, lib/RT/User.pm:
+
+	Fixed a CRITICAL security bug that allowed remote administrative access
+	to RT without a password.  (Security advisory to follow)
+	
+2002-03-14 16:15  jesse
+
+	* Makefile:
+
+	Bumped the version to 2.0.12
+	
+2002-03-06 18:57  jesse
+
+	* Makefile:
+
+	Bumped the version to 2.0.12pre6
+	
+2002-03-06 18:57  jesse
+
+	* lib/RT/Transaction.pm:
+
+	Added an update that will make dates changed as parts of transaction updates show up in local time
+	
+2002-03-06 18:56  jesse
+
+	* webrt/Admin/Queues/Modify.html:
+
+	Added a note to the queue creation screen about defaults.
+	
+2002-03-01 01:41  jesse
+
+	* webrt/Ticket/Elements/ShowTransaction:
+
+	This patch fixes a small problem with printing a message.It checks if themessage is true, not if it has length, so a message containing 0 will notbe printed.  From Blair Zajac <blair@orcaware.com>
+	
+2002-03-01 01:39  jesse
+
+	* bin/rt:
+
+	RT-Ticket:438
+	RT-Status: resolved
+	
+	Added brandon's patch to allow searching for tickets by keyword on the commandline
+	
+2002-02-28 02:03  jesse
+
+	* bin/rt:
+
+	RT-Ticket: 1258
+	RT-Milestone: 2.0.x
+	RT-Subsystem: CLI
+	RT-Severity: normal
+	RT-Broken in: 2.0-beta3
+	RT-Broken in: 2.0.1
+	RT-Broken in: 2.0.2
+	RT-Broken in: 2.0.3
+	RT-Broken in: 2.0.4
+	RT-Broken in: 2.0.5
+	RT-Broken in: 2.0.6
+	RT-Broken in: 2.0.7
+	RT-Broken in: 2.0.8
+	RT-Broken in: 2.0.9
+	RT-Broken in: 2.0.10
+	RT-Broken in: 2.0.11
+	
+	Removed a line that make --limit-priority and --limit-final-priority not
+	work
+	
+2002-02-28 01:49  jesse
+
+	* lib/RT/Action/: Autoreply.pm, SendEmail.pm:
+
+	RT-Ticket: 1196
+	RT-Status: resolved
+	
+2002-02-28 01:38  jesse
+
+	* lib/RT/Interface/Web.pm:
+
+	RT-Ticket: 1246
+	RT-Status: resolved
+	
+2002-02-28 01:38  jesse
+
+	* tools/testdeps:
+
+	Added a couple explicit dependencies to testdeps that should have been there
+	forever ago. you'll only run into this if your cpan doesn't do recursive deps.
+	
+2002-02-20 20:45  jesse
+
+	* Makefile, lib/RT/Interface/Web.pm, webrt/Admin/Users/index.html,
+	webrt/Ticket/Update.html:
+
+	Bumped the version to 2.0.12-pre5.
+	
+	Web: Fixed a typo in user administration that prevented user listing
+	
+	Web: fixed recieve to receive in ticket/update
+	
+2002-02-19 03:23  jesse
+
+	* lib/RT/Scrips.pm:
+
+	Fixed a typo. (Added a missing ;)
+	
+2002-02-19 01:04  jesse
+
+	* Makefile:
+
+	Bumped version to 2.0.12pre4
+	
+2002-02-18 18:35  jesse
+
+	* lib/RT/Condition/Generic.pm:
+
+	RT-Ticket: 1194
+	
+	cleaned up a reference to "ApplicableTypes", a nonexistent parameter to Condition->new
+	
+2002-02-18 18:30  jesse
+
+	* webrt/Elements/Login:
+
+	RT-Ticket: 1226
+	RT-Status: resolved
+	
+	Added an explicit reset of the content-type to 'text/html' when displaying hte login page
+	
+2002-02-18 18:25  jesse
+
+	* webrt/Admin/Users/index.html:
+
+	rt-ticket: 1190
+	rt-status: resolved
+	
+	Modified administrative userlist to make it easier to click on users who have no Name attribute defined
+	
+2002-02-18 18:18  jesse
+
+	* webrt/: Elements/Header, SelfService/Elements/Header:
+
+	rt-ticket: 1176
+	rt-status: resolved
+	
+	Applied tom's patch which hides the preferences link if the user doesn't have the right to "modify self"
+	
+2002-02-18 18:14  jesse
+
+	* lib/RT/Interface/Email.pm:
+
+	RT-Ticket: 1165
+	RT-Status: resolved
+	
+	exporting the ParseAddressFromHeader subroutine so others can play with it
+	
+2002-02-18 18:06  jesse
+
+	* webrt/Ticket/Update.html:
+
+	RT-Ticket:1209
+	RT-Milestone: 2.0.x
+	RT-Status: resolved
+	
+	Removed  a bogus font tag from the Ticket update screen
+	
+2002-02-18 18:00  jesse
+
+	* lib/RT/Interface/Web.pm, webrt/Search/Listing.html:
+
+	RT-Ticket: 1243
+	RT-Status: resolved
+	RT-Milestone: 2.0.x
+	RT-Broken-In: 2.0.8
+	RT-Broken-In: 2.0.9
+	RT-Broken-In: 2.0.10
+	RT-Broken-In: 2.0.11
+	RT-Subsystem: HTML::Mason Frontend
+	RT-Severity: Normal
+	
+	Switched the web frontend to use an in-core scalar for uploaded attachment content,
+	rather than a tempfile which wasn't getting cleaned up properly
+	
+2002-02-18 16:53  jesse
+
+	* webrt/Search/Listing.html:
+
+	RT-Ticket: 1245
+	Rt-status: resolved
+	
+	Applied a patch to nuke duplicate restrictions in the webui.
+	
+2002-02-18 16:47  jesse
+
+	* webrt/Admin/Groups/Members.html:
+
+	RT-Ticket: 1421
+	RT-Status: resolved
+	
+	moved a label inside a loop to make the ui easier to understand
+	
+2002-02-18 16:36  jesse
+
+	* etc/config.pm:
+
+	Set Default for UseFriendlyToLines to 0 by default, to deal with users running
+	redhat who have trouble configuring RT.
+	
+2002-02-18 16:31  jesse
+
+	* Makefile, lib/RT/Scrip.pm, tools/insertdata:
+
+	Edited insertdata to insert scrips by default, so that users don't need
+	to go through the configuration task themselves.
+	
+	Change the Makefile's WEB_GROUP to www by default for redhat and OSX.
+	
+	Correced docs for lib/RT/Scrip new() method
+	
+2002-02-08 01:23  jesse
+
+	* webrt/SelfService/Display.html:
+
+	cleanup to "last trans" in SelfService
+	
+2002-02-08 00:53  jesse
+
+	* lib/RT/Interface/Web.pm:
+
+	Generalized "Abort" function to allow other non-html error messages with
+	proper handlers
+	
+2002-02-08 00:49  jesse
+
+	* etc/: schema.Pg, schema.mysql:
+
+	removed duplicate indices
+	
+2002-02-07 16:41  jesse
+
+	* etc/config.pm:
+
+	Added some docs to the config file from Rich Lafferty
+	
+2002-02-04 12:37  jesse
+
+	* lib/RT/Template.pm:
+
+	Output template content to core rather than disk when parsing.
+	
+2002-01-28 01:01  jesse
+
+	* webrt/Ticket/Elements/ShowHistory:
+
+	closing lasttrans anchor
+	
+2002-01-28 00:59  jesse
+
+	* webrt/Ticket/Elements/ShowHistory:
+
+	Closing the #lasttrans anchor
+	
+2002-01-28 00:58  jesse
+
+	* lib/RT/Record.pm:
+
+	RT-Ticket: 1156
+	
+	Pulling forward the patch for 1156
+	
+2002-01-28 00:57  jesse
+
+	* lib/RT/Record.pm:
+
+	RT-Ticket: 1156
+	RT-Status: resolved
+	
+2002-01-28 00:47  jesse
+
+	* bin/mason_handler.fcgi:
+
+	Small fix to the fastcgi handler to make attachment display work better,
+	thanks to rich lafferty.
+	
+2002-01-28 00:47  jesse
+
+	* etc/config.pm:
+
+	Removed some extraneous slashes from the config file.
+	
+2002-01-28 00:46  jesse
+
+	* README:
+
+	Clarified some readme stuff
+	
+2002-01-28 00:44  jesse
+
+	* bin/rt-commit-handler:
+
+	Bringing forward a fix to the cvs commit handler to deal with branched
+	version #s.
+	
+2002-01-28 00:40  jesse
+
+	* Makefile:
+
+	Bumped the version to 2.1.1
+	
+2002-01-28 00:27  jesse
+
+	* etc/RT_Config.pm:
+
+	file RT_Config.pm was initially added on branch rt-2-1.
+	
+2002-01-28 00:27  jesse
+
+	* bin/enhanced-mailgate:
+
+	file enhanced-mailgate was initially added on branch rt-2-1.
+	
+2002-01-28 00:27  jesse
+
+	* bin/rt-commit-handler:
+
+	file rt-commit-handler was initially added on branch rt-2-1.
+	
+2002-01-28 00:27  jesse
+
+	* Makefile, bin/enhanced-mailgate, bin/mason_handler.fcgi, bin/rt,
+	bin/rt-commit-handler, bin/rt-mailgate, bin/rtadmin, bin/webmux.pl,
+	etc/RT_Config.pm, etc/acl.Oracle, etc/acl.Pg, etc/acl.mysql,
+	etc/config.pm, lib/RT.pm, lib/RT/Handle.pm, lib/RT/User.pm,
+	lib/RT/Watcher.pm, lib/RT/Interface/CLI.pm,
+	lib/RT/Interface/Email.pm, tools/cpan2rpm, tools/initdb,
+	tools/insertdata, tools/testdeps:
+
+	First RT 2.1 checkin. don't expect this to run.  (though it does here)
+	
+2002-01-25 17:37  jesse
+
+	* README:
+
+	Added a warning to the readme that 2.1 is scary and people shouldn't use it
+	
+2002-01-25 17:24  jesse
+
+	* Makefile:
+
+	Branching 2.1.0  and incrementing the makefile to 2.1.
+	
+	Welcome to the future.
+	
+2002-01-24 13:30  jesse
+
+	* lib/RT/Transaction.pm:
+
+	RT-Ticket: 1201
+	RT-Status: resolved
+	
+	Better transaction display for "text" and "message" parts.
+	
+2002-01-24 13:00  jesse
+
+	* webrt/Ticket/Elements/ShowTransaction:
+
+	RT-Ticket: 1166
+	RT-Status: resolved
+	
+	Implemented better URL regexp matching.
+	
+2002-01-24 10:39  jesse
+
+	* bin/rt-mailgate:
+
+	Fixed a typo in a debug message in rt-mailgate
+	
+2002-01-24 10:34  jesse
+
+	* lib/RT/Template.pm:
+
+	Switched from bogus mime parsing to using MIME::Parser like we should have
+	from the get-go.
+	
+	Used perltidy to clean up template.pm before we started working on it.
+	
+2002-01-24 10:28  jesse
+
+	* lib/RT/Record.pm:
+
+	Added a check to LoadByCols which causes postgres mode to not try to lookup
+	lc(undef)
+	
+2002-01-24 10:23  jesse
+
+	* webrt/NoAuth/webrt.css:
+
+	Added a new style to the stylesheet to support some new reports
+	
+2002-01-24 10:21  jesse
+
+	* lib/RT/Interface/Email.pm:
+
+	mail gateway now unfolds long headers on parse.
+	
+2002-01-11 15:20  jesse
+
+	* Makefile, lib/RT/Transaction.pm:
+
+	RT-Ticket: 950
+	
+	Aoolyed the recommended patch to make blank bodies not get
+	mailed in lieu of the real message
+	
+2002-01-11 15:00  jesse
+
+	* Makefile, webrt/Ticket/ModifyAll.html:
+
+	Fixed a small bug that broke the "jumbo" page after 2.0.11
+	
+2002-01-11 01:17  jesse
+
+	* bin/rt-mailgate:
+
+	Added a new flag to rt-mailgate to enable setting the owner of new tickets based on +extension
+	
+2002-01-11 01:13  jesse
+
+	* webrt/Ticket/: Modify.html, ModifyAll.html:
+
+	Adding a couple ACL checks to better deal with moving tickets to queues the user can't see
+	
+2002-01-11 01:11  jesse
+
+	* webrt/Admin/Queues/index.html:
+
+	Fixed typo in ACL check that resulted in "Create Queue" being more restrictive than
+	it needed to be
+	
+2002-01-10 19:07  jesse
+
+	* webrt/Ticket/Update.html:
+
+	more tweaking
+	
+2002-01-10 19:05  jesse
+
+	* webrt/Ticket/Update.html:
+
+	Cleaned up the Ticekt Update ui some
+	
+2002-01-10 19:02  jesse
+
+	* lib/RT/: Attachment.pm, Action/Notify.pm, Condition/Generic.pm:
+
+	Cleanups to make Also-Cc and Also-Bcc go
+	
+2002-01-10 19:01  jesse
+
+	* lib/RT/Queue.pm:
+
+	Changed a test to work the way that Test::Inline does now
+	
+2002-01-10 18:34  jesse
+
+	* lib/RT/Attachment.pm:
+
+	Changes to attachment to provide the header frobbing necessary to send mail to ccs and bccs
+	
+2002-01-10 18:32  jesse
+
+	* Makefile, README, lib/RT/Ticket.pm, tools/insertdata,
+	webrt/Ticket/Update.html, lib/RT/Action/Notify.pm:
+
+	Work on "Explicit Cc" and "Explicit Bcc" for a client
+	
+2002-01-10 18:27  jesse
+
+	* webrt/Ticket/Elements/ShowTransaction:
+
+	abstracting out a number to a named variable
+	
+2002-01-09 02:24  jesse
+
+	* webrt/Admin/: Groups/index.html, Keywords/index.html:
+
+	A couple tiny ui cleanups (removed some object ids from the UI where they were just being clutter
+	
+2002-01-02 21:58  jesse
+
+	* Makefile, README, webrt/Elements/Login:
+
+	Bumped some copyright notices to 2002. bumped version to 2.0.11
+	
+2001-12-26 14:59  jesse
+
+	* Makefile:
+
+	Bumping version to 2.0.11pre1
+	
+2001-12-26 14:51  jesse
+
+	* lib/RT/Tickets.pm:
+
+	Merges were being over-zealous in what they twiddled the effective id of.
+	
+	this meant that far too many tickets would show up in ticket listings.
+	
+2001-12-24 18:58  jesse
+
+	* Makefile:
+
+	Bumped the version to 2.0.10
+	
+2001-12-19 00:24  jesse
+
+	* Makefile:
+
+	Bumped version to 2.0.10pre4
+	
+	fix to makefile to genereate changelog for head
+	
+2001-12-18 03:58  jesse
+
+	* lib/RT/Tickets.pm:
+
+	The "null search" was finding all tickets in 2.0.10pre3.  Fixed in CVS
+	
+2001-12-18 03:53  jesse
+
+	* bin/rt:
+
+	fixed typos in bin/rt that stopped --limit-subject --limit-requestors and --limit-body from
+	working
+	
+2001-12-17 15:13  jesse
+
+	* Makefile:
+
+	Bumped the version to 2.0.10-test3
+	
+2001-12-17 14:58  jesse
+
+	* lib/RT/User.pm, tools/insertdata, webrt/Admin/Users/Modify.html:
+
+	RT-Ticket: 935
+	RT-Status: resolved
+	
+	cleaned up seph's patch. this enabled me to actually really properly support
+	users with no email address, which meant there were a couple other cleanups
+	to go through too.
+	
+2001-12-17 14:26  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Some small cleanups to the IsWatcher stuff.
+	
+	Added checks to make sure that watchers aren't duplicated to ticket.pm
+	
+2001-12-17 13:04  jesse
+
+	* webrt/Ticket/Elements/ShowTransaction:
+
+	Fixed an unclosed anchor which caused IE to render ticket listings wrong.
+	
+2001-12-14 18:29  jesse
+
+	* lib/Makefile.PL, tools/testdeps:
+
+	Bumped DBIx::SearchBuilder dependency to 0.48
+	
+2001-12-14 18:28  jesse
+
+	* tools/testdeps, webrt/Elements/Login:
+
+	Removed code to special case for bugs in mason < 1.01.
+	Moved us up to a mason 1.02 dependency
+	
+2001-12-14 18:26  jesse
+
+	* bin/rt:
+
+	bin/rt: added support for --version, fixed --status = !closed, docced --merge-into
+	
+2001-12-14 18:25  jesse
+
+	* Makefile:
+
+	Some stylistic cleanups  to the makefile from blair.
+	
+2001-12-14 16:42  jesse
+
+	* bin/rtadmin:
+
+	rtadmin had some issues where it would assume a 'name' if called without --name for user group and queue editing.
+	
+2001-12-14 16:06  jesse
+
+	* lib/RT/Tickets.pm:
+
+	
+	Ticket listings will no longer show tickets which have been merged into others.
+	
+		-j
+	
+2001-12-14 15:27  jesse
+
+	* lib/RT/User.pm:
+
+	Prevent users from futzing with nobody or rt_System, unless you're setting an email address.
+	(Arguably, that's a bug too)
+	
+2001-12-14 14:03  jesse
+
+	* lib/RT/: ACE.pm, Group.pm, GroupMember.pm, Keyword.pm,
+	KeywordSelect.pm, Queue.pm, Scrip.pm, Template.pm, Ticket.pm:
+
+	Standardised on "Permission Denied" instead of having some "Permission denied". Thanks simon.
+	
+	        -j
+	
+2001-12-14 13:46  jesse
+
+	* lib/RT/Interface/Web.pm:
+
+	Reordered the order that Basics actions are committed, so that Queue changes
+	come after other changes, so that users don't move tickets out of a queue before they have a
+	chance to update them.
+	
+2001-12-13 02:18  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Addition to Ticket->Import, so you can set owner by name.
+	
+	Fix for a bug in Ticket->AddWatcher that would let privileged watchers without
+	email addresses add others as watchers.
+	
+2001-12-03 20:13  jesse
+
+	* Makefile, lib/RT/EasySearch.pm, lib/RT/Keyword.pm,
+	lib/RT/Record.pm, lib/RT/Tickets.pm, lib/RT/User.pm:
+
+	more work on making sure that only the things we want are case sensitive
+	(IE name, content email address should always be insensitive.  when loading a row by any field other than ID, that should be case-insensitive)
+	
+2001-12-03 19:17  jesse
+
+	* Makefile:
+
+	bumped the version  to 2.0.10-test1
+	
+2001-12-03 19:14  jesse
+
+	* lib/RT/EasySearch.pm:
+
+	We now default to case sensitive searches, rather than case-insensitive ones.
+	(This should speed up Pg a LOT. We'll be adding in case-insensitive searching
+	for the 13 attributes that matter:
+	
+	Watcher->Email
+	User->name
+	User->email
+	User->gecos
+	Ticket->Subject
+	Queue->name
+	KeywordSelect->name
+	Keyword->Name
+	ObjectKeyword->Name
+	Attachment->Subject
+	Attachment->Content
+	Attachment->Headers
+	
+2001-12-03 19:13  jesse
+
+	* webrt/: Admin/Queues/Modify.html, Admin/Queues/People.html,
+	Elements/GotoTicket:
+
+	Some small UI cleanups from Hakke
+	
+2001-11-29 03:50  jesse
+
+	* webrt/: Elements/SelectEqualityOperator, Elements/SelectOwner,
+	Search/PickRestriction:
+
+	SelectOwner now passes a ticket up the line.
+	
+	Priority can now have = and != searches
+	
+2001-11-29 03:49  jesse
+
+	* tools/insertdata:
+
+	Cleaned up a template to display Ticket subject, if no transaction subject is given.
+	
+2001-11-29 03:48  jesse
+
+	* webrt/Ticket/: Update.html, Elements/EditPeople:
+
+	Now pass in ticket Id, so that "owner" can be someone who only has rights to that tikcet.
+	
+2001-11-29 03:47  jesse
+
+	* lib/RT/Ticket.pm:
+
+	FinalPriority should never get set to null if a ticket doesn't have the attribute set on create
+	
+	Untake's arguments were debognifed
+	
+2001-11-29 03:45  jesse
+
+	* webrt/SelfService/Elements/Header:
+
+	"Logout" no longer shows up when using external auth with SelfService
+	
+2001-11-29 03:44  jesse
+
+	* bin/rt:
+
+	Fix for setting priority when creating tickets with the cli
+	
+2001-11-29 03:42  jesse
+
+	* bin/rt-mailgate:
+
+	Added support for --ticket-id-from-extension to rt-mailgate
+	
+2001-11-14 14:28  jesse
+
+	* Makefile:
+
+	Bumped the version to 2.0.9
+	
+2001-11-13 11:33  jesse
+
+	* Makefile, bin/initacls.Pg, bin/rt:
+
+	rt-ticket:1007
+	rt-status: resolved
+	
+	initacls.pg no longer has extranious spaces which break variable assignment for port and host.
+	
+	Bumped version to 2.0.9pre9
+	
+2001-11-12 13:19  jesse
+
+	* Makefile, bin/initacls.Pg:
+
+	Fix for #1007 (Typo in bin/initacls.Pg)
+	Bumped version to 2.0.9pre8
+	
+2001-11-09 18:24  jesse
+
+	* webrt/Ticket/Elements/ShowTransaction:
+
+	URL higlighting should now work with mailto: urls
+	
+2001-11-09 18:15  jesse
+
+	* Makefile, webrt/Ticket/Elements/ShowTransaction:
+
+	Cleaned up the url highlighting code
+	
+	Bumped the version to 2.0.9pre7
+	
+2001-11-09 17:27  jesse
+
+	* Makefile:
+
+	Fixing the new taggy stuff
+	
+2001-11-09 17:23  jesse
+
+	* Makefile:
+
+	Fixing the new branchy stuff
+	
+2001-11-09 17:07  jesse
+
+	* Makefile, bin/rtadmin, etc/config.pm,
+	webrt/Ticket/Elements/ShowTransaction:
+
+	Added a bit of doc to etc/config.pm
+	
+	Modified ShowTransaction to more properly escape html
+	
+	Fixed some of the cli help for rtadmin
+	
+	Added support for branch specification to the makefile
+	
+2001-11-08 15:15  jesse
+
+	* lib/RT/Interface/Web.pm:
+
+	I can commit on the head. really.
+	
+2001-11-08 15:06  jesse
+
+	* lib/RT/Interface/Web.pm:
+
+	Dealing with defined but blank Owner fields
+	
+2001-11-06 18:06  jesse
+
+	* tools/cpan2rpm, tools/initdb, tools/insertdata, tools/testdeps,
+	webrt/autohandler, webrt/index.html, webrt/Admin/index.html,
+	webrt/Admin/Elements/CreateQueueCalled,
+	webrt/Admin/Elements/CreateUserCalled,
+	webrt/Admin/Elements/EditUserComments,
+	webrt/Admin/Elements/GrantQueueRightsTo,
+	webrt/Admin/Elements/GroupTabs, webrt/Admin/Elements/Header,
+	webrt/Admin/Elements/ListGlobalKeywordSelects,
+	webrt/Admin/Elements/ListGlobalScrips,
+	webrt/Admin/Elements/ModifyKeyword,
+	webrt/Admin/Elements/ModifyKeywordSelect,
+	webrt/Admin/Elements/ModifyQueue,
+	webrt/Admin/Elements/ModifyTemplate,
+	webrt/Admin/Elements/ModifyUser,
+	webrt/Admin/Elements/QueueRightsForUser,
+	webrt/Admin/Elements/QueueTabs,
+	webrt/Admin/Elements/SelectKeywordSelect,
+	webrt/Admin/Elements/SelectModifyGroup,
+	webrt/Admin/Elements/SelectModifyKeyword,
+	webrt/Admin/Elements/SelectModifyKeywordSelect,
+	webrt/Admin/Elements/SelectModifyQueue,
+	webrt/Admin/Elements/SelectModifyUser,
+	webrt/Admin/Elements/SelectQueueRights,
+	webrt/Admin/Elements/SelectRights,
+	webrt/Admin/Elements/SelectScrip,
+	webrt/Admin/Elements/SelectScripAction,
+	webrt/Admin/Elements/SelectScripCondition,
+	webrt/Admin/Elements/SelectSingleOrMultiple,
+	webrt/Admin/Elements/SelectTemplate,
+	webrt/Admin/Elements/SelectUsers, webrt/Admin/Elements/SystemTabs,
+	webrt/Admin/Elements/Tabs, webrt/Admin/Elements/UserTabs,
+	webrt/Admin/Global/GroupRights.html,
+	webrt/Admin/Global/Keywords.html, webrt/Admin/Global/Scrips.html,
+	webrt/Admin/Global/Template.html,
+	webrt/Admin/Global/Templates.html,
+	webrt/Admin/Global/UserRights.html, webrt/Admin/Global/index.html,
+	webrt/Admin/Groups/Members.html, webrt/Admin/Groups/Modify.html,
+	webrt/Admin/Groups/Rights.html, webrt/Admin/Groups/index.html,
+	webrt/Admin/KeywordSelects/Modify.html,
+	webrt/Admin/KeywordSelects/index.html,
+	webrt/Admin/Keywords/Modify.html, webrt/Admin/Keywords/index.html,
+	webrt/Admin/Queues/Create.html,
+	webrt/Admin/Queues/GroupRights.html,
+	webrt/Admin/Queues/Keywords.html, webrt/Admin/Queues/Modify.html,
+	webrt/Admin/Queues/People.html, webrt/Admin/Queues/Scrips.html,
+	webrt/Admin/Queues/Template.html,
+	webrt/Admin/Queues/Templates.html,
+	webrt/Admin/Queues/UserRights.html, webrt/Admin/Queues/index.html,
+	webrt/Admin/Users/Modify.html, webrt/Admin/Users/Prefs.html,
+	webrt/Admin/Users/Rights.html, webrt/Admin/Users/index.html,
+	webrt/Elements/Checkbox, webrt/Elements/CreateTicket,
+	webrt/Elements/CustomHomepageHeader, webrt/Elements/Error,
+	webrt/Elements/Footer, webrt/Elements/GotoTicket,
+	webrt/Elements/Header, webrt/Elements/ListActions,
+	webrt/Elements/Login, webrt/Elements/MessageBox,
+	webrt/Elements/MyRequests, webrt/Elements/MyTickets,
+	webrt/Elements/Quicksearch, webrt/Elements/Refresh,
+	webrt/Elements/Section, webrt/Elements/SelectBoolean,
+	webrt/Elements/SelectDate, webrt/Elements/SelectDateRelation,
+	webrt/Elements/SelectDateType, webrt/Elements/SelectKeyword,
+	webrt/Elements/SelectKeywordOptions, webrt/Elements/SelectLinkType,
+	webrt/Elements/SelectMatch, webrt/Elements/SelectNewTicketQueue,
+	webrt/Elements/SelectOwner, webrt/Elements/SelectQueue,
+	webrt/Elements/SelectResultsPerPage,
+	webrt/Elements/SelectSortOrder, webrt/Elements/SelectStatus,
+	webrt/Elements/SelectTicketSortBy, webrt/Elements/SelectUsers,
+	webrt/Elements/SelectWatcherType, webrt/Elements/ShadedBox,
+	webrt/Elements/Submit, webrt/Elements/Tabs,
+	webrt/Elements/TitleBoxEnd, webrt/Elements/TitleBoxStart,
+	webrt/Elements/ViewUser, webrt/Elements/dayMenu,
+	webrt/Elements/monthMenu, webrt/Elements/yearMenu,
+	webrt/NoAuth/Logout.html, webrt/NoAuth/Reminder.html,
+	webrt/NoAuth/webrt.css, webrt/NoAuth/images/rt.jpg,
+	webrt/NoAuth/images/spacer.gif, webrt/Search/Bulk.html,
+	webrt/Search/Listing.html, webrt/Search/PickRestriction,
+	webrt/Search/RestrictSearch.html, webrt/Search/TicketCell,
+	webrt/SelfService/Closed.html, webrt/SelfService/Create.html,
+	webrt/SelfService/Display.html, webrt/SelfService/Error.html,
+	webrt/SelfService/Prefs.html, webrt/SelfService/Update.html,
+	webrt/SelfService/index.html,
+	webrt/SelfService/Attachment/dhandler,
+	webrt/SelfService/Elements/GotoTicket,
+	webrt/SelfService/Elements/Header,
+	webrt/SelfService/Elements/MyRequests,
+	webrt/SelfService/Elements/Tabs, webrt/Ticket/Create.html,
+	webrt/Ticket/Display.html, webrt/Ticket/History.html,
+	webrt/Ticket/Modify.html, webrt/Ticket/ModifyAll.html,
+	webrt/Ticket/ModifyDates.html, webrt/Ticket/ModifyLinks.html,
+	webrt/Ticket/ModifyPeople.html, webrt/Ticket/Update.html,
+	webrt/Ticket/Attachment/dhandler,
+	webrt/Ticket/Elements/AddWatchers,
+	webrt/Ticket/Elements/EditBasics, webrt/Ticket/Elements/EditDates,
+	webrt/Ticket/Elements/EditKeywordSelects,
+	webrt/Ticket/Elements/EditLinks, webrt/Ticket/Elements/EditPeople,
+	webrt/Ticket/Elements/EditWatchers,
+	webrt/Ticket/Elements/ShowBasics, webrt/Ticket/Elements/ShowDates,
+	webrt/Ticket/Elements/ShowDependencies,
+	webrt/Ticket/Elements/ShowHistory,
+	webrt/Ticket/Elements/ShowKeywordSelects,
+	webrt/Ticket/Elements/ShowLinks,
+	webrt/Ticket/Elements/ShowMemberOf,
+	webrt/Ticket/Elements/ShowMembers,
+	webrt/Ticket/Elements/ShowPeople,
+	webrt/Ticket/Elements/ShowReferences,
+	webrt/Ticket/Elements/ShowRequestor,
+	webrt/Ticket/Elements/ShowSummary,
+	webrt/Ticket/Elements/ShowTransaction, webrt/Ticket/Elements/Tabs,
+	webrt/Ticket/Elements/ToolBar, webrt/User/Prefs.html:
+
+	Merging rt-1-1 to the head.
+	
+	RT 1.0 now lives on the rt-1-0 branch.
+	
+2001-11-06 18:03  jesse
+
+	* Makefile, NEWS, README, TODO, bin/initacls.Oracle,
+	bin/initacls.Pg, bin/initacls.mysql, bin/mason_handler.fcgi,
+	bin/mason_handler.scgi, bin/rt, bin/rt-mailgate, bin/rtadmin,
+	bin/rtmux.pl, bin/testdeps.pl, bin/webmux.pl, docs/FAQ,
+	docs/FAQ.html, docs/README.docs, docs/Security,
+	docs/rt-templates.html, docs/rt_users_guide.html,
+	docs/design_docs/CARS, docs/design_docs/TransactionTypes.txt,
+	docs/design_docs/acls, docs/design_docs/basic-definitions.txt,
+	docs/design_docs/cli_spec, docs/design_docs/cvs_integration,
+	docs/design_docs/evil_plans, docs/design_docs/link-definitions.txt,
+	docs/design_docs/local_hacking,
+	docs/design_docs/subscription-definitions.txt,
+	docs/design_docs/users, etc/acl.Oracle, etc/acl.Pg, etc/acl.mysql,
+	etc/config.pm, etc/mysql.acl, etc/rt.spec, etc/schema,
+	etc/schema.Oracle, etc/schema.Pg, etc/schema.mysql, etc/schema.pm,
+	etc/suidrt.c, lib/MANIFEST, lib/MANIFEST.SKIP, lib/Makefile.PL,
+	lib/RT.pm, lib/test.pl, lib/RT/ACE.pm, lib/RT/ACL.pm,
+	lib/RT/Attachment.pm, lib/RT/Attachments.pm, lib/RT/CurrentUser.pm,
+	lib/RT/Date.pm, lib/RT/EasySearch.pm, lib/RT/Group.pm,
+	lib/RT/GroupMember.pm, lib/RT/GroupMembers.pm, lib/RT/Groups.pm,
+	lib/RT/Handle.pm, lib/RT/Keyword.pm, lib/RT/KeywordSelect.pm,
+	lib/RT/KeywordSelects.pm, lib/RT/Keywords.pm, lib/RT/Link.pm,
+	lib/RT/Links.pm, lib/RT/ObjectKeyword.pm, lib/RT/ObjectKeywords.pm,
+	lib/RT/Queue.pm, lib/RT/Queues.pm, lib/RT/Record.pm,
+	lib/RT/Scrip.pm, lib/RT/ScripAction.pm, lib/RT/ScripActions.pm,
+	lib/RT/ScripCondition.pm, lib/RT/ScripConditions.pm,
+	lib/RT/Scrips.pm, lib/RT/Template.pm, lib/RT/Templates.pm,
+	lib/RT/TestHarness.pm, lib/RT/Ticket.pm, lib/RT/Tickets.pm,
+	lib/RT/Transaction.pm, lib/RT/Transactions.pm, lib/RT/User.pm,
+	lib/RT/Users.pm, lib/RT/Watcher.pm, lib/RT/Watchers.pm,
+	lib/RT/Action/Autoreply.pm, lib/RT/Action/Generic.pm,
+	lib/RT/Action/Notify.pm, lib/RT/Action/NotifyAsComment.pm,
+	lib/RT/Action/OpenDependent.pm, lib/RT/Action/README.hackers,
+	lib/RT/Action/ResolveMembers.pm, lib/RT/Action/SendEmail.pm,
+	lib/RT/Action/SendPasswordEmail.pm,
+	lib/RT/Action/StallDependent.pm,
+	lib/RT/Condition/AnyTransaction.pm, lib/RT/Condition/Generic.pm,
+	lib/RT/Condition/NewDependency.pm,
+	lib/RT/Condition/StatusChange.pm, lib/RT/Interface/CLI.pm,
+	lib/RT/Interface/Email.pm, lib/RT/Interface/Web.pm:
+
+	Merging rt-1-1 to the head.
+	
+	RT 1.0 now lives on the rt-1-0 branch.
+	
+2001-11-06 17:57  jesse
+
+	* rt.spec, etc/rt.spec:
+
+	Cleaned up spec file goodness
+	
+2001-11-06 16:28  jesse
+
+	* Makefile:
+
+	Bumped version to 2.0.9pre5
+	
+2001-11-05 00:55  jesse
+
+	* rt.spec, lib/Makefile.PL, tools/testdeps:
+
+	Bumped the searchbuilder dependency to 0.47
+	
+2001-11-05 00:54  jesse
+
+	* webrt/Ticket/Update.html:
+
+	Named the ticket update form.
+	
+2001-11-05 00:52  jesse
+
+	* etc/config.pm, lib/RT/Handle.pm:
+
+	Added support for postgres' connections-over-ssl
+	
+2001-11-05 00:49  jesse
+
+	* webrt/Admin/Elements/SelectRights:
+
+	Updated ACL selecting UI to work properly with browsers that try to auto-select
+	a value in a SELECT
+	
+2001-11-02 01:39  jesse
+
+	* Makefile:
+
+	bumped the version to 2.0.9pre4
+	
+2001-11-02 01:31  jesse
+
+	* webrt/Ticket/: Display.html, ModifyAll.html:
+
+	Fix to not automatically record comments if nothing was typed.
+	
+2001-11-02 00:52  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Fix for duplicated requestors on merge. #791
+	
+2001-11-01 17:40  jesse
+
+	* webrt/Ticket/Elements/ShowTransaction:
+
+	More tweaking transaction display
+	
+2001-11-01 17:36  jesse
+
+	* webrt/: Admin/Users/Modify.html, Ticket/Elements/ShowTransaction:
+
+	Fixed newlines between ticket body and headers.
+	
+	Fix for 934: creating users doesn't completely fail (new)
+	
+2001-11-01 17:24  jesse
+
+	* webrt/Ticket/Elements/ShowTransaction:
+
+	Cleanups to ShowTransaction
+	
+2001-11-01 17:10  jesse
+
+	* lib/RT/: Keyword.pm, Interface/Web.pm:
+
+	Fix for loading queue (post 2.0.8) when called by name
+	Fix for _not_ trying to load keywords when called with no value.
+	
+2001-10-31 17:38  jesse
+
+	* Makefile:
+
+	Fixed the make dist
+	
+2001-10-31 02:56  jesse
+
+	* Makefile:
+
+	Bumped the version to 2.0.9pre3
+	
+2001-10-31 02:54  jesse
+
+	* lib/RT/Action/SendPasswordEmail.pm:
+
+	file SendPasswordEmail.pm was initially added on branch rt-1-1.
+	
+2001-10-31 02:54  jesse
+
+	* lib/RT/Action/SendPasswordEmail.pm:
+
+	Added an action to mail a password to the user.
+	
+2001-10-31 02:54  jesse
+
+	* bin/rt-mailgate:
+
+	added support to rt-mailgate for putting the queue name in a +extension
+	
+2001-10-31 02:52  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Tickets which are created in a "resolved" state will now have their "resolved"
+	date set right.
+	
+2001-10-31 02:51  jesse
+
+	* lib/RT/User.pm:
+
+	Started work on "Email password to user"
+	
+2001-10-31 02:48  jesse
+
+	* lib/RT/Watcher.pm:
+
+	Added a patch from Simon Cozens which makes sure that a requestor is always a user, rather than an email address.
+	
+2001-10-31 02:47  jesse
+
+	* lib/RT/Keyword.pm:
+
+	Added a helper Load function to Keyword to load by Id or Path
+	
+2001-10-31 02:42  jesse
+
+	* lib/RT/Template.pm:
+
+	
+	Template got new helper functions for loading queue and system templates.
+	
+2001-10-31 02:40  jesse
+
+	* bin/rt, bin/rtadmin, lib/RT/Interface/CLI.pm,
+	lib/RT/Interface/Email.pm:
+
+	Bringing forward a security fix from 2.0.8_01.  (nonusers could get superuser permissions from the CLI)
+	
+2001-10-31 02:37  jesse
+
+	* webrt/: Elements/MyRequests, Elements/MyTickets,
+	Ticket/Create.html:
+
+	Fixed a display bug in mytickets and myrequests which prevented clicking on
+	subjectless email
+	
+2001-10-31 02:04  jesse
+
+	* etc/: config.pm, schema.Pg, schema.mysql, schema.pm:
+
+	Lengthened queue name and email addresses in the default DB schema
+	
+2001-10-31 02:02  jesse
+
+	* webrt/Ticket/Update.html, lib/RT/Interface/Web.pm:
+
+	Now show the current ticket subject by default in the update subject box.
+	But don't include it in the transaction if it hasn't changed.
+	
+2001-10-31 01:09  jesse
+
+	* Makefile, bin/rt, bin/rt-mailgate, bin/rtadmin,
+	lib/RT/Interface/CLI.pm, lib/RT/Interface/Email.pm:
+
+	Security fixes per Jay at mojomole
+	
+2001-10-25 17:40  jesse
+
+	* webrt/Search/Listing.html:
+
+	Fixed a bug in new listing display. introduced after 2.0.8
+	
+2001-10-24 14:10  jesse
+
+	* Makefile, lib/RT/Ticket.pm:
+
+	Fixed the ticket status changes from open to open bug, thanks to raphael
+	at linkvest.
+	
+2001-10-23 17:34  jesse
+
+	* webrt/Ticket/Create.html:
+
+	Some cleanups to the Create form. No new functionality, just a little bit prettier
+	
+2001-10-23 17:34  jesse
+
+	* webrt/Elements/SelectTicketSortBy:
+
+	Elements/SelectTicketsSortBy now uses new list of sortable Tickets fields
+	in Tickets.pm
+	
+2001-10-23 17:32  jesse
+
+	* webrt/Search/Listing.html:
+
+	Column headings in searches are now clicky, where possible
+	
+2001-10-23 17:31  jesse
+
+	* webrt/Ticket/Elements/ShowTransaction:
+
+	URLs in ticket history should now be clicky
+	
+2001-10-23 17:26  jesse
+
+	* webrt/Elements/CustomHomepageHeader:
+
+	file CustomHomepageHeader was initially added on branch rt-1-1.
+	
+2001-10-23 17:26  jesse
+
+	* webrt/: index.html, Elements/CustomHomepageHeader:
+
+	Added a hook for sites to put their own html in the top of the "Home" page
+	
+2001-10-23 17:24  jesse
+
+	* webrt/Elements/: SelectNewTicketQueue, SelectQueue:
+
+	Frefactored SelectQueue to elimintate dupicate code and enable a "too many queues" option
+	
+2001-10-23 17:22  jesse
+
+	* lib/: RT.pm, RT/Date.pm, RT/Keyword.pm, RT/KeywordSelect.pm,
+	RT/Keywords.pm, RT/Link.pm, RT/Links.pm, RT/ObjectKeywords.pm,
+	RT/Record.pm, RT/Scrip.pm, RT/ScripActions.pm,
+	RT/ScripConditions.pm, RT/Ticket.pm, RT/Action/SendEmail.pm,
+	RT/Condition/Generic.pm, RT/Interface/CLI.pm,
+	RT/Interface/Email.pm:
+
+	Simple fixes to POD from Feargal Reilly to fix complaints from pod2man
+	
+2001-10-23 17:08  jesse
+
+	* lib/RT/Tickets.pm:
+
+	Refactored Tickets.pm a bit to provide better access to fields
+	that tickets can be sorted on.
+	
+2001-10-23 17:06  jesse
+
+	* etc/: config.pm, schema.Pg, schema.mysql, schema.pm:
+
+	Added some new indices, based on recommendations from Nobel Tse at Outblaze
+	
+	Started to cleanup config.pm to not use deprecated methods when displaying
+	ticket columns.
+	
+2001-10-19 15:44  jesse
+
+	* Makefile, bin/initacls.Pg, bin/initacls.mysql, tools/initdb:
+
+	Reverting last patch. it lead to too much brokenness
+	
+2001-10-19 15:16  jesse
+
+	* Makefile, bin/initacls.Pg, bin/initacls.mysql, tools/initdb:
+
+	Work on the install procedure to automate it some more. (automatically supply
+	passwords defined in the makefile)
+	
+2001-10-19 00:49  jesse
+
+	* Makefile:
+
+	Bumped version to 2.0.9pre1
+	
+2001-10-19 00:46  jesse
+
+	* docs/design_docs/cvs_integration:
+
+	file cvs_integration was initially added on branch rt-1-1.
+	
+2001-10-19 00:46  jesse
+
+	* webrt/NoAuth/images/rt.jpg:
+
+	file rt.jpg was initially added on branch rt-1-1.
+	
+2001-10-19 00:46  jesse
+
+	* rt.spec, docs/design_docs/cvs_integration, etc/config.pm,
+	webrt/rt.jpg, webrt/Elements/Header, webrt/Elements/TitleBoxEnd,
+	webrt/Elements/TitleBoxStart, webrt/NoAuth/images/rt.jpg,
+	webrt/SelfService/Elements/Header:
+
+	Refactored images path to have a configurable URL, so it will work with fastcgi ;)
+	
+2001-10-19 00:37  jesse
+
+	* webrt/: Elements/Footer, autohandler:
+
+	Added support for timing of page display with &Debug=1
+	
+2001-10-19 00:29  jesse
+
+	* lib/RT/User.pm:
+
+	User.pm: a fix to allow you to create multiple users with no email address.
+	
+2001-10-19 00:25  jesse
+
+	* lib/RT/Tickets.pm:
+
+	Added sub Due to Tickets.pm. fixes #910
+	
+2001-10-19 00:17  jesse
+
+	* etc/rt.spec:
+
+	file rt.spec was initially added on branch rt-1-1.
+	
+2001-10-19 00:17  jesse
+
+	* Makefile, rt.spec, etc/rt.spec:
+
+	Some work on the rpm build infrastructure
+	
+2001-10-19 00:03  jesse
+
+	* tools/cpan2rpm:
+
+	cpan2rpm doesn't repeat builds of the same distribution, even if we're looking for differnet  modules
+	
+2001-10-18 23:30  jesse
+
+	* tools/cpan2rpm:
+
+	cpan2rpm has been cleaned up a whole lot. it should actually be somewhat smarter about not doing the same work twice
+	
+2001-10-18 22:42  jesse
+
+	* tools/cpan2rpm:
+
+	Added cpan2rpm to the tools directory, for autogenerating rpms of cpan modules
+	
+2001-10-18 22:42  jesse
+
+	* tools/cpan2rpm:
+
+	file cpan2rpm was initially added on branch rt-1-1.
+	
+2001-10-18 21:20  jesse
+
+	* Makefile, rt.spec:
+
+	Added support for autobuilding an rpm with "make rpm"
+	
+2001-10-18 02:15  jesse
+
+	* tools/insertdata:
+
+	Fixed templates to include the ticket subject if it was otherwise blank
+	
+2001-10-18 02:14  jesse
+
+	* lib/RT/Interface/Web.pm, webrt/Ticket/Display.html:
+
+	work on web-based ticket creation. fixed bugs setting due dates, etc
+	
+2001-10-18 02:13  jesse
+
+	* lib/RT/Interface/Email.pm:
+
+	fixed a user creation race condition in the mail gateway
+	
+2001-10-18 02:11  jesse
+
+	* webrt/Elements/SelectStatus:
+
+	use the new status abstraction in the web ui
+	
+2001-10-18 02:08  jesse
+
+	* tools/testdeps:
+
+	moved to a dbix::searchbuilder 0.46 dependency
+	
+2001-10-18 02:07  jesse
+
+	* lib/RT/Tickets.pm:
+
+	Movign away from a deprecated API
+	
+2001-10-18 02:07  jesse
+
+	* tools/initdb:
+
+	initdb won't whine if you don't set a host
+	
+2001-10-18 02:05  jesse
+
+	* docs/design_docs/evil_plans:
+
+	Added some docs about what 2.2 might hold
+	
+2001-10-18 02:00  jesse
+
+	* lib/RT/: Ticket.pm, Queue.pm:
+
+	Abstracted out status enumeration and validation
+	
+2001-10-18 01:57  jesse
+
+	* webrt/Ticket/Elements/EditLinks:
+
+	added WebPath to fix some links in showlinks
+	
+2001-10-17 16:34  jesse
+
+	* lib/Makefile.PL:
+
+	Bumped searchbuilder dependency to 0.46
+	
+2001-10-17 16:33  jesse
+
+	* webrt/Ticket/Elements/ShowHistory:
+
+	Added an optional bit of configuration to not show the "History" header
+	
+2001-10-06 03:01  jesse
+
+	* webrt/Ticket/Elements/ShowTransaction:
+
+	Added a new option "Show commands" to show tranasaction
+	
+2001-10-06 03:00  jesse
+
+	* webrt/Admin/: Keywords/index.html, Queues/index.html:
+
+	Added support for reenabling deleted queues and keywords
+	
+2001-10-06 02:57  jesse
+
+	* lib/RT/Condition/Generic.pm:
+
+	Added test harness glue
+	
+2001-10-06 02:55  jesse
+
+	* lib/RT/Interface/Web.pm:
+
+	Added code to detect bogus ticket update types
+	
+2001-10-06 02:54  jesse
+
+	* lib/RT/Interface/: CLI.pm, Email.pm:
+
+	Added support for unit testing
+	
+2001-10-06 02:51  jesse
+
+	* lib/RT/Handle.pm:
+
+	Added support for unit testing
+	
+	Added a test for Database Port definition to stop perl from whining
+	
+2001-10-06 02:49  jesse
+
+	* lib/RT/: ACE.pm, ACL.pm, Action/Generic.pm, Action/SendEmail.pm,
+	Attachment.pm, Attachments.pm:
+
+	Added support for unit testing
+	
+2001-10-06 02:46  jesse
+
+	* lib/RT/: Tickets.pm, Transaction.pm, Transactions.pm, User.pm,
+	Users.pm, Watcher.pm, Watchers.pm, Queues.pm, Record.pm, Scrip.pm,
+	ScripAction.pm, ScripActions.pm, ScripCondition.pm,
+	ScripConditions.pm, Scrips.pm, Template.pm, Templates.pm:
+
+	Added support for unit testing
+	
+2001-10-06 02:43  jesse
+
+	* lib/RT/: Keyword.pm, KeywordSelect.pm, KeywordSelects.pm,
+	Keywords.pm, Link.pm, Links.pm, ObjectKeyword.pm,
+	ObjectKeywords.pm, CurrentUser.pm, Date.pm, EasySearch.pm,
+	Group.pm, GroupMember.pm, GroupMembers.pm, Groups.pm:
+
+	Added support for unit testing
+	
+2001-10-06 02:38  jesse
+
+	* lib/RT.pm:
+
+	Added the beginnings of test support to RT.pm
+	
+2001-10-06 02:22  jesse
+
+	* lib/RT/TestHarness.pm:
+
+	file TestHarness.pm was initially added on branch rt-1-1.
+	
+2001-10-06 02:22  jesse
+
+	* lib/: Makefile.PL, RT/TestHarness.pm:
+
+	First bits of glue for new RT unit testing infrastructure
+	
+2001-10-06 02:19  jesse
+
+	* bin/rt:
+
+	bin/rt: Documentation cleanups. removing an unnecessary data tainting check
+	
+2001-10-06 02:18  jesse
+
+	* bin/initacls.Pg:
+
+	Fixes to initacls.Pg to allow installation with Unix Domain sockets
+	
+2001-10-04 02:01  jesse
+
+	* Makefile:
+
+	Bumped the version to 2.0.8
+	
+2001-10-01 02:44  jesse
+
+	* rt.spec:
+
+	Revved the version of DBIx::SearchBuilder needed in the .spec file
+	
+2001-10-01 02:42  jesse
+
+	* Makefile, lib/RT/Interface/Email.pm:
+
+	Fixed the call to MIME::Entity::Build in Email.pm
+	
+	Bumped the version to 2.0.8pre3
+	
+2001-09-30 23:03  jesse
+
+	* README, bin/rt, lib/RT/Tickets.pm, lib/RT/Interface/Email.pm,
+	webrt/Search/PickRestriction, webrt/Ticket/History.html,
+	webrt/Ticket/Elements/EditBasics,
+	webrt/Ticket/Elements/ShowHistory:
+
+	Code refactoring to allow searching for nonlocal links
+	Cleanup to the Loop prevention stuff (v. 2.0.8pre2)
+	Readme cleanup
+	CLI cleanups.  changed "return" to "exit"
+	
+2001-09-26 16:31  jesse
+
+	* tools/testdeps:
+
+	Bumped the searchbuilder dependency.  to 0.43
+	
+2001-09-26 16:28  jesse
+
+	* Makefile, bin/rt, lib/RT/Tickets.pm,
+	webrt/Admin/Queues/Scrips.html:
+
+	Added a fix for ItemsArrayRef to Tickets which causes the Next/Prev links in
+	the web ui to be smarter.
+	
+	Fixed a typo in SCrips.html
+	
+	Bumped the version to 2.0.8pre2
+	
+2001-09-24 20:10  jesse
+
+	* rt.spec:
+
+	file rt.spec was initially added on branch rt-1-1.
+	
+2001-09-24 20:10  jesse
+
+	* Makefile, rt.spec:
+
+	Added destdir support to allow building of RPMS.
+	added rt.spec for building of RPMS.
+	
+2001-09-21 16:51  jesse
+
+	* Makefile:
+
+	Bumped makefule version to 2.0.8pre1
+	
+2001-09-21 16:45  jesse
+
+	* bin/rt, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
+	lib/RT/Interface/Web.pm, webrt/Ticket/Elements/ShowTransaction:
+
+	Fixed a typo in the bin/rt docs
+	Allowed "Force owner change" from bulk update screen.
+	
+2001-09-20 22:34  jesse
+
+	* bin/rt, lib/RT/Action/SendEmail.pm, lib/RT/Interface/Email.pm,
+	webrt/Search/Bulk.html, webrt/Ticket/Elements/ShowTransaction:
+
+	Fixes for:
+	
+	888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888862 Re: [rt-users] how does rt --limit-last-updated work?
+	
+	863 Ticket/Elements/ShowTransaction doesn't show headers sometimes
+	
+	Fix for a bug in the code that prevents RT from looping with itself.
+	
+	Start of work for "force change owner" in Bulk.html
+	
+2001-09-19 16:49  jesse
+
+	* bin/initacls.Pg, bin/rt, etc/config.pm, lib/RT/Queue.pm,
+	lib/RT/Ticket.pm, lib/RT/Tickets.pm, webrt/Elements/Header,
+	webrt/Search/Listing.html, webrt/Ticket/Create.html,
+	webrt/Ticket/Display.html, webrt/Ticket/ModifyAll.html,
+	webrt/Ticket/Update.html, webrt/Ticket/Elements/ShowLinks:
+
+	Fixed a bug that would cause installation on postgres to lose if $PORT wasn't
+	specified
+	
+	Changed " to ' in a few places in the config file, to make file and variable
+	names with embedded metacharacters not lose as badly
+	
+	Set some logical defaults for Queue->Create, so it's not as likely to fail
+	to create a queue if you leave out some fields
+	
+	Ticket->Create: now takes a Starts date.  Also, fixed some API docs.
+	
+	Tickets: Negative searching on fields like "subject" should now work
+	
+	WebUI:  Added a pragma NO-CACHE pseudo-header, to stop overzealous browsers from caching RT's pages
+	
+	WebUI: changed the "Bookmark this search" link to "Bookmarkable URL for this search"
+	
+	WebUI: ticket create now has a "more detail" section
+	
+	WebUI: ticket updates no longer have a default subject preset.
+	
+	WebUI: fixed a bug in ShowLinks that generated bogus urls within RT if RT wasn't at / on your server
+	
+2001-09-13 00:03  jesse
+
+	* Makefile:
+
+	Bumping the version to 2.0.7
+	
+2001-09-10 02:18  jesse
+
+	* Makefile:
+
+	Bumped the makefile version to 2.0.7pre1
+	
+2001-09-10 02:11  jesse
+
+	* bin/mason_handler.fcgi, lib/RT/User.pm:
+
+	Fixed #883, a permissions caching bug.
+	
+	Added the Text::Wrapper dependency to mason_handler.fcgi
+	
+2001-09-06 15:59  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Reverted reopen on correspondence to 1.0 behaviour
+	
+2001-09-06 15:41  jesse
+
+	* webrt/SelfService/Display.html:
+
+	make row coloring alternate in selfservice transaction history
+	
+2001-09-06 15:39  jesse
+
+	* webrt/SelfService/Display.html:
+
+	Fixed cell spacing in selfservice transaction display
+	
+2001-09-06 15:33  jesse
+
+	* bin/webmux.pl, webrt/SelfService/Display.html,
+	webrt/Ticket/Display.html, webrt/Ticket/Elements/ShowHistory,
+	webrt/Ticket/Elements/ShowKeywordSelects,
+	webrt/Ticket/Elements/ShowSummary,
+	webrt/Ticket/Elements/ShowTransaction:
+
+	Cleaned up the web ticket transaction display.
+	
+2001-09-06 15:32  jesse
+
+	* lib/RT/: ObjectKeyword.pm, Queue.pm:
+
+	Added some docs.
+	Started refactoring Ticket statuses.
+	
+2001-09-06 15:32  jesse
+
+	* lib/RT/Ticket.pm:
+
+	$Ticket->SetTold  now optionally takes a date to set it to.
+	
+2001-09-06 15:30  jesse
+
+	* bin/rt:
+
+	Fixing some docs in bin/rt
+	
+2001-09-05 11:00  jesse
+
+	* webrt/Elements/: Header, Refresh:
+
+	Fix for #823 from martin@schapendonk.org
+		Refresh now allows you to turn off refresh.
+	
+2001-09-01 19:01  jesse
+
+	* webrt/Elements/MessageBox:
+
+	Fix for [fsck.com #803] Jumbo recording comments accidentally
+	
+2001-09-01 18:23  jesse
+
+	* Makefile:
+
+	Bumped the version to 2.0.6
+	
+2001-08-28 15:49  jesse
+
+	* Makefile:
+
+	Bumped the version to pre7, fixed a typo in the makefile's install instructions.
+	
+2001-08-24 00:13  jesse
+
+	* lib/RT/Attachment.pm:
+
+	importing the Crit->crit typo fix from 2.0.5_01
+	
+2001-08-24 00:08  jesse
+
+	* Makefile, lib/RT/Interface/Email.pm:
+
+	Rolled in the 2.05 perl 5.005 compatibility fix.
+	bumped the version to 2.0.6pre6
+	
+2001-08-23 19:49  jesse
+
+	* bin/rt-mailgate, tools/initdb:
+
+	fixed initdb to not append a port= to the db connect string unless it needs one.
+	
+	added support for $SenderMustExistInExternalDatabase to mailgate.
+	
+2001-08-23 19:46  jesse
+
+	* lib/RT/Groups.pm:
+
+	Added a default alphabetical sort order to lib/RT/Groups
+	
+2001-08-23 19:45  jesse
+
+	* etc/: config.pm, schema.Pg, schema.mysql, schema.pm:
+
+	Added new indices to schema. Regenerated mysql and postgres schema.
+	
+	Cleaned up etc/config.pm's docs some more, based on comments from Christian Gimore
+	Added a default value for RT::OwnerEmail, which was documented by not defined
+	by default
+	
+2001-08-22 18:48  jesse
+
+	* bin/rt, lib/RT/Ticket.pm, webrt/Ticket/Update.html:
+
+	bin/rt --create now deals with watchers.
+	
+	fixed a typo in Ticket/Update.html introduced after 2.0.5_03
+	
+2001-08-22 01:37  jesse
+
+	* Makefile, lib/RT/Tickets.pm, webrt/Admin/Global/Keywords.html:
+
+	Bumped version to 2.0.6-pre5
+	
+	Fixed 'deep' merges.
+	
+	Fixed a typo in Global/Keywords
+	
+2001-08-22 00:41  jesse
+
+	* Makefile, lib/RT/Interface/Email.pm:
+
+	Fixed a couple of bugs in the new email db lookups
+	
+2001-08-21 23:57  jesse
+
+	* Makefile, bin/initacls.Oracle, bin/initacls.Pg,
+	bin/initacls.mysql, tools/initdb:
+
+	Added support for setting the database port for postgres and mysql
+	
+2001-08-21 23:48  jesse
+
+	* README:
+
+	Updated jesse's email address and shuffled things around a bit.
+	
+2001-08-21 23:45  jesse
+
+	* etc/config.pm:
+
+	Added more docs and updated the default config for the external db lookups
+	
+2001-08-21 23:35  jesse
+
+	* webrt/: index.html, NoAuth/webrt.css, Search/Listing.html,
+	Search/PickRestriction, Ticket/ModifyDates.html,
+	Ticket/Update.html, Ticket/Elements/ShowHistory,
+	Ticket/Elements/ShowTransaction:
+
+	Added support for autorefresh to / and /Search/Listing.html
+	
+	Tightened up Transaction display. Fixed 'full headers' display.
+	
+	Cleaned up the ui in ModifyDates a bit
+	
+	Cleaned up the ui in Ticket/Update.html
+	
+	fixed a few typos in the css file
+	
+2001-08-21 23:30  jesse
+
+	* lib/RT/Attachment.pm:
+
+	Added some documentation
+	
+2001-08-21 23:25  jesse
+
+	* bin/rt-mailgate:
+
+	Bringing forward a patch to the mailgate from 2.0.5_01
+	
+2001-08-21 23:19  jesse
+
+	* webrt/Elements/Refresh:
+
+	file Refresh was initially added on branch rt-1-1.
+	
+2001-08-21 23:19  jesse
+
+	* webrt/Elements/Refresh:
+
+	Commiting a Refresh control to cvs
+	
+2001-08-21 23:17  jesse
+
+	* bin/rtadmin:
+
+	Fixed cli group creation
+	
+2001-08-21 23:12  jesse
+
+	* webrt/Elements/MessageBox:
+
+	Fixed transaction quoting to use the new transaction content quoting method.
+	
+2001-08-21 23:07  jesse
+
+	* webrt/Elements/Login:
+
+	Display a version string in the login box.
+	
+2001-08-21 23:06  jesse
+
+	* webrt/Elements/Header:
+
+	Added support for refresh to webrt/Elements/Header
+	Don't display the logout link if using external auth.
+	
+2001-08-21 23:05  jesse
+
+	* webrt/Admin/Users/Modify.html:
+
+	Little bit of ui and code cleanup to the User editing page
+	
+2001-08-21 23:04  jesse
+
+	* lib/RT/Record.pm:
+
+	Fixed broken caching of the CreatorObj
+	
+2001-08-21 23:03  jesse
+
+	* lib/RT/Handle.pm:
+
+	Added support for Database port to Handle.pm
+	
+2001-08-21 22:50  jesse
+
+	* lib/RT/Interface/Web.pm:
+
+	Added vivek khera's patch to clean up newline processing for incoming messages
+	
+	Removed debugging output from file attachment subroutine
+	
+	Added support for setting refresh interval to the search page
+	
+2001-08-21 22:46  jesse
+
+	* lib/RT/Interface/Email.pm:
+
+	Fixed the bug fixed in 2.0.5_?? which called the wrong function for finding
+	sender name
+	
+	Altered the mail interface's external user lookup function to be returned
+	 a hash of parameters
+	
+2001-08-21 22:43  jesse
+
+	* lib/RT/Transaction.pm:
+
+	Added support for Quoting a transaction to the Content sub.
+	
+2001-08-16 00:23  jesse
+
+	* Makefile, tools/testdeps:
+
+	dependency on CGI::Cookie 1.20 had reverted.
+	Bumped version to 2.0.5_03
+	
+2001-08-15 16:44  jesse
+
+	* Makefile, bin/rt-mailgate, lib/RT/Interface/Email.pm:
+
+	A couple of fixes to the mail gateway to deal with proper processing
+	of sender email addresses
+	
+2001-08-15 16:12  jesse
+
+	* lib/RT/Interface/Email.pm:
+
+	Trying for 2.0.5-01 again
+	Fixed a perl 5.6ism in Interface/Email
+	Fixed a bug in Attachment.pm that would cause a DIE on a fatal error
+	
+2001-08-15 16:12  jesse
+
+	* lib/RT/Attachment.pm:
+
+	Trying for 2.0.5-01 again
+	Fixed a bug in Attachment.pm that would cause a DIE on a fatal error
+	
+2001-08-15 16:12  jesse
+
+	* Makefile:
+
+	Trying for 2.0.5-01 again
+	
+2001-08-15 15:44  jesse
+
+	* lib/RT/Interface/Email.pm:
+
+	Fixed an error message in Attachment that should never be reached
+	Bumped the Makefile version to 2.0.5_01
+	Fixed an inadvertent perl 5.6ism in the mail gateway.
+	
+2001-08-15 15:42  jesse
+
+	* lib/RT/Attachment.pm:
+
+	Fixed an error message in Attachment that should never be reached
+	
+	Bumped the Makefile version to 2.0.5_01
+	
+2001-08-15 15:42  jesse
+
+	* Makefile:
+
+	Bumped the Makefile version to 2.0.5_01
+	
+2001-08-15 01:01  jesse
+
+	* Makefile:
+
+	Bumped version to 2.0.6-pre1
+	
+2001-08-15 01:00  jesse
+
+	* webrt/: autohandler, Admin/Users/Modify.html, Elements/Login,
+	SelfService/Prefs.html, User/Prefs.html:
+
+	Added support for external authentication to the web ui
+	
+2001-08-15 01:00  jesse
+
+	* bin/rt-mailgate, lib/RT/Interface/Email.pm:
+
+	Added support for looking up new users in an external datasource
+	
+2001-08-15 00:58  jesse
+
+	* etc/config.pm:
+
+	Added new configuration variables for external authentication for the web ui and
+	to support looking up new users in the mail gateway from a site-defined external datasource.
+	
+2001-08-15 00:17  jesse
+
+	* tools/testdeps:
+
+	Fixed testdeps to depend on the right version of CGI.pm
+	
+2001-08-14 23:55  jesse
+
+	* Makefile:
+
+	Released RT 2.0.5  No changes since 2.0.5-test3.
+	
+2001-08-12 21:13  jesse
+
+	* Makefile, bin/webmux.pl:
+
+	Fixed a typo in webmux.pl created after 2.0.4
+	Bumped the version to 2.0.5-test3
+	
+2001-08-12 20:00  jesse
+
+	* docs/manual.pod, lib/RT/Transaction.pm:
+
+	Core:  Updated Transaction->Content to be smarter about showing the first
+	message in the transaction.
+	
+	Removed the old manual skeleton in docs in favor of the web based docs.
+	
+2001-08-12 19:58  jesse
+
+	* lib/RT/Attachment.pm:
+
+	Core: Added a convenience function to RT::Attachemnt to find Children of this attachment.
+	Core: Added code to RT::Attachemnt to allow access to the 'Parent' attribute
+	
+2001-08-12 19:55  jesse
+
+	* lib/RT/Attachments.pm:
+
+	Core: A convenience function to search for Attachments by ContentType.
+	Core: Added some docs to RT::Attachments
+	
+2001-08-12 19:53  jesse
+
+	* webrt/Ticket/Elements/ShowTransaction:
+
+	WebUI: Show 'comment' and 'correspond' for multipart messages in the per-transaction listing.
+	
+2001-08-10 23:59  jesse
+
+	* README:
+
+	README: added more pointers to the 'complete' docs.
+	README: Removed the little bit of configuration info in the readme in favor of the 'complete' docs on the web
+	
+2001-08-10 23:58  jesse
+
+	* bin/rt-mailgate:
+
+	mailgate: RT is now less likely to try to send mail to senders which will cause loops
+	
+2001-08-10 23:57  jesse
+
+	* webrt/index.html:
+
+	Webui: [home] now gets greyed out when you're there
+	
+2001-08-10 15:32  jesse
+
+	* Makefile, webrt/Elements/MessageBox:
+
+	Added a pair of () in webrt/Elements/MessageBox to correct a typo in an if
+	Bumped version to 2.0.5-test2
+	
+2001-08-10 00:24  jesse
+
+	* Makefile:
+
+	Bumped version to 2.0.5test1
+	
+2001-08-10 00:24  jesse
+
+	* lib/RT/Users.pm, webrt/Elements/MessageBox,
+	webrt/Ticket/Elements/AddWatchers, webrt/Ticket/Elements/EditDates:
+
+	Cleanup to date editing ui
+	
+	Code cleanups to Elements/MessageBox for more readable and maintainable code
+	Code cleanups to TicketElements/AddWatchers for more readable and maintainable code
+	
+2001-08-10 00:23  jesse
+
+	* webrt/Ticket/Elements/: EditLinks, ShowLinks:
+
+	Cleanup to Relationship editing and display ui
+	
+2001-08-10 00:21  jesse
+
+	* webrt/Ticket/ModifyDates.html:
+
+	UI cleanups in Ticket/ModifyDates.html
+	
+2001-08-10 00:20  jesse
+
+	* webrt/Ticket/ModifyAll.html:
+
+	Jumbo no longer loses ticket update contents.
+	
+2001-08-09 20:07  jesse
+
+	* webrt/Admin/Users/index.html:
+
+	Cleaned up Admin/Users search functionality and made it look more like
+	other user searching screens and enables searching for disabled users.
+	
+2001-08-09 20:02  jesse
+
+	* lib/RT/Interface/Web.pm:
+
+	Properly strip trailing spaces from things we're trying to link to.
+	
+2001-08-09 20:00  jesse
+
+	* lib/RT/Links.pm:
+
+	By default, try to sort Links by something intelligent when displaying them
+	
+2001-08-03 01:52  jesse
+
+	* lib/RT/Action/Autoreply.pm:
+
+	Autoreplies are now from "Queuename" rather than from "RT"
+	
+2001-08-02 04:57  jesse
+
+	* webrt/: Admin/Queues/People.html, Elements/Quicksearch,
+	Elements/SelectResultsPerPage, Elements/SelectStatus,
+	Search/PickRestriction:
+
+	WebUI: Fixed a typo in hte 'bookmark this search' link display.
+	WebUI: By default, limit displayed results to 50 per page.
+	
+2001-08-02 04:57  jesse
+
+	* lib/RT/Interface/Web.pm:
+
+	Documented a function in the web ui library
+	
+2001-08-02 04:56  jesse
+
+	* etc/config.pm:
+
+	Fixed a typo in the docs in the config file, thanks to sheeri.
+	
+2001-08-02 04:55  jesse
+
+	* bin/rt-mailgate:
+
+	rt-mailgate: bug-fix to properly grab 'from' addresses for purposes of determinigng whether something's a mailer-daemon
+	
+2001-08-02 04:54  jesse
+
+	* bin/rt:
+
+	Added support for merging to the CLI
+	Cli now works as described when linking tickets. Formerly, you couldn't admit the "+" before an added link
+	
+2001-08-02 04:53  jesse
+
+	* webrt/User/Prefs.html:
+
+	Bugfix to allow users to fully delete their rt signatures
+	
+2001-07-30 03:54  jesse
+
+	* docs/design_docs/evil_plans:
+
+	file evil_plans was initially added on branch rt-1-1.
+	
+2001-07-30 03:54  jesse
+
+	* Makefile, docs/design_docs/evil_plans:
+
+	bumped the version, so as not to get confused users complaining to the lists
+	
+	added some notes about what may happen for 2.2
+	
+2001-07-30 03:52  jesse
+
+	* webrt/SelfService/Display.html:
+
+	file Display.html was initially added on branch rt-1-1.
+	
+2001-07-30 03:52  jesse
+
+	* bin/mason_handler.fcgi, bin/webmux.pl, lib/RT/Interface/Web.pm,
+	webrt/SelfService/Create.html, webrt/SelfService/Details.html,
+	webrt/SelfService/Display.html, webrt/SelfService/Update.html,
+	webrt/SelfService/Elements/GotoTicket,
+	webrt/SelfService/Elements/MyRequests, webrt/Ticket/Create.html,
+	webrt/Ticket/Display.html, webrt/Ticket/Modify.html,
+	webrt/Ticket/ModifyAll.html, webrt/Ticket/ModifyDates.html,
+	webrt/Ticket/ModifyLinks.html, webrt/Ticket/ModifyPeople.html,
+	webrt/Ticket/Update.html, webrt/Ticket/Elements/EditBasics,
+	webrt/Ticket/Elements/ShowTransaction:
+
+	Switched SelfService/Details to SelfService/Display  to better jibe
+	with the regular UI.
+	
+	Added better current-page navigation hints to most per-ticket pages.
+	
+	Added support for uploading attachments on ticket create or update.
+	
+2001-07-30 03:51  jesse
+
+	* webrt/Admin/Elements/ListGlobalScrips:
+
+	file ListGlobalScrips was initially added on branch rt-1-1.
+	
+2001-07-30 03:51  jesse
+
+	* webrt/Admin/: Elements/ListGlobalKeywordSelects,
+	Elements/ListGlobalScrips, Global/Scrips.html,
+	Queues/Keywords.html, Queues/Scrips.html:
+
+	Added some ui to show global scrips and keywordselects in the queue
+	uis for adminning the same.
+	
+2001-07-30 03:51  jesse
+
+	* webrt/Admin/Elements/ListGlobalKeywordSelects:
+
+	file ListGlobalKeywordSelects was initially added on branch rt-1-1.
+	
+2001-07-30 03:49  jesse
+
+	* TODO:
+
+	Clarified the errata urls
+	
+2001-07-30 03:48  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Cleaned up the return values from Ticket->CreateLink. (always return $status, $msg);
+	
+2001-07-30 03:48  jesse
+
+	* lib/RT/Action/SendEmail.pm:
+
+	changed the case of the Managed-by header to be less grating
+	
+2001-07-30 03:45  jesse
+
+	* bin/rt-mailgate, lib/RT/Interface/Email.pm:
+
+	Moving a bunch of mail gateway library routines to the library where they
+	belong
+	
+2001-07-27 01:06  jesse
+
+	* README:
+
+	fixed a typo in the cronjob
+	
+2001-07-25 01:05  jesse
+
+	* bin/rt-mailgate, lib/RT/Tickets.pm:
+
+	Fix for mailgateway being unable to send error mail with 'sendmailpipe' mailing
+	Fix for 'blank' searches when using search bookmarking.
+	
+2001-07-25 01:00  jesse
+
+	* Makefile:
+
+	Bumped version to 2.0.4
+	Fixed bookmarkable searches
+	Fix for sendmailpipe errors in mailgateway
+	
+2001-07-24 12:10  jesse
+
+	* Makefile, webrt/Search/PickRestriction:
+
+	Fixed a bug in Search/PickRestriction, thanks to Vivek Khera
+	Bumped version to 2.0.3
+	
+2001-07-24 00:28  jesse
+
+	* Makefile:
+
+	Bumped version to 2.0.2
+	
+2001-07-24 00:21  jesse
+
+	* lib/RT/Tickets.pm, webrt/Elements/Submit,
+	webrt/Search/Listing.html, webrt/Search/PickRestriction:
+
+	Bookmarked searches now keep track of sorting and record count limits
+	New "Refine" button to allow faster updates of search criteria.
+	
+2001-07-24 00:01  jesse
+
+	* bin/rt:
+
+	Added support for --limit-queue to  RT cli tool
+	
+2001-07-23 10:43  jesse
+
+	* Makefile, tools/testdeps:
+
+	Testdeps was accidentally looking for Freeze::Thaw, rather than FreezeThaw
+	
+2001-07-23 00:31  jesse
+
+	* Makefile:
+
+	bumped version to 2.0.2test2
+	
+2001-07-23 00:30  jesse
+
+	* lib/RT/Tickets.pm, lib/RT/Interface/Web.pm, tools/testdeps,
+	webrt/Search/Listing.html:
+
+	Added support for bookmarkable searches.
+	
+2001-07-22 22:12  jesse
+
+	* lib/RT/: KeywordSelect.pm, User.pm:
+
+	Better error checking in User ACL checking
+	
+	Fixed an ACL check bug in KeywordSelect.pm, thanks to Matthew Stock.
+	
+2001-07-22 22:09  jesse
+
+	* webrt/Admin/Users/index.html:
+
+	Fix for a users search bug and a clarification of another search option.
+	
+2001-07-22 22:06  jesse
+
+	* lib/RT/: Keywords.pm, Queues.pm, Users.pm:
+
+	By default, order Queues, Users and Keywords alphabetically
+	
+2001-07-22 22:05  jesse
+
+	* Makefile:
+
+	Permissions fix for the data dirs for the fastcgi handler
+	
+	rt/etc is now mode 755, rather than 555.
+	
+2001-07-22 22:03  jesse
+
+	* bin/mason_handler.fcgi:
+
+	fastcgi handler no longer drops setgidness, so it can deal with session files.
+	
+2001-07-22 21:55  jesse
+
+	* etc/config.pm:
+
+	Cleaned up the config file a bit to make installation easier.
+	
+2001-07-22 21:52  jesse
+
+	* webrt/Elements/MyRequests:
+
+	Clean up phrasing of the "Tickets I own dialogbox"
+	
+2001-07-19 00:57  jesse
+
+	* Makefile:
+
+	Changed Makefile to not use MAN[13]INSTALLSITEPATH per Robert Shaw's changes
+	
+2001-07-18 16:20  jesse
+
+	* Makefile, lib/RT/Queue.pm:
+
+	Added a newline to Queue.pm to fix a pod bug
+	
+	Bumped version to 2.0.2-test1  to get some feedback
+	
+2001-07-18 16:16  jesse
+
+	* lib/RT/User.pm:
+
+	RT should now honor queue-level pseudogroup memebership for ACL checks.
+	Also, simplified some of the queue related ACL checking code.
+	
+	Reduced the ACL permissions cache from 30sec to 10sec.
+	
+2001-07-18 16:13  jesse
+
+	* lib/RT/Transaction.pm:
+
+	Added BriefDescription, which is just like Description without the "By actor"
+	at the end
+	
+	Descriptions Keyword operations should include _which_ keyword select from
+	here on in (also touched the last update to Ticket.pm)
+	
+2001-07-18 16:06  jesse
+
+	* lib/RT/Ticket.pm:
+
+	TTicket->Create no longer just adds admin ccs..unless the person doing the add
+	has the right to do so.  otherwise, there was an ACL related attack that
+	could happen. luckily none of the UI exposedd this hole yet.
+	
+	Ticket->Create should now be able to set keywords on create
+	
+	Ticket->Create now reports back non-fatal errors and how they were dealt with
+	
+	Ticket->AddKeyword got split into AddKeyword and _AddKeyword. The former
+	has the acl check and calls the latter. the latter just does the adding.
+	
+	Ticket->AddKeyword got a Silent flag, which causes a transaction not
+	to be written. useful on ticket create.
+	
+2001-07-18 15:59  jesse
+
+	* tools/testdeps:
+
+	Added tests for Apache::Cookie
+	and DBI 1.18 to testdeps
+	
+2001-07-18 15:53  jesse
+
+	* webrt/SelfService/: Details.html, Update.html:
+
+	Added the ability for requestors to use the self-service ui to comment on / reply to tickets.
+	
+2001-07-18 15:53  jesse
+
+	* webrt/SelfService/Update.html:
+
+	file Update.html was initially added on branch rt-1-1.
+	
+2001-07-17 22:12  jesse
+
+	* webrt/Admin/Queues/People.html:
+
+	Fixed a link to Users/Modify.html in Queue/People.html
+	
+2001-07-17 22:01  jesse
+
+	* bin/webmux.pl:
+
+	Fix to the solaris chown problem
+	
+2001-07-17 18:37  jesse
+
+	* README:
+
+	Fixed typo in the cron job description
+	
+2001-07-13 02:17  jesse
+
+	* lib/RT/Tickets.pm:
+
+	Work on tickets.pm to support some new searching options
+	
+2001-07-12 19:43  jesse
+
+	* Makefile:
+
+	Bumped version to 2.0.1
+	
+2001-07-11 23:17  jesse
+
+	* etc/config.pm:
+
+	No longer log things of less than 'error' to the logfile
+	
+2001-07-11 23:16  jesse
+
+	* Makefile, bin/mason_handler.fcgi, bin/rt, bin/rt-mailgate,
+	bin/rtadmin, lib/Makefile.PL, lib/RT.pm, lib/RT/Interface/CLI.pm,
+	lib/RT/Interface/Email.pm:
+
+	Make sure that the setgid programs don't drop setgidness before trying to open logfiles
+	
+2001-07-10 20:15  jesse
+
+	* Makefile, lib/Makefile.PL, lib/RT/Tickets.pm,
+	lib/RT/Interface/Web.pm, tools/testdeps:
+
+	Fixes to allow search-by-requestor to search for requestors who don't have RT accounts
+	
+2001-07-10 13:53  jesse
+
+	* bin/webmux.pl:
+
+	Fix for the weird sessiondata permissions bug folks have seen on solaris
+	
+2001-07-10 11:47  jesse
+
+	* lib/RT/Tickets.pm:
+
+	Change to Tickets.pm to fix description of watcher limits
+	
+2001-07-10 11:36  jesse
+
+	* bin/webmux.pl, webrt/Elements/SelectMatch:
+
+	Fixed a bug in webmux.pl that prevented Apache::Cookie support from working
+	
+	Fixed a bug in the enw SelectMatch code
+	
+2001-07-10 11:20  jesse
+
+	* lib/RT/Ticket.pm, webrt/Elements/SelectMatch,
+	webrt/Search/PickRestriction:
+
+	Cleanup to SelectMatch and PickRestriction to clear up the UI issues
+	with searching for Tickets from a give nrequestor
+	
+2001-07-09 10:36  jesse
+
+	* lib/RT/Template.pm:
+
+	Fixed a typo in Template.pm that squashed templates on outgoing mail. (Bug in my untainting fix)
+	
+	Bumped version to 2.0.1-test2
+	
+2001-07-09 10:36  jesse
+
+	* Makefile:
+
+	Fixed a typo in Template.pm that squashed templates on outgoing mail. (Bug in my untainting fix)
+	
+2001-07-08 22:31  jesse
+
+	* README:
+
+	Added some polite comments about supporting the development of RT
+	with contracts, cash or gifts
+	
+2001-07-08 20:14  jesse
+
+	* Makefile, bin/mason_handler.fcgi,
+	webrt/SelfService/Elements/ShowTransaction:
+
+	Bumped version to 2.01pre1
+	
+	Fixed mason_handler header newlines
+	
+2001-07-08 20:12  jesse
+
+	* lib/RT/: ScripAction.pm, ScripCondition.pm, Template.pm,
+	Ticket.pm:
+
+	Taint fixes for ScripAction, ScripCondtion,Template.
+	Header wrapping fix in Template.pm.
+	Fix in Ticket.pm to make EffectiveId a public field.
+	
+2001-07-06 18:32  jesse
+
+	* lib/RT/Attachment.pm:
+
+	Applied a patch from ivan to deal with poorly formed mime messages
+	and clean up the attachment proccessing code.
+	
+2001-07-06 18:26  jesse
+
+	* webrt/SelfService/Attachment/dhandler:
+
+	file dhandler was initially added on branch rt-1-1.
+	
+2001-07-06 18:26  jesse
+
+	* webrt/: SelfService/Details.html,
+	Ticket/Elements/ShowTransaction, SelfService/Attachment/dhandler:
+
+	ShowTransaction now no longer displays 'Comment' and 'Reply' if the user
+	doesn't have the right rights.
+	
+	SelfService uses the 'standard' ShowTransaction.
+	
+	SelfService now displays Attachments
+	
+2001-07-06 18:21  jesse
+
+	* etc/schema.mysql:
+
+	Switched mysql to use LONGTEXT rather than LONGBLOB to get
+	case insensitive searching.
+	
+2001-07-06 18:19  jesse
+
+	* bin/mason_handler.fcgi, lib/RT/Interface/Web.pm,
+	webrt/NoAuth/Logout.html:
+
+	Cleanups to deal better with the fastcgi handler.
+	
+	Switched to CGI::Fast from FCGI
+	
+	ContentType fixes.
+	
+	Logging out now clears the session hash, rather than detaching a perfectly good session. (This gets around an obnoxious tainting issue too)
+	
+2001-07-06 16:14  jesse
+
+	* webrt/Ticket/Attachment/dhandler:
+
+	Changed default attachment type to text/plain from text/html
+	
+2001-07-05 16:48  jesse
+
+	* bin/rt-mailgate, lib/RT/Ticket.pm:
+
+	Updates to make Correspondence on a closed or stalled ticket reopen the ticket
+	
+2001-07-04 00:51  jesse
+
+	* bin/rt:
+
+	bin/rt will now show transactions of type 'text'
+	
+2001-07-04 00:36  jesse
+
+	* bin/webmux.pl:
+
+	Minor fixes to webmux.pl for content type stuff.
+	
+2001-07-03 23:15  jesse
+
+	* lib/RT/Interface/Web.pm, webrt/Admin/Queues/index.html,
+	webrt/Search/PickRestriction:
+
+	Web ui now supports 'SearchByPriority'
+	
+2001-07-03 23:14  jesse
+
+	* etc/config.pm:
+
+	Added a few comments about configuration variables
+	
+2001-07-03 23:12  jesse
+
+	* webrt/SelfService/Elements/ShowTransaction:
+
+	Now SelfService displays attachments of type 'text'
+	
+2001-07-03 23:08  jesse
+
+	* webrt/Ticket/Elements/ShowTransaction:
+
+	With the web ticket display, now display attachments of type 'text' properly.
+	Also, always have a download link.
+	
+2001-07-03 23:00  jesse
+
+	* webrt/Ticket/Elements/ShowLinks:
+
+	Changed SubTickets/SuperTickets to Parents/Children
+	
+2001-07-03 22:57  jesse
+
+	* Makefile:
+
+	Added notes to the effect that the speedycgi and fastcgi handlers aren't
+	supported.
+	
+2001-07-03 22:52  jesse
+
+	* bin/webmux.pl, bin/mason_handler.fcgi,
+	webrt/Ticket/Attachment/dhandler:
+
+	Switched mod_perl hander to use Apache::Cookie
+	
+	Refactored mime type handling to properly set the mime type with the modperl
+	handler and the fastcgi handler
+	
+	Added untainting for the requirred parts of the fastcgi wrapper.
+	I'm not yet confident that it works properly, but it does the right
+	thing in the trivial case.
+	
+2001-06-27 00:11  jesse
+
+	* Makefile:
+
+	Bumped version to 2.0 for release to the unsuspecting masses
+	
+2001-06-25 16:28  jesse
+
+	* Makefile, lib/RT/Ticket.pm:
+
+	Fix for a bug introduced by RC2  (while fixing another bug with _Links)
+	 which caused Links listings to recurse rather infinitely.
+	
+	Bumped RC2 to RC3
+	
+2001-06-25 16:25  jesse
+
+	* webrt/Admin/Elements/SelectRights:
+
+	Fix for a crashing bug when editing ACLs without permission
+	
+2001-06-25 12:19  jesse
+
+	* Makefile, lib/RT/Ticket.pm:
+
+	Fixed bug in Ticket.pm -> _Links that caused it to return an error
+	rather than an empty links object if permission denied.
+	
+	Bumped version to RC2
+	
+2001-06-23 02:48  jesse
+
+	* Makefile, README, tools/import-1.0-to-2.0:
+
+	removed 1.0-2.0 importer. (it's now in the contrib archive)
+	updated readme and makefile to know about the change.
+	
+	Bumped the version to 2.0.0-RC1. Yeah. That's right. the major version
+	number just got incremented.
+	
+2001-06-22 14:50  jesse
+
+	* Makefile, lib/RT/Ticket.pm:
+
+	hopefully a fix for everyone's favorite import bug.
+	
+2001-06-20 23:56  jesse
+
+	* webrt/Search/Bulk.html:
+
+	Display cleanups to Bulk.html.
+	Removed bogus nav items
+	
+2001-06-20 17:33  jesse
+
+	* NEWS, lib/Makefile.PL:
+
+	Removed the out of date NEWS file. It's been superceeded by the changelog
+	
+2001-06-20 17:27  jesse
+
+	* Makefile, README, lib/RT/Ticket.pm, lib/RT/User.pm,
+	lib/RT/Interface/Web.pm, tools/import-1.0-to-2.0, tools/testdeps,
+	webrt/Ticket/Display.html, webrt/Ticket/History.html:
+
+	Fixes for the import problems some folks have been seeing
+	Fixes for the Can't click on URL issues reported by mixo and Carl Potter.
+	Turned off some overly verbose debugging.
+	
+	Bumped the version to 1.3.105
+	
+2001-06-19 00:34  jesse
+
+	* Makefile:
+
+	Bumped version to 1.3.104
+	
+2001-06-19 00:25  jesse
+
+	* lib/RT/Tickets.pm:
+
+	A fix for search based on keywords that don't exist. (Some rows would be lost, due to poorly constructed SELECT statements.  This change requires DBIx::SearchBuilder 0.39
+	
+2001-06-18 15:39  jesse
+
+	* Makefile, README, webrt/Ticket/Elements/ShowTransaction:
+
+	Updated README to note new RT2 Errata list
+	Bumped version to 1.3.103
+	Added comments in ShowTransaction to let you see exact transaction / ticket Ids
+	if you view source.
+	
+2001-06-18 15:32  jesse
+
+	* bin/rt:
+
+	Better fomating for cli queue listing.
+	
+2001-06-17 16:45  jesse
+
+	* lib/RT/: Transaction.pm, User.pm:
+
+	Added PurgeTransaction datatype for Transactions.
+	
+	Removed debugging code from User.pm
+	
+2001-06-17 14:36  jesse
+
+	* webrt/Ticket/Elements/Tabs:
+
+	Fix for webui error when displaying next/prev tabs on new tix.
+	
+2001-06-15 22:23  jesse
+
+	* Makefile, README:
+
+	Bumped the version to a private pre-test 1.3.103
+	
+2001-06-15 22:19  jesse
+
+	* README, lib/RT/Ticket.pm, lib/RT/User.pm:
+
+	Debugging fixes for import oddness folks are having
+	
+2001-06-15 01:13  jesse
+
+	* webrt/Search/Bulk.html:
+
+	removed debugging output from bulk.html
+	
+2001-06-14 15:53  jesse
+
+	* Makefile, lib/RT/Transactions.pm,
+	webrt/Ticket/Elements/AddWatchers:
+
+	Installation path of man pages is now configurable
+	By default Transactions should now be ordered by date, no matter what their id sequence is.
+	Fixed an html typo in Tickets/Elements/AddWatchers
+	
+	Bumped version to 1.3.102
+	
+2001-06-14 03:21  jesse
+
+	* Makefile:
+
+	Bumped the version to 1.3.101
+	
+2001-06-14 02:47  jesse
+
+	* lib/RT/Ticket.pm, lib/RT/Interface/Web.pm, webrt/Elements/Tabs,
+	webrt/Ticket/Elements/Tabs:
+
+	Comments in Ticket.pm about less than optimal design
+	Enhancments to Interface/Web for the bulk ticket manipulation tool.
+	Search navigation was cleaned up a bunch.
+	
+2001-06-14 01:52  jesse
+
+	* webrt/Search/Bulk.html:
+
+	file Bulk.html was initially added on branch rt-1-1.
+	
+2001-06-14 01:52  jesse
+
+	* webrt/Search/: BuildSearch, Bulk.html, Listing.html, QueueFooter,
+	QueueHeader, QueueItem:
+
+	Be vewwy vewwy quiet. I'm hunting cweeping features.
+	Like the brand new Bulk Ticket manipulator
+	
+	Removed some cruft from the repository. (unused files from tobix' first
+	search implementation)
+	
+2001-06-13 03:53  jesse
+
+	* Makefile:
+
+	Bumped version to 1.3.100
+	
+2001-06-13 03:52  jesse
+
+	* bin/mason_handler.fcgi:
+
+	The fastcgi handler works for everything except attachment viewing.  I'm going to have to think a bit about how to set
+	content type properly in a nice handler-agnostic manner.
+	
+2001-06-13 03:51  jesse
+
+	* bin/rt-mailgate:
+
+	Fixed a warn -> warning in mailgate's logging
+	
+2001-06-13 03:50  jesse
+
+	* lib/RT/Interface/Web.pm:
+
+	Adjusting spacing
+	
+2001-06-13 03:50  jesse
+
+	* webrt/Ticket/Elements/Tabs:
+
+	
+	Added an error check to the new navigation bars to deal with a possible lack of active search
+	
+2001-06-12 21:28  jesse
+
+	* etc/config.pm:
+
+	Clarified required permissions for the RT Logdir
+	
+2001-06-12 19:12  jesse
+
+	* etc/config.pm, lib/RT/Queue.pm, lib/RT/Transaction.pm:
+
+	Cleaned up some docs in config.pm and Queue.pm
+	Updated the Transaction Descriptions in transaction.pm to make sure
+	that the Actor is listed.
+	
+2001-06-12 18:08  jesse
+
+	* webrt/Ticket/Elements/Tabs:
+
+	Added links to navigate within an existing search.
+	
+2001-06-08 23:57  jesse
+
+	* webrt/Ticket/Elements/EditKeywordSelects:
+
+	Made "(empty)" the same between "EditKeywordSelects" and "SearchByKeywordSelect"
+	
+2001-06-08 23:51  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Ability to set owner by name when creating tickets.
+	Ability to set timeleft when creating tickets
+	
+2001-06-08 23:00  jesse
+
+	* Makefile, README, etc/schema.Pg, lib/RT/Ticket.pm:
+
+	Added an index to etc/schema.Pg
+	Ticket.pm->Create now passes through a few more values that were missing.
+	
+	Added doc on imports w/ postgres to the readme.
+	
+	bumped the version to 1.3.99
+	
+2001-06-08 18:32  jesse
+
+	* Makefile, tools/import-1.0-to-2.0:
+
+	Fix for merging more than one ticket.
+	Fix for req2rt which imported transactions in reverse order.
+	
+2001-06-07 16:02  jesse
+
+	* Makefile, lib/RT/Queue.pm, tools/import-1.0-to-2.0:
+
+	Catch a possibly undefined value in Queue::AddWatcher
+	Bumped verion to 1.3.97
+	another attempt at fixing the owner change generation code in import.
+	
+2001-06-07 14:59  jesse
+
+	* tools/import-1.0-to-2.0:
+
+	The importer now imports the root user and the general queue.
+	
+2001-06-07 12:44  jesse
+
+	* Makefile, etc/config.pm, lib/RT/Interface/Web.pm:
+
+	Support for a seperate local component root for local WebRT mods and additions.
+	
+2001-06-06 17:25  jesse
+
+	* README:
+
+	Added instructions for migrating  1.0 instances to 2.0
+	
+2001-06-06 16:15  jesse
+
+	* Makefile:
+
+	Bumped version to 1.3.95
+	
+2001-06-06 16:15  jesse
+
+	* tools/import-1.0-to-2.0:
+
+	Importer should now import tickets created by the req importer
+	
+2001-06-06 16:12  jesse
+
+	* bin/initacls.Pg:
+
+	initacls.Pg should now handle pg database on remote machine
+	
+2001-06-06 16:05  jesse
+
+	* webrt/Ticket/Elements/ShowRequestor:
+
+	Don't show the 'About this Requestor' box if the user is privileged.
+	
+2001-06-06 15:37  jesse
+
+	* lib/RT/Date.pm:
+
+	Now date comparisons against never dtrt.
+	
+2001-06-06 15:30  jesse
+
+	* lib/RT/Interface/Web.pm:
+
+	Search by content now works on the web
+	
+2001-06-06 14:22  jesse
+
+	* webrt/Admin/Groups/Members.html:
+
+	Fix for #552: spurious warning when going into group membership editor
+	
+2001-06-06 14:14  jesse
+
+	* webrt/Ticket/Elements/EditKeywordSelects:
+
+	keywordSelect selction fix (fsck #555)
+	
+2001-06-06 10:57  jesse
+
+	* Makefile, tools/import-1.0-to-2.0:
+
+	Removed spurious 'u' from line 1 of importer.
+	bumped version to 1.3.95-test2
+	
+2001-06-06 09:39  jesse
+
+	* Makefile, tools/import-1.0-to-2.0:
+
+	Possible fix for jens' user import troubles.
+	bounced version to 1.3.95-test1
+	
+2001-06-06 02:12  jesse
+
+	* Makefile, tools/import-1.0-to-2.0:
+
+	Importer wasn't properly grabbing ACLs. Bumped version to 1.3.94
+	
+2001-06-06 01:33  jesse
+
+	* tools/import-1.0-to-2.0:
+
+	Fixed a bug in the 'Make users superusers' code in the importer
+	
+2001-06-06 00:41  jesse
+
+	* lib/RT/Ticket.pm:
+
+	fixed a missing =cut (end of perldoc in ticket.pm
+	
+2001-06-06 00:40  jesse
+
+	* Makefile, tools/import-1.0-to-2.0:
+
+	fixing a typo in importer's mime parser
+	
+2001-06-06 00:19  jesse
+
+	* Makefile, lib/Makefile.PL, lib/RT/Action/Notify.pm,
+	lib/RT/Action/SendEmail.pm, tools/testdeps:
+
+	Cleaned up some dependencies
+	RT should no longer send mail when there are no recipients. thanks to the nice folks at Sensarray.com for some good debugging.
+	
+2001-06-05 23:16  jesse
+
+	* Makefile, bin/webmux.pl, tools/import-1.0-to-2.0:
+
+	Fixed some bogus header parsing in import.
+	web mux now tries to chown files again. (christian's going to test it again ;)
+	Bumped to 1.3.91 for a release
+	
+2001-06-05 11:34  jesse
+
+	* webrt/Admin/Users/Modify.html:
+
+	Rephrased the "Privileged" checkbox in AdminUsers.
+	
+2001-06-05 11:18  jesse
+
+	* Makefile, bin/webmux.pl, tools/import-1.0-to-2.0,
+	webrt/NoAuth/Logout.html:
+
+	webmux no longer tries to chown its data directories on startup
+	import now handles final_priority
+	Logout.html now refreshes to a login page
+	
+2001-06-05 10:42  jesse
+
+	* Makefile, tools/import-1.0-to-2.0:
+
+	When we added support for 'priority' transactions, we accidentally broke
+	support for 'subject' transactions.  fixed now.
+	
+2001-06-05 03:25  jesse
+
+	* Makefile, tools/import-1.0-to-2.0:
+
+	Import tool now handles priority changes.
+	
+2001-06-05 02:56  jesse
+
+	* Makefile, tools/import-1.0-to-2.0:
+
+	Minor tweak to importer to try even harder to find users in the database before creating new ones.
+	
+2001-06-05 02:32  jesse
+
+	* Makefile, tools/import-1.0-to-2.0:
+
+	importer is now less likely to try to greate nonexitent empty users.
+	
+	Makefile now chgrps web ui datafiles
+	
+2001-06-05 00:06  jesse
+
+	* Makefile, tools/import-1.0-to-2.0:
+
+	Removed out of date comments in the importer
+	Made the importer grab its libraries from the makefile. (Turned off testing code)
+	
+2001-06-05 00:01  jesse
+
+	* Makefile:
+
+	Bumped the version # to 1.3.84 for immediate release
+	
+2001-06-04 23:50  jesse
+
+	* Makefile, lib/RT/Ticket.pm, tools/import-1.0-to-2.0:
+
+	Cleanups to Ticket->Import
+	import-1.0-to-2.0 now deals with dates right.
+	
+2001-06-04 20:52  jesse
+
+	* lib/RT/Link.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
+	tools/import-1.0-to-2.0:
+
+	Cleanup to Ticket, Link and User.
+	
+	merge now works on import.
+	
+	most everything in import other than ticket dates should work now.
+	
+2001-06-04 01:34  jesse
+
+	* tools/import-1.0-to-2.0:
+
+	more cleanup
+	
+2001-06-04 00:03  jesse
+
+	* tools/import-1.0-to-2.0:
+
+	First cut at importing queue adminccs and acls
+	
+2001-06-03 22:16  jesse
+
+	* tools/import-1.0-to-2.0:
+
+	Cleanup and better progress indication
+	
+2001-06-03 13:33  jesse
+
+	* lib/RT/Record.pm, lib/RT/Ticket.pm, tools/import-1.0-to-2.0:
+
+	More work on the importer. now it gets transaction creators right and catches requestor email addreses.
+	
+2001-06-03 03:43  jesse
+
+	* lib/RT/Ticket.pm, lib/RT/Transaction.pm, tools/import-1.0-to-2.0:
+
+	Transaction.pm now allows the caller to turn off scrips (for import)
+	Ticket.pm now has a mostly working import method.
+	import-1.0-to-2.0 seems to have some basic functionality.  it's not _working_ yet, but it
+	will do most of what we want it to.
+	
+2001-06-02 20:36  jesse
+
+	* webrt/Ticket/Display.html:
+
+	Fix for Ticket #537 Crash when creating ticket without permission to view ticket
+	
+2001-06-02 14:22  jesse
+
+	* tools/import-1.0-to-2.0:
+
+	added a couple of todos to the import tool
+	
+2001-06-02 14:14  jesse
+
+	* Makefile, tools/import-1.0-to-2.0:
+
+	Work on the importer. it now runs.  (note that it probably won't yet _import_ anything)
+	
+2001-06-02 12:58  jesse
+
+	* Makefile, bin/webmux.pl, lib/RT/Ticket.pm, lib/RT/Transaction.pm:
+
+	Bumped the version to 1.3.84
+	
+	Once again chown mason data directory in webmux.pl, this time
+	using more reliable, dynamic userids, rather than compiled in defaults.
+	
+	Added an 'import' method to Ticket, for the RT1 importer.
+	
+	Added a Subject method to transaction, to simplify the lives of template authors
+	
+2001-06-01 23:38  jesse
+
+	* tools/: import-1.0-to-2.0, insertdata:
+
+	Cleaned up some names and descriptions in insertdata
+	
+	First checkin of outline of code of import tool. It's never been run.
+	It's incomplete.
+	
+2001-06-01 23:38  jesse
+
+	* tools/import-1.0-to-2.0:
+
+	file import-1.0-to-2.0 was initially added on branch rt-1-1.
+	
+2001-05-31 23:27  jesse
+
+	* lib/RT/Tickets.pm:
+
+	Cleaned up Tickets->LimitQueue a bit
+	
+2001-05-31 21:22  jesse
+
+	* Makefile, tools/testdeps:
+
+	Fixed testdeps to use new searchbuilder. bumped version to 1.3.83
+	
+2001-05-31 21:14  jesse
+
+	* lib/RT/Tickets.pm, lib/RT/Interface/Web.pm,
+	webrt/Elements/SelectKeyword:
+
+	Logic fixes for keyword select negation
+	
+2001-05-31 20:30  jesse
+
+	* lib/RT/Tickets.pm, lib/RT/Interface/Web.pm,
+	webrt/Elements/SelectKeyword:
+
+	Added support for "Tickets without keyword 'foo'.
+	
+2001-05-31 17:32  jesse
+
+	* bin/webmux.pl, lib/RT/Interface/Web.pm,
+	webrt/Ticket/Attachment/dhandler:
+
+	Fix for #522: attachments without names got short shrift.
+	webRT now dies rather than run when users can't log in due to a permissions
+	bug.
+	
+2001-05-31 02:57  jesse
+
+	* etc/: schema.Pg, schema.mysql:
+
+	Cleaned up the table indices a bit. for mysql, yanked duplicate indices.
+	for Pg, added an index (we need to regen the schema for pg soon)
+	
+2001-05-31 02:46  jesse
+
+	* Makefile, lib/RT/Interface/Web.pm, webrt/Ticket/ModifyAll.html,
+	webrt/Ticket/ModifyPeople.html, webrt/Ticket/Elements/AddWatchers,
+	webrt/Ticket/Elements/EditPeople:
+
+	You can now add watchers by email address
+	Bumped version to 1.3.82
+	
+2001-05-29 15:58  jesse
+
+	* webrt/Ticket/Attachment/dhandler:
+
+	Fixed the attachments display bug.
+	
+2001-05-29 15:48  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Fix for #513 - status update without permissions returns no error message
+	
+2001-05-29 00:38  jesse
+
+	* Makefile:
+
+	Bumped version to 1.3.81
+	
+2001-05-28 20:39  jesse
+
+	* bin/webmux.pl:
+
+	Removed a bogus line from webmux
+	
+2001-05-28 20:29  jesse
+
+	* lib/RT/: Ticket.pm, Interface/Web.pm:
+
+	Work to solve 325: updating detritus in update listing
+	
+2001-05-28 17:35  jesse
+
+	* bin/rt, etc/schema.mysql, etc/schema.pm, lib/RT/Ticket.pm,
+	lib/RT/Interface/CLI.pm, webrt/Ticket/Attachment/dhandler:
+
+	Work on the CLI to resolve #482.  Can't add content when creating tix with the CLI
+	Do a bunch of better error checking on ticket creation.
+	
+	Generalized the ticket status checking code.
+	
+	Added another index on Attachments for increased speed.
+	
+2001-05-28 15:49  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Removed code which auto-opened tickets that were new.  It should
+	be a scrip and it's too late in teh release cycle to do this right now.
+	
+2001-05-28 15:24  jesse
+
+	* webrt/SelfService/: Details.html, Elements/MyRequests:
+
+	Fixed #506. Non-priv user can't see tickets
+	
+2001-05-23 23:53  jesse
+
+	* webrt/SelfService/Elements/MyRequests:
+
+	Fixed MyRequest so it shows your tickets.
+	
+2001-05-23 23:18  jesse
+
+	* Makefile:
+
+	Bumped the version to 1.3.80
+	
+2001-05-23 23:01  jesse
+
+	* bin/webmux.pl, docs/manual.pod, webrt/Elements/MyRequests,
+	webrt/Elements/MyTickets, webrt/NoAuth/Logout.html,
+	webrt/Ticket/ModifyAll.html:
+
+	Fixed logout bug from 1.3.79 http://fsck.com/rt2/Ticket/Display.html?id=500
+	Fixed bug in jumbo from 1.3.79 http://fsck.com/rt2/Ticket/Display.html?id=496
+	Added a bit of docs about templates to the manual
+	
+	Cleaned up the ui for MyRequests and MyTickets a bit.
+	
+2001-05-23 12:34  jesse
+
+	* webrt/SelfService/: Prefs.html, index.html:
+
+	Little bit of cleanup to SelfService. added prefs.
+	
+2001-05-23 12:34  jesse
+
+	* webrt/SelfService/Prefs.html:
+
+	file Prefs.html was initially added on branch rt-1-1.
+	
+2001-05-23 12:07  jesse
+
+	* Makefile:
+
+	Bumped version to 1.3.79.
+	
+2001-05-23 12:06  jesse
+
+	* README, tools/testdeps:
+
+	Added dependecy on DBIx::SearchBuilder 0.34
+	
+2001-05-23 11:43  jesse
+
+	* bin/: rt-mailgate, webmux.pl:
+
+	Made sure that the webui always writes sessions to disk
+	Fixed a typo in the mail gateway.
+	
+2001-05-23 00:09  jesse
+
+	* Makefile, bin/rt-mailgate:
+
+	Added a bit of code to rt-mailgate to deal with not properly loading users on
+	ticket creation.
+	
+2001-05-22 23:01  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Within Ticket->Create, always get a Queue object as SystemUser for like, defaults and stuff.
+	
+2001-05-21 18:12  jesse
+
+	* etc/config.pm:
+
+	Added comments from Feargal about how to configure RT for http urls.
+	
+2001-05-21 16:37  jesse
+
+	* Makefile:
+
+	bumped version to 1.3.78
+	
+2001-05-21 16:36  jesse
+
+	* lib/RT/Ticket.pm, webrt/Ticket/Display.html:
+
+	Tickets now open when they're new and get acted on.
+	
+2001-05-21 16:09  jesse
+
+	* lib/RT/Action/: Autoreply.pm, SendEmail.pm:
+
+	Fix for Ticket #481 $CorrespondAddress= variable in config.pm doesn't work
+	
+2001-05-21 15:54  jesse
+
+	* webrt/Elements/MessageBox:
+
+	Added a space at teh end of the line, per the standard convention for signature
+	dashes.
+	
+2001-05-21 15:54  jesse
+
+	* webrt/Elements/MessageBox:
+
+	If the user doesn't have a signature, don't include signature dashes
+	
+2001-05-21 15:17  jesse
+
+	* lib/RT/Tickets.pm, webrt/Ticket/ModifyAll.html:
+
+	Dead tickets aren't searchable via the ui anymore.
+	ModifyAll is a bit smarter about what to let people do.
+	
+2001-05-21 14:02  jesse
+
+	* lib/RT/Keyword.pm, webrt/Admin/Keywords/index.html:
+
+	Editing keywords without permission now actually tells you so.
+	
+2001-05-21 13:32  jesse
+
+	* webrt/Admin/: Global/Scrips.html, Queues/Scrips.html:
+
+	Users without permission to delete scrips now get a proper permission denied.
+	
+2001-05-21 13:20  jesse
+
+	* webrt/Ticket/: Update.html, Elements/Tabs:
+
+	The ticket update form is now a little smarter about only letting people perform
+	updates that they have the right to perform.
+	
+2001-05-17 23:09  jesse
+
+	* Makefile:
+
+	Chmod the makefile in the make dist procedure.
+	
+2001-05-17 23:05  jesse
+
+	* README:
+
+	Cleaned up some instructions. Thanks Feargal.
+	
+2001-05-17 22:50  jesse
+
+	* Makefile, lib/RT/Transaction.pm, lib/RT/Action/SendEmail.pm,
+	tools/insertdata:
+
+	Fixed scrip actions to activate when there's a missing scripcontent.
+	
+	Added a Content method to Transaction.pm
+	Fixed Tempates to use new Content method.
+	
+2001-05-17 16:19  jesse
+
+	* lib/RT/Transaction.pm, lib/RT/Action/SendEmail.pm,
+	webrt/Ticket/Display.html, webrt/Ticket/Update.html:
+
+	Better debugging info for some scrips.
+	
+	Fixed bugs which prevented status and owner to change on correspondence
+	and comment.
+	
+2001-05-17 12:36  jesse
+
+	* Makefile, README:
+
+	Bumped the version. Added Mark Vevers to the thansk in the readme.
+	
+2001-05-17 12:34  jesse
+
+	* lib/RT/Interface/Web.pm:
+
+	Removed some obsolete code. fixed a bug in Comment recording from Mark Vevers
+	
+2001-05-16 18:51  jesse
+
+	* Makefile, tools/testdeps:
+
+	Fixed testdeps to not install bogus new DBD::mysql rev.
+	Bumped rev to 1.3.75
+	
+2001-05-16 17:30  jesse
+
+	* Makefile:
+
+	bumped to 1.3.74
+	
+2001-05-16 17:30  jesse
+
+	* webrt/Admin/Groups/Modify.html:
+
+	Fixed a small bug in Groups editing
+	
+2001-05-16 17:21  jesse
+
+	* tools/testdeps:
+
+	Bumped version to 1.3.73.
+	Bumped dependency on searchbuilder to 0.33
+	
+2001-05-16 17:15  jesse
+
+	* webrt/: Elements/TitleBoxStart, Ticket/Update.html,
+	Ticket/Elements/Tabs:
+
+	The quick link for 'Resolve' now requests that the user enter a ticket update
+	
+2001-05-16 15:45  jesse
+
+	* README, lib/RT/Interface/Web.pm, tools/testdeps,
+	webrt/Ticket/Display.html:
+
+	Added some documentation about what to do if the install fails.
+	
+	Specified a minimum working version of DBD::mysql.
+	
+	Fixed support for entering updates via the webui.
+	
+2001-05-15 00:55  jesse
+
+	* lib/RT/Action/Autoreply.pm:
+
+	Fixed a typo that broke autoreplies
+	
+2001-05-15 00:37  jesse
+
+	* tools/testdeps:
+
+	added Errno dependency
+	
+2001-05-14 23:44  jesse
+
+	* etc/config.pm, tools/insertdata, webrt/Admin/Queues/People.html:
+
+	Cleaned up a bit of phrasing. cleaned up some extra /s in urls.
+	
+2001-05-14 22:49  jesse
+
+	* Makefile, bin/mason_handler.fcgi, bin/mason_handler.scgi, bin/rt,
+	bin/webmux.pl, lib/Makefile.PL, lib/RT/Date.pm,
+	lib/RT/Interface/Web.pm, tools/testdeps:
+
+	Switched from Date::Manip To Graham Barr's Date::Parse
+	
+2001-05-14 18:58  jesse
+
+	* lib/RT/Scrips.pm, lib/RT/Ticket.pm, lib/RT/Interface/Web.pm,
+	webrt/Ticket/Display.html, webrt/Ticket/Elements/Tabs:
+
+	Work on the web frontend. the "quick" links have been cleaned up and decomplexified.
+	
+2001-05-14 17:11  jesse
+
+	* lib/RT/User.pm, lib/RT/Interface/Web.pm,
+	webrt/Admin/Groups/Modify.html, webrt/Admin/Users/Modify.html:
+
+	Cleaned up bugs related to spurious extra display of information in user and group modification and ACL deletion
+	when the user didn't have the right to do so.
+	
+2001-05-13 23:05  jesse
+
+	* webrt/Admin/Users/index.html:
+
+	no longer provide a link to create a new user to someone who doesn't have rights to do so.
+	
+2001-05-13 22:49  jesse
+
+	* lib/RT/Ticket.pm, tools/insertdata, webrt/Ticket/Modify.html:
+
+	yanked bogus Ticket Queue caching
+	rephrased ticket creation autoreply
+	
+2001-05-13 22:15  jesse
+
+	* webrt/User/Prefs.html:
+
+	Added a hack to make sure that session gets written to disk
+	
+2001-05-13 22:11  jesse
+
+	* webrt/User/Prefs.html:
+
+	more work on letting users edit their own passwords
+	
+2001-05-13 21:40  jesse
+
+	* webrt/Ticket/: Attachment/dhandler, Elements/ShowTransaction:
+
+	Fix for #433. now attachements are displayable after merges.
+	
+2001-05-12 17:46  jesse
+
+	* Makefile, lib/Makefile.PL, tools/testdeps, webrt/User/Prefs.html:
+
+	Started work on user prefs. password changing is untested
+	
+	Fixed dependency on SB to .31 and bumped version
+	
+2001-05-11 12:32  jesse
+
+	* lib/RT/Record.pm:
+
+	turned on use of DBIx::SearchBuilder::Record::Cachable
+	
+2001-05-11 12:30  jesse
+
+	* lib/RT/User.pm, webrt/Elements/Quicksearch:
+
+	Redid how the ACL checking works for great perf gains.
+	Added stalled lists to quicksearch.
+	
+2001-05-09 20:11  jesse
+
+	* Makefile:
+
+	Bumping the version # so people working off cvs get less confused.
+	
+2001-05-09 20:11  jesse
+
+	* bin/rt-mailgate, lib/RT/Queue.pm, lib/RT/Action/Autoreply.pm,
+	lib/RT/Action/Notify.pm, lib/RT/Action/NotifyAsComment.pm,
+	lib/RT/Action/SendEmail.pm:
+
+	Cleanup in the mail sending stuff.
+		fix for ticket 403:  RT should no longer send mail when it has
+		no recipients
+	
+		fix for #404: Squelch-Replies-To should be a bit more intelligent,
+		since it was rewritten from scratch
+	
+		RT should now properly send mail to queue ccs and queue admin ccs
+		when you ask it to
+	
+		internally, RT's mail sending stuff now lets you pass around
+		arrays of addresses to send mail to, rather than comma delimited
+		strings. More flexible down the line.
+	
+2001-05-09 16:39  jesse
+
+	* README:
+
+	Updated the readme to note the dependency on setuid perl
+	
+2001-05-09 16:08  jesse
+
+	* webrt/Ticket/Elements/ShowLinks:
+
+	fix for RT/fsck.com: Ticket #440 [rt-devel] 'Depended on by' doesn't work
+	
+2001-05-08 20:48  jesse
+
+	* etc/schema.mysql, etc/schema.pm, lib/RT/Ticket.pm,
+	lib/RT/Transaction.pm, webrt/Admin/Elements/UserTabs,
+	webrt/Admin/Queues/People.html, webrt/Elements/MyRequests,
+	webrt/Elements/MyTickets, webrt/Elements/Tabs,
+	webrt/Ticket/Elements/ShowBasics,
+	webrt/Ticket/Elements/ShowRequestor:
+
+	Schema.pm now has a few more indices. the mysql schema has been regenerated, but not
+	the Pg or oracle schemas.
+	
+	in Ticket.pm, a message got the queue id replaced with the queue name
+	
+	removed a spurious variable localization in Transaction.pm
+	
+	Removed a pointer to a nonexistent page  on admin/user/modify
+	
+	Modifying queue watchers now has a more coherent title
+	
+	"This user's tickets, My requests and My tickets are now limited to the 25 highest priority items
+	attached to you.
+	
+	The "Administration" tab has been changed to the "Configuration" tab
+	
+2001-04-04 16:55  jesse
+
+	* lib/RT/Interface/Web.pm:
+
+	Fixing a comment in the web interface. no functional changes.
+	
+2001-04-04 16:52  jesse
+
+	* Makefile:
+
+	
+	Bumping the version to 1.3.70 for release
+	
+2001-04-04 16:51  jesse
+
+	* lib/RT/User.pm:
+
+	lib/RT/User no longer treats "ModifySelf" as equivalent to "AdminUsers" for the current user.
+	
+2001-04-04 15:08  jesse
+
+	* lib/RT/KeywordSelect.pm, lib/RT/Action/Autoreply.pm,
+	webrt/Admin/Global/Keywords.html, webrt/Admin/Queues/Keywords.html:
+
+	Fixed a crashing bug and an ACL violation on keywordselect deletion
+	
+2001-04-04 00:19  jesse
+
+	* Makefile:
+
+	bumping version for release
+	
+2001-04-03 21:14  jesse
+
+	* Makefile:
+
+	Bumped the version
+	
+2001-04-03 21:08  jesse
+
+	* etc/config.pm, lib/RT/Action/Notify.pm:
+
+	Added configuration tweak to not set a :; To header if the user doesn't want it.
+	
+2001-04-03 17:32  jesse
+
+	* lib/RT/Action/Notify.pm:
+
+	Fix for sendmail null list syntax.  : ;  is not the same as :; to sendmail
+	
+2001-04-03 17:05  jesse
+
+	* webrt/Admin/Queues/: GroupRights.html, UserRights.html:
+
+	removed a couple of stray 's in the html
+	
+2001-04-03 16:50  jesse
+
+	* webrt/Elements/Header:
+
+	Dropped doctype back to 4.0 because 4.01 makes mozilla render things funny
+	
+2001-04-03 16:47  jesse
+
+	* webrt/Elements/Quicksearch:
+
+	<TABLE>
+	should have been </TABLE>
+	
+2001-04-03 16:30  jesse
+
+	* webrt/Elements/Quicksearch:
+
+	Added a feature request/patch from nick@netability.ie
+	http://fsck.com/rt2/Ticket/Display.html?id=345
+	
+2001-04-03 16:01  jesse
+
+	* tools/testdeps:
+
+	Adding in testing for params::validate 0.02
+	
+2001-04-03 15:46  jesse
+
+	* Makefile:
+
+	Bumped the version slightly for a prerelease
+	
+2001-04-03 15:40  jesse
+
+	* lib/RT/Action/Autoreply.pm, lib/RT/Action/SendEmail.pm,
+	tools/insertdata:
+
+	Fixed autoreply by adding a new scrip. some misc. cleanup in SendEmail (method calls were on the wrong object)
+	
+2001-04-03 15:40  jesse
+
+	* lib/RT/Action/Autoreply.pm:
+
+	file Autoreply.pm was initially added on branch rt-1-1.
+	
+2001-04-03 15:15  jesse
+
+	* lib/RT/Action/SendEmail.pm:
+
+	Fixed a bug in the 'blacklist' regexp
+	
+2001-04-03 15:04  jesse
+
+	* etc/config.pm, lib/RT/Action/SendEmail.pm,
+	lib/RT/Interface/Web.pm, webrt/Ticket/Elements/ShowRequestor:
+
+	Two seperate fixes for the "RT doesn't send mail" problem. One that helps fix Mail::Internet->send
+	and one that provides an alternative.
+	
+	A fix for a bad link in ShowRequestor.
+	
+	Updating fields via the web ui should now be a bit more descriptive
+	
+2001-04-03 02:31  jesse
+
+	* webrt/Ticket/ModifyPeople.html:
+
+	Missed one of the mason fixes
+	
+2001-04-03 02:31  jesse
+
+	* Makefile, bin/rt-mailgate, etc/config.pm, lib/RT/Date.pm,
+	lib/RT/Ticket.pm, lib/RT/Transaction.pm, lib/RT/Watcher.pm,
+	lib/RT/Interface/Web.pm, webrt/Admin/Global/GroupRights.html,
+	webrt/Admin/Global/Keywords.html, webrt/Admin/Global/Scrips.html,
+	webrt/Admin/Global/UserRights.html,
+	webrt/Admin/Keywords/index.html,
+	webrt/Admin/Queues/GroupRights.html,
+	webrt/Admin/Queues/Keywords.html, webrt/Admin/Queues/People.html,
+	webrt/Admin/Queues/Scrips.html, webrt/Admin/Queues/UserRights.html,
+	webrt/Ticket/Modify.html, webrt/Ticket/ModifyAll.html,
+	webrt/Ticket/ModifyDates.html, webrt/Ticket/ModifyPeople.html:
+
+	Added support for parsing Cc and To in the mail gateway
+	(resolves the last work item for beta 2 - #219)
+	
+	Ticket due date is no longer set to "right now" if the queue has an
+	undefined "default due in"
+	
+	Cleanup warnings in date, ticket and watcher
+	
+	fixes for a bunch of mason 1.01 related bugs (Mason changed handling of combined GET and POST, thus breaking RT)
+	
+2001-04-02 23:15  jesse
+
+	* README, bin/webmux.pl:
+
+	Cleanup for mason 1.01.
+	Moved Apache::DBI out of the webmux into the instructions
+	
+2001-04-02 17:56  jesse
+
+	* tools/initdb:
+
+	Typo fix from  "Nick Hilliard" <nick@netability.ie>
+	
+2001-04-02 15:32  jesse
+
+	* Makefile, lib/RT/Keyword.pm, webrt/NoAuth/Logout.html:
+
+	Makefile cleanup.
+	Fix for #342 - reported by ivan
+	
+	Fix for a bug that clobbered logouts.
+	
+2001-04-02 03:09  jesse
+
+	* Makefile:
+
+	Bumped version for release
+	
+2001-04-01 19:19  jesse
+
+	* bin/rtadmin, lib/RT/ACE.pm, lib/RT/Interface/Web.pm,
+	webrt/Admin/Elements/SelectRights,
+	webrt/Admin/Global/GroupRights.html,
+	webrt/Admin/Global/UserRights.html,
+	webrt/Admin/Queues/GroupRights.html,
+	webrt/Admin/Queues/UserRights.html:
+
+	Redid the ACL editor so that it's much much faster. and easier to use...if not quite as pretty.
+	
+2001-04-01 17:31  jesse
+
+	* webrt/Ticket/Elements/: ShowDates, ShowRequestor:
+
+	fixing a couple of html typos
+	
+2001-03-31 03:07  jesse
+
+	* Makefile:
+
+	fixing Changelog generation
+	
+2001-03-31 02:52  jesse
+
+	* Makefile:
+
+	Bumped the version.
+	
+2001-03-31 02:52  jesse
+
+	* webrt/User/Prefs.html:
+
+	Cleaned up user preferences somewhat. removed things that don't do anything.
+	
+		-j
+	
+2001-03-31 01:59  jesse
+
+	* bin/rt:
+
+	Fix for #88   RT now lets you use the CLI to search for tickets, based on links to other tickets
+	
+2001-03-31 01:20  jesse
+
+	* README:
+
+	Fix for #216: Web session files need better handling and cleanup
+	
+2001-03-31 00:49  jesse
+
+	* Makefile, README, bin/rtadmin, bin/webmux.pl, etc/config.pm:
+
+	Moved RT Session data out of /tmp to somewhere that makes more sense.
+	This is the first half of the fix for #216.  Now we just need to document the cronjob reaper to kill old sessions
+	
+	Cleaned up creation of queues and users in bin/rtadmin
+	
+	Updates to the README
+	
+2001-03-30 23:44  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Fix for http://fsck.com/rt2/Ticket/Display.html?id=324
+	mail from requestors does not reopen ticket
+	
+2001-03-30 23:19  jesse
+
+	* bin/rtadmin, lib/RT/Queue.pm, lib/RT/Watcher.pm:
+
+	Work on Watchers and editing watchers from the CLI tool.  added support for --list-{queues|users|groups}
+	
+2001-03-30 19:31  jesse
+
+	* bin/rt, lib/RT/ACE.pm, lib/RT/Queue.pm, lib/RT/Ticket.pm,
+	lib/RT/Tickets.pm, lib/RT/Watcher.pm, lib/RT/Action/SendEmail.pm,
+	lib/RT/Interface/Web.pm:
+
+	A bunch of reworking of access control for watchers. should be much more robust
+	and more flexible.
+	
+	Resolves http://fsck.com/rt2/Ticket/Display.html?id=253 by adding the "Watch" and "WatchAsAdminCc" rights.
+	
+2001-03-30 15:41  jesse
+
+	* lib/RT/: Action/Notify.pm, Interface/Web.pm:
+
+	Tiny cleanup in Interface/Web.pm.  no functional difference there just being more explicit.
+	
+	Fix for #292: Sender of a message is no longer notified of that message.
+	
+2001-03-30 02:55  jesse
+
+	* Makefile:
+
+	Bumped the version
+	
+2001-03-30 02:37  jesse
+
+	* webrt/Elements/SelectDate:
+
+	Fixed an as-yet-untickled bug in SelectDate that incremented things too much
+	
+2001-03-30 02:32  jesse
+
+	* lib/RT/Template.pm, webrt/Admin/Global/Scrips.html:
+
+	Fixes to template creation. stupid typo.
+	Global scrips creation should now work better
+	
+2001-03-30 02:12  jesse
+
+	* webrt/: Admin/Elements/GroupTabs, Admin/Groups/Members.html,
+	Admin/Groups/Modify.html, Admin/Users/Modify.html,
+	Elements/ListActions:
+
+	Fix for PseudoGroups having a prompt to add members.
+	some cleanups to not make the "Results" box pop up when it's not wanted.
+	
+2001-03-30 01:41  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Attached is a patch to implement the ShowTicketComments in the
+	display of transactions of a ticket.
+	
+			Arthur de Jong <arthur@West.NL>
+	
+2001-03-30 01:34  jesse
+
+	* lib/RT/Scrip.pm, webrt/Admin/Global/Scrips.html,
+	webrt/Admin/Queues/Scrips.html:
+
+	Fix for 328: Re: [rt-users] 1.3.64 & postgres & scrips
+	there was an ACL bug.
+	
+2001-03-28 22:15  jesse
+
+	* Makefile, webrt/autohandler:
+
+	Fixed a tiny bug in the new authandler that caused logout to fail
+	
+2001-03-27 22:30  jesse
+
+	* webrt/index.html:
+
+	fixed index.html
+	
+2001-03-27 22:26  jesse
+
+	* Makefile, webrt/Admin/Groups/Members.html,
+	webrt/Ticket/Update.html:
+
+	Added a couple of fixes from Arthur at west.nl
+	Groups/Members deals better with multiple selections
+	Ticket/Update now displays queue watchers.
+	bumped the version to 1.3.63
+	
+2001-03-27 04:25  jesse
+
+	* docs/manual.pod, webrt/autohandler, webrt/index.html,
+	webrt/Admin/Users/index.html, webrt/Elements/ShadedBox,
+	webrt/Search/Listing.html:
+
+	Lots of cleanup of the auothandler.
+	a tiny bit of doc about an alternative apache configuration.
+	some web ui cleanup so that when you are on a page, your location is more properly hilighted.
+	admin/users includes some more verbiage explaining what's going on.
+	
+2001-03-25 00:44  jesse
+
+	* Makefile, lib/RT/Interface/Web.pm:
+
+	Bumped the version.
+	cosmetic fix in Interface/Web.pm
+	
+2001-03-23 20:33  jesse
+
+	* lib/RT/: Action/SendEmail.pm, Interface/Web.pm:
+
+	Fixed for TEXTAREA newline bug and Correspondence subject bug.
+	
+2001-03-23 00:34  jesse
+
+	* lib/RT/Action/Notify.pm:
+
+	: goes outside the '' in undisclosed recipients
+	
+2001-03-23 00:30  jesse
+
+	* lib/RT/: ACL.pm, ObjectKeywords.pm:
+
+	Removed some very loud uneccesary debugging statements
+	
+2001-03-23 00:27  jesse
+
+	* Makefile, lib/RT/Action/Notify.pm, lib/RT/Action/SendEmail.pm:
+
+	Work on mail sending routines to be more careful about newlines in subjects.
+	And about Undisclosed recipients
+	
+2001-03-22 23:17  jesse
+
+	* lib/RT/Action/Notify.pm:
+
+	yet another typo in notify.pm
+	
+2001-03-22 23:12  jesse
+
+	* lib/RT/Action/Notify.pm:
+
+	typo fix
+	
+2001-03-22 23:09  jesse
+
+	* lib/RT/Action/: Notify.pm, SendEmail.pm:
+
+	Cleanups and fixes to Notify and SendEmail
+	
+2001-03-22 19:46  jesse
+
+	* webrt/Ticket/ModifyAll.html:
+
+	TicketObj->Ticket
+	
+2001-03-22 19:42  jesse
+
+	* lib/RT/Action/Notify.pm:
+
+	A more functional Undisclosed Recipients;
+	
+2001-03-22 19:28  jesse
+
+	* webrt/Ticket/: ModifyAll.html, Elements/Tabs:
+
+	Elements/Tabs now does better access control checking before making
+	buttons available to people.
+	
+	ModifyAll.html has a better title and should now update objectkeywords.
+	
+2001-03-22 18:18  jesse
+
+	* lib/RT/: Date.pm, Ticket.pm:
+
+	Added  a routine to Date.pm to advance the date N days
+	
+	Started using queue defaults on Ticket->Create
+	
+2001-03-22 18:17  jesse
+
+	* webrt/: autohandler, Elements/Login, NoAuth/Login.html,
+	Search/autohandler, Ticket/autohandler:
+
+	Cleanup of the login process. now you can't accidentally call "Login.html"
+	when you're already logged in.
+	removed a couple of bogus old autohandlers
+	
+2001-03-22 18:17  jesse
+
+	* webrt/Elements/Login:
+
+	file Login was initially added on branch rt-1-1.
+	
+2001-03-22 14:45  jesse
+
+	* webrt/Ticket/Elements/EditPeople:
+
+	EditPeople should now enforce a list of possible owners reasonably
+	
+2001-03-21 21:40  jesse
+
+	* Makefile:
+
+	bumped the version to .60
+	
+2001-03-21 21:22  jesse
+
+	* docs/manual.pod:
+
+	Adding some content to the manual. and even more places where the manual is
+	missing content. :/
+	
+2001-03-21 12:21  jesse
+
+	* lib/RT/Action/NotifyAsComment.pm:
+
+	NotifyAsComment should now DTRT and send mail from the comments email address
+	
+2001-03-21 02:46  jesse
+
+	* Makefile:
+
+	yanked some cruft from the ChangeLog creator
+	
+2001-03-21 02:44  jesse
+
+	* Makefile, README:
+
+	Bumped the version. added some people to the readme
+	
+2001-03-21 02:39  jesse
+
+	* webrt/Ticket/Elements/ShowBasics:
+
+	Fix for 242: time left displayed via the web ui is now more intuitive
+	
+2001-03-21 02:37  jesse
+
+	* bin/rt, bin/rt-mailgate, lib/RT.pm, lib/RT/Attachment.pm,
+	lib/RT/Date.pm, lib/RT/Tickets.pm, lib/RT/User.pm:
+
+	Added more error checking and error handling to the mail gateway
+	finished code in Attachment.pm to handle too-long attachments
+	
+	added support for limiting by date to the CLI
+	
+	fixed little bugs in user, date and tickets.
+	
+2001-03-20 19:02  jesse
+
+	* docs/manual.pod:
+
+	file manual.pod was initially added on branch rt-1-1.
+	
+2001-03-20 19:02  jesse
+
+	* docs/manual.pod:
+
+	actually adding the outline of the manual
+	
+2001-03-20 19:01  jesse
+
+	* Makefile, bin/rt, docs/API, docs/README.docs, docs/Security,
+	docs/keywords, etc/config.pm:
+
+	Starting the doc cleanup
+	
+2001-03-20 15:26  jesse
+
+	* webrt/Elements/SelectTicketSortBy:
+
+	LastUpdated, not LastUpdate
+	
+2001-03-20 15:21  jesse
+
+	* webrt/Elements/: SelectDate, SelectTicketSortBy:
+
+	more things to sort by.
+	select date shouldn't insert spurious null dates.
+	
+2001-03-20 13:27  jesse
+
+	* lib/RT/Action/SendEmail.pm:
+
+	fixed a typo. $defined is not useful perl ;)
+	
+2001-03-20 13:21  jesse
+
+	* lib/RT/Action/: Notify.pm, SendEmail.pm:
+
+	Fixed a couple bugs in Notify and SendEmail that should get mail flowing
+	for transactions without content.
+	
+2001-03-20 13:08  jesse
+
+	* webrt/Ticket/: Attachment/dhandler, Elements/ShowTransaction:
+
+	Making web based attachment display deal nicely with too-long message bodies
+	
+2001-03-20 04:26  jesse
+
+	* Makefile:
+
+	bumping the version
+	
+2001-03-20 04:20  jesse
+
+	* lib/RT/Action/SendEmail.pm:
+
+	regexps with three /s need a leading s ;)
+	
+2001-03-20 04:16  jesse
+
+	* bin/rt-mailgate, lib/RT/Template.pm:
+
+	fixing scrips-related mailing stuff. some transaction mailing used to bomb out.
+	
+2001-03-20 02:46  jesse
+
+	* Makefile, bin/rt-mailgate, etc/config.pm,
+	lib/RT/Action/SendEmail.pm, tools/insertdata:
+
+	Work on robustification of the mail gateway. including single-transaction
+	blacklisting of addresses that might generate bounces.
+	
+2001-03-20 00:41  jesse
+
+	* lib/RT/User.pm:
+
+	Work on user.pm to allow users to be disabled.
+	
+2001-03-19 18:03  jesse
+
+	* webrt/: autohandler, Elements/MyRequests, NoAuth/Login.html,
+	NoAuth/Reminder.html:
+
+	fixed the MyRequests bug that caused them not to be listed.
+	nonexistent users no longer get shunted to SelfService.
+	
+2001-03-19 15:30  jesse
+
+	* Makefile, bin/mason_handler.fcgi, bin/mason_handler.scgi, bin/rt,
+	bin/rt-mailgate, bin/rtadmin, webrt/Admin/Elements/ModifyTemplate,
+	webrt/Admin/Elements/ModifyUser, webrt/Admin/Global/Template.html,
+	webrt/Admin/Queues/Template.html, webrt/Admin/Users/Modify.html,
+	webrt/Elements/MessageBox:
+
+	Fixes for perl path and textarea bugs noted by Arthur de Jong
+	
+2001-03-18 14:58  jesse
+
+	* lib/RT/Attachment.pm:
+
+	Removed an extra signature attachment
+	
+2001-03-17 14:57  jesse
+
+	* Makefile:
+
+	bumped version
+	
+2001-03-17 14:55  jesse
+
+	* lib/Makefile.PL, lib/RT/Tickets.pm, lib/RT/Interface/Web.pm,
+	webrt/Elements/Quicksearch, webrt/Elements/SelectDate,
+	webrt/Elements/SelectDateType, webrt/Elements/TitleBoxEnd,
+	webrt/Search/PickRestriction:
+
+	Fixed a bug on simple actions reported by christian.
+	Implemented search by date via web ui
+	
+2001-03-16 03:55  jesse
+
+	* Makefile, lib/RT/Interface/Web.pm, webrt/Elements/Header:
+
+	Fixed a tiny typo that prevented objectkeyword editing
+	
+2001-03-16 02:29  jesse
+
+	* Makefile:
+
+	Bumped the version.
+	
+2001-03-16 02:27  jesse
+
+	* Makefile, README, bin/initacls.Oracle, bin/initacls.Pg,
+	bin/initacls.mysql, bin/initdb.Oracle, tools/initdb:
+
+	some clarifications to the install procedure.
+	
+2001-03-16 02:10  jesse
+
+	* lib/RT/Tickets.pm, webrt/Search/Listing.html:
+
+	Fixed #2 WebRT doesn't refresh searches properly. the oldest bug in the bug tracking
+	system ;)
+	
+	Fixed Tickets->Count
+	
+2001-03-16 01:39  jesse
+
+	* webrt/Admin/: Global/Template.html, Global/Templates.html,
+	Queues/Modify.html, Queues/Template.html, Queues/Templates.html:
+
+	now you can create templates with the web ui.
+	
+2001-03-16 00:39  jesse
+
+	* webrt/Ticket/Elements/EditLinks:
+
+	file EditLinks was initially added on branch rt-1-1.
+	
+2001-03-16 00:39  jesse
+
+	* webrt/Ticket/ModifyAll.html:
+
+	file ModifyAll.html was initially added on branch rt-1-1.
+	
+2001-03-16 00:39  jesse
+
+	* lib/RT/Ticket.pm, lib/RT/Interface/Web.pm, webrt/Elements/Tabs,
+	webrt/Ticket/Modify.html, webrt/Ticket/ModifyAll.html,
+	webrt/Ticket/ModifyDates.html, webrt/Ticket/ModifyLinks.html,
+	webrt/Ticket/ModifyPeople.html, webrt/Ticket/ValidateUpdate.html,
+	webrt/Ticket/Elements/EditKeywordSelects,
+	webrt/Ticket/Elements/EditLinks, webrt/Ticket/Elements/EditPeople,
+	webrt/Ticket/Elements/Tabs:
+
+	A bunch of Ticket modification refactoring and cleanup.
+	Added a "ModifyAll" at sam hartman's suggestion
+	
+2001-03-14 21:20  jesse
+
+	* bin/rt:
+
+	--id=43-45 should now work. there was a regex typo
+	
+2001-03-14 04:37  jesse
+
+	* Makefile, bin/initacls.Oracle, etc/acl.Oracle, etc/acl.mysql,
+	etc/schema.Oracle, etc/user.Oracle, tools/initdb, tools/testdeps:
+
+	reworked init procedures, oracle schema and
+	acl setup for mysql and postgres and oracle.
+	
+	RT2 now runs on oracle.
+	
+2001-03-14 02:08  jesse
+
+	* etc/acl.Oracle, etc/schema.Oracle, tools/initdb:
+
+	hacking to make oracle work. we're much of the way there. next up:
+	schema updates
+	
+2001-03-14 02:08  jesse
+
+	* etc/acl.Oracle:
+
+	file acl.Oracle was initially added on branch rt-1-1.
+	
+2001-03-14 01:03  jesse
+
+	* webrt/Admin/Queues/GroupRights.html:
+
+	file GroupRights.html was initially added on branch rt-1-1.
+	
+2001-03-14 01:03  jesse
+
+	* webrt/Admin/Queues/UserRights.html:
+
+	file UserRights.html was initially added on branch rt-1-1.
+	
+2001-03-14 01:03  jesse
+
+	* Makefile, lib/RT/ACE.pm, lib/RT/Interface/Web.pm, tools/initdb,
+	webrt/Admin/Elements/QueueTabs,
+	webrt/Admin/Global/GroupRights.html, webrt/Admin/Queues/ACL.html,
+	webrt/Admin/Queues/GroupRights.html,
+	webrt/Admin/Queues/UserRights.html, webrt/Elements/Tabs,
+	webrt/NoAuth/webrt.css:
+
+	Cleanup to the ACL editors (consistency)
+	a bit of web ui tuning.
+	
+	fixes for initdb issues (thanks, jhutz)
+	
+	minor cleanups to ACE.pm
+	
+2001-03-13 22:44  jesse
+
+	* lib/RT/Transaction.pm, lib/RT/Transactions.pm, tools/testdeps:
+
+	Updated DBIx::SearchBuilder dependency
+	
+	code cleanup and sketching in Transaction.pm and Transactions.pm
+	
+2001-03-12 21:14  jesse
+
+	* Makefile, etc/schema.Pg, etc/schema.mysql, tools/initdb,
+	tools/testdeps:
+
+	initdb now caches schema, eliminating the install-time dependency on DBIx::DBSchema.
+	
+	this is 1.3.50, folks. it has what I believe to be functional postgres support
+	
+2001-03-11 21:58  jesse
+
+	* etc/config.pm, etc/schema.pm, lib/RT/Attachment.pm,
+	lib/RT/Ticket.pm, tools/initdb:
+
+	Cleanup in Ticket.pm
+	Bugfixes to Attachment.pm (for postgres mimencoding supporT)
+	
+	reconfigured to use the new DBIx::DBSchema (which isn't out yet. but should
+	be soon)
+	
+	still need to do a bit more work on attachments configuration.
+	
+2001-03-11 02:45  jesse
+
+	* bin/rt-mailgate:
+
+	file rt-mailgate was initially added on branch rt-1-1.
+	
+2001-03-11 02:45  jesse
+
+	* Makefile, README, bin/rt-mailgate, bin/rtmux.pl, bin/webmux.pl,
+	etc/config.pm, etc/schema.Oracle, etc/schema.pm, lib/RT.pm,
+	lib/RT/Attachment.pm, lib/RT/ScripAction.pm, lib/RT/Ticket.pm,
+	lib/RT/Action/SendEmail.pm, lib/RT/Interface/CLI.pm,
+	lib/RT/Interface/Email.pm, tools/insertdata:
+
+	This is a bit more of a 'comprehensive' diff than I'd intended. That's what
+	I get for working for 1/2 a week at my parents place without real net ;)
+	
+	Cleanups in the makefile and readme to make installation simpler and more
+	sensical.
+	
+	removed outdated rtmux.pl
+	moved old Interface/Email.pm to bin/rt-mailgate
+	started new baseclass for new mail gateways (Interface/Email.pm)
+	
+	first cut implementation of attachment size limits.
+	
+	switched mysql to use 'longblob' rather than just 'blob', so
+	that users can submit > 64k attachments.  with the next release
+	of DBIx::DBSchema, we should have what we need to get
+	PG attachmetns of more reasonable sizes working.
+	
+	first cut implementation of base64 encoding for MIME objects
+	on databases that don't support BLOBs (postgres)
+	
+	restructured initdb so we'll be able to support databases
+	for which we need to hand-hack schema.
+	
+	added the 'Owner' pseudogroup to insertdata
+	
+	fixed the bug in logging for the mail gateway that caused
+	lots of warnings about joins.
+	
+	lots of work on the mail gateway to start to clean up and restructure
+	things.
+	
+2001-03-10 18:53  jesse
+
+	* tools/initdb:
+
+	Refactoring initdb to make it easier to do things like add oracle support. yay
+	
+2001-03-09 15:19  jesse
+
+	* lib/RT/Condition/StatusChange.pm:
+
+	file StatusChange.pm was initially added on branch rt-1-1.
+	
+2001-03-09 15:19  jesse
+
+	* Makefile, etc/config.pm, lib/RT/Attachment.pm, lib/RT/Link.pm,
+	lib/RT/Ticket.pm, lib/RT/Transaction.pm, lib/RT/Watcher.pm,
+	lib/RT/Action/SendEmail.pm, lib/RT/Condition/AnyTransaction.pm,
+	lib/RT/Condition/Generic.pm, lib/RT/Condition/StatusChange.pm,
+	tools/insertdata, tools/testdeps:
+
+	OnResolve scrip now works.
+	some cleanup on Scrips and Watchers.
+	commented out some debug messages that aren't immediately useful
+	
+2001-03-09 15:15  jesse
+
+	* webrt/Ticket/: ModifyDates.html, Elements/EditWatchers:
+
+	Two bugfixes:
+		one, editdates no longer errors out on 5.005
+		two, links from watchers to the ModifyUser page now work properly
+	
+2001-03-08 15:21  jesse
+
+	* Makefile, lib/RT/User.pm, tools/insertdata:
+
+	
+	Fixed a bootstrapping bug introduced with the new acls on Create.
+	bumped version to 1.3.49_01
+	
+2001-03-07 00:40  jesse
+
+	* lib/: test.pl, RT/ACE.pm, RT/CurrentUser.pm, RT/Group.pm,
+	RT/GroupMember.pm, RT/Keyword.pm, RT/KeywordSelect.pm, RT/Link.pm,
+	RT/Queue.pm, RT/Scrip.pm, RT/ScripAction.pm, RT/Template.pm,
+	RT/Ticket.pm, RT/Transaction.pm, RT/User.pm, RT/Watcher.pm:
+
+	acls for Delete methods that needed them.
+	flat lockouts on Delete methods that needed them.
+	
+	test.pl got 'use *' added to it
+	
+2001-03-06 18:07  jesse
+
+	* lib/RT/Attachment.pm:
+
+	Backing out changes that broke ->Content
+	
+2001-03-06 17:42  jesse
+
+	* Makefile, lib/RT/Attachment.pm, lib/RT/Record.pm,
+	lib/RT/Interface/Web.pm, webrt/Elements/SelectSortOrder,
+	webrt/Search/Listing.html, webrt/Search/PickRestriction:
+
+	work on Attachments.
+	cleanup on sorting and limiting.
+	
+2001-03-06 16:26  jesse
+
+	* webrt/Search/PickRestriction:
+
+	adding a header
+	
+2001-03-04 19:46  jesse
+
+	* etc/schema.pm:
+
+	Schema change to support postgres
+	
+2001-03-04 19:44  jesse
+
+	* lib/RT/Record.pm:
+
+	Small change for new DBIx::SearchBuilder::Record PrimaryKey behaviors..
+	
+2001-03-04 19:15  jesse
+
+	* bin/rt:
+
+	rt --id=<int> should work now
+	
+2001-03-02 00:26  jesse
+
+	* etc/config.pm, lib/RT/Date.pm, lib/RT/Ticket.pm,
+	webrt/Ticket/ModifyDates.html:
+
+	first pass on dates and timezones...seems to work. for common ops
+	
+2001-02-28 16:34  jesse
+
+	* lib/RT/User.pm:
+
+	fix for RT/fsck.com: Ticket #208 User->Create needs more argument checking
+		added a check to User->Create to make sure a name was specified
+	
+2001-02-28 08:56  jesse
+
+	* Makefile, bin/rtadmin:
+
+	Enabled the ability to set a user's password via the CLI
+	
+2001-02-27 22:09  jesse
+
+	* lib/Makefile.PL, tools/testdeps:
+
+	Bumping required version of searchbuilder in testdeps and lib/Makefile.pl
+	
+2001-02-27 22:00  jesse
+
+	* webrt/Elements/SelectKeyword:
+
+	allowing undef keywords
+	
+2001-02-27 21:43  jesse
+
+	* webrt/Admin/Queues/Scrips.html:
+
+	Fix for ticket #50. grammar in per queue scrip descriptions
+	
+2001-02-27 21:41  jesse
+
+	* tools/insertdata:
+
+	resolving ticket #181- extra \s in the autoreply template
+	
+2001-02-27 21:36  jesse
+
+	* Makefile, lib/RT/Transaction.pm, tools/testdeps:
+
+	testdeps now erorrs out if you don't specify a db type.
+	
+	queue change transaction descriptions are better.
+	
+	bumped the version
+	
+2001-02-27 21:12  jesse
+
+	* webrt/Elements/SelectTicketSortBy:
+
+	file SelectTicketSortBy was initially added on branch rt-1-1.
+	
+2001-02-27 21:12  jesse
+
+	* webrt/Elements/SelectSortOrder:
+
+	file SelectSortOrder was initially added on branch rt-1-1.
+	
+2001-02-27 21:12  jesse
+
+	* lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/Interface/Web.pm,
+	webrt/Elements/SelectKeyword, webrt/Elements/SelectResultsPerPage,
+	webrt/Elements/SelectSortOrder, webrt/Elements/SelectTicketSortBy,
+	webrt/Search/Listing.html, webrt/Search/PickRestriction:
+
+	Basic ticket sorting has been implemented.
+	Ticket listing by pages works too.
+	
+	a bit of cleanup in the ticket listing.  now select by keywords uses the component designed for that purpose
+	
+2001-02-26 15:44  jesse
+
+	* lib/RT/Ticket.pm:
+
+	No longer generate spurious watchers transactions when merging tickets.
+	
+2001-02-26 03:08  jesse
+
+	* lib/RT/Ticket.pm:
+
+	fixed a typo in a debug message that prevented compilation
+	
+2001-02-26 02:53  jesse
+
+	* Makefile:
+
+	bumped the version for release. again.
+	
+2001-02-26 02:52  jesse
+
+	* lib/RT/: ACE.pm, Ticket.pm:
+
+	Fixed a variable redef in ticket and an acl granting bug in ACE
+	
+2001-02-26 01:24  jesse
+
+	* Makefile, webrt/Ticket/ModifyLinks.html:
+
+	A bit more merging support.
+	Bumped version for release
+	
+2001-02-25 22:28  jesse
+
+	* webrt/Ticket/Elements/: ShowHistory, ShowTransaction:
+
+	Cleaning up the transaction display.
+	
+2001-02-25 22:22  jesse
+
+	* lib/RT/: Scrip.pm, ScripCondition.pm, Ticket.pm:
+
+	Some bug fixes for merging.
+	Fixed a bug in Scrips that caused an infinite loop if the user had no rights.
+	
+2001-02-24 02:42  jesse
+
+	* Makefile, lib/RT/Ticket.pm:
+
+	Fixed a bug that prevented ticket loading from appearing to work
+	
+2001-02-23 19:17  jesse
+
+	* Makefile, lib/RT/Ticket.pm, lib/RT/Interface/Web.pm:
+
+	Fixed a typo in Ticket.pm that prevented transaction lists from working
+	fixed a paste error in Web.pm
+	
+2001-02-23 17:41  jesse
+
+	* Makefile:
+
+	Bumped the version # for release
+	
+2001-02-23 17:31  jesse
+
+	* Makefile, README, bin/initacls.mysql, bin/webmux.pl,
+	lib/RT/ACE.pm, lib/RT/ACL.pm, lib/RT/Link.pm, lib/RT/Queue.pm,
+	lib/RT/Ticket.pm, lib/RT/User.pm, lib/RT/Interface/Web.pm,
+	tools/initdb, tools/testdeps:
+
+	Fixed a bug that made a first install with mysql fail
+	yanked a UNIVERSAL::AUTOLOADER handler I inserted to test things out.
+	Fixed several ACL creation bugs.
+	Initial implementation of merge for the core.
+	Testdeps now does database testing.
+	
+	Made Ticket->Load smarter. (nolonger needs a seperate LoadByURI sub.
+	
+	fixed bugs in the readme
+	
+2001-02-22 01:03  jesse
+
+	* tools/testdeps:
+
+	Updated dependencies.
+	
+2001-02-21 17:49  jesse
+
+	* lib/RT/: Ticket.pm, Tickets.pm:
+
+	Cache Queue in Ticket.pm for added perf.
+	formatting cleanup in Tickets.pm
+	
+2001-02-20 14:38  jesse
+
+	* webrt/Ticket/Display.html:
+
+	Uncompressed history on summary page...
+	
+2001-02-20 14:18  jesse
+
+	* lib/RT/ScripCondition.pm:
+
+	fixed a pod typo
+	
+2001-02-20 14:07  jesse
+
+	* Makefile, etc/schema.pm, lib/MANIFEST, tools/insertdata,
+	webrt/Admin/Users/Modify.html,
+	webrt/SelfService/Elements/ShowTransaction,
+	webrt/Ticket/Elements/ShowTransaction:
+
+	removed a false unique index from schema. pm.
+	make web interface and insertdata deal properly with the fact that email addresses
+	should be unique.
+	
+	cleaned up ShowTransaction for the webui. (now uses CreatorObj rather than Creator,
+	as it was confusing
+	
+2001-02-20 01:42  jesse
+
+	* lib/RT/: ACE.pm, ACL.pm, Attachment.pm, Attachments.pm,
+	CurrentUser.pm, EasySearch.pm, Group.pm, GroupMember.pm,
+	GroupMembers.pm, Groups.pm, Keyword.pm, KeywordSelect.pm,
+	Keywords.pm, Link.pm, Links.pm, ObjectKeyword.pm,
+	ObjectKeywords.pm, Queue.pm, Queues.pm, Record.pm, Scrip.pm,
+	ScripAction.pm, ScripActions.pm, ScripCondition.pm,
+	ScripConditions.pm, Scrips.pm, Template.pm, Templates.pm,
+	Ticket.pm, Tickets.pm, Transaction.pm, Transactions.pm, User.pm,
+	Users.pm, Utils.pm, Watcher.pm, Watchers.pm, Action/SendEmail.pm:
+
+	A major security audit of the codebase has taken place.  I was primarily out for
+	ACL related issues, but took care of a number of other minor cleanups at the same time.
+	
+2001-02-19 17:16  jesse
+
+	* NEWS:
+
+	fixed a typo in cli_respond_req
+	
+2001-02-15 18:02  jesse
+
+	* webrt/SelfService/: Details.html, Error.html:
+
+	fixing bug #90: SelfService calls to Abort use the 'standard' handler. which includes the wrong header.
+	
+2001-02-15 18:02  jesse
+
+	* webrt/SelfService/Error.html:
+
+	file Error.html was initially added on branch rt-1-1.
+	
+2001-02-15 17:39  jesse
+
+	* webrt/Admin/Elements/SelectSingleOrMultiple:
+
+	file SelectSingleOrMultiple was initially added on branch rt-1-1.
+	
+2001-02-15 17:39  jesse
+
+	* lib/RT/Keyword.pm, lib/RT/KeywordSelect.pm,
+	webrt/Admin/Elements/SelectKeywordSelect,
+	webrt/Admin/Elements/SelectSingleOrMultiple,
+	webrt/Admin/Global/Keywords.html, webrt/Admin/Queues/Keywords.html,
+	webrt/Elements/SelectKeyword, webrt/Elements/SelectKeywordOptions,
+	webrt/Ticket/Elements/ModifyTicket:
+
+	KeywordSelect.pm got an ACL bug fixed.
+	Keyword.pm now does recursive searches in Descendants properly.
+	
+	KeyworSelect editing via the webui is now much smarter. and cleaner. and better. and faster, and resolving bug 123
+	
+2001-02-15 17:39  jesse
+
+	* webrt/Admin/Elements/SelectKeywordSelect:
+
+	file SelectKeywordSelect was initially added on branch rt-1-1.
+	
+2001-02-13 22:54  jesse
+
+	* lib/: Makefile.PL, RT/ACE.pm, RT/Keyword.pm, RT/KeywordSelect.pm,
+	RT/Scrip.pm:
+
+	Better ACL handling for ACEs, Keywords and KeywordSelects.
+	specified more accurate versions of some dependencies in lib/Makefile.PL
+	
+2001-02-13 12:51  jesse
+
+	* bin/rtadmin, etc/schema.pm, lib/RT/Keyword.pm,
+	lib/RT/KeywordSelect.pm, lib/RT/KeywordSelects.pm,
+	lib/RT/Keywords.pm, lib/RT/Queue.pm, lib/RT/Queues.pm,
+	lib/RT/User.pm, lib/RT/Users.pm, webrt/Admin/Global/Keywords.html,
+	webrt/Admin/Keywords/index.html, webrt/Admin/Queues/Keywords.html,
+	webrt/Admin/Queues/Modify.html, webrt/Admin/Users/Modify.html:
+
+	Implemented 'Disabled' for Keywords, KeywordSelects, Queues and Users.
+	This supplants 'Delete' for these objects which need to exist to guarantee
+	referential integrity.
+	
+	Implemented cli and web interfaces to support the new code.
+	
+2001-02-12 18:27  jesse
+
+	* README, bin/rtadmin, etc/schema.pm, lib/RT/Attachment.pm,
+	lib/RT/EasySearch.pm, lib/RT/Link.pm, lib/RT/ObjectKeyword.pm,
+	lib/RT/Queue.pm, lib/RT/Queues.pm, lib/RT/Record.pm,
+	lib/RT/ScripAction.pm, lib/RT/ScripCondition.pm,
+	lib/RT/Template.pm, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
+	lib/RT/Watcher.pm, tools/testdeps:
+
+	Cleaned up LastUpdated / Created/ LastUpdatedBy / Creator to all get set on
+	create for all relevant objects.
+	
+	Based on discussions with ivan, changed the 'Deleted' flag on various objects to 'Disabled'
+	to better represent its purpose.
+	
+	Fully implemented Disable for queue as a prototype.
+	
+	fixed queue attribute editing in cli.
+	
+2001-02-12 13:59  jesse
+
+	* tools/testdeps:
+
+	specified a minimum known good version of Getopt::Long
+	
+2001-02-12 12:38  jesse
+
+	* lib/RT/Queue.pm, webrt/Ticket/Elements/ShowTransaction:
+
+	transaction links work again.
+	admin ccs get listed.
+	
+2001-02-11 22:16  jesse
+
+	* Makefile:
+
+	bumped the version # for a new release
+	
+2001-02-11 22:13  jesse
+
+	* lib/RT/Queue.pm, lib/RT/Template.pm, tools/insertdata:
+
+	cleaning up queue create.
+	
+2001-02-11 22:12  jesse
+
+	* etc/schema.pm:
+
+	started the work on dealing with Deleting records that need to exist to guarantee ref. integrity
+	
+2001-02-11 18:40  jesse
+
+	* NEWS:
+
+	imported brandon's url importing code
+	
+2001-02-06 22:59  jesse
+
+	* lib/RT/Queue.pm, webrt/Admin/Queues/Modify.html,
+	webrt/Admin/Users/index.html:
+
+	Fixes to Queue.pm to stop it from clobbering the Name.
+	
+	fixed a typo in the webui Admin/Users/index.html
+	
+2001-02-06 15:22  jesse
+
+	* lib/RT/Queue.pm, webrt/Admin/Elements/QueueRightsForUser,
+	webrt/Admin/Elements/SelectRights,
+	webrt/Ticket/Elements/ShowMembers:
+
+	ACL fixes in Queue.pm.
+	ACL search fies for the web ui.
+	fixed a recursive subticket display bug.
+	
+2001-02-06 12:49  jesse
+
+	* Makefile:
+
+	removed the old rt 1.0 lib/rt directory forever. yay
+	
+2001-02-06 12:48  jesse
+
+	* lib/RT/Interface/Email.pm:
+
+	Added a tiny patch from ivan to not extract nested messages. not totally sure about this one yet.
+	
+2001-02-02 01:26  jesse
+
+	* Makefile:
+
+	version bumpin
+	
+2001-02-02 01:11  jesse
+
+	* bin/rtadmin, lib/RT/Keyword.pm:
+
+	keyword creation, editing and deletion now works via the cli tool.
+	
+	This means that for alpha 4, we're *gasp* feature complete.  now to fix lots of bugs.
+	
+2001-02-01 02:46  jesse
+
+	* bin/rtadmin, lib/RT/Group.pm, lib/RT/Keyword.pm,
+	lib/RT/KeywordSelect.pm, tools/testdeps, webrt/Ticket/Display.html,
+	webrt/Ticket/Elements/ShowHistory,
+	webrt/Ticket/Elements/ShowTransaction:
+
+	Commandline editing of keywordselects now works.
+	
+	Added in a patch to collapse history on the ticket listing
+	page from Byron Ellacott
+	
+	Bumped a few dependecy versions. added a File::Spec dependency, since File::Temp
+	gets it not quote right.
+	
+2001-01-31 02:08  jesse
+
+	* bin/rtadmin, lib/RT/Group.pm, webrt/Admin/Groups/Members.html:
+
+	Commandline group editing now works. yay. group membership even.
+	the api changed to be easier to work with and more consistent with other functions
+	
+2001-01-30 23:12  jesse
+
+	* lib/RT/Interface/Email.pm, webrt/Ticket/Elements/ShowLinks,
+	webrt/Ticket/Elements/ShowRequestor:
+
+	The email interface now uses tempdir from File::Temp for increased security.
+	
+	A couple of webui cleanups to display more sensible things.
+	
+2001-01-30 16:42  jesse
+
+	* etc/config.pm, lib/RT/User.pm, lib/RT/Interface/Email.pm:
+
+	Added mail-on-error to the mail gateway. now it should tell you when it fails.
+	
+	turned off debugging output from ACLs....
+	
+2001-01-29 23:58  jesse
+
+	* bin/rtadmin, lib/RT/ACE.pm, lib/RT/ACL.pm, lib/RT/Scrip.pm,
+	lib/RT/ScripAction.pm, lib/RT/ScripCondition.pm, lib/RT/Scrips.pm,
+	lib/RT/Template.pm, lib/RT/Templates.pm, lib/RT/User.pm,
+	lib/RT/Interface/CLI.pm, lib/RT/Interface/Web.pm,
+	webrt/Admin/Elements/SelectTemplate,
+	webrt/Admin/Global/Template.html,
+	webrt/Admin/Global/Templates.html,
+	webrt/Admin/Queues/Template.html:
+
+	A bunch of work on the admin cli (acl editor now works)
+	
+	a couple API changes to standardize method names across classes
+	template editing via the web should work better now.
+	
+2001-01-29 23:56  jesse
+
+	* webrt/Elements/: TitleBoxEnd, TitleBoxStart:
+
+	Futzing with the title box to make it a bit more consistent
+	
+2001-01-29 23:54  jesse
+
+	* lib/RT/Record.pm:
+
+	Removed a redundant sub new
+	
+2001-01-29 22:22  jesse
+
+	* lib/RT/Group.pm:
+
+	Groups can now be loaded by name.
+	
+2001-01-23 15:46  jesse
+
+	* bin/rtadmin, etc/schema.pm, lib/RT/Queue.pm, lib/RT/Template.pm,
+	lib/RT/Ticket.pm, lib/RT/User.pm, lib/RT/Interface/CLI.pm,
+	tools/initdb:
+
+	initdb now punts on database creation for oracle.
+	
+	Ticket->Name removed from code (retargeted to post 2.0 and its own table)
+	Some better error checking in User and Queue.
+	
+	Can now edit templates (And create them) from the CLI.
+	
+2001-01-22 12:51  jesse
+
+	* lib/RT/Action/Notify.pm:
+
+	
+	It's amazing how much effect 3 little letters can have. with this patch,
+	scrips that depend on notify (most everything other than autoreply)
+	just work. woo!
+	
+2001-01-22 06:18  jesse
+
+	* lib/RT/Template.pm:
+
+	Fixed a couple ACL bugs in Template::_Set
+	
+2001-01-22 05:04  jesse
+
+	* Makefile:
+
+	Bumped the version # because of the schema change
+	
+2001-01-22 04:51  jesse
+
+	* lib/RT/Interface/CLI.pm:
+
+	file CLI.pm was initially added on branch rt-1-1.
+	
+2001-01-22 04:51  jesse
+
+	* lib/RT/Interface/CLI.pm:
+
+	Added CLI.pm, which rt and adminrt are dependant on
+	
+2001-01-22 04:46  jesse
+
+	* bin/rtadmin, lib/MANIFEST, lib/RT/Template.pm:
+
+	a bit more work on rtadmin (the start of template editing)
+	
+	added Interface/CLI to the manifest.
+	added a comment to Template.pm
+	
+2001-01-22 02:51  jesse
+
+	* Makefile, TODO, bin/mason_handler.scgi, bin/rt, bin/rtadmin,
+	bin/rtmux.pl, bin/webmux.pl, etc/config.pm, etc/schema.Oracle,
+	etc/schema.pm, lib/RT.pm, lib/RT/Attachment.pm,
+	lib/RT/CurrentUser.pm, lib/RT/Group.pm, lib/RT/Link.pm,
+	lib/RT/ObjectKeywords.pm, lib/RT/Queue.pm, lib/RT/Template.pm,
+	lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/Transaction.pm,
+	lib/RT/User.pm, lib/RT/Users.pm, lib/RT/Watchers.pm,
+	lib/RT/Interface/Email.pm, tools/insertdata,
+	webrt/Admin/Elements/CreateQueueCalled,
+	webrt/Admin/Elements/CreateUserCalled,
+	webrt/Admin/Elements/GrantQueueRightsTo,
+	webrt/Admin/Elements/ModifyKeywordSelect,
+	webrt/Admin/Elements/ModifyQueue,
+	webrt/Admin/Elements/ModifyTemplate,
+	webrt/Admin/Elements/ModifyUser,
+	webrt/Admin/Elements/SelectModifyQueue,
+	webrt/Admin/Elements/SelectModifyUser,
+	webrt/Admin/Elements/SelectTemplate,
+	webrt/Admin/Elements/SelectUsers, webrt/Admin/Global/Scrips.html,
+	webrt/Admin/Global/Template.html,
+	webrt/Admin/Global/Templates.html,
+	webrt/Admin/Global/UserRights.html,
+	webrt/Admin/Groups/Members.html,
+	webrt/Admin/KeywordSelects/index.html, webrt/Admin/Queues/ACL.html,
+	webrt/Admin/Queues/Create.html, webrt/Admin/Queues/Keywords.html,
+	webrt/Admin/Queues/Modify.html, webrt/Admin/Queues/People.html,
+	webrt/Admin/Queues/Scrips.html, webrt/Admin/Queues/Template.html,
+	webrt/Admin/Queues/Templates.html, webrt/Admin/Queues/index.html,
+	webrt/Admin/Users/Modify.html, webrt/Admin/Users/Prefs.html,
+	webrt/Admin/Users/index.html, webrt/Elements/Header,
+	webrt/Elements/MyRequests, webrt/Elements/MyTickets,
+	webrt/Elements/Quicksearch, webrt/Elements/SelectNewTicketQueue,
+	webrt/Elements/SelectOwner, webrt/Elements/SelectQueue,
+	webrt/Elements/SelectUsers, webrt/SelfService/Details.html,
+	webrt/SelfService/Elements/Header,
+	webrt/SelfService/Elements/MyRequests,
+	webrt/SelfService/Elements/ShowTransaction,
+	webrt/Ticket/Create.html, webrt/Ticket/ModifyLinks.html,
+	webrt/Ticket/autohandler, webrt/Ticket/Elements/AddWatchers,
+	webrt/Ticket/Elements/ShowBasics, webrt/Ticket/Elements/ShowDates,
+	webrt/Ticket/Elements/ShowDependencies,
+	webrt/Ticket/Elements/ShowLinks, webrt/Ticket/Elements/ShowPeople,
+	webrt/Ticket/Elements/ShowReferences,
+	webrt/Ticket/Elements/ShowTransaction:
+
+	In prep for a true schema freeze, I fixed a number of attribute names that were troublesome for
+	one reason or another.
+	
+	        Queue->QueueId and User->UserId have been changed to Queue->Name and User->Name, so
+	        as not to conflict with queue->id and user->id any more.  A number of tables
+	        used "Alias" and "Title" and things like that, rather than the somewhat
+	        more standard "Name" and "Description"
+	
+	Abstracted a bunch of the CLI setup stuff out into lib/RT/Interface/CLI
+	
+	Abstracted some of the core DB startup code into RT.pm
+	
+	fixed the makefile to handle the new rtadmin.
+	
+	lots of updates to the new rtadmin (which works for user editing!)
+	
+	fixed a bug in ObjectKeywords->LoadByName....
+	
+2001-01-19 04:23  jesse
+
+	* bin/rtadmin:
+
+	A bit of cleanup and a bit more docs.  it's now actually implementable with getopt::long
+	
+2001-01-19 04:16  jesse
+
+	* bin/rtadmin:
+
+	file rtadmin was initially added on branch rt-1-1.
+	
+2001-01-19 04:16  jesse
+
+	* bin/rtadmin:
+
+	Docced the proposed cli for the new rtadmin tool. It's rather more intense than I'd intended
+	
+2001-01-19 02:15  jesse
+
+	* lib/RT/User.pm:
+
+	Fixed ACL bug that prevented by-group auth from working
+	
+2001-01-19 00:52  jesse
+
+	* lib/RT/Ticket.pm, lib/RT/User.pm, webrt/SelfService/Details.html:
+
+	Work on SelfService (fixing the a permission denied bug)
+	
+2001-01-19 00:21  jesse
+
+	* webrt/NoAuth/webrt.css:
+
+	file webrt.css was initially added on branch rt-1-1.
+	
+2001-01-19 00:21  jesse
+
+	* webrt/: webrt.css, Elements/Header, NoAuth/webrt.css,
+	SelfService/Details.html, SelfService/Elements/Header:
+
+	webui cleanups
+	
+2001-01-19 00:07  jesse
+
+	* bin/rt:
+
+	bug-fixing in bin/rt
+	
+2001-01-18 23:47  jesse
+
+	* lib/RT/Link.pm, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
+	webrt/Ticket/ModifyLinks.html, webrt/Ticket/Elements/ShowLinks,
+	webrt/Ticket/Elements/ShowMembers,
+	webrt/Ticket/Elements/ShowReferences,
+	webrt/Ticket/Elements/ShowSummary:
+
+	A bunch of work on links.
+	API cleanups.
+	Ticket-> Members and MemberOf  now return Links objects rather than Tickets Objects
+	Edit links via the webui works now
+	
+2001-01-18 15:11  jesse
+
+	* HACKING, docs/API:
+
+	Added a bit more documentation and philosophy
+	to the API file. yanked tobix' old out of date "HACKING"
+	doc
+	
+2001-01-18 03:18  jesse
+
+	* Makefile, NEWS:
+
+	Headers in incoming mail are now parsed case insensitively.
+	
+	Version is now 1.0.7
+	
+2001-01-17 16:41  jesse
+
+	* Makefile, tools/testdeps:
+
+	updated searchbuilder dependency in testdeps
+	
+	revved version in Makefile for release.
+	
+2001-01-17 14:27  jesse
+
+	* Makefile, bin/rt, lib/RT/Date.pm:
+
+	Fixed #45 Permissions bug on redhat 6.0
+	Fixed #51 RT CLI doesn't check for valid user
+	
+	Implemented a bunch more searching in bin/rt
+	
+	Refactored RT::Date a bit.
+	
+	Fixed some unreported permissions eits.
+	
+2001-01-16 11:43  jesse
+
+	* webrt/Ticket/Elements/: ShowLinks, ShowMemberOf, ShowMembers,
+	ShowPeople, ShowSummary:
+
+	Cleaned up and shortened the Ticket Display screen
+	
+2001-01-16 10:56  jesse
+
+	* lib/RT/Ticket.pm, webrt/Ticket/Modify.html:
+
+	Cleaned up and better documented Ticket->SetStatus
+	Ticket/Modify.html got rid of a whole bunch of evals.
+	
+2001-01-15 23:57  jesse
+
+	* Makefile, lib/MANIFEST, lib/RT/Tickets.pm:
+
+	Removed a deleted file from the manifest. revved the version
+	
+2001-01-15 15:19  jesse
+
+	* lib/RT/: KeywordSelect.pm, Queue.pm:
+
+	Adding the ability to load keyword selects by name.
+	
+2001-01-15 03:49  jesse
+
+	* lib/RT/Ticket.pm, webrt/Ticket/Elements/EditKeywordSelects:
+
+	keyword display now cleaner. doesn't force you to select a keyword if none
+	is selected yet.
+	
+2001-01-15 03:36  jesse
+
+	* lib/RT/Ticket.pm:
+
+	SetQueue is no-longer heinously broken. thanks eoin
+	
+2001-01-15 03:10  jesse
+
+	* lib/RT/: Queue.pm, User.pm, Action/Notify.pm, Action/Spam.pm:
+
+	removed an old RT::Action that didn't actually do anything useful these days.  it'll get replaced later.
+	
+	Scrips which sign watchers up for things _actually seem to work_
+	(required some frobbing of watchers)
+	
+2001-01-15 02:44  jesse
+
+	* bin/rt, etc/schema.pm, lib/RT/ObjectKeywords.pm, lib/RT/Queue.pm,
+	lib/RT/Template.pm, lib/RT/Ticket.pm, lib/RT/Tickets.pm,
+	lib/RT/Watchers.pm, webrt/Elements/ViewUser,
+	webrt/Ticket/Elements/ShowRequestor:
+
+	Added a 'Type' column to templates, to more easily allow for insertable templates for quick responses from customer service folks ,etc.
+	Reworked a bunch of the watchers code to not do its own potentially very bogus caching and to reuse more core code.
+	Oh. and it always returns the expected object type now.
+	
+	Redid tobias' old "ViewUser" box to use a set of tickets, rather than a bogus search for watchers (ignoring tickets).
+	
+	Fixed a bug in searching for tickets by watcher.
+	
+2001-01-15 00:53  jesse
+
+	* bin/rt, webrt/Elements/SelectOwner, webrt/Elements/TitleBoxStart,
+	webrt/NoAuth/Login.html, webrt/Ticket/Elements/ShowSummary:
+
+	Added a bunch of doc to bin/rt. probably should have check to see if it runs ;)
+	TitleBoxStart got the attributes:  class, title_href and titleright_href. makes calls to it cleaner.
+	showsummary got a few more links to the places things should go.
+	selectOwner now will actually default to nobody if that's the right value.
+	
+2001-01-13 03:22  jesse
+
+	* TODO:
+
+	Changed the TODO file to point to the current TODO list
+	
+2001-01-13 03:18  jesse
+
+	* Makefile:
+
+	Bumped version # for release
+	
+2001-01-13 03:11  jesse
+
+	* bin/rtmux.pl, lib/RT/Queue.pm, lib/RT/Action/SendEmail.pm:
+
+	Fixing a couple minor things in rtmux and Queue.pm so that the mail interfaces work ok.
+	
+2001-01-13 02:34  jesse
+
+	* lib/RT/User.pm:
+
+	Added the ability to generate a random password to RT::User.  we don't yet
+	have a nice way to email this information to the user. which is a real bummer.
+	
+2001-01-12 17:35  jesse
+
+	* etc/config.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
+	lib/RT/Interface/Web.pm, webrt/Admin/Users/Modify.html,
+	webrt/SelfService/Create.html, webrt/SelfService/Details.html,
+	webrt/SelfService/Elements/Header, webrt/SelfService/Elements/Tabs:
+
+	Made ACLs for 'Everyone' work. fixed a few other small ACL bugs.
+	Made the 'Requestor-mode' ticket create tool work.
+	
+2001-01-12 12:27  jesse
+
+	* webrt/Elements/: SelectDate, SelectOwner:
+
+	Commented out unimplemented select relative date bits.
+	SelectOwner now lets you pick nobody.
+	
+2001-01-12 03:16  jesse
+
+	* bin/rt, bin/rtmux.pl, lib/RT/Ticket.pm, tools/testdeps:
+
+	Comments and Correspondence work from the cli now. with and without --source (for source data) and --no-edit (to disable invocation of $EDITOR)
+	
+	rt and rtmux.pl now drop setgidness as soon as they can. it's happier this
+	way. really :)
+	
+	testdeps now installs File::Temp, which is needed to do safe tempfile usage.
+	
+2001-01-12 00:11  jesse
+
+	* webrt/Elements/: MyRequests, MyTickets:
+
+	Bug fix for #47 (Id flows into subject on 'home' screen)
+	
+2001-01-11 03:34  jesse
+
+	* webrt/Elements/Header:
+
+	Removed extra spaces from the header
+	
+2001-01-11 02:57  jesse
+
+	* webrt/Elements/SelectOwner:
+
+	Made SelectOwner actually show all the right people
+	
+2001-01-11 02:53  jesse
+
+	* tools/testdeps:
+
+	Added a requirement for the current DBIx::SearchBuilder to testdeps
+	
+2001-01-11 02:28  jesse
+
+	* Makefile:
+
+	revved the version for distribution
+	
+2001-01-11 02:28  jesse
+
+	* lib/RT/Ticket.pm, lib/RT/Interface/Web.pm,
+	webrt/Elements/Quicksearch, webrt/Elements/TitleBoxStart,
+	webrt/Ticket/Display.html, webrt/Ticket/Elements/EditBasics:
+
+	fixed a couple of UI bugs. the 'quick' links in the web ticket view should now all work.
+	Logger->warn  -> Logger->warning in the web ui
+	
+2001-01-10 17:42  jesse
+
+	* Makefile:
+
+	Bumped to 1.3.33
+	
+2001-01-10 01:46  jesse
+
+	* webrt/Ticket/Attachment/dhandler:
+
+	Date: Wed, 10 Jan 2001 16:22:43 +1000 (EST)                                     From: Byron Ellacott <bje@apnic.net>                                            To: rt-devel@fsck.com                                                           Subject: Re: [rt-devel] [rt-announce] RT 1.3.30 released                        List-Id: RT Development <rt-devel.lists.fsck.com>                                                                                                               [-- Attachment #1 --]                                                           [-- Type: text/PLAIN, Encoding: 7bit, Size: 0.7K --]                                                                                                            On Wed, 3 Jan 2001, Jesse wrote:                                                                                                                                [snip]                                                                                                                                                          I noticed 1-3-31 sitting around, so I installed that.  I'm giving a             demonstration tomorrow, so I've been running through the web UI.  I             noticed a problem with attachments - HTML::Mason was munging everything to      be HTML-nice, but a jpg doesn't display if its < characters are changed to      &lt;, and it's not good to have </BODY></HTML> on the end of binary             attachments.
+	
+2001-01-10 00:24  jesse
+
+	* Makefile:
+
+	Revved the version to 1.3.32
+	
+2001-01-09 23:57  jesse
+
+	* webrt/Admin/Users/Rights.html:
+
+	file Rights.html was initially added on branch rt-1-1.
+	
+2001-01-09 23:57  jesse
+
+	* lib/RT/Record.pm, lib/RT/User.pm, lib/RT/Interface/Email.pm,
+	tools/insertdata, webrt/Admin/Elements/UserTabs,
+	webrt/Admin/Users/Modify.html, webrt/Admin/Users/Rights.html,
+	webrt/Elements/Quicksearch, webrt/Elements/TitleBoxEnd,
+	webrt/Elements/TitleBoxStart:
+
+	Did some work on User creation to check for duplicate userids on create.
+	Better user create error checking.
+	Switched the TitleBox UI to a compromise between new and old.
+	
+	Did a bit of ui work on web based user modification
+	
+2001-01-09 02:15  jesse
+
+	* Makefile, lib/RT/User.pm, tools/insertdata,
+	webrt/Admin/Users/Modify.html:
+
+	shuffling around hte user password stuff. hopefully the user modification issues seen in 1.3.30 will be fixed.
+	
+2001-01-09 00:48  jesse
+
+	* webrt/Ticket/History.html:
+
+	file History.html was initially added on branch rt-1-1.
+	
+2001-01-09 00:48  jesse
+
+	* docs/keywords:
+
+	file keywords was initially added on branch rt-1-1.
+	
+2001-01-09 00:48  jesse
+
+	* bin/mason_handler.scgi:
+
+	file mason_handler.scgi was initially added on branch rt-1-1.
+	
+2001-01-09 00:48  jesse
+
+	* Makefile, bin/mason_handler.scgi, bin/webmux.pl, docs/keywords,
+	lib/RT/Tickets.pm, lib/RT/Interface/Web.pm,
+	webrt/Admin/Elements/GrantQueueRightsTo~,
+	webrt/Ticket/History.html:
+
+	Started to write out notes on a testsuite.
+	Started work on a CGI/SpeedyCGI frontend
+	added a file that was missing in 1.3.30
+	
+2001-01-08 14:04  jesse
+
+	* NEWS, README:
+
+	Added a web based due-date patch.
+	
+2001-01-06 15:17  jesse
+
+	* etc/schema.pm:
+
+	Added 'Deleted' attributes for tables whose entries can not be safely
+	removed from the database for ref. integrity problems.
+	
+2001-01-03 23:07  jesse
+
+	* Makefile:
+
+	Bumped version to 1.3.30
+	
+2001-01-03 23:02  jesse
+
+	* tools/testdeps:
+
+	file testdeps was initially added on branch rt-1-1.
+	
+2001-01-03 23:02  jesse
+
+	* README, bin/testdeps.pl, lib/Makefile.PL, tools/testdeps,
+	webrt/Elements/TitleBoxStart:
+
+	a bit of quick UI work.
+	an update to depend on DBIx::SearchBuilder 0.15 (just releaseD)
+	testdeps moved to tools
+	
+2001-01-03 03:21  jesse
+
+	* bin/rt, lib/RT/Tickets.pm:
+
+	ticket searches for integers are a bit more flexible now (and the code's tighter)
+	
+	the rtq section of the new bin/rt appears functional, if underdocced.
+	
+2001-01-02 22:55  jesse
+
+	* lib/RT/Tickets.pm, lib/RT/Interface/Web.pm,
+	webrt/Search/PickRestriction:
+
+	Imported ivan's keyword search patch, along with a modification to allow
+	for _not_ selecting keywords.
+	
+2001-01-02 21:45  jesse
+
+	* Makefile, bin/testdeps.pl, lib/RT/KeywordSelect.pm,
+	lib/RT/ObjectKeyword.pm, lib/RT/ObjectKeywords.pm,
+	lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/Watchers.pm,
+	lib/RT/Interface/Web.pm, tools/insertdata, webrt/webrt.css,
+	webrt/Elements/Header, webrt/Elements/TitleBoxStart,
+	webrt/Elements/ViewUser, webrt/Search/Listing.html,
+	webrt/Search/PickRestriction, webrt/Ticket/Create.html,
+	webrt/Ticket/Display.html, webrt/Ticket/Elements/ShowBasics,
+	webrt/Ticket/Elements/ShowSummary,
+	webrt/Ticket/Elements/ShowTransaction, webrt/Ticket/Elements/Tabs:
+
+	Fixed a warning in testdeps (Well, worked around it, anyway)
+	Added some helper functions for keywords and keyword selects.
+	
+	did a bunch of UI cleanup. started to color-code the webui
+	
+	started work on a generic queue listing format in Tickets.pm
+	
+2001-01-02 15:02  jesse
+
+	* webrt/SelfService/Elements/ShowTransaction:
+
+	file ShowTransaction was initially added on branch rt-1-1.
+	
+2001-01-02 15:02  jesse
+
+	* webrt/SelfService/: Create.html, Details.html,
+	Elements/GotoTicket, Elements/Header, Elements/ShowTransaction,
+	Elements/Tabs:
+
+	Fleshed out more of the requestor UI.
+	It's good enough for the alpha. yay!
+	
+2001-01-02 15:02  jesse
+
+	* webrt/SelfService/Elements/GotoTicket:
+
+	file GotoTicket was initially added on branch rt-1-1.
+	
+2001-01-01 19:06  jesse
+
+	* webrt/Ticket/: Modify.html, ModifyDates.html, ModifyPeople.html,
+	Elements/EditBasics, Elements/EditKeywordSelects,
+	Elements/ShowDates, Elements/ShowSummary:
+
+	Even yet still more Technicolor!
+	
+2001-01-01 18:42  jesse
+
+	* webrt/NoAuth/images/spacer.gif:
+
+	file spacer.gif was initially added on branch rt-1-1.
+	
+2001-01-01 18:42  jesse
+
+	* webrt/NoAuth/Reminder.html:
+
+	file Reminder.html was initially added on branch rt-1-1.
+	
+2001-01-01 18:42  jesse
+
+	* webrt/Elements/Section:
+
+	file Section was initially added on branch rt-1-1.
+	
+2001-01-01 18:42  jesse
+
+	* lib/RT/CurrentUser.pm, lib/RT/KeywordSelect.pm, webrt/webrt.css,
+	webrt/Admin/Keywords/index.html, webrt/Admin/Queues/People.html,
+	webrt/Elements/Header, webrt/Elements/ListActions,
+	webrt/Elements/MyRequests, webrt/Elements/MyTickets,
+	webrt/Elements/Section, webrt/Elements/Submit,
+	webrt/Elements/TitleBoxEnd, webrt/Elements/TitleBoxStart,
+	webrt/NoAuth/Login.html, webrt/NoAuth/Reminder.html,
+	webrt/NoAuth/images/spacer.gif, webrt/Ticket/Display.html,
+	webrt/Ticket/ModifyPeople.html, webrt/Ticket/Elements/ShowSummary,
+	webrt/Ticket/Elements/ShowTransaction:
+
+	A bunch of UI work.
+	Ticket Display is significantly different. and _much_ faster loading.
+	A color style guide for the web ui is forthcoming.
+	
+	removed a Die from CurrentUser.
+	
+2000-12-30 03:27  jesse
+
+	* webrt/Elements/Tabs:
+
+	fixed a ui nit from ivan
+	
+2000-12-30 03:03  jesse
+
+	* webrt/Ticket/Elements/ShowSummary:
+
+	fixed a hyperlink.
+	
+2000-12-30 00:07  jesse
+
+	* Makefile:
+
+	bumped version for release
+	
+2000-12-30 00:03  jesse
+
+	* etc/config.pm, lib/RT/User.pm,
+	webrt/Admin/Elements/ModifyKeywordSelect,
+	webrt/Admin/Global/Keywords.html,
+	webrt/Admin/KeywordSelects/index.html,
+	webrt/Admin/Keywords/Modify.html, webrt/Admin/Keywords/index.html,
+	webrt/Admin/Queues/Keywords.html, webrt/Admin/Users/index.html:
+
+	Fixed a bug in keyword creation that caused urls and param values to get buggered.
+	
+	Passwords are now encrypted in the database
+	
+2000-12-29 05:54  jesse
+
+	* bin/rt, lib/RT/Link.pm, lib/RT/Ticket.pm,
+	lib/RT/Interface/Web.pm, webrt/Ticket/Display.html,
+	webrt/Ticket/Elements/ShowDependencies,
+	webrt/Ticket/Elements/ShowLinks:
+
+	Did a bunch of work on the linking interface. It's now got
+	a much easier API. and it's twice as functional (you can delete links)
+	
+	Did the proof-of concept for the link code in the CLI. it'll need
+	fleshing out tomorrow.
+	
+	Fleshed out other parts of the CLI.
+	
+	stayed up way too late.
+	
+2000-12-29 00:30  jesse
+
+	* Makefile, bin/rt, lib/RT/Keyword.pm, lib/RT/Ticket.pm:
+
+	Added keyword support to the CLI.
+	fixed a couple of Keyword core bugs
+	
+2000-12-28 03:56  jesse
+
+	* bin/rt, bin/testdeps.pl, lib/RT/Keyword.pm,
+	lib/RT/KeywordSelect.pm, lib/RT/User.pm:
+
+	Removed unused keyword related code. added in a bit of
+	new keyword related code to get "relative" paths of keywords.
+	
+	fixed a longstanding warning in ACL checking.
+	
+	first 1/2 of keywords support for the new rt cli.
+	
+	added Tie::IxHash to testdeps.pl (keywords needs it)
+	
+2000-12-27 02:19  jesse
+
+	* webrt/Ticket/Elements/ShowTransaction:
+
+	missed a comma
+	
+2000-12-27 01:21  jesse
+
+	* webrt/Admin/Global/Keywords.html:
+
+	file Keywords.html was initially added on branch rt-1-1.
+	
+2000-12-27 01:21  jesse
+
+	* etc/schema.pm, lib/RT/ACE.pm, lib/RT/KeywordSelect.pm,
+	lib/RT/KeywordSelects.pm, lib/RT/Queue.pm, lib/RT/Ticket.pm,
+	lib/RT/Transaction.pm, webrt/Admin/Elements/SystemTabs,
+	webrt/Admin/Global/Keywords.html, webrt/Admin/Queues/Keywords.html,
+	webrt/Ticket/Create.html, webrt/Ticket/ModifyPeople.html,
+	webrt/Ticket/Elements/EditKeywordSelects,
+	webrt/Ticket/Elements/ShowKeywordSelects,
+	webrt/Ticket/Elements/ShowSummary,
+	webrt/Ticket/Elements/ShowTransaction:
+
+	Added the ability to name keyword selects.
+	first round of ACLing for keywords.
+	
+	Added the ability to create KeywordSelects which apply to all queues (Rather than just
+	a single queue)
+	
+	misc bigfixes.
+	
+2000-12-26 02:56  jesse
+
+	* webrt/Elements/SelectKeywordOptions:
+
+	file SelectKeywordOptions was initially added on branch rt-1-1.
+	
+2000-12-26 02:56  jesse
+
+	* webrt/Admin/Keywords/index.html:
+
+	file index.html was initially added on branch rt-1-1.
+	
+2000-12-26 02:56  jesse
+
+	* webrt/Admin/Queues/Keywords.html:
+
+	file Keywords.html was initially added on branch rt-1-1.
+	
+2000-12-26 02:56  jesse
+
+	* webrt/Elements/SelectKeyword:
+
+	file SelectKeyword was initially added on branch rt-1-1.
+	
+2000-12-26 02:56  jesse
+
+	* bin/webmux.pl, etc/schema.pm, lib/RT/Keyword.pm,
+	lib/RT/KeywordSelect.pm, lib/RT/KeywordSelects.pm,
+	lib/RT/Keywords.pm, lib/RT/ObjectKeyword.pm,
+	lib/RT/ObjectKeywords.pm, lib/RT/Queue.pm, lib/RT/Ticket.pm,
+	lib/RT/Watchers.pm, webrt/Admin/Elements/ModifyKeyword,
+	webrt/Admin/Elements/ModifyKeywordSelect,
+	webrt/Admin/Elements/QueueTabs, webrt/Admin/Elements/Tabs,
+	webrt/Admin/KeywordSelects/index.html,
+	webrt/Admin/Keywords/Modify.html, webrt/Admin/Keywords/index.html,
+	webrt/Admin/Queues/Keywords.html, webrt/Elements/SelectKeyword,
+	webrt/Elements/SelectKeywordOptions, webrt/Ticket/Modify.html,
+	webrt/Ticket/Elements/EditKeywordSelects,
+	webrt/Ticket/Elements/ShowKeywordSelects:
+
+	My first pass at making the keywords stuff work more like the rest of the RT core.
+	A couple of minor fixes on non-keywords things, but mostly this was an
+	edit of the keywords code to:
+		1. make the admin UI work more like the rest of the admin ui
+		(still need to do "global" keyword selections)
+	
+		2. bring the coding style of the keywords stuff more into line
+		with the rest of the codebase
+	
+		3. flesh out the helper methods in the keywords modules.
+	
+2000-12-24 02:04  jesse
+
+	* lib/RT/: Keyword.pm, KeywordSelect.pm, ObjectKeyword.pm:
+
+	A first round of commentary and cleanup on a few modules
+	
+2000-12-24 01:34  jesse
+
+	* webrt/Ticket/Elements/ShowKeywordSelects:
+
+	file ShowKeywordSelects was initially added on branch rt-1-1.
+	
+2000-12-24 01:34  jesse
+
+	* webrt/Ticket/Elements/EditKeywordSelects:
+
+	file EditKeywordSelects was initially added on branch rt-1-1.
+	
+2000-12-24 01:34  jesse
+
+	* webrt/Admin/: KeywordSelects/Modify.html, Keywords/Modify.html:
+
+	file Modify.html was initially added on branch rt-1-1.
+	
+2000-12-24 01:34  jesse
+
+	* webrt/Admin/KeywordSelects/index.html:
+
+	file index.html was initially added on branch rt-1-1.
+	
+2000-12-24 01:34  jesse
+
+	* webrt/Admin/Elements/ModifyKeyword:
+
+	file ModifyKeyword was initially added on branch rt-1-1.
+	
+2000-12-24 01:34  jesse
+
+	* webrt/Admin/Elements/ModifyKeywordSelect:
+
+	file ModifyKeywordSelect was initially added on branch rt-1-1.
+	
+2000-12-24 01:34  jesse
+
+	* webrt/Admin/Elements/SelectModifyKeyword:
+
+	file SelectModifyKeyword was initially added on branch rt-1-1.
+	
+2000-12-24 01:34  jesse
+
+	* webrt/Admin/Elements/SelectModifyKeywordSelect:
+
+	file SelectModifyKeywordSelect was initially added on branch rt-1-1.
+	
+2000-12-24 01:34  jesse
+
+	* lib/RT/ObjectKeyword.pm:
+
+	file ObjectKeyword.pm was initially added on branch rt-1-1.
+	
+2000-12-24 01:34  jesse
+
+	* lib/RT/Keyword.pm:
+
+	file Keyword.pm was initially added on branch rt-1-1.
+	
+2000-12-24 01:34  jesse
+
+	* lib/RT/KeywordSelect.pm:
+
+	file KeywordSelect.pm was initially added on branch rt-1-1.
+	
+2000-12-24 01:34  jesse
+
+	* lib/test.pl:
+
+	file test.pl was initially added on branch rt-1-1.
+	
+2000-12-24 01:34  jesse
+
+	* lib/RT/ObjectKeywords.pm:
+
+	file ObjectKeywords.pm was initially added on branch rt-1-1.
+	
+2000-12-24 01:34  jesse
+
+	* lib/RT/KeywordSelects.pm:
+
+	file KeywordSelects.pm was initially added on branch rt-1-1.
+	
+2000-12-24 01:34  jesse
+
+	* lib/RT/Keywords.pm:
+
+	file Keywords.pm was initially added on branch rt-1-1.
+	
+2000-12-24 01:34  jesse
+
+	* Makefile, etc/acl.Pg, etc/schema.pm, lib/MANIFEST,
+	lib/MANIFEST.SKIP, lib/Makefile.PL, lib/RT.pm, lib/test.pl,
+	lib/RT/Keyword.pm, lib/RT/KeywordSelect.pm,
+	lib/RT/KeywordSelects.pm, lib/RT/Keywords.pm,
+	lib/RT/ObjectKeyword.pm, lib/RT/ObjectKeywords.pm,
+	lib/RT/Ticket.pm, webrt/Admin/Elements/ModifyKeyword,
+	webrt/Admin/Elements/ModifyKeywordSelect,
+	webrt/Admin/Elements/SelectModifyKeyword,
+	webrt/Admin/Elements/SelectModifyKeywordSelect,
+	webrt/Admin/Elements/Tabs, webrt/Admin/KeywordSelects/Modify.html,
+	webrt/Admin/KeywordSelects/index.html,
+	webrt/Admin/Keywords/Modify.html, webrt/Ticket/Modify.html,
+	webrt/Ticket/Elements/EditBasics,
+	webrt/Ticket/Elements/EditKeywordSelects,
+	webrt/Ticket/Elements/ShowKeywordSelects,
+	webrt/Ticket/Elements/ShowSummary:
+
+	Importing two largish patches from ivan@420.am:
+		First up, ivan switched lib/RT over to using MakeMaker..so now
+		we get man pages for the core modules and a bunch of other cool stuff.
+	
+		Second: ivan handed us an almost complete keywords system.  Over the next
+		week or two, I'm going to be adding ACL support to the keywords system
+		and starting to integrate bits of it better into the rest of the core
+		(though it's nearly all done already).
+	
+			Thanks, ivan!
+	
+2000-12-24 01:34  jesse
+
+	* lib/MANIFEST:
+
+	file MANIFEST was initially added on branch rt-1-1.
+	
+2000-12-24 01:34  jesse
+
+	* lib/Makefile.PL:
+
+	file Makefile.PL was initially added on branch rt-1-1.
+	
+2000-12-24 01:34  jesse
+
+	* lib/RT.pm:
+
+	file RT.pm was initially added on branch rt-1-1.
+	
+2000-12-24 01:34  jesse
+
+	* lib/MANIFEST.SKIP:
+
+	file MANIFEST.SKIP was initially added on branch rt-1-1.
+	
+2000-12-23 23:45  jesse
+
+	* Makefile, webrt/Ticket/Elements/Tabs:
+
+	made the links in the ticket tool bar point to the right places.
+	
+2000-12-23 23:15  jesse
+
+	* lib/RT/Ticket.pm:
+
+	fixing a typo and the docs.
+	
+2000-12-23 23:12  jesse
+
+	* lib/RT/Ticket.pm:
+
+	the internal function _SetTold shouldn't be hitting an ACL check.
+	
+2000-12-23 17:37  jesse
+
+	* lib/RT/Ticket.pm, webrt/Ticket/Display.html,
+	webrt/Ticket/Modify.html, webrt/Ticket/ModifyDates.html,
+	webrt/Ticket/ModifyLinks.html, webrt/Ticket/ModifyPeople.html,
+	webrt/Ticket/Update.html, webrt/Ticket/Elements/Tabs,
+	webrt/Ticket/Elements/TicketToolBox:
+
+	Cleaned up a bit of date diff related functionality.
+	
+	Did work on the ticket tool bar.
+	
+2000-12-23 16:46  jesse
+
+	* lib/RT/Record.pm:
+
+	Lets try that again..
+	
+2000-12-23 16:39  jesse
+
+	* lib/RT/Record.pm:
+
+	LongSinceUpdatedAsString is now actually relative :)
+	
+2000-12-23 16:09  jesse
+
+	* lib/RT/Tickets.pm:
+
+	added a default to LimitStatus.
+	
+2000-12-23 01:47  jesse
+
+	* bin/: rt, testdeps.pl:
+
+	updated testdeps to require the latest mason (for ease of debugging)
+	the new combined bin/rt actually implements the behavior of rtq and rt -show
+	fully (I believe). next up, more ticket modification and a code cleanup
+	
+2000-12-22 18:37  jesse
+
+	* Makefile:
+
+	bumped to 1.3.28 for release
+	
+2000-12-19 22:38  jesse
+
+	* lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/Transaction.pm,
+	lib/RT/Interface/Web.pm, webrt/Elements/Tabs,
+	webrt/Ticket/ModifyPeople.html, webrt/Ticket/Elements/EditPeople,
+	webrt/User/Prefs.html:
+
+	Removed outdated CC request to and BCC request to
+	did some UI touchups.
+	
+	started a bit of work in tickets.pm for the new CLI (more explicit searching)
+	
+2000-12-19 21:50  jesse
+
+	* bin/rt:
+
+	Modifying ticket requestors from the commandline works. yay.
+	Simplified the commandline arguments a bit too.
+	
+2000-12-19 18:37  jesse
+
+	* bin/: mason_handler.fcgi, webmux.pl:
+
+	updaes to webmux.pl to work on with new versions of HTML::Mason
+	
+2000-12-19 14:05  jesse
+
+	* webrt/Ticket/Display.html:
+
+	Fixed a bug in Ticket/Display.html that caused navigation not to work within new tickets.
+	
+2000-12-19 04:03  jesse
+
+	* bin/rt:
+
+	implemented --history (show ticket history)
+	and --limit-status (limit to a ticket status)
+	just to make sure that this works at all.  it does.
+	
+	With the new ui, you'll be able to trivially perform actions on large #s of tickets.
+	
+2000-12-19 03:38  jesse
+
+	* bin/rt:
+
+	After playing with a few Getopt variants, I've settled on Getopt::Long for now...
+	and implemented the skeleton of the new RT cli.  I suspect that with another day's work,
+	it should be mostly functional. yay.
+	
+2000-12-19 03:38  jesse
+
+	* bin/rt:
+
+	file rt was initially added on branch rt-1-1.
+	
+2000-12-18 19:34  jesse
+
+	* docs/design_docs/cli_spec:
+
+	file cli_spec was initially added on branch rt-1-1.
+	
+2000-12-18 19:34  jesse
+
+	* docs/design_docs/cli_spec:
+
+	Added the CLI spec from deborah.
+	
+2000-12-18 02:11  jesse
+
+	* webrt/Elements/: CreateTicket, GotoTicket:
+
+	Fixed a basepath error.
+	
+2000-12-18 01:19  jesse
+
+	* webrt/Elements/CreateTicket:
+
+	file CreateTicket was initially added on branch rt-1-1.
+	
+2000-12-18 01:19  jesse
+
+	* webrt/Elements/GotoTicket:
+
+	file GotoTicket was initially added on branch rt-1-1.
+	
+2000-12-18 01:19  jesse
+
+	* README, webrt/Admin/Queues/Modify.html,
+	webrt/Admin/Users/Modify.html, webrt/Elements/CreateTicket,
+	webrt/Elements/GotoTicket, webrt/Search/Listing.html:
+
+	A few more changes from Lee Ann and a couple of files I missed on the earlier  checkins.
+	
+2000-12-18 01:14  jesse
+
+	* webrt/Admin/Groups/Rights.html:
+
+	file Rights.html was initially added on branch rt-1-1.
+	
+2000-12-18 01:14  jesse
+
+	* webrt/Admin/Groups/: Members.html, Rights.html:
+
+	a couple UI tweaks from Lee Ann Goldstein
+	
+2000-12-18 00:51  jesse
+
+	* webrt/: Admin/Elements/SystemTabs, Admin/Groups/index.html,
+	Admin/Users/index.html, Elements/Submit, Elements/Tabs:
+
+	More UI hacking. whee
+	
+2000-12-17 23:55  jesse
+
+	* webrt/: Elements/SelectNewTicketQueue, Elements/SelectOwner,
+	Elements/Tabs, Ticket/Create.html, Ticket/Elements/Tabs:
+
+	ui hacking to add the "Create Ticket" and "Goto Ticket" ui elements at the top.
+	
+2000-12-17 22:17  jesse
+
+	* lib/RT/Ticket.pm, lib/RT/Transaction.pm,
+	webrt/Elements/MessageBox, webrt/Ticket/Modify.html,
+	webrt/Ticket/ModifyPeople.html:
+
+	Fixing bugs 7,8,28
+	
+2000-12-17 02:38  jesse
+
+	* webrt/Ticket/Elements/ShowDates:
+
+	*sigh* typo in ShowDates.
+	
+2000-12-17 02:34  jesse
+
+	* lib/RT/Date.pm, webrt/Ticket/Elements/EditDates,
+	webrt/Ticket/Elements/ShowDates:
+
+	A bit of work on Dates. a postgres fix from ivan and some display prettification.
+	
+2000-12-17 02:15  jesse
+
+	* Makefile, webrt/Ticket/Elements/TicketToolBox:
+
+	commeted out some toolbar actions which don't work yet.
+	
+	bumped the version to 1.3.27 for imminent release.
+	
+2000-12-17 01:51  jesse
+
+	* lib/RT/Attachment.pm:
+
+	The ACL problem on attachments was a bootstrapping issue. couldn't check acls because it
+	couldn't necessarily see what to check
+	
+2000-12-17 01:44  jesse
+
+	* lib/RT/Attachment.pm:
+
+	acl fix for attachments.
+	
+2000-12-17 01:15  jesse
+
+	* lib/RT/Ticket.pm:
+
+	fixing ugly disgusting ACL bugs
+	
+2000-12-17 00:35  jesse
+
+	* lib/RT/Transaction.pm, lib/RT/User.pm,
+	webrt/Ticket/Elements/ShowTransaction:
+
+	Fixing bugs in Transaction ACLs.
+	
+2000-12-16 03:56  jesse
+
+	* webrt/Admin/Groups/Members.html:
+
+	ui nit in admin/groups/members.
+	
+2000-12-16 03:31  jesse
+
+	* lib/RT/: Group.pm, GroupMember.pm:
+
+	$object->$SUPER::Foo is wrong. $object->SUPER::Foo is not.
+	
+2000-12-16 03:28  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Rights checks for ticket ownership work best when the right that's set is the same
+	as the right that's checked for *sigh*
+	
+2000-12-16 03:26  jesse
+
+	* webrt/Admin/Groups/Members.html:
+
+	Fixed a couple bugs in Group mebership administration code.
+	
+2000-12-16 03:04  jesse
+
+	* webrt/: Admin/Elements/GroupTabs, Admin/Elements/QueueTabs,
+	Admin/Elements/SystemTabs, Admin/Elements/Tabs,
+	Admin/Elements/UserTabs, Admin/Global/index.html,
+	Admin/Groups/Modify.html, Admin/Groups/index.html,
+	Admin/Queues/People.html, Admin/Queues/index.html,
+	Admin/Users/Modify.html, Admin/Users/index.html,
+	Elements/SelectWatcherType, Elements/Tabs, Ticket/Create.html,
+	Ticket/Display.html, Ticket/Elements/Tabs:
+
+	Bugfix in user admin (no longer automatically revokes "privileged status)
+	a bunch of tab-related UI cleanup. the start of tabs that reflect the current page.
+	
+	added the ability to configure queue watchers from the web ui
+	
+2000-12-16 03:04  jesse
+
+	* webrt/Admin/Queues/People.html:
+
+	file People.html was initially added on branch rt-1-1.
+	
+2000-12-16 00:58  jesse
+
+	* webrt/Admin/Users/index.html:
+
+	typo fixing.
+	
+2000-12-15 19:12  jesse
+
+	* webrt/Admin/Global/GroupRights.html:
+
+	file GroupRights.html was initially added on branch rt-1-1.
+	
+2000-12-15 19:12  jesse
+
+	* webrt/Admin/Global/UserRights.html:
+
+	file UserRights.html was initially added on branch rt-1-1.
+	
+2000-12-15 19:12  jesse
+
+	* webrt/Admin/Elements/GroupTabs:
+
+	file GroupTabs was initially added on branch rt-1-1.
+	
+2000-12-15 19:12  jesse
+
+	* lib/RT/ACE.pm, lib/RT/Group.pm, lib/RT/Groups.pm,
+	lib/RT/Record.pm, lib/RT/Scrip.pm, lib/RT/ScripAction.pm,
+	lib/RT/Ticket.pm, lib/RT/Transaction.pm, lib/RT/User.pm,
+	lib/RT/Users.pm, tools/insertdata, webrt/Admin/Elements/GroupTabs,
+	webrt/Admin/Elements/SystemTabs, webrt/Admin/Global/ACL.html,
+	webrt/Admin/Global/GroupRights.html,
+	webrt/Admin/Global/UserRights.html,
+	webrt/Admin/Groups/Members.html, webrt/Admin/Groups/Modify.html,
+	webrt/Admin/Groups/index.html, webrt/Admin/Users/Modify.html,
+	webrt/Admin/Users/index.html:
+
+	A bunch of cleanup work on Users and Groups (and a couple of small bugfixes, one
+	which might prevent install of Alpha 2) mostly aimed at improving the admin ui.
+	
+	We now have two levels of "Privileged" for a user, 1 which means "can be granted rights"
+	and 2 which means "should not be futzed with by the user"
+	
+2000-12-14 23:04  jesse
+
+	* webrt/Ticket/Attachment/dhandler:
+
+	Accidentally left out of the last rev. sorry about that.
+	
+2000-12-14 23:04  jesse
+
+	* webrt/Ticket/Attachment/dhandler:
+
+	file dhandler was initially added on branch rt-1-1.
+	
+2000-12-12 20:44  jesse
+
+	* Makefile:
+
+	Bumped version to 1.3.26. This is RT2 Alpha 2, folks.
+	
+2000-12-12 20:34  jesse
+
+	* lib/RT/Attachment.pm, lib/RT/Record.pm, lib/RT/Ticket.pm,
+	lib/RT/Transaction.pm, lib/RT/User.pm,
+	webrt/Ticket/Elements/ShowTransaction:
+
+	Attachment display in the webui now just works [tm] RT2 Alpha 2 will be rolled later tonight.
+	
+2000-12-12 19:03  jesse
+
+	* webrt/Admin/Global/Template.html:
+
+	file Template.html was initially added on branch rt-1-1.
+	
+2000-12-12 19:03  jesse
+
+	* webrt/Admin/Global/Templates.html:
+
+	file Templates.html was initially added on branch rt-1-1.
+	
+2000-12-12 19:03  jesse
+
+	* README, bin/webmux.pl, lib/RT/Attachment.pm, lib/RT/Template.pm,
+	lib/RT/Transaction.pm, webrt/Admin/Elements/SelectTemplate,
+	webrt/Admin/Elements/SystemTabs, webrt/Admin/Global/Template.html,
+	webrt/Admin/Global/Templates.html,
+	webrt/Admin/Queues/Templates.html,
+	webrt/Ticket/Elements/ShowTransaction:
+
+	Working on attachments support.
+	
+	did some work on global templates
+	
+2000-12-12 15:15  jesse
+
+	* lib/RT/Template.pm, lib/RT/Templates.pm, tools/insertdata:
+
+	Core support for system-scoped templates
+	
+2000-12-12 14:12  jesse
+
+	* webrt/Admin/: Queues/Modify.html, Users/Create.html,
+	Users/Modify.html:
+
+	Fixed queue and user creation problems.
+	
+2000-12-12 03:05  jesse
+
+	* webrt/Ticket/: Link.html, ModifyLinks.html, Elements/ShowSummary,
+	Elements/Tabs:
+
+	Brought the still basic link editing ui into conformance with the rest of the ticket ui
+	
+2000-12-12 03:05  jesse
+
+	* webrt/Ticket/ModifyLinks.html:
+
+	file ModifyLinks.html was initially added on branch rt-1-1.
+	
+2000-12-12 02:41  jesse
+
+	* webrt/Ticket/: ModifyDates.html, ModifyPeople.html:
+
+	split out the ticket modify screen into 3 more bite-sized pages.
+	
+2000-12-12 02:41  jesse
+
+	* webrt/Ticket/ModifyPeople.html:
+
+	file ModifyPeople.html was initially added on branch rt-1-1.
+	
+2000-12-12 02:41  jesse
+
+	* webrt/Ticket/ModifyDates.html:
+
+	file ModifyDates.html was initially added on branch rt-1-1.
+	
+2000-12-12 02:41  jesse
+
+	* webrt/Ticket/: Modify.html, Elements/Tabs:
+
+	[no log message]
+	
+2000-12-11 15:01  jesse
+
+	* webrt/NoAuth/Login.html:
+
+	file Login.html was initially added on branch rt-1-1.
+	
+2000-12-11 15:01  jesse
+
+	* webrt/NoAuth/Logout.html:
+
+	file Logout.html was initially added on branch rt-1-1.
+	
+2000-12-11 15:01  jesse
+
+	* webrt/: Login.html, Logout.html, autohandler, Elements/Footer,
+	Elements/Header, NoAuth/Login.html, NoAuth/Logout.html:
+
+	Moving Login and Logout around so they work right with the new NoAuth scheme
+	
+2000-12-11 05:00  jesse
+
+	* webrt/: Login.html, autohandler:
+
+	fixed a couple login bugs. implemented some logic to deal with different auth classes:
+	/NoAuth/ and /SelfService/
+	
+2000-12-11 01:46  jesse
+
+	* webrt/: rt.jpg, Elements/Header, Elements/MyRequests,
+	Elements/MyTickets, Search/Listing.html, Ticket/Create.html,
+	Ticket/Create_Detail.html, Ticket/Display.html, Ticket/Modify.html,
+	Ticket/Update.html, Ticket/Elements/ShowTransaction,
+	Ticket/Elements/Tabs, Ticket/Elements/TicketToolBox:
+
+	 Work on ticket display. we're getting there.
+	
+2000-12-10 23:53  jesse
+
+	* webrt/Admin/Queues/Template.html:
+
+	file Template.html was initially added on branch rt-1-1.
+	
+2000-12-10 23:53  jesse
+
+	* webrt/Admin/Queues/Templates.html:
+
+	file Templates.html was initially added on branch rt-1-1.
+	
+2000-12-10 23:53  jesse
+
+	* webrt/Admin/Elements/QueueTabs:
+
+	file QueueTabs was initially added on branch rt-1-1.
+	
+2000-12-10 23:53  jesse
+
+	* webrt/Admin/Elements/SystemTabs:
+
+	file SystemTabs was initially added on branch rt-1-1.
+	
+2000-12-10 23:53  jesse
+
+	* webrt/Admin/: Global/Scrips.html, Queues/Scrips.html:
+
+	file Scrips.html was initially added on branch rt-1-1.
+	
+2000-12-10 23:53  jesse
+
+	* webrt/Admin/Elements/UserTabs:
+
+	file UserTabs was initially added on branch rt-1-1.
+	
+2000-12-10 23:53  jesse
+
+	* webrt/Admin/: Global/ACL.html, Queues/ACL.html:
+
+	file ACL.html was initially added on branch rt-1-1.
+	
+2000-12-10 23:53  jesse
+
+	* webrt/Admin/Global/index.html:
+
+	file index.html was initially added on branch rt-1-1.
+	
+2000-12-10 23:53  jesse
+
+	* Makefile, webrt/index.html, webrt/Admin/ModifyUser,
+	webrt/Admin/index.html, webrt/Admin/Elements/Header,
+	webrt/Admin/Elements/QueueTabs, webrt/Admin/Elements/SystemTabs,
+	webrt/Admin/Elements/Tabs, webrt/Admin/Elements/UserTabs,
+	webrt/Admin/Global/ACL.html, webrt/Admin/Global/Scrips.html,
+	webrt/Admin/Global/index.html, webrt/Admin/Queues/ACL.html,
+	webrt/Admin/Queues/Modify.html, webrt/Admin/Queues/Scrips.html,
+	webrt/Admin/Queues/Template.html,
+	webrt/Admin/Queues/Templates.html, webrt/Admin/Queues/index.html,
+	webrt/Admin/Users/Modify.html, webrt/Admin/Users/index.html,
+	webrt/Elements/Header, webrt/Elements/Tabs:
+
+	Bunch of work on the web administration framework.
+	Lots of stuff should be much cleaner now.
+	
+2000-12-10 01:21  jesse
+
+	* Makefile:
+
+	Bumped version to 1.3.25 for release
+	
+2000-12-10 01:15  jesse
+
+	* webrt/: Elements/TitleBoxEnd, Elements/TitleBoxStart,
+	SelfService/Elements/MyRequests, SelfService/Elements/Tabs,
+	Ticket/Update.html, User/Prefs.html:
+
+	Work on SSRI and a bit of overall UI tweaking
+	
+2000-12-09 22:48  jesse
+
+	* webrt/SelfService/Elements/Header:
+
+	file Header was initially added on branch rt-1-1.
+	
+2000-12-09 22:48  jesse
+
+	* webrt/SelfService/Elements/: Header, MyRequests, Tabs:
+
+	Missed a couple files for SSRI
+	
+2000-12-09 22:48  jesse
+
+	* webrt/SelfService/Elements/MyRequests:
+
+	file MyRequests was initially added on branch rt-1-1.
+	
+2000-12-09 22:48  jesse
+
+	* webrt/SelfService/Elements/Tabs:
+
+	file Tabs was initially added on branch rt-1-1.
+	
+2000-12-09 22:43  jesse
+
+	* webrt/SelfService/Create.html:
+
+	file Create.html was initially added on branch rt-1-1.
+	
+2000-12-09 22:43  jesse
+
+	* webrt/SelfService/Details.html:
+
+	file Details.html was initially added on branch rt-1-1.
+	
+2000-12-09 22:43  jesse
+
+	* webrt/SelfService/index.html:
+
+	file index.html was initially added on branch rt-1-1.
+	
+2000-12-09 22:43  jesse
+
+	* webrt/SelfService/Closed.html:
+
+	file Closed.html was initially added on branch rt-1-1.
+	
+2000-12-09 22:43  jesse
+
+	* webrt/Elements/SelectNewTicketQueue:
+
+	file SelectNewTicketQueue was initially added on branch rt-1-1.
+	
+2000-12-09 22:43  jesse
+
+	* webrt/Admin/Groups/Members.html:
+
+	file Members.html was initially added on branch rt-1-1.
+	
+2000-12-09 22:43  jesse
+
+	* webrt/Admin/Elements/SelectUsers:
+
+	file SelectUsers was initially added on branch rt-1-1.
+	
+2000-12-09 22:43  jesse
+
+	* lib/RT/CurrentUser.pm, lib/RT/Group.pm, lib/RT/GroupMember.pm,
+	lib/RT/Record.pm, lib/RT/User.pm, lib/RT/Users.pm,
+	webrt/Login.html, webrt/autohandler,
+	webrt/Admin/Elements/SelectModifyGroup,
+	webrt/Admin/Elements/SelectUsers, webrt/Admin/Groups/Members.html,
+	webrt/Admin/Groups/Modify.html, webrt/Admin/Groups/index.html,
+	webrt/Admin/Users/Modify.html, webrt/Admin/Users/index.html,
+	webrt/Elements/Header, webrt/Elements/SelectNewTicketQueue,
+	webrt/SelfService/Closed.html, webrt/SelfService/Create.html,
+	webrt/SelfService/Details.html, webrt/SelfService/index.html,
+	webrt/User/Prefs.html:
+
+	First rev of SSRI, the Self Service Requestor Interface.
+	Did a bunch of work on groups and the admin UI
+	
+2000-12-05 23:24  jesse
+
+	* webrt/Admin/Groups/Modify.html:
+
+	file Modify.html was initially added on branch rt-1-1.
+	
+2000-12-05 23:24  jesse
+
+	* webrt/Admin/Groups/index.html:
+
+	file index.html was initially added on branch rt-1-1.
+	
+2000-12-05 23:24  jesse
+
+	* webrt/Admin/Elements/SelectModifyGroup:
+
+	file SelectModifyGroup was initially added on branch rt-1-1.
+	
+2000-12-05 23:24  jesse
+
+	* lib/RT/Action/NotifyAsComment.pm:
+
+	file NotifyAsComment.pm was initially added on branch rt-1-1.
+	
+2000-12-05 23:24  jesse
+
+	* lib/RT/Group.pm, lib/RT/GroupMembers.pm, lib/RT/Scrip.pm,
+	lib/RT/Action/Notify.pm, lib/RT/Action/NotifyAsComment.pm,
+	lib/RT/Action/SendEmail.pm, tools/insertdata,
+	webrt/Admin/Elements/SelectModifyGroup,
+	webrt/Admin/Groups/Modify.html, webrt/Admin/Groups/index.html,
+	webrt/Admin/Queues/Modify.html, webrt/Admin/Queues/index.html:
+
+	Lots of work on groups. I think the core is basically set.  UI has been started
+	
+	Scrips got even more work and more code. they now work at least as well as
+	they ever have _and_ they now do it for the right reasons.
+	
+2000-12-02 13:44  jesse
+
+	* Makefile:
+
+	
+	fixed a local customization in the makefile
+	
+2000-12-02 13:34  jesse
+
+	* Makefile:
+
+	bumped version to 1.0.6
+	
+2000-12-02 03:22  jesse
+
+	* webrt/Ticket/Link.html:
+
+	file Link.html was initially added on branch rt-1-1.
+	
+2000-12-02 03:22  jesse
+
+	* lib/RT/Scrip.pm, lib/RT/ScripActions.pm, lib/RT/Scrips.pm,
+	webrt/Ticket/Link.html:
+
+	catching some stragglers.
+	
+2000-12-02 03:22  jesse
+
+	* lib/RT/ScripActions.pm:
+
+	file ScripActions.pm was initially added on branch rt-1-1.
+	
+2000-12-02 03:20  jesse
+
+	* webrt/Admin/Elements/SelectScripAction:
+
+	file SelectScripAction was initially added on branch rt-1-1.
+	
+2000-12-02 03:20  jesse
+
+	* webrt/Admin/Elements/SelectScripCondition:
+
+	file SelectScripCondition was initially added on branch rt-1-1.
+	
+2000-12-02 03:20  jesse
+
+	* lib/RT/: Action/Generic.pm, Condition/Generic.pm:
+
+	file Generic.pm was initially added on branch rt-1-1.
+	
+2000-12-02 03:20  jesse
+
+	* lib/RT/Condition/AnyTransaction.pm:
+
+	file AnyTransaction.pm was initially added on branch rt-1-1.
+	
+2000-12-02 03:20  jesse
+
+	* lib/RT/Condition/NewDependency.pm:
+
+	file NewDependency.pm was initially added on branch rt-1-1.
+	
+2000-12-02 03:20  jesse
+
+	* lib/RT/ScripAction.pm:
+
+	file ScripAction.pm was initially added on branch rt-1-1.
+	
+2000-12-02 03:20  jesse
+
+	* lib/RT/ScripCondition.pm:
+
+	file ScripCondition.pm was initially added on branch rt-1-1.
+	
+2000-12-02 03:20  jesse
+
+	* lib/RT/ScripConditions.pm:
+
+	file ScripConditions.pm was initially added on branch rt-1-1.
+	
+2000-12-02 03:20  jesse
+
+	* bin/webmux.pl, docs/design_docs/subscription-definitions.txt,
+	etc/schema.pm, lib/RT/Action.pm, lib/RT/Scrip.pm,
+	lib/RT/ScripAction.pm, lib/RT/ScripCondition.pm,
+	lib/RT/ScripConditions.pm, lib/RT/ScripScope.pm,
+	lib/RT/ScripScopes.pm, lib/RT/Scrips.pm, lib/RT/Transaction.pm,
+	lib/RT/Action/Generic.pm, lib/RT/Action/Notify.pm,
+	lib/RT/Action/OpenDependent.pm, lib/RT/Action/ResolveMembers.pm,
+	lib/RT/Action/SendEmail.pm, lib/RT/Action/SendEmailOnResolve.pm,
+	lib/RT/Action/StallDependent.pm,
+	lib/RT/Condition/AnyTransaction.pm, lib/RT/Condition/Generic.pm,
+	lib/RT/Condition/NewDependency.pm, tools/insertdata,
+	webrt/Admin/Elements/SelectScripAction,
+	webrt/Admin/Elements/SelectScripCondition:
+
+	Major major major work on scrips
+	scrips now specify a 'Stage' which has only one value for now but should be easier to add in other
+	points in the code where they get called
+	
+	What used to be called Scrip got split into ScripCondition and ScripAction
+	
+	ScripScope got renamed 'Scrip', like it should have been from the getgo.
+	
+	Did some work to the scrip mailing routines.All in all, scrips are much
+	cleaner and more flexible. and at least as functional as they were last night.
+	
+	I'll be adjusting the templates as I get to them
+	
+2000-12-01 14:02  jesse
+
+	* NEWS:
+
+	fixed a display bug in how we split messages for the webui
+	
+2000-11-30 02:18  jesse
+
+	* lib/RT/Action/AutoReply.pm, lib/RT/Action/SendEmail.pm,
+	tools/insertdata:
+
+	Working on cleaning up the Scrips system.  The whole templating system
+	was really, really incredibly overdesigned and badly implemented on the first go-round.
+	Over the next few checkins, I'll be cleaning it up and cleaning it out...
+	
+2000-11-29 16:31  jesse
+
+	* bin/testdeps.pl:
+
+	updated apache::session dependency
+	
+2000-11-29 01:32  jesse
+
+	* lib/RT/ACE.pm, lib/RT/ScripScope.pm, lib/RT/Ticket.pm,
+	lib/RT/Transaction.pm, lib/RT/User.pm, lib/RT/Action/AutoReply.pm,
+	lib/RT/Action/SendEmail.pm, lib/RT/Interface/Email.pm,
+	webrt/Admin/Elements/SelectScrip,
+	webrt/Admin/Elements/SelectTemplate,
+	webrt/Ticket/Create_Detail.html:
+
+	Work on scrips all around:
+		web ui cleanups
+		Action::SendEmail cleanups
+	
+	work on acls for Ticket creation.
+	now users who only have "CreateTicket" can actually create tickets,
+	even if they can't see the ticket once created.
+	RT1's "allow nonmembers to create requests" can be replicated by
+	granting  the metagroup 'requestors' the right "CreateTicket".
+	
+	Mail gateway got a lot of debugging stubs. mail gateway now uses
+	modern semantics for Create.
+	
+2000-11-28 17:46  jesse
+
+	* lib/RT/User.pm:
+
+	cacheed acl decisions are now properly granular.
+	
+2000-11-28 17:39  jesse
+
+	* lib/RT/User.pm:
+
+	Cached ACL decisions are now expire after 2 minutes.
+	
+2000-11-28 03:37  jesse
+
+	* etc/config.pm, lib/RT/Ticket.pm, webrt/Ticket/Update.html,
+	webrt/Ticket/Elements/ShowReferences,
+	webrt/Ticket/Elements/ShowTransaction:
+
+	fixed a small bug in ticket update.
+	fixed a set of bugs in "external" links that were discovered when my roommate suggested
+	that RT could be used as an mp3 playlist server.  Now it can. no, you really don't want to.
+	At least until we have asset managment.
+	
+2000-11-28 00:20  jesse
+
+	* Makefile, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
+	lib/RT/Action/SendEmail.pm:
+
+	a couple little tweask to transaction and sendemail.
+	
+	bumped the version #
+	
+2000-11-28 00:12  jesse
+
+	* webrt/Ticket/: Display.html, LinkIt.html, ProcessUpdate.html,
+	Update.html, Elements/ShowSummary, Elements/ShowTransaction,
+	Elements/TicketToolBox:
+
+	Work on cleaning up the web ui. got rid of processupdate.html.
+	cleaned up the code in display.html..  linking is no longer nearly as offensive.
+	
+2000-11-27 20:26  jesse
+
+	* webrt/Ticket/Elements/ShowRequestor:
+
+	small display fix to not show nobody as a possible requestor
+	
+2000-11-27 20:05  jesse
+
+	* lib/RT/Ticket.pm, lib/RT/User.pm, webrt/Ticket/Display.html:
+
+	Updates to how Create handles Requestor, Cc and Admin Cc.
+	it's now much more flexible, cleaner and simpler. yay.
+	
+2000-11-27 04:01  jesse
+
+	* webrt/Elements/: Error, Header, MyRequests:
+
+	Web error reporting tweaks.
+	added MyRequests to the front page
+	
+2000-11-27 04:01  jesse
+
+	* webrt/Elements/MyRequests:
+
+	file MyRequests was initially added on branch rt-1-1.
+	
+2000-11-27 03:30  jesse
+
+	* lib/RT/Ticket.pm, lib/RT/Interface/Web.pm,
+	webrt/Ticket/Display.html, webrt/Ticket/Elements/ShowHistory:
+
+	more work on ACLs
+	
+	Ticket.pm has been fully ACLed.
+	Did work on web ticket create.  it's no longer a festering pile of garbage.
+	Now it's more of an office wastepaper basket full of clean white 20lb paper.
+	Seriously, though, it's cleaner. I got rid of some of Tobias' temporary ticket creation
+	code.
+	
+2000-11-26 23:45  jesse
+
+	* lib/RT/ACE.pm, lib/RT/GroupMember.pm, lib/RT/Queue.pm,
+	lib/RT/Queues.pm, lib/RT/Template.pm, lib/RT/Ticket.pm,
+	lib/RT/User.pm, lib/RT/Interface/Web.pm, tools/insertdata,
+	webrt/Admin/Elements/ModifyQueue, webrt/Elements/Header,
+	webrt/Elements/Tabs:
+
+	
+	
+	lots more ACL work.
+	a little bit of UI cleanup.
+	
+2000-11-25 01:56  jesse
+
+	* lib/RT/Tickets.pm, webrt/index.html,
+	webrt/Ticket/Elements/ShowDates:
+
+	made "my requests" doable.
+	fixed some ui in showdates.
+	
+2000-11-24 20:14  jesse
+
+	* lib/RT/: Queue.pm, User.pm:
+
+	Fixed a couple of bugs in HasSystemRight that make RT install correctly again.
+	
+2000-11-24 19:21  jesse
+
+	* etc/schema.pm:
+
+	schema fix to make pg happy
+	
+2000-11-22 03:08  jesse
+
+	* webrt/Ticket/Update.html:
+
+	cleaned up the ticket udpdate form. made it more concise.::
+	
+2000-11-22 03:04  jesse
+
+	* webrt/Ticket/Update.html:
+
+	cleaning up the ticket update form
+	
+2000-11-22 02:49  jesse
+
+	* bin/testdeps.pl:
+
+	bumped searchbuilder dependency to the version now in CPAN...
+	
+2000-11-22 02:31  jesse
+
+	* Makefile, lib/RT/ACE.pm, lib/RT/ACL.pm, lib/RT/Action.pm,
+	lib/RT/Attachment.pm, lib/RT/Attachments.pm, lib/RT/CurrentUser.pm,
+	lib/RT/Date.pm, lib/RT/EasySearch.pm, lib/RT/Group.pm,
+	lib/RT/GroupMember.pm, lib/RT/GroupMembers.pm, lib/RT/Groups.pm,
+	lib/RT/Handle.pm, lib/RT/Link.pm, lib/RT/Links.pm, lib/RT/Queue.pm,
+	lib/RT/Queues.pm, lib/RT/Record.pm, lib/RT/Scrip.pm,
+	lib/RT/ScripScope.pm, lib/RT/ScripScopes.pm, lib/RT/Scrips.pm,
+	lib/RT/Template.pm, lib/RT/Templates.pm, lib/RT/Ticket.pm,
+	lib/RT/Tickets.pm, lib/RT/Transaction.pm, lib/RT/Transactions.pm,
+	lib/RT/User.pm, lib/RT/Users.pm, lib/RT/Utils.pm,
+	lib/RT/Watcher.pm, lib/RT/Watchers.pm:
+
+	Bumped version to 1.3.23
+	Added pod headers to most core modules?
+	
+2000-11-21 23:05  jesse
+
+	* webrt/Ticket/Elements/ShowSummary:
+
+	removed a dead link
+	
+2000-11-21 04:07  jesse
+
+	* Makefile, lib/RT/Queue.pm, lib/RT/Scrip.pm, lib/RT/ScripScope.pm,
+	lib/RT/Transaction.pm, lib/RT/User.pm:
+
+	tmp logfiles now go in /tmp
+	oh. and SCRIPS NOW WORK. RT can send mail.
+	and recieve mail. life is good.
+	
+2000-11-21 02:55  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Implemented Ticket->IsWatcher.
+	This is what we needed to make pseudogroup based ACLs work
+	
+2000-11-21 00:55  jesse
+
+	* lib/RT/Queue.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
+	webrt/Elements/Tabs:
+
+	fixed a couple of bugs while I was out and about.
+	Oh. and most of the rest of the ACL core is implemented now.
+	rights for requestor/owner/cc/admincc should now work.
+	
+2000-11-20 11:59  jesse
+
+	* lib/RT/ACE.pm, lib/RT/User.pm, tools/insertdata:
+
+	Added "Requestor" and "Everyone" metagroups to tools/insertdata
+	
+	Fixed a bug with yet another way to call HasQueueRight.
+	
+2000-11-20 00:39  jesse
+
+	* Makefile:
+
+	bumped to 1.3.22 for release
+	
+2000-11-20 00:24  jesse
+
+	* webrt/Search/Listing.html:
+
+	fixed a big triggered when clearing empty ticket searches
+	
+2000-11-19 23:55  jesse
+
+	* bin/webmux.pl, lib/RT/User.pm:
+
+	fixed a bug that stopped you from specifying an owner on ticket create
+	Watcher and Watchers are now preloaded in the App server.
+	
+2000-11-19 23:20  jesse
+
+	* webrt/Ticket/Elements/Tabs:
+
+	file Tabs was initially added on branch rt-1-1.
+	
+2000-11-19 23:20  jesse
+
+	* webrt/: index.html, Admin/Elements/Tabs, Elements/Header,
+	Elements/Tabs, Search/Listing.html, Search/RestrictSearch.html,
+	Ticket/Create.html, Ticket/Create_Detail.html, Ticket/Display.html,
+	Ticket/EditWatchers.html, Ticket/Modify.html, Ticket/Update.html,
+	Ticket/Elements/Tabs:
+
+	more UI tweaking. yay.
+	
+2000-11-19 17:57  jesse
+
+	* webrt/Elements/Quicksearch:
+
+	file Quicksearch was initially added on branch rt-1-1.
+	
+2000-11-19 17:57  jesse
+
+	* webrt/Elements/MyTickets:
+
+	file MyTickets was initially added on branch rt-1-1.
+	
+2000-11-19 17:57  jesse
+
+	* webrt/rt.jpg:
+
+	file rt.jpg was initially added on branch rt-1-1.
+	
+2000-11-19 17:57  jesse
+
+	* lib/RT/ACE.pm, lib/RT/Ticket.pm, lib/RT/Tickets.pm,
+	lib/RT/Interface/Web.pm, webrt/index.html, webrt/rt.jpg,
+	webrt/Elements/MyTickets, webrt/Elements/Quicksearch,
+	webrt/Search/Listing.html:
+
+	A bunch of UI work. we now have a placeholder logo
+	
+2000-11-18 03:03  jesse
+
+	* lib/RT/: User.pm, Interface/Web.pm:
+
+	ACL  change messages are now properly scoped. so now they don't hang out
+	between sessions
+	
+	if a user has a system right, that right now applies to all queues.
+	
+2000-11-17 00:19  jesse
+
+	* Makefile:
+
+	Rolled rev 1.3.21. now with an ACL editor.
+	
+2000-11-17 00:15  jesse
+
+	* webrt/Admin/Elements/SelectRights:
+
+	file SelectRights was initially added on branch rt-1-1.
+	
+2000-11-17 00:15  jesse
+
+	* lib/RT/ACE.pm, lib/RT/Group.pm, lib/RT/Queue.pm,
+	lib/RT/Template.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
+	lib/RT/Interface/Web.pm, webrt/Admin/Elements/SelectRights:
+
+	Woo! the ACL editor is now much cleaner. and it works. :)
+	
+2000-11-16 01:17  jesse
+
+	* lib/RT/: ACE.pm, ACL.pm, Attachment.pm, Attachments.pm,
+	CurrentUser.pm, EasySearch.pm, Group.pm, GroupMember.pm,
+	GroupMembers.pm, Groups.pm, Link.pm, Links.pm, Queue.pm, Queues.pm,
+	Record.pm, Scrip.pm, ScripScope.pm, ScripScopes.pm, Scrips.pm,
+	Template.pm, Templates.pm, Ticket.pm, Transaction.pm,
+	Transactions.pm, User.pm, Users.pm, Watcher.pm, Watchers.pm,
+	Interface/Web.pm:
+
+	
+	LEANED UP A WHOLE BUNCH OF NEW ROUTINES. FIXED A FREW ACL BUGS.
+	
+2000-11-15 02:29  jesse
+
+	* lib/RT/ACE.pm, lib/RT/ACL.pm, lib/RT/CurrentUser.pm,
+	lib/RT/Queue.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
+	webrt/Admin/Elements/Tabs, webrt/Elements/Submit:
+
+	refactored ACLS to take out a layer of complexity or two.
+	
+2000-11-14 13:17  jesse
+
+	* Makefile:
+
+	bumped the makefuile version
+	
+2000-11-13 23:19  jesse
+
+	* bin/webmux.pl, lib/RT/ACL.pm, lib/RT/EasySearch.pm,
+	lib/RT/Group.pm, lib/RT/GroupMember.pm, lib/RT/Record.pm,
+	lib/RT/User.pm:
+
+	A bunch of refactoring to make ACL editable. Lots of work on the ACL editor.
+	Basic user ACLs are now editable.
+	It needs some more refactoring, since I stopped being on quite as much crack
+	over the wekeend and figured out a much less intense way to do a bunch of stuff. Yay.
+	
+2000-11-08 14:55  jesse
+
+	* Makefile, NEWS:
+
+	all mail sent out is now sent out precedence "bulk" like it should be.
+	
+2000-11-08 01:24  jesse
+
+	* webrt/Admin/Elements/SelectScrip:
+
+	file SelectScrip was initially added on branch rt-1-1.
+	
+2000-11-08 01:24  jesse
+
+	* webrt/Admin/Elements/SelectTemplate:
+
+	file SelectTemplate was initially added on branch rt-1-1.
+	
+2000-11-08 01:24  jesse
+
+	* etc/schema.pm, lib/RT/ACE.pm, lib/RT/ACL.pm,
+	lib/RT/CurrentUser.pm, lib/RT/Group.pm, lib/RT/Ticket.pm,
+	lib/RT/Tickets.pm, lib/RT/Transaction.pm, lib/RT/User.pm,
+	lib/RT/Users.pm, tools/insertdata,
+	webrt/Admin/Elements/SelectScrip,
+	webrt/Admin/Elements/SelectTemplate:
+
+	A whole slew of work on ACLs and assorted other related things.
+	This involved a lot of cleanup of ACL related code and things it touched.
+	ACL decisions are now being made. (Yes, you're all still superusers) but I
+	think I've got a bunch of the infrastructure cleaned up, so it should be
+	easier to finish off the ACL editor. yay!
+	
+	As part of this, I had to add more groups support. all you groups-maniacs should be pleased ;)
+	
+2000-11-06 11:55  jesse
+
+	* Makefile:
+
+	Fixed yet another typo in manipulate.pm.
+	
+	Bumped version to 1.0.5
+	
+2000-11-05 15:24  jesse
+
+	* Makefile:
+
+	A fix for action vs actions in mail manipulate.
+	fixed a typo normailize -> normalize in database/manipulate.pm
+	
+2000-11-03 17:54  jesse
+
+	* README, etc/schema.pm, lib/RT/ACE.pm, lib/RT/ACL.pm,
+	lib/RT/CurrentUser.pm, lib/RT/GroupMember.pm, lib/RT/Queue.pm,
+	lib/RT/Ticket.pm, lib/RT/User.pm, lib/RT/Users.pm,
+	lib/RT/Interface/Email.pm, lib/RT/Interface/Web.pm,
+	tools/insertdata, webrt/Admin/ModifyUser,
+	webrt/Admin/Elements/QueueRightsForUser, webrt/Admin/Elements/Tabs,
+	webrt/Elements/SelectOwner:
+
+	A bunch of work on the ACLs. we're getting closer to having a workable ACL
+	editor.
+	
+2000-11-03 15:37  jesse
+
+	* Makefile, NEWS:
+
+	We now deal better with merging merged tickets.
+	
+	We now properly ignore Precedence: {junk|bulk} headers
+	
+2000-10-31 00:06  jesse
+
+	* lib/RT/: ACE.pm, ScripScope.pm:
+
+	Added ACL support to the ScripScope system.
+	
+2000-10-29 21:31  jesse
+
+	* Makefile, README, bin/webmux.pl, lib/RT/ACE.pm, lib/RT/Group.pm,
+	lib/RT/Groups.pm, lib/RT/Queue.pm, lib/RT/ScripScope.pm,
+	lib/RT/ScripScopes.pm, lib/RT/Scrips.pm, lib/RT/Template.pm,
+	lib/RT/Templates.pm, lib/RT/Transaction.pm, tools/insertdata:
+
+	A bunch of hacking to the ScripScopes system.
+	
+	You can now edit scrips for a given queue.
+	but hey, scrips have no ACL checking yet.
+	
+2000-10-29 17:51  jesse
+
+	* etc/schema.pm:
+
+	Added a whole lot of documentation to schema.pm.
+	
+2000-10-25 21:09  jesse
+
+	* Makefile, bin/testdeps.pl, etc/schema.pm:
+
+	Updated schema.pm and testdeps to jibe with the current CPAN versions of things.
+	And I bumped the version to 1.3.20
+	
+2000-10-23 16:53  jesse
+
+	* Makefile, lib/RT/Date.pm:
+
+	Reverted to using mysql by default.
+	Finished off the postgresql support in the rt core. (well, at least finished the initial support)
+	
+2000-10-23 16:35  jesse
+
+	* Makefile, lib/RT/ACE.pm, lib/RT/Ticket.pm, tools/insertdata:
+
+	Cleanups related to making postgres support work right.
+	
+2000-10-22 20:57  jesse
+
+	* Makefile, bin/initacls.Pg, bin/testdeps.pl, etc/acl.Pg,
+	etc/config.pm, etc/schema.pm, lib/RT/Link.pm, lib/RT/Ticket.pm,
+	lib/RT/Tickets.pm, tools/initdb, tools/insertdata,
+	webrt/Ticket/Display.html:
+
+	merged in ivan's postgres patches.
+	made local ticket links work again. *sigh* SQL evil. eeeeevil.
+	
+2000-10-16 16:32  jesse
+
+	* docs/Security:
+
+	file Security was initially added on branch rt-1-1.
+	
+2000-10-16 16:32  jesse
+
+	* docs/Security:
+
+	some initial notes on security. targetted at RT admins.
+	
+2000-10-16 03:01  jesse
+
+	* lib/RT/: Link.pm, Links.pm, Ticket.pm:
+
+	Fixed a couple of typos in link and links.
+	Ticket->Load will now do the right hting with ticket uris or aliases.
+	
+2000-10-16 00:47  jesse
+
+	* etc/config.pm, lib/RT/Link.pm, lib/RT/Links.pm, lib/RT/Ticket.pm:
+
+	The linking interface now uses URIs internally. and it does lots of
+	sanity checking.
+	
+	Tickets now understand what their uris should be. you can load tickets by
+	uri. and by alias.
+	
+	We need a bit more work to make alias support just transparent, but we're
+	getting really close.
+	
+	You shouldn't be able to link to nonexistent local objects any mroe.
+	
+2000-10-15 01:57  jesse
+
+	* lib/RT/CurrentUser.pm:
+
+	Added CurrentUser->LoadByGecos.
+	The CLI now uses LoadByGecos to load the currentuser.
+	This means that users other than root might actually be able to use the cli now
+	VS: ----------------------------------------------------------------------
+	
+2000-10-15 01:11  jesse
+
+	* Makefile:
+
+	Significantly redid the installation procedure. we're now _much_
+	more careful about what gets installed where and what's owned by whom.
+	
+	Oh. and RT's now setgid, rather than setuid. and there's no setuid wrapper anymore
+	
+2000-10-15 01:08  jesse
+
+	* etc/: config.pm, suidrt.c:
+
+	Yanked suidrt.c, since we now run setgid.
+	
+	rt now logs to /tmp/rt.log.pid.userid
+	
+2000-10-14 02:56  jesse
+
+	* bin/rtmux.pl, bin/webmux.pl, etc/schema.pm,
+	lib/RT/CurrentUser.pm, lib/RT/Interface/Email.pm, tools/initdb,
+	tools/insertdata:
+
+	CurrentUser.pm had LoadByEmail and LoadByUserId methods added and they're now
+	actually used most everywhere.
+	
+	insertdata doesn't force ids for users now.
+	
+	the schema now actually enforces a lot of important uniqueness constraints.
+	
+2000-10-13 10:59  jesse
+
+	* etc/schema.mysql:
+
+	Removed the old schema.mysql, lest it lead people astray
+	
+2000-10-13 02:27  jesse
+
+	* webrt/Ticket/Elements/: EditPeople, ShowMembers:
+
+	Removed some old warning text that's not true any more.
+	Fixed a relative url problem in "show memebers"
+	
+2000-10-12 23:22  jesse
+
+	* Makefile, bin/testdeps.pl:
+
+	updated testdeps.
+	Makefile now defaults to installing rt2 in /opt/rt2
+	
+2000-10-12 22:54  jesse
+
+	* Makefile, lib/RT/ACL.pm, lib/RT/Queue.pm, lib/RT/Ticket.pm,
+	lib/RT/User.pm, lib/RT/Users.pm, tools/insertdata,
+	webrt/index.html:
+
+	A couple of links on the front page.
+	Makefile now assumes www-data instead of nobody as the web user. this is not quite right.
+	
+	Fixed a little bit of the POD in User.pm.
+	
+	Redid how Ticket.pm deals with Owner on create. the new logic should actually catch errors
+	instead of easily letting referential integrity checks just _fail_.
+	
+	Insertdata got cleaned up a little bit.
+	
+	ACL got its cleaned up a bit
+	
+2000-10-11 23:22  jesse
+
+	* webrt/Admin/Elements/QueueRightsForUser:
+
+	file QueueRightsForUser was initially added on branch rt-1-1.
+	
+2000-10-11 23:22  jesse
+
+	* lib/RT/Users.pm, webrt/Admin/Elements/QueueRightsForUser:
+
+	Work on ACLs. and the ACL editor
+	
+2000-10-11 21:23  jesse
+
+	* tools/insertdata:
+
+	gave root a password
+	
+2000-10-11 12:28  jesse
+
+	* Makefile, tools/initdb:
+
+	Databasename changed from RT2 to rt2 to make postgres happier.
+	
+	initdb quoting bug fixed.
+	
+	debug mode in initdb turned off.
+	
+	If you're using mysql and running with ivan's current CVS version of DBIx::DBSchema, RT should once again work.
+	
+2000-10-09 02:32  jesse
+
+	* etc/schema.pm, tools/initdb:
+
+	a debugging hook in initdb and defaults (though they don't work just right yet)
+	in schema.pm. Note that we now need DBIx::DBSchema from CVS.
+	
+2000-10-09 01:59  jesse
+
+	* Makefile, NEWS, etc/suidrt.c:
+
+	Jan Kujawa fixed a bug in the setuid wrapper
+	Jan Okrouhly fixed some bugs in the merged ticket resolution in the cli.
+	
+	Rolled 1.0.5pre3
+	
+2000-10-05 17:30  jesse
+
+	* lib/RT/: ACE.pm, ACL.pm:
+
+	more work on RT's acl core
+	
+2000-10-05 17:30  jesse
+
+	* webrt/Admin/Elements/: GrantQueueRightsTo, GrantQueueRightsTo~,
+	SelectQueueRights:
+
+	more acl work
+	
+2000-10-05 17:30  jesse
+
+	* webrt/Admin/Elements/GrantQueueRightsTo~:
+
+	file GrantQueueRightsTo~ was initially added on branch rt-1-1.
+	
+2000-10-05 17:30  jesse
+
+	* webrt/Admin/Elements/GrantQueueRightsTo:
+
+	file GrantQueueRightsTo was initially added on branch rt-1-1.
+	
+2000-10-05 17:30  jesse
+
+	* webrt/Admin/Elements/SelectQueueRights:
+
+	file SelectQueueRights was initially added on branch rt-1-1.
+	
+2000-10-05 15:49  jesse
+
+	* etc/suidrt.c:
+
+	reordering things in suidrt.c seemed to make them happier.
+	
+2000-10-05 15:39  jesse
+
+	* etc/suidrt.c:
+
+	missed a comma
+	
+2000-10-05 15:03  jesse
+
+	* bin/testdeps.pl:
+
+	added a dependency test script to make installation by newbies easier.
+	
+2000-10-05 15:03  jesse
+
+	* Makefile, README, etc/suidrt.c:
+
+	Major rewrite of suidrt.c by jan kujawa.
+	A couple of bugfixes from Jan Okrouhly
+		Public history should now work right in the cli
+		Web viewing of merged tickets by their old # should now work better.
+	
+2000-10-03 20:22  jesse
+
+	* bin/testdeps.pl:
+
+	cleaned up testedeps.pl output
+	
+2000-10-03 02:41  jesse
+
+	* tools/insertdata:
+
+	file insertdata was initially added on branch rt-1-1.
+	
+2000-10-03 02:41  jesse
+
+	* tools/initdb:
+
+	file initdb was initially added on branch rt-1-1.
+	
+2000-10-03 02:41  jesse
+
+	* etc/schema.pm:
+
+	file schema.pm was initially added on branch rt-1-1.
+	
+2000-10-03 02:41  jesse
+
+	* Makefile, bin/initdb.Oracle, bin/initdb.Pg, bin/initdb.mysql,
+	bin/testdeps.pl, etc/schema.Pg, etc/schema.pm, lib/RT/ACE.pm,
+	lib/RT/Queue.pm, lib/RT/Scrip.pm, lib/RT/User.pm, tools/initdb,
+	tools/insertdata:
+
+	Fairly massive installation changes.
+		We now use ivan's really cool DBIx::DBschema, which, when things
+	settle out a bit mean that the oracle and postgres (and possibly other) ports
+	get their schema updated automatically.
+	
+	The initial seed data is now inserted by tools/insertdata through the RT API.
+	
+	ACE::Create now actually works.
+	Same with Scrip::Create.
+	and Queue::Create.
+	
+	There are a couple of new installation-only dependencies. One of them (DBSchema) may become a build-only
+	dependency if people whine enough :)
+	
+	date/time handling was a casualty of the changes. some things will be handled oddly for now.
+	Once Ivan releases the next DBSchema update, this should get better again. it was
+	the result of a namespace collision between pg and mysql. the timestamp column has
+	different behavior. go fig.
+	
+	This version will require DBIx::SearchBuilder 0.06 (aka what I'm about to check in)
+	
+2000-10-03 02:07  jesse
+
+	* tools/test:
+
+	blew away old, crufty "extras"
+	
+2000-09-28 13:55  jesse
+
+	* lib/RT/Group.pm:
+
+	file Group.pm was initially added on branch rt-1-1.
+	
+2000-09-28 13:55  jesse
+
+	* lib/RT/: Group.pm, GroupMember.pm, GroupMembers.pm, Groups.pm:
+
+	Long overdue adding of completely untested (and unused) code for groups in RT.
+	note that this implementation does not assume recursive group membership
+	
+2000-09-28 13:55  jesse
+
+	* lib/RT/GroupMember.pm:
+
+	file GroupMember.pm was initially added on branch rt-1-1.
+	
+2000-09-28 13:55  jesse
+
+	* lib/RT/GroupMembers.pm:
+
+	file GroupMembers.pm was initially added on branch rt-1-1.
+	
+2000-09-28 13:55  jesse
+
+	* lib/RT/Groups.pm:
+
+	file Groups.pm was initially added on branch rt-1-1.
+	
+2000-09-18 01:57  jesse
+
+	* lib/RT/: ACE.pm, Queue.pm, Ticket.pm:
+
+	Lots of work on Queue.pm  Most cleanups related to queue watchers, but I
+	also added a bit more documentation and fixed a bug that could cause DelWatcher
+	in ticket.pm to delete watchers it shouldn't
+	
+2000-09-18 00:03  jesse
+
+	* docs/API, docs/FAQ, docs/README.oracle, lib/RT/Ticket.pm,
+	lib/RT/Transaction.pm:
+
+	More documentation. removed outdated docs.
+	
+	docs/API now talks about what those of you writing your own RT client
+	code shouldn't be doing. (Which objects you shouldn't touch).
+	
+2000-09-18 00:00  jesse
+
+	* README:
+
+	Clarified license terms. RT is available under Version 2 of the GPL.
+	Not version 1. Not some as-yet-unwritten version 3 that says you can only
+	use it if you agree to license your children under the GPL. Version 2.
+	
+2000-09-17 19:57  jesse
+
+	* lib/RT/: TicketCollection.pm, User.pm, Interface/Email.pm:
+
+	Removed bogus signature code.
+	Documented User->IsPassword
+	removed --area flag from Mailgateway (We ain't got no stinking areas)
+	
+2000-09-17 19:21  jesse
+
+	* etc/schema.Oracle, etc/schema.mysql, lib/RT/ACE.pm,
+	lib/RT/ACL.pm, lib/RT/Scrip.pm, lib/RT/User.pm:
+
+	Ugh. Mysql isn't respecting SQL92 reserved words. which meant that I didn't
+	notice that I was using "Type" and "Action" in my schema.
+	This required a bit of churn to the ACE and User modules.
+	
+2000-09-17 17:38  jesse
+
+	* Makefile:
+
+	Ok. I think I've got it now. This is RT 1.3.18. aka RT2 - Alpha 1.
+	        The "Bear Suit" Release.
+	
+	        A formal release announcement is forthcoming.
+	
+2000-09-17 17:29  jesse
+
+	* Makefile:
+
+	work on the changelog generator
+	
+2000-09-17 17:19  jesse
+
+	* HACKING, Makefile, README, bin/initdb.mysql, bin/testdeps.pl:
+
+	Bumped the required version of SearchBuilder in testdeps, now that it's
+	propagated throughout CPAN
+	
+	Replaced initdb.mysql with ivan's new version.
+	
+	Tweaked ivan's initdb.mysql to be a little friendlier, create the schema
+	(it was missing a FILEHANDLE in a print statement and deal
+	better with omitted passwords.
+	
+	Updated the readme some more.
+	
+	Added experimental ChangeLog generation to the make dist process
+	
+	Bumped the version number to 1.3.18 for release as alpha1 for RT2 today.
+	
+2000-09-17 01:40  jesse
+
+	* Makefile, README, bin/initacls.mysql, bin/testdeps.pl,
+	bin/webmux.pl:
+
+	Bumped the Mason version requirement up, so we avoid the poisoned v 0.88
+	Applied ivan's alpha-1 patches.
+	Did some tweaking for the alpha 1 release.
+	Cleaned up the readme a bit
+	
+2000-09-15 01:21  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+2000-09-15 01:17  jesse
+
+	* lib/RT/Interface/Email.pm:
+
+	Mail gateway now handles followup correspondence properly
+	(It gets the ticket # right)
+	
+2000-09-15 01:06  jesse
+
+	* lib/RT/Watcher.pm:
+
+	fixed a typo (left off a > ) in Watcher.pm
+	
+2000-09-15 00:59  jesse
+
+	* lib/RT/Ticket.pm, lib/RT/Watcher.pm, webrt/Ticket/Modify.html:
+
+	Editing ticket watchers from the webui now works.
+	this required a bunch of work on the internal wathers stuff
+	in ticket.pm.
+	Also added documentation and watcher-related sanity checks
+	
+2000-09-14 00:04  jesse
+
+	* lib/RT/Ticket.pm, lib/RT/Watcher.pm,
+	webrt/Elements/SelectWatcherType, webrt/Ticket/Elements/EditPeople,
+	webrt/Ticket/Elements/EditWatchers,
+	webrt/Ticket/Elements/ModifyTicket:
+
+	Some cleanup to Watcher and Ticket. (mainly documentation updates)
+	Added an IsUser sub to Watcher.pm (which tells you if the watcher
+	object refers to a local user or a remote email address)
+	
+	the ui for editing tickets should work now.
+	note that the backend for the watchers side of this isn't there
+	yet.
+	
+	        -j
+	
+2000-09-13 18:10  jesse
+
+	* etc/config.pm:
+
+	fixed a configfile typo that would break a new installation
+	
+2000-09-12 01:28  jesse
+
+	* lib/RT/Date.pm, lib/RT/Ticket.pm, webrt/Elements/ListActions,
+	webrt/Elements/SelectDate, webrt/Elements/SelectUsers,
+	webrt/Elements/SelectWatcherType, webrt/Ticket/Modify.html,
+	webrt/Ticket/Elements/AddWatchers, webrt/Ticket/Elements/EditDates,
+	webrt/Ticket/Elements/EditPeople,
+	webrt/Ticket/Elements/ModifyTicket:
+
+	TimeWorked is now read/write (which may be a bad idea. but I'm willing to try it.
+	RT::Date now better understands that "never" doesn't mean 1970.
+	
+	The web modify interface is getting closer to working.
+	I mainly need to finish making the watchers column go.
+	
+2000-09-11 00:37  jesse
+
+	* etc/config.pm:
+
+	Some sanity cleanups to the web queue listing.
+	
+2000-09-11 00:35  jesse
+
+	* webrt/Ticket/Elements/EditDates:
+
+	file EditDates was initially added on branch rt-1-1.
+	
+2000-09-11 00:35  jesse
+
+	* webrt/Ticket/Elements/EditWatchers:
+
+	file EditWatchers was initially added on branch rt-1-1.
+	
+2000-09-11 00:35  jesse
+
+	* webrt/Ticket/Elements/AddWatchers:
+
+	file AddWatchers was initially added on branch rt-1-1.
+	
+2000-09-11 00:35  jesse
+
+	* webrt/Ticket/Elements/EditBasics:
+
+	file EditBasics was initially added on branch rt-1-1.
+	
+2000-09-11 00:35  jesse
+
+	* webrt/Ticket/Elements/EditPeople:
+
+	file EditPeople was initially added on branch rt-1-1.
+	
+2000-09-11 00:35  jesse
+
+	* webrt/Ticket/Elements/ModifyTicket:
+
+	file ModifyTicket was initially added on branch rt-1-1.
+	
+2000-09-11 00:35  jesse
+
+	* webrt/: Login.html, webrt.css, Elements/SelectDate,
+	Elements/SelectMatch, Elements/SelectQueue, Elements/SelectUsers,
+	Elements/ShadedBox, Ticket/EditWatchers.html, Ticket/Modify.html,
+	Ticket/Elements/AddWatchers, Ticket/Elements/EditBasics,
+	Ticket/Elements/EditDates, Ticket/Elements/EditPeople,
+	Ticket/Elements/EditWatcherList, Ticket/Elements/EditWatchers,
+	Ticket/Elements/ModifyTicket, Ticket/Elements/ShowBasics,
+	Ticket/Elements/ShowDates, Ticket/Elements/ShowDependencies,
+	Ticket/Elements/ShowHistory, Ticket/Elements/ShowPeople,
+	Ticket/Elements/ShowSummary, Ticket/Elements/TicketToolBox:
+
+	Lots and lots of work on the webui.
+	The display UI has been cleaned up a bit and the modify UI has been started.
+	It's not in its final for yet, nor is there any logic backing many of the new ui features, but those will come next.
+	
+	If I'm remebering my list correctly, this is the one "biggie" before Alpha 1.
+	
+	Yay!
+	
+2000-09-11 00:35  jesse
+
+	* webrt/Elements/SelectUsers:
+
+	file SelectUsers was initially added on branch rt-1-1.
+	
+2000-09-07 00:52  jesse
+
+	* webrt/: Login.html, autohandler, Ticket/Elements/ShowSummary:
+
+	Replaced tobias' web arg preservation code with something that's actually based on _mason_ rather than the external apache object. This should make the fastcgi port easier
+	
+	Fixed a bug in showsummary (unqualified WebPath)
+	
+2000-09-07 00:30  jesse
+
+	* Makefile, bin/rtmux.pl, lib/RT/Handle.pm:
+
+	Look ma! it should install again (i'd flubbed a bit of the
+	fastcgi mason handler install.
+	
+	Oh. and oracle support should work now.
+	
+2000-09-06 00:52  jesse
+
+	* webrt/Logout.html:
+
+	Logout.html links you to the right place now
+	
+2000-09-05 23:47  jesse
+
+	* webrt/Search/Listing.html:
+
+	YA typo fix
+	
+2000-09-05 23:45  jesse
+
+	* webrt/Search/Listing.html:
+
+	Damn I wish I could type tonight. :/ missed an $RT::
+	
+2000-09-05 23:43  jesse
+
+	* webrt/: Search/Listing.html, Ticket/Elements/ShowSummary:
+
+	Fixed a few more Absolute url bugs
+	
+2000-09-05 23:35  jesse
+
+	* webrt/Elements/Tabs:
+
+	Tabs needed / as the final character for transparent proxying
+	
+2000-09-05 22:39  jesse
+
+	* webrt/: Login.html, Admin/Elements/CreateUserCalled,
+	Admin/Elements/ModifyQueue, Admin/Elements/ModifyTemplate,
+	Admin/Elements/ModifyUser, Admin/Users/index.html:
+
+	more work on proper absolute pathing
+	
+2000-09-05 22:08  jesse
+
+	* webrt/: Login.html, Admin/Elements/CreateQueueCalled,
+	Admin/Elements/CreateUserCalled, Admin/Elements/ModifyUser,
+	Admin/Users/index.html:
+
+	A bunch of the admin tools weren't properly dealing with absolute pathed requests. it made it impossible to have RT2 anywhere other than at the / of your webserver
+	
+2000-09-05 21:40  jesse
+
+	* lib/RT/Handle.pm:
+
+	file Handle.pm was initially added on branch rt-1-1.
+	
+2000-09-05 21:40  jesse
+
+	* bin/mason_handler.fcgi:
+
+	file mason_handler.fcgi was initially added on branch rt-1-1.
+	
+2000-09-05 21:40  jesse
+
+	* Makefile, bin/mason_handler.fcgi, bin/testdeps.pl,
+	lib/RT/Handle.pm:
+
+	Updated testdeps to ask for the new version of mailtools
+	Added in the new fastcgi handler (not working yet)
+	and RT::Handle, which is a wrapper for SearchBuilder::Handle
+	
+2000-09-04 22:52  jesse
+
+	* Makefile, TODO, bin/rtmux.pl, bin/webmux.pl, etc/config.pm,
+	lib/RT/Record.pm, lib/RT/User.pm, lib/RT/Interface/Web.pm,
+	webrt/Ticket/Display.html, webrt/Ticket/Elements/ShowRequestor,
+	webrt/Ticket/Elements/TicketToolBox:
+
+	A couple of bugfixes related to the switch to SearchBuilder.
+	A few webui cleanups.
+	A bit of abstraction to make the eventual fastcgi port easier.
+	
+2000-09-04 12:48  jesse
+
+	* bin/testdeps.pl, lib/RT/Attachments.pm, lib/RT/Ticket.pm,
+	lib/RT/Transaction.pm, lib/RT/Watcher.pm, lib/RT/Watchers.pm,
+	lib/RT/Interface/Web.pm, webrt/Ticket/Elements/ShowDates:
+
+	Several batched updates from when pallas was off-net
+	
+	UpdateTold changed to SetTold.
+	A bunch of work to get Scrips working.
+	Lots more POD in Ticket.pm
+	Transaction->Describe  is better about printing what really happened.
+	Attachments.pm had a typo that prevented it from dealing with multipart messages.
+	
+2000-08-31 02:18  jesse
+
+	* Makefile, NEWS, etc/suidrt.c:
+
+	Added ENV squashing to suidrt.c
+	
+2000-08-30 14:46  jesse
+
+	* bin/rtmux.pl:
+
+	Rolling in some oracle changes...they're not done yet, but nothing should
+	break with mysql. fixed a typo in rtmux.pl that was introduced with the switch to searchbuilder.
+	
+2000-08-29 17:02  jesse
+
+	* README, bin/rtmux.pl, bin/testdeps.pl, bin/webmux.pl,
+	lib/RT/EasySearch.pm, lib/RT/Record.pm:
+
+	MAJOR CHANGE: Switched to the new name of the DBIx:: modules.
+	We now use DBIx::SearchBuilder rather than DBIx::EasySearch and friends.
+	Note that this is only a name and structure change for the module set.
+	The functionality is the same...though seperating out oracle and mysql
+	specific features comes soon.
+	
+2000-08-29 16:57  jesse
+
+	* etc/schema.Oracle:
+
+	updated the schema.Oracle
+	
+2000-08-29 02:02  jesse
+
+	* webrt/: Elements/SelectWatcherType, Ticket/EditWatchers.html,
+	Ticket/Update.html:
+
+	Started hacking on watchers and ticket update webui a bit.
+	they need a lot more work
+	
+2000-08-29 01:51  jesse
+
+	* webrt/Ticket/: Display.html, DisplayHistory, DisplayTransaction,
+	Elements/ShowHistory, Elements/ShowTransaction:
+
+	Made FullHeaders/BriefHeaders work in the webui
+	
+2000-08-28 01:46  jesse
+
+	* webrt/Admin/Elements/: CreateUserCalled, ModifyUser:
+
+	Fixed some display buglets from tobi oetiker
+	
+2000-08-28 01:31  jesse
+
+	* webrt/Ticket/Update.html:
+
+	Removed some text that harassed the user. that's generally bad policy
+	
+2000-08-27 23:56  jesse
+
+	* webrt/: Admin/Elements/Header, Admin/Elements/ModifyTemplate,
+	Admin/Elements/Tabs, Elements/ListActions, Elements/Tabs:
+
+	A few more added helper elements from the webui
+	
+2000-08-27 23:56  jesse
+
+	* webrt/Admin/Elements/Header:
+
+	file Header was initially added on branch rt-1-1.
+	
+2000-08-27 23:56  jesse
+
+	* webrt/: Admin/Elements/Tabs, Elements/Tabs:
+
+	file Tabs was initially added on branch rt-1-1.
+	
+2000-08-27 23:56  jesse
+
+	* webrt/Admin/Elements/ModifyTemplate:
+
+	file ModifyTemplate was initially added on branch rt-1-1.
+	
+2000-08-27 23:56  jesse
+
+	* webrt/Elements/ListActions:
+
+	file ListActions was initially added on branch rt-1-1.
+	
+2000-08-27 23:54  jesse
+
+	* webrt/Admin/Users/Prefs.html:
+
+	file Prefs.html was initially added on branch rt-1-1.
+	
+2000-08-27 23:54  jesse
+
+	* webrt/Admin/: Queues/Create.html, Users/Create.html:
+
+	file Create.html was initially added on branch rt-1-1.
+	
+2000-08-27 23:54  jesse
+
+	* webrt/Admin/: Queues/Modify.html, Users/Modify.html:
+
+	file Modify.html was initially added on branch rt-1-1.
+	
+2000-08-27 23:54  jesse
+
+	* webrt/Admin/: Queues/index.html, Users/index.html:
+
+	file index.html was initially added on branch rt-1-1.
+	
+2000-08-27 23:54  jesse
+
+	* bin/webmux.pl, lib/RT/Area.pm, lib/RT/Areas.pm, lib/RT/Queue.pm,
+	lib/RT/ScripScopes.pm, lib/RT/Template.pm, lib/RT/Templates.pm,
+	webrt/Admin/CreateQueue.html, webrt/Admin/CreateUser.html,
+	webrt/Admin/EditUser.html, webrt/Admin/ModifyQueue.html,
+	webrt/Admin/ModifyUser.html, webrt/Admin/index.html,
+	webrt/Admin/Elements/CreateQueueCalled,
+	webrt/Admin/Elements/CreateUserCalled,
+	webrt/Admin/Elements/ModifyQueue, webrt/Admin/Elements/ModifyUser,
+	webrt/Admin/Elements/SelectModifyQueue,
+	webrt/Admin/Elements/SelectModifyUser,
+	webrt/Admin/Queues/Create.html, webrt/Admin/Queues/Modify.html,
+	webrt/Admin/Queues/index.html, webrt/Admin/Users/Create.html,
+	webrt/Admin/Users/Modify.html, webrt/Admin/Users/Prefs.html,
+	webrt/Admin/Users/index.html:
+
+	Lots of work on the web admin ui. basic user and queue editing working.
+	and template editing
+	
+2000-08-24 15:53  jesse
+
+	* Makefile, README, bin/rtmux.pl, etc/config.pm,
+	lib/RT/Action/SendEmail.pm, webrt/Elements/Footer,
+	webrt/Elements/Header, webrt/Elements/ViewUser,
+	webrt/Ticket/Elements/EditWatcherList:
+
+	The first cut at better configuration.
+	
+	Updated the readme
+	
+	Made the mail send routine in lib/RT/Action/Email.pm somewhat
+	more configurable (though we're still using printing to a pipe
+	because Mail::Mailer is busted :/)
+	
+	Most options moved out of the makefile..this will make packaging
+	possible.
+	
+	Fixed a couple places where tobias had been using a non-relative
+	url unnecessarily.
+	
+2000-08-22 03:08  jesse
+
+	* Makefile:
+
+	Getting version #s in sync for RT 1.3.15
+	
+2000-08-22 03:05  jesse
+
+	* lib/RT/: Scrip.pm, Transaction.pm, Action/AutoReply.pm,
+	Action/SendEmail.pm:
+
+	Work on making sure mail gets sent. It's not "right" yet but it's getting
+	closer.
+	
+2000-08-21 19:46  jesse
+
+	* webrt/autohandler:
+
+	Fixed a minor issue that let people "log in as ''"
+	
+2000-08-21 01:12  jesse
+
+	* bin/rtmux.pl, etc/config.pm, lib/RT/Ticket.pm, lib/RT/Tickets.pm:
+
+	Set a default type in ticket.pm
+	allowed restriction based on type in tickets.pm
+	
+	now set the timezone in the config file rather than the rtmux.
+	means it effects webmux.pl too.
+	
+2000-08-20 23:41  jesse
+
+	* etc/schema.mysql, lib/RT/Date.pm, webrt/Elements/SelectOwner:
+
+	Standardized StartsBy to Starts.
+	Removed a warning from SelectOwner
+	Fixed a bug in RT::Date->Set(Format => 'unknown')
+	
+2000-08-20 01:46  jesse
+
+	* lib/RT/Ticket.pm, webrt/Search/Listing.html,
+	webrt/Ticket/Elements/ShowMemberOf,
+	webrt/Ticket/Elements/ShowMembers:
+
+	Work on MemberOf and Members in Ticket.pm
+	they're both now Tickets objects rather than links objects.
+	and the things that use them have been updated
+	
+2000-08-19 03:03  jesse
+
+	* Makefile:
+
+	Bumped the version 1.3.14
+	
+2000-08-19 02:49  jesse
+
+	* README, etc/config.pm, lib/RT/Ticket.pm:
+
+	Did some work on logging. switched some carping to some logging.
+	
+2000-08-18 02:04  jesse
+
+	* Makefile, README:
+
+	Minor readme updates.
+	
+	Bumped the version to 1.3.13
+	
+2000-08-18 01:04  jesse
+
+	* lib/RT/Transaction.pm:
+
+	CurrentUser objects act on things. not user Objects.  Thanks, Jens
+	
+2000-08-17 23:55  jesse
+
+	* webrt/Elements/: SelectOwner, Submit:
+
+	notes in select owner. a bit of tweaking in submit ot make it more visible
+	
+2000-08-17 16:16  jesse
+
+	* Makefile:
+
+	Changes to rt-mailgate to properly respect authenticated users
+	when performing %RT RESOLVE commands.
+	
+2000-08-17 03:01  jesse
+
+	* lib/RT/Interface/Web.pm:
+
+	Missed a checkin on Web.pm. sorry about that
+	
+2000-08-17 02:53  jesse
+
+	* bin/webmux.pl, lib/RT/Database.pm, lib/RT/Date.pm,
+	lib/RT/Ticket.pm, lib/RT/Interface/Web.pm:
+
+	Yanked the ancient lib/RT/Database.pm. It  never served any purpose
+	added some functionality to RT::Date. it can now take a date type
+	of 'unknown.'  This will "require" Date::Manip and parse it into
+	an ISO style date.  note that this should NEVER be called from RT's
+	core due to overhead. It is useful from web interfaces and CLI tools....
+	
+	added date::manip as a requirement to webmux.pl (so it gets loaded before
+	client hits)
+	
+	cleaned up Interface/Web.pm
+	
+	rationalized some of the routines dealing with date stuff in ticket.pm.
+	
+	Actual working web date changing should be coming "soon." (where soon is
+	defined as sometime this week)
+	
+2000-08-16 14:46  jesse
+
+	* webrt/Elements/Submit:
+
+	file Submit was initially added on branch rt-1-1.
+	
+2000-08-16 14:46  jesse
+
+	* webrt/: Login.html, index.html, Elements/Footer, Elements/Header,
+	Elements/Submit, Ticket/Elements/ShowBasics,
+	Ticket/Elements/ShowTransaction:
+
+	Various bits of webui cleanup
+	
+2000-08-16 14:16  jesse
+
+	* lib/RT/: Tickets.pm, Interface/Email.pm:
+
+	We can now search for tickets by relationship
+	
+2000-08-16 13:18  jesse
+
+	* lib/RT/CurrentUser.pm:
+
+	the real oneline patch that should make rt-mailgate work for new users again.
+	
+2000-08-15 01:17  jesse
+
+	* lib/RT/: Tickets.pm, Interface/Web.pm:
+
+	The first round of convenience methods in RT/Tickets.pm
+	Still need to do the ticket relations methods and the
+	date methods
+	
+2000-08-14 23:47  jesse
+
+	* webrt/Elements/SelectDateType:
+
+	file SelectDateType was initially added on branch rt-1-1.
+	
+2000-08-14 23:47  jesse
+
+	* webrt/Elements/SelectDateType:
+
+	ack. missed this in the wackiness with tonight's earlier checkin.
+	
+2000-08-14 19:35  jesse
+
+	* webrt/: Elements/Header, Elements/SelectDate,
+	Elements/SelectQueue, Elements/TitleBoxStart, Search/Listing.html,
+	Search/PickRestriction:
+
+	The rest of the previous commit.
+	
+2000-08-14 19:27  jesse
+
+	* etc/config.pm, webrt/Login.html, webrt/Logout.html,
+	webrt/autohandler, webrt/index.html, webrt/webrt.css,
+	webrt/Ticket/autohandler, webrt/Ticket/Elements/ShowMemberOf,
+	webrt/Ticket/Elements/ShowMembers,
+	webrt/Ticket/Elements/ShowSummary,
+	webrt/Ticket/Elements/ShowTransaction:
+
+	Cleaned up the ticket display a bit.
+	made logout actually properly erase session data
+	protected _everything_ with an autohandler in /
+	prettified Login.html
+	added some options to /Elements/TitleBoxHead...which seems to have been missed
+	
+2000-08-14 14:37  jesse
+
+	* README:
+
+	Added a warning about postmaster from JD
+	
+2000-08-13 21:57  jesse
+
+	* lib/RT/TicketCollection.pm, lib/RT/Tickets.pm,
+	lib/RT/Interface/Web.pm, webrt/Elements/SelectBoolean,
+	webrt/Elements/SelectDate, webrt/Elements/SelectMatch,
+	webrt/Elements/SelectOwner, webrt/Elements/SelectQueue,
+	webrt/Elements/SelectStatus, webrt/Elements/SelectWatcherType,
+	webrt/Search/Listing.html, webrt/Search/PickRestriction,
+	webrt/Search/TicketCell:
+
+	Significant work on the search and display code.
+	I'm not convinced that this doesn't introduce new bugs.
+	However, you can now search by ticket content.
+	
+	I will be reworking Tickets.pm a bit more to add a bunch of convenience methods
+	over then next week or so.
+	
+2000-08-12 18:07  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Fixed a bug in WatchersAsString. (RT::Watchers wasn't required early enough)
+	this whole routine needs to be redone :/
+	
+2000-08-12 18:06  jesse
+
+	* lib/RT/User.pm:
+
+	User->Create CanManipulate now defaults to 0.
+	
+2000-08-12 18:05  jesse
+
+	* etc/schema.mysql:
+
+	Updated the default user entries in schema.mysql to have the "CanManipulate"
+	flag set so they'd show up in owner lists.
+	
+2000-08-10 19:16  jesse
+
+	* README:
+
+	updated instructions for Apache install
+	
+2000-08-10 18:59  jesse
+
+	* etc/schema.mysql:
+
+	the queue values for the first queue were wrong
+	
+2000-08-10 17:55  jesse
+
+	* lib/RT/Ticket.pm:
+
+	BUGFIX: _UpdateTold now doesn't record a transaction, as things should be
+	
+2000-08-10 15:43  jesse
+
+	* etc/config.pm, etc/schema.Oracle, etc/schema.mysql,
+	lib/RT/Attachment.pm, lib/RT/Record.pm, lib/RT/Scrip.pm,
+	lib/RT/ScripScope.pm, lib/RT/Ticket.pm, lib/RT/TicketCollection.pm,
+	lib/RT/Tickets.pm, lib/RT/Transaction.pm, lib/RT/User.pm,
+	lib/RT/Action/AutoReply.pm, lib/RT/Action/Notify.pm,
+	lib/RT/Action/SendEmail.pm, lib/RT/Interface/Web.pm,
+	webrt/autohandler, webrt/Elements/Error,
+	webrt/Elements/SelectStatus, webrt/Ticket/Update.html,
+	webrt/Ticket/Elements/ShowBasics,
+	webrt/Ticket/Elements/ShowDependencies,
+	webrt/Ticket/Elements/ShowMemberOf,
+	webrt/Ticket/Elements/ShowMembers,
+	webrt/Ticket/Elements/ShowPeople,
+	webrt/Ticket/Elements/ShowReferences,
+	webrt/Ticket/Elements/ShowRequestor,
+	webrt/Ticket/Elements/TicketToolBox:
+
+	Fixed ACL caching bugs
+	Finished adding status "new"
+	cli searching based on status works better.
+	
+	API Change. Queue is NO LONGER the Queue Object for a ticket
+	API Change. Owner is NO LONGER the Owner Object for a ticket
+	
+	instead, both point to their proper database values and OwnerObj and QueueObj
+	do the right thing throughout. This was rather more code churn than I was hoping for, but we've now got a cleaner, more consistent API that's easier to work
+	with.
+	
+	little bits of POD update.
+	
+	Cleaned out some unused code.
+	
+	Made some error messages more professional.
+	
+	We now keep track of date started as well as a "start by" date.  these both
+	need a bit more work.
+	
+	Calling convention for _Set changed. Rather than three different calling
+	conventions which weren't very extensible, DBIx::Record::_Set and all its
+	subclasses now use paramhash style calling. it's much more extensible and
+	flexible now. (This was necessary for some ACL work, among other things)
+	
+2000-08-09 01:11  jesse
+
+	* lib/RT/Record.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
+	webrt/Elements/SelectStatus, webrt/Elements/dayMenu,
+	webrt/Elements/monthMenu, webrt/Elements/yearMenu:
+
+	ACL Decisions are now cached
+	date menus have a "never" option in the webui
+	added a new status. "new" for tickets that aren't yet open
+	
+2000-08-08 01:45  jesse
+
+	* etc/schema.mysql, lib/RT/Queue.pm:
+
+	schema updates.
+	fixed queue->Create
+	
+2000-08-08 01:44  jesse
+
+	* webrt/Admin/ModifyQueue.html:
+
+	file ModifyQueue.html was initially added on branch rt-1-1.
+	
+2000-08-08 01:44  jesse
+
+	* webrt/Admin/: CreateQueue.html, CreateUser.html,
+	ModifyQueue.html, ModifyUser.html, index.html,
+	Elements/CreateQueueCalled, Elements/CreateUserCalled,
+	Elements/ModifyQueue, Elements/ModifyUser,
+	Elements/SelectModifyQueue, Elements/SelectModifyUser:
+
+	Started the new web admin interface.
+	it can now edit queues and users and create queues and users
+	I'm fairly leery of its user handling stuff. particularly passwords
+	
+2000-08-08 01:44  jesse
+
+	* webrt/Admin/CreateUser.html:
+
+	file CreateUser.html was initially added on branch rt-1-1.
+	
+2000-08-08 01:44  jesse
+
+	* webrt/Admin/Elements/SelectModifyUser:
+
+	file SelectModifyUser was initially added on branch rt-1-1.
+	
+2000-08-08 01:44  jesse
+
+	* webrt/Admin/Elements/ModifyUser:
+
+	file ModifyUser was initially added on branch rt-1-1.
+	
+2000-08-08 01:44  jesse
+
+	* webrt/Admin/Elements/CreateUserCalled:
+
+	file CreateUserCalled was initially added on branch rt-1-1.
+	
+2000-08-08 01:44  jesse
+
+	* webrt/Admin/ModifyUser.html:
+
+	file ModifyUser.html was initially added on branch rt-1-1.
+	
+2000-08-08 01:44  jesse
+
+	* webrt/Admin/index.html:
+
+	file index.html was initially added on branch rt-1-1.
+	
+2000-08-08 01:44  jesse
+
+	* webrt/Admin/CreateQueue.html:
+
+	file CreateQueue.html was initially added on branch rt-1-1.
+	
+2000-08-08 01:44  jesse
+
+	* webrt/Admin/Elements/ModifyQueue:
+
+	file ModifyQueue was initially added on branch rt-1-1.
+	
+2000-08-08 01:44  jesse
+
+	* webrt/Admin/Elements/SelectModifyQueue:
+
+	file SelectModifyQueue was initially added on branch rt-1-1.
+	
+2000-08-08 01:44  jesse
+
+	* webrt/Admin/Elements/CreateQueueCalled:
+
+	file CreateQueueCalled was initially added on branch rt-1-1.
+	
+2000-08-07 22:28  jesse
+
+	* etc/schema.mysql, lib/RT/Date.pm, lib/RT/Ticket.pm,
+	lib/RT/Users.pm:
+
+	added a few ticket attributes for forwards compatibility
+	fixed another ACL problem in users.pm
+	fixed a date display bug
+	
+2000-08-07 01:03  jesse
+
+	* lib/RT/Transaction.pm, webrt/Ticket/Create.html,
+	webrt/Ticket/Elements/ShowTransaction:
+
+	Transaction.pm had some lingering ACL bugs ($CurrentUser) isn't a reasonable
+	global in core library routines :/
+	
+	Working on spawning subtickets.
+	
+2000-08-07 00:31  jesse
+
+	* webrt/User/Prefs.html:
+
+	file Prefs.html was initially added on branch rt-1-1.
+	
+2000-08-07 00:31  jesse
+
+	* webrt/Ticket/Elements/ShowDependencies:
+
+	file ShowDependencies was initially added on branch rt-1-1.
+	
+2000-08-07 00:31  jesse
+
+	* webrt/Ticket/Elements/ShowReferences:
+
+	file ShowReferences was initially added on branch rt-1-1.
+	
+2000-08-07 00:31  jesse
+
+	* webrt/Ticket/Elements/ShowMembers:
+
+	file ShowMembers was initially added on branch rt-1-1.
+	
+2000-08-07 00:31  jesse
+
+	* webrt/Ticket/Elements/ShowMemberOf:
+
+	file ShowMemberOf was initially added on branch rt-1-1.
+	
+2000-08-07 00:31  jesse
+
+	* webrt/Admin/EditUser.html:
+
+	file EditUser.html was initially added on branch rt-1-1.
+	
+2000-08-07 00:31  jesse
+
+	* webrt/Admin/Elements/EditUserComments:
+
+	file EditUserComments was initially added on branch rt-1-1.
+	
+2000-08-07 00:31  jesse
+
+	* etc/config.pm, lib/RT/Ticket.pm, webrt/EditUserComments.html,
+	webrt/ViewUser.html, webrt/webrt.css, webrt/Admin/EditUser.html,
+	webrt/Admin/ModifyUser, webrt/Admin/Elements/EditUserComments,
+	webrt/Elements/Error, webrt/Elements/Header,
+	webrt/Elements/SelectOwner, webrt/Ticket/Create.html,
+	webrt/Ticket/Create_Detail.html, webrt/Ticket/Display.html,
+	webrt/Ticket/Elements/EditWatcherList,
+	webrt/Ticket/Elements/ShowDependencies,
+	webrt/Ticket/Elements/ShowMemberOf,
+	webrt/Ticket/Elements/ShowMembers,
+	webrt/Ticket/Elements/ShowPeople,
+	webrt/Ticket/Elements/ShowReferences,
+	webrt/Ticket/Elements/ShowSummary, webrt/User/Prefs.html:
+
+	Did a bunch of work on the webui. cleaned up a lot of the link display stuff
+	did some work on ticket create
+	
+	dependencies and subtickets are now listed in the ticketview. yay!
+	
+2000-08-05 19:47  jesse
+
+	* lib/RT/Ticket.pm, webrt/Ticket/Elements/ShowSummary:
+
+	more Nobody fixes in Ticket.pm
+	justification fixes in ShowSummary
+	
+2000-08-05 18:50  jesse
+
+	* webrt/Ticket/ProcessUpdate.html:
+
+	The webui can now process updates.
+	it needed YA currentuser fix
+	
+2000-08-05 18:43  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Ticket::Create(Owner =>  now takes either a user object or a userid.
+	and defaults to nobody.
+	
+2000-08-05 17:51  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+2000-08-05 17:49  jesse
+
+	* lib/RT/: Date.pm, Interface/Email.pm:
+
+	fixed a few more bugs in the mailgateway. it can create tickets now.
+	fixed an undefined default in the cli query
+	made the date routine not spit out a stupid warning
+	
+2000-08-05 17:21  jesse
+
+	* lib/RT/Interface/Email.pm:
+
+	fixed typos in the mailgate. thanks gary
+	
+2000-08-05 00:16  jesse
+
+	* Makefile, NEWS, webrt/Login.html, webrt/autohandler,
+	webrt/webrt.css:
+
+	little tweaks to the webui.
+	bumped the version to 1.3.11 for distribution
+	
+2000-08-04 18:45  jesse
+
+	* README, bin/rtmux.pl, bin/webmux.pl, lib/RT/Areas.pm,
+	lib/RT/Attachments.pm, lib/RT/Date.pm, lib/RT/Link.pm,
+	lib/RT/Links.pm, lib/RT/Queue.pm, lib/RT/Queues.pm,
+	lib/RT/Record.pm, lib/RT/ScripScopes.pm, lib/RT/Scrips.pm,
+	lib/RT/Template.pm, lib/RT/Ticket.pm, lib/RT/Tickets.pm,
+	lib/RT/Transaction.pm, lib/RT/Transactions.pm, lib/RT/Users.pm,
+	lib/RT/Watchers.pm, lib/RT/Interface/Web.pm,
+	webrt/Admin/ModifyUser, webrt/Elements/SelectOwner,
+	webrt/Elements/SelectQueue, webrt/Elements/ViewUser,
+	webrt/Ticket/Display.html, webrt/Ticket/LinkIt.html,
+	webrt/Ticket/Elements/ShowPeople:
+
+	When creating an object, you ALWAYS need to pass in the current user
+	or acls break. we were a bit too lax about this before.
+	
+	this was a major round of bugfixing for the webui
+	
+2000-08-04 15:41  jesse
+
+	* Makefile, lib/RT/CurrentUser.pm, lib/RT/User.pm, webrt/webrt.css,
+	webrt/Elements/Header, webrt/Search/Listing.html,
+	webrt/Search/autohandler, webrt/Ticket/autohandler:
+
+	Queue listing doesn't have that ugly blue any more. And its code for
+	setting row color is a bit cleaner.
+	
+	we now actually _check_ passwords for web logins.
+	
+	webrt.css now has slightly darker hyperlinks.
+	
+	CurrentUser->IsPassword now uses the UserObj
+	
+	users can't use null passwords for authentication.
+	
+2000-08-03 02:19  jesse
+
+	* lib/RT/Interface/Web.pm, webrt/Elements/ShadedBox,
+	webrt/Elements/TitleBoxStart:
+
+	misc fixes to the webui and a leftover fix to the cli.
+	
+	the webui needs to have some of its internals gutted and
+	put back together. it feels very kludgy and not really "planned"
+	
+2000-08-03 02:04  jesse
+
+	* lib/RT/: Record.pm, Scrip.pm, Ticket.pm, Tickets.pm,
+	Transaction.pm, Action/SendEmail.pm:
+
+	made status changes work. (RT::Action::SendEmail was being stupid
+	and not error checking until it was too late)
+	
+	removed more use of hardwired SQL "now()"
+	
+	moved the handling of LastUpdated into RT::Record. from DBIx::Record
+	
+2000-08-03 01:09  jesse
+
+	* lib/RT/Queue.pm:
+
+	fixed a bug in the cli that kept ticket creates from working.
+	queue->hasright's calling convention changed.
+	
+2000-08-03 00:59  jesse
+
+	* Makefile:
+
+	fixed a makefile typo. added back the comment about pg
+	
+2000-08-03 00:42  jesse
+
+	* docs/design_docs/users:
+
+	file users was initially added on branch rt-1-1.
+	
+2000-08-03 00:42  jesse
+
+	* etc/user.Oracle:
+
+	file user.Oracle was initially added on branch rt-1-1.
+	
+2000-08-03 00:42  jesse
+
+	* etc/schema.Oracle:
+
+	file schema.Oracle was initially added on branch rt-1-1.
+	
+2000-08-03 00:42  jesse
+
+	* bin/initacls.Oracle, bin/initdb.Oracle, docs/README.oracle,
+	docs/design_docs/users, etc/schema.Oracle, etc/user.Oracle:
+
+	A first cut at oracle support from Dave Morgan <dmorgan@bartertrust.com>.
+	It is pretty much untested and guaranteed to break. Among other
+	things, the schema isn't current. but it's a start.
+	Thanks, Dave!
+	
+2000-08-03 00:42  jesse
+
+	* docs/README.oracle:
+
+	file README.oracle was initially added on branch rt-1-1.
+	
+2000-08-03 00:42  jesse
+
+	* bin/initacls.Oracle:
+
+	file initacls.Oracle was initially added on branch rt-1-1.
+	
+2000-08-03 00:42  jesse
+
+	* bin/initdb.Oracle:
+
+	file initdb.Oracle was initially added on branch rt-1-1.
+	
+2000-08-03 00:31  jesse
+
+	* docs/design_docs/local_hacking:
+
+	file local_hacking was initially added on branch rt-1-1.
+	
+2000-08-03 00:31  jesse
+
+	* HACKING, Makefile, docs/FAQ.html, docs/actions.html,
+	docs/admin.html, docs/attributes.html, docs/outline.html,
+	docs/rt_users_guide.html, docs/design_docs/local_hacking:
+
+	doc updates. removed outdated 1.x docs
+	
+2000-08-02 23:53  jesse
+
+	* etc/config.pm:
+
+	added some comments from tobias
+	
+2000-08-02 00:20  jesse
+
+	* Makefile, NEWS, TODO, etc/config.pm, etc/schema.mysql,
+	lib/RT/ACE.pm, lib/RT/ACL.pm, lib/RT/CurrentUser.pm,
+	lib/RT/Date.pm, lib/RT/Queue.pm, lib/RT/Record.pm,
+	lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/User.pm,
+	lib/RT/Interface/Email.pm:
+
+	
+	Weekend of 1 Aug 2000
+	---------------------
+	I spent the weekend in DC visiting family.   This meant I got a bit of
+	code written ;)  Sadly, I have no access to the CVS server,
+	so I'll be batching a bunch of commits.
+	
+	1. Enabled CLI admin tool
+	2. Added ACL listing functionality to the CLI admin tool.
+	3. Enhanced RT::Queue->Grant such that it works with the structure of RT2
+	   ACLs
+	4. Made the Logging framework actually log errors to STDERR.
+	   (This makes debugging the CLI tools much easier. It also means
+	    that the cli tools explain _why_ they're dying.)
+	5. Fully expunged use of Mysql's SQL keyword "now()". I'd have left this
+	   stuff in, except mysql doesn't seem to deal well with the idea that the
+	   entire world isn't one timezone.  On top of that, it doesn't seem to
+	   have a way to force it into GMT mode that doesn't involve modifying init
+	   scripts. *sigh*
+	6. Did a whole bunch more work on the ACL checking in RT::User
+	7. Wrote up some preliminary docs on local hacks to RT
+	8. Added in a routine to allow local canonicalization of email addresses
+	9. Added in the concept of "Disabled users"  To preserve RT2's database
+	   Integrity, whacking user accounts would be a bad thing. So, instead,
+	   we've got the concept of 'disabled' users. A disabled user fails ANY
+	   ACL check, ANY password check and doesn't appear in any lists of ACLs.
+	   (note that the lastmost statement isn't yet true)
+	
+	10. rtadmin user -enable and rtadmin user -disable now work.
+	11. ACLs are now enforced for many ticket related actions.
+	    (this does mean that you'll want to insert some acls like those below)
+	
+	INSERT INTO ACL VALUES (1,0,'User','SuperUser','Queue',0);
+	INSERT INTO ACL VALUES (2,3,'User','CreateTicket','Queue',0);
+	INSERT INTO ACL VALUES (3,3,'User','ShowTicket','Ticket',0);
+	INSERT INTO ACL VALUES (4,3,'User','ShowTicketHistory','Ticket',0);
+	INSERT INTO ACL VALUES (6,3,'User','CreateTicket','Queue',1);
+	INSERT INTO ACL VALUES (7,3,'User','ModifyTicket','Ticket',1);
+	INSERT INTO ACL VALUES (8,1,'User','Superuser','System',0);
+	INSERT INTO ACL VALUES (9,0,'Everyone','Superuser','System',0);
+	
+2000-08-02 00:17  jesse
+
+	* bin/: rtmux.pl, testdeps.pl:
+
+	Bumped us up to requiring Log::Dispatch 1.6.
+	Cleaned up testdeps a bit. Now, you knwo it passes.
+	
+2000-07-27 03:01  jesse
+
+	* Makefile:
+
+	Bumped the version to 1.3.9
+	Rolled RT 1.3.9
+	
+2000-07-27 02:37  jesse
+
+	* lib/RT/Date.pm, lib/RT/Ticket.pm, webrt/Elements/ViewUser,
+	webrt/Ticket/Elements/ShowDates, webrt/Ticket/Elements/ShowSummary,
+	webrt/Ticket/Elements/ShowTransaction, bin/webmux.pl:
+
+	Fixed a bug with null due dates.
+	Made RT/Date deal with a time of -1 as "Never"
+	made html escaping on included entities on webrt default.
+	
+2000-07-27 02:01  jesse
+
+	* lib/RT/Date.pm:
+
+	file Date.pm was initially added on branch rt-1-1.
+	
+2000-07-27 02:01  jesse
+
+	* README, lib/RT/Date.pm, lib/RT/Record.pm, lib/RT/Ticket.pm,
+	bin/testdeps.pl:
+
+	Moved Date managment routines from DBIx::Record to RT::Record.
+	Initial Checkin of RT::Date, a lightweight Date object capable
+	of doing everything RT needs. Oh. and it's fully documented in POD.
+	
+	Converted RT::Record and RT::Ticket and the cli to use RT::Date instead
+	of Date::Kronos.  The CLI now feels _much_ zippier and code within
+	RT::Ticket is a bit easier to read.
+	
+2000-07-27 01:55  jesse
+
+	* etc/schema.mysql:
+
+	removed extraneous whitespace
+	
+2000-07-27 01:51  jesse
+
+	* lib/RT/Attachment.pm:
+
+	changed the header on attachment.pm
+	
+2000-07-24 10:17  tobiasb
+
+	* lib/RT/Interface/Web.pm, webrt/ViewUser.html,
+	webrt/Search/TicketCell, webrt/Ticket/Display.html,
+	webrt/Ticket/ProcessUpdate.html, webrt/Ticket/Update.html:
+
+	Moved some things to Web.pm, made some nifty options for getting tickets from the listing in a new window
+	
+2000-07-24 06:56  tobiasb
+
+	* lib/RT/User.pm:
+
+	Some TODOs
+	
+2000-07-24 06:54  tobiasb
+
+	* lib/RT/Interface/Email.pm:
+
+	Some comments and TODOs.
+	
+	I fixed one simple TODO about putting in pid + rand into the name of
+	the temp directory needed for parsing the mime entity.
+	
+2000-07-24 00:52  jesse
+
+	* lib/RT/User.pm:
+
+	Added a few comments where they really should be
+	
+2000-07-24 00:48  jesse
+
+	* lib/RT/Interface/Email.pm:
+
+	Did a bunch of cleanup work on Interface/Email.pm
+		It could still use more.
+	
+2000-07-23 03:50  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Added the method 'TimeWorkedAsString'.  Ok, I'll start looking into Date::Kronos shortly :)
+	
+2000-07-22 20:10  tobiasb
+
+	* lib/RT/Interface/Email.pm:
+
+	[no log message]
+	
+2000-07-22 20:05  tobiasb
+
+	* lib/RT/Interface/Email.pm:
+
+	Inserted a reference to [fsck 290] in a TODO-comment.
+	
+2000-07-22 13:06  tobiasb
+
+	* lib/RT/Interface/Web.pm, webrt/Search/Listing.html:
+
+	Moved stuff from Listing.html to Web.pm, sub ProcessSearchQuery (suggestions to a better name for the sub?)
+	
+2000-07-21 15:11  tobiasb
+
+	* lib/RT/Ticket.pm, lib/RT/Interface/Web.pm,
+	webrt/Search/Listing.html:
+
+	bugfixing
+	
+2000-07-21 11:09  tobiasb
+
+	* etc/schema.mysql:
+
+	Bugfix
+	
+2000-07-21 10:57  tobiasb
+
+	* webrt/index.html:
+
+	Now it's possible to select queue from the start page
+	
+2000-07-21 10:35  tobiasb
+
+	* lib/RT/Attachment.pm, lib/RT/Ticket.pm, webrt/Elements/Header,
+	webrt/Elements/SelectOwner, webrt/Ticket/Elements/EditWatcherList:
+
+	bugfixes, comments.  I restricted the Owner-list to those that CanManipulate - this should eventually go away when we have proper access control.  Tiny improvement of EditWatcherList - it's now possible to edit user information if the user is found.
+	
+2000-07-21 05:48  tobiasb
+
+	* lib/RT/CurrentUser.pm:
+
+	bugfix
+	
+2000-07-21 00:08  jesse
+
+	* lib/RT/ACE.pm, lib/RT/Attachment.pm, lib/RT/Queue.pm,
+	lib/RT/Ticket.pm, lib/RT/User.pm, webrt/EditUserComments.html:
+
+	Cleaned up language in EditUserComments
+	
+	did work on watchers in ui/cli/admin and Ticket.pm and User.pm
+	cleaned up code in Ticket.pm
+	
+	Start of some work on acls in Queue.pm
+	
+2000-07-20 22:13  tobiasb
+
+	* lib/RT/Interface/Web.pm, webrt/Elements/SelectWatcherType,
+	webrt/Ticket/Display.html, webrt/Ticket/EditWatchers.html,
+	webrt/Ticket/Elements/EditWatcherList,
+	webrt/Ticket/Elements/ShowHistory, webrt/Ticket/Elements/ShowLinks,
+	webrt/Ticket/Elements/TicketToolBox:
+
+	Some code improvements, added one popular demand here; to avoid spending too much time clicking around, it should be possible to show all histoies of member requests at the same page.
+	
+2000-07-20 18:31  tobiasb
+
+	* lib/RT/CurrentUser.pm:
+
+	Fixing a bit.  Please try to remember to test code before committing
+	it :)
+	
+2000-07-20 18:09  tobiasb
+
+	* webrt/Ticket/ProcessUpdate.html:
+
+	once more I've committed without testing..
+	
+2000-07-20 18:02  tobiasb
+
+	* lib/RT/CurrentUser.pm:
+
+	Removed a compile-time bug
+	
+2000-07-20 17:48  tobiasb
+
+	* lib/RT/User.pm:
+
+	bugfix
+	
+2000-07-20 17:39  tobiasb
+
+	* etc/config.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
+	lib/RT/Watcher.pm, lib/RT/Interface/Web.pm,
+	webrt/Ticket/Display.html:
+
+	bugfixes + conflict resolving at the signature + moved something to Web.pm from Display.html
+	
+2000-07-20 17:31  jesse
+
+	* lib/RT/: CurrentUser.pm, User.pm:
+
+	Culled some not-for-now signature stuff.
+	Cleaned up and optimised CurrentUser->UserObj
+	
+2000-07-20 16:39  jesse
+
+	* Makefile, NEWS:
+
+	doing some work for a customer.  rt-mailgate --help should tell you
+	about the fabulous new mail mode
+	
+2000-07-20 15:39  tobiasb
+
+	* lib/RT/Interface/Web.pm, webrt/Ticket/Display.html:
+
+	moving things from the template to Web.pm was not as straight-forwarded as I had hoped.
+	
+2000-07-20 15:20  tobiasb
+
+	* lib/RT/Attachment.pm, lib/RT/CurrentUser.pm, lib/RT/User.pm,
+	lib/RT/Interface/Web.pm, webrt/Ticket/Display.html:
+
+	Started moving stuff to Web.pm, fixed and tested signatures
+	
+2000-07-20 14:50  tobiasb
+
+	* lib/RT/: CurrentUser.pm, User.pm:
+
+	moved signature from currentuser to user (but does it make sense, anyway?  Signatures is something 'personal' that belongs only to the current user?)
+	
+2000-07-20 14:43  tobiasb
+
+	* webrt/ViewUser.html:
+
+	bugfix ... hmpf, always test before committing .. always test before committing ...
+	
+2000-07-20 14:33  tobiasb
+
+	* lib/RT/Interface/Web.pm, webrt/ViewUser.html:
+
+	bugfix
+	
+2000-07-20 14:11  tobiasb
+
+	* lib/RT/Interface/Web.pm:
+
+	file Web.pm was initially added on branch rt-1-1.
+	
+2000-07-20 14:11  tobiasb
+
+	* lib/RT/Interface/Web.pm:
+
+	I'm considering to move things from Display.html and ProcessUpdate.html to Web.pm.  Comments?
+	
+2000-07-20 14:06  jesse
+
+	* lib/RT/Watcher.pm:
+
+	Removed the bogus code frol lib/RT/Watcher.pm
+	
+2000-07-20 13:39  jesse
+
+	* lib/RT/User.pm:
+
+	reversed some bogus code
+	
+2000-07-20 11:44  tobiasb
+
+	* webrt/Ticket/Elements/EditWatcherList:
+
+	file EditWatcherList was initially added on branch rt-1-1.
+	
+2000-07-20 11:44  tobiasb
+
+	* webrt/Elements/SelectWatcherType:
+
+	file SelectWatcherType was initially added on branch rt-1-1.
+	
+2000-07-20 11:44  tobiasb
+
+	* webrt/: Elements/SelectWatcherType,
+	Ticket/Elements/EditWatcherList:
+
+	Now it's possible to edit ticket and queue watchers.  It's really horrible, but at least it works
+	
+2000-07-20 11:43  tobiasb
+
+	* webrt/Ticket/: EditWatchers.html, Update.html:
+
+	Small comment
+	
+2000-07-20 11:40  tobiasb
+
+	* webrt/Ticket/Update.html:
+
+	Linked in the 'edit watchers' functionality
+	
+2000-07-20 11:27  tobiasb
+
+	* lib/RT/Ticket.pm, lib/RT/Watcher.pm,
+	webrt/Ticket/EditWatchers.html:
+
+	Now it's possible to edit ticket and queue watchers.  It's really horrible, but at least it works
+	
+2000-07-20 11:27  tobiasb
+
+	* lib/RT/User.pm:
+
+	bugfix
+	
+2000-07-20 11:23  tobiasb
+
+	* webrt/Ticket/Elements/ShowTransaction:
+
+	This is sort of a local hack, I guess it should be separated ... but maybe not.  if content-type =~ /^text/(?\!plain)/, there is now a link for 'view this as plain text', which might be useful for unknown text formats and for viewing 'code'
+	
+2000-07-20 02:59  jesse
+
+	* lib/RT/: ACE.pm, ACL.pm:
+
+	I'm committing ACE.pm and ACL.pm so people can get a bit of a taste of what I'm doing. They don't work, they probably don't even compile yet, but they're not getting called from the rest of the code yet.
+	
+	These aren't the droids you're looking for.
+	
+2000-07-20 02:58  jesse
+
+	* lib/RT/User.pm:
+
+	updated User.pm to match the schema
+	
+2000-07-19 16:45  tobiasb
+
+	* webrt/Ticket/EditWatchers.html:
+
+	file EditWatchers.html was initially added on branch rt-1-1.
+	
+2000-07-19 16:45  tobiasb
+
+	* webrt/Ticket/EditWatchers.html:
+
+	This should be a template for adding and removing watchers; will be completed tomorrow
+	
+2000-07-19 16:10  tobiasb
+
+	* webrt/: Logout.html, ViewUser.html, Search/Listing.html,
+	Ticket/Display.html, Ticket/Update.html,
+	Ticket/Elements/ShowPeople, Ticket/Elements/ShowSummary:
+
+	It's now possible to edit user data (realname, userid, email) from the web ui
+	
+2000-07-19 16:04  tobiasb
+
+	* lib/RT/: CurrentUser.pm, Ticket.pm, Watcher.pm,
+	Interface/Email.pm:
+
+	Worked a bit with requestors; 1) if we already have a user object at the requestor, we should use it.  2) it should be possible to edit the users email without also updating the watcher email if those are the same.  3) if a user enters an email with a different from address, but can be identified as a previous user (by equal real name or other means of authentication), the email field in the watcher table should be used
+	
+2000-07-19 10:06  tobiasb
+
+	* webrt/Elements/Header:
+
+	bugfixing
+	
+2000-07-19 08:53  tobiasb
+
+	* webrt/webrt.css:
+
+	Our web designer didn't like red table borders
+	
+2000-07-19 08:52  tobiasb
+
+	* webrt/: Elements/Header, Search/Listing.html:
+
+	Fun #440: Popular wish: Fixed alternating colours at the lines in Listing.html
+	
+2000-07-19 07:41  tobiasb
+
+	* webrt/webrt.css:
+
+	oddline for use in Listing.html
+	
+2000-07-19 06:54  tobiasb
+
+	* webrt/Elements/Header:
+
+	nicer
+	
+2000-07-19 06:51  tobiasb
+
+	* webrt/: index.html, Elements/Header:
+
+	Fun #666; Form 'view bug #xxx' from display and the front page
+	
+2000-07-18 04:17  tobiasb
+
+	* etc/schema.mysql:
+
+	bug #286; two nines in schema.sql
+	
+2000-07-14 11:40  tobiasb
+
+	* webrt/Search/TicketCell:
+
+	I'm currently trying to fix it so that each user can put in options in the session information (or should it rather be in the DB?) about whether they want tickets to pop up in separate windows or not.
+	
+2000-07-14 10:47  tobiasb
+
+	* etc/schema.mysql, lib/RT/Link.pm, lib/RT/Ticket.pm,
+	lib/RT/Action/StallDependent.pm,
+	webrt/Ticket/Elements/TicketToolBox:
+
+	added a scrip for stalling members upon membership linking ... now it's impossible for a request to make a link to itself ... now it's possible to open a request from the ticket display
+	
+2000-07-14 09:29  tobiasb
+
+	* webrt/Ticket/ProcessUpdate.html:
+
+	TODO: Public comments are currently beeing threated as private
+	comments (that's better than it beeing ignored ... at least at the
+	moment)
+	
+	Now it skips trying to build a MIME entity if there are no message.
+	
+2000-07-14 09:11  tobiasb
+
+	* webrt/ViewUser.html:
+
+	Bugfix
+	
+2000-07-14 09:09  tobiasb
+
+	* webrt/Search/Listing.html:
+
+	Killed a warning
+	
+2000-07-13 13:31  tobiasb
+
+	* webrt/index.html:
+
+	Typo
+	
+2000-07-13 11:44  tobiasb
+
+	* webrt/Elements/Header:
+
+	huh?  seems like I've lost the control of CVS a bit today :)
+	
+2000-07-13 11:43  tobiasb
+
+	* webrt/Elements/Header:
+
+	[no log message]
+	
+2000-07-13 11:36  jesse
+
+	* webrt/index.html:
+
+	tobix missed a &>
+	
+2000-07-13 11:08  tobiasb
+
+	* webrt/: Search/RestrictSearch.html, Ticket/Display.html,
+	Ticket/ProcessUpdate.html, Ticket/Update.html:
+
+	Dealt with the footer; it does not need overriding anywhere, and is thus placed in the autohandler
+	
+2000-07-13 11:04  tobiasb
+
+	* webrt/: Logout.html, ViewUser.html, autohandler, index.html,
+	Elements/Header, Search/Listing.html, Ticket/Modify.html,
+	Ticket/ValidateUpdate.html:
+
+	Dealt with the header module; it's now in the .html templates, not in autohandler ... the title should be nice and informative in all the templates ... and the instance name is viewed along with the header
+	
+2000-07-13 07:26  tobiasb
+
+	* lib/RT/Link.pm, lib/RT/Ticket.pm, webrt/index.html,
+	webrt/Elements/SelectResultsPerPage, webrt/Search/Listing.html,
+	webrt/Search/PickRestriction:
+
+	small bugfix + better handling of LimitResultsOnPage
+	
+2000-07-12 14:09  tobiasb
+
+	* lib/RT/: Ticket.pm, Transaction.pm:
+
+	bugfix'es.  duplicated linking actions are now turned down.
+	
+2000-07-12 01:39  jesse
+
+	* etc/schema.mysql:
+
+	updated the schema for User objects. now they've got _even more_ data.
+	and better extension capabilities.
+	
+2000-07-12 00:10  tobiasb
+
+	* lib/RT/Attachment.pm, lib/RT/Scrip.pm, lib/RT/ScripScope.pm,
+	lib/RT/Ticket.pm, lib/RT/Transaction.pm,
+	lib/RT/Action/SendEmail.pm, lib/RT/Action/StallDependent.pm,
+	webrt/Elements/SelectResultsPerPage, webrt/Elements/ViewUser,
+	webrt/Ticket/Create.html, webrt/Ticket/Elements/ShowTransaction:
+
+	Debugged a bit and removed some critical bugs
+	
+2000-07-11 14:43  tobiasb
+
+	* webrt/Elements/ViewUser:
+
+		<% $User->Comments || "No comment entered about this user" |h %>
+	
+	"|h" seems like some random noise, or have I misunderstood something?
+	
+2000-07-11 12:19  tobiasb
+
+	* etc/schema.mysql:
+
+	Comments
+	
+2000-07-11 11:30  tobiasb
+
+	* lib/RT/Transaction.pm, lib/RT/Action/AutoReply.pm,
+	webrt/Logout.html, webrt/ViewUser.html:
+
+	more debug logging + some bugfixing (exception handling)
+	
+2000-07-10 20:09  jesse
+
+	* bin/testdeps.pl, etc/schema.mysql, lib/RT/Ticket.pm:
+
+	work on ACLs. some acl decisions are now made.
+	
+2000-07-10 17:13  jesse
+
+	* etc/schema.mysql, lib/RT/ACL.pm, lib/RT/CurrentUser.pm,
+	lib/RT/Queue.pm, lib/RT/Record.pm, lib/RT/Ticket.pm,
+	lib/RT/Transaction.pm, lib/RT/User.pm, lib/RT/Interface/Email.pm,
+	webrt/Ticket/Display.html:
+
+	Wow. all kinds of work.
+	
+	Beginning of implementation of ACLs. lots of code cleanup.
+	
+	schema changes for Groups and Acls.
+	
+	we now use MIMEObj EVERYWHERE instead of MIMEEntity.
+	
+2000-06-29 20:36  jesse
+
+	* Makefile:
+
+	bumped to 1.0.4pre2
+	fixed perms issue for lib/templates
+	
+2000-06-29 16:11  jesse
+
+	* Makefile, etc/schema:
+
+	makefile fixes. bump to 1.0.4pre1
+	schema.mysql has a longer phone number field
+	
+2000-06-26 15:35  jesse
+
+	* README:
+
+	[no log message]
+	
+2000-06-26 15:10  jesse
+
+	* Makefile, bin/rtmux.pl, bin/testdeps.pl:
+
+	added Date::Manip to testdeps.pl
+	set $ENV{'TZ'} in bin/rtmux.pl to deal with a bug in Date::Manip
+	bumped the version to 1.3.8
+	
+2000-06-26 14:38  jesse
+
+	* bin/testdeps.pl:
+
+	added Date::Kronos to testdeps.pl
+	
+2000-06-26 14:36  jesse
+
+	* bin/testdeps.pl:
+
+	added Time::Seconds to testdeps.pl
+	
+2000-06-26 14:31  jesse
+
+	* bin/testdeps.pl, webrt/autohandler, webrt/webrt.css,
+	webrt/Elements/ViewUser, webrt/Ticket/Elements/ShowTransaction:
+
+	various hacking for RTCon pilsen. a much enhanced testdeps.pl
+	
+2000-06-16 10:51  jesse
+
+	* lib/RT/Interface/Email.pm:
+
+	some commentary.
+	
+2000-06-16 08:57  tobiasb
+
+	* lib/RT/Interface/Email.pm:
+
+	Sort of a bugfix
+	
+2000-06-16 08:56  tobiasb
+
+	* lib/RT/Action/SendEmail.pm:
+
+	Removed some old garbage
+	
+	TODO: Fix message trailer
+	
+2000-06-16 04:37  tobiasb
+
+	* lib/RT/: Attachment.pm, Record.pm, Ticket.pm, Transaction.pm:
+
+	It's no longer mandatory to have a Creator in every RT table.  It's just to set them 'read/auto'-accessible.  This should fix bug #275
+	
+2000-06-15 16:43  tobiasb
+
+	* etc/config.pm, lib/RT/Attachment.pm, lib/RT/Link.pm,
+	lib/RT/Ticket.pm, webrt/Elements/MessageBox,
+	webrt/Ticket/Display.html, webrt/Ticket/LinkIt.html,
+	webrt/Ticket/ProcessUpdate.html, webrt/Ticket/Update.html,
+	webrt/Ticket/Elements/ShowTransaction:
+
+	some few bugfixes + some work to get 'reply-linking' working.  In my local version of RT (only changes in the config.pm) people can now enter a 'FAQ-tag', and the right article from KB is automaticly inserted in the reply.
+	
+2000-06-15 12:22  tobiasb
+
+	* webrt/ViewUser.html:
+
+	file ViewUser.html was initially added on branch rt-1-1.
+	
+2000-06-15 12:22  tobiasb
+
+	* lib/RT/Attachment.pm, lib/RT/CurrentUser.pm, lib/RT/Ticket.pm,
+	lib/RT/User.pm, lib/RT/Interface/Email.pm, webrt/ViewUser.html,
+	webrt/autohandler, webrt/Elements/Error, webrt/Elements/Footer,
+	webrt/Elements/Header, webrt/Elements/ViewUser,
+	webrt/Ticket/ProcessUpdate.html, webrt/Ticket/Update.html,
+	webrt/Ticket/Elements/ShowTransaction:
+
+	lots of bugfixes and some enhancements:
+	- signature in replies
+	- Creator, LastUpdated etc. should be updated in User.pm
+	- The message headers of inbound requests is now decoded ... this is
+	  some sort of a hack as it discards charset information in the header.
+	  Anyway, in those cases where the header data will be in the same charset
+	  as the body, this works out nicely.
+	- I'm allowing a user to see what data is stored at him.  We might need ACLs
+	  for the user comment.  Also, this one is placed directly on the root, so
+	  it will break if the user is not logged in.  Also, the page and the module
+	  is 'ViewUser', 'ShowUser' would be more consistent.
+	- Prettified the ShowTransaction header
+	
+2000-06-15 09:02  tobiasb
+
+	* etc/schema.mysql:
+
+	Added "Signature" to the Users table and worked a bit at the comments
+	
+2000-06-14 09:24  tobiasb
+
+	* lib/RT/Ticket.pm, lib/RT/Transaction.pm,
+	webrt/Ticket/Display.html, webrt/Ticket/Elements/TicketToolBox:
+
+	Tons of minor bugfixes and enhancements
+	
+2000-06-14 09:19  tobiasb
+
+	* etc/schema.mysql:
+
+	Added this:
+	
+	##TODO: Get Notify.pm to support OldOwner + fix a template
+	#INSERT INTO Scrips VALUES (20, 'NotifyOldOwnerOnSteal',
+	#			  'Sends mail to the old owner when the ticket is stolen',
+	#			  'Steal','Notify',10,'OldOwner',1,NULL,1,NULL);
+	
+2000-06-14 06:54  tobiasb
+
+	* etc/schema.mysql, lib/RT/Attachment.pm, lib/RT/Record.pm,
+	lib/RT/Ticket.pm, webrt/Ticket/Display.html,
+	webrt/Ticket/Elements/ShowDates:
+
+	minor enhancements and bugfixes
+	
+2000-06-14 03:30  tobiasb
+
+	* etc/schema.mysql:
+
+	I just noticed that Jesse already had a 'resolution' attribute in the ticket.  I guess that covers the same as my 'state' attribute
+	
+2000-06-14 00:12  tobiasb
+
+	* lib/RT/Attachment.pm, webrt/Elements/ViewUser,
+	webrt/Search/Listing.html, webrt/Search/PickRestriction,
+	webrt/Ticket/Elements/ShowDates:
+
+	Some enhancements and bugfixes
+	
+2000-06-13 23:26  tobiasb
+
+	* webrt/Ticket/Elements/ShowDates:
+
+	improved
+	
+2000-06-13 20:42  tobiasb
+
+	* etc/schema.mysql:
+
+	Bugfix
+	
+2000-06-13 15:53  tobiasb
+
+	* lib/RT/TicketCollection.pm, webrt/Search/Listing.html:
+
+	Trying to get search on requestor to work - unsuccessful so far :/
+	
+2000-06-13 10:23  tobiasb
+
+	* webrt/: autohandler, Ticket/Display.html,
+	Ticket/Elements/TicketToolBox:
+
+	Some bugfixes
+	
+2000-06-13 06:41  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Bugfix
+	
+2000-06-09 14:43  tobiasb
+
+	* webrt/EditUserComments.html:
+
+	Hm, aaaalways check if everything is working before committing.  Argh.
+	
+2000-06-09 14:30  tobiasb
+
+	* webrt/: EditUserComments.html, autohandler, Elements/Error,
+	Elements/ViewUser:
+
+	added a minimum interface for editing comments about users
+	
+2000-06-09 12:53  tobiasb
+
+	* webrt/Ticket/Elements/ShowRequestor:
+
+	file ShowRequestor was initially added on branch rt-1-1.
+	
+2000-06-09 12:53  tobiasb
+
+	* webrt/Elements/ViewUser:
+
+	file ViewUser was initially added on branch rt-1-1.
+	
+2000-06-09 12:53  tobiasb
+
+	* webrt/EditUserComments.html:
+
+	file EditUserComments.html was initially added on branch rt-1-1.
+	
+2000-06-09 12:53  tobiasb
+
+	* etc/schema.mysql, lib/RT/Ticket.pm, lib/RT/User.pm,
+	lib/RT/Users.pm, lib/RT/Watcher.pm, lib/RT/Interface/Email.pm,
+	webrt/EditUserComments.html, webrt/Elements/ViewUser,
+	webrt/Ticket/ProcessUpdate.html, webrt/Ticket/Elements/ShowPeople,
+	webrt/Ticket/Elements/ShowRequestor,
+	webrt/Ticket/Elements/ShowSummary:
+
+	added a large section in the ticket view for earlier requests (stubbed) by the same requestor and comments about the requestor (the interface for editing those comments are stubbed)
+	
+2000-06-09 04:32  tobiasb
+
+	* etc/schema.mysql:
+
+	Added "Lang" to the users table
+	
+2000-06-08 10:17  tobiasb
+
+	* etc/config.pm, etc/schema.mysql, lib/RT/Ticket.pm,
+	webrt/Elements/SelectMatch, webrt/Ticket/Display.html,
+	webrt/Ticket/Elements/TicketToolBox:
+
+	Added 'UpdateTold' sub to Tickets.  Some minor bugfixes and enhancements.  Not much testing done.
+	
+2000-06-08 08:19  tobiasb
+
+	* lib/RT/Ticket.pm, lib/RT/Transaction.pm, lib/RT/Watcher.pm,
+	lib/RT/Action/SendEmail.pm, lib/RT/Interface/Email.pm,
+	webrt/Ticket/Update.html:
+
+	A bit of debugging, and I managed to remove some annoying warnings
+	
+2000-06-08 08:10  tobiasb
+
+	* etc/schema.mysql:
+
+	bugfix
+	
+2000-06-08 07:59  tobiasb
+
+	* etc/schema.mysql:
+
+	Removed the area in one template.
+	
+2000-06-08 07:55  tobiasb
+
+	* etc/schema.mysql:
+
+	# I think it might make sense replacing "TIMESTAMP" with "DATETIME"
+	# for mysql.  Yes, indeed, I'll do that right away.
+	
+2000-06-08 06:53  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Removed some redundant lines.
+	
+2000-06-08 06:38  tobiasb
+
+	* etc/schema.mysql:
+
+	Inserted table AlternateEmails (commented out as for now).
+	
+	One bugfix (typo) in the ACL table.
+	
+2000-06-08 06:31  tobiasb
+
+	* etc/schema.mysql:
+
+	Grouped into folders
+	
+2000-06-08 05:47  tobiasb
+
+	* lib/RT/Attachment.pm, lib/RT/Ticket.pm, webrt/Login.html,
+	webrt/Search/Listing.html, webrt/Ticket/ProcessUpdate.html,
+	webrt/Ticket/Elements/ShowTransaction,
+	webrt/Ticket/Elements/TicketToolBox:
+
+	bugfixes + improvements requested from the support team; kill & take link from the front page, table borders in listing, reduced header printing ...
+	
+2000-06-07 16:15  tobiasb
+
+	* lib/RT/Ticket.pm, lib/RT/Transaction.pm,
+	webrt/Elements/MessageBox, webrt/Ticket/Elements/ShowTransaction:
+
+	bugfixes
+	
+2000-06-07 15:46  tobiasb
+
+	* etc/schema.mysql:
+
+	bugfix
+	
+2000-06-07 15:42  tobiasb
+
+	* lib/RT/: Ticket.pm, Transaction.pm:
+
+	bugfixes
+	
+2000-06-07 15:22  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Now, if some Record decendant can _Accessible('Created', auto) and _Accessible('LastUpdated', auto), they will be set automaticly (at least, that's the theory)
+	
+2000-06-07 14:16  tobiasb
+
+	* etc/schema.mysql:
+
+	mysql autosets the first TIMESTAMP in the table on every
+	update/insert.
+	
+2000-06-07 12:33  tobiasb
+
+	* webrt/autohandler:
+
+	The error handling here seems to work now ... but only for documents
+	at the root.  I thought those autohandlers were called recursively?
+	
+2000-06-07 12:12  tobiasb
+
+	* etc/config.pm, lib/RT/Record.pm, lib/RT/Ticket.pm:
+
+	working with those pesky dates
+	
+2000-06-07 11:51  tobiasb
+
+	* bin/webmux.pl:
+
+	bugfix
+	
+2000-06-07 08:37  tobiasb
+
+	* README:
+
+	Added Date::Kronos (not on CPAN yet) to README
+	
+2000-06-07 08:17  tobiasb
+
+	* webrt/Ticket/Elements/ShowTransaction:
+
+	Different Comment and Reply links.  They link to the same page, but the default
+	action is changed.
+	
+2000-06-07 07:36  tobiasb
+
+	* webrt/Ticket/Elements/ShowTransaction:
+
+	Now it doesn't display looooong text/plain attachments.
+	
+	We have a lot of ~1M text/plain attachments in our RT queue.
+	
+	I'm trying to hack my webrt.cgi to show attachments upon a
+	"PickUpTransaction" parameter.  I don't know how to do it in the
+	mason/mod_perl model.
+	
+2000-06-07 04:09  tobiasb
+
+	* webrt/Elements/MessageBox:
+
+	bugfix
+	
+2000-06-06 18:44  jesse
+
+	* etc/schema.mysql:
+
+	removed an outdated table
+	
+2000-06-06 15:42  jesse
+
+	* webrt/Login.html:
+
+	changed the name of the mason package to RT::Mason, so it didn't conflict with other instances
+	on the same webserver
+	
+	fixed a couple of Log::Dispatch(warn)s to (warning)s
+	
+	removed tobix' weird session crunching code that was messign me up
+	
+2000-06-06 15:42  jesse
+
+	* etc/config.pm, lib/RT/Ticket.pm:
+
+	changed the name of the mason package to RT::Mason, so it didn't conflict with other instances
+	on the same webserver
+	
+	fixed a couple of Log::Dispatch(warn)s to (warning)s
+	
+2000-06-06 15:41  jesse
+
+	* bin/webmux.pl:
+
+	changed the name of the mason package to RT::Mason, so it didn't conflict with other instances
+	on the same webserver
+	
+	f
+	
+2000-06-06 15:41  jesse
+
+	* README:
+
+	changed the name of the mason package to RT::Mason, so it didn't conflict with other instances
+	on the same webserver
+	
+2000-06-06 14:40  tobiasb
+
+	* webrt/Ticket/: Update.html, Elements/TicketToolBox:
+
+	I'm trying to set default action in Update.html dependent on which link the
+	user clicked at (update, comment or reply).  I'll continue tomorrow (dinnertime
+	now :)
+	
+2000-06-06 14:11  tobiasb
+
+	* webrt/Ticket/ProcessUpdate.html:
+
+	bugfix
+	
+2000-06-06 13:48  jesse
+
+	* etc/config.pm:
+
+	changed Log::Dispatch::VERSION (1.2) which didn't work
+	to the more standard perl syntax:  use Log::Dispatch 1.2;
+	
+	\ed an @ that tobix left in rtmux.pl
+	
+2000-06-06 13:47  jesse
+
+	* bin/rtmux.pl:
+
+	\ed an @ that tobix left in rtmux.pl
+	
+2000-06-06 13:32  jesse
+
+	* Makefile:
+
+	:%s/        /	/ in the makefile (convert spaces to tabs)
+	
+2000-06-06 13:15  tobiasb
+
+	* README:
+
+	Mostly doc changes
+	
+2000-06-06 11:36  tobiasb
+
+	* etc/config.pm:
+
+	bugfix
+	
+2000-06-06 11:15  tobiasb
+
+	* docs/FAQ:
+
+	Added some few tips
+	
+2000-06-06 11:05  tobiasb
+
+	* bin/rtmux.pl:
+
+	putted in some warnings about things that doesn't work
+	
+2000-06-06 04:21  tobiasb
+
+	* README:
+
+	added comments about DBMS'es
+	
+2000-06-05 16:54  tobiasb
+
+	* Makefile:
+
+	more bugfixes
+	
+2000-06-05 16:46  tobiasb
+
+	* Makefile:
+
+	bgfx
+	
+2000-06-05 14:01  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+2000-06-05 09:26  tobiasb
+
+	* README, etc/config.pm, etc/schema.mysql, webrt/autohandler:
+
+	done some documentation fixes
+	
+2000-06-05 07:14  tobiasb
+
+	* README:
+
+	updated the STATUS
+	
+2000-06-02 03:32  tobiasb
+
+	* etc/schema.mysql, lib/RT/Action/SendEmail.pm,
+	lib/RT/Interface/Email.pm, webrt/autohandler, webrt/Elements/Error:
+
+	bugfix
+	
+2000-06-01 23:28  tobiasb
+
+	* webrt/Ticket/Elements/TicketToolBox:
+
+	file TicketToolBox was initially added on branch rt-1-1.
+	
+2000-06-01 23:28  tobiasb
+
+	* etc/config.pm, etc/schema.mysql, lib/RT/Link.pm,
+	lib/RT/Ticket.pm, lib/RT/Action/SendEmail.pm,
+	lib/RT/Interface/Email.pm, webrt/autohandler, webrt/Elements/Error,
+	webrt/Elements/SelectOwner, webrt/Ticket/Create_Detail.html,
+	webrt/Ticket/Display.html, webrt/Ticket/ProcessUpdate.html,
+	webrt/Ticket/Update.html, webrt/Ticket/Elements/TicketToolBox:
+
+	 ... better logging (logs a warning when it's dieing during an eval) ... maybe the URL in the mails will work now ... misc bugfixes ... some better foldings ... better error handling in the WebUI (not tested!  You should absolutely see this, I have a feeling it's unsmart.  Check autohandler and Elements/Error) ... misc features added (default values on selectowners now work, auto-fill-in of requestor on create, auto-fill-in of subject on spawn, viewing actions on the ProcessUpdate, ProcessUpdate fixed up a bit ... hm, that's it)
+	
+2000-06-01 20:54  tobiasb
+
+	* bin/testdeps.pl:
+
+	Added Text::Wrapper for quoting of wide messages
+	
+2000-06-01 20:50  tobiasb
+
+	* lib/RT/Transaction.pm, lib/RT/Action/StallDependent.pm,
+	lib/RT/Interface/Email.pm, webrt/Login.html,
+	webrt/Ticket/autohandler, webrt/Ticket/Elements/ShowLinks:
+
+	lots of bugfixes and minor enhancements
+	
+2000-06-01 02:58  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+2000-06-01 02:20  jesse
+
+	* Makefile, NEWS:
+
+	work on the web ui. cleanups to the comment and reply pages as well as the
+	queue view and the ticket detail page
+	
+2000-05-31 14:28  tobiasb
+
+	* etc/config.pm, webrt/Search/Listing.html,
+	webrt/Search/TicketCell, webrt/Ticket/Display.html:
+
+	Popular demand: A link for taking an action from the listing page (reduces the change for concurrency problems)
+	
+2000-05-31 13:59  tobiasb
+
+	* webrt/Search/autohandler:
+
+	Uh, some weird debugging stuff came into the last commit - I should
+	have checked better.
+	
+	Some of those autohandlers seems like copies of each other.  There
+	must be better ways to do this (i.e. separating all the common stuff
+	into some module)?
+	
+2000-05-31 13:52  tobiasb
+
+	* lib/RT/Transaction.pm, lib/RT/Interface/Email.pm,
+	webrt/Search/Listing.html, webrt/Search/PickRestriction,
+	webrt/Search/autohandler, webrt/Ticket/Display.html,
+	webrt/Ticket/Elements/ShowHistory:
+
+	popular demands; more navigation ({back to listing} and {last transaction}) and misc details
+	
+2000-05-31 12:20  tobiasb
+
+	* webrt/Elements/SelectMatch:
+
+	This one is plain ugly at the moment.  Anyway, it's ment for a more advanced 'regexp match / glob match / word match / substring match / total match'
+	
+2000-05-31 12:20  tobiasb
+
+	* webrt/Elements/SelectMatch:
+
+	file SelectMatch was initially added on branch rt-1-1.
+	
+2000-05-31 11:55  tobiasb
+
+	* lib/RT/Action/SendEmail.pm:
+
+	bugfix
+	
+2000-05-31 09:53  tobiasb
+
+	* webrt/: Elements/SelectStatus, Ticket/Update.html:
+
+	Some popular demands from the support dept;
+	
+	I've made it possible to kill by selecting status dead
+	
+	Response is the default action.  I've added a cryptical line which
+	might or might not give a warning.  Ideally, I guess we should do the comment /
+	reply selection through submit buttons rather than through a select menu - what
+	di you think?
+	
+2000-05-30 22:46  tobiasb
+
+	* etc/config.pm, lib/RT/Attachment.pm:
+
+	Ah ... I had forgotten signatures.  Some stubbed work, I'll continue tomorrow
+	
+2000-05-30 22:31  tobiasb
+
+	* lib/RT/Attachment.pm, lib/RT/Attachments.pm, lib/RT/Record.pm,
+	lib/RT/Ticket.pm, lib/RT/Transaction.pm, webrt/Login.html,
+	webrt/Elements/MessageBox, webrt/Search/Listing.html,
+	webrt/Ticket/autohandler, webrt/Ticket/Elements/ShowTransaction:
+
+	Quoting works now ... fixed some other misc details + bugfixes ... and I've moved the date handling to RT::Record, it will be completed tomorrow (I hopecvs diff -uw | less)
+	
+2000-05-30 20:31  tobiasb
+
+	* webrt/Ticket/Create_Detail.html:
+
+	Removed those annoying blink tags.. :)
+	
+2000-05-30 20:14  tobiasb
+
+	* webrt/: Elements/MessageBox, Ticket/Create_Detail.html:
+
+	Still working on that MessageBox
+	
+2000-05-30 20:09  tobiasb
+
+	* webrt/: Elements/MessageBox, Ticket/Update.html:
+
+	Separated out the MessageBox
+	
+2000-05-30 20:09  tobiasb
+
+	* webrt/Elements/MessageBox:
+
+	file MessageBox was initially added on branch rt-1-1.
+	
+2000-05-30 19:56  tobiasb
+
+	* webrt/Ticket/Elements/ShowTransaction:
+
+	Changed <BLOCKQUOTE> to <pre> for the message content.
+	
+	TODO: We really should HTML'ify and/or HTML-escape the Content.
+	
+2000-05-29 06:59  tobiasb
+
+	* Makefile:
+
+	Some bugfixes, but absolutely not tested.
+	
+2000-05-26 12:11  tobiasb
+
+	* webrt/Search/Listing.html:
+
+	Now it runs /Elements/Header - I was a bit annoyed because it was missing Title
+	
+2000-05-26 10:11  tobiasb
+
+	* webrt/Ticket/Display.html:
+
+	Seems like I had introduced an error here
+	
+2000-05-24 21:50  jesse
+
+	* lib/RT/Ticket.pm, lib/RT/TicketCollection.pm, lib/RT/Tickets.pm,
+	webrt/Search/Listing.html, webrt/Ticket/Display.html:
+
+	Working on persistable web queries. Introduced RT::TicketCollection
+	Arguably this should be in RT::Tickets. and may be some day
+	
+2000-05-24 21:50  jesse
+
+	* lib/RT/TicketCollection.pm:
+
+	file TicketCollection.pm was initially added on branch rt-1-1.
+	
+2000-05-24 08:00  tobiasb
+
+	* lib/RT/Interface/Email.pm:
+
+	It should also be possible to "unlink" something (i.e. if a link was
+	wrongly set).  This is not implemented, but at least mails with
+	an "unlink" command will not bounce now.
+	
+2000-05-23 18:49  tobiasb
+
+	* lib/RT/Transaction.pm:
+
+	Made the transaction text from a link action a bit more readable,
+	though this still needs quite some work.
+	
+2000-05-23 16:57  jesse
+
+	* Makefile:
+
+	Bumped to 1.3.7
+	
+2000-05-23 10:12  tobiasb
+
+	* etc/config.pm, lib/RT/Link.pm, lib/RT/Ticket.pm,
+	lib/RT/Interface/Email.pm, webrt/Ticket/Display.html:
+
+	I've started looking at the mail interface.  Now linking works through the mailgate, though we need some info in the docs.  I'm proposing that it should accept both commands in the headerlines ("RT-Command: Link/Resolve/Whatever blahblah") and traditional commands in the mail ("%RT Link", "%RT Resolve", etc), though I've only supported the first one yet.  Look at the comments in Email.pm for details.
+	
+2000-05-23 10:04  tobiasb
+
+	* lib/RT/Scrip.pm:
+
+	Bugfix/optimalization or something?
+	
+2000-05-22 19:09  tobiasb
+
+	* lib/RT/Ticket.pm, webrt/Ticket/Create_Detail.html,
+	webrt/Ticket/Display.html, webrt/Ticket/LinkIt.html:
+
+	I'm not very happy about some comprimises, choises and short-cuts I've done here, but anyway linking & spawning seems to work now.
+	
+2000-05-22 18:05  tobiasb
+
+	* lib/RT/Transaction.pm, lib/RT/Action/AutoReply.pm,
+	webrt/Ticket/Create.html, webrt/Ticket/Create_Detail.html,
+	webrt/Ticket/Display.html, webrt/Ticket/LinkIt.html:
+
+	all changes here are either related to getting the Create working from the web, or harmless details
+	
+2000-05-22 17:39  tobiasb
+
+	* webrt/Ticket/Display.html:
+
+	$Subject => $Subject||(no subject given)
+	
+	TODO: HTML-escape
+	
+2000-05-22 17:38  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Removed VerboseSubject and HTMLSubject
+	
+2000-05-22 17:24  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	I do use $Ticket->Subject (and other stuff as well) frequently when
+	I'm editing Mason.  There is two issues;
+	
+	1) Things might look freaked if the ticket has no subject, i.e. Display.html
+	
+	2) Things might get totally whacko if the subject contains HTML code.
+	
+	I could ensure the "right" behaviour all the places by using
+	HTML::Entities::encode (I've done it one place), and by always using
+	$Subject||"(No subject)".  Anyway, I think it might be more
+	appropriate to have a sub RT::Ticket::VerboseSubject and
+	RT::Ticket::HTMLSubject.
+	
+	What do you think?
+	
+2000-05-22 16:51  tobiasb
+
+	* webrt/Ticket/Display.html:
+
+	It seems like it can create and view new transactions now.
+	
+	My next step will be to fix linking
+	
+2000-05-22 16:47  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	I should never commit before testing ... I should never commit before testing ... I should never commit before ...
+	
+	bugfix.
+	
+2000-05-22 16:38  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	I'm trying to get a better propagation of error messages.  I'm a bit
+	amused to find lots of things that shouldn't pass `perl -w' and `use
+	strict'?
+	
+2000-05-22 15:52  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Removed a debug (?) line that was commented out:
+	
+	#      print "From is $From\n";
+	
+	...and inserted some other logging:
+	
+	- logs an info message with ticket id, subject and queue upon
+	successful message creation.
+	
+	- logs a warning if it couldn't be created.
+	
+2000-05-22 14:11  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	In RT::Ticket::Create: Defaulting queue to 'general', and warning when it's not set
+	
+2000-05-22 14:06  tobiasb
+
+	* README:
+
+	Added a 'rt-comment' to the recommended mail configuration
+	
+2000-05-22 14:04  tobiasb
+
+	* Makefile:
+
+	added a comment-mail-alias
+	
+2000-05-22 14:03  tobiasb
+
+	* etc/config.pm:
+
+	Hm ... $RT::CorrespondAddress is used in AutoReply.pm, while only
+	$MailAlias is set in config.pm.  I'm not sure if this is the Right(tm)
+	solution, but anyway ... I added those two lines, additions to the
+	Makefile and README file is coming up shortly ...
+	
+	$CorrespondAddress=$MailAlias;
+	$CommentAddress="!!RT_COMMENT_MAIL_ALIAS!!";
+	
+2000-05-22 12:53  tobiasb
+
+	* webrt/Ticket/Create_Detail.html:
+
+	fixed up a bug caused by too quick usage of cut&paste
+	
+2000-05-22 12:01  tobiasb
+
+	* webrt/Ticket/Create_Detail.html:
+
+	Done some work making this page look OK.  Now I will put in some logic
+	in Display.html for creating and linking requests.
+	
+2000-05-22 05:30  tobiasb
+
+	* webrt/Elements/SelectOwner:
+
+	# TODO: respect the ACLs!!
+	# This will be a list of some thousands requestors with the current scheme.
+	
+2000-05-19 12:37  tobiasb
+
+	* webrt/Ticket/Create.html:
+
+	Added a box for setting link information.  Only a web mockup, the
+	logic doesn't work yet.  Feel free to do whatever you'd like with this
+	one.  It might make sense to move this to the details page.
+	
+2000-05-19 12:17  jesse
+
+	* webrt/Ticket/LinkIt.html:
+
+	Code and formatting cleanups
+	
+2000-05-19 11:23  tobiasb
+
+	* etc/config.pm:
+
+	Removed some weird stuff
+	
+2000-05-19 10:59  jesse
+
+	* webrt/: index.html, Search/PickRestriction:
+
+	fixed some typos
+	
+2000-05-19 10:59  jesse
+
+	* etc/config.pm:
+
+	cleaned up the config file a bit
+	
+	<M-}>CVS: 	etc/config.pm
+	
+2000-05-19 08:42  tobiasb
+
+	* bin/testdeps.pl, bin/webmux.pl, webrt/Elements/SelectLinkType,
+	webrt/Ticket/Display.html, webrt/Ticket/LinkIt.html,
+	webrt/Ticket/ProcessUpdate.html, webrt/Ticket/Elements/ShowSummary,
+	webrt/Ticket/Elements/ShowTransaction:
+
+	Started the work getting links to work.  While the linking doesn't work yet, this is a hint about how I think things might work
+	
+2000-05-19 08:42  tobiasb
+
+	* webrt/Elements/SelectLinkType:
+
+	file SelectLinkType was initially added on branch rt-1-1.
+	
+2000-05-19 08:42  tobiasb
+
+	* webrt/Ticket/LinkIt.html:
+
+	file LinkIt.html was initially added on branch rt-1-1.
+	
+2000-05-18 14:46  jesse
+
+	* lib/RT/Ticket.pm:
+
+	a tiny bit of doc added to Ticket.pm
+	still not happy with the format
+	
+2000-05-18 10:56  tobiasb
+
+	* webrt/Ticket/autohandler:
+
+	undo of last commit; only local modifications for debugging
+	
+2000-05-18 10:51  tobiasb
+
+	* webrt/: Search/Listing.html, Ticket/Elements/ShowTransaction:
+
+	the previous commit had wrong loginfo; those files are modified according to the latest changes in etc/config.pm
+	
+2000-05-18 10:42  jesse
+
+	* webrt/Elements/SelectResultsPerPage:
+
+	adding missing file
+	
+2000-05-18 10:41  tobiasb
+
+	* webrt/: index.html, Search/Listing.html, Ticket/autohandler,
+	Ticket/Elements/ShowTransaction:
+
+	A front page for navigation.  This one needs work; Masonifying, generalizing and possibilities for customizations needs to be implemented
+	
+2000-05-18 10:41  tobiasb
+
+	* webrt/index.html:
+
+	file index.html was initially added on branch rt-1-1.
+	
+2000-05-18 10:36  tobiasb
+
+	* webrt/Elements/SelectResultsPerPage:
+
+	Added an empty file as for now
+	
+2000-05-18 10:36  tobiasb
+
+	* webrt/Elements/SelectResultsPerPage:
+
+	file SelectResultsPerPage was initially added on branch rt-1-1.
+	
+2000-05-18 05:48  tobiasb
+
+	* etc/config.pm:
+
+	I'm planning to deal with web customizations with one hash RT::WebOptions in config.pm.  This hash might contain callbacks and maybe names of extra Mason modules to pull in.  What do you think?
+	
+2000-05-17 19:08  jesse
+
+	* webrt/Search/autohandler:
+
+	file autohandler was initially added on branch rt-1-1.
+	
+2000-05-17 19:08  jesse
+
+	* webrt/Search/: Listing.html, PickRestriction, autohandler:
+
+	Work on searches. in the cli  -maxitems <n> now does the right thing
+	
+2000-05-16 17:48  jesse
+
+	* webrt/Ticket/Elements/ShowLinks:
+
+	file ShowLinks was initially added on branch rt-1-1.
+	
+2000-05-16 17:48  jesse
+
+	* bin/rtmux.pl, bin/webmux.pl, lib/RT/Link.pm, lib/RT/Ticket.pm,
+	lib/RT/Action/OpenDependent.pm, lib/RT/Action/ResolveMembers.pm,
+	lib/RT/Action/Spam.pm, lib/RT/Action/StallDependent.pm,
+	webrt/Elements/Error, webrt/Ticket/Elements/ShowLinks,
+	webrt/Ticket/Elements/ShowSummary:
+
+	Converted the new link code to a fully oo setup, rahter than a mishmash of
+	procedural and oo.  seperated out webrt/Ticket/Elements/ShowLinks
+	
+	It's by no means done, but it does seem to work.
+	
+	jesse
+	
+2000-05-16 12:30  tobiasb
+
+	* Makefile, etc/config.pm, lib/RT/Link.pm, lib/RT/Ticket.pm,
+	webrt/Ticket/Elements/ShowSummary:
+
+	Done quite some work at the right hand 'Other Links' window (well, it's not good enough, and it also lists dependencies as for now).  Jesse, you might want to do something with ShowSummary, my Mason code seems horribly ugly.
+	
+2000-05-16 09:18  tobiasb
+
+	* etc/config.pm:
+
+	(...)
+	# A hash table of convertion subs to be used for transforming RT Link
+	# URIs to URLs in the web interface.  If you want to use RT towards
+	# locally installed databases, this is the right place to configure it.
+	# (TODO!)
+	my %URI2HTML=
+	    (
+	     'fsck.com-rt' => sub {warn "stub!";},
+	     'mozilla.com-bugzilla' => sub {warn "stub!";},
+	     'fsck.com-kb' => sub {warn "stub!"}
+	     );
+	(...)
+	
+	I will also make a sub RT::Links::URI2HTML which gives smart links to
+	internal references, and passes other URIs to this hash table, and
+	eventually we should make default subs for KB and RT.
+	
+	What do you think of this idea?
+	
+2000-05-16 04:58  tobiasb
+
+	* lib/RT/: Link.pm, Ticket.pm:
+
+	Enabled link display in the CLI
+	
+2000-05-16 04:43  tobiasb
+
+	* lib/RT/Transaction.pm:
+
+	Seems like I had broken something...(bugfix)
+	
+2000-05-13 19:56  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Right, we need to work a bit with the links API.
+	
+	- we need an AllLinks sub.  How to tell EasySearch to give both links
+	where we're BASE and were we're TARGET?
+	
+	- we need an "unresolved dependencies" according to the current
+	design.  How to tell if a dependency is unresolved?  Dependencies can
+	point out of this RT instance!
+	
+	- we might need more subs, but not right now anyway.
+	
+2000-05-12 11:32  tobiasb
+
+	* webrt/Ticket/Elements/ShowTransaction:
+
+	partly a bugfix; 'QouteTransaction=attachment-id' doesn't work very well for transactions without attachment.  Maybe that link should only be for attachments, and not for transactions.  Anyway, I changed it to transaction-id instead.  And I also added 'spawn' to the title; I think 'spawning' should be done through the same page.  'spawn' is when creating a new request that is linked up somehow to the old one.  Maybe it rather should be titled 'forward' or 'create new' or something?
+	
+2000-05-12 07:54  tobiasb
+
+	* webrt/: Elements/Error, Ticket/Display.html:
+
+	Bugfixing ... ehrm, why don't I test things before committing? :)
+	
+2000-05-12 07:34  tobiasb
+
+	* webrt/Elements/Error:
+
+	It logs errors now
+	
+2000-05-12 07:32  tobiasb
+
+	* webrt/Ticket/Display.html:
+
+	dies if element can't be loaded
+	
+2000-05-12 06:55  tobiasb
+
+	* webrt/Login.html:
+
+	seems like CGI won't take a combined get+post
+	
+2000-05-12 06:51  tobiasb
+
+	* etc/config.pm:
+
+	bugfix
+	
+2000-05-11 12:45  jesse
+
+	* webrt/Elements/ShadedBox:
+
+	file ShadedBox was initially added on branch rt-1-1.
+	
+2000-05-11 12:45  jesse
+
+	* webrt/Elements/ShadedBox:
+
+	missed this one before. it's somewhat misnamed right now. basically, it
+	prints a title and content.
+	
+2000-05-11 12:39  jesse
+
+	* webrt/Elements/: TitleBoxEnd, TitleBoxStart:
+
+	the title box for webui
+	
+2000-05-11 12:39  jesse
+
+	* webrt/Elements/TitleBoxStart:
+
+	file TitleBoxStart was initially added on branch rt-1-1.
+	
+2000-05-11 12:39  jesse
+
+	* webrt/Elements/TitleBoxEnd:
+
+	file TitleBoxEnd was initially added on branch rt-1-1.
+	
+2000-05-11 12:37  jesse
+
+	* webrt/Ticket/: Display.html, Elements/ShowSummary:
+
+	hrml cleanup. it's not as pretty, but man does it render faster
+	
+2000-05-11 01:07  jesse
+
+	* webrt/: Elements/Footer, Elements/Header, Ticket/Display.html,
+	Ticket/Elements/ShowHistory, Ticket/Elements/ShowSummary,
+	Ticket/Elements/ShowTransaction:
+
+	
+	Cleanup
+	\
+	
+2000-05-11 00:46  tobiasb
+
+	* TODO:
+
+	Added a list
+	
+2000-05-10 23:43  jesse
+
+	* webrt/webrt.css:
+
+	file webrt.css was initially added on branch rt-1-1.
+	
+2000-05-10 23:43  jesse
+
+	* webrt/webrt.css:
+
+	The base stylesheet.
+	
+2000-05-10 23:41  jesse
+
+	* webrt/Ticket/Elements/ShowSummary:
+
+	file ShowSummary was initially added on branch rt-1-1.
+	
+2000-05-10 23:41  jesse
+
+	* webrt/Ticket/Elements/ShowTransaction:
+
+	file ShowTransaction was initially added on branch rt-1-1.
+	
+2000-05-10 23:41  jesse
+
+	* webrt/Ticket/Elements/ShowDates:
+
+	file ShowDates was initially added on branch rt-1-1.
+	
+2000-05-10 23:41  jesse
+
+	* webrt/Ticket/Elements/ShowHistory:
+
+	file ShowHistory was initially added on branch rt-1-1.
+	
+2000-05-10 23:41  jesse
+
+	* webrt/Ticket/Elements/ToolBar:
+
+	file ToolBar was initially added on branch rt-1-1.
+	
+2000-05-10 23:41  jesse
+
+	* webrt/Ticket/Elements/ShowBasics:
+
+	file ShowBasics was initially added on branch rt-1-1.
+	
+2000-05-10 23:41  jesse
+
+	* webrt/Ticket/Elements/ShowPeople:
+
+	file ShowPeople was initially added on branch rt-1-1.
+	
+2000-05-10 23:41  jesse
+
+	* webrt/: Elements/Header, Ticket/Display.html,
+	Ticket/DisplayHeader, Ticket/DisplaySummary, Ticket/DisplayTicket,
+	Ticket/ProcessUpdate.html, Ticket/ToolBar, Ticket/autohandler,
+	Ticket/Elements/ShowBasics, Ticket/Elements/ShowDates,
+	Ticket/Elements/ShowHistory, Ticket/Elements/ShowPeople,
+	Ticket/Elements/ShowSummary, Ticket/Elements/ShowTransaction,
+	Ticket/Elements/ToolBar:
+
+	Work on the web ui. mostly on the ticket display interface
+	
+2000-05-10 15:43  tobiasb
+
+	* README:
+
+	Added a comment about how to do the CGI :) Well:
+	
+		To get it up running even without mod_perl, you will need to
+	consult Tobix or the rt-devel mailinglist.  Tobix is actively working
+	on a (Fast)CGI version, but as for now he has been too lazy to update
+	the template for the cgi executable.
+	
+2000-05-10 15:39  tobiasb
+
+	* webrt/Ticket/Create_Detail.html:
+
+	added a require statement.  No effect for the mod_perl version, but makes sense for a CGI version.
+	
+2000-05-09 05:35  tobiasb
+
+	* bin/webmux.pl:
+
+	Better formatting
+	
+2000-05-08 05:01  tobiasb
+
+	* lib/RT/Interface/Email.pm:
+
+	bugfix
+	
+2000-05-05 19:20  tobiasb
+
+	* lib/RT/Action/SendEmail.pm:
+
+	This one shouldn't loop now - though it's not tested :)
+	
+2000-05-05 19:15  tobiasb
+
+	* lib/RT/Interface/Email.pm:
+
+	Fixing up the loop control.  When a possible loop occurs, an error
+	flag is set, and a new header field RT-Loop-Alarm appears.  I feel a
+	bit bad about the latter, we are indeed changing an email after it
+	arrived to the system, which I think is a bad thing - but anyway not
+	as bad as dropping the email completely.  My idea is that the Actions,
+	particularly the SendEmail.pm Action remain silent when this header
+	field is set.
+	
+2000-05-05 19:01  tobiasb
+
+	* etc/config.pm:
+
+	Added this about logging to the comments:
+	
+	# It might generally make sense to send error and higher by email to
+	# some administrator.  For heavens sake; be sure that the email goes
+	# directly to a mailbox, and not via RT :) Mail loops will generate a
+	# critical log message.
+	
+2000-05-05 16:47  jesse
+
+	* bin/testdeps.pl:
+
+	Added Log::Dispatch to testdeps.pl
+	
+2000-05-05 13:04  tobiasb
+
+	* lib/RT/Transaction.pm:
+
+	bugfix
+	
+2000-05-05 12:47  tobiasb
+
+	* etc/config.pm:
+
+	I need help, I can't really figure out from this;
+	
+	When commenting out the $SIG{__DIE__} stuff, everything works fine.
+	
+	When having this line in the config:
+	
+	$SIG{__DIE__}  = sub {$RT::Logger->log(level=>'crit',message=>$_[0]); print STDERR $_[0]; exit(-1);};
+	
+	I get this error:
+	
+	Can't locate Mail/Field/addrlist.pm in @INC (@INC contains: /tmp/FunRT /tmp/DBIx /etc/rt /usr/local/lib/perl5/5.6.0/i686-linux /usr/local/lib/perl5/5.6.0 /usr/local/lib/perl5/site_perl/5.6.0/i686-linux /usr/local/lib/perl5/site_perl/5.6.0 /usr/local/lib/perl5/site_perl .) at (eval 115)[/usr/local/lib/perl5/site_perl/5.6.0/Mail/Field.pm:87] line 3.
+	
+	WTF???
+	
+2000-05-05 10:29  tobiasb
+
+	* bin/rtmux.pl:
+
+	I guess this should block that stupid warnings
+	
+2000-05-05 10:01  tobiasb
+
+	* etc/config.pm:
+
+	Added Log::Dispatch.  I also have added those comments, which I would
+	like comments on (:
+	
+	# Most (if not all?) $RT:: global variables should be here.  I'd
+	# suggest putting session information in another Namespace (main:: or
+	# RT::main or maybe something like that).
+	
+	#use strict;
+	
+	#use vars qw/%SitePolicy $dirmode $transactionmode $DatabasePassword $rtname $domain $host $DatabaseHost $DatabaseUser $RT::DatabaseName $DatabaseType $user_passwd_min $MailAlias $WebrtImagePath $web_auth_mechanism $web_auth_cookies_allow_no_path $DefaultLocale $LocalePath $Nobody $Logger/;
+	
+	I'm not sure if "use strict" breaks, but at least "use vars" breaks
+	bigtime as we are using it other places (like rtmux.pl).  I suggest
+	using another package name for the execution logic.  What do you
+	think?
+	
+2000-05-05 08:07  tobiasb
+
+	* Makefile:
+
+	Added RT_LOGFILE, and comments on how to fix advanced logging
+	
+2000-05-05 02:31  jesse
+
+	* bin/rtmux.pl:
+
+	a bit of performance hacking. now require mason and cgi rather than 'use'ing them
+	
+2000-05-05 02:22  jesse
+
+	* lib/RT/: Action.pm, Scrip.pm, ScripScope.pm, Template.pm,
+	Ticket.pm, Transaction.pm, Action/AutoReply.pm,
+	Action/SendEmail.pm, Action/Spam.pm:
+
+	Cleaned up a couple minor things (like precedence, again) and changed "FixSubject" to "SetSubjectTag"
+	
+	Fixed the memory leak in Transaction.pm (it wasn't letting go of Scrip objects)
+	The fix was a bit of a "large mallet on a small nail" in that I'm now _explicitly_ destroying ScripObjects two different ways and don't quite understand why I have to do it. It does, however, work.
+	
+2000-05-04 09:00  tobiasb
+
+	* lib/RT/Action/Spam.pm:
+
+	Completely untested - but I guess this should do real spamming, that
+	is one email for each request(or).
+	
+2000-05-04 08:59  tobiasb
+
+	* lib/RT/Action/SendEmail.pm:
+
+	bugfix
+	
+2000-05-04 07:04  tobiasb
+
+	* lib/RT/Action/: AutoReply.pm, SendEmail.pm:
+
+	Precedence: Bulk should only be set for AutoReply
+	
+2000-05-04 05:29  tobiasb
+
+	* lib/RT/Action/SendEmail.pm:
+
+	sub FixSubject sets the RT tag (unless it is already there).  I moved
+	it out from Prepare because I need to override this behaviour when
+	Spamming people.
+	
+2000-05-04 01:34  jesse
+
+	* etc/schema.mysql:
+
+	spec some defaults in the schema
+	
+2000-05-04 01:32  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Bugfix to ticket.pm for better handling of default values for some queue fields
+	
+2000-05-03 14:19  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Sorry, the last commit on this file was not really a bugfix.  I'd say all Ticket (Transaction) Actions should return status, message and eventually optional things after the message.
+	
+2000-05-03 14:16  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Bugfix
+	
+2000-05-03 14:13  tobiasb
+
+	* lib/RT/Action/: ResolveMembers.pm, Spam.pm:
+
+	Those actually seems to work :)
+	
+2000-05-03 14:13  tobiasb
+
+	* lib/RT/Action/Spam.pm:
+
+	file Spam.pm was initially added on branch rt-1-1.
+	
+2000-05-03 14:13  tobiasb
+
+	* lib/RT/Action/ResolveMembers.pm:
+
+	file ResolveMembers.pm was initially added on branch rt-1-1.
+	
+2000-05-03 14:13  tobiasb
+
+	* lib/RT/Action/SendEmail.pm:
+
+	gubfix
+	
+2000-05-03 14:00  tobiasb
+
+	* etc/schema.mysql:
+
+	Bugfix
+	
+2000-05-03 13:29  tobiasb
+
+	* etc/schema.mysql:
+
+	Commented out the AutoReplies table.
+	
+2000-05-03 13:17  tobiasb
+
+	* lib/RT/Action/AutoReply.pm:
+
+	Putted in "#TODO: " comments for avoiding duplicate AutoReplies.
+	
+2000-05-03 13:15  tobiasb
+
+	* etc/schema.mysql:
+
+	Added a table AutoReplies to avoid sending the same autoreply template
+	more than once to each requestor.
+	
+	Eventually entries should be removed (i.e. after a week) through the
+	(upcoming?) timer system (eventually through the good, old crontab(5))
+	
+2000-05-03 11:48  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	LinkTo and LinkFrom are tested a bit, and they seem to work OK now.
+	
+2000-05-03 11:02  tobiasb
+
+	* etc/schema.mysql:
+
+	Bugfix.
+	
+2000-05-03 07:40  tobiasb
+
+	* etc/schema.mysql:
+
+	I'm putting ResolveGroupTicket on hold.  It's just not important.
+	
+2000-05-02 18:05  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Starting to add a bit of inline pod documentation. the style isn't finalized yet
+	
+2000-05-02 14:30  tobiasb
+
+	* lib/RT/Action/OpenDependent.pm:
+
+	file OpenDependent.pm was initially added on branch rt-1-1.
+	
+2000-05-02 14:30  tobiasb
+
+	* etc/schema.mysql, lib/RT/Link.pm, lib/RT/Ticket.pm,
+	lib/RT/Action/OpenDependent.pm, lib/RT/Action/StallDependent.pm:
+
+	I just got DependsOn Links to work as they should in the CLI :)
+	
+2000-05-02 13:36  tobiasb
+
+	* lib/RT/Links.pm:
+
+	file Links.pm was initially added on branch rt-1-1.
+	
+2000-05-02 13:36  tobiasb
+
+	* lib/RT/: Links.pm, Ticket.pm, Action/StallDependent.pm:
+
+	[no log message]
+	
+2000-05-02 13:07  tobiasb
+
+	* lib/RT/Action/StallDependent.pm:
+
+	Bugfix.  Also, only Open requests should be Stalled.
+	
+2000-05-02 13:01  tobiasb
+
+	* lib/RT/: Ticket.pm, Action/StallDependent.pm:
+
+	Bugfixing
+	
+2000-05-02 12:21  tobiasb
+
+	* lib/RT/: Ticket.pm, Action/StallDependent.pm:
+
+	bugfixes
+	
+2000-05-02 11:55  tobiasb
+
+	* etc/schema.mysql:
+
+	Added TobiX-style logic scrips for DependsOn link and MemberOf link.
+	
+2000-05-02 07:55  tobiasb
+
+	* lib/RT/: Link.pm, Ticket.pm:
+
+	oup, forgot to keep a consistant style
+	base => Base
+	target => Target
+	etc
+	
+2000-05-02 07:55  tobiasb
+
+	* Makefile, etc/config.pm:
+
+	forgot to commit those changes ... configuration for the URI method
+	
+2000-05-02 05:45  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Agh, compile error.
+	
+2000-05-02 05:30  tobiasb
+
+	* lib/RT/Action/StallDependent.pm:
+
+	file StallDependent.pm was initially added on branch rt-1-1.
+	
+2000-05-02 05:30  tobiasb
+
+	* lib/RT/Action/: README.hackers, StallDependent.pm:
+
+	Ok, so lets put all Actions into one directory - though I'd say it would be better for future hackers to orient themselves if we grouped them somehow.
+	
+2000-05-02 00:11  jesse
+
+	* Makefile:
+
+	Version bumping
+	
+2000-05-01 17:16  jesse
+
+	* lib/RT/Ticket.pm:
+
+	moved URIIsLocal closer to other linking routines.
+	
+2000-05-01 10:16  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Made the transaction data a bit "nicer", should look something like:
+	
+	THIS DependsOn 4323 as of 342
+	<URI> DependsOn THIS as of 343
+	
+2000-05-01 08:58  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Changed URL -> URI
+	
+	Changed NewLink and ReverseLink to LinkTo and LinkFrom
+	
+	Added one byte to indicate if it's a From-link or a To-link in the
+	transaction data.
+	
+2000-05-01 01:52  jesse
+
+	* etc/schema.mysql:
+
+	fixed a few typos in the schema
+	
+2000-05-01 01:50  jesse
+
+	* lib/RT/ACL.pm:
+
+	Initial sketches at RT::ACL.pm. there's no running code here yet.
+	
+2000-05-01 01:48  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Fixed Ticket->URL. changed queue->load to queue->Load
+	
+2000-05-01 01:04  jesse
+
+	* bin/rtmux.pl:
+
+	Fixed improper rt program selection code.
+	
+2000-05-01 00:14  jesse
+
+	* lib/RT/Queue.pm:
+
+	a stub for ACL work.
+	
+2000-04-30 13:28  tobiasb
+
+	* lib/RT/Link.pm:
+
+	file Link.pm was initially added on branch rt-1-1.
+	
+2000-04-30 13:28  tobiasb
+
+	* lib/RT/: Link.pm, Ticket.pm:
+
+	Link.pm
+	
+2000-04-30 13:13  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Added a static method URIIsLocal which checks if it's a local URI or not.
+	
+2000-04-28 14:20  jesse
+
+	* lib/RT/Transaction.pm:
+
+	Cleaned up some comments and formatting. and did a bit of reorganizing
+	of routines to more closely model other files. Oh. i finally have
+	emacs doing proper indenting per perlstyle. so we'll hopefully start
+	to get better about that :) Tobix has only been bugging me for a year
+	
+2000-04-28 09:05  tobiasb
+
+	* lib/RT/Action/README.hackers:
+
+	Just some documentation for future hackers :)
+	
+2000-04-28 09:05  tobiasb
+
+	* lib/RT/Action/README.hackers:
+
+	file README.hackers was initially added on branch rt-1-1.
+	
+2000-04-28 08:20  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Started the work of implementing links
+	
+2000-04-28 04:40  tobiasb
+
+	* etc/schema.mysql:
+
+	Didn't we once agree that we needed "state" (user-configurable logic)
+	and "status" (fixed open/stalled/resolved/dead)? :)
+	
+2000-04-28 01:17  jesse
+
+	* lib/RT/Ticket.pm:
+
+	didn't balance parens. grr
+	
+2000-04-28 00:54  jesse
+
+	* lib/RT/Ticket.pm:
+
+	a bunch of cleanup.. a bunch more folding mode braces.
+	a few minor (still not in any codepath) changes for the start of some
+	acls work
+	
+2000-04-28 00:51  jesse
+
+	* docs/design_docs/link-definitions.txt:
+
+	a few comments, additions and clarifications. nothing really major
+	
+2000-04-27 02:06  jesse
+
+	* docs/design_docs/acls:
+
+	more thoughts on ACLs. this time including some code snippits.
+	
+2000-04-27 02:01  jesse
+
+	* etc/schema.mysql:
+
+	added the schema for the new ACL system.
+	responded to tobix' comments about GECOS.
+	
+2000-04-26 14:58  tobiasb
+
+	* docs/design_docs/subscription-definitions.txt:
+
+	marginal updates to reflect that scrips/actions can be used for more things than subscriptions (the whole document might need a rename)
+	
+2000-04-26 14:50  tobiasb
+
+	* docs/design_docs/link-definitions.txt, etc/schema.mysql:
+
+	only insignificant comments - some made weeks ago
+	
+2000-04-26 12:59  jesse
+
+	* docs/design_docs/link-definitions.txt:
+
+	some comments on link definitions
+	my comments are marked with # as the first character of the line.
+	
+2000-04-26 02:27  tobiasb
+
+	* docs/design_docs/: link-definitions.txt,
+	subscription-definitions.txt:
+
+	updates
+	
+2000-04-26 00:14  jesse
+
+	* docs/design_docs/acls:
+
+	some more hacking on acls design
+	
+2000-04-25 17:58  jesse
+
+	* docs/design_docs/acls:
+
+	thoughts on acls
+	
+2000-04-24 00:17  jesse
+
+	* webrt/Ticket/Create_Detail.html:
+
+	file Create_Detail.html was initially added on branch rt-1-1.
+	
+2000-04-24 00:17  jesse
+
+	* webrt/Ticket/Create_Detail.html:
+
+	some work on create. nothing ready for consumption yet.
+	
+2000-04-24 00:16  jesse
+
+	* webrt/: Logout.html, Elements/Footer, Elements/Header,
+	Elements/SelectQueue, Ticket/Create.html, Ticket/Display.html,
+	Ticket/ProcessUpdate.html, Ticket/SetOwner, Ticket/SetStatus,
+	Ticket/Update.html, Ticket/autohandler:
+
+	Look ma, $session{'CurrentUser'} contains the current user object.
+	you can depend on this being set if the user's authenticated.
+	
+2000-04-24 00:16  jesse
+
+	* webrt/Logout.html:
+
+	file Logout.html was initially added on branch rt-1-1.
+	
+2000-04-24 00:14  jesse
+
+	* Makefile, bin/testdeps.pl, bin/webmux.pl:
+
+	Added Apache::Session support to the HTML::Mason version of things.
+	
+2000-04-23 19:45  jesse
+
+	* bin/testdeps.pl:
+
+	added a little script to test perl dependencies.
+	it should probably get integrated into the makefile
+	
+2000-04-23 19:45  jesse
+
+	* bin/testdeps.pl:
+
+	file testdeps.pl was initially added on branch rt-1-1.
+	
+2000-04-23 17:28  jesse
+
+	* Makefile, docs/design_docs/acls, etc/schema.mysql:
+
+	installation seems to work a bit better now
+	
+2000-04-20 02:18  jesse
+
+	* webrt/Login.html:
+
+	Removing cruft from login.html
+	
+2000-04-20 02:17  jesse
+
+	* webrt/Ticket/autohandler:
+
+	Look ma! this autohandler seems to make webauth (with $pass = $user ) work.
+	
+2000-04-20 02:09  jesse
+
+	* webrt/: autohandler, Ticket/autohandler:
+
+	file autohandler was initially added on branch rt-1-1.
+	
+2000-04-20 02:09  jesse
+
+	* webrt/Login.html:
+
+	file Login.html was initially added on branch rt-1-1.
+	
+2000-04-20 02:09  jesse
+
+	* Makefile, bin/webmux.pl, webrt/Login.html, webrt/autohandler,
+	webrt/Ticket/autohandler:
+
+	Doing work on cookie-based authentication for WebRT. The basic idea
+	is that the autohandler in each directory (unless the global handlers can be made to work) will check to see if the user is authenticated. If they are, then it keeps going happily. otherwise, it forces the user to login with the form in /Login.html, which should eventually be smart enough to put them back to where they want to go.
+	
+2000-04-18 02:43  jesse
+
+	* docs/design_docs/acls:
+
+	checking in design work on ACLs. a bit more work, such as notes
+	on order of evaluation and a rough implementation plan and then I'll
+	implement
+	
+2000-04-13 11:58  tobiasb
+
+	* etc/config.pm:
+
+	Introduced all columns we need locally, that is all columns as of RT
+	1.0, except due, area and priorities.  I guess somebody might want to
+	add those columns as well :)
+	
+2000-04-13 11:52  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	hrmwell, you did introduse a slight bug here.. :)
+	
+2000-04-13 11:26  tobiasb
+
+	* webrt/Search/: Listing.html, TicketCell:
+
+	Looks gruesome, but hey - it works\!
+	
+2000-04-13 11:26  tobiasb
+
+	* webrt/Search/TicketCell:
+
+	file TicketCell was initially added on branch rt-1-1.
+	
+2000-04-13 10:52  tobiasb
+
+	* etc/config.pm:
+
+	agh..
+	
+2000-04-13 10:50  tobiasb
+
+	* etc/config.pm:
+
+	Added the site configurable option "QueueListingCols".  It should also
+	be possible to override this one at least through the query, but it
+	might not be trivial.  (maybe you have better suggestions?)
+	
+2000-04-13 10:23  tobiasb
+
+	* webrt/Search/QueueItem:
+
+	I think I want to remove this one, I have other thoughts about how to
+	handle this - let's discuss it more when I've made some implementation :)
+	
+2000-04-13 10:05  tobiasb
+
+	* webrt/Search/Listing.html:
+
+	Added this:
+	
+	# TODO: This one should _not_ be here, rather somewhere else
+	# (suggestions?).  It might eventually read the cookies, user
+	# configuration information from the DB, queue configuration information
+	# from the DB, etc.  It should be object oriented.  But what object can
+	# it belong to, and how should it get access to all this data?
+	
+	sub _cfg {
+	  my $key=shift;
+	  return $ARGS{$key} || $RT::SitePolicy{$key};
+	}
+	
+2000-04-13 10:05  tobiasb
+
+	* etc/config.pm:
+
+	Added a hash for "tunable" configurations:
+	
+	# This is where RT's preferences are kept track of
+	
+	package RT;
+	
+	# Different "tunable" configuration options should be in this hash:
+	%SitePolicy=();
+	
+2000-04-13 02:30  jesse
+
+	* lib/RT/Ticket.pm:
+
+	Ticket::clean became Ticket::_CleanAddressesAsString
+	references to clean changed accordingly. i feel a bit dirty not
+	making this $self->_CleanAddressesAsString.
+	
+2000-04-12 08:53  tobiasb
+
+	* webrt/: Elements/SelectStatus, Ticket/ProcessUpdate.html,
+	Ticket/Update.html:
+
+	bugfixes and insignificant enhancements
+	
+2000-04-12 07:14  tobiasb
+
+	* webrt/Elements/yearMenu:
+
+	"Last year" is now (by default) available
+	
+2000-04-12 07:11  tobiasb
+
+	* webrt/Search/PickRestriction:
+
+	Changed the default to select one queue, not select "anything but" a queue.
+	
+2000-04-12 07:07  tobiasb
+
+	* webrt/Search/PickRestriction:
+
+	Added a stupid "under construction" message.
+	
+2000-04-12 07:00  tobiasb
+
+	* lib/RT/Interface/Email.pm:
+
+	Ehm .. the last commit message should be more descriptive;
+	
+	From the README:
+	
+	        rt:     |"/path/to/rt/bin/rt-mailgate general correspond"
+	                                                    |          |
+	                                   <<queue-name>----/          |
+	                                                               |
+	                <<correspond or comment depending on whether   |
+	                 the mail shoud be resent to the requestor>---/
+	                 "action" here will make this address only
+	                  parse actions in the message without
+	                  recording the message as a transaction
+	                  of its own"
+	
+	...while the implementation required "correspond general"
+	
+2000-04-12 06:58  tobiasb
+
+	* lib/RT/Interface/Email.pm:
+
+	This was not in sync with the README
+	
+2000-04-12 06:50  tobiasb
+
+	* webrt/Search/PickRestriction:
+
+	Bugfix
+	
+2000-04-12 06:45  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Agh, should have tested before committing :)
+	
+2000-04-12 06:44  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Fixd SetOwner to allow stealing and to respect the new Nobody user
+	
+2000-04-12 05:19  tobiasb
+
+	* webrt/Elements/SelectQueue:
+
+	Now this one actually works
+	
+2000-04-11 07:30  tobiasb
+
+	* webrt/Elements/SelectQueue:
+
+	This won't work yet.
+	
+2000-04-11 07:17  tobiasb
+
+	* lib/RT/Transaction.pm:
+
+	Ehr...right.  Still fixing at the same bug; the IsInbound sub didn't work....well
+	
+2000-04-11 07:08  tobiasb
+
+	* lib/RT/: Ticket.pm, Transaction.pm:
+
+	argh .. I should learn to test the bugfixes before committing
+	
+2000-04-11 06:46  tobiasb
+
+	* lib/RT/Transaction.pm:
+
+	bugfix
+	
+2000-04-11 06:42  tobiasb
+
+	* lib/RT/Template.pm, lib/RT/Ticket.pm, webrt/Elements/SelectOwner,
+	webrt/Ticket/ProcessUpdate.html:
+
+	bugfixes
+	
+2000-04-11 05:47  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	bugfixing
+	
+2000-04-11 04:46  tobiasb
+
+	* lib/RT/Watchers.pm:
+
+	Bugfix
+	
+2000-04-11 04:41  tobiasb
+
+	* etc/config.pm, lib/RT/Ticket.pm:
+
+	I'm trying to fix this nobody user..
+	
+2000-04-11 04:36  tobiasb
+
+	* etc/schema.mysql:
+
+	I'm trying to fix this nobody user..
+	
+2000-04-11 04:29  tobiasb
+
+	* lib/RT/Queue.pm, webrt/Ticket/ProcessUpdate.html:
+
+	Bugfixing
+	
+2000-04-11 03:16  tobiasb
+
+	* webrt/Search/Listing.html:
+
+	Insignificant.  Oh, how should errors be trapped?
+	
+2000-04-11 00:40  jesse
+
+	* lib/RT/: Queue.pm, Ticket.pm, Watchers.pm:
+
+	all the watcher types now have AsString methods. this was done by dropping
+	an EmailsAsString method into RT::Watcher
+	
+2000-04-10 23:04  tobiasb
+
+	* webrt/Ticket/ProcessUpdate.html:
+
+	Added those use statements
+	
+	This page seems very broken in Netscape.
+	
+2000-04-10 23:00  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Darn, I thought I had tested this.  Well, now it should work!?
+	
+2000-04-10 22:54  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	...some work is needed to get Watchers work OK.  I commented out my
+	try on it, so now it will ignore queue watchers (it simply ignored all
+	watchers as it was).
+	
+2000-04-10 14:29  tobiasb
+
+	* webrt/Ticket/: DisplayTicket, DisplayTransaction:
+
+	Update and Modify-links
+	
+2000-04-10 14:20  tobiasb
+
+	* webrt/Ticket/DisplayTransaction:
+
+	Added an "act" link and touched the comments
+	
+2000-04-10 14:11  tobiasb
+
+	* webrt/Ticket/DisplaySummary:
+
+	Reinserted the "Last Contact" and "Last Update" lines, but they're "cleaned" a bit.
+	
+	(btw, this seems like a crude copy from the cli, does the cli have similar problems?)
+	
+2000-04-10 13:51  tobiasb
+
+	* webrt/Ticket/DisplaySummary:
+
+	Hacking a bit on this
+	
+2000-04-10 13:48  tobiasb
+
+	* webrt/Ticket/: DisplayTransaction, Update.html:
+
+	Hacking a bit on this
+	
+2000-04-10 13:18  tobiasb
+
+	* webrt/Ticket/Modify.html:
+
+	'undo' (well, not really :)
+	
+2000-04-10 13:13  tobiasb
+
+	* webrt/Ticket/Update.html:
+
+	This 'fix' is maybe only temporary?
+	
+2000-04-10 13:08  tobiasb
+
+	* webrt/Ticket/Modify.html:
+
+	I'd daresay this one is superceded by Update.html?
+	
+2000-04-10 13:07  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	just added some comments
+	
+2000-04-10 12:52  tobiasb
+
+	* webrt/Ticket/DisplaySummary:
+
+	This 'fix' is maybe only temporary?
+	
+2000-04-10 10:35  tobiasb
+
+	* webrt/: Elements/SelectBoolean, Search/Listing.html:
+
+	insignificant changes
+	
+2000-04-10 06:53  tobiasb
+
+	* webrt/Elements/SelectOwner:
+
+	Insignificant fix (wouldn't work here without)
+	
+2000-04-10 05:38  tobiasb
+
+	* bin/rtmux.pl:
+
+	Might be a bugfix
+	
+2000-04-09 16:56  jesse
+
+	* lib/RT/Users.pm, webrt/Elements/SelectBoolean,
+	webrt/Elements/SelectOwner, webrt/Search/Listing.html,
+	webrt/Search/PickRestriction:
+
+	I can now get a listing of tickets whose owner is or isn't a given owner.
+	and it even lists them. Next, I'll probably make searches for
+	other attributes work.
+	the plan of attack is requestor, then probably ticket content (as a test
+	of whether this whole system works ;)
+	
+2000-04-07 20:41  jesse
+
+	* webrt/Search/Listing.html:
+
+	Added the first bit of code to support queue/owner/requestor/subject search.
+	This will make up the core of the  web search functionality of the first release of the webui. (not the 2.0 release, but the "tobix needs it now) release.
+	
+2000-04-07 14:53  tobiasb
+
+	* etc/schema.mysql, lib/RT/Ticket.pm, lib/RT/Watchers.pm,
+	lib/RT/Action/SendEmail.pm:
+
+	hm ... seems like I forgot to commit my last work
+	
+2000-04-07 03:55  tobiasb
+
+	* lib/RT/: Ticket.pm, Transaction.pm:
+
+	it almost works now
+	
+2000-04-06 17:40  tobiasb
+
+	* lib/RT/Transaction.pm:
+
+	development
+	
+2000-04-06 17:21  tobiasb
+
+	* lib/RT/: Ticket.pm, Transaction.pm, Action/Notify.pm,
+	Action/SendEmail.pm:
+
+	ouch, found a lot of fatal stubs
+	
+2000-04-06 16:54  tobiasb
+
+	* etc/schema.mysql, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
+	lib/RT/Action/Notify.pm, lib/RT/Action/SendEmail.pm:
+
+	still fighting with the mail handling
+	
+2000-04-06 16:12  tobiasb
+
+	* etc/schema.mysql, lib/RT/Scrips.pm, lib/RT/Ticket.pm,
+	lib/RT/Transaction.pm, lib/RT/Action/Notify.pm:
+
+	New snapshot of development.  Note the change I've done in the Type recognizion
+	when selecting the right Scrips in Transaction::Create - it should be more
+	flexible this way (replaced "ne" with "!~").  Check the change to schema for
+	an example of how this is more flexible.
+	
+2000-04-06 15:36  tobiasb
+
+	* lib/RT/Action/Notify.pm:
+
+	Recipient finder
+	
+2000-04-06 15:35  tobiasb
+
+	* etc/schema.mysql, lib/RT/Template.pm, lib/RT/Action/SendEmail.pm:
+
+	Snapshot; I'm not finished debugging yet, but this should (hopefully) be
+	very close to actually work.
+	
+2000-04-06 11:38  tobiasb
+
+	* docs/FAQ:
+
+	this clearly needs a lot more work ...
+	
+2000-04-06 11:31  tobiasb
+
+	* lib/RT/Action/SendEmail.pm:
+
+	...ah, this felt good.
+	
+	Checked the recent version of Mailtools at CPAN, so I used the "right"
+	method for sending emails.
+	
+	I also added back again the SetRecipients method, and documented it in
+	the POD.
+	
+	I think I will get this working in a couple of hours, so please don't
+	disturb me saying that you disagree very much to those changes.. :)
+	
+2000-04-06 10:46  tobiasb
+
+	* etc/schema.mysql:
+
+	Bugfixing
+	
+2000-04-06 10:40  tobiasb
+
+	* etc/schema.mysql:
+
+	I think that I will get this up working during the next few hours.
+	
+	If I eventually get it working, I'd really appreciate that you don't
+	wreck it until the web interface is working and until we've discussed
+	the design thoroughly and come down to some consensus about it.
+	
+2000-04-06 06:22  tobiasb
+
+	* webrt/Elements/Checkbox:
+
+	This is not my turf ... and I don't know what I'm doing ... anyway, it didn't work, but now it works (?) :)
+	
+2000-04-06 01:49  jesse
+
+	* lib/RT/Action/SendEmailOnResolve.pm:
+
+	file SendEmailOnResolve.pm was initially added on branch rt-1-1.
+	
+2000-04-06 01:49  jesse
+
+	* Makefile, etc/schema.mysql, lib/RT/Template.pm,
+	lib/RT/Action/MailComment.pm, lib/RT/Action/MailCorrespondence.pm,
+	lib/RT/Action/Notify.pm, lib/RT/Action/NotifyOnResolve.pm,
+	lib/RT/Action/SendEmail.pm, lib/RT/Action/SendEmailOnResolve.pm:
+
+	Ok, i think i significantly cut down the complexity of the actions we've got
+	so far. I nuked the old notify rules, as they were superceeded by my more
+	capable SendEmail.pm There are still a few things I'm not happy with...
+	like, the way that scrips, scripscopes and templates are related. it needs
+	some thought and cleanup. but i think it'll work just fine for now.
+	
+	I redid the templates and scrips to fit with the revised actions and added
+	some more docs to SendEmail.pm
+	
+	the generic RT::Action should deal with templates, not SendEmail, I think,
+	but I'm leaving that abstraction for another day.
+	
+	Oh, the Argument from the scrip is now passed into the template as $T::Argument.
+	
+2000-04-05 23:24  jesse
+
+	* webrt/Elements/Checkbox:
+
+	stylistic cleanup
+	using an explicit defined ($foo)
+	
+2000-04-05 18:02  tobiasb
+
+	* webrt/: Elements/Checkbox, Search/PickRestriction:
+
+	Only minor corrections
+	
+2000-04-05 17:43  tobiasb
+
+	* webrt/Search/PickRestriction:
+
+	It certainly doesn't work okay ... I think I should look into it a bit ...
+	
+2000-04-05 17:08  tobiasb
+
+	* webrt/Search/PickRestriction:
+
+	Added ugly submit button
+	
+2000-04-05 10:34  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Temporary implementation of kill
+	
+	As mentionated earlier, I think the right thing is to just set status
+	'dead' and then eventually do some garbage collection later.
+	
+2000-04-05 08:55  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	More error handling
+	
+2000-04-05 08:51  jesse
+
+	* lib/RT/Interface/Email.pm:
+
+	added some comments around the dies pointing out that we need better error handling.
+	
+2000-04-05 05:34  tobiasb
+
+	* lib/RT/Interface/Email.pm:
+
+	Doh...I'm really stupid sometimes...
+	
+2000-04-05 05:31  tobiasb
+
+	* lib/RT/Interface/Email.pm:
+
+	For some weird reason (perl 5.6.0 bug?) it wouldn't work here without this fix.
+	
+2000-04-05 00:35  jesse
+
+	* docs/design_docs/acls:
+
+	initial musings on acls for 2.0
+	
+2000-04-05 00:35  jesse
+
+	* docs/design_docs/acls:
+
+	file acls was initially added on branch rt-1-1.
+	
+2000-04-04 09:52  tobiasb
+
+	* etc/schema.mysql:
+
+	Language idea
+	
+2000-04-04 02:17  jesse
+
+	* Makefile, README, bin/rtmux.pl, etc/config.pm:
+
+	The first little bits of structure for future L10n support
+	
+2000-04-03 12:40  tobiasb
+
+	* Makefile, bin/rtmux.pl:
+
+	Cleaned out yet some more visible configuration bugs
+	
+2000-04-03 12:29  tobiasb
+
+	* README:
+
+	Some fixes
+	
+2000-04-03 10:44  tobiasb
+
+	* Makefile, bin/rtmux.pl:
+
+	Just a configuration fix.
+	
+2000-04-03 01:26  jesse
+
+	* Makefile, bin/rtmux.pl:
+
+	Ok, I've modified rtmux.pl and Makefile to add in the first bits of stub
+	code for running Mason as a cgi. it compiles and appears to invoke.
+	but I haven't tested it under a webserver. I've gotta get to sleep now, but
+	figured this would give tobias a leg up with his testing today.
+	
+	Subject:      RE: [Mason] Mason under CGI (was: replacing storyserver)
+	Author:       Ilmari Karonen <iltzu@sci.fi>
+	Date:         Fri, 17 Sep 1999 15:10:20 +0300 (EET DST)
+	
+	On Thu, 16 Sep 1999, Ben Munoz wrote:
+	> I'm running Apache 1.3.6 on NT.  I'm looking to install HTML::Mason and see
+	> what it can do, but from what I've read, I can't install mod_perl with the
+	> current version of ActiveState's Perl, which I have installed on my machine.
+	
+	I realize this is probably not what you were asking for, but I'd like to
+	mention here my recent (yesterday) experience in setting up Mason under
+	plain ol' CGI.
+	
+	Setting: One Mason top level component plus a few subcomponents on a
+	development server with mod_perl and Mason. One production server with the
+	least possible selection of modules. (Not even mod_so!)
+	
+	Needed to quickly get the Mason component up and running on the second
+	server. Installing Mason itself and a few other perl modules was easy.
+	But adding mod_perl was definitely out of the question.
+	
+	What I did was take the usual handler.pl, copy it to cgi-bin, deleting
+	everything from "my $ah = new HTML::Mason::ApacheHandler" onward
+	inclusive, and replacing it with the following:
+	
+	    use CGI;
+	    my $q = new CGI;
+	
+	    # This routine comes from ApacheHandler.pm:
+	    my (%args);
+	    foreach my $key ( $q->param ) {
+	      foreach my $value ( $q->param($key) ) {
+	        if (exists($args{$key})) {
+	          if (ref($args{$key})) {
+	            $args{$key} = [@{$args{$key}}, $value];
+	          } else {
+	            $args{$key} = [$args{$key}, $value];
+	          }
+	        } else {
+	          $args{$key} = $value;
+	        }
+	    }
+	
+	    my $comp = $ENV{'PATH_TRANSLATED'};
+	    my $root = $interp->comp_root;
+	    $comp ~= s/^$root//  or die "Component outside comp_root";
+	
+	    $interp->exec($comp, %args);
+	
+	This, plus an Action line in httpd.conf mapping *.mas to this script, has
+	so far done the job just fine.
+	
+	One problem I noticed was that this all would've been much harder if I
+	hadn't been familiar with the way ApacheHandler.pm uses CGI.pm and hadn't
+	known where to find that parsing routine. IMHO it'd be a good idea to
+	separate this loop into a user-callable subroutine.
+	
+	(Note: this was Mason 0.6.mumble - I have no experience with the newer
+	versions.)
+	
+	--
+	Ilmari Karonen (iltzu@sci.fi)
+	http://www.sci.fi/~iltzu/
+	
+	_______________________________________________
+	Mason maillist  -  Mason@netizen.com.au
+	http://netizen.com.au/mailman/listinfo/mason
+	
+2000-04-03 00:49  jesse
+
+	* bin/rtmux.pl, etc/schema.mysql, lib/RT/Action.pm,
+	lib/RT/CurrentUser.pm, lib/RT/Scrip.pm, lib/RT/ScripScopes.pm,
+	lib/RT/Template.pm, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
+	lib/RT/Watchers.pm, lib/RT/Action/AutoReply.pm,
+	lib/RT/Action/SendEmail.pm:
+
+	Well, that was an exciting afternoon! Er, an exciting evening!
+	*grin* AutoReply now works. which means that all the infrastructure for
+	scrips is back in place.  It required refactoring things a bit. as cool
+	as making RT::Template a MIME::Entity seemed, I just couldn't get it to work
+	right, so now, it just creates a MIME::Entity when it needs it, which is
+	probably better anyway.  I simplified templates a bit. Now they only have
+	access to the Ticket and Transaction. This may not be wise, but we'll see.
+	
+	Also, I merged the two blobs per template (headers and body).
+	
+2000-03-31 08:25  tobiasb
+
+	* bin/webmux.pl:
+
+	rmvd dupl line
+	
+2000-03-31 02:47  jesse
+
+	* Makefile:
+
+	removed old webui hooks from the makefile. bumped the version to 1.3.0
+	
+2000-03-31 02:32  jesse
+
+	* webrt/Elements/Error:
+
+	file Error was initially added on branch rt-1-1.
+	
+2000-03-31 02:32  jesse
+
+	* webrt/Ticket/DisplayTicket:
+
+	file DisplayTicket was initially added on branch rt-1-1.
+	
+2000-03-31 02:32  jesse
+
+	* webrt/: Elements/Error, Elements/SelectStatus,
+	Ticket/Display.html, Ticket/DisplayTicket,
+	Ticket/DisplayTransaction, Ticket/ProcessUpdate.html,
+	Ticket/Update.html:
+
+	Ticket/Update.html will now allow you to submit a ticket update.
+	It's the RT2 equivalent of RT1.0's "comment" and "correspond" pages...
+	with a bit of added value. it's not a global "modify ticket" page. that comes
+	next. but it's where 90% of your single-ticket action will take place.
+	
+2000-03-31 02:28  jesse
+
+	* lib/RT/Ticket.pm:
+
+	TimeTaken should increment now
+	
+2000-03-31 02:26  jesse
+
+	* README:
+
+	added the mason dependency to the README
+	
+2000-03-31 02:25  jesse
+
+	* bin/webmux.pl:
+
+	added some uses to the webmux so I don't have to add them to each page that
+	calls them
+	
+2000-03-30 00:44  jesse
+
+	* webrt/Search/PickRestriction:
+
+	made the variable names in PickRestriction look more like the parameter names
+	in EasySearch. Wanna guess why?
+	
+2000-03-29 23:52  jesse
+
+	* webrt/Search/RestrictSearch.html:
+
+	file RestrictSearch.html was initially added on branch rt-1-1.
+	
+2000-03-29 23:52  jesse
+
+	* webrt/Search/PickRestriction:
+
+	file PickRestriction was initially added on branch rt-1-1.
+	
+2000-03-29 23:52  jesse
+
+	* webrt/Elements/Footer:
+
+	file Footer was initially added on branch rt-1-1.
+	
+2000-03-29 23:52  jesse
+
+	* webrt/: Elements/Checkbox, Elements/Footer, Elements/Header,
+	Elements/SelectBoolean, Elements/SelectDate,
+	Elements/SelectDateRelation, Elements/SelectOwner,
+	Elements/SelectQueue, Elements/SelectStatus, Elements/dayMenu,
+	Elements/monthMenu, Elements/yearMenu, Search/PickRestriction,
+	Search/RestrictSearch.html:
+
+	A bunch of infrasturcture work on the Ticket Search interface. it doesn't
+	have any real logic behind it. that's next.
+	
+2000-03-29 23:52  jesse
+
+	* webrt/Elements/SelectBoolean:
+
+	file SelectBoolean was initially added on branch rt-1-1.
+	
+2000-03-29 23:52  jesse
+
+	* webrt/Elements/dayMenu:
+
+	file dayMenu was initially added on branch rt-1-1.
+	
+2000-03-29 23:52  jesse
+
+	* webrt/Elements/SelectStatus:
+
+	file SelectStatus was initially added on branch rt-1-1.
+	
+2000-03-29 23:52  jesse
+
+	* webrt/Elements/SelectQueue:
+
+	file SelectQueue was initially added on branch rt-1-1.
+	
+2000-03-29 23:52  jesse
+
+	* webrt/Elements/yearMenu:
+
+	file yearMenu was initially added on branch rt-1-1.
+	
+2000-03-29 23:52  jesse
+
+	* webrt/Elements/Checkbox:
+
+	file Checkbox was initially added on branch rt-1-1.
+	
+2000-03-29 23:52  jesse
+
+	* webrt/Elements/Header:
+
+	file Header was initially added on branch rt-1-1.
+	
+2000-03-29 23:52  jesse
+
+	* webrt/Elements/SelectOwner:
+
+	file SelectOwner was initially added on branch rt-1-1.
+	
+2000-03-29 23:52  jesse
+
+	* webrt/Elements/monthMenu:
+
+	file monthMenu was initially added on branch rt-1-1.
+	
+2000-03-29 23:52  jesse
+
+	* webrt/Elements/SelectDateRelation:
+
+	file SelectDateRelation was initially added on branch rt-1-1.
+	
+2000-03-29 23:52  jesse
+
+	* webrt/Elements/SelectDate:
+
+	file SelectDate was initially added on branch rt-1-1.
+	
+2000-03-29 00:33  jesse
+
+	* etc/schema.mysql:
+
+	added a generic "RefersTo" ticket type to the comments.
+	changed the types of Link.Base and Link.Target to VARCHAR(255) from INT(11)
+	
+2000-03-28 05:16  tobiasb
+
+	* README, tools/test:
+
+	darn, it seems like I'll need to install mod-perl ... actually I haven't done that earlier..
+	
+2000-03-28 00:13  jesse
+
+	* Makefile, lib/RT/Record.pm, lib/RT/Transaction.pm,
+	webrt/Search/Listing.html, webrt/Search/QueueItem:
+
+	webrt/Search/Listing.html now gives a basic listing of all open tickets
+	It even has links to the _still display only_ Display.html for each ticket
+	
+2000-03-27 23:55  jesse
+
+	* webrt/Ticket/DisplayTransaction:
+
+	missed this one. sorry.
+	
+2000-03-27 23:55  jesse
+
+	* webrt/Ticket/DisplayTransaction:
+
+	file DisplayTransaction was initially added on branch rt-1-1.
+	
+2000-03-27 23:54  jesse
+
+	* webrt/Ticket/: Display.html, DisplayHistory:
+
+	Hey. Look Ticket/Display.html?id=<int> works!
+	
+2000-03-27 22:35  jesse
+
+	* webrt/Ticket/ToolBar:
+
+	file ToolBar was initially added on branch rt-1-1.
+	
+2000-03-27 22:35  jesse
+
+	* webrt/Ticket/DisplaySummary:
+
+	file DisplaySummary was initially added on branch rt-1-1.
+	
+2000-03-27 22:35  jesse
+
+	* webrt/Ticket/DisplayHistory:
+
+	file DisplayHistory was initially added on branch rt-1-1.
+	
+2000-03-27 22:35  jesse
+
+	* README, webrt/Ticket/DisplayHistory, webrt/Ticket/DisplaySummary,
+	webrt/Ticket/ToolBar:
+
+	Work on WebRT, including a README update!
+	
+	check out  http://s.ly/~jesse/2000_03_28_171606_shot.jpg
+	
+2000-03-27 22:31  jesse
+
+	* lib/RT/Watchers.pm:
+
+	Bugfix in Watchers AdministrativeCc -> AdminCc
+	
+2000-03-27 22:30  jesse
+
+	* webrt/Ticket/: Display.html, Displaysummary, Update.html:
+
+	Work on WebUI. Display.html has slight functionality
+	
+2000-03-27 22:13  tobiasb
+
+	* docs/design_docs/basic-definitions.txt, tools/test:
+
+	minor
+	
+2000-03-27 21:50  tobiasb
+
+	* tools/test:
+
+	added some stuff to the test script
+	
+2000-03-27 21:32  tobiasb
+
+	* lib/RT/: ScripScope.pm, Transaction.pm:
+
+	bugfixing
+	
+2000-03-27 21:22  tobiasb
+
+	* lib/RT/Transaction.pm:
+
+	...well, even more bugs...
+	
+2000-03-27 21:09  tobiasb
+
+	* lib/RT/: Scrip.pm, ScripScope.pm, Template.pm, Transaction.pm:
+
+	First level bugfixing completed; Now the create (from the cli) calls up the action (though as earlier mentionated no emails are sent).
+	
+2000-03-27 20:54  tobiasb
+
+	* lib/RT/Scrip.pm:
+
+	bgfx
+	
+2000-03-27 20:47  tobiasb
+
+	* lib/RT/Scrip.pm:
+
+	Bugfix
+	
+2000-03-27 20:22  tobiasb
+
+	* lib/RT/ScripScope.pm:
+
+	bugfix
+	
+2000-03-27 20:19  tobiasb
+
+	* docs/design_docs/basic-definitions.txt:
+
+	clarified
+	
+2000-03-27 18:58  tobiasb
+
+	* lib/RT/Action/SendEmail.pm:
+
+	The recipients aren't set anywhere as far as I can see ... and I'm really uncertain what you've thought of with SetEnvelopeTo vs SetTo, etc.  You'd better take a look.  Obviously, this won't work until the recipients are set somehow
+	
+2000-03-27 18:40  tobiasb
+
+	* lib/RT/Action/SendEmail.pm:
+
+	I've mostly only added comments.  Anyway, I must say that I like this
+	code. (maybe I'll say something different when I've tried debugging it
+	;)
+	
+2000-03-27 17:59  tobiasb
+
+	* lib/RT/ScripScope.pm:
+
+	bugfix
+	
+2000-03-27 17:57  tobiasb
+
+	* lib/RT/Action.pm:
+
+	comment/folding bugfix
+	
+2000-03-27 17:56  tobiasb
+
+	* docs/design_docs/basic-definitions.txt:
+
+	file basic-definitions.txt was initially added on branch rt-1-1.
+	
+2000-03-27 17:56  tobiasb
+
+	* docs/design_docs/basic-definitions.txt:
+
+	(no comment :)
+	
+2000-03-27 17:55  tobiasb
+
+	* docs/design_docs/link-definitions.txt:
+
+	I think maybe those additions might be appreciated by Rouillard ... and this was (hopefully) the last thing I do with design documentation/discussion until 1.3 is finished :)
+	
+2000-03-27 17:33  tobiasb
+
+	* docs/design_docs/link-definitions.txt:
+
+	Doh ... I really shouldn't waste my time on this now ...
+	
+2000-03-27 17:17  tobiasb
+
+	* lib/RT/Scrip.pm:
+
+	Did you ever try to see if those modules would pass `perl -c'? :)
+	
+2000-03-27 16:44  jesse
+
+	* etc/schema.mysql, lib/RT/Action.pm, lib/RT/Scrip.pm,
+	lib/RT/ScripScope.pm, lib/RT/Action/AutoReply.pm,
+	lib/RT/Action/SendEmail.pm:
+
+	Lots of works on Scrip, ScripScope, Action. Tobias: wanna take a look?
+	Basically, now Templates are autoloaded by RT::Scrip.pm and passed into
+	the Action as TemplateObj.  Also, Templates are now of type MIME::Entity,
+	which means that they have all the attributes of mail messages and can
+	just be sent.
+	
+2000-03-27 16:20  tobiasb
+
+	* docs/design_docs/: TransactionTypes.txt, link-definitions.txt:
+
+	Linking definitions
+	
+2000-03-27 16:20  tobiasb
+
+	* docs/design_docs/link-definitions.txt:
+
+	file link-definitions.txt was initially added on branch rt-1-1.
+	
+2000-03-27 16:01  tobiasb
+
+	* docs/README.docs:
+
+	Updated the README to reflect that the docs are old :)
+	
+2000-03-27 15:45  tobiasb
+
+	* README:
+
+	status update
+	
+2000-03-27 15:41  tobiasb
+
+	* lib/RT/ScripScope.pm:
+
+	minor string fix
+	
+2000-03-27 15:36  tobiasb
+
+	* docs/design_docs/subscription-definitions.txt:
+
+	How does the system determinate whom to send mail to?
+	
+	The ScripScope table in the DB should indicate whether a Scrip is relevant
+	for a queue or not /* TobiX thinks that this might eventually be extended to
+	keywords, tickets, etc, and not only Queues */ ... the Scope table should
+	indicate whether the Scrip is relevant for a given transaction type ... then
+	the given Action should determinate whether it applies or not, and finally
+	the Action has to find out (via the Watchers table) whom it applies to, and
+	how to contact them ... and the Template tells how the mails that are sent
+	out should look like.
+	
+2000-03-27 12:33  jesse
+
+	* lib/RT/ScripScopes.pm:
+
+	file ScripScopes.pm was initially added on branch rt-1-1.
+	
+2000-03-27 12:33  jesse
+
+	* lib/RT/: ScripScope.pm, ScripScopes.pm:
+
+	a bit more stub work on ScripScopes for tobias.
+	more work after lunch
+	
+2000-03-27 07:18  tobiasb
+
+	* lib/RT/ScripScope.pm:
+
+	test..?
+	
+2000-03-27 07:04  tobiasb
+
+	* lib/RT/: ScripScope.pm, Scrips.pm:
+
+	Initiated work to get the code understand the Scrips/Scripscope split
+	
+2000-03-27 07:04  tobiasb
+
+	* lib/RT/ScripScope.pm:
+
+	file ScripScope.pm was initially added on branch rt-1-1.
+	
+2000-03-27 06:55  tobiasb
+
+	* etc/schema.mysql:
+
+	Added yet a stupid design thought as a comment:
+	
+	# {{{ TABLE ScripScope
+	  (...)
+	  Queue INT(11), #Queue Id 0 for global
+			 # (maybe there might be conditions where otherb
+	                 # Scopes apply, i.e. a ticket, keyword, owner, etc?)
+	
+2000-03-27 00:45  jesse
+
+	* lib/RT/Action/Notify.pm:
+
+	Oops. forgot to commit Notify.pm
+	
+2000-03-27 00:45  jesse
+
+	* lib/RT/Action/Notify.pm:
+
+	file Notify.pm was initially added on branch rt-1-1.
+	
+2000-03-27 00:44  jesse
+
+	* lib/RT/Action/NotifyOnResolve.pm:
+
+	file NotifyOnResolve.pm was initially added on branch rt-1-1.
+	
+2000-03-27 00:44  jesse
+
+	* etc/schema.mysql, lib/RT/Ticket.pm,
+	lib/RT/Action/NotifyOnResolve.pm, lib/RT/Action/NotifyWatchers.pm:
+
+	Work on Notify (Formerly NotifyWatchers)
+	Work on NotifyOnResolve (Formerly NotifyWatchersOnResolve)
+	
+	They don't _work_ per se. But they're getting closer. I'm wondering
+	whether we want to do something smarter with all the addresses we're passing
+	in to make it easier to remove specific ones...for example, we currently
+	have no way to _not_ send mail to the reuqestor.
+	
+2000-03-26 18:13  jesse
+
+	* lib/RT/Action/: AutoReply.pm, SendEmail.pm:
+
+	AutoReply is now a proper subclass of SendEmail.pm
+	Maybe tonight, I'll try to get through some work on the Scrips and ScripScope stuff to make it work again.
+	then to wrok on NotifyWatchers.pm
+	
+2000-03-25 01:03  jesse
+
+	* Makefile, lib/RT/Template.pm, lib/RT/Ticket.pm,
+	lib/RT/Action/SendEmail.pm:
+
+	Work on the templating system. I actually gutted Template.pm and SendEmail.pm
+	(sorry tobix :/)  Basically RT::Template is now A MIME::Entity object, which
+	means that the various things one can do to mail messages can now be done to
+	RT::Template objects, once you run $TemplateObj->Parse on them..
+	SendEmail was cleaned up somewhat to be less intimidating to people who aren't
+	as comfortable with big chunks of fairly dense perl.  Oh and it's a heck of a
+	lot more subclassable now ;)
+	
+	Fixed a tiny bug in Ticket.pm resulting from the changes to Watchers.
+	
+2000-03-24 08:29  tobiasb
+
+	* tools/test:
+
+	I'm making a test suite which is intended to be run off from the Makefile after an install
+	
+2000-03-24 08:29  tobiasb
+
+	* tools/test:
+
+	file test was initially added on branch rt-1-1.
+	
+2000-03-24 08:06  tobiasb
+
+	* etc/schema.mysql:
+
+	Added some more noise
+	
+2000-03-23 23:41  jesse
+
+	* subscription-definitions.txt,
+	docs/design_docs/subscription-definitions.txt, etc/schema.mysql,
+	lib/RT/Action/NotifyWatchers.pm, lib/RT/Action/SendEmail.pm:
+
+	A little bit of cleanup to the SendEmail and NotifyWatchers actions.
+	I probably did more damage than good, but that's what I get for messing
+	with code that makes little sense to me.
+	
+2000-03-23 23:41  jesse
+
+	* docs/design_docs/subscription-definitions.txt:
+
+	file subscription-definitions.txt was initially added on branch rt-1-1.
+	
+2000-03-23 22:19  jesse
+
+	* webrt/Search/BuildSearch:
+
+	Testing the setgid repository. commiting an empty file
+	
+2000-03-23 22:19  jesse
+
+	* webrt/Search/BuildSearch:
+
+	file BuildSearch was initially added on branch rt-1-1.
+	
+2000-03-23 00:50  jesse
+
+	* webrt/Search/QueueFooter:
+
+	file QueueFooter was initially added on branch rt-1-1.
+	
+2000-03-23 00:50  jesse
+
+	* webrt/Search/QueueItem:
+
+	file QueueItem was initially added on branch rt-1-1.
+	
+2000-03-23 00:50  jesse
+
+	* webrt/Search/QueueHeader:
+
+	file QueueHeader was initially added on branch rt-1-1.
+	
+2000-03-23 00:50  jesse
+
+	* webrt/Admin/ModifyUser:
+
+	file ModifyUser was initially added on branch rt-1-1.
+	
+2000-03-23 00:50  jesse
+
+	* lib/RT/Action/NotifyWatchers.pm:
+
+	file NotifyWatchers.pm was initially added on branch rt-1-1.
+	
+2000-03-23 00:50  jesse
+
+	* Makefile, bin/rtmux.pl, etc/schema.mysql, lib/RT/Queue.pm,
+	lib/RT/Scrip.pm, lib/RT/Ticket.pm, lib/RT/Watcher.pm,
+	lib/RT/Action/NotifyWatchers.pm, webrt/Admin/ModifyUser,
+	webrt/Search/Listing.html, webrt/Search/QueueFooter,
+	webrt/Search/QueueHeader, webrt/Search/QueueItem,
+	webrt/Ticket/Displaysummary:
+
+	Did a bit of hacking on webrt2
+	Redid the watchers system according to what I posted earlier to rt-devel
+	Scrips have now broken..but we'll get them working again really soon.
+	Queue Cc and AdminCc now exist in cli adminrt.
+	
+2000-03-22 14:56  tobiasb
+
+	* subscription-definitions.txt:
+
+	definitions in the subscription system
+	
+2000-03-22 14:56  tobiasb
+
+	* subscription-definitions.txt:
+
+	file subscription-definitions.txt was initially added on branch rt-1-1.
+	
+2000-03-22 14:42  tobiasb
+
+	* etc/schema.mysql:
+
+	This is a suggestion about a simple splitting of the Scrips table.  I
+	think the admin tools will be significantly easier to set up if we do
+	it this way.  An administrator can through some UI just add and remove
+	Scrips from a queue.
+	
+2000-03-22 01:02  jesse
+
+	* lib/RT/: ACE.pm, ACL.pm, Action.pm, Area.pm, Areas.pm,
+	Attachment.pm, Attachments.pm, CurrentUser.pm, EasySearch.pm,
+	Queue.pm, Queues.pm, Record.pm, Scrip.pm, Scrips.pm, Template.pm,
+	Templates.pm, Ticket.pm, Tickets.pm, Transaction.pm,
+	Transactions.pm, User.pm, Users.pm, Utils.pm, Watcher.pm,
+	Watchers.pm, Action/AutoReply.pm, Action/MailComment.pm,
+	Action/SendEmail.pm, Interface/Email.pm:
+
+	This may look like a lot of code. but it's not.
+	It's merely the result of running
+	
+	perl -pi.bak -e 's/sub (.*?){\n/# {{{ sub $1\nsub $1 {\n/; s/^}$/}\n# }}}/'
+	
+	basically, this adds # {{{ sub function
+		         and # }}}
+	around all the function names. The main reason to do this is for
+	emacs fold-minor-mode.  It makes things a lot easier to read.
+	In an ideal world, we'd have perl-aware folding editor and there'd be
+	no need for this markup
+	
+2000-03-21 20:38  jesse
+
+	* lib/RT/: Queue.pm, Ticket.pm, Watcher.pm, Watchers.pm:
+
+	Work on watchers.
+	
+2000-03-20 15:21  jesse
+
+	* etc/schema.mysql:
+
+	Modified the schema for my "New Improved Watchers" system. Basically,
+	now you'll be able to tie a template to a given watch. along with a
+	boolean "send mail" flag.  We'll need a special "Mail Watchers" action to
+	make this all work..but the code should be pretty easy.
+	
+		jesse
+	
+2000-03-20 05:27  tobiasb
+
+	* bin/initdb.mysql:
+
+	bugfix
+	
+2000-03-17 15:20  jesse
+
+	* webrt/Ticket/Create.html:
+
+	file Create.html was initially added on branch rt-1-1.
+	
+2000-03-17 15:20  jesse
+
+	* webrt/Ticket/DisplayHeader:
+
+	file DisplayHeader was initially added on branch rt-1-1.
+	
+2000-03-17 15:20  jesse
+
+	* webrt/Ticket/SetOwner:
+
+	file SetOwner was initially added on branch rt-1-1.
+	
+2000-03-17 15:20  jesse
+
+	* webrt/Ticket/SetStatus:
+
+	file SetStatus was initially added on branch rt-1-1.
+	
+2000-03-17 15:20  jesse
+
+	* webrt/Ticket/: Create.html, Display.html, DisplayHeader,
+	Displaysummary, SetOwner, SetStatus, Update.html:
+
+	More work on the basic webui
+	
+2000-03-17 15:20  jesse
+
+	* webrt/Ticket/Displaysummary:
+
+	file Displaysummary was initially added on branch rt-1-1.
+	
+2000-03-17 11:32  tobiasb
+
+	* bin/initdb.mysql:
+
+	Bugfix, the password passing didn't work as it should.
+	
+2000-03-17 10:52  tobiasb
+
+	* etc/schema.mysql:
+
+	- Slashed away the old "MailQueueMembersOn..." junk.
+	
+	- Added Scrips to the Watchers table.  ... the Watchers/Scrips system
+	seems quite flexible .. BUT .. I have a certain feeling that it might
+	be hard to make administration tools that helps a non-hacking
+	administrator to find out which mails are sent where, etc.  Well,
+	that's something we'll have to worry about later :)
+	
+2000-03-17 08:47  tobiasb
+
+	* Makefile, etc/schema.mysql:
+
+	removed some instanses of 'su' that really shouldn't be needed, and which also broke on anything but GNU shellutils
+	
+2000-03-17 07:32  tobiasb
+
+	* README:
+
+	Some additions and changes to reflect that this is, after all, a
+	development version.  Meri, do you subscribe to cvs-commit? :)
+	
+2000-03-17 06:01  tobiasb
+
+	* etc/schema.mysql:
+
+	# Those subscription field are not used in RT 1.1 as I see it.
+	# I think we should modify the Scrips system so it by default
+	# respects those fields.
+	 MailOwnerOnTransaction INT,             # notify owner on transaction
+	 MailMembersOnTransaction INT,		# notify list members on transaction
+	 MailRequestorOnTransaction INT,	# notify requestor on transaction
+	 MailRequestorOnCreation INT,		# notify user on creation
+	 MailMembersOnCorrespondence INT,		# notify members on creation
+	 MailMembersOnComment INT,		# notify members on comment
+	
+2000-03-16 16:31  jesse
+
+	* webrt/: Search/Listing.html, Ticket/Display.html,
+	Ticket/Modify.html, Ticket/ProcessUpdate.html, Ticket/Update.html,
+	Ticket/ValidateUpdate.html:
+
+	The beginnings of the All New! Web UI based around HTML::Mason
+	There's nothing functional here yet. but it's a start at a framework.
+	Ticket/Update.html is probably the closest to "real" code so far.
+	
+2000-03-16 16:31  jesse
+
+	* webrt/Ticket/ValidateUpdate.html:
+
+	file ValidateUpdate.html was initially added on branch rt-1-1.
+	
+2000-03-16 16:31  jesse
+
+	* webrt/Ticket/Display.html:
+
+	file Display.html was initially added on branch rt-1-1.
+	
+2000-03-16 16:31  jesse
+
+	* webrt/Ticket/Modify.html:
+
+	file Modify.html was initially added on branch rt-1-1.
+	
+2000-03-16 16:31  jesse
+
+	* webrt/Search/Listing.html:
+
+	file Listing.html was initially added on branch rt-1-1.
+	
+2000-03-16 16:31  jesse
+
+	* webrt/Ticket/ProcessUpdate.html:
+
+	file ProcessUpdate.html was initially added on branch rt-1-1.
+	
+2000-03-16 16:31  jesse
+
+	* webrt/Ticket/Update.html:
+
+	file Update.html was initially added on branch rt-1-1.
+	
+2000-03-16 14:46  tobiasb
+
+	* Makefile:
+
+	Changed the default database name from rt to RT to avoid confusion with previously installed versions of rt
+	
+2000-03-16 02:34  tobiasb
+
+	* lib/RT/User.pm:
+
+	Bugfixes:  It was impossible not to give requests to somebody.
+	
+2000-03-16 01:32  tobiasb
+
+	* lib/RT/Interface/Email.pm:
+
+	Bugfixes
+	
+	was
+	
+	  if ($CurrentUser->Id == 0) {
+	    #If it fails, create a user
+	
+	now
+	
+	  unless ($CurrentUser->Id) {
+	    #If it fails, create a user
+	
+	as Id returned undef.
+	
+	Changed 'Queue' to 'QueueTag'.
+	
+	Added some few comments
+	
+2000-03-14 00:40  jesse
+
+	* README:
+
+	Modified the README for the beginnings of the new webui
+	
+2000-03-14 00:39  jesse
+
+	* bin/: rtmux.pl, webmux.pl:
+
+	added webmux. modified rtmux.pl to clean out some cruft
+	
+2000-03-14 00:39  jesse
+
+	* bin/webmux.pl:
+
+	file webmux.pl was initially added on branch rt-1-1.
+	
+2000-03-13 12:53  jesse
+
+	* lib/RT/Interface/Email.pm:
+
+	rt-mailgate has now recieved and logged correspondence and comments with current schema.
+	
+2000-03-08 23:26  jesse
+
+	* lib/RT/: Ticket.pm, Transaction.pm:
+
+	DBIx cleanups to deal with load by id when id is null
+	Work on comment and correspond. Eventually, we'll get the
+	per-transaction cc and bcc working.
+	
+2000-03-08 18:22  jesse
+
+	* bin/rtmux.pl, lib/RT/Queue.pm, lib/RT/Ticket.pm,
+	lib/RT/Transaction.pm, lib/RT/User.pm:
+
+	rtq works a bit better
+	rtadmin works again.
+	rtadmin -user create
+		-user modify
+	 both seem to work ok
+	
+	rt -create now makes sure a queue exists and permits ticket creation
+	rt -create now make sure a prospective owner has queue membership.
+	
+2000-03-02 17:23  tobiasb
+
+	* lib/RT/Ticket.pm, lib/RT/Transaction.pm,
+	lib/RT/Action/SendEmail.pm, etc/schema.mysql:
+
+	resolve, open, take (if unowned, at least) seems to work
+	
+2000-03-02 16:10  tobiasb
+
+	* lib/RT/: Ticket.pm, Ticket.pm:
+
+	Bugfixing
+	
+2000-03-02 14:35  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Correspondence almost works
+	
+2000-03-02 13:26  tobiasb
+
+	* lib/RT/Ticket.pm, lib/RT/Action/MailComment.pm, etc/schema.mysql:
+
+	Comments almost work now (from the cli)
+	
+2000-03-02 12:38  tobiasb
+
+	* lib/RT/Action/: MailComment.pm, MailCorrespondence.pm:
+
+	one minor bugfix + some comments
+	
+2000-03-01 23:58  jesse
+
+	* NEWS:
+
+	brought the news up to date.
+	nuked old /contrib
+	nuked old /etc/templates.
+	
+	bedtime now.
+	
+2000-03-01 23:57  jesse
+
+	* NEWS:
+
+	brought the news up to date (a bit)
+	
+2000-03-01 23:50  jesse
+
+	* Makefile:
+
+	removed a lot of outdated cruft.
+	Bumped the version to 1.1.11 for a release later this week.
+	
+2000-03-01 23:18  jesse
+
+	* lib/RT/: Ticket.pm, Interface/Email.pm:
+
+	The mail gateway now lets you create, comment and correspond on tickets.
+	Ticket->Owner now deals better when the owner is NULL
+	
+2000-03-01 21:27  jesse
+
+	* HACKING:
+
+	minor comments added to hacking
+	
+2000-03-01 21:20  jesse
+
+	* HACKING:
+
+	Trivial change to HACKING to test commitinfo
+	
+2000-03-01 21:09  jesse
+
+	* lib/RT/Interface/Email.pm:
+
+	file Email.pm was initially added on branch rt-1-1.
+	
+2000-03-01 21:09  jesse
+
+	* bin/rtmux.pl, lib/RT/Interface/Email.pm:
+
+	work on mailgate
+	
+2000-03-01 18:36  tobiasb
+
+	* docs/design_docs/TransactionTypes.txt, etc/schema.mysql:
+
+	Some loose thoughts only ... as comments and a doc which I'm not sure
+	if it's possible to understand by others than me anyway :)
+	
+	Anyway, it is too complex.  We'll just continue following the current design.
+	
+2000-03-01 18:36  tobiasb
+
+	* docs/design_docs/TransactionTypes.txt:
+
+	file TransactionTypes.txt was initially added on branch rt-1-1.
+	
+2000-03-01 17:51  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Seems like it's a lot of things that doesn't work here.
+	
+2000-03-01 16:26  tobiasb
+
+	* etc/schema.mysql:
+
+	Ehm ... maybe I forgot to commit this one.  It contains some fixes.
+	
+2000-03-01 16:08  jesse
+
+	* TODO:
+
+	ripped a bit of obsolete code from rtmux.pl
+	updated the TODO to reference the production instance of RT.
+	
+2000-03-01 14:48  jesse
+
+	* bin/rtmux.pl:
+
+	removed the old web ui hooks from rtmux.pl
+	
+2000-03-01 12:12  tobiasb
+
+	* lib/RT/: Action.pm, Scrip.pm, Template.pm, Ticket.pm,
+	Watchers.pm, Action/AutoReply.pm, Action/SendEmail.pm:
+
+	I've done some debugging and polishing.  I hope it won't break with stuff you're eventually working with
+	
+2000-02-29 16:58  tobiasb
+
+	* lib/RT/: Queue.pm, Ticket.pm, Watchers.pm:
+
+	One sort of bugfix..
+	
+2000-02-29 16:35  tobiasb
+
+	* lib/RT/: Queue.pm, Template.pm, Ticket.pm, Watcher.pm,
+	Watchers.pm, Action/SendEmail.pm:
+
+	Scrips work for me.  Well, I'm not that sure anyway.  I had actually
+	expected one email to drop in for each Scrip - but I only got the
+	AutoReply and the Correspondence.  Maybe I should debug even more.
+	
+2000-02-29 14:29  tobiasb
+
+	* lib/RT/Watchers.pm:
+
+	LimitToTicket updated (not tested, though)
+	LimitToQueue added     (not tested, though)
+	
+2000-02-29 14:27  tobiasb
+
+	* etc/schema.mysql:
+
+	
+	# Primarly used by RT::Actions::SendEmail as well as some subclasses
+	# to determinate whom to send emails to.  This scheme should work out
+	# better than the scheme under RT 1.0, and should suit most users.
+	# For more fine grained control, it's possible to create tables as you
+	# like and make a new subclass of RT::Actions::SendEmail where the
+	# SetRecepients sub is overloaded :)
+	
+	CREATE TABLE Watchers (
+	   id int(11) AUTO_INCREMENT PRIMARY KEY,
+	   Value int(11),
+	   Scope varchar(16), # Might be "Queue" and "Ticket" as for now
+	                      # ... might be extended to "Keywords", "Owners", etc.
+	   Email VARCHAR(255),
+	   Type VARCHAR(16), #Requestor, Cc, Bcc
+	   Creator INT(11),
+	   Created TIMESTAMP,
+	   LastUpdatedBy INT(11),
+	   LastUpdated TIMESTAMP
+	)\g
+	
+2000-02-29 13:40  tobiasb
+
+	* etc/schema.mysql:
+
+	CREATE TABLE Watchers (
+	   id int(11) AUTO_INCREMENT PRIMARY KEY,
+	   Ticket int(11), # 0 for all
+	   Queue int(11), # 0 for all
+		# We might consider adding more power here,
+		# i.e. TransactionType, Scrip, etc
+	   Email VARCHAR(255),
+	   Type VARCHAR(16), #Requestor, Cc, Bcc
+	   Creator INT(11),
+	   Created TIMESTAMP,
+	   LastUpdatedBy INT(11),
+	   LastUpdated TIMESTAMP
+	)\g
+	
+2000-02-29 10:43  tobiasb
+
+	* etc/schema.mysql:
+
+	Template.{content and title} => Content and Title - since we use
+	UpperCase in the rest of the DD.
+	
+2000-02-29 10:31  tobiasb
+
+	* etc/schema.mysql:
+
+	Blob, that is..
+	
+2000-02-29 10:12  tobiasb
+
+	* etc/schema.mysql:
+
+	Added ExtraHeaders as VARCHAR(255).  255 characters should be enough
+	for storing some few extra header lines, but anyway maybe it should
+	have been blob instead?
+	
+2000-02-29 09:51  tobiasb
+
+	* lib/RT/: Attachment.pm, Action/AutoReply.pm, Action/SendEmail.pm:
+
+	I've continued the work on mail sending.  There is still some missing
+	stuff:
+	
+	1. EasySearch/Scrips issue - currently it doesn't properly output "
+	all scrips that has (queue=0 or queue=this) and (type="any" or type=this)".
+	
+	2. A serious stub in RT::Action::SendEmail - I don't know where to find
+	"interessted parties".  I think it could be nice putting queue watchers
+	in the same table as ticket watchers.
+	
+2000-02-29 09:42  tobiasb
+
+	* lib/RT/Scrips.pm:
+
+	Hack - everything that applies for a Correspondence action also
+	applies for a Create action (I'd daresay).
+	
+2000-02-29 07:02  tobiasb
+
+	* lib/RT/Transaction.pm:
+
+	Some insignificant changes.  Well, one marginally significant; it
+	shouldn't $Scrip->Commit unless $Scrip->Prepare()
+	
+2000-02-29 04:12  tobiasb
+
+	* etc/schema.mysql:
+
+	I've started at general transaction emails.
+	
+2000-02-29 03:58  tobiasb
+
+	* lib/RT/Watchers.pm:
+
+	Added an Emails method.  It can be used like:
+	
+	   print join(",", @{$Watchers->Emails("Requestors")});
+	
+	or
+	
+	   $Watchers->LimitToRequestors;
+	   $Emails=$Watchers->Emails;
+	
+	...
+	
+2000-02-29 02:31  tobiasb
+
+	* lib/RT/Action/SendEmail.pm:
+
+	Sender => RT-Originator
+	
+2000-02-29 00:40  jesse
+
+	* README:
+
+	Added Into Netowrks and Funcom to the thanks at the top of the readme
+	`
+	
+2000-02-28 23:20  jesse
+
+	* Makefile:
+
+	RT 1.1.10 released. Tobix has autoreply basically working :)
+	
+2000-02-28 22:49  jesse
+
+	* Makefile, NEWS, README:
+
+	Fixed a longstanding bug in the WebRT administrator
+	added a note about stripmime to the readme.
+	added a bit of code from curl.com that adds functionality to rtq for reporting
+	
+2000-02-28 22:17  jesse
+
+	* Makefile, NEWS:
+
+	bumped the version for release of 1.0.2
+	
+2000-02-28 11:33  tobiasb
+
+	* lib/RT/: Template.pm, Transaction.pm, Action/AutoReply.pm,
+	Action/SendEmail.pm:
+
+	AutoReply seems to work now ... except that rtadmin didn't set email
+	aliases for the queue, so the mail bounces with invalid from address.
+	I won't look more at this until tomorrow.  You're very welcome to take
+	over for a while if you feel like it :)
+	
+2000-02-28 11:29  tobiasb
+
+	* etc/schema.mysql:
+
+	AutoReply seems to work now
+	
+2000-02-28 08:18  tobiasb
+
+	* HACKING:
+
+	Added some hints and misc.  Please look through.
+	
+2000-02-28 05:25  tobiasb
+
+	* lib/RT/: Ticket.pm, Transaction.pm, Action/AutoReply.pm,
+	Action/SendEmail.pm:
+
+	- The queue tag rather than queue id is delievered from the cli, this
+	  broke in Ticket::Create.  Fixed.
+	
+	- The Attachments have to be assigned to a transaction before Scrips
+	   is run.  Now the Attachments are delievered as a part of the parameters
+	   to Transaction::Create
+	
+2000-02-27 23:28  tobiasb
+
+	* etc/schema.mysql:
+
+	Fixed the AutoReply template ... still not tested, though.
+	
+2000-02-27 22:04  tobiasb
+
+	* lib/RT/Action/: AutoReply.pm, SendEmail.pm:
+
+	I think we can nuke the old rt/lib/rt/support/mail.pm now - everything
+	should be located in SendEmail.pm, AutoReply.pm and Template.pm by now :)
+	
+	It's not tested yet, and the templates needs upgrading.  Anyway, I will
+	probably not mess more around with the perl code as for now.
+	
+2000-02-27 21:43  tobiasb
+
+	* bin/rtmux.pl:
+
+	Seems like $rtversion="!!RT_VERSION!!" had disappeared.  I renamed the
+	variable to $VERSION.
+	
+2000-02-27 21:22  jesse
+
+	* lib/RT/Ticket.pm:
+
+	dates now display in the cli.
+	
+2000-02-27 20:53  tobiasb
+
+	* lib/RT/Templates.pm:
+
+	Fixed DBIx::EasySearch => RT::EasySearch
+	
+2000-02-27 20:53  tobiasb
+
+	* lib/RT/Template.pm:
+
+	Method Template::Parse added, Text::Template used for the moment.
+	
+	(sigh ... that means my next worktask will be to update the
+	templates...)
+	
+2000-02-27 20:49  jesse
+
+	* lib/RT/Ticket.pm:
+
+	so. Ticket->Create now actually figures out ccs and bccs and requestors from the mime
+	object passed in to it.
+	
+2000-02-27 19:05  jesse
+
+	* lib/RT/Transaction.pm:
+
+	added a comment for tobias about a new line that didn't make sense.
+	
+2000-02-27 18:46  jesse
+
+	* lib/RT/: Ticket.pm, Watchers.pm:
+
+	watchers updates.
+	
+2000-02-27 17:25  tobiasb
+
+	* lib/RT/Template.pm:
+
+	file Template.pm was initially added on branch rt-1-1.
+	
+2000-02-27 17:25  tobiasb
+
+	* lib/RT/: Attachment.pm, Template.pm, Templates.pm,
+	Action/AutoReply.pm, Action/SendEmail.pm:
+
+	Development snapshot.  I guess I'll have it working in half an hour
+	with _efficient_ working, that is some four hours working at my
+	current efficiency rate :/
+	
+2000-02-27 17:25  tobiasb
+
+	* lib/RT/Templates.pm:
+
+	file Templates.pm was initially added on branch rt-1-1.
+	
+2000-02-27 16:43  tobiasb
+
+	* etc/schema.mysql:
+
+	Added some templates
+	
+2000-02-27 11:19  tobiasb
+
+	* lib/RT/: Scrip.pm, Transaction.pm:
+
+	development snapshot
+	
+2000-02-27 10:31  tobiasb
+
+	* lib/RT/Action/: AutoReply.pm, MailComment.pm,
+	MailCorrespondence.pm, SendEmail.pm:
+
+	I've started bashing at the mail sending functionallity.  It seemed quite
+	stubbed to me.
+	
+2000-02-24 03:44  tobiasb
+
+	* etc/schema.mysql:
+
+	minor bug in comment
+	
+2000-02-24 03:24  tobiasb
+
+	* lib/RT/Action/SendEmail.pm:
+
+	clearing out a potential weird bug
+	
+2000-02-24 00:27  jesse
+
+	* lib/RT/Scrips.pm:
+
+	Fixed a typo in my code near tobix' changes to Scrips.pm. his changes look good.
+	
+2000-02-24 00:03  jesse
+
+	* Makefile, NEWS, README:
+
+	little fix to mail manipulate from "Heather L. Sherman" <heather@idealab.com>
+	
+2000-02-23 17:06  tobiasb
+
+	* lib/RT/: Scrips.pm, Action/SendEmail.pm:
+
+	Some small fixes.  You'd better look through it, as I'm not completely sure what I'm doing :)
+	
+2000-02-23 16:07  tobiasb
+
+	* etc/schema.mysql:
+
+	An insert entry here reffers to SendMail.pm, while the file is SendEmail.pm
+	
+2000-02-23 15:26  jesse
+
+	* docs/rt-templates.html:
+
+	[no log message]
+	
+2000-02-23 11:38  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Could not get 'rt -create' working.  It seems more sane now, but I'm not really sure what I'm doing ... so you should have a peek at it.  I changed  $Id->SUPER::_Set("EffectiveId",$id); to $self->SUPER::_Set etc
+	
+2000-02-22 23:35  jesse
+
+	* lib/RT/InterestedParty.pm:
+
+	removed vestigal code
+	
+2000-02-22 23:25  jesse
+
+	* etc/schema.mysql, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
+	lib/RT/Transactions.pm, lib/RT/Watchers.pm:
+
+	A bit more work on watchers. we're getting close.
+	rtq works today.
+	rt -create basically works.
+	rt -take works.
+	
+	rt -show will now start to show ownership changes.
+	
+2000-02-22 08:06  jesse
+
+	* Makefile, etc/schema.mysql, lib/RT/Ticket.pm:
+
+	Work on Watchers.  Most of the code needed to make this work is now
+	present. sadly I haven't even _tried_ to run it yet.
+	
+2000-02-21 01:33  jesse
+
+	* lib/RT/Watcher.pm:
+
+	file Watcher.pm was initially added on branch rt-1-1.
+	
+2000-02-21 01:33  jesse
+
+	* lib/RT/: InterestedParties.pm, InterestedParties.pm~,
+	Notification.pm, Ticket.pm, Watcher.pm, Watchers.pm:
+
+	Renamed interested parties to "Watchers"
+	Watchers are now keyed by EmailAddress rather than UserId. Not every CC will have an rt account, i think
+	
+2000-02-21 01:33  jesse
+
+	* lib/RT/Watchers.pm:
+
+	file Watchers.pm was initially added on branch rt-1-1.
+	
+2000-02-20 18:28  jesse
+
+	* lib/RT/InterestedParties.pm~:
+
+	file InterestedParties.pm~ was initially added on branch rt-1-1.
+	
+2000-02-20 18:28  jesse
+
+	* lib/RT/InterestedParties.pm:
+
+	file InterestedParties.pm was initially added on branch rt-1-1.
+	
+2000-02-20 18:28  jesse
+
+	* lib/RT/InterestedParty.pm:
+
+	file InterestedParty.pm was initially added on branch rt-1-1.
+	
+2000-02-20 18:28  jesse
+
+	* lib/RT/: InterestedParties.pm, InterestedParties.pm~,
+	InterestedParty.pm:
+
+	[no log message]
+	
+2000-02-20 18:24  jesse
+
+	* etc/schema.mysql, lib/RT/Ticket.pm:
+
+	[no log message]
+	
+2000-02-20 15:27  jesse
+
+	* etc/schema.mysql, lib/RT/Action.pm, lib/RT/Scrip.pm,
+	lib/RT/Action/AutoReply.pm, lib/RT/Action/SendEmail.pm:
+
+	Work on scrips. stubs for the webui
+	
+2000-02-19 17:45  jesse
+
+	* lib/RT/: Action.pm, Scrip.pm:
+
+	work on actions. checking in for eric to take a look
+	
+2000-02-19 16:48  jesse
+
+	* lib/RT/Action/AutoReply.pm:
+
+	file AutoReply.pm was initially added on branch rt-1-1.
+	
+2000-02-19 16:48  jesse
+
+	* lib/RT/Action/MailCorrespondence.pm:
+
+	file MailCorrespondence.pm was initially added on branch rt-1-1.
+	
+2000-02-19 16:48  jesse
+
+	* lib/RT/Action.pm:
+
+	file Action.pm was initially added on branch rt-1-1.
+	
+2000-02-19 16:48  jesse
+
+	* lib/RT/Action/MailComment.pm:
+
+	file MailComment.pm was initially added on branch rt-1-1.
+	
+2000-02-19 16:48  jesse
+
+	* lib/RT/: Action.pm, Action/AutoReply.pm, Action/MailComment.pm,
+	Action/MailCorrespondence.pm, Action/SendEmail.pm:
+
+	As it turns out, Action needed to be abstracted a bit and renamed.
+	
+	I'm also making the Object syntax a bit.
+	
+2000-02-19 16:48  jesse
+
+	* lib/RT/Action/SendEmail.pm:
+
+	file SendEmail.pm was initially added on branch rt-1-1.
+	
+2000-02-17 09:19  jesse
+
+	* etc/schema.mysql, lib/RT/Scrip.pm, lib/RT/Scrips.pm,
+	lib/RT/Transaction.pm:
+
+	The base architecture for Scrips to work should now be in place.
+	Next up: write example "Actions" (gotta move the Scrips directory to Actions)
+	for the scrip handlers to use.
+	
+2000-02-16 09:59  jesse
+
+	* lib/RT/: Scrip.pm, Transaction.pm:
+
+	Starting to make scrips actually work
+	
+2000-02-10 23:24  jesse
+
+	* lib/RT/Scrips.pm:
+
+	file Scrips.pm was initially added on branch rt-1-1.
+	
+2000-02-10 23:24  jesse
+
+	* lib/RT/: Scrip.pm, Scrips.pm, Transaction.pm:
+
+	more work stubbing scrips. but now my arms hurt badly enough that i'm going to log out.
+	
+2000-02-10 23:24  jesse
+
+	* lib/RT/Scrip.pm:
+
+	file Scrip.pm was initially added on branch rt-1-1.
+	
+2000-01-31 02:38  tobiasb
+
+	* README, lib/RT/Attachments.pm:
+
+	does the commit automail work now?
+	
+2000-01-30 23:54  jesse
+
+	* NEWS, README, etc/schema.mysql, lib/RT/CurrentUser.pm,
+	lib/RT/Record.pm, lib/RT/User.pm:
+
+	Work on the User object.
+	The mail gateway now autocreates users. (This will make more sense
+	once we start tying tickets to users by means of the InterestedParties table.
+	
+2000-01-29 01:33  jesse
+
+	* Makefile:
+
+	makefile cleanup. including removing the C compiler and template and
+	transaction directories
+	
+2000-01-29 01:30  jesse
+
+	* Makefile:
+
+	removed C compiler from the makefile
+	
+2000-01-29 01:25  jesse
+
+	* Makefile:
+
+	Removed C compiler from the makefile. we just don't need it anymore
+	
+2000-01-29 01:22  jesse
+
+	* Makefile:
+
+	bumped version to 1-1-8
+	
+2000-01-29 01:20  jesse
+
+	* Makefile:
+
+	removed template and transaction paths from the makefile.
+	(to test new cvs wrappers and cuz they should be gona anyway)
+	
+2000-01-29 00:26  jesse
+
+	* etc/schema.mysql:
+
+	Started to do work on scrips. see the schema for how it would work.
+	
+2000-01-28 20:04  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Some modifications and bugfixes on the messages popping up after a `successful' correspondence/comment
+	
+2000-01-28 19:47  tobiasb
+
+	* lib/RT/Ticket.pm:
+
+	Removed some annoying warnings.  I don't know if this is the "right"
+	way to remove them, but it works (for me, at least), it's an easy
+	way to do it, and it's harmless;
+	
+	instead of writing
+		$var_that_might_be_undef
+	I write
+		$var_that_might_be_undef || ""
+	eventually with parantheses, and eventually with "" replaced by 0, or maybe
+	(not tested) even undef.
+	
+2000-01-28 13:22  tobiasb
+
+	* Makefile:
+
+	Two substitution parameters was forgotten in config.pm
+	
+2000-01-28 13:12  tobiasb
+
+	* etc/schema.mysql:
+
+	Oups, committed the wrong file
+	
+2000-01-28 13:10  tobiasb
+
+	* Makefile, etc/schema.mysql:
+
+	Two substitution parameters was forgotten in config.pm
+	
+2000-01-27 04:09  tobiasb
+
+	* Makefile, bin/initdb.mysql:
+
+	small password fix
+	
+2000-01-25 23:26  jesse
+
+	* Makefile:
+
+	bumped the version to 1.1.7 for tonight's release.
+	
+2000-01-25 23:12  jesse
+
+	* lib/RT/: Attachments.pm, Ticket.pm, Transaction.pm:
+
+	DBIx::EasySearch now has a -> First method. which is like -> Next, but picks
+	the first element
+	
+	DBIx::Record -> now returns '' rather than undef for null values. it's less
+	likely to break interfaces.
+	
+2000-01-25 16:36  tobiasb
+
+	* README:
+
+	aargh
+	
+2000-01-25 16:31  tobiasb
+
+	* TODO:
+
+	test
+	
+2000-01-25 14:57  tobiasb
+
+	* etc/schema.mysql:
+
+	bugfix
+	
+2000-01-25 14:44  tobiasb
+
+	* Makefile:
+
+	removed obsoleteness
+	
+2000-01-25 14:37  tobiasb
+
+	* README:
+
+	The UPGRADE section of the README was inaccurate
+	
+2000-01-25 14:31  tobiasb
+
+	* lib/RT/Transaction.pm:
+
+	comment bug
+	
+2000-01-24 01:45  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+2000-01-24 01:43  jesse
+
+	* Makefile, NEWS, lib/RT/Attachment.pm, lib/RT/Attachments.pm,
+	lib/RT/Record.pm, lib/RT/Ticket.pm, lib/RT/Tickets.pm,
+	lib/RT/Transaction.pm, lib/RT/Transactions.pm:
+
+	
+	* Attachments support in code. rtq now basically works
+	  Mailgate creates new tickets
+	  rt -show now works a bit (doesn't display transaction content yet)
+	  rt -subject works. several other commandline tools work
+	
+2000-01-23 18:32  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+2000-01-23 18:27  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+2000-01-23 18:19  jesse
+
+	* etc/schema.mysql, lib/RT/Attachment.pm, lib/RT/Attachments.pm,
+	lib/RT/Ticket.pm, lib/RT/Transaction.pm:
+
+	Work to make attachments work. So far we've got something that puts attachments
+	in the database.
+	
+2000-01-21 12:25  tobiasb
+
+	* README:
+
+	doc-bugfix
+	
+2000-01-18 23:56  jesse
+
+	* lib/RT/Ticket.pm:
+
+	work on the mail gateway. (mainly disemboweled it)
+	
+2000-01-18 00:34  jesse
+
+	* lib/RT/Attachments.pm:
+
+	file Attachments.pm was initially added on branch rt-1-1.
+	
+2000-01-18 00:34  jesse
+
+	* docs/API:
+
+	file API was initially added on branch rt-1-1.
+	
+2000-01-18 00:34  jesse
+
+	* lib/RT/Attachment.pm:
+
+	file Attachment.pm was initially added on branch rt-1-1.
+	
+2000-01-18 00:34  jesse
+
+	* HACKING:
+
+	file HACKING was initially added on branch rt-1-1.
+	
+2000-01-18 00:34  jesse
+
+	* HACKING, Makefile, docs/API, etc/schema.mysql,
+	lib/RT/Attachment.pm, lib/RT/Attachments.pm, lib/RT/CurrentUser.pm,
+	lib/RT/Queue.pm, lib/RT/Record.pm, lib/RT/Ticket.pm,
+	lib/RT/Transaction.pm, lib/RT/Utils.pm:
+
+	work on attachments.
+	work on structure
+	
+2000-01-17 12:59  jesse
+
+	* Makefile, etc/schema.mysql, lib/RT/ACE.pm, lib/RT/ACL.pm,
+	lib/RT/CurrentUser.pm, lib/RT/Queue.pm, lib/RT/Queues.pm,
+	lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/Transaction.pm,
+	lib/RT/Transactions.pm, lib/RT/User.pm, lib/RT/Users.pm:
+
+	work on create. work on attachments. upcased the table names.
+	
+2000-01-14 15:34  jesse
+
+	* etc/schema.mysql:
+
+	work on schema
+	
+2000-01-14 14:47  jesse
+
+	* NEWS, etc/schema:
+
+	schema change to make long email addresses work better for queue members.
+	
+2000-01-14 01:07  jesse
+
+	* lib/RT/: EasySearch.pm, Record.pm, Ticket.pm, Tickets.pm,
+	Transaction.pm:
+
+	basic searches now work.
+	comments almost work.
+	creates are having an issue with effectiveid not getting set.
+	
+2000-01-13 18:04  jesse
+
+	* Makefile, lib/RT/EasySearch.pm, lib/RT/Tickets.pm:
+
+	[no log message]
+	
+2000-01-13 15:03  jesse
+
+	* lib/RT/Utils.pm:
+
+	file Utils.pm was initially added on branch rt-1-1.
+	
+2000-01-13 15:03  jesse
+
+	* lib/RT/Utils.pm:
+
+	[no log message]
+	
+2000-01-09 20:38  jesse
+
+	* lib/RT/EasySearch.pm:
+
+	file EasySearch.pm was initially added on branch rt-1-1.
+	
+2000-01-09 20:38  jesse
+
+	* lib/RT/: EasySearch.pm, Queue.pm, Queues.pm, Record.pm,
+	Tickets.pm:
+
+	added RT/EasySearch.pm
+	
+	rtadmin queue -list will now show all queues.
+	removed some debugging output
+	
+2000-01-04 01:21  jesse
+
+	* etc/schema.mysql, lib/RT/CurrentUser.pm, lib/RT/Queue.pm,
+	lib/RT/Record.pm, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
+	lib/RT/User.pm:
+
+	Lots of work. first working ticket update.
+	
+2000-01-04 01:21  jesse
+
+	* lib/RT/CurrentUser.pm:
+
+	file CurrentUser.pm was initially added on branch rt-1-1.
+	
+2000-01-03 07:40  tobiasb
+
+	* README, README:
+
+	bugfix
+	
+2000-01-03 01:39  jesse
+
+	* lib/RT/: Record.pm, Ticket.pm, User.pm:
+
+	basic create support working.
+	more boackend and abstraction work
+	
+2000-01-02 22:04  jesse
+
+	* lib/RT/Ticket.pm:
+
+	[no log message]
+	
+2000-01-02 20:31  jesse
+
+	* lib/RT/: ACE.pm, Area.pm, Queue.pm, Record.pm, Ticket.pm,
+	Transaction.pm, User.pm:
+
+	work on a buit more abstraction
+	
+2000-01-01 19:01  jesse
+
+	* etc/schema.mysql, lib/RT/ACE.pm, lib/RT/Ticket.pm,
+	lib/RT/User.pm:
+
+	work on Ticket.pm, schema.
+	things are starting to use immutable ids when referring to other tables.
+	
+1999-12-30 02:13  jesse
+
+	* Makefile, etc/schema.mysql, lib/RT/Queue.pm, lib/RT/Record.pm,
+	lib/RT/User.pm:
+
+	reworked things to use autoloaded functions.
+	
+1999-12-29 00:24  jesse
+
+	* Makefile, bin/rtmux.pl, etc/schema.mysql, lib/RT/ACE.pm,
+	lib/RT/Area.pm, lib/RT/Queue.pm, lib/RT/Record.pm,
+	lib/RT/Ticket.pm, lib/RT/Transaction.pm, lib/RT/User.pm:
+
+	lots of changes. some of them not quite done perfectly.
+	but admin is closer
+	
+1999-12-28 01:39  jesse
+
+	* bin/rtmux.pl, etc/config.pm, lib/RT/ACE.pm, lib/RT/ACL.pm,
+	lib/RT/Area.pm, lib/RT/Areas.pm, lib/RT/Notification.pm,
+	lib/RT/Queue.pm, lib/RT/Queues.pm, lib/RT/Record.pm,
+	lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/Transaction.pm,
+	lib/RT/Transactions.pm, lib/RT/User.pm, lib/RT/Users.pm:
+
+	rtadmin will now invoke and exit.
+	
+1999-12-27 19:54  jesse
+
+	* Makefile, bin/initacls.mysql, bin/rtmux.pl, etc/acl.mysql,
+	etc/config.pm, lib/RT/Record.pm:
+
+	first steps toward runability
+	
+1999-12-27 01:51  jesse
+
+	* Makefile, bin/rtmux.pl, etc/config.pm:
+
+	trying to get the config worked out
+	
+1999-12-26 21:58  jesse
+
+	* Makefile, Makefile:
+
+	[no log message]
+	
+1999-12-26 21:55  jesse
+
+	* Makefile, Makefile:
+
+	[no log message]
+	
+1999-12-26 21:53  jesse
+
+	* Makefile, Makefile, Makefile:
+
+	[no log message]
+	
+1999-12-26 21:51  jesse
+
+	* Makefile, Makefile, Makefile:
+
+	[no log message]
+	
+1999-12-26 21:45  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+1999-12-26 21:42  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+1999-12-26 21:34  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+1999-12-26 21:19  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+1999-12-26 18:35  jesse
+
+	* Makefile:
+
+	work on the makefile
+	
+1999-12-26 17:42  jesse
+
+	* lib/RT/User.pm:
+
+	more fixes for the new Handle object
+	
+1999-12-26 17:03  jesse
+
+	* bin/rtmux.pl, lib/RT/ACL.pm, lib/RT/Areas.pm, lib/RT/Queues.pm,
+	lib/RT/Tickets.pm, lib/RT/Transactions.pm, lib/RT/Users.pm:
+
+	more work on making everything use DBIx::Handle
+	
+1999-12-26 15:58  jesse
+
+	* lib/RT/Ticket.pm:
+
+	file Ticket.pm was initially added on branch rt-1-1.
+	
+1999-12-26 15:58  jesse
+
+	* lib/RT/Queue.pm:
+
+	file Queue.pm was initially added on branch rt-1-1.
+	
+1999-12-26 15:58  jesse
+
+	* lib/RT/Transaction.pm:
+
+	file Transaction.pm was initially added on branch rt-1-1.
+	
+1999-12-26 15:58  jesse
+
+	* lib/RT/Notification.pm:
+
+	file Notification.pm was initially added on branch rt-1-1.
+	
+1999-12-26 15:58  jesse
+
+	* lib/RT/ACE.pm:
+
+	file ACE.pm was initially added on branch rt-1-1.
+	
+1999-12-26 15:58  jesse
+
+	* lib/RT/Areas.pm:
+
+	file Areas.pm was initially added on branch rt-1-1.
+	
+1999-12-26 15:58  jesse
+
+	* lib/RT/ACL.pm:
+
+	file ACL.pm was initially added on branch rt-1-1.
+	
+1999-12-26 15:58  jesse
+
+	* lib/RT/Users.pm:
+
+	file Users.pm was initially added on branch rt-1-1.
+	
+1999-12-26 15:58  jesse
+
+	* lib/RT/Database.pm:
+
+	file Database.pm was initially added on branch rt-1-1.
+	
+1999-12-26 15:58  jesse
+
+	* lib/RT/Tickets.pm:
+
+	file Tickets.pm was initially added on branch rt-1-1.
+	
+1999-12-26 15:58  jesse
+
+	* lib/RT/Queues.pm:
+
+	file Queues.pm was initially added on branch rt-1-1.
+	
+1999-12-26 15:58  jesse
+
+	* lib/RT/Transactions.pm:
+
+	file Transactions.pm was initially added on branch rt-1-1.
+	
+1999-12-26 15:58  jesse
+
+	* lib/RT/Area.pm:
+
+	file Area.pm was initially added on branch rt-1-1.
+	
+1999-12-26 15:58  jesse
+
+	* lib/RT/: ACE.pm, ACL.pm, Area.pm, Areas.pm, Database.pm,
+	Notification.pm, Queue.pm, Queues.pm, Record.pm, Ticket.pm,
+	Tickets.pm, Transaction.pm, Transactions.pm, User.pm, Users.pm:
+
+	moving things to a more sane directory
+	
+1999-12-26 15:58  jesse
+
+	* lib/RT/Record.pm:
+
+	file Record.pm was initially added on branch rt-1-1.
+	
+1999-12-26 15:58  jesse
+
+	* lib/RT/User.pm:
+
+	file User.pm was initially added on branch rt-1-1.
+	
+1999-12-23 01:05  jesse
+
+	* Makefile, NEWS:
+
+	23 Dec 1999
+	-----------
+	
+	* Enabled a status = unresolved option for the web ui. thanks to
+	  brandon allbery <allbery@ece.cmu.edu> and Marion Hakanson <hakanson@cse.ogi.edu>
+	
+	* Made most of the permissions and directory changes from Marion
+	  Hakanson <hakanson@cse.ogi.edu> generally cleaned things up. but DID not
+	  include the changes to the directory creation, file copying and permission
+	  fixing code to enable RT_VAR_DIR
+	
+	* Made the web ui use $MESSAGE_FONT when putting up the compose window.
+	    Marion Hakanson <hakanson@cse.ogi.edu>
+	
+	* Genericised the templates to not mention the mythical "systems group"
+	
+1999-12-19 01:54  jesse
+
+	* Makefile, etc/schema.mysql:
+
+	work on ticket, transaction.
+	schema cleanup
+	
+1999-12-18 13:25  jesse
+
+	* etc/schema:
+
+	removed obsolete schema
+	
+1999-12-17 01:28  jesse
+
+	* Makefile:
+
+	set version
+	
+1999-12-17 01:27  jesse
+
+	* etc/: config.pm, schema.mysql:
+
+	more cleanup. we're getting there. just another zillion hours or so
+	
+1999-12-15 23:56  jesse
+
+	* docs/: FAQ, FAQ.html:
+
+	faq updates committed
+	
+1999-12-15 23:26  jesse
+
+	* README:
+
+	updates to tobix' additions
+	
+1999-12-15 18:32  tobiasb
+
+	* README:
+
+	duh
+	
+1999-12-15 18:04  tobiasb
+
+	* README:
+
+	Some few pitfalls mentionated
+	
+1999-12-09 00:38  jesse
+
+	* etc/schema.mysql:
+
+	work on Ticket and Transaction.
+	we're getting there.
+	
+1999-12-08 03:40  tobiasb
+
+	* etc/suidrt.c:
+
+	bugfixes
+	
+1999-12-06 21:41  jesse
+
+	* Makefile, NEWS:
+
+	[no log message]
+	
+1999-12-06 06:27  tobiasb
+
+	* Makefile:
+
+	insignificant output fix
+	
+1999-12-04 03:30  jesse
+
+	* NEWS, etc/schema.mysql:
+
+	[no log message]
+	
+1999-12-04 01:46  jesse
+
+	* NEWS:
+
+	Fixed tobix-induced bug in lib/rt/database/manipulate.pm
+	that'll teach him to make untested fixes to the stable branch.
+	
+1999-12-02 13:18  tobiasb
+
+	* etc/schema:
+
+	I'm unfortunately not even half on the way in my merging. I'm in a hurry, some small notes:
+	
+	1.1:
+	- work on dependencies done
+	- work on mail distribution done.
+	- requires sub dist_list
+	- requires sub open_parents
+	- requires sub add_link
+	
+	Dependencies & linking in general.
+	
+	Mail distribution. The distribution list is set by a &dist_list
+	sub. The transaction mail is never sent out for comments and
+	correspondence, but people who subscribe all transactions will get the
+	comments and correspondence.
+	
+1999-12-02 03:10  tobiasb
+
+	* etc/mysql.acl:
+
+	This file is renamed
+	
+1999-12-02 03:05  tobiasb
+
+	* etc/: schema.Pg, schema.mysql:
+
+	This file was fucked up, I don't know why. I'll just truncate it for now
+	
+1999-12-02 02:56  jesse
+
+	* Makefile:
+
+	bumped version
+	
+1999-12-02 02:54  tobiasb
+
+	* etc/schema:
+
+	Added links (dependency + knowledge db)
+	
+1999-12-02 01:42  jesse
+
+	* Makefile:
+
+	some makefile cleanup
+	
+1999-12-01 23:16  jesse
+
+	* NEWS:
+
+	[no log message]
+	
+1999-12-01 23:10  jesse
+
+	* bin/rtmux.pl, etc/schema.mysql:
+
+	mots of work on the new backend.
+	cliadmin is mostly up to date.
+	no, i haven't run any of the code :)
+	
+1999-11-30 21:52  jesse
+
+	* etc/: acl.Pg, schema.mysql:
+
+	[no log message]
+	
+1999-11-23 17:21  jesse
+
+	* docs/design_docs/CARS:
+
+	file CARS was initially added on branch rt-1-1.
+	
+1999-11-23 17:21  jesse
+
+	* README, docs/design_docs/CARS, etc/schema.mysql:
+
+	schema hacking for rt-1-1 features.
+	
+1999-11-18 21:40  jesse
+
+	* Makefile, Makefile, Makefile:
+
+	[no log message]
+	
+1999-11-17 17:36  tobiasb
+
+	* NEWS:
+
+	merged in changes from 1.0
+	
+1999-11-16 23:09  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+1999-11-08 20:54  jesse
+
+	* NEWS:
+
+	fixed a longstanding bug in cli/query
+	
+1999-11-08 18:02  jesse
+
+	* Makefile, NEWS, etc/config.pm:
+
+	[no log message]
+	
+1999-11-05 03:50  tobiasb
+
+	* Makefile, NEWS, README, bin/initacls.mysql, bin/initdb.mysql,
+	etc/acl.mysql, etc/config.pm:
+
+	patch from khamer integrated - no testing done, however
+	
+1999-10-22 14:09  tobiasb
+
+	* etc/schema:
+
+	merged 1.1-changes
+	
+1999-10-22 12:14  tobiasb
+
+	* NEWS, etc/mysql.acl, etc/schema:
+
+	Merged in changes from 1.0. I haven't checked that things works quite well, anyway.
+	
+1999-10-21 16:21  jesse
+
+	* Makefile, NEWS:
+
+	changes to date_diff, some of the oldest code in RT
+	
+1999-10-21 07:07  tobiasb
+
+	* docs/actions.txt, docs/admin.txt, docs/attributes.txt,
+	docs/outline.txt, docs/rt_users_guide.html, etc/config.pm:
+
+	merged from 1.0
+	
+1999-10-20 23:16  jesse
+
+	* NEWS:
+
+	[no log message]
+	
+1999-10-20 22:25  jesse
+
+	* NEWS:
+
+	[no log message]
+	
+1999-10-20 21:58  jesse
+
+	* NEWS:
+
+	[no log message]
+	
+1999-10-20 21:43  jesse
+
+	* Makefile, NEWS:
+
+	[no log message]
+	
+1999-10-20 10:33  tobiasb
+
+	* Makefile, NEWS, README, README.91UPGRADE, TODO,
+	bin/initacls.mysql, bin/initdb.mysql, docs/README.docs:
+
+	Merged 1.0-development into 1.1
+	
+1999-10-20 01:23  jesse
+
+	* Makefile, NEWS:
+
+	
+	20 Oct 1999
+	-----------
+	* RT now uses a queue's mail alias when sending mail.
+	
+1999-10-20 00:44  jesse
+
+	* Makefile, NEWS:
+
+	
+	20 Oct 1999
+	-----------
+	
+	* Using the web UI to send correspondence should no longer not
+	  sent the correspondence if there are CCs, BCCs or the actor is
+	  the same as the requestor. thanks to <douglas@arepa.com> for
+	  pointing out the deficiency.
+	
+1999-10-13 19:32  jesse
+
+	* Makefile, TODO:
+
+	Released version 1.0 Updated the TODO file.
+	
+1999-10-06 18:01  jesse
+
+	* Makefile:
+
+	bumped version
+	
+1999-10-06 17:57  jesse
+
+	* Makefile, NEWS, README, docs/README.docs:
+
+	[no log message]
+	
+1999-10-06 17:48  jesse
+
+	* docs/: FAQ, FAQ.html, README.docs, actions.html, actions.txt,
+	admin.html, admin.txt, attributes.html, attributes.txt,
+	outline.html, outline.txt, rt_users_guide.html:
+
+	major documentation updates from mbrader
+	
+1999-10-04 14:22  jesse
+
+	* Makefile, NEWS:
+
+	bumped the version to 1.0.0pre2
+	
+1999-10-01 01:39  jesse
+
+	* Makefile:
+
+	fixed a makefile typo
+	
+1999-10-01 01:37  jesse
+
+	* NEWS, README, README.91UPGRADE:
+
+	updated readme
+	
+1999-10-01 01:07  jesse
+
+	* NEWS:
+
+	[no log message]
+	
+1999-10-01 00:22  jesse
+
+	* NEWS, etc/config.pm:
+
+	
+	30 Sep 1999
+	-----------
+	
+	*  Fixed a bug which caused RT to go crazy when comments were submitted
+	   by may without a ticket #.
+	
+	The following changes are from johnl@microware.com
+	
+	   1. Directories were not getting created with the correct modes under            /usr/local/rt/transactions.                                                         The umask() takes an octal file mode mask, not a file mode.                                                                                                     In addition I read the comments about $dirmode not working when             doing the mkdir's in content.pm.  I also fixed content.pm to use                $dirmode.  The main problem was the $dirmode was being set to a string          instead of an octal number.
+	
+	  Fixes to database.pm
+	    1.  The first hunk fixes problem where the call to write_content is             passing $time.  This variable does not exist.   It looked like $time was        supposed to be the current time.  ($time always == 0).  I changed all           occurances of $time to time (IE: time()).                                                                                                                       2.  The first hunk also passes $in_time instead of $time.                                                                                                       3.  The rest of the hunks fix $time and replace them with time().
+	
+	27 Sep 1999
+	-----------
+	Fixed a bug which caused the priority not to get set to the default
+	when requests were created in the webui. Thanks to <Elmar.Knipp@knipp.de>
+	
+1999-09-23 23:16  anoncvs
+
+	* Makefile:
+
+	[no log message]
+	
+1999-09-23 23:09  anoncvs
+
+	* Makefile, Makefile:
+
+	[no log message]
+	
+1999-09-23 23:07  anoncvs
+
+	* Makefile:
+
+	[no log message]
+	
+1999-09-23 23:01  anoncvs
+
+	* Makefile:
+
+	[no log message]
+	
+1999-09-23 22:52  anoncvs
+
+	* Makefile:
+
+	[no log message]
+	
+1999-08-08 22:20  tobiasb
+
+	* etc/schema:
+
+	ups
+	
+1999-08-07 02:27  tobiasb
+
+	* etc/schema:
+
+	in-work
+	
+1999-08-04 02:48  tobiasb
+
+	* Makefile, NEWS:
+
+	Merge
+	
+1999-08-03 22:38  jesse
+
+	* NEWS:
+
+	first cut of -trans
+	
+1999-08-03 22:27  jesse
+
+	* Makefile, NEWS:
+
+	reved the version to .99.9. tiny mail manipulate fix
+	
+1999-08-03 11:31  tobiasb
+
+	* bin/initdb.mysql:
+
+	file initdb.mysql was initially added on branch rt-1-1.
+	
+1999-08-03 11:31  tobiasb
+
+	* bin/initdb.Pg:
+
+	file initdb.Pg was initially added on branch rt-1-1.
+	
+1999-08-03 11:31  tobiasb
+
+	* bin/initacls.mysql:
+
+	file initacls.mysql was initially added on branch rt-1-1.
+	
+1999-08-03 11:31  tobiasb
+
+	* bin/: initacls.Pg, initacls.mysql, initdb.Pg, initdb.mysql:
+
+	Scripts for initing the DB
+	
+1999-08-03 11:31  tobiasb
+
+	* bin/initacls.Pg:
+
+	file initacls.Pg was initially added on branch rt-1-1.
+	
+1999-08-03 10:31  tobiasb
+
+	* etc/schema.mysql:
+
+	file schema.mysql was initially added on branch rt-1-1.
+	
+1999-08-03 10:31  tobiasb
+
+	* etc/schema.Pg:
+
+	file schema.Pg was initially added on branch rt-1-1.
+	
+1999-08-03 10:31  tobiasb
+
+	* etc/acl.mysql:
+
+	file acl.mysql was initially added on branch rt-1-1.
+	
+1999-08-03 10:31  tobiasb
+
+	* etc/acl.Pg:
+
+	file acl.Pg was initially added on branch rt-1-1.
+	
+1999-08-03 10:31  tobiasb
+
+	* Makefile, etc/acl.Pg, etc/acl.mysql, etc/mysql.acl, etc/schema,
+	etc/schema.Pg, etc/schema.mysql:
+
+	More work on the move to a DBMS-independent RT. The Makefile and executables _really_ need some testing and eventually debugging.
+	
+1999-08-03 02:14  tobiasb
+
+	* Makefile, etc/config.pm:
+
+	It seems to me that I've somehow managed to go to DBI...WebRT seems to work locally, but that's the only testing I've done
+	
+1999-08-02 07:07  tobiasb
+
+	* etc/schema:
+
+	in-work
+	
+1999-07-29 02:55  tobiasb
+
+	* etc/schema:
+
+	uuuurghh
+	
+1999-07-28 10:42  tobiasb
+
+	* README:
+
+	One small update on the work to link requests...
+	
+1999-07-27 07:08  tobiasb
+
+	* NEWS:
+
+	1.0-gospel
+	
+1999-07-27 06:48  tobiasb
+
+	* etc/schema:
+
+	asdfjlsadfhjkhdfawhi
+	
+1999-07-26 21:21  jesse
+
+	* Makefile, NEWS:
+
+	fixes to the mail gateway header handling
+	added cli rtq flags to the help
+	
+1999-07-26 07:03  tobiasb
+
+	* NEWS:
+
+	Merge
+	
+1999-07-24 20:43  jesse
+
+	* Makefile:
+
+	bumpted the version
+	
+1999-07-24 20:40  jesse
+
+	* NEWS:
+
+	added a few options to the cli query engine. area limitying and display of due dates.
+	
+1999-07-23 03:20  tobiasb
+
+	* NEWS:
+
+	Some merges
+	
+1999-07-23 02:56  tobiasb
+
+	* etc/schema:
+
+	With generic links
+	
+1999-07-22 23:13  jesse
+
+	* Makefile, NEWS:
+
+	22 Jul 99 (Jesse)
+	-----------------
+	Inital cleanup to the web ticket view. I'd like to significantly
+	compact and simplify that display.  More tables are probably in
+	order.  Additionally, I want to get rid of all those buttons "I
+	changed this." There's just no need for them. we can write logic
+	to do that for us.  Also, I bumped the version to 1.1.1.  I'd like
+	to do this 'linux-kernel-esque' The 1.1.x
+	series will be a development series leading toward 1.2.  Once we
+	get the DB changes in, I'll feel comfortable rolling a 'releaseable'
+	1.1 version for people who like pain.
+	
+1999-07-21 23:47  jesse
+
+	* Makefile, NEWS:
+
+	21 July 1999
+	------------
+	
+	Fix for [fsck #102] Better checks in is_not_a_requestor. this should fix
+	        issues with external users being equated with queue members.
+	
+	Fix for [fsck #114] Comment from bin/rt was accidentaly access controlled.
+	
+	Fix for [fsck #113] Display of requests users can't manipulate should now give
+	        ian error
+	
+1999-07-20 23:40  tobiasb
+
+	* etc/schema:
+
+	For a general way of linking WebRT requests to other web-based DBs
+	
+1999-07-20 21:42  tobiasb
+
+	* NEWS:
+
+	[no log message]
+	
+1999-07-20 21:11  tobiasb
+
+	* NEWS:
+
+	Hmf.
+	
+1999-07-20 21:07  tobiasb
+
+	* README, etc/config.pm:
+
+	updated for Internet::Mail
+	
+1999-07-20 21:01  tobiasb
+
+	* Makefile:
+
+	updated for Internet::Mail
+	
+1999-07-20 01:21  jesse
+
+	* NEWS:
+
+	Fix for [fsck #88] WebUI area SELECT bug.
+	
+	Fix for [fsck #90] A small html bug in WebRT
+	
+	Fix for [fsck #92] "Allow non-members to create requests" appeared twice
+	        in the WebAdmin
+	
+	Fix for [fsck #94] web ui forms are now 78 chars wide
+	
+1999-07-20 00:09  jesse
+
+	* NEWS:
+
+	19 July 1999
+	------------
+	Fix for [fsck #104]  We no longer try to reset the user's uid after writing
+	        transaction content to the filesystem. This should help out Net/OpenBSD
+	        compatibility
+	
+	Removed some legacy support for glimpse searching
+	
+	Fix for [fsck #115] The web ticket list should now wrap reasonably, so it's
+	        printable.
+	
+1999-07-19 03:26  tobiasb
+
+	* NEWS:
+
+	some updates
+	
+1999-07-17 13:14  tobiasb
+
+	* NEWS:
+
+	Updated a bit
+	
+1999-07-16 23:42  tobiasb
+
+	* Makefile:
+
+	Version number 1.pre1.1 - what do you think about it?
+	
+1999-07-16 22:49  tobiasb
+
+	* bin/rtmux.pl:
+
+	Filled in a missing comment
+	
+1999-07-16 22:46  tobiasb
+
+	* Makefile:
+
+	Set version to 1.1.0pre1, and changed /opt/rt to /usr/local/rt, I'd
+	daresay the next is more widely preffered.
+	
+1999-07-16 18:36  tobiasb
+
+	* COPYING, Makefile, NEWS, README, README.91UPGRADE, TODO,
+	bin/rtmux.pl, docs/FAQ, docs/FAQ.html, docs/README.docs,
+	docs/actions.html, docs/actions.txt, docs/admin.html,
+	docs/admin.txt, docs/attributes.html, docs/attributes.txt,
+	docs/outline.html, docs/outline.txt, etc/config.pm, etc/mysql.acl,
+	etc/schema, etc/suidrt.c:
+
+	Imported Tobix' current version
+	
+1999-07-08 02:10  jesse
+
+	* Makefile, NEWS, TODO:
+
+	Rolled .99.8
+	
+1999-07-07 15:37  jesse
+
+	* NEWS:
+
+	[no log message]
+	
+1999-07-07 00:45  jesse
+
+	* Makefile, NEWS:
+
+	updated makefile and news.
+	
+1999-07-06 22:58  jesse
+
+	* NEWS:
+
+	6 Jul 99
+	--------
+	Now, if you move a request to a new queue, it won't disown it if the same person can own reqs in the new queue. [fsck #75] (untested)
+	
+	Fixed a problem with cli create not properly handling due dates ([fsck #67])
+	Fixed a duplicate --help entry for bin/rt [fsck #69]
+	Fixed bugs fsck  #68/77: Odness Merging RT requests
+	
+	Transactions from merged requests will now be displayed along with the request id of the request that transaction was originially associated with.
+	
+	Fixed [fsck #74], which was reported by charlie brady:
+	   Messages are sent out from the mail interface with content first, then
+	   "--- Headers Follow ---", then the headers. In our vanilla sendmail setup,
+	   before the headers is a UUCP style deliver notification "From blah Tue Jul
+	   6 18:13:01 1999" line. This is interpreted by many mail agents as a
+	   message delimiter, so that what is seen in the mail agent is not one, but
+	   two messages. This is easily fixed by using the conventional quoting
+	   mechanism...
+	Fixed [fsck #71] WebRT: "User" should be "Requestor"
+	
+1999-07-06 21:35  jesse
+
+	* NEWS:
+
+	resovled #71, #74. worked on merge functionality
+	
+1999-06-29 17:39  jesse
+
+	* Makefile, NEWS:
+
+	[no log message]
+	
+1999-06-29 17:20  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+1999-06-24 00:52  jesse
+
+	* Makefile, NEWS, README, TODO:
+
+	lots of touchups.
+	
+1999-06-23 23:29  jesse
+
+	* NEWS:
+
+	moved to CGI.pm's form parser.
+	
+1999-06-17 01:49  jesse
+
+	* NEWS:
+
+	edited news
+	
+1999-06-16 23:21  jesse
+
+	* Makefile, NEWS:
+
+	Fixed an auth bug.
+	
+1999-06-15 02:13  jesse
+
+	* Makefile:
+
+	upped the version to .99.8pre5
+	
+1999-06-15 02:09  jesse
+
+	* Makefile, NEWS:
+
+	lots of misc changes. see the diff to the news file
+	
+1999-05-12 20:37  jesse
+
+	* Makefile, NEWS:
+
+	cookies hacked to deal with the fact that netscape can't handle path=/
+	
+1999-05-12 01:57  jesse
+
+	* Makefile:
+
+	bumped the version number to .99.8pre3
+	
+1999-05-12 01:56  jesse
+
+	* NEWS:
+
+	Made error messages on the web admin interface more prominent.
+	
+	All the following changes are from tobix:
+	
+		Correspondence from RT now properly reflect the name of the sender
+		in the "from" header.
+	
+		Automated messages now properly have a "Precedence: bulk" header
+	
+		A stupid error with rt::mail_alias has been fixed
+	
+		Tobix' patch removes headers from all correspondence.  I'm relatively
+		afraid of this change, so I'm going to comment it out for now.
+	
+		rtadmin (the commandline has a new tool) :
+		     -update <passwd> <admin> [<users>]  updates user(s) from the
+	                   /etc/passwd file. If no users are specified, ALL
+	                   of /etc/passwd will be processed.
+	
+1999-05-11 16:46  jesse
+
+	* Makefile, NEWS, README:
+
+	mail loop fix from toby
+	
+1999-05-09 20:35  jesse
+
+	* Makefile:
+
+	bumped version numbers
+	
+1999-05-09 20:35  jesse
+
+	* Makefile, NEWS, README:
+
+	updated makefile and news
+	
+1999-05-09 20:17  jesse
+
+	* bin/rtmux.pl:
+
+	modifications to cookies support to md5 hash the password.
+	modification to allow non-nph web ui
+	
+1999-05-05 02:39  jesse
+
+	* NEWS:
+
+	fixed some cookies/frames problems
+	
+1999-05-05 02:10  jesse
+
+	* Makefile, NEWS:
+
+	fixed bugs in web auth from charlie brady
+	
+1999-05-03 21:44  jesse
+
+	* Makefile:
+
+	bumped the version #
+	
+1999-04-28 16:03  jesse
+
+	* Makefile:
+
+	bumped version
+	
+1999-04-28 16:03  jesse
+
+	* NEWS:
+
+	updated content.pm to spit errors.
+	
+1999-04-27 02:58  jesse
+
+	* Makefile:
+
+	downed the makefile version
+	
+1999-04-27 02:57  jesse
+
+	* Makefile:
+
+	fixed a makefile bug
+	
+1999-04-26 21:57  jesse
+
+	* NEWS, README:
+
+	added configuration info about mod_auth_mysql
+	
+1999-04-26 21:45  jesse
+
+	* Makefile, etc/config.pm:
+
+	Updated authetication stuff with patches from ingo. updated them further.
+	Added the ability to configure whether external authentication is done for webrt
+	added the ability to turn off ie compatibility mode
+	
+1999-04-23 19:31  jesse
+
+	* Makefile, NEWS, README, TODO:
+
+	started to update the README and Makefile
+	
+1999-04-13 04:00  jesse
+
+	* Makefile:
+
+	fixed totally fuxored makefile
+	
+1999-04-13 03:28  jesse
+
+	* README:
+
+	noted that there's a dependency on gnu make
+	
+1999-04-13 03:07  jesse
+
+	* Makefile:
+
+	bumped version
+	
+1999-04-13 03:06  jesse
+
+	* NEWS:
+
+	updated news
+	
+1999-04-08 04:36  jesse
+
+	* docs/rt.gif:
+
+	added the gif to the docs
+	
+1999-04-08 04:35  jesse
+
+	* NEWS:
+
+	fixes for new mysql modules
+	
+1999-04-07 23:57  jesse
+
+	* NEWS:
+
+	updates
+	
+1999-04-07 02:14  jesse
+
+	* NEWS:
+
+	[no log message]
+	
+1999-04-07 02:09  jesse
+
+	* Makefile, README:
+
+	fixes for cookie auth from charlie brady
+	
+1999-04-06 06:30  jesse
+
+	* Makefile, NEWS, README:
+
+	misc changes to support cookie authentication
+	
+1999-04-03 04:57  jesse
+
+	* NEWS, docs/FAQ, docs/FAQ.html, docs/README.docs,
+	docs/actions.html, docs/actions.txt, docs/admin.html,
+	docs/admin.txt, docs/attributes.html, docs/attributes.txt,
+	docs/outline.html, docs/outline.txt:
+
+	major update of the docs from adam.
+	
+1999-04-03 04:49  jesse
+
+	* Makefile:
+
+	makefile hackery to ease installs slightly.
+	
+1999-03-21 20:24  jesse
+
+	* Makefile:
+
+	updated makefile
+	
+1999-03-21 20:22  jesse
+
+	* NEWS, README:
+
+	mail changes
+	
+1999-03-08 14:50  jesse
+
+	* NEWS:
+
+	turned off the troll
+	
+1999-03-08 14:02  jesse
+
+	* Makefile:
+
+	fixed makefile bogosity for ACLs
+	
+1999-03-04 01:50  jesse
+
+	* Makefile, NEWS:
+
+	fixed a subject line parsing error.
+	
+1999-02-26 22:29  jesse
+
+	* NEWS:
+
+	added a check to make sure you don't merge ar equest into a non-existent other request
+	
+1999-02-26 21:43  jesse
+
+	* README.91UPGRADE, README.FIRST, TODO:
+
+	moved readme.fdirst to readmne.91upgrade
+	
+1999-02-26 19:59  jesse
+
+	* Makefile, NEWS:
+
+	updated makefile: added upgrade-noclobber
+	
+1999-02-24 19:11  jesse
+
+	* NEWS:
+
+	[no log message]
+	
+1999-02-23 14:41  jesse
+
+	* NEWS:
+
+	updated bnews
+	
+1999-02-23 03:20  jesse
+
+	* docs/: actions.txt, admin.txt, attributes.txt:
+
+	added updates for adam for the docs.
+	
+	updated the news
+	
+1999-02-23 03:20  jesse
+
+	* NEWS:
+
+	updated the news
+	
+1999-02-21 01:56  jesse
+
+	* Makefile:
+
+	fixed the .4
+	
+1999-02-21 01:53  jesse
+
+	* Makefile:
+
+	fixed make pre
+	
+1999-02-20 23:27  jesse
+
+	* Makefile:
+
+	addded back predist
+	
+1999-02-20 16:36  jesse
+
+	* NEWS:
+
+	edited the news to reflect changes
+	
+1999-02-20 14:56  jesse
+
+	* Makefile, NEWS:
+
+	bumped the version to .99.4 for testing.
+	
+1999-02-20 14:48  jesse
+
+	* etc/mysql.acl:
+
+	updated acls so they'll work with newer versions of mysql 3.22
+	
+1999-01-20 02:21  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+1999-01-20 02:13  jesse
+
+	* Makefile:
+
+	On another note, here is a fix for the "HTML turd" reported by Benji
+	Cline in lib/rt/ui/web/forms.pm:
+	==========                                                                      diff -r0.99.2 forms.pm
+	87c87                                                                           <               $u = 0;
+	---                                                                             >               $u = 1;
+	91c91                                                                           <                       $u = 1;                                                 ---                                                                             >                       $u = 0;
+	==========
+	
+	With this patch applied, v0.99.2 (0.99.3?)                                      appears to be as solid as v0.9.18, if not more
+	so.
+	
+	Upgraded the version to .99.3
+	
+1999-01-16 20:44  jesse
+
+	* NEWS:
+
+	[no log message]
+	
+1999-01-16 20:39  jesse
+
+	* Makefile:
+
+	fixed a web acls bug. incremented the version.
+	
+1999-01-16 01:22  jesse
+
+	* Makefile:
+
+	bumped version to .99.1
+	
+1999-01-16 01:20  jesse
+
+	* Makefile, NEWS:
+
+	fixed some web admin sillyness..acls work better.
+	we no longer dump back to the main menu quite as gratuitously.
+	acls are no longer broken on the CLI either.
+	
+1998-12-16 01:31  jesse
+
+	* Makefile:
+
+	fixed the following things:
+	
+	From owner-rt-users@horked.fsck.com  Tue Nov 24 02:24:03 1998
+	Return-Path: <owner-rt-users@lists.fsck.com>
+	Received: (from majordomo@localhost)
+		by horked.fsck.com (8.8.7/8.8.7) id CAA11181
+		for rt-users-outgoing; Tue, 24 Nov 1998 02:24:01 -0500
+	X-Authentication-Warning: horked.fsck.com: majordomo set sender to owner-rt-users@lists.fsck.com using -f
+	Received: from modgud.nordicdms.com (h21-168-107.nordicdms.com [207.21.168.107] (may be forged))
+		by horked.fsck.com (8.8.7/8.8.7) with SMTP id CAA11177
+		for <rt-users@lists.fsck.com>; Tue, 24 Nov 1998 02:23:58 -0500
+	Received: (qmail 6211 invoked by alias); 24 Nov 1998 07:25:59 -0000
+	Message-ID: <19981124072559.6209.qmail@modgud.nordicdms.com>
+	Received: (qmail 6197 invoked from network); 24 Nov 1998 07:25:59 -0000
+	Received: from mail-ftp.nordicdms.com (HELO mail-ftp) (207.21.168.100)
+	  by mail.nordicdms.com with SMTP; 24 Nov 1998 07:25:59 -0000
+	From: "Dave Walton" <walton@nordicdms.com>
+	Organization: Nordic Entertainment Worldwide
+	To: Jesse <jrvincent@wesleyan.edu>, rt-users@lists.fsck.com
+	Date: Mon, 23 Nov 1998 23:25:58 -0800
+	MIME-Version: 1.0
+	Content-type: text/plain; charset=US-ASCII
+	Content-transfer-encoding: 7BIT
+	Subject: Two bugfixes
+	Reply-to: walton@nordicdms.com
+	In-reply-to: <19981013013318.H18644@horked.fsck.com>
+	References: <19981013042506.9798.qmail@modgud.nordicdms.com>; from Dave Walton on Mon, Oct 12, 1998 at 09:25:06PM -0700
+	X-mailer: Pegasus Mail for Win32 (v3.01d)
+	Sender: owner-rt-users@lists.fsck.com
+	Precedence: bulk
+	
+	1.  A backwards search was causing lib/rt/ui/web/support.pm to
+	crash when data that looks like an invalid regex is present in the
+	message headers.
+	------------------------------------------------------------
+	# diff support.old.pm support.pm
+	44c44
+	<               ($headers_ignore !~ /$field/i)) {
+	---
+	>               ($field !~ /$headers_ignore/i)) {
+	------------------------------------------------------------
+	
+	2.  HTML buglet in lib/rt/ui/web/manipulate.pm.
+	------------------------------------------------------------
+	# diff manipulate.old.pm manipulate.pm
+	894c894
+	< <font color=\"\$fg_color\">
+	---
+	> <font color=\"$fg_color\">
+	------------------------------------------------------------
+	
+	Dave
+	
+	----------------------------------------------------------------------
+	Dave Walton
+	Webmaster, Postmaster                   Nordic Entertainment Worldwide
+	walton@nordicdms.com                          http://www.nordicdms.com
+	----------------------------------------------------------------------
+	
+	From benji@hnt.com  Fri Nov 20 14:28:44 1998
+	Return-Path: <benji@hnt.com>
+	Received: from horked.fsck.com (jesse@localhost [127.0.0.1])
+		by horked.fsck.com (8.8.7/8.8.7) with ESMTP id OAA04739
+		for <jesse@localhost>; Fri, 20 Nov 1998 14:28:44 -0500
+	Received: from mail.wesleyan.edu
+		by horked.fsck.com (fetchmail-4.3.2 POP3 run by jrvincent)
+		for <jesse@localhost> (single-drop); Fri Nov 20 14:28:44 1998
+	Received: from columbus.hnt.com (columbus.hnt.com [208.221.11.10]) by mail.wesleyan.edu (8.8.6/8.7.3) with ESMTP id OAA18408 for <jrvincent@wesleyan.edu>; Fri, 20 Nov 1998 14:30:34 -0500 (EST)
+	Received: from peppermint.hnt.com (peppermint.hnt.com [208.221.11.51])
+		by columbus.hnt.com (8.9.1/8.9.1/HnT-980729) with ESMTP id OAA26134
+		for <jrvincent@wesleyan.edu>; Fri, 20 Nov 1998 14:30:32 -0500 (EST)
+	Received: from localhost by peppermint.hnt.com (8.9.1/8.9.1/HnT-nullclient-980724) with ESMTP id OAA02733
+		for <jrvincent@wesleyan.edu>; Fri, 20 Nov 1998 14:30:32 -0500 (EST)
+	X-Authentication-Warning: peppermint.hnt.com: benji owned process doing -bs
+	Date: Fri, 20 Nov 1998 14:30:31 -0500 (EST)
+	From: Benjamin Cline <benji@hnt.com>
+	To: Jesse <jrvincent@mail.wesleyan.edu>
+	Subject: Re: 0.9.20 is out
+	In-Reply-To: <19981120005718.F28841@horked.fsck.com>
+	Message-ID: <Pine.GSO.4.05.9811201427100.2438-100000@peppermint.hnt.com>
+	MIME-Version: 1.0
+	Content-Type: TEXT/PLAIN; charset=US-ASCII
+	X-UIDL: 4f1695a69f7cdbefcfce9198121fef95
+	
+	I think I've found a buglet in 0.9.20, I had to add an extra curly bracket
+	("}") to the end of lib/rt/database/admin.pm (just before the "1;") to get
+	it to work right.
+	
+		benji
+	
+	P.S. Sorry if that's not the most coherent bug report/fix, I'm afraid I'm
+	not much of a perl hacker.
+	
+	On Fri, 20 Nov 1998, Jesse wrote:
+	
+	> ftp://horked.fsck.com/pub/rt/devel/rt-0.9.20.tar.gz
+	>
+	> 19 Nov 98
+	> ---------
+	>
+	> Incorportated patches from Dave Walton to fix a typo, replace an
+	> accidentally
+	> blown away library and add a "last acted" column to the web ui.
+	> incremented version to .9.20
+	>
+	>
+	> 	jesse
+	>
+	> --
+	> jesse reed vincent -- jrvincent@wesleyan.edu -- jesse@fsck.com
+	> pgp keyprint:  50 41 9C 03 D0 BC BC C8 2C B9 77 26 6F E1 EB 91
+	> --------------------------------------------------------------
+	> They'll take my private key when they pry it from my cold dead fingers!
+	>
+	
+	--
+	Benjamin R. Cline       Harrison & Troxell, Inc.         benji@hnt.com
+	                     Quis Custodiet Ipsos Custodes?
+	
+	From adam@baz.org  Fri Nov 13 17:07:09 1998
+	Return-Path: <adam@baz.org>
+	Received: from horked.fsck.com (jesse@localhost [127.0.0.1])
+		by horked.fsck.com (8.8.7/8.8.7) with ESMTP id RAA10943
+		for <jesse@localhost>; Fri, 13 Nov 1998 17:07:09 -0500
+	Received: from mail.wesleyan.edu
+		by horked.fsck.com (fetchmail-4.3.2 POP3 run by jrvincent)
+		for <jesse@localhost> (single-drop); Fri Nov 13 17:07:09 1998
+	Received: from impei.baz.org (adam@impei.baz.org [139.167.64.229]) by mail.wesleyan.edu (8.8.6/8.7.3) with ESMTP id RAA08425 for <jrvincent@wesleyan.edu>; Fri, 13 Nov 1998 17:08:38 -0500 (EST)
+	Received: (from adam@localhost)
+		by impei.baz.org (8.8.7/8.8.8) id RAA18674
+		for jrvincent@wesleyan.edu; Fri, 13 Nov 1998 17:08:38 -0500
+	Message-ID: <19981113170837.A18668@baz.org>
+	Date: Fri, 13 Nov 1998 17:08:37 -0500
+	From: secret agent man <adam@baz.org>
+	To: "J.R.Ewing" <jrvincent@mail.wesleyan.edu>
+	Subject: RT bug, mebbe?
+	Mime-Version: 1.0
+	X-Mailer: Mutt 0.93.2i
+	Content-Type: text/plain; charset=us-ascii
+	X-UIDL: 5563064ca159a5eee88e16843932a45f
+	
+	<jailbait> q: If you leave the field blank when clicking on "create new
+	(queue|user) named", it goes to the create screen with an empty field that
+	can't be filled. It should either be editable there or it should reject
+	you.
+	
+	A
+	
+	--
+	Everything I needed to know about life I learned       <adam@baz.org>
+	from killing smarter people and eating their brains.    adam hirsch
+	
+1998-11-20 00:45  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+1998-11-20 00:28  jesse
+
+	* Makefile, NEWS:
+
+	19 Nov 98
+	---------
+	
+	Incorportated patches from Dave Walton to fix a typo, replace an accidentally
+	blown away library and add a "last acted" column to the web ui.
+	incremented version to .9.20
+	
+1998-11-18 02:26  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+1998-10-13 03:37  jesse
+
+	* Makefile, README, etc/mysql.acl:
+
+	shiny:% cat >> changes                                          ~ 10:53PM:tt
+	2.  Made comments and replies update date_acted.
+	
+	        -- Dave Walton
+	
+	Ok.. I know this is being picky, but, in rt/lib/ui/web/support.pm, the
+	subroutine "content_header", at line 290, should have:
+	    print "<head><title>WebRT</title></head>\n";
+	
+	Otherwise, when running in frames, you never get a title on the page. :(
+	
+	No biggie...
+	
+	-Rich
+	
+	Oh, one other.
+	
+	8.  etc/mysql.acl, line 5
+	The RT_MYSQL_HOST entry on that line doesn't make any sense
+	when MySQL is on a different host than RT.  That should be
+	RT_HOST, or some such thing.
+	
+	Dave
+	
+	After just upgrading to Apache 1.3.0 from 1.2.5, I figured I would make it
+	known that, in the file <apache_src_dir>/src/main/util_script.c, you have
+	to define SECURITY_HOLE_PASS_AUTHORIZATION to allow for RT's authorization
+	to work properly.
+	-Rich
+	
+	On Tue, Oct 06, 1998 at 09:19:07PM -0700, Dave Walton wrote:
+	> I just discovered that if there is an error in add_correspondence, the
+	> mail interface discards the incoming mail without comment.  To
+	> correct this, I took the following steps:
+	>
+	In mail.pm, there's a space before :
+	
+	From: $rt::mail_alias
+	
+	This causes problems in some mail clients, putting the From: line on the
+	same line as the subject.  If the spaces are removed this is fixed.
+	
+	Regards,
+	From: "Andrew Foster" <adf@fl.net.au>
+	
+1998-09-11 01:15  jesse
+
+	* docs/README.docs:
+
+	updated lists for rt docs.
+	
+1998-09-08 03:23  jesse
+
+	* NEWS:
+
+	updated news
+	
+1998-09-08 03:18  jesse
+
+	* Makefile, NEWS, README, etc/config.pm:
+
+	Final bug fixes for .9.18
+	
+1998-08-09 17:43  jesse
+
+	* NEWS, README, TODO:
+
+	All kinds of crazy updates for .9.18. Mostly from serge zhuk
+	
+1998-08-04 03:09  jesse
+
+	* NEWS:
+
+	first round of updates from serge
+	
+1998-06-26 17:07  jesse
+
+	* Makefile, NEWS:
+
+	modified makefile and news
+	
+1998-06-26 16:34  jesse
+
+	* docs/: README.docs, actions.txt, admin.txt, attributes.txt,
+	outline.txt:
+
+	Added documentation from <adam@apocalypse.org>
+	
+1998-06-25 17:06  jesse
+
+	* Makefile, README, etc/config.pm:
+
+	removed refs to glimpse
+	
+1998-06-25 15:46  jesse
+
+	* Makefile:
+
+	dist fixes
+	
+1998-06-25 15:44  jesse
+
+	* Makefile:
+
+	dist fixes
+	
+1998-06-25 14:09  jesse
+
+	* Makefile:
+
+	edited dist. maker
+	
+1998-05-21 22:40  jesse
+
+	* Makefile:
+
+	added httpd.conf configurator for cern
+	
+1998-04-27 20:17  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+1998-04-20 14:53  jesse
+
+	* Makefile:
+
+	bumped version to .9.14.
+	
+1998-04-20 14:53  jesse
+
+	* Makefile:
+
+	bumped version to .9.13.1
+	
+1998-04-19 03:14  jesse
+
+	* Makefile:
+
+	updated version number.
+	now explicitly create rt-etc-dir
+	
+1998-04-16 21:40  jesse
+
+	* bin/rtmux.pl:
+
+	removed a spurious addition to the lib path from the mux
+	abstracted a bunch of stuff out of the mux and throughout the makefile.
+	like program names.
+	
+1998-04-16 21:39  jesse
+
+	* Makefile:
+
+	abstracted a bunch of stuff out of the mux and throughout the makefile.
+	like program names.
+	
+1998-04-16 19:47  jesse
+
+	* COPYING, Makefile, NEWS, README, README.FIRST, TODO:
+
+	commiting updates
+	
+1998-04-08 13:35  jesse
+
+	* etc/config.pm:
+
+	fixed typos in config.pm that prevented mail from working with .9.11
+	bumped version to .12
+	
+1998-04-08 13:34  jesse
+
+	* Makefile:
+
+	bumped version to .12
+	
+1998-04-02 21:30  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+1998-04-02 21:27  jesse
+
+	* Makefile:
+
+	fixed make dist
+	
+1998-04-02 15:36  jesse
+
+	* Makefile, Makefile:
+
+	[no log message]
+	
+1998-04-02 15:29  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+1998-04-02 15:25  jesse
+
+	* etc/config.pm:
+
+	split mail program and mail program flags
+	hopefully fixed make dist
+	
+1998-04-02 15:25  jesse
+
+	* Makefile:
+
+	hopefully fixed make dist
+	
+1998-04-02 11:02  jesse
+
+	* Makefile, NEWS:
+
+	updated news
+	
+1998-04-02 10:55  jesse
+
+	* Makefile:
+
+	[no log message]
+	
+1998-04-02 10:31  jesse
+
+	* etc/config.pm:
+
+	reshuffled files that the user won't be changing out of etc and into lib
+	this includes generic templates and images for the web ui
+	updated src and makefiles accordingly.
+	verbosifoed part of config.pm
+	
+1998-04-02 10:31  jesse
+
+	* Makefile:
+
+	reshuffled files that the user won't be changing out of etc and into lib
+	this includes generic templates and images for the web ui
+	updated src and makefiles accordingly.
+	
+1998-04-02 10:20  jesse
+
+	* Makefile:
+
+	built more auto-dist stuff
+	
+1998-04-02 03:22  jesse
+
+	* README:
+
+	added apache patch to readme
+	
+1998-04-02 03:13  jesse
+
+	* Makefile, README, TODO, etc/config.pm:
+
+	updated makefile and readme and todo
+	added toggle for mysql 3.21
+	moved sendmail flags to makefile for compat w 8.6
+	
+1998-02-08 21:12  jesse
+
+	* Makefile:
+
+	make upgrade now calls mux-install
+	
+1998-01-30 22:31  jesse
+
+	* Makefile, README, README.FIRST:
+
+	added bits to upgrade from .9.1
+	made make upgrade upgrade the conf file
+	
+1998-01-27 01:56  jesse
+
+	* NEWS:
+
+	updated news
+	
+1998-01-27 01:48  jesse
+
+	* Makefile:
+
+	started a make dist
+	
+1998-01-26 17:59  jesse
+
+	* Makefile, README, README.FIRST:
+
+	updated readme
+	
+1998-01-21 18:37  jesse
+
+	* Makefile:
+
+	fixes to makefile to allow for proper specification of database as local.
+	added "you are logged in as..." to web/support...
+	changed sendmail options in mail.pm/
+	
+1998-01-14 23:49  jesse
+
+	* Makefile, etc/mysql.acl:
+
+	incremented version number
+	
+1998-01-09 14:48  jesse
+
+	* bin/rtmux.pl:
+
+	added taint safeness for $ENV{'ENV}
+	updated makefile version number
+	
+1998-01-09 14:47  jesse
+
+	* Makefile:
+
+	updated makefile version number
+	
+1998-01-08 16:17  jesse
+
+	* README.FIRST:
+
+	ipdated readme.first.
+	
+1998-01-08 14:53  jesse
+
+	* etc/suidrt.c:
+
+	made suidrt.c work
+	updated the mux
+	
+1998-01-08 14:53  jesse
+
+	* bin/rtmux.pl:
+
+	updated the mux
+	
+1998-01-08 13:10  jesse
+
+	* Makefile:
+
+	more fixes to make suid wrapper stuff work.
+	
+1998-01-08 12:51  jesse
+
+	* bin/rtmux.pl:
+
+	made rtmux attempt to work with the suid wrapper
+	
+1998-01-08 12:48  jesse
+
+	* etc/suidrt.c:
+
+	added back suidrt.c. blech.
+	
+1998-01-08 12:44  jesse
+
+	* Makefile, bin/rtmux.pl:
+
+	brought back suidrt.c
+	bleck.
+	
+1998-01-07 18:06  jesse
+
+	* Makefile:
+
+	added a sane mode for $(RT_PATH)
+	
+1998-01-07 00:37  jesse
+
+	* Makefile, README.FIRST:
+
+	added basic old upgrade instructions.
+	added info to README.FIRST about upgrading.
+	
+1998-01-07 00:31  jesse
+
+	* bin/rtmux.pl:
+
+	made mailing work.
+	
+1998-01-06 10:27  jesse
+
+	* bin/rtmux.pl:
+
+	made the mux require ui::mail before it tried to invoke it.
+	
+1998-01-04 02:26  jesse
+
+	* README:
+
+	told users to read readme.first.
+	
+1998-01-04 02:25  jesse
+
+	* README, README.FIRST:
+
+	added readme.first
+	
+1998-01-04 02:12  jesse
+
+	* Makefile:
+
+	updated webadmin interface. fixed some logout problems. fixed an html bug in web-manip.
+	
+1998-01-02 01:14  jesse
+
+	* Makefile, bin/rtmux.pl:
+
+	fixed more problems w/ making cliadmin run
+	merged mux-install and mux-links into one section of makefile
+	
+1998-01-02 00:59  jesse
+
+	* Makefile, NEWS, README, TODO, bin/rtmux.pl, etc/config.pm:
+
+	fixed typo in Makefile: install-libs -> libs-install
+	
+1998-01-01 03:07  jesse
+
+	* Makefile, bin/rtmux.pl:
+
+	commented makefile better
+	added more stuff for taint checks to rtmux.pl
+	fixed a non-frames web bug in FormComment
+	
+1997-12-31 01:55  jesse
+
+	* Makefile, bin/rtmux.pl, etc/config.pm:
+
+	lots of cleanup to get web interface running.
+	beginnigs of taint-safe scripts.
+	
+1997-12-30 23:49  jesse
+
+	* Makefile, bin/rtmux.pl:
+
+	cleanup in cli admin.pm, cli query.pm, the mux, the makefile
+	database routines now assign an effective serial # to a request when you get
+	the fact's serial number
+	
+1997-12-30 22:56  jesse
+
+	* Makefile, README, bin/rtmux.pl:
+
+	remodded rtmux to use correct vars for command line arguments.
+	moved RT_VERSION to makefile.
+	updated README for new install procedure
+	
+1997-12-30 01:09  jesse
+
+	* Makefile, etc/config.pm, etc/mysql.acl:
+
+	fixed typo in web/admin.pm
+	set up config.pm mysql.acl and rtmux.pl to get themselves parsed from the makefile.
+	removed last vestiges of C
+	
+1997-12-28 18:59  jesse
+
+	* Makefile, etc/schema:
+
+	removed suidrt for a preparation to move to a c-free system
+	added provisions for token-parsing to makefile
+	
+1997-12-28 03:10  jesse
+
+	* etc/schema:
+
+	added tags to schema
+	
+1997-12-28 02:48  jesse
+
+	* Makefile:
+
+	started to modify toplevel makefile
+	
+1997-12-19 03:04  jesse
+
+	* lib/rtmux.pl:
+
+	moved the executable rtmux.pl to bin, where it belongs.
+	made sure bin/cgi gets created on checkout
+	
+1997-12-19 03:03  jesse
+
+	* bin/rtmux.pl:
+
+	moved the executable rtmux.pl to bin, where it belongs.
+	
+1997-12-18 19:05  jesse
+
+	* lib/rtmux.pl:
+
+	worked on the mux
+	
+1997-12-09 15:14  jesse
+
+	* TODO:
+
+	added things for v1.0 to the todo list
+	
+1997-12-09 02:03  jesse
+
+	* etc/config.pm:
+
+	broke configuration out into config.pm
+	
+1997-12-09 01:54  jesse
+
+	* COPYING, Makefile, NEWS, README, TODO, etc/mysql.acl, etc/schema:
+
+	initial commit after i nuked the repository
+	
+1997-12-09 01:54  jesse
+
+	* COPYING, Makefile, NEWS, README, TODO, etc/mysql.acl, etc/schema:
+
+	Initial revision
+	
diff --git a/rt/Makefile b/rt/Makefile
new file mode 100644
index 000000000..fe01b71c1
--- /dev/null
+++ b/rt/Makefile
@@ -0,0 +1,418 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/Makefile,v 1.1 2002-08-12 06:17:06 ivan Exp $
+# RT is Copyright 1996-2002 Jesse Vincent <jesse@bestpractical.com>
+# It is distributed under the terms of the GNU General Public License, version 2
+
+PERL			= 	/usr/bin/perl
+
+RT_VERSION_MAJOR	=	2
+RT_VERSION_MINOR	=	0
+RT_VERSION_PATCH	=	14
+
+
+RT_VERSION =	$(RT_VERSION_MAJOR).$(RT_VERSION_MINOR).$(RT_VERSION_PATCH)
+TAG 	   =	rt-$(RT_VERSION_MAJOR)-$(RT_VERSION_MINOR)-$(RT_VERSION_PATCH)
+
+BRANCH			=	HEAD
+
+# This is the group that all of the installed files will be chgrp'ed to.
+RTGROUP			=	rt
+
+
+# User which should own rt binaries.
+BIN_OWNER		=	root
+
+# User that should own all of RT's libraries, generally root.
+LIBS_OWNER 		=	root
+
+# Group that should own all of RT's libraries, generally root.
+LIBS_GROUP		=	bin
+
+
+
+# {{{ Files and directories 
+
+# DESTDIR allows you to specify that RT be installed somewhere other than
+# where it will eventually reside
+
+DESTDIR			=	
+
+
+# RT_PATH is the name of the directory you want make to install RT in
+# RT must be installed in its own directory (don't set this to /usr/local)
+
+RT_PATH			=	/opt/rt2
+
+# The rest of these paths are all configurable, but you probably don't want to 
+# put them elsewhere
+
+RT_LIB_PATH		=	$(RT_PATH)/lib
+RT_ETC_PATH		=	$(RT_PATH)/etc
+RT_CONFIG_PATH		=	$(RT_ETC_PATH)
+RT_BIN_PATH		=	$(RT_PATH)/bin
+RT_MAN_PATH		=	$(RT_PATH)/man
+MASON_HTML_PATH		=	$(RT_PATH)/WebRT/html
+
+
+# RT allows sites to overlay the default web ui with 
+# local customizations Those files can be placed in MASON_LOCAL_HTML_PATH
+
+MASON_LOCAL_HTML_PATH	=	$(RT_PATH)/local/WebRT/html
+
+# RT needs to be able to write to MASON_DATA_PATH and MASON_SESSION_PATH
+# RT will create and chown these directories. Don't just set them to /tmp
+MASON_DATA_PATH		=       $(RT_PATH)/WebRT/data
+MASON_SESSION_PATH	=       $(RT_PATH)/WebRT/sessiondata
+
+RT_LOG_PATH             =       /tmp
+
+# RT_READABLE_DIR_MODE is the mode of directories that are generally meant
+# to be accessable
+RT_READABLE_DIR_MODE	=	0755
+
+
+
+# The location of your rt configuration file
+RT_CONFIG		=	$(RT_CONFIG_PATH)/config.pm
+
+# RT_MODPERL_HANDLER is the mason handler script for mod_perl
+RT_MODPERL_HANDLER	=	$(RT_BIN_PATH)/webmux.pl
+
+# RT_FASTCGI_HANDLER is the mason handler script for FastCGI
+# THIS HANDLER IS NOT CURRENTLY SUPPORTED
+RT_FASTCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.fcgi
+
+# RT_SPEEDYCGI_HANDLER is the mason handler script for SpeedyCGI
+# THIS HANDLER IS NOT CURRENTLY SUPPORTED
+RT_SPEEDYCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.scgi
+
+# The following are the names of the various binaries which make up RT 
+
+RT_CLI_BIN		=	$(RT_BIN_PATH)/rt
+RT_CLI_ADMIN_BIN	=	$(RT_BIN_PATH)/rtadmin
+RT_MAILGATE_BIN		=	$(RT_BIN_PATH)/rt-mailgate
+
+# }}}
+
+# {{{ Database setup
+
+#
+# DB_TYPE defines what sort of database RT trys to talk to
+# "mysql" is known to work.
+# "Pg" is known to work
+# "Oracle" is in the early stages of working.
+
+DB_TYPE			=	mysql
+
+# DB_HOME is where the Database's commandline tools live.  $DB_HOME/bin
+# should contain the binaries themselves, e.g. if "which mysql" gives
+# "/usr/local/mysql/bin/mysql", $DB_HOME should be "/usr/local/mysql"
+
+DB_HOME			= /usr
+
+# Set DBA to the name of a unix account with the proper permissions and 
+# environment to run your commandline SQL tools
+
+# Set DB_DBA to the name of a DB user with permission to create new databases 
+# Set DB_DBA_PASSWORD to that user's password (if you don't, you'll be prompted
+# later)
+
+# For mysql, you probably want 'root'
+# For Pg, you probably want 'postgres' 
+# For oracle, you want 'system'
+
+DB_DBA			=	root
+DB_DBA_PASSWORD		=	
+ 
+#
+# Set this to the Fully Qualified Domain Name of your database server.
+# If the database is local, rather than on a remote host, using "localhost" 
+# will greatly enhance performance.
+
+DB_HOST			=	localhost
+
+# If you're not running your database server on its default port, 
+# specifiy the port the database server is running on below.
+# It's generally safe to leave this blank 
+
+DB_PORT			=	
+
+#
+# Set this to the canonical name of the interface RT will be talking to the 
+# database on.  If you said that the RT_DB_HOST above was "localhost," this 
+# should be too. This value will be used to grant rt access to the database.
+# If you want to access the RT database from multiple hosts, you'll need
+# to grant those database rights by hand.
+#
+
+DB_RT_HOST		=	localhost
+
+# set this to the name you want to give to the RT database in 
+# your database server. For Oracle, this should be the name of your sid
+
+DB_DATABASE		=	rt2
+
+# Set this to the name of the rt database user
+
+DB_RT_USER		=	rt_user
+
+# Set this to the password used by the rt database user
+# *** Change This Before Installation***
+
+DB_RT_PASS		=	rt_pass
+
+# }}}
+
+# {{{ Web configuration 
+
+# The user your webserver runs as. needed so that webrt can cache mason
+# objectcode
+
+WEB_USER		=	www
+WEB_GROUP		=	rt
+
+# }}}
+
+
+####################################################################
+# No user servicable parts below this line.  Frob at your own risk #
+####################################################################
+
+default:
+	@echo "Please read RT's readme before installing. Not doing so could"
+	@echo "be dangerous."
+
+install: dirs initialize.$(DB_TYPE) upgrade insert instruct
+
+instruct:
+	@echo "Congratulations. RT has been installed. "
+	@echo "You must now configure it by editing $(RT_CONFIG)."
+	@echo "From here on in, you should refer to the users guide."
+
+
+insert: insert-install
+	$(PERL) -I$(DESTDIR)/$(RT_ETC_PATH) -I$(DESTDIR)/$(RT_LIB_PATH) $(DESTDIR)/$(RT_ETC_PATH)/insertdata
+
+upgrade: dirs config-replace upgrade-noclobber  upgrade-instruct
+
+upgrade-instruct: 
+	@echo "Congratulations. RT has been upgraded. You should now check-over"
+	@echo "$(RT_CONFIG) for any necessary site customization. Additionally,"
+	@echo "you should update RT's system database objects by running "
+	@echo "	   $(RT_ETC_PATH)/insertdata <version>"
+	@echo "where <version> is the version of RT you're upgrading from."
+
+upgrade-noclobber: insert-install libs-install html-install bin-install nondestruct
+
+nondestruct: fixperms
+
+testdeps:
+	$(PERL) ./tools/testdeps -warn $(DB_TYPE)
+
+fixdeps:
+	$(PERL) ./tools/testdeps -fix $(DB_TYPE)
+
+
+
+all:
+	@echo "Read the readme."
+
+fixperms:
+	# Make the libraries readable
+	chmod -R $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_PATH)
+	chown -R $(LIBS_OWNER) $(DESTDIR)/$(RT_LIB_PATH)
+	chgrp -R $(LIBS_GROUP) $(DESTDIR)/$(RT_LIB_PATH)
+
+	chown -R $(BIN_OWNER) $(DESTDIR)/$(RT_BIN_PATH)
+	chgrp -R $(RTGROUP) $(DESTDIR)/$(RT_BIN_PATH)
+
+
+	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_BIN_PATH)
+	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_BIN_PATH)	
+
+	chmod 0755 $(DESTDIR)/$(RT_ETC_PATH)
+	chmod 0500 $(DESTDIR)/$(RT_ETC_PATH)/*
+
+	#TODO: the config file should probably be able to have its
+	# owner set seperately from the binaries.
+	chown -R $(BIN_OWNER) $(DESTDIR)/$(RT_ETC_PATH)
+	chgrp -R $(RTGROUP) $(DESTDIR)/$(RT_ETC_PATH)
+
+	chmod 0550 $(DESTDIR)/$(RT_CONFIG)
+
+	# Make the interfaces executable and setgid rt
+	chown $(BIN_OWNER) $(DESTDIR)/$(RT_MAILGATE_BIN) \
+			$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
+			$(DESTDIR)/$(RT_SPEEDYCGI_HANDLER) \
+			$(DESTDIR)/$(RT_CLI_BIN) \
+			$(DESTDIR)/$(RT_CLI_ADMIN_BIN)
+
+	chgrp $(RTGROUP) $(DESTDIR)/$(RT_MAILGATE_BIN) \
+			$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
+			$(DESTDIR)/$(RT_SPEEDYCGI_HANDLER) \
+			$(DESTDIR)/$(RT_CLI_BIN) \
+			$(DESTDIR)/$(RT_CLI_ADMIN_BIN)
+
+	chmod 0755  	$(DESTDIR)/$(RT_MAILGATE_BIN) \
+			$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
+			$(DESTDIR)/$(RT_SPEEDYCGI_HANDLER) \
+			$(DESTDIR)/$(RT_CLI_BIN) \
+			$(DESTDIR)/$(RT_CLI_ADMIN_BIN)
+
+	chmod g+s 	$(DESTDIR)/$(RT_MAILGATE_BIN) \
+			$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
+			$(DESTDIR)/$(RT_SPEEDYCGI_HANDLER) \
+			$(DESTDIR)/$(RT_CLI_BIN) \
+			$(DESTDIR)/$(RT_CLI_ADMIN_BIN)
+
+	# Make the web ui readable by all. 
+	chmod -R  u+rwX,go-w,go+rX 	$(DESTDIR)/$(MASON_HTML_PATH) \
+					$(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
+	chown -R $(LIBS_OWNER) 	$(DESTDIR)/$(MASON_HTML_PATH) \
+				$(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
+	chgrp -R $(LIBS_GROUP) 	$(DESTDIR)/$(MASON_HTML_PATH) \
+				$(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
+
+	# Make the web ui's data dir writable
+	chmod 0770  	$(DESTDIR)/$(MASON_DATA_PATH) \
+			$(DESTDIR)/$(MASON_SESSION_PATH)
+	chown -R $(WEB_USER) 	$(DESTDIR)/$(MASON_DATA_PATH) \
+				$(DESTDIR)/$(MASON_SESSION_PATH)
+	chgrp -R $(WEB_GROUP) 	$(DESTDIR)/$(MASON_DATA_PATH) \
+				$(DESTDIR)/$(MASON_SESSION_PATH)
+dirs:
+	mkdir -p $(DESTDIR)/$(RT_BIN_PATH)
+	mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)
+	mkdir -p $(DESTDIR)/$(MASON_SESSION_PATH)
+	mkdir -p $(DESTDIR)/$(RT_ETC_PATH)
+	mkdir -p $(DESTDIR)/$(RT_LIB_PATH)
+	mkdir -p $(DESTDIR)/$(MASON_HTML_PATH)
+	mkdir -p $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
+
+libs-install: 
+	[ -d $(DESTDIR)/$(RT_LIB_PATH) ] || mkdir $(DESTDIR)/$(RT_LIB_PATH)
+	chown -R $(LIBS_OWNER) $(DESTDIR)/$(RT_LIB_PATH)
+	chgrp -R $(LIBS_GROUP) $(DESTDIR)/$(RT_LIB_PATH)
+	chmod -R $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_LIB_PATH)
+	( cd ./lib; \
+	  $(PERL) Makefile.PL INSTALLSITELIB=$(DESTDIR)/$(RT_LIB_PATH) \
+			      INSTALLMAN1DIR=$(DESTDIR)/$(RT_MAN_PATH)/man1 \
+			      INSTALLMAN3DIR=$(DESTDIR)/$(RT_MAN_PATH)/man3 \
+	    && make \
+	    && make test \
+	    && $(PERL) -p -i -e " s'!!RT_VERSION!!'$(RT_VERSION)'g;" blib/lib/RT.pm ;\
+	    make install \
+			   INSTALLSITEMAN1DIR=$(DESTDIR)/$(RT_MAN_PATH)/man1 \
+			   INSTALLSITEMAN3DIR=$(DESTDIR)/$(RT_MAN_PATH)/man3 \
+	)
+
+html-install:
+	cp -rp ./webrt/* $(DESTDIR)/$(MASON_HTML_PATH)
+
+
+
+genschema:
+	$(PERL)	tools/initdb '$(DB_TYPE)' '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_DBA)' '$(DB_DATABASE)' generate
+
+
+initialize.Pg: createdb initdb.dba acls 
+
+initialize.mysql: createdb acls initdb.rtuser
+
+initialize.Oracle: acls initdb.rtuser
+
+acls:
+	cp etc/acl.$(DB_TYPE) '$(DESTDIR)/$(RT_ETC_PATH)/acl.$(DB_TYPE)'
+	$(PERL) -p -i -e " s'!!DB_TYPE!!'"$(DB_TYPE)"'g;\
+				s'!!DB_HOST!!'"$(DB_HOST)"'g;\
+				s'!!DB_RT_PASS!!'"$(DB_RT_PASS)"'g;\
+				s'!!DB_RT_HOST!!'"$(DB_RT_HOST)"'g;\
+				s'!!DB_RT_USER!!'"$(DB_RT_USER)"'g;\
+				s'!!DB_DATABASE!!'"$(DB_DATABASE)"'g;" $(DESTDIR)/$(RT_ETC_PATH)/acl.$(DB_TYPE)
+	bin/initacls.$(DB_TYPE) '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_DBA)' '$(DB_DBA_PASSWORD)' '$(DB_DATABASE)' '$(DESTDIR)/$(RT_ETC_PATH)/acl.$(DB_TYPE)' 
+
+
+
+dropdb: 
+	$(PERL)	tools/initdb '$(DB_TYPE)' '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_DBA)' '$(DB_DATABASE)' drop
+
+
+createdb: 
+	$(PERL)	tools/initdb '$(DB_TYPE)' '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_DBA)' '$(DB_DATABASE)' create
+initdb.dba:
+	$(PERL)	tools/initdb '$(DB_TYPE)' '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_DBA)' '$(DB_DATABASE)' insert
+
+initdb.rtuser:
+	$(PERL)	tools/initdb '$(DB_TYPE)' '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_RT_USER)' '$(DB_DATABASE)' insert
+
+
+
+insert-install:
+	cp -rp ./tools/insertdata \
+		 $(DESTDIR)/$(RT_ETC_PATH)
+	$(PERL) -p -i -e " s'!!RT_ETC_PATH!!'$(RT_ETC_PATH)'g;\
+		           s'!!RT_LIB_PATH!!'$(RT_LIB_PATH)'g;"\
+		$(DESTDIR)/$(RT_ETC_PATH)/insertdata
+
+bin-install:
+	cp -p ./bin/webmux.pl $(DESTDIR)/$(RT_MODPERL_HANDLER)
+	cp -p ./bin/rt-mailgate $(DESTDIR)/$(RT_MAILGATE_BIN)
+	cp -p ./bin/rtadmin $(DESTDIR)/$(RT_CLI_ADMIN_BIN)
+	cp -p ./bin/rt $(DESTDIR)/$(RT_CLI_BIN)
+	cp -p ./bin/mason_handler.fcgi $(DESTDIR)/$(RT_FASTCGI_HANDLER)
+	cp -p ./bin/mason_handler.scgi $(DESTDIR)/$(RT_SPEEDYCGI_HANDLER)
+
+	$(PERL) -p -i -e "s'!!RT_PATH!!'"$(RT_PATH)"'g;\
+				s'!!PERL!!'"$(PERL)"'g;\
+			      	s'!!RT_VERSION!!'"$(RT_VERSION)"'g;\
+				s'!!RT_ETC_PATH!!'"$(RT_CONFIG_PATH)"'g;\
+				s'!!RT_LIB_PATH!!'"$(RT_LIB_PATH)"'g;"\
+		$(DESTDIR)/$(RT_MODPERL_HANDLER) \
+		$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
+		$(DESTDIR)/$(RT_SPEEDYCGI_HANDLER) \
+		$(DESTDIR)/$(RT_CLI_BIN) \
+		$(DESTDIR)/$(RT_CLI_ADMIN_BIN) \
+		$(DESTDIR)/$(RT_MAILGATE_BIN)
+
+
+config-replace:
+	-[ -f $(DESTDIR)/$(RT_CONFIG) ] && \
+		mv $(DESTDIR)/$(RT_CONFIG) $(DESTDIR)/$(RT_CONFIG).old && \
+	 	chmod 000 $(DESTDIR)/$(RT_CONFIG).old
+	cp -rp ./etc/config.pm $(DESTDIR)/$(RT_CONFIG)
+	$(PERL) -p -i -e "\
+	s'!!DB_TYPE!!'"$(DB_TYPE)"'g;\
+	s'!!DB_HOST!!'"$(DB_HOST)"'g;\
+	s'!!DB_PORT!!'"$(DB_PORT)"'g;\
+	s'!!DB_RT_PASS!!'"$(DB_RT_PASS)"'g;\
+	s'!!DB_RT_USER!!'"$(DB_RT_USER)"'g;\
+	s'!!DB_DATABASE!!'"$(DB_DATABASE)"'g;\
+	s'!!MASON_HTML_PATH!!'"$(MASON_HTML_PATH)"'g;\
+	s'!!MASON_LOCAL_HTML_PATH!!'"$(MASON_LOCAL_HTML_PATH)"'g;\
+	s'!!MASON_SESSION_PATH!!'"$(MASON_SESSION_PATH)"'g;\
+	s'!!MASON_DATA_PATH!!'"$(MASON_DATA_PATH)"'g;\
+	s'!!RT_LOG_PATH!!'"$(RT_LOG_PATH)"'g;\
+	s'!!RT_VERSION!!'"$(RT_VERSION)"'g;\
+	" $(DESTDIR)/$(RT_CONFIG)
+
+
+commit:
+	cvs commit
+
+predist: commit
+	cvs tag -r $(BRANCH) -F $(TAG)
+	rm -rf /tmp/$(TAG)
+	cvs co -d /tmp/$(TAG) -r $(TAG) rt
+	cd /tmp/$(TAG); chmod 600 Makefile; /usr/local/bin/cvs2cl.pl \
+		--no-wrap --separate-header \
+		--window 120
+	cd /tmp; tar czvf /home/ftp/pub/rt/devel/$(TAG).tar.gz $(TAG)/
+	chmod 644 /home/ftp/pub/rt/devel/$(TAG).tar.gz
+
+dist: commit predist
+	rm -rf /home/ftp/pub/rt/devel/rt.tar.gz
+	ln -s ./$(TAG).tar.gz /home/ftp/pub/rt/devel/rt.tar.gz
+
+
+rpm:
+	(cd ..; tar czvf /usr/src/redhat/SOURCES/rt.tar.gz rt)
+	rpm -ba etc/rt.spec
diff --git a/rt/README b/rt/README
new file mode 100755
index 000000000..d16100c5f
--- /dev/null
+++ b/rt/README
@@ -0,0 +1,336 @@
+$Header: /home/cvs/cvsroot/freeside/rt/README,v 1.1 2002-08-12 06:17:06 ivan Exp $
+RT is (c) 1996-2002 by Jesse Vincent <jesse@bestpractical.com>
+
+RT is licensed to you under the terms of version 2 of the GNU General 
+Public License. 
+
+If you don't have a copy of the GPL, you've been living in a cave,
+but one should be included in this distribution.
+
+
+INSTALLATION INSTRUCTIONS
+-------------------------
+
+These instructions are a summary of those at http://www.fsck.com/rtfm/
+The docs on the web at www.fsck.com/rtfm/ are likely to be more up to
+date and complete than this document. You should consult them before 
+proceeding.
+
+REQUIRED PACKAGES:
+------------------
+
+o   Perl5.005_03 or later with support for setgid perl scripts
+        RT's command line and mail gateway tools run setgid to the 'rt' group
+	to protect RT's database password.  You may need to install a special 
+	"suidperl" package or reconfigure your perl setup to support
+	 "setuid scripts".
+
+o   A DB backend; MySQL is recommended ( http://www.mysql.com ) 
+        Currently supported:    Mysql 3.23.38 or newer. 
+				 (Some older releases had crippling SQL bugs)
+				Postgres 7.1 or newer.
+
+o   Apache + mod_perl -- ( http://perl.apache.org) 
+    or A webserver with FastCGI support (www.fastcgi.com)
+
+	If you compile mod_perl as a DSO, you're on your own. It's known
+	to have massive stability problems. 
+        mod_perl must be build with EVERYTHING=1
+
+o    Various and sundry perl modules
+        RT takes care of the installation of most of these automatically
+        during the "make testdeps" and "make fixdeps" stages below
+
+
+GENERAL INSTALLATION
+--------------------
+
+1   Unpack this distribution SOMWHERE OTHER THAN where you want to install RT
+
+        Granted, you've already got it open. To do this cleanly:
+
+        	tar xzvf rt.tar.gz -C /tmp
+
+2   Check over /tmp/rt/Makefile
+
+	There are many variables you NEED to customize for your site.
+	Even if you are just upgrading, you must set ALL variables.
+
+3   Satisfy RT's myriad dependencies.  There's a perl script in rt/tools
+    called testdeps that uses CPAN to automate all of this.
+
+3.1   Check for compliance:
+	make testdeps
+
+3.2   If there are unsatisfied dependencies, install them by hand or run
+	make fixdeps
+	
+       (You may need to install Apache::Session and Apache::DBI by hand.
+
+	You might need to install Msql-Mysql-Modules by hand.
+	perl -MCPAN -e'install DBD::mysql::Install' should do it for you.
+       )
+
+3.3   Check to make sure everything was installed properly:
+	make testdeps
+
+4   Create a group called 'rt'
+
+5a  FOR A NEW INSTALLATION: 
+        
+        As root, type:
+		 make install	(replace "make" with the local name for 
+				 Make, if you need to)
+
+	If the make fails, type:
+		make dropdb 
+	and start over from step 5a
+
+5b  FOR UPGRADING: (Within the RT 2.0.x series)
+
+	Make a backup of /path/to/rt/etc/config.pm
+ 
+        As root, type: 
+		make upgrade     (replace "make" with the local name for 
+				  Make, if you need to)
+
+	This will build new binaries, config files and libraries without
+	overwriting your RT database. 
+
+        WARNING: This WILL clobber your existing configuration file!
+        
+        The install process will then instruct you to update your RT system 
+        database objects by running rt/etc/insertdata <version> where 
+        <version> is the version of RT you're upgrading from.
+
+        
+	
+5c  FOR UPGRADING (From 1.0.x):
+
+	Follow the instructions for installing RT 2.0.
+
+	Once you have installed RT 2.0, download import-1.0-to-2.0
+	from http://www.fsck.com/pub/rt/contrib/2.0/rt-addons
+
+	Edit the configuration defaults in import-1.0-to-2.0
+
+	If you don't set $DEFAULTQUEUE to the name of one of your
+	RT 1.0 queues, THE IMPORT WILL FAIL.
+
+	perl ./import-1.0-to-2.0
+
+	The import tool will do its thing. If you're using postgres, you'll
+	need to execute the following SQL statement within your RT2 database:
+
+	select setval('tickets_id_seq', (select max(id) from tickets));
+	
+	It imports:
+		Queues, Areas, Users, Acls, Mailing Rules, Queue Members,
+		Tickets and Transactions.
+
+	It DOES NOT IMPORT:
+		Attachments removed by stripmime or Templates.
+	
+6   Edit etc/config.pm in your RT installation directory.  In many
+    cases sensible defaults have been included. In others, you MUST
+    supply a value.
+
+7   Configure the email and web gateways, as described below. 
+
+8   Stop and start your webserver, so it picks up your configuration changes.
+
+    NOTE: root's password for the web interface is "password" 
+    (without the quotes.)  Not changing this is a SECURITY risk
+    
+9   Configure RT per the instructions at http://www.fsck.com/rtfm/
+
+    Until you do this, RT will not be able to send or recieve email,
+    nor will it be more than marginally functional.  This is not an
+    optional step.
+
+
+SETTING UP THE MAIL GATEWAY 
+---------------------------
+
+An alias for the initial queue will need to be made in either your
+global mail aliases file (if you are using NIS) or locally on your
+machine.
+ 
+Add the following lines to /etc/aliases (or your local equivalent) :
+
+rt:         "|/path/to/rt2/bin/rt-mailgate --queue general --action correspond"
+rt-comment: "|/path/to/rt2/bin/rt-mailgate --queue general --action comment"
+                                                   |                |
+                                   <queue-name>----/                |
+                                                                    |
+                      <correspond or comment depending on whether   |
+                      the mail should be resent to the requestor>---/
+
+
+
+THE WEB UI
+----------
+
+RT's web ui is based around HTML::Mason, which works well with the mod_perl
+perl interpreter within Apache httpd as well as with a webserver which
+supports FastCGI. (Instructions for configuring RT for use with FastCGI
+are available at http://www.fsck.com/rtfm/ )
+
+Apache 
+        RT Uses HTML::Mason.  You'll need to add a few lines to your
+        httpd.conf telling it to use rt's web ui.  If you have mod-perl
+	(you should, the perl scripts will go quite a bit faster around with
+	it), you can do something like this:
+
+
+<VirtualHost your.ip.address>
+DocumentRoot /path/to/rt2/WebRT/html
+ServerName your.rt.server.hostname
+PerlModule Apache::DBI
+PerlFreshRestart On
+PerlRequire /path/to/rt2/bin/webmux.pl
+<Location />
+ SetHandler perl-script
+ PerlHandler RT::Mason
+</Location>
+</VirtualHost>
+
+Additionally, you should set up a cron job to remove stale session data.
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ WARNING: Don't install this cron job or run this find command if your
+ MASON_SESSION_PATH (known in config.pm as $MasonSessionDir) 
+ points to a directory that could  EVER contain any file that's not 
+ a Apache::Session datafile.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+# Every hour, nuke session files and lockfiles that haven't been 
+# touched in 10 hours
+
+0 * * * * find /path/to/rt2/WebRT/sessiondata -type f -amin +600 -exec rm {} \;
+
+
+THE CLI
+-------
+        Binaries for the CLI are located in rt/bin
+        You've got:
+
+                "rt" (manipulate or display requests) 
+                "rtadmin" (modify queues, users and acls)
+
+        Both of these programs take --help as an option.
+
+
+BUGS
+----
+
+Known issues with releases of RT2 are listed at 
+<URL:http://fsck.com/rt2/NoAuth/Errata.html>.  This includes every bug known
+to exist in each release of RT.  (When prompted, login as guest/guest)
+
+To find out more about currently open bugs, check out the live 
+Buglist at  <URL:http://fsck.com/rt2/NoAuth/Buglist.html>.
+(When prompted, login as guest/guest)
+
+To report a bug, send an email to rt-2.0-bugs@fsck.com.
+
+GETTING HELP
+------------
+
+If RT is mission-critical for you or if you use it heavily, we recommend that
+you purchase a commercial support contract.  Details on support contracts
+are available at http://www.bestpractical.com.
+
+If you're interested in having RT extended or customized or would like more
+information about commercial support options, please send email to 
+<sales@bestpractical.com> to discuss rates and availability.
+
+
+RT-USERS MAILINGLIST
+--------------------
+
+To keep up to date on the latest RT tips, techniques and extections,
+you probably want to join the rt-users mailinglist.  Send a message to:
+
+         rt-users-request@lists.fsck.com 
+
+With the body of the message consisting of only the word:
+
+        subscribe
+
+If you're interested in hacking on rt, you'll want to subscribe to
+rt-devel@lists.fsck.com.  Subscribe to it with instructions similar to
+those above.
+
+Address questions about the stable release to the rt-users list, and
+questions about the development version to the rt-devel list.  If you feel
+your questions are best not asked publically, send them personally to
+<jesse@bestpractical.com>.
+
+If you want to be informed of every commit to the CVS repository,
+subscribe to rt-commit@fsck.com using similar instructions to those above.
+
+
+RT WEBSITE
+----------
+
+For current information about RT, check out the RT website at 
+http://www.bestpractical.com/rt  You'll find screenshots, a pointer
+to the current version of rt, contributed patches and lots of other great
+stuff.
+
+
+TROUBLESHOOTING
+---------------
+
+All errors will be appended to a logfile, which lives in /tmp/rt.log.* unless 
+you've reconfigured it.  Check etc/config.pm for details.
+
+If the solution to the problem you're running into isn't obvious and you've 
+checked the FAQ, feel free to send mail to rt-users@fsck.com (for release 
+versions of RT) or rt-devel@fsck.com (for development versions).
+
+GIVING SOMETHING BACK
+---------------------
+
+RT is free software. You are not obligated to pay for it.  You should be 
+aware, however, that bestpractical.com's sole source of revenue is commercial
+work related to RT. If you are able, either a contract to extend RT in some 
+way that would be useful to your organization, a financial contribution, or 
+even something off the author's amazon wishlist 
+	( http://www.amazon.com/exec/obidos/wishlist/2GMHUDAFBT2XR/ )
+would be much appreciated. 
+
+Thanks!
+
+
+CREDITS
+-------
+
+A lot of people are responsible for making RT a better program.  Many
+thanks to Lauren Burka, who originally tasked me with writing this beast.
+She forced me to use a database backend.  I've thanked her for it every
+day since.  Rich West rewrote this readme and did some UI hacking.  Adam
+Hirsch, Kit Kraysha, Robin Garner, Jens Glaser, John Adams, Trey Belew, 
+Sean Dague, Nathan Mehl, Kee Hinckley, Rich West, Dale Bewley, Serge Zhuk,
+John Lengeling, Elmar Knipp, Gerald Abshez, Dave Hull, Dave Schenet,
+Dave Walton, Jan Okrouhly, Tobias Brox, Lamont Lucas, Charlie Brady,
+Robin Shostack, Eric Mumpower, Jerrod Wiesman, Adam Hammer, Ivan Kohler, Alex
+Pilosov, Mary Alderdice, Deborah Kaplan, Jens von Bülow, Tristan Horn,
+Lee Ann Goldstein, Karel P Kerezman, Feargal Reilly, Christian Steger,
+Christian Kurz, JD Falk, Arthur de Jong, Ben Carter, Mark Vevers
+and many others
+have all contributed bug reports, code or ideas that have helped RT along.  
+
+Arepa, Inc, Utopia Inc, Wesleyan University and The Leftbank Operation 
+have paid me to maintain RT and release it to the public.  Without their 
+support RT would not exist.  
+
+If I've left you out, please drop me a line ....it wasn't intentional. 
+ 
+
+        Enjoy
+
+        Jesse Vincent
+	<jesse@bestpractical.com>
+        Best Practical Solutions, LLC
diff --git a/rt/TODO b/rt/TODO
new file mode 100755
index 000000000..3d1b7d02e
--- /dev/null
+++ b/rt/TODO
@@ -0,0 +1,9 @@
+Errata for RT 2.x can be found at http://fsck.com/rt2/NoAuth/Errata.html
+
+A list of all open issues, including those which haven't been added
+to the official Errata lists,  can be found at 
+http://fsck.com/rt2/NoAuth/Buglist.html
+
+If you want to look at bugs in more detail, you may need to login as guest with a password of 'guest'
+
+
diff --git a/rt/bin/initacls.Oracle b/rt/bin/initacls.Oracle
new file mode 100644
index 000000000..8d05f45e1
--- /dev/null
+++ b/rt/bin/initacls.Oracle
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+DATABASEHOME=$1
+HOSTNAME=$2
+PORT=$3
+DATABASEADMIN=$4
+DBAPASSWD=$5
+DATABASENAME=$6
+DATABASEACLS=$7
+
+BINDIR=${DATABASEHOME}/bin
+
+echo "DBHOME = $DATABASEHOME"
+echo "HOSTNAME = $HOSTNAME"
+echo "PORT = $PORT"
+echo "DATABASEADMIN = $DATABASEADMIN"
+echo "DBAPASSWD = $DBAPASSWD"
+echo "DATABASENAME = $DATABASENAME"
+
+PATH=$PATH:$BINDIR
+export PATH
+
+echo "Please enter ${DATABASEADMIN}'s  password for the SID ${DATABASENAME} to create an rt user";
+
+$BINDIR/sqlplus ${DATABASEADMIN}@${DATABASENAME}  @$DATABASEACLS
+
diff --git a/rt/bin/initacls.Pg b/rt/bin/initacls.Pg
new file mode 100755
index 000000000..82e32de74
--- /dev/null
+++ b/rt/bin/initacls.Pg
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+DATABASEHOME=$1
+HOSTNAME=$2
+PORT=$3
+DATABASEADMIN=$4
+DBAPASSWD=$5
+DATABASENAME=$6
+DATABASEACLS=$7
+
+BINDIR=${DATABASEHOME}/bin
+
+
+PATH=$PATH:$BINDIR
+export PATH
+
+echo "Enter the postgres administrator's database password to create a new user for rt"
+
+if [ "fnord$PORT" != "fnord" ]; then
+	PORT="-p $PORT"
+fi;
+
+if [ "fnord$HOSTNAME" != "fnord" ]; then
+	HOSTNAME="-h $HOSTNAME"
+fi;
+
+psql $HOSTNAME $PORT -d $DATABASENAME -f $DATABASEACLS -U $DATABASEADMIN
+
diff --git a/rt/bin/initacls.mysql b/rt/bin/initacls.mysql
new file mode 100755
index 000000000..17e63f837
--- /dev/null
+++ b/rt/bin/initacls.mysql
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+DATABASEHOME=$1
+HOSTNAME=$2
+PORT=$3
+DATABASEADMIN=$4
+DBAPASSWD=$5
+DATABASENAME=$6
+DATABASEACLS=$7
+
+BINDIR=${DATABASEHOME}/bin
+
+PATH=$PATH:$BINDIR
+export PATH
+
+echo "Enter the mysql administrator's database password to create a new user for RT"
+$BINDIR/mysql --host=${HOSTNAME} --port=${PORT} --user=${DATABASEADMIN} -p${DBAPASSWD} mysql < $DATABASEACLS
+
+echo "Enter the mysql administrator's database password to nondestructively reload the database"
+$BINDIR/mysqladmin --host=${HOSTNAME} --port=${PORT} --user=${DATABASEADMIN} -p${DBAPASSWD} reload
diff --git a/rt/bin/mason_handler.fcgi b/rt/bin/mason_handler.fcgi
new file mode 100755
index 000000000..e8a4e128f
--- /dev/null
+++ b/rt/bin/mason_handler.fcgi
@@ -0,0 +1,221 @@
+#!!!PERL!!
+# $Header: /home/cvs/cvsroot/freeside/rt/bin/mason_handler.fcgi,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# RT is (c) 1996-2001 Jesse Vincent (jesse@fsck.com);
+
+use strict;
+$ENV{'PATH'} = '/bin:/usr/bin';    # or whatever you need
+$ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
+$ENV{'SHELL'} = '/bin/sh' if defined $ENV{'SHELL'};
+$ENV{'ENV'} = '' if defined $ENV{'ENV'};
+$ENV{'IFS'} = ''          if defined $ENV{'IFS'};
+
+
+# We really don't want apache to try to eat all vm
+# see http://perl.apache.org/guide/control.html#Preventing_mod_perl_Processes_Fr
+
+
+package RT::Mason;
+#use CGI qw(-private_tempfiles);   # pull in CGI with the private tempfiles
+				  #option predefined
+use HTML::Mason;  # brings in subpackages: Parser, Interp, etc.
+
+use vars qw($VERSION %session $Nobody $SystemUser $cgi);
+
+# List of modules that you want to use from components (see Admin
+# manual for details)
+
+#Clean up our umask...so that the session files aren't world readable, writable or executable
+umask(0077);
+
+
+  
+$VERSION="!!RT_VERSION!!";
+
+use lib "!!RT_LIB_PATH!!";
+use lib "!!RT_ETC_PATH!!";
+
+#This drags in  RT's config.pm
+use config;
+use Carp;
+
+{  
+    package HTML::Mason::Commands;
+    use vars qw(%session $ContentType);
+    
+    use RT; 
+    use RT::Ticket;
+    use RT::Tickets;
+    use RT::Transaction;
+    use RT::Transactions;
+    use RT::User;
+    use RT::Users;
+    use RT::CurrentUser;
+    use RT::Template;
+    use RT::Templates;
+    use RT::Queue;
+    use RT::Queues;
+    use RT::ScripAction;
+    use RT::ScripActions;
+    use RT::ScripCondition;
+    use RT::ScripConditions;
+    use RT::Scrip;
+    use RT::Scrips;
+    use RT::Group;
+    use RT::Groups;
+    use RT::Keyword;
+    use RT::Keywords;
+    use RT::ObjectKeyword;
+    use RT::ObjectKeywords;
+    use RT::KeywordSelect;
+    use RT::KeywordSelects;
+    use RT::GroupMember;
+    use RT::GroupMembers;
+    use RT::Watcher;
+    use RT::Watchers;
+    use RT::Handle;
+    use RT::Interface::Web;    
+    use MIME::Entity;
+    use CGI::Cookie;
+    use Date::Parse;
+    use HTML::Entities;
+    use Text::Wrapper;
+ 
+    #TODO: make this use DBI
+    use Apache::Session::File;
+    use CGI::Fast;
+
+    # set the page's content type.
+    # In this case, just save it to a variable that we can pull later;
+    sub SetContentType {
+	$ContentType = shift;
+    }
+    sub CGIObject {
+	return $RT::Mason::cgi;
+    }
+}
+
+
+my ($output, $parser, $interp);
+if ($HTML::Mason::VERSION < 1.0902) {
+        require HTML::Mason::ApacheHandler;
+
+         $parser = &RT::Interface::Web::NewParser(allow_globals => [%session]);
+
+         $interp = &RT::Interface::Web::NewInterp(parser=>$parser,
+                                             allow_recursive_autohandlers => 1,
+					    out_method => \$output);
+}
+else {
+         $interp = &RT::Interface::Web::NewInterp(
+                                                  allow_globals => [%session],
+                                                  default_escape_flags => 'h',
+
+					    out_method => \$output);
+}
+# Die if WebSessionDir doesn't exist or we can't write to it
+
+stat ($RT::MasonSessionDir);
+die "Can't read and write $RT::MasonSessionDir"
+  unless (( -d _ ) and ( -r _ ) and ( -w _ ));
+
+
+RT::Init();
+
+# Response loop
+while ($RT::Mason::cgi = new CGI::Fast) {
+    
+    $HTML::Mason::Commands::ContentType = 'text/html';
+        
+    # This routine comes from ApacheHandler.pm:
+    my (%args, $cookie);
+    foreach my $key ( $cgi->param ) {
+	foreach my $value ( $cgi->param($key) ) {
+	    if (exists($args{$key})) {
+		if (ref($args{$key})) {
+		    $args{$key} = [@{$args{$key}}, $value];
+		} else {
+		    $args{$key} = [$args{$key}, $value];
+		}
+	    } else {
+		$args{$key} = $value;
+	    }
+
+	}
+	
+    }
+    
+
+    my $comp = $ENV{'PATH_INFO'};
+    
+    if ($comp =~ /^(.*)$/) {  # untaint the path info. apache should
+			      # never hand us a bogus path. 
+			      # We should be more careful here.
+	$comp = $1;
+    }    
+    
+    if ($comp =~ /\/$/) {
+	$comp .= "index.html";
+    }	
+    
+    #This is all largely cut and pasted from mason's session_handler.pl
+    
+    # {{{ Cookies
+    my %cookies = fetch CGI::Cookie();
+    
+    eval {
+	my $session_id = undef;
+
+	#Get the session id and untaint it
+	if ($cookies{'AF_SID'} && $cookies{'AF_SID'}->value() =~ /^(.*)$/) {
+		$session_id = $1;
+	}
+ 
+	tie %HTML::Mason::Commands::session, 'Apache::Session::File',
+	  	$session_id, 
+	    { Directory => $RT::MasonSessionDir,
+	      LockDirectory => $RT::MasonSessionDir,
+	    }	;
+    };
+    
+    if ( $@ ) {
+	# If the session is invalid, create a new session.
+	if ( $@ =~ m#^Object does not exist in the data store# ) {
+	     tie %HTML::Mason::Commands::session, 'Apache::Session::File', undef,
+	     { Directory => $RT::MasonSessionDir,
+	       LockDirectory => $RT::MasonSessionDir,
+	     };
+	     undef $cookies{'AF_SID'};
+	}
+	  else {
+	      die "$@ \nProbably means that RT Couldn't write to session directory '$RT::MasonSessionDir'. Check that this directory's permissions are correct.";
+	  }
+    }
+    
+    if ( !$cookies{'AF_SID'} ) {
+	$cookie = new CGI::Cookie
+	  (-name=>'AF_SID', 
+	   -value=>$HTML::Mason::Commands::session{_session_id}, 
+	   -path => '/',);
+	
+    } else {
+	$cookie = undef;
+    }
+    
+    # }}}
+    
+    $output = '';
+    eval {
+	    my $status = $interp->exec($comp, %args);
+    };
+ 
+    if ($@) {
+	$output = "<PRE>$@</PRE>";
+    }
+ 
+    print "Content-Type: $HTML::Mason::Commands::ContentType\r\n";
+    print "Set-Cookie: $cookie\r\n" if ($cookie);
+    print "\r\n";
+    print $output;
+    untie %HTML::Mason::Commands::session;
+    
+}
diff --git a/rt/bin/mason_handler.scgi b/rt/bin/mason_handler.scgi
new file mode 100755
index 000000000..b9846c898
--- /dev/null
+++ b/rt/bin/mason_handler.scgi
@@ -0,0 +1,193 @@
+#!!!PERL!! -w
+
+#!/usr/bin/speedy -- -t600 -M8
+# $Header: /home/cvs/cvsroot/freeside/rt/bin/mason_handler.scgi,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# RT is (c) 1996-2001 Jesse Vincent (jesse@fsck.com);
+#
+# Contains code derived from mason.cgi
+# mason.cgi is Copyright December 2000 Joshua Kronengold (mneme@io.com, 
+# mneme@cyberspace.org).  All Rights Reserved.
+
+use strict;
+# {{{ Clean out the environment a little bit
+$ENV{'PATH'} = '/bin:/usr/bin';    # or whatever you need
+$ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
+$ENV{'SHELL'} = '/bin/sh' if defined $ENV{'SHELL'};
+$ENV{'ENV'} = '' if defined $ENV{'ENV'};
+$ENV{'IFS'} = ''          if defined $ENV{'IFS'};
+# }}}
+
+package RT::Mason;
+use HTML::Mason;  # brings in subpackages: Parser, Interp, etc.
+use vars qw($VERSION %session $Nobody $SystemUser);
+
+# List of modules that you want to use from components (see Admin
+# manual for details)
+
+$VERSION="!!RT_VERSION!!";
+
+use lib "!!RT_LIB_PATH!!";
+use lib "!!RT_ETC_PATH!!";
+
+
+#This drags in  RT's config.pm
+use config;
+use Carp;
+
+use HTML::Mason::FakeApache;
+use CGI;
+
+# {{{ Set up CGI environment and grab CGI params:
+
+my $r=new HTML::Mason::FakeApache;
+
+$|=1; # set output to non-buffered.
+
+my %cgi;
+CGI::ReadParse(\%cgi); # %cgi is now a tied hash containing our params.
+
+my $q=$cgi{CGI}; # $q now contains the object tied to %cgi.
+# }}}
+
+# {{{ require what we need
+{  
+    package HTML::Mason::Commands;
+
+    use vars qw(%session);
+
+    use RT::Ticket;
+    use RT::Tickets;
+    use RT::Transaction;
+    use RT::Transactions;
+    use RT::User;
+    use RT::Users;
+    use RT::CurrentUser;
+    use RT::Template;
+    use RT::Templates;
+    use RT::Queue;
+    use RT::Queues;
+    use RT::ScripAction;
+    use RT::ScripActions;
+    use RT::ScripCondition;
+    use RT::ScripConditions;
+    use RT::Scrip;
+    use RT::Scrips;
+    use RT::Group;
+    use RT::Groups;
+    use RT::Keyword;
+    use RT::Keywords;
+    use RT::ObjectKeyword;
+    use RT::ObjectKeywords;
+    use RT::KeywordSelect;
+    use RT::KeywordSelects;
+    use RT::GroupMember;
+    use RT::GroupMembers;
+    use RT::Watcher;
+    use RT::Watchers;
+    use RT::Handle;
+    use RT::Interface::Web;    
+    use MIME::Entity;
+    use CGI::Cookie;
+    use Date::Parse;
+    use HTML::Entities;
+
+    
+    use Apache::Session::File;
+
+    
+}
+# }}}
+
+# {{{ RT Database setup
+    $RT::Handle = new RT::Handle;
+    
+    $RT::Handle->Connect;
+   
+    use RT::CurrentUser;
+    
+    #RT's system user is a genuine database user. its id lives here
+    $RT::SystemUser = new RT::CurrentUser();
+    $RT::SystemUser->LoadByName('RT_System');
+
+    #RT's "nobody user" is a genuine database user. its ID lives here.
+    $RT::Nobody = new RT::CurrentUser();
+    $RT::Nobody->LoadByName('Nobody'); 
+     
+
+# }}}
+
+
+
+
+# {{{ Deal with cookies
+
+my %cookies = fetch CGI::Cookie();
+eval { 
+    tie %HTML::Mason::Commands::session, 'Apache::Session::File',
+      ( $cookies{'AF_SID'} ? $cookies{'AF_SID'}->value() : undef );
+};
+
+if ( $@ ) {
+    # If the session is invalid, create a new session.
+    if ( $@ =~ m#^Object does not exist in the data store# ) {
+	 tie %HTML::Mason::Commands::session, 'Apache::Session::File', undef;
+	 undef $cookies{'AF_SID'};
+    }
+}
+
+if ( !$cookies{'AF_SID'} ) {
+    my $cookie = new CGI::Cookie(
+ 	 -name=>'AF_SID', 
+	 -value=>$HTML::Mason::Commands::session{_session_id}, 
+	  -path => '/');
+    print 'Set-Cookie: '. $cookie."\r\n";
+}
+
+# }}}
+
+my $path=$ENV{PATH_INFO} || "/"; $path=~s/\'/\\\'/g;
+
+my $type=`/usr/bin/file '$RT::MasonComponentRoot/$path'`;
+
+# {{{ if it's a text file, handle it with mason.
+if($type=~/text|directory/) { 
+	my ($out, %mason_params);
+        my $parser = RT::Interface::Web::NewParser(allow_globals=>[qw($r)]);
+	$mason_params{parser}=$parser;
+	$r->content_type('text/html');
+	# (get cookies line) ...
+	$r->access_hash('headers_in','Cookie',$ENV{HTTP_COOKIE});
+	$r->{'args@'}=[];
+	$mason_params{out_method}=\$out;
+
+	my $interp = RT::Interface::Web::NewInterp(%mason_params);
+
+	$interp->set_global(r=>$r);
+	$interp->exec($path,%cgi);
+	$r->send_http_header();
+        print $out;
+} 
+# }}} 
+
+# {{{ if it's not a text file, just stream it out.
+
+else { # file is binary, damn it
+	my $mime_type;
+	if ( $mime_type=
+	     eval{ use MIME::Types;
+		   my($type,$encoding)=MIME::Types::by_suffix($path);
+		   $type; }) {
+	    print $q->header($mime_type);	
+	    $path=~s/[\|\>\<\&]//g;
+	    open F,"$RT::MasonComponentRoot/$path" or 
+	      die "couldn't open $path -- $!";
+	    print while <F>; 
+	    close F;
+	} else {
+	    die "couldn't resolve type of non-text file (!@; $type) -- install Mime::Types\n";
+	}
+    }
+
+# }}}
+
+untie %HTML::Mason::Commands::session;
diff --git a/rt/bin/rt b/rt/bin/rt
new file mode 100755
index 000000000..41220bb56
--- /dev/null
+++ b/rt/bin/rt
@@ -0,0 +1,1391 @@
+#!!!PERL!! -w
+#
+# $Header: /home/cvs/cvsroot/freeside/rt/bin/Attic/rt,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# RT is (c) 1996-2001 Jesse Vincent <jesse@bestpractical.com>
+
+use strict;
+use Carp;
+use Getopt::Long;
+
+use lib "!!RT_LIB_PATH!!";
+use lib "!!RT_ETC_PATH!!";
+
+use RT::Interface::CLI  qw(CleanEnv LoadConfig DBConnect 
+			   GetCurrentUser GetMessageContent);
+
+#Clean out all the nasties from the environment
+CleanEnv();
+
+#Load etc/config.pm and drop privs
+LoadConfig();
+
+#Connect to the database and get RT::SystemUser and RT::Nobody loaded
+DBConnect();
+
+#Drop setgid permissions
+RT::DropSetGIDPermissions();
+
+#Get the current user all loaded
+my $CurrentUser = GetCurrentUser();
+
+unless ($CurrentUser->Id) {
+	print "No RT user found. Please consult your RT administrator.\n";
+	exit(1);
+}
+
+
+# {{{ commandline flags 
+
+my ( @id,
+     @limit_queue,
+     @limit_status,
+     @limit_owner,
+     @limit_priority,
+     @limit_final_priority,
+     @limit_requestor,
+     @limit_subject,
+     @limit_body,
+     @limit_created,
+     @limit_resolved,
+     @limit_lastupdated,
+     @limit_dependson,
+     @limit_dependedonby,
+     @limit_memberof,
+     @limit_hasmember,
+     @limit_refersto,
+     @limit_referredtoby,
+     @limit_keyword,
+     
+     @limit_due,
+     @limit_starts,
+     @limit_started,
+     $limit_first,
+     $limit_rows,
+     $history,
+     $summary,
+     $create,
+     @requestors,
+     @cc,
+     @admincc,
+     $status,
+     $subject,
+     $owner,
+     $steal,
+     $queue,
+     $time_left,
+     $priority,
+     $final_priority,
+     $due,
+     $starts,
+     $started,
+     $contacted,
+     $comment,
+     $reply,
+     $source,
+     $edit,
+     @dependson,
+     @memberof, 
+     @refersto,
+     $mergeinto,
+     @keywords,
+     $time_taken,
+     $verbose,
+     $debug,
+   $help,
+   $version);
+
+# }}}
+
+# Set defaults for cli args
+
+$edit = 1; # Assume the user wants to edit replies and comments 
+           # unless they specify --noedit
+
+# {{{    args
+
+my @args =("id=s" => \@id,
+	   "limit-queue=s" => \@limit_queue,
+	   "limit-status=s" => \@limit_status,
+	   "limit-owner=s" => \@limit_owner,
+	   "limit-priority=s" => \@limit_priority,
+	   "limit-final-priority=s" => \@limit_final_priority,
+	   "limit-requestor=s" => \@limit_requestor,
+	   "limit-subject=s" => \@limit_subject,
+	   "limit-body=s",	\@limit_body,
+	   "limit-created=s" => \@limit_created,
+	   "limit-due=s" =>	\@limit_due,
+ 	   "limit-last-updated=s" => \@limit_lastupdated,
+	   "limit-keyword=s" => \@limit_keyword,
+
+	   "limit-member-of=s" => \@limit_memberof,
+	   "limit-has-member=s" => \@limit_hasmember,
+	   "limit-depended-on-by=s" => \@limit_dependedonby,
+	   "limit-depends-on=s" => \@limit_dependson,
+	   "limit-referred-to-by=s" => \@limit_referredtoby,
+	   "limit-refers-to=s" => \@limit_refersto,
+
+	   "limit-starts=s" => \@limit_starts,
+	   "limit-started=s" => \@limit_started,
+	   "limit-first=i" => \$limit_first,
+	   "limit-rows=i" => \$limit_rows,
+	   "history|show" => \$history,
+	   "summary:s" => \$summary,
+	   "create" => \$create,
+	   "keywords=s" => \@keywords,
+	   "requestor|requestors=s" => \@requestors,
+	   "cc=s" => \@cc,
+	   "admincc=s" => \@admincc,
+	   "status=s" => \$status,
+	   "subject=s" => \$subject,
+	   "owner=s" => \$owner,
+	   "steal" => \$steal,
+	   "queue=s" => \$queue,
+
+	   
+	   "priority=i" => \$priority,
+	   "final-priority=i" => \$final_priority,
+	   "due=s" => \$due,
+	   "starts=s" => \$starts,
+	   "started=s" => \$started,
+	   "contacted=s" => \$contacted,
+	   "comment", \$comment,
+	   "reply|respond", \$reply,
+	   "source=s" => \$source,
+	   "edit!" => \$edit,
+	   "depends-on=s" => \@dependson,
+	   "member-of=s" => \@memberof, 
+	   "merge-into=s" => \$mergeinto, 
+	   "refers-to=s" => \@refersto,
+	   "time-left=i" => \$time_left,
+	   "time-taken=i" => \$time_taken,
+	   "verbose+" => \$verbose,
+	   "debug" => \$debug,
+	   "version" => \$version,
+	   "help|h|usage" => \$help
+	  );
+
+# }}}
+
+
+
+GetOptions(@args);
+
+print join(':',@keywords);
+# {{{ If they want it, print a usage message and get out
+
+if ($help) {
+
+
+print <<EOUSAGE;
+
+Limit the set of records returned:
+
+--id=[first][-][last]
+  Specify a single ticket, a range, or to start with (n-) or end with (-n)
+a specific ticket.
+  
+  --limit-queue=<queue>
+	  --limit-status=[!](new|open|stalled|resolved)
+
+	  --limit-owner=[!]<userid>
+	  --limit-priority=[starts][-][ends]
+	  --limit-final-priority=[starts][-][ends]
+	    starts is less than ends
+	  --limit-requestor=[!]<userid>|<email>
+	  --limit-subject=[!]<text>
+	  --limit-body=[!]<text>
+	  --limit-keyword=[!]<select>/<keyword>
+        
+       Links
+          --limit-member-of=<ticketid>
+          --limit-has-member=<ticketid>
+          --limit-refers-to=<ticketid>
+          --limit-referred-to-by=<ticketid>
+          --limit-depends-on=<ticketid>
+          --limit-depended-on-by=<ticketid>
+
+
+       Dates
+	  --limit-created=[starts][-][ends]
+	  --limit-due=[starts][-][ends]
+	  --limit-starts=[starts][-][ends]
+	  --limit-started=[starts][-][ends]
+          --limit-resolved=[starts][-][ends]
+          --limit-last-updated=[starts][-][ends]
+	    starts and ends are dates.  starts can not be less than ends
+
+	  --limit-first=<first row returned>
+	  --limit-rows=<row count>
+
+	  --history | --show
+            show a history of the tickets found
+ 
+
+	  --summary [format-string]
+             show a listing-style summary of the tickets found. If format string
+             is ommitted, uses \$RT_SUMMARY_FORMAT or an internal default
+            
+
+             #TODO: doc summary 
+             format: <atom>%<format>
+             atom:   <name><size>
+             size: <integer>
+             name:  (grep for # {{{ attribs for the array of ok values)
+
+
+	  --create
+            create a new ticket. Any attributes that you can modify on an existing ticket
+            can also be used for ticket creation.
+
+
+
+Attributes
+  Basics
+	  --status=<new|open|stalled|resolved|dead>
+           sets status
+	   --subject=<subject>
+           sets subject
+	   --owner=<userid>
+           set owner to 
+           --steal
+           Become the owner, even if someone else owns the ticket
+	   --queue=<queueid>
+           set queue to
+	   
+	   --priority=<int>
+	  
+           --final-priority=<int>
+
+  Watchers
+	  --requestors=[+|-]<userid|email address>
+          add or remove this user as a ticket requestor 
+	  --cc=[+|-]<userid|email address>
+          add or remove this user as a ticket cc
+	  --admincc=[+|-]<userid|email address>
+          add or remove this user as a ticket admincc
+
+	(When creating tickets, just leave off the + or - )
+
+  Keywords
+	  --keywords[+|-]<keyword_select>/<keyword>
+          Add or remove a keyword.
+
+
+
+  Dates
+	   --due=<date>
+	   --starts=<date>
+	   --started=<date>
+	   --contacted=<date>
+
+	   --time-left=<int>
+	     
+	   --time-taken=<int>
+
+
+   Link related manipulation:
+
+	   --depends-on=[+|-]<ticketid>
+	   --member-of=[+|-]<ticketid>
+	   --refers-to=[+|-]<ticketid>
+           --merge-into=<ticketid>
+
+Comments and replies
+
+	   --comment
+	   --reply|respond
+	     --source <path>
+                Specify the path to the source file for this ticket update
+
+	      --noedit
+                Don't invoke \$EDITOR to edit the content of this update
+
+
+
+
+   Condiments
+
+	   --verbose
+	   --debug
+	   --version
+	   --help|h|usage
+             You're reading it.
+
+EOUSAGE
+
+    exit(0);
+}
+
+# Print version, and leave
+if ($version) {
+	print "RT $RT::VERSION for $RT::rtname. Copyright 1996-2001 Jesse Vincent <jesse\@fsck.com>\n";
+	exit(0);
+}
+
+# }}}
+
+# {{{ Validate any options that were passed in. normalize them.
+
+#if a queue was specified
+if ($queue) {
+    # make sure that $queue is a valid queue and load it into $queue_obj
+}
+
+#For each date in: $due, $starts, $started
+
+# load up an RT::Date object and parse it into a normalized form
+# if it can't parse it, log an error and null out the variable
+
+# }}}
+
+# {{{ Check if we're creating, if so, create the ticket and be done
+
+if ($create) {
+    $RT::Logger->debug("Creating a new ticket");
+
+    #Make sure the current user can create tickets in this queue
+    
+    #Make sure that the owner specified can own tickets in this queue
+
+
+	    
+    my $linesref = GetMessageContent( Edit => $edit, Source => $source,
+				      CurrentUser => $CurrentUser
+				    );
+    
+    require MIME::Entity;
+    my $MIMEObj;
+    
+    if ($linesref) {
+	$MIMEObj = MIME::Entity->build(Data => $linesref);
+    }	
+    
+    use RT::Ticket;
+    my $Ticket=new RT::Ticket($CurrentUser);
+    my ($ticket, $trans, $msg) =
+      $Ticket->Create(Queue => $queue,
+		      Owner => $owner,
+		      Status => $status || 'new' ,
+		      Subject => $subject,
+		      Requestor => \@requestors,
+		      Cc => \@cc,
+		      AdminCc => \@admincc,
+		      Due => $due,
+		      Starts => $starts,
+		      Started => $started,
+		      TimeLeft => $time_left,
+		      InitialPriority => $priority,
+		      FinalPriority => $final_priority,
+		      MIMEObj => $MIMEObj
+		     );
+    print $msg . "\n";
+}
+
+# }}}
+
+else {
+    #Apply restrictions
+    use RT::Tickets;
+    my $Tickets = new RT::Tickets($CurrentUser);
+    
+    # {{{ Limit our search
+    my $value;			#to use when iterating through restrictions
+    my $queue_id;		#to use when limiting by keyword
+    
+    # {{{ limit on id
+
+    foreach $value (@id) {
+	if ($value =~ /^(\d+)$/) {
+	    $Tickets->LimitId ( VALUE => $1,
+				OPERATOR => '=');
+	}	
+	elsif ($value =~ /^(\d*)\D?(\d*)$/) {
+	    my $start = $1;
+	    my $end = $2;
+	    $Tickets->LimitId(
+			      VALUE => "$start",
+			      OPERATOR => '>=') if ($start);
+	    $Tickets->LimitId(
+			      VALUE => "$end",
+			      OPERATOR => '<=') if ($end);
+	}	
+    }
+
+
+    # }}}
+    
+    # {{{ limit on status
+
+    foreach $value (@limit_status) {
+	if ($value =~ /^(=|!=|!|)(.*)$/) {
+	    my $op = $1;
+	    my $val = $2;
+	         
+
+	    $op = ParseBooleanOp($op);
+	    $Tickets->LimitStatus(VALUE => "$val",
+				  OPERATOR => "$op");
+	}	
+    }
+
+    # }}}
+
+
+
+    # {{{ limit on queue
+    foreach $value (@limit_queue) {
+	if ($value =~ /^(\W?)(.*?)$/i) {
+	    my $op = $1;
+	    my $val = $2;
+		
+	    $op = ParseBooleanOp($op);
+
+	    my $queue_obj = new RT::Queue($RT::SystemUser);
+		
+	    unless ($queue_obj->Load($val)) {
+		$RT::Logger->debug("Queue '$val' not found");
+		print STDERR "Queue '$val' not found\n";	
+		exit(-1);
+	    }
+	    $RT::Logger->debug ("Limiting queue to $op ".$queue_obj->Name);
+	    $Tickets->LimitQueue(VALUE => $queue_obj->Name,
+				 OPERATOR => $op);
+	    $queue_id=$queue_obj->id;
+	}	
+    }	
+
+    # {{{ limit on keyword
+    foreach $value (@limit_keyword) {
+	if ($value =~ /^(\W?)(.*?)\/(.*)$/i) {
+	    my $op = $1;
+	    my $select = $2;
+	    my $keyword = $3;
+
+	    $op = ParseBooleanOp($op);
+
+	    # load the keyword select
+	    my $keyselect = RT::KeywordSelect->new($RT::SystemUser);
+	    unless ($keyselect->LoadByName(Name=>$select, Queue=>$queue_id)) {
+		$RT::Logger->debug("KeywordSelect '$select' not found");
+		print STDERR "KeywordSelect '$select' not fount\n";
+		exit(-1);
+	    }
+
+	    # load the keyword
+	    my $k = RT::Keyword->new($RT::SystemUser);
+	    unless ($k->LoadByNameAndParentId($keyword, $keyselect->Keyword)) {
+		$RT::Logger->debug("Keyword '$keyword' not found");
+		print STDERR "Keyword '$keyword' not found\n";
+		exit(-1);
+	    }
+	    $Tickets->LimitKeyword(OPERATOR => $op,
+	                           KEYWORDSELECT => $keyselect->id,
+				   KEYWORD => $k->id);
+	    $RT::Logger->debug ("Limiting keyword to $op ".$k->Path);
+	}
+    }
+    # }}}
+    # {{{ limit on owner
+    foreach $value (@limit_owner) {
+	if ($value =~ /^(\W?)(.*?)$/i) {
+	    my $op = $1;
+	    my $val = $2;
+		
+	    $op = ParseBooleanOp($op);
+
+	    my $user_obj = new RT::User($RT::SystemUser);
+		
+	    unless ($user_obj->Load($val)) {
+		$RT::Logger->debug("User '$val' not found");
+		print STDERR "User '$val' not found\n";	
+		exit(-1);
+	    }
+	    $val = $user_obj->id();
+		
+	    $RT::Logger->debug ("Limiting owner to $op $val");
+	    $Tickets->LimitOwner(VALUE => "$val",
+				 OPERATOR => "$op");
+	}	
+    }	
+    # }}}
+    # {{{ limt on priority
+
+    foreach $value (@limit_priority) {
+	my ($start, $end) = ParseRange($value);
+	if ($start == $end) {
+	    $Tickets->LimitPriority( VALUE => $start,
+				     OPERATOR => '=');
+	} elsif ($start) {
+	    $Tickets->LimitPriority( VALUE => $start,
+				     OPERATOR => '>=');
+	} elsif ($end) {
+	    $Tickets->LimitPriority( VALUE => $end,
+				     OPERATOR => '<=');
+	}	
+	    
+    }
+    foreach $value (@limit_final_priority) {
+	my ($start, $end) = ParseRange($value);
+	if ($start == $end) {
+	    $Tickets->LimitFinalPriority( VALUE => $start,
+					  OPERATOR => '=');
+	} elsif ($start) {
+	    $Tickets->LimitFinalPriority( VALUE => $start,
+					  OPERATOR => '>=');
+	} elsif ($end) {
+	    $Tickets->LimitFinalPriority( VALUE => $end,
+					  OPERATOR => '<=');
+	}	
+    }
+    # }}}
+
+    foreach $value (@limit_requestor) {
+	if ($value =~ /^(\W?)(.*?)$/i) {
+	    my $op = $1;
+	    my $val = $2;
+		
+	    $op = ParseBooleanOp($op);
+	    $Tickets->LimitRequestor(VALUE => $val,
+				     OPERATOR => $op );
+	}
+	    
+    }
+    foreach $value (@limit_subject) {
+	
+	if ($value =~ /^(\W?)(.*?)$/i) {
+	    my $op = $1;
+	    my $val = $2;
+	    
+	    $op = ParseLikeOp($op);
+	    
+	    $Tickets->LimitSubject(VALUE => $val,
+				   OPERATOR => $op );
+	    }
+    }
+    
+    foreach $value (@limit_body) {
+	if ($value =~ /^(\W?)(.*?)$/i) {
+	    my $op = $1;
+	    my $val = $2;
+	    
+	    $op = ParseLikeOp($op);
+	    
+		$Tickets->LimitBody(VALUE => $val,
+				    OPERATOR => $op );
+	}	
+	
+    }
+    
+    
+    
+    # Dates
+    foreach my $date (@limit_created) {
+	my ($start, $end) = ParseDateRange($date);
+	$Tickets->LimitCreated ( VALUE => $start,
+				 OPERATOR => '>=' ) if ($start);
+	$Tickets->LimitCreated ( VALUE => $end,
+				 OPERATOR => '<=' ) if ($end);
+    }
+
+    foreach my $date (@limit_due) {
+	my ($start, $end) = ParseDateRange($date);
+	$Tickets->LimitDue ( VALUE => $start,
+				 OPERATOR => '>=' ) if ($start);
+	$Tickets->LimitDue ( VALUE => $end,
+				 OPERATOR => '<=' ) if ($end);
+    }
+
+    foreach my $date (@limit_starts) {
+	my ($start, $end) = ParseDateRange($date);
+	$Tickets->LimitStarts ( VALUE => $start,
+				 OPERATOR => '>=' ) if ($start);
+	$Tickets->LimitStarts ( VALUE => $end,
+				 OPERATOR => '<=' ) if ($end);
+    }
+
+    foreach my $date (@limit_started) {
+	my ($start, $end) = ParseDateRange($date);
+	$Tickets->LimitStarted ( VALUE => $start,
+				 OPERATOR => '>=' ) if ($start);
+	$Tickets->LimitStarted ( VALUE => $end,
+				 OPERATOR => '<=' ) if ($end);
+    }
+
+    foreach my $date (@limit_resolved) {
+	my ($start, $end) = ParseDateRange($date);
+	$Tickets->LimitResolved ( VALUE => $start,
+				 OPERATOR => '>=' ) if ($start);
+	$Tickets->LimitResolved ( VALUE => $end,
+				 OPERATOR => '<=' ) if ($end);
+    }
+
+    foreach my $date (@limit_lastupdated) {
+	my ($start, $end) = ParseDateRange($date);
+	$Tickets->LimitLastUpdated( VALUE => $start,
+				 OPERATOR => '>=' ) if ($start);
+	$Tickets->LimitLastUpdated ( VALUE => $end,
+				 OPERATOR => '<=' ) if ($end);
+    }
+
+    foreach my $link (@limit_memberof) {
+	$Tickets->LimitMemberOf($link);
+    }	
+
+    foreach my $link (@limit_hasmember) {
+	$Tickets->LimitHasMember($link);
+    }	
+
+    foreach my $link (@limit_dependson) {
+	$Tickets->LimitDependsOn($link);
+    }	
+
+    foreach my $link (@limit_dependedonby) {
+	$Tickets->LimitDependedOnBy($link);
+    }
+    foreach my $link (@limit_refersto) {
+	$Tickets->LimitRefersTo($link);
+    }	
+    
+    foreach my $link (@limit_referredtoby) {
+	$Tickets->LimitReferredToBy($link);
+    }	
+
+    
+    if ($limit_first){
+    }
+    if ($limit_rows){
+    }
+
+# }}}
+    
+    # {{{ Iterate through all tickets we found
+
+
+    my ($format, $titles, $code);
+    
+    #Set up the summary format if we need to
+    if (defined $summary) {
+	my $format_string = $summary || $ENV{'RT_SUMMARY_FORMAT'} || "%id4%status4%queue7%subject40%requestor16";
+
+	($format, $titles, $code) = BuildListingFormat($format_string);
+        printf "$format\n", eval "$titles";
+   }	
+
+ 
+
+    while (my $Ticket = $Tickets->Next()) {
+	$RT::Logger->debug ("Now working on ticket ". $Ticket->id);
+    
+	#Run through all the ticket modifications we might want to do
+	#TODO: these are all insufficiently lazy and should be replaced with some 
+	# nice foreaches.
+
+
+	# {{{ deal with watchers
+	
+	# add / delete requestors
+	foreach $value (@requestors) {
+	    if ($value =~ /^(\W?)(.*)$/) {
+		my $op = $1;
+		my $addr = $2;
+		
+		$Ticket->AddRequestor(Email => $addr) if ($op eq '+');
+		$Ticket->DeleteRequestor( $addr) if ($op eq '-');
+	    }	
+	}
+	
+	# add / delete ccs
+	foreach $value (@cc) {
+	    if ($value =~ /^(\W?)(.*)$/) {
+		my $op = $1;
+		my $addr = $2;
+		$Ticket->AddCc(Email => $addr) if ($op eq '+');
+		$Ticket->DeleteCc($addr) if ($op eq '-');
+	    }	
+	}	
+	
+	# add / delete adminccs
+        $RT::Logger->debug("Looking at admin ccs");
+	foreach $value (@admincc) {
+	    if ($value =~ /^(\W?)(.*)$/) {
+		my $op = $1;
+		my $addr = $2;
+		$Ticket->AddAdminCc(Email => $addr) if ($op eq '+');
+		$Ticket->DeleteAdminCc($addr) if ($op eq '-');
+	    }	
+	}	
+
+	# }}}
+	
+	# {{{ Deal with ticket keywords
+
+	my $KeywordSelects = $Ticket->QueueObj->KeywordSelects();
+        $RT::Logger->debug ("Looking at keywords");
+	foreach $value (@keywords) {
+           $RT::Logger->debug("Looking at --keyword=$value");
+	    if ($value =~ /^(\W?)(.*?)\/(.*)$/) {
+		my $op = $1;
+		my $select = $2;
+		my $keyword = $3;
+		
+		$RT::Logger->debug("Going to $op Keyword $select / $keyword");	
+		while (my $ks = $KeywordSelects->Next) {
+                    $RT::Logger->debug("$select is select ".$ks->Name." is found");
+		    next unless ($ks->Name =~ /$select/i);
+		    $RT::Logger->debug ("Found a match for $select\n"); 
+		    my $kids = $ks->KeywordObj->Descendents;
+    
+                    my ($kid);
+		    foreach $kid (keys %{$kids}) {
+                        $RT::Logger->debug("Now comparing $keyword with ".$kids->{$kid}. "\n");
+			next unless ($kids->{$kid} =~ /^$keyword$/i);
+		        $RT::Logger->debug("Going to $op $select / $keyword (".$kids->{$kid} .")");	
+			$Ticket->DeleteKeyword(KeywordSelect => $ks->id,
+					    Keyword => $kid) if ($op eq '-');
+			
+			$Ticket->AddKeyword(KeywordSelect => $ks->id,
+					    Keyword => $kid) if ($op eq '+');
+		    }
+		    
+		}
+	    }
+	}
+	# }}}
+	
+	# {{{ deal with links
+
+	# Deal with merging {
+	if ($mergeinto) {
+		my ($trans, $msg) =$Ticket->MergeInto($mergeinto);
+		print $msg."\n";
+	}	
+	# add /delete depends-ons
+
+	foreach my $value (@dependson) {
+	    if ($value =~ /^(\W?)(.*)$/) {
+		my $op = $1;
+		my $ticket = $2;
+		if (!$op or ($op eq '+')) {
+		    my ($trans, $msg) =
+		      $Ticket->AddLink(Type => 'DependsOn', Target => $ticket);
+		    print $msg."\n";
+		}
+		elsif ($op eq '-') {
+		    my ($trans, $msg) = 
+		      $Ticket->DeleteLink(Type => 'DependsOn', Target => $ticket);
+		    print $msg."\n";
+		}
+
+	    }
+	}
+	# add /delete member-of
+	foreach my $value (@memberof) {
+	    if ($value =~ /^(\W?)(.*)$/) {
+		my $op = $1;
+		my $ticket = $2;
+		if ($op eq '+') {
+		    my ($trans, $msg) =
+		      $Ticket->AddLink(Type => 'MemberOf', Target => $ticket);
+		    print $msg;
+		}
+		elsif ($op eq '-') {
+		    my ($trans, $msg) = 
+		      $Ticket->DeleteLink(Type => 'MemberOf', Target => $ticket);
+		    print $msg;
+		}
+
+	    }
+	}	
+	# add / delete refers-to
+		foreach my $value (@refersto) {
+	    if ($value =~ /^(\W?)(.*)$/) {
+		my $op = $1;
+		my $ticket = $2;
+		if ($op eq '+') {
+		    my ($trans, $msg) =
+		      $Ticket->AddLink(Type => 'RefersTo', Target => $ticket);
+		    print $msg;
+		}
+		elsif ($op eq '-') {
+		    my ($trans, $msg) = 
+		      $Ticket->DeleteLink(Type => 'RefersTo', Target => $ticket);
+		    print $msg;
+		}
+
+	    }
+	}
+
+	# }}}
+	
+	# {{{ deal with dates
+	
+	#set due 
+	if ($due) {
+	    my $iso = ParseDateToISO($due);
+	    if ($iso) {
+		$RT::Logger->debug("Setting due date to $iso ($due)");
+		my ($trans, $msg) = 
+		  $Ticket->SetDue($iso);
+		print $msg;
+	    }
+	    else {
+		print "Due date '$due' could not be parsed";
+	    }
+	}
+
+	#set starts
+	if ($starts) {
+	    my $iso = ParseDateToISO($due);
+	    if ($iso) {
+		my ($trans, $msg) = 
+		  $Ticket->SetStarts($iso);
+		print $msg."\n";
+	    }
+	    else {
+		print "Starts date '$starts' could not be parsed";
+	    }
+	}
+	#set started
+		if ($started) {
+	    my $iso = ParseDateToISO($started);
+	    if ($iso) {
+		my ($trans, $msg) = 
+		  $Ticket->SetStarted($iso);
+		print $msg."\n";
+	    }
+	    else {
+		print "Started date '$started' could not be parsed";
+	    }
+	}
+	#set contacted
+		if ($contacted) {
+	    my $iso = ParseDateToISO($contacted);
+	    if ($iso) {
+		my ($trans, $msg) = 
+		  $Ticket->SetContacted($iso);
+		print $msg."\n";
+	    }
+	    else {
+		print "Contacted date '$contacted' could not be parsed";
+	    }
+	}
+
+    # }}}
+	
+	# {{{ set other attributes
+
+	#Set subject
+	if ($subject) {
+	    my ($trans, $msg) = $Ticket->SetSubject($subject);
+	    print $msg."\n";
+	}
+	
+	#Set priority
+	if ($priority) {
+	    my ($trans, $msg) = 
+	      $Ticket->SetPriority($priority);
+	    print $msg."\n";
+	}
+	
+	#Set final priority
+	if ($final_priority) {
+	    my ($trans, $msg) =
+	      $Ticket->SetFinalPriority($final_priority);
+	    print $msg."\n";
+	}
+
+	#Set status
+	if ($status) {
+	    my ($trans, $msg) = 
+	      $Ticket->SetStatus($status);
+	    print $msg."\n";
+	}
+	
+	#Set time left
+	if ($time_left) {
+	    my ($trans, $msg) = 
+	      $Ticket->SetTimeLeft($time_left);
+	    print $msg."\n";
+	}
+
+	#Set time_taken 
+	if ($time_taken) {
+	    my ($trans, $msg) = 
+	      $Ticket->SetTimeTaken($time_taken);
+	    print $msg."\n";
+	}
+	
+	#Set owner
+	if ($owner) {
+	    my ($trans, $msg) =
+	      $Ticket->SetOwner($owner);
+	    print $msg."\n";
+	}
+
+        # Steal
+        if ($steal) {
+                my ($trans, $msg) =
+                 $Ticket->Steal();
+                 print $msg . "\n";
+        }
+	#Set queue 
+	if ($queue) {
+	    my ($trans, $msg) = 
+	      $Ticket->SetQueue($queue);
+	    print $msg."\n";
+	}
+
+    # }}}
+	
+
+
+	# {{{ Perform ticket comments/replies
+	if ($reply) {
+	    $RT::Logger->debug("Replying to ticket ".$Ticket->Id);
+	    
+	    my $linesref = GetMessageContent( Edit => $edit, Source => $source,
+					     CurrentUser => $CurrentUser
+					   );
+	    
+	    #TODO build this entity
+	    require MIME::Entity;
+	    my $MIMEObj = MIME::Entity->build(Data => $linesref);
+	    
+	    $Ticket->Correspond( MIMEObj => $MIMEObj ,
+				 TimeTaken => $time_taken);
+	}	
+	
+	elsif ($comment) {
+	    $RT::Logger->debug("Commenting on ticket ".$Ticket->Id);
+	
+	    my $linesref =GetMessageContent(Edit => $edit, Source => $source,
+					    CurrentUser => $CurrentUser);
+	    #TODO build this entity
+	    require MIME::Entity;
+	    my $MIMEObj = MIME::Entity->build(Data => $linesref);
+	    
+	    $Ticket->Comment( MIMEObj => $MIMEObj,
+			      TimeTaken => $time_taken);
+	}
+
+    # }}}
+	
+	# {{{ Display whatever we need to display
+
+	# {{{ Display a full ticket listing and history
+	if ($history) {
+	    #Display the history
+	    $RT::Logger->debug("Show history for ".$Ticket->id);
+	    
+	    if ($Ticket->CurrentUserHasRight("ShowTicket")) {
+		&ShowSummary($Ticket);
+		print "\n";
+		&ShowHistory($Ticket);
+	    }
+	    else {
+		print "You don't have permission to view that ticket.\n";
+	    }
+	}	
+
+	# }}}
+	
+	# {{{ Display a summary if we need to
+	if (defined $summary) {
+	    $RT::Logger->debug ("Show ticket summary with format $format");
+	    
+	    printf $format."\n", eval $code;
+	    
+	}	
+	# }}}
+
+	# }}}
+	
+    }
+
+    # }}}
+    
+}
+
+
+$RT::Handle->Disconnect();
+
+
+
+
+
+
+
+# {{{ sub ParseBooleanOp
+
+=head2 ParseBooleanOp
+
+  Takes an option modifier. returns the apropriate SQL operator.
+  If it's handed ! or -, returns !=.  Otherwise returns =.
+
+=cut
+
+sub ParseBooleanOp {
+    
+    my $op = shift;
+    
+    #so that !new limits to not new, etc
+    if ($op =~ /^(\!|-)/) {
+	$op = "!=";
+    }
+    else {
+	$op = "=";
+    }
+    
+    return($op);
+}
+
+# }}}
+
+# {{{ sub ParseLikeOp
+=head2 ParseLikeOp
+
+  Takes an option modifier. returns the apropriate SQL operator.
+  If it's handed ! or -, returns NOT  LIKE.  Otherwise returns LIKE
+
+=cut
+
+sub ParseLikeOp {
+    
+    my $op = shift;
+    
+    #so that !new limits to not new, etc
+    if ($op =~ /^(\!|-)/) {
+	$op = "NOT LIKE";
+    }
+    else {
+	$op = "LIKE";
+    }
+    
+    return($op);
+}
+# }}}
+
+# {{{ sub ParseDateToISO
+
+=head2 ParseDateToISO
+
+Takes a date in an arbitrary format.
+Returns an ISO date and time in GMT
+
+=cut
+
+sub ParseDateToISO {
+    my $date = shift;
+
+	my $date_obj = new RT::Date($CurrentUser);
+	$date_obj->Set( Format => 'unknown',
+			Value => $date
+		      );
+	return ($date_obj->ISO);
+}
+
+# }}}
+
+# {{{ sub ParseDateRange
+
+=head2 ParseDateRange [RANGE]
+
+Takes a range of dates of the form [<date>][-][<date>] and returns 
+starting and ending dates (as ISOs) If a date is specified as neither a starting nor ending 
+date, we parse it it as "midnight tonight to midnight tomorrow"
+
+=cut
+
+sub ParseDateRange {
+    my $in = shift;
+    my ($start, $end);
+    
+    
+    use RT::Date;
+    my $start_obj = new RT::Date($CurrentUser);
+    my $end_obj = new RT::Date($CurrentUser);
+    
+    if ($in =~ /^(.*?)-(.*?)$/) {
+	$start = $1;
+	$end = $2;
+
+	if ($start) {
+	    $start_obj->Set(Format => 'unknown', 
+			    Value => $start);
+	}
+	if ($end) {
+	    $end_obj->Set(Format => 'unknown', 
+			  Value => $end);
+	}
+    }
+    else {
+	$start = $in;
+	$end = $in;
+
+	$start_obj->Set(Format => 'unknown', 
+			Value => $start);
+	
+	$end_obj->Set(Format => 'unknown', 
+		      Value => $end);
+	
+	$start_obj->SetToMidnight();
+	$end_obj->SetToMidnight();
+	$end_obj->AddDay();
+    }	
+    
+    if ($start) {
+	$start = $start_obj->ISO;
+    }
+    if ($end) {
+	$end = $end_obj->ISO;
+    }
+
+    return ($start, $end);
+}
+
+# }}}
+
+# {{{ ParseRange
+=head2 ParseRange [RANGE]
+
+Takes a range of the form [<int>][-][<int>] and returns 
+a first and a last value. If the - is omitted, both $start and $end are the same.
+=cut
+
+sub ParseRange {
+    my $in = shift;
+    my ($start, $end);
+    
+    if ($in =~ /(.*?)-(.*?)/) {
+	$start = $1;
+	$end = $2;
+    }
+    else {
+	$start = $in;
+	$end = $in;
+    }	
+    
+    return ($start, $end);
+    
+
+    
+}
+
+# }}}
+	  
+# {{{ sub ShowSummary 
+
+sub ShowSummary  {
+    my $Ticket = shift;
+
+
+    print <<EOFORM;
+Serial Number: @{[$Ticket->Id]}   Status:@{[$Ticket->Status]} Worked: @{[$Ticket->TimeWorked]} minutes  Queue:@{[$Ticket->QueueObj->Name]}
+      Subject: @{[$Ticket->Subject]}
+   Requestors: @{[$Ticket->RequestorsAsString]}
+           Cc: @{[$Ticket->CcAsString]}
+     Admin Cc: @{[$Ticket->AdminCcAsString]}
+        Owner: @{[$Ticket->OwnerObj->Name]}
+     Priority: @{[$Ticket->Priority]} / @{[$Ticket->FinalPriority]}
+          Due: @{[$Ticket->DueAsString]}
+      Created: @{[$Ticket->CreatedAsString]} (@{[$Ticket->AgeAsString]})
+ Last Contact: @{[$Ticket->ToldAsString]} (@{[$Ticket->LongSinceToldAsString]})
+  Last Update: @{[$Ticket->LastUpdatedAsString]} by @{[$Ticket->LastUpdatedByObj->Name]}
+	         
+EOFORM
+
+my $selects = $Ticket->QueueObj->KeywordSelects();
+    #get the keyword selects
+    print "Keywords:\n";
+    while (my $select = $selects->Next) {
+	print "\t" .$select->Name .": ";
+	my $keys = $Ticket->KeywordsObj($select->id);	
+	while (my $key = $keys->Next) {
+	    print $key->KeywordObj->RelativePath($select->KeywordObj) . "  ";
+	    
+	}	
+	print "\n";
+    }
+    
+#iterate through the keyword selects.
+#print the keyword select and all the related keywords
+
+
+
+#TODO: finish link  descriptions
+print "Dependencies: \n";
+   while (my $l=$Ticket->DependedOnBy->Next) {
+       print $l->BaseObj->id," (",$l->BaseObj->Subject,") ",$l->Type," this ticket\n";
+   }
+   while (my $l=$Ticket->DependsOn->Next) {
+       print "This ticket ",$l->Type," ",$l->TargetObj->Id," (",$l->TargetObj->Subject,")\n";
+   }
+}
+
+# }}}
+
+# {{{ sub ShowHistory 
+sub ShowHistory  {
+    my $Ticket = shift;
+    my $Transaction;    
+    my $Transactions = $Ticket->Transactions;
+
+    while ($Transaction = $Transactions->Next) {
+      &ShowTransaction($Transaction);
+    }   
+  }
+# }}}
+
+# {{{ sub ShowTransaction 
+sub ShowTransaction  {
+  my $transaction = shift;
+  
+print <<EOFORM;
+==========================================================================
+Date: @{[$transaction->CreatedAsString]} (@{[$transaction->TimeTaken]} minutes)
+@{[$transaction->Description]}
+EOFORM
+    ;
+  my $attachments=$transaction->Attachments();
+  while (my $message=$attachments->Next) {
+    print <<EOFORM;
+--------------------------------------------------------------------------
+@{[$message->Headers]}
+EOFORM
+
+    if ($message->ContentType =~ m{^(text/plain|message|text$)}) {
+	print $message->Content;
+    } else {
+	print $message->ContentType, " not shown";
+    }
+  }
+  print "\n";
+  return();
+}
+# }}}
+
+
+# {{{ sub BuildListingFormat
+
+sub BuildListingFormat {
+    my $format_string = shift;
+
+    my ($id, @format, @code, @titles);
+    my ($field,$titles,$length, $format);
+
+    my $code = "";
+
+    # {{{ attribs
+    my $attribs = { id => { chars => '4',
+			    justify => 'r',
+			    title => 'id',
+			    value => '$Ticket->id',
+			  },
+		    
+		    queue => { chars => '8',
+			       justify => 'l',
+			       title => 'Queue',
+			       value => '$Ticket->QueueObj->Name' 
+			     },
+		    subject => { chars => '30',
+				 justify => 'l',
+				 title => 'Subject',
+				 value => '$Ticket->Subject',
+			       },
+		    priority => { chars => '2',
+				  justify => 'r',
+				  title => 'Pri',
+				  value => '$Ticket->Priority',
+				},
+		    final_priority => {  chars => '2',
+					 justify => 'r',
+					 title => 'Fin',
+					 value => '$Ticket->FinalPriority',
+				      },
+		    time_worked => { chars => '6',
+				     justify => 'r',
+				     title => 'Worked',
+				     value => '$Ticket->TimeWorked',
+				   },
+		    time_left => { chars => '5',
+				   justify => 'r',
+				   title => 'Left',
+				   value => '$Ticket->TimeLeft',
+			       
+				 },
+		
+		    status => {  chars => '6',
+				 justify => 'r',
+				 title => 'Status',
+				 value => '$Ticket->Status',
+			      },
+		    owner => {  chars => '10',
+				justify => 'r',
+				title => 'Owner',
+				value => '$Ticket->OwnerObj->Name'
+			     },
+		    requestor => {  chars => '10',
+				    justify => 'r',
+				    title => 'Requestor',
+				    value => '$Ticket->RequestorsAsString'
+				 },
+		    created => {  chars => '12',
+				  justify => 'r',
+				  title => 'Created',
+				  value => '$Ticket->CreatedAsString'
+			       },
+		    updated => {  chars => '12',
+				  justify => 'r',
+				  title => 'Updated',
+				  value => '$Ticket->LastUpdatedAsString'
+			       },
+		    due => {  chars => '12',
+			      justify => 'r',
+			      title => 'Due',
+			      value => '$Ticket->DueAsString'
+			   },
+		    told => {  chars => '12',
+			       justify => 'r',
+			       title => 'Told',
+			       value => '$Ticket->ToldAsString'
+			    },
+		
+		
+		
+		  };
+
+    # }}}
+    
+
+    foreach $field (split ('%',$format_string)) {
+	
+	if ($field =~ /^(\D*?)(\d*?)$/) {
+	    $id = $1;
+	    $length = $2;
+	}
+	else {	
+	    $RT::Logger->debug ("Error parsing $field\n");
+	}
+	if ($length) {
+	    push (@format, "%".$length.".".$length."s ");
+	    
+	    push (@code,  $attribs->{"$id"}->{'value'});
+		  
+	    push (@titles, "'". $attribs->{"$id"}->{title}. "'");
+	}
+	
+	
+    }
+     $code = join (',', @code);
+     $format = join (" ", @format);
+     $titles = join (', ', @titles);
+    
+  
+    return ($format, $titles, $code);
+}
+
+# }}}
+
+
+
+1;
diff --git a/rt/bin/rt-mailgate b/rt/bin/rt-mailgate
new file mode 100755
index 000000000..e6f0d95c5
--- /dev/null
+++ b/rt/bin/rt-mailgate
@@ -0,0 +1,367 @@
+#!!!PERL!! -w
+
+# $Header: /home/cvs/cvsroot/freeside/rt/bin/rt-mailgate,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# (c) 1996-2001 Jesse Vincent <jesse@fsck.com>
+# This software is redistributable under the terms of the GNU GPL
+
+
+package RT;
+use strict;
+use vars qw($VERSION $Handle $Nobody $SystemUser);
+
+$VERSION="!!RT_VERSION!!";
+
+
+use lib "!!RT_LIB_PATH!!";
+use lib "!!RT_ETC_PATH!!";
+
+use RT::Interface::Email  qw(CleanEnv LoadConfig DBConnect
+			     GetCurrentUser
+			     GetMessageContent
+			     CheckForLoops 
+			     CheckForSuspiciousSender
+			     CheckForAutoGenerated 
+			     ParseMIMEEntityFromSTDIN
+			     ParseTicketId 
+			     MailError 
+			     ParseCcAddressesFromHead
+			     ParseSenderAddressFromHead 
+			     ParseErrorsToAddressFromHead
+			    );
+
+#Clean out all the nasties from the environment
+CleanEnv();
+
+#Load etc/config.pm and drop privs
+LoadConfig();
+
+#Connect to the database and get RT::SystemUser and RT::Nobody loaded
+DBConnect();
+
+#Drop setgid permissions
+RT::DropSetGIDPermissions();
+
+use RT::Ticket;
+use RT::Queue;
+use MIME::Parser;
+use File::Temp;
+use Mail::Address;
+
+
+#Set some sensible defaults 
+my $Queue = 1;
+my $time = time;
+my $Action = "correspond";  
+
+my ($Verbose, $ReturnTid, $Debug);
+my ($From, $TicketId, $Subject,$SquelchReplies);
+
+# using --owner-from-extension, this will let you set ticket owner on create
+my $AssignTicketTo = undef;
+my ($status, $msg);
+
+# {{{ parse commandline 
+
+while (my $flag = shift @ARGV) {
+    if (($flag eq '-v') or ($flag eq '--verbose')) {
+	$Verbose = 1;
+    }
+    if (($flag eq '-t') or ($flag eq '--ticketid')) {
+	$ReturnTid = 1;
+    }
+    
+    if (($flag eq '-d') or ($flag eq '--debug')) {
+	$RT::Logger->debug("Debug mode enabled\n");
+	$Debug = 1;
+      }
+    
+    if (($flag eq '-q') or ($flag eq '--queue')) {
+	$Queue = shift @ARGV;
+    } 
+    if ($flag eq '--ticket-id-from-extension') {
+       $TicketId = $ENV{'EXTENSION'};
+    }
+    if ($flag eq '--queue-from-extension') {
+       $Queue = $ENV{'EXTENSION'};
+    }
+    if ($flag eq '--owner-from-extension') {
+        $AssignTicketTo = $ENV{'EXTENSION'};
+    }
+
+    if (($flag eq '-a') or ($flag eq '--action')) {
+	  $Action = shift @ARGV;
+    } 
+    
+    
+}
+
+# }}}
+
+# get the current mime entity from stdin
+my ($entity, $head) = ParseMIMEEntityFromSTDIN();
+
+#Get someone to send runtime errors to;
+my $ErrorsTo = ParseErrorsToAddressFromHead($head);
+
+#Get us a current user object.
+my $CurrentUser = GetCurrentUser($head, $entity, $ErrorsTo);
+
+# We've already performed a warning and sent the mail off to somewhere safe ($RTOwner).
+#  this is _exceedingly_ unlikely but we don't want to keep going if we don't have a current user
+
+unless ($CurrentUser->Id) {
+	exit(1);
+}
+
+my $MessageId = $head->get('Message-Id') || 
+  "<no-message-id-".time.rand(2000)."\@.$RT::Organization>";
+
+#Pull apart the subject line
+$Subject = $head->get('Subject') || "[no subject]";
+chomp $Subject;
+
+# Get the ticket ID unless it's already set
+$TicketId = ParseTicketId($Subject) unless ($TicketId);
+
+#Set up a queue object
+my $QueueObj = RT::Queue->new($CurrentUser);
+$QueueObj->Load($Queue);
+unless ($QueueObj->id ) {
+
+  MailError(To => $RT::OwnerEmail,
+                  Subject => "RT Bounce: $Subject",
+                  Explanation => "RT couldn't find the queue: $Queue",
+                  MIMEObj => $entity);
+
+}
+
+# {{{ Lets check for mail loops of various sorts.
+
+my $IsAutoGenerated = CheckForAutoGenerated($head);
+
+my $IsSuspiciousSender = CheckForSuspiciousSender($head);
+
+my $IsALoop = CheckForLoops($head);
+
+
+#If the message is autogenerated, we need to know, so we can not 
+# send mail to the sender
+if ($IsSuspiciousSender || $IsAutoGenerated || $IsALoop) {
+    $SquelchReplies = 1;
+
+    $ErrorsTo = $RT::OwnerEmail;
+    
+    #TODO: Is what we want to do here really 
+    #  "Make the requestor cease to get mail from RT"?
+    # This might wreak havoc with vacation-mailing users.
+    # Maybe have a "disabled for bouncing" state that gets
+    # turned off when we get a legit incoming message
+
+}
+
+
+# {{{ Warn someone  if it's a loop
+
+# Warn someone if it's a loop, before we drop it on the ground
+if ($IsALoop) {
+    $RT::Logger->crit("RT Received mail ($MessageId) from itself.");
+    
+    #Should we mail it to RTOwner?
+    if ($RT::LoopsToRTOwner) {
+	MailError(To => $RT::OwnerEmail,
+		  Subject => "RT Bounce: $Subject",
+		  Explanation => "RT thinks this message may be a bounce",
+		  MIMEObj => $entity);
+	
+	#Do we actually want to store it?
+	exit unless ($RT::StoreLoops);
+    }
+}
+
+# }}}
+
+
+   #Don't let the user stuff the RT-Squelch-Replies-To header.
+    if ($head->get('RT-Squelch-Replies-To')) {
+        $head->add('RT-Relocated-Squelch-Replies-To',
+                   $head->get('RT-Squelch-Replies-To'));
+        $head->delete('RT-Squelch-Replies-To')
+    }
+
+
+if ($SquelchReplies) {
+    ## TODO: This is a hack.  It should be some other way to
+    ## indicate that the transaction should be "silent".
+
+    my ($Sender, $junk) = ParseSenderAddressFromHead($head);
+    $head->add('RT-Squelch-Replies-To', $Sender);
+}
+
+# }}}
+
+
+# {{{ If we require that the sender be found in an external DB and they're not
+# forward this message to RTOwner
+
+
+
+if ($RT::LookupSenderInExternalDatabase && 
+    $RT::SenderMustExistInExternalDatabase )  {
+
+    MailError(To => $RT::OwnerEmail,
+	      Subject => "RT Bounce: $Subject",
+	      Explanation => "RT couldn't find requestor via its external database lookup",
+	      MIMEObj => $entity);
+    
+}
+
+# }}}
+
+# {{{ elsif we don't have a ticket Id, we're creating a new ticket
+
+
+
+elsif (!defined($TicketId)) {
+    
+    # {{{ Create a new ticket
+    if ($Action =~ /correspond/) {
+	
+	#    open a new ticket 
+	my @Requestors = ($CurrentUser->id);
+	
+	my @Cc;
+	if ($RT::ParseNewMessageForTicketCcs) {
+		@Cc = ParseCcAddressesFromHead(Head => $head, 
+					CurrentUser => $CurrentUser,
+					QueueObj => $QueueObj );
+	}
+
+	my $Ticket = new RT::Ticket($CurrentUser);
+	my ($id, $Transaction, $ErrStr) = 
+	  $Ticket->Create ( Queue => $Queue,
+			    Subject => $Subject,
+                            Owner => $AssignTicketTo,
+			    Requestor => \@Requestors,
+			    Cc => \@Cc,
+			    MIMEObj => $entity
+			  );
+	if ($id == 0 ) {
+	    MailError( To => $ErrorsTo,
+ 		       Subject => "Ticket creation failed",
+		       Explanation => $ErrStr,
+		       MIMEObj => $entity
+		     );
+	    $RT::Logger->error("Create failed: $id / $Transaction / $ErrStr ");
+	}	
+    }
+
+    # }}}
+    
+    else {
+	#TODO Return an error message
+	MailError( To => $ErrorsTo,
+		   Subject => "No ticket id specified",
+		   Explanation => "$Action aliases require a TicketId to work on",
+		   MIMEObj => $entity
+		 );
+	
+	$RT::Logger->crit("$Action aliases require a TicketId to work on ".
+			  "(from ".$CurrentUser->UserObj->EmailAddress.") ".
+			  $MessageId);
+    }
+}
+
+# }}}
+
+# {{{ If we've got a ticket ID, update the ticket
+
+else {
+    
+    #   If the action is comment, add a comment.
+    if ($Action =~ /comment/i){
+	
+	my $Ticket = new RT::Ticket($CurrentUser);
+	$Ticket->Load($TicketId);
+	unless ($Ticket->Id) {
+	    MailError( To => $ErrorsTo,
+		       Subject => "Comment not recorded",
+		       Explanation => "Could not find a ticket with id $TicketId",
+		       MIMEObj => $entity
+		     );
+	    #Return an error message saying that Ticket "#foo" wasn't found.
+	}
+	
+	($status, $msg) = $Ticket->Comment(MIMEObj=>$entity);
+	unless ($status) {
+	    #Warn the sender that we couldn't actually submit the comment.
+	    MailError( To => $ErrorsTo,
+		       Subject => "Comment not recorded",
+		       Explanation => $msg,
+		       MIMEObj => $entity
+		     );
+	}	
+    }
+
+    # If the message is correspondence, add it to the ticket
+    elsif ($Action =~ /correspond/i) {
+	my $Ticket = RT::Ticket->new($CurrentUser);
+	$Ticket->Load($TicketId);
+	
+	#TODO: Check for error conditions
+	($status, $msg) = $Ticket->Correspond(MIMEObj => $entity);
+	unless ($status) {
+
+	    #Return mail to the sender with an error
+	    MailError( To => $ErrorsTo,
+		       Subject => "Correspondence not recorded",
+		       Explanation => $msg,
+		       MIMEObj => $entity
+		     );
+	}
+    }
+
+    else {
+	#Return mail to the sender with an error
+	    MailError( To => $ErrorsTo,
+		       Subject => "RT Configuration error",
+		       Explanation => "'$Action' not a recognized action.".
+		                      " Your RT administrator has misconfigured ".
+		                      "the mail aliases which invoke RT" ,
+		       MIMEObj => $entity
+		     );
+
+	$RT::Logger->crit("$Action type unknown for $MessageId");
+	
+    }
+    
+}
+
+# }}}
+
+$RT::Handle->Disconnect();
+
+
+# Everything below this line is a helper sub. most of them will eventually
+# move to Interface::Email
+
+#When we call die, trap it and log->crit with the value of the die.
+$SIG{__DIE__}  = sub {
+    unless ($^S || !defined $^S ) {
+        $RT::Logger->crit("$_[0]");
+	MailError( To => $ErrorsTo,  
+		   Bcc => $RT::OwnerEmail,
+		   Subject => "RT Critical error. Message not recorded!",
+		   Explanation => "$_[0]",
+		   MIMEObj => $entity
+		 );
+	exit(-1);
+    }
+    else {
+        #Get out of here if we're in an eval
+        die $_[0];
+    }
+};
+
+
+
+1;
diff --git a/rt/bin/rtadmin b/rt/bin/rtadmin
new file mode 100644
index 000000000..25ba1b06a
--- /dev/null
+++ b/rt/bin/rtadmin
@@ -0,0 +1,1040 @@
+#!!!PERL!! -w
+#
+# $Header: /home/cvs/cvsroot/freeside/rt/bin/Attic/rtadmin,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# RT is (c) 1996-2001 Jesse Vincent <jesse@fsck.com>
+
+use strict;
+use Carp;
+use Getopt::Long qw(:config pass_through);
+
+use lib "!!RT_LIB_PATH!!";
+use lib "!!RT_ETC_PATH!!";
+
+use RT::Interface::CLI  qw(CleanEnv LoadConfig DBConnect 
+			   GetCurrentUser GetMessageContent);
+
+#Clean out all the nasties from the environment
+CleanEnv();
+
+#Load etc/config.pm and drop privs
+LoadConfig();
+
+#Connect to the database and get RT::SystemUser and RT::Nobody loaded
+DBConnect();
+
+#Drop setgid permissions
+RT::DropSetGIDPermissions();
+
+#Get the current user all loaded
+my $CurrentUser = GetCurrentUser();
+
+unless ($CurrentUser->Id) {
+        print "No RT user found. Please consult your RT administrator.\n";   
+        exit(1);
+}
+
+
+
+
+PickMode();
+
+
+# {{{ Help
+
+sub Help {
+
+    # {{{ help_acl
+my $help_acl ="
+        Access control
+	--grant-right <right> 
+	--revoke-right <right>
+	  --userid <user>
+          --groupid <group>
+	--list-rights";
+
+# }}}
+    
+    # {{{ help_keyword_sel
+my $help_keyword_sel = "
+       Keyword Selections
+       --add-keyword-select
+       --modify-keyword-select <name>
+          --ks-name <name>
+          --ks-keyword <keyword>
+          --ks-single 
+          --ks-multiple
+          --ks-depth  <int>
+
+        --disable-keyword-select <name>";
+# }}}
+    
+    # {{{ help_scrip
+my $help_scrip = "
+        Scrips
+        --create-scrip
+           --scrip-condition <condition name or id>
+           --scrip-action <action name or id>
+           --scrip-template <template name or id>
+
+        --delete-scrip <id>
+	--list-scrips";
+
+# }}}
+    
+    # {{{ help_template  
+my $help_template = "      
+        Templates
+        --delete-template [<id>|<name>]
+        --display-template [<id>|<name>]
+
+         --create-template
+         --modify-template [<id>|<name>]
+           Flags for --create-template and --modify-template
+           --template-name
+           --template-description
+           --template-edit-content
+         
+         --list-templates";
+
+# }}}
+    
+    
+print <<EOF;
+
+USAGE:  rtadmin --user <userid> [Userflags]
+	rtadmin --list-users
+	rtadmin --queue <queueid> [Queueflags]
+	rtadmin --list-queues
+	rtadmin --group [groupflags]
+	rtadmin --list-groups
+	rtadmin --system  [SystemFlags]
+	rtadmin --keyword [keywordflags]
+
+User configuration for --user <userid>
+   
+  	--disable
+  	--create
+	--display
+
+  Core Attributes
+	--userid
+	--gecos
+	--password
+	--emailaddress
+	--privileged
+	--comments
+	--signature
+	--organization
+
+  Names	
+	--realname
+	--nickname
+	
+  Auth and external info
+	--externalcontactinfoid
+	--contactinfosystem
+	--externalauthid
+	--authsystem
+
+  Phone numbers
+	--pagerphone
+	--workphone
+	--mobilemphone
+	--homephone
+
+  Paper address
+	--address1
+	--address2
+	--city
+	--state
+	--zip
+	--country
+	--freeformcontactqinfo	
+
+
+Group Configuration for --group <groupid>
+	--create 
+	--delete
+	--display
+
+	--name <new name>
+	--description <new description>
+
+
+
+	--add-member <userid>
+	--delete-member <userid>
+	--list-members	
+
+Queue Configuration for --queue <queueid>
+	--create
+	--disable
+	--display
+
+	--name <name>
+	--correspondaddress <email address>
+	--commentaddress <email address>
+	--initialpriority <int>
+	--finalpriority <int>
+	--defaultduein <days>
+
+	--add-cc <email address>
+	--delete-cc <email address>
+	--add-admincc <email address>
+	--delete-admincc <email address>
+        --list-watchers
+
+	
+
+$help_acl
+
+$help_keyword_sel
+
+$help_template
+
+$help_scrip
+
+
+System configuration for --system 
+
+$help_acl
+
+$help_keyword_sel
+
+$help_template
+
+$help_scrip
+
+
+Keyword configuration for --keyword  <fully qualified name>
+	--list-children
+  	--create-child <name>
+	--disable
+	--name <new name>
+	--description <new description>
+
+EOF
+
+
+
+}
+
+# }}}
+
+# {{{ PickMode
+
+sub PickMode {
+    my ($user,$group, $queue, $system, $keyword, $listusers, 
+	$listgroups, $listqueues, $help);
+
+
+    GetOptions ('help|h|usage' => \$help,
+		'user=s' => \$user,
+		'queue=s' => \$queue,
+		'group=s' => \$group,
+		'system' => \$system,
+		'keyword=s', => \$keyword,
+		'list-users' => \$listusers,
+		'list-queues' => \$listqueues,
+		'list-groups' => \$listgroups,
+	       );
+    
+
+    
+    if ($user)          { AdminUser($user) }  
+    elsif ($group)      { AdminGroup($group) }
+    elsif ($queue)      { AdminQueue($queue) }
+    elsif ($system)     { AdminSystem($system) }
+    elsif ($keyword)    { AdminKeywords($keyword) }
+    elsif ($listusers)  { ListUsers() }
+    elsif ($listgroups) { ListGroups()  }
+    elsif ($listqueues) { ListQueues() }
+    elsif ($help)       { Help()}
+    else {
+	print "No command found\n";
+    }
+    exit(0);
+}	
+
+# }}}
+
+# {{{ AdminUser
+
+sub AdminUser {
+    my $user=shift;
+    my %args;
+
+    GetOptions(\%args,
+	   'create', 'disable|delete', 'display',
+	   'Name=s', 'Gecos=s', 'Password=s',
+	   'EmailAddress=s', 'Privileged=s', 'Comments=s', 'Signature=s',
+	   'Organization=s', 'RealName=s', 'NickName=s',  
+	   'ExternalContactInfoId=s', 'ContactInfoSystem=s', 
+           'ExternalAuthId=s', 'AuthSystem=s',
+	   'HomePhone=s', 'WorkPhone=s', 'MobilePhone=s', 'PagerPhone=s',
+           'Address1=s', 'Address2=s', 'City=s', 'State=s', 'Zip=s', 
+           'Country=s', 'FreeformContactInfo=s');
+
+    my $user_obj = new RT::User($CurrentUser);
+    
+ 
+    #Create the user if we need to 
+    if ($args{'create'}) {
+	my ($status, $msg) = 
+	  $user_obj->Create( Name => ($args{'Name'} || $user),
+			     Gecos => $args{'Gecos'},
+			     Password => $args{'Password'},
+			     EmailAddress => $args{'EmailAddress'},
+			     Privileged => $args{'Privileged'},
+			     Comments => $args{'Comments'},
+			     Signature => $args{'Signature'},
+			     Organization => $args{'Organization'},
+			     RealName => $args{'RealName'},
+			     NickName => $args{'NickName'},
+			     ExternalContactInfoId => $args{'ExternalContactInfoId'},
+			     ContactInfoSystem => $args{'ContactInfoSystem'},
+			     ExternalAuthId => $args{'ExternalAuthId'},
+			     AuthSystem => $args{'AuthSystem'},
+			     HomePhone => $args{'HomePhone'},
+			     WorkPhone => $args{'WorkPhone'},
+			     MobilePhone => $args{'MobilePhone'},
+			     PagerPhone => $args{'PagerPhone'},
+			     Address1 => $args{'Address1'},
+			     Address2 => $args{'Address2'},
+			     City  => $args{'City'},
+			     State => $args{'State'},
+			     Zip => $args{'Zip'},
+			     FreeformContactInfo => $args{'FreeformContactInfo'}
+			   );
+	
+	print "$msg\n";
+	return();
+	
+    }
+    else {
+	
+	
+	#Load the user
+	$user_obj->Load($user);
+	
+	unless ($user_obj->id) {
+	    print "User '$user' not found\n";
+	    return();
+	}	
+	
+	
+	
+	#modify the user if we need to
+	my @attributes = ('Name', 'Gecos',
+			  'EmailAddress', 'Privileged', 'Comments', 'Signature',
+			  'Organization', 'RealName', 'NickName',  
+			  'ExternalContactInfoId', 'ContactInfoSystem', 
+			  'ExternalAuthId', 'AuthSystem',
+			  'HomePhone', 'WorkPhone', 'MobilePhone', 'PagerPhone',
+			  'Address1', 'Address2', 'City', 'State', 'Zip', 
+			  'Country', 'FreeformContactInfo');
+	foreach my $attrib (@attributes) {
+	    if ( (exists ($args{"$attrib"})) and
+		 ($user_obj->$attrib() ne $args{"$attrib"})) {
+		
+		my $method = "Set$attrib";
+		my ($val, $msg) = $user_obj->$method($args{"$attrib"});
+		print "User ".$user_obj->Name. " $attrib:  $msg\n";
+		
+	    }
+	}		
+	
+	if (exists ($args{'Password'})) {
+	    my ($code, $msg);
+	    ($code, $msg) = $user_obj->SetPassword($args{'Password'});
+	    print "User ". $user_obj->Name. ' Password: '. $msg . "\n";
+	}
+	
+	#Check if we need to display the user
+	if ($args{'display'}) {
+	    foreach my $attrib (@attributes) {
+		next if ($attrib eq 'Password'); #Can't see the password
+		printf("%22.22s %-64s\n",$attrib, ($user_obj->$attrib()||'(undefined)'));
+		
+	    }	
+	}	
+	
+	#Check if we need to delete the user
+	if ($args{'disable'}) {
+	    my ($val, $msg) = $user_obj->SetDisabled(1);
+	    print "$msg\n";
+	}	
+	
+    }
+}
+
+# }}}
+
+# {{{ AdminQueue
+
+sub AdminQueue {
+    my $queue=shift;
+    my %args;
+
+    GetOptions(\%args,
+	       'create', 'disable|delete', 'display',
+	       'Name=s', 'CorrespondAddress=s', 'Description=s',
+	       'CommentAddress=s', 'InitialPriority=n', 'FinalPriority=n',
+	       'DefaultDueIn=n',
+	       
+	       'add-cc=s@', 'add-admincc=s@', 
+	       'delete-cc=s@', 'delete-admincc=s@',
+	       'list-watchers', 'create-template'
+	       );
+
+    use RT::Queue;
+    my $queue_obj = new RT::Queue($CurrentUser);
+    
+    #Create the queue if we need to 
+    if ($args{'create'}) {
+	my ($status, $msg) = 
+	  $queue_obj->Create(
+			     Name => ($args{'Name'} || $queue) ,
+			     CorrespondAddress => $args{'CorrespondAddress'},
+			     Description => $args{'Description'},
+			     CommentAddress  => $args{'CommentAddress'},
+			     InitialPriority => $args{'InitialPriority'},
+			     FinalPriority => $args{'FinalPriority'},
+			     DefaultDueIn => $args{'DefaultDueIn'}
+			    );
+	
+	print "$msg\n";
+    }
+    else {
+	#Load the queue
+	$queue_obj->Load($queue);
+	
+	unless ($queue_obj->id) {
+	    print "Queue '$queue' not found\n";
+	    return();
+	}	
+		
+        #modify if we need to
+	my @attributes = qw(Name CorrespondAddress Description
+			    CommentAddress InitialPriority FinalPriority
+			    DefaultDueIn
+			 );
+	foreach my $attrib (@attributes) {
+	    if ( (exists ($args{"$attrib"})) and
+		 ($queue_obj->$attrib() ne $args{"$attrib"})) {
+		
+		my $method = "Set$attrib";
+		my ($val, $msg) = $queue_obj->$method($args{"$attrib"});
+		print "Queue ".$queue_obj->Name. " $attrib:  $msg\n";
+		
+	    }
+	}		
+	    
+	
+	#Check if we need to display the queue
+	if ($args{'display'}) {
+	    foreach my $attrib (@attributes) {
+		printf("%22.22s %-64s\n",$attrib, ($queue_obj->$attrib()||'(undefined)'));
+		
+	    }	
+	}	
+       	
+	foreach my $person (@{$args{'add-cc'}}) {
+	    my ($val, $msg) = $queue_obj->AddCc(Email => $person);
+	    print "$msg\n";
+	}
+	foreach my $person (@{$args{'add-admincc'}}) {
+	    my ($val, $msg) = $queue_obj->AddAdminCc(Email => $person);
+	    print "$msg\n";
+	}
+
+	foreach my $person (@{$args{'delete-cc'}}) {
+	    my ($val, $msg) = $queue_obj->DeleteCc($person);
+	    print "$msg\n";
+	}
+	foreach my $person (@{$args{'delete-admincc'}}) {
+	    my ($val, $msg) = $queue_obj->DeleteAdminCc($person);
+	    print "$msg\n";
+	}
+
+	if ($args{'list-watchers'}) {
+	    require RT::Watchers;
+	    my $watchers = new RT::Watchers($CurrentUser);
+	    $watchers->LimitToQueue($queue_obj->id);
+	    while (my $watcher = $watchers->Next()) {
+		printf("%10s %-60s\n",
+		       $watcher->Type, $watcher->Email );
+	    }	
+	}	
+
+        AdminTemplates($queue_obj->Id());
+        AdminScrips($queue_obj->Id());
+	AdminRights($queue_obj->Id());
+	AdminKeywordSelects($queue_obj->Id());
+
+	#Check if we need to delete the queue
+	if ($args{'disable'}) {
+	    my ($val, $msg) = $queue_obj->SetDisabled(1);
+	    print "$msg\n";
+	}	
+	
+    }
+}
+
+# }}}
+
+# {{{ AdminKeywords
+
+sub AdminKeywords {
+    my $keyword = shift;
+    
+    my %args;
+    GetOptions(\%args, 'list-children', 'create-child=s', 'disable|delete', 'Name=s', 'Description=s');
+    
+    use RT::Keyword;
+    
+    my $key_obj = new RT::Keyword($CurrentUser);
+    my $key_id;
+    
+    #If we're dealing with the root of the keyword list
+    if ($keyword eq '/') {
+	$key_id=0;
+    }	
+    else {
+	my ($val, $msg) = $key_obj->LoadByPath( $keyword );
+	unless ($val) {
+	    print $msg ."\n";
+	}
+	$key_id = $key_obj->Id();
+    }	
+    
+    if ($args{'create-child'}) {
+	my $child = new RT::Keyword($CurrentUser);
+	
+	my ($val, $msg) = $child->Create( Parent => $key_id,
+					  Name => $args{'create-child'},
+					);
+	print $msg ."\n";
+    }	
+    
+    elsif ($args{'list-children'}) {
+	my $keywords;
+	if ($key_obj->id) {
+	    $keywords = $key_obj->Children();
+	}	
+	#If we didn't actually have a keyword object, we need to create our own Keywords object.
+	else {
+	    $keywords = new RT::Keywords($CurrentUser);
+	    $keywords->LimitToParent(0); 
+	}
+	
+	while (my $key=$keywords->Next) {
+	    print $key->Name;
+	    if ($key->Description) {
+		print " (" . $key->Description .")";
+	    }	
+	    print "\n";
+	}	
+	      
+
+    }	
+    
+    #Else we wanna do some modification.
+    else {
+	
+	#If we didn't load a keyword, get out
+	return(undef) unless ($key_obj->Id);
+	
+	
+	my @attributes = qw( Name Description );
+	foreach my $attrib (@attributes) {
+	    if ( (exists ($args{"$attrib"})) and
+		 ($key_obj->$attrib() ne $args{"$attrib"})) {
+		
+		my $method = "Set$attrib";
+		my ($val, $msg) = $key_obj->$method($args{"$attrib"});
+		
+		print "Keyword ".$key_obj->Name. " $attrib:  $msg\n";	    }
+	}
+	
+	if ($args{'disable'}) {
+	    $key_obj->SetDisabled(1);
+	    
+	}
+	
+    }
+}
+
+# }}}
+
+# {{{ AdminKeywordSelects
+
+sub AdminKeywordSelects {
+    my $queue = shift;
+    # O for queue means global
+
+    my %args;
+    GetOptions(\%args, 'add-keyword-select','disable-keyword-select|delete-keyword-select=s',
+	       'modify-keyword-select=s', 
+	       'keyword-select-Keyword|ks-keyword=s', 
+	       'keyword-select-Single|ks-single', 
+	       'keyword-select-Multiple|ks-multiple', 
+	       'keyword-select-Depth|ks-depth=i', 
+	       'keyword-select-Name|ks-name=s'
+	      );
+
+    # sanitize single vs multiple.
+    if ($args{'keyword-select-Multiple'}) {
+	$args{'keyword-select-Single'} = 0;
+    }
+    
+    use RT::KeywordSelect;
+    my $keysel_obj = new RT::KeywordSelect($CurrentUser);
+    if ($args{'add-keyword-select'}) {
+	
+	my ($val, $msg) = $keysel_obj->Create( Keyword => $args{'keyword-select-Keyword'},
+					       Depth => $args{'keyword-select-Depth'},
+					       Single => $args{'keyword-select-Single'},
+					       Name => $args{'keyword-select-Name'},
+					       ObjectType => 'Ticket',
+					       ObjectField => 'Queue',
+					       ObjectValue => $queue);
+	print $msg ."\n";
+    }	
+    elsif ($args{'modify-keyword-select'}) {
+	$keysel_obj->LoadByName(Name => $args{'modify-keyword-select'},
+				Queue => $queue
+			       );
+	
+	unless ($keysel_obj->Id()) {
+	    print "Keyword select not found\n";
+	    return();
+	}	
+	my @attributes = qw( Name Keyword Single Depth );
+	foreach my $attrib (@attributes) {
+	    if ( (exists ($args{"keyword-select-$attrib"})) and
+		 ($keysel_obj->$attrib() ne $args{"keyword-select-$attrib"})) {
+		
+		my $method = "Set$attrib";
+		my ($val, $msg) = $keysel_obj->$method($args{"keyword-select-$attrib"});
+				
+		print "Keyword select ".$keysel_obj->Name. " $attrib:  $msg\n";	    }
+	}
+
+
+    }	
+
+    
+    elsif ($args{'disable-keyword-select'}) {
+	$keysel_obj->LoadByName(Name => $args{'disable-keyword-select'},
+				Queue => $queue);
+	
+	$keysel_obj->SetDisabled(1);
+	
+    }
+}
+
+# }}}
+
+# {{{ AdminGroup
+
+sub AdminGroup {
+    my $group = shift;
+
+    my (%args);
+
+    GetOptions(\%args,
+	       'create', 'delete', 'display',
+	       'Name=s', 'Description=s',
+	       	       
+	       'add-member=s@', 'delete-member=s@',
+	       'list-members'
+	       );
+
+
+    use RT::Group;
+    my $group_obj = new RT::Group($CurrentUser);
+    unless ($group) {
+	print "Group not specified.\n";
+	return();
+    }	
+    
+
+    #Create the group if we need to
+    if ($args{'create'}) {
+	my ($val, $msg) = $group_obj->Create( Name => ($args{'Name'} || $group),
+					      Description => $args{'Description'} );
+	print $msg ."\n";
+    }	
+    #otherwise we load it
+    else {
+	$group_obj->Load($group);
+    }	
+    
+    #If we have no group object, get the hell out
+    unless ($group_obj->Id) {
+	print "Group not found.\n";
+    }
+
+    if ($args{'delete'}) {
+	my ($val, $msg) = $group_obj->Delete();
+	print $msg ."\n";
+	return();
+    }	
+
+
+    
+    #modify if we need to
+    my @attributes = qw(Name Description
+			
+		       );
+    foreach my $attrib (@attributes) {
+	if ( (exists ($args{"$attrib"})) and
+	     ($group_obj->$attrib() ne $args{"$attrib"})) {
+		
+	    my $method = "Set$attrib";
+	    my ($val, $msg) = $group_obj->$method($args{"$attrib"});
+	    print "Group ".$group_obj->Name. " $attrib:  $msg\n";
+	    
+	    }
+    }		
+    
+    foreach my $user (@{$args{'add-member'}}) {
+	my ($val, $msg) = $group_obj->AddMember($user);
+	print $msg. "\n";
+    }
+    foreach my $user (@{$args{'delete-member'}}) {
+	my ($val, $msg) = $group_obj->DeleteMember($user);
+	print $msg ."\n";
+    }
+    
+    if ($args{'list-members'}) {
+	my $members = $group_obj->MembersObj();
+	while (my $member = $members->Next()) {
+	    print $member->UserObj->Name() ."\n";
+	}
+    }	
+    
+}
+
+# }}}
+
+# {{{ AdminSystem
+sub AdminSystem {
+    print "In AdminSystem\n";
+
+    AdminTemplates(0);
+    AdminScrips(0);
+    AdminRights(0);
+    AdminKeywordSelects(0);
+}
+# }}}
+
+# {{{ sub AdminTemplates
+
+sub AdminTemplates {
+    my $queue = shift;
+    #Queue = 0 means 'global';
+
+    my %args;
+
+    
+    GetOptions(\%args, 'list-templates', 'create-template','modify-template=s',
+	       'delete-template=s', 'display-template=s',
+	       'template-Name=s', 'template-Description=s',
+	       'template-edit-content!');
+    
+    # {{{ List templates
+    if ($args{'list-templates'}) {
+	print "Templates for $queue\n";
+	require RT::Templates;
+	my $templates = new RT::Templates($CurrentUser);
+	if ($queue != 0) {
+	    $templates->LimitToQueue($queue);
+	}	
+	else {
+	    $templates->LimitToGlobal();
+	}	
+	while (my $template = $templates->Next) {
+	    print $template->Id.": ".$template->Name." - " . $template->Description ."\n";
+	}	
+    }
+
+    # }}}
+
+    require RT::Template;	
+    my $template = new RT::Template($CurrentUser);
+    if ($args{'delete-template'}) {
+	$template->Load($args{'delete-template'});
+	unless ($template->id) {
+	    print "Couldn't load template";
+	    return(undef);
+	}
+	my ($val, $msg) = $template->Delete();
+	print "$msg\n";
+    }
+    elsif ($args{'create-template'}) {
+	#TODO edit the template content
+	my $content;
+
+	my $linesref = GetMessageContent(CurrentUser => $CurrentUser,
+				      Edit => 1);
+	
+	$content = join("\n", @{$linesref});
+	
+
+	my ($val, $msg) = $template->Create(Name => $args{'template-Name'},
+					    Description => $args{'template-Description'},
+					    Content => $content,
+					    Queue => $queue);
+	print "$msg\n";
+    }	
+    elsif ($args{'modify-template'}) {
+	
+	$template->Load($args{'modify-template'});
+	unless ($template->Id()) {
+	    print "Template not found\n";
+	    return();
+	}	
+	my @attributes = qw( Name Description );
+	foreach my $attrib (@attributes) {
+	    if ( (exists ($args{"template-$attrib"})) and
+		 ($template->$attrib() ne $args{"template-$attrib"})) {
+		
+		my $method = "Set$attrib";
+		my $val = $template->$method($args{"template-$attrib"});
+				
+	    }
+	}
+	if ($args{'template-edit-content'}) {
+	    
+	    my $linesref = GetMessageContent(CurrentUser => $CurrentUser,
+					     Content => $template->Content,
+					     Edit => 1);
+	    
+	    my $content = join("\n", @{$linesref});	    
+	    my ($val) = $template->SetContent($content);
+	    print $val."\n";
+	}	
+
+    }	
+    if ($args{'display-template'}) {
+	$template->Load($args{'display-template'});
+	print $template->Name . "\n". $template->Description ."\n". $template->Content."\n";
+    }	
+}	
+
+# }}}
+
+# {{{ sub AdminScrips
+
+sub AdminScrips {
+    my $queue = shift;
+    #Queue = 0 means 'global';
+
+    my %args;
+
+    
+    GetOptions(\%args, 'list-scrips', 'create-scrip','modify-scrip=s',
+	       'scrip-action=s', 'scrip-template=s', 'scrip-condition=s',
+	       'delete-scrip=s');
+
+    
+    # {{{ List entries
+    if ($args{'list-scrips'}) {
+	print "Scrips for $queue\n";
+	require RT::Scrips;
+	my $scrips = new RT::Scrips($CurrentUser);
+	if ($queue != 0) {
+	    $scrips->LimitToQueue($queue);
+	}	
+	else {
+	    $scrips->LimitToGlobal();
+	}	
+	while (my $scrip = $scrips->Next) {
+	    print $scrip->Id.": If ".
+	      $scrip->ConditionObj->Name." then " .
+		$scrip->ActionObj->Name." with template " .
+		  $scrip->TemplateObj->Name."\n";
+	}	
+    }
+
+    # }}}
+
+    require RT::Scrip;
+    my $scrip = new RT::Scrip($CurrentUser);
+    if ($args{'delete-scrip'}) {
+	$scrip->Load($args{'delete-scrip'});
+	unless ($scrip->id) {
+	    print "Couldn't load scrip";
+	      return(undef);
+	}
+	my ($val, $msg) = $scrip->Delete();
+	print "$msg\n";
+    }
+    elsif ($args{'create-scrip'}) {
+	my ($val, $msg) = $scrip->Create( ScripAction => $args{'scrip-action'},
+					  ScripCondition => $args{'scrip-condition'},
+					  Template => $args{'scrip-template'},
+					  Queue => $queue);
+
+	print "$msg\n";
+    }	
+}	
+
+# }}}
+
+# {{{ sub AdminRights
+
+sub AdminRights {
+    my $queue = shift;
+    #Queue = 0 means 'global';
+
+    my ($scope, $appliesto);
+    if ($queue == 0) {
+	$scope = 'System';
+	$appliesto = 0;
+    }	
+    else {
+	$scope =  'Queue';
+	$appliesto = $queue;
+    }	
+
+    my %args;    
+    GetOptions(\%args, 
+	       'grant-right|add-right|new-right|create-right=s@',
+	       'revoke-right|del-right|delete-right=s@',
+	       'list-rights', 'userid=s@', 'groupid=s@',
+	      );
+    
+    
+    # {{{ List entries
+    if ($args{'list-rights'}) {
+	require RT::ACL;
+	my $acl = new RT::ACL($CurrentUser);
+	if ($queue != 0) {
+	    $acl->LimitToQueue($queue);
+	}	
+	else {
+	    $acl->LimitToSystem();
+	}	
+	while (my $ace = $acl->Next) {
+	    print $ace->RightScope;
+	    
+	    #Print the queue name if we have it.
+	    print " " . $ace->AppliesToObj->Name if (defined $ace->AppliesToObj);
+	    
+	    print ": ". $ace->PrincipalType . " " .$ace->PrincipalObj->Name .
+	      " has right " . $ace->RightName ."\n";
+	      
+	}	
+    }
+
+    # }}}
+
+    require RT::ACE;    
+
+    # {{{ Build up an array of principals
+    my (@principals);
+    my $i = 0;
+    foreach my $group (@{$args{'groupid'}}) { 
+
+
+	my $princ = new RT::Group($CurrentUser);
+	$princ->Load("$group");
+	if ($princ->id) {
+	    $principals[$i]->{'type'} = 'Group';
+	    $principals[$i]->{'id'} = $princ->id();
+	    $i++;
+	}	
+	else {
+	    print "Could not find group $group\n";
+	}	
+    }	
+
+
+    foreach my $user (@{$args{'userid'}}) { 
+	my $princ = new RT::User($CurrentUser);
+	$princ->Load("$user");
+	if ($princ->id) {
+	    $principals[$i]->{'type'} = 'User';
+	    $principals[$i]->{'id'} = $princ->id();
+	    $i++;
+	}	
+	else {
+	    print "Could not find user $user.\n";
+	    }
+    }
+    # }}}
+
+
+    foreach my $principal (@principals) {
+
+	# {{{ Delete rights that need deleting
+	foreach my $right (@{$args{'revoke-right'}}) {
+	    my $ace = new RT::ACE($CurrentUser);
+	    $RT::Logger->debug("Trying to delete a right: $right \n");
+	    my ($val, $msg) = $ace->LoadByValues( RightName => $right,
+						  RightScope => $scope,
+						  PrincipalType => $principal->{'type'},
+						  PrincipalId => $principal->{'id'},
+						  RightAppliesTo => $appliesto);
+	    
+	    unless ($val) {
+		print "Right $right not found for" . $principal->{'type'} . " " .
+		  $principal->{'id'} . " in scope $scope ($appliesto)\n";
+		next;
+	    }	
+	    my ($delval, $delmsg) =$ace->Delete;
+	    print "$delmsg\n";
+	    
+	    
+	}
+
+	# }}}
+	
+	# {{{ grant rights that need granting
+	foreach my $right (@{$args{'grant-right'}}) {
+	    my $ace = new RT::ACE($CurrentUser);
+	    my ($val, $msg) = $ace->Create(RightName => $right,
+					   PrincipalType => $principal->{'type'},
+					   PrincipalId => $principal->{'id'},
+					   RightScope => $scope,
+					   RightAppliesTo => $appliesto);
+	    
+	    print $msg . "\n";
+	}
+
+	# }}}
+    }	
+
+}
+
+# }}}
+
+
+sub ListUsers {
+    require RT::Users;
+    my $users = new RT::Users($CurrentUser);
+    $users->UnLimit();
+    while (my $user = $users->Next()) {
+	printf ("%16s %-16s\n",$user->Name(), $user->EmailAddress());
+    }
+}
+sub ListQueues {
+    require RT::Queues;
+    my $queues = new RT::Queues($CurrentUser);
+    $queues->UnLimit();
+    while (my $queue = $queues->Next()) {
+	printf ("%16s %-16s\n",$queue->Name(), $queue->Description());
+    }
+}
+
+sub ListGroups {
+    require RT::Groups;
+    my $groups = new RT::Groups($CurrentUser);
+    $groups->UnLimit();
+    while (my $group = $groups->Next()) {
+	printf ("%16s %-16s\n",$group->Name(), $group->Description());
+    }	
+}
diff --git a/rt/bin/webmux.pl b/rt/bin/webmux.pl
new file mode 100755
index 000000000..6e1ae06de
--- /dev/null
+++ b/rt/bin/webmux.pl
@@ -0,0 +1,177 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/bin/Attic/webmux.pl,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# RT is (c) 1996-2000 Jesse Vincent (jesse@fsck.com);
+
+use strict;
+$ENV{'PATH'} = '/bin:/usr/bin';    # or whatever you need
+$ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
+$ENV{'SHELL'} = '/bin/sh' if defined $ENV{'SHELL'};
+$ENV{'ENV'} = '' if defined $ENV{'ENV'};
+$ENV{'IFS'} = ''          if defined $ENV{'IFS'};
+
+
+# We really don't want apache to try to eat all vm
+# see http://perl.apache.org/guide/control.html#Preventing_mod_perl_Processes_Fr
+
+
+package RT::Mason;
+
+use CGI qw(-private_tempfiles); #bring this in before mason, to make sure we
+				#set private_tempfiles
+use HTML::Mason::ApacheHandler (args_method => 'CGI');
+use HTML::Mason;  # brings in subpackages: Parser, Interp, etc.
+
+use vars qw($VERSION %session $Nobody $SystemUser $r $m);
+
+# List of modules that you want to use from components (see Admin
+# manual for details)
+
+#Clean up our umask...so that the session files aren't world readable, writable or executable
+umask(0077);
+
+
+	  
+$VERSION="!!RT_VERSION!!";
+
+use lib "!!RT_LIB_PATH!!";
+use lib "!!RT_ETC_PATH!!";
+
+#This drags in  RT's config.pm
+use config;
+use Carp;
+
+{  
+	    package HTML::Mason::Commands;
+	    use vars qw(%session $m);
+	  
+	    use RT; 
+	    use RT::Ticket;
+	    use RT::Tickets;
+	    use RT::Transaction;
+	    use RT::Transactions;
+	    use RT::User;
+	    use RT::Users;
+	    use RT::CurrentUser;
+	    use RT::Template;
+	    use RT::Templates;
+	    use RT::Queue;
+	    use RT::Queues;
+	    use RT::ScripAction;
+	    use RT::ScripActions;
+	    use RT::ScripCondition;
+	    use RT::ScripConditions;
+	    use RT::Scrip;
+	    use RT::Scrips;
+	    use RT::Group;
+	    use RT::Groups;
+	    use RT::Keyword;
+	    use RT::Keywords;
+	    use RT::ObjectKeyword;
+	    use RT::ObjectKeywords;
+	    use RT::KeywordSelect;
+	    use RT::KeywordSelects;
+	    use RT::GroupMember;
+	    use RT::GroupMembers;
+	    use RT::Watcher;
+	    use RT::Watchers;
+	    use RT::Handle;
+	    use RT::Interface::Web;    
+	    use MIME::Entity;
+	    use Text::Wrapper;
+	    use Apache::Cookie;
+	    use Date::Parse;
+	    use HTML::Entities;
+	    
+	    #TODO: make this use DBI
+	    use Apache::Session::File;
+
+	    # Set this page's content type to whatever we are called with
+	    sub SetContentType {
+		my $type = shift;
+		$RT::Mason::r->content_type($type);
+	    }
+
+	    sub CGIObject {
+		$m->cgi_object();
+	    }
+
+	}
+my ($parser, $interp, $ah);
+if ($HTML::Mason::VERSION < 1.0902) {
+ $parser = &RT::Interface::Web::NewParser(allow_globals => [%session]);
+
+ $interp = &RT::Interface::Web::NewInterp(parser=>$parser,
+                                          allow_recursive_autohandlers => 1,
+                                                              );
+
+ $ah = &RT::Interface::Web::NewApacheHandler($interp);
+} else {
+ $ah = &RT::Interface::Web::NewMason11ApacheHandler();
+}
+# Activate the following if running httpd as root (the normal case).
+# Resets ownership of all files created by Mason at startup.
+#
+chown (Apache->server->uid, Apache->server->gid, 
+		[$RT::MasonSessionDir]);
+
+
+chown (Apache->server->uid, Apache->server->gid, 
+		$ah->interp->files_written);
+
+# Die if WebSessionDir doesn't exist or we can't write to it
+
+stat ($RT::MasonSessionDir);
+die "Can't read and write $RT::MasonSessionDir"
+  unless (( -d _ ) and ( -r _ ) and ( -w _ ));
+
+
+sub handler {
+    ($r) = @_;
+    
+    RT::Init();
+ 
+    # We don't need to handle non-text items
+    return -1 if defined($r->content_type) && $r->content_type !~ m|^text/|io;
+    
+    #This is all largely cut and pasted from mason's session_handler.pl
+    
+    my %cookies = Apache::Cookie::parse($r->header_in('Cookie'));
+    
+    eval { 
+	tie %HTML::Mason::Commands::session, 'Apache::Session::File',
+	  ( $cookies{'AF_SID'} ? $cookies{'AF_SID'}->value() : undef ), 
+	    { Directory => $RT::MasonSessionDir,
+	      LockDirectory => $RT::MasonSessionDir,
+	    }	;
+    };
+    
+    if ( $@ ) {
+	# If the session is invalid, create a new session.
+	if ( $@ =~ m#^Object does not exist in the data store# ) {
+	     tie %HTML::Mason::Commands::session, 'Apache::Session::File', undef,
+	     { Directory => $RT::MasonSessionDir,
+	       LockDirectory => $RT::MasonSessionDir,
+	     };
+	     undef $cookies{'AF_SID'};
+	}
+	  else {
+	     die "RT Couldn't write to session directory '$RT::MasonSessionDir'. Check that this directory's permissions are correct.";
+	  }
+    }
+    
+    if ( !$cookies{'AF_SID'} ) {
+	my $cookie = new Apache::Cookie
+	  ($r,
+	   -name=>'AF_SID', 
+	   -value=>$HTML::Mason::Commands::session{_session_id}, 
+	   -path => '/',);
+	$cookie->bake;
+
+    }
+    my $status = $ah->handle_request($r);
+    untie %HTML::Mason::Commands::session;
+    
+    return $status;
+    
+  }
+1;
+
diff --git a/rt/docs/README.docs b/rt/docs/README.docs
new file mode 100755
index 000000000..38866b357
--- /dev/null
+++ b/rt/docs/README.docs
@@ -0,0 +1,2 @@
+Questions about docs should be sent to the RT Documentation Team (rt-docs@fsck.com)
+which is led by Meri.
diff --git a/rt/docs/Security b/rt/docs/Security
new file mode 100644
index 000000000..c9787ac52
--- /dev/null
+++ b/rt/docs/Security
@@ -0,0 +1,25 @@
+RT2 runs setgid to some group (it defaults to 'rt').
+
+rt's configuration file, 'config.pm', is not world readable because it 
+contains rt's database password. If  a user gets access to this file, he
+can arbitrarily manipulate the RT database. This is bad. You don't want
+this to happen.  config.pm is mode 550. No users should be members of 
+the 'rt' group unless you want them to be able to obtain your rt password.
+
+If you're running the web interface, you'll need to make sure your webserver
+has access to config.pm.  You could do this by letting your webserver's user
+be a member of the 'rt' group. This has the disadvantage of letting 
+any mod_perl code on your web server have access to your RT password.
+
+Alternatively, you can run RT2 on its own apache instance bound to a high
+port on 127.0.0.1
+which runs as a non-priviledged user which is a member of the group 'rt'.  
+
+Configure your webserver to proxy requests to RT's 
+virtual directory to the apache instance you just set up.
+
+TODO: doc the apache configs needed to do this.
+
+The same technique can be used to run multiple RT2 instances on the same host.
+
+
diff --git a/rt/docs/design_docs/CARS b/rt/docs/design_docs/CARS
new file mode 100755
index 000000000..a4d2a78c5
--- /dev/null
+++ b/rt/docs/design_docs/CARS
@@ -0,0 +1,66 @@
+Conditional Automated Request Shuffler 
+Initial Design. 		<jesse@fsck.com> 9 Nov 99
+
+#Try to find out what queue the incoming ticket is in
+#Try to find out the default action for this invocation
+#Read the ticket from STDIN
+#Obtain the actor
+#Obtain the serial # if we have one
+#If the ticket has a ticket-id
+	#if this is a 'comment'
+		#add the current mime objects as a 'comment'
+
+	#if this is 'correspondence'
+		#add the current mime object as 'correspondence'
+
+
+#if this ticket does not yet have a ticket id
+
+  #For now:
+	#Create a new ticket
+
+  #In the distant future
+
+	#load the regexp table matching this queue
+	#check the message agains the regexp table, ordered by precedence
+		#when we get a match
+			#get the ruleset for that regexp from the actions table
+  			#evaluate the ruleset in order of precedence.
+			   #if we get an 'exit' stop proccesing ALL rulesets
+wpw  			   #if we get a 'forward,' forward it to 'value'.
+
+   			   #if we get a 'create,' create a request in 'value'
+			   #elseif we get a 'map', add this as additional correspondence on ticket 'value'
+
+    
+		           #if we get an 'associate', associate the ticket number returned from the 
+			   'create' or 'map' with the master ticket from 'value'
+
+			   #if we get a 'reply', 
+				#load the reply template with id 'value'      
+				#replace strings in the template
+				#send the template
+
+
+
+
+CREATE TABLE Rules {
+ID int AUTO_INCREMENT,
+Desc varchar(120),
+Regexp varchar(80),
+Precedence int,
+MatchField varchar(20), #Can be a headername or 'any' all header names
+                        #end in :
+
+
+CREATE TABLE Actions {
+Rule int,
+Action varchar(20), # Create, Forward, Squelch, Owner, Area, Associate
+Value varchar(20), #queue or email address
+Desc varchar(120)
+}
+
+CREATE TABLE Autoreplies {
+ID int AUTO_INCREMENT,
+Content text
+);
\ No newline at end of file
diff --git a/rt/docs/design_docs/TransactionTypes.txt b/rt/docs/design_docs/TransactionTypes.txt
new file mode 100755
index 000000000..942b72371
--- /dev/null
+++ b/rt/docs/design_docs/TransactionTypes.txt
@@ -0,0 +1,48 @@
+This is some loose scrabbling made by TobiX, they might eventually be relevant
+for 2.1.
+
+INTERFACES, in general
+
+should:
+
+- provide the user (client?) with a list of possible actions (methods).
+- let the user execute those actions (methods).
+- Return information to the user/client.
+
+There are two kind of actions/methods:
+
+- Information retrieval
+- Transactions
+
+For the first, I think the best thing is to just provide a lot of
+methods for it in the libraries, and let it be an Interface Design
+Issue what to show and how to show it.
+
+For the second, I think we can win in the long run on having a
+generalized methods for 
+
+- listing transaction types.
+- creating & committing transactions.
+
+..with the possibility of just deploying new custom-developed modules
+when new transaction types are needed.
+
+
+$RT::TransactionTypes  ...and...
+%RT::TransactionTypes
+   - global object which contains all TransactionTypes
+   - used by all UIs to create menues of possible (user) actions (one TransactionType is a user action)
+
+The UIs should call sth like
+$Ticket->AddTransaction($TransactionName), which should be equivalent
+with i.e.  $Ticket->Correspond when $TransactionName is 'Correspond'
+(AUTOLOAD should call the do-sub if exists
+$RT::TransactionTypes{$TransactionName})
+
+The RT::Ticket::AddTransaction will create a new transaction of the
+right TransactionClass (maybe via a sub
+RT::TransactionTypes::NewTransaction).  Then $Transaction->do is
+called.
+
+TransactionType->do initializes a new object of the right TransactionClass, and 
+
diff --git a/rt/docs/design_docs/acls b/rt/docs/design_docs/acls
new file mode 100644
index 000000000..3b9d8567c
--- /dev/null
+++ b/rt/docs/design_docs/acls
@@ -0,0 +1,206 @@
+$Header: /home/cvs/cvsroot/freeside/rt/docs/design_docs/acls,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+
+
+# {{{ Requirements 
+
+Here's the rough scheme I was thinking of for RT2 acls. Thoughts? I think
+it's a lot more flexible than RT 1.0, but not so crazily complex that
+it will be impossible to implement.  One of the "interesting" features
+is the ability to grant acls based on watcher status. This now lives
+in design-docs/acls
+
+        jesse
+
+Who can rights be granted to:
+
+	users whose id is <foo>
+	users who are watchers of type <requestor/cc/admincc> for <queue/ticket> <id>
+	users who are watchers of type <requestor/cc/admincc> for <this ticket / this queue>
+
+
+what scope do these rights apply to
+	queue <id>
+	system
+	
+
+What rights can be granted
+	Display Ticket
+	Manipulate Ticket
+		Only users with manipulate ticket level access will see comments
+	Maniplulate Ticket Status
+	Create Ticket	
+
+	Admin Queue Watchers 
+	Admin Ticket Watchers
+	Admin user accounts
+	Admin scrips
+	Admin scripscopes
+	Admin Queue ACLS
+	Admin System ACLs
+
+# }}}
+
+
+# {{{ Prinicpals  These are the entities in your Access Control Element
+#
+
+Principal: What user does this right apply to
+
+	Made up of: 
+		PrincipalScope, PrincipalType and PrincipalId
+
+	
+	User:	
+		Scope: 	User	
+		Type: 	null
+		Id:	A userid or 0
+
+	Owner:
+		Scope:  Owner
+		Type: 	null
+		Id:	none
+
+
+	Watchers:
+
+		Scope: Ticket
+		Type:	Requestors; Cc; AdminCc
+		Id:	A ticket id or 0 for "this ticket"
+
+		Scope: Queue
+		Type:	Cc; AdminCc
+		Id:	A queue id or 0 for "this queue"
+
+
+# }}}
+
+# {{{ Object: What object does this right apply to
+
+	Object is composed of an ObjectType and an ObjectId
+
+	Type:	System 	
+	Id:	NULL
+
+	Type:	Queue
+	Id:	Integer ref to queue id or 0 for all queues
+	
+# }}}
+
+# {{{ Right: (What does this entry give the principal the right to do)
+
+
+
+	For the Object System:
+		System::SetACL
+		System::AdminScrips
+
+		User::Display
+		User::Create
+		User::Destroy
+		User::Modify
+		User::SetPassword
+
+
+
+	For the Object "Queue":
+		Queue::Admin
+		Queue::SetACL
+		Queue::Create
+		Queue::Display
+		Queue::Destroy
+		Queue::ModifyWatchers
+		Ticket::Create
+		Ticket::Destory
+		Ticket::Display
+		Ticket::Update
+		Ticket::UpdateRequestors
+		Ticket::UpdateCc
+		Ticket::UpdateAdminCc
+		Ticket::NotifyWatchers
+
+		
+		DEFERRED
+
+		Ticket::SetStatus:	(Values)
+					Open
+					Resolved
+					Stalled
+					<null> means any
+
+
+# }}}
+
+
+# {{{ Implementation:
+
+# {{{ SQL Schema 
+CREATE TABLE ACL (
+	id int not null primary_key autoincrement,
+	PrinicpalId INT(11),
+	PrincipalType VARCHAR(16),
+	PrincipalScope VARCHAR(16),
+	ObjectType VARCHAR(16),
+	ObjectId  INT,
+	Right VARCHAR(16)
+);
+
+# }}}
+
+# {{{ perl implementation of rights searches
+
+sub Principals {
+if (defined $Ticket) {
+	return "($UserPrincipal) OR ($OwnerPrincipal) OR ($WatchersPrincipal)";
+	}
+else {
+	return 	 "($UserPrincipal) OR ($WatchersPrincipal)";
+	}  
+}
+	
+$Principals = " ($UserPrincipal) OR ($OwnerPrincipal) OR ($WatchersPrincipal)";
+
+$UserPrincipal = " ( ACE.PrincipalScope = 'User') AND 
+		   ( ACE.PrincipalId = $User OR ACE.PrincipalId = 0)";
+
+$OwnerPrincipal = " ( ACE.PrinciaplScope = 'Owner') AND 
+		      ( Tickets.Owner = "$User ) AND	
+		      ( Tickets.Id = $Ticket)";
+
+$WatchersPrincipal = " ( ACE.PrincipalScope = Watchers.Scope ) AND 
+		      ( ACE.PrincipalType = Watchers.Type ) AND 
+		      ( ACL.PrincipalId = Watchers.Value ) AND 
+		      ( Watchers.Owner = $User )";
+
+$QueueObject = "( ACE.ObjectType = 'Queue' and (ACE.ObjectId = $Queue OR ACE.ObjectId = 0)";
+
+$SystemObject = "( ACE.ObjectType = 'System' )";
+
+
+# This select statement would figure out if A user has $Right at the queue level
+
+SELECT ACE.id from ACE, Watchers, Tickets WHERE ( 
+	     $QueueObject
+	     AND ( ACE.Right = $Right) 
+	     AND ($Principals))
+
+# This select statement would figure outif a user has $Right for the "System"
+
+SELECT ACE.id from ACE, Watchers, Tickets WHERE ( 
+	     ($SystemObject) AND ( ACE.Right = $Right ) AND ($Principals))
+
+# }}}
+
+# }}}
+
+# {{{ Examples
+#
+
+# }}}	
+
+
+
+Unaddressed issues:
+
+	There needs to be a more refined method for grouping users, such that members of the customer service department
+can't change sysadmins' passwords.
diff --git a/rt/docs/design_docs/basic-definitions.txt b/rt/docs/design_docs/basic-definitions.txt
new file mode 100644
index 000000000..23d2c5748
--- /dev/null
+++ b/rt/docs/design_docs/basic-definitions.txt
@@ -0,0 +1,54 @@
+(todo ... basically, those are untouched from 1.0)
+Ticket
+Queue
+(...more?)
+
+Requestor
+
+  (...definition of a requestor .. blahblah)
+
+  I'm often doing a distinction between "Internal Requestors" and "External
+  Requestors" (see below).  The system doesn't make any difference between
+  requestors, but the distinction might be useful to discuss usage patterns,
+  templates and configurations.
+
+
+External Requestor
+
+  Might be a customer or a potential customer.  The External Requestor
+  should be treated as a VIP.  (S)he shouldn't need to see too much of RT.
+  The support (s)he gets should be as personal as possible.  The external
+  requestor might eventually get access to the Web UI, but only to track
+  her/his own requests.  If you're not planning to use RT for handling
+  external customers, all your requestors are probably "Internal
+  Requestors".
+
+
+Watcher
+
+  Somebody that are "subscribing" to a queue or a ticket (or something
+  differently).  Basicly, somebody watching a queue or a ticket should get
+  all updates by email.  A requestor is a (special) watcher.
+
+
+Regular Watcher
+
+  People within the same organization, people that have read access to whole
+  queues.
+
+  I consider "Regular Watchers" as well as "Internal Requestors" as more
+  robust and capable human beeings than the fragile customers.  We don't
+  mind letting them get entagled with RT, and we let them access the Web UI.
+  They can live with beeing just the Cc or Bcc at an email.
+
+
+Internal Requestor
+
+  An Internal Requestor is usually internal to the company.  He might be 1st
+  line support sending matters to tech support or similar. Might be an
+  internal employee sending matters to tech support (or even 1st line
+  support if he's not sure where to send matters).  It might also be that
+  "ordinary" requestors actually might be treated as intelligent human
+  beeings rather than VIPs, i.e. in open source projects ... we'll still
+  call them "Internal Requestors" as they don't need the special VIP
+  treatment.
diff --git a/rt/docs/design_docs/cli_spec b/rt/docs/design_docs/cli_spec
new file mode 100644
index 000000000..48a7f34e1
--- /dev/null
+++ b/rt/docs/design_docs/cli_spec
@@ -0,0 +1,354 @@
+
+Find tickets to operate on:
+        --id=<tickets>          Find only tickets in the range <tickets>
+                synonyms:
+                --limit-id, --tickets, --limit-tickets
+        --limit-queue=<queue>
+        --limit-status=<status>
+        --limit-owner=<owner>
+        --limit-priority=<priority>
+        --limit-requestor=<email>
+        --limit-subject=<string>      (Subject contains)
+        --limit-body=<string>         (body contains)
+        --limit-created=(before/after) <date>
+        --limit-due=(before/after) <date>
+        --limit-starts=(before/after) <date>
+        --limit-started=(before/after) <date>
+
+        --limit-first=<int>           Start on the <int>th row returned by the
+                                database  
+        --limit-rows=<int>      Find only <int> rows
+
+Display:
+        --show                  shows a ticket history
+        --history               ditto
+
+        --summary               default option. shows a ticket summary
+                --format        Optional format string. If not specified,
+                                uses the value of ENV{'RT_LISTING_FORMAT'}
+                                or an internal default
+        
+
+Basic ticket editing:
+
+	--status=(open|stall|resolve|kill)
+	--subject=<string>
+        --owner=<owner>
+	--queue=<queue>
+	--time-left=<minutes>
+
+Watcher-related editing:
+
+	--add-requestor=<email>
+	--del-requestor=<email>
+	--add-cc=<email>
+	--del-cc=<email>
+	--add-admincc=<email>
+	--del-admincc=<email>
+
+Priority related editing:
+
+	--priority=<int>
+	--final-priority=<int>
+
+Date related editing:
+
+	--due=date
+	--starts=date
+	--started=date
+	--contacted=date
+
+
+
+Ticket updates:
+
+	--comment 
+	--reply | --respond 
+
+
+Links
+
+	--add-link 
+		--type=<DependsOn|MemberOf|RelatedTo>
+		needs one of:
+		   --target=<ticketid> 
+		   --base=<ticketid>
+
+	--del-link <link-id>
+
+
+
+Condiments:
+	any update can take:
+
+		--time-taken <minutes>
+
+	Ticket updates can take:
+
+		--source 	-- specify a source file to read the content from
+		--edit		= give me an editor to edit the message
+		--no-edit	= don't give me an editor to edit the message.
+
+
+
+
+----- Forwarded message from deborah kaplan <deborah@curl.com> -----
+
+Date: Fri, 14 Apr 2000 11:43:18 -0400 (EDT)
+From: deborah kaplan <deborah@curl.com>
+To: Jesse <jesse@fsck.com>
+Subject: Re: [rt-devel] RT Projects list
+
+Finally, here is the functional spec for the command line
+interface.  This is for the user interface only; if you think
+this is right, I will add the administrative interface as well.
+Should I post to rt-devel, add to the ticket, or just modify
+based on your kibbitzing?  When you are happy with it I'll start
+the code.
+
+-deborah
+
+
+RT command line interface functional specification
+Author: Deborah Kaplan (Deborah@suberic.net)
+Version:0.1
+
+Requirements: 
+
+RT needs a CLI for various reasons.  If a user is restricted to a
+dumb terminal, she needs to be able to access the RT database and
+manipulate it fully.  The full functionality of both the RT
+database and the RT administrative interface should be available
+from this CLI.
+
+There are two possible types of CLI which I will discuss here.
+The first is a curses-style interface, which allows the user to
+move about a series of menus and choices, usually using arrow
+keys.  As RT supplies a Web interface, there is no need for this
+curses-style interface to be written as part of RT.  Instead, the
+RT developers should pick one tty-based Web browser (e.g. lynx,
+w3m) and make sure that all of the RT pages are easily readable
+with that tty based browser.  Installation of that browser should
+be recommended in the RT installation documentation as a
+supported method of accessing RT from a tty.
+
+The second possible type of CLI is more minimal: a series of
+commands which can be run at a UNIX command prompt which provide
+full functionality to the RT database and administrative
+interface.  There are two major benefits to this second type of
+CLI.  First of all, in order to use this CLI, you need no extra
+tools (Web browsers, etc.).  All that is required is a UNIX
+command line prompt and an installation of RT.  Secondly, a user
+of RT who has a very specific command to run and who knows the
+appropriate CLI commands can accomplish her task much more
+quickly with a single command then she could navigating through a
+menu based interface.
+
+In the specification, I will describe the second type of CLI.
+
+Caveats:
+
+This specification draws heavily on the structure of formatting
+command line options for cvs.  RT faces a smaller version of the
+same kinds of problems cvs faces: we want to create a very rich
+command set without sacrificing ease-of-use. 
+
+I am not wedded to any specific command names if they seem
+impractical; I merely am proposing the command names that seem
+reasonable to me at this moment.
+
+Finally, I am finding the functioning of the web UI from RT 1.
+If the functionality differs greatly in RT 2, I will need to
+modify this specification.
+
+Specification:
+
+There are two commands: "rt", which is the primary interface to
+the database, and "rtadmin", which is the administrative
+interface to the database.
+
+The format of an rt command is as follows:
+
+ rt <command> 
+    <command> is one of:
+
+    - help
+      print an overview of the commands which can be run
+
+    - print <queue> <options> 
+      with no options, dump to the screen a list of all open
+      requests in <queue> -- the equivalent of "Display Queue" in
+      the existing Web interface.
+
+      <queue> is the name of an RT queue
+      <option> is either:
+
+        -f <filename> |  --filename <filename>
+	   where <filename> is the name of a file (defaulting to
+	   ~/.rtrc) in which the options described below can be
+	   placed in the format "^ <long option name> <option value>
+	   $".
+
+        Or a series of the following options:
+
+        -o <owner name> |  --owner <owner name>: restrict tickets
+	viewed to those owned by <owner name>.
+	   This option can be used multiple times in one call of
+	   the rt command in order to produce a list which
+	   contains tickets owned by multiple owners.  Giving the
+	   empty string ("") as an option to this switch will
+	   restrict tickets viewed to those which have no owner.
+	   If this switch is given with no argument, the option
+	   defaults to the user name of the currently running
+	   process.
+
+        -r <requestor name> | --requestor <requestor name>:
+	restrict tickets viewed to those requested by <requestor
+	name>.
+	   This option can be used multiple times in one call of
+	   the rt command in order to produce a list which
+	   contains tickets requested by multiple requesters.  If
+	   this switch is given with no arguments, it produces an
+	   error.
+
+        -s <status> | --status <status>: restrict tickets viewed
+	to those with the status named in <status>.
+	   This option can be used multiple times in one call of
+	   the rt command in order to produce a list which
+	   contains tickets with multiple statuses (statii?
+	   Dragon NaturallySpeaking recognizes "statuses" as a
+	   word).  This option defaults to status "open".
+
+        -j <subject> | --subject <subject>: restrict tickets
+	viewed to those which contain <subject> as a substring in
+	the subject field of the ticket.
+	   This command can be used multiple times in one call of
+	   the rt command in order to produce a list which
+	   contains tickets with various subject substrings.  If
+	   the option is called with no argument, the result is
+	   an error.
+
+        -h | --help: print a usage message.
+
+        -n | --number: print out a specific ticket.
+	   This command can be used multiple times to produce a
+	   list which contains multiple tickets.  If the option
+	   is called with no argument, the result is an error.
+
+    This completes all of the print options which are available
+    in the Web interface, except the sort options.  I maintain
+    that this command is already excessively complex, and that
+    adding functionality which can be replicated easily by
+    standard UNIX tools is unnecessary added complexity.  I
+    recommend that the man pages and documentation for this
+    option contain an example of a command line run (e.g. of rt |
+    awk) which replicates the sorting functionality provided by
+    the Web interface.
+
+    - edit <ticket> <options>
+      with no options, or with no <ticket>, produces the same
+      output as the --help option.
+      Otherwise, edits the ticket with number <ticket> as
+      indicated in the options given.  All options listed below
+      except for --help and --number can be used in conjunction
+      with one another to change many features of the same ticket
+      all at once.
+
+        -h | --help: print usage message
+
+        -s <status> | --status <status>: change the status to the
+	status listed in <status>.
+	   No <status> listed, or 1 listed it does not come from
+	   a list of approve statuses, produces an error.
+
+        -o <owner name> |  --owner <owner name>: set to the owner
+	of the ticket the owner named.
+	   Follows whatever convention is finally decided on for
+	   the requirement to steal a ticket that is owned by
+	   somebody else.  No <owner named> listed has the user
+	   who is running the rt program take the ticket.  If
+	   that user is not a valid owner, or the 1 listed does
+	   not come from a list of approve names, produces an
+	   error.
+
+        -r <requestor name> | --requestor <requestor name>: sets
+	the requestor to <requestor name>.
+	   Follows any conventions that the Web UI follows to
+	   make sure that this is a legal name.  If not legal, or
+	   left blank, produces an error.
+
+        -j <subject> | --subject <subject>:  sets the subject of
+	the ticket to <subject>.
+	   If the option is called with no argument, the result
+	   is an error.
+
+        -n <number one> <number 2> | --number <number one>
+	<number 2>: merges ticket number <number one> into ticket
+	<number 2>.
+	   If both arguments are not provided, the result is an
+	   error.
+
+        -q <queue> | --queue <queue>: set the queue to that
+	named.
+	   If <queue> is not listed, or the 1 listed does not
+	   come from a list of approve queues, produces an
+	   error.
+
+        -a <area> | --area <area>: set the area of the ticket to
+	that named.
+	   If <area> is not listed, or the 1 listed does not come
+	   from a list of approve areas, produces an error.
+
+        -c <time stamp> | --contact <time stamp>: sets the last
+	user contact field, and produces an error if the format
+	is invalid.
+	   If the argument is left blank, sets the last user
+	   contact field to now.
+
+        -p <priority> | --priority <priority>: sets the current
+	priority to the 1 listed.
+	   Produces an error if the argument is left blank.
+
+        -f <priority> | --final <priority>: sets the final
+	priority to the 1 listed.
+	   Produces an error if the arguments left blank.
+
+        -d <date due> | --datedue <date due>: sets the due date
+	to the 1 listed.
+	   Produces an error if the argument is left blank, or if
+	   the format is invalid.
+
+    - comment <options>
+      with no options, this command reads from standard input
+      until it sees EOF and appends that to the ticket as a
+      comment.
+
+        -h | --help: print usage message
+
+        -c | --comment: append as a comment.  This is the default behavior.
+
+        -r | --reply: append as a reply.
+
+        -f <filename> | --file <filename>: can be used with
+	either the comment or reply options.  Instead of reading
+	from standard input, read the text of the comment or
+	reply from the file <filename>.
+
+    - report <options>
+      this command is a place holder for reporting functionality
+      which does not yet exist.  It will probably have the
+      default behavior to select reports at the command line or
+      choose default reports from a .rtrc file.  In a future
+      version, it can output graphs in some graphical format.
+
+
+
+----- End forwarded message -----
+
+-- 
+jesse reed vincent -- root@eruditorum.org -- jesse@fsck.com 
+70EBAC90: 2A07 FC22 7DB4 42C1 9D71 0108 41A3 3FB3 70EB AC90
+
+"If IBM _wanted_ to make clones, we could make them cheaper and faster than
+anyone else!"  - An IBM Rep. visiting Vassar College's Comp Sci Department.
+
diff --git a/rt/docs/design_docs/cvs_integration b/rt/docs/design_docs/cvs_integration
new file mode 100644
index 000000000..35c8737ed
--- /dev/null
+++ b/rt/docs/design_docs/cvs_integration
@@ -0,0 +1,164 @@
+jesse@FSCK.COM: ok. anyone here
+       interested in having RT as a bug tracker integrated with CVS? ()
+
+marc: in principle, sure. ()
+
+jesse@FSCK.COM: want to write up your
+       ideal of how such a beast would work? ()
+
+alex_c: what sort of integration are you thinking of, Jesse? ()
+
+jesse@FSCK.COM: well, that's what I want
+       to know, alex. lots of people want their bug trackers tied to their
+       version control. I want to know what people want it to _do_ ;) ()
+
+alex_c: weird. :) ()
+
+marc: similarly to what the debian bts does. 
+       you put a magic string ("rt-closes#123") and it causes the bug in rt to
+       be closed (or appended with a different magic string) with the commit
+       message.  also nice would be if rt would then generate links to a
+       webcvs server. ()
+
+jhawk: Hrmm. cvs front-end that strips 'em out?
+       Perhaps with RT:  lines instead of CVS: lines in the commit
+       interaction? ()
+
+marc: the magic string goes in the commit
+       message, that is. no, use one of the magic post-commit scripts. ()
+
+
+jesse@FSCK.COM: well, there's also the
+       pre-commit script to lock out commits wihtout a ticket id ()
+
+jhawk: Personally, I don't want to force special
+       magic strings to the bug-tracking system, some of which may be
+       confidential, to appear in the cvs logs. ()
+
+marc: I could see wanting that on a release
+       branch. ()
+
+jhawk: I also think it would be cool to supply
+       template stuff for you to edit. ()
+
+jesse@FSCK.COM: I'm not sure cvs can be
+       made to do that. can it? (generate templates) ()
+
+jhawk: It would be reasonable, in my model, to
+       turn some kinds of RT: lines into things that fell in the commit
+       message, but not all kinds. ()
+
+marc: I don't quite see jhawk's objection. ()
+
+ghudson: In my observation, locking out commits
+       without a ticket ID is usually an impediment to development, and leads
+       to developers having the one bug which all commits cite. ()
+
+jhawk: If you had a CVS frontend, it could geneate
+       the template and feed it to 'cvs commit -m' ()
+
+ghudson: CVS can generate templates and verify
+       that they have been filled in. ()
+
+jhawk: What Greg says sounds cool; greg, what do
+    you mean? marc: one sec. ()
+
+marc: I think assuming a frontend is a terrible
+       idea. ()
+
+jesse@FSCK.COM: greg: agreed. but people
+       seem to want it. the idea would be only for a locked down release
+       branch. ()
+
+jhawk: marc: So, I might want to close an open
+       ticket as part of a commit message without that showing up in the
+       coommit message. Or to insert a splufty long comment into a ticket
+       while I do the commit but not close or really change the state, and
+       that comment might want to ramble a lot but not include that ramble in
+       the commit message. ()
+
+jesse@FSCK.COM: well, then arguably, you
+       might want to not use the commit message for that update, but instead
+       just go straight to the bts ()
+
+marc: I think the idea is to force you to
+       mention the ticket closing in the commit message. ()
+
+jesse@FSCK.COM: but yeah, state changing
+       and 'update messages' are seperate concepts that should both be
+       supported. ()
+
+jesse@FSCK.COM: part of the idea is to
+       drag the commit message into the BTS ()
+
+jhawk: Err, I think it quite frequent that I want
+       to put seperate info in both the commit message and the ticket system,
+       and entering them at the same time seems cool. ()
+
+jesse@FSCK.COM: ok. noted. I'll see if
+       that's doable, when i get around to this. ()
+
+marc: so I think you want a custom front-end,
+       but I don't think what you want is what jesse is talking about. ()
+
+jesse@FSCK.COM: the thing that would be
+       really cool that scare the pants off me is tracking which branches bugs
+       exist in / are fixed in ()
+
+jesse@FSCK.COM: what jhawk wants should
+       be doable, now that I understand his reqts. ()
+
+marc: that would require the bts to understand
+       branches in some fundamental way. ()
+
+jesse@FSCK.COM: yes. see above, about
+       the pants. ()
+
+sly: uh oh, not more people losing their pants... ..
+
+
+ghudson: RT needs to know the names of branches
+       and their structure (so that you can tell it "fixed in foo" and it
+       knows that the bug is still fixed in anything that branches off of foo,
+       but not necessarily in other new branches), but nothing more than that.
+
+jhawk: So, note that what I'm describing is how
+       I'd like the UI to be, from a generic architectural level, and not
+       really thinking terribly specific. Greg, can you explain the CVS
+       template thing? ()
+
+jesse@FSCK.COM: and it needs to know
+       exactly "when" a branch happens. because "fixed in foo" won't fix
+       something that branched off foo yesterday ()
+
+marc: jesse was talking about integrating rt
+       with cvs.  building a new developent+repository+bts from scratch would
+       be a problem with larger scope :-) ()
+
+jesse@FSCK.COM: marc: was that in
+       response to jhawk? ()
+
+ghudson: CVS and templates: "rcsinfo" lets you
+       specify a template for log messages, and "commitinfo" lets you check
+       them. ()
+
+ghudson: Er, sorry, my bad. 
+       s/commitinfo/verifymsg/ ()
+
+marc: with cvs, if you have the revision number
+       of the fix (which you should). you can use the branch version number to
+       get a date and see when the branch happened relative to the fix. ()
+
+marc: jesse: yes. ()
+
+jesse@FSCK.COM: Ok. would people
+       consider "integration with CVS" to be subpar or incomplete if it didn't
+       deal with tracking branches? ()
+
+marc: incomplete relative to an ideal, but not
+       subpar, as it would still be useful. ()
+
+allbery@CS.CMU.EDU: CVS's branch
+       support sucks so much that failure to work with it is hardly a bug ()
+
+
diff --git a/rt/docs/design_docs/evil_plans b/rt/docs/design_docs/evil_plans
new file mode 100644
index 000000000..34b9f81a2
--- /dev/null
+++ b/rt/docs/design_docs/evil_plans
@@ -0,0 +1,167 @@
+Current planned 2.2 feature list. subject to change.
+
+
+Core
+
+Should	Make "Owner" a watcher type, rather than a special ticket attribute,
+	under the hood.  This wins for ACL and code consistency reasons.
+
+Web UI
+
+Should	New "Tools" top level menu
+Should		"This week in RT" at a glance.
+Nice		"RT Stats" overview.
+Nice	recent and favorite items
+
+
+per-user configuration
+
+Must		Saveable user preferences.
+
+		The ideal implementation would be "saveable user metadata",
+		including things like "Alternate Email Addresses".  To 
+		do this right, not all user metadata would be directly
+		editable by the user who has "ModifySelf"  it may be that
+		this is a "system" datastore that gets accessed by various
+		functions, some of which the user has access to modify and
+		some of which only the system does.
+		
+		API:	Set field "FOO" to value "BAR" for user BAZ
+			What values does field "FOO" have for user BAZ?
+			Clear all values of "FOO" for user BAZ
+			What users have value "BAR" for field "FOO"
+
+		Example usages:
+
+			What users have the alternative email address matching 
+			"boo@fsck.com"
+			What custom searches does user BAZ have defined?
+			What is baz's default queue?
+
+		Actually, I feel a little sketchy about Alternative Email 
+		Addresses in there. I'm not quite sure why yet.
+
+		The same would really be useful for queues. Damn it. I think
+		I want a registry.
+
+
+
+Searching
+
+Must	Ability to define search result format.
+should 	Saveable user searches.
+nice	Sharable searches.
+
+
+Scrips
+
+must	Include more Conditions; at least those contributed so far
+	that make sense in my grand scheme of things
+
+should	The name should change to something that people don't think is
+	spelled wrong.	("I will not invent words\n" x 1000)
+
+nice	Scrips could apply to a list of queues, rather than just one queue or 
+	all of them.
+
+
+Custom fields
+
+Must	"KeywordSelects" become "Custom Fields"
+Should	String and multi-string custom fields.
+Nice	Date custom fields
+Nice	Some way to order and group custom fields.
+Nice	Default values
+Nice	Required values
+Nice	Make custom fields apply to an enumerated list of queues, 
+	rather than just one. 
+
+
+Web infrastructure
+
+Must	Full fastcgi support.
+
+
+Installation 
+
+Should	Better FSSTD conformance:
+		bins in /bin
+		admin tools in /sbin (does this include rtadmin?)
+		ephemeral data in /var
+		rename config file	
+		force local RT search path?	
+
+Mail gateway
+
+must	Integrate gpg-authenticated command-by-mail mode
+	
+
+
+Core
+
+should	Use apache logging, if available
+should	Use syslog, if available.
+should	Mail user new password, as an Action, so it can be invoked either 
+	as a scripaction or from the web ui.
+
+
+
+Web Services Framework
+
+Should	Expose an API to create a ticket by HTTP posting an XML document.
+Should  Provide an RSS feed to display tickets matching certain criteria
+Nice	Allow ticket updates via the web ui
+Nice	Export full ticket metadata and history as XML
+
+Note: 	I currently favor the REST philosophy that GET and POST to specific,
+	defined URLs provides everything one needs to build comprehensive
+	web services without the massive added complexity of a SOAP or XML-RPC
+	framework.
+
+
+ACLs:
+
+Wish	New ACL primitives for:
+
+		List all users who have right "FOO" on object "BAR"
+		List all rights user "BAZ" has for object "BAR"
+		List all objects for which user "BAR" has right "FOO"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+For the near future:
+
+	Use case:
+		Jesse wants to get notified of all tickets in queue 'RT Bugs'
+		with a severity of 'critical' and also have a requestor whcih matches 'fsck.com'.  
+		I'm not sure this is the best idea.
+
+
+	Site admins define a number of subscriptions and can sign up individual
+	users, groups or metagroups to get mail on that subscription.
+
+	Basically, an admin would define "On Condition, notify as comment with
+	template _template_"
+
+	There would be a new table called "subscriptions"(?) that would have
+	the structure:
+
+		id
+		ScripId
+		PrincipalType  ENUM: User, Group, Owner, Requestors, AdminCcs, Ccs
+		PrincipalId --  UserId or GroupId.  For Owner, Requestors, AdminCcs, Ccs, it doesn't really make a lick of difference.	
diff --git a/rt/docs/design_docs/link-definitions.txt b/rt/docs/design_docs/link-definitions.txt
new file mode 100644
index 000000000..30b903567
--- /dev/null
+++ b/rt/docs/design_docs/link-definitions.txt
@@ -0,0 +1,143 @@
+For 2.0, those Linking actions should be supported:
+
+1. DependentOn; TobiX-style.
+
+ BASE is dependent on TARGET.
+ 
+ ...meaning that TARGET has to be resolved before BASE (really) is
+ resolved.
+ 
+ According to TobiX, those "weird action" makes sense:
+ ...when the link and/or TARGET is created, the BASE might be stalled.
+ Alternatively, this should be very trivial to request through the UIs.
+ ...when the TARGET is resolved, BASE will be reopened if it's stalled.
+
+ An alternative to those "weird actions" is to have some run-time logic that
+ takes care of this; i.e. letting the search interface handle "please hide
+ all requests with unresolved dependencies"
+ 
+ TobiX will need to make dependency links into Bugzilla.
+
+ Dependency links should be made when more work to BASE should be done
+ after the TARGET is resolved and/or BASE can't be resolved before TARGET is
+ resolved.
+
+ Dependency links are often 1:1, but n:n links makes sense; one ticket can
+ depend on several others, several tickets can depend on one ticket, etc.
+
+ Loops don't make sense at all, but the system above won't break if it
+ encounter loops.
+
+ Dependency links is more for workflow than anything else.  When a new
+ TARGET is created, some of the work might be passed over to another
+ department/person ... but _not_ the responsibility for the communication
+ with the external requestor.
+
+2. MemberOf link (grouping)
+
+ BASE is a member of TARGET.
+
+ TobiX-style "weird actions":
+ ...when TARGET is beeing replied to, all BASE requestors should get the
+ reply.
+
+ ...when TARGET is resolved, all BASE tickets should be resolved (unless
+ they have other unresolved Dependencies/MemberOf links).
+
+ ...when all BASEs to one TARGET are resolved, TARGET should be resolved.
+ 
+ The alternative is to let the user choose "reply to all" and "resolve all"
+ through the user interfaces.
+
+ MemberOf should be used when BASE ticket states more or less the same as
+ the TARGET ticket, and we do want to give a reply to all requestors, but we
+ don't want to merge them (Individual tickets from individual external
+ requestors should be respected as separate entities). If BASE tickets from
+ more than one external requestor is linked to a TARGET ticket, we denote
+ the TARGET ticket as a "Group ticket".  This is only a documentation
+ definition, you won't find any references to "Group tickets" in the source.
+
+ I think the proper etiquette should be to clearly state in a reply to a
+ group ticket that the mail is going to several persons, and that the
+ requestor should reply back if they feel their Ticket hasn't got the
+ attention it deserves.  The user documentation should reflect this.
+
+ MemberOf links can also be used to hand away the work flow. The person in
+ charge of the TARGET ticket will also be in charge of the BASE tickets and
+ the communication with the end user.
+
+ If a work task needs to be splitted into two subtasks, MemberOf might also be
+ used.
+
+ 1:n links makes more sense, but n:n can also work in some cases.
+ The reply stuff might break seriously upon loops.  Recursement might be
+ handy for splitting a work task into subtasks (making a hierarchical tree
+ of the worktasks).
+
+
+3. Merge (connecting)
+
+ BASE is the same as TARGET.
+
+ ...the system should somehow merge together transactions for both tickets.
+ ...BASE should be more or less deleted, only the TARGET should apply.
+ ...actions done toward BASE should be redirected to TARGET.
+
+ I think MergeLinks should be used when two tickets accidentally has
+ appeared twice in the system, and/or there is no reason to keep the two
+ tickets separately.  It might be that it's the same requestor (i.e.
+ clicking the "send" button twice in a web environment) or that we don't
+ care much about giving the requestor individual follow-up (typically
+ "internal" requestors, etc.)
+
+ Based on user feedback, merged tickets will be displayed as the same ticket
+within RT's user interfaces. but the original tickets' transactions will be
+kept seperated in the database. this may require some magic.
+ 
+4. RefersTo / No Action link (linking)
+
+ BASE is somewhat related to TARGET
+
+ No special actions will be taken.
+ 
+ Loops might maybe make sense
+
+BASE and TARGET are usually Tickets within one RT instance, but it
+might also point to external RT instances, other DB systems, etc.
+
+
+
+
+In future revisions, it should be very easy to set up site-specific link action types.
+We should also consider to include more linking actions in the box.
+
+An example stolen from John Rouillard.  Eventually the [comments] should be
+removed, and the text modified to fit the planned 2.0 link actions:
+
+  ticket  problem
+    1         can't connect to hosts with netscape
+    2         ping is broken
+    3         Can't send email: error no space on spool/mqueue
+	  
+  You have the above in the queue. You realize that DNS is down. Spawn
+  a ticket
+	  
+    4         DNS is down
+
+  mergelink 1 and 2 to it [I would rather say "make a MemberOf link _or_ a
+  dependency link from 1 and 2 to 4" --TobiX] (if you choose to stall 1 and
+  2 automatically feel free, its just a shell script change) [well, you
+  might choose dependency instead of MemberOf --TobiX]. The person working
+  on 3 has come to the conclusion that outgoing mail is backing up because
+  of the DNS failure. She has cleared space by copying the mail queue to
+  another disk, but can't really get email working till DNS is up. So she
+  creates a Dependency linkon  ticket 4 stalling ticket 3.
+
+  We finally get DNS working and resolve ticket 3. What happens?  Tickets 1
+  and 2 are resolved and email is sent to requestors notifying them of the
+  resolution [This is the default behaviour for 2.0 MemberOf-linked tickets.
+  Remember that if we send Replies to "Group Tickets" (that is, the target
+  of several "MemberOf" links) --TobiX]. Ticket 4 [should be 3? --TobiX] is
+  reopened and the person working on it starts flushing the mail queue and
+  the moved mailq by hand. 
+
diff --git a/rt/docs/design_docs/local_hacking b/rt/docs/design_docs/local_hacking
new file mode 100644
index 000000000..c06d1126d
--- /dev/null
+++ b/rt/docs/design_docs/local_hacking
@@ -0,0 +1,32 @@
+To facilitate local hacking, RT needs a mechanism to allow site administrators
+to easily add HTML templates for the web ui and to replace sections
+of code in RT's core modules _without_ having to modify those modules
+
+We'll use several methods to achieve this goal.
+
+	Webui
+		HTML::Mason allows users to create multiple
+component hierarchies.  RT should ship with a local component root
+defined and available. This root should be configured as the "primary"
+component root.
+
+
+	Core modules
+
+	This gets a bit trickier. we want to allow people to trivially
+subclass core modules and to use those subclasses throughout the code.
+
+The way we're going to handle this is by setting up a number of subroutines
+in config.pm that look something like this:
+
+sub NewTicketObj {
+	eval "require $TicketClass";
+	my $object = new $TicketClass;
+	return ($object);
+}
+
+# This variable is used for ref type checking
+$TicketClass = "RT::Ticket";
+
+we could use an eval around the require and thus completely avoid specifying
+the object in two places. which feels like a win. but i'm worried about perf.
diff --git a/rt/docs/design_docs/subscription-definitions.txt b/rt/docs/design_docs/subscription-definitions.txt
new file mode 100755
index 000000000..deda35cda
--- /dev/null
+++ b/rt/docs/design_docs/subscription-definitions.txt
@@ -0,0 +1,113 @@
+NEW SCRIP NOTES
+
+
+RT Actions:
+
+
+   EmailOwnerAsComment
+	Send mail to the ticket owner from the queue's comment address
+	
+   EmailOwnerOrAdminWatchersAsComment
+	Send mail to the ticket owner, or if there is no owner, the ticket's admin watchers
+	from the queue's comment addresses
+
+   EmailAdminWatchersAsComment
+	Send mail to the ticket's adminstrative watchers from the queue's comment address
+
+
+
+   EmailOwner
+	Send mail to the ticket owner from the queue's correspond address
+	
+   EmailOwnerOrAdminWatchers
+	Send mail to the ticket owner, or if there is no owner, the ticket's admin watchers
+	from the queue's correspond addresses
+
+   EmailAdminWatchers
+	Send mail to the ticket's adminstrative watchers from the queue's correspond address
+
+   EmailWatchers
+	Send mail to the ticket watchers from the queue's correspond address
+
+   AutoReply 
+	Sendmail to the requestor from the queue's correspond address.
+	     
+   
+
+RT Conditions:
+   OnCreate
+   OnEachTransaction
+   OnComment
+   OnCorrespond
+   
+
+
+
+
+What is an Action?
+
+...some piece of code that can do something whenever a transaction is done.
+The actions shipped with RT sends email and can handle some logic that makes
+sense for some instances.  site-specific modules can be dropped in to
+perform special actions.
+
+
+What can an Action do?
+
+- decide whether it's applicable or not
+- prepare
+- commit
+- describe itself
+
+...and if it's a subclass of SendEmail, you can also override a lot.
+
+Currently the schema.mysql contains a list of the basic subscription-related
+actions that will be bundled with RT.
+
+
+What is a Scrip?
+
+...it's an entry in the database that tells that an action is to be
+performed with a certain template and argument.  Template and argument
+doesn't make sense in all contexts.  A scrip can be limited to transaction
+types; the current implementation allows a comma-separated list (though for
+a "cleaner" schema design, it should be a separate table for this?).  It has
+a name and a description.
+
+
+What is a ScripScope?
+
+...an indication of what queues the different Scrips applies to.  It should
+be easy to remove/insert ScripScope objects by the admin tools.
+
+
+What is a Watcher?
+
+...it's a request for beeing kept updated on a ticket and/or a queue
+and/or whatever.  It is to be used by the Actions.  Watcher items can
+easily be enabled/disabled through the `Quiet' attribute.  `Type' might
+indicate what emails the watcher wants to get and how to get them.
+
+The Bcc/Cc watchers should be handled by the NotifyWatchers action which is
+run regardless of the Scrips.
+
+
+What is a Template?
+
+...A template is a text template that is to be used for outgoing email -
+or for different use for different actions.  One template can be used by
+several Scrips.
+
+
+How does the system determinate whom to send mail to?
+
+The ScripScope table in the DB should indicate whether a Scrip is relevant
+for a queue or not /* TobiX thinks that this might eventually be extended to
+keywords, tickets, etc, and not only Queues */ ... the Scope table should
+indicate whether the Scrip is relevant for a given transaction type ... then
+the given Action should determinate whether it applies or not, and finally
+the Action has to find out (via the Watchers table) whom it applies to, and
+how to contact them ... and the Template tells how the mails that are sent
+out should look like.
+
+
diff --git a/rt/docs/design_docs/users b/rt/docs/design_docs/users
new file mode 100644
index 000000000..71c4476c9
--- /dev/null
+++ b/rt/docs/design_docs/users
@@ -0,0 +1,14 @@
+RT2 makes everybody a user. some sites won't like this. there
+should be away to make an "anonymous" user who the mailgate makes
+the requestor for all mailed in tickets. it would then set the
+ticket 'requestor' watcher's alternate email address to the real
+requestor's email.
+
+additionally, eventually, users will need to be deleted. RT doesn't
+want any user deleted. Instead, there will be a flag in the user's
+entry in the users table called 'Disabled.'  Disabled users will
+not be able to be granted rights.
+
+	The process of disabling a user should remove their acls and
+should force the giving away of their tickets or reject the disabling.
+
diff --git a/rt/docs/rt.gif b/rt/docs/rt.gif
new file mode 100755
index 000000000..693b06238
Binary files /dev/null and b/rt/docs/rt.gif differ
diff --git a/rt/etc/acl.Oracle b/rt/etc/acl.Oracle
new file mode 100644
index 000000000..59d35a028
--- /dev/null
+++ b/rt/etc/acl.Oracle
@@ -0,0 +1,9 @@
+CREATE USER !!DB_RT_USER!! identified by !!DB_RT_PASS!!
+temporary tablespace TEMP
+default tablespace USERS
+quota unlimited on USERS;
+
+grant connect, resource to !!DB_RT_USER!!;
+
+exit;
+
diff --git a/rt/etc/acl.Pg b/rt/etc/acl.Pg
new file mode 100755
index 000000000..13ac41dcf
--- /dev/null
+++ b/rt/etc/acl.Pg
@@ -0,0 +1,39 @@
+drop user !!DB_RT_USER!!;
+create user !!DB_RT_USER!! with password '!!DB_RT_PASS!!' NOCREATEDB NOCREATEUSER;
+
+grant select, insert, update, delete on Groups to !!DB_RT_USER!!;
+grant select, insert, update, delete on Groups_id_seq to !!DB_RT_USER!!;
+grant select, insert, update, delete on ACL to !!DB_RT_USER!!;
+grant select, insert, update, delete on ACL_id_seq to !!DB_RT_USER!!;
+grant select, insert, update, delete on Watchers to !!DB_RT_USER!!;
+grant select, insert, update, delete on Watchers_id_seq to !!DB_RT_USER!!;
+grant select, insert, update, delete on Links to !!DB_RT_USER!!;
+grant select, insert, update, delete on Links_id_seq to !!DB_RT_USER!!;
+grant select, insert, update, delete on Users to !!DB_RT_USER!!;
+grant select, insert, update, delete on Users_id_seq to !!DB_RT_USER!!;
+grant select, insert, update, delete on Tickets to !!DB_RT_USER!!;
+grant select, insert, update, delete on Tickets_id_seq to !!DB_RT_USER!!;
+grant select, insert, update, delete on GroupMembers to !!DB_RT_USER!!;
+grant select, insert, update, delete on GroupMembers_id_seq to !!DB_RT_USER!!;
+grant select, insert, update, delete on Queues to !!DB_RT_USER!!;
+grant select, insert, update, delete on Queues_id_seq to !!DB_RT_USER!!;
+grant select, insert, update, delete on Transactions to !!DB_RT_USER!!;
+grant select, insert, update, delete on Transactions_id_seq to !!DB_RT_USER!!;
+grant select, insert, update, delete on ScripActions to !!DB_RT_USER!!;
+grant select, insert, update, delete on ScripActions_id_seq to !!DB_RT_USER!!;
+grant select, insert, update, delete on ScripConditions to !!DB_RT_USER!!;
+grant select, insert, update, delete on ScripConditions_id_seq to !!DB_RT_USER!!;
+grant select, insert, update, delete on Scrips to !!DB_RT_USER!!;
+grant select, insert, update, delete on Scrips_id_seq to !!DB_RT_USER!!;
+grant select, insert, update, delete on Attachments to !!DB_RT_USER!!;
+grant select, insert, update, delete on Attachments_id_seq to !!DB_RT_USER!!;
+grant select, insert, update, delete on Templates to !!DB_RT_USER!!;
+grant select, insert, update, delete on Templates_id_seq to !!DB_RT_USER!!;
+grant select, insert, update, delete on Keywords to !!DB_RT_USER!!;
+grant select, insert, update, delete on Keywords_id_seq to !!DB_RT_USER!!;
+grant select, insert, update, delete on ObjectKeywords to !!DB_RT_USER!!;
+grant select, insert, update, delete on ObjectKeywords_id_seq to !!DB_RT_USER!!;
+grant select, insert, update, delete on KeywordSelects to !!DB_RT_USER!!;
+grant select, insert, update, delete on KeywordSelects_id_seq to !!DB_RT_USER!!;
+
+
diff --git a/rt/etc/acl.mysql b/rt/etc/acl.mysql
new file mode 100755
index 000000000..7feb376f5
--- /dev/null
+++ b/rt/etc/acl.mysql
@@ -0,0 +1,4 @@
+
+DELETE FROM user WHERE user like '!!DB_RT_USER!!';
+DELETE FROM db where db LIKE '!!DB_DATABASE!!';
+GRANT SELECT,INSERT,CREATE,INDEX,UPDATE,DELETE ON !!DB_DATABASE!!.* TO !!DB_RT_USER!!@!!DB_RT_HOST!! IDENTIFIED BY '!!DB_RT_PASS!!';
diff --git a/rt/etc/config.pm b/rt/etc/config.pm
new file mode 100755
index 000000000..52b1a0b25
--- /dev/null
+++ b/rt/etc/config.pm
@@ -0,0 +1,473 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/etc/Attic/config.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $	
+
+package RT;
+
+# {{{ Base Configuration
+
+# $rtname the string that RT will look for in mail messages to
+# figure out what ticket a new piece of mail belongs to
+
+# Your domain name is recommended, so as not to pollute the namespace.
+# once you start using a given tag, you should probably never change it. 
+# (otherwise, mail for existing tickets won't get put in the right place
+
+$rtname="example.com";  
+
+# You should set this to your organization's DNS domain. For example,
+# fsck.com or asylum.arkham.ma.us. It's used by the linking interface to 
+# guarantee that ticket URIs are unique and easy to construct.
+
+$Organization = "example.com";
+
+# $user_passwd_min defines the minimum length for user passwords. Setting
+# it to 0 disables this check
+$MinimumPasswordLength = "5";
+
+# $Timezone is used to convert times entered by users into GMT and back again
+# It should be set to a timezone recognized by your local unix box.
+$Timezone =  'US/Eastern'; 
+
+# LogDir is where RT writes its logfiles.
+# This directory should be writable by your rt group
+$LogDir = "!!RT_LOG_PATH!!";
+
+# }}}
+
+# {{{ Database Configuration
+
+# Database driver beeing used - i.e. MySQL.
+$DatabaseType="!!DB_TYPE!!";
+
+# The domain name of your database server
+# If you're running mysql and it's on localhost,
+# leave it blank for enhanced performance
+$DatabaseHost="!!DB_HOST!!";
+
+# The port that your database server is running on.  Ignored unless it's 
+# a positive integer. It's usually safe to leave this blank
+$DatabasePort="!!DB_PORT!!";
+
+
+#The name of the database user (inside the database) 
+$DatabaseUser='!!DB_RT_USER!!';
+
+# Password the DatabaseUser should use to access the database
+$DatabasePassword='!!DB_RT_PASS!!';
+
+
+# The name of the RT's database on your database server
+$DatabaseName='!!DB_DATABASE!!';
+
+# If you're using Postgres and have compiled in SSL support, 
+# set DatabaseRequireSSL to 1 to turn on SSL communication
+$DatabaseRequireSSL=undef;
+
+# }}}
+
+# {{{ Incoming mail gateway configuration
+
+
+# OwnerEmail is the address of a human who manages RT. RT will send
+# errors generated by the mail gateway to this address.  This address
+# should _not_ be an address that's managed by your RT instance.
+
+$OwnerEmail = 'root';
+
+# If $LoopsToRTOwner is defined, RT will send mail that it believes 
+# might be a loop to $RT::OwnerEmail 
+
+$LoopsToRTOwner = 1;
+
+# If $StoreLoopss is defined, RT will record messages that it believes 
+# to be part of mail loops.
+# As it does this, it will try to be careful not to send mail to the 
+# sender of these messages 
+
+$StoreLoops = undef;
+
+
+# $MaxAttachmentSize sets the maximum size (in bytes) of attachments stored
+# in the database. 
+
+# For mysql and oracle, we set this size at 10 megabytes.
+# If you're running a postgres version earlier than 7.1, you will need
+# to drop this to 8192. (8k)
+
+$MaxAttachmentSize = 10000000;  
+
+# $TruncateLongAttachments: if this is set to a non-undef value,
+# RT will truncate attachments longer than MaxAttachmentLength. 
+
+$TruncateLongAttachments = undef;
+
+
+# $DropLongAttachments: if this is set to a non-undef value,
+# RT will silently drop attachments longer than MaxAttachmentLength. 
+
+$DropLongAttachments = undef;
+
+# If $ParseNewMessageForTicketCcs is true, RT will attempt to divine
+# Ticket 'Cc' watchers from the To and Cc lines of incoming messages
+# Be forewarned that if you have _any_ addresses which forward mail to
+# RT automatically and you enable this option without modifying 
+# "IsRTAddress" below, you will get yourself into a heap of trouble.
+# And well, this is free software, so there isn't a warrantee, but
+# I disclaim all ability to help you if you do enable this without
+# modifying IsRTAddress below.
+
+$ParseNewMessageForTicketCcs = undef;
+
+# IsRTAddress is used to make sure RT doesn't add itself as a ticket CC if
+# the setting above is enabled.
+
+sub IsRTAddress {
+    my $address = shift;
+
+    # Example: the following rule would tell RT not to Cc 
+    #	"tickets@noc.example.com"
+    # return(1) if ($address =~ /^tickets\@noc.example.com$/i);
+    
+    return(undef)
+}
+
+# CanonicalizeAddress converts email addresses into canonical form.
+# it takes one email address in and returns the proper canonical
+# form. You can dump whatever your proper local config is in here
+
+sub CanonicalizeAddress {
+    my $email = shift;
+    # Example: the following rule would treat all email
+    # coming from a subdomain as coming from second level domain
+    # foo.com
+    #$email =~ s/\@(.*).foo.com/\@foo.com/;
+    return ($email)
+}
+
+# If $LookupSenderInExternalDatabase is defined, RT will attempt to
+# verify the incoming message sender with a known source, using the 
+# LookupExternalUserInfo routine below
+
+$LookupSenderInExternalDatabase = undef;
+
+# If $SenderMustExistInExternalDatabase is true, RT will refuse to
+# create non-privileged accounts for unknown users if you are using 
+# the "LookupSenderInExternalDatabase" option.
+# Instead, an error message will be mailed and RT will forward the 
+# message to $RTOwner.
+#
+# If you are not using $LookupSenderInExternalDatabase, this option
+# has no effect.
+#
+# If you define an AutoRejectRequest template, RT will use this   
+# template for the rejection message.
+
+$SenderMustExistInExternalDatabase = undef;
+
+# LookupExternalUserInfo is a site-definable method for synchronizing
+# incoming users with an external data source. 
+#
+# This routine takes a tuple of EmailAddress and FriendlyName
+# 	EmailAddress is the user's email address, ususally taken from
+#  		an email message's From: header.
+# 	FriendlyName is a freeform string, ususally taken from the "comment" 
+#		portion	of an email message's From: header.
+#
+# It returns (FoundInExternalDatabase, ParamHash);
+#
+#   FoundInExternalDatabase must  be set to 1 before return if the user was
+#   found in the external database.
+#
+#   ParamHash is a Perl parameter hash which can contain at least the following
+#   fields. These fields are used to populate RT's users database when the user 
+#   is created
+#
+# 	EmailAddress is the email address that RT should use for this user.  
+# 	Name is the 'Name' attribute RT should use for this user. 
+#   	     'Name' is used for things like access control and user lookups.
+# 	RealName is what RT should display as the user's name when displaying 
+#   	     'friendly' names
+
+sub LookupExternalUserInfo {
+  my ($EmailAddress, $RealName) = @_;
+
+  my $FoundInExternalDatabase = 1;
+  my %params = {};
+  
+  #Name is the RT username you want to use for this user.
+  $params{'Name'} = $EmailAddress;
+  $params{'EmailAddress'} = $EmailAddress;
+  $params{'RealName'} = $RealName;
+
+  # See RT's contributed code for examples.
+  # http://www.fsck.com/pub/rt/contrib/
+  return ($FoundInExternalDatabase, %params); 
+}
+
+# }}}
+
+# {{{ Outgoing mail configuration
+
+# RT is designed such that any mail which already has a ticket-id associated
+# with it will get to the right place automatically.
+
+# $CorrespondAddress and $CommentAddress are the default addresses 
+# that will be listed in From: and Reply-To: headers of correspondence
+# and comment mail tracked by RT, unless overridden by a queue-specific
+# address. 
+
+$CorrespondAddress='RT::CorrespondAddress.not.set';
+
+$CommentAddress='RT::CommentAddress.not.set';
+
+
+#Sendmail Configuration
+
+# $MailCommand defines which method RT will use to try to send mail
+# We know that 'sendmailpipe' works fairly well.
+# If 'sendmailpipe' doesn't work well for you, try 'sendmail' 
+#
+# Note that you should remove the '-t' from $SendmailArguments 
+# if you use 'sendmail rather than 'sendmailpipe'
+
+$MailCommand = 'sendmailpipe';
+
+# $SendmailArguments defines what flags to pass to $Sendmail
+# assuming you picked 'sendmail' or 'sendmailpipe' as the $MailCommand above.
+# If you picked 'sendmailpipe', you MUST add a -t flag to $SendmailArguments
+
+# These options are good for most sendmail wrappers and workalikes
+$SendmailArguments="-oi -t";
+
+# These arguments are good for sendmail brand sendmail 8 and newer
+#$SendmailArguments="-oi -t -ODeliveryMode=b -OErrorMode=m";
+
+# If you selected 'sendmailpipe' above, you MUST specify the path
+# to your sendmail binary in $SendmailPath.  
+# !! If you did not # select 'sendmailpipe' above, this has no effect!!
+$SendmailPath = "/usr/sbin/sendmail";
+
+# RT can optionally set a "Friendly" 'To:' header when sending messages to 
+# Ccs or AdminCcs (rather than having a blank 'To:' header.
+
+# This feature DOES NOT WORK WITH SENDMAIL[tm] BRAND SENDMAIL
+# If you are using sendmail, rather than postfix, qmail, exim or some other MTA,
+# you _must_ disable this option.
+
+$UseFriendlyToLine = 0;
+
+
+# }}}
+
+# {{{ Logging
+
+# Logging.  The default is to log anything except debugging
+# information to a logfile.  Check the Log::Dispatch POD for
+# information about how to get things by syslog, mail or anything
+# else, get debugging info in the log, etc. 
+
+#  It might generally make
+# sense to send error and higher by email to some administrator. 
+# If you do this, be careful that this email isn't sent to this RT instance.
+
+
+# the minimum level error that will be logged to the specific device.
+# levels from lowest to highest:  
+#  debug info notice warning error critical alert emergency 
+
+
+#  Mail loops will generate a critical log message.
+
+$LogToScreen = 'error';
+$LogToFile = 'error';
+#$LogToFileNamed = "$LogDir/rt.log.".$$.".".$<; #log to rt.log.<pid>.<user>
+$LogToFileNamed = "$LogDir/rt.log".$<; #log to rt.log.user;
+
+# }}}
+
+# {{{ Web interface configuration
+
+
+
+# Define the directory name to be used for images in rt web
+# documents.
+
+# If you're putting the web ui somewhere other than at the root of
+# your server
+# $WebPath requires a leading / but no trailing /     
+
+$WebPath = "";
+
+# This is the Scheme, server and port for constructing urls to webrt
+# $WebBaseURL doesn't need a trailing /                                                                            
+
+$WebBaseURL = "http://RT::WebBaseURL.not.configured:80";
+
+$WebURL = $WebBaseURL . $WebPath . "/";
+
+
+
+# $WebImagesURL points to the base URL where RT can find its images.
+# If you're running the FastCGI version of the RT web interface,
+# you should make RT's WebRT/html/NoAuth/images directory available on 
+# a static web server and supply that URL as $WebImagesURL.
+
+$WebImagesURL = $WebURL."NoAuth/images/";
+
+# $RTLogoURL points to the URL of the RT logo displayed in the web UI
+
+$LogoURL = $WebImagesURL."rt.jpg";
+
+# If $WebExternalAuth is defined, RT will defer to the environment's
+# REMOTE_USER variable.
+
+$WebExternalAuth = undef;
+
+# $MasonComponentRoot is where your rt instance keeps its mason html files
+# (this should be autoconfigured during 'make install' or 'make upgrade')
+
+$MasonComponentRoot = "!!MASON_HTML_PATH!!";
+
+# $MasonLocalComponentRoot is where your rt instance keeps its site-local
+# mason html files.
+# (this should be autoconfigured during 'make install' or 'make upgrade')
+
+$MasonLocalComponentRoot = "!!MASON_LOCAL_HTML_PATH!!";
+
+# $MasonDataDir Where mason keeps its datafiles
+# (this should be autoconfigured during 'make install' or 'make upgrade')
+
+$MasonDataDir = "!!MASON_DATA_PATH!!";
+
+# RT needs to put session data (for preserving state between connections
+# via the web interface)
+$MasonSessionDir = "!!MASON_SESSION_PATH!!";
+
+
+
+#This is from tobias' prototype web search UI. it may stay and it may go.
+%WebOptions=
+    (
+     # This is for putting in more user-actions at the Transaction
+     # bar.  I will typically add "Enter bug in Bugzilla" here.:
+     ExtraTransactionActions => sub { return ""; },
+
+     # Here you can modify the list view.  Be aware that the web
+     # interface might crash if TicketAttribute is wrongly set.
+     
+     QueueListingCols => 
+      [
+       { Header     => 'Id',
+	 TicketLink => 1,
+	 TicketAttribute => 'Id'
+	 },
+
+      { Header     => 'Subject',
+	 TicketAttribute => 'Subject'
+	 },
+       { Header => 'Requestor(s)',
+	 TicketAttribute => 'RequestorsAsString'
+	 },
+       { Header => 'Status',
+	 TicketAttribute => 'Status'
+	 },
+
+
+       { Header => 'Queue',
+	 TicketAttribute => 'QueueObj->Name'
+	 },
+
+
+
+       { Header => 'Told',
+	 TicketAttribute => 'ToldObj->AgeAsString'
+	 },
+
+       { Header => 'Age',
+	 TicketAttribute => 'CreatedObj->AgeAsString'
+	 },
+
+       { Header => 'Last',
+	 TicketAttribute => 'LastUpdatedObj->AgeAsString'
+	 },
+
+       # TODO: It would be nice with a link here to the Owner and all
+       # other request owned by this Owner.
+       { Header => 'Owner',
+	 TicketAttribute => 'OwnerObj->Name'
+       },
+   
+ 
+       { Header     => 'Take',
+	 TicketLink => 1,
+	 Constant   => 'Take',
+	 ExtraLinks => '&Action=Take'
+	 },
+
+      ]
+     );
+
+# }}}
+
+# {{{ RT Linking Interface
+
+# $TicketBaseURI is the Base path of the URI for local tickets
+
+# You shouldn't need to touch this. it's used to link tickets both locally
+# and remotely
+
+$TicketBaseURI = "fsck.com-rt://$Organization/$rtname/ticket/";
+
+# A hash table of conversion subs to be used for transforming RT Link
+# URIs to URLs in the web interface.  If you want to use RT towards
+# locally installed databases, this is the right place to configure it.
+
+%URI2HTTP=
+    (
+      'http' => sub {return @_;},
+      'https' => sub {return @_;},
+      'ftp' => sub {return @_;},
+     'fsck.com-rt' => sub {warn "stub!";},
+     'mozilla.org-bugzilla' => sub {warn "stub!"},
+     'fsck.com-kb' => sub {warn "stub!"}
+     );
+
+
+# A hash table of subs for fetching content from an URI
+%ContentFromURI=   
+    (
+     'fsck.com-rt' => sub {warn "stub!";},
+     'mozilla.org-bugzilla' => sub {warn "stub!"},
+     'fsck.com-kb' => sub {warn "stub!"}
+     );
+
+# }}}
+
+# {{{ No User servicable parts inside 
+
+############################################
+############################################
+############################################
+#
+#  Don't edit anything below this line unless you really know
+#  what you're doing
+#
+#
+############################################
+############################################
+
+# TODO: get this stuff out of the config file and into RT.pm
+
+#Set up us the timezone
+$ENV{'TZ'} = $Timezone; #TODO: Bogus hack to deal with Date::Manip whining
+
+# Configure sendmail if we're using Entity->send('sendmail')
+if ($MailCommand eq 'sendmail') {
+    $MailParams = $SendmailArguments;
+}
+
+
+
+# }}}
+
+
+1;
diff --git a/rt/etc/rt.spec b/rt/etc/rt.spec
new file mode 100644
index 000000000..14200c1f3
--- /dev/null
+++ b/rt/etc/rt.spec
@@ -0,0 +1,137 @@
+Summary: rt Request Tracker
+
+Name: rt
+Version: 2.0.9pre5
+Release: 1
+Group: Applications/Web
+Packager: Jesse Vincent <jesse@bestpractical.com>
+Vendor: http://www.fsck.com/projects/rt
+Requires: perl
+Requires: mod_perl > 1.22
+Requires: perl-DBI >= 1.18
+Requires: perl-DBIx-DataSource >= 0.02
+Requires: perl-DBIx-SearchBuilder >= 0.47
+Requires: perl-HTML-Parser
+Requires: perl-MLDBM
+Requires: perl-libnet
+Requires: perl-CGI.pm >= 2.78
+Requires: perl-Params-Validate >= 0.02
+Requires: perl-HTML-Mason >= 0.896
+Requires: perl-libapreq
+Requires: perl-Apache-Session >= 1.53
+Requires: perl-MIME-tools >= 5.411
+Requires: perl-MailTools >= 1.20
+Requires: perl-Getopt-Long >= 2.24
+Requires: perl-Tie-IxHash
+Requires: perl-TimeDate
+Requires: perl-Time-HiRes
+Requires: perl-Text-Wrapper
+Requires: perl-Text-Template
+Requires: perl-File-Spec >= 0.8
+Requires: perl-FreezeThaw
+Requires: perl-Storable
+Requires: perl-File-Temp
+Requires: perl-Log-Dispatch >= 1.6                     
+
+Source: http://www.fsck.com/pub/rt/release/%{name}.tar.gz
+ 
+Copyright: GPL 
+BuildRoot: /var/tmp/rt-root
+
+%description
+RT is an industrial-grade ticketing system. It lets a group
+of people intelligently and efficiently manage requests
+submitted by a community of users. RT is used by systems
+administrators, customer support staffs, NOCs, developers
+and even marketing departments at over a thousand sites
+around the world. 
+
+%prep
+groupadd rt || true
+%setup -q -n %{name}
+
+%build
+
+%install
+
+if [ x$RPM_BUILD_ROOT != x ]; then
+rm -rf $RPM_BUILD_ROOT
+fi
+
+#
+# Perform all the non-site specfic steps whilst building the package
+#
+make dirs libs-install html-install bin-install  DESTDIR=$RPM_BUILD_ROOT
+#
+# fixperms needs these, so make fake empty files
+touch $RPM_BUILD_ROOT/opt/rt2/etc/insertdata $RPM_BUILD_ROOT/opt/rt2/etc/config.pm
+make fixperms insert-install WEB_USER=www DESTDIR=$RPM_BUILD_ROOT
+
+#
+# Copy in the files needed again after install
+#
+mkdir -p $RPM_BUILD_ROOT/opt/rt2/postinstall/bin
+cp -rp Makefile etc tools $RPM_BUILD_ROOT/opt/rt2/postinstall
+cp -rp bin/initacls.* $RPM_BUILD_ROOT/opt/rt2/postinstall/bin
+
+# logging in /var/log/rt2
+mkdir -p $RPM_BUILD_ROOT/var/log/rt2
+chown www $RPM_BUILD_ROOT/var/log/rt2
+chgrp rt $RPM_BUILD_ROOT/var/log/rt2
+chmod ug=rwx,o= $RPM_BUILD_ROOT/var/log/rt2
+
+%clean
+if [ x$RPM_BUILD_ROOT != x ]; then
+rm -rf $RPM_BUILD_ROOT
+fi
+
+#
+# A new rt groups is required
+#
+%pre
+groupadd rt || true
+
+#
+# Show the user the site specific steps required after install
+#
+%post
+cat <<EOF
+-----------------------------------------------------------------------
+rt2 installation is complete. Now create the rt2 database by running:
+-----------------------------------------------------------------------
+
+# cd /opt/rt2/postinstall
+# make config-replace initialize.mysql insert RT_LOG_PATH=/var/log/rt2 DB_RT_PASS=new_rt_user_password
+
+Choose your own new_rt_user_password. You will need the mysql root password.
+You can try Pg or Oracle instead of mysql - untested.
+
+Review and configure your site specific details in /opt/rt2/etc/config.pm
+EOF
+
+%preun
+
+%files
+%dir /opt/rt2
+/opt/rt2/bin
+/opt/rt2/WebRT
+/opt/rt2/lib
+/opt/rt2/local
+/opt/rt2/man
+/opt/rt2/postinstall
+%dir /opt/rt2/etc
+/opt/rt2/etc/insertdata
+%config /opt/rt2/etc/config.pm
+%dir /var/log/rt2
+
+%changelog
+* Mon Sep 24 2001 Jesse Vincent <jesse@bestpractical.com>
+  Switch to rt DESTDIR support
+* Fri Sep 14 2001 Cris Bailiff <c.bailiff@devsecure.com>
+  Fix permissions on created /var/log/rt2 and roll in 2.0.7
+* Tue Sep 4 2001 Cris Bailiff <c.bailiff@devsecure.com>
+- created initial spec file
+* Tue Sep 4 2001 Cris Bailiff <c.bailiff@devsecure.com>
+- created initial spec file
+* Tue Sep 4 2001 Cris Bailiff <c.bailiff@devsecure.com>
+- created initial spec file
diff --git a/rt/etc/schema.Oracle b/rt/etc/schema.Oracle
new file mode 100644
index 000000000..0c14cb39d
--- /dev/null
+++ b/rt/etc/schema.Oracle
@@ -0,0 +1,287 @@
+CREATE SEQUENCE KEYWORDSELECTS_seq;
+CREATE TABLE KeywordSelects (
+	id		NUMBER(11, 0) PRIMARY KEY,
+	Name		VARCHAR2(255),
+	Keyword		NUMBER(11, 0),
+	Single		NUMBER(11, 0),
+	Depth		NUMBER(11, 0) DEFAULT 0,
+	ObjectType	VARCHAR2(32) NOT NULL,
+	ObjectField	VARCHAR2(32),
+	ObjectValue	VARCHAR2(255),
+	Disabled		NUMBER(11, 0) DEFAULT 0
+);
+
+CREATE INDEX KeywordSelects1 ON KeywordSelects (Keyword);
+CREATE INDEX KeywordSelects2 ON 
+	KeywordSelects(ObjectType, ObjectField, ObjectValue);
+
+
+CREATE SEQUENCE ATTACHMENTS_seq;
+CREATE TABLE Attachments (
+  	id 		NUMBER(11,0) PRIMARY KEY,
+  	TransactionId	NUMBER(11,0) NOT NULL,
+  	Parent 		NUMBER(11,0), 		
+  	MessageId 	VARCHAR2(160),
+  	Subject 	VARCHAR2(255),
+  	Filename 	VARCHAR2(255),
+  	ContentType 	VARCHAR2(80),
+  	ContentEncoding 	VARCHAR2(80),
+  	Content 	CLOB,
+  	Headers 	CLOB,
+  	Creator 	NUMBER(11,0),
+  	Created 	DATE,
+  	Disabled 	NUMBER(11,0) DEFAULT 0
+);
+
+CREATE SEQUENCE QUEUES_seq;
+CREATE TABLE Queues (
+ 	id 			NUMBER(11, 0) PRIMARY KEY,
+	Name 			VARCHAR2(40) NOT NULL UNIQUE,
+	Description 		VARCHAR2(120),
+ 	CorrespondAddress 	VARCHAR2(40),
+ 	CommentAddress 		VARCHAR2(40),
+ 	InitialPriority 	NUMBER(11, 0),		
+ 	FinalPriority 		NUMBER(11, 0),
+ 	DefaultDueIn 		NUMBER(11, 0),
+  	Creator 		NUMBER(11, 0),
+  	Created 		DATE,
+  	LastUpdatedBy 		NUMBER(11, 0),
+  	LastUpdated		DATE,
+  	Disabled 		NUMBER(11,0) DEFAULT 0
+);
+
+CREATE SEQUENCE LINKS_seq;
+CREATE TABLE Links (
+  	id 		NUMBER(11,0) PRIMARY KEY,
+  	Base 		VARCHAR2(255),
+  	Target 		VARCHAR2(255),
+  	Type 		VARCHAR2(20) NOT NULL,
+	LocalTarget	NUMBER(11,0),
+	LocalBase	NUMBER(11,0),
+  	LastUpdatedBy 	NUMBER(11,0),
+  	LastUpdated 	DATE,
+  	Creator 	NUMBER(11,0),
+  	Created 	DATE
+);
+
+CREATE UNIQUE INDEX Links1 ON Links (Base, Target, Type);
+
+
+
+CREATE SEQUENCE GROUPS_seq;
+CREATE TABLE Groups (
+	id 		NUMBER(11,0) PRIMARY KEY,
+	Name 		VARCHAR2(16) UNIQUE,
+	Description 	VARCHAR(64),
+	Pseudo		NUMBER(11,0) DEFAULT 0
+);
+
+CREATE SEQUENCE WATCHERS_seq;
+CREATE TABLE Watchers (
+   	id 		NUMBER(11,0) PRIMARY KEY,
+   	Type 		VARCHAR2(16), 	
+   	Scope 		VARCHAR2(16),	
+   	Value 		NUMBER(11,0),	
+   	Email 		VARCHAR2(255),  
+   	Quiet 		NUMBER(11,0),	
+   	Owner 		NUMBER(11,0),	
+   	Creator 	NUMBER(11,0),
+   	Created 	DATE,
+   	LastUpdatedBy 	NUMBER(11,0),
+   	LastUpdated 	DATE
+);
+
+
+
+CREATE SEQUENCE SCRIPCONDITIONS_seq;
+CREATE TABLE ScripConditions (
+ 	id 			NUMBER(11, 0) PRIMARY KEY,
+	Name 			VARCHAR2(255),
+	Description 		VARCHAR2(255),
+	ExecModule		VARCHAR2(60),
+	Argument		VARCHAR2(255),
+	ApplicableTransTypes	VARCHAR2(60),
+  	Creator 		NUMBER(11, 0),
+  	Created 		DATE,
+  	LastUpdatedBy 		NUMBER(11, 0),
+  	LastUpdated		DATE
+);
+
+
+CREATE SEQUENCE TRANSACTIONS_seq;
+CREATE TABLE Transactions (
+  	id 			NUMBER(11,0) PRIMARY KEY,
+  	EffectiveTicket 	NUMBER(11,0),
+  	Ticket 			NUMBER(11,0),
+  	TimeTaken 		NUMBER(11,0),
+  	Type 			VARCHAR2(20),
+  	Field 			VARCHAR2(40),
+  	OldValue 		VARCHAR2(255),
+  	NewValue 		VARCHAR2(255),
+  	Data 			VARCHAR2(100),
+  	Creator 		NUMBER(11,0),
+  	Created 		DATE,
+  	Disabled 		NUMBER(11,0) DEFAULT 0
+);
+
+CREATE SEQUENCE SCRIPS_seq;
+CREATE TABLE Scrips (
+  	id 		NUMBER(11,0) PRIMARY KEY,	
+	ScripCondition 	NUMBER(11,0),
+	ScripAction	NUMBER(11,0),
+	Stage		VARCHAR2(32),
+	Queue		NUMBER(11,0),
+	Template	NUMBER(11,0),
+  	Creator 	NUMBER(11,0),
+  	Created 	DATE,
+  	LastUpdatedBy 	NUMBER(11,0),
+  	LastUpdated 	DATE  
+);
+
+
+
+
+CREATE SEQUENCE ACL_seq;
+CREATE TABLE ACL (
+	id 		NUMBER(11,0) PRIMARY KEY,
+	PrincipalId 	NUMBER(11,0),
+	PrincipalType 	VARCHAR2(25),
+	RightName	VARCHAR2(25),
+	RightScope	VARCHAR2(25),
+	RightAppliesTo  NUMBER(11,0)
+);
+
+CREATE SEQUENCE GROUPMEMBERS_seq;
+CREATE TABLE GroupMembers (
+	id 		NUMBER(11,0) PRIMARY KEY,
+	GroupId 	NUMBER(11,0),
+	UserId 		NUMBER(11,0) 
+);
+
+CREATE UNIQUE INDEX GroupMembers1 ON GroupMembers (GroupId, UserId);
+
+
+CREATE SEQUENCE OBJECTKEYWORDS_seq;
+CREATE TABLE ObjectKeywords (
+  id 		NUMBER(11,0)  PRIMARY KEY,
+  Keyword	NUMBER(11,0) NOT NULL,
+  KeywordSelect NUMBER(11,0)  NOT NULL,
+  ObjectType	VARCHAR2(32) NOT NULL,
+  ObjectId	NUMBER(11,0) NOT NULL
+);
+
+CREATE UNIQUE INDEX ObjectKeywords1 ON ObjectKeywords
+	(ObjectId, ObjectType, KeywordSelect, Keyword);
+CREATE INDEX ObjectKeywords3 ON ObjectKeywords (Keyword);
+
+CREATE SEQUENCE KEYWORDS_seq;
+CREATE TABLE Keywords (
+	id		NUMBER(11, 0) PRIMARY KEY,
+	Name		VARCHAR2(255) NOT NULL,
+	Description	VARCHAR2(255),
+	Parent		NUMBER(11, 0),
+	Disabled		NUMBER(11, 0) DEFAULT 0
+);
+
+CREATE UNIQUE INDEX Keywords1 ON Keywords (Name, Parent);
+CREATE INDEX Keywords3 ON Keywords (Parent);
+
+CREATE SEQUENCE USERS_seq;
+CREATE TABLE Users (
+  	id 			NUMBER(11,0) PRIMARY KEY,
+  	Name 			VARCHAR2(120) NOT NULL UNIQUE,
+  	Password 		VARCHAR2(40),
+  	Comments 		CLOB,
+  	Signature 		CLOB,
+  	EmailAddress 		VARCHAR2(120),
+  	FreeFormContactInfo 	CLOB,
+	Organization		VARCHAR2(200),
+	Privileged		NUMBER(11,0),
+  	RealName 		VARCHAR2(120),
+  	NickName 		VARCHAR2(16),
+  	Lang 			VARCHAR2(16),
+	EmailEncoding		VARCHAR2(16),
+	WebEncoding		VARCHAR2(16),
+	ExternalContactInfoId	VARCHAR2(100),
+	ContactInfoSystem	VARCHAR2(30),
+	ExternalAuthId 		VARCHAR2(100),
+	AuthSystem		VARCHAR2(30),
+	Gecos			VARCHAR2(16),
+  	HomePhone 		VARCHAR2(30),
+  	WorkPhone 		VARCHAR2(30),
+  	MobilePhone 		VARCHAR2(30),
+  	PagerPhone 		VARCHAR2(30),
+  	Address1	 	VARCHAR2(200),
+  	Address2 		VARCHAR2(200),
+  	City 			VARCHAR2(100),
+  	State 			VARCHAR2(100),
+  	Zip 			VARCHAR2(16),
+  	Country 		VARCHAR2(50),
+  	Creator 		NUMBER(11,0),
+  	Created 		DATE,
+  	LastUpdatedBy 		NUMBER(11,0),
+  	LastUpdated 		DATE,
+	Disabled			NUMBER(11,0) DEFAULT 0
+);
+
+
+
+
+CREATE SEQUENCE TICKETS_seq;
+CREATE TABLE Tickets (
+  	id			NUMBER(11, 0) PRIMARY KEY,
+  	EffectiveId		NUMBER(11, 0),
+  	Queue 			NUMBER(11,0),
+  	Type 			VARCHAR2(16), 		
+  	IssueStatement 		NUMBER(11,0), 	
+  	Resolution 		NUMBER(11,0),		
+  	Owner 			NUMBER(11,0),		
+  	Subject			VARCHAR2(200) DEFAULT '', 
+  	InitialPriority 	NUMBER(11,0) DEFAULT 0,
+  	FinalPriority 		NUMBER(11,0) DEFAULT 0,
+  	Priority 		NUMBER(11,0) DEFAULT 0,
+  	Status 			VARCHAR2(10), 		
+  	TimeWorked 		NUMBER(11,0) DEFAULT 0,
+	TimeLeft 		NUMBER(11,0) DEFAULT 0,
+  	Told 			DATE,
+	Starts			DATE,
+	Started			DATE,
+  	Due 			DATE,
+	Resolved		DATE,
+  	LastUpdatedBy 		NUMBER(11,0),
+  	LastUpdated 		DATE,
+	Creator 		NUMBER(11,0),
+  	Created 		DATE,
+  	Disabled 		NUMBER(11,0) DEFAULT 0
+);
+
+CREATE SEQUENCE SCRIPACTIONS_seq;
+CREATE TABLE ScripActions (
+  id		NUMBER(11,0) PRIMARY KEY,
+  Name		VARCHAR2(255),
+  Description	VARCHAR2(255),
+  ExecModule	VARCHAR2(60),
+  Argument	VARCHAR2(255),
+  Creator	NUMBER(11,0),
+  Created	DATE,
+  LastUpdatedBy	NUMBER(11,0),
+  LastUpdated	DATE
+);
+
+
+CREATE SEQUENCE TEMPLATES_seq;
+CREATE TABLE Templates (
+  	id 		NUMBER(11,0) PRIMARY KEY,
+	Queue 		NUMBER(11,0) DEFAULT 0 NOT NULL,
+	Name		VARCHAR2(40) NOT NULL UNIQUE,
+	Description	VARCHAR2(120),
+	Type		VARCHAR2(16),
+  	Language 	VARCHAR2(16), 
+  	TranslationOf 	NUMBER(11,0),
+  	Content 	CLOB,
+  	LastUpdated 	DATE,
+  	LastUpdatedBy 	NUMBER(11,0),
+  	Creator 	NUMBER(11,0),
+  	Created 	DATE
+);
+
diff --git a/rt/etc/schema.Pg b/rt/etc/schema.Pg
new file mode 100755
index 000000000..21d981b4a
--- /dev/null
+++ b/rt/etc/schema.Pg
@@ -0,0 +1,267 @@
+CREATE TABLE KeywordSelects (
+  id serial NOT NULL  ,
+  Name varchar(255)   ,
+  Keyword integer   ,
+  Single integer   ,
+  Depth integer NOT NULL DEFAULT 0 ,
+  ObjectType varchar(32) NOT NULL  ,
+  ObjectField varchar(32)   ,
+  ObjectValue varchar(255)   ,
+  Disabled int2 NOT NULL DEFAULT 0 ,
+  PRIMARY KEY (id)
+);
+CREATE INDEX KeywordSelects1 ON KeywordSelects (Keyword);
+CREATE INDEX KeywordSelects2 ON KeywordSelects (ObjectType, ObjectField, ObjectValue);
+CREATE TABLE Attachments (
+  id serial NOT NULL  ,
+  TransactionId integer NOT NULL  ,
+  Parent integer   ,
+  MessageId varchar(160)   ,
+  Subject varchar(255)   ,
+  Filename varchar(255)   ,
+  ContentType varchar(80)   ,
+  ContentEncoding varchar(80)   ,
+  Content TEXT   ,
+  Headers TEXT   ,
+  Creator integer   ,
+  Created timestamp   ,
+  PRIMARY KEY (id)
+);
+CREATE INDEX Attachments1 ON Attachments (Parent);
+CREATE INDEX Attachments2 ON Attachments (TransactionId);
+CREATE INDEX Attachments3 ON Attachments (Parent, TransactionId);
+CREATE TABLE Queues (
+  id serial NOT NULL  ,
+  Name varchar(120) NOT NULL  ,
+  Description varchar(120)   ,
+  CorrespondAddress varchar(120)   ,
+  CommentAddress varchar(120)   ,
+  InitialPriority integer   ,
+  FinalPriority integer   ,
+  DefaultDueIn integer   ,
+  Creator integer   ,
+  Created timestamp   ,
+  LastUpdatedBy integer   ,
+  LastUpdated timestamp   ,
+  Disabled int2 NOT NULL DEFAULT 0 ,
+  PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX Queues1 ON Queues (Name);
+CREATE TABLE Links (
+  id serial NOT NULL  ,
+  Base varchar(240)   ,
+  Target varchar(240)   ,
+  Type varchar(20) NOT NULL  ,
+  LocalTarget integer   ,
+  LocalBase integer   ,
+  LastUpdatedBy integer   ,
+  LastUpdated timestamp   ,
+  Creator integer   ,
+  Created timestamp   ,
+  PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX Links1 ON Links (Base, Target, Type);
+CREATE TABLE Groups (
+  id serial NOT NULL  ,
+  Name varchar(16)   ,
+  Description varchar(64)   ,
+  Pseudo integer NOT NULL DEFAULT 0 ,
+  PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX Groups1 ON Groups (Name);
+CREATE TABLE Watchers (
+  id serial NOT NULL  ,
+  Type varchar(16)   ,
+  Scope varchar(16)   ,
+  Value integer   ,
+  Email varchar(255)   ,
+  Quiet integer   ,
+  Owner integer   ,
+  Creator integer   ,
+  Created timestamp   ,
+  LastUpdatedBy integer   ,
+  LastUpdated timestamp   ,
+  PRIMARY KEY (id)
+);
+CREATE INDEX Watchers1 ON Watchers (Scope, Value, Type, Owner);
+CREATE TABLE ScripConditions (
+  id serial NOT NULL  ,
+  Name varchar(255)   ,
+  Description varchar(255)   ,
+  ExecModule varchar(60)   ,
+  Argument varchar(255)   ,
+  ApplicableTransTypes varchar(60)   ,
+  Creator integer   ,
+  Created timestamp   ,
+  LastUpdatedBy integer   ,
+  LastUpdated timestamp   ,
+  PRIMARY KEY (id)
+);
+CREATE TABLE Transactions (
+  id serial NOT NULL  ,
+  EffectiveTicket integer   ,
+  Ticket integer   ,
+  TimeTaken integer   ,
+  Type varchar(20)   ,
+  Field varchar(40)   ,
+  OldValue varchar(255)   ,
+  NewValue varchar(255)   ,
+  Data varchar(100)   ,
+  Creator integer   ,
+  Created timestamp   ,
+  PRIMARY KEY (id)
+);
+CREATE INDEX Transactions1 ON Transactions (Ticket);
+CREATE INDEX Transactions2 ON Transactions (EffectiveTicket);
+CREATE TABLE Scrips (
+  id serial NOT NULL  ,
+  ScripCondition integer   ,
+  ScripAction integer   ,
+  Stage varchar(32)   ,
+  Queue integer   ,
+  Template integer   ,
+  Creator integer   ,
+  Created timestamp   ,
+  LastUpdatedBy integer   ,
+  LastUpdated timestamp   ,
+  PRIMARY KEY (id)
+);
+CREATE TABLE ACL (
+  id serial NOT NULL  ,
+  PrincipalId integer   ,
+  PrincipalType varchar(25)   ,
+  RightName varchar(25)   ,
+  RightScope varchar(25)   ,
+  RightAppliesTo integer   ,
+  PRIMARY KEY (id)
+);
+CREATE INDEX ACL1 ON ACL (RightScope, PrincipalId);
+CREATE INDEX ACL2 ON ACL (RightScope, RightAppliesTo, RightName, PrincipalType, PrincipalId);
+CREATE TABLE GroupMembers (
+  id serial NOT NULL  ,
+  GroupId integer   ,
+  UserId integer   ,
+  PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX GroupMembers1 ON GroupMembers (GroupId, UserId);
+CREATE TABLE ObjectKeywords (
+  id serial NOT NULL  ,
+  Keyword integer NOT NULL  ,
+  KeywordSelect integer NOT NULL  ,
+  ObjectType varchar(32) NOT NULL  ,
+  ObjectId integer NOT NULL  ,
+  PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX ObjectKeywords1 ON ObjectKeywords (ObjectId, ObjectType, KeywordSelect, Keyword);
+CREATE INDEX ObjectKeywords2 ON ObjectKeywords (ObjectId, ObjectType);
+CREATE INDEX ObjectKeywords3 ON ObjectKeywords (Keyword);
+CREATE TABLE Keywords (
+  id serial NOT NULL  ,
+  Name varchar(255) NOT NULL  ,
+  Description varchar(255)   ,
+  Parent integer   ,
+  Disabled int2 NOT NULL DEFAULT 0 ,
+  PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX Keywords1 ON Keywords (Name, Parent);
+CREATE INDEX Keywords2 ON Keywords (Name);
+CREATE INDEX Keywords3 ON Keywords (Parent);
+CREATE TABLE Users (
+  id serial NOT NULL  ,
+  Name varchar(120) NOT NULL  ,
+  Password varchar(40)   ,
+  Comments TEXT   ,
+  Signature TEXT   ,
+  EmailAddress varchar(120)   ,
+  FreeformContactInfo TEXT   ,
+  Organization varchar(200)   ,
+  Privileged integer   ,
+  RealName varchar(120)   ,
+  Nickname varchar(16)   ,
+  Lang varchar(16)   ,
+  EmailEncoding varchar(16)   ,
+  WebEncoding varchar(16)   ,
+  ExternalContactInfoId varchar(100)   ,
+  ContactInfoSystem varchar(30)   ,
+  ExternalAuthId varchar(100)   ,
+  AuthSystem varchar(30)   ,
+  Gecos varchar(16)   ,
+  HomePhone varchar(30)   ,
+  WorkPhone varchar(30)   ,
+  MobilePhone varchar(30)   ,
+  PagerPhone varchar(30)   ,
+  Address1 varchar(200)   ,
+  Address2 varchar(200)   ,
+  City varchar(100)   ,
+  State varchar(100)   ,
+  Zip varchar(16)   ,
+  Country varchar(50)   ,
+  Creator integer   ,
+  Created timestamp   ,
+  LastUpdatedBy integer   ,
+  LastUpdated timestamp   ,
+  Disabled int2 NOT NULL DEFAULT 0 ,
+  PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX Users1 ON Users (Name);
+CREATE INDEX Users3 ON Users (id, EmailAddress);
+CREATE INDEX Users4 ON Users (EmailAddress);
+CREATE TABLE Tickets (
+  id serial NOT NULL  ,
+  EffectiveId integer   ,
+  Queue integer   ,
+  Type varchar(16)   ,
+  IssueStatement integer   ,
+  Resolution integer   ,
+  Owner integer   ,
+  Subject varchar(200)  DEFAULT '[no subject]' ,
+  InitialPriority integer   ,
+  FinalPriority integer   ,
+  Priority integer   ,
+  Status varchar(10)   ,
+  TimeWorked integer   ,
+  TimeLeft integer   ,
+  Told timestamp   ,
+  Starts timestamp   ,
+  Started timestamp   ,
+  Due timestamp   ,
+  Resolved timestamp   ,
+  LastUpdatedBy integer   ,
+  LastUpdated timestamp   ,
+  Creator integer   ,
+  Created timestamp   ,
+  Disabled int2 NOT NULL DEFAULT 0 ,
+  PRIMARY KEY (id)
+);
+CREATE INDEX Tickets1 ON Tickets (Queue, Status);
+CREATE INDEX Tickets2 ON Tickets (Owner);
+CREATE INDEX Tickets3 ON Tickets (EffectiveId);
+CREATE INDEX Tickets4 ON Tickets (id, Status);
+CREATE INDEX Tickets5 ON Tickets (id, EffectiveId);
+CREATE TABLE ScripActions (
+  id serial NOT NULL  ,
+  Name varchar(255)   ,
+  Description varchar(255)   ,
+  ExecModule varchar(60)   ,
+  Argument varchar(255)   ,
+  Creator integer   ,
+  Created timestamp   ,
+  LastUpdatedBy integer   ,
+  LastUpdated timestamp   ,
+  PRIMARY KEY (id)
+);
+CREATE TABLE Templates (
+  id serial NOT NULL  ,
+  Queue integer NOT NULL DEFAULT 0 ,
+  Name varchar(40) NOT NULL  ,
+  Description varchar(120)   ,
+  Type varchar(16)   ,
+  Language varchar(16)   ,
+  TranslationOf integer   ,
+  Content TEXT   ,
+  LastUpdated timestamp   ,
+  LastUpdatedBy integer   ,
+  Creator integer   ,
+  Created timestamp   ,
+  PRIMARY KEY (id)
+);
diff --git a/rt/etc/schema.mysql b/rt/etc/schema.mysql
new file mode 100755
index 000000000..7e715c201
--- /dev/null
+++ b/rt/etc/schema.mysql
@@ -0,0 +1,267 @@
+CREATE TABLE KeywordSelects (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  Name varchar(255) NULL  ,
+  Keyword integer NULL  ,
+  Single integer NULL  ,
+  Depth integer NOT NULL DEFAULT 0 ,
+  ObjectType varchar(32) NOT NULL  ,
+  ObjectField varchar(32) NULL  ,
+  ObjectValue varchar(255) NULL  ,
+  Disabled int2 NOT NULL DEFAULT 0 ,
+  PRIMARY KEY (id)
+);
+CREATE INDEX KeywordSelects1 ON KeywordSelects (Keyword);
+CREATE INDEX KeywordSelects2 ON KeywordSelects (ObjectType, ObjectField, ObjectValue);
+CREATE TABLE Attachments (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  TransactionId integer NOT NULL  ,
+  Parent integer NULL  ,
+  MessageId varchar(160) NULL  ,
+  Subject varchar(255) NULL  ,
+  Filename varchar(255) NULL  ,
+  ContentType varchar(80) NULL  ,
+  ContentEncoding varchar(80) NULL  ,
+  Content LONGTEXT NULL  ,
+  Headers LONGTEXT NULL  ,
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  PRIMARY KEY (id)
+);
+CREATE INDEX Attachments1 ON Attachments (Parent);
+CREATE INDEX Attachments2 ON Attachments (TransactionId);
+CREATE INDEX Attachments3 ON Attachments (Parent, TransactionId);
+CREATE TABLE Queues (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  Name varchar(120) NOT NULL  ,
+  Description varchar(120) NULL  ,
+  CorrespondAddress varchar(120) NULL  ,
+  CommentAddress varchar(120) NULL  ,
+  InitialPriority integer NULL  ,
+  FinalPriority integer NULL  ,
+  DefaultDueIn integer NULL  ,
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL  ,
+  Disabled int2 NOT NULL DEFAULT 0 ,
+  PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX Queues1 ON Queues (Name);
+CREATE TABLE Links (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  Base varchar(240) NULL  ,
+  Target varchar(240) NULL  ,
+  Type varchar(20) NOT NULL  ,
+  LocalTarget integer NULL  ,
+  LocalBase integer NULL  ,
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL  ,
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX Links1 ON Links (Base, Target, Type);
+CREATE TABLE Groups (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  Name varchar(16) NULL  ,
+  Description varchar(64) NULL  ,
+  Pseudo integer NOT NULL DEFAULT 0 ,
+  PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX Groups1 ON Groups (Name);
+CREATE TABLE Watchers (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  Type varchar(16) NULL  ,
+  Scope varchar(16) NULL  ,
+  Value integer NULL  ,
+  Email varchar(255) NULL  ,
+  Quiet integer NULL  ,
+  Owner integer NULL  ,
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL  ,
+  PRIMARY KEY (id)
+);
+CREATE INDEX Watchers1 ON Watchers (Scope, Value, Type, Owner);
+CREATE TABLE ScripConditions (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  Name varchar(255) NULL  ,
+  Description varchar(255) NULL  ,
+  ExecModule varchar(60) NULL  ,
+  Argument varchar(255) NULL  ,
+  ApplicableTransTypes varchar(60) NULL  ,
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL  ,
+  PRIMARY KEY (id)
+);
+CREATE TABLE Transactions (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  EffectiveTicket integer NULL  ,
+  Ticket integer NULL  ,
+  TimeTaken integer NULL  ,
+  Type varchar(20) NULL  ,
+  Field varchar(40) NULL  ,
+  OldValue varchar(255) NULL  ,
+  NewValue varchar(255) NULL  ,
+  Data varchar(100) NULL  ,
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  PRIMARY KEY (id)
+);
+CREATE INDEX Transactions1 ON Transactions (Ticket);
+CREATE INDEX Transactions2 ON Transactions (EffectiveTicket);
+CREATE TABLE Scrips (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  ScripCondition integer NULL  ,
+  ScripAction integer NULL  ,
+  Stage varchar(32) NULL  ,
+  Queue integer NULL  ,
+  Template integer NULL  ,
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL  ,
+  PRIMARY KEY (id)
+);
+CREATE TABLE ACL (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  PrincipalId integer NULL  ,
+  PrincipalType varchar(25) NULL  ,
+  RightName varchar(25) NULL  ,
+  RightScope varchar(25) NULL  ,
+  RightAppliesTo integer NULL  ,
+  PRIMARY KEY (id)
+);
+CREATE INDEX ACL1 ON ACL (RightScope, PrincipalId);
+CREATE INDEX ACL2 ON ACL (RightScope, RightAppliesTo, RightName, PrincipalType, PrincipalId);
+CREATE TABLE GroupMembers (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  GroupId integer NULL  ,
+  UserId integer NULL  ,
+  PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX GroupMembers1 ON GroupMembers (GroupId, UserId);
+CREATE TABLE ObjectKeywords (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  Keyword integer NOT NULL  ,
+  KeywordSelect integer NOT NULL  ,
+  ObjectType varchar(32) NOT NULL  ,
+  ObjectId integer NOT NULL  ,
+  PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX ObjectKeywords1 ON ObjectKeywords (ObjectId, ObjectType, KeywordSelect, Keyword);
+CREATE INDEX ObjectKeywords2 ON ObjectKeywords (ObjectId, ObjectType);
+CREATE INDEX ObjectKeywords3 ON ObjectKeywords (Keyword);
+CREATE TABLE Keywords (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  Name varchar(255) NOT NULL  ,
+  Description varchar(255) NULL  ,
+  Parent integer NULL  ,
+  Disabled int2 NOT NULL DEFAULT 0 ,
+  PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX Keywords1 ON Keywords (Name, Parent);
+CREATE INDEX Keywords2 ON Keywords (Name);
+CREATE INDEX Keywords3 ON Keywords (Parent);
+CREATE TABLE Users (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  Name varchar(120) NOT NULL  ,
+  Password varchar(40) NULL  ,
+  Comments blob NULL  ,
+  Signature blob NULL  ,
+  EmailAddress varchar(120) NULL  ,
+  FreeformContactInfo blob NULL  ,
+  Organization varchar(200) NULL  ,
+  Privileged integer NULL  ,
+  RealName varchar(120) NULL  ,
+  Nickname varchar(16) NULL  ,
+  Lang varchar(16) NULL  ,
+  EmailEncoding varchar(16) NULL  ,
+  WebEncoding varchar(16) NULL  ,
+  ExternalContactInfoId varchar(100) NULL  ,
+  ContactInfoSystem varchar(30) NULL  ,
+  ExternalAuthId varchar(100) NULL  ,
+  AuthSystem varchar(30) NULL  ,
+  Gecos varchar(16) NULL  ,
+  HomePhone varchar(30) NULL  ,
+  WorkPhone varchar(30) NULL  ,
+  MobilePhone varchar(30) NULL  ,
+  PagerPhone varchar(30) NULL  ,
+  Address1 varchar(200) NULL  ,
+  Address2 varchar(200) NULL  ,
+  City varchar(100) NULL  ,
+  State varchar(100) NULL  ,
+  Zip varchar(16) NULL  ,
+  Country varchar(50) NULL  ,
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL  ,
+  Disabled int2 NOT NULL DEFAULT 0 ,
+  PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX Users1 ON Users (Name);
+CREATE INDEX Users3 ON Users (id, EmailAddress);
+CREATE INDEX Users4 ON Users (EmailAddress);
+CREATE TABLE Tickets (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  EffectiveId integer NULL  ,
+  Queue integer NULL  ,
+  Type varchar(16) NULL  ,
+  IssueStatement integer NULL  ,
+  Resolution integer NULL  ,
+  Owner integer NULL  ,
+  Subject varchar(200) NULL DEFAULT '[no subject]' ,
+  InitialPriority integer NULL  ,
+  FinalPriority integer NULL  ,
+  Priority integer NULL  ,
+  Status varchar(10) NULL  ,
+  TimeWorked integer NULL  ,
+  TimeLeft integer NULL  ,
+  Told DATETIME NULL  ,
+  Starts DATETIME NULL  ,
+  Started DATETIME NULL  ,
+  Due DATETIME NULL  ,
+  Resolved DATETIME NULL  ,
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL  ,
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  Disabled int2 NOT NULL DEFAULT 0 ,
+  PRIMARY KEY (id)
+);
+CREATE INDEX Tickets1 ON Tickets (Queue, Status);
+CREATE INDEX Tickets2 ON Tickets (Owner);
+CREATE INDEX Tickets3 ON Tickets (EffectiveId);
+CREATE INDEX Tickets4 ON Tickets (id, Status);
+CREATE INDEX Tickets5 ON Tickets (id, EffectiveId);
+CREATE TABLE ScripActions (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  Name varchar(255) NULL  ,
+  Description varchar(255) NULL  ,
+  ExecModule varchar(60) NULL  ,
+  Argument varchar(255) NULL  ,
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL  ,
+  PRIMARY KEY (id)
+);
+CREATE TABLE Templates (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  Queue integer NOT NULL DEFAULT 0 ,
+  Name varchar(40) NOT NULL  ,
+  Description varchar(120) NULL  ,
+  Type varchar(16) NULL  ,
+  Language varchar(16) NULL  ,
+  TranslationOf integer NULL  ,
+  Content blob NULL  ,
+  LastUpdated DATETIME NULL  ,
+  LastUpdatedBy integer NULL  ,
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  PRIMARY KEY (id)
+);
diff --git a/rt/etc/schema.pm b/rt/etc/schema.pm
new file mode 100644
index 000000000..44e143ecd
--- /dev/null
+++ b/rt/etc/schema.pm
@@ -0,0 +1,349 @@
+#   column, type, nullability, length, default, database-local
+
+my $gratuitous = {
+
+'Groups' => {
+  'columns' => [
+    'id', 'serial', '', '', '', '',
+    'Name', 'varchar', 'NULL', '16', '', '',
+    'Description', 'varchar', 'NULL', '64', '', '',
+    'Pseudo', 'integer', '', '', '0', '',
+  ],
+  'primary_key' => 'id',
+  'unique' => [ ['Name'] ],
+  'index' => [  ],
+},
+
+'ACL' => {
+  'columns' => [
+    'id', 'serial', '', '', '', '',
+    'PrincipalId', 'integer', 'NULL', '', '', '',
+    'PrincipalType', 'varchar', 'NULL', '25', '', '',
+    'RightName', 'varchar', 'NULL', '25', '', '',
+    'RightScope', 'varchar', 'NULL', '25', '', '',
+    'RightAppliesTo', 'integer', 'NULL', '', '', '',
+  ],
+  'primary_key' => 'id',
+  'unique' => [  ],
+  'index' => [ ['RightScope', 'PrincipalId'], 
+  	       ['RightScope','RightAppliesTo','RightName','PrincipalType','PrincipalId'] ],
+},
+
+'Watchers' => {
+  'columns' => [
+    'id', 'serial', '', '', '', '',
+    'Type', 'varchar', 'NULL', '16', '', '',
+    'Scope', 'varchar', 'NULL', '16', '', '',
+    'Value', 'integer', 'NULL', '', '', '',
+    'Email', 'varchar', 'NULL', '255', '', '',
+    'Quiet', 'integer', 'NULL', '', '', '',
+    'Owner', 'integer', 'NULL', '', '', '',
+    'Creator', 'integer', 'NULL', '', '', '',
+    'Created', 'timestamp', 'NULL', '', '', '',
+    'LastUpdatedBy', 'integer', 'NULL', '', '', '',
+    'LastUpdated', 'timestamp', 'NULL', '', '', '',
+  ],
+  'primary_key' => 'id',
+  'unique' => [  ],
+  'index' => [ ['Scope','Value','Type','Owner'] ],
+},
+
+'Links' => {
+  'columns' => [
+    'id', 'serial', '', '', '', '',
+    'Base', 'varchar', 'NULL', '240', '', '',
+    'Target', 'varchar', 'NULL', '240', '', '',
+    'Type', 'varchar', '', '20', '', '',
+    'LocalTarget', 'integer', 'NULL', '', '', '',
+    'LocalBase', 'integer', 'NULL', '', '', '',
+    'LastUpdatedBy', 'integer', 'NULL', '', '', '',
+    'LastUpdated', 'timestamp', 'NULL', '', '', '',
+    'Creator', 'integer', 'NULL', '', '', '',
+    'Created', 'timestamp', 'NULL', '', '', '',
+  ],
+  'primary_key' => 'id',
+  'unique' => [ ['Base', 'Target', 'Type'] ],
+  'index' => [  ],
+},
+
+'Users' => {
+  'columns' => [
+    'id', 'serial', '', '', '', '',
+    'Name', 'varchar', '', '120', '', '',
+    'Password', 'varchar', 'NULL', '40', '', '',
+    'Comments', 'blob', 'NULL', '', '', '',
+    'Signature', 'blob', 'NULL', '', '', '',
+    'EmailAddress', 'varchar', 'NULL', '120', '', '',
+    'FreeformContactInfo', 'blob', 'NULL', '', '', '',
+    'Organization', 'varchar', 'NULL', '200', '', '',
+    'Privileged', 'integer', 'NULL', '', '', '',
+    'RealName', 'varchar', 'NULL', '120', '', '',
+    'Nickname', 'varchar', 'NULL', '16', '', '',
+    'Lang', 'varchar', 'NULL', '16', '', '',
+    'EmailEncoding', 'varchar', 'NULL', '16', '', '',
+    'WebEncoding', 'varchar', 'NULL', '16', '', '',
+    'ExternalContactInfoId', 'varchar', 'NULL', '100', '', '',
+    'ContactInfoSystem', 'varchar', 'NULL', '30', '', '',
+    'ExternalAuthId', 'varchar', 'NULL', '100', '', '',
+    'AuthSystem', 'varchar', 'NULL', '30', '', '',
+    'Gecos', 'varchar', 'NULL', '16', '', '',
+    'HomePhone', 'varchar', 'NULL', '30', '', '',
+    'WorkPhone', 'varchar', 'NULL', '30', '', '',
+    'MobilePhone', 'varchar', 'NULL', '30', '', '',
+    'PagerPhone', 'varchar', 'NULL', '30', '', '',
+    'Address1', 'varchar', 'NULL', '200', '', '',
+    'Address2', 'varchar', 'NULL', '200', '', '',
+    'City', 'varchar', 'NULL', '100', '', '',
+    'State', 'varchar', 'NULL', '100', '', '',
+    'Zip', 'varchar', 'NULL', '16', '', '',
+    'Country', 'varchar', 'NULL', '50', '', '',
+    'Creator', 'integer', 'NULL', '', '', '',
+    'Created', 'timestamp', 'NULL', '', '', '',
+    'LastUpdatedBy', 'integer', 'NULL', '', '', '',
+    'LastUpdated', 'timestamp', 'NULL', '', '', '',
+    'Disabled', 'int2', '','','0','',
+  ],
+  'primary_key' => 'id',
+  'unique' => [ ['Name'] ],
+  'index' => [ ['Name'], 
+  	       ['id', 'EmailAddress'],
+  	       ['EmailAddress'] ],
+},
+
+'Tickets' => {
+  'columns' => [
+    'id', 'serial', '', '', '', '',
+    'EffectiveId', 'integer', 'NULL', '', '', '',
+    'Queue', 'integer', 'NULL', '', '', '',
+    'Type', 'varchar', 'NULL', '16', '', '',
+    'IssueStatement', 'integer', 'NULL', '', '', '',
+    'Resolution', 'integer', 'NULL', '', '', '',
+    'Owner', 'integer', 'NULL', '', '', '',
+    'Subject', 'varchar', 'NULL', '200', '[no subject]', '',
+    'InitialPriority', 'integer', 'NULL', '', '', '',
+    'FinalPriority', 'integer', 'NULL', '', '', '',
+    'Priority', 'integer', 'NULL', '', '', '',
+    'Status', 'varchar', 'NULL', '10', '', '',
+    'TimeWorked', 'integer', 'NULL', '', '', '',
+    'TimeLeft', 'integer', 'NULL', '', '', '',
+    'Told', 'timestamp', 'NULL', '', '', '',
+    'Starts', 'timestamp', 'NULL', '', '', '',
+    'Started', 'timestamp', 'NULL', '', '', '',
+    'Due', 'timestamp', 'NULL', '', '', '',
+    'Resolved', 'timestamp', 'NULL', '', '', '',
+    'LastUpdatedBy', 'integer', 'NULL', '', '', '',
+    'LastUpdated', 'timestamp', 'NULL', '', '', '',
+    'Creator', 'integer', 'NULL', '', '', '',
+    'Created', 'timestamp', 'NULL', '', '', '',
+    'Disabled', 'int2', '','','0','',
+  ],
+  'primary_key' => 'id',
+  'unique' => [ [] ],
+  'index' => [ ['Queue', 'Status'], 
+  	       ['Owner'], 
+	       ['EffectiveId'], 
+	       ['id', 'Status'], 
+	       ['id', 'EffectiveId'] ],
+},
+
+'GroupMembers' => {
+  'columns' => [
+    'id', 'serial', '', '', '', '',
+    'GroupId', 'integer', 'NULL', '', '', '', #foreign key, Groups::id
+    'UserId', 'integer', 'NULL', '', '', '', #foreign key, Users::id
+  ],
+  'primary_key' => 'id',
+  'unique' => [ ['GroupId', 'UserId']  ],
+  'index' => [  ],
+},
+
+'Queues' => {
+  'columns' => [
+    'id', 'serial', '', '', '', '',
+    'Name', 'varchar', '', '120', '', '', #Textual 'name' for this queue
+    'Description', 'varchar', 'NULL', '120', '', '', #Textual descr. of this
+    #queue
+    'CorrespondAddress', 'varchar', 'NULL', '120', '', '',
+    'CommentAddress', 'varchar', 'NULL', '120', '', '',
+    'InitialPriority', 'integer', 'NULL', '', '', '',
+    'FinalPriority', 'integer', 'NULL', '', '', '',
+    'DefaultDueIn', 'integer', 'NULL', '', '', '',
+
+    'Creator', 'integer', 'NULL', '', '', '',
+    'Created', 'timestamp', 'NULL', '', '', '',
+    'LastUpdatedBy', 'integer', 'NULL', '', '', '',
+    'LastUpdated', 'timestamp', 'NULL', '', '', '',
+    'Disabled', 'int2', '','','0','',
+  ],
+  'primary_key' => 'id',
+  'unique' => [ ['Name'] ],
+  'index' => [  ],
+},
+
+'Transactions' => {
+  'columns' => [
+    'id', 'serial', '', '', '', '',
+    'EffectiveTicket', 'integer', 'NULL', '', '', '', 
+    'Ticket', 'integer', 'NULL', '', '', '',  #Foreign key Ticket::id
+    'TimeTaken', 'integer', 'NULL', '', '', '', #Time spent on this trans in min
+    'Type', 'varchar', 'NULL', '20', '', '',
+    'Field', 'varchar', 'NULL', '40', '', '', #If it's a "Set" transaction, what
+    #field was set.
+    'OldValue', 'varchar', 'NULL', '255', '', '', 
+    'NewValue', 'varchar', 'NULL', '255', '', '',
+    'Data', 'varchar', 'NULL', '100', '', '',
+
+
+    'Creator', 'integer', 'NULL', '', '', '',
+    'Created', 'timestamp', 'NULL', '', '', '',
+
+  ],
+  'primary_key' => 'id',
+  'unique' => [  ],
+  'index' => [ ['Ticket'], ['EffectiveTicket'] ],
+},
+
+'ScripActions' => {
+  'columns' => [
+		'id', 'serial', '', '', '', '',
+		'Name', 'varchar', 'NULL', '255', '', '',  # Alias
+		'Description', 'varchar', 'NULL', '255', '', '', #Textual description
+		'ExecModule', 'varchar', 'NULL', '60', '', '', #This calles RT::Action::___
+		'Argument', 'varchar', 'NULL', '255', '', '', #We can pass a single argument
+		#to the scrip. sometimes, it's who to send mail to.
+		'Creator', 'integer', 'NULL', '', '', '',
+		'Created', 'timestamp', 'NULL', '', '', '',
+		'LastUpdatedBy', 'integer', 'NULL', '', '', '',
+		'LastUpdated', 'timestamp', 'NULL', '', '', '',
+  ],
+  'primary_key' => 'id',
+  'unique' => [  ],
+  'index' => [  ],
+},
+
+'ScripConditions' => {
+  'columns' => [
+		'id', 'serial', '', '', '', '',
+		'Name', 'varchar', 'NULL', '255', '', '',  # Alias
+		'Description', 'varchar', 'NULL', '255', '', '', #Textual description
+		'ExecModule', 'varchar', 'NULL', '60', '', '', #This calles RT::Condition::
+		'Argument', 'varchar', 'NULL', '255', '', '', #We can pass a single argument
+		#to the scrip. sometimes, it's who to send mail to.
+		'ApplicableTransTypes', 'varchar', 'NULL', '60', '', '',#Transaction types this scrip
+		# acts on. comma or / delimited is just great.
+		'Creator', 'integer', 'NULL', '', '', '',
+		'Created', 'timestamp', 'NULL', '', '', '',
+		'LastUpdatedBy', 'integer', 'NULL', '', '', '',
+		'LastUpdated', 'timestamp', 'NULL', '', '', '',
+  ],
+  'primary_key' => 'id',
+  'unique' => [  ],
+  'index' => [  ],
+},
+'Scrips' => {
+		 'columns' => [
+			       'id', 'serial', '', '', '', '',
+			       'ScripCondition', 'integer', 'NULL', '', '', '', #Foreign key ScripConditions::id
+			       'ScripAction', 'integer', 'NULL', '', '', '', #Foreign key ScripActions::id
+			       'Stage', 'varchar', 'NULL', '32','','', #What stage does this scrip
+			       #Happen in.  for now, everything is 'TransactionCreate',
+			       'Queue', 'integer', 'NULL', '', '', '', #Foreign key Queues::id
+			       'Template', 'integer', 'NULL', '', '', '', #Foreign key Templates::id
+			       
+			       'Creator', 'integer', 'NULL', '', '', '',
+			       'Created', 'timestamp', 'NULL', '', '', '',
+			       'LastUpdatedBy', 'integer', 'NULL', '', '', '',
+			       'LastUpdated', 'timestamp', 'NULL', '', '', '',
+			      ],
+		 'primary_key' => 'id',
+		 'unique' => [  ],
+		 'index' => [  ],
+},
+
+'Attachments' => {
+  'columns' => [
+    'id', 'serial', '', '', '', '',
+    'TransactionId', 'integer', '', '', '', '', #Foreign key Transactions::Id
+    'Parent', 'integer', 'NULL', '', '', '', # Attachments::Id
+    'MessageId', 'varchar', 'NULL', '160', '', '', #RFC822 messageid, if any
+    'Subject', 'varchar', 'NULL', '255', '', '', 
+    'Filename', 'varchar', 'NULL', '255', '', '',
+    'ContentType', 'varchar', 'NULL', '80', '', '',
+    'ContentEncoding', 'varchar', 'NULL', '80', '', '',
+    'Content', 'long varbinary', 'NULL', '', '', '',
+    'Headers', 'long varbinary', 'NULL', '', '', '',
+
+    'Creator', 'integer', 'NULL', '', '', '',
+    'Created', 'timestamp', 'NULL', '', '', '',
+
+  ],
+  'primary_key' => 'id',
+  'unique' => [  ],
+  'index' => [ ['Parent'], ['TransactionId'], ['Parent', 'TransactionId'] ],
+},
+
+'Templates' => {
+  'columns' => [
+    'id', 'serial', '', '', '', '',
+    'Queue', 'integer', 'NOT NULL', '', '0', '',
+    'Name', 'varchar', '', '40', '', '',
+    'Description', 'varchar', 'NULL', '120', '', '',
+    'Type', 'varchar', 'NULL', '16', '','',
+    'Language', 'varchar', 'NULL', '16', '', '',
+    'TranslationOf', 'integer', 'NULL', '', '', '',
+    'Content', 'blob', 'NULL', '', '', '',
+    'LastUpdated', 'timestamp', 'NULL', '', '', '',
+    'LastUpdatedBy', 'integer', 'NULL', '', '', '',
+    'Creator', 'integer', 'NULL', '', '', '',
+    'Created', 'timestamp', 'NULL', '', '', '',
+  ],
+  'primary_key' => 'id',
+  'unique' => [ [''] ],
+  'index' => [  ],
+},
+
+'Keywords' => {
+  'columns' => [
+    'id', 'serial', '', '', '', '',
+    'Name', 'varchar', 'NOT NULL', '255', '', '',
+    'Description', 'varchar', 'NULL', '255', '', '',
+    'Parent', 'integer', 'NULL', '', '', '',
+    'Disabled', 'int2', '','','0','',
+],
+  'primary_key' => 'id',
+  'unique' => [ [ 'Name', 'Parent' ] ],
+  'index' => [ [ 'Name', ], [ 'Parent' ] ],
+},
+
+'ObjectKeywords' => {
+  'columns' =>  [
+    'id', 'serial', '', '', '', '',
+    'Keyword', 'integer', 'NOT NULL', '', '', '',
+    'KeywordSelect', 'integer', 'NOT NULL', '', '', '',
+    'ObjectType', 'varchar', 'NOT NULL', '32', '', '',
+    'ObjectId', 'integer', 'NOT NULL', '', '', '',
+  ],
+  'primary_key' => 'id',
+  'unique' => [ [  'ObjectId', 'ObjectType','KeywordSelect', 'Keyword' ] ],
+  'index' => [ [ 'ObjectId', 'ObjectType'  ] , ['Keyword'] ],
+
+},
+
+'KeywordSelects' => {
+  'columns' =>  [
+    'id', 'serial', '', '', '', '',
+    'Name','varchar','NULL','255','','',
+    'Keyword', 'integer', 'NULL', '', '', '',
+    'Single', 'integer', 'NULL', '', '', '',
+    'Depth', 'integer', 'NOT NULL', '', 0, '',
+    'ObjectType', 'varchar', 'NOT NULL',  '32', '', '',
+    'ObjectField', 'varchar', 'NULL', '32', '', '',
+    'ObjectValue', 'varchar', 'NULL', '255', '', '',
+    'Disabled', 'int2', '','','0','',
+  ],
+  'primary_key' => 'id',
+  'unique' => [ [ ] ],
+  'index' => [ [ 'Keyword' ], [ 'ObjectType', 'ObjectField', 'ObjectValue'] ],
+},
+
+};
diff --git a/rt/lib/MANIFEST b/rt/lib/MANIFEST
new file mode 100644
index 000000000..cda386be5
--- /dev/null
+++ b/rt/lib/MANIFEST
@@ -0,0 +1,57 @@
+MANIFEST
+MANIFEST.SKIP
+Makefile.PL
+RT.pm
+test.pl
+RT/ACE.pm
+RT/ACL.pm
+RT/Action/Generic.pm
+RT/Action/NotifyAsComment.pm
+RT/Action/OpenDependent.pm
+RT/Action/SendEmail.pm
+RT/Action/StallDependent.pm
+RT/Action/Notify.pm
+RT/Action/ResolveMembers.pm
+RT/Attachment.pm
+RT/Attachments.pm
+RT/Condition/AnyTransaction.pm
+RT/Condition/Generic.pm
+RT/Condition/NewDependency.pm
+RT/CurrentUser.pm
+RT/Date.pm
+RT/EasySearch.pm
+RT/Group.pm
+RT/GroupMember.pm
+RT/GroupMembers.pm
+RT/Groups.pm
+RT/Handle.pm
+RT/Interface/CLI.pm
+RT/Interface/Email.pm
+RT/Interface/Web.pm
+RT/Keyword.pm
+RT/Keywords.pm
+RT/KeywordSelect.pm
+RT/KeywordSelects.pm
+RT/Link.pm
+RT/Links.pm
+RT/ObjectKeyword.pm
+RT/ObjectKeywords.pm
+RT/Queue.pm
+RT/Queues.pm
+RT/Record.pm
+RT/Scrip.pm
+RT/Scrips.pm
+RT/ScripAction.pm
+RT/ScripActions.pm
+RT/ScripCondition.pm
+RT/ScripConditions.pm
+RT/Template.pm
+RT/Templates.pm
+RT/Ticket.pm
+RT/Tickets.pm
+RT/Transaction.pm
+RT/Transactions.pm
+RT/User.pm
+RT/Users.pm
+RT/Watcher.pm
+RT/Watchers.pm
diff --git a/rt/lib/MANIFEST.SKIP b/rt/lib/MANIFEST.SKIP
new file mode 100644
index 000000000..ae335e78a
--- /dev/null
+++ b/rt/lib/MANIFEST.SKIP
@@ -0,0 +1 @@
+CVS/
diff --git a/rt/lib/Makefile.PL b/rt/lib/Makefile.PL
new file mode 100644
index 000000000..c0e1af28c
--- /dev/null
+++ b/rt/lib/Makefile.PL
@@ -0,0 +1,49 @@
+use ExtUtils::MakeMaker;
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written.
+WriteMakefile(
+    'NAME'      => 'RT',
+    'VERSION_FROM' => 'RT.pm', # finds $VERSION
+    'PREREQ_PM' => {
+                     'DBI'                 => 1.16,
+                     'DBIx::SearchBuilder' => '0.48',
+                     'Date::Parse'         => 0,
+                     'Date::Format'        => 0,
+                     'MIME::Entity'        => 5.108,
+                     'Mail::Mailer'        => '1.20',
+                     'Log::Dispatch'       => 1.6,
+                     'HTML::Entities'      => 0,
+                     'Text::Wrapper'       => 0,
+                     'Text::Template'      => 0,
+		     'Getopt::Long'        => 2.24,
+                   },
+);
+
+     {
+                   package MY;
+                   sub top_targets {
+                       my($self) = @_;
+                       my $out = "POD2TEST_EXE = pod2test\n";
+
+                       $out .= $self->SUPER::top_targets(@_);
+                       # $out =~ s/^(pure_all\b.*)/$1 testifypods/m;
+
+                       $out .= "\n\ntestifypods : \n";
+
+			my @pods = (keys %{$self->{MAN1PODS}},
+				     keys %{$self->{MAN3PODS}});
+
+                       foreach my $pod (@pods) {
+                           (my $test = $pod) =~ s/\.(pm|pod)$//;
+                           $test =~ s/^lib\W//;
+                           $test =~ s/\W/-/;
+			   $test =~ s/\//__/g;
+                           $test = "autogen-$test.t";
+                           $out .= "\t$self->{NOECHO}\$(POD2TEST_EXE) ".
+                                   "$pod t/$test \n";
+                       }
+
+                       return $out;
+                   }
+               }
+
diff --git a/rt/lib/RT.pm b/rt/lib/RT.pm
new file mode 100644
index 000000000..1cfc428ee
--- /dev/null
+++ b/rt/lib/RT.pm
@@ -0,0 +1,155 @@
+package RT;
+use RT::Handle;
+use RT::CurrentUser;
+use strict;
+
+use vars qw($VERSION $SystemUser $Nobody $Handle $Logger);
+
+$VERSION = '!!RT_VERSION!!';
+
+=head1 NAME
+
+	RT - Request Tracker
+
+=head1 SYNOPSIS
+
+	A fully featured request tracker package
+	
+
+=head1 DESCRIPTION
+
+
+=cut
+
+sub Init {
+    #Get a database connection
+    $Handle = new RT::Handle($RT::DatabaseType);
+    $Handle->Connect();
+    
+    
+    #RT's system user is a genuine database user. its id lives here
+    $SystemUser = new RT::CurrentUser();
+    $SystemUser->LoadByName('RT_System');
+    
+    #RT's "nobody user" is a genuine database user. its ID lives here.
+    $Nobody = new RT::CurrentUser();
+    $Nobody->LoadByName('Nobody');
+   
+   InitLogging(); 
+}
+
+=head2 InitLogging
+
+Create the RT::Logger object. 
+
+=cut
+sub InitLogging {
+
+    # We have to set the record seperator ($, man perlvar)
+    # or Log::Dispatch starts getting
+    # really pissy, as some other module we use unsets it.
+
+    $, = '';
+    use Log::Dispatch 1.6;
+    use Log::Dispatch::File;
+    use Log::Dispatch::Screen;
+
+    $Logger=Log::Dispatch->new();
+    
+    if ($RT::LogToFile) {
+	my $filename = $RT::LogToFileNamed || "$RT::LogDir/rt.log";
+
+	  $Logger->add(Log::Dispatch::File->new
+		       ( name=>'rtlog',
+			 min_level=> $RT::LogToFile,
+			 filename=> $filename,
+			 mode=>'append',
+            callbacks => sub {my %p=@_; return "[".gmtime(time)."] [".$p{level}."]: $p{message}\n"}
+
+		       ));
+    }
+    if ($RT::LogToScreen) {
+	$Logger->add(Log::Dispatch::Screen->new
+		     ( name => 'screen',
+		       min_level => $RT::LogToScreen,
+		       stderr => 1
+		     ));
+    }
+# {{{ Signal handlers
+
+## This is the default handling of warnings and die'ings in the code
+## (including other used modules - maybe except for errors catched by
+## Mason).  It will log all problems through the standard logging
+## mechanism (see above).
+
+$SIG{__WARN__} = sub {$RT::Logger->warning($_[0])};
+
+#When we call die, trap it and log->crit with the value of the die.
+
+$SIG{__DIE__}  = sub {
+    unless ($^S || !defined $^S ) {
+        $RT::Logger->crit("$_[0]");
+        exit(-1);
+    }
+    else {
+        #Get out of here if we're in an eval
+        die $_[0];
+    }
+};
+
+# }}}
+
+}
+
+# }}}
+
+
+sub SystemUser {
+    return($SystemUser);
+}	
+
+sub Nobody {
+    return ($Nobody);
+}
+
+
+=head2 DropSetGIDPermissions
+
+Drops setgid permissions.
+
+=cut
+
+sub DropSetGIDPermissions {
+    # Now that we got the config read in, we have the database 
+    # password and don't need to be setgid
+    # make the effective group the real group
+    $) = $(;
+}
+
+
+=head1 NAME
+
+RT - Request Tracker
+
+=head1 SYNOPSIS
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+
+ok ($RT::Nobody->Name() eq 'Nobody', "Nobody is nobody");
+ok ($RT::Nobody->Name() ne 'root', "Nobody isn't named root");
+ok ($RT::SystemUser->Name() eq 'RT_System', "The system user is RT_System");
+ok ($RT::SystemUser->Name() ne 'noname', "The system user isn't noname");
+
+
+=end testing
+
+=cut
+
+1;
diff --git a/rt/lib/RT/ACE.pm b/rt/lib/RT/ACE.pm
new file mode 100755
index 000000000..d4681cf44
--- /dev/null
+++ b/rt/lib/RT/ACE.pm
@@ -0,0 +1,774 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/ACE.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::ACE - RT\'s ACE object
+
+=head1 SYNOPSIS
+
+  use RT::ACE;
+  my $ace = new RT::ACE($CurrentUser);
+
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing
+
+ok(require RT::TestHarness);
+ok(require RT::ACE);
+
+=end testing
+
+=cut
+
+package RT::ACE;
+use RT::Record;
+@ISA= qw(RT::Record);
+
+use vars qw (%SCOPES
+   	     %QUEUERIGHTS
+	     %SYSTEMRIGHTS
+	     %LOWERCASERIGHTNAMES
+	    ); 
+
+%SCOPES = (
+	   System => 'System-level right',
+	   Queue => 'Queue-level right'
+	  );
+
+# {{{ Descriptions of rights
+
+# Queue rights are the sort of queue rights that can only be granted
+# to real people or groups
+%QUEUERIGHTS = ( 
+		SeeQueue => 'Can this principal see this queue',
+		AdminQueue => 'Create, delete and modify queues', 
+		ShowACL => 'Display Access Control List',
+		ModifyACL => 'Modify Access Control List',
+		ModifyQueueWatchers => 'Modify the queue watchers',
+                AdminKeywordSelects => 'Create, delete and modify keyword selections',
+
+		
+		ModifyTemplate => 'Modify email templates for this queue',
+		ShowTemplate => 'Display email templates for this queue',
+		ModifyScrips => 'Modify Scrips for this queue',
+		ShowScrips => 'Display Scrips for this queue',
+
+		ShowTicket => 'Show ticket summaries',
+		ShowTicketComments => 'Show ticket private commentary',
+
+		Watch => 'Sign up as a ticket Requestor or ticket or queue Cc',
+		WatchAsAdminCc => 'Sign up as a ticket or queue AdminCc',
+		CreateTicket => 'Create tickets in this queue',
+		ReplyToTicket => 'Reply to tickets',
+		CommentOnTicket => 'Comment on tickets',
+		OwnTicket => 'Own tickets',
+		ModifyTicket => 'Modify tickets',
+		DeleteTicket => 'Delete tickets'
+
+	       );	
+
+
+# System rights are rights granted to the whole system
+%SYSTEMRIGHTS = (
+                SuperUser => 'Do anything and everything',
+		AdminKeywords => 'Creatte, delete and modify keywords',	 
+		AdminGroups => 'Create, delete and modify groups',
+	        AdminUsers => 'Create, Delete and Modify users',
+		ModifySelf => 'Modify one\'s own RT account',
+
+		);
+
+# }}}
+
+# {{{ Descriptions of principals
+
+%TICKET_METAPRINCIPALS = ( Owner => 'The owner of a ticket',
+            			   Requestor => 'The requestor of a ticket',
+		            	   Cc => 'The CC of a ticket',
+			               AdminCc => 'The administrative CC of a ticket',
+			 );
+
+# }}}
+
+# {{{ We need to build a hash of all rights, keyed by lower case names
+
+#since you can't do case insensitive hash lookups
+
+foreach $right (keys %QUEUERIGHTS) {
+    $LOWERCASERIGHTNAMES{lc $right}=$right;
+}
+foreach $right (keys %SYSTEMRIGHTS) {
+    $LOWERCASERIGHTNAMES{lc $right}=$right;
+}
+
+# }}}
+
+# {{{ sub _Init
+sub _Init  {
+  my $self = shift;
+  $self->{'table'} = "ACL";
+  return($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub LoadByValues
+
+=head2 LoadByValues PARAMHASH
+
+Load an ACE by specifying a paramhash with the following fields:
+
+              PrincipalId => undef,
+	      PrincipalType => undef,
+	      RightName => undef,
+	      RightScope => undef,
+	      RightAppliesTo => undef,
+
+=cut
+
+sub LoadByValues {
+  my $self = shift;
+  my %args = (PrincipalId => undef,
+	      PrincipalType => undef,
+	      RightName => undef,
+	      RightScope => undef,
+	      RightAppliesTo => undef,
+	      @_);
+  
+  $self->LoadByCols (PrincipalId => $args{'PrincipalId'},
+		     PrincipalType => $args{'PrincipalType'},
+		     RightName => $args{'RightName'},
+		     RightScope => $args{'RightScope'},
+		     RightAppliesTo => $args{'RightAppliesTo'}
+		    );
+  
+  #If we couldn't load it.
+  unless ($self->Id) {
+      return (0, "ACE not found");
+  }
+  # if we could
+  return ($self->Id, "ACE Loaded");
+  
+}
+
+# }}}
+
+# {{{ sub Create
+
+=head2 Create <PARAMS>
+
+PARAMS is a parameter hash with the following elements:
+
+   PrincipalType => "Queue"|"User"
+   PrincipalId => an intentifier you can use to ->Load a user or group
+   RightName => the name of a right. in any case
+   RightScope => "System" | "Queue"
+   RightAppliesTo => a queue id or undef
+
+=cut
+
+sub Create {
+    my $self = shift;
+    my %args = ( PrincipalId => undef,
+		 PrincipalType => undef,
+		 RightName => undef,
+		 RightScope => undef,
+		 RightAppliesTo => undef,
+		 @_
+	       );
+    
+    # {{{ Validate the principal
+    my ($princ_obj);
+    if ($args{'PrincipalType'} eq 'User') {
+	$princ_obj = new RT::User($RT::SystemUser);
+	
+    }	
+    elsif ($args{'PrincipalType'} eq 'Group') {
+	require RT::Group;
+	$princ_obj = new RT::Group($RT::SystemUser);
+    }
+    else {
+	return (0, 'Principal type '.$args{'PrincipalType'} . ' is invalid.');
+    }	
+    
+    $princ_obj->Load($args{'PrincipalId'});
+    my $princ_id = $princ_obj->Id();
+    
+    unless ($princ_id) {
+	return (0, 'Principal '.$args{'PrincipalId'}.' not found.');
+    }
+
+    # }}}
+    
+    #TODO allow loading of queues by name.    
+    
+    # {{{ Check the ACL
+    if ($args{'RightScope'} eq 'System') {
+	
+	unless ($self->CurrentUserHasSystemRight('ModifyACL')) {
+	    $RT::Logger->error("Permission Denied.");
+	    return(undef);
+	}
+    }
+    
+    elsif ($args{'RightScope'} eq 'Queue') {
+	unless ($self->CurrentUserHasQueueRight( Queue => $args{'RightAppliesTo'},
+						 Right => 'ModifyACL')) {
+	    return (0, 'Permission Denied.');
+	}
+	
+	
+	
+	
+    }
+    #If it's not a scope we recognise, something scary is happening.
+    else {
+	$RT::Logger->err("RT::ACE->Create got a scope it didn't recognize: ".
+			 $args{'RightScope'}." Bailing. \n");
+	return(0,"System error. Unable to grant rights.");
+    }
+
+    # }}}
+
+    # {{{ Canonicalize and check the right name
+    $args{'RightName'} = $self->CanonicalizeRightName($args{'RightName'});
+    
+    #check if it's a valid RightName
+    if ($args{'RightScope'} eq 'Queue') {
+	unless (exists $QUEUERIGHTS{$args{'RightName'}}) {
+	    return(0, 'Invalid right');
+	}	
+	}	
+    elsif ($args{'RightScope' eq 'System'}) {
+	unless (exists $SYSTEMRIGHTS{$args{'RightName'}}) {
+	    return(0, 'Invalid right');
+	}		    
+    }	
+    # }}}
+    
+    # Make sure the right doesn't already exist.
+    $self->LoadByCols (PrincipalId => $princ_id,
+		       PrincipalType => $args{'PrincipalType'},
+		       RightName => $args{'RightName'},
+		       RightScope => $args {'RightScope'},
+		       RightAppliesTo => $args{'RightAppliesTo'}
+		      );
+    if ($self->Id) {
+	return (0, 'That user already has that right');
+    }	
+
+    my $id = $self->SUPER::Create( PrincipalId => $princ_id,
+				   PrincipalType => $args{'PrincipalType'},
+				   RightName => $args{'RightName'},
+				   RightScope => $args {'RightScope'},
+				   RightAppliesTo => $args{'RightAppliesTo'}
+				 );
+    
+    
+    if ($id > 0 ) {
+	return ($id, 'Right Granted');
+    }
+    else {
+	$RT::Logger->err('System error. right not granted.');
+	return(0, 'System Error. right not granted');
+    }
+}
+
+# }}}
+
+
+# {{{ sub Delete 
+
+=head2 Delete
+
+Delete this object.
+
+=cut
+
+sub Delete {
+    my $self = shift;
+    
+    unless ($self->CurrentUserHasRight('ModifyACL')) {
+	return (0, 'Permission Denied');
+    }	
+    
+    
+    my ($val,$msg) = $self->SUPER::Delete(@_);
+    if ($val) {
+	return ($val, 'ACE Deleted');
+    }	
+    else {
+	return (0, 'ACE could not be deleted');
+    }
+}
+
+# }}}
+
+# {{{ sub _BootstrapRight 
+
+=head2 _BootstrapRight
+
+Grant a right with no error checking and no ACL. this is _only_ for 
+installation. If you use this routine without jesse@fsck.com's explicit 
+written approval, he will hunt you down and make you spend eternity
+translating mozilla's code into FORTRAN or intercal.
+
+=cut
+
+sub _BootstrapRight {
+    my $self = shift;
+    my %args = @_;
+
+    my $id = $self->SUPER::Create( PrincipalId => $args{'PrincipalId'},
+				   PrincipalType => $args{'PrincipalType'},
+				   RightName => $args{'RightName'},
+				   RightScope => $args {'RightScope'},
+				   RightAppliesTo => $args{'RightAppliesTo'}
+				 );
+    
+    if ($id > 0 ) {
+	return ($id);
+    }
+    else {
+	$RT::Logger->err('System error. right not granted.');
+	return(undef);
+    }
+    
+}
+
+# }}}
+
+# {{{ sub CanonicalizeRightName
+
+=head2 CanonicalizeRightName <RIGHT>
+
+Takes a queue or system right name in any case and returns it in
+the correct case. If it's not found, will return undef.
+
+=cut
+
+sub CanonicalizeRightName {
+    my $self = shift;
+    my $right = shift;
+    $right = lc $right;
+    if (exists $LOWERCASERIGHTNAMES{"$right"}) {
+	return ($LOWERCASERIGHTNAMES{"$right"});
+    }
+    else {
+	return (undef);
+    }
+}
+
+# }}}
+
+# {{{ sub QueueRights
+
+=head2 QueueRights
+
+Returns a hash of all the possible rights at the queue scope
+
+=cut
+
+sub QueueRights {
+        return (%QUEUERIGHTS);
+}
+
+# }}}
+
+# {{{ sub SystemRights
+
+=head2 SystemRights
+
+Returns a hash of all the possible rights at the system scope
+
+=cut
+
+sub SystemRights {
+	return (%SYSTEMRIGHTS);
+}
+
+
+# }}}
+
+# {{{ sub _Accessible 
+
+sub _Accessible  {
+  my $self = shift;  
+  my %Cols = (
+	      PrincipalId => 'read/write',
+	      PrincipalType => 'read/write',
+	      RightName => 'read/write', 
+	      RightScope => 'read/write',
+	      RightAppliesTo => 'read/write'
+	    );
+  return($self->SUPER::_Accessible(@_, %Cols));
+}
+# }}}
+
+# {{{ sub AppliesToObj
+
+=head2 AppliesToObj
+
+If the AppliesTo is a queue, returns the queue object. If it's 
+the system object, returns undef. If the user has no rights, returns undef.
+
+=cut
+
+sub AppliesToObj {
+    my $self = shift;
+    if ($self->RightScope eq 'Queue') {
+	my $appliesto_obj = new RT::Queue($self->CurrentUser);
+	$appliesto_obj->Load($self->RightAppliesTo);
+	return($appliesto_obj);
+    }
+    elsif ($self->RightScope eq 'System') {
+	return (undef);
+    }	
+    else {
+	$RT::Logger->warning("$self -> AppliesToObj called for an object ".
+			     "of an unknown scope:" . $self->RightScope);
+	return(undef);
+    }
+}	
+
+# }}}
+
+# {{{ sub PrincipalObj
+
+=head2 PrincipalObj
+
+If the AppliesTo is a group, returns the group object.
+If the AppliesTo is a user, returns the user object.
+Otherwise, it logs a warning and returns undef.
+
+=cut
+
+sub PrincipalObj {
+    my $self = shift;
+    my ($princ_obj);
+
+    if ($self->PrincipalType eq 'Group') {
+	use RT::Group;
+	$princ_obj = new RT::Group($self->CurrentUser);
+    }
+    elsif ($self->PrincipalType eq 'User') {
+	$princ_obj = new RT::User($self->CurrentUser);
+    }
+    else {
+	$RT::Logger->warning("$self -> PrincipalObj called for an object ".
+			     "of an unknown principal type:" . 
+			     $self->PrincipalType ."\n");
+	return(undef);
+    }
+    
+    $princ_obj->Load($self->PrincipalId);
+    return($princ_obj);
+
+}	
+
+# }}}
+
+# {{{ ACL related methods
+
+# {{{ sub _Set
+
+sub _Set {
+  my $self = shift;
+  return (0, "ACEs can only be created and deleted.");
+}
+
+# }}}
+
+# {{{ sub _Value
+
+sub _Value {
+    my $self = shift;
+
+    unless ($self->CurrentUserHasRight('ShowACL')) {
+	return (undef);
+    }
+
+    return ($self->__Value(@_));
+}
+
+# }}}
+
+
+# {{{ sub CurrentUserHasQueueRight 
+
+=head2 CurrentUserHasQueueRight ( Queue => QUEUEID, Right => RIGHTNANAME )
+
+Check to see whether the current user has the specified right for the specified queue.
+
+=cut
+
+sub CurrentUserHasQueueRight {
+    my $self = shift;
+    my %args = (Queue => undef,
+		Right => undef,
+		@_
+		);
+    return ($self->HasRight( Right => $args{'Right'},
+			     Principal => $self->CurrentUser->UserObj,
+			     Queue => $args{'Queue'}));
+}
+
+# }}}
+
+# {{{ sub CurrentUserHasSystemRight 
+=head2 CurrentUserHasSystemRight RIGHTNAME
+
+Check to see whether the current user has the specified right for the 'system' scope.
+
+=cut
+
+sub CurrentUserHasSystemRight {
+    my $self = shift;
+    my $right = shift;
+    return ($self->HasRight( Right => $right,
+			     Principal => $self->CurrentUser->UserObj,
+			     System => 1
+			   ));
+}
+
+
+# }}}
+
+# {{{ sub CurrentUserHasRight
+
+=item CurrentUserHasRight RIGHT 
+Takes a rightname as a string.
+
+Helper menthod for HasRight. Presets Principal to CurrentUser then 
+calls HasRight.
+
+=cut
+
+sub CurrentUserHasRight {
+    my $self = shift;
+    my $right = shift;
+    return ($self->HasRight( Principal => $self->CurrentUser->UserObj,
+                             Right => $right,
+			   ));
+}
+
+# }}}
+
+# {{{ sub HasRight
+
+=item HasRight
+
+Takes a param-hash consisting of "Right" and "Principal"  Principal is 
+an RT::User object or an RT::CurrentUser object. "Right" is a textual
+Right string that applies to KeywordSelects
+
+=cut
+
+sub HasRight {
+    my $self = shift;
+    my %args = ( Right => undef,
+                 Principal => undef,
+		 Queue => undef,
+		 System => undef,
+                 @_ ); 
+
+    #If we're explicitly specifying a queue, as we need to do on create
+    if (defined $args{'Queue'}) {
+	return ($args{'Principal'}->HasQueueRight(Right => $args{'Right'},
+						  Queue => $args{'Queue'}));
+    }
+    #else if we're specifying to check a system right
+    elsif ((defined $args{'System'}) and (defined $args{'Right'})) {
+        return( $args{'Principal'}->HasSystemRight( $args{'Right'} ));
+    }	
+    
+    elsif ($self->__Value('RightScope') eq 'System') {
+	return $args{'Principal'}->HasSystemRight($args{'Right'});
+    }
+    elsif ($self->__Value('RightScope') eq 'Queue') {
+	return $args{'Principal'}->HasQueueRight( Queue => $self->__Value('RightAppliesTo'),
+						  Right => $args{'Right'} );
+    }	
+    else {
+	$RT::Logger->warning("$self: Trying to check an acl for a scope we ".
+			     "don't understand:" . $self->__Value('RightScope') ."\n");
+	return undef;
+    }
+
+
+
+}
+# }}}
+
+# }}}
+
+1;
+
+__DATA__
+
+# {{{ POD
+
+=head1 Out of date docs
+
+=head2 Table Structure
+
+PrincipalType, PrincipalId, Right,Scope,AppliesTo
+
+=head1 The docs are out of date. so you know.
+
+=head1 Scopes
+
+Scope is the scope of the right granted, not the granularity of the grant.
+For example, Queue and Ticket rights are both granted for a "queue." 
+Rights with a scope of 'System' don't have an AppliesTo. (They're global).
+Rights with a scope of "Queue" are rights that act on a queue.
+Rights with a scope of "System" are rights that act on some other aspect
+of the system.
+
+
+=item Queue
+=item System
+
+
+=head1 Rights
+
+=head2 Scope: Queue
+
+=head2 Queue rights that apply to a ticket within a queue
+
+Create Ticket in <queue>
+
+        Name: Create
+	Principals: <user> <group>
+Display Ticket Summary in <queue>
+
+	Name: Show
+	Principals: <user> <group> Owner Requestor Cc AdminCc
+
+Display Ticket History  <queue>
+
+	Name: ShowHistory
+	Principals: <user> <group> Owner Requestor Cc AdminCc
+
+Display Ticket Private Comments  <queue>
+
+	Name: ShowComments
+	Principals: <user> <group> Owner Requestor Cc AdminCc
+
+Reply to Ticket in <queue>
+
+	Name: Reply
+	Principals: <user> <group> Owner Requestor Cc AdminCc
+
+Comment on Ticket in <queue>
+
+	Name: Comment
+	Principals: <user> <group> Owner Requestor Cc AdminCc
+
+Modify Ticket in <queue>
+
+	Name: Modify
+	Principals: <user> <group> Owner Requestor Cc AdminCc
+
+Delete Tickets in <queue>
+
+	Name: Delete
+	Principals: <user> <group> Owner Requestor Cc AdminCc
+
+
+=head2 Queue Rights that apply to a whole queue
+
+These rights can only be granted to "real people"
+
+List Tickets in <queue>
+
+	Name: ListQueue
+	Principals: <user> <group>
+
+Know that <queue> exists
+    
+    Name: See
+    Principals: <user> <group>
+
+Display queue settings
+
+    Name: Explore
+    Principals: <user> <group>
+
+Modify Queue Watchers for <queue>
+
+	Name: ModifyQueueWatchers
+	Principals: <user> <group>
+
+Modify Queue Attributes for <queue> 
+
+	Name: ModifyQueue
+	Principals: <user> <group>
+
+Modify Queue ACL for queue <queue>
+
+	Name: ModifyACL
+	Principals: <user> <group>
+
+
+=head2 Rights that apply to the System scope
+
+=head2 SystemRights
+
+Create Queue
+  
+        Name: CreateQueue
+	Principals: <user> <group>
+Delete Queue
+  
+        Name: DeleteQueue
+  	Principals: <user> <group>
+
+Create Users
+  
+        Name: CreateUser
+	Principals: <user> <group>
+
+Delete Users
+  
+        Name: DeleteUser
+  	Principals: <user> <group>
+  
+Modify Users
+  
+        Name: ModifyUser
+	Principals: <user> <group>
+
+Modify Self
+        Name: ModifySelf
+	Principals: <user> <group>
+
+Browse Users
+
+        Name: BrowseUsers (NOT IMPLEMENTED in 2.0)
+	Principals: <user> <group>
+
+Modify Self
+		    
+	Name: ModifySelf
+	Principals: <user> <group>
+
+Modify System ACL
+
+	Name: ModifyACL		  
+	Principals: <user> <group>
+
+=head1 The Principal Side of the ACE
+
+=head2 PrincipalTypes,PrincipalIds in our Neighborhood
+
+  User,<userid>
+  Group,<groupip>
+  Everyone,NULL
+
+=cut
+
+# }}}
diff --git a/rt/lib/RT/ACL.pm b/rt/lib/RT/ACL.pm
new file mode 100755
index 000000000..444a4c2af
--- /dev/null
+++ b/rt/lib/RT/ACL.pm
@@ -0,0 +1,308 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/ACL.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# Distributed under the terms of the GNU GPL
+# Copyright (c) 2000 Jesse Vincent <jesse@fsck.com>
+
+=head1 NAME
+
+  RT::ACL - collection of RT ACE objects
+
+=head1 SYNOPSIS
+
+  use RT::ACL;
+my $ACL = new RT::ACL($CurrentUser);
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing
+
+ok(require RT::TestHarness);
+ok(require RT::ACL);
+
+=end testing
+
+=cut
+
+package RT::ACL;
+use RT::EasySearch;
+use RT::ACE;
+@ISA= qw(RT::EasySearch);
+
+# {{{ sub _Init 
+sub _Init  {
+  my $self = shift;
+  $self->{'table'} = "ACL";
+  $self->{'primary_key'} = "id";
+  return ( $self->SUPER::_Init(@_));
+  
+}
+# }}}
+
+# {{{ sub NewItem 
+sub NewItem  {
+  my $self = shift;
+  return(RT::ACE->new($self->CurrentUser));
+}
+# }}}
+
+=head2 Next
+
+Hand out the next ACE that was found
+
+=cut
+
+# {{{ sub Next 
+sub Next {
+    my $self = shift;
+    
+    my $ACE = $self->SUPER::Next();
+    if ((defined($ACE)) and (ref($ACE))) {
+	
+	if ( $ACE->CurrentUserHasRight('ShowACL') or
+	     $ACE->CurrentUserHasRight('ModifyACL')
+	   ) {
+	    return($ACE);
+	}
+	
+	#If the user doesn't have the right to show this ACE
+	else {	
+	    return($self->Next());
+	}
+    }
+    #if there never was any ACE
+    else {
+	return(undef);
+    }	
+    
+}
+
+# }}}
+
+
+=head1 Limit the ACL to a specific scope
+
+There are two real scopes right now:
+
+=item Queue is for rights that apply to a single queue
+
+=item System is for rights that apply to the System (rights that aren't queue related)
+
+
+=head2 LimitToQueue
+
+Takes a single queueid as its argument.
+
+Limit the ACL to just a given queue when supplied with an integer queue id.
+
+=cut
+
+sub LimitToQueue {
+    my $self = shift;
+    my $queue = shift;
+    
+    
+    
+    $self->Limit( FIELD =>'RightScope',
+		  ENTRYAGGREGATOR => 'OR',
+		  VALUE => 'Queue');
+    $self->Limit( FIELD =>'RightScope',
+		  ENTRYAGGREGATOR => 'OR',
+		VALUE => 'Ticket');
+    
+    $self->Limit(ENTRYAGGREGATOR => 'OR',
+		 FIELD => 'RightAppliesTo',
+		 VALUE => $queue );
+  
+}
+
+
+=head2 LimitToSystem()
+
+Limit the ACL to system rights
+
+=cut 
+
+sub LimitToSystem {
+  my $self = shift;
+  
+  $self->Limit( FIELD =>'RightScope',
+		VALUE => 'System');
+}
+
+
+=head2 LimitRightTo
+
+Takes a single RightName as its only argument.
+Limits the search to the right $right.
+$right is a right listed in perldoc RT::ACE
+
+=cut
+
+sub LimitRightTo {
+  my $self = shift;
+  my $right = shift;
+  
+  $self->Limit(ENTRYAGGREGATOR => 'OR',
+	       FIELD => 'RightName',
+	       VALUE => $right );
+  
+}
+
+=head1 Limit to a specifc set of principals
+
+=head2 LimitPrincipalToUser
+
+Takes a single userid as its only argument.
+Limit the ACL to a just a specific user.
+
+=cut
+
+sub LimitPrincipalToUser {
+  my $self = shift;
+  my $user = shift;
+  
+  $self->Limit(ENTRYAGGREGATOR => 'OR',
+	       FIELD => 'PrincipalType',
+	       VALUE => 'User' );
+  
+  $self->Limit(ENTRYAGGREGATOR => 'OR',
+	       FIELD => 'PrincipalId',
+	       VALUE => $user );
+  
+}
+
+
+=head2 LimitPrincipalToGroup
+
+Takes a single group as its only argument.
+Limit the ACL to just a specific group.
+
+=cut
+  
+sub LimitPrincipalToGroup {
+  my $self = shift;
+  my $group = shift;
+  
+  $self->Limit(ENTRYAGGREGATOR => 'OR',
+	       FIELD => 'PrincipalType',
+	       VALUE => 'Group' );
+
+  $self->Limit(ENTRYAGGREGATOR => 'OR',
+	       FIELD => 'PrincipalId',
+	       VALUE => $group );
+
+}
+
+=head2 LimitPrincipalToType($type)
+
+Takes a single argument, $type.
+Limit the ACL to just a specific principal type
+
+$type is one of:
+  TicketOwner
+  TicketRequestor
+  TicketCc
+  TicketAdminCc
+  Everyone
+  User
+  Group
+
+=cut
+
+sub LimitPrincipalToType {
+  my $self=shift;
+  my $type=shift;  
+  $self->Limit(ENTRYAGGREGATOR => 'OR',
+		FIELD => 'PrincipalType',
+		VALUE => $type );
+}
+
+
+=head2 LimitPrincipalToId 
+
+Takes a single argument, the numeric Id of the principal to limit this ACL to. Repeated calls to this 
+function will broaden the scope of the search to include all principals listed.
+
+=cut
+
+sub LimitPrincipalToId {
+    my $self = shift;
+    my $id = shift;
+
+    if ($id =~ /^\d+$/) {
+	$self->Limit(ENTRYAGGREGATOR => 'OR',
+		     FIELD => 'PrincipalId',
+		     VALUE => $id );
+    }
+    else {
+	$RT::Logger->warn($self."->LimitPrincipalToId called with '$id' as an id");
+	return undef;
+    }
+}
+
+
+#wrap around _DoSearch  so that we can build the hash of returned
+#values 
+sub _DoSearch {
+    my $self = shift;
+   # $RT::Logger->debug("Now in ".$self."->_DoSearch");
+    my $return = $self->SUPER::_DoSearch(@_);
+  #  $RT::Logger->debug("In $self ->_DoSearch. return from SUPER::_DoSearch was $return\n");
+    $self->_BuildHash();
+    return ($return);
+}
+
+
+#Build a hash of this ACL's entries.
+sub _BuildHash {
+    my $self = shift;
+
+    while (my $entry = $self->Next) {
+       my $hashkey = $entry->RightScope . "-" .
+                             $entry->RightAppliesTo . "-" . 
+                             $entry->RightName . "-" .
+                             $entry->PrincipalId . "-" .
+                             $entry->PrincipalType;
+
+        $self->{'as_hash'}->{"$hashkey"} =1;
+
+    }
+}
+
+
+# {{{ HasEntry
+
+=head2 HasEntry
+
+=cut
+
+sub HasEntry {
+
+    my $self = shift;
+    my %args = ( RightScope => undef,
+                 RightAppliesTo => undef,
+                 RightName => undef,
+                 PrincipalId => undef,
+                 PrincipalType => undef,
+                 @_ );
+
+    #if we haven't done the search yet, do it now.
+    $self->_DoSearch();
+
+    if ($self->{'as_hash'}->{ $args{'RightScope'} . "-" .
+			      $args{'RightAppliesTo'} . "-" . 
+			      $args{'RightName'} . "-" .
+			      $args{'PrincipalId'} . "-" .
+			      $args{'PrincipalType'}
+                            } == 1) {
+	return(1);
+    }
+    else {
+	return(undef);
+    }
+}
+
+# }}}
+1;
diff --git a/rt/lib/RT/Action/Autoreply.pm b/rt/lib/RT/Action/Autoreply.pm
new file mode 100755
index 000000000..624888e94
--- /dev/null
+++ b/rt/lib/RT/Action/Autoreply.pm
@@ -0,0 +1,64 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/Autoreply.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+package RT::Action::Autoreply;
+require RT::Action::SendEmail;
+@ISA = qw(RT::Action::SendEmail);
+
+
+# {{{ sub SetRecipients
+
+=head2 SetRecipients
+
+Sets the recipients of this message to this ticket's Requestor.
+
+=cut
+
+
+sub SetRecipients {
+    my $self=shift;
+
+    push(@{$self->{'To'}}, @{$self->TicketObj->Requestors->Emails});
+    
+    return(1);
+}
+
+# }}}
+
+
+# {{{ sub SetReturnAddress 
+
+=head2 SetReturnAddress
+
+Set this message\'s return address to the apropriate queue address
+
+=cut
+
+sub SetReturnAddress {
+    my $self = shift;
+    my %args = ( is_comment => 0,
+		 @_
+	       );
+    
+    if ($args{'is_comment'}) { 
+	$replyto = $self->TicketObj->QueueObj->CommentAddress || 
+		     $RT::CommentAddress;
+    }
+    else {
+	$replyto = $self->TicketObj->QueueObj->CorrespondAddress ||
+		     $RT::CorrespondAddress;
+    }
+    
+    unless ($self->TemplateObj->MIMEObj->head->get('From')) {
+	my $friendly_name=$self->TicketObj->QueueObj->Name;
+	$self->SetHeader('From', "\"$friendly_name\" <$replyto>");
+    }
+    
+    unless ($self->TemplateObj->MIMEObj->head->get('Reply-To')) {
+	$self->SetHeader('Reply-To', "$replyto");
+    }
+    
+}
+  
+# }}}
+
+1;
diff --git a/rt/lib/RT/Action/Generic.pm b/rt/lib/RT/Action/Generic.pm
new file mode 100755
index 000000000..ecfd4ab1a
--- /dev/null
+++ b/rt/lib/RT/Action/Generic.pm
@@ -0,0 +1,155 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/Generic.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# (c) 1996-2000 Jesse Vincent <jesse@fsck.com>
+# This software is redistributable under the terms of the GNU GPL
+
+=head1 NAME
+
+  RT::Action::Generic - a generic baseclass for RT Actions
+
+=head1 SYNOPSIS
+
+  use RT::Action::Generic;
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Action::Generic);
+
+=end testing
+
+=cut
+
+package RT::Action::Generic;
+
+# {{{ sub new 
+sub new  {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self  = {};
+  bless ($self, $class);
+  $self->_Init(@_);
+  return $self;
+}
+# }}}
+
+# {{{ sub _Init 
+sub _Init  {
+  my $self = shift;
+  my %args = ( TransactionObj => undef,
+	       TicketObj => undef,
+	       ScripObj => undef,
+	       TemplateObj => undef,
+	       Argument => undef,
+	       Type => undef,
+	       @_ );
+  
+  
+  $self->{'Argument'} = $args{'Argument'};
+  $self->{'ScripObj'} = $args{'ScripObj'};
+  $self->{'TicketObj'} = $args{'TicketObj'};
+  $self->{'TransactionObj'} = $args{'TransactionObj'};
+  $self->{'TemplateObj'} = $args{'TemplateObj'};
+  $self->{'Type'} = $args{'Type'};
+}
+# }}}
+
+# Access Scripwide data
+
+# {{{ sub Argument 
+sub Argument  {
+  my $self = shift;
+  return($self->{'Argument'});
+}
+# }}}
+
+# {{{ sub TicketObj
+sub TicketObj  {
+  my $self = shift;
+  return($self->{'TicketObj'});
+}
+# }}}
+
+# {{{ sub TransactionObj
+sub TransactionObj  {
+  my $self = shift;
+  return($self->{'TransactionObj'});
+}
+# }}}
+
+# {{{ sub TemplateObj
+sub TemplateObj  {
+  my $self = shift;
+  return($self->{'TemplateObj'});
+}
+# }}}
+
+# {{{ sub Type
+sub Type  {
+  my $self = shift;
+  return($self->{'Type'});
+}
+# }}}
+
+
+# Scrip methods
+
+#Do what we need to do and send it out.
+
+# {{{ sub Commit 
+sub Commit  {
+  my $self = shift;
+  return(0,"Commit Stubbed");
+}
+# }}}
+
+
+#What does this type of Action does
+
+# {{{ sub Describe 
+sub Describe  {
+  my $self = shift;
+  return ("No description for " . ref $self);
+}
+# }}}
+
+
+#Parse the templates, get things ready to go.
+
+# {{{ sub Prepare 
+sub Prepare  {
+  my $self = shift;
+  return (0,"Prepare Stubbed");
+}
+# }}}
+
+
+#If this rule applies to this transaction, return true.
+
+# {{{ sub IsApplicable 
+sub IsApplicable  {
+  my $self = shift;
+  return(undef);
+}
+# }}}
+
+# {{{ sub DESTROY
+sub DESTROY {
+    my $self = shift;
+
+    # We need to clean up all the references that might maybe get
+    # oddly circular
+    $self->{'TemplateObj'} =undef
+    $self->{'TicketObj'} = undef;
+    $self->{'TransactionObj'} = undef;
+    $self->{'ScripObj'} = undef;
+
+
+     
+}
+
+# }}}
+1;
diff --git a/rt/lib/RT/Action/Notify.pm b/rt/lib/RT/Action/Notify.pm
new file mode 100755
index 000000000..6dca4fd41
--- /dev/null
+++ b/rt/lib/RT/Action/Notify.pm
@@ -0,0 +1,99 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/Notify.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+package RT::Action::Notify;
+require RT::Action::SendEmail;
+@ISA = qw(RT::Action::SendEmail);
+
+# {{{ sub SetRecipients
+
+=head2 SetRecipients
+
+Sets the recipients of this meesage to Owner, Requestor, AdminCc, Cc or All. 
+Explicitly B<does not> notify the creator of the transaction.
+
+=cut
+
+sub SetRecipients {
+    my $self = shift;
+
+    $arg = $self->Argument;
+
+    $arg =~ s/\bAll\b/Owner,Requestor,AdminCc,Cc/;
+
+    my ( @To, @PseudoTo, @Cc, @Bcc );
+
+
+    if ($arg =~ /\bOtherRecipients\b/) {
+        if ($self->TransactionObj->Message->First) {
+            push (@Cc, $self->TransactionObj->Message->First->GetHeader('RT-Send-Cc'));
+            push (@Bcc, $self->TransactionObj->Message->First->GetHeader('RT-Send-Bcc'));
+        }
+    }
+
+    if ( $arg =~ /\bRequestor\b/ ) {
+        push ( @To, @{ $self->TicketObj->Requestors->Emails } );
+    }
+
+    
+
+    if ( $arg =~ /\bCc\b/ ) {
+
+        #If we have a To, make the Ccs, Ccs, otherwise, promote them to To
+        if (@To) {
+            push ( @Cc, @{ $self->TicketObj->Cc->Emails } );
+            push ( @Cc, @{ $self->TicketObj->QueueObj->Cc->Emails } );
+        }
+        else {
+            push ( @Cc, @{ $self->TicketObj->Cc->Emails } );
+            push ( @To, @{ $self->TicketObj->QueueObj->Cc->Emails } );
+        }
+    }
+
+    if ( ( $arg =~ /\bOwner\b/ )
+        && ( $self->TicketObj->OwnerObj->id != $RT::Nobody->id ) )
+    {
+
+        # If we're not sending to Ccs or requestors, 
+        # then the Owner can be the To.
+        if (@To) {
+            push ( @Bcc, $self->TicketObj->OwnerObj->EmailAddress );
+        }
+        else {
+            push ( @To, $self->TicketObj->OwnerObj->EmailAddress );
+        }
+
+    }
+
+    if ( $arg =~ /\bAdminCc\b/ ) {
+        push ( @Bcc, @{ $self->TicketObj->AdminCc->Emails } );
+        push ( @Bcc, @{ $self->TicketObj->QueueObj->AdminCc->Emails } );
+    }
+
+    if ($RT::UseFriendlyToLine) {
+        unless (@To) {
+            push ( @PseudoTo,
+                "\"$arg of $RT::rtname Ticket #"
+                  . $self->TicketObj->id . "\":;" );
+        }
+    }
+
+    my $creator = $self->TransactionObj->CreatorObj->EmailAddress();
+
+    #Strip the sender out of the To, Cc and AdminCc and set the 
+    # recipients fields used to build the message by the superclass.
+
+    $RT::Logger->debug("$self: To is ".join(",",@To));
+    $RT::Logger->debug("$self: Cc is ".join(",",@Cc));
+    $RT::Logger->debug("$self: Bcc is ".join(",",@Bcc));
+
+    @{ $self->{'To'} }  = grep ( !/^$creator$/, @To );
+    @{ $self->{'Cc'} }  = grep ( !/^$creator$/, @Cc );
+    @{ $self->{'Bcc'} } = grep ( !/^$creator$/, @Bcc );
+    @{ $self->{'PseudoTo'} } = @PseudoTo;
+    return (1);
+
+}
+
+# }}}
+
+1;
diff --git a/rt/lib/RT/Action/NotifyAsComment.pm b/rt/lib/RT/Action/NotifyAsComment.pm
new file mode 100755
index 000000000..c72bfff13
--- /dev/null
+++ b/rt/lib/RT/Action/NotifyAsComment.pm
@@ -0,0 +1,25 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/NotifyAsComment.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+package RT::Action::NotifyAsComment;
+require RT::Action::Notify;
+@ISA = qw(RT::Action::Notify);
+
+
+=head2 SetReturnAddress
+
+Tell SendEmail that this message should come out as a comment. 
+Calls SUPER::SetReturnAddress.
+
+=cut
+
+sub SetReturnAddress {
+	my $self = shift;
+	
+	# Tell RT::Action::SendEmail that this should come 
+	# from the relevant comment email address.
+	$self->{'comment'} = 1;
+	
+	return($self->SUPER::SetReturnAddress(is_comment => 1));
+}
+1;
+
diff --git a/rt/lib/RT/Action/OpenDependent.pm b/rt/lib/RT/Action/OpenDependent.pm
new file mode 100644
index 000000000..b271e4709
--- /dev/null
+++ b/rt/lib/RT/Action/OpenDependent.pm
@@ -0,0 +1,55 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/Attic/OpenDependent.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# This Action will open the BASE if a dependent is resolved.
+
+package RT::Action::OpenDependent;
+require RT::Action::Generic;
+require RT::Links;
+@ISA=qw(RT::Action::Generic);
+
+#Do what we need to do and send it out.
+
+#What does this type of Action does
+
+# {{{ sub Describe 
+sub Describe  {
+  my $self = shift;
+  return (ref $self . " will stall a [local] BASE if it's open and a dependency link is created.");
+}
+# }}}
+
+
+# {{{ sub Prepare 
+sub Prepare  {
+    # nothing to prepare
+    return 1;
+}
+# }}}
+
+sub Commit {
+    my $self = shift;
+
+    my $Links=RT::Links->new($RT::SystemUser);
+    $Links->Limit(FIELD => 'Type', VALUE => 'DependsOn');
+    $Links->Limit(FIELD => 'Target', VALUE => $self->TicketObj->id);
+
+    while (my $Link=$Links->Next()) {
+	next unless $Link->BaseIsLocal;
+	my $base=RT::Ticket->new($self->TicketObj->CurrentUser);
+	# Todo: Only work if Base is a plain ticket num:
+	$base->Load($Link->Base);
+        $base->Open if $base->Status eq 'stalled';
+    }
+}
+
+
+# Applicability checked in Commit.
+
+# {{{ sub IsApplicable 
+sub IsApplicable  {
+  my $self = shift;
+  1;  
+  return 1;
+}
+# }}}
+
+1;
diff --git a/rt/lib/RT/Action/ResolveMembers.pm b/rt/lib/RT/Action/ResolveMembers.pm
new file mode 100644
index 000000000..00547ebe8
--- /dev/null
+++ b/rt/lib/RT/Action/ResolveMembers.pm
@@ -0,0 +1,57 @@
+# This Action will resolve all members of a resolved group ticket
+
+package RT::Action::ResolveMembers;
+require RT::Action::Generic;
+require RT::Links;
+@ISA=qw(RT::Action::Generic);
+
+#Do what we need to do and send it out.
+
+#What does this type of Action does
+
+# {{{ sub Describe 
+sub Describe  {
+  my $self = shift;
+  return (ref $self . " will resolve all members of a resolved group ticket.");
+}
+# }}}
+
+
+# {{{ sub Prepare 
+sub Prepare  {
+    # nothing to prepare
+    return 1;
+}
+# }}}
+
+sub Commit {
+    my $self = shift;
+
+    my $Links=RT::Links->new($RT::SystemUser);
+    $Links->Limit(FIELD => 'Type', VALUE => 'MemberOf');
+    $Links->Limit(FIELD => 'Target', VALUE => $self->TicketObj->id);
+
+    while (my $Link=$Links->Next()) {
+	# Todo: Try to deal with remote URIs as well
+	next unless $Link->BaseIsLocal;
+	my $base=RT::Ticket->new($self->TicketObj->CurrentUser);
+	# Todo: Only work if Base is a plain ticket num:
+	$base->Load($Link->Base);
+	# I'm afraid this might be a major bottleneck if ResolveGroupTicket is on.
+        $base->Resolve;
+    }
+}
+
+
+# Applicability checked in Commit.
+
+# {{{ sub IsApplicable 
+sub IsApplicable  {
+  my $self = shift;
+  1;  
+  return 1;
+}
+# }}}
+
+1;
+
diff --git a/rt/lib/RT/Action/SendEmail.pm b/rt/lib/RT/Action/SendEmail.pm
new file mode 100755
index 000000000..e3abb1154
--- /dev/null
+++ b/rt/lib/RT/Action/SendEmail.pm
@@ -0,0 +1,468 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/SendEmail.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# Copyright 1996-2002  Jesse Vincent <jesse@bestpractical.com> 
+# Portions Copyright 2000 Tobias Brox <tobix@cpan.org>
+# Released under the terms of version 2 of the GNU Public License
+
+package RT::Action::SendEmail;
+require RT::Action::Generic;
+
+@ISA = qw(RT::Action::Generic);
+
+
+=head1 NAME
+
+  RT::Action::SendEmail - An Action which users can use to send mail 
+  or can subclassed for more specialized mail sending behavior. 
+  RT::Action::AutoReply is a good example subclass.
+
+
+=head1 SYNOPSIS
+
+  require RT::Action::SendEmail;
+  @ISA  = qw(RT::Action::SendEmail);
+
+
+=head1 DESCRIPTION
+
+Basically, you create another module RT::Action::YourAction which ISA
+RT::Action::SendEmail.
+
+If you want to set the recipients of the mail to something other than
+the addresses mentioned in the To, Cc, Bcc and headers in
+the template, you should subclass RT::Action::SendEmail and override
+either the SetRecipients method or the SetTo, SetCc, etc methods (see
+the comments for the SetRecipients sub).
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Action::SendEmail);
+
+=end testing
+
+
+=head1 AUTHOR
+
+Jesse Vincent <jesse@bestpractical.com> and Tobias Brox <tobix@cpan.org>
+
+=head1 SEE ALSO
+
+perl(1).
+
+=cut
+
+# {{{ Scrip methods (_Init, Commit, Prepare, IsApplicable)
+
+# {{{ sub _Init 
+# We use _Init from RT::Action
+# }}}
+
+# {{{ sub Commit 
+#Do what we need to do and send it out.
+sub Commit  {
+    my $self = shift;
+    #send the email
+    
+    # If there are no recipients, don't try to send the message.
+    # If the transaction has content and has the header RT-Squelch-Replies-To
+    
+    if (defined $self->TransactionObj->Message->First()) { 
+	my $headers = $self->TransactionObj->Message->First->Headers();
+	
+	if ($headers =~ /^RT-Squelch-Replies-To: (.*?)$/si) {
+	    my @blacklist = split(/,/,$1);
+	    
+	    # Cycle through the people we're sending to and pull out anyone on the
+	    # system blacklist
+	    
+	    foreach my $person_to_yank (@blacklist) {
+		$person_to_yank =~ s/\s//g;
+		@{$self->{'To'}} = grep (!/^$person_to_yank$/, @{$self->{'To'}});
+		@{$self->{'Cc'}} = grep (!/^$person_to_yank$/, @{$self->{'Cc'}});
+		@{$self->{'Bcc'}} = grep (!/^$person_to_yank$/, @{$self->{'Bcc'}});
+	    }
+	}
+    }
+    
+    # Go add all the Tos, Ccs and Bccs that we need to to the message to 
+    # make it happy, but only if we actually have values in those arrays.
+    
+    $self->SetHeader('To', join(',', @{$self->{'To'}})) 
+      if (@{$self->{'To'}});
+    $self->SetHeader('Cc', join(',' , @{$self->{'Cc'}})) 
+      if (@{$self->{'Cc'}});
+	$self->SetHeader('Bcc', join(',', @{$self->{'Bcc'}})) 
+	  if (@{$self->{'Bcc'}});;
+    
+    my $MIMEObj = $self->TemplateObj->MIMEObj;
+    
+
+    $MIMEObj->make_singlepart;
+    
+    
+    #If we don't have any recipients to send to, don't send a message;
+    unless ($MIMEObj->head->get('To') ||
+	    $MIMEObj->head->get('Cc') || 
+	    $MIMEObj->head->get('Bcc') ) {
+	$RT::Logger->debug("$self: No recipients found. Not sending.\n");
+	return(1);
+    }
+
+    # PseudoTo	(fake to headers) shouldn't get matched for message recipients.
+    # If we don't have any 'To' header, drop in the pseudo-to header.
+
+    $self->SetHeader('To', join(',', @{$self->{'PseudoTo'}}))
+      if ( (@{$self->{'PseudoTo'}}) and (! $MIMEObj->head->get('To')));
+    
+    if ($RT::MailCommand eq 'sendmailpipe') {
+	open (MAIL, "|$RT::SendmailPath $RT::SendmailArguments") || return(0);
+	print MAIL $MIMEObj->as_string;
+	close(MAIL);
+    }
+    else {
+	unless ($MIMEObj->send($RT::MailCommand, $RT::MailParams)) {
+	    $RT::Logger->crit("$self: Could not send mail for ".
+			      $self->TransactionObj . "\n");
+	    return(0);
+	}
+    }
+    
+    return (1);
+    
+}
+# }}}
+
+# {{{ sub Prepare 
+
+sub Prepare  {
+  my $self = shift;
+  
+  # This actually populates the MIME::Entity fields in the Template Object
+  
+  unless ($self->TemplateObj) {
+    $RT::Logger->warning("No template object handed to $self\n");
+  }
+  
+  unless ($self->TransactionObj) {
+    $RT::Logger->warning("No transaction object handed to $self\n");
+    
+  }
+  
+  unless ($self->TicketObj) {
+    $RT::Logger->warning("No ticket object handed to $self\n");
+      
+  }
+  
+  
+  $self->TemplateObj->Parse(Argument => $self->Argument,
+			    TicketObj => $self->TicketObj, 
+			    TransactionObj => $self->TransactionObj);
+  
+  # Header
+  
+  $self->SetSubject();
+  
+  $self->SetSubjectToken();
+  
+  $self->SetRecipients();  
+  
+  $self->SetReturnAddress();
+
+  $self->SetRTSpecialHeaders();
+  
+  return 1;
+  
+}
+
+# }}}
+
+# }}}
+
+# {{{ Deal with message headers (Set* subs, designed for  easy overriding)
+
+# {{{ sub SetRTSpecialHeaders
+
+# This routine adds all the random headers that RT wants in a mail message
+# that don't matter much to anybody else.
+
+sub SetRTSpecialHeaders {
+    my $self = shift;
+    
+    $self->SetReferences();
+
+    $self->SetMessageID();
+    
+    $self->SetPrecedence();
+
+    $self->SetHeader('X-RT-Loop-Prevention', $RT::rtname); 
+    $self->SetHeader('RT-Ticket', $RT::rtname. " #".$self->TicketObj->id());
+    $self->SetHeader
+      ('Managed-by',"RT $RT::VERSION (http://bestpractical.com/rt/)");
+    
+    $self->SetHeader('RT-Originator', $self->TransactionObj->CreatorObj->EmailAddress);
+    return();
+    
+}
+
+
+
+# {{{ sub SetReferences
+
+=head2 SetReferences 
+  
+  # This routine will set the References: and In-Reply-To headers,
+# autopopulating it with all the correspondence on this ticket so
+# far. This should make RT responses threadable.
+
+=cut
+
+sub SetReferences {
+  my $self = shift;
+  
+  # TODO: this one is broken.  What is this email really a reply to?
+  # If it's a reply to an incoming message, we'll need to use the
+  # actual message-id from the appropriate Attachment object.  For
+  # incoming mails, we would like to preserve the In-Reply-To and/or
+  # References.
+
+  $self->SetHeader
+    ('In-Reply-To', "<rt-".$self->TicketObj->id().
+     "\@".$RT::rtname.">");
+
+
+  # TODO We should always add References headers for all message-ids
+  # of previous messages related to this ticket.
+}
+
+# }}}
+
+# {{{ sub SetMessageID
+
+# Without this one, threading won't work very nice in email agents.
+# Anyway, I'm not really sure it's that healthy if we need to send
+# several separate/different emails about the same transaction.
+
+sub SetMessageID {
+  my $self = shift;
+
+  # TODO this one might be sort of broken.  If we have several scrips +++
+  # sending several emails to several different persons, we need to
+  # pull out different message-ids.  I'd suggest message ids like
+  # "rt-ticket#-transaction#-scrip#-receipient#"
+
+  $self->SetHeader
+    ('Message-ID', "<rt-".$self->TicketObj->id().
+     "-".
+     $self->TransactionObj->id()."." .rand(20) . "\@".$RT::Organization.">")
+      unless $self->TemplateObj->MIMEObj->head->get('Message-ID');
+}
+
+
+# }}}
+
+# }}}
+
+# {{{ sub SetReturnAddress 
+
+sub SetReturnAddress {
+
+  my $self = shift;
+  my %args = ( is_comment => 0,
+	       @_ );
+
+  # From and Reply-To
+  # $args{is_comment} should be set if the comment address is to be used.
+  my $replyto;
+
+  if ($args{'is_comment'}) { 
+      $replyto = $self->TicketObj->QueueObj->CommentAddress || 
+		  $RT::CommentAddress;
+  }
+  else {
+      $replyto = $self->TicketObj->QueueObj->CorrespondAddress ||
+		  $RT::CorrespondAddress;
+  }
+    
+  unless ($self->TemplateObj->MIMEObj->head->get('From')) {
+      my $friendly_name=$self->TransactionObj->CreatorObj->RealName;
+
+      if ($friendly_name =~ /^\S+\@\S+$/) { # A "bare" mail address
+          $friendly_name =~ s/"/\\"/g;
+          $friendly_name = qq|"$friendly_name"|;
+      }
+
+
+      # TODO: this "via RT" should really be site-configurable.
+      $self->SetHeader('From', "\"$friendly_name via RT\" <$replyto>");
+  }
+  
+  unless ($self->TemplateObj->MIMEObj->head->get('Reply-To')) {
+      $self->SetHeader('Reply-To', "$replyto");
+  }
+  
+}
+
+# }}}
+
+# {{{ sub SetHeader
+
+sub SetHeader {
+  my $self = shift;
+  my $field = shift;
+  my $val = shift;
+
+  chomp $val;                                                                  
+  chomp $field;                                                                
+  $self->TemplateObj->MIMEObj->head->fold_length($field,10000);     
+  $self->TemplateObj->MIMEObj->head->add($field, $val);
+  return $self->TemplateObj->MIMEObj->head->get($field);
+}
+
+# }}}
+
+# {{{ sub SetRecipients
+
+=head2 SetRecipients
+
+Dummy method to be overriden by subclasses which want to set the recipients.
+
+=cut
+
+sub SetRecipients {
+    my $self = shift;
+    return();
+}
+
+# }}}
+
+# {{{ sub SetTo
+
+sub SetTo {
+    my $self=shift;
+    my $addresses = shift;
+    return $self->SetHeader('To',$addresses);
+}
+# }}}
+
+# {{{ sub SetCc
+=head2 SetCc
+
+Takes a string that is the addresses you want to Cc
+
+=cut
+
+sub SetCc {
+    my $self=shift;
+    my $addresses = shift;
+
+    return $self->SetHeader('Cc', $addresses);
+}
+# }}}
+
+# {{{ sub SetBcc
+
+=head2 SetBcc
+
+Takes a string that is the addresses you want to Bcc
+
+=cut
+sub SetBcc {
+    my $self=shift;
+    my $addresses = shift;
+
+    return $self->SetHeader('Bcc', $addresses);
+}
+
+# }}}
+
+# {{{ sub SetPrecedence 
+
+sub SetPrecedence {
+  my $self = shift;
+
+  unless ($self->TemplateObj->MIMEObj->head->get("Precedence")) { 
+    $self->SetHeader('Precedence', "bulk");
+   }
+}
+
+# }}}
+
+# {{{ sub SetSubject
+
+=head2 SetSubject
+
+This routine sets the subject. it does not add the rt tag. that gets done elsewhere
+If $self->{'Subject'} is already defined, it uses that. otherwise, it tries to get
+the transaction's subject.
+
+=cut 
+
+sub SetSubject {
+  my $self = shift;
+  unless ($self->TemplateObj->MIMEObj->head->get('Subject')) {
+    my $message=$self->TransactionObj->Message;
+    my $ticket=$self->TicketObj->Id;
+    
+    my $subject;
+    
+    if ($self->{'Subject'}) {
+      $subject = $self->{'Subject'};
+    }
+    elsif (($message->First()) &&
+	   ($message->First->Headers)) {
+      $header = $message->First->Headers();
+      $header =~ s/\n\s+/ /g; 
+      if ( $header =~ /^Subject: (.*?)$/m ) {
+	$subject = $1;
+      }
+      else {
+	$subject = $self->TicketObj->Subject();
+      }
+      
+    }
+    else {
+      $subject = $self->TicketObj->Subject();
+    }
+    
+    $subject =~ s/(\r\n|\n|\s)/ /gi;
+
+    chomp $subject;
+    $self->SetHeader('Subject',$subject);
+    
+    }
+  return($subject);
+}
+# }}}
+
+# {{{ sub SetSubjectToken
+
+=head2 SetSubjectToken
+
+ This routine fixes the RT tag in the subject. It's unlikely that you want to overwrite this.
+
+=cut
+
+sub SetSubjectToken {
+  my $self=shift;
+  my $tag = "[$RT::rtname #".$self->TicketObj->id."]";
+  my $sub = $self->TemplateObj->MIMEObj->head->get('Subject');
+  unless ($sub =~ /\Q$tag\E/) {
+    $sub =~ s/(\r\n|\n|\s)/ /gi;
+    chomp $sub;
+    $self->TemplateObj->MIMEObj->head->replace('Subject', "$tag $sub");
+  }
+}
+
+# }}}
+
+# }}}
+
+__END__
+
+# {{{ POD
+
+# }}}
+
+1;
+
diff --git a/rt/lib/RT/Action/SendPasswordEmail.pm b/rt/lib/RT/Action/SendPasswordEmail.pm
new file mode 100755
index 000000000..91bb3c1cb
--- /dev/null
+++ b/rt/lib/RT/Action/SendPasswordEmail.pm
@@ -0,0 +1,170 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/Attic/SendPasswordEmail.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# Copyright 2001  Jesse Vincent <jesse@fsck.com>
+# Released under the terms of the GNU Public License
+
+package RT::Action::SendPasswordEmail;
+require RT::Action::Generic;
+
+@ISA = qw(RT::Action::Generic);
+
+
+=head1 NAME
+
+  RT::Action::SendGenericEmail - An Action which users can use to send mail 
+  or can subclassed for more specialized mail sending behavior. 
+
+
+
+=head1 SYNOPSIS
+
+  require RT::Action::SendPasswordEmail;
+
+
+=head1 DESCRIPTION
+
+Basically, you create another module RT::Action::YourAction which ISA
+RT::Action::SendEmail.
+
+If you want to set the recipients of the mail to something other than
+the addresses mentioned in the To, Cc, Bcc and headers in
+the template, you should subclass RT::Action::SendEmail and override
+either the SetRecipients method or the SetTo, SetCc, etc methods (see
+the comments for the SetRecipients sub).
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Action::SendPasswordEmail);
+
+=end testing
+
+
+=head1 AUTHOR
+
+Jesse Vincent <jesse@bestpractical.com>
+
+=head1 SEE ALSO
+
+perl(1).
+
+=cut
+
+# {{{ Scrip methods (_Init, Commit, Prepare, IsApplicable)
+
+# {{{ sub Commit 
+
+#Do what we need to do and send it out.
+
+sub Commit  {
+    my $self = shift;
+    #send the email
+    
+    
+    
+
+    
+    my $MIMEObj = $self->TemplateObj->MIMEObj;
+    
+    
+    $MIMEObj->make_singlepart;
+    
+    #If we don\'t have any recipients to send to, don\'t send a message;
+    unless ($MIMEObj->head->get('To')) {
+	$RT::Logger->debug("$self: No recipients found. Not sending.\n");
+	return(1);
+    }
+    
+    if ($RT::MailCommand eq 'sendmailpipe') {
+	open (MAIL, "|$RT::SendmailPath $RT::SendmailArguments") || return(0);
+	print MAIL $MIMEObj->as_string;
+	close(MAIL);
+    }
+    else {
+	unless ($MIMEObj->send($RT::MailCommand, $RT::MailParams)) {
+	    $RT::Logger->crit("$self: Could not send mail for ".
+			      $self->TransactionObj . "\n");
+	    return(0);
+	}
+    }
+    
+    return (1);
+    
+}
+# }}}
+
+# {{{ sub Prepare 
+
+sub Prepare  {
+    my $self = shift;
+    
+    # This actually populates the MIME::Entity fields in the Template Object
+    
+    unless ($self->TemplateObj) {
+	$RT::Logger->warning("No template object handed to $self\n");
+    }
+    
+    
+    unless ($self->TemplateObj->MIMEObj->head->get('Reply-To')) {
+	$self->SetHeader('Reply-To',$RT::CorrespondAddress );
+    }
+
+    
+    $self->SetHeader('Precedence', "bulk");
+    $self->SetHeader('X-RT-Loop-Prevention', $RT::rtname); 
+    $self->SetHeader
+      ('Managed-by',"Request Tracker $RT::VERSION (http://www.fsck.com/projects/rt/)");
+    
+    $self->TemplateObj->Parse(Argument => $self->Argument);
+    
+    
+    return 1;
+}
+
+# }}}
+
+# }}}
+
+
+# {{{ sub SetTo
+
+=head2 SetTo EMAIL
+
+Sets this message's "To" field to EMAIL
+
+=cut
+
+sub SetTo {
+    my $self = shift;
+    my $to = shift;
+    $self->SetHeader('To',$to);
+}
+
+# }}}
+
+# {{{ sub SetHeader
+
+sub SetHeader {
+  my $self = shift;
+  my $field = shift;
+  my $val = shift;
+
+  chomp $val;                                                                  
+  chomp $field;                                                                
+  $self->TemplateObj->MIMEObj->head->fold_length($field,10000);     
+  $self->TemplateObj->MIMEObj->head->add($field, $val);
+  return $self->TemplateObj->MIMEObj->head->get($field);
+}
+
+# }}}
+
+
+
+__END__
+
+# {{{ POD
+
+# }}}
+
+1;
+
diff --git a/rt/lib/RT/Action/StallDependent.pm b/rt/lib/RT/Action/StallDependent.pm
new file mode 100644
index 000000000..09d3448a8
--- /dev/null
+++ b/rt/lib/RT/Action/StallDependent.pm
@@ -0,0 +1,68 @@
+# This Action will stall the BASE if a dependency or membership link
+# (according to argument) is created and if BASE is open.
+
+# TODO: Rename this .pm
+
+package RT::Action::StallDependent;
+require RT::Action::Generic;
+@ISA=qw|RT::Action::Generic|;
+
+# {{{ sub Describe 
+sub Describe  {
+  my $self = shift;
+  return (ref $self . " will stall a [local] BASE if it's dependent [or member] of a linked up request.");
+}
+# }}}
+
+
+# {{{ sub Prepare 
+sub Prepare  {
+    # nothing to prepare
+    return 1;
+}
+# }}}
+
+sub Commit {
+    my $self = shift;
+    # Find all Dependent
+    my $arg=$self->Argument || "DependsOn";
+    unless ($self->TransactionObj->Data =~ /^([^ ]+) $arg /) {
+	warn; return 0;
+    }
+    my $base_id=$1;
+    my $base;
+    if ($1 eq "THIS") {
+	$base=$self->TicketObj;
+    } else {
+	$base_id=&RT::Link::_IsLocal(undef, $base_id) || return 0;
+	$base=RT::Ticket->new($self->TicketObj->CurrentUser);
+	$base->Load($base_id);
+    }
+    $base->Stall if $base->Status eq 'open';
+    return 0;
+}
+
+
+# {{{ sub IsApplicable 
+
+# Only applicable if:
+# 1. the link action is a dependency
+# 2. BASE is a local ticket
+
+sub IsApplicable  {
+  my $self = shift;
+
+  my $arg=$self->Argument || "DependsOn";
+
+  # 1:
+  $self->TransactionObj->Data =~ /^([^ ]*) $arg / || return 0;
+
+  # 2:
+  # (dirty!)
+  &RT::Link::_IsLocal(undef,$1) || return 0;
+
+  return 1;
+}
+# }}}
+
+1;
diff --git a/rt/lib/RT/Attachment.pm b/rt/lib/RT/Attachment.pm
new file mode 100755
index 000000000..916ac355e
--- /dev/null
+++ b/rt/lib/RT/Attachment.pm
@@ -0,0 +1,423 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attachment.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# Copyright 2000 Jesse Vincent <jesse@fsck.com>
+# Released under the terms of the GNU Public License
+
+=head1 NAME
+
+  RT::Attachment -- an RT attachment object
+
+=head1 SYNOPSIS
+
+  use RT::Attachment;
+
+
+=head1 DESCRIPTION
+
+This module should never be instantiated directly by client code. it's an internal 
+module which should only be instantiated through exported APIs in Ticket, Queue and other 
+similar objects.
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Attachment);
+
+=end testing
+
+=cut
+
+package RT::Attachment;
+use RT::Record;
+use MIME::Base64;
+use vars qw|@ISA|;
+@ISA= qw(RT::Record);
+
+# {{{ sub _Init
+sub _Init  {
+    my $self = shift; 
+    $self->{'table'} = "Attachments";
+    return($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub _ClassAccessible 
+sub _ClassAccessible {
+    {
+    TransactionId   => { 'read'=>1, 'public'=>1, },
+    MessageId       => { 'read'=>1, },
+    Parent          => { 'read'=>1, },
+    ContentType     => { 'read'=>1, },
+    Subject         => { 'read'=>1, },
+    Content         => { 'read'=>1, },
+    ContentEncoding => { 'read'=>1, },
+    Headers         => { 'read'=>1, },
+    Filename        => { 'read'=>1, },
+    Creator         => { 'read'=>1, 'auto'=>1, },
+    Created         => { 'read'=>1, 'auto'=>1, },
+  };
+}
+# }}}
+
+# {{{ sub TransactionObj 
+
+=head2 TransactionObj
+
+Returns the transaction object asscoiated with this attachment.
+
+=cut
+
+sub TransactionObj {
+    require RT::Transaction;
+    my $self=shift;
+    unless (exists $self->{_TransactionObj}) {
+	$self->{_TransactionObj}=RT::Transaction->new($self->CurrentUser);
+	$self->{_TransactionObj}->Load($self->TransactionId);
+    }
+    return $self->{_TransactionObj};
+}
+
+# }}}
+
+# {{{ sub Create 
+
+=head2 Create
+
+Create a new attachment. Takes a paramhash:
+    
+    'Attachment' Should be a single MIME body with optional subparts
+    'Parent' is an optional Parent RT::Attachment object
+    'TransactionId' is the mandatory id of the Transaction this attachment is associated with.;
+
+=cut
+
+sub Create  {
+    my $self = shift;
+    my ($id);
+    my %args = ( id => 0,
+		 TransactionId => 0,
+		 Parent => 0,
+		 Attachment => undef,
+		 @_
+	       );
+    
+    
+    #For ease of reference
+    my $Attachment = $args{'Attachment'};
+    
+    #if we didn't specify a ticket, we need to bail
+    if ( $args{'TransactionId'} == 0) {
+	$RT::Logger->crit("RT::Attachment->Create couldn't, as you didn't specify a transaction\n");
+	return (0);
+	
+    }
+    
+    #If we possibly can, collapse it to a singlepart
+    $Attachment->make_singlepart;
+    
+    #Get the subject
+    my $Subject = $Attachment->head->get('subject',0);
+    defined($Subject) or $Subject = '';
+    chomp($Subject);
+  
+    #Get the filename
+    my $Filename = $Attachment->head->recommended_filename;
+    
+    if ($Attachment->parts) {
+	$id = $self->SUPER::Create(TransactionId => $args{'TransactionId'},
+				   Parent => 0,
+				   ContentType  => $Attachment->mime_type,
+				   Headers => $Attachment->head->as_string,
+				   Subject => $Subject,
+				   
+				  );
+ 	foreach my $part ($Attachment->parts) {	
+	    my $SubAttachment = new RT::Attachment($self->CurrentUser);
+	    $SubAttachment->Create(TransactionId => $args{'TransactionId'},
+				   Parent => $id,
+				   Attachment => $part,
+				   ContentType  => $Attachment->mime_type,
+				   Headers => $Attachment->head->as_string(),
+				   
+				  );
+	}
+	return ($id);
+    }
+  
+  
+    #If it's not multipart
+    else {
+	
+	my $ContentEncoding = 'none'; 
+	
+	my $Body = $Attachment->bodyhandle->as_string;
+	
+	#get the max attachment length from RT
+	my $MaxSize = $RT::MaxAttachmentSize;
+	
+	#if the current attachment contains nulls and the 
+	#database doesn't support embedded nulls
+	
+	if ( (! $RT::Handle->BinarySafeBLOBs) &&
+	     ( $Body =~ /\x00/ ) ) {
+	    # set a flag telling us to mimencode the attachment
+	    $ContentEncoding = 'base64';
+	    
+	    #cut the max attchment size by 25% (for mime-encoding overhead.
+	    $RT::Logger->debug("Max size is $MaxSize\n");
+	    $MaxSize = $MaxSize * 3/4;	
+	}
+	
+	#if the attachment is larger than the maximum size
+	if (($MaxSize) and ($MaxSize < length($Body))) {
+	    # if we're supposed to truncate large attachments
+	    if ($RT::TruncateLongAttachments) {
+		# truncate the attachment to that length.
+		$Body = substr ($Body, 0, $MaxSize);
+
+	    }
+	    
+	    # elsif we're supposed to drop large attachments on the floor,
+	    elsif ($RT::DropLongAttachments) {
+		# drop the attachment on the floor
+		$RT::Logger->info("$self: Dropped an attachment of size ". length($Body).
+				  "\n". "It started: ". substr($Body, 0, 60) . "\n");
+		return(undef);
+	    }
+	}
+	# if we need to mimencode the attachment
+	if ($ContentEncoding eq 'base64') {
+	    # base64 encode the attachment
+	    $Body = MIME::Base64::encode_base64($Body);
+	    
+	}
+	
+	my $id = $self->SUPER::Create(TransactionId => $args{'TransactionId'},
+				      ContentType  => $Attachment->mime_type,
+				      ContentEncoding => $ContentEncoding,
+				      Parent => $args{'Parent'},
+				      Content => $Body,
+				      Headers => $Attachment->head->as_string,
+				      Subject => $Subject,
+				      Filename => $Filename,
+				     );
+	return ($id);
+    }
+}
+
+# }}}
+
+
+# {{{ sub Content
+
+=head2 Content
+
+Returns the attachment's content. if it's base64 encoded, decode it 
+before returning it.
+
+=cut
+
+sub Content {
+  my $self = shift;
+  if ( $self->ContentEncoding eq 'none' || ! $self->ContentEncoding ) {
+      return $self->_Value('Content');
+  } elsif ( $self->ContentEncoding eq 'base64' ) {
+      return MIME::Base64::decode_base64($self->_Value('Content'));
+  } else {
+      return( "Unknown ContentEncoding ". $self->ContentEncoding);
+  }
+}
+
+
+# }}}
+
+# {{{ sub Children
+
+=head2 Children
+
+  Returns an RT::Attachments object which is preloaded with all Attachments objects with this Attachment\'s Id as their 'Parent'
+
+=cut
+
+sub Children {
+    my $self = shift;
+    
+    my $kids = new RT::Attachments($self->CurrentUser);
+    $kids->ChildrenOf($self->Id);
+    return($kids);
+}
+
+# }}}
+
+# {{{ UTILITIES
+
+# {{{ sub Quote 
+
+
+
+sub Quote {
+    my $self=shift;
+    my %args=(Reply=>undef, # Prefilled reply (i.e. from the KB/FAQ system)
+	      @_);
+
+    my ($quoted_content, $body, $headers);
+    my $max=0;
+
+    # TODO: Handle Multipart/Mixed (eventually fix the link in the
+    # ShowHistory web template?)
+    if ($self->ContentType =~ m{^(text/plain|message)}i) {
+	$body=$self->Content;
+
+	# Do we need any preformatting (wrapping, that is) of the message?
+
+	# Remove quoted signature.
+	$body =~ s/\n-- \n(.*)$//s;
+
+	# What's the longest line like?
+	foreach (split (/\n/,$body)) {
+	    $max=length if ( length > $max);
+	}
+
+	if ($max>76) {
+	    require Text::Wrapper;
+	    my $wrapper=new Text::Wrapper
+		(
+		 columns => 70, 
+		 body_start => ($max > 70*3 ? '   ' : ''),
+		 par_start => ''
+		 );
+	    $body=$wrapper->wrap($body);
+	}
+
+	$body =~ s/^/> /gm;
+
+	$body = '[' . $self->TransactionObj->CreatorObj->Name() . ' - ' . $self->TransactionObj->CreatedAsString()
+	            . "]:\n\n"
+   	        . $body . "\n\n";
+
+    } else {
+	$body = "[Non-text message not quoted]\n\n";
+    }
+    
+    $max=60 if $max<60;
+    $max=70 if $max>78;
+    $max+=2;
+
+    return (\$body, $max);
+}
+# }}}
+
+# {{{ sub NiceHeaders - pulls out only the most relevant headers
+
+=head2 NiceHeaders
+
+Returns the To, From, Cc, Date and Subject headers.
+
+It is a known issue that this breaks if any of these headers are not
+properly unfolded.
+
+=cut
+
+sub NiceHeaders {
+    my $self=shift;
+    my $hdrs="";
+    for (split(/\n/,$self->Headers)) {
+	    $hdrs.="$_\n" if /^(To|From|RT-Send-Cc|Cc|Date|Subject): /i
+    }
+    return $hdrs;
+}
+# }}}
+
+# {{{ sub Headers
+
+=head2 Headers
+
+Returns this object's headers as a string.  This method specifically
+removes the RT-Send-Bcc: header, so as to never reveal to whom RT sent a Bcc.
+We need to record the RT-Send-Cc and RT-Send-Bcc values so that we can actually send
+out mail. (The mailing rules are seperated from the ticket update code by
+an abstraction barrier that makes it impossible to pass this data directly
+
+=cut
+
+sub Headers {
+    my $self = shift;
+    my $hdrs="";
+    for (split(/\n/,$self->SUPER::Headers)) {
+	    $hdrs.="$_\n" unless /^(RT-Send-Bcc): /i
+    }
+    return $hdrs;
+}
+
+
+# }}}
+
+# {{{ sub GetHeader
+
+=head2 GetHeader ( 'Tag')
+
+Returns the value of the header Tag as a string. This bypasses the weeding out
+done in Headers() above.
+
+=cut
+
+sub GetHeader {
+    my $self = shift;
+    my $tag = shift;
+    foreach my $line (split(/\n/,$self->SUPER::Headers)) {
+        $RT::Logger->debug( "Does $line match $tag\n");
+        if ($line =~ /^$tag:\s+(.*)$/i) { #if we find the header, return its value
+            return ($1);
+        }
+    }
+    
+    # we found no header. return an empty string
+    return undef;
+}
+# }}}
+
+# {{{ sub _Value 
+
+=head2 _Value
+
+Takes the name of a table column.
+Returns its value as a string, if the user passes an ACL check
+
+=cut
+
+sub _Value  {
+
+    my $self = shift;
+    my $field = shift;
+    
+    
+    #if the field is public, return it.
+    if ($self->_Accessible($field, 'public')) {
+	#$RT::Logger->debug("Skipping ACL check for $field\n");
+	return($self->__Value($field));
+	
+    }
+    
+    #If it's a comment, we need to be extra special careful
+    elsif ( (($self->TransactionObj->CurrentUserHasRight('ShowTicketComments')) and
+	     ($self->TransactionObj->Type eq 'Comment') )  or
+	    ($self->TransactionObj->CurrentUserHasRight('ShowTicket'))) {
+	
+	return($self->__Value($field));
+    }
+    #if they ain't got rights to see, don't let em
+    else {
+	    return(undef);
+	}
+    	
+    
+}
+
+# }}}
+
+# }}}
+
+1;
diff --git a/rt/lib/RT/Attachments.pm b/rt/lib/RT/Attachments.pm
new file mode 100755
index 000000000..73cd350a4
--- /dev/null
+++ b/rt/lib/RT/Attachments.pm
@@ -0,0 +1,99 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attachments.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::Attachments - a collection of RT::Attachment objects
+
+=head1 SYNOPSIS
+
+  use RT::Attachments;
+
+=head1 DESCRIPTION
+
+This module should never be called directly by client code. it's an internal module which
+should only be accessed through exported APIs in Ticket, Queue and other similar objects.
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Attachments);
+
+=end testing
+
+=cut
+
+package RT::Attachments;
+
+use RT::EasySearch;
+
+@ISA= qw(RT::EasySearch);
+
+# {{{ sub _Init  
+sub _Init   {
+  my $self = shift;
+ 
+  $self->{'table'} = "Attachments";
+  $self->{'primary_key'} = "id";
+  return ( $self->SUPER::_Init(@_));
+}
+# }}}
+
+
+# {{{ sub ContentType
+
+=head2 ContentType (VALUE => 'text/plain', ENTRYAGGREGATOR => 'OR', OPERATOR => '=' ) 
+
+Limit result set to attachments of ContentType 'TYPE'...
+
+=cut
+
+
+sub ContentType  {
+  my $self = shift;
+  my %args = ( VALUE => 'text/plain',
+	       OPERATOR => '=',
+	       ENTRYAGGREGATOR => 'OR',
+	       @_);
+
+  $self->Limit ( FIELD => 'ContentType',
+		 VALUE => $args{'VALUE'},
+		 OPERATOR => $args{'OPERATOR'},
+		 ENTRYAGGREGATOR => $args{'ENTRYAGGREGATOR'});
+}
+# }}}
+
+# {{{ sub ChildrenOf 
+
+=head2 ChildrenOf ID
+
+Limit result set to children of Attachment ID
+
+=cut
+
+
+sub ChildrenOf  {
+  my $self = shift;
+  my $attachment = shift;
+  $self->Limit ( FIELD => 'Parent',
+		 VALUE => $attachment);
+}
+# }}}
+
+# {{{ sub NewItem 
+sub NewItem  {
+  my $self = shift;
+
+  use RT::Attachment;
+  my $item = new RT::Attachment($self->CurrentUser);
+  return($item);
+}
+# }}}
+  1;
+
+
+
+
diff --git a/rt/lib/RT/Condition/AnyTransaction.pm b/rt/lib/RT/Condition/AnyTransaction.pm
new file mode 100644
index 000000000..83e5de6ce
--- /dev/null
+++ b/rt/lib/RT/Condition/AnyTransaction.pm
@@ -0,0 +1,23 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Condition/AnyTransaction.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# Copyright 1996-2001 Jesse Vincent <jesse@fsck.com> 
+# Released under the terms of the GNU General Public License
+
+package RT::Condition::AnyTransaction;
+require RT::Condition::Generic;
+
+@ISA = qw(RT::Condition::Generic);
+
+
+=head2 IsApplicable
+
+This happens on every transaction. it's always applicable
+
+=cut
+
+sub IsApplicable {
+    my $self = shift;
+    return(1);
+}
+
+1;
+
diff --git a/rt/lib/RT/Condition/Generic.pm b/rt/lib/RT/Condition/Generic.pm
new file mode 100755
index 000000000..393f4b786
--- /dev/null
+++ b/rt/lib/RT/Condition/Generic.pm
@@ -0,0 +1,170 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Condition/Generic.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# (c) 1996-2000 Jesse Vincent <jesse@fsck.com>
+# This software is redistributable under the terms of the GNU GPL
+
+=head1 NAME
+
+  RT::Condition::Generic - ;
+
+=head1 SYNOPSIS
+
+    use RT::Condition::Generic;
+    my $foo = new RT::Condition::IsApplicable( 
+		TransactionObj => $tr, 
+		TicketObj => $ti, 
+		ScripObj => $scr, 
+		Argument => $arg, 
+		Type => $type);
+
+    if ($foo->IsApplicable) {
+ 	   # do something
+    }
+
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Condition::Generic);
+
+=end testing
+
+
+=cut
+
+package RT::Condition::Generic;
+
+# {{{ sub new 
+sub new  {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self  = {};
+  bless ($self, $class);
+  $self->_Init(@_);
+  return $self;
+}
+# }}}
+
+# {{{ sub _Init 
+sub _Init  {
+  my $self = shift;
+  my %args = ( TransactionObj => undef,
+	       TicketObj => undef,
+	       ScripObj => undef,
+	       TemplateObj => undef,
+	       Argument => undef,
+	       ApplicableTransTypes => undef,
+	       @_ );
+  
+  
+  $self->{'Argument'} = $args{'Argument'};
+  $self->{'ScripObj'} = $args{'ScripObj'};
+  $self->{'TicketObj'} = $args{'TicketObj'};
+  $self->{'TransactionObj'} = $args{'TransactionObj'};
+  $self->{'ApplicableTransTypes'} = $args{'ApplicableTransTypes'};
+}
+# }}}
+
+# Access Scripwide data
+
+# {{{ sub Argument 
+
+=head2 Argument
+
+Return the optional argument associated with this ScripCondition
+
+=cut
+
+sub Argument  {
+  my $self = shift;
+  return($self->{'Argument'});
+}
+# }}}
+
+# {{{ sub TicketObj
+
+=head2 TicketObj
+
+Return the ticket object we're talking about
+
+=cut
+
+sub TicketObj  {
+  my $self = shift;
+  return($self->{'TicketObj'});
+}
+# }}}
+
+# {{{ sub TransactionObj
+
+=head2 TransactionObj
+
+Return the transaction object we're talking about
+
+=cut
+
+sub TransactionObj  {
+  my $self = shift;
+  return($self->{'TransactionObj'});
+}
+# }}}
+
+# {{{ sub Type
+
+=head2 Type 
+
+
+
+=cut
+
+sub ApplicableTransTypes  {
+  my $self = shift;
+  return($self->{'ApplicableTransTypes'});
+}
+# }}}
+
+
+# Scrip methods
+
+
+#What does this type of Action does
+
+# {{{ sub Describe 
+sub Describe  {
+  my $self = shift;
+  return ("No description for " . ref $self);
+}
+# }}}
+
+
+#Parse the templates, get things ready to go.
+
+#If this rule applies to this transaction, return true.
+
+# {{{ sub IsApplicable 
+sub IsApplicable  {
+  my $self = shift;
+  return(undef);
+}
+# }}}
+
+# {{{ sub DESTROY
+sub DESTROY {
+    my $self = shift;
+
+    # We need to clean up all the references that might maybe get
+    # oddly circular
+    $self->{'TemplateObj'} =undef
+    $self->{'TicketObj'} = undef;
+    $self->{'TransactionObj'} = undef;
+    $self->{'ScripObj'} = undef;
+     
+}
+
+# }}}
+1;
diff --git a/rt/lib/RT/Condition/NewDependency.pm b/rt/lib/RT/Condition/NewDependency.pm
new file mode 100644
index 000000000..e69de29bb
diff --git a/rt/lib/RT/Condition/StatusChange.pm b/rt/lib/RT/Condition/StatusChange.pm
new file mode 100644
index 000000000..56419b2c7
--- /dev/null
+++ b/rt/lib/RT/Condition/StatusChange.pm
@@ -0,0 +1,30 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Condition/StatusChange.pm,v 1.1 2002-08-12 06:17:08 ivan Exp $
+# Copyright 1996-2001 Jesse Vincent <jesse@fsck.com> 
+# Released under the terms of the GNU General Public License
+
+package RT::Condition::StatusChange;
+require RT::Condition::Generic;
+
+@ISA = qw(RT::Condition::Generic);
+
+
+=head2 IsApplicable
+
+If the argument passed in is equivalent to the new value of
+the Status Obj
+
+=cut
+
+sub IsApplicable {
+    my $self = shift;
+    if (($self->TransactionObj->Field eq 'Status') and 
+    ($self->Argument eq $self->TransactionObj->NewValue())) {
+	return(1);
+    } 
+    else {
+	return(undef);
+    }
+}
+
+1;
+
diff --git a/rt/lib/RT/CurrentUser.pm b/rt/lib/RT/CurrentUser.pm
new file mode 100755
index 000000000..6997ddbac
--- /dev/null
+++ b/rt/lib/RT/CurrentUser.pm
@@ -0,0 +1,270 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/CurrentUser.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# (c) 1996-1999 Jesse Vincent <jesse@fsck.com>
+# This software is redistributable under the terms of the GNU GPL
+
+=head1 NAME
+
+  RT::CurrentUser - an RT object representing the current user
+
+=head1 SYNOPSIS
+
+  use RT::CurrentUser
+
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::CurrentUser);
+
+=end testing
+
+=cut
+
+
+package RT::CurrentUser;
+use RT::Record;
+@ISA= qw(RT::Record);
+
+
+# {{{ sub _Init 
+
+#The basic idea here is that $self->CurrentUser is always supposed
+# to be a CurrentUser object. but that's hard to do when we're trying to load
+# the CurrentUser object
+
+sub _Init  {
+  my $self = shift;
+  my $Name = shift;
+
+  $self->{'table'} = "Users";
+
+  if (defined($Name)) {
+    $self->Load($Name);
+  }
+  
+  $self->_MyCurrentUser($self);
+
+}
+# }}}
+
+# {{{ sub Create
+
+sub Create {
+    return (0, 'Permission Denied');
+}
+
+# }}}
+
+# {{{ sub Delete
+
+sub Delete {
+    return (0, 'Permission Denied');
+}
+
+# }}}
+
+# {{{ sub UserObj
+
+=head2 UserObj
+
+  Returns the RT::User object associated with this CurrentUser object.
+
+=cut
+
+sub UserObj {
+    my $self = shift;
+    
+    unless ($self->{'UserObj'}) {
+	use RT::User;
+	$self->{'UserObj'} = RT::User->new($self);
+	unless ($self->{'UserObj'}->Load($self->Id)) {
+	    $RT::Logger->err("Couldn't load ".$self->Id. "from the users database.\n");
+	}
+	
+    }
+    return ($self->{'UserObj'});
+}
+# }}}
+
+# {{{ sub _Accessible 
+sub _Accessible  {
+  my $self = shift;
+  my %Cols = (
+	      Name => 'read',
+	      Gecos => 'read',
+	      RealName => 'read',
+	      Password => 'neither',
+	      EmailAddress => 'read',
+	      Privileged => 'read',
+	      IsAdministrator => 'read'
+	     );
+  return($self->SUPER::_Accessible(@_, %Cols));
+}
+# }}}
+
+# {{{ sub LoadByEmail
+
+=head2 LoadByEmail
+
+Loads a User into this CurrentUser object.
+Takes the email address of the user to load.
+
+=cut
+
+sub LoadByEmail  {
+    my $self = shift;
+    my $identifier = shift;
+        
+    $self->LoadByCol("EmailAddress",$identifier);
+    
+}
+# }}}
+
+# {{{ sub LoadByGecos
+
+=head2 LoadByGecos
+
+Loads a User into this CurrentUser object.
+Takes a unix username as its only argument.
+
+=cut
+
+sub LoadByGecos  {
+    my $self = shift;
+    my $identifier = shift;
+        
+    $self->LoadByCol("Gecos",$identifier);
+    
+}
+# }}}
+
+# {{{ sub LoadByName
+
+=head2 LoadByName
+
+Loads a User into this CurrentUser object.
+Takes a Name.
+=cut
+
+sub LoadByName {
+    my $self = shift;
+    my $identifier = shift;
+    $self->LoadByCol("Name",$identifier);
+    
+}
+# }}}
+
+# {{{ sub Load 
+
+=head2 Load
+
+Loads a User into this CurrentUser object.
+Takes either an integer (users id column reference) or a Name
+The latter is deprecated. Instead, you should use LoadByName.
+Formerly, this routine also took email addresses. 
+
+=cut
+
+sub Load  {
+  my $self = shift;
+  my $identifier = shift;
+
+  #if it's an int, load by id. otherwise, load by name.
+  if ($identifier !~ /\D/) {
+    $self->SUPER::LoadById($identifier);
+  }
+  else {
+      # This is a bit dangerous, we might get false authen if somebody
+      # uses ambigous userids or real names:
+      $self->LoadByCol("Name",$identifier);
+  }
+}
+
+# }}}
+
+# {{{ sub IsPassword
+
+=head2 IsPassword
+
+Takes a password as a string.  Passes it off to IsPassword in this
+user's UserObj.  If it is the user's password and the user isn't
+disabled, returns 1.
+
+Otherwise, returns undef.
+
+=cut
+
+sub IsPassword { 
+  my $self = shift;
+  my $value = shift;
+  
+  return ($self->UserObj->IsPassword($value)); 
+}
+
+# }}}
+
+# {{{ sub Privileged
+
+=head2 Privileged
+
+Returns true if the current user can be granted rights and be
+a member of groups.
+
+=cut
+
+sub Privileged {
+    my $self = shift;
+    return ($self->UserObj->Privileged());
+}
+
+# }}}
+
+# {{{ Convenient ACL methods
+
+=head2 HasQueueRight
+
+calls $self->UserObj->HasQueueRight with the arguments passed in
+
+=cut
+
+sub HasQueueRight {
+	my $self = shift;
+	return ($self->UserObj->HasQueueRight(@_));
+}
+
+=head2 HasSystemRight
+
+calls $self->UserObj->HasSystemRight with the arguments passed in
+
+=cut
+
+
+sub HasSystemRight {
+	my $self = shift;
+	return ($self->UserObj->HasSystemRight(@_));
+}
+# }}}
+
+# {{{ sub HasRight
+
+=head2 HasSystemRight
+
+calls $self->UserObj->HasRight with the arguments passed in
+
+=cut
+
+sub HasRight {
+  my $self = shift;
+  return ($self->UserObj->HasRight(@_));
+}
+
+# }}}
+
+1;
+ 
diff --git a/rt/lib/RT/Date.pm b/rt/lib/RT/Date.pm
new file mode 100644
index 000000000..d56997174
--- /dev/null
+++ b/rt/lib/RT/Date.pm
@@ -0,0 +1,436 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Date.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# (c) 1996-2000 Jesse Vincent <jesse@fsck.com>
+# This software is redistributable under the terms of the GNU GPL
+
+=head1 NAME
+
+  RT::Date - a simple Object Oriented date.
+
+=head1 SYNOPSIS
+
+  use RT::Date
+
+=head1 DESCRIPTION
+
+RT Date is a simple Date Object designed to be speedy and easy for RT to use
+
+The fact that it assumes that a time of 0 means "never" is probably a bug.
+
+=begin testing
+
+ok (require RT::Date);
+
+=end testing
+
+=head1 METHODS
+
+=cut
+
+
+package RT::Date;
+use Time::Local;
+use vars qw($MINUTE $HOUR $DAY $WEEK $MONTH $YEAR);
+
+$MINUTE = 60;
+$HOUR   = 60 * $MINUTE;
+$DAY    = 24 * $HOUR;
+$WEEK   = 7 * $DAY;
+$MONTH  = 4 * $WEEK;
+$YEAR   = 365 * $DAY;
+
+# {{{ sub new 
+
+sub new  {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self  = {};
+  bless ($self, $class);
+  $self->Unix(0);
+  return $self;
+}
+
+# }}}
+
+# {{{ sub Set
+
+=head2 sub Set
+
+takes a param hash with the fields 'Format' and 'Value'
+
+if $args->{'Format'} is 'unix', takes the number of seconds since the epoch 
+
+If $args->{'Format'} is ISO, tries to parse an ISO date.
+
+If $args->{'Format'} is 'unknown', require Date::Parse and make it figure things
+out. This is a heavyweight operation that should never be called from within 
+RT's core. But it's really useful for something like the textbox date entry
+where we let the user do whatever they want.
+
+If $args->{'Value'}  is 0, assumes you mean never.
+
+
+=cut
+
+sub Set {
+    my $self = shift;
+    my %args = ( Format => 'unix',
+		 Value => time,
+		 @_);
+    if (($args{'Value'} =~ /^\d*$/) and ($args{'Value'} == 0)) {
+	$self->Unix(-1);
+	return($self->Unix());
+    }
+
+    if ($args{'Format'} =~ /^unix$/i) {
+	$self->Unix($args{'Value'});
+    }
+    
+    elsif ($args{'Format'} =~ /^(sql|datemanip|iso)$/i) {
+	
+	if (($args{'Value'} =~ /^(\d{4}?)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) ||
+	    ($args{'Value'} =~ /^(\d{4}?)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)$/) ||
+	    ($args{'Value'} =~ /^(\d{4}?)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)\+00$/) ||
+	    ($args{'Value'} =~ /^(\d{4}?)(\d\d)(\d\d)(\d\d):(\d\d):(\d\d)$/)) {
+	    
+        my $year = $1;
+	    my $mon = $2;
+	    my $mday = $3;
+	    my $hours = $4;
+	    my $min = $5;
+	    my $sec = $6;
+	    
+	    #timegm expects month as 0->11
+	    $mon--;
+	    
+	    #now that we've parsed it, deal with the case where everything
+	    #was 0
+            if ($mon == -1) {
+	            $self->Unix(-1);
+	        } else {
+
+		    #Dateamnip strings aren't in GMT.
+		    if ($args{'Format'} =~ /^datemanip$/i) {
+			$self->Unix(timelocal($sec,$min,$hours,$mday,$mon,$year));
+		    }
+		    #ISO and SQL dates are in GMT
+		    else {
+			$self->Unix(timegm($sec,$min,$hours,$mday,$mon,$year));
+		    }
+		    
+		    $self->Unix(-1) unless $self->Unix;
+		}
+   }  
+	else {
+	    use Carp;
+	    Carp::cluck;
+	    $RT::Logger->debug( "Couldn't parse date $args{'Value'} as a $args{'Format'}");
+	    
+	}
+    }
+    elsif ($args{'Format'} =~ /^unknown$/i) {
+        require Date::Parse;
+        #Convert it to an ISO format string 
+        
+	my $date = Date::Parse::str2time($args{'Value'});
+        
+	#This date has now been set to a date in the _local_ timezone.
+	#since ISO dates are known to be in GMT (for RT's purposes);
+	
+	$RT::Logger->debug("RT::Date used date::parse to make ".$args{'Value'} . " $date\n");
+        
+	
+	return ($self->Set( Format => 'unix', Value => "$date"));
+    }                                                    
+    else {
+	die "Unknown Date format: ".$args{'Format'}."\n";
+    }
+    
+    return($self->Unix());
+}
+
+# }}}
+
+# {{{ sub SetToMidnight 
+
+=head2 SetToMidnight
+
+Sets the date to midnight (at the beginning of the day) GMT
+Returns the unixtime at midnight.
+
+=cut
+
+sub SetToMidnight {
+    my $self = shift;
+    
+    use Time::Local;
+    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday) = gmtime($self->Unix);
+    $self->Unix(timegm (0,0,0,$mday,$mon,$year,$wday,$yday));
+    
+    return ($self->Unix);
+    
+    
+}
+
+
+# }}}
+
+# {{{ sub SetToNow
+sub SetToNow {
+	my $self = shift;
+	return($self->Set(Format => 'unix', Value => time))
+}
+# }}}
+
+# {{{ sub Diff
+
+=head2 Diff
+
+Takes either an RT::Date object or the date in unixtime format as a string
+
+Returns the differnce between $self and that time as a number of seconds
+
+=cut
+
+sub Diff {
+    my $self = shift;
+    my $other = shift;
+
+    if (ref($other) eq 'RT::Date') {
+	$other=$other->Unix;
+    }
+    return ($self->Unix - $other);
+}
+# }}}
+
+# {{{ sub DiffAsString
+
+=head2 sub DiffAsString
+
+Takes either an RT::Date object or the date in unixtime format as a string
+
+Returns the differnce between $self and that time as a number of seconds as
+as string fit for human consumption
+
+=cut
+
+sub DiffAsString {
+    my $self = shift;
+    my $other = shift;
+
+
+    if ($other < 1) {
+	return ("");
+    }
+    if ($self->Unix < 1) {
+	return("");
+    }
+    my $diff = $self->Diff($other);
+
+    return ($self->DurationAsString($diff));
+}
+# }}}
+
+# {{{ sub DurationAsString
+
+=head2 DurationAsString
+
+Takes a number of seconds. returns a string describing that duration
+
+=cut
+
+sub DurationAsString{
+
+    my $self=shift;
+    my $duration = shift;
+    
+    my ($negative, $s);
+    
+    $negative = 'ago' if ($duration < 0);
+
+    $duration = abs($duration);
+
+    if($duration < $MINUTE) {
+	$s=$duration;
+	$string="sec";
+    } elsif($duration < (2 * $HOUR)) {
+	$s = int($duration/$MINUTE);
+	$string="min";
+    } elsif($duration < (2 * $DAY)) {
+	$s = int($duration/$HOUR);
+	$string="hours";
+    } elsif($duration < (2 * $WEEK)) {
+	$s = int($duration/$DAY);
+	$string="days";
+    } elsif($duration < (2 * $MONTH)) {
+	$s = int($duration/$WEEK);
+	$string="weeks";
+    } elsif($duration < $YEAR) {
+	$s = int($duration/$MONTH);
+	$string="months";
+    } else {
+	$s = int($duration/$YEAR);
+	$string="years";
+    }
+    
+    return ("$s $string $negative");
+}
+
+# }}}
+
+# {{{ sub AgeAsString
+
+=head2 sub AgeAsString
+
+Takes nothing
+
+Returns a string that's the differnce between the time in the object and now
+
+=cut
+
+sub AgeAsString {
+    my $self = shift;
+    return ($self->DiffAsString(time));
+    }
+# }}}
+
+# {{{ sub AsString
+
+=head2 sub AsString
+
+Returns the object\'s time as a string with the current timezone.
+
+=cut
+
+sub AsString {
+    my $self = shift;
+    return ("Not set") if ($self->Unix <= 0);
+
+    return (scalar(localtime($self->Unix)));
+}
+# }}}
+
+# {{{ sub AddSeconds
+
+=head2 sub AddSeconds
+
+Takes a number of seconds as a string
+
+Returns the new time
+
+=cut
+
+sub AddSeconds {
+    my $self = shift;
+    my $delta = shift;
+    
+    $self->Set(Format => 'unix', Value => ($self->Unix + $delta));
+    
+    return ($self->Unix);
+    
+
+}
+
+# }}}
+
+# {{{ sub AddDays
+
+=head2 AddDays $DAYS
+
+Adds 24 hours * $DAYS to the current time
+
+=cut
+
+sub AddDays {
+    my $self = shift;
+    my $days = shift;
+    $self->AddSeconds($days * $DAY);
+    
+}
+
+# }}}
+
+# {{{ sub AddDay
+
+=head2 AddDay
+
+Adds 24 hours to the current time
+
+=cut
+
+sub AddDay {
+    my $self = shift;
+    $self->AddSeconds($DAY);
+    
+}
+
+# }}}
+
+# {{{ sub Unix
+
+=head2 sub Unix [unixtime]
+
+Optionally takes a date in unix seconds since the epoch format.
+Returns the number of seconds since the epoch
+
+=cut
+
+sub Unix {
+    my $self = shift;
+    
+    $self->{'time'} = shift if (@_);
+    
+    return ($self->{'time'});
+}
+# }}}
+
+# {{{ sub ISO
+
+=head2 ISO
+
+Takes nothing
+
+Returns the object's date in ISO format
+
+=cut
+
+sub ISO {
+    my $self=shift;
+    my    ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst, $date) ;
+    
+    return ('1970-01-01 00:00:00') if ($self->Unix == -1);
+
+    #  0    1    2     3     4    5     6     7     8
+    ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime($self->Unix);
+    #make the year YYYY
+    $year+=1900;
+
+    #the month needs incrementing, as gmtime returns 0-11
+    $mon++;
+        
+    $date = sprintf("%04d-%02d-%02d %02d:%02d:%02d", $year,$mon,$mday, $hour,$min,$sec);
+    
+    return ($date);
+}
+
+# }}}
+
+
+# {{{ sub LocalTimezone 
+=head2 LocalTimezone
+
+  Returns the current timezone. For now, draws off a system timezone, RT::Timezone. Eventually, this may
+pull from a 'Timezone' attribute of the CurrentUser
+
+=cut
+
+sub LocalTimezone {
+    my $self = shift;
+    
+    return ($RT::Timezone);
+}
+
+# }}}
+
+
+
+1;
diff --git a/rt/lib/RT/EasySearch.pm b/rt/lib/RT/EasySearch.pm
new file mode 100755
index 000000000..bcbfa01b2
--- /dev/null
+++ b/rt/lib/RT/EasySearch.pm
@@ -0,0 +1,115 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/EasySearch.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::EasySearch - a baseclass for RT collection objects
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::EasySearch);
+
+=end testing
+
+
+=cut
+
+package RT::EasySearch;
+use DBIx::SearchBuilder;
+@ISA= qw(DBIx::SearchBuilder);
+
+# {{{ sub _Init 
+sub _Init  {
+    my $self = shift;
+    
+    $self->{'user'} = shift;
+    unless(defined($self->CurrentUser)) {
+	use Carp;
+	Carp::confess("$self was created without a CurrentUser");
+	$RT::Logger->err("$self was created without a CurrentUser\n"); 
+	return(0);
+    }
+    $self->SUPER::_Init( 'Handle' => $RT::Handle);
+}
+# }}}
+
+# {{{ sub LimitToEnabled
+
+=head2 LimitToEnabled
+
+Only find items that haven\'t been disabled
+
+=cut
+
+sub LimitToEnabled {
+    my $self = shift;
+    
+    $self->Limit( FIELD => 'Disabled',
+		  VALUE => '0',
+		  OPERATOR => '=' );
+}
+# }}}
+
+# {{{ sub LimitToDisabled
+
+=head2 LimitToDeleted
+
+Only find items that have been deleted.
+
+=cut
+
+sub LimitToDeleted {
+    my $self = shift;
+    
+    $self->{'find_disabled_rows'} = 1;
+    $self->Limit( FIELD => 'Disabled',
+		  OPERATOR => '=',
+		  VALUE => '1'
+		);
+}
+# }}}
+
+
+# {{{ sub Limit 
+
+=head2 Limit PARAMHASH
+
+This Limit sub calls SUPER::Limit, but defaults "CASESENSITIVE" to 1, thus
+making sure that by default lots of things don't do extra work trying to 
+match lower(colname) agaist lc($val);
+
+=cut
+
+sub Limit {
+	my $self = shift;
+	my %args = ( CASESENSITIVE => 1,
+		     @_ );
+
+   return $self->SUPER::Limit(%args);
+}
+
+# {{{ sub CurrentUser 
+
+=head2 CurrentUser
+
+  Returns the current user as an RT::User object.
+
+=cut
+
+sub CurrentUser  {
+  my $self = shift;
+  return ($self->{'user'});
+}
+# }}}
+    
+
+1;
+
+
diff --git a/rt/lib/RT/Group.pm b/rt/lib/RT/Group.pm
new file mode 100755
index 000000000..005601f5e
--- /dev/null
+++ b/rt/lib/RT/Group.pm
@@ -0,0 +1,364 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Group.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# Copyright 2000 Jesse Vincent <jesse@fsck.com>
+# Released under the terms of the GNU Public License
+#
+#
+
+=head1 NAME
+
+  RT::Group - RT\'s group object
+
+=head1 SYNOPSIS
+
+  use RT::Group;
+my $group = new RT::Group($CurrentUser);
+
+=head1 DESCRIPTION
+
+An RT group object.
+
+=head1 AUTHOR
+
+Jesse Vincent, jesse@fsck.com
+
+=head1 SEE ALSO
+
+RT
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Group);
+
+=end testing
+
+=cut
+
+
+package RT::Group;
+use RT::Record;
+use RT::GroupMember;
+use RT::ACE;
+
+use vars qw|@ISA|;
+@ISA= qw(RT::Record);
+
+
+# {{{ sub _Init
+sub _Init  {
+  my $self = shift; 
+  $self->{'table'} = "Groups";
+  return ($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub _Accessible 
+sub _Accessible  {
+    my $self = shift;
+    my %Cols = (
+		Name => 'read/write',
+		Description => 'read/write',
+		Pseudo => 'read'
+	       );
+    return $self->SUPER::_Accessible(@_, %Cols);
+}
+# }}}
+
+# {{{ sub Load 
+
+=head2 Load
+
+Load a group object from the database. Takes a single argument.
+If the argument is numerical, load by the column 'id'. Otherwise, load by
+the "Name" column which is the group's textual name
+
+=cut
+
+sub Load  {
+    my $self = shift;
+    my $identifier = shift || return undef;
+    
+    #if it's an int, load by id. otherwise, load by name.
+    if ($identifier !~ /\D/) {
+	$self->SUPER::LoadById($identifier);
+    }
+    else {
+	$self->LoadByCol("Name",$identifier);
+    }
+}
+
+# }}}
+
+# {{{ sub Create
+
+=head2 Create
+
+Takes a paramhash with three named arguments: Name, Description and Pseudo.
+Pseudo is used internally by RT for certain special ACL decisions.
+
+=cut
+
+sub Create {
+    my $self = shift;
+    my %args = ( Name => undef,
+		 Description => undef,
+		 Pseudo => 0,
+		 @_);
+    
+    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
+	$RT::Logger->warning($self->CurrentUser->Name ." Tried to create a group without permission.");
+	return(0, 'Permission Denied');
+    }
+    
+    my $retval = $self->SUPER::Create(Name => $args{'Name'},
+				      Description => $args{'Description'},
+				      Pseudo => $args{'Pseudo'});
+    
+    return ($retval);
+}
+
+# }}}
+
+# {{{ sub Delete
+
+=head2 Delete
+
+Delete this object
+
+=cut
+
+sub Delete {
+    my $self = shift;
+    
+    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
+	return (0, 'Permission Denied');
+    }
+    
+    return($self->SUPER::Delete(@_));    
+}
+
+# }}}
+
+# {{{ MembersObj
+
+=head2 MembersObj
+
+Returns an RT::GroupMembers object of this group's members.
+
+=cut
+
+sub MembersObj {
+    my $self = shift;
+    unless (defined $self->{'members_obj'}) {
+	use RT::GroupMembers;
+        $self->{'members_obj'} = new RT::GroupMembers($self->CurrentUser);
+	
+	#If we don't have rights, don't include any results
+	$self->{'members_obj'}->LimitToGroup($self->id);
+	
+    }
+    return ($self->{'members_obj'});
+    
+}
+
+# }}}
+
+# {{{ AddMember
+
+=head2 AddMember
+
+AddMember adds a user to this group.  It takes a user id.
+Returns a two value array. the first value is true on successful 
+addition or 0 on failure.  The second value is a textual status msg.
+
+=cut
+
+sub AddMember {
+    my $self = shift;
+    my $new_member = shift;
+
+    my $new_member_obj = new RT::User($self->CurrentUser);
+    $new_member_obj->Load($new_member);
+    
+    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
+        #User has no permission to be doing this
+        return(0, "Permission Denied");
+    }
+
+    unless ($new_member_obj->Id) {
+	$RT::Logger->debug("Couldn't find user $new_member");
+	return(0, "Couldn't find user");
+    }	
+
+    if ($self->HasMember($new_member_obj->Id)) {
+        #User is already a member of this group. no need to add it
+        return(0, "Group already has member");
+    }
+    
+    my $member_object = new RT::GroupMember($self->CurrentUser);
+    $member_object->Create( UserId => $new_member_obj->Id, 
+			    GroupId => $self->id );
+    return(1, "Member added");
+}
+
+# }}}
+
+# {{{ HasMember
+
+=head2 HasMember
+
+Takes a user Id and returns a GroupMember Id if that user is a member of 
+this group.
+Returns undef if the user isn't a member of the group or if the current
+user doesn't have permission to find out. Arguably, it should differentiate
+between ACL failure and non membership.
+
+=cut
+
+sub HasMember {
+    my $self = shift;
+    my $user_id = shift;
+
+    #Try to cons up a member object using "LoadByCols"
+
+    my $member_obj = new RT::GroupMember($self->CurrentUser);
+    $member_obj->LoadByCols( UserId => $user_id, GroupId => $self->id);
+
+    #If we have a member object
+    if (defined $member_obj->id) {
+        return ($member_obj->id);
+    }
+
+    #If Load returns no objects, we have an undef id. 
+    else {
+        return(undef);
+    } 
+}
+
+# }}}
+
+# {{{ DeleteMember
+
+=head2 DeleteMember
+
+Takes the user id of a member.
+If the current user has apropriate rights,
+removes that GroupMember from this group.
+Returns a two value array. the first value is true on successful 
+addition or 0 on failure.  The second value is a textual status msg.
+
+=cut
+
+sub DeleteMember {
+    my $self = shift;
+    my $member = shift;
+
+    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
+        #User has no permission to be doing this
+        return(0,"Permission Denied");
+    }
+
+    my $member_user_obj = new RT::User($self->CurrentUser);
+    $member_user_obj->Load($member);
+    
+    unless ($member_user_obj->Id) {
+	$RT::Logger->debug("Couldn't find user $member");
+	return(0, "User not found");
+    }	
+
+    my $member_obj = new RT::GroupMember($self->CurrentUser);
+    unless ($member_obj->LoadByCols ( UserId => $member_user_obj->Id,
+				      GroupId => $self->Id )) {
+	return(0, "Couldn\'t load member");  #couldn\'t load member object
+    }
+    
+    #If we couldn't load it, return undef.
+    unless ($member_obj->Id()) {
+	return (0, "Group has no such member");
+    }	
+    
+    #Now that we've checked ACLs and sanity, delete the groupmember
+    my $val = $member_obj->Delete();
+    if ($val) {
+	return ($val, "Member deleted");
+    }
+    else {
+	return (0, "Member not deleted");
+    }
+}
+
+# }}}
+
+# {{{ ACL Related routines
+
+# {{{ GrantQueueRight
+
+=head2 GrantQueueRight
+
+Grant a queue right to this group.  Takes a paramhash of which the elements
+RightAppliesTo and RightName are important.
+
+=cut
+
+sub GrantQueueRight {
+    
+    my $self = shift;
+    my %args = ( RightScope => 'Queue',
+		 RightName => undef,
+		 RightAppliesTo => undef,
+		 PrincipalType => 'Group',
+		 PrincipalId => $self->Id,
+		 @_);
+   
+    #ACLs get checked in ACE.pm
+    
+    my $ace = new RT::ACE($self->CurrentUser);
+    
+    return ($ace->Create(%args));
+}
+
+# }}}
+
+# {{{ GrantSystemRight
+
+=head2 GrantSystemRight
+
+Grant a system right to this group. 
+The only element that's important to set is RightName.
+
+=cut
+sub GrantSystemRight {
+    
+    my $self = shift;
+    my %args = ( RightScope => 'System',
+		 RightName => undef,
+		 RightAppliesTo => 0,
+		 PrincipalType => 'Group',
+		 PrincipalId => $self->Id,
+		 @_);
+    
+    # ACLS get checked in ACE.pm
+    
+    my $ace = new RT::ACE($self->CurrentUser);
+    return ($ace->Create(%args));
+}
+
+
+# }}}
+
+
+# {{{ sub _Set
+sub _Set {
+    my $self = shift;
+
+    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
+	return (0, 'Permission Denied');
+    }	
+
+    return ($self->SUPER::_Set(@_));
+
+}
+# }}}
diff --git a/rt/lib/RT/GroupMember.pm b/rt/lib/RT/GroupMember.pm
new file mode 100755
index 000000000..69de50b42
--- /dev/null
+++ b/rt/lib/RT/GroupMember.pm
@@ -0,0 +1,136 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/GroupMember.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# Copyright 2000 Jesse Vincent <jesse@fsck.com>
+# Released under the terms of the GNU Public License
+
+=head1 NAME
+
+  RT::GroupMember - a member of an RT Group
+
+=head1 SYNOPSIS
+
+RT::GroupMember should never be called directly. It should generally
+only be accessed through the helper functions in RT::Group;
+
+=head1 DESCRIPTION
+
+
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::GroupMember);
+
+=end testing
+
+
+=cut
+
+package RT::GroupMember;
+use RT::Record;
+use vars qw|@ISA|;
+@ISA= qw(RT::Record);
+
+# {{{ sub _Init
+sub _Init {
+  my $self = shift; 
+  $self->{'table'} = "GroupMembers";
+  return($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub _Accessible 
+sub _Accessible  {
+    my $self = shift;
+    my %Cols = (
+		GroupId => 'read',
+		UserId => 'read'
+		);
+
+    return $self->SUPER::_Accessible(@_, %Cols);
+}
+# }}}
+
+# {{{ sub Create
+
+# a helper method for Add
+
+sub Create {
+    my $self = shift;
+    my %args = ( GroupId => undef,
+		 UserId => undef,
+		 @_
+	       );
+    
+    unless( $self->CurrentUser->HasSystemRight('AdminGroups')) {
+	return (0, 'Permission Denied');
+    }
+
+    return ($self->SUPER::Create(GroupId => $args{'GroupId'},
+				 UserId => $args{'UserId'}))
+}
+# }}}
+
+# {{{ sub Add
+
+=head2 Add
+
+Takes a paramhash of UserId and GroupId.  makes that user a memeber
+of that group
+
+=cut
+
+sub Add {
+    my $self = shift;
+    return ($self->Create(@_));
+}
+# }}}
+
+# {{{ sub Delete
+
+=head2 Delete
+
+Takes no arguments. deletes the currently loaded member from the 
+group in question.
+
+=cut
+
+sub Delete {
+    my $self = shift;
+    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
+	return (0, 'Permission Denied');
+    }
+    return($self->SUPER::Delete(@_));
+}
+
+# }}}
+
+# {{{ sub UserObj
+
+=head2 UserObj
+
+Returns an RT::User object for the user specified by $self->UserId
+
+=cut
+
+sub UserObj {
+    my $self = shift;
+    unless (defined ($self->{'user_obj'})) {
+        $self->{'user_obj'} = new RT::User($self->CurrentUser);
+        $self->{'user_obj'}->Load($self->UserId);
+    }
+    return($self->{'user_obj'});
+}
+
+# {{{ sub _Set
+sub _Set {
+    my $self = shift;
+    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
+	return (0, 'Permission Denied');
+    }
+    return($self->SUPER::_Set(@_));
+}
+# }}}
diff --git a/rt/lib/RT/GroupMembers.pm b/rt/lib/RT/GroupMembers.pm
new file mode 100755
index 000000000..a90a2a899
--- /dev/null
+++ b/rt/lib/RT/GroupMembers.pm
@@ -0,0 +1,73 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/GroupMembers.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::GroupMembers - a collection of RT::GroupMember objects
+
+=head1 SYNOPSIS
+
+  use RT::GroupMembers;
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::GroupMembers);
+
+=end testing
+
+=cut
+
+package RT::GroupMembers;
+use RT::EasySearch;
+use RT::GroupMember;
+
+@ISA= qw(RT::EasySearch);
+
+
+# {{{ sub _Init  
+sub _Init   {
+  my $self = shift;
+ 
+  $self->{'table'} = "GroupMembers";
+  $self->{'primary_key'} = "id";
+  return ( $self->SUPER::_Init(@_) );
+}
+# }}}
+
+# {{{ sub LimitToGroup
+
+=head2 LimitToGroup
+
+Takes a group id as its only argument.  Limits the current search to that
+group object
+
+=cut
+
+sub LimitToGroup {
+    my $self = shift;
+    my $group = shift;
+
+    return ($self->Limit( 
+                         VALUE => "$group",
+                         FIELD => 'GroupId',
+                         ENTRYAGGREGATOR => 'OR',
+                         ));
+
+}
+# }}}
+
+# {{{ sub NewItem 
+
+sub NewItem  {
+    my $self = shift;
+    return(RT::GroupMember->new($self->CurrentUser))
+}
+
+# }}}
+1;
diff --git a/rt/lib/RT/Groups.pm b/rt/lib/RT/Groups.pm
new file mode 100755
index 000000000..f44f1fdb3
--- /dev/null
+++ b/rt/lib/RT/Groups.pm
@@ -0,0 +1,100 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Groups.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::Groups - a collection of RT::Group objects
+
+=head1 SYNOPSIS
+
+  use RT::Groups;
+  my $groups = $RT::Groups->new($CurrentUser);
+  $groups->LimitToReal();
+  while (my $group = $groups->Next()) {
+     print $group->Id ." is a group id\n";
+  }
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Groups);
+
+=end testing
+
+=cut
+
+package RT::Groups;
+use RT::EasySearch;
+use RT::Groups;
+
+@ISA= qw(RT::EasySearch);
+
+# {{{ sub _Init
+
+sub _Init { 
+  my $self = shift;
+  $self->{'table'} = "Groups";
+  $self->{'primary_key'} = "id";
+
+  $self->OrderBy( ALIAS => 'main',
+		  FIELD => 'Name',
+		  ORDER => 'ASC');
+
+
+  return ( $self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ LimitToReal
+
+=head2 LimitToReal
+
+Make this groups object return only "real" groups, which can be
+granted rights and have members assigned to them
+
+=cut
+
+sub LimitToReal {
+    my $self = shift;
+
+    return ($self->Limit( FIELD => 'Pseudo',
+			  VALUE => '0',
+			  OPERATOR => '='));
+
+}
+# }}}
+
+# {{{ sub LimitToPseudo
+
+=head2 LimitToPseudo
+
+Make this groups object return only "pseudo" groups, which can be
+granted rights but whose membership lists are determined dynamically.
+
+=cut
+  
+  sub LimitToPseudo {
+    my $self = shift;
+
+    return ($self->Limit( FIELD => 'Pseudo',
+			  VALUE => '1',
+			  OPERATOR => '='));
+
+}
+# }}}
+
+# {{{ sub NewItem 
+sub NewItem  {
+  my $self = shift;
+  return (RT::Group->new($self->CurrentUser));
+}
+# }}}
+
+
+1;
+
diff --git a/rt/lib/RT/Handle.pm b/rt/lib/RT/Handle.pm
new file mode 100644
index 000000000..6b74f361b
--- /dev/null
+++ b/rt/lib/RT/Handle.pm
@@ -0,0 +1,53 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Handle.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::Handle - RT's database handle
+
+=head1 SYNOPSIS
+
+  use RT::Handle;
+
+=head1 DESCRIPTION
+
+=begin testing
+
+ok(require RT::Handle);
+
+=end testing
+
+=head1 METHODS
+
+=cut
+
+package RT::Handle;
+
+eval "use DBIx::SearchBuilder::Handle::$RT::DatabaseType;
+
+\@ISA= qw(DBIx::SearchBuilder::Handle::$RT::DatabaseType);";
+
+#TODO check for errors here.
+
+=head2 Connect
+
+Takes nothing. Calls SUPER::Connect with the needed args
+
+=cut
+
+sub Connect {
+my $self=shift;
+
+# Unless the database port is a positive integer, we really don't want to pass it.
+$RT::DatabasePort = undef unless (defined $RT::DatabasePort && $RT::DatabasePort =~ /^(\d+)$/);
+
+$self->SUPER::Connect(Host => $RT::DatabaseHost, 
+			 Database => $RT::DatabaseName, 
+			 User => $RT::DatabaseUser,
+			 Password => $RT::DatabasePassword,
+			 Port => $RT::DatabasePort,
+			 Driver => $RT::DatabaseType,
+			 RequireSSL => $RT::DatabaseRequireSSL,
+			);
+   
+}
+1;
diff --git a/rt/lib/RT/Interface/CLI.pm b/rt/lib/RT/Interface/CLI.pm
new file mode 100644
index 000000000..a3bf92d5f
--- /dev/null
+++ b/rt/lib/RT/Interface/CLI.pm
@@ -0,0 +1,224 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Interface/CLI.pm,v 1.1 2002-08-12 06:17:08 ivan Exp $
+# RT is (c) 1996-2001 Jesse Vincent <jesse@fsck.com>
+
+package RT::Interface::CLI;
+
+use strict;
+
+
+BEGIN {
+    use Exporter ();
+    use vars qw ($VERSION  @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+    
+    # set the version for version checking
+    $VERSION = do { my @r = (q$Revision: 1.1 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
+    
+    @ISA         = qw(Exporter);
+    
+    # your exported package globals go here,
+    # as well as any optionally exported functions
+    @EXPORT_OK   = qw(&CleanEnv &LoadConfig &DBConnect 
+		      &GetCurrentUser &GetMessageContent &debug);
+}
+
+=head1 NAME
+
+  RT::Interface::CLI - helper functions for creating a commandline RT interface
+
+=head1 SYNOPSIS
+
+  use lib "!!RT_LIB_PATH!!";
+  use lib "!!RT_ETC_PATH!!";
+
+  use RT::Interface::CLI  qw(CleanEnv LoadConfig DBConnect 
+	  		   GetCurrentUser GetMessageContent);
+
+  #Clean out all the nasties from the environment
+  CleanEnv();
+
+  #Load etc/config.pm and drop privs
+  LoadConfig();
+
+  #Connect to the database and get RT::SystemUser and RT::Nobody loaded
+  DBConnect();
+
+
+  #Get the current user all loaded
+  my $CurrentUser = GetCurrentUser();
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing
+
+ok(require RT::TestHarness);
+ok(require RT::Interface::CLI);
+
+=end testing
+
+=cut
+
+
+=head2 CleanEnv
+
+Removes some of the nastiest nasties from the user\'s environment.
+
+=cut
+
+sub CleanEnv {
+    $ENV{'PATH'} = '/bin:/usr/bin';    # or whatever you need
+    $ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
+    $ENV{'SHELL'} = '/bin/sh' if defined $ENV{'SHELL'};
+    $ENV{'ENV'} = '' if defined $ENV{'ENV'};
+    $ENV{'IFS'} = ''		if defined $ENV{'IFS'};
+}
+
+
+
+=head2 LoadConfig
+
+Loads RT's config file and then drops setgid privileges.
+
+=cut
+
+sub LoadConfig {
+    
+    #This drags in  RT's config.pm
+    use config;
+    
+}	
+
+
+
+=head2 DBConnect
+
+  Calls RT::Init, which creates a database connection and then creates $RT::Nobody
+  and $RT::SystemUser
+
+=cut
+
+
+sub DBConnect {
+    use RT;
+    RT::Init();
+}
+
+
+
+# {{{ sub GetCurrentUser 
+
+=head2 GetCurrentUser
+
+  Figures out the uid of the current user and returns an RT::CurrentUser object
+loaded with that user.  if the current user isn't found, returns a copy of RT::Nobody.
+
+=cut
+sub GetCurrentUser  {
+    
+    my ($Gecos, $CurrentUser);
+    
+    require RT::CurrentUser;
+    
+    #Instantiate a user object
+    
+    $Gecos=(getpwuid($<))[0];
+
+    #If the current user is 0, then RT will assume that the User object
+    #is that of the currentuser.
+
+    $CurrentUser = new RT::CurrentUser();
+    $CurrentUser->LoadByGecos($Gecos);
+    
+    unless ($CurrentUser->Id) {
+	$RT::Logger->debug("No user with a unix login of '$Gecos' was found. ");
+    }
+    return($CurrentUser);
+}
+# }}}
+
+# {{{ sub GetMessageContent
+
+=head2 GetMessageContent
+
+Takes two arguments a source file and a boolean "edit".  If the source file
+is undef or "", assumes an empty file.  Returns an edited file as an 
+array of lines.
+
+=cut
+
+sub GetMessageContent {
+    my %args = (  Source => undef,
+		  Content => undef,
+		  Edit => undef,
+		  CurrentUser => undef,
+		 @_);
+    my $source = $args{'Source'};
+
+    my $edit = $args{'Edit'};
+    
+    my $currentuser = $args{'CurrentUser'};
+    my @lines;
+
+    use File::Temp qw/ tempfile/;
+    
+    #Load the sourcefile, if it's been handed to us
+    if ($source) {
+	open (SOURCE, "<$source");
+	@lines = (<SOURCE>);
+	close (SOURCE);
+    }
+    elsif ($args{'Content'}) {
+	@lines = split('\n',$args{'Content'});
+    }
+    #get us a tempfile.
+    my ($fh, $filename) = tempfile();
+	
+    #write to a tmpfile
+    for (@lines) {
+	print $fh $_;
+    }
+    close ($fh);
+    
+    #Edit the file if we need to
+    if ($edit) {	
+
+	unless ($ENV{'EDITOR'}) {
+	    $RT::Logger->crit('No $EDITOR variable defined'. "\n");
+	    return undef;
+	}
+	system ($ENV{'EDITOR'}, $filename);
+    }	
+    
+    open (READ, "<$filename");
+    my @newlines = (<READ>);
+    close (READ);
+
+    unlink ($filename) unless (debug());
+    return(\@newlines);
+    
+}
+
+# }}}
+
+# {{{ sub debug
+
+sub debug {
+    my $val = shift;
+    my ($debug);
+    if ($val) {
+	$RT::Logger->debug($val."\n");
+	if ($debug) {
+	    print STDERR "$val\n";
+	}
+    }
+    if ($debug) {
+	return(1);
+    }	
+}
+
+# }}}
+
+
+1;
diff --git a/rt/lib/RT/Interface/Email.pm b/rt/lib/RT/Interface/Email.pm
new file mode 100755
index 000000000..e95436091
--- /dev/null
+++ b/rt/lib/RT/Interface/Email.pm
@@ -0,0 +1,581 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Interface/Email.pm,v 1.1 2002-08-12 06:17:08 ivan Exp $
+# RT is (c) 1996-2001 Jesse Vincent <jesse@fsck.com>
+
+package RT::Interface::Email;
+
+use strict;
+use Mail::Address;
+use MIME::Entity;
+
+BEGIN {
+    use Exporter ();
+    use vars qw ($VERSION  @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+    
+    # set the version for version checking
+    $VERSION = do { my @r = (q$Revision: 1.1 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
+    
+    @ISA         = qw(Exporter);
+    
+    # your exported package globals go here,
+    # as well as any optionally exported functions
+    @EXPORT_OK   = qw(&CleanEnv 
+		      &LoadConfig 
+		      &DBConnect 
+		      &GetCurrentUser
+		      &GetMessageContent
+		      &CheckForLoops 
+		      &CheckForSuspiciousSender
+		      &CheckForAutoGenerated 
+		      &ParseMIMEEntityFromSTDIN
+		      &ParseTicketId 
+		      &MailError 
+		      &ParseCcAddressesFromHead
+		      &ParseSenderAddressFromHead 
+   		      &ParseErrorsToAddressFromHead
+              &ParseAddressFromHeader
+
+
+		      &debug);
+}
+
+=head1 NAME
+
+  RT::Interface::CLI - helper functions for creating a commandline RT interface
+
+=head1 SYNOPSIS
+
+  use lib "!!RT_LIB_PATH!!";
+  use lib "!!RT_ETC_PATH!!";
+
+  use RT::Interface::Email  qw(CleanEnv LoadConfig DBConnect 
+			      );
+
+  #Clean out all the nasties from the environment
+  CleanEnv();
+
+  #Load etc/config.pm and drop privs
+  LoadConfig();
+
+  #Connect to the database and get RT::SystemUser and RT::Nobody loaded
+  DBConnect();
+
+
+  #Get the current user all loaded
+  my $CurrentUser = GetCurrentUser();
+
+=head1 DESCRIPTION
+
+
+=begin testing
+
+ok(require RT::TestHarness);
+ok(require RT::Interface::Email);
+
+=end testing
+
+
+=head1 METHODS
+
+=cut
+
+
+=head2 CleanEnv
+
+Removes some of the nastiest nasties from the user\'s environment.
+
+=cut
+
+sub CleanEnv {
+    $ENV{'PATH'} = '/bin:/usr/bin';    # or whatever you need
+    $ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
+    $ENV{'SHELL'} = '/bin/sh' if defined $ENV{'SHELL'};
+    $ENV{'ENV'} = '' if defined $ENV{'ENV'};
+    $ENV{'IFS'} = '' if defined $ENV{'IFS'};
+}
+
+
+
+=head2 LoadConfig
+
+Loads RT's config file and then drops setgid privileges.
+
+=cut
+
+sub LoadConfig {
+    
+    #This drags in  RT's config.pm
+    use config;
+    
+}	
+
+
+
+=head2 DBConnect
+
+  Calls RT::Init, which creates a database connection and then creates $RT::Nobody
+  and $RT::SystemUser
+
+=cut
+
+
+sub DBConnect {
+    use RT;
+    RT::Init();
+}
+
+
+
+# {{{ sub debug
+
+sub debug {
+    my $val = shift;
+    my ($debug);
+    if ($val) {
+	$RT::Logger->debug($val."\n");
+	if ($debug) {
+	    print STDERR "$val\n";
+	}
+    }
+    if ($debug) {
+	return(1);
+    }	
+}
+
+# }}}
+
+
+# {{{ sub CheckForLoops 
+
+sub CheckForLoops  {
+    my $head = shift;
+    
+    #If this instance of RT sent it our, we don't want to take it in
+    my $RTLoop = $head->get("X-RT-Loop-Prevention") || "";
+    chomp ($RTLoop); #remove that newline
+    if ($RTLoop eq "$RT::rtname") {
+	return (1);
+    }
+    
+    # TODO: We might not trap the case where RT instance A sends a mail
+    # to RT instance B which sends a mail to ...
+    return (undef);
+}
+
+# }}}
+
+# {{{ sub CheckForSuspiciousSender
+
+sub CheckForSuspiciousSender {
+    my $head = shift;
+
+    #if it's from a postmaster or mailer daemon, it's likely a bounce.
+    
+    #TODO: better algorithms needed here - there is no standards for
+    #bounces, so it's very difficult to separate them from anything
+    #else.  At the other hand, the Return-To address is only ment to be
+    #used as an error channel, we might want to put up a separate
+    #Return-To address which is treated differently.
+    
+    #TODO: search through the whole email and find the right Ticket ID.
+
+    my ($From, $junk) = ParseSenderAddressFromHead($head);
+    
+    if (($From =~ /^mailer-daemon/i) or
+	($From =~ /^postmaster/i)){
+	return (1);
+	
+    }
+    
+    return (undef);
+
+}
+
+# }}}
+
+# {{{ sub CheckForAutoGenerated
+sub CheckForAutoGenerated {
+    my $head = shift;
+    
+    my $Precedence = $head->get("Precedence") || "" ;
+    if ($Precedence =~ /^(bulk|junk)/i) {
+	return (1);
+    }
+    else {
+	return (0);
+    }
+}
+
+# }}}
+
+# {{{ sub ParseMIMEEntityFromSTDIN
+
+sub ParseMIMEEntityFromSTDIN {
+
+    # Create a new parser object:
+    
+    my $parser = new MIME::Parser;
+    
+    # {{{ Config $parser to store large attacments in temp dir
+
+    ## TODO: Does it make sense storing to disk at all?  After all, we
+    ## need to put each msg as an in-core scalar before saving it to
+    ## the database, don't we?
+
+    ## At the same time, we should make sure that we nuke attachments 
+    ## Over max size and return them
+
+    ## TODO: Remove the temp dir when we don't need it any more.
+
+    my $AttachmentDir = File::Temp::tempdir (TMPDIR => 1, CLEANUP => 1);
+    
+    # Set up output directory for files:
+    $parser->output_dir("$AttachmentDir");
+  
+    #If someone includes a message, don't extract it
+    $parser->extract_nested_messages(0);
+
+   
+    # Set up the prefix for files with auto-generated names:
+    $parser->output_prefix("part");
+
+    # If content length is <= 20000 bytes, store each msg as in-core scalar;
+    # Else, write to a disk file (the default action):
+  
+    $parser->output_to_core(20000);
+
+    # }}} (temporary directory)
+
+    #Ok. now that we're set up, let's get the stdin.
+    my $entity;
+    unless ($entity = $parser->read(\*STDIN)) {
+	die "couldn't parse MIME stream";
+    }
+    #Now we've got a parsed mime object. 
+    
+    # Get the head, a MIME::Head:
+    my $head = $entity->head;
+   
+
+    # Unfold headers that are have embedded newlines
+    $head->unfold; 
+    
+    # TODO - information about the charset is lost here!
+    $head->decode;
+
+    return ($entity, $head);
+
+}
+# }}}
+
+# {{{ sub ParseTicketId 
+
+sub ParseTicketId {
+    my $Subject = shift;
+    my ($Id);
+    
+    if ($Subject =~ s/\[$RT::rtname \#(\d+)\]//i) {
+	$Id = $1;
+	$RT::Logger->debug("Found a ticket ID. It's $Id");
+	return($Id);
+    }
+    else {
+	return(undef);
+    }
+}
+# }}}
+
+# {{{ sub MailError 
+sub MailError {
+    my %args = (To => $RT::OwnerEmail,
+		Bcc => undef,
+		From => $RT::CorrespondAddress,
+		Subject => 'There has been an error',
+		Explanation => 'Unexplained error',
+		MIMEObj => undef,
+		LogLevel => 'crit',
+		@_);
+
+
+    $RT::Logger->log(level => $args{'LogLevel'}, 
+		     message => $args{'Explanation'}
+		    );
+    my $entity = MIME::Entity->build( Type  =>"multipart/mixed",
+				      From => $args{'From'},
+				      Bcc => $args{'Bcc'},
+				      To => $args{'To'},
+				      Subject => $args{'Subject'},
+				      'X-RT-Loop-Prevention' => $RT::rtname,
+				    );
+
+    $entity->attach(  Data => $args{'Explanation'}."\n");
+    
+    my $mimeobj = $args{'MIMEObj'};
+    if ($mimeobj) {
+        $mimeobj->sync_headers();
+        $entity->add_part($mimeobj);
+    } 
+
+    if ($RT::MailCommand eq 'sendmailpipe') {
+        open (MAIL, "|$RT::SendmailPath $RT::SendmailArguments") || return(0);
+        print MAIL $entity->as_string;
+        close(MAIL);
+    }
+    else {
+	$entity->send($RT::MailCommand, $RT::MailParams);
+    }
+}
+
+# }}}
+
+# {{{ sub GetCurrentUser 
+
+sub GetCurrentUser  {
+    my $head = shift;
+    my $entity = shift;
+    my $ErrorsTo = shift;
+
+    my %UserInfo = ();
+
+    #Suck the address of the sender out of the header
+    my ($Address, $Name) = ParseSenderAddressFromHead($head);
+    
+    #This will apply local address canonicalization rules
+    $Address = RT::CanonicalizeAddress($Address);
+  
+    #If desired, synchronize with an external database
+
+    my $UserFoundInExternalDatabase = 0;
+
+    # Username is the 'Name' attribute of the user that RT uses for things
+    # like authentication
+    my $Username = undef;
+    if ($RT::LookupSenderInExternalDatabase) {
+	($UserFoundInExternalDatabase, %UserInfo) = 
+	  RT::LookupExternalUserInfo($Address, $Name);
+   
+       $Address = $UserInfo{'EmailAddress'};
+       $Username = $UserInfo{'Name'}; 
+    }
+    
+    my $CurrentUser = RT::CurrentUser->new();
+    
+    # First try looking up by a username, if we got one from the external
+    # db lookup. Next, try looking up by email address. Failing that,
+    # try looking up by users who have this user's email address as their
+    # username.
+
+    if ($Username) {
+	$CurrentUser->LoadByName($Username);
+    }	
+    
+    unless ($CurrentUser->Id) {
+	$CurrentUser->LoadByEmail($Address);
+    }	
+
+    #If we can't get it by email address, try by name.  
+    unless ($CurrentUser->Id) {
+	$CurrentUser->LoadByName($Address);
+    }
+    
+    
+    unless ($CurrentUser->Id) {
+        #If we couldn't load a user, determine whether to create a user
+
+        # {{{ If we require an incoming address to be found in the external
+	# user database, reject the incoming message appropriately
+        if ( $RT::LookupSenderInExternalDatabase &&
+	     $RT::SenderMustExistInExternalDatabase && 
+	     !$UserFoundInExternalDatabase) {
+	    
+	    my $Message = "Sender's email address was not found in the user database.";
+
+	    # {{{  This code useful only if you've defined an AutoRejectRequest template
+	    
+	    require RT::Template;
+	    my $template = new RT::Template($RT::Nobody);
+	    $template->Load('AutoRejectRequest');
+	    $Message = $template->Content || $Message;
+	    
+	    # }}}
+	    
+	    MailError( To => $ErrorsTo,
+		       Subject => "Ticket Creation failed: user could not be created",
+		       Explanation => $Message,
+		       MIMEObj => $entity,
+		       LogLevel => 'notice'
+		     );
+
+	    return($CurrentUser);
+
+	} 
+	# }}}
+	
+	else {
+	    my $NewUser = RT::User->new($RT::SystemUser);
+	    
+	    my ($Val, $Message) = 
+	      $NewUser->Create(Name => ($Username || $Address),
+			       EmailAddress => $Address,
+			       RealName => "$Name",
+			       Password => undef,
+			       Privileged => 0,
+			       Comments => 'Autocreated on ticket submission'
+			      );
+	    
+	    unless ($Val) {
+		
+		# Deal with the race condition of two account creations at once
+		#
+           	if ($Username) {
+		    $NewUser->LoadByName($Username);
+		}
+		
+		unless ($NewUser->Id) {
+	            $NewUser->LoadByEmail($Address);
+		}
+		
+		unless ($NewUser->Id) {  
+		    MailError( To => $ErrorsTo,
+			       Subject => "User could not be created",
+			       Explanation => "User creation failed in mailgateway: $Message",
+			       MIMEObj => $entity,
+			       LogLevel => 'crit'
+			     );
+		}
+	    }
+	}
+	
+	#Load the new user object
+	$CurrentUser->LoadByEmail($Address);
+	
+	unless ($CurrentUser->id) {
+	    $RT::Logger->warning("Couldn't load user '$Address'.".  "giving up");
+		MailError( To => $ErrorsTo,
+			   Subject => "User could not be loaded",
+			   Explanation => "User  '$Address' could not be loaded in the mail gateway",
+			   MIMEObj => $entity,
+			   LogLevel => 'crit'
+			 );
+	    
+	}
+    }
+    
+    return ($CurrentUser);
+    
+}
+# }}}
+
+# {{{ ParseCcAddressesFromHead 
+
+=head2 ParseCcAddressesFromHead HASHREF
+
+Takes a hashref object containing QueueObj, Head and CurrentUser objects.
+Returns a list of all email addresses in the To and Cc 
+headers b<except> the current Queue\'s email addresses, the CurrentUser\'s 
+email address  and anything that the configuration sub RT::IsRTAddress matches.
+
+=cut
+  
+sub ParseCcAddressesFromHead {
+    my %args = ( Head => undef,
+		 QueueObj => undef,
+		 CurrentUser => undef,
+		 @_ );
+    
+    my (@Addresses);
+        
+    my @ToObjs = Mail::Address->parse($args{'Head'}->get('To'));
+    my @CcObjs = Mail::Address->parse($args{'Head'}->get('Cc'));
+    
+    foreach my $AddrObj (@ToObjs, @CcObjs) {
+	my $Address = $AddrObj->address;
+	$Address = RT::CanonicalizeAddress($Address);
+ 	next if ($args{'CurrentUser'}->EmailAddress =~ /^$Address$/i);
+	next if ($args{'QueueObj'}->CorrespondAddress =~ /^$Address$/i);
+	next if ($args{'QueueObj'}->CommentAddress =~ /^$Address$/i);
+	next if (RT::IsRTAddress($Address));
+	
+	push (@Addresses, $Address);
+    }
+    return (@Addresses);
+}
+
+
+# }}}
+
+# {{{ ParseSenderAdddressFromHead
+
+=head2 ParseSenderAddressFromHead
+
+Takes a MIME::Header object. Returns a tuple: (user@host, friendly name) 
+of the From (evaluated in order of Reply-To:, From:, Sender)
+
+=cut
+
+sub ParseSenderAddressFromHead {
+    my $head = shift;
+    #Figure out who's sending this message.
+    my $From = $head->get('Reply-To') || 
+      $head->get('From') || 
+	$head->get('Sender');
+    return (ParseAddressFromHeader($From));
+}
+# }}}
+
+# {{{ ParseErrorsToAdddressFromHead
+
+=head2 ParseErrorsToAddressFromHead
+
+Takes a MIME::Header object. Return a single value : user@host
+of the From (evaluated in order of Errors-To:,Reply-To:, From:, Sender)
+
+=cut
+
+sub ParseErrorsToAddressFromHead {
+    my $head = shift;
+    #Figure out who's sending this message.
+
+    foreach my $header ('Errors-To' , 'Reply-To', 'From', 'Sender' ) {
+	# If there's a header of that name
+	my $headerobj = $head->get($header);
+	if ($headerobj) {
+		my ($addr, $name ) = ParseAddressFromHeader($headerobj);
+		# If it's got actual useful content...
+		return ($addr) if ($addr);
+	}
+    }
+}
+# }}}
+
+# {{{ ParseAddressFromHeader
+
+=head2 ParseAddressFromHeader ADDRESS
+
+Takes an address from $head->get('Line') and returns a tuple: user@host, friendly name
+
+=cut
+
+
+sub ParseAddressFromHeader{
+    my $Addr = shift;
+    
+    my @Addresses = Mail::Address->parse($Addr);
+    
+    my $AddrObj = $Addresses[0];
+
+    unless (ref($AddrObj)) {
+	return(undef,undef);
+    }
+ 
+    my $Name =  ($AddrObj->phrase || $AddrObj->comment || $AddrObj->address);
+
+
+    #Lets take the from and load a user object.
+    my $Address = $AddrObj->address;
+
+    return ($Address, $Name);
+}
+# }}}
+
+
+1;
diff --git a/rt/lib/RT/Interface/Web.pm b/rt/lib/RT/Interface/Web.pm
new file mode 100644
index 000000000..6b5272848
--- /dev/null
+++ b/rt/lib/RT/Interface/Web.pm
@@ -0,0 +1,1287 @@
+## $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Interface/Web.pm,v 1.1 2002-08-12 06:17:08 ivan Exp $
+
+## Portions Copyright 2000 Tobias Brox <tobix@fsck.com>
+## Copyright 1996-2002 Jesse Vincent <jesse@bestpractical.com>
+
+## This is a library of static subs to be used by the Mason web
+## interface to RT
+
+package RT::Interface::Web;
+
+# {{{ sub NewParser
+
+=head2 NewParser
+
+  Returns a new Mason::Parser object. Takes a param hash of things 
+  that get passed to HTML::Mason::Parser. Currently hard coded to only
+  take the parameter 'allow_globals'.
+
+=cut
+
+sub NewParser {
+    my %args = (
+        allow_globals => undef,
+        @_
+    );
+
+    my $parser = new HTML::Mason::Parser(
+        default_escape_flags => 'h',
+        allow_globals        => $args{'allow_globals'}
+    );
+    return ($parser);
+}
+
+# }}}
+
+# {{{ sub NewInterp
+
+=head2 NewInterp 
+
+  Takes a paremeter hash. Needs a param called 'parser' which is a reference
+  to an HTML::Mason::Parser.
+  returns a new Mason::Interp object
+
+=cut
+
+sub NewInterp {
+    my %params = (
+        comp_root                    => [
+            [ local    => $RT::MasonLocalComponentRoot ],
+            [ standard => $RT::MasonComponentRoot ]
+        ],
+        data_dir => "$RT::MasonDataDir",
+        @_
+    );
+
+    #We allow recursive autohandlers to allow for RT auth.
+
+    use HTML::Mason::Interp;
+    my $interp = new HTML::Mason::Interp(%params);
+
+}
+
+# }}}
+
+# {{{ sub NewApacheHandler 
+
+=head2 NewApacheHandler
+
+  Takes a Mason::Interp object
+  Returns a new Mason::ApacheHandler object
+
+=cut
+
+sub NewApacheHandler {
+    my $interp = shift;
+    my $ah = new HTML::Mason::ApacheHandler( interp => $interp );
+    return ($ah);
+}
+
+# }}}
+
+
+# {{{ sub NewMason11ApacheHandler
+
+=head2 NewMason11ApacheHandler
+
+  Returns a new Mason::ApacheHandler object
+
+=cut
+
+sub NewMason11ApacheHandler {
+        my %args = ( default_escape_flags => 'h',
+                    allow_globals        => [%session],
+        comp_root                    => [
+            [ local    => $RT::MasonLocalComponentRoot ],
+            [ standard => $RT::MasonComponentRoot ]
+        ],
+        data_dir => "$RT::MasonDataDir",
+        args_method => 'CGI'
+    );
+    my $ah = new HTML::Mason::ApacheHandler(%args);
+    return ($ah);
+}
+
+# }}}
+
+
+
+
+
+# }}}
+
+package HTML::Mason::Commands;
+
+# {{{ sub Abort
+# Error - calls Error and aborts
+sub Abort {
+
+    if ( $session{'ErrorDocument'} && $session{'ErrorDocumentType'} ) {
+        SetContentType( $session{'ErrorDocumentType'} );
+        $m->comp( $session{'ErrorDocument'}, Why => shift );
+        $m->abort;
+    }
+    else {
+        SetContentType('text/html');
+        $m->comp( "/Elements/Error", Why => shift );
+        $m->abort;
+    }
+}
+
+# }}}
+
+# {{{ sub CreateTicket 
+
+=head2 CreateTicket ARGS
+
+Create a new ticket, using Mason's %ARGS.  returns @results.
+=cut
+
+sub CreateTicket {
+    my %ARGS = (@_);
+
+    my (@Actions);
+
+    my $Ticket = new RT::Ticket( $session{'CurrentUser'} );
+
+    my $Queue = new RT::Queue( $session{'CurrentUser'} );
+    unless ( $Queue->Load( $ARGS{'Queue'} ) ) {
+        Abort('Queue not found');
+    }
+
+    unless ( $Queue->CurrentUserHasRight('CreateTicket') ) {
+        Abort('You have no permission to create tickets in that queue.');
+    }
+
+    my $due = new RT::Date( $session{'CurrentUser'} );
+    $due->Set( Format => 'unknown', Value => $ARGS{'Due'} );
+    my $starts = new RT::Date( $session{'CurrentUser'} );
+    $starts->Set( Format => 'unknown', Value => $ARGS{'Starts'} );
+
+    my @Requestors = split ( /,/, $ARGS{'Requestors'} );
+    my @Cc         = split ( /,/, $ARGS{'Cc'} );
+    my @AdminCc    = split ( /,/, $ARGS{'AdminCc'} );
+
+    my $MIMEObj = MakeMIMEEntity(
+        Subject             => $ARGS{'Subject'},
+        From                => $ARGS{'From'},
+        Cc                  => $ARGS{'Cc'},
+        Body                => $ARGS{'Content'},
+        AttachmentFieldName => 'Attach'
+    );
+
+    my %create_args = (
+        Queue           => $ARGS{Queue},
+        Owner           => $ARGS{Owner},
+        InitialPriority => $ARGS{InitialPriority},
+        FinalPriority   => $ARGS{FinalPriority},
+        TimeLeft        => $ARGS{TimeLeft},
+        TimeWorked      => $ARGS{TimeWorked},
+        Requestor       => \@Requestors,
+        Cc              => \@Cc,
+        AdminCc         => \@AdminCc,
+        Subject         => $ARGS{Subject},
+        Status          => $ARGS{Status},
+        Due             => $due->ISO,
+        Starts          => $starts->ISO,
+        MIMEObj         => $MIMEObj
+    );
+
+    # we need to get any KeywordSelect-<integer> fields into %create_args..
+    grep { $_ =~ /^KeywordSelect-/ &&{ $create_args{$_} = $ARGS{$_} } } %ARGS;
+
+    my ( $id, $Trans, $ErrMsg ) = $Ticket->Create(%create_args);
+    unless ( $id && $Trans ) {
+        Abort($ErrMsg);
+    }
+    my @linktypes = qw( DependsOn MemberOf RefersTo );
+
+    foreach my $linktype (@linktypes) {
+        foreach my $luri ( split ( / /, $ARGS{"new-$linktype"} ) ) {
+            $luri =~ s/\s*$//;    # Strip trailing whitespace
+            my ( $val, $msg ) = $Ticket->AddLink(
+                Target => $luri,
+                Type   => $linktype
+            );
+            push ( @Actions, $msg ) unless ($val);
+        }
+
+        foreach my $luri ( split ( / /, $ARGS{"$linktype-new"} ) ) {
+            my ( $val, $msg ) = $Ticket->AddLink(
+                Base => $luri,
+                Type => $linktype
+            );
+
+            push ( @Actions, $msg ) unless ($val);
+        }
+    }
+
+    push ( @Actions, $ErrMsg );
+    unless ( $Ticket->CurrentUserHasRight('ShowTicket') ) {
+        Abort( "No permission to view newly created ticket #"
+            . $Ticket->id . "." );
+    }
+    return ( $Ticket, @Actions );
+
+}
+
+# }}}
+
+# {{{ sub LoadTicket - loads a ticket
+
+=head2  LoadTicket id
+
+Takes a ticket id as its only variable. if it's handed an array, it takes
+the first value.
+
+Returns an RT::Ticket object as the current user.
+
+=cut
+
+sub LoadTicket {
+    my $id = shift;
+
+    if ( ref($id) eq "ARRAY" ) {
+        $id = $id->[0];
+    }
+
+    unless ($id) {
+        Abort("No ticket specified");
+    }
+
+    my $Ticket = RT::Ticket->new( $session{'CurrentUser'} );
+    $Ticket->Load($id);
+    unless ( $Ticket->id ) {
+        Abort("Could not load ticket $id");
+    }
+    return $Ticket;
+}
+
+# }}}
+
+# {{{ sub ProcessUpdateMessage
+
+sub ProcessUpdateMessage {
+
+    #TODO document what else this takes.
+    my %args = (
+        ARGSRef   => undef,
+        Actions   => undef,
+        TicketObj => undef,
+        @_
+    );
+
+    #Make the update content have no 'weird' newlines in it
+    if ( $args{ARGSRef}->{'UpdateContent'} ) {
+
+        if (
+            $args{ARGSRef}->{'UpdateSubject'} eq $args{'TicketObj'}->Subject() )
+        {
+            $args{ARGSRef}->{'UpdateSubject'} = undef;
+        }
+
+        my $Message = MakeMIMEEntity(
+            Subject             => $args{ARGSRef}->{'UpdateSubject'},
+            Body                => $args{ARGSRef}->{'UpdateContent'},
+            AttachmentFieldName => 'UpdateAttachment'
+        );
+
+	## Check whether this was a refresh or not.  
+
+	# Match Correspondence or Comments.
+        my $trans_flag = -2;
+	my $trans_type = undef;
+	my $orig_trans = $args{ARGSRef}->{'UpdateType'};
+        if ( $orig_trans =~ /^(private|public)$/ ) {
+	    $trans_type = "Comment";
+        }elsif ( $orig_trans eq 'response' ) {
+	    $trans_type = "Correspond";
+	}
+
+	# Do we have a transaction that we need to update on? session
+	if( defined( $trans_type ) ){
+	    $trans_flag = 0;
+
+	    # Prepare a checksum.
+	    # See perldoc -f unpack for example of this.
+	    my $this_checksum = unpack("%32C*", $Message->body_as_string ) % 65535;
+
+	    # The above *could* generate duplicate checksums.  Crosscheck with
+	    # the length.
+	    my $this_length = length( $Message->body_as_string );
+
+	    # Don't forget the ticket id.
+	    my $this_id = $args{TicketObj}->id;
+
+	    # Check whether the previous transaction in the
+	    # ticket is the same as the current transaction.
+	    if( defined( $session{'prev_trans_type'} ) && defined( $session{'prev_trans_chksum'} ) && defined( $session{'prev_trans_length'} ) && defined( $session{'prev_trans_tickid'} ) ){
+		if( $session{'prev_trans_type'} eq $orig_trans && $session{'prev_trans_chksum'} == $this_checksum && $session{'prev_trans_length'} == $this_length && $session{'prev_trans_tickid'} == $this_id ){
+		    # Its the same as the previous transaction for this user.
+		    $trans_flag = -1;
+		}
+	    }
+
+	    # Store them for next time.
+	    $session{'prev_trans_type'} = $orig_trans;
+	    $session{'prev_trans_chksum'} = $this_checksum;
+	    $session{'prev_trans_length'} = $this_length;
+	    $session{'prev_trans_tickid'} = $this_id;
+
+	    if( $trans_flag == -1 ){
+                push ( @{ $args{'Actions'} },
+"This appears to be a duplicate of your previous update (please do not refresh this page)" );
+	    }
+
+
+            if ( $trans_type eq 'Comment' && $trans_flag >= 0 ) {
+                my ( $Transaction, $Description ) = $args{TicketObj}->Comment(
+                    CcMessageTo  => $args{ARGSRef}->{'UpdateCc'},
+                    BccMessageTo => $args{ARGSRef}->{'UpdateBcc'},
+                    MIMEObj      => $Message,
+                    TimeTaken    => $args{ARGSRef}->{'UpdateTimeWorked'}
+                );
+                push ( @{ $args{Actions} }, $Description );
+            }
+            elsif ( $trans_type eq 'Correspond' && $trans_flag >= 0 ) {
+                my ( $Transaction, $Description ) = $args{TicketObj}->Correspond(
+                    CcMessageTo  => $args{ARGSRef}->{'UpdateCc'},
+                    BccMessageTo => $args{ARGSRef}->{'UpdateBcc'},
+                    MIMEObj      => $Message,
+                    TimeTaken    => $args{ARGSRef}->{'UpdateTimeWorked'}
+                );
+                push ( @{ $args{Actions} }, $Description );
+            }
+	}
+        else {
+            push ( @{ $args{'Actions'} },
+    "Update type was neither correspondence nor comment. Update not recorded"
+                );
+        }
+    }
+}
+
+# }}}
+
+# {{{ sub MakeMIMEEntity
+
+=head2 MakeMIMEEntity PARAMHASH
+
+Takes a paramhash Subject, Body and AttachmentFieldName.
+
+  Returns a MIME::Entity.
+
+=cut
+
+sub MakeMIMEEntity {
+
+    #TODO document what else this takes.
+    my %args = (
+        Subject             => undef,
+        From                => undef,
+        Cc                  => undef,
+        Body                => undef,
+        AttachmentFieldName => undef,
+        @_
+    );
+
+    #Make the update content have no 'weird' newlines in it
+
+    $args{'Body'} =~ s/\r\n/\n/gs;
+    my $Message = MIME::Entity->build(
+        Subject => $args{'Subject'} || "",
+        From    => $args{'From'},
+        Cc      => $args{'Cc'},
+        Data    => [ $args{'Body'} ]
+    );
+
+    my $cgi_object = CGIObject();
+    if ( $cgi_object->param( $args{'AttachmentFieldName'} ) ) {
+
+        my $cgi_filehandle =
+          $cgi_object->upload( $args{'AttachmentFieldName'} );
+
+        use File::Temp qw(tempfile tempdir);
+
+        #foreach my $filehandle (@filenames) {
+
+        # my ( $fh, $temp_file ) = tempfile();
+
+        #$binmode $fh;    #thank you, windows
+
+        # We're having trouble with tempfiles not getting created. Let's try it with 
+        # a scalar instead
+
+        my ( $buffer, @file );
+
+        while ( my $bytesread = read( $cgi_filehandle, $buffer, 4096 ) ) {
+            push ( @file, $buffer );
+        }
+
+        $RT::Logger->debug($file);
+        my $filename = "$cgi_filehandle";
+        $filename =~ s#^(.*)/##;
+        $filename =~ s#^(.*)\\##;
+        my $uploadinfo = $cgi_object->uploadInfo($cgi_filehandle);
+        $Message->attach(
+            Data => \@file,
+
+            #Path     => $temp_file,
+            Filename => $filename,
+            Type     => $uploadinfo->{'Content-Type'}
+        );
+
+        #close($fh);
+        #unlink($temp_file);
+
+        #	}
+    }
+    $Message->make_singlepart();
+    return ($Message);
+
+}
+
+# }}}
+
+# {{{ sub ProcessSearchQuery
+
+=head2 ProcessSearchQuery
+
+  Takes a form such as the one filled out in webrt/Search/Elements/PickRestriction and turns it into something that RT::Tickets can understand.
+
+TODO Doc exactly what comes in the paramhash
+
+
+=cut
+
+sub ProcessSearchQuery {
+    my %args = @_;
+
+    ## TODO: The only parameter here is %ARGS.  Maybe it would be
+    ## cleaner to load this parameter as $ARGS, and use $ARGS->{...}
+    ## instead of $args{ARGS}->{...} ? :)
+
+    #Searches are sticky.
+    if ( defined $session{'tickets'} ) {
+
+        # Reset the old search
+        $session{'tickets'}->GotoFirstItem;
+    }
+    else {
+
+        # Init a new search
+        $session{'tickets'} = RT::Tickets->new( $session{'CurrentUser'} );
+    }
+
+    #Import a bookmarked search if we have one
+    if ( defined $args{ARGS}->{'Bookmark'} ) {
+        $session{'tickets'}->ThawLimits( $args{ARGS}->{'Bookmark'} );
+    }
+
+    # {{{ Goto next/prev page
+    if ( $args{ARGS}->{'GotoPage'} eq 'Next' ) {
+        $session{'tickets'}->NextPage;
+    }
+    elsif ( $args{ARGS}->{'GotoPage'} eq 'Prev' ) {
+        $session{'tickets'}->PrevPage;
+    }
+
+    # }}}
+
+    # {{{ Deal with limiting the search
+
+    if ( $args{ARGS}->{'RefreshSearchInterval'} ) {
+        $session{'tickets_refresh_interval'} =
+          $args{ARGS}->{'RefreshSearchInterval'};
+    }
+
+    if ( $args{ARGS}->{'TicketsSortBy'} ) {
+        $session{'tickets_sort_by'}    = $args{ARGS}->{'TicketsSortBy'};
+        $session{'tickets_sort_order'} = $args{ARGS}->{'TicketsSortOrder'};
+        $session{'tickets'}->OrderBy(
+            FIELD => $args{ARGS}->{'TicketsSortBy'},
+            ORDER => $args{ARGS}->{'TicketsSortOrder'}
+        );
+    }
+
+    # }}}
+
+    # {{{ Set the query limit
+    if ( defined $args{ARGS}->{'RowsPerPage'} ) {
+        $RT::Logger->debug(
+            "limiting to " . $args{ARGS}->{'RowsPerPage'} . " rows" );
+
+        $session{'tickets_rows_per_page'} = $args{ARGS}->{'RowsPerPage'};
+        $session{'tickets'}->RowsPerPage( $args{ARGS}->{'RowsPerPage'} );
+    }
+
+    # }}}
+    # {{{ Limit priority
+    if ( $args{ARGS}->{'ValueOfPriority'} ne '' ) {
+        $session{'tickets'}->LimitPriority(
+            VALUE    => $args{ARGS}->{'ValueOfPriority'},
+            OPERATOR => $args{ARGS}->{'PriorityOp'}
+        );
+    }
+
+    # }}}
+    # {{{ Limit owner
+    if ( $args{ARGS}->{'ValueOfOwner'} ne '' ) {
+        $session{'tickets'}->LimitOwner(
+            VALUE    => $args{ARGS}->{'ValueOfOwner'},
+            OPERATOR => $args{ARGS}->{'OwnerOp'}
+        );
+    }
+
+    # }}}
+    # {{{ Limit requestor email
+
+    if ( $args{ARGS}->{'ValueOfRequestor'} ne '' ) {
+        my $alias = $session{'tickets'}->LimitRequestor(
+            VALUE    => $args{ARGS}->{'ValueOfRequestor'},
+            OPERATOR => $args{ARGS}->{'RequestorOp'},
+        );
+
+    }
+
+    # }}}
+    # {{{ Limit Queue
+    if ( $args{ARGS}->{'ValueOfQueue'} ne '' ) {
+        $session{'tickets'}->LimitQueue(
+            VALUE    => $args{ARGS}->{'ValueOfQueue'},
+            OPERATOR => $args{ARGS}->{'QueueOp'}
+        );
+    }
+
+    # }}}
+    # {{{ Limit Status
+    if ( $args{ARGS}->{'ValueOfStatus'} ne '' ) {
+        if ( ref( $args{ARGS}->{'ValueOfStatus'} ) ) {
+            foreach my $value ( @{ $args{ARGS}->{'ValueOfStatus'} } ) {
+                $session{'tickets'}->LimitStatus(
+                    VALUE    => $value,
+                    OPERATOR => $args{ARGS}->{'StatusOp'},
+                );
+            }
+        }
+        else {
+            $session{'tickets'}->LimitStatus(
+                VALUE    => $args{ARGS}->{'ValueOfStatus'},
+                OPERATOR => $args{ARGS}->{'StatusOp'},
+            );
+        }
+
+    }
+
+    # }}}
+    # {{{ Limit Subject
+    if ( $args{ARGS}->{'ValueOfSubject'} ne '' ) {
+        $session{'tickets'}->LimitSubject(
+            VALUE    => $args{ARGS}->{'ValueOfSubject'},
+            OPERATOR => $args{ARGS}->{'SubjectOp'},
+        );
+    }
+
+    # }}}    
+    # {{{ Limit Dates
+    if ( $args{ARGS}->{'ValueOfDate'} ne '' ) {
+
+        my $date = ParseDateToISO( $args{ARGS}->{'ValueOfDate'} );
+        $args{ARGS}->{'DateType'} =~ s/_Date$//;
+
+        $session{'tickets'}->LimitDate(
+            FIELD    => $args{ARGS}->{'DateType'},
+            VALUE    => $date,
+            OPERATOR => $args{ARGS}->{'DateOp'},
+        );
+    }
+
+    # }}}    
+    # {{{ Limit Content
+    if ( $args{ARGS}->{'ValueOfContent'} ne '' ) {
+        $session{'tickets'}->LimitContent(
+            VALUE    => $args{ARGS}->{'ValueOfContent'},
+            OPERATOR => $args{ARGS}->{'ContentOp'},
+        );
+    }
+
+    # }}}   
+    # {{{ Limit KeywordSelects
+
+    foreach my $KeywordSelectId (
+        map { /^KeywordSelect(\d+)$/; $1 }
+        grep { /^KeywordSelect(\d+)$/; } keys %{ $args{ARGS} }
+      )
+    {
+        my $form = $args{ARGS}->{"KeywordSelect$KeywordSelectId"};
+        my $oper = $args{ARGS}->{"KeywordSelectOp$KeywordSelectId"};
+        foreach my $KeywordId ( ref($form) ? @{$form} : ($form) ) {
+            next unless ($KeywordId);
+            my $quote = 1;
+            if ( $KeywordId =~ /^null$/i ) {
+
+                #Don't quote the string 'null'
+                $quote = 0;
+
+                # Convert the operator to something apropriate for nulls
+                $oper = 'IS'     if ( $oper eq '=' );
+                $oper = 'IS NOT' if ( $oper eq '!=' );
+            }
+            $session{'tickets'}->LimitKeyword(
+                KEYWORDSELECT => $KeywordSelectId,
+                OPERATOR      => $oper,
+                QUOTEVALUE    => $quote,
+                KEYWORD       => $KeywordId
+            );
+        }
+    }
+
+    # }}}
+
+}
+
+# }}}
+
+# {{{ sub ParseDateToISO
+
+=head2 ParseDateToISO
+
+Takes a date in an arbitrary format.
+Returns an ISO date and time in GMT
+
+=cut
+
+sub ParseDateToISO {
+    my $date = shift;
+
+    my $date_obj = new RT::Date($CurrentUser);
+    $date_obj->Set(
+        Format => 'unknown',
+        Value  => $date
+    );
+    return ( $date_obj->ISO );
+}
+
+# }}}
+
+# {{{ sub Config 
+# TODO: This might eventually read the cookies, user configuration
+# information from the DB, queue configuration information from the
+# DB, etc.
+
+sub Config {
+    my $args = shift;
+    my $key  = shift;
+    return $args->{$key} || $RT::WebOptions{$key};
+}
+
+# }}}
+
+# {{{ sub ProcessACLChanges
+
+sub ProcessACLChanges {
+    my $ACLref  = shift;
+    my $ARGSref = shift;
+
+    my @CheckACL = @$ACLref;
+    my %ARGS     = %$ARGSref;
+
+    my ( $ACL, @results );
+
+    # {{{ Add rights
+    foreach $ACL (@CheckACL) {
+        my ($Principal);
+
+        next unless ($ACL);
+
+        # Parse out what we're really talking about. 
+        if ( $ACL =~ /^(.*?)-(\d+)-(.*?)-(\d+)/ ) {
+            my $PrincipalType = $1;
+            my $PrincipalId   = $2;
+            my $Scope         = $3;
+            my $AppliesTo     = $4;
+
+            # {{{ Create an object called Principal
+            # so we can do rights operations
+
+            if ( $PrincipalType eq 'User' ) {
+                $Principal = new RT::User( $session{'CurrentUser'} );
+            }
+            elsif ( $PrincipalType eq 'Group' ) {
+                $Principal = new RT::Group( $session{'CurrentUser'} );
+            }
+            else {
+                Abort("$PrincipalType unknown principal type");
+            }
+
+            $Principal->Load($PrincipalId)
+              || Abort("$PrincipalType $PrincipalId couldn't be loaded");
+
+            # }}}
+
+            # {{{ load up an RT::ACL object with the same current vals of this ACL
+
+            my $CurrentACL = new RT::ACL( $session{'CurrentUser'} );
+            if ( $Scope eq 'Queue' ) {
+                $CurrentACL->LimitToQueue($AppliesTo);
+            }
+            elsif ( $Scope eq 'System' ) {
+                $CurrentACL->LimitToSystem();
+            }
+
+            $CurrentACL->LimitPrincipalToType($PrincipalType);
+            $CurrentACL->LimitPrincipalToId($PrincipalId);
+
+            # }}}
+
+            # {{{ Get the values of the select we're working with 
+            # into an array. it will contain all the new rights that have 
+            # been granted
+            #Hack to turn the ACL returned into an array
+            my @rights =
+              ref( $ARGS{"GrantACE-$ACL"} ) eq 'ARRAY'
+              ? @{ $ARGS{"GrantACE-$ACL"} }
+              : ( $ARGS{"GrantACE-$ACL"} );
+
+            # }}}
+
+            # {{{ Add any rights we need.
+
+            foreach my $right (@rights) {
+                next unless ($right);
+
+                #if the right that's been selected wasn't there before, add it.
+                unless (
+                    $CurrentACL->HasEntry(
+                        RightScope     => "$Scope",
+                        RightName      => "$right",
+                        RightAppliesTo => "$AppliesTo",
+                        PrincipalType  => $PrincipalType,
+                        PrincipalId    => $Principal->Id
+                    )
+                  )
+                {
+
+                    #Add new entry to list of rights.
+                    if ( $Scope eq 'Queue' ) {
+                        my $Queue = new RT::Queue( $session{'CurrentUser'} );
+                        $Queue->Load($AppliesTo);
+                        unless ( $Queue->id ) {
+                            Abort("Couldn't find a queue called $AppliesTo");
+                        }
+
+                        my ( $val, $msg ) = $Principal->GrantQueueRight(
+                            RightAppliesTo => $Queue->id,
+                            RightName      => "$right"
+                        );
+
+                        if ($val) {
+                            push ( @results,
+                                "Granted right $right to "
+                                  . $Principal->Name
+                                  . " for queue "
+                                  . $Queue->Name );
+                        }
+                        else {
+                            push ( @results, $msg );
+                        }
+                    }
+                    elsif ( $Scope eq 'System' ) {
+                        my ( $val, $msg ) = $Principal->GrantSystemRight(
+                            RightAppliesTo => $AppliesTo,
+                            RightName      => "$right"
+                        );
+                        if ($val) {
+                            push ( @results, "Granted system right '$right' to "
+                                  . $Principal->Name );
+                        }
+                        else {
+                            push ( @results, $msg );
+                        }
+                    }
+                }
+            }
+
+            # }}}
+        }
+    }
+
+    # }}} Add rights
+
+    # {{{ remove any rights that have been deleted
+
+    my @RevokeACE =
+      ref( $ARGS{"RevokeACE"} ) eq 'ARRAY' 
+      ? @{ $ARGS{"RevokeACE"} }
+      : ( $ARGS{"RevokeACE"} );
+
+    foreach my $aceid (@RevokeACE) {
+
+        my $right = new RT::ACE( $session{'CurrentUser'} );
+        $right->Load($aceid);
+        next unless ( $right->id );
+
+        my $phrase = "Revoked "
+          . $right->PrincipalType . " "
+          . $right->PrincipalObj->Name
+          . "'s right to "
+          . $right->RightName;
+
+        if ( $right->RightScope eq 'System' ) {
+            $phrase .= ' across all queues.';
+        }
+        else {
+            $phrase .= ' for the queue ' . $right->AppliesToObj->Name . '.';
+        }
+        my ( $val, $msg ) = $right->Delete();
+        if ($val) {
+            push ( @results, $phrase );
+        }
+        else {
+            push ( @results, $msg );
+        }
+    }
+
+    # }}}
+
+    return (@results);
+}
+
+# }}}
+
+# {{{ sub UpdateRecordObj
+
+=head2 UpdateRecordObj ( ARGSRef => \%ARGS, Object => RT::Record, AttributesRef => \@attribs)
+
+@attribs is a list of ticket fields to check and update if they differ from the  B<Object>'s current values. ARGSRef is a ref to HTML::Mason's %ARGS.
+
+Returns an array of success/failure messages
+
+=cut
+
+sub UpdateRecordObject {
+    my %args = (
+        ARGSRef       => undef,
+        AttributesRef => undef,
+        Object        => undef,
+        @_
+    );
+
+    my (@results);
+
+    my $object     = $args{'Object'};
+    my $attributes = $args{'AttributesRef'};
+    my $ARGSRef    = $args{'ARGSRef'};
+
+    foreach $attribute (@$attributes) {
+        if ( ( defined $ARGSRef->{"$attribute"} )
+            and ( $ARGSRef->{"$attribute"} ne $object->$attribute() ) )
+        {
+            $ARGSRef->{"$attribute"} =~ s/\r\n/\n/gs;
+
+            my $method = "Set$attribute";
+            my ( $code, $msg ) = $object->$method( $ARGSRef->{"$attribute"} );
+            push @results, "$attribute: $msg";
+        }
+    }
+    return (@results);
+}
+
+# }}}
+
+# {{{ sub ProcessTicketBasics
+
+=head2 ProcessTicketBasics ( TicketObj => $Ticket, ARGSRef => \%ARGS );
+
+Returns an array of results messages.
+
+=cut
+
+sub ProcessTicketBasics {
+
+    my %args = (
+        TicketObj => undef,
+        ARGSRef   => undef,
+        @_
+    );
+
+    my $TicketObj = $args{'TicketObj'};
+    my $ARGSRef   = $args{'ARGSRef'};
+
+    # {{{ Set basic fields 
+    my @attribs = qw(
+      Subject
+      FinalPriority
+      Priority
+      TimeWorked
+      TimeLeft
+      Status
+      Queue
+    );
+
+    if ( $ARGSRef->{'Queue'} and ( $ARGSRef->{'Queue'} !~ /^(\d+)$/ ) ) {
+        my $tempqueue = RT::Queue->new($RT::SystemUser);
+        $tempqueue->Load( $ARGSRef->{'Queue'} );
+        if ( $tempqueue->id ) {
+            $ARGSRef->{'Queue'} = $tempqueue->Id();
+        }
+    }
+
+    my @results = UpdateRecordObject(
+        AttributesRef => \@attribs,
+        Object        => $TicketObj,
+        ARGSRef       => $ARGSRef
+    );
+
+    # We special case owner changing, so we can use ForceOwnerChange
+    if ( $ARGSRef->{'Owner'} && ( $TicketObj->Owner ne $ARGSRef->{'Owner'} ) ) {
+        my ($ChownType);
+        if ( $ARGSRef->{'ForceOwnerChange'} ) {
+            $ChownType = "Force";
+        }
+        else {
+            $ChownType = "Give";
+        }
+
+        my ( $val, $msg ) =
+          $TicketObj->SetOwner( $ARGSRef->{'Owner'}, $ChownType );
+        push ( @results, "$msg" );
+    }
+
+    # }}}
+
+    return (@results);
+}
+
+# }}}
+
+# {{{ sub ProcessTicketWatchers
+
+=head2 ProcessTicketWatchers ( TicketObj => $Ticket, ARGSRef => \%ARGS );
+
+Returns an array of results messages.
+
+=cut
+
+sub ProcessTicketWatchers {
+    my %args = (
+        TicketObj => undef,
+        ARGSRef   => undef,
+        @_
+    );
+    my (@results);
+
+    my $Ticket  = $args{'TicketObj'};
+    my $ARGSRef = $args{'ARGSRef'};
+
+    # {{{ Munge watchers
+
+    foreach my $key ( keys %$ARGSRef ) {
+
+        # Delete deletable watchers
+        if ( ( $key =~ /^DelWatcher(\d*)$/ ) and ( $ARGSRef->{$key} ) ) {
+            my ( $code, $msg ) = $Ticket->DeleteWatcher($1);
+            push @results, $msg;
+        }
+
+        # Delete watchers in the simple style demanded by the bulk manipulator
+        elsif ( $key =~ /^Delete(Requestor|Cc|AdminCc)$/ ) {
+            my ( $code, $msg ) = $Ticket->DeleteWatcher( $ARGSRef->{$key}, $1 );
+            push @results, $msg;
+        }
+
+        # Add new wathchers by email address      
+        elsif ( ( $ARGSRef->{$key} =~ /^(AdminCc|Cc|Requestor)$/ )
+            and ( $key =~ /^WatcherTypeEmail(\d*)$/ ) )
+        {
+
+            #They're in this order because otherwise $1 gets clobbered :/
+            my ( $code, $msg ) = $Ticket->AddWatcher(
+                Type  => $ARGSRef->{$key},
+                Email => $ARGSRef->{ "WatcherAddressEmail" . $1 }
+            );
+            push @results, $msg;
+        }
+
+        #Add requestors in the simple style demanded by the bulk manipulator
+        elsif ( $key =~ /^Add(Requestor|Cc|AdminCc)$/ ) {
+            my ( $code, $msg ) = $Ticket->AddWatcher(
+                Type  => $1,
+                Email => $ARGSRef->{$key}
+            );
+            push @results, $msg;
+        }
+
+        # Add new  watchers by owner
+        elsif ( ( $ARGSRef->{$key} =~ /^(AdminCc|Cc|Requestor)$/ )
+            and ( $key =~ /^WatcherTypeUser(\d*)$/ ) )
+        {
+
+            #They're in this order because otherwise $1 gets clobbered :/
+            my ( $code, $msg ) =
+              $Ticket->AddWatcher( Type => $ARGSRef->{$key}, Owner => $1 );
+            push @results, $msg;
+        }
+    }
+
+    # }}}
+
+    return (@results);
+}
+
+# }}}
+
+# {{{ sub ProcessTicketDates
+
+=head2 ProcessTicketDates ( TicketObj => $Ticket, ARGSRef => \%ARGS );
+
+Returns an array of results messages.
+
+=cut
+
+sub ProcessTicketDates {
+    my %args = (
+        TicketObj => undef,
+        ARGSRef   => undef,
+        @_
+    );
+
+    my $Ticket  = $args{'TicketObj'};
+    my $ARGSRef = $args{'ARGSRef'};
+
+    my (@results);
+
+    # {{{ Set date fields
+    my @date_fields = qw(
+      Told
+      Resolved
+      Starts
+      Started
+      Due
+    );
+
+    #Run through each field in this list. update the value if apropriate
+    foreach $field (@date_fields) {
+        my ( $code, $msg );
+
+        my $DateObj = RT::Date->new( $session{'CurrentUser'} );
+
+        #If it's something other than just whitespace
+        if ( $ARGSRef->{ $field . '_Date' } ne '' ) {
+            $DateObj->Set(
+                Format => 'unknown',
+                Value  => $ARGSRef->{ $field . '_Date' }
+            );
+            my $obj = $field . "Obj";
+            if ( ( defined $DateObj->Unix )
+                and ( $DateObj->Unix ne $Ticket->$obj()->Unix() ) )
+            {
+                my $method = "Set$field";
+                my ( $code, $msg ) = $Ticket->$method( $DateObj->ISO );
+                push @results, "$msg";
+            }
+        }
+    }
+
+    # }}}
+    return (@results);
+}
+
+# }}}
+
+# {{{ sub ProcessTicketLinks
+
+=head2 ProcessTicketLinks ( TicketObj => $Ticket, ARGSRef => \%ARGS );
+
+Returns an array of results messages.
+
+=cut
+
+sub ProcessTicketLinks {
+    my %args = (
+        TicketObj => undef,
+        ARGSRef   => undef,
+        @_
+    );
+
+    my $Ticket  = $args{'TicketObj'};
+    my $ARGSRef = $args{'ARGSRef'};
+
+    my (@results);
+
+    # Delete links that are gone gone gone.
+    foreach my $arg ( keys %$ARGSRef ) {
+        if ( $arg =~ /DeleteLink-(.*?)-(DependsOn|MemberOf|RefersTo)-(.*)$/ ) {
+            my $base   = $1;
+            my $type   = $2;
+            my $target = $3;
+
+            push @results,
+              "Trying to delete: Base: $base Target: $target  Type $type";
+            my ( $val, $msg ) = $Ticket->DeleteLink(
+                Base   => $base,
+                Type   => $type,
+                Target => $target
+            );
+
+            push @results, $msg;
+
+        }
+
+    }
+
+    my @linktypes = qw( DependsOn MemberOf RefersTo );
+
+    foreach my $linktype (@linktypes) {
+
+        for my $luri ( split ( / /, $ARGSRef->{ $Ticket->Id . "-$linktype" } ) )
+        {
+            $luri =~ s/\s*$//;    # Strip trailing whitespace
+            my ( $val, $msg ) = $Ticket->AddLink(
+                Target => $luri,
+                Type   => $linktype
+            );
+            push @results, $msg;
+        }
+
+        for my $luri ( split ( / /, $ARGSRef->{ "$linktype-" . $Ticket->Id } ) )
+        {
+            my ( $val, $msg ) = $Ticket->AddLink(
+                Base => $luri,
+                Type => $linktype
+            );
+
+            push @results, $msg;
+        }
+    }
+
+    #Merge if we need to
+    if ( $ARGSRef->{ $Ticket->Id . "-MergeInto" } ) {
+        my ( $val, $msg ) =
+          $Ticket->MergeInto( $ARGSRef->{ $Ticket->Id . "-MergeInto" } );
+        push @results, $msg;
+    }
+
+    return (@results);
+}
+
+# }}}
+
+# {{{ sub ProcessTicketObjectKeywords
+
+=head2 ProcessTicketObjectKeywords ( TicketObj => $Ticket, ARGSRef => \%ARGS );
+
+Returns an array of results messages.
+
+=cut
+
+sub ProcessTicketObjectKeywords {
+    my %args = (
+        TicketObj => undef,
+        ARGSRef   => undef,
+        @_
+    );
+
+    my $TicketObj = $args{'TicketObj'};
+    my $ARGSRef   = $args{'ARGSRef'};
+
+    my (@results);
+
+    # {{{ set ObjectKeywords.
+
+    my $KeywordSelects = $TicketObj->QueueObj->KeywordSelects;
+
+    # iterate through all the keyword selects for this queue
+    while ( my $KeywordSelect = $KeywordSelects->Next ) {
+
+        # {{{ do some setup
+
+        # if we have KeywordSelectMagic for this keywordselect:
+        next
+          unless
+          defined $ARGSRef->{ 'KeywordSelectMagic' . $KeywordSelect->id };
+
+        # Lets get a hash of the possible values to work with
+        my $value = $ARGSRef->{ 'KeywordSelect' . $KeywordSelect->id } || [];
+
+        #lets get all those values in a hash. regardless of # of entries
+        #we'll use this for adding and deleting keywords from this object.
+        my %values = map { $_ => 1 } ref($value) ? @{$value} : ($value);
+
+        # Load up the ObjectKeywords for this KeywordSelect for this ticket
+        my $ObjectKeys = $TicketObj->KeywordsObj( $KeywordSelect->id );
+
+        # }}}
+        # {{{ add new keywords
+
+        foreach my $key ( keys %values ) {
+
+            #unless the ticket has that keyword for that keyword select,
+            unless ( $ObjectKeys->HasEntry($key) ) {
+
+                #Add the keyword
+                my ( $result, $msg ) = $TicketObj->AddKeyword(
+                    Keyword       => $key,
+                    KeywordSelect => $KeywordSelect->id
+                );
+                push ( @results, $msg );
+            }
+        }
+
+        # }}}
+        # {{{ Delete unused keywords
+
+        #redo this search, so we don't ask it to delete things that are already gone
+        # such as when a single keyword select gets its value changed.
+        $ObjectKeys = $TicketObj->KeywordsObj( $KeywordSelect->id );
+
+        while ( my $TicketKey = $ObjectKeys->Next ) {
+
+            # if the hash defined above doesn\'t contain the keyword mentioned,
+            unless ( $values{ $TicketKey->Keyword } ) {
+
+                #I'd really love to just call $keyword->Delete, but then 
+                # we wouldn't get a transaction recorded
+                my ( $result, $msg ) = $TicketObj->DeleteKeyword(
+                    Keyword       => $TicketKey->Keyword,
+                    KeywordSelect => $KeywordSelect->id
+                );
+                push ( @results, $msg );
+            }
+        }
+
+        # }}}
+    }
+
+    #Iterate through the keyword selects for BulkManipulator style access
+    while ( my $KeywordSelect = $KeywordSelects->Next ) {
+        if ( $ARGSRef->{ "AddToKeywordSelect" . $KeywordSelect->Id } ) {
+
+            #Add the keyword
+            my ( $result, $msg ) = $TicketObj->AddKeyword(
+                Keyword =>
+                $ARGSRef->{ "AddToKeywordSelect" . $KeywordSelect->Id },
+                KeywordSelect => $KeywordSelect->id
+            );
+            push ( @results, $msg );
+        }
+        if ( $ARGSRef->{ "DeleteFromKeywordSelect" . $KeywordSelect->Id } ) {
+
+            #Delete the keyword
+            my ( $result, $msg ) = $TicketObj->DeleteKeyword(
+                Keyword =>
+                $ARGSRef->{ "DeleteFromKeywordSelect" . $KeywordSelect->Id },
+                KeywordSelect => $KeywordSelect->id
+            );
+            push ( @results, $msg );
+        }
+    }
+
+    # }}}
+
+    return (@results);
+}
+
+# }}}
+
+1;
diff --git a/rt/lib/RT/Keyword.pm b/rt/lib/RT/Keyword.pm
new file mode 100644
index 000000000..a41e0a585
--- /dev/null
+++ b/rt/lib/RT/Keyword.pm
@@ -0,0 +1,446 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/Keyword.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+ RT::Keyword - Manipulate an RT::Keyword record
+
+=head1 SYNOPSIS
+
+  use RT::Keyword;
+
+  my $keyword = RT::Keyword->new($CurrentUser);
+  $keyword->Create( Name => 'tofu',
+		    Description => 'fermented soy beans',
+		  );
+  
+
+  my $keyword2 = RT::Keyword->new($CurrentUser);
+  $keyword2->Create( Name   => 'beast',
+		    Description => 'a wild animal',
+		    Parent => $keyword->id(),
+		  );
+
+=head1 DESCRIPTION
+
+An B<RT::Keyword> object is an arbitrary string. 
+
+=head1 METHODS
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Scrip);
+
+=end testing
+
+
+=cut 
+package RT::Keyword;
+
+use strict;
+use vars qw(@ISA);
+use Tie::IxHash;
+use RT::Record;
+use RT::Keywords;
+
+@ISA = qw(RT::Record);
+
+# {{{ Core methods
+
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = "Keywords";
+    $self->SUPER::_Init(@_);
+}
+
+sub _Accessible {
+    my $self = shift;
+    my %cols = (
+		Name        => 'read/write', #the keyword itself
+		Description => 'read/write', #a description of the keyword
+		Parent      => 'read/write', #optional id of another B<RT::Keyword>, allowing keywords to be arranged hierarchically
+		Disabled    => 'read/write'
+	       );
+    return ($self->SUPER::_Accessible( @_, %cols));
+    
+}
+
+# }}}
+
+
+=over 4
+
+=item new CURRENT_USER
+
+Takes a single argument, an RT::CurrentUser object.  Instantiates a new
+(uncreated) RT::Keyword object.
+
+=cut
+
+# {{{ sub Create
+
+=item Create KEY => VALUE, ...
+
+Takes a list of key/value pairs and creates a the object.  Returns the id of
+the newly created record, or false if there was an error.
+
+Keys are:
+
+Name - the keyword itself
+Description - (not yet used)
+Parent - optional link to another B<RT::Keyword>, allowing keyword to be arranged in a hierarchical fashion.  Can be specified by id or Name.
+
+=cut
+
+sub Create {
+    my $self = shift;
+    my %args = (Name => undef,
+		Description => undef,
+		Parent => 0,
+		@_);
+    
+    unless ($self->CurrentUserHasRight('AdminKeywords')) {
+	return (0, 'Permission Denied');
+    }    
+  
+    if ( $args{'Parent'} && $args{'Parent'} !~ /^\d+$/ ) {
+	$RT::Logger->err( "can't yet specify parents by name, sorry: ". $args{'Parent'});
+	return(0,'Parent must be specified by id');
+    }
+    
+    my $val = $self->SUPER::Create(Name => $args{'Name'},
+				   Description => $args{'Description'},
+				   Parent => $args{'Parent'}
+				  );
+    if ($val) {
+	return ($val, 'Keyword created');
+    }
+    else {
+	return(0,'Could not create keyword');
+    }	
+}
+
+# }}}
+
+# {{{ sub Delete
+
+sub Delete {
+    my $self = shift;
+    
+    return (0, 'Deleting this object would break referential integrity.');
+}
+
+# }}}
+
+# {{{ sub LoadByPath 
+
+=head2 LoadByPath STRING
+
+LoadByPath takes a string.  Whatever character starts the string is assumed to be a delimter.  The routine parses the keyword path description and tries to load the keyword
+described by that path.  It returns a numerical status and a textual message.
+A non-zero status means 'Success'.
+
+=cut
+
+sub LoadByPath {
+    my $self = shift;
+
+    my $path = shift;
+    
+    my $delimiter = substr($path,0,1);
+    my @path_elements = split($delimiter, $path);
+    
+    #throw awya the first bogus path element
+    shift @path_elements;
+    
+    my $parent = 0;
+    my ($tempkey);
+    #iterate through all the path elements loading up a
+    #keyword object. when we're done, this object becomes 
+    #whatever the last tempkey object was.
+    while (my $name = shift @path_elements) {
+	
+	$tempkey = new RT::Keyword($self->CurrentUser);
+
+	my $loaded = $tempkey->LoadByNameAndParentId($name, $parent);
+	
+	#Set the new parent for loading its child.
+	$parent = $tempkey->Id;
+	
+	#If the parent Id is 0, then we're not recursing through the tree
+	# time to bail
+	return (0, "Couldn't find keyword") unless ($tempkey->id());
+
+    }	
+    #Now that we're through with the loop, the last keyword loaded
+    # is the the one we wanted.
+    # we shouldn't need to explicitly load it like this. but we do. Thanks SQL
+    
+    $self->Load($tempkey->Id);
+    
+    return (1, 'Keyword loaded');
+}
+
+
+# }}}
+
+# {{{ sub LoadByNameAndParentId
+
+=head2 LoadByNameAndParentId NAME PARENT_ID
+  
+Takes two arguments, a keyword name and a parent id. Loads a keyword into 
+  the current object.
+
+=cut
+  
+sub LoadByNameAndParentId {
+    my $self = shift;
+    my $name = shift;
+    my $parentid = shift;
+    
+    my $val = $self->LoadByCols( Name => $name, Parent => $parentid);
+    if ($self->Id) {
+	return ($self->Id, 'Keyword loaded');
+    }	
+    else {
+	return (0, 'Keyword could not be found');
+    }
+  }
+
+# }}}
+
+
+# {{{ sub Load
+
+=head2 Load KEYWORD
+
+Loads KEYWORD, either by id if it's an integer or by Path, otherwise
+
+=cut
+
+sub Load {
+    my $self = shift;
+    my $id = shift;
+
+    if (!$id) {
+	return (0, 'No keyword defined');
+    }	
+    if ($id =~ /^(\d+)$/) {
+	 return ($self->SUPER::Load($id));
+    }
+    else {
+	 return($self->LoadByPath($id));
+    }
+}
+
+
+# }}}
+
+# {{{ sub Path
+
+=item Path
+
+  Returns this Keyword's full path going back to the root. (eg /OS/Unix/Linux/Redhat if 
+this keyword is "Redhat" )
+
+=cut
+
+sub Path {
+    my $self = shift;
+    
+    if ($self->Parent == 0) {
+	return ("/".$self->Name);
+    }
+    else {
+	return ( $self->ParentObj->Path . "/" . $self->Name);
+    }	
+    
+}
+
+# }}}
+
+# {{{ sub RelativePath 
+
+=head2 RelativePath KEYWORD_OBJ
+
+Takes a keyword object.  Returns this keyword's path relative to that
+keyword.  
+
+=item Bugs
+
+Currently assumes that the "other" keyword is a predecessor of this keyword
+
+=cut
+
+sub RelativePath {
+    my $self = shift;
+    my $OtherKey = shift;
+    
+    my $OtherPath = $OtherKey->Path();
+    my $MyPath = $self->Path;
+    $MyPath =~ s/^$OtherPath\///g;
+    return ($MyPath);
+}
+
+
+# }}}
+
+# {{{ sub ParentObj
+
+=item ParentObj
+
+  Returns an RT::Keyword object of this Keyword's 'parents'
+
+=cut
+
+sub ParentObj {
+    my $self = shift;
+    
+    my $ParentObj = new RT::Keyword($self->CurrentUser);
+    $ParentObj->Load($self->Parent);
+    return ($ParentObj);
+}
+
+# }}}
+
+# {{{ sub Children
+
+=item Children
+
+Return an RT::Keywords object  this Object's children.
+
+=cut
+
+sub Children {
+    my $self = shift;
+    
+    my $Children = new RT::Keywords($self->CurrentUser);
+    $Children->LimitToParent($self->id);
+    return ($Children);
+}
+
+# }}}
+
+# {{{ sub Descendents
+
+=item Descendents [ NUM_GENERATIONS [ EXCLUDE_HASHREF ]  ]
+
+Returns an ordered (see L<Tie::IxHash>) hash reference of the descendents of
+this keyword, possibly limited to a given number of generations.  The keys
+are B<RT::Keyword> I<id>s, and the values are strings containing the I<Name>s
+of those B<RT::Keyword>s.
+
+=cut
+
+sub Descendents {
+    my $self = shift;
+    my $generations = shift || 0;
+    my $exclude = shift || {};
+    my %results;
+    
+
+    tie %results, 'Tie::IxHash';
+    my $Keywords = new RT::Keywords($self->CurrentUser);
+    $Keywords->LimitToParent($self->id || 0 ); #If we have no id, start at the top
+    
+    while ( my $Keyword = $Keywords->Next ) {
+	
+	next if defined $exclude->{ $Keyword->id };
+	$results{ $Keyword->id } = $Keyword->Name;
+		
+	if ( $generations == 0 || $generations > 1 ) {
+	    #if we're limiting to some number of generations,
+	    # decrement the number of generations
+
+	    my $nextgen = $generations;
+	    $nextgen-- if ( $nextgen > 1 );
+	    
+	    my $kids = $Keyword->Descendents($nextgen, \%results);
+	    
+	    foreach my $kid ( keys %{$kids}) {
+		$results{"$kid"} = $Keyword->Name. "/". $kids->{"$kid"};
+	    }
+	}
+    }
+    return(\%results);
+}
+
+# }}}
+
+# {{{ ACL related methods
+
+# {{{ sub _Set
+
+# does an acl check and then passes off the call
+sub _Set {
+    my $self = shift;
+    
+    unless ($self->CurrentUserHasRight('AdminKeywords')) {
+	return (0,'Permission Denied');
+    }
+    return $self->SUPER::_Set(@_);
+}
+
+# }}}
+
+# {{{ sub CurrentUserHasRight
+
+=head2 CurrentUserHasRight
+
+Helper menthod for HasRight. Presets Principal to CurrentUser then 
+calls HasRight.
+
+=cut
+
+sub CurrentUserHasRight {
+    my $self = shift;
+    my $right = shift;
+    return ($self->HasRight( Principal => $self->CurrentUser->UserObj,
+                             Right => $right ));
+    
+}
+
+# }}}
+
+# {{{ sub HasRight
+
+=head2 HasRight
+
+Takes a param-hash consisting of "Right" and "Principal"  Principal is 
+an RT::User object or an RT::CurrentUser object. "Right" is a textual
+Right string that applies to Keywords.
+
+=cut
+
+sub HasRight {
+    my $self = shift;
+    my %args = ( Right => undef,
+                 Principal => undef,
+                 @_ );
+
+    return( $args{'Principal'}->HasSystemRight( $args{'Right'}) );
+
+}
+# }}}
+
+# }}}
+
+=back
+
+=head1 AUTHOR
+
+Ivan Kohler <ivan-rt@420.am>
+
+=head1 BUGS
+
+Yes.
+
+=head1 SEE ALSO
+
+L<RT::Keywords>, L<RT::ObjectKeyword>, L<RT::ObjectKeywords>, L<RT::Ticket>,
+L<RT::Record>
+
+[A=cut
+
+1;
+
diff --git a/rt/lib/RT/KeywordSelect.pm b/rt/lib/RT/KeywordSelect.pm
new file mode 100644
index 000000000..6865216fd
--- /dev/null
+++ b/rt/lib/RT/KeywordSelect.pm
@@ -0,0 +1,452 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/KeywordSelect.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+package RT::KeywordSelect;
+
+use strict;
+use vars qw(@ISA);
+use RT::Record;
+use RT::Keyword;
+
+@ISA = qw(RT::Record);
+
+# {{{ POD
+
+=head1 NAME
+
+ RT::KeywordSelect - Manipulate an RT::KeywordSelect record
+
+=head1 SYNOPSIS
+
+  use RT::KeywordSelect;
+
+  my $keyword_select = RT::KeywordSelect->new($CurrentUser);
+  $keyword_select->Create(
+    Keyword     => 20,
+    ObjectType => 'Ticket',
+    Name       => 'Choices'
+  );
+
+  my $keyword_select = RT::KeywordSelect->new($CurrentUser);
+  $keyword_select->Create(
+    Name        => 'Choices',			  
+    Keyword     => 20,
+    ObjectType  => 'Ticket',
+    ObjectField => 'Queue',
+    ObjectValue => 1,
+    Single      => 1,
+    Depth => 4,
+  );
+
+=head1 DESCRIPTION
+
+An B<RT::KeywordSelect> object is a link between a Keyword and a object
+type (one of: Ticket), titled by the I<Name> field of the B<RT::Keyword> such
+that:
+
+=over 4
+
+=item Object display will contain a field, titled with the I<Name> field and
+  showing any descendent keywords which are related to this object via the
+  B<RT::ObjectKeywords> table.
+
+=item Object creation for this object will contain a field titled with the
+  I<Name> field and containing the descendents of the B<RT::Keyword> as
+  choices.  If the I<Single> field of this B<RT::KeywordSelect> is true, each
+  object must be associated (via an B<RT::ObjectKeywords> record) to a single
+  descendent.  If the I<Single> field is false, each object may be connect to
+  zero, one, or many descendents.
+
+=item Searches for this object type will contain a selection field titled with
+  the I<Name> field and containing the descendents of the B<RT::Keyword> as
+  choices.
+
+=item If I<ObjectField> is defined (one of: Queue), all of the above apply only
+  when the value of I<ObjectField> (Queue) in B<ObjectType> (Ticket) matches
+  I<ObjectValue>.
+
+=back
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::KeywordSelects);
+
+=end testing
+
+
+=head1 METHODS
+
+
+=cut
+
+
+=over 4
+
+=item new CURRENT_USER
+
+Takes a single argument, an RT::CurrentUser object.  Instantiates a new
+(uncreated) RT::KeywordSelect object.
+
+=cut
+# }}}
+
+# {{{ sub _Init
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = "KeywordSelects";
+    $self->SUPER::_Init(@_);
+}
+# }}}
+
+# {{{ sub _Accessible
+sub _Accessible {
+    my $self = shift;
+    my %Cols = (
+		Name => 'read/write',
+		Keyword => 'read/write', # link to Keywords.  Can be specified by id
+		Single => 'read/write', # bool (described below)
+
+		Depth => 'read/write', #- If non-zero, limits the descendents to this number of levels deep.
+		ObjectType  => 'read/write', # currently only C<Ticket>
+		ObjectField => 'read/write', #optional, currently only C<Queue>
+		ObjectValue => 'read/write', #constrains KeywordSelect function to when B<ObjectType>.I<ObjectField> equals I<ObjectValue>
+		Disabled => 'read/write'
+	       );
+    return($self->SUPER::_Accessible(@_, %Cols));  
+}
+# }}}
+
+# {{{ sub LoadByName
+
+=head2 LoadByName( Name => [NAME], Queue => [QUEUE_ID])
+.  Takes a queue id and a keyword select name. 
+    tries to load the keyword select for that queue. if that fails, it tries to load it
+    without a queue specified.
+
+=cut
+
+
+sub LoadByName {
+    my $self = shift;
+    my %args = ( Name => undef,
+		 Queue => undef,
+		 @_
+	       );
+    if ($args{'Queue'}) {
+	#Try to get the keyword select for this queue
+	$self->LoadByCols( Name => $args{'Name'}, 
+			   ObjectType => 'Ticket', 
+			   ObjectField => 'Queue', 
+			   ObjectValue => $args{'Queue'});
+    }	
+    unless ($self->Id) { #if that failed to load an object
+	#Try to get the keyword select of that name that's global
+	$self->LoadByCols( Name => $args{'Name'}, 
+			   ObjectType => 'Ticket', 
+			   ObjectField => 'Queue', 
+			   ObjectValue => '0');
+    }
+    
+    return($self->Id);
+    
+}
+
+# }}}
+
+# {{{ sub Create
+=item Create KEY => VALUE, ...
+
+Takes a list of key/value pairs and creates a the object.  Returns the id of
+the newly created record, or false if there was an error.
+
+Keys are:
+
+Keyword - link to Keywords.  Can be specified by id.
+Name - A name for this KeywordSelect
+Single - bool (described above)
+Depth - If non-zero, limits the descendents to this number of levels deep.
+ObjectType - currently only C<Ticket>
+ObjectField - optional, currently only C<Queue>
+ObjectValue - constrains KeywordSelect function to when B<ObjectType>.I<ObjectField> equals I<ObjectValue>
+
+=cut
+
+sub Create {
+    my $self = shift;
+    my %args = ( Keyword => undef,
+		 Single => 1,
+		 Depth => 0,
+		 Name => undef,
+		 ObjectType => undef,
+		 ObjectField => undef,
+		 ObjectValue => undef,
+		 @_);
+
+    #If we're talking about a keyword select based on a ticket's 'Queue' field
+    if  ( ($args{'ObjectField'} eq 'Queue') and
+	  ($args{'ObjectType'} eq 'Ticket')) {
+	
+	#If we're talking about a keywordselect for all queues
+	if ($args{'ObjectValue'} == 0) {
+	    unless( $self->CurrentUserHasSystemRight('AdminKeywordSelects')) {
+		return (0, 'Permission Denied');
+	    }
+	}  
+	#otherwise, we're talking about a keywordselect for a specific queue
+	else {
+	    unless ($self->CurrentUserHasQueueRight( Right => 'AdminKeywordSelects',
+						     Queue => $args{'ObjectValue'})) {
+		return (0, 'Permission Denied');
+	    }
+	}
+    }
+    else {
+	return (0, "Can't create a KeywordSelect for that object/field combo");
+    }
+
+    my $Keyword = new RT::Keyword($self->CurrentUser);
+
+    if ( $args{'Keyword'} && $args{'Keyword'} !~ /^\d+$/ ) {
+	$Keyword->LoadByPath($args{'Keyword'});
+    }	
+    else {
+	$Keyword->Load($args{'Keyword'});
+    }
+
+    unless ($Keyword->Id) {
+	$RT::Logger->debug("Keyword ".$args{'Keyword'} ." not found\n");
+	return(0, 'Keyword not found');
+    }
+    
+    $args{'Name'} = $Keyword->Name if  (!$args{'Name'});
+    
+    my $val = $self->SUPER::Create( Name => $args{'Name'},
+				    Keyword => $Keyword->Id,
+				    Single => $args{'Single'},
+				    Depth => $args{'Depth'},
+				    ObjectType => $args{'ObjectType'},
+				    ObjectField => $args{'ObjectField'},
+				    ObjectValue => $args{'ObjectValue'});
+    if ($val) {
+	return ($val, 'KeywordSelect Created');
+    }
+    else {
+	return (0, 'System error. KeywordSelect not created');
+	
+    }
+}
+# }}}
+
+# {{{ sub Delete
+
+sub Delete {
+    my $self = shift;
+    
+    return (0, 'Deleting this object would break referential integrity.');
+}
+
+# }}}
+
+
+# {{{ sub SetDisabled
+
+=head2 Sub SetDisabled
+
+Toggles the KeywordSelect's disabled flag.
+
+
+=cut 
+
+sub SetDisabled {
+    my $self = shift;
+    my $value = shift;
+
+    unless ($self->CurrentUserHasRight('AdminKeywordSelects')) {
+	return (0, "Permission Denied");
+    }
+    return($self->_Set(Field => 'Disabled', Value => $value));
+}
+
+# }}}
+
+# {{{ sub KeywordObj
+
+=item KeywordObj
+
+Returns the B<RT::Keyword> referenced by the I<Keyword> field.
+
+=cut
+
+sub KeywordObj {
+    my $self = shift;
+
+    my $Keyword = new RT::Keyword($self->CurrentUser);
+    $Keyword->Load( $self->Keyword ); #or ?
+    return($Keyword);
+} 
+# }}}
+
+# {{{ sub Object
+
+=item Object
+
+Returns the object (currently only RT::Queue) specified by ObjectField and ObjectValue.
+
+=cut
+
+sub Object {
+    my $self = shift;
+    if ( $self->ObjectField eq 'Queue' ) {
+	my $Queue = new RT::Queue($self->CurrentUser);
+	$Queue->Load( $self->ObjectValue );
+	return ($Queue);
+    } else {
+	$RT::Logger->error("$self trying to load an object value for a non-queue object");
+	return (undef);
+    }
+}
+
+# }}}
+
+# {{{ sub _Set
+
+# does an acl check, then passes off the call
+sub _Set {
+    my $self = shift;
+
+    unless ($self->CurrentUserHasRight('AdminKeywordSelects')) {
+	return (0, "Permission Denied");
+    }
+    
+    return ($self->SUPER::_Set(@_));
+
+}
+
+# }}}
+
+
+# {{{ sub CurrentUserHasQueueRight 
+
+=head2 CurrentUserHasQueueRight ( Queue => QUEUEID, Right => RIGHTNANAME )
+
+Check to see whether the current user has the specified right for the specified queue.
+
+=cut
+
+sub CurrentUserHasQueueRight {
+    my $self = shift;
+    my %args = (Queue => undef,
+		Right => undef,
+		@_
+		);
+    return ($self->HasRight( Right => $args{'Right'},
+			     Principal => $self->CurrentUser->UserObj,
+			     Queue => $args{'Queue'}));
+}
+
+# }}}
+
+# {{{ sub CurrentUserHasSystemRight 
+
+=head2 CurrentUserHasSystemRight RIGHTNAME
+
+Check to see whether the current user has the specified right for the 'system' scope.
+
+=cut
+
+sub CurrentUserHasSystemRight {
+    my $self = shift;
+    my $right = shift;
+    $RT::Logger->debug("$self in hashsysright for right $right\n");
+    return ($self->HasRight( Right => $right,
+			     System => 1,
+			     Principal => $self->CurrentUser->UserObj));
+}
+
+# }}}
+
+# {{{ sub CurrentUserHasRight
+
+=item CurrentUserHasRight RIGHT  [QUEUEID]
+
+Takes a rightname as a string. Can take a queue id as a second
+optional parameter, which can be useful to a routine like create.
+Helper menthod for HasRight. Presets Principal to CurrentUser then 
+calls HasRight.
+
+=cut
+
+sub CurrentUserHasRight {
+    my $self = shift;
+    my $right = shift;
+    return ($self->HasRight( Principal => $self->CurrentUser->UserObj,
+                             Right => $right,
+			   ));
+}
+
+# }}}
+
+# {{{ sub HasRight
+
+=item HasRight
+
+Takes a param-hash consisting of "Right" and "Principal"  Principal is 
+an RT::User object or an RT::CurrentUser object. "Right" is a textual
+Right string that applies to KeywordSelects
+
+=cut
+
+sub HasRight {
+    my $self = shift;
+    my %args = ( Right => undef,
+                 Principal => undef,
+		 Queue => undef,
+		 System => undef,
+                 @_ );
+
+    #If we're explicitly specifying a queue, as we need to do on create
+    if ($args{'Queue'}) {
+	return ($args{'Principal'}->HasQueueRight(Right => $args{'Right'},
+						  Queue => $args{'Queue'}));
+    }
+    #else if we're specifying to check a system right
+    elsif ($args{'System'}) {
+        return( $args{'Principal'}->HasSystemRight( $args{'Right'} ));
+    }	
+
+    #else if we 're using the object's queue
+    elsif (($self->__Value('ObjectField') eq 'Queue') and
+	   ($self->__Value('ObjectValue') > 0 )) {
+        return ($args{'Principal'}->HasQueueRight(Right => $args{'Right'},
+						  Queue => $self->__Value('ObjectValue') )); 
+    }
+    
+    #If the object is system scoped.
+    else {
+        return( $args{'Principal'}->HasSystemRight( $args{'Right'} ));
+    }
+}
+
+# }}}
+
+=back
+
+=head1 AUTHORS
+
+Ivan Kohler <ivan-rt@420.am>, Jesse Vincent <jesse@fsck.com>
+
+=head1 BUGS
+
+The ACL system for this object is more byzantine than it should be.  reworking it eventually
+would be a good thing.
+
+=head1 SEE ALSO
+
+L<RT::KeywordSelects>, L<RT::Keyword>, L<RT::Keywords>, L<RT::ObjectKeyword>,
+L<RT::ObjectKeywords>, L<RT::Record>
+
+=cut
+
+1;
+
diff --git a/rt/lib/RT/KeywordSelects.pm b/rt/lib/RT/KeywordSelects.pm
new file mode 100644
index 000000000..c220b39f9
--- /dev/null
+++ b/rt/lib/RT/KeywordSelects.pm
@@ -0,0 +1,143 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/KeywordSelects.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Scrip);
+
+=end testing
+
+=cut
+
+
+package RT::KeywordSelects;
+
+use strict;
+use vars qw( @ISA );
+use RT::EasySearch;
+use RT::KeywordSelect;
+
+@ISA = qw( RT::EasySearch );
+
+# {{{ _Init
+sub _Init {
+  my $self = shift;
+  $self->{'table'} = 'KeywordSelects';
+  $self->{'primary_key'} = 'id';
+  return ($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub _DoSearch 
+
+=head2 _DoSearch
+
+  A subclass of DBIx::SearchBuilder::_DoSearch that makes sure that _Disabled rows never get seen unless
+we're explicitly trying to see them.
+
+=cut
+
+sub _DoSearch {
+    my $self = shift;
+    
+    #unless we really want to find disabled rows, make sure we\'re only finding enabled ones.
+    unless($self->{'find_disabled_rows'}) {
+	$self->LimitToEnabled();
+    }
+    
+    return($self->SUPER::_DoSearch(@_));
+    
+}
+
+# }}}
+
+# {{{ sub LimitToQueue
+=head2 LimitToQueue 
+
+Takes a queue id. Limits the returned set to KeywordSelects for that queue.
+Repeated calls will be OR'd together.
+
+=cut
+
+sub LimitToQueue {
+    my $self = shift;
+    my $queue = shift;
+
+    $self->Limit( FIELD => 'ObjectValue',
+		  VALUE => $queue,
+		  OPERATOR => '=',
+		  ENTRYAGGREGATOR => 'OR'
+		);
+
+    $self->Limit( FIELD => 'ObjectType',
+		  VALUE => 'Ticket',
+		  OPERATOR => '=');
+
+    $self->Limit( FIELD => 'ObjectField',
+		  VALUE => 'Queue',
+		  OPERATOR => '=');
+
+    
+}
+# }}}
+
+# {{{ sub LimitToGlobals
+
+=head2 LimitToGlobals
+
+Limits the returned set to KeywordSelects for all queues.
+Repeated calls will be OR'd together.
+
+=cut
+
+sub LimitToGlobals {
+    my $self = shift;
+
+    $self->Limit( FIELD => 'ObjectType',
+		  VALUE => 'Ticket',
+		  OPERATOR => '=');
+
+    $self->Limit( FIELD => 'ObjectField',
+		  VALUE => 'Queue',
+		  OPERATOR => '=');
+
+    $self->Limit( FIELD => 'ObjectValue',
+		  VALUE => '0',
+		  OPERATOR => '=',
+		  ENTRYAGGREGATOR => 'OR'
+		);
+    
+}
+# }}}
+
+# {{{ sub IncludeGlobals
+=head2 IncludeGlobals
+
+Include KeywordSelects which apply globally in the set of returned results
+
+=cut
+
+
+sub IncludeGlobals {
+    my $self = shift;
+    $self->Limit( FIELD => 'ObjectValue',
+		  VALUE => '0',
+		  OPERATOR => '=',
+		  ENTRYAGGREGATOR => 'OR'
+		);
+    
+
+}
+# }}}
+
+# {{{ sub NewItem
+sub NewItem {
+    my $self = shift;
+    #my $Handle = shift;
+    return (new RT::KeywordSelect($self->CurrentUser));
+}
+# }}}
+1;
+
diff --git a/rt/lib/RT/Keywords.pm b/rt/lib/RT/Keywords.pm
new file mode 100644
index 000000000..a9ecda2bc
--- /dev/null
+++ b/rt/lib/RT/Keywords.pm
@@ -0,0 +1,106 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/Keywords.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::Keywords - a collection of RT::Keyword objects
+
+=head1 SYNOPSIS
+
+  use RT::Keywords;
+  my $keywords = RT::Keywords->new($user);
+  $keywords->LimitToParent(0);
+  while my ($keyword = $keywords->Next()) {
+     print $keyword->Name ."\n";
+  }
+
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Keywords);
+
+=end testing
+
+=cut
+
+package RT::Keywords;
+
+use strict;
+use vars qw( @ISA );
+use RT::EasySearch;
+use RT::Keyword;
+
+@ISA = qw( RT::EasySearch );
+
+
+# {{{ sub _Init
+
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'Keywords';
+    $self->{'primary_key'} = 'id';
+
+    # By default, order by name
+    $self->OrderBy( ALIAS => 'main',
+		    FIELD => 'Name',
+		    ORDER => 'ASC');
+
+    return ($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub _DoSearch 
+
+=head2 _DoSearch
+
+  A subclass of DBIx::SearchBuilder::_DoSearch that makes sure that _Disabled rows never get seen unless
+we're explicitly trying to see them.
+
+=cut
+
+sub _DoSearch {
+    my $self = shift;
+    
+    #unless we really want to find disabled rows, make sure we\'re only finding enabled ones.
+    unless($self->{'find_disabled_rows'}) {
+	$self->LimitToEnabled();
+    }
+    
+    return($self->SUPER::_DoSearch(@_));
+    
+}
+
+# }}}
+
+# {{{ sub NewItem 
+sub NewItem {
+    my $self = shift;
+    return (RT::Keyword->new($self->CurrentUser));
+}
+# }}}
+
+# {{{ sub LimitToParent
+
+=head2 LimitToParent
+
+Takes a parent id and limits the returned keywords to children of that parent.
+
+=cut
+
+sub LimitToParent {
+    my $self = shift;
+    my $parent = shift;
+    $self->Limit( FIELD => 'Parent',
+		  VALUE => $parent,
+		  OPERATOR => '=',
+		  ENTRYAGGREGATOR => 'OR' );
+}	
+# }}}
+
+1;
+
diff --git a/rt/lib/RT/Link.pm b/rt/lib/RT/Link.pm
new file mode 100644
index 000000000..885ffe3ed
--- /dev/null
+++ b/rt/lib/RT/Link.pm
@@ -0,0 +1,373 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Link.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# (c) 1996-1999 Jesse Vincent <jesse@fsck.com>
+# This software is redistributable under the terms of the GNU GPL
+
+=head1 NAME
+
+  RT::Link - an RT Link object
+
+=head1 SYNOPSIS
+
+  use RT::Link;
+
+=head1 DESCRIPTION
+
+This module should never be called directly by client code. it's an internal module which
+should only be accessed through exported APIs in Ticket other similar objects.
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Link);
+
+=end testing
+
+=cut
+
+package RT::Link;
+use RT::Record;
+use Carp;
+@ISA= qw(RT::Record);
+
+# {{{ sub _Init
+sub _Init  {
+  my $self  = shift;
+  $self->{'table'} = "Links";
+  return ($self->SUPER::_Init(@_));
+}
+
+# }}}
+
+# {{{ sub Create 
+
+=head2 Create PARAMHASH
+
+Create a new link object. Takes 'Base', 'Target' and 'Type'.
+Returns undef on failure or a Link Id on success.
+
+=cut
+
+sub Create  {
+    my $self = shift;
+    my %args = ( Base => undef,
+		 Target => undef,
+		 Type => undef,
+		 @_ # get the real argumentlist
+	       );
+    
+    my $BaseURI = $self->CanonicalizeURI($args{'Base'});
+    my $TargetURI = $self->CanonicalizeURI($args{'Target'});
+    
+    unless (defined $BaseURI) {
+	$RT::Logger->warning ("$self couldn't resolve base:'".$args{'Base'}.
+			      "' into a URI\n");
+	return (undef);
+    }
+    unless (defined $TargetURI) {
+	$RT::Logger->warning ("$self couldn't resolve target:'".$args{'Target'}.
+			      "' into a URI\n");
+	return(undef);
+    }
+    
+    my $LocalBase = $self->_IsLocal($BaseURI);
+    my $LocalTarget = $self->_IsLocal($TargetURI);
+    my $id = $self->SUPER::Create(Base => "$BaseURI",
+				  Target => "$TargetURI",
+				  LocalBase => $LocalBase, 
+				  LocalTarget => $LocalTarget,
+				  Type => $args{'Type'});
+    return ($id);
+}
+
+# }}}
+ 
+# {{{ sub Load 
+
+=head2 Load
+
+  Load an RT::Link object from the database.  Takes one parameter or three.
+  One parameter is the id of an entry in the links table.  Three parameters are a tuple of (base, linktype, target);
+
+
+=cut
+
+sub Load  {
+  my $self = shift;
+  my $identifier = shift;
+  my $linktype = shift if (@_);
+  my $target = shift if (@_);
+  
+  if ($target) {
+      my $BaseURI = $self->CanonicalizeURI($identifier);
+      my $TargetURI = $self->CanonicalizeURI($target);
+      $self->LoadByCols( Base => $BaseURI,
+			 Type => $linktype,
+			 Target => $TargetURI
+		       ) || return (0, "Couldn't load link");
+  }
+  
+  elsif ($identifier =~ /^\d+$/) {
+      $self->LoadById($identifier) ||
+	return (0, "Couldn't load link");
+  }
+  else {
+	return (0, "That's not a numerical id");
+  }
+}
+
+# }}}
+
+# {{{ sub TargetObj 
+
+=head2 TargetObj
+
+=cut
+
+sub TargetObj {
+  my $self = shift;
+   return $self->_TicketObj('base',$self->Target);
+}
+# }}}
+
+# {{{ sub BaseObj
+
+=head2 BaseObj
+
+=cut
+
+sub BaseObj {
+  my $self = shift;
+  return $self->_TicketObj('target',$self->Base);
+}
+# }}}
+
+# {{{ sub _TicketObj
+sub _TicketObj {
+  my $self = shift;
+  my $name = shift;
+  my $ref = shift;
+  my $tag="$name\_obj";
+  
+  unless (exists $self->{$tag}) {
+
+  $self->{$tag}=RT::Ticket->new($self->CurrentUser);
+
+  #If we can get an actual ticket, load it up.
+  if ($self->_IsLocal($ref)) {
+      $self->{$tag}->Load($ref);
+    }
+  }
+  return $self->{$tag};
+}
+# }}}
+
+# {{{ sub _Accessible 
+sub _Accessible  {
+  my $self = shift;
+  my %Cols = (
+	      LocalBase => 'read',
+	      LocalTarget => 'read',
+	      Base => 'read',
+	      Target => 'read',
+	      Type => 'read',
+	      Creator => 'read/auto',
+	      Created => 'read/auto',
+	      LastUpdatedBy => 'read/auto',
+	      LastUpdated => 'read/auto'
+	     );
+  return($self->SUPER::_Accessible(@_, %Cols));
+}
+# }}}
+
+
+# Static methods:
+
+# {{{ sub BaseIsLocal
+
+=head2 BaseIsLocal
+
+Returns true if the base of this link is a local ticket
+
+=cut
+
+sub BaseIsLocal {
+  my $self = shift;
+  return $self->_IsLocal($self->Base);
+}
+
+# }}}
+
+# {{{ sub TargetIsLocal
+
+=head2 TargetIsLocal
+
+Returns true if the target of this link is a local ticket
+
+=cut
+
+sub TargetIsLocal {
+  my $self = shift;
+  return $self->_IsLocal($self->Target);
+}
+
+# }}}
+
+# {{{ sub _IsLocal
+
+=head2 _IsLocal URI 
+
+When handed a URI returns the local ticket id if it\'s local. otherwise returns undef.
+
+=cut
+
+sub _IsLocal {
+    my $self = shift;
+    my $URI=shift;
+    unless ($URI) {
+	$RT::Logger->warning ("$self _IsLocal called without a URI\n");
+	return (undef);
+    }
+    # TODO: More thorough check
+    if ($URI =~ /^$RT::TicketBaseURI(\d+)$/) {
+	return($1);
+    }
+    else {
+	return (undef);
+    }
+}
+# }}}
+
+
+# {{{ sub BaseAsHREF 
+
+=head2 BaseAsHREF
+
+Returns an HTTP url to access the base of this link
+
+=cut
+
+sub BaseAsHREF {
+  my $self = shift;
+  return $self->AsHREF($self->Base);
+}
+# }}}
+
+# {{{ sub TargetAsHREF 
+
+=head2 TargetAsHREF
+
+return an HTTP url to access the target of this link
+
+=cut
+
+sub TargetAsHREF {
+  my $self = shift;
+  return $self->AsHREF($self->Target);
+}
+# }}}
+
+# {{{ sub AsHREF - Converts Link URIs to HTTP URLs
+=head2 URI
+
+Takes a URI and returns an http: url to access that object.
+
+=cut
+sub AsHREF {
+    my $self=shift;
+    my $URI=shift;
+    if ($self->_IsLocal($URI)) {
+	my $url=$RT::WebURL . "Ticket/Display.html?id=$URI";
+	return($url);
+    } 
+    else {
+	my ($protocol) = $URI =~ m|(.*?)://|;
+	unless (exists $RT::URI2HTTP{$protocol}) {
+	    $RT::Logger->warning("Linking for protocol $protocol not defined in the config file!");
+	    return("");
+	}
+	return $RT::URI2HTTP{$protocol}->($URI);
+    }
+}
+
+# }}}
+
+# {{{ sub GetContent - gets the content from a link
+sub GetContent {
+    my ($self, $URI)= @_;
+    if ($self->_IsLocal($URI)) {
+	die "stub";
+    } else {
+	# Find protocol
+	if ($URI =~ m|^(.*?)://|) {
+	    if (exists $RT::ContentFromURI{$1}) {
+		return $RT::ContentFromURI{$1}->($URI);
+	    } else {
+		warn "No sub exists for fetching the content from a $1 in $URI";
+	    }
+	} else {
+	    warn "No protocol specified in $URI";
+	}
+    }
+}
+# }}}
+
+# {{{ sub CanonicalizeURI
+
+=head2 CanonicalizeURI
+
+Takes a single argument: some form of ticket identifier. 
+Returns its canonicalized URI.
+
+Bug: ticket aliases can't have :// in them. URIs must have :// in them.
+
+=cut
+
+sub CanonicalizeURI {
+    my $self = shift;
+    my $id = shift;
+    
+    
+    #If it's a local URI, load the ticket object and return its URI
+    if ($id =~ /^$RT::TicketBaseURI/) {
+	my $ticket = new RT::Ticket($self->CurrentUser);
+	$ticket->Load($id);
+	#If we couldn't find a ticket, return undef.
+	return undef unless (defined $ticket->Id);
+	#$RT::Logger->debug("$self -> CanonicalizeURI was passed $id and returned ".$ticket->URI ." (uri)\n");
+	return ($ticket->URI);
+    }
+    #If it's a remote URI, we're going to punt for now
+    elsif ($id =~ '://' ) {
+	return ($id);
+    }
+  
+    #If the base is an integer, load it as a ticket 
+    elsif ( $id =~ /^\d+$/ ) {
+	
+	#$RT::Logger->debug("$self -> CanonicalizeURI was passed $id. It's a ticket id.\n");
+	my $ticket = new RT::Ticket($self->CurrentUser);
+	$ticket->Load($id);
+	#If we couldn't find a ticket, return undef.
+	return undef unless (defined $ticket->Id);
+	#$RT::Logger->debug("$self returned ".$ticket->URI ." (id #)\n");
+	return ($ticket->URI);
+    }
+
+    #It's not a URI. It's not a numerical ticket ID
+    else { 
+     
+	#If we couldn't find a ticket, return undef.
+	return( undef);
+    
+    }
+
+ 
+}
+
+# }}}
+
+1;
+ 
diff --git a/rt/lib/RT/Links.pm b/rt/lib/RT/Links.pm
new file mode 100644
index 000000000..a8180caf0
--- /dev/null
+++ b/rt/lib/RT/Links.pm
@@ -0,0 +1,90 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Links.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::Links - A collection of Link objects
+
+=head1 SYNOPSIS
+
+  use RT::Links;
+  my $links = new RT::Links($CurrentUser);
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Links);
+
+=end testing
+
+=cut
+
+package RT::Links;
+use RT::EasySearch;
+use RT::Link;
+
+@ISA= qw(RT::EasySearch);
+
+# {{{ sub _Init  
+sub _Init   {
+  my $self = shift;
+ 
+  $self->{'table'} = "Links";
+  $self->{'primary_key'} = "id";
+
+
+  return ( $self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub Limit 
+sub Limit  {
+    my $self = shift;
+    my %args = ( ENTRYAGGREGATOR => 'AND',
+		 OPERATOR => '=',
+		 @_);
+    
+    #if someone's trying to search for tickets, try to resolve the uris for searching.
+    
+    if (  ( $args{'OPERATOR'} eq '=') and
+	  ( $args{'FIELD'}  eq 'Base') or ($args{'FIELD'} eq 'Target')
+       ) {
+	my $dummy = $self->NewItem();
+	  $uri = $dummy->CanonicalizeURI($args{'VALUE'});
+    }
+
+
+    # If we're limiting by target, order by base
+    # (Order by the thing that's changing)
+
+    if ( ($args{'FIELD'} eq 'Target') or 
+	 ($args{'FIELD'} eq 'LocalTarget') ) {
+	$self->OrderBy (ALIAS => 'main',
+			FIELD => 'Base',
+			ORDER => 'ASC');
+    }
+    elsif ( ($args{'FIELD'} eq 'Base') or 
+	    ($args{'FIELD'} eq 'LocalBase') ) {
+	$self->OrderBy (ALIAS => 'main',
+			FIELD => 'Target',
+			ORDER => 'ASC');
+    }
+    
+
+    $self->SUPER::Limit(%args);
+}
+# }}}
+
+# {{{ sub NewItem 
+sub NewItem  {
+    my $self = shift;
+    return(RT::Link->new($self->CurrentUser));
+}
+# }}}
+  1;
+
diff --git a/rt/lib/RT/ObjectKeyword.pm b/rt/lib/RT/ObjectKeyword.pm
new file mode 100644
index 000000000..287d41fab
--- /dev/null
+++ b/rt/lib/RT/ObjectKeyword.pm
@@ -0,0 +1,192 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/ObjectKeyword.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# Released under the terms of the GNU Public License
+
+=head1 NAME
+
+  RT::ObjectKeyword -- a keyword tied to an object in the database
+
+=head1 SYNOPSIS
+
+  use RT::ObjectKeyword;
+
+
+=head1 DESCRIPTION
+
+This module should never be called directly by client code. it's an internal module which
+should only be accessed through exported APIs in Ticket, Queue and other similar objects.
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::ObjectKeyword);
+
+=end testing
+
+=head1 METHODS
+
+=cut
+
+package RT::ObjectKeyword;
+
+use strict;
+use vars qw(@ISA);
+use RT::Record;
+
+@ISA = qw(RT::Record);
+
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = "ObjectKeywords";
+    $self->SUPER::_Init(@_);
+}
+
+sub _Accessible {
+    my $self = shift;
+    
+    my %cols = (
+		Keyword       => 'read/write', #link to the B<RT::Keyword>
+		KeywordSelect => 'read/write', #link to the B<RT::KeywordSelect>
+		ObjectType    => 'read/write', #currently only C<Ticket>
+		ObjectId      => 'read/write', #link to the object specified in I<ObjectType>
+	       );
+    return ($self->SUPER::_Accessible( @_, %cols));
+}
+
+
+
+# TODO - post 2.0. add in _Set and _Value, so we can ACL them.  protected at another API level
+
+
+=head1 NAME
+
+ RT::ObjectKeyword - Manipulate an RT::ObjectKeyword record
+
+=head1 SYNOPSIS
+
+  use RT::ObjectKeyword;
+
+  my $keyword = RT::ObjectKeyword->new($CurrentUser);
+  $keyword->Create;
+
+=head1 DESCRIPTION
+
+An B<RT::ObjectKeyword> object associates an B<RT::Keyword> with another
+object (currently only B<RT::Ticket>.
+
+This module should B<NEVER> be called directly by client code. its API is entirely through RT ticket or other objects which can have keywords assigned.
+
+
+=head1 METHODS
+
+=over 4
+
+=item new CURRENT_USER
+
+Takes a single argument, an RT::CurrentUser object.  Instantiates a new
+(uncreated) RT::ObjectKeyword object.
+
+=cut
+
+# {{{ sub Create
+
+=item Create KEY => VALUE, ...
+
+Takes a list of key/value pairs and creates a the object.  Returns the id of
+the newly created record, or false if there was an error.
+
+Keys are:
+
+Keyword - link to the B<RT::Keyword>
+ObjectType - currently only C<Ticket>
+ObjectId - link to the object specified in I<ObjectType>
+
+=cut
+
+
+sub Create {
+    my $self = shift;
+    my %args = (Keyword => undef,
+		KeywordSelect => undef,
+		ObjectType => undef,
+		ObjectId => undef,
+		@_);
+    
+    #TODO post 2.0 ACL check
+    
+    return ($self->SUPER::Create( Keyword => $args{'Keyword'}, 
+				  KeywordSelect => $args{'KeywordSelect'},
+				  ObjectType => $args{'ObjectType'}, 
+				  ObjectId => $args{'ObjectId'}))
+}
+# }}}
+
+# {{{ sub KeywordObj
+
+=item KeywordObj 
+
+Returns an B<RT::Keyword> object of the Keyword associated with this ObjectKeyword.
+
+=cut
+
+sub KeywordObj {
+    my $self = shift;
+    my $keyword = new RT::Keyword($self->CurrentUser);
+    $keyword->Load($self->Keyword);
+    return ($keyword);
+}
+# }}}
+
+# {{{ sub KeywordSelectObj
+
+=item KeywordSelectObj 
+
+Returns an B<RT::KeywordSelect> object of the KeywordSelect associated with this ObjectKeyword.
+
+=cut
+
+sub KeywordSelectObj {
+    my $self = shift;
+    my $keyword_sel = new RT::KeywordSelect($self->CurrentUser);
+    $keyword_sel->Load($self->KeywordSelect);
+    return ($keyword_sel);
+}
+# }}}
+
+# {{{ sub KeywordRelativePath
+
+=item KeywordRelativePath
+
+Returns a string of the Keyword's path relative to this ObjectKeyword's KeywordSelect
+
+
+
+=cut
+
+sub KeywordRelativePath {
+    my $self = shift;
+    return($self->KeywordObj->RelativePath(
+              $self->KeywordSelectObj->KeywordObj->Path));
+    
+}
+# }}}
+
+=back
+
+=head1 AUTHOR
+
+Ivan Kohler <ivan-rt@420.am>
+
+=head1 BUGS
+
+Yes.
+
+=head1 SEE ALSO
+
+L<RT::ObjectKeywords>, L<RT::Keyword>, L<RT::Keywords>, L<RT::Ticket>,
+L<RT::Record>
+
+=cut
+
+1;
+
diff --git a/rt/lib/RT/ObjectKeywords.pm b/rt/lib/RT/ObjectKeywords.pm
new file mode 100644
index 000000000..5df996e37
--- /dev/null
+++ b/rt/lib/RT/ObjectKeywords.pm
@@ -0,0 +1,234 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/ObjectKeywords.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+package RT::ObjectKeywords;
+
+use strict;
+use vars qw( @ISA );
+
+=head1 NAME
+
+	RT::ObjectKeywords - note warning
+
+=head1 WARNING
+
+This module should B<NEVER> be called directly by client code. its API is entirely through RT ticket or other objects which can have keywords assigned.
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::ObjectKeywords);
+
+=end testing
+
+=cut
+
+use RT::EasySearch;
+use RT::ObjectKeyword;
+
+@ISA = qw( RT::EasySearch );
+
+# {{{ sub _Init
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'ObjectKeywords';
+    $self->{'primary_key'} = 'id';
+    return ($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub NewItem
+sub NewItem {
+    my $self = shift;
+    return (new RT::ObjectKeyword($self->CurrentUser));
+}
+# }}}
+
+# {{{ sub LimitToKeywordSelect
+
+=head2 LimitToKeywordSelect
+
+  Takes a B<RT::KeywordSelect> id or Nameas its single argument. limits the returned set of ObjectKeywords
+to ObjectKeywords which apply to that ticket
+
+=cut
+
+
+sub LimitToKeywordSelect {
+    my $self = shift;
+    my $keywordselect = shift;
+    
+    if ($keywordselect =~ /^\d+$/) {
+
+	$self->Limit(FIELD => 'KeywordSelect',
+		     OPERATOR => '=',
+		     ENTRYAGGREGATOR => 'OR',
+		     VALUE => "$keywordselect");
+    }
+
+    #We're limiting by name. time to be klever
+    else {
+	my $ks = $self->NewAlias('KeywordSelects');
+	$self->Join(ALIAS1 => $ks, FIELD1 => 'id',
+		    ALIAS2 => 'main', FIELD2 => 'KeywordSelect');
+	
+	$self->Limit( ALIAS => "$ks",
+		       FIELD => 'Name',
+		       VALUE => "$keywordselect",
+		       OPERATOR => "=",
+		       ENTRYAGGREGATOR => "OR");
+
+	$self->Limit ( ALIAS => "$ks",
+		       FIELD => 'ObjectType',
+		       VALUE => 'Ticket',
+		       OPERATOR => '=',
+		     );
+
+	$self->Limit ( ALIAS => "$ks",
+		       FIELD => 'ObjectField',
+		       VALUE => 'Queue',
+		       OPERATOR => '=',
+		     );
+
+
+	# TODO +++ we need to be able to limit the returned
+	# keywordselects to ones that apply only to this queue
+	#	$self->Limit( ALIAS => "$ks",
+	#		       FIELD => 'ObjectValue',
+	#		       VALUE => $self->QueueObj->Id,
+	#		       OPERATOR => "=",
+	#		       ENTRYAGGREGATOR => "OR");	
+
+    }
+
+
+
+}
+
+# }}}
+
+# {{{ LimitToTicket
+
+=head2 LimitToTicket TICKET_ID
+
+  Takes an B<RT::Ticket> id as its single argument. limits the returned set of ObjectKeywords
+to ObjectKeywords which apply to that ticket
+
+=cut
+
+sub LimitToTicket {
+    my $self = shift;
+    my $ticket = shift;
+    $self->Limit(FIELD => 'ObjectId',
+		 OPERATOR => '=',
+		 ENTRYAGGREGATOR => 'OR',
+		 VALUE => "$ticket");
+
+    $self->Limit(FIELD => 'ObjectType',
+		 OPERATOR => '=',
+		 ENTRYAGGREGATOR => 'OR',
+		 VALUE => "Ticket");
+    
+}
+
+# }}}
+
+# {{{ sub _DoSearch
+#wrap around _DoSearch  so that we can build the hash of returned
+#values 
+
+sub _DoSearch {
+    my $self = shift;
+   # $RT::Logger->debug("Now in ".$self."->_DoSearch");
+    my $return = $self->SUPER::_DoSearch(@_);
+  #  $RT::Logger->debug("In $self ->_DoSearch. return from SUPER::_DoSearch was $return\n");
+    $self->_BuildHash();
+    return ($return);
+}
+# }}}
+
+# {{{ sub _BuildHash
+#Build a hash of this ACL's entries.
+sub _BuildHash {
+    my $self = shift;
+
+    while (my $entry = $self->Next) {
+
+	my $hashkey = $entry->Keyword;
+        $self->{'as_hash'}->{"$hashkey"} =1;
+    }
+
+}
+# }}}
+
+# {{{ HasEntry
+
+=head2 HasEntry KEYWORD_ID
+  
+  Takes a keyword id and returns true if this ObjectKeywords object has an entry for that
+keyword.  Returns undef otherwise.
+
+=cut
+
+sub HasEntry {
+
+    my $self = shift;
+    my $keyword = shift;
+
+
+    #if we haven't done the search yet, do it now.
+    $self->_DoSearch();
+    
+    #    $RT::Logger->debug("Now in ".$self."->HasEntry\n");
+    
+    
+    if ($self->{'as_hash'}->{ $keyword } == 1) {
+	return(1);
+    }
+    else {
+	return(undef);
+    }
+}
+
+# }}}
+
+# {{{ sub RelativePaths
+
+=head2 RelativePaths
+
+# Return a (reference to a) list of KeywordRelativePaths
+
+=cut
+
+sub RelativePaths  {
+    my $self = shift;
+
+    my @list;
+
+    # Here $key is a RT::ObjectKeyword
+    while (my $key=$self->Next()) {
+	push(@list, $key->KeywordRelativePath);
+    }
+    return(\@list);
+}
+# }}}
+
+# {{{ sub RelativePathsAsString
+
+=head2 RelativePathsAsString
+
+# Returns the RT::ObjectKeywords->RelativePaths as a comma seperated string
+
+=cut
+
+sub RelativePathsAsString {
+    my $self = shift;
+    return(join(", ",@{$self->KeywordRelativePaths}));
+}
+# }}}
+
+1;
+
diff --git a/rt/lib/RT/Queue.pm b/rt/lib/RT/Queue.pm
new file mode 100755
index 000000000..1656903b3
--- /dev/null
+++ b/rt/lib/RT/Queue.pm
@@ -0,0 +1,944 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Queue.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::Queue - an RT Queue object
+
+=head1 SYNOPSIS
+
+  use RT::Queue;
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing 
+use RT::TestHarness;
+
+use RT::Queue;
+
+=end testing
+
+=cut
+
+
+
+package RT::Queue;
+use RT::Record;
+
+@ISA= qw(RT::Record);
+
+use vars (@STATUS);
+
+@STATUS = qw(new open stalled resolved dead); 
+
+=head2 StatusArray
+
+Returns an array of all statuses for this queue
+
+=cut
+
+sub StatusArray {
+    my $self = shift;
+    return (@STATUS);
+}
+
+
+=head2 IsValidStatus VALUE
+
+Returns true if VALUE is a valid status.  Otherwise, returns 0
+
+=for testing
+my $q = new RT::Queue($RT::SystemUser);
+ok($q->IsValidStatus('new')== 1, 'New is a valid status');
+ok($q->IsValidStatus('f00')== 0, 'f00 is not a valid status');
+
+=cut
+
+sub IsValidStatus {
+	my $self = shift;
+	my $value = shift;
+
+	my $retval = grep (/^$value$/, $self->StatusArray);
+ 	return ($retval);	
+
+}
+	
+
+
+
+# {{{  sub _Init 
+sub _Init  {
+    my $self = shift;
+    $self->{'table'} = "Queues";
+    return ($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub _Accessible 
+
+sub _Accessible  {
+    my $self = shift;
+    my %Cols = ( Name => 'read/write',
+		 CorrespondAddress => 'read/write',
+		 Description => 'read/write',
+		 CommentAddress =>  'read/write',
+		 InitialPriority =>  'read/write',
+		 FinalPriority =>  'read/write',
+		 DefaultDueIn =>  'read/write',
+		 Creator => 'read/auto',
+		 Created => 'read/auto',
+		 LastUpdatedBy => 'read/auto',
+		 LastUpdated => 'read/auto',
+		 Disabled => 'read/write',
+		 
+	       );
+    return($self->SUPER::_Accessible(@_, %Cols));
+}
+
+# }}}
+
+# {{{ sub Create
+
+=head2 Create
+
+Create takes the name of the new queue 
+If you pass the ACL check, it creates the queue and returns its queue id.
+
+=cut
+
+sub Create  {
+    my $self = shift;
+    my %args = ( Name => undef,
+		 CorrespondAddress => '',
+		 Description => '',
+		 CommentAddress => '',
+		 InitialPriority => "0",
+		 FinalPriority =>  "0",
+		 DefaultDueIn =>  "0",
+		 @_); 
+    
+    unless ($self->CurrentUser->HasSystemRight('AdminQueue')) {    #Check them ACLs
+	return (0, "No permission to create queues") 
+    }
+
+    unless ($self->ValidateName($args{'Name'})) {
+	return(0, 'Queue already exists');
+    }
+    #TODO better input validation
+    
+    my $id = $self->SUPER::Create(%args);
+    unless ($id) {
+	return (0, 'Queue could not be created');
+    }
+
+    return ($id, "Queue $id created");
+}
+
+# }}}
+
+# {{{ sub Delete 
+
+sub Delete {
+    my $self = shift;
+    return (0, 'Deleting this object would break referential integrity');
+}
+
+# }}}
+
+# {{{ sub SetDisabled
+
+=head2 SetDisabled
+
+Takes a boolean.
+1 will cause this queue to no longer be avaialble for tickets.
+0 will re-enable this queue
+
+=cut
+
+# }}}
+
+# {{{ sub Load 
+
+=head2 Load
+
+Takes either a numerical id or a textual Name and loads the specified queue.
+  
+=cut
+
+sub Load  {
+    my $self = shift;
+    
+    my $identifier = shift;
+    if (!$identifier) {
+	return (undef);
+    }	    
+    
+    if ($identifier !~ /\D/) {
+	$self->SUPER::LoadById($identifier);
+    }
+    else {
+	$self->LoadByCol("Name", $identifier);
+    }
+
+    return ($self->Id);
+
+
+}
+# }}}
+
+# {{{ sub ValidateName
+
+=head2 ValidateName NAME
+
+Takes a queue name. Returns true if it's an ok name for
+a new queue. Returns undef if there's already a queue by that name.
+
+=cut
+
+sub ValidateName {
+    my $self = shift;
+    my $name = shift;
+   
+    my $tempqueue = new RT::Queue($RT::SystemUser);
+    $tempqueue->Load($name);
+
+    #If we couldn't load it :)
+    unless ($tempqueue->id()) {
+	return(1);
+    }
+
+    #If this queue exists, return undef
+    #Avoid the ACL check.
+    if ($tempqueue->Name()){
+        return(undef);
+    }
+
+    #If the queue doesn't exist, return 1
+    else {
+        return(1);
+    }
+
+}
+
+
+# }}}
+
+# {{{ sub Templates
+
+=head2 Templates
+
+Returns an RT::Templates object of all of this queue's templates.
+
+=cut
+
+sub Templates {
+    my $self = shift;
+    
+
+    my $templates = RT::Templates->new($self->CurrentUser);
+
+    if ($self->CurrentUserHasRight('ShowTemplate')) {
+	$templates->LimitToQueue($self->id);
+    }
+    
+    return ($templates); 
+}
+
+# }}}
+
+# {{{ Dealing with watchers
+
+# {{{ sub Watchers
+
+=head2 Watchers
+
+Watchers returns a Watchers object preloaded with this queue\'s watchers.
+
+=cut
+
+sub Watchers {
+    my $self = shift;
+    
+    require RT::Watchers;
+    my $watchers =RT::Watchers->new($self->CurrentUser);
+    
+    if ($self->CurrentUserHasRight('SeeQueue')) {
+	$watchers->LimitToQueue($self->id);	
+    }	
+    
+    return($watchers);
+}
+
+# }}}
+
+# {{{ sub WatchersAsString
+=head2 WatchersAsString
+
+Returns a string of all queue watchers email addresses concatenated with ','s.
+
+=cut
+
+sub WatchersAsString {
+    my $self=shift;
+    return($self->Watchers->EmailsAsString());
+}
+
+# }}}
+
+# {{{ sub AdminCcAsString 
+
+=head2 AdminCcAsString
+
+Takes nothing. returns a string: All Ticket/Queue AdminCcs.
+
+=cut
+
+
+sub AdminCcAsString {
+    my $self=shift;
+    
+    return($self->AdminCc->EmailsAsString());
+  }
+
+# }}}
+
+# {{{ sub CcAsString
+
+=head2 CcAsString
+
+B<Returns> String: All Queue Ccs as a comma delimited set of email addresses.
+
+=cut
+
+sub CcAsString {
+    my $self=shift;
+    
+    return ($self->Cc->EmailsAsString());
+}
+
+# }}}
+
+# {{{ sub Cc
+
+=head2 Cc
+
+Takes nothing.
+Returns a watchers object which contains this queue\'s Cc watchers
+
+=cut
+
+sub Cc {
+    my $self = shift;
+    my $cc = $self->Watchers();
+    if ($self->CurrentUserHasRight('SeeQueue')) {
+	$cc->LimitToCc();
+    }
+    return ($cc);
+}
+
+# A helper function for Cc, so that we can call it from the ACL checks 
+# without going through acl checks.
+
+sub _Cc {
+    my $self = shift;
+    my $cc = $self->Watchers();
+    $cc->LimitToCc();
+    return($cc);
+    
+}
+
+# }}}
+
+# {{{ sub AdminCc
+
+=head2 AdminCc
+
+Takes nothing.
+Returns this queue's administrative Ccs as an RT::Watchers object
+
+=cut
+
+sub AdminCc {
+    my $self = shift;
+    my $admin_cc = $self->Watchers();
+    if ($self->CurrentUserHasRight('SeeQueue')) {
+ 	$admin_cc->LimitToAdminCc();
+    }
+    return($admin_cc);
+}
+
+#helper function for AdminCc so we can call it without ACLs
+sub _AdminCc {
+    my $self = shift;
+    my $admin_cc = $self->Watchers();
+    $admin_cc->LimitToAdminCc();
+    return($admin_cc);
+}
+
+# }}}
+
+# {{{ IsWatcher, IsCc, IsAdminCc
+
+# {{{ sub IsWatcher
+
+# a generic routine to be called by IsRequestor, IsCc and IsAdminCc
+
+=head2 IsWatcher
+
+Takes a param hash with the attributes Type and User. User is either a user object or string containing an email address. Returns true if that user or string
+is a queue watcher. Returns undef otherwise
+
+=cut
+
+sub IsWatcher {
+    my $self = shift;
+    
+    my %args = ( Type => 'Requestor',
+		 Id => undef,
+		 Email => undef,
+		 @_
+	       );
+    #ACL check - can't do it. we need this method for ACL checks
+    #    unless ($self->CurrentUserHasRight('SeeQueue')) {
+    #	return(undef);
+    #    }
+
+
+    my %cols = ('Type' => $args{'Type'},
+		'Scope' => 'Queue',
+		'Value' => $self->Id
+	       );
+    if (defined ($args{'Id'})) {
+	if (ref($args{'Id'})){ #If it's a ref, assume it's an RT::User object;
+	    #Dangerous but ok for now
+	    $cols{'Owner'} = $args{'Id'}->Id;
+	}
+	elsif ($args{'Id'} =~ /^\d+$/) { # if it's an integer, it's an RT::User obj
+	    $cols{'Owner'} = $args{'Id'};
+	}
+	else {
+	    $cols{'Email'} = $args{'Id'};
+	}	
+    }	
+    
+    if (defined $args{'Email'}) {
+	$cols{'Email'} = $args{'Email'};
+    }
+
+    my ($description);
+    $description = join(":",%cols);
+    
+    #If we've cached a positive match...
+    if (defined $self->{'watchers_cache'}->{"$description"}) {
+	if ($self->{'watchers_cache'}->{"$description"} == 1) {
+	    return(1);
+	}
+	#If we've cached a negative match...
+	else {
+	    return(undef);
+	}
+    }
+
+    require RT::Watcher;
+    my $watcher = new RT::Watcher($self->CurrentUser);
+    $watcher->LoadByCols(%cols);
+    
+    
+    if ($watcher->id) {
+	$self->{'watchers_cache'}->{"$description"} = 1;
+	return(1);
+    }	
+    else {
+	$self->{'watchers_cache'}->{"$description"} = 0;
+	return(undef);
+    }
+    
+}
+
+# }}}
+
+# {{{ sub IsCc
+
+=head2 IsCc
+
+Takes a string. Returns true if the string is a Cc watcher of the current queue
+
+=item Bugs
+
+Should also be able to handle an RT::User object
+
+=cut
+
+
+sub IsCc {
+  my $self = shift;
+  my $cc = shift;
+  
+  return ($self->IsWatcher( Type => 'Cc', Id => $cc ));
+  
+}
+
+# }}}
+
+# {{{ sub IsAdminCc
+
+=head2 IsAdminCc
+
+Takes a string. Returns true if the string is an AdminCc watcher of the current queue
+
+=item Bugs
+
+Should also be able to handle an RT::User object
+
+=cut
+
+sub IsAdminCc {
+  my $self = shift;
+  my $admincc = shift;
+  
+  return ($self->IsWatcher( Type => 'AdminCc', Id => $admincc ));
+  
+}
+
+# }}}
+
+# }}}
+
+# {{{ sub AddWatcher
+
+=head2 AddWatcher
+
+Takes a paramhash of Email, Owner and Type. Type is one of 'Cc' or 'AdminCc',
+We need either an Email Address in Email or a userid in Owner
+
+=cut
+
+sub AddWatcher {
+    my $self = shift;
+    my %args = ( Email => undef,
+		 Type => undef,
+		 Owner => 0,
+		 @_
+	       );
+    
+    # {{{ Check ACLS
+    #If the watcher we're trying to add is for the current user
+    if ( ( ( defined $args{'Email'})  && 
+           ( $args{'Email'} eq $self->CurrentUser->EmailAddress) ) or 
+	 ($args{'Owner'} eq $self->CurrentUser->Id)) {
+	
+	#  If it's an AdminCc and they don't have 
+	#   'WatchAsAdminCc' or 'ModifyQueueWatchers', bail
+	if ($args{'Type'} eq 'AdminCc') {
+	    unless ($self->CurrentUserHasRight('ModifyQueueWatchers') or 
+		    $self->CurrentUserHasRight('WatchAsAdminCc')) {
+		return(0, 'Permission Denied');
+	    }
+	}
+
+	#  If it's a Requestor or Cc and they don't have
+	#   'Watch' or 'ModifyQueueWatchers', bail
+	elsif ($args{'Type'} eq 'Cc') {
+	    unless ($self->CurrentUserHasRight('ModifyQueueWatchers') or 
+		    $self->CurrentUserHasRight('Watch')) {
+		return(0, 'Permission Denied');
+	    }
+	}
+	else {
+	    $RT::Logger->warn("$self -> AddWatcher hit code".
+			      " it never should. We got passed ".
+			      " a type of ". $args{'Type'});
+	    return (0,'Error in parameters to $self AddWatcher');
+	}
+    }
+    # If the watcher isn't the current user 
+    # and the current user  doesn't have 'ModifyQueueWatchers'
+    # bail
+    else {
+	unless ($self->CurrentUserHasRight('ModifyQueueWatchers')) {
+	    return (0, "Permission Denied");
+	}
+    }
+    # }}}
+        
+    require RT::Watcher;
+    my $Watcher = new RT::Watcher ($self->CurrentUser);
+    return ($Watcher->Create(Scope => 'Queue', 
+			     Value => $self->Id,
+			     Email => $args{'Email'},
+			     Type => $args{'Type'},
+			     Owner => $args{'Owner'}
+			    ));
+}
+
+# }}}
+
+# {{{ sub AddCc
+
+=head2 AddCc
+
+Add a Cc to this queue.
+Takes a paramhash of Email and Owner. 
+We need either an Email Address in Email or a userid in Owner
+
+=cut
+
+
+sub AddCc {
+    my $self = shift;
+    return ($self->AddWatcher( Type => 'Cc', @_));
+}
+# }}}
+
+# {{{ sub AddAdminCc
+
+=head2 AddAdminCc
+
+Add an Administrative Cc to this queue.
+Takes a paramhash of Email and Owner. 
+We need either an Email Address in Email or a userid in Owner
+
+=cut
+
+sub AddAdminCc {
+    my $self = shift;
+    return ($self->AddWatcher( Type => 'AdminCc', @_));
+}
+# }}}
+
+# {{{ sub DeleteWatcher
+
+=head2 DeleteWatcher id [type]
+
+DeleteWatcher takes a single argument which is either an email address 
+or a watcher id.  
+If the first argument is an email address, you need to specify the watcher type you're talking
+about as the second argument. Valid values are 'Cc' or 'AdminCc'.
+It removes that watcher from this Queue\'s list of watchers.
+
+
+=cut
+
+
+sub DeleteWatcher {
+    my $self = shift;
+    my $id = shift;
+    
+    my $type;
+    
+    $type = shift if (@_);
+    
+
+    require RT::Watcher;
+    my $Watcher = new RT::Watcher($self->CurrentUser);
+    
+    #If it\'s a numeric watcherid
+    if ($id =~ /^(\d*)$/) {
+	$Watcher->Load($id);
+    }
+    
+    #Otherwise, we'll assume it's an email address
+    elsif ($type) {
+	my ($result, $msg) = 
+	  $Watcher->LoadByValue( Email => $id,
+				 Scope => 'Queue',
+				 Value => $self->id,
+				 Type => $type);
+	return (0,$msg) unless ($result);
+    }
+    
+    else {
+	return(0,"Can\'t delete a watcher by email address without specifying a type");
+    }
+    
+    # {{{ Check ACLS 
+
+    #If the watcher we're trying to delete is for the current user
+    if ($Watcher->Email eq $self->CurrentUser->EmailAddress) {
+		
+	#  If it's an AdminCc and they don't have 
+	#   'WatchAsAdminCc' or 'ModifyQueueWatchers', bail
+	if ($Watcher->Type eq 'AdminCc') {
+	    unless ($self->CurrentUserHasRight('ModifyQueueWatchers') or 
+		    $self->CurrentUserHasRight('WatchAsAdminCc')) {
+		return(0, 'Permission Denied');
+	    }
+	}
+
+	#  If it's a  Cc and they don't have
+	#   'Watch' or 'ModifyQueueWatchers', bail
+	elsif ($Watcher->Type eq 'Cc') {
+	    unless ($self->CurrentUserHasRight('ModifyQueueWatchers') or 
+		    $self->CurrentUserHasRight('Watch')) {
+		return(0, 'Permission Denied');
+	    }
+	}
+	else {
+	    $RT::Logger->warn("$self -> DeleteWatcher hit code".
+			      " it never should. We got passed ".
+			      " a type of ". $args{'Type'});
+	    return (0,'Error in parameters to $self DeleteWatcher');
+	}
+    }
+    # If the watcher isn't the current user 
+    # and the current user  doesn't have 'ModifyQueueWatchers'
+    # bail
+    else {
+	unless ($self->CurrentUserHasRight('ModifyQueueWatchers')) {
+	    return (0, "Permission Denied");
+	}
+    }
+
+    # }}}
+    
+    unless (($Watcher->Scope eq 'Queue') and
+	    ($Watcher->Value == $self->id) ) {
+	return (0, "Not a watcher for this queue");
+    }
+    
+
+    #Clear out the watchers hash.
+    $self->{'watchers'} = undef;
+    
+    my $retval = $Watcher->Delete();
+    
+    unless ($retval) {
+	return(0,"Watcher could not be deleted.");
+    }
+    
+    return(1, "Watcher deleted");
+}
+
+# {{{ sub DeleteCc
+
+=head2 DeleteCc EMAIL
+
+Takes an email address. It calls DeleteWatcher with a preset 
+type of 'Cc'
+
+
+=cut
+
+sub DeleteCc {
+   my $self = shift;
+   my $id = shift;
+   return ($self->DeleteWatcher ($id, 'Cc'))
+}
+
+# }}}
+
+# {{{ sub DeleteAdminCc
+
+=head2 DeleteAdminCc EMAIL
+
+Takes an email address. It calls DeleteWatcher with a preset 
+type of 'AdminCc'
+
+
+=cut
+
+sub DeleteAdminCc {
+   my $self = shift;
+   my $id = shift;
+   return ($self->DeleteWatcher ($id, 'AdminCc'))
+}
+
+# }}}
+
+
+# }}}
+
+# }}}
+
+# {{{ Dealing with keyword selects
+
+# {{{ sub AddKeywordSelect
+
+=head2 AddKeywordSelect
+
+Takes a paramhash of Name, Keyword, Depth and Single.  Adds a new KeywordSelect for 
+this queue with those attributes.
+
+=cut
+
+
+sub AddKeywordSelect {
+    my $self = shift;
+    my %args = ( Keyword => undef,
+		 Depth => undef,
+		 Single => undef,
+		 Name => undef,
+		 @_);
+    
+    #ACLS get handled in KeywordSelect
+    my $NewKeywordSelect = new RT::KeywordSelect($self->CurrentUser);
+    
+    return ($NewKeywordSelect->Create (Keyword => $args{'Keyword'},
+			       Depth => $args{'Depth'},
+			       Name => $args{'Name'},
+			       Single => $args{'Single'},
+			       ObjectType => 'Ticket',
+			       ObjectField => 'Queue',
+			       ObjectValue => $self->Id()
+			      )	);
+}
+
+# }}}
+
+# {{{ sub KeywordSelect
+
+=head2 KeywordSelect([NAME])
+
+Takes the name of a keyword select for this queue or that's global.
+Returns the relevant KeywordSelect object.  Prefers a keywordselect that's 
+specific to this queue over a global one.  If it can't find the proper
+Keword select or the user doesn't have permission, returns an empty 
+KeywordSelect object
+
+=cut
+
+sub KeywordSelect {
+    my $self = shift;
+    my $name = shift;
+    
+    require RT::KeywordSelect;
+
+    my $select = RT::KeywordSelect->new($self->CurrentUser);
+    if ($self->CurrentUserHasRight('SeeQueue')) {
+	$select->LoadByName( Name => $name, Queue => $self->Id);
+    }
+    return ($select);
+}
+
+
+# }}}
+
+# {{{ sub KeywordSelects
+
+=head2 KeywordSelects
+
+Returns an B<RT::KeywordSelects> object containing the collection of
+B<RT::KeywordSelect> objects which apply to this queue. (Both queue specific keyword selects
+and global keyword selects.
+
+=cut
+
+sub KeywordSelects {
+  my $self = shift;
+
+
+  use RT::KeywordSelects;
+  my $KeywordSelects = new RT::KeywordSelects($self->CurrentUser);
+
+  if ($self->CurrentUserHasRight('SeeQueue')) {
+      $KeywordSelects->LimitToQueue($self->id);
+      $KeywordSelects->IncludeGlobals();
+  }
+  return ($KeywordSelects);
+}
+# }}}
+
+# }}}
+
+# {{{ ACCESS CONTROL
+
+# {{{ sub ACL 
+
+=head2 ACL
+
+#Returns an RT::ACL object of ACEs everyone who has anything to do with this queue.
+
+=cut
+
+sub ACL  {
+    my $self = shift;
+    
+    use RT::ACL;
+    my $acl = new RT::ACL($self->CurrentUser);
+    
+    if ($self->CurrentUserHasRight('ShowACL')) {
+	$acl->LimitToQueue($self->Id);
+    }
+    
+    return ($acl);
+}
+
+# }}}
+
+# {{{ sub _Set
+sub _Set {
+    my $self = shift;
+
+    unless ($self->CurrentUserHasRight('AdminQueue')) {
+	return(0, 'Permission Denied');
+    }	
+    return ($self->SUPER::_Set(@_));
+}
+# }}}
+
+# {{{ sub _Value
+
+sub _Value {
+    my $self = shift;
+
+    unless ($self->CurrentUserHasRight('SeeQueue')) {
+	return (undef);
+    }
+
+    return ($self->__Value(@_));
+}
+
+# }}}
+
+# {{{ sub CurrentUserHasRight
+
+=head2 CurrentUserHasRight
+
+Takes one argument. A textual string with the name of the right we want to check.
+Returns true if the current user has that right for this queue.
+Returns undef otherwise.
+
+=cut
+
+sub CurrentUserHasRight {
+  my $self = shift;
+  my $right = shift;
+
+  return ($self->HasRight( Principal=> $self->CurrentUser,
+                            Right => "$right"));
+
+}
+
+# }}}
+
+# {{{ sub HasRight
+
+=head2 HasRight
+
+Takes a param hash with the fields 'Right' and 'Principal'.
+Principal defaults to the current user.
+Returns true if the principal has that right for this queue.
+Returns undef otherwise.
+
+=cut
+
+# TAKES: Right and optional "Principal" which defaults to the current user
+sub HasRight {
+    my $self = shift;
+        my %args = ( Right => undef,
+                     Principal => $self->CurrentUser,
+                     @_);
+        unless(defined $args{'Principal'}) {
+                $RT::Logger->debug("Principal undefined in Queue::HasRight");
+
+        }
+        return($args{'Principal'}->HasQueueRight(QueueObj => $self,
+          Right => $args{'Right'}));
+}
+# }}}
+
+# }}}
+
+1;
diff --git a/rt/lib/RT/Queues.pm b/rt/lib/RT/Queues.pm
new file mode 100755
index 000000000..ab58d8d6d
--- /dev/null
+++ b/rt/lib/RT/Queues.pm
@@ -0,0 +1,123 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Queues.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::Queues - a collection of RT::Queue objects
+
+=head1 SYNOPSIS
+
+  use RT::Queues;
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Queues);
+
+=end testing
+
+=cut
+
+package RT::Queues;
+use RT::EasySearch;
+@ISA= qw(RT::EasySearch);
+
+
+# {{{ sub _Init
+sub _Init { 
+  my $self = shift;
+  $self->{'table'} = "Queues";
+  $self->{'primary_key'} = "id";
+
+  # By default, order by name
+  $self->OrderBy( ALIAS => 'main',
+		  FIELD => 'Name',
+		  ORDER => 'ASC');
+
+  return ($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub _DoSearch 
+
+=head2 _DoSearch
+
+  A subclass of DBIx::SearchBuilder::_DoSearch that makes sure that _Disabled rows never get seen unless
+we're explicitly trying to see them.
+
+=cut
+
+sub _DoSearch {
+    my $self = shift;
+    
+    #unless we really want to find disabled rows, make sure we\'re only finding enabled ones.
+    unless($self->{'find_disabled_rows'}) {
+	$self->LimitToEnabled();
+    }
+    
+    return($self->SUPER::_DoSearch(@_));
+    
+}
+
+# }}}
+  
+
+# {{{ sub Limit 
+sub Limit  {
+  my $self = shift;
+  my %args = ( ENTRYAGGREGATOR => 'AND',
+	       @_);
+  $self->SUPER::Limit(%args);
+}
+# }}}
+
+# {{{ sub NewItem 
+sub NewItem  {
+  my $self = shift;
+  my $item;
+
+  use RT::Queue;
+  $item = new RT::Queue($self->CurrentUser);
+  return($item);
+}
+# }}}
+
+# {{{ sub Next 
+
+=head2 Next
+
+Returns the next queue that this user can see.
+
+=cut
+  
+sub Next {
+    my $self = shift;
+    
+    
+    my $Queue = $self->SUPER::Next();
+    if ((defined($Queue)) and (ref($Queue))) {
+
+	if ($Queue->CurrentUserHasRight('SeeQueue')) {
+	    return($Queue);
+	}
+	
+	#If the user doesn't have the right to show this queue
+	else {	
+	    return($self->Next());
+	}
+    }
+    #if there never was any queue
+    else {
+	return(undef);
+    }	
+    
+}
+# }}}
+
+1;
+
diff --git a/rt/lib/RT/Record.pm b/rt/lib/RT/Record.pm
new file mode 100755
index 000000000..5340f7de4
--- /dev/null
+++ b/rt/lib/RT/Record.pm
@@ -0,0 +1,345 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Record.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::Record - Base class for RT record objects
+
+=head1 SYNOPSIS
+
+
+=head1 DESCRIPTION
+
+
+=begin testing
+
+ok (require RT::Record);
+
+=end testing
+
+=head1 METHODS
+
+=cut
+
+
+package RT::Record;
+use DBIx::SearchBuilder::Record::Cachable;
+use RT::Date;
+use RT::User;
+
+@ISA= qw(DBIx::SearchBuilder::Record::Cachable);
+
+# {{{ sub _Init 
+
+sub _Init  {
+  my $self = shift;
+  $self->_MyCurrentUser(@_);
+  
+}
+
+# }}}
+
+# {{{ _PrimaryKeys
+
+=head2 _PrimaryKeys
+
+The primary keys for RT classes is 'id'
+
+=cut
+
+sub _PrimaryKeys {
+    my $self = shift;
+    return(['id']);
+}
+
+# }}}
+
+# {{{ sub _MyCurrentUser 
+
+sub _MyCurrentUser  {
+    my $self = shift;
+  
+    $self->CurrentUser(@_);
+    if(!defined($self->CurrentUser)) {
+	use Carp;
+	Carp::cluck();
+	$RT::Logger->err("$self was created without a CurrentUser\n"); 
+      return(0);
+    }
+}
+
+# }}}
+
+# {{{ sub _Handle 
+sub _Handle  {
+  my $self = shift;
+  return($RT::Handle);
+}
+# }}}
+
+# {{{ sub Create 
+
+sub Create  {
+    my $self = shift;
+    my $now = new RT::Date($self->CurrentUser);
+    $now->Set(Format=> 'unix', Value => time);
+    push @_, 'Created', $now->ISO()
+      if ($self->_Accessible('Created', 'auto'));
+    
+
+    push @_, 'Creator', $self->{'user'}->id
+      if $self->_Accessible('Creator', 'auto');
+    
+    push @_, 'LastUpdated', $now->ISO()
+      if ($self->_Accessible('LastUpdated', 'auto'));
+
+    push @_, 'LastUpdatedBy', $self->{'user'}->id
+      if $self->_Accessible('LastUpdatedBy', 'auto');
+    
+    
+
+   my $id = $self->SUPER::Create(@_);
+    
+    if ($id) {
+	$self->Load($id);
+    }
+    
+    return($id);
+    
+}
+
+# }}}
+
+
+# {{{ sub LoadByCols
+
+=head2 LoadByCols
+
+Override DBIx::SearchBuilder::LoadByCols to do case-insensitive loads if the 
+DB is case sensitive
+
+=cut
+
+sub LoadByCols {
+    my $self = shift;
+    my %hash = (@_);
+
+    # If this database is case sensitive we need to uncase objects for
+    # explicit loading
+    if ($self->_Handle->CaseSensitive) {
+	 my %newhash;
+	 foreach my $key (keys %hash) {
+        # If we've been passed an empty value, we can't do the lookup. 
+		# We don't need to explicitly downcase integers or an id.
+		if ($key =~ '^id$' || $hash{$key} =~/^\d+$/ || !defined ($hash{$key}) ) {
+			$newhash{$key} = $hash{$key};
+		}
+		else {
+			$newhash{"lower(".$key.")"} = lc($hash{$key});	
+		}
+	 }
+	$self->SUPER::LoadByCols(%newhash);
+    }
+    else {
+	$self->SUPER::LoadByCols(%hash);
+    }
+}
+
+# }}}
+
+
+# {{{ Datehandling
+
+# There is room for optimizations in most of those subs:
+
+# {{{ LastUpdatedObj
+
+sub LastUpdatedObj {
+    my $self=shift;
+    my $obj = new RT::Date($self->CurrentUser);
+    
+    $obj->Set(Format => 'sql', Value => $self->LastUpdated);
+    return $obj;
+}
+
+# }}}
+
+# {{{ CreatedObj
+
+sub CreatedObj {
+    my $self=shift;
+    my $obj = new RT::Date($self->CurrentUser);
+    
+    $obj->Set(Format => 'sql', Value => $self->Created);
+
+    
+    return $obj;
+}
+
+# }}}
+
+# {{{ AgeAsString
+#
+# TODO: This should be deprecated
+#
+sub AgeAsString {
+    my $self=shift;
+    return($self->CreatedObj->AgeAsString());
+}
+# }}}
+
+# {{{ LastUpdatedAsString
+
+# TODO this should be deprecated
+
+sub LastUpdatedAsString {
+    my $self=shift;
+    if ($self->LastUpdated) {
+	return ($self->LastUpdatedObj->AsString());
+	  
+    } else {
+	return "never";
+    }
+}
+
+# }}}
+
+# {{{ CreatedAsString
+#
+# TODO This should be deprecated 
+#
+sub CreatedAsString {
+    my $self = shift;
+    return ($self->CreatedObj->AsString());
+}
+# }}}
+
+# {{{ LongSinceUpdateAsString
+#
+# TODO This should be deprecated
+#
+sub LongSinceUpdateAsString {
+    my $self=shift;
+    if ($self->LastUpdated) {
+      
+        return ($self->LastUpdatedObj->AgeAsString());
+	
+    } else {
+	return "never";
+    }
+}
+# }}}
+
+# }}} Datehandling
+
+
+# {{{ sub _Set 
+sub _Set  {
+  my $self = shift;
+
+  my %args = ( Field => undef,
+	       Value => undef,
+	       IsSQL => undef,
+	       @_ );
+
+
+  #if the user is trying to modify the record
+  if ((!defined ($args{'Field'})) || (!defined ($args{'Value'}))) {
+    $args{'Value'} = 0; 
+   }
+
+  $self->_SetLastUpdated();
+  $self->SUPER::_Set(Field => $args{'Field'},
+		     Value => $args{'Value'},
+		     IsSQL => $args{'IsSQL'});
+  
+  
+}
+# }}}
+
+# {{{ sub _SetLastUpdated
+
+=head2 _SetLastUpdated
+
+This routine updates the LastUpdated and LastUpdatedBy columns of the row in question
+It takes no options. Arguably, this is a bug
+
+=cut
+
+sub _SetLastUpdated {
+    my $self = shift;
+    use RT::Date;
+    my $now = new RT::Date($self->CurrentUser);
+    $now->SetToNow();
+
+    if ($self->_Accessible('LastUpdated','auto')) {
+    	my ($msg, $val) = $self->__Set( Field => 'LastUpdated',
+                                        Value => $now->ISO);
+    }
+    if ($self->_Accessible('LastUpdatedBy','auto')) {
+        my ($msg, $val) = $self->__Set( Field => 'LastUpdatedBy', 
+				        Value => $self->CurrentUser->id);
+    }
+}
+
+# }}}
+
+# {{{ sub CreatorObj 
+
+=head2 CreatorObj
+
+Returns an RT::User object with the RT account of the creator of this row
+
+=cut
+
+sub CreatorObj  {
+  my $self = shift;
+  unless (exists $self->{'CreatorObj'}) {
+    
+    $self->{'CreatorObj'} = RT::User->new($self->CurrentUser);
+    $self->{'CreatorObj'}->Load($self->Creator);
+  }
+  return($self->{'CreatorObj'});
+}
+# }}}
+
+# {{{ sub LastUpdatedByObj
+
+=head2 LastUpdatedByObj
+
+  Returns an RT::User object of the last user to touch this object
+
+=cut
+
+sub LastUpdatedByObj {
+    my $self=shift;
+    unless (exists $self->{LastUpdatedByObj}) {
+	$self->{'LastUpdatedByObj'}=RT::User->new($self->CurrentUser);
+	$self->{'LastUpdatedByObj'}->Load($self->LastUpdatedBy);
+    }
+    return $self->{'LastUpdatedByObj'};
+}
+
+# }}}
+
+# {{{ sub CurrentUser 
+
+=head2 CurrentUser
+
+If called with an argument, sets the current user to that user object.
+This will affect ACL decisions, etc.  
+Returns the current user
+
+=cut
+
+sub CurrentUser  {
+  my $self = shift;
+
+  if (@_) {
+    $self->{'user'} = shift;
+  }
+  return ($self->{'user'});
+}
+# }}}
+
+
+1;
diff --git a/rt/lib/RT/Scrip.pm b/rt/lib/RT/Scrip.pm
new file mode 100755
index 000000000..aef011ca3
--- /dev/null
+++ b/rt/lib/RT/Scrip.pm
@@ -0,0 +1,372 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Scrip.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::Scrip - an RT Scrip object
+
+=head1 SYNOPSIS
+
+  use RT::Scrip;
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Scrip);
+
+=end testing
+
+=cut
+
+package RT::Scrip;
+use RT::Record;
+@ISA= qw(RT::Record);
+
+# {{{ sub _Init
+sub _Init  {
+    my $self = shift;
+    $self->{'table'} = "Scrips";
+    return ($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub _Accessible 
+sub _Accessible  {
+    my $self = shift;
+    my %Cols = ( ScripAction  => 'read/write',
+		 ScripCondition => 'read/write',
+		 Stage => 'read/write',
+		 Queue => 'read/write', 
+		 Template => 'read/write',
+	       );
+    return($self->SUPER::_Accessible(@_, %Cols));
+}
+# }}}
+
+# {{{ sub Create 
+
+=head2 Create
+
+Creates a new entry in the Scrips table. Takes a paramhash with the attributes:
+
+    Queue           A queue id or 0 for a global scrip
+    Template        A template ID or name.  
+                    Behavior is undefined if you have multiple items with 
+                    the same name
+    ScripAction     A ScripAction id or name
+                    Behavior is undefined if you have multiple items with 
+                    the same name
+    ScripCondition  A ScripCondition id or name
+                    Behavior is undefined if you have multiple items with 
+                    the same name
+
+Returns (retval, msg);
+retval is 0 for failure or scrip id.  msg is a textual description of what happened.
+
+=cut
+
+sub Create  {
+    my $self = shift;
+    my %args = ( Queue => undef,
+		 Template => undef,
+		 ScripAction => undef,
+		 ScripCondition => undef,
+		 Stage => 'TransactionCreate',
+		 @_
+	       );
+    
+      
+    if ($args{'Queue'} == 0 ) { 
+	unless ($self->CurrentUser->HasSystemRight('ModifyScrips')) {
+	    return (0, 'Permission Denied');
+ 	}	
+    }
+    else {
+	my $QueueObj = new RT::Queue($self->CurrentUser);
+	$QueueObj->Load($args{'Queue'});
+	unless ($QueueObj->id()) {
+	    return (0,'Invalid queue');
+	}
+	unless ($QueueObj->CurrentUserHasRight('ModifyScrips')) {
+	    return (0, 'Permssion Denied');
+	}	
+    }
+
+    #TODO +++ validate input 
+
+    require RT::ScripAction;
+    my $action = new RT::ScripAction($self->CurrentUser);
+    $action->Load($args{'ScripAction'});
+    return (0, "Action ".$args{'ScripAction'}." not found") unless $action->Id;
+
+    require RT::Template;
+    my $template = new RT::Template($self->CurrentUser);
+    $template->Load($args{'Template'});
+    return (0, 'Template not found') unless $template->Id;
+
+    require RT::ScripCondition;
+    my $condition = new RT::ScripCondition($self->CurrentUser);
+    $condition->Load($args{'ScripCondition'});
+
+    unless ($condition->Id) {
+	return (0, 'Condition not found');
+    }	
+    
+    my $id = $self->SUPER::Create(Queue => $args{'Queue'},
+				  Template => $template->Id,
+				  ScripCondition => $condition->id,
+				  Stage => $args{'Stage'},
+				  ScripAction => $action->Id
+				 );
+    return ($id, 'Scrip Created'); 
+}
+
+# }}}
+
+# {{{ sub Delete
+
+=head2 Delete
+
+Delete this object
+
+=cut
+
+sub Delete {
+    my $self = shift;
+    
+    unless ($self->CurrentUserHasRight('ModifyScrips')) {
+	return (0, 'Permission Denied');
+    }
+    
+    return ($self->SUPER::Delete(@_));
+}
+# }}}
+
+# {{{ sub QueueObj
+
+=head2 QueueObj
+
+Retuns an RT::Queue object with this Scrip\'s queue
+
+=cut
+
+sub QueueObj {
+    my $self = shift;
+    
+    if (!$self->{'QueueObj'})  {
+	require RT::Queue;
+	$self->{'QueueObj'} = RT::Queue->new($self->CurrentUser);
+	$self->{'QueueObj'}->Load($self->Queue);
+    }
+    return ($self->{'QueueObj'});
+}
+
+# }}}
+
+# {{{ sub ActionObj
+
+
+=head2 ActionObj
+
+Retuns an RT::Action object with this Scrip\'s Action
+
+=cut
+
+sub ActionObj {
+    my $self = shift;
+    
+    unless (defined $self->{'ScripActionObj'})  {
+	require RT::ScripAction;
+	
+	$self->{'ScripActionObj'} = RT::ScripAction->new($self->CurrentUser);
+	#TODO: why are we loading Actions with templates like this. 
+	# two seperate methods might make more sense
+	$self->{'ScripActionObj'}->Load($self->ScripAction, $self->Template);
+    }
+    return ($self->{'ScripActionObj'});
+}
+
+# }}}
+
+
+# {{{ sub TemplateObj
+=head2 TemplateObj
+
+Retuns an RT::Template object with this Scrip\'s Template
+
+=cut
+
+sub TemplateObj {
+    my $self = shift;
+    
+    unless (defined $self->{'TemplateObj'})  {
+	require RT::Template;
+	$self->{'TemplateObj'} = RT::Template->new($self->CurrentUser);
+	$self->{'TemplateObj'}->Load($self->Template);
+    }
+    return ($self->{'TemplateObj'});
+}
+
+# }}}
+
+# {{{ sub Prepare
+=head2 Prepare
+
+Calls the action object's prepare method
+
+=cut
+
+sub Prepare {
+    my $self = shift;
+    $self->ActionObj->Prepare(@_);
+}
+
+# }}}
+
+# {{{ sub Commit
+=head2 Commit
+
+Calls the action object's commit method
+
+=cut
+
+sub Commit {
+    my $self = shift;
+    $self->ActionObj->Commit(@_);
+}
+
+# }}}
+
+# {{{ sub ConditionObj
+
+=head2 ConditionObj
+
+Retuns an RT::ScripCondition object with this Scrip's IsApplicable
+
+=cut
+
+sub ConditionObj {
+    my $self = shift;
+    
+    unless (defined $self->{'ScripConditionObj'})  {
+	require RT::ScripCondition;
+	$self->{'ScripConditionObj'} = RT::ScripCondition->new($self->CurrentUser);
+	$self->{'ScripConditionObj'}->Load($self->ScripCondition);
+    }
+    return ($self->{'ScripConditionObj'});
+}
+
+# }}}
+
+# {{{ sub IsApplicable
+
+=head2 IsApplicable
+
+Calls the  Condition object\'s IsApplicable method
+
+=cut
+
+sub IsApplicable {
+    my $self = shift;
+    return ($self->ConditionObj->IsApplicable(@_));
+}
+
+# }}}
+
+# {{{ sub DESTROY
+sub DESTROY {
+    my $self = shift;
+    $self->{'ActionObj'} = undef;
+}
+# }}}
+
+# {{{ ACL related methods
+
+# {{{ sub _Set
+
+# does an acl check and then passes off the call
+sub _Set {
+    my $self = shift;
+    
+    unless ($self->CurrentUserHasRight('ModifyScrips')) {
+        $RT::Logger->debug("CurrentUser can't modify Scrips for ".$self->Queue."\n");
+	return (0, 'Permission Denied');
+    }
+    return $self->__Set(@_);
+}
+
+# }}}
+
+# {{{ sub _Value
+# does an acl check and then passes off the call
+sub _Value {
+    my $self = shift;
+    
+    unless ($self->CurrentUserHasRight('ShowScrips')) {
+        $RT::Logger->debug("CurrentUser can't modify Scrips for ".$self->__Value('Queue')."\n");
+	return (undef);
+    }
+    
+    return $self->__Value(@_);
+}
+# }}}
+
+# {{{ sub CurrentUserHasRight
+
+=head2 CurrentUserHasRight
+
+Helper menthod for HasRight. Presets Principal to CurrentUser then 
+calls HasRight.
+
+=cut
+
+sub CurrentUserHasRight {
+    my $self = shift;
+    my $right = shift;
+    return ($self->HasRight( Principal => $self->CurrentUser->UserObj,
+                             Right => $right ));
+    
+}
+
+# }}}
+
+# {{{ sub HasRight
+
+=head2 HasRight
+
+Takes a param-hash consisting of "Right" and "Principal"  Principal is 
+an RT::User object or an RT::CurrentUser object. "Right" is a textual
+Right string that applies to Scrips.
+
+=cut
+
+sub HasRight {
+    my $self = shift;
+    my %args = ( Right => undef,
+                 Principal => undef,
+                 @_ );
+    
+    if ((defined $self->SUPER::_Value('Queue')) and ($self->SUPER::_Value('Queue') != 0)) {
+        return ( $args{'Principal'}->HasQueueRight(
+						   Right => $args{'Right'},
+						   Queue => $self->SUPER::_Value('Queue'),
+						   Principal => $args{'Principal'}
+						  ) 
+	       );
+	
+    }
+    else {
+        return( $args{'Principal'}->HasSystemRight( $args{'Right'}) );
+    }
+}
+# }}}
+
+# }}}
+
+1;
+
+
diff --git a/rt/lib/RT/ScripAction.pm b/rt/lib/RT/ScripAction.pm
new file mode 100755
index 000000000..471ad9191
--- /dev/null
+++ b/rt/lib/RT/ScripAction.pm
@@ -0,0 +1,200 @@
+# Copyright 1999-2000 Jesse Vincent <jesse@fsck.com>
+# Released under the terms of the GNU Public License
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/ScripAction.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::ScripAction - RT Action object
+
+=head1 SYNOPSIS
+
+  use RT::ScripAction;
+
+
+=head1 DESCRIPTION
+
+This module should never be called directly by client code. it's an internal module which
+should only be accessed through exported APIs in other modules.
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::ScripAction);
+
+=end testing
+
+=head1 METHODS
+
+=cut
+
+package RT::ScripAction;
+use RT::Record;
+@ISA= qw(RT::Record);
+
+# {{{  sub _Init 
+sub _Init  {
+    my $self = shift; 
+    $self->{'table'} = "ScripActions";
+    return ($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub _Accessible 
+sub _Accessible  {
+    my $self = shift;
+    my %Cols = ( Name  => 'read',
+		 Description => 'read',
+		 ExecModule  => 'read',
+		 Argument  => 'read',
+		 Creator => 'read/auto',
+		 Created => 'read/auto',
+		 LastUpdatedBy => 'read/auto',
+		 LastUpdated => 'read/auto'
+       );
+    return($self->SUPER::_Accessible(@_, %Cols));
+}
+# }}}
+
+# {{{ sub Create 
+=head2 Create
+  
+ Takes a hash. Creates a new Action entry.
+ should be better documented.
+=cut
+
+sub Create  {
+    my $self = shift;
+    #TODO check these args and do smart things.
+    return($self->SUPER::Create(@_));
+}
+# }}}
+
+# {{{ sub Delete 
+sub Delete  {
+    my $self = shift;
+    
+    return (0, "ScripAction->Delete not implemented");
+}
+# }}}
+
+# {{{ sub Load 
+sub Load  {
+    my $self = shift;
+    my $identifier = shift;
+    
+    if (!$identifier) {
+	return (0, 'Input error');
+    }	    
+    
+    if ($identifier !~ /\D/) {
+	$self->SUPER::LoadById($identifier);
+    }
+    else {
+	$self->LoadByCol('Name', $identifier);
+	
+    }
+
+    if (@_) {
+	# Set the template Id to the passed in template    
+	my $template = shift;
+	
+	$self->{'Template'} = $template;
+    }
+    return ($self->Id, 'ScripAction loaded');
+}
+# }}}
+
+# {{{ sub LoadAction 
+
+=head2 LoadAction HASH
+
+  Takes a hash consisting of TicketObj and TransactionObj.  Loads an RT::Action:: module.
+
+=cut
+
+sub LoadAction  {
+    my $self = shift;
+    my %args = ( TransactionObj => undef,
+		 TicketObj => undef,
+		 @_ );
+    
+    #TODO: Put this in an eval  
+    $self->ExecModule =~ /^(\w+)$/;
+    my $module = $1;
+    my $type = "RT::Action::". $module;
+ 
+    $RT::Logger->debug("now requiring $type\n"); 
+    eval "require $type" || die "Require of $type failed.\n$@\n";
+    
+    $self->{'Action'}  = $type->new ( 'ScripActionObj' => $self, 
+				      'TicketObj' => $args{'TicketObj'},
+				      'TransactionObj' => $args{'TransactionObj'},
+				      'TemplateObj' => $self->TemplateObj,
+				      'Argument' => $self->Argument,
+				    );
+}
+# }}}
+
+# {{{ sub TemplateObj
+
+=head2 TemplateObj
+
+Return this action\'s template object
+
+=cut
+
+sub TemplateObj {
+    my $self = shift;
+    return undef unless $self->{Template};
+    if (!$self->{'TemplateObj'})  {
+	require RT::Template;
+	$self->{'TemplateObj'} = RT::Template->new($self->CurrentUser);
+	$self->{'TemplateObj'}->LoadById($self->{'Template'});
+	
+    }
+    
+    return ($self->{'TemplateObj'});
+}
+# }}}
+
+# The following methods call the action object
+
+# {{{ sub Prepare 
+
+sub Prepare  {
+    my $self = shift;
+    return ($self->{'Action'}->Prepare());
+  
+}
+# }}}
+
+# {{{ sub Commit 
+sub Commit  {
+    my $self = shift;
+    return($self->{'Action'}->Commit());
+    
+    
+}
+# }}}
+
+# {{{ sub Describe 
+sub Describe  {
+    my $self = shift;
+    return ($self->{'Action'}->Describe());
+    
+}
+# }}}
+
+# {{{ sub DESTROY
+sub DESTROY {
+    my $self=shift;
+    $self->{'Action'} = undef;
+    $self->{'TemplateObj'} = undef;
+}
+# }}}
+
+
+1;
+
+
diff --git a/rt/lib/RT/ScripActions.pm b/rt/lib/RT/ScripActions.pm
new file mode 100755
index 000000000..ec6141559
--- /dev/null
+++ b/rt/lib/RT/ScripActions.pm
@@ -0,0 +1,70 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/ScripActions.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::ScripActions - Collection of Action objects
+
+=head1 SYNOPSIS
+
+  use RT::ScripActions;
+
+
+=head1 DESCRIPTION
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::ScripActions);
+
+=end testing
+
+=head1 METHODS
+
+=cut
+
+package RT::ScripActions;
+use RT::EasySearch;
+use RT::ScripAction;
+
+@ISA= qw(RT::EasySearch);
+
+# {{{ sub _Init
+sub _Init { 
+  my $self = shift;
+  $self->{'table'} = "ScripActions";
+  $self->{'primary_key'} = "id";
+  return ( $self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub LimitToType 
+sub LimitToType  {
+  my $self = shift;
+  my $type = shift;
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Type',
+		VALUE => "$type")
+      if defined $type;
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Type',
+		VALUE => "Correspond")
+      if $type eq "Create";
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Type',
+		VALUE => 'any');
+  
+}
+# }}}
+
+# {{{ sub NewItem 
+sub NewItem  {
+  my $self = shift;
+  return(RT::ScripAction->new($self->CurrentUser));
+
+}
+# }}}
+
+
+1;
+
diff --git a/rt/lib/RT/ScripCondition.pm b/rt/lib/RT/ScripCondition.pm
new file mode 100755
index 000000000..253502bd4
--- /dev/null
+++ b/rt/lib/RT/ScripCondition.pm
@@ -0,0 +1,192 @@
+# Copyright 1999-2000 Jesse Vincent <jesse@fsck.com>
+# Released under the terms of the GNU Public License
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/ScripCondition.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::ScripCondition - RT scrip conditional
+
+=head1 SYNOPSIS
+
+  use RT::ScripCondition;
+
+
+=head1 DESCRIPTION
+
+This module should never be called directly by client code. it's an internal module which
+should only be accessed through exported APIs in other modules.
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::ScripCondition);
+
+=end testing
+
+=head1 METHODS
+
+=cut
+
+package RT::ScripCondition;
+use RT::Record;
+@ISA= qw(RT::Record);
+
+# {{{  sub _Init 
+sub _Init  {
+    my $self = shift; 
+    $self->{'table'} = "ScripConditions";
+    return ($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub _Accessible 
+sub _Accessible  {
+    my $self = shift;
+    my %Cols = ( Name  => 'read',
+		 Description => 'read',
+		 ApplicableTransTypes	 => 'read',
+		 ExecModule  => 'read',
+		 Argument  => 'read',
+		 Creator => 'read/auto',
+		 Created => 'read/auto',
+		 LastUpdatedBy => 'read/auto',
+		 LastUpdated => 'read/auto'
+	       );
+    return($self->SUPER::_Accessible(@_, %Cols));
+}
+# }}}
+
+# {{{ sub Create 
+
+=head2 Create
+  
+  Takes a hash. Creates a new Condition entry.
+  should be better documented.
+
+=cut
+
+sub Create  {
+    my $self = shift;
+    return($self->SUPER::Create(@_));
+}
+# }}}
+
+# {{{ sub Delete 
+
+=head2 Delete
+
+No API available for deleting things just yet.
+
+=cut
+
+sub Delete  {
+    my $self = shift;
+    return(0,'Unimplemented');
+}
+# }}}
+
+# {{{ sub Load 
+
+=head2 Load IDENTIFIER
+
+Loads a condition takes a name or ScripCondition id.
+
+=cut
+
+sub Load  {
+    my $self = shift;
+    my $identifier = shift;
+    
+    unless (defined $identifier) {
+	return (undef);
+    }	    
+    
+    if ($identifier !~ /\D/) {
+	return ($self->SUPER::LoadById($identifier));
+    }
+    else {
+	return ($self->LoadByCol('Name', $identifier));
+    }
+}
+# }}}
+
+# {{{ sub LoadCondition 
+
+=head2 LoadCondition  HASH
+
+takes a hash which has the following elements:  TransactionObj and TicketObj.
+Loads the Condition module in question.
+
+=cut
+
+
+sub LoadCondition  {
+    my $self = shift;
+    my %args = ( TransactionObj => undef,
+		 TicketObj => undef,
+		 @_ );
+    
+    #TODO: Put this in an eval  
+    $self->ExecModule =~ /^(\w+)$/;
+    my $module = $1;
+    my $type = "RT::Condition::". $module;
+    
+    $RT::Logger->debug("now requiring $type\n"); 
+    eval "require $type" || die "Require of $type failed.\n$@\n";
+    
+    $self->{'Condition'}  = $type->new ( 'ScripConditionObj' => $self, 
+					 'TicketObj' => $args{'TicketObj'},
+					 'TransactionObj' => $args{'TransactionObj'},
+					 'Argument' => $self->Argument,
+					 'ApplicableTransTypes' => $self->ApplicableTransTypes,
+				       );
+}
+# }}}
+
+# {{{ The following methods call the Condition object
+
+
+# {{{ sub Describe 
+
+=head2 Describe 
+
+Helper method to call the condition module\'s Describe method.
+
+=cut
+
+sub Describe  {
+    my $self = shift;
+    return ($self->{'Condition'}->Describe());
+    
+}
+# }}}
+
+# {{{ sub IsApplicable 
+
+=head2 IsApplicable
+
+Helper method to call the condition module\'s IsApplicable method.
+
+=cut
+
+sub IsApplicable  {
+    my $self = shift;
+    return ($self->{'Condition'}->IsApplicable());
+    
+}
+# }}}
+
+# }}}
+
+# {{{ sub DESTROY
+sub DESTROY {
+    my $self=shift;
+    $self->{'Condition'} = undef;
+}
+# }}}
+
+
+1;
+
+
diff --git a/rt/lib/RT/ScripConditions.pm b/rt/lib/RT/ScripConditions.pm
new file mode 100755
index 000000000..236e6718d
--- /dev/null
+++ b/rt/lib/RT/ScripConditions.pm
@@ -0,0 +1,69 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/ScripConditions.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::ScripConditions - Collection of Action objects
+
+=head1 SYNOPSIS
+
+  use RT::ScripConditions;
+
+
+=head1 DESCRIPTION
+
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::ScripConditions);
+
+=end testing
+
+=head1 METHODS
+
+=cut
+
+package RT::ScripConditions;
+use RT::EasySearch;
+use RT::ScripCondition;
+@ISA= qw(RT::EasySearch);
+
+# {{{ sub _Init
+sub _Init { 
+  my $self = shift;
+  $self->{'table'} = "ScripConditions";
+  $self->{'primary_key'} = "id";
+  return ( $self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub LimitToType 
+sub LimitToType  {
+  my $self = shift;
+  my $type = shift;
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Type',
+		VALUE => "$type")
+      if defined $type;
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Type',
+		VALUE => "Correspond")
+      if $type eq "Create";
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Type',
+		VALUE => 'any');
+  
+}
+# }}}
+
+# {{{ sub NewItem 
+sub NewItem  {
+  my $self = shift;
+  return(RT::ScripCondition->new($self->CurrentUser));
+}
+# }}}
+
+
+1;
+
diff --git a/rt/lib/RT/Scrips.pm b/rt/lib/RT/Scrips.pm
new file mode 100755
index 000000000..90be847d8
--- /dev/null
+++ b/rt/lib/RT/Scrips.pm
@@ -0,0 +1,127 @@
+# Copyright 1999-2001 Jesse Vincent <jesse@fsck.com>
+# Released under the terms of the GNU Public License
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Scrips.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::Scrips - a collection of RT Scrip objects
+
+=head1 SYNOPSIS
+
+  use RT::Scrips;
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Scrips);
+
+=end testing
+
+=cut
+
+package RT::Scrips;
+use RT::EasySearch;
+use RT::Scrip;
+@ISA= qw(RT::EasySearch);
+
+
+# {{{ sub _Init
+sub _Init { 
+  my $self = shift;
+  $self->{'table'} = "Scrips";
+  $self->{'primary_key'} = "id";
+  return ( $self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub LimitToQueue 
+
+=head2 LimitToQueue
+
+Takes a queue id (numerical) as its only argument. Makes sure that 
+Scopes it pulls out apply to this queue (or another that you've selected with
+another call to this method
+
+=cut
+
+sub LimitToQueue  {
+   my $self = shift;
+  my $queue = shift;
+ 
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Queue',
+		VALUE => "$queue")
+      if defined $queue;
+  
+}
+# }}}
+
+# {{{ sub LimitToGlobal
+
+=head2 LimitToGlobal
+
+Makes sure that 
+Scopes it pulls out apply to all queues (or another that you've selected with
+another call to this method or LimitToQueue
+
+=cut
+
+
+sub LimitToGlobal  {
+   my $self = shift;
+ 
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Queue',
+		VALUE => 0);
+  
+}
+# }}}
+
+# {{{ sub NewItem 
+sub NewItem  {
+  my $self = shift;
+  
+  return(new RT::Scrip($self->CurrentUser));
+}
+# }}}
+
+# {{{ sub Next 
+
+=head2 Next
+
+Returns the next scrip that this user can see.
+
+=cut
+  
+sub Next {
+    my $self = shift;
+    
+    
+    my $Scrip = $self->SUPER::Next();
+    if ((defined($Scrip)) and (ref($Scrip))) {
+
+	if ($Scrip->CurrentUserHasRight('ShowScrips')) {
+	    return($Scrip);
+	}
+	
+	#If the user doesn't have the right to show this scrip
+	else {	
+	    return($self->Next());
+	}
+    }
+    #if there never was any scrip
+    else {
+	return(undef);
+    }	
+    
+}
+# }}}
+
+1;
+
diff --git a/rt/lib/RT/Template.pm b/rt/lib/RT/Template.pm
new file mode 100755
index 000000000..3ef96c7df
--- /dev/null
+++ b/rt/lib/RT/Template.pm
@@ -0,0 +1,395 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Template.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# Copyright 1996-2002 Jesse Vincent <jesse@bestpractical.com>
+# Portions Copyright 2000 Tobias Brox <tobix@cpan.org> 
+# Released under the terms of the GNU General Public License
+
+=head1 NAME
+
+  RT::Template - RT's template object
+
+=head1 SYNOPSIS
+
+  use RT::Template;
+
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing
+
+ok(require RT::TestHarness);
+ok(require RT::Template);
+
+=end testing
+
+=cut
+
+package RT::Template;
+use RT::Record;
+use MIME::Entity;
+use MIME::Parser;
+
+@ISA = qw(RT::Record);
+
+# {{{ sub _Init
+
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = "Templates";
+    return ( $self->SUPER::_Init(@_) );
+}
+
+# }}}
+
+# {{{ sub _Accessible 
+
+sub _Accessible {
+    my $self = shift;
+    my %Cols = (
+        id            => 'read',
+        Name          => 'read/write',
+        Description   => 'read/write',
+        Type          => 'read/write',    #Type is one of Action or Message
+        Content       => 'read/write',
+        Queue         => 'read/write',
+        Creator       => 'read/auto',
+        Created       => 'read/auto',
+        LastUpdatedBy => 'read/auto',
+        LastUpdated   => 'read/auto'
+    );
+    return $self->SUPER::_Accessible( @_, %Cols );
+}
+
+# }}}
+
+# {{{ sub _Set
+
+sub _Set {
+    my $self = shift;
+
+    # use super::value or we get acl blocked
+    if ( ( defined $self->SUPER::_Value('Queue') )
+        && ( $self->SUPER::_Value('Queue') == 0 ) )
+    {
+        unless ( $self->CurrentUser->HasSystemRight('ModifyTemplate') ) {
+            return ( 0, 'Permission Denied' );
+        }
+    }
+    else {
+
+        unless ( $self->CurrentUserHasQueueRight('ModifyTemplate') ) {
+            return ( 0, 'Permission Denied' );
+        }
+    }
+    return ( $self->SUPER::_Set(@_) );
+
+}
+
+# }}}
+
+# {{{ sub _Value 
+
+=head2 _Value
+
+Takes the name of a table column.
+Returns its value as a string, if the user passes an ACL check
+
+=cut
+
+sub _Value {
+
+    my $self  = shift;
+    my $field = shift;
+
+    #If the current user doesn't have ACLs, don't let em at it.  
+    #use super::value or we get acl blocked
+    if ( ( !defined $self->__Value('Queue') )
+        || ( $self->__Value('Queue') == 0 ) )
+    {
+        unless ( $self->CurrentUser->HasSystemRight('ShowTemplate') ) {
+            return (undef);
+        }
+    }
+    else {
+        unless ( $self->CurrentUserHasQueueRight('ShowTemplate') ) {
+            return (undef);
+        }
+    }
+    return ( $self->__Value($field) );
+
+}
+
+# }}}
+
+# {{{ sub Load
+
+=head2 Load <identifer>
+
+Load a template, either by number or by name
+
+=cut
+
+sub Load {
+    my $self       = shift;
+    my $identifier = shift;
+
+    if ( !$identifier ) {
+        return (undef);
+    }
+
+    if ( $identifier !~ /\D/ ) {
+        $self->SUPER::LoadById($identifier);
+    }
+    else {
+        $self->LoadByCol( 'Name', $identifier );
+
+    }
+}
+
+# }}}
+
+# {{{ sub LoadGlobalTemplate
+
+=head2 LoadGlobalTemplate NAME
+
+Load the global tempalte with the name NAME
+
+=cut
+
+sub LoadGlobalTemplate {
+    my $self = shift;
+    my $id   = shift;
+
+    return ( $self->LoadQueueTemplate( Queue => 0, Name => $id ) );
+}
+
+# }}}
+
+# {{{ sub LoadQueueTemplate
+
+=head2  LoadQueueTemplate (Queue => QUEUEID, Name => NAME)
+
+Loads the Queue template named NAME for Queue QUEUE.
+
+=cut
+
+sub LoadQueueTemplate {
+    my $self = shift;
+    my %args = (
+        Queue => undef,
+        Name  => undef
+    );
+
+    return ( $self->LoadByCols( Name => $args{'Name'}, Queue => {'Queue'} ) );
+
+}
+
+# }}}
+
+# {{{ sub Create
+
+=head2 Create
+
+Takes a paramhash of Content, Queue, Name and Description.
+Name should be a unique string identifying this Template.
+Description and Content should be the template's title and content.
+Queue should be 0 for a global template and the queue # for a queue-specific 
+template.
+
+Returns the Template's id # if the create was successful. Returns undef for
+unknown database failure.
+
+
+=cut
+
+sub Create {
+    my $self = shift;
+    my %args = (
+        Content     => undef,
+        Queue       => 0,
+        Description => '[no description]',
+        Type => 'Action',    #By default, template are 'Action' templates
+        Name => undef,
+        @_
+    );
+
+    if ( $args{'Queue'} == 0 ) {
+        unless ( $self->CurrentUser->HasSystemRight('ModifyTemplate') ) {
+            return (undef);
+        }
+    }
+    else {
+        my $QueueObj = new RT::Queue( $self->CurrentUser );
+        $QueueObj->Load( $args{'Queue'} ) || return ( 0, 'Invalid queue' );
+
+        unless ( $QueueObj->CurrentUserHasRight('ModifyTemplate') ) {
+            return (undef);
+        }
+    }
+
+    my $result = $self->SUPER::Create(
+        Content => $args{'Content'},
+        Queue   => $args{'Queue'},
+        ,
+        Description => $args{'Description'},
+        Name        => $args{'Name'}
+    );
+
+    return ($result);
+
+}
+
+# }}}
+
+# {{{ sub Delete
+
+=head2 Delete
+
+Delete this template.
+
+=cut
+
+sub Delete {
+    my $self = shift;
+
+    unless ( $self->CurrentUserHasRight('ModifyTemplate') ) {
+        return ( 0, 'Permission Denied' );
+    }
+
+    return ( $self->SUPER::Delete(@_) );
+}
+
+# }}}
+
+# {{{ sub MIMEObj
+sub MIMEObj {
+    my $self = shift;
+    return ( $self->{'MIMEObj'} );
+}
+
+# }}}
+
+# {{{ sub Parse 
+
+=item Parse
+
+ This routine performs Text::Template parsing on thte template and then imports the 
+ results into a MIME::Entity so we can really use it
+ It returns a tuple of (val, message)
+ If val is 0, the message contains an error message
+
+=cut
+
+sub Parse {
+    my $self = shift;
+
+    #We're passing in whatever we were passed. it's destined for _ParseContent
+    my $content = $self->_ParseContent(@_);
+
+    #Lets build our mime Entity
+
+    my $parser = MIME::Parser->new();
+    
+    # Do work on the parsed template in memory, rather than on disk
+    $parser->output_to_core(1); 
+
+    ### Should we forgive normally-fatal errors?
+    $parser->ignore_errors(1);
+    $self->{'MIMEObj'} = eval { $parser->parse_data($content) };
+    $error = ( $@ || $parser->last_error );
+
+    if ($error) {
+        $RT::Logger->error("$error");
+        return ( 0, $error );
+    }
+
+    # Unfold all headers
+    $self->{'MIMEObj'}->head->unfold();
+
+    return ( 1, "Template parsed" );
+   
+
+}
+
+# }}}
+
+# {{{ sub _ParseContent
+
+# Perform Template substitutions on the template
+
+sub _ParseContent {
+    my $self = shift;
+    my %args = (
+        Argument       => undef,
+        TicketObj      => undef,
+        TransactionObj => undef,
+        @_
+    );
+
+    # Might be subject to change
+    use Text::Template;
+
+    $T::Ticket      = $args{'TicketObj'};
+    $T::Transaction = $args{'TransactionObj'};
+    $T::Argument    = $args{'Argument'};
+    $T::rtname      = $RT::rtname;
+
+    # We need to untaint the content of the template, since we'll be working
+    # with it
+    my $content = $self->Content();
+    $content =~ s/^(.*)$/$1/;
+    $template = Text::Template->new(
+        TYPE   => STRING,
+        SOURCE => $content
+    );
+
+    my $retval = $template->fill_in( PACKAGE => T );
+    return ($retval);
+}
+
+# }}}
+
+# {{{ sub QueueObj
+
+=head2 QueueObj
+
+Takes nothing. returns this ticket's queue object
+
+=cut
+
+sub QueueObj {
+    my $self = shift;
+    if ( !defined $self->{'queue'} ) {
+        require RT::Queue;
+        $self->{'queue'} = RT::Queue->new( $self->CurrentUser );
+
+        unless ( $self->{'queue'} ) {
+            $RT::Logger->crit(
+                "RT::Queue->new(" . $self->CurrentUser . ") returned false" );
+            return (undef);
+        }
+        my ($result) = $self->{'queue'}->Load( $self->__Value('Queue') );
+
+    }
+    return ( $self->{'queue'} );
+}
+
+# }}}
+
+# {{{ sub CurrentUserHasQueueRight
+
+=head2 CurrentUserHasQueueRight
+
+Helper function to call the template's queue's CurrentUserHasQueueRight with the passed in args.
+
+=cut
+
+sub CurrentUserHasQueueRight {
+    my $self = shift;
+    return ( $self->QueueObj->CurrentUserHasRight(@_) );
+}
+
+# }}}
+1;
diff --git a/rt/lib/RT/Templates.pm b/rt/lib/RT/Templates.pm
new file mode 100755
index 000000000..b5b483c96
--- /dev/null
+++ b/rt/lib/RT/Templates.pm
@@ -0,0 +1,122 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Templates.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::Templates - a collection of RT Template objects
+
+=head1 SYNOPSIS
+
+  use RT::Templates;
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Templates);
+
+=end testing
+
+=cut
+
+package RT::Templates;
+use RT::EasySearch;
+@ISA= qw(RT::EasySearch);
+
+
+# {{{ sub _Init
+
+=head2 _Init
+
+  Returns RT::Templates specific init info like table and primary key names
+
+=cut
+
+sub _Init {
+    
+    my $self = shift;
+    $self->{'table'} = "Templates";
+    $self->{'primary_key'} = "id";
+    return ($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ LimitToNotInQueue
+
+=head2 LimitToNotInQueue
+
+Takes a queue id # and limits the returned set of templates to those which 
+aren't that queue's templates.
+
+=cut
+
+sub LimitToNotInQueue {
+    my $self = shift;
+    my $queue_id = shift;
+    $self->Limit(FIELD => 'Queue',
+                 VALUE => "$queue_id",
+                 OPERATOR => '!='
+                );
+}
+# }}}
+
+# {{{ LimitToGlobal
+
+=head2 LimitToGlobal
+
+Takes no arguments. Limits the returned set to "Global" templates
+which can be used with any queue.
+
+=cut
+
+sub LimitToGlobal {
+    my $self = shift;
+    my $queue_id = shift;
+    $self->Limit(FIELD => 'Queue',
+                 VALUE => "0",
+                 OPERATOR => '='
+                );
+}
+# }}}
+
+# {{{ LimitToQueue
+
+=head2 LimitToQueue
+
+Takes a queue id # and limits the returned set of templates to that queue's
+templates
+
+=cut
+
+sub LimitToQueue {
+    my $self = shift;
+    my $queue_id = shift;
+    $self->Limit(FIELD => 'Queue',
+                 VALUE => "$queue_id",
+                 OPERATOR => '='
+                );
+}
+# }}}
+
+# {{{ sub NewItem 
+
+=head2 NewItem
+
+Returns a new empty Template object
+
+=cut
+
+sub NewItem  {
+  my $self = shift;
+
+  use RT::Template;
+  my $item = new RT::Template($self->CurrentUser);
+  return($item);
+}
+# }}}
+
+1;
+
diff --git a/rt/lib/RT/TestHarness.pm b/rt/lib/RT/TestHarness.pm
new file mode 100644
index 000000000..160e9e636
--- /dev/null
+++ b/rt/lib/RT/TestHarness.pm
@@ -0,0 +1,14 @@
+use lib "/opt/rt2/etc/";
+
+use RT::Interface::CLI  qw(CleanEnv LoadConfig DBConnect 
+			   GetCurrentUser GetMessageContent);
+
+#Clean out all the nasties from the environment
+CleanEnv();
+
+#Load etc/config.pm and drop privs
+LoadConfig();
+
+
+use RT;
+RT::Init;
diff --git a/rt/lib/RT/Ticket.pm b/rt/lib/RT/Ticket.pm
new file mode 100755
index 000000000..f7275e4e3
--- /dev/null
+++ b/rt/lib/RT/Ticket.pm
@@ -0,0 +1,3004 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Ticket.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# (c) 1996-2001 Jesse Vincent <jesse@fsck.com>
+# This software is redistributable under the terms of the GNU GPL
+#
+
+=head1 NAME
+
+  RT::Ticket - RT ticket object
+
+=head1 SYNOPSIS
+
+  use RT::Ticket;
+  my $ticket = new RT::Ticket($CurrentUser);
+  $ticket->Load($ticket_id);
+
+=head1 DESCRIPTION
+
+This module lets you manipulate RT\'s ticket object.
+
+
+=head1 METHODS
+
+=cut
+
+
+
+package RT::Ticket;
+use RT::Queue;
+use RT::User;
+use RT::Record;
+use RT::Link;
+use RT::Links;
+use RT::Date;
+use RT::Watcher;
+
+
+@ISA= qw(RT::Record);
+
+
+=begin testing
+
+use RT::TestHarness;
+
+ok(require RT::Ticket, "Loading the RT::Ticket library");
+
+=end testing
+
+=cut
+
+# {{{ sub _Init
+
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = "Tickets";
+    return ($self->SUPER::_Init(@_));
+}
+
+# }}}
+
+# {{{ sub Load
+
+=head2 Load
+
+Takes a single argument. This can be a ticket id, ticket alias or 
+local ticket uri.  If the ticket can't be loaded, returns undef.
+Otherwise, returns the ticket id.
+
+=cut
+
+sub Load {
+   my $self = shift;
+   my $id = shift;
+
+   #TODO modify this routine to look at EffectiveId and do the recursive load
+   # thing. be careful to cache all the interim tickets we try so we don't loop forever.
+   
+   #If it's a local URI, turn it into a ticket id
+   if ($id =~ /^$RT::TicketBaseURI(\d+)$/)  {
+       $id = $1;
+   }
+   #If it's a remote URI, we're going to punt for now
+   elsif ($id =~ '://' ) {
+       return (undef);
+   }
+   
+   #If we have an integer URI, load the ticket
+   if ( $id =~ /^\d+$/ ) {
+       my $ticketid = $self->LoadById($id);
+   
+       unless ($ticketid) {
+	   $RT::Logger->debug("$self tried to load a bogus ticket: $id\n");
+	   return(undef);
+       }
+   }
+   
+   #It's not a URI. It's not a numerical ticket ID. Punt!
+   else {
+       return(undef);
+   }
+   
+   #If we're merged, resolve the merge.
+   if (($self->EffectiveId) and
+       ($self->EffectiveId != $self->Id)) {
+	   return ($self->Load($self->EffectiveId));
+       }
+
+   #Ok. we're loaded. lets get outa here.
+   return ($self->Id);
+   
+}
+
+# }}}
+
+# {{{ sub LoadByURI
+
+=head2 LoadByURI
+
+Given a local ticket URI, loads the specified ticket.
+
+=cut
+
+sub LoadByURI {
+    my $self = shift;
+    my $uri = shift;
+    
+    if ($uri =~ /^$RT::TicketBaseURI(\d+)$/) {
+        my $id = $1;
+        return ($self->Load($id));
+    }
+    else {
+        return(undef);
+    }
+}
+
+# }}}
+
+# {{{ sub Create
+
+=head2 Create (ARGS)
+
+Arguments: ARGS is a hash of named parameters.  Valid parameters are:
+
+  Queue  - Either a Queue object or a Queue Name
+  Requestor -  A reference to a list of RT::User objects, email addresses or RT user Names
+  Cc  - A reference to a list of RT::User objects, email addresses or Names
+  AdminCc  - A reference to a  list of RT::User objects, email addresses or Names
+  Type -- The ticket\'s type. ignore this for now
+  Owner -- This ticket\'s owner. either an RT::User object or this user\'s id
+  Subject -- A string describing the subject of the ticket
+  InitialPriority -- an integer from 0 to 99
+  FinalPriority -- an integer from 0 to 99
+  Status -- any valid status (Defined in RT::Queue)
+  TimeWorked -- an integer
+  TimeLeft -- an integer
+  Starts -- an ISO date describing the ticket\'s start date and time in GMT
+  Due -- an ISO date describing the ticket\'s due date and time in GMT
+  MIMEObj -- a MIME::Entity object with the content of the initial ticket request.
+
+  KeywordSelect-<id> -- an array of keyword ids for that keyword select
+
+
+Returns: TICKETID, Transaction Object, Error Message
+
+
+=begin testing
+
+my $t = RT::Ticket->new($RT::SystemUser);
+
+ok( $t->Create(Queue => 'General', Subject => 'This is a subject'), "Ticket Created");
+
+ok ( my $id = $t->Id, "Got ticket id");
+
+=end testing
+
+=cut
+
+sub Create {
+    my $self = shift;
+    
+    my %args = (
+		Queue => undef,
+		Requestor => undef,
+		Cc => undef,
+		AdminCc => undef,
+		Type => 'ticket',
+		Owner => $RT::Nobody->UserObj,
+		Subject => '[no subject]',
+		InitialPriority => undef,
+		FinalPriority => undef,
+		Status => 'new',
+		TimeWorked => "0",
+		TimeLeft => 0,
+		Due => undef,
+		Starts => undef,
+		MIMEObj => undef,
+		@_);
+
+    my ($ErrStr, $QueueObj, $Owner, $resolved);
+    my (@non_fatal_errors);
+    
+    my $now = RT::Date->new($self->CurrentUser);
+    $now->SetToNow();
+
+    if ( (defined($args{'Queue'})) && (!ref($args{'Queue'})) ) {
+	$QueueObj=RT::Queue->new($RT::SystemUser);
+	$QueueObj->Load($args{'Queue'});
+    }
+    elsif (ref($args{'Queue'}) eq 'RT::Queue') {
+	$QueueObj=RT::Queue->new($RT::SystemUser);
+	$QueueObj->Load($args{'Queue'}->Id);
+    }
+    else {
+	$RT::Logger->debug("$self ". $args{'Queue'} . 
+			 " not a recognised queue object.");
+    }
+  
+    #Can't create a ticket without a queue.
+    unless (defined ($QueueObj)) {
+	$RT::Logger->debug( "$self No queue given for ticket creation.");
+	return (0, 0,'Could not create ticket. Queue not set');
+    }
+    
+    #Now that we have a queue, Check the ACLS
+    unless ($self->CurrentUser->HasQueueRight(Right => 'CreateTicket',
+					      QueueObj => $QueueObj )) {
+	return (0,0,"No permission to create tickets in the queue '". 
+		$QueueObj->Name."'.");
+    }
+    
+    #Since we have a queue, we can set queue defaults
+    #Initial Priority
+
+    # If there's no queue default initial priority and it's not set, set it to 0
+    $args{'InitialPriority'} = ($QueueObj->InitialPriority || 0)
+      unless (defined $args{'InitialPriority'});
+	
+    #Final priority 
+
+    # If there's no queue default final priority and it's not set, set it to 0
+    $args{'FinalPriority'} = ($QueueObj->FinalPriority  || 0)
+      unless (defined $args{'FinalPriority'});
+    
+    
+    #TODO we should see what sort of due date we're getting, rather +
+    # than assuming it's in ISO format.
+    
+    #Set the due date. if we didn't get fed one, use the queue default due in
+    my $due = new RT::Date($self->CurrentUser);
+    if (defined $args{'Due'}) {
+	$due->Set (Format => 'ISO',
+		   Value => $args{'Due'});
+    }	
+    elsif (defined ($QueueObj->DefaultDueIn)) {
+	$due->SetToNow;
+	$due->AddDays($QueueObj->DefaultDueIn);
+    }	
+    
+    my $starts = new RT::Date($self->CurrentUser);
+    if (defined $args{'Starts'}) {
+	$starts->Set (Format => 'ISO',
+		   Value => $args{'Starts'});
+    }
+
+	
+    # {{{ Deal with setting the owner
+    
+    if (ref($args{'Owner'}) eq 'RT::User') {
+	$Owner = $args{'Owner'};
+    }
+    #If we've been handed something else, try to load the user.
+    elsif ($args{'Owner'}) {
+	$Owner = new RT::User($self->CurrentUser);
+	$Owner->Load($args{'Owner'});
+	
+    }
+    #If we can't handle it, call it nobody
+    else {
+	if (ref($args{'Owner'})) {
+	    $RT::Logger->warning("$ticket ->Create called with an Owner of ".
+		 "type ".ref($args{'Owner'}) .". Defaulting to nobody.\n");
+
+	    push @non_fatal_errors, "Invalid owner. Defaulting to 'nobody'.";
+	}
+	else { 
+	    $RT::Logger->warning("$self ->Create called with an ".
+				 "unknown datatype for Owner: ".$args{'Owner'} .
+				 ". Defaulting to Nobody.\n");
+	}
+    }
+    
+    #If we have a proposed owner and they don't have the right 
+    #to own a ticket, scream about it and make them not the owner
+    if ((defined ($Owner)) and
+	($Owner->Id != $RT::Nobody->Id) and 
+	(!$Owner->HasQueueRight( QueueObj => $QueueObj, 
+				 Right => 'OwnTicket'))) {
+	
+	$RT::Logger->warning("$self user ".$Owner->Name . "(".$Owner->id .
+			     ") was proposed ".
+			     "as a ticket owner but has no rights to own ".
+			     "tickets in this queue\n");
+
+	push @non_fatal_errors, "Invalid owner. Defaulting to 'nobody'.";
+
+	$Owner = undef;
+    }
+    
+    #If we haven't been handed a valid owner, make it nobody.
+    unless (defined ($Owner)) {
+	$Owner = new RT::User($self->CurrentUser);
+	$Owner->Load($RT::Nobody->UserObj->Id);
+    }	
+
+    # }}}
+
+    unless ($self->ValidateStatus($args{'Status'})) {
+	return (0,0,'Invalid value for status');
+    }
+
+    if ($args{'Status'} eq 'resolved') {
+	$resolved = $now->ISO;
+    } else{
+	$resolved = undef;
+    }
+
+    my $id = $self->SUPER::Create(
+				  Queue => $QueueObj->Id,
+				  Owner => $Owner->Id,
+				  Subject => $args{'Subject'},
+				  InitialPriority => $args{'InitialPriority'},
+				  FinalPriority => $args{'FinalPriority'},
+				  Priority => $args{'InitialPriority'},
+				  Status => $args{'Status'},
+				  TimeWorked => $args{'TimeWorked'},
+				  TimeLeft => $args{'TimeLeft'},
+				  Type => $args{'Type'},	
+				  Starts => $starts->ISO,
+				  Resolved => $resolved,
+				  Due => $due->ISO
+				 );
+    #Set the ticket's effective ID now that we've created it.
+    my ($val, $msg) = $self->__Set(Field => 'EffectiveId', Value => $id);
+    
+    unless ($val) {
+	$RT::Logger->err("$self ->Create couldn't set EffectiveId: $msg\n");
+    }	
+     
+
+    my $watcher;
+    foreach $watcher (@{$args{'Cc'}}) {
+	my ($wval, $wmsg) = 
+	  $self->_AddWatcher( Type => 'Cc', Person => $watcher, Silent => 1);
+	push @non_fatal_errors, $wmsg	unless ($wval);
+    }	
+
+    foreach $watcher (@{$args{'Requestor'}}) {
+	my ($wval, $wmsg) = 
+	  $self->_AddWatcher( Type => 'Requestor', Person => $watcher, Silent => 1);
+	push @non_fatal_errors, $wmsg	unless ($wval);
+    }
+
+    foreach $watcher (@{$args{'AdminCc'}}) {
+	# Note that we're using AddWatcher, rather than _AddWatcher, as we 
+	# actually _want_ that ACL check. Otherwise, random ticket creators
+	# could make themselves adminccs and maybe get ticket rights. that would
+	# be poor
+	my ($wval, $wmsg) = 
+	  $self->AddWatcher( Type => 'AdminCc', Person => $watcher, Silent => 1);
+	push @non_fatal_errors, $wmsg	unless ($wval);
+    }
+
+    # Iterate through all the KeywordSelect-<int> params passed in, calling _AddKeyword
+    # for each of them
+
+
+    foreach my $key (keys %args) {
+
+	next unless ($key =~ /^KeywordSelect-(.*)$/);
+	
+	my $ks = $1;
+
+
+	my @keywords = ref($args{$key}) eq 'ARRAY' ?
+	      @{$args{$key}} : ($args{$key});
+	
+	foreach my $keyword (@keywords) {  
+	    my ($kval, $kmsg) = $self->_AddKeyword(KeywordSelect => $ks,
+						   Keyword => $keyword,
+						   Silent => 1);
+	}	
+	push @non_fatal_errors, $kmsg unless ($kval);
+    }
+
+    
+    
+    #Add a transaction for the create
+    my ($Trans, $Msg, $TransObj) = 
+	$self->_NewTransaction( Type => "Create",
+			  	TimeTaken => 0, 
+			  	MIMEObj=>$args{'MIMEObj'});
+    
+    # Logging
+    if ($self->Id && $Trans) {
+	$ErrStr = "Ticket ".$self->Id . " created in queue '". $QueueObj->Name. 
+	  "'.\n" . join("\n", @non_fatal_errors);
+	
+	$RT::Logger->info($ErrStr);
+    }
+    else {
+	# TODO where does this get errstr from?
+	$RT::Logger->warning("Ticket couldn't be created: $ErrStr");
+    }
+    
+    return($self->Id, $TransObj->Id, $ErrStr);
+}
+
+# }}}
+
+# {{{ sub Import
+
+=head2 Import PARAMHASH
+
+Import a ticket. 
+Doesn\'t create a transaction. 
+Doesn\'t supply queue defaults, etc.
+
+Arguments are identical to Create(), with the addition of
+    Id -    Ticket Id
+
+Returns: TICKETID
+
+=cut
+
+
+sub Import {
+    my $self = shift;
+    my ( $ErrStr, $QueueObj, $Owner);
+    
+    my %args = (id => undef,
+		EffectiveId => undef,
+		Queue => undef,
+		Requestor => undef,
+		Type => 'ticket',
+		Owner => $RT::Nobody->Id,
+		Subject => '[no subject]',
+		InitialPriority => undef,
+		FinalPriority => undef,
+		Status => 'new',
+		TimeWorked => "0",
+		Due => undef,
+		Created => undef,
+		Updated => undef,
+	Resolved => undef,
+		Told => undef,
+		@_);
+    
+    if ( (defined($args{'Queue'})) && (!ref($args{'Queue'})) ) {
+	$QueueObj=RT::Queue->new($RT::SystemUser);
+	$QueueObj->Load($args{'Queue'});
+	#TODO error check this and return 0 if it\'s not loading properly +++
+    }
+    elsif (ref($args{'Queue'}) eq 'RT::Queue') {
+	$QueueObj=RT::Queue->new($RT::SystemUser);
+	$QueueObj->Load($args{'Queue'}->Id);
+    }
+    else {
+	$RT::Logger->debug("$self ". $args{'Queue'} . 
+			   " not a recognised queue object.");
+    }
+    
+    #Can't create a ticket without a queue.
+    unless (defined ($QueueObj) and $QueueObj->Id) {
+	$RT::Logger->debug( "$self No queue given for ticket creation.");
+	return (0,'Could not create ticket. Queue not set');
+    }
+    
+    #Now that we have a queue, Check the ACLS
+    unless ($self->CurrentUser->HasQueueRight(Right => 'CreateTicket',
+					      QueueObj => $QueueObj )) {
+	return (0,"No permission to create tickets in the queue '". 
+		$QueueObj->Name."'.");
+    }
+    
+    
+
+
+    # {{{ Deal with setting the owner
+      
+    # Attempt to take user object, user name or user id.
+    # Assign to nobody if lookup fails.
+    if (defined ($args{'Owner'})) { 
+	if ( ref($args{'Owner'}) ) {
+	    $Owner = $args{'Owner'};
+	}
+	else {
+	    $Owner = new RT::User($self->CurrentUser);
+	    $Owner->Load($args{'Owner'});
+	    if ( ! defined($Owner->id) ) {
+		$Owner->Load($RT::Nobody->id);
+	    }
+	}
+    }
+    
+
+    #If we have a proposed owner and they don't have the right 
+    #to own a ticket, scream about it and make them not the owner
+    if ((defined ($Owner)) and
+	($Owner->Id != $RT::Nobody->Id) and 
+	(!$Owner->HasQueueRight( QueueObj => $QueueObj, 
+				 Right => 'OwnTicket'))) {
+	
+	$RT::Logger->warning("$self user ".$Owner->Name . "(".$Owner->id .
+			     ") was proposed ".
+			     "as a ticket owner but has no rights to own ".
+			     "tickets in '".$QueueObj->Name."'\n");
+	
+	$Owner = undef;
+    }
+    
+    #If we haven't been handed a valid owner, make it nobody.
+    unless (defined ($Owner)) {
+	$Owner = new RT::User($self->CurrentUser);
+	$Owner->Load($RT::Nobody->UserObj->Id);
+    }	
+
+    # }}}
+
+    unless ($self->ValidateStatus($args{'Status'})) {
+	return (0,"'$args{'Status'}' is an invalid value for status");
+    }
+    
+    $self->{'_AccessibleCache'}{Created} = { 'read'=>1, 'write'=>1 };
+    $self->{'_AccessibleCache'}{Creator} = { 'read'=>1, 'auto'=>1 };
+    $self->{'_AccessibleCache'}{LastUpdated} = { 'read'=>1, 'write'=>1 };
+    $self->{'_AccessibleCache'}{LastUpdatedBy} = { 'read'=>1, 'auto'=>1 };
+
+
+    # If we're coming in with an id, set that now.
+    my $EffectiveId = undef;
+    if ($args{'id'}) {
+	$EffectiveId = $args{'id'};
+
+    }
+
+
+    my $id = $self->SUPER::Create(
+				  id => $args{'id'},
+				  EffectiveId => $EffectiveId,
+				  Queue => $QueueObj->Id,
+				  Owner => $Owner->Id,
+				  Subject => $args{'Subject'},
+				  InitialPriority => $args{'InitialPriority'},
+				  FinalPriority => $args{'FinalPriority'},
+				  Priority => $args{'InitialPriority'},
+				  Status => $args{'Status'},
+				  TimeWorked => $args{'TimeWorked'},
+				  Type => $args{'Type'},	
+				  Created => $args{'Created'},
+				  Told => $args{'Told'},
+				  LastUpdated => $args{'Updated'},
+	Resolved => $args{Resolved},
+				  Due => $args{'Due'},
+				 );
+
+
+
+    # If the ticket didn't have an id
+    # Set the ticket's effective ID now that we've created it.
+    if ($args{'id'} ) { 
+	  $self->Load($args{'id'});
+    }
+    else {
+	   my ($val, $msg) = $self->__Set(Field => 'EffectiveId', Value => $id);
+    
+    	   unless ($val) {
+	    $RT::Logger->err($self."->Import couldn't set EffectiveId: $msg\n");
+   	   }	
+    } 
+
+    my $watcher;
+    foreach $watcher (@{$args{'Cc'}}) {
+	$self->_AddWatcher( Type => 'Cc', Person => $watcher, Silent => 1);
+    }	
+    foreach $watcher (@{$args{'AdminCc'}}) {
+	$self->_AddWatcher( Type => 'AdminCc', Person => $watcher, Silent => 1);
+    }	
+    foreach $watcher (@{$args{'Requestor'}}) {
+	$self->_AddWatcher( Type => 'Requestor', Person => $watcher, Silent => 1);
+    }
+    
+    return($self->Id, $ErrStr);
+}
+
+# }}}
+
+# {{{ sub Delete
+
+sub Delete {
+    my $self = shift;
+    return (0, 'Deleting this object would violate referential integrity.'.
+	    ' That\'s bad.');
+}
+# }}}
+
+# {{{ Routines dealing with watchers.
+
+# {{{ Routines dealing with adding new watchers
+
+# {{{ sub AddWatcher
+
+=head2 AddWatcher
+
+AddWatcher takes a parameter hash. The keys are as follows:
+
+Email
+Type
+Owner
+
+If the watcher you\'re trying to set has an RT account, set the Owner paremeter to their User Id. Otherwise, set the Email parameter to their Email address.
+
+=cut
+
+sub AddWatcher {
+    my $self = shift;
+    my %args = ( Email => undef,
+		 Type => undef,
+		 Owner => undef,
+		 @_
+	       );
+
+    # {{{ Check ACLS
+    #If the watcher we're trying to add is for the current user
+    if ( ( $self->CurrentUser->EmailAddress &&
+           ($args{'Email'} eq $self->CurrentUser->EmailAddress) ) or
+           ($args{'Owner'} eq $self->CurrentUser->Id) 
+        ) {
+
+	
+	#  If it's an AdminCc and they don't have 
+	#   'WatchAsAdminCc' or 'ModifyTicket', bail
+	if ($args{'Type'} eq 'AdminCc') {
+	    unless ($self->CurrentUserHasRight('ModifyTicket') or 
+		    $self->CurrentUserHasRight('WatchAsAdminCc')) {
+		return(0, 'Permission Denied');
+	    }
+	}
+
+	#  If it's a Requestor or Cc and they don't have
+	#   'Watch' or 'ModifyTicket', bail
+	elsif (($args{'Type'} eq 'Cc') or 
+	       ($args{'Type'} eq 'Requestor')) {
+		   
+	    unless ($self->CurrentUserHasRight('ModifyTicket') or 
+		    $self->CurrentUserHasRight('Watch')) {
+		return(0, 'Permission Denied');
+	    }
+	}
+	else {
+	    $RT::Logger->warn("$self -> AddWatcher hit code".
+			      " it never should. We got passed ".
+			      " a type of ". $args{'Type'});
+	    return (0,'Error in parameters to TicketAddWatcher');
+	}
+    }
+    # If the watcher isn't the current user 
+    # and the current user  doesn't have 'ModifyTicket'
+    # bail
+    else {
+	unless ($self->CurrentUserHasRight('ModifyTicket')) {
+	    return (0, "Permission Denied");
+	}
+    }
+    # }}}
+
+    return ($self->_AddWatcher(%args));
+}
+
+
+#This contains the meat of AddWatcher. but can be called from a routine like
+# Create, which doesn't need the additional acl check
+sub _AddWatcher {
+    my $self = shift;
+    my %args = (
+		Type => undef,
+		Silent => undef,
+		Email => undef,
+		Owner => 0,
+		Person => undef,
+		@_ );
+    
+    
+    
+    #clear the watchers cache
+    $self->{'watchers_cache'} = undef;
+    
+    if (defined $args{'Person'}) {
+	#if it's an RT::User object, pull out the id and shove it in Owner
+	if (ref ($args{'Person'}) =~ /RT::User/) {
+	    $args{'Owner'} = $args{'Person'}->id;
+	}	
+	#if it's an int, shove it in Owner
+	elsif ($args{'Person'} =~ /^\d+$/) {
+	    $args{'Owner'} = $args{'Person'};
+	}
+	#if it's an email address, shove it in Email
+       else {
+	   $args{'Email'} = $args{'Person'};
+       }	
+    }	
+
+    # Turn an email address int a watcher if we possibly can.
+    if ($args{'Email'}) {
+	my $watcher = new RT::User($self->CurrentUser);
+	$watcher->LoadByEmail($args{'Email'});
+	if ($watcher->Id) {
+		$args{'Owner'} = $watcher->Id;
+		delete $args{'Email'};
+	}
+    }
+
+
+    # see if this user is already a watcher. if we have an owner, check it
+    # otherwise, we've got an email-address watcher. use that.
+
+    if ($self->IsWatcher(Type => $args{'Type'},
+                         Id => ($args{'Owner'} || $args{'Email'}) ) ) {
+
+
+        return(0, 'That user is already that sort of watcher for this ticket');
+    }
+
+    
+    require RT::Watcher;
+    my $Watcher = new RT::Watcher ($self->CurrentUser);
+    my ($retval, $msg) = ($Watcher->Create( Value => $self->Id,
+					    Scope => 'Ticket',
+					    Email => $args{'Email'},
+					    Type => $args{'Type'},
+					    Owner => $args{'Owner'},
+					  ));
+    
+    unless ($args{'Silent'}) {
+	$self->_NewTransaction( Type => 'AddWatcher',
+				NewValue => $Watcher->Email,
+				Field => $Watcher->Type);
+    }
+    
+    return ($retval, $msg);
+}
+
+# }}}
+
+# {{{ sub AddRequestor
+
+=head2 AddRequestor
+
+AddRequestor takes what AddWatcher does, except it presets
+the "Type" parameter to \'Requestor\'
+
+=cut
+
+sub AddRequestor {
+   my $self = shift;
+   return ($self->AddWatcher ( Type => 'Requestor', @_));
+}
+
+# }}}
+
+# {{{ sub AddCc
+
+=head2 AddCc
+
+AddCc takes what AddWatcher does, except it presets
+the "Type" parameter to \'Cc\'
+
+=cut
+
+sub AddCc {
+   my $self = shift;
+   return ($self->AddWatcher ( Type => 'Cc', @_));
+}
+# }}}
+	
+# {{{ sub AddAdminCc
+
+=head2 AddAdminCc
+
+AddAdminCc takes what AddWatcher does, except it presets
+the "Type" parameter to \'AdminCc\'
+
+=cut
+
+sub AddAdminCc {
+   my $self = shift;
+   return ($self->AddWatcher ( Type => 'AdminCc', @_));
+}
+
+# }}}
+
+# }}}
+
+# {{{ sub DeleteWatcher
+
+=head2 DeleteWatcher id [type]
+
+DeleteWatcher takes a single argument which is either an email address 
+or a watcher id.  
+If the first argument is an email address, you need to specify the watcher type you're talking
+about as the second argument. Valid values are 'Requestor', 'Cc' or 'AdminCc'.
+It removes that watcher from this Ticket\'s list of watchers.
+
+
+=cut
+
+#TODO It is lame that you can't call this the same way you can call AddWatcher
+
+sub DeleteWatcher {
+    my $self = shift;
+    my $id = shift;
+
+    my $type;
+    
+    $type = shift if (@_);
+    
+    my $Watcher = new RT::Watcher($self->CurrentUser);
+    
+    #If it\'s a numeric watcherid
+    if ($id =~ /^(\d*)$/) {
+	$Watcher->Load($id);
+    }
+    
+    #Otherwise, we'll assume it's an email address
+    elsif ($type) {
+	my ($result, $msg) = 
+	  $Watcher->LoadByValue( Email => $id,
+				 Scope => 'Ticket',
+				 Value => $self->id,
+				 Type => $type);
+	return (0,$msg) unless ($result);
+    }
+    
+    else {
+	return(0,"Can\'t delete a watcher by email address without specifying a type");
+    }
+    
+    # {{{ Check ACLS 
+
+    #If the watcher we're trying to delete is for the current user
+    if ($Watcher->Email eq $self->CurrentUser->EmailAddress) {
+		
+	#  If it's an AdminCc and they don't have 
+	#   'WatchAsAdminCc' or 'ModifyTicket', bail
+	if ($Watcher->Type eq 'AdminCc') {
+	    unless ($self->CurrentUserHasRight('ModifyTicket') or 
+		    $self->CurrentUserHasRight('WatchAsAdminCc')) {
+		return(0, 'Permission Denied');
+	    }
+	}
+
+	#  If it's a Requestor or Cc and they don't have
+	#   'Watch' or 'ModifyTicket', bail
+	elsif (($Watcher->Type eq 'Cc') or 
+	       ($Watcher->Type eq 'Requestor')) {
+		   
+	    unless ($self->CurrentUserHasRight('ModifyTicket') or 
+		    $self->CurrentUserHasRight('Watch')) {
+		return(0, 'Permission Denied');
+	    }
+	}
+	else {
+	    $RT::Logger->warn("$self -> DeleteWatcher hit code".
+			      " it never should. We got passed ".
+			      " a type of ". $args{'Type'});
+	    return (0,'Error in parameters to $self DeleteWatcher');
+	}
+    }
+    # If the watcher isn't the current user 
+    # and the current user  doesn't have 'ModifyTicket'
+    # bail
+    else {
+	unless ($self->CurrentUserHasRight('ModifyTicket')) {
+	    return (0, "Permission Denied");
+	}
+    }	
+    
+    # }}}
+    
+    unless (($Watcher->Scope eq 'Ticket') and
+	    ($Watcher->Value == $self->id) ) {
+	return (0, "Not a watcher for this ticket");
+    }
+
+
+    #Clear out the watchers hash.
+    $self->{'watchers'} = undef;
+    
+    #If we\'ve validated that it is a watcher for this ticket 
+    $self->_NewTransaction ( Type => 'DelWatcher',        
+			     OldValue => $Watcher->Email,
+			     Field => $Watcher->Type,
+			   );
+    
+    my $retval = $Watcher->Delete();
+    
+    unless ($retval) {
+	return(0,"Watcher could not be deleted. Database inconsistency possible.");
+    }
+    
+    return(1, "Watcher deleted");
+}
+
+# {{{ sub DeleteRequestor
+
+=head2 DeleteRequestor EMAIL
+
+Takes an email address. It calls DeleteWatcher with a preset 
+type of 'Requestor'
+
+
+=cut
+
+sub DeleteRequestor {
+   my $self = shift;
+   my $id = shift;
+   return ($self->DeleteWatcher ($id, 'Requestor'))
+}
+
+# }}}
+
+# {{{ sub DeleteCc
+
+=head2 DeleteCc EMAIL
+
+Takes an email address. It calls DeleteWatcher with a preset 
+type of 'Cc'
+
+
+=cut
+
+sub DeleteCc {
+   my $self = shift;
+   my $id = shift;
+   return ($self->DeleteWatcher ($id, 'Cc'))
+}
+
+# }}}
+
+# {{{ sub DeleteAdminCc
+
+=head2 DeleteAdminCc EMAIL
+
+Takes an email address. It calls DeleteWatcher with a preset 
+type of 'AdminCc'
+
+
+=cut
+
+sub DeleteAdminCc {
+   my $self = shift;
+   my $id = shift;
+   return ($self->DeleteWatcher ($id, 'AdminCc'))
+}
+
+# }}}
+
+
+# }}}
+
+# {{{ sub Watchers
+
+=head2 Watchers
+
+Watchers returns a Watchers object preloaded with this ticket\'s watchers.
+
+# It should return only the ticket watchers. the actual FooAsString
+# methods capture the queue watchers too. I don't feel thrilled about this,
+# but we don't want the Cc Requestors and AdminCc objects to get filled up
+# with all the queue watchers too. we've got seperate objects for that.
+  # should we rename these as s/(.*)AsString/$1Addresses/ or somesuch?
+
+=cut
+
+sub Watchers {
+  my $self = shift;
+  
+  require RT::Watchers;
+  my $watchers=RT::Watchers->new($self->CurrentUser);
+  if ($self->CurrentUserHasRight('ShowTicket')) {
+      $watchers->LimitToTicket($self->id);
+  }
+  
+  return($watchers);
+  
+}
+
+# }}}
+
+# {{{ a set of  [foo]AsString subs that will return the various sorts of watchers for a ticket/queue as a comma delineated string
+
+=head2 RequestorsAsString
+
+ B<Returns> String: All Ticket Requestor email addresses as a string.
+
+=cut
+
+sub RequestorsAsString {
+    my $self=shift;
+
+    unless ($self->CurrentUserHasRight('ShowTicket')) {
+        return undef;
+    }
+    
+    return ($self->Requestors->EmailsAsString() );
+}
+
+=head2 WatchersAsString
+
+B<Returns> String: All Ticket Watchers email addresses as a string
+
+=cut
+
+sub WatchersAsString {
+    my $self=shift;
+
+    unless ($self->CurrentUserHasRight('ShowTicket')) {
+	return (0, "Permission Denied");
+    }
+    
+    return ($self->Watchers->EmailsAsString());
+
+}
+
+=head2 AdminCcAsString
+
+returns String: All Ticket AdminCc email addresses as a string
+
+=cut
+
+
+sub AdminCcAsString {
+    my $self=shift;
+
+    unless ($self->CurrentUserHasRight('ShowTicket')) {
+	return undef;
+    }
+    
+    return ($self->AdminCc->EmailsAsString());
+    
+}
+
+=head2 CcAsString
+
+returns String: All Ticket Ccs as a string of email addresses
+
+=cut
+
+sub CcAsString {
+    my $self=shift;
+
+    unless ($self->CurrentUserHasRight('ShowTicket')) {
+        return undef; 
+    }
+    
+    return ($self->Cc->EmailsAsString());
+
+}
+
+# }}}
+
+# {{{ Routines that return RT::Watchers objects of Requestors, Ccs and AdminCcs
+
+# {{{ sub Requestors
+
+=head2 Requestors
+
+Takes nothing.
+Returns this ticket's Requestors as an RT::Watchers object
+
+=cut
+
+sub Requestors {
+    my $self = shift;
+    
+    my $requestors = $self->Watchers();
+    if ($self->CurrentUserHasRight('ShowTicket')) {
+	$requestors->LimitToRequestors();
+    }	
+    
+    return($requestors);
+    
+}
+
+# }}}
+
+# {{{ sub Cc
+
+=head2 Cc
+
+Takes nothing.
+Returns a watchers object which contains this ticket's Cc watchers
+
+=cut
+
+sub Cc {
+    my $self = shift;
+    
+    my $cc = $self->Watchers();
+    
+    if ($self->CurrentUserHasRight('ShowTicket')) {
+	$cc->LimitToCc();
+    }
+    
+    return($cc);
+    
+}
+
+# }}}
+
+# {{{ sub AdminCc
+
+=head2 AdminCc
+
+Takes nothing.
+Returns this ticket\'s administrative Ccs as an RT::Watchers object
+
+=cut
+
+sub AdminCc {
+    my $self = shift;
+    
+    my $admincc = $self->Watchers();
+    if ($self->CurrentUserHasRight('ShowTicket')) {
+	$admincc->LimitToAdminCc();
+    }
+    return($admincc);
+}
+
+# }}}
+
+# }}}
+
+# {{{ IsWatcher,IsRequestor,IsCc, IsAdminCc
+
+# {{{ sub IsWatcher
+# a generic routine to be called by IsRequestor, IsCc and IsAdminCc
+
+=head2 IsWatcher
+
+Takes a param hash with the attributes Type and User. User is either a user object or string containing an email address. Returns true if that user or string
+is a ticket watcher. Returns undef otherwise
+
+=cut
+
+sub IsWatcher {
+    my $self = shift;
+
+    my %args = ( Type => 'Requestor',
+		 Email => undef,
+		 Id => undef,
+		 @_
+	       );
+    
+    my %cols = ('Type' => $args{'Type'},
+		'Scope' => 'Ticket',
+		'Value' => $self->Id,
+		'Owner' => undef,
+		'Email' => undef
+	       );
+    
+    if (ref($args{'Id'})){ 
+	#If it's a ref, it's an RT::User object;
+	$cols{'Owner'} = $args{'Id'}->Id;
+    }
+    elsif ($args{'Id'} =~ /^\d+$/) { 
+	# if it's an integer, it's a reference to an RT::User obj
+	$cols{'Owner'} = $args{'Id'};
+    }
+    else {
+	$cols{'Email'} = $args{'Id'};
+    }	
+    
+    if ($args{'Email'}) {
+	$cols{'Email'} = $args{'Email'};
+    }
+
+    my $description = join(":",%cols);
+    
+    #If we've cached a positive match...
+    if (defined $self->{'watchers_cache'}->{"$description"}) {
+	if ($self->{'watchers_cache'}->{"$description"} == 1) {
+	    return(1);
+	}
+	else { #If we've cached a negative match...
+	    return(undef);
+	}
+    }
+    
+    
+    my $watcher = new RT::Watcher($self->CurrentUser);
+    $watcher->LoadByCols(%cols);
+    
+    
+    if ($watcher->id) {
+	$self->{'watchers_cache'}->{"$description"} = 1;
+	return(1);
+    }	
+    else {
+	$self->{'watchers_cache'}->{"$description"} = 0;
+	return(undef);
+    }
+    
+}
+# }}}
+
+# {{{ sub IsRequestor
+
+=head2 IsRequestor
+  
+  Takes an email address, RT::User object or integer (RT user id)
+  Returns true if the string is a requestor of the current ticket.
+
+
+=cut
+
+sub IsRequestor {
+    my $self = shift;
+    my $person = shift;
+
+    return ($self->IsWatcher(Type => 'Requestor', Id => $person));
+	    
+};
+
+# }}}
+
+# {{{ sub IsCc
+
+=head2 IsCc
+
+Takes a string. Returns true if the string is a Cc watcher of the current ticket.
+
+=cut
+
+sub IsCc {
+  my $self = shift;
+  my $cc = shift;
+  
+  return ($self->IsWatcher( Type => 'Cc', Id => $cc ));
+  
+}
+
+# }}}
+
+# {{{ sub IsAdminCc
+
+=head2 IsAdminCc
+
+Takes a string. Returns true if the string is an AdminCc watcher of the current ticket.
+
+=cut
+
+sub IsAdminCc {
+  my $self = shift;
+  my $person = shift;
+  
+  return ($self->IsWatcher( Type => 'AdminCc', Id => $person ));
+  
+}
+
+# }}}
+
+# {{{ sub IsOwner
+
+=head2 IsOwner
+
+  Takes an RT::User object. Returns true if that user is this ticket's owner.
+returns undef otherwise
+
+=cut
+
+sub IsOwner {
+    my $self = shift;
+    my $person = shift;
+  
+
+    # no ACL check since this is used in acl decisions
+    # unless ($self->CurrentUserHasRight('ShowTicket')) {
+    #	return(undef);
+    #   }	
+
+    
+    #Tickets won't yet have owners when they're being created.
+    unless ($self->OwnerObj->id) {
+        return(undef);
+    }
+    
+    if ($person->id == $self->OwnerObj->id) {
+	return(1);
+    }
+    else {
+	return(undef);
+    }
+}
+
+
+# }}}
+
+# }}}
+
+# }}}
+
+# {{{ Routines dealing with queues 
+
+# {{{ sub ValidateQueue
+
+sub ValidateQueue {
+  my $self = shift;
+  my $Value = shift;
+  
+  #TODO I don't think this should be here. We shouldn't allow anything to have an undef queue,
+  if (!$Value) {
+    $RT::Logger->warning( " RT:::Queue::ValidateQueue called with a null value. this isn't ok.");
+    return (1);
+  }
+  
+  my $QueueObj = RT::Queue->new($self->CurrentUser);
+  my $id = $QueueObj->Load($Value);
+  
+  if ($id) {
+    return (1);
+  }
+  else {
+    return (undef);
+  }
+}
+
+# }}}
+
+# {{{ sub SetQueue  
+
+sub SetQueue {
+    my $self = shift;
+    my $NewQueue = shift;
+
+    #Redundant. ACL gets checked in _Set;
+    unless ($self->CurrentUserHasRight('ModifyTicket')) {
+	return (0, "Permission Denied");
+    }
+   
+ 
+    my $NewQueueObj = RT::Queue->new($self->CurrentUser);
+    $NewQueueObj->Load($NewQueue);
+    
+    unless ($NewQueueObj->Id()) {
+	return (0, "That queue does not exist");
+    }
+    
+    if ($NewQueueObj->Id == $self->QueueObj->Id) {
+	return (0, 'That is the same value');
+    }
+    unless ($self->CurrentUser->HasQueueRight(Right =>'CreateTicket',
+					      QueueObj => $NewQueueObj )) {
+	return (0, "You may not create requests in that queue.");
+    }
+    
+    unless ($self->OwnerObj->HasQueueRight(Right=> 'OwnTicket',  
+					   QueueObj => $NewQueueObj)) {
+	    $self->Untake();
+    }
+
+    return($self->_Set(Field => 'Queue', Value => $NewQueueObj->Id()));
+    
+}
+
+# }}}
+
+# {{{ sub QueueObj
+
+=head2 QueueObj
+
+Takes nothing. returns this ticket's queue object
+
+=cut
+
+sub QueueObj {
+    my $self = shift;
+    
+    my $queue_obj = RT::Queue->new($self->CurrentUser);
+    #We call __Value so that we can avoid the ACL decision and some deep recursion
+    my ($result) = $queue_obj->Load($self->__Value('Queue'));
+    return ($queue_obj);
+}
+
+
+# }}}
+
+# }}}
+
+# {{{ Date printing routines
+
+# {{{ sub DueObj
+
+=head2 DueObj
+
+  Returns an RT::Date object containing this ticket's due date
+
+=cut
+sub DueObj {
+    my $self = shift;
+    
+    my $time = new RT::Date($self->CurrentUser);
+
+    # -1 is RT::Date slang for never
+    if ($self->Due) {
+	$time->Set(Format => 'sql', Value => $self->Due );
+    }
+    else {
+	$time->Set(Format => 'unix', Value => -1);
+    }
+    
+    return $time;
+}
+# }}}
+
+# {{{ sub DueAsString 
+
+=head2 DueAsString
+
+Returns this ticket's due date as a human readable string
+
+=cut
+
+sub DueAsString {
+  my $self = shift;
+  return $self->DueObj->AsString();
+}
+
+# }}}
+
+# {{{ sub GraceTimeAsString 
+
+=head2 GraceTimeAsString
+
+Return the time until this ticket is due as a string
+
+=cut
+
+# TODO This should be deprecated 
+
+sub GraceTimeAsString {
+    my $self=shift;
+    
+    if ($self->Due) {
+	return ($self->DueObj->AgeAsString());
+    } else {
+	return "";
+    }
+}
+
+# }}}
+
+
+# {{{ sub ResolvedObj
+
+=head2 ResolvedObj
+
+  Returns an RT::Date object of this ticket's 'resolved' time.
+
+=cut
+
+sub ResolvedObj {
+  my $self = shift;
+
+  my $time = new RT::Date($self->CurrentUser);
+  $time->Set(Format => 'sql', Value => $self->Resolved);
+  return $time;
+}
+# }}}
+
+# {{{ sub SetStarted
+
+=head2 SetStarted
+
+Takes a date in ISO format or undef
+Returns a transaction id and a message
+The client calls "Start" to note that the project was started on the date in $date.
+A null date means "now"
+
+=cut
+  
+sub SetStarted {
+    my $self = shift;
+    my $time = shift || 0;
+    
+
+    unless ($self->CurrentUserHasRight('ModifyTicket')) {
+	return (0, "Permission Denied");
+    }
+
+    #We create a date object to catch date weirdness
+    my $time_obj = new RT::Date($self->CurrentUser());
+    if ($time != 0)  {
+	$time_obj->Set(Format => 'ISO', Value => $time);
+    }
+    else {
+	$time_obj->SetToNow();
+    }
+    
+    #Now that we're starting, open this ticket
+    #TODO do we really want to force this as policy? it should be a scrip
+    
+    #We need $TicketAsSystem, in case the current user doesn't have
+    #ShowTicket
+    #
+    my $TicketAsSystem = new RT::Ticket($RT::SystemUser);
+    $TicketAsSystem->Load($self->Id);	
+    if ($TicketAsSystem->Status eq 'new') {
+	$TicketAsSystem->Open();
+    }	
+    
+    return ($self->_Set(Field => 'Started', Value =>$time_obj->ISO));
+    
+}
+
+# }}}
+
+# {{{ sub StartedObj
+
+=head2 StartedObj
+
+  Returns an RT::Date object which contains this ticket's 
+'Started' time.
+
+=cut
+
+
+sub StartedObj {
+    my $self = shift;
+    
+    my $time = new RT::Date($self->CurrentUser);
+    $time->Set(Format => 'sql', Value => $self->Started);
+    return $time;
+}
+# }}}
+
+# {{{ sub StartsObj
+
+=head2 StartsObj
+
+  Returns an RT::Date object which contains this ticket's 
+'Starts' time.
+
+=cut
+
+sub StartsObj {
+  my $self = shift;
+  
+  my $time = new RT::Date($self->CurrentUser);
+  $time->Set(Format => 'sql', Value => $self->Starts);
+  return $time;
+}
+# }}}
+
+# {{{ sub ToldObj
+
+=head2 ToldObj
+
+  Returns an RT::Date object which contains this ticket's 
+'Told' time.
+
+=cut
+
+
+sub ToldObj {
+  my $self = shift;
+  
+  my $time = new RT::Date($self->CurrentUser);
+  $time->Set(Format => 'sql', Value => $self->Told);
+  return $time;
+}
+
+# }}}
+
+# {{{ sub LongSinceToldAsString
+
+# TODO this should be deprecated
+
+
+sub LongSinceToldAsString {
+  my $self = shift;
+
+  if ($self->Told) {
+      return $self->ToldObj->AgeAsString();
+  } else {
+      return "Never";
+  }
+}
+# }}}
+
+# {{{ sub ToldAsString
+
+=head2 ToldAsString
+
+A convenience method that returns ToldObj->AsString
+
+TODO: This should be deprecated
+
+=cut
+
+
+sub ToldAsString {
+    my $self = shift;
+    if ($self->Told) {
+	return $self->ToldObj->AsString();
+    }
+    else {
+	return("Never");
+    }
+}
+# }}}
+
+# {{{ sub TimeWorkedAsString
+
+=head2 TimeWorkedAsString
+
+Returns the amount of time worked on this ticket as a Text String
+
+=cut
+
+sub TimeWorkedAsString {
+    my $self=shift;
+    return "0" unless $self->TimeWorked;
+    
+    #This is not really a date object, but if we diff a number of seconds 
+    #vs the epoch, we'll get a nice description of time worked.
+    
+    my $worked = new RT::Date($self->CurrentUser);
+    #return the  #of minutes worked turned into seconds and written as
+    # a simple text string
+
+    return($worked->DurationAsString($self->TimeWorked*60));
+}
+
+# }}}
+
+
+# }}}
+
+# {{{ Routines dealing with correspondence/comments
+
+# {{{ sub Comment
+
+=head2 Comment
+
+Comment on this ticket.
+Takes a hashref with the follwoing attributes:
+
+MIMEObj, TimeTaken, CcMessageTo, BccMessageTo
+
+=cut
+
+sub Comment {
+  my $self = shift;
+  
+  my %args = (
+          CcMessageTo => undef,
+          BccMessageTo => undef,
+	      MIMEObj => undef,
+	      TimeTaken => 0,
+	      @_ );
+
+  unless (($self->CurrentUserHasRight('CommentOnTicket')) or
+	  ($self->CurrentUserHasRight('ModifyTicket'))) {
+      return (0, "Permission Denied");
+  }
+ 
+   unless ($args{'MIMEObj'}) {
+       return(0,"No correspondence attached");
+   }
+
+  # If we've been passed in CcMessageTo and BccMessageTo fields,
+  # add them to the mime object for passing on to the transaction handler
+  # The "NotifyOtherRecipients" scripAction will look for RT--Send-Cc: and
+  # RT-Send-Bcc: headers
+ 
+  $args{'MIMEObj'}->head->add('RT-Send-Cc', $args{'CcMessageTo'});
+  $args{'MIMEObj'}->head->add('RT-Send-Bcc', $args{'BccMessageTo'});
+
+  #Record the correspondence (write the transaction)
+  my ($Trans, $Msg, $TransObj) = $self->_NewTransaction( Type => 'Comment',
+				      Data =>($args{'MIMEObj'}->head->get('subject') || 'No Subject'),
+				      TimeTaken => $args{'TimeTaken'},
+				      MIMEObj => $args{'MIMEObj'}
+				    );
+  
+  
+  return ($Trans, "The comment has been recorded");
+}
+
+# }}}
+
+# {{{ sub Correspond
+
+=head2 Correspond
+
+Correspond on this ticket.
+Takes a hashref with the following attributes:
+
+
+MIMEObj, TimeTaken, CcMessageTo, BccMessageTo
+
+=cut
+
+sub Correspond {
+    my $self = shift;
+    my %args = (
+          CcMessageTo => undef,
+          BccMessageTo => undef,
+		MIMEObj => undef,
+		TimeTaken => 0,
+		@_ );
+    
+    unless (($self->CurrentUserHasRight('ReplyToTicket')) or
+	    ($self->CurrentUserHasRight('ModifyTicket'))) {
+	return (0, "Permission Denied");
+    }
+    
+    unless ($args{'MIMEObj'}) {
+	return(0,"No correspondence attached");
+    }
+    
+  # If we've been passed in CcMessageTo and BccMessageTo fields,
+  # add them to the mime object for passing on to the transaction handler
+  # The "NotifyOtherRecipients" scripAction will look for RT-Send-Cc: and RT-Send-Bcc:
+  # headers
+ 
+  $args{'MIMEObj'}->head->add('RT-Send-Cc', $args{'CcMessageTo'});
+  $args{'MIMEObj'}->head->add('RT-Send-Bcc', $args{'BccMessageTo'});
+
+    #Record the correspondence (write the transaction)
+    my ($Trans,$msg, $TransObj) = $self->_NewTransaction
+      (Type => 'Correspond',
+       Data => ($args{'MIMEObj'}->head->get('subject') || 'No Subject'),
+       TimeTaken => $args{'TimeTaken'},
+       MIMEObj=> $args{'MIMEObj'}     
+      );
+    
+    # TODO this bit of logic should really become a scrip for 2.2
+    my $TicketAsSystem = new RT::Ticket($RT::SystemUser);
+    $TicketAsSystem->Load($self->Id);
+	
+    if (
+	($TicketAsSystem->Status ne 'open') and
+	($TicketAsSystem->Status ne 'new')
+       ) {
+	
+	my $oldstatus = $TicketAsSystem->Status();
+	$TicketAsSystem->__Set(Field => 'Status', Value => 'open');
+	$TicketAsSystem->_NewTransaction 
+	  ( Type => 'Set',
+	    Field => 'Status',
+	    OldValue => $oldstatus,
+	    NewValue => 'open',
+	    Data => 'Ticket auto-opened on incoming correspondence'
+	  );
+    }
+    
+    unless ($Trans) {
+	$RT::Logger->err("$self couldn't init a transaction ($msg)\n");
+	return ($Trans, "correspondence (probably) not sent", $args{'MIMEObj'});
+    }
+    
+    #Set the last told date to now if this isn't mail from the requestor.
+    #TODO: Note that this will wrongly ack mail from any non-requestor as a "told"
+    
+    unless ($TransObj->IsInbound) {
+	$self->_SetTold;
+    }
+    
+    return ($Trans, "correspondence sent");
+}
+
+# }}}
+
+# }}}
+
+# {{{ Routines dealing with Links and Relations between tickets
+
+# {{{ Link Collections
+
+# {{{ sub Members
+
+=head2 Members
+
+  This returns an RT::Links object which references all the tickets 
+which are 'MembersOf' this ticket
+
+=cut
+
+sub Members {
+   my $self = shift;
+   return ($self->_Links('Target', 'MemberOf'));
+}
+
+# }}}
+
+# {{{ sub MemberOf
+
+=head2 MemberOf
+
+  This returns an RT::Links object which references all the tickets that this
+ticket is a 'MemberOf'
+
+=cut
+
+sub MemberOf {
+   my $self = shift;
+   return ($self->_Links('Base', 'MemberOf'));
+}
+
+# }}}
+
+# {{{ RefersTo
+
+=head2 RefersTo
+
+  This returns an RT::Links object which shows all references for which this ticket is a base
+
+=cut
+
+sub RefersTo {
+    my $self = shift;
+    return ($self->_Links('Base', 'RefersTo'));
+}
+
+# }}}
+
+# {{{ ReferredToBy
+
+=head2 ReferredToBy
+
+  This returns an RT::Links object which shows all references for which this ticket is a target
+
+=cut
+
+sub ReferredToBy {
+    my $self = shift;
+    return ($self->_Links('Target', 'RefersTo'));
+}
+
+# }}}
+
+# {{{ DependedOnBy
+
+=head2 DependedOnBy
+
+  This returns an RT::Links object which references all the tickets that depend on this one
+
+=cut
+sub DependedOnBy {
+    my $self = shift;
+    return ($self->_Links('Target','DependsOn'));
+}
+
+# }}}
+
+# {{{ DependsOn
+
+=head2 DependsOn
+
+  This returns an RT::Links object which references all the tickets that this ticket depends on
+
+=cut
+sub DependsOn {
+   my $self = shift;
+    return ($self->_Links('Base','DependsOn'));
+}
+
+# }}}
+
+# {{{ sub _Links 
+
+sub _Links {
+    my $self = shift;
+    
+    #TODO: Field isn't the right thing here. but I ahave no idea what mnemonic ---
+    #tobias meant by $f
+    my $field = shift;
+    my $type =shift || "";
+
+    unless ($self->{"$field$type"}) {
+	$self->{"$field$type"} = new RT::Links($self->CurrentUser);
+	if ($self->CurrentUserHasRight('ShowTicket')) {
+	    
+	    $self->{"$field$type"}->Limit(FIELD=>$field, VALUE=>$self->URI);
+	    $self->{"$field$type"}->Limit(FIELD=>'Type', 
+					  VALUE=>$type) if ($type);
+	}
+    }
+    return ($self->{"$field$type"});
+}
+
+# }}}
+
+# }}}
+
+
+# {{{ sub DeleteLink 
+
+=head2 DeleteLink
+
+Delete a link. takes a paramhash of Base, Target and Type.
+Either Base or Target must be null. The null value will 
+be replaced with this ticket\'s id
+
+=cut 
+
+sub DeleteLink {
+    my $self = shift;
+    my %args = ( Base =>  undef,
+		 Target => undef,
+		 Type => undef,
+		 @_ );
+    
+    #check acls
+    unless ($self->CurrentUserHasRight('ModifyTicket')) {
+        $RT::Logger->debug("No permission to delete links\n"); 
+        return (0, 'Permission Denied');
+
+    
+    }
+    
+    #we want one of base and target. we don't care which
+    #but we only want _one_
+
+    if ($args{'Base'} and $args{'Target'}) {
+	$RT::Logger->debug("$self ->_DeleteLink. got both Base and Target\n");
+	return (0, 'Can\'t specifiy both base and target');
+    }
+    elsif ($args{'Base'}) {
+	$args{'Target'} = $self->Id();
+    }
+    elsif ($args{'Target'}) {
+	$args{'Base'} = $self->Id();
+    }
+    else {  
+        $RT::Logger->debug("$self: Base or Target must be specified\n");
+	return (0, 'Either base or target must be specified');
+    }
+     
+    my $link = new RT::Link($self->CurrentUser);
+    $RT::Logger->debug("Trying to load link: ". $args{'Base'}." ". $args{'Type'}. " ". $args{'Target'}. "\n");
+    
+    $link->Load($args{'Base'}, $args{'Type'}, $args{'Target'});
+    
+    
+    
+    #it's a real link. 
+    if ($link->id) {
+        $RT::Logger->debug("We're going to delete link ".$link->id."\n");
+	$link->Delete();
+
+	my $TransString=
+	  "Ticket $args{'Base'} no longer $args{Type} ticket $args{'Target'}.";
+	my ($Trans, $Msg, $TransObj) = $self->_NewTransaction
+	  (Type => 'DeleteLink',
+	   Field => $args{'Type'},
+	   Data => $TransString,
+	   TimeTaken => 0
+	  );
+	
+	return ($linkid, "Link deleted ($TransString)", $transactionid);
+    }
+    #if it's not a link we can find
+    else {
+        $RT::Logger->debug("Couldn't find that link\n");
+	return (0, "Link not found");
+    }
+}
+
+# }}}
+
+# {{{ sub AddLink
+
+=head2 AddLink
+
+Takes a paramhash of Type and one of Base or Target. Adds that link to this ticket.
+
+
+=cut
+
+sub AddLink {
+    my $self = shift;
+    my %args = ( Target => '',
+		 Base => '',
+	 	 Type => '',
+		 @_ );
+    
+    unless ($self->CurrentUserHasRight('ModifyTicket')) {
+	return (0, "Permission Denied");
+    }
+    
+    if ($args{'Base'} and $args{'Target'}) {
+	$RT::Logger->debug("$self tried to delete a link. both base and target were specified\n");
+	return (0, 'Can\'t specifiy both base and target');
+    }
+    elsif ($args{'Base'}) {
+        $args{'Target'} = $self->Id();
+    }
+    elsif ($args{'Target'}) {
+	$args{'Base'} = $self->Id();
+    }
+    else {  
+	return (0, 'Either base or target must be specified');
+    }
+    
+    # {{{ We don't want references to ourself
+    if ($args{Base} eq $args{Target}) {
+	return (0, "Can\'t link a ticket to itself");
+    }	
+		
+    # }}}
+    
+    # If the base isn't a URI, make it a URI. 
+    # If the target isn't a URI, make it a URI. 
+        
+    # {{{ Check if the link already exists - we don't want duplicates
+    my $old_link= new RT::Link ($self->CurrentUser);
+    $old_link->Load($args{'Base'}, $args{'Type'}, $args{'Target'});
+    if ($old_link->Id) {
+	$RT::Logger->debug("$self Somebody tried to duplicate a link");
+	return ($old_link->id, "Link already exists",0);
+    }
+    # }}}
+    
+    # Storing the link in the DB.
+    my $link = RT::Link->new($self->CurrentUser);
+    my ($linkid) = $link->Create(Target => $args{Target}, 
+				 Base => $args{Base}, 
+				 Type => $args{Type});
+    
+    unless ($linkid) {
+	return (0,"Link could not be created");
+    }
+	#Write the transaction
+    
+    my $TransString="Ticket $args{'Base'} $args{Type} ticket $args{'Target'}.";
+    
+    my ($Trans, $Msg, $TransObj) = $self->_NewTransaction
+      (Type => 'AddLink',
+       Field => $args{'Type'},
+       Data => $TransString,
+       TimeTaken => 0
+      );
+    
+    return ($Trans, "Link created ($TransString)");
+	
+	
+}
+# }}}
+
+# {{{ sub URI 
+
+=head2 URI
+
+Returns this ticket's URI
+
+=cut
+
+sub URI {
+    my $self = shift;
+    return $RT::TicketBaseURI.$self->id;
+}
+
+# }}}
+
+# {{{ sub MergeInto
+
+=head2 MergeInto
+MergeInto take the id of the ticket to merge this ticket into.
+
+=cut
+
+sub MergeInto {
+    my $self = shift;
+    my $MergeInto = shift;
+    
+    unless ($self->CurrentUserHasRight('ModifyTicket')) {
+	return (0, "Permission Denied");
+    }
+    
+    # Load up the new ticket.
+    my $NewTicket = RT::Ticket->new($RT::SystemUser);
+    $NewTicket->Load($MergeInto);
+
+    # make sure it exists.
+    unless (defined $NewTicket->Id) {
+	return (0, 'New ticket doesn\'t exist');
+    }
+
+    
+    # Make sure the current user can modify the new ticket.
+    unless ($NewTicket->CurrentUserHasRight('ModifyTicket')) {
+	$RT::Logger->debug("failed...");
+	return (0, "Permission Denied");
+    }
+    
+    $RT::Logger->debug("checking if the new ticket has the same id and effective id...");
+    unless ($NewTicket->id == $NewTicket->EffectiveId) {
+	$RT::Logger->err('$self trying to merge into '.$NewTicket->Id .
+			 ' which is itself merged.\n');
+	return (0, "Can't merge into a merged ticket. ".
+		"You should never get this error");
+    }
+
+    
+    # We use EffectiveId here even though it duplicates information from
+    # the links table becasue of the massive performance hit we'd take
+    # by trying to do a seperate database query for merge info everytime 
+    # loaded a ticket. 
+    
+    
+    #update this ticket's effective id to the new ticket's id.
+    my ($id_val, $id_msg) = $self->__Set(Field => 'EffectiveId', 
+					 Value => $NewTicket->Id());
+    
+    unless ($id_val) {
+	$RT::Logger->error("Couldn't set effective ID for ".$self->Id.
+			   ": $id_msg");
+	return(0,"Merge failed. Couldn't set EffectiveId");
+    }
+    
+    my ($status_val, $status_msg) = $self->__Set(Field => 'Status',
+						 Value => 'resolved');
+    
+    unless ($status_val) {
+	$RT::Logger->error("$self couldn't set status to resolved.".
+			   "RT's Database may be inconsistent.");
+    }	    
+    
+    #make a new link: this ticket is merged into that other ticket.
+    $self->AddLink( Type =>'MergedInto',
+		    Target => $NewTicket->Id() );
+    
+    #add all of this ticket's watchers to that ticket.
+    my $watchers = $self->Watchers();
+    
+    while (my $watcher = $watchers->Next()) {
+	unless (
+		($watcher->Owner && 
+		$NewTicket->IsWatcher (Type => $watcher->Type,
+				       Id => $watcher->Owner)) or 
+		($watcher->Email && 
+		 $NewTicket->IsWatcher (Type => $watcher->Type,
+					Id => $watcher->Email)) 
+	       ) {
+	    
+	    
+	    
+	    $NewTicket->_AddWatcher(Silent => 1, 
+				    Type => $watcher->Type, 
+				    Email => $watcher->Email,
+				    Owner => $watcher->Owner);
+	}
+    }
+    
+    
+    #find all of the tickets that were merged into this ticket. 
+    my $old_mergees = new RT::Tickets($self->CurrentUser);
+    $old_mergees->Limit( FIELD => 'EffectiveId',
+			 OPERATOR => '=',
+			 VALUE => $self->Id );
+    
+    #   update their EffectiveId fields to the new ticket's id
+    while (my $ticket = $old_mergees->Next()) {
+	my ($val, $msg) = $ticket->__Set(Field => 'EffectiveId', 
+					 Value => $NewTicket->Id());
+    }	
+    $NewTicket->_SetLastUpdated;
+
+    return ($TransactionObj, "Merge Successful");
+}  
+
+# }}}
+
+# }}}
+
+# {{{ Routines dealing with keywords
+
+# {{{ sub KeywordsObj
+
+=head2 KeywordsObj [KEYWORD_SELECT_ID]
+
+  Returns an B<RT::ObjectKeywords> object preloaded with this ticket's ObjectKeywords.
+If the optional KEYWORD_SELECT_ID parameter is set, limit the keywords object to that keyword
+select.
+
+=cut
+
+sub KeywordsObj {
+    my $self = shift;
+    my $keyword_select; 
+    
+    $keyword_select = shift if (@_);
+    
+    use RT::ObjectKeywords;
+    my $Keywords = new RT::ObjectKeywords($self->CurrentUser);
+
+    #ACL check
+    if ($self->CurrentUserHasRight('ShowTicket')) {
+	$Keywords->LimitToTicket($self->id);
+	if ($keyword_select) {
+	    $Keywords->LimitToKeywordSelect($keyword_select);
+	}	
+    }
+    return ($Keywords);
+}
+# }}}
+
+# {{{ sub AddKeyword
+
+=head2 AddKeyword
+
+Takes a paramhash of Keyword and KeywordSelect.  If Keyword is a valid choice
+for KeywordSelect, creates a KeywordObject.  If the KeywordSelect says this should
+be a single KeywordObject, automatically removes the old value.
+
+ Issues: probably doesn't enforce the depth restrictions or make sure that keywords
+are coming from the right part of the tree. really should.
+
+=cut
+
+sub AddKeyword {
+    my $self = shift;
+   #ACL check
+    unless ($self->CurrentUserHasRight('ModifyTicket')) {
+	return (0, 'Permission Denied');
+    }
+    
+    return($self->_AddKeyword(@_));
+    
+}
+
+
+# Helper version of AddKeyword without that pesky ACL check
+sub _AddKeyword {
+    my $self = shift;
+    my %args = ( KeywordSelect => undef,  # id of a keyword select record
+		 Keyword => undef, #id of the keyword to add
+		 Silent => 0,
+		 @_
+	       );
+    
+    my ($OldValue);
+
+    #TODO make sure that $args{'Keyword'} is valid for $args{'KeywordSelect'}
+
+    #TODO: make sure that $args{'KeywordSelect'} applies to this ticket's queue.
+    
+    my $Keyword = new RT::Keyword($self->CurrentUser);
+    unless ($Keyword->Load($args{'Keyword'}) ) {
+	$RT::Logger->err("$self Couldn't load Keyword ".$args{'Keyword'} ."\n");
+	return(0, "Couldn't load keyword");
+    }
+    
+    my $KeywordSelectObj = new RT::KeywordSelect($self->CurrentUser);
+    unless ($KeywordSelectObj->Load($args{'KeywordSelect'})) {
+	$RT::Logger->err("$self Couldn't load KeywordSelect ".$args{'KeywordSelect'});
+	return(0, "Couldn't load keywordselect");
+    }
+    
+    my $Keywords = $self->KeywordsObj($KeywordSelectObj->id);
+
+    #If the ticket already has this keyword, just get out of here.
+    if ($Keywords->HasEntry($Keyword->id)) {
+	return(0, "That is already the current value");
+    }	
+
+    #If the keywordselect wants this to be a singleton:
+
+    if ($KeywordSelectObj->Single) {
+
+	#Whack any old values...keep track of the last value that we get.
+	#we shouldn't need a loop ehre, but we do it anyway, to try to 
+	# help keep the database clean.
+	while (my $OldKey = $Keywords->Next) {
+	    $OldValue = $OldKey->KeywordObj->Name;
+	    $OldKey->Delete();
+	}	
+	
+	
+    }
+
+    # create the new objectkeyword 
+    my $ObjectKeyword = new RT::ObjectKeyword($self->CurrentUser);
+    my $result = $ObjectKeyword->Create( Keyword => $Keyword->Id,
+					 ObjectType => 'Ticket',
+					 ObjectId => $self->Id,
+					 KeywordSelect => $KeywordSelectObj->Id );
+    
+
+    # record a single transaction, unless we were told not to
+    unless ($args{'Silent'}) {
+	my ($TransactionId, $Msg, $TransactionObj) = 
+	  $self->_NewTransaction( Type => 'Keyword',
+				  Field => $KeywordSelectObj->Id,
+				  OldValue => $OldValue,
+				  NewValue => $Keyword->Name );
+    }
+    return ($TransactionId, "Keyword ".$ObjectKeyword->KeywordObj->Name ." added.");    
+
+}	
+
+# }}}
+
+# {{{ sub DeleteKeyword
+
+=head2 DeleteKeyword
+  
+  Takes a paramhash. Deletes the Keyword denoted by the I<Keyword> parameter from this
+  ticket's object keywords.
+
+=cut
+
+sub DeleteKeyword {
+    my $self = shift;
+    my %args = ( Keyword => undef,
+		 KeywordSelect => undef,
+		 @_ );
+
+   #ACL check
+    unless ($self->CurrentUserHasRight('ModifyTicket')) {    
+	return (0, 'Permission Denied');
+    }
+
+    
+    #Load up the ObjectKeyword we\'re talking about
+    my $ObjectKeyword = new RT::ObjectKeyword($self->CurrentUser);
+    $ObjectKeyword->LoadByCols(Keyword => $args{'Keyword'},
+			       KeywordSelect => $args{'KeywordSelect'},
+			       ObjectType => 'Ticket',
+			       ObjectId => $self->id()
+			      );
+    
+    #if we can\'t find it, bail
+    unless ($ObjectKeyword->id) {
+	$RT::Logger->err("Couldn't find the keyword ".$args{'Keyword'} .
+			 " for keywordselect ". $args{'KeywordSelect'} . 
+			 "for ticket ".$self->id );
+	return (undef, "Couldn't load keyword while trying to delete it.");
+    };
+    
+    #record transaction here.
+    my ($TransactionId, $Msg, $TransObj) = 
+      $self->_NewTransaction( Type => 'Keyword', 
+			      OldValue => $ObjectKeyword->KeywordObj->Name);
+    
+    $ObjectKeyword->Delete();
+    
+    return ($TransactionId, "Keyword ".$ObjectKeyword->KeywordObj->Name ." deleted.");
+    
+}
+
+# }}}
+
+# }}}
+
+# {{{ Routines dealing with ownership
+
+# {{{ sub OwnerObj
+
+=head2 OwnerObj
+
+Takes nothing and returns an RT::User object of 
+this ticket's owner
+
+=cut
+
+sub OwnerObj {
+    my $self = shift;
+    
+    #If this gets ACLed, we lose on a rights check in User.pm and
+    #get deep recursion. if we need ACLs here, we need
+    #an equiv without ACLs
+    
+    $owner = new RT::User ($self->CurrentUser);
+    $owner->Load($self->__Value('Owner'));
+    
+    #Return the owner object
+    return ($owner);
+}
+
+# }}}
+
+# {{{ sub OwnerAsString 
+
+=head2 OwnerAsString
+
+Returns the owner's email address
+
+=cut
+
+sub OwnerAsString {
+  my $self = shift;
+  return($self->OwnerObj->EmailAddress);
+
+}
+
+# }}}
+
+# {{{ sub SetOwner
+
+=head2 SetOwner
+
+Takes two arguments:
+     the Id or Name of the owner 
+and  (optionally) the type of the SetOwner Transaction. It defaults
+to 'Give'.  'Steal' is also a valid option.
+
+=cut
+
+sub SetOwner {
+    my $self = shift;
+    my $NewOwner = shift;
+    my $Type = shift || "Give";
+    
+    unless ($self->CurrentUserHasRight('ModifyTicket')) {
+	return (0, "Permission Denied");
+    }  
+    
+    my $NewOwnerObj = RT::User->new($self->CurrentUser);
+    my $OldOwnerObj = $self->OwnerObj;
+  
+    $NewOwnerObj->Load($NewOwner);
+    if (!$NewOwnerObj->Id) {
+	    return (0, "That user does not exist");
+    }
+    
+    #If thie ticket has an owner and it's not the current user
+    
+    if (($Type ne 'Steal' ) and ($Type ne 'Force') and	#If we're not stealing
+	($self->OwnerObj->Id != $RT::Nobody->Id ) and #and the owner is set
+	($self->CurrentUser->Id ne $self->OwnerObj->Id())) { #and it's not us
+	return(0, "You can only reassign tickets that you own or that are unowned");
+    }
+    
+    #If we've specified a new owner and that user can't modify the ticket
+    elsif (($NewOwnerObj->Id) and 
+	   (!$NewOwnerObj->HasQueueRight(Right => 'OwnTicket',
+					 QueueObj => $self->QueueObj,
+					 TicketObj => $self))
+	  ) {
+	return (0, "That user may not own requests in that queue");
+    }
+  
+  
+    #If the ticket has an owner and it's the new owner, we don't need
+    #To do anything
+    elsif (($self->OwnerObj) and ($NewOwnerObj->Id eq $self->OwnerObj->Id)) {
+	return(0, "That user already owns that request");
+    }
+  
+  
+    my ($trans,$msg)=$self->_Set(Field => 'Owner',
+				 Value => $NewOwnerObj->Id, 
+				 TimeTaken => 0,
+				 TransactionType => $Type);
+  
+    if ($trans) {
+	$msg = "Owner changed from ".$OldOwnerObj->Name." to ".$NewOwnerObj->Name;
+    }
+    return ($trans, $msg);
+	  
+}
+
+# }}}
+
+# {{{ sub Take
+
+=head2 Take
+
+A convenince method to set the ticket's owner to the current user
+
+=cut
+
+sub Take {
+    my $self = shift;
+    return ($self->SetOwner($self->CurrentUser->Id, 'Take'));
+}
+
+# }}}
+
+# {{{ sub Untake
+
+=head2 Untake
+
+Convenience method to set the owner to 'nobody' if the current user is the owner.
+
+=cut
+
+sub Untake {
+    my $self = shift;
+    return($self->SetOwner($RT::Nobody->UserObj->Id, 'Untake'));
+}
+# }}}
+
+# {{{ sub Steal 
+
+=head2 Steal
+
+A convenience method to change the owner of the current ticket to the
+current user. Even if it's owned by another user.
+
+=cut
+
+sub Steal {
+    my $self = shift;
+  
+    if ($self->IsOwner($self->CurrentUser)) {
+	return (0,"You already own this ticket"); 
+    } else {
+	return($self->SetOwner($self->CurrentUser->Id, 'Steal'));
+      
+    }
+  
+}
+
+# }}}
+
+# }}}
+
+# {{{ Routines dealing with status
+
+# {{{ sub ValidateStatus 
+
+=head2 ValidateStatus STATUS
+
+Takes a string. Returns true if that status is a valid status for this ticket.
+Returns false otherwise.
+
+=cut
+
+sub ValidateStatus {
+    my $self = shift;
+    my $status = shift;
+
+    #Make sure the status passed in is valid
+    unless ($self->QueueObj->IsValidStatus($status)) {
+	return (undef);
+    }
+    
+    return (1);
+
+}
+
+
+# }}}
+
+# {{{ sub SetStatus
+
+=head2 SetStatus STATUS
+
+Set this ticket\'s status. STATUS can be one of: new, open, stalled, resolved or dead.
+
+=cut
+
+sub SetStatus { 
+    my $self = shift;
+    my $status = shift;
+
+    #Check ACL
+    unless ($self->CurrentUserHasRight('ModifyTicket')) {
+	return (0, 'Permission Denied');
+    }
+
+    my $now = new RT::Date($self->CurrentUser);
+    $now->SetToNow();
+    
+    #If we're changing the status from new, record that we've started
+    if (($self->Status =~ /new/) && ($status ne 'new')) {
+	#Set the Started time to "now"
+	$self->_Set(Field => 'Started',
+		    Value => $now->ISO,
+		    RecordTransaction => 0);
+    }
+    
+
+    if ($status eq 'resolved') {
+	#When we resolve a ticket, set the 'Resolved' attribute to now.
+	$self->_Set(Field => 'Resolved',
+		    Value => $now->ISO, 
+		    RecordTransaction => 0);
+    }
+    
+    
+    #Actually update the status
+    return($self->_Set(Field => 'Status', 
+		       Value => $status,
+		       TimeTaken => 0,
+		       TransactionType => 'Status'));
+}
+
+# }}}
+
+# {{{ sub Kill
+
+=head2 Kill
+
+Takes no arguments. Marks this ticket for garbage collection
+
+=cut
+
+sub Kill {
+  my $self = shift;
+  return ($self->SetStatus('dead'));
+  # TODO: garbage collection
+}
+
+# }}}
+
+# {{{ sub Stall
+
+=head2 Stall
+
+Sets this ticket's status to stalled
+
+=cut
+
+sub Stall {
+  my $self = shift;
+  return ($self->SetStatus('stalled'));
+}
+
+# }}}
+
+# {{{ sub Open
+
+=head2 Open
+
+Sets this ticket\'s status to Open
+
+=cut
+
+sub Open {
+    my $self = shift;
+    return ($self->SetStatus('open'));
+}
+
+# }}}
+
+# {{{ sub Resolve
+
+=head2 Resolve
+
+Sets this ticket\'s status to Resolved
+
+=cut
+
+sub Resolve {
+    my $self = shift;
+    return ($self->SetStatus('resolved'));
+}
+
+# }}}
+
+# }}}
+
+# {{{ Actions + Routines dealing with transactions
+
+# {{{ sub SetTold and _SetTold
+
+=head2 SetTold ISO  [TIMETAKEN]
+
+Updates the told and records a transaction
+
+=cut
+
+sub SetTold {
+    my $self=shift;
+    my $told;
+    $told = shift if (@_);
+    my $timetaken=shift || 0;
+   
+    unless ($self->CurrentUserHasRight('ModifyTicket')) {
+	return (0, "Permission Denied");
+    }
+
+    my $datetold = new RT::Date($self->CurrentUser);
+    if ($told) {
+	$datetold->Set( Format => 'iso',
+			Value => $told);
+    }
+    else {
+	 $datetold->SetToNow(); 
+    }
+    
+    return($self->_Set(Field => 'Told', 
+		       Value => $datetold->ISO,
+		       TimeTaken => $timetaken,
+		       TransactionType => 'Told'));
+}
+
+=head2 _SetTold
+
+Updates the told without a transaction or acl check. Useful when we're sending replies.
+
+=cut
+
+sub _SetTold {
+    my $self=shift;
+    
+    my $now = new RT::Date($self->CurrentUser);
+    $now->SetToNow();
+    #use __Set to get no ACLs ;)
+    return($self->__Set(Field => 'Told',
+			Value => $now->ISO));
+}
+
+# }}}
+
+# {{{ sub Transactions 
+
+=head2 Transactions
+
+  Returns an RT::Transactions object of all transactions on this ticket
+
+=cut
+  
+sub Transactions {
+    my $self = shift;
+    
+    use RT::Transactions;
+    my $transactions = RT::Transactions->new($self->CurrentUser);
+
+    #If the user has no rights, return an empty object
+    if ($self->CurrentUserHasRight('ShowTicket')) {
+	my $tickets = $transactions->NewAlias('Tickets');
+	$transactions->Join( ALIAS1 => 'main',
+			      FIELD1 => 'Ticket',
+			      ALIAS2 => $tickets,
+			      FIELD2 => 'id');
+	$transactions->Limit( ALIAS => $tickets,
+			      FIELD => 'EffectiveId',
+			      VALUE => $self->id());
+        # if the user may not see comments do not return them
+        unless ($self->CurrentUserHasRight('ShowTicketComments')) {
+            $transactions->Limit( FIELD => 'Type',
+                                  OPERATOR => '!=',
+                                  VALUE => "Comment");
+        }
+    }
+    
+    return($transactions);
+}
+
+# }}}
+
+# {{{ sub _NewTransaction
+
+sub _NewTransaction {
+    my $self = shift;
+    my %args = ( TimeTaken => 0,
+		 Type => undef,
+		 OldValue => undef,
+		 NewValue => undef,
+		 Data => undef,
+		 Field => undef,
+		 MIMEObj => undef,
+		 @_ );
+    
+    
+    require RT::Transaction;
+    my $trans = new RT::Transaction($self->CurrentUser);
+    my ($transaction, $msg) = 
+      $trans->Create( Ticket => $self->Id,
+		      TimeTaken => $args{'TimeTaken'},
+		      Type => $args{'Type'},
+		      Data => $args{'Data'},
+		      Field => $args{'Field'},
+		      NewValue => $args{'NewValue'},
+		      OldValue => $args{'OldValue'},
+		      MIMEObj => $args{'MIMEObj'}
+		    );
+    
+    $RT::Logger->warning($msg) unless $transaction;
+    
+    $self->_SetLastUpdated;
+    
+    if (defined $args{'TimeTaken'} ) {
+	$self->_UpdateTimeTaken($args{'TimeTaken'}); 
+    }
+    return($transaction, $msg, $trans);
+}
+
+# }}}
+
+# }}}
+
+# {{{ PRIVATE UTILITY METHODS. Mostly needed so Ticket can be a DBIx::Record
+
+# {{{ sub _ClassAccessible
+
+sub _ClassAccessible {
+    {
+	EffectiveId => { 'read' => 1, 'write' => 1, 'public' => 1 },
+	Queue => { 'read' => 1, 'write' => 1 },
+	Requestors => { 'read' => 1, 'write' => 1 },
+	Owner => { 'read' => 1, 'write' => 1 },
+	Subject => { 'read' => 1, 'write' => 1 },
+	InitialPriority => { 'read' => 1, 'write' => 1 },
+	FinalPriority => { 'read' => 1, 'write' => 1 },
+	Priority => { 'read' => 1, 'write' => 1 },
+	Status => { 'read' => 1, 'write' => 1 },
+	TimeWorked => { 'read' => 1, 'write' => 1 },
+	TimeLeft => { 'read' => 1, 'write' => 1 },
+	Created => { 'read' => 1, 'auto' => 1 },
+	Creator => { 'read' => 1,  'auto' => 1 },
+	Told => { 'read' => 1, 'write' => 1 },
+	Resolved => {'read' => 1},
+	Starts => { 'read' => 1, 'write' => 1 },
+	Started => { 'read' => 1, 'write' => 1 },
+	Due => { 'read' => 1, 'write' => 1 },
+	Creator => { 'read' => 1, 'auto' => 1 },
+	Created => { 'read' => 1, 'auto' => 1 },
+	LastUpdatedBy => { 'read' => 1, 'auto' => 1 },
+	LastUpdated => { 'read' => 1, 'auto' => 1 }
+    };
+
+}    
+
+# }}}
+
+# {{{ sub _Set
+
+sub _Set {
+    my $self = shift;
+    
+    unless ($self->CurrentUserHasRight('ModifyTicket')) {
+	return (0, "Permission Denied");
+    }
+    
+    my %args = (Field => undef,
+		Value => undef,
+		TimeTaken => 0,
+		RecordTransaction => 1,
+		TransactionType => 'Set',
+		@_
+	       );
+    #if the user is trying to modify the record
+    
+    #Take care of the old value we really don't want to get in an ACL loop.
+    # so ask the super::_Value
+    my $Old=$self->SUPER::_Value("$args{'Field'}");
+    
+    #Set the new value
+    my ($ret, $msg)=$self->SUPER::_Set(Field => $args{'Field'}, 
+				       Value=> $args{'Value'});
+    
+    #If we can't actually set the field to the value, don't record
+    # a transaction. instead, get out of here.
+    if ($ret==0) {return (0,$msg);}
+    
+    if ($args{'RecordTransaction'} == 1) {
+	
+	my ($Trans, $Msg, $TransObj) =	
+	  $self->_NewTransaction(Type => $args{'TransactionType'},
+				 Field => $args{'Field'},
+				 NewValue => $args{'Value'},
+				 OldValue =>  $Old,
+				 TimeTaken => $args{'TimeTaken'},
+				);
+      return ($Trans,$TransObj->Description);
+    }
+    else {
+	return ($ret, $msg);
+  }
+}
+
+# }}}
+
+# {{{ sub _Value 
+
+=head2 _Value
+
+Takes the name of a table column.
+Returns its value as a string, if the user passes an ACL check
+
+=cut
+
+sub _Value  {
+
+  my $self = shift;
+  my $field = shift;
+
+  
+  #if the field is public, return it.
+  if ($self->_Accessible($field, 'public')) {
+      #$RT::Logger->debug("Skipping ACL check for $field\n");
+      return($self->SUPER::_Value($field));
+      
+  }
+  
+  #If the current user doesn't have ACLs, don't let em at it.  
+  
+  unless ($self->CurrentUserHasRight('ShowTicket')) {
+      return (undef);
+  }
+  return($self->SUPER::_Value($field));
+  
+}
+
+# }}}
+
+# {{{ sub _UpdateTimeTaken
+
+=head2 _UpdateTimeTaken
+
+This routine will increment the timeworked counter. it should
+only be called from _NewTransaction 
+
+=cut
+
+sub _UpdateTimeTaken {
+  my $self = shift;
+  my $Minutes = shift;
+  my ($Total);
+   
+  $Total = $self->SUPER::_Value("TimeWorked");
+  $Total = ($Total || 0) + ($Minutes || 0);
+  $self->SUPER::_Set(Field => "TimeWorked", 
+		     Value => $Total);
+
+  return ($Total);
+}
+
+# }}}
+
+# }}}
+
+# {{{ Routines dealing with ACCESS CONTROL
+
+# {{{ sub CurrentUserHasRight 
+
+=head2 CurrentUserHasRight
+
+  Takes the textual name of a Ticket scoped right (from RT::ACE) and returns
+1 if the user has that right. It returns 0 if the user doesn't have that right.
+
+=cut
+
+sub CurrentUserHasRight {
+  my $self = shift;
+  my $right = shift;
+  
+  return ($self->HasRight( Principal=> $self->CurrentUser->UserObj(),
+			    Right => "$right"));
+
+}
+
+# }}}
+
+# {{{ sub HasRight 
+
+=head2 HasRight
+
+ Takes a paramhash with the attributes 'Right' and 'Principal'
+  'Right' is a ticket-scoped textual right from RT::ACE 
+  'Principal' is an RT::User object
+
+  Returns 1 if the principal has the right. Returns undef if not.
+
+=cut
+
+sub HasRight {
+    my $self = shift;
+    my %args = ( Right => undef,
+		 Principal => undef,
+		 @_);
+    
+    unless ((defined $args{'Principal'}) and (ref($args{'Principal'}))) {
+	$RT::Logger->warning("Principal attrib undefined for Ticket::HasRight");
+    }
+    
+    return($args{'Principal'}->HasQueueRight(TicketObj => $self,
+					     Right => $args{'Right'}));
+}
+
+# }}}
+
+# }}}
+
+
+1;
+
+=head1 AUTHOR
+
+Jesse Vincent, jesse@fsck.com
+
+=head1 SEE ALSO
+
+RT
+
+=cut
+
+
diff --git a/rt/lib/RT/Tickets.pm b/rt/lib/RT/Tickets.pm
new file mode 100755
index 000000000..dd91126c4
--- /dev/null
+++ b/rt/lib/RT/Tickets.pm
@@ -0,0 +1,1789 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Tickets.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::Tickets - A collection of Ticket objects
+
+
+=head1 SYNOPSIS
+
+  use RT::Tickets;
+  my $tickets = new RT::Tickets($CurrentUser);
+
+=head1 DESCRIPTION
+
+   A collection of RT::Tickets.
+
+=head1 METHODS
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Tickets);
+
+=end testing
+
+=cut
+
+package RT::Tickets;
+use RT::EasySearch;
+use RT::Ticket;
+@ISA= qw(RT::EasySearch);
+
+use vars qw(%TYPES @SORTFIELDS);
+
+# {{{ TYPES
+
+%TYPES =    ( Status => 'ENUM',
+	      Queue  => 'ENUM',
+	      Type => 'ENUM',
+	      Creator => 'ENUM',
+	      LastUpdatedBy => 'ENUM',
+	      Owner => 'ENUM',
+	      EffectiveId => 'INT',
+	      id => 'INT',
+	      InitialPriority => 'INT',
+	      FinalPriority => 'INT',
+	      Priority => 'INT',
+	      TimeLeft => 'INT',
+	      TimeWorked => 'INT',
+	      MemberOf => 'LINK',
+	      DependsOn => 'LINK',
+	      HasMember => 'LINK',
+	      HasDepender => 'LINK',
+	      RelatedTo => 'LINK',
+              Told => 'DATE',
+              StartsBy => 'DATE',
+              Started => 'DATE',
+              Due  => 'DATE',
+              Resolved => 'DATE',
+              LastUpdated => 'DATE',
+              Created => 'DATE',
+              Subject => 'STRING',
+	      Type => 'STRING',
+              Content => 'TRANSFIELD',
+	      ContentType => 'TRANSFIELD',
+ 	      TransactionDate => 'TRANSDATE',
+	      Watcher => 'WATCHERFIELD',
+	      LinkedTo => 'LINKFIELD',
+              Keyword => 'KEYWORDFIELD'
+
+	    );
+
+
+# }}}
+
+# {{{ sub SortFields
+
+@SORTFIELDS = qw(id Status Owner Created Due Starts Started
+		 Queue Subject Told Started 
+		    Resolved LastUpdated Priority TimeWorked TimeLeft);
+
+=head2 SortFields
+
+Returns the list of fields that lists of tickets can easily be sorted by
+
+=cut
+
+
+sub SortFields {
+	my $self = shift;
+	return(@SORTFIELDS);
+}
+
+
+# }}}
+
+# {{{ Limit the result set based on content
+
+# {{{ sub Limit 
+
+=head2 Limit
+
+Takes a paramhash with the fields FIELD, OPERATOR, VALUE and DESCRIPTION
+Generally best called from LimitFoo methods
+
+=cut
+sub Limit {
+    my $self = shift;
+    my %args = ( FIELD => undef,
+		 OPERATOR => '=',
+		 VALUE => undef,
+		 DESCRIPTION => undef,
+		 @_
+	       );
+   $args{'DESCRIPTION'} = "Autodescribed: ".$args{'FIELD'} . $args{'OPERATOR'} . $args{'VALUE'},
+    if (!defined $args{'DESCRIPTION'}) ;
+
+    my $index = $self->_NextIndex;
+    
+    #make the TicketRestrictions hash the equivalent of whatever we just passed in;
+    
+    %{$self->{'TicketRestrictions'}{$index}} = %args;
+
+    $self->{'RecalcTicketLimits'} = 1;
+
+    # If we're looking at the effective id, we don't want to append the other clause
+    # which limits us to tickets where id = effective id 
+    if ($args{'FIELD'} eq 'EffectiveId') {
+        $self->{'looking_at_effective_id'} = 1;
+    }
+
+    return ($index);
+}
+
+# }}}
+
+
+
+
+=head2 FreezeLimits
+
+Returns a frozen string suitable for handing back to ThawLimits.
+
+=cut
+# {{{ sub FreezeLimits
+
+sub FreezeLimits {
+	my $self = shift;
+	require FreezeThaw;
+	return (FreezeThaw::freeze($self->{'TicketRestrictions'},
+				   $self->{'restriction_index'}
+				  ));
+}
+
+# }}}
+
+=head2 ThawLimits
+
+Take a frozen Limits string generated by FreezeLimits and make this tickets
+object have that set of limits.
+
+=cut
+# {{{ sub ThawLimits
+
+sub ThawLimits {
+	my $self = shift;
+	my $in = shift;
+	
+	#if we don't have $in, get outta here.
+	return undef unless ($in);
+
+    	$self->{'RecalcTicketLimits'} = 1;
+
+	require FreezeThaw;
+	
+	#We don't need to die if the thaw fails.
+	
+	eval {
+		($self->{'TicketRestrictions'},
+		$self->{'restriction_index'}
+		) = FreezeThaw::thaw($in);
+	}
+
+}
+
+# }}}
+
+# {{{ Limit by enum or foreign key
+
+# {{{ sub LimitQueue
+
+=head2 LimitQueue
+
+LimitQueue takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of = or !=. (It defaults to =).
+VALUE is a queue id. 
+
+=cut
+
+sub LimitQueue {
+    my $self = shift;
+    my %args = (VALUE => undef,
+		OPERATOR => '=',
+		@_);
+
+    #TODO  VALUE should also take queue names and queue objects
+    my $queue = new RT::Queue($self->CurrentUser);
+    $queue->Load($args{'VALUE'});
+    
+    #TODO check for a valid queue here
+
+    $self->Limit (FIELD => 'Queue',
+		  VALUE => $queue->id(),
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => 'Queue ' .  $args{'OPERATOR'}. " ". $queue->Name
+		 );
+    
+}
+# }}}
+
+# {{{ sub LimitStatus
+
+=head2 LimitStatus
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of = or !=.
+VALUE is a status.
+
+=cut
+
+sub LimitStatus {
+    my $self = shift;
+    my %args = ( OPERATOR => '=',
+                  @_);
+    $self->Limit (FIELD => 'Status',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => 'Status ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
+		 );
+}
+
+# }}}
+
+# {{{ sub LimitType
+
+=head2 LimitType
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of = or !=, it defaults to "=".
+VALUE is a string to search for in the type of the ticket.
+
+=cut
+
+sub LimitType {
+    my $self = shift;
+    my %args = (OPERATOR => '=',
+		VALUE => undef,
+		@_);
+    $self->Limit (FIELD => 'Type',
+                  VALUE => $args{'VALUE'},
+                  OPERATOR => $args{'OPERATOR'},
+                  DESCRIPTION => 'Type ' .  $args{'OPERATOR'}. " ". $args{'Limit'},
+                 );
+}
+
+# }}}
+
+# }}}
+
+# {{{ Limit by string field
+
+# {{{ sub LimitSubject
+
+=head2 LimitSubject
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of = or !=.
+VALUE is a string to search for in the subject of the ticket.
+
+=cut
+
+sub LimitSubject {
+    my $self = shift;
+    my %args = (@_);
+    $self->Limit (FIELD => 'Subject',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => 'Subject ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
+		 );
+}
+
+# }}}
+
+# }}}
+
+# {{{ Limit based on ticket numerical attributes
+# Things that can be > < = !=
+
+# {{{ sub LimitId
+
+=head2 LimitId
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of =, >, < or !=.
+VALUE is a ticket Id to search for
+
+=cut
+
+sub LimitId {
+    my $self = shift;
+    my %args = (OPERATOR => '=',
+                @_);
+    
+    $self->Limit (FIELD => 'id',
+                  VALUE => $args{'VALUE'},
+                  OPERATOR => $args{'OPERATOR'},
+                  DESCRIPTION => 'Id ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
+                 );
+}
+
+# }}}
+
+# {{{ sub LimitPriority
+
+=head2 LimitPriority
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of =, >, < or !=.
+VALUE is a value to match the ticket\'s priority against
+
+=cut
+
+sub LimitPriority {
+    my $self = shift;
+    my %args = (@_);
+    $self->Limit (FIELD => 'Priority',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => 'Priority ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
+		 );
+}
+
+# }}}
+
+# {{{ sub LimitInitialPriority
+
+=head2 LimitInitialPriority
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of =, >, < or !=.
+VALUE is a value to match the ticket\'s initial priority against
+
+
+=cut
+
+sub LimitInitialPriority {
+    my $self = shift;
+    my %args = (@_);
+    $self->Limit (FIELD => 'InitialPriority',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => 'Initial Priority ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
+		 );
+}
+
+# }}}
+
+# {{{ sub LimitFinalPriority
+
+=head2 LimitFinalPriority
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of =, >, < or !=.
+VALUE is a value to match the ticket\'s final priority against
+
+=cut
+
+sub LimitFinalPriority {
+    my $self = shift;
+    my %args = (@_);
+    $self->Limit (FIELD => 'FinalPriority',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => 'Final Priority ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
+		 );
+}
+
+# }}}
+
+# {{{ sub LimitTimeWorked
+
+=head2 LimitTimeWorked
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of =, >, < or !=.
+VALUE is a value to match the ticket's TimeWorked attribute
+
+=cut
+
+sub LimitTimeWorked {
+    my $self = shift;
+    my %args = (@_);
+    $self->Limit (FIELD => 'TimeWorked',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => 'Time worked ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
+		 );
+}
+
+# }}}
+
+# {{{ sub LimitTimeLeft
+
+=head2 LimitTimeLeft
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of =, >, < or !=.
+VALUE is a value to match the ticket's TimeLeft attribute
+
+=cut
+
+sub LimitTimeLeft {
+    my $self = shift;
+    my %args = (@_);
+    $self->Limit (FIELD => 'TimeLeft',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => 'Time left ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
+		 );
+}
+
+# }}}
+
+# }}}
+
+# {{{ Limiting based on attachment attributes
+
+# {{{ sub LimitContent
+
+=head2 LimitContent
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of =, LIKE, NOT LIKE or !=.
+VALUE is a string to search for in the body of the ticket
+
+=cut
+sub LimitContent {
+    my $self = shift;
+    my %args = (@_);
+    $self->Limit (FIELD => 'Content',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => 'Ticket content ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
+		 );
+}
+
+# }}}
+# {{{ sub LimitContentType
+
+=head2 LimitContentType
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of =, LIKE, NOT LIKE or !=.
+VALUE is a content type to search ticket attachments for
+
+=cut
+  
+sub LimitContentType {
+    my $self = shift;
+    my %args = (@_);
+    $self->Limit (FIELD => 'ContentType',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => 'Ticket content type ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
+		 );
+}
+# }}}
+
+# }}}
+
+# {{{ Limiting based on people
+
+# {{{ sub LimitOwner
+
+=head2 LimitOwner
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of = or !=.
+VALUE is a user id.
+
+=cut
+
+sub LimitOwner {
+    my $self = shift;
+    my %args = ( OPERATOR => '=',
+                 @_);
+    
+    my $owner = new RT::User($self->CurrentUser);
+    $owner->Load($args{'VALUE'});
+    $self->Limit (FIELD => 'Owner',
+		  VALUE => $owner->Id,
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => 'Owner ' .  $args{'OPERATOR'}. " ". $owner->Name()
+		 );
+    
+}
+
+# }}}
+
+# {{{ Limiting watchers
+
+# {{{ sub LimitWatcher
+
+
+=head2 LimitWatcher
+  
+  Takes a paramhash with the fields OPERATOR, TYPE and VALUE.
+  OPERATOR is one of =, LIKE, NOT LIKE or !=.
+  VALUE is a value to match the ticket\'s watcher email addresses against
+  TYPE is the sort of watchers you want to match against. Leave it undef if you want to search all of them
+
+=cut
+   
+sub LimitWatcher {
+    my $self = shift;
+    my %args = ( OPERATOR => '=',
+		 VALUE => undef,
+		 TYPE => undef,
+		@_);
+
+
+    #build us up a description
+    my ($watcher_type, $desc);
+    if ($args{'TYPE'}) {
+	$watcher_type = $args{'TYPE'};
+    }
+    else {
+	$watcher_type = "Watcher";
+    }
+    $desc = "$watcher_type ".$args{'OPERATOR'}." ".$args{'VALUE'};
+
+
+    $self->Limit (FIELD => 'Watcher',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  TYPE => $args{'TYPE'},
+		  DESCRIPTION => "$desc"
+		 );
+}
+
+# }}}
+
+# {{{ sub LimitRequestor
+
+=head2 LimitRequestor
+
+It\'s like LimitWatcher, but it presets TYPE to Requestor
+
+=cut
+
+
+sub LimitRequestor {
+    my $self = shift;
+    $self->LimitWatcher(TYPE=> 'Requestor', @_);
+}
+
+# }}}
+
+# {{{ sub LimitCc
+
+=head2 LimitCC
+
+It\'s like LimitWatcher, but it presets TYPE to Cc
+
+=cut
+
+sub LimitCc {
+    my $self = shift;
+    $self->LimitWatcher(TYPE=> 'Cc', @_);
+}
+
+# }}}
+
+# {{{ sub LimitAdminCc
+
+=head2 LimitAdminCc
+
+It\'s like LimitWatcher, but it presets TYPE to AdminCc
+
+=cut
+  
+sub LimitAdminCc {
+    my $self = shift;
+    $self->LimitWatcher(TYPE=> 'AdminCc', @_);
+}
+
+# }}}
+
+# }}}
+
+# }}}
+
+# {{{ Limiting based on links
+
+# {{{ LimitLinkedTo
+
+=head2 LimitLinkedTo
+
+LimitLinkedTo takes a paramhash with two fields: TYPE and TARGET
+TYPE limits the sort of relationship we want to search on
+
+TARGET is the id or URI of the TARGET of the link
+(TARGET used to be 'TICKET'.  'TICKET' is deprecated, but will be treated as TARGET
+
+=cut
+
+sub LimitLinkedTo {
+    my $self = shift;
+    my %args = ( 
+		TICKET => undef,
+		TARGET => undef,
+		TYPE => undef,
+		 @_);
+
+
+    $self->Limit( FIELD => 'LinkedTo',
+		  BASE => undef,
+		  TARGET => ($args{'TARGET'} || $args{'TICKET'}),
+		  TYPE => $args{'TYPE'},
+		  DESCRIPTION => "Tickets ".$args{'TYPE'}." by ".($args{'TARGET'} || $args{'TICKET'})
+		);
+}
+
+
+# }}}
+
+# {{{ LimitLinkedFrom
+
+=head2 LimitLinkedFrom
+
+LimitLinkedFrom takes a paramhash with two fields: TYPE and BASE
+TYPE limits the sort of relationship we want to search on
+
+
+BASE is the id or URI of the BASE of the link
+(BASE used to be 'TICKET'.  'TICKET' is deprecated, but will be treated as BASE
+
+
+=cut
+
+sub LimitLinkedFrom {
+    my $self = shift;
+    my %args = ( BASE => undef,
+		 TICKET => undef,
+		 TYPE => undef,
+		 @_);
+
+    
+    $self->Limit( FIELD => 'LinkedTo',
+		  TARGET => undef,
+		  BASE => ($args{'BASE'} || $args{'TICKET'}),
+		  TYPE => $args{'TYPE'},
+		  DESCRIPTION => "Tickets " .($args{'BASE'} || $args{'TICKET'}) ." ".$args{'TYPE'}
+		);
+}
+
+
+# }}}
+
+# {{{ LimitMemberOf 
+sub LimitMemberOf {
+    my $self = shift;
+    my $ticket_id = shift;
+    $self->LimitLinkedTo ( TARGET=> "$ticket_id",
+			   TYPE => 'MemberOf',
+			  );
+    
+}
+# }}}
+
+# {{{ LimitHasMember
+sub LimitHasMember {
+    my $self = shift;
+    my $ticket_id =shift;
+    $self->LimitLinkedFrom ( BASE => "$ticket_id",
+			     TYPE => 'MemberOf',
+			     );
+    
+}
+# }}}
+
+# {{{ LimitDependsOn
+
+sub LimitDependsOn {
+    my $self = shift;
+    my $ticket_id = shift;
+    $self->LimitLinkedTo ( TARGET => "$ticket_id",
+                           TYPE => 'DependsOn',
+			   );
+    
+}
+
+# }}}
+
+# {{{ LimitDependedOnBy
+
+sub LimitDependedOnBy {
+    my $self = shift;
+    my $ticket_id = shift;
+    $self->LimitLinkedFrom (  BASE => "$ticket_id",
+                               TYPE => 'DependsOn',
+			     );
+    
+}
+
+# }}}
+
+
+# {{{ LimitRefersTo
+
+sub LimitRefersTo {
+    my $self = shift;
+    my $ticket_id = shift;
+    $self->LimitLinkedTo ( TARGET => "$ticket_id",
+                           TYPE => 'RefersTo',
+			   );
+    
+}
+
+# }}}
+
+# {{{ LimitReferredToBy
+
+sub LimitReferredToBy {
+    my $self = shift;
+    my $ticket_id = shift;
+    $self->LimitLinkedFrom (  BASE=> "$ticket_id",
+                               TYPE => 'RefersTo',
+			     );
+    
+}
+
+# }}}
+
+# }}}
+
+# {{{ limit based on ticket date attribtes
+
+# {{{ sub LimitDate
+
+=head2 LimitDate (FIELD => 'DateField', OPERATOR => $oper, VALUE => $ISODate)
+
+Takes a paramhash with the fields FIELD OPERATOR and VALUE.
+
+OPERATOR is one of > or < 
+VALUE is a date and time in ISO format in GMT
+FIELD is one of Starts, Started, Told, Created, Resolved, LastUpdated
+
+There are also helper functions of the form LimitFIELD that eliminate
+the need to pass in a FIELD argument.
+
+=cut
+
+sub LimitDate {
+    my $self = shift;
+    my %args = (
+                  FIELD => undef,
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+
+                  @_);
+
+    #Set the description if we didn't get handed it above
+    unless ($args{'DESCRIPTION'} ) {
+	$args{'DESCRIPTION'} = $args{'FIELD'} . " " .$args{'OPERATOR'}. " ". $args{'VALUE'} . " GMT"
+    }
+
+    $self->Limit (%args);
+
+}
+
+# }}}
+
+
+
+
+sub LimitCreated {
+    my $self = shift;
+    $self->LimitDate( FIELD => 'Created', @_);
+}
+sub LimitDue {
+    my $self = shift;
+    $self->LimitDate( FIELD => 'Due', @_);
+
+}
+sub LimitStarts {
+    my $self = shift;
+    $self->LimitDate( FIELD => 'Starts', @_);
+
+}
+sub LimitStarted {
+    my $self = shift;
+    $self->LimitDate( FIELD => 'Started', @_);
+}
+sub LimitResolved { 
+    my $self = shift;
+    $self->LimitDate( FIELD => 'Resolved', @_);
+}
+sub LimitTold {
+    my $self = shift;
+    $self->LimitDate( FIELD => 'Told', @_);
+}
+sub LimitLastUpdated {
+    my $self = shift;
+    $self->LimitDate( FIELD => 'LastUpdated', @_);
+}
+#
+# {{{ sub LimitTransactionDate
+
+=head2 LimitTransactionDate (OPERATOR => $oper, VALUE => $ISODate)
+
+Takes a paramhash with the fields FIELD OPERATOR and VALUE.
+
+OPERATOR is one of > or < 
+VALUE is a date and time in ISO format in GMT
+
+
+=cut
+
+sub LimitTransactionDate {
+    my $self = shift;
+    my %args = (
+                  FIELD => 'TransactionDate',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+
+                  @_);
+
+    #Set the description if we didn't get handed it above
+    unless ($args{'DESCRIPTION'} ) {
+	$args{'DESCRIPTION'} = $args{'FIELD'} . " " .$args{'OPERATOR'}. " ". $args{'VALUE'} . " GMT"
+    }
+
+    $self->Limit (%args);
+
+}
+
+# }}}
+
+# }}}
+
+# {{{ sub LimitKeyword
+
+=head2 LimitKeyword 
+
+Takes a paramhash of key/value pairs with the following keys:
+
+=over 4
+
+=item KEYWORDSELECT - KeywordSelect id
+
+=item OPERATOR - (for KEYWORD only - KEYWORDSELECT operator is always `=')
+
+=item KEYWORD - Keyword id
+
+=back
+
+=cut
+
+sub LimitKeyword {
+    my $self = shift;
+    my %args = ( KEYWORD => undef,
+                 KEYWORDSELECT => undef,
+		 OPERATOR => '=',
+		 DESCRIPTION => undef,
+		 FIELD => 'Keyword',
+		 QUOTEVALUE => 1,
+		 @_
+	       );
+
+    use RT::KeywordSelect;
+    my $KeywordSelect = RT::KeywordSelect->new($self->CurrentUser);
+    $KeywordSelect->Load($args{KEYWORDSELECT});
+    
+
+    # Below, We're checking to see whether the keyword we're searching for
+    # is null or not.
+    # This could probably be rewritten to be easier to read and  understand
+
+    
+    #If we are looking to compare with a null value.
+    if ($args{'OPERATOR'} =~ /is/i)  {
+	if ($args{'OPERATOR'} =~ /^is$/i) {
+	    $args{'DESCRIPTION'} ||= "Keyword Selection ". $KeywordSelect->Name . " has no value";
+	}
+	elsif ($args{'OPERATOR'} =~ /^is not$/i) {
+	    $args{'DESCRIPTION'} ||= "Keyword Selection ". $KeywordSelect->Name . " has a value";
+	}
+    }
+	# if we're not looking to compare with a null value
+    else { 	
+        use RT::Keyword;
+	my $Keyword = RT::Keyword->new($self->CurrentUser);
+	$Keyword->Load($args{KEYWORD});
+	$args{'DESCRIPTION'} ||= "Keyword Selection " . $KeywordSelect->Name.  " $args{OPERATOR} ". $Keyword->Name;
+    }
+    
+    $args{SingleValued} = $KeywordSelect->Single();
+ 
+    
+    my $index = $self->_NextIndex;
+    %{$self->{'TicketRestrictions'}{$index}} = %args;
+    
+    $self->{'RecalcTicketLimits'} = 1;
+    return ($index);
+}
+
+# }}}
+
+# {{{ sub _NextIndex
+
+=head2 _NextIndex
+
+Keep track of the counter for the array of restrictions
+
+=cut
+
+sub _NextIndex {
+    my $self = shift;
+    return ($self->{'restriction_index'}++);
+}
+# }}}
+
+# }}} 
+
+# {{{ Core bits to make this a DBIx::SearchBuilder object
+
+# {{{ sub _Init 
+sub _Init  {
+    my $self = shift;
+    $self->{'table'} = "Tickets";
+    $self->{'RecalcTicketLimits'} = 1;
+    $self->{'looking_at_effective_id'} = 0;
+    $self->{'restriction_index'} =1;
+    $self->{'primary_key'} = "id";
+    $self->SUPER::_Init(@_);
+
+}
+# }}}
+
+# {{{ sub NewItem 
+sub NewItem  {
+  my $self = shift;
+  return(RT::Ticket->new($self->CurrentUser));
+
+}
+# }}}
+
+# {{{ sub Count
+sub Count {
+  my $self = shift;
+  $self->_ProcessRestrictions if ($self->{'RecalcTicketLimits'} == 1 );
+  return($self->SUPER::Count());
+}
+# }}}
+
+# {{{ sub ItemsArrayRef
+
+=head2 ItemsArrayRef
+
+Returns a reference to the set of all items found in this search
+
+=cut
+
+sub ItemsArrayRef {
+    my $self = shift;
+    my @items;
+    
+    my $placeholder = $self->_ItemsCounter;
+    $self->GotoFirstItem();
+    while (my $item = $self->Next) { 
+	push (@items, $item);
+    }
+    
+    $self->GotoItem($placeholder);
+    return(\@items);
+}
+# }}}
+
+# {{{ sub Next 
+sub Next {
+	my $self = shift;
+ 	
+	$self->_ProcessRestrictions if ($self->{'RecalcTicketLimits'} == 1 );
+
+	my $Ticket = $self->SUPER::Next();
+	if ((defined($Ticket)) and (ref($Ticket))) {
+
+    	    #Make sure we _never_ show dead tickets
+	    #TODO we should be doing this in the where clause.
+	    #but you can't do multiple clauses on the same field just yet :/
+
+	    if ($Ticket->Status eq 'dead') {
+		return($self->Next());
+	    }
+  	    elsif ($Ticket->CurrentUserHasRight('ShowTicket')) {
+		return($Ticket);
+	    }
+
+	    #If the user doesn't have the right to show this ticket
+	    else {	
+		return($self->Next());
+	    }
+	}
+	#if there never was any ticket
+	else {
+		return(undef);
+	}	
+
+}
+# }}}
+
+# }}}
+
+# {{{ Deal with storing and restoring restrictions
+
+# {{{ sub LoadRestrictions
+
+=head2 LoadRestrictions
+
+LoadRestrictions takes a string which can fully populate the TicketRestrictons hash.
+TODO It is not yet implemented
+
+=cut
+
+# }}}
+
+# {{{ sub DescribeRestrictions
+
+=head2 DescribeRestrictions
+
+takes nothing.
+Returns a hash keyed by restriction id. 
+Each element of the hash is currently a one element hash that contains DESCRIPTION which
+is a description of the purpose of that TicketRestriction
+
+=cut
+
+sub DescribeRestrictions  {
+    my $self = shift;
+    
+    my ($row, %listing);
+    
+    foreach $row (keys %{$self->{'TicketRestrictions'}}) {
+	$listing{$row} = $self->{'TicketRestrictions'}{$row}{'DESCRIPTION'};
+    }
+    return (%listing);
+}
+# }}}
+
+# {{{ sub RestrictionValues
+
+=head2 RestrictionValues FIELD
+
+Takes a restriction field and returns a list of values this field is restricted
+to.
+
+=cut
+
+sub RestrictionValues {
+    my $self = shift;
+    my $field = shift;
+    map $self->{'TicketRestrictions'}{$_}{'VALUE'},
+      grep {
+             $self->{'TicketRestrictions'}{$_}{'FIELD'} eq $field
+             && $self->{'TicketRestrictions'}{$_}{'OPERATOR'} eq "="
+           }
+        keys %{$self->{'TicketRestrictions'}};
+}
+
+# }}}
+
+# {{{ sub ClearRestrictions
+
+=head2 ClearRestrictions
+
+Removes all restrictions irretrievably
+
+=cut
+  
+sub ClearRestrictions {
+    my $self = shift;
+    delete $self->{'TicketRestrictions'};
+    $self->{'looking_at_effective_id'} = 0;
+    $self->{'RecalcTicketLimits'} =1;
+}
+
+# }}}
+
+# {{{ sub DeleteRestriction
+
+=head2 DeleteRestriction
+
+Takes the row Id of a restriction (From DescribeRestrictions' output, for example.
+Removes that restriction from the session's limits.
+
+=cut
+
+
+sub DeleteRestriction {
+    my $self = shift;
+    my $row = shift;
+    delete $self->{'TicketRestrictions'}{$row};
+    
+    $self->{'RecalcTicketLimits'} = 1;
+    #make the underlying easysearch object forget all its preconceptions
+}
+
+# }}}
+
+# {{{ sub _ProcessRestrictions 
+
+sub _ProcessRestrictions {
+    my $self = shift;
+
+    #Need to clean the EasySearch slate because it makes things too sticky
+    $self->CleanSlate();
+
+    #Blow away ticket aliases since we'll need to regenerate them for a new search
+    delete $self->{'TicketAliases'};
+    delete $self->{KeywordsAliases};
+
+    my $row;
+    
+    foreach $row (keys %{$self->{'TicketRestrictions'}}) {
+        my $restriction = $self->{'TicketRestrictions'}{$row};
+	# {{{ if it's an int
+	
+	if ($TYPES{$restriction->{'FIELD'}} eq 'INT' ) {
+	    if ($restriction->{'OPERATOR'} =~ /^(=|!=|>|<|>=|<=)$/) {
+		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
+			      ENTRYAGGREGATOR => 'AND',
+			      OPERATOR => $restriction->{'OPERATOR'},
+			      VALUE => $restriction->{'VALUE'},
+			      );
+	    }
+	}
+	# }}}
+	# {{{ if it's an enum
+	elsif ($TYPES{$restriction->{'FIELD'}} eq 'ENUM') {
+	    
+	    if ($restriction->{'OPERATOR'} eq '=') {
+		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
+			      ENTRYAGGREGATOR => 'OR',
+			      OPERATOR => '=',
+			      VALUE => $restriction->{'VALUE'},
+			    );
+	    }
+	    elsif ($restriction->{'OPERATOR'} eq '!=') {
+		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
+			      ENTRYAGGREGATOR => 'AND',
+			      OPERATOR => '!=',
+			      VALUE => $restriction->{'VALUE'},
+			    );
+	    }
+	    
+	}
+	# }}}
+	# {{{ if it's a date
+
+	elsif ($TYPES{$restriction->{'FIELD'}} eq 'DATE') {
+	    $self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
+				 ENTRYAGGREGATOR => 'AND',
+				 OPERATOR => $restriction->{'OPERATOR'},
+				 VALUE => $restriction->{'VALUE'},
+			       );
+	}
+	# }}}
+ 	# {{{ if it's a string
+
+	elsif ($TYPES{$restriction->{'FIELD'}} eq 'STRING') {
+	    
+	    if ($restriction->{'OPERATOR'} eq '=') {
+		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
+			      ENTRYAGGREGATOR => 'OR',
+			      OPERATOR => '=',
+			      VALUE => $restriction->{'VALUE'},
+			      CASESENSITIVE => 0
+			    );
+	    }
+	    elsif ($restriction->{'OPERATOR'} eq '!=') {
+		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
+			      ENTRYAGGREGATOR => 'AND',
+			      OPERATOR => '!=',
+			      VALUE => $restriction->{'VALUE'},
+			      CASESENSITIVE => 0
+			    );
+	    }
+	    elsif ($restriction->{'OPERATOR'} eq 'LIKE') {
+		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
+			      ENTRYAGGREGATOR => 'AND',
+			      OPERATOR => 'LIKE',
+			      VALUE => $restriction->{'VALUE'},
+			      CASESENSITIVE => 0
+			    );
+	    }
+	    elsif ($restriction->{'OPERATOR'} eq 'NOT LIKE') {
+		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
+			      ENTRYAGGREGATOR => 'AND',
+			      OPERATOR => 'NOT LIKE',
+			      VALUE => $restriction->{'VALUE'},
+			      CASESENSITIVE => 0
+			    );
+	    }
+	}
+
+	# }}}
+	# {{{ if it's Transaction content that we're hunting for
+	elsif ($TYPES{$restriction->{'FIELD'}} eq 'TRANSFIELD') {
+
+	    #Basically, we want to make sure that the limits apply to the same attachment,
+	    #rather than just another attachment for the same ticket, no matter how many 
+	    #clauses we lump on. 
+	    #We put them in TicketAliases so that they get nuked when we redo the join.
+	    
+	    unless (defined $self->{'TicketAliases'}{'TransFieldAlias'}) {
+		$self->{'TicketAliases'}{'TransFieldAlias'} = $self->NewAlias ('Transactions');
+	    }
+	    unless (defined $self->{'TicketAliases'}{'TransFieldAttachAlias'}){
+		$self->{'TicketAliases'}{'TransFieldAttachAlias'} = $self->NewAlias('Attachments');
+		
+	    }
+	    #Join transactions to attachments
+	    $self->Join( ALIAS1 => $self->{'TicketAliases'}{'TransFieldAttachAlias'},  
+			 FIELD1 => 'TransactionId',
+			 ALIAS2 => $self->{'TicketAliases'}{'TransFieldAlias'}, FIELD2=> 'id');
+	    
+	    #Join transactions to tickets
+	    $self->Join( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
+			 ALIAS2 =>$self->{'TicketAliases'}{'TransFieldAlias'}, FIELD2 => 'Ticket');
+	    
+	    #Search for the right field
+	    $self->SUPER::Limit(ALIAS => $self->{'TicketAliases'}{'TransFieldAttachAlias'},
+				  ENTRYAGGREGATOR => 'AND',
+				  FIELD =>    $restriction->{'FIELD'},
+				  OPERATOR => $restriction->{'OPERATOR'} ,
+				  VALUE =>    $restriction->{'VALUE'},
+			      	  CASESENSITIVE => 0
+ 				);
+	    
+
+	}
+
+	# }}}
+	# {{{ if it's a Transaction date that we're hunting for
+	elsif ($TYPES{$restriction->{'FIELD'}} eq 'TRANSDATE') {
+
+	    #Basically, we want to make sure that the limits apply to the same attachment,
+	    #rather than just another attachment for the same ticket, no matter how many 
+	    #clauses we lump on. 
+	    #We put them in TicketAliases so that they get nuked when we redo the join.
+	    
+	    unless (defined $self->{'TicketAliases'}{'TransFieldAlias'}) {
+		$self->{'TicketAliases'}{'TransFieldAlias'} = $self->NewAlias ('Transactions');
+	    }
+
+	    #Join transactions to tickets
+	    $self->Join( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
+			 ALIAS2 =>$self->{'TicketAliases'}{'TransFieldAlias'}, FIELD2 => 'Ticket');
+	    
+	    #Search for the right field
+	    $self->SUPER::Limit(ALIAS => $self->{'TicketAliases'}{'TransFieldAlias'},
+				ENTRYAGGREGATOR => 'AND',
+				FIELD =>    'Created',
+				OPERATOR => $restriction->{'OPERATOR'} ,
+				VALUE =>    $restriction->{'VALUE'} );
+	}
+
+	# }}}
+	# {{{ if it's a relationship that we're hunting for
+	
+	# Takes FIELD: which is something like "LinkedTo"
+	# takes TARGET or BASE which is the TARGET or BASE id that we're searching for
+	# takes TYPE which is the type of link we're looking for.
+
+	elsif ($TYPES{$restriction->{'FIELD'}} eq 'LINKFIELD') {
+
+	    
+	    my $LinkAlias = $self->NewAlias ('Links');
+
+	    
+	    #Make sure we get the right type of link, if we're restricting it
+	    if ($restriction->{'TYPE'}) {
+		$self->SUPER::Limit(ALIAS => $LinkAlias,
+				    ENTRYAGGREGATOR => 'AND',
+				    FIELD =>   'Type',
+				    OPERATOR => '=',
+				    VALUE =>    $restriction->{'TYPE'} );
+	    }
+	    
+	    #If we're trying to limit it to things that are target of
+	    if ($restriction->{'TARGET'}) {
+		
+
+		# If the TARGET is an integer that means that we want to look at the LocalTarget
+		# field. otherwise, we want to look at the "Target" field
+
+		my ($matchfield);
+		if ($restriction->{'TARGET'} =~/^(\d+)$/) {
+		    $matchfield = "LocalTarget";
+		}	
+		else {
+		    $matchfield = "Target";
+		}	
+
+		$self->SUPER::Limit(ALIAS => $LinkAlias,
+				    ENTRYAGGREGATOR => 'AND',
+				    FIELD =>   $matchfield,
+				    OPERATOR => '=',
+				    VALUE =>    $restriction->{'TARGET'} );
+
+		
+		#If we're searching on target, join the base to ticket.id
+		$self->Join( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
+			     ALIAS2 => $LinkAlias,
+			     FIELD2 => 'LocalBase');
+
+	    
+
+
+	    }
+	    #If we're trying to limit it to things that are base of
+	    elsif ($restriction->{'BASE'}) {
+
+
+		# If we're trying to match a numeric link, we want to look at LocalBase,
+		# otherwise we want to look at "Base"
+
+		my ($matchfield);
+		if ($restriction->{'BASE'} =~/^(\d+)$/) {
+		    $matchfield = "LocalBase";
+		}	
+		else {
+		    $matchfield = "Base";
+		}	
+
+
+		$self->SUPER::Limit(ALIAS => $LinkAlias,
+				    ENTRYAGGREGATOR => 'AND',
+				    FIELD => $matchfield,
+				    OPERATOR => '=',
+				    VALUE =>    $restriction->{'BASE'} );
+		
+		#If we're searching on base, join the target to ticket.id
+		$self->Join( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
+			     ALIAS2 => $LinkAlias,
+			     FIELD2 => 'LocalTarget');
+		
+	    }
+
+	}
+		
+	# }}}
+	# {{{ if it's a watcher that we're hunting for
+	elsif ($TYPES{$restriction->{'FIELD'}} eq 'WATCHERFIELD') {
+
+	    my $Watch = $self->NewAlias('Watchers');
+
+	    #Join watchers to users
+	    my $User = $self->Join( TYPE => 'left',
+				     ALIAS1 => $Watch, 
+				     FIELD1 => 'Owner',
+				     TABLE2 => 'Users', 
+				     FIELD2 => 'id',
+				   );
+
+	    #Join Ticket to watchers
+	    $self->Join( ALIAS1 => 'main', FIELD1 => 'id',
+			 ALIAS2 => $Watch, FIELD2 => 'Value');
+
+
+	    #Make sure we're only talking about ticket watchers
+	    $self->SUPER::Limit( ALIAS => $Watch,
+				 FIELD => 'Scope',
+				 VALUE => 'Ticket',
+				 OPERATOR => '=');
+
+
+	    # Find email address watchers
+	    $self->SUPER::Limit( SUBCLAUSE => 'WatcherEmailAddress',
+				 ALIAS => $Watch,
+				 FIELD => 'Email',
+				 ENTRYAGGREGATOR => 'OR',
+				 VALUE => $restriction->{'VALUE'},
+				 OPERATOR => $restriction->{'OPERATOR'},
+			         CASESENSITIVE => 0
+			);
+
+
+
+	    #Find user watchers
+	    $self->SUPER::Limit(
+				SUBCLAUSE => 'WatcherEmailAddress',
+				ALIAS => $User,
+				FIELD => 'EmailAddress',
+				ENTRYAGGREGATOR => 'OR',
+				VALUE => $restriction->{'VALUE'},
+				OPERATOR => $restriction->{'OPERATOR'},
+			        CASESENSITIVE => 0
+			       );
+
+	    
+	    #If we only want a specific type of watchers, then limit it to that
+	    if ($restriction->{'TYPE'}) {
+		$self->SUPER::Limit( ALIAS => $Watch,
+				     FIELD => 'Type',
+				     ENTRYAGGREGATOR => 'OR',
+				     VALUE => $restriction->{'TYPE'},
+				     OPERATOR => '=');
+	    }
+	}
+
+	# }}}
+	# {{{ if it's a keyword
+	elsif ($TYPES{$restriction->{'FIELD'}} eq 'KEYWORDFIELD') {
+ 
+	    my $null_columns_ok;
+
+            my $ObjKeywordsAlias;
+	    $ObjKeywordsAlias = $self->{KeywordsAliases}{$restriction->{'KEYWORDSELECT'}}
+	      if $restriction->{SingleValued};
+	    unless (defined $ObjKeywordsAlias) {
+	      $ObjKeywordsAlias = $self->Join(
+					       TYPE => 'left',
+					       ALIAS1 => 'main',
+					       FIELD1 => 'id',
+					       TABLE2 => 'ObjectKeywords',
+					       FIELD2 => 'ObjectId'
+					      );
+	      if ($restriction->{'SingleValued'}) {
+		$self->{KeywordsAliases}{$restriction->{'KEYWORDSELECT'}} 
+		  = $ObjKeywordsAlias;
+	      }
+	    }
+
+	  
+            $self->SUPER::Limit(
+				ALIAS => $ObjKeywordsAlias,
+				FIELD => 'Keyword',
+				OPERATOR => $restriction->{'OPERATOR'},
+				VALUE => $restriction->{'KEYWORD'},
+				QUOTEVALUE => $restriction->{'QUOTEVALUE'},
+				ENTRYAGGREGATOR => 'OR',
+                               );
+	    
+            if  ( ($restriction->{'OPERATOR'} =~ /^IS$/i) or 
+	          ($restriction->{'OPERATOR'} eq '!=') ) {
+		
+		$null_columns_ok=1;
+
+	    } 
+
+	    #If we're trying to find tickets where the keyword isn't somethng, also check ones where it _IS_ null
+	    if ( $restriction->{'OPERATOR'} eq '!=') {
+	        $self->SUPER::Limit(
+				    ALIAS => $ObjKeywordsAlias,
+				    FIELD => 'Keyword',
+				    OPERATOR => 'IS',
+				    VALUE => 'NULL',
+				    QUOTEVALUE => 0,
+				    ENTRYAGGREGATOR => 'OR',
+				   );
+	      }
+
+
+            $self->SUPER::Limit(LEFTJOIN => $ObjKeywordsAlias,
+				FIELD => 'KeywordSelect',
+				VALUE => $restriction->{'KEYWORDSELECT'},
+				ENTRYAGGREGATOR => 'OR');
+
+
+ 
+            $self->SUPER::Limit( ALIAS => $ObjKeywordsAlias,
+                                 FIELD => 'ObjectType',
+                                 VALUE => 'Ticket',
+                                 ENTRYAGGREGATOR => 'AND');
+	    
+	    if ($null_columns_ok) {
+	         $self->SUPER::Limit(ALIAS => $ObjKeywordsAlias,
+                                    FIELD => 'ObjectType',
+	   	  		    OPERATOR => 'IS',
+                                    VALUE => 'NULL',
+				    QUOTEVALUE => 0,
+                                    ENTRYAGGREGATOR => 'OR');
+	    }
+	   
+        }
+        # }}}
+
+    
+     }
+
+     
+     # here, we make sure we don't get any tickets that have been merged  into other tickets
+     # (Ticket Id == Ticket EffectiveId
+     # note that we _really_ don't want to do this if we're already looking at the effectiveid
+     if ($self->_isLimited && (! $self->{'looking_at_effective_id'})) {
+        $self->SUPER::Limit( FIELD => 'EffectiveId', 
+              OPERATOR => '=',
+              QUOTEVALUE => 0,
+              VALUE => 'main.id');   #TODO, we shouldn't be hard coding the tablename to main.
+      } 
+    $self->{'RecalcTicketLimits'} = 0;
+}
+
+# }}}
+
+# }}}
+
+# {{{ Deal with displaying rows of the listing 
+
+#
+#  Everything in this section is stub code for 2.2
+# It's not part of the API. It's not for your use
+# It's not for our use.
+#
+
+
+# {{{ sub SetListingFormat
+
+=head2 SetListingFormat
+
+Takes a single Format string as specified below. parses that format string and makes the various listing output
+things DTRT.
+
+=item Format strings
+
+Format strings are made up of a chain of Elements delimited with vertical pipes (|).
+Elements of a Format string 
+
+
+FormatString:    Element[::FormatString]
+
+Element:         AttributeName[;HREF=<URL>][;TITLE=<TITLE>]
+
+AttributeName    Id | Subject | Status | Owner | Priority | InitialPriority | TimeWorked | TimeLeft |
+  
+                 Keywords[;SELECT=<KeywordSelect>] | 
+	
+                <Created|Starts|Started|Contacted|Due|Resolved>Date<AsString|AsISO|AsAge>
+
+
+=cut
+
+
+
+
+#accept a format string
+
+
+
+sub SetListingFormat {
+    my $self = shift;
+    my $listing_format = shift;
+    
+    my ($element, $attribs);
+    my $i = 0;
+    foreach $element (split (/::/,$listing_format)) {
+	if ($element =~ /^(.*?);(.*)$/) {
+	    $element = $1;
+	    $attribs = $2;
+	}	
+	$self->{'format_string'}->[$i]->{'Element'} = $element;
+	foreach $attrib (split (/;/, $attribs)) {
+	    my $value = "";
+	    if ($attrib =~ /^(.*?)=(.*)$/) {
+		$attrib = $1;
+		$value = $2;
+	    }	
+	    $self->{'format_string'}->[$i]->{"$attrib"} = $val;
+	    
+	}
+    
+    }
+    return(1);
+}
+
+# }}}
+
+# {{{ sub HeaderAsHTML
+sub HeaderAsHTML {
+    my $self = shift;
+    my $header = "";
+    my $col;
+    foreach $col ( @{[ $self->{'format_string'} ]}) {
+	$header .= "<TH>" . $self->_ColumnTitle($self->{'format_string'}->[$col]) . "</TH>";
+	
+    }
+    return ($header);
+}
+# }}}
+
+# {{{ sub HeaderAsText
+#Print text header
+sub HeaderAsText {
+    my $self = shift;
+    my ($header);
+    
+    return ($header);
+}
+# }}}
+
+# {{{ sub TicketAsHTMLRow
+#Print HTML row
+sub TicketAsHTMLRow {
+    my $self = shift;
+    my $Ticket = shift;
+    my ($row, $col);
+    foreach $col (@{[$self->{'format_string'}]}) {
+	$row .= "<TD>" . $self->_TicketColumnValue($ticket,$self->{'format_string'}->[$col]) . "</TD>";
+	
+    }
+    return ($row);
+}
+# }}}
+
+# {{{ sub TicketAsTextRow
+#Print text row
+sub TicketAsTextRow {
+    my $self = shift;
+    my ($row);
+
+    #TODO implement
+    
+    return ($row);
+}
+# }}}
+
+# {{{ _ColumnTitle {
+
+sub _ColumnTitle {
+    my $self = shift;
+    
+    # Attrib is a hash 
+    my $attrib = shift;
+    
+    # return either attrib->{'TITLE'} or..
+    if ($attrib->{'TITLE'}) {
+	return($attrib->{'TITLE'});
+    }	
+    # failing that, Look up the title in a hash
+    else {
+	#TODO create $self->{'ColumnTitles'};
+	return ($self->{'ColumnTitles'}->{$attrib->{'Element'}});
+    }	
+    
+}
+
+# }}}
+
+# {{{ _TicketColumnValue
+sub _TicketColumnValue {
+    my $self = shift;
+    my $Ticket = shift;
+    my $attrib = shift;
+
+    
+    my $out;
+
+  SWITCH: {
+	/^id/i && do {
+	    $out = $Ticket->id;
+	    last SWITCH; 
+	};
+	/^subj/i && do {
+	    last SWITCH; 
+	    $Ticket->Subject;
+		   };	
+	/^status/i && do {
+	    last SWITCH; 
+	    $Ticket->Status;
+	};
+	/^prio/i && do {
+	    last SWITCH; 
+	    $Ticket->Priority;
+	};
+	/^finalprio/i && do {
+	    
+	    last SWITCH; 
+	    $Ticket->FinalPriority
+	};
+	/^initialprio/i && do {
+	    
+	    last SWITCH; 
+	    $Ticket->InitialPriority;
+	};	
+	/^timel/i && do {
+	    
+	    last SWITCH; 
+	    $Ticket->TimeWorked;
+	};
+	/^timew/i && do {
+	    
+	    last SWITCH; 
+	    $Ticket->TimeLeft;
+	};
+	
+	/^(.*?)date(.*)$/i && do {
+	    my $o = $1;
+	    my $m = $2;
+	    my ($obj);
+	    #TODO: optimize
+	    $obj = $Ticket->DueObj         if $o =~ /due/i;
+	    $obj = $Ticket->CreatedObj     if $o =~ /created/i;
+	    $obj = $Ticket->StartsObj      if $o =~ /starts/i;
+	    $obj = $Ticket->StartedObj     if $o =~ /started/i;
+	    $obj = $Ticket->ToldObj        if $o =~ /told/i;
+	    $obj = $Ticket->LastUpdatedObj if $o =~ /lastu/i;
+	    
+	    $method = 'ISO' if $m =~ /iso/i;
+	    
+	    $method = 'AsString' if $m =~ /asstring/i;
+	    $method = 'AgeAsString' if $m =~ /age/i;
+	    last SWITCH;
+	    $obj->$method();
+	      
+	};
+	  
+	  /^watcher/i && do {
+	      last SWITCH; 
+	      $Ticket->WatchersAsString();
+	  };	
+	
+	/^requestor/i && do {
+	    last SWITCH; 
+	    $Ticket->RequestorsAsString();
+	};	
+	/^cc/i && do {
+	    last SWITCH; 
+	    $Ticket->CCAsString();
+	};	
+	
+	
+	/^admincc/i && do {
+	    last SWITCH; 
+	    $Ticket->AdminCcAsString();
+	};
+	
+	/^keywords/i && do {
+	    last SWITCH; 
+	    #Limit it to the keyword select we're talking about, if we've got one.
+	    my $objkeys =$Ticket->KeywordsObj($attrib->{'SELECT'});
+	    $objkeys->KeywordRelativePathsAsString();
+	};
+	
+    }
+      
+}
+
+# }}}
+
+# }}}
+
+# {{{ POD
+=head2 notes
+"Enum" Things that get Is, IsNot
+
+
+"Int" Things that get Is LessThan and GreaterThan
+id
+InitialPriority
+FinalPriority
+Priority
+TimeLeft
+TimeWorked
+
+"Text" Things that get Is, Like
+Subject
+TransactionContent
+
+
+"Link" OPERATORs
+
+
+"Date" OPERATORs Is, Before, After
+
+  =cut
+# }}}
+1;
diff --git a/rt/lib/RT/Transaction.pm b/rt/lib/RT/Transaction.pm
new file mode 100755
index 000000000..ee1f069b2
--- /dev/null
+++ b/rt/lib/RT/Transaction.pm
@@ -0,0 +1,783 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Transaction.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# Copyright 1999-2001 Jesse Vincent <jesse@fsck.com>
+# Released under the terms of the GNU Public License
+
+=head1 NAME
+
+  RT::Transaction - RT\'s transaction object
+
+=head1 SYNOPSIS
+
+  use RT::Transaction;
+
+
+=head1 DESCRIPTION
+
+
+Each RT::Transaction describes an atomic change to a ticket object 
+or an update to an RT::Ticket object.
+It can have arbitrary MIME attachments.
+
+
+=head1 METHODS
+
+=begin testing
+
+ok(require RT::TestHarness);
+ok(require RT::Transaction);
+
+=end testing
+
+=cut
+
+package RT::Transaction;
+
+use RT::Record;
+@ISA= qw(RT::Record);
+    
+use RT::Attachments;
+
+# {{{ sub _Init 
+sub _Init  {
+    my $self = shift;
+  $self->{'table'} = "Transactions";
+  return ($self->SUPER::_Init(@_));
+
+}
+# }}}
+
+# {{{ sub Create 
+
+=head2 Create
+
+Create a new transaction.
+
+This routine should _never_ be called anything other Than RT::Ticket. It should not be called 
+from client code. Ever. Not ever.  If you do this, we will hunt you down. and break your kneecaps.
+Then the unpleasant stuff will start.
+
+TODO: Document what gets passed to this
+
+=cut
+
+sub Create  {
+    my $self = shift;
+    my %args = ( id => undef,
+		 TimeTaken => 0,
+		 Ticket => 0 ,
+		 Type => 'undefined',
+		 Data => '',
+		 Field => undef,
+		 OldValue => undef,
+		 NewValue => undef,
+		 MIMEObj => undef,
+		 ActivateScrips => 1,
+		 @_
+	       );
+    
+    #if we didn't specify a ticket, we need to bail
+    unless ( $args{'Ticket'} ) {
+	return(0, "RT::Transaction->Create couldn't, as you didn't specify a ticket id");
+    }
+        
+    #lets create our transaction
+    my $id = $self->SUPER::Create(Ticket => $args{'Ticket'},
+	                          TimeTaken => $args{'TimeTaken'},
+				  Type => $args{'Type'},
+				  Data => $args{'Data'},
+				  Field => $args{'Field'},
+				  OldValue => $args{'OldValue'},
+				  NewValue => $args{'NewValue'},
+				  Created => $args{'Created'}
+				 );
+    $self->Load($id);
+    $self->_Attach($args{'MIMEObj'})
+      if defined $args{'MIMEObj'};
+    
+    #Provide a way to turn off scrips if we need to
+    if ($args{'ActivateScrips'}) {
+
+	#We're really going to need a non-acled ticket for the scrips to work
+	my $TicketAsSystem = RT::Ticket->new($RT::SystemUser);
+	$TicketAsSystem->Load($args{'Ticket'}) || 
+	  $RT::Logger->err("$self couldn't load ticket $args{'Ticket'}\n");
+	
+	my $TransAsSystem = RT::Transaction->new($RT::SystemUser);
+	$TransAsSystem->Load($self->id) ||
+	  $RT::Logger->err("$self couldn't load a copy of itself as superuser\n");
+	
+	# {{{ Deal with Scrips
+    
+    #Load a scripscopes object
+    use RT::Scrips;
+    my $PossibleScrips = RT::Scrips->new($RT::SystemUser);
+    
+    $PossibleScrips->LimitToQueue($TicketAsSystem->QueueObj->Id); #Limit it to  $Ticket->QueueObj->Id
+    $PossibleScrips->LimitToGlobal(); # or to "global"
+    my $ConditionsAlias = $PossibleScrips->NewAlias('ScripConditions');
+    
+    $PossibleScrips->Join(ALIAS1 => 'main',  FIELD1 => 'ScripCondition',
+			  ALIAS2 => $ConditionsAlias, FIELD2=> 'id');
+    
+    
+    #We only want things where the scrip applies to this sort of transaction
+    $PossibleScrips->Limit(ALIAS=> $ConditionsAlias,
+			   FIELD=>'ApplicableTransTypes',
+			   OPERATOR => 'LIKE',
+			   VALUE => $args{'Type'},
+			   ENTRYAGGREGATOR => 'OR',
+			  );
+    
+    # Or where the scrip applies to any transaction
+    $PossibleScrips->Limit(ALIAS=> $ConditionsAlias,
+			   FIELD=>'ApplicableTransTypes',
+			   OPERATOR => 'LIKE',
+			   VALUE => "Any",
+			   ENTRYAGGREGATOR => 'OR',
+			  );			    
+    
+    #Iterate through each script and check it's applicability.
+    
+    while (my $Scrip = $PossibleScrips->Next()) {
+      
+      #TODO: properly deal with errors raised in this scrip loop
+	
+      #$RT::Logger->debug("$self now dealing with ".$Scrip->Id. "\n");      
+	eval {
+	  local $SIG{__DIE__} = sub { $RT::Logger->error($_[0])};
+	  
+	  
+	  #Load the scrip's Condition object
+	  $Scrip->ConditionObj->LoadCondition(TicketObj => $TicketAsSystem, 
+					      TransactionObj => $TransAsSystem);	  
+	  
+	  
+	  #If it's applicable, prepare and commit it
+	  
+	$RT::Logger->debug ("$self: Checking condition ".$Scrip->ConditionObj->Name. "...\n");
+	  
+	  if ( $Scrip->IsApplicable() ) {
+	      
+		$RT::Logger->debug ("$self: Matches condition ".$Scrip->ConditionObj->Name. "...\n");
+	      #TODO: handle some errors here
+	      
+	      $Scrip->ActionObj->LoadAction(TicketObj => $TicketAsSystem, 
+					   TransactionObj => $TransAsSystem);
+	  
+	      
+	      if ($Scrip->Prepare()) {
+		  $RT::Logger->debug("$self: Prepared " .
+				   $Scrip->ActionObj->Name . "\n");
+		  if ($Scrip->Commit()) {
+			$RT::Logger->debug("$self: Committed " .
+					   $Scrip->ActionObj->Name . "\n");
+	     	  }
+		  else {
+			$RT::Logger->info("$self: Failed to commit ".
+					   $Scrip->ActionObj->Name . "\n");
+		  } 
+	      }
+	      else {
+		  $RT::Logger->info("$self: Failed to prepare " .
+				     $Scrip->ActionObj->Name . "\n");
+	      }
+
+	      #We're done with it. lets clean up.
+	      #TODO: something else isn't letting these get garbage collected. check em out.
+	      $Scrip->ActionObj->DESTROY();
+	      $Scrip->ConditionObj->DESTROY;
+	  }
+	  
+	  
+	else {
+	    $RT::Logger->debug ("$self: Doesn't match condition ".$Scrip->ConditionObj->Name. "...\n");
+
+	    # TODO: why doesn't this catch all the ScripObjs we create. 
+	    # and why do we explictly need to destroy them?
+	    $Scrip->ConditionObj->DESTROY;
+	}
+      }	
+    }
+
+    # }}}
+	
+    }
+
+    return ($id, "Transaction Created");
+}
+
+# }}}
+
+# {{{ sub Delete
+
+sub Delete {
+    my $self = shift;
+    return (0, 'Deleting this object could break referential integrity');
+}
+
+# }}}
+
+# {{{ Routines dealing with Attachments
+
+# {{{ sub Message 
+
+=head2 Message
+
+  Returns the RT::Attachments Object which contains the "top-level" object
+  attachment for this transaction
+
+=cut
+
+sub Message  {
+
+    my $self = shift;
+    
+    if (!defined ($self->{'message'}) ){
+	
+	$self->{'message'} = new RT::Attachments($self->CurrentUser);
+	$self->{'message'}->Limit(FIELD => 'TransactionId',
+				  VALUE => $self->Id);
+	
+	$self->{'message'}->ChildrenOf(0);
+    } 
+    return($self->{'message'});
+}
+# }}}
+
+# {{{ sub Content
+
+=head2 Content PARAMHASH
+
+If this transaction has attached mime objects, returns the first text/ part.
+Otherwise, returns undef.
+
+Takes a paramhash.  If the $args{'Quote'} parameter is set, wraps this message 
+at $args{'Wrap'}.  $args{'Wrap'} defaults to 70.
+
+
+=cut
+
+sub Content {
+    my $self = shift;
+    my %args = ( Quote => 0,
+		 Wrap => 70,
+		 @_ );
+
+    my $content = undef;
+
+    # If we don\'t have any content, return undef now.
+    unless ($self->Message->First) {
+	return (undef);
+    }	
+    
+    # Get the set of toplevel attachments to this transaction.
+    my $MIMEObj = $self->Message->First();
+    
+    # If it's a message or a plain part, just return the
+    # body. 
+    if ($MIMEObj->ContentType() =~ '^(text|message)(/|$)') {
+	$content = $MIMEObj->Content();
+    }
+    
+    # If it's a multipart object, first try returning the first 
+    # text/plain part. 
+    
+    elsif ($MIMEObj->ContentType() =~ '^multipart/') {
+	my $plain_parts = $MIMEObj->Children();
+	$plain_parts->ContentType(VALUE => 'text/plain');
+	
+	# If we actully found a part, return its content
+	if ($plain_parts->First && 
+        $plain_parts->First->Content ne '') {
+	    $content = $plain_parts->First->Content;		
+	}	
+	
+	# If that fails, return the  first text/ or message/ part 
+	# which has some content.
+    
+	else {
+	    my $all_parts = $MIMEObj->Children();
+	    while (($content == undef) && 
+		   (my $part = $all_parts->Next)) {
+		if (($part->ContentType() =~ '^(text|message)(/|$)') and
+		    ($part->Content())) {
+		    $content = $part->Content;
+		}	
+	    }
+	}	
+
+    }
+    # If all else fails, return a message that we couldn't find
+    # any content
+    else { 
+        $content = 'This transaction appears to have no content';
+    }	
+
+    if ($args{'Quote'}) {
+	# Remove quoted signature.
+	$content =~ s/\n-- \n(.*)$//s;
+
+	# What's the longest line like?
+	foreach (split (/\n/,$content)) {
+	    $max=length if ( length > $max);
+	}
+
+	if ($max>76) {
+	    require Text::Wrapper;
+	    my $wrapper=new Text::Wrapper
+		(
+		 columns => $args{'Wrap'}, 
+		 body_start => ($max > 70*3 ? '   ' : ''),
+		 par_start => ''
+		 );
+	    $content=$wrapper->wrap($content);
+	}
+
+	$content =~ s/^/> /gm;
+	$content = '[' . $self->CreatorObj->Name() . ' - ' . $self->CreatedAsString()
+	            . "]:\n\n"
+   	        . $content . "\n\n";
+
+    }
+
+    return ($content); 
+}
+# }}}
+
+# {{{ sub Subject
+
+=head2 Subject
+
+If this transaction has attached mime objects, returns the first one's subject
+Otherwise, returns null
+  
+=cut
+
+sub Subject {
+    my $self = shift;
+    if ($self->Message->First) {
+	return ($self->Message->First->Subject);
+    }
+    else {
+	return (undef);
+    }
+}
+# }}}
+
+# {{{ sub Attachments 
+
+=head2 Attachments
+
+  Returns all the RT::Attachment objects which are attached
+to this transaction. Takes an optional parameter, which is
+a ContentType that Attachments should be restricted to.
+
+=cut
+
+
+sub Attachments  {
+    my $self = shift;
+    my $Types = '';
+    $Types = shift if (@_);
+
+    my $Attachments = new RT::Attachments($self->CurrentUser);
+    
+    #If it's a comment, return an empty object if they don't have the right to see it
+    if ($self->Type eq 'Comment') {
+	unless ($self->CurrentUserHasRight('ShowTicketComments')) {
+	    return ($Attachments);
+	}
+    }	
+    #if they ain't got rights to see, return an empty object
+    else {
+	unless ($self->CurrentUserHasRight('ShowTicket')) {
+	    return ($Attachments);
+	}
+    }
+    
+    $Attachments->Limit(FIELD => 'TransactionId',
+			VALUE => $self->Id);
+
+    # Get the attachments in the order they're put into
+    # the database.  Arguably, we should be returning a tree
+    # of attachments, not a set...but no current app seems to need
+    # it. 
+
+    $Attachments->OrderBy(ALIAS => 'main', 
+			  FIELD => 'Id',
+			  ORDER => 'asc');
+
+    if ($Types) {
+	$Attachments->ContentType( VALUE => "$Types",
+				   OPERATOR => "LIKE");
+    }
+    
+    
+    return($Attachments);
+    
+}
+
+# }}}
+
+# {{{ sub _Attach 
+
+=head2 _Attach
+
+A private method used to attach a mime object to this transaction.
+
+=cut
+
+sub _Attach  {
+    my $self = shift;
+    my $MIMEObject = shift;
+    
+    if (!defined($MIMEObject)) {
+	$RT::Logger->error("$self _Attach: We can't attach a mime object if you don't give us one.\n");
+	return(0, "$self: no attachment specified");
+    }
+    
+  
+    use RT::Attachment;
+    my $Attachment = new RT::Attachment ($self->CurrentUser);
+    $Attachment->Create(TransactionId => $self->Id,
+			Attachment => $MIMEObject);
+    return ($Attachment, "Attachment created");
+    
+}
+
+# }}}
+
+# }}}
+
+# {{{ Routines dealing with Transaction Attributes
+
+# {{{ sub TicketObj
+
+=head2 TicketObj
+
+Returns this transaction's ticket object.
+
+=cut
+
+sub TicketObj {
+    my $self = shift;
+    if (! exists $self->{'TicketObj'}) {
+	$self->{'TicketObj'} = new RT::Ticket($self->CurrentUser);
+	$self->{'TicketObj'}->Load($self->Ticket);
+    }
+    
+    return $self->{'TicketObj'};
+}
+# }}}
+
+# {{{ sub Description 
+
+=head2 Description
+
+Returns a text string which describes this transaction
+
+=cut
+
+
+sub Description  {
+    my $self = shift;
+
+    #Check those ACLs
+    #If it's a comment, we need to be extra special careful
+    if ($self->__Value('Type') eq 'Comment') {
+     	unless ($self->CurrentUserHasRight('ShowTicketComments')) {
+	    return (0, "Permission Denied");
+	}
+    }	
+
+    #if they ain't got rights to see, don't let em
+    else {
+	unless ($self->CurrentUserHasRight('ShowTicket')) {
+	    return (0, "Permission Denied");
+	}
+    }
+
+    if (!defined($self->Type)) {
+	return("No transaction type specified");
+    }
+    
+    return ($self->BriefDescription . " by " . $self->CreatorObj->Name);
+}
+
+# }}}
+
+# {{{ sub BriefDescription 
+
+=head2 BriefDescription
+
+Returns a text string which briefly describes this transaction
+
+=cut
+
+
+sub BriefDescription  {
+    my $self = shift;
+
+    #Check those ACLs
+    #If it's a comment, we need to be extra special careful
+    if ($self->__Value('Type') eq 'Comment') {
+     	unless ($self->CurrentUserHasRight('ShowTicketComments')) {
+	    return (0, "Permission Denied");
+	}
+    }	
+
+    #if they ain't got rights to see, don't let em
+    else {
+	unless ($self->CurrentUserHasRight('ShowTicket')) {
+	    return (0, "Permission Denied");
+	}
+    }
+
+    if (!defined($self->Type)) {
+	return("No transaction type specified");
+    }
+    
+    if ($self->Type eq 'Create'){
+	return("Ticket created");
+    }
+    elsif ($self->Type =~ /Status/) {
+	if ($self->Field eq 'Status') {
+	    if ($self->NewValue eq 'dead') {
+		return ("Ticket killed");
+      }
+	    else {
+		return( "Status changed from ".  $self->OldValue . 
+			" to ". $self->NewValue);
+
+	    }
+	}
+	# Generic:
+	return ($self->Field." changed from ".($self->OldValue||"(empty value)").
+	  " to ".$self->NewValue );
+      }
+    
+    if ($self->Type eq 'Correspond')    {
+	return("Correspondence added");
+    }
+    
+    elsif ($self->Type eq 'Comment')  {
+	return( "Comments added");
+    }
+    
+    elsif ($self->Type eq 'Keyword') {
+
+	my $field = 'Keyword';
+
+	if ($self->Field) {
+	    my $keywordsel = new RT::KeywordSelect ($self->CurrentUser);
+	    $keywordsel->Load($self->Field);
+	    $field = $keywordsel->Name();
+	}
+
+	if ($self->OldValue eq '') {
+	    return ($field." ".$self->NewValue." added");
+	}
+	elsif ($self->NewValue eq '') {
+	    return ($field." ".$self->OldValue." deleted"); 
+	    
+	}
+	else {
+	    return ($field." ".$self->OldValue . " changed to ". 
+		     $self->NewValue);
+	}	
+    }
+    
+    elsif ($self->Type eq 'Untake'){
+	    return( "Untaken");
+	}
+    
+    elsif ($self->Type eq "Take") {
+	return( "Taken");
+    }
+    
+    elsif ($self->Type eq "Force") {
+        my $Old = RT::User->new($self->CurrentUser);
+        $Old->Load($self->OldValue);
+        my $New = RT::User->new($self->CurrentUser);
+        $New->Load($self->NewValue);
+	return "Owner forcibly changed from ".$Old->Name . " to ". $New->Name;
+    }
+    elsif ($self->Type eq "Steal") {
+	my $Old = RT::User->new($self->CurrentUser);
+	$Old->Load($self->OldValue);
+	return "Stolen from ".$Old->Name;
+    }
+    
+    elsif ($self->Type eq "Give") {
+	my $New = RT::User->new($self->CurrentUser);
+	$New->Load($self->NewValue);
+	return( "Given to ".$New->Name);
+    }
+    
+    elsif ($self->Type eq 'AddWatcher'){
+	return( $self->Field." ". $self->NewValue ." added");
+    }
+    
+    elsif ($self->Type eq 'DelWatcher'){
+	return( $self->Field." ".$self->OldValue ." deleted");
+    }
+    
+    elsif ($self->Type eq 'Subject') {
+	return( "Subject changed to ".$self->Data);
+    }
+    elsif ($self->Type eq 'Told') {
+	return( "User notified");
+    }
+    
+    elsif ($self->Type eq 'AddLink') {
+	return ($self->Data);
+    }
+    elsif ($self->Type eq 'DeleteLink') {
+	return ($self->Data);
+    }
+    elsif ($self->Type eq 'Set') {
+	if ($self->Field eq 'Queue') {
+	    my $q1 = new RT::Queue($self->CurrentUser);
+	    $q1->Load($self->OldValue);
+	    my $q2 = new RT::Queue($self->CurrentUser);
+	    $q2->Load($self->NewValue);
+	    return ($self->Field . " changed from " . $q1->Name . " to ".
+		    $q2->Name);
+	}
+
+        # Write the date/time change at local time:                    
+    elsif ($self->Field =~  /Due|Starts|Started|Told/) {           
+        my $t1 = new RT::Date($self->CurrentUser);                 
+        $t1->Set(Format => 'ISO', Value => $self->NewValue);       
+        my $t2 = new RT::Date($self->CurrentUser);                 
+        $t2->Set(Format => 'ISO', Value => $self->OldValue);       
+        return ($self->Field . " changed from " . $t2->AsString .  
+                    " to ".$t1->AsString);      
+    }                
+	else {
+	    return ($self->Field . " changed from " . $self->OldValue . 
+		    " to ".$self->NewValue);
+	}	
+    }
+    elsif ($self->Type eq 'PurgeTransaction') {
+	return ("Transaction ".$self->Data. " purged");
+    }
+    else {
+	return ("Default: ". $self->Type ."/". $self->Field . 
+		" changed from " . $self->OldValue . 
+		" to ".$self->NewValue);
+	
+    }
+}
+
+# }}}
+
+# {{{ Utility methods
+
+# {{{ sub IsInbound
+
+=head2 IsInbound
+
+Returns true if the creator of the transaction is a requestor of the ticket.
+Returns false otherwise
+
+=cut
+
+sub IsInbound {
+    my $self=shift;
+    return ($self->TicketObj->IsRequestor($self->CreatorObj));
+}
+
+# }}}
+
+# }}}
+
+# {{{ sub _Accessible 
+
+sub _Accessible  {
+  my $self = shift;
+  my %Cols = (
+	      TimeTaken => 'read',
+	      Ticket => 'read/public',
+	      Type=> 'read',
+	      Field => 'read',
+	      Data => 'read',
+	      NewValue => 'read',
+	      OldValue => 'read',
+	      Creator => 'read/auto',
+	      Created => 'read/auto',
+	     );
+  return $self->SUPER::_Accessible(@_, %Cols);
+}
+
+# }}}
+
+# }}}
+
+# {{{ sub _Set
+
+sub _Set {
+    my $self = shift;
+    return(0, 'Transactions are immutable');
+}
+
+# }}}
+
+# {{{ sub _Value 
+
+=head2 _Value
+
+Takes the name of a table column.
+Returns its value as a string, if the user passes an ACL check
+
+=cut
+
+sub _Value  {
+
+    my $self = shift;
+    my $field = shift;
+    
+    
+    #if the field is public, return it.
+    if ($self->_Accessible($field, 'public')) {
+	return($self->__Value($field));
+	
+    }
+    #If it's a comment, we need to be extra special careful
+    if ($self->__Value('Type') eq 'Comment') {
+	unless ($self->CurrentUserHasRight('ShowTicketComments')) {
+	    return (undef);
+	}
+    }	
+    #if they ain't got rights to see, don't let em
+    else {
+	unless ($self->CurrentUserHasRight('ShowTicket')) {
+	    return (undef);
+	}
+    }	
+    
+    return($self->__Value($field));
+    
+}
+
+# }}}
+
+# {{{ sub CurrentUserHasRight
+
+=head2 CurrentUserHasRight RIGHT
+
+Calls $self->CurrentUser->HasQueueRight for the right passed in here.
+passed in here.
+
+=cut
+
+sub CurrentUserHasRight {
+    my $self = shift;
+    my $right = shift;
+    return ($self->CurrentUser->HasQueueRight(Right => "$right", 
+                                              TicketObj => $self->TicketObj));            
+}
+
+# }}}
+
+1;
diff --git a/rt/lib/RT/Transactions.pm b/rt/lib/RT/Transactions.pm
new file mode 100755
index 000000000..2ae98f286
--- /dev/null
+++ b/rt/lib/RT/Transactions.pm
@@ -0,0 +1,78 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Transactions.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+=head1 NAME
+
+  RT::Transactions - a collection of RT Transaction objects
+
+=head1 SYNOPSIS
+
+  use RT::Transactions;
+
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing
+
+ok (require RT::TestHarness);
+ok (require RT::Transactions);
+
+=end testing
+
+=cut
+
+package RT::Transactions;
+use RT::EasySearch;
+
+@ISA= qw(RT::EasySearch);
+use RT::Transaction;
+
+# {{{ sub _Init  
+sub _Init   {
+  my $self = shift;
+  
+  $self->{'table'} = "Transactions";
+  $self->{'primary_key'} = "id";
+  
+  # By default, order by the date of the transaction, rather than ID.
+  $self->OrderBy( ALIAS => 'main',
+		  FIELD => 'Created',
+		  ORDER => 'ASC');
+
+  return ( $self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub NewItem 
+sub NewItem  {
+    my $self = shift;
+    
+    return(RT::Transaction->new($self->CurrentUser));
+}
+# }}}
+
+
+=head2 example methods
+
+  Queue RT::Queue or Queue Id
+  Ticket RT::Ticket or Ticket Id
+
+
+LimitDate 
+  
+Type TRANSTYPE
+Field STRING
+OldValue OLDVAL
+NewValue NEWVAL
+Data DATA
+TimeTaken
+Actor USEROBJ/USERID
+ContentMatches STRING
+
+=cut
+
+
+1;
+
diff --git a/rt/lib/RT/User.pm b/rt/lib/RT/User.pm
new file mode 100755
index 000000000..4e8554030
--- /dev/null
+++ b/rt/lib/RT/User.pm
@@ -0,0 +1,1222 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/User.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# (c) 1996-2000 Jesse Vincent <jesse@fsck.com>
+# This software is redistributable under the terms of the GNU GPL
+
+=head1 NAME
+
+  RT::User - RT User object
+
+=head1 SYNOPSIS
+
+  use RT::User;
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing
+
+ok(require RT::TestHarness);
+ok(require RT::User);
+
+=end testing
+
+
+=cut
+
+
+package RT::User;
+use RT::Record;
+@ISA= qw(RT::Record);
+
+# {{{ sub _Init
+sub _Init  {
+    my $self = shift;
+    $self->{'table'} = "Users";
+    return($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub _Accessible 
+
+sub _Accessible  {
+  my $self = shift;
+  my %Cols = (
+	      # {{{ Core RT info
+	      Name => 'public/read/write/admin',
+	      Password => 'write',
+	      Comments => 'read/write/admin',
+	      Signature => 'read/write',
+	      EmailAddress => 'public/read/write',
+	      PagerEmailAddress => 'read/write',
+	      FreeformContactInfo => 'read/write',
+	      Organization => 'public/read/write/admin',
+	      Disabled => 'public/read/write/admin', #To modify this attribute, we have helper
+	      #methods
+	      Privileged => 'read/write/admin', # 0=no 1=user 2=system
+
+	      # }}}
+	      
+	      # {{{ Names
+	      
+	      RealName => 'public/read/write',
+	      NickName => 'public/read/write',
+	      # }}}
+	      	      
+	      # {{{ Localization and Internationalization
+	      Lang => 'public/read/write',
+	      EmailEncoding => 'public/read/write',
+	      WebEncoding => 'public/read/write',
+	      # }}}
+	      
+	      # {{{ External ContactInfo Linkage
+	      ExternalContactInfoId => 'public/read/write/admin',
+	      ContactInfoSystem => 'public/read/write/admin',
+	      # }}}
+	      
+	      # {{{ User Authentication identifier
+	      ExternalAuthId => 'public/read/write/admin',
+	      #Authentication system used for user 
+	      AuthSystem => 'public/read/write/admin',
+	      Gecos => 'public/read/write/admin', #Gecos is the name of the fields in a 
+	      # unix passwd file. In this case, it refers to "Unix Username"
+	      # }}}
+	      
+	      # {{{ Telephone numbers
+	      HomePhone =>  'read/write',
+	      WorkPhone => 'read/write',
+	      MobilePhone => 'read/write',
+	      PagerPhone => 'read/write',
+
+	      # }}}
+	      
+	      # {{{ Paper Address
+	      Address1 => 'read/write',
+	      Address2 => 'read/write',
+	      City => 'read/write',
+	      State => 'read/write',
+	      Zip => 'read/write',
+	      Country => 'read/write',
+	      # }}}
+	      
+	      # {{{ Core DBIx::Record Attributes
+	      Creator => 'read/auto',
+	      Created => 'read/auto',
+	      LastUpdatedBy => 'read/auto',
+	      LastUpdated => 'read/auto'
+
+	      # }}}
+	     );
+  return($self->SUPER::_Accessible(@_, %Cols));
+}
+
+# }}}
+
+# {{{ sub Create 
+
+sub Create  {
+    my $self = shift;
+    my %args = (Privileged => 0,
+		@_ # get the real argumentlist
+	       );
+    
+    #Check the ACL
+    unless ($self->CurrentUserHasRight('AdminUsers')) {
+	return (0, 'No permission to create users');
+    }
+    
+    if (! $args{'Password'})  {
+	$args{'Password'} = '*NO-PASSWORD*';
+    }
+    elsif (length($args{'Password'}) < $RT::MinimumPasswordLength) {
+        return(0,"Password too short");
+    }
+    else {
+        my $salt = join '', ('.','/',0..9,'A'..'Z','a'..'z')[rand 64, rand 64];
+        $args{'Password'} = crypt($args{'Password'}, $salt);     
+    }   
+        
+    
+    #TODO Specify some sensible defaults.
+    
+    unless (defined ($args{'Name'})) {
+	return(0, "Must specify 'Name' attribute");
+    }	
+    
+    
+    #SANITY CHECK THE NAME AND ABORT IF IT'S TAKEN
+    if ($RT::SystemUser) { #This only works if RT::SystemUser has been defined
+		my $TempUser = RT::User->new($RT::SystemUser);
+		$TempUser->Load($args{'Name'});
+		return (0, 'Name in use') if ($TempUser->Id);
+	
+		return(0, 'Email address in use') 
+			unless ($self->ValidateEmailAddress($args{'EmailAddress'}));
+    }
+    else {
+		$RT::Logger->warning("$self couldn't check for pre-existing ".
+			     " users on create. This will happen".
+			     " on installation\n");
+    }
+    
+    my $id = $self->SUPER::Create(%args);
+    
+    #If the create failed.
+    unless ($id) {
+		return (0, 'Could not create user');
+    }
+      
+    
+    #TODO post 2.0
+    #if ($args{'SendWelcomeMessage'}) {
+    #	#TODO: Check if the email exists and looks valid
+    #	#TODO: Send the user a "welcome message" 
+    #}
+    
+    return ($id, 'User created');
+}
+
+# }}}
+
+# {{{ sub _BootstrapCreate 
+
+#create a user without validating _any_ data.
+
+#To be used only on database init.
+
+sub _BootstrapCreate {
+    my $self = shift;
+    my %args = (@_);
+
+    $args{'Password'} = "*NO-PASSWORD*";
+    my $id = $self->SUPER::Create(%args);
+    
+    #If the create failed.
+    return (0, 'Could not create user') 
+      unless ($id);
+
+    return ($id, 'User created');
+}
+
+# }}}
+
+# {{{ sub Delete 
+
+sub Delete  {
+    my $self = shift;
+    
+    return(0, 'Deleting this object would violate referential integrity');
+    
+}
+
+# }}}
+
+# {{{ sub Load 
+
+=head2 Load
+
+Load a user object from the database. Takes a single argument.
+If the argument is numerical, load by the column 'id'. Otherwise, load by
+the "Name" column which is the user's textual username.
+
+=cut
+
+sub Load  {
+    my $self = shift;
+    my $identifier = shift || return undef;
+    
+    #if it's an int, load by id. otherwise, load by name.
+    if ($identifier !~ /\D/) {
+	$self->SUPER::LoadById($identifier);
+    }
+    else {
+	$self->LoadByCol("Name",$identifier);
+    }
+}
+
+# }}}
+
+
+# {{{ sub LoadByEmail
+
+=head2 LoadByEmail
+
+Tries to load this user object from the database by the user's email address.
+
+
+=cut
+
+sub LoadByEmail {
+    my $self=shift;
+    my $address = shift;
+
+    # Never load an empty address as an email address.
+    unless ($address) {
+	return(undef);
+    }
+
+    $address = RT::CanonicalizeAddress($address);
+    #$RT::Logger->debug("Trying to load an email address: $address\n");
+    return $self->LoadByCol("EmailAddress", $address);
+}
+# }}}
+
+
+# {{{ sub ValidateEmailAddress
+
+=head2 ValidateEmailAddress ADDRESS
+
+Returns true if the email address entered is not in use by another user or is 
+undef or ''. Returns false if it's in use. 
+
+=cut
+
+sub ValidateEmailAddress {
+	my $self = shift;
+	my $Value = shift;
+
+ 	# if the email address is null, it's always valid
+ 	return (1) if(!$Value || $Value eq "");
+
+ 	my $TempUser = RT::User->new($RT::SystemUser);
+ 	$TempUser->LoadByEmail($Value);
+
+ 	if( $TempUser->id && 
+	   ($TempUser->id != $self->id)) { # if we found a user with that address 
+					# it's invalid to set this user's address to it
+ 		return(undef);
+ 	}
+ 	else { #it's a valid email address
+ 		return(1);
+ 	}
+}
+
+# }}}
+
+
+
+
+# {{{ sub SetRandomPassword
+
+=head2 SetRandomPassword
+
+Takes no arguments. Returns a status code and a new password or an error message.
+If the status is 1, the second value returned is the new password.
+If the status is anything else, the new value returned is the error code.
+
+=cut
+
+sub SetRandomPassword  {
+    my $self = shift;
+
+
+    unless ($self->CurrentUserCanModify('Password')) {
+	return (0, "Permission Denied");
+    }
+    
+    my $pass = $self->GenerateRandomPassword(6,8);
+
+    # If we have "notify user on 
+
+    my ($val, $msg) = $self->SetPassword($pass);
+    
+    #If we got an error return the error.
+    return (0, $msg) unless ($val);
+    
+    #Otherwise, we changed the password, lets return it.
+    return (1, $pass);
+    
+}
+
+# }}}
+
+
+# {{{ sub ResetPassword
+
+=head2 ResetPassword
+
+Returns status, [ERROR or new password].  Resets this user\'s password to
+a randomly generated pronouncable password and emails them, using a 
+global template called "RT_PasswordChange", which can be overridden
+with global templates "RT_PasswordChange_Privileged" or "RT_PasswordChange_NonPrivileged" 
+for privileged and Non-privileged users respectively.
+
+=cut
+
+sub ResetPassword {
+    my $self = shift;
+    
+    unless ($self->CurrentUserCanModify('Password')) {
+	return (0, "Permission Denied");
+    }
+    my ($status, $pass) = $self->SetRandomPassword();
+
+    unless ($status) {
+	return (0, "$pass");
+    }
+    
+    my $template = RT::Template->new($self->CurrentUser);
+
+
+    if ($self->IsPrivileged) {
+	$template->LoadGlobalTemplate('RT_PasswordChange_Privileged');
+    } 
+    else {
+	$template->LoadGlobalTemplate('RT_PasswordChange_Privileged');
+    }	
+    
+    unless ($template->Id) {
+	$template->LoadGlobalTemplate('RT_PasswordChange');
+    }	
+    
+    unless ($template->Id) {
+	$RT::Logger->crit("$self tried to send ".$self->Name." a password reminder ".
+			  "but couldn't find a password change template");
+    }	
+
+    my $notification =  RT::Action::SendPasswordEmail->new(TemplateObj => $template,
+							   Argument => $pass);
+    
+    $notification->SetTo($self->EmailAddress);
+
+    my ($ret);
+    $ret = $notification->Prepare();
+    if ($ret) {
+	$ret = $notification->Commit();
+    }
+    
+    if ($ret) {
+	return(1, 'New password notification sent');
+    }	else {
+	return (0, 'Notification could not be sent');
+    }	
+    
+}
+
+
+# }}}
+
+# {{{ sub GenerateRandomPassword
+
+=head2 GenerateRandomPassword MIN_LEN and MAX_LEN
+
+Returns a random password between MIN_LEN and MAX_LEN characters long.
+
+=cut
+
+sub GenerateRandomPassword {
+    my $self = shift;
+    my $min_length = shift;
+    my $max_length = shift;
+    
+    #This code derived from mpw.pl, a bit of code with a sordid history
+    # Its notes: 
+    
+    # Perl cleaned up a bit by Jesse Vincent 1/14/2001.
+    # Converted to perl from C by Marc Horowitz, 1/20/2000.
+    # Converted to C from Multics PL/I by Bill Sommerfeld, 4/21/86.
+    # Original PL/I version provided by Jerry Saltzer.
+
+    
+    my ($frequency, $start_freq, $total_sum, $row_sums);
+
+    #When munging characters, we need to know where to start counting letters from
+    my $a = ord('a');
+
+    # frequency of English digraphs (from D Edwards 1/27/66) 
+    $frequency =
+      [ [ 4, 20, 28, 52, 2, 11, 28, 4, 32, 4, 6, 62, 23,
+	  167, 2, 14, 0, 83, 76, 127, 7, 25, 8, 1, 9, 1 ], # aa - az
+	[ 13, 0, 0, 0, 55, 0, 0, 0, 8, 2, 0, 22, 0,
+	  0, 11, 0, 0, 15, 4, 2, 13, 0, 0, 0, 15, 0 ], # ba - bz
+	[ 32, 0, 7, 1, 69, 0, 0, 33, 17, 0, 10, 9, 1,
+	  0, 50, 3, 0, 10, 0, 28, 11, 0, 0, 0, 3, 0 ], # ca - cz
+	[ 40, 16, 9, 5, 65, 18, 3, 9, 56, 0, 1, 4, 15,
+	  6, 16, 4, 0, 21, 18, 53, 19, 5, 15, 0, 3, 0 ], # da - dz
+	[ 84, 20, 55, 125, 51, 40, 19, 16, 50, 1, 4, 55, 54,
+	  146, 35, 37, 6, 191, 149, 65, 9, 26, 21, 12, 5, 0 ], # ea - ez
+	[ 19, 3, 5, 1, 19, 21, 1, 3, 30, 2, 0, 11, 1,
+	  0, 51, 0, 0, 26, 8, 47, 6, 3, 3, 0, 2, 0 ], # fa - fz
+	[ 20, 4, 3, 2, 35, 1, 3, 15, 18, 0, 0, 5, 1,
+	  4, 21, 1, 1, 20, 9, 21, 9, 0, 5, 0, 1, 0 ], # ga - gz
+	[ 101, 1, 3, 0, 270, 5, 1, 6, 57, 0, 0, 0, 3,
+	  2, 44, 1, 0, 3, 10, 18, 6, 0, 5, 0, 3, 0 ], # ha - hz
+	[ 40, 7, 51, 23, 25, 9, 11, 3, 0, 0, 2, 38, 25,
+	  202, 56, 12, 1, 46, 79, 117, 1, 22, 0, 4, 0, 3 ], # ia - iz
+	[ 3, 0, 0, 0, 5, 0, 0, 0, 1, 0, 0, 0, 0,
+	  0, 4, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0 ], # ja - jz
+	[ 1, 0, 0, 0, 11, 0, 0, 0, 13, 0, 0, 0, 0,
+	  2, 0, 0, 0, 0, 6, 2, 1, 0, 2, 0, 1, 0 ], # ka - kz
+	[ 44, 2, 5, 12, 62, 7, 5, 2, 42, 1, 1, 53, 2,
+	  2, 25, 1, 1, 2, 16, 23, 9, 0, 1, 0, 33, 0 ], # la - lz
+	[ 52, 14, 1, 0, 64, 0, 0, 3, 37, 0, 0, 0, 7,
+	  1, 17, 18, 1, 2, 12, 3, 8, 0, 1, 0, 2, 0 ], # ma - mz
+	[ 42, 10, 47, 122, 63, 19, 106, 12, 30, 1, 6, 6, 9,
+	  7, 54, 7, 1, 7, 44, 124, 6, 1, 15, 0, 12, 0 ], # na - nz
+	[ 7, 12, 14, 17, 5, 95, 3, 5, 14, 0, 0, 19, 41,
+	  134, 13, 23, 0, 91, 23, 42, 55, 16, 28, 0, 4, 1 ], # oa - oz
+	[ 19, 1, 0, 0, 37, 0, 0, 4, 8, 0, 0, 15, 1,
+	  0, 27, 9, 0, 33, 14, 7, 6, 0, 0, 0, 0, 0 ], # pa - pz
+	[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0 ], # qa - qz
+	[ 83, 8, 16, 23, 169, 4, 8, 8, 77, 1, 10, 5, 26,
+	  16, 60, 4, 0, 24, 37, 55, 6, 11, 4, 0, 28, 0 ], # ra - rz
+	[ 65, 9, 17, 9, 73, 13, 1, 47, 75, 3, 0, 7, 11,
+	  12, 56, 17, 6, 9, 48, 116, 35, 1, 28, 0, 4, 0 ], # sa - sz
+	[ 57, 22, 3, 1, 76, 5, 2, 330, 126, 1, 0, 14, 10,
+	  6, 79, 7, 0, 49, 50, 56, 21, 2, 27, 0, 24, 0 ], # ta - tz
+	[ 11, 5, 9, 6, 9, 1, 6, 0, 9, 0, 1, 19, 5,
+	  31, 1, 15, 0, 47, 39, 31, 0, 3, 0, 0, 0, 0 ],	# ua - uz
+	[ 7, 0, 0, 0, 72, 0, 0, 0, 28, 0, 0, 0, 0,
+	  0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0 ], # va - vz
+	[ 36, 1, 1, 0, 38, 0, 0, 33, 36, 0, 0, 4, 1,
+	  8, 15, 0, 0, 0, 4, 2, 0, 0, 1, 0, 0, 0 ], # wa - wz
+	[ 1, 0, 2, 0, 0, 1, 0, 0, 3, 0, 0, 0, 0,
+	  0, 1, 5, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0 ], # xa - xz
+	[ 14, 5, 4, 2, 7, 12, 12, 6, 10, 0, 0, 3, 7,
+	  5, 17, 3, 0, 4, 16, 30, 0, 0, 5, 0, 0, 0 ], # ya - yz
+	[ 1, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] ]; # za - zz
+
+    #We need to know the totals for each row 
+    $row_sums =
+      [ map { my $sum = 0; map { $sum += $_ } @$_; $sum } @$frequency ];
+    
+
+    #Frequency with which a given letter starts a word.
+    $start_freq =
+      [ 1299, 425, 725, 271, 375, 470, 93, 223, 1009, 24, 20, 355, 379,
+	319, 823, 618, 21, 317, 962, 1991, 271, 104, 516, 6, 16, 14 ];
+    
+    $total_sum = 0; map { $total_sum += $_ } @$start_freq;
+    
+    
+    my $length = $min_length + int(rand($max_length-$min_length));
+    
+    my $char = $self->GenerateRandomNextChar($total_sum, $start_freq);
+    my @word = ($char+$a);
+    for (2..$length) {
+	$char = $self->_GenerateRandomNextChar($row_sums->[$char], $frequency->[$char]);
+	push(@word, $char+$a);
+    }
+    
+    #Return the password
+    return pack("C*",@word);
+    
+}
+
+
+#A private helper function for RandomPassword
+# Takes a row summary and a frequency chart for the next character to be searched
+sub _GenerateRandomNextChar {
+    my $self = shift;
+    my($all, $freq) = @_;
+    my($pos, $i);
+    
+    for ($pos = int(rand($all)), $i=0;
+	 $pos >= $freq->[$i];
+	 $pos -= $freq->[$i], $i++) {};
+    
+    return($i);
+}
+
+# }}}
+
+# {{{ sub SetPassword
+
+=head2 SetPassword
+
+Takes a string. Checks the string's length and sets this user's password 
+to that string.
+
+=cut
+
+sub SetPassword {
+    my $self = shift;
+    my $password = shift;
+    
+    unless ($self->CurrentUserCanModify('Password')) {
+	return(0, 'Permission Denied');
+    }
+    
+    if (! $password)  {
+        return(0, "No password set");
+    }
+    elsif (length($password) < $RT::MinimumPasswordLength) {
+        return(0,"Password too short");
+    }
+    else {
+        my $salt = join '', ('.','/',0..9,'A'..'Z','a'..'z')[rand 64, rand 64];
+        return ( $self->SUPER::SetPassword(crypt($password, $salt)) );
+    }   
+    
+}
+
+# }}}
+
+# {{{ sub IsPassword 
+
+=head2 IsPassword
+
+Returns true if the passed in value is this user's password.
+Returns undef otherwise.
+
+=cut
+
+sub IsPassword { 
+    my $self = shift;
+    my $value = shift;
+
+    #TODO there isn't any apparent way to legitimately ACL this
+
+    # RT does not allow null passwords 
+    if ((!defined ($value)) or ($value eq '')) {
+	return(undef);
+    } 
+    if ($self->Disabled) {
+  	$RT::Logger->info("Disabled user ".$self->Name." tried to log in");
+	return(undef);
+    }
+
+    if ( ($self->__Value('Password') eq '') || 
+         ($self->__Value('Password') eq undef) )  {
+        return(undef);
+     }
+    if ($self->__Value('Password') eq crypt($value, $self->__Value('Password'))) {
+	return (1);
+    }
+    else {
+	return (undef);
+    }
+}
+
+# }}}
+
+# {{{ sub SetDisabled
+
+=head2 Sub SetDisabled
+
+Toggles the user's disabled flag.
+If this flag is
+set, all password checks for this user will fail. All ACL checks for this
+user will fail. The user will appear in no user listings.
+
+=cut 
+
+# }}}
+
+# {{{ ACL Related routines
+
+# {{{ GrantQueueRight
+
+=head2 GrantQueueRight
+
+Grant a queue right to this user.  Takes a paramhash of which the elements
+RightAppliesTo and RightName are important.
+
+=cut
+
+sub GrantQueueRight {
+    
+    my $self = shift;
+    my %args = ( RightScope => 'Queue',
+		 RightName => undef,
+		 RightAppliesTo => undef,
+		 PrincipalType => 'User',
+		 PrincipalId => $self->Id,
+		 @_);
+   
+    #ACL check handled in ACE.pm
+
+    require RT::ACE;
+
+#    $RT::Logger->debug("$self ->GrantQueueRight right:". $args{'RightName'} .
+#		       " applies to queue ".$args{'RightAppliesTo'}."\n");
+    
+    my $ace = new RT::ACE($self->CurrentUser);
+    
+    return ($ace->Create(%args));
+}
+
+# }}}
+
+# {{{ GrantSystemRight
+
+=head2 GrantSystemRight
+
+Grant a system right to this user. 
+The only element that's important to set is RightName.
+
+=cut
+sub GrantSystemRight {
+    
+    my $self = shift;
+    my %args = ( RightScope => 'System',
+		 RightName => undef,
+		 RightAppliesTo => 0,
+		 PrincipalType => 'User',
+		 PrincipalId => $self->Id,
+		 @_);
+   
+
+    #ACL check handled in ACE.pm
+
+    require RT::ACE;    
+    my $ace = new RT::ACE($self->CurrentUser);
+    
+    return ($ace->Create(%args));
+}
+
+
+# }}}
+
+# {{{ sub HasQueueRight
+
+=head2 HasQueueRight
+
+Takes a paramhash which can contain
+these items:
+    TicketObj => RT::Ticket or QueueObj => RT::Queue or Queue => integer
+    IsRequestor => undef, (for bootstrapping create)
+    Right => 'Right' 
+
+
+Returns 1 if this user has the right specified in the paramhash. for the queue
+passed in.
+
+Returns undef if they don't
+
+=cut
+
+sub HasQueueRight {
+    my $self = shift;
+    my %args = ( TicketObj => undef,
+                 QueueObj => undef,
+		 Queue => undef,
+		 IsRequestor => undef,
+		 Right => undef,
+		 @_);
+    
+    my ($IsRequestor, $IsCc, $IsAdminCc, $IsOwner);
+    
+    if (defined $args{'Queue'}) {
+	$args{'QueueObj'} = new RT::Queue($self->CurrentUser);
+	$args{'QueueObj'}->Load($args{'Queue'});
+    }
+    
+    if (defined $args{'TicketObj'}) {
+	$args{'QueueObj'} = $args{'TicketObj'}->QueueObj();
+    }
+
+    # {{{ Validate and load up the QueueId
+    unless ((defined $args{'QueueObj'}) and ($args{'QueueObj'}->Id)) {
+	require Carp;
+	$RT::Logger->debug(Carp::cluck ("$self->HasQueueRight Couldn't find a queue id"));
+	return undef;
+    }
+
+    # }}}
+
+        
+    # Figure out whether a user has the right we're asking about.
+    # first see if they have the right personally for the queue in question. 
+    my $retval = $self->_HasRight(Scope => 'Queue',
+				  AppliesTo => $args{'QueueObj'}->Id,
+				  Right => $args{'Right'},
+				  IsOwner => $IsOwner);
+
+    return ($retval) if (defined $retval);
+    
+    # then we see whether they have the right personally globally. 
+    $retval = $self->HasSystemRight( $args{'Right'});
+
+    return ($retval) if (defined $retval);
+    
+    # now that we know they don't have the right personally,
+    
+    # {{{ Find out about whether the current user is a Requestor, Cc, AdminCc or Owner
+
+    if (defined $args{'TicketObj'}) {
+	if ($args{'TicketObj'}->IsRequestor($self)) {#user is requestor
+	    $IsRequestor = 1;
+	}	
+
+	if ($args{'TicketObj'}->IsCc($self)) { #If user is a cc
+	    $IsCc = 1;
+	}
+
+	if ($args{'TicketObj'}->IsAdminCc($self)) { #If user is an admin cc
+	    $IsAdminCc = 1;
+	}	
+	
+	if ($args{'TicketObj'}->IsOwner($self)) { #If user is an owner
+	    $IsOwner = 1;
+	}
+    }
+    
+    if (defined $args{'QueueObj'}) {
+	if ($args{'QueueObj'}->IsCc($self)) { #If user is a cc
+	    $IsCc = 1;
+	}
+	if ($args{'QueueObj'}->IsAdminCc($self)) { #If user is an admin cc
+	    $IsAdminCc = 1;
+	}
+	
+    } 
+    # }}}
+    
+    # then see whether they have the right for the queue as a member of a metagroup 
+
+    $retval = $self->_HasRight(Scope => 'Queue',
+				  AppliesTo => $args{'QueueObj'}->Id,
+				  Right => $args{'Right'},
+				  IsOwner => $IsOwner,
+				  IsCc => $IsCc,
+				  IsAdminCc => $IsAdminCc,
+				  IsRequestor => $IsRequestor
+				 );
+
+    return ($retval) if (defined $retval);
+
+    #   then we see whether they have the right globally as a member of a metagroup
+    $retval = $self->HasSystemRight( $args{'Right'},
+				     (IsOwner => $IsOwner,
+				      IsCc => $IsCc,
+				      IsAdminCc => $IsAdminCc,
+				      IsRequestor => $IsRequestor
+				     ) );
+
+    #If they haven't gotten it by now, they just lose.
+    return ($retval);
+    
+}
+
+# }}}
+  
+# {{{ sub HasSystemRight
+
+=head2 HasSystemRight
+
+takes an array of a single value and a paramhash.
+The single argument is the right being passed in.
+the param hash is some additional data. (IsCc, IsOwner, IsAdminCc and IsRequestor)
+
+Returns 1 if this user has the listed 'right'. Returns undef if this user doesn't.
+
+=cut
+
+sub HasSystemRight {
+    my $self = shift;
+    my $right = shift;
+
+    my %args = ( IsOwner => undef,
+		 IsCc => undef,
+		 IsAdminCc => undef,
+		 IsRequestor => undef,
+		 @_);
+    
+    unless (defined $right) {
+
+	$RT::Logger->debug("$self RT::User::HasSystemRight was passed in no right.");
+	return(undef);
+    }	
+    return ( $self->_HasRight ( Scope => 'System',
+				AppliesTo => '0',
+				Right => $right,
+				IsOwner => $args{'IsOwner'},
+				IsCc => $args{'IsCc'},
+				IsAdminCc => $args{'IsAdminCc'},
+				IsRequestor => $args{'IsRequestor'},
+				
+			      )
+	   );
+    
+}
+
+# }}}
+
+# {{{ sub _HasRight
+
+=head2 sub _HasRight (Right => 'right', Scope => 'scope',  AppliesTo => int, ExtendedPrincipals => SQL)
+
+_HasRight is a private helper method for checking a user's rights. It takes
+several options:
+
+=item Right is a textual right name
+
+=item Scope is a textual scope name. (As of July these were Queue, Ticket and System
+
+=item AppliesTo is the numerical Id of the object identified in the scope. For tickets, this is the queue #. for queues, this is the queue #
+
+=item ExtendedPrincipals is an  SQL select clause which assumes that the only
+table in play is ACL.  It's used by HasQueueRight to pass in which 
+metaprincipals apply. Actually, it's probably obsolete. TODO: remove it.
+
+Returns 1 if a matching ACE was found.
+
+Returns undef if no ACE was found.
+
+=cut
+
+
+sub _HasRight {
+    
+    my $self = shift;
+    my %args = ( Right => undef,
+		 Scope => undef,
+		 AppliesTo => undef,
+		 IsRequestor => undef,
+		 IsCc => undef,
+		 IsAdminCc => undef,
+		 IsOwner => undef,
+		 ExtendedPrincipals => undef,
+		 @_);
+    
+    if ($self->Disabled) {
+	$RT::Logger->debug ("Disabled User:  ".$self->Name.
+			    " failed access check for ".$args{'Right'}.
+			    " to object ".$args{'Scope'}."/".
+			    $args{'AppliesTo'}."\n");
+	return (undef);
+    }
+    
+    if (!defined $args{'Right'}) {
+    	$RT::Logger->debug("_HasRight called without a right\n");
+    	return(undef);
+    }
+    elsif (!defined $args{'Scope'}) {
+    	$RT::Logger->debug("_HasRight called without a scope\n");
+    	return(undef);
+    }
+    elsif (!defined $args{'AppliesTo'}) {
+    	$RT::Logger->debug("_HasRight called without an AppliesTo object\n");
+    	return(undef);
+    }
+    
+    #If we've cached a win or loss for this lookup say so
+    
+    #TODO Security +++ check to make sure this is complete and right
+    
+    #Construct a hashkey to cache decisions in
+    my ($hashkey);
+    { #it's ugly, but we need to turn off warning, cuz we're joining nulls.
+	local $^W=0;
+	$hashkey =$self->Id .":". join(':',%args);
+    }	
+    
+  # $RT::Logger->debug($hashkey."\n");
+    
+    #Anything older than 10 seconds needs to be rechecked
+    my $cache_timeout = (time - 10);
+    
+    
+    if ((defined $self->{'rights'}{"$hashkey"}) &&
+	    ($self->{'rights'}{"$hashkey"} == 1 ) &&
+        (defined $self->{'rights'}{"$hashkey"}{'set'} ) &&
+	    ($self->{'rights'}{"$hashkey"}{'set'} > $cache_timeout)) {
+#	  $RT::Logger->debug("Cached ACL win for ". 
+#			     $args{'Right'}.$args{'Scope'}.
+#			     $args{'AppliesTo'}."\n");	    
+	return ($self->{'rights'}{"$hashkey"});
+    }
+    elsif ((defined $self->{'rights'}{"$hashkey"}) &&
+	       ($self->{'rights'}{"$hashkey"} == -1)  &&
+           (defined $self->{'rights'}{"$hashkey"}{'set'}) &&
+	       ($self->{'rights'}{"$hashkey"}{'set'} > $cache_timeout)) {
+	
+#	$RT::Logger->debug("Cached ACL loss decision for ". 
+#			   $args{'Right'}.$args{'Scope'}.
+#			   $args{'AppliesTo'}."\n");	    
+	
+	return(undef);
+    }
+    
+    
+    my $RightClause = "(RightName = '$args{'Right'}')";
+    my $ScopeClause = "(RightScope = '$args{'Scope'}')";
+    
+    #If an AppliesTo was passed in, we should pay attention to it.
+    #otherwise, none is needed
+    
+    $ScopeClause = "($ScopeClause AND (RightAppliesTo = $args{'AppliesTo'}))"
+      if ($args{'AppliesTo'});
+    
+    
+    # The generic principals clause looks for users with my id
+    # and Rights that apply to _everyone_
+    my $PrincipalsClause = "((PrincipalType = 'User') AND (PrincipalId = ".$self->Id."))";
+    
+    
+    # If the user is the superuser, grant them the damn right ;)
+    my $SuperUserClause = 
+      "(RightName = 'SuperUser') AND (RightScope = 'System') AND (RightAppliesTo = 0)";
+    
+    # If we've been passed in an extended principals clause, we should lump it
+    # on to the existing principals clause. it'll make life easier
+    if ($args{'ExtendedPrincipals'}) {
+	$PrincipalsClause = "(($PrincipalsClause) OR ".
+	  "($args{'ExtendedPrincipalsClause'}))";
+    }
+    
+    my $GroupPrincipalsClause = "((ACL.PrincipalType = 'Group') ".
+      "AND (ACL.PrincipalId = Groups.Id) AND (GroupMembers.GroupId = Groups.Id) ".
+     " AND (GroupMembers.UserId = ".$self->Id."))";
+    
+    
+
+
+    # {{{ A bunch of magic statements that make the metagroups listed
+    # work. basically, we if the user falls into the right group,
+    # we add the type of ACL check needed
+    my (@MetaPrincipalsSubClauses, $MetaPrincipalsClause);
+    
+    #The user is always part of the 'Everyone' Group
+    push (@MetaPrincipalsSubClauses,  "((Groups.Name = 'Everyone') AND 
+                                       (PrincipalType = 'Group') AND 
+                                       (Groups.Id = PrincipalId))");
+
+    if ($args{'IsAdminCc'}) {
+	push (@MetaPrincipalsSubClauses,  "((Groups.Name = 'AdminCc') AND 
+                                       (PrincipalType = 'Group') AND 
+                                       (Groups.Id = PrincipalId))");
+    }
+    if ($args{'IsCc'}) {
+	push (@MetaPrincipalsSubClauses, " ((Groups.Name = 'Cc') AND 
+                                       (PrincipalType = 'Group') AND 
+                                       (Groups.Id = PrincipalId))");
+    }
+    if ($args{'IsRequestor'}) {
+	push (@MetaPrincipalsSubClauses,  " ((Groups.Name = 'Requestor') AND 
+                                       (PrincipalType = 'Group') AND 
+                                       (Groups.Id = PrincipalId))");
+    }
+    if ($args{'IsOwner'}) {
+	
+	push (@MetaPrincipalsSubClauses, " ((Groups.Name = 'Owner') AND 
+                                       (PrincipalType = 'Group') AND 
+                                       (Groups.Id = PrincipalId))");
+    }
+
+    # }}}
+    
+    my ($GroupRightsQuery, $MetaGroupRightsQuery, $IndividualRightsQuery, $hitcount);
+    
+    # {{{ If there are any metaprincipals to be checked
+    if (@MetaPrincipalsSubClauses) {
+	#chop off the leading or
+	#TODO redo this with an array and a join
+	$MetaPrincipalsClause = join (" OR ", @MetaPrincipalsSubClauses);
+	
+	$MetaGroupRightsQuery =  "SELECT COUNT(ACL.id) FROM ACL, Groups".
+	  " WHERE " .
+	    " ($ScopeClause) AND ($RightClause) AND ($MetaPrincipalsClause)";
+	
+	# {{{ deal with checking if the user has a right as a member of a metagroup
+
+#	$RT::Logger->debug("Now Trying $MetaGroupRightsQuery\n");	
+	$hitcount = $self->_Handle->FetchResult($MetaGroupRightsQuery);
+	
+	#if there's a match, the right is granted
+	if ($hitcount) {
+	    $self->{'rights'}{"$hashkey"}{'set'} = time;
+	    $self->{'rights'}{"$hashkey"} = 1;
+	    return (1);
+	}
+	
+#	$RT::Logger->debug("No ACL matched MetaGroups query: $MetaGroupRightsQuery\n");	
+
+	# }}}    
+	
+    }
+    # }}}
+
+    # {{{ deal with checking if the user has a right as a member of a group
+    # This query checks to se whether the user has the right as a member of a
+    # group
+    $GroupRightsQuery = "SELECT COUNT(ACL.id) FROM ACL, GroupMembers, Groups".
+      " WHERE " .
+	" (((($ScopeClause) AND ($RightClause)) OR ($SuperUserClause)) ".
+	  " AND ($GroupPrincipalsClause))";    
+    
+    #  $RT::Logger->debug("Now Trying $GroupRightsQuery\n");	
+    $hitcount = $self->_Handle->FetchResult($GroupRightsQuery);
+    
+    #if there's a match, the right is granted
+    if ($hitcount) {
+	$self->{'rights'}{"$hashkey"}{'set'} = time;
+	$self->{'rights'}{"$hashkey"} = 1;
+	return (1);
+    }
+    
+#    $RT::Logger->debug("No ACL matched $GroupRightsQuery\n");	
+    
+    # }}}
+
+    # {{{ Check to see whether the user has a right as an individual
+    
+    # This query checks to see whether the current user has the right directly
+    $IndividualRightsQuery = "SELECT COUNT(ACL.id) FROM ACL WHERE ".
+      " ((($ScopeClause) AND ($RightClause)) OR ($SuperUserClause)) " .
+	" AND ($PrincipalsClause)";
+
+    
+    $hitcount = $self->_Handle->FetchResult($IndividualRightsQuery);
+    
+    if ($hitcount) {
+	$self->{'rights'}{"$hashkey"}{'set'} = time;
+	$self->{'rights'}{"$hashkey"} = 1;
+	return (1);
+    }
+    # }}}
+
+    else { #If the user just doesn't have the right
+	
+#	$RT::Logger->debug("No ACL matched $IndividualRightsQuery\n");
+	
+	#If nothing matched, return 0.
+	$self->{'rights'}{"$hashkey"}{'set'} = time;
+	$self->{'rights'}{"$hashkey"} = -1;
+
+	
+	return (undef);
+    }
+}
+
+# }}}
+
+# {{{ sub CurrentUserCanModify
+
+=head2 CurrentUserCanModify RIGHT
+
+If the user has rights for this object, either because
+he has 'AdminUsers' or (if he\'s trying to edit himself and the right isn\'t an 
+admin right) 'ModifySelf', return 1. otherwise, return undef.
+
+=cut
+
+sub CurrentUserCanModify {
+    my $self = shift;
+    my $right = shift;
+
+    if ($self->CurrentUserHasRight('AdminUsers')) {
+	return (1);
+    }
+    #If the field is marked as an "administrators only" field, 
+    # don\'t let the user touch it.
+    elsif ($self->_Accessible($right, 'admin')) {
+	return(undef);
+    }
+    
+    #If the current user is trying to modify themselves
+    elsif ( ($self->id == $self->CurrentUser->id)  and
+	    ($self->CurrentUserHasRight('ModifySelf'))) {
+	return(1);
+    }
+ 
+    #If we don\'t have a good reason to grant them rights to modify
+    # by now, they lose
+    else {
+	return(undef);
+    }
+    
+}
+
+# }}}
+
+# {{{ sub CurrentUserHasRight
+
+=head2 CurrentUserHasRight
+  
+  Takes a single argument. returns 1 if $Self->CurrentUser
+  has the requested right. returns undef otherwise
+
+=cut
+
+sub CurrentUserHasRight {
+    my $self = shift;
+    my $right = shift;
+    
+    return ($self->CurrentUser->HasSystemRight($right));
+}
+
+# }}}
+
+
+# {{{ sub _Set
+
+sub _Set {
+  my $self = shift;
+  
+  my %args = (Field => undef,
+	      Value => undef,
+	      @_
+	     );
+
+  # Nobody is allowed to futz with RT_System or Nobody unless they
+  # want to change an email address. For 2.2, neither should have an email address
+
+  if ($self->Privileged == 2) {
+    return (0, "Can not modify system users"); 
+  }
+  unless ($self->CurrentUserCanModify($args{'Field'})) {
+      return (0, "Permission Denied");
+  }
+
+
+  
+  #Set the new value
+  my ($ret, $msg)=$self->SUPER::_Set(Field => $args{'Field'}, 
+				     Value=> $args{'Value'});
+  
+    return ($ret, $msg);
+}
+
+# }}}
+
+# {{{ sub _Value 
+
+=head2 _Value
+
+Takes the name of a table column.
+Returns its value as a string, if the user passes an ACL check
+
+=cut
+
+sub _Value  {
+
+  my $self = shift;
+  my $field = shift;
+  
+  #If the current user doesn't have ACLs, don't let em at it.  
+  
+  my @PublicFields = qw( Name EmailAddress Organization Disabled
+			 RealName NickName Gecos ExternalAuthId 
+			 AuthSystem ExternalContactInfoId 
+			 ContactInfoSystem );
+
+  #if the field is public, return it.
+  if ($self->_Accessible($field, 'public')) {
+      return($self->SUPER::_Value($field));
+      
+  }
+  #If the user wants to see their own values, let them
+  elsif ($self->CurrentUser->Id == $self->Id) {	
+      return($self->SUPER::_Value($field));
+  } 
+  #If the user has the admin users right, return the field
+  elsif ($self->CurrentUserHasRight('AdminUsers')) {
+      return($self->SUPER::_Value($field));
+  }
+  else {
+      return(undef);
+  }	
+ 
+
+}
+
+# }}}
+
+# }}}
+1;
+ 
diff --git a/rt/lib/RT/Users.pm b/rt/lib/RT/Users.pm
new file mode 100755
index 000000000..f4a97268c
--- /dev/null
+++ b/rt/lib/RT/Users.pm
@@ -0,0 +1,281 @@
+
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Users.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# (c) 1996-1999 Jesse Vincent <jesse@fsck.com>
+# This software is redistributable under the terms of the GNU GPL
+
+=head1 NAME
+
+  RT::Users - Collection of RT::User objects
+
+=head1 SYNOPSIS
+
+  use RT::Users;
+
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing
+
+ok(require RT::TestHarness);
+ok(require RT::Users);
+
+=end testing
+
+=cut
+
+package RT::Users;
+use RT::EasySearch;
+@ISA = qw(RT::EasySearch);
+
+# {{{ sub _Init 
+sub _Init  {
+  my $self = shift;
+  $self->{'table'} = "Users";
+  $self->{'primary_key'} = "id";
+
+  # By default, order by name
+  $self->OrderBy( ALIAS => 'main',
+		  FIELD => 'Name',
+		  ORDER => 'ASC');
+
+  return ($self->SUPER::_Init(@_));
+  
+}
+# }}}
+
+# {{{ sub _DoSearch 
+
+=head2 _DoSearch
+
+  A subclass of DBIx::SearchBuilder::_DoSearch that makes sure that _Disabled rows never get seen unless
+we're explicitly trying to see them.
+
+=cut
+
+sub _DoSearch {
+    my $self = shift;
+    
+    #unless we really want to find disabled rows, make sure we\'re only finding enabled ones.
+    unless($self->{'find_disabled_rows'}) {
+	$self->LimitToEnabled();
+    }
+    
+    return($self->SUPER::_DoSearch(@_));
+    
+}
+
+# }}}
+
+# {{{ sub NewItem 
+
+sub NewItem  {
+  my $self = shift;
+
+  use RT::User;
+  my $item = new RT::User($self->CurrentUser);
+  return($item);
+}
+# }}}
+
+# {{{ LimitToEmail
+=head2 LimitToEmail
+
+Takes one argument. an email address. limits the returned set to
+that email address
+
+=cut
+
+sub LimitToEmail {
+    my $self = shift;
+    my $addr = shift;
+    $self->Limit(FIELD => 'EmailAddress', VALUE => "$addr");
+}
+
+# }}}
+
+# {{{ MemberOfGroup
+
+=head2 MemberOfGroup
+
+takes one argument, a group id number. Limits the returned set
+to members of a given group
+
+=cut
+
+sub MemberOfGroup {
+    my $self = shift;
+    my $group = shift;
+    
+    return ("No group specified") if (!defined $group);
+
+    my $groupalias = $self->NewAlias('GroupMembers');
+
+    $self->Join( ALIAS1 => 'main', FIELD1 => 'id', 
+		 ALIAS2 => "$groupalias", FIELD2 => 'Name');
+    
+    $self->Limit (ALIAS => "$groupalias",
+		  FIELD => 'GroupId',
+		  VALUE => "$group",
+		  OPERATOR => "="
+		 );
+}
+
+# }}}
+
+# {{{ LimitToPrivileged
+
+=head2 LimitToPrivileged
+
+Limits to users who can be made members of ACLs and groups
+
+=cut
+
+sub LimitToPrivileged {
+    my $self = shift;
+    $self->Limit( FIELD => 'Privileged',
+                  OPERATOR => '=',
+                  VALUE => '1');
+}
+
+# }}}
+
+
+
+# {{{ LimitToSystem
+
+=head2 LimitToSystem
+
+Limits to users who can be granted rights, but who should
+never have their rights modified by a user or be made members of groups.
+
+=cut
+
+sub LimitToSystem {
+    my $self = shift;
+    $self->Limit( FIELD => 'Privileged',
+                  OPERATOR => '=',
+                  VALUE => '2');
+}
+
+# }}}
+
+# {{{ HasQueueRight
+
+=head2 HasQueueRight
+
+Takes a queue id as its first argument.  Queue Id "0" is treated by RT as "applies to all queues"
+Takes a specific right as an optional second argument
+
+Limits the returned set to users who have rights in the queue specified, personally.  If the optional second argument is supplied, limits to users who have been explicitly granted that right.
+
+
+
+This should not be used as an ACL check, but only for obtaining lists of
+users with explicit rights in a given queue.
+
+=cut
+
+sub HasQueueRight {
+    my $self = shift;
+    my $queue = shift;
+    my $right;
+    
+    $right = shift if (@_);
+
+
+    my $acl_alias  = $self->NewAlias('ACL');
+    $self->Join( ALIAS1 => 'main',  FIELD1 => 'id',
+		 ALIAS2 => $acl_alias, FIELD2 => 'PrincipalId');
+    $self->Limit (ALIAS => $acl_alias,
+		 FIELD => 'PrincipalType',
+		 OPERATOR => '=',
+		 VALUE => 'User');
+
+
+    $self->Limit(ALIAS => $acl_alias,
+		 FIELD => 'RightAppliesTo',
+		 OPERATOR => '=',
+		 VALUE => "$queue");
+
+
+    $self->Limit(ALIAS => $acl_alias,
+		 FIELD => 'RightScope',
+		 OPERATOR => '=',
+		 ENTRYAGGREGATOR => 'OR',
+		 VALUE => 'Queue');
+
+
+    $self->Limit(ALIAS => $acl_alias,
+		 FIELD => 'RightScope',
+		 OPERATOR => '=',
+		 ENTRYAGGREGATOR => 'OR',
+		 VALUE => 'Ticket');
+
+
+    #TODO: is this being initialized properly if the right isn't there?
+    if (defined ($right)) {
+	
+	$self->Limit(ALIAS => $acl_alias,
+		     FIELD => 'RightName',
+		     OPERATOR => '=',
+		     VALUE => "$right");
+	
+	
+       };
+
+
+}
+
+
+
+# }}}
+
+# {{{ HasSystemRight
+
+=head2 HasSystemRight
+
+Takes one optional argument:
+   The name of a System level right.
+
+Limits the returned set to users who have been granted system rights, personally.  If the optional argument is passed in, limits to users who have been granted the explicit right listed.   Please see the note attached to LimitToQueueRights
+
+=cut
+
+sub HasSystemRight {
+    my $self = shift;
+    my $right = shift if (@_);
+       my $acl_alias  = $self->NewAlias('ACL');
+
+
+    $self->Join( ALIAS1 => 'main',  FIELD1 => 'id',
+		 ALIAS2 => $acl_alias, FIELD2 => 'PrincipalId');
+    $self->Limit (ALIAS => $acl_alias,
+		 FIELD => 'PrincipalType',
+		 OPERATOR => '=',
+		 VALUE => 'User');
+
+    $self->Limit(ALIAS => $acl_alias,
+		 FIELD => 'RightScope',
+		 OPERATOR => '=',
+		 VALUE => 'System');
+
+
+    #TODO: is this being initialized properly if the right isn't there?
+    if (defined ($right)) {
+	$self->Limit(ALIAS => $acl_alias,
+		     FIELD => 'RightName',
+		     OPERATOR => '=',
+		     VALUE => "$right");
+	
+       }
+
+    
+}
+
+# }}}
+
+1;
+
diff --git a/rt/lib/RT/Watcher.pm b/rt/lib/RT/Watcher.pm
new file mode 100755
index 000000000..c7c6100cf
--- /dev/null
+++ b/rt/lib/RT/Watcher.pm
@@ -0,0 +1,313 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/Watcher.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# (c) 1996-2001 Jesse Vincent <jesse@fsck.com>
+# This software is redistributable under the terms of the GNU GPL
+
+=head1 NAME
+
+  RT::Watcher - RT Watcher object
+
+=head1 SYNOPSIS
+
+  use RT::Watcher;
+
+
+=head1 DESCRIPTION
+
+This module should never be called directly by client code. it\'s an internal module which
+should only be accessed through exported APIs in Ticket, Queue and other similar objects.
+
+=head1 METHODS
+
+=begin testing
+
+ok(require RT::TestHarness);
+ok(require RT::Watcher);
+
+=end testing
+
+=cut
+
+package RT::Watcher;
+use RT::Record;
+@ISA= qw(RT::Record);
+
+
+# {{{ sub _Init 
+
+sub _Init {
+  my $self = shift;
+  
+  $self->{'table'} = "Watchers";
+  return ($self->SUPER::_Init(@_));
+
+}
+# }}}
+
+# {{{ sub Create 
+
+=head2 Create PARAMHASH
+
+Create a new watcher object with the following Attributes:
+
+Scope:  Ticket or Queue
+Value: Ticket or queue id
+Type: Requestor, Cc or AdminCc.  Requestor is not supported for a scope of \'Queue\'
+Email: The email address of the watcher.  If the email address maps to an RT User, this is resolved
+to an Owner object instead.
+Owner: The RT user id of the \'owner\' of this watcher object. 
+
+=cut
+
+sub Create  {
+    my $self = shift;
+    my %args = (
+		Owner => undef,
+		Email => undef,
+		Value => undef,
+		Scope => undef,
+		Type => undef,
+		Quiet => 0,
+		@_ # get the real argumentlist
+	       );
+    
+    #Do we have someone this applies to?
+    unless (($args{'Owner'} =~ /^(\d+)$/) || ($args{'Email'} =~ /\@/)) {
+	return (0, "No user or email address specified");
+    }
+    
+    #if we only have an email address, try to resolve it to an owner
+    if ($args{'Owner'} == 0) {
+        my $User = new RT::User($RT::SystemUser);
+        $User->LoadByEmail($args{'Email'});
+        if ($User->id) {
+            $args{'Owner'} = $User->id;
+   	    delete $args{'Email'};
+	}
+    }
+    
+    
+    if ($args{'Type'} eq "Requestor" and $args{'Owner'} == 0) {
+	# Requestors *MUST* have an account
+	
+	my $Address = RT::CanonicalizeAddress($args{'Email'});
+	
+	my $NewUser = RT::User->new($RT::SystemUser);
+	my ($Val, $Message) =
+	  $NewUser->Create(Name => $Address,
+			   EmailAddress => $Address,
+			   RealName => $Address,
+			   Password => undef,
+			   Privileged => 0,
+			   Comments => 'Autocreated on ticket submission'
+			  );
+	return (0, "Could not create watcher for requestor")
+	  unless $Val;
+	if ($NewUser->id) {
+	    $args{'Owner'} = $NewUser->id;
+	    delete $args{'Email'};
+	}
+    }
+    
+    
+    
+    
+    #Make sure we\'ve got a valid type
+    #TODO --- move this to ValidateType 
+    return (0, "Invalid Type")
+      unless ($args{'Type'} =~ /^(Requestor|Cc|AdminCc)$/i);
+
+    my $id = $self->SUPER::Create(%args);
+    if ($id) {
+	return (1,"Interest noted");
+    }
+    else {
+	return (0, "Error adding watcher");
+    }
+}
+# }}}
+
+# {{{ sub Load 
+
+=head2 Load ID
+  
+  Loads a watcher by the primary key of the watchers table ($Watcher->id)
+  
+=cut
+
+sub Load  {
+    my $self = shift;
+    my $identifier = shift;
+    
+    if ($identifier !~ /\D/) {
+	$self->SUPER::LoadById($identifier);
+    }
+    else {
+	return (0, "That's not a numerical id");
+    }
+}
+
+# }}}
+
+# {{{ sub LoadByValue
+
+=head2 LoadByValue PARAMHASH
+  
+LoadByValue takes a parameter hash with the following attributes:
+
+  Email, Owner, Scope, Type, Value
+
+The same rules enforced at create are enforced by Load.
+
+Returns a tuple of (retval, msg). Retval is 1 on success and 0 on failure.
+msg describes what happened in a human readable form.
+
+=cut
+
+sub LoadByValue {
+    my $self = shift;
+    my %args = ( Email => undef, 
+		 Owner => undef,
+		 Scope => undef,
+		 Type => undef,
+		 Value => undef,
+		 @_);
+    
+    #TODO: all this code is being copied from Create. that\'s silly
+    
+    #Do we have someone this applies to?
+    unless (($args{'Owner'} =~ /^(\d*)$/) || ($args{'Email'} =~ /\@/)) {
+	return (0, "No user or email address specified");
+    }
+    
+    #if we only have an email address, try to resolve it to an owner
+    unless ($args{'Owner'}) {
+        my $User = new RT::User($RT::SystemUser);
+        $User->LoadByEmail($args{'Email'});
+        if ($User->id > 0) {
+            $args{'Owner'} = $User->id;
+   	    delete $args{'Email'};
+	}
+    }
+    
+    if ((defined ($args{'Type'})) and 
+	($args{'Type'} !~ /^(Requestor|Cc|AdminCc)$/i)) {
+	return (0, "Invalid Type");
+    }
+    if ($args{'Owner'}) {
+	$self->LoadByCols( Type => $args{'Type'},
+			   Value => $args{'Value'},
+			   Owner => $args{'Owner'},
+			   Scope => $args{'Scope'},
+			 );
+    }
+    else {
+	$self->LoadByCols( Type => $args{'Type'},
+			   Email => $args{'Email'},
+			   Value => $args{'Value'},
+			   Scope => $args{'Scope'},
+			 );
+    }	
+    unless ($self->Id) {
+	return(0, "Couldn\'t find that watcher");
+    }
+    return (1, "Watcher loaded");
+}
+
+# }}}
+
+# {{{ sub OwnerObj 
+
+=head2 OwnerObj
+
+Return an RT Owner Object for this Watcher, if we have one
+
+=cut
+
+sub OwnerObj  {
+    my $self = shift;
+    if (!defined $self->{'OwnerObj'}) {
+	require RT::User;
+	$self->{'OwnerObj'} = RT::User->new($self->CurrentUser);
+	if ($self->Owner) {
+	    $self->{'OwnerObj'}->Load($self->Owner);
+	} else {
+	    return $RT::Nobody->UserObj;
+	}
+    }
+    return ($self->{'OwnerObj'});
+}
+# }}}
+
+# {{{ sub Email
+
+=head2 Email
+
+This custom data accessor does the right thing and returns
+the 'Email' attribute of this Watcher object. If that's undefined,
+it returns the 'EmailAddress' attribute of its 'Owner' object, which is
+an RT::User object.
+
+=cut
+
+sub Email {
+    my $self = shift;
+    
+    # IF Email is defined, return that. Otherwise, return the Owner's email address
+    if (defined($self->__Value('Email'))) {
+	return ($self->__Value('Email'));
+    }
+    elsif ($self->Owner) {
+	return ($self->OwnerObj->EmailAddress);
+    }
+    else {
+	return ("Data error");
+    }
+}
+# }}}
+  
+# {{{ sub IsUser
+
+=head2 IsUser
+
+Returns true if this watcher object is tied to a user object. (IE it
+isn't sending to some other email address).
+Otherwise, returns undef
+
+=cut
+
+sub IsUser {
+    my $self = shift;
+    # if this watcher has an email address glued onto it,
+    # return undef
+
+    if (defined($self->__Value('Email'))) {
+        return undef;
+    }
+    else {
+        return 1;
+    }
+}
+
+# }}}
+
+# {{{ sub _Accessible 
+sub _Accessible  {
+  my $self = shift;
+  my %Cols = (
+	      Email => 'read/write',
+	      Scope => 'read/write',
+	      Value => 'read/write',
+	      Type => 'read/write',
+	      Quiet => 'read/write',
+	      Owner => 'read/write',	      
+	      Creator => 'read/auto',
+	      Created => 'read/auto',
+	      LastUpdatedBy => 'read/auto',
+	      LastUpdated => 'read/auto'
+	     );
+  return($self->SUPER::_Accessible(@_, %Cols));
+}
+# }}}
+
+1;
+ 
diff --git a/rt/lib/RT/Watchers.pm b/rt/lib/RT/Watchers.pm
new file mode 100755
index 000000000..c55adda3f
--- /dev/null
+++ b/rt/lib/RT/Watchers.pm
@@ -0,0 +1,226 @@
+# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/Watchers.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# (c) 1996-2000 Jesse Vincent <jesse@fsck.com>
+# This software is redistributable under the terms of the GNU GPL
+
+=head1 NAME
+
+  RT::Watchers - Collection of RT Watcher objects
+
+=head1 SYNOPSIS
+
+  use RT::Watchers;
+  my $watchers = new RT::Watchers($CurrentUser);
+  while (my $watcher = $watchers->Next()) {
+    print $watcher->Id . "is a watcher";
+  }  
+
+=head1 DESCRIPTION
+
+This module should never be called directly by client code. it's an internal module which
+should only be accessed through exported APIs in Ticket, Queue and other similar objects.
+
+
+=head1 METHODS
+
+=begin testing
+
+ok(require RT::TestHarness);
+ok(require RT::Watchers);
+
+=end testing
+
+=cut
+
+package RT::Watchers;
+
+use strict;
+use vars qw( @ISA );
+
+
+require RT::EasySearch;
+require RT::Watcher;
+@ISA= qw(RT::EasySearch);
+
+
+# {{{ sub _Init
+sub _Init  {
+  my $self = shift;
+  
+  $self->{'table'} = "Watchers";
+  $self->{'primary_key'} = "id";
+  return($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub Limit 
+
+=head2 Limit
+
+  A wrapper around RT::EasySearch::Limit which sets
+the default entry aggregator to 'AND'
+
+=cut
+
+sub Limit  {
+  my $self = shift;
+  my %args = ( ENTRYAGGREGATOR => 'AND',
+	       @_);
+
+  $self->SUPER::Limit(%args);
+}
+# }}}
+
+# {{{ sub LimitToTicket
+
+=head2 LimitToTicket
+
+Takes a single arg which is a ticket id
+Limits to watchers of that ticket
+
+=cut
+
+sub LimitToTicket { 
+  my $self = shift;
+  my $ticket = shift;
+  $self->Limit( ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Value',
+		VALUE => $ticket);
+  $self->Limit (ENTRYAGGREGATOR => 'AND',
+		FIELD => 'Scope',
+		VALUE => 'Ticket');
+}
+# }}}
+
+# {{{ sub LimitToQueue 
+
+=head2 LimitToQueue
+
+Takes a single arg, which is a queue id
+Limits to watchers of that queue.
+
+=cut
+
+sub LimitToQueue  {
+  my $self = shift;
+  my $queue = shift;
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Value',
+		VALUE => $queue);
+  $self->Limit (ENTRYAGGREGATOR => 'AND',
+		FIELD => 'Scope',
+		VALUE => 'Queue');
+}
+# }}}
+
+# {{{ sub LimitToType 
+
+=head2 LimitToType
+
+Takes a single string as its argument. That string is a watcher type
+which is one of 'Requestor', 'Cc' or 'AdminCc'
+Limits to watchers of that type
+
+=cut
+
+
+sub LimitToType  {
+  my $self = shift;
+  my $type = shift;
+  $self->Limit(FIELD => 'Type',
+	       VALUE => "$type");
+}
+# }}}
+
+# {{{ sub LimitToRequestors 
+
+=head2 LimitToRequestors
+
+Limits to watchers of type 'Requestor'
+
+=cut
+
+sub LimitToRequestors  {
+  my $self = shift;
+  $self->LimitToType("Requestor");
+}
+# }}}
+
+# {{{ sub LimitToCc 
+
+=head2 LimitToCc
+
+Limits to watchers of type 'Cc'
+
+=cut
+
+sub LimitToCc  {
+    my $self = shift;
+    $self->LimitToType("Cc");
+}
+# }}}
+
+# {{{ sub LimitToAdminCc 
+
+=head2 LimitToAdminCc
+
+Limits to watchers of type AdminCc
+
+=cut
+
+sub LimitToAdminCc  {
+    my $self = shift;
+    $self->LimitToType("AdminCc");
+}
+# }}}
+
+# {{{ sub Emails 
+
+=head2 Emails
+
+# Return a (reference to a) list of emails
+
+=cut
+
+sub Emails  {
+    my $self = shift;
+    my @list;    # List is a list of watcher email addresses
+
+    # $watcher is an RT::Watcher object
+    while (my $watcher=$self->Next()) {
+	push(@list, $watcher->Email);
+    }
+    return \@list;
+}
+# }}}
+
+# {{{ sub EmailsAsString
+
+=head2 EmailsAsString
+
+# Returns the RT::Watchers->Emails as a comma seperated string
+
+=cut
+
+sub EmailsAsString {
+    my $self = shift;
+    return(join(", ",@{$self->Emails}));
+}
+# }}}
+
+# {{{ sub NewItem 
+
+
+
+sub NewItem  {
+    my $self = shift;
+    
+    use RT::Watcher;
+    my  $item = new RT::Watcher($self->CurrentUser);
+    return($item);
+}
+# }}}
+1;
+
+
+
+
diff --git a/rt/lib/test.pl b/rt/lib/test.pl
new file mode 100644
index 000000000..f0da5df27
--- /dev/null
+++ b/rt/lib/test.pl
@@ -0,0 +1,52 @@
+# Before `make install' is performed this script should be runnable with
+# `make test'. After `make install' it should work as `perl test.pl'
+
+######################### We start with some black magic to print on failure.
+
+# Change 1..1 below to 1..last_test_to_print .
+# (It may become useful if the test is moved to ./t subdirectory.)
+
+BEGIN { $| = 1; print "1..1\n"; }
+END {print "not ok 1\n" unless $loaded;}
+use RT;
+$loaded = 1;
+print "ok 1\n";
+
+######################### End of black magic.
+
+# Insert your test code below (better if it prints "ok 13"
+# (correspondingly "not ok 13") depending on the success of chunk 13
+# of the test code):
+
+use RT::Record;
+use RT::EasySearch;
+use RT::Handle;
+use RT::Ticket;
+use RT::Tickets;
+use RT::ACE;
+use RT::ACL;
+use RT::Watcher;
+use RT::Watchers;
+use RT::Scrip;
+use RT::Scrips;
+use RT::ScripAction;
+use RT::ScripCondition;
+use RT::ScripActions;
+use RT::ScripConditions;
+use RT::Transaction;
+use RT::Transactions;
+use RT::Group;
+use RT::GroupMembers;
+use RT::User;
+use RT::Users;
+use RT::CurrentUser;
+use RT::Attachment;
+use RT::Attachments;
+use RT::Keyword;
+use RT::Keywords;
+use RT::KeywordSelect;
+use RT::KeywordSelects;
+use RT::ObjectKeyword;
+use RT::ObjectKeywords;
+use RT::Date;
+
diff --git a/rt/tools/cpan2rpm b/rt/tools/cpan2rpm
new file mode 100644
index 000000000..9b54cb912
--- /dev/null
+++ b/rt/tools/cpan2rpm
@@ -0,0 +1,299 @@
+#!/usr/bin/perl -w
+
+
+# Take a perl tarball and make a specfile for it. Now with bundles.
+#
+# Copyright 2000,2001 Simon Wilkinson. All rights reserved.
+#
+# 10/18/2001 - <jesse@bestpractical.com>
+#		Added resolution of prereq_pm modules
+#
+# This program is free software; you can redistribute it 
+# and/or modify it under the same terms as Perl itself.
+#
+
+use strict;
+
+use CPAN;
+use POSIX;
+use Sys::Hostname;
+use File::Basename;
+use Getopt::Long;
+
+use vars qw ($DEBUG $ARCH $builddir $seen @report);
+
+$ARCH = 'i386';
+
+$DEBUG = 0;
+# Icky globals
+
+my $release;
+my $package;
+
+$seen = {};
+
+
+sub usage 
+{
+  print STDERR <<EOM;
+
+Usage: cpan2rpm [--release <release>] [--builddir <rpm build dir>]  <Perl::Module>
+
+Where:
+<release> is the release number of the RPM you wish to produce
+<Perl::Module> is the name of the module to build
+EOM
+  exit(1);
+}
+
+
+my $ret=GetOptions("release" => \$release,
+		   "builddir=s" => \$builddir);
+
+$package=$ARGV[0];
+usage() if !$package;
+$release=1 if !$release;
+
+
+$builddir=ExtractRpmMacro($ENV{HOME}."/.rpmmacros","_topdir") if !$builddir;
+$builddir=ExtractRpmMacro("/etc/rpm/macros","_topdir") if !$builddir;
+$builddir=getcwd() if !$builddir;
+  
+die "Build directory $builddir doesn't look like an RPM build root\n"
+    if ((! -d "$builddir/SPECS") || (! -d "$builddir/SOURCES"));
+
+process($package,$release);
+
+print join("\n",@report)."\n";
+
+sub process {
+  my ($infile,$release)=@_;
+
+  
+
+# Convert our installation list into an unbundled one
+  unbundle($infile);
+
+  print "Building $infile\n";
+
+    cpan2rpm($infile,$builddir,$release);
+
+}
+
+# Given a Module, try to split it into its required components - this
+# currently only handles Bundles, but could also be extended to deal with
+# prereqs as well.
+
+sub unbundle {
+  my ($item) = @_;
+
+  if ($item=~/Bundle::/) {
+    my $obj=CPAN::Shell->expand('Bundle',$item);
+
+    foreach my $kid ($obj->contains) {
+     	process($kid,$release);
+    }
+  }
+}
+
+
+sub cpan2rpm($$$) {
+  my ($infile,$builddir,$release) = @_;
+
+  my $ret;
+
+  my $obj=CPAN::Shell->expand('Module',$infile);
+
+  print "CPAN tells us the following about $infile:\n",$obj->as_string if ($DEBUG);
+
+  $ret=fetch_source($obj,$builddir);
+  $ret=build_specfile($obj,$builddir,$release) if !$ret;
+  
+  return $ret;
+}
+
+# FIXME: Some error handling in the function below wouldn't go amiss ...
+sub fetch_source {
+  my ($obj,$builddir)=@_;
+
+  # Minor Sanity checks
+  my $id=$obj->{ID};
+
+  return "Error: No file for $id\n" 
+     if $obj->cpan_file eq "N/A";
+  return "Error: $id says 'Contact Author'\n" 
+     if $obj->cpan_file =~ /^Contact Author/;
+  return "Error: $id is contained within Perl itself!\n"
+     if ($obj->cpan_file =~/perl-5\.\d?\.\d?\.tar\.gz/xo);
+
+  # We do this so we can take advantage of CPAN's object caching. This is
+  # pinched from the CPAN::Distribution::get method, which we can't use
+  # directly, as it untars the package as well - which we let RPM do.
+ 
+  my $dist = $CPAN::META->instance('CPAN::Distribution',$obj->cpan_file);
+
+
+  my($local_wanted) =
+       MM->catfile($CPAN::Config->{keep_source_where},
+                   "authors",
+                   "id",
+                   split("/",$dist->{ID})
+                   );
+
+  my $local_file = CPAN::FTP->localize("authors/id/$dist->{ID}", $local_wanted);
+  
+  $dist->{localfile} = $local_file;
+
+  $dist->verifyMD5 if ($CPAN::META->has_inst('MD5'));
+
+
+  # Find all the prereqs for this distribution, then build em.
+  # TODO this should be somewhere else
+
+  $dist->make;
+  build_prereqs( $dist->prereq_pm());
+
+
+
+  my $infile=basename($obj->cpan_file);
+
+  File::Copy::copy($local_file,"$builddir/SOURCES/$infile");
+
+  return undef;
+}
+
+
+sub build_prereqs($) {
+  my ($prereqs) = @_;
+  
+  foreach my $prereq (keys %{$prereqs}) {
+	process ($prereq, $release);
+  }
+}
+sub build_specfile($$$) {
+  my ($obj,$builddir,$release) = @_;
+
+  my $source=basename($obj->cpan_file);
+
+  # don't go through dependencies on something we've already dealt with
+  return() if ($seen->{$source});
+  $seen->{$source} = 1; 
+
+my ($name,$version)=($source=~/(.*)-(.*)\.tar\.gz/);
+  return "Couldn't get a name for $source\n" if !$name;
+  return "Couldn't get a version for $source\n" if !$version; 
+  
+  my $summary="$name module for perl";
+  my $description=$obj->{description};
+  $description= $summary if !$description;
+
+  open(SPEC, ">$builddir/SPECS/perl-$name.spec")
+    or die "Couldn't open perl-$name.spec for writing.";
+  print SPEC <<EOF;
+
+Summary: $summary
+Name: perl-$name
+Version: $version
+Release: $release
+Copyright: distributable
+Group: Applications/CPAN
+Source0: $source
+Url: http://www.cpan.org
+BuildRoot: /var/tmp/perl-${name}-buildroot/
+Requires: perl 
+
+%description
+This is a perl module, autogenerated by cpan2rpm. The original package's
+description was:
+
+$description
+
+%prep
+%setup -q -n $name-%{version}
+
+%build
+CFLAGS="\$RPM_OPT_FLAGS" perl Makefile.PL
+make
+
+%clean
+rm -rf \$RPM_BUILD_ROOT
+
+%install
+rm -rf \$RPM_BUILD_ROOT
+eval `perl '-V:installarchlib'`
+mkdir -p \$RPM_BUILD_ROOT/\$installarchlib
+make PREFIX=\$RPM_BUILD_ROOT/usr install
+/usr/lib/rpm/brp-compress
+find \$RPM_BUILD_ROOT/usr -type f -print | sed "s\@^\$RPM_BUILD_ROOT\@\@g" | grep -v perllocal.pod > $name-$version-filelist
+
+%files -f ${name}-${version}-filelist
+%defattr(-,root,root)
+
+%changelog
+EOF
+  print SPEC "* ",POSIX::strftime("%a %b %d %Y",localtime()), " ",$ENV{USER}," <",$ENV{USER},"\@",hostname(),">\n";
+  print SPEC "- Spec file automatically generated by cpan2rpm\n";
+
+  close(SPEC);
+
+  system("rpm -ba $builddir/SPECS/perl-$name.spec >/dev/null") == 0
+    or push (@report,  "RPM of $source failed with : $!\n"); 
+ 
+  system("rpm -Uvh $builddir/RPMS/$ARCH/perl-$name-$version-$release.$ARCH.rpm") == 0
+    or warn "RPM of $source could not be installed: $!\n";
+
+  push (@report,  "Built perl-$name-$version-$release.$ARCH.rpm");
+}
+
+sub ExtractRpmMacro {
+  my ($file,$macro) = @_;
+
+  my $handle=new IO::File;
+
+  if (!$handle->open($file)) {
+    return undef;
+  }
+
+  while(<$handle>) {
+    if (/\%$macro (.*)/) {
+       return $1;
+    }
+  }
+
+  return undef;
+}
+
+=head1 NAME
+
+cpan2rpm - fetch and convert CPAN packages to RPMs
+
+=head1 SYNOPSIS
+
+cpan2rpm --release <release> <package>
+
+=head1 DESCRIPTION
+
+cpan2rpm provides a quick way of creating RPM packages from perl modules
+published on CPAN. It interfaces with the perl CPAN module to fetch the
+file from the selected mirror, and then creates a spec file from the 
+information in CPAN, and invokes RPM on that spec file.
+
+Files are created in the users RPM build root.
+
+=head1 OPTIONS
+
+=over 4
+
+=item release
+
+Sets the release number of the created RPMs.
+
+=back
+
+=head1 SEE ALSO
+
+rpm(1)
+
+=head1 AUTHOR
+
+Simon Wilkinson <sxw@sxw.org.uk>
diff --git a/rt/tools/initdb b/rt/tools/initdb
new file mode 100644
index 000000000..ffb1ae3b0
--- /dev/null
+++ b/rt/tools/initdb
@@ -0,0 +1,216 @@
+#!/usr/bin/perl -w
+# $Header: /home/cvs/cvsroot/freeside/rt/tools/Attic/initdb,v 1.1 2002-08-12 06:17:08 ivan Exp $
+
+use strict;
+use vars qw($PROMPT $SCHEMA_FILE $SCHEMA_DIR
+	    $ACTION $DEBUG $DB_TYPE $DB_HOME 
+	    $DB_HOST $DB_PORT $DB_DBA $DB_DATABASE $DB_DBA_PASSWORD);
+
+use DBI;
+use DBIx::DataSource qw( create_database drop_database );
+
+
+$|=1; #unbuffer that output.
+
+$DEBUG=0;
+$PROMPT = 1; #by default, should at least *ask* before nuking databases
+$SCHEMA_DIR ="etc";
+$SCHEMA_FILE = "$SCHEMA_DIR/schema.pm"; #hmm
+
+($DB_TYPE, $DB_HOME, $DB_HOST, $DB_PORT, $DB_DBA, $DB_DATABASE, $ACTION) = @ARGV;
+
+
+if ($DEBUG) {
+  print_config_params();
+}
+my $dsn = "dbi:$DB_TYPE:";
+
+if (($DB_TYPE eq 'Pg') or ($DB_TYPE eq 'mysql')) {
+   $dsn .= "dbname=$DB_DATABASE";
+   if ($DB_HOST) {
+	$dsn .= ";host=$DB_HOST";
+    }
+   if ($DB_PORT) {
+ 	$dsn .= ";port=$DB_PORT";
+   }
+}
+elsif ($DB_TYPE eq 'Oracle') {
+   $dsn .= "$DB_DATABASE";
+}
+
+
+if ($ACTION eq 'create') {
+    unless ($DB_TYPE eq 'Oracle') {
+        print "Now creating a database for RT.\n";
+	prompt_for_dba_password();
+	create_db();
+    }
+}
+elsif ($ACTION eq 'drop' ) {
+    unless ($DB_TYPE eq 'Oracle') {
+	print "Now dropping the RT2 database.\n";
+        prompt_for_dba_password();
+        drop_db();
+    }
+}
+elsif ($ACTION eq 'insert' ) {
+    print "Now populating database schema.\n";
+    prompt_for_dba_password();
+    insert_schema();
+}
+elsif ($ACTION eq 'generate') {
+    prompt_for_dba_password();
+    generate_schema();
+}
+else {
+    print STDERR '$ACTION unspecified. Makefile error. It was '.$ACTION ;
+    exit(-1);
+}
+
+
+# {{{ sub prompt_for_dba_password
+
+sub prompt_for_dba_password {
+    print "Enter the $DB_TYPE password for $DB_DBA: ";
+
+    system "stty -echo";
+    $DB_DBA_PASSWORD = scalar(<STDIN>); #keep off commandline
+    system "stty echo";
+    chomp $DB_DBA_PASSWORD;
+
+}
+# }}}
+
+# {{{ sub print_config_params
+sub print_config_params {
+    print <<END;
+Database creation parameters:
+
+DB_TYPE         = $DB_TYPE
+DB_HOME         = $DB_HOME
+DB_HOST         = $DB_HOST
+DB_DBA          = $DB_DBA
+DB_DBA_PASSWORD = <hidden>
+DB_DATABASE     = $DB_DATABASE
+END
+}
+# }}}
+
+# {{{ sub drop_db
+sub drop_db {
+    
+    if ( $PROMPT ) {
+	print <<END;
+
+About to drop $DB_TYPE database $DB_DATABASE.
+WARNING: This will erase all data in $DB_DATABASE.
+If you have an existing RT 2.x installation, this will destroy all your data.
+i
+END
+	exit unless _yesno();
+	
+    }
+    
+
+  print "\nDropping $DB_TYPE database $DB_DATABASE.\n";
+  drop_database( $dsn, $DB_DBA, $DB_DBA_PASSWORD )
+    or warn $DBIx::DataSource::errstr;
+
+
+}
+# }}}
+
+# {{{ sub generate_schema
+sub generate_schema {
+    my @schema = generate_schema_from_hash();
+    print "Generating schema for $DB_TYPE...";
+    
+    system('mv', "$SCHEMA_DIR/schema.$DB_TYPE", "$SCHEMA_DIR/schema.$DB_TYPE.bak")
+      if (-f "$SCHEMA_DIR/schema.$DB_TYPE");
+    open(SCHEMA, ">$SCHEMA_DIR/schema.$DB_TYPE");
+    foreach my $line (@schema) {
+	print SCHEMA "$line;\n";
+    }
+    close(SCHEMA);
+    print "done.\n";
+}
+# }}}
+
+# {{{ sub insert_schema
+sub insert_schema {
+    my (@schema);
+    print "\nCreating database schema.\n";
+   
+    my $dbh = DBI->connect( $dsn, $DB_DBA, $DB_DBA_PASSWORD ) or die $DBI::errstr;    
+    
+    if ( -f "$SCHEMA_DIR/schema.$DB_TYPE") {
+	open (SCHEMA, "<$SCHEMA_DIR/schema.$DB_TYPE");
+	my $statement = "";
+	foreach my $line (<SCHEMA>) {
+	    $statement .= $line;
+	    if ($line =~ /;$/) {
+		$statement =~ s/;$//g;
+		push @schema, $statement;
+		$statement = "";
+	    }
+	}	
+    }	
+    
+    else {
+	 @schema = generate_schema_from_hash();
+     }
+    
+    foreach my $statement (@schema) {
+	print STDERR $statement if $DEBUG;
+	my $sth = $dbh->prepare($statement) or die $dbh->errstr;
+	unless ($sth->execute) {
+	    print STDERR "Problem with statement:\n $statement\n";
+	    die $sth->errstr;
+	}
+    }
+    
+    
+    $dbh->disconnect;
+    print "schema sucessfully inserted\n";
+    
+}
+# }}}
+
+# {{{ sub generate_schema_from_hash
+sub generate_schema_from_hash {
+    my (@schema);
+    
+    require DBIx::DBSchema;    
+    my $schema_href = do "$SCHEMA_FILE" or die $@ || $!;
+    my $schema = DBIx::DBSchema->pretty_read($schema_href);
+    
+    
+    foreach my $statement ( $schema->sql($dsn, $DB_DBA, $DB_DBA_PASSWORD ) ) {
+	print STDERR $statement if $DEBUG;
+	chomp $statement;
+	push @schema, $statement;
+	
+    }
+    return (@schema);
+    
+}
+# }}}
+
+# {{{ sub create_db
+sub create_db {
+    
+    print "\nCreating $DB_TYPE database $DB_DATABASE.\n";
+    create_database( $dsn, $DB_DBA, $DB_DBA_PASSWORD )
+      or die $DBIx::DataSource::errstr;
+
+}
+# }}}
+
+# {{{ sub _yesno
+sub _yesno {
+    print "Proceed [y/N]:";
+    my $x = scalar(<STDIN>);
+    $x =~ /^y/i;
+}
+
+# }}}
diff --git a/rt/tools/insertdata b/rt/tools/insertdata
new file mode 100755
index 000000000..b3e76e623
--- /dev/null
+++ b/rt/tools/insertdata
@@ -0,0 +1,618 @@
+#!/usr/bin/perl -w
+#
+# $Header: /home/cvs/cvsroot/freeside/rt/tools/Attic/insertdata,v 1.1 2002-08-12 06:17:08 ivan Exp $
+# RT is (c) 1996-2002 Jesse Vincent (jesse@bestpractical.com);
+
+package RT;
+use strict;
+use vars qw($VERSION $Handle $Nobody $SystemUser $item);
+
+use lib "!!RT_LIB_PATH!!";
+use lib "!!RT_ETC_PATH!!";
+
+#This drags in  RT's config.pm
+use config;
+use Carp;
+
+use RT::Handle;
+use RT::User;
+use RT::CurrentUser;
+
+# 
+my $LastVersion = shift || undef;
+my $LastMinorVersion = undef;
+
+#connect to the db
+$RT::Handle = new RT::Handle($RT::DatabaseType);
+$RT::Handle->Connect();
+
+#Put together a current user object so we can create a User object
+my $CurrentUser = new RT::CurrentUser();
+
+if ($LastVersion) {
+    if ( $LastVersion =~ /^2.0.(\d+)$/ ) {
+        $LastMinorVersion = $1;
+        print "Looking for new objects to add to the database"
+          . " since $LastVersion\n\n";
+    }
+    else {
+        print "This tool does not support upgrades from development releases "
+          . "or non 2.0.x versions";
+    }
+}
+else {    # this is a virgin install
+    print "Checking for existing system user...";
+    my $test_user = RT::User->new($CurrentUser);
+    $test_user->Load('RT_System');
+    if ( $test_user->id ) {
+        print "Found!\n\nYou appear to have already run insertdata.\n"
+          . "Exiting, so as not to clobber your existing data. To ERASE your\n"
+          . "RT database and start over, type 'make dropdb; make install' in\n"
+          . "the RT installation directory. If you just meant to upgrade the\n"
+          . "content of your database, rerun this program as: \n",
+          "       $0 <version>\n"
+          . "where <version> is the last RELEASED version of RT you installed\n"
+          . "for example, if you're upgrading from 2.0.4, you'd type:\n"
+          . "       $0 2.0.4\n";
+        exit(-1);
+
+    }
+    else {
+        print "not found.  This appears to be a new installation";
+    }
+
+    print "Creating system user...";
+    my $RT_System = new RT::User($CurrentUser);
+
+    my ( $val, $msg ) = $RT_System->_BootstrapCreate(
+        Name     => 'RT_System',
+        RealName => 'The RT System itself',
+        Comments =>
+'Do not delete or modify this user. It is integral to RT\'s internal database structures',
+        Privileged => '2',
+        Creator    => '1'
+    );
+
+    if ($val) {
+        print "done.\n";
+    }
+    else {
+        print "$msg\n";
+        exit(1);
+    }
+
+}
+
+#now that we bootstrapped that little bit, we can use the standard RT cli
+# helpers  to do what we need
+
+use RT::Interface::CLI qw(CleanEnv LoadConfig DBConnect
+  GetCurrentUser GetMessageContent);
+
+#Clean out all the nasties from the environment
+CleanEnv();
+
+#Load etc/config.pm and drop privs
+LoadConfig();
+
+#Connect to the database and get RT::SystemUser and RT::Nobody loaded
+DBConnect();
+
+$CurrentUser->LoadByName('RT_System');
+
+# {{{ Users
+
+my @users;
+
+unless ($LastVersion) {
+    @users = (
+        {
+            Name     => 'Nobody',
+            RealName => 'Nobody in particular',
+            Comments => 'Do not delete or modify this user. It is integral '
+              . 'to RT\'s internal data structures',
+            Privileged => '2',
+        },
+
+        {
+            Name         => 'root',
+            Gecos        => 'root',
+            RealName     => 'Enoch Root',
+            Password     => 'password',
+            EmailAddress => "root\@localhost",
+            Comments     => 'SuperUser',
+            Privileged   => '1',
+        }
+    );
+}
+
+# }}}
+
+# {{{ Groups 
+
+my @groups;
+unless ($LastVersion) {
+    @groups = (
+        {
+            Name        => 'Everyone',
+            Description => 'Pseudogroup for internal use',
+            Pseudo      => '1',
+        },
+        {
+            Name        => 'Owner',
+            Description => 'Pseudogroup for internal use',
+            Pseudo      => '1',
+        },
+        {
+            Name        => 'Requestor',
+            Description => 'Pseudogroup for internal use',
+            Pseudo      => '1',
+        },
+        {
+            Name        => 'Cc',
+            Description => 'Pseudogroup for internal use',
+            Pseudo      => '1',
+        },
+        {
+            Name        => 'AdminCc',
+            Description => 'Pseudogroup for internal use',
+            Pseudo      => '1',
+        },
+    );
+}
+
+# }}}
+
+# {{{ ACL
+my @acl;
+
+unless ($LastVersion) {
+    @acl = (    #TODO: make this actually take the serial # granted to root.
+        {
+            PrincipalId    => '1',
+            PrincipalType  => 'User',
+            RightName      => 'SuperUser',
+            RightScope     => 'System',
+            RightAppliesTo => '0'
+        },
+        {
+            PrincipalId    => '2',
+            PrincipalType  => 'User',
+            RightName      => 'SuperUser',
+            RightScope     => 'System',
+            RightAppliesTo => '0'
+        },
+
+        {
+            PrincipalId    => '3',
+            PrincipalType  => 'User',
+            RightName      => 'SuperUser',
+            RightScope     => 'System',
+            RightAppliesTo => '0'
+        }
+
+    );
+}
+
+# }}}
+
+# {{{ Queues
+
+my @queues;
+unless ($LastVersion) {
+    @queues = (
+        {
+            Name              => 'general',
+            Description       => 'The default queue',
+            CorrespondAddress => "rt\@localhost",
+            CommentAddress    => "rt-comment\@localhost"
+        }
+    );
+}
+
+# }}}
+
+# {{{ ScripActions
+
+my @ScripActions;
+
+unless ($LastVersion) {
+    @ScripActions = (
+
+        {
+            Name        => 'AutoreplyToRequestors',
+            Description =>
+'Always sends a message to the requestors independent of message sender',
+            ExecModule => 'Autoreply',
+            Argument   => 'Requestor'
+        },
+        {
+            Name        => 'NotifyRequestors',
+            Description => 'Sends a message to the requestors',
+            ExecModule  => 'Notify',
+            Argument    => 'Requestor'
+        },
+        {
+            Name        => 'NotifyOwnerAsComment',
+            Description => 'Sends mail to the owner',
+            ExecModule  => 'NotifyAsComment',
+            Argument    => 'Owner'
+        },
+        {
+            Name        => 'NotifyOwner',
+            Description => 'Sends mail to the owner',
+            ExecModule  => 'Notify',
+            Argument    => 'Owner'
+        },
+        {
+            Name        => 'NotifyAdminCcsAsComment',
+            Description => 'Sends mail to the administrative Ccs as a comment',
+            ExecModule  => 'NotifyAsComment',
+            Argument    => 'AdminCc'
+        },
+        {
+            Name        => 'NotifyAdminCcs',
+            Description => 'Sends mail to the administrative Ccs',
+            ExecModule  => 'Notify',
+            Argument    => 'AdminCc'
+        },
+
+        {
+            Name        => 'NotifyRequestorsAndCcsAsComment',
+            Description => 'Send mail to requestors and Ccs as a comment',
+            ExecModule  => 'NotifyAsComment',
+            Argument    => 'Requestor,Cc'
+        },
+
+        {
+            Name        => 'NotifyRequestorsAndCcs',
+            Description => 'Send mail to requestors and Ccs',
+            ExecModule  => 'Notify',
+            Argument    => 'Requestor,Cc'
+        },
+
+        {
+            Name        => 'NotifyAllWatchersAsComment',
+            Description => 'Send mail to all watchers',
+            ExecModule  => 'NotifyAsComment',
+            Argument    => 'All'
+        },
+        {
+            Name        => 'NotifyAllWatchers',
+            Description => 'Send mail to all watchers',
+            ExecModule  => 'Notify',
+            Argument    => 'All'
+        },
+    );
+}
+
+if ( $LastMinorVersion < 12 ) {
+    push (
+        @ScripActions,
+        {
+            Name        => 'NotifyOtherRecipientsAsComment',
+            Description => 'Sends mail to explicitly listed Ccs and Bccs',
+            ExecModule  => 'NotifyAsComment',
+            Argument    => 'OtherRecipients'
+        },
+        {
+            Name        => 'NotifyOtherRecipients',
+            Description => 'Sends mail to explicitly listed Ccs and Bccs',
+            ExecModule  => 'Notify',
+            Argument    => 'OtherRecipients'
+        },
+    );
+}
+
+# }}}
+
+# {{{ ScripConditions
+
+my @ScripConditions;
+unless ($LastVersion) {
+    @ScripConditions = (
+        {
+            Name                 => 'OnCreate',
+            Description          => 'When a ticket is created',
+            ApplicableTransTypes => 'Create',
+            ExecModule           => 'AnyTransaction',
+        },
+
+        {
+            Name                 => 'OnTransaction',
+            Description          => 'When anything happens',
+            ApplicableTransTypes => 'Any',
+            ExecModule           => 'AnyTransaction',
+        },
+        {
+
+            Name                 => 'OnCorrespond',
+            Description          => 'Whenever correspondence comes in',
+            ApplicableTransTypes => 'Correspond',
+            ExecModule           => 'AnyTransaction',
+        },
+
+        {
+
+            Name                 => 'OnComment',
+            Description          => 'Whenever comments come in',
+            ApplicableTransTypes => 'Comment',
+            ExecModule           => 'AnyTransaction'
+        },
+        {
+
+            Name                 => 'OnStatus',
+            Description          => 'Whenever a ticket\'s status changes',
+            ApplicableTransTypes => 'Status',
+            ExecModule           => 'AnyTransaction',
+
+        },
+        {
+            Name                 => 'OnResolve',
+            Description          => 'Whenever a ticket is resolved.',
+            ApplicableTransTypes => 'Status',
+            ExecModule           => 'StatusChange',
+            Argument             => 'resolved'
+
+        },
+
+    );
+}
+
+# }}}
+
+# {{{ Templates
+my @templates;
+
+unless ($LastVersion) {
+    @templates = (
+        {
+            Queue       => '0',
+            Name        => 'Autoreply',
+            Description => 'Default Autoresponse Template',
+            Content     => 'Subject: AutoReply: {$Ticket->Subject}
+
+
+Greetings,
+
+This message has been automatically generated in response to the
+creation of a trouble ticket regarding:
+	"{$Ticket->Subject()}", 
+a summary of which appears below.
+
+There is no need to reply to this message right now.  Your ticket has been
+assigned an ID of [{$rtname} #{$Ticket->id()}].
+
+Please include the string:
+
+         [{$rtname} #{$Ticket->id}]
+
+in the subject line of all future correspondence about this issue. To do so, 
+you may reply to this message.
+
+                        Thank you,
+                        {$Ticket->QueueObj->CorrespondAddress()}
+
+-------------------------------------------------------------------------
+{$Transaction->Content()}
+'
+        },
+
+        {
+
+            #                  id => 2,
+            Queue       => '0',
+            Name        => 'Transaction',
+            Description => 'Default transaction template',
+            Content     => '
+
+
+{$Transaction->CreatedAsString}: Request {$Ticket->id} was acted upon.
+Transaction: {$Transaction->Description}
+       Queue: {$Ticket->QueueObj->Name}
+     Subject: {$Transaction->Subject || $Ticket->Subject || "(No subject given)"}
+       Owner: {$Ticket->OwnerObj->Name}
+  Requestors: {$Ticket->Requestors->EmailsAsString()}
+      Status: {$Ticket->Status}
+ Ticket <URL: {$RT::WebURL}Ticket/Display.html?id={$Ticket->id} >
+-------------------------------------------------------------------------
+{$Transaction->Content()}'
+        },
+
+        {
+
+            Queue       => '0',
+            Name        => 'AdminCorrespondence',
+            Description => 'Default admin correspondence template',
+            Content     => '
+
+
+<URL: {$RT::WebURL}Ticket/Display.html?id={$Ticket->id} >
+
+{$Transaction->Content()}'
+        },
+
+        {
+            Queue       => '0',
+            Name        => 'Correspondence',
+            Description => 'Default correspondence template',
+            Content     => '
+
+{$Transaction->Content()}'
+        },
+
+        {
+            Queue       => '0',
+            Name        => 'AdminComment',
+            Description => 'Default admin comment template',
+            Content     =>
+'Subject: [Comment] {my $s=($Transaction->Subject||$Ticket->Subject); $s =~ s/\\[Comment\\]//g; $comment =~ s/^Re//i; $s;}
+
+
+{$RT::WebURL}Ticket/Display.html?id={$Ticket->id}
+This is a comment.  It is not sent to the Requestor(s):
+
+{$Transaction->Content()}
+'
+        },
+
+        {
+            Queue       => '0',
+            Name        => 'StatusChange',
+            Description => 'Ticket status changed',
+            Content     => 'Subject: Status Changed to: {$Transaction->NewValue}
+
+
+{$RT::WebURL}Ticket/Display.html?id={$Ticket->id}
+
+{$Transaction->Content()}
+'
+        },
+
+        {
+
+            Queue       => '0',
+            Name        => 'Resolved',
+            Description => 'Ticket Resolved',
+            Content     => 'Subject: Ticket Resolved
+
+According to our records, your request has been resolved. If you have any
+further questions or concerns, please respond to this message.
+'
+        }
+    );
+}
+
+# }}}
+
+# {{{ Scrips;
+
+my @scrips;
+unless ($LastVersion) {
+     @scrips = (
+                { Queue => 0,
+                  ScripCondition => 'OnCreate',
+                  ScripAction => 'AutoreplyToRequestors',
+                  Template => 'Autoreply'
+                },
+                { Queue => 0,
+                  ScripCondition => 'OnCreate',
+                  ScripAction => 'NotifyAdminCcs',
+                  Template => 'Transaction',
+                },
+                { Queue => 0,
+                  ScripCondition => 'OnCorrespond',
+                  ScripAction => 'NotifyAllWatchers',
+                  Template => 'Correspondence',
+                },
+                { Queue => 0,
+                  ScripCondition => 'OnComment',
+                  ScripAction => 'NotifyAdminCcsAsComment',
+                  Template => 'AdminComment',
+                },
+     ) 
+}
+if ( $LastMinorVersion < 12 ) {
+    push (
+        @scrips,
+                { Queue => 0,
+                  ScripCondition => 'OnComment',
+                  ScripAction => 'NotifyOtherRecipientsAsComment',
+                  Template => 'Correspondence',
+                },
+                { Queue => 0,
+                  ScripCondition => 'OnCorrespond',
+                  ScripAction => 'NotifyOtherRecipients',
+                  Template => 'Correspondence',
+                },
+        );
+}
+# }}}
+
+print "Creating ACL...";
+use RT::ACE;
+for $item (@acl) {
+    my $new_entry = new RT::ACE($CurrentUser);
+
+    #Using an internal function. this should never be used outside of the bootstrap script
+    my $return = $new_entry->_BootstrapRight(%$item);
+    print $return. ".";
+}
+print "done.\n";
+
+print "Creating users...";
+use RT::User;
+foreach $item (@users) {
+    my $new_entry = new RT::User($CurrentUser);
+    my ( $return, $msg ) = $new_entry->Create(%$item);
+    print "(Error: $msg)" unless ($return);
+    print $return. ".";
+}
+print "done.\n";
+
+print "Creating groups...";
+use RT::Group;
+foreach $item (@groups) {
+    my $new_entry = new RT::Group($CurrentUser);
+    my $return    = $new_entry->Create(%$item);
+    print $return. ".";
+}
+print "done.\n";
+
+print "Creating queues...";
+use RT::Queue;
+for $item (@queues) {
+    my $new_entry = new RT::Queue($CurrentUser);
+    my ( $return, $msg ) = $new_entry->Create(%$item);
+    print "(Error: $msg)" unless ($return);
+    print $return. ".";
+}
+
+print "done.\n";
+print "Creating ScripActions...";
+
+use RT::ScripAction;
+for $item (@ScripActions) {
+    my $new_entry = new RT::ScripAction($CurrentUser);
+    my $return    = $new_entry->Create(%$item);
+    print $return. ".";
+}
+
+print "done.\n";
+print "Creating ScripConditions...";
+
+use RT::ScripCondition;
+for $item (@ScripConditions) {
+    my $new_entry = new RT::ScripCondition($CurrentUser);
+    my $return    = $new_entry->Create(%$item);
+    print $return. ".";
+}
+
+print "done.\n";
+
+print "Creating templates...";
+
+use RT::Template;
+for $item (@templates) {
+    my $new_entry = new RT::Template($CurrentUser);
+    my $return    = $new_entry->Create(%$item);
+    print $return. ".";
+}
+print "done.\n";
+
+print "Creating Scrips...";
+
+use RT::Scrip;
+for $item (@scrips) {
+        my $new_entry = RT::Scrip->new($CurrentUser);
+        my ($return,$msg) = $new_entry->Create(%$item);
+        print "(Error: $msg)" unless ($return);
+        print $return.".";
+
+}
+print "done.\n";
+
+$RT::Handle->Disconnect();
+
+1;
+
diff --git a/rt/tools/testdeps b/rt/tools/testdeps
new file mode 100644
index 000000000..ddc338107
--- /dev/null
+++ b/rt/tools/testdeps
@@ -0,0 +1,115 @@
+#!/usr/bin/perl -w
+
+# $Header: /home/cvs/cvsroot/freeside/rt/tools/Attic/testdeps,v 1.1 2002-08-12 06:17:08 ivan Exp $
+
+# Copyright 2000 Jesse Vincent <jesse@fsck.com>
+# Distributed under the GNU General Public License
+# 
+
+#
+# This is just a basic script that checks to make sure that all
+# the modules needed by RT before you can install it.
+#
+
+use strict;
+
+use vars qw($mode $dbd $module @modules);
+
+$mode = shift || print_help();
+$dbd = shift || print_help();
+
+@modules = qw(
+Digest::MD5
+Storable
+DBI 1.18
+DBIx::DataSource 0.02
+DBIx::SearchBuilder 0.48
+HTML::Entities 
+MLDBM
+Net::Domain
+Net::SMTP
+Params::Validate 0.02
+HTML::Mason 1.02
+CGI::Cookie 1.20
+Apache::Cookie
+Apache::Session 1.53
+Date::Parse
+Date::Format 
+MIME::Entity 5.108
+Mail::Mailer 1.20
+Getopt::Long 2.24
+Tie::IxHash 
+Text::Wrapper 
+Text::Template
+File::Spec 0.8
+Errno
+FreezeThaw
+File::Temp 
+Log::Dispatch 1.6
+);
+
+
+if ($dbd =~ /mysql/i) {
+	push @modules, ('DBD::mysql','2.0416'); 
+}
+elsif ($dbd =~ /oracle/i) {
+	push @modules, ('DBD::Oracle','');
+}
+elsif ($dbd =~ /pg/i) {
+	push @modules, ('DBD::Pg','');
+}
+use CPAN;
+
+while ($module= shift @modules) {
+	my $version = "";
+	$version = " ". shift (@modules) . " " if ($modules[0] =~ /^([\d\.]*)$/);
+	print "Checking for $module$version";
+	eval "use $module$version" ;
+	if ($@) {
+	&resolve_dependency($module, $version) 
+	}
+	else {
+	print "...found\n";
+	}
+}
+
+sub print_help {
+print <<EOF;
+
+$0 FLAG DBTYPE
+
+
+$0 is a tool for RT that will tell you if you've got all
+the modules RT depends on properly installed.
+
+Flags: (only one flag is valid for a given run)
+
+-quiet will check to see if we've got everything we need
+	and will exit with a return code of (1) if we don't.
+
+-warn will tell you what isn't properly installed
+
+-fix will use CPAN to magically make everything better
+
+DBTYPE is one of:
+	oracle, pg, mysql
+
+EOF
+
+exit(0);
+}
+
+sub resolve_dependency {
+	my $module = shift;
+	my $version = shift;
+        print "....$module$version not installed.";
+    if ($mode =~ /-f/) {
+	$module = "DBD::mysql::Install" if ($module =~ /DBD::mysql/);
+	
+        print "Installing with CPAN...";
+        CPAN::install($module);
+     }
+     print "\n";
+	exit(1) if ($mode =~ /-q/);
+}	
+	
diff --git a/rt/webrt/Admin/Elements/CreateQueueCalled b/rt/webrt/Admin/Elements/CreateQueueCalled
new file mode 100755
index 000000000..aeed6e786
--- /dev/null
+++ b/rt/webrt/Admin/Elements/CreateQueueCalled
@@ -0,0 +1,3 @@
+<FORM METHOD=get ACTION="<% $RT::WebPath %>/Admin/Queues/Create.html">
+Create a queue called <INPUT NAME="Name" size=10><input type=submit>
+</form>
diff --git a/rt/webrt/Admin/Elements/CreateUserCalled b/rt/webrt/Admin/Elements/CreateUserCalled
new file mode 100755
index 000000000..7e4bb7554
--- /dev/null
+++ b/rt/webrt/Admin/Elements/CreateUserCalled
@@ -0,0 +1,3 @@
+<FORM METHOD=get ACTION="<%$RT::WebPath%>/Admin/Users/Create.html">
+New user called <INPUT NAME="Name" size=10><input type=submit value="Create">
+</form>
diff --git a/rt/webrt/Admin/Elements/EditUserComments b/rt/webrt/Admin/Elements/EditUserComments
new file mode 100755
index 000000000..1ac7e187f
--- /dev/null
+++ b/rt/webrt/Admin/Elements/EditUserComments
@@ -0,0 +1,9 @@
+<& /Elements/Header, Title => "Comments about $name" &>
+These comments aren't generally visible to the user:<br>
+<input type="hidden" name="id" value="<%$id%>">
+<TEXTAREA COLS=60 ROWS=15 WRAP=SOFT NAME="Comments"><% $UserObj->Comments %></TEXTAREA>
+</FORM>
+
+<%ARGS>
+$UserObj => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/GrantQueueRightsTo b/rt/webrt/Admin/Elements/GrantQueueRightsTo
new file mode 100755
index 000000000..3850a18f2
--- /dev/null
+++ b/rt/webrt/Admin/Elements/GrantQueueRightsTo
@@ -0,0 +1,30 @@
+<BR>
+
+% if ($msg) {
+<%$msg%>
+% } elsif ($Users) {
+<ul>
+% while (my $u = $Users->Next ) {
+<li> <%$u->Name%> (<%$u->RealName%>) <& SelectQueueRights, Name => "GrantTo".$u->id &>
+% }
+</ul>
+% }
+
+<%INIT>
+my ($msg, $Users);
+if (!$ARGS{'UserString'}) {
+$msg = "No users selected.";
+ }
+else {
+    $Users = new RT::Users($session{'CurrentUser'});
+    $Users->Limit(FIELD => $ARGS{'UserField'},
+                 VALUE => $ARGS{'UserString'},
+                 OPERATOR => $ARGS{'UserOp'});
+     }
+</%INIT>
+
+<%ARGS>
+$UserField => 'Name'
+$UserOp => '='
+$UserString => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/GroupTabs b/rt/webrt/Admin/Elements/GroupTabs
new file mode 100755
index 000000000..261bef1e2
--- /dev/null
+++ b/rt/webrt/Admin/Elements/GroupTabs
@@ -0,0 +1,18 @@
+<& /Admin/Elements/Tabs, subtabs => $subtabs, current_tab => 'Admin/Groups/' &>
+<hr>
+<%INIT>
+my $subtabs = { 
+             Basics => { title => 'Basics',
+                         path => "Admin/Groups/Modify.html?id=". $GroupObj->id
+                       }
+	};
+
+unless ($GroupObj->Pseudo) {
+$subtabs->{'Members'} = { title => 'Members',
+                         path => "Admin/Groups/Members.html?id=".$GroupObj->id };
+}
+</%INIT>
+
+<%ARGS>
+$GroupObj => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/Header b/rt/webrt/Admin/Elements/Header
new file mode 100755
index 000000000..95acdac7e
--- /dev/null
+++ b/rt/webrt/Admin/Elements/Header
@@ -0,0 +1,5 @@
+<& /Elements/Header, Title => $Title &>
+
+<%ARGS>
+$Title => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/ListGlobalKeywordSelects b/rt/webrt/Admin/Elements/ListGlobalKeywordSelects
new file mode 100644
index 000000000..b24d68989
--- /dev/null
+++ b/rt/webrt/Admin/Elements/ListGlobalKeywordSelects
@@ -0,0 +1,15 @@
+% while (my $KeywordSelect = $KeywordSelects->Next()) {
+
+<%$KeywordSelect->Name %>:
+<% $KeywordSelect->Single ? 'Single' : 'Multiple' %>
+children of
+<% $KeywordSelect->KeywordObj->Path %>
+% if ($KeywordSelect->Depth) {
+	  up to <%$KeywordSelect->Depth%> levels deep
+% }
+<BR>
+%} 
+<%INIT>
+my $KeywordSelects = RT::KeywordSelects->new($session{'CurrentUser'});
+$KeywordSelects->LimitToGlobals();
+</%INIT>
diff --git a/rt/webrt/Admin/Elements/ListGlobalScrips b/rt/webrt/Admin/Elements/ListGlobalScrips
new file mode 100755
index 000000000..2f044bf52
--- /dev/null
+++ b/rt/webrt/Admin/Elements/ListGlobalScrips
@@ -0,0 +1,10 @@
+%  while (my $scrip = $Scrips->Next ) {
+<% $scrip->ConditionObj->Name %> 
+<% $scrip->ActionObj->Name %> 
+with template <% $scrip->TemplateObj->Name %>
+<BR>
+%   }
+<%init>
+my $Scrips = new RT::Scrips ($session{'CurrentUser'});
+$Scrips->LimitToGlobal();
+</%INIT>
diff --git a/rt/webrt/Admin/Elements/ModifyKeyword b/rt/webrt/Admin/Elements/ModifyKeyword
new file mode 100644
index 000000000..4b01c3692
--- /dev/null
+++ b/rt/webrt/Admin/Elements/ModifyKeyword
@@ -0,0 +1,95 @@
+<FORM METHOD="get" ACTION="<%$RT::WebPath%>/Admin/Keywords/Modify.html">
+[<%$title |n %>]<BR>
+
+<INPUT TYPE="hidden" NAME="id" VALUE="<% $id %>">
+Keyword <INPUT NAME="Name" VALUE="<% $Keyword->Name %>"><BR>
+
+Parent <SELECT NAME="Parent">
+	      <OPTION VALUE=""<% defined($Keyword->Parent) ? '' : ' SELECTED' %>>-</OPTION>
+%while ( $parent = $parents->Next ) {
+	      <OPTION VALUE="<% $parent->id %>"<% defined($Keyword->Parent) && $parent->id == $Keyword->Parent ? ' SELECTED' : '' %>><% $parent->Name %></OPTION>
+%}
+</SELECT>
+
+
+Kids <FONT SIZE="-2">(separate by
+<INPUT TYPE="radio" NAME="delim" VALUE="n"<% $delim eq 'n' ? ' CHECKED' : '' %>>
+line or
+<INPUT TYPE="radio" NAME="delim" VALUE="s"<% $delim eq 's' ? ' CHECKED' : '' %>>
+whitespace)</FONT><BR>
+
+<TEXTAREA NAME="Kids" ROWS=4><% $kidstring %></TEXTAREA>
+<BR>
+
+<& /Elements/Submit, Label => $submit &>
+</FORM>
+
+<%INIT>
+
+my $Keyword = new RT::Keyword($session{CurrentUser});
+my ($title, $submit, %kids, $kid);
+
+if ( $Create ) {
+    $title = "Create a new Keyword";
+    $submit = "Create";
+    $id = "new";
+    %kids = ();
+    $Parent = ''; #silence 
+} elsif ( $id eq 'new' ) {
+    $id = $Keyword->Create( Name => $Name, Parent => $Parent )
+      or Abort("can't create keyword Name=>$Name, Parent=>$Parent");
+} else {
+    $Keyword->Load($id) || Abort("Can't load keyword id $id");
+    #foreach my $field ( grep eval "defined(\$$_)", qw( Name Parent )) {
+    #  eval "\$Keyword->Set(\$field=>\$$field); #sigh
+    #}
+    $Keyword->SetName($Name) if defined($Name);
+    $Keyword->SetParent($Parent) if defined($Parent);
+}
+
+$title = "Modify the Keyword <B>". $Keyword->Name. "</B>";
+$submit = "Modify";
+
+my $kids = new RT::Keywords($session{CurrentUser});
+$kids->Limit( FIELD => 'Parent', VALUE => $id, OPERATOR => '=' );
+$kids{$kid->Name} = $kid while $kid = $kids->Next;
+
+if ( defined($Kids) ) {
+    my %newkids;
+    if ( $delim eq 'n' ) {
+	%newkids = map { $_=>1 } split(/\n/, $Kids);
+    } elsif ( $delim eq 's' ) {
+	%newkids = map { $_=>1 } split(' ', $Kids);
+    } else {
+	Abort("'$delim' isn't a valid keyword delimiter.");
+    }
+    foreach ( grep { ! defined($newkids{$_}) } keys %kids ) {
+	$kids{$_}->Delete;
+	delete $kids{$_};
+    }
+    foreach ( grep { ! defined($kids{$_}) } keys %newkids ) {
+	$kids{$_} = new RT::Keyword($session{CurrentUser});
+	$kids{$_}->Create( Name => $_, Parent => $id )
+	  or Abort("can't create keyword Name=>$_, Parent=>$id");
+    }
+
+}
+
+
+my $parent;
+my $parents = new RT::Keywords($session{CurrentUser});
+$parents->UnLimit;
+
+$delim = ( grep /\s/, keys %kids ) ? 'n' : 's';
+my $kidstring = join("\n", keys %kids);
+
+</%INIT>
+
+<%ARGS>
+$id => undef
+$Create => undef
+$Name => undef
+$Parent => undef
+$Kids => undef
+$delim => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/ModifyKeywordSelect b/rt/webrt/Admin/Elements/ModifyKeywordSelect
new file mode 100644
index 000000000..470e62929
--- /dev/null
+++ b/rt/webrt/Admin/Elements/ModifyKeywordSelect
@@ -0,0 +1,120 @@
+  <FORM NAME="ModifyKeywordSelect" METHOD=POST ACTION="<%$RT::WebPath%>/Admin/KeywordSelects/Modify.html">
+
+    [<%$title |n %>]
+    <BR>
+      
+      <INPUT TYPE="hidden" NAME="id" VALUE="<% $id %>">
+	Keyword 
+	<SELECT NAME="Parent">
+	  
+%while ( $parent = $parents->Next ) {
+	  
+	  <OPTION VALUE="<% $parent->id %>" <% defined($KeywordSelect->Parent) && $parent->id == $KeywordSelect->Parent ? ' SELECTED' : '' %>><% $parent->Name %></OPTION>
+	  
+% }
+	  
+	</SELECT>
+	<BR>
+	  Object 
+	  <SELECT NAME="ObjectType">
+	    <OPTION SELECTED>Ticket</OPTION>
+	  </SELECT>
+	  <BR>
+	    
+<SCRIPT>
+function addOption(text, value, defaultselected, selected) {
+  var option = new Option(text, value, defaultselected, selected )
+  var length = document.ModifyKeywordSelect.ObjectValue.length;
+  document.ModifyKeywordSelect.ObjectValue.options[length] = option
+}
+function ChangeObjectValue(what) {
+  Value = what.options[what.selectedIndex].value
+  if ( Value == "(none)" ) {
+    document.ModifyKeywordSelect.ObjectValue.options.length = 0
+    addOption("(n/a)", "", false, false)
+  }
+  if ( Value == "Queue" ) {
+    document.ModifyKeywordSelect.ObjectValue.options.length = 0
+%foreach $queue ( keys %queues ) {
+    addOption("<% $queues{$queue} %>", "<% $queue %>", false, <% $queue == $KeywordSelect->ObjectValue ? 'true' : 'false' %> )
+%}
+  }
+}
+</SCRIPT>
+	    
+	    Limit to <SELECT NAME="ObjectField" onChange="ChangeObjectValue(this)">
+	      <OPTION VALUE="" <% $KeywordSelect->ObjectField ? '' : ' SELECTED' %>>(none)</OPTION>
+	      <OPTION VALUE="Queue" <% $KeywordSelect->ObjectField eq 'Queue' ? ' SELECTED' : '' %>>Queue</OPTION>
+	    </SELECT> 
+	    <SELECT NAME="ObjectValue">
+	      <OPTION VALUE="<% $KeywordSelect->ObjectValue %>">
+		<% $KeywordSelect->ObjectField ? $queues{$KeywordSelect->ObjectValue} : "(n/a)" %></OPTION>
+	    </SELECT><BR>
+	      <INPUT TYPE="hidden" NAME="SingleMagic" VALUE="1">
+		<INPUT TYPE="checkbox" NAME="Single" VALUE="1" <% $KeywordSelect->Single ? ' CHECKED' : '' %>>Allow single selection only<BR>
+		    Limit to <INPUT TYPE="text" NAME="Generations" SIZE="2" VALUE="<% $KeywordSelect->Generations %>"> generations (0 = no limit)<BR>
+			<& /Elements/Submit, Label => $submit &>
+
+</FORM>
+
+<%INIT>
+
+
+my $KeywordSelect = new RT::KeywordSelect($session{CurrentUser});
+  
+my($title, $submit);
+  
+if ( $Create ) {
+      $title = "Create a new KeywordSelect";
+      $submit = "Create";
+      $id = "new";
+} else {
+    if  ( $id eq 'new' ) {
+	$id = $KeywordSelect->Create (
+				      Parent      => $Parent,
+				      ObjectType  => $ObjectType,
+				      ObjectField => $ObjectField,
+				      ObjectValue => $ObjectValue,
+				      Single      => $Single,
+				      Generations => $Generations,
+				     ) or Abort "can't create KeywordSelect";
+    } else {
+	$KeywordSelect->Load($id) || Abort("Can't load keyword id $id");
+	#false laziness
+	$KeywordSelect->SetParent($Parent) if defined($Parent);
+	$KeywordSelect->SetObjectType($ObjectType) if defined($ObjectType);
+	$KeywordSelect->SetObjectField($ObjectField) if defined($ObjectField);
+	$KeywordSelect->SetObjectValue($ObjectValue) if defined($ObjectValue);
+	$KeywordSelect->SetSingle($Single) if defined($SingleMagic);
+	$KeywordSelect->SetGenerations($Generations) if defined($Generations);
+    }
+    $title = "Modify the KeywordSelect <B>". $KeywordSelect->KeywordObj->Name. "</B>";
+    $submit = "Modify";
+    
+}
+  
+  my $parents = new RT::Keywords($session{CurrentUser});
+  $parents->UnLimit;
+  my $parent;
+
+my $queues = new RT::Queues($session{CurrentUser});
+$queues->UnLimit;
+
+my %queues;
+my $queue;
+$queues{$queue->id} = $queue->Name while $queue = $queues->Next;
+
+</%INIT>
+
+<%ARGS>
+$id => undef
+$Create => undef
+$Parent => undef
+$ObjectType => undef
+$ObjectField => undef
+$ObjectValue => undef
+$Single => undef
+$SingleMagic => undef
+$Generations => undef
+</%ARGS>
+
diff --git a/rt/webrt/Admin/Elements/ModifyQueue b/rt/webrt/Admin/Elements/ModifyQueue
new file mode 100755
index 000000000..a641c81af
--- /dev/null
+++ b/rt/webrt/Admin/Elements/ModifyQueue
@@ -0,0 +1,56 @@
+
+<& /Elements/TitleBoxStart, title => 'Editing Configuration for queue '.$QueueObj->Id &>
+
+<FORM ACTION="<%$RT::WebPath%>/Admin/Queues/Modify.html" METHOD=POST>
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$QueueObj->Id%>">
+<TABLE>
+<TR><TD ALIGN=RIGHT>
+Queue Name: 
+</TD>
+<TD><INPUT name="Name" value="<%$QueueObj->Name%>"></TD>
+</TR><TR>
+<TD ALIGN=RIGHT>
+Description:</TD><TD COLSPAN=3><INPUT name="Description" value="<%$QueueObj->Description%>" size=60></TD></TR>
+<TR>
+<TD ALIGN=RIGHT>
+Correspondence Address:
+</TD><TD>
+<INPUT name="CorrespondAddress" value="<%$QueueObj->CorrespondAddress%>">
+</TD>
+<TD ALIGN=RIGHT>
+
+Comment Address: </TD><TD>
+<INPUT NAME="CommentAddress" value="<%$QueueObj->CommentAddress%>">
+</TD>
+</TR><TR>
+
+<TD ALIGN=RIGHT>
+Priority starts at: 
+</TD><TD><INPUT NAME="InitialPriority" value="<%$QueueObj->InitialPriority %>">
+</TD>
+<TD ALIGN=RIGHT>
+Over time, priority moves toward:
+</TD><TD><INPUT NAME="FinalPriority" value="<%$QueueObj->FinalPriority %>">
+</TD>
+</TR>
+<TR>
+<TD ALIGN=RIGHT>
+Requests should be due in:
+</TD><TD>
+<INPUT NAME="DefaultDueIn" VALUE="<%$QueueObj->DefaultDueIn%>"> days.
+</TD>
+</TR>
+</TABLE>
+<& /Elements/Submit &>
+</form>
+<& /Elements/TitleBoxEnd &>
+
+<%INIT>
+
+</%INIT>
+
+<%ARGS>
+
+
+$QueueObj => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/ModifyTemplate b/rt/webrt/Admin/Elements/ModifyTemplate
new file mode 100755
index 000000000..6e4f8a379
--- /dev/null
+++ b/rt/webrt/Admin/Elements/ModifyTemplate
@@ -0,0 +1,78 @@
+
+<& /Elements/TitleBoxStart, title => 'Editing Configuration for user '.$UserObj->Name &>
+
+<FORM ACTION="<%$RT::WebPath%>/Admin/ModifyUser.html" METHOD=POST>
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$UserObj->Id%>">
+
+Name: <input name="Name" value="<%$UserObj->Name%>">
+<BR>
+New Password: <input type=password name="Pass1"><BR>
+Retype Password: <input type=password name="Pass2"><BR>
+
+Comments: <TEXTAREA name="Comments" COLS=20 ROWS=5>
+<%$UserObj->Comments%></TEXTAREA>
+
+<BR>
+Signature: <TEXTAREA COLS=80 ROWS=5 name="Signature">
+<%$UserObj->Signature%>"></TEXTAREA>
+<BR>
+EmailAddress: <input name="EmailAddress" value="<%$UserObj->EmailAddress%>">
+<BR>
+FreeformContactInfo: <input name="FreeformContactInfo" value="<%$UserObj->FreeformContactInfo%>">
+<BR>
+Organization: <input name="Organization" value="<%$UserObj->Organization%>">
+<BR>
+RealName: <input name="RealName" value="<%$UserObj->RealName%>">
+<BR>
+NickName: <input name="NickName" value="<%$UserObj->NickName%>">
+<BR>
+Lang: <input name="Lang" value="<%$UserObj->Lang%>">
+<BR>
+EmailEncoding: <input name="EmailEncoding" value="<%$UserObj->EmailEncoding%>">
+<BR>
+WebEncoding: <input name="WebEncoding" value="<%$UserObj->WebEncoding%>">
+<BR>
+ExternalContactInfoId: <input name="ExternalContactInfoId" value="<%$UserObj->ExternalContactInfoId%>">
+<BR>
+ContactInfoSystem: <input name="ContactInfoSystem" value="<%$UserObj->ContactInfoSystem%>">
+<BR>
+Gecos: <input name="Gecos" value="<%$UserObj->Gecos%>">
+<BR>
+ExternalAuthId: <input name="ExternalAuthId" value="<%$UserObj->ExternalAuthId%>">
+<BR>
+AuthSystem: <input name="AuthSystem" value="<%$UserObj->AuthSystem%>">
+<BR>
+HomePhone: <input name="HomePhone" value="<%$UserObj->HomePhone%>">
+<BR>
+WorkPhone: <input name="WorkPhone" value="<%$UserObj->WorkPhone%>">
+<BR>
+MobilePhone: <input name="MobilePhone" value="<%$UserObj->MobilePhone%>">
+<BR>
+PagerPhone: <input name="PagerPhone" value="<%$UserObj->PagerPhone%>">
+<BR>
+Address1: <input name="Address1" value="<%$UserObj->Address1%>">
+<BR>
+Address2: <input name="Address2" value="<%$UserObj->Address2%>">
+<BR>
+City: <input name="City" value="<%$UserObj->City%>">
+<BR>
+State: <input name="State" value="<%$UserObj->State%>">
+<BR>
+Zip: <input name="Zip" value="<%$UserObj->Zip%>">
+<BR>
+Country: <input name="Country" value="<%$UserObj->Country%>">
+<BR>
+
+<input type=submit>
+</form>
+<& /Elements/TitleBoxEnd &>
+
+<%INIT>
+
+</%INIT>
+
+<%ARGS>
+
+
+$UserObj => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/ModifyUser b/rt/webrt/Admin/Elements/ModifyUser
new file mode 100755
index 000000000..53aa027c0
--- /dev/null
+++ b/rt/webrt/Admin/Elements/ModifyUser
@@ -0,0 +1,77 @@
+
+<& /Elements/TitleBoxStart, title => 'Editing Configuration for user '.$UserObj->Name &>
+
+<FORM ACTION="<%$RT::WebPath%>/Admin/Users/Modify.html" METHOD=POST>
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$UserObj->Id%>">
+
+Name: <input name="Name" value="<%$UserObj->Name%>">
+<BR>
+New Password: <input type=password name="Pass1"><BR>
+Retype Password: <input type=password name="Pass2"><BR>
+
+Comments: <TEXTAREA name="Comments" COLS=80 ROWS=5 WRAP=VIRTUAL>
+<%$UserObj->Comments%></TEXTAREA>
+
+<BR>
+Signature: <TEXTAREA COLS=80 ROWS=5 name="Signature" WRAP=HARD>
+<%$UserObj->Signature%></TEXTAREA>
+<BR>
+EmailAddress: <input name="EmailAddress" value="<%$UserObj->EmailAddress%>">
+<BR>
+FreeformContactInfo: <input name="FreeformContactInfo" value="<%$UserObj->FreeformContactInfo%>">
+<BR>
+Organization: <input name="Organization" value="<%$UserObj->Organization%>">
+<BR>
+RealName: <input name="RealName" value="<%$UserObj->RealName%>">
+<BR>
+NickName: <input name="NickName" value="<%$UserObj->NickName%>">
+<BR>
+Lang: <input name="Lang" value="<%$UserObj->Lang%>">
+<BR>
+EmailEncoding: <input name="EmailEncoding" value="<%$UserObj->EmailEncoding%>">
+<BR>
+WebEncoding: <input name="WebEncoding" value="<%$UserObj->WebEncoding%>">
+<BR>
+ExternalContactInfoId: <input name="ExternalContactInfoId" value="<%$UserObj->ExternalContactInfoId%>">
+<BR>
+ContactInfoSystem: <input name="ContactInfoSystem" value="<%$UserObj->ContactInfoSystem%>">
+<BR>
+Gecos: <input name="Gecos" value="<%$UserObj->Gecos%>">
+<BR>
+ExternalAuthId: <input name="ExternalAuthId" value="<%$UserObj->ExternalAuthId%>">
+<BR>
+AuthSystem: <input name="AuthSystem" value="<%$UserObj->AuthSystem%>">
+<BR>
+HomePhone: <input name="HomePhone" value="<%$UserObj->HomePhone%>">
+<BR>
+WorkPhone: <input name="WorkPhone" value="<%$UserObj->WorkPhone%>">
+<BR>
+MobilePhone: <input name="MobilePhone" value="<%$UserObj->MobilePhone%>">
+<BR>
+PagerPhone: <input name="PagerPhone" value="<%$UserObj->PagerPhone%>">
+<BR>
+Address1: <input name="Address1" value="<%$UserObj->Address1%>">
+<BR>
+Address2: <input name="Address2" value="<%$UserObj->Address2%>">
+<BR>
+City: <input name="City" value="<%$UserObj->City%>">
+<BR>
+State: <input name="State" value="<%$UserObj->State%>">
+<BR>
+Zip: <input name="Zip" value="<%$UserObj->Zip%>">
+<BR>
+Country: <input name="Country" value="<%$UserObj->Country%>">
+<BR>
+<& /Elements/Submit &>
+</form>
+<& /Elements/TitleBoxEnd &>
+
+<%INIT>
+
+</%INIT>
+
+<%ARGS>
+
+
+$UserObj => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/QueueRightsForUser b/rt/webrt/Admin/Elements/QueueRightsForUser
new file mode 100644
index 000000000..e62a124ce
--- /dev/null
+++ b/rt/webrt/Admin/Elements/QueueRightsForUser
@@ -0,0 +1,17 @@
+<UL>
+%while(my $ACE = $ACL->Next) {
+
+<LI><checkbox name="delete_ace_<%$ACE->id%>"> <%$ACE->RightName%> (<%$ACE->UserObj->RealName%>)
+
+%}
+</UL>
+
+<%INIT>
+my $ACL = new RT::ACL($session{'CurrentUser'});
+$ACL->LimitToQueue($QueueObj->id);
+$ACL->LimitPrincipalToUser($PrincipalId);
+</%INIT>
+<%ARGS>
+$PrincipalId => undef
+$QueueObj => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/QueueTabs b/rt/webrt/Admin/Elements/QueueTabs
new file mode 100755
index 000000000..b7da7e007
--- /dev/null
+++ b/rt/webrt/Admin/Elements/QueueTabs
@@ -0,0 +1,36 @@
+<& /Admin/Elements/Tabs, subtabs => $subtabs, current_tab => 'Admin/Queues/' &>
+<hr>
+<%INIT>
+  my $subtabs = {
+		 A => { title => 'Basics',
+  		     	path => "Admin/Queues/Modify.html?id=".$id,
+			   },
+		 B => { title => 'Watchers',
+		 	path => "Admin/Queues/People.html?id=".$id,
+		      },
+
+		 C => { title => 'Scrips',
+			     path => "Admin/Queues/Scrips.html?id=".$id,
+			   },
+		 D => { title => 'Templates',
+				path => "Admin/Queues/Templates.html?id=".$id,
+			      },
+		 E => { title => 'Keyword Selections',
+				path => "Admin/Queues/Keywords.html?id=".$id,
+			},
+		 F => { title => 'Group Rights',
+			  path => "Admin/Queues/GroupRights.html?id=".$id,
+			},	
+		 G => { title => 'User Rights',
+			  path => "Admin/Queues/UserRights.html?id=".$id,
+			},
+
+
+		 
+};
+</%INIT>
+
+  
+<%ARGS>
+$id => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectKeywordSelect b/rt/webrt/Admin/Elements/SelectKeywordSelect
new file mode 100644
index 000000000..f5a8d77cd
--- /dev/null
+++ b/rt/webrt/Admin/Elements/SelectKeywordSelect
@@ -0,0 +1,22 @@
+<input size=10 name="<%$NamePrefix%>-Name" value="<% $KeywordSelect->Name %>">:
+<& /Admin/Elements/SelectSingleOrMultiple, 
+	  Name => $NamePrefix.'-Single',
+	  Default => $KeywordSelect->Single &>
+	  
+children of
+<& /Elements/SelectKeyword, Root => '0', 
+	                    Name => $NamePrefix.'-Keyword',
+                            Default => $KeywordSelect->KeywordObj->Id &>
+	  up to <input name="<%$NamePrefix%>-Depth" size=2 value="<%$KeywordSelect->Depth%>"> levels deep.
+<%INIT>
+unless ($NamePrefix) {
+	$NamePrefix = $KeywordSelect->Id;
+}
+$NamePrefix = "KeywordSelect-$NamePrefix";
+
+</%INIT>
+
+<%ARGS>
+$KeywordSelect => undef
+$NamePrefix => undef
+</%ARGS>
\ No newline at end of file
diff --git a/rt/webrt/Admin/Elements/SelectModifyGroup b/rt/webrt/Admin/Elements/SelectModifyGroup
new file mode 100644
index 000000000..45d437f41
--- /dev/null
+++ b/rt/webrt/Admin/Elements/SelectModifyGroup
@@ -0,0 +1,10 @@
+%while ( $Group = $Groups->Next) {
+<A HREF="Modify.html?id=<%$Group->id%>"><%$Group->id%>: <%$Group->Name%></a><BR>
+%}
+<%INIT>
+my ($Group);
+my $Groups = new RT::Groups($session{'CurrentUser'});
+$Groups->UnLimit;
+</%INIT>
+<%ARGS>
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectModifyKeyword b/rt/webrt/Admin/Elements/SelectModifyKeyword
new file mode 100644
index 000000000..6af223229
--- /dev/null
+++ b/rt/webrt/Admin/Elements/SelectModifyKeyword
@@ -0,0 +1,13 @@
+%while ( $keyword = $keywords->Next ) {
+<A HREF="/Admin/Keywords/Modify.html?id=<%$keyword->id%>"><%$keyword->id%>: <%$keyword->Name%></a><BR>
+%}
+
+<%INIT>
+
+use RT::Keywords;
+
+my $keyword;
+my $keywords = new RT::Keywords $session{CurrentUser};
+$keywords->UnLimit;
+</%INIT>
+
diff --git a/rt/webrt/Admin/Elements/SelectModifyKeywordSelect b/rt/webrt/Admin/Elements/SelectModifyKeywordSelect
new file mode 100644
index 000000000..c91eb6cfe
--- /dev/null
+++ b/rt/webrt/Admin/Elements/SelectModifyKeywordSelect
@@ -0,0 +1,13 @@
+%while ( $keywordselect = $keywordselects->Next ) {
+<A HREF="/Admin/KeywordSelects/Modify.html?id=<%$keywordselect->id%>"><%$keywordselect->id%>: ( <%$keywordselect->Parent%>: <%$keywordselect->KeywordObj->Name%> )</a><BR>
+%}
+
+<%INIT>
+
+use RT::KeywordSelects;
+
+my $keywordselect;
+my $keywordselects = new RT::KeywordSelects $session{CurrentUser};
+$keywordselects->UnLimit;
+</%INIT>
+
diff --git a/rt/webrt/Admin/Elements/SelectModifyQueue b/rt/webrt/Admin/Elements/SelectModifyQueue
new file mode 100755
index 000000000..1c6cd7d5e
--- /dev/null
+++ b/rt/webrt/Admin/Elements/SelectModifyQueue
@@ -0,0 +1,10 @@
+%while ( $queue = $queues->Next) {
+<A HREF="Modify.html?id=<%$queue->id%>"><%$queue->id%>: <%$queue->Name%></a><BR>
+%}
+<%INIT>
+my ($queue);
+my $queues = new RT::Queues($session{'CurrentUser'});
+$queues->UnLimit;
+</%INIT>
+<%ARGS>
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectModifyUser b/rt/webrt/Admin/Elements/SelectModifyUser
new file mode 100755
index 000000000..da49212e4
--- /dev/null
+++ b/rt/webrt/Admin/Elements/SelectModifyUser
@@ -0,0 +1,26 @@
+%while ( $user = $users->Next) {
+<A HREF="Modify.html?id=<%$user->id%>"><%$user->id%>: <%$user->Name%></a><BR>
+%}
+<%INIT>
+my ($user);
+my $users = new RT::Users($session{'CurrentUser'});
+$users->Limit(FIELD => 'id',
+              VALUE => $RT::SystemUser->id,
+              OPERATOR => '!=' );
+
+if (defined $IdLike) {
+$users->Limit(FIELD => 'Name',
+              VALUE => $IdLike,
+              OPERATOR => 'LIKE' );
+}
+if (defined $EmailLike) {
+$users->Limit(FIELD => 'EmailAddress',
+              VALUE => $EmailLike,
+              OPERATOR => 'LIKE');
+
+}
+</%INIT>
+<%ARGS>
+$IdLike => undef
+$EmailLike => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectQueueRights b/rt/webrt/Admin/Elements/SelectQueueRights
new file mode 100755
index 000000000..6861d40c6
--- /dev/null
+++ b/rt/webrt/Admin/Elements/SelectQueueRights
@@ -0,0 +1,29 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Admin/Elements/Attic/SelectQueueRights,v 1.1 2002-08-12 06:17:08 ivan Exp $
+
+<SELECT NAME ="<%$Name%>">
+<OPTION VALUE="">-</OPTION>
+%foreach $right (@rights) {
+<OPTION VALUE="<%$right%>" <%($Default eq $right) && 'SELECTED'%>><%$right%></OPTION>
+% }
+</SELECT>
+<%ONCE>
+
+use RT::ACE;
+my $ACE = new RT::ACE($session{'CurrentUser'});
+my %QueueRights = $ACE->QueueRights;
+my %TicketRights = $ACE->TicketRights;
+
+my ($key, $right, @rights);
+
+foreach $key (sort keys %QueueRights) {
+push (@rights, $QueueRights{$key} . " ($key)");
+}
+foreach $key (sort keys %TicketRights) {
+push (@rights, $TicketRights{$key} . " ($key)");
+}
+</%ONCE>
+<%ARGS>
+$Name => undef
+$Default => undef
+ 
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectRights b/rt/webrt/Admin/Elements/SelectRights
new file mode 100644
index 000000000..0ac774985
--- /dev/null
+++ b/rt/webrt/Admin/Elements/SelectRights
@@ -0,0 +1,58 @@
+<INPUT TYPE=HIDDEN NAME="CheckACL"  VALUE="<%$ACLDesc%>">
+     <TABLE BORDER=0>
+<TR>
+<TD valign=top>
+<h3>New rights</h3> 
+<SELECT SIZE=5  MULTIPLE  NAME="GrantACE-<%$ACLDesc%>">
+% foreach $right (sort keys %Rights) {
+      <OPTION VALUE="<%$right%>"  
+	><%$right%></OPTION>
+% }
+<OPTION VALUE="" SELECTED>(no value)</OPTION>
+</SELECT>
+</TD>
+<TD valign=top> 
+<h3>Current rights</h3>
+<i>(Check box to revoke right)</i> <BR>
+% while (my $right = $ACLObj->Next()) {
+% if ($right->RightName) {
+<input type=checkbox value="<%$right->Id%>" name="RevokeACE"> <%$right->RightName%><br>
+% }
+%  }
+</TD>
+</TR>
+</TABLE>
+<%INIT>
+    my ($right, $ACLDesc, $AppliesTo, %Rights);
+   
+       
+    my $ACLObj = new RT::ACL($session{'CurrentUser'});
+    my $ACE = new RT::ACE($session{'CurrentUser'});
+
+    if ($Scope eq 'Queue') { 
+        $AppliesTo = $QueueObj->Id;
+        $ACLObj->LimitToQueue($AppliesTo);
+        %Rights = $ACE->QueueRights();
+    } 
+    elsif ($Scope eq 'System') {
+        $AppliesTo = 0;
+        $ACLObj->LimitToSystem();
+        %Rights =  ( $ACE->SystemRights , $ACE->QueueRights());
+    }
+
+    if ($PrincipalType eq 'Group') {
+        $ACLObj->LimitPrincipalToGroup($PrincipalObj->Id);
+    } 
+    elsif ($PrincipalType eq 'User') {
+        $ACLObj->LimitPrincipalToUser($PrincipalObj->Id);
+    } 
+    
+    $ACLDesc = "$PrincipalType-".$PrincipalObj->Id."-$Scope-$AppliesTo";
+</%INIT>
+    
+<%ARGS>
+$PrincipalType => undef
+$PrincipalObj => undef
+$Scope => undef
+$QueueObj => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectScrip b/rt/webrt/Admin/Elements/SelectScrip
new file mode 100755
index 000000000..4ae15d8c3
--- /dev/null
+++ b/rt/webrt/Admin/Elements/SelectScrip
@@ -0,0 +1,25 @@
+<SELECT NAME=<%$Name%>>
+<OPTION VALUE="" 
+<% $Default eq undef && 'SELECTED' %>
+>-</OPTION>
+%while  (my $Scrip = $Scrips->Next) {
+<OPTION VALUE=<%$Scrip->Id%>
+<% $Scrip->Id == $Default && 'SELECTED' %>
+><%$Scrip->Name%>
+</OPTION>
+%}
+</SELECT>
+
+<%INIT>
+my $Scrips = RT::Scrips->new($session{'CurrentUser'});
+$Scrips->UnLimit;
+
+
+
+</%INIT>
+<%ARGS>
+
+$Default => undef
+$Name => 'Scrip'
+
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectScripAction b/rt/webrt/Admin/Elements/SelectScripAction
new file mode 100644
index 000000000..08a173493
--- /dev/null
+++ b/rt/webrt/Admin/Elements/SelectScripAction
@@ -0,0 +1,25 @@
+<SELECT NAME=<%$Name%>>
+<OPTION VALUE="" 
+<% $Default eq undef && 'SELECTED' %>
+>-</OPTION>
+%while  (my $ScripAction = $ScripActions->Next) {
+<OPTION VALUE=<%$ScripAction->Id%>
+<% $ScripAction->Id == $Default && 'SELECTED' %>
+><%$ScripAction->Name%>
+</OPTION>
+%}
+</SELECT>
+
+<%INIT>
+my $ScripActions = RT::ScripActions->new($session{'CurrentUser'});
+$ScripActions->UnLimit;
+
+
+
+</%INIT>
+<%ARGS>
+
+$Default => undef
+$Name => 'ScripAction'
+
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectScripCondition b/rt/webrt/Admin/Elements/SelectScripCondition
new file mode 100644
index 000000000..434f0c4ae
--- /dev/null
+++ b/rt/webrt/Admin/Elements/SelectScripCondition
@@ -0,0 +1,25 @@
+<SELECT NAME=<%$Name%>>
+<OPTION VALUE="" 
+<% $Default eq undef && 'SELECTED' %>
+>-</OPTION>
+%while  (my $ScripCondition = $ScripConditions->Next) {
+<OPTION VALUE=<%$ScripCondition->Id%>
+<% $ScripCondition->Id == $Default && 'SELECTED' %>
+><%$ScripCondition->Name%>
+</OPTION>
+%}
+</SELECT>
+
+<%INIT>
+my $ScripConditions = RT::ScripConditions->new($session{'CurrentUser'});
+$ScripConditions->UnLimit;
+
+
+
+</%INIT>
+<%ARGS>
+
+$Default => undef
+$Name => 'ScripCondition'
+
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectSingleOrMultiple b/rt/webrt/Admin/Elements/SelectSingleOrMultiple
new file mode 100644
index 000000000..307b0211c
--- /dev/null
+++ b/rt/webrt/Admin/Elements/SelectSingleOrMultiple
@@ -0,0 +1,20 @@
+  <select name="<%$Name%>">
+    <option value="1" <%$SingleDefault%>>Single</option>
+    <option value="0" <%$MultipleDefault%>>Multiple</option>
+  </select>	
+
+
+<%INIT>
+my ($SingleDefault, $MultipleDefault);
+if ($Default == 1) {
+    $SingleDefault = "SELECTED";
+}
+elsif ($Default == 0 ) {
+    $MultipleDefault = "SELECTED";
+}
+
+</%INIT>
+<%ARGS>
+$Name => 'Single'
+$Default => 1
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectTemplate b/rt/webrt/Admin/Elements/SelectTemplate
new file mode 100755
index 000000000..76550dc4e
--- /dev/null
+++ b/rt/webrt/Admin/Elements/SelectTemplate
@@ -0,0 +1,37 @@
+<SELECT NAME=<%$Name%>>
+<OPTION VALUE="" 
+<% $Default eq 'none' && 'SELECTED' %>
+>-</OPTION>
+%while  (my $Template = $PrimaryTemplates->Next) {
+<OPTION VALUE=<%$Template->Id%>
+<% ($Template->Id == $Default) && 'SELECTED' %>
+><%$Template->Name%>
+</OPTION>
+%}
+%while  (my $Template = $OtherTemplates->Next) {
+<OPTION VALUE=<%$Template->Id%>
+<% ($Template->Id == $Default)  && 'SELECTED'%>
+>Global template: <%$Template->Name%>
+</OPTION>
+%}
+</SELECT>
+
+<%INIT>
+
+
+my $PrimaryTemplates = RT::Templates->new($session{'CurrentUser'});
+if ($DefaultQueue != 0) {
+$PrimaryTemplates->LimitToQueue($DefaultQueue);
+}
+
+my $OtherTemplates = RT::Templates->new($session{'CurrentUser'});
+$OtherTemplates->LimitToGlobal($DefaultQueue);
+
+</%INIT>
+<%ARGS>
+
+$Default => 'none'
+$DefaultQueue => undef
+$Name => 'Template'
+
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectUsers b/rt/webrt/Admin/Elements/SelectUsers
new file mode 100644
index 000000000..af51c60f9
--- /dev/null
+++ b/rt/webrt/Admin/Elements/SelectUsers
@@ -0,0 +1,17 @@
+<SELECT MULTIPLE NAME="<%$Name%>"  SIZE=10>
+%while (my $user = $users->Next) {
+<OPTION VALUE="<%$user->id%>"><%$user->Name%>
+%}
+</SELECT>
+
+<%INIT>
+my $users = new RT::Users($session{'CurrentUser'});
+
+$users->Limit(FIELD => 'id', VALUE => $RT::SystemUser->id, OPERATOR => '!=' );
+$users->Limit(FIELD => 'id', VALUE => $RT::Nobody->id, OPERATOR => '!=' );
+$users->LimitToPrivileged();
+
+</%INIT>
+<%ARGS>
+$Name => 'Users'
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SystemTabs b/rt/webrt/Admin/Elements/SystemTabs
new file mode 100755
index 000000000..f8b23128b
--- /dev/null
+++ b/rt/webrt/Admin/Elements/SystemTabs
@@ -0,0 +1,31 @@
+<& /Admin/Elements/Tabs, subtabs => $subtabs, current_tab => 'Admin/Global/', current_subtab => $current_subtab &>
+<hr>
+<%INIT>
+  my $subtabs = {
+		
+	       A => { title => 'Scrips',
+			   path => 'Admin/Global/Scrips.html',
+			 },
+	       Ba => { title => 'Keyword Selections',		
+			        path => 'Admin/Global/Keywords.html',
+		      },
+
+	       B => { title => 'Templates',
+			path => 'Admin/Global/Templates.html',
+		      },
+	        C => { title => 'Group Rights',
+			        path => 'Admin/Global/GroupRights.html',
+		      },
+	        D => { title => 'User Rights',
+			        path => 'Admin/Global/UserRights.html',
+		      }
+
+
+};
+</%INIT>
+
+  
+<%ARGS>
+$id => undef
+$current_subtab => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/Tabs b/rt/webrt/Admin/Elements/Tabs
new file mode 100755
index 000000000..ee6d82b58
--- /dev/null
+++ b/rt/webrt/Admin/Elements/Tabs
@@ -0,0 +1,31 @@
+<& /Elements/Tabs, tabs => $tabs, subtabs => $subtabs, current_toptab => 'Admin/', current_tab => $current_tab, current_subtab => $current_subtab&>
+
+<hr>
+  
+<%INIT>
+  my $tabs = { Users => { title => 'Users',
+			  path => 'Admin/Users/',
+			},
+	       Groups => { title => 'Groups',
+			   path => 'Admin/Groups/',
+			 },
+	       Queues => { title => 'Queues',
+			   path => 'Admin/Queues/',
+			 },
+	       System => { 'title' => 'Global',
+			   path => 'Admin/Global/',
+			 },
+               Keywords => { title => 'Keywords',
+                                   path => 'Admin/Keywords/',
+                                 },
+
+	       
+	     };
+</%INIT>
+
+
+<%ARGS>
+$subtabs => undef
+$current_tab => undef
+$current_subtab => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Elements/UserTabs b/rt/webrt/Admin/Elements/UserTabs
new file mode 100755
index 000000000..bbf17314d
--- /dev/null
+++ b/rt/webrt/Admin/Elements/UserTabs
@@ -0,0 +1,21 @@
+<& /Admin/Elements/Tabs, subtabs => $subtabs,
+			 current_tab => 'Admin/Users/', 
+                         current_subtab => $current_subtab &>
+<hr>
+<%INIT>
+my $subtabs = {
+	       Queues => { title => 'Basics',
+			   path => "Admin/Users/Modify.html?id=".$id
+			 },
+#	       Scrips => { title => 'Rights',
+#			   path => "Admin/Users/Rights.html?id=".$id
+#			 }
+	       
+	      };
+</%INIT>
+  
+  
+<%ARGS>
+$id => undef
+$current_subtab => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Global/GroupRights.html b/rt/webrt/Admin/Global/GroupRights.html
new file mode 100755
index 000000000..26b7e1fe2
--- /dev/null
+++ b/rt/webrt/Admin/Global/GroupRights.html
@@ -0,0 +1,78 @@
+<& /Admin/Elements/Header, Title => 'Modify System ACLS' &>
+<& /Admin/Elements/SystemTabs &>
+  
+<& /Elements/ListActions, actions => \@results &>
+  <FORM METHOD=POST action="GroupRights.html">
+      
+
+
+<h2>Modify global rights for groups</h2>
+
+<TABLE>
+<TR><TD>Pseudogroups</TD></TR>
+% while (my $GroupObj = $PseudoGroups->Next()) {
+	      
+	      <TR ALIGN=RIGHT> 
+		<TD VALIGN=TOP>
+		  <% $GroupObj->Name %>
+		</TD>
+		<TD>
+	    <& /Admin/Elements/SelectRights, PrincipalObj => $GroupObj, 
+                                   PrincipalType => 'Group',
+                                   Scope => 'System' &>
+		</TD>
+	      </TR>
+	
+% }
+
+<TR><TD>Groups</TD></TR>
+
+% while (my $GroupObj = $Groups->Next()) {
+	      
+	      <TR ALIGN=RIGHT> 
+		<TD VALIGN=TOP>
+		  <% $GroupObj->Name %>
+		</TD>
+		<TD>
+	    <& /Admin/Elements/SelectRights, PrincipalObj => $GroupObj, 
+                                   PrincipalType => 'Group',
+                                   Scope => 'System' &>
+		</TD>
+	      </TR>
+	
+% }
+	
+      </TABLE>
+    <& /Elements/Submit, Caption => "Be sure to save your changes", Reset => 1 &>
+  </FORM>
+  
+  <%INIT>
+ 
+   #Update the acls.
+ my @results =  ProcessACLChanges(\@CheckACL, \%ARGS);
+
+        
+    # {{{ do basic initialization.
+    
+  
+  
+  # Find out which groups we want to display ACL selects for.
+  my $Groups = new RT::Groups($session{'CurrentUser'});
+  #TODO: limit this to non-pseudogroups
+  $Groups->LimitToReal();
+
+
+  my $PseudoGroups = new RT::Groups($session{'CurrentUser'});
+  #TODO: limit this to non-pseudogroups
+  $PseudoGroups->LimitToPseudo;
+
+  # }}}
+    
+  
+
+  
+  </%INIT>
+
+<%ARGS>
+@CheckACL => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Global/Keywords.html b/rt/webrt/Admin/Global/Keywords.html
new file mode 100644
index 000000000..bf7bbd266
--- /dev/null
+++ b/rt/webrt/Admin/Global/Keywords.html
@@ -0,0 +1,97 @@
+<& /Admin/Elements/Header, Title => 'Edit keywords' &>
+<& /Admin/Elements/SystemTabs &>
+<& /Elements/ListActions, actions => \@actions &>
+
+<& /Elements/TitleBoxStart, title => $description &>
+  
+  <FORM METHOD=POST ACTION="Keywords.html">
+
+% if ($KeywordSelects->Count > 0 ) {
+<TABLE>
+<TR><TD>Delete</TD></TR>
+%  while (my $keywordselect = $KeywordSelects->Next ) {
+<TR>
+  <TD><INPUT TYPE="CHECKBOX" NAME="KeywordSelect-<%$keywordselect->Id%>-Delete"></TD>
+  <TD><& /Admin/Elements/SelectKeywordSelect, KeywordSelect => $keywordselect &></TD>
+</TR>
+%  }
+</TABLE>
+% }
+
+Add a global keyword selection:
+%my $ks = new RT::KeywordSelect($session{'CurrentUser'});
+<ul>
+<li><& /Admin/Elements/SelectKeywordSelect, KeywordSelect => $ks, NamePrefix => 'new' &></li>
+</ul>
+
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit &>
+</FORM>
+
+
+
+<%init>
+my (@actions);
+
+my $description = "Modify global Keyword selections";
+
+my $KeywordSelects = new RT::KeywordSelects ($session{'CurrentUser'});
+
+unless ($KeywordSelects->LimitToGlobals()) {
+    Abort("Couldn't load KeywordSelects.");
+}
+
+
+# {{{ if we're trying to create a new keyword select
+
+if ($ARGS{'KeywordSelect-new-Name'}) {
+    my $NewKeywordSelect = new RT::KeywordSelect($session{'CurrentUser'});
+    
+    my ($retval, $msg) = $NewKeywordSelect->Create ( Keyword => $ARGS{'KeywordSelect-new-Keyword'},
+					     ObjectField => 'Queue',
+					     ObjectType => 'Ticket',
+					     ObjectValue => 0,
+					     Name => $ARGS{'KeywordSelect-new-Name'},
+					     Single => $ARGS{'KeywordSelect-new-Single'},
+					     Depth => $ARGS{'KeywordSelect-new-Depth'}
+					   );
+	push (@actions, $msg);
+}
+# }}}
+
+# {{{ if we're trying to delete the keywordselect
+foreach my $key (keys %ARGS) {
+    if ($key =~ /^KeywordSelect-(\d+)-Delete$/) {
+	my $id = $1;
+	my $keywordselect = new RT::KeywordSelect($session{'CurrentUser'});
+	$keywordselect->Load($id) || push @actions, "Couldn't load keywordSelect";
+	my ($val, $msg) = $keywordselect->SetDisabled(1);
+	if ($val) {
+	    push @actions, 'KeywordSelect disabled.';
+	}	
+	else {
+	    push @actions, $msg;
+	}	
+    }
+}
+# }}}
+# {{{ if we're modifying keyword selects
+my @fields = qw(Name Keyword Single Depth);
+
+while (my $ks = $KeywordSelects->Next) {
+    foreach my $field (@fields) {
+	if (defined ($ARGS{"KeywordSelect-".$ks->Id."-".$field}) &&
+	    ($ARGS{"KeywordSelect-".$ks->Id."-".$field} ne $ks->$field())) {
+	    
+	    my $method = "Set$field";
+	    my ($val, $msg) = $ks->$method($ARGS{"KeywordSelect-".$ks->Id."-".$field});
+	    push @actions, "Keyword Select ". $ks->Name."/$field:".$msg;
+	}	
+    }
+}
+# }}}
+
+</%init>
+
+<%ARGS>
+</%ARGS>
diff --git a/rt/webrt/Admin/Global/Scrips.html b/rt/webrt/Admin/Global/Scrips.html
new file mode 100755
index 000000000..e55f8b3de
--- /dev/null
+++ b/rt/webrt/Admin/Global/Scrips.html
@@ -0,0 +1,95 @@
+<& /Admin/Elements/Header, Title => 'Edit scrips' &>
+<& /Admin/Elements/SystemTabs &>
+
+<& /Elements/ListActions, actions => \@actions &>
+
+<& /Elements/TitleBoxStart, title => "Modify global scrips" &>
+  
+  <FORM METHOD=POST ACTION="Scrips.html">
+
+% if ($Scrips->Count > 0 ) {
+<TABLE>
+<TR>
+<TD>Delete
+</TD>
+<TD>
+</TR>
+
+%   while (my $scrip = $Scrips->Next ) {
+<TR>
+<TD>
+<INPUT TYPE="CHECKBOX" NAME="DeleteScrip-<%$scrip->Id%>">
+</TD>
+<TD>
+<% $scrip->ConditionObj->Name %> 
+<% $scrip->ActionObj->Name %> 
+with template <% $scrip->TemplateObj->Name %>
+</TD>
+</TR>
+%   }
+
+</TABLE>
+
+% }
+Add a scrip which will apply to all queues:
+<ul>
+<li>Condition: <& /Admin/Elements/SelectScripCondition, Name => 'NewScripCondition' &>
+	  Action: <& /Admin/Elements/SelectScripAction, Name => 'NewScripAction' &>
+	  Template: <& /Admin/Elements/SelectTemplate, Name => 'NewScripTemplate' &>
+
+</ul>
+
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit &>
+</FORM>
+<%init>
+my (@actions, $description);
+
+my $Scrips = new RT::Scrips ($session{'CurrentUser'});
+$Scrips->LimitToGlobal();
+
+
+
+
+if ($NewScripAction and $NewScripCondition) {
+    my $NewScrip = new RT::Scrip($session{'CurrentUser'});
+    
+    my ($retval, $msg) = $NewScrip->Create ( ScripAction => $NewScripAction,
+				     ScripCondition => $NewScripCondition,
+				     Stage => 'TransactionCreate',
+				     Queue => 0,
+				     Template => $NewScripTemplate);
+    if (defined $retval) {
+        push @actions, $msg;
+    }
+    else {
+        push @actions, $msg;
+    }
+}
+
+# {{{ deal with modifying and deleting existing scrips
+my ($key );
+foreach $key (keys %ARGS) {
+  # {{{ if we're trying to delete the scrip
+  if ($key =~ /^DeleteScrip-(\d+)/) {
+    my $id = $1;
+    my $scrip = new RT::Scrip($session{'CurrentUser'});
+    $scrip->Load($id);
+    my ($retval, $msg) = $scrip->Delete;
+    if ($retval) {
+      push @actions, "Scrip deleted";
+    }
+    else {
+      push @actions, $msg;
+    }
+  }
+  # }}}
+}
+# }}}
+</%init>
+
+<%ARGS>
+$NewScripCondition => undef
+$NewScripAction => undef
+$NewScripTemplate => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Global/Template.html b/rt/webrt/Admin/Global/Template.html
new file mode 100755
index 000000000..856d2ee8f
--- /dev/null
+++ b/rt/webrt/Admin/Global/Template.html
@@ -0,0 +1,66 @@
+<& /Admin/Elements/Header, title => "Modify template ".$TemplateObj->id&>
+<& /Admin/Elements/SystemTabs &>
+<& /Elements/ListActions, actions => \@results &>
+
+<& /Elements/TitleBoxStart, title => $title &>
+
+<FORM METHOD=POST ACTION="Template.html">
+%if ($create ) {
+<INPUT TYPE=HIDDEN NAME=template VALUE="new">
+% } else {
+<INPUT TYPE=HIDDEN NAME=template VALUE="<%$TemplateObj->Id%>">
+% }
+
+%# hang onto the queue id
+<INPUT TYPE=HIDDEN name="Queue" value="<%$Queue%>">
+
+
+Name: <input name="Name" VALUE="<%$TemplateObj->Name%>" SIZE=20><BR>
+Description: <input name="Description" VALUE="<%$TemplateObj->Description%>" SIZE=80><BR>
+
+<TEXTAREA NAME=Content ROWS=25 COLS=80 WRAP=SOFT>
+<%$TemplateObj->Content%></TEXTAREA>
+
+<& /Elements/TitleBoxEnd&>
+<&/Elements/Submit&>
+</FORM>
+
+
+
+<%INIT>
+
+my $TemplateObj = new RT::Template($session{'CurrentUser'});
+my  ($title, @results);
+
+if ($create) {
+  $title = "Create a template";
+}
+
+else {
+  if ($template eq 'new') {
+      my ($val, $msg) =  $TemplateObj->Create(Queue => $Queue, Name => $Name);
+      Abort("Could not create template: $msg") unless ($val);
+     push @results, $msg;
+     $title = 'Created template ' . $TemplateObj->Name(); 
+    }
+    else {
+       $TemplateObj->Load($template) || Abort('No Template');
+      $title = 'Editing template ' . $TemplateObj->Name(); 
+    }
+  
+    
+}
+if ($TemplateObj->Id()) {
+  my @attribs = qw( Description Content Queue Name);
+  my @aresults = UpdateRecordObject( AttributesRef => \@attribs, 
+				     Object => $TemplateObj, 
+				     ARGSRef => \%ARGS);
+  push @results, @aresults;
+}
+</%INIT>
+<%ARGS>
+$Queue => undef
+$template => undef
+$create => undef
+$Name => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Global/Templates.html b/rt/webrt/Admin/Global/Templates.html
new file mode 100755
index 000000000..cf388e521
--- /dev/null
+++ b/rt/webrt/Admin/Global/Templates.html
@@ -0,0 +1,24 @@
+<& /Admin/Elements/Header, Title => 'Edit system templates' &>
+<& /Admin/Elements/SystemTabs &>
+
+<& /Elements/TitleBoxStart, title => 'Edit system templates' &>
+<UL>
+<LI><A href="Template.html?create=1&Queue=0">Create a new template</A><BR><BR>
+
+
+%while  (my $TemplateObj = $Templates->Next) { 
+
+<LI><A HREF="Template.html?template=<%$TemplateObj->id()%>"><%$TemplateObj->id()%>/<%$TemplateObj->Name%>: <%$TemplateObj->Description%></a><BR>
+
+%}
+
+<& /Elements/TitleBoxEnd &>
+<%INIT>
+
+my $Templates = RT::Templates->new($session{'CurrentUser'});
+$Templates->LimitToGlobal();
+
+</%INIT>
+<%ARGS>
+$id => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Global/UserRights.html b/rt/webrt/Admin/Global/UserRights.html
new file mode 100755
index 000000000..351f4b8c6
--- /dev/null
+++ b/rt/webrt/Admin/Global/UserRights.html
@@ -0,0 +1,42 @@
+<& /Admin/Elements/Header, Title => 'Modify System ACLS' &>
+<& /Admin/Elements/SystemTabs &>
+  
+<& /Elements/ListActions, actions => \@results &>
+  <FORM METHOD=POST action="UserRights.html">
+      
+
+<h2>Modify global rights for users</h2>
+<TABLE>
+%	while (my $UserObj = $Users->Next()) {
+  <TR ALIGN=RIGHT> 
+	<TD VALIGN=TOP>
+	  <A HREF="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$UserObj->id%>"><% $UserObj->Name %></A>
+	</TD>
+	<TD>
+	  <& /Admin/Elements/SelectRights, PrincipalObj => $UserObj, 
+	      PrincipalType => 'User',
+	      Scope => 'System' &>
+	  
+	</TD>
+      </TR>
+	
+% }
+    </TABLE>
+    
+    <& /Elements/Submit, Caption => "Be sure to save your changes", Reset => 1 &>
+  </FORM>
+  
+<%INIT>
+ 
+ my @results =  ProcessACLChanges(\@CheckACL, \%ARGS);
+
+ # Find out which users we want to display ACL selects for
+ my $Users = new RT::Users($session{'CurrentUser'});
+
+ $Users->LimitToPrivileged();
+  
+</%INIT>
+
+<%ARGS>
+@CheckACL => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Global/index.html b/rt/webrt/Admin/Global/index.html
new file mode 100755
index 000000000..5907ed1e8
--- /dev/null
+++ b/rt/webrt/Admin/Global/index.html
@@ -0,0 +1,2 @@
+<& /Admin/Elements/Header, Title => 'Admin/Global configuration' &>
+<& /Admin/Elements/SystemTabs &>
diff --git a/rt/webrt/Admin/Groups/Members.html b/rt/webrt/Admin/Groups/Members.html
new file mode 100644
index 000000000..4b0e0d04f
--- /dev/null
+++ b/rt/webrt/Admin/Groups/Members.html
@@ -0,0 +1,76 @@
+<& /Admin/Elements/Header, Title => "RT/Admin/Edit the group ". $Group->Name &>
+<& /Admin/Elements/GroupTabs, GroupObj => $Group &>
+<& /Elements/ListActions, actions => \@results &>
+
+
+<& /Elements/TitleBoxStart, title => 'Editing membership for group '.$Group->Name &>
+
+<FORM ACTION="<%$RT::WebPath%>/Admin/Groups/Members.html" METHOD=POST>
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Group->Id%>">
+<TABLE WIDTH="100%">
+<TR>
+<TD>
+Add members
+</TD>
+<TD>
+Current members
+</TD>
+</TR>
+
+<TR>
+<TD VALIGN=TOP>
+<& /Admin/Elements/SelectUsers, Name => "AddMembers" &>
+</TD>
+<TD VALIGN=TOP>
+% if ($Group->MembersObj->Count == 0 ) {
+<i>(No members)</i>
+% } else {
+(Check box to delete group member)
+<UL>
+% while (my $member = $Group->MembersObj->Next()) {
+<LI><INPUT TYPE=CHECKBOX Name="DeleteMember-<%$member->UserObj->id%>">
+<%$member->UserObj->Name%> (<%$member->UserObj->RealName%>)
+% }
+% }
+</UL>
+</TD>
+</TR>
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit &>
+</form>
+
+
+<%INIT>
+
+my $Group = new RT::Group($session{'CurrentUser'});
+$Group->Load($id) || Abort('Could not load group');
+
+my (@results);
+
+my $key;
+foreach $key (keys %ARGS) {
+
+if ($key =~ /^DeleteMember-(\d+)$/) {
+    my $id = $1; 
+    my ($val,$msg) = $Group->DeleteMember($id);
+    push (@results, $msg);
+}
+}
+
+# Make sure AddMembers is always an array
+my @AddMembers = (ref $AddMembers eq 'ARRAY') ? @{$AddMembers} : ($AddMembers);
+
+foreach my $member (@AddMembers) {
+    next unless ($member);
+    my ($val, $msg) = $Group->AddMember($member);
+    push (@results, $msg);
+}
+
+
+</%INIT>
+
+<%ARGS>
+$AddMembers => undef
+$id => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Groups/Modify.html b/rt/webrt/Admin/Groups/Modify.html
new file mode 100644
index 000000000..7104a6937
--- /dev/null
+++ b/rt/webrt/Admin/Groups/Modify.html
@@ -0,0 +1,83 @@
+<& /Admin/Elements/Header, Title => $title &>
+
+<& /Admin/Elements/GroupTabs, GroupObj => $Group &>
+<& /Elements/ListActions, actions => \@results &>
+
+
+<& /Elements/TitleBoxStart, title => $title &>
+
+<FORM ACTION="<%$RT::WebPath%>/Admin/Groups/Modify.html" METHOD=POST>
+
+%unless ($Group->Id) {
+<INPUT TYPE=HIDDEN NAME=id VALUE="new">
+% } else {
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Group->Id%>">
+% }
+<TABLE>
+<TR><TD ALIGN=RIGHT>
+Name: 
+</TD>
+<TD><INPUT name="Name" value="<%$Group->Name%>"></TD>
+</TR><TR>
+<TD ALIGN=RIGHT>
+Description:</TD><TD COLSPAN=3><INPUT name="Description" value="<%$Group->Description%>" size=60></TD></TR>
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+
+<& /Elements/Submit &>
+</form>
+<%INIT>
+
+my ($title);
+my (@results);
+
+my $Group = new RT::Group($session{'CurrentUser'});
+
+if ($Create) {
+    $title = "Create a new group";
+} 
+
+else {
+    
+    if ($id eq 'new' ) {
+	
+	$Group->Create(Name => "$Name") || Abort ("Group could not be created.");
+	$id = $Group->Id;
+    }
+    else {
+	$Group->Load($id) || Abort('Could not load group');
+    }
+
+
+    if ($id) {
+	$title = "Modify the group ". $Group->Name;
+
+    }	
+
+    # If the create failed
+    else {
+	$title = "Create a new group";
+	$Create = 1;
+    }    
+    
+}
+
+if ($id) {
+    
+    my @fields = qw(Description Name );
+    my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
+					    Object => $Group,
+					    ARGSRef => \%ARGS );
+    push (@results,@fieldresults);
+}
+
+
+</%INIT>
+
+
+<%ARGS>
+$Create => undef
+$Name => undef
+$Description => undef
+$id => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Groups/Rights.html b/rt/webrt/Admin/Groups/Rights.html
new file mode 100644
index 000000000..5c842a301
--- /dev/null
+++ b/rt/webrt/Admin/Groups/Rights.html
@@ -0,0 +1 @@
+Not yet implemented....
diff --git a/rt/webrt/Admin/Groups/index.html b/rt/webrt/Admin/Groups/index.html
new file mode 100644
index 000000000..d419e7f73
--- /dev/null
+++ b/rt/webrt/Admin/Groups/index.html
@@ -0,0 +1,33 @@
+
+<& /Admin/Elements/Header, Title => 'Admin/Groups' &>
+<& /Admin/Elements/Tabs, current_tab => 'Admin/Groups/' &>
+
+<& /Elements/TitleBoxStart, title => 'Select a group' &>
+
+Pseudogroups:<BR>
+<UL>
+%while ( $Group = $PseudoGroups->Next) {
+<LI><A HREF="Modify.html?id=<%$Group->id%>"><%$Group->Name%></a><BR>
+%}
+
+</UL>
+
+Groups:<BR>
+<UL>
+<LI><A HREF="Modify.html?Create=1">Create a new group</A><BR><BR></LI>
+%while ( $Group = $Groups->Next) {
+<LI><A HREF="Modify.html?id=<%$Group->id%>"><%$Group->Name%></a><BR>
+%}
+</UL>
+
+<& /Elements/TitleBoxEnd &>
+<%INIT>
+my ($Group);
+my $PseudoGroups = new RT::Groups($session{'CurrentUser'});
+$PseudoGroups->LimitToPseudo;
+my $Groups = new RT::Groups($session{'CurrentUser'});
+$Groups->LimitToReal;
+
+</%INIT>
+<%ARGS>
+</%ARGS>
diff --git a/rt/webrt/Admin/KeywordSelects/Modify.html b/rt/webrt/Admin/KeywordSelects/Modify.html
new file mode 100644
index 000000000..e753c6622
--- /dev/null
+++ b/rt/webrt/Admin/KeywordSelects/Modify.html
@@ -0,0 +1,17 @@
+<& /Admin/Elements/Header, Title => 'Admin KeywordSelects' &>
+<& /Admin/Elements/Tabs &>
+
+<& /Admin/Elements/ModifyKeywordSelect, Create=>$Create, id=>$id, Parent=>$Parent, ObjectType=>$ObjectType, ObjectField=>$ObjectField, ObjectValue=>$ObjectValue, Single=>$Single, SingleMagic=>$SingleMagic, Generations=>$Generations &>
+
+<%ARGS>
+$Create => undef
+$id => undef
+$Parent => undef
+$ObjectType => undef
+$ObjectField => undef
+$ObjectValue => undef
+$Single => undef
+$SingleMagic => undef
+$Generations => undef
+</%ARGS>
+ 
diff --git a/rt/webrt/Admin/KeywordSelects/index.html b/rt/webrt/Admin/KeywordSelects/index.html
new file mode 100644
index 000000000..ba3da9f0c
--- /dev/null
+++ b/rt/webrt/Admin/KeywordSelects/index.html
@@ -0,0 +1,137 @@
+<& /Admin/Elements/Header, Title => 'Admin KeywordSelects' &>
+<& /Admin/Elements/Tabs, current_tab => 'Admin/KeywordSelects/' &>
+
+A <B>KeywordSelect</B> is a link between a <B>Keyword</B> and a object
+(currently just <B>Tickets</B>), titled by the <I>Name</I> field of the Keyword such that:
+<ul>
+<li>Object display will contain a field, titled with the <I>Name</I> field of
+the <B>Keyword</B> and showing any descendent keywords.
+<li>Object creation for this field will contain a field, titled with the
+<I>Name</I> field of the <B>Keyword</B> and containing the descendents of
+the <B>Keyword</B> as choices.
+<li>Searches for this object type will contain a selection field titled with
+the <I>Name</I> field of the <B>Keyword</B> and containing the descendents
+of the <B>Keyword</B> as choices.
+<TABLE WIDTH=100%>
+
+
+
+  <TD VALIGN=TOP>
+    <h2>Create KeywordSelect</h2>
+  <FORM NAME="ModifyKeywordSelect" METHOD="POST" ACTION="<%$RT::WebPath%>/Admin/KeywordSelects/Modify.html">
+    [<%$title |n %>]
+    <BR>
+      
+      <INPUT TYPE="hidden" NAME="id" VALUE="<% $id %>">
+	Keyword 
+	<SELECT NAME="Parent">
+	  
+%while ( $parent = $parents->Next ) {
+	  
+	  <OPTION VALUE="<% $parent->id %>" <% defined($KeywordSelect->Parent) && $parent->id == $KeywordSelect->Parent ? ' SELECTED' : '' %>><% $parent->Name %></OPTION>
+	  
+% }
+	  
+	</SELECT>
+	<BR>
+	  Object 
+	  <SELECT NAME="ObjectType">
+	    <OPTION SELECTED>Ticket</OPTION>
+	  </SELECT>
+	  <BR>
+	    
+%foreach $queue ( keys %queues ) {
+    addOption("<% $queues{$queue} %>", "<% $queue %>", false, <% $queue == $KeywordSelect->ObjectValue ? 'true' : 'false' %> )
+%}
+  }
+}
+</SCRIPT>
+	    
+	    Limit to <SELECT NAME="ObjectField" onChange="ChangeObjectValue(this)">
+	      <OPTION VALUE="" <% $KeywordSelect->ObjectField ? '' : ' SELECTED' %>>(none)</OPTION>
+	      <OPTION VALUE="Queue" <% $KeywordSelect->ObjectField eq 'Queue' ? ' SELECTED' : '' %>>Queue</OPTION>
+	    </SELECT> 
+	    <SELECT NAME="ObjectValue">
+	      <OPTION VALUE="<% $KeywordSelect->ObjectValue %>">
+		<% $KeywordSelect->ObjectField ? $queues{$KeywordSelect->ObjectValue} : "(n/a)" %></OPTION>
+	    </SELECT><BR>
+	      <INPUT TYPE="hidden" NAME="SingleMagic" VALUE="1">
+		<INPUT TYPE="checkbox" NAME="Single" VALUE="1" <% $KeywordSelect->Single ? ' CHECKED' : '' %>>Allow single selection only<BR>
+		    Limit to <INPUT TYPE="text" NAME="Generations" SIZE="2" VALUE="<% $KeywordSelect->Generations %>"> generations (0 = no limit)<BR>
+			<& /Elements/Submit, Label => $submit &>
+
+</FORM>
+
+<%INIT>
+
+
+my $KeywordSelect = new RT::KeywordSelect($session{CurrentUser});
+  
+my($title, $submit);
+  
+if ( $Create ) {
+      $title = "Create a new KeywordSelect";
+      $submit = "Create";
+      $id = "new";
+} else {
+    if  ( $id eq 'new' ) {
+	$id = $KeywordSelect->Create (
+				      Parent      => $Parent,
+				      ObjectType  => $ObjectType,
+				      ObjectField => $ObjectField,
+				      ObjectValue => $ObjectValue,
+				      Single      => $Single,
+				      Generations => $Generations,
+				     ) or Abort "can't create KeywordSelect";
+    } else {
+	$KeywordSelect->Load($id) || Abort("Can't load keyword id $id");
+	#false laziness
+	$KeywordSelect->SetParent($Parent) if defined($Parent);
+	$KeywordSelect->SetObjectType($ObjectType) if defined($ObjectType);
+	$KeywordSelect->SetObjectField($ObjectField) if defined($ObjectField);
+	$KeywordSelect->SetObjectValue($ObjectValue) if defined($ObjectValue);
+	$KeywordSelect->SetSingle($Single) if defined($SingleMagic);
+	$KeywordSelect->SetGenerations($Generations) if defined($Generations);
+    }
+    $title = "Modify the KeywordSelect <B>". $KeywordSelect->KeywordObj->Name. "</B>";
+    $submit = "Modify";
+    
+}
+  
+  my $parents = new RT::Keywords($session{CurrentUser});
+  $parents->UnLimit;
+  my $parent;
+
+my $queues = new RT::Queues($session{CurrentUser});
+$queues->UnLimit;
+
+my %queues;
+my $queue;
+$queues{$queue->id} = $queue->Name while $queue = $queues->Next;
+
+</%INIT>
+
+<%ARGS>
+$id => undef
+$Create => undef
+$Parent => undef
+$ObjectType => undef
+$ObjectField => undef
+$ObjectValue => undef
+$Single => undef
+$SingleMagic => undef
+$Generations => undef
+</%ARGS>
+
+
+    <& /Admin/Elements/ModifyKeywordSelect, 'Create'=>'1' &>
+  </TD>
+
+  <TD VALIGN=TOP>
+    <H2>Modify KeywordSelect</H2>
+
+    <& /Admin/Elements/SelectModifyKeywordSelect &>
+  </TD>
+</TR>
+
+</TABLE>
diff --git a/rt/webrt/Admin/Keywords/Modify.html b/rt/webrt/Admin/Keywords/Modify.html
new file mode 100644
index 000000000..bb7e2db8c
--- /dev/null
+++ b/rt/webrt/Admin/Keywords/Modify.html
@@ -0,0 +1,96 @@
+<& /Admin/Elements/Header, Title => $title &>
+<& /Admin/Elements/Tabs &>
+
+
+<& /Elements/TitleBoxStart, title => %$title  &>
+<FORM METHOD="POST" ACTION="<%$RT::WebPath%>/Admin/Keywords/Modify.html">
+<INPUT TYPE="hidden" NAME="id" VALUE="<% $id %>">
+Keyword <INPUT NAME="Name" VALUE="<% $Keyword->Name %>"><BR>
+
+Parent <SELECT NAME="Parent">
+	      <OPTION VALUE=""<% defined($Keyword->Parent) ? '' : ' SELECTED' %>>-</OPTION>
+%while ( $parent = $parents->Next ) {
+	      <OPTION VALUE="<% $parent->id %>"<% defined($Keyword->Parent) && $parent->id == $Keyword->Parent ? ' SELECTED' : '' %>><% $parent->Name %></OPTION>
+%}
+</SELECT>
+
+
+New children of this keyword. one per line.
+<TEXTAREA NAME="Kids" ROWS=4><% $kidstring %></TEXTAREA>
+<BR>
+
+<& /Elements/Submit, Label => $submit &>
+</FORM>
+<& /Elements/TitleBoxEnd &>
+
+<%INIT>
+
+my $Keyword = new RT::Keyword($session{CurrentUser});
+my ($title, $submit, %kids, $kid);
+
+if ( $Create ) {
+    $title = "Create a new Keyword";
+    $submit = "Create";
+    $id = "new";
+    %kids = ();
+    $Parent = ''; #silence 
+} 
+else {
+    if ( $id eq 'new' ) {
+	$id = $Keyword->Create( Name => $Name, Parent => $Parent )
+	  or Abort("can't create keyword Name=>$Name, Parent=>$Parent");
+    } else {
+	$Keyword->Load($id) || Abort("Can't load keyword id $id");
+	
+	#foreach my $field ( grep eval "defined(\$$_)", qw( Name Parent )) {
+	#  eval "\$Keyword->Set(\$field=>\$$field); #sigh
+	#}
+	
+	$Keyword->SetName($Name) if defined($Name);
+	$Keyword->SetParent($Parent) if defined($Parent);
+    }
+
+    $title = "Modify the Keyword <B>". $Keyword->Name. "</B>";
+    $submit = "Modify";
+}
+
+
+my $kids = $Keyword->Children(new RT::Keywords($session{CurrentUser}));
+
+$kids{$kid->Name} = $kid while $kid = $kids->Next;
+
+if ( defined($Kids) ) {
+    my %newkids;
+
+	%newkids = map { $_=>1 } split(/\r/, $Kids);
+
+    }
+    foreach ( grep { ! defined($newkids{$_}) } keys %kids ) {
+	$kids{$_}->Delete;
+	delete $kids{$_};
+    }
+    foreach ( grep { ! defined($kids{$_}) } keys %newkids ) {
+	$kids{$_} = new RT::Keyword($session{CurrentUser});
+	$kids{$_}->Create( Name => $_, Parent => $id )
+	  or Abort("can't create keyword Name=>$_, Parent=>$id");
+    }
+
+}
+
+
+my $parent;
+my $parents = new RT::Keywords($session{CurrentUser});
+$parents->UnLimit;
+
+my $kidstring = join("\r", keys %kids);
+
+</%INIT>
+
+<%ARGS>
+$id => undef
+$Create => undef
+$Name => undef
+$Parent => undef
+$Kids => undef
+
+</%ARGS>
diff --git a/rt/webrt/Admin/Keywords/index.html b/rt/webrt/Admin/Keywords/index.html
new file mode 100644
index 000000000..12814ec03
--- /dev/null
+++ b/rt/webrt/Admin/Keywords/index.html
@@ -0,0 +1,110 @@
+<& /Elements/Header, Title => 'Admin/Keywords' &>
+<& /Admin/Elements/Tabs, current_tab => 'Admin/Keywords/' &>
+
+<& /Elements/ListActions, actions => \@Actions &>
+
+<& /Elements/TitleBoxStart, title => 'Keywords' &>
+<a href="<%$RT::WebPath%>/Admin/Keywords/?RootId=<%$Root->Parent%>"><%$Root->Path%></a>
+<UL>
+<FORM METHOD=POST ACTION="index.html">
+<input type=hidden name=RootId value="<%$RootId%>">
+
+
+% while (my $key = $Keywords->Next) {
+    <LI>
+% if ($Edit == $key->id) {
+      <input name="KeyName-<%$key->id%>" value="<%$key->Name%>">
+	  <input type=submit value="Update">
+	    <input type=submit name="Disable-<%$key->id%>" value="Disable">
+% } else {
+	      <A HREF="?RootId=<%$key->id%>"><%$key->Name%></A>
+% if ($key->Disabled) {
+	<input type=submit name="Enable-<%$key->id%>" value="Enable">
+% } else {
+      [<a href="?Edit=<%$key->id%>&RootId=<%$Root->Id%>">edit</a>]
+% }
+% }
+
+
+	  </LI>
+% }
+	  <LI>
+	    <input name="KeyName-New"> <input type=submit value="Add">
+</UL>
+<BR>
+	  <input type="checkbox" name="ShowDisabled"> Include disabled items in listing.
+	<input type=submit value="Go!">
+
+</FORM>
+
+<& /Elements/TitleBoxEnd &>
+<%INIT>
+my (@Actions);
+  
+if ($ARGS{'KeyName-New'}) {
+    my $NewKey = new RT::Keyword($session{'CurrentUser'});
+    my ($val, $msg) = $NewKey->Create( Parent => $RootId, Name => $ARGS{'KeyName-New'});
+    push (@Actions, $msg);
+}
+
+my $arg;
+foreach $arg (keys %ARGS) {
+    if ($arg =~ /^Disable-(\d*)$/) {
+	my $id = $1;
+	my $keyword = new RT::Keyword($session{'CurrentUser'});
+	$keyword->Load($id);
+	my ($val, $msg) = $keyword->SetDisabled(1);
+	push (@Actions, $msg);
+
+
+    }	
+    elsif ($arg =~ /^Enable-(\d*)$/) {
+	my $id = $1;
+	my $keyword = new RT::Keyword($session{'CurrentUser'});
+	$keyword->Load($id);
+	my ($val, $msg) = $keyword->SetDisabled(0);
+	push (@Actions, $msg);
+    }
+    elsif ($arg =~ /^KeyName-(\d*)$/) {
+	my $id = $1;
+	my $keyword = new RT::Keyword ($session{'CurrentUser'});
+	$keyword->Load($id);
+	if ($keyword->Name() ne $ARGS{"$arg"}) {
+	    my ($val, $msg) = $keyword->SetName($ARGS{"$arg"});
+	    push (@Actions, $msg);
+	}	
+	if (($ARGS{"KeyParent-$id"}) && 
+	    ($keyword->Parent ne $ARGS{"KeyParent-$id"})) {
+	    my ($val, $msg) = $keyword->SetParent($ARGS{"KeyParent-$id"});
+	    push (@Actions, $msg);
+	}	
+    }	
+}
+
+
+my $Root = new RT::Keyword($session{'CurrentUser'});
+my $Keywords;
+#If we have a root load it.
+if ($RootId != 0) {
+    $Root->Load($RootId);
+    $Keywords = $Root->Children();
+    
+}
+else {
+    $Keywords = new RT::Keywords($session{'CurrentUser'});
+    $Keywords->LimitToParent(0);
+}
+
+if ($ShowDisabled) {
+    $Keywords->{'find_disabled_rows'} = 1;
+}
+
+
+
+
+</%INIT>
+<%ARGS>
+$RootId => 0
+$Edit => undef
+$ShowDisabled => 0
+</%ARGS>
diff --git a/rt/webrt/Admin/Queues/Create.html b/rt/webrt/Admin/Queues/Create.html
new file mode 100755
index 000000000..b39d6590c
--- /dev/null
+++ b/rt/webrt/Admin/Queues/Create.html
@@ -0,0 +1,13 @@
+<& /Admin/Elements/Header, Title => 'Create a queue' &>
+    <h1>Create a queue</h1>
+
+<& /Admin/Elements/ModifyQueue, QueueObj => $QueueObj &>
+
+<%INIT>
+my $QueueObj = new RT::Queue($session{'CurrentUser'});
+$QueueObj->Create(Name => "$Name");
+</%INIT>
+
+<%ARGS>
+$Name => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Queues/GroupRights.html b/rt/webrt/Admin/Queues/GroupRights.html
new file mode 100755
index 000000000..a2c669083
--- /dev/null
+++ b/rt/webrt/Admin/Queues/GroupRights.html
@@ -0,0 +1,103 @@
+<& /Admin/Elements/Header, Title => 'Modify group rights for queue '. $QueueObj->Name &>
+<& /Admin/Elements/QueueTabs, id => $id &>  
+<& /Elements/ListActions, actions => \@results &>
+
+  <FORM METHOD=POST ACTION="GroupRights.html">
+    <INPUT TYPE=HIDDEN NAME=id VALUE="<% $QueueObj->id %>">
+      
+
+
+<& /Elements/TitleBoxStart, title => 'Modify group rights for queue '.$QueueObj->Name &>
+
+<TABLE>
+<TR><TD>Pseudogroups</TD></TR>
+% while (my $GroupObj = $PseudoGroups->Next()) {
+	      
+	      <TR ALIGN=RIGHT> 
+		<TD VALIGN=TOP>
+		  <% $GroupObj->Name %>
+		</TD>
+		<TD>
+	    <& /Admin/Elements/SelectRights, PrincipalObj => $GroupObj, 
+                                   PrincipalType => 'Group',
+	                           QueueObj => $QueueObj,
+                                   Scope => 'Queue' &>
+
+		</TD>
+	      </TR>
+	
+% }
+
+<TR><TD>Groups</TD></TR>
+
+% while (my $GroupObj = $Groups->Next()) {
+	      
+	      <TR ALIGN=RIGHT> 
+		<TD VALIGN=TOP>
+		  <% $GroupObj->Name %>
+		</TD>
+		<TD>
+	    <& /Admin/Elements/SelectRights, PrincipalObj => $GroupObj, 
+                                   PrincipalType => 'Group',
+	                           QueueObj => $QueueObj,
+                                   Scope => 'Queue' &>
+
+		</TD>
+	      </TR>
+	
+% }
+	
+      </TABLE>
+
+      <& /Elements/TitleBoxEnd &>
+      <& /Elements/Submit, Caption => "Be sure to save your changes", Reset => 1 &>
+  </FORM>
+  
+<%INIT>
+ 
+#Update the acls.
+my @results =  ProcessACLChanges(\@CheckACL, \%ARGS);
+
+# {{{ Deal with setting up the display of current rights.
+
+# {{{ do basic initialization.
+
+#Define vars used in html above
+my ($GroupObj);
+
+my ($right);
+
+
+if (!defined $id) {
+    Abort("No Queue defined");
+}
+
+my $QueueObj = new RT::Queue($session{'CurrentUser'});
+$QueueObj->Load($id) ||
+  Abort("Couldn't load queue $id");
+  
+  # Find out which groups we want to display ACL selects for.
+  my $Groups = new RT::Groups($session{'CurrentUser'});
+  #TODO: limit this to non-pseudogroups
+  $Groups->LimitToReal();
+
+
+  my $PseudoGroups = new RT::Groups($session{'CurrentUser'});
+  #TODO: limit this to non-pseudogroups
+  $PseudoGroups->LimitToPseudo;
+
+
+# }}}
+    
+  
+  # }}}
+
+</%INIT>
+
+<%ARGS>
+$id => undef
+$UserString => undef
+$UserOp => undef
+$UserField => undef
+@CheckACL => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Queues/Keywords.html b/rt/webrt/Admin/Queues/Keywords.html
new file mode 100644
index 000000000..7809805c5
--- /dev/null
+++ b/rt/webrt/Admin/Queues/Keywords.html
@@ -0,0 +1,114 @@
+<& /Admin/Elements/Header, Title => 'Edit keywords' &>
+<& /Admin/Elements/QueueTabs, id => $QueueObj->Id &>
+
+<& /Elements/ListActions, actions => \@actions &>
+
+<& /Elements/TitleBoxStart, title => $description &>
+
+<h2>Global Keyword Selections</h2>
+<& /Admin/Elements/ListGlobalKeywordSelects &>
+<BR>
+  
+  <FORM METHOD=POST ACTION="Keywords.html">
+    <INPUT TYPE=HIDDEN NAME=id VALUE="<%$id%>">
+
+% if ($KeywordSelects->Count > 0 ) {
+
+
+<h2>Queue Keyword Selections</h2>
+<TABLE>
+<TR><TD>Delete</TD></TR>
+%  while (my $keywordselect = $KeywordSelects->Next ) {
+<TR>
+  <TD><INPUT TYPE="CHECKBOX" NAME="KeywordSelect-<%$keywordselect->Id%>-Delete"></TD>
+  <TD><& /Admin/Elements/SelectKeywordSelect, KeywordSelect => $keywordselect &></TD>
+</TR>
+%  }
+</TABLE>
+% }
+
+Add a keyword selection to this queue:
+%my $ks = new RT::KeywordSelect($session{'CurrentUser'});
+<ul>
+<li><& /Admin/Elements/SelectKeywordSelect, KeywordSelect => $ks, NamePrefix => 'new' &></li>
+</ul>
+
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit &>
+
+</FORM>
+<%init>
+my (@actions);
+
+
+
+my $KeywordSelects = new RT::KeywordSelects ($session{'CurrentUser'});
+unless ($id =~ /^\d+$/) {
+    Abort("$id isn't a valid Queue id.");
+}
+
+unless ($KeywordSelects->LimitToQueue($id)) {
+    Abort("Couldn't load KeywordSelects.");
+}
+
+my $QueueObj = new RT::Queue($session{'CurrentUser'});
+$QueueObj->Load($id);
+
+my $description = "Modify Keyword selections for queue '". $QueueObj->Name ."'";
+
+
+
+# {{{ if we're trying to create a new keyword select
+
+if ($ARGS{'KeywordSelect-new-Name'}) {
+    my $NewKeywordSelect = new RT::KeywordSelect($session{'CurrentUser'});
+    
+    my ($retval, $msg) = $NewKeywordSelect->Create ( Keyword => $ARGS{'KeywordSelect-new-Keyword'},
+					     ObjectField => 'Queue',
+					     ObjectType => 'Ticket',
+					     ObjectValue => $QueueObj->Id,
+					     Name => $ARGS{'KeywordSelect-new-Name'},
+					     Single => $ARGS{'KeywordSelect-new-Single'},
+					     Depth => $ARGS{'KeywordSelect-new-Depth'}
+					   );
+	push (@actions, $msg);
+}
+# }}}
+# {{{ if we're trying to delete the keywordselect
+foreach my $key (keys %ARGS) {
+    if ($key =~ /^KeywordSelect-(\d+)-Delete$/) {
+	my $id = $1;
+	my $keywordselect = new RT::KeywordSelect($session{'CurrentUser'});
+	$keywordselect->Load($id) || push @actions, "Couldn't load keywordSelect";
+	my ($val, $msg) = $keywordselect->SetDisabled(1);
+	if ($val) {
+	    push @actions, 'KeywordSelect disabled.';
+	}	
+	else {
+	    push @actions, $msg;
+	}	
+    }
+}
+# }}}
+# {{{ if we're modifying keyword selects
+my @fields = qw(Name Keyword Single Depth);
+
+while (my $ks = $KeywordSelects->Next) {
+    foreach my $field (@fields) {
+	if (defined ($ARGS{"KeywordSelect-".$ks->Id."-".$field}) &&
+	    ($ARGS{"KeywordSelect-".$ks->Id."-".$field} ne $ks->$field())) {
+	    
+	    my $method = "Set$field";
+	    my ($val, $msg) = $ks->$method($ARGS{"KeywordSelect-".$ks->Id."-".$field});
+	    push @actions, "Keyword Select ". $ks->Name."/$field:".$msg;
+	}	
+    }
+}
+# }}}
+
+</%init>
+
+<%ARGS>
+$id => undef         #some identifier that a Queue could 
+
+</%ARGS>
diff --git a/rt/webrt/Admin/Queues/Modify.html b/rt/webrt/Admin/Queues/Modify.html
new file mode 100755
index 000000000..7a200df92
--- /dev/null
+++ b/rt/webrt/Admin/Queues/Modify.html
@@ -0,0 +1,137 @@
+<& /Admin/Elements/Header, Title => 'Admin/Queue/Basics' &>
+<& /Admin/Elements/QueueTabs, id => $QueueObj->id &>
+<& /Elements/ListActions, actions => \@results &>
+
+
+
+<& /Elements/TitleBoxStart, title => $title &>
+
+
+<FORM ACTION="<%$RT::WebPath%>/Admin/Queues/Modify.html" METHOD=POST>
+%if ($Create ) {
+<INPUT TYPE=HIDDEN NAME=id VALUE="new">
+% } else {
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$QueueObj->Id%>">
+% }
+
+<TABLE>
+<TR><TD ALIGN=RIGHT>
+Queue Name: 
+</TD>
+<TD><INPUT name="Name" value="<%$QueueObj->Name%>"></TD>
+</TR><TR>
+<TD ALIGN=RIGHT>
+Description:</TD><TD COLSPAN=3><INPUT name="Description" value="<%$QueueObj->Description%>" size=60></TD></TR>
+<TR>
+<TD ALIGN=RIGHT>
+Correspondence Address:
+</TD><TD>
+<INPUT name="CorrespondAddress" value="<%$QueueObj->CorrespondAddress%>">
+<BR><font size="-1"><i>(If left blank, will default to <%$RT::CorrespondAddress%></i></font>
+</TD>
+<TD ALIGN=RIGHT>
+
+Comment Address: </TD><TD>
+<INPUT NAME="CommentAddress" value="<%$QueueObj->CommentAddress%>">
+<BR><font size="-1"><i>(If left blank, will default to <%$RT::CommentAddress%></i></font>
+</TD>
+</TR><TR>
+
+<TD ALIGN=RIGHT>
+Priority starts at: 
+</TD><TD><INPUT NAME="InitialPriority" value="<%$QueueObj->InitialPriority %>">
+</TD>
+<TD ALIGN=RIGHT>
+Over time, priority moves toward:
+</TD><TD><INPUT NAME="FinalPriority" value="<%$QueueObj->FinalPriority %>">
+</TD>
+</TR>
+<TR>
+<TD ALIGN=RIGHT>
+Requests should be due in:
+</TD><TD>
+<INPUT NAME="DefaultDueIn" VALUE="<%$QueueObj->DefaultDueIn%>"> days.
+</TD>
+</TR>
+<TR>
+<TD>
+</TD>
+<TD COLSPAN=4><INPUT TYPE=HIDDEN NAME="SetEnabled" VALUE="1">
+<INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>> Enabled (Unchecking this box disables this queue)<BR>
+</TD>
+</TR>
+
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit &>
+</form>
+
+
+
+<%INIT>
+
+my $QueueObj = new RT::Queue($session{'CurrentUser'});
+my  ($title, @results, $Disabled, $EnabledChecked);
+
+if ($Create) {
+    $title = "Create a queue";
+}
+
+else {
+    if ($id eq 'new') {
+       my ($val, $msg) =  $QueueObj->Create(Name => $Name);
+       if ($val == 0 ) {
+           Abort("Could not create queue: $msg");
+	}
+	else {
+		push @results, $msg;
+	}    
+     }
+     else {
+        $QueueObj->Load($id) || $QueueObj->Load($Name) || Abort("Couldn't load queue '$Name'");
+    }
+        $title = 'Editing Configuration for queue '.$QueueObj->Name;
+    
+}
+if ($QueueObj->Id()) {
+my @attribs= qw(Description CorrespondAddress CommentAddress Name 
+                InitialPriority FinalPriority DefaultDueIn);
+
+  @results = UpdateRecordObject( AttributesRef => \@attribs, 
+				    Object => $QueueObj, 
+				    ARGSRef => \%ARGS);
+
+}
+
+#we're asking about enabled on the web page but really care about disabled.
+if ($Enabled == 1) {
+    $Disabled = 0;
+}	
+else {
+    $Disabled = 1;
+}
+if  ( ($SetEnabled) and ( $Disabled != $QueueObj->Disabled) ) { 
+    my  ($code, $msg) = $QueueObj->SetDisabled($Disabled);
+    push @results, 'Enabled status '. $msg;
+}
+
+unless ($QueueObj->Disabled()) {
+    $EnabledChecked ="CHECKED";
+}
+</%INIT>
+
+
+<%ARGS>
+$id => undef
+$result => undef
+$Name => undef
+$Create => undef
+$Description => undef
+$CorrespondAddress => undef
+$CommentAddress => undef
+$InitialPriority => undef
+$FinalPriority => undef
+$DefaultDueIn => undef
+$SetEnabled => undef
+$Enabled => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Queues/People.html b/rt/webrt/Admin/Queues/People.html
new file mode 100755
index 000000000..b495400ed
--- /dev/null
+++ b/rt/webrt/Admin/Queues/People.html
@@ -0,0 +1,161 @@
+<& /Elements/Header, Title => 'Modify people related to queue ' . $QueueObj->Name &>
+<& /Admin/Elements/QueueTabs, id => $id  &>
+
+<& /Elements/ListActions, actions => \@results &>
+
+ 
+<FORM METHOD=POST ACTION="People.html">
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$QueueObj->Id%>">
+<& /Elements/TitleBoxStart, title => 'Modify watchers for queue \''.$QueueObj->Name ."'",   width => "100%" &>
+
+<TABLE WIDTH=100%>
+<TR>
+<TD VALIGN=TOP >
+
+<h3>Current watchers</h3>
+<i>(Check box to delete)</i><br><BR>
+
+
+Cc:
+
+<ul>
+
+%# Print out a placeholder if there are none.
+%if ($cc->Count == 0 ) {
+<li><i>none</i>
+% }
+
+%while (my $watcher=$cc->Next) {
+<li>
+<INPUT TYPE=CHECKBOX NAME="DelWatcher<%$watcher->id%>" UNCHECKED>
+%# account
+%if ($watcher->IsUser) { 
+<a href="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$watcher->OwnerObj->id%>">
+<%$watcher->OwnerObj->RealName%></a>:
+%} else {
+Email address:
+%}
+<i><%$watcher->Email%></i>
+%}
+</ul>
+
+
+Administrative Cc:
+<UL>
+%# Print out a placeholder if there are none.
+%if ($admincc->Count == 0 ) {
+<li><i>none</i>
+% }
+
+%while (my $watcher=$admincc->Next) {
+<li><INPUT TYPE=CHECKBOX NAME="DelWatcher<%$watcher->id%>" UNCHECKED>
+%# account
+%if ($watcher->IsUser) { 
+<a href="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$watcher->OwnerObj->id%>">
+<%$watcher->OwnerObj->RealName%></a>:
+%} else {
+Email address:
+%}
+<i><%$watcher->Email%></i>
+%}
+</UL>
+</TD>
+
+<TD VALIGN=TOP>
+<h3>New watchers</h3>
+Find people whose<BR>
+<& /Elements/SelectUsers &>
+
+<BR>
+Add new watchers:<br>
+
+% if ($msg) {
+<i><%$msg%></i>
+% } elsif ($Users) {
+<ul>
+% while (my $u = $Users->Next ) {
+<li><&/Elements/SelectWatcherType, Scope=>'queue', Name => "WatcherTypeUser".$u->Id &> <%$u->Name%>
+(<%$u->RealName%>)
+% }
+</ul>
+% }
+
+</TD>
+</TR>
+</TABLE>
+
+
+
+
+
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit, Label => 'Save Changes', Caption => "If you've updated anything above, be sure to" &>
+</form>
+
+<%INIT>
+
+my ($field, @results, $User, $Users, $watcher, $key, $msg);
+# {{{ Load the queue
+#If we get handed two ids, mason will make them an array. bleck.
+# We want teh first one. Just because there's no other sensible way
+# to deal
+
+
+
+my $QueueObj = new RT::Queue($session{'CurrentUser'});
+$QueueObj->Load($id) || Abort("Couldn't load queue '$id'");
+# }}}
+
+# {{{ Delete deletable watchers
+
+foreach $key (keys %ARGS) {
+    if (($key =~ /^DelWatcher(\d*)$/) and
+	($ARGS{$key})) {
+	$RT::Logger->debug("Deleting watcher $1\n");
+	my ($code, $msg) = $QueueObj->DeleteWatcher($1);
+	
+	push @results, $msg;
+    }
+}
+# }}}
+
+# {{{ Add new watchers
+foreach $key (keys %ARGS) {
+    #They're in this order because otherwise $1 gets clobbered :/
+    if ( ($ARGS{$key} =~ /^(AdminCc|Cc)$/) and
+	 ($key =~ /^WatcherTypeUser(\d*)$/) ) {
+	$RT::Logger->debug("Adding a watcher $1 to ".$ARGS{$key}."\n");
+	my ($code, $msg) = 
+	  $QueueObj->AddWatcher(Type => $ARGS{$key},
+				 Owner => $1);
+	push @results, $msg;
+    }
+}
+
+# }}}
+
+
+
+my $admincc = $QueueObj->AdminCc;
+my $cc = $QueueObj->Cc;
+ 
+
+if (!$ARGS{'UserString'}) {
+$msg = "No users selected.";
+ }
+else {
+    $Users = new RT::Users($session{'CurrentUser'});
+    $Users->Limit(FIELD => $ARGS{'UserField'},
+                 VALUE => $ARGS{'UserString'},
+                 OPERATOR => $ARGS{'UserOp'});
+     }
+</%INIT>
+
+<%ARGS>
+$UserField => 'Name'
+$UserOp => '='
+$UserString => undef
+$Type => undef
+$id => undef
+</%ARGS>
+
diff --git a/rt/webrt/Admin/Queues/Scrips.html b/rt/webrt/Admin/Queues/Scrips.html
new file mode 100755
index 000000000..95b8c4378
--- /dev/null
+++ b/rt/webrt/Admin/Queues/Scrips.html
@@ -0,0 +1,111 @@
+<& /Admin/Elements/Header, Title => 'Edit scrips' &>
+<& /Admin/Elements/QueueTabs, id => $QueueObj->Id &>
+
+<& /Elements/ListActions, actions => \@actions &>
+
+<& /Elements/TitleBoxStart, title => $description &>
+ 
+<h2>Global Scrips</h2>
+<& /Admin/Elements/ListGlobalScrips &>
+<BR> 
+  <FORM METHOD=POST ACTION="Scrips.html">
+    <INPUT TYPE=HIDDEN NAME=id VALUE=<%$id%>>
+<h2>Queue Scrips</h2>
+% if ($Scrips->Count > 0 ) {
+<TABLE>
+<TR>
+<TD>Delete
+</TD>
+<TD>
+</TR>
+% while (my $scrip = $Scrips->Next ) {
+<TR>
+<TD>
+<INPUT TYPE="CHECKBOX" NAME="DeleteScrip-<%$scrip->Id%>">
+</TD>
+<TD>
+<% $scrip->ConditionObj->Name %> 
+<% $scrip->ActionObj->Name %> with template
+<% $scrip->TemplateObj->Name %>
+</TD>
+</TR>
+% }
+</TABLE>
+% }
+<BR>
+<h2>Add a scrip to this queue</h2>
+Condition: <& /Admin/Elements/SelectScripCondition, Name => 'NewScripCondition' &>
+	  Action: <& /Admin/Elements/SelectScripAction, Name => 'NewScripAction' &>
+	  Template: <& /Admin/Elements/SelectTemplate, Name => 'NewScripTemplate', DefaultQueue => $id &>
+
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit &>
+</FORM>
+<%init>
+my (@actions, $description);
+
+my $Scrips = new RT::Scrips ($session{'CurrentUser'});
+unless ($id =~ /^\d+$/) {
+    Abort("$id isn't a valid Queue id.");
+}
+
+unless ($Scrips->LimitToQueue($id)) {
+    Abort("Couldn't load Scrips.");
+        }
+
+my $QueueObj = new RT::Queue($session{'CurrentUser'});
+$QueueObj->Load($id);
+
+if ($QueueObj->id) {
+    $description = "Modify scrips for queue '". $QueueObj->Name ."'";
+}
+else {
+    $description = "Modify global scrips";
+}
+
+
+if ($NewScripAction and $NewScripCondition) {
+    my $NewScrip = new RT::Scrip($session{'CurrentUser'});
+    
+    my ($retval, $msg) = $NewScrip->Create ( ScripAction => $NewScripAction,
+				     ScripCondition => $NewScripCondition,
+				     Stage => 'TransactionCreate',
+				     Queue => $id,
+				     Template => $NewScripTemplate);
+    if (defined $retval) {
+        push @actions, $msg;
+    }
+    else {
+        push @actions, $msg;
+    }
+}
+
+# {{{ deal with modifying and deleting existing scrips
+my ($key );
+foreach $key (keys %ARGS) {
+	# {{{ if we're trying to delete the scrip
+    if ($key =~ /^DeleteScrip-(\d+)/) {
+            my $id = $1;
+	        my $scrip = new RT::Scrip($session{'CurrentUser'});
+	        $scrip->Load($id);
+    	    my ($retval, $msg) = $scrip->Delete;
+	    if ($retval) {
+	        push @actions, 'Scrip deleted';
+	    }
+	    else {
+		push @actions, $msg;
+	    }
+	}
+	# }}}
+
+    
+}
+# }}}
+</%init>
+
+<%ARGS>
+$NewScripCondition => undef
+$NewScripAction => undef
+$NewScripTemplate => undef
+$id => undef         #some identifier that a Queue could 
+</%ARGS>
diff --git a/rt/webrt/Admin/Queues/Template.html b/rt/webrt/Admin/Queues/Template.html
new file mode 100755
index 000000000..61ee418a6
--- /dev/null
+++ b/rt/webrt/Admin/Queues/Template.html
@@ -0,0 +1,68 @@
+<& /Admin/Elements/Header, title => "Modify template ".$TemplateObj->id&>
+<& /Admin/Elements/QueueTabs, id => $Queue &>
+<& /Elements/ListActions, actions => \@results &>
+
+<& /Elements/TitleBoxStart, title => $title &>
+
+<FORM METHOD=POST ACTION="Template.html">
+%if ($create ) {
+<INPUT TYPE=HIDDEN NAME=template VALUE="new">
+% } else {
+<INPUT TYPE=HIDDEN NAME=template VALUE="<%$TemplateObj->Id%>">
+% }
+
+%# hang onto the queue id
+<INPUT TYPE=HIDDEN name="Queue" value="<%$Queue%>">
+
+
+Name: <input name="Name" VALUE="<%$TemplateObj->Name%>" SIZE=20><BR>
+Description: <input name="Description" VALUE="<%$TemplateObj->Description%>" SIZE=80><BR>
+
+<TEXTAREA NAME=Content ROWS=25 COLS=80 WRAP=SOFT>
+<%$TemplateObj->Content%></TEXTAREA>
+
+<& /Elements/TitleBoxEnd&>
+<&/Elements/Submit&>
+</FORM>
+
+
+
+<%INIT>
+
+my $TemplateObj = new RT::Template($session{'CurrentUser'});
+my  ($title, @results);
+
+if ($create) {
+  $title = "Create a template";
+}
+
+else {
+  if ($template eq 'new') {
+      my ($val, $msg) =  $TemplateObj->Create(Queue => $Queue, Name => $Name);
+      Abort("Could not create template: $msg") unless ($val);
+     push @results, $msg;
+     $title = 'Created template ' . $TemplateObj->Name(); 
+    }
+    else {
+       $TemplateObj->Load($template) || Abort('No Template');
+      $title = 'Editing template ' . $TemplateObj->Name(); 
+    }
+  
+    
+}
+if ($TemplateObj->Id()) {
+  $Queue = $TemplateObj->Queue;
+
+  my @attribs = qw( Description Content Queue Name);
+  my @aresults = UpdateRecordObject( AttributesRef => \@attribs, 
+				     Object => $TemplateObj, 
+				     ARGSRef => \%ARGS);
+  push @results, @aresults;
+}
+</%INIT>
+<%ARGS>
+$Queue => undef
+$template => undef
+$create => undef
+$Name => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Queues/Templates.html b/rt/webrt/Admin/Queues/Templates.html
new file mode 100755
index 000000000..218d41dc9
--- /dev/null
+++ b/rt/webrt/Admin/Queues/Templates.html
@@ -0,0 +1,24 @@
+<& /Admin/Elements/Header, Title => 'Edit templates for '.$Queue->Name &>
+<& /Admin/Elements/QueueTabs, id => $Queue->id &>
+
+<& /Elements/TitleBoxStart, title => 'Edit templates for '.$Queue->Name &>
+<UL>
+<LI><A href="Template.html?create=1&Queue=<%$Queue->id%>">Create a new template</A><BR><BR>
+
+%while  (my $TemplateObj = $Templates->Next) { 
+
+<LI><A HREF="Template.html?Queue=<%$id%>&template=<%$TemplateObj->id()%>"><%$TemplateObj->id()%>/<%$TemplateObj->Name%>: <%$TemplateObj->Description%></a><BR>
+
+%}
+
+<& /Elements/TitleBoxEnd &>
+<%INIT>
+
+my $Queue = new RT::Queue($session{'CurrentUser'});
+$Queue->Load($id);
+my $Templates = $Queue->Templates;
+
+</%INIT>
+<%ARGS>
+$id => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Queues/UserRights.html b/rt/webrt/Admin/Queues/UserRights.html
new file mode 100755
index 000000000..75d9cb282
--- /dev/null
+++ b/rt/webrt/Admin/Queues/UserRights.html
@@ -0,0 +1,72 @@
+<& /Admin/Elements/Header, Title => 'Modify user rights for queue '. $QueueObj->Name &>
+<& /Admin/Elements/QueueTabs, id => $id &>  
+<& /Elements/ListActions, actions => \@results &>
+
+  <FORM METHOD=POST ACTION="UserRights.html">
+    <INPUT TYPE=HIDDEN NAME=id VALUE="<% $QueueObj->id %>">
+      
+<& /Elements/TitleBoxStart, title => 'Modify user rights for queue '.$QueueObj->Name &>
+      
+<TABLE>
+        
+%	while (my $UserObj = $Users->Next()) {
+  <TR ALIGN=RIGHT> 
+	<TD VALIGN=TOP>
+	    <% $UserObj->Name %>
+		  </TD>
+	  <TD>
+	    <& /Admin/Elements/SelectRights, PrincipalObj => $UserObj,
+		    PrincipalType => 'User',
+		      Scope => 'Queue',
+			QueueObj => $QueueObj &>
+	  </TD>
+	</TR>
+% }
+      </TABLE>
+            
+      <& /Elements/TitleBoxEnd &>
+      <& /Elements/Submit, Caption => "Be sure to save your changes", Reset => 1 &>
+      
+  </FORM>
+  
+<%INIT>
+ 
+  #Update the acls.
+  my @results =  ProcessACLChanges(\@CheckACL, \%ARGS);
+
+# {{{ Deal with setting up the display of current rights.
+
+# {{{ do basic initialization.
+
+#Define vars used in html above
+my ($GroupObj);
+
+my ($right);
+
+
+if (!defined $id) {
+    Abort("No Queue defined");
+}
+
+my $QueueObj = new RT::Queue($session{'CurrentUser'});
+$QueueObj->Load($id) ||
+  Abort("Couldn't load queue $id");
+
+# Find out which users we want to display ACL selects for
+my $Users = new RT::Users($session{'CurrentUser'});
+$Users->LimitToPrivileged();
+
+# }}}
+    
+  
+# }}}
+    
+</%INIT>
+
+<%ARGS>
+$id => undef
+$UserString => undef
+$UserOp => undef
+$UserField => undef
+@CheckACL => undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Queues/index.html b/rt/webrt/Admin/Queues/index.html
new file mode 100755
index 000000000..52dfb73c8
--- /dev/null
+++ b/rt/webrt/Admin/Queues/index.html
@@ -0,0 +1,52 @@
+<& /Admin/Elements/Header, Title => 'Admin queues' &>
+<& /Admin/Elements/Tabs, current_tab => 'Admin/Queues/' &>
+
+
+<& /Elements/TitleBoxStart, title => 'Select a queue' &>
+
+<TABLE>
+<TR>
+<TD VALIGN=TOP>
+
+<FORM METHOD=POST ACTION="<% $RT::WebPath %>/Admin/Queues/">
+
+<input type="checkbox" name="FindDisabledQueues"> Include disabled queues in listing.
+<BR>
+<div align=right><input type=submit value="Go!"></div> 
+</FORM>
+</TD>
+<TD VALIGN=TOP>
+<UL>
+% if ($session{'CurrentUser'}->HasSystemRight('AdminQueue')) {
+<LI><A HREF="<%$RT::WebPath%>/Admin/Queues/Modify.html?Create=1">Create a new queue</A><BR><BR></LI>
+</UL>
+% }
+
+<%$caption%><BR>
+<UL>
+%if ($queues->Count == 0) {
+<LI> <i>No queues matching search criteria found.</i>
+% }
+%while ( $queue = $queues->Next) {
+<LI><A HREF="Modify.html?id=<%$queue->id%>"><%$queue->Name%></a></LI>
+%}
+
+</UL>
+</TD>
+</TR>
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+
+<%INIT>
+my ($queue, $caption);
+my $queues = new RT::Queues($session{'CurrentUser'});
+$queues->UnLimit();
+
+if ($FindDisabledQueues) {
+	$queues->{'find_disabled_rows'} = 1;
+}
+
+</%INIT>
+<%ARGS>
+$FindDisabledQueues => 0
+</%ARGS>
diff --git a/rt/webrt/Admin/Users/Modify.html b/rt/webrt/Admin/Users/Modify.html
new file mode 100755
index 000000000..b6daed49b
--- /dev/null
+++ b/rt/webrt/Admin/Users/Modify.html
@@ -0,0 +1,259 @@
+<& /Admin/Elements/Header, Title => $title &>
+<& /Admin/Elements/UserTabs, id => $id, current_subtab => '/Admin/Elements/Modify.html?id='.$id &>
+
+<& /Elements/ListActions, actions => \@results &>
+
+<FORM ACTION="<%$RT::WebPath%>/Admin/Users/Modify.html" METHOD=POST>
+%if ($Create) {
+<INPUT TYPE=HIDDEN NAME=id VALUE="new">
+% } else {
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$UserObj->Id%>">
+% }
+
+<TABLE WIDTH=100% BORDER=0>
+<TR>
+
+<TD VALIGN=TOP ROWSPAN=2>
+<& /Elements/TitleBoxStart, title => 'Identity' &>
+
+Username: <input name="Name" value="<%$UserObj->Name%>"> <b>(required)</b> <BR>
+Email: <input name="EmailAddress" value="<%$UserObj->EmailAddress%>"><BR>
+Real Name: <input name="RealName" value="<%$UserObj->RealName%>"> <BR>
+Nickname: <input name="NickName" value="<%$UserObj->NickName%>">
+<BR>
+Unix login: <input name="Gecos" value="<%$UserObj->Gecos%>">
+<BR>
+Extra info: <textarea name="FreeformContactInfo" cols=20 rows=5><%$UserObj->FreeformContactInfo%></TEXTAREA>
+<& /Elements/TitleBoxEnd &>
+</TD>
+<TD VALIGN=TOP>
+<& /Elements/TitleBoxStart, title => 'Access control' &>
+<INPUT TYPE=HIDDEN NAME="SetEnabled" VALUE="1">
+<INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>>
+Let this user access RT<BR>
+
+
+<INPUT TYPE=HIDDEN NAME="SetPrivileged" VALUE="1">
+<INPUT TYPE=CHECKBOX NAME="Privileged" VALUE="1" <%$PrivilegedChecked%>> Let this user be granted rights<BR>
+		    
+% unless ($RT::WebExternalAuth) {
+<TABLE>
+<TR>
+<TD ALIGN=RIGHT>
+New Password:
+</TD>
+<TD ALIGN=LEFT>
+<input type=password name="Pass1">
+</TD>
+</TR>
+<TR><TD ALIGN=RIGHT>
+Retype Password:
+</TD>
+<TD>
+<input type=password name="Pass2">
+</TD>
+</TR>
+</TABLE>
+% }
+<& /Elements/TitleBoxEnd &>
+</TD>
+<TR>
+
+<TD VALIGN=TOP>
+<& /Elements/TitleBoxStart, title => 'Location' &>
+Organization: <input name="Organization" value="<%$UserObj->Organization%>">
+<BR>
+Address1: <input name="Address1" value="<%$UserObj->Address1%>">
+<BR>
+Address2: <input name="Address2" value="<%$UserObj->Address2%>">
+<BR>
+City: <input name="City" value="<%$UserObj->City%>" size=14>
+
+State: <input name="State" value="<%$UserObj->State%>" size=3>
+
+Zip: <input name="Zip" value="<%$UserObj->Zip%>" size=9>
+<BR>
+Country: <input name="Country" value="<%$UserObj->Country%>">
+<BR>
+
+
+<& /Elements/TitleBoxEnd &>
+</TD>
+</TR>
+<TR>
+<TD COLSPAN=2 VALIGN=TOP>
+
+
+<& /Elements/TitleBoxStart, title => 'Phone numbers' &>
+Home: <input name="HomePhone" value="<%$UserObj->HomePhone%>" size=13>
+
+Work: <input name="WorkPhone" value="<%$UserObj->WorkPhone%>" size=13>
+
+Mobile: <input name="MobilePhone" value="<%$UserObj->MobilePhone%>" size=13>
+
+Pager: <input name="PagerPhone" value="<%$UserObj->PagerPhone%>" size=13>
+<& /Elements/TitleBoxEnd &>
+<BR>
+<& /Elements/TitleBoxStart, title => 'Comments about this user' &>
+<TEXTAREA name="Comments" COLS=80 ROWS=5 WRAP=VIRTUAL><%$UserObj->Comments%></TEXTAREA>
+<& /Elements/TitleBoxEnd &>
+
+
+%if ($UserObj->Privileged) {
+<BR>
+<& /Elements/TitleBoxStart, title => 'Signature' &>
+<TEXTAREA COLS=80 ROWS=5 name="Signature" WRAP=HARD>
+<%$UserObj->Signature%></TEXTAREA>
+<& /Elements/TitleBoxEnd &>
+% }
+
+</TD>
+
+</TR>
+</TABLE>
+
+
+<& /Elements/Submit &>
+</form>
+
+
+<%INIT>
+
+my $UserObj = new RT::User($session{'CurrentUser'});
+my ($title, $PrivilegedChecked, $EnabledChecked, $Disabled, $result, @results);
+
+my ($val, $msg);
+
+if ($Create) {
+    $title = "Create a new user";
+} 
+else {
+
+    if ($id eq 'new') {
+	($val, $msg) = $UserObj->Create( Name => $Name,
+					 EmailAddress => $ARGS{'EmailAddress'}
+				       );
+	if ($val) {
+		push @results, $msg;
+	} else {
+		push @results, 'User could not be created: '. $msg;
+	}	
+	
+    }
+    else {
+	$UserObj->Load($id) || $UserObj->Load($Name) || Abort("Couldn't load user '$Name'");
+	$val = $UserObj->Id();
+    }
+
+    if ($val) {
+	$title = "Modify the user ". $UserObj->Name;
+    }	
+
+    # If the create failed
+    else {
+	$title = "Create a new user";
+	$Create = 1;
+    }    
+
+    
+
+}
+
+
+
+
+# If we have a user to modify, lets try. 
+if ($UserObj->Id) {
+    
+    my @fields = qw(Name Comments Signature EmailAddress FreeformContactInfo 
+		    Organization RealName NickName Lang EmailEncoding WebEncoding 
+		    ExternalContactInfoId ContactInfoSystem Gecos ExternalAuthId 
+		    AuthSystem HomePhone WorkPhone MobilePhone PagerPhone Address1
+		Address2 City State Zip Country 
+		   );
+    
+    my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
+					    Object => $UserObj,
+					    ARGSRef => \%ARGS );
+    push (@results,@fieldresults);
+
+
+# {{{ Deal with special fields: Privileged, Enabled and Password
+if  ( ($SetPrivileged) and ( $Privileged != $UserObj->Privileged) ) {
+my  ($code, $msg) = $UserObj->SetPrivileged($Privileged);
+     push @results, 'Privileged status: '. $msg;
+}
+
+#we're asking about enabled on the web page but really care about disabled.
+if ($Enabled == 1) {
+    $Disabled = 0;
+}	
+else {
+    $Disabled = 1;
+}
+if  ( ($SetEnabled) and ( $Disabled != $UserObj->Disabled) ) { 
+    my  ($code, $msg) = $UserObj->SetDisabled($Disabled);
+    push @results, 'Enabled status '. $msg;
+}
+
+
+#TODO: make this report errors properly
+if ((defined $Pass1) and ($Pass1 ne '') and ($Pass1 eq $Pass2) and (!$UserObj->IsPassword($Pass1))) {
+    my ($code, $msg);
+    ($code, $msg) = $UserObj->SetPassword($Pass1);
+    push @results, 'Password: '. $msg;
+}
+
+# }}}
+}
+
+
+# {{{ Do some setup for the ui
+unless ($UserObj->Disabled()) {
+    $EnabledChecked ="CHECKED";
+}
+
+if ($UserObj->Privileged()) {  
+    $PrivilegedChecked = "CHECKED";
+}
+
+# }}}
+</%INIT>
+
+
+<%ARGS>
+$id => undef
+$Name  => undef
+$Comments  => undef
+$Signature  => undef
+$EmailAddress  => undef
+$FreeformContactInfo => undef
+$Organization  => undef
+$RealName  => undef
+$NickName  => undef
+$Privileged => undef
+$SetPrivileged => undef
+$Enabled => undef
+$SetEnabled => undef
+$Lang  => undef
+$EmailEncoding  => undef
+$WebEncoding => undef
+$ExternalContactInfoId  => undef
+$ContactInfoSystem  => undef
+$Gecos => undef
+$ExternalAuthId  => undef
+$AuthSystem  => undef
+$HomePhone => undef
+$WorkPhone  => undef
+$MobilePhone  => undef
+$PagerPhone  => undef
+$Address1 => undef
+$Address2  => undef
+$City  => undef
+$State  => undef
+$Zip  => undef
+$Country => undef
+$Pass1 => undef
+$Pass2=> undef
+$Create=> undef
+</%ARGS>
diff --git a/rt/webrt/Admin/Users/Prefs.html b/rt/webrt/Admin/Users/Prefs.html
new file mode 100755
index 000000000..4a9fc5cdf
--- /dev/null
+++ b/rt/webrt/Admin/Users/Prefs.html
@@ -0,0 +1,97 @@
+<& /Elements/Header, Title=>"User view" &>
+
+<& /Elements/ViewUser, User=>$u &>
+
+%if ($session{CurrentUser} && ($session{CurrentUser}->Id == $id)) {
+	<& /Elements/TitleBoxStart, title => 'Signature'  &>
+<form method=post>
+<input type="hidden" name="id" value=<%$id%>>
+<TEXTAREA COLS=72 ROWS=4 WRAP=HARD NAME="Signature"><% $u->Signature %></TEXTAREA><br><br>
+<input type="submit" value="Update signature">
+</form>
+	  <& /Elements/TitleBoxEnd &>
+	  <form method=post>
+	  Open tickets (from listing) in another window: <input type="checkbox" name="NewWindowOption" <%exists $session{NewWindowOption} && "CHECKED"%>><br>
+	  Open tickets (from listing) in a new window: <input type="checkbox" name="AlwaysNewWindowOption" <%exists $session{AlwaysNewWindowOption} && "CHECKED"%>><br>
+	  <input type="submit" name="NewWindowSetting" value="New window setting">
+	  </form>
+%}
+
+	<& /Elements/TitleBoxStart, title => 'Email'  &>
+<form method=post>
+<input type="hidden" name="id" value="<%$id%>">
+<input name="Email" value="<% $u->EmailAddress %>"><input type="submit" value="Update email">
+</form>
+	  <& /Elements/TitleBoxEnd &>
+	<& /Elements/TitleBoxStart, title => 'Real Name'  &>
+<form method=post>
+<input type="hidden" name="id" value="<%$id%>">
+<input name="RealName" value="<% $u->RealName %>"><input type="submit" value="Update name">
+</form>
+	  <& /Elements/TitleBoxEnd &>
+
+	<& /Elements/TitleBoxStart, title => 'User ID'  &>
+<form method=post>
+<input type="hidden" name="id" value="<%$id%>">
+<input name="Name" value="<% $u->Name %>"><input type="submit" value="Update ID">
+</form>
+	  <& /Elements/TitleBoxEnd &>
+
+%# TODO: alternative email addresses + merging users
+
+<%ARGS>
+$id => $session{CurrentUser} ? $session{CurrentUser}->Id : 0
+$Signature => undef
+$Email => undef
+$RealName => undef
+$Name => undef
+</%ARGS>
+
+<%INIT>
+require RT::User;
+my $u=RT::User->new($session{CurrentUser});
+$u->Load($id) || die "Couldn't load that user ($id)";
+if ($Signature) {
+my ($val, $msg)=$u->SetSignature($Signature);
+$RT::Logger->log(level=>($val ? 'info' : 'error'), message=>$msg);
+}
+
+if ($Email) {
+my ($val, $msg)=$u->SetEmailAddress($Email);
+$RT::Logger->log(level=>($val ? 'info' : 'error'), message=>$msg);
+}
+
+if ($RealName) {
+my ($val, $msg)=$u->SetRealName($RealName);
+$RT::Logger->log(level=>($val ? 'info' : 'error'), message=>$msg);
+}
+
+if ($Name) {
+my ($val, $msg)=$u->SetName($Name);
+$RT::Logger->log(level=>($val ? 'info' : 'error'), message=>$msg);
+}
+
+if ($ARGS{NewWindowSetting}) {
+if ($ARGS{NewWindowOption}) {
+$session{NewWindowOption}=1;
+} else {
+delete $session{NewWindowOption};
+}
+if ($ARGS{AlwaysNewWindowOption}) {
+$session{NewWindowOption}=1;
+$session{AlwaysNewWindowOption}=1;
+} else {
+delete $session{AlwaysNewWindowOption};
+}
+}
+
+</%INIT>
+
+
+
+
+
+
+
+
+
diff --git a/rt/webrt/Admin/Users/Rights.html b/rt/webrt/Admin/Users/Rights.html
new file mode 100644
index 000000000..3b94f9157
--- /dev/null
+++ b/rt/webrt/Admin/Users/Rights.html
@@ -0,0 +1 @@
+Placeholder
diff --git a/rt/webrt/Admin/Users/index.html b/rt/webrt/Admin/Users/index.html
new file mode 100755
index 000000000..383513710
--- /dev/null
+++ b/rt/webrt/Admin/Users/index.html
@@ -0,0 +1,71 @@
+<& /Admin/Elements/Header, Title => 'Admin users' &>
+<& /Admin/Elements/Tabs, current_tab => 'Admin/Users/' &>
+
+
+<& /Elements/TitleBoxStart, title => 'Select a user' &>
+
+<TABLE>
+<TR>
+<TD VALIGN=TOP>
+
+<FORM METHOD=POST ACTION="<% $RT::WebPath %>/Admin/Users/">
+
+Find people whose <& /Elements/SelectUsers &><BR>
+<input type="checkbox" name="FindDisabledUsers"> Include disabled users in search.
+<BR>
+<div align=right><input type=submit value="Go!"></div> 
+</FORM>
+</TD>
+<TD VALIGN=TOP>
+<UL>
+% if ($session{'CurrentUser'}->HasSystemRight('AdminUsers')) {
+<LI><A HREF="<%$RT::WebPath%>/Admin/Users/Modify.html?Create=1">Create a new user</A><BR><BR></LI>
+</UL>
+% }
+
+<%$caption%><BR>
+<UL>
+%if ($users->Count == 0) {
+<LI> <i>No users matching search criteria found.</i>
+% }
+%while ( $user = $users->Next) {
+<LI><A HREF="Modify.html?id=<%$user->id%>"><%$user->Name || '(no name listed)'%></a></LI>
+%}
+
+</UL>
+</TD>
+</TR>
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+
+<%INIT>
+my ($user, $caption);
+my $users = new RT::Users($session{'CurrentUser'});
+
+if ($FindDisabledUsers) {
+	$users->{'find_disabled_rows'} = 1;
+}
+
+unless (defined $UserString) {
+    $users->LimitToPrivileged();
+    $caption = "Privileged users";
+}
+else {
+    $caption = "Users matching search criteria";
+
+  if ($UserString) {
+	$users->Limit( FIELD => $UserField,
+		        OPERATOR => $UserOp,
+		       VALUE => $UserString); 
+
+}
+}
+</%INIT>
+<%ARGS>
+$UserString => undef
+$UserOp => '='
+$UserField => 'Name'
+$IdLike => undef
+$EmailLike => undef
+$FindDisabledUsers => 0
+</%ARGS>
diff --git a/rt/webrt/Admin/index.html b/rt/webrt/Admin/index.html
new file mode 100755
index 000000000..1ed973f7e
--- /dev/null
+++ b/rt/webrt/Admin/index.html
@@ -0,0 +1,4 @@
+  <& /Admin/Elements/Header, Title => 'RT Administration' &>
+<& /Admin/Elements/Tabs &>
+
+
diff --git a/rt/webrt/Elements/Checkbox b/rt/webrt/Elements/Checkbox
new file mode 100755
index 000000000..964c482ba
--- /dev/null
+++ b/rt/webrt/Elements/Checkbox
@@ -0,0 +1,17 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/Checkbox,v 1.1 2002-08-12 06:17:08 ivan Exp $
+<INPUT TYPE="Checkbox" NAME ="<%$Name%>" <%$IsChecked%>>
+
+<%ARGS>
+$Name => undef
+$Default => undef
+$True => undef
+$False => undef
+$IsChecked => undef
+</%ARGS>
+
+<%INIT>
+$IsChecked = 
+  ($Default && $Default =~ /checked/i)
+    ? " CHECKED " : "";
+1;
+</%INIT>
diff --git a/rt/webrt/Elements/CreateTicket b/rt/webrt/Elements/CreateTicket
new file mode 100644
index 000000000..1270f6ebe
--- /dev/null
+++ b/rt/webrt/Elements/CreateTicket
@@ -0,0 +1 @@
+<FORM ACTION="<% $RT::WebPath%>/Ticket/Create.html"><input type=submit value="New ticket in">&nbsp;<& /Elements/SelectNewTicketQueue &></FORM>
diff --git a/rt/webrt/Elements/CustomHomepageHeader b/rt/webrt/Elements/CustomHomepageHeader
new file mode 100644
index 000000000..e69de29bb
diff --git a/rt/webrt/Elements/Error b/rt/webrt/Elements/Error
new file mode 100755
index 000000000..ec2cf511f
--- /dev/null
+++ b/rt/webrt/Elements/Error
@@ -0,0 +1,23 @@
+<& /Elements/Header, Code => $Code, Why => $Why &>
+<& /Elements/Tabs &>
+<& /Elements/TitleBoxStart, title => $Title &>
+<%$Why%>
+<br>
+<font size=-1>
+<%$Details%>
+</font>
+<& /Elements/TitleBoxEnd &>
+</body>
+</HTML>
+
+
+<%args>
+$Code => undef
+$Details => undef
+$Title => "RT Error"
+$Why => "the calling component did not specify why"
+</%args>
+
+<%INIT>
+$RT::Logger->error("WebRT: $Why ($Details)");
+</%INIT>
diff --git a/rt/webrt/Elements/Footer b/rt/webrt/Elements/Footer
new file mode 100755
index 000000000..776c219bb
--- /dev/null
+++ b/rt/webrt/Elements/Footer
@@ -0,0 +1,10 @@
+% if ($Debug) {
+<HR>
+<b>Time to display: <%time - $m->{'rt_base_time'} %></b>
+% }
+</BODY>
+</HTML>
+
+<%ARGS>
+$Debug => 0
+</%ARGS>
diff --git a/rt/webrt/Elements/GotoTicket b/rt/webrt/Elements/GotoTicket
new file mode 100644
index 000000000..21d2bcdf8
--- /dev/null
+++ b/rt/webrt/Elements/GotoTicket
@@ -0,0 +1 @@
+<FORM ACTION="<%$RT::WebPath%>/Ticket/Display.html"><input type=submit value="Goto ticket">&nbsp;<input size=5 name=id></FORM>
diff --git a/rt/webrt/Elements/Header b/rt/webrt/Elements/Header
new file mode 100755
index 000000000..471331be2
--- /dev/null
+++ b/rt/webrt/Elements/Header
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+<HEAD>
+<TITLE><%$Title%></TITLE>
+<META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
+
+%# TODO this gets called from error. but I have no idea what it might
+%# be used for. can we whack it?  -jesse
+% if ($Code) {
+<META HTTP-EQUIV VALUE="<%$Code%> <%$Why%>">
+% }
+% if ($Refresh > 0) {
+<META HTTP-EQUIV="REFRESH" CONTENT="<%$Refresh%>">
+% }
+
+<link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/webrt.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR="<%$BgColor%>">
+% if ($ShowBar) {
+<TABLE BORDER=0 WIDTH=100% CELLSPACING=0 BGCOLOR="#993333">
+<TR VALIGN=TOP>
+<TD><IMG SRC="<%$RT::LogoURL%>" alt="RT"></TD>
+<TD VALIGN=CENTER ALIGN=LEFT>
+<font size=+2 color="#ffffff">
+<B>
+<%$Title%>
+</B>
+</font>
+</TD>
+<TD ALIGN=RIGHT>
+<font color="#ffffff">
+% if ($session{'CurrentUser'}) {
+Signed in as <b><%$session{'CurrentUser'}->Name%></b>.<BR>
+% if ($session{'CurrentUser'}->HasSystemRight('ModifySelf')) {
+[<A class='inverse' HREF="<%$RT::WebPath%>/User/Prefs.html" >Preferences</A>] 
+% }
+% unless ($RT::WebExternalAuth) { 
+[<A class='inverse' HREF="<%$RT::WebPath%>/NoAuth/Logout.html">Logout</a>]
+% }
+% } else {
+Not logged in.
+% }
+</font>
+</TD>
+</TR>
+</TABLE>
+
+<BR>
+% }
+<%ARGS>
+$Title => 'WebRT'
+$Code => undef
+$Refresh => undef
+$Why => undef
+$BgColor => '#ffffff'
+$ShowBar => 1
+</%ARGS>
+<%INIT>
+$Title = "RT/$RT::rtname: ".$Title;
+</%INIT>
+
diff --git a/rt/webrt/Elements/ListActions b/rt/webrt/Elements/ListActions
new file mode 100755
index 000000000..3fc9b0ba5
--- /dev/null
+++ b/rt/webrt/Elements/ListActions
@@ -0,0 +1,14 @@
+% if (@actions ) {
+<& /Elements/TitleBoxStart, title => 'Results' &>
+<UL>
+% foreach my $action (@actions) {
+% next unless ($action);
+<LI><%$action%></LI>
+% }
+</UL>
+<& /Elements/TitleBoxEnd &>
+<BR>
+% }
+<%ARGS>
+@actions => undef
+</%ARGS>
diff --git a/rt/webrt/Elements/Login b/rt/webrt/Elements/Login
new file mode 100755
index 000000000..27ec98281
--- /dev/null
+++ b/rt/webrt/Elements/Login
@@ -0,0 +1,69 @@
+<& /Elements/Header, Title=>"Login" , &>
+
+<DIV ALIGN=CENTER>
+% if ($Error) {
+<& /Elements/TitleBoxStart, title => 'Error' &>
+<% $Error %>
+<& /Elements/TitleBoxEnd &>
+% }
+<BR>
+<& /Elements/TitleBoxStart, width=> "40%", titleright => "RT $RT::VERSION for $RT::rtname", title => 'Login' ,
+contentbg=>"#cccccc" &>
+
+
+% unless ($RT::WebExternalAuth) {
+<FORM METHOD=POST >
+<TABLE BORDER=0 WIDTH=100%>
+<TR ALIGN=RIGHT>
+<TD ALIGN=RIGHT>Username:</TD><TD ALIGN=LEFT><input name=user value="<%$user%>"></TD></TR>
+<TR><TD ALIGN=RIGHT>Password:</TD><TD ALIGN=LEFT><input type=password name=pass></TD></TR>
+<TR><TD colspan=2 align=right>
+<input type=submit Value="Login">
+</TD></TR>
+</TABLE>
+<&/Elements/TitleBoxEnd&>
+% # From mason 1.0.1 forward, this doesn't work. in fact, it breaks things.
+% if (0) {
+% # The code below iterates through everything in the passed in arguments
+% # Preserving all the old parameters
+% # This would be easier, except mason is 'smart' and calls multiple values
+% # arrays rather than multiple hash keys
+% my $key; my $val;
+% foreach $key (keys %ARGS) {
+%  if (($key ne 'user') and ($key ne 'pass')) {
+% 	if (ref($ARGS{$key}) =~ /ARRAY/) {
+% 		foreach $val (@{$ARGS{$key}}) {
+<input type=hidden name="<%$key %>" value="<% $val %>">
+% 		}
+% 	}
+%	else {
+<input type="hidden" name="<% $key %>" value="<% $ARGS{$key} %>">
+% 	}
+% }
+%}
+% }
+</FORM>
+% }
+</DIV>
+
+<BR>
+<!-- TODO: not yet implemented
+If you've forgotten your username or password, RT can <A
+href="/NoAuth/Reminder.html">send you a reminder</a>.
+-->
+<BR>
+<HR>
+RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is
+distributed under <a href="http://www.gnu.org/copyleft/gpl.html">Version 2 of the GNU General Public License.</a>
+
+
+<%ARGS>
+$user => ""
+$pass => undef
+$goto => undef
+$Error => undef
+</%ARGS>
+
+<%INIT>
+SetContentType('text/html');
+</%INIT>
diff --git a/rt/webrt/Elements/MessageBox b/rt/webrt/Elements/MessageBox
new file mode 100644
index 000000000..aa081a380
--- /dev/null
+++ b/rt/webrt/Elements/MessageBox
@@ -0,0 +1,30 @@
+<TEXTAREA COLS=<%$Width%> ROWS=15 WRAP=HARD NAME="<%$Name%>"><% $Default %><%$message%><%$signature%></TEXTAREA>
+<%INIT>
+
+my ($message);
+
+if ($MessageURI) {
+	my $code;
+	($code, $Default)=RT::Link->GetContent($MessageURI);
+}
+if ($QuoteTransaction) {
+    my $transaction=RT::Transaction->new($session{'CurrentUser'});
+    $transaction->Load($QuoteTransaction);
+    $message=$transaction->Content(Quote => 1);
+}
+
+my $signature = '';
+if ($session{'CurrentUser'}->UserObj->Signature) {
+	$signature = "-- \n".$session{'CurrentUser'}->UserObj->Signature;
+}
+
+</%INIT>
+<%ARGS>
+$QuoteTransaction => undef
+$Name => 'Content'
+$Default => ''
+$DefaultURI => undef
+$Width => 72
+$MessageURI => undef
+</%ARGS>
+
diff --git a/rt/webrt/Elements/MyRequests b/rt/webrt/Elements/MyRequests
new file mode 100644
index 000000000..67817296c
--- /dev/null
+++ b/rt/webrt/Elements/MyRequests
@@ -0,0 +1,45 @@
+<& /Elements/TitleBoxStart, title => "25 highest priority tickets I requested..." &>
+<TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>
+<TR>
+<TH align=right>#</TH>
+<TH align=left>Subject</TH>
+<TH align=left>Queue</TH>
+<TH align=left>Status</TH>
+<TH align=left>Owner</TH>
+<TH>&nbsp;</TH>
+</TR>
+% while (my $Ticket = $MyTickets->Next) {
+<TR>
+<TD ALIGN=RIGHT>
+<%$Ticket->Id%>
+</TD>
+<TD>
+<A HREF="<% $RT::WebPath %>/Ticket/Display.html?id=<%$Ticket->Id%>">
+<%$Ticket->Subject || '[no subject]'%>
+</A>
+</TD>
+<TD>
+<%$Ticket->QueueObj->Name%>
+</TD><TD>
+<%$Ticket->Status%>
+</TD><TD>
+<%$Ticket->OwnerObj->Name%>
+</TD><TD ALIGN=RIGHT>
+[<A HREF="<% $RT::WebPath %>/Ticket/Display.html?id=<%$Ticket->Id%>">Display</A>]
+</TD>
+</TR>
+% }
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+
+
+<%INIT>
+my $MyTickets;
+$MyTickets = new RT::Tickets ($session{'CurrentUser'});
+$MyTickets->LimitRequestor(VALUE => $session{'CurrentUser'}->EmailAddress);
+$MyTickets->LimitStatus(VALUE => "open");
+$MyTickets->LimitStatus(VALUE => "new");
+$MyTickets->OrderBy(FIELD => 'Priority', ORDER => 'DESC');
+$MyTickets->RowsPerPage(25);
+
+</%INIT>
diff --git a/rt/webrt/Elements/MyTickets b/rt/webrt/Elements/MyTickets
new file mode 100644
index 000000000..64a2ba7cc
--- /dev/null
+++ b/rt/webrt/Elements/MyTickets
@@ -0,0 +1,43 @@
+<& /Elements/TitleBoxStart, title => "25 highest priority tickets I own..." &>
+<TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>
+<TR>
+<TH ALIGN=RIGHT>#</TH>
+<TH ALIGN=LEFT>Subject</TH>
+<TH ALIGN=LEFT>Queue</TH>
+<TH ALIGN=LEFT>Status</TH>
+<TH ALIGN=LEFT>&nbsp;</TH>
+</TR>
+% while (my $Ticket = $MyTickets->Next) {
+<TR>
+<TD ALIGN=RIGHT>
+<%$Ticket->Id%>
+</TD>
+<TD>
+<A HREF="<% $RT::WebPath %>/Ticket/Display.html?id=<%$Ticket->Id%>">
+<%$Ticket->Subject || '[no subject]'%>
+</A>
+</TD>
+<TD>
+<%$Ticket->QueueObj->Name%>
+</TD><TD>
+<%$Ticket->Status%>
+</TD>
+<TD ALIGN=RIGHT>
+[<A HREF="<% $RT::WebPath %>/Ticket/Update.html?id=<%$Ticket->Id%>">Update</A>]
+</TD>
+</TR>
+% }
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+
+
+<%INIT>
+my $MyTickets;
+$MyTickets = new RT::Tickets ($session{'CurrentUser'});
+$MyTickets->LimitOwner(VALUE => $session{'CurrentUser'}->Id);
+$MyTickets->LimitStatus(VALUE => "open");
+$MyTickets->LimitStatus(VALUE => "new");
+$MyTickets->OrderBy(FIELD => 'Priority', ORDER => 'DESC');
+$MyTickets->RowsPerPage(25);
+
+</%INIT>
diff --git a/rt/webrt/Elements/Quicksearch b/rt/webrt/Elements/Quicksearch
new file mode 100644
index 000000000..d44c996fa
--- /dev/null
+++ b/rt/webrt/Elements/Quicksearch
@@ -0,0 +1,41 @@
+<& /Elements/TitleBoxStart, title => "Find new/open tickets", titleright => "<A class='inverse' href=\"$RT::WebPath/Search/Listing.html?NewSearch=1\">Advanced Search</A>" &>
+
+<TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>                       
+<tr>                                                                          
+       <th align=left>Queue</th>                                         
+       <th align=left><font size=-1>New</font></th>
+       <th align=left><font size=-1>Open</font></th>          
+       <th align=left><font size=-1>Stalled</font></th>          
+</tr>
+
+<%PERL>
+while (my $queue = $Queues->Next) {
+     $Tickets->ClearRestrictions;                                           
+     $Tickets->LimitStatus(VALUE => "open");                                
+     $Tickets->LimitQueue(VALUE => $queue->id, OPERATOR => '=');            
+     my $open = $Tickets->Count();
+
+     $Tickets->ClearRestrictions;                                           
+     $Tickets->LimitStatus(VALUE => "new");
+     $Tickets->LimitQueue(VALUE => $queue->id, OPERATOR => '=');            
+     my $new = $Tickets->Count();
+
+     $Tickets->ClearRestrictions; 
+     $Tickets->LimitStatus(VALUE => "stalled");
+     $Tickets->LimitQueue(VALUE => $queue->id, OPERATOR => '=');            
+     my $stalled = $Tickets->Count();
+</%PERL>
+<TR><TD><A HREF="<% $RT::WebPath%>/Search/Listing.html?ValueOfStatus=open&ValueOfStatus=new&StatusOp=%3D&QueueOp=%3D&ValueOfQueue=<%$queue->Id%>&RowsPerPage=50&NewSearch=1"><%$queue->Name%></a></TD>
+<TD><%$new%></TD>
+<TD><%$open%></TD>
+<TD><%$stalled%></TD>
+</TR>
+% }
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+
+<%INIT>
+my $Queues = new RT::Queues($session{'CurrentUser'}); 
+$Queues->UnLimit();
+my $Tickets = new RT::Tickets ($session{'CurrentUser'});
+</%INIT>
diff --git a/rt/webrt/Elements/Refresh b/rt/webrt/Elements/Refresh
new file mode 100644
index 000000000..6949d8c24
--- /dev/null
+++ b/rt/webrt/Elements/Refresh
@@ -0,0 +1,22 @@
+<SELECT NAME="<%$Name%>">
+<OPTION VALUE="-1"
+%unless ($Default) {
+ SELECTED
+%}
+>Don't refresh this page.</OPTION>
+%foreach my $value (@refreshevery) {
+<OPTION VALUE="<%$value%>"
+% if ($value == $Default) {
+SELECTED 
+% }
+>Refresh this page every <%$value/60%> minutes.
+%}
+</SELECT>
+
+<%INIT>
+my @refreshevery = qw(120 300 600 1200 3600 7200);
+</%INIT>
+<%ARGS>
+$Name => undef
+$Default => undef
+</%ARGS>
diff --git a/rt/webrt/Elements/Section b/rt/webrt/Elements/Section
new file mode 100755
index 000000000..067311d9e
--- /dev/null
+++ b/rt/webrt/Elements/Section
@@ -0,0 +1,11 @@
+<TABLE WIDTH=100%>
+<TR>
+<TD>
+<font size=+4><%$title%></font>
+</TD>
+</TR>
+</TABLE>
+
+<%ARGS>
+$title => undef
+</%ARGS>
\ No newline at end of file
diff --git a/rt/webrt/Elements/SelectBoolean b/rt/webrt/Elements/SelectBoolean
new file mode 100755
index 000000000..93b78ce76
--- /dev/null
+++ b/rt/webrt/Elements/SelectBoolean
@@ -0,0 +1,24 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectBoolean,v 1.1 2002-08-12 06:17:08 ivan Exp $
+<SELECT NAME ="<%$Name%>">
+<OPTION VALUE="<%$TrueVal%>" <%$TrueDefault%>><%$True%></OPTION>
+<OPTION VALUE="<%$FalseVal%>" <%$FalseDefault%>><%$False%></OPTION>
+</SELECT>
+
+<%ARGS>
+$Name => undef
+$True => "is"
+$Default => 'true'
+$TrueVal => 1
+$FalseVal => 0
+$False => "isn't"
+</%ARGS>
+
+<%INIT>
+my ($TrueDefault, $FalseDefault);
+if ($Default && $Default !~ /true/i) {
+	$FalseDefault = "SELECTED";
+}
+else {
+	$TrueDefault = "SELECTED";
+}
+</%INIT>
diff --git a/rt/webrt/Elements/SelectDate b/rt/webrt/Elements/SelectDate
new file mode 100755
index 000000000..6fafbf170
--- /dev/null
+++ b/rt/webrt/Elements/SelectDate
@@ -0,0 +1,25 @@
+<INPUT NAME="<%$Name%>" VALUE="<%$Default%>" size=16> 
+
+<%init>
+unless ((defined $Default) or 
+	($current <= 0)) {
+	my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
+                                            localtime($current);
+        $Default = sprintf("%04d-%02d-%02d %02d:%02d",                         
+                           $year+1900,$mon+1,$mday,                            
+                           $hour,$min);   
+}
+
+unless ($Name) {
+	$Name = $menu_prefix. "_Date";
+}
+</%init>
+
+<%args>
+
+$ShowTime => undef
+$menu_prefix=>''
+$current=>time
+$Default => undef
+$Name => undef
+</%args>
diff --git a/rt/webrt/Elements/SelectDateRelation b/rt/webrt/Elements/SelectDateRelation
new file mode 100755
index 000000000..c5849c8e2
--- /dev/null
+++ b/rt/webrt/Elements/SelectDateRelation
@@ -0,0 +1,14 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectDateRelation,v 1.1 2002-08-12 06:17:08 ivan Exp $
+<SELECT NAME ="<%$Name%>">
+<OPTION VALUE="&lt;"><%$Before%></OPTION>
+<OPTION VALUE="="><%$On%></OPTION>
+<OPTION VALUE="&gt;"><%$After%></OPTION>
+</SELECT>
+
+<%ARGS>
+$Name => undef
+$Default => undef
+$Before => 'Before'
+$On => 	'On'
+$After => 'After'
+</%ARGS>
diff --git a/rt/webrt/Elements/SelectDateType b/rt/webrt/Elements/SelectDateType
new file mode 100755
index 000000000..65c0e9b4b
--- /dev/null
+++ b/rt/webrt/Elements/SelectDateType
@@ -0,0 +1,12 @@
+<SELECT NAME="<%$Name%>">
+<OPTION VALUE="Created">Created</OPTION>
+<OPTION VALUE="Started">Started</OPTION>
+<OPTION VALUE="Resolved">Resolved</OPTION>
+<OPTION VALUE="Told">Last Contacted</OPTION>
+<OPTION VALUE="LastUpdated">Last Updated</OPTION>
+<OPTION VALUE="StartsBy">Starts By</OPTION>
+<OPTION VALUE="Due">Due</OPTION>
+</SELECT>
+<%ARGS>
+$Name => 'DateType'
+</%ARGS>
diff --git a/rt/webrt/Elements/SelectEqualityOperator b/rt/webrt/Elements/SelectEqualityOperator
new file mode 100755
index 000000000..f93dc1af2
--- /dev/null
+++ b/rt/webrt/Elements/SelectEqualityOperator
@@ -0,0 +1,18 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectEqualityOperator,v 1.1 2002-08-12 06:17:08 ivan Exp $
+<SELECT NAME ="<%$Name%>">
+% while (my $option = shift @Options) {
+% my $value = shift @Values;
+<OPTION VALUE="<%$value%>"
+% if ($Default eq '$value') {
+SELECTED
+% }
+><%$option%></OPTION>
+% }
+</SELECT>
+
+<%ARGS>
+$Name => undef
+@Options => ('less than', 'equal to', 'greater than', 'not equal to')
+@Values => qw(< = > !=)
+$Default => undef
+</%ARGS>
diff --git a/rt/webrt/Elements/SelectKeyword b/rt/webrt/Elements/SelectKeyword
new file mode 100644
index 000000000..c4bd9e1aa
--- /dev/null
+++ b/rt/webrt/Elements/SelectKeyword
@@ -0,0 +1,38 @@
+<SELECT NAME=<%$Name%> <%$Size%> <%$Multiple%>>
+<OPTION VALUE="">-</OPTION>
+<OPTION VALUE="NULL">(empty)</OPTION>
+%   foreach my $kid ( keys %{$Descendents} ) {
+<OPTION VALUE="<% $kid %>" 
+%if ($kid == $Default) {
+SELECTED
+%}
+><% $Descendents->{$kid} %></OPTION>
+% }
+</SELECT>
+
+
+<%INIT>
+
+unless (defined $KeywordObj) {
+    $KeywordObj = new RT::Keyword($session{'CurrentUser'});
+    $KeywordObj->Load($Root);
+}
+my $Descendents = $KeywordObj->Descendents();
+
+if ($Multiple) {
+	$Multiple = "MULTIPLE";
+}
+if ($Size) {
+	$Size="SIZE=$Size";
+}	
+
+
+</%INIT>
+<%ARGS>
+$Multiple => undef
+$Size => undef
+$Name => 'Keyword'
+$KeywordObj => undef
+$Root => 0
+$Default => undef
+</%ARGS>
diff --git a/rt/webrt/Elements/SelectKeywordOptions b/rt/webrt/Elements/SelectKeywordOptions
new file mode 100644
index 000000000..f56dfe52c
--- /dev/null
+++ b/rt/webrt/Elements/SelectKeywordOptions
@@ -0,0 +1,18 @@
+<PERL>
+while (my $keyword = $keywords->Next()) {
+    my ($selected);
+    if $keyword->Id == $default
+</PERL>
+<OPTION VALUE="<%$keyword->id%>"><% '-' x $depth %><%$keyword->Name%></OPTION>
+<& SelectKeywordOptions, depth => ($depth+1), root => $keyword->id &>
+%}
+<%INIT>
+
+my $keywords = new RT::Keywords($session{'CurrentUser'});
+$keywords->LimitToParent($root);
+
+</%INIT>
+<%ARGS>
+$root => undef
+$depth => 0
+</%ARGS>
\ No newline at end of file
diff --git a/rt/webrt/Elements/SelectLinkType b/rt/webrt/Elements/SelectLinkType
new file mode 100644
index 000000000..22cde3dff
--- /dev/null
+++ b/rt/webrt/Elements/SelectLinkType
@@ -0,0 +1,16 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectLinkType,v 1.1 2002-08-12 06:17:08 ivan Exp $
+
+<SELECT NAME ="<%$Name%>">
+% foreach ('MemberOf', 'DependsOn', 'RefersTo') { # TODO: Merging!
+<OPTION VALUE="<%$_%>"><%$_%></OPTION>
+% }
+</SELECT>
+
+<%ARGS>
+$Name => "LinkType"
+$Default => undef
+</%ARGS>
+
+<%INIT>
+# TODO handle Default
+</%INIT>
diff --git a/rt/webrt/Elements/SelectMatch b/rt/webrt/Elements/SelectMatch
new file mode 100644
index 000000000..7f3a94fae
--- /dev/null
+++ b/rt/webrt/Elements/SelectMatch
@@ -0,0 +1,31 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectMatch,v 1.1 2002-08-12 06:17:08 ivan Exp $
+<SELECT NAME ="<%$Name%>">
+<OPTION VALUE="LIKE" <%$LikeDefault%>><%$Like%></OPTION>
+<OPTION VALUE="NOT LIKE" <%$NotLikeDefault%>><%$NotLike%></OPTION>
+<OPTION VALUE="=" <%$TrueDefault%>><%$True%></OPTION>
+<OPTION VALUE="!=" <%$FalseDefault%>><%$False%></OPTION>
+</SELECT>
+
+<%ARGS>
+$Name => undef
+$Like => 'contains'
+$NotLike => "doesn't contain"
+$True => 'is'
+$False => "isn't"
+$Default => undef
+</%ARGS>
+<%INIT>
+my ($TrueDefault, $FalseDefault, $LikeDefault, $NotLikeDefault);
+if ($Default && $Default !~ /true/i) {
+	$FalseDefault = "SELECTED";
+}
+elsif ($Default && $Default !~ /false/i) {
+	$TrueDefault = "SELECTED";
+} 
+elsif ($Default && $Default !~ /notlike/i) {
+	$NotLikeDefault = "SELECTED";
+}
+else {
+	$LikeDefault = "SELECTED";
+}
+</%INIT>
diff --git a/rt/webrt/Elements/SelectNewTicketQueue b/rt/webrt/Elements/SelectNewTicketQueue
new file mode 100755
index 000000000..9f5cd2871
--- /dev/null
+++ b/rt/webrt/Elements/SelectNewTicketQueue
@@ -0,0 +1,9 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectNewTicketQueue,v 1.1 2002-08-12 06:17:08 ivan Exp $
+<& SelectQueue, Name => $Name, Verbose => $Verbose, Default => $Default,
+	ShowAllQueues => 0, ShowNullOption => 0 &>
+
+<%ARGS>
+$Name => 'Queue'
+$Verbose => undef
+$Default => undef
+</%ARGS>
diff --git a/rt/webrt/Elements/SelectOwner b/rt/webrt/Elements/SelectOwner
new file mode 100755
index 000000000..59ebf3631
--- /dev/null
+++ b/rt/webrt/Elements/SelectOwner
@@ -0,0 +1,22 @@
+<SELECT NAME="<%$Name%>">
+<OPTION VALUE="">-</OPTION>
+<OPTION <% ($RT::Nobody->Id() == $Default) && "SELECTED" %> VALUE="<%$RT::Nobody->Id%>"><%$RT::Nobody->Name%></OPTION>
+%while ( my $User = $Users->Next())  {
+% if ((!defined $QueueObj) || ($User->HasQueueRight(Right => 'OwnTicket', QueueObj => $QueueObj, TicketObj => $TicketObj))){
+<OPTION VALUE="<%$User->Id()%>" <% ($User->Id() == $Default) && "SELECTED" %>><%$User->Name()%></OPTION>
+% }
+%}
+</SELECT>
+
+<%INIT>
+my $Users = RT::Users->new($session{CurrentUser});
+$Users->LimitToPrivileged;
+</%INIT>
+
+<%ARGS>
+$QueueObj => undef
+$Name => undef
+$Default => undef
+$User => undef
+$TicketObj => undef
+</%ARGS>
diff --git a/rt/webrt/Elements/SelectQueue b/rt/webrt/Elements/SelectQueue
new file mode 100755
index 000000000..d63b17b4e
--- /dev/null
+++ b/rt/webrt/Elements/SelectQueue
@@ -0,0 +1,38 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectQueue,v 1.1 2002-08-12 06:17:08 ivan Exp $
+
+% if ($Lite) {
+<INPUT NAME="<%$Name%>" size=25 DEFAULT="<%$d->Name%>">
+% } else {
+<SELECT NAME ="<%$Name%>">
+% if ($ShowNullOption) {
+<OPTION VALUE="">-</OPTION>
+% }
+% while (my $queue=$q->Next) {
+% if ($ShowAllQueues || $queue->CurrentUserHasRight('CreateTicket')) {
+<OPTION VALUE="<%$queue->Id%>" <%($queue->Id == $Default) && 'SELECTED'%>><%$queue->Name%>
+%   if (($Verbose) and ($queue->Description) ){
+(<%$queue->Description%>)
+%  }
+</OPTION>
+% }
+% }
+</SELECT>
+% }
+<%ARGS>
+$ShowNullOption => 1
+$ShowAllQueues => 1
+$Name => undef
+$Verbose => undef
+$Default => undef
+$Lite => 0
+</%ARGS>
+
+<%INIT>
+
+my $q=new RT::Queues($session{'CurrentUser'});
+$q->UnLimit;
+
+my $d = new RT::Queue($session{'CurrentUser'});
+$d->Load($Default);
+
+</%INIT>
diff --git a/rt/webrt/Elements/SelectResultsPerPage b/rt/webrt/Elements/SelectResultsPerPage
new file mode 100644
index 000000000..0699c6868
--- /dev/null
+++ b/rt/webrt/Elements/SelectResultsPerPage
@@ -0,0 +1,22 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectResultsPerPage,v 1.1 2002-08-12 06:17:08 ivan Exp $
+
+%# TODO: Better default handling
+
+<SELECT NAME ="<%$Name%>">
+% foreach my $value (@values) {
+<OPTION VALUE="<%$value%>" <% $value == $Default && 'SELECTED' %>>
+<% shift @labels %>
+</OPTION>
+% }
+</SELECT>
+
+<%INIT>
+my @values = qw(0 10 25 50 100);
+my @labels = qw(Unlimited 10 25 50 100);
+</%INIT>
+<%ARGS>
+
+$Name => undef
+$Default => 50
+
+</%ARGS>
diff --git a/rt/webrt/Elements/SelectSortOrder b/rt/webrt/Elements/SelectSortOrder
new file mode 100644
index 000000000..6dc900631
--- /dev/null
+++ b/rt/webrt/Elements/SelectSortOrder
@@ -0,0 +1,18 @@
+<SELECT NAME="<%$Name%>">
+%foreach my $order (@orders) {
+<OPTION VALUE="<%$order%>" <%$order eq $Default && 'SELECTED' %>>
+<% shift @order_names %>
+</OPTION>
+% }
+</SELECT>
+
+<%INIT>
+my @orders = qw (ASC DESC);
+my @order_names = qw (Ascending Descending);
+
+</%INIT>
+
+<%ARGS>
+$Name => 'SortOrder'
+$Default => 'ASC'
+</%ARGS>
diff --git a/rt/webrt/Elements/SelectStatus b/rt/webrt/Elements/SelectStatus
new file mode 100755
index 000000000..92df7c619
--- /dev/null
+++ b/rt/webrt/Elements/SelectStatus
@@ -0,0 +1,17 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectStatus,v 1.1 2002-08-12 06:17:08 ivan Exp $
+
+<SELECT NAME ="<%$Name%>">
+<OPTION VALUE="">-</OPTION>
+%foreach my $status (@status) {
+<OPTION VALUE="<%$status%>" <%($Default eq $status) && 'SELECTED'%>><%$status%></OPTION>
+% }
+</SELECT>
+<%ONCE>
+my $queue = new RT::Queue($session{'CurrentUser'});
+my @status = $queue->StatusArray();
+</%ONCE>
+<%ARGS>
+$Name => undef
+$Default => undef
+ 
+</%ARGS>
diff --git a/rt/webrt/Elements/SelectTicketSortBy b/rt/webrt/Elements/SelectTicketSortBy
new file mode 100644
index 000000000..02021decc
--- /dev/null
+++ b/rt/webrt/Elements/SelectTicketSortBy
@@ -0,0 +1,15 @@
+<SELECT NAME="<%$Name%>">
+% foreach my $field (@sortfields) {
+<OPTION VALUE="<%$field%>" <%$field eq $Default && 'SELECTED'%>><%$field%></OPTION>
+% }
+</SELECT>
+
+<%INIT>
+my $tickets = new RT::Tickets($session{'CurrentUser'});
+my @sortfields = $tickets->SortFields();
+
+</%INIT>
+<%ARGS>
+$Name => 'SortTicketsBy'
+$Default => 'id'
+</%ARGS>
diff --git a/rt/webrt/Elements/SelectUsers b/rt/webrt/Elements/SelectUsers
new file mode 100755
index 000000000..f517d3510
--- /dev/null
+++ b/rt/webrt/Elements/SelectUsers
@@ -0,0 +1,8 @@
+<select name="UserField">
+<option value="Name">User Id
+<option value="EmailAddress">Email
+<option value="RealName">Name
+<option value="Organization">Organization
+</select>
+<& /Elements/SelectMatch, Name=> 'UserOp' &>
+<input size=8 name="UserString">
diff --git a/rt/webrt/Elements/SelectWatcherType b/rt/webrt/Elements/SelectWatcherType
new file mode 100644
index 000000000..5a855192c
--- /dev/null
+++ b/rt/webrt/Elements/SelectWatcherType
@@ -0,0 +1,26 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectWatcherType,v 1.1 2002-08-12 06:17:08 ivan Exp $
+%# portions Copyright 2000 Tobias Brox <tobix@fsck.com>
+%# Request Tracker is Copyright 1996-2000 Jesse Vincent <jesse@fsck.com>
+
+<SELECT NAME ="<%$Name%>">
+<OPTION VALUE="none">-</OPTION>
+%# Make nice options:
+%for my $option (@types) {
+<OPTION VALUE="<%$option%>" <%$option eq $Default && "SELECTED"%>><%$option%></OPTION>
+%}
+</SELECT>
+
+<%INIT>
+my @types;
+if ($Scope =~ 'queue') {
+   @types = qw(Cc AdminCc);
+}
+else { 
+   @types = qw(Requestor Cc AdminCc);
+}
+</%INIT>
+<%ARGS>
+$Default=>undef
+$Scope => 'ticket'
+$Name => 'WatcherType'
+</%ARGS>
diff --git a/rt/webrt/Elements/ShadedBox b/rt/webrt/Elements/ShadedBox
new file mode 100755
index 000000000..334b57975
--- /dev/null
+++ b/rt/webrt/Elements/ShadedBox
@@ -0,0 +1,5 @@
+<div align="left"><span class=label><%$title |n %></span><br><b><%$content |n %></b></div>
+<%ARGS>
+$title => undef
+$content => "&nbsp;"
+</%ARGS>
diff --git a/rt/webrt/Elements/Submit b/rt/webrt/Elements/Submit
new file mode 100755
index 000000000..7b75e9e98
--- /dev/null
+++ b/rt/webrt/Elements/Submit
@@ -0,0 +1,44 @@
+<TABLE WIDTH=100% BGCOLOR="<%$color%>" CELLSPACING=0 BORDER=0 CELLPADDING=0 >
+<TR>
+% if ($Reset) {
+<TD>
+<FONT COLOR=#ffd800 >
+<INPUT TYPE=RESET VALUE="<%$ResetLabel%>">
+</FONT>
+</TD>
+%}
+<TD>
+&nbsp;
+</TD>
+<TD ALIGN=RIGHT VALIGN=CENTER>
+
+<FONT COLOR=#ffd800>
+
+% if ($AlternateLabel) {
+<B><%$AlternateCaption%>
+<INPUT TYPE=SUBMIT
+%if ($Name) {
+NAME="<%$Name%>"
+%}
+VALUE='<%$AlternateLabel%>'></B>
+% }
+
+<B><%$Caption%>
+<INPUT TYPE=SUBMIT
+%if ($Name) {
+NAME="<%$Name%>"
+% }
+ VALUE='<%$Label%>'></B></FONT>
+</TD>
+</TR>
+</TABLE>
+<%ARGS>
+$color => "#336699"
+$Caption => undef
+$AlternateCaption => undef
+$AlternateLabel => undef
+$Label => 'Submit'
+$Name => undef
+$Reset => undef
+$ResetLabel => 'Reset'
+</%ARGS>
diff --git a/rt/webrt/Elements/Tabs b/rt/webrt/Elements/Tabs
new file mode 100755
index 000000000..6eacf391a
--- /dev/null
+++ b/rt/webrt/Elements/Tabs
@@ -0,0 +1,133 @@
+<TABLE WIDTH=100%>
+    <TR>
+      <TD VALIGN=TOP>
+	<TABLE cellspacing=1>
+	  <TR>
+% foreach $tab (sort keys %{$toptabs}) {
+	    <TD ALIGN=CENTER>
+	      <font size=+1>
+		[<A 
+% if ($current_toptab eq $toptabs->{$tab}->{'path'}) {
+class='currenttab'
+% } 
+	HREF="<%$RT::WebPath%>/<% $toptabs->{$tab}->{'path'}%>"><% $toptabs->{$tab}->{'title'}%></A>]
+
+
+	      </font>
+	    </TD>
+% }
+	  </TR>
+	</TABLE>
+<BR>
+% if ($tabs_scalar) {
+<% $tabs_scalar |n%>
+% }
+% if ($tabs) {
+	
+	<TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0>	
+	  <TR>
+% foreach $tab (sort keys %{$tabs}) {
+	    <TD ALIGN=CENTER VALIGN=TOP>
+[<A 
+% if ($current_tab eq $tabs->{$tab}->{'path'}) {
+class='currenttab' 
+% } 
+HREF="<%$RT::WebPath%>/<% $tabs->{$tab}->{'path'}%>"><% $tabs->{$tab}->{'title'}%></A>]</TD>
+%}
+	  </TR>
+	</TABLE>
+%}
+
+<BR>
+% if ($subtabs_scalar) {
+<% $subtabs_scalar |n%>
+% }
+% if ($subtabs) {
+	<TABLE>	
+	  <TR>
+% foreach $tab (sort keys %{$subtabs}) {
+	    <TD ALIGN=CENTER>
+	      [<A HREF="<%$RT::WebPath%>/<% $subtabs->{$tab}->{'path'}%>"><% $subtabs->{$tab}->{'title'}%></A>]
+	    </TD>
+%}
+	  </TR>
+	</TABLE>
+%}
+      </TD>
+      <TD VALIGN=TOP ALIGN=RIGHT>
+<TABLE>
+<TR>
+
+% foreach $action (sort keys %{$topactions}) {
+<TD><font size=-1><%$topactions->{"$action"}->{'html'} |n %></font></TD>
+% }
+</TR>
+</TABLE>
+	
+
+	
+% if ($actions) {
+<TABLE><TR>
+%  foreach $action (sort keys %{$actions}) {
+<TD>
+<FONT SIZE=-1>
+% if ($actions->{"$action"}->{'html'}) {
+<%$actions->{"$action"}->{'html'} |n%>
+% } else {
+<A HREF="<%$RT::WebPath%>/<% $actions->{$action}->{'path'}%>"><% $actions->{$action}->{'title'}%></A>
+% }
+</FONT>
+</TD>
+%  }
+</TR></TABLE>
+% }
+	
+% if ($subactions_scalar) {
+<% $subactions_scalar |n%>
+% }
+% if ($subactions) {
+<BR>|&nbsp;
+%  foreach $action (sort keys %{$subactions}) {
+<%$subactions->{"$action"}->{'html'} |n%>&nbsp;|
+%  }
+% }
+      </TD>
+    </TR>
+  </TABLE>
+
+
+<%INIT>
+my ($tab, $action);
+my $toptabs = {    A => { title => 'Home',
+                           path => '',
+                         },
+                    B => { title => 'Search',
+                        path => 'Search/Listing.html'
+                      },
+
+                    D => { title => 'Configuration',
+                           path => 'Admin/'
+                         }
+                 };
+                    
+
+my $topactions = {
+	A => { html => $m->scomp('/Elements/CreateTicket')	
+		},
+	B => { html => $m->scomp('/Elements/GotoTicket') 
+		}
+	};
+</%INIT>
+<%ARGS>
+$current_toptab =>  "none"
+$current_tab => "none"
+$current_subtab => "none"
+$tabs => undef
+$tabs_scalar => undef
+$subtabs => undef
+$actions => undef
+$subactions => undef
+$subtabs_scalar => undef
+$subactions_scalar => undef
+</%ARGS>
+
diff --git a/rt/webrt/Elements/TitleBoxEnd b/rt/webrt/Elements/TitleBoxEnd
new file mode 100755
index 000000000..bdd41065a
--- /dev/null
+++ b/rt/webrt/Elements/TitleBoxEnd
@@ -0,0 +1,10 @@
+</TD></TR></TABLE>
+</TD>
+</TR>
+<TR><TD COLSPAN=4><IMG SRC="<%$RT::WebImagesURL%>spacer.gif" height=1 ALT="&nbsp;"width=1></TD>
+</TABLE>
+<%ARGS>
+$title => undef
+$content => undef
+</%ARGS>
+
diff --git a/rt/webrt/Elements/TitleBoxStart b/rt/webrt/Elements/TitleBoxStart
new file mode 100755
index 000000000..6d0f1f91a
--- /dev/null
+++ b/rt/webrt/Elements/TitleBoxStart
@@ -0,0 +1,20 @@
+<TABLE CLASS="<%$class%>" BGCOLOR="<%$color%>" CELLSPACING=0 BORDER=0 CELLPADDING=0 WIDTH="<%$width%>">
+<TR><TD ROWSPAN=2><IMG SRC="<%$RT::WebImagesURL%>spacer.gif" width=1 height=1 ALT=""></TD>
+<TD valign=middle align=left bgcolor="<%$color%>">&nbsp;<font size=-1 color="#ffffff"><b><% $title_href && "<A CLASS=\"$title_class\" HREF=\"$title_href\">"|n%><%$title |n %><%  $title_href && "</A>" |n%></b></font></TD>
+<TD  ALIGN="right" valign=middle bgcolor="<%$color%>"><FONT color="#ffffff" SIZE=-1><%$titleright |n %></FONT>&nbsp;</TD>
+<TD ROWSPAN=2><IMG SRC="<%$RT::WebImagesURL%>spacer.gif" width=1 height=1 ALT=""></TD></TR>
+<TR><TD COLSPAN=2 bgcolor="<%$contentbg%>" valign=top align=left WIDTH=100%>
+<TABLE CELLPADDING=2 WIDTH=100%><TR><TD>
+<%ARGS>
+$width => "100%"
+$class => undef
+
+$title_href => undef
+$title => undef
+$title_class => undef
+
+$titleright_href => undef
+$titleright => undef
+$contentbg => "#dddddd"
+$color => "#336699"
+</%ARGS>
diff --git a/rt/webrt/Elements/ViewUser b/rt/webrt/Elements/ViewUser
new file mode 100644
index 000000000..92446e6ef
--- /dev/null
+++ b/rt/webrt/Elements/ViewUser
@@ -0,0 +1,29 @@
+
+<& /Elements/TitleBoxStart, 
+	title => "<a class='inverse' href=\"$RT::WebPath/Search/Listing.html?LimitRequestorById=1&IdOfRequestor=".$User->id."\">Tickets from $name</a>",
+	titleright=> "<a class='inverse' href=\"$RT::WebPath/EditUserComments.html?id=".$User->id."\">Comments about $name</a>" &>
+<TABLE WIDTH="100%">
+<tr>
+<td halign=left valign=top>
+%while (my $w=$tickets->Next) {
+<%$w->Id%>: <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$w->id%>"><%$w->Subject%></a> (<%$w->Status%>)<BR>
+%}
+</td>
+<td align=right valign=top>
+	<% ($User->Comments || "No comment entered about this user") %>
+</tr>
+</table>
+<& /Elements/TitleBoxEnd &>
+
+<%ARGS>
+$User=>undef
+</%ARGS>
+
+<%INIT>
+my $name=$User->RealName || $User->EmailAddress;	
+
+my $tickets = new RT::Tickets($session{'CurrentUser'});
+$tickets->LimitRequestor(VALUE => $User->EmailAddress);
+
+
+</%INIT>
diff --git a/rt/webrt/Elements/dayMenu b/rt/webrt/Elements/dayMenu
new file mode 100755
index 000000000..6591b05d2
--- /dev/null
+++ b/rt/webrt/Elements/dayMenu
@@ -0,0 +1,19 @@
+<%doc>-------------------------------------------------------------------
+dayMenu: Display a pulldown menu of days of the month (1 to 31)
+
+Optional arguments:
+$menu_name - Name of menu, defaults to 'day'
+$current - Selected day value (1 to 31)
+-------------------------------------------------------------------</%doc>
+
+<select name="<% $menu_name %>">
+<option value="-1">-
+% foreach my $day (1..31) {
+<option value="<% $day %>" <% $day==$current ? "selected" : "" %>><% sprintf("%02d",$day) %>
+% }
+</select>
+
+<%args>
+$menu_name=>'day'
+$current=>undef
+</%args>
diff --git a/rt/webrt/Elements/monthMenu b/rt/webrt/Elements/monthMenu
new file mode 100755
index 000000000..b9a71d3f9
--- /dev/null
+++ b/rt/webrt/Elements/monthMenu
@@ -0,0 +1,37 @@
+<%doc>-------------------------------------------------------------------
+monthMenu: Display a pulldown menu of months
+
+Optional arguments:
+$menu_name - Name of menu, defaults to 'month'
+$current - Selected month value (1 to 12)
+$format - Choice of month labels:
+   'full'    (January, February, ...)
+   'short'   (Jan, Feb, ...)
+   'numeric' (1, 2, ...)
+  Defaults to 'full'. The format only affects appearance; the menu
+  values are always numeric.
+-------------------------------------------------------------------</%doc>
+
+<select name="<% $menu_name %>">
+<option value="-1">-
+% foreach my $month (1..12) {
+<option value="<% $month %>" <% $month==$current ? "selected" : "" %>>
+%   if ($format eq 'full') {
+<% $month_names[$month-1] %>
+%   } elsif ($format eq 'short') {
+<% substr($month_names[$month-1],0,3) %>
+%   } elsif ($format eq 'numeric') {
+<% sprintf("%02d",$month) %>
+%   }
+% }
+</select>
+
+<%init>
+my @month_names = qw(January February March April May June July August September October November December);
+</%init>
+
+<%args>
+$menu_name=>'month'
+$current=>undef
+$format=>'full'
+</%args>
diff --git a/rt/webrt/Elements/yearMenu b/rt/webrt/Elements/yearMenu
new file mode 100755
index 000000000..4a0e7a772
--- /dev/null
+++ b/rt/webrt/Elements/yearMenu
@@ -0,0 +1,24 @@
+<%doc>-------------------------------------------------------------------
+yearMenu: Display a pulldown menu of years.
+
+Optional arguments:
+$menu_name - Name of menu, defaults to 'year'
+$current - Selected year value
+$min - Minimum year appearing in menu; defaults to current year
+$max - Maximum year appearing in menus; defaults to $min plus 10.
+-------------------------------------------------------------------</%doc>
+
+<select name="<% $menu_name %>">
+<option value="-1">-
+% foreach my $year ($min..$max) {
+<option value="<% $year %>" <% $year==$current ? "selected" : "" %>>
+<% $year %>
+% }
+</select>
+
+<%args>
+$menu_name=>'year'
+$current=>(localtime)[5]+1900
+$min=>(localtime)[5]+1900-1
+$max=>$min+10
+</%args>
diff --git a/rt/webrt/NoAuth/Logout.html b/rt/webrt/NoAuth/Logout.html
new file mode 100755
index 000000000..a00ae9675
--- /dev/null
+++ b/rt/webrt/NoAuth/Logout.html
@@ -0,0 +1,22 @@
+<HTML>
+<HEAD>
+<TITLE>RT: Logout</TITLE>
+ <META HTTP-EQUIV="Refresh" CONTENT="0;URL=<%$RT::WebPath%>/">
+</HEAD>
+<BODY>
+<p>You have been logged out of RT.
+
+
+<br>
+<br>
+<A HREF="<%$RT::WebPath%>/">You're welcome to login again</a>
+
+
+<%PERL>
+if (defined %session) {
+	%session = undef;
+}
+$m->abort();
+</%PERL>
+
+
diff --git a/rt/webrt/NoAuth/Reminder.html b/rt/webrt/NoAuth/Reminder.html
new file mode 100755
index 000000000..a814a912f
--- /dev/null
+++ b/rt/webrt/NoAuth/Reminder.html
@@ -0,0 +1,3 @@
+<& /Elements/Header, title => 'Password Reminder' &>
+
+Not yet implemented.
diff --git a/rt/webrt/NoAuth/images/rt.jpg b/rt/webrt/NoAuth/images/rt.jpg
new file mode 100644
index 000000000..a137a932b
Binary files /dev/null and b/rt/webrt/NoAuth/images/rt.jpg differ
diff --git a/rt/webrt/NoAuth/images/spacer.gif b/rt/webrt/NoAuth/images/spacer.gif
new file mode 100644
index 000000000..5bfd67a2d
Binary files /dev/null and b/rt/webrt/NoAuth/images/spacer.gif differ
diff --git a/rt/webrt/NoAuth/webrt.css b/rt/webrt/NoAuth/webrt.css
new file mode 100755
index 000000000..a71d05720
--- /dev/null
+++ b/rt/webrt/NoAuth/webrt.css
@@ -0,0 +1,102 @@
+BODY, TD {font-family: Helvetica, Arial, sans-serif}
+TD {border-color: #cccccc }
+
+BLOCKQUOTE.message {
+	font-size: 80%;
+	font-family: "Helvetica", sans-serif;
+}
+
+
+BODY {
+  color: #000;
+  background: #FFFFFF;
+  font-family: "Helvetica", sans-serif;
+
+
+}
+
+TD, TH { /* ns workaround */
+  font-family: "Helvetica", sans-serif;
+}
+
+TR.oddline { 
+    background-color : #eeeeee;
+}
+
+H1, H2, H3 { 
+  margin-top: 0.2em;
+  color: #336699;
+  font-family: "Helvetica", sans-serif;
+
+  clear: both;
+}
+
+
+DIV.endmatter { margin-left: -7% }
+
+
+
+A { font-weight: bold; 
+      		color: #000000;
+	    /* border: none -- breaks NS 4.x */ }
+
+.currenttab { background-color: #cccccc; }
+
+.inverse { color: #ffffff; }
+
+
+
+A:link IMG, A:visited IMG { border-style: none }
+
+A IMG { color: white } /* The only way to hide the border in NS 4.x */
+
+.hide {
+  display: none;
+  color: white;
+}
+
+SPAN.date { font-size: 0.8em }
+
+SPAN.attribution {
+  font-weight: bold
+}
+
+SPAN.label { font-size: 0.8em; 
+}
+
+BLOCKQUOTE {
+  font-style: italic;
+  /* color: #990; */
+}
+
+ADDRESS { 
+  text-align: right;
+  font-weight: bold;
+  font-style: italic 
+}
+
+BLOCKQUOTE P {			/* Try to avoid space above the attribution */
+  margin-bottom: 0;
+}
+BLOCKQUOTE ADDRESS {
+  margin: 0;
+}
+
+.motto, .motto A {font: italic 120%/1.3 Georgia, serif; color: #990}
+
+.emphasized {
+  font-weight: bold
+}
+
+/* Why o why does this break Netscape 4.x?
+IMG { 
+  border: none
+}
+*/
+
+P.map-also { font-style: italic; margin-left: 15%; text-align: right }
+
+.oddline { 
+background-color : #eeeeee;
+
+}
diff --git a/rt/webrt/Search/Bulk.html b/rt/webrt/Search/Bulk.html
new file mode 100755
index 000000000..ac688d7cd
--- /dev/null
+++ b/rt/webrt/Search/Bulk.html
@@ -0,0 +1,186 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Search/Attic/Bulk.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
+%# Copyright 1996-2001 Jesse Vincent <jesse@fsck.com>
+<& /Elements/Header, Title => "Bulk ticket update" &>
+<& /Elements/Tabs &>
+
+<& /Elements/ListActions, actions => \@results &>
+
+<FORM METHOD=POST>
+<TABLE WIDTH=100% border=0 cellpadding=3 CELLSPACING=0>
+<TR>
+<TH>Update</TH>
+%foreach my $col (@cols) {
+% my $colalias = $col;
+% $colalias =~ s/(Obj\-\>|)(Name|AsString)//;
+
+<TH ><% $colalias %>&nbsp;</TH>
+%}
+</TR>
+
+<%PERL>
+
+my $i;
+
+
+      
+$session{'tickets'}->RedoSearch();
+while (my $Ticket = $session{'tickets'}->Next) {
+ $i++;
+ if ($i % 2) {
+     $bgcolor = "#dddddd";
+ }
+ else {
+     $bgcolor = "#ffffff";
+ }
+      </%PERL>
+<TR bgcolor="<%$bgcolor%>">
+<TD><input type=checkbox name="UpdateTicket<%$Ticket->Id%>" CHECKED></TD>
+%# The ticket view is controlled by config.pm, WebOptions
+%foreach my $col (@cols) {
+<TD>
+% if ($col eq 'id') {
+<A HREF="<% $RT::WebPath%>/Ticket/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id()%></A>
+% }
+%else {
+<% eval "\$Ticket->$col()" %>&nbsp;
+%}
+</TD>
+%}
+</TR>
+%}
+
+
+
+</TABLE>
+
+<HR>
+
+
+<& /Elements/TitleBoxStart, title => 'Update selected tickets' &>
+<TABLE>
+<TR>
+<TD VALIGN=TOP>
+<UL>
+<li> Make Owner <& /Elements/SelectOwner, Name => "Owner" &>
+(<input type=checkbox name="ForceOwnerChange"> Force change)
+<li> Add Requestor <INPUT Name="AddRequestor" SIZE=20>
+<li> Remove Requestor <INPUT Name="DeleteRequestor" SIZE=20>
+<li> Add Cc <INPUT Name="AddCc" SIZE=20>
+<li> Remove Cc <INPUT Name="DeleteCc" SIZE=20>
+<li> Add AdminCc <INPUT Name="AddAdminCc" SIZE=20>
+<li> Remove AdminCc <INPUT Name="DeleteAdminCc" SIZE=20>
+</UL>
+</TD>
+<TD VALIGN=TOP>
+<UL>
+<li> Make subject <INPUT Name="Subject" SIZE=20>
+<li> Make priority <INPUT Name="Priority" SIZE=4>
+<li> Make queue <& /Elements/SelectQueue, Name => "Queue" &>
+
+<li>Make Status <& /Elements/SelectStatus, Name => "Status" &>
+
+
+
+<li> Make date Starts <& /Elements/SelectDate, Name => "Starts_Date", ShowTime => 0, Default => '' &>
+<li> Make date Started <& /Elements/SelectDate, Name => "Started_Date", ShowTime => 0, Default => '' &>
+<li> Make date Told <& /Elements/SelectDate, Name => "Told_Date", ShowTime => 0, Default => '' &>
+<li> Make date Due <& /Elements/SelectDate, Name => "Due_Date", ShowTime => 0, Default => '' &>
+<li> Make date Resolved <& /Elements/SelectDate, Name => "Resolved_Date", ShowTime => 0, Default => '' &>
+
+
+% while ( my $KeywordSelect = $KeywordSelects->Next ) {
+
+<li> Add <% $KeywordSelect->Name %> <& /Elements/SelectKeyword, Name => "AddToKeywordSelect".$KeywordSelect->id, KeywordObj => $KeywordSelect->KeywordObj &>
+<li> Remove <% $KeywordSelect->Name %> <& /Elements/SelectKeyword, Name => "DeleteFromKeywordSelect".$KeywordSelect->id, KeywordObj => $KeywordSelect->KeywordObj &>
+% }
+
+</UL>
+
+
+</TD>
+</TR>
+</table>
+<& /Elements/TitleBoxEnd&>
+<& /Elements/TitleBoxStart, title => 'Add comments or replies to selected tickets' &>
+<table>
+<tr><td align=right>Update Type:</td>
+<td><select name="UpdateType">
+  <option value="private" >Comments (not sent to requestors)</option>
+<option value="response" >Response to requestors</option>
+</select> 
+</td></tr>
+<tr><td align=right>Subject:</td><td> <input name="UpdateSubject" size=60 value=""></td></tr>
+ <tr><td align=right>Attach:</td><td><input name="UpdateAttachment" type="file"></td></tr>
+ <tr><td colspan="2">
+ <& /Elements/MessageBox, Name=>"UpdateContent"&>
+ </td></tr>
+ </table>
+<& /Elements/TitleBoxEnd &>
+
+
+
+
+<& /Elements/Submit &>
+
+
+</FORM>
+<%INIT>
+
+# Iterate through the ARGS hash and remove anything with a null value.
+map ($ARGS{$_} =~ /^$/ && (delete $ARGS{$_}), keys %ARGS);
+
+my ($bgcolor, @results);
+my @cols = qw(id Status Priority Subject QueueObj->Name OwnerObj->Name RequestorsAsString DueAsString );
+
+Abort("No search to operate on.") unless ($session{'tickets'});
+
+
+my $do_comment_reply=0;
+# Prepare for ticket updates
+$ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
+chomp ($ARGS{'UpdateContent'}) ;
+
+if ($ARGS{'UpdateContent'} &&
+    $ARGS{'UpdateContent'} ne '' &&
+    $ARGS{'UpdateContent'} ne  "-- \n" .
+    $session{'CurrentUser'}->UserObj->Signature) {
+            $do_comment_reply=1;
+}
+
+my $KeywordSelects = new RT::KeywordSelects $session{'CurrentUser'};
+foreach ( $session{'tickets'}->RestrictionValues('Queue') ) {
+    $KeywordSelects->LimitToQueue($_);
+}
+
+$KeywordSelects->IncludeGlobals;
+
+
+#Iterate through each ticket we've been handed
+
+while (my $Ticket = $session{'tickets'}->Next) {
+    $RT::Logger->debug( "Checking Ticket ".$Ticket->Id ."\n");
+    next unless ($ARGS{"UpdateTicket".$Ticket->Id});
+    $RT::Logger->debug ("Matched\n");
+    #Update the basics.
+    my @basicresults = ProcessTicketBasics(TicketObj => $Ticket, ARGSRef => \%ARGS);
+    my @dateresults = ProcessTicketDates(TicketObj => $Ticket, ARGSRef => \%ARGS);
+    my @watchresults = ProcessTicketWatchers(TicketObj => $Ticket, ARGSRef => \%ARGS);    
+    my @selectresults = ProcessTicketObjectKeywords(TicketObj => $Ticket, ARGSRef => \%ARGS);
+    
+   
+     my @updateresults; 
+     if ($do_comment_reply) {
+     ProcessUpdateMessage(TicketObj => $Ticket, ARGSRef => \%ARGS, Actions => \
+@updateresults); 
+    } 
+    my @tempresults = (@watchresults, @basicresults, @dateresults, @updateresults);
+    @tempresults = map { "Ticket ".$Ticket->Id. ": ".$_ } @tempresults;
+
+    
+    #Update the keyword selects
+    #Update the watchers
+    $RT::Logger->debug(join("\n",@tempresults));
+    @results = (@results, @tempresults);
+}
+
+</%INIT>
diff --git a/rt/webrt/Search/Listing.html b/rt/webrt/Search/Listing.html
new file mode 100755
index 000000000..da927fec7
--- /dev/null
+++ b/rt/webrt/Search/Listing.html
@@ -0,0 +1,134 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Search/Attic/Listing.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
+%# Copyright 1996-2001 Jesse Vincent <jesse@fsck.com>
+<& /Elements/Header, Title => "Search", Refresh => $session{'tickets_refresh_interval'} &>
+<& /Elements/Tabs, current_toptab => 'Search/Listing.html' &>
+
+
+% unless ($ARGS{'Action'} eq 'Refine') {
+<TABLE WIDTH=100% border=0 cellpadding=3 CELLSPACING=1>
+<TR>
+%foreach my $col (@{Config(\%ARGS, 'QueueListingCols')}) {
+<TH>
+
+<%PERL>	
+my ($order);
+ my $attr = $col->{'TicketAttribute'};
+ $attr =~ s/Obj->(Name|AsString|AgeAsString)//g;
+  if ($session{'tickets_sort_order'} =~ /^asc$/i) {
+   $order = 'DESC';
+ } else {
+   $order = 'ASC';
+ }
+</%PERL>
+
+% if (grep (/^$attr$/i, $session{'tickets'}->SortFields)) {
+<A 
+% if ($attr eq $session{'tickets_sort_by'}) {
+class="currenttab"
+% }
+HREF="<% $RT::WebPath%>/Search/Listing.html?Bookmark=<%$session{'tickets'}->FreezeLimits()|u%>&TicketsSortBy=<%$attr%>&TicketsSortOrder=<%$order%>&RowsPerPage=<%$session{'tickets_rows_per_page'}%>">
+<%$col->{Header}%>
+</A>
+% } else {
+<% $col->{Header} %>
+% }
+</TH>
+%}
+</TR>
+
+<%PERL>
+
+my $i;
+      
+$session{'tickets'}->RedoSearch();
+while (my $Ticket = $session{'tickets'}->Next) {
+ $i++;
+ if ($i % 2) {
+     $bgcolor = "#dddddd";
+ }
+ else {
+     $bgcolor = "#ffffff";
+ }
+      </%PERL>
+<TR bgcolor="<%$bgcolor%>" >
+%# The ticket view is controlled by config.pm, WebOptions
+%foreach my $col (@{Config(\%ARGS,'QueueListingCols')}) {
+<TD><& TicketCell , Ticket=>$Ticket,  Column=>$col &></TD>
+%}
+</TR>
+%}
+
+
+
+</TABLE>
+
+<div align=center>
+<font size=2>
+<a href="Listing.html?GotoPage=1">First page</a>
+&nbsp;&nbsp;
+<a href="Listing.html?GotoPage=Prev">&lt;Previous page</a>
+&nbsp;&nbsp;
+<a href="Listing.html?GotoPage=Next">Next page&gt;</a>
+%#&nbsp;&nbsp;<form method=get action="Listing.html">Goto page <input name=GotoPage size=2></form>
+</font>
+</div>
+% if ($session{'tickets'}->Count()) { 
+<div align=right>
+<a href="Bulk.html">Update all these tickets at once</a>
+</div>
+% }
+<HR>
+
+% } #endif {$ARGS{'Action'} eq 'Refine')
+<TABLE WIDTH="100%">
+<TR>
+<TD VALIGN="TOP">
+<& /Elements/TitleBoxStart, title => 'Search Criteria'&>
+
+<A HREF="<% $RT::WebPath%>/Search/Listing.html?ClearRestrictions=1">New search</a><br>
+<A HREF="<% $RT::WebPath%>/Search/Listing.html?Bookmark=<%$session{'tickets'}->FreezeLimits()|u%>&TicketsSortBy=<%$session{'tickets_sort_by'}%>&TicketsSortOrder=<%$session{'tickets_sort_order'}%>&RowsPerPage=<%$session{'tickets_rows_per_page'}%>">Bookmarkable URL for this search</a>
+<BR>
+<BR>
+% my %restrictions=$session{'tickets'}->DescribeRestrictions();
+% my %seen_restrictions=();
+% foreach $row (keys %restrictions){
+%  my $tmp=$restrictions{"$row"};
+%  if( ! defined( $seen_restrictions{"$tmp"} ) ){
+<%$restrictions{"$row"}%> <A HREF="<% $RT::WebPath%>/Search/Listing.html?DeleteRestriction=<%$row%>">[delete]</a><br>
+%   } else {
+%     $session{'tickets'}->DeleteRestriction($row);
+<b>Deleted Duplicate Restriction <i><%$tmp%></i></b><br>
+% }
+% $seen_restrictions{"$tmp"}++;
+%}
+<& /Elements/TitleBoxEnd&>
+</TD>
+<TD>
+
+<& PickRestriction &>
+
+</TD>
+</TR>
+</TABLE>
+
+<%INIT>
+
+my $bgcolor;
+require RT::Interface::Web;
+
+$session{'i'}++;
+if ($session{'tickets'}) {
+    if ( ($ARGS{'ClearRestrictions'}) ||
+	 ($ARGS{'NewSearch'}) ) {
+	$session{'tickets'}->ClearRestrictions;
+    }
+    
+    if ($ARGS{'DeleteRestriction'}) {
+	$session{'tickets'}->DeleteRestriction($ARGS{'DeleteRestriction'});
+    }
+}
+&ProcessSearchQuery(ARGS=>\%ARGS);
+
+my $row;
+
+</%INIT>
diff --git a/rt/webrt/Search/PickRestriction b/rt/webrt/Search/PickRestriction
new file mode 100755
index 000000000..82f576c1f
--- /dev/null
+++ b/rt/webrt/Search/PickRestriction
@@ -0,0 +1,112 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Search/Attic/PickRestriction,v 1.1 2002-08-12 06:17:09 ivan Exp $
+<FORM ACTION="Listing.html" METHOD="GET">
+<INPUT TYPE=HIDDEN NAME="Bookmark" VALUE="<% $session{'tickets'}->FreezeLimits()|u %>">
+<& /Elements/TitleBoxStart, title => 'Refine Search'&>
+<INPUT TYPE=HIDDEN NAME="CompileRestriction" VALUE=1>
+
+<ul>
+<li>Owner is  <& /Elements/SelectBoolean, Name => "OwnerOp", 
+					  TrueVal=> '=', 
+					  FalseVal => '!=' 
+&> 
+<& /Elements/SelectOwner, Name => "ValueOfOwner" &>
+
+<li>
+Requestor email address 
+<& /Elements/SelectMatch, Name => "RequestorOp" &>
+<INPUT Name="ValueOfRequestor" SIZE=20>
+
+<li>
+Subject <& /Elements/SelectMatch, Name => "SubjectOp" &> 
+<INPUT Name="ValueOfSubject" SIZE=20>
+
+<li>Queue  <& /Elements/SelectBoolean,  Name => "QueueOp" , 
+					True => "is", 
+					False => "isn't", 
+					TrueVal=> '=', 
+					FalseVal => '!=' &>
+<& /Elements/SelectQueue, Name => "ValueOfQueue" &>
+
+
+<li>Priority  <& /Elements/SelectEqualityOperator,  Name => "PriorityOp" &>
+
+<INPUT Name="ValueOfPriority" SIZE=5>
+
+
+<li>
+<& /Elements/SelectDateType, Name => 'DateType' &>
+<& /Elements/SelectDateRelation, Name=>"DateOp" &>
+<& /Elements/SelectDate, Name => "ValueOfDate", ShowTime => 0, Default => '' &>
+
+<li>Ticket content 
+<& /Elements/SelectBoolean, Name => "ContentOp", 
+			    True => "matches", 
+			    False => "does not match", 
+			    TrueVal => 'LIKE', 
+			    FalseVal => 'NOT LIKE' 
+&> 
+<Input Name="ValueOfContent" Size=20>
+
+<li>Status 
+<& /Elements/SelectBoolean, Name => "StatusOp", 
+			    True => "is", 
+  			    False => "isn't", 
+			    TrueVal=> '=', 
+			    FalseVal => '!=' 
+&>  
+<& /Elements/SelectStatus, Name => "ValueOfStatus" &>
+
+% while ( my $KeywordSelect = $KeywordSelects->Next ) {
+
+<li><% $KeywordSelect->Name %> 
+	<& /Elements/SelectBoolean, Name => "KeywordSelectOp". $KeywordSelect->id, 
+				    True => "is", False => "isn't", 
+  				    TrueVal=> '=', FalseVal => '!=' &>
+
+<& /Elements/SelectKeyword, Name => "KeywordSelect".$KeywordSelect->id,
+			    KeywordObj => $KeywordSelect->KeywordObj
+			    &>
+% }
+
+</UL>
+
+<& /Elements/TitleBoxEnd &>
+
+<& /Elements/TitleBoxStart, title => 'Ordering and sorting'&>
+
+<UL>
+
+<li>Results per page <& /Elements/SelectResultsPerPage, Name => "RowsPerPage", 
+							Default => $session{'tickets_rows_per_page'} || '50'
+&>
+
+<li>Sort results by <& /Elements/SelectTicketSortBy, Name => "TicketsSortBy", 
+						     Default => $session{'tickets_sort_by'} 
+&> 
+<& /Elements/SelectSortOrder, Name => 'TicketsSortOrder', Default => $session{'tickets_sort_order'} &>
+
+<li> <& /Elements/Refresh, Name => 'RefreshSearchInterval' , Default => $session{'tickets_refresh_interval'} &>
+
+
+</UL>
+
+
+</DIV>
+
+
+
+<& /Elements/TitleBoxEnd &>
+
+<& /Elements/Submit, Label => 'Show Results', AlternateLabel => 'Refine', Name => 'Action'&>
+
+</FORM>
+
+
+ <%INIT>
+ my $KeywordSelects = new RT::KeywordSelects $session{'CurrentUser'};
+ foreach ( $session{'tickets'}->RestrictionValues('Queue') ) {
+        $KeywordSelects->LimitToQueue($_);
+ }
+
+ $KeywordSelects->IncludeGlobals;
+</%INIT>
diff --git a/rt/webrt/Search/RestrictSearch.html b/rt/webrt/Search/RestrictSearch.html
new file mode 100755
index 000000000..977308e3b
--- /dev/null
+++ b/rt/webrt/Search/RestrictSearch.html
@@ -0,0 +1,3 @@
+<& /Elements/Header, Title=>"Compile Restrictions" &>
+<& /Elements/Tabs &>
+<& PickRestriction &>
diff --git a/rt/webrt/Search/TicketCell b/rt/webrt/Search/TicketCell
new file mode 100644
index 000000000..aaded88e9
--- /dev/null
+++ b/rt/webrt/Search/TicketCell
@@ -0,0 +1,28 @@
+%#$Header: /home/cvs/cvsroot/freeside/rt/webrt/Search/Attic/TicketCell,v 1.1 2002-08-12 06:17:09 ivan Exp $
+<% $link |n%><%$Column->{Constant} || eval("\$Ticket->$Column->{TicketAttribute}") || "-" %><% $endlink|n %>
+<%INIT>
+
+my $link = "";
+my $endlink = "";
+if ($Column->{TicketLink}) {
+	$link = "<A HREF=\"";
+	if ($Column->{TicketLink} == 1 ) {
+		$link .= "../Ticket/Display.html?";
+	}
+	else {
+		$link .= $Column->{TicketLink};
+	}
+
+	$link .= "id=".$Ticket->Id . $Column->{ExtraLinks};
+
+	if ($session{NewWindowOption}) {
+		$link .= "TARGET=\"TicketDisplay".$session{AlwaysNewWindowOption} && (time() . rand(1024))."\" ";
+	}
+	$link .= "\">";
+	$endlink = "</a>";
+}
+</%INIT>
+<%ARGS>
+$Ticket => undef
+$Column => undef
+</%ARGS>
diff --git a/rt/webrt/SelfService/Attachment/dhandler b/rt/webrt/SelfService/Attachment/dhandler
new file mode 100644
index 000000000..0d646cc0b
--- /dev/null
+++ b/rt/webrt/SelfService/Attachment/dhandler
@@ -0,0 +1,27 @@
+<%perl>
+     my ($ticket, $trans,$attach, $filename);
+     my $arg = $m->dhandler_arg;                # get rest of path
+     if ($arg =~ '^(\d+)/(\d+)') {
+        $trans = $1;
+        $attach = $2;
+     }
+    else {
+        Abort("Corrupted attachment URL.");
+        }
+     my $AttachmentObj = new RT::Attachment($session{'CurrentUser'});
+     $AttachmentObj->Load($attach) || Abort("Attachment '$attach' could not be loaded");
+
+
+     unless ($AttachmentObj->id) {
+        Abort("Bad attachment id. Couldn't find attachment '$attach'\n");
+    }
+     unless ($AttachmentObj->TransactionId() == $trans ) {
+        Abort("Bad transaction number for attachment. $trans should be".$AttachmentObj->TransactionId() ."\n");
+
+     }
+     my $content_type = $AttachmentObj->ContentType || 'text/plain';
+     SetContentType($content_type);
+     $m->out($AttachmentObj->Content); 
+     $m->abort; 
+</%perl>
+
diff --git a/rt/webrt/SelfService/Closed.html b/rt/webrt/SelfService/Closed.html
new file mode 100644
index 000000000..a35936092
--- /dev/null
+++ b/rt/webrt/SelfService/Closed.html
@@ -0,0 +1,4 @@
+<& /SelfService/Elements/Header, title => 'RT Self Service / Closed Tickets' &>
+
+<& /SelfService/Elements/MyRequests, status => ['resolved'], friendly_status =>
+'closed' &>
diff --git a/rt/webrt/SelfService/Create.html b/rt/webrt/SelfService/Create.html
new file mode 100755
index 000000000..60110cb5a
--- /dev/null
+++ b/rt/webrt/SelfService/Create.html
@@ -0,0 +1,63 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/SelfService/Attic/Create.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
+%# Copyright 1996-2001 Jesse Vincent <jesse@fsck.com>
+
+<& Elements/Header, Title => "Create a request" &>
+
+
+<FORM ACTION="Display.html" METHOD="POST" ENCTYPE="multipart/form-data">
+<INPUT TYPE=HIDDEN Name="id" VALUE="new">
+<& /Elements/TitleBoxStart, contentbg => "#cccccc", title => "Create a new ticket" &>
+
+<TABLE>
+<TR>
+<TD>
+Queue:
+</TD>
+<TD>
+<& /Elements/SelectNewTicketQueue, Verbose => 'True' &>
+</TD>
+</TR>
+<TR>
+<TD>
+Requestors: 
+</TD>
+<TD>
+<INPUT Name="Requestors" Value="<%$session{CurrentUser}->EmailAddress%>" SIZE=20>
+</TD>
+</TR>
+<TR>
+<TD>
+Cc:
+</TD>
+<TD>
+ <INPUT NAME="Cc" SIZE=20>
+</TD>
+</TR>
+<TR>
+<TD>
+Subject:
+</TD>
+<TD>
+<INPUT Name="Subject" SIZE=60 MAXSIZE=100 value="">
+</TD>
+</TR>
+<TR>
+<TD>
+Attach file:
+</TD>
+<TD>
+<INPUT Name="Attach" type=file>
+</TD>
+</TR>
+<TR>
+<TD COLSPAN=2>
+Describe the issue below:<br>
+<& /Elements/MessageBox &>
+</TD>
+</TR>
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit, Label => "Create ticket"&>
+
+
+</FORM>
diff --git a/rt/webrt/SelfService/Display.html b/rt/webrt/SelfService/Display.html
new file mode 100755
index 000000000..2d44f148e
--- /dev/null
+++ b/rt/webrt/SelfService/Display.html
@@ -0,0 +1,190 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/SelfService/Attic/Display.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
+%# Copyright 1996-2001 Jesse Vincent <jesse@fsck.com>
+
+<& /SelfService/Elements/Header, Title => 'Display ticket #'.$Ticket->id &>
+
+
+<& /Elements/ListActions, actions => \@results &>
+
+<TABLE>
+    <TR>
+	<TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
+	Ticket Id
+	</TD>
+      <TD>
+	<%$Ticket->Id%>
+	</TD>
+      </TR>
+    <TR>	
+      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
+	Requestors
+	</TD>
+      <TD>
+	<%$Ticket->RequestorsAsString%>
+      </TD>
+      </TR>
+    <TR>	
+      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
+	Cc
+	</TD>
+      <TD>
+	<%$Ticket->CcAsString%>
+      </TD>
+    </TR>
+
+  <TR>	
+      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
+	Status
+	</TD>
+      <TD>
+	<%$Ticket->Status%>
+      </TD>
+    </TR>
+
+    <TR>	
+      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
+	Queue
+	</TD>
+      <TD>
+	<%$Ticket->QueueObj->Name%> (<%$Ticket->QueueObj->Description%>)
+      </TD>
+    </TR>
+    <TR>	
+      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
+	Priority
+      </TD>
+      <TD>
+	<%$Ticket->Priority %>
+      </TD>
+    </TR>
+ 
+%  if ($Ticket->TimeWorked) {
+   <TR>	
+      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
+	Worked
+      </TD>
+      <TD>
+	<%$Ticket->TimeWorked %> minutes
+      </TD>
+    </TR>
+% }
+    
+% my $selects = $Ticket->QueueObj->KeywordSelects;
+% while (my $select = $selects->Next) {
+    <TR>
+      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
+	<%$select->Name%>
+      </TD>
+      <TD>
+% my $object_keywords = $Ticket->KeywordsObj($select->id);	
+% while (my $keyword = $object_keywords->Next) {
+	<%$keyword->KeywordObj->RelativePath($select->KeywordObj)%>
+% }
+%}
+	</TD>
+      </TR>
+
+
+
+
+	</TABLE>
+<TABLE BORDER=0 CELLSPACING=0>
+% my ($i);
+%while (my $Transaction = $Transactions->Next) {
+% $i++;
+%	if ($Transactions->IsLast) {
+	<a name="lasttrans"></a>
+% 	}
+	<& /Ticket/Elements/ShowTransaction, Transaction => $Transaction, 
+					     RowNum => $i,
+					     Ticket => $Ticket &>
+
+%}
+</TABLE>
+
+
+<%INIT>
+
+my ($field, @results);
+
+# {{{ Load the ticket
+#If we get handed two ids, mason will make them an array. bleck.
+# We want teh first one. Just because there's no other sensible way
+# to deal
+my @id = (ref $id eq 'ARRAY') ? @{$id} : ($id);                
+
+
+my $Ticket = new RT::Ticket($session{'CurrentUser'});
+if ($id[0] eq 'new') {
+    # {{{ Create a new ticket
+    
+    my $Queue = new RT::Queue($session{'CurrentUser'});	
+    unless ($Queue->Load($ARGS{'Queue'})) {
+	$m->comp('Error.html', Why => 'Queue not found');
+	$m->abort;
+    }
+    
+    unless ($Queue->CurrentUserHasRight('CreateTicket')) {
+	$m->comp('Error.html', Why => 'You have no permission to create tickets in that queue.');
+  	$m->abort; 
+    }
+    
+    my @Requestors = split(/,/,$ARGS{'Requestors'});
+    my @Cc = split(/,/,$ARGS{'Cc'});
+    
+
+    my $MIMEObj = MakeMIMEEntity ( Subject => $ARGS{'Subject'},
+				   From => $ARGS{'From'},
+				   Cc => $ARGS{'Cc'},
+				   Body => $ARGS{'Content'},
+				   AttachmentFieldName => 'Attach');
+
+    #TODO in Create_Details.html: priorities and due-date      
+    my ($id, $Trans, $ErrMsg)= $Ticket->Create(Queue=>$ARGS{Queue},
+					       Requestor=> \@Requestors,
+					       Cc => \@Cc,
+					       Subject=>$ARGS{Subject},
+					       MIMEObj => $MIMEObj	  
+					      );         
+    unless ($id && $Trans) {
+	$m->comp('Error.html', Why => $ErrMsg);
+   	$m->abort(); 
+    }
+
+    push(@results, $ErrMsg);
+
+    # }}}
+}
+else {
+    unless ($Ticket->Load($id[0])) {
+	$m->comp('Error.html', Why =>"Couldn't load ticket '$id'");
+	$m->abort();
+    }
+}
+# }}}
+
+unless ($session{'CurrentUser'}->HasQueueRight ( TicketObj => $Ticket,
+						 Right => 'ShowTicket')) {
+    $m->comp('Error.html', Why => "No permission to display that ticket");
+    $m->abort();
+}
+
+my ($code, $msg);
+
+#Update the status
+if ((defined $ARGS{'Status'}) and 
+    ($ARGS{'Status'} ne $Ticket->Status)) {
+    ($code, $msg) = $Ticket->SetStatus($ARGS{'Status'});
+    push @results, "$msg";
+}
+
+ProcessUpdateMessage(ARGSRef=>\%ARGS, Actions=>\@results, TicketObj=>$Ticket);
+
+my $Transactions = $Ticket->Transactions;
+
+</%INIT>
+
+
+<%ARGS>
+$id => undef
+</%ARGS>
diff --git a/rt/webrt/SelfService/Elements/GotoTicket b/rt/webrt/SelfService/Elements/GotoTicket
new file mode 100755
index 000000000..0c0c8b67a
--- /dev/null
+++ b/rt/webrt/SelfService/Elements/GotoTicket
@@ -0,0 +1 @@
+<FORM ACTION="<%$RT::WebPath%>/SelfService/Display.html"><input type=submit value="Goto ticket">&nbsp;<input size=4 name=id></FORM>
diff --git a/rt/webrt/SelfService/Elements/Header b/rt/webrt/SelfService/Elements/Header
new file mode 100755
index 000000000..ecf58f461
--- /dev/null
+++ b/rt/webrt/SelfService/Elements/Header
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
+     "http://www.w3.org/TR/REC-html40/loose.dtd"> 
+<HTML>
+<HEAD>
+<TITLE><%$Title%></TITLE>
+% if ($Code) {
+<META NAME="HTTP-EQUIV" VALUE="<%$Code%> <%$Why%>">
+% }
+
+<link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/webrt.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR="<%$BgColor%>">
+<TABLE BORDER=0 WIDTH=100% CELLSPACING=0 BGCOLOR="#993333">
+<TR VALIGN=TOP>
+<TD WIDTH=32>
+        <IMG SRC="<%$RT::LogoURL%>" alt="RT">
+</TD>
+<TD VALIGN=CENTER ALIGN=LEFT>
+<font size=+2 color=#ffffff>
+<B>
+<%$Title%>
+</B>
+</font>
+</TD>
+<TD ALIGN=RIGHT>
+<font color="#ffffff">
+% if ($session{'CurrentUser'} ) {
+Signed in as <b><%$session{'CurrentUser'}->Name%></b>.<BR>
+% if ($session{'CurrentUser'}->HasSystemRight('ModifySelf')) {
+[<A class='inverse' HREF="<%$RT::WebPath%>/SelfService/Prefs.html" >Preferences</A>]
+% }
+% unless ($RT::WebExternalAuth) { 
+ [<A class='inverse' HREF="<%$RT::WebPath%>/NoAuth/Logout.html">Logout</a>]
+% }
+% } else {
+Not logged in.
+% }
+</font>
+</TD>
+</TR>
+</TABLE>
+
+<BR>
+<& /SelfService/Elements/Tabs &>
+
+<%ARGS>
+$Title => ''
+$Code => undef
+$Why => undef
+$BgColor => '#ffffff'
+</%ARGS>
+<%INIT>
+$Title = "RT/$RT::rtname: ".$Title;
+</%INIT>
+
diff --git a/rt/webrt/SelfService/Elements/MyRequests b/rt/webrt/SelfService/Elements/MyRequests
new file mode 100644
index 000000000..ce268d58d
--- /dev/null
+++ b/rt/webrt/SelfService/Elements/MyRequests
@@ -0,0 +1,41 @@
+<& /Elements/TitleBoxStart, title => "Your $friendly_status requests" &>
+<TABLE BORDER=0 cellspacing=1 cellpadding=1 BGCOLOR="#eeeeee" WIDTH=100%>
+<TR>
+<TH>Subject</TH>
+<TH>Status</TH>
+<TH>Owner</TH>
+<TH>&nbsp;</TH>
+</TR>
+<TR>
+% while (my $Ticket = $MyTickets->Next) {
+<TR>
+<TD>
+<%$Ticket->Id%>: <%$Ticket->Subject%>
+</TD>
+<TD>
+<%$Ticket->Status%>
+</TD><TD>
+<%$Ticket->OwnerObj->Name%>
+</TD><TD ALIGN=RIGHT>
+[<A HREF="<% $RT::WebPath %>/SelfService/Display.html?id=<%$Ticket->Id%>">Details</A>]
+</TD>
+</TR>
+% }
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+
+
+<%INIT>
+my $MyTickets;
+$MyTickets = new RT::Tickets ($session{'CurrentUser'});
+$MyTickets->LimitRequestor(VALUE => $session{'CurrentUser'}->EmailAddress);
+
+foreach my $status (@status) {
+
+        $MyTickets->LimitStatus(VALUE => $status);
+}
+</%INIT>
+<%ARGS>
+$friendly_status => 'open'
+@status => ('open', 'new', 'stalled')
+</%ARGS>
diff --git a/rt/webrt/SelfService/Elements/Tabs b/rt/webrt/SelfService/Elements/Tabs
new file mode 100644
index 000000000..d689d8a72
--- /dev/null
+++ b/rt/webrt/SelfService/Elements/Tabs
@@ -0,0 +1,49 @@
+<TABLE WIDTH=100%>
+<TR>
+% foreach $tab (sort keys %{$tabs}) {
+<TD ALIGN=CENTER>
+[<A HREF="<%$RT::WebPath%>/<% $tabs->{"$tab"}->{'path'}%>"><% $tabs->{"$tab"}->{'title'}%></A>]
+</TD>
+%}
+
+% if ($actions) {
+
+<TD ALIGN=RIGHT>
+<TABLE><TR>
+%  foreach my $action (sort keys %{$actions}) {
+<TD>
+<FONT SIZE=-1>
+% if ($actions->{"$action"}->{'html'}) {
+<%$actions->{"$action"}->{'html'} |n%>
+% } else {
+<A HREF="<%$RT::WebPath%>/<% $actions->{$action}->{'path'}%>"><% $actions->{$action}->{'title'}%></A>
+% }
+</FONT>
+</TD>
+%  }
+</TR>
+</TABLE>
+</TD>
+%}
+</TR>
+</TABLE>
+<hr>
+<%INIT>
+my ($tab);
+my $tabs = { A  => { title => 'Open requests',
+                        path => 'SelfService/',
+                      },
+             B => { title => 'Closed requests',
+                         path => 'SelfService/Closed.html',
+                       },
+             C => { title => 'New request',
+                    path => 'SelfService/Create.html'
+                    }
+           };
+my $actions = {
+	B => { html => $m->scomp('GotoTicket') 
+		}
+	};
+</%INIT>
+
+
diff --git a/rt/webrt/SelfService/Error.html b/rt/webrt/SelfService/Error.html
new file mode 100755
index 000000000..19b79e68b
--- /dev/null
+++ b/rt/webrt/SelfService/Error.html
@@ -0,0 +1,22 @@
+<& /SelfService/Elements/Header, Title => 'Error' &>
+<& /Elements/TitleBoxStart, title => $Title &>
+<%$Why%>
+<br>
+<font size=-1>
+<%$Details%>
+</font>
+<& /Elements/TitleBoxEnd &>
+</body>
+</HTML>
+
+
+<%args>
+$Code => undef
+$Details => undef
+$Title => "RT Error"
+$Why => "the calling component did not specify why"
+</%args>
+
+<%INIT>
+$RT::Logger->error("WebRT: $Why ($Details)");
+</%INIT>
diff --git a/rt/webrt/SelfService/Prefs.html b/rt/webrt/SelfService/Prefs.html
new file mode 100755
index 000000000..9c614e9fd
--- /dev/null
+++ b/rt/webrt/SelfService/Prefs.html
@@ -0,0 +1,51 @@
+<& /SelfService/Elements/Header, title => 'Preferences' &>
+
+<& /Elements/ListActions, actions => \@results &>
+<form method=post>
+
+% unless ($RT::WebExternalAuth) {
+<& /Elements/TitleBoxStart, title => 'Change password'  &>
+New password: <input type=password name="NewPass1" size=16>
+Confirm: <input type=password name="NewPass2" size=16>
+<& /Elements/TitleBoxEnd &>
+<BR>
+% }
+<& /Elements/TitleBoxStart, title => 'Signature'  &>
+
+<TEXTAREA COLS=72 ROWS=4 WRAP=HARD NAME="Signature"><% $session{'CurrentUser'}->UserObj->Signature %></TEXTAREA>
+<br>
+<BR>
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit &>
+	  </form>
+
+
+<%INIT>
+my @results;
+
+if ($NewPass1) {
+    if ($NewPass1 ne $NewPass2) {
+	push (@results, "Passwords did not match.");
+    }	
+    else {
+	my ($val, $msg)=$session{'CurrentUser'}->UserObj->SetPassword($NewPass1);
+	push (@results, "Password: ".$msg);
+    }	
+}
+if ($Signature) {
+    $Signature =~ s/(\r\n|\r)/\n/g;
+    if ($Signature ne $session{'CurrentUser'}->UserObj->Signature) {
+	my ($val, $msg)=$session{'CurrentUser'}->UserObj->SetSignature($Signature);
+	push (@results, "Signature: ".$msg);
+    }
+}
+#A hack to make sure that session gets rewritten.
+
+$session{'i'}++;
+</%INIT>
+
+<%ARGS>
+$Signature => undef
+$NewPass1 => undef
+$NewPass2 => undef
+</%ARGS>
diff --git a/rt/webrt/SelfService/Update.html b/rt/webrt/SelfService/Update.html
new file mode 100755
index 000000000..17f1618a3
--- /dev/null
+++ b/rt/webrt/SelfService/Update.html
@@ -0,0 +1,40 @@
+<& /SelfService/Elements/Header, Title => 'Update ticket #'.$Ticket->id &>
+
+
+<FORM ACTION="Display.html" METHOD=POST ENCTYPE="multipart/form-data">
+
+Status:
+<& /Elements/SelectStatus, Name=>"Status", Default => $DefaultStatus &> 
+<input type=hidden name="UpdateType" value="response">
+
+Subject: <input name="UpdateSubject" size=60 value="Re: <% $Ticket->Subject %>"> <br>
+Attach: <input name="UpdateAttachment" type=file><br>
+<& /Elements/MessageBox, Name=>"UpdateContent", QuoteTransaction=>$ARGS{QuoteTransaction} &>
+		<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>"><br>
+
+
+<& /Elements/Submit &>
+  </FORM>
+
+
+
+<%INIT>
+
+my $Ticket = LoadTicket($id);
+
+my $title = "Update ticket #" . $Ticket->id;
+
+$DefaultStatus = $Ticket->Status() unless ($DefaultStatus);
+
+
+Abort("No permission to view update ticket") 
+	unless ( $Ticket->CurrentUserHasRight('ReplyToTicket') or
+                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
+
+</%INIT>
+
+<%ARGS>
+$id => undef
+$Action => undef
+$DefaultStatus => undef
+</%ARGS>
diff --git a/rt/webrt/SelfService/index.html b/rt/webrt/SelfService/index.html
new file mode 100644
index 000000000..a377d8cff
--- /dev/null
+++ b/rt/webrt/SelfService/index.html
@@ -0,0 +1,3 @@
+<& /SelfService/Elements/Header, title => 'Self Service' &>
+
+<& /SelfService/Elements/MyRequests &>
diff --git a/rt/webrt/Ticket/Attachment/dhandler b/rt/webrt/Ticket/Attachment/dhandler
new file mode 100644
index 000000000..0d646cc0b
--- /dev/null
+++ b/rt/webrt/Ticket/Attachment/dhandler
@@ -0,0 +1,27 @@
+<%perl>
+     my ($ticket, $trans,$attach, $filename);
+     my $arg = $m->dhandler_arg;                # get rest of path
+     if ($arg =~ '^(\d+)/(\d+)') {
+        $trans = $1;
+        $attach = $2;
+     }
+    else {
+        Abort("Corrupted attachment URL.");
+        }
+     my $AttachmentObj = new RT::Attachment($session{'CurrentUser'});
+     $AttachmentObj->Load($attach) || Abort("Attachment '$attach' could not be loaded");
+
+
+     unless ($AttachmentObj->id) {
+        Abort("Bad attachment id. Couldn't find attachment '$attach'\n");
+    }
+     unless ($AttachmentObj->TransactionId() == $trans ) {
+        Abort("Bad transaction number for attachment. $trans should be".$AttachmentObj->TransactionId() ."\n");
+
+     }
+     my $content_type = $AttachmentObj->ContentType || 'text/plain';
+     SetContentType($content_type);
+     $m->out($AttachmentObj->Content); 
+     $m->abort; 
+</%perl>
+
diff --git a/rt/webrt/Ticket/Create.html b/rt/webrt/Ticket/Create.html
new file mode 100755
index 000000000..2c61de03a
--- /dev/null
+++ b/rt/webrt/Ticket/Create.html
@@ -0,0 +1,199 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Ticket/Attic/Create.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
+%# Copyright 1996-2000 Jesse Vincent <jesse@fsck.com> 
+
+<& /Elements/Header, Title => "Create a new ticket" &>
+<& /Elements/Tabs, current_toptab => "Ticket/Create.html" &>
+<FORM ACTION="Display.html" METHOD="POST" ENCTYPE="multipart/form-data">
+<INPUT TYPE=HIDDEN Name="id" VALUE="new">
+<A NAME="top">
+	
+	
+[<a class="currenttab">Show basics</a>] [<A HREF="#detail">Show details</a>]
+<BR>
+<& /Elements/TitleBoxStart, contentbg => "#cccccc", title => "Create a new ticket"&>
+<div align=right><input type=submit value="Create"></div>
+<TABLE border=0 cellpadding=0 cellspacing=0>
+<TR><TD>Queue</TD>
+<TD><% $QueueObj->Name %>
+<INPUT TYPE=HIDDEN NAME=Queue Value="<%$QueueObj->Name%>">
+</TD>
+<TD>Status:
+</TD>
+<TD>
+<& /Elements/SelectStatus, Name => "Status", Default=> 'new' &>
+</TD>
+<TD>
+Owner: 
+</TD>
+<TD>
+<& /Elements/SelectOwner, Name => "ValueOfOwner", QueueObj => $QueueObj &>
+</TD>
+</TR>
+<TR>
+<TD>
+Requestors: 
+</TD>
+<TD COLSPAN=5>
+<INPUT Name="Requestors" Value="<%$session{CurrentUser}->EmailAddress%>" SIZE=40>
+</TD>
+</TR>
+<TR>
+<TD>
+Cc:
+</TD>
+<TD COLSPAN=5>
+ <INPUT NAME="Cc" SIZE=40>
+</TD>
+</TR>
+<TR>
+<TD>
+Admin Cc:
+</TD>
+<TD COLSPAN=5>
+ <INPUT NAME="AdminCc" SIZE=40>
+</TD>
+</TR>
+<TR>
+<TD>
+Subject:
+</TD>
+<TD COLSPAN=5>
+<INPUT Name="Subject" SIZE=60 MAXSIZE=100 value="">
+</TD>
+</TR>
+<TR>
+<TD>
+Attach file:
+</TD>
+<TD COLSPAN=5>
+<INPUT TYPE=FILE NAME="Attach">
+</TD>
+</TR>
+<TR>
+<TD COLSPAN=6>
+Describe the issue below:<br>
+<& /Elements/MessageBox, QuoteTransaction => $QuoteTransaction &>
+
+<BR>
+</TD>
+</TR>
+<TR>
+<TD ALIGN=RIGHT COLSPAN=2>
+</TD>
+</TR>
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit, Label => "Create"&>
+
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+
+<A NAME="detail">
+	[<A HREF="#top">Show basics</a>] [<a class="currenttab">Show details</a>]
+<BR>
+<TABLE WIDTH="100%" BORDER=0>
+<TR>
+<TD WIDTH="50%" VALIGN=TOP>
+
+	  <& /Elements/TitleBoxStart, title => 'The Basics', 
+		title_class=> 'inverse',  
+		color => "#993333" &>
+<TABLE BORDER=0>
+<TR><TD ALIGN=RIGHT>Priority:</TD><TD><input size=3 name="InitialPriority" value="<%$QueueObj->InitialPriority%>"></TD></TR>
+<TR><TD ALIGN=RIGHT>Final Priority:</TD><TD><input size=3 name="FinalPriority" value="<%$QueueObj->FinalPriority%>"></TD></TR>
+<TR><TD ALIGN=RIGHT>Time Worked:</TD><TD><input size=3 name="TimeWorked"></TD></TR>
+<TR><TD ALIGN=RIGHT>Time Left:</TD><TD><input size=3 name="TimeLeft"></TD></TR>
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+<BR>
+<BR>
+
+
+ <& /Elements/TitleBoxStart, 
+		title_class=> 'inverse',  
+		title => "Keyword Selections", color => "#993300"
+  &>
+<TABLE BORDER=0>
+% while ( my $KeywordSelect = $KeywordSelects->Next ) {
+%   my $Descendents = $KeywordSelect->KeywordObj->Descendents;
+     <TR><TD ALIGN=RIGHT>
+	<% $KeywordSelect->Name %></TD><TD>
+	  <INPUT TYPE="hidden" NAME="KeywordSelectMagic<% $KeywordSelect->id %>" VALUE="1">
+	    <SELECT NAME="KeywordSelect-<% $KeywordSelect->id %>"
+	      <% $KeywordSelect->Single ? "" : " MULTIPLE " %> SIZE=5>
+%#
+%#  All of this cruft is so we have a 'no keyword' selector for single
+%#  keywords that's only selected when there's no value.
+%
+% foreach my $kid ( keys %{$Descendents} ) {
+	      <OPTION VALUE="<% $kid %>"><% $Descendents->{$kid} %></OPTION>
+%   }
+%   if ( $KeywordSelect->Single) {
+<OPTION VALUE="" SELECTED>(empty)</OPTION>
+% }
+	    </SELECT>
+      </TD></TR>
+% }
+  
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+
+</TD>
+
+<TD VALIGN="TOP">
+<& /Elements/TitleBoxStart, title => "Dates",
+		title_class=> 'inverse',  
+		 color => "#663366" &>
+
+<TABLE BORDER=0>
+<TR><TD ALIGN=RIGHT>Starts:</TD><TD><input size=10 name="Starts"></TD></TR>
+<TR><TD ALIGN=RIGHT>Due:</TD><TD><input size=10 name="Due"></TD></TR>
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+<BR>
+<& /Elements/TitleBoxStart, title => 'Relationships', 
+	title_class=> 'inverse',  
+	titleright => '', color=> "#336633" &>
+
+<i>(Enter ticket ids or URLs, seperated with spaces)</i>
+<TABLE BORDER=0>
+<TR><TD ALIGN=RIGHT>Depends on</TD><TD><input size=10 name="new-DependsOn"></TD></TR>
+<TR><TD ALIGN=RIGHT>Depended on by</TD><TD><input size=10 name="DependsOn-new"></TD></TR>
+<TR><TD ALIGN=RIGHT>Parents</TD><TD><input size=10 name="new-MemberOf"></TD></TR>
+<TR><TD ALIGN=RIGHT>Children</TD><TD><input size=10 name="MemberOf-new"></TD></TR>
+<TR><TD ALIGN=RIGHT>Refers to</TD><TD><input size=10 name="new-RefersTo"></TD></TR>
+<TR><TD ALIGN=RIGHT>Referred to by</TD><TD><input size=10 name="RefersTo-new"></TD></TR>
+
+
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+<BR>
+
+</TD>
+</TR>
+</TABLE>
+<& /Elements/Submit, Label => "Create"&>
+</FORM>
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+
+<%INIT>
+my $QueueObj = new RT::Queue($session{'CurrentUser'});
+$QueueObj->Load($Queue) || Abort("Queue could not be loaded.");
+my $KeywordSelects = $QueueObj->KeywordSelects;
+
+</%INIT>
+
+<%ARGS>
+$DependsOn => undef
+$DependedOnBy => undef
+$MemberOf => undef
+$QuoteTransaction => undef
+$Queue => undef
+</%ARGS>
diff --git a/rt/webrt/Ticket/Display.html b/rt/webrt/Ticket/Display.html
new file mode 100755
index 000000000..cb0dc2501
--- /dev/null
+++ b/rt/webrt/Ticket/Display.html
@@ -0,0 +1,152 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Ticket/Attic/Display.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
+%# Copyright 1996-2000 Jesse Vincent <jesse@fsck.com>
+
+<& /Elements/Header, Title => "Ticket #".$Ticket->Id ." ".$Ticket->Subject &>
+<& /Ticket/Elements/Tabs, Ticket => $Ticket, current_tab => 'Ticket/Display.html?id='.$Ticket->id &>
+
+<& /Elements/ListActions, actions => \@Actions &>
+
+<& /Ticket/Elements/ShowSummary,  Ticket => $Ticket &>
+
+
+<BR>
+<& /Ticket/Elements/ShowHistory , 
+      Ticket => $Ticket, 
+      Collapsed => $ARGS{'Collapsed'}, 
+      ShowHeaders => $ARGS{'ShowHeaders'} &> 
+
+  
+<%ARGS>
+$id => undef
+$Create => undef
+$ShowHeaders => undef
+$Collapsed => undef
+</%ARGS>
+
+<%INIT>
+
+  
+  my ($linkid, $message, $tid, $Ticket, @Actions);  
+
+$Ticket = new RT::Ticket($session{'CurrentUser'});
+
+unless ($id) {
+    Abort('No ticket specified');
+}
+
+if ($ARGS{'id'} eq 'new') {
+    # {{{ Create a new ticket
+    
+    my $Queue = new RT::Queue($session{'CurrentUser'});	
+    unless ($Queue->Load($ARGS{'Queue'})) {
+	Abort('Queue not found');
+    }
+    
+    unless ($Queue->CurrentUserHasRight('CreateTicket')) {
+	Abort('You have no permission to create tickets in that queue.');
+    }
+   
+    my $due = new RT::Date($session{'CurrentUser'});
+    $due->Set(Format => 'unknown', Value => $ARGS{'Due'});
+    my $starts = new RT::Date($session{'CurrentUser'});
+    $starts->Set(Format => 'unknown', Value => $ARGS{'Starts'});
+    
+ 
+    my @Requestors = split(/,/,$ARGS{'Requestors'});
+    my @Cc = split(/,/,$ARGS{'Cc'});
+    my @AdminCc = split(/,/,$ARGS{'AdminCc'});
+    
+    my $MIMEObj = MakeMIMEEntity( Subject => $ARGS{'Subject'},
+				  From => $ARGS{'From'},
+				  Cc => $ARGS{'Cc'},
+				  Body => $ARGS{'Content'},
+				  AttachmentFieldName => 'Attach');
+ 
+				  
+    my %create_args = ( 
+		       Queue=>$ARGS{Queue},
+		       Owner=>$ARGS{ValueOfOwner},
+		       InitialPriority=> $ARGS{InitialPriority},
+		       FinalPriority=> $ARGS{FinalPriority},
+		       TimeLeft => $ARGS{TimeLeft},
+		       TimeWorked => $ARGS{TimeWorked},
+		       Requestor=> \@Requestors,
+		       Cc => \@Cc,
+		       AdminCc => \@AdminCc,
+		       Subject=>$ARGS{Subject},
+		       Status=>$ARGS{Status},
+		       Due => $due->ISO,
+		       Starts => $starts->ISO,
+		       MIMEObj => $MIMEObj	  
+		      );         
+
+    
+    # we need to get any KeywordSelect-<integer> fields into %create_args..
+    grep { $_ =~ /^KeywordSelect-/ && {$create_args{$_} = $ARGS{$_}}} %ARGS;
+
+    my ($id, $Trans, $ErrMsg)= $Ticket->Create(%create_args);
+    unless ($id && $Trans) {
+	Abort($ErrMsg);
+    }
+    my @linktypes = qw( DependsOn MemberOf RefersTo );
+    
+    foreach my $linktype (@linktypes) {
+      foreach my $luri (split (/ /,$ARGS{"new-$linktype"})) {
+	$luri =~ s/\s*$//; # Strip trailing whitespace
+	my ($val, $msg) = $Ticket->AddLink( Target => $luri,
+					    Type => $linktype);
+	push @Actions, $msg;
+      }
+      
+      foreach my $luri (split (/ /,$ARGS{"$linktype-new"})) {
+	my ($val, $msg) = $Ticket->AddLink( Base => $luri,
+					    Type => $linktype);
+	
+	push @Actions, $msg;
+      }
+    }
+    # don't try to change queue to the current queue
+    delete $ARGS{'Queue'};
+
+    push(@Actions, $ErrMsg);
+    unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
+      Abort("No permission to view newly created ticket #".$Ticket->id.".");
+    }
+    # }}}
+}
+
+else { 
+    $Ticket = LoadTicket($ARGS{'id'});
+    unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
+	Abort("No permission to view ticket");
+    }
+
+
+if (defined $ARGS{'Action'}) {
+  if ($ARGS{'Action'} =~ /^(Steal|Kill|Take|SetTold)$/) {
+    my $action = $1;
+    my ($res, $msg)=$Ticket->$action();
+    push(@Actions, $msg);
+  }
+}
+    $ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
+
+    if ($ARGS{'UpdateContent'} &&
+        $ARGS{'UpdateContent'} ne '' &&
+        $ARGS{'UpdateContent'} ne  "-- \n" .
+                                $session{'CurrentUser'}->UserObj->Signature
+       ) {
+	    ProcessUpdateMessage(ARGSRef=>\%ARGS, 
+				 Actions=>\@Actions, 
+				 TicketObj=>$Ticket);
+	}
+#Process status updates
+my @BasicActions = ProcessTicketBasics(ARGSRef => \%ARGS, TicketObj=>$Ticket);
+
+push (@Actions, @BasicActions);
+}
+</%INIT>
+
+
+
+
diff --git a/rt/webrt/Ticket/Elements/AddWatchers b/rt/webrt/Ticket/Elements/AddWatchers
new file mode 100755
index 000000000..053cff122
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/AddWatchers
@@ -0,0 +1,54 @@
+<BR>
+<%$msg%><br>
+
+Add new watchers:<br>
+
+<table>
+% if ($Users) {
+<tr><td>
+Type
+</td><td>
+Username
+</td></tr>
+% while (my $u = $Users->Next ) {
+<tr><td><&/Elements/SelectWatcherType, Name => "WatcherTypeUser".$u->Id &></td><td><%$u->Name%> (<%$u->RealName%>)</td></tr>
+% }
+% }
+
+<tr><td>
+Type
+</td><td>
+Email
+</td></tr>
+<tr><td>
+<&/Elements/SelectWatcherType, Name => "WatcherTypeEmail1" &>
+</td><td>
+<input name="WatcherAddressEmail1" size=15>
+</td></tr>
+<tr><td>
+<&/Elements/SelectWatcherType, Name => "WatcherTypeEmail2" &> 
+</td><td>
+<input name="WatcherAddressEmail2" size=15>
+</td></tr>
+<tr><td>
+<&/Elements/SelectWatcherType, Name => "WatcherTypeEmail3" &>
+</td><td>
+<input name="WatcherAddressEmail3" size=15>
+</td></tr>
+</table>
+
+<%INIT>
+my ($msg, $Users);
+if ($UserString) {
+    $Users = new RT::Users($session{'CurrentUser'});
+    $Users->Limit(FIELD => $UserField,
+                 VALUE => $UserString,
+                 OPERATOR => $UserOp);
+     }
+</%INIT>
+
+<%ARGS>
+$UserField => 'Name'
+$UserOp => '='
+$UserString => undef
+</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/EditBasics b/rt/webrt/Ticket/Elements/EditBasics
new file mode 100755
index 000000000..12142879e
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/EditBasics
@@ -0,0 +1,62 @@
+<TABLE>
+<TR>
+<TD COLSPAN=6>
+        Subject<BR>
+        <input name=Subject value="<%$TicketObj->Subject|h%>"  SIZE=50>
+</TD>
+</TR>
+<TR>
+<TD>
+<& /Elements/ShadedBox, 
+        title => 'Status',
+        content => $SelectStatus
+&>
+</TD>
+<TD>
+
+<& /Elements/ShadedBox,
+	title => 'Time Worked',
+	content => "<input name=TimeWorked value=\"".$TicketObj->TimeWorked."\" SIZE=5>" 
+&>
+
+</TD>
+<TD>
+<& /Elements/ShadedBox,
+	title => 'Time Left',
+	content => "<input name=TimeLeft value=\"".$TicketObj->TimeLeft."\" SIZE=5>" 
+&>
+</TD>
+<TD>
+<& /Elements/ShadedBox,
+	title => 'Priority',
+	content => "<input name=Priority value=\"".$TicketObj->Priority."\" SIZE=3>"
+&>
+
+</TD>
+<TD>
+<& /Elements/ShadedBox,
+	title => 'Final Priority',
+	content => "<input name=FinalPriority value=\"".$TicketObj->FinalPriority."\" SIZE=3>"
+&>
+
+
+</TD>
+<TD>
+<& /Elements/ShadedBox,
+        title => 'Queue',
+        content => "$SelectQueue"
+ &>
+</TD>
+</TR>
+</TABLE>
+
+<%INIT>
+#It's hard to do this inline, so we'll preload the html of the selectstatus in here.
+my $SelectStatus = $m->scomp("/Elements/SelectStatus", Name => 'Status', Default=> $TicketObj->Status);
+my $SelectQueue = $m->scomp("/Elements/SelectQueue", Name => 'Queue', Default =>$TicketObj->QueueObj->Id);
+
+</%INIT>
+<%ARGS>
+
+$TicketObj => undef
+</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/EditDates b/rt/webrt/Ticket/Elements/EditDates
new file mode 100755
index 000000000..f04130bde
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/EditDates
@@ -0,0 +1,46 @@
+<TABLE>
+<TR>
+<TD>
+Starts: 
+</TD>
+<TD>
+<& /Elements/SelectDate, menu_prefix => 'Starts', current => 0 &> 
+        (<% $TicketObj->StartsObj->AsString %>)
+</TD>
+</TR>
+<TR>
+<TD>
+Started:
+</TD>
+<TD>
+<& /Elements/SelectDate, menu_prefix => 'Started', current => 0 &> (<%$TicketObj->StartedObj->AsString %>)
+
+
+
+</TD>
+</TR>
+
+<TR>
+<TD>
+Last Contact:
+</TD>
+<TD>
+<& /Elements/SelectDate, menu_prefix => 'Told', current => 0 &> (<% $TicketObj->ToldObj->AsString %>)
+
+</TD>
+</TR>
+<TR>
+<TD>
+Due:
+</TD>
+<TD>
+
+<& /Elements/SelectDate, menu_prefix => 'Due', current => 0 &> (<% $TicketObj->DueObj->AsString %>)
+</TD>
+</TR>
+
+</TABLE>
+<%ARGS>
+$TicketObj => undef
+</%ARGS>
+
diff --git a/rt/webrt/Ticket/Elements/EditKeywordSelects b/rt/webrt/Ticket/Elements/EditKeywordSelects
new file mode 100644
index 000000000..34ade9f25
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/EditKeywordSelects
@@ -0,0 +1,45 @@
+
+<TABLE>
+    <TR>
+% while ( my $KeywordSelect = $KeywordSelects->Next ) {
+% my $CurrentKeywords = $TicketObj->KeywordsObj($KeywordSelect->id);	
+%   my $Descendents = $KeywordSelect->KeywordObj->Descendents;
+      <TD VALIGN=TOP>
+	<% $KeywordSelect->Name %>
+	<BR>
+	  <INPUT TYPE="hidden" NAME="KeywordSelectMagic<% $KeywordSelect->id %>" VALUE="1">
+	    <SELECT NAME="KeywordSelect<% $KeywordSelect->id %>"
+	      <% $KeywordSelect->Single ? "" : " MULTIPLE " %> SIZE=5>
+%#
+%#
+%#  All of this cruft is so we have a 'no keyword' selector for single
+%#  keywords that's only selected when there's no value.
+%
+% my $selected_keywords = 0;
+% foreach my $kid ( keys %{$Descendents} ) {
+% my $selected = 0;
+% if ($CurrentKeywords->HasEntry($kid)) { $selected_keywords++; $selected=1;}
+	      <OPTION VALUE="<% $kid %>" 
+		<% $selected && 'SELECTED'%>>
+		<% $Descendents->{$kid} %>
+	      </OPTION>
+%   }
+%   if ( $KeywordSelect->Single) {
+<OPTION VALUE="" <% ($selected_keywords == 0) && 'SELECTED' %> >(empty)</OPTION>
+% }
+	    </SELECT>
+      </TD>
+% }
+    </TR>
+  
+</TABLE>
+
+
+<%INIT>
+my $KeywordSelects = $TicketObj->QueueObj->KeywordSelects;
+</%INIT>
+
+<%ARGS>
+$TicketObj => undef
+</%ARGS>
+
diff --git a/rt/webrt/Ticket/Elements/EditLinks b/rt/webrt/Ticket/Elements/EditLinks
new file mode 100755
index 000000000..b0296fce1
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/EditLinks
@@ -0,0 +1,109 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Ticket/Elements/Attic/EditLinks,v 1.1 2002-08-12 06:17:09 ivan Exp $
+%# Copyright 1996-2000 Jesse Vincent <jesse@fsck.com>
+
+
+<TABLE>
+<TR>
+<TD VALIGN=TOP>
+<h3>New Relationships</h3>
+<i>Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces.</i><br>
+<TABLE>
+<TR><TD>Merge into:</TD><TD><input name="<%$Ticket->Id%>-MergeInto"> <i>(only one ticket)</i></TD></TR>
+<TR><TD>Depends on:</TD><TD><input name="<%$Ticket->Id%>-DependsOn"></TD></TR>
+<TR><TD>Depended on by:</TD><TD><input name="DependsOn-<%$Ticket->Id%>"></TD></TR>
+<TR><TD>Parents:</TD><TD><input name="<%$Ticket->Id%>-MemberOf"></TD></TR>
+<TR><TD>Children:</TD><TD> <input name="MemberOf-<%$Ticket->Id%>"></TD></TR>
+<TR><TD>Refers to:</TD><TD><input name="<%$Ticket->Id%>-RefersTo"></TD></TR>
+<TR><TD>Referred to by:</TD><TD> <input name="RefersTo-<%$Ticket->Id%>"></TD></TR>
+</TABLE>
+</TD>
+<TD VALIGN=TOP WIDTH=50%>
+<h3>Current Relationships</h3>
+<i>(Check boxes to delete)</i><br>
+
+Depends on:<BR>
+<UL>
+% while (my $link = $Ticket->DependsOn->Next) {
+% my $member = $link->TargetObj;
+<LI>
+<INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
+<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
+[<%$member->Status%>]
+
+% }
+</UL>
+
+Depended on by:<BR>
+<UL>
+% while (my $link = $Ticket->DependedOnBy->Next) {
+% my $member = $link->BaseObj;
+<LI>
+<INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-">
+<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> 
+[<%$member->Status%>]
+% }
+</UL>
+
+Parents:<BR>
+<UL>
+% while (my $link = $Ticket->MemberOf->Next) {
+% my $member = $link->TargetObj;
+<LI>
+<INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
+<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
+[<%$member->Status%>]
+
+% }
+</UL>
+
+Children:<BR>
+<UL>
+% while (my $link = $Ticket->Members->Next) {
+<LI>
+<INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-">
+% my $member = $link->BaseObj;
+<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> 
+[<%$member->Status%>]
+% }
+</UL>
+
+
+Refers to:<BR>
+<UL>
+% while (my $link = $Ticket->RefersTo->Next) {
+<LI>
+<INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
+% if ($link->TargetIsLocal) {
+% my $member = $link->TargetObj;
+
+<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
+% } else {
+<A HREF="<%$link->TargetAsHREF%>"><%$link->Target%></A>
+% }
+%}
+</UL>
+
+Referred to by:<BR>
+<UL>
+% while (my $link = $Ticket->ReferredToBy->Next) {
+<LI>
+<INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-">
+% if ($link->BaseIsLocal) {
+% my $member = $link->BaseObj;
+<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
+% } else {
+<A HREF="<%$link->BaseAsHREF%>"><%$link->Base%></A>
+%}
+% }
+</UL>
+
+			    
+</TD>
+</TR>
+</TABLE>
+
+
+      
+<%ARGS>
+$Ticket => undef
+</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/EditPeople b/rt/webrt/Ticket/Elements/EditPeople
new file mode 100755
index 000000000..4f69af970
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/EditPeople
@@ -0,0 +1,37 @@
+
+<TABLE>
+<TR>
+<TD VALIGN=TOP>
+
+<h3>New watchers</h3>
+Find people whose<BR>
+<& /Elements/SelectUsers &>
+<input type=submit name="OnlySearchForPeople" value="Go!">
+
+<& AddWatchers, Ticket => $Ticket, UserString => $UserString,
+        UserOp => $UserOp, UserField => $UserField &> 
+</TD><TD VALIGN=TOP>
+<h3>Owner</h3>
+Owner: <& /Elements/SelectOwner, Name => 'Owner', QueueObj => $Ticket->QueueObj, TicketObj => $Ticket, Default => $Ticket->OwnerObj->Id &>
+<h3>Current watchers</h3>
+(Check box to delete)<br>
+
+Requestors:
+<& EditWatchers, TicketObj => $Ticket, Type => 'requestors' &>
+
+Cc:
+<& EditWatchers, TicketObj => $Ticket, Type => 'cc' &>
+
+Administrative Cc:
+<& EditWatchers, TicketObj => $Ticket, Type => 'admincc' &>
+
+</TD>
+</TR>
+</TABLE>
+
+<%ARGS>
+$UserField => undef
+$UserOp => undef
+$UserString => undef
+$Ticket => undef
+</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/EditWatchers b/rt/webrt/Ticket/Elements/EditWatchers
new file mode 100755
index 000000000..00185e8f9
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/EditWatchers
@@ -0,0 +1,46 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Ticket/Elements/Attic/EditWatchers,v 1.1 2002-08-12 06:17:09 ivan Exp $
+%# Copyright 1996-2000 Jesse Vincent <jesse@fsck.com>
+
+<ul>
+
+%# Print out a placeholder if there are none.
+%if ($watchers->Count == 0 ) {
+<li><i>none</i>
+% }
+
+
+%while (my $watcher=$watchers->Next) {
+<li>
+<INPUT TYPE=CHECKBOX NAME="DelWatcher<%$watcher->id%>" UNCHECKED>
+%#If there's a principal backing this user, lets give a link to their
+%# account
+%if ($watcher->IsUser) { 
+<a href="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$watcher->OwnerObj->id%>">
+<%$watcher->OwnerObj->RealName%></a>:
+%} else {
+Email address:
+%}
+<i><%$watcher->Email%></i>
+%}
+</ul>
+<%INIT>
+my ($watchers, $watcher, $set);
+if ($Type  =~ /^request/i) {
+       $watchers = $TicketObj->Requestors;
+       }
+elsif ($Type =~ /^admin/i) {
+        $watchers = $TicketObj->AdminCc;
+        }
+elsif ($Type =~ /^cc/i) {
+        $watchers = $TicketObj->Cc;
+      }
+else { $watchers = $TicketObj->Watchers;
+       }
+</%INIT>
+<%ARGS>
+$TicketObj => undef
+$Type => undef
+</%ARGS>
+
+
+
diff --git a/rt/webrt/Ticket/Elements/ShowBasics b/rt/webrt/Ticket/Elements/ShowBasics
new file mode 100755
index 000000000..97c84c9d0
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/ShowBasics
@@ -0,0 +1,29 @@
+ <TABLE WIDTH="100%">
+      <TR>
+	<TD VALIGN=TOP WIDTH="20%">
+	  <& /Elements/ShadedBox, title => 'Id' , content => $Ticket->Id &>
+	</TD>
+	<TD VALIGN=TOP WIDTH="20%"> <& /Elements/ShadedBox, title => 'Status' , content => $Ticket->Status &>
+	</TD>
+	<TD VALIGN=TOP WIDTH="20%">
+        <& /Elements/ShadedBox, title => 'Worked' , content => $TimeWorked ." min" &>
+	</TD>
+	<TD VALIGN=TOP WIDTH="20%">
+	  <& /Elements/ShadedBox, title => 'Priority', content=> $Ticket->Priority."/".$Ticket->FinalPriority &>
+	</TD>
+	<TD VALIGN=TOP WIDTH="20%">
+	  <& /Elements/ShadedBox, title => 'Queue', content=> $Ticket->QueueObj->Name &>
+	</TD>	
+
+
+      </TR>
+    </TABLE>
+<%INIT>
+my $TimeWorked = $Ticket->TimeWorked;
+if ($Ticket->TimeLeft > 0 ) {
+        $TimeWorked = $Ticket->TimeWorked."/".$Ticket->TimeLeft;
+}
+</%INIT>
+<%ARGS>
+$Ticket => undef
+</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowDates b/rt/webrt/Ticket/Elements/ShowDates
new file mode 100755
index 000000000..e17e31355
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/ShowDates
@@ -0,0 +1,54 @@
+<TABLE>
+<TR>
+<TD>
+Created:
+</TD>
+<TD>
+<% $Ticket->CreatedObj->AsString %>
+</TD>
+</TR>
+<TR>
+<TD>
+Starts: 
+</TD>
+<TD>
+<% $Ticket->StartsObj->AsString %> <BR>
+</TD>
+</TR>
+<TR>
+<TD>
+Started:
+</TD>
+<TD>
+<% $Ticket->StartedObj->AsString %>
+</TD>
+</TR>
+
+<TR>
+<TD>
+<a href="Display.html?id=<%$Ticket->id%>&Action=SetTold">Last Contact</a>:
+</TD>
+<TD>
+<% $Ticket->ToldObj->AsString %>
+</TD>
+</TR>
+<TR>
+<TD>
+Due:
+</TD>
+<TD><% $Ticket->DueObj->AsString  %>
+</TD>
+</TR>
+<TR>
+<TD>
+Updated:
+</TD>
+<TD>
+<A HREF="#lasttrans">
+<% $Ticket->LastUpdated ? ($Ticket->LastUpdatedAsString ." by ".$Ticket->LastUpdatedByObj->Name) : "Never" | h %></a>
+</TD>
+</TR>
+</TABLE>
+<%ARGS>
+$Ticket => undef
+</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowDependencies b/rt/webrt/Ticket/Elements/ShowDependencies
new file mode 100755
index 000000000..488652f83
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/ShowDependencies
@@ -0,0 +1,18 @@
+Depends on:<BR>
+% while (my $Link = $Ticket->DependsOn->Next) {
+% my $member = $Link->TargetObj;
+<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
+[<%$member->Status%>]
+ <br>
+% }
+Depended on by:<BR>
+% while (my $Link = $Ticket->DependedOnBy->Next) {
+% my $member = $Link->TargetObj;
+<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> 
+[<%$member->Status%>]
+ <br>
+% }
+
+<%ARGS>
+$Ticket => undef
+</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowHistory b/rt/webrt/Ticket/Elements/ShowHistory
new file mode 100755
index 000000000..155eaaabd
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/ShowHistory
@@ -0,0 +1,43 @@
+<TABLE BORDER=0 width="100%">
+<TR>
+<TD ALIGN=LEFT>
+% if ($ShowTitle) {
+<font size=+3>History</font>
+% }
+&nbsp;</TD>
+<TD align=right><font size=-1>Display mode: 
+%  if ($ShowHeaders == $Ticket->Id) {
+[<A HREF="<%$URIFile%>?id=<%$Ticket->id%>">Brief headers</a>]
+<b>[Full headers]</b>
+% } else {
+<b>[Brief headers]</b>
+[<A HREF="<%$URIFile%>?ShowHeaders=<%$Ticket->Id%>&id=<%$Ticket->id%>">Full headers</a>]
+%  }
+</font>
+</TD>
+</TR>
+</TABLE>
+
+<TABLE WIDTH=100% CELLSPACING=0 CELLPADDING=2 BORDER=0>
+% while (my $Transaction = $Transactions->Next) {
+% $i++;
+%	if ($Transactions->IsLast) {
+	<a name="lasttrans"></a>
+% 	}
+	    <& ShowTransaction, Ticket => $Ticket, Transaction => $Transaction, ShowHeaders => $ShowHeaders, Collapsed => $Collapsed, RowNum => $i  &>
+% }
+</TABLE>
+<%INIT>
+
+my $Transactions = $Ticket->Transactions;
+my $i;
+
+
+</%INIT>
+<%ARGS>
+$URIFile => 'Display.html'
+$Ticket => undef
+$ShowHeaders => undef
+$Collapsed => undef
+$ShowTitle => 1
+</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowKeywordSelects b/rt/webrt/Ticket/Elements/ShowKeywordSelects
new file mode 100644
index 000000000..4f8a1786b
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/ShowKeywordSelects
@@ -0,0 +1,26 @@
+<TABLE>
+% while ( my $KeywordSelect = $KeywordSelects->Next ) {
+    <TR>
+      <TD VALIGN=TOP>
+	<% $KeywordSelect->Name %><BR>
+      </TD>
+      <TD VALIGN=TOP>
+	<UL>
+% my $Keywords = $Ticket->KeywordsObj($KeywordSelect->Id);
+% while (my $Keyword = $Keywords->Next) { 
+	<li><% $Keyword->KeywordObj->RelativePath($KeywordSelect->KeywordObj) |n %></li>
+
+%   }
+	</ul>
+      </TD>
+    </TR>
+% }
+</TABLE>
+
+<%INIT>
+my $KeywordSelects = $Ticket->QueueObj->KeywordSelects;
+</%INIT>
+
+<%ARGS>
+$Ticket => undef
+</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowLinks b/rt/webrt/Ticket/Elements/ShowLinks
new file mode 100755
index 000000000..49795959e
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/ShowLinks
@@ -0,0 +1,61 @@
+Depends on:<BR>
+<UL>
+% while (my $Link = $Ticket->DependsOn->Next) {
+% my $member = $Link->TargetObj;
+<LI><a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
+[<%$member->Status%>]
+
+% }
+</UL>
+
+Depended on by:<BR>
+<UL>
+% while (my $Link = $Ticket->DependedOnBy->Next) {
+% my $member = $Link->BaseObj;
+<LI><a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> 
+[<%$member->Status%>]
+% }
+</UL>
+Parents:<BR>	
+<UL>
+% while (my $Link = $Ticket->MemberOf->Next) {
+% my $member = $Link->TargetObj;
+<LI><a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
+[<%$member->Status%>]
+
+% }
+</UL>
+
+Children:<BR>
+<& /Ticket/Elements/ShowMembers, Ticket => $Ticket &>
+<BR>
+Refers to:<BR>
+<UL>
+% while (my $Link = $Ticket->RefersTo->Next) {
+<LI>
+% if ($Link->TargetIsLocal) {
+% my $member = $Link->TargetObj;
+
+<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
+% } else {
+<A HREF="<%$Link->TargetAsHREF%>"><%$Link->Target%></A>
+% }
+%}
+</UL>
+
+Referred to by:<BR>
+<UL>
+% while (my $Link = $Ticket->ReferredToBy->Next) {
+<LI>
+% if ($Link->BaseIsLocal) {
+% my $member = $Link->BaseObj;
+<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
+% } else {
+<A HREF="<%$Link->BaseAsHREF%>"><%$Link->Base%></A>
+%}
+% }
+</UL>
+
+<%ARGS>
+$Ticket => undef
+</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowMemberOf b/rt/webrt/Ticket/Elements/ShowMemberOf
new file mode 100755
index 000000000..df5dc92b0
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/ShowMemberOf
@@ -0,0 +1,12 @@
+<UL>
+% my $memberof = $Ticket->MemberOf;
+% while (my $member_of = $memberof->Next) {
+<LI><a href="/Ticket/Display.html?id=<%$member_of->Id%>"><%$member_of->Id%></a>: <%$member_of->Subject%> [<%$member_of->Status%>]
+% }
+</UL>
+
+<%INIT>
+</%INIT>
+<%ARGS>
+$Ticket => undef
+</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowMembers b/rt/webrt/Ticket/Elements/ShowMembers
new file mode 100755
index 000000000..0a6f12377
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/ShowMembers
@@ -0,0 +1,22 @@
+% if ($members->Count) {
+<UL>
+% while (my $link = $members->Next) {
+% my $member= $link->BaseObj;
+<LI><a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: <%$member->Subject%> [<%$member->Status%>]<br>
+% if ($depth < 8) {
+<&/Ticket/Elements/ShowMembers, Ticket => $member, depth => ($depth+1) &> 
+% }
+% }
+</UL>
+% }
+
+<%INIT>
+
+my $members = $Ticket->Members;
+
+</%INIT>
+
+<%ARGS>
+$Ticket => undef
+$depth => 1
+</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowPeople b/rt/webrt/Ticket/Elements/ShowPeople
new file mode 100755
index 000000000..ff35f484d
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/ShowPeople
@@ -0,0 +1,12 @@
+Owner<BR>
+&nbsp;<B><%$Ticket->OwnerObj->Name%></B><BR>
+Requestors<BR>
+&nbsp;<B><%$Ticket->RequestorsAsString%></B><BR>
+Cc<BR>
+&nbsp;<B><%$Ticket->CcAsString%></B><BR>
+AdminCc<BR>
+&nbsp;<B><%$Ticket->AdminCcAsString%></B>
+<%ARGS>
+$Ticket => undef
+</%ARGS>
+
diff --git a/rt/webrt/Ticket/Elements/ShowReferences b/rt/webrt/Ticket/Elements/ShowReferences
new file mode 100755
index 000000000..37e2fdece
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/ShowReferences
@@ -0,0 +1,27 @@
+<UL>
+% while (my $Link = $Ticket->RefersTo->Next) {
+<LI>
+% if ($Link->TargetIsLocal) {
+% my $member = $Link->TargetObj;
+
+<a href="/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
+% } else {
+<A HREF="<%$Link->TargetAsHREF%>"><%$Link->Target%></A>
+% }
+%}
+
+
+
+% while (my $Link = $Ticket->ReferredToBy->Next) {
+<LI>
+% if ($Link->BaseIsLocal) {
+% my $member = $Link->BaseObj;
+<a href="/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
+% } else {
+<A HREF="<%$Link->BaseAsHREF%>"><%$Link->Base%></A>
+%}
+% }
+</UL>
+<%ARGS>
+$Ticket => undef
+</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowRequestor b/rt/webrt/Ticket/Elements/ShowRequestor
new file mode 100644
index 000000000..fcbe71df1
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/ShowRequestor
@@ -0,0 +1,35 @@
+<%PERL>
+my $people = $Ticket->Requestors;
+while (my $requestor=$people->Next) {
+if (($requestor->Owner ) && (my $user=$requestor->OwnerObj)) {
+my $name=$user->RealName || $user->EmailAddress;	
+my $tickets = new RT::Tickets($session{'CurrentUser'});
+$tickets->LimitRequestor(VALUE => $user->EmailAddress);
+$tickets->LimitStatus( VALUE => 'open');
+$tickets->LimitStatus( VALUE => 'new');
+$tickets->RowsPerPage(25);
+$tickets->OrderBy(FIELD => 'Priority',
+		  ORDER => 'DESC');
+</%PERL>
+
+% unless ($user->Privileged) {
+<& /Elements/TitleBoxStart, 
+	title => "<a class='inverse' href=\"$RT::WebPath/Admin/Users/Modify.html?id=".$user->id."\">More about $name</a>" &>
+
+Comments about this user:<BR>
+<B><% ($user->Comments || "No comment entered about this user") %></B><BR>
+
+This user's 25 highest priority tickets:<BR>
+<UL>
+%while (my $w=$tickets->Next) {
+<LI><%$w->Id%>: <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$w->id%>"><%$w->Subject%></a> (<%$w->Status%>)
+%}
+</UL>
+<& /Elements/TitleBoxEnd &>
+
+% }
+% }
+%}
+<%ARGS>
+$Ticket=>undef
+</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowSummary b/rt/webrt/Ticket/Elements/ShowSummary
new file mode 100755
index 000000000..b80ceb4fd
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/ShowSummary
@@ -0,0 +1,61 @@
+      <TABLE WIDTH="100%" >
+      <TR>
+	<TD VALIGN=TOP >
+	  <& /Elements/TitleBoxStart, title => 'The Basics', 
+		title_href =>"$RT::WebPath/Ticket/Modify.html?id=".$Ticket->Id, 
+		title_class=> 'inverse',  
+		color => "#993333" &>
+	  <& /Ticket/Elements/ShowBasics, Ticket => $Ticket &>
+	  <& /Elements/TitleBoxEnd &>
+
+	<BR>
+
+	  <& /Elements/TitleBoxStart, 
+		title_href =>"$RT::WebPath/Ticket/Modify.html?id=".$Ticket->Id, 
+		title_class=> 'inverse',  
+		title => "Keyword Selections", color => "#993300"
+	  &>
+	  <& /Ticket/Elements/ShowKeywordSelects, Ticket => $Ticket &>
+	  <& /Elements/TitleBoxEnd &>
+
+	
+
+	<BR>
+	  <& /Elements/TitleBoxStart, title => 'Relationships', 
+		title_href => "$RT::WebPath/Ticket/ModifyLinks.html?id=".$Ticket->Id, 
+		title_class=> 'inverse',  
+		titleright => '', color=> "#336633" &>
+	  <& /Ticket/Elements/ShowLinks, Ticket => $Ticket &>
+	<& /Elements/TitleBoxEnd &>
+	</TD>
+	<BR>
+	<TD VALIGN=TOP >
+
+	  <& /Elements/TitleBoxStart, title => "Dates",
+		title_href =>"$RT::WebPath/Ticket/ModifyDates.html?id=".$Ticket->Id, 
+		title_class=> 'inverse',  
+		 color => "#663366" &>
+	  <& /Ticket/Elements/ShowDates, Ticket => $Ticket &>
+	  <& /Elements/TitleBoxEnd &>
+	<BR>  
+	  <& /Elements/TitleBoxStart, title => 'People', 
+		title_href =>"$RT::WebPath/Ticket/ModifyPeople.html?id=".$Ticket->Id, 
+		title_class=> 'inverse',  
+		color => "#333399" &>
+	  <& /Ticket/Elements/ShowPeople, Ticket => $Ticket &>
+	  <& /Elements/TitleBoxEnd &>
+	<BR>
+
+	  <& /Ticket/Elements/ShowRequestor, Ticket => $Ticket &>
+
+
+	</TD>
+      </TR>
+    </TABLE>
+<%ARGS>
+$Ticket => undef
+</%ARGS>
+
+
+
+
diff --git a/rt/webrt/Ticket/Elements/ShowTransaction b/rt/webrt/Ticket/Elements/ShowTransaction
new file mode 100755
index 000000000..a0da008b3
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/ShowTransaction
@@ -0,0 +1,162 @@
+<TR bgcolor="<%$rowbgcolor%>">
+<TD bgcolor="<%$bgcolor%>"><A NAME="#<%$Transaction->Id%>"></A>&nbsp&nbsp;</TD>
+<TD>&nbsp&nbsp;</TD>
+<TD><font size=-2><% $transdate|n %></font>&nbsp;</TD>
+<TD ALIGN="LEFT"><b><%$Transaction->CreatorObj->Name%> - <%$TicketString%> <%$Transaction->BriefDescription%>
+
+</b></TD>
+<TD><%$TimeTaken%>&nbsp;</TD>
+<TD ALIGN="RIGHT"><font size=-1><%$titlebar_commands|n%></font></TD>
+</TR>
+<%PERL>
+
+unless ($Collapsed) {
+ $attachments->GotoFirstItem;
+ while (my $message=$attachments->Next) {
+     #we don't want to show any empty transactions, unless they have kids
+     next unless (length $message->Content || $message->Children->Count);
+     my ($headers, $content);
+     
+    </%PERL>
+
+
+<%PERL>
+  if ($message->Parent == 0) {
+      if ($ShowHeaders == $Ticket->Id) {
+	  $headers = $message->Headers;
+      } else {
+	  $headers = $message->NiceHeaders;
+      }
+      chomp $headers;
+      $headers .= "\n\n" if ($headers);
+  }
+     # 13456 is a random # of about the biggest size we want to see inline text
+     my $MAX_INLINE_BODY = 13456;
+     if ($message->ContentType =~ m{^(text/plain|message|text$)}i && 
+				    length($message->Content)< $MAX_INLINE_BODY ) {
+
+	 $content = $message->Content;
+
+	 my $wrapper = new Text::Wrapper (columns=>85);
+	 $content = $wrapper->wrap($content);
+         $content =~ s/&/&amp;/g;
+	 $content =~ s/</&lt;/g;
+	 $content =~ s/>/&gt;/g;
+         $content =~ s!((?:http|https|ftp|mailto):\S*?)([\s"']|&gt;|\.[\n])!<A HREF=\"$1\" TARGET=new>$1</A>$2!g;
+
+
+     }
+     else {
+	 $content = "&nbsp;";
+     }
+        
+</%PERL>
+<TR BGCOLOR="<%$rowbgcolor%>">
+      <TD BGCOLOR="<%$bgcolor%>">&nbsp;&nbsp;</TD>
+      <TD>&nbsp&nbsp;</TD>
+      <TD COLSPAN=3 VALIGN=TOP>
+	<PRE>
+<%$headers%><%$content|n%>
+</PRE>
+      </TD>
+      <TD VALIGN=TOP ALIGN=RIGHT>
+	
+% if ($message->Parent == 0  ) {
+<BR>
+% }
+<%PERL>
+my $size = length($message->Content());
+
+if ($size) {
+    if ($size > 1024) {
+	$size = int($size/102.4)/10 . "k";
+    }
+    else {
+	$size = $size ."b";
+    }
+</%PERL>
+<font size=-1><A HREF="Attachment/<%$Transaction->Id%>/<%$message->Id%>/<%$message->Filename%>">Download <%$message->Filename|| '(untitled)'%></a> <% $size %></font>
+% }
+</TD>
+</TR>
+% }
+% }
+
+
+
+<%ARGS>
+$Ticket => undef
+$Transaction => undef
+$ShowHeaders => undef
+$Collapsed => undef
+$ShowTitleBarCommands => 1
+$RowNum => 1
+</%ARGS>
+
+<%INIT>
+
+
+my ($TimeTaken, $TicketString, $bgcolor, $rowbgcolor);
+
+my $transdate = $Transaction->CreatedAsString();
+$transdate =~ s/\s/&nbsp;/g;
+
+if ($RowNum % 2) {
+	$rowbgcolor="#cccccc";
+} else {
+	$rowbgcolor="#ffffff";
+}
+
+if ($Transaction->Type =~ /^(Create|Correspond|Comment$)/) {
+	if ($Transaction->IsInbound) {
+		$bgcolor="#336699";
+	}
+	else {
+		$bgcolor="#339999";
+	}
+} elsif (($Transaction->Field =~ /^Owner$/) or 
+	 ($Transaction->Type =~ /^(AddWatcher|DelWatcher)$/)) {
+	$bgcolor="#333399";
+
+} elsif ($Transaction->Type =~ /^(AddLink|DeleteLink)$/) {
+	$bgcolor="#336633";
+} elsif ($Transaction->Type =~ /^(Status|Set|Keyword|Told)$/) {
+	if ($Transaction->Field =~ /^(Told|Starts|Started|Due)$/) {
+		$bgcolor="#663366";	
+	}
+	else {
+		$bgcolor="#993333";
+	}
+}
+else {
+	$bgcolor="#cccccc";
+}
+
+if ($Ticket->Id != $Transaction->Ticket) {
+	$TicketString = "Ticket ".$Transaction->Ticket .": ";
+}
+
+if ($Transaction->TimeTaken > 0) {
+	$TimeTaken = $Transaction->TimeTaken." min"
+}
+my $attachments = $Transaction->Attachments;
+
+my $titlebar_commands='&nbsp;';
+
+# If the transaction has anything attached to it at all
+if ($Transaction->Message->First && $ShowTitleBarCommands) {
+	if ($Transaction->TicketObj->CurrentUserHasRight('ReplyToTicket')) {
+		$titlebar_commands .= 
+	  	  "[<a href=\"Update.html?id=".
+		  $Transaction->Ticket . "&QuoteTransaction=".$Transaction->Id.
+		  "&Action=Respond\">Reply</a>]&nbsp;";
+	}
+	if ($Transaction->TicketObj->CurrentUserHasRight('CommentOnTicket')) {
+	     $titlebar_commands .= 
+	     "[<a href=\"Update.html?id=".$Transaction->Ticket. 
+	     "&QuoteTransaction=".$Transaction->Id.
+	     "&Action=Comment\">Comment</a>]";
+	}
+}
+
+</%INIT>
diff --git a/rt/webrt/Ticket/Elements/Tabs b/rt/webrt/Ticket/Elements/Tabs
new file mode 100755
index 000000000..8cce197de
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/Tabs
@@ -0,0 +1,126 @@
+<& /Elements/Tabs, tabs => $tabs, actions => $actions, current_tab => $current_tab, tabs_scalar => $tabs_scalar &>
+<%INIT>
+	
+  my $id = $Ticket->id();
+  my $tabs_scalar = '';
+  my $tabs = {
+		 A => { title => 'Display',
+			path => "Ticket/Display.html?id=".$id,
+		      },
+	      
+	      Ab => { title => 'History',
+		      path => "Ticket/History.html?id=".$id,
+		       },
+	      B => { title => 'Basics',
+		     path => "Ticket/Modify.html?id=".$id,
+		   },
+	      
+	      C => { title => 'Dates',
+		     path => "Ticket/ModifyDates.html?id=".$id,
+		   },
+	      
+	      D => { title => 'People',
+		     path => "Ticket/ModifyPeople.html?id=".$id,
+		   },
+	      E => { title => 'Links',
+		     path => "Ticket/ModifyLinks.html?id=".$id,
+		   },
+	      F => { title => 'Jumbo',
+		     path => "Ticket/ModifyAll.html?id=".$id,
+		   },
+	      
+	     };
+
+my $actions;
+if ($Ticket->CurrentUserHasRight('ModifyTicket') or 
+    $Ticket->CurrentUserHasRight('CommentOnTicket')) {
+    $actions->{'Comment'} = 
+      { 
+       title => 'Comment',
+	path => "Ticket/Update.html?Action=Comment&id=".$id,
+      }
+  };
+
+if ($Ticket->CurrentUserHasRight('ModifyTicket') or 
+    $Ticket->CurrentUserHasRight('ReplyToTicket')) {
+    $actions->{'Reply'} = 
+      { 
+       title => 'Reply',
+       path => "Ticket/Update.html?Action=Respond&id=".$id,
+      }
+  };
+
+if ($Ticket->CurrentUserHasRight('OwnTicket')) {
+    if ($Ticket->OwnerObj->id == $RT::Nobody->id)  {
+	$actions->{'Take'} = 	
+	  { 
+	   path => "Ticket/Display.html?Action=Take&id=".$id,
+	   title => 'Take'
+	  };
+    }
+    elsif ( $Ticket->OwnerObj->id != $session{CurrentUser}->id) {
+	$actions->{'Steal'} = 	
+	  { 
+	   path => "Ticket/Display.html?Action=Steal&id=".$id,
+	   title => 'Steal' 
+	  };
+    }
+}
+
+if ($Ticket->CurrentUserHasRight('ModifyTicket')) {
+    if ($Ticket->Status ne 'resolved') {
+	$actions->{'Resolve'} = 
+	  { 
+
+           path => "Ticket/Update.html?Action=Comment&DefaultStatus=resolved&id=".$id,
+	   title => 'Resolve'
+	  };
+    }	
+    if ($Ticket->Status ne 'open') {	
+	$actions->{'Open'} = 
+	  { 
+	   path => "Ticket/Display.html?Status=open&id=". $id,
+	   title => 'Open'
+	  };
+    }
+}
+
+
+
+
+if (defined $session{'tickets'}) {
+    my $items = $session{'tickets'}->ItemsArrayRef();
+    my @indexs = grep(($items->[$_]->id == $Ticket->Id), 0 .. $#{$items});
+
+    if ($items->[0]) {
+
+    if ($items->[$indexs[0]]->id == $Ticket->Id) {
+	# Don't display prev links if we're on the first ticket
+ 	if ( $items->[0]->id != $Ticket->id ) {
+	    $tabs_scalar .= '[<A HREF="Display.html?id='.
+	      $items->[0]->id.
+		'">&lt;&lt; First</a>] ';
+	    $tabs_scalar .= '[<A HREF="Display.html?id='.
+	      $items->[$indexs[0]-1]->id.
+		'">&lt; Prev</a>] ';
+	}
+	# Don't display next links if we're on the last ticket
+	if ( $Ticket->id != $items->[-1]->id ) {
+	    $tabs_scalar .= '[<A HREF="Display.html?id='.
+	      $items->[$indexs[0]+1]->id.
+		'">Next &gt;</a>] ';
+	    $tabs_scalar .= '[<A HREF="Display.html?id='.
+	      $items->[-1]->id.
+		'">Last &gt;&gt</a>]';
+	}
+	$tabs_scalar .= "<BR><BR>";
+    }
+    }
+}
+</%INIT>
+
+  
+<%ARGS>
+$Ticket => undef
+$current_tab => undef
+</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ToolBar b/rt/webrt/Ticket/Elements/ToolBar
new file mode 100755
index 000000000..108e2f784
--- /dev/null
+++ b/rt/webrt/Ticket/Elements/ToolBar
@@ -0,0 +1,3 @@
+<%ARGS>
+$Ticket => undef
+</%ARGS>
diff --git a/rt/webrt/Ticket/History.html b/rt/webrt/Ticket/History.html
new file mode 100755
index 000000000..e0a5fe15a
--- /dev/null
+++ b/rt/webrt/Ticket/History.html
@@ -0,0 +1,30 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Ticket/Attic/History.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
+%# Copyright 1996-2000 Jesse Vincent <jesse@fsck.com>
+
+<& /Elements/Header, Title => "Ticket History #".$Ticket->Id ." ".$Ticket->Subject &>
+<& /Ticket/Elements/Tabs, Ticket => $Ticket, current_tab => 'Ticket/History.html?id='.$Ticket->id  &>
+
+<BR>
+      
+<& /Ticket/Elements/ShowHistory , Ticket => $Ticket, ShowHeaders => $ARGS{'ShowHeaders'}, URIFile => 'History.html' &> 
+
+
+<%ARGS>
+$id => undef
+</%ARGS>
+
+<%INIT>
+
+  
+
+my $Ticket = LoadTicket ($id);
+
+unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
+	Abort("No permission to view ticket");
+}
+
+</%INIT>
+
+
+
+
diff --git a/rt/webrt/Ticket/Modify.html b/rt/webrt/Ticket/Modify.html
new file mode 100755
index 000000000..7a8a79216
--- /dev/null
+++ b/rt/webrt/Ticket/Modify.html
@@ -0,0 +1,39 @@
+<& /Elements/Header, Title => 'Modify ticket #'.$TicketObj->Id &>
+<& /Ticket/Elements/Tabs, Ticket => $TicketObj, current_tab => "Ticket/Modify.html?id=".$TicketObj->Id  &>
+
+<& /Elements/ListActions, actions => \@results &>
+<FORM METHOD=POST ACTION="Modify.html">
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$TicketObj->Id%>">
+
+<& /Elements/TitleBoxStart, title => 'Modify ticket #'.$TicketObj->Id, 
+  color=> "#993333", width => "100%" &>
+<& Elements/EditBasics, TicketObj => $TicketObj &>
+<& /Elements/TitleBoxEnd &>
+
+<& /Elements/TitleBoxStart, title => 'Keywords', color =>"#993333"&>
+<& Elements/EditKeywordSelects, TicketObj=>$TicketObj &>
+<& /Elements/TitleBoxEnd &>
+
+<& /Elements/Submit, Label => 'Save Changes', Caption => "If you've updated anything above, be sure to", color => "#993333" &>
+</form>
+<%INIT>
+  
+my $TicketObj = LoadTicket($id);
+
+my @results = ProcessTicketBasics(TicketObj => $TicketObj, ARGSRef => \%ARGS);
+my @okresults = ProcessTicketObjectKeywords(TicketObj => $TicketObj, ARGSRef => \%ARGS);
+
+push (@results, @okresults);
+
+# TODO: display the results, even if we can't display the ticket
+
+unless ($TicketObj->CurrentUserHasRight('ShowTicket')) {
+     Abort("No permission to view ticket");
+} 
+
+</%INIT>
+
+
+<%ARGS>
+$id => undef
+</%ARGS>
diff --git a/rt/webrt/Ticket/ModifyAll.html b/rt/webrt/Ticket/ModifyAll.html
new file mode 100755
index 000000000..ad913739d
--- /dev/null
+++ b/rt/webrt/Ticket/ModifyAll.html
@@ -0,0 +1,124 @@
+<& /Elements/Header, Title => "Ticket #".$Ticket->Id ." Jumbo update: ".$Ticket->Subject &>
+<& /Ticket/Elements/Tabs, Ticket => $Ticket , current_tab => "Ticket/ModifyAll.html?id=".$Ticket->Id &>
+
+<& /Elements/ListActions, actions => \@results &>
+
+<FORM METHOD=POST ACTION="ModifyAll.html" ENCTYPE="multipart/form-data">
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>">
+
+
+<& /Elements/TitleBoxStart, title => 'Modify ticket #'.$Ticket->Id,   color=> "#993333", width => "100%" &>
+<& Elements/EditBasics, TicketObj => $Ticket &>
+<& /Elements/TitleBoxEnd &>
+
+<BR>
+
+<& /Elements/TitleBoxStart, title => 'Dates',  width => "100%", color => "#663366"  &>
+<& Elements/EditDates, TicketObj => $Ticket &>
+<& /Elements/TitleBoxEnd &>
+
+<BR>
+
+<& /Elements/TitleBoxStart, title => 'Keywords', color =>"#993333"&>
+<& Elements/EditKeywordSelects, TicketObj=>$Ticket &>
+<& /Elements/TitleBoxEnd &>
+
+<BR>
+
+<& /Elements/TitleBoxStart, title => 'People',width => "100%", color=> "#333399" &>
+<& Elements/EditPeople, Ticket => $Ticket, UserField => $UserField, UserString => $UserString, UserOp => $UserOp &>
+<& /Elements/TitleBoxEnd &>
+
+<BR>
+
+<& /Elements/TitleBoxStart, title => 'Relationships', color => "#336633"&>
+<& Elements/EditLinks, Ticket => $Ticket &>
+<& /Elements/TitleBoxEnd &>
+
+<BR>
+
+<& /Elements/TitleBoxStart, title => 'Update ticket' &>
+<hr>
+Update Type: <select name="UpdateType">
+% if ($CanComment) {
+  <option value="private" >Comments (Not sent to requestors)</option>
+% }
+% if ($CanRespond) {
+   <option value="response">Response to requestors</option>
+% }
+</select> 
+<br>
+
+Subject: <input name="UpdateSubject" size=60 value=""> <br>
+Attach: <input name="UpdateAttachment" type=file> <br>
+<& /Elements/MessageBox, Name=>"UpdateContent", QuoteTransaction=>$ARGS{QuoteTransaction} &>
+<& /Elements/TitleBoxEnd &>
+
+
+<& /Elements/Submit, Label => 'Save Changes', Caption => "If you've updated anything above, be sure to", color => "#333399" &>
+</form>
+
+<%INIT>
+
+
+
+my $Ticket = LoadTicket($id);
+
+my $CanRespond = 0;
+my $CanComment = 0;
+
+
+$CanRespond = 1 if ( $Ticket->CurrentUserHasRight('ReplyToTicket') or
+                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
+
+$CanComment = 1 if ( $Ticket->CurrentUserHasRight('CommentOnTicket') or
+                     $Ticket->CurrentUserHasRight('ModifyTicket') );
+
+
+my (@wresults, @results, @okresults, @dresults, @lresults);
+
+unless ($OnlySearchForPeople) {
+    @wresults = ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS);
+    @results = ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS);
+    @okresults = ProcessTicketObjectKeywords(TicketObj => $Ticket, ARGSRef => \%ARGS);
+
+    @dresults = ProcessTicketDates( TicketObj => $Ticket, ARGSRef => \%ARGS);
+    @lresults = ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);
+
+    $ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
+
+    if ($ARGS{'UpdateContent'} && 
+	$ARGS{'UpdateContent'} ne '' && 
+	$ARGS{'UpdateContent'} ne  "-- \n" . 
+				$session{'CurrentUser'}->UserObj->Signature
+       ) {
+   	 ProcessUpdateMessage(TicketObj => $Ticket, 
+			      ARGSRef=>\%ARGS, 
+                              Actions=>\@results);
+	}
+}
+push @results, @wresults;
+push @results, @dresults;
+push @results, @lresults;
+push @results, @okresults;
+
+# If they've gone and moved the ticket to somewhere they can't see, etc...
+# TODO: display the results, even if we can't display the ticket.
+
+unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
+   Abort("No permission to view ticket");
+}
+
+
+</%INIT>
+
+
+
+<%ARGS>
+$OnlySearchForPeople => undef
+$UserField => undef
+$UserOp => undef
+$UserString => undef
+$id => undef
+</%ARGS>
+
diff --git a/rt/webrt/Ticket/ModifyDates.html b/rt/webrt/Ticket/ModifyDates.html
new file mode 100755
index 000000000..b2ecb68fb
--- /dev/null
+++ b/rt/webrt/Ticket/ModifyDates.html
@@ -0,0 +1,26 @@
+<& /Elements/Header, Title => 'Modify dates for #'. $TicketObj->Id &>
+<& /Ticket/Elements/Tabs, Ticket => $TicketObj, current_tab => "Ticket/ModifyDates.html?id=".$TicketObj->Id  &> 
+
+<& /Elements/ListActions, actions => \@results &>
+
+<FORM METHOD=POST ACTION="ModifyDates.html">
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$TicketObj->Id%>">
+<& /Elements/TitleBoxStart, title => 'Modify dates for ticket #'.$TicketObj->Id,  width => "100%", color => "#663366"  &>
+
+<& Elements/EditDates, TicketObj => $TicketObj &>
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit, color => "#663366" &>
+</form>
+
+
+<%INIT>
+
+my $TicketObj = LoadTicket($id);
+my @results = ProcessTicketDates( TicketObj => $TicketObj, ARGSRef => \%ARGS);
+
+</%INIT>
+
+
+<%ARGS>
+$id => undef
+</%ARGS>
diff --git a/rt/webrt/Ticket/ModifyLinks.html b/rt/webrt/Ticket/ModifyLinks.html
new file mode 100755
index 000000000..14c939d43
--- /dev/null
+++ b/rt/webrt/Ticket/ModifyLinks.html
@@ -0,0 +1,31 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Ticket/Attic/ModifyLinks.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
+%# Copyright 1996-2000 Jesse Vincent <jesse@fsck.com>
+
+<& /Elements/Header, Title => "Link ticket ".$Ticket->Id &>
+<& /Ticket/Elements/Tabs, Ticket => $Ticket, current_tab => "Ticket/ModifyLinks.html?id=".$Ticket->Id &>
+
+<& /Elements/ListActions, actions => \@results &>
+
+<form action="ModifyLinks.html" method="post">
+<input type="hidden" name="id" value="<%$Ticket->id%>">
+
+<& /Elements/TitleBoxStart, title => 'Edit Relationships', color => "#336633"&>
+<& Elements/EditLinks, Ticket => $Ticket &>
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit, color => "#336633", Caption=> 'Save changes' &>
+</form>
+
+
+
+
+<%INIT>
+  
+my $Ticket = LoadTicket($id);
+my @results = ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);
+    
+</%INIT>
+      
+      
+<%ARGS>
+$id => undef
+</%ARGS>
diff --git a/rt/webrt/Ticket/ModifyPeople.html b/rt/webrt/Ticket/ModifyPeople.html
new file mode 100755
index 000000000..fecf09192
--- /dev/null
+++ b/rt/webrt/Ticket/ModifyPeople.html
@@ -0,0 +1,38 @@
+<& /Elements/Header, Title => 'Modify people related to ticket # ' . $Ticket->id &>
+<& /Ticket/Elements/Tabs, Ticket => $Ticket , current_tab => "Ticket/ModifyPeople.html?id=".$Ticket->Id &>
+
+<& /Elements/ListActions, actions => \@results &>
+
+<FORM METHOD=POST ACTION="ModifyPeople.html">
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>">
+<& /Elements/TitleBoxStart, title => 'Modify people related to ticket #'.$Ticket->Id,   width => "100%", color=> "#333399" &>
+<& Elements/EditPeople, Ticket => $Ticket, UserField => $UserField, UserString => $UserString, UserOp => $UserOp &>
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit, Label => 'Save Changes', Caption => "If you've updated anything above, be sure to", color => "#333399" &>
+</form>
+
+<%INIT>
+
+my (@results, @wresults);
+
+my $Ticket = LoadTicket($id);
+
+# if we're trying to search for watchers and nothing else
+unless ($OnlySearchForPeople) {
+    @results = ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS);
+    @wresults = ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS);
+}
+
+push @results, @wresults;
+</%INIT>
+
+
+
+<%ARGS>
+$OnlySearchForPeople => undef
+$UserField => undef
+$UserOp => undef
+$UserString => undef
+$id => undef
+</%ARGS>
+
diff --git a/rt/webrt/Ticket/Update.html b/rt/webrt/Ticket/Update.html
new file mode 100755
index 000000000..be2266663
--- /dev/null
+++ b/rt/webrt/Ticket/Update.html
@@ -0,0 +1,110 @@
+<& /Elements/Header, Title=> $title  &>
+<& /Ticket/Elements/Tabs, Ticket => $Ticket &>
+<& /Elements/TitleBoxStart, title => "Update ticket" &>
+
+<FORM ACTION="Display.html" NAME="TicketUpdate" 
+	METHOD=POST enctype="multipart/form-data">
+
+<TABLE>
+<TR><TD>
+<a href="ModifyPeople.html?id=<%$Ticket->Id%>">Ticket watchers</A></TD><TD align=right>
+Requestor:
+</TD><TD>
+<b><% $Ticket->RequestorsAsString %></b>
+</TD></TR>
+<TR><TD>&nbsp;</TD><TD align=right>
+Cc:
+</TD><TD>
+<b><% $Ticket->CcAsString %></b>
+</TD></TR>
+<TR><TD>&nbsp;</TD><TD align=right>
+AdminCc:
+</TD><TD>
+<b><% $Ticket->AdminCcAsString %></b>
+</TD></TR>
+</TR>
+</TABLE>
+<hr>
+
+<TABLE BORDER=0>
+
+<tr><td align=right>Status:</td>
+<td>
+<& /Elements/SelectStatus, Name=>"Status", Default => $DefaultStatus &>
+Owner:  
+<& /Elements/SelectOwner, Name=>"Owner", Default => $Ticket->OwnerObj->Id(), QueueObj => $Ticket->QueueObj, TicketObj => $Ticket &>
+Worked: <input size=4 name="UpdateTimeWorked"> minutes</td></tr>
+<tr><td align=right>Update Type:</td>
+<td><select name="UpdateType">
+% if ($CanComment) {
+  <option value="private" <%$CommentDefault%>>Comments (Not sent to requestors)</option>
+% }
+% if ($CanRespond) {
+   <option value="response" <%$ResponseDefault%>>Response to requestors</option>
+% }
+</select> 
+</td></tr>
+<tr><td align=right>Subject:</td><td> <input name="UpdateSubject" size=60 value="<%$Ticket->Subject()%>"></td></tr>
+<tr><td align=right>Cc:</td><td> <input name="UpdateCc" size=60><BR>
+<i><font size=-2>(Sends a carbon-copy of this update to a comma-delimited list
+of email addresses. Does <b>not</b> change who will receive future updates.)</font></i>
+</td></tr>
+<tr><td align=right>Bcc:</td><td> <input name="UpdateBcc" size=60><BR>
+<i><font size=-2>(Sends a blind carbon-copy of this update to a comma-delimited list
+of email addresses. Does <b>not</b> change who will receive future updates.)</font></i>
+</td></tr>
+<tr><td align=right>Attach:</td><td><input name="UpdateAttachment" type="file"></td></tr>
+</table>
+<& /Elements/MessageBox, Name=>"UpdateContent", QuoteTransaction=>$ARGS{QuoteTransaction} &>
+		<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>"><br>
+
+
+
+
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit &>
+  </FORM>
+
+
+
+<%INIT>
+
+my $CanRespond = 0;
+my $CanComment = 0;
+my $title;
+
+my $Ticket = LoadTicket($id);
+
+
+if ($DefaultStatus eq 'resolved') {
+	$title = "Resolve";
+} else {
+	$title = "Update";
+}
+
+$title .= " ticket #" . $Ticket->id . " (" .$Ticket->Subject.")";
+
+# Things needed in the template - we'll do the processing here, just
+# for the convinience:
+my $CommentDefault=$Action eq "Comment" ? "SELECTED" : "";
+my $ResponseDefault=$Action eq "Respond" ? "SELECTED" : "";
+
+$DefaultStatus = $Ticket->Status() unless ($DefaultStatus);
+
+$CanRespond = 1 if ( $Ticket->CurrentUserHasRight('ReplyToTicket') or
+                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
+
+$CanComment = 1 if ( $Ticket->CurrentUserHasRight('CommentOnTicket') or
+                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
+	
+
+     
+     
+
+</%INIT>
+
+<%ARGS>
+$id => undef
+$Action => undef
+$DefaultStatus => undef
+</%ARGS>
diff --git a/rt/webrt/User/Prefs.html b/rt/webrt/User/Prefs.html
new file mode 100755
index 000000000..d769977f9
--- /dev/null
+++ b/rt/webrt/User/Prefs.html
@@ -0,0 +1,53 @@
+<& /Elements/Header, Title=>"Preferences" &>
+<& /Elements/Tabs &>
+
+<& /Elements/ListActions, actions => \@results &>
+<form method=post>
+
+% unless ($RT::WebExternalAuth) {
+<& /Elements/TitleBoxStart, title => 'Change password'  &>
+New password: <input type=password name="NewPass1" size=16>
+Confirm: <input type=password name="NewPass2" size=16>
+<& /Elements/TitleBoxEnd &>
+<BR>
+% }
+<& /Elements/TitleBoxStart, title => 'Signature'  &>
+<INPUT TYPE=HIDDEN NAME="SignatureMagic" VALUE=1>
+<TEXTAREA COLS=72 ROWS=4 WRAP=HARD NAME="Signature"><% $session{'CurrentUser'}->UserObj->Signature %></TEXTAREA>
+<br>
+<BR>
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit &>
+	  </form>
+
+
+<%INIT>
+my @results;
+
+if ($NewPass1) {
+    if ($NewPass1 ne $NewPass2) {
+	push (@results, "Passwords did not match.");
+    }	
+    else {
+	my ($val, $msg)=$session{'CurrentUser'}->UserObj->SetPassword($NewPass1);
+	push (@results, "Password: ".$msg);
+    }	
+}
+if ($Signature || $SignatureMagic) {
+    $Signature =~ s/(\r\n|\r)/\n/g;
+    if ($Signature ne $session{'CurrentUser'}->UserObj->Signature) {
+	my ($val, $msg)=$session{'CurrentUser'}->UserObj->SetSignature($Signature);
+	push (@results, "Signature: ".$msg);
+    }
+}
+#A hack to make sure that session gets rewritten.
+
+$session{'i'}++;
+</%INIT>
+
+<%ARGS>
+$Signature => undef
+$SignatureMagic => undef
+$NewPass1 => undef
+$NewPass2 => undef
+</%ARGS>
diff --git a/rt/webrt/autohandler b/rt/webrt/autohandler
new file mode 100755
index 000000000..16cdbc79b
--- /dev/null
+++ b/rt/webrt/autohandler
@@ -0,0 +1,73 @@
+%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Attic/autohandler,v 1.1 2002-08-12 06:17:08 ivan Exp $
+<& /Elements/Footer, %ARGS &>
+
+<%INIT>
+
+$m->{'rt_base_time'} = time;
+
+#if it's a noauth file, don't ask for auth.
+if ($m->base_comp->path =~ '^/+NoAuth/') {
+        $m->call_next();
+	$m->abort();
+}
+
+# If RT is configured for external auth, let's get REMOTE_USER
+# We intentionally don't test for REMOTE_USER to meet our policy
+elsif ($RT::WebExternalAuth){
+
+    $user = $ENV{'REMOTE_USER'};
+    $session{'CurrentUser'} = RT::CurrentUser->new();
+    $session{'CurrentUser'}->Load($user);
+    unless ($session{'CurrentUser'}->id() ) {
+        delete $session{'CurrentUser'};
+        $m->comp('/Elements/Login', %ARGS, Error=> 'You are not an authorized user');
+        $m->abort();
+    }
+}
+ 
+# If the user is loging in, let's authenticate
+elsif (defined ($user) && defined ($pass)){
+    
+    $session{'CurrentUser'} = RT::CurrentUser->new();
+    $session{'CurrentUser'}->Load($user);
+    unless ($session{'CurrentUser'}->id() ) {
+	delete $session{'CurrentUser'};
+	$m->comp('/Elements/Login', %ARGS, Error=> 'Your username or password is incorrect');
+        $m->abort();
+    };
+    unless ($session{'CurrentUser'}->IsPassword($pass)) {
+	delete $session{'CurrentUser'};
+	
+	$m->comp('/Elements/Login', Error => 'Your username or password is incorrect', %ARGS);
+	$m->abort();
+    }
+}
+  
+
+#If we've got credentials, lets serve the file up.
+if ( (defined $session{'CurrentUser'}) and 
+     ( $session{'CurrentUser'}->Id) ) {
+    
+    # If the user isn\'t privileged, they can only see SelfService
+    if ((! $session{'CurrentUser'}->Privileged) and
+	($m->base_comp->path !~ '^/+SelfService/') ) {
+	$m->comp('/SelfService/index.html');
+	$m->abort();
+    }
+    else {
+	$m->call_next;
+    }
+}
+
+#If we have no credentials
+else {
+    $m->comp('/Elements/Login', %ARGS);
+    $m->abort();
+}
+
+</%INIT>
+
+<%ARGS>
+$user => undef
+$pass => undef
+</%ARGS>
diff --git a/rt/webrt/index.html b/rt/webrt/index.html
new file mode 100644
index 000000000..0c1091abb
--- /dev/null
+++ b/rt/webrt/index.html
@@ -0,0 +1,25 @@
+<& /Elements/Header, Title=>"Start page", Refresh => $session{'home_refresh_interval'} &>
+<& /Elements/Tabs, current_toptab => '' &>
+<TABLE BORDER=0 WIDTH=100%>
+<TR VALIGN=TOP>
+<TD WIDTH=70%>
+<& /Elements/CustomHomepageHeader, %ARGS &>
+<& /Elements/MyTickets &>
+<BR>
+<& /Elements/MyRequests &>
+</TD>
+<TD>
+<& /Elements/Quicksearch &>
+<BR>
+<form method=get action="index.html">
+<& /Elements/Refresh, Name => 'HomeRefreshInterval', Default => $session {'home_refresh_interval'} &>
+<div align=right><input type=submit value="Go!"></div>
+</form>
+</TD>
+</TR>
+</TABLE>
+<%init>
+if ($ARGS{'HomeRefreshInterval'}) {
+	$session{'home_refresh_interval'} = $ARGS{'HomeRefreshInterval'};
+}
+</%init>
-- 
cgit v1.2.1


From 160be29a0dc62e79a4fb95d2ab8c0c7e5996760e Mon Sep 17 00:00:00 2001
From: cvs2git <cvs2git>
Date: Mon, 12 Aug 2002 06:17:10 +0000
Subject: This commit was manufactured by cvs2svn to create branch
 'BESTPRACTICAL'.

---
 ANNOUCE.1.4.0                                      |    50 -
 Artistic                                           |   125 -
 CREDITS                                            |   110 -
 FS/Changes                                         |     5 -
 FS/FS.pm                                           |   231 -
 FS/FS/CGI.pm                                       |   314 -
 FS/FS/ClientAPI.pm                                 |    44 -
 FS/FS/ClientAPI/MyAccount.pm                       |   136 -
 FS/FS/ClientAPI/passwd.pm                          |    56 -
 FS/FS/Conf.pm                                      |   972 --
 FS/FS/ConfItem.pm                                  |    63 -
 FS/FS/InitHandler.pm                               |    88 -
 FS/FS/Msgcat.pm                                    |    98 -
 FS/FS/Record.pm                                    |  1258 --
 FS/FS/SearchCache.pm                               |    96 -
 FS/FS/UI/Base.pm                                   |   194 -
 FS/FS/UI/CGI.pm                                    |   239 -
 FS/FS/UI/Gtk.pm                                    |   224 -
 FS/FS/UI/agent.pm                                  |    62 -
 FS/FS/UID.pm                                       |   281 -
 FS/FS/agent.pm                                     |   160 -
 FS/FS/agent_type.pm                                |   165 -
 FS/FS/cust_bill.pm                                 |   976 --
 FS/FS/cust_bill_event.pm                           |   175 -
 FS/FS/cust_bill_pay.pm                             |   219 -
 FS/FS/cust_bill_pkg.pm                             |   155 -
 FS/FS/cust_credit.pm                               |   260 -
 FS/FS/cust_credit_bill.pm                          |   162 -
 FS/FS/cust_credit_refund.pm                        |   205 -
 FS/FS/cust_main.pm                                 |  1994 ---
 FS/FS/cust_main_county.pm                          |   253 -
 FS/FS/cust_main_invoice.pm                         |   184 -
 FS/FS/cust_pay.pm                                  |   422 -
 FS/FS/cust_pay_batch.pm                            |   209 -
 FS/FS/cust_pkg.pm                                  |   710 -
 FS/FS/cust_refund.pm                               |   282 -
 FS/FS/cust_svc.pm                                  |   367 -
 FS/FS/cust_tax_exempt.pm                           |   131 -
 FS/FS/domain_record.pm                             |   332 -
 FS/FS/export_svc.pm                                |   123 -
 FS/FS/msgcat.pm                                    |   132 -
 FS/FS/nas.pm                                       |   152 -
 FS/FS/part_bill_event.pm                           |   183 -
 FS/FS/part_export.pm                               |   850 -
 FS/FS/part_export/bind.pm                          |     7 -
 FS/FS/part_export/bind_slave.pm                    |     7 -
 FS/FS/part_export/bsdshell.pm                      |     7 -
 FS/FS/part_export/cp.pm                            |   112 -
 FS/FS/part_export/cyrus.pm                         |    98 -
 FS/FS/part_export/http.pm                          |    88 -
 FS/FS/part_export/infostreet.pm                    |   218 -
 FS/FS/part_export/null.pm                          |    13 -
 FS/FS/part_export/shellcommands.pm                 |    85 -
 FS/FS/part_export/shellcommands_withdomain.pm      |     7 -
 FS/FS/part_export/sqlmail.pm                       |   111 -
 FS/FS/part_export/sqlradius.pm                     |   273 -
 FS/FS/part_export/sysvshell.pm                     |     7 -
 FS/FS/part_export/textradius.pm                    |   166 -
 FS/FS/part_export/vpopmail.pm                      |   179 -
 FS/FS/part_export/www_shellcommands.pm             |   112 -
 FS/FS/part_export_option.pm                        |   134 -
 FS/FS/part_pkg.pm                                  |   317 -
 FS/FS/part_pop_local.pm                            |   116 -
 FS/FS/part_referral.pm                             |   116 -
 FS/FS/part_svc.pm                                  |   348 -
 FS/FS/part_svc_column.pm                           |   118 -
 FS/FS/pkg_svc.pm                                   |   152 -
 FS/FS/port.pm                                      |   160 -
 FS/FS/prepay_credit.pm                             |   126 -
 FS/FS/queue.pm                                     |   401 -
 FS/FS/queue_arg.pm                                 |   121 -
 FS/FS/queue_depend.pm                              |   120 -
 FS/FS/raddb.pm                                     |  1091 --
 FS/FS/radius_usergroup.pm                          |   130 -
 FS/FS/session.pm                                   |   269 -
 FS/FS/svc_Common.pm                                |   381 -
 FS/FS/svc_acct.pm                                  |  1150 --
 FS/FS/svc_acct_pop.pm                              |   204 -
 FS/FS/svc_acct_sm.pm                               |   260 -
 FS/FS/svc_domain.pm                                |   478 -
 FS/FS/svc_forward.pm                               |   470 -
 FS/FS/svc_www.pm                                   |   276 -
 FS/FS/type_pkgs.pm                                 |   113 -
 FS/MANIFEST                                        |   168 -
 FS/MANIFEST.SKIP                                   |     1 -
 FS/Makefile.PL                                     |     8 -
 FS/README                                          |     6 -
 FS/bin/freeside-adduser                            |    57 -
 FS/bin/freeside-apply-credits                      |    21 -
 FS/bin/freeside-bill                               |   128 -
 FS/bin/freeside-cc-receipts-report                 |   270 -
 FS/bin/freeside-credit-report                      |   224 -
 FS/bin/freeside-daily                              |    99 -
 FS/bin/freeside-email                              |    61 -
 FS/bin/freeside-expiration-alerter                 |   224 -
 FS/bin/freeside-overdue                            |   196 -
 FS/bin/freeside-queued                             |   254 -
 FS/bin/freeside-receivables-report                 |   217 -
 FS/bin/freeside-reexport                           |    62 -
 FS/bin/freeside-setinvoice                         |    42 -
 FS/bin/freeside-sqlradius-reset                    |    74 -
 FS/bin/freeside-tax-report                         |   292 -
 FS/t/CGI.t                                         |     5 -
 FS/t/ClientAPI.t                                   |     5 -
 FS/t/Conf.t                                        |     5 -
 FS/t/ConfItem.t                                    |     5 -
 FS/t/InitHandler.t                                 |     5 -
 FS/t/Msgcat.t                                      |     5 -
 FS/t/Record.t                                      |     5 -
 FS/t/SearchCache.t                                 |     5 -
 FS/t/UID.t                                         |     5 -
 FS/t/agent.t                                       |     5 -
 FS/t/agent_type.t                                  |     5 -
 FS/t/cust_bill.t                                   |     5 -
 FS/t/cust_bill_event.t                             |     5 -
 FS/t/cust_bill_pay.t                               |     5 -
 FS/t/cust_bill_pkg.t                               |     5 -
 FS/t/cust_credit.t                                 |     5 -
 FS/t/cust_credit_bill.t                            |     5 -
 FS/t/cust_credit_refund.t                          |     5 -
 FS/t/cust_main.t                                   |     5 -
 FS/t/cust_main_county.t                            |     5 -
 FS/t/cust_main_invoice.t                           |     5 -
 FS/t/cust_pay.t                                    |     5 -
 FS/t/cust_pay_batch.t                              |     5 -
 FS/t/cust_pkg.t                                    |     5 -
 FS/t/cust_refund.t                                 |     5 -
 FS/t/cust_svc.t                                    |     5 -
 FS/t/cust_tax_exempt.pm                            |     5 -
 FS/t/cust_tax_exempt.t                             |     5 -
 FS/t/domain_record.t                               |     5 -
 FS/t/export_svc.t                                  |     5 -
 FS/t/msgcat.t                                      |     5 -
 FS/t/nas.t                                         |     5 -
 FS/t/part_bill_event.t                             |     5 -
 FS/t/part_export-bind.t                            |     5 -
 FS/t/part_export-bind_slave.t                      |     5 -
 FS/t/part_export-bsdshell.t                        |     5 -
 FS/t/part_export-cp.t                              |     5 -
 FS/t/part_export-cyrus.t                           |     5 -
 FS/t/part_export-http.t                            |     5 -
 FS/t/part_export-infostreet.t                      |     5 -
 FS/t/part_export-null.t                            |     5 -
 FS/t/part_export-shellcommands.t                   |     5 -
 FS/t/part_export-shellcommands_withdomain.t        |     5 -
 FS/t/part_export-sqlmail.t                         |     5 -
 FS/t/part_export-sqlradius.t                       |     5 -
 FS/t/part_export-sysvshell.t                       |     5 -
 FS/t/part_export-textradius.t                      |     5 -
 FS/t/part_export-vpopmail.t                        |     5 -
 FS/t/part_export-www_shellcommands.t               |     5 -
 FS/t/part_export.t                                 |     5 -
 FS/t/part_export_option.t                          |     5 -
 FS/t/part_pkg.t                                    |     5 -
 FS/t/part_pop_local.t                              |     5 -
 FS/t/part_referral.t                               |     5 -
 FS/t/part_svc.t                                    |     5 -
 FS/t/part_svc_column.t                             |     5 -
 FS/t/pkg_svc.t                                     |     5 -
 FS/t/port.t                                        |     5 -
 FS/t/prepay_credit.t                               |     5 -
 FS/t/queue.t                                       |     5 -
 FS/t/queue_arg.t                                   |     5 -
 FS/t/queue_depend.t                                |     5 -
 FS/t/raddb.t                                       |     5 -
 FS/t/radius_usergroup.t                            |     5 -
 FS/t/session.t                                     |     5 -
 FS/t/svc_Common.t                                  |     5 -
 FS/t/svc_acct.t                                    |     5 -
 FS/t/svc_acct_pop.t                                |     5 -
 FS/t/svc_acct_sm.t                                 |     5 -
 FS/t/svc_domain.t                                  |     5 -
 FS/t/svc_forward.t                                 |     5 -
 FS/t/svc_www.t                                     |     5 -
 FS/t/type_pkgs.t                                   |     5 -
 GPL                                                |   339 -
 INSTALL                                            |     1 -
 Makefile                                           |   180 -
 README                                             |    49 -
 TODO                                               |     9 -
 bin/bind.export                                    |   182 -
 bin/bind.import                                    |   192 -
 bin/bsdshell.export                                |   119 -
 bin/create-history-tables                          |    83 -
 bin/dbdef-create                                   |    26 -
 bin/freeside-init                                  |    60 -
 bin/freeside-session-kill                          |   103 -
 bin/fs-migrate-part_svc                            |    41 -
 bin/fs-migrate-payref                              |    31 -
 bin/fs-migrate-svc_acct_sm                         |   229 -
 bin/fs-radius-add-check                            |    68 -
 bin/fs-radius-add-reply                            |    69 -
 bin/fs-setup                                       |  1033 --
 bin/generate-prepay                                |    35 -
 bin/generate-raddb                                 |    37 -
 bin/generate-tests                                 |    21 -
 bin/masonize                                       |    70 -
 bin/passwd.import                                  |   114 -
 bin/pod2x                                          |    56 -
 bin/populate-msgcat                                |   119 -
 bin/svc_acct.export                                |   641 -
 bin/svc_acct.import                                |   238 -
 bin/svc_acct_sm.import                             |   262 -
 bin/svc_domain.erase                               |    17 -
 bin/sysvshell.export                               |   117 -
 conf/agent_defaultpkg                              |     0
 conf/alerter_template                              |    20 -
 conf/declinetemplate                               |    10 -
 conf/home                                          |     1 -
 conf/invoice_from                                  |     1 -
 conf/invoice_template                              |    27 -
 conf/locale                                        |     1 -
 conf/lpr                                           |     1 -
 conf/maxsearchrecordsperpage                       |     1 -
 conf/report_template                               |    14 -
 conf/shells                                        |     5 -
 conf/show-msgcat-codes                             |     0
 conf/smtpmachine                                   |     1 -
 debian/README.Debian                               |     6 -
 debian/changelog                                   |     9 -
 debian/conffiles.ex                                |     7 -
 debian/control                                     |    82 -
 debian/copyright                                   |    10 -
 debian/cron.d.ex                                   |     4 -
 debian/dirs                                        |     2 -
 debian/docs                                        |     3 -
 debian/ex.doc-base.package                         |    22 -
 debian/freeside-doc.docs                           |     2 -
 debian/freeside-doc.files                          |     2 -
 debian/init.d.ex                                   |    70 -
 debian/manpage.1.ex                                |    60 -
 debian/manpage.sgml.ex                             |   143 -
 debian/menu.ex                                     |     2 -
 debian/postinst.ex                                 |    47 -
 debian/postrm.ex                                   |    36 -
 debian/preinst.ex                                  |    42 -
 debian/prerm.ex                                    |    37 -
 debian/rules                                       |   113 -
 debian/watch.ex                                    |     5 -
 eg/TEMPLATE_cust_main.import                       |   198 -
 eg/export_template.pm                              |    50 -
 eg/table_template-svc.pm                           |   161 -
 eg/table_template.pm                               |   112 -
 eg/vpopmailrestart                                 |    11 -
 etc/acp_logfile-parse                              |   197 -
 etc/countries.txt                                  |   239 -
 etc/domain-template.txt                            |   231 -
 etc/example-direct-cardin                          |    67 -
 etc/megapop.pl                                     |   116 -
 etc/sql-reserved-words.txt                         |   103 -
 fs_passwd/fs_passwd                                |   129 -
 fs_passwd/fs_passwd.cgi                            |    57 -
 fs_passwd/fs_passwd.html                           |    25 -
 fs_passwd/fs_passwd_server                         |    88 -
 fs_passwd/fs_passwdd                               |    62 -
 fs_radlog/fs_radlogd                               |    51 -
 fs_selfadmin/FS-MailAdminServer/MailAdminClient.pm |   541 -
 fs_selfadmin/FS-MailAdminServer/cgi/mailadmin.cgi  |   698 -
 fs_selfadmin/FS-MailAdminServer/fs_mailadmind      |   366 -
 fs_selfadmin/README                                |    27 -
 fs_selfadmin/fs_mailadmin_server                   |   642 -
 fs_selfservice/DEPLOY                              |    15 -
 fs_selfservice/FS-SelfService/Changes              |     6 -
 fs_selfservice/FS-SelfService/MANIFEST             |     6 -
 fs_selfservice/FS-SelfService/Makefile.PL          |    15 -
 fs_selfservice/FS-SelfService/SelfService.pm       |   112 -
 fs_selfservice/FS-SelfService/cgi/login.html       |    23 -
 fs_selfservice/FS-SelfService/cgi/myaccount.html   |    47 -
 fs_selfservice/FS-SelfService/cgi/passwd.html      |    25 -
 fs_selfservice/FS-SelfService/cgi/selfservice.cgi  |   109 -
 .../FS-SelfService/cgi/view_invoice.html           |    21 -
 .../FS-SelfService/freeside-selfservice-clientd    |   226 -
 fs_selfservice/FS-SelfService/test.pl              |    17 -
 fs_selfservice/freeside-selfservice-server         |   224 -
 fs_selfservice/fs_passwd_test                      |    19 -
 fs_sesmon/FS-SessionClient/Changes                 |     5 -
 fs_sesmon/FS-SessionClient/MANIFEST                |    11 -
 fs_sesmon/FS-SessionClient/MANIFEST.SKIP           |     1 -
 fs_sesmon/FS-SessionClient/Makefile.PL             |    10 -
 fs_sesmon/FS-SessionClient/SessionClient.pm        |   122 -
 fs_sesmon/FS-SessionClient/bin/freeside-login      |    36 -
 fs_sesmon/FS-SessionClient/bin/freeside-logout     |    36 -
 fs_sesmon/FS-SessionClient/cgi/login.cgi           |   108 -
 fs_sesmon/FS-SessionClient/cgi/logout.cgi          |    83 -
 fs_sesmon/FS-SessionClient/fs_sessiond             |    65 -
 fs_sesmon/FS-SessionClient/test.pl                 |    21 -
 fs_sesmon/fs_session_server                        |   140 -
 fs_signup/FS-SignupClient/Changes                  |     5 -
 fs_signup/FS-SignupClient/MANIFEST                 |     8 -
 fs_signup/FS-SignupClient/MANIFEST.SKIP            |     1 -
 fs_signup/FS-SignupClient/Makefile.PL              |    18 -
 fs_signup/FS-SignupClient/SignupClient.pm          |   187 -
 fs_signup/FS-SignupClient/cgi/decline.html         |     5 -
 .../FS-SignupClient/cgi/signup-alternate.html      |   218 -
 fs_signup/FS-SignupClient/cgi/signup.cgi           |   656 -
 fs_signup/FS-SignupClient/cgi/signup.html          |   180 -
 fs_signup/FS-SignupClient/cgi/success.html         |    11 -
 fs_signup/FS-SignupClient/fs_signupd               |    86 -
 fs_signup/FS-SignupClient/test.pl                  |    20 -
 fs_signup/cck.template                             |    14 -
 fs_signup/fs_signup_server                         |   269 -
 fs_signup/ieak.template                            |    40 -
 fs_webdemo/register.cgi                            |   136 -
 fs_webdemo/register.html                           |    33 -
 fs_webdemo/registerd                               |   192 -
 fs_webdemo/registerd.Pg                            |   221 -
 htetc/global.asa                                   |    83 -
 htetc/handler.pl                                   |   151 -
 httemplate/.htaccess                               |     3 -
 httemplate/browse/agent.cgi                        |    63 -
 httemplate/browse/agent_type.cgi                   |    58 -
 httemplate/browse/cust_main_county.cgi             |   127 -
 httemplate/browse/cust_pay_batch.cgi               |    52 -
 httemplate/browse/msgcat.cgi                       |    50 -
 httemplate/browse/nas.cgi                          |    80 -
 httemplate/browse/part_bill_event.cgi              |    71 -
 httemplate/browse/part_export.cgi                  |    39 -
 httemplate/browse/part_pkg.cgi                     |   102 -
 httemplate/browse/part_referral.cgi                |    38 -
 httemplate/browse/part_svc.cgi                     |   107 -
 httemplate/browse/queue.cgi                        |     7 -
 httemplate/browse/svc_acct_pop.cgi                 |    53 -
 httemplate/config/config-process.cgi               |    51 -
 httemplate/config/config-view.cgi                  |    64 -
 httemplate/config/config.cgi                       |   176 -
 httemplate/docs/admin.html                         |    81 -
 httemplate/docs/billing.html                       |    54 -
 httemplate/docs/config.html                        |    36 -
 httemplate/docs/export.html                        |    55 -
 httemplate/docs/index.html                         |    30 -
 httemplate/docs/install.html                       |   198 -
 httemplate/docs/legacy.html                        |    38 -
 httemplate/docs/overview.dia                       |   Bin 2800 -> 0 bytes
 httemplate/docs/overview.png                       |   Bin 13064 -> 0 bytes
 httemplate/docs/passwd.html                        |    23 -
 httemplate/docs/schema.dia                         |   Bin 14414 -> 0 bytes
 httemplate/docs/schema.html                        |   424 -
 httemplate/docs/schema.png                         |   Bin 681043 -> 0 bytes
 httemplate/docs/session.html                       |    54 -
 httemplate/docs/signup.html                        |    56 -
 httemplate/docs/ssh.html                           |    15 -
 httemplate/docs/trouble.html                       |    26 -
 httemplate/docs/upgrade4.html                      |    27 -
 httemplate/docs/upgrade5.html                      |    34 -
 httemplate/docs/upgrade6.html                      |    66 -
 httemplate/docs/upgrade7.html                      |    24 -
 httemplate/docs/upgrade8.html                      |   392 -
 httemplate/edit/REAL_cust_pkg.cgi                  |    89 -
 httemplate/edit/agent.cgi                          |    74 -
 httemplate/edit/agent_type.cgi                     |    63 -
 httemplate/edit/cust_bill_pay.cgi                  |    95 -
 httemplate/edit/cust_credit.cgi                    |    63 -
 httemplate/edit/cust_credit_bill.cgi               |   101 -
 httemplate/edit/cust_main.cgi                      |   460 -
 httemplate/edit/cust_main_county-expand.cgi        |    54 -
 httemplate/edit/cust_main_county.cgi               |    66 -
 httemplate/edit/cust_pay.cgi                       |   129 -
 httemplate/edit/cust_pkg.cgi                       |   117 -
 httemplate/edit/msgcat.cgi                         |    58 -
 httemplate/edit/part_bill_event.cgi                |   192 -
 httemplate/edit/part_export.cgi                    |   117 -
 httemplate/edit/part_pkg.cgi                       |   464 -
 httemplate/edit/part_referral.cgi                  |    48 -
 httemplate/edit/part_svc.cgi                       |   232 -
 httemplate/edit/process/REAL_cust_pkg.cgi          |    20 -
 httemplate/edit/process/agent.cgi                  |    28 -
 httemplate/edit/process/agent_type.cgi             |    55 -
 httemplate/edit/process/cust_bill_pay.cgi          |    31 -
 httemplate/edit/process/cust_credit.cgi            |    30 -
 httemplate/edit/process/cust_credit_bill.cgi       |    43 -
 httemplate/edit/process/cust_main.cgi              |   119 -
 .../edit/process/cust_main_county-collapse.cgi     |    35 -
 .../edit/process/cust_main_county-expand.cgi       |    58 -
 httemplate/edit/process/cust_main_county.cgi       |    25 -
 httemplate/edit/process/cust_pay.cgi               |    39 -
 httemplate/edit/process/cust_pkg.cgi               |    36 -
 httemplate/edit/process/domain_record.cgi          |    34 -
 httemplate/edit/process/msgcat.cgi                 |    20 -
 httemplate/edit/process/part_bill_event.cgi        |    53 -
 httemplate/edit/process/part_export.cgi            |    39 -
 httemplate/edit/process/part_pkg.cgi               |   109 -
 httemplate/edit/process/part_referral.cgi          |    28 -
 httemplate/edit/process/part_svc.cgi               |    62 -
 httemplate/edit/process/quick-charge.cgi           |    32 -
 httemplate/edit/process/quick-cust_pkg.cgi         |    24 -
 httemplate/edit/process/svc_acct.cgi               |    49 -
 httemplate/edit/process/svc_acct_pop.cgi           |    28 -
 httemplate/edit/process/svc_acct_sm.cgi            |    34 -
 httemplate/edit/process/svc_domain.cgi             |    31 -
 httemplate/edit/process/svc_forward.cgi            |    29 -
 httemplate/edit/process/svc_www.cgi                |    36 -
 httemplate/edit/svc_acct.cgi                       |   278 -
 httemplate/edit/svc_acct_pop.cgi                   |    56 -
 httemplate/edit/svc_acct_sm.cgi                    |   178 -
 httemplate/edit/svc_domain.cgi                     |    98 -
 httemplate/edit/svc_forward.cgi                    |   176 -
 httemplate/edit/svc_www.cgi                        |   178 -
 httemplate/images/mid-logo.png                     |   Bin 9727 -> 0 bytes
 httemplate/images/small-logo.png                   |   Bin 4781 -> 0 bytes
 httemplate/index.html                              |   210 -
 httemplate/misc/bill.cgi                           |    37 -
 httemplate/misc/cancel-unaudited.cgi               |    31 -
 httemplate/misc/cancel_pkg.cgi                     |    15 -
 httemplate/misc/catchall.cgi                       |   133 -
 httemplate/misc/delete-cust_pay.cgi                |    16 -
 httemplate/misc/delete-customer.cgi                |    60 -
 httemplate/misc/delete-domain_record.cgi           |    15 -
 httemplate/misc/delete-part_export.cgi             |    15 -
 httemplate/misc/expire_pkg.cgi                     |    25 -
 httemplate/misc/link.cgi                           |    46 -
 httemplate/misc/print-invoice.cgi                  |    23 -
 httemplate/misc/process/catchall.cgi               |    33 -
 httemplate/misc/process/delete-customer.cgi        |    29 -
 httemplate/misc/process/link.cgi                   |    40 -
 httemplate/misc/queue.cgi                          |    47 -
 httemplate/misc/susp_pkg.cgi                       |    15 -
 httemplate/misc/unsusp_pkg.cgi                     |    15 -
 httemplate/search/cust_bill.cgi                    |   165 -
 httemplate/search/cust_bill.html                   |    19 -
 httemplate/search/cust_bill_event.cgi              |    62 -
 httemplate/search/cust_bill_event.html             |    23 -
 httemplate/search/cust_main-otaker.cgi             |    29 -
 httemplate/search/cust_main-payinfo.html           |    20 -
 httemplate/search/cust_main-quickpay.html          |    43 -
 httemplate/search/cust_main.cgi                    |   659 -
 httemplate/search/cust_main.html                   |    42 -
 httemplate/search/cust_pay.cgi                     |   103 -
 httemplate/search/cust_pay.html                    |    18 -
 httemplate/search/cust_pkg.cgi                     |   319 -
 httemplate/search/cust_pkg.html                    |    24 -
 httemplate/search/report_cc.cgi                    |    25 -
 httemplate/search/report_cc.html                   |    23 -
 httemplate/search/report_credit.cgi                |    25 -
 httemplate/search/report_credit.html               |    23 -
 httemplate/search/report_receivables.cgi           |    19 -
 httemplate/search/report_tax.cgi                   |    25 -
 httemplate/search/report_tax.html                  |    23 -
 httemplate/search/sql.cgi                          |    76 -
 httemplate/search/svc_acct.cgi                     |   294 -
 httemplate/search/svc_acct.html                    |    19 -
 httemplate/search/svc_acct_sm.cgi                  |    84 -
 httemplate/search/svc_acct_sm.html                 |    23 -
 httemplate/search/svc_domain.cgi                   |   163 -
 httemplate/search/svc_domain.html                  |    19 -
 httemplate/view/cust_bill.cgi                      |    48 -
 httemplate/view/cust_main.cgi                      |   653 -
 httemplate/view/cust_pkg.cgi                       |   157 -
 httemplate/view/svc_acct.cgi                       |   156 -
 httemplate/view/svc_acct_sm.cgi                    |    58 -
 httemplate/view/svc_domain.cgi                     |   106 -
 httemplate/view/svc_forward.cgi                    |    69 -
 httemplate/view/svc_www.cgi                        |    59 -
 init.d/freeside-init                               |    58 -
 rt/ChangeLog                                       | 16016 -------------------
 rt/TODO                                            |     9 -
 rt/bin/initacls.Oracle                             |    26 -
 rt/bin/initacls.Pg                                 |    28 -
 rt/bin/initacls.mysql                              |    20 -
 rt/bin/rtadmin                                     |  1040 --
 rt/docs/design_docs/basic-definitions.txt          |    54 -
 rt/docs/design_docs/local_hacking                  |    32 -
 rt/docs/rt.gif                                     |   Bin 8811 -> 0 bytes
 rt/etc/config.pm                                   |   473 -
 rt/etc/schema.pm                                   |   349 -
 rt/lib/MANIFEST                                    |    57 -
 rt/lib/MANIFEST.SKIP                               |     1 -
 rt/lib/Makefile.PL                                 |    49 -
 rt/lib/RT/Action/OpenDependent.pm                  |    55 -
 rt/lib/RT/Action/SendPasswordEmail.pm              |   170 -
 rt/lib/RT/Action/StallDependent.pm                 |    68 -
 rt/lib/RT/Condition/NewDependency.pm               |     0
 rt/lib/RT/EasySearch.pm                            |   115 -
 rt/lib/RT/Keyword.pm                               |   446 -
 rt/lib/RT/KeywordSelect.pm                         |   452 -
 rt/lib/RT/KeywordSelects.pm                        |   143 -
 rt/lib/RT/Keywords.pm                              |   106 -
 rt/lib/RT/ObjectKeyword.pm                         |   192 -
 rt/lib/RT/ObjectKeywords.pm                        |   234 -
 rt/lib/RT/TestHarness.pm                           |    14 -
 rt/lib/RT/Watcher.pm                               |   313 -
 rt/lib/RT/Watchers.pm                              |   226 -
 rt/lib/test.pl                                     |    52 -
 rt/tools/cpan2rpm                                  |   299 -
 rt/tools/initdb                                    |   216 -
 rt/tools/insertdata                                |   618 -
 rt/tools/testdeps                                  |   115 -
 rt/webrt/Admin/Elements/CreateQueueCalled          |     3 -
 rt/webrt/Admin/Elements/CreateUserCalled           |     3 -
 rt/webrt/Admin/Elements/EditUserComments           |     9 -
 rt/webrt/Admin/Elements/GrantQueueRightsTo         |    30 -
 rt/webrt/Admin/Elements/GroupTabs                  |    18 -
 rt/webrt/Admin/Elements/Header                     |     5 -
 rt/webrt/Admin/Elements/ListGlobalKeywordSelects   |    15 -
 rt/webrt/Admin/Elements/ListGlobalScrips           |    10 -
 rt/webrt/Admin/Elements/ModifyKeyword              |    95 -
 rt/webrt/Admin/Elements/ModifyKeywordSelect        |   120 -
 rt/webrt/Admin/Elements/ModifyQueue                |    56 -
 rt/webrt/Admin/Elements/ModifyTemplate             |    78 -
 rt/webrt/Admin/Elements/ModifyUser                 |    77 -
 rt/webrt/Admin/Elements/QueueRightsForUser         |    17 -
 rt/webrt/Admin/Elements/QueueTabs                  |    36 -
 rt/webrt/Admin/Elements/SelectKeywordSelect        |    22 -
 rt/webrt/Admin/Elements/SelectModifyGroup          |    10 -
 rt/webrt/Admin/Elements/SelectModifyKeyword        |    13 -
 rt/webrt/Admin/Elements/SelectModifyKeywordSelect  |    13 -
 rt/webrt/Admin/Elements/SelectModifyQueue          |    10 -
 rt/webrt/Admin/Elements/SelectModifyUser           |    26 -
 rt/webrt/Admin/Elements/SelectQueueRights          |    29 -
 rt/webrt/Admin/Elements/SelectRights               |    58 -
 rt/webrt/Admin/Elements/SelectScrip                |    25 -
 rt/webrt/Admin/Elements/SelectScripAction          |    25 -
 rt/webrt/Admin/Elements/SelectScripCondition       |    25 -
 rt/webrt/Admin/Elements/SelectSingleOrMultiple     |    20 -
 rt/webrt/Admin/Elements/SelectTemplate             |    37 -
 rt/webrt/Admin/Elements/SelectUsers                |    17 -
 rt/webrt/Admin/Elements/SystemTabs                 |    31 -
 rt/webrt/Admin/Elements/Tabs                       |    31 -
 rt/webrt/Admin/Elements/UserTabs                   |    21 -
 rt/webrt/Admin/Global/GroupRights.html             |    78 -
 rt/webrt/Admin/Global/Keywords.html                |    97 -
 rt/webrt/Admin/Global/Scrips.html                  |    95 -
 rt/webrt/Admin/Global/Template.html                |    66 -
 rt/webrt/Admin/Global/Templates.html               |    24 -
 rt/webrt/Admin/Global/UserRights.html              |    42 -
 rt/webrt/Admin/Global/index.html                   |     2 -
 rt/webrt/Admin/Groups/Members.html                 |    76 -
 rt/webrt/Admin/Groups/Modify.html                  |    83 -
 rt/webrt/Admin/Groups/Rights.html                  |     1 -
 rt/webrt/Admin/Groups/index.html                   |    33 -
 rt/webrt/Admin/KeywordSelects/Modify.html          |    17 -
 rt/webrt/Admin/KeywordSelects/index.html           |   137 -
 rt/webrt/Admin/Keywords/Modify.html                |    96 -
 rt/webrt/Admin/Keywords/index.html                 |   110 -
 rt/webrt/Admin/Queues/Create.html                  |    13 -
 rt/webrt/Admin/Queues/GroupRights.html             |   103 -
 rt/webrt/Admin/Queues/Keywords.html                |   114 -
 rt/webrt/Admin/Queues/Modify.html                  |   137 -
 rt/webrt/Admin/Queues/People.html                  |   161 -
 rt/webrt/Admin/Queues/Scrips.html                  |   111 -
 rt/webrt/Admin/Queues/Template.html                |    68 -
 rt/webrt/Admin/Queues/Templates.html               |    24 -
 rt/webrt/Admin/Queues/UserRights.html              |    72 -
 rt/webrt/Admin/Queues/index.html                   |    52 -
 rt/webrt/Admin/Users/Modify.html                   |   259 -
 rt/webrt/Admin/Users/Prefs.html                    |    97 -
 rt/webrt/Admin/Users/Rights.html                   |     1 -
 rt/webrt/Admin/Users/index.html                    |    71 -
 rt/webrt/Admin/index.html                          |     4 -
 rt/webrt/Elements/Checkbox                         |    17 -
 rt/webrt/Elements/CreateTicket                     |     1 -
 rt/webrt/Elements/CustomHomepageHeader             |     0
 rt/webrt/Elements/Error                            |    23 -
 rt/webrt/Elements/Footer                           |    10 -
 rt/webrt/Elements/GotoTicket                       |     1 -
 rt/webrt/Elements/Header                           |    61 -
 rt/webrt/Elements/ListActions                      |    14 -
 rt/webrt/Elements/Login                            |    69 -
 rt/webrt/Elements/MessageBox                       |    30 -
 rt/webrt/Elements/MyRequests                       |    45 -
 rt/webrt/Elements/MyTickets                        |    43 -
 rt/webrt/Elements/Quicksearch                      |    41 -
 rt/webrt/Elements/Refresh                          |    22 -
 rt/webrt/Elements/Section                          |    11 -
 rt/webrt/Elements/SelectBoolean                    |    24 -
 rt/webrt/Elements/SelectDate                       |    25 -
 rt/webrt/Elements/SelectDateRelation               |    14 -
 rt/webrt/Elements/SelectDateType                   |    12 -
 rt/webrt/Elements/SelectEqualityOperator           |    18 -
 rt/webrt/Elements/SelectKeyword                    |    38 -
 rt/webrt/Elements/SelectKeywordOptions             |    18 -
 rt/webrt/Elements/SelectLinkType                   |    16 -
 rt/webrt/Elements/SelectMatch                      |    31 -
 rt/webrt/Elements/SelectNewTicketQueue             |     9 -
 rt/webrt/Elements/SelectOwner                      |    22 -
 rt/webrt/Elements/SelectQueue                      |    38 -
 rt/webrt/Elements/SelectResultsPerPage             |    22 -
 rt/webrt/Elements/SelectSortOrder                  |    18 -
 rt/webrt/Elements/SelectStatus                     |    17 -
 rt/webrt/Elements/SelectTicketSortBy               |    15 -
 rt/webrt/Elements/SelectUsers                      |     8 -
 rt/webrt/Elements/SelectWatcherType                |    26 -
 rt/webrt/Elements/ShadedBox                        |     5 -
 rt/webrt/Elements/Submit                           |    44 -
 rt/webrt/Elements/Tabs                             |   133 -
 rt/webrt/Elements/TitleBoxEnd                      |    10 -
 rt/webrt/Elements/TitleBoxStart                    |    20 -
 rt/webrt/Elements/ViewUser                         |    29 -
 rt/webrt/Elements/dayMenu                          |    19 -
 rt/webrt/Elements/monthMenu                        |    37 -
 rt/webrt/Elements/yearMenu                         |    24 -
 rt/webrt/NoAuth/Logout.html                        |    22 -
 rt/webrt/NoAuth/Reminder.html                      |     3 -
 rt/webrt/NoAuth/images/rt.jpg                      |   Bin 917 -> 0 bytes
 rt/webrt/NoAuth/images/spacer.gif                  |   Bin 43 -> 0 bytes
 rt/webrt/NoAuth/webrt.css                          |   102 -
 rt/webrt/Search/Bulk.html                          |   186 -
 rt/webrt/Search/Listing.html                       |   134 -
 rt/webrt/Search/PickRestriction                    |   112 -
 rt/webrt/Search/RestrictSearch.html                |     3 -
 rt/webrt/Search/TicketCell                         |    28 -
 rt/webrt/SelfService/Attachment/dhandler           |    27 -
 rt/webrt/SelfService/Closed.html                   |     4 -
 rt/webrt/SelfService/Create.html                   |    63 -
 rt/webrt/SelfService/Display.html                  |   190 -
 rt/webrt/SelfService/Elements/GotoTicket           |     1 -
 rt/webrt/SelfService/Elements/Header               |    55 -
 rt/webrt/SelfService/Elements/MyRequests           |    41 -
 rt/webrt/SelfService/Elements/Tabs                 |    49 -
 rt/webrt/SelfService/Error.html                    |    22 -
 rt/webrt/SelfService/Prefs.html                    |    51 -
 rt/webrt/SelfService/Update.html                   |    40 -
 rt/webrt/SelfService/index.html                    |     3 -
 rt/webrt/Ticket/Attachment/dhandler                |    27 -
 rt/webrt/Ticket/Create.html                        |   199 -
 rt/webrt/Ticket/Display.html                       |   152 -
 rt/webrt/Ticket/Elements/AddWatchers               |    54 -
 rt/webrt/Ticket/Elements/EditBasics                |    62 -
 rt/webrt/Ticket/Elements/EditDates                 |    46 -
 rt/webrt/Ticket/Elements/EditKeywordSelects        |    45 -
 rt/webrt/Ticket/Elements/EditLinks                 |   109 -
 rt/webrt/Ticket/Elements/EditPeople                |    37 -
 rt/webrt/Ticket/Elements/EditWatchers              |    46 -
 rt/webrt/Ticket/Elements/ShowBasics                |    29 -
 rt/webrt/Ticket/Elements/ShowDates                 |    54 -
 rt/webrt/Ticket/Elements/ShowDependencies          |    18 -
 rt/webrt/Ticket/Elements/ShowHistory               |    43 -
 rt/webrt/Ticket/Elements/ShowKeywordSelects        |    26 -
 rt/webrt/Ticket/Elements/ShowLinks                 |    61 -
 rt/webrt/Ticket/Elements/ShowMemberOf              |    12 -
 rt/webrt/Ticket/Elements/ShowMembers               |    22 -
 rt/webrt/Ticket/Elements/ShowPeople                |    12 -
 rt/webrt/Ticket/Elements/ShowReferences            |    27 -
 rt/webrt/Ticket/Elements/ShowRequestor             |    35 -
 rt/webrt/Ticket/Elements/ShowSummary               |    61 -
 rt/webrt/Ticket/Elements/ShowTransaction           |   162 -
 rt/webrt/Ticket/Elements/Tabs                      |   126 -
 rt/webrt/Ticket/Elements/ToolBar                   |     3 -
 rt/webrt/Ticket/History.html                       |    30 -
 rt/webrt/Ticket/Modify.html                        |    39 -
 rt/webrt/Ticket/ModifyAll.html                     |   124 -
 rt/webrt/Ticket/ModifyDates.html                   |    26 -
 rt/webrt/Ticket/ModifyLinks.html                   |    31 -
 rt/webrt/Ticket/ModifyPeople.html                  |    38 -
 rt/webrt/Ticket/Update.html                        |   110 -
 rt/webrt/User/Prefs.html                           |    53 -
 rt/webrt/autohandler                               |    73 -
 rt/webrt/index.html                                |    25 -
 test/cgi-test                                      |   560 -
 648 files changed, 80125 deletions(-)
 delete mode 100644 ANNOUCE.1.4.0
 delete mode 100644 Artistic
 delete mode 100644 CREDITS
 delete mode 100644 FS/Changes
 delete mode 100644 FS/FS.pm
 delete mode 100644 FS/FS/CGI.pm
 delete mode 100644 FS/FS/ClientAPI.pm
 delete mode 100644 FS/FS/ClientAPI/MyAccount.pm
 delete mode 100644 FS/FS/ClientAPI/passwd.pm
 delete mode 100644 FS/FS/Conf.pm
 delete mode 100644 FS/FS/ConfItem.pm
 delete mode 100644 FS/FS/InitHandler.pm
 delete mode 100644 FS/FS/Msgcat.pm
 delete mode 100644 FS/FS/Record.pm
 delete mode 100644 FS/FS/SearchCache.pm
 delete mode 100644 FS/FS/UI/Base.pm
 delete mode 100644 FS/FS/UI/CGI.pm
 delete mode 100644 FS/FS/UI/Gtk.pm
 delete mode 100644 FS/FS/UI/agent.pm
 delete mode 100644 FS/FS/UID.pm
 delete mode 100644 FS/FS/agent.pm
 delete mode 100644 FS/FS/agent_type.pm
 delete mode 100644 FS/FS/cust_bill.pm
 delete mode 100644 FS/FS/cust_bill_event.pm
 delete mode 100644 FS/FS/cust_bill_pay.pm
 delete mode 100644 FS/FS/cust_bill_pkg.pm
 delete mode 100644 FS/FS/cust_credit.pm
 delete mode 100644 FS/FS/cust_credit_bill.pm
 delete mode 100644 FS/FS/cust_credit_refund.pm
 delete mode 100644 FS/FS/cust_main.pm
 delete mode 100644 FS/FS/cust_main_county.pm
 delete mode 100644 FS/FS/cust_main_invoice.pm
 delete mode 100644 FS/FS/cust_pay.pm
 delete mode 100644 FS/FS/cust_pay_batch.pm
 delete mode 100644 FS/FS/cust_pkg.pm
 delete mode 100644 FS/FS/cust_refund.pm
 delete mode 100644 FS/FS/cust_svc.pm
 delete mode 100644 FS/FS/cust_tax_exempt.pm
 delete mode 100644 FS/FS/domain_record.pm
 delete mode 100644 FS/FS/export_svc.pm
 delete mode 100644 FS/FS/msgcat.pm
 delete mode 100644 FS/FS/nas.pm
 delete mode 100644 FS/FS/part_bill_event.pm
 delete mode 100644 FS/FS/part_export.pm
 delete mode 100644 FS/FS/part_export/bind.pm
 delete mode 100644 FS/FS/part_export/bind_slave.pm
 delete mode 100644 FS/FS/part_export/bsdshell.pm
 delete mode 100644 FS/FS/part_export/cp.pm
 delete mode 100644 FS/FS/part_export/cyrus.pm
 delete mode 100644 FS/FS/part_export/http.pm
 delete mode 100644 FS/FS/part_export/infostreet.pm
 delete mode 100644 FS/FS/part_export/null.pm
 delete mode 100644 FS/FS/part_export/shellcommands.pm
 delete mode 100644 FS/FS/part_export/shellcommands_withdomain.pm
 delete mode 100644 FS/FS/part_export/sqlmail.pm
 delete mode 100644 FS/FS/part_export/sqlradius.pm
 delete mode 100644 FS/FS/part_export/sysvshell.pm
 delete mode 100644 FS/FS/part_export/textradius.pm
 delete mode 100644 FS/FS/part_export/vpopmail.pm
 delete mode 100644 FS/FS/part_export/www_shellcommands.pm
 delete mode 100644 FS/FS/part_export_option.pm
 delete mode 100644 FS/FS/part_pkg.pm
 delete mode 100644 FS/FS/part_pop_local.pm
 delete mode 100644 FS/FS/part_referral.pm
 delete mode 100644 FS/FS/part_svc.pm
 delete mode 100644 FS/FS/part_svc_column.pm
 delete mode 100644 FS/FS/pkg_svc.pm
 delete mode 100644 FS/FS/port.pm
 delete mode 100644 FS/FS/prepay_credit.pm
 delete mode 100644 FS/FS/queue.pm
 delete mode 100644 FS/FS/queue_arg.pm
 delete mode 100644 FS/FS/queue_depend.pm
 delete mode 100644 FS/FS/raddb.pm
 delete mode 100644 FS/FS/radius_usergroup.pm
 delete mode 100644 FS/FS/session.pm
 delete mode 100644 FS/FS/svc_Common.pm
 delete mode 100644 FS/FS/svc_acct.pm
 delete mode 100644 FS/FS/svc_acct_pop.pm
 delete mode 100644 FS/FS/svc_acct_sm.pm
 delete mode 100644 FS/FS/svc_domain.pm
 delete mode 100644 FS/FS/svc_forward.pm
 delete mode 100644 FS/FS/svc_www.pm
 delete mode 100644 FS/FS/type_pkgs.pm
 delete mode 100644 FS/MANIFEST
 delete mode 100644 FS/MANIFEST.SKIP
 delete mode 100644 FS/Makefile.PL
 delete mode 100644 FS/README
 delete mode 100644 FS/bin/freeside-adduser
 delete mode 100755 FS/bin/freeside-apply-credits
 delete mode 100755 FS/bin/freeside-bill
 delete mode 100755 FS/bin/freeside-cc-receipts-report
 delete mode 100755 FS/bin/freeside-credit-report
 delete mode 100755 FS/bin/freeside-daily
 delete mode 100755 FS/bin/freeside-email
 delete mode 100755 FS/bin/freeside-expiration-alerter
 delete mode 100755 FS/bin/freeside-overdue
 delete mode 100644 FS/bin/freeside-queued
 delete mode 100755 FS/bin/freeside-receivables-report
 delete mode 100644 FS/bin/freeside-reexport
 delete mode 100644 FS/bin/freeside-setinvoice
 delete mode 100755 FS/bin/freeside-sqlradius-reset
 delete mode 100755 FS/bin/freeside-tax-report
 delete mode 100644 FS/t/CGI.t
 delete mode 100644 FS/t/ClientAPI.t
 delete mode 100644 FS/t/Conf.t
 delete mode 100644 FS/t/ConfItem.t
 delete mode 100644 FS/t/InitHandler.t
 delete mode 100644 FS/t/Msgcat.t
 delete mode 100644 FS/t/Record.t
 delete mode 100644 FS/t/SearchCache.t
 delete mode 100644 FS/t/UID.t
 delete mode 100644 FS/t/agent.t
 delete mode 100644 FS/t/agent_type.t
 delete mode 100644 FS/t/cust_bill.t
 delete mode 100644 FS/t/cust_bill_event.t
 delete mode 100644 FS/t/cust_bill_pay.t
 delete mode 100644 FS/t/cust_bill_pkg.t
 delete mode 100644 FS/t/cust_credit.t
 delete mode 100644 FS/t/cust_credit_bill.t
 delete mode 100644 FS/t/cust_credit_refund.t
 delete mode 100644 FS/t/cust_main.t
 delete mode 100644 FS/t/cust_main_county.t
 delete mode 100644 FS/t/cust_main_invoice.t
 delete mode 100644 FS/t/cust_pay.t
 delete mode 100644 FS/t/cust_pay_batch.t
 delete mode 100644 FS/t/cust_pkg.t
 delete mode 100644 FS/t/cust_refund.t
 delete mode 100644 FS/t/cust_svc.t
 delete mode 100644 FS/t/cust_tax_exempt.pm
 delete mode 100644 FS/t/cust_tax_exempt.t
 delete mode 100644 FS/t/domain_record.t
 delete mode 100644 FS/t/export_svc.t
 delete mode 100644 FS/t/msgcat.t
 delete mode 100644 FS/t/nas.t
 delete mode 100644 FS/t/part_bill_event.t
 delete mode 100644 FS/t/part_export-bind.t
 delete mode 100644 FS/t/part_export-bind_slave.t
 delete mode 100644 FS/t/part_export-bsdshell.t
 delete mode 100644 FS/t/part_export-cp.t
 delete mode 100644 FS/t/part_export-cyrus.t
 delete mode 100644 FS/t/part_export-http.t
 delete mode 100644 FS/t/part_export-infostreet.t
 delete mode 100644 FS/t/part_export-null.t
 delete mode 100644 FS/t/part_export-shellcommands.t
 delete mode 100644 FS/t/part_export-shellcommands_withdomain.t
 delete mode 100644 FS/t/part_export-sqlmail.t
 delete mode 100644 FS/t/part_export-sqlradius.t
 delete mode 100644 FS/t/part_export-sysvshell.t
 delete mode 100644 FS/t/part_export-textradius.t
 delete mode 100644 FS/t/part_export-vpopmail.t
 delete mode 100644 FS/t/part_export-www_shellcommands.t
 delete mode 100644 FS/t/part_export.t
 delete mode 100644 FS/t/part_export_option.t
 delete mode 100644 FS/t/part_pkg.t
 delete mode 100644 FS/t/part_pop_local.t
 delete mode 100644 FS/t/part_referral.t
 delete mode 100644 FS/t/part_svc.t
 delete mode 100644 FS/t/part_svc_column.t
 delete mode 100644 FS/t/pkg_svc.t
 delete mode 100644 FS/t/port.t
 delete mode 100644 FS/t/prepay_credit.t
 delete mode 100644 FS/t/queue.t
 delete mode 100644 FS/t/queue_arg.t
 delete mode 100644 FS/t/queue_depend.t
 delete mode 100644 FS/t/raddb.t
 delete mode 100644 FS/t/radius_usergroup.t
 delete mode 100644 FS/t/session.t
 delete mode 100644 FS/t/svc_Common.t
 delete mode 100644 FS/t/svc_acct.t
 delete mode 100644 FS/t/svc_acct_pop.t
 delete mode 100644 FS/t/svc_acct_sm.t
 delete mode 100644 FS/t/svc_domain.t
 delete mode 100644 FS/t/svc_forward.t
 delete mode 100644 FS/t/svc_www.t
 delete mode 100644 FS/t/type_pkgs.t
 delete mode 100644 GPL
 delete mode 100644 INSTALL
 delete mode 100644 Makefile
 delete mode 100644 README
 delete mode 100644 TODO
 delete mode 100755 bin/bind.export
 delete mode 100755 bin/bind.import
 delete mode 100755 bin/bsdshell.export
 delete mode 100755 bin/create-history-tables
 delete mode 100755 bin/dbdef-create
 delete mode 100755 bin/freeside-init
 delete mode 100755 bin/freeside-session-kill
 delete mode 100755 bin/fs-migrate-part_svc
 delete mode 100755 bin/fs-migrate-payref
 delete mode 100755 bin/fs-migrate-svc_acct_sm
 delete mode 100755 bin/fs-radius-add-check
 delete mode 100755 bin/fs-radius-add-reply
 delete mode 100755 bin/fs-setup
 delete mode 100755 bin/generate-prepay
 delete mode 100755 bin/generate-raddb
 delete mode 100755 bin/generate-tests
 delete mode 100755 bin/masonize
 delete mode 100755 bin/passwd.import
 delete mode 100755 bin/pod2x
 delete mode 100755 bin/populate-msgcat
 delete mode 100755 bin/svc_acct.export
 delete mode 100755 bin/svc_acct.import
 delete mode 100755 bin/svc_acct_sm.import
 delete mode 100755 bin/svc_domain.erase
 delete mode 100755 bin/sysvshell.export
 delete mode 100644 conf/agent_defaultpkg
 delete mode 100644 conf/alerter_template
 delete mode 100644 conf/declinetemplate
 delete mode 100644 conf/home
 delete mode 100644 conf/invoice_from
 delete mode 100644 conf/invoice_template
 delete mode 100644 conf/locale
 delete mode 100644 conf/lpr
 delete mode 100644 conf/maxsearchrecordsperpage
 delete mode 100644 conf/report_template
 delete mode 100644 conf/shells
 delete mode 100644 conf/show-msgcat-codes
 delete mode 100644 conf/smtpmachine
 delete mode 100644 debian/README.Debian
 delete mode 100644 debian/changelog
 delete mode 100644 debian/conffiles.ex
 delete mode 100644 debian/control
 delete mode 100644 debian/copyright
 delete mode 100644 debian/cron.d.ex
 delete mode 100644 debian/dirs
 delete mode 100644 debian/docs
 delete mode 100644 debian/ex.doc-base.package
 delete mode 100644 debian/freeside-doc.docs
 delete mode 100644 debian/freeside-doc.files
 delete mode 100644 debian/init.d.ex
 delete mode 100644 debian/manpage.1.ex
 delete mode 100644 debian/manpage.sgml.ex
 delete mode 100644 debian/menu.ex
 delete mode 100644 debian/postinst.ex
 delete mode 100644 debian/postrm.ex
 delete mode 100644 debian/preinst.ex
 delete mode 100644 debian/prerm.ex
 delete mode 100755 debian/rules
 delete mode 100644 debian/watch.ex
 delete mode 100755 eg/TEMPLATE_cust_main.import
 delete mode 100644 eg/export_template.pm
 delete mode 100644 eg/table_template-svc.pm
 delete mode 100644 eg/table_template.pm
 delete mode 100755 eg/vpopmailrestart
 delete mode 100755 etc/acp_logfile-parse
 delete mode 100644 etc/countries.txt
 delete mode 100644 etc/domain-template.txt
 delete mode 100755 etc/example-direct-cardin
 delete mode 100755 etc/megapop.pl
 delete mode 100644 etc/sql-reserved-words.txt
 delete mode 100755 fs_passwd/fs_passwd
 delete mode 100755 fs_passwd/fs_passwd.cgi
 delete mode 100644 fs_passwd/fs_passwd.html
 delete mode 100755 fs_passwd/fs_passwd_server
 delete mode 100755 fs_passwd/fs_passwdd
 delete mode 100755 fs_radlog/fs_radlogd
 delete mode 100755 fs_selfadmin/FS-MailAdminServer/MailAdminClient.pm
 delete mode 100755 fs_selfadmin/FS-MailAdminServer/cgi/mailadmin.cgi
 delete mode 100755 fs_selfadmin/FS-MailAdminServer/fs_mailadmind
 delete mode 100644 fs_selfadmin/README
 delete mode 100755 fs_selfadmin/fs_mailadmin_server
 delete mode 100755 fs_selfservice/DEPLOY
 delete mode 100644 fs_selfservice/FS-SelfService/Changes
 delete mode 100644 fs_selfservice/FS-SelfService/MANIFEST
 delete mode 100644 fs_selfservice/FS-SelfService/Makefile.PL
 delete mode 100644 fs_selfservice/FS-SelfService/SelfService.pm
 delete mode 100644 fs_selfservice/FS-SelfService/cgi/login.html
 delete mode 100644 fs_selfservice/FS-SelfService/cgi/myaccount.html
 delete mode 100644 fs_selfservice/FS-SelfService/cgi/passwd.html
 delete mode 100644 fs_selfservice/FS-SelfService/cgi/selfservice.cgi
 delete mode 100644 fs_selfservice/FS-SelfService/cgi/view_invoice.html
 delete mode 100644 fs_selfservice/FS-SelfService/freeside-selfservice-clientd
 delete mode 100644 fs_selfservice/FS-SelfService/test.pl
 delete mode 100644 fs_selfservice/freeside-selfservice-server
 delete mode 100755 fs_selfservice/fs_passwd_test
 delete mode 100644 fs_sesmon/FS-SessionClient/Changes
 delete mode 100644 fs_sesmon/FS-SessionClient/MANIFEST
 delete mode 100644 fs_sesmon/FS-SessionClient/MANIFEST.SKIP
 delete mode 100644 fs_sesmon/FS-SessionClient/Makefile.PL
 delete mode 100644 fs_sesmon/FS-SessionClient/SessionClient.pm
 delete mode 100644 fs_sesmon/FS-SessionClient/bin/freeside-login
 delete mode 100644 fs_sesmon/FS-SessionClient/bin/freeside-logout
 delete mode 100644 fs_sesmon/FS-SessionClient/cgi/login.cgi
 delete mode 100644 fs_sesmon/FS-SessionClient/cgi/logout.cgi
 delete mode 100644 fs_sesmon/FS-SessionClient/fs_sessiond
 delete mode 100644 fs_sesmon/FS-SessionClient/test.pl
 delete mode 100644 fs_sesmon/fs_session_server
 delete mode 100644 fs_signup/FS-SignupClient/Changes
 delete mode 100644 fs_signup/FS-SignupClient/MANIFEST
 delete mode 100644 fs_signup/FS-SignupClient/MANIFEST.SKIP
 delete mode 100644 fs_signup/FS-SignupClient/Makefile.PL
 delete mode 100644 fs_signup/FS-SignupClient/SignupClient.pm
 delete mode 100644 fs_signup/FS-SignupClient/cgi/decline.html
 delete mode 100755 fs_signup/FS-SignupClient/cgi/signup-alternate.html
 delete mode 100755 fs_signup/FS-SignupClient/cgi/signup.cgi
 delete mode 100755 fs_signup/FS-SignupClient/cgi/signup.html
 delete mode 100644 fs_signup/FS-SignupClient/cgi/success.html
 delete mode 100755 fs_signup/FS-SignupClient/fs_signupd
 delete mode 100644 fs_signup/FS-SignupClient/test.pl
 delete mode 100644 fs_signup/cck.template
 delete mode 100755 fs_signup/fs_signup_server
 delete mode 100755 fs_signup/ieak.template
 delete mode 100755 fs_webdemo/register.cgi
 delete mode 100644 fs_webdemo/register.html
 delete mode 100755 fs_webdemo/registerd
 delete mode 100755 fs_webdemo/registerd.Pg
 delete mode 100644 htetc/global.asa
 delete mode 100644 htetc/handler.pl
 delete mode 100755 httemplate/.htaccess
 delete mode 100755 httemplate/browse/agent.cgi
 delete mode 100755 httemplate/browse/agent_type.cgi
 delete mode 100755 httemplate/browse/cust_main_county.cgi
 delete mode 100755 httemplate/browse/cust_pay_batch.cgi
 delete mode 100755 httemplate/browse/msgcat.cgi
 delete mode 100755 httemplate/browse/nas.cgi
 delete mode 100755 httemplate/browse/part_bill_event.cgi
 delete mode 100755 httemplate/browse/part_export.cgi
 delete mode 100755 httemplate/browse/part_pkg.cgi
 delete mode 100755 httemplate/browse/part_referral.cgi
 delete mode 100755 httemplate/browse/part_svc.cgi
 delete mode 100755 httemplate/browse/queue.cgi
 delete mode 100755 httemplate/browse/svc_acct_pop.cgi
 delete mode 100644 httemplate/config/config-process.cgi
 delete mode 100644 httemplate/config/config-view.cgi
 delete mode 100644 httemplate/config/config.cgi
 delete mode 100755 httemplate/docs/admin.html
 delete mode 100644 httemplate/docs/billing.html
 delete mode 100644 httemplate/docs/config.html
 delete mode 100755 httemplate/docs/export.html
 delete mode 100644 httemplate/docs/index.html
 delete mode 100644 httemplate/docs/install.html
 delete mode 100755 httemplate/docs/legacy.html
 delete mode 100644 httemplate/docs/overview.dia
 delete mode 100644 httemplate/docs/overview.png
 delete mode 100755 httemplate/docs/passwd.html
 delete mode 100644 httemplate/docs/schema.dia
 delete mode 100644 httemplate/docs/schema.html
 delete mode 100644 httemplate/docs/schema.png
 delete mode 100644 httemplate/docs/session.html
 delete mode 100644 httemplate/docs/signup.html
 delete mode 100755 httemplate/docs/ssh.html
 delete mode 100755 httemplate/docs/trouble.html
 delete mode 100644 httemplate/docs/upgrade4.html
 delete mode 100644 httemplate/docs/upgrade5.html
 delete mode 100644 httemplate/docs/upgrade6.html
 delete mode 100644 httemplate/docs/upgrade7.html
 delete mode 100644 httemplate/docs/upgrade8.html
 delete mode 100755 httemplate/edit/REAL_cust_pkg.cgi
 delete mode 100755 httemplate/edit/agent.cgi
 delete mode 100755 httemplate/edit/agent_type.cgi
 delete mode 100755 httemplate/edit/cust_bill_pay.cgi
 delete mode 100755 httemplate/edit/cust_credit.cgi
 delete mode 100755 httemplate/edit/cust_credit_bill.cgi
 delete mode 100755 httemplate/edit/cust_main.cgi
 delete mode 100755 httemplate/edit/cust_main_county-expand.cgi
 delete mode 100755 httemplate/edit/cust_main_county.cgi
 delete mode 100755 httemplate/edit/cust_pay.cgi
 delete mode 100755 httemplate/edit/cust_pkg.cgi
 delete mode 100755 httemplate/edit/msgcat.cgi
 delete mode 100755 httemplate/edit/part_bill_event.cgi
 delete mode 100644 httemplate/edit/part_export.cgi
 delete mode 100755 httemplate/edit/part_pkg.cgi
 delete mode 100755 httemplate/edit/part_referral.cgi
 delete mode 100755 httemplate/edit/part_svc.cgi
 delete mode 100755 httemplate/edit/process/REAL_cust_pkg.cgi
 delete mode 100755 httemplate/edit/process/agent.cgi
 delete mode 100755 httemplate/edit/process/agent_type.cgi
 delete mode 100755 httemplate/edit/process/cust_bill_pay.cgi
 delete mode 100755 httemplate/edit/process/cust_credit.cgi
 delete mode 100755 httemplate/edit/process/cust_credit_bill.cgi
 delete mode 100755 httemplate/edit/process/cust_main.cgi
 delete mode 100755 httemplate/edit/process/cust_main_county-collapse.cgi
 delete mode 100755 httemplate/edit/process/cust_main_county-expand.cgi
 delete mode 100755 httemplate/edit/process/cust_main_county.cgi
 delete mode 100755 httemplate/edit/process/cust_pay.cgi
 delete mode 100755 httemplate/edit/process/cust_pkg.cgi
 delete mode 100755 httemplate/edit/process/domain_record.cgi
 delete mode 100644 httemplate/edit/process/msgcat.cgi
 delete mode 100755 httemplate/edit/process/part_bill_event.cgi
 delete mode 100644 httemplate/edit/process/part_export.cgi
 delete mode 100755 httemplate/edit/process/part_pkg.cgi
 delete mode 100755 httemplate/edit/process/part_referral.cgi
 delete mode 100755 httemplate/edit/process/part_svc.cgi
 delete mode 100644 httemplate/edit/process/quick-charge.cgi
 delete mode 100644 httemplate/edit/process/quick-cust_pkg.cgi
 delete mode 100755 httemplate/edit/process/svc_acct.cgi
 delete mode 100755 httemplate/edit/process/svc_acct_pop.cgi
 delete mode 100755 httemplate/edit/process/svc_acct_sm.cgi
 delete mode 100755 httemplate/edit/process/svc_domain.cgi
 delete mode 100755 httemplate/edit/process/svc_forward.cgi
 delete mode 100644 httemplate/edit/process/svc_www.cgi
 delete mode 100755 httemplate/edit/svc_acct.cgi
 delete mode 100755 httemplate/edit/svc_acct_pop.cgi
 delete mode 100755 httemplate/edit/svc_acct_sm.cgi
 delete mode 100755 httemplate/edit/svc_domain.cgi
 delete mode 100755 httemplate/edit/svc_forward.cgi
 delete mode 100644 httemplate/edit/svc_www.cgi
 delete mode 100644 httemplate/images/mid-logo.png
 delete mode 100644 httemplate/images/small-logo.png
 delete mode 100644 httemplate/index.html
 delete mode 100755 httemplate/misc/bill.cgi
 delete mode 100755 httemplate/misc/cancel-unaudited.cgi
 delete mode 100755 httemplate/misc/cancel_pkg.cgi
 delete mode 100755 httemplate/misc/catchall.cgi
 delete mode 100755 httemplate/misc/delete-cust_pay.cgi
 delete mode 100755 httemplate/misc/delete-customer.cgi
 delete mode 100755 httemplate/misc/delete-domain_record.cgi
 delete mode 100755 httemplate/misc/delete-part_export.cgi
 delete mode 100755 httemplate/misc/expire_pkg.cgi
 delete mode 100755 httemplate/misc/link.cgi
 delete mode 100755 httemplate/misc/print-invoice.cgi
 delete mode 100755 httemplate/misc/process/catchall.cgi
 delete mode 100755 httemplate/misc/process/delete-customer.cgi
 delete mode 100755 httemplate/misc/process/link.cgi
 delete mode 100644 httemplate/misc/queue.cgi
 delete mode 100755 httemplate/misc/susp_pkg.cgi
 delete mode 100755 httemplate/misc/unsusp_pkg.cgi
 delete mode 100755 httemplate/search/cust_bill.cgi
 delete mode 100755 httemplate/search/cust_bill.html
 delete mode 100644 httemplate/search/cust_bill_event.cgi
 delete mode 100755 httemplate/search/cust_bill_event.html
 delete mode 100755 httemplate/search/cust_main-otaker.cgi
 delete mode 100755 httemplate/search/cust_main-payinfo.html
 delete mode 100755 httemplate/search/cust_main-quickpay.html
 delete mode 100755 httemplate/search/cust_main.cgi
 delete mode 100755 httemplate/search/cust_main.html
 delete mode 100755 httemplate/search/cust_pay.cgi
 delete mode 100755 httemplate/search/cust_pay.html
 delete mode 100755 httemplate/search/cust_pkg.cgi
 delete mode 100755 httemplate/search/cust_pkg.html
 delete mode 100755 httemplate/search/report_cc.cgi
 delete mode 100755 httemplate/search/report_cc.html
 delete mode 100755 httemplate/search/report_credit.cgi
 delete mode 100755 httemplate/search/report_credit.html
 delete mode 100755 httemplate/search/report_receivables.cgi
 delete mode 100755 httemplate/search/report_tax.cgi
 delete mode 100755 httemplate/search/report_tax.html
 delete mode 100755 httemplate/search/sql.cgi
 delete mode 100755 httemplate/search/svc_acct.cgi
 delete mode 100755 httemplate/search/svc_acct.html
 delete mode 100755 httemplate/search/svc_acct_sm.cgi
 delete mode 100755 httemplate/search/svc_acct_sm.html
 delete mode 100755 httemplate/search/svc_domain.cgi
 delete mode 100755 httemplate/search/svc_domain.html
 delete mode 100755 httemplate/view/cust_bill.cgi
 delete mode 100755 httemplate/view/cust_main.cgi
 delete mode 100755 httemplate/view/cust_pkg.cgi
 delete mode 100755 httemplate/view/svc_acct.cgi
 delete mode 100755 httemplate/view/svc_acct_sm.cgi
 delete mode 100755 httemplate/view/svc_domain.cgi
 delete mode 100755 httemplate/view/svc_forward.cgi
 delete mode 100644 httemplate/view/svc_www.cgi
 delete mode 100644 init.d/freeside-init
 delete mode 100644 rt/ChangeLog
 delete mode 100755 rt/TODO
 delete mode 100644 rt/bin/initacls.Oracle
 delete mode 100755 rt/bin/initacls.Pg
 delete mode 100755 rt/bin/initacls.mysql
 delete mode 100644 rt/bin/rtadmin
 delete mode 100644 rt/docs/design_docs/basic-definitions.txt
 delete mode 100644 rt/docs/design_docs/local_hacking
 delete mode 100755 rt/docs/rt.gif
 delete mode 100755 rt/etc/config.pm
 delete mode 100644 rt/etc/schema.pm
 delete mode 100644 rt/lib/MANIFEST
 delete mode 100644 rt/lib/MANIFEST.SKIP
 delete mode 100644 rt/lib/Makefile.PL
 delete mode 100644 rt/lib/RT/Action/OpenDependent.pm
 delete mode 100755 rt/lib/RT/Action/SendPasswordEmail.pm
 delete mode 100644 rt/lib/RT/Action/StallDependent.pm
 delete mode 100644 rt/lib/RT/Condition/NewDependency.pm
 delete mode 100755 rt/lib/RT/EasySearch.pm
 delete mode 100644 rt/lib/RT/Keyword.pm
 delete mode 100644 rt/lib/RT/KeywordSelect.pm
 delete mode 100644 rt/lib/RT/KeywordSelects.pm
 delete mode 100644 rt/lib/RT/Keywords.pm
 delete mode 100644 rt/lib/RT/ObjectKeyword.pm
 delete mode 100644 rt/lib/RT/ObjectKeywords.pm
 delete mode 100644 rt/lib/RT/TestHarness.pm
 delete mode 100755 rt/lib/RT/Watcher.pm
 delete mode 100755 rt/lib/RT/Watchers.pm
 delete mode 100644 rt/lib/test.pl
 delete mode 100644 rt/tools/cpan2rpm
 delete mode 100644 rt/tools/initdb
 delete mode 100755 rt/tools/insertdata
 delete mode 100644 rt/tools/testdeps
 delete mode 100755 rt/webrt/Admin/Elements/CreateQueueCalled
 delete mode 100755 rt/webrt/Admin/Elements/CreateUserCalled
 delete mode 100755 rt/webrt/Admin/Elements/EditUserComments
 delete mode 100755 rt/webrt/Admin/Elements/GrantQueueRightsTo
 delete mode 100755 rt/webrt/Admin/Elements/GroupTabs
 delete mode 100755 rt/webrt/Admin/Elements/Header
 delete mode 100644 rt/webrt/Admin/Elements/ListGlobalKeywordSelects
 delete mode 100755 rt/webrt/Admin/Elements/ListGlobalScrips
 delete mode 100644 rt/webrt/Admin/Elements/ModifyKeyword
 delete mode 100644 rt/webrt/Admin/Elements/ModifyKeywordSelect
 delete mode 100755 rt/webrt/Admin/Elements/ModifyQueue
 delete mode 100755 rt/webrt/Admin/Elements/ModifyTemplate
 delete mode 100755 rt/webrt/Admin/Elements/ModifyUser
 delete mode 100644 rt/webrt/Admin/Elements/QueueRightsForUser
 delete mode 100755 rt/webrt/Admin/Elements/QueueTabs
 delete mode 100644 rt/webrt/Admin/Elements/SelectKeywordSelect
 delete mode 100644 rt/webrt/Admin/Elements/SelectModifyGroup
 delete mode 100644 rt/webrt/Admin/Elements/SelectModifyKeyword
 delete mode 100644 rt/webrt/Admin/Elements/SelectModifyKeywordSelect
 delete mode 100755 rt/webrt/Admin/Elements/SelectModifyQueue
 delete mode 100755 rt/webrt/Admin/Elements/SelectModifyUser
 delete mode 100755 rt/webrt/Admin/Elements/SelectQueueRights
 delete mode 100644 rt/webrt/Admin/Elements/SelectRights
 delete mode 100755 rt/webrt/Admin/Elements/SelectScrip
 delete mode 100644 rt/webrt/Admin/Elements/SelectScripAction
 delete mode 100644 rt/webrt/Admin/Elements/SelectScripCondition
 delete mode 100644 rt/webrt/Admin/Elements/SelectSingleOrMultiple
 delete mode 100755 rt/webrt/Admin/Elements/SelectTemplate
 delete mode 100644 rt/webrt/Admin/Elements/SelectUsers
 delete mode 100755 rt/webrt/Admin/Elements/SystemTabs
 delete mode 100755 rt/webrt/Admin/Elements/Tabs
 delete mode 100755 rt/webrt/Admin/Elements/UserTabs
 delete mode 100755 rt/webrt/Admin/Global/GroupRights.html
 delete mode 100644 rt/webrt/Admin/Global/Keywords.html
 delete mode 100755 rt/webrt/Admin/Global/Scrips.html
 delete mode 100755 rt/webrt/Admin/Global/Template.html
 delete mode 100755 rt/webrt/Admin/Global/Templates.html
 delete mode 100755 rt/webrt/Admin/Global/UserRights.html
 delete mode 100755 rt/webrt/Admin/Global/index.html
 delete mode 100644 rt/webrt/Admin/Groups/Members.html
 delete mode 100644 rt/webrt/Admin/Groups/Modify.html
 delete mode 100644 rt/webrt/Admin/Groups/Rights.html
 delete mode 100644 rt/webrt/Admin/Groups/index.html
 delete mode 100644 rt/webrt/Admin/KeywordSelects/Modify.html
 delete mode 100644 rt/webrt/Admin/KeywordSelects/index.html
 delete mode 100644 rt/webrt/Admin/Keywords/Modify.html
 delete mode 100644 rt/webrt/Admin/Keywords/index.html
 delete mode 100755 rt/webrt/Admin/Queues/Create.html
 delete mode 100755 rt/webrt/Admin/Queues/GroupRights.html
 delete mode 100644 rt/webrt/Admin/Queues/Keywords.html
 delete mode 100755 rt/webrt/Admin/Queues/Modify.html
 delete mode 100755 rt/webrt/Admin/Queues/People.html
 delete mode 100755 rt/webrt/Admin/Queues/Scrips.html
 delete mode 100755 rt/webrt/Admin/Queues/Template.html
 delete mode 100755 rt/webrt/Admin/Queues/Templates.html
 delete mode 100755 rt/webrt/Admin/Queues/UserRights.html
 delete mode 100755 rt/webrt/Admin/Queues/index.html
 delete mode 100755 rt/webrt/Admin/Users/Modify.html
 delete mode 100755 rt/webrt/Admin/Users/Prefs.html
 delete mode 100644 rt/webrt/Admin/Users/Rights.html
 delete mode 100755 rt/webrt/Admin/Users/index.html
 delete mode 100755 rt/webrt/Admin/index.html
 delete mode 100755 rt/webrt/Elements/Checkbox
 delete mode 100644 rt/webrt/Elements/CreateTicket
 delete mode 100644 rt/webrt/Elements/CustomHomepageHeader
 delete mode 100755 rt/webrt/Elements/Error
 delete mode 100755 rt/webrt/Elements/Footer
 delete mode 100644 rt/webrt/Elements/GotoTicket
 delete mode 100755 rt/webrt/Elements/Header
 delete mode 100755 rt/webrt/Elements/ListActions
 delete mode 100755 rt/webrt/Elements/Login
 delete mode 100644 rt/webrt/Elements/MessageBox
 delete mode 100644 rt/webrt/Elements/MyRequests
 delete mode 100644 rt/webrt/Elements/MyTickets
 delete mode 100644 rt/webrt/Elements/Quicksearch
 delete mode 100644 rt/webrt/Elements/Refresh
 delete mode 100755 rt/webrt/Elements/Section
 delete mode 100755 rt/webrt/Elements/SelectBoolean
 delete mode 100755 rt/webrt/Elements/SelectDate
 delete mode 100755 rt/webrt/Elements/SelectDateRelation
 delete mode 100755 rt/webrt/Elements/SelectDateType
 delete mode 100755 rt/webrt/Elements/SelectEqualityOperator
 delete mode 100644 rt/webrt/Elements/SelectKeyword
 delete mode 100644 rt/webrt/Elements/SelectKeywordOptions
 delete mode 100644 rt/webrt/Elements/SelectLinkType
 delete mode 100644 rt/webrt/Elements/SelectMatch
 delete mode 100755 rt/webrt/Elements/SelectNewTicketQueue
 delete mode 100755 rt/webrt/Elements/SelectOwner
 delete mode 100755 rt/webrt/Elements/SelectQueue
 delete mode 100644 rt/webrt/Elements/SelectResultsPerPage
 delete mode 100644 rt/webrt/Elements/SelectSortOrder
 delete mode 100755 rt/webrt/Elements/SelectStatus
 delete mode 100644 rt/webrt/Elements/SelectTicketSortBy
 delete mode 100755 rt/webrt/Elements/SelectUsers
 delete mode 100644 rt/webrt/Elements/SelectWatcherType
 delete mode 100755 rt/webrt/Elements/ShadedBox
 delete mode 100755 rt/webrt/Elements/Submit
 delete mode 100755 rt/webrt/Elements/Tabs
 delete mode 100755 rt/webrt/Elements/TitleBoxEnd
 delete mode 100755 rt/webrt/Elements/TitleBoxStart
 delete mode 100644 rt/webrt/Elements/ViewUser
 delete mode 100755 rt/webrt/Elements/dayMenu
 delete mode 100755 rt/webrt/Elements/monthMenu
 delete mode 100755 rt/webrt/Elements/yearMenu
 delete mode 100755 rt/webrt/NoAuth/Logout.html
 delete mode 100755 rt/webrt/NoAuth/Reminder.html
 delete mode 100644 rt/webrt/NoAuth/images/rt.jpg
 delete mode 100644 rt/webrt/NoAuth/images/spacer.gif
 delete mode 100755 rt/webrt/NoAuth/webrt.css
 delete mode 100755 rt/webrt/Search/Bulk.html
 delete mode 100755 rt/webrt/Search/Listing.html
 delete mode 100755 rt/webrt/Search/PickRestriction
 delete mode 100755 rt/webrt/Search/RestrictSearch.html
 delete mode 100644 rt/webrt/Search/TicketCell
 delete mode 100644 rt/webrt/SelfService/Attachment/dhandler
 delete mode 100644 rt/webrt/SelfService/Closed.html
 delete mode 100755 rt/webrt/SelfService/Create.html
 delete mode 100755 rt/webrt/SelfService/Display.html
 delete mode 100755 rt/webrt/SelfService/Elements/GotoTicket
 delete mode 100755 rt/webrt/SelfService/Elements/Header
 delete mode 100644 rt/webrt/SelfService/Elements/MyRequests
 delete mode 100644 rt/webrt/SelfService/Elements/Tabs
 delete mode 100755 rt/webrt/SelfService/Error.html
 delete mode 100755 rt/webrt/SelfService/Prefs.html
 delete mode 100755 rt/webrt/SelfService/Update.html
 delete mode 100644 rt/webrt/SelfService/index.html
 delete mode 100644 rt/webrt/Ticket/Attachment/dhandler
 delete mode 100755 rt/webrt/Ticket/Create.html
 delete mode 100755 rt/webrt/Ticket/Display.html
 delete mode 100755 rt/webrt/Ticket/Elements/AddWatchers
 delete mode 100755 rt/webrt/Ticket/Elements/EditBasics
 delete mode 100755 rt/webrt/Ticket/Elements/EditDates
 delete mode 100644 rt/webrt/Ticket/Elements/EditKeywordSelects
 delete mode 100755 rt/webrt/Ticket/Elements/EditLinks
 delete mode 100755 rt/webrt/Ticket/Elements/EditPeople
 delete mode 100755 rt/webrt/Ticket/Elements/EditWatchers
 delete mode 100755 rt/webrt/Ticket/Elements/ShowBasics
 delete mode 100755 rt/webrt/Ticket/Elements/ShowDates
 delete mode 100755 rt/webrt/Ticket/Elements/ShowDependencies
 delete mode 100755 rt/webrt/Ticket/Elements/ShowHistory
 delete mode 100644 rt/webrt/Ticket/Elements/ShowKeywordSelects
 delete mode 100755 rt/webrt/Ticket/Elements/ShowLinks
 delete mode 100755 rt/webrt/Ticket/Elements/ShowMemberOf
 delete mode 100755 rt/webrt/Ticket/Elements/ShowMembers
 delete mode 100755 rt/webrt/Ticket/Elements/ShowPeople
 delete mode 100755 rt/webrt/Ticket/Elements/ShowReferences
 delete mode 100644 rt/webrt/Ticket/Elements/ShowRequestor
 delete mode 100755 rt/webrt/Ticket/Elements/ShowSummary
 delete mode 100755 rt/webrt/Ticket/Elements/ShowTransaction
 delete mode 100755 rt/webrt/Ticket/Elements/Tabs
 delete mode 100755 rt/webrt/Ticket/Elements/ToolBar
 delete mode 100755 rt/webrt/Ticket/History.html
 delete mode 100755 rt/webrt/Ticket/Modify.html
 delete mode 100755 rt/webrt/Ticket/ModifyAll.html
 delete mode 100755 rt/webrt/Ticket/ModifyDates.html
 delete mode 100755 rt/webrt/Ticket/ModifyLinks.html
 delete mode 100755 rt/webrt/Ticket/ModifyPeople.html
 delete mode 100755 rt/webrt/Ticket/Update.html
 delete mode 100755 rt/webrt/User/Prefs.html
 delete mode 100755 rt/webrt/autohandler
 delete mode 100644 rt/webrt/index.html
 delete mode 100755 test/cgi-test

diff --git a/ANNOUCE.1.4.0 b/ANNOUCE.1.4.0
deleted file mode 100644
index d110c6f3a..000000000
--- a/ANNOUCE.1.4.0
+++ /dev/null
@@ -1,50 +0,0 @@
-Hi,
-
-I'm pleased to announce the first beta release of Freeside 1.4.0.
-Freeside is a web-based, open-source billing and account administration
-package for ISPs, web hosts, and similar businesses.
-
-You can see a web demo, read the documentation, and download the new beta
-at <http://www.sisd.com/freeside/>.
-
-Although Freeside is free software, it is supported commercially with
-installation, customization, training and support services.  Please
-consider our services and help support the development of the software!
-
-
-Major new features in 1.4.0 include:
-
-- Billing engine has been rewritten and now has support for easily added
-  "price plans".  Included price plans include anniversary billing,
-  1st-of-the-month billing (pro-rated and subscription), free for N days,
-  commissions for referrals and per-minute/per-hour charges.
-
-- Customer-to-customer referrals, tracking and commissions.
-
-- Configurable invoice events triggered for delinquent customers can
-  re-send invoices, suspend accounts, charge late fees, and so on.
-
-- Export and provisioning system has been rewritten.  New provisioning
-  methods can now be "plugged-in" for any service type.  Included exports
-  include BSD and Linux password files, configurable shell commands,
-  RADIUS (both text and SQL, including groups), BIND configuration files,
-  Cyrus, vpopmail, and many others.
-
-- Complete set of history tables tracking all changes to the database.
-
-- Job queue with display and retry for provisioning tasks.
-
-- UI overhaul - easier to navigate and use.  Quick package order and
-  one-time charges.  Separate billing and service contact information.
-  Customer comments.
-
-- Performance optimizations.
-
-- Financials have been rewritten.  Apply payments and credits against
-  specific invoices (in whole or in part), or have the system apply
-  automatically.
-
-- Texas tax.
-
-- Improved documentation and easier install.
-
diff --git a/Artistic b/Artistic
deleted file mode 100644
index 4ffc78e97..000000000
--- a/Artistic
+++ /dev/null
@@ -1,125 +0,0 @@
-                      The "Artistic License"
-
-                             Preamble
-
-The intent of this document is to state the conditions under which a
-Package may be copied, such that the Copyright Holder maintains some
-semblance of artistic control over the development of the Package,
-while giving the users of the package the right to use and distribute
-the Package in a more-or-less customary fashion, plus the right to make
-reasonable modifications.
-
-It also grants you the rights to reuse parts of a Package in your own
-programs without transferring this License to those programs, provided
-that you meet some reasonable requirements.
-
-Definitions:
-
-        "Package" refers to the collection of files distributed by the
-        Copyright Holder, and derivatives of that collection of files
-        created through textual modification.
-
-        "Standard Version" refers to such a Package if it has not been
-        modified, or has been modified in accordance with the wishes
-        of the Copyright Holder as specified below.
-
-        "Copyright Holder" is whoever is named in the copyright or
-        copyrights for the package.
-
-        "You" is you, if you're thinking about copying or distributing
-        this Package.
-
-        "Reasonable copying fee" is whatever you can justify on the
-        basis of media cost, duplication charges, time of people involved,
-        and so on.  (You will not be required to justify it to the
-        Copyright Holder, but only to the computing community at large
-        as a market that must bear the fee.)
-
-        "Freely Available" means that no fee is charged for the item
-        itself, though there may be fees involved in handling the item.
-        It also means that recipients of the item may redistribute it
-        under the same conditions they received it.
-
-1. You may make and give away verbatim copies of the source form of the
-Standard Version of this Package without restriction, provided that you
-duplicate all of the original copyright notices and associated disclaimers.
-
-2. You may apply bug fixes, portability fixes and other modifications
-derived from the Public Domain or from the Copyright Holder.  A Package
-modified in such a way shall still be considered the Standard Version.
-
-3. You may otherwise modify your copy of this Package in any way, provided
-that you insert a prominent notice in each changed file stating how and
-when you changed that file, and provided that you do at least ONE of the
-following:
-
-    a) place your modifications in the Public Domain or otherwise make them
-    Freely Available, such as by posting said modifications to Usenet or
-    an equivalent medium, or placing the modifications on a major archive
-    site such as uunet.uu.net, or by allowing the Copyright Holder to include
-    your modifications in the Standard Version of the Package.
-
-    b) use the modified Package only within your corporation or organization.
-
-    c) rename any non-standard executables so the names do not conflict
-    with standard executables, which must also be provided, and provide
-    a separate manual page for each non-standard executable that clearly
-    documents how it differs from the Standard Version.
-
-    d) make other distribution arrangements with the Copyright Holder.
-
-4. You may distribute the programs of this Package in object code or
-executable form, provided that you do at least ONE of the following:
-
-    a) distribute a Standard Version of the executables and library files,
-    together with instructions (in the manual page or equivalent) on where
-    to get the Standard Version.
-
-    b) accompany the distribution with the machine-readable source of
-    the Package with your modifications.
-
-    c) give non-standard executables non-standard names, and clearly
-    document the differences in manual pages (or equivalent), together
-    with instructions on where to get the Standard Version.
-
-    d) make other distribution arrangements with the Copyright Holder.
-
-5. You may charge a reasonable copying fee for any distribution of this
-Package.  You may charge any fee you choose for support of this
-Package.  You may not charge a fee for this Package itself.  However,
-you may distribute this Package in aggregate with other (possibly
-commercial) programs as part of a larger (possibly commercial) software
-distribution provided that you do not advertise this Package as a
-product of your own.
-
-6. The scripts and library files supplied as input to or produced as
-output from the programs of this Package do not automatically fall
-under the copyright of this Package, but belong to whomever generated
-them, and may be sold commercially, and may be aggregated with this
-Package.  If such scripts or library files are aggregated with this
-Package via the so-called "undump" or "unexec" methods of producing a
-binary executable image, then distribution of such an image shall
-neither be construed as a distribution of this Package nor shall it
-fall under the restrictions of Paragraphs 3 and 4, provided that you do
-not represent such an executable image as a Standard Version of this
-Package.
-
-7. You may reuse parts of this Package in your own programs, provided that
-you explicitly state where you got them from, in the source code (and, left
-to your courtesy, in the documentation), duplicating all the associated
-copyright notices and disclaimers. Besides your changes, if any, must be
-clearly marked as such. Parts reused that way will no longer fall under this
-license if, and only if, the name of your program(s) have no immediate
-connection with the name of the Package itself or its associated programs.
-You may then apply whatever restrictions you wish on the reused parts or
-choose to place them in the Public Domain--this will apply only within the
-context of your package.
-
-8. The name of the Copyright Holder may not be used to endorse or promote
-products derived from this software without specific prior written permission.
-
-9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-                                The End
diff --git a/CREDITS b/CREDITS
deleted file mode 100644
index d89f4f564..000000000
--- a/CREDITS
+++ /dev/null
@@ -1,110 +0,0 @@
-Thanks to Matt Simerson <matt@michweb.net> of MichWeb Inc. for documentation
-and pre-release testing.  Without his help the documentation in 1.0.0
-release would have consisted of a single screenfull of text.
-(To clear up some misunderstanding, Matt did not write the current
-documentation.)
-
-Steve Cleff <cleff@yahoo.com> did the default background image in 1.0.x and
-is also the creator of Freeside's elusive mascot, Snakeman, who we hope will
-make an appearance in an upcoming version.
-
-Jerry St. Pierre <jstpi@city.timmins.on.ca> did the "SISD" graphic used in
-1.0.x and most of 1.1.x.
-
-Mark Norris of Urban Design, Inc. <http://www.urban.com/> did the red "S"
-logo for later 1.1.x versions and 1.2.x
-
-Brian McCane? <bmccane@maxbaud.net> contributed PostgreSQL support, HTML
-style enhancements and many, many bugfixes.
-
-Cerkit <cerkit@alfheim.net> contributed rsync support and desynced hosts.
-His changes will hopefully be included in an upcoming version.
-
-CompleteHOST, Inc. (http://www.completehost.com) funded the development of the
-following features:
-  - Multiple, separate databases and configurations on one box.
-  - Per-customer pricing (custom packages)
-  - Internationalization wrt addresses (cust_main, cust_main_county)
-Thanks!
-
-Mark Williamson <mark.williamson@ebbs.com.au> and Roger Mangraviti
-<rem@atu.com.au> contributed state/provence listings for Australia.
-
-Peter Wemm <peter@netplex.com.au> sent in a bunch of bugfixes for the 1.2
-release.
-
-Greg Kuhnert <gregk@no1.com.au> sent some documentation updates.
-
-Joel Griffiths <griff@aver-computer.com> contribued many bugfixes as well as
-the print-batch script.
-
-NetLoud <http://www.netloud.com/> funded the development of the following
-features:
-  - IEAK support for the signup server
-  - Pre-payment support
-
-NetAcces.Net (not netaccess.net) funded the development of the following
-features:
-  - DNS tracking and export to BIND configuration files
-  - Web site virtual host tracking and export to Apache configuration files
-
-Kristian Hoffmann <khoff@pc-intouch.com> contributed Netscape CCK
-autoconfiguration support for the signup server, lots of great mailing
-lists posts which I shamelessly made into documentation, fixes to get rid of
-the embarassing and non-database-normal "owed" field, and many other things
-I'm forgetting.
-
-Jeff Finucane <jeff@cmh.net> send in a bunch of bugfixes (for the sendmail
-export, cancel-unaudited.cgi), patches to support billing date modification,
-and probably other things too (sorry if I forgot them).  And yet even more
-bug squashing, thanks!  *and* he single-handedly implemented all the necessary
-work to get rid of svc_acct_sm and the "default domain"  thanks!!  and rewrote
-the financials!  wow, thanks jeff!  and contributed financial reports!
-
-Kenny Elliott <kenny@neoserve.com> contributed ICRADIUS radreply table support,
-allowing attributes with ICRADIUS, helped fix many bugs, and some
-other stuff I can't recall (sorry).
-
-Stephen Amadei <amadei@dandy.net> contribued portability cleanups for the
-low-level DBI stuff.
-
-Jason Spence <thalakan@frys.com> contributed admin.html and other
-documentation, autocapnames javascript, bugfixes & other neat stuff I can't
-remember.
-
-Brad Dameron <bdameron@tscnet.com> contributed code to do configurable state
-and referral defaults.
-
-Surf and Sip, Inc., <http://www.surfandsip.com> sponsored a long-requested
-feature - the session monitor and time-based prepaid cards.
-Matt Peterson <matt@peterson.org> and Mack ? <mackn@mackn.net> tested
-the new features and contributed many bugfixes.
-
-Landel Telecom <http://www.landel.com/> sponsored shipping addresses and
-customer notes, as well as an update of the CP provisioning.
-
-nikotel, Inc. <http://www.nikojet.com> sponsored the inclusion of
-customer-to-customer referrals in the web interface and signup server.
-
-Three Bubba's Innanet <http://www.inna.net> sponsored expedited check entry,
-the "similar names warning" feature, and a number of other enhancements.
-
-Dave Burgess <burgess@neonramp.com> sent in a bunch of fixes and small changes
-and will doubtless send more once he's got his tree under control.
-
-Luke Pfeifer <freeside@globalli.com> contributed the "subscription" price plan.
-
-Noment Networks, LLC <http://www.noment.com/> sponsored ICRADIUS/FreeRADIUS
-groups, message catalogs, and signup server enhancements.
-
-Donald Greer <dgreer@austintx.com> provided the SQL to work around MySQL's lack
-of subqueries, and Dale Hege <fhege@lumenexus.net> provided the patches.
-Thanks!
-
-<baloo@gimpgirl.com> sent in several documentation patches.
-
-"Stephen Bechard" <steve@destek.net> sent in patches for svc_www services and
-other fixes.
-
-Everything else is my (Ivan Kohler <ivan@420.am>) fault.
-
diff --git a/FS/Changes b/FS/Changes
deleted file mode 100644
index c94ef10f5..000000000
--- a/FS/Changes
+++ /dev/null
@@ -1,5 +0,0 @@
-Revision history for Perl extension FS.
-
-0.01  Wed Aug  4 00:13:45 1999
-	- original version; created by h2xs 1.19
-
diff --git a/FS/FS.pm b/FS/FS.pm
deleted file mode 100644
index 963c73548..000000000
--- a/FS/FS.pm
+++ /dev/null
@@ -1,231 +0,0 @@
-package FS;
-
-use strict;
-use vars qw($VERSION);
-
-$VERSION = '0.01';
-
-#find missing entries in this file with:
-# for a in `ls *pm | cut -d. -f1`; do grep 'L<FS::'$a'>' ../FS.pm >/dev/null || echo "missing $a" ; done
-
-1;
-__END__
-
-=head1 NAME
-
-FS - Freeside Perl modules
-
-=head1 SYNOPSIS
-
-Freeside perl modules and CLI utilities.
-
-=head2 Utility classes
-
-L<FS::Conf> - Freeside configuration values
-
-L<FS::ConfItem> - Freeside configuration option meta-data.
-
-L<FS::UID> - User class (not yet OO)
-
-L<FS::CGI> - Non OO-subroutines for the web interface.
-
-L<FS::Msgcat> - Message catalog
-
-L<FS::SearchCache> - Search cache
-
-L<FS::raddb> - RADIUS dictionary
-
-=head2 Database record classes
-
-L<FS::Record> - Database record base class
-
-L<FS::svc_acct_pop> - POP (Point of Presence, not Post
-Office Protocol) class
-
-L<FS::part_pop_local> - Local calling area class
-
-L<FS::part_referral> - Referral class
-
-L<FS::cust_main_county> - Locale (tax rate) class
-
-L<FS::cust_tax_exempt> - Tax exemption record class
-
-L<FS::svc_Common> - Service base class
-
-L<FS::svc_acct> - Account (shell, RADIUS, POP3) class
-
-L<FS::radius_usergroup> - RADIUS groups
-
-L<FS::svc_domain> - Domain class
-
-L<FS::domain_record> - DNS zone entries
-
-L<FS::svc_forward> - Mail forwarding class
-
-L<FS::svc_acct_sm> - (Depreciated) Vitual mail alias class
-
-L<FS::svc_www> - Web virtual host class.
-
-L<FS::part_svc> - Service definition class
-
-L<FS::part_svc_column> - Column constraint class
-
-L<FS::export_svc> - Class linking service definitions (see L<FS::part_svc>)
-with exports (see L<FS::part_export>)
-
-L<FS::part_export> - External provisioning export class
-
-L<FS::part_export_option> - Export option class
-
-L<FS::part_pkg> - Package (billing item) definition class
-
-L<FS::pkg_svc> - Class linking package (billing item)
-definitions (see L<FS::part_pkg>) with service definitions
-(see L<FS::part_svc>)
-
-L<FS::agent> - Agent (reseller) class
-
-L<FS::agent_type> - Agent type class
-
-L<FS::type_pkgs> - Class linking agent types (see
-L<FS::agent_type>) with package (billing item) definitions
-(see L<FS::part_pkg>)
-
-L<FS::cust_svc> - Service class
-
-L<FS::cust_pkg> - Package (billing item) class
-
-L<FS::cust_main> - Customer class
-
-L<FS::cust_main_invoice> - Invoice destination
-class
-
-L<FS::cust_bill> - Invoice class
-
-L<FS::cust_bill_pkg> - Invoice line item class
-
-L<FS::part_bill_event> - Invoice event definition class
-
-L<FS::cust_bill_event> - Completed invoice event class
-
-L<FS::cust_pay> - Payment class
-
-L<FS::cust_bill_pay> - Payment application class
-
-L<FS::cust_credit> - Credit class
-
-L<FS::cust_refund> - Refund class
-
-L<FS::cust_credit_refund> - Refund application class
-
-L<FS::cust_credit_bill> - Credit invoice application class
-
-L<FS::cust_pay_batch> - Credit card transaction queue class
-
-L<FS::prepay_credit> - Prepaid "calling card" credit class.
-
-L<FS::nas> - Network Access Server class
-
-L<FS::port> - NAS port class
-
-L<FS::session> - User login session class
-
-L<FS::queue> - Job queue
-
-L<FS::queue_arg> - Job arguments
-
-L<FS::queue_depend> - Job dependencies
-
-L<FS::msgcat> - Message catalogs
-
-=head1 Remote API modules
-
-L<FS::SignupClient>
-
-L<FS::SessionClient>
-
-L<FS::MailAdminServer>
-
-=head2 Command-line utilities
-
-L<freeside-adduser>
-
-L<freeside-queued>
-
-L<freeside-daily>
-
-L<freeside-expiration-alerter>
-
-L<freeside-email>
-
-L<freeside-cc-receipts-report>
-
-L<freeside-credit-report>
-
-L<freeside-receivables-report>
-
-L<freeside-tax-report>
-
-L<freeside-bill>
-
-L<freeside-overdue>
-
-=head2 User Interface classes (under (stalled) development; not yet usable)
-
-L<FS::UI::Base> - User-interface base class
-
-L<FS::UI::Gtk> - Gtk user-interface class
-
-L<FS::UI::CGI> - CGI (HTML) user-interface class
-
-L<FS::UI::agent> - agent table user-interface class
-
-=head2 Notes
-
-To quote perl(1), "If you're intending to read these straight through for the
-first time, the suggested order will tend to reduce the number of forward
-references."
-
-If you've never used OO modules before,
-http://www.cpan.org/doc/FMTEYEWTK/easy_objects.html might help you out.
-
-=head1 DESCRIPTION
-
-Freeside is a billing and administration package for Internet Service
-Providers.
-
-The Freeside home page is at <http://www.sisd.com/freeside>.
-
-The main documentation is in httemplate/docs.
-
-=head1 SUPPORT
-
-A mailing list for users is available.  Send a blank message to
-<ivan-freeside-subscribe@sisd.com> to subscribe.
-
-A mailing list for developers is available.  It is intended to be lower volume
-and higher SNR than the users list.  Send a blank message to
-<ivan-freeside-devel-subscribe@sisd.com> to subscribe.
-
-Commercial support is available; see
-<http://www.sisd.com/freeside/commercial.html>.
-
-=head1 AUTHOR
-
-Primarily Ivan Kohler <ivan@sisd.com>, with help from many kind folks.
-
-See the CREDITS file in the Freeside distribution for a (hopefully) complete
-list and the individal files for details.
-
-=head1 SEE ALSO
-
-perl(1), main Freeside documentation in htdocs/docs/
-
-=head1 BUGS
-
-Those modules which would be useful separately should be pulled out, 
-renamed appropriately and uploaded to CPAN.  So far: DBIx::DBSchema, Net::SSH
-and Net::SCP...
-
-=cut
-
diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
deleted file mode 100644
index e44ebcc0a..000000000
--- a/FS/FS/CGI.pm
+++ /dev/null
@@ -1,314 +0,0 @@
-package FS::CGI;
-
-use strict;
-use vars qw(@EXPORT_OK @ISA);
-use Exporter;
-use CGI;
-use URI::URL;
-#use CGI::Carp qw(fatalsToBrowser);
-use FS::UID;
-
-@ISA = qw(Exporter);
-@EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable
-                small_custview myexit);
-
-=head1 NAME
-
-FS::CGI - Subroutines for the web interface
-
-=head1 SYNOPSIS
-
-  use FS::CGI qw(header menubar idiot eidiot popurl);
-
-  print header( 'Title', '' );
-  print header( 'Title', menubar('item', 'URL', ... ) );
-
-  idiot "error message"; 
-  eidiot "error message";
-
-  $url = popurl; #returns current url
-  $url = popurl(3); #three levels up
-
-=head1 DESCRIPTION
-
-Provides a few common subroutines for the web interface.
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item header TITLE, MENUBAR
-
-Returns an HTML header.
-
-=cut
-
-sub header {
-  my($title,$menubar,$etc)=@_; #$etc is for things like onLoad= etc.
-  #use Carp;
-  $etc = '' unless defined $etc;
-
-  my $x =  <<END;
-    <HTML>
-      <HEAD>
-        <TITLE>
-          $title
-        </TITLE>
-        <META HTTP-Equiv="Cache-Control" Content="no-cache">
-        <META HTTP-Equiv="Pragma" Content="no-cache">
-        <META HTTP-Equiv="Expires" Content="0"> 
-      </HEAD>
-      <BODY BGCOLOR="#e8e8e8"$etc>
-          <FONT SIZE=7>
-            $title
-          </FONT>
-          <BR><BR>
-END
-  $x .=  $menubar. "<BR><BR>" if $menubar;
-  $x;
-}
-
-=item menubar ITEM, URL, ...
-
-Returns an HTML menubar.
-
-=cut
-
-sub menubar { #$menubar=menubar('Main Menu', '../', 'Item', 'url', ... );
-  my($item,$url,@html);
-  while (@_) {
-    ($item,$url)=splice(@_,0,2);
-    push @html, qq!<A HREF="$url">$item</A>!;
-  }
-  join(' | ',@html);
-}
-
-=item idiot ERROR
-
-This is depriciated.  Don't use it.
-
-Sends an HTML error message.
-
-=cut
-
-sub idiot {
-  #warn "idiot depriciated";
-  my($error)=@_;
-#  my $cgi = &FS::UID::cgi();
-#  if ( $cgi->isa('CGI::Base') ) {
-#    no strict 'subs';
-#    &CGI::Base::SendHeaders;
-#  } else {
-#    print $cgi->header( @FS::CGI::header );
-#  }
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error processing your request</TITLE>
-    <META HTTP-Equiv="Cache-Control" Content="no-cache">
-    <META HTTP-Equiv="Pragma" Content="no-cache">
-    <META HTTP-Equiv="Expires" Content="0"> 
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Error processing your request</H4>
-    </CENTER>
-    Your request could not be processed because of the following error:
-    <P><B>$error</B>
-  </BODY>
-</HTML>
-END
-
-}
-
-=item eidiot ERROR
-
-This is depriciated.  Don't use it.
-
-Sends an HTML error message, then exits.
-
-=cut
-
-sub eidiot {
-  warn "eidiot depriciated";
-  $HTML::Mason::Commands::r->send_http_header
-    if defined $HTML::Mason::Commands::r;
-  idiot(@_);
-  &myexit();
-}
-
-=item myexit
-
-You probably shouldn't use this; but if you must:
-
-If running under mod_perl, calles Apache::exit, otherwise, calls exit.
-
-=cut
-
-sub myexit {
-  if (exists $ENV{MOD_PERL}) {
-
-    if ( defined $main::Response
-         && $main::Response->isa('Apache::ASP::Response') ) {  #Apache::ASP
-      $main::Response->End();
-      require Apache;
-      Apache::exit();
-    } elsif ( defined $HTML::Mason::Commands::m  ) { #Mason
-      #$HTML::Mason::Commands::m->flush_buffer();
-      $HTML::Mason::Commands::m->abort();
-      die "shouldn't fall through to here (mason \$m->abort didn't)";
-    } else {
-      #??? well, it is $ENV{MOD_PERL}
-      warn "running under unknown mod_perl environment; trying Apache::exit()";
-      require Apache;
-      Apache::exit();
-    }
-  } else {
-    exit;
-  }
-}
-
-=item popurl LEVEL
-
-Returns current URL with LEVEL levels of path removed from the end (default 0).
-
-=cut
-
-sub popurl {
-  my($up)=@_;
-  my $cgi = &FS::UID::cgi;
-  my $url = new URI::URL ( $cgi->isa('Apache') ? $cgi->uri : $cgi->url );
-  my(@path)=$url->path_components;
-  splice @path, 0-$up;
-  $url->path_components(@path);
-  my $x = $url->as_string;
-  $x .= '/' unless $x =~ /\/$/;
-  $x;
-}
-
-=item table
-
-Returns HTML tag for beginning a table.
-
-=cut
-
-sub table {
-  my $col = shift;
-  if ( $col ) {
-    qq!<TABLE BGCOLOR="$col" BORDER=1 WIDTH="100%" CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">!;
-  } else { 
-    '<TABLE BORDER=1 CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">';
-  }
-}
-
-=item itable
-
-Returns HTML tag for beginning an (invisible) table.
-
-=cut
-
-sub itable {
-  my $col = shift;
-  my $cellspacing = shift || 0;
-  if ( $col ) {
-    qq!<TABLE BGCOLOR="$col" BORDER=0 CELLSPACING=$cellspacing WIDTH="100%">!;
-  } else {
-    qq!<TABLE BORDER=0 CELLSPACING=$cellspacing WIDTH="100%">!;
-  }
-}
-
-=item ntable
-
-This is getting silly.
-
-=cut
-
-sub ntable {
-  my $col = shift;
-  my $cellspacing = shift || 0;
-  if ( $col ) {
-    qq!<TABLE BGCOLOR="$col" BORDER=0 CELLSPACING=$cellspacing>!;
-  } else {
-    '<TABLE BORDER CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">';
-  }
-
-}
-
-=item small_custview CUSTNUM || CUST_MAIN_OBJECT, COUNTRYDEFAULT
-
-Sheesh. I should just switch to Mason.
-
-=cut
-
-sub small_custview {
-  use FS::Record qw(qsearchs);
-  use FS::cust_main;
-
-  my $arg = shift;
-  my $countrydefault = shift || 'US';
-
-  my $cust_main = ref($arg) ? $arg
-                  : qsearchs('cust_main', { 'custnum' => $arg } )
-    or die "unknown custnum $arg";
-
-  my $html = 'Customer #<B>'. $cust_main->custnum. '</B>'.
-    ntable('#e8e8e8'). '<TR><TD>'. ntable("#cccccc",2).
-    '<TR><TD ALIGN="right" VALIGN="top">Billing<BR>Address</TD><TD BGCOLOR="#ffffff">'.
-    $cust_main->getfield('last'). ', '. $cust_main->first. '<BR>';
-
-  $html .= $cust_main->company. '<BR>' if $cust_main->company;
-  $html .= $cust_main->address1. '<BR>';
-  $html .= $cust_main->address2. '<BR>' if $cust_main->address2;
-  $html .= $cust_main->city. ', '. $cust_main->state. '  '. $cust_main->zip. '<BR>';
-  $html .= $cust_main->country. '<BR>'
-    if $cust_main->country && $cust_main->country ne $countrydefault;
-
-  $html .= '</TD></TR></TABLE></TD>';
-
-  if ( defined $cust_main->dbdef_table->column('ship_last') ) {
-
-    my $pre = $cust_main->ship_last ? 'ship_' : '';
-
-    $html .= '<TD>'. ntable("#cccccc",2).
-      '<TR><TD ALIGN="right" VALIGN="top">Service<BR>Address</TD><TD BGCOLOR="#ffffff">'.
-      $cust_main->get("${pre}last"). ', '.
-      $cust_main->get("${pre}first"). '<BR>';
-    $html .= $cust_main->get("${pre}company"). '<BR>'
-      if $cust_main->get("${pre}company");
-    $html .= $cust_main->get("${pre}address1"). '<BR>';
-    $html .= $cust_main->get("${pre}address2"). '<BR>'
-      if $cust_main->get("${pre}address2");
-    $html .= $cust_main->get("${pre}city"). ', '.
-             $cust_main->get("${pre}state"). '  '.
-             $cust_main->get("${pre}ship_zip"). '<BR>';
-    $html .= $cust_main->get("${pre}country"). '<BR>'
-      if $cust_main->get("${pre}country")
-         && $cust_main->get("${pre}country") ne $countrydefault;
-
-    $html .= '</TD></TR></TABLE></TD>';
-  }
-
-  $html .= '</TR></TABLE>';
-
-  $html;
-}
-
-=back
-
-=head1 BUGS
-
-Not OO.
-
-Not complete.
-
-small_custview sooooo doesn't belong here.  i should just switch to Mason.
-
-=head1 SEE ALSO
-
-L<CGI>, L<CGI::Base>
-
-=cut
-
-1;
-
-
diff --git a/FS/FS/ClientAPI.pm b/FS/FS/ClientAPI.pm
deleted file mode 100644
index f7b8eb028..000000000
--- a/FS/FS/ClientAPI.pm
+++ /dev/null
@@ -1,44 +0,0 @@
-package FS::ClientAPI;
-
-use strict;
-use vars qw(%handler);
-
-%handler = ();
-
-#find modules
-foreach my $INC ( @INC ) {
-  foreach my $file ( glob("$INC/FS/ClientAPI/*") ) {
-    $file =~ /\/(\w+)\.pm$/ or do {
-      warn "unrecognized ClientAPI file: $file";
-      next
-    };
-    my $mod = $1;
-    #warn "using FS::ClientAPI::$mod";
-    eval "use FS::ClientAPI::$mod;";
-    die "error using FS::ClientAPI::$mod: $@" if $@;
-  }
-}
-
-#(sub for modules)
-sub register_handlers {
-  my $self = shift;
-  my %new_handlers = @_;
-  foreach my $key ( keys %new_handlers ) {
-    warn "WARNING: redefining sub $key" if exists $handler{$key};
-    #warn "registering $key";
-    $handler{$key} = $new_handlers{$key};
-  }
-}
-
-#---
-
-sub dispatch {
-  my ( $self, $name ) = ( shift, shift );
-  my $sub = $handler{$name}
-    or die "unknown FS::ClientAPI sub $name (known: ". join(" ", keys %handler );
-    #or die "unknown FS::ClientAPI sub $name";
-  &{$sub}(@_);
-}
-
-1;
-
diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
deleted file mode 100644
index 674785524..000000000
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ /dev/null
@@ -1,136 +0,0 @@
-package FS::ClientAPI::MyAccount;
-
-use strict;
-use vars qw($cache);
-use Digest::MD5 qw(md5_hex);
-use Date::Format;
-use Cache::SharedMemoryCache; #store in db?
-use FS::CGI qw(small_custview); #doh
-use FS::Conf;
-use FS::Record qw(qsearchs);
-use FS::svc_acct;
-use FS::svc_domain;
-use FS::cust_main;
-use FS::cust_bill;
-
-use FS::ClientAPI; #hmm
-FS::ClientAPI->register_handlers(
-  'MyAccount/login'         => \&login,
-  'MyAccount/customer_info' => \&customer_info,
-  'MyAccount/invoice'       => \&invoice,
-);
-
-#store in db?
-my $cache = new Cache::SharedMemoryCache();
-
-#false laziness w/FS::ClientAPI::passwd::passwd (needs to handle encrypted pw)
-sub login {
-  my $p = shift;
-
-  my $svc_domain = qsearchs('svc_domain', { 'domain' => $p->{'domain'} } )
-    or return { error => "Domain not found" };
-
-  my $svc_acct =
-    ( length($p->{'password'}) < 13
-      && qsearchs( 'svc_acct', { 'username'  => $p->{'username'},
-                                 'domsvc'    => $svc_domain->svcnum,
-                                 '_password' => $p->{'password'}     } )
-    )
-    || qsearchs( 'svc_acct', { 'username'  => $p->{'username'},
-                               'domsvc'    => $svc_domain->svcnum,
-                               '_password' => $p->{'password'}     } );
-
-  unless ( $svc_acct ) { return { error => 'Incorrect password.' } }
-
-  my $session = {
-    'svcnum' => $svc_acct->svcnum,
-  };
-
-  my $cust_pkg = $svc_acct->cust_svc->cust_pkg;
-  if ( $cust_pkg ) {
-    my $cust_main = $cust_pkg->cust_main;
-    $session->{'custnum'} = $cust_main->custnum;
-  }
-
-  my $session_id;
-  do {
-    $session_id = md5_hex(md5_hex(time(). {}. rand(). $$))
-  } until ( ! defined $cache->get($session_id) ); #just in case
-
-  $cache->set( $session_id, $session, '1 hour' );
-
-  return { 'error'      => '',
-           'session_id' => $session_id,
-         };
-}
-
-sub customer_info {
-  my $p = shift;
-  my $session = $cache->get($p->{'session_id'})
-    or return { 'error' => "Can't resume session" }; #better error message
-
-  my %return;
-
-  my $custnum = $session->{'custnum'};
-
-  if ( $custnum ) { #customer record
-
-    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
-      or return { 'error' => "unknown custnum $custnum" };
-
-    $return{balance} = $cust_main->balance;
-
-    my @open = map {
-                     {
-                       invnum => $_->invnum,
-                       date   => time2str("%b %o, %Y", $_->_date),
-                       owed   => $_->owed,
-                     };
-                   } $cust_main->open_cust_bill;
-    $return{open_invoices} = \@open;
-
-    my $conf = new FS::Conf;
-    $return{small_custview} =
-      small_custview( $cust_main, $conf->config('defaultcountry') );
-
-    $return{name} = $cust_main->first. ' '. $cust_main->get('last');
-
-  } else { #no customer record
-
-    my $svc_acct = qsearchs('svc_acct', { 'svcnum' => $session->{'svcnum'} } )
-      or die "unknown svcnum";
-    $return{name} = $svc_acct->email;
-
-  }
-
-
-  return { 'error'          => '',
-           'custnum'        => $custnum,
-           %return,
-         };
-
-}
-
-sub invoice {
-  my $p = shift;
-  my $session = $cache->get($p->{'session_id'})
-    or return { 'error' => "Can't resume session" }; #better error message
-
-  my $custnum = $session->{'custnum'};
-
-  my $invnum = $p->{'invnum'};
-
-  my $cust_bill = qsearchs('cust_bill', { 'invnum'  => $invnum,
-                                          'custnum' => $custnum } )
-    or return { 'error' => "Can't find invnum" };
-
-  #my %return;
-
-  return { 'error'        => '',
-           'invnum'       => $invnum,
-           'invoice_text' => join('', $cust_bill->print_text ),
-         };
-
-}
-
-
diff --git a/FS/FS/ClientAPI/passwd.pm b/FS/FS/ClientAPI/passwd.pm
deleted file mode 100644
index 29606227d..000000000
--- a/FS/FS/ClientAPI/passwd.pm
+++ /dev/null
@@ -1,56 +0,0 @@
-package FS::ClientAPI::passwd;
-
-use strict;
-use FS::Record qw(qsearchs);
-use FS::svc_acct;
-#use FS::svc_domain;
-
-use FS::ClientAPI; #hmm
-FS::ClientAPI->register_handlers(
-  'passwd/passwd' => \&passwd,
-  'passwd/chfn' => \&chfn,
-  'passwd/chsh' => \&chsh,
-);
-
-sub passwd {
-  my $packet = shift;
-
-  #my $domain = qsearchs('svc_domain', { 'domain' => $packet->{'domain'} } )
-  #  or return { error => "Domain $domain not found" };
-
-  my $old_password = $packet->{'old_password'};
-  my $new_password = $packet->{'new_password'};
-  my $new_gecos = $packet->{'new_gecos'};
-  my $new_shell = $packet->{'new_shell'};
-
-#false laziness w/FS::ClientAPI::MyAccount::login (needs to handle encrypted pw)
-  my $svc_acct =
-    ( length($old_password) < 13
-      && qsearchs( 'svc_acct', { 'username'  => $packet->{'username'},
-                                 #'domsvc'    => $svc_domain->svcnum,
-                                 '_password' => $old_password } )
-    )
-    || qsearchs( 'svc_acct', { 'username'  => $packet->{'username'},
-                               #'domsvc'    => $svc_domain->svcnum,
-                               '_password' => $old_password } );
-
-  unless ( $svc_acct ) { return { error => 'Incorrect password.' } }
-
-  my %hash = $svc_acct->hash;
-  my $new_svc_acct = new FS::svc_acct ( \%hash );
-  $new_svc_acct->setfield('_password', $new_password ) 
-    if $new_password && $new_password ne $old_password;
-  $new_svc_acct->setfield('finger',$new_gecos) if $new_gecos;
-  $new_svc_acct->setfield('shell',$new_shell) if $new_shell;
-  my $error = $new_svc_acct->replace($svc_acct);
-
-  return { error => $error };
-
-}
-
-sub chfn {}
-
-sub chsh {}
-
-1;
-
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
deleted file mode 100644
index e93eaf3fc..000000000
--- a/FS/FS/Conf.pm
+++ /dev/null
@@ -1,972 +0,0 @@
-package FS::Conf;
-
-use vars qw($default_dir @config_items $DEBUG );
-use IO::File;
-use File::Basename;
-use FS::ConfItem;
-
-$DEBUG = 0;
-
-=head1 NAME
-
-FS::Conf - Freeside configuration values
-
-=head1 SYNOPSIS
-
-  use FS::Conf;
-
-  $conf = new FS::Conf "/config/directory";
-
-  $FS::Conf::default_dir = "/config/directory";
-  $conf = new FS::Conf;
-
-  $dir = $conf->dir;
-
-  $value = $conf->config('key');
-  @list  = $conf->config('key');
-  $bool  = $conf->exists('key');
-
-  $conf->touch('key');
-  $conf->set('key' => 'value');
-  $conf->delete('key');
-
-  @config_items = $conf->config_items;
-
-=head1 DESCRIPTION
-
-Read and write Freeside configuration values.  Keys currently map to filenames,
-but this may change in the future.
-
-=head1 METHODS
-
-=over 4
-
-=item new [ DIRECTORY ]
-
-Create a new configuration object.  A directory arguement is required if
-$FS::Conf::default_dir has not been set.
-
-=cut
-
-sub new {
-  my($proto,$dir) = @_;
-  my($class) = ref($proto) || $proto;
-  my($self) = { 'dir' => $dir || $default_dir } ;
-  bless ($self, $class);
-}
-
-=item dir
-
-Returns the directory.
-
-=cut
-
-sub dir {
-  my($self) = @_;
-  my $dir = $self->{dir};
-  -e $dir or die "FATAL: $dir doesn't exist!";
-  -d $dir or die "FATAL: $dir isn't a directory!";
-  -r $dir or die "FATAL: Can't read $dir!";
-  -x $dir or die "FATAL: $dir not searchable (executable)!";
-  $dir =~ /^(.*)$/;
-  $1;
-}
-
-=item config KEY
-
-Returns the configuration value or values (depending on context) for key.
-
-=cut
-
-sub config {
-  my($self,$file)=@_;
-  my($dir)=$self->dir;
-  my $fh = new IO::File "<$dir/$file" or return;
-  if ( wantarray ) {
-    map {
-      /^(.*)$/
-        or die "Illegal line (array context) in $dir/$file:\n$_\n";
-      $1;
-    } <$fh>;
-  } else {
-    <$fh> =~ /^(.*)$/
-      or die "Illegal line (scalar context) in $dir/$file:\n$_\n";
-    $1;
-  }
-}
-
-=item exists KEY
-
-Returns true if the specified key exists, even if the corresponding value
-is undefined.
-
-=cut
-
-sub exists {
-  my($self,$file)=@_;
-  my($dir) = $self->dir;
-  -e "$dir/$file";
-}
-
-=item touch KEY
-
-Creates the specified configuration key if it does not exist.
-
-=cut
-
-sub touch {
-  my($self, $file) = @_;
-  my $dir = $self->dir;
-  unless ( $self->exists($file) ) {
-    warn "[FS::Conf] TOUCH $file\n" if $DEBUG;
-    system('touch', "$dir/$file");
-  }
-}
-
-=item set KEY VALUE
-
-Sets the specified configuration key to the given value.
-
-=cut
-
-sub set {
-  my($self, $file, $value) = @_;
-  my $dir = $self->dir;
-  $value =~ /^(.*)$/s;
-  $value = $1;
-  unless ( join("\n", @{[ $self->config($file) ]}) eq $value ) {
-    warn "[FS::Conf] SET $file\n" if $DEBUG;
-#    warn "$dir" if is_tainted($dir);
-#    warn "$dir" if is_tainted($file);
-    chmod 0644, "$dir/$file";
-    my $fh = new IO::File ">$dir/$file" or return;
-    chmod 0644, "$dir/$file";
-    print $fh "$value\n";
-  }
-}
-#sub is_tainted {
-#             return ! eval { join('',@_), kill 0; 1; };
-#         }
-
-=item delete KEY
-
-Deletes the specified configuration key.
-
-=cut
-
-sub delete {
-  my($self, $file) = @_;
-  my $dir = $self->dir;
-  if ( $self->exists($file) ) {
-    warn "[FS::Conf] DELETE $file\n";
-    unlink "$dir/$file";
-  }
-}
-
-=item config_items
-
-Returns all of the possible configuration items as FS::ConfItem objects.  See
-L<FS::ConfItem>.
-
-=cut
-
-sub config_items {
-  my $self = shift; 
-  #quelle kludge
-  @config_items,
-  map { 
-        my $basename = basename($_);
-        $basename =~ /^(.*)$/;
-        $basename = $1;
-        new FS::ConfItem {
-                           'key'         => $basename,
-                           'section'     => 'billing',
-                           'description' => 'Alternate template file for invoices.  See the <a href="../docs/billing.html">billing documentation</a> for details.',
-                           'type'        => 'textarea',
-                         }
-      } glob($self->dir. '/invoice_template_*')
-  ;
-}
-
-=back
-
-=head1 BUGS
-
-If this was more than just crud that will never be useful outside Freeside I'd
-worry that config_items is freeside-specific and icky.
-
-=head1 SEE ALSO
-
-"Configuration" in the web interface (config/config.cgi).
-
-httemplate/docs/config.html
-
-=cut
-
-@config_items = map { new FS::ConfItem $_ } (
-
-  {
-    'key'         => 'address',
-    'section'     => 'deprecated',
-    'description' => 'This configuration option is no longer used.  See <a href="#invoice_template">invoice_template</a> instead.',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'alerter_template',
-    'section'     => 'billing',
-    'description' => 'Template file for billing method expiration alerts.  See the <a href="../docs/billing.html#invoice_template">billing documentation</a> for details.',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'apacheroot',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>www_shellcommands</i> <a href="../browse/part_export.cgi">export</a> instead.  The directory containing Apache virtual hosts',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'apacheip',
-    'section'     => 'apache',
-    'description' => 'The current IP address to assign to new virtual hosts',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'apachemachine',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>www_shellcommands</i> <a href="../browse/part_export.cgi">export</a> instead.  A machine with the apacheroot directory and user home directories.  The existance of this file enables setup of virtual host directories, and, in conjunction with the `home\' configuration file, symlinks into user home directories.',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'apachemachines',
-    'section'     => 'apache',
-    'description' => 'Your Apache machines, one per line.  This enables export of `/etc/apache/vhosts.conf\', which can be included in your Apache configuration via the <a href="http://www.apache.org/docs/mod/core.html#include">Include</a> directive.',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'bindprimary',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>bind</i> <a href="../browse/part_export.cgi">export</a> instead.  Your BIND primary nameserver.  This enables export of /var/named/named.conf and zone files into /var/named',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'bindsecondaries',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>bind_slave</i> <a href="../browse/part_export.cgi">export</a> instead.  Your BIND secondary nameservers, one per line.  This enables export of /var/named/named.conf',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'business-onlinepayment',
-    'section'     => 'billing',
-    'description' => '<a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a> support, at least three lines: processor, login, and password.  An optional fourth line specifies the action or actions (multiple actions are separated with `,\': for example: `Authorization Only, Post Authorization\').    Optional additional lines are passed to Business::OnlinePayment as %processor_options.',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'business-onlinepayment-description',
-    'section'     => 'billing',
-    'description' => 'String passed as the description field to <a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a>.  Evaluated as a double-quoted perl string, with the following variables available: <code>$agent</code> (the agent name), and <code>$pkgs</code> (a comma-separated list of packages to which the invoiced being charged applies)',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'bsdshellmachines',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>bsdshell</i> <a href="../browse/part_export.cgi">export</a> instead.  Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd\' and `/etc/master.passwd\'.',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'countrydefault',
-    'section'     => 'UI',
-    'description' => 'Default two-letter country code (if not supplied, the default is `US\')',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'cybercash3.2',
-    'section'     => 'billing',
-    'description' => '<a href="http://www.cybercash.com/cashregister/">CyberCash Cashregister v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly\' or `mauthcapture\').',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'cyrus',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>cyrus</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to integrate with <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a>, three lines: IMAP server, admin username, and admin password.  Cyrus::IMAP::Admin should be installed locally and the connection to the server secured.',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'cp_app',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>cp</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to integrate with <a href="http://www.cp.net/">Critial Path Account Provisioning Protocol</a>, four lines: "host:port", username, password, and workgroup (for new users).',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'deletecustomers',
-    'section'     => 'UI',
-    'description' => 'Enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that this customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers\' packages if they cancel service.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'deletepayments',
-    'section'     => 'UI',
-    'description' => 'Enable deletion of unclosed payments.  Be very careful!  Only delete payments that were data-entry errors, not adjustments. Optionally specify one or more comma-separated email addresses to be notified when a payment is deleted.',
-    'type'        => [qw( checkbox text )],
-  },
-
-  {
-    'key'         => 'dirhash',
-    'section'     => 'shell',
-    'description' => 'Optional numeric value to control directory hashing.  If positive, hashes directories for the specified number of levels from the front of the username.  If negative, hashes directories for the specified number of levels from the end of the username.  Some examples: <ul><li>1: user -> <a href="#home">/home</a>/u/user<li>2: user -> <a href="#home">/home</a>/u/s/user<li>-1: user -> <a href="#home">/home</a>/r/user<li>-2: user -> <a href="#home">home</a>/r/e/user</ul>',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'disable_customer_referrals',
-    'section'     => 'UI',
-    'description' => 'Disable new customer-to-customer referrals in the web interface',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'domain',
-    'section'     => 'deprecated',
-    'description' => 'Your domain name.',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'editreferrals',
-    'section'     => 'UI',
-    'description' => 'Enable advertising source modification for existing customers',
-    'type'       => 'checkbox',
-  },
-
-  {
-    'key'         => 'emailinvoiceonly',
-    'section'     => 'billing',
-    'description' => 'Disables postal mail invoices',
-    'type'       => 'checkbox',
-  },
-
-  {
-    'key'         => 'disablepostalinvoicedefault',
-    'section'     => 'billing',
-    'description' => 'Disables postal mail invoices as the default option in the UI.  Be careful not to setup customers which are not sent invoices.  See <a href ="#emailinvoiceauto">emailinvoiceauto</a>.',
-    'type'       => 'checkbox',
-  },
-
-  {
-    'key'         => 'emailinvoiceauto',
-    'section'     => 'billing',
-    'description' => 'Automatically adds new accounts to the email invoice list upon customer creation',
-    'type'       => 'checkbox',
-  },
-
-  {
-    'key'         => 'erpcdmachines',
-    'section'     => '',
-    'description' => 'Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd\' and `/usr/annex/acp_dialup\'',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'hidecancelledpackages',
-    'section'     => 'UI',
-    'description' => 'Prevent cancelled packages from showing up in listings (though they will still be in the database)',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'hidecancelledcustomers',
-    'section'     => 'UI',
-    'description' => 'Prevent customers with only cancelled packages from showing up in listings (though they will still be in the database)',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'home',
-    'section'     => 'required',
-    'description' => 'For new users, prefixed to username to create a directory name.  Should have a leading but not a trailing slash.',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'icradiusmachines',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add an <i>sqlradius</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to enable radcheck and radreply table population - by default in the Freeside database, or in the database specified by the <a href="http://rootwood.haze.st/aspside/config/config-view.cgi#icradius_secrets">icradius_secrets</a> config option (the radcheck and radreply tables needs to be created manually).  You do not need to use MySQL for your Freeside database to export to an ICRADIUS/FreeRADIUS MySQL database with this option.  <blockquote><b>ADDITIONAL DEPRECATED FUNCTIONALITY</b> (instead use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or point icradius_secrets to the external database) - your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines or <a href="http://www.freeradius.org/">FreeRADIUS</a> (with MySQL authentication) machines, one per line.  Machines listed in this file will have the radcheck table exported to them.  Each line should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: <CODE>"radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd"</CODE></blockquote>',
-    'type'        => [qw( checkbox textarea )],
-  },
-
-  {
-    'key'         => 'icradius_mysqldest',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add an <i>sqlradius</i> https://billing.crosswind.net/freeside/browse/part_export.cgi">export</a> instead.  Used to be the destination directory for the MySQL databases, on the ICRADIUS/FreeRADIUS machines.  Defaults to "/usr/local/var/".',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'icradius_mysqlsource',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add an <i>sqlradius</i> https://billing.crosswind.net/freeside/browse/part_export.cgi">export</a> instead.  Used to be the source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'icradius_secrets',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add an <i>sqlradius</i> https://billing.crosswind.net/freeside/browse/part_export.cgi">export</a> instead.  This option used to specify a database for ICRADIUS/FreeRADIUS export.  Three lines: DBI data source, username and password.',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'invoice_from',
-    'section'     => 'required',
-    'description' => 'Return address on email invoices',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'invoice_template',
-    'section'     => 'required',
-    'description' => 'Required template file for invoices.  See the <a href="../docs/billing.html">billing documentation</a> for details.',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'lpr',
-    'section'     => 'required',
-    'description' => 'Print command for paper invoices, for example `lpr -h\'',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'maildisablecatchall',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, now the default.  Turning this option on used to disable the requirement that each virtual domain have a catch-all mailbox.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'money_char',
-    'section'     => '',
-    'description' => 'Currency symbol - defaults to `$\'',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'mxmachines',
-    'section'     => 'deprecated',
-    'description' => 'MX entries for new domains, weight and machine, one per line, with trailing `.\'',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'nsmachines',
-    'section'     => 'deprecated',
-    'description' => 'NS nameservers for new domains, one per line, with trailing `.\'',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'defaultrecords',
-    'section'     => 'BIND',
-    'description' => 'DNS entries to add automatically when creating a domain',
-    'type'        => 'editlist',
-    'editlist_parts' => [ { type=>'text' },
-                          { type=>'immutable', value=>'IN' },
-                          { type=>'select',
-                            select_enum=>{ map { $_=>$_ } qw(A CNAME MX NS)} },
-                          { type=> 'text' }, ],
-  },
-
-  {
-    'key'         => 'arecords',
-    'section'     => 'deprecated',
-    'description' => 'A list of tab seperated CNAME records to add automatically when creating a domain',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'cnamerecords',
-    'section'     => 'deprecated',
-    'description' => 'A list of tab seperated CNAME records to add automatically when creating a domain',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'nismachines',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>.  Your NIS master (not slave master) machines, one per line.  This enables export of `/etc/global/passwd\' and `/etc/global/shadow\'.',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'passwordmin',
-    'section'     => 'password',
-    'description' => 'Minimum password length (default 6)',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'passwordmax',
-    'section'     => 'password',
-    'description' => 'Maximum password length (default 8) (don\'t set this over 12 if you need to import or export crypt() passwords)',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'qmailmachines',
-    'section'     => 'mail',
-    'description' => 'Your qmail machines, one per line.  This enables export of `/var/qmail/control/virtualdomains\', `/var/qmail/control/recipientmap\', and `/var/qmail/control/rcpthosts\'.  Setting this option (even if empty) also turns on user `.qmail-extension\' file maintenance in conjunction with the <b>shellmachine</b> option.',
-    'type'        => [qw( checkbox textarea )],
-  },
-
-  {
-    'key'         => 'radiusmachines',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add an <i>sqlradius</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to export to be: your RADIUS authentication machines, one per line.  This enables export of `/etc/raddb/users\'.',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'referraldefault',
-    'section'     => 'UI',
-    'description' => 'Default referral, specified by refnum',
-    'type'        => 'text',
-  },
-
-#  {
-#    'key'         => 'registries',
-#    'section'     => 'required',
-#    'description' => 'Directory which contains domain registry information.  Each registry is a directory.',
-#  },
-
-  {
-    'key'         => 'report_template',
-    'section'     => 'required',
-    'description' => 'Required template file for reports.  See the <a href="../docs/billing.html">billing documentation</a> for details.',
-    'type'        => 'textarea',
-  },
-
-
-  {
-    'key'         => 'maxsearchrecordsperpage',
-    'section'     => 'UI',
-    'description' => 'If set, number of search records to return per page.',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'sendmailconfigpath',
-    'section'     => 'mail',
-    'description' => 'Sendmail configuration file path.  Defaults to `/etc\'.  Many newer distributions use `/etc/mail\'.',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'sendmailmachines',
-    'section'     => 'mail',
-    'description' => 'Your sendmail machines, one per line.  This enables export of `/etc/virtusertable\' and `/etc/sendmail.cw\'.',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'sendmailrestart',
-    'section'     => 'mail',
-    'description' => 'If defined, the command which is run on sendmail machines after files are copied.',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'session-start',
-    'section'     => 'session',
-    'description' => 'If defined, the command which is executed on the Freeside machine when a session begins.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'session-stop',
-    'section'     => 'session',
-    'description' => 'If defined, the command which is executed on the Freeside machine when a session ends.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'shellmachine',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>shellcommands</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain a single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines\', it also enables `.qmail-extension\' file maintenance.',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'shellmachine-useradd',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>shellcommands</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain command(s) to run on shellmachine when an account is created.  If the <b>shellmachine</b> option is set but this option is not, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If this option is set but empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.',
-    'type'        => [qw( checkbox text )],
-  },
-
-  {
-    'key'         => 'shellmachine-userdel',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>shellcommands</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain command(s) to run on shellmachine when an account is deleted.  If the <b>shellmachine</b> option is set but this option is not, <code>userdel $username</code> is the default.  If this option is set but empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.',
-    'type'        => [qw( checkbox text )],
-  },
-
-  {
-    'key'         => 'shellmachine-usermod',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>shellcommands</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain command(s) to run on shellmachine when an account is modified.  If the <b>shellmachine</b> option is set but this option is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.',
-    #'type'        => [qw( checkbox text )],
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'shellmachines',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>sysvshell</i> <a href="../browse/part_export.cgi">export</a> instead.  Your Linux and System V flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd\' and `/etc/shadow\' files.',
-     'type'        => 'textarea',
- },
-
-  {
-    'key'         => 'shells',
-    'section'     => 'required',
-    'description' => 'Legal shells (think /etc/shells).  You probably want to `cut -d: -f7 /etc/passwd | sort | uniq\' initially so that importing doesn\'t fail with `Illegal shell\' errors, then remove any special entries afterwords.  A blank line specifies that an empty shell is permitted.',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'showpasswords',
-    'section'     => 'UI',
-    'description' => 'Display unencrypted user passwords in the web interface',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'signupurl',
-    'section'     => 'UI',
-    'description' => 'if you are using customer-to-customer referrals, and you enter the URL of your <a href="../docs/signup.html">signup server CGI</a>, the customer view screen will display a customized link to the signup server with the appropriate customer as referral',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'smtpmachine',
-    'section'     => 'required',
-    'description' => 'SMTP relay for Freeside\'s outgoing mail',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'soadefaultttl',
-    'section'     => 'BIND',
-    'description' => 'SOA default TTL for new domains.',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'soaemail',
-    'section'     => 'BIND',
-    'description' => 'SOA email for new domains, in BIND form (`.\' instead of `@\'), with trailing `.\'',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'soaexpire',
-    'section'     => 'BIND',
-    'description' => 'SOA expire for new domains',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'soamachine',
-    'section'     => 'BIND',
-    'description' => 'SOA machine for new domains, with trailing `.\'',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'soarefresh',
-    'section'     => 'BIND',
-    'description' => 'SOA refresh for new domains',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'soaretry',
-    'section'     => 'BIND',
-    'description' => 'SOA retry for new domains',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'statedefault',
-    'section'     => 'UI',
-    'description' => 'Default state or province (if not supplied, the default is `CA\')',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'radiusprepend',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, real-time text radius now edits an existing file in place - just (turn off freeside-queued and) edit your RADIUS users file directly.  The contents used to be be prepended to the top of the RADIUS users file (text exports only).',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'textradiusprepend',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, use RADIUS check attributes instead.  The contents used to be prepended to the first line of a user\'s RADIUS entry in text exports.',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'unsuspendauto',
-    'section'     => 'billing',
-    'description' => 'Enables the automatic unsuspension of suspended packages when a customer\'s balance due changes from positive to zero or negative as the result of a payment or credit',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'usernamemin',
-    'section'     => 'username',
-    'description' => 'Minimum username length (default 2)',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'usernamemax',
-    'section'     => 'username',
-    'description' => 'Maximum username length',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'username-ampersand',
-    'section'     => 'username',
-    'description' => 'Allow the ampersand character (&amp;) in usernames.  Be careful when using this option in conjunction with <a href="#shellmachine-useradd">shellmachine-useradd</a> and other configuration options which execute shell commands, as the ampersand will be interpreted by the shell if not quoted.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'username-letter',
-    'section'     => 'username',
-    'description' => 'Usernames must contain at least one letter',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'username-letterfirst',
-    'section'     => 'username',
-    'description' => 'Usernames must start with a letter',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'username-noperiod',
-    'section'     => 'username',
-    'description' => 'Disallow periods in usernames',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'username-nounderscore',
-    'section'     => 'username',
-    'description' => 'Disallow underscores in usernames',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'username-nodash',
-    'section'     => 'username',
-    'description' => 'Disallow dashes in usernames',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'username-uppercase',
-    'section'     => 'username',
-    'description' => 'Allow uppercase characters in usernames',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'username_policy',
-    'section'     => '',
-    'description' => 'This file controls the mechanism for preventing duplicate usernames in passwd/radius files exported from svc_accts.  This should be one of \'prepend domsvc\' \'append domsvc\' \'append domain\' or \'append @domain\'',
-    'type'        => 'select',
-    'select_enum' => [ 'prepend domsvc', 'append domsvc', 'append domain', 'append @domain' ],
-    #'type'        => 'text',
-  },
-
-  {
-    'key'         => 'vpopmailmachines',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>cp</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain your vpopmail pop toasters, one per line.  Each line is of the form "machinename vpopdir vpopuid vpopgid".  For example: <code>poptoaster.domain.tld /home/vpopmail 508 508</code>  Note: vpopuid and vpopgid are values taken from the vpopmail machine\'s /etc/passwd',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'vpopmailrestart',
-    'section'     => 'mail',
-    'description' => 'If defined, the shell commands to run on vpopmail machines after files are copied.  An example can be found in eg/vpopmailrestart of the source distribution.',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'safe-part_pkg',
-    'section'     => 'UI',
-    'description' => 'Validates package definition setup and recur expressions against a preset list.  Useful for webdemos, annoying to powerusers.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'safe-part_bill_event',
-    'section'     => 'UI',
-    'description' => 'Validates invoice event expressions against a preset list.  Useful for webdemos, annoying to powerusers.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'show_ss',
-    'section'     => 'UI',
-    'description' => 'Turns on display/collection of SS# in the web interface.',
-    'type'        => 'checkbox',
-  },
-
-  { 
-    'key'         => 'agent_defaultpkg',
-    'section'     => 'UI',
-    'description' => 'Setting this option will cause new packages to be available to all agent types by default.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'legacy_link',
-    'section'     => 'UI',
-    'description' => 'Display options in the web interface to link legacy pre-Freeside services.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'queue_dangerous_controls',
-    'section'     => 'UI',
-    'description' => 'Enable queue modification controls on account pages and for new jobs.  Unless you are a developer working on new export code, you should probably leave this off to avoid causing provisioning problems.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'security_phrase',
-    'section'     => 'password',
-    'description' => 'Enable the tracking of a "security phrase" with each account.  Not recommended, as it is vulnerable to social engineering.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'locale',
-    'section'     => 'UI',
-    'description' => 'Message locale',
-    'type'        => 'select',
-    'select_enum' => [ qw(en_US) ],
-  },
-
-  {
-    'key'         => 'signup_server-payby',
-    'section'     => '',
-    'description' => 'Acceptable payment types for the signup server',
-    'type'        => 'selectmultiple',
-    'select_enum' => [ qw(CARD PREPAY BILL COMP) ],
-  },
-
-  {
-    'key'         => 'signup_server-email',
-    'section'     => '',
-    'description' => 'Comma-separated list of email addresses to receive notification of signups via the signup server.',
-    'type'        => 'text',
-  },
-
-
-  {
-    'key'         => 'show-msgcat-codes',
-    'section'     => 'UI',
-    'description' => 'Show msgcat codes in error messages.  Turn this option on before reporting errors to the mailing list.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'signup_server-realtime',
-    'section'     => '',
-    'description' => 'Run billing for signup server signups immediately, and suspend accounts which subsequently have a balance.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'declinetemplate',
-    'section'     => 'billing',
-    'description' => 'Template file for credit card decline emails.',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'emaildecline',
-    'section'     => 'billing',
-    'description' => 'Enable emailing of credit card decline notices.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'require_cardname',
-    'section'     => 'billing',
-    'description' => 'Require an "Exact name on card" to be entered explicitly; don\'t default to using the first and last name.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'enable_taxclasses',
-    'section'     => 'billing',
-    'description' => 'Enable per-package tax classes',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'welcome_email',
-    'section'     => '',
-    'description' => 'Template file for welcome email.  Welcome emails are sent to the customer email invoice destination(s) each time a svc_acct record is created.  See the <a href="http://search.cpan.org/doc/MJD/Text-Template-1.42/Template.pm">Text::Template</a> documentation for details on the template substitution language.  The following variables are available: <code>$username</code>, <code>$password</code>, <code>$first</code>, <code>$last</code> and <code>$pkg</code>.',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'welcome_email-from',
-    'section'     => '',
-    'description' => 'From: address header for welcome email',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'welcome_email-subject',
-    'section'     => '',
-    'description' => 'Subject: header for welcome email',
-    'type'        => 'text',
-  },
-  
-  {
-    'key'         => 'welcome_email-mimetype',
-    'section'     => '',
-    'description' => 'MIME type for welcome email',
-    'type'        => 'select',
-    'select_enum' => [ 'text/plain', 'text/html' ],
-  },
-
-);
-
-1;
-
diff --git a/FS/FS/ConfItem.pm b/FS/FS/ConfItem.pm
deleted file mode 100644
index 83295b4fa..000000000
--- a/FS/FS/ConfItem.pm
+++ /dev/null
@@ -1,63 +0,0 @@
-package FS::ConfItem;
-
-=head1 NAME
-
-FS::ConfItem - Configutaion option meta-data.
-
-=head1 SYNOPSIS
-
-  use FS::Conf;
-  @config_items = $conf->config_items;
-
-  foreach $item ( @config_items ) {
-    $key = $item->key;
-    $section = $item->section;
-    $description = $item->description;
-  }
-
-=head1 DESCRIPTION
-
-=head1 METHODS
-
-=over 4
-
-=item new
-
-=cut
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = @_ ? shift : {};
-  bless ($self, $class);
-}
-
-=item key
-
-=item section
-
-=item description
-
-=cut
-
-sub AUTOLOAD {
-  my $self = shift;
-  my $field = $AUTOLOAD;
-  $field =~ s/.*://;
-  $self->{$field};
-}
-
-=back
-
-=head1 BUGS
-
-Terse docs.
-
-=head1 SEE ALSO
-
-L<FS::Conf>
-
-=cut
-
-1;
-
diff --git a/FS/FS/InitHandler.pm b/FS/FS/InitHandler.pm
deleted file mode 100644
index 87f507c22..000000000
--- a/FS/FS/InitHandler.pm
+++ /dev/null
@@ -1,88 +0,0 @@
-package FS::InitHandler;
-
-use strict;
-use vars qw($DEBUG);
-use FS::UID qw(adminsuidsetup);
-use FS::Record;
-
-$DEBUG = 1;
-
-sub handler {
-
-  use Date::Format;
-  use Date::Parse;
-  use Tie::IxHash;
-  use HTML::Entities;
-  use IO::Handle;
-  use IO::File;
-  use String::Approx;
-  use HTML::Widgets::SelectLayers 0.02;
-  #use FS::UID;
-  #use FS::Record;
-  use FS::Conf;
-  use FS::CGI;
-  use FS::Msgcat;
-  
-  use FS::agent;
-  use FS::agent_type;
-  use FS::domain_record;
-  use FS::cust_bill;
-  use FS::cust_bill_pay;
-  use FS::cust_credit;
-  use FS::cust_credit_bill;
-  use FS::cust_main;
-  use FS::cust_main_county;
-  use FS::cust_pay;
-  use FS::cust_pkg;
-  use FS::cust_refund;
-  use FS::cust_svc;
-  use FS::nas;
-  use FS::part_bill_event;
-  use FS::part_pkg;
-  use FS::part_referral;
-  use FS::part_svc;
-  use FS::pkg_svc;
-  use FS::port;
-  use FS::queue;
-  use FS::raddb;
-  use FS::session;
-  use FS::svc_acct;
-  use FS::svc_acct_pop;
-  use FS::svc_acct_sm;
-  use FS::svc_domain;
-  use FS::svc_forward;
-  use FS::svc_www;
-  use FS::type_pkgs;
-  use FS::part_export;
-  use FS::part_export_option;
-  use FS::export_svc;
-  use FS::msgcat;
-
-  warn "[FS::InitHandler] handler called\n" if $DEBUG;
-
-  #this is sure to be broken on freebsd
-  $> = $FS::UID::freeside_uid;
-
-  open(MAPSECRETS,"<$FS::UID::conf_dir/mapsecrets")
-    or die "can't read $FS::UID::conf_dir/mapsecrets: $!";
-
-  my %seen;
-  while (<MAPSECRETS>) {
-    next if /^\s*(#|$)/;
-    /^([\w\-\.]+)\s(.*)$/
-      or do { warn "strange line in mapsecrets: $_"; next; };
-    my($user, $datasrc) = ($1, $2);
-    next if $seen{$datasrc}++;
-    warn "[FS::InitHandler] preloading $datasrc for $user\n" if $DEBUG;
-    adminsuidsetup($user);
-  }
-
-  close MAPSECRETS;
-
-  #lalala probably broken on freebsd
-  ($<, $>) = ($>, $<);
-  $< = 0;
-
-}
-
-1;
diff --git a/FS/FS/Msgcat.pm b/FS/FS/Msgcat.pm
deleted file mode 100644
index 625743dc0..000000000
--- a/FS/FS/Msgcat.pm
+++ /dev/null
@@ -1,98 +0,0 @@
-package FS::Msgcat;
-
-use strict;
-use vars qw( @ISA @EXPORT_OK $conf $locale $debug );
-use Exporter;
-use FS::UID;
-#use FS::Record qw( qsearchs ); # wtf?  won't import...
-use FS::Record;
-use FS::Conf;
-use FS::msgcat;
-
-@ISA = qw(Exporter);
-@EXPORT_OK = qw( gettext geterror );
-
-$FS::UID::callback{'Msgcat'} = sub {
-  $conf = new FS::Conf;
-  $locale = $conf->config('locale') || 'en_US';
-  $debug = $conf->exists('show-msgcat-codes')
-};
-
-=head1 NAME
-
-FS::Msgcat - Message catalog functions
-
-=head1 SYNOPSIS
-
-  use FS::Msgcat qw(gettext geterror);
-
-  #simple interface for retreiving messages...
-  $message = gettext('msgcode');
-  #or errors (includes the error code)
-  $message = geterror('msgcode');
-
-=head1 DESCRIPTION
-
-FS::Msgcat provides functions to use the message catalog.  If you want to
-maintain the message catalog database, see L<FS::msgcat> instead.
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item gettext MSGCODE
-
-Returns the full message for the supplied message code.
-
-=cut
-
-sub gettext {
-  $debug ? geterror(@_) : _gettext(@_);
-}
-
-sub _gettext {
-  my $msgcode = shift;
-  my $msgcat = FS::Record::qsearchs('msgcat', {
-    'msgcode' => $msgcode,
-    'locale' => $locale
-  } );
-  if ( $msgcat ) {
-    $msgcat->msg;
-  } else {
-    warn "WARNING: message for msgcode $msgcode in locale $locale not found";
-    $msgcode;
-  }
-
-}
-
-=item geterror MSGCODE
-
-Returns the full message for the supplied message code, including the message
-code.
-
-=cut
-
-sub geterror {
-  my $msgcode = shift;
-  my $msg = _gettext($msgcode);
-  if ( $msg eq $msgcode ) {
-    "Error code $msgcode (message for locale $locale not found)";
-  } else {
-    "$msg (error code $msgcode)";
-  }
-}
-
-=back
-
-=head1 BUGS
-
-i18n/l10n, eek
-
-=head1 SEE ALSO
-
-L<FS::msgcat>, L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
deleted file mode 100644
index e6126a13b..000000000
--- a/FS/FS/Record.pm
+++ /dev/null
@@ -1,1258 +0,0 @@
-package FS::Record;
-
-use strict;
-use vars qw( $dbdef_file $dbdef $setup_hack $AUTOLOAD @ISA @EXPORT_OK $DEBUG
-             $me %dbdef_cache );
-use subs qw(reload_dbdef);
-use Exporter;
-use Carp qw(carp cluck croak confess);
-use File::CounterFile;
-use Locale::Country;
-use DBI qw(:sql_types);
-use DBIx::DBSchema 0.19;
-use FS::UID qw(dbh checkruid getotaker datasrc driver_name);
-use FS::SearchCache;
-use FS::Msgcat qw(gettext);
-
-@ISA = qw(Exporter);
-@EXPORT_OK = qw(dbh fields hfields qsearch qsearchs dbdef jsearch);
-
-$DEBUG = 0;
-$me = '[FS::Record]';
-
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::Record'} = sub { 
-  $File::CounterFile::DEFAULT_DIR = "/usr/local/etc/freeside/counters.". datasrc;
-  $dbdef_file = "/usr/local/etc/freeside/dbdef.". datasrc;
-  &reload_dbdef unless $setup_hack; #$setup_hack needed now?
-};
-
-=head1 NAME
-
-FS::Record - Database record objects
-
-=head1 SYNOPSIS
-
-    use FS::Record;
-    use FS::Record qw(dbh fields qsearch qsearchs dbdef);
-
-    $record = new FS::Record 'table', \%hash;
-    $record = new FS::Record 'table', { 'column' => 'value', ... };
-
-    $record  = qsearchs FS::Record 'table', \%hash;
-    $record  = qsearchs FS::Record 'table', { 'column' => 'value', ... };
-    @records = qsearch  FS::Record 'table', \%hash; 
-    @records = qsearch  FS::Record 'table', { 'column' => 'value', ... };
-
-    $table = $record->table;
-    $dbdef_table = $record->dbdef_table;
-
-    $value = $record->get('column');
-    $value = $record->getfield('column');
-    $value = $record->column;
-
-    $record->set( 'column' => 'value' );
-    $record->setfield( 'column' => 'value' );
-    $record->column('value');
-
-    %hash = $record->hash;
-
-    $hashref = $record->hashref;
-
-    $error = $record->insert;
-    #$error = $record->add; #deprecated
-
-    $error = $record->delete;
-    #$error = $record->del; #deprecated
-
-    $error = $new_record->replace($old_record);
-    #$error = $new_record->rep($old_record); #deprecated
-
-    $value = $record->unique('column');
-
-    $error = $record->ut_float('column');
-    $error = $record->ut_number('column');
-    $error = $record->ut_numbern('column');
-    $error = $record->ut_money('column');
-    $error = $record->ut_text('column');
-    $error = $record->ut_textn('column');
-    $error = $record->ut_alpha('column');
-    $error = $record->ut_alphan('column');
-    $error = $record->ut_phonen('column');
-    $error = $record->ut_anything('column');
-    $error = $record->ut_name('column');
-
-    $dbdef = reload_dbdef;
-    $dbdef = reload_dbdef "/non/standard/filename";
-    $dbdef = dbdef;
-
-    $quoted_value = _quote($value,'table','field');
-
-    #depriciated
-    $fields = hfields('table');
-    if ( $fields->{Field} ) { # etc.
-
-    @fields = fields 'table'; #as a subroutine
-    @fields = $record->fields; #as a method call
-
-
-=head1 DESCRIPTION
-
-(Mostly) object-oriented interface to database records.  Records are currently
-implemented on top of DBI.  FS::Record is intended as a base class for
-table-specific classes to inherit from, i.e. FS::cust_main.
-
-=head1 CONSTRUCTORS
-
-=over 4
-
-=item new [ TABLE, ] HASHREF
-
-Creates a new record.  It doesn't store it in the database, though.  See
-L<"insert"> for that.
-
-Note that the object stores this hash reference, not a distinct copy of the
-hash it points to.  You can ask the object for a copy with the I<hash> 
-method.
-
-TABLE can only be omitted when a dervived class overrides the table method.
-
-=cut
-
-sub new { 
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = {};
-  bless ($self, $class);
-
-  unless ( defined ( $self->table ) ) {
-    $self->{'Table'} = shift;
-    carp "warning: FS::Record::new called with table name ". $self->{'Table'};
-  }
-
-  my $hashref = $self->{'Hash'} = shift;
-
-  foreach my $field ( grep !defined($hashref->{$_}), $self->fields ) { 
-    $hashref->{$field}='';
-  }
-
-  $self->_cache($hashref, shift) if $self->can('_cache') && @_;
-
-  $self;
-}
-
-sub new_or_cached {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = {};
-  bless ($self, $class);
-
-  $self->{'Table'} = shift unless defined ( $self->table );
-
-  my $hashref = $self->{'Hash'} = shift;
-  my $cache = shift;
-  if ( defined( $cache->cache->{$hashref->{$cache->key}} ) ) {
-    my $obj = $cache->cache->{$hashref->{$cache->key}};
-    $obj->_cache($hashref, $cache) if $obj->can('_cache');
-    $obj;
-  } else {
-    $cache->cache->{$hashref->{$cache->key}} = $self->new($hashref, $cache);
-  }
-
-}
-
-sub create {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = {};
-  bless ($self, $class);
-  if ( defined $self->table ) {
-    cluck "create constructor is depriciated, use new!";
-    $self->new(@_);
-  } else {
-    croak "FS::Record::create called (not from a subclass)!";
-  }
-}
-
-=item qsearch TABLE, HASHREF, SELECT, EXTRA_SQL, CACHE_OBJ
-
-Searches the database for all records matching (at least) the key/value pairs
-in HASHREF.  Returns all the records found as `FS::TABLE' objects if that
-module is loaded (i.e. via `use FS::cust_main;'), otherwise returns FS::Record
-objects.
-
-###oops, argh, FS::Record::new only lets us create database fields.
-#Normal behaviour if SELECT is not specified is `*', as in
-#C<SELECT * FROM table WHERE ...>.  However, there is an experimental new
-#feature where you can specify SELECT - remember, the objects returned,
-#although blessed into the appropriate `FS::TABLE' package, will only have the
-#fields you specify.  This might have unwanted results if you then go calling
-#regular FS::TABLE methods
-#on it.
-
-=cut
-
-sub qsearch {
-  my($stable, $record, $select, $extra_sql, $cache ) = @_;
-  #$stable =~ /^([\w\_]+)$/ or die "Illegal table: $table";
-  #for jsearch
-  $stable =~ /^([\w\s\(\)\.\,\=]+)$/ or die "Illegal table: $stable";
-  $stable = $1;
-  $select ||= '*';
-  my $dbh = dbh;
-
-  my $table = $cache ? $cache->table : $stable;
-
-  my @fields = grep exists($record->{$_}), fields($table);
-
-  my $statement = "SELECT $select FROM $stable";
-  if ( @fields ) {
-    $statement .= ' WHERE '. join(' AND ', map {
-
-      my $op = '=';
-      if ( ref($record->{$_}) ) {
-        $op = $record->{$_}{'op'} if $record->{$_}{'op'};
-        $op = 'LIKE' if $op =~ /^ILIKE$/i && driver_name !~ /^Pg$/i;
-        $record->{$_} = $record->{$_}{'value'}
-      }
-
-      if ( ! defined( $record->{$_} ) || $record->{$_} eq '' ) {
-        if ( $op eq '=' ) {
-          if ( driver_name =~ /^Pg$/i ) {
-            qq-( $_ IS NULL OR $_ = '' )-;
-          } else {
-            qq-( $_ IS NULL OR $_ = "" )-;
-          }
-        } elsif ( $op eq '!=' ) {
-          if ( driver_name =~ /^Pg$/i ) {
-            qq-( $_ IS NOT NULL AND $_ != '' )-;
-          } else {
-            qq-( $_ IS NOT NULL AND $_ != "" )-;
-          }
-        } else {
-          if ( driver_name =~ /^Pg$/i ) {
-            qq-( $_ $op '' )-;
-          } else {
-            qq-( $_ $op "" )-;
-          }
-        }
-      } else {
-        "$_ $op ?";
-      }
-    } @fields );
-  }
-  $statement .= " $extra_sql" if defined($extra_sql);
-
-  warn "[debug]$me $statement\n" if $DEBUG > 1;
-  my $sth = $dbh->prepare($statement)
-    or croak "$dbh->errstr doing $statement";
-
-  my $bind = 1;
-
-  foreach my $field (
-    grep defined( $record->{$_} ) && $record->{$_} ne '', @fields
-  ) {
-    if ( $record->{$field} =~ /^\d+(\.\d+)?$/
-         && $dbdef->table($table)->column($field)->type =~ /(int)/i
-    ) {
-      $sth->bind_param($bind++, $record->{$field}, { TYPE => SQL_INTEGER } );
-    } else {
-      $sth->bind_param($bind++, $record->{$field}, { TYPE => SQL_VARCHAR } );
-    }
-  }
-
-#  $sth->execute( map $record->{$_},
-#    grep defined( $record->{$_} ) && $record->{$_} ne '', @fields
-#  ) or croak "Error executing \"$statement\": ". $sth->errstr;
-
-  $sth->execute or croak "Error executing \"$statement\": ". $sth->errstr;
-
-  $dbh->commit or croak $dbh->errstr if $FS::UID::AutoCommit;
-
-  if ( eval 'scalar(@FS::'. $table. '::ISA);' ) {
-    if ( eval 'FS::'. $table. '->can(\'new\')' eq \&new ) {
-      #derivied class didn't override new method, so this optimization is safe
-      if ( $cache ) {
-        map {
-          new_or_cached( "FS::$table", { %{$_} }, $cache )
-        } @{$sth->fetchall_arrayref( {} )};
-      } else {
-        map {
-          new( "FS::$table", { %{$_} } )
-        } @{$sth->fetchall_arrayref( {} )};
-      }
-    } else {
-      warn "untested code (class FS::$table uses custom new method)";
-      map {
-        eval 'FS::'. $table. '->new( { %{$_} } )';
-      } @{$sth->fetchall_arrayref( {} )};
-    }
-  } else {
-    cluck "warning: FS::$table not loaded; returning FS::Record objects";
-    map {
-      FS::Record->new( $table, { %{$_} } );
-    } @{$sth->fetchall_arrayref( {} )};
-  }
-
-}
-
-=item jsearch TABLE, HASHREF, SELECT, EXTRA_SQL, PRIMARY_TABLE, PRIMARY_KEY
-
-Experimental JOINed search method.  Using this method, you can execute a
-single SELECT spanning multiple tables, and cache the results for subsequent
-method calls.  Interface will almost definately change in an incompatible
-fashion.
-
-Arguments: 
-
-=cut
-
-sub jsearch {
-  my($table, $record, $select, $extra_sql, $ptable, $pkey ) = @_;
-  my $cache = FS::SearchCache->new( $ptable, $pkey );
-  my %saw;
-  ( $cache,
-    grep { !$saw{$_->getfield($pkey)}++ }
-      qsearch($table, $record, $select, $extra_sql, $cache )
-  );
-}
-
-=item qsearchs TABLE, HASHREF
-
-Same as qsearch, except that if more than one record matches, it B<carp>s but
-returns the first.  If this happens, you either made a logic error in asking
-for a single item, or your data is corrupted.
-
-=cut
-
-sub qsearchs { # $result_record = &FS::Record:qsearchs('table',\%hash);
-  my(@result) = qsearch(@_);
-  carp "warning: Multiple records in scalar search!" if scalar(@result) > 1;
-    #should warn more vehemently if the search was on a primary key?
-  scalar(@result) ? ($result[0]) : ();
-}
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item table
-
-Returns the table name.
-
-=cut
-
-sub table {
-#  cluck "warning: FS::Record::table depriciated; supply one in subclass!";
-  my $self = shift;
-  $self -> {'Table'};
-}
-
-=item dbdef_table
-
-Returns the DBIx::DBSchema::Table object for the table.
-
-=cut
-
-sub dbdef_table {
-  my($self)=@_;
-  my($table)=$self->table;
-  $dbdef->table($table);
-}
-
-=item get, getfield COLUMN
-
-Returns the value of the column/field/key COLUMN.
-
-=cut
-
-sub get {
-  my($self,$field) = @_;
-  # to avoid "Use of unitialized value" errors
-  if ( defined ( $self->{Hash}->{$field} ) ) {
-    $self->{Hash}->{$field};
-  } else { 
-    '';
-  }
-}
-sub getfield {
-  my $self = shift;
-  $self->get(@_);
-}
-
-=item set, setfield COLUMN, VALUE
-
-Sets the value of the column/field/key COLUMN to VALUE.  Returns VALUE.
-
-=cut
-
-sub set { 
-  my($self,$field,$value) = @_;
-  $self->{'Hash'}->{$field} = $value;
-}
-sub setfield {
-  my $self = shift;
-  $self->set(@_);
-}
-
-=item AUTLOADED METHODS
-
-$record->column is a synonym for $record->get('column');
-
-$record->column('value') is a synonym for $record->set('column','value');
-
-=cut
-
-# readable/safe
-sub AUTOLOAD {
-  my($self,$value)=@_;
-  my($field)=$AUTOLOAD;
-  $field =~ s/.*://;
-  if ( defined($value) ) {
-    confess "errant AUTOLOAD $field for $self (arg $value)"
-      unless $self->can('setfield');
-    $self->setfield($field,$value);
-  } else {
-    confess "errant AUTOLOAD $field for $self (no args)"
-      unless $self->can('getfield');
-    $self->getfield($field);
-  }    
-}
-
-# efficient
-#sub AUTOLOAD {
-#  my $field = $AUTOLOAD;
-#  $field =~ s/.*://;
-#  if ( defined($_[1]) ) {
-#    $_[0]->setfield($field, $_[1]);
-#  } else {
-#    $_[0]->getfield($field);
-#  }    
-#}
-
-=item hash
-
-Returns a list of the column/value pairs, usually for assigning to a new hash.
-
-To make a distinct duplicate of an FS::Record object, you can do:
-
-    $new = new FS::Record ( $old->table, { $old->hash } );
-
-=cut
-
-sub hash {
-  my($self) = @_;
-  %{ $self->{'Hash'} }; 
-}
-
-=item hashref
-
-Returns a reference to the column/value hash.
-
-=cut
-
-sub hashref {
-  my($self) = @_;
-  $self->{'Hash'};
-}
-
-=item insert
-
-Inserts this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-sub insert {
-  my $self = shift;
-
-  my $error = $self->check;
-  return $error if $error;
-
-  #single-field unique keys are given a value if false
-  #(like MySQL's AUTO_INCREMENT)
-  foreach ( $self->dbdef_table->unique->singles ) {
-    $self->unique($_) unless $self->getfield($_);
-  }
-  #and also the primary key
-  my $primary_key = $self->dbdef_table->primary_key;
-  $self->unique($primary_key) 
-    if $primary_key && ! $self->getfield($primary_key);
-
-  #false laziness w/delete
-  my @fields =
-    grep defined($self->getfield($_)) && $self->getfield($_) ne "",
-    $self->fields
-  ;
-  my @values = map { _quote( $self->getfield($_), $self->table, $_) } @fields;
-  #eslaf
-
-  my $statement = "INSERT INTO ". $self->table. " ( ".
-      join( ', ', @fields ).
-    ") VALUES (".
-      join( ', ', @values ).
-    ")"
-  ;
-  warn "[debug]$me $statement\n" if $DEBUG > 1;
-  my $sth = dbh->prepare($statement) or return dbh->errstr;
-
-  my $h_sth;
-  if ( defined $dbdef->table('h_'. $self->table) ) {
-    my $h_statement = $self->_h_statement('insert');
-    warn "[debug]$me $h_statement\n" if $DEBUG > 2;
-    $h_sth = dbh->prepare($h_statement) or return dbh->errstr;
-  } else {
-    $h_sth = '';
-  }
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE'; 
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  $sth->execute or return $sth->errstr;
-  $h_sth->execute or return $h_sth->errstr if $h_sth;
-  dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
-
-  '';
-}
-
-=item add
-
-Depriciated (use insert instead).
-
-=cut
-
-sub add {
-  cluck "warning: FS::Record::add depriciated!";
-  insert @_; #call method in this scope
-}
-
-=item delete
-
-Delete this record from the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-sub delete {
-  my $self = shift;
-
-  my $statement = "DELETE FROM ". $self->table. " WHERE ". join(' AND ',
-    map {
-      $self->getfield($_) eq ''
-        #? "( $_ IS NULL OR $_ = \"\" )"
-        ? ( driver_name =~ /^Pg$/i
-              ? "$_ IS NULL"
-              : "( $_ IS NULL OR $_ = \"\" )"
-          )
-        : "$_ = ". _quote($self->getfield($_),$self->table,$_)
-    } ( $self->dbdef_table->primary_key )
-          ? ( $self->dbdef_table->primary_key)
-          : $self->fields
-  );
-  warn "[debug]$me $statement\n" if $DEBUG > 1;
-  my $sth = dbh->prepare($statement) or return dbh->errstr;
-
-  my $h_sth;
-  if ( defined $dbdef->table('h_'. $self->table) ) {
-    my $h_statement = $self->_h_statement('delete');
-    warn "[debug]$me $h_statement\n" if $DEBUG > 2;
-    $h_sth = dbh->prepare($h_statement) or return dbh->errstr;
-  } else {
-    $h_sth = '';
-  }
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE'; 
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $rc = $sth->execute or return $sth->errstr;
-  #not portable #return "Record not found, statement:\n$statement" if $rc eq "0E0";
-  $h_sth->execute or return $h_sth->errstr if $h_sth;
-  dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
-
-  #no need to needlessly destoy the data either (causes problems actually)
-  #undef $self; #no need to keep object!
-
-  '';
-}
-
-=item del
-
-Depriciated (use delete instead).
-
-=cut
-
-sub del {
-  cluck "warning: FS::Record::del depriciated!";
-  &delete(@_); #call method in this scope
-}
-
-=item replace OLD_RECORD
-
-Replace the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-  warn "[debug]$me $new ->replace $old\n" if $DEBUG;
-
-  return "Records not in same table!" unless $new->table eq $old->table;
-
-  my $primary_key = $old->dbdef_table->primary_key;
-  return "Can't change $primary_key"
-    if $primary_key
-       && ( $old->getfield($primary_key) ne $new->getfield($primary_key) );
-
-  my $error = $new->check;
-  return $error if $error;
-
-  my @diff = grep $new->getfield($_) ne $old->getfield($_), $old->fields;
-  unless ( @diff ) {
-    carp "[warning]$me $new -> replace $old: records identical";
-    return '';
-  }
-
-  my $statement = "UPDATE ". $old->table. " SET ". join(', ',
-    map {
-      "$_ = ". _quote($new->getfield($_),$old->table,$_) 
-    } @diff
-  ). ' WHERE '.
-    join(' AND ',
-      map {
-        $old->getfield($_) eq ''
-          #? "( $_ IS NULL OR $_ = \"\" )"
-          ? ( driver_name =~ /^Pg$/i
-                ? "$_ IS NULL"
-                : "( $_ IS NULL OR $_ = \"\" )"
-            )
-          : "$_ = ". _quote($old->getfield($_),$old->table,$_)
-      } ( $primary_key ? ( $primary_key ) : $old->fields )
-    )
-  ;
-  warn "[debug]$me $statement\n" if $DEBUG > 1;
-  my $sth = dbh->prepare($statement) or return dbh->errstr;
-
-  my $h_old_sth;
-  if ( defined $dbdef->table('h_'. $old->table) ) {
-    my $h_old_statement = $old->_h_statement('replace_old');
-    warn "[debug]$me $h_old_statement\n" if $DEBUG > 2;
-    $h_old_sth = dbh->prepare($h_old_statement) or return dbh->errstr;
-  } else {
-    $h_old_sth = '';
-  }
-
-  my $h_new_sth;
-  if ( defined $dbdef->table('h_'. $new->table) ) {
-    my $h_new_statement = $new->_h_statement('replace_new');
-    warn "[debug]$me $h_new_statement\n" if $DEBUG > 2;
-    $h_new_sth = dbh->prepare($h_new_statement) or return dbh->errstr;
-  } else {
-    $h_new_sth = '';
-  }
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE'; 
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $rc = $sth->execute or return $sth->errstr;
-  #not portable #return "Record not found (or records identical)." if $rc eq "0E0";
-  $h_old_sth->execute or return $h_old_sth->errstr if $h_old_sth;
-  $h_new_sth->execute or return $h_new_sth->errstr if $h_new_sth;
-  dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
-
-  '';
-
-}
-
-=item rep
-
-Depriciated (use replace instead).
-
-=cut
-
-sub rep {
-  cluck "warning: FS::Record::rep depriciated!";
-  replace @_; #call method in this scope
-}
-
-=item check
-
-Not yet implemented, croaks.  Derived classes should provide a check method.
-
-=cut
-
-sub check {
-  confess "FS::Record::check not implemented; supply one in subclass!";
-}
-
-sub _h_statement {
-  my( $self, $action ) = @_;
-
-  my @fields =
-    grep defined($self->getfield($_)) && $self->getfield($_) ne "",
-    $self->fields
-  ;
-  my @values = map { _quote( $self->getfield($_), $self->table, $_) } @fields;
-
-  "INSERT INTO h_". $self->table. " ( ".
-      join(', ', qw(history_date history_user history_action), @fields ).
-    ") VALUES (".
-      join(', ', time, dbh->quote(getotaker()), dbh->quote($action), @values).
-    ")"
-  ;
-}
-
-=item unique COLUMN
-
-Replaces COLUMN in record with a unique number.  Called by the B<add> method
-on primary keys and single-field unique columns (see L<DBIx::DBSchema::Table>).
-Returns the new value.
-
-=cut
-
-sub unique {
-  my($self,$field) = @_;
-  my($table)=$self->table;
-
-  #croak("&FS::UID::checkruid failed") unless &checkruid;
-
-  croak "Unique called on field $field, but it is ",
-        $self->getfield($field),
-        ", not null!"
-    if $self->getfield($field);
-
-  #warn "table $table is tainted" if is_tainted($table);
-  #warn "field $field is tainted" if is_tainted($field);
-
-  my($counter) = new File::CounterFile "$table.$field",0;
-# hack for web demo
-#  getotaker() =~ /^([\w\-]{1,16})$/ or die "Illegal CGI REMOTE_USER!";
-#  my($user)=$1;
-#  my($counter) = new File::CounterFile "$user/$table.$field",0;
-# endhack
-
-  my($index)=$counter->inc;
-  $index=$counter->inc
-    while qsearchs($table,{$field=>$index}); #just in case
-
-  $index =~ /^(\d*)$/;
-  $index=$1;
-
-  $self->setfield($field,$index);
-
-}
-
-=item ut_float COLUMN
-
-Check/untaint floating point numeric data: 1.1, 1, 1.1e10, 1e10.  May not be
-null.  If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub ut_float {
-  my($self,$field)=@_ ;
-  ($self->getfield($field) =~ /^(\d+\.\d+)$/ ||
-   $self->getfield($field) =~ /^(\d+)$/ ||
-   $self->getfield($field) =~ /^(\d+\.\d+e\d+)$/ ||
-   $self->getfield($field) =~ /^(\d+e\d+)$/)
-    or return "Illegal or empty (float) $field: ". $self->getfield($field);
-  $self->setfield($field,$1);
-  '';
-}
-
-=item ut_number COLUMN
-
-Check/untaint simple numeric data (whole numbers).  May not be null.  If there
-is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub ut_number {
-  my($self,$field)=@_;
-  $self->getfield($field) =~ /^(\d+)$/
-    or return "Illegal or empty (numeric) $field: ". $self->getfield($field);
-  $self->setfield($field,$1);
-  '';
-}
-
-=item ut_numbern COLUMN
-
-Check/untaint simple numeric data (whole numbers).  May be null.  If there is
-an error, returns the error, otherwise returns false.
-
-=cut
-
-sub ut_numbern {
-  my($self,$field)=@_;
-  $self->getfield($field) =~ /^(\d*)$/
-    or return "Illegal (numeric) $field: ". $self->getfield($field);
-  $self->setfield($field,$1);
-  '';
-}
-
-=item ut_money COLUMN
-
-Check/untaint monetary numbers.  May be negative.  Set to 0 if null.  If there
-is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub ut_money {
-  my($self,$field)=@_;
-  $self->setfield($field, 0) if $self->getfield($field) eq '';
-  $self->getfield($field) =~ /^(\-)? ?(\d*)(\.\d{2})?$/
-    or return "Illegal (money) $field: ". $self->getfield($field);
-  #$self->setfield($field, "$1$2$3" || 0);
-  $self->setfield($field, ( ($1||''). ($2||''). ($3||'') ) || 0);
-  '';
-}
-
-=item ut_text COLUMN
-
-Check/untaint text.  Alphanumerics, spaces, and the following punctuation
-symbols are currently permitted: ! @ # $ % & ( ) - + ; : ' " , . ? / =
-May not be null.  If there is an error, returns the error, otherwise returns
-false.
-
-=cut
-
-sub ut_text {
-  my($self,$field)=@_;
-  #warn "msgcat ". \&msgcat. "\n";
-  #warn "notexist ". \&notexist. "\n";
-  #warn "AUTOLOAD ". \&AUTOLOAD. "\n";
-  $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=]+)$/
-    or return gettext('illegal_or_empty_text'). " $field: ".
-               $self->getfield($field);
-  $self->setfield($field,$1);
-  '';
-}
-
-=item ut_textn COLUMN
-
-Check/untaint text.  Alphanumerics, spaces, and the following punctuation
-symbols are currently permitted: ! @ # $ % & ( ) - + ; : ' " , . ? /
-May be null.  If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub ut_textn {
-  my($self,$field)=@_;
-  $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=]*)$/
-    or return gettext('illegal_text'). " $field: ". $self->getfield($field);
-  $self->setfield($field,$1);
-  '';
-}
-
-=item ut_alpha COLUMN
-
-Check/untaint alphanumeric strings (no spaces).  May not be null.  If there is
-an error, returns the error, otherwise returns false.
-
-=cut
-
-sub ut_alpha {
-  my($self,$field)=@_;
-  $self->getfield($field) =~ /^(\w+)$/
-    or return "Illegal or empty (alphanumeric) $field: ".
-              $self->getfield($field);
-  $self->setfield($field,$1);
-  '';
-}
-
-=item ut_alpha COLUMN
-
-Check/untaint alphanumeric strings (no spaces).  May be null.  If there is an
-error, returns the error, otherwise returns false.
-
-=cut
-
-sub ut_alphan {
-  my($self,$field)=@_;
-  $self->getfield($field) =~ /^(\w*)$/ 
-    or return "Illegal (alphanumeric) $field: ". $self->getfield($field);
-  $self->setfield($field,$1);
-  '';
-}
-
-=item ut_phonen COLUMN [ COUNTRY ]
-
-Check/untaint phone numbers.  May be null.  If there is an error, returns
-the error, otherwise returns false.
-
-Takes an optional two-letter ISO country code; without it or with unsupported
-countries, ut_phonen simply calls ut_alphan.
-
-=cut
-
-sub ut_phonen {
-  my( $self, $field, $country ) = @_;
-  return $self->ut_alphan($field) unless defined $country;
-  my $phonen = $self->getfield($field);
-  if ( $phonen eq '' ) {
-    $self->setfield($field,'');
-  } elsif ( $country eq 'US' || $country eq 'CA' ) {
-    $phonen =~ s/\D//g;
-    $phonen =~ /^(\d{3})(\d{3})(\d{4})(\d*)$/
-      or return gettext('illegal_phone'). " $field: ". $self->getfield($field);
-    $phonen = "$1-$2-$3";
-    $phonen .= " x$4" if $4;
-    $self->setfield($field,$phonen);
-  } else {
-    warn "warning: don't know how to check phone numbers for country $country";
-    return $self->ut_textn($field);
-  }
-  '';
-}
-
-=item ut_ip COLUMN
-
-Check/untaint ip addresses.  IPv4 only for now.
-
-=cut
-
-sub ut_ip {
-  my( $self, $field ) = @_;
-  $self->getfield($field) =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/
-    or return "Illegal (IP address) $field: ". $self->getfield($field);
-  for ( $1, $2, $3, $4 ) { return "Illegal (IP address) $field" if $_ > 255; }
-  $self->setfield($field, "$1.$2.$3.$3");
-  '';
-}
-
-=item ut_ipn COLUMN
-
-Check/untaint ip addresses.  IPv4 only for now.  May be null.
-
-=cut
-
-sub ut_ipn {
-  my( $self, $field ) = @_;
-  if ( $self->getfield($field) =~ /^()$/ ) {
-    $self->setfield($field,'');
-    '';
-  } else {
-    $self->ut_ip($field);
-  }
-}
-
-=item ut_domain COLUMN
-
-Check/untaint host and domain names.
-
-=cut
-
-sub ut_domain {
-  my( $self, $field ) = @_;
-  #$self->getfield($field) =~/^(\w+\.)*\w+$/
-  $self->getfield($field) =~/^(([\w\-]+\.)*\w+)$/
-    or return "Illegal (domain) $field: ". $self->getfield($field);
-  $self->setfield($field,$1);
-  '';
-}
-
-=item ut_name COLUMN
-
-Check/untaint proper names; allows alphanumerics, spaces and the following
-punctuation: , . - '
-
-May not be null.
-
-=cut
-
-sub ut_name {
-  my( $self, $field ) = @_;
-  $self->getfield($field) =~ /^([\w \,\.\-\']+)$/
-    or return gettext('illegal_name'). " $field: ". $self->getfield($field);
-  $self->setfield($field,$1);
-  '';
-}
-
-=item ut_zip COLUMN
-
-Check/untaint zip codes.
-
-=cut
-
-sub ut_zip {
-  my( $self, $field, $country ) = @_;
-  if ( $country eq 'US' ) {
-    $self->getfield($field) =~ /\s*(\d{5}(\-\d{4})?)\s*$/
-      or return gettext('illegal_zip'). " $field for country $country: ".
-                $self->getfield($field);
-    $self->setfield($field,$1);
-  } else {
-    $self->getfield($field) =~ /^\s*(\w[\w\-\s]{2,8}\w)\s*$/
-      or return gettext('illegal_zip'). " $field: ". $self->getfield($field);
-    $self->setfield($field,$1);
-  }
-  '';
-}
-
-=item ut_country COLUMN
-
-Check/untaint country codes.  Country names are changed to codes, if possible -
-see L<Locale::Country>.
-
-=cut
-
-sub ut_country {
-  my( $self, $field ) = @_;
-  unless ( $self->getfield($field) =~ /^(\w\w)$/ ) {
-    if ( $self->getfield($field) =~ /^([\w \,\.\(\)\']+)$/ 
-         && country2code($1) ) {
-      $self->setfield($field,uc(country2code($1)));
-    }
-  }
-  $self->getfield($field) =~ /^(\w\w)$/
-    or return "Illegal (country) $field: ". $self->getfield($field);
-  $self->setfield($field,uc($1));
-  '';
-}
-
-=item ut_anything COLUMN
-
-Untaints arbitrary data.  Be careful.
-
-=cut
-
-sub ut_anything {
-  my( $self, $field ) = @_;
-  $self->getfield($field) =~ /^(.*)$/s
-    or return "Illegal $field: ". $self->getfield($field);
-  $self->setfield($field,$1);
-  '';
-}
-
-=item ut_enum COLUMN CHOICES_ARRAYREF
-
-Check/untaint a column, supplying all possible choices, like the "enum" type.
-
-=cut
-
-sub ut_enum {
-  my( $self, $field, $choices ) = @_;
-  foreach my $choice ( @$choices ) {
-    if ( $self->getfield($field) eq $choice ) {
-      $self->setfield($choice);
-      return '';
-    }
-  }
-  return "Illegal (enum) field $field: ". $self->getfield($field);
-}
-
-=item ut_foreign_key COLUMN FOREIGN_TABLE FOREIGN_COLUMN
-
-Check/untaint a foreign column key.  Call a regular ut_ method (like ut_number)
-on the column first.
-
-=cut
-
-sub ut_foreign_key {
-  my( $self, $field, $table, $foreign ) = @_;
-  qsearchs($table, { $foreign => $self->getfield($field) })
-    or return "Can't find $field ". $self->getfield($field).
-              " in $table.$foreign";
-  '';
-}
-
-=item ut_foreign_keyn COLUMN FOREIGN_TABLE FOREIGN_COLUMN
-
-Like ut_foreign_key, except the null value is also allowed.
-
-=cut
-
-sub ut_foreign_keyn {
-  my( $self, $field, $table, $foreign ) = @_;
-  $self->getfield($field)
-    ? $self->ut_foreign_key($field, $table, $foreign)
-    : '';
-}
-
-=item fields [ TABLE ]
-
-This can be used as both a subroutine and a method call.  It returns a list
-of the columns in this record's table, or an explicitly specified table.
-(See L<DBIx::DBSchema::Table>).
-
-=cut
-
-# Usage: @fields = fields($table);
-#        @fields = $record->fields;
-sub fields {
-  my $something = shift;
-  my $table;
-  if ( ref($something) ) {
-    $table = $something->table;
-  } else {
-    $table = $something;
-  }
-  #croak "Usage: \@fields = fields(\$table)\n   or: \@fields = \$record->fields" unless $table;
-  my($table_obj) = $dbdef->table($table);
-  confess "Unknown table $table" unless $table_obj;
-  $table_obj->columns;
-}
-
-=back
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item reload_dbdef([FILENAME])
-
-Load a database definition (see L<DBIx::DBSchema>), optionally from a
-non-default filename.  This command is executed at startup unless
-I<$FS::Record::setup_hack> is true.  Returns a DBIx::DBSchema object.
-
-=cut
-
-sub reload_dbdef {
-  my $file = shift || $dbdef_file;
-
-  unless ( exists $dbdef_cache{$file} ) {
-    warn "[debug]$me loading dbdef for $file\n" if $DEBUG;
-    $dbdef_cache{$file} = DBIx::DBSchema->load( $file )
-                            or die "can't load database schema from $file";
-  } else {
-    warn "[debug]$me re-using cached dbdef for $file\n" if $DEBUG;
-  }
-  $dbdef = $dbdef_cache{$file};
-}
-
-=item dbdef
-
-Returns the current database definition.  See L<DBIx::DBSchema>.
-
-=cut
-
-sub dbdef { $dbdef; }
-
-=item _quote VALUE, TABLE, COLUMN
-
-This is an internal function used to construct SQL statements.  It returns
-VALUE DBI-quoted (see L<DBI/"quote">) unless VALUE is a number and the column
-type (see L<DBIx::DBSchema::Column>) does not end in `char' or `binary'.
-
-=cut
-
-sub _quote {
-  my($value,$table,$field)=@_;
-  my($dbh)=dbh;
-  if ( $value =~ /^\d+(\.\d+)?$/ && 
-#       ! ( datatype($table,$field) =~ /^char/ ) 
-       ! $dbdef->table($table)->column($field)->type =~ /(char|binary|text)$/i 
-  ) {
-    $value;
-  } else {
-    $dbh->quote($value);
-  }
-}
-
-=item hfields TABLE
-
-This is depriciated.  Don't use it.
-
-It returns a hash-type list with the fields of this record's table set true.
-
-=cut
-
-sub hfields {
-  carp "warning: hfields is depriciated";
-  my($table)=@_;
-  my(%hash);
-  foreach (fields($table)) {
-    $hash{$_}=1;
-  }
-  \%hash;
-}
-
-sub _dump {
-  my($self)=@_;
-  join("\n", map {
-    "$_: ". $self->getfield($_). "|"
-  } (fields($self->table)) );
-}
-
-sub DESTROY { return; }
-
-#sub DESTROY {
-#  my $self = shift;
-#  #use Carp qw(cluck);
-#  #cluck "DESTROYING $self";
-#  warn "DESTROYING $self";
-#}
-
-#sub is_tainted {
-#             return ! eval { join('',@_), kill 0; 1; };
-#         }
-
-=back
-
-=head1 BUGS
-
-This module should probably be renamed, since much of the functionality is
-of general use.  It is not completely unlike Adapter::DBI (see below).
-
-Exported qsearch and qsearchs should be depriciated in favor of method calls
-(against an FS::Record object like the old search and searchs that qsearch
-and qsearchs were on top of.)
-
-The whole fields / hfields mess should be removed.
-
-The various WHERE clauses should be subroutined.
-
-table string should be depriciated in favor of DBIx::DBSchema::Table.
-
-No doubt we could benefit from a Tied hash.  Documenting how exists / defined
-true maps to the database (and WHERE clauses) would also help.
-
-The ut_ methods should ask the dbdef for a default length.
-
-ut_sqltype (like ut_varchar) should all be defined
-
-A fallback check method should be provided which uses the dbdef.
-
-The ut_money method assumes money has two decimal digits.
-
-The Pg money kludge in the new method only strips `$'.
-
-The ut_phonen method only checks US-style phone numbers.
-
-The _quote function should probably use ut_float instead of a regex.
-
-All the subroutines probably should be methods, here or elsewhere.
-
-Probably should borrow/use some dbdef methods where appropriate (like sub
-fields)
-
-As of 1.14, DBI fetchall_hashref( {} ) doesn't set fetchrow_hashref NAME_lc,
-or allow it to be set.  Working around it is ugly any way around - DBI should
-be fixed.  (only affects RDBMS which return uppercase column names)
-
-ut_zip should take an optional country like ut_phone.
-
-=head1 SEE ALSO
-
-L<DBIx::DBSchema>, L<FS::UID>, L<DBI>
-
-Adapter::DBI from Ch. 11 of Advanced Perl Programming by Sriram Srinivasan.
-
-=cut
-
-1;
-
diff --git a/FS/FS/SearchCache.pm b/FS/FS/SearchCache.pm
deleted file mode 100644
index 4218acfb6..000000000
--- a/FS/FS/SearchCache.pm
+++ /dev/null
@@ -1,96 +0,0 @@
-package FS::SearchCache;
-
-use strict;
-use vars qw($DEBUG);
-#use Carp qw(carp cluck croak confess);
-
-$DEBUG = 0;
-
-=head1 NAME
-
-FS::SearchCache - cache
-
-=head1 SYNOPSIS
-
-=head1 DESCRIPTION
-
-=head1 METHODS
-
-=over 4
-
-=item new
-
-=cut
-
-sub new { 
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my( $table, $key ) = @_;
-  warn "table $table\n" if $DEBUG > 1;
-  warn "key $key\n" if $DEBUG > 1;
-  my $self = { 'table' => $table,
-               'key'   => $key,
-               'cache' => {},
-               'subcache' => {},
-             };
-  bless ($self, $class);
-
-  $self;
-}
-
-=item table
-
-=cut
-
-sub table { my $self = shift; $self->{table}; }
-
-=item key
-
-=cut
-
-sub key { my $self = shift; $self->{key}; }
-
-=item cache
-
-=cut
-
-sub cache { my $self = shift; $self->{cache}; }
-
-=item subcache
-
-=cut
-
-sub subcache {
-  my $self = shift;
-  my $col = shift;
-  my $table = shift;
-  my $keyval = shift;
-  if ( exists $self->{subcache}->{$col}->{$keyval} ) {
-    warn "returning existing subcache for $keyval ($col)".
-         "$self->{subcache}->{$col}->{$keyval}\n" if $DEBUG;
-    return $self->{subcache}->{$col}->{$keyval};
-  } else {
-    #my $tablekey = @_ ? shift : $col;
-    my $tablekey = $col;
-    my $subcache = ref($self)->new( $table, $tablekey );
-    $self->{subcache}->{$col}->{$keyval} = $subcache;
-    warn "creating new subcache $table $tablekey: $subcache\n" if $DEBUG;
-    $subcache;
-  }
-}
-
-=back
-
-=head1 BUGS
-
-Dismal documentation.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_main>
-
-=cut
-
-1;
-
-
diff --git a/FS/FS/UI/Base.pm b/FS/FS/UI/Base.pm
deleted file mode 100644
index bbeb9e171..000000000
--- a/FS/FS/UI/Base.pm
+++ /dev/null
@@ -1,194 +0,0 @@
-package FS::UI::Base;
-
-use strict;
-use vars qw ( @ISA );
-use FS::Record qw( fields qsearch );
-
-@ISA = ( $FS::UI::Base::_lock );
-
-=head1 NAME
-
-FS::UI::Base - Base class for all user-interface objects
-
-=head1 SYNOPSIS
-
-  use FS::UI::SomeInterface;
-  use FS::UI::some_table;
-
-  $interface = new FS::UI::some_table;
-
-  $error = $interface->browse;
-  $error = $interface->search;
-  $error = $interface->view;
-  $error = $interface->edit;
-  $error = $interface->process;
-
-=head1 DESCRIPTION
-
-An FS::UI::Base object represents a user interface object.  FS::UI::Base
-is intended as a base class for table-specfic classes to inherit from, i.e.
-FS::UI::cust_main.  The simplest case, which will provide a default UI for your
-new table, is as follows:
-
-  package FS::UI::table_name;
-  use vars qw ( @ISA );
-  use FS::UI::Base;
-  @ISA = qw( FS::UI::Base );
-  sub db_table { 'table_name'; }
-
-Currently available interfaces are:
-  FS::UI::Gtk, an X-Windows UI implemented using the Gtk+ toolkit
-  FS::UI::CGI, a web interface implemented using CGI.pm, etc.
-
-=head1 METHODS
-
-=over 4
-
-=item new
-
-=cut
-
-=item browse
-
-=cut
-
-sub browse {
-  my $self = shift;
-
-  my @fields = $self->list_fields;
-
-  #begin browse-specific stuff
-
-  $self->title( "Browse ". $self->db_names ) unless $self->title;
-  my @records = qsearch ( $self->db_table, {} );
-
-  #end browse-specific stuff
-
-  $self->addwidget ( new FS::UI::_Text ( $self->db_description ) );
-
-  my @header = $self->list_header;
-  my @headerspan = $self->list_headerspan;
-  my %callback = $self->db_callback;
-
-  my $columns;
-
-  my $table = new FS::UI::_Tableborder (
-    'rows' => 1 + scalar(@records),
-    'columns' => $columns || scalar(@fields),
-  );
-
-  my $c = 0;
-  foreach my $header ( @header ) {
-    my $headerspan = shift(@headerspan) || 1;
-    $table->attach(
-      0, $c, new FS::UI::_Text ( $header ), 1, $headerspan
-    );
-    $c += $headerspan;
-  }
-
-  my $r = 1;
-  
-  foreach my $record ( @records ) {
-    $c = 0;
-    foreach my $field ( @fields ) {
-      my $value = $record->getfield($field);
-      my $widget;
-      if ( $callback{$field} ) {
-        $widget = &{ $callback{$field} }( $value, $record );
-      } else {
-        $widget = new FS::UI::_Text ( $value );
-      }
-      $table->attach( $r, $c++, $widget, 1, 1 );
-    }
-    $r++;
-  }
-
-  $self->addwidget( $table );
-
-  $self->activate;
-
-}
-
-=item title
-
-=cut
-
-sub title {
-  my $self = shift;
-  my $value = shift;
-  if ( defined($value) ) {
-    $self->{'title'} = $value;
-  } else {
-    $self->{'title'};
-  }
-}
-
-=item addwidget
-
-=cut
-
-sub addwidget {
-  my $self = shift;
-  my $widget = shift;
-  push @{ $self->{'Widgets'} }, $widget;
-}
-
-#fallback methods
-
-sub db_description {}
-
-sub db_name {}
-
-sub db_names {
-  my $self = shift;
-  $self->db_name. 's';
-}
-
-sub list_fields {
-  my $self = shift;
-  fields( $self->db_table );
-}
-
-sub list_header {
-  my $self = shift;
-  $self->list_fields
-}
-
-sub list_headerspan {
-  my $self = shift;
-  map 1, $self->list_header;
-}
-
-sub db_callback {}
-
-=back
-
-=head1 VERSION
-
-$Id: Base.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
-
-=head1 BUGS
-
-This documentation is incomplete.
-
-There should be some sort of per-(freeside)-user preferences and the ability
-for specific FS::UI:: modules to put their own values there as well.
-
-=head1 SEE ALSO
-
-L<FS::UI::Gtk>, L<FS::UI::CGI>
-
-=head1 HISTORY
-
-$Log: Base.pm,v $
-Revision 1.1  1999-08-04 09:03:53  ivan
-initial checkin of module files for proper perl installation
-
-Revision 1.1  1999/01/20 09:30:36  ivan
-skeletal cross-UI UI code.
-
-
-=cut
-
-1;
-
diff --git a/FS/FS/UI/CGI.pm b/FS/FS/UI/CGI.pm
deleted file mode 100644
index ae87d1375..000000000
--- a/FS/FS/UI/CGI.pm
+++ /dev/null
@@ -1,239 +0,0 @@
-package FS::UI::CGI;
-
-use strict;
-use CGI;
-#use CGI::Switch;  #when FS::UID user and preference callback stuff is fixed
-use CGI::Carp qw(fatalsToBrowser);
-use HTML::Table;
-use FS::UID qw(adminsuidsetup);
-#use FS::Record qw( qsearch fields );
-
-die "Can't initialize CGI interface; $FS::UI::Base::_lock used"
-  if $FS::UI::Base::_lock;
-$FS::UI::Base::_lock = "FS::UI::CGI";
-
-=head1 NAME
-
-FS::UI::CGI - Base class for CGI user-interface objects
-
-=head1 SYNOPSIS
-
-  use FS::UI::CGI;
-  use FS::UI::some_table;
-
-  $interface = new FS::UI::some_table;
-
-  $error = $interface->browse;
-  $error = $interface->search;
-  $error = $interface->view;
-  $error = $interface->edit;
-  $error = $interface->process;
-
-=head1 DESCRIPTION
-
-An FS::UI::CGI object represents a CGI interface object.
-
-=head1 METHODS
-
-=over 4
-
-=item new
-
-=cut
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = { @_ };
-
-  $self->{'_cgi'} = new CGI;
-  $self->{'_user'} = $self->{'_cgi'}->remote_user;
-  $self->{'_dbh'} = FS::UID::adminsuidsetup $self->{'_user'};
-
-  bless ( $self, $class);
-}
-
-sub activate {
-  my $self = shift;
-  print $self->_header,
-        join ( "<BR>", map $_->sprint, @{ $self->{'Widgets'} } ),
-        $self->_footer,
-  ;
-}
-
-=item _header
-
-=cut
-
-sub _header {
-  my $self = shift;
-  my $cgi = $self->{'_cgi'};
-
-  $cgi->header( '-expires' => 'now' ), '<HTML>', 
-    '<HEAD><TITLE>', $self->title, '</TITLE></HEAD>',
-    '<BODY BGCOLOR="#ffffff">',
-    '<FONT COLOR="#ff0000" SIZE=7>', $self->title, '</FONT><BR><BR>',
-  ;
-}
-
-=item _footer
-
-=cut
-
-sub _footer {
-  "</BODY></HTML>";
-}
-
-=item interface
-
-Returns the string `CGI'.  Useful for the author of a table-specific UI class
-to conditionally specify certain behaviour.
-
-=cut
-
-sub interface { 'CGI'; }
-
-=back
-
-=cut
-
-package FS::UI::_Widget;
-
-use vars qw( $AUTOLOAD );
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = { @_ };
-  bless ( $self, $class );
-}
-
-sub AUTOLOAD {
-  my $self = shift;
-  my $value = shift;
-  my($field)=$AUTOLOAD;
-  $field =~ s/.*://;
-  if ( defined($value) ) {
-    $self->{$field} = $value;
-  } else {
-    $self->{$field};
-  }    
-}
-
-package FS::UI::_Text;
-
-use vars qw ( @ISA );
-
-@ISA = qw ( FS::UI::_Widget);
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = {};
-  $self->{'_text'} = shift;
-  bless ( $self, $class );
-}
-
-sub sprint {
-  my $self = shift;
-  $self->{'_text'};
-}
-
-package FS::UI::_Link;
-
-use vars qw ( @ISA $BASE_URL );
-
-@ISA = qw ( FS::UI::_Widget);
-$BASE_URL = "http://rootwood.sisd.com/freeside";
-
-sub sprint {
-  my $self = shift;
-  my $table = $self->{'table'};
-  my $method = $self->{'method'};
-
-  # i will be cleaned up when we're done moving from the old webinterface!
-  my @arg = @{$self->{'arg'}};
-  my $yuck = join( "&", @arg);
-  qq(<A HREF="$BASE_URL/$method/$table.cgi?$yuck">). $self->{'text'}. "<\A>";
-}
-
-package FS::UI::_Table;
-
-use vars qw ( @ISA );
-
-@ISA = qw ( FS::UI::_Widget);
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = $class eq $proto ? { @_ } : $proto;
-  bless ( $self, $class );
-  $self->{'_table'} = new HTML::Table ( $self->rows, $self->columns );
-  $self;
-}
-
-sub attach {
-  my $self = shift;
-  my ( $row, $column, $widget, $rowspan, $colspan ) = @_;
-  $self->{"_table"}->setCell( $row+1, $column+1, $widget->sprint );
-  $self->{"_table"}->setCellRowSpan( $row+1, $column+1, $rowspan ) if $rowspan;
-  $self->{"_table"}->setCellColSpan( $row+1, $column+1, $colspan ) if $colspan;
-}
-
-sub sprint {
-  my $self = shift;
-  $self->{'_table'}->getTable;
-}
-
-package FS::UI::_Tableborder;
-
-use vars qw ( @ISA );
-
-@ISA = qw ( FS::UI::_Table );
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = $class eq $proto ? { @_ } : $proto;
-  bless ( $self, $class );
-  $self->SUPER::new(@_);
-  $self->{'_table'}->setBorder;
-  $self;
-}
-
-=head1 VERSION
-
-$Id: CGI.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
-
-=head1 BUGS
-
-This documentation is incomplete.
-
-In _Tableborder, headers should be links that sort on their fields.
-
-_Link uses a constant $BASE_URL
-
-_Link passes the arguments as a manually-constructed GET string instead
-of POSTing, for compatability while the web interface is upgraded.  Once
-this is done it should pass arguements properly (i.e. as a POST, 8-bit clean)
-
-Still some small bits of widget code same as FS::UI::Gtk.
-
-=head1 SEE ALSO
-
-L<FS::UI::Base>
-
-=head1 HISTORY
-
-$Log: CGI.pm,v $
-Revision 1.1  1999-08-04 09:03:53  ivan
-initial checkin of module files for proper perl installation
-
-Revision 1.1  1999/01/20 09:30:36  ivan
-skeletal cross-UI UI code.
-
-
-=cut
-
-1;
-
diff --git a/FS/FS/UI/Gtk.pm b/FS/FS/UI/Gtk.pm
deleted file mode 100644
index 507a29361..000000000
--- a/FS/FS/UI/Gtk.pm
+++ /dev/null
@@ -1,224 +0,0 @@
-package FS::UI::Gtk;
-
-use strict;
-use Gtk;
-use FS::UID qw(adminsuidsetup);
-
-die "Can't initialize Gtk interface; $FS::UI::Base::_lock used"
-  if $FS::UI::Base::_lock;
-$FS::UI::Base::_lock = "FS::UI::Gtk";
-
-=head1 NAME
-
-FS::UI::Gtk - Base class for Gtk user-interface objects
-
-=head1 SYNOPSIS
-
-  use FS::UI::Gtk;
-  use FS::UI::some_table;
-
-  $interface = new FS::UI::some_table;
-
-  $error = $interface->browse;
-  $error = $interface->search;
-  $error = $interface->view;
-  $error = $interface->edit;
-  $error = $interface->process;
-
-=head1 DESCRIPTION
-
-An FS::UI::Gtk object represents a Gtk user interface object.
-
-=head1 METHODS
-
-=over 4
-
-=item new
-
-=cut
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = { @_ };
-
-  bless ( $self, $class );
-
-  $self->{'_user'} = 'ivan'; #Pop up login window?
-  $self->{'_dbh'} = FS::UID::adminsuidsetup $self->{'_user'};
-
-
-
-  $self;
-}
-
-sub activate {
-  my $self = shift;
-
-  my $vbox = new Gtk::VBox ( 0, 4 );
-
-  foreach my $widget ( @{ $self->{'Widgets'} } ) {
-    $widget->_gtk->show;
-    $vbox->pack_start ( $widget->_gtk, 1, 1, 4 );
-  }
-  $vbox->show;
-
-  my $window = new Gtk::Window "toplevel";
-  $self->{'_gtk'} = $window;
-  $window->set_title( $self->title );
-  $window->add ( $vbox );
-  $window->show;
-  main Gtk;
-}
-
-=item interface
-
-Returns the string `Gtk'.  Useful for the author of a table-specific UI class
-to conditionally specify certain behaviour.
-
-=cut 
-
-sub interface { 'Gtk'; }
-
-=back
-
-=cut
-
-package FS::UI::_Widget;
-
-use vars qw( $AUTOLOAD );
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = { @_ };
-  bless ( $self, $class );
-}
-
-sub _gtk {
-  my $self = shift;
-  $self->{'_gtk'};
-}
-
-sub AUTOLOAD {
-  my $self = shift;
-  my $value = shift;
-  my($field)=$AUTOLOAD;
-  $field =~ s/.*://;
-  if ( defined($value) ) {
-    $self->{$field} = $value;
-  } else {
-    $self->{$field};
-  }    
-}
-
-package FS::UI::_Text;
-
-use vars qw ( @ISA );
-
-@ISA = qw ( FS::UI::_Widget );
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = {};
-  $self->{'_gtk'} = new Gtk::Label ( shift );
-  bless ( $self, $class );
-}
-
-package FS::UI::_Link;
-
-use vars qw ( @ISA );
-
-@ISA = qw ( FS::UI::_Widget );
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = { @_ };
-  $self->{'_gtk'} = new_with_label Gtk::Button ( $self->{'text'} );
-  $self->{'_gtk'}->signal_connect( 'clicked', sub {
-      print "STUB: (Gtk) FS::UI::_Link";
-    }, "hi", "there" );
-  bless ( $self, $class );
-}
-
-
-package FS::UI::_Table;
-
-use vars qw ( @ISA );
-
-@ISA = qw ( FS::UI::_Widget );
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = { @_ };
-  bless ( $self, $class );
-
-  $self->{'_gtk'} = new Gtk::Table (
-    $self->rows,
-    $self->columns,
-    0, #homogeneous
-  );
-
-  $self;
-}
-
-sub attach {
-  my $self = shift;
-  my ( $row, $column, $widget, $rowspan, $colspan ) = @_;
-  $rowspan ||= 1;
-  $colspan ||= 1;
-  $self->_gtk->attach_defaults(
-    $widget->_gtk,
-    $column,
-    $column + $colspan,
-    $row,
-    $row + $rowspan,
-  );
-  $widget->_gtk->show;
-}
-
-package FS::UI::_Tableborder;
-
-use vars qw ( @ISA );
-
-@ISA = qw ( FS::UI::_Table );
-
-=head1 VERSION
-
-$Id: Gtk.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
-
-=head1 BUGS
-
-This documentation is incomplete.
-
-_Tableborder is just a _Table now.  _Tableborders should scroll (but not the
-headers) and need and need more decoration. (data in white section ala gtksql
-and sliding field widths) headers should be buttons that callback to sort on
-their fields.
-
-There should be a persistant, per-(freeside)-user store for window positions
-and sizes and sort fields etc (see L<FS::UI::CGI/BUGS>.
-
-Still some small bits of widget code same as FS::UI::CGI.
-
-=head1 SEE ALSO
-
-L<FS::UI::Base>
-
-=head1 HISTORY
-
-$Log: Gtk.pm,v $
-Revision 1.1  1999-08-04 09:03:53  ivan
-initial checkin of module files for proper perl installation
-
-Revision 1.1  1999/01/20 09:30:36  ivan
-skeletal cross-UI UI code.
-
-
-=cut
-
-1;
-
diff --git a/FS/FS/UI/agent.pm b/FS/FS/UI/agent.pm
deleted file mode 100644
index ce9744a55..000000000
--- a/FS/FS/UI/agent.pm
+++ /dev/null
@@ -1,62 +0,0 @@
-package FS::UI::agent;
-
-use strict;
-use vars qw ( @ISA );
-use FS::UI::Base;
-use FS::Record qw( qsearchs );
-use FS::agent;
-use FS::agent_type;
-
-@ISA = qw ( FS::UI::Base );
-
-sub db_table { 'agent' };
-
-sub db_name { 'Agent' };
-
-sub db_description { <<END;
-Agents are resellers of your service. Agents may be limited to a subset of your
-full offerings (via their type).
-END
-}
-
-sub list_fields {
-  'agentnum',
-  'typenum',
-#  'freq',
-#  'prog',
-; }
-
-sub list_header {
-  'Agent',
-  'Type',
-#  'Freq (n/a)',
-#  'Prog (n/a)',
-; }
-
-sub db_callback { 
-  'agentnum' =>
-    sub {
-      my ( $agentnum, $record ) = @_;
-      my $agent = $record->agent;
-      new FS::UI::_Link (
-        'table'  => 'agent',
-        'method' => 'edit',
-        'arg'    => [ $agentnum ],
-        'text'   => "$agentnum: $agent",
-      );
-    },
-  'typenum' =>
-    sub {
-      my $typenum = shift;
-      my $agent_type = qsearchs( 'agent_type', { 'typenum' => $typenum } );
-      my $atype = $agent_type->atype;
-      new FS::UI::_Link (
-        'table'  => 'agent_type',
-        'method' => 'edit',
-        'arg'    => [ $typenum ],
-        'text'   => "$typenum: $atype"
-      );
-    },
-}
-
-1;
diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
deleted file mode 100644
index 0b10612c5..000000000
--- a/FS/FS/UID.pm
+++ /dev/null
@@ -1,281 +0,0 @@
-package FS::UID;
-
-use strict;
-use vars qw(
-  @ISA @EXPORT_OK $cgi $dbh $freeside_uid $user 
-  $conf_dir $secrets $datasrc $db_user $db_pass %callback $driver_name
-  $AutoCommit
-);
-use subs qw(
-  getsecrets cgisetotaker
-);
-use Exporter;
-use Carp qw(carp croak cluck);
-use DBI;
-use FS::Conf;
-
-@ISA = qw(Exporter);
-@EXPORT_OK = qw(checkeuid checkruid cgisuidsetup adminsuidsetup forksuidsetup
-                getotaker dbh datasrc getsecrets driver_name );
-
-$freeside_uid = scalar(getpwnam('freeside'));
-
-$conf_dir = "/usr/local/etc/freeside/";
-
-$AutoCommit = 1; #ours, not DBI
-
-=head1 NAME
-
-FS::UID - Subroutines for database login and assorted other stuff
-
-=head1 SYNOPSIS
-
-  use FS::UID qw(adminsuidsetup cgisuidsetup dbh datasrc getotaker
-  checkeuid checkruid);
-
-  adminsuidsetup $user;
-
-  $cgi = new CGI;
-  $dbh = cgisuidsetup($cgi);
-
-  $dbh = dbh;
-
-  $datasrc = datasrc;
-
-  $driver_name = driver_name;
-
-=head1 DESCRIPTION
-
-Provides a hodgepodge of subroutines. 
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item adminsuidsetup USER
-
-Sets the user to USER (see config.html from the base documentation).
-Cleans the environment.
-Make sure the script is running as freeside, or setuid freeside.
-Opens a connection to the database.
-Swaps real and effective UIDs.
-Runs any defined callbacks (see below).
-Returns the DBI database handle (usually you don't need this).
-
-=cut
-
-sub adminsuidsetup {
-  $dbh->disconnect if $dbh;
-  &forksuidsetup(@_);
-}
-
-sub forksuidsetup {
-  $user = shift;
-  croak "fatal: adminsuidsetup called without arguements" unless $user;
-
-  $user =~ /^([\w\-\.]+)$/ or croak "fatal: illegal user $user";
-  $user = $1;
-
-  $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
-  $ENV{'SHELL'} = '/bin/sh';
-  $ENV{'IFS'} = " \t\n";
-  $ENV{'CDPATH'} = '';
-  $ENV{'ENV'} = '';
-  $ENV{'BASH_ENV'} = '';
-
-  croak "Not running uid freeside!" unless checkeuid();
-  getsecrets;
-  $dbh = DBI->connect($datasrc,$db_user,$db_pass, {
-                          'AutoCommit' => 0,
-                          'ChopBlanks' => 1,
-  } ) or die "DBI->connect error: $DBI::errstr\n";
-
-  foreach ( keys %callback ) {
-    &{$callback{$_}};
-    # breaks multi-database installs # delete $callback{$_}; #run once
-  }
-
-  $dbh;
-}
-
-=item cgisuidsetup CGI_object
-
-Takes a single argument, which is a CGI (see L<CGI>) or Apache (see L<Apache>)
-object (CGI::Base is depriciated).  Runs cgisetotaker and then adminsuidsetup.
-
-=cut
-
-sub cgisuidsetup {
-  $cgi=shift;
-  if ( $cgi->isa('CGI::Base') ) {
-    carp "Use of CGI::Base is depriciated";
-  } elsif ( $cgi->isa('Apache') ) {
-
-  } elsif ( ! $cgi->isa('CGI') ) {
-    croak "fatal: unrecognized object $cgi";
-  }
-  cgisetotaker; 
-  adminsuidsetup($user);
-}
-
-=item cgi
-
-Returns the CGI (see L<CGI>) object.
-
-=cut
-
-sub cgi {
-  carp "warning: \$FS::UID::cgi isa Apache" if $cgi->isa('Apache');
-  $cgi;
-}
-
-=item dbh
-
-Returns the DBI database handle.
-
-=cut
-
-sub dbh {
-  $dbh;
-}
-
-=item datasrc
-
-Returns the DBI data source.
-
-=cut
-
-sub datasrc {
-  $datasrc;
-}
-
-=item driver_name
-
-Returns just the driver name portion of the DBI data source.
-
-=cut
-
-sub driver_name {
-  return $driver_name if defined $driver_name;
-  $driver_name = ( split(':', $datasrc) )[1];
-}
-
-sub suidsetup {
-  croak "suidsetup depriciated";
-}
-
-=item getotaker
-
-Returns the current Freeside user.
-
-=cut
-
-sub getotaker {
-  $user;
-}
-
-=item cgisetotaker
-
-Sets and returns the CGI REMOTE_USER.  $cgi should be defined as a CGI.pm
-object (see L<CGI>) or an Apache object (see L<Apache>).  Support for CGI::Base
-and derived classes is depriciated.
-
-=cut
-
-sub cgisetotaker {
-  if ( $cgi && $cgi->isa('CGI::Base') && defined $cgi->var('REMOTE_USER')) {
-    carp "Use of CGI::Base is depriciated";
-    $user = lc ( $cgi->var('REMOTE_USER') );
-  } elsif ( $cgi && $cgi->isa('CGI') && defined $cgi->remote_user ) {
-    $user = lc ( $cgi->remote_user );
-  } elsif ( $cgi && $cgi->isa('Apache') ) {
-    $user = lc ( $cgi->connection->user );
-  } else {
-    die "fatal: Can't get REMOTE_USER! for cgi $cgi - you need to setup ".
-        "Apache user authentication as documented in httemplate/docs/install.html";
-  }
-  $user;
-}
-
-=item checkeuid
-
-Returns true if effective UID is that of the freeside user.
-
-=cut
-
-sub checkeuid {
-  ( $> == $freeside_uid );
-}
-
-=item checkruid
-
-Returns true if the real UID is that of the freeside user.
-
-=cut
-
-sub checkruid {
-  ( $< == $freeside_uid );
-}
-
-=item getsecrets [ USER ]
-
-Sets the user to USER, if supplied.
-Sets and returns the DBI datasource, username and password for this user from
-the `/usr/local/etc/freeside/mapsecrets' file.
-
-=cut
-
-sub getsecrets {
-  my($setuser) = shift;
-  $user = $setuser if $setuser;
-  die "No user!" unless $user;
-  my($conf) = new FS::Conf $conf_dir;
-  my($line) = grep /^\s*$user\s/, $conf->config('mapsecrets');
-  die "User $user not found in mapsecrets!" unless $line;
-  $line =~ /^\s*$user\s+(.*)$/;
-  $secrets = $1;
-  die "Illegal mapsecrets line for user?!" unless $secrets;
-  ($datasrc, $db_user, $db_pass) = $conf->config($secrets)
-    or die "Can't get secrets: $!";
-  $FS::Conf::default_dir = $conf_dir. "/conf.$datasrc";
-  undef $driver_name;
-  ($datasrc, $db_user, $db_pass);
-}
-
-=back
-
-=head1 CALLBACKS
-
-Warning: this interface is likely to change in future releases.
-
-A package can install a callback to be run in adminsuidsetup by putting a
-coderef into the hash %FS::UID::callback :
-
-    $coderef = sub { warn "Hi, I'm returning your call!" };
-    $FS::UID::callback{'Package::Name'};
-
-=head1 VERSION
-
-$Id: UID.pm,v 1.18 2002-07-03 11:23:25 ivan Exp $
-
-=head1 BUGS
-
-Too many package-global variables.
-
-Not OO.
-
-No capabilities yet.  When mod_perl and Authen::DBI are implemented, 
-cgisuidsetup will go away as well.
-
-Goes through contortions to support non-OO syntax with multiple datasrc's.
-
-Callbacks are inelegant.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<CGI>, L<DBI>, config.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
deleted file mode 100644
index f11a28db9..000000000
--- a/FS/FS/agent.pm
+++ /dev/null
@@ -1,160 +0,0 @@
-package FS::agent;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-use FS::cust_main;
-use FS::agent_type;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::agent - Object methods for agent records
-
-=head1 SYNOPSIS
-
-  use FS::agent;
-
-  $record = new FS::agent \%hash;
-  $record = new FS::agent { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $agent_type = $record->agent_type;
-
-  $hashref = $record->pkgpart_hashref;
-  #may purchase $pkgpart if $hashref->{$pkgpart};
-
-=head1 DESCRIPTION
-
-An FS::agent object represents an agent.  Every customer has an agent.  Agents
-can be used to track things like resellers or salespeople.  FS::agent inherits
-from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item agentnum - primary key (assigned automatically for new agents)
-
-=item agent - Text name of this agent
-
-=item typenum - Agent type.  See L<FS::agent_type>
-
-=item prog - For future use.
-
-=item freq - For future use.
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new agent.  To add the agent to the database, see L<"insert">.
-
-=cut
-
-sub table { 'agent'; }
-
-=item insert
-
-Adds this agent to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this agent from the database.  Only agents with no customers can be
-deleted.  If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub delete {
-  my $self = shift;
-
-  return "Can't delete an agent with customers!"
-    if qsearch( 'cust_main', { 'agentnum' => $self->agentnum } );
-
-  $self->SUPER::delete;
-}
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid agent.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error =
-    $self->ut_numbern('agentnum')
-      || $self->ut_text('agent')
-      || $self->ut_number('typenum')
-      || $self->ut_numbern('freq')
-      || $self->ut_textn('prog')
-  ;
-  return $error if $error;
-
-  return "Unknown typenum!"
-    unless $self->agent_type;
-
-  '';
-
-}
-
-=item agent_type
-
-Returns the FS::agent_type object (see L<FS::agent_type>) for this agent.
-
-=cut
-
-sub agent_type {
-  my $self = shift;
-  qsearchs( 'agent_type', { 'typenum' => $self->typenum } );
-}
-
-=item pkgpart_hashref
-
-Returns a hash reference.  The keys of the hash are pkgparts.  The value is
-true if this agent may purchase the specified package definition.  See
-L<FS::part_pkg>.
-
-=cut
-
-sub pkgpart_hashref {
-  my $self = shift;
-  $self->agent_type->pkgpart_hashref;
-}
-
-=back
-
-=head1 VERSION
-
-$Id: agent.pm,v 1.3 2002-03-24 18:23:47 ivan Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::agent_type>, L<FS::cust_main>, L<FS::part_pkg>, 
-schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/agent_type.pm b/FS/FS/agent_type.pm
deleted file mode 100644
index 988533ae3..000000000
--- a/FS/FS/agent_type.pm
+++ /dev/null
@@ -1,165 +0,0 @@
-package FS::agent_type;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch );
-use FS::agent;
-use FS::type_pkgs;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::agent_type - Object methods for agent_type records
-
-=head1 SYNOPSIS
-
-  use FS::agent_type;
-
-  $record = new FS::agent_type \%hash;
-  $record = new FS::agent_type { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $hashref = $record->pkgpart_hashref;
-  #may purchase $pkgpart if $hashref->{$pkgpart};
-
-  @type_pkgs = $record->type_pkgs;
-
-  @pkgparts = $record->pkgpart;
-
-=head1 DESCRIPTION
-
-An FS::agent_type object represents an agent type.  Every agent (see
-L<FS::agent>) has an agent type.  Agent types define which packages (see
-L<FS::part_pkg>) may be purchased by customers (see L<FS::cust_main>), via 
-FS::type_pkgs records (see L<FS::type_pkgs>).  FS::agent_type inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item typenum - primary key (assigned automatically for new agent types)
-
-=item atype - Text name of this agent type
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new agent type.  To add the agent type to the database, see
-L<"insert">.
-
-=cut
-
-sub table { 'agent_type'; }
-
-=item insert
-
-Adds this agent type to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this agent type from the database.  Only agent types with no agents
-can be deleted.  If there is an error, returns the error, otherwise returns
-false.
-
-=cut
-
-sub delete {
-  my $self = shift;
-
-  return "Can't delete an agent_type with agents!"
-    if qsearch( 'agent', { 'typenum' => $self->typenum } );
-
-  $self->SUPER::delete;
-}
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid agent type.  If there is an
-error, returns the error, otherwise returns false.  Called by the insert and
-replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  $self->ut_numbern('typenum')
-  or $self->ut_text('atype');
-
-}
-
-=item pkgpart_hashref
-
-Returns a hash reference.  The keys of the hash are pkgparts.  The value is
-true iff this agent may purchase the specified package definition.  See
-L<FS::part_pkg>.
-
-=cut
-
-sub pkgpart_hashref {
-  my $self = shift;
-  my %pkgpart;
-  #$pkgpart{$_}++ foreach $self->pkgpart;
-  # not compatible w/5.004_04 (fixed in 5.004_05)
-  foreach ( $self->pkgpart ) { $pkgpart{$_}++; }
-  \%pkgpart;
-}
-
-=item type_pkgs
-
-Returns all FS::type_pkgs objects (see L<FS::type_pkgs>) for this agent type.
-
-=cut
-
-sub type_pkgs {
-  my $self = shift;
-  qsearch('type_pkgs', { 'typenum' => $self->typenum } );
-}
-
-=item pkgpart
-
-Returns the pkgpart of all package definitions (see L<FS::part_pkg>) for this
-agent type.
-
-=cut
-
-sub pkgpart {
-  my $self = shift;
-  map $_->pkgpart, $self->type_pkgs;
-}
-
-=back
-
-=head1 VERSION
-
-$Id: agent_type.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::agent>, L<FS::type_pkgs>, L<FS::cust_main>,
-L<FS::part_pkg>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
deleted file mode 100644
index 5a9fdd09b..000000000
--- a/FS/FS/cust_bill.pm
+++ /dev/null
@@ -1,976 +0,0 @@
-package FS::cust_bill;
-
-use strict;
-use vars qw( @ISA $conf $money_char );
-use vars qw( $lpr $invoice_from $smtpmachine );
-use vars qw( $processor );
-use vars qw( $xaction $E_NoErr );
-use vars qw( $bop_processor $bop_login $bop_password $bop_action @bop_options );
-use vars qw( $invoice_lines @buf ); #yuck
-use Date::Format;
-use Mail::Internet 1.44;
-use Mail::Header;
-use Text::Template;
-use FS::Record qw( qsearch qsearchs );
-use FS::cust_main;
-use FS::cust_bill_pkg;
-use FS::cust_credit;
-use FS::cust_pay;
-use FS::cust_pkg;
-use FS::cust_credit_bill;
-use FS::cust_pay_batch;
-use FS::cust_bill_event;
-
-@ISA = qw( FS::Record );
-
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::cust_bill'} = sub { 
-
-  $conf = new FS::Conf;
-
-  $money_char = $conf->config('money_char') || '$';  
-
-  $lpr = $conf->config('lpr');
-  $invoice_from = $conf->config('invoice_from');
-  $smtpmachine = $conf->config('smtpmachine');
-
-  if ( $conf->exists('cybercash3.2') ) {
-    require CCMckLib3_2;
-      #qw($MCKversion %Config InitConfig CCError CCDebug CCDebug2);
-    require CCMckDirectLib3_2;
-      #qw(SendCC2_1Server);
-    require CCMckErrno3_2;
-      #qw(MCKGetErrorMessage $E_NoErr);
-    import CCMckErrno3_2 qw($E_NoErr);
-
-    my $merchant_conf;
-    ($merchant_conf,$xaction)= $conf->config('cybercash3.2');
-    my $status = &CCMckLib3_2::InitConfig($merchant_conf);
-    if ( $status != $E_NoErr ) {
-      warn "CCMckLib3_2::InitConfig error:\n";
-      foreach my $key (keys %CCMckLib3_2::Config) {
-        warn "  $key => $CCMckLib3_2::Config{$key}\n"
-      }
-      my($errmsg) = &CCMckErrno3_2::MCKGetErrorMessage($status);
-      die "CCMckLib3_2::InitConfig fatal error: $errmsg\n";
-    }
-    $processor='cybercash3.2';
-  } elsif ( $conf->exists('business-onlinepayment') ) {
-    ( $bop_processor,
-      $bop_login,
-      $bop_password,
-      $bop_action,
-      @bop_options
-    ) = $conf->config('business-onlinepayment');
-    $bop_action ||= 'normal authorization';
-    eval "use Business::OnlinePayment";  
-    $processor="Business::OnlinePayment::$bop_processor";
-  }
-
-};
-
-=head1 NAME
-
-FS::cust_bill - Object methods for cust_bill records
-
-=head1 SYNOPSIS
-
-  use FS::cust_bill;
-
-  $record = new FS::cust_bill \%hash;
-  $record = new FS::cust_bill { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  ( $total_previous_balance, @previous_cust_bill ) = $record->previous;
-
-  @cust_bill_pkg_objects = $cust_bill->cust_bill_pkg;
-
-  ( $total_previous_credits, @previous_cust_credit ) = $record->cust_credit;
-
-  @cust_pay_objects = $cust_bill->cust_pay;
-
-  $tax_amount = $record->tax;
-
-  @lines = $cust_bill->print_text;
-  @lines = $cust_bill->print_text $time;
-
-=head1 DESCRIPTION
-
-An FS::cust_bill object represents an invoice; a declaration that a customer
-owes you money.  The specific charges are itemized as B<cust_bill_pkg> records
-(see L<FS::cust_bill_pkg>).  FS::cust_bill inherits from FS::Record.  The
-following fields are currently supported:
-
-=over 4
-
-=item invnum - primary key (assigned automatically for new invoices)
-
-=item custnum - customer (see L<FS::cust_main>)
-
-=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=item charged - amount of this invoice
-
-=item printed - deprecated
-
-=item closed - books closed flag, empty or `Y'
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new invoice.  To add the invoice to the database, see L<"insert">.
-Invoices are normally created by calling the bill method of a customer object
-(see L<FS::cust_main>).
-
-=cut
-
-sub table { 'cust_bill'; }
-
-=item insert
-
-Adds this invoice to the database ("Posts" the invoice).  If there is an error,
-returns the error, otherwise returns false.
-
-=item delete
-
-Currently unimplemented.  I don't remove invoices because there would then be
-no record you ever posted this invoice (which is bad, no?)
-
-=cut
-
-sub delete {
-  my $self = shift;
-  return "Can't delete closed invoice" if $self->closed =~ /^Y/i;
-  $self->SUPER::delete(@_);
-}
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-Only printed may be changed.  printed is normally updated by calling the
-collect method of a customer object (see L<FS::cust_main>).
-
-=cut
-
-sub replace {
-  my( $new, $old ) = ( shift, shift );
-  return "Can't change custnum!" unless $old->custnum == $new->custnum;
-  #return "Can't change _date!" unless $old->_date eq $new->_date;
-  return "Can't change _date!" unless $old->_date == $new->_date;
-  return "Can't change charged!" unless $old->charged == $new->charged;
-
-  $new->SUPER::replace($old);
-}
-
-=item check
-
-Checks all fields to make sure this is a valid invoice.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error =
-    $self->ut_numbern('invnum')
-    || $self->ut_number('custnum')
-    || $self->ut_numbern('_date')
-    || $self->ut_money('charged')
-    || $self->ut_numbern('printed')
-    || $self->ut_enum('closed', [ '', 'Y' ])
-  ;
-  return $error if $error;
-
-  return "Unknown customer"
-    unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
-
-  $self->_date(time) unless $self->_date;
-
-  $self->printed(0) if $self->printed eq '';
-
-  ''; #no error
-}
-
-=item previous
-
-Returns a list consisting of the total previous balance for this customer, 
-followed by the previous outstanding invoices (as FS::cust_bill objects also).
-
-=cut
-
-sub previous {
-  my $self = shift;
-  my $total = 0;
-  my @cust_bill = sort { $a->_date <=> $b->_date }
-    grep { $_->owed != 0 && $_->_date < $self->_date }
-      qsearch( 'cust_bill', { 'custnum' => $self->custnum } ) 
-  ;
-  foreach ( @cust_bill ) { $total += $_->owed; }
-  $total, @cust_bill;
-}
-
-=item cust_bill_pkg
-
-Returns the line items (see L<FS::cust_bill_pkg>) for this invoice.
-
-=cut
-
-sub cust_bill_pkg {
-  my $self = shift;
-  qsearch( 'cust_bill_pkg', { 'invnum' => $self->invnum } );
-}
-
-=item cust_bill_event
-
-Returns the completed invoice events (see L<FS::cust_bill_event>) for this
-invoice.
-
-=cut
-
-sub cust_bill_event {
-  my $self = shift;
-  qsearch( 'cust_bill_event', { 'invnum' => $self->invnum } );
-}
-
-
-=item cust_main
-
-Returns the customer (see L<FS::cust_main>) for this invoice.
-
-=cut
-
-sub cust_main {
-  my $self = shift;
-  qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
-}
-
-=item cust_credit
-
-Depreciated.  See the cust_credited method.
-
- #Returns a list consisting of the total previous credited (see
- #L<FS::cust_credit>) and unapplied for this customer, followed by the previous
- #outstanding credits (FS::cust_credit objects).
-
-=cut
-
-sub cust_credit {
-  use Carp;
-  croak "FS::cust_bill->cust_credit depreciated; see ".
-        "FS::cust_bill->cust_credit_bill";
-  #my $self = shift;
-  #my $total = 0;
-  #my @cust_credit = sort { $a->_date <=> $b->_date }
-  #  grep { $_->credited != 0 && $_->_date < $self->_date }
-  #    qsearch('cust_credit', { 'custnum' => $self->custnum } )
-  #;
-  #foreach (@cust_credit) { $total += $_->credited; }
-  #$total, @cust_credit;
-}
-
-=item cust_pay
-
-Depreciated.  See the cust_bill_pay method.
-
-#Returns all payments (see L<FS::cust_pay>) for this invoice.
-
-=cut
-
-sub cust_pay {
-  use Carp;
-  croak "FS::cust_bill->cust_pay depreciated; see FS::cust_bill->cust_bill_pay";
-  #my $self = shift;
-  #sort { $a->_date <=> $b->_date }
-  #  qsearch( 'cust_pay', { 'invnum' => $self->invnum } )
-  #;
-}
-
-=item cust_bill_pay
-
-Returns all payment applications (see L<FS::cust_bill_pay>) for this invoice.
-
-=cut
-
-sub cust_bill_pay {
-  my $self = shift;
-  sort { $a->_date <=> $b->_date }
-    qsearch( 'cust_bill_pay', { 'invnum' => $self->invnum } );
-}
-
-=item cust_credited
-
-Returns all applied credits (see L<FS::cust_credit_bill>) for this invoice.
-
-=cut
-
-sub cust_credited {
-  my $self = shift;
-  sort { $a->_date <=> $b->_date }
-    qsearch( 'cust_credit_bill', { 'invnum' => $self->invnum } )
-  ;
-}
-
-=item tax
-
-Returns the tax amount (see L<FS::cust_bill_pkg>) for this invoice.
-
-=cut
-
-sub tax {
-  my $self = shift;
-  my $total = 0;
-  my @taxlines = qsearch( 'cust_bill_pkg', { 'invnum' => $self->invnum ,
-                                             'pkgnum' => 0 } );
-  foreach (@taxlines) { $total += $_->setup; }
-  $total;
-}
-
-=item owed
-
-Returns the amount owed (still outstanding) on this invoice, which is charged
-minus all payment applications (see L<FS::cust_bill_pay>) and credit
-applications (see L<FS::cust_credit_bill>).
-
-=cut
-
-sub owed {
-  my $self = shift;
-  my $balance = $self->charged;
-  $balance -= $_->amount foreach ( $self->cust_bill_pay );
-  $balance -= $_->amount foreach ( $self->cust_credited );
-  $balance = sprintf( "%.2f", $balance);
-  $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
-  $balance;
-}
-
-=item send
-
-Sends this invoice to the destinations configured for this customer: send
-emails or print.  See L<FS::cust_main_invoice>.
-
-=cut
-
-sub send {
-  my($self,$template) = @_;
-  my @print_text = $self->print_text('', $template);
-  my @invoicing_list = $self->cust_main->invoicing_list;
-
-  if ( grep { $_ ne 'POST' } @invoicing_list ) { #email invoice
-    #false laziness w/FS::cust_pay::delete & fs_signup_server && ::realtime_card
-    #$ENV{SMTPHOSTS} = $smtpmachine;
-    $ENV{MAILADDRESS} = $invoice_from;
-    my $header = new Mail::Header ( [
-      "From: $invoice_from",
-      "To: ". join(', ', grep { $_ ne 'POST' } @invoicing_list ),
-      "Sender: $invoice_from",
-      "Reply-To: $invoice_from",
-      "Date: ". time2str("%a, %d %b %Y %X %z", time),
-      "Subject: Invoice",
-    ] );
-    my $message = new Mail::Internet (
-      'Header' => $header,
-      'Body' => [ @print_text ], #( date)
-    );
-    $!=0;
-    $message->smtpsend( Host => $smtpmachine )
-      or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-        or return "(customer # ". $self->custnum. ") can't send invoice email".
-                  " to ". join(', ', grep { $_ ne 'POST' } @invoicing_list ).
-                  " via server $smtpmachine with SMTP: $!";
-
-  }
-
-  if ( ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list ) { #postal
-    open(LPR, "|$lpr")
-      or return "Can't open pipe to $lpr: $!";
-    print LPR @print_text;
-    close LPR
-      or return $! ? "Error closing $lpr: $!"
-                   : "Exit status $? from $lpr";
-  }
-
-  '';
-
-}
-
-=item comp
-
-Pays this invoice with a compliemntary payment.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub comp {
-  my $self = shift;
-  my $cust_pay = new FS::cust_pay ( {
-    'invnum'   => $self->invnum,
-    'paid'     => $self->owed,
-    '_date'    => '',
-    'payby'    => 'COMP',
-    'payinfo'  => $self->cust_main->payinfo,
-    'paybatch' => '',
-  } );
-  $cust_pay->insert;
-}
-
-=item realtime_card
-
-Attempts to pay this invoice with a Business::OnlinePayment realtime gateway.
-See http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment
-for supproted processors.
-
-=cut
-
-sub realtime_card {
-  my $self = shift;
-  my $cust_main = $self->cust_main;
-  my $amount = $self->owed;
-
-  unless ( $processor =~ /^Business::OnlinePayment::(.*)$/ ) {
-    return "Real-time card processing not enabled (processor $processor)";
-  }
-  my $bop_processor = $1; #hmm?
-
-  my $address = $cust_main->address1;
-  $address .= ", ". $cust_main->address2 if $cust_main->address2;
-
-  #fix exp. date
-  #$cust_main->paydate =~ /^(\d+)\/\d*(\d{2})$/;
-  $cust_main->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
-  my $exp = "$2/$1";
-
-  my($payname, $payfirst, $paylast);
-  if ( $cust_main->payname ) {
-    $payname = $cust_main->payname;
-    $payname =~ /^\s*([\w \,\.\-\']*)?\s+([\w\,\.\-\']+)\s*$/
-      or do {
-              #$dbh->rollback if $oldAutoCommit;
-              return "Illegal payname $payname";
-            };
-    ($payfirst, $paylast) = ($1, $2);
-  } else {
-    $payfirst = $cust_main->getfield('first');
-    $paylast = $cust_main->getfield('last');
-    $payname =  "$payfirst $paylast";
-  }
-
-  my @invoicing_list = grep { $_ ne 'POST' } $cust_main->invoicing_list;
-  if ( $conf->exists('emailinvoiceauto')
-       || ( $conf->exists('emailinvoiceonly') && ! @invoicing_list ) ) {
-    push @invoicing_list, $cust_main->default_invoicing_list;
-  }
-  my $email = $invoicing_list[0];
-
-  my( $action1, $action2 ) = split(/\s*\,\s*/, $bop_action );
-
-  my $description = 'Internet Services';
-  if ( $conf->exists('business-onlinepayment-description') ) {
-    my $dtempl = $conf->config('business-onlinepayment-description');
-
-    my $agent_obj = $cust_main->agent
-      or die "can't retreive agent for $cust_main (agentnum ".
-             $cust_main->agentnum. ")";
-    my $agent = $agent_obj->agent;
-    my $pkgs = join(', ',
-      map { $_->cust_pkg->part_pkg->pkg }
-        grep { $_->pkgnum } $self->cust_bill_pkg
-    );
-    $description = eval qq("$dtempl");
-
-  }
-  
-  my $transaction =
-    new Business::OnlinePayment( $bop_processor, @bop_options );
-  $transaction->content(
-    'type'           => 'CC',
-    'login'          => $bop_login,
-    'password'       => $bop_password,
-    'action'         => $action1,
-    'description'    => $description,
-    'amount'         => $amount,
-    'invoice_number' => $self->invnum,
-    'customer_id'    => $self->custnum,
-    'last_name'      => $paylast,
-    'first_name'     => $payfirst,
-    'name'           => $payname,
-    'address'        => $address,
-    'city'           => $cust_main->city,
-    'state'          => $cust_main->state,
-    'zip'            => $cust_main->zip,
-    'country'        => $cust_main->country,
-    'card_number'    => $cust_main->payinfo,
-    'expiration'     => $exp,
-    'referer'        => 'http://cleanwhisker.420.am/',
-    'email'          => $email,
-    'phone'          => $cust_main->daytime || $cust_main->night,
-  );
-  $transaction->submit();
-
-  if ( $transaction->is_success() && $action2 ) {
-    my $auth = $transaction->authorization;
-    my $ordernum = $transaction->order_number;
-
-    #warn "********* $auth ***********\n";
-    #warn "********* $ordernum ***********\n";
-    my $capture =
-      new Business::OnlinePayment( $bop_processor, @bop_options );
-
-    $capture->content(
-      action         => $action2,
-      login          => $bop_login,
-      password       => $bop_password,
-      order_number   => $ordernum,
-      amount         => $amount,
-      authorization  => $auth,
-      description    => $description,
-    );
-
-    $capture->submit();
-
-    unless ( $capture->is_success ) {
-      my $e = "Authorization sucessful but capture failed, invnum #".
-              $self->invnum. ': '.  $capture->result_code.
-              ": ". $capture->error_message;
-      warn $e;
-      return $e;
-    }
-
-  }
-
-  if ( $transaction->is_success() ) {
-
-    my $cust_pay = new FS::cust_pay ( {
-       'invnum'   => $self->invnum,
-       'paid'     => $amount,
-       '_date'     => '',
-       'payby'    => 'CARD',
-       'payinfo'  => $cust_main->payinfo,
-       'paybatch' => "$processor:". $transaction->authorization,
-    } );
-    my $error = $cust_pay->insert;
-    if ( $error ) {
-      # gah, even with transactions.
-      my $e = 'WARNING: Card debited but database not updated - '.
-              'error applying payment, invnum #' . $self->invnum.
-              " ($processor): $error";
-      warn $e;
-      return $e;
-    } else {
-      return '';
-    }
-  #} elsif ( $options{'report_badcard'} ) {
-  } else {
-
-    my $perror = "$processor error, invnum #". $self->invnum. ': '.
-                 $transaction->result_code. ": ". $transaction->error_message;
-
-    if ( $conf->exists('emaildecline')
-         && grep { $_ ne 'POST' } $cust_main->invoicing_list
-    ) {
-      my @templ = $conf->config('declinetemplate');
-      my $template = new Text::Template (
-        TYPE   => 'ARRAY',
-        SOURCE => [ map "$_\n", @templ ],
-      ) or return "($perror) can't create template: $Text::Template::ERROR";
-      $template->compile()
-        or return "($perror) can't compile template: $Text::Template::ERROR";
-
-      my $templ_hash = { error => $transaction->error_message };
-
-      #false laziness w/FS::cust_pay::delete & fs_signup_server && ::send
-      $ENV{MAILADDRESS} = $invoice_from;
-      my $header = new Mail::Header ( [
-        "From: $invoice_from",
-        "To: ". join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list ),
-        "Sender: $invoice_from",
-        "Reply-To: $invoice_from",
-        "Date: ". time2str("%a, %d %b %Y %X %z", time),
-        "Subject: Your credit card could not be processed",
-      ] );
-      my $message = new Mail::Internet (
-        'Header' => $header,
-        'Body' => [ $template->fill_in(HASH => $templ_hash) ],
-      );
-      $!=0;
-      $message->smtpsend( Host => $smtpmachine )
-        or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-          or return "($perror) (customer # ". $self->custnum.
-            ") can't send card decline email to ".
-            join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list ).
-            " via server $smtpmachine with SMTP: $!";
-    }
-  
-    return $perror;
-  }
-
-}
-
-=item realtime_card_cybercash
-
-Attempts to pay this invoice with the CyberCash CashRegister realtime gateway.
-
-=cut
-
-sub realtime_card_cybercash {
-  my $self = shift;
-  my $cust_main = $self->cust_main;
-  my $amount = $self->owed;
-
-  return "CyberCash CashRegister real-time card processing not enabled!"
-    unless $processor eq 'cybercash3.2';
-
-  my $address = $cust_main->address1;
-  $address .= ", ". $cust_main->address2 if $cust_main->address2;
-
-  #fix exp. date
-  #$cust_main->paydate =~ /^(\d+)\/\d*(\d{2})$/;
-  $cust_main->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
-  my $exp = "$2/$1";
-
-  #
-
-  my $paybatch = $self->invnum. 
-                  '-' . time2str("%y%m%d%H%M%S", time);
-
-  my $payname = $cust_main->payname ||
-                $cust_main->getfield('first').' '.$cust_main->getfield('last');
-
-  my $country = $cust_main->country eq 'US' ? 'USA' : $cust_main->country;
-
-  my @full_xaction = ( $xaction,
-    'Order-ID'     => $paybatch,
-    'Amount'       => "usd $amount",
-    'Card-Number'  => $cust_main->getfield('payinfo'),
-    'Card-Name'    => $payname,
-    'Card-Address' => $address,
-    'Card-City'    => $cust_main->getfield('city'),
-    'Card-State'   => $cust_main->getfield('state'),
-    'Card-Zip'     => $cust_main->getfield('zip'),
-    'Card-Country' => $country,
-    'Card-Exp'     => $exp,
-  );
-
-  my %result;
-  %result = &CCMckDirectLib3_2::SendCC2_1Server(@full_xaction);
-  
-  if ( $result{'MStatus'} eq 'success' ) { #cybercash smps v.2 or 3
-    my $cust_pay = new FS::cust_pay ( {
-       'invnum'   => $self->invnum,
-       'paid'     => $amount,
-       '_date'     => '',
-       'payby'    => 'CARD',
-       'payinfo'  => $cust_main->payinfo,
-       'paybatch' => "$processor:$paybatch",
-    } );
-    my $error = $cust_pay->insert;
-    if ( $error ) {
-      # gah, even with transactions.
-      my $e = 'WARNING: Card debited but database not updated - '.
-              'error applying payment, invnum #' . $self->invnum.
-              " (CyberCash Order-ID $paybatch): $error";
-      warn $e;
-      return $e;
-    } else {
-      return '';
-    }
-#  } elsif ( $result{'Mstatus'} ne 'failure-bad-money'
-#            || $options{'report_badcard'}
-#          ) {
-  } else {
-     return 'Cybercash error, invnum #' . 
-       $self->invnum. ':'. $result{'MErrMsg'};
-  }
-
-}
-
-=item batch_card
-
-Adds a payment for this invoice to the pending credit card batch (see
-L<FS::cust_pay_batch>).
-
-=cut
-
-sub batch_card {
-  my $self = shift;
-  my $cust_main = $self->cust_main;
-
-  my $cust_pay_batch = new FS::cust_pay_batch ( {
-    'invnum'   => $self->getfield('invnum'),
-    'custnum'  => $cust_main->getfield('custnum'),
-    'last'     => $cust_main->getfield('last'),
-    'first'    => $cust_main->getfield('first'),
-    'address1' => $cust_main->getfield('address1'),
-    'address2' => $cust_main->getfield('address2'),
-    'city'     => $cust_main->getfield('city'),
-    'state'    => $cust_main->getfield('state'),
-    'zip'      => $cust_main->getfield('zip'),
-    'country'  => $cust_main->getfield('country'),
-    'trancode' => 77,
-    'cardnum'  => $cust_main->getfield('payinfo'),
-    'exp'      => $cust_main->getfield('paydate'),
-    'payname'  => $cust_main->getfield('payname'),
-    'amount'   => $self->owed,
-  } );
-  my $error = $cust_pay_batch->insert;
-  die $error if $error;
-
-  '';
-}
-
-=item print_text [TIME];
-
-Returns an text invoice, as a list of lines.
-
-TIME an optional value used to control the printing of overdue messages.  The
-default is now.  It isn't the date of the invoice; that's the `_date' field.
-It is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=cut
-
-sub print_text {
-
-  my( $self, $today, $template ) = @_;
-  $today ||= time;
-#  my $invnum = $self->invnum;
-  my $cust_main = qsearchs('cust_main', { 'custnum', $self->custnum } );
-  $cust_main->payname( $cust_main->first. ' '. $cust_main->getfield('last') )
-    unless $cust_main->payname;
-
-  my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
-#  my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
-  #my $balance_due = $self->owed + $pr_total - $cr_total;
-  my $balance_due = $self->owed + $pr_total;
-
-  #my @collect = ();
-  #my($description,$amount);
-  @buf = ();
-
-  #previous balance
-  foreach ( @pr_cust_bill ) {
-    push @buf, [
-      "Previous Balance, Invoice #". $_->invnum. 
-                 " (". time2str("%x",$_->_date). ")",
-      $money_char. sprintf("%10.2f",$_->owed)
-    ];
-  }
-  if (@pr_cust_bill) {
-    push @buf,['','-----------'];
-    push @buf,[ 'Total Previous Balance',
-                $money_char. sprintf("%10.2f",$pr_total ) ];
-    push @buf,['',''];
-  }
-
-  #new charges
-  foreach ( $self->cust_bill_pkg ) {
-
-    if ( $_->pkgnum ) {
-
-      my($cust_pkg)=qsearchs('cust_pkg', { 'pkgnum', $_->pkgnum } );
-      my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->pkgpart});
-      my($pkg)=$part_pkg->pkg;
-
-      if ( $_->setup != 0 ) {
-        push @buf, [ "$pkg Setup", $money_char. sprintf("%10.2f",$_->setup) ];
-        push @buf,
-          map { [ "  ". $_->[0]. ": ". $_->[1], '' ] } $cust_pkg->labels;
-      }
-
-      if ( $_->recur != 0 ) {
-        push @buf, [
-          "$pkg (" . time2str("%x",$_->sdate) . " - " .
-                                time2str("%x",$_->edate) . ")",
-          $money_char. sprintf("%10.2f",$_->recur)
-        ];
-        push @buf,
-          map { [ "  ". $_->[0]. ": ". $_->[1], '' ] } $cust_pkg->labels;
-      }
-
-    } else { #pkgnum Tax
-      push @buf,["Tax", $money_char. sprintf("%10.2f",$_->setup) ] 
-        if $_->setup != 0;
-    }
-  }
-
-  push @buf,['','-----------'];
-  push @buf,['Total New Charges',
-             $money_char. sprintf("%10.2f",$self->charged) ];
-  push @buf,['',''];
-
-  push @buf,['','-----------'];
-  push @buf,['Total Charges',
-             $money_char. sprintf("%10.2f",$self->charged + $pr_total) ];
-  push @buf,['',''];
-
-  #credits
-  foreach ( $self->cust_credited ) {
-
-    #something more elaborate if $_->amount ne $_->cust_credit->credited ?
-
-    my $reason = substr($_->cust_credit->reason,0,32);
-    $reason .= '...' if length($reason) < length($_->cust_credit->reason);
-    $reason = " ($reason) " if $reason;
-    push @buf,[
-      "Credit #". $_->crednum. " (". time2str("%x",$_->cust_credit->_date) .")".
-        $reason,
-      $money_char. sprintf("%10.2f",$_->amount)
-    ];
-  }
-  #foreach ( @cr_cust_credit ) {
-  #  push @buf,[
-  #    "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
-  #    $money_char. sprintf("%10.2f",$_->credited)
-  #  ];
-  #}
-
-  #get & print payments
-  foreach ( $self->cust_bill_pay ) {
-
-    #something more elaborate if $_->amount ne ->cust_pay->paid ?
-
-    push @buf,[
-      "Payment received ". time2str("%x",$_->cust_pay->_date ),
-      $money_char. sprintf("%10.2f",$_->amount )
-    ];
-  }
-
-  #balance due
-  push @buf,['','-----------'];
-  push @buf,['Balance Due', $money_char. 
-    sprintf("%10.2f", $balance_due ) ];
-
-  #create the template
-  my $templatefile = 'invoice_template';
-  $templatefile .= "_$template" if $template;
-  my @invoice_template = $conf->config($templatefile)
-  or die "cannot load config file $templatefile";
-  $invoice_lines = 0;
-  my $wasfunc = 0;
-  foreach ( grep /invoice_lines\(\d+\)/, @invoice_template ) { #kludgy
-    /invoice_lines\((\d+)\)/;
-    $invoice_lines += $1;
-    $wasfunc=1;
-  }
-  die "no invoice_lines() functions in template?" unless $wasfunc;
-  my $invoice_template = new Text::Template (
-    TYPE   => 'ARRAY',
-    SOURCE => [ map "$_\n", @invoice_template ],
-  ) or die "can't create new Text::Template object: $Text::Template::ERROR";
-  $invoice_template->compile()
-    or die "can't compile template: $Text::Template::ERROR";
-
-  #setup template variables
-  package FS::cust_bill::_template; #!
-  use vars qw( $invnum $date $page $total_pages @address $overdue @buf );
-
-  $invnum = $self->invnum;
-  $date = $self->_date;
-  $page = 1;
-
-  if ( $FS::cust_bill::invoice_lines ) {
-    $total_pages =
-      int( scalar(@FS::cust_bill::buf) / $FS::cust_bill::invoice_lines );
-    $total_pages++
-      if scalar(@FS::cust_bill::buf) % $FS::cust_bill::invoice_lines;
-  } else {
-    $total_pages = 1;
-  }
-
-  #format address (variable for the template)
-  my $l = 0;
-  @address = ( '', '', '', '', '', '' );
-  package FS::cust_bill; #!
-  $FS::cust_bill::_template::address[$l++] =
-    $cust_main->payname.
-      ( ( $cust_main->payby eq 'BILL' ) && $cust_main->payinfo
-        ? " (P.O. #". $cust_main->payinfo. ")"
-        : ''
-      )
-  ;
-  $FS::cust_bill::_template::address[$l++] = $cust_main->company
-    if $cust_main->company;
-  $FS::cust_bill::_template::address[$l++] = $cust_main->address1;
-  $FS::cust_bill::_template::address[$l++] = $cust_main->address2
-    if $cust_main->address2;
-  $FS::cust_bill::_template::address[$l++] =
-    $cust_main->city. ", ". $cust_main->state. "  ".  $cust_main->zip;
-  $FS::cust_bill::_template::address[$l++] = $cust_main->country
-    unless $cust_main->country eq 'US';
-
-	#  #overdue? (variable for the template)
-	#  $FS::cust_bill::_template::overdue = ( 
-	#    $balance_due > 0
-	#    && $today > $self->_date 
-	##    && $self->printed > 1
-	#    && $self->printed > 0
-	#  );
-
-  #and subroutine for the template
-
-  sub FS::cust_bill::_template::invoice_lines {
-    my $lines = shift or return @buf;
-    map { 
-      scalar(@buf) ? shift @buf : [ '', '' ];
-    }
-    ( 1 .. $lines );
-  }
-
-
-  #and fill it in
-  $FS::cust_bill::_template::page = 1;
-  my $lines;
-  my @collect;
-  while (@buf) {
-    push @collect, split("\n",
-      $invoice_template->fill_in( PACKAGE => 'FS::cust_bill::_template' )
-    );
-    $FS::cust_bill::_template::page++;
-  }
-
-  map "$_\n", @collect;
-
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_bill.pm,v 1.38 2002-06-26 02:37:48 ivan Exp $
-
-=head1 BUGS
-
-The delete method.
-
-print_text formatting (and some logic :/) is in source, but needs to be
-slurped in from a file.  Also number of lines ($=).
-
-missing print_ps for a nice postscript copy (maybe HylaFAX-cover-page-style
-or something similar so the look can be completely customized?)
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_main>, L<FS::cust_bill_pay>, L<FS::cust_pay>,
-L<FS::cust_bill_pkg>, L<FS::cust_bill_credit>, schema.html from the base
-documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/cust_bill_event.pm b/FS/FS/cust_bill_event.pm
deleted file mode 100644
index f631987aa..000000000
--- a/FS/FS/cust_bill_event.pm
+++ /dev/null
@@ -1,175 +0,0 @@
-package FS::cust_bill_event;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-use FS::part_bill_event;
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::cust_bill_event - Object methods for cust_bill_event records
-
-=head1 SYNOPSIS
-
-  use FS::cust_bill_event;
-
-  $record = new FS::cust_bill_event \%hash;
-  $record = new FS::cust_bill_event { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cust_bill_event object represents an complete invoice event.
-FS::cust_bill_event inherits from FS::Record.  The following fields are
-currently supported:
-
-=over 4
-
-=item eventnum - primary key
-
-=item invnum - invoice (see L<FS::cust_bill>)
-
-=item eventpart - event definition (see L<FS::part_bill_event>)
-
-=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new completed invoice event.  To add the compelted invoice event to
-the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'cust_bill_event'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid completed invoice event.  If
-there is an error, returns the error, otherwise returns false.  Called by the
-insert and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  my $error = $self->ut_numbern('eventnum')
-    || $self->ut_number('invnum')
-    || $self->ut_number('eventpart')
-    || $self->ut_number('_date')
-    || $self->ut_enum('status', [qw( done failed )])
-    || $self->ut_textn('statustext')
-  ;
-
-  return "Unknown invnum"
-    unless qsearchs( 'cust_bill' ,{ 'invnum' => $self->invnum } );
-
-  return "Unknown eventpart"
-    unless qsearchs( 'part_bill_event' ,{ 'eventpart' => $self->eventpart } );
-
-  ''; #no error
-}
-
-=item part_bill_event
-
-Returns the invoice event definition (see L<FS::part_bill_event>) for this
-completed invoice event.
-
-=cut
-
-sub part_bill_event {
-  my $self = shift;
-  qsearchs( 'part_bill_event', { 'eventpart' => $self->eventpart } );
-}
-
-=item cust_bill
-
-Returns the invoice (see L<FS::cust_bill>) for this completed invoice event.
-
-=cut
-
-sub cust_bill {
-  my $self = shift;
-  qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
-}
-
-=item retry
-
-Changes the status of this event from B<done> to B<failed>, allowing it to be
-retried.
-
-=cut
-
-sub retry {
-  my $self = shift;
-  return '' unless $self->status eq 'done';
-  my $old = ref($self)->new( { $self->hash } );
-  $self->status('failed');
-  $self->replace($old);
-}
-
-=back
-
-=head1 BUGS
-
-Far too early in the morning.
-
-=head1 SEE ALSO
-
-L<FS::part_bill_event>, L<FS::cust_bill>, L<FS::Record>, schema.html from the
-base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
deleted file mode 100644
index 913704bef..000000000
--- a/FS/FS/cust_bill_pay.pm
+++ /dev/null
@@ -1,219 +0,0 @@
-package FS::cust_bill_pay;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs dbh );
-use FS::cust_bill;
-use FS::cust_pay;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::cust_bill_pay - Object methods for cust_bill_pay records
-
-=head1 SYNOPSIS 
-
-  use FS::cust_bill_pay;
-
-  $record = new FS::cust_bill_pay \%hash;
-  $record = new FS::cust_bill_pay { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cust_bill_pay object represents the application of a payment to a
-specific invoice.  FS::cust_bill_pay inherits from FS::Record.  The following
-fields are currently supported:
-
-=over 4
-
-=item billpaynum - primary key (assigned automatically)
-
-=item invnum - Invoice (see L<FS::cust_bill>)
-
-=item paynum - Payment (see L<FS::cust_pay>)
-
-=item amount - Amount of the payment to apply to the specific invoice.
-
-=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=back
-
-=head1 METHODS
-
-=over 4 
-
-=item new HASHREF
-
-Creates a new record.  To add the record to the database, see L<"insert">.
-
-=cut
-
-sub table { 'cust_bill_pay'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-sub insert {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->check;
-  return $error if $error;
-
-  $error = $self->SUPER::insert;
-
-  my $cust_pay = qsearchs('cust_pay', { 'paynum' => $self->paynum } ) or do {
-    $dbh->rollback if $oldAutoCommit;
-    return "unknown cust_pay.paynum: ". $self->paynum;
-  };
-
-  my $pay_total = 0;
-  $pay_total += $_ foreach map { $_->amount }
-    qsearch('cust_bill_pay', { 'paynum' => $self->paynum } );
-
-  if ( sprintf("%.2f", $pay_total) > sprintf("%.2f", $cust_pay->paid) ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "total cust_bill_pay.amount $pay_total for paynum ". $self->paynum.
-           " greater than cust_pay.paid ". $cust_pay->paid;
-  }
-
-  my $cust_bill = qsearchs('cust_bill', { 'invnum' => $self->invnum } ) or do {
-    $dbh->rollback if $oldAutoCommit;
-    return "unknown cust_bill.invnum: ". $self->invnum;
-  };
-
-  my $bill_total = 0;
-  $bill_total += $_ foreach map { $_->amount }
-    qsearch('cust_bill_pay', { 'invnum' => $self->invnum } );
-  $bill_total += $_ foreach map { $_->amount } 
-    qsearch('cust_credit_bill', { 'invnum' => $self->invnum } );
-  if ( sprintf("%.2f", $bill_total) > sprintf("%.2f", $cust_bill->charged) ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "total cust_bill_pay.amount and cust_credit_bill.amount $bill_total".
-           " for invnum ". $self->invnum.
-           " greater than cust_bill.charged ". $cust_bill->charged;
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-}
-
-=item delete
-
-Deletes this payment application, unless the closed flag for the parent payment
-(see L<FS::cust_pay>) is set.
-
-=cut
-
-sub delete {
-  my $self = shift;
-  return "Can't delete application for closed payment"
-    if $self->cust_pay->closed =~ /^Y/i;
-  $self->SUPER::delete(@_);
-}
-
-=item replace OLD_RECORD
-
-Currently unimplemented (accounting reasons).
-
-=cut
-
-sub replace {
-   return "Can't (yet?) modify cust_bill_pay records!";
-}
-
-=item check
-
-Checks all fields to make sure this is a valid payment.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert method.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-    $self->ut_numbern('billpaynum')
-    || $self->ut_number('invnum')
-    || $self->ut_number('paynum')
-    || $self->ut_money('amount')
-    || $self->ut_numbern('_date')
-  ;
-  return $error if $error;
-
-  return "amount must be > 0" if $self->amount <= 0;
-
-  $self->_date(time) unless $self->_date;
-
-  ''; #no error
-}
-
-=item cust_pay 
-
-Returns the payment (see L<FS::cust_pay>)
-
-=cut
-
-sub cust_pay {
-  my $self = shift;
-  qsearchs( 'cust_pay', { 'paynum' => $self->paynum } );
-}
-
-=item cust_bill 
-
-Returns the invoice (see L<FS::cust_bill>)
-
-=cut
-
-sub cust_bill {
-  my $self = shift;
-  qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_bill_pay.pm,v 1.12 2002-02-07 22:29:34 ivan Exp $
-
-=head1 BUGS
-
-Delete and replace methods.
-
-the checks for over-applied payments could be better done like the ones in
-cust_bill_credit
-
-=head1 SEE ALSO
-
-L<FS::cust_pay>, L<FS::cust_bill>, L<FS::Record>, schema.html from the
-base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
deleted file mode 100644
index 72f9ce4a9..000000000
--- a/FS/FS/cust_bill_pkg.pm
+++ /dev/null
@@ -1,155 +0,0 @@
-package FS::cust_bill_pkg;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs );
-use FS::cust_pkg;
-use FS::cust_bill;
-
-@ISA = qw(FS::Record );
-
-=head1 NAME
-
-FS::cust_bill_pkg - Object methods for cust_bill_pkg records
-
-=head1 SYNOPSIS
-
-  use FS::cust_bill_pkg;
-
-  $record = new FS::cust_bill_pkg \%hash;
-  $record = new FS::cust_bill_pkg { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cust_bill_pkg object represents an invoice line item.
-FS::cust_bill_pkg inherits from FS::Record.  The following fields are currently
-supported:
-
-=over 4
-
-=item invnum - invoice (see L<FS::cust_bill>)
-
-=item pkgnum - package (see L<FS::cust_pkg>) or 0 for the special virtual sales tax package
-
-=item setup - setup fee
-
-=item recur - recurring fee
-
-=item sdate - starting date of recurring fee
-
-=item edate - ending date of recurring fee
-
-=back
-
-sdate and edate are specified as UNIX timestamps; see L<perlfunc/"time">.  Also
-see L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new line item.  To add the line item to the database, see
-L<"insert">.  Line items are normally created by calling the bill method of a
-customer object (see L<FS::cust_main>).
-
-=cut
-
-sub table { 'cust_bill_pkg'; }
-
-=item insert
-
-Adds this line item to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Currently unimplemented.  I don't remove line items because there would then be
-no record the items ever existed (which is bad, no?)
-
-=cut
-
-sub delete {
-  return "Can't delete cust_bill_pkg records!";
-}
-
-=item replace OLD_RECORD
-
-Currently unimplemented.  This would be even more of an accounting nightmare
-than deleteing the items.  Just don't do it.
-
-=cut
-
-sub replace {
-  return "Can't modify cust_bill_pkg records!";
-}
-
-=item check
-
-Checks all fields to make sure this is a valid line item.  If there is an
-error, returns the error, otherwise returns false.  Called by the insert
-method.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error =
-    $self->ut_number('pkgnum')
-      || $self->ut_number('invnum')
-      || $self->ut_money('setup')
-      || $self->ut_money('recur')
-      || $self->ut_numbern('sdate')
-      || $self->ut_numbern('edate')
-  ;
-  return $error if $error;
-
-  if ( $self->pkgnum != 0 ) { #allow unchecked pkgnum 0 for tax! (add to part_pkg?)
-    return "Unknown pkgnum ". $self->pkgnum
-      unless qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
-  }
-
-  return "Unknown invnum"
-    unless qsearchs( 'cust_bill' ,{ 'invnum' => $self->invnum } );
-
-  ''; #no error
-}
-
-=item cust_pkg
-
-Returns the package (see L<FS::cust_pkg>) for this invoice line item.
-
-=cut
-
-sub cust_pkg {
-  my $self = shift;
-  qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_bill_pkg.pm,v 1.3 2002-04-06 22:32:43 ivan Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_bill>, L<FS::cust_pkg>, L<FS::cust_main>, schema.html
-from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
deleted file mode 100644
index 284d59de2..000000000
--- a/FS/FS/cust_credit.pm
+++ /dev/null
@@ -1,260 +0,0 @@
-package FS::cust_credit;
-
-use strict;
-use vars qw( @ISA $conf $unsuspendauto );
-use FS::UID qw( dbh getotaker );
-use FS::Record qw( qsearch qsearchs );
-use FS::cust_main;
-use FS::cust_refund;
-use FS::cust_credit_bill;
-
-@ISA = qw( FS::Record );
-
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::cust_credit'} = sub { 
-
-  $conf = new FS::Conf;
-  $unsuspendauto = $conf->exists('unsuspendauto');
-
-};
-
-=head1 NAME
-
-FS::cust_credit - Object methods for cust_credit records
-
-=head1 SYNOPSIS
-
-  use FS::cust_credit;
-
-  $record = new FS::cust_credit \%hash;
-  $record = new FS::cust_credit { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cust_credit object represents a credit; the equivalent of a negative
-B<cust_bill> record (see L<FS::cust_bill>).  FS::cust_credit inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item crednum - primary key (assigned automatically for new credits)
-
-=item custnum - customer (see L<FS::cust_main>)
-
-=item amount - amount of the credit
-
-=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=item otaker - order taker (assigned automatically, see L<FS::UID>)
-
-=item reason - text
-
-=item closed - books closed flag, empty or `Y'
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new credit.  To add the credit to the database, see L<"insert">.
-
-=cut
-
-sub table { 'cust_credit'; }
-
-=item insert
-
-Adds this credit to the database ("Posts" the credit).  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub insert {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $cust_main = qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
-  my $old_balance = $cust_main->balance;
-
-  my $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "error inserting $self: $error";
-  }
-
-  #false laziness w/ cust_credit::insert
-  if ( $unsuspendauto && $old_balance && $cust_main->balance <= 0 ) {
-    my @errors = $cust_main->unsuspend;
-    #return 
-    # side-fx with nested transactions?  upstack rolls back?
-    warn "WARNING:Errors unsuspending customer ". $cust_main->custnum. ": ".
-         join(' / ', @errors)
-      if @errors;
-  }
-  #eslaf
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-}
-
-=item delete
-
-Currently unimplemented.
-
-=cut
-
-sub delete {
-  my $self = shift;
-  return "Can't delete closed credit" if $self->closed =~ /^Y/i;
-  $self->SUPER::delete(@_);
-}
-
-=item replace OLD_RECORD
-
-Credits may not be modified; there would then be no record the credit was ever
-posted.
-
-=cut
-
-sub replace {
-  return "Can't modify credit!"
-}
-
-=item check
-
-Checks all fields to make sure this is a valid credit.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error =
-    $self->ut_numbern('crednum')
-    || $self->ut_number('custnum')
-    || $self->ut_numbern('_date')
-    || $self->ut_money('amount')
-    || $self->ut_textn('reason')
-    || $self->ut_enum('closed', [ '', 'Y' ])
-  ;
-  return $error if $error;
-
-  return "amount must be > 0 " if $self->amount <= 0;
-
-  return "Unknown customer"
-    unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
-
-  $self->_date(time) unless $self->_date;
-
-  $self->otaker(getotaker);
-
-  ''; #no error
-}
-
-=item cust_refund
-
-Depreciated.  See the cust_credit_refund method.
-
-#Returns all refunds (see L<FS::cust_refund>) for this credit.
-
-=cut
-
-sub cust_refund {
-  use Carp;
-  croak "FS::cust_credit->cust_pay depreciated; see ".
-        "FS::cust_credit->cust_credit_refund";
-  #my $self = shift;
-  #sort { $a->_date <=> $b->_date }
-  #  qsearch( 'cust_refund', { 'crednum' => $self->crednum } )
-  #;
-}
-
-=item cust_credit_refund
-
-Returns all refund applications (see L<FS::cust_credit_refund>) for this credit.
-
-=cut
-
-sub cust_credit_refund {
-  my $self = shift;
-  sort { $a->_date <=> $b->_date }
-    qsearch( 'cust_credit_refund', { 'crednum' => $self->crednum } )
-  ;
-}
-
-=item cust_credit_bill
-
-Returns all application to invoices (see L<FS::cust_credit_bill>) for this
-credit.
-
-=cut
-
-sub cust_credit_bill {
-  my $self = shift;
-  sort { $a->_date <=> $b->_date }
-    qsearch( 'cust_credit_bill', { 'crednum' => $self->crednum } )
-  ;
-}
-
-=item credited
-
-Returns the amount of this credit that is still outstanding; which is
-amount minus all refund applications (see L<FS::cust_credit_refund>) and
-applications to invoices (see L<FS::cust_credit_bill>).
-
-=cut
-
-sub credited {
-  my $self = shift;
-  my $amount = $self->amount;
-  $amount -= $_->amount foreach ( $self->cust_credit_refund );
-  $amount -= $_->amount foreach ( $self->cust_credit_bill );
-  sprintf( "%.2f", $amount );
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_credit.pm,v 1.16 2002-06-04 14:35:52 ivan Exp $
-
-=head1 BUGS
-
-The delete method.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_credit_refund>, L<FS::cust_refund>,
-L<FS::cust_credit_bill> L<FS::cust_bill>, schema.html from the base
-documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/cust_credit_bill.pm b/FS/FS/cust_credit_bill.pm
deleted file mode 100644
index 62215419c..000000000
--- a/FS/FS/cust_credit_bill.pm
+++ /dev/null
@@ -1,162 +0,0 @@
-package FS::cust_credit_bill;
-
-use strict;
-use vars qw( @ISA );
-use FS::UID qw( getotaker );
-use FS::Record qw( qsearch qsearchs );
-use FS::cust_main;
-#use FS::cust_refund;
-use FS::cust_credit;
-use FS::cust_bill;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::cust_credit_bill - Object methods for cust_credit_bill records
-
-=head1 SYNOPSIS
-
-  use FS::cust_credit_bill;
-
-  $record = new FS::cust_credit_bill \%hash;
-  $record = new FS::cust_credit_bill { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cust_credit_bill object represents application of a credit (see
-L<FS::cust_credit>) to an invoice (see L<FS::cust_bill>).  FS::cust_credit
-inherits from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item creditbillnum - primary key
-
-=item crednum - credit being applied 
-
-=item invnum - invoice to which credit is applied (see L<FS::cust_bill>)
-
-=item amount - amount of the credit applied
-
-=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new cust_credit_bill.  To add the cust_credit_bill to the database,
-see L<"insert">.
-
-=cut
-
-sub table { 'cust_credit_bill'; }
-
-=item insert
-
-Adds this cust_credit_bill to the database ("Posts" all or part of a credit).
-If there is an error, returns the error, otherwise returns false.
-
-=item delete
-
-Currently unimplemented.
-
-=cut
-
-sub delete {
-  return "Can't unapply credit!"
-}
-
-=item replace OLD_RECORD
-
-Application of credits may not be modified.
-
-=cut
-
-sub replace {
-  return "Can't modify application of credit!"
-}
-
-=item check
-
-Checks all fields to make sure this is a valid credit application.  If there
-is an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error =
-    $self->ut_numbern('creditbillnum')
-    || $self->ut_number('crednum')
-    || $self->ut_number('invnum')
-    || $self->ut_numbern('_date')
-    || $self->ut_money('amount')
-  ;
-  return $error if $error;
-
-  return "amount must be > 0" if $self->amount <= 0;
-
-  return "Unknown credit"
-    unless my $cust_credit = 
-      qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
-
-  return "Unknown invoice"
-    unless my $cust_bill =
-      qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
-
-  $self->_date(time) unless $self->_date;
-
-  return "Cannot apply more than remaining value of credit"
-    unless $self->amount <= $cust_credit->credited;
-
-  return "Cannot apply more than remaining value of invoice"
-    unless $self->amount <= $cust_bill->owed;
-
-  ''; #no error
-}
-
-=item sub cust_credit
-
-Returns the credit (see L<FS::cust_credit>)
-
-=cut
-
-sub cust_credit {
-  my $self = shift;
-  qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_credit_bill.pm,v 1.7 2002-01-24 16:58:47 ivan Exp $
-
-=head1 BUGS
-
-The delete method.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_refund>, L<FS::cust_bill>, L<FS::cust_credit>,
-schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/cust_credit_refund.pm b/FS/FS/cust_credit_refund.pm
deleted file mode 100644
index cc3b32cdb..000000000
--- a/FS/FS/cust_credit_refund.pm
+++ /dev/null
@@ -1,205 +0,0 @@
-package FS::cust_credit_refund;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs dbh );
-#use FS::UID qw(getotaker);
-use FS::cust_credit;
-use FS::cust_refund;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::cust_credit_refund - Object methods for cust_bill_pay records
-
-=head1 SYNOPSIS 
-
-  use FS::cust_credit_refund;
-
-  $record = new FS::cust_credit_refund \%hash;
-  $record = new FS::cust_credit_refund { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cust_credit_refund represents the application of a refund to a specific
-credit.  FS::cust_credit_refund inherits from FS::Record.  The following fields
-are currently supported:
-
-=over 4
-
-=item creditrefundnum - primary key (assigned automatically)
-
-=item crednum - Credit (see L<FS::cust_credit>)
-
-=item refundnum - Refund (see L<FS::cust_refund>)
-
-=item amount - Amount of the refund to apply to the specific credit.
-
-=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=back
-
-=head1 METHODS
-
-=over 4 
-
-=item new HASHREF
-
-Creates a new record.  To add the record to the database, see L<"insert">.
-
-=cut
-
-sub table { 'cust_credit_refund'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-sub insert {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->check;
-  return $error if $error;
-
-  $error = $self->SUPER::insert;
-
-  my $cust_refund =
-    qsearchs('cust_refund', { 'refundnum' => $self->refundnum } )
-  or do {
-    $dbh->rollback if $oldAutoCommit;
-    return "unknown cust_refund.refundnum: ". $self->refundnum
-  };
-
-  my $refund_total = 0;
-  $refund_total += $_ foreach map { $_->amount }
-    qsearch('cust_credit_refund', { 'refundnum' => $self->refundnum } );
-
-  if ( $refund_total > $cust_refund->refund ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "total cust_credit_refund.amount $refund_total for refundnum ".
-           $self->refundnum.
-           " greater than cust_refund.refund ". $cust_refund->refund;
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-}
-
-=item delete
-
-Currently unimplemented (accounting reasons).
-
-=cut
-
-sub delete {
-  return "Can't (yet?) delete cust_credit_refund records!";
-}
-
-=item replace OLD_RECORD
-
-Currently unimplemented (accounting reasons).
-
-=cut
-
-sub replace {
-   return "Can't (yet?) modify cust_credit_refund records!";
-}
-
-=item check
-
-Checks all fields to make sure this is a valid payment.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert method.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-    $self->ut_numbern('creditrefundnum')
-    || $self->ut_number('crednum')
-    || $self->ut_number('refundnum')
-    || $self->ut_money('amount')
-    || $self->ut_numbern('_date')
-  ;
-  return $error if $error;
-
-  return "amount must be > 0" if $self->amount <= 0;
-
-  $self->_date(time) unless $self->_date;
-
-  return "unknown cust_credit.crednum: ". $self->crednum
-    unless qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
-
-  ''; #no error
-}
-
-=item cust_refund
-
-Returns the refund (see L<FS::cust_refund>)
-
-=cut
-
-sub cust_refund {
-  my $self = shift;
-  qsearchs( 'cust_refund', { 'refundnum' => $self->refundnum } );
-}
-
-=item cust_credit
-
-Returns the credit (see L<FS::cust_credit>)
-
-=cut
-
-sub cust_credit {
-  my $self = shift;
-  qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_credit_refund.pm,v 1.9 2002-01-26 01:52:31 ivan Exp $
-
-=head1 BUGS
-
-Delete and replace methods.
-
-the checks for over-applied refunds could be better done like the ones in
-cust_bill_credit
-
-=head1 SEE ALSO
-
-L<FS::cust_credit>, L<FS::cust_refund>, L<FS::Record>, schema.html from the
-base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
deleted file mode 100644
index eb468d981..000000000
--- a/FS/FS/cust_main.pm
+++ /dev/null
@@ -1,1994 +0,0 @@
-package FS::cust_main;
-
-use strict;
-use vars qw( @ISA $conf $Debug $import );
-use Safe;
-use Carp;
-use Time::Local;
-use Date::Format;
-#use Date::Manip;
-use Business::CreditCard;
-use FS::UID qw( getotaker dbh );
-use FS::Record qw( qsearchs qsearch dbdef );
-use FS::cust_pkg;
-use FS::cust_bill;
-use FS::cust_bill_pkg;
-use FS::cust_pay;
-use FS::cust_credit;
-use FS::part_referral;
-use FS::cust_main_county;
-use FS::agent;
-use FS::cust_main_invoice;
-use FS::cust_credit_bill;
-use FS::cust_bill_pay;
-use FS::prepay_credit;
-use FS::queue;
-use FS::part_pkg;
-use FS::part_bill_event;
-use FS::cust_bill_event;
-use FS::cust_tax_exempt;
-use FS::type_pkgs;
-use FS::Msgcat qw(gettext);
-
-@ISA = qw( FS::Record );
-
-$Debug = 0;
-#$Debug = 1;
-
-$import = 0;
-
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::cust_main'} = sub { 
-  $conf = new FS::Conf;
-  #yes, need it for stuff below (prolly should be cached)
-};
-
-sub _cache {
-  my $self = shift;
-  my ( $hashref, $cache ) = @_;
-  if ( exists $hashref->{'pkgnum'} ) {
-#    #@{ $self->{'_pkgnum'} } = ();
-    my $subcache = $cache->subcache( 'pkgnum', 'cust_pkg', $hashref->{custnum});
-    $self->{'_pkgnum'} = $subcache;
-    #push @{ $self->{'_pkgnum'} },
-    FS::cust_pkg->new_or_cached($hashref, $subcache) if $hashref->{pkgnum};
-  }
-}
-
-=head1 NAME
-
-FS::cust_main - Object methods for cust_main records
-
-=head1 SYNOPSIS
-
-  use FS::cust_main;
-
-  $record = new FS::cust_main \%hash;
-  $record = new FS::cust_main { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  @cust_pkg = $record->all_pkgs;
-
-  @cust_pkg = $record->ncancelled_pkgs;
-
-  @cust_pkg = $record->suspended_pkgs;
-
-  $error = $record->bill;
-  $error = $record->bill %options;
-  $error = $record->bill 'time' => $time;
-
-  $error = $record->collect;
-  $error = $record->collect %options;
-  $error = $record->collect 'invoice_time'   => $time,
-                            'batch_card'     => 'yes',
-                            'report_badcard' => 'yes',
-                          ;
-
-=head1 DESCRIPTION
-
-An FS::cust_main object represents a customer.  FS::cust_main inherits from 
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item custnum - primary key (assigned automatically for new customers)
-
-=item agentnum - agent (see L<FS::agent>)
-
-=item refnum - Advertising source (see L<FS::part_referral>)
-
-=item first - name
-
-=item last - name
-
-=item ss - social security number (optional)
-
-=item company - (optional)
-
-=item address1
-
-=item address2 - (optional)
-
-=item city
-
-=item county - (optional, see L<FS::cust_main_county>)
-
-=item state - (see L<FS::cust_main_county>)
-
-=item zip
-
-=item country - (see L<FS::cust_main_county>)
-
-=item daytime - phone (optional)
-
-=item night - phone (optional)
-
-=item fax - phone (optional)
-
-=item ship_first - name
-
-=item ship_last - name
-
-=item ship_company - (optional)
-
-=item ship_address1
-
-=item ship_address2 - (optional)
-
-=item ship_city
-
-=item ship_county - (optional, see L<FS::cust_main_county>)
-
-=item ship_state - (see L<FS::cust_main_county>)
-
-=item ship_zip
-
-=item ship_country - (see L<FS::cust_main_county>)
-
-=item ship_daytime - phone (optional)
-
-=item ship_night - phone (optional)
-
-=item ship_fax - phone (optional)
-
-=item payby - `CARD' (credit cards), `BILL' (billing), `COMP' (free), or `PREPAY' (special billing type: applies a credit - see L<FS::prepay_credit> and sets billing type to BILL)
-
-=item payinfo - card number, P.O., comp issuer (4-8 lowercase alphanumerics; think username) or prepayment identifier (see L<FS::prepay_credit>)
-
-=item paydate - expiration date, mm/yyyy, m/yyyy, mm/yy or m/yy
-
-=item payname - name on card or billing name
-
-=item tax - tax exempt, empty or `Y'
-
-=item otaker - order taker (assigned automatically, see L<FS::UID>)
-
-=item comments - comments (optional)
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new customer.  To add the customer to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-sub table { 'cust_main'; }
-
-=item insert [ CUST_PKG_HASHREF [ , INVOICING_LIST_ARYREF ] ]
-
-Adds this customer to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-CUST_PKG_HASHREF: If you pass a Tie::RefHash data structure to the insert
-method containing FS::cust_pkg and FS::svc_I<tablename> objects, all records
-are inserted atomicly, or the transaction is rolled back.  Passing an empty
-hash reference is equivalent to not supplying this parameter.  There should be
-a better explanation of this, but until then, here's an example:
-
-  use Tie::RefHash;
-  tie %hash, 'Tie::RefHash'; #this part is important
-  %hash = (
-    $cust_pkg => [ $svc_acct ],
-    ...
-  );
-  $cust_main->insert( \%hash );
-
-INVOICING_LIST_ARYREF: If you pass an arrarref to the insert method, it will
-be set as the invoicing list (see L<"invoicing_list">).  Errors return as
-expected and rollback the entire transaction; it is not necessary to call 
-check_invoicing_list first.  The invoicing_list is set after the records in the
-CUST_PKG_HASHREF above are inserted, so it is now possible to set an
-invoicing_list destination to the newly-created svc_acct.  Here's an example:
-
-  $cust_main->insert( {}, [ $email, 'POST' ] );
-
-=cut
-
-sub insert {
-  my $self = shift;
-  my $cust_pkgs = @_ ? shift : {};
-  my $invoicing_list = @_ ? shift : '';
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $amount = 0;
-  my $seconds = 0;
-  if ( $self->payby eq 'PREPAY' ) {
-    $self->payby('BILL');
-    my $prepay_credit = qsearchs(
-      'prepay_credit',
-      { 'identifier' => $self->payinfo },
-      '',
-      'FOR UPDATE'
-    );
-    warn "WARNING: can't find pre-found prepay_credit: ". $self->payinfo
-      unless $prepay_credit;
-    $amount = $prepay_credit->amount;
-    $seconds = $prepay_credit->seconds;
-    my $error = $prepay_credit->delete;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "removing prepay_credit (transaction rolled back): $error";
-    }
-  }
-
-  my $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    #return "inserting cust_main record (transaction rolled back): $error";
-    return $error;
-  }
-
-  # invoicing list
-  if ( $invoicing_list ) {
-    $error = $self->check_invoicing_list( $invoicing_list );
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "checking invoicing_list (transaction rolled back): $error";
-    }
-    $self->invoicing_list( $invoicing_list );
-  }
-
-  # packages
-  foreach my $cust_pkg ( keys %$cust_pkgs ) {
-    $cust_pkg->custnum( $self->custnum );
-    $error = $cust_pkg->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "inserting cust_pkg (transaction rolled back): $error";
-    }
-    foreach my $svc_something ( @{$cust_pkgs->{$cust_pkg}} ) {
-      $svc_something->pkgnum( $cust_pkg->pkgnum );
-      if ( $seconds && $svc_something->isa('FS::svc_acct') ) {
-        $svc_something->seconds( $svc_something->seconds + $seconds );
-        $seconds = 0;
-      }
-      $error = $svc_something->insert;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        #return "inserting svc_ (transaction rolled back): $error";
-        return $error;
-      }
-    }
-  }
-
-  if ( $seconds ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "No svc_acct record to apply pre-paid time";
-  }
-
-  if ( $amount ) {
-    my $cust_credit = new FS::cust_credit {
-      'custnum' => $self->custnum,
-      'amount'  => $amount,
-    };
-    $error = $cust_credit->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "inserting credit (transaction rolled back): $error";
-    }
-  }
-
-  #false laziness with sub replace
-  my $queue = new FS::queue { 'job' => 'FS::cust_main::append_fuzzyfiles' };
-  $error = $queue->insert($self->getfield('last'), $self->company);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "queueing job (transaction rolled back): $error";
-  }
-
-  if ( defined $self->dbdef_table->column('ship_last') && $self->ship_last ) {
-    $queue = new FS::queue { 'job' => 'FS::cust_main::append_fuzzyfiles' };
-    $error = $queue->insert($self->getfield('last'), $self->company);
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-  }
-  #eslaf
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
-}
-
-=item delete NEW_CUSTNUM
-
-This deletes the customer.  If there is an error, returns the error, otherwise
-returns false.
-
-This will completely remove all traces of the customer record.  This is not
-what you want when a customer cancels service; for that, cancel all of the
-customer's packages (see L<FS::cust_pkg/cancel>).
-
-If the customer has any uncancelled packages, you need to pass a new (valid)
-customer number for those packages to be transferred to.  Cancelled packages
-will be deleted.  Did I mention that this is NOT what you want when a customer
-cancels service and that you really should be looking see L<FS::cust_pkg/cancel>?
-
-You can't delete a customer with invoices (see L<FS::cust_bill>),
-or credits (see L<FS::cust_credit>), payments (see L<FS::cust_pay>) or
-refunds (see L<FS::cust_refund>).
-
-=cut
-
-sub delete {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  if ( qsearch( 'cust_bill', { 'custnum' => $self->custnum } ) ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "Can't delete a customer with invoices";
-  }
-  if ( qsearch( 'cust_credit', { 'custnum' => $self->custnum } ) ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "Can't delete a customer with credits";
-  }
-  if ( qsearch( 'cust_pay', { 'custnum' => $self->custnum } ) ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "Can't delete a customer with payments";
-  }
-  if ( qsearch( 'cust_refund', { 'custnum' => $self->custnum } ) ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "Can't delete a customer with refunds";
-  }
-
-  my @cust_pkg = $self->ncancelled_pkgs;
-  if ( @cust_pkg ) {
-    my $new_custnum = shift;
-    unless ( qsearchs( 'cust_main', { 'custnum' => $new_custnum } ) ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "Invalid new customer number: $new_custnum";
-    }
-    foreach my $cust_pkg ( @cust_pkg ) {
-      my %hash = $cust_pkg->hash;
-      $hash{'custnum'} = $new_custnum;
-      my $new_cust_pkg = new FS::cust_pkg ( \%hash );
-      my $error = $new_cust_pkg->replace($cust_pkg);
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return $error;
-      }
-    }
-  }
-  my @cancelled_cust_pkg = $self->all_pkgs;
-  foreach my $cust_pkg ( @cancelled_cust_pkg ) {
-    my $error = $cust_pkg->delete;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  foreach my $cust_main_invoice ( #(email invoice destinations, not invoices)
-    qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } )
-  ) {
-    my $error = $cust_main_invoice->delete;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  my $error = $self->SUPER::delete;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
-}
-
-=item replace OLD_RECORD [ INVOICING_LIST_ARYREF ]
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-INVOICING_LIST_ARYREF: If you pass an arrarref to the insert method, it will
-be set as the invoicing list (see L<"invoicing_list">).  Errors return as
-expected and rollback the entire transaction; it is not necessary to call 
-check_invoicing_list first.  Here's an example:
-
-  $new_cust_main->replace( $old_cust_main, [ $email, 'POST' ] );
-
-=cut
-
-sub replace {
-  my $self = shift;
-  my $old = shift;
-  my @param = @_;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->SUPER::replace($old);
-
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  if ( @param ) { # INVOICING_LIST_ARYREF
-    my $invoicing_list = shift @param;
-    $error = $self->check_invoicing_list( $invoicing_list );
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-    $self->invoicing_list( $invoicing_list );
-  }
-
-  if ( $self->payby eq 'CARD' &&
-       grep { $self->get($_) ne $old->get($_) } qw(payinfo paydate payname) ) {
-    # card info has changed, want to retry realtime_card invoice events
-    #false laziness w/collect
-    foreach my $cust_bill_event (
-      grep {
-             #$_->part_bill_event->plan eq 'realtime-card'
-             $_->part_bill_event->eventcode eq '$cust_bill->realtime_card();'
-               && $_->status eq 'done'
-               && $_->statustext
-           }
-        map { $_->cust_bill_event }
-          grep { $_->cust_bill_event }
-            $self->open_cust_bill
-
-    ) {
-      my $error = $cust_bill_event->retry;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "error scheduling invoice events for retry: $error";
-      }
-    }
-    #eslaf
-
-  }
-
-  #false laziness with sub insert
-  my $queue = new FS::queue { 'job' => 'FS::cust_main::append_fuzzyfiles' };
-  $error = $queue->insert($self->getfield('last'), $self->company);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "queueing job (transaction rolled back): $error";
-  }
-
-  if ( defined $self->dbdef_table->column('ship_last') && $self->ship_last ) {
-    $queue = new FS::queue { 'job' => 'FS::cust_main::append_fuzzyfiles' };
-    $error = $queue->insert($self->getfield('last'), $self->company);
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-  }
-  #eslaf
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
-}
-
-=item check
-
-Checks all fields to make sure this is a valid customer record.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and repalce methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  #warn "BEFORE: \n". $self->_dump;
-
-  my $error =
-    $self->ut_numbern('custnum')
-    || $self->ut_number('agentnum')
-    || $self->ut_number('refnum')
-    || $self->ut_name('last')
-    || $self->ut_name('first')
-    || $self->ut_textn('company')
-    || $self->ut_text('address1')
-    || $self->ut_textn('address2')
-    || $self->ut_text('city')
-    || $self->ut_textn('county')
-    || $self->ut_textn('state')
-    || $self->ut_country('country')
-    || $self->ut_anything('comments')
-    || $self->ut_numbern('referral_custnum')
-  ;
-  #barf.  need message catalogs.  i18n.  etc.
-  $error .= "Please select a advertising source."
-    if $error =~ /^Illegal or empty \(numeric\) refnum: /;
-  return $error if $error;
-
-  return "Unknown agent"
-    unless qsearchs( 'agent', { 'agentnum' => $self->agentnum } );
-
-  return "Unknown refnum"
-    unless qsearchs( 'part_referral', { 'refnum' => $self->refnum } );
-
-  return "Unknown referring custnum ". $self->referral_custnum
-    unless ! $self->referral_custnum 
-           || qsearchs( 'cust_main', { 'custnum' => $self->referral_custnum } );
-
-  if ( $self->ss eq '' ) {
-    $self->ss('');
-  } else {
-    my $ss = $self->ss;
-    $ss =~ s/\D//g;
-    $ss =~ /^(\d{3})(\d{2})(\d{4})$/
-      or return "Illegal social security number: ". $self->ss;
-    $self->ss("$1-$2-$3");
-  }
-
-
-# bad idea to disable, causes billing to fail because of no tax rates later
-#  unless ( $import ) {
-    unless ( qsearchs('cust_main_county', {
-      'country' => $self->country,
-      'state'   => '',
-     } ) ) {
-      return "Unknown state/county/country: ".
-        $self->state. "/". $self->county. "/". $self->country
-        unless qsearchs('cust_main_county',{
-          'state'   => $self->state,
-          'county'  => $self->county,
-          'country' => $self->country,
-        } );
-    }
-#  }
-
-  $error =
-    $self->ut_phonen('daytime', $self->country)
-    || $self->ut_phonen('night', $self->country)
-    || $self->ut_phonen('fax', $self->country)
-    || $self->ut_zip('zip', $self->country)
-  ;
-  return $error if $error;
-
-  my @addfields = qw(
-    last first company address1 address2 city county state zip
-    country daytime night fax
-  );
-
-  if ( defined $self->dbdef_table->column('ship_last') ) {
-    if ( scalar ( grep { $self->getfield($_) ne $self->getfield("ship_$_") }
-                       @addfields )
-         && scalar ( grep { $self->getfield("ship_$_") ne '' } @addfields )
-       )
-    {
-      my $error =
-        $self->ut_name('ship_last')
-        || $self->ut_name('ship_first')
-        || $self->ut_textn('ship_company')
-        || $self->ut_text('ship_address1')
-        || $self->ut_textn('ship_address2')
-        || $self->ut_text('ship_city')
-        || $self->ut_textn('ship_county')
-        || $self->ut_textn('ship_state')
-        || $self->ut_country('ship_country')
-      ;
-      return $error if $error;
-
-      #false laziness with above
-      unless ( qsearchs('cust_main_county', {
-        'country' => $self->ship_country,
-        'state'   => '',
-       } ) ) {
-        return "Unknown ship_state/ship_county/ship_country: ".
-          $self->ship_state. "/". $self->ship_county. "/". $self->ship_country
-          unless qsearchs('cust_main_county',{
-            'state'   => $self->ship_state,
-            'county'  => $self->ship_county,
-            'country' => $self->ship_country,
-          } );
-      }
-      #eofalse
-
-      $error =
-        $self->ut_phonen('ship_daytime', $self->ship_country)
-        || $self->ut_phonen('ship_night', $self->ship_country)
-        || $self->ut_phonen('ship_fax', $self->ship_country)
-        || $self->ut_zip('ship_zip', $self->ship_country)
-      ;
-      return $error if $error;
-
-    } else { # ship_ info eq billing info, so don't store dup info in database
-      $self->setfield("ship_$_", '')
-        foreach qw( last first company address1 address2 city county state zip
-                    country daytime night fax );
-    }
-  }
-
-  $self->payby =~ /^(CARD|BILL|COMP|PREPAY)$/
-    or return "Illegal payby: ". $self->payby;
-  $self->payby($1);
-
-  if ( $self->payby eq 'CARD' ) {
-
-    my $payinfo = $self->payinfo;
-    $payinfo =~ s/\D//g;
-    $payinfo =~ /^(\d{13,16})$/
-      or return gettext('invalid_card'); # . ": ". $self->payinfo;
-    $payinfo = $1;
-    $self->payinfo($payinfo);
-    validate($payinfo)
-      or return gettext('invalid_card'); # . ": ". $self->payinfo;
-    return gettext('unknown_card_type')
-      if cardtype($self->payinfo) eq "Unknown";
-
-  } elsif ( $self->payby eq 'BILL' ) {
-
-    $error = $self->ut_textn('payinfo');
-    return "Illegal P.O. number: ". $self->payinfo if $error;
-
-  } elsif ( $self->payby eq 'COMP' ) {
-
-    $error = $self->ut_textn('payinfo');
-    return "Illegal comp account issuer: ". $self->payinfo if $error;
-
-  } elsif ( $self->payby eq 'PREPAY' ) {
-
-    my $payinfo = $self->payinfo;
-    $payinfo =~ s/\W//g; #anything else would just confuse things
-    $self->payinfo($payinfo);
-    $error = $self->ut_alpha('payinfo');
-    return "Illegal prepayment identifier: ". $self->payinfo if $error;
-    return "Unknown prepayment identifier"
-      unless qsearchs('prepay_credit', { 'identifier' => $self->payinfo } );
-
-  }
-
-  if ( $self->paydate eq '' || $self->paydate eq '-' ) {
-    return "Expriation date required"
-      unless $self->payby eq 'BILL' || $self->payby eq 'PREPAY';
-    $self->paydate('');
-  } else {
-    $self->paydate =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/
-      or return "Illegal expiration date: ". $self->paydate;
-    my $y = length($2) == 4 ? $2 : "20$2";
-    $self->paydate("$y-$1-01");
-    my($nowm,$nowy)=(localtime(time))[4,5]; $nowm++; $nowy+=1900;
-    return gettext('expired_card') if $y<$nowy || ( $y==$nowy && $1<$nowm );
-  }
-
-  if ( $self->payname eq '' &&
-       ( ! $conf->exists('require_cardname') || $self->payby ne 'CARD' ) ) {
-    $self->payname( $self->first. " ". $self->getfield('last') );
-  } else {
-    $self->payname =~ /^([\w \,\.\-\']+)$/
-      or return gettext('illegal_name'). " payname: ". $self->payname;
-    $self->payname($1);
-  }
-
-  $self->tax =~ /^(Y?)$/ or return "Illegal tax: ". $self->tax;
-  $self->tax($1);
-
-  $self->otaker(getotaker);
-
-  #warn "AFTER: \n". $self->_dump;
-
-  ''; #no error
-}
-
-=item all_pkgs
-
-Returns all packages (see L<FS::cust_pkg>) for this customer.
-
-=cut
-
-sub all_pkgs {
-  my $self = shift;
-  if ( $self->{'_pkgnum'} ) {
-    values %{ $self->{'_pkgnum'}->cache };
-  } else {
-    qsearch( 'cust_pkg', { 'custnum' => $self->custnum });
-  }
-}
-
-=item ncancelled_pkgs
-
-Returns all non-cancelled packages (see L<FS::cust_pkg>) for this customer.
-
-=cut
-
-sub ncancelled_pkgs {
-  my $self = shift;
-  if ( $self->{'_pkgnum'} ) {
-    grep { ! $_->getfield('cancel') } values %{ $self->{'_pkgnum'}->cache };
-  } else {
-    @{ [ # force list context
-      qsearch( 'cust_pkg', {
-        'custnum' => $self->custnum,
-        'cancel'  => '',
-      }),
-      qsearch( 'cust_pkg', {
-        'custnum' => $self->custnum,
-        'cancel'  => 0,
-      }),
-    ] };
-  }
-}
-
-=item suspended_pkgs
-
-Returns all suspended packages (see L<FS::cust_pkg>) for this customer.
-
-=cut
-
-sub suspended_pkgs {
-  my $self = shift;
-  grep { $_->susp } $self->ncancelled_pkgs;
-}
-
-=item unflagged_suspended_pkgs
-
-Returns all unflagged suspended packages (see L<FS::cust_pkg>) for this
-customer (thouse packages without the `manual_flag' set).
-
-=cut
-
-sub unflagged_suspended_pkgs {
-  my $self = shift;
-  return $self->suspended_pkgs
-    unless dbdef->table('cust_pkg')->column('manual_flag');
-  grep { ! $_->manual_flag } $self->suspended_pkgs;
-}
-
-=item unsuspended_pkgs
-
-Returns all unsuspended (and uncancelled) packages (see L<FS::cust_pkg>) for
-this customer.
-
-=cut
-
-sub unsuspended_pkgs {
-  my $self = shift;
-  grep { ! $_->susp } $self->ncancelled_pkgs;
-}
-
-=item unsuspend
-
-Unsuspends all unflagged suspended packages (see L</unflagged_suspended_pkgs>
-and L<FS::cust_pkg>) for this customer.  Always returns a list: an empty list
-on success or a list of errors.
-
-=cut
-
-sub unsuspend {
-  my $self = shift;
-  grep { $_->unsuspend } $self->suspended_pkgs;
-}
-
-=item suspend
-
-Suspends all unsuspended packages (see L<FS::cust_pkg>) for this customer.
-Always returns a list: an empty list on success or a list of errors.
-
-=cut
-
-sub suspend {
-  my $self = shift;
-  grep { $_->suspend } $self->unsuspended_pkgs;
-}
-
-=item cancel
-
-Cancels all uncancelled packages (see L<FS::cust_pkg>) for this customer.
-Always returns a list: an empty list on success or a list of errors.
-
-=cut
-
-sub cancel {
-  my $self = shift;
-  grep { $_->cancel } $self->ncancelled_pkgs;
-}
-
-=item agent
-
-Returns the agent (see L<FS::agent>) for this customer.
-
-=cut
-
-sub agent {
-  my $self = shift;
-  qsearchs( 'agent', { 'agentnum' => $self->agentnum } );
-}
-
-=item bill OPTIONS
-
-Generates invoices (see L<FS::cust_bill>) for this customer.  Usually used in
-conjunction with the collect method.
-
-Options are passed as name-value pairs.
-
-The only currently available option is `time', which bills the customer as if
-it were that time.  It is specified as a UNIX timestamp; see
-L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse> for conversion
-functions.  For example:
-
- use Date::Parse;
- ...
- $cust_main->bill( 'time' => str2time('April 20th, 2001') );
-
-If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub bill {
-  my( $self, %options ) = @_;
-  my $time = $options{'time'} || time;
-
-  my $error;
-
-  #put below somehow?
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  # find the packages which are due for billing, find out how much they are
-  # & generate invoice database.
- 
-  my( $total_setup, $total_recur ) = ( 0, 0 );
-  #my( $taxable_setup, $taxable_recur ) = ( 0, 0 );
-  my @cust_bill_pkg = ();
-  my $tax = 0;##
-  #my $taxable_charged = 0;##
-  #my $charged = 0;##
-
-  foreach my $cust_pkg (
-    qsearch('cust_pkg', { 'custnum' => $self->custnum } )
-  ) {
-
-    #NO!! next if $cust_pkg->cancel;  
-    next if $cust_pkg->getfield('cancel');  
-
-    #? to avoid use of uninitialized value errors... ?
-    $cust_pkg->setfield('bill', '')
-      unless defined($cust_pkg->bill);
- 
-    my $part_pkg = $cust_pkg->part_pkg;
-
-    #so we don't modify cust_pkg record unnecessarily
-    my $cust_pkg_mod_flag = 0;
-    my %hash = $cust_pkg->hash;
-    my $old_cust_pkg = new FS::cust_pkg \%hash;
-
-    # bill setup
-    my $setup = 0;
-    unless ( $cust_pkg->setup ) {
-      my $setup_prog = $part_pkg->getfield('setup');
-      $setup_prog =~ /^(.*)$/ or do {
-        $dbh->rollback if $oldAutoCommit;
-        return "Illegal setup for pkgpart ". $part_pkg->pkgpart.
-               ": $setup_prog";
-      };
-      $setup_prog = $1;
-
-        #my $cpt = new Safe;
-        ##$cpt->permit(); #what is necessary?
-        #$cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
-        #$setup = $cpt->reval($setup_prog);
-      $setup = eval $setup_prog;
-      unless ( defined($setup) ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "Error eval-ing part_pkg->setup pkgpart ". $part_pkg->pkgpart.
-               "(expression $setup_prog): $@";
-      }
-      $cust_pkg->setfield('setup',$time);
-      $cust_pkg_mod_flag=1; 
-    }
-
-    #bill recurring fee
-    my $recur = 0;
-    my $sdate;
-    if ( $part_pkg->getfield('freq') > 0 &&
-         ! $cust_pkg->getfield('susp') &&
-         ( $cust_pkg->getfield('bill') || 0 ) < $time
-    ) {
-      my $recur_prog = $part_pkg->getfield('recur');
-      $recur_prog =~ /^(.*)$/ or do {
-        $dbh->rollback if $oldAutoCommit;
-        return "Illegal recur for pkgpart ". $part_pkg->pkgpart.
-               ": $recur_prog";
-      };
-      $recur_prog = $1;
-
-      # shared with $recur_prog
-      $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
-
-        #my $cpt = new Safe;
-        ##$cpt->permit(); #what is necessary?
-        #$cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
-        #$recur = $cpt->reval($recur_prog);
-      $recur = eval $recur_prog;
-      unless ( defined($recur) ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "Error eval-ing part_pkg->recur pkgpart ".  $part_pkg->pkgpart.
-               "(expression $recur_prog): $@";
-      }
-      #change this bit to use Date::Manip? CAREFUL with timezones (see
-      # mailing list archive)
-      my ($sec,$min,$hour,$mday,$mon,$year) =
-        (localtime($sdate) )[0,1,2,3,4,5];
-
-      #pro-rating magic - if $recur_prog fiddles $sdate, want to use that
-      # only for figuring next bill date, nothing else, so, reset $sdate again
-      # here
-      $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
-
-      $mon += $part_pkg->freq;
-      until ( $mon < 12 ) { $mon -= 12; $year++; }
-      $cust_pkg->setfield('bill',
-        timelocal($sec,$min,$hour,$mday,$mon,$year));
-      $cust_pkg_mod_flag = 1; 
-    }
-
-    warn "\$setup is undefined" unless defined($setup);
-    warn "\$recur is undefined" unless defined($recur);
-    warn "\$cust_pkg->bill is undefined" unless defined($cust_pkg->bill);
-
-    my $taxable_charged = 0;
-    if ( $cust_pkg_mod_flag ) {
-      $error=$cust_pkg->replace($old_cust_pkg);
-      if ( $error ) { #just in case
-        $dbh->rollback if $oldAutoCommit;
-        return "Error modifying pkgnum ". $cust_pkg->pkgnum. ": $error";
-      }
-      $setup = sprintf( "%.2f", $setup );
-      $recur = sprintf( "%.2f", $recur );
-      if ( $setup < 0 ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "negative setup $setup for pkgnum ". $cust_pkg->pkgnum;
-      }
-      if ( $recur < 0 ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "negative recur $recur for pkgnum ". $cust_pkg->pkgnum;
-      }
-      if ( $setup > 0 || $recur > 0 ) {
-        my $cust_bill_pkg = new FS::cust_bill_pkg ({
-          'pkgnum' => $cust_pkg->pkgnum,
-          'setup'  => $setup,
-          'recur'  => $recur,
-          'sdate'  => $sdate,
-          'edate'  => $cust_pkg->bill,
-        });
-        push @cust_bill_pkg, $cust_bill_pkg;
-        $total_setup += $setup;
-        $total_recur += $recur;
-        $taxable_charged += $setup
-          unless $part_pkg->setuptax =~ /^Y$/i;
-        $taxable_charged += $recur
-          unless $part_pkg->recurtax =~ /^Y$/i;
-          
-        unless ( $self->tax =~ /Y/i
-                 || $self->payby eq 'COMP'
-                 || $taxable_charged == 0 ) {
-
-          my $cust_main_county =
-            qsearchs('cust_main_county',{
-              'state'    => $self->state,
-              'county'   => $self->county,
-              'country'  => $self->country,
-              'taxclass' => $part_pkg->taxclass,
-            } )
-            or qsearchs('cust_main_county',{
-              'state'    => $self->state,
-              'county'   => $self->county,
-              'country'  => $self->country,
-              'taxclass' => '',
-            } )
-            or do {
-              $dbh->rollback if $oldAutoCommit;
-              return
-                "fatal: can't find tax rate for state/county/country/taxclass ".
-                join('/', ( map $self->$_(), qw(state county country) ),
-                          $part_pkg->taxclass ).  "\n";
-            };
-
-          if ( $cust_main_county->exempt_amount ) {
-            my ($mon,$year) = (localtime($sdate) )[4,5];
-            $mon++;
-            my $freq = $part_pkg->freq || 1;
-            my $taxable_per_month = sprintf("%.2f", $taxable_charged / $freq );
-            foreach my $which_month ( 1 .. $freq ) {
-              my %hash = (
-                'custnum' => $self->custnum,
-                'taxnum'  => $cust_main_county->taxnum,
-                'year'    => 1900+$year,
-                'month'   => $mon++,
-              );
-              #until ( $mon < 12 ) { $mon -= 12; $year++; }
-              until ( $mon < 13 ) { $mon -= 12; $year++; }
-              my $cust_tax_exempt =
-                qsearchs('cust_tax_exempt', \%hash)
-                || new FS::cust_tax_exempt( { %hash, 'amount' => 0 } );
-              my $remaining_exemption = sprintf("%.2f",
-                $cust_main_county->exempt_amount - $cust_tax_exempt->amount );
-              if ( $remaining_exemption > 0 ) {
-                my $addl = $remaining_exemption > $taxable_per_month
-                  ? $taxable_per_month
-                  : $remaining_exemption;
-                $taxable_charged -= $addl;
-                my $new_cust_tax_exempt = new FS::cust_tax_exempt ( {
-                  $cust_tax_exempt->hash,
-                  'amount' => sprintf("%.2f", $cust_tax_exempt->amount + $addl),
-                } );
-                $error = $new_cust_tax_exempt->exemptnum
-                  ? $new_cust_tax_exempt->replace($cust_tax_exempt)
-                  : $new_cust_tax_exempt->insert;
-                if ( $error ) {
-                  $dbh->rollback if $oldAutoCommit;
-                  return "fatal: can't update cust_tax_exempt: $error";
-                }
-
-              } # if $remaining_exemption > 0
-
-            } #foreach $which_month
-
-          } #if $cust_main_county->exempt_amount
-
-          $taxable_charged = sprintf( "%.2f", $taxable_charged);
-          $tax += $taxable_charged * $cust_main_county->tax / 100
-
-        } #unless $self->tax =~ /Y/i
-          #       || $self->payby eq 'COMP'
-          #       || $taxable_charged == 0
-
-      } #if $setup > 0 || $recur > 0
-      
-    } #if $cust_pkg_mod_flag
-
-  } #foreach my $cust_pkg
-
-  my $charged = sprintf( "%.2f", $total_setup + $total_recur );
-#  my $taxable_charged = sprintf( "%.2f", $taxable_setup + $taxable_recur );
-
-  unless ( @cust_bill_pkg ) { #don't create invoices with no line items
-    $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-    return '';
-  } 
-
-#  unless ( $self->tax =~ /Y/i
-#           || $self->payby eq 'COMP'
-#           || $taxable_charged == 0 ) {
-#    my $cust_main_county = qsearchs('cust_main_county',{
-#        'state'   => $self->state,
-#        'county'  => $self->county,
-#        'country' => $self->country,
-#    } ) or die "fatal: can't find tax rate for state/county/country ".
-#               $self->state. "/". $self->county. "/". $self->country. "\n";
-#    my $tax = sprintf( "%.2f",
-#      $taxable_charged * ( $cust_main_county->getfield('tax') / 100 )
-#    );
-
-  $tax = sprintf("%.2f", $tax);
-  if ( $tax > 0 ) {
-    $charged = sprintf( "%.2f", $charged+$tax );
-
-    my $cust_bill_pkg = new FS::cust_bill_pkg ({
-      'pkgnum' => 0,
-      'setup'  => $tax,
-      'recur'  => 0,
-      'sdate'  => '',
-      'edate'  => '',
-    });
-    push @cust_bill_pkg, $cust_bill_pkg;
-  }
-#  }
-
-  my $cust_bill = new FS::cust_bill ( {
-    'custnum' => $self->custnum,
-    '_date'   => $time,
-    'charged' => $charged,
-  } );
-  $error = $cust_bill->insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "can't create invoice for customer #". $self->custnum. ": $error";
-  }
-
-  my $invnum = $cust_bill->invnum;
-  my $cust_bill_pkg;
-  foreach $cust_bill_pkg ( @cust_bill_pkg ) {
-    #warn $invnum;
-    $cust_bill_pkg->invnum($invnum);
-    $error = $cust_bill_pkg->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "can't create invoice line item for customer #". $self->custnum.
-             ": $error";
-    }
-  }
-  
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  ''; #no error
-}
-
-=item collect OPTIONS
-
-(Attempt to) collect money for this customer's outstanding invoices (see
-L<FS::cust_bill>).  Usually used after the bill method.
-
-Depending on the value of `payby', this may print an invoice (`BILL'), charge
-a credit card (`CARD'), or just add any necessary (pseudo-)payment (`COMP').
-
-Most actions are now triggered by invoice events; see L<FS::part_bill_event>
-and the invoice events web interface.
-
-If there is an error, returns the error, otherwise returns false.
-
-Options are passed as name-value pairs.
-
-Currently available options are:
-
-invoice_time - Use this time when deciding when to print invoices and
-late notices on those invoices.  The default is now.  It is specified as a UNIX timestamp; see L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse>
-for conversion functions.
-
-retry_card - Retry cards even when not scheduled by invoice events.
-
-batch_card - This option is deprecated.  See the invoice events web interface
-to control whether cards are batched or run against a realtime gateway.
-
-report_badcard - This option is deprecated.
-
-force_print - This option is deprecated; see the invoice events web interface.
-
-=cut
-
-sub collect {
-  my( $self, %options ) = @_;
-  my $invoice_time = $options{'invoice_time'} || time;
-
-  #put below somehow?
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $balance = $self->balance;
-  warn "collect customer". $self->custnum. ": balance $balance" if $Debug;
-  unless ( $balance > 0 ) { #redundant?????
-    $dbh->rollback if $oldAutoCommit; #hmm
-    return '';
-  }
-
-  if ( exists($options{'retry_card'}) && $options{'retry_card'} ) {
-    #false laziness w/replace
-    foreach my $cust_bill_event (
-      grep {
-             #$_->part_bill_event->plan eq 'realtime-card'
-             $_->part_bill_event->eventcode eq '$cust_bill->realtime_card();'
-               && $_->status eq 'done'
-               && $_->statustext
-           }
-        map { $_->cust_bill_event }
-          grep { $_->cust_bill_event }
-            $self->open_cust_bill
-    ) {
-      my $error = $cust_bill_event->retry;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "error scheduling invoice events for retry: $error";
-      }
-    }
-    #eslaf
-  }
-
-  foreach my $cust_bill ( $self->cust_bill ) {
-
-    #this has to be before next's
-    my $amount = sprintf( "%.2f", $balance < $cust_bill->owed
-                                  ? $balance
-                                  : $cust_bill->owed
-    );
-    $balance = sprintf( "%.2f", $balance - $amount );
-
-    next unless $cust_bill->owed > 0;
-
-    # don't try to charge for the same invoice if it's already in a batch
-    #next if qsearchs( 'cust_pay_batch', { 'invnum' => $cust_bill->invnum } );
-
-    warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ", amount $amount, balance $balance)" if $Debug;
-
-    next unless $amount > 0;
-
-
-    foreach my $part_bill_event (
-      sort {    $a->seconds   <=> $b->seconds
-             || $a->weight    <=> $b->weight
-             || $a->eventpart <=> $b->eventpart }
-        grep { $_->seconds <= ( $invoice_time - $cust_bill->_date )
-               && ! qsearchs( 'cust_bill_event', {
-                                'invnum'    => $cust_bill->invnum,
-                                'eventpart' => $_->eventpart,
-                                'status'    => 'done',
-                                                                   } )
-             }
-          qsearch('part_bill_event', { 'payby'    => $self->payby,
-                                       'disabled' => '',           } )
-    ) {
-
-      last unless $cust_bill->owed > 0; #don't run subsequent events if owed=0
-
-      warn "calling invoice event (". $part_bill_event->eventcode. ")\n"
-        if $Debug;
-      my $cust_main = $self; #for callback
-      my $error = eval $part_bill_event->eventcode;
-
-      my $status = '';
-      my $statustext = '';
-      if ( $@ ) {
-        $status = 'failed';
-        $statustext = $@;
-      } elsif ( $error ) {
-        $status = 'done';
-        $statustext = $error;
-      } else {
-        $status = 'done'
-      }
-
-      #add cust_bill_event
-      my $cust_bill_event = new FS::cust_bill_event {
-        'invnum'     => $cust_bill->invnum,
-        'eventpart'  => $part_bill_event->eventpart,
-        '_date'      => $invoice_time,
-        'status'     => $status,
-        'statustext' => $statustext,
-      };
-      $error = $cust_bill_event->insert;
-      if ( $error ) {
-        #$dbh->rollback if $oldAutoCommit;
-        #return "error: $error";
-
-        # gah, even with transactions.
-        $dbh->commit if $oldAutoCommit; #well.
-        my $e = 'WARNING: Event run but database not updated - '.
-                'error inserting cust_bill_event, invnum #'. $cust_bill->invnum.
-                ', eventpart '. $part_bill_event->eventpart.
-                ": $error";
-        warn $e;
-        return $e;
-      }
-
-
-    }
-
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
-}
-
-=item total_owed
-
-Returns the total owed for this customer on all invoices
-(see L<FS::cust_bill/owed>).
-
-=cut
-
-sub total_owed {
-  my $self = shift;
-  $self->total_owed_date(2145859200); #12/31/2037
-}
-
-=item total_owed_date TIME
-
-Returns the total owed for this customer on all invoices with date earlier than
-TIME.  TIME is specified as a UNIX timestamp; see L<perlfunc/"time">).  Also
-see L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=cut
-
-sub total_owed_date {
-  my $self = shift;
-  my $time = shift;
-  my $total_bill = 0;
-  foreach my $cust_bill (
-    grep { $_->_date <= $time }
-      qsearch('cust_bill', { 'custnum' => $self->custnum, } )
-  ) {
-    $total_bill += $cust_bill->owed;
-  }
-  sprintf( "%.2f", $total_bill );
-}
-
-=item apply_credits
-
-Applies (see L<FS::cust_credit_bill>) unapplied credits (see L<FS::cust_credit>)
-to outstanding invoice balances in chronological order and returns the value
-of any remaining unapplied credits available for refund
-(see L<FS::cust_refund>).
-
-=cut
-
-sub apply_credits {
-  my $self = shift;
-
-  return 0 unless $self->total_credited;
-
-  my @credits = sort { $b->_date <=> $a->_date} (grep { $_->credited > 0 }
-      qsearch('cust_credit', { 'custnum' => $self->custnum } ) );
-
-  my @invoices = sort { $a->_date <=> $b->_date} (grep { $_->owed > 0 }
-      qsearch('cust_bill', { 'custnum' => $self->custnum } ) );
-
-  my $credit;
-
-  foreach my $cust_bill ( @invoices ) {
-    my $amount;
-
-    if ( !defined($credit) || $credit->credited == 0) {
-      $credit = pop @credits or last;
-    }
-
-    if ($cust_bill->owed >= $credit->credited) {
-      $amount=$credit->credited;
-    }else{
-      $amount=$cust_bill->owed;
-    }
-    
-    my $cust_credit_bill = new FS::cust_credit_bill ( {
-      'crednum' => $credit->crednum,
-      'invnum'  => $cust_bill->invnum,
-      'amount'  => $amount,
-    } );
-    my $error = $cust_credit_bill->insert;
-    die $error if $error;
-    
-    redo if ($cust_bill->owed > 0);
-
-  }
-
-  return $self->total_credited;
-}
-
-=item apply_payments
-
-Applies (see L<FS::cust_bill_pay>) unapplied payments (see L<FS::cust_pay>)
-to outstanding invoice balances in chronological order.
-
- #and returns the value of any remaining unapplied payments.
-
-=cut
-
-sub apply_payments {
-  my $self = shift;
-
-  #return 0 unless
-
-  my @payments = sort { $b->_date <=> $a->_date } ( grep { $_->unapplied > 0 }
-      qsearch('cust_pay', { 'custnum' => $self->custnum } ) );
-
-  my @invoices = sort { $a->_date <=> $b->_date} (grep { $_->owed > 0 }
-      qsearch('cust_bill', { 'custnum' => $self->custnum } ) );
-
-  my $payment;
-
-  foreach my $cust_bill ( @invoices ) {
-    my $amount;
-
-    if ( !defined($payment) || $payment->unapplied == 0 ) {
-      $payment = pop @payments or last;
-    }
-
-    if ( $cust_bill->owed >= $payment->unapplied ) {
-      $amount = $payment->unapplied;
-    } else {
-      $amount = $cust_bill->owed;
-    }
-
-    my $cust_bill_pay = new FS::cust_bill_pay ( {
-      'paynum' => $payment->paynum,
-      'invnum' => $cust_bill->invnum,
-      'amount' => $amount,
-    } );
-    my $error = $cust_bill_pay->insert;
-    die $error if $error;
-
-    redo if ( $cust_bill->owed > 0);
-
-  }
-
-  return $self->total_unapplied_payments;
-}
-
-=item total_credited
-
-Returns the total outstanding credit (see L<FS::cust_credit>) for this
-customer.  See L<FS::cust_credit/credited>.
-
-=cut
-
-sub total_credited {
-  my $self = shift;
-  my $total_credit = 0;
-  foreach my $cust_credit ( qsearch('cust_credit', {
-    'custnum' => $self->custnum,
-  } ) ) {
-    $total_credit += $cust_credit->credited;
-  }
-  sprintf( "%.2f", $total_credit );
-}
-
-=item total_unapplied_payments
-
-Returns the total unapplied payments (see L<FS::cust_pay>) for this customer.
-See L<FS::cust_pay/unapplied>.
-
-=cut
-
-sub total_unapplied_payments {
-  my $self = shift;
-  my $total_unapplied = 0;
-  foreach my $cust_pay ( qsearch('cust_pay', {
-    'custnum' => $self->custnum,
-  } ) ) {
-    $total_unapplied += $cust_pay->unapplied;
-  }
-  sprintf( "%.2f", $total_unapplied );
-}
-
-=item balance
-
-Returns the balance for this customer (total_owed minus total_credited
-minus total_unapplied_payments).
-
-=cut
-
-sub balance {
-  my $self = shift;
-  sprintf( "%.2f",
-    $self->total_owed - $self->total_credited - $self->total_unapplied_payments
-  );
-}
-
-=item balance_date TIME
-
-Returns the balance for this customer, only considering invoices with date
-earlier than TIME (total_owed_date minus total_credited minus
-total_unapplied_payments).  TIME is specified as a UNIX timestamp; see
-L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse> for conversion
-functions.
-
-=cut
-
-sub balance_date {
-  my $self = shift;
-  my $time = shift;
-  sprintf( "%.2f",
-    $self->total_owed_date($time)
-      - $self->total_credited
-      - $self->total_unapplied_payments
-  );
-}
-
-=item invoicing_list [ ARRAYREF ]
-
-If an arguement is given, sets these email addresses as invoice recipients
-(see L<FS::cust_main_invoice>).  Errors are not fatal and are not reported
-(except as warnings), so use check_invoicing_list first.
-
-Returns a list of email addresses (with svcnum entries expanded).
-
-Note: You can clear the invoicing list by passing an empty ARRAYREF.  You can
-check it without disturbing anything by passing nothing.
-
-This interface may change in the future.
-
-=cut
-
-sub invoicing_list {
-  my( $self, $arrayref ) = @_;
-  if ( $arrayref ) {
-    my @cust_main_invoice;
-    if ( $self->custnum ) {
-      @cust_main_invoice = 
-        qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
-    } else {
-      @cust_main_invoice = ();
-    }
-    foreach my $cust_main_invoice ( @cust_main_invoice ) {
-      #warn $cust_main_invoice->destnum;
-      unless ( grep { $cust_main_invoice->address eq $_ } @{$arrayref} ) {
-        #warn $cust_main_invoice->destnum;
-        my $error = $cust_main_invoice->delete;
-        warn $error if $error;
-      }
-    }
-    if ( $self->custnum ) {
-      @cust_main_invoice = 
-        qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
-    } else {
-      @cust_main_invoice = ();
-    }
-    my %seen = map { $_->address => 1 } @cust_main_invoice;
-    foreach my $address ( @{$arrayref} ) {
-      #unless ( grep { $address eq $_->address } @cust_main_invoice ) {
-      next if exists $seen{$address} && $seen{$address};
-      $seen{$address} = 1;
-      my $cust_main_invoice = new FS::cust_main_invoice ( {
-        'custnum' => $self->custnum,
-        'dest'    => $address,
-      } );
-      my $error = $cust_main_invoice->insert;
-      warn $error if $error;
-    }
-  }
-  if ( $self->custnum ) {
-    map { $_->address }
-      qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
-  } else {
-    ();
-  }
-}
-
-=item check_invoicing_list ARRAYREF
-
-Checks these arguements as valid input for the invoicing_list method.  If there
-is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub check_invoicing_list {
-  my( $self, $arrayref ) = @_;
-  foreach my $address ( @{$arrayref} ) {
-    my $cust_main_invoice = new FS::cust_main_invoice ( {
-      'custnum' => $self->custnum,
-      'dest'    => $address,
-    } );
-    my $error = $self->custnum
-                ? $cust_main_invoice->check
-                : $cust_main_invoice->checkdest
-    ;
-    return $error if $error;
-  }
-  '';
-}
-
-=item default_invoicing_list
-
-Sets the invoicing list to all accounts associated with this customer.
-
-=cut
-
-sub default_invoicing_list {
-  my $self = shift;
-  my @list = ();
-  foreach my $cust_pkg ( $self->all_pkgs ) {
-    my @cust_svc = qsearch('cust_svc', { 'pkgnum' => $cust_pkg->pkgnum } );
-    my @svc_acct =
-      map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
-        grep { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
-          @cust_svc;
-    push @list, map { $_->email } @svc_acct;
-  }
-  $self->invoicing_list(\@list);
-}
-
-=item invoicing_list_addpost
-
-Adds postal invoicing to this customer.  If this customer is already configured
-to receive postal invoices, does nothing.
-
-=cut
-
-sub invoicing_list_addpost {
-  my $self = shift;
-  return if grep { $_ eq 'POST' } $self->invoicing_list;
-  my @invoicing_list = $self->invoicing_list;
-  push @invoicing_list, 'POST';
-  $self->invoicing_list(\@invoicing_list);
-}
-
-=item referral_cust_main [ DEPTH [ EXCLUDE_HASHREF ] ]
-
-Returns an array of customers referred by this customer (referral_custnum set
-to this custnum).  If DEPTH is given, recurses up to the given depth, returning
-customers referred by customers referred by this customer and so on, inclusive.
-The default behavior is DEPTH 1 (no recursion).
-
-=cut
-
-sub referral_cust_main {
-  my $self = shift;
-  my $depth = @_ ? shift : 1;
-  my $exclude = @_ ? shift : {};
-
-  my @cust_main =
-    map { $exclude->{$_->custnum}++; $_; }
-      grep { ! $exclude->{ $_->custnum } }
-        qsearch( 'cust_main', { 'referral_custnum' => $self->custnum } );
-
-  if ( $depth > 1 ) {
-    push @cust_main,
-      map { $_->referral_cust_main($depth-1, $exclude) }
-        @cust_main;
-  }
-
-  @cust_main;
-}
-
-=item referral_cust_main_ncancelled
-
-Same as referral_cust_main, except only returns customers with uncancelled
-packages.
-
-=cut
-
-sub referral_cust_main_ncancelled {
-  my $self = shift;
-  grep { scalar($_->ncancelled_pkgs) } $self->referral_cust_main;
-}
-
-=item referral_cust_pkg [ DEPTH ]
-
-Like referral_cust_main, except returns a flat list of all unsuspended (and
-uncancelled) packages for each customer.  The number of items in this list may
-be useful for comission calculations (perhaps after a C<grep { my $pkgpart = $_->pkgpart; grep { $_ == $pkgpart } @commission_worthy_pkgparts> } $cust_main-> ).
-
-=cut
-
-sub referral_cust_pkg {
-  my $self = shift;
-  my $depth = @_ ? shift : 1;
-
-  map { $_->unsuspended_pkgs }
-    grep { $_->unsuspended_pkgs }
-      $self->referral_cust_main($depth);
-}
-
-=item credit AMOUNT, REASON
-
-Applies a credit to this customer.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-sub credit {
-  my( $self, $amount, $reason ) = @_;
-  my $cust_credit = new FS::cust_credit {
-    'custnum' => $self->custnum,
-    'amount'  => $amount,
-    'reason'  => $reason,
-  };
-  $cust_credit->insert;
-}
-
-=item charge AMOUNT [ PKG [ COMMENT [ TAXCLASS ] ] ]
-
-Creates a one-time charge for this customer.  If there is an error, returns
-the error, otherwise returns false.
-
-=cut
-
-sub charge {
-  my ( $self, $amount ) = ( shift, shift );
-  my $pkg      = @_ ? shift : 'One-time charge';
-  my $comment  = @_ ? shift : '$'. sprintf("%.2f",$amount);
-  my $taxclass = @_ ? shift : '';
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $part_pkg = new FS::part_pkg ( {
-    'pkg'      => $pkg,
-    'comment'  => $comment,
-    'setup'    => $amount,
-    'freq'     => 0,
-    'recur'    => '0',
-    'disabled' => 'Y',
-    'taxclass' => $taxclass,
-  } );
-
-  my $error = $part_pkg->insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  my $pkgpart = $part_pkg->pkgpart;
-  my %type_pkgs = ( 'typenum' => $self->agent->typenum, 'pkgpart' => $pkgpart );
-  unless ( qsearchs('type_pkgs', \%type_pkgs ) ) {
-    my $type_pkgs = new FS::type_pkgs \%type_pkgs;
-    $error = $type_pkgs->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  my $cust_pkg = new FS::cust_pkg ( {
-    'custnum' => $self->custnum,
-    'pkgpart' => $pkgpart,
-  } );
-
-  $error = $cust_pkg->insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
-}
-
-=item cust_bill
-
-Returns all the invoices (see L<FS::cust_bill>) for this customer.
-
-=cut
-
-sub cust_bill {
-  my $self = shift;
-  sort { $a->_date <=> $b->_date }
-    qsearch('cust_bill', { 'custnum' => $self->custnum, } )
-}
-
-=item open_cust_bill
-
-Returns all the open (owed > 0) invoices (see L<FS::cust_bill>) for this
-customer.
-
-=cut
-
-sub open_cust_bill {
-  my $self = shift;
-  grep { $_->owed > 0 } $self->cust_bill;
-}
-
-=back
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item check_and_rebuild_fuzzyfiles
-
-=cut
-
-sub check_and_rebuild_fuzzyfiles {
-  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
-  -e "$dir/cust_main.last" && -e "$dir/cust_main.company"
-    or &rebuild_fuzzyfiles;
-}
-
-=item rebuild_fuzzyfiles
-
-=cut
-
-sub rebuild_fuzzyfiles {
-
-  use Fcntl qw(:flock);
-
-  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
-
-  #last
-
-  open(LASTLOCK,">>$dir/cust_main.last")
-    or die "can't open $dir/cust_main.last: $!";
-  flock(LASTLOCK,LOCK_EX)
-    or die "can't lock $dir/cust_main.last: $!";
-
-  my @all_last = map $_->getfield('last'), qsearch('cust_main', {});
-  push @all_last,
-                 grep $_, map $_->getfield('ship_last'), qsearch('cust_main',{})
-    if defined dbdef->table('cust_main')->column('ship_last');
-
-  open (LASTCACHE,">$dir/cust_main.last.tmp")
-    or die "can't open $dir/cust_main.last.tmp: $!";
-  print LASTCACHE join("\n", @all_last), "\n";
-  close LASTCACHE or die "can't close $dir/cust_main.last.tmp: $!";
-
-  rename "$dir/cust_main.last.tmp", "$dir/cust_main.last";
-  close LASTLOCK;
-
-  #company
-
-  open(COMPANYLOCK,">>$dir/cust_main.company")
-    or die "can't open $dir/cust_main.company: $!";
-  flock(COMPANYLOCK,LOCK_EX)
-    or die "can't lock $dir/cust_main.company: $!";
-
-  my @all_company = grep $_ ne '', map $_->company, qsearch('cust_main',{});
-  push @all_company,
-       grep $_ ne '', map $_->ship_company, qsearch('cust_main', {})
-    if defined dbdef->table('cust_main')->column('ship_last');
-
-  open (COMPANYCACHE,">$dir/cust_main.company.tmp")
-    or die "can't open $dir/cust_main.company.tmp: $!";
-  print COMPANYCACHE join("\n", @all_company), "\n";
-  close COMPANYCACHE or die "can't close $dir/cust_main.company.tmp: $!";
-
-  rename "$dir/cust_main.company.tmp", "$dir/cust_main.company";
-  close COMPANYLOCK;
-
-}
-
-=item all_last
-
-=cut
-
-sub all_last {
-  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
-  open(LASTCACHE,"<$dir/cust_main.last")
-    or die "can't open $dir/cust_main.last: $!";
-  my @array = map { chomp; $_; } <LASTCACHE>;
-  close LASTCACHE;
-  \@array;
-}
-
-=item all_company
-
-=cut
-
-sub all_company {
-  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
-  open(COMPANYCACHE,"<$dir/cust_main.company")
-    or die "can't open $dir/cust_main.last: $!";
-  my @array = map { chomp; $_; } <COMPANYCACHE>;
-  close COMPANYCACHE;
-  \@array;
-}
-
-=item append_fuzzyfiles LASTNAME COMPANY
-
-=cut
-
-sub append_fuzzyfiles {
-  my( $last, $company ) = @_;
-
-  &check_and_rebuild_fuzzyfiles;
-
-  use Fcntl qw(:flock);
-
-  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
-
-  if ( $last ) {
-
-    open(LAST,">>$dir/cust_main.last")
-      or die "can't open $dir/cust_main.last: $!";
-    flock(LAST,LOCK_EX)
-      or die "can't lock $dir/cust_main.last: $!";
-
-    print LAST "$last\n";
-
-    flock(LAST,LOCK_UN)
-      or die "can't unlock $dir/cust_main.last: $!";
-    close LAST;
-  }
-
-  if ( $company ) {
-
-    open(COMPANY,">>$dir/cust_main.company")
-      or die "can't open $dir/cust_main.company: $!";
-    flock(COMPANY,LOCK_EX)
-      or die "can't lock $dir/cust_main.company: $!";
-
-    print COMPANY "$company\n";
-
-    flock(COMPANY,LOCK_UN)
-      or die "can't unlock $dir/cust_main.company: $!";
-
-    close COMPANY;
-  }
-
-  1;
-}
-
-=back
-
-=head1 BUGS
-
-The delete method.
-
-The delete method should possibly take an FS::cust_main object reference
-instead of a scalar customer number.
-
-Bill and collect options should probably be passed as references instead of a
-list.
-
-There should probably be a configuration file with a list of allowed credit
-card types.
-
-No multiple currency support (probably a larger project than just this module).
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_pkg>, L<FS::cust_bill>, L<FS::cust_credit>
-L<FS::agent>, L<FS::part_referral>, L<FS::cust_main_county>,
-L<FS::cust_main_invoice>, L<FS::UID>, schema.html from the base documentation.
-
-=cut
-
-1;
-
-
diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
deleted file mode 100644
index e41564d21..000000000
--- a/FS/FS/cust_main_county.pm
+++ /dev/null
@@ -1,253 +0,0 @@
-package FS::cust_main_county;
-
-use strict;
-use vars qw( @ISA @EXPORT_OK $conf
-             @cust_main_county %cust_main_county $countyflag );
-use Exporter;
-use FS::Record qw( qsearch );
-
-@ISA = qw( FS::Record );
-@EXPORT_OK = qw( regionselector );
-
-@cust_main_county = ();
-$countyflag = '';
-
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::cust_main_county'} = sub { 
-  $conf = new FS::Conf;
-};
-
-=head1 NAME
-
-FS::cust_main_county - Object methods for cust_main_county objects
-
-=head1 SYNOPSIS
-
-  use FS::cust_main_county;
-
-  $record = new FS::cust_main_county \%hash;
-  $record = new FS::cust_main_county { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  ($county_html, $state_html, $country_html) =
-    FS::cust_main_county::regionselector( $county, $state, $country );
-
-=head1 DESCRIPTION
-
-An FS::cust_main_county object represents a tax rate, defined by locale.
-FS::cust_main_county inherits from FS::Record.  The following fields are
-currently supported:
-
-=over 4
-
-=item taxnum - primary key (assigned automatically for new tax rates)
-
-=item state
-
-=item county
-
-=item country
-
-=item tax - percentage
-
-=item taxclass
-
-=item exempt_amount
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new tax rate.  To add the tax rate to the database, see L<"insert">.
-
-=cut
-
-sub table { 'cust_main_county'; }
-
-=item insert
-
-Adds this tax rate to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this tax rate from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid tax rate.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  $self->exempt_amount(0) unless $self->exempt_amount;
-
-  $self->ut_numbern('taxnum')
-    || $self->ut_textn('state')
-    || $self->ut_textn('county')
-    || $self->ut_text('country')
-    || $self->ut_float('tax')
-    || $self->ut_textn('taxclass') # ...
-    || $self->ut_money('exempt_amount')
-  ;
-
-}
-
-=back
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item regionselector [ COUNTY STATE COUNTRY [ PREFIX [ ONCHANGE ] ] ]
-
-=cut
-
-sub regionselector {
-  my ( $selected_county, $selected_state, $selected_country,
-       $prefix, $onchange ) = @_;
-
-  $prefix = '' unless defined $prefix;
-
-  $countyflag = 0;
-
-#  unless ( @cust_main_county ) { #cache 
-    @cust_main_county = qsearch('cust_main_county', {} );
-    foreach my $c ( @cust_main_county ) {
-      $countyflag=1 if $c->county;
-      #push @{$cust_main_county{$c->country}{$c->state}}, $c->county;
-      $cust_main_county{$c->country}{$c->state}{$c->county} = 1;
-    }
-#  }
-  $countyflag=1 if $selected_county;
-
-  my $script_html = <<END;
-    <SCRIPT>
-    function opt(what,value,text) {
-      var optionName = new Option(text, value, false, false);
-      var length = what.length;
-      what.options[length] = optionName;
-    }
-    function ${prefix}country_changed(what) {
-      country = what.options[what.selectedIndex].text;
-      for ( var i = what.form.${prefix}state.length; i >= 0; i-- )
-          what.form.${prefix}state.options[i] = null;
-END
-      #what.form.${prefix}state.options[0] = new Option('', '', false, true);
-
-  foreach my $country ( sort keys %cust_main_county ) {
-    $script_html .= "\nif ( country == \"$country\" ) {\n";
-    foreach my $state ( sort keys %{$cust_main_county{$country}} ) {
-      my $text = $state || '(n/a)';
-      $script_html .= qq!opt(what.form.${prefix}state, "$state", "$text");\n!;
-    }
-    $script_html .= "}\n";
-  }
-
-  $script_html .= <<END;
-    }
-    function ${prefix}state_changed(what) {
-END
-
-  if ( $countyflag ) {
-    $script_html .= <<END;
-      state = what.options[what.selectedIndex].text;
-      country = what.form.${prefix}country.options[what.form.${prefix}country.selectedIndex].text;
-      for ( var i = what.form.${prefix}county.length; i >= 0; i-- )
-          what.form.${prefix}county.options[i] = null;
-END
-
-    foreach my $country ( sort keys %cust_main_county ) {
-      $script_html .= "\nif ( country == \"$country\" ) {\n";
-      foreach my $state ( sort keys %{$cust_main_county{$country}} ) {
-        $script_html .= "\nif ( state == \"$state\" ) {\n";
-          #foreach my $county ( sort @{$cust_main_county{$country}{$state}} ) {
-          foreach my $county ( sort keys %{$cust_main_county{$country}{$state}} ) {
-            my $text = $county || '(n/a)';
-            $script_html .=
-              qq!opt(what.form.${prefix}county, "$county", "$text");\n!;
-          }
-        $script_html .= "}\n";
-      }
-      $script_html .= "}\n";
-    }
-  }
-
-  $script_html .= <<END;
-    }
-    </SCRIPT>
-END
-
-  my $county_html = $script_html;
-  if ( $countyflag ) {
-    $county_html .= qq!<SELECT NAME="${prefix}county" onChange="$onchange">!;
-    $county_html .= '</SELECT>';
-  } else {
-    $county_html .=
-      qq!<INPUT TYPE="hidden" NAME="${prefix}county" VALUE="$selected_county">!;
-  }
-
-  my $state_html = qq!<SELECT NAME="${prefix}state" !.
-                   qq!onChange="${prefix}state_changed(this); $onchange">!;
-  foreach my $state ( sort keys %{ $cust_main_county{$selected_country} } ) {
-    my $text = $state || '(n/a)';
-    my $selected = $state eq $selected_state ? 'SELECTED' : '';
-    $state_html .= "\n<OPTION $selected VALUE=$state>$text</OPTION>"
-  }
-  $state_html .= '</SELECT>';
-
-  $state_html .= '</SELECT>';
-
-  my $country_html = qq!<SELECT NAME="${prefix}country" !.
-                     qq!onChange="${prefix}country_changed(this); $onchange">!;
-  my $countrydefault = $conf->config('countrydefault') || 'US';
-  foreach my $country (
-    sort { ($b eq $countrydefault) <=> ($a eq $countrydefault) or $a cmp $b }
-      keys %cust_main_county
-  ) {
-    my $selected = $country eq $selected_country ? ' SELECTED' : '';
-    $country_html .= "\n<OPTION$selected>$country</OPTION>"
-  }
-  $country_html .= '</SELECT>';
-
-  ($county_html, $state_html, $country_html);
-
-}
-
-=back
-
-=head1 BUGS
-
-regionselector?  putting web ui components in here?  they should probably live
-somewhere else...
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_main>, L<FS::cust_bill>, schema.html from the base
-documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm
deleted file mode 100644
index a5533a088..000000000
--- a/FS/FS/cust_main_invoice.pm
+++ /dev/null
@@ -1,184 +0,0 @@
-package FS::cust_main_invoice;
-
-use strict;
-use vars qw(@ISA $conf);
-use Exporter;
-use FS::Record qw( qsearchs );
-use FS::Conf;
-use FS::cust_main;
-use FS::svc_acct;
-use FS::Msgcat qw(gettext);
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::cust_main_invoice - Object methods for cust_main_invoice records
-
-=head1 SYNOPSIS
-
-  use FS::cust_main_invoice;
-
-  $record = new FS::cust_main_invoice \%hash;
-  $record = new FS::cust_main_invoice { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $email_address = $record->address;
-
-=head1 DESCRIPTION
-
-An FS::cust_main_invoice object represents an invoice destination.  FS::cust_main_invoice inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item destnum - primary key
-
-=item custnum - customer (see L<FS::cust_main>)
-
-=item dest - Invoice destination: If numeric, a svcnum (see L<FS::svc_acct>), if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new invoice destination.  To add the invoice destination to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-sub table { 'cust_main_invoice'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Delete this record from the database.
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-
-  return "Can't change custnum!" unless $old->custnum == $new->custnum;
-
-  $new->SUPER::replace($old);
-}
-
-
-=item check
-
-Checks all fields to make sure this is a valid invoice destination.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and repalce methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error = $self->ut_numbern('destnum')
-           || $self->ut_number('custnum')
-           || $self->checkdest;
-  ;
-  return $error if $error;
-
-  return "Unknown customer"
-    unless qsearchs('cust_main',{ 'custnum' => $self->custnum });
-
-  ''; #noerror
-}
-
-=item checkdest
-
-Checks the dest field only.
-
-#If it finds that the account ends in the
-#same domain configured as the B<domain> configuration file, it will change the
-#invoice destination from an email address to a service number (see
-#L<FS::svc_acct>).
-
-=cut
-
-sub checkdest { 
-  my $self = shift;
-
-  my $error = $self->ut_text('dest');
-  return $error if $error;
-
-  if ( $self->dest eq 'POST' ) {
-    #contemplate our navel
-  } elsif ( $self->dest =~ /^(\d+)$/ ) {
-    return "Unknown local account (specified by svcnum: ". $self->dest. ")"
-      unless qsearchs( 'svc_acct', { 'svcnum' => $self->dest } );
-  } elsif ( $self->dest =~ /^([\w\.\-\&\+]+)\@(([\w\.\-]+\.)+\w+)$/ ) {
-    my($user, $domain) = ($1, $2);
-#    if ( $domain eq $mydomain ) {
-#      my $svc_acct = qsearchs( 'svc_acct', { 'username' => $user } );
-#      return "Unknown local account: $user\@$domain (specified literally)"
-#        unless $svc_acct;
-#      $svc_acct->svcnum =~ /^(\d+)$/ or die "Non-numeric svcnum?!";
-#      $self->dest($1);
-#    }
-    $self->dest("$1\@$2");
-  } else {
-    return gettext("illegal_email_invoice_address");
-  }
-
-  ''; #no error
-}
-
-=item address
-
-Returns the literal email address for this record (or `POST').
-
-=cut
-
-sub address {
-  my $self = shift;
-  if ( $self->dest =~ /^(\d+)$/ ) {
-    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $1 } )
-      or return undef;
-    $svc_acct->email;
-  } else {
-    $self->dest;
-  }
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_main_invoice.pm,v 1.12 2002-04-12 13:22:02 ivan Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_main>
-
-=cut
-
-1;
-
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
deleted file mode 100644
index 98eba704b..000000000
--- a/FS/FS/cust_pay.pm
+++ /dev/null
@@ -1,422 +0,0 @@
-package FS::cust_pay;
-
-use strict;
-use vars qw( @ISA $conf $unsuspendauto $smtpmachine $invoice_from );
-use Date::Format;
-use Mail::Header;
-use Mail::Internet 1.44;
-use Business::CreditCard;
-use FS::UID qw( dbh );
-use FS::Record qw( dbh qsearch qsearchs dbh );
-use FS::cust_bill;
-use FS::cust_bill_pay;
-use FS::cust_main;
-
-@ISA = qw( FS::Record );
-
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::cust_pay'} = sub { 
-
-  $conf = new FS::Conf;
-  $unsuspendauto = $conf->exists('unsuspendauto');
-  $smtpmachine = $conf->config('smtpmachine');
-  $invoice_from = $conf->config('invoice_from');
-
-};
-
-=head1 NAME
-
-FS::cust_pay - Object methods for cust_pay objects
-
-=head1 SYNOPSIS
-
-  use FS::cust_pay;
-
-  $record = new FS::cust_pay \%hash;
-  $record = new FS::cust_pay { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cust_pay object represents a payment; the transfer of money from a
-customer.  FS::cust_pay inherits from FS::Record.  The following fields are
-currently supported:
-
-=over 4
-
-=item paynum - primary key (assigned automatically for new payments)
-
-=item custnum - customer (see L<FS::cust_main>)
-
-=item paid - Amount of this payment
-
-=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=item payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
-
-=item payinfo - card number, check #, or comp issuer (4-8 lowercase alphanumerics; think username), respectively
-
-=item paybatch - text field for tracking card processing
-
-=item closed - books closed flag, empty or `Y'
-
-=back
-
-=head1 METHODS
-
-=over 4 
-
-=item new HASHREF
-
-Creates a new payment.  To add the payment to the databse, see L<"insert">.
-
-=cut
-
-sub table { 'cust_pay'; }
-
-=item insert
-
-Adds this payment to the database.
-
-For backwards-compatibility and convenience, if the additional field invnum
-is defined, an FS::cust_bill_pay record for the full amount of the payment
-will be created.  In this case, custnum is optional.
-
-=cut
-
-sub insert {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  if ( $self->invnum ) {
-    my $cust_bill = qsearchs('cust_bill', { 'invnum' => $self->invnum } )
-      or do {
-        $dbh->rollback if $oldAutoCommit;
-        return "Unknown cust_bill.invnum: ". $self->invnum;
-      };
-    $self->custnum($cust_bill->custnum );
-  }
-
-  my $cust_main = qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
-  my $old_balance = $cust_main->balance;
-
-  my $error = $self->check;
-  return $error if $error;
-
-  $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "error inserting $self: $error";
-  }
-
-  if ( $self->invnum ) {
-    my $cust_bill_pay = new FS::cust_bill_pay {
-      'invnum' => $self->invnum,
-      'paynum' => $self->paynum,
-      'amount' => $self->paid,
-      '_date'  => $self->_date,
-    };
-    $error = $cust_bill_pay->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "error inserting $cust_bill_pay: $error";
-    }
-  }
-
-  if ( $self->paybatch =~ /^webui-/ ) {
-    my @cust_pay = qsearch('cust_pay', {
-      'custnum' => $self->custnum,
-      'paybatch' => $self->paybatch,
-    } );
-    if ( scalar(@cust_pay) > 1 ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "a payment with webui token ". $self->paybatch. " already exists";
-    }
-  }
-
-  #false laziness w/ cust_credit::insert
-  if ( $unsuspendauto && $old_balance && $cust_main->balance <= 0 ) {
-    my @errors = $cust_main->unsuspend;
-    #return 
-    # side-fx with nested transactions?  upstack rolls back?
-    warn "WARNING:Errors unsuspending customer ". $cust_main->custnum. ": ".
-         join(' / ', @errors)
-      if @errors;
-  }
-  #eslaf
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-}
-
-sub upgrade_replace { #1.3.x->1.4.x
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->check;
-  return $error if $error;
-
-  my %new = $self->hash;
-  my $new = FS::cust_pay->new(\%new);
-
-  if ( $self->invnum ) {
-    my $cust_bill_pay = new FS::cust_bill_pay {
-      'invnum' => $self->invnum,
-      'paynum' => $self->paynum,
-      'amount' => $self->paid,
-      '_date'  => $self->_date,
-    };
-    $error = $cust_bill_pay->insert;
-    if ( $error =~ 
-           /total cust_bill_pay.amount and cust_credit_bill.amount .* for invnum .* greater than cust_bill.charged/ ) {
-      #warn $error;
-      my $cust_bill = qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
-      $new->custnum($cust_bill->custnum);
-    } elsif ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    } else {
-      $new->custnum($cust_bill_pay->cust_bill->custnum);
-    }
-  } else {
-    die;
-  }
-
-  $error = $new->SUPER::replace($self);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-
-}
-
-=item delete
-
-Deletes this payment and all associated applications (see L<FS::cust_bill_pay>),
-unless the closed flag is set.
-
-=cut
-
-sub delete {
-  my $self = shift;
-  return "Can't delete closed payment" if $self->closed =~ /^Y/i;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  foreach my $cust_bill_pay ( $self->cust_bill_pay ) {
-    my $error = $cust_bill_pay->delete;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  my $error = $self->SUPER::delete(@_);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  if ( $conf->config('deletepayments') ne '' ) {
-
-    my $cust_main = qsearchs('cust_main',{ 'custnum' => $self->custnum });
-    #false laziness w/FS::cust_bill::send & fs_signup_server
-    $ENV{MAILADDRESS} = $invoice_from; #??? well as good as any
-    my $header = new Mail::Header ( [
-      "From: $invoice_from",
-      "To: ". $conf->config('deletepayments'),
-      "Sender: $invoice_from",
-      "Reply-To: $invoice_from",
-      "Date: ". time2str("%a, %d %b %Y %X %z", time),
-      "Subject: FREESIDE NOTIFICATION: Payment deleted",
-    ] );
-    my $message = new Mail::Internet (
-      'Header' => $header,
-      'Body' => [ 
-        "This is an automatic message from your Freeside installation\n",
-        "informing you that the following payment has been deleted:\n",
-        "\n",
-        'paynum: '. $self->paynum. "\n",
-        'custnum: '. $self->custnum.
-          " (". $cust_main->last. ", ". $cust_main->first. ")\n",
-        'paid: $'. sprintf("%.2f", $self->paid). "\n",
-        'date: '. time2str("%a %b %e %T %Y", $self->_date). "\n",
-        'payby: '. $self->payby. "\n",
-        'payinfo: '. $self->payinfo. "\n",
-        'paybatch: '. $self->paybatch. "\n",
-      ],
-    );
-    $!=0;
-    $message->smtpsend( Host => $smtpmachine )
-      or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-        or do {
-          $dbh->rollback if $oldAutoCommit;
-          return "(customer # ". $self->custnum.
-                 ") can't send payment deletion email to ".
-                 $conf->config('deletepayments').
-                 " via server $smtpmachine with SMTP: $!";
-        };
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-}
-
-=item replace OLD_RECORD
-
-Currently unimplemented (accounting reasons).
-
-=cut
-
-sub replace {
-   return "Can't (yet?) modify cust_pay records!";
-}
-
-=item check
-
-Checks all fields to make sure this is a valid payment.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert method.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error =
-    $self->ut_numbern('paynum')
-    || $self->ut_numbern('custnum')
-    || $self->ut_money('paid')
-    || $self->ut_numbern('_date')
-    || $self->ut_textn('paybatch')
-    || $self->ut_enum('closed', [ '', 'Y' ])
-  ;
-  return $error if $error;
-
-  return "paid must be > 0 " if $self->paid <= 0;
-
-  return "unknown cust_main.custnum: ". $self->custnum
-    unless $self->invnum
-           || qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
-
-  $self->_date(time) unless $self->_date;
-
-  $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
-  $self->payby($1);
-
-  #false laziness with cust_refund::check
-  if ( $self->payby eq 'CARD' ) {
-    my $payinfo = $self->payinfo;
-    $payinfo =~ s/\D//g;
-    $self->payinfo($payinfo);
-    if ( $self->payinfo ) {
-      $self->payinfo =~ /^(\d{13,16})$/
-        or return "Illegal (mistyped?) credit card number (payinfo)";
-      $self->payinfo($1);
-      validate($self->payinfo) or return "Illegal credit card number";
-      return "Unknown card type" if cardtype($self->payinfo) eq "Unknown";
-    } else {
-      $self->payinfo('N/A');
-    }
-
-  } else {
-    $error = $self->ut_textn('payinfo');
-    return $error if $error;
-  }
-
-  ''; #no error
-
-}
-
-=item cust_bill_pay
-
-Returns all applications to invoices (see L<FS::cust_bill_pay>) for this
-payment.
-
-=cut
-
-sub cust_bill_pay {
-  my $self = shift;
-  sort { $a->_date <=> $b->_date }
-    qsearch( 'cust_bill_pay', { 'paynum' => $self->paynum } )
-  ;
-}
-
-=item unapplied
-
-Returns the amount of this payment that is still unapplied; which is
-paid minus all payment applications (see L<FS::cust_bill_pay>).
-
-=cut
-
-sub unapplied {
-  my $self = shift;
-  my $amount = $self->paid;
-  $amount -= $_->amount foreach ( $self->cust_bill_pay );
-  sprintf("%.2f", $amount );
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_pay.pm,v 1.21 2002-06-04 14:35:52 ivan Exp $
-
-=head1 BUGS
-
-Delete and replace methods.
-
-=head1 SEE ALSO
-
-L<FS::cust_bill_pay>, L<FS::cust_bill>, L<FS::Record>, schema.html from the
-base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
deleted file mode 100644
index c4427c387..000000000
--- a/FS/FS/cust_pay_batch.pm
+++ /dev/null
@@ -1,209 +0,0 @@
-package FS::cust_pay_batch;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record;
-use Business::CreditCard;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::cust_pay_batch - Object methods for batch cards
-
-=head1 SYNOPSIS
-
-  use FS::cust_pay_batch;
-
-  $record = new FS::cust_pay_batch \%hash;
-  $record = new FS::cust_pay_batch { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cust_pay_batch object represents a credit card transaction ready to be
-batched (sent to a processor).  FS::cust_pay_batch inherits from FS::Record.  
-Typically called by the collect method of an FS::cust_main object.  The
-following fields are currently supported:
-
-=over 4
-
-=item paybatchnum - primary key (automatically assigned)
-
-=item cardnum
-
-=item exp - card expiration 
-
-=item amount 
-
-=item invnum - invoice
-
-=item custnum - customer 
-
-=item payname - name on card 
-
-=item first - name 
-
-=item last - name 
-
-=item address1 
-
-=item address2 
-
-=item city 
-
-=item state 
-
-=item zip 
-
-=item country 
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new record.  To add the record to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-sub table { 'cust_pay_batch'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Delete this record from the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item replace OLD_RECORD
-
-#inactive
-#
-#Replaces the OLD_RECORD with this one in the database.  If there is an error,
-#returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  return "Can't (yet?) replace batched transactions!";
-}
-
-=item check
-
-Checks all fields to make sure this is a valid transaction.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and repalce methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-      $self->ut_numbern('paybatchnum')
-    || $self->ut_numbern('trancode') #depriciated
-    || $self->ut_number('cardnum') 
-    || $self->ut_money('amount')
-    || $self->ut_number('invnum')
-    || $self->ut_number('custnum')
-    || $self->ut_text('address1')
-    || $self->ut_textn('address2')
-    || $self->ut_text('city')
-    || $self->ut_textn('state')
-  ;
-
-  return $error if $error;
-
-  $self->getfield('last') =~ /^([\w \,\.\-\']+)$/ or return "Illegal last name";
-  $self->setfield('last',$1);
-
-  $self->first =~ /^([\w \,\.\-\']+)$/ or return "Illegal first name";
-  $self->first($1);
-
-  my $cardnum = $self->cardnum;
-  $cardnum =~ s/\D//g;
-  $cardnum =~ /^(\d{13,16})$/
-    or return "Illegal credit card number";
-  $cardnum = $1;
-  $self->cardnum($cardnum);
-  validate($cardnum) or return "Illegal credit card number";
-  return "Unknown card type" if cardtype($cardnum) eq "Unknown";
-
-  if ( $self->exp eq '' ) {
-    return "Expriation date required"; #unless 
-    $self->exp('');
-  } else {
-    if ( $self->exp =~ /^(\d{4})[\/\-](\d{1,2})[\/\-](\d{1,2})$/ ) {
-      $self->exp("$1-$2-$3");
-    } elsif ( $self->exp =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/ ) {
-      if ( length($2) == 4 ) {
-        $self->exp("$2-$1-01");
-      } elsif ( $2 > 98 ) { #should pry change to check for "this year"
-        $self->exp("19$2-$1-01");
-      } else {
-        $self->exp("20$2-$1-01");
-      }
-    } else {
-      return "Illegal expiration date";
-    }
-  }
-
-  if ( $self->payname eq '' ) {
-    $self->payname( $self->first. " ". $self->getfield('last') );
-  } else {
-    $self->payname =~ /^([\w \,\.\-\']+)$/
-      or return "Illegal billing name";
-    $self->payname($1);
-  }
-
-  #$self->zip =~ /^\s*(\w[\w\-\s]{3,8}\w)\s*$/
-  #  or return "Illegal zip: ". $self->zip;
-  #$self->zip($1);
-
-  $self->country =~ /^(\w\w)$/ or return "Illegal country: ". $self->country;
-  $self->country($1);
-
-  $error = $self->ut_zip('zip', $self->country);
-  return $error if $error;
-
-  #check invnum, custnum, ?
-
-  ''; #no error
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_pay_batch.pm,v 1.6 2002-02-22 23:08:11 ivan Exp $
-
-=head1 BUGS
-
-There should probably be a configuration file with a list of allowed credit
-card types.
-
-=head1 SEE ALSO
-
-L<FS::cust_main>, L<FS::Record>
-
-=cut
-
-1;
-
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
deleted file mode 100644
index 8b65ac4bd..000000000
--- a/FS/FS/cust_pkg.pm
+++ /dev/null
@@ -1,710 +0,0 @@
-package FS::cust_pkg;
-
-use strict;
-use vars qw(@ISA);
-use FS::UID qw( getotaker dbh );
-use FS::Record qw( qsearch qsearchs );
-use FS::cust_svc;
-use FS::part_pkg;
-use FS::cust_main;
-use FS::type_pkgs;
-use FS::pkg_svc;
-
-# need to 'use' these instead of 'require' in sub { cancel, suspend, unsuspend,
-# setup }
-# because they load configuraion by setting FS::UID::callback (see TODO)
-use FS::svc_acct;
-use FS::svc_acct_sm;
-use FS::svc_domain;
-use FS::svc_www;
-use FS::svc_forward;
-
-@ISA = qw( FS::Record );
-
-sub _cache {
-  my $self = shift;
-  my ( $hashref, $cache ) = @_;
-  #if ( $hashref->{'pkgpart'} ) {
-  if ( $hashref->{'pkg'} ) {
-    # #@{ $self->{'_pkgnum'} } = ();
-    # my $subcache = $cache->subcache('pkgpart', 'part_pkg');
-    # $self->{'_pkgpart'} = $subcache;
-    # #push @{ $self->{'_pkgnum'} },
-    #   FS::part_pkg->new_or_cached($hashref, $subcache);
-    $self->{'_pkgpart'} = FS::part_pkg->new($hashref);
-  }
-  if ( exists $hashref->{'svcnum'} ) {
-    #@{ $self->{'_pkgnum'} } = ();
-    my $subcache = $cache->subcache('svcnum', 'cust_svc', $hashref->{pkgnum});
-    $self->{'_svcnum'} = $subcache;
-    #push @{ $self->{'_pkgnum'} },
-    FS::cust_svc->new_or_cached($hashref, $subcache) if $hashref->{svcnum};
-  }
-}
-
-=head1 NAME
-
-FS::cust_pkg - Object methods for cust_pkg objects
-
-=head1 SYNOPSIS
-
-  use FS::cust_pkg;
-
-  $record = new FS::cust_pkg \%hash;
-  $record = new FS::cust_pkg { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $error = $record->cancel;
-
-  $error = $record->suspend;
-
-  $error = $record->unsuspend;
-
-  $part_pkg = $record->part_pkg;
-
-  @labels = $record->labels;
-
-  $seconds = $record->seconds_since($timestamp);
-
-  $error = FS::cust_pkg::order( $custnum, \@pkgparts );
-  $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );
-
-=head1 DESCRIPTION
-
-An FS::cust_pkg object represents a customer billing item.  FS::cust_pkg
-inherits from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item pkgnum - primary key (assigned automatically for new billing items)
-
-=item custnum - Customer (see L<FS::cust_main>)
-
-=item pkgpart - Billing item definition (see L<FS::part_pkg>)
-
-=item setup - date
-
-=item bill - date
-
-=item susp - date
-
-=item expire - date
-
-=item cancel - date
-
-=item otaker - order taker (assigned automatically if null, see L<FS::UID>)
-
-=item manual_flag - If this field is set to 1, disables the automatic
-unsuspension of this package when using the B<unsuspendauto> config file.
-
-=back
-
-Note: setup, bill, susp, expire and cancel are specified as UNIX timestamps;
-see L<perlfunc/"time">.  Also see L<Time::Local> and L<Date::Parse> for
-conversion functions.
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Create a new billing item.  To add the item to the database, see L<"insert">.
-
-=cut
-
-sub table { 'cust_pkg'; }
-
-=item insert
-
-Adds this billing item to the database ("Orders" the item).  If there is an
-error, returns the error, otherwise returns false.
-
-=cut
-
-sub insert {
-  my $self = shift;
-
-  # custnum might not have have been defined in sub check (for one-shot new
-  # customers), so check it here instead
-  # (is this still necessary with transactions?)
-
-  my $error = $self->ut_number('custnum');
-  return $error if $error;
-
-  my $cust_main = $self->cust_main;
-  return "Unknown customer ". $self->custnum unless $cust_main;
-
-  my $agent = qsearchs( 'agent', { 'agentnum' => $cust_main->agentnum } );
-  my $pkgpart_href = $agent->pkgpart_hashref;
-  return "agent ". $agent->agentnum. " can't purchase pkgpart ". $self->pkgpart
-    unless $pkgpart_href->{ $self->pkgpart };
-
-  $self->SUPER::insert;
-
-}
-
-=item delete
-
-This method now works but you probably shouldn't use it.
-
-You don't want to delete billing items, because there would then be no record
-the customer ever purchased the item.  Instead, see the cancel method.
-
-=cut
-
-#sub delete {
-#  return "Can't delete cust_pkg records!";
-#}
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-Currently, custnum, setup, bill, susp, expire, and cancel may be changed.
-
-Changing pkgpart may have disasterous effects.  See the order subroutine.
-
-setup and bill are normally updated by calling the bill method of a customer
-object (see L<FS::cust_main>).
-
-suspend is normally updated by the suspend and unsuspend methods.
-
-cancel is normally updated by the cancel method (and also the order subroutine
-in some cases).
-
-=cut
-
-sub replace {
-  my( $new, $old ) = ( shift, shift );
-
-  #return "Can't (yet?) change pkgpart!" if $old->pkgpart != $new->pkgpart;
-  return "Can't change otaker!" if $old->otaker ne $new->otaker;
-
-  #allow this *sigh*
-  #return "Can't change setup once it exists!"
-  #  if $old->getfield('setup') &&
-  #     $old->getfield('setup') != $new->getfield('setup');
-
-  #some logic for bill, susp, cancel?
-
-  $new->SUPER::replace($old);
-}
-
-=item check
-
-Checks all fields to make sure this is a valid billing item.  If there is an
-error, returns the error, otherwise returns false.  Called by the insert and
-replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-    $self->ut_numbern('pkgnum')
-    || $self->ut_numbern('custnum')
-    || $self->ut_number('pkgpart')
-    || $self->ut_numbern('setup')
-    || $self->ut_numbern('bill')
-    || $self->ut_numbern('susp')
-    || $self->ut_numbern('cancel')
-  ;
-  return $error if $error;
-
-  if ( $self->custnum ) { 
-    return "Unknown customer ". $self->custnum unless $self->cust_main;
-  }
-
-  return "Unknown pkgpart: ". $self->pkgpart
-    unless qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
-
-  $self->otaker(getotaker) unless $self->otaker;
-  $self->otaker =~ /^(\w{0,16})$/ or return "Illegal otaker";
-  $self->otaker($1);
-
-  if ( $self->dbdef_table->column('manual_flag') ) {
-    $self->manual_flag =~ /^([01]?)$/ or return "Illegal manual_flag";
-    $self->manual_flag($1);
-  }
-
-  ''; #no error
-}
-
-=item cancel
-
-Cancels and removes all services (see L<FS::cust_svc> and L<FS::part_svc>)
-in this package, then cancels the package itself (sets the cancel field to
-now).
-
-If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub cancel {
-  my $self = shift;
-  my $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE'; 
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  foreach my $cust_svc (
-    qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum } )
-  ) {
-    my $error = $cust_svc->cancel;
-
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "Error cancelling cust_svc: $error";
-    }
-
-  }
-
-  unless ( $self->getfield('cancel') ) {
-    my %hash = $self->hash;
-    $hash{'cancel'} = time;
-    my $new = new FS::cust_pkg ( \%hash );
-    $error = $new->replace($self);
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  ''; #no errors
-}
-
-=item suspend
-
-Suspends all services (see L<FS::cust_svc> and L<FS::part_svc>) in this
-package, then suspends the package itself (sets the susp field to now).
-
-If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub suspend {
-  my $self = shift;
-  my $error ;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE'; 
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  foreach my $cust_svc (
-    qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum } )
-  ) {
-    my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $cust_svc->svcpart } );
-
-    $part_svc->svcdb =~ /^([\w\-]+)$/ or do {
-      $dbh->rollback if $oldAutoCommit;
-      return "Illegal svcdb value in part_svc!";
-    };
-    my $svcdb = $1;
-    require "FS/$svcdb.pm";
-
-    my $svc = qsearchs( $svcdb, { 'svcnum' => $cust_svc->svcnum } );
-    if ($svc) {
-      $error = $svc->suspend;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return $error;
-      }
-    }
-
-  }
-
-  unless ( $self->getfield('susp') ) {
-    my %hash = $self->hash;
-    $hash{'susp'} = time;
-    my $new = new FS::cust_pkg ( \%hash );
-    $error = $new->replace($self);
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  ''; #no errors
-}
-
-=item unsuspend
-
-Unsuspends all services (see L<FS::cust_svc> and L<FS::part_svc>) in this
-package, then unsuspends the package itself (clears the susp field).
-
-If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub unsuspend {
-  my $self = shift;
-  my($error);
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE'; 
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  foreach my $cust_svc (
-    qsearch('cust_svc',{'pkgnum'=> $self->pkgnum } )
-  ) {
-    my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $cust_svc->svcpart } );
-
-    $part_svc->svcdb =~ /^([\w\-]+)$/ or do {
-      $dbh->rollback if $oldAutoCommit;
-      return "Illegal svcdb value in part_svc!";
-    };
-    my $svcdb = $1;
-    require "FS/$svcdb.pm";
-
-    my $svc = qsearchs( $svcdb, { 'svcnum' => $cust_svc->svcnum } );
-    if ($svc) {
-      $error = $svc->unsuspend;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return $error;
-      }
-    }
-
-  }
-
-  unless ( ! $self->getfield('susp') ) {
-    my %hash = $self->hash;
-    $hash{'susp'} = '';
-    my $new = new FS::cust_pkg ( \%hash );
-    $error = $new->replace($self);
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  ''; #no errors
-}
-
-=item part_pkg
-
-Returns the definition for this billing item, as an FS::part_pkg object (see
-L<FS::part_pkg>).
-
-=cut
-
-sub part_pkg {
-  my $self = shift;
-  #exists( $self->{'_pkgpart'} )
-  $self->{'_pkgpart'}
-    ? $self->{'_pkgpart'}
-    : qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
-}
-
-=item cust_svc
-
-Returns the services for this package, as FS::cust_svc objects (see
-L<FS::cust_svc>)
-
-=cut
-
-sub cust_svc {
-  my $self = shift;
-  if ( $self->{'_svcnum'} ) {
-    values %{ $self->{'_svcnum'}->cache };
-  } else {
-    qsearch ( 'cust_svc', { 'pkgnum' => $self->pkgnum } );
-  }
-}
-
-=item labels
-
-Returns a list of lists, calling the label method for all services
-(see L<FS::cust_svc>) of this billing item.
-
-=cut
-
-sub labels {
-  my $self = shift;
-  map { [ $_->label ] } $self->cust_svc;
-}
-
-=item cust_main
-
-Returns the parent customer object (see L<FS::cust_main>).
-
-=cut
-
-sub cust_main {
-  my $self = shift;
-  qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
-}
-
-=item seconds_since TIMESTAMP
-
-Returns the number of seconds all accounts (see L<FS::svc_acct>) in this
-package have been online since TIMESTAMP.
-
-TIMESTAMP is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=cut
-
-sub seconds_since {
-  my($self, $since) = @_;
-  my $seconds = 0;
-
-  foreach my $cust_svc (
-    grep { $_->part_svc->svcdb eq 'svc_acct' } $self->cust_svc
-  ) {
-    $seconds += $cust_svc->seconds_since($since);
-  }
-
-  $seconds;
-
-}
-
-=back
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item order CUSTNUM, PKGPARTS_ARYREF, [ REMOVE_PKGNUMS_ARYREF [ RETURN_CUST_PKG_ARRAYREF ] ]
-
-CUSTNUM is a customer (see L<FS::cust_main>)
-
-PKGPARTS is a list of pkgparts specifying the the billing item definitions (see
-L<FS::part_pkg>) to order for this customer.  Duplicates are of course
-permitted.
-
-REMOVE_PKGNUMS is an optional list of pkgnums specifying the billing items to
-remove for this customer.  The services (see L<FS::cust_svc>) are moved to the
-new billing items.  An error is returned if this is not possible (see
-L<FS::pkg_svc>).  An empty arrayref is equivalent to not specifying this
-parameter.
-
-RETURN_CUST_PKG_ARRAYREF, if specified, will be filled in with the
-newly-created cust_pkg objects.
-
-=cut
-
-sub order {
-  my($custnum, $pkgparts, $remove_pkgnums, $return_cust_pkg) = @_;
-  $remove_pkgnums = [] unless defined($remove_pkgnums);
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  # generate %part_pkg
-  # $part_pkg{$pkgpart} is true iff $custnum may purchase $pkgpart
-  #
-  my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
-  my($agent)=qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
-  my %part_pkg = %{ $agent->pkgpart_hashref };
-
-  my(%svcnum);
-  # generate %svcnum
-  # for those packages being removed:
-  #@{ $svcnum{$svcpart} } goes from a svcpart to a list of FS::cust_svc objects
-  my($pkgnum);
-  foreach $pkgnum ( @{$remove_pkgnums} ) {
-    foreach my $cust_svc (qsearch('cust_svc',{'pkgnum'=>$pkgnum})) {
-      push @{ $svcnum{$cust_svc->getfield('svcpart')} }, $cust_svc;
-    }
-  }
-  
-  my @cust_svc;
-  #generate @cust_svc
-  # for those packages the customer is purchasing:
-  # @{$pkgparts} is a list of said packages, by pkgpart
-  # @cust_svc is a corresponding list of lists of FS::Record objects
-  foreach my $pkgpart ( @{$pkgparts} ) {
-    unless ( $part_pkg{$pkgpart} ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "Customer not permitted to purchase pkgpart $pkgpart!";
-    }
-    push @cust_svc, [
-      map {
-        ( $svcnum{$_} && @{ $svcnum{$_} } ) ? shift @{ $svcnum{$_} } : ();
-      } map { $_->svcpart }
-          qsearch('pkg_svc', { pkgpart  => $pkgpart,
-                               quantity => { op=>'>', value=>'0', } } )
-    ];
-  }
-
-  #special-case until this can be handled better
-  # move services to new svcparts - even if the svcparts don't match (svcdb
-  # needs to...)
-  # looks like they're moved in no particular order, ewwwwwwww
-  # and looks like just one of each svcpart can be moved... o well
-
-  #start with still-leftover services
-  #foreach my $svcpart ( grep { scalar(@{ $svcnum{$_} }) } keys %svcnum ) {
-  foreach my $svcpart ( keys %svcnum ) {
-    next unless @{ $svcnum{$svcpart} };
-
-    my $svcdb = $svcnum{$svcpart}->[0]->part_svc->svcdb;
-
-    #find an empty place to put one
-    my $i = 0;
-    foreach my $pkgpart ( @{$pkgparts} ) {
-      my @pkg_svc =
-        qsearch('pkg_svc', { pkgpart  => $pkgpart,
-                             quantity => { op=>'>', value=>'0', } } );
-      #my @pkg_svc =
-      #  grep { $_->quantity > 0 } qsearch('pkg_svc', { pkgpart=>$pkgpart } );
-      if ( ! @{$cust_svc[$i]} #find an empty place to put them with 
-           && grep { $svcdb eq $_->part_svc->svcdb } #with appropriate svcdb
-                @pkg_svc
-      ) {
-        my $new_svcpart =
-          ( grep { $svcdb eq $_->part_svc->svcdb } @pkg_svc )[0]->svcpart; 
-        my $cust_svc = shift @{$svcnum{$svcpart}};
-        $cust_svc->svcpart($new_svcpart);
-        #warn "changing from $svcpart to $new_svcpart!!!\n";
-        $cust_svc[$i] = [ $cust_svc ];
-      }
-      $i++;
-    }
-
-  }
-  
-  #check for leftover services
-  foreach (keys %svcnum) {
-    next unless @{ $svcnum{$_} };
-    $dbh->rollback if $oldAutoCommit;
-    return "Leftover services, svcpart $_: svcnum ".
-           join(', ', map { $_->svcnum } @{ $svcnum{$_} } );
-  }
-
-  #no leftover services, let's make changes.
- 
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE'; 
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE'; 
-  local $SIG{PIPE} = 'IGNORE'; 
-
-  #first cancel old packages
-  foreach my $pkgnum ( @{$remove_pkgnums} ) {
-    my($old) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-    unless ( $old ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "Package $pkgnum not found to remove!";
-    }
-    my(%hash) = $old->hash;
-    $hash{'cancel'}=time;   
-    my($new) = new FS::cust_pkg ( \%hash );
-    my($error)=$new->replace($old);
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "Couldn't update package $pkgnum: $error";
-    }
-  }
-
-  #now add new packages, changing cust_svc records if necessary
-  my $pkgpart;
-  while ($pkgpart=shift @{$pkgparts} ) {
- 
-    my $new = new FS::cust_pkg {
-                                 'custnum' => $custnum,
-                                 'pkgpart' => $pkgpart,
-                               };
-    my $error = $new->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "Couldn't insert new cust_pkg record: $error";
-    }
-    push @{$return_cust_pkg}, $new if $return_cust_pkg;
-    my $pkgnum = $new->pkgnum;
- 
-    foreach my $cust_svc ( @{ shift @cust_svc } ) {
-      my(%hash) = $cust_svc->hash;
-      $hash{'pkgnum'}=$pkgnum;
-      my $new = new FS::cust_svc ( \%hash );
-
-      #avoid Record diffing missing changed svcpart field from above.
-      my $old = qsearchs('cust_svc', { 'svcnum' => $cust_svc->svcnum } );
-
-      my $error = $new->replace($old);
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "Couldn't link old service to new package: $error";
-      }
-    }
-  }  
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  ''; #no errors
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_pkg.pm,v 1.22 2002-05-22 12:17:06 ivan Exp $
-
-=head1 BUGS
-
-sub order is not OO.  Perhaps it should be moved to FS::cust_main and made so?
-
-In sub order, the @pkgparts array (passed by reference) is clobbered.
-
-Also in sub order, no money is adjusted.  Once FS::part_pkg defines a standard
-method to pass dates to the recur_prog expression, it should do so.
-
-FS::svc_acct, FS::svc_acct_sm, and FS::svc_domain are loaded via 'use' at 
-compile time, rather than via 'require' in sub { setup, suspend, unsuspend,
-cancel } because they use %FS::UID::callback to load configuration values.
-Probably need a subroutine which decides what to do based on whether or not
-we've fetched the user yet, rather than a hash.  See FS::UID and the TODO.
-
-Now that things are transactional should the check in the insert method be
-moved to check ?
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_main>, L<FS::part_pkg>, L<FS::cust_svc>,
-L<FS::pkg_svc>, schema.html from the base documentation
-
-=cut
-
-1;
-
diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
deleted file mode 100644
index 8fe6876d3..000000000
--- a/FS/FS/cust_refund.pm
+++ /dev/null
@@ -1,282 +0,0 @@
-package FS::cust_refund;
-
-use strict;
-use vars qw( @ISA );
-use Business::CreditCard;
-use FS::Record qw( qsearchs dbh );
-use FS::UID qw(getotaker);
-use FS::cust_credit;
-use FS::cust_credit_refund;
-use FS::cust_main;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::cust_refund - Object method for cust_refund objects
-
-=head1 SYNOPSIS
-
-  use FS::cust_refund;
-
-  $record = new FS::cust_refund \%hash;
-  $record = new FS::cust_refund { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cust_refund represents a refund: the transfer of money to a customer;
-equivalent to a negative payment (see L<FS::cust_pay>).  FS::cust_refund
-inherits from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item refundnum - primary key (assigned automatically for new refunds)
-
-=item custnum - customer (see L<FS::cust_main>)
-
-=item refund - Amount of the refund
-
-=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=item payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
-
-=item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
-
-=item paybatch - text field for tracking card processing
-
-=item otaker - order taker (assigned automatically, see L<FS::UID>)
-
-=item closed - books closed flag, empty or `Y'
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new refund.  To add the refund to the database, see L<"insert">.
-
-=cut
-
-sub table { 'cust_refund'; }
-
-=item insert
-
-Adds this refund to the database.
-
-For backwards-compatibility and convenience, if the additional field crednum is
-defined, an FS::cust_credit_refund record for the full amount of the refund
-will be created.  In this case, custnum is optional.
-
-=cut
-
-sub insert {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  if ( $self->crednum ) {
-    my $cust_credit = qsearchs('cust_credit', { 'crednum' => $self->crednum } )
-      or do {
-        $dbh->rollback if $oldAutoCommit;
-        return "Unknown cust_credit.crednum: ". $self->crednum;
-      };
-    $self->custnum($cust_credit->custnum);
-  }
-
-  my $error = $self->check;
-  return $error if $error;
-
-  $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  if ( $self->crednum ) {
-    my $cust_credit_refund = new FS::cust_credit_refund {
-      'crednum'   => $self->crednum,
-      'refundnum' => $self->refundnum,
-      'amount'    => $self->refund,
-      '_date'     => $self->_date,
-    };
-    $error = $cust_credit_refund->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-    #$self->custnum($cust_credit_refund->cust_credit->custnum);
-  }
-
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-}
-
-sub upgrade_replace { #1.3.x->1.4.x
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->check;
-  return $error if $error;
-
-  my %new = $self->hash;
-  my $new = FS::cust_refund->new(\%new);
-
-  if ( $self->crednum ) {
-    my $cust_credit_refund = new FS::cust_credit_refund {
-      'crednum'   => $self->crednum,
-      'refundnum' => $self->refundnum,
-      'amount'    => $self->refund,
-      '_date'     => $self->_date,
-    };
-    $error = $cust_credit_refund->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-    $new->custnum($cust_credit_refund->cust_credit->custnum);
-  } else {
-    die;
-  }
-
-  $error = $new->SUPER::replace($self);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-}
-
-=item delete
-
-Currently unimplemented (accounting reasons).
-
-=cut
-
-sub delete {
-  my $self = shift;
-  return "Can't delete closed refund" if $self->closed =~ /^Y/i;
-  $self->SUPER::delete(@_);
-}
-
-=item replace OLD_RECORD
-
-Currently unimplemented (accounting reasons).
-
-=cut
-
-sub replace {
-   return "Can't (yet?) modify cust_refund records!";
-}
-
-=item check
-
-Checks all fields to make sure this is a valid refund.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert method.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error =
-    $self->ut_numbern('refundnum')
-    || $self->ut_numbern('custnum')
-    || $self->ut_money('refund')
-    || $self->ut_numbern('_date')
-    || $self->ut_textn('paybatch')
-    || $self->ut_enum('closed', [ '', 'Y' ])
-  ;
-  return $error if $error;
-
-  return "refund must be > 0 " if $self->refund <= 0;
-
-  $self->_date(time) unless $self->_date;
-
-  return "unknown cust_main.custnum: ". $self->custnum
-    unless $self->crednum 
-           || qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
-
-  $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
-  $self->payby($1);
-
-  #false laziness with cust_pay::check
-  if ( $self->payby eq 'CARD' ) {
-    my $payinfo = $self->payinfo;
-    $payinfo =~ s/\D//g;
-    $self->payinfo($payinfo);
-    if ( $self->payinfo ) {
-      $self->payinfo =~ /^(\d{13,16})$/
-        or return "Illegal (mistyped?) credit card number (payinfo)";
-      $self->payinfo($1);
-      validate($self->payinfo) or return "Illegal credit card number";
-      return "Unknown card type" if cardtype($self->payinfo) eq "Unknown";
-    } else {
-      $self->payinfo('N/A');
-    }
-
-  } else {
-    $error = $self->ut_textn('payinfo');
-    return $error if $error;
-  }
-
-  $self->otaker(getotaker);
-
-  ''; #no error
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_refund.pm,v 1.18 2002-02-19 03:22:39 jeff Exp $
-
-=head1 BUGS
-
-Delete and replace methods.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_credit>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
deleted file mode 100644
index c7cc4b322..000000000
--- a/FS/FS/cust_svc.pm
+++ /dev/null
@@ -1,367 +0,0 @@
-package FS::cust_svc;
-
-use strict;
-use vars qw( @ISA );
-use Carp qw( cluck );
-use FS::Record qw( qsearch qsearchs dbh );
-use FS::cust_pkg;
-use FS::part_pkg;
-use FS::part_svc;
-use FS::pkg_svc;
-use FS::svc_acct;
-use FS::svc_acct_sm;
-use FS::svc_domain;
-use FS::svc_forward;
-use FS::domain_record;
-
-@ISA = qw( FS::Record );
-
-sub _cache {
-  my $self = shift;
-  my ( $hashref, $cache ) = @_;
-  if ( $hashref->{'username'} ) {
-    $self->{'_svc_acct'} = FS::svc_acct->new($hashref, '');
-  }
-  if ( $hashref->{'svc'} ) {
-    $self->{'_svcpart'} = FS::part_svc->new($hashref);
-  }
-}
-
-=head1 NAME
-
-FS::cust_svc - Object method for cust_svc objects
-
-=head1 SYNOPSIS
-
-  use FS::cust_svc;
-
-  $record = new FS::cust_svc \%hash
-  $record = new FS::cust_svc { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  ($label, $value) = $record->label;
-
-=head1 DESCRIPTION
-
-An FS::cust_svc represents a service.  FS::cust_svc inherits from FS::Record.
-The following fields are currently supported:
-
-=over 4
-
-=item svcnum - primary key (assigned automatically for new services)
-
-=item pkgnum - Package (see L<FS::cust_pkg>)
-
-=item svcpart - Service definition (see L<FS::part_svc>)
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new service.  To add the refund to the database, see L<"insert">.
-Services are normally created by creating FS::svc_ objects (see
-L<FS::svc_acct>, L<FS::svc_domain>, and L<FS::svc_forward>, among others).
-
-=cut
-
-sub table { 'cust_svc'; }
-
-=item insert
-
-Adds this service to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this service from the database.  If there is an error, returns the
-error, otherwise returns false.  Note that this only removes the cust_svc
-record - you should probably use the B<cancel> method instead.
-
-=item cancel
-
-Cancels the relevant service by calling the B<cancel> method of the associated
-FS::svc_XXX object (i.e. an FS::svc_acct object or FS::svc_domain object),
-deleting the FS::svc_XXX record and then deleting this record.
-
-If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub cancel {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE'; 
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $part_svc = $self->part_svc;
-
-  $part_svc->svcdb =~ /^([\w\-]+)$/ or do {
-    $dbh->rollback if $oldAutoCommit;
-    return "Illegal svcdb value in part_svc!";
-  };
-  my $svcdb = $1;
-  require "FS/$svcdb.pm";
-
-  my $svc = $self->svc_x;
-  if ($svc) {
-    my $error = $svc->cancel;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "Error canceling service: $error";
-    }
-    $error = $svc->delete;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "Error deleting service: $error";
-    }
-  }
-
-  my $error = $self->delete;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "Error deleting cust_svc: $error";
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  ''; #no errors
-
-}
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $new->SUPER::replace($old);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error if $error;
-  }
-
-  if ( $new->svcpart != $old->svcpart ) {
-    my $svc_x = $new->svc_x;
-    my $new_svc_x = ref($svc_x)->new({$svc_x->hash});
-    my $error = $new_svc_x->replace($svc_x);
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error if $error;
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  ''; #no error
-
-}
-
-=item check
-
-Checks all fields to make sure this is a valid service.  If there is an error,
-returns the error, otehrwise returns false.  Called by the insert and
-replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error =
-    $self->ut_numbern('svcnum')
-    || $self->ut_numbern('pkgnum')
-    || $self->ut_number('svcpart')
-  ;
-  return $error if $error;
-
-  my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
-  return "Unknown svcpart" unless $part_svc;
-
-  if ( $self->pkgnum ) {
-    my $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
-    return "Unknown pkgnum" unless $cust_pkg;
-    my $pkg_svc = qsearchs( 'pkg_svc', {
-      'pkgpart' => $cust_pkg->pkgpart,
-      'svcpart' => $self->svcpart,
-    });
-    # or new FS::pkg_svc ( { 'pkgpart'  => $cust_pkg->pkgpart,
-    #                        'svcpart'  => $self->svcpart,
-    #                        'quantity' => 0                   } );
-
-    my @cust_svc = qsearch('cust_svc', {
-      'pkgnum'  => $self->pkgnum,
-      'svcpart' => $self->svcpart,
-    });
-    return "Already ". scalar(@cust_svc). " ". $part_svc->svc.
-           " services for pkgnum ". $self->pkgnum
-      if scalar(@cust_svc) >= $pkg_svc->quantity;
-  }
-
-  ''; #no error
-}
-
-=item part_svc
-
-Returns the definition for this service, as a FS::part_svc object (see
-L<FS::part_svc>).
-
-=cut
-
-sub part_svc {
-  my $self = shift;
-  $self->{'_svcpart'}
-    ? $self->{'_svcpart'}
-    : qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
-}
-
-=item cust_pkg
-
-Returns the definition for this service, as a FS::part_svc object (see
-L<FS::part_svc>).
-
-=cut
-
-sub cust_pkg {
-  my $self = shift;
-  qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
-}
-
-=item label
-
-Returns a list consisting of:
-- The name of this service (from part_svc)
-- A meaningful identifier (username, domain, or mail alias)
-- The table name (i.e. svc_domain) for this service
-
-=cut
-
-sub label {
-  my $self = shift;
-  my $svcdb = $self->part_svc->svcdb;
-  my $svc_x = $self->svc_x
-    or die "can't find $svcdb.svcnum ". $self->svcnum;
-  my $tag;
-  if ( $svcdb eq 'svc_acct' ) {
-    $tag = $svc_x->email;
-  } elsif ( $svcdb eq 'svc_acct_sm' ) {
-    my $domuser = $svc_x->domuser eq '*' ? '(anything)' : $svc_x->domuser;
-    my $svc_domain = qsearchs ( 'svc_domain', { 'svcnum' => $svc_x->domsvc } );
-    my $domain = $svc_domain->domain;
-    $tag = "$domuser\@$domain";
-  } elsif ( $svcdb eq 'svc_forward' ) {
-    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $svc_x->srcsvc } );
-    $tag = $svc_acct->email. '->';
-    if ( $svc_x->dstsvc ) {
-      $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $svc_x->dstsvc } );
-      $tag .= $svc_acct->email;
-    } else {
-      $tag .= $svc_x->dst;
-    }
-  } elsif ( $svcdb eq 'svc_domain' ) {
-    $tag = $svc_x->getfield('domain');
-  } elsif ( $svcdb eq 'svc_www' ) {
-    my $domain = qsearchs( 'domain_record', { 'recnum' => $svc_x->recnum } );
-    $tag = $domain->reczone;
-  } else {
-    cluck "warning: asked for label of unsupported svcdb; using svcnum";
-    $tag = $svc_x->getfield('svcnum');
-  }
-  $self->part_svc->svc, $tag, $svcdb;
-}
-
-=item svc_x
-
-Returns the FS::svc_XXX object for this service (i.e. an FS::svc_acct object or
-FS::svc_domain object, etc.)
-
-=cut
-
-sub svc_x {
-  my $self = shift;
-  my $svcdb = $self->part_svc->svcdb;
-  if ( $svcdb eq 'svc_acct' && $self->{'_svc_acct'} ) {
-    $self->{'_svc_acct'};
-  } else {
-    qsearchs( $svcdb, { 'svcnum' => $self->svcnum } );
-  }
-}
-
-=item seconds_since TIMESTAMP
-
-See L<FS::svc_acct/seconds_since>.  Equivalent to
-$cust_svc->svc_x->seconds_since, but more efficient.  Meaningless for records
-where B<svcdb> is not "svc_acct".
-
-=cut
-
-#note: implementation here, POD in FS::svc_acct
-sub seconds_since {
-  my($self, $since) = @_;
-  my $dbh = dbh;
-  my $sth = $dbh->prepare(' SELECT SUM(logout-login) FROM session
-                              WHERE svcnum = ?
-                                AND login >= ?
-                                AND logout IS NOT NULL'
-  ) or die $dbh->errstr;
-  $sth->execute($self->svcnum, $since) or die $sth->errstr;
-  $sth->fetchrow_arrayref->[0];
-}
-
-=back
-
-=head1 VERSION
-
-$Id: cust_svc.pm,v 1.15 2002-05-22 12:17:06 ivan Exp $
-
-=head1 BUGS
-
-Behaviour of changing the svcpart of cust_svc records is undefined and should
-possibly be prohibited, and pkg_svc records are not checked.
-
-pkg_svc records are not checked in general (here).
-
-Deleting this record doesn't check or delete the svc_* record associated
-with this record.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_pkg>, L<FS::part_svc>, L<FS::pkg_svc>, 
-schema.html from the base documentation
-
-=cut
-
-1;
-
diff --git a/FS/FS/cust_tax_exempt.pm b/FS/FS/cust_tax_exempt.pm
deleted file mode 100644
index ab873c0a7..000000000
--- a/FS/FS/cust_tax_exempt.pm
+++ /dev/null
@@ -1,131 +0,0 @@
-package FS::cust_tax_exempt;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::cust_tax_exempt - Object methods for cust_tax_exempt records
-
-=head1 SYNOPSIS
-
-  use FS::cust_tax_exempt;
-
-  $record = new FS::cust_tax_exempt \%hash;
-  $record = new FS::cust_tax_exempt { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cust_tax_exempt object represents a historical record of a customer tax
-exemption.  Currently this is only used for "texas tax".  FS::cust_tax_exempt
-inherits from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item exemptnum - primary key
-
-=item custnum - customer (see L<FS::cust_main>)
-
-=item taxnum - tax rate (see L<FS::cust_main_county>)
-
-=item year
-
-=item month
-
-=item amount
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new exemption record.  To add the example to the database, see
-L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'cust_tax_exempt'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  $self->ut_numbern('exemptnum')
-    || $self->ut_foreign_key('custnum', 'cust_main', 'custnum')
-    || $self->ut_foreign_key('taxnum', 'cust_main_county', 'taxnum')
-    || $self->ut_number('year') #check better
-    || $self->ut_number('month') #check better
-    || $self->ut_money('amount')
-  ;
-}
-
-=back
-
-=head1 BUGS
-
-Texas tax is a royal pain in the ass.
-
-=head1 SEE ALSO
-
-L<FS::cust_main_county>, L<FS::cust_main>, L<FS::Record>, schema.html from the
-base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
deleted file mode 100644
index 37cc6c9e8..000000000
--- a/FS/FS/domain_record.pm
+++ /dev/null
@@ -1,332 +0,0 @@
-package FS::domain_record;
-
-use strict;
-use vars qw( @ISA $noserial_hack );
-#use FS::Record qw( qsearch qsearchs );
-use FS::Record qw( qsearchs dbh );
-use FS::svc_domain;
-use FS::svc_www;
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::domain_record - Object methods for domain_record records
-
-=head1 SYNOPSIS
-
-  use FS::domain_record;
-
-  $record = new FS::domain_record \%hash;
-  $record = new FS::domain_record { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::domain_record object represents an entry in a DNS zone.
-FS::domain_record inherits from FS::Record.  The following fields are currently
-supported:
-
-=over 4
-
-=item recnum - primary key
-
-=item svcnum - Domain (see L<FS::svc_domain>) of this entry
-
-=item reczone - partial (or full) zone for this entry
-
-=item recaf - address family for this entry, currently only `IN' is recognized.
-
-=item rectype - record type for this entry (A, MX, etc.)
-
-=item recdata - data for this entry
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new entry.  To add the example to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-sub table { 'domain_record'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-sub insert {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  if ( $self->rectype eq '_mstr' ) { #delete all other records
-    foreach my $domain_record ( reverse $self->svc_domain->domain_record ) {
-      my $error = $domain_record->delete;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return $error;
-      }
-    }
-  }
-
-  my $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  unless ( $self->rectype =~ /^(SOA|_mstr)$/ ) {
-    my $error = $self->increment_serial;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-}
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-sub delete {
-  my $self = shift;
-
-  return "Can't delete a domain record which has a website!"
-    if qsearchs( 'svc_www', { 'recnum' => $self->recnum } );
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->SUPER::delete;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  unless ( $self->rectype =~ /^(SOA|_mstr)$/ ) {
-    my $error = $self->increment_serial;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-}
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->SUPER::replace(@_);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  unless ( $self->rectype eq 'SOA' ) {
-    my $error = $self->increment_serial;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-}
-
-=item check
-
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-    $self->ut_numbern('recnum')
-    || $self->ut_number('svcnum')
-  ;
-  return $error if $error;
-
-  return "Unknown svcnum (in svc_domain)"
-    unless qsearchs('svc_domain', { 'svcnum' => $self->svcnum } );
-
-  $self->reczone =~ /^(@|[a-z0-9\.\-\*]+)$/i
-    or return "Illegal reczone: ". $self->reczone;
-  $self->reczone($1);
-
-  $self->recaf =~ /^(IN)$/ or return "Illegal recaf: ". $self->recaf;
-  $self->recaf($1);
-
-  $self->rectype =~ /^(SOA|NS|MX|A|PTR|CNAME|_mstr)$/
-    or return "Illegal rectype (only SOA NS MX A PTR CNAME recognized): ".
-              $self->rectype;
-  $self->rectype($1);
-
-  return "Illegal reczone for ". $self->rectype. ": ". $self->reczone
-    if $self->rectype !~ /^MX$/i && $self->reczone =~ /\*/;
-
-  if ( $self->rectype eq 'SOA' ) {
-    my $recdata = $self->recdata;
-    $recdata =~ s/\s+/ /g;
-    $recdata =~ /^([a-z0-9\.\-]+ [\w\-\+]+\.[a-z0-9\.\-]+ \( (\d+ ){5}\))$/i
-      or return "Illegal data for SOA record: $recdata";
-    $self->recdata($1);
-  } elsif ( $self->rectype eq 'NS' ) {
-    $self->recdata =~ /^([a-z0-9\.\-]+)$/i
-      or return "Illegal data for NS record: ". $self->recdata;
-    $self->recdata($1);
-  } elsif ( $self->rectype eq 'MX' ) {
-    $self->recdata =~ /^(\d+)\s+([a-z0-9\.\-]+)$/i
-      or return "Illegal data for MX record: ". $self->recdata;
-    $self->recdata("$1 $2");
-  } elsif ( $self->rectype eq 'A' ) {
-    $self->recdata =~ /^((\d{1,3}\.){3}\d{1,3})$/
-      or return "Illegal data for A record: ". $self->recdata;
-    $self->recdata($1);
-  } elsif ( $self->rectype eq 'PTR' ) {
-    $self->recdata =~ /^([a-z0-9\.\-]+)$/i
-      or return "Illegal data for PTR record: ". $self->recdata;
-    $self->recdata($1);
-  } elsif ( $self->rectype eq 'CNAME' ) {
-    $self->recdata =~ /^([a-z0-9\.\-]+)$/i
-      or return "Illegal data for CNAME record: ". $self->recdata;
-    $self->recdata($1);
-  } elsif ( $self->rectype eq '_mstr' ) {
-    $self->recdata =~ /^((\d{1,3}\.){3}\d{1,3})$/
-      or return "Illegal data for _master pseudo-record: ". $self->recdata;
-  } else {
-    die "ack!";
-  }
-
-  ''; #no error
-}
-
-=item increment_serial
-
-=cut
-
-sub increment_serial {
-  return '' if $noserial_hack;
-  my $self = shift;
-
-  my $soa = qsearchs('domain_record', {
-    svcnum  => $self->svcnum,
-    reczone => '@', #or full domain ?
-    recaf   => 'IN',
-    rectype => 'SOA', 
-  } ) or return "soa record not found; can't increment serial";
-
-  my $data = $soa->recdata;
-  $data =~ s/(\(\D*)(\d+)/$1.($2+1)/e; #well, it works.
-
-  my %hash = $soa->hash;
-  $hash{recdata} = $data;
-  my $new = new FS::domain_record \%hash;
-  $new->replace($soa);
-}
-
-=item svc_domain
-
-Returns the domain (see L<FS::svc_domain>) for this record.
-
-=cut
-
-sub svc_domain {
-  my $self = shift;
-  qsearchs('svc_domain', { svcnum => $self->svcnum } );
-}
-
-=back
-
-=head1 VERSION
-
-$Id: domain_record.pm,v 1.11 2002-06-23 19:16:45 ivan Exp $
-
-=head1 BUGS
-
-The data validation doesn't check everything it could.  In particular,
-there is no protection against bad data that passes the regex, duplicate
-SOA records, forgetting the trailing `.', impossible IP addersses, etc.  Of
-course, it's still better than editing the zone files directly.  :)
-
-=head1 SEE ALSO
-
-L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/export_svc.pm b/FS/FS/export_svc.pm
deleted file mode 100644
index da9ac698a..000000000
--- a/FS/FS/export_svc.pm
+++ /dev/null
@@ -1,123 +0,0 @@
-package FS::export_svc;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-use FS::part_export;
-use FS::part_svc;
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::export_svc - Object methods for export_svc records
-
-=head1 SYNOPSIS
-
-  use FS::export_svc;
-
-  $record = new FS::export_svc \%hash;
-  $record = new FS::export_svc { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::export_svc object links a service definition (see L<FS::part_svc>) to
-an export (see L<FS::part_export>).  FS::export_svc inherits from FS::Record.
-The following fields are currently supported:
-
-=over 4
-
-=item exportsvcnum - primary key
-
-=item exportnum - export (see L<FS::part_export>)
-
-=item svcpart - service definition (see L<FS::part_svc>)
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new record.  To add the record to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'export_svc'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  $self->ut_numbern('exportsvcnum')
-    || $self->ut_number('exportnum')
-    || $self->ut_foreign_key('exportnum', 'part_export', 'exportnum')
-    || $self->ut_number('svcpart')
-    || $self->ut_foreign_key('svcpart', 'part_svc', 'svcpart')
-  ;
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::part_export>, L<FS::part_svc>, L<FS::Record>, schema.html from the base
-documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/msgcat.pm b/FS/FS/msgcat.pm
deleted file mode 100644
index fa10d34fa..000000000
--- a/FS/FS/msgcat.pm
+++ /dev/null
@@ -1,132 +0,0 @@
-package FS::msgcat;
-
-use strict;
-use vars qw( @ISA );
-use Exporter;
-use FS::UID;
-use FS::Record qw( qsearchs );
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::msgcat - Object methods for message catalog entries
-
-=head1 SYNOPSIS
-
-  use FS::msgcat;
-
-  $record = new FS::msgcat \%hash;
-  $record = new FS::msgcat { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::msgcat object represents an message catalog entry.  FS::msgcat inherits 
-from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item msgnum - primary key
-
-=item msgcode - Error code
-
-=item locale - Locale
-
-=item msg - Message
-
-=back
-
-If you just want to B<use> message catalogs, see L<FS::Msgcat>.
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new example.  To add the example to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'msgcat'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  my $error =
-    $self->ut_numbern('msgnum')
-    || $self->ut_text('msgcode')
-    || $self->ut_text('msg')
-  ;
-  return $error if $error;
-
-  $self->locale =~ /^([\w\@]+)$/ or return "illegal locale: ". $self->locale;
-  $self->locale($1);
-
-  ''; #no error
-}
-
-=back
-
-=head1 BUGS
-
-i18n/l10n, eek
-
-=head1 SEE ALSO
-
-L<FS::Msgcat>, L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/nas.pm b/FS/FS/nas.pm
deleted file mode 100644
index 58c6827ea..000000000
--- a/FS/FS/nas.pm
+++ /dev/null
@@ -1,152 +0,0 @@
-package FS::nas;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw(qsearchs); #qsearch);
-use FS::UID qw( dbh );
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::nas - Object methods for nas records
-
-=head1 SYNOPSIS
-
-  use FS::nas;
-
-  $record = new FS::nas \%hash;
-  $record = new FS::nas {
-    'nasnum'  => 1,
-    'nasip'   => '10.4.20.23',
-    'nasfqdn' => 'box1.brc.nv.us.example.net',
-  };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $error = $record->heartbeat($timestamp);
-
-=head1 DESCRIPTION
-
-An FS::nas object represents an Network Access Server on your network, such as
-a terminal server or equivalent.  FS::nas inherits from FS::Record.  The
-following fields are currently supported:
-
-=over 4
-
-=item nasnum - primary key
-
-=item nas - NAS name
-
-=item nasip - NAS ip address
-
-=item nasfqdn - NAS fully-qualified domain name
-
-=item last - timestamp indicating the last instant the NAS was in a known
-             state (used by the session monitoring).
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new NAS.  To add the NAS to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'nas'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  $self->ut_numbern('nasnum')
-    || $self->ut_text('nas')
-    || $self->ut_ip('nasip')
-    || $self->ut_domain('nasfqdn')
-    || $self->ut_numbern('last');
-}
-
-=item heartbeat TIMESTAMP
-
-Updates the timestamp for this nas
-
-=cut
-
-sub heartbeat {
-  my($self, $timestamp) = @_;
-  my $dbh = dbh;
-  my $sth =
-    $dbh->prepare("UPDATE nas SET last = ? WHERE nasnum = ? AND last < ?");
-  $sth->execute($timestamp, $self->nasnum, $timestamp) or die $sth->errstr;
-  $self->last($timestamp);
-}
-
-=back
-
-=head1 VERSION
-
-$Id: nas.pm,v 1.6 2002-03-04 12:48:49 ivan Exp $
-
-=head1 BUGS
-
-heartbeat method uses SQL directly and doesn't update history tables.
-
-=head1 SEE ALSO
-
-L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
deleted file mode 100644
index a31b09b36..000000000
--- a/FS/FS/part_bill_event.pm
+++ /dev/null
@@ -1,183 +0,0 @@
-package FS::part_bill_event;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-use FS::Conf;
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::part_bill_event - Object methods for part_bill_event records
-
-=head1 SYNOPSIS
-
-  use FS::part_bill_event;
-
-  $record = new FS::part_bill_event \%hash;
-  $record = new FS::part_bill_event { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::part_bill_event object represents an invoice event definition -
-a callback which is triggered when an invoice is a certain amount of time
-overdue.  FS::part_bill_event inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item eventpart - primary key
-
-=item payby - CARD, BILL, or COMP
-
-=item event - event name
-
-=item eventcode - event action
-
-=item seconds - how long after the invoice date events of this type are triggered
-
-=item weight - ordering for events with identical seconds
-
-=item plan - eventcode plan
-
-=item plandata - additional plan data
-
-=item disabled - Disabled flag, empty or `Y'
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new invoice event definition.  To add the example to the database,
-see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'part_bill_event'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid invoice event definition.  If
-there is an error, returns the error, otherwise returns false.  Called by the
-insert and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  $self->weight(0) unless $self->weight;
-
-  my $conf = new FS::Conf;
-  if ( $conf->exists('safe-part_bill_event') ) {
-    my $error = $self->ut_anything('eventcode');
-    return $error if $error;
-
-    my $c = $self->eventcode;
-
-    $c =~ /^\s*\$cust_main\->(suspend|cancel|invoicing_list_addpost|bill|collect)\(\);\s*("";)?\s*$/
-
-      or $c =~ /^\s*\$cust_bill\->(comp|realtime_card|realtime_card_cybercash|batch_card|send)\(\);\s*$/
-
-      or $c =~ /^\s*\$cust_bill\->send\(\'\w+\'\);\s*$/
-
-      or $c =~ /^\s*\$cust_main\->apply_payments; \$cust_main->apply_credits; "";\s*$/
-
-      or $c =~ /^\s*\$cust_main\->charge\( \s*\d*\.?\d*\s*,\s*\'[\w \!\@\#\$\%\&\(\)\-\+\;\:\"\,\.\?\/]*\'\s*\);\s*$/
-
-      or do {
-        #log
-        return "illegal eventcode: $c";
-      };
-
-  }
-
-  my $error = $self->ut_numbern('eventpart')
-    || $self->ut_enum('payby', [qw( CARD BILL COMP )] )
-    || $self->ut_text('event')
-    || $self->ut_anything('eventcode')
-    || $self->ut_number('seconds')
-    || $self->ut_enum('disabled', [ '', 'Y' ] )
-    || $self->ut_number('weight')
-    || $self->ut_textn('plan')
-    || $self->ut_anything('plandata')
-  ;
-  return $error if $error;
-
-  #quelle kludge
-  if ( $self->plandata =~ /^templatename\s+(.*)$/ ) {
-    my $name= $1;
-    unless ( $conf->exists("invoice_template_$name") ) {
-      $conf->set(
-        "invoice_template_$name" =>
-          join("\n", $conf->config('invoice_template') )
-      );
-    }
-  }
-
-  '';
-
-}
-
-=back
-
-=head1 BUGS
-
-Alas.
-
-=head1 SEE ALSO
-
-L<FS::cust_bill>, L<FS::cust_bill_event>, L<FS::Record>, schema.html from the
-base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
deleted file mode 100644
index 4f45fbeec..000000000
--- a/FS/FS/part_export.pm
+++ /dev/null
@@ -1,850 +0,0 @@
-package FS::part_export;
-
-use strict;
-use vars qw( @ISA @EXPORT_OK %exports );
-use Exporter;
-use Tie::IxHash;
-use FS::Record qw( qsearch qsearchs dbh );
-use FS::part_svc;
-use FS::part_export_option;
-use FS::export_svc;
-
-@ISA = qw(FS::Record);
-@EXPORT_OK = qw(export_info);
-
-=head1 NAME
-
-FS::part_export - Object methods for part_export records
-
-=head1 SYNOPSIS
-
-  use FS::part_export;
-
-  $record = new FS::part_export \%hash;
-  $record = new FS::part_export { 'column' => 'value' };
-
-  #($new_record, $options) = $template_recored->clone( $svcpart );
-
-  $error = $record->insert( { 'option' => 'value' } );
-  $error = $record->insert( \%options );
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::part_export object represents an export of Freeside data to an external
-provisioning system.  FS::part_export inherits from FS::Record.  The following
-fields are currently supported:
-
-=over 4
-
-=item exportnum - primary key
-
-=item machine - Machine name 
-
-=item exporttype - Export type
-
-=item nodomain - blank or "Y" : usernames are exported to this service with no domain
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new export.  To add the export to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'part_export'; }
-
-=cut
-
-#=item clone SVCPART
-#
-#An alternate constructor.  Creates a new export by duplicating an existing
-#export.  The given svcpart is assigned to the new export.
-#
-#Returns a list consisting of the new export object and a hashref of options.
-#
-#=cut
-#
-#sub clone {
-#  my $self = shift;
-#  my $class = ref($self);
-#  my %hash = $self->hash;
-#  $hash{'exportnum'} = '';
-#  $hash{'svcpart'} = shift;
-#  ( $class->new( \%hash ),
-#    { map { $_->optionname => $_->optionvalue }
-#        qsearch('part_export_option', { 'exportnum' => $self->exportnum } )
-#    }
-#  );
-#}
-
-=item insert HASHREF
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-If a hash reference of options is supplied, part_export_option records are
-created (see L<FS::part_export_option>).
-
-=cut
-
-#false laziness w/queue.pm
-sub insert {
-  my $self = shift;
-  my $options = shift;
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  foreach my $optionname ( keys %{$options} ) {
-    my $part_export_option = new FS::part_export_option ( {
-      'exportnum'   => $self->exportnum,
-      'optionname'  => $optionname,
-      'optionvalue' => $options->{$optionname},
-    } );
-    $error = $part_export_option->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-}
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-#foreign keys would make this much less tedious... grr dumb mysql
-sub delete {
-  my $self = shift;
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->SUPER::delete;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  foreach my $part_export_option ( $self->part_export_option ) {
-    my $error = $part_export_option->delete;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  foreach my $export_svc ( $self->export_svc ) {
-    my $error = $export_svc->delete;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-}
-
-=item replace OLD_RECORD HASHREF
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-If a hash reference of options is supplied, part_export_option records are
-created or modified (see L<FS::part_export_option>).
-
-=cut
-
-sub replace {
-  my $self = shift;
-  my $old = shift;
-  my $options = shift;
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->SUPER::replace($old);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  foreach my $optionname ( keys %{$options} ) {
-    my $old = qsearchs( 'part_export_option', {
-        'exportnum'   => $self->exportnum,
-        'optionname'  => $optionname,
-    } );
-    my $new = new FS::part_export_option ( {
-        'exportnum'   => $self->exportnum,
-        'optionname'  => $optionname,
-        'optionvalue' => $options->{$optionname},
-    } );
-    $new->optionnum($old->optionnum) if $old;
-    my $error = $old ? $new->replace($old) : $new->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  #remove extraneous old options
-  foreach my $opt (
-    grep { !exists $options->{$_->optionname} } $old->part_export_option
-  ) {
-    my $error = $opt->delete;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-};
-
-=item check
-
-Checks all fields to make sure this is a valid export.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-  my $error = 
-    $self->ut_numbern('exportnum')
-    || $self->ut_domain('machine')
-    || $self->ut_alpha('exporttype')
-  ;
-  return $error if $error;
-
-  warn $self->machine. "!!!\n";
-
-  $self->machine =~ /^([\w\-\.]*)$/
-    or return "Illegal machine: ". $self->machine;
-  $self->machine($1);
-
-  $self->nodomain =~ /^(Y?)$/ or return "Illegal nodomain: ". $self->nodomain;
-  $self->nodomain($1);
-
-  $self->deprecated(1); #BLAH
-
-  #check exporttype?
-
-  ''; #no error
-}
-
-#=item part_svc
-#
-#Returns the service definition (see L<FS::part_svc>) for this export.
-#
-#=cut
-#
-#sub part_svc {
-#  my $self = shift;
-#  qsearchs('part_svc', { svcpart => $self->svcpart } );
-#}
-
-sub part_svc {
-  use Carp;
-  croak "FS::part_export::part_svc deprecated";
-  #confess "FS::part_export::part_svc deprecated";
-}
-
-=item export_svc
-
-Returns a list of associated FS::export_svc records.
-
-=cut
-
-sub export_svc {
-  my $self = shift;
-  qsearch('export_svc', { 'exportnum' => $self->exportnum } );
-}
-
-=item part_export_option
-
-Returns all options as FS::part_export_option objects (see
-L<FS::part_export_option>).
-
-=cut
-
-sub part_export_option {
-  my $self = shift;
-  qsearch('part_export_option', { 'exportnum' => $self->exportnum } );
-}
-
-=item options 
-
-Returns a list of option names and values suitable for assigning to a hash.
-
-=cut
-
-sub options {
-  my $self = shift;
-  map { $_->optionname => $_->optionvalue } $self->part_export_option;
-}
-
-=item option OPTIONNAME
-
-Returns the option value for the given name, or the empty string.
-
-=cut
-
-sub option {
-  my $self = shift;
-  my $part_export_option =
-    qsearchs('part_export_option', {
-      exportnum  => $self->exportnum,
-      optionname => shift,
-  } );
-  $part_export_option ? $part_export_option->optionvalue : '';
-}
-
-=item rebless
-
-Reblesses the object into the FS::part_export::EXPORTTYPE class, where
-EXPORTTYPE is the object's I<exporttype> field.  There should be better docs
-on how to create new exports (and they should live in their own files and be
-autoloaded-on-demand), but until then, see L</NEW EXPORT CLASSES>.
-
-=cut
-
-sub rebless {
-  my $self = shift;
-  my $exporttype = $self->exporttype;
-  my $class = ref($self). "::$exporttype";
-  eval "use $class;";
-  die $@ if $@;
-  bless($self, $class);
-}
-
-=item export_insert SVC_OBJECT
-
-=cut
-
-sub export_insert {
-  my $self = shift;
-  $self->rebless;
-  $self->_export_insert(@_);
-}
-
-#sub AUTOLOAD {
-#  my $self = shift;
-#  $self->rebless;
-#  my $method = $AUTOLOAD;
-#  #$method =~ s/::(\w+)$/::_$1/; #infinite loop prevention
-#  $method =~ s/::(\w+)$/_$1/; #infinite loop prevention
-#  $self->$method(@_);
-#}
-
-=item export_replace NEW OLD
-
-=cut
-
-sub export_replace {
-  my $self = shift;
-  $self->rebless;
-  $self->_export_replace(@_);
-}
-
-=item export_delete
-
-=cut
-
-sub export_delete {
-  my $self = shift;
-  $self->rebless;
-  $self->_export_delete(@_);
-}
-
-=item export_suspend
-
-=cut
-
-sub export_suspend {
-  my $self = shift;
-  $self->rebless;
-  $self->_export_suspend(@_);
-}
-
-=item export_unsuspend
-
-=cut
-
-sub export_unsuspend {
-  my $self = shift;
-  $self->rebless;
-  $self->_export_unsuspend(@_);
-}
-
-#fallbacks providing useful error messages intead of infinite loops
-sub _export_insert {
-  my $self = shift;
-  return "_export_insert: unknown export type ". $self->exporttype;
-}
-
-sub _export_replace {
-  my $self = shift;
-  return "_export_replace: unknown export type ". $self->exporttype;
-}
-
-sub _export_delete {
-  my $self = shift;
-  return "_export_delete: unknown export type ". $self->exporttype;
-}
-
-#fallbacks providing null operations
-
-sub _export_suspend {
-  my $self = shift;
-  #warn "warning: _export_suspened unimplemented for". ref($self);
-  '';
-}
-
-sub _export_unsuspend {
-  my $self = shift;
-  #warn "warning: _export_unsuspend unimplemented for ". ref($self);
-  '';
-}
-
-=back
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item export_info [ SVCDB ]
-
-Returns a hash reference of the exports for the given I<svcdb>, or if no
-I<svcdb> is specified, for all exports.  The keys of the hash are
-I<exporttype>s and the values are again hash references containing information
-on the export:
-
-  'desc'     => 'Description',
-  'options'  => {
-                  'option'  => { label=>'Option Label' },
-                  'option2' => { label=>'Another label' },
-                },
-  'nodomain' => 'Y', #or ''
-  'notes'    => 'Additional notes',
-
-=cut
-
-sub export_info {
-  #warn $_[0];
-  return $exports{$_[0]} if @_;
-  #{ map { %{$exports{$_}} } keys %exports };
-  my $r = { map { %{$exports{$_}} } keys %exports };
-}
-
-#=item exporttype2svcdb EXPORTTYPE
-#
-#Returns the applicable I<svcdb> for an I<exporttype>.
-#
-#=cut
-#
-#sub exporttype2svcdb {
-#  my $exporttype = $_[0];
-#  foreach my $svcdb ( keys %exports ) {
-#    return $svcdb if grep { $exporttype eq $_ } keys %{$exports{$svcdb}};
-#  }
-#  '';
-#}
-
-tie my %sysvshell_options, 'Tie::IxHash',
-  'crypt' => { label=>'Password encryption',
-               type=>'select', options=>[qw(crypt md5)],
-               default=>'crypt',
-             },
-;
-
-tie my %bsdshell_options, 'Tie::IxHash', 
-  'crypt' => { label=>'Password encryption',
-               type=>'select', options=>[qw(crypt md5)],
-               default=>'crypt',
-             },
-;
-
-tie my %shellcommands_options, 'Tie::IxHash',
-  #'machine' => { label=>'Remote machine' },
-  'user' => { label=>'Remote username', default=>'root' },
-  'useradd' => { label=>'Insert command',
-                 default=>'useradd -d $dir -m -s $shell -u $uid -p $crypt_password $username'
-                #default=>'cp -pr /etc/skel $dir; chown -R $uid.$gid $dir'
-               },
-  'useradd_stdin' => { label=>'Insert command STDIN',
-                       type =>'textarea',
-                       default=>'',
-                     },
-  'userdel' => { label=>'Delete command',
-                 default=>'userdel -r $username',
-                 #default=>'rm -rf $dir',
-               },
-  'userdel_stdin' => { label=>'Delete command STDIN',
-                       type =>'textarea',
-                       default=>'',
-                     },
-  'usermod' => { label=>'Modify command',
-                 default=>'usermod -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username',
-                #default=>'[ -d $old_dir ] && mv $old_dir $new_dir || ( '.
-                 #  'chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; '.
-                 #  'find . -depth -print | cpio -pdm $new_dir; '.
-                 #  'chmod u-t $new_dir; chown -R $uid.$gid $new_dir; '.
-                 #  'rm -rf $old_dir'.
-                 #')'
-               },
-  'usermod_stdin' => { label=>'Modify command STDIN',
-                       type =>'textarea',
-                       default=>'',
-                     },
-;
-
-tie my %shellcommands_withdomain_options, 'Tie::IxHash',
-  'user' => { label=>'Remote username', default=>'root' },
-  'useradd' => { label=>'Insert command',
-                 #default=>''
-               },
-  'useradd_stdin' => { label=>'Insert command STDIN',
-                       type =>'textarea',
-                       #default=>"$_password\n$_password\n",
-                     },
-  'userdel' => { label=>'Delete command',
-                 #default=>'',
-               },
-  'userdel_stdin' => { label=>'Delete command STDIN',
-                       type =>'textarea',
-                       #default=>'',
-                     },
-  'usermod' => { label=>'Modify command',
-                 default=>'',
-               },
-  'usermod_stdin' => { label=>'Modify command STDIN',
-                       type =>'textarea',
-                       #default=>"$_password\n$_password\n",
-                     },
-;
-
-tie my %www_shellcommands_options, 'Tie::IxHash',
-  'user' => { lable=>'Remote username', default=>'root' },
-  'useradd' => { label=>'Insert command',
-                 default=>'mkdir /var/www/$zone; chown $username /var/www/$zone; ln -s /var/www/$zone $homedir/$zone',
-               },
-  'userdel'  => { label=>'Delete command',
-                  default=>'[ -n &quot;$zone&quot; ] && rm -rf /var/www/$zone; rm $homedir/$zone',
-                },
-  'usermod'  => { label=>'Modify command',
-                  default=>'[ -n &quot;$old_zone&quot; ] && rm $old_homedir/$old_zone; [ &quot;$old_zone&quot; != &quot;$new_zone&quot; -a -n &quot;$new_zone&quot; ] && mv /var/www/$old_zone /var/www/$new_zone; [ &quot;$old_username&quot; != &quot;$new_username&quot; ] && chown -R $new_username /var/www/$new_zone; ln -s /var/www/$new_zone $new_homedir/$new_zone',
-                },
-;
-
-tie my %textradius_options, 'Tie::IxHash',
-  'user' => { label=>'Remote username', default=>'root' },
-  'users' => { label=>'users file location', default=>'/etc/raddb/users' },
-;
-
-tie my %sqlradius_options, 'Tie::IxHash',
-  'datasrc'  => { label=>'DBI data source ' },
-  'username' => { label=>'Database username' },
-  'password' => { label=>'Database password' },
-;
-
-tie my %cyrus_options, 'Tie::IxHash',
-  'server' => { label=>'IMAP server' },
-  'username' => { label=>'Admin username' },
-  'password' => { label=>'Admin password' },
-;
-
-tie my %cp_options, 'Tie::IxHash',
-  'host'      => { label=>'Hostname' },
-  'port'      => { label=>'Port number' },
-  'username'  => { label=>'Username' },
-  'password'  => { label=>'Password' },
-  'domain'    => { label=>'Domain' },
-  'workgroup' => { label=>'Default Workgroup' },
-;
-
-tie my %infostreet_options, 'Tie::IxHash',
-  'url'      => { label=>'XML-RPC Access URL', },
-  'login'    => { label=>'InfoStreet login', },
-  'password' => { label=>'InfoStreet password', },
-  'groupID'  => { label=>'InfoStreet groupID', },
-;
-
-tie my %vpopmail_options, 'Tie::IxHash',
-  'machine' => { label=>'vpopmail machine', },
-  'dir'     => { label=>'directory', }, # ?more info? default?
-  'uid'     => { label=>'vpopmail uid' },
-  'gid'     => { label=>'vpopmail gid' },
-;
-
-tie my %bind_options, 'Tie::IxHash',
-  #'machine'    => { label=>'named machine' },
-  'named_conf' => { label  => 'named.conf location',
-                    default=> '/etc/bind/named.conf' },
-  'zonepath'   => { label => 'path to zone files',
-                    default=> '/etc/bind/', },
-;
-
-tie my %bind_slave_options, 'Tie::IxHash',
-  #'machine'    => { label=> 'Slave machine' },
-  'master'      => { label=> 'Master IP address(s) (semicolon-separated)' },
-  'named_conf'  => { label   => 'named.conf location',
-                     default => '/etc/bind/named.conf' },
-;
-
-tie my %http_options, 'Tie::IxHash',
-  'method' => { label   =>'Method',
-                type    =>'select',
-                #options =>[qw(POST GET)],
-                options =>[qw(POST)],
-                default =>'POST' },
-  'url'    => { label   => 'URL', default => 'http://', },
-  'insert_data' => {
-    label   => 'Insert data',
-    type    => 'textarea',
-    default => join("\n",
-      'DomainName $svc_x->domain',
-      'Email ( grep { $_ ne "POST" } $svc_x->cust_svc->cust_pkg->cust_main->invoicing_list)[0]',
-      'test 1',
-      'reseller $svc_x->cust_svc->cust_pkg->part_pkg->pkg =~ /reseller/i',
-    ),
-  },
-  'delete_data' => {
-    label   => 'Delete data',
-    type    => 'textarea',
-    default => join("\n",
-    ),
-  },
-  'replace_data' => {
-    label   => 'Replace data',
-    type    => 'textarea',
-    default => join("\n",
-    ),
-  },
-;
-
-tie my %sqlmail_options, 'Tie::IxHash',
-  'datasrc'  => { label=>'DBI data source' },
-  'username' => { label=>'Database username' },
-  'password' => { label=>'Database password' },
-;
-
-
-#export names cannot have dashes...
-%exports = (
-  'svc_acct' => {
-    'sysvshell' => {
-      'desc' =>
-        'Batch export of /etc/passwd and /etc/shadow files (Linux/SysV).',
-      'options' => \%sysvshell_options,
-      'nodomain' => 'Y',
-      'notes' => 'MD5 crypt requires installation of <a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a> from CPAN.    Run bin/sysvshell.export to export the files.',
-    },
-    'bsdshell' => {
-      'desc' =>
-        'Batch export of /etc/passwd and /etc/master.passwd files (BSD).',
-      'options' => \%bsdshell_options,
-      'nodomain' => 'Y',
-      'notes' => 'MD5 crypt requires installation of <a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a> from CPAN.  Run bin/bsdshell.export to export the files.',
-    },
-#    'nis' => {
-#      'desc' =>
-#        'Batch export of /etc/global/passwd and /etc/global/shadow for NIS ',
-#      'options' => {},
-#    },
-    'textradius' => {
-      'desc' => 'Real-time export to a text /etc/raddb/users file (Livingston, Cistron)',
-      'options' => \%textradius_options,
-      'notes' => 'This will edit a text RADIUS users file in place on a remote server.  Requires installation of <a href="http://search.cpan.org/search?dist=RADIUS-UserFile">RADIUS::UserFile</a> from CPAN.  If using RADIUS::UserFile 1.01, make sure to apply <a href="http://rt.cpan.org/NoAuth/Bug.html?id=1210">this patch</a>.  Also make sure <a href="http://rsync.samba.org/">rsync</a> is installed on the remote machine, and <a href="../docs/ssh.html">SSH is setup for unattended operation</a>.',
-    },
-
-    'shellcommands' => {
-      'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
-      'options' => \%shellcommands_options,
-      'nodomain' => 'Y',
-      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = "";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -c $finger -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "pw userdel $username -r"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0"; this.form.usermod_stdin.value = "$new__password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>',
-    },
-
-    'shellcommands_withdomain' => {
-      'desc' => 'Real-time export via remote SSH.',
-      'options' => \%shellcommands_withdomain_options,
-      'notes' => 'Run remote commands via SSH.  username@domain (rather than just usernames) are considered unique (also see shellcommands).  You probably want this if the commands you are running will accept a domain as a parameter, and will allow the same username with different domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.',
-    },
-
-    'sqlradius' => {
-      'desc' => 'Real-time export to SQL-backed RADIUS (ICRADIUS, FreeRADIUS)',
-      'options' => \%sqlradius_options,
-      'nodomain' => 'Y',
-      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.23/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.  If using <a href="http://www.freeradius.org/">FreeRADIUS</a> 0.5 or above, make sure your <b>op</b> fields are set to allow NULL values.',
-    },
-
-    'sqlmail' => {
-      'desc' => 'Real-time export to SQL-backed mail server',
-      'options' => \%sqlmail_options,
-      'nodomain' => 'Y',
-      'notes' => 'Database schema can be made to work with Courier IMAP and Exim.  Others could work but are untested. (...extended description from pc-intouch?...)',
-    },
-
-    'cyrus' => {
-      'desc' => 'Real-time export to Cyrus IMAP server',
-      'options' => \%cyrus_options,
-      'nodomain' => 'Y',
-      'notes' => 'Integration with <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a>.  Cyrus::IMAP::Admin should be installed locally and the connection to the server secured.  <B>svc_acct.quota</B>, if available, is used to set the Cyrus quota. '
-    },
-
-    'cp' => {
-      'desc' => 'Real-time export to Critical Path Account Provisioning Protocol',
-      'options' => \%cp_options,
-      'notes' => 'Real-time export to <a href="http://www.cp.net/">Critial Path Account Provisioning Protocol</a>.  Requires installation of <a href="http://search.cpan.org/search?dist=Net-APP">Net::APP</a> from CPAN.',
-    },
-    
-    'infostreet' => {
-      'desc' => 'Real-time export to InfoStreet streetSmartAPI',
-      'options' => \%infostreet_options,
-      'nodomain' => 'Y',
-      'notes' => 'Real-time export to <a href="http://www.infostreet.com/">InfoStreet</a> streetSmartAPI.  Requires installation of <a href="http://search.cpan.org/search?dist=Frontier-Client">Frontier::Client</a> from CPAN.',
-    },
-
-    'vpopmail' => {
-      'desc' => 'Real-time export to vpopmail text files',
-      'options' => \%vpopmail_options,
-      'notes' => 'Real time export to <a href="http://inter7.com/vpopmail/">vpopmail</a> text files (...extended description from jeff?...)',
-    },
-
-  },
-
-  'svc_domain' => {
-
-    'bind' => {
-      'desc' =>'Batch export to BIND named',
-      'options' => \%bind_options,
-      'notes' => 'Batch export of BIND zone and configuration files to primary nameserver.  <a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a> must be installed.  Run bin/bind.export to export the files.',
-    },
-
-    'bind_slave' => {
-      'desc' =>'Batch export to slave BIND named',
-      'options' => \%bind_slave_options,
-      'notes' => 'Batch export of BIND configuration file to a secondary nameserver.  Zones are slaved from the listed masters.  <a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a> must be installed.  Run bin/bind.export to export the files.',
-    },
-
-    'http' => {
-      'desc' => 'Send an HTTP or HTTPS GET or POST request',
-      'options' => \%http_options,
-      'notes' => 'Send an HTTP or HTTPS GET or POST to the specified URL.  <a href="http://search.cpan.org/search?dist=libwww-perl">libwww-perl</a> must be installed.  For HTTPS support, <a href="http://search.cpan.org/search?dist=Crypt-SSLeay">Crypt::SSLeay</a> or <a href="http://search.cpan.org/search?dist=IO-Socket-SSL">IO::Socket::SSL</a> is required.',
-    },
-
-    'sqlmail' => {
-      'desc' => 'Real-time export to SQL-backed mail server',
-      'options' => \%sqlmail_options,
-      #'nodomain' => 'Y',
-      'notes' => 'Database schema can be made to work with Courier IMAP and Exim.  Others could work but are untested. (...extended description from pc-intouch?...)',
-    },
-
-
-  },
-
-  'svc_acct_sm' => {},
-
-  'svc_forward' => {
-    'sqlmail' => {
-      'desc' => 'Real-time export to SQL-backed mail server',
-      'options' => \%sqlmail_options,
-      #'nodomain' => 'Y',
-      'notes' => 'Database schema can be made to work with Courier IMAP and Exim.  Others could work but are untested. (...extended description from pc-intouch?...)',
-    },
-  },
-
-  'svc_www' => {
-    'www_shellcommands' => {
-      'desc' => 'Run remote commands via SSH, for virtual web sites.',
-      'options' => \%www_shellcommands_options,
-      'notes'    => 'Run remote commands via SSH, for virtual web sites.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.',
-    },
-
-  },
-
-);
-
-=back
-
-=head1 NEW EXPORT CLASSES
-
-Should be added to the %export hash here, and a module should be added in
-FS/FS/part_export/ (an example may be found in eg/export_template.pm)
-
-=head1 BUGS
-
-All the stuff in the %exports hash should be generated from the specific
-export modules.
-
-Hmm... cust_export class (not necessarily a database table...) ... ?
-
-deprecated column...
-
-=head1 SEE ALSO
-
-L<FS::part_export_option>, L<FS::export_svc>, L<FS::svc_acct>,
-L<FS::svc_domain>,
-L<FS::svc_forward>, L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/part_export/bind.pm b/FS/FS/part_export/bind.pm
deleted file mode 100644
index b72c9bdb0..000000000
--- a/FS/FS/part_export/bind.pm
+++ /dev/null
@@ -1,7 +0,0 @@
-package FS::part_export::bind;
-
-use vars qw(@ISA);
-use FS::part_export::null;
-
-@ISA = qw(FS::part_export::null);
-
diff --git a/FS/FS/part_export/bind_slave.pm b/FS/FS/part_export/bind_slave.pm
deleted file mode 100644
index ebb29c1d7..000000000
--- a/FS/FS/part_export/bind_slave.pm
+++ /dev/null
@@ -1,7 +0,0 @@
-package FS::part_export::bind_slave;
-
-use vars qw(@ISA);
-use FS::part_export::null;
-
-@ISA = qw(FS::part_export::null);
-
diff --git a/FS/FS/part_export/bsdshell.pm b/FS/FS/part_export/bsdshell.pm
deleted file mode 100644
index 06642097f..000000000
--- a/FS/FS/part_export/bsdshell.pm
+++ /dev/null
@@ -1,7 +0,0 @@
-package FS::part_export::bsdshell;
-
-use vars qw(@ISA);
-use FS::part_export::null;
-
-@ISA = qw(FS::part_export::null);
-
diff --git a/FS/FS/part_export/cp.pm b/FS/FS/part_export/cp.pm
deleted file mode 100644
index d998c1d95..000000000
--- a/FS/FS/part_export/cp.pm
+++ /dev/null
@@ -1,112 +0,0 @@
-package FS::part_export::cp;
-
-use vars qw(@ISA);
-use FS::part_export;
-
-@ISA = qw(FS::part_export);
-
-sub rebless { shift; }
-
-sub _export_insert {
-  my( $self, $svc_acct ) = (shift, shift);
-  $self->cp_queue( $svc_acct->svcnum, 'create_mailbox',
-    Mailbox   => $svc_acct->username,
-    Password  => $svc_acct->_password,
-    Workgroup => $self->option('workgroup'),
-    Domain    => $svc_acct->domain,
-  );
-}
-
-sub _export_replace {
-  my( $self, $new, $old ) = (shift, shift, shift);
-  return "can't change domain with Critical Path"
-    if $old->domain ne $new->domain;
-  return '' unless $old->username  ne $new->username
-                || $old->_password ne $new->_password;
-  $self->cp_queue( $new->svcnum, 'replace', $new->domain,
-    $old->username, $new->username, $old->_password, $new->_password );
-}
-
-sub _export_delete {
-  my( $self, $svc_acct ) = (shift, shift);
-  $self->cp_queue( $svc_acct->svcnum, 'delete_mailbox',
-    Mailbox   => $svc_acct->username,
-    Domain    => $svc_acct->domain,
-  );
-}
-
-sub cp_queue {
-  my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => 'FS::part_export::cp::cp_command',
-  };
-  $queue->insert(
-    $self->option('host'),
-    $self->option('port'),
-    $self->option('username'),
-    $self->option('password'),
-    $self->option('domain'),
-    $method,
-    @_,
-  );
-}
-
-sub cp_command { #subroutine, not method
-  my($host, $port, $username, $password, $login_domain, $method, @args) = @_;
-
-  #quelle hack
-  if ( $method eq 'replace' ) {
-  
-    my( $domain, $old_username, $new_username, $old_password, $new_password)
-      = @args;
-
-    if ( $old_username ne $new_username ) {
-      cp_command($host, $port, $username, $password, 'rename_mailbox',
-        Domain        => $domain,
-        Old_Mailbox   => $old_username,
-        New_Mailbox   => $new_username,
-      );
-    }
-
-    my $other = 'F';
-    if ( $new_password =~ /^\*SUSPENDED\* (.*)$/ ) {
-      $new_password = $1;
-      $other = 'T';
-    }
-    cp_command($host, $port, $username, $password, 'set_mailbox_status',
-      Domain       => $domain,
-      Mailbox      => $new_username,
-      Other        => $other,
-      Other_Bounce => $other,
-    );
-
-    if ( $old_password ne $new_password ) {
-      cp_command($host, $port, $username, $password, 'change_mailbox',
-        Domain    => $domain,
-        Mailbox   => $new_username,
-        Password  => $new_password,
-      );
-    }
-
-    return;
-  }
-  #eof quelle hack
-
-  eval "use Net::APP;";
-
-  my $app = new Net::APP (
-    "$host:$port",
-    User     => $username,
-    Password => $password,
-    Domain   => $login_domain,
-    Timeout  => 60,
-    #Debug    => 1,
-  ) or die "$@\n";
-
-  $app->$method( @args );
-
-  die $app->message."\n" unless $app->ok;
-
-}
-
diff --git a/FS/FS/part_export/cyrus.pm b/FS/FS/part_export/cyrus.pm
deleted file mode 100644
index 110ff198f..000000000
--- a/FS/FS/part_export/cyrus.pm
+++ /dev/null
@@ -1,98 +0,0 @@
-package FS::part_export::cyrus;
-
-use vars qw(@ISA);
-use FS::part_export;
-
-@ISA = qw(FS::part_export);
-
-sub rebless { shift; }
-
-sub _export_insert {
-  my($self, $svc_acct) = (shift, shift);
-  $self->cyrus_queue( $svc_acct->svcnum, 'insert',
-    $svc_acct->username, $svc_acct->quota );
-}
-
-sub _export_replace {
-  my( $self, $new, $old ) = (shift, shift, shift);
-  return "can't change username using Cyrus"
-    if $old->username ne $new->username;
-  return '';
-#  #return '' unless $old->_password ne $new->_password;
-#  $self->cyrus_queue( $new->svcnum,
-#    'replace', $new->username, $new->_password );
-}
-
-sub _export_delete {
-  my( $self, $svc_acct ) = (shift, shift);
-  $self->cyrus_queue( $svc_acct->svcnum, 'delete',
-    $svc_acct->username );
-}
-
-#a good idea to queue anything that could fail or take any time
-sub cyrus_queue {
-  my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => "FS::part_export::cyrus::cyrus_$method",
-  };
-  $queue->insert(
-    $self->option('server'),
-    $self->option('username'),
-    $self->option('password'),
-    @_
-  );
-}
-
-sub cyrus_insert { #subroutine, not method
-  my $client = cyrus_connect(shift, shift, shift);
-  my( $username, $quota ) = @_;
-  my $rc = $client->create("user.$username");
-  my $error = $client->error;
-  die "creating user.$username: $error" if $error;
-
-  $rc = $client->setacl("user.$username", $username => 'all' );
-  $error = $client->error;
-  die "setacl user.$username: $error" if $error;
-
-  if ( $quota ) {
-    $rc = $client->setquota("user.$username", 'STORAGE' => $quota );
-    $error = $client->error;
-    die "setquota user.$username: $error" if $error;
-  }
-
-}
-
-sub cyrus_delete { #subroutine, not method
-  my ( $server, $admin_username, $password_username, $username ) = @_;
-  my $client = cyrus_connect($server, $admin_username, $password_username);
-
-  my $rc = $client->setacl("user.$username", $admin_username => 'all' );
-  my $error = $client->error;
-  die $error if $error;
-
-  $rc = $client->delete("user.$username");
-  $error = $client->error;
-  die $error if $error;
-}
-
-sub cyrus_connect {
-
-  my( $server, $admin_username, $admin_password ) = @_;
-
-  eval "use Cyrus::IMAP::Admin;";
-
-  my $client = Cyrus::IMAP::Admin->new($server);
-  $client->authenticate(
-    -user      => $admin_username,
-    -mechanism => "login",       
-    -password  => $admin_password,
-  );
-  $client;
-
-}
-
-#sub cyrus_replace { #subroutine, not method
-#}
-
-
diff --git a/FS/FS/part_export/http.pm b/FS/FS/part_export/http.pm
deleted file mode 100644
index 0e02f0f8e..000000000
--- a/FS/FS/part_export/http.pm
+++ /dev/null
@@ -1,88 +0,0 @@
-package FS::part_export::http;
-
-use vars qw(@ISA);
-use FS::part_export;
-
-@ISA = qw(FS::part_export);
-
-sub rebless { shift; }
-
-sub _export_insert {
-  my $self = shift;
-  $self->_export_command('insert', @_);
-}
-
-sub _export_delete {
-  my $self = shift;
-  $self->_export_command('delete', @_);
-}
-
-sub _export_command {
-  my( $self, $action, $svc_x ) = ( shift, shift, shift );
-
-  return unless $self->option("${action}_data");
-
-  $self->http_queue( $svc_x->svcnum,
-    $self->option('method'),
-    $self->option('url'),
-    map {
-      /^\s*(\S+)\s+(.*)$/ or /()()/;
-      my( $field, $value_expression ) = ( $1, $2 );
-      my $value = eval $value_expression;
-      die $@ if $@;
-      ( $field, $value );
-    } split(/\n/, $self->option("${action}_data") )
-  );
-
-}
-
-sub _export_replace {
-  my( $self, $new, $old ) = ( shift, shift, shift );
-
-  return unless $self->option('replace_data');
-
-  $self->http_queue( $svc_x->svcnum,
-    $self->option('method'),
-    $self->option('url'),
-    map {
-      /^\s*(\S+)\s+(.*)$/ or /()()/;
-      my( $field, $value_expression ) = ( $1, $2 );
-      die $@ if $@;
-      ( $field, $value );
-    } split(/\n/, $self->option('replace_data') )
-  );
-
-}
-
-sub http_queue {
-  my($self, $svcnum) = (shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => "FS::part_export::http::http",
-  };
-  $queue->insert( @_ );
-}
-
-sub http {
-  my($method, $url, @data) = @_;
-
-  $method = lc($method);
-
-  eval "use LWP::UserAgent;";
-  die "using LWP::UserAgent: $@" if $@;
-  eval "use HTTP::Request::Common;";
-  die "using HTTP::Request::Common: $@" if $@;
-
-  my $ua = LWP::UserAgent->new;
-
-  #my $response = $ua->$method(
-  #  $url, \%data,
-  #  'Content-Type'=>'application/x-www-form-urlencoded'
-  #);
-  my $req = HTTP::Request::Common::POST( $url, \@data );
-  my $response = $ua->request($req);
-
-  die $response->error_as_HTML if $response->is_error;
-
-}
-
diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
deleted file mode 100644
index f2d519932..000000000
--- a/FS/FS/part_export/infostreet.pm
+++ /dev/null
@@ -1,218 +0,0 @@
-package FS::part_export::infostreet;
-
-use vars qw(@ISA %infostreet2cust_main $DEBUG);
-use FS::UID qw(dbh);
-use FS::part_export;
-
-@ISA = qw(FS::part_export);
-
-$DEBUG = 0;
-
-%infostreet2cust_main = (
-  'firstName'   => 'first',
-  'lastName'    => 'last',
-  'address1'    => 'address1',
-  'address2'    => 'address2',
-  'city'        => 'city',
-  'state'       => 'state',
-  'zipCode'     => 'zip',
-  'country'     => 'country',
-  'phoneNumber' => 'daytime',
-  'faxNumber'   => 'night', #noment-request...
-);
-
-sub rebless { shift; }
-
-sub _export_insert {
-  my( $self, $svc_acct ) = (shift, shift);
-  my $cust_main = $svc_acct->cust_svc->cust_pkg->cust_main;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $err_or_queue = $self->infostreet_err_or_queue( $svc_acct->svcnum,
-    'createUser', $svc_acct->username, $svc_acct->_password );
-  return $err_or_queue unless ref($err_or_queue);
-  my $jobnum = $err_or_queue->jobnum;
-
-  my %contact_info = ( map {
-    $_ => $cust_main->getfield( $infostreet2cust_main{$_} );
-  } keys %infostreet2cust_main );
-
-  my @emails = grep { $_ ne 'POST' } $cust_main->invoicing_list;
-  $contact_info{'email'} = $emails[0] if @emails;
-
-  #this one is kinda noment-specific
-  $contact_info{'organization'} = $cust_main->agent->agent;
-
-  $err_or_queue = $self->infostreet_queueContact( $svc_acct->svcnum,
-    $svc_acct->username, %contact_info );
-  return $err_or_queue unless ref($err_or_queue);
-  my $error = $err_or_queue->depend_insert( $jobnum );
-  return $error if $error;
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-}
-
-sub _export_replace {
-  my( $self, $new, $old ) = (shift, shift, shift);
-  return "can't change username with InfoStreet"
-    if $old->username ne $new->username;
-  return '' unless $old->_password ne $new->_password;
-  $self->infostreet_queue( $new->svcnum,
-    'passwd', $new->username, $new->_password );
-}
-
-sub _export_delete {
-  my( $self, $svc_acct ) = (shift, shift);
-  $self->infostreet_queue( $svc_acct->svcnum,
-    'purgeAccount,releaseUsername', $svc_acct->username );
-}
-
-sub _export_suspend {
-  my( $self, $svc_acct ) = (shift, shift);
-  $self->infostreet_queue( $svc_acct->svcnum,
-    'setStatus', $svc_acct->username, 'DISABLED' );
-}
-
-sub _export_unsuspend {
-  my( $self, $svc_acct ) = (shift, shift);
-  $self->infostreet_queue( $svc_acct->svcnum,
-    'setStatus', $svc_acct->username, 'ACTIVE' );
-}
-
-sub infostreet_queue {
-  my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => 'FS::part_export::infostreet::infostreet_command',
-  };
-  $queue->insert(
-    $self->option('url'),
-    $self->option('login'),
-    $self->option('password'),
-    $self->option('groupID'),
-    $method,
-    @_,
-  );
-}
-
-#ick false laziness
-sub infostreet_err_or_queue {
-  my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => 'FS::part_export::infostreet::infostreet_command',
-  };
-  $queue->insert(
-    $self->option('url'),
-    $self->option('login'),
-    $self->option('password'),
-    $self->option('groupID'),
-    $method,
-    @_,
-  ) or $queue;
-}
-
-sub infostreet_queueContact {
-  my( $self, $svcnum ) = (shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => 'FS::part_export::infostreet::infostreet_setContact',
-  };
-  $queue->insert(
-    $self->option('url'),
-    $self->option('login'),
-    $self->option('password'),
-    $self->option('groupID'),
-    @_,
-  ) or $queue;
-}
-
-sub infostreet_setContact {
-  my($url, $is_username, $is_password, $groupID, $username, %contact_info) = @_;
-  my $accountID = infostreet_command($url, $is_username, $is_password, $groupID,
-    'getAccountID', $username);
-  foreach my $field ( keys %contact_info ) {
-    infostreet_command($url, $is_username, $is_password, $groupID,
-      'setContactField', [ 'int'=>$accountID ], $field, $contact_info{$field} );
-  }
-
-}
-
-sub infostreet_command { #subroutine, not method
-  my($url, $username, $password, $groupID, $method, @args) = @_;
-
-  warn "[FS::part_export::infostreet] $method ".join(' ', @args)."\n" if $DEBUG;
-
-  #quelle hack
-  if ( $method =~ /,/ ) {
-    foreach my $part ( split(/,\s*/, $method) ) {
-      infostreet_command($url, $username, $password, $groupID, $part, @args);
-    }
-    return;
-  }
-
-  eval "use Frontier::Client;";
-  die $@ if $@;
-
-  eval 'sub Frontier::RPC2::String::repr {
-    my $self = shift;
-    my $value = $$self;
-    $value =~ s/([&<>\"])/$Frontier::RPC2::char_entities{$1}/ge;
-    $value;
-  }';
-  die $@ if $@;
-
-  my $conn = Frontier::Client->new( url => $url );
-  my $key_result = $conn->call( 'authenticate', $username, $password, $groupID);
-  my %key_result = _infostreet_parse($key_result);
-  die $key_result{error} unless $key_result{success};
-  my $key = $key_result{data};
-
-  #my $result = $conn->call($method, $key, @args);
-  my $result = $conn->call( $method, $key,
-                            map {
-                                  if ( ref($_) ) {
-                                    my( $type, $value) = @{$_};
-                                    $conn->$type($value);
-                                  } else {
-                                    $conn->string($_);
-                                  }
-                                } @args );
-  my %result = _infostreet_parse($result);
-  die $result{error} unless $result{success};
-
-  $result->{data};
-
-}
-
-#sub infostreet_command_byid { #subroutine, not method;
-#  my($url, $username, $password, $groupID, $method, @args ) = @_;
-#
-#  infostreet_command
-#
-#}
-
-sub _infostreet_parse { #subroutine, not method
-  my $arg = shift;
-  map {
-    my $value = $arg->{$_};
-    #warn ref($value);
-    $value = $value->value()
-      if ref($value) && $value->isa('Frontier::RPC2::DataType');
-    $_=>$value;
-  } keys %$arg;
-}
-
-
diff --git a/FS/FS/part_export/null.pm b/FS/FS/part_export/null.pm
deleted file mode 100644
index 0145af3a4..000000000
--- a/FS/FS/part_export/null.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-package FS::part_export::null;
-
-use vars qw(@ISA);
-use FS::part_export;
-
-@ISA = qw(FS::part_export);
-
-sub rebless { shift; }
-
-sub _export_insert {}
-sub _export_replace {}
-sub _export_delete {}
-
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
deleted file mode 100644
index e4005761b..000000000
--- a/FS/FS/part_export/shellcommands.pm
+++ /dev/null
@@ -1,85 +0,0 @@
-package FS::part_export::shellcommands;
-
-use vars qw(@ISA @saltset);
-use String::ShellQuote;
-use FS::part_export;
-
-@ISA = qw(FS::part_export);
-
-@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
-
-sub rebless { shift; }
-
-sub _export_insert {
-  my($self) = shift;
-  $self->_export_command('useradd', @_);
-}
-
-sub _export_delete {
-  my($self) = shift;
-  $self->_export_command('userdel', @_);
-}
-
-sub _export_command {
-  my ( $self, $action, $svc_acct) = (shift, shift, shift);
-  my $command = $self->option($action);
-  my $stdin = $self->option($action."_stdin");
-  {
-    no strict 'refs';
-    ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
-  }
-  $finger = shell_quote $finger;
-  $crypt_password = ''; #surpress "used only once" warnings
-  $crypt_password = crypt( $svc_acct->_password,
-                             $saltset[int(rand(64))].$saltset[int(rand(64))] );
-  $self->shellcommands_queue( $svc_acct->svcnum,
-    user         => $self->option('user')||'root',
-    host         => $self->machine,
-    command      => eval(qq("$command")),
-    stdin_string => eval(qq("$stdin")),
-  );
-}
-
-sub _export_replace {
-  my($self, $new, $old ) = (shift, shift, shift);
-  my $command = $self->option('usermod');
-  my $stdin = $self->option('usermod_stdin');
-  {
-    no strict 'refs';
-    ${"old_$_"} = $old->getfield($_) foreach $old->fields;
-    ${"new_$_"} = $new->getfield($_) foreach $new->fields;
-  }
-  $new_finger = shell_quote $new_finger;
-  $new_crypt_password = ''; #surpress "used only once" warnings
-  $new_crypt_password = crypt( $new->_password,
-                               $saltset[int(rand(64))].$saltset[int(rand(64))]);
-  $self->shellcommands_queue( $new->svcnum,
-    user         => $self->option('user')||'root',
-    host         => $self->machine,
-    command      => eval(qq("$command")),
-    stdin_string => eval(qq("$stdin")),
-  );
-}
-
-#a good idea to queue anything that could fail or take any time
-sub shellcommands_queue {
-  my( $self, $svcnum ) = (shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => "FS::part_export::shellcommands::ssh_cmd",
-  };
-  $queue->insert( @_ );
-}
-
-sub ssh_cmd { #subroutine, not method
-  use Net::SSH '0.06';
-  &Net::SSH::ssh_cmd( { @_ } );
-}
-
-#sub shellcommands_insert { #subroutine, not method
-#}
-#sub shellcommands_replace { #subroutine, not method
-#}
-#sub shellcommands_delete { #subroutine, not method
-#}
-
diff --git a/FS/FS/part_export/shellcommands_withdomain.pm b/FS/FS/part_export/shellcommands_withdomain.pm
deleted file mode 100644
index a15c24d88..000000000
--- a/FS/FS/part_export/shellcommands_withdomain.pm
+++ /dev/null
@@ -1,7 +0,0 @@
-package FS::part_export::shellcommands_withdomain;
-
-use vars qw(@ISA);
-use FS::part_export::shellcommands;
-
-@ISA = qw(FS::part_export::shellcommands);
-
diff --git a/FS/FS/part_export/sqlmail.pm b/FS/FS/part_export/sqlmail.pm
deleted file mode 100644
index 4194daf0c..000000000
--- a/FS/FS/part_export/sqlmail.pm
+++ /dev/null
@@ -1,111 +0,0 @@
-package FS::part_export::sqlmail;
-
-use vars qw(@ISA %fs_mail_table %fields);
-use FS::part_export;
-
-@ISA = qw(FS::part_export);
-
-%fs_mail_table = ( svc_acct => 'user',
-                   svc_domain => 'domain' );
-
-# fields that need to be copied into the fs_mail tables
-$fields{user} = [qw(username _password finger domsvc svcnum )];
-$fields{domain} = [qw(domain svcnum catchall )];
-
-sub rebless { shift; }
-
-sub _export_insert {
-  my($self, $svc) = (shift, shift);
-  # this is a svc_something.
-
-  my $table = $fs_mail_table{$svc->cust_svc->part_svc->svcdb};
-  my @attrib = map {$svc->$_} @{$fields{$table}};
-  my $error = $self->sqlmail_queue( $svc->svcnum, 'insert',
-      $table, @attrib );
-  return $error if $error;
-  '';
-}
-
-sub _export_replace {
-  my( $self, $new, $old ) = (shift, shift, shift);
-
-  my $table = $fs_mail_table{$new->cust_svc->part_svc->svcdb};
-
-  my @old = ($old->svcnum, 'delete', $table, $old->svcnum);
-  my @narf = map {$new->$_} @{$fields{$table}};
-  $self->sqlmail_queue($new->svcnum, 'replace', $table, 
-      $new->svcnum, @narf);
-
-  return $error if $error;
-  '';
-}
-
-sub _export_delete {
-  my( $self, $svc ) = (shift, shift);
-  my $table = $fs_mail_table{$new->cust_svc->part_svc->svcdb};
-  $self->sqlmail_queue( $svc->svcnum, 'delete', $table,
-    $svc->svcnum );
-}
-
-sub sqlmail_queue {
-  my( $self, $svcnum, $method, $table ) = (shift, shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => "FS::part_export::sqlmail::sqlmail_$method",
-  };
-  $queue->insert(
-    $self->option('datasrc'),
-    $self->option('username'),
-    $self->option('password'),
-    @_,
-  );
-}
-
-sub sqlmail_insert { #subroutine, not method
-  my $dbh = sqlmail_connect(shift, shift, shift);
-  my( $table, @attrib ) = @_;
-
-  my $sth = $dbh->prepare(
-    "INSERT INTO $table (" . join (',', @{$fields{$table}}) .
-    ") VALUES ('" . join ("','", @attrib) . "')"
-  ) or die $dbh->errstr;
-  $sth->execute() or die $sth->errstr;
-
-  $dbh->disconnect;
-}
-
-sub sqlmail_delete { #subroutine, not method
-  my $dbh = sqlmail_connect(shift, shift, shift);
-  my( $table, $svcnum ) = @_;
-
-  my $sth = $dbh->prepare(
-    "DELETE FROM $table WHERE svcnum = $svcnum"
-  ) or die $dbh->errstr;
-  $sth->execute() or die $sth->errstr;
-
-  $dbh->disconnect;
-}
-
-sub sqlmail_replace {
-  my $dbh = sqlmail_connect(shift, shift, shift);
-  my( $table, $svcnum, @attrib ) = @_;
-
-  my %data;
-  @data{@{$fields{$table}}} = @attrib;
-
-  my $sth = $dbh->prepare(
-    "UPDATE $table SET " .
-    ( join ',',  map {$_ . "='" . $data{$_} . "'"} keys(%data) ) .
-    " WHERE svcnum = $svcnum"
-    ) or die $dbh->errstr;
-  $sth->execute() or die $sth->errstr;
-
-  $dbh->disconnect;
-}
-
-sub sqlmail_connect {
-  #my($datasrc, $username, $password) = @_;
-  #DBI->connect($datasrc, $username, $password) or die $DBI::errstr;
-  DBI->connect(@_) or die $DBI::errstr;
-}
-
diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
deleted file mode 100644
index 3c781c043..000000000
--- a/FS/FS/part_export/sqlradius.pm
+++ /dev/null
@@ -1,273 +0,0 @@
-package FS::part_export::sqlradius;
-
-use vars qw(@ISA);
-use FS::Record qw( dbh );
-use FS::part_export;
-
-@ISA = qw(FS::part_export);
-
-sub rebless { shift; }
-
-sub _export_insert {
-  my($self, $svc_acct) = (shift, shift);
-
-  foreach my $table (qw(reply check)) {
-    my $method = "radius_$table";
-    my %attrib = $svc_acct->$method();
-    next unless keys %attrib;
-    my $err_or_queue = $self->sqlradius_queue( $svc_acct->svcnum, 'insert',
-      $table, $svc_acct->username, %attrib );
-    return $err_or_queue unless ref($err_or_queue);
-  }
-  my @groups = $svc_acct->radius_groups;
-  if ( @groups ) {
-    my $err_or_queue = $self->sqlradius_queue(
-      $svc_acct->svcnum, 'usergroup_insert',
-      $svc_acct->username, @groups );
-    return $err_or_queue unless ref($err_or_queue);
-  }
-  '';
-}
-
-sub _export_replace {
-  my( $self, $new, $old ) = (shift, shift, shift);
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $jobnum = '';
-  if ( $old->username ne $new->username ) {
-    my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'rename',
-      $new->username, $old->username );
-    unless ( ref($err_or_queue) ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $err_or_queue;
-    }
-    $jobnum = $err_or_queue->jobnum;
-  }
-
-  foreach my $table (qw(reply check)) {
-    my $method = "radius_$table";
-    my %new = $new->$method();
-    my %old = $old->$method();
-    if ( grep { !exists $old{$_} #new attributes
-                || $new{$_} ne $old{$_} #changed
-              } keys %new
-    ) {
-      my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'insert',
-        $table, $new->username, %new );
-      unless ( ref($err_or_queue) ) {
-        $dbh->rollback if $oldAutoCommit;
-        return $err_or_queue;
-      }
-      if ( $jobnum ) {
-        my $error = $err_or_queue->depend_insert( $jobnum );
-        if ( $error ) {
-          $dbh->rollback if $oldAutoCommit;
-          return $error;
-        }
-      }
-    }
-
-    my @del = grep { !exists $new{$_} } keys %old;
-    if ( @del ) {
-      my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'attrib_delete',
-        $table, $new->username, @del );
-      unless ( ref($err_or_queue) ) {
-        $dbh->rollback if $oldAutoCommit;
-        return $err_or_queue;
-      }
-      if ( $jobnum ) {
-        my $error = $err_or_queue->depend_insert( $jobnum );
-        if ( $error ) {
-          $dbh->rollback if $oldAutoCommit;
-          return $error;
-        }
-      }
-    }
-  }
-
-  # (sorta) false laziness with FS::svc_acct::replace
-  my @oldgroups = @{$old->usergroup}; #uuuh
-  my @newgroups = $new->radius_groups;
-  my @delgroups = ();
-  foreach my $oldgroup ( @oldgroups ) {
-    if ( grep { $oldgroup eq $_ } @newgroups ) {
-      @newgroups = grep { $oldgroup ne $_ } @newgroups;
-      next;
-    }
-    push @delgroups, $oldgroup;
-  }
-
-  if ( @delgroups ) {
-    my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'usergroup_delete',
-      $new->username, @delgroups );
-    unless ( ref($err_or_queue) ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $err_or_queue;
-    }
-    if ( $jobnum ) {
-      my $error = $err_or_queue->depend_insert( $jobnum );
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return $error;
-      }
-    }
-  }
-
-  if ( @newgroups ) {
-    my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'usergroup_insert',
-      $new->username, @newgroups );
-    unless ( ref($err_or_queue) ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $err_or_queue;
-    }
-    if ( $jobnum ) {
-      my $error = $err_or_queue->depend_insert( $jobnum );
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return $error;
-      }
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-}
-
-sub _export_delete {
-  my( $self, $svc_acct ) = (shift, shift);
-  my $err_or_queue = $self->sqlradius_queue( $svc_acct->svcnum, 'delete',
-    $svc_acct->username );
-  ref($err_or_queue) ? '' : $err_or_queue;
-}
-
-sub sqlradius_queue {
-  my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => "FS::part_export::sqlradius::sqlradius_$method",
-  };
-  $queue->insert(
-    $self->option('datasrc'),
-    $self->option('username'),
-    $self->option('password'),
-    @_,
-  ) or $queue;
-}
-
-sub sqlradius_insert { #subroutine, not method
-  my $dbh = sqlradius_connect(shift, shift, shift);
-  my( $table, $username, %attributes ) = @_;
-
-  foreach my $attribute ( keys %attributes ) {
-  
-    my $s_sth = $dbh->prepare(
-      "SELECT COUNT(*) FROM rad$table WHERE UserName = ? AND Attribute = ?"
-    ) or die $dbh->errstr;
-    $s_sth->execute( $username, $attribute ) or die $s_sth->errstr;
-
-    if ( $s_sth->fetchrow_arrayref->[0] ) {
-
-      my $u_sth = $dbh->prepare(
-        "UPDATE rad$table SET Value = ? WHERE UserName = ? AND Attribute = ?"
-      ) or die $dbh->errstr;
-      $u_sth->execute($attributes{$attribute}, $username, $attribute)
-        or die $u_sth->errstr;
-
-    } else {
-
-      my $i_sth = $dbh->prepare(
-        "INSERT INTO rad$table ( id, UserName, Attribute, Value ) ".
-          "VALUES ( ?, ?, ?, ? )"
-      ) or die $dbh->errstr;
-      $i_sth->execute( '', $username, $attribute, $attributes{$attribute} )
-        or die $i_sth->errstr;
-
-    }
-
-  }
-  $dbh->disconnect;
-}
-
-sub sqlradius_usergroup_insert { #subroutine, not method
-  my $dbh = sqlradius_connect(shift, shift, shift);
-  my( $username, @groups ) = @_;
-
-  my $sth = $dbh->prepare( 
-    "INSERT INTO usergroup ( id, UserName, GroupName ) VALUES ( ?, ?, ? )"
-  ) or die $dbh->errstr;
-  foreach my $group ( @groups ) {
-    $sth->execute( '', $username, $group )
-      or die "can't insert into groupname table: ". $sth->errstr;
-  }
-  $dbh->disconnect;
-}
-
-sub sqlradius_usergroup_delete { #subroutine, not method
-  my $dbh = sqlradius_connect(shift, shift, shift);
-  my( $username, @groups ) = @_;
-
-  my $sth = $dbh->prepare( 
-    "DELETE FROM usergroup WHERE UserName = ? AND GroupName = ?"
-  ) or die $dbh->errstr;
-  foreach my $group ( @groups ) {
-    $sth->execute( $username, $group )
-      or die "can't delete from groupname table: ". $sth->errstr;
-  }
-  $dbh->disconnect;
-}
-
-sub sqlradius_rename { #subroutine, not method
-  my $dbh = sqlradius_connect(shift, shift, shift);
-  my($new_username, $old_username) = @_;
-  foreach my $table (qw(radreply radcheck usergroup )) {
-    my $sth = $dbh->prepare("UPDATE $table SET Username = ? WHERE UserName = ?")
-      or die $dbh->errstr;
-    $sth->execute($new_username, $old_username)
-      or die "can't update $table: ". $sth->errstr;
-  }
-  $dbh->disconnect;
-}
-
-sub sqlradius_attrib_delete { #subroutine, not method
-  my $dbh = sqlradius_connect(shift, shift, shift);
-  my( $table, $username, @attrib ) = @_;
-
-  foreach my $attribute ( @attrib ) {
-    my $sth = $dbh->prepare(
-        "DELETE FROM rad$table WHERE UserName = ? AND Attribute = ?" )
-      or die $dbh->errstr;
-    $sth->execute($username,$attribute)
-      or die "can't delete from rad$table table: ". $sth->errstr;
-  }
-  $dbh->disconnect;
-}
-
-sub sqlradius_delete { #subroutine, not method
-  my $dbh = sqlradius_connect(shift, shift, shift);
-  my $username = shift;
-
-  foreach my $table (qw( radcheck radreply usergroup )) {
-    my $sth = $dbh->prepare( "DELETE FROM $table WHERE UserName = ?" );
-    $sth->execute($username)
-      or die "can't delete from $table table: ". $sth->errstr;
-  }
-  $dbh->disconnect;
-}
-
-sub sqlradius_connect {
-  #my($datasrc, $username, $password) = @_;
-  #DBI->connect($datasrc, $username, $password) or die $DBI::errstr;
-  DBI->connect(@_) or die $DBI::errstr;
-}
-
diff --git a/FS/FS/part_export/sysvshell.pm b/FS/FS/part_export/sysvshell.pm
deleted file mode 100644
index f3f6b34b6..000000000
--- a/FS/FS/part_export/sysvshell.pm
+++ /dev/null
@@ -1,7 +0,0 @@
-package FS::part_export::sysvshell;
-
-use vars qw(@ISA);
-use FS::part_export::null;
-
-@ISA = qw(FS::part_export::null);
-
diff --git a/FS/FS/part_export/textradius.pm b/FS/FS/part_export/textradius.pm
deleted file mode 100644
index 1492f2672..000000000
--- a/FS/FS/part_export/textradius.pm
+++ /dev/null
@@ -1,166 +0,0 @@
-package FS::part_export::textradius;
-
-use vars qw(@ISA $prefix);
-use Fcntl qw(:flock);
-use FS::UID qw(datasrc);
-use FS::part_export;
-
-@ISA = qw(FS::part_export);
-
-$prefix = "/usr/local/etc/freeside/export.";
-
-sub rebless { shift; }
-
-sub _export_insert {
-  my($self, $svc_acct) = (shift, shift);
-  $err_or_queue = $self->textradius_queue( $svc_acct->svcnum, 'insert',
-    $svc_acct->username, $svc_acct->radius_check, '-', $svc_acct->radius_reply);
-  ref($err_or_queue) ? '' : $err_or_queue;
-}
-
-sub _export_replace {
-  my( $self, $new, $old ) = (shift, shift, shift);
-  return "can't (yet?) change username with textradius"
-    if $old->username ne $new->username;
-  #return '' unless $old->_password ne $new->_password;
-  $err_or_queue = $self->textradius_queue( $new->svcnum, 'insert',
-    $new->username, $new->radius_check, '-', $new->radius_reply);
-  ref($err_or_queue) ? '' : $err_or_queue;
-}
-
-sub _export_delete {
-  my( $self, $svc_acct ) = (shift, shift);
-  $err_or_queue = $self->textradius_queue( $svc_acct->svcnum, 'delete',
-    $svc_acct->username );
-  ref($err_or_queue) ? '' : $err_or_queue;
-}
-
-#a good idea to queue anything that could fail or take any time
-sub textradius_queue {
-  my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => "FS::part_export::textradius::textradius_$method",
-  };
-  $queue->insert(
-    $self->option('user')||'root',
-    $self->machine,
-    $self->option('users'),
-    @_,
-  ) or $queue;
-}
-
-sub textradius_insert { #subroutine, not method
-  my( $user, $host, $users, $username, @attributes ) = @_;
-
-  #silly arg processing
-  my($att, @check);
-  push @check, $att while @attributes && ($att=shift @attributes) ne '-';
-  my %check = @check;
-  my %reply = @attributes;
-
-  my $file = textradius_download($user, $host, $users);
-
-  eval "use RADIUS::UserFile;";
-  die $@ if $@;
-
-  my $userfile = new RADIUS::UserFile(
-    File        => $file,
-    Who         => [ $username ],
-    Check_Items => [ keys %check ],
-  ) or die "error parsing $file";
-
-  $userfile->remove($username);
-  $userfile->add(
-    Who        => $username,
-    Attributes => { %check, %reply },
-    Comment    => 'user added by Freeside',
-  ) or die "error adding to $file";
-
-  $userfile->update( Who => [ $username ] )
-    or die "error updating $file";
-
-  textradius_upload($user, $host, $users);
-
-}
-
-sub textradius_delete { #subroutine, not method
-  my( $user, $host, $users, $username ) = @_;
-
-  my $file = textradius_download($user, $host, $users);
-
-  eval "use RADIUS::UserFile;";
-  die $@ if $@;
-
-  my $userfile = new RADIUS::UserFile(
-    File        => $file,
-    Who         => [ $username ],
-  ) or die "error parsing $file";
-
-  $userfile->remove($username);
-
-  $userfile->update( Who => [ $username ] )
-    or die "error updating $file";
-
-  textradius_upload($user, $host, $users);
-}
-
-sub textradius_download {
-  my( $user, $host, $users ) = @_;
-
-  my $dir = $prefix. datasrc;
-  mkdir $dir, 0700 or die $! unless -d $dir;
-  $dir .= "/$host";
-  mkdir $dir, 0700 or die $! unless -d $dir;
-
-  my $dest = "$dir/users";
-
-  eval "use File::Rsync;";
-  die $@ if $@;
-  my $rsync = File::Rsync->new({ rsh => 'ssh' });
-
-  open(LOCK, "+>>$dest.lock")
-    and flock(LOCK,LOCK_EX)
-      or die "can't open $dest.lock: $!";
-
-  $rsync->exec( {
-    src  => "$user\@$host:$users",
-    dest => $dest,
-  } ); # true/false return value from exec is not working, alas
-  if ( $rsync->err ) {
-    die "error downloading $user\@$host:$users : ".
-        'exit status: '. $rsync->status. ', '.
-        'STDERR: '. join(" / ", $rsync->err). ', '.
-        'STDOUT: '. join(" / ", $rsync->out);
-  }
-
-  $dest;
-}
-
-sub textradius_upload {
-  my( $user, $host, $users ) = @_;
-
-  my $dir = $prefix. datasrc. "/$host";
-
-  eval "use File::Rsync;";
-  die $@ if $@;
-  my $rsync = File::Rsync->new({
-    rsh => 'ssh',
-    #dry_run => 1,
-  });
-  $rsync->exec( {
-    src  => "$dir/users",
-    dest => "$user\@$host:$users",
-  } ); # true/false return value from exec is not working, alas
-  if ( $rsync->err ) {
-    die "error uploading to $user\@$host:$users : ".
-        'exit status: '. $rsync->status. ', '.
-        'STDERR: '. join(" / ", $rsync->err). ', '.
-        'STDOUT: '. join(" / ", $rsync->out);
-  }
-
-  flock(LOCK,LOCK_UN);
-  close LOCK;
-
-}
-
diff --git a/FS/FS/part_export/vpopmail.pm b/FS/FS/part_export/vpopmail.pm
deleted file mode 100644
index 6a486faa1..000000000
--- a/FS/FS/part_export/vpopmail.pm
+++ /dev/null
@@ -1,179 +0,0 @@
-package FS::part_export::vpopmail;
-
-use vars qw(@ISA @saltset $exportdir $rsync $ssh);
-use File::Path;
-use FS::UID qw( datasrc );
-use FS::part_export;
-
-@ISA = qw(FS::part_export);
-
-@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
-
-$rsync = "rsync";
-$ssh = "ssh";
-
-sub rebless { shift; }
-
-sub _export_insert {
-  my($self, $svc_acct) = (shift, shift);
-  $self->vpopmail_queue( $svc_acct->svcnum, 'insert',
-    $svc_acct->username,
-    crypt($svc_acct->_password,$saltset[int(rand(64))].$saltset[int(rand(64))]),
-    $svc_acct->domain,
-  );
-}
-
-sub _export_replace {
-  my( $self, $new, $old ) = (shift, shift, shift);
-
-  my $cpassword = crypt(
-    $new->_password, $saltset[int(rand(64))].$saltset[int(rand(64))]
-  );
-
-  return "can't change username with vpopmail"
-    if $old->username ne $new->username;
-
-  #no.... if mail can't be preserved, better to disallow username changes
-  #if ($old->username ne $new->username || $old->domain ne $new->domain ) {
-  #  vpopmail_queue( $svc_acct->svcnum, 'delete', 
-  #    $old->username, $old->domain
-  #  );
-  #  vpopmail_queue( $svc_acct->svcnum, 'insert', 
-  #    $new->username,
-  #    $cpassword,
-  #    $new->domain,
-  #  );
-
-  return '' unless $old->_password ne $new->_password;
-
-  $self->vpopmail_queue( $new->svcnum, 'replace',
-    $new->username, $cpassword, $new->domain );
-}
-
-sub _export_delete {
-  my( $self, $svc_acct ) = (shift, shift);
-  $self->vpopmail_queue( $svc_acct->svcnum, 'delete',
-    $svc_acct->username, $svc_acct->domain );
-}
-
-#a good idea to queue anything that could fail or take any time
-sub vpopmail_queue {
-  my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my $exportdir = "/usr/local/etc/freeside/export." . datasrc;
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => "FS::part_export::vpopmail::vpopmail_$method",
-  };
-  $queue->insert(
-    $exportdir,
-    $self->option('machine'),
-    $self->option('dir'),
-    $self->option('uid'),
-    $self->option('gid'),
-    @_
-  );
-}
-
-sub vpopmail_insert { #subroutine, not method
-  my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
-  my( $username, $password, $domain ) = @_;
-  
-  (open(VPASSWD, ">>$exportdir/domains/$domain/vpasswd")
-    and flock(VPASSWD,LOCK_EX)
-  ) or die "can't open vpasswd file for $username\@$domain: ".
-           "$exportdir/domains/$domain/vpasswd: $!";
-  print VPASSWD join(":",
-    $username,
-    $password,
-    '1',
-    '0',
-    $username,
-    "$dir/domains/$domain/$username",
-    'NOQUOTA',
-  ), "\n";
-
-  flock(VPASSWD,LOCK_UN);
-  close(VPASSWD);
-
-  for my $mkdir (
-    map { "$exportdir/domains/$domain/$username$_" }
-      ( '', qw( /Maildir /Maildir/cur /Maildir/new /Maildir/tmp ) )
-  ) {
-    mkdir $mkdir, 0700 or die "can't mkdir $mkdir: $!";
-  }
-
-  vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid );
-
-}
-
-sub vpopmail_replace { #subroutine, not method
-  my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
-  my( $username, $password, $domain ) = @_;
-  
-  (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
-    and flock(VPASSWD,LOCK_EX)
-  ) or die "can't open $exportdir/domains/$domain/vpasswd: $!";
-
-  open(VPASSWDTMP, ">$exportdir/domains/$domain/vpasswd.tmp")
-    or die "Can't open $exportdir/domains/$domain/vpasswd.tmp: $!";
-
-  while (<VPASSWD>) {
-    my ($mailbox, $pw, @rest) = split(':', $_);
-    print VPASSWDTMP $_ unless $username eq $mailbox;
-    print VPASSWDTMP join (':', ($mailbox, $password, @rest))
-      if $username eq $mailbox;
-  }
-
-  close(VPASSWDTMP);
-
-  rename "$exportdir/domains/$domain/vpasswd.tmp", "$exportdir/domains/$domain/vpasswd"
-    or die "Can't rename $exportdir/domains/$domain/vpasswd.tmp: $!";
-
-  flock(VPASSWD,LOCK_UN);
-  close(VPASSWD);
-
-  vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid );
-
-}
-
-sub vpopmail_delete { #subroutine, not method
-  my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
-  my( $username, $domain ) = @_;
-  
-  (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
-    and flock(VPASSWD,LOCK_EX)
-  ) or die "can't open $exportdir/domains/$domain/vpasswd: $!";
-
-  open(VPASSWDTMP, ">$exportdir/domains/$domain/vpasswd.tmp")
-    or die "Can't open $exportdir/domains/$domain/vpasswd.tmp: $!";
-
-  while (<VPASSWD>) {
-    my ($mailbox, $rest) = split(':', $_);
-    print VPASSWDTMP $_ unless $username eq $mailbox;
-  }
-
-  close(VPASSWDTMP);
-
-  rename "$exportdir/domains/$domain/vpasswd.tmp",
-         "$exportdir/domains/$domain/vpasswd"
-    or die "Can't rename $exportdir/domains/$domain/vpasswd.tmp: $!";
-
-  flock(VPASSWD,LOCK_UN);
-  close(VPASSWD);
-
-  rmtree "$exportdir/domains/$domain/$username"
-    or die "can't rmtree $exportdir/domains/$domain/$username: $!";
-
-  vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid );
-}
-
-sub vpopmail_sync {
-  my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
-  
-  chdir $exportdir;
-  my @args = ( $rsync, "-rlpt", "-e", $ssh, "domains/",
-               "vpopmail\@$machine:$dir/domains/"  );
-  system {$args[0]} @args;
-}
-
-
diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
deleted file mode 100644
index 84c162761..000000000
--- a/FS/FS/part_export/www_shellcommands.pm
+++ /dev/null
@@ -1,112 +0,0 @@
-package FS::part_export::www_shellcommands;
-
-use strict;
-use vars qw(@ISA);
-use FS::part_export;
-
-@ISA = qw(FS::part_export);
-
-sub rebless { shift; }
-
-sub _export_insert {
-  my($self) = shift;
-  $self->_export_command('useradd', @_);
-}
-
-sub _export_delete {
-  my($self) = shift;
-  $self->_export_command('userdel', @_);
-}
-
-sub _export_command {
-  my ( $self, $action, $svc_www) = (shift, shift, shift);
-  my $command = $self->option($action);
-
-  #set variable for the command
-  {
-    no strict 'refs';
-    ${$_} = $svc_www->getfield($_) foreach $svc_www->fields;
-  }
-  my $domain_record = $svc_www->domain_record; # or die ?
-  my $zone = $domain_record->reczone; # or die ?
-  unless ( $zone =~ /\.$/ ) {
-    my $svc_domain = $domain_record->svc_domain; # or die ?
-    $zone .= '.'. $svc_domain->domain;
-  }
-
-  my $svc_acct = $svc_www->svc_acct; # or die ?
-  my $username = $svc_acct->username;
-  my $homedir = $svc_acct->dir; # or die ?
-
-  #done setting variables for the command
-
-  $self->shellcommands_queue( $svc_www->svcnum,
-    user         => $self->option('user')||'root',
-    host         => $self->machine,
-    command      => eval(qq("$command")),
-  );
-}
-
-sub _export_replace {
-  my($self, $new, $old ) = (shift, shift, shift);
-  my $command = $self->option('usermod');
-  
-  #set variable for the command
-  {
-    no strict 'refs';
-    ${"old_$_"} = $old->getfield($_) foreach $old->fields;
-    ${"new_$_"} = $new->getfield($_) foreach $new->fields;
-  }
-  my $old_domain_record = $old->domain_record; # or die ?
-  my $old_zone = $old_domain_record->reczone; # or die ?
-  unless ( $old_zone =~ /\.$/ ) {
-    my $old_svc_domain = $old_domain_record->svc_domain; # or die ?
-    $old_zone .= '.'. $old_svc_domain->domain;
-  }
-
-  my $old_svc_acct = $old->svc_acct; # or die ?
-  my $old_username = $old_svc_acct->username;
-  my $old_homedir = $old_svc_acct->dir; # or die ?
-
-  my $new_domain_record = $new->domain_record; # or die ?
-  my $new_zone = $new_domain_record->reczone; # or die ?
-  unless ( $new_zone =~ /\.$/ ) {
-    my $new_svc_domain = $new_domain_record->svc_domain; # or die ?
-    $new_zone .= '.'. $new_svc_domain->domain;
-  }
-
-  my $new_svc_acct = $new->svc_acct; # or die ?
-  my $new_username = $new_svc_acct->username;
-  my $new_homedir = $new_svc_acct->dir; # or die ?
-
-  #done setting variables for the command
-
-  $self->shellcommands_queue( $new->svcnum,
-    user         => $self->option('user')||'root',
-    host         => $self->machine,
-    command      => eval(qq("$command")),
-  );
-}
-
-#a good idea to queue anything that could fail or take any time
-sub shellcommands_queue {
-  my( $self, $svcnum ) = (shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => "FS::part_export::www_shellcommands::ssh_cmd",
-  };
-  $queue->insert( @_ );
-}
-
-sub ssh_cmd { #subroutine, not method
-  use Net::SSH '0.06';
-  &Net::SSH::ssh_cmd( { @_ } );
-}
-
-#sub shellcommands_insert { #subroutine, not method
-#}
-#sub shellcommands_replace { #subroutine, not method
-#}
-#sub shellcommands_delete { #subroutine, not method
-#}
-
diff --git a/FS/FS/part_export_option.pm b/FS/FS/part_export_option.pm
deleted file mode 100644
index a0b19fde1..000000000
--- a/FS/FS/part_export_option.pm
+++ /dev/null
@@ -1,134 +0,0 @@
-package FS::part_export_option;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-use FS::part_export;
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::part_export_option - Object methods for part_export_option records
-
-=head1 SYNOPSIS
-
-  use FS::part_export_option;
-
-  $record = new FS::part_export_option \%hash;
-  $record = new FS::part_export_option { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::part_export_option object represents an export option.
-FS::part_export_option inherits from FS::Record.  The following fields are
-currently supported:
-
-=over 4
-
-=item optionnum - primary key
-
-=item exportnum - export (see L<FS::part_export>)
-
-=item optionname - option name
-
-=item optionvalue - option value
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new export option.  To add the export option to the database, see
-L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'part_export_option'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid export option.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-    $self->ut_numbern('optionnum')
-    || $self->ut_number('exportnum')
-    || $self->ut_alpha('optionname')
-    || $self->ut_anything('optionvalue')
-  ;
-  return $error if $error;
-
-  return "Unknown exportnum: ". $self->exportnum
-    unless qsearchs('part_export', { 'exportnum' => $self->exportnum } );
-
-  #check options & values?
-
-  ''; #no error
-}
-
-=back
-
-=head1 BUGS
-
-Possibly.
-
-=head1 SEE ALSO
-
-L<FS::part_export>, L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
deleted file mode 100644
index e914636e4..000000000
--- a/FS/FS/part_pkg.pm
+++ /dev/null
@@ -1,317 +0,0 @@
-package FS::part_pkg;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch dbh );
-use FS::pkg_svc;
-use FS::agent_type;
-use FS::type_pkgs;
-use FS::Conf;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::part_pkg - Object methods for part_pkg objects
-
-=head1 SYNOPSIS
-
-  use FS::part_pkg;
-
-  $record = new FS::part_pkg \%hash
-  $record = new FS::part_pkg { 'column' => 'value' };
-
-  $custom_record = $template_record->clone;
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  @pkg_svc = $record->pkg_svc;
-
-  $svcnum = $record->svcpart;
-  $svcnum = $record->svcpart( 'svc_acct' );
-
-=head1 DESCRIPTION
-
-An FS::part_pkg object represents a billing item definition.  FS::part_pkg
-inherits from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item pkgpart - primary key (assigned automatically for new billing item definitions)
-
-=item pkg - Text name of this billing item definition (customer-viewable)
-
-=item comment - Text name of this billing item definition (non-customer-viewable)
-
-=item setup - Setup fee expression
-
-=item freq - Frequency of recurring fee
-
-=item recur - Recurring fee expression
-
-=item setuptax - Setup fee tax exempt flag, empty or `Y'
-
-=item recurtax - Recurring fee tax exempt flag, empty or `Y'
-
-=item taxclass - Tax class flag
-
-=item plan - Price plan
-
-=item plandata - Price plan data
-
-=item disabled - Disabled flag, empty or `Y'
-
-=back
-
-setup and recur are evaluated as Safe perl expressions.  You can use numbers
-just as you would normally.  More advanced semantics are not yet defined.
-
-=head1 METHODS
-
-=over 4 
-
-=item new HASHREF
-
-Creates a new billing item definition.  To add the billing item definition to
-the database, see L<"insert">.
-
-=cut
-
-sub table { 'part_pkg'; }
-
-=item clone
-
-An alternate constructor.  Creates a new billing item definition by duplicating
-an existing definition.  A new pkgpart is assigned and `(CUSTOM) ' is prepended
-to the comment field.  To add the billing item definition to the database, see
-L<"insert">.
-
-=cut
-
-sub clone {
-  my $self = shift;
-  my $class = ref($self);
-  my %hash = $self->hash;
-  $hash{'pkgpart'} = '';
-  $hash{'comment'} = "(CUSTOM) ". $hash{'comment'}
-    unless $hash{'comment'} =~ /^\(CUSTOM\) /;
-  #new FS::part_pkg ( \%hash ); # ?
-  new $class ( \%hash ); # ?
-}
-
-=item insert
-
-Adds this billing item definition to the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub insert {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  my $conf = new FS::Conf;
-
-  if ( $conf->exists('agent_defaultpkg') ) {
-    foreach my $agent_type ( qsearch('agent_type', {} ) ) {
-      my $type_pkgs = new FS::type_pkgs({
-        'typenum' => $agent_type->typenum,
-        'pkgpart' => $self->pkgpart,
-      });
-      my $error = $type_pkgs->insert;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return $error;
-      }
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-}
-
-=item delete
-
-Currently unimplemented.
-
-=cut
-
-sub delete {
-  return "Can't (yet?) delete package definitions.";
-# check & make sure the pkgpart isn't in cust_pkg or type_pkgs?
-}
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid billing item definition.  If
-there is an error, returns the error, otherwise returns false.  Called by the
-insert and replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $conf = new FS::Conf;
-  if ( $conf->exists('safe-part_pkg') ) {
-
-    my $error = $self->ut_anything('setup')
-                || $self->ut_anything('recur');
-    return $error if $error;
-
-    my $s = $self->setup;
-
-    $s =~ /^\s*\d*\.?\d*\s*$/
-
-      or $s =~ /^my \$d = \$cust_pkg->bill || \$time; \$d += 86400 \* \s*\d+\s*; \$cust_pkg->bill\(\$d\); \$cust_pkg_mod_flag=1; \s*\d*\.?\d*\s*$/
-
-      or do {
-        #log!
-        return "illegal setup: $s";
-      };
-
-    my $r = $self->recur;
-
-    $r =~ /^\s*\d*\.?\d*\s*$/
-
-      #or $r =~ /^\$sdate += 86400 \* \s*\d+\s*; \s*\d*\.?\d*\s*$/
-
-      or $r =~ /^my \$mnow = \$sdate; my \(\$sec,\$min,\$hour,\$mday,\$mon,\$year\) = \(localtime\(\$sdate\) \)\[0,1,2,3,4,5\]; my \$mstart = timelocal\(0,0,0,1,\$mon,\$year\); my \$mend = timelocal\(0,0,0,1, \$mon == 11 \? 0 : \$mon\+1, \$year\+\(\$mon==11\)\); \$sdate = \$mstart; \( \$part_pkg->freq \- 1 \) \* \d*\.?\d* \/ \$part_pkg\-\>freq \+ \d*\.?\d* \/ \$part_pkg\-\>freq \* \(\$mend\-\$mnow\) \/ \(\$mend\-\$mstart\) ;\s*$/
-
-      or $r =~ /^my \$mnow = \$sdate; my \(\$sec,\$min,\$hour,\$mday,\$mon,\$year\) = \(localtime\(\$sdate\) \)\[0,1,2,3,4,5\]; \$sdate = timelocal\(0,0,0,1,\$mon,\$year\); \s*\d*\.?\d*\s*;\s*$/
-
-      or $r =~ /^my \$error = \$cust_pkg\->cust_main\->credit\( \s*\d*\.?\d*\s* \* scalar\(\$cust_pkg\->cust_main\->referral_cust_main_ncancelled\(\s*\d+\s*\)\), "commission" \); die \$error if \$error; \s*\d*\.?\d*\s*;\s*$/
-
-      or $r =~ /^my \$error = \$cust_pkg\->cust_main\->credit\( \s*\d*\.?\d*\s* \* scalar\(\$cust_pkg\->cust_main->referral_cust_pkg\(\s*\d+\s*\)\), "commission" \); die \$error if \$error; \s*\d*\.?\d*\s*;\s*$/
-
-      or $r =~ /^my \$error = \$cust_pkg\->cust_main\->credit\( \s*\d*\.?\d*\s* \* scalar\( grep \{ my \$pkgpart = \$_\->pkgpart; grep \{ \$_ == \$pkgpart \} \(\s*(\s*\d+,\s*)*\s*\) \} \$cust_pkg\->cust_main->referral_cust_pkg\(\s*\d+\s*\)\), "commission" \); die \$error if \$error; \s*\d*\.?\d*\s*;\s*$/
-
-      or $r =~ /^my \$hours = \$cust_pkg\->seconds_since\(\$cust_pkg\->bill \|\| 0\) \/ 3600 \- \s*\d*\.?\d*\s*; \$hours = 0 if \$hours < 0; \s*\d*\.?\d*\s* \+ \s*\d*\.?\d*\s* \* \$hours;\s*$/
-
-      or $r =~ /^my \$min = \$cust_pkg\->seconds_since\(\$cust_pkg\->bill \|\| 0\) \/ 60 \- \s*\d*\.?\d*\s*; \$min = 0 if \$min < 0; \s*\d*\.?\d*\s* \+ \s*\d*\.?\d*\s* \* \$min;\s*$/
-
-      or do {
-        #log!
-        return "illegal recur: $r";
-      };
-
-  }
-
-    $self->ut_numbern('pkgpart')
-      || $self->ut_text('pkg')
-      || $self->ut_text('comment')
-      || $self->ut_anything('setup')
-      || $self->ut_number('freq')
-      || $self->ut_anything('recur')
-      || $self->ut_alphan('plan')
-      || $self->ut_anything('plandata')
-      || $self->ut_enum('setuptax', [ '', 'Y' ] )
-      || $self->ut_enum('recurtax', [ '', 'Y' ] )
-      || $self->ut_textn('taxclass')
-      || $self->ut_enum('disabled', [ '', 'Y' ] )
-    ;
-}
-
-=item pkg_svc
-
-Returns all FS::pkg_svc objects (see L<FS::pkg_svc>) for this package
-definition (with non-zero quantity).
-
-=cut
-
-sub pkg_svc {
-  my $self = shift;
-  grep { $_->quantity } qsearch( 'pkg_svc', { 'pkgpart' => $self->pkgpart } );
-}
-
-=item svcpart [ SVCDB ]
-
-Returns the svcpart of a single service definition (see L<FS::part_svc>)
-associated with this billing item definition (see L<FS::pkg_svc>).  Returns
-false if there not exactly one service definition with quantity 1, or if 
-SVCDB is specified and does not match the svcdb of the service definition, 
-
-=cut
-
-sub svcpart {
-  my $self = shift;
-  my $svcdb = shift;
-  my @pkg_svc = $self->pkg_svc;
-  return '' if scalar(@pkg_svc) != 1
-               || $pkg_svc[0]->quantity != 1
-               || ( $svcdb && $pkg_svc[0]->part_svc->svcdb ne $svcdb );
-  $pkg_svc[0]->svcpart;
-}
-
-=item payby
-
-Returns a list of the acceptable payment types for this package.  Eventually
-this should come out of a database table and be editable, but currently has the
-following logic instead;
-
-If the package has B<0> setup and B<0> recur, the single item B<BILL> is
-returned, otherwise, the single item B<CARD> is returned.
-
-=cut
-
-sub payby {
-  my $self = shift;
-  #if ( $self->setup == 0 && $self->recur == 0 ) {
-  if (    $self->setup =~ /^\s*0+(\.0*)?\s*$/
-       && $self->recur =~ /^\s*0+(\.0*)?\s*$/ ) {
-    ( 'BILL' );
-  } else {
-    ( 'CARD' );
-  }
-}
-
-=back
-
-=head1 VERSION
-
-$Id: part_pkg.pm,v 1.16 2002-06-10 01:39:50 khoff Exp $
-
-=head1 BUGS
-
-The delete method is unimplemented.
-
-setup and recur semantics are not yet defined (and are implemented in
-FS::cust_bill.  hmm.).
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_pkg>, L<FS::type_pkgs>, L<FS::pkg_svc>, L<Safe>.
-schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/part_pop_local.pm b/FS/FS/part_pop_local.pm
deleted file mode 100644
index 0b7cdf6c9..000000000
--- a/FS/FS/part_pop_local.pm
+++ /dev/null
@@ -1,116 +0,0 @@
-package FS::part_pop_local;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record; # qw( qsearchs );
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::part_pop_local - Object methods for part_pop_local records
-
-=head1 SYNOPSIS
-
-  use FS::part_pop_local;
-
-  $record = new FS::part_pop_local \%hash;
-  $record = new FS::part_pop_local { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::part_pop_local object represents a local call area.  Each
-FS::part_pop_local record maps a NPA/NXX (area code and exchange) to the POP
-(see L<FS::svc_acct_pop>) which is a local call.  FS::part_pop_local inherits
-from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item localnum - primary key (assigned automatically for new accounts)
-
-=item popnum - see L<FS::svc_acct_pop>
-
-=item city
-
-=item state
-
-=item npa - area code
-
-=item nxx - exchange
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new point of presence (if only it were that easy!).  To add the 
-point of presence to the database, see L<"insert">.
-
-=cut
-
-sub table { 'part_pop_local'; }
-
-=item insert
-
-Adds this point of presence to the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item delete
-
-Removes this point of presence from the database.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid point of presence.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-    $self->ut_numbern('localnum')
-      or $self->ut_numbern('popnum')
-      or $self->ut_text('city')
-      or $self->ut_text('state')
-      or $self->ut_number('npa')
-      or $self->ut_number('nxx')
-  ;
-
-}
-
-=back
-
-=head1 VERSION
-
-$Id: part_pop_local.pm,v 1.1 2001-09-26 09:17:06 ivan Exp $
-
-=head1 BUGS
-
-US/CA-centric.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::svc_acct_pop>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/part_referral.pm b/FS/FS/part_referral.pm
deleted file mode 100644
index 23885dffd..000000000
--- a/FS/FS/part_referral.pm
+++ /dev/null
@@ -1,116 +0,0 @@
-package FS::part_referral;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::part_referral - Object methods for part_referral objects
-
-=head1 SYNOPSIS
-
-  use FS::part_referral;
-
-  $record = new FS::part_referral \%hash
-  $record = new FS::part_referral { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::part_referral represents a advertising source - where a customer heard
-of your services.  This can be used to track the effectiveness of a particular
-piece of advertising, for example.  FS::part_referral inherits from FS::Record.
-The following fields are currently supported:
-
-=over 4
-
-=item refnum - primary key (assigned automatically for new referrals)
-
-=item referral - Text name of this advertising source
-
-=back
-
-=head1 NOTE
-
-These were called B<referrals> before version 1.4.0 - the name was changed
-so as not to be confused with the new customer-to-customer referrals.
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new advertising source.  To add the referral to the database, see
-L<"insert">.
-
-=cut
-
-sub table { 'part_referral'; }
-
-=item insert
-
-Adds this advertising source to the database.  If there is an error, returns
-the error, otherwise returns false.
-
-=item delete
-
-Currently unimplemented.
-
-=cut
-
-sub delete {
-  my $self = shift;
-  return "Can't (yet?) delete part_referral records";
-  #need to make sure no customers have this referral!
-}
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid advertising source.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert and
-replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  $self->ut_numbern('refnum')
-    || $self->ut_text('referral')
-  ;
-}
-
-=back
-
-=head1 BUGS
-
-The delete method is unimplemented.
-
-`Advertising source'.  Yes, it's a sucky name.  The only other ones I could
-come up with were "Marketing channel" and "Heard Abouts" and those are
-definately both worse.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_main>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
deleted file mode 100644
index 959a3f887..000000000
--- a/FS/FS/part_svc.pm
+++ /dev/null
@@ -1,348 +0,0 @@
-package FS::part_svc;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs fields dbh );
-use FS::part_svc_column;
-use FS::part_export;
-use FS::export_svc;
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::part_svc - Object methods for part_svc objects
-
-=head1 SYNOPSIS
-
-  use FS::part_svc;
-
-  $record = new FS::part_svc \%hash
-  $record = new FS::part_svc { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::part_svc represents a service definition.  FS::part_svc inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item svcpart - primary key (assigned automatically for new service definitions)
-
-=item svc - text name of this service definition
-
-=item svcdb - table used for this service.  See L<FS::svc_acct>,
-L<FS::svc_domain>, and L<FS::svc_forward>, among others.
-
-=item disabled - Disabled flag, empty or `Y'
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new service definition.  To add the service definition to the
-database, see L<"insert">.
-
-=cut
-
-sub table { 'part_svc'; }
-
-=item insert EXTRA_FIELDS_ARRAYREF
-
-Adds this service definition to the database.  If there is an error, returns
-the error, otherwise returns false.
-
-TODOC:
-
-=item I<svcdb>__I<field> - Default or fixed value for I<field> in I<svcdb>.
-
-=item I<svcdb>__I<field>_flag - defines I<svcdb>__I<field> action: null, `D' for default, or `F' for fixed
-
-TODOC: EXTRA_FIELDS_ARRAYREF
-
-=cut
-
-sub insert {
-  my $self = shift;
-  my @fields = ();
-  @fields = @{shift(@_)} if @_;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  my $svcdb = $self->svcdb;
-#  my @rows = map { /^${svcdb}__(.*)$/; $1 }
-#    grep ! /_flag$/,
-#      grep /^${svcdb}__/,
-#        fields('part_svc');
-  foreach my $field (
-    grep { $_ ne 'svcnum'
-           && defined( $self->getfield($svcdb.'__'.$_.'_flag') )
-         } (fields($svcdb), @fields)
-  ) {
-    my $part_svc_column = $self->part_svc_column($field);
-    my $previous = qsearchs('part_svc_column', {
-      'svcpart'    => $self->svcpart,
-      'columnname' => $field,
-    } );
-
-    my $flag = $self->getfield($svcdb.'__'.$field.'_flag');
-    if ( uc($flag) =~ /^([DF])$/ ) {
-      $part_svc_column->setfield('columnflag', $1);
-      $part_svc_column->setfield('columnvalue',
-        $self->getfield($svcdb.'__'.$field)
-      );
-      if ( $previous ) {
-        $error = $part_svc_column->replace($previous);
-      } else {
-        $error = $part_svc_column->insert;
-      }
-    } else {
-      $error = $previous ? $previous->delete : '';
-    }
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-}
-
-=item delete
-
-Currently unimplemented.
-
-=cut
-
-sub delete {
-  return "Can't (yet?) delete service definitions.";
-# check & make sure the svcpart isn't in cust_svc or pkg_svc (in any packages)?
-}
-
-=item replace OLD_RECORD [ '1.3-COMPAT' [ , EXTRA_FIELDS_ARRAYREF ] ]
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-TODOC: 1.3-COMPAT
-
-TODOC: EXTRA_FIELDS_ARRAYREF
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-
-  return "Can't change svcdb for an existing service definition!"
-    unless $old->svcdb eq $new->svcdb;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $new->SUPER::replace( $old );
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  if ( @_ && $_[0] eq '1.3-COMPAT' ) {
-    shift;
-    my @fields = ();
-    @fields = @{shift(@_)} if @_;
-
-    my $svcdb = $new->svcdb;
-    foreach my $field (
-      grep { $_ ne 'svcnum'
-             && defined( $new->getfield($svcdb.'__'.$_.'_flag') )
-           } (fields($svcdb),@fields)
-    ) {
-      my $part_svc_column = $new->part_svc_column($field);
-      my $previous = qsearchs('part_svc_column', {
-        'svcpart'    => $new->svcpart,
-        'columnname' => $field,
-      } );
-
-      my $flag = $new->getfield($svcdb.'__'.$field.'_flag');
-      if ( uc($flag) =~ /^([DF])$/ ) {
-        $part_svc_column->setfield('columnflag', $1);
-        $part_svc_column->setfield('columnvalue',
-          $new->getfield($svcdb.'__'.$field)
-        );
-        if ( $previous ) {
-          $error = $part_svc_column->replace($previous);
-        } else {
-          $error = $part_svc_column->insert;
-        }
-      } else {
-        $error = $previous ? $previous->delete : '';
-      }
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return $error;
-      }
-    }
-  } else {
-    $dbh->rollback if $oldAutoCommit;
-    return 'non-1.3-COMPAT interface not yet written';
-    #not yet implemented
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-}
-
-=item check
-
-Checks all fields to make sure this is a valid service definition.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-  my $recref = $self->hashref;
-
-  my $error;
-  $error=
-    $self->ut_numbern('svcpart')
-    || $self->ut_text('svc')
-    || $self->ut_alpha('svcdb')
-    || $self->ut_enum('disabled', [ '', 'Y' ] )
-  ;
-  return $error if $error;
-
-  my @fields = eval { fields( $recref->{svcdb} ) }; #might die
-  return "Unknown svcdb!" unless @fields;
-
-##REPLACED BY part_svc_column
-#  my $svcdb;
-#  foreach $svcdb ( qw(
-#    svc_acct svc_acct_sm svc_domain
-#  ) ) {
-#    my @rows = map { /^${svcdb}__(.*)$/; $1 }
-#      grep ! /_flag$/,
-#        grep /^${svcdb}__/,
-#          fields('part_svc');
-#    foreach my $row (@rows) {
-#      unless ( $svcdb eq $recref->{svcdb} ) {
-#        $recref->{$svcdb.'__'.$row}='';
-#        $recref->{$svcdb.'__'.$row.'_flag'}='';
-#        next;
-#      }
-#      $recref->{$svcdb.'__'.$row.'_flag'} =~ /^([DF]?)$/
-#        or return "Illegal flag for $svcdb $row";
-#      $recref->{$svcdb.'__'.$row.'_flag'} = $1;
-#
-#      my $error = $self->ut_anything($svcdb.'__'.$row);
-#      return $error if $error;
-#
-#    }
-#  }
-
-  ''; #no error
-}
-
-=item part_svc_column COLUMNNAME
-
-Returns the part_svc_column object (see L<FS::part_svc_column>) for the given
-COLUMNNAME, or a new part_svc_column object if none exists.
-
-=cut
-
-sub part_svc_column {
-  my $self = shift;
-  my $columnname = shift;
-  qsearchs('part_svc_column',  {
-                                 'svcpart'    => $self->svcpart,
-                                 'columnname' => $columnname,
-                               }
-  ) or new FS::part_svc_column {
-                                 'svcpart'    => $self->svcpart,
-                                 'columnname' => $columnname,
-                               };
-}
-
-=item all_part_svc_column
-
-=cut
-
-sub all_part_svc_column {
-  my $self = shift;
-  qsearch('part_svc_column', { 'svcpart' => $self->svcpart } );
-}
-
-=item part_export
-
-=cut
-
-sub part_export {
-  my $self = shift;
-  map { qsearchs('part_export', { 'exportnum' => $_->exportnum } ) }
-    qsearch('export_svc', { 'svcpart' => $self->svcpart } );
-}
-
-=back
-
-=head1 VERSION
-
-$Id: part_svc.pm,v 1.13 2002-04-11 22:05:31 ivan Exp $
-
-=head1 BUGS
-
-Delete is unimplemented.
-
-The list of svc_* tables is hardcoded.  When svc_acct_pop is renamed, this
-should be fixed.
-
-all_part_svc_column and part_export methods should be documented
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::part_svc_column>, L<FS::part_pkg>, L<FS::pkg_svc>,
-L<FS::cust_svc>, L<FS::svc_acct>, L<FS::svc_forward>, L<FS::svc_domain>,
-schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/part_svc_column.pm b/FS/FS/part_svc_column.pm
deleted file mode 100644
index 37e841e87..000000000
--- a/FS/FS/part_svc_column.pm
+++ /dev/null
@@ -1,118 +0,0 @@
-package FS::part_svc_column;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( fields );
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::part_svc_column - Object methods for part_svc_column objects
-
-=head1 SYNOPSIS
-
-  use FS::part_svc_column;
-
-  $record = new FS::part_svc_column \%hash
-  $record = new FS::part_svc_column { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::part_svc_column record represents a service definition column
-constraint.  FS::part_svc_column inherits from FS::Record.  The following
-fields are currently supported:
-
-=over 4
-
-=item columnnum - primary key (assigned automatcially for new records)
-
-=item svcpart - service definition (see L<FS::part_svc>)
-
-=item columnname - column name in part_svc.svcdb table
-
-=item columnvalue - default or fixed value for the column
-
-=item columnflag - null, D or F
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new column constraint.  To add the column constraint to the database, see L<"insert">.
-
-=cut
-
-sub table { 'part_svc_column'; }
-
-=item insert
-
-Adds this service definition to the database.  If there is an error, returns
-the error, otherwise returns false.
-
-=item delete
-
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error =
-    $self->ut_numbern('columnnum')
-    || $self->ut_number('svcpart')
-    || $self->ut_alpha('columnname')
-    || $self->ut_anything('columnvalue')
-  ;
-  return $error if $error;
-
-  $self->columnflag =~ /^([DF])$/
-    or return "illegal columnflag ". $self->columnflag;
-  $self->columnflag(uc($1));
-
-  ''; #no error
-}
-
-=back
-
-=head1 VERSION
-
-$Id: part_svc_column.pm,v 1.1 2001-09-07 20:49:15 ivan Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::part_svc>, L<FS::part_pkg>, L<FS::pkg_svc>,
-L<FS::cust_svc>, L<FS::svc_acct>, L<FS::svc_forward>, L<FS::svc_domain>,
-schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/pkg_svc.pm b/FS/FS/pkg_svc.pm
deleted file mode 100644
index 3c544ffd8..000000000
--- a/FS/FS/pkg_svc.pm
+++ /dev/null
@@ -1,152 +0,0 @@
-package FS::pkg_svc;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs );
-use FS::part_pkg;
-use FS::part_svc;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::pkg_svc - Object methods for pkg_svc records
-
-=head1 SYNOPSIS
-
-  use FS::pkg_svc;
-
-  $record = new FS::pkg_svc \%hash;
-  $record = new FS::pkg_svc { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $part_pkg = $record->part_pkg;
-
-  $part_svc = $record->part_svc;
-
-=head1 DESCRIPTION
-
-An FS::pkg_svc record links a billing item definition (see L<FS::part_pkg>) to
-a service definition (see L<FS::part_svc>).  FS::pkg_svc inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item pkgpart - Billing item definition (see L<FS::part_pkg>)
-
-=item svcpart - Service definition (see L<FS::part_svc>)
-
-=item quantity - Quantity of this service definition that this billing item
-definition includes
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Create a new record.  To add the record to the database, see L<"insert">.
-
-=cut
-
-sub table { 'pkg_svc'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-
-  return "Can't change pkgpart!" if $old->pkgpart != $new->pkgpart;
-  return "Can't change svcpart!" if $old->svcpart != $new->svcpart;
-
-  $new->SUPER::replace($old);
-}
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error;
-  $error =
-    $self->ut_number('pkgpart')
-    || $self->ut_number('svcpart')
-    || $self->ut_number('quantity')
-  ;
-  return $error if $error;
-
-  return "Unknown pkgpart!" unless $self->part_pkg;
-  return "Unknown svcpart!" unless $self->part_svc;
-
-  ''; #no error
-}
-
-=item part_pkg
-
-Returns the FS::part_pkg object (see L<FS::part_pkg>).
-
-=cut
-
-sub part_pkg {
-  my $self = shift;
-  qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
-}
-
-=item part_svc
-
-Returns the FS::part_svc object (see L<FS::part_svc>).
-
-=cut
-
-sub part_svc {
-  my $self = shift;
-  qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
-}
-
-=back
-
-=head1 VERSION
-
-$Id: pkg_svc.pm,v 1.3 2002-06-10 01:39:50 khoff Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::part_pkg>, L<FS::part_svc>, schema.html from the base
-documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/port.pm b/FS/FS/port.pm
deleted file mode 100644
index 13455ca89..000000000
--- a/FS/FS/port.pm
+++ /dev/null
@@ -1,160 +0,0 @@
-package FS::port;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs );
-use FS::nas;
-use FS::session;
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::port - Object methods for port records
-
-=head1 SYNOPSIS
-
-  use FS::port;
-
-  $record = new FS::port \%hash;
-  $record = new FS::port { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $session = $port->session;
-
-=head1 DESCRIPTION
-
-An FS::port object represents an individual port on a NAS.  FS::port inherits
-from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item portnum - primary key
-
-=item ip - IP address of this port
-
-=item nasport - port number on the NAS
-
-=item nasnum - NAS this port is on - see L<FS::nas>
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new port.  To add the example to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'port'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-  my $error =
-    $self->ut_numbern('portnum')
-    || $self->ut_ipn('ip')
-    || $self->ut_numbern('nasport')
-    || $self->ut_number('nasnum');
-  ;
-  return $error if $error;
-  return "Either ip or nasport must be specified"
-    unless $self->ip || $self->nasport;
-  return "Unknown nasnum"
-    unless qsearchs('nas', { 'nasnum' => $self->nasnum } );
-  ''; #no error
-}
-
-=item session
-
-Returns the currently open session on this port, or if no session is currently
-open, the most recent session.  See L<FS::session>.
-
-=cut
-
-sub session {
-  my $self = shift;
-  qsearchs('session', { 'portnum' => $self->portnum }, '*',
-                     'ORDER BY login DESC LIMIT 1' );
-}
-
-=back
-
-=head1 VERSION
-
-$Id: port.pm,v 1.5 2001-02-14 04:33:06 ivan Exp $
-
-=head1 BUGS
-
-The author forgot to customize this manpage.
-
-The session method won't deal well if you have multiple open sessions on a
-port, for example if your RADIUS server drops B<stop> records.  Suggestions for
-how to deal with this sort of lossage welcome; should we close the session
-when we get a new session on that port?  Tag it as invalid somehow?  Close it
-one second after it was opened?  *sigh*  Maybe FS::session shouldn't let you
-create overlapping sessions, at least folks will find out their logging is
-dropping records.
-
-If you think the above refers multiple user logins you need to read the
-manpages again.
-
-=head1 SEE ALSO
-
-L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/prepay_credit.pm b/FS/FS/prepay_credit.pm
deleted file mode 100644
index 7ed9b8344..000000000
--- a/FS/FS/prepay_credit.pm
+++ /dev/null
@@ -1,126 +0,0 @@
-package FS::prepay_credit;
-
-use strict;
-use vars qw( @ISA );
-#use FS::Record qw( qsearch qsearchs );
-use FS::Record qw();
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::prepay_credit - Object methods for prepay_credit records
-
-=head1 SYNOPSIS
-
-  use FS::prepay_credit;
-
-  $record = new FS::prepay_credit \%hash;
-  $record = new FS::prepay_credit {
-    'identifier' => '4198123455512121'
-    'amount'     => '19.95',
-  };
-
-  $record = new FS::prepay_credit {
-    'identifier' => '4198123455512121'
-    'seconds'    => '7200',
-  };
-
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::table_name object represents an pre--paid credit, such as a pre-paid
-"calling card".  FS::prepay_credit inherits from FS::Record.  The following
-fields are currently supported:
-
-=over 4
-
-=item field - description
-
-=item identifier - identifier entered by the user to receive the credit
-
-=item amount - amount of the credit
-
-=item seconds - time amount of credit (see L<FS::svc_acct/seconds>)
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new pre-paid credit.  To add the example to the database, see
-L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-sub table { 'prepay_credit'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-=item check
-
-Checks all fields to make sure this is a valid pre-paid credit.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $identifier = $self->identifier;
-  $identifier =~ s/\W//g; #anything else would just confuse things
-  $self->identifier($identifier);
-
-  $self->ut_numbern('prepaynum')
-  || $self->ut_alpha('identifier')
-  || $self->ut_money('amount')
-  || $self->utnumbern('seconds')
-  ;
-
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::svc_acct>, L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
deleted file mode 100644
index d35dc883f..000000000
--- a/FS/FS/queue.pm
+++ /dev/null
@@ -1,401 +0,0 @@
-package FS::queue;
-
-use strict;
-use vars qw( @ISA @EXPORT_OK $conf $jobnums);
-use Exporter;
-use FS::UID;
-use FS::Conf;
-use FS::Record qw( qsearch qsearchs dbh );
-#use FS::queue;
-use FS::queue_arg;
-use FS::queue_depend;
-use FS::cust_svc;
-
-@ISA = qw(FS::Record);
-@EXPORT_OK = qw( joblisting );
-
-$FS::UID::callback{'FS::queue'} = sub {
-  $conf = new FS::Conf;
-};
-
-$jobnums = '';
-
-=head1 NAME
-
-FS::queue - Object methods for queue records
-
-=head1 SYNOPSIS
-
-  use FS::queue;
-
-  $record = new FS::queue \%hash;
-  $record = new FS::queue { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::queue object represents an queued job.  FS::queue inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item jobnum - primary key
-
-=item job - fully-qualified subroutine name
-
-=item status - job status
-
-=item statustext - freeform text status message
-
-=item _date - UNIX timestamp
-
-=item svcnum - optional link to service (see L<FS::cust_svc>)
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new job.  To add the example to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'queue'; }
-
-=item insert [ ARGUMENT, ARGUMENT... ]
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-If any arguments are supplied, a queue_arg record for each argument is also
-created (see L<FS::queue_arg>).
-
-=cut
-
-#false laziness w/part_export.pm
-sub insert {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  foreach my $arg ( @_ ) {
-    my $queue_arg = new FS::queue_arg ( {
-      'jobnum' => $self->jobnum,
-      'arg'    => $arg,
-    } );
-    $error = $queue_arg->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  push @$jobnums, $self->jobnum if $jobnums;
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-}
-
-=item delete
-
-Delete this record from the database.  Any corresponding queue_arg records are
-deleted as well
-
-=cut
-
-sub delete {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my @del = qsearch( 'queue_arg', { 'jobnum' => $self->jobnum } );
-  push @del, qsearch( 'queue_depend', { 'depend_jobnum' => $self->jobnum } );
-
-  my $error = $self->SUPER::delete;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  foreach my $del ( @del ) {
-    $error = $del->delete;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-}
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid job.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-  my $error =
-    $self->ut_numbern('jobnum')
-    || $self->ut_anything('job')
-    || $self->ut_numbern('_date')
-    || $self->ut_enum('status',['', qw( new locked failed )])
-    || $self->ut_anything('statustext')
-    || $self->ut_numbern('svcnum')
-  ;
-  return $error if $error;
-
-  $error = $self->ut_foreign_keyn('svcnum', 'cust_svc', 'svcnum');
-  $self->svcnum('') if $error;
-
-  $self->status('new') unless $self->status;
-  $self->_date(time) unless $self->_date;
-
-  ''; #no error
-}
-
-=item args
-
-Returns a list of the arguments associated with this job.
-
-=cut
-
-sub args {
-  my $self = shift;
-  map $_->arg, qsearch( 'queue_arg',
-                        { 'jobnum' => $self->jobnum },
-                        '',
-                        'ORDER BY argnum'
-                      );
-}
-
-=item cust_svc
-
-Returns the FS::cust_svc object associated with this job, if any.
-
-=cut
-
-sub cust_svc {
-  my $self = shift;
-  qsearchs('cust_svc', { 'svcnum' => $self->svcnum } );
-}
-
-=item queue_depend
-
-Returns the FS::queue_depend objects associated with this job, if any.
-
-=cut
-
-sub queue_depend {
-  my $self = shift;
-  qsearch('queue_depend', { 'jobnum' => $self->jobnum } );
-}
-
-
-=item depend_insert OTHER_JOBNUM
-
-Inserts a dependancy for this job - it will not be run until the other job
-specified completes.  If there is an error, returns the error, otherwise
-returns false.
-
-When using job dependancies, you should wrap the insertion of all relevant jobs
-in a database transaction.  
-
-=cut
-
-sub depend_insert {
-  my($self, $other_jobnum) = @_;
-  my $queue_depend = new FS::queue_depend ( {
-    'jobnum'        => $self->jobnum,
-    'depend_jobnum' => $other_jobnum,
-  } );
-  $queue_depend->insert;
-}
-
-=back
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item joblisting HASHREF NOACTIONS
-
-=cut
-
-sub joblisting {
-  my($hashref, $noactions) = @_;
-
-  use Date::Format;
-  use HTML::Entities;
-  use FS::CGI;
-
-  my @queue = qsearch( 'queue', $hashref );
-  return '' unless scalar(@queue);
-
-  my $p = FS::CGI::popurl(2);
-
-  my $html = qq!<FORM ACTION="$p/misc/queue.cgi" METHOD="POST">!.
-             FS::CGI::table(). <<END;
-      <TR>
-        <TH COLSPAN=2>Job</TH>
-        <TH>Args</TH>
-        <TH>Date</TH>
-        <TH>Status</TH>
-END
-  $html .= '<TH>Account</TH>' unless $hashref->{svcnum};
-  $html .= '</TR>';
-
-  my $dangerous = $conf->exists('queue_dangerous_controls');
-
-  my $areboxes = 0;
-
-  foreach my $queue ( sort { 
-    $a->getfield('jobnum') <=> $b->getfield('jobnum')
-  } @queue ) {
-    my $queue_hashref = $queue->hashref;
-    my $jobnum = $queue->jobnum;
-
-    my $args;
-    if ( $dangerous || $queue->job !~ /^FS::part_export::/ || !$noactions ) {
-      $args = encode_entities( join(' ',
-        map { length($_)<54 ? $_ : substr($_,0,32)."..."  } $queue->args #1&g
-      ) );
-    } else {
-      $args = '';
-    }
-
-    my $date = time2str( "%a %b %e %T %Y", $queue->_date );
-    my $status = $queue->status;
-    $status .= ': '. $queue->statustext if $queue->statustext;
-    my @queue_depend = $queue->queue_depend;
-    $status .= ' (waiting for '.
-               join(', ', map { $_->depend_jobnum } @queue_depend ). 
-               ')'
-      if @queue_depend;
-    my $changable = $dangerous
-         || ( ! $noactions && $status =~ /^failed/ || $status =~ /^locked/ );
-    if ( $changable ) {
-      $status .=
-        qq! (&nbsp;<A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=new">retry</A>&nbsp;|!.
-        qq!&nbsp;<A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=del">remove</A>&nbsp;)!;
-    }
-    my $cust_svc = $queue->cust_svc;
-
-    $html .= <<END;
-      <TR>
-        <TD>$jobnum</TD>
-        <TD>$queue_hashref->{job}</TD>
-        <TD>$args</TD>
-        <TD>$date</TD>
-        <TD>$status</TD>
-END
-
-    unless ( $hashref->{svcnum} ) {
-      my $account;
-      if ( $cust_svc ) {
-        my $table = $cust_svc->part_svc->svcdb;
-        my $label = ( $cust_svc->label )[1];
-        $account = qq!<A HREF="../view/$table.cgi?!. $queue->svcnum.
-                   qq!">$label</A>!;
-      } else {
-        $account = '';
-      }
-      $html .= "<TD>$account</TD>";
-    }
-
-    if ( $changable ) {
-      $areboxes=1;
-      $html .=
-        qq!<TD><INPUT NAME="jobnum$jobnum" TYPE="checkbox" VALUE="1"></TD>!;
-
-    }
-
-    $html .= '</TR>';
-
-}
-
-  $html .= '</TABLE>';
-
-  if ( $areboxes ) {
-    $html .= '<BR><INPUT TYPE="submit" NAME="action" VALUE="retry selected">'.
-             '<INPUT TYPE="submit" NAME="action" VALUE="remove selected"><BR>';
-  }
-
-  $html;
-
-}
-
-=back
-
-=head1 VERSION
-
-$Id: queue.pm,v 1.15 2002-07-02 06:48:59 ivan Exp $
-
-=head1 BUGS
-
-$jobnums global
-
-=head1 SEE ALSO
-
-L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/queue_arg.pm b/FS/FS/queue_arg.pm
deleted file mode 100644
index 08fe47341..000000000
--- a/FS/FS/queue_arg.pm
+++ /dev/null
@@ -1,121 +0,0 @@
-package FS::queue_arg;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::queue_arg - Object methods for queue_arg records
-
-=head1 SYNOPSIS
-
-  use FS::queue_arg;
-
-  $record = new FS::queue_arg \%hash;
-  $record = new FS::queue_arg { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::queue_arg object represents job argument.  FS::queue_arg inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item argnum - primary key
-
-=item jobnum - see L<FS::queue>
-
-=item arg - argument
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new argument.  To add the example to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'queue_arg'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid argument.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-  my $error =
-    $self->ut_numbern('argnum')
-    || $self->ut_numbern('jobnum')
-    || $self->ut_anything('arg')
-  ;
-  return $error if $error;
-
-  ''; #no error
-}
-
-=back
-
-=head1 VERSION
-
-$Id: queue_arg.pm,v 1.1 2001-09-11 00:08:18 ivan Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::queue>, L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/queue_depend.pm b/FS/FS/queue_depend.pm
deleted file mode 100644
index 4a4e3c55c..000000000
--- a/FS/FS/queue_depend.pm
+++ /dev/null
@@ -1,120 +0,0 @@
-package FS::queue_depend;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-use FS::queue;
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::queue_depend - Object methods for queue_depend records
-
-=head1 SYNOPSIS
-
-  use FS::queue_depend;
-
-  $record = new FS::queue_depend \%hash;
-  $record = new FS::queue_depend { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::queue_depend object represents an job dependancy.  FS::queue_depend
-inherits from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item dependnum - primary key
-
-=item jobnum - source jobnum (see L<FS::queue>).
-
-=item depend_jobnum - dependancy jobnum (see L<FS::queue>)
-
-=back
-
-The job specified by B<jobnum> depends on the job specified B<depend_jobnum> -
-the B<jobnum> job will not be run until the B<depend_jobnum> job has completed
-sucessfully (or manually removed).
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new dependancy.  To add the dependancy to the database, see
-L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'queue_depend'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid dependancy.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  $self->ut_numbern('dependnum')
-    || $self->ut_foreign_key('jobnum',        'queue', 'jobnum')
-    || $self->ut_foreign_key('depend_jobnum', 'queue', 'jobnum')
-  ;
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::queue>, L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/raddb.pm b/FS/FS/raddb.pm
deleted file mode 100644
index 497d98450..000000000
--- a/FS/FS/raddb.pm
+++ /dev/null
@@ -1,1091 +0,0 @@
-package FS::raddb;
-use vars qw(%attrib);
-
-%attrib = (
-  'ascend_bi_directional_au' => 'Ascend-Bi-Directional-Auth',
-  'h323_connect_time' => 'h323-connect-time',
-  'connect_rate' => 'Connect-Rate',
-  'bind_auth_service_grp' => 'Bind_Auth_Service_Grp',
-  'usr_callback_type' => 'USR-Callback-Type',
-  'erx_primary_wins' => 'ERX-Primary-Wins',
-  'ascend_x25_x121_address' => 'Ascend-X25-X121-Address',
-  'usr_log_filter_packets' => 'USR-Log-Filter-Packets',
-  'annex_addr_resolution_pr' => 'Annex-Addr-Resolution-Protocol',
-  'usr_ip_rip_simple_auth_p' => 'USR-IP-RIP-Simple-Auth-Password',
-  'dialback_name' => 'Dialback-Name',
-  'x_ascend_fr_dce_n392' => 'X-Ascend-FR-DCE-N392',
-  'usr_host_type' => 'USR-Host-Type',
-  'le_modem_info' => 'LE-Modem-Info',
-  'x_ascend_menu_selector' => 'X-Ascend-Menu-Selector',
-  'x_ascend_fr_dce_n393' => 'X-Ascend-FR-DCE-N393',
-  'ascend_ip_direct' => 'Ascend-IP-Direct',
-  'x_ascend_pre_output_octe' => 'X-Ascend-Pre-Output-Octets',
-  'x_ascend_ft1_caller' => 'X-Ascend-FT1-Caller',
-  'usr_last_callers_number_' => 'USR-Last-Callers-Number-ANI',
-  'usr_rmmie_product_code' => 'USR-RMMIE-Product-Code',
-  'usr_igmp_robustness' => 'USR-IGMP-Robustness',
-  'ms_chap2_success' => 'MS-CHAP2-Success',
-  'ascend_home_agent_passwo' => 'Ascend-Home-Agent-Password',
-  'acc_bridging_support' => 'Acc-Bridging-Support',
-  'annex_transmit_speed' => 'Annex-Transmit-Speed',
-  'old_password' => 'Old-Password',
-  'x_ascend_metric' => 'X-Ascend-Metric',
-  'acc_clearing_location' => 'Acc-Clearing-Location',
-  'ascend_multilink_id' => 'Ascend-Multilink-ID',
-  'ascend_egress_enabled' => 'Ascend-Egress-Enabled',
-  'usr_bridging' => 'USR-Bridging',
-  'ascend_assign_ip_server' => 'Ascend-Assign-IP-Server',
-  'acc_dns_server_sec' => 'Acc-Dns-Server-Sec',
-  'ascend_home_agent_ip_add' => 'Ascend-Home-Agent-IP-Addr',
-  'usr_dnis_reauthenticatio' => 'USR-DNIS-ReAuthentication',
-  'acc_modem_error_protocol' => 'Acc-Modem-Error-Protocol',
-  'ascend_backup' => 'Ascend-Backup',
-  'usr_connect_time' => 'USR-Connect-Time',
-  'ascend_cbcp_mode' => 'Ascend-CBCP-Mode',
-  'usr_rmmie_x2_status' => 'USR-RMMIE-x2-Status',
-  'ascend_multicast_gleave_' => 'Ascend-Multicast-GLeave-Delay',
-  'erx_ingress_statistics' => 'ERX-Ingress-Statistics',
-  'cisco_nas_port' => 'Cisco-NAS-Port',
-  'le_admin_group' => 'LE-Admin-Group',
-  'annex_mrru' => 'Annex-MRRU',
-  'x_ascend_add_seconds' => 'X-Ascend-Add-Seconds',
-  'ascend_token_expiry' => 'Ascend-Token-Expiry',
-  'usr_igmp_maximum_respons' => 'USR-IGMP-Maximum-Response-Time',
-  'ascend_calling_id_presen' => 'Ascend-Calling-Id-Presentatn',
-  'connect_info' => 'Connect-Info',
-  'ascend_access_intercept_' => 'Ascend-Access-Intercept-LEA',
-  'x_ascend_dba_monitor' => 'X-Ascend-DBA-Monitor',
-  'client_dns_pri' => 'Client_DNS_Pri',
-  'ip_host_addr' => 'Ip_Host_Addr',
-  'callback_id' => 'Callback-Id',
-  'acct_mcast_out_octets' => 'Acct_Mcast_Out_Octets',
-  'acct_input_octets_64' => 'Acct_Input_Octets_64',
-  'tunnel_function' => 'Tunnel_Function',
-  'ascend_fr_direct_profile' => 'Ascend-FR-Direct-Profile',
-  'h323_incoming_conf_id' => 'h323-incoming-conf-id',
-  'ascend_ppp_vj_1172' => 'Ascend-PPP-VJ-1172',
-  'ms_new_arap_password' => 'MS-New-ARAP-Password',
-  'h323_voice_quality' => 'h323-voice-quality',
-  'framed_appletalk_network' => 'Framed-AppleTalk-Network',
-  'bind_int_interface_name' => 'Bind_Int_Interface_Name',
-  'event_timestamp' => 'Event-Timestamp',
-  'ascend_bir_enable' => 'Ascend-BIR-Enable',
-  'usr_fallback_enabled' => 'USR-Fallback-Enabled',
-  'ascend_dhcp_pool_number' => 'Ascend-DHCP-Pool-Number',
-  'acct_session_id' => 'Acct-Session-Id',
-  'ascend_private_route_req' => 'Ascend-Private-Route-Required',
-  'usr_rmmie_pwrlvl_farecho' => 'USR-RMMIE-PwrLvl-FarEcho-Canc',
-  'usr_at_input_filter' => 'USR-AT-Input-Filter',
-  'erx_egress_statistics' => 'ERX-Egress-Statistics',
-  'x_ascend_call_type' => 'X-Ascend-Call-Type',
-  'acct_tunnel_client_endpo' => 'Acct-Tunnel-Client-Endpoint',
-  'x_ascend_assign_ip_clien' => 'X-Ascend-Assign-IP-Client',
-  'ascend_if_netmask' => 'Ascend-IF-Netmask',
-  'ascend_dhcp_maximum_leas' => 'Ascend-DHCP-Maximum-Leases',
-  'usr_at_output_filter' => 'USR-AT-Output-Filter',
-  'usr_rad_dvmrp_metric' => 'USR-Rad-Dvmrp-Metric',
-  'rate_limit_rate' => 'Rate_Limit_Rate',
-  'prefix' => 'Prefix',
-  'ascend_x25_pad_banner' => 'Ascend-X25-Pad-Banner',
-  'usr_rmmie_rcv_pwrlvl_375' => 'USR-RMMIE-Rcv-PwrLvl-3750Hz',
-  'x_ascend_user_acct_key' => 'X-Ascend-User-Acct-Key',
-  'group_name' => 'Group-Name',
-  'ascend_receive_secret' => 'Ascend-Receive-Secret',
-  'reply_message' => 'Reply-Message',
-  'le_nat_sess_dir_fail_act' => 'LE-NAT-Sess-Dir-Fail-Action',
-  'framed_callback_id' => 'Framed-Callback-Id',
-  'cisco_disconnect_cause' => 'Cisco-Disconnect-Cause',
-  'stripped_user_name' => 'Stripped-User-Name',
-  'annex_keypress_timeout' => 'Annex-Keypress-Timeout',
-  'annex_receive_speed' => 'Annex-Receive-Speed',
-  'ms_chap_domain' => 'MS-CHAP-Domain',
-  'ascend_atm_connect_group' => 'Ascend-ATM-Connect-Group',
-  'usr_send_name' => 'USR-Send-Name',
-  'usr_local_framed_ip_addr' => 'USR-Local-Framed-IP-Addr',
-  'erx_alternate_cli_vroute' => 'ERX-Alternate-Cli-Vrouter-Name',
-  'usr_fallback_limit' => 'USR-Fallback-Limit',
-  'ascend_pri_number_type' => 'Ascend-PRI-Number-Type',
-  'x_ascend_minimum_channel' => 'X-Ascend-Minimum-Channels',
-  'x_ascend_fr_direct_dlci' => 'X-Ascend-FR-Direct-DLCI',
-  'ascend_fr_link_mgt' => 'Ascend-FR-Link-Mgt',
-  'annex_host_allow' => 'Annex-Host-Allow',
-  'x_ascend_force_56' => 'X-Ascend-Force-56',
-  'police_burst' => 'Police_Burst',
-  'pvc_profile_name' => 'PVC_Profile_Name',
-  'ms_filter' => 'MS-Filter',
-  'rate_limit_burst' => 'Rate_Limit_Burst',
-  'ascend_number_sessions' => 'Ascend-Number-Sessions',
-  'cisco_call_filter' => 'Cisco-Call-Filter',
-  'erx_igmp_enable' => 'ERX-Igmp-Enable',
-  'ascend_filter_required' => 'Ascend-Filter-Required',
-  'erx_cli_allow_all_vr_acc' => 'ERX-Cli-Allow-All-VR-Access',
-  'acc_callback_delay' => 'Acc-Callback-Delay',
-  'usr_default_dte_data_rat' => 'USR-Default-DTE-Data-Rate',
-  'le_ip_pool' => 'LE-IP-Pool',
-  'cisco_pre_output_packets' => 'Cisco-Pre-Output-Packets',
-  'x_ascend_group' => 'X-Ascend-Group',
-  'usr_channel_connected_to' => 'USR-Channel-Connected-To',
-  'usr_ipx_rip_output_filte' => 'USR-IPX-RIP-Output-Filter',
-  'usr_esn' => 'USR-ESN',
-  'annex_user_level' => 'Annex-User-Level',
-  'x_ascend_primary_home_ag' => 'X-Ascend-Primary-Home-Agent',
-  'no_such_attribute' => 'No-Such-Attribute',
-  'x_ascend_pri_number_type' => 'X-Ascend-PRI-Number-Type',
-  'ms_mppe_send_key' => 'MS-MPPE-Send-Key',
-  'usr_actual_voltage' => 'USR-Actual-Voltage',
-  'annex_acct_servers' => 'Annex-Acct-Servers',
-  'ascend_handle_ipx' => 'Ascend-Handle-IPX',
-  'cisco_xmit_rate' => 'Cisco-Xmit-Rate',
-  'acc_service_profile' => 'Acc-Service-Profile',
-  'x_ascend_ara_pw' => 'X-Ascend-Ara-PW',
-  'ascend_ckt_type' => 'Ascend-Ckt-Type',
-  'cisco_data_rate' => 'Cisco-Data-Rate',
-  'group' => 'Group',
-  'nas_port' => 'NAS-Port',
-  'usr_ipx_call_output_filt' => 'USR-IPX-Call-Output-Filter',
-  'tunnel_type' => 'Tunnel-Type',
-  'usr_rmmie_manufacturer_i' => 'USR-RMMIE-Manufacturer-ID',
-  'user_name_is_star' => 'User-Name-Is-Star',
-  'usr_call_arrival_in_gmt' => 'USR-Call-Arrival-in-GMT',
-  'x_ascend_number_sessions' => 'X-Ascend-Number-Sessions',
-  'ascend_send_auth' => 'Ascend-Send-Auth',
-  'user_service_type' => 'User-Service-Type',
-  'annex_cli_filter' => 'Annex-CLI-Filter',
-  'erx_cli_initial_access_l' => 'ERX-Cli-Initial-Access-Level',
-  'ascend_call_direction' => 'Ascend-Call-Direction',
-  'usr_chassis_temp_thresho' => 'USR-Chassis-Temp-Threshold',
-  'usr_pw_usr_ofilter_ipx' => 'USR-PW_USR_OFilter_IPX',
-  'tunnel_session_auth' => 'Tunnel_Session_Auth',
-  'x_ascend_connect_progres' => 'X-Ascend-Connect-Progress',
-  'ascend_atm_connect_vci' => 'Ascend-ATM-Connect-Vci',
-  'x_ascend_maximum_call_du' => 'X-Ascend-Maximum-Call-Duration',
-  'usr_rmmie_planned_discon' => 'USR-RMMIE-Planned-Disconnect',
-  'x_ascend_fr_dte_n392' => 'X-Ascend-FR-DTE-N392',
-  'login_host' => 'Login-Host',
-  'ascend_user_acct_host' => 'Ascend-User-Acct-Host',
-  'x_ascend_fr_dte_n393' => 'X-Ascend-FR-DTE-N393',
-  'acc_tunnel_secret' => 'Acc-Tunnel-Secret',
-  'usr_at_rtmp_input_filter' => 'USR-AT-RTMP-Input-Filter',
-  'framed_protocol' => 'Framed-Protocol',
-  'login_callback_number' => 'Login-Callback-Number',
-  'ascend_dsl_rate_type' => 'Ascend-Dsl-Rate-Type',
-  'ascend_pre_output_packet' => 'Ascend-Pre-Output-Packets',
-  'proxy_state' => 'Proxy-State',
-  'usr_pw_usr_ofilter_ip' => 'USR-PW_USR_OFilter_IP',
-  'cisco_data_filter' => 'Cisco-Data-Filter',
-  'cisco_target_util' => 'Cisco-Target-Util',
-  'usr_ids0_call_type' => 'USR-IDS0-Call-Type',
-  'usr_blocks_resent' => 'USR-Blocks-Resent',
-  'usr_terminal_type' => 'USR-Terminal-Type',
-  'ascend_history_weigh_typ' => 'Ascend-History-Weigh-Type',
-  'framed_routing' => 'Framed-Routing',
-  'ascend_client_assign_dns' => 'Ascend-Client-Assign-DNS',
-  'ascend_atm_group' => 'Ascend-ATM-Group',
-  'bind_bypass_bypass' => 'Bind_Bypass_Bypass',
-  'le_ip_gateway' => 'LE-IP-Gateway',
-  'cisco_ip_pool_definition' => 'Cisco-IP-Pool-Definition',
-  'x_ascend_maximum_time' => 'X-Ascend-Maximum-Time',
-  'usr_request_type' => 'USR-Request-Type',
-  'usr_call_arrival_time' => 'USR-Call-Arrival-Time',
-  'tunnel_domain' => 'Tunnel_Domain',
-  'ms_chap_nt_enc_pw' => 'MS-CHAP-NT-Enc-PW',
-  'shiva_calling_number' => 'Shiva-Calling-Number',
-  'ip_address_pool_name' => 'Ip_Address_Pool_Name',
-  'erx_secondary_dns' => 'ERX-Secondary-Dns',
-  'x_ascend_pre_input_octet' => 'X-Ascend-Pre-Input-Octets',
-  'ascend_home_agent_udp_po' => 'Ascend-Home-Agent-UDP-Port',
-  'le_nat_outsource_inmap' => 'LE-NAT-Outsource-Inmap',
-  'x_ascend_home_agent_pass' => 'X-Ascend-Home-Agent-Password',
-  'tunnel_password' => 'Tunnel-Password',
-  'usr_compression_type' => 'USR-Compression-Type',
-  'usr_connect_speed' => 'USR-Connect-Speed',
-  'usr_connect_time_limit' => 'USR-Connect-Time-Limit',
-  'arap_challenge_response' => 'ARAP-Challenge-Response',
-  'ms_link_utilization_thre' => 'MS-Link-Utilization-Threshold',
-  'usr_mp_edo' => 'USR-MP-EDO',
-  'usr_primary_nbns_server' => 'USR-Primary_NBNS_Server',
-  'usr_imsi' => 'USR-IMSI',
-  'ascend_fr_direct' => 'Ascend-FR-Direct',
-  'ascend_vrouter_name' => 'Ascend-VRouter-Name',
-  'ascend_preempt_limit' => 'Ascend-Preempt-Limit',
-  'ascend_ip_pool_definitio' => 'Ascend-IP-Pool-Definition',
-  'h323_gw_id' => 'h323-gw-id',
-  'usr_framed_ipx_route' => 'USR-Framed-IPX-Route',
-  'x_ascend_maximum_channel' => 'X-Ascend-Maximum-Channels',
-  'login_lat_node' => 'Login-LAT-Node',
-  'acct_session_time' => 'Acct-Session-Time',
-  'ascend_disconnect_cause' => 'Ascend-Disconnect-Cause',
-  'ms_mppe_encryption_polic' => 'MS-MPPE-Encryption-Policy',
-  'ms_ras_version' => 'MS-RAS-Version',
-  'class' => 'Class',
-  'caller_id' => 'Caller-ID',
-  'ascend_access_intercept_' => 'Ascend-Access-Intercept-Log',
-  'ascend_service_type' => 'Ascend-Service-Type',
-  'ascend_h323_dialed_time' => 'Ascend-H323-Dialed-Time',
-  'exec_program_wait' => 'Exec-Program-Wait',
-  'ascend_x25_nui_password_' => 'Ascend-X25-Nui-Password-Prompt',
-  'ascend_appletalk_peer_mo' => 'Ascend-Appletalk-Peer-Mode',
-  'login_lat_group' => 'Login-LAT-Group',
-  'strip_user_name' => 'Strip-User-Name',
-  'nas_ip_address' => 'NAS-IP-Address',
-  'ascend_maximum_time' => 'Ascend-Maximum-Time',
-  'erx_atm_pcr' => 'ERX-Atm-PCR',
-  'ascend_client_primary_dn' => 'Ascend-Client-Primary-DNS',
-  'auth_type' => 'Auth-Type',
-  'ascend_secondary_home_ag' => 'Ascend-Secondary-Home-Agent',
-  'x_ascend_idle_limit' => 'X-Ascend-Idle-Limit',
-  'ms_ras_vendor' => 'MS-RAS-Vendor',
-  'ascend_pre_input_packets' => 'Ascend-Pre-Input-Packets',
-  'ascend_bridge' => 'Ascend-Bridge',
-  'h323_redirect_number' => 'h323-redirect-number',
-  'usr_simplified_mnp_level' => 'USR-Simplified-MNP-Levels',
-  'annex_edo' => 'Annex-EDO',
-  'acc_nbns_server_sec' => 'Acc-Nbns-Server-Sec',
-  'ascend_cbcp_trunk_group' => 'Ascend-CBCP-Trunk-Group',
-  'x_ascend_data_svc' => 'X-Ascend-Data-Svc',
-  'le_terminate_detail' => 'LE-Terminate-Detail',
-  'acct_output_octets' => 'Acct-Output-Octets',
-  'usr_calling_party_number' => 'USR-Calling-Party-Number',
-  'x_ascend_dhcp_maximum_le' => 'X-Ascend-DHCP-Maximum-Leases',
-  'ascend_force_56' => 'Ascend-Force-56',
-  'shiva_acct_serv_switch' => 'Shiva-Acct-Serv-Switch',
-  'tunnel_algorithm' => 'Tunnel_Algorithm',
-  'usr_max_channels' => 'USR-Max-Channels',
-  'usr_port_tap_priority' => 'USR-Port-Tap-Priority',
-  'le_nat_outmap' => 'LE-NAT-Outmap',
-  'usr_call_connecting_time' => 'USR-Call-Connecting-Time',
-  'usr_supports_tags' => 'USR-Supports-Tags',
-  'idle_timeout' => 'Idle-Timeout',
-  'usr_ip_rip_input_filter' => 'USR-IP-RIP-Input-Filter',
-  'erx_ingress_policy_name' => 'ERX-Ingress-Policy-Name',
-  'usr_pw_cutoff' => 'USR-PW_Cutoff',
-  'usr_channel_expansion' => 'USR-Channel-Expansion',
-  'x_ascend_send_secret' => 'X-Ascend-Send-Secret',
-  'h323_call_origin' => 'h323-call-origin',
-  'h323_preferred_lang' => 'h323-preferred-lang',
-  'ascend_base_channel_coun' => 'Ascend-Base-Channel-Count',
-  'bind_auth_context' => 'Bind_Auth_Context',
-  'ascend_calling_id_number' => 'Ascend-Calling-Id-Number-Plan',
-  'ascend_modem_shelfno' => 'Ascend-Modem-ShelfNo',
-  'tunnel_police_burst' => 'Tunnel_Police_Burst',
-  'pvc_circuit_padding' => 'PVC_Circuit_Padding',
-  'acc_ml_call_threshold' => 'Acc-ML-Call-Threshold',
-  'usr_end_time' => 'USR-End-Time',
-  'usr_ipx' => 'USR-IPX',
-  'ms_primary_dns_server' => 'MS-Primary-DNS-Server',
-  'ascend_dsl_upstream_limi' => 'Ascend-Dsl-Upstream-Limit',
-  'usr_blocks_sent' => 'USR-Blocks-Sent',
-  'bind_dot1q_vlan_tag_id' => 'Bind_Dot1q_Vlan_Tag_Id',
-  'ascend_private_route' => 'Ascend-Private-Route',
-  'usr_back_channel_data_ra' => 'USR-Back-Channel-Data-Rate',
-  'ascend_dropped_packets' => 'Ascend-Dropped-Packets',
-  'cisco_route_ip' => 'Cisco-Route-IP',
-  'nas_identifier' => 'NAS-Identifier',
-  'ascend_presession_time' => 'Ascend-PreSession-Time',
-  'usr_call_type' => 'USR-Call-Type',
-  'usr_acct_reason_code' => 'USR-Acct-Reason-Code',
-  'acc_dialout_auth_passwor' => 'Acc-Dialout-Auth-Password',
-  'acc_connect_tx_speed' => 'Acc-Connect-Tx-Speed',
-  'cisco_pre_input_octets' => 'Cisco-Pre-Input-Octets',
-  'x_ascend_send_passwd' => 'X-Ascend-Send-Passwd',
-  'ascend_bir_bridge_group' => 'Ascend-BIR-Bridge-Group',
-  'ascend_fr_profile_name' => 'Ascend-FR-Profile-Name',
-  'ascend_group' => 'Ascend-Group',
-  'crypt_password' => 'Crypt-Password',
-  'usr_port_tap_address' => 'USR-Port-Tap-Address',
-  'le_nat_outsource_outmap' => 'LE-NAT-Outsource-Outmap',
-  'usr_vpn_encrypter' => 'USR-VPN-Encrypter',
-  'usr_blocks_received' => 'USR-Blocks-Received',
-  'tunnel_group' => 'Tunnel_Group',
-  'ascend_shared_profile_en' => 'Ascend-Shared-Profile-Enable',
-  'replicate_to_realm' => 'Replicate-To-Realm',
-  'usr_mobile_ip_address' => 'USR-Mobile-IP-Address',
-  'x_ascend_authen_alias' => 'X-Ascend-Authen-Alias',
-  'ascend_fr_linkup' => 'Ascend-FR-LinkUp',
-  'tunnel_rate_limit_rate' => 'Tunnel_Rate_Limit_Rate',
-  'acc_access_community' => 'Acc-Access-Community',
-  'x_ascend_presession_time' => 'X-Ascend-PreSession-Time',
-  'ms_chap_cpw_1' => 'MS-CHAP-CPW-1',
-  'ms_chap_cpw_2' => 'MS-CHAP-CPW-2',
-  'erx_primary_dns' => 'ERX-Primary-Dns',
-  'ascend_fr_circuit_name' => 'Ascend-FR-Circuit-Name',
-  'ascend_token_immediate' => 'Ascend-Token-Immediate',
-  'cisco_idle_limit' => 'Cisco-Idle-Limit',
-  'usr_speed_of_connection' => 'USR-Speed-Of-Connection',
-  'shiva_links_in_bundle' => 'Shiva-Links-In-Bundle',
-  'x_ascend_fr_profile_name' => 'X-Ascend-FR-Profile-Name',
-  'cisco_multilink_id' => 'Cisco-Multilink-ID',
-  'x_ascend_preempt_limit' => 'X-Ascend-Preempt-Limit',
-  'ascend_assign_ip_client' => 'Ascend-Assign-IP-Client',
-  'usr_iwf_ip_address' => 'USR-IWF-IP-Address',
-  'acct_unique_session_id' => 'Acct-Unique-Session-Id',
-  'framed_pool' => 'Framed-Pool',
-  'usr_igmp_version' => 'USR-IGMP-Version',
-  'tunnel_max_tunnels' => 'Tunnel_Max_Tunnels',
-  'annex_unauthenticated_ti' => 'Annex-Unauthenticated-Time',
-  'bg_path_cost' => 'BG_Path_Cost',
-  'ascend_client_assign_win' => 'Ascend-Client-Assign-WINS',
-  'x_ascend_dial_number' => 'X-Ascend-Dial-Number',
-  'cisco_maximum_channels' => 'Cisco-Maximum-Channels',
-  'usr_pw_framed_routing_v2' => 'USR-PW_Framed_Routing_V2',
-  'usr_channel_decrement' => 'USR-Channel-Decrement',
-  'x_ascend_route_ipx' => 'X-Ascend-Route-IPX',
-  'port_limit' => 'Port-Limit',
-  'ascend_dsl_downstream_li' => 'Ascend-Dsl-Downstream-Limit',
-  'ascend_ip_tos_precedence' => 'Ascend-IP-TOS-Precedence',
-  'usr_multicast_receive' => 'USR-Multicast-Receive',
-  'usr_auth_mode' => 'USR-Auth-Mode',
-  'expiration' => 'Expiration',
-  'x_ascend_fr_circuit_name' => 'X-Ascend-FR-Circuit-Name',
-  'x_ascend_token_immediate' => 'X-Ascend-Token-Immediate',
-  'ascend_ft1_caller' => 'Ascend-FT1-Caller',
-  'shiva_event_flags' => 'Shiva-Event-Flags',
-  'framed_netmask' => 'Framed-Netmask',
-  'ascend_minimum_channels' => 'Ascend-Minimum-Channels',
-  'acc_ml_damping_factor' => 'Acc-ML-Damping-Factor',
-  'bind_sub_password' => 'Bind_Sub_Password',
-  'ascend_ip_tos_apply_to' => 'Ascend-IP-TOS-Apply-To',
-  'x_ascend_home_agent_udp_' => 'X-Ascend-Home-Agent-UDP-Port',
-  'x_ascend_menu_item' => 'X-Ascend-Menu-Item',
-  'ascend_session_type' => 'Ascend-Session-Type',
-  'usr_pw_packet' => 'USR-PW_Packet',
-  'session' => 'Session',
-  'usr_mic' => 'USR-MIC',
-  'usr_line_reversals' => 'USR-Line-Reversals',
-  'assigned_ip_address' => 'Assigned_IP_Address',
-  'cisco_ip_direct' => 'Cisco-IP-Direct',
-  'le_ipsec_log_options' => 'LE-IPSec-Log-Options',
-  'tunnel_rate_limit_burst' => 'Tunnel_Rate_Limit_Burst',
-  'x_ascend_assign_ip_globa' => 'X-Ascend-Assign-IP-Global-Pool',
-  'x_ascend_inc_channel_cou' => 'X-Ascend-Inc-Channel-Count',
-  'h323_return_code' => 'h323-return-code',
-  'shiva_disconnect_reason' => 'Shiva-Disconnect-Reason',
-  'filter_id' => 'Filter-Id',
-  'usr_appletalk_network_ra' => 'USR-Appletalk-Network-Range',
-  'ascend_temporary_rtes' => 'Ascend-Temporary-Rtes',
-  'ascend_h323_conference_i' => 'Ascend-H323-Conference-Id',
-  'h323_billing_model' => 'h323-billing-model',
-  'usr_bearer_capabilities' => 'USR-Bearer-Capabilities',
-  'framed_appletalk_zone' => 'Framed-AppleTalk-Zone',
-  'usr_harc_disconnect_code' => 'USR-HARC-Disconnect-Code',
-  'usr_ipx_rip_input_filter' => 'USR-IPX-RIP-Input-Filter',
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Bound',
-  'ascend_pw_lifetime' => 'Ascend-PW-Lifetime',
-  'acc_dialout_auth_usernam' => 'Acc-Dialout-Auth-Username',
-  'ascend_x25_pad_x3_parame' => 'Ascend-X25-Pad-X3-Parameters',
-  'bind_dot1q_slot' => 'Bind_Dot1q_Slot',
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-RtLim',
-  'x_ascend_multicast_clien' => 'X-Ascend-Multicast-Client',
-  'ascend_authen_alias' => 'Ascend-Authen-Alias',
-  'ascend_dec_channel_count' => 'Ascend-Dec-Channel-Count',
-  'dhcp_max_leases' => 'DHCP_Max_Leases',
-  'shiva_called_number' => 'Shiva-Called-Number',
-  'annex_tunnel_authen_mode' => 'Annex-Tunnel-Authen-Mode',
-  'usr_call_error_code' => 'USR-Call-Error-Code',
-  'x_ascend_user_acct_type' => 'X-Ascend-User-Acct-Type',
-  'ascend_atm_connect_vpi' => 'Ascend-ATM-Connect-Vpi',
-  'ascend_x25_pad_x3_profil' => 'Ascend-X25-Pad-X3-Profile',
-  'usr_mobileip_home_agent_' => 'USR-MobileIP-Home-Agent-Address',
-  'suffix' => 'Suffix',
-  'bind_tun_context' => 'Bind_Tun_Context',
-  'x_ascend_ppp_address' => 'X-Ascend-PPP-Address',
-  'usr_dtr_false_timeout' => 'USR-DTR-False-Timeout',
-  'usr_final_rx_link_data_r' => 'USR-Final-Rx-Link-Data-Rate',
-  'ms_chap_error' => 'MS-CHAP-Error',
-  'x_ascend_home_agent_ip_a' => 'X-Ascend-Home-Agent-IP-Addr',
-  'ascend_data_svc' => 'Ascend-Data-Svc',
-  'usr_rmmie_pwrlvl_noise_l' => 'USR-RMMIE-PwrLvl-Noise-Lvl',
-  'usr_dtr_true_timeout' => 'USR-DTR-True-Timeout',
-  'context_name' => 'Context-Name',
-  'usr_card_type' => 'USR-Card-Type',
-  'ascend_fr_link_status_dl' => 'Ascend-FR-Link-Status-DLCI',
-  'annex_sec_profile_index' => 'Annex-Sec-Profile-Index',
-  'usr_pw_usr_ofilter_sap' => 'USR-PW_USR_OFilter_SAP',
-  'tunnel_medium_type' => 'Tunnel-Medium-Type',
-  'x_ascend_require_auth' => 'X-Ascend-Require-Auth',
-  'ascend_connect_progress' => 'Ascend-Connect-Progress',
-  'x_ascend_modem_shelfno' => 'X-Ascend-Modem-ShelfNo',
-  'cisco_pre_input_packets' => 'Cisco-Pre-Input-Packets',
-  'ascend_fr_dce_n392' => 'Ascend-FR-DCE-N392',
-  'ascend_fr_dce_n393' => 'Ascend-FR-DCE-N393',
-  'ascend_client_primary_wi' => 'Ascend-Client-Primary-WINS',
-  'shiva_link_protocol' => 'Shiva-Link-Protocol',
-  'bridge_group' => 'Bridge_Group',
-  'client_port_dnis' => 'Client-Port-DNIS',
-  'usr_mpip_tunnel_originat' => 'USR-MPIP-Tunnel-Originator',
-  'le_nat_log_options' => 'LE-NAT-Log-Options',
-  'usr_number_of_rings_limi' => 'USR-Number-of-Rings-Limit',
-  'usr_retrains_granted' => 'USR-Retrains-Granted',
-  'acc_ip_gateway_pri' => 'Acc-Ip-Gateway-Pri',
-  'usr_number_of_fallbacks' => 'USR-Number-of-Fallbacks',
-  'usr_tunnel_auth_hostname' => 'USR-Tunnel-Auth-Hostname',
-  'annex_filter' => 'Annex-Filter',
-  'ascend_mtu' => 'Ascend-MTU',
-  'ms_arap_pw_change_reason' => 'MS-ARAP-PW-Change-Reason',
-  'private_group_id' => 'Private-Group-Id',
-  'ascend_cache_time' => 'Ascend-Cache-Time',
-  'acc_ml_clear_threshold' => 'Acc-ML-Clear-Threshold',
-  'x_ascend_dhcp_reply' => 'X-Ascend-DHCP-Reply',
-  'ascend_h323_gatekeeper' => 'Ascend-H323-Gatekeeper',
-  'x_ascend_xmit_rate' => 'X-Ascend-Xmit-Rate',
-  'usr_last_number_dialed_o' => 'USR-Last-Number-Dialed-Out',
-  'acc_connect_rx_speed' => 'Acc-Connect-Rx-Speed',
-  'acc_clearing_cause' => 'Acc-Clearing-Cause',
-  'ascend_call_attempt_limi' => 'Ascend-Call-Attempt-Limit',
-  'x_ascend_data_rate' => 'X-Ascend-Data-Rate',
-  'termination_action' => 'Termination-Action',
-  'ascend_pre_input_octets' => 'Ascend-Pre-Input-Octets',
-  'x_ascend_ipx_route' => 'X-Ascend-IPX-Route',
-  'x_ascend_ts_idle_mode' => 'X-Ascend-TS-Idle-Mode',
-  'client_ip_address' => 'Client-IP-Address',
-  'ascend_add_seconds' => 'Ascend-Add-Seconds',
-  'login_ip_host' => 'Login-IP-Host',
-  'annex_sw_version' => 'Annex-SW-Version',
-  'huntgroup_name' => 'Huntgroup-Name',
-  'usr_pw_vpn_gateway' => 'USR-PW_VPN_Gateway',
-  'ascend_x25_reverse_charg' => 'Ascend-X25-Reverse-Charging',
-  'lac_real_port' => 'LAC_Real_Port',
-  'ascend_dba_monitor' => 'Ascend-DBA-Monitor',
-  'annex_user_server_locati' => 'Annex-User-Server-Location',
-  'ascend_h323_fegw_address' => 'Ascend-H323-Fegw-Address',
-  'acct_output_gigawords' => 'Acct-Output-Gigawords',
-  'bind_l2tp_tunnel_name' => 'Bind_L2TP_Tunnel_Name',
-  'x_ascend_token_idle' => 'X-Ascend-Token-Idle',
-  'acc_apsm_oversubscribed' => 'Acc-Apsm-Oversubscribed',
-  'ip_tos_field' => 'IP_TOS_Field',
-  'ascend_dsl_cir_xmit_limi' => 'Ascend-Dsl-CIR-Xmit-Limit',
-  'usr_number_of_link_naks' => 'USR-Number-of-Link-NAKs',
-  'framed_address' => 'Framed-Address',
-  'x_ascend_num_in_multilin' => 'X-Ascend-Num-In-Multilink',
-  'hint' => 'Hint',
-  'ascend_source_ip_check' => 'Ascend-Source-IP-Check',
-  'arap_zone_access' => 'ARAP-Zone-Access',
-  'x_ascend_fr_direct_profi' => 'X-Ascend-FR-Direct-Profile',
-  'x_ascend_bridge_address' => 'X-Ascend-Bridge-Address',
-  'usr_iwf_call_identifier' => 'USR-IWF-Call-Identifier',
-  'ascend_home_network_name' => 'Ascend-Home-Network-Name',
-  'ascend_require_auth' => 'Ascend-Require-Auth',
-  'source_validation' => 'Source_Validation',
-  'ms_primary_nbns_server' => 'MS-Primary-NBNS-Server',
-  'h323_setup_time' => 'h323-setup-time',
-  'tunnel_remote_name' => 'Tunnel_Remote_Name',
-  'ascend_maximum_channels' => 'Ascend-Maximum-Channels',
-  'ascend_tunneling_protoco' => 'Ascend-Tunneling-Protocol',
-  'arap_security_data' => 'ARAP-Security-Data',
-  'ascend_ipx_peer_mode' => 'Ascend-IPX-Peer-Mode',
-  'ascend_cir_timer' => 'Ascend-CIR-Timer',
-  'ascend_ts_idle_limit' => 'Ascend-TS-Idle-Limit',
-  'ascend_cache_refresh' => 'Ascend-Cache-Refresh',
-  'usr_rmmie_status' => 'USR-RMMIE-Status',
-  'annex_callback_portlist' => 'Annex-Callback-Portlist',
-  'usr_port_tap' => 'USR-Port-Tap',
-  'ascend_client_secondary_' => 'Ascend-Client-Secondary-DNS',
-  'x_ascend_first_dest' => 'X-Ascend-First-Dest',
-  'lac_port' => 'LAC_Port',
-  'acc_callback_cbcp_type' => 'Acc-Callback-CBCP-Type',
-  'usr_call_reference_numbe' => 'USR-Call-Reference-Number',
-  'mcast_receive' => 'Mcast_Receive',
-  'x_ascend_link_compressio' => 'X-Ascend-Link-Compression',
-  'ascend_inter_arrival_jit' => 'Ascend-Inter-Arrival-Jitter',
-  'x_ascend_assign_ip_pool' => 'X-Ascend-Assign-IP-Pool',
-  'usr_chassis_call_span' => 'USR-Chassis-Call-Span',
-  'arap_password' => 'ARAP-Password',
-  'usr_ip_default_route_opt' => 'USR-IP-Default-Route-Option',
-  'ascend_endpoint_disc' => 'Ascend-Endpoint-Disc',
-  'tunnel_dnis' => 'Tunnel_DNIS',
-  'ms_acct_auth_type' => 'MS-Acct-Auth-Type',
-  'ascend_ts_idle_mode' => 'Ascend-TS-Idle-Mode',
-  'shasta_service_profile' => 'Shasta-Service-Profile',
-  'usr_cdma_call_reference_' => 'USR-CDMA-Call-Reference-Number',
-  'usr_at_zip_input_filter' => 'USR-AT-Zip-Input-Filter',
-  'x_ascend_pw_warntime' => 'X-Ascend-PW-Warntime',
-  'ascend_fr_direct_dlci' => 'Ascend-FR-Direct-DLCI',
-  'usr_dte_ring_no_answer_l' => 'USR-DTE-Ring-No-Answer-Limit',
-  'ascend_multicast_rate_li' => 'Ascend-Multicast-Rate-Limit',
-  'usr_routing_protocol' => 'USR-Routing-Protocol',
-  'pam_auth' => 'Pam-Auth',
-  'client_dns_sec' => 'Client_DNS_Sec',
-  'bg_trans_bpdu' => 'BG_Trans_BPDU',
-  'police_rate' => 'Police_Rate',
-  'calling_station_id' => 'Calling-Station-Id',
-  'usr_called_party_number' => 'USR-Called-Party-Number',
-  'shiva_network_protocols' => 'Shiva-Network-Protocols',
-  'x_ascend_client_gateway' => 'X-Ascend-Client-Gateway',
-  'acct_input_octets' => 'Acct-Input-Octets',
-  'ascend_call_type' => 'Ascend-Call-Type',
-  'annex_product_name' => 'Annex-Product-Name',
-  'framed_compression' => 'Framed-Compression',
-  'ascend_atm_direct' => 'Ascend-ATM-Direct',
-  'x_ascend_remote_addr' => 'X-Ascend-Remote-Addr',
-  'usr_tunneled_mlpp' => 'USR-Tunneled-MLPP',
-  'le_ipsec_outsource_profi' => 'LE-IPSec-Outsource-Profile',
-  'ascend_atm_vci' => 'Ascend-ATM-Vci',
-  'usr_number_of_link_timeo' => 'USR-Number-of-Link-Timeouts',
-  'usr_et_bridge_input_filt' => 'USR-ET-Bridge-Input-Filter',
-  'x_ascend_fr_t391' => 'X-Ascend-FR-T391',
-  'x_ascend_fr_t392' => 'X-Ascend-FR-T392',
-  'h323_conf_id' => 'h323-conf-id',
-  'usr_call_end_date_time' => 'USR-Call-End-Date-Time',
-  'ascend_fr_t391' => 'Ascend-FR-T391',
-  'bg_aging_time' => 'BG_Aging_Time',
-  'x_ascend_pre_output_pack' => 'X-Ascend-Pre-Output-Packets',
-  'acc_dialout_auth_mode' => 'Acc-Dialout-Auth-Mode',
-  'ascend_calling_subaddres' => 'Ascend-Calling-Subaddress',
-  'ascend_fr_t392' => 'Ascend-FR-T392',
-  'acct_link_count' => 'Acct-Link-Count',
-  'usr_chassis_call_slot' => 'USR-Chassis-Call-Slot',
-  'h323_credit_time' => 'h323-credit-time',
-  'nas_port_id' => 'NAS-Port-Id',
-  'x_ascend_call_filter' => 'X-Ascend-Call-Filter',
-  'ascend_destination_nas_p' => 'Ascend-Destination-Nas-Port',
-  'arap_features' => 'ARAP-Features',
-  'x_ascend_history_weigh_t' => 'X-Ascend-History-Weigh-Type',
-  'annex_host_restrict' => 'Annex-Host-Restrict',
-  'usr_compression_reset_mo' => 'USR-Compression-Reset-Mode',
-  'cisco_maximum_time' => 'Cisco-Maximum-Time',
-  'tunnel_max_sessions' => 'Tunnel_Max_Sessions',
-  'bind_ses_context' => 'Bind_Ses_Context',
-  'x_ascend_ppp_vj_slot_com' => 'X-Ascend-PPP-VJ-Slot-Comp',
-  'usr_mobile_numbytes_rxed' => 'USR-Mobile-NumBytes-Rxed',
-  'usr_rmmie_last_update_ti' => 'USR-RMMIE-Last-Update-Time',
-  'ascend_atm_loopback_cell' => 'Ascend-ATM-Loopback-Cell-Loss',
-  'ascend_bir_proxy' => 'Ascend-BIR-Proxy',
-  'acct_mcast_in_packets' => 'Acct_Mcast_In_Packets',
-  'shiva_type_of_service' => 'Shiva-Type-Of-Service',
-  'ascend_fr_dte_n392' => 'Ascend-FR-DTE-N392',
-  'usr_at_call_input_filter' => 'USR-AT-Call-Input-Filter',
-  'ascend_fr_dte_n393' => 'Ascend-FR-DTE-N393',
-  'x_ascend_backup' => 'X-Ascend-Backup',
-  'char_noecho' => 'Char-Noecho',
-  'usr_rmmie_last_update_ev' => 'USR-RMMIE-Last-Update-Event',
-  'le_advice_of_charge' => 'LE-Advice-of-Charge',
-  'ascend_calling_id_type_o' => 'Ascend-Calling-Id-Type-Of-Num',
-  'ascend_pppoe_enable' => 'Ascend-PPPoE-Enable',
-  'usr_sync_async_mode' => 'USR-Sync-Async-Mode',
-  'state' => 'State',
-  'x_ascend_user_acct_base' => 'X-Ascend-User-Acct-Base',
-  'x_ascend_ipx_alias' => 'X-Ascend-IPX-Alias',
-  'ascend_ip_tos' => 'Ascend-IP-TOS',
-  'annex_secondary_dns_serv' => 'Annex-Secondary-DNS-Server',
-  'tunnel_session_auth_ctx' => 'Tunnel_Session_Auth_Ctx',
-  'usr_mbi_ct_pri_card_span' => 'USR-Mbi_Ct_PRI_Card_Span_Line',
-  'usr_call_event_code' => 'USR-Call-Event-Code',
-  'chap_password' => 'CHAP-Password',
-  'le_nat_tcp_session_timeo' => 'LE-NAT-TCP-Session-Timeout',
-  'usr_call_start_date_time' => 'USR-Call-Start-Date-Time',
-  'usr_multicast_forwarding' => 'USR-Multicast-Forwarding',
-  'client_id' => 'Client-Id',
-  'sql_user_name' => 'SQL-User-Name',
-  'x_ascend_billing_number' => 'X-Ascend-Billing-Number',
-  'ms_secondary_nbns_server' => 'MS-Secondary-NBNS-Server',
-  'cisco_num_in_multilink' => 'Cisco-Num-In-Multilink',
-  'x_ascend_client_assign_d' => 'X-Ascend-Client-Assign-DNS',
-  'x_ascend_user_acct_port' => 'X-Ascend-User-Acct-Port',
-  'usr_local_ip_address' => 'USR-Local-IP-Address',
-  'x_ascend_ip_pool_definit' => 'X-Ascend-IP-Pool-Definition',
-  'ascend_metric' => 'Ascend-Metric',
-  'x_ascend_bacp_enable' => 'X-Ascend-BACP-Enable',
-  'x_ascend_user_acct_time' => 'X-Ascend-User-Acct-Time',
-  'x_ascend_mpp_idle_percen' => 'X-Ascend-MPP-Idle-Percent',
-  'annex_authen_servers' => 'Annex-Authen-Servers',
-  'x_ascend_data_filter' => 'X-Ascend-Data-Filter',
-  'ascend_idle_limit' => 'Ascend-Idle-Limit',
-  'ldap_userdn' => 'Ldap-UserDn',
-  'x_ascend_target_util' => 'X-Ascend-Target-Util',
-  'shiva_connect_reason' => 'Shiva-Connect-Reason',
-  'usr_ds0' => 'USR-DS0',
-  'annex_re_chap_timeout' => 'Annex-Re-CHAP-Timeout',
-  'shasta_vpn_name' => 'Shasta-VPN-Name',
-  'acct_tunnel_connection_i' => 'Acct-Tunnel-Connection-Id',
-  'h323_prompt_id' => 'h323-prompt-id',
-  'x_ascend_ipx_peer_mode' => 'X-Ascend-IPX-Peer-Mode',
-  'ascend_numbering_plan_id' => 'Ascend-Numbering-Plan-ID',
-  'x_ascend_ts_idle_limit' => 'X-Ascend-TS-Idle-Limit',
-  'ascend_atm_fault_managem' => 'Ascend-ATM-Fault-Management',
-  'annex_primary_nbns_serve' => 'Annex-Primary-NBNS-Server',
-  'lac_port_type' => 'LAC_Port_Type',
-  'usr_initial_rx_link_data' => 'USR-Initial-Rx-Link-Data-Rate',
-  'usr_interface_index' => 'USR-Interface-Index',
-  'usr_expansion_algorithm' => 'USR-Expansion-Algorithm',
-  'ascend_tunnel_vrouter_na' => 'Ascend-Tunnel-VRouter-Name',
-  'usr_pw_vpn_neighbor' => 'USR-PW_VPN_Neighbor',
-  'bind_type' => 'Bind_Type',
-  'acc_ccp_option' => 'Acc-Ccp-Option',
-  'ascend_route_appletalk' => 'Ascend-Route-Appletalk',
-  'erx_alternate_cli_access' => 'ERX-Alternate-Cli-Access-Level',
-  'usr_at_rtmp_output_filte' => 'USR-AT-RTMP-Output-Filter',
-  'erx_atm_mbs' => 'ERX-Atm-MBS',
-  'usr_at_call_output_filte' => 'USR-AT-Call-Output-Filter',
-  'ms_old_arap_password' => 'MS-Old-ARAP-Password',
-  'x_ascend_client_primary_' => 'X-Ascend-Client-Primary-DNS',
-  'x_ascend_host_info' => 'X-Ascend-Host-Info',
-  'bind_auth_protocol' => 'Bind_Auth_Protocol',
-  'cisco_link_compression' => 'Cisco-Link-Compression',
-  'annex_syslog_tap' => 'Annex-Syslog-Tap',
-  'tunnel_window' => 'Tunnel_Window',
-  'usr_gateway_ip_address' => 'USR-Gateway-IP-Address',
-  'ascend_redirect_number' => 'Ascend-Redirect-Number',
-  'x_ascend_secondary_home_' => 'X-Ascend-Secondary-Home-Agent',
-  'usr_pw_index' => 'USR-PW_Index',
-  'le_multicast_client' => 'LE-Multicast-Client',
-  'annex_modem_disc_reason' => 'Annex-Modem-Disc-Reason',
-  'annex_primary_dns_server' => 'Annex-Primary-DNS-Server',
-  'erx_secondary_wins' => 'ERX-Secondary-Wins',
-  'fall_through' => 'Fall-Through',
-  'acct_mcast_out_packets' => 'Acct_Mcast_Out_Packets',
-  'x_ascend_transit_number' => 'X-Ascend-Transit-Number',
-  'usr_unauthenticated_time' => 'USR-Unauthenticated-Time',
-  'le_ipsec_active_profile' => 'LE-IPSec-Active-Profile',
-  'ascend_ip_pool_chaining' => 'Ascend-IP-Pool-Chaining',
-  'usr_syslog_tap' => 'USR-Syslog-Tap',
-  'ascend_multicast_client' => 'Ascend-Multicast-Client',
-  'usr_device_connected_to' => 'USR-Device-Connected-To',
-  'tunnel_l2f_second_passwo' => 'Tunnel_L2F_Second_Password',
-  'add_prefix' => 'Add-Prefix',
-  'tunnel_cmd_timeout' => 'Tunnel_Cmd_Timeout',
-  'x_ascend_remove_seconds' => 'X-Ascend-Remove-Seconds',
-  'acct_mcast_in_octets' => 'Acct_Mcast_In_Octets',
-  'ascend_appletalk_route' => 'Ascend-Appletalk-Route',
-  'ascend_fcp_parameter' => 'Ascend-FCP-Parameter',
-  'acc_ip_compression' => 'Acc-Ip-Compression',
-  'usr_modem_training_time' => 'USR-Modem-Training-Time',
-  'usr_primary_dns_server' => 'USR-Primary_DNS_Server',
-  'erx_egress_policy_name' => 'ERX-Egress-Policy-Name',
-  'x_ascend_base_channel_co' => 'X-Ascend-Base-Channel-Count',
-  'x_ascend_pre_input_packe' => 'X-Ascend-Pre-Input-Packets',
-  'password_retry' => 'Password-Retry',
-  'ascend_source_auth' => 'Ascend-Source-Auth',
-  'cisco_pw_lifetime' => 'Cisco-PW-Lifetime',
-  'acc_dns_server_pri' => 'Acc-Dns-Server-Pri',
-  'ascend_netware_timeout' => 'Ascend-Netware-timeout',
-  'ascend_ppp_async_map' => 'Ascend-PPP-Async-Map',
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Ttl',
-  'x_ascend_modem_slotno' => 'X-Ascend-Modem-SlotNo',
-  'x_ascend_ip_direct' => 'X-Ascend-IP-Direct',
-  'simultaneous_use' => 'Simultaneous-Use',
-  'erx_virtual_router_name' => 'ERX-Virtual-Router-Name',
-  'ascend_bridge_non_pppoe' => 'Ascend-Bridge-Non-PPPoE',
-  'ascend_fr_08_mode' => 'Ascend-FR-08-Mode',
-  'h323_call_type' => 'h323-call-type',
-  'tunnel_context' => 'Tunnel_Context',
-  'usr_transmit_acc_map' => 'USR-Transmit-Acc-Map',
-  'usr_ipx_wan' => 'USR-IPX-WAN',
-  'usr_ip_call_input_filter' => 'USR-IP-Call-Input-Filter',
-  'usr_call_connect_in_gmt' => 'USR-Call-Connect-in-GMT',
-  'acct_multi_session_id' => 'Acct-Multi-Session-Id',
-  'usr_reply_script1' => 'USR-Reply-Script1',
-  'cisco_ppp_vj_slot_comp' => 'Cisco-PPP-VJ-Slot-Comp',
-  'usr_reply_script2' => 'USR-Reply-Script2',
-  'usr_reply_script3' => 'USR-Reply-Script3',
-  'usr_reply_script4' => 'USR-Reply-Script4',
-  'usr_reply_script5' => 'USR-Reply-Script5',
-  'usr_reply_script6' => 'USR-Reply-Script6',
-  'user_category' => 'User-Category',
-  'mcast_send' => 'Mcast_Send',
-  'ascend_send_secret' => 'Ascend-Send-Secret',
-  'usr_tunnel_switch_endpoi' => 'USR-Tunnel-Switch-Endpoint',
-  'tunnel_retransmit' => 'Tunnel_Retransmit',
-  'add_port_to_ip_address' => 'Add-Port-To-IP-Address',
-  'ascend_ipx_node_addr' => 'Ascend-IPX-Node-Addr',
-  'x_ascend_netware_timeout' => 'X-Ascend-Netware-timeout',
-  'erx_sa_validate' => 'ERX-Sa-Validate',
-  'le_ipsec_passive_profile' => 'LE-IPSec-Passive-Profile',
-  'usr_chassis_slot' => 'USR-Chassis-Slot',
-  'usr_final_tx_link_data_r' => 'USR-Final-Tx-Link-Data-Rate',
-  'usr_nfas_id' => 'USR-NFAS-ID',
-  'called_station_id' => 'Called-Station-Id',
-  'login_lat_port' => 'Login-LAT-Port',
-  'ascend_dialed_number' => 'Ascend-Dialed-Number',
-  'h323_credit_amount' => 'h323-credit-amount',
-  'tunnel_local_name' => 'Tunnel_Local_Name',
-  'framed_ip_netmask' => 'Framed-IP-Netmask',
-  'client_port_id' => 'Client-Port-Id',
-  'bg_span_dis' => 'BG_Span_Dis',
-  'multi_link_flag' => 'Multi-Link-Flag',
-  'bind_sub_user_at_context' => 'Bind_Sub_User_At_Context',
-  'usr_ipx_routing' => 'USR-IPX-Routing',
-  'ascend_fr_nailed_grp' => 'Ascend-FR-Nailed-Grp',
-  'ascend_pre_output_octets' => 'Ascend-Pre-Output-Octets',
-  'pppoe_url' => 'PPPOE_URL',
-  'ascend_ara_pw' => 'Ascend-Ara-PW',
-  'acc_callback_mode' => 'Acc-Callback-Mode',
-  'usr_server_time' => 'USR-Server-Time',
-  'ascend_seconds_of_histor' => 'Ascend-Seconds-Of-History',
-  'ns_mta_md5_password' => 'NS-MTA-MD5-Password',
-  'tunnel_server_endpoint' => 'Tunnel-Server-Endpoint',
-  'usr_channel' => 'USR-Channel',
-  'ascend_dsl_cir_recv_limi' => 'Ascend-Dsl-CIR-Recv-Limit',
-  'acct_session_start_time' => 'Acct-Session-Start-Time',
-  'ascend_send_passwd' => 'Ascend-Send-Passwd',
-  'ascend_num_in_multilink' => 'Ascend-Num-In-Multilink',
-  'usr_ip_rip_policies' => 'USR-IP-RIP-Policies',
-  'vendor_specific' => 'Vendor-Specific',
-  'x_ascend_event_type' => 'X-Ascend-Event-Type',
-  'lac_real_port_type' => 'LAC_Real_Port_Type',
-  'x_ascend_modem_portno' => 'X-Ascend-Modem-PortNo',
-  'usr_originate_answer_mod' => 'USR-Originate-Answer-Mode',
-  'framed_ipx_network' => 'Framed-IPX-Network',
-  'ascend_modem_slotno' => 'Ascend-Modem-SlotNo',
-  'ms_mppe_encryption_type' => 'MS-MPPE-Encryption-Type',
-  'annex_cli_command' => 'Annex-CLI-Command',
-  'acct_status_type' => 'Acct-Status-Type',
-  'usr_et_bridge_call_outpu' => 'USR-ET-Bridge-Call-Output-Filte',
-  'usr_pw_vpn_id' => 'USR-PW_VPN_ID',
-  'usr_sap_filter_in' => 'USR-SAP-Filter-In',
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Proto',
-  'annex_audit_level' => 'Annex-Audit-Level',
-  'x_ascend_shared_profile_' => 'X-Ascend-Shared-Profile-Enable',
-  'ascend_dial_number' => 'Ascend-Dial-Number',
-  'ascend_link_compression' => 'Ascend-Link-Compression',
-  'usr_event_date_time' => 'USR-Event-Date-Time',
-  'usr_mp_edo_hiper' => 'USR-MP-EDO-HIPER',
-  'usr_re_chap_timeout' => 'USR-Re-Chap-Timeout',
-  'x_ascend_third_prompt' => 'X-Ascend-Third-Prompt',
-  'x_ascend_ppp_vj_1172' => 'X-Ascend-PPP-VJ-1172',
-  'annex_disconnect_reason' => 'Annex-Disconnect-Reason',
-  'ascend_fr_svc_addr' => 'Ascend-FR-SVC-Addr',
-  'nas_real_port' => 'NAS_Real_Port',
-  'usr_power_supply_number' => 'USR-Power-Supply-Number',
-  'ms_secondary_dns_server' => 'MS-Secondary-DNS-Server',
-  'ascend_port_redir_server' => 'Ascend-Port-Redir-Server',
-  'ascend_x25_pad_alias_1' => 'Ascend-X25-Pad-Alias-1',
-  'x_ascend_fcp_parameter' => 'X-Ascend-FCP-Parameter',
-  'ascend_x25_pad_alias_2' => 'Ascend-X25-Pad-Alias-2',
-  'ascend_ipsec_profile' => 'Ascend-IPSEC-Profile',
-  'ascend_x25_pad_alias_3' => 'Ascend-X25-Pad-Alias-3',
-  'usr_mobile_numbytes_txed' => 'USR-Mobile-NumBytes-Txed',
-  'ascend_atm_vpi' => 'Ascend-ATM-Vpi',
-  'annex_input_filter' => 'Annex-Input-Filter',
-  'menu' => 'Menu',
-  'x_ascend_route_ip' => 'X-Ascend-Route-IP',
-  'usr_rmmie_num_of_updates' => 'USR-RMMIE-Num-Of-Updates',
-  'acc_request_type' => 'Acc-Request-Type',
-  'ascend_dhcp_reply' => 'Ascend-DHCP-Reply',
-  'usr_number_of_upshifts' => 'USR-Number-of-Upshifts',
-  'usr_rmmie_firmware_versi' => 'USR-RMMIE-Firmware-Version',
-  'bind_bypass_context' => 'Bind_Bypass_Context',
-  'ascend_dialout_allowed' => 'Ascend-Dialout-Allowed',
-  'annex_tunnel_authen_type' => 'Annex-Tunnel-Authen-Type',
-  'x_ascend_bridge' => 'X-Ascend-Bridge',
-  'ascend_client_secondary_' => 'Ascend-Client-Secondary-WINS',
-  'erx_local_loopback_inter' => 'ERX-Local-Loopback-Interface',
-  'acct_input_gigawords' => 'Acct-Input-Gigawords',
-  'usr_equalization_type' => 'USR-Equalization-Type',
-  'usr_port_tap_format' => 'USR-Port-Tap-Format',
-  'x_ascend_ppp_async_map' => 'X-Ascend-PPP-Async-Map',
-  'acc_ipx_compression' => 'Acc-Ipx-Compression',
-  'ascend_nas_port_format' => 'Ascend-NAS-Port-Format',
-  'acc_modem_modulation_typ' => 'Acc-Modem-Modulation-Type',
-  'ascend_modem_portno' => 'Ascend-Modem-PortNo',
-  'usr_et_bridge_output_fil' => 'USR-ET-Bridge-Output-Filter',
-  'ascend_ipx_header_compre' => 'Ascend-IPX-Header-Compression',
-  'framed_appletalk_link' => 'Framed-AppleTalk-Link',
-  'x_ascend_receive_secret' => 'X-Ascend-Receive-Secret',
-  'ascend_route_ipx' => 'Ascend-Route-IPX',
-  'ascend_user_acct_type' => 'Ascend-User-Acct-Type',
-  'ascend_token_idle' => 'Ascend-Token-Idle',
-  'framed_ip_address' => 'Framed-IP-Address',
-  'ascend_call_block_durati' => 'Ascend-Call-Block-Duration',
-  'ascend_ppp_address' => 'Ascend-PPP-Address',
-  'usr_mbi_ct_pri_card_slot' => 'USR-Mbi_Ct_PRI_Card_Slot',
-  'x_ascend_dec_channel_cou' => 'X-Ascend-Dec-Channel-Count',
-  'x_ascend_send_auth' => 'X-Ascend-Send-Auth',
-  'usr_characters_received' => 'USR-Characters-Received',
-  'usr_pw_tunnel_authentica' => 'USR-PW_Tunnel_Authentication',
-  'usr_call_end_time' => 'USR-Call-End-Time',
-  'x_ascend_dialout_allowed' => 'X-Ascend-Dialout-Allowed',
-  'x_ascend_call_attempt_li' => 'X-Ascend-Call-Attempt-Limit',
-  'initial_modulation_type' => 'Initial-Modulation-Type',
-  'usr_packet_bus_session' => 'USR-Packet-Bus-Session',
-  'x_ascend_ipx_node_addr' => 'X-Ascend-IPX-Node-Addr',
-  'ascend_ppp_vj_slot_comp' => 'Ascend-PPP-VJ-Slot-Comp',
-  'ascend_menu_item' => 'Ascend-Menu-Item',
-  'x_ascend_fr_link_mgt' => 'X-Ascend-FR-Link-Mgt',
-  'usr_rmmie_serial_number' => 'USR-RMMIE-Serial-Number',
-  'message_authenticator' => 'Message-Authenticator',
-  'usr_dte_data_idle_timout' => 'USR-DTE-Data-Idle-Timout',
-  'usr_port_tap_facility' => 'USR-Port-Tap-Facility',
-  'acc_ml_mlx_admin_state' => 'Acc-ML-MLX-Admin-State',
-  'usr_modem_group' => 'USR-Modem-Group',
-  'x_ascend_callback' => 'X-Ascend-Callback',
-  'acct_input_packets_64' => 'Acct_Input_Packets_64',
-  'ascend_third_prompt' => 'Ascend-Third-Prompt',
-  'configuration_token' => 'Configuration-Token',
-  'x_ascend_fr_nailed_grp' => 'X-Ascend-FR-Nailed-Grp',
-  'acct_output_octets_64' => 'Acct_Output_Octets_64',
-  'h323_time_and_day' => 'h323-time-and-day',
-  'ascend_port_redir_portnu' => 'Ascend-Port-Redir-Portnum',
-  'acct_interim_interval' => 'Acct-Interim-Interval',
-  'ascend_uu_info' => 'Ascend-UU-Info',
-  'usr_pw_vpn_name' => 'USR-PW_VPN_Name',
-  'ascend_maximum_call_dura' => 'Ascend-Maximum-Call-Duration',
-  'ascend_atm_direct_profil' => 'Ascend-ATM-Direct-Profile',
-  'acc_input_errors' => 'Acc-Input-Errors',
-  'bind_dot1q_port' => 'Bind_Dot1q_Port',
-  'ascend_first_dest' => 'Ascend-First-Dest',
-  'x_ascend_if_netmask' => 'X-Ascend-IF-Netmask',
-  'tunnel_session_auth_serv' => 'Tunnel_Session_Auth_Service_Grp',
-  'annex_local_ip_address' => 'Annex-Local-IP-Address',
-  'termination_menu' => 'Termination-Menu',
-  'ms_chap2_cpw' => 'MS-CHAP2-CPW',
-  'ascend_mpp_idle_percent' => 'Ascend-MPP-Idle-Percent',
-  'usr_characters_sent' => 'USR-Characters-Sent',
-  'eap_message' => 'EAP-Message',
-  'acct_delay_time' => 'Acct-Delay-Time',
-  'ascend_remote_fw' => 'Ascend-Remote-FW',
-  'x_ascend_tunneling_proto' => 'X-Ascend-Tunneling-Protocol',
-  'shiva_session_id' => 'Shiva-Session-Id',
-  'usr_igmp_query_interval' => 'USR-IGMP-Query-Interval',
-  'usr_accm_type' => 'USR-ACCM-Type',
-  'usr_call_terminate_in_gm' => 'USR-Call-Terminate-in-GMT',
-  'usr_rad_location_type' => 'USR-Rad-Location-Type',
-  'ascend_filter' => 'Ascend-Filter',
-  'ascend_primary_home_agen' => 'Ascend-Primary-Home-Agent',
-  'x_ascend_user_acct_host' => 'X-Ascend-User-Acct-Host',
-  'chap_challenge' => 'CHAP-Challenge',
-  'acct_output_packets_64' => 'Acct_Output_Packets_64',
-  'bind_auth_max_sessions' => 'Bind_Auth_Max_Sessions',
-  'cisco_pre_output_octets' => 'Cisco-Pre-Output-Octets',
-  'x_ascend_fr_direct' => 'X-Ascend-FR-Direct',
-  'x_ascend_client_secondar' => 'X-Ascend-Client-Secondary-DNS',
-  'usr_rmmie_pwrlvl_nearech' => 'USR-RMMIE-PwrLvl-NearEcho-Canc',
-  'ascend_bridge_address' => 'Ascend-Bridge-Address',
-  'user_name' => 'User-Name',
-  'usr_rmmie_firmware_build' => 'USR-RMMIE-Firmware-Build-Date',
-  'ms_chap_mppe_keys' => 'MS-CHAP-MPPE-Keys',
-  'usr_number_of_characters' => 'USR-Number-Of-Characters-Lost',
-  'usr_physical_state' => 'USR-Physical-State',
-  'x_ascend_assign_ip_serve' => 'X-Ascend-Assign-IP-Server',
-  'bind_int_context' => 'Bind_Int_Context',
-  'erx_tunnel_virtual_route' => 'ERX-Tunnel-Virtual-Router',
-  'ascend_xmit_rate' => 'Ascend-Xmit-Rate',
-  'usr_secondary_dns_server' => 'USR-Secondary_DNS_Server',
-  'ascend_dsl_rate_mode' => 'Ascend-Dsl-Rate-Mode',
-  'ascend_data_rate' => 'Ascend-Data-Rate',
-  'realm' => 'Realm',
-  'usr_ipx_call_input_filte' => 'USR-IPX-Call-Input-Filter',
-  'ascend_ipx_route' => 'Ascend-IPX-Route',
-  'usr_failure_to_connect_r' => 'USR-Failure-to-Connect-Reason',
-  'x_ascend_home_network_na' => 'X-Ascend-Home-Network-Name',
-  'acc_nbns_server_pri' => 'Acc-Nbns-Server-Pri',
-  'usr_modulation_type' => 'USR-Modulation-Type',
-  'service_type' => 'Service-Type',
-  'ascend_callback_delay' => 'Ascend-Callback-Delay',
-  'ascend_owner_ip_addr' => 'Ascend-Owner-IP-Addr',
-  'x_ascend_handle_ipx' => 'X-Ascend-Handle-IPX',
-  'usr_connect_term_reason' => 'USR-Connect-Term-Reason',
-  'x_ascend_multicast_rate_' => 'X-Ascend-Multicast-Rate-Limit',
-  'h323_disconnect_time' => 'h323-disconnect-time',
-  'acc_ip_gateway_sec' => 'Acc-Ip-Gateway-Sec',
-  'usr_number_of_blers' => 'USR-Number-of-Blers',
-  'x_ascend_fr_type' => 'X-Ascend-FR-Type',
-  'ascend_assign_ip_pool' => 'Ascend-Assign-IP-Pool',
-  'ascend_qos_upstream' => 'Ascend-QOS-Upstream',
-  'usr_nas_type' => 'USR-NAS-Type',
-  'acc_dial_port_index' => 'Acc-Dial-Port-Index',
-  'usr_initial_tx_link_data' => 'USR-Initial-Tx-Link-Data-Rate',
-  'ascend_fr_type' => 'Ascend-FR-Type',
-  'usr_mbi_ct_tdm_time_slot' => 'USR-Mbi_Ct_TDM_Time_Slot',
-  'usr_rmmie_pwrlvl_xmit_lv' => 'USR-RMMIE-PwrLvl-Xmit-Lvl',
-  'erx_atm_service_category' => 'ERX-Atm-Service-Category',
-  'usr_appletalk' => 'USR-Appletalk',
-  'usr_send_script1' => 'USR-Send-Script1',
-  'usr_send_script2' => 'USR-Send-Script2',
-  'usr_send_script3' => 'USR-Send-Script3',
-  'usr_ospf_addressless_ind' => 'USR-OSPF-Addressless-Index',
-  'acct_input_packets' => 'Acct-Input-Packets',
-  'usr_send_script4' => 'USR-Send-Script4',
-  'usr_send_script5' => 'USR-Send-Script5',
-  'usr_send_script6' => 'USR-Send-Script6',
-  'usr_service_option' => 'USR-Service-Option',
-  'ascend_dropped_octets' => 'Ascend-Dropped-Octets',
-  'usr_ip' => 'USR-IP',
-  'usr_tunnel_security' => 'USR-Tunnel-Security',
-  'acc_acct_on_off_reason' => 'Acc-Acct-On-Off-Reason',
-  'shiva_compression_type' => 'Shiva-Compression-Type',
-  'ascend_pw_warntime' => 'Ascend-PW-Warntime',
-  'usr_security_resp_limit' => 'USR-Security-Resp-Limit',
-  'ascend_x25_pad_prompt' => 'Ascend-X25-Pad-Prompt',
-  'cisco_asing_ip_pool' => 'Cisco-Asing-IP-Pool',
-  'acc_route_policy' => 'Acc-Route-Policy',
-  'annex_local_username' => 'Annex-Local-Username',
-  'x_ascend_call_by_call' => 'X-Ascend-Call-By-Call',
-  'ascend_calling_id_screen' => 'Ascend-Calling-Id-Screening',
-  'x_ascend_dhcp_pool_numbe' => 'X-Ascend-DHCP-Pool-Number',
-  'nas_port_type' => 'NAS-Port-Type',
-  'ascend_route_ip' => 'Ascend-Route-IP',
-  'ascend_client_gateway' => 'Ascend-Client-Gateway',
-  'ascend_qos_downstream' => 'Ascend-QOS-Downstream',
-  'ms_bap_usage' => 'MS-BAP-Usage',
-  'usr_vts_session_key' => 'USR-VTS-Session-Key',
-  'usr_receive_acc_map' => 'USR-Receive-Acc-Map',
-  'ascend_expect_callback' => 'Ascend-Expect-Callback',
-  'password' => 'Password',
-  'packet_type' => 'Packet-Type',
-  'ascend_remote_addr' => 'Ascend-Remote-Addr',
-  'ascend_recv_name' => 'Ascend-Recv-Name',
-  'ms_acct_eap_type' => 'MS-Acct-EAP-Type',
-  'usr_filter_zones' => 'USR-Filter-Zones',
-  'annex_output_filter' => 'Annex-Output-Filter',
-  'usr_rmmie_rcv_tot_pwrlvl' => 'USR-RMMIE-Rcv-Tot-PwrLvl',
-  'usr_mp_mrru' => 'USR-MP-MRRU',
-  'ascend_call_filter' => 'Ascend-Call-Filter',
-  'usr_keypress_timeout' => 'USR-Keypress-Timeout',
-  'usr_modem_setup_time' => 'USR-Modem-Setup-Time',
-  'acct_authentic' => 'Acct-Authentic',
-  'pppoe_motm' => 'PPPOE_MOTM',
-  'x_ascend_expect_callback' => 'X-Ascend-Expect-Callback',
-  'erx_atm_scr' => 'ERX-Atm-SCR',
-  'erx_address_pool_name' => 'ERX-Address-Pool-Name',
-  'challenge_state' => 'Challenge-State',
-  'usr_multicast_proxy' => 'USR-Multicast-Proxy',
-  'framed_filter_id' => 'Framed-Filter-Id',
-  'add_suffix' => 'Add-Suffix',
-  'ascend_auth_type' => 'Ascend-Auth-Type',
-  'session_timeout' => 'Session-Timeout',
-  'ascend_callback' => 'Ascend-Callback',
-  'usr_chat_script_name' => 'USR-Chat-Script-Name',
-  'port_message' => 'Port-Message',
-  'acct_output_packets' => 'Acct-Output-Packets',
-  'ascend_session_svr_key' => 'Ascend-Session-Svr-Key',
-  'login_tcp_port' => 'Login-TCP-Port',
-  'erx_tunnel_password' => 'ERX-Tunnel-Password',
-  'shasta_user_privilege' => 'Shasta-User-Privilege',
-  'usr_secondary_nbns_serve' => 'USR-Secondary_NBNS_Server',
-  'usr_security_login_limit' => 'USR-Security-Login-Limit',
-  'usr_start_time' => 'USR-Start-Time',
-  'acc_access_partition' => 'Acc-Access-Partition',
-  'versanet_termination_cau' => 'Versanet-Termination-Cause',
-  'x_ascend_call_block_dura' => 'X-Ascend-Call-Block-Duration',
-  'mcast_maxgroups' => 'Mcast_MaxGroups',
-  'ascend_user_acct_base' => 'Ascend-User-Acct-Base',
-  'usr_vpn_gw_location_id' => 'USR-VPN-GW-Location-Id',
-  'usr_block_error_count_li' => 'USR-Block-Error-Count-Limit',
-  'ascend_telnet_profile' => 'Ascend-Telnet-Profile',
-  'ascend_port_redir_protoc' => 'Ascend-Port-Redir-Protocol',
-  'ascend_call_by_call' => 'Ascend-Call-By-Call',
-  'usr_disconnect_cause_ind' => 'USR-Disconnect-Cause-Indicator',
-  'x_ascend_fr_linkup' => 'X-Ascend-FR-LinkUp',
-  'ascend_billing_number' => 'Ascend-Billing-Number',
-  'usr_ds0s' => 'USR-DS0s',
-  'usr_at_zip_output_filter' => 'USR-AT-Zip-Output-Filter',
-  'ascend_user_acct_port' => 'Ascend-User-Acct-Port',
-  'login_port' => 'Login-Port',
-  'arap_security' => 'ARAP-Security',
-  'tunnel_deadtime' => 'Tunnel_Deadtime',
-  'ascend_user_acct_time' => 'Ascend-User-Acct-Time',
-  'ms_chap_challenge' => 'MS-CHAP-Challenge',
-  'ascend_x25_rpoa' => 'Ascend-X25-Rpoa',
-  'login_time' => 'Login-Time',
-  'current_time' => 'Current-Time',
-  'login_service' => 'Login-Service',
-  'ascend_menu_selector' => 'Ascend-Menu-Selector',
-  'ascend_bacp_enable' => 'Ascend-BACP-Enable',
-  'shiva_link_speed' => 'Shiva-Link-Speed',
-  'ascend_private_route_tab' => 'Ascend-Private-Route-Table-ID',
-  'x_ascend_session_svr_key' => 'X-Ascend-Session-Svr-Key',
-  'ascend_data_filter' => 'Ascend-Data-Filter',
-  'ascend_target_util' => 'Ascend-Target-Util',
-  'shiva_function' => 'Shiva-Function',
-  'usr_pw_usr_ifilter_ip' => 'USR-PW_USR_IFilter_IP',
-  'usr_igmp_routing' => 'USR-IGMP-Routing',
-  'acc_tunnel_port' => 'Acc-Tunnel-Port',
-  'x_ascend_fr_n391' => 'X-Ascend-FR-N391',
-  'medium_type' => 'Medium_Type',
-  'annex_domain_name' => 'Annex-Domain-Name',
-  'ascend_fr_n391' => 'Ascend-FR-N391',
-  'callback_number' => 'Callback-Number',
-  'usr_chassis_temperature' => 'USR-Chassis-Temperature',
-  'dialback_no' => 'Dialback-No',
-  'ms_mppe_recv_key' => 'MS-MPPE-Recv-Key',
-  'ascend_ipx_alias' => 'Ascend-IPX-Alias',
-  'le_nat_inmap' => 'LE-NAT-Inmap',
-  'tunnel_police_rate' => 'Tunnel_Police_Rate',
-  'acct_terminate_cause' => 'Acct-Terminate-Cause',
-  'le_nat_other_session_tim' => 'LE-NAT-Other-Session-Timeout',
-  'usr_ip_rip_output_filter' => 'USR-IP-RIP-Output-Filter',
-  'exec_program' => 'Exec-Program',
-  'h323_disconnect_cause' => 'h323-disconnect-cause',
-  'usr_chassis_call_channel' => 'USR-Chassis-Call-Channel',
-  'x_ascend_fr_dlci' => 'X-Ascend-FR-DLCI',
-  'ms_link_drop_time_limit' => 'MS-Link-Drop-Time-Limit',
-  'acc_callback_num_valid' => 'Acc-Callback-Num-Valid',
-  'cisco_presession_time' => 'Cisco-PreSession-Time',
-  'ms_chap_response' => 'MS-CHAP-Response',
-  'usr_spoofing' => 'USR-Spoofing',
-  'usr_num_fax_pages_proces' => 'USR-Num-Fax-Pages-Processed',
-  'ascend_x25_cug' => 'Ascend-X25-Cug',
-  'ascend_fr_dlci' => 'Ascend-FR-DLCI',
-  'shiva_user_attributes' => 'Shiva-User-Attributes',
-  'ms_chap_lm_enc_pw' => 'MS-CHAP-LM-Enc-PW',
-  'ascend_transit_number' => 'Ascend-Transit-Number',
-  'usr_last_number_dialed_i' => 'USR-Last-Number-Dialed-In-DNIS',
-  'usr_ip_saa_filter' => 'USR-IP-SAA-Filter',
-  'usr_pw_usr_ifilter_ipx' => 'USR-PW_USR_IFilter_IPX',
-  'ascend_remove_seconds' => 'Ascend-Remove-Seconds',
-  'le_connect_detail' => 'LE-Connect-Detail',
-  'ascend_assign_ip_global_' => 'Ascend-Assign-IP-Global-Pool',
-  'proxy_to_realm' => 'Proxy-To-Realm',
-  'usr_retrains_requested' => 'USR-Retrains-Requested',
-  'h323_remote_address' => 'h323-remote-address',
-  'ascend_x25_nui_prompt' => 'Ascend-X25-Nui-Prompt',
-  'acc_customer_id' => 'Acc-Customer-Id',
-  'ms_chap2_response' => 'MS-CHAP2-Response',
-  'ascend_host_info' => 'Ascend-Host-Info',
-  'annex_addr_resolution_se' => 'Annex-Addr-Resolution-Servers',
-  'x_ascend_multilink_id' => 'X-Ascend-Multilink-ID',
-  'login_lat_service' => 'Login-LAT-Service',
-  'usr_rmmie_rcv_pwrlvl_330' => 'USR-RMMIE-Rcv-PwrLvl-3300Hz',
-  'ascend_event_type' => 'Ascend-Event-Type',
-  'ascend_inc_channel_count' => 'Ascend-Inc-Channel-Count',
-  'cisco_ppp_async_map' => 'Cisco-PPP-Async-Map',
-  'usr_min_compression_size' => 'USR-Min-Compression-Size',
-  'ascend_traffic_shaper' => 'Ascend-Traffic-Shaper',
-  'ascend_user_acct_key' => 'Ascend-User-Acct-Key',
-  'usr_port_tap_output' => 'USR-Port-Tap-Output',
-  'ascend_x25_nui' => 'Ascend-X25-Nui',
-  'x_ascend_disconnect_caus' => 'X-Ascend-Disconnect-Cause',
-  'ascend_cbcp_enable' => 'Ascend-CBCP-Enable',
-  'usr_framed_ip_address_po' => 'USR-Framed_IP_Address_Pool_Name',
-  'ascend_x25_profile_name' => 'Ascend-X25-Profile-Name',
-  'usr_orig_nas_type' => 'USR-Orig-NAS-Type',
-  'acc_output_errors' => 'Acc-Output-Errors',
-  'h323_redirect_ip_address' => 'h323-redirect-ip-address',
-  'usr_ip_call_output_filte' => 'USR-IP-Call-Output-Filter',
-  'cisco_avpair' => 'Cisco-AVPair',
-  'usr_slot_connected_to' => 'USR-Slot-Connected-To',
-  'framed_route' => 'Framed-Route',
-  'ascend_global_call_id' => 'Ascend-Global-Call-Id',
-  'x_ascend_seconds_of_hist' => 'X-Ascend-Seconds-Of-History',
-  'x_ascend_temporary_rtes' => 'X-Ascend-Temporary-Rtes',
-  'h323_currency_type' => 'h323-currency-type',
-  'x_ascend_token_expiry' => 'X-Ascend-Token-Expiry',
-  'pvc_encapsulation_type' => 'PVC_Encapsulation_Type',
-  'x_ascend_pw_lifetime' => 'X-Ascend-PW-Lifetime',
-  'usr_expected_voltage' => 'USR-Expected-Voltage',
-  'usr_simplified_v42bis_us' => 'USR-Simplified-V42bis-Usage',
-  'shiva_customer_id' => 'Shiva-Customer-Id',
-  'usr_compression_algorith' => 'USR-Compression-Algorithm',
-  'annex_system_disc_reason' => 'Annex-System-Disc-Reason',
-  'annex_secondary_nbns_ser' => 'Annex-Secondary-NBNS-Server',
-  'usr_q931_call_reference_' => 'USR-Q931-Call-Reference-Value',
-  'usr_send_password' => 'USR-Send-Password',
-  'prompt' => 'Prompt',
-  'usr_cusr_hat_script_rule' => 'USR-CUSR-hat-Script-Rules',
-  'usr_event_id' => 'USR-Event-Id',
-  'usr_ccp_algorithm' => 'USR-CCP-Algorithm',
-  'usr_mbi_ct_bchannel_used' => 'USR-Mbi_Ct_BChannel_Used',
-  'ascend_svc_enabled' => 'Ascend-SVC-Enabled',
-  'framed_mtu' => 'Framed-MTU',
-  'acc_reason_code' => 'Acc-Reason-Code',
-  'bind_l2tp_flow_control' => 'Bind_L2TP_Flow_Control',
-  'ascend_cbcp_delay' => 'Ascend-CBCP-Delay',
-  'le_ipsec_deny_action' => 'LE-IPSec-Deny-Action',
-
-  #NOMENT
-  'nomadix_bw_down' => 'Nomadix-Bw-Down',
-  'nomadix_bw_up' => 'Nomadix-Bw-Up',
-  'nomadix_ip_upsell' => 'Nomadix-IP-Upsell',
-);
-
-1;
diff --git a/FS/FS/radius_usergroup.pm b/FS/FS/radius_usergroup.pm
deleted file mode 100644
index 647621d28..000000000
--- a/FS/FS/radius_usergroup.pm
+++ /dev/null
@@ -1,130 +0,0 @@
-package FS::radius_usergroup;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-use FS::svc_acct;
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::radius_usergroup - Object methods for radius_usergroup records
-
-=head1 SYNOPSIS
-
-  use FS::radius_usergroup;
-
-  $record = new FS::radius_usergroup \%hash;
-  $record = new FS::radius_usergroup { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::radius_usergroup object links an account (see L<FS::svc_acct>) with a
-RADIUS group.  FS::radius_usergroup inherits from FS::Record.  The following
-fields are currently supported:
-
-=over 4
-
-=item usergroupnum - primary key
-
-=item svcnum - Account (see L<FS::svc_acct>).
-
-=item groupname - group name
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new record.  To add the record to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'radius_usergroup'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-#inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-#inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-#inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  $self->ut_numbern('usergroupnum')
-    || $self->ut_number('svcnum')
-    || $self->ut_foreign_key('svcnum','svc_acct','svcnum')
-    || $self->ut_text('groupname')
-  ;
-}
-
-=item svc_acct
-
-Returns the account associated with this record (see L<FS::svc_acct>).
-
-=cut
-
-sub svc_acct {
-  my $self = shift;
-  qsearchs('svc_acct', { svcnum => $self->svcnum } );
-}
-
-=back
-
-=head1 BUGS
-
-Don't let 'em get you down.
-
-=head1 SEE ALSO
-
-L<svc_acct>, L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/session.pm b/FS/FS/session.pm
deleted file mode 100644
index de0f2a76a..000000000
--- a/FS/FS/session.pm
+++ /dev/null
@@ -1,269 +0,0 @@
-package FS::session;
-
-use strict;
-use vars qw( @ISA $conf $start $stop );
-use FS::UID qw( dbh );
-use FS::Record qw( qsearchs );
-use FS::svc_acct;
-use FS::port;
-use FS::nas;
-
-@ISA = qw(FS::Record);
-
-$FS::UID::callback{'FS::session'} = sub {
-  $conf = new FS::Conf;
-  $start = $conf->exists('session-start') ? $conf->config('session-start') : '';
-  $stop = $conf->exists('session-stop') ? $conf->config('session-stop') : '';
-};
-
-=head1 NAME
-
-FS::session - Object methods for session records
-
-=head1 SYNOPSIS
-
-  use FS::session;
-
-  $record = new FS::session \%hash;
-  $record = new FS::session {
-    'portnum' => 1,
-    'svcnum'  => 2,
-    'login'   => $timestamp,
-    'logout'  => $timestamp,
-  };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $error = $record->nas_heartbeat($timestamp);
-
-=head1 DESCRIPTION
-
-An FS::session object represents an user login session.  FS::session inherits
-from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item sessionnum - primary key
-
-=item portnum - NAS port for this session - see L<FS::port>
-
-=item svcnum - User for this session - see L<FS::svc_acct>
-
-=item login - timestamp indicating the beginning of this user session.
-
-=item logout - timestamp indicating the end of this user session.  May be null,
-               which indicates a currently open session.
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new session.  To add the session to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'session'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.  If the `login' field is empty, it is replaced with
-the current time.
-
-=cut
-
-sub insert {
-  my $self = shift;
-  my $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  $error = $self->check;
-  return $error if $error;
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  if ( qsearchs('session', { 'portnum' => $self->portnum, 'logout' => '' } ) ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "a session on that port is already open!";
-  }
-
-  $self->setfield('login', time()) unless $self->getfield('login');
-
-  $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  $self->nas_heartbeat($self->getfield('login'));
-
-  #session-starting callback
-    #redundant with heartbeat, yuck
-  my $port = qsearchs('port',{'portnum'=>$self->portnum});
-  my $nas = qsearchs('nas',{'nasnum'=>$port->nasnum});
-    #kcuy
-  my( $ip, $nasip, $nasfqdn ) = ( $port->ip, $nas->nasip, $nas->nasfqdn );
-  system( eval qq("$start") ) if $start;
-  
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
-}
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.  If the `logout' field is empty,
-it is replaced with the current time.
-
-=cut
-
-sub replace {
-  my($self, $old) = @_;
-  my $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  $error = $self->check;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  $self->setfield('logout', time()) unless $self->getfield('logout');
-
-  $error = $self->SUPER::replace($old);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  $self->nas_heartbeat($self->getfield('logout'));
-
-  #session-ending callback
-  #redundant with heartbeat, yuck
-  my $port = qsearchs('port',{'portnum'=>$self->portnum});
-  my $nas = qsearchs('nas',{'nasnum'=>$port->nasnum});
-    #kcuy
-  my( $ip, $nasip, $nasfqdn ) = ( $port->ip, $nas->nasip, $nas->nasfqdn );
-  system( eval qq("$stop") ) if $stop;
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-}
-
-=item check
-
-Checks all fields to make sure this is a valid session.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-  my $error =
-    $self->ut_numbern('sessionnum')
-    || $self->ut_number('portnum')
-    || $self->ut_number('svcnum')
-    || $self->ut_numbern('login')
-    || $self->ut_numbern('logout')
-  ;
-  return $error if $error;
-  return "Unknown svcnum"
-    unless qsearchs('svc_acct', { 'svcnum' => $self->svcnum } );
-  '';
-}
-
-=item nas_heartbeat
-
-Heartbeats the nas associated with this session (see L<FS::nas>).
-
-=cut
-
-sub nas_heartbeat {
-  my $self = shift;
-  my $port = qsearchs('port',{'portnum'=>$self->portnum});
-  my $nas = qsearchs('nas',{'nasnum'=>$port->nasnum});
-  $nas->heartbeat(shift);
-}
-
-=item svc_acct
-
-Returns the svc_acct record associated with this session (see L<FS::svc_acct>).
-
-=cut
-
-sub svc_acct {
-  my $self = shift;
-  qsearchs('svc_acct', { 'svcnum' => $self->svcnum } );
-}
-
-=back
-
-=head1 VERSION
-
-$Id: session.pm,v 1.7 2001-04-15 13:35:12 ivan Exp $
-
-=head1 BUGS
-
-Maybe you shouldn't be able to insert a session if there's currently an open
-session on that port.  Or maybe the open session on that port should be flagged
-as problematic?  autoclosed?  *sigh*
-
-Hmm, sessions refer to current svc_acct records... probably need to constrain
-deletions to svc_acct records such that no svc_acct records are deleted which
-have a session (even if long-closed).
-
-=head1 SEE ALSO
-
-L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
deleted file mode 100644
index 87b6097aa..000000000
--- a/FS/FS/svc_Common.pm
+++ /dev/null
@@ -1,381 +0,0 @@
-package FS::svc_Common;
-
-use strict;
-use vars qw( @ISA $noexport_hack );
-use FS::Record qw( qsearchs fields dbh );
-use FS::cust_svc;
-use FS::part_svc;
-use FS::queue;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::svc_Common - Object method for all svc_ records
-
-=head1 SYNOPSIS
-
-use FS::svc_Common;
-
-@ISA = qw( FS::svc_Common );
-
-=head1 DESCRIPTION
-
-FS::svc_Common is intended as a base class for table-specific classes to
-inherit from, i.e. FS::svc_acct.  FS::svc_Common inherits from FS::Record.
-
-=head1 METHODS
-
-=over 4
-
-=item insert [ JOBNUM_ARRAYREF ]
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
-defined.  An FS::cust_svc record will be created and inserted.
-
-If an arrayref is passed as parameter, the B<jobnum>s of any export jobs will
-be added to the array.
-
-=cut
-
-sub insert {
-  my $self = shift;
-  local $FS::queue::jobnums = shift if @_;
-  my $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  $error = $self->check;
-  return $error if $error;
-
-  my $svcnum = $self->svcnum;
-  my $cust_svc;
-  unless ( $svcnum ) {
-    $cust_svc = new FS::cust_svc ( {
-      #hua?# 'svcnum'  => $svcnum,
-      'pkgnum'  => $self->pkgnum,
-      'svcpart' => $self->svcpart,
-    } );
-    $error = $cust_svc->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-    $svcnum = $self->svcnum($cust_svc->svcnum);
-  } else {
-    $cust_svc = qsearchs('cust_svc',{'svcnum'=>$self->svcnum});
-    unless ( $cust_svc ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "no cust_svc record found for svcnum ". $self->svcnum;
-    }
-    $self->pkgnum($cust_svc->pkgnum);
-    $self->svcpart($cust_svc->svcpart);
-  }
-
-  $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  #new-style exports!
-  unless ( $noexport_hack ) {
-    foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
-      my $error = $part_export->export_insert($self);
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "exporting to ". $part_export->exporttype.
-               " (transaction rolled back): $error";
-      }
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-}
-
-=item delete
-
-Deletes this account from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-The corresponding FS::cust_svc record will be deleted as well.
-
-=cut
-
-sub delete {
-  my $self = shift;
-  my $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $svcnum = $self->svcnum;
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  $error = $self->SUPER::delete;
-  return $error if $error;
-
-  #new-style exports!
-  unless ( $noexport_hack ) {
-    foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
-      my $error = $part_export->export_delete($self);
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "exporting to ". $part_export->exporttype.
-               " (transaction rolled back): $error";
-      }
-    }
-  }
-
-  return $error if $error;
-
-  my $cust_svc = $self->cust_svc;
-  $error = $cust_svc->delete;
-  return $error if $error;
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-}
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-sub replace {
-  my ($new, $old) = (shift, shift);
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $new->SUPER::replace($old);
-  if ($error) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  #new-style exports!
-  unless ( $noexport_hack ) {
-    foreach my $part_export ( $new->cust_svc->part_svc->part_export ) {
-      my $error = $part_export->export_replace($new,$old);
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "error exporting to ". $part_export->exporttype.
-               " (transaction rolled back): $error";
-      }
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-}
-
-
-=item setfixed
-
-Sets any fixed fields for this service (see L<FS::part_svc>).  If there is an
-error, returns the error, otherwise returns the FS::part_svc object (use ref()
-to test the return).  Usually called by the check method.
-
-=cut
-
-sub setfixed {
-  my $self = shift;
-  $self->setx('F');
-}
-
-=item setdefault
-
-Sets all fields to their defaults (see L<FS::part_svc>), overriding their
-current values.  If there is an error, returns the error, otherwise returns
-the FS::part_svc object (use ref() to test the return).
-
-=cut
-
-sub setdefault {
-  my $self = shift;
-  $self->setx('D');
-}
-
-sub setx {
-  my $self = shift;
-  my $x = shift;
-
-  my $error;
-
-  $error =
-    $self->ut_numbern('svcnum')
-  ;
-  return $error if $error;
-
-  #get part_svc
-  my $svcpart;
-  if ( $self->svcnum ) {
-    my $cust_svc = $self->cust_svc;
-    return "Unknown svcnum" unless $cust_svc; 
-    $svcpart = $cust_svc->svcpart;
-  } else {
-    $svcpart = $self->getfield('svcpart');
-  }
-  my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
-  return "Unkonwn svcpart" unless $part_svc;
-
-  #set default/fixed/whatever fields from part_svc
-  my $table = $self->table;
-  foreach my $field ( grep { $_ ne 'svcnum' } fields($table) ) {
-    my $part_svc_column = $part_svc->part_svc_column($field);
-    if ( $part_svc_column->columnflag eq $x ) {
-      $self->setfield( $field, $part_svc_column->columnvalue );
-    }
-  }
-
- $part_svc;
-
-}
-
-=item cust_svc
-
-Returns the cust_svc record associated with this svc_ record, as a FS::cust_svc
-object (see L<FS::cust_svc>).
-
-=cut
-
-sub cust_svc {
-  my $self = shift;
-  qsearchs('cust_svc', { 'svcnum' => $self->svcnum } );
-}
-
-=item suspend
-
-Runs export_suspend callbacks.
-
-=cut
-
-sub suspend {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  #new-style exports!
-  unless ( $noexport_hack ) {
-    foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
-      my $error = $part_export->export_suspend($self);
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "error exporting to ". $part_export->exporttype.
-               " (transaction rolled back): $error";
-      }
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
-}
-
-=item unsuspend
-
-Runs export_unsuspend callbacks.
-
-=cut
-
-sub unsuspend {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  #new-style exports!
-  unless ( $noexport_hack ) {
-    foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
-      my $error = $part_export->export_unsuspend($self);
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "error exporting to ". $part_export->exporttype.
-               " (transaction rolled back): $error";
-      }
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
-}
-
-=item cancel
-
-Stub - returns false (no error) so derived classes don't need to define these
-methods.  Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=cut
-
-sub cancel { ''; }
-
-=back
-
-=head1 VERSION
-
-$Id: svc_Common.pm,v 1.12 2002-06-14 11:22:53 ivan Exp $
-
-=head1 BUGS
-
-The setfixed method return value.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>, schema.html
-from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
deleted file mode 100644
index c95df94cf..000000000
--- a/FS/FS/svc_acct.pm
+++ /dev/null
@@ -1,1150 +0,0 @@
-package FS::svc_acct;
-
-use strict;
-use vars qw( @ISA $noexport_hack $conf
-             $dir_prefix @shells $usernamemin
-             $usernamemax $passwordmin $passwordmax
-             $username_ampersand $username_letter $username_letterfirst
-             $username_noperiod $username_nounderscore $username_nodash
-             $username_uppercase
-             $mydomain
-             $welcome_template $welcome_from $welcome_subject $welcome_mimetype
-             $smtpmachine
-             $dirhash
-             @saltset @pw_set );
-use Carp;
-use Fcntl qw(:flock);
-use FS::UID qw( datasrc );
-use FS::Conf;
-use FS::Record qw( qsearch qsearchs fields dbh );
-use FS::svc_Common;
-use Net::SSH;
-use FS::cust_svc;
-use FS::part_svc;
-use FS::svc_acct_pop;
-use FS::svc_acct_sm;
-use FS::cust_main_invoice;
-use FS::svc_domain;
-use FS::raddb;
-use FS::queue;
-use FS::radius_usergroup;
-use FS::export_svc;
-use FS::part_export;
-use FS::Msgcat qw(gettext);
-
-@ISA = qw( FS::svc_Common );
-
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::svc_acct'} = sub { 
-  $conf = new FS::Conf;
-  $dir_prefix = $conf->config('home');
-  @shells = $conf->config('shells');
-  $usernamemin = $conf->config('usernamemin') || 2;
-  $usernamemax = $conf->config('usernamemax');
-  $passwordmin = $conf->config('passwordmin') || 6;
-  $passwordmax = $conf->config('passwordmax') || 8;
-  $username_letter = $conf->exists('username-letter');
-  $username_letterfirst = $conf->exists('username-letterfirst');
-  $username_noperiod = $conf->exists('username-noperiod');
-  $username_nounderscore = $conf->exists('username-nounderscore');
-  $username_nodash = $conf->exists('username-nodash');
-  $username_uppercase = $conf->exists('username-uppercase');
-  $username_ampersand = $conf->exists('username-ampersand');
-  $mydomain = $conf->config('domain');
-  $dirhash = $conf->config('dirhash') || 0;
-  if ( $conf->exists('welcome_email') ) {
-    $welcome_template = new Text::Template (
-      TYPE   => 'ARRAY',
-      SOURCE => [ map "$_\n", $conf->config('welcome_email') ]
-    ) or warn "can't create welcome email template: $Text::Template::ERROR";
-    $welcome_from = $conf->config('welcome_email-from'); # || 'your-isp-is-dum'
-    $welcome_subject = $conf->config('welcome_email-subject') || 'Welcome';
-    $welcome_mimetype = $conf->config('welcome_email-mimetype') || 'text/plain';
-  } else {
-    $welcome_template = '';
-  }
-  $smtpmachine = $conf->config('smtpmachine');
-};
-
-@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
-@pw_set = ( 'a'..'z', 'A'..'Z', '0'..'9', '(', ')', '#', '!', '.', ',' );
-
-sub _cache {
-  my $self = shift;
-  my ( $hashref, $cache ) = @_;
-  if ( $hashref->{'svc_acct_svcnum'} ) {
-    $self->{'_domsvc'} = FS::svc_domain->new( {
-      'svcnum'   => $hashref->{'domsvc'},
-      'domain'   => $hashref->{'svc_acct_domain'},
-      'catchall' => $hashref->{'svc_acct_catchall'},
-    } );
-  }
-}
-
-=head1 NAME
-
-FS::svc_acct - Object methods for svc_acct records
-
-=head1 SYNOPSIS
-
-  use FS::svc_acct;
-
-  $record = new FS::svc_acct \%hash;
-  $record = new FS::svc_acct { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $error = $record->suspend;
-
-  $error = $record->unsuspend;
-
-  $error = $record->cancel;
-
-  %hash = $record->radius;
-
-  %hash = $record->radius_reply;
-
-  %hash = $record->radius_check;
-
-  $domain = $record->domain;
-
-  $svc_domain = $record->svc_domain;
-
-  $email = $record->email;
-
-  $seconds_since = $record->seconds_since($timestamp);
-
-=head1 DESCRIPTION
-
-An FS::svc_acct object represents an account.  FS::svc_acct inherits from
-FS::svc_Common.  The following fields are currently supported:
-
-=over 4
-
-=item svcnum - primary key (assigned automatcially for new accounts)
-
-=item username
-
-=item _password - generated if blank
-
-=item sec_phrase - security phrase
-
-=item popnum - Point of presence (see L<FS::svc_acct_pop>)
-
-=item uid
-
-=item gid
-
-=item finger - GECOS
-
-=item dir - set automatically if blank (and uid is not)
-
-=item shell
-
-=item quota - (unimplementd)
-
-=item slipip - IP address
-
-=item seconds - 
-
-=item domsvc - svcnum from svc_domain
-
-=item radius_I<Radius_Attribute> - I<Radius-Attribute>
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new account.  To add the account to the database, see L<"insert">.
-
-=cut
-
-sub table { 'svc_acct'; }
-
-=item insert
-
-Adds this account to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
-defined.  An FS::cust_svc record will be created and inserted.
-
-The additional field I<usergroup> can optionally be defined; if so it should
-contain an arrayref of group names.  See L<FS::radius_usergroup>.  (used in
-sqlradius export only)
-
-(TODOC: L<FS::queue> and L<freeside-queued>)
-
-(TODOC: new exports! $noexport_hack)
-
-=cut
-
-sub insert {
-  my $self = shift;
-  my $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  $error = $self->check;
-  return $error if $error;
-
-  #no, duplicate checking just got a whole lot more complicated
-  #(perhaps keep this check with a config option to turn on?)
-
-  #return gettext('username_in_use'). ": ". $self->username
-  #  if qsearchs( 'svc_acct', { 'username' => $self->username,
-  #                             'domsvc'   => $self->domsvc,
-  #                           } );
-
-  if ( $self->svcnum ) {
-    my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$self->svcnum});
-    unless ( $cust_svc ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "no cust_svc record found for svcnum ". $self->svcnum;
-    }
-    $self->pkgnum($cust_svc->pkgnum);
-    $self->svcpart($cust_svc->svcpart);
-  }
-
-  #new duplicate username checking
-
-  my $part_svc = qsearchs('part_svc', { 'svcpart' => $self->svcpart } );
-  unless ( $part_svc ) {
-    $dbh->rollback if $oldAutoCommit;
-    return 'unknown svcpart '. $self->svcpart;
-  }
-
-  my @dup_user = qsearch( 'svc_acct', { 'username' => $self->username } );
-  my @dup_userdomain = qsearch( 'svc_acct', { 'username' => $self->username,
-                                              'domsvc'   => $self->domsvc } );
-  my @dup_uid;
-  if ( $part_svc->part_svc_column('uid')->columnflag ne 'F'
-       && $self->username !~ /^(toor|(hyla)?fax)$/          ) {
-    @dup_uid = qsearch( 'svc_acct', { 'uid' => $self->uid } );
-  } else {
-    @dup_uid = ();
-  }
-
-  if ( @dup_user || @dup_userdomain || @dup_uid ) {
-    my $exports = FS::part_export::export_info('svc_acct');
-    my( %conflict_user_svcpart, %conflict_userdomain_svcpart );
-
-    foreach my $part_export ( $part_svc->part_export ) {
-
-      #this will catch to the same exact export
-      my @svcparts = map { $_->svcpart }
-        qsearch('export_svc', { 'exportnum' => $part_export->exportnum });
-
-      #this will catch to exports w/same exporthost+type ???
-      #my @other_part_export = qsearch('part_export', {
-      #  'machine'    => $part_export->machine,
-      #  'exporttype' => $part_export->exporttype,
-      #} );
-      #foreach my $other_part_export ( @other_part_export ) {
-      #  push @svcparts, map { $_->svcpart }
-      #    qsearch('export_svc', { 'exportnum' => $part_export->exportnum });
-      #}
-
-      my $nodomain = $exports->{$part_export->exporttype}{'nodomain'};
-      if ( $nodomain =~ /^Y/i ) {
-        $conflict_user_svcpart{$_} = $part_export->exportnum
-          foreach @svcparts;
-      } else {
-        $conflict_userdomain_svcpart{$_} = $part_export->exportnum
-          foreach @svcparts;
-      }
-    }
-
-    foreach my $dup_user ( @dup_user ) {
-      my $dup_svcpart = $dup_user->cust_svc->svcpart;
-      if ( exists($conflict_user_svcpart{$dup_svcpart}) ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "duplicate username: conflicts with svcnum ". $dup_user->svcnum.
-               " via exportnum ". $conflict_user_svcpart{$dup_svcpart};
-      }
-    }
-
-    foreach my $dup_userdomain ( @dup_userdomain ) {
-      my $dup_svcpart = $dup_userdomain->cust_svc->svcpart;
-      if ( exists($conflict_userdomain_svcpart{$dup_svcpart}) ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "duplicate username\@domain: conflicts with svcnum ".
-               $dup_userdomain->svcnum. " via exportnum ".
-               $conflict_userdomain_svcpart{$dup_svcpart};
-      }
-    }
-
-    foreach my $dup_uid ( @dup_uid ) {
-      my $dup_svcpart = $dup_uid->cust_svc->svcpart;
-      if ( exists($conflict_user_svcpart{$dup_svcpart})
-           || exists($conflict_userdomain_svcpart{$dup_svcpart}) ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "duplicate uid: conflicts with svcnum". $dup_uid->svcnum.
-               "via exportnum ". $conflict_user_svcpart{$dup_svcpart}
-                                 || $conflict_userdomain_svcpart{$dup_svcpart};
-      }
-    }
-
-  }
-
-  #see?  i told you it was more complicated
-
-  my @jobnums;
-  $error = $self->SUPER::insert(\@jobnums);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  if ( $self->usergroup ) {
-    foreach my $groupname ( @{$self->usergroup} ) {
-      my $radius_usergroup = new FS::radius_usergroup ( {
-        svcnum    => $self->svcnum,
-        groupname => $groupname,
-      } );
-      my $error = $radius_usergroup->insert;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return $error;
-      }
-    }
-  }
-
-  #false laziness with sub replace (and cust_main)
-  my $queue = new FS::queue {
-    'svcnum' => $self->svcnum,
-    'job'    => 'FS::svc_acct::append_fuzzyfiles'
-  };
-  $error = $queue->insert($self->username);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "queueing job (transaction rolled back): $error";
-  }
-
-  #welcome email
-  my $cust_pkg = $self->cust_svc->cust_pkg;
-  my( $cust_main, $to ) = ( '', '' );
-  if ( $welcome_template && $cust_pkg ) {
-    my $cust_main = $cust_pkg->cust_main;
-    my $to = join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list );
-    if ( $to ) {
-      my $wqueue = new FS::queue {
-        'svcnum' => $self->svcnum,
-        'job'    => 'FS::svc_acct::send_email'
-      };
-      warn "attempting to queue email to $to";
-      my $error = $wqueue->insert(
-        'to'       => $to,
-        'from'     => $welcome_from,
-        'subject'  => $welcome_subject,
-        'mimetype' => $welcome_mimetype,
-        'body'     => $welcome_template->fill_in( HASH => {
-                        'username' => $self->username,
-                        'password' => $self->_password,
-                        'first'    => $cust_main->first,
-                        'last'     => $cust_main->getfield('last'),
-                        'pkg'      => $cust_pkg->part_pkg->pkg,
-                      } ),
-      );
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "queuing welcome email: $error";
-      }
-  
-      foreach my $jobnum ( @jobnums ) {
-        my $error = $wqueue->depend_insert($jobnum);
-        if ( $error ) {
-          $dbh->rollback if $oldAutoCommit;
-          return "queuing welcome email job dependancy: $error";
-        }
-      }
-
-    }
-  
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  ''; #no error
-}
-
-=item delete
-
-Deletes this account from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-The corresponding FS::cust_svc record will be deleted as well.
-
-(TODOC: new exports! $noexport_hack)
-
-=cut
-
-sub delete {
-  my $self = shift;
-
-  if ( defined( $FS::Record::dbdef->table('svc_acct_sm') ) ) {
-    return "Can't delete an account which has (svc_acct_sm) mail aliases!"
-      if $self->uid && qsearch( 'svc_acct_sm', { 'domuid' => $self->uid } );
-  }
-
-  return "Can't delete an account which is a (svc_forward) source!"
-    if qsearch( 'svc_forward', { 'srcsvc' => $self->svcnum } );
-
-  return "Can't delete an account which is a (svc_forward) destination!"
-    if qsearch( 'svc_forward', { 'dstsvc' => $self->svcnum } );
-
-  return "Can't delete an account with (svc_www) web service!"
-    if qsearch( 'svc_www', { 'usersvc' => $self->usersvc } );
-
-  # what about records in session ? (they should refer to history table)
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  foreach my $cust_main_invoice (
-    qsearch( 'cust_main_invoice', { 'dest' => $self->svcnum } )
-  ) {
-    unless ( defined($cust_main_invoice) ) {
-      warn "WARNING: something's wrong with qsearch";
-      next;
-    }
-    my %hash = $cust_main_invoice->hash;
-    $hash{'dest'} = $self->email;
-    my $new = new FS::cust_main_invoice \%hash;
-    my $error = $new->replace($cust_main_invoice);
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  foreach my $svc_domain (
-    qsearch( 'svc_domain', { 'catchall' => $self->svcnum } )
-  ) {
-    my %hash = new FS::svc_domain->hash;
-    $hash{'catchall'} = '';
-    my $new = new FS::svc_domain \%hash;
-    my $error = $new->replace($svc_domain);
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  foreach my $radius_usergroup (
-    qsearch('radius_usergroup', { 'svcnum' => $self->svcnum } )
-  ) {
-    my $error = $radius_usergroup->delete;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  my $error = $self->SUPER::delete;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-}
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-The additional field I<usergroup> can optionally be defined; if so it should
-contain an arrayref of group names.  See L<FS::radius_usergroup>.  (used in
-sqlradius export only)
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-  my $error;
-
-  return "Username in use"
-    if $old->username ne $new->username &&
-      qsearchs( 'svc_acct', { 'username' => $new->username,
-                               'domsvc'   => $new->domsvc,
-                             } );
-  {
-    #no warnings 'numeric';  #alas, a 5.006-ism
-    local($^W) = 0;
-    return "Can't change uid!" if $old->uid != $new->uid;
-  }
-
-  #change homdir when we change username
-  $new->setfield('dir', '') if $old->username ne $new->username;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  $old->usergroup( [ $old->radius_groups ] );
-  if ( $new->usergroup ) {
-    #(sorta) false laziness with FS::part_export::sqlradius::_export_replace
-    my @newgroups = @{$new->usergroup};
-    foreach my $oldgroup ( @{$old->usergroup} ) {
-      if ( grep { $oldgroup eq $_ } @newgroups ) {
-        @newgroups = grep { $oldgroup ne $_ } @newgroups;
-        next;
-      }
-      my $radius_usergroup = qsearchs('radius_usergroup', {
-        svcnum    => $old->svcnum,
-        groupname => $oldgroup,
-      } );
-      my $error = $radius_usergroup->delete;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "error deleting radius_usergroup $oldgroup: $error";
-      }
-    }
-
-    foreach my $newgroup ( @newgroups ) {
-      my $radius_usergroup = new FS::radius_usergroup ( {
-        svcnum    => $new->svcnum,
-        groupname => $newgroup,
-      } );
-      my $error = $radius_usergroup->insert;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "error adding radius_usergroup $newgroup: $error";
-      }
-    }
-
-  }
-
-  $error = $new->SUPER::replace($old);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error if $error;
-  }
-
-  #false laziness with sub insert (and cust_main)
-  my $queue = new FS::queue {
-    'svcnum' => $new->svcnum,
-    'job'    => 'FS::svc_acct::append_fuzzyfiles'
-  };
-  $error = $queue->insert($new->username);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "queueing job (transaction rolled back): $error";
-  }
-
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  ''; #no error
-}
-
-=item suspend
-
-Suspends this account by prefixing *SUSPENDED* to the password.  If there is an
-error, returns the error, otherwise returns false.
-
-Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=cut
-
-sub suspend {
-  my $self = shift;
-  my %hash = $self->hash;
-  unless ( $hash{_password} =~ /^\*SUSPENDED\* /
-           || $hash{_password} eq '*'
-         ) {
-    $hash{_password} = '*SUSPENDED* '.$hash{_password};
-    my $new = new FS::svc_acct ( \%hash );
-    my $error = $new->replace($self);
-    return $error if $error;
-  }
-
-  $self->SUPER::suspend;
-}
-
-=item unsuspend
-
-Unsuspends this account by removing *SUSPENDED* from the password.  If there is
-an error, returns the error, otherwise returns false.
-
-Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=cut
-
-sub unsuspend {
-  my $self = shift;
-  my %hash = $self->hash;
-  if ( $hash{_password} =~ /^\*SUSPENDED\* (.*)$/ ) {
-    $hash{_password} = $1;
-    my $new = new FS::svc_acct ( \%hash );
-    my $error = $new->replace($self);
-    return $error if $error;
-  }
-
-  $self->SUPER::unsuspend;
-}
-
-=item cancel
-
-Just returns false (no error) for now.
-
-Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item check
-
-Checks all fields to make sure this is a valid service.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-Sets any fixed values; see L<FS::part_svc>.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my($recref) = $self->hashref;
-
-  my $x = $self->setfixed;
-  return $x unless ref($x);
-  my $part_svc = $x;
-
-  if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) {
-    $self->usergroup(
-      [ split(',', $part_svc->part_svc_column('usergroup')->columnvalue) ] );
-  }
-
-  my $error = $self->ut_numbern('svcnum')
-              || $self->ut_number('domsvc')
-              || $self->ut_textn('sec_phrase')
-  ;
-  return $error if $error;
-
-  my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;
-  if ( $username_uppercase ) {
-    $recref->{username} =~ /^([a-z0-9_\-\.\&]{$usernamemin,$ulen})$/i
-      or return gettext('illegal_username'). " ($usernamemin-$ulen): ". $recref->{username};
-    $recref->{username} = $1;
-  } else {
-    $recref->{username} =~ /^([a-z0-9_\-\.\&]{$usernamemin,$ulen})$/
-      or return gettext('illegal_username'). " ($usernamemin-$ulen): ". $recref->{username};
-    $recref->{username} = $1;
-  }
-
-  if ( $username_letterfirst ) {
-    $recref->{username} =~ /^[a-z]/ or return gettext('illegal_username');
-  } elsif ( $username_letter ) {
-    $recref->{username} =~ /[a-z]/ or return gettext('illegal_username');
-  }
-  if ( $username_noperiod ) {
-    $recref->{username} =~ /\./ and return gettext('illegal_username');
-  }
-  if ( $username_nounderscore ) {
-    $recref->{username} =~ /_/ and return gettext('illegal_username');
-  }
-  if ( $username_nodash ) {
-    $recref->{username} =~ /\-/ and return gettext('illegal_username');
-  }
-  unless ( $username_ampersand ) {
-    $recref->{username} =~ /\&/ and return gettext('illegal_username');
-  }
-
-  $recref->{popnum} =~ /^(\d*)$/ or return "Illegal popnum: ".$recref->{popnum};
-  $recref->{popnum} = $1;
-  return "Unknown popnum" unless
-    ! $recref->{popnum} ||
-    qsearchs('svc_acct_pop',{'popnum'=> $recref->{popnum} } );
-
-  unless ( $part_svc->part_svc_column('uid')->columnflag eq 'F' ) {
-
-    $recref->{uid} =~ /^(\d*)$/ or return "Illegal uid";
-    $recref->{uid} = $1 eq '' ? $self->unique('uid') : $1;
-
-    $recref->{gid} =~ /^(\d*)$/ or return "Illegal gid";
-    $recref->{gid} = $1 eq '' ? $recref->{uid} : $1;
-    #not all systems use gid=uid
-    #you can set a fixed gid in part_svc
-
-    return "Only root can have uid 0"
-      if $recref->{uid} == 0
-         && $recref->{username} ne 'root'
-         && $recref->{username} ne 'toor';
-
-#    $error = $self->ut_textn('finger');
-#    return $error if $error;
-    $self->getfield('finger') =~
-      /^([\w \t\!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\*\<\>]*)$/
-        or return "Illegal finger: ". $self->getfield('finger');
-    $self->setfield('finger', $1);
-
-    $recref->{dir} =~ /^([\/\w\-\.\&]*)$/
-      or return "Illegal directory";
-    $recref->{dir} = $1;
-    return "Illegal directory"
-      if $recref->{dir} =~ /(^|\/)\.+(\/|$)/; #no .. component
-    return "Illegal directory"
-      if $recref->{dir} =~ /\&/ && ! $username_ampersand;
-    unless ( $recref->{dir} ) {
-      $recref->{dir} = $dir_prefix . '/';
-      if ( $dirhash > 0 ) {
-        for my $h ( 1 .. $dirhash ) {
-          $recref->{dir} .= substr($recref->{username}, $h-1, 1). '/';
-        }
-      } elsif ( $dirhash < 0 ) {
-        for my $h ( reverse $dirhash .. -1 ) {
-          $recref->{dir} .= substr($recref->{username}, $h, 1). '/';
-        }
-      }
-      $recref->{dir} .= $recref->{username};
-    ;
-    }
-
-    unless ( $recref->{username} eq 'sync' ) {
-      if ( grep $_ eq $recref->{shell}, @shells ) {
-        $recref->{shell} = (grep $_ eq $recref->{shell}, @shells)[0];
-      } else {
-        return "Illegal shell \`". $self->shell. "\'; ".
-               $conf->dir. "/shells contains: @shells";
-      }
-    } else {
-      $recref->{shell} = '/bin/sync';
-    }
-
-    $recref->{quota} =~ /^(\d*)$/ or return "Illegal quota (unimplemented)";
-    $recref->{quota} = $1;
-
-  } else {
-    $recref->{gid} ne '' ? 
-      return "Can't have gid without uid" : ( $recref->{gid}='' );
-    $recref->{finger} ne '' ? 
-      return "Can't have finger-name without uid" : ( $recref->{finger}='' );
-    $recref->{dir} ne '' ? 
-      return "Can't have directory without uid" : ( $recref->{dir}='' );
-    $recref->{shell} ne '' ? 
-      return "Can't have shell without uid" : ( $recref->{shell}='' );
-    $recref->{quota} ne '' ? 
-      return "Can't have quota without uid" : ( $recref->{quota}='' );
-  }
-
-  unless ( $part_svc->part_svc_column('slipip')->columnflag eq 'F' ) {
-    unless ( $recref->{slipip} eq '0e0' ) {
-      $recref->{slipip} =~ /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/
-        or return "Illegal slipip". $self->slipip;
-      $recref->{slipip} = $1;
-    } else {
-      $recref->{slipip} = '0e0';
-    }
-
-  }
-
-  #arbitrary RADIUS stuff; allow ut_textn for now
-  foreach ( grep /^radius_/, fields('svc_acct') ) {
-    $self->ut_textn($_);
-  }
-
-  #generate a password if it is blank
-  $recref->{_password} = join('',map($pw_set[ int(rand $#pw_set) ], (0..7) ) )
-    unless ( $recref->{_password} );
-
-  #if ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([^\t\n]{4,16})$/ ) {
-  if ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([^\t\n]{$passwordmin,$passwordmax})$/ ) {
-    $recref->{_password} = $1.$3;
-    #uncomment this to encrypt password immediately upon entry, or run
-    #bin/crypt_pw in cron to give new users a window during which their
-    #password is available to techs, for faxing, etc.  (also be aware of 
-    #radius issues!)
-    #$recref->{password} = $1.
-    #  crypt($3,$saltset[int(rand(64))].$saltset[int(rand(64))]
-    #;
-  } elsif ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([\w\.\/\$]{13,34})$/ ) {
-    $recref->{_password} = $1.$3;
-  } elsif ( $recref->{_password} eq '*' ) {
-    $recref->{_password} = '*';
-  } elsif ( $recref->{_password} eq '!!' ) {
-    $recref->{_password} = '!!';
-  } else {
-    #return "Illegal password";
-    return gettext('illegal_password'). " $passwordmin-$passwordmax ".
-           FS::Msgcat::_gettext('illegal_password_characters').
-           ": ". $recref->{_password};
-  }
-
-  ''; #no error
-}
-
-=item radius
-
-Depriciated, use radius_reply instead.
-
-=cut
-
-sub radius {
-  carp "FS::svc_acct::radius depriciated, use radius_reply";
-  $_[0]->radius_reply;
-}
-
-=item radius_reply
-
-Returns key/value pairs, suitable for assigning to a hash, for any RADIUS
-reply attributes of this record.
-
-Note that this is now the preferred method for reading RADIUS attributes - 
-accessing the columns directly is discouraged, as the column names are
-expected to change in the future.
-
-=cut
-
-sub radius_reply { 
-  my $self = shift;
-  my %reply =
-    map {
-      /^(radius_(.*))$/;
-      my($column, $attrib) = ($1, $2);
-      #$attrib =~ s/_/\-/g;
-      ( $FS::raddb::attrib{lc($attrib)}, $self->getfield($column) );
-    } grep { /^radius_/ && $self->getfield($_) } fields( $self->table );
-  if ( $self->slipip && $self->slipip ne '0e0' ) {
-    $reply{'Framed-IP-Address'} = $self->slipip;
-  }
-  %reply;
-}
-
-=item radius_check
-
-Returns key/value pairs, suitable for assigning to a hash, for any RADIUS
-check attributes of this record.
-
-Note that this is now the preferred method for reading RADIUS attributes - 
-accessing the columns directly is discouraged, as the column names are
-expected to change in the future.
-
-=cut
-
-sub radius_check {
-  my $self = shift;
-  ( 'Password' => $self->_password,
-    map {
-      /^(rc_(.*))$/;
-      my($column, $attrib) = ($1, $2);
-      #$attrib =~ s/_/\-/g;
-      ( $FS::raddb::attrib{lc($attrib)}, $self->getfield($column) );
-    } grep { /^rc_/ && $self->getfield($_) } fields( $self->table )
-  );
-}
-
-=item domain
-
-Returns the domain associated with this account.
-
-=cut
-
-sub domain {
-  my $self = shift;
-  if ( $self->domsvc ) {
-    #$self->svc_domain->domain;
-    my $svc_domain = $self->svc_domain
-      or die "no svc_domain.svcnum for svc_acct.domsvc ". $self->domsvc;
-    $svc_domain->domain;
-  } else {
-    $mydomain or die "svc_acct.domsvc is null and no legacy domain config file";
-  }
-}
-
-=item svc_domain
-
-Returns the FS::svc_domain record for this account's domain (see
-L<FS::svc_domain>).
-
-=cut
-
-sub svc_domain {
-  my $self = shift;
-  $self->{'_domsvc'}
-    ? $self->{'_domsvc'}
-    : qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } );
-}
-
-=item cust_svc
-
-Returns the FS::cust_svc record for this account (see L<FS::cust_svc>).
-
-sub cust_svc {
-  my $self = shift;
-  qsearchs( 'cust_svc', { 'svcnum' => $self->svcnum } );
-}
-
-=item email
-
-Returns an email address associated with the account.
-
-=cut
-
-sub email {
-  my $self = shift;
-  $self->username. '@'. $self->domain;
-}
-
-=item seconds_since TIMESTAMP
-
-Returns the number of seconds this account has been online since TIMESTAMP.
-See L<FS::session>
-
-TIMESTAMP is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=cut
-
-#note: POD here, implementation in FS::cust_svc
-sub seconds_since {
-  my $self = shift;
-  $self->cust_svc->seconds_since(@_);
-}
-
-=item radius_groups
-
-Returns all RADIUS groups for this account (see L<FS::radius_usergroup>).
-
-=cut
-
-sub radius_groups {
-  my $self = shift;
-  if ( $self->usergroup ) {
-    #when provisioning records, export callback runs in svc_Common.pm before
-    #radius_usergroup records can be inserted...
-    @{$self->usergroup};
-  } else {
-    map { $_->groupname }
-      qsearch('radius_usergroup', { 'svcnum' => $self->svcnum } );
-  }
-}
-
-=back
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item send_email
-
-=cut
-
-sub send_email {
-  my %opt = @_;
-
-  use Date::Format;
-  use Mail::Internet 1.44;
-  use Mail::Header;
-
-  $opt{mimetype} ||= 'text/plain';
-  $opt{mimetype} .= '; charset="iso-8859-1"' unless $opt{mimetype} =~ /charset/;
-
-  $ENV{MAILADDRESS} = $opt{from};
-  my $header = new Mail::Header ( [
-    "From: $opt{from}",
-    "To: $opt{to}",
-    "Sender: $opt{from}",
-    "Reply-To: $opt{from}",
-    "Date: ". time2str("%a, %d %b %Y %X %z", time),
-    "Subject: $opt{subject}",
-    "Content-Type: $opt{mimetype}",
-  ] );
-  my $message = new Mail::Internet (
-    'Header' => $header,
-    'Body' => [ map "$_\n", split("\n", $opt{body}) ],
-  );
-  $!=0;
-  $message->smtpsend( Host => $smtpmachine )
-    or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-      or die "can't send email to $opt{to} via $smtpmachine with SMTP: $!";
-}
-
-=item check_and_rebuild_fuzzyfiles
-
-=cut
-
-sub check_and_rebuild_fuzzyfiles {
-  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
-  -e "$dir/svc_acct.username"
-    or &rebuild_fuzzyfiles;
-}
-
-=item rebuild_fuzzyfiles
-
-=cut
-
-sub rebuild_fuzzyfiles {
-
-  use Fcntl qw(:flock);
-
-  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
-
-  #username
-
-  open(USERNAMELOCK,">>$dir/svc_acct.username")
-    or die "can't open $dir/svc_acct.username: $!";
-  flock(USERNAMELOCK,LOCK_EX)
-    or die "can't lock $dir/svc_acct.username: $!";
-
-  my @all_username = map $_->getfield('username'), qsearch('svc_acct', {});
-
-  open (USERNAMECACHE,">$dir/svc_acct.username.tmp")
-    or die "can't open $dir/svc_acct.username.tmp: $!";
-  print USERNAMECACHE join("\n", @all_username), "\n";
-  close USERNAMECACHE or die "can't close $dir/svc_acct.username.tmp: $!";
-
-  rename "$dir/svc_acct.username.tmp", "$dir/svc_acct.username";
-  close USERNAMELOCK;
-
-}
-
-=item all_username
-
-=cut
-
-sub all_username {
-  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
-  open(USERNAMECACHE,"<$dir/svc_acct.username")
-    or die "can't open $dir/svc_acct.username: $!";
-  my @array = map { chomp; $_; } <USERNAMECACHE>;
-  close USERNAMECACHE;
-  \@array;
-}
-
-=item append_fuzzyfiles USERNAME
-
-=cut
-
-sub append_fuzzyfiles {
-  my $username = shift;
-
-  &check_and_rebuild_fuzzyfiles;
-
-  use Fcntl qw(:flock);
-
-  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
-
-  open(USERNAME,">>$dir/svc_acct.username")
-    or die "can't open $dir/svc_acct.username: $!";
-  flock(USERNAME,LOCK_EX)
-    or die "can't lock $dir/svc_acct.username: $!";
-
-  print USERNAME "$username\n";
-
-  flock(USERNAME,LOCK_UN)
-    or die "can't unlock $dir/svc_acct.username: $!";
-  close USERNAME;
-
-  1;
-}
-
-
-
-=item radius_usergroup_selector GROUPS_ARRAYREF [ SELECTNAME ]
-
-=cut
-
-sub radius_usergroup_selector {
-  my $sel_groups = shift;
-  my %sel_groups = map { $_=>1 } @$sel_groups;
-
-  my $selectname = shift || 'radius_usergroup';
-
-  my $dbh = dbh;
-  my $sth = $dbh->prepare(
-    'SELECT DISTINCT(groupname) FROM radius_usergroup ORDER BY groupname'
-  ) or die $dbh->errstr;
-  $sth->execute() or die $sth->errstr;
-  my @all_groups = map { $_->[0] } @{$sth->fetchall_arrayref};
-
-  my $html = <<END;
-    <SCRIPT>
-    function ${selectname}_doadd(object) {
-      var myvalue = object.${selectname}_add.value;
-      var optionName = new Option(myvalue,myvalue,false,true);
-      var length = object.$selectname.length;
-      object.$selectname.options[length] = optionName;
-      object.${selectname}_add.value = "";
-    }
-    </SCRIPT>
-    <SELECT MULTIPLE NAME="$selectname">
-END
-
-  foreach my $group ( @all_groups ) {
-    $html .= '<OPTION';
-    if ( $sel_groups{$group} ) {
-      $html .= ' SELECTED';
-      $sel_groups{$group} = 0;
-    }
-    $html .= ">$group</OPTION>\n";
-  }
-  foreach my $group ( grep { $sel_groups{$_} } keys %sel_groups ) {
-    $html .= "<OPTION SELECTED>$group</OPTION>\n";
-  };
-  $html .= '</SELECT>';
-
-  $html .= qq!<BR><INPUT TYPE="text" NAME="${selectname}_add">!.
-           qq!<INPUT TYPE="button" VALUE="Add new group" onClick="${selectname}_doadd(this.form)">!;
-
-  $html;
-}
-
-=back
-
-=head1 BUGS
-
-The $recref stuff in sub check should be cleaned up.
-
-The suspend, unsuspend and cancel methods update the database, but not the
-current object.  This is probably a bug as it's unexpected and
-counterintuitive.
-
-radius_usergroup_selector?  putting web ui components in here?  they should
-probably live somewhere else...
-
-=head1 SEE ALSO
-
-L<FS::svc_Common>, edit/part_svc.cgi from an installed web interface,
-export.html from the base documentation, L<FS::Record>, L<FS::Conf>,
-L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>, L<FS::queue>,
-L<freeside-queued>), L<Net::SSH>, L<ssh>, L<FS::svc_acct_pop>,
-schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/svc_acct_pop.pm b/FS/FS/svc_acct_pop.pm
deleted file mode 100644
index 3c9ea0130..000000000
--- a/FS/FS/svc_acct_pop.pm
+++ /dev/null
@@ -1,204 +0,0 @@
-package FS::svc_acct_pop;
-
-use strict;
-use vars qw( @ISA @EXPORT_OK @svc_acct_pop %svc_acct_pop );
-use FS::Record qw( qsearch qsearchs );
-
-@ISA = qw( FS::Record Exporter );
-@EXPORT_OK = qw( popselector );
-
-=head1 NAME
-
-FS::svc_acct_pop - Object methods for svc_acct_pop records
-
-=head1 SYNOPSIS
-
-  use FS::svc_acct_pop;
-
-  $record = new FS::svc_acct_pop \%hash;
-  $record = new FS::svc_acct_pop { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $html = FS::svc_acct_pop::popselector( $popnum, $state );
-
-=head1 DESCRIPTION
-
-An FS::svc_acct object represents an point of presence.  FS::svc_acct_pop
-inherits from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item popnum - primary key (assigned automatically for new accounts)
-
-=item city
-
-=item state
-
-=item ac - area code
-
-=item exch - exchange
-
-=item loc - rest of number
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new point of presence (if only it were that easy!).  To add the 
-point of presence to the database, see L<"insert">.
-
-=cut
-
-sub table { 'svc_acct_pop'; }
-
-=item insert
-
-Adds this point of presence to the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item delete
-
-Removes this point of presence from the database.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid point of presence.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-    $self->ut_numbern('popnum')
-      or $self->ut_text('city')
-      or $self->ut_text('state')
-      or $self->ut_number('ac')
-      or $self->ut_number('exch')
-      or $self->ut_numbern('loc')
-  ;
-
-}
-
-=item text
-
-Returns:
-
-"$city, $state ($ac)/$exch"
-
-=cut
-
-sub text {
-  my $self = shift;
-  $self->city. ', '. $self->state.
-    ' ('. $self->ac. ')/'. $self->exch. '-'. $self->loc;
-}
-
-=back
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item popselector [ POPNUM [ STATE ] ]
-
-=cut
-
-#horrible false laziness with signup.cgi (pull special-case for 0 & 1
-# pop code out from signup.cgi??)
-sub popselector {
-  my( $popnum, $state ) = @_;
-
-  unless ( @svc_acct_pop ) { #cache pop list
-    @svc_acct_pop = qsearch('svc_acct_pop', {} );
-    %svc_acct_pop = ();
-    push @{$svc_acct_pop{$_->state}}, $_ foreach @svc_acct_pop;
-  }
-
-  my $text = <<END;
-    <SCRIPT>
-    function opt(what,href,text) {
-      var optionName = new Option(text, href, false, false)
-      var length = what.length;
-      what.options[length] = optionName;
-    }
-    
-    function popstate_changed(what) {
-      state = what.options[what.selectedIndex].text;
-      for (var i = what.form.popnum.length;i > 0;i--)
-                what.form.popnum.options[i] = null;
-      what.form.popnum.options[0] = new Option("", "", false, true);
-END
-
-  foreach my $popstate ( sort { $a cmp $b } keys %svc_acct_pop ) {
-    $text .= "\nif ( state == \"$popstate\" ) {\n";
-
-    foreach my $pop ( @{$svc_acct_pop{$popstate}}) {
-      my $o_popnum = $pop->popnum;
-      my $poptext = $pop->text;
-      $text .= "opt(what.form.popnum, \"$o_popnum\", \"$poptext\");\n"
-    }
-    $text .= "}\n";
-  }
-
-  $text .= "}\n</SCRIPT>\n";
-
-  $text .=
-    qq!<SELECT NAME="popstate" SIZE=1 onChange="popstate_changed(this)">!.
-    qq!<OPTION> !;
-  $text .= "<OPTION>$_" foreach sort { $a cmp $b } keys %svc_acct_pop;
-  $text .= '</SELECT>'; #callback? return 3 html pieces?  #'</TD><TD>';
-
-  $text .= qq!<SELECT NAME="popnum" SIZE=1><OPTION> !;
-  foreach my $pop ( @svc_acct_pop ) {
-    $text .= qq!<OPTION VALUE="!. $pop->popnum. '"'.
-             ( ( $popnum && $pop->popnum == $popnum ) ? ' SELECTED' : '' ). ">".
-             $pop->text;
-  }
-  $text .= '</SELECT>';
-
-  $text;
-
-}
-
-=back
-
-=head1 VERSION
-
-$Id: svc_acct_pop.pm,v 1.7 2002-04-10 13:42:48 ivan Exp $
-
-=head1 BUGS
-
-It should be renamed to part_pop.
-
-popselector?  putting web ui components in here?  they should probably live
-somewhere else...  
-
-popselector: pull special-case for 0 & 1 pop code out from signup.cgi
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::svc_acct>, L<FS::part_pop_local>, schema.html from the
-base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/svc_acct_sm.pm b/FS/FS/svc_acct_sm.pm
deleted file mode 100644
index c92f1421f..000000000
--- a/FS/FS/svc_acct_sm.pm
+++ /dev/null
@@ -1,260 +0,0 @@
-package FS::svc_acct_sm;
-
-use strict;
-use vars qw( @ISA $nossh_hack $conf $shellmachine @qmailmachines );
-use FS::Record qw( fields qsearch qsearchs );
-use FS::svc_Common;
-use FS::cust_svc;
-use Net::SSH qw(ssh);
-use FS::Conf;
-use FS::svc_acct;
-use FS::svc_domain;
-
-@ISA = qw( FS::svc_Common );
-
-#ask FS::UID to run this stuff for us later
-#$FS::UID::callback{'FS::svc_acct_sm'} = sub { 
-#  $conf = new FS::Conf;
-#  $shellmachine = $conf->exists('qmailmachines')
-#                  ? $conf->config('shellmachine')
-#                  : '';
-#};
-
-=head1 NAME
-
-FS::svc_acct_sm - Object methods for svc_acct_sm records
-
-=head1 SYNOPSIS
-
-  use FS::svc_acct_sm;
-
-  $record = new FS::svc_acct_sm \%hash;
-  $record = new FS::svc_acct_sm { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $error = $record->suspend;
-
-  $error = $record->unsuspend;
-
-  $error = $record->cancel;
-
-=head1 WARNING
-
-FS::svc_acct_sm is B<depreciated>.  This class is only included for migration
-purposes.  See L<FS::svc_forward>.
-
-=head1 DESCRIPTION
-
-An FS::svc_acct_sm object represents a virtual mail alias.  FS::svc_acct_sm
-inherits from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item svcnum - primary key (assigned automatcially for new accounts)
-
-=item domsvc - svcnum of the virtual domain (see L<FS::svc_domain>)
-
-=item domuid - uid of the target account (see L<FS::svc_acct>)
-
-=item domuser - virtual username
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new virtual mail alias.  To add the virtual mail alias to the
-database, see L<"insert">.
-
-=cut
-
-sub table { 'svc_acct_sm'; }
-
-=item insert
-
-Adds this virtual mail alias to the database.  If there is an error, returns
-the error, otherwise returns false.
-
-The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
-defined.  An FS::cust_svc record will be created and inserted.
-
- #If the configuration values (see L<FS::Conf>) shellmachine and qmailmachines
- #exist, and domuser is `*' (meaning a catch-all mailbox), the command:
- #
- #  [ -e $dir/.qmail-$qdomain-default ] || {
- #    touch $dir/.qmail-$qdomain-default;
- #    chown $uid:$gid $dir/.qmail-$qdomain-default;
- #  }
- #
- #is executed on shellmachine via ssh (see L<dot-qmail/"EXTENSION ADDRESSES">).
- #This behaviour can be surpressed by setting $FS::svc_acct_sm::nossh_hack true.
-
-=cut
-
-sub insert {
-  my $self = shift;
-  my $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  $error=$self->check;
-  return $error if $error;
-
-  return "Domain username (domuser) in use for this domain (domsvc)"
-    if qsearchs('svc_acct_sm',{ 'domuser'=> $self->domuser,
-                                'domsvc' => $self->domsvc,
-                              } );
-
-  return "First domain username (domuser) for domain (domsvc) must be " .
-         qq='*' (catch-all)!=
-    if $self->domuser ne '*'
-       && ! qsearch('svc_acct_sm',{ 'domsvc' => $self->domsvc } )
-       && ! $conf->exists('maildisablecatchall');
-
-  $error = $self->SUPER::insert;
-  return $error if $error;
-
-  #my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } );
-  #my $svc_acct = qsearchs( 'svc_acct', { 'uid' => $self->domuid } );
-  #my ( $uid, $gid, $dir, $domain ) = (
-  #  $svc_acct->uid,
-  #  $svc_acct->gid,
-  #  $svc_acct->dir,
-  #  $svc_domain->domain,
-  #);
-  #my $qdomain = $domain;
-  #$qdomain =~ s/\./:/g; #see manpage for 'dot-qmail': EXTENSION ADDRESSES
-  #ssh("root\@$shellmachine","[ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }")  
-  #  if ( ! $nossh_hack && $shellmachine && $dir && $self->domuser eq '*' );
-
-  ''; #no error
-
-}
-
-=item delete
-
-Deletes this virtual mail alias from the database.  If there is an error,
-returns the error, otherwise returns false.
-
-The corresponding FS::cust_svc record will be deleted as well.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-  my $error;
-
-  return "Domain username (domuser) in use for this domain (domsvc)"
-    if ( $old->domuser ne $new->domuser
-         || $old->domsvc != $new->domsvc
-       )  && qsearchs('svc_acct_sm',{
-         'domuser'=> $new->domuser,
-         'domsvc' => $new->domsvc,
-       } )
-     ;
-
- $new->SUPER::replace($old);
-
-}
-
-=item suspend
-
-Just returns false (no error) for now.
-
-Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item unsuspend
-
-Just returns false (no error) for now.
-
-Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item cancel
-
-Just returns false (no error) for now.
-
-Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item check
-
-Checks all fields to make sure this is a valid virtual mail alias.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert and
-replace methods.
-
-Sets any fixed values; see L<FS::part_svc>.
-
-=cut
-
-sub check {
-  my $self = shift;
-  my $error;
-
-  my $x = $self->setfixed;
-  return $x unless ref($x);
-  #my $part_svc = $x;
-
-  my($recref) = $self->hashref;
-
-  $recref->{domuser} =~ /^(\*|[a-z0-9_\-]{2,32})$/
-    or return "Illegal domain username (domuser)";
-  $recref->{domuser} = $1;
-
-  $recref->{domsvc} =~ /^(\d+)$/ or return "Illegal domsvc";
-  $recref->{domsvc} = $1;
-  my($svc_domain);
-  return "Unknown domsvc" unless
-    $svc_domain=qsearchs('svc_domain',{'svcnum'=> $recref->{domsvc} } );
-
-  $recref->{domuid} =~ /^(\d+)$/ or return "Illegal uid";
-  $recref->{domuid} = $1;
-  my($svc_acct);
-  return "Unknown uid" unless
-    $svc_acct=qsearchs('svc_acct',{'uid'=> $recref->{domuid} } );
-
-  ''; #no error
-}
-
-=back
-
-=head1 VERSION
-
-$Id: svc_acct_sm.pm,v 1.5 2001-09-06 20:41:59 ivan Exp $
-
-=head1 BUGS
-
-The remote commands should be configurable.
-
-The $recref stuff in sub check should be cleaned up.
-
-=head1 SEE ALSO
-
-L<FS::svc_forward>
-
-L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
-L<FS::svc_acct>, L<FS::svc_domain>, L<Net::SSH>, L<ssh>, L<dot-qmail>,
-schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
deleted file mode 100644
index b06d03013..000000000
--- a/FS/FS/svc_domain.pm
+++ /dev/null
@@ -1,478 +0,0 @@
-package FS::svc_domain;
-
-use strict;
-use vars qw( @ISA $whois_hack $conf $smtpmachine
-  @defaultrecords $soadefaultttl $soaemail $soaexpire $soamachine
-  $soarefresh $soaretry $qshellmachine $nossh_hack 
-);
-use Carp;
-use Mail::Internet 1.44;
-use Mail::Header;
-use Date::Format;
-use Net::Whois 1.0;
-use Net::SSH;
-use FS::Record qw(fields qsearch qsearchs dbh);
-use FS::Conf;
-use FS::svc_Common;
-use FS::cust_svc;
-use FS::svc_acct;
-use FS::cust_pkg;
-use FS::cust_main;
-use FS::domain_record;
-use FS::queue;
-
-@ISA = qw( FS::svc_Common );
-
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::domain'} = sub { 
-  $conf = new FS::Conf;
-
-  $smtpmachine = $conf->config('smtpmachine');
-
-  @defaultrecords = $conf->config('defaultrecords');
-  $soadefaultttl = $conf->config('soadefaultttl');
-  $soaemail      = $conf->config('soaemail');
-  $soaexpire     = $conf->config('soaexpire');
-  $soamachine    = $conf->config('soamachine');
-  $soarefresh    = $conf->config('soarefresh');
-  $soaretry      = $conf->config('soaretry');
-
-  $qshellmachine = $conf->exists('qmailmachines')
-                   ? $conf->config('shellmachine')
-                   : '';
-};
-
-=head1 NAME
-
-FS::svc_domain - Object methods for svc_domain records
-
-=head1 SYNOPSIS
-
-  use FS::svc_domain;
-
-  $record = new FS::svc_domain \%hash;
-  $record = new FS::svc_domain { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $error = $record->suspend;
-
-  $error = $record->unsuspend;
-
-  $error = $record->cancel;
-
-=head1 DESCRIPTION
-
-An FS::svc_domain object represents a domain.  FS::svc_domain inherits from
-FS::svc_Common.  The following fields are currently supported:
-
-=over 4
-
-=item svcnum - primary key (assigned automatically for new accounts)
-
-=item domain
-
-=item catchall - optional svcnum of an svc_acct record, designating an email catchall account.
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new domain.  To add the domain to the database, see L<"insert">.
-
-=cut
-
-sub table { 'svc_domain'; }
-
-=item insert
-
-Adds this domain to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-The additional fields I<pkgnum> and I<svcpart> (see L<FS::cust_svc>) should be 
-defined.  An FS::cust_svc record will be created and inserted.
-
-The additional field I<action> should be set to I<N> for new domains or I<M>
-for transfers.
-
-A registration or transfer email will be submitted unless
-$FS::svc_domain::whois_hack is true.
-
-The additional field I<email> can be used to manually set the admin contact
-email address on this email.  Otherwise, the svc_acct records for this package 
-(see L<FS::cust_pkg>) are searched.  If there is exactly one svc_acct record
-in the same package, it is automatically used.  Otherwise an error is returned.
-
-If any I<soamachine> configuration file exists, an SOA record is added to
-the domain_record table (see <FS::domain_record>).
-
-If any records are defined in the I<defaultrecords> configuration file,
-appropriate records are added to the domain_record table (see
-L<FS::domain_record>).
-
-If a machine is defined in the I<shellmachine> configuration value, the
-I<qmailmachines> configuration file exists, and the I<catchall> field points
-to an an account with a home directory (see L<FS::svc_acct>), the command:
-
-  [ -e $dir/.qmail-$qdomain-defualt ] || {
-    touch $dir/.qmail-$qdomain-default;
-    chown $uid:$gid $dir/.qmail-$qdomain-default;
-  }
-
-is executed on shellmachine via ssh (see L<dot-qmail/"EXTENSION ADDRESSES">).
-This behaviour can be supressed by setting $FS::svc_domain::nossh_hack true.
-
-a machine is defined
-in the 
-
-=cut
-
-sub insert {
-  my $self = shift;
-  my $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  $error = $self->check;
-  return $error if $error;
-
-  return "Domain in use (here)"
-    if qsearchs( 'svc_domain', { 'domain' => $self->domain } );
-
-  my $whois = $self->whois;
-  if ( $self->action eq "N" && ! $whois_hack && $whois ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "Domain in use (see whois)";
-  }
-  if ( $self->action eq "M" && ! $whois ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "Domain not found (see whois)";
-  }
-
-  $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  $self->submit_internic unless $whois_hack;
-
-  if ( $soamachine ) {
-    my $soa = new FS::domain_record {
-      'svcnum'  => $self->svcnum,
-      'reczone' => '@',
-      'recaf'   => 'IN',
-      'rectype' => 'SOA',
-      'recdata' => "$soamachine $soaemail ( ". time2str("%Y%m%d", time). "00 ".
-                   "$soarefresh $soaretry $soaexpire $soadefaultttl )"
-    };
-    $error = $soa->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "couldn't insert SOA record for new domain: $error";
-    }
-
-    foreach my $record ( @defaultrecords ) {
-      my($zone,$af,$type,$data) = split(/\s+/,$record,4);
-      my $domain_record = new FS::domain_record {
-        'svcnum'  => $self->svcnum,
-        'reczone' => $zone,
-        'recaf'   => $af,
-        'rectype' => $type,
-        'recdata' => $data,
-      };
-      my $error = $domain_record->insert;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "couldn't insert record for new domain: $error";
-      }
-    }
-
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  if ( $qshellmachine && $self->catchall && ! $nossh_hack ) {
-
-    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->catchall } )
-      or warn "WARNING: inserted unknown catchall: ". $self->catchall;
-    if ( $svc_acct && $svc_acct->dir ) {
-      my $qdomain = $self->domain;
-      $qdomain =~ s/\./:/g; #see manpage for 'dot-qmail': EXTENSION ADDRESSES
-      my ( $uid, $gid, $dir ) = (
-        $svc_acct->uid,
-        $svc_acct->gid,
-        $svc_acct->dir,
-      );
-  
-    my $queue = new FS::queue {
-      'svcnum' => $self->svcnum,
-      'job'    => 'Net::SSH::ssh_cmd',
-    };
-    $error = $queue->insert("root\@$qshellmachine", "[ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }" );
-
-    }
-  }
-
-  ''; #no error
-}
-
-=item delete
-
-Deletes this domain from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-The corresponding FS::cust_svc record will be deleted as well.
-
-=cut
-
-sub delete {
-  my $self = shift;
-
-  return "Can't delete a domain which has accounts!"
-    if qsearch( 'svc_acct', { 'domsvc' => $self->svcnum } );
-
-  return "Can't delete a domain with (svc_acct_sm) mail aliases!"
-    if defined( $FS::Record::dbdef->table('svc_acct_sm') )
-       && qsearch('svc_acct_sm', { 'domsvc' => $self->svcnum } );
-
-  #return "Can't delete a domain with (domain_record) zone entries!"
-  #  if qsearch('domain_record', { 'svcnum' => $self->svcnum } );
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->SUPER::delete;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  foreach my $domain_record ( reverse $self->domain_record ) {
-    my $error = $domain_record->delete;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-}
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-
-  return "Can't change domain - reorder."
-    if $old->getfield('domain') ne $new->getfield('domain'); 
-
-  my $error = $new->SUPER::replace($old);
-  return $error if $error;
-}
-
-=item suspend
-
-Just returns false (no error) for now.
-
-Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item unsuspend
-
-Just returns false (no error) for now.
-
-Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item cancel
-
-Just returns false (no error) for now.
-
-Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item check
-
-Checks all fields to make sure this is a valid domain.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-Sets any fixed values; see L<FS::part_svc>.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $x = $self->setfixed;
-  return $x unless ref($x);
-  #my $part_svc = $x;
-
-  my $error = $self->ut_numbern('svcnum')
-              || $self->ut_numbern('catchall')
-  ;
-  return $error if $error;
-
-  #hmm
-  my $pkgnum;
-  if ( $self->svcnum ) {
-    my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $self->svcnum } );
-    $pkgnum = $cust_svc->pkgnum;
-  } else {
-    $pkgnum = $self->pkgnum;
-  }
-
-  my($recref) = $self->hashref;
-
-  unless ( $whois_hack ) {
-    unless ( $self->email ) { #find out an email address
-      my @svc_acct;
-      foreach ( qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } ) ) {
-        my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $_->svcnum } );
-        push @svc_acct, $svc_acct if $svc_acct;
-      }
-
-      if ( scalar(@svc_acct) == 0 ) {
-        return "Must order an account in package ". $pkgnum. " first";
-      } elsif ( scalar(@svc_acct) > 1 ) {
-        return "More than one account in package ". $pkgnum. ": specify admin contact email";
-      } else {
-        $self->email($svc_acct[0]->email );
-      }
-    }
-  }
-
-  #if ( $recref->{domain} =~ /^([\w\-\.]{1,22})\.(com|net|org|edu)$/ ) {
-  if ( $recref->{domain} =~ /^([\w\-]{1,22})\.(com|net|org|edu)$/ ) {
-    $recref->{domain} = "$1.$2";
-  # hmmmmmmmm.
-  } elsif ( $whois_hack && $recref->{domain} =~ /^([\w\-\.]+)$/ ) {
-    $recref->{domain} = $1;
-  } else {
-    return "Illegal domain ". $recref->{domain}.
-           " (or unknown registry - try \$whois_hack)";
-  }
-
-  $recref->{action} =~ /^(M|N)$/ or return "Illegal action";
-  $recref->{action} = $1;
-
-  my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $recref->{catchall} } );
-  return "Unknown catchall" unless $svc_acct || ! $recref->{catchall};
-
-  $self->ut_textn('purpose');
-
-}
-
-=item domain_record
-
-=cut
-
-sub domain_record {
-  my $self = shift;
-
-  my %order = (
-    SOA => 1,
-    NS => 2,
-    MX => 3,
-    CNAME => 4,
-    A => 5,
-  );
-
-  sort { $order{$a->rectype} <=> $order{$b->rectype} }
-    qsearch('domain_record', { svcnum => $self->svcnum } );
-
-}
-
-=item whois
-
-Returns the Net::Whois::Domain object (see L<Net::Whois>) for this domain, or
-undef if the domain is not found in whois.
-
-(If $FS::svc_domain::whois_hack is true, returns that in all cases instead.)
-
-=cut
-
-sub whois {
-  $whois_hack or new Net::Whois::Domain $_[0]->domain;
-}
-
-=item _whois
-
-Depriciated.
-
-=cut
-
-sub _whois {
-  die "_whois depriciated";
-}
-
-=item submit_internic
-
-Submits a registration email for this domain.
-
-=cut
-
-sub submit_internic {
-  #my $self = shift;
-  carp "submit_internic depreciated";
-}
-
-=back
-
-=head1 VERSION
-
-$Id: svc_domain.pm,v 1.31 2002-06-10 02:52:48 ivan Exp $
-
-=head1 BUGS
-
-All BIND/DNS fields should be included (and exported).
-
-Delete doesn't send a registration template.
-
-All registries should be supported.
-
-Should change action to a real field.
-
-The $recref stuff in sub check should be cleaned up.
-
-=head1 SEE ALSO
-
-L<FS::svc_Common>, L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>,
-L<FS::part_svc>, L<FS::cust_pkg>, L<Net::Whois>, L<ssh>,
-L<dot-qmail>, schema.html from the base documentation, config.html from the
-base documentation.
-
-=cut
-
-1;
-
-
diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
deleted file mode 100644
index 1c5b5c40d..000000000
--- a/FS/FS/svc_forward.pm
+++ /dev/null
@@ -1,470 +0,0 @@
-package FS::svc_forward;
-
-use strict;
-use vars qw( @ISA $nossh_hack $conf $shellmachine @qmailmachines
-             @vpopmailmachines );
-use Net::SSH qw(ssh);
-use FS::Conf;
-use FS::Record qw( fields qsearch qsearchs dbh );
-use FS::svc_Common;
-use FS::cust_svc;
-use FS::svc_acct;
-use FS::svc_domain;
-
-@ISA = qw( FS::svc_Common );
-
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::svc_forward'} = sub { 
-  $conf = new FS::Conf;
-  if ( $conf->exists('qmailmachines') ) {
-    $shellmachine = $conf->config('shellmachine')
-  } else {
-    $shellmachine = '';
-  }
-  if ( $conf->exists('vpopmailmachines') ) {
-    @vpopmailmachines = $conf->config('vpopmailmachines');
-  } else {
-    @vpopmailmachines = ();
-  }
-};
-
-=head1 NAME
-
-FS::svc_forward - Object methods for svc_forward records
-
-=head1 SYNOPSIS
-
-  use FS::svc_forward;
-
-  $record = new FS::svc_forward \%hash;
-  $record = new FS::svc_forward { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $error = $record->suspend;
-
-  $error = $record->unsuspend;
-
-  $error = $record->cancel;
-
-=head1 DESCRIPTION
-
-An FS::svc_forward object represents a mail forwarding alias.  FS::svc_forward
-inherits from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item svcnum - primary key (assigned automatcially for new accounts)
-
-=item srcsvc - svcnum of the source of the forward (see L<FS::svc_acct>)
-
-=item dstsvc - svcnum of the destination of the forward (see L<FS::svc_acct>)
-
-=item dst - foreign destination (email address) - forward not local to freeside
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new mail forwarding alias.  To add the mail forwarding alias to the
-database, see L<"insert">.
-
-=cut
-
-sub table { 'svc_forward'; }
-
-=item insert
-
-Adds this mail forwarding alias to the database.  If there is an error, returns
-the error, otherwise returns false.
-
-The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
-defined.  An FS::cust_svc record will be created and inserted.
-
-If the configuration value (see L<FS::Conf>) vpopmailmachines exists, then
-the command:
-
-  [ -d $vpopdir/domains/$domain/$source ] && {
-    echo "$destination" >> $vpopdir/domains/$domain/$username/.$qmail
-    chown $vpopuid:$vpopgid $vpopdir/domains/$domain/$username/.$qmail
-  }
-
-is executed on each vpopmailmachine via ssh (see the vpopmail documentation).
-This behaviour can be supressed by setting $FS::svc_forward::nossh_hack true.
-
-=cut
-
-sub insert {
-  my $self = shift;
-  my $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  $error = $self->check;
-  return $error if $error;
-
-  $error = $self->SUPER::insert;
-  if ($error) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->srcsvc } );
-  my $username = $svc_acct->username;
-  my $domain = $svc_acct->domain;
-  my $destination;
-  if ($self->dstsvc) {
-    $destination = $self->dstsvc_acct->email;
-  } else {
-    $destination = $self->dst;
-  }
-    
-  foreach my $vpopmailmachine ( @vpopmailmachines ) {
-    my($machine, $vpopdir, $vpopuid, $vpopgid) = split(/\s+/, $vpopmailmachine);
-    my $queue = new FS::queue {
-      'svcnum' => $self->svcnum,
-      'job'    => 'Net::SSH::ssh_cmd',
-    };
-    # should be neater
-    my $error = $queue->insert("root\@$machine","[ -d $vpopdir/domains/$domain/$username ] && { echo \"$destination\" >> $vpopdir/domains/$domain/$username/.qmail; chown $vpopuid:$vpopgid $vpopdir/domains/$domain/$username/.qmail; }") 
-      unless $nossh_hack;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  ''; #no error
-
-}
-
-=item delete
-
-Deletes this mail forwarding alias from the database.  If there is an error,
-returns the error, otherwise returns false.
-
-The corresponding FS::cust_svc record will be deleted as well.
-
-If the configuration value vpopmailmachines exists, then the command:
-
-  { sed -e '/^$destination/d' < 
-      $vpopdir/domains/$srcdomain/$srcusername/.qmail >
-      $vpopdir/domains/$srcdomain/$srcusername/.qmail.temp;
-    mv $vpopdir/domains/$srcdomain/$srcusername/.qmail.temp
-      $vpopdir/domains/$srcdomain/$srcusername/.qmail;
-    chown $vpopuid.$vpopgid $vpopdir/domains/$srcdomain/$srcusername/.qmail; }
-    
-
-is executed on each vpopmailmachine via ssh.  This behaviour can be supressed
-by setting $FS::svc_forward_nossh_hack true.
-
-=cut
-
-sub delete {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::Autocommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->SUPER::delete;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  my $svc_acct = $self->srcsvc_acct;
-  my $username = $svc_acct->username;
-  my $domain = $svc_acct->domain;
-  my $destination;
-  if ($self->dstsvc) {
-    $destination = $self->dstsvc_acct->email;
-  } else {
-    $destination = $self->dst;
-  }
-  foreach my $vpopmailmachine ( @vpopmailmachines ) {
-    my($machine, $vpopdir, $vpopuid, $vpopgid) =
-      split(/\s+/, $vpopmailmachine);
-    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' };
-    # should be neater
-    my $error = $queue->insert("root\@$machine",
-      "sed -e '/^$destination/d' " .
-        "< $vpopdir/domains/$domain/$username/.qmail" .
-        "> $vpopdir/domains/$domain/$username/.qmail.temp; " .
-      "mv $vpopdir/domains/$domain/$username/.qmail.temp " .
-        "$vpopdir/domains/$domain/$username/.qmail; " .
-      "chown $vpopuid.$vpopgid $vpopdir/domains/$domain/$username/.qmail;"
-    )
-      unless $nossh_hack;
-
-    if ($error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-}
-
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-If the configuration value vpopmailmachines exists, then the command:
-
-  { sed -e '/^$destination/d' < 
-      $vpopdir/domains/$srcdomain/$srcusername/.qmail >
-      $vpopdir/domains/$srcdomain/$srcusername/.qmail.temp;
-    mv $vpopdir/domains/$srcdomain/$srcusername/.qmail.temp
-      $vpopdir/domains/$srcdomain/$srcusername/.qmail; 
-    chown $vpopuid.$vpopgid $vpopdir/domains/$srcdomain/$srcusername/.qmail; }
-    
-
-is executed on each vpopmailmachine via ssh.  This behaviour can be supressed
-by setting $FS::svc_forward_nossh_hack true.
-
-Also, if the configuration value vpopmailmachines exists, then the command:
-
-  [ -d $vpopdir/domains/$domain/$source ] && {
-    echo "$destination" >> $vpopdir/domains/$domain/$username/.$qmail
-    chown $vpopuid:$vpopgid $vpopdir/domains/$domain/$username/.$qmail
-  }
-
-is executed on each vpopmailmachine via ssh.  This behaviour can be supressed
-by setting $FS::svc_forward_nossh_hack true.
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-
-  if ( $new->srcsvc != $old->srcsvc
-       && ( $new->dstsvc != $old->dstsvc
-            || ! $new->dstsvc && $new->dst ne $old->dst 
-          )
-      ) {
-    return "Can't change both source and destination of a mail forward!"
-  }
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $new->SUPER::replace($old);
-  if ($error) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  my $old_svc_acct = $old->srcsvc_acct;
-  my $old_username = $old_svc_acct->username;
-  my $old_domain = $old_svc_acct->domain;
-  my $destination;
-  if ($old->dstsvc) {
-    $destination = $old->dstsvc_acct->email;
-  } else {
-    $destination = $old->dst;
-  }
-  foreach my $vpopmailmachine ( @vpopmailmachines ) {
-    my($machine, $vpopdir, $vpopuid, $vpopgid) =
-      split(/\s+/, $vpopmailmachine);
-    my $queue = new FS::queue {
-      'svcnum' => $new->svcnum,
-      'job'    => 'Net::SSH::ssh_cmd',
-    };
-    # should be neater
-    my $error = $queue->insert("root\@$machine",
-      "sed -e '/^$destination/d' " .
-        "< $vpopdir/domains/$old_domain/$old_username/.qmail" .
-        "> $vpopdir/domains/$old_domain/$old_username/.qmail.temp; " .
-      "mv $vpopdir/domains/$old_domain/$old_username/.qmail.temp " .
-        "$vpopdir/domains/$old_domain/$old_username/.qmail; " .
-      "chown $vpopuid.$vpopgid " .
-        "$vpopdir/domains/$old_domain/$old_username/.qmail;"
-    )
-      unless $nossh_hack;
-
-    if ( $error ) {
-       $dbh->rollback if $oldAutoCommit;
-       return "queueing job (transaction rolled back): $error";
-    }
-  }
-
-  #false laziness with stuff in insert, should subroutine
-  my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $new->srcsvc } );
-  my $username = $svc_acct->username;
-  my $domain = $svc_acct->domain;
-  if ($new->dstsvc) {
-    $destination = $new->dstsvc_acct->email;
-  } else {
-    $destination = $new->dst;
-  }
-  
-  foreach my $vpopmailmachine ( @vpopmailmachines ) {
-    my($machine, $vpopdir, $vpopuid, $vpopgid) = split(/\s+/, $vpopmailmachine);
-    my $queue = new FS::queue {
-      'svcnum' => $new->svcnum,
-      'job'    => 'Net::SSH::ssh_cmd',
-    };
-    # should be neater
-    my $error = $queue->insert("root\@$machine","[ -d $vpopdir/domains/$domain/$username ] && { echo \"$destination\" >> $vpopdir/domains/$domain/$username/.qmail; chown $vpopuid:$vpopgid $vpopdir/domains/$domain/$username/.qmail; }") 
-      unless $nossh_hack;
-    if ( $error ) {
-       $dbh->rollback if $oldAutoCommit;
-       return "queueing job (transaction rolled back): $error";
-    }
-  }
-  #end subroutinable bits
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-}
-
-=item suspend
-
-Just returns false (no error) for now.
-
-Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item unsuspend
-
-Just returns false (no error) for now.
-
-Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item cancel
-
-Just returns false (no error) for now.
-
-Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item check
-
-Checks all fields to make sure this is a valid mail forwarding alias.  If there
-is an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-Sets any fixed values; see L<FS::part_svc>.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $x = $self->setfixed;
-  return $x unless ref($x);
-  #my $part_svc = $x;
-
-  my $error = $self->ut_numbern('svcnum')
-              || $self->ut_number('srcsvc')
-              || $self->ut_numbern('dstsvc')
-  ;
-  return $error if $error;
-
-  return "Unknown srcsvc" unless $self->srcsvc_acct;
-
-  return "Both dstsvc and dst were defined; only one can be specified"
-    if $self->dstsvc && $self->dst;
-
-  return "one of dstsvc or dst is required"
-    unless $self->dstsvc || $self->dst;
-
-  #return "Unknown dstsvc: $dstsvc" unless $self->dstsvc_acct || ! $self->dstsvc;
-  return "Unknown dstsvc"
-    unless qsearchs('svc_acct', { 'svcnum' => $self->dstsvc } )
-           || ! $self->dstsvc;
-
-
-  if ( $self->dst ) {
-    $self->dst =~ /^([\w\.\-]+)\@(([\w\-]+\.)+\w+)$/
-       or return "Illegal dst: ". $self->dst;
-    $self->dst("$1\@$2");
-  } else {
-    $self->dst('');
-  }
-
-  ''; #no error
-}
-
-=item srcsvc_acct
-
-Returns the FS::svc_acct object referenced by the srcsvc column.
-
-=cut
-
-sub srcsvc_acct {
-  my $self = shift;
-  qsearchs('svc_acct', { 'svcnum' => $self->srcsvc } );
-}
-
-=item dstsvc_acct
-
-Returns the FS::svc_acct object referenced by the srcsvc column, or false for
-forwards not local to freeside.
-
-=cut
-
-sub dstsvc_acct {
-  my $self = shift;
-  qsearchs('svc_acct', { 'svcnum' => $self->dstsvc } );
-}
-
-=back
-
-=head1 VERSION
-
-$Id: svc_forward.pm,v 1.12 2002-05-31 17:50:37 ivan Exp $
-
-=head1 BUGS
-
-The remote commands should be configurable.
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
-L<FS::svc_acct>, L<FS::svc_domain>, L<Net::SSH>, L<ssh>, L<dot-qmail>,
-schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/svc_www.pm b/FS/FS/svc_www.pm
deleted file mode 100644
index d7a42c8ae..000000000
--- a/FS/FS/svc_www.pm
+++ /dev/null
@@ -1,276 +0,0 @@
-package FS::svc_www;
-
-use strict;
-use vars qw(@ISA $conf $apacheip);
-#use FS::Record qw( qsearch qsearchs );
-use FS::Record qw( qsearchs dbh );
-use FS::svc_Common;
-use FS::cust_svc;
-use FS::domain_record;
-use FS::svc_acct;
-use FS::svc_domain;
-
-@ISA = qw( FS::svc_Common );
-
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::svc_www'} = sub { 
-  $conf = new FS::Conf;
-  $apacheip = $conf->config('apacheip');
-};
-
-=head1 NAME
-
-FS::svc_www - Object methods for svc_www records
-
-=head1 SYNOPSIS
-
-  use FS::svc_www;
-
-  $record = new FS::svc_www \%hash;
-  $record = new FS::svc_www { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $error = $record->suspend;
-
-  $error = $record->unsuspend;
-
-  $error = $record->cancel;
-
-=head1 DESCRIPTION
-
-An FS::svc_www object represents an web virtual host.  FS::svc_www inherits
-from FS::svc_Common.  The following fields are currently supported:
-
-=over 4
-
-=item svcnum - primary key
-
-=item recnum - DNS `A' record corresponding to this web virtual host. (see L<FS::domain_record>)
-
-=item usersvc - account (see L<FS::svc_acct>) corresponding to this web virtual host.
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new web virtual host.  To add the record to the database, see
-L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-sub table { 'svc_www'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
-defined.  An FS::cust_svc record will be created and inserted.
-
-=cut
-
-sub insert {
-  my $self = shift;
-
-  my $error = $self->check;
-  return $error if $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  #if ( $self->recnum =~ /^([\w\-]+|\@)\.(([\w\.\-]+\.)+\w+)$/ ) {
-  if ( $self->recnum =~ /^([\w\-]+|\@)\.(\d+)$/ ) {
-    my( $reczone, $domain_svcnum ) = ( $1, $2 );
-    unless ( $apacheip ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "Configuration option apacheip not set; can't autocreate A record";
-             #"for $reczone". $svc_domain->domain;
-    }
-    my $domain_record = new FS::domain_record {
-      'svcnum'  => $domain_svcnum,
-      'reczone' => $reczone,
-      'recaf'   => 'IN',
-      'rectype' => 'A',
-      'recdata' => $apacheip,
-    };
-    $error = $domain_record->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-    $self->recnum($domain_record->recnum);
-  }
-
-  $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-}
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-sub delete {
-  my $self = shift;
-  my $error;
-
-  $error = $self->SUPER::delete;
-  return $error if $error;
-
-  '';
-}
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-  my $error;
-
-  $error = $new->SUPER::replace($old);
-  return $error if $error;
-
-  '';
-}
-
-=item suspend
-
-Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item unsuspend
-
-Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item cancel
-
-Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item check
-
-Checks all fields to make sure this is a valid web virtual host.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and repalce methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $x = $self->setfixed;
-  return $x unless ref($x);
-  #my $part_svc = $x;
-
-  my $error =
-    $self->ut_numbern('svcnum')
-#    || $self->ut_number('recnum')
-    || $self->ut_number('usersvc')
-  ;
-  return $error if $error;
-
-  if ( $self->recnum =~ /^(\d+)$/ ) {
-  
-    $self->recnum($1);
-    return "Unknown recnum: ". $self->recnum
-      unless qsearchs('domain_record', { 'recnum' => $self->recnum } );
-
-  } elsif ( $self->recnum =~ /^([\w\-]+|\@)\.(([\w\.\-]+\.)+\w+)$/ ) {
-
-    my( $reczone, $domain ) = ( $1, $2 );
-
-    my $svc_domain = qsearchs( 'svc_domain', { 'domain' => $domain } )
-      or return "unknown domain $domain (recnum $1.$2)";
-
-    my $domain_record = qsearchs( 'domain_record', {
-      'reczone' => $reczone,
-      'svcnum' => $svc_domain->svcnum,
-    });
-
-    if ( $domain_record ) {
-      $self->recnum($domain_record->recnum);
-    } else {
-      #insert will create it
-      #$self->recnum("$reczone.$domain");
-      $self->recnum("$reczone.". $svc_domain->svcnum);
-    }
-
-  } else {
-    return "Illegal recnum: ". $self->recnum;
-  }
-
-  return "Unknown usersvc (svc_acct.svcnum): ". $self->usersvc
-    unless qsearchs('svc_acct', { 'svcnum' => $self->usersvc } );
-
-  ''; #no error
-}
-
-=item domain_record
-
-Returns the FS::domain_record record for this web virtual host's zone (see
-L<FS::domain_record>).
-
-=cut
-
-sub domain_record {
-  my $self = shift;
-  qsearchs('domain_record', { 'recnum' => $self->recnum } );
-}
-
-=item svc_acct
-
-Returns the FS::svc_acct record for this web virtual host's owner (see
-L<FS::svc_acct>).
-
-=cut
-
-sub svc_acct {
-  my $self = shift;
-  qsearchs('svc_acct', { 'svcnum' => $self->usersvc } );
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::svc_Common>, L<FS::Record>, L<FS::domain_record>, L<FS::cust_svc>,
-L<FS::part_svc>, L<FS::cust_pkg>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/type_pkgs.pm b/FS/FS/type_pkgs.pm
deleted file mode 100644
index 8e0d4ef56..000000000
--- a/FS/FS/type_pkgs.pm
+++ /dev/null
@@ -1,113 +0,0 @@
-package FS::type_pkgs;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs );
-use FS::agent_type;
-use FS::part_pkg;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::type_pkgs - Object methods for type_pkgs records
-
-=head1 SYNOPSIS
-
-  use FS::type_pkgs;
-
-  $record = new FS::type_pkgs \%hash;
-  $record = new FS::type_pkgs { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::type_pkgs record links an agent type (see L<FS::agent_type>) to a
-billing item definition (see L<FS::part_pkg>).  FS::type_pkgs inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item typenum - Agent type, see L<FS::agent_type>
-
-=item pkgpart - Billing item definition, see L<FS::part_pkg>
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Create a new record.  To add the record to the database, see L<"insert">.
-
-=cut
-
-sub table { 'type_pkgs'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-    $self->ut_number('typenum')
-    || $self->ut_number('pkgpart')
-  ;
-  return $error if $error;
-
-  return "Unknown typenum"
-    unless qsearchs( 'agent_type', { 'typenum' => $self->typenum } );
-
-  return "Unknown pkgpart"
-    unless qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
-
-  ''; #no error
-}
-
-=back
-
-=head1 VERSION
-
-$Id: type_pkgs.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, L<FS::agent_type>, L<FS::part_pkgs>, schema.html from the base
-documentation.
-
-=cut
-
-1;
-
diff --git a/FS/MANIFEST b/FS/MANIFEST
deleted file mode 100644
index 8355e40fb..000000000
--- a/FS/MANIFEST
+++ /dev/null
@@ -1,168 +0,0 @@
-Changes
-MANIFEST
-MANIFEST.SKIP
-Makefile.PL
-README
-bin/freeside-bill
-bin/freeside-daily
-bin/freeside-email
-bin/freeside-queued
-bin/freeside-apply-credits
-bin/freeside-adduser
-bin/freeside-setinvoice
-bin/freeside-overdue
-bin/freeside-receivables-report
-bin/freeside-tax-report
-bin/freeside-cc-receipts-report
-bin/freeside-credit-report
-bin/freeside-expiration-alerter
-bin/freeside-reexport
-FS.pm
-FS/CGI.pm
-FS/InitHandler.pm
-FS/ClientAPI.pm
-FS/ClientAPI/passwd.pm
-FS/ClientAPI/MyAccount.pm
-FS/Conf.pm
-FS/ConfItem.pm
-FS/Record.pm
-FS/SearchCache.pm
-FS/UI/Base.pm
-FS/UI/CGI.pm
-FS/UI/Gtk.pm
-FS/UI/agent.pm
-FS/UID.pm
-FS/Msgcat.pm
-FS/agent.pm
-FS/agent_type.pm
-FS/cust_bill.pm
-FS/cust_bill_pkg.pm
-FS/cust_credit.pm
-FS/cust_credit_bill.pm
-FS/cust_main.pm
-FS/cust_main_county.pm
-FS/cust_main_invoice.pm
-FS/cust_pay.pm
-FS/cust_bill_event.pm
-FS/cust_bill_pay.pm
-FS/cust_pay_batch.pm
-FS/cust_pkg.pm
-FS/cust_refund.pm
-FS/cust_credit_refund.pm
-FS/cust_svc.pm
-FS/part_bill_event.pm
-FS/export_svc.pm
-FS/part_export.pm
-FS/part_export_option.pm
-FS/part_export/bind.pm
-FS/part_export/bind_slave.pm
-FS/part_export/bsdshell.pm
-FS/part_export/cp.pm
-FS/part_export/cyrus.pm
-FS/part_export/http.pm
-FS/part_export/infostreet.pm
-FS/part_export/null.pm
-FS/part_export/shellcommands.pm
-FS/part_export/shellcommands_withdomain.pm
-FS/part_export/sqlmail.pm
-FS/part_export/sqlradius.pm
-FS/part_export/sysvshell.pm
-FS/part_export/textradius.pm
-FS/part_export/vpopmail.pm
-FS/part_export/www_shellcommands.pm
-FS/part_pkg.pm
-FS/part_pop_local.pm
-FS/part_referral.pm
-FS/part_svc.pm
-FS/part_svc_column.pm
-FS/pkg_svc.pm
-FS/svc_Common.pm
-FS/svc_acct.pm
-FS/svc_acct_pop.pm
-FS/svc_acct_sm.pm
-FS/svc_domain.pm
-FS/type_pkgs.pm
-FS/nas.pm
-FS/port.pm
-FS/session.pm
-FS/domain_record.pm
-FS/prepay_credit.pm
-FS/svc_www.pm
-FS/svc_forward.pm
-FS/raddb.pm
-FS/radius_usergroup.pm
-FS/queue.pm
-FS/queue_arg.pm
-FS/queue_depend.pm
-FS/msgcat.pm
-FS/cust_tax_exempt.pm
-t/agent.t
-t/agent_type.t
-t/CGI.t
-t/InitHandler.t
-t/ClientAPI.t
-t/Conf.t
-t/ConfItem.t
-t/Record.t
-t/UID.t
-t/Msgcat.t
-t/cust_bill.t
-t/cust_bill_event.t
-t/cust_bill_pay.t
-t/cust_bill_pkg.t
-t/cust_credit.t
-t/cust_credit_bill.t
-t/cust_credit_refund.t
-t/cust_main.t
-t/cust_main_county.t
-t/cust_main_invoice.t
-t/cust_pay.t
-t/cust_pay_batch.t
-t/cust_pkg.t
-t/cust_refund.t
-t/cust_svc.t
-t/domain_record.t
-t/nas.t
-t/part_bill_event.t
-t/export_svc.t
-t/part_export.t
-t/part_export_option.t
-t/part_export-bind.t
-t/part_export-bind_slave.t
-t/part_export-bsdshell.t
-t/part_export-cp.t
-t/part_export-cyrus.t
-t/part_export-http.t
-t/part_export-infostreet.t
-t/part_export-null.t
-t/part_export-shellcommands.t
-t/part_export-shellcommands_withdomain.t
-t/part_export-sqlmail.t
-t/part_export-sqlradius.t
-t/part_export-sysvshell.t
-t/part_export-textradius.t
-t/part_export-vpopmail.t
-t/part_export-www_shellcommands.t
-t/part_pkg.t
-t/part_pop_local.t
-t/part_referral.t
-t/part_svc.t
-t/part_svc_column.t
-t/pkg_svc.t
-t/port.t
-t/prepay_credit.t
-t/radius_usergroup.t
-t/session.t
-t/svc_acct.t
-t/svc_acct_pop.t
-t/svc_acct_sm.t
-t/svc_Common.t
-t/svc_domain.t
-t/svc_forward.t
-t/svc_www.t
-t/type_pkgs.t
-t/queue.t
-t/queue_arg.t
-t/msgcat.t
-t/raddb.t
-t/cust_tax_exempt.t
diff --git a/FS/MANIFEST.SKIP b/FS/MANIFEST.SKIP
deleted file mode 100644
index ae335e78a..000000000
--- a/FS/MANIFEST.SKIP
+++ /dev/null
@@ -1 +0,0 @@
-CVS/
diff --git a/FS/Makefile.PL b/FS/Makefile.PL
deleted file mode 100644
index ab4c2281b..000000000
--- a/FS/Makefile.PL
+++ /dev/null
@@ -1,8 +0,0 @@
-use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-WriteMakefile(
-    'NAME'	   => 'FS',
-    'VERSION_FROM' => 'FS.pm', # finds $VERSION
-    'EXE_FILES'    => [ glob 'bin/*' ],
-);
diff --git a/FS/README b/FS/README
deleted file mode 100644
index d4c35acb4..000000000
--- a/FS/README
+++ /dev/null
@@ -1,6 +0,0 @@
-This is the Perl module section of Freeside.
-
-perl Makefile.PL
-make
-make test
-make install
diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
deleted file mode 100644
index 9d424634b..000000000
--- a/FS/bin/freeside-adduser
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/perl -w
-#
-# $Id: freeside-adduser,v 1.4 2002-02-06 14:58:05 ivan Exp $
-
-use strict;
-use vars qw($opt_h $opt_c $opt_s);
-use Getopt::Std;
-
-my $FREESIDE_CONF = "/usr/local/etc/freeside";
-
-getopts("ch:s:");
-die &usage if $opt_c && ! $opt_h;
-my $user = shift or die &usage;
-
-if ( $opt_h ) {
-  my @args = ( 'htpasswd' );
-  push @args, '-c' if $opt_c;
-  push @args, $opt_h, $user;
-  system(@args) == 0 or die "htpasswd failed: $?";
-}
-
-my $secretfile = $opt_s || 'secrets';
-
-open(MAPSECRETS,">>$FREESIDE_CONF/mapsecrets")
-  or die "can't open $FREESIDE_CONF/mapsecrets: $!";
-print MAPSECRETS "$user $secretfile\n";
-close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
-
-sub usage {
-  die "Usage:\n\n  freeside-adduser [ -h htpasswd_file [ -c ] ] [ -s secretfile ] username"
-}
-
-=head1 NAME
-
-freeside-adduser - Command line interface to add (freeside) users.
-
-=head1 SYNOPSIS
-
-  freeside-adduser [ -h htpasswd_file [ -c ] ] [ -s secretfile ] username
-
-=head1 DESCRIPTION
-
-Adds a user to the Freeside billing system.  This is for adding users (internal
-sales/tech folks) to the web interface, not for adding customer accounts.
-
-  -h: Also call htpasswd for this user with the given filename
-
-  -c: Passed to htpasswd
-
-  -s: Specify an alternate secret file
-
-=head1 SEE ALSO
-
-L<htpasswd>, base Freeside documentation
-
-=cut
-
diff --git a/FS/bin/freeside-apply-credits b/FS/bin/freeside-apply-credits
deleted file mode 100755
index ea6a7bdd0..000000000
--- a/FS/bin/freeside-apply-credits
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use vars qw( $user $cust_main @customers );
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch);
-use FS::cust_main;
-
-$user = shift or die &usage;
-&adminsuidsetup( $user );
-
-my @customers = qsearch('cust_main', {} );
-die "No customers" unless (scalar(@customers) > 0);
-
-foreach $cust_main (@customers) {
-  print "Applying credits for customer #". $cust_main->custnum;
-  $cust_main->apply_credits;
-}
-
-
-
diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill
deleted file mode 100755
index 49ad4a768..000000000
--- a/FS/bin/freeside-bill
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/perl -w
-# don't take any world-facing input
-#!/usr/bin/perl -Tw
-
-use strict;
-use Fcntl qw(:flock);
-use Date::Parse;
-use Getopt::Std;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::cust_main;
-
-&untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_a $opt_c $opt_d $opt_p);
-getopts("acd:p");
-my $user = shift or die &usage;
-
-adminsuidsetup $user;
-
-my %bill_only = map { $_ => 1 } (
-  @ARGV ? @ARGV : ( map $_->custnum, qsearch('cust_main', {} ) )
-);
-
-#we're at now now (and later).
-my($time)= $opt_d ? str2time($opt_d) : $^T;
-
-# find packages w/ bill < time && cancel != '', and create corresponding
-# customer objects
-
-my($cust_main,%saw);
-foreach $cust_main (
-  map {
-    unless ( exists $saw{ $_->custnum } && defined $saw{ $_->custnum} ) {
-      $saw{ $_->custnum } = 0; # to avoid 'use of uninitialized value' errors
-    }
-    if (
-      ( $opt_a || ( ( $_->getfield('bill') || 0 ) <= $time ) )
-      && $bill_only{ $_->custnum }
-      && !$saw{ $_->custnum }++
-    ) {
-      qsearchs('cust_main',{'custnum'=> $_->custnum } );
-    } else {
-      ();
-    }
-  } ( qsearch('cust_pkg', { 'cancel' => '' }),
-      qsearch('cust_pkg', { 'cancel' => 0  }),
-    )
-) {
-
-  # and bill them
-
-  print "Billing customer #" . $cust_main->getfield('custnum') . "\n";
-
-  my($error);
-
-  $error=$cust_main->bill('time'=>$time);
-  warn "Error billing,  customer #" . $cust_main->getfield('custnum') . 
-    ":" . $error if $error;
-
-  if ($opt_p) {
-    $cust_main->apply_payments;
-    $cust_main->apply_credits;
-  }
-
-  if ($opt_c) {
-    $error=$cust_main->collect( 'invoice_time' => $time);
-    warn "Error collecting from customer #" . $cust_main->custnum.  ":$error"
-      if $error;
-
-    #sleep 1;
-  }
-
-}
-
-# subroutines
-
-sub untaint_argv {
-  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    #$ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
-    # Date::Parse
-    $ARGV[$_] =~ /^(.*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
-    $ARGV[$_]=$1;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n  freeside-bill [ -c [ -p ] ] [ -d 'date' ] user [ custnum custnum ... ]\n";
-}
-
-=head1 NAME
-
-freeside-bill - Command line (crontab, script) interface to customer billing.
-
-=head1 SYNOPSIS
-
-  freeside-bill [ -c [ -p ] [ -a ] ] [ -d 'date' ] user [ custnum custnum ... ]
-
-=head1 DESCRIPTION
-
-This script is deprecated in 1.4.0.  You should use freeside-daily instead.
-
-Bills customers.  Searches for customers who are due for billing and calls
-the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
-
-  -c: Turn on collecting (you probably want this).
-
-  -p: Apply unapplied payments and credits before collecting (you probably want
-      this too)
-
-  -a: Call collect even if there isn't a new invoice (probably a bad idea for
-      daily use)
-
-  -d: Pretend it's 'date'.  Date is in any format Date::Parse is happy with,
-      but be careful.
-
-user: From the mapsecrets file - see config.html from the base documentation
-
-custnum: if one or more customer numbers are specified, only bills those
-customers.  Otherwise, bills all customers.
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<freeside-daily>, L<FS::cust_main>, config.html from the base documentation
-
-=cut
-
diff --git a/FS/bin/freeside-cc-receipts-report b/FS/bin/freeside-cc-receipts-report
deleted file mode 100755
index 06e3aba81..000000000
--- a/FS/bin/freeside-cc-receipts-report
+++ /dev/null
@@ -1,270 +0,0 @@
-#!/usr/bin/perl -Tw
-
-
-use strict;
-use Date::Parse;
-use Time::Local;
-use Getopt::Std;
-use Text::Template;
-use Net::SMTP;
-use Mail::Header;
-use Mail::Internet;
-use FS::Conf;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::cust_pay;
-use FS::cust_pay_batch;
-
-
-&untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $opt_s $opt_f $report_lines $report_template @buf $header);
-getopts("vpmef:s:");	#switches
-
-#we're at now now (and later).
-my($_finishdate)= $opt_f ? str2time($main::opt_f) : $^T;
-my($_startdate)= $opt_s ? str2time($main::opt_s) : $^T;
-
-# Get the current month
-my ($ssec,$smin,$shour,$smday,$smon,$syear) =
-	(localtime($_startdate) )[0,1,2,3,4,5]; 
-$smon++;
-$syear += 1900;
-
-# Get the current month
-my ($fsec,$fmin,$fhour,$fmday,$fmon,$fyear) =
-	(localtime($_finishdate) )[0,1,2,3,4,5]; 
-$fmon++;
-$fyear += 1900;
-
-# Login to the database
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-# Get the needed configuration files
-my $conf = new FS::Conf;
-my $lpr = $conf->config('lpr');
-my $email = $conf->config('email');
-my $smtpmachine = $conf->config('smtpmachine');
-my $mail_sender = $conf->exists('invoice_from') ? $conf->config('invoice_from') :
-  'postmaster';
-my @report_template = $conf->config('report_template')
-  or die "cannot load config file report_template";
-$report_lines = 0;
-foreach ( grep /report_lines\(\d+\)/, @report_template ) { #kludgy :/
-  /report_lines\((\d+)\)/;
-  $report_lines += $1;
-}
-die "no report_lines() functions in template?" unless $report_lines;
-$report_template = new Text::Template (
-  TYPE   => 'ARRAY',
-  SOURCE => [ map "$_\n", @report_template ],
-) or die "can't create new Text::Template object: $Text::Template::ERROR";
-
-
-my(@cust_pays)=qsearch('cust_pay',{});
-if (scalar(@cust_pays) == 0)
-{
-	exit 1;
-}
-
-# Open print and email pipes
-# $lpr and opt_p for printing
-# $email and opt_m for email
-
-if ($lpr && $main::opt_p)
-{
-        open(LPR, "|$lpr");
-}
-
-if ($email && $main::opt_m)
-{
-  $ENV{MAILADDRESS} = $mail_sender;
-  $header = new Mail::Header ( [
-    "From: Account Processor",
-    "To: $email",
-    "Sender: $mail_sender",
-    "Reply-To: $mail_sender",
-    "Subject: Credit Card Receipts",
-  ] );
-}
-
-my $uninvoiced = 0;
-my $total = 0;
-my $taxed = 0;
-my $untaxed = 0;
-my $total_tax = 0;
-
-# Now I can start looping
-foreach my $cust_pay (@cust_pays)
-{
-	my $_date = $cust_pay->getfield('_date');
-	my $invnum = $cust_pay->getfield('invnum');
-	my $paid = $cust_pay->getfield('paid');
-	my $payby = $cust_pay->getfield('payby');
-	
-
-	if ($_date >= $_startdate && $_date <= $_finishdate && $payby =~ 'CARD') {
-		$total += $paid;
-
-		$uninvoiced += $cust_pay->unapplied; 
-		my @cust_bill_pays = $cust_pay->cust_bill_pay;
-                foreach my $cust_bill_pay (@cust_bill_pays) {
-			my $invoice_amt =0;
-			my $invoice_tax =0;
-			my(@cust_bill_pkgs)= $cust_bill_pay->cust_bill->cust_bill_pkg;
-			foreach my $cust_bill_pkg (@cust_bill_pkgs) {
-
-				my $recur = $cust_bill_pkg->getfield('recur');
-				my $setup = $cust_bill_pkg->getfield('setup');
-				my $pkgnum = $cust_bill_pkg->getfield('pkgnum');
-			
-				if ($pkgnum == 0) {
-					$invoice_tax += $recur;
-					$invoice_tax += $setup;
-				} else {
-					$invoice_amt += $recur;
-					$invoice_amt += $setup;
-				}
-
-			}
-
-			if ($invoice_tax > 0) {
-				if ($invoice_amt != $paid) {
-					# attempt to prorate partially paid invoices
-					$total_tax += $paid / ($invoice_amt + $invoice_tax) * $invoice_tax;
-					$taxed += $paid / ($invoice_amt + $invoice_tax) * $invoice_amt;
-				} else {
-					$total_tax += $invoice_tax;
-					$taxed += $invoice_amt;
-				}
-			} else {
-				$untaxed += $paid;
-			}
-
-		}
-
-	}
-
-}
-
-push @buf, sprintf(qq{\n%25s%14.2f\n}, "Uninvoiced", $uninvoiced);
-push @buf, sprintf(qq{%25s%14.2f\n}, "Untaxed", $untaxed);
-push @buf, sprintf(qq{%25s%14.2f\n}, "Taxed", $taxed);
-push @buf, sprintf(qq{%25s%14.2f\n}, "Tax", $total_tax);
-push @buf, sprintf(qq{\n%39s\n%39.2f\n}, "=========", $total);
-
-sub FS::cc_receipts_report::_template::report_lines {
-  my $lines = shift;
-  map {
-    scalar(@buf) ? shift @buf : '' ;
-  }
-  ( 1 .. $lines );
-}
-
-$FS::cc_receipts_report::_template::title = qq~CREDIT CARD RECEIPTS for period $smon/$smday/$syear through $fmon/$fmday/$fyear~;
-$FS::cc_receipts_report::_template::title = $opt_t if $opt_t;
-$FS::cc_receipts_report::_template::page = 1;
-$FS::cc_receipts_report::_template::date = $^T;
-$FS::cc_receipts_report::_template::date = $^T;
-$FS::cc_receipts_report::_template::fdate = $_finishdate;
-$FS::cc_receipts_report::_template::fdate = $_finishdate;
-$FS::cc_receipts_report::_template::sdate = $_startdate;
-$FS::cc_receipts_report::_template::sdate = $_startdate;
-$FS::cc_receipts_report::_template::total_pages = 
-  int( scalar(@buf) / $report_lines);
-$FS::cc_receipts_report::_template::total_pages++ if scalar(@buf) % $report_lines;
-
-my @report;
-while (@buf) {
-  push @report, split("\n", 
-    $report_template->fill_in( PACKAGE => 'FS::cc_receipts_report::_template' )
-  );
-  $FS::cc_receipts_report::_template::page++;
-}
-
-if ($opt_v) {
-  print map "$_\n", @report;
-}
-if($lpr && $opt_p)
-{
-  print LPR map "$_\n", @report;
-  print LPR "\f" if $opt_e;
-  close LPR || die "Could not close printer: $lpr\n";
-}
-if($email && $opt_m)
-{
-  my $message = new Mail::Internet (
-    'Header' => $header,
-    'Body' => [ (@report) ],
-  );
-  $!=0;
-  $message->smtpsend( Host => "$smtpmachine" )
-    or die "can't send report to $email via $smtpmachine: $!";
-}
-
-
-# subroutines
-sub untaint_argv {
-  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    $ARGV[$_] =~ /^([\w\-\/ :]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
-    $ARGV[$_]=$1;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n  freeside-cc-receipts-report [-v] [-p] [-e] user\n";
-}
-
-=head1 NAME
-
-freeside-cc-receipts-report - Prints or emails total credit card receipts in a given period.
-
-=head1 SYNOPSIS
-
-  freeside-cc-receipts-report [-v] [-p] [-m] [-e] [-t "title"] [-s date] [-f date] user
-
-=head1 DESCRIPTION
-
-Prints or emails sales taxes invoiced in a given period.
-
--v: Verbose - Prints records to STDOUT.
-
--p: Print to printer lpr as found in the conf directory.
-
--m: Email output to user found in the Conf email file.
-
--e: Print a final form feed to the printer.
-
--t: supply a title for the top of each page.
-
--s: starting date for inclusion
-
--f: final date for inclusion
-
-user: From the mapsecrets file - see config.html from the base documentation
-
-=head1 VERSION
-
-$Id: freeside-cc-receipts-report,v 1.4 2002-03-07 19:50:23 jeff Exp $
-
-=head1 BUGS
-
-Yes..... Use at your own risk. No guarantees or warrantees of any
-kind apply to this program. Parts of this program are hacked from
-other GNU licensed software created mainly by Ivan Kohler.
-
-This is released under the GNU Public License. See www.gnu.org
-for more information regarding this license.
-
-=head1 SEE ALSO
-
-L<FS::cust_main>, config.html from the base documentation
-
-=head1 AUTHOR
-
-Jeff Finucane <jeff@cmh.net>
-
-based on print-batch by Joel Griffiths <griff@aver-computer.com>
-
-=cut
-
diff --git a/FS/bin/freeside-credit-report b/FS/bin/freeside-credit-report
deleted file mode 100755
index 7699daf4d..000000000
--- a/FS/bin/freeside-credit-report
+++ /dev/null
@@ -1,224 +0,0 @@
-#!/usr/bin/perl -Tw
-
-
-use strict;
-use Date::Parse;
-use Time::Local;
-use Getopt::Std;
-use Text::Template;
-use Net::SMTP;
-use Mail::Header;
-use Mail::Internet;
-use FS::Conf;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch);
-use FS::cust_credit;
-
-
-&untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $opt_s $opt_f $report_lines $report_template @buf $header);
-getopts("vpmef:s:");	#switches
-
-#we're at now now (and later).
-my($_finishdate)= $opt_f ? str2time($main::opt_f) : $^T;
-my($_startdate)= $opt_s ? str2time($main::opt_s) : $^T;
-
-# Get the current month
-my ($ssec,$smin,$shour,$smday,$smon,$syear) =
-	(localtime($_startdate) )[0,1,2,3,4,5]; 
-$smon++;
-$syear += 1900;
-
-# Get the current month
-my ($fsec,$fmin,$fhour,$fmday,$fmon,$fyear) =
-	(localtime($_finishdate) )[0,1,2,3,4,5]; 
-$fmon++;
-$fyear += 1900;
-
-# Login to the database
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-# Get the needed configuration files
-my $conf = new FS::Conf;
-my $lpr = $conf->config('lpr');
-my $email = $conf->config('email');
-my $smtpmachine = $conf->config('smtpmachine');
-my $mail_sender = $conf->exists('invoice_from') ? $conf->config('invoice_from') :
-  'postmaster';
-my @report_template = $conf->config('report_template')
-  or die "cannot load config file report_template";
-$report_lines = 0;
-foreach ( grep /report_lines\(\d+\)/, @report_template ) { #kludgy :/
-  /report_lines\((\d+)\)/;
-  $report_lines += $1;
-}
-die "no report_lines() functions in template?" unless $report_lines;
-$report_template = new Text::Template (
-  TYPE   => 'ARRAY',
-  SOURCE => [ map "$_\n", @report_template ],
-) or die "can't create new Text::Template object: $Text::Template::ERROR";
-
-
-my(@cust_credits)=qsearch('cust_credit',{});
-if (scalar(@cust_credits) == 0)
-{
-	exit 1;
-}
-
-# Open print and email pipes
-# $lpr and opt_p for printing
-# $email and opt_m for email
-
-if ($lpr && $main::opt_p)
-{
-        open(LPR, "|$lpr");
-}
-
-if ($email && $main::opt_m)
-{
-  $ENV{MAILADDRESS} = $mail_sender;
-  $header = new Mail::Header ( [
-    "From: Account Processor",
-    "To: $email",
-    "Sender: $mail_sender",
-    "Reply-To: $mail_sender",
-    "Subject: In House Credits",
-  ] );
-}
-
-my $uninvoiced = 0;
-my $total = 0;
-my $taxed = 0;
-my $untaxed = 0;
-my $total_tax = 0;
-
-# Now I can start looping
-foreach my $cust_credit (@cust_credits)
-{
-	my $_date = $cust_credit->getfield('_date');
-	my $amount = $cust_credit->getfield('amount');
-
-	if ($_date >= $_startdate && $_date <= $_finishdate) {
-		$total += $amount;
-	}
-}
-
-push @buf, sprintf(qq{\n%25s%14.2f\n}, "Credits Offered", $total);
-push @buf, sprintf(qq{\n%39s\n%39.2f\n}, "=========", $total);
-
-sub FS::credit_report::_template::report_lines {
-  my $lines = shift;
-  map {
-    scalar(@buf) ? shift @buf : '' ;
-  }
-  ( 1 .. $lines );
-}
-
-$FS::credit_report::_template::title = qq~IN HOUSE CREDITS for $smon/$smday/$syear through $fmon/$fmday/$fyear~;
-$FS::credit_report::_template::title = $opt_t if $opt_t;
-$FS::credit_report::_template::page = 1;
-$FS::credit_report::_template::date = $^T;
-$FS::credit_report::_template::date = $^T;
-$FS::credit_report::_template::fdate = $_finishdate;
-$FS::credit_report::_template::fdate = $_finishdate;
-$FS::credit_report::_template::sdate = $_startdate;
-$FS::credit_report::_template::sdate = $_startdate;
-$FS::credit_report::_template::total_pages = 
-  int( scalar(@buf) / $report_lines);
-$FS::credit_report::_template::total_pages++ if scalar(@buf) % $report_lines;
-
-my @report;
-while (@buf) {
-  push @report, split("\n", 
-    $report_template->fill_in( PACKAGE => 'FS::credit_report::_template' )
-  );
-  $FS::credit_report::_template::page++;
-}
-
-if ($opt_v) {
-  print map "$_\n", @report;
-}
-if($lpr && $opt_p)
-{
-  print LPR map "$_\n", @report;
-  print LPR "\f" if $opt_e;
-  close LPR || die "Could not close printer: $lpr\n";
-}
-if($email && $opt_m)
-{
-  my $message = new Mail::Internet (
-    'Header' => $header,
-    'Body' => [ (@report) ],
-  );
-  $!=0;
-  $message->smtpsend( Host => "$smtpmachine" )
-    or die "can't send report to $email via $smtpmachine: $!";
-}
-
-
-# subroutines
-sub untaint_argv {
-  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    $ARGV[$_] =~ /^([\w\-\/ :]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
-    $ARGV[$_]=$1;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n  freeside-credit-report [-v] [-p] [-e] user\n";
-}
-
-=head1 NAME
-
-freeside-credit-report - Prints or emails total credit memos in a given period.
-
-=head1 SYNOPSIS
-
-  freeside-credit-report [-v] [-p] [-m] [-e] [-t "title"] [-s date] [-f date] user
-
-=head1 DESCRIPTION
-
-Prints or emails total credit memos in a given period.
-
--v: Verbose - Prints records to STDOUT.
-
--p: Print to printer lpr as found in the conf directory.
-
--m: Email output to user found in the Conf email file.
-
--e: Print a final form feed to the printer.
-
--t: supply a title for the top of each page.
-
--s: starting date for inclusion
-
--f: final date for inclusion
-
-user: From the mapsecrets file - see config.html from the base documentation
-
-=head1 VERSION
-
-$Id: freeside-credit-report,v 1.4 2002-03-07 19:50:24 jeff Exp $
-
-=head1 BUGS
-
-Yes..... Use at your own risk. No guarantees or warrantees of any
-kind apply to this program. Parts of this program are hacked from
-other GNU licensed software created mainly by Ivan Kohler.
-
-This is released under the GNU Public License. See www.gnu.org
-for more information regarding this license.
-
-=head1 SEE ALSO
-
-L<FS::cust_main>, config.html from the base documentation
-
-=head1 AUTHOR
-
-Jeff Finucane <jeff@cmh.net>
-
-based on print-batch by Joel Griffiths <griff@aver-computer.com>
-
-=cut
-
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
deleted file mode 100755
index 142b0c73a..000000000
--- a/FS/bin/freeside-daily
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use Fcntl qw(:flock);
-use Date::Parse;
-use Getopt::Std;
-use FS::UID qw(adminsuidsetup driver_name dbh);
-use FS::Record qw(qsearch qsearchs);
-use FS::cust_main;
-
-&untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_d $opt_v);
-getopts("d:v");
-my $user = shift or die &usage;
-
-adminsuidsetup $user;
-
-$FS::cust_main::Debug = 1 if $opt_v;
-
-my @cust_main = @ARGV
-  ? map { qsearchs('cust_main', { custnum => $_ } ) } @ARGV
-  : qsearch('cust_main', {} )
-;
-
-#we're at now now (and later).
-my($time)= $opt_d ? str2time($opt_d) : $^T;
-
-my($cust_main,%saw);
-foreach $cust_main ( @cust_main ) {
-
-  my $error;
-
-  $error = $cust_main->bill( 'time' => $time );
-  warn "Error billing, custnum ". $cust_main->custnum. ": $error" if $error;
-
-  $cust_main->apply_payments;
-  $cust_main->apply_credits;
-
-  $error=$cust_main->collect( 'invoice_time' => $time );
-  warn "Error collecting, custnum". $cust_main->custnum. ": $error" if $error;
-
-}
-
-if ( driver_name eq 'Pg' ) {
-  foreach my $statement ( 'vacuum', 'vacuum analyze' ) {
-    my $sth = dbh->prepare($statement) or die dbh->errstr;
-    $sth->execute or die $sth->errstr;
-  }
-}
-
-# subroutines
-
-sub untaint_argv {
-  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    #$ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
-    # Date::Parse
-    $ARGV[$_] =~ /^(.*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
-    $ARGV[$_]=$1;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n  freeside-daily [ -d 'date' ] user [ custnum custnum ... ]\n";
-}
-
-=head1 NAME
-
-freeside-daily - Run daily billing and invoice collection events.
-
-=head1 SYNOPSIS
-
-  freeside-daily [ -d 'date' ] user [ custnum custnum ... ]
-
-=head1 DESCRIPTION
-
-Bills customers and runs invoice collection events.  Should be run from
-crontab daily.
-
-This script replaces freeside-bill from 1.3.1.
-
-Bills customers.  Searches for customers who are due for billing and calls
-the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
-
-  -d: Pretend it's 'date'.  Date is in any format Date::Parse is happy with,
-      but be careful.
-
-user: From the mapsecrets file - see config.html from the base documentation
-
-custnum: if one or more customer numbers are specified, only bills those
-customers.  Otherwise, bills all customers.
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::cust_main>, config.html from the base documentation
-
-=cut
-
diff --git a/FS/bin/freeside-email b/FS/bin/freeside-email
deleted file mode 100755
index c7ff41114..000000000
--- a/FS/bin/freeside-email
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use FS::UID qw(adminsuidsetup);
-use FS::Conf;
-use FS::Record qw(qsearch);
-use FS::svc_acct;
-
-&untaint_argv;	#what it sounds like  (eww)
-my $user = shift or die &usage;
-
-adminsuidsetup $user;
-
-my $conf = new FS::Conf;
-my $domain = $conf->config('domain');
-
-my @svc_acct = qsearch('svc_acct', {});
-my @usernames = map $_->username, @svc_acct;
-my @emails = map "$_\@$domain", @usernames;
-
-print join("\n", @emails), "\n";
-
-# subroutines
-
-sub untaint_argv {
-  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    #$ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
-    # Date::Parse
-    $ARGV[$_] =~ /^(.*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
-    $ARGV[$_]=$1;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n  freeside-email user\n";
-}
-
-=head1 NAME
-
-freeside-email - Prints email addresses of all users on STDOUT
-
-=head1 SYNOPSIS
-
-  freeside-email user
-
-=head1 DESCRIPTION
-
-Prints the email addresses of all customers on STDOUT, separated by newlines.
-
-user: From the mapsecrets file - see config.html from the base documentation
-
-=head1 VERSION
-
-$Id: freeside-email,v 1.1 2001-05-15 07:52:34 ivan Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-=cut
-
diff --git a/FS/bin/freeside-expiration-alerter b/FS/bin/freeside-expiration-alerter
deleted file mode 100755
index ee3c1fb92..000000000
--- a/FS/bin/freeside-expiration-alerter
+++ /dev/null
@@ -1,224 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use Date::Format;
-use Time::Local;
-use Text::Template;
-use Getopt::Std;
-use Net::SMTP;
-use Mail::Header;
-use Mail::Internet;
-use FS::Conf;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch);
-use FS::cust_main;
-
-use vars qw($smtpmachine @body);
-
-#hush, perl!
-$FS::alerter::_template::first = "";
-$FS::alerter::_template::last = "";
-$FS::alerter::_template::company = "";
-$FS::alerter::_template::payby = "";
-$FS::alerter::_template::expdate = "";
-
-# Set the mail program  and other variables
-my $mail_sender = "billing\@mydomain.tld";  # or invoice_from if available
-my $failure_recipient = "postmaster";       # or invoice_from if available
-my $warning_time = 30 * 24 * 60 * 60;
-my $urgent_time = 15 * 24 * 60 * 60;
-my $panic_time = 5 * 24 * 60 * 60;
-my $window_time = 24 * 60 * 60;
-
-&untaint_argv;	#what it sounds like  (eww)
-
-#we're at now now (and later).
-my($_date)= $^T;
-
-# Get the current month
-my ($sec,$min,$hour,$mday,$mon,$year) =
-	(localtime($_date) )[0,1,2,3,4,5]; 
-$mon++;
-
-# Login to the database
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-# Get the needed configuration files
-my $conf = new FS::Conf;
-$smtpmachine = $conf->config('smtpmachine');
-$mail_sender = $conf->config('invoice_from')
-  if $conf->exists('invoice_from');
-$failure_recipient = $conf->config('invoice_from')
-  if $conf->exists('invoice_from');
-
-
-my(@customers)=qsearch('cust_main',{});
-if (scalar(@customers) == 0)
-{
-  exit 1;
-}
-
-# Prepare for sending email
-
-$ENV{MAILADDRESS} = $mail_sender;
-my $header = new Mail::Header ( [
-  "From: Account Processor",
-  "To: $failure_recipient",
-  "Sender: $mail_sender",
-  "Reply-To: $mail_sender",
-  "Subject: Unnotified Billing Arrangement Expirations",
-] );
-
-my @alerter_template = $conf->config('alerter_template')
-  or die "cannot load config file alerter_template";
-
-my $alerter = new Text::Template (TYPE => 'ARRAY', SOURCE => [ map "$_\n", @alerter_template ])
-  or die "can't create new Text::Template object:  Text::Template::ERROR";
-$alerter->compile() or die "can't compile template:  Text::Template::ERROR";
-
-# Now I can start looping
-foreach my $customer (@customers)
-{
-  my $custnum = $customer->getfield('custnum');
-  my $first = $customer->getfield('first');
-  my $last = $customer->getfield('last');
-  my $company = $customer->getfield('company');
-  my $payby = $customer->getfield('payby');
-  my $payinfo = $customer->getfield('payinfo');
-  my $paydate = $customer->getfield('paydate');
-  my $daytime = $customer->getfield('daytime');
-  my $night = $customer->getfield('night');
-	
-  my ($payyear,$paymonth,$payday) = split (/-/,$paydate);
-
-  my $expire_time = timelocal(0,0,0,$payday,--$paymonth,$payyear);
-
-  #credit cards expire at the end of the month/year of their exp date
-  if ($payby eq 'CARD') {
-    ($paymonth < 11) ? $paymonth++ : ($paymonth=0, $payyear++);
-    $expire_time = timelocal(0,0,0,$payday,$paymonth,$payyear);
-    $expire_time--;
-  }
-
-  if (($expire_time < $_date + $warning_time &&
-    $expire_time > $_date + $warning_time - $window_time) ||
-      ($expire_time < $_date + $urgent_time &&
-       $expire_time > $_date + $urgent_time - $window_time) ||
-      ($expire_time < $_date + $panic_time &&
-       $expire_time > $_date + $panic_time - $window_time)) {
-
-
-
-    my @packages = $customer->ncancelled_pkgs;
-    if (scalar(@packages) != 0) {
-      my @invoicing_list = $customer->invoicing_list;
-      if ( grep { $_ ne 'POST' } @invoicing_list ) { 
-        my $header = new Mail::Header ( [
-          "From: $mail_sender",
-          "To: ". join(', ', grep { $_ ne 'POST' } @invoicing_list ),
-          "Sender: $mail_sender",
-          "Reply-To: $mail_sender",
-          "Date: ". time2str("%a, %d %b %Y %X %z", time),
-          "Subject: Billing Arrangement Expiration",
-        ] );
-        $FS::alerter::_template::first = $first;
-        $FS::alerter::_template::last = $last;
-        $FS::alerter::_template::company = $company;
-        if ($payby eq 'CARD') {
-          $FS::alerter::_template::payby = "credit card (" .
-            substr($payinfo, 0, 2) . "xxxxxxxxxx" .
-            substr($payinfo, -4) . ")";
-        }elsif ($payby eq 'COMP') {
-          $FS::alerter::_template::payby = "complimentary account";
-        }else{
-          $FS::alerter::_template::payby = "current method";
-        }
-        $FS::alerter::_template::expdate = $expire_time;
-
-        my $message = new Mail::Internet (
-          'Header' => $header,
-          'Body' => [ $alerter->fill_in( PACKAGE => 'FS::alerter::_template' ) ],
-        );
-        $!=0;
-        $message->smtpsend( Host => $smtpmachine )
-          or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-            or die "Can't send expiration email: $!";
-
-      } elsif ( ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list ) { 
-        push @body, sprintf(qq{%5d %-32.32s %4s %10s %12s %12s},
-          $custnum,
-          $first . " " . $last . "   " . $company,
-          $payby,
-          $paydate,
-          $daytime,
-          $night);
-      }
-    }
-  }
-}
-
-# Now I need to send EMAIL
-if (scalar(@body)) {
-  my $message = new Mail::Internet (
-    'Header' => $header,
-    'Body' => [ (@body) ],
-  );
-  $!=0;
-  $message->smtpsend( Host => $smtpmachine )
-    or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-      or die "can't send alerter failure email to $failure_recipient".
-             " via server $smtpmachine with SMTP: $!";
-}
-
-# subroutines
-sub untaint_argv {
-  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    $ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
-    $ARGV[$_]=$1;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n  freeside-expiration-alerter user\n";
-}
-
-=head1 NAME
-
-freeside-expiration-alerter - Emails notifications of credit card expirations.
-
-=head1 SYNOPSIS
-
-  freeside-expiration-alerter user
-
-=head1 DESCRIPTION
-
-Emails customers notice that their credit card or other billing arrangement
-is about to expire.  Usually run as a cron job.
-
-user: From the mapsecrets file - see config.html from the base documentation
-
-=head1 VERSION
-
-$Id: freeside-expiration-alerter,v 1.3 2002-04-16 09:38:19 ivan Exp $
-
-=head1 BUGS
-
-Yes..... Use at your own risk. No guarantees or warrantees of any
-kind apply to this program. Parts of this program are hacked from
-other GNU licensed software created mainly by Ivan Kohler.
-
-This is released under the GNU Public License. See www.gnu.org
-for more information regarding this license.
-
-=head1 SEE ALSO
-
-L<FS::cust_main>, config.html from the base documentation
-
-=head1 AUTHOR
-
-Jeff Finucane <jeff@cmh.net>
-
-=cut
-
-
diff --git a/FS/bin/freeside-overdue b/FS/bin/freeside-overdue
deleted file mode 100755
index 116245f9c..000000000
--- a/FS/bin/freeside-overdue
+++ /dev/null
@@ -1,196 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use vars qw( $days_to_pay $cust_main $cust_pkg 
-             $cust_svc $svc_acct );
-use Getopt::Std;
-use FS::cust_main;
-use FS::cust_pkg;
-use FS::cust_svc;
-use FS::svc_acct;
-use FS::Record qw(qsearch qsearchs);
-use FS::UID qw(adminsuidsetup);
-
-&untaint_argv;
-my %opt;
-getopts('ed:qpl:scbyoi', \%opt);
-my $user = shift or die &usage;
-
-adminsuidsetup $user;
-
-my $now = time; #eventually take a time option like freeside-bill
-my ($sec,$min,$hour,$mday,$mon,$year) =
-  (localtime($now) )[0,1,2,3,4,5];
-$mon++;
-$year += 1900;
-
-foreach $cust_main ( qsearch('cust_main',{} ) ) {
-
-  my ( $eyear, $emon, $eday ) = ( 2037, 12, 31 );
-  if ( $cust_main->paydate =~ /^(\d{4})\-(\d{1,2})\-(\d{1,2})$/
-       && $cust_main->payby eq 'BILL') {
-    ( $eyear, $emon, $eday ) = ( $1, $2, $3 );
-  }
-
-  if ( ( $opt{d}
-           && $cust_main->balance_date(time - $opt{d} * 86400) > 0
-           && qsearchs( 'cust_pkg', { 'custnum' => $cust_main->custnum,
-                                      'susp' => "" } ) )
-       || ( $opt{e}
-            && $cust_main->payby eq 'BILL'
-            && ( $eyear < $year
-                 || ( $eyear == $year && $emon < $mon ) ) )
-  ) { 
-
-    unless ( $opt{q} ) {
-      print $cust_main->custnum, "\t",
-            $cust_main->last, "\t", $cust_main->first, "\t",
-            $cust_main->balance_date(time-$opt{d} * 86400);
-    }
-
-    if ( $opt{p} && ! grep { $_ eq 'POST' } $cust_main->invoicing_list ) {
-      print "\n\tAdding postal invoicing" unless $opt{q};
-      my @invoicing_list = $cust_main->invoicing_list;
-      push @invoicing_list, 'POST';
-      $cust_main->invoicing_list(\@invoicing_list);
-    }
-
-    if ( $opt{l} ) {
-      print "\n\tCharging late fee of \$$opt{l}" unless $opt{q};
-      my $error = $cust_main->charge($opt{l}, 'Late fee');
-      # comment or plandata with info so we don't redo the same late fee every
-      # day
-    }
-
-    foreach $cust_pkg ( qsearch( 'cust_pkg', 
-                                 { 'custnum' => $cust_main->custnum } ) ) {
-
-      if ($opt{s}) {
-        print "\n\tSuspending pkgnum " . $cust_pkg->pkgnum unless $opt{q};
-        $cust_pkg->suspend;
-      }
-
-      if ($opt{c}) {
-        print "\n\tCancelling pkgnum " . $cust_pkg->pkgnum unless $opt{q};
-        $cust_pkg->cancel;
-      }
-      
-    }
-
-    if ( $opt{b} ) {
-      print "\n\tBilling" unless $opt{q};
-      my $error = $cust_main->bill('time'=>$now);
-      warn "Error billing,  customer #" . $cust_main->custnum . 
-        ":" . $error if $error;
-    }
-
-    if ( $opt{y} ) {
-      print "\n\tApplying outstanding payments and credits" unless $opt{q};
-      $cust_main->apply_payments;
-      $cust_main->apply_credits;
-    }
-
-    if ( $opt{o} ) {
-      print "\n\tCollecting" unless $opt{q};
-      my $error = $cust_main->collect(
-        'invoice_time' => $now,
-        'batch_card'   => $opt{i} ? 'no' : 'yes',
-        'force_print'  => 'yes',
-      );
-      warn "Error collecting from customer #" . $cust_main->custnum.  ":$error"
-        if $error;
-    }
-
-    print "\n" unless $opt{q};
-
-  }
-
-}
-
-sub untaint_argv {
-  foreach $_ ( $[ .. $#ARGV ) { 
-    $ARGV[$_] =~ /^([\w\-\/\.]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
-    $ARGV[$_]=$1;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n    freeside-overdue [ -e ] [ -d days ] [ -q ] [ -p ] [ -l amount ] [ -s ] [ -c ] [ -b ] [ -y ] [ -o [ -i ] ] user\n";
-}
-
-
-=head1 NAME
-
-freeside-overdue - Perform actions on overdue and/or expired accounts.
-
-=head1 SYNOPSIS
-
-  freeside-overdue [ -e ] [ -d days ] [ -q ] [ -p ] [ -l amount ] [ -s ] [ -c ] [ -b ] [ -y ] [ -o [ -i ] ] user
-
-=head1 DESCRIPTION
-
-This script is deprecated in 1.4.0.  You should use freeside-daily and invoice
-events instead.
-
-Performs actions on overdue and/or expired accounts.
-
-Selection options (at least one selection option is required):
-
-  -d:  Customers with a balance due on invoices older than the supplied number
-       of days.  Requires an integer argument.
-
-  -e:  Customers with a billing expiration date in the past.
-
-Action options: 
-
-  -q:  Be quiet (by default, selected accounts are printed).
-
-  -p:  Add postal invoicing to the relevant customers.
-
-  -l:  Add a charge of the given amount to the relevant customers.
-
-  -s:  Suspend accounts.
-
-  -c:  Cancel accounts.
-
-  -b:  Bill customers (create invoices)
-
-  -y:  Apply unapplied payments and credits
-
-  -o:  Collect from customers (charge cards, print invoices)
-
-    -i:  real-time billing (as opposed to batch billing).  only relevant
-         for credit cards.
-
-  user: From the mapsecrets file - see config.html from the base documentation
-
-=head1 CRONTAB
-
-Example crontab entries:
-
-# suspend expired accounts
-20 4 * * * freeside-overdue -e -s user
-
-# quietly add postal invoicing to customers over 30 days past due
-20 4 * * * freeside-overdue -d 30 -p -q user
-
-# suspend accounts and charge a $10.23 fee for customers over 60 days past due
-20 4 * * * freeside-overdue -d 60 -s -l 10.23 user
-
-# cancel accounts over 90 days past due
-20 4 * * * freeside-overdue -d 90 -c user
-
-=head1 ORIGINAL AUTHORS
-
-Original disable-overdue version by mw/kwh: Mark W.? and Kristian Hoffmann ?
-
-Ivan seems to be turning it into the "do-everything" CLI.
-
-=head1 BUGS
-
-Hell now that this is the do-everything CLI it should have --longoptions
-
-=cut
-
-1;
-
diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
deleted file mode 100644
index 83074b9e4..000000000
--- a/FS/bin/freeside-queued
+++ /dev/null
@@ -1,254 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use vars qw( $log_file $sigterm $sigint $kids $max_kids );
-use subs qw( _die _logmsg );
-use Fcntl qw(:flock);
-use POSIX qw(setsid);
-use Date::Format;
-use IO::File;
-use FS::UID qw(adminsuidsetup forksuidsetup driver_name dbh);
-use FS::Record qw(qsearch qsearchs);
-use FS::queue;
-use FS::queue_depend;
-
-# no autoloading just yet
-use FS::cust_main;
-use FS::svc_acct;
-use Net::SSH 0.06;
-use FS::part_export;
-
-$max_kids = '10'; #guess it should be a config file...
-$kids = 0;
-
-my $user = shift or die &usage;
-
-#my $pid_file = "/var/run/freeside-queued.$user.pid";
-my $pid_file = "/var/run/freeside-queued.pid";
-
-&daemonize1;
-
-sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; $kids--; }
-$SIG{CHLD} =  \&REAPER;
-
-$sigterm = 0;
-$sigint = 0;
-$SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $sigint++; };
-$SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
-
-my $freeside_gid = scalar(getgrnam('freeside'))
-  or die "can't setgid to freeside group\n";
-$) = $freeside_gid;
-$( = $freeside_gid;
-#if freebsd can't setuid(), presumably it can't setgid() either.  grr fleabsd
-($(,$)) = ($),$();
-$) = $freeside_gid;
-
-$> = $FS::UID::freeside_uid;
-$< = $FS::UID::freeside_uid;
-#freebsd is sofa king broken, won't setuid()
-($<,$>) = ($>,$<);
-$> = $FS::UID::freeside_uid;
-
-$ENV{HOME} = (getpwuid($>))[7]; #for ssh
-adminsuidsetup $user;
-
-$log_file = "/usr/local/etc/freeside/queuelog.". $FS::UID::datasrc;
-
-&daemonize2;
-
-$SIG{__DIE__} = \&_die;
-$SIG{__WARN__} = \&_logmsg;
-
-warn "freeside-queued starting\n";
-
-my $warnkids=0;
-while (1) {
-
-  #prevent runaway forking
-  if ( $kids >= $max_kids ) {
-    warn "WARNING: maximum $kids children reached\n" unless $warnkids++;
-    sleep 1; #waiting for signals is cheap
-    next;
-  }
-  $warnkids=0;
-
-  my $nodepend = driver_name eq 'mysql'
-   ? ''
-   : 'AND 0 = ( SELECT COUNT(*) FROM queue_depend'.
-     ' WHERE queue_depend.jobnum = queue.jobnum ) ';
-
-  #my($job, $ljob);
-  #{
-  #  my $oldAutoCommit = $FS::UID::AutoCommit;
-  #  local $FS::UID::AutoCommit = 0;
-  $FS::UID::AutoCommit = 0;
-  my $dbh = dbh; 
-  
-  my $job = qsearchs(
-    'queue',
-    { 'status' => 'new' },
-    '',
-    driver_name eq 'mysql'
-      ? "$nodepend ORDER BY jobnum LIMIT 1 FOR UPDATE"
-      : "$nodepend ORDER BY jobnum FOR UPDATE LIMIT 1"
-  ) or do {
-    $dbh->commit or die $dbh->errstr; #if $oldAutoCommit;
-    sleep 5; #connecting to db is expensive
-    next;
-  };
-
-  if ( driver_name eq 'mysql'
-       && qsearch('queue_depend', { 'jobnum' => $job->jobnum } ) ) {
-    $dbh->commit or die $dbh->errstr; #if $oldAutoCommit;
-    sleep 5; #would be better if mysql could do everything in query above
-    next;
-  }
-
-  my %hash = $job->hash;
-  $hash{'status'} = 'locked';
-  my $ljob = new FS::queue ( \%hash );
-  my $error = $ljob->replace($job);
-  die $error if $error;
-
-  $dbh->commit or die $dbh->errstr; #if $oldAutoCommit;
-
-  $FS::UID::AutoCommit = 1;
-  #} 
-
-  my @args = $ljob->args;
-
-  defined( my $pid = fork ) or do {
-    warn "WARNING: can't fork: $!\n";
-    my %hash = $job->hash;
-    $hash{'status'} = 'failed';
-    $hash{'statustext'} = "[freeside-queued] can't fork: $!";
-    my $ljob = new FS::queue ( \%hash );
-    my $error = $ljob->replace($job);
-    die $error if $error;
-    next; #don't increment the kid counter
-  };
-
-  if ( $pid ) {
-    $kids++;
-  } else { #kid time
-
-    #get new db handle
-    $FS::UID::dbh->{InactiveDestroy} = 1;
-
-    forksuidsetup($user);
-
-    #auto-use export classes...
-    if ( $ljob->job =~ /(FS::part_export::\w+)::/ ) {
-      my $class = $1;
-      eval "use $class;";
-      if ( $@ ) {
-        warn "job use $class failed";
-        my %hash = $ljob->hash;
-        $hash{'status'} = 'failed';
-        $hash{'statustext'} = $@;
-        my $fjob = new FS::queue( \%hash );
-        my $error = $fjob->replace($ljob);
-        die $error if $error;
-        exit; #end-of-kid
-      };
-    }
-
-    my $eval = "&". $ljob->job. '(@args);';
-    warn "running $eval";
-    eval $eval; #throw away return value?  suppose so
-    if ( $@ ) {
-      warn "job $eval failed";
-      my %hash = $ljob->hash;
-      $hash{'status'} = 'failed';
-      $hash{'statustext'} = $@;
-      my $fjob = new FS::queue( \%hash );
-      my $error = $fjob->replace($ljob);
-      die $error if $error;
-    } else {
-      $ljob->delete;
-    }
-
-    exit;
-    #end-of-kid
-  }
-
-} continue {
-  if ( $sigterm ) {
-    warn "received TERM signal; exiting\n";
-    exit;
-  }
-  if ( $sigint ) {
-    warn "received INT signal; exiting\n";
-    exit;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n  freeside-queued user\n";
-}
-
-sub _die {
-  my $msg = shift;
-  unlink $pid_file if -e $pid_file;
-  _logmsg($msg);
-}
-
-sub _logmsg {
-  chomp( my $msg = shift );
-  my $log = new IO::File ">>$log_file";
-  flock($log, LOCK_EX);
-  seek($log, 0, 2);
-  print $log "[". time2str("%a %b %e %T %Y",time). "] [$$] $msg\n";
-  flock($log, LOCK_UN);
-  close $log;
-}
-
-sub daemonize1 {
-
-  chdir "/" or die "Can't chdir to /: $!";
-  open STDIN, '/dev/null'   or die "Can't read /dev/null: $!";
-  defined(my $pid = fork) or die "Can't fork: $!";
-  if ( $pid ) {
-    print "freeside-queued started with pid $pid\n"; #logging to $log_file\n";
-    exit unless $pid_file;
-    my $pidfh = new IO::File ">$pid_file" or exit;
-    print $pidfh "$pid\n";
-    exit;
-  }
-  #open STDOUT, '>/dev/null'
-  #                          or die "Can't write to /dev/null: $!";
-  #setsid                  or die "Can't start a new session: $!";
-  #open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
-
-}
-
-sub daemonize2 {
-  open STDOUT, '>/dev/null'
-                            or die "Can't write to /dev/null: $!";
-  setsid                  or die "Can't start a new session: $!";
-  open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
-}
-
-=head1 NAME
-
-freeside-queued - Job queue daemon
-
-=head1 SYNOPSIS
-
-  freeside-queued user
-
-=head1 DESCRIPTION
-
-Job queue daemon.  Should be running at all times.
-
-user: from the mapsecrets file - see config.html from the base documentation
-
-=head1 VERSION
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-=cut
-
diff --git a/FS/bin/freeside-receivables-report b/FS/bin/freeside-receivables-report
deleted file mode 100755
index b5a49031e..000000000
--- a/FS/bin/freeside-receivables-report
+++ /dev/null
@@ -1,217 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use Date::Parse;
-use Time::Local;
-use Getopt::Std;
-use Text::Template;
-use Net::SMTP;
-use Mail::Header;
-use Mail::Internet;
-use FS::Conf;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch);
-use FS::cust_main;
-
-
-&untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $report_lines $report_template @buf $header);
-getopts("vpmet:");	#switches
-
-#we're at now now (and later).
-my($_date)= $^T;
-
-# Get the current month
-my ($sec,$min,$hour,$mday,$mon,$year) =
-	(localtime($_date) )[0,1,2,3,4,5]; 
-$mon++;
-$year += 1900;
-
-# Login to the database
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-# Get the needed configuration files
-my $conf = new FS::Conf;
-my $lpr = $conf->config('lpr');
-my $email = $conf->config('email');
-my $smtpmachine = $conf->config('smtpmachine');
-my $mail_sender = $conf->exists('invoice_from') ? $conf->config('invoice_from') :
-  'postmaster';
-my @report_template = $conf->config('report_template')
-  or die "cannot load config file report_template";
-$report_lines = 0;
-  foreach ( grep /report_lines\(\d+\)/, @report_template ) { #kludgy :/
-  /report_lines\((\d+)\)/;
-  $report_lines += $1;
-}
-die "no report_lines() functions in template?" unless $report_lines;
-$report_template = new Text::Template (
-  TYPE   => 'ARRAY',
-  SOURCE => [ map "$_\n", @report_template ],
-) or die "can't create new Text::Template object: $Text::Template::ERROR";
-
-
-my(@customers)=qsearch('cust_main',{});
-if (scalar(@customers) == 0)
-{
-	exit 1;
-}
-
-# Open print and email pipes
-# $lpr and opt_p for printing
-# $email and opt_m for email
-
-if ($lpr && $opt_p)
-{
-        open(LPR, "|$lpr");
-}
-
-if ($email && $opt_m)
-{
-  $ENV{MAILADDRESS} = $mail_sender;
-  $header = new Mail::Header ( [
-    "From: Account Processor",
-    "To: $email",
-    "Sender: $mail_sender",
-    "Reply-To: $mail_sender",
-    "Subject: Receivables",
-  ] );
-}
-
-my $total = 0;
-
-
-# Now I can start looping
-foreach my $customer (@customers)
-{
-  my $custnum = $customer->getfield('custnum');
-  my $first = $customer->getfield('first');
-  my $last = $customer->getfield('last');
-  my $company = $customer->getfield('company');
-  my $daytime = $customer->getfield('daytime');
-  my $balance = $customer->balance;
-
-
-  if ($balance != 0) {
-    $total += $balance;
-    push @buf, sprintf(qq{%8d %-32.32s %12s %9.2f},
-      $custnum,
-      $first . " " . $last . "   " . $company,
-      $daytime,
-      $balance);
-
-  }
-
-}
-
-push @buf, ('', sprintf(qq{%61s}, "========="), sprintf(qq{%61.2f}, $total));
-
-sub FS::receivables_report::_template::report_lines {
-  my $lines = shift;
-  map {
-    scalar(@buf) ? shift @buf : '' ;
-  }
-  ( 1 .. $lines );
-}
-
-$FS::receivables_report::_template::title = " R E C E I V A B L E S ";
-$FS::receivables_report::_template::title = $opt_t if $opt_t;
-$FS::receivables_report::_template::page = 1;
-$FS::receivables_report::_template::date = $_date;
-$FS::receivables_report::_template::date = $_date;
-$FS::receivables_report::_template::total_pages = 
-  int( scalar(@buf) / $report_lines);
-$FS::receivables_report::_template::total_pages++ if scalar(@buf) % $report_lines;
-
-my @report;
-while (@buf) {
-  push @report, split("\n", 
-    $report_template->fill_in( PACKAGE => 'FS::receivables_report::_template' )
-  );
-  $FS::receivables_report::_template::page++;
-}
-
-if ($opt_v) {
-  print map "$_\n", @report;
-}
-if($lpr && $opt_p)
-{
-  print LPR map "$_\n", @report;
-  print LPR "\f" if $opt_e;
-  close LPR || die "Could not close printer: $lpr\n";
-}
-if($email && $opt_m)
-{
-  my $message = new Mail::Internet (
-    'Header' => $header,
-    'Body' => [ (@report) ],
-  );
-  $!=0;
-  $message->smtpsend( Host => "$smtpmachine" )
-    or die "can't send report to $email via $smtpmachine: $!";
-}
-
-
-# subroutines
-
-sub untaint_argv {
-  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    $ARGV[$_] =~ /^([\w\-\/ ]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
-    $ARGV[$_]=$1;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n  freeside-receivables-report [-v] [-p] [-e] user\n";
-}
-
-=head1 NAME
-
-freeside-receivables-report - Prints or emails outstanding receivables.
-
-=head1 SYNOPSIS
-
-  freeside-receivables-report [-v] [-p] [-m] [-e] [-t "title"] user
-
-=head1 DESCRIPTION
-
-Prints or emails outstanding receivables
-
-B<-v>: Verbose - Prints records to STDOUT.
-
-B<-p>: Print to printer lpr as found in the conf directory.
-
-B<-m>: Mail output to user found in the Conf email file.
-
-B<-e>: Print a final form feed to the printer.
-
-B<-t>: supply a title for the top of each page.
-
-user: From the mapsecrets file - see config.html from the base documentation
-
-=head1 VERSION
-
-$Id: freeside-receivables-report,v 1.5 2002-03-07 19:50:24 jeff Exp $
-
-=head1 BUGS
-
-Yes..... Use at your own risk. No guarantees or warrantees of any
-kind apply to this program. Parts of this program are hacked from
-other GNU licensed software created mainly by Ivan Kohler.
-
-This is released under the GNU Public License. See www.gnu.org
-for more information regarding this license.
-
-=head1 SEE ALSO
-
-L<FS::cust_main>, config.html from the base documentation
-
-=head1 AUTHOR
-
-Jeff Finucane <jeff@cmh.net>
-
-based on print-batch by Joel Griffiths <griff@aver-computer.com>
-
-=cut
-
diff --git a/FS/bin/freeside-reexport b/FS/bin/freeside-reexport
deleted file mode 100644
index b5c50a422..000000000
--- a/FS/bin/freeside-reexport
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::part_export;
-use FS::svc_acct;
-use FS::cust_svc;
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-my $export_x = shift or die &usage;
-my @part_export;
-if ( $export_x =~ /^(\d+)$/ ) {
-  @part_export = qsearchs('part_export', { exportnum=>$1 } )
-    or die "exportnum $export_x not found\n";
-} else {
-  @part_export = qsearch('part_export', { exporttype=>$export_x } )
-    or die "no exports of type $export_x found\n";
-}
-
-my $svc_something = shift or die &usage;
-my $svc_x;
-if ( $svc_something =~ /^(\d+)$/ ) {
-  my $cust_svc = qsearchs('cust_svc', { svcnum=>$1 } )
-    or die "svcnum $svc_something not found\n";
-  $svc_x = $cust_svc->svc_x;
-} else {
-  $svc_x = qsearchs('svc_acct', { username=>$svc_something } )
-    or die "username $svc_something not found\n";
-}
-
-foreach my $part_export ( @part_export ) {
-  my $error = $part_export->export_insert($svc_x);
-  die $error if $error;
-}
-
-
-sub usage {
-  die "Usage:\n\n  freeside-reexport user exportnum|exporttype svcnum|username\n";
-}
-
-=head1 NAME
-
-freeside-reexport - Command line tool to re-trigger export jobs for existing services
-
-=head1 SYNOPSIS
-
-  freeside-reexport user exportnum|exporttype svcnum|username
-
-=head1 DESCRIPTION
-
-  Re-queues the export job for the specified exportnum or exporttype(s) and
-  specified service (selected by svcnum or username).
-
-=head1 SEE ALSO
-
-L<freeside-sqlradius-reset>, L<FS::part_export>
-
-=cut
-
diff --git a/FS/bin/freeside-setinvoice b/FS/bin/freeside-setinvoice
deleted file mode 100644
index 708e2fa30..000000000
--- a/FS/bin/freeside-setinvoice
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use FS::UID qw(adminsuidsetup);
-use FS::Conf;
-use FS::Record qw(qsearch qsearchs);
-use FS::cust_main;
-use FS::svc_acct;
-
-&untaint_argv;  #what it sounds like  (eww)
-my $user = shift or die &usage;
-
-adminsuidsetup $user;
-
-foreach my $cust_main (
-   grep { ! scalar($_->invoicing_list) }
-     qsearch( 'cust_main', {} )
-) {
-  my @dest;
-  my @cust_pkg = $cust_main->ncancelled_pkgs;
-  foreach my $cust_pkg ( @cust_pkg ) {
-    foreach my $cust_svc ( $cust_pkg->cust_svc ) {
-      my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $cust_svc->svcnum } );
-      push @dest, $svc_acct->svcnum if $svc_acct;
-    }
-  }
-  push @dest, 'POST' unless @dest;
-  $cust_main->invoicing_list(\@dest);
-}
-
-sub untaint_argv {
-  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    $ARGV[$_] =~ /^(.*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
-    $ARGV[$_]=$1;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n  freeside-setinvoice user\n";
-}
-
-
diff --git a/FS/bin/freeside-sqlradius-reset b/FS/bin/freeside-sqlradius-reset
deleted file mode 100755
index 9d3a6a700..000000000
--- a/FS/bin/freeside-sqlradius-reset
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::part_export;
-use FS::svc_acct;
-use FS::cust_svc;
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-#my $machine = shift or die &usage;
-
-my @exports = qsearch('part_export', { 'exporttype' => 'sqlradius' } );
-
-foreach my $export ( @exports ) {
-  my $icradius_dbh = DBI->connect(
-    map { $export->option($_) } qw( datasrc username password )
-  ) or die $DBI::errstr;
-  for my $table (qw( radcheck radreply usergroup )) {
-    my $sth = $icradius_dbh->prepare("DELETE FROM $table");
-    $sth->execute or die "Can't reset $table table: ". $sth->errstr;
-  }
-  $icradius_dbh->disconnect;
-}
-
-foreach my $export ( @exports ) {
-
-  #my @svcparts = map { $_->svcpart } $export->export_svc;
-
-  my @svc_acct =
-    map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
-      map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-        grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-          $export->export_svc;
-
-  foreach my $svc_acct ( @svc_acct ) {
-
-    #false laziness with FS::svc_acct::insert (like it matters)
-    my $error = $export->export_insert($svc_acct);
-    die $error if $error;
-
-  }
-}
-
-sub usage {
-  #die "Usage:\n\n  sqlradius_reset user machine\n";
-  die "Usage:\n\n  freeside-sqlradius-reset user\n";
-}
-
-=head1 NAME
-
-freeside-sqlradius-reset - Command line interface to reset and recreate RADIUS SQL tables
-
-=head1 SYNOPSIS
-
-  freeside-sqlradius-reset username
-
-=head1 DESCRIPTION
-
-Deletes the radcheck, radreply and usergroup tables and repopulates them from
-the Freeside database, for all sqlradius exports.
-
-B<username> is a username added by freeside-adduser.
-
-=head1 SEE ALSO
-
-L<freeside-reexport>, L<FS::part_export>, L<FS::part_export::sqlradius>
-
-=cut
-
-
-
diff --git a/FS/bin/freeside-tax-report b/FS/bin/freeside-tax-report
deleted file mode 100755
index 8d5021358..000000000
--- a/FS/bin/freeside-tax-report
+++ /dev/null
@@ -1,292 +0,0 @@
-#!/usr/bin/perl -Tw
-
-
-use strict;
-use Date::Parse;
-use Time::Local;
-use Getopt::Std;
-use Text::Template;
-use Net::SMTP;
-use Mail::Header;
-use Mail::Internet;
-use FS::Conf;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch);
-use FS::cust_bill;
-use FS::cust_bill_pay;
-use FS::cust_pay;
-
-
-&untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $opt_s $opt_f $report_lines $report_template @buf $header);
-getopts("vpmef:s:");	#switches
-
-#we're at now now (and later).
-my($_finishdate)= $opt_f ? str2time($main::opt_f) : $^T;
-my($_startdate)= $opt_s ? str2time($main::opt_s) : $^T;
-
-# Get the current month
-my ($ssec,$smin,$shour,$smday,$smon,$syear) =
-	(localtime($_startdate) )[0,1,2,3,4,5]; 
-$smon++;
-$syear += 1900;
-
-# Get the current month
-my ($fsec,$fmin,$fhour,$fmday,$fmon,$fyear) =
-	(localtime($_finishdate) )[0,1,2,3,4,5]; 
-$fmon++;
-$fyear += 1900;
-
-# Login to the database
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-# Get the needed configuration files
-my $conf = new FS::Conf;
-my $lpr = $conf->config('lpr');
-my $email = $conf->config('email');
-my $smtpmachine = $conf->config('smtpmachine');
-my $mail_sender = $conf->exists('invoice_from') ? $conf->config('invoice_from') :
-  'postmaster';
-my @report_template = $conf->config('report_template')
-  or die "cannot load config file report_template";
-$report_lines = 0;
-foreach ( grep /report_lines\(\d+\)/, @report_template ) { #kludgy :/
-  /report_lines\((\d+)\)/;
-  $report_lines += $1;
-}
-die "no report_lines() functions in template?" unless $report_lines;
-$report_template = new Text::Template (
-  TYPE   => 'ARRAY',
-  SOURCE => [ map "$_\n", @report_template ],
-) or die "can't create new Text::Template object: $Text::Template::ERROR";
-
-
-my(@cust_bills)=qsearch('cust_bill',{});
-if (scalar(@cust_bills) == 0)
-{
-	exit 1;
-}
-
-# Open print and email pipes
-# $lpr and opt_p for printing
-# $email and opt_m for email
-
-if ($lpr && $main::opt_p)
-{
-        open(LPR, "|$lpr");
-}
-
-if ($email && $main::opt_m)
-{
-  $ENV{MAILADDRESS} = $mail_sender;
-  $header = new Mail::Header ( [
-    "From: Account Processor",
-    "To: $email",
-    "Sender: $mail_sender",
-    "Reply-To: $mail_sender",
-    "Subject: Sales Taxes Invoiced",
-  ] );
-}
-
-my $comped = 0;
-my $comped_tax = 0;
-my $other = 0;
-my $other_tax = 0;
-my $total = 0;
-my $taxed = 0;
-my $untaxed = 0;
-my $total_tax = 0;
-
-# Now I can start looping
-foreach my $cust_bill (@cust_bills)
-{
-	my $_date = $cust_bill->getfield('_date');
-	my $invnum = $cust_bill->getfield('invnum');
-	my $charged = $cust_bill->getfield('charged');
-
-	if ($_date >= $_startdate && $_date <= $_finishdate) {
-		$total += $charged;
-
-                # The following lines were used to produce rather verbose reports
-                #my ($sec,$min,$hour,$mday,$mon,$year) =
-                #       (localtime($_date) )[0,1,2,3,4,5]; 
-                #$mon++;
-                #$year -= 100 if $year >= 100;
-                #$year = "0" . $year if $year < 10;
-
-                my $invoice_amt =0;
-                my $invoice_tax =0;
-                my $invoice_comped =0;
-                my(@cust_bill_pkgs)= $cust_bill->cust_bill_pkg;
-                foreach my $cust_bill_pkg (@cust_bill_pkgs) {
-
-                        my $recur = $cust_bill_pkg->getfield('recur');
-                        my $setup = $cust_bill_pkg->getfield('setup');
-                        my $pkgnum = $cust_bill_pkg->getfield('pkgnum');
-                        
-                        if ($pkgnum == 0) {
-                                # The following line was used to produce rather verbose reports
-                                # push @buf, ('', sprintf(qq{%10s%15s%14.2f}, "$mon/$mday/$year", "Tax $invnum", $recur+$setup));
-                                $invoice_tax += $recur;
-                                $invoice_tax += $setup;
-                        } else {
-                                # The following line was used to produce rather verbose reports
-                                # push @buf, ('', sprintf(qq{%10s%15s%14.2f}, "$mon/$mday/$year", "Inv $invnum", $recur+$setup));
-                                $invoice_amt += $recur;
-                                $invoice_amt += $setup;
-                        }
-
-                }
-
-                my(@cust_bill_pays)= $cust_bill->cust_bill_pay;
-                foreach my $cust_bill_pay (@cust_bill_pays) {
-                        my $payby = $cust_bill_pay->cust_pay->payby;
-                        my $paid = $cust_bill_pay->getfield('amount');
-                        if ($payby =~ 'COMP') {
-                                $invoice_comped += $paid;
-                        }
-                }
-
-                if (abs($invoice_comped - ($invoice_amt + $invoice_tax)) < 0.0001){
-                        $comped += $invoice_amt;
-                        $comped_tax += $invoice_tax;
-                } elsif ($invoice_comped > 0) {
-                        push @buf, sprintf(qq{\nInvoice %10d has inexpliciable complimentary payments of %14.9f\n}, $invnum, $invoice_comped);
-                        $other += $invoice_amt;
-                        $other_tax += $invoice_tax;
-                } elsif ($invoice_tax > 0) {
-                        $total_tax += $invoice_tax;
-                        $taxed += $invoice_amt;
-                } else {
-                        $untaxed += $invoice_amt;
-                }
-
-        }
-
-}
-
-push @buf, ('', sprintf(qq{%25s%14.2f}, "Complimentary", $comped));
-push @buf, sprintf(qq{%25s%14.2f}, "Complimentary Tax", $comped_tax);
-push @buf, sprintf(qq{%25s%14.2f}, "Other", $other);
-push @buf, sprintf(qq{%25s%14.2f}, "Other Tax", $other_tax);
-push @buf, sprintf(qq{%25s%14.2f}, "Untaxed", $untaxed);
-push @buf, sprintf(qq{%25s%14.2f}, "Taxed", $taxed);
-push @buf, sprintf(qq{%25s%14.2f}, "Tax", $total_tax);
-push @buf, ('', sprintf(qq{%39s}, "========="), sprintf(qq{%39.2f}, $total));
-
-sub FS::tax_report::_template::report_lines {
-  my $lines = shift;
-  map {
-    scalar(@buf) ? shift @buf : '' ;
-  }
-  ( 1 .. $lines );
-}
-
-$FS::tax_report::_template::title = qq~SALES TAXES INVOICED for $smon/$smday/$syear through $fmon/$fmday/$fyear~;
-$FS::tax_report::_template::title = $opt_t if $opt_t;
-$FS::tax_report::_template::page = 1;
-$FS::tax_report::_template::date = $^T;
-$FS::tax_report::_template::date = $^T;
-$FS::tax_report::_template::fdate = $_finishdate;
-$FS::tax_report::_template::fdate = $_finishdate;
-$FS::tax_report::_template::sdate = $_startdate;
-$FS::tax_report::_template::sdate = $_startdate;
-$FS::tax_report::_template::total_pages = 
-  int( scalar(@buf) / $report_lines);
-$FS::tax_report::_template::total_pages++ if scalar(@buf) % $report_lines;
-
-my @report;
-while (@buf) {
-  push @report, split("\n", 
-    $report_template->fill_in( PACKAGE => 'FS::tax_report::_template' )
-  );
-  $FS::tax_report::_template::page++;
-}
-
-if ($opt_v) {
-  print map "$_\n", @report;
-}
-if($lpr && $opt_p)
-{
-  print LPR map "$_\n", @report;
-  print LPR "\f" if $opt_e;
-  close LPR || die "Could not close printer: $lpr\n";
-}
-if($email && $opt_m)
-{
-  my $message = new Mail::Internet (
-    'Header' => $header,
-    'Body' => [ (@report) ],
-  );
-  $!=0;
-  $message->smtpsend( Host => "$smtpmachine" )
-    or die "can't send report to $email via $smtpmachine: $!";
-}
-
-
-# subroutines
-sub untaint_argv {
-  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    $ARGV[$_] =~ /^([\w\-\/ :]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
-    $ARGV[$_]=$1;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n  freeside-tax-report [-v] [-p] [-e] user\n";
-}
-
-=head1 NAME
-
-freeside-tax-report - Prints or emails sales taxes invoiced in a given period.
-
-=head1 SYNOPSIS
-
-  freeside-tax-report [-v] [-p] [-m] [-e] [-t "title"] [-s date] [-f date] user
-
-=head1 DESCRIPTION
-
-Prints or emails sales taxes invoiced in a given period.
-
--v: Verbose - Prints records to STDOUT.
-
--p: Print to printer lpr as found in the conf directory.
-
--m: Email output to user found in the Conf email file.
-
--e: Print a final form feed to the printer.
-
--t: supply a title for the top of each page.
-
--s: starting date for inclusion
-
--f: final date for inclusion
-
-user: From the mapsecrets file - see config.html from the base documentation
-
-=head1 VERSION
-
-$Id: freeside-tax-report,v 1.4 2002-03-07 19:50:24 jeff Exp $
-
-=head1 BUGS
-
-Yes..... Use at your own risk. No guarantees or warrantees of any
-kind apply to this program. Parts of this program are hacked from
-other GNU licensed software created mainly by Ivan Kohler.
-
-This is released under the GNU Public License. See www.gnu.org
-for more information regarding this license.
-
-=head1 SEE ALSO
-
-L<FS::cust_main>, config.html from the base documentation
-
-=head1 AUTHOR
-
-Jeff Finucane <jeff@cmh.net>
-
-based on print-batch by Joel Griffiths <griff@aver-computer.com>
-
-=cut
-
diff --git a/FS/t/CGI.t b/FS/t/CGI.t
deleted file mode 100644
index 1b4e238b6..000000000
--- a/FS/t/CGI.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::CGI;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/ClientAPI.t b/FS/t/ClientAPI.t
deleted file mode 100644
index 973d8dada..000000000
--- a/FS/t/ClientAPI.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::ClientAPI;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/Conf.t b/FS/t/Conf.t
deleted file mode 100644
index a9f7653b3..000000000
--- a/FS/t/Conf.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::Conf;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/ConfItem.t b/FS/t/ConfItem.t
deleted file mode 100644
index c7932d7e3..000000000
--- a/FS/t/ConfItem.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::ConfItem;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/InitHandler.t b/FS/t/InitHandler.t
deleted file mode 100644
index 0ce60c833..000000000
--- a/FS/t/InitHandler.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::InitHandler;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/Msgcat.t b/FS/t/Msgcat.t
deleted file mode 100644
index 29e71b33c..000000000
--- a/FS/t/Msgcat.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::Msgcat;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/Record.t b/FS/t/Record.t
deleted file mode 100644
index 00de1eda3..000000000
--- a/FS/t/Record.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::Record;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/SearchCache.t b/FS/t/SearchCache.t
deleted file mode 100644
index 3c26f3528..000000000
--- a/FS/t/SearchCache.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::SearchCache;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/UID.t b/FS/t/UID.t
deleted file mode 100644
index 9f7da4e89..000000000
--- a/FS/t/UID.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::UID;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/agent.t b/FS/t/agent.t
deleted file mode 100644
index 769cce254..000000000
--- a/FS/t/agent.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::agent;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/agent_type.t b/FS/t/agent_type.t
deleted file mode 100644
index 99c66a151..000000000
--- a/FS/t/agent_type.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::agent_type;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cust_bill.t b/FS/t/cust_bill.t
deleted file mode 100644
index b43f08ee2..000000000
--- a/FS/t/cust_bill.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cust_bill;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cust_bill_event.t b/FS/t/cust_bill_event.t
deleted file mode 100644
index 0e2ca3e24..000000000
--- a/FS/t/cust_bill_event.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cust_bill_event;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cust_bill_pay.t b/FS/t/cust_bill_pay.t
deleted file mode 100644
index 001eed01e..000000000
--- a/FS/t/cust_bill_pay.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cust_bill_pay;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cust_bill_pkg.t b/FS/t/cust_bill_pkg.t
deleted file mode 100644
index 0e45bdb0c..000000000
--- a/FS/t/cust_bill_pkg.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cust_bill_pkg;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cust_credit.t b/FS/t/cust_credit.t
deleted file mode 100644
index cddf75cff..000000000
--- a/FS/t/cust_credit.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cust_credit;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cust_credit_bill.t b/FS/t/cust_credit_bill.t
deleted file mode 100644
index 0ef54c3f1..000000000
--- a/FS/t/cust_credit_bill.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cust_credit_bill;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cust_credit_refund.t b/FS/t/cust_credit_refund.t
deleted file mode 100644
index 6b2b599f3..000000000
--- a/FS/t/cust_credit_refund.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cust_credit_refund;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cust_main.t b/FS/t/cust_main.t
deleted file mode 100644
index b0ffbdb32..000000000
--- a/FS/t/cust_main.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cust_main;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cust_main_county.t b/FS/t/cust_main_county.t
deleted file mode 100644
index dd6119911..000000000
--- a/FS/t/cust_main_county.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cust_main_county;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cust_main_invoice.t b/FS/t/cust_main_invoice.t
deleted file mode 100644
index 9661620e0..000000000
--- a/FS/t/cust_main_invoice.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cust_main_invoice;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cust_pay.t b/FS/t/cust_pay.t
deleted file mode 100644
index f6d0b7571..000000000
--- a/FS/t/cust_pay.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cust_pay;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cust_pay_batch.t b/FS/t/cust_pay_batch.t
deleted file mode 100644
index 02b572c15..000000000
--- a/FS/t/cust_pay_batch.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cust_pay_batch;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cust_pkg.t b/FS/t/cust_pkg.t
deleted file mode 100644
index c6a686061..000000000
--- a/FS/t/cust_pkg.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cust_pkg;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cust_refund.t b/FS/t/cust_refund.t
deleted file mode 100644
index 91583da28..000000000
--- a/FS/t/cust_refund.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cust_refund;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cust_svc.t b/FS/t/cust_svc.t
deleted file mode 100644
index 267d731db..000000000
--- a/FS/t/cust_svc.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cust_svc;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cust_tax_exempt.pm b/FS/t/cust_tax_exempt.pm
deleted file mode 100644
index 8af13e3aa..000000000
--- a/FS/t/cust_tax_exempt.pm
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cust_tax_exempt;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cust_tax_exempt.t b/FS/t/cust_tax_exempt.t
deleted file mode 100644
index 8af13e3aa..000000000
--- a/FS/t/cust_tax_exempt.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cust_tax_exempt;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/domain_record.t b/FS/t/domain_record.t
deleted file mode 100644
index 794518ccf..000000000
--- a/FS/t/domain_record.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::domain_record;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/export_svc.t b/FS/t/export_svc.t
deleted file mode 100644
index 773c5dea7..000000000
--- a/FS/t/export_svc.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::export_svc;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/msgcat.t b/FS/t/msgcat.t
deleted file mode 100644
index c38c63935..000000000
--- a/FS/t/msgcat.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::msgcat;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/nas.t b/FS/t/nas.t
deleted file mode 100644
index 6f8ae36d2..000000000
--- a/FS/t/nas.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::nas;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_bill_event.t b/FS/t/part_bill_event.t
deleted file mode 100644
index 5626a9f97..000000000
--- a/FS/t/part_bill_event.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_bill_event;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export-bind.t b/FS/t/part_export-bind.t
deleted file mode 100644
index d0c96be40..000000000
--- a/FS/t/part_export-bind.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export::bind;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export-bind_slave.t b/FS/t/part_export-bind_slave.t
deleted file mode 100644
index c6a038610..000000000
--- a/FS/t/part_export-bind_slave.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export::bind_slave;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export-bsdshell.t b/FS/t/part_export-bsdshell.t
deleted file mode 100644
index eaf417a70..000000000
--- a/FS/t/part_export-bsdshell.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export::bsdshell;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export-cp.t b/FS/t/part_export-cp.t
deleted file mode 100644
index bbefa6c1b..000000000
--- a/FS/t/part_export-cp.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export::cp;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export-cyrus.t b/FS/t/part_export-cyrus.t
deleted file mode 100644
index e0b3f350e..000000000
--- a/FS/t/part_export-cyrus.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export::cyrus;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export-http.t b/FS/t/part_export-http.t
deleted file mode 100644
index ea41b939f..000000000
--- a/FS/t/part_export-http.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export::http;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export-infostreet.t b/FS/t/part_export-infostreet.t
deleted file mode 100644
index 1b3341825..000000000
--- a/FS/t/part_export-infostreet.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export::infostreet;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export-null.t b/FS/t/part_export-null.t
deleted file mode 100644
index 055cdcee6..000000000
--- a/FS/t/part_export-null.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export::null;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export-shellcommands.t b/FS/t/part_export-shellcommands.t
deleted file mode 100644
index 7bb47d3f8..000000000
--- a/FS/t/part_export-shellcommands.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export::shellcommands;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export-shellcommands_withdomain.t b/FS/t/part_export-shellcommands_withdomain.t
deleted file mode 100644
index c0bd1bbb0..000000000
--- a/FS/t/part_export-shellcommands_withdomain.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export::shellcommands_withdomain;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export-sqlmail.t b/FS/t/part_export-sqlmail.t
deleted file mode 100644
index b048a75a5..000000000
--- a/FS/t/part_export-sqlmail.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export::sqlmail;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export-sqlradius.t b/FS/t/part_export-sqlradius.t
deleted file mode 100644
index 5fb23a5a6..000000000
--- a/FS/t/part_export-sqlradius.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export::sqlradius;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export-sysvshell.t b/FS/t/part_export-sysvshell.t
deleted file mode 100644
index 7fc24acb1..000000000
--- a/FS/t/part_export-sysvshell.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export::sysvshell;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export-textradius.t b/FS/t/part_export-textradius.t
deleted file mode 100644
index d8a48a0c8..000000000
--- a/FS/t/part_export-textradius.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export::textradius;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export-vpopmail.t b/FS/t/part_export-vpopmail.t
deleted file mode 100644
index 2e37114a2..000000000
--- a/FS/t/part_export-vpopmail.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export::vpopmail;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export-www_shellcommands.t b/FS/t/part_export-www_shellcommands.t
deleted file mode 100644
index 2ea79cf97..000000000
--- a/FS/t/part_export-www_shellcommands.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export::www_shellcommands;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export.t b/FS/t/part_export.t
deleted file mode 100644
index 26b398791..000000000
--- a/FS/t/part_export.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export_option.t b/FS/t/part_export_option.t
deleted file mode 100644
index 13200c213..000000000
--- a/FS/t/part_export_option.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export_option;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_pkg.t b/FS/t/part_pkg.t
deleted file mode 100644
index fd96073f9..000000000
--- a/FS/t/part_pkg.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_pkg;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_pop_local.t b/FS/t/part_pop_local.t
deleted file mode 100644
index 4e4ad17f5..000000000
--- a/FS/t/part_pop_local.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_pop_local;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_referral.t b/FS/t/part_referral.t
deleted file mode 100644
index d20b97930..000000000
--- a/FS/t/part_referral.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_referral;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_svc.t b/FS/t/part_svc.t
deleted file mode 100644
index bdb2a7aca..000000000
--- a/FS/t/part_svc.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_svc;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_svc_column.t b/FS/t/part_svc_column.t
deleted file mode 100644
index 467025c1e..000000000
--- a/FS/t/part_svc_column.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_svc_column;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/pkg_svc.t b/FS/t/pkg_svc.t
deleted file mode 100644
index 77d34295a..000000000
--- a/FS/t/pkg_svc.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::pkg_svc;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/port.t b/FS/t/port.t
deleted file mode 100644
index 46377aaf9..000000000
--- a/FS/t/port.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::port;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/prepay_credit.t b/FS/t/prepay_credit.t
deleted file mode 100644
index e7626bdf1..000000000
--- a/FS/t/prepay_credit.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::prepay_credit;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/queue.t b/FS/t/queue.t
deleted file mode 100644
index 43e33730e..000000000
--- a/FS/t/queue.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::queue;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/queue_arg.t b/FS/t/queue_arg.t
deleted file mode 100644
index cf3f91dfe..000000000
--- a/FS/t/queue_arg.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::queue_arg;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/queue_depend.t b/FS/t/queue_depend.t
deleted file mode 100644
index 8eaa2cdb3..000000000
--- a/FS/t/queue_depend.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::queue_depend;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/raddb.t b/FS/t/raddb.t
deleted file mode 100644
index ac28d0798..000000000
--- a/FS/t/raddb.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::raddb;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/radius_usergroup.t b/FS/t/radius_usergroup.t
deleted file mode 100644
index 325742cf5..000000000
--- a/FS/t/radius_usergroup.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::radius_usergroup;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/session.t b/FS/t/session.t
deleted file mode 100644
index c4b714ea4..000000000
--- a/FS/t/session.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::session;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/svc_Common.t b/FS/t/svc_Common.t
deleted file mode 100644
index ed49e1e49..000000000
--- a/FS/t/svc_Common.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::svc_Common;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/svc_acct.t b/FS/t/svc_acct.t
deleted file mode 100644
index 9ca78c9d1..000000000
--- a/FS/t/svc_acct.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::svc_acct;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/svc_acct_pop.t b/FS/t/svc_acct_pop.t
deleted file mode 100644
index e612c40af..000000000
--- a/FS/t/svc_acct_pop.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::svc_acct_pop;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/svc_acct_sm.t b/FS/t/svc_acct_sm.t
deleted file mode 100644
index 1082f2cdb..000000000
--- a/FS/t/svc_acct_sm.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::svc_acct_sm;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/svc_domain.t b/FS/t/svc_domain.t
deleted file mode 100644
index 4d91898ac..000000000
--- a/FS/t/svc_domain.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::svc_domain;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/svc_forward.t b/FS/t/svc_forward.t
deleted file mode 100644
index d653d34ef..000000000
--- a/FS/t/svc_forward.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::svc_forward;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/svc_www.t b/FS/t/svc_www.t
deleted file mode 100644
index eb4e83fbc..000000000
--- a/FS/t/svc_www.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::svc_www;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/type_pkgs.t b/FS/t/type_pkgs.t
deleted file mode 100644
index 98401805c..000000000
--- a/FS/t/type_pkgs.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::type_pkgs;
-$loaded=1;
-print "ok 1\n";
diff --git a/GPL b/GPL
deleted file mode 100644
index e77696ae8..000000000
--- a/GPL
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 4b9b0853c..000000000
--- a/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-See httemplate/docs/index.html
diff --git a/Makefile b/Makefile
deleted file mode 100644
index a3f61585a..000000000
--- a/Makefile
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/usr/bin/make
-
-DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
-#DATASOURCE=DBI:mysql:freeside
-
-DB_USER = freeside
-DB_PASSWORD=
-
-TEMPLATE = asp
-#TEMPLATE = mason
-
-ASP_GLOBAL = /usr/local/etc/freeside/asp-global
-
-FREESIDE_DOCUMENT_ROOT = /var/www/freeside
-
-INIT_FILE = /etc/init.d/freeside
-
-HTTPD_RESTART = /etc/init.d/apache restart
-FREESIDE_RESTART = /etc/init.d/freeside restart
-
-INSTALLGROUP = root
-
-#edit the stuff below to have the daemons start
-
-QUEUED_USER=ivan
-
-#eventually this shouldn't be needed
-FREESIDE_PATH = `pwd`
-
-PASSWD_USER = nostart
-PASSWD_MACHINE = localhost
-
-SIGNUP_USER = nostart
-SIGNUP_MACHINE = localhost
-SIGNUP_AGENTNUM = 2
-SIGNUP_REFNUM = 2
-
-#---
-
-#not changable yet
-FREESIDE_CONF = /usr/local/etc/freeside
-
-VERSION=1.4.0
-TAG=freeside_1_4_0
-
-help:
-	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
-	@echo "                   htmlman"
-	@echo "                   perl-modules install-perl-modules"
-	@echo "                   install deploy"
-	@echo "                   create-database"
-	@echo "                   clean"
-
-aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
-	rm -rf aspdocs
-	cp -pr httemplate aspdocs
-	touch aspdocs
-
-masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
-	rm -rf masondocs
-	cp -pr httemplate masondocs
-	( cd masondocs; \
-	  ../bin/masonize; \
-	)
-	touch masondocs
-
-alldocs: aspdocs masondocs
-
-docs:
-	make ${TEMPLATE}docs
-
-htmlman:
-	[ -e ./httemplate/docs/man ] || mkdir httemplate/docs/man
-	[ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
-	[ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
-	[ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
-	[ -e ./httemplate/docs/man/FS/part_export ] || mkdir httemplate/docs/man/FS/part_export
-	[ -e DONT_REBUILD_DOCS ] || bin/pod2x
-
-forcehtmlman:
-	[ -e ./httemplate/docs/man ] || mkdir httemplate/docs/man
-	[ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
-	[ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
-	[ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
-	[ -e ./httemplate/docs/man/FS/part_export ] || mkdir httemplate/docs/man/FS/part_export
-	bin/pod2x
-
-install-docs: docs
-	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
-	cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
-	[ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL} || true
-	[ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
-	[ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
-
-perl-modules:
-	cd FS; \
-	[ -e Makefile ] || perl Makefile.PL; \
-	make
-
-install-perl-modules: perl-modules
-	cd FS; \
-	make install UNINST=1
-
-install-init:
-	#[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
-	install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
-	perl -p -i -e "\
-	  s/%%%QUEUED_USER%%%/${QUEUED_USER}/g;\
-	  s'%%%FREESIDE_PATH%%%'${FREESIDE_PATH}'g;\
-	  s/%%%PASSWD_USER%%%/${PASSWD_USER}/g;\
-	  s/%%%PASSWD_MACHINE%%%/${PASSWD_MACHINE}/g;\
-	  s/%%%SIGNUP_USER%%%/${SIGNUP_USER}/g;\
-	  s/%%%SIGNUP_MACHINE%%%/${SIGNUP_MACHINE}/g;\
-	  s/%%%SIGNUP_AGENTNUM%%%/${SIGNUP_AGENTNUM}/g;\
-	  s/%%%SIGNUP_REFNUM%%%/${SIGNUP_REFNUM}/g;\
-	" ${INIT_FILE}
-
-install: install-perl-modules install-docs install-init
-
-deploy: install
-	${HTTPD_RESTART}
-	${FREESIDE_RESTART}
-
-create-database:
-	perl -e 'use DBIx::DataSource qw( create_database ); create_database( "${DATASOURCE}", "${DB_USER}", "${DB_PASSWORD}" ) or die $$DBIx::DataSource::errstr;'
-
-create-config: install-perl-modules
-	[ -e ${FREESIDE_CONF} ] && mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S` || true
-	mkdir ${FREESIDE_CONF}
-	chown freeside ${FREESIDE_CONF}
-
-	touch ${FREESIDE_CONF}/secrets
-	chown freeside ${FREESIDE_CONF}/secrets
-	chmod 600 ${FREESIDE_CONF}/secrets
-
-	echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets
-	chmod 600 ${FREESIDE_CONF}/secrets
-	chown freeside ${FREESIDE_CONF}/secrets
-
-	mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
-	cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
-	chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
-
-	mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"
-	chown freeside "${FREESIDE_CONF}/counters.${DATASOURCE}"
-
-	mkdir "${FREESIDE_CONF}/cache.${DATASOURCE}"
-	chown freeside "${FREESIDE_CONF}/cache.${DATASOURCE}"
-
-	mkdir "${FREESIDE_CONF}/export.${DATASOURCE}"
-	chown freeside "${FREESIDE_CONF}/export.${DATASOURCE}"
-
-clean:
-	rm -rf aspdocs masondocs
-	cd FS; \
-	make clean
-
-#these are probably only useful if you're me...
-
-upload-docs: forcehtmlman
-	ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
-	scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs
-
-release: upload-docs
-	cd /home/ivan/freeside_current
-	#cvs tag ${TAG}
-	cvs tag -F ${TAG}
-
-	#cd /home/ivan
-	cvs export -r ${TAG} -d freeside-${VERSION} freeside
-	tar czvf freeside-${VERSION}.tar.gz freeside-${VERSION}
-
-	scp freeside-${VERSION}.tar.gz ivan@cleanwhisker.420.am:/var/www/sisd.420.am/freeside/
-	mv freeside-${VERSION} freeside-${VERSION}.tar.gz ..
-
-update-webdemo:
-	ssh ivan@pouncequick.420.am '( cd freeside; cvs update -d -P )'
-	#ssh root@pouncequick.420.am '( cd /home/ivan/freeside; make clean; make deploy )'
-	ssh root@pouncequick.420.am '( cd /home/ivan/freeside; make deploy )'
-
diff --git a/README b/README
deleted file mode 100644
index 91e625386..000000000
--- a/README
+++ /dev/null
@@ -1,49 +0,0 @@
-Freeside 1.4.0
-
-Copyright (C) 2000,2001 Ivan Kohler
-Copyright (C) 1999 Silicon Interactive Software Design
-All rights reserved
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of either:
-
-        a) the GNU General Public License as published by the Free
-        Software Foundation; either version 2, or (at your option) any
-        later version, or
-
-        b) the "Artistic 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 either the
-    GNU General Public License or the Artistic License for more details.
-  
-    You should have received a copy of the GNU General Public
-    License along with this program, in the file `GPL'; if not,
-    write to the Free Software Foundation, Inc., 59 Temple Place - Suite
-    330, Boston, MA 02111-1307, USA.
-
-    You should have received a copy of the Artistic License along with
-    this program, in the file `Artistic'; if not, download it from
-    http://www.perl.com/CPAN/doc/misc/license/Artistic
-
-Freeside is a billing and administration package for Internet Service 
-Providers.
-
-The Freeside home page is at `http://www.sisd.com/freeside'.
-
-The documentation is in `httemplate/docs'.
-
-A mailing list for users is available.  Send a blank message to
-<ivan-freeside-subscribe@sisd.com> to subscribe.
-
-A mailing list for developers is available.  It is intended to be lower volume
-and higher SNR than the users list.  Send a blank message to
-<ivan-freeside-devel-subscribe@sisd.com> to subscribe.
-
-Commercial support is available from Ivan Kohler <ivan@sisd.com>.  Requests for
-free support sent to me directly will be ignored.  Please subscribe to the the
-user mailing list to request free support!
-
-Ivan Kohler <ivan-freeside_readme@420.am>
-
diff --git a/TODO b/TODO
deleted file mode 100644
index 4c582c9d7..000000000
--- a/TODO
+++ /dev/null
@@ -1,9 +0,0 @@
-$Id: TODO,v 1.68 2002-02-16 18:14:23 ivan Exp $
-
-The TODO list / bug-tracking is now kept in a database.  See
-http://pouncequick.420.am/rt/
-
-If you are interested in helping with any of these, please join the
-*development* mailing list (send a blank message to
-ivan-freeside-devel-subscribe@sisd.com) to avoid duplication of effort.
-
diff --git a/bin/bind.export b/bin/bind.export
deleted file mode 100755
index 7d1452dc6..000000000
--- a/bin/bind.export
+++ /dev/null
@@ -1,182 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use File::Path;
-use File::Rsync;
-use Net::SSH qw(ssh);
-use FS::UID qw(adminsuidsetup datasrc);
-use FS::Record qw(qsearch qsearchs);
-use FS::part_export;
-use FS::cust_pkg;
-use FS::cust_svc;
-use FS::svc_domain;
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-my $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/bind";
-mkdir $spooldir, 0700 unless -d $spooldir;
-
-my @exports = qsearch('part_export', { 'exporttype' => 'bind' } );
-my @sexports = qsearch('part_export', { 'exporttype' => 'bind_slave' } );
-
-my $rsync = File::Rsync->new({
-  rsh     => 'ssh',
-#  dry_run => 1,
-});
-
-foreach my $export ( @exports ) {
-
-  my $machine = $export->machine;
-  my $prefix = "$spooldir/$machine";
-
-  #prevent old domain files from piling up
-  #rmtree "$prefix" or die "can't rmtree $prefix.db: $!";
-
-  mkdir $prefix, 0700 unless -d $prefix;
-
-  open(NAMED_CONF,">$prefix/named.conf")
-    or die "can't open $prefix/named.conf: $!";
-
-  open(CONF_HEADER,"<$prefix/named.conf.HEADER"); #or die
-  while (<CONF_HEADER>) { print NAMED_CONF $_; }
-  close CONF_HEADER;
-
-  my $zonepath = $export->option('zonepath');
-  $zonepath =~ s/\/$//;
-
-  #false laziness with  freeside-sqlradius-reset and shell.export
-  my @svc_domain =
-    map { qsearchs('svc_domain', { 'svcnum' => $_->svcnum } ) }
-      map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-        grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-          $export->export_svc;
-
-  foreach my $svc_domain ( @svc_domain ) {
-    my $domain = $svc_domain->domain;
-    my @masters = qsearch('domain_record', {
-      'svcnum' => $svc_domain->svcnum,
-      'rectype' => '_mstr',
-    } );
-    if ( @masters ) {
-      my $masters = join('; ', map { $_->recdata } @masters );
-
-      print NAMED_CONF <<END;
-zone "$domain" {
-	type slave;
-	file "db.$domain";
-	masters { $masters; };
-};
-
-END
-
-    } else {
-
-      print NAMED_CONF <<END;
-zone "$domain" {
-	type master;
-	file "$zonepath/db.$domain";
-};
-
-END
-
-      open (DB_MASTER,">$prefix/db.$domain")
-        or die "can't open $prefix/db.$domain: $!";
-
-      my @domain_records =
-        qsearch('domain_record', { 'svcnum' => $svc_domain->svcnum } );
-      foreach my $domain_record (
-        sort { $b->rectype cmp $a->rectype } @domain_records
-      ) {
-        #if ( $domain_record->rectype eq 'SOA' ) {
-        #  print DB_MASTER join("\t", $domain_record-> reczone
-        #} else {
-          print DB_MASTER join("\t",
-            map { $domain_record->getfield($_) }
-              qw( reczone recaf rectype recdata )
-          ), "\n";
-        #}
-      }
-
-      close DB_MASTER;
-
-    }
-
-  }
-
-  $rsync->exec( {
-    src       => "$prefix/",
-    recursive => 1,
-    dest      => "root\@$machine:$zonepath/",
-    exclude   => [qw( *.import named.conf.HEADER named.conf )],
-  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
- # warn $rsync->out;
-
-  $rsync->exec( {
-    src     => "$prefix/named.conf",
-    dest    => "root\@$machine:". $export->option('named_conf'),
-  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
-#  warn $rsync->out;
-
-  ssh("root\@$machine", 'ndc reload');
-
-}
-
-close NAMED_CONF;
-
-foreach my $sexport ( @sexports ) { #false laziness with above
-
-  my $machine = $sexport->machine;
-  my $prefix = "$spooldir/$machine";
-
-  #prevent old domain files from piling up
-  #rmtree "$prefix" or die "can't rmtree $prefix.db: $!";
-
-  mkdir $prefix, 0700 unless -d $prefix;
-
-  open(NAMED_CONF,">$prefix/named.conf")
-    or die "can't open $prefix/named.conf: $!";
-
-  open(CONF_HEADER,"<$prefix/named.conf.HEADER"); #or die
-  while (<CONF_HEADER>) { print NAMED_CONF $_; }
-  close CONF_HEADER;
-
-  my $masters = $sexport->option('master');
-
-  #false laziness with  freeside-sqlradius-reset 
-  my @svc_domain =
-    map { qsearchs('svc_domain', { 'svcnum' => $_->svcnum } ) }
-      map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-        grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-          $sexport->export_svc;
-
-  foreach my $svc_domain ( @svc_domain ) {
-    my $domain = $svc_domain->domain;
-    print NAMED_CONF <<END;
-zone "$domain" {
-	type slave;
-	file "db.$domain";
-	masters { $masters; };
-};
-
-END
-
-  }
-
-  $rsync->exec( {
-    src     => "$prefix/named.conf",
-    dest    => "root\@$machine:". $sexport->option('named_conf'),
-  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
-#  warn $rsync->out;
-
-  ssh("root\@$machine", 'ndc reload');
-
-}
-close NAMED_CONF;
-
-# -----
-
-sub usage {
-  die "Usage:\n  bind.export user\n"; 
-}
-
diff --git a/bin/bind.import b/bin/bind.import
deleted file mode 100755
index 57eca2b63..000000000
--- a/bin/bind.import
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/usr/bin/perl -w
-#
-# $Id: bind.import,v 1.3 2002-07-15 01:44:23 ivan Exp $
-
-#need to manually put header in /usr/local/etc/freeside/export.<datasrc./bind/<machine>/named.conf.HEADER
-
-use strict;
-use vars qw( %d_part_svc );
-use Term::Query qw(query);
-#use BIND::Conf_Parser;
-#use DNS::ZoneParse 0.81;
-
-#use Net::SCP qw(iscp);
-use Net::SCP qw(scp);
-use FS::UID qw(adminsuidsetup datasrc);
-use FS::Record qw(qsearch); #qsearchs);
-#use FS::svc_acct_sm;
-use FS::svc_domain;
-use FS::domain_record;
-#use FS::svc_acct;
-#use FS::part_svc;
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-$FS::svc_Common::noexport_hack = 1;
-$FS::domain_record::noserial_hack = 1;
-
-use vars qw($spooldir);
-$spooldir = "/usr/local/etc/freeside/export.". datasrc. "/bind";
-mkdir $spooldir unless -d $spooldir;
-
-%d_part_svc =
-  map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_domain'});
-
-print "\n\n",
-      ( join "\n", map "$_: ".$d_part_svc{$_}->svc, sort keys %d_part_svc ),
-      "\n\n";
-use vars qw($domain_svcpart);
-$^W=0; #Term::Query isn't -w-safe
-$domain_svcpart =
-  query "Enter part number for domains: ", 'irk', [ keys %d_part_svc ];
-$^W=1;
-
-print "\n\n", <<END;
-Enter the location and name of your primary named.conf file, for example
-"ns.isp.com:/var/named/named.conf"
-END
-my($named_conf)=&getvalue(":");
-  
-use vars qw($named_machine $prefix);
-$named_machine = (split(/:/, $named_conf))[0];
-$prefix = "$spooldir/$named_machine";
-mkdir $prefix unless -d $prefix;
-
-#iscp("root\@$named_conf","$prefix/named.conf.import");
-scp("root\@$named_conf","$prefix/named.conf.import");
-
-
-sub getvalue {
-  my $prompt = shift;
-  $^W=0; # Term::Query isn't -w-safe
-  my $return = query $prompt, '';
-  $^W=1;
-  $return;
-}
-
-print "\n\n";
-
-##
-
-$FS::svc_domain::whois_hack=1;
-
-my $p = Parser->new;
-$p->parse_file("$prefix/named.conf.import");
-
-print "\nBIND import completed.\n";
-
-##
-
-sub usage {
-  die "Usage:\n\n  svc_domain.import user\n";
-}
-
-########
-BEGIN {
-  
-  package Parser;
-  use BIND::Conf_Parser;
-  use vars qw(@ISA $named_dir);
-  @ISA = qw(BIND::Conf_Parser);
-  
-  sub handle_option {
-    my($self, $option, $argument) = @_;
-    return unless $option eq "directory";
-    $named_dir = $argument;
-  }
-  
-  sub handle_zone {
-    my($self, $name, $class, $type, $options) = @_;
-    return unless $class eq 'in';
-    return if grep { $name eq $_ }
-      ( qw( . localhost 127.in-addr.arpa 0.in-addr.arpa 255.in-addr.arpa ) );
-
-    my $domain = new FS::svc_domain( {
-      svcpart => $main::domain_svcpart,
-      domain  => $name,
-      action  => 'N',
-    } );
-    my $error = $domain->insert;
-    die $error if $error;
-
-    if ( $type eq 'slave' ) {
-
-      #use Data::Dumper;
-      #print Dumper($options);
-      #exit;
-
-      foreach my $master ( @{ $options->{masters} } ) {
-        my $domain_record = new FS::domain_record( {
-          'svcnum'  => $domain->svcnum,
-          'reczone' => '@',
-          'recaf'   => 'IN',
-          'rectype' => '_mstr',
-          'recdata' => $master,
-        } );
-        my $error = $domain_record->insert;
-        die $error if $error;
-      }
-
-    } elsif ( $type eq 'master' ) {
-
-      my $file = $options->{file};
-  
-      use File::Basename;
-      my $basefile = basename($file);
-      my $sourcefile = $file;
-      $sourcefile = "$named_dir/$sourcefile" unless $file =~ /^\//;
-      use Net::SCP qw(iscp scp);
-      scp("root\@$main::named_machine:$sourcefile",
-          "$main::prefix/$basefile.import");
-    
-      use DNS::ZoneParse 0.81;
-      my $zone = DNS::ZoneParse->new("$main::prefix/$basefile.import");
-    
-      my $dump = $zone->Dump;
-  
-      #use Data::Dumper;
-      #print "$name: ". Dumper($dump);
-      #exit;
-    
-      foreach my $rectype ( keys %$dump ) {
-        if ( $rectype =~ /^SOA$/i ) {
-          my $rec = $dump->{$rectype};
-          my $domain_record = new FS::domain_record( {
-            'svcnum'  => $domain->svcnum,
-            'reczone' => $rec->{origin},
-            'recaf'   => 'IN',
-            'rectype' => $rectype,
-            'recdata' =>
-              $rec->{primary}. ' '. $rec->{email}. ' ( '.
-             join(' ', map $rec->{$_},
-                           qw( serial refresh retry expire minimumTTL ) ).
-             ' )',
-          } );
-          my $error = $domain_record->insert;
-          die $error if $error;
-       } else {
-          #die $dump->{$rectype};
-          foreach my $rec ( @{ $dump->{$rectype} } ) {
-            my $domain_record = new FS::domain_record( {
-              'svcnum'  => $domain->svcnum,
-              'reczone' => $rec->{name},
-              'recaf'   => $rec->{class},
-              'rectype' => $rectype,
-              'recdata' => ( $rectype =~ /^MX$/i
-                               ? $rec->{priority}. ' '. $rec->{host}
-                               : $rec->{host}                      ),
-            } );
-            my $error = $domain_record->insert;
-            die $error if $error;
-          }
-        }
-      }
-
-    }
-    
-  }
-
-}
-#########
-
diff --git a/bin/bsdshell.export b/bin/bsdshell.export
deleted file mode 100755
index 10c27671e..000000000
--- a/bin/bsdshell.export
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/perl -w
-
-# bsdshell export
-
-use strict;
-use File::Rsync;
-use Net::SSH qw(ssh);
-use FS::UID qw(adminsuidsetup datasrc);
-use FS::Record qw(qsearch qsearchs);
-use FS::part_export;
-use FS::cust_svc;
-use FS::svc_acct;
-
-my @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-my $spooldir = "/usr/local/etc/freeside/export.". datasrc;
-#my $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/shell";
-
-my @bsd_exports = qsearch('part_export', { 'exporttype' => 'bsdshell' } );
-
-my $rsync = File::Rsync->new({
-  rsh     => 'ssh',
-#  dry_run => 1,
-});
-
-foreach my $export ( @bsd_exports ) {
-  my $machine = $export->machine;
-  my $prefix = "$spooldir/$machine";
-  mkdir $prefix, 0700 unless -d $prefix;
-
-  #LOCKING!!!
-
-  ( open(MASTER,">$prefix/master.passwd")
-    #!!!  and flock(MASTER,LOCK_EX|LOCK_NB)
-  ) or die "Can't open $prefix/master.passwd: $!";
-  ( open(PASSWD,">$prefix/passwd")
-    #!!!  and flock(PASSWD,LOCK_EX|LOCK_NB)
-  ) or die "Can't open $prefix/passwd: $!";
-
-  chmod 0644, "$prefix/passwd";
-  chmod 0600, "$prefix/master.passwd";
-
-  #false laziness with  freeside-sqlradius-reset and bind.export
-  my @svc_acct = 
-    map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
-      map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-        grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-          $export->export_svc;
-
-  next unless @svc_acct;
-
-  foreach my $svc_acct ( sort { $a->uid <=> $b->uid } @svc_acct ) {
-
-    my $password = $svc_acct->_password;
-    my $cpassword;
-    #if ( ( length($password) <= 8 )
-    if ( ( length($password) <= 12 )
-         && ( $password ne '*' )
-         && ( $password ne '!!' )
-         && ( $password ne '' )
-    ) {
-      $cpassword=crypt($password,
-                       $saltset[int(rand(64))].$saltset[int(rand(64))]
-      );
-      # MD5 !!!!
-    } else {
-      $cpassword=$password;
-    }
-
-    ###
-    # FORMAT OF THE PASSWD FILE HERE
-    print PASSWD join(":",
-      $svc_acct->username,
-      'x', # "##". $username,
-      $svc_acct->uid,
-      $svc_acct->gid,
-      $svc_acct->finger,
-      $svc_acct->dir,
-      $svc_acct->shell,
-    ), "\n";
-
-    ###
-    # FORMAT OF FreeBSD MASTER PASSWD FILE HERE
-    print MASTER join(":",
-      $svc_acct->username,              # User name
-      $cpassword,                       # Encrypted password
-      $svc_acct->uid,                   # User ID
-      $svc_acct->gid,                   # Group ID
-      "",                               # Login Class
-      "0",                              # Password Change Time
-      "0",                              # Password Expiration Time
-      $svc_acct->finger,                # Users name
-      $svc_acct->dir,                   # Users home directory
-      $svc_acct->shell,                 # shell
-    ), "\n" ;
-  
-  }
-
-  #!!! flock(MASTER,LOCK_UN);
-  #!!! flock(PASSWD,LOCK_UN);
-  close MASTER;
-  close PASSWD;
-
-  $rsync->exec( {
-    src  => "$prefix/passwd",
-    dest => "root\@$machine:/etc/passwd"
-  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
-
-  $rsync->exec( {
-    src  => "$prefix/master.passwd",
-    dest => "root\@$machine:/etc/master.passwd.new"
-  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
-  ssh("root\@$machine", "pwd_mkdb /etc/master.passwd.new");
-
-  # UNLOCK!!
-}
diff --git a/bin/create-history-tables b/bin/create-history-tables
deleted file mode 100755
index d37d682d8..000000000
--- a/bin/create-history-tables
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use DBI;
-use DBIx::DBSchema 0.20;
-use DBIx::DBSchema::Table;
-use DBIx::DBSchema::Column;
-use DBIx::DBSchema::ColGroup::Unique;
-use DBIx::DBSchema::ColGroup::Index;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(dbdef);
-
-my $user = shift or die &usage;
-my $dbh = adminsuidsetup $user;
-
-my $schema = dbdef();
-
-#false laziness w/fs-setup
-my @tables = scalar(@ARGV)
-               ? @ARGV
-               : grep { ! /^h_/ } $schema->tables;
-foreach my $table ( @tables ) {
-  warn "creating history table for $table\n";
-  my $tableobj = $schema->table($table)
-    or die "unknown table $table (did you run dbdef-create?)\n";
-  my $h_tableobj = DBIx::DBSchema::Table->new( {
-    name        => "h_$table",
-    primary_key => 'historynum',
-    unique      => DBIx::DBSchema::ColGroup::Unique->new( [] ),
-    'index'     => DBIx::DBSchema::ColGroup::Index->new( [
-                     @{$tableobj->unique->lol_ref},
-                     @{$tableobj->index->lol_ref}
-                   ] ),
-    columns     => [
-                     DBIx::DBSchema::Column->new( {
-                       'name'    => 'historynum',
-                       'type'    => 'serial',
-                       'null'    => 'NOT NULL',
-                       'length'  => '',
-                       'default' => '',
-                       'local'   => '',
-                     } ),
-                     DBIx::DBSchema::Column->new( {
-                       'name'    => 'history_date',
-                       'type'    => 'int',
-                       'null'    => 'NULL',
-                       'length'  => '',
-                       'default' => '',
-                       'local'   => '',
-                     } ),
-                     DBIx::DBSchema::Column->new( {
-                       'name'    => 'history_user',
-                       'type'    => 'varchar',
-                       'null'    => 'NOT NULL',
-                       'length'  => '80',
-                       'default' => '',
-                       'local'   => '',
-                     } ),
-                     DBIx::DBSchema::Column->new( {
-                       'name'    => 'history_action',
-                       'type'    => 'varchar',
-                       'null'    => 'NOT NULL',
-                       'length'  => '80',
-                       'default' => '',
-                       'local'   => '',
-                     } ),
-                     map { $tableobj->column($_) } $tableobj->columns
-                   ],
-  } );
-  foreach my $statement ( $h_tableobj->sql_create_table($dbh) ) {
-    $dbh->do( $statement )
-      or die "CREATE error: ". $dbh->errstr. "\ndoing statement: $statement";
-  }
-
-}
-
-$dbh->commit or die $dbh->errstr;
-$dbh->disconnect or die $dbh->errstr;
-
-sub usage {
-  die "Usage:\n  create-history-tables user [ table table ... ] \n";
-}
-
diff --git a/bin/dbdef-create b/bin/dbdef-create
deleted file mode 100755
index 0b297b9e6..000000000
--- a/bin/dbdef-create
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: dbdef-create,v 1.5 2001-08-21 02:43:18 ivan Exp $
-
-use strict;
-use DBI;
-use DBIx::DBSchema;
-use FS::UID qw(adminsuidsetup datasrc driver_name);
-
-my $user = shift or die &usage;
-
-my($dbh)=adminsuidsetup $user;
-
-#needs to match FS::Record
-my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;
-
-my $dbdef = new_native DBIx::DBSchema $dbh;
-
-#print $dbdef->pretty_print;
-
-#important
-$dbdef->save($dbdef_file);
-
-sub usage {
-  die "Usage:\n  dbdef-create user\n";
-}
diff --git a/bin/freeside-init b/bin/freeside-init
deleted file mode 100755
index fe12931fc..000000000
--- a/bin/freeside-init
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-#
-# start the freeside job queue daemon
-
-#PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/local/bin/freeside-queued
-NAME=freeside-queued
-DESC="freeside job queue daemon"
-USER="ivan"
-
-test -f $DAEMON || exit 0
-
-set -e
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-#	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid -b -m\
-#		--exec $DAEMON
-	$DAEMON $USER &
-	echo "$NAME."
-	;;
-  stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON
-	echo "$NAME."
-        rm /var/run/$NAME.pid
-	;;
-  #reload)
-	#
-	#	If the daemon can reload its config files on the fly
-	#	for example by sending it SIGHUP, do it here.
-	#
-	#	If the daemon responds to changes in its config file
-	#	directly anyway, make this a do-nothing entry.
-	#
-	# echo "Reloading $DESC configuration files."
-	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
-	#	/var/run/$NAME.pid --exec $DAEMON
-  #;;
-  restart|force-reload)
-	#
-	#	If the "reload" option is implemented, move the "force-reload"
-	#	option to the "reload" entry above. If not, "force-reload" is
-	#	just the same as "restart".
-	#
-        $0 stop
-	sleep 1
-        $0 start
-	;;
-  *)
-	N=/etc/init.d/$NAME
-	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/bin/freeside-session-kill b/bin/freeside-session-kill
deleted file mode 100755
index d5fd703f6..000000000
--- a/bin/freeside-session-kill
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use vars qw($conf);
-use Fcntl qw(:flock);
-use FS::UID qw(adminsuidsetup datasrc dbh);
-use FS::Record qw(dbdef qsearch fields);
-use FS::session;
-use FS::svc_acct;
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-my $sessionlock = "/usr/local/etc/freeside/session-kill.lock.". datasrc;
-
-open(LOCK,"+>>$sessionlock") or die "Can't open $sessionlock: $!";
-select(LOCK); $|=1; select(STDOUT);
-unless ( flock(LOCK,LOCK_EX|LOCK_NB) ) {
-  seek(LOCK,0,0);
-  my($pid)=<LOCK>;
-  chop($pid);
-  #no reason to start loct of blocking processes
-  die "Is another session kill process running under pid $pid?\n";
-}
-seek(LOCK,0,0);
-print LOCK $$,"\n";
-
-$FS::UID::AutoCommit = 0;
-
-my $now = time;
-
-#uhhhhh
-
-use DBIx::DBSchema;
-use DBIx::DBSchema::Table; #down this path lies madness
-use DBIx::DBSchema::Column;
-
-my $dbdef = dbdef or die;
-#warn $dbdef;
-#warn $dbdef->{'tables'};
-#warn keys %{$dbdef->{'tables'}};
-my $session_table = $dbdef->table('session') or die;
-my $svc_acct_table = $dbdef->table('svc_acct') or die;
-
-my $session_svc_acct = new DBIx::DBSchema::Table ( 'session,svc_acct', '', '', '',
-  map( DBIx::DBSchema::Column->new( "session.$_",
-                              $session_table->column($_)->type,
-                              $session_table->column($_)->null,
-                              $session_table->column($_)->length,
-  ), $session_table->columns() ),
-  map( DBIx::DBSchema::Column->new( "svc_acct.$_",
-                              $svc_acct_table->column($_)->type,
-                              $svc_acct_table->column($_)->null,
-                              $svc_acct_table->column($_)->length,
-  ), $svc_acct_table->columns ),
-#  map("svc_acct.$_", $svc_acct_table->columns),
-);
-
-$dbdef->addtable($session_svc_acct); #madness, i tell you
-
-$FS::Record::DEBUG = 1;
-my @session = qsearch('session,svc_acct', {}, '', ' WHERE '. join(' AND ',
-  'svc_acct.svcnum = session.svcnum',
-  '( session.logout IS NULL OR session.logout = 0 )',
-  "( $now - session.login ) >= svc_acct.seconds"
-). " FOR UPDATE" );
-
-my $dbh = dbh;
-
-foreach my $join ( @session ) {
-
-  my $session = new FS::session ( {
-    map { $_ => $join->{'Hash'}{"session.$_"} } fields('session')
-  } ); #see no evil
-
-  my $svc_acct = new FS::svc_acct ( {
-    map { $_ => $join->{'Hash'}{"svc_acct.$_"} } fields('svc_acct')
-  } );
-
-  #false laziness w/ fs_session_server
-  my $nsession = new FS::session ( { $session->hash } );
-  my $error = $nsession->replace($session);
-  if ( $error ) {
-    $dbh->rollback;
-    die $error;
-  }
-  my $time = $nsession->logout - $nsession->login;
-  my $new_svc_acct = new FS::svc_acct ( { $svc_acct->hash } );
-  my $seconds = $new_svc_acct->seconds;
-  $seconds -= $time;
-  $seconds = 0 if $seconds < 0;
-  $new_svc_acct->seconds( $seconds );
-  $error = $new_svc_acct->replace( $svc_acct );
-  warn "can't debit time from ". $svc_acct->username. ": $error\n"; #don't want to rollback, though
-  #ssenizal eslaf
-
-}
-
-$dbh->commit or die $dbh->errstr;
-
-sub usage {
-  die "Usage:\n\n  freeside-session-kill user\n";
-}
diff --git a/bin/fs-migrate-part_svc b/bin/fs-migrate-part_svc
deleted file mode 100755
index b0f3ac57e..000000000
--- a/bin/fs-migrate-part_svc
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch fields);
-use FS::part_svc;
-
-my $user = shift or die &usage;
-my $dbh = adminsuidsetup $user;
-
-my $oldAutoCommit = $FS::UID::AutoCommit;
-local $FS::UID::AutoCommit = 0;
-
-foreach my $part_svc ( qsearch('part_svc', {} ) ) {
-  foreach my $field (
-    grep { defined($part_svc->getfield($part_svc->svcdb.'__'.$_.'_flag') ) }
-      fields($part_svc->svcdb)
-  ) {
-    my $flag = $part_svc->getfield($part_svc->svcdb.'__'.$field.'_flag');
-    if ( uc($flag) =~ /^([DF])$/ ) {
-      my $part_svc_column = new FS::part_svc_column {
-        'svcpart' => $part_svc->svcpart,
-        'columnname' => $field,
-        'columnflag' => $1,
-        'columnvalue' => $part_svc->getfield($part_svc->svcdb.'__'.$field),
-      };
-      my $error = $part_svc_column->insert;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        die $error;
-      }
-    }
-  }
-}
-
-$dbh->commit or die $dbh->errstr;
-
-sub usage {
-  die "Usage:\n  fs-migrate-part_svc user\n"; 
-}
-
diff --git a/bin/fs-migrate-payref b/bin/fs-migrate-payref
deleted file mode 100755
index 158419706..000000000
--- a/bin/fs-migrate-payref
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch);
-use FS::cust_pay;
-use FS::cust_refund;
-
-my $user = shift or die &usage;
-my $dbh = adminsuidsetup $user;
-
-# apply payments to invoices
-
-foreach my $cust_pay ( qsearch('cust_pay', {} ) ) {
-  my $error = $cust_pay->upgrade_replace;
-  warn $error if $error;
-}
-
-# apply refunds to credits
-
-foreach my $cust_refund ( qsearch('cust_refund') ) {
-  my $error = $cust_refund->upgrade_replace;
-  warn $error if $error;
-}
-
-# ? apply credits to invoices
-
-sub usage {
-  die "Usage:\n  fs-migrate-payref user\n"; 
-}
-
diff --git a/bin/fs-migrate-svc_acct_sm b/bin/fs-migrate-svc_acct_sm
deleted file mode 100755
index e34b23596..000000000
--- a/bin/fs-migrate-svc_acct_sm
+++ /dev/null
@@ -1,229 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: fs-migrate-svc_acct_sm,v 1.4 2002-06-21 09:13:16 ivan Exp $
-#
-# jeff@cmh.net 01-Jul-20
-
-#to delay loading dbdef until we're ready
-#BEGIN { $FS::Record::setup_hack = 1; }
-
-use strict;
-use Term::Query qw(query);
-#use DBI;
-#use DBIx::DBSchema;
-#use DBIx::DBSchema::Table;
-#use DBIx::DBSchema::Column;
-#use DBIx::DBSchema::ColGroup::Unique;
-#use DBIx::DBSchema::ColGroup::Index;
-use FS::Conf;
-use FS::UID qw(adminsuidsetup datasrc checkeuid getsecrets);
-use FS::Record qw(qsearch qsearchs);
-use FS::svc_domain;
-use FS::svc_forward;
-use vars qw( $conf $old_default_domain %part_domain_svc %part_acct_svc %part_forward_svc $svc_acct $svc_acct_sm $error);
-
-die "Not running uid freeside!" unless checkeuid();
-
-my $user = shift or die &usage;
-getsecrets($user);
-
-$conf = new FS::Conf;
-$old_default_domain = $conf->config('domain');
-
-#needs to match FS::Record
-#my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;
-
-###
-# This section would be the appropriate place to manipulate
-# the schema & tables.
-###
-
-##  we need to add the domsvc to svc_acct
-##  we must add a svc_forward record....
-##  I am thinking that the fields  svcnum (int), destsvc (int), and
-##  dest (varchar (80))  are appropriate, with destsvc/dest an either/or
-##  much in the spirit of cust_main_invoice
-
-###
-# massage the data
-###
-
-my($dbh)=adminsuidsetup $user;
-
-$|=1;
-
-$FS::svc_Common::noexport_hack = 1;
-$FS::svc_domain::whois_hack = 1;
-
-%part_domain_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_domain'});
-%part_acct_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_acct'});
-%part_forward_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_forward'});
-
-die "No services with svcdb svc_domain!\n" unless %part_domain_svc;
-die "No services with svcdb svc_acct!\n" unless %part_acct_svc;
-die "No services with svcdb svc_forward!\n" unless %part_forward_svc;
-
-my($svc_domain) = qsearchs('svc_domain', { 'domain' => $old_default_domain });
-if (! $svc_domain || $svc_domain->domain != $old_default_domain) {
-   print <<EOF;
-
-Your database currently does not contain a svc_domain record for the
-domain $old_default_domain.  Would you like me to add one for you?
-EOF
-
-   my($response)=scalar(<STDIN>);
-   chop $response;
-   if ($response =~ /^[yY]/) {
-      print "\n\n", &menu_domain_svc, "\n", <<END;
-I need to create new domain accounts.  Which service shall I use for that?
-END
-      my($domain_svcpart)=&getdomainpart;
-
-      $svc_domain = new FS::svc_domain {
-        'domain' => $old_default_domain,
-        'svcpart' => $domain_svcpart,
-        'action' => 'M',
-       };
-#      $error=$svc_domain->insert && die "Error adding domain $old_default_domain: $error";
-      $error=$svc_domain->insert;
-      die "Error adding domain $old_default_domain: $error" if $error;
-   }else{
-      print <<EOF;
-
-  This program cannot function properly until a svc_domain record matching
-your conf_dir/domain file exists.
-EOF
-
-      exit 1;
-   }
-}
-
-print "\n\n", &menu_acct_svc, "\n", <<END;
-I may need to create some new pop accounts and set up forwarding to them
-for some users.  Which service shall I use for that?
-END
-my($pop_svcpart)=&getacctpart;
-
-print "\n\n", &menu_forward_svc, "\n", <<END;
-I may need to create some new forwarding for some users.  Which service
-shall I use for that?
-END
-my($forward_svcpart)=&getforwardpart;
-
-sub menu_domain_svc {
-  ( join "\n", map "$_: ".$part_domain_svc{$_}->svc, sort keys %part_domain_svc ). "\n";
-}
-sub menu_acct_svc {
-  ( join "\n", map "$_: ".$part_acct_svc{$_}->svc, sort keys %part_acct_svc ). "\n";
-}
-sub menu_forward_svc {
-  ( join "\n", map "$_: ".$part_forward_svc{$_}->svc, sort keys %part_forward_svc ). "\n";
-}
-sub getdomainpart {
-  $^W=0; # Term::Query isn't -w-safe
-  my $return = query "Enter part number:", 'irk', [ keys %part_domain_svc ];
-  $^W=1;
-  $return;
-}
-sub getacctpart {
-  $^W=0; # Term::Query isn't -w-safe
-  my $return = query "Enter part number:", 'irk', [ keys %part_acct_svc ];
-  $^W=1;
-  $return;
-}
-sub getforwardpart {
-  $^W=0; # Term::Query isn't -w-safe
-  my $return = query "Enter part number:", 'irk', [ keys %part_forward_svc ];
-  $^W=1;
-  $return;
-}
-
-
-#migrate data
-
-my(@svc_accts) = qsearch('svc_acct', {});
-foreach $svc_acct (@svc_accts) {
-  my(@svc_acct_sms) = qsearch('svc_acct_sm', {
-      domuid => $svc_acct->getfield('uid'),
-      }
-    );
-
-  #  Ok.. we've got the svc_acct record, and an array of svc_acct_sm's
-  #  What do we do from here?
-
-  #  The intuitive:
-  #    plop the svc_acct into the 'default domain'
-  #    and then represent the svc_acct_sm's with svc_forwards
-  #    they can be gussied up manually, later
-  #
-  #  Perhaps better:
-  #    when no svc_acct_sm exists, place svc_acct in 'default domain'
-  #    when one svc_acct_sm exists, place svc_acct in corresponding
-  #      domain & possibly create a svc_forward in 'default domain'
-  #    when multiple svc_acct_sm's exists (in different domains) we'd
-  #    better use the 'intuitive' approach.
-  #
-  #  Specific way:
-  #    as 'perhaps better,' but we may be able to guess which domain
-  #    is correct by comparing the svcnum of domains to the username
-  #    of the svc_acct
-  #
-
-  # The intuitive way:
-
-  my $def_acct = new FS::svc_acct ( { $svc_acct->hash } );
-  $def_acct->setfield('domsvc' => $svc_domain->getfield('svcnum'));
-  $error = $def_acct->replace($svc_acct);
-  die "Error replacing svc_acct for " . $def_acct->username . " : $error" if $error;
-
-  foreach $svc_acct_sm (@svc_acct_sms) {
-
-    my($domrec)=qsearchs('svc_domain', {
-      svcnum => $svc_acct_sm->getfield('domsvc'),
-    }) || die  "svc_acct_sm references invalid domsvc $svc_acct_sm->getfield('domsvc')\n";
-
-    if ($svc_acct_sm->getfield('domuser') =~ /^\*$/) {
-      
-      my($newdom) = new FS::svc_domain ( { $domrec->hash } );
-      $newdom->setfield('catchall', $svc_acct->svcnum);
-      $newdom->setfield('action', "M");
-      $error = $newdom->replace($domrec);
-      die "Error replacing svc_domain for (anything)@" . $domrec->domain . " : $error" if $error;
-
-    } else {
-
-      my($newacct) = new FS::svc_acct {
-        'svcpart'  => $pop_svcpart,
-        'username' => $svc_acct_sm->getfield('domuser'),
-        'domsvc'   => $svc_acct_sm->getfield('domsvc'),
-        'dir'      => '/dev/null',
-      };
-      $error = $newacct->insert;
-      die "Error adding svc_acct for " . $newacct->username . " : $error" if $error;
-     
-      my($newforward) = new FS::svc_forward {
-        'svcpart'  => $forward_svcpart, 
-        'srcsvc'   => $newacct->getfield('svcnum'),
-        'dstsvc'   => $def_acct->getfield('svcnum'),
-      };
-      $error = $newforward->insert;
-      die "Error adding svc_forward for " . $newacct->username ." : $error" if $error;
-    }
-     
-    $error = $svc_acct_sm->delete;
-    die "Error deleting svc_acct_sm for " . $svc_acct_sm->domuser ." : $error" if $error;
-
-  };
-
-};
-
-
-$dbh->commit or die $dbh->errstr;
-$dbh->disconnect or die $dbh->errstr;
-
-print "svc_acct_sm records sucessfully migrated\n";
-
-sub usage {
-  die "Usage:\n  fs-migrate-svc_acct_sm user\n"; 
-}
-
diff --git a/bin/fs-radius-add-check b/bin/fs-radius-add-check
deleted file mode 100755
index 4e4769e58..000000000
--- a/bin/fs-radius-add-check
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/perl -Tw
-
-# quick'n'dirty hack of fs-setup to add radius attributes
-
-use strict;
-use DBI;
-use FS::UID qw(adminsuidsetup checkeuid getsecrets);
-use FS::raddb;
-
-die "Not running uid freeside!" unless checkeuid();
-
-my %attrib2db =
-  map { lc($FS::raddb::attrib{$_}) => $_ } keys %FS::raddb::attrib;
-
-my $user = shift or die &usage;
-getsecrets($user);
-
-my $dbh = adminsuidsetup $user;
-
-###
-
-print "\n\n", <<END, ":";
-Enter the additional RADIUS check attributes you need to track for
-each user, separated by whitespace.
-END
-my @attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
-                   split(" ",&getvalue);
-
-sub getvalue {
-  my($x)=scalar(<STDIN>);
-  chop $x;
-  $x;
-}
-
-###
-
-my($char_d) = 80; #default maxlength for text fields
-
-###
-
-foreach my $attribute ( @attributes ) {
-
-  my $statement =
-    "ALTER TABLE svc_acct ADD COLUMN rc_$attribute varchar($char_d) NULL";
-  my $sth = $dbh->prepare( $statement )
-   or warn "Error preparing $statement: ". $dbh->errstr;
-  my $rc = $sth->execute
-    or warn "Error executing $statement: ". $sth->errstr;
-
-  $statement =
-    "ALTER TABLE h_svc_acct ADD COLUMN rc_$attribute varchar($char_d) NULL";
-  $sth = $dbh->prepare( $statement )
-   or warn "Error preparing $statement: ". $dbh->errstr;
-  $rc = $sth->execute
-    or warn "Error executing $statement: ". $sth->errstr;
-
-}
-
-$dbh->commit or die $dbh->errstr;
-
-$dbh->disconnect or die $dbh->errstr;
-
-print "\n\n", "Now you must run dbdef-create.\n\n";
-
-sub usage {
-  die "Usage:\n  fs-radius-add-check user\n"; 
-}
-
diff --git a/bin/fs-radius-add-reply b/bin/fs-radius-add-reply
deleted file mode 100755
index 3de01374f..000000000
--- a/bin/fs-radius-add-reply
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/perl -Tw
-
-# quick'n'dirty hack of fs-setup to add radius attributes
-
-use strict;
-use DBI;
-use FS::UID qw(adminsuidsetup checkeuid getsecrets);
-use FS::raddb;
-
-die "Not running uid freeside!" unless checkeuid();
-
-my %attrib2db =
-  map { lc($FS::raddb::attrib{$_}) => $_ } keys %FS::raddb::attrib;
-
-my $user = shift or die &usage;
-getsecrets($user);
-
-my $dbh = adminsuidsetup $user;
-
-###
-
-print "\n\n", <<END, ":";
-Enter the additional RADIUS reply attributes you need to track for
-each user, separated by whitespace.
-END
-my @attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
-                   split(" ",&getvalue);
-
-sub getvalue {
-  my($x)=scalar(<STDIN>);
-  chop $x;
-  $x;
-}
-
-###
-
-my($char_d) = 80; #default maxlength for text fields
-
-###
-
-foreach my $attribute ( @attributes ) {
-
-  my $statement =
-    "ALTER TABLE svc_acct ADD COLUMN radius_$attribute varchar($char_d) NULL";
-  my $sth = $dbh->prepare( $statement )
-    or warn "Error preparing $statement: ". $dbh->errstr;
-  my $rc = $sth->execute
-    or warn "Error executing $statement: ". $sth->errstr;
-
-  $statement =
-    "ALTER TABLE h_svc_acct ADD COLUMN radius_$attribute varchar($char_d) NULL";
-  $sth = $dbh->prepare( $statement )
-    or warn "Error preparing $statement: ". $dbh->errstr;
-  $rc = $sth->execute
-    or warn "Error executing $statement: ". $sth->errstr;
-
-}
-
-$dbh->commit or die $dbh->errstr;
-
-$dbh->disconnect or die $dbh->errstr;
-
-print "\n\n", "Now you must run dbdef-create.\n\n";
-
-sub usage {
-  die "Usage:\n  fs-radius-add-reply user\n"; 
-}
-
-
diff --git a/bin/fs-setup b/bin/fs-setup
deleted file mode 100755
index 9522ce370..000000000
--- a/bin/fs-setup
+++ /dev/null
@@ -1,1033 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: fs-setup,v 1.96 2002-07-06 12:13:49 ivan Exp $
-
-#to delay loading dbdef until we're ready
-BEGIN { $FS::Record::setup_hack = 1; }
-
-use strict;
-use DBI;
-use DBIx::DBSchema 0.20;
-use DBIx::DBSchema::Table;
-use DBIx::DBSchema::Column;
-use DBIx::DBSchema::ColGroup::Unique;
-use DBIx::DBSchema::ColGroup::Index;
-use FS::UID qw(adminsuidsetup datasrc checkeuid getsecrets);
-use FS::Record;
-use FS::cust_main_county;
-use FS::raddb;
-use FS::part_bill_event;
-
-die "Not running uid freeside!" unless checkeuid();
-
-my %attrib2db =
-  map { lc($FS::raddb::attrib{$_}) => $_ } keys %FS::raddb::attrib;
-
-my $user = shift or die &usage;
-getsecrets($user);
-
-#needs to match FS::Record
-my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;
-
-###
-
-#print "\nEnter the maximum username length: ";
-#my($username_len)=&getvalue;
-my $username_len = 32; #usernamemax config file
-
-print "\n\n", <<END, ":";
-Freeside tracks the RADIUS User-Name, check attribute Password and
-reply attribute Framed-IP-Address for each user.  You can specify additional
-check and reply attributes (or you can add them later with the
-fs-radius-add-check and fs-radius-add-reply programs).
-
-First enter any additional RADIUS check attributes you need to track for each 
-user, separated by whitespace.
-END
-my @check_attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
-                         split(" ",&getvalue);
-
-print "\n\n", <<END, ":";
-Now enter any additional reply attributes you need to track for each user,
-separated by whitespace.
-END
-my @attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
-                   split(" ",&getvalue);
-
-print "\n\n", <<END, ":";
-Do you wish to enable the tracking of a second, separate shipping/service
-address?
-END
-my $ship = &_yesno;
-
-sub getvalue {
-  my($x)=scalar(<STDIN>);
-  chop $x;
-  $x;
-}
-
-sub _yesno {
-  print " [y/N]:";
-  my $x = scalar(<STDIN>);
-  $x =~ /^y/i;
-}
-
-###
-
-my($char_d) = 80; #default maxlength for text fields
-
-#my(@date_type)  = ( 'timestamp', '', ''     );
-my(@date_type)  = ( 'int', 'NULL', ''     );
-my(@perl_type) = ( 'text', 'NULL', ''  ); 
-my @money_type = ( 'decimal',   '', '10,2' );
-
-###
-# create a dbdef object from the old data structure
-###
-
-my(%tables)=&tables_hash_hack;
-
-#turn it into objects
-my($dbdef) = new DBIx::DBSchema ( map {  
-  my(@columns);
-  while (@{$tables{$_}{'columns'}}) {
-    my($name,$type,$null,$length)=splice @{$tables{$_}{'columns'}}, 0, 4;
-    push @columns, new DBIx::DBSchema::Column ( $name,$type,$null,$length );
-  }
-  DBIx::DBSchema::Table->new(
-    $_,
-    $tables{$_}{'primary_key'},
-    DBIx::DBSchema::ColGroup::Unique->new($tables{$_}{'unique'}),
-    DBIx::DBSchema::ColGroup::Index->new($tables{$_}{'index'}),
-    @columns,
-  );
-} (keys %tables) );
-
-my $cust_main = $dbdef->table('cust_main');
-unless ($ship) { #remove ship_ from cust_main
-  $cust_main->delcolumn($_) foreach ( grep /^ship_/, $cust_main->columns );
-} else { #add indices on ship_last and ship_company
-  push @{$cust_main->index->lol_ref}, ( ['ship_last'], ['ship_company'] ) 
-}
-
-#add radius attributes to svc_acct
-
-my($svc_acct)=$dbdef->table('svc_acct');
-
-my($attribute);
-foreach $attribute (@attributes) {
-  $svc_acct->addcolumn ( new DBIx::DBSchema::Column (
-    'radius_'. $attribute,
-    'varchar',
-    'NULL',
-    $char_d,
-  ));
-}
-
-foreach $attribute (@check_attributes) {
-  $svc_acct->addcolumn( new DBIx::DBSchema::Column (
-    'rc_'. $attribute,
-    'varchar',
-    'NULL',
-    $char_d,
-  ));
-}
-
-##make part_svc table (but now as object)
-#
-#my($part_svc)=$dbdef->table('part_svc');
-#
-##because of svc_acct_pop
-##foreach (grep /^svc_/, $dbdef->tables) { 
-##foreach (qw(svc_acct svc_acct_sm svc_charge svc_domain svc_wo)) {
-#foreach (qw(svc_acct svc_domain svc_forward svc_www)) {
-#  my($table)=$dbdef->table($_);
-#  my($col);
-#  foreach $col ( $table->columns ) {
-#    next if $col =~ /^svcnum$/;
-#    $part_svc->addcolumn( new DBIx::DBSchema::Column (
-#      $table->name. '__' . $table->column($col)->name,
-#      'varchar', #$table->column($col)->type, 
-#      'NULL',
-#      $char_d, #$table->column($col)->length,
-#    ));
-#    $part_svc->addcolumn ( new DBIx::DBSchema::Column (
-#      $table->name. '__'. $table->column($col)->name . "_flag",
-#      'char',
-#      'NULL',
-#      1,
-#    ));
-#  }
-#}
-
-#create history tables (false laziness w/create-history-tables)
-foreach my $table ( grep { ! /^h_/ } $dbdef->tables ) {
-  my $tableobj = $dbdef->table($table)
-    or die "unknown table $table";
-
-  die "unique->lol_ref undefined for $table"
-    unless defined $tableobj->unique->lol_ref;
-  die "index->lol_ref undefined for $table"
-    unless defined $tableobj->index->lol_ref;
-
-  my $h_tableobj = DBIx::DBSchema::Table->new( {
-    name        => "h_$table",
-    primary_key => 'historynum',
-    unique      => DBIx::DBSchema::ColGroup::Unique->new( [] ),
-    'index'     => DBIx::DBSchema::ColGroup::Index->new( [
-                     @{$tableobj->unique->lol_ref},
-                     @{$tableobj->index->lol_ref}
-                   ] ),
-    columns     => [
-                     DBIx::DBSchema::Column->new( {
-                       'name'    => 'historynum',
-                       'type'    => 'serial',
-                       'null'    => 'NOT NULL',
-                       'length'  => '',
-                       'default' => '',
-                       'local'   => '',
-                     } ),
-                     DBIx::DBSchema::Column->new( {
-                       'name'    => 'history_date',
-                       'type'    => 'int',
-                       'null'    => 'NULL',
-                       'length'  => '',
-                       'default' => '',
-                       'local'   => '',
-                     } ),
-                     DBIx::DBSchema::Column->new( {
-                       'name'    => 'history_user',
-                       'type'    => 'varchar',
-                       'null'    => 'NOT NULL',
-                       'length'  => '80',
-                       'default' => '',
-                       'local'   => '',
-                     } ),
-                     DBIx::DBSchema::Column->new( {
-                       'name'    => 'history_action',
-                       'type'    => 'varchar',
-                       'null'    => 'NOT NULL',
-                       'length'  => '80',
-                       'default' => '',
-                       'local'   => '',
-                     } ),
-                     map { $tableobj->column($_) } $tableobj->columns
-                   ],
-  } );
-  $dbdef->addtable($h_tableobj);
-}
-
-#important
-$dbdef->save($dbdef_file);
-&FS::Record::reload_dbdef($dbdef_file);
-
-###
-# create 'em
-###
-
-my($dbh)=adminsuidsetup $user;
-
-#create tables
-$|=1;
-
-foreach my $statement ( $dbdef->sql($dbh) ) {
-  $dbh->do( $statement )
-    or die "CREATE error: ". $dbh->errstr. "\ndoing statement: $statement";
-}
-
-#not really sample data (and shouldn't default to US)
-
-#cust_main_county
-
-#USPS state codes
-foreach ( qw(
-AL AK AS AZ AR CA CO CT DC DE FM FL GA GU HI ID IL IN IA KS KY LA
-ME MH MD MA MI MN MS MO MT NC ND NE NH NJ NM NV NY MP OH OK OR PA PW PR RI 
-SC SD TN TX UT VT VI VA WA WV WI WY AE AA AP
-) ) {
-  my($cust_main_county)=new FS::cust_main_county({
-    'state' => $_,
-    'tax'   => 0,
-    'country' => 'US',
-  });  
-  my($error);
-  $error=$cust_main_county->insert;
-  die $error if $error;
-}
-
-#AU "offical" state codes ala mark.williamson@ebbs.com.au (Mark Williamson)
-foreach ( qw(
-VIC NSW NT QLD TAS ACT WA SA
-) ) {
-  my($cust_main_county)=new FS::cust_main_county({
-    'state' => $_,
-    'tax'   => 0,
-    'country' => 'AU',
-  });  
-  my($error);
-  $error=$cust_main_county->insert;
-  die $error if $error;
-}
-
-#ISO 2-letter country codes (same as country TLDs) except US and AU
-foreach ( qw(
-AF AL DZ AS AD AO AI AQ AG AR AM AW AT AZ BS BH BD BB BY BE BZ BJ BM BT BO
-BA BW BV BR IO BN BG BF BI KH CM CA CV KY CF TD CL CN CX CC CO KM CG CK CR CI
-HR CU CY CZ DK DJ DM DO TP EC EG SV GQ ER EE ET FK FO FJ FI FR FX GF PF TF GA
-GM GE DE GH GI GR GL GD GP GU GT GN GW GY HT HM HN HK HU IS IN ID IR IQ IE IL
-IT JM JP JO KZ KE KI KP KR KW KG LA LV LB LS LR LY LI LT LU MO MK MG MW MY MV
-ML MT MH MQ MR MU YT MX FM MD MC MN MS MA MZ MM NA NR NP NL AN NC NZ NI NE NG
-NU NF MP NO OM PK PW PA PG PY PE PH PN PL PT PR QA RE RO RU RW KN LC VC WS SM
-ST SA SN SC SL SG SK SI SB SO ZA GS ES LK SH PM SD SR SJ SZ SE CH SY TW TJ TZ
-TH TG TK TO TT TN TR TM TC TV UG UA AE GB UM UY UZ VU VA VE VN VG VI WF EH
-YE YU ZR ZM ZW
-) ) {
-  my($cust_main_county)=new FS::cust_main_county({
-    'tax'   => 0,
-    'country' => $_,
-  });  
-  my($error);
-  $error=$cust_main_county->insert;
-  die $error if $error;
-}
-
-#billing events
-foreach my $aref ( 
-  [ 'COMP', 'Comp invoice', '$cust_bill->comp();', 30, 'comp' ],
-  [ 'CARD', 'Batch card', '$cust_bill->batch_card();', 40, 'batch-card' ],
-  [ 'BILL', 'Send invoice', '$cust_bill->send();', 50, 'send' ],
-) {
-
-  my $part_bill_event = new FS::part_bill_event({
-    'payby' => $aref->[0],
-    'event' => $aref->[1],
-    'eventcode' => $aref->[2],
-    'seconds' => 0,
-    'weight' => $aref->[3],
-    'plan' => $aref->[4],
-  });
-  my($error);
-  $error=$part_bill_event->insert;
-  die $error if $error;
-
-}
-
-$dbh->commit or die $dbh->errstr;
-$dbh->disconnect or die $dbh->errstr;
-
-print "Freeside database initialized sucessfully\n";
-
-sub usage {
-  die "Usage:\n  fs-setup user\n"; 
-}
-
-###
-# Now it becomes an object.  much better.
-###
-sub tables_hash_hack {
-
-  #note that s/(date|change)/_$1/; to avoid keyword conflict.
-  #put a kludge in FS::Record to catch this or? (pry need some date-handling
-  #stuff anyway also)
-
-  my(%tables)=( #yech.}
-
-    'agent' => {
-      'columns' => [
-        'agentnum', 'int',            '',     '',
-        'agent',    'varchar',           '',     $char_d,
-        'typenum',  'int',            '',     '',
-        'freq',     'int',       'NULL', '',
-        'prog',     @perl_type,
-      ],
-      'primary_key' => 'agentnum',
-      'unique' => [],
-      'index' => [ ['typenum'] ],
-    },
-
-    'agent_type' => {
-      'columns' => [
-        'typenum',   'int',  '', '',
-        'atype',     'varchar', '', $char_d,
-      ],
-      'primary_key' => 'typenum',
-      'unique' => [],
-      'index' => [],
-    },
-
-    'type_pkgs' => {
-      'columns' => [
-        'typenum',   'int',  '', '',
-        'pkgpart',   'int',  '', '',
-      ],
-      'primary_key' => '',
-      'unique' => [ ['typenum', 'pkgpart'] ],
-      'index' => [ ['typenum'] ],
-    },
-
-    'cust_bill' => {
-      'columns' => [
-        'invnum',    'int',  '', '',
-        'custnum',   'int',  '', '',
-        '_date',     @date_type,
-        'charged',   @money_type,
-        'printed',   'int',  '', '',
-        'closed',    'char', 'NULL', 1,
-      ],
-      'primary_key' => 'invnum',
-      'unique' => [],
-      'index' => [ ['custnum'] ],
-    },
-
-    'cust_bill_event' => {
-      'columns' => [
-        'eventnum',    'int',  '', '',
-        'invnum',   'int',  '', '',
-        'eventpart',   'int',  '', '',
-        '_date',     @date_type,
-        'status', 'varchar', '', $char_d,
-        'statustext', 'text', 'NULL', '',
-      ],
-      'primary_key' => 'eventnum',
-      #no... there are retries now #'unique' => [ [ 'eventpart', 'invnum' ] ],
-      'unique' => [],
-      'index' => [ ['invnum'], ['status'] ],
-    },
-
-    'part_bill_event' => {
-      'columns' => [
-        'eventpart',    'int',  '', '',
-        'payby',       'char',  '', 4,
-        'event',       'varchar',           '',     $char_d,
-        'eventcode',    @perl_type,
-        'seconds',     'int', 'NULL', '',
-        'weight',      'int', '', '',
-        'plan',       'varchar', 'NULL', $char_d,
-        'plandata',   'text', 'NULL', '',
-        'disabled',     'char', 'NULL', 1,
-      ],
-      'primary_key' => 'eventpart',
-      'unique' => [],
-      'index' => [ ['payby'] ],
-    },
-
-    'cust_bill_pkg' => {
-      'columns' => [
-        'pkgnum',  'int', '', '',
-        'invnum',  'int', '', '',
-        'setup',   @money_type,
-        'recur',   @money_type,
-        'sdate',   @date_type,
-        'edate',   @date_type,
-      ],
-      'primary_key' => '',
-      'unique' => [ ['pkgnum', 'invnum'] ],
-      'index' => [ ['invnum'] ],
-    },
-
-    'cust_credit' => {
-      'columns' => [
-        'crednum',  'int', '', '',
-        'custnum',  'int', '', '',
-        '_date',    @date_type,
-        'amount',   @money_type,
-        'otaker',   'varchar', '', 8,
-        'reason',   'text', 'NULL', '',
-        'closed',    'char', 'NULL', 1,
-      ],
-      'primary_key' => 'crednum',
-      'unique' => [],
-      'index' => [ ['custnum'] ],
-    },
-
-    'cust_credit_bill' => {
-      'columns' => [
-        'creditbillnum', 'int', '', '',
-        'crednum',  'int', '', '',
-        'invnum',  'int', '', '',
-        '_date',    @date_type,
-        'amount',   @money_type,
-      ],
-      'primary_key' => 'creditbillnum',
-      'unique' => [],
-      'index' => [ ['crednum'], ['invnum'] ],
-    },
-
-    'cust_main' => {
-      'columns' => [
-        'custnum',  'int',  '',     '',
-        'agentnum', 'int',  '',     '',
-#        'titlenum', 'int',  'NULL',   '',
-        'last',     'varchar', '',     $char_d,
-#        'middle',   'varchar', 'NULL', $char_d,
-        'first',    'varchar', '',     $char_d,
-        'ss',       'char', 'NULL', 11,
-        'company',  'varchar', 'NULL', $char_d,
-        'address1', 'varchar', '',     $char_d,
-        'address2', 'varchar', 'NULL', $char_d,
-        'city',     'varchar', '',     $char_d,
-        'county',   'varchar', 'NULL', $char_d,
-        'state',    'varchar', 'NULL', $char_d,
-        'zip',      'varchar', '',     10,
-        'country',  'char', '',     2,
-        'daytime',  'varchar', 'NULL', 20,
-        'night',    'varchar', 'NULL', 20,
-        'fax',      'varchar', 'NULL', 12,
-        'ship_last',     'varchar', 'NULL', $char_d,
-#        'ship_middle',   'varchar', 'NULL', $char_d,
-        'ship_first',    'varchar', 'NULL', $char_d,
-        'ship_company',  'varchar', 'NULL', $char_d,
-        'ship_address1', 'varchar', 'NULL', $char_d,
-        'ship_address2', 'varchar', 'NULL', $char_d,
-        'ship_city',     'varchar', 'NULL', $char_d,
-        'ship_county',   'varchar', 'NULL', $char_d,
-        'ship_state',    'varchar', 'NULL', $char_d,
-        'ship_zip',      'varchar', 'NULL', 10,
-        'ship_country',  'char', 'NULL', 2,
-        'ship_daytime',  'varchar', 'NULL', 20,
-        'ship_night',    'varchar', 'NULL', 20,
-        'ship_fax',      'varchar', 'NULL', 12,
-        'payby',    'char', '',     4,
-        'payinfo',  'varchar', 'NULL', $char_d,
-        #'paydate',  @date_type,
-        'paydate',  'varchar', 'NULL', 10,
-        'payname',  'varchar', 'NULL', $char_d,
-        'tax',      'char', 'NULL', 1,
-        'otaker',   'varchar', '',     8,
-        'refnum',   'int',  '',     '',
-        'referral_custnum', 'int',  'NULL', '',
-        'comments', 'text', 'NULL', '',
-      ],
-      'primary_key' => 'custnum',
-      'unique' => [],
-      #'index' => [ ['last'], ['company'] ],
-      'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ] ],
-    },
-
-    'cust_main_invoice' => {
-      'columns' => [
-        'destnum',  'int',  '',     '',
-        'custnum',  'int',  '',     '',
-        'dest',     'varchar', '',  $char_d,
-      ],
-      'primary_key' => 'destnum',
-      'unique' => [],
-      'index' => [ ['custnum'], ],
-    },
-
-    'cust_main_county' => { #county+state+country are checked off the
-                            #cust_main_county for validation and to provide
-                            # a tax rate.
-      'columns' => [
-        'taxnum',   'int',   '',    '',
-        'state',    'varchar',  'NULL',    $char_d,
-        'county',   'varchar',  'NULL',    $char_d,
-        'country',  'char',  '', 2, 
-        'taxclass',   'varchar', 'NULL', $char_d,
-        'exempt_amount', @money_type,
-        'tax',      'real',  '',    '', #tax %
-      ],
-      'primary_key' => 'taxnum',
-      'unique' => [],
-  #    'unique' => [ ['taxnum'], ['state', 'county'] ],
-      'index' => [],
-    },
-
-    'cust_pay' => {
-      'columns' => [
-        'paynum',   'int',    '',   '',
-        #now cust_bill_pay #'invnum',   'int',    '',   '',
-        'custnum',  'int',    '',   '',
-        'paid',     @money_type,
-        '_date',    @date_type,
-        'payby',    'char',   '',     4, # CARD/BILL/COMP, should be index into
-                                         # payment type table.
-        'payinfo',  'varchar',   'NULL', 16,  #see cust_main above
-        'paybatch', 'varchar',   'NULL', $char_d, #for auditing purposes.
-        'closed',    'char', 'NULL', 1,
-      ],
-      'primary_key' => 'paynum',
-      'unique' => [],
-      'index' => [ [ 'custnum' ], [ 'paybatch' ] ],
-    },
-
-    'cust_bill_pay' => {
-      'columns' => [
-        'billpaynum', 'int',     '',   '',
-        'invnum',  'int',     '',   '',
-        'paynum',  'int',     '',   '',
-        'amount',  @money_type,
-        '_date',   @date_type
-      ],
-      'primary_key' => 'billpaynum',
-      'unique' => [],
-      'index' => [ [ 'paynum' ], [ 'invnum' ] ],
-    },
-
-    'cust_pay_batch' => { #what's this used for again?  list of customers
-                          #in current CARD batch? (necessarily CARD?)
-      'columns' => [
-        'paybatchnum',   'int',    '',   '',
-        'invnum',   'int',    '',   '',
-        'custnum',   'int',    '',   '',
-        'last',     'varchar', '',     $char_d,
-        'first',    'varchar', '',     $char_d,
-        'address1', 'varchar', '',     $char_d,
-        'address2', 'varchar', 'NULL', $char_d,
-        'city',     'varchar', '',     $char_d,
-        'state',    'varchar', 'NULL', $char_d,
-        'zip',      'varchar', '',     10,
-        'country',  'char', '',     2,
-#        'trancode', 'int', '', '',
-        'cardnum',  'varchar', '',     16,
-        #'exp',      @date_type,
-        'exp',      'varchar', '',     11,
-        'payname',  'varchar', 'NULL', $char_d,
-        'amount',   @money_type,
-      ],
-      'primary_key' => 'paybatchnum',
-      'unique' => [],
-      'index' => [ ['invnum'], ['custnum'] ],
-    },
-
-    'cust_pkg' => {
-      'columns' => [
-        'pkgnum',    'int',    '',   '',
-        'custnum',   'int',    '',   '',
-        'pkgpart',   'int',    '',   '',
-        'otaker',    'varchar', '', 8,
-        'setup',     @date_type,
-        'bill',      @date_type,
-        'susp',      @date_type,
-        'cancel',    @date_type,
-        'expire',    @date_type,
-        'manual_flag', 'char', 'NULL', 1,
-      ],
-      'primary_key' => 'pkgnum',
-      'unique' => [],
-      'index' => [ ['custnum'] ],
-    },
-
-    'cust_refund' => {
-      'columns' => [
-        'refundnum',    'int',    '',   '',
-        #now cust_credit_refund #'crednum',      'int',    '',   '',
-        'custnum',  'int',    '',   '',
-        '_date',        @date_type,
-        'refund',       @money_type,
-        'otaker',       'varchar',   '',   8,
-        'reason',       'varchar',   '',   $char_d,
-        'payby',        'char',   '',     4, # CARD/BILL/COMP, should be index
-                                             # into payment type table.
-        'payinfo',      'varchar',   'NULL', 16,  #see cust_main above
-        'paybatch',     'varchar',   'NULL', $char_d,
-        'closed',    'char', 'NULL', 1,
-      ],
-      'primary_key' => 'refundnum',
-      'unique' => [],
-      'index' => [],
-    },
-
-    'cust_credit_refund' => {
-      'columns' => [
-        'creditrefundnum', 'int',     '',   '',
-        'crednum',  'int',     '',   '',
-        'refundnum',  'int',     '',   '',
-        'amount',  @money_type,
-        '_date',   @date_type
-      ],
-      'primary_key' => 'creditrefundnum',
-      'unique' => [],
-      'index' => [ [ 'crednum', 'refundnum' ] ],
-    },
-
-
-    'cust_svc' => {
-      'columns' => [
-        'svcnum',    'int',    '',   '',
-        'pkgnum',    'int',    'NULL',   '',
-        'svcpart',   'int',    '',   '',
-      ],
-      'primary_key' => 'svcnum',
-      'unique' => [],
-      'index' => [ ['svcnum'], ['pkgnum'], ['svcpart'] ],
-    },
-
-    'part_pkg' => {
-      'columns' => [
-        'pkgpart',    'int',    '',   '',
-        'pkg',        'varchar',   '',   $char_d,
-        'comment',    'varchar',   '',   $char_d,
-        'setup',      @perl_type,
-        'freq',       'int', '', '',  #billing frequency (months)
-        'recur',      @perl_type,
-        'setuptax',  'char', 'NULL', 1,
-        'recurtax',  'char', 'NULL', 1,
-        'plan',       'varchar', 'NULL', $char_d,
-        'plandata',   'text', 'NULL', '',
-        'disabled',   'char', 'NULL', 1,
-        'taxclass',   'varchar', 'NULL', $char_d,
-      ],
-      'primary_key' => 'pkgpart',
-      'unique' => [],
-      'index' => [],
-    },
-
-#    'part_title' => {
-#      'columns' => [
-#        'titlenum',   'int',    '',   '',
-#        'title',      'varchar',   '',   $char_d,
-#      ],
-#      'primary_key' => 'titlenum',
-#      'unique' => [ [] ],
-#      'index' => [ [] ],
-#    },
-
-    'pkg_svc' => {
-      'columns' => [
-        'pkgpart',    'int',    '',   '',
-        'svcpart',    'int',    '',   '',
-        'quantity',   'int',    '',   '',
-      ],
-      'primary_key' => '',
-      'unique' => [ ['pkgpart', 'svcpart'] ],
-      'index' => [ ['pkgpart'] ],
-    },
-
-    'part_referral' => {
-      'columns' => [
-        'refnum',   'int',    '',   '',
-        'referral', 'varchar',   '',   $char_d,
-      ],
-      'primary_key' => 'refnum',
-      'unique' => [],
-      'index' => [],
-    },
-
-    'part_svc' => {
-      'columns' => [
-        'svcpart',    'int',    '',   '',
-        'svc',        'varchar',   '',   $char_d,
-        'svcdb',      'varchar',   '',   $char_d,
-        'disabled',   'char',  'NULL',   1,
-      ],
-      'primary_key' => 'svcpart',
-      'unique' => [],
-      'index' => [],
-    },
-
-    'part_svc_column' => {
-      'columns' => [
-        'columnnum',   'int',         '', '',
-        'svcpart',     'int',         '', '',
-        'columnname',  'varchar',     '', 64,
-        'columnvalue', 'varchar', 'NULL', $char_d,
-        'columnflag',  'char',    'NULL', 1, 
-      ],
-      'primary_key' => 'columnnum',
-      'unique' => [ [ 'svcpart', 'columnname' ] ],
-      'index' => [ [ 'svcpart' ] ],
-    },
-
-    #(this should be renamed to part_pop)
-    'svc_acct_pop' => {
-      'columns' => [
-        'popnum',    'int',    '',   '',
-        'city',      'varchar',   '',   $char_d,
-        'state',     'varchar',   '',   $char_d,
-        'ac',        'char',   '',   3,
-        'exch',      'char',   '',   3,
-        'loc',       'char',   'NULL',   4, #NULL for legacy purposes
-      ],
-      'primary_key' => 'popnum',
-      'unique' => [],
-      'index' => [ [ 'state' ] ],
-    },
-
-    'part_pop_local' => {
-      'columns' => [
-        'localnum',  'int',     '',     '',
-        'popnum',    'int',     '',     '',
-        'city',      'varchar', 'NULL', $char_d,
-        'state',     'char',    'NULL', 2,
-        'npa',       'char',    '',     3,
-        'nxx',       'char',    '',     3,
-      ],
-      'primary_key' => 'localnum',
-      'unique' => [],
-      'index' => [ [ 'npa', 'nxx' ], [ 'popnum' ] ],
-    },
-
-    'svc_acct' => {
-      'columns' => [
-        'svcnum',    'int',    '',   '',
-        'username',  'varchar',   '',   $username_len, #unique (& remove dup code)
-        '_password', 'varchar',   '',   50, #13 for encryped pw's plus ' *SUSPENDED* (mp5 passwords can be 34)
-        'sec_phrase', 'varchar',  'NULL',   $char_d,
-        'popnum',    'int',    'NULL',   '',
-        'uid',       'int', 'NULL',   '',
-        'gid',       'int', 'NULL',   '',
-        'finger',    'varchar',   'NULL',   $char_d,
-        'dir',       'varchar',   'NULL',   $char_d,
-        'shell',     'varchar',   'NULL',   $char_d,
-        'quota',     'varchar',   'NULL',   $char_d,
-        'slipip',    'varchar',   'NULL',   15, #four TINYINTs, bah.
-        'seconds',   'int', 'NULL',   '', #uhhhh
-        'domsvc',    'int', '',   '',
-      ],
-      'primary_key' => 'svcnum',
-      #'unique' => [ [ 'username', 'domsvc' ] ],
-      'unique' => [],
-      'index' => [ ['username'], ['domsvc'] ],
-    },
-
-#    'svc_acct_sm' => {
-#      'columns' => [
-#        'svcnum',    'int',    '',   '',
-#        'domsvc',    'int',    '',   '',
-#        'domuid',    'int', '',   '',
-#        'domuser',   'varchar',   '',   $char_d,
-#      ],
-#      'primary_key' => 'svcnum',
-#      'unique' => [ [] ],
-#      'index' => [ ['domsvc'], ['domuid'] ], 
-#    },
-
-    #'svc_charge' => {
-    #  'columns' => [
-    #    'svcnum',    'int',    '',   '',
-    #    'amount',    @money_type,
-    #  ],
-    #  'primary_key' => 'svcnum',
-    #  'unique' => [ [] ],
-    #  'index' => [ [] ],
-    #},
-
-    'svc_domain' => {
-      'columns' => [
-        'svcnum',    'int',    '',   '',
-        'domain',    'varchar',    '',   $char_d,
-        'catchall',  'int', 'NULL',    '',
-      ],
-      'primary_key' => 'svcnum',
-      'unique' => [ ['domain'] ],
-      'index' => [],
-    },
-
-    'domain_record' => {
-      'columns' => [
-        'recnum',    'int',     '',  '',
-        'svcnum',    'int',     '',  '',
-        'reczone',   'varchar', '',  $char_d,
-        'recaf',     'char',    '',  2,
-        'rectype',   'char',    '',  5,
-        'recdata',   'varchar', '',  $char_d,
-      ],
-      'primary_key' => 'recnum',
-      'unique'      => [],
-      'index'       => [ ['svcnum'] ],
-    },
-
-    'svc_forward' => {
-      'columns' => [
-        'svcnum',   'int',    '',  '',
-        'srcsvc',   'int',    '',  '',
-        'dstsvc',   'int',    '',  '',
-        'dst',      'varchar',    'NULL',  $char_d,
-      ],
-      'primary_key' => 'svcnum',
-      'unique'      => [],
-      'index'       => [ ['srcsvc'], ['dstsvc'] ],
-    },
-
-    'svc_www' => {
-      'columns' => [
-        'svcnum',   'int',    '',  '',
-        'recnum',   'int',    '',  '',
-        'usersvc',  'int',    '',  '',
-      ],
-      'primary_key' => 'svcnum',
-      'unique'      => [],
-      'index'       => [],
-    },
-
-    #'svc_wo' => {
-    #  'columns' => [
-    #    'svcnum',    'int',    '',   '',
-    #    'svcnum',    'int',    '',   '',
-    #    'svcnum',    'int',    '',   '',
-    #    'worker',    'varchar',   '',   $char_d,
-    #    '_date',     @date_type,
-    #  ],
-    #  'primary_key' => 'svcnum',
-    #  'unique' => [ [] ],
-    #  'index' => [ [] ],
-    #},
-
-    'prepay_credit' => {
-      'columns' => [
-        'prepaynum',   'int',     '',   '',
-        'identifier',  'varchar', '', $char_d,
-        'amount',      @money_type,
-        'seconds',     'int',     'NULL', '',
-      ],
-      'primary_key' => 'prepaynum',
-      'unique'      => [ ['identifier'] ],
-      'index'       => [],
-    },
-
-    'port' => {
-      'columns' => [
-        'portnum',  'int',     '',   '',
-        'ip',       'varchar', 'NULL', 15,
-        'nasport',  'int',     'NULL', '',
-        'nasnum',   'int',     '',   '',
-      ],
-      'primary_key' => 'portnum',
-      'unique'      => [],
-      'index'       => [],
-    },
-
-    'nas' => {
-      'columns' => [
-        'nasnum',   'int',     '',    '',
-        'nas',      'varchar', '',    $char_d,
-        'nasip',    'varchar', '',    15,
-        'nasfqdn',  'varchar', '',    $char_d,
-        'last',     'int',     '',    '',
-      ],
-      'primary_key' => 'nasnum',
-      'unique'      => [ [ 'nas' ], [ 'nasip' ] ],
-      'index'       => [ [ 'last' ] ],
-    },
-
-    'session' => {
-      'columns' => [
-        'sessionnum', 'int',       '',   '',
-        'portnum',    'int',       '',   '',
-        'svcnum',     'int',       '',   '',
-        'login',      @date_type,
-        'logout',     @date_type,
-      ],
-      'primary_key' => 'sessionnum',
-      'unique'      => [],
-      'index'       => [ [ 'portnum' ] ],
-    },
-
-    'queue' => {
-      'columns' => [
-        'jobnum', 'int', '', '',
-        'job', 'text', '', '',
-        '_date', 'int', '', '',
-        'status', 'varchar', '', $char_d,
-        'statustext', 'text', 'NULL', '',
-        'svcnum', 'int', 'NULL', '',
-      ],
-      'primary_key' => 'jobnum',
-      'unique'      => [],
-      'index'       => [ [ 'svcnum' ], [ 'status' ] ],
-    },
-
-    'queue_arg' => {
-      'columns' => [
-        'argnum', 'int', '', '',
-        'jobnum', 'int', '', '',
-        'arg', 'text', 'NULL', '',
-      ],
-      'primary_key' => 'argnum',
-      'unique'      => [],
-      'index'       => [ [ 'jobnum' ] ],
-    },
-
-    'queue_depend' => {
-      'columns' => [
-        'dependnum', 'int', '', '',
-        'jobnum', 'int', '', '',
-        'depend_jobnum', 'int', '', '',
-      ],
-      'primary_key' => 'dependnum',
-      'unique'      => [],
-      'index'       => [ [ 'jobnum' ], [ 'depend_jobnum' ] ],
-    },
-
-    'export_svc' => {
-      'columns' => [
-        'exportsvcnum' => 'int', '', '',
-        'exportnum'    => 'int', '', '',
-        'svcpart'      => 'int', '', '',
-      ],
-      'primary_key' => 'exportsvcnum',
-      'unique'      => [ [ 'exportnum', 'svcpart' ] ],
-      'index'       => [ [ 'exportnum' ], [ 'svcpart' ] ],
-    },
-
-    'part_export' => {
-      'columns' => [
-        'exportnum', 'int', '', '',
-        #'svcpart',   'int', '', '',
-        'machine', 'varchar', '', $char_d,
-        'exporttype', 'varchar', '', $char_d,
-        'nodomain',     'char', 'NULL', 1,
-      ],
-      'primary_key' => 'exportnum',
-      'unique'      => [],
-      'index'       => [ [ 'machine' ], [ 'exporttype' ] ],
-    },
-
-    'part_export_option' => {
-      'columns' => [
-        'optionnum', 'int', '', '',
-        'exportnum', 'int', '', '',
-        'optionname', 'varchar', '', $char_d,
-        'optionvalue', 'text', 'NULL', '',
-      ],
-      'primary_key' => 'optionnum',
-      'unique'      => [],
-      'index'       => [ [ 'exportnum' ], [ 'optionname' ] ],
-    },
-
-    'radius_usergroup' => {
-      'columns' => [
-        'usergroupnum', 'int', '', '',
-        'svcnum',       'int', '', '',
-        'groupname',    'varchar', '', $char_d,
-      ],
-      'primary_key' => 'usergroupnum',
-      'unique'      => [],
-      'index'       => [ [ 'svcnum' ], [ 'groupname' ] ],
-    },
-
-    'msgcat' => {
-      'columns' => [
-        'msgnum', 'int', '', '',
-        'msgcode', 'varchar', '', $char_d,
-        'locale', 'varchar', '', 16,
-        'msg', 'text', '', '',
-      ],
-      'primary_key' => 'msgnum',
-      'unique'      => [ [ 'msgcode', 'locale' ] ],
-      'index'       => [],
-    },
-
-    'cust_tax_exempt' => {
-      'columns' => [
-        'exemptnum', 'int', '', '',
-        'custnum',   'int', '', '',
-        'taxnum',    'int', '', '',
-        'year',      'int', '', '',
-        'month',     'int', '', '',
-        'amount',   @money_type,
-      ],
-      'primary_key' => 'exemptnum',
-      'unique'      => [ [ 'custnum', 'taxnum', 'year', 'month' ] ],
-      'index'       => [],
-    },
-
-
-
-  );
-
-  %tables;
-
-}
-
diff --git a/bin/generate-prepay b/bin/generate-prepay
deleted file mode 100755
index cb4ba7fc6..000000000
--- a/bin/generate-prepay
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use FS::UID qw(adminsuidsetup);
-use FS::prepay_credit;
-
-require 5.004; #srand(time|$$);
-
-my $user = shift or die &usage;
-&adminsuidsetup( $user );
-
-my $amount = shift or die &usage;
-
-my $seconds = shift or die &usage;
-
-my $num_digits = shift or die &usage;
-
-my $num_entries = shift or die &usage;
-
-for ( 1 .. $num_entries ) {
-  my $identifier = join( '', map int(rand(10)), ( 1 .. $num_digits ) );
-  my $prepay_credit = new FS::prepay_credit {
-    'identifier' => $identifier,
-    'amount'     => $amount,
-    'seconds'    => $seconds,
-  };
-  my $error = $prepay_credit->insert;
-  die $error if $error;
-  print "$identifier\n";
-}
-
-sub usage {
-  die "Usage:\n\n  generate-prepay user amount seconds num_digits num_entries";
-}
-
diff --git a/bin/generate-raddb b/bin/generate-raddb
deleted file mode 100755
index 1d0053a2b..000000000
--- a/bin/generate-raddb
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/perl
-
-# usage: generate-raddb radius-server/raddb/dictionary* >raddb.pm
-#  i.e.: generate-raddb ~/src/freeradius-0.2/raddb/dictionary* >FS/raddb.pm
-
-print <<END;
-package FS::raddb;
-use vars qw(%attrib);
-
-%attrib = (
-END
-
-while (<>) {
-  next if /^(#|\s*$|\$INCLUDE\s+)/;
-  next if /^(VALUE|VENDOR|BEGIN\-VENDOR|END\-VENDOR)\s+/;
-  /^(ATTRIBUTE|ATTRIB_NMC)\s+([\w\-]+)\s+/ or die $_;
-  $attrib = $2;
-  $dbname = lc($2);
-  $dbname =~ s/\-/_/g;
-  $hash{$dbname} = $attrib;
-  #print "$2\n";
-}
-
-foreach ( keys %hash ) {
-#  print "$_\n" if length($_)>24;
-#  print substr($_,0,24),"\n" if length($_)>24; 
-#  $max = length($_) if length($_)>$max;
-#everything >24 is still unique, at least with freeradius comprehensive dataset
-  print "  '". substr($_,0,24). "' => '$hash{$_}',\n";
-}
-
-print <<END;
-);
-
-1;
-END
-
diff --git a/bin/generate-tests b/bin/generate-tests
deleted file mode 100755
index 73fd29ecb..000000000
--- a/bin/generate-tests
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/perl
-@files = glob('FS/*.pm');
-foreach (@files) {
-#  warn $_;
-  chomp;
-  s/^FS\///;
-  $f=$_;
-  $f=~s/pm$/t/;
-  $m=$_;
-  $m=~s/\.pm$//;
-  open(TEST,">t/$f");
-  print "t/$f\n";
-  print TEST
-             'BEGIN { $| = 1; print "1..1\n" }'. "\n".
-             'END {print "not ok 1\n" unless $loaded;}'. "\n".
-             "use FS::$m;\n".
-             '$loaded=1;'. "\n".
-             'print "ok 1\n";'. "\n"
-             ;
-  close TEST;
-}
diff --git a/bin/masonize b/bin/masonize
deleted file mode 100755
index 475c9a6bf..000000000
--- a/bin/masonize
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/perl
-
-foreach $file ( split(/\n/, `find . -depth -print | grep cgi\$`) ) {
-  open(F,$file) or die "can't open $file for reading: $!";
-  @file = <F>;
-  #print "$file ". scalar(@file). "\n";
-  close $file;
-  system("chmod u+w $file");
-  open(W,">$file") or die "can't open $file for writing: $!";
-  select W; $| = 1; select STDOUT;
-  $all = join('',@file);
-
-  $mode = 'html';
-  while ( length($all) ) {
-
-    if ( $mode eq 'html' ) {
-
-      if ( $all =~ /^(.+?)(<%=?.*)$/s && $1 !~ /<%/s ) {
-        print W $1;
-        $all = $2;
-        next;
-      } elsif ( $all =~ /^<%=(.*)$/s ) {
-        print W '<%';
-        $all = $1;
-        $mode = 'perlv';
-        #die;
-        next;
-      } elsif ( $all =~ /^<%(.*)$/s ) {
-        print W "\n";
-        $all = $1;
-        $mode = 'perlc';
-        next;
-      } elsif ( $all !~ /<%/s ) {
-        print W $all;
-        last;
-      } else {
-        warn length($all); die;
-      }
-      die;
-
-    } elsif ( $mode eq 'perlv' ) {
-
-      if ( $all =~ /^(.*?%>)(.*)$/s ) {
-        print W $1;
-        $all=$2;
-        $mode = 'html';
-        next;
-      }
-      die 'unterminated <%= ???';
-
-    } elsif ( $mode eq 'perlc' ) {
-
-      if ( $all =~ /^([^\n]*?)%>(.*)$/s ) {
-        print W "%$1\n";
-        $all=$2;
-        $mode='html';
-        next;
-      }
-      if ( $all =~ /^([^\n]*)\n(.*)$/s ) {
-        print W "%$1\n";
-        $all=$2;
-        next;
-      }
-
-    } else { die };
-
-  }
-
-  close W;
-}
diff --git a/bin/passwd.import b/bin/passwd.import
deleted file mode 100755
index fbf27370f..000000000
--- a/bin/passwd.import
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/perl -Tw
-# $Id: passwd.import,v 1.5 2002-06-21 09:57:05 ivan Exp $
-
-use strict;
-use vars qw(%part_svc);
-use Date::Parse;
-use Term::Query qw(query);
-use Net::SCP qw(iscp);
-use FS::UID qw(adminsuidsetup datasrc);
-use FS::Record qw(qsearch qsearchs);
-use FS::svc_acct;
-use FS::part_svc;
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-push @FS::svc_acct::shells, qw(/bin/sync /sbin/shuddown /bin/halt); #others?
-
-my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
-
-#$FS::svc_acct::nossh_hack = 1;
-$FS::svc_Common::noexport_hack = 1;
-
-###
-
-%part_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_acct'});
-
-die "No services with svcdb svc_acct!\n" unless %part_svc;
-
-print "\n\n", &menu_svc, "\n", <<END;
-Enter part number to import.
-END
-my($shell_svcpart)=&getpart;
-
-print "\n\n", <<END;
-Enter the location and name of your _user_ passwd file, for example
-"mail.isp.com:/etc/passwd" or "nis.isp.com:/etc/global/passwd"
-END
-my($loc_passwd)=&getvalue(":");
-iscp("root\@$loc_passwd", "$spooldir/passwd.import");
-
-print "\n\n", <<END;
-Enter the location and name of your _user_ shadow file, for example
-"mail.isp.com:/etc/shadow" or "bsd.isp.com:/etc/master.passwd"
-END
-my($loc_shadow)=&getvalue(":");
-iscp("root\@$loc_shadow", "$spooldir/shadow.import");
-
-sub menu_svc {
-  ( join "\n", map "$_: ".$part_svc{$_}->svc, sort keys %part_svc ). "\n";
-}
-sub getpart {
-  $^W=0; # Term::Query isn't -w-safe
-  my $return = query "Enter part number:", 'irk', [ keys %part_svc ];
-  $^W=1;
-  $return;
-}
-sub getvalue {
-  my $prompt = shift;
-  $^W=0; # Term::Query isn't -w-safe
-  my $return = query $prompt, '';
-  $^W=1;
-  $return;
-}
-
-print "\n\n";
-
-###
-
-open(PASSWD,"<$spooldir/passwd.import");
-open(SHADOW,"<$spooldir/shadow.import");
-
-my(%password);
-while (<SHADOW>) {
-  chop;
-  my($username,$password)=split(/:/);
-  #$password =~ s/^\!$/\*/;
-  #$password =~ s/\!+/\*SUSPENDED\* /;
-  $password{$username}=$password;
-}
-
-while (<PASSWD>) {
-  chop;
-  my($username,$x,$uid,$gid,$finger,$dir,$shell) = split(/:/);
-  my $password = $password{$username};
-
-  my $svcpart = $shell_svcpart;
-
-  #if ( qsearchs('svc_acct', { 'username' => $username } ) ) {
-  #  warn "warning: $username already exists; skipping\n";
-  #  next;
-  #}
-
-  my($svc_acct) = new FS::svc_acct ({
-    'svcpart'   => $svcpart,
-    'username'  => $username,
-    '_password' => $password,
-    'uid'       => $uid,
-    'gid'       => $gid,
-    'finger'    => $finger,
-    'dir'       => $dir,
-    'shell'     => $shell,
-    #%{$allparam{$username}},
-  });
-  my($error);
-  $error=$svc_acct->insert;
-  die $error if $error;
-
-}
-
-sub usage {
-  die "Usage:\n\n  passwd.import user\n";
-}
-
diff --git a/bin/pod2x b/bin/pod2x
deleted file mode 100755
index 46ccc7743..000000000
--- a/bin/pod2x
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/perl
-
-#use Pod::Text;
-#$Pod::Text::termcap=1;
-
-my $site_perl = "./FS";
-#my $catman = "./catman";
-#my $catman = "./htdocs/docs/man";
-#my $html = "./htdocs/docs/man";
-my $html = "./httemplate/docs/man";
-
-$|=1;
-
-die "Can't find $site_perl" unless -d $site_perl;
-#die "Can't find $catman" unless -d $catman;
-die "Can't find $html" unless -d $html;
-
-#make some useless links
-foreach my $file (
-  glob("$site_perl/bin/freeside-*"),
-) {
-  next if $file =~ /\.pod$/;
-  #symlink $file, "$file.pod"; # or die "link $file to $file.pod: $!";
-  system("cp $file $file.pod");
-}
-
-foreach my $file (
-  glob("$site_perl/*.pm"),
-  glob("$site_perl/*/*.pm"),
-  glob("$site_perl/*/*/*.pm"),
-  glob("$site_perl/bin/*.pod"),
-  glob("./fs_sesmon/FS-SessionClient/*.pm"),
-  glob("./fs_signup/FS-SignupClient/*.pm"),
-  glob("./fs_selfadmin/FS-MailAdminServer/*.pm"),
-) {
-  next if $file =~ /(^|\/)blib\//;
-  #$file =~ /\/([\w\-]+)\.pm$/ or die "oops file $file";
-  my $name;
-  if ( $file =~ /fs_\w+\/FS\-\w+\/(.*)\.pm$/ ) {
-    $name = "FS/$1";
-  } elsif ( $file =~ /$site_perl\/(.*)\.(pm|pod)$/ ) {
-    $name = $1;
-  } else {
-    die "oops file $file";
-  }
-  print "$name\n";
-  my $htmlroot = join('/', map '..',1..(scalar($file =~ tr/\///)-2)) || '.';
-#  system "pod2text $file >$catman/$name.txt"; 
-  system "pod2html --podroot=$site_perl --podpath=./FS:./FS/UI:.:./bin --norecurse --htmlroot=$htmlroot $file >$html/$name.html";
-  #system "pod2html --podroot=$site_perl --htmlroot=$htmlroot $file >$html/$name.html";
-#  system "pod2html $file >$html/$name.html";
-}
-
-#remove the useless links
-unlink glob("$site_perl/bin/*.pod");
-
diff --git a/bin/populate-msgcat b/bin/populate-msgcat
deleted file mode 100755
index f8e23cfa0..000000000
--- a/bin/populate-msgcat
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch);
-use FS::msgcat;
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-foreach my $del_msgcat ( qsearch('msgcat', {}) ) {
-  my $error = $del_msgcat->delete;
-  die $error if $error;
-}
-
-my %messages = messages();
-
-foreach my $msgcode ( keys %messages ) {
-  foreach my $locale ( keys %{$messages{$msgcode}} ) {
-    my $msgcat = new FS::msgcat( {
-      'msgcode' => $msgcode,
-      'locale'  => $locale,
-      'msg'     => $messages{$msgcode}{$locale},
-    });
-    my $error = $msgcat->insert;
-    die $error if $error;
-  }
-}
-
-print "Message catalog initialized sucessfully\n";
-
-sub messages {
-
-  #  'msgcode' => {
-  #    'en_US' => 'Message',
-  #  },
-
-  (
-
-    'passwords_dont_match' => {
-      'en_US' => "Passwords don't match",
-    },
-
-    'invalid_card' => {
-      'en_US' => 'Invalid credit card number',
-    },
-
-    'unknown_card_type' => {
-      'en_US' => 'Unknown card type',
-    },
-
-    'not_a' => {
-      'en_US' => 'Not a ',
-    },
-
-    'empty_password' => {
-      'en_US' => 'Empty password',
-    },
-
-    'no_access_number_selected' => {
-      'en_US' => 'No access number selected',
-    },
-
-    'illegal_text' => {
-      'en_US' => 'Illegal (text)',
-      #'en_US' => 'Only letters, numbers, spaces, and the following punctuation symbols are permitted: ! @ # $ % & ( ) - + ; : \' " , . ? / in field',
-    },
-
-    'illegal_or_empty_text' => {
-      'en_US' => 'Illegal or empty (text)',
-      #'en_US' => 'Only letters, numbers, spaces, and the following punctuation symbols are permitted: ! @ # $ % & ( ) - + ; : \' " , . ? / in required field',
-    },
-
-    'illegal_username' => {
-      'en_US' => 'Illegal username',
-    },
-
-    'illegal_password' => {
-      'en_US' => 'Illegal password (',
-    },
-
-    'illegal_password_characters' => {
-      'en_US' => ' characters)',
-    },
-
-    'username_in_use' => {
-      'en_US' => 'Username in use',
-    },
-
-    'illegal_email_invoice_address' => {
-      'en_US' => 'Illegal email invoice address',
-    },
-
-    'illegal_name' => {
-      'en_US' => 'Illegal (name)',
-      #'en_US' => 'Only letters, numbers, spaces and the following punctuation symbols are permitted: , . - \' in field',
-    },
-
-    'illegal_phone' => {
-      'en_US' => 'Illegal (phone)',
-      #'en_US' => '',
-    },
-
-    'illegal_zip' => {
-      'en_US' => 'Illegal (zip)',
-      #'en_US' => '',
-    },
-
-    'expired_card' => {
-      'en_US' => 'Expired card',
-    },
-
-  );
-}
-
-sub usage {
-  die "Usage:\n\n  populate-msgcat user\n";
-}
-
diff --git a/bin/svc_acct.export b/bin/svc_acct.export
deleted file mode 100755
index 0bc370fc0..000000000
--- a/bin/svc_acct.export
+++ /dev/null
@@ -1,641 +0,0 @@
-#!/usr/bin/perl -w
-#
-# $Id: svc_acct.export,v 1.36 2002-05-16 14:28:35 ivan Exp $
-#
-# Create and export password, radius and vpopmail password files:
-# passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
-# users/assign, domains/vdomain/vpasswd
-# Also export sendmail and qmail config files.
-
-use strict;
-use vars qw($conf);
-use Fcntl qw(:flock);
-use File::Path;
-use IO::Handle;
-use FS::Conf;
-use Net::SSH qw(ssh);
-use Net::SCP qw(scp);
-use FS::UID qw(adminsuidsetup datasrc dbh);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_acct;
-use FS::svc_domain;
-use FS::svc_forward;
-
-my $ssh='ssh';
-my $rsync='rsync';
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-$conf = new FS::Conf;
-
-my $userpolicy = $conf->config('username_policy')
-  if $conf->exists('username_policy');
-
-my @shellmachines = $conf->config('shellmachines')
-  if $conf->exists('shellmachines');
-
-my @bsdshellmachines = $conf->config('bsdshellmachines')
-  if $conf->exists('bsdshellmachines');
-
-my @nismachines = $conf->config('nismachines')
-  if $conf->exists('nismachines');
-
-my @erpcdmachines = $conf->config('erpcdmachines')
-  if $conf->exists('erpcdmachines');
-
-my @radiusmachines = $conf->config('radiusmachines')
-  if $conf->exists('radiusmachines');
-
-my $textradiusprepend =
-  $conf->exists('textradiusprepend')
-    ? $conf->config('textradiusprepend')
-    : '';
-
-warn "using depriciated textradiusprepend file" if $textradiusprepend;
-
-
-my $radiusprepend =
-  $conf->exists('radiusprepend')
-    ? join("\n", $conf->config('radiusprepend'))
-    : '';
-
-my @vpopmailmachines = $conf->config('vpopmailmachines')
-  if $conf->exists('vpopmailmachines');
-my $vpopmailrestart = '';
-$vpopmailrestart = $conf->config('vpopmailrestart')
-  if $conf->exists('vpopmailrestart');
-
-my ($machine, $vpopdir, $vpopuid, $vpopgid) = split (/\s+/, $vpopmailmachines[0]) if $vpopmailmachines[0];
-
-my($shellmachine, @qmailmachines);
-if ( $conf->exists('qmailmachines') ) {
-  $shellmachine = $conf->config('shellmachine');
-  @qmailmachines = $conf->config('qmailmachines');
-}
-
-my(@sendmailmachines, $sendmailconfigpath, $sendmailrestart);
-if ( $conf->exists('sendmailmachines') ) {
-  @sendmailmachines = $conf->config('sendmailmachines');
-  $sendmailconfigpath = $conf->config('sendmailconfigpath') || '/etc';
-  $sendmailrestart = $conf->config('sendmailrestart');
-}
-
-my $mydomain = $conf->config('domain') if $conf->exists('domain');
-
-
-
-
-my(@saltset)= ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
-require 5.004; #srand(time|$$);
-
-my $spooldir = "/usr/local/etc/freeside/export.". datasrc;
-my $spoollock = "/usr/local/etc/freeside/svc_acct.export.lock.". datasrc;
-
-open(EXPORT,"+>>$spoollock") or die "Can't open $spoollock: $!";
-select(EXPORT); $|=1; select(STDOUT);
-unless ( flock(EXPORT,LOCK_EX|LOCK_NB) ) {
-  seek(EXPORT,0,0);
-  my($pid)=<EXPORT>;
-  chop($pid);
-  #no reason to start lots of blocking processes
-  die "Is another export process running under pid $pid?\n";
-}
-seek(EXPORT,0,0);
-print EXPORT $$,"\n";
-
-my(@svc_domain)=qsearch('svc_domain',{});
-
-( open(MASTER,">$spooldir/master.passwd")
-  and flock(MASTER,LOCK_EX|LOCK_NB)  
-) or die "Can't open $spooldir/.master.passwd: $!";
-( open(PASSWD,">$spooldir/passwd")
-  and flock(PASSWD,LOCK_EX|LOCK_NB)  
-) or die "Can't open $spooldir/passwd: $!";
-( open(SHADOW,">$spooldir/shadow")
-  and flock(SHADOW,LOCK_EX|LOCK_NB)  
-) or die "Can't open $spooldir/shadow: $!";
-( open(ACP_PASSWD,">$spooldir/acp_passwd")
-  and flock(ACP_PASSWD,LOCK_EX|LOCK_NB)  
-) or die "Can't open $spooldir/acp_passwd: $!";
-( open(ACP_DIALUP,">$spooldir/acp_dialup")
-  and flock(ACP_DIALUP,LOCK_EX|LOCK_NB)  
-) or die "Can't open $spooldir/acp_dialup: $!";
-( open(USERS,">$spooldir/users")
-  and flock(USERS,LOCK_EX|LOCK_NB)  
-) or die "Can't open $spooldir/users: $!";
-
-( open(ASSIGN,">$spooldir/assign")
-  and flock(ASSIGN,LOCK_EX|LOCK_NB)  
-) or die "Can't open $spooldir/assign: $!";
-( open(RCPTHOSTS,">$spooldir/rcpthosts")
-  and flock(RCPTHOSTS,LOCK_EX|LOCK_NB) 
-) or die "Can't open $spooldir/rcpthosts: $!";
-( open(VPOPRCPTHOSTS,">$spooldir/vpoprcpthosts")
-  and flock(VPOPRCPTHOSTS,LOCK_EX|LOCK_NB) 
-) or die "Can't open $spooldir/rcpthosts: $!";
-( open(RECIPIENTMAP,">$spooldir/recipientmap") 
-  and flock(RECIPIENTMAP,LOCK_EX|LOCK_NB) 
-) or die "Can't open $spooldir/recipientmap: $!";
-( open(VIRTUALDOMAINS,">$spooldir/virtualdomains") 
-  and flock(VIRTUALDOMAINS,LOCK_EX|LOCK_NB)
-) or die "Can't open $spooldir/virtualdomains: $!";
-( open(VPOPVIRTUALDOMAINS,">$spooldir/vpopvirtualdomains") 
-  and flock(VPOPVIRTUALDOMAINS,LOCK_EX|LOCK_NB)
-) or die "Can't open $spooldir/virtualdomains: $!";
-( open(VIRTUSERTABLE,">$spooldir/virtusertable")
-  and flock(VIRTUSERTABLE,LOCK_EX|LOCK_NB)
-) or die "Can't open $spooldir/virtusertable: $!";
-( open(SENDMAIL_CW,">$spooldir/sendmail.cw")
-  and flock(SENDMAIL_CW,LOCK_EX|LOCK_NB)
-) or die "Can't open $spooldir/sendmail.cw: $!";
-
-
-
-chmod 0644, "$spooldir/passwd",
-            "$spooldir/acp_dialup",
-            "$spooldir/assign",
-            "$spooldir/sendmail.cw",
-            "$spooldir/virtusertable",
-            "$spooldir/rcpthosts",
-            "$spooldir/vpoprcpthosts",
-            "$spooldir/recipientmap",
-            "$spooldir/virtualdomains",
-            "$spooldir/vpopvirtualdomains",
-
-;
-chmod 0600, "$spooldir/master.passwd",
-            "$spooldir/acp_passwd",
-            "$spooldir/shadow",
-            "$spooldir/users",
-;
-
-rmtree"$spooldir/domains", 0, 1;
-mkdir "$spooldir/domains", 0700;
-
-setpriority(0,0,10);
-
-print USERS "$radiusprepend\n";
-
-my %usernames;  ## this hack helps keep the passwd files sane
-my @sendmail;
-
-my $svc_domain;
-foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) {
-
-  my($domain)=$svc_domain->domain;
-  print RCPTHOSTS "$domain\n.$domain\n";
-  print VPOPRCPTHOSTS "$domain\n";
-  print SENDMAIL_CW "$domain\n";
-
-  ###
-  # FORMAT OF THE ASSIGN/USERS FILE HERE
-  print ASSIGN join(":",
-    "+" . $domain . "-",
-    $domain,
-    $vpopuid,
-    $vpopgid,
-    $vpopdir . "/domains/" . $domain,
-    "-",
-    "",
-    "",
-  ), "\n" if $vpopmailmachines[0];
-
-  (mkdir "$spooldir/domains/" . $domain, 0700)
-    or die "Can't create $spooldir/domains/" . $domain .": $!";
-
-  ( open(QMAILDEFAULT,">$spooldir/domains/" . $domain . "/.qmail-default")
-    and flock(QMAILDEFAULT,LOCK_EX|LOCK_NB)  
-  ) or die "Can't open $spooldir/domains/" . $domain . "/.qmail-default: $!";
-
-  ( open(VPASSWD,">$spooldir/domains/" . $domain . "/vpasswd")
-    and flock(VPASSWD,LOCK_EX|LOCK_NB)  
-  ) or die "Can't open $spooldir/domains/" . $domain . "/vpasswd: $!";
-
-  my ($svc_acct);
-
-  if ($svc_domain->getfield('catchall')) {
-    $svc_acct = qsearchs('svc_acct', {'svcnum' => $svc_domain->catchall});
-    die "Cannot find catchall account for domain $domain\n" unless $svc_acct;
-
-    my $username = $svc_acct->username;
-    push @sendmail, "\@$domain\t$username\n";
-    print VIRTUALDOMAINS "$domain:$username-$domain\n",
-                         ".$domain:$username-$domain\n",
-    ;
-
-    ###
-    # FORMAT OF THE .QMAIL-DEFAULT FILE HERE
-    print QMAILDEFAULT "| $vpopdir/bin/vdelivermail \"\" " . $svc_acct->email . "\n"
-      if $vpopmailmachines[0];
-
-  }else{
-    ###
-    # FORMAT OF THE .QMAIL-DEFAULT FILE HERE
-    print QMAILDEFAULT "| $vpopdir/bin/vdelivermail \"\" bounce-no-mailbox\n"
-      if $vpopmailmachines[0];
-  }
-
-  print VPOPVIRTUALDOMAINS "$domain:$domain\n";
-
-  foreach $svc_acct (qsearch('svc_acct', {'domsvc' => $svc_domain->svcnum})) {
-    my($password)=$svc_acct->getfield('_password');
-    my($cpassword,$rpassword);
-    #if ( ( length($password) <= 8 )
-    if ( ( length($password) <= 12 )
-         && ( $password ne '*' )
-         && ( $password ne '!!' )
-         && ( $password ne '' )
-       ) {
-      $cpassword=crypt($password,
-                       $saltset[int(rand(64))].$saltset[int(rand(64))]
-      );
-      $rpassword=$password;
-    } else {
-      $cpassword=$password;
-      $rpassword='UNIX';
-    }
-
-    my $username;
-
-    if ($mydomain && ($mydomain eq $svc_domain->domain)) {
-      $username=$svc_acct->username;
-    } elsif ($userpolicy =~ /^prepend domsvc$/) {
-      $username=$svc_acct->domsvc . $svc_acct->username;
-    } elsif ($userpolicy =~ /^append domsvc$/) {
-      $username=$svc_acct->username . $svc_acct->domsvc;
-    } elsif ($userpolicy =~ /^append domain$/) {
-      $username=$svc_acct->username . $svc_domain->domain;
-    } elsif ($userpolicy =~ /^append domain$/) {
-      $username=$svc_acct->username . $svc_domain->domain;
-    } elsif ($userpolicy =~ /^append \@domain$/) {
-      $username=$svc_acct->username . '@'. $svc_domain->domain;
-    } else {
-      die "Unknown policy in username_policy\n";
-    }
-
-    if ($svc_acct->dir ne '/dev/null' || $svc_acct->slipip ne '') {
-      if ($usernames{$username}++) {
-        die "Duplicate username detected: $username\n";
-      }
-    }
-            
-    if ( $svc_acct->uid  =~ /^(\d+)$/ ) {
-
-      die "Non-root user ". $svc_acct->username. " has 0 UID!"
-        if $svc_acct->uid == 0 && $svc_acct->username ne 'root';
-
-      if ( $svc_acct->dir ne "/dev/null") {
-
-        ###
-        # FORMAT OF FreeBSD MASTER PASSWD FILE HERE
-        print MASTER join(":",
-          $username,                        # User name
-          $cpassword,                       # Encrypted password
-          $svc_acct->uid,                   # User ID
-          $svc_acct->gid,                   # Group ID
-          "",                               # Login Class
-          "0",                              # Password Change Time
-          "0",                              # Password Expiration Time
-          $svc_acct->finger,                # Users name
-          $svc_acct->dir,                   # Users home directory
-          $svc_acct->shell,                 # shell
-        ), "\n" ;
-
-
-        ###
-        # FORMAT OF THE PASSWD FILE HERE
-        print PASSWD join(":",
-          $username,
-          'x', # "##". $username,
-          $svc_acct->uid,
-          $svc_acct->gid,
-          $svc_acct->finger,
-          $svc_acct->dir,
-          $svc_acct->shell,
-        ), "\n";
-
-        ###
-        # FORMAT OF THE SHADOW FILE HERE
-        print SHADOW join(":",
-          $username,
-          $cpassword,
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-        ), "\n";
-      }
-    }
-
-    ###
-    # FORMAT OF THE VPASSWD FILE HERE
-    print VPASSWD join(":",
-      $svc_acct->username,
-      $cpassword,
-      '1',
-      '0',
-      $svc_acct->username,
-      "$vpopdir/domains/" . $svc_domain->domain ."/" . $svc_acct->username,
-      'NOQUOTA',
-    ), "\n";
-
-
-    if ( $svc_acct->slipip ne '' ) {
-
-      ###
-      # FORMAT OF THE ACP_* FILES HERE
-      print ACP_PASSWD join(":",
-        $username,
-        $cpassword,
-        "0",
-        "0",
-        "",
-        "",
-        "",
-      ), "\n";
-
-      my($ip)=$svc_acct->slipip;
-
-      unless ( $ip eq '0.0.0.0' || $svc_acct->slipip eq '0e0' ) {
-        print ACP_DIALUP $username, "\t*\t", $svc_acct->slipip, "\n";
-      }
-
-      my %radreply = $svc_acct->radius_reply;
-      my %radcheck = $svc_acct->radius_check;
-
-      my $radcheck = join ", ", map { qq($_ = "$radcheck{$_}") } keys %radcheck;
-      $radcheck .= ", " if $radcheck;
-
-      ###
-      # FORMAT OF THE USERS FILE HERE
-      print USERS
-        $username,
-        qq(\t${textradiusprepend}),
-        $radcheck,
-#        qq(Password = "$rpassword"\n\t),
-        join ",\n\t", map { qq($_ = "$radreply{$_}") } keys %radreply;
-
-      #if ( $ip && $ip ne '0e0' ) {
-      #  #print USERS qq(,\n\tFramed-Address = "$ip"\n\n);
-      #  print USERS qq(,\n\tFramed-IP-Address = "$ip"\n\n);
-      #} else {
-        print USERS qq(\n\n);
-      #}
-
-    }
-  
-    ###
-    # vpopmail directory structure creation
-
-    (mkdir "$spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username, 0700)
-      or die "Can't create $spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . ": $!";
-    (mkdir "$spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . "/Maildir", 0700)
-      or die "Can't create $spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . " /Maildir: $!";
-    (mkdir "$spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . "/Maildir/cur", 0700)
-      or die "Can't create $spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . " /Maildir/cur: $!";
-    (mkdir "$spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . "/Maildir/new", 0700)
-      or die "Can't create $spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . " /Maildir/new: $!";
-    (mkdir "$spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . "/Maildir/tmp", 0700)
-      or die "Can't create $spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . " /Maildir/tmp: $!";
-
-    ( open(DOTQMAIL,">$spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . "/.qmail")
-      and flock(DOTQMAIL,LOCK_EX|LOCK_NB)  
-    ) or die "Can't open $spooldir/domains/" . $svc_domain->domain . "/" . $svc_acct->username . "/.qmail: $!";
-
-    my($svc_forward);
-    foreach $svc_forward (qsearch('svc_forward', {'srcsvc' => $svc_acct->svcnum})) {
-      my($destination);
-      if ($svc_forward->dstsvc) {
-        my $dst_acct = qsearchs('svc_acct', {'svcnum' => $svc_forward->dstsvc});
-        my $dst_domain = qsearchs('svc_domain', {'svcnum' => $dst_acct->domsvc});
-        $destination = $dst_acct->username . '@' . $dst_domain->domain;
-
-        if ($dst_domain->domain eq $mydomain) {
-          print VIRTUSERTABLE $svc_acct->username . "@" . $svc_domain->domain .
-            "\t" . $dst_acct->username . "\n";
-          print RECIPIENTMAP $svc_acct->username . "@" . $svc_domain->domain .
-            ":$destination\n";
-        }
-      } else {
-        $destination = $svc_forward->dst;
-      }
-    
-      ###
-      # FORMAT OF .QMAIL FILES HERE
-      print DOTQMAIL "$destination\n";
-    }
-
-    flock(DOTQMAIL,LOCK_UN);
-    close DOTQMAIL;
-
-  }
-
-  flock(VPASSWD,LOCK_UN);
-  flock(QMAILDEFAULT,LOCK_UN);
-  close VPASSWD;
-  close QMAILDEFAULT;
-
-}
-
-###
-# FORMAT OF THE ASSIGN/USERS FILE FINAL LINE HERE
-print ASSIGN ".\n";
-
-print VIRTUSERTABLE @sendmail;
-
-flock(MASTER,LOCK_UN);
-flock(PASSWD,LOCK_UN);
-flock(SHADOW,LOCK_UN);
-flock(ACP_DIALUP,LOCK_UN);
-flock(ACP_PASSWD,LOCK_UN);
-flock(USERS,LOCK_UN);
-flock(ASSIGN,LOCK_UN);
-flock(SENDMAIL_CW,LOCK_UN);
-flock(VIRTUSERTABLE,LOCK_UN);
-flock(RCPTHOSTS,LOCK_UN);
-flock(VPOPRCPTHOSTS,LOCK_UN);
-flock(RECIPIENTMAP,LOCK_UN);
-flock(VPOPVIRTUALDOMAINS,LOCK_UN);
-
-close MASTER;
-close PASSWD;
-close SHADOW;
-close ACP_DIALUP;
-close ACP_PASSWD;
-close USERS;
-close ASSIGN;
-close SENDMAIL_CW;
-close VIRTUSERTABLE;
-close RCPTHOSTS;
-close VPOPRCPTHOSTS;
-close RECIPIENTMAP;
-close VPOPVIRTUALDOMAINS;
-
-###
-# export stuff
-#
-
-my($ashellmachine);
-foreach $ashellmachine (@shellmachines) {
-  my $scp = new Net::SCP;
-  $scp->scp("$spooldir/passwd","root\@$ashellmachine:/etc/passwd.new")
-    or die "scp error: ". $scp->{errstr};
-  $scp->scp("$spooldir/shadow","root\@$ashellmachine:/etc/shadow.new")
-    or die "scp error: ". $scp->{errstr};
-  ssh("root\@$ashellmachine",
-    "( ".
-      "mv /etc/passwd.new /etc/passwd; ".
-      "mv /etc/shadow.new /etc/shadow; ".
-    " )"
-  )
-    == 0 or die "ssh error: $!";
-}
-
-my($bsdshellmachine);
-foreach $bsdshellmachine (@bsdshellmachines) {
-  my $scp = new Net::SCP;
-  $scp->scp("$spooldir/passwd","root\@$bsdshellmachine:/etc/passwd.new")
-    or die "scp error: ". $scp->{errstr};
-  $scp->scp("$spooldir/master.passwd","root\@$bsdshellmachine:/etc/master.passwd.new")
-    or die "scp error: ". $scp->{errstr};
-  ssh("root\@$bsdshellmachine",
-    "( ".
-      "mv /etc/passwd.new /etc/passwd; ".
-      #"mv /etc/master.passwd.new /etc/master.passwd; ".
-      "pwd_mkdb /etc/master.passwd.new; ".
-    " )"
-  )
-    == 0 or die "ssh error: $!";
-}
-
-my($nismachine);
-foreach $nismachine (@nismachines) {
-  my $scp = new Net::SCP;
-  $scp->scp("$spooldir/passwd","root\@$nismachine:/etc/global/passwd")
-    or die "scp error: ". $scp->{errstr};
-  $scp->scp("$spooldir/shadow","root\@$nismachine:/etc/global/shadow")
-    or die "scp error: ". $scp->{errstr};
-  ssh("root\@$nismachine",
-    "( ".
-      "cd /var/yp; make; ".
-    " )"
-  )
-    == 0 or die "ssh error: $!";
-}
-
-my($erpcdmachine);
-foreach $erpcdmachine (@erpcdmachines) {
-  my $scp = new Net::SCP;
-  $scp->scp("$spooldir/acp_passwd","root\@$erpcdmachine:/usr/annex/acp_passwd")
-    or die "scp error: ". $scp->{errstr};
-  $scp->scp("$spooldir/acp_dialup","root\@$erpcdmachine:/usr/annex/acp_dialup")
-    or die "scp error: ". $scp->{errstr};
-  ssh("root\@$erpcdmachine",
-    "( ".
-      "kill -USR1 \`cat /usr/annex/erpcd.pid\'".
-    " )"
-  )
-    == 0 or die "ssh error: $!";
-}
-
-my($radiusmachine);
-foreach $radiusmachine (@radiusmachines) {
-  my $scp = new Net::SCP;
-  $scp->scp("$spooldir/users","root\@$radiusmachine:/etc/raddb/users")
-    or die "scp error: ". $scp->{errstr};
-  ssh("root\@$radiusmachine",
-    "( ".
-      "builddbm".
-    " )"
-  )
-    == 0 or die "ssh error: $!";
-}
-
-#my @args = ("/bin/tar", "c", "--force-local", "-C", "$spooldir", "-f", "$spooldir/vpoptarball", "domains");
-
-#system {$args[0]} @args;
-
-my($vpopmailmachine);
-foreach $vpopmailmachine (@vpopmailmachines) {
-  my ($machine, $vpopdir, $vpopuid, $vpopgid) = split (/\s+/, $vpopmailmachine);
-  my $scp = new Net::SCP;
-#  $scp->scp("$spooldir/vpoptarball","root\@$machine:vpoptarball")
-#    or die "scp error: ". $scp->{errstr};
-#  ssh("root\@$machine",
-#    "( ".
-#      "rm -rf domains; ".
-#      "tar xf vpoptarball; ".
-#      "chown -R $vpopuid:$vpopgid domains; ".
-#      "tar cf vpoptarball domains; ".
-#      "cd $vpopdir; ".
-#      "tar xf ~/vpoptarball; ".
-#    " )"
-#  )
-#    == 0 or die "ssh error: $!";
-
-  chdir $spooldir;
-  my @args = ("$rsync", "-rlpt", "-e", "$ssh", "domains/", "vpopmail\@$machine:$vpopdir/domains/");
-
-  system {$args[0]} @args;
-
-  $scp->scp("$spooldir/assign","root\@$machine:/var/qmail/users/assign")
-    or die "scp error: ". $scp->{errstr};
-  $scp->scp("$spooldir/vpopvirtualdomains","root\@$machine:/var/qmail/control/virtualdomains")
-    or die "scp error: ". $scp->{errstr};
-  $scp->scp("$spooldir/vpoprcpthosts","root\@$machine:/var/qmail/control/rcpthosts")
-    or die "scp error: ". $scp->{errstr};
-
-  ssh("root\@$machine",
-    "( ".
-      $vpopmailrestart .
-    " )"
-  )
-    == 0 or die "ssh error: $!";
-
-
-}
-
-my($sendmailmachine);
-foreach $sendmailmachine (@sendmailmachines) {
-  my $scp = new Net::SCP;
-  $scp->scp("$spooldir/sendmail.cw","root\@$sendmailmachine:$sendmailconfigpath/sendmail.cw.new")
-    or die "scp error: ". $scp->{errstr};
-  $scp->scp("$spooldir/virtusertable","root\@$sendmailmachine:$sendmailconfigpath/virtusertable.new")
-    or die "scp error: ". $scp->{errstr};
-  ssh("root\@$sendmailmachine",
-    "( ".
-      "mv $sendmailconfigpath/sendmail.cw.new $sendmailconfigpath/sendmail.cw; ".
-      "mv $sendmailconfigpath/virtusertable.new $sendmailconfigpath/virtusertable; ".
-      $sendmailrestart.
-    " )"
-  )
-    == 0 or die "ssh error: $!";
-}
-
-my($qmailmachine);
-foreach $qmailmachine (@qmailmachines) {
-  my $scp = new Net::SCP;
-  $scp->scp("$spooldir/recipientmap","root\@$qmailmachine:/var/qmail/control/recipientmap")
-    or die "scp error: ". $scp->{errstr};
-  $scp->scp("$spooldir/virtualdomains","root\@$qmailmachine:/var/qmail/control/virtualdomains")
-    or die "scp error: ". $scp->{errstr};
-  $scp->scp("$spooldir/rcpthosts","root\@$qmailmachine:/var/qmail/control/rcpthosts")
-    or die "scp error: ". $scp->{errstr};
-  #ssh("root\@$qmailmachine","/etc/init.d/qmail restart")
-  #  == 0 or die "ssh error: $!";
-}
-
-unlink $spoollock;
-flock(EXPORT,LOCK_UN);
-close EXPORT;
-
-#
-
-sub usage {
-  die "Usage:\n\n  svc_acct.export user\n";
-}
-
diff --git a/bin/svc_acct.import b/bin/svc_acct.import
deleted file mode 100755
index eb94e1c37..000000000
--- a/bin/svc_acct.import
+++ /dev/null
@@ -1,238 +0,0 @@
-#!/usr/bin/perl -Tw
-# $Id: svc_acct.import,v 1.17 2001-08-19 10:25:44 ivan Exp $
-
-use strict;
-use vars qw(%part_svc);
-use Date::Parse;
-use Term::Query qw(query);
-use Net::SCP qw(iscp);
-use FS::UID qw(adminsuidsetup datasrc);
-use FS::Record qw(qsearch);
-use FS::svc_acct;
-use FS::part_svc;
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-push @FS::svc_acct::shells, qw(/bin/sync /sbin/shuddown /bin/halt); #others?
-
-my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
-
-$FS::svc_acct::nossh_hack = 1;
-
-###
-
-%part_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_acct'});
-
-die "No services with svcdb svc_acct!\n" unless %part_svc;
-
-print "\n\n", &menu_svc, "\n", <<END;
-Most accounts probably have entries in passwd and users (with Port-Limit
-nonexistant or 1).
-END
-my($ppp_svcpart)=&getpart;
-
-print "\n\n", &menu_svc, "\n", <<END;
-Some accounts have entries in passwd and users, but with Port-Limit 2 (or
-more).
-END
-my($isdn_svcpart)=&getpart;
-
-print "\n\n", &menu_svc, "\n", <<END;
-Some accounts might have entries in users only (Port-Limit 1)
-END
-my($oppp_svcpart)=&getpart;
-
-print "\n\n", &menu_svc, "\n", <<END;
-Some accounts might have entries in users only (Port-Limit >= 2)
-END
-my($oisdn_svcpart)=&getpart;
-
-print "\n\n", &menu_svc, "\n", <<END;
-POP mail accounts have entries in passwd only, and have a particular shell.
-END
-my($pop_shell)=&getvalue("Enter that shell:");
-my($popmail_svcpart)=&getpart;
-
-print "\n\n", &menu_svc, "\n", <<END;
-Everything else in passwd is a shell account.
-END
-my($shell_svcpart)=&getpart;
-
-print "\n\n", <<END;
-Enter the location and name of your _user_ passwd file, for example
-"mail.isp.com:/etc/passwd" or "nis.isp.com:/etc/global/passwd"
-END
-my($loc_passwd)=&getvalue(":");
-iscp("root\@$loc_passwd", "$spooldir/passwd.import");
-
-print "\n\n", <<END;
-Enter the location and name of your _user_ shadow file, for example
-"mail.isp.com:/etc/shadow" or "bsd.isp.com:/etc/master.passwd"
-END
-my($loc_shadow)=&getvalue(":");
-iscp("root\@$loc_shadow", "$spooldir/shadow.import");
-
-print "\n\n", <<END;
-Enter the location and name of your radius "users" file, for example
-"radius.isp.com:/etc/raddb/users"
-END
-my($loc_users)=&getvalue(":");
-iscp("root\@$loc_users", "$spooldir/users.import");
-
-sub menu_svc {
-  ( join "\n", map "$_: ".$part_svc{$_}->svc, sort keys %part_svc ). "\n";
-}
-sub getpart {
-  $^W=0; # Term::Query isn't -w-safe
-  my $return = query "Enter part number:", 'irk', [ keys %part_svc ];
-  $^W=1;
-  $return;
-}
-sub getvalue {
-  my $prompt = shift;
-  $^W=0; # Term::Query isn't -w-safe
-  my $return = query $prompt, '';
-  $^W=1;
-  $return;
-}
-
-print "\n\n";
-
-###
-
-open(PASSWD,"<$spooldir/passwd.import");
-open(SHADOW,"<$spooldir/shadow.import");
-open(USERS,"<$spooldir/users.import");
-
-my(%upassword,%ip,%allparam);
-my(%param,$username);
-while (<USERS>) {
-  chop;
-  next if /^\s*$/;
-  next if /^\s*#/;
-  if ( /^\S/ ) {
-    /^(\w+)\s+(Auth-Type\s+=\s+Local,\s+)?Password\s+=\s+"([^"]+)"(,\s+Expiration\s+=\s+"([^"]*")\s*)?$/
-      or die "1Unexpected line in users.import: $_";
-    my($password,$expiration);
-    ($username,$password,$expiration)=(lc($1),$3,$5);
-    $password = '' if $password eq 'UNIX';
-    $upassword{$username}=$password;
-    undef %param;
-  } else {
-    die "2Unexpected line in users.import: $_";
-  }
-  while (<USERS>) {
-    chop;
-    if ( /^\s*$/ ) {
-      if ( defined $param{'radius_Framed_IP_Address'} ) {
-        $ip{$username} = $param{'radius_Framed_IP_Address'};
-        delete $param{'radius_Framed_IP_Address'};
-      } else {
-        $ip{$username} = '0e0';
-      }
-      $allparam{$username}={ %param };
-      last;
-    } elsif ( /^\s+([\w\-]+)\s=\s"?([\w\.\-\s]+)"?,?\s*$/ ) {
-      my($attribute,$value)=($1,$2);
-      $attribute =~ s/\-/_/g;
-      $param{'radius_'.$attribute}=$value;
-    } else {
-      die "3Unexpected line in users.import: $_";
-    }
-  }
-}
-#? incase there isn't a terminating blank line ?
-if ( defined $param{'radius_Framed_IP_Address'} ) {
-  $ip{$username} = $param{'radius_Framed_IP_Address'};
-  delete $param{'radius_Framed_IP_Address'};
-} else {
-  $ip{$username} = '0e0';
-}
-$allparam{$username}={ %param };
-
-my(%password);
-while (<SHADOW>) {
-  chop;
-  my($username,$password)=split(/:/);
-  #$password =~ s/^\!$/\*/;
-  #$password =~ s/\!+/\*SUSPENDED\* /;
-  $password{$username}=$password;
-}
-
-while (<PASSWD>) {
-  chop;
-  my($username,$x,$uid,$gid,$finger,$dir,$shell)=split(/:/);
-  my($password)=$upassword{$username} || $password{$username};
-
-  my($maxb)=${$allparam{$username}}{'radius_Port_Limit'};
-  my($svcpart);
-  if ( exists $upassword{$username} ) {
-    if ( $maxb >= 2 ) {
-      $svcpart = $isdn_svcpart
-    } elsif ( ! $maxb || $maxb == 1 ) {
-      $svcpart = $ppp_svcpart
-    } else {
-      die "Illegal Port-Limit in users ($username)!\n";
-    }
-  } elsif ( $shell eq $pop_shell ) {
-    $svcpart = $popmail_svcpart;
-  } else {
-    $svcpart = $shell_svcpart;
-  }
-
-  my($svc_acct) = new FS::svc_acct ({
-    'svcpart'   => $svcpart,
-    'username'  => $username,
-    '_password' => $password,
-    'uid'       => $uid,
-    'gid'       => $gid,
-    'finger'    => $finger,
-    'dir'       => $dir,
-    'shell'     => $shell,
-    'slipip'    => $ip{$username},
-    %{$allparam{$username}},
-  });
-  my($error);
-  $error=$svc_acct->insert;
-  die $error if $error;
-
-  delete $allparam{$username};
-  delete $upassword{$username};
-}
-
-#my($username);
-foreach $username ( keys %upassword ) {
-  my($password)=$upassword{$username};
-
-  my($maxb)=${$allparam{$username}}{'radius_Port_Limit'} || 0;
-  my($svcpart);
-  if ( $maxb == 2 ) {
-    $svcpart = $oisdn_svcpart
-  } elsif ( ! $maxb || $maxb == 1 ) {
-    $svcpart = $oppp_svcpart
-  } else {
-    die "Illegal Port-Limit in users!\n";
-  }
-
-  my($svc_acct) = new FS::svc_acct ({
-    'svcpart'   => $svcpart,
-    'username'  => $username,
-    '_password' => $password,
-    'slipip'    => $ip{$username},
-    %{$allparam{$username}},
-  });
-  my($error);
-  $error=$svc_acct->insert;
-  die $error, if $error;
-
-  delete $allparam{$username};
-  delete $upassword{$username};
-}
-
-#
-
-sub usage {
-  die "Usage:\n\n  svc_acct.import user\n";
-}
-
diff --git a/bin/svc_acct_sm.import b/bin/svc_acct_sm.import
deleted file mode 100755
index b668405f5..000000000
--- a/bin/svc_acct_sm.import
+++ /dev/null
@@ -1,262 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: svc_acct_sm.import,v 1.10 2001-08-21 02:43:18 ivan Exp $
-
-use strict;
-use vars qw(%d_part_svc %m_part_svc);
-use Term::Query qw(query);
-use Net::SCP qw(iscp);
-use FS::UID qw(adminsuidsetup datasrc);
-use FS::Record qw(qsearch qsearchs);
-use FS::svc_acct_sm;
-use FS::svc_domain;
-use FS::svc_acct;
-use FS::part_svc;
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
-
-my(%mta) = (
-  1 => "qmail",
-  2 => "sendmail",
-);
-
-###
-
-%d_part_svc =
-  map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_domain'});
-%m_part_svc =
-  map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_acct_sm'});
-
-die "No services with svcdb svc_domain!\n" unless %d_part_svc;
-die "No services with svcdb svc_svc_acct_sm!\n" unless %m_part_svc;
-
-print "\n\n", 
-      ( join "\n", map "$_: ".$d_part_svc{$_}->svc, sort keys %d_part_svc ),
-      "\n\n";
-$^W=0; #Term::Query isn't -w-safe
-my $domain_svcpart = 
-  query "Enter part number for domains: ", 'irk', [ keys %d_part_svc ];
-$^W=1;
-
-print "\n\n", 
-      ( join "\n", map "$_: ".$m_part_svc{$_}->svc, sort keys %m_part_svc ),
-      "\n\n";
-$^W=0; #Term::Query isn't -w-safe
-my $mailalias_svcpart = 
-  query "Enter part number for mail aliases: ", 'irk', [ keys %m_part_svc ];
-$^W=1;
-
-print "\n\n", <<END;
-Select your MTA from the following list.
-END
-print join "\n", map "$_: $mta{$_}", sort keys %mta;
-print "\n\n";
-$^W=0; #Term::Query isn't -w-safe
-my $mta = query ":", 'irk', [ keys %mta ];
-$^W=1;
-
-if ( $mta{$mta} eq "qmail" ) {
-
-  print "\n\n", <<END;
-Enter the location and name of your qmail control directory, for example
-"mail.isp.com:/var/qmail/control"
-END
-  my($control)=&getvalue(":");
-  iscp("root\@$control/rcpthosts","$spooldir/rcpthosts.import");
-#  iscp("root\@$control/recipientmap","$spooldir/recipientmap.import");
-  iscp("root\@$control/virtualdomains","$spooldir/virtualdomains.import");
-
-#  print "\n\n", <<END;
-#Enter the name of the machine with your user .qmail files, for example
-#"mail.isp.com"
-#END
-#  print ":";
-#  my($shellmachine)=&getvalue;
-
-} elsif ( $mta{$mta} eq "sendmail" ) {
-
-  print "\n\n", <<END;
-Enter the location and name of your sendmail virtual user table, for example
-"mail.isp.com:/etc/virtusertable"
-END
-  my($virtusertable)=&getvalue(":");
-  iscp("root\@$virtusertable","$spooldir/virtusertable.import");
-
-  print "\n\n", <<END;
-Enter the location and name of your sendmail.cw file, for example
-"mail.isp.com:/etc/sendmail.cw"
-END
-  my($sendmail_cw)=&getvalue(":");
-  iscp("root\@$sendmail_cw","$spooldir/sendmail.cw.import");
-
-} else {
-  die "Unknown MTA!\n";
-}
-
-sub getvalue {
-  my $prompt = shift;
-  $^W=0; #Term::Query isn't -w-safe
-  my $data = query $prompt, '';
-  $^W=1;
-  $data;
-}
-
-print "\n\n";
-
-###
-
-$FS::svc_domain::whois_hack=1;
-$FS::svc_acct_sm::nossh_hack=1;
-
-if ( $mta{$mta} eq "qmail" ) {
-  open(RCPTHOSTS,"<$spooldir/rcpthosts.import")
-    or die "Can't open $spooldir/rcpthosts.import: $!";
-} elsif ( $mta{$mta} eq "sendmail" ) {
-  open(RCPTHOSTS,"<$spooldir/sendmail.cw.import")
-    or die "Can't open $spooldir/sendmail.cw.import: $!";
-} else {
-  die "Unknown MTA!\n";
-}
-
-my(%svcnum);
-
-while (<RCPTHOSTS>) {
-  next if /^(#|$)/;
-  next if $mta{$mta} eq 'sendmail' && /^\s*$/; #blank lines
-  /^\.?([\w\-\.]+)$/
-    #or do { warn "Strange rcpthosts/sendmail.cw line: $_"; next; };
-    or die "Strange rcpthosts/sendmail.cw line: $_";
-  my $domain = $1;
-  my($svc_domain);
-  unless ( $svc_domain = qsearchs('svc_domain', {'domain'=>$domain} ) ) {
-    $svc_domain = new FS::svc_domain ({
-      'domain'  => $domain,
-      'svcpart' => $domain_svcpart,
-      'action'  => 'N',
-    });
-    my $error = $svc_domain->insert;
-    #warn $error if $error;
-    die $error if $error;
-  }
-  $svcnum{$domain}=$svc_domain->svcnum;
-}
-close RCPTHOSTS; 
-
-#these two loops have enough similar parts they should probably be merged
-if ( $mta{$mta} eq "qmail" ) {
-
-  open(VD_FIX,">$spooldir/virtualdomains.FIX");
-  print VD_FIX "#!/usr/bin/perl\n";
-
-  open(VIRTUALDOMAINS,"<$spooldir/virtualdomains.import")
-    or die "Can't open $spooldir/virtualdomains.import: $!";
-  while (<VIRTUALDOMAINS>) {
-    next if /^#/;
-    /^\.?([\w\-\.]+):(\w+)(\-([\w\-\.]+))?$/
-      #or do { warn "Strange virtualdomains line: $_"; next; };
-      or die "Strange virtualdomains line: $_";
-    my($domain,$username,$dash_ext,$extension)=($1,$2,$3,$4);
-    $dash_ext ||= '';
-    $extension ||= '';
-    my($svc_acct)=qsearchs('svc_acct',{'username'=>$username});
-    unless ( $svc_acct ) {
-      #warn "Unknown user $username in virtualdomains; skipping\n";
-      #die "Unknown user $username in virtualdomains; skipping\n";
-      next;
-    }
-    if ( $domain ne $extension ) {
-      #warn "virtualdomains line $domain:$username$dash_ext changed to $domain:$username-$domain\n";
-      my($dir)=$svc_acct->dir;
-      my($qdomain)=$domain;
-      $qdomain =~ s/\./:/g; #see manpage for 'dot-qmail': EXTENSION ADDRESSES
-      #example to move .qmail files for virtual domains to their new location 
-      #dry run
-      #issh("root\@$shellmachine",'perl -e \'foreach $a (<'. $dir. '/.qmail'. $dash_ext. '-*>) { $old=$a; $a =~ s/\\.qmail'. $dash_ext. '\\-/\\.qmail\\-'. $qdomain. '\\-/; print " $old -> $a\n"; }\'');
-      #the real thing
-      #issh("root\@$shellmachine",'perl -e \'foreach $a (<'. $dir. '/.qmail'. $dash_ext. '-*>) { $old=$a; $a =~ s/\\.qmail'. $dash_ext. '\\-/\\.qmail\\-'. $qdomain. '\\-/; rename $old, $a; }\'');
-      print VD_FIX <<END;
-foreach \$file (<$dir/.qmail$dash_ext-*>) {
-  \$old = \$file;
-  \$file =~ s/\.qmail$dash_ext\-/\.qmail\-$qdomain\-/;
-  rename \$old, \$file;
-}
-END
-    }
-
-    unless ( exists $svcnum{$domain} ) {
-      my($svc_domain) = new FS::svc_domain ({
-        'domain'  => $domain,
-        'svcpart' => $domain_svcpart,
-        'action'  => 'N',
-      });
-      my $error = $svc_domain->insert;
-      #warn $error if $error;
-      die $error if $error;
-      $svcnum{$domain}=$svc_domain->svcnum;
-    }
-
-    my($svc_acct_sm)=new FS::svc_acct_sm ({
-      'domsvc'  => $svcnum{$domain},
-      'domuid'  => $svc_acct->uid,
-      'domuser' => '*',
-      'svcpart' => $mailalias_svcpart,
-    });
-    my($error)='';
-    $error=$svc_acct_sm->insert;
-    #warn $error if $error;
-    die $error, ", domain $domain" if $error;
-  }
-  close VIRTUALDOMAINS;
-  close VD_FIX;
-
-} elsif ( $mta{$mta} eq "sendmail" ) {
-
-  open(VIRTUSERTABLE,"<$spooldir/virtusertable.import")
-    or die "Can't open $spooldir/virtusertable.import: $!";
-  while (<VIRTUSERTABLE>) {
-    next if /^#/; #comments?
-    next if /^\s*$/; #blank lines
-    /^([\w\-\.]+)?\@([\w\-\.]+)\t+([\w\-\.]+)$/
-      #or do { warn "Strange virtusertable line: $_"; next; };
-      or die "Strange virtusertable line: $_";
-    my($domuser,$domain,$username)=($1,$2,$3);
-    my($svc_acct)=qsearchs('svc_acct',{'username'=>$username});
-    unless ( $svc_acct ) {
-      #warn "Unknown user $username in virtusertable";
-      die "Unknown user $username in virtusertable";
-      next;
-    }
-    my($svc_acct_sm)=new FS::svc_acct_sm ({
-      'domsvc'  => $svcnum{$domain},
-      'domuid'  => $svc_acct->uid,
-      'domuser' => $domuser || '*',
-      'svcpart' => $mailalias_svcpart,
-    });
-    my($error)='';
-    $error=$svc_acct_sm->insert;
-    #warn $error if $error;
-    die $error if $error;
-  }
-  close VIRTUSERTABLE;
-
-} else {
-  die "Unknown MTA!\n";
-}
-
-#open(RECIPIENTMAP,"<$spooldir/recipientmap.import");
-#close RECIPIENTMAP;
-
-print "\n\n", <<END if $mta{$mta} eq "qmail";
-Don\'t forget to run $spooldir/virtualdomains.FIX before using
-$spooldir/virtualdomains !
-END
-
-#
-
-sub usage {
-  die "Usage:\n\n  svc_acct_sm.import user\n";
-}
-
diff --git a/bin/svc_domain.erase b/bin/svc_domain.erase
deleted file mode 100755
index c0236614b..000000000
--- a/bin/svc_domain.erase
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/perl -w
-#
-# $Id: svc_domain.erase,v 1.1 2002-04-20 11:57:35 ivan Exp $
-
-use strict;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch);
-
-use FS::domain_record;
-use FS::svc_domain;
-
-adminsuidsetup(shift @ARGV) or die "Usage: svc_domain.erase user\n";
-
-foreach my $record ( qsearch('domain_record',{}), qsearch('svc_domain', {} ) ) {
-  my $error = $record->delete;
-  die $error if $error;
-}
diff --git a/bin/sysvshell.export b/bin/sysvshell.export
deleted file mode 100755
index 859766103..000000000
--- a/bin/sysvshell.export
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/usr/bin/perl -w
-
-# sysvshell export
-
-use strict;
-use File::Rsync;
-use Net::SSH qw(ssh);
-use FS::UID qw(adminsuidsetup datasrc);
-use FS::Record qw(qsearch qsearchs);
-use FS::part_export;
-use FS::cust_svc;
-use FS::svc_acct;
-
-my @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-my $spooldir = "/usr/local/etc/freeside/export.". datasrc;
-#my $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/shell";
-
-my @sysv_exports = qsearch('part_export', { 'exporttype' => 'sysvshell' } );
-
-my $rsync = File::Rsync->new({
-  rsh     => 'ssh',
-#  dry_run => 1,
-});
-
-foreach my $export ( @sysv_exports ) {
-  my $machine = $export->machine;
-  my $prefix = "$spooldir/$machine";
-  mkdir $prefix, 0700 unless -d $prefix;
-
-  #LOCKING!!!
-
-  ( open(SHADOW,">$prefix/shadow")
-    #!!!  and flock(SHADOW,LOCK_EX|LOCK_NB)
-  ) or die "Can't open $prefix/shadow: $!";
-  ( open(PASSWD,">$prefix/passwd")
-    #!!!  and flock(PASSWD,LOCK_EX|LOCK_NB)
-  ) or die "Can't open $prefix/passwd: $!";
-
-  chmod 0644, "$prefix/passwd";
-  chmod 0600, "$prefix/shadow";
-
-  #false laziness with  freeside-sqlradius-reset and bind.export
-  my @svc_acct = 
-    map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
-      map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-        grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-          $export->export_svc;
-
-  next unless @svc_acct;
-
-  foreach my $svc_acct ( sort { $a->uid <=> $b->uid } @svc_acct ) {
-
-    my $password = $svc_acct->_password;
-    my $cpassword;
-    #if ( ( length($password) <= 8 )
-    if ( ( length($password) <= 12 )
-         && ( $password ne '*' )
-         && ( $password ne '!!' )
-         && ( $password ne '' )
-    ) {
-      $cpassword=crypt($password,
-                       $saltset[int(rand(64))].$saltset[int(rand(64))]
-      );
-      # MD5 !!!!
-    } else {
-      $cpassword=$password;
-    }
-
-    ###
-    # FORMAT OF THE PASSWD FILE HERE
-    print PASSWD join(":",
-      $svc_acct->username,
-      'x', # "##". $username,
-      $svc_acct->uid,
-      $svc_acct->gid,
-      $svc_acct->finger,
-      $svc_acct->dir,
-      $svc_acct->shell,
-    ), "\n";
-
-    ###
-    # FORMAT OF THE SHADOW FILE HERE
-    print SHADOW join(":",
-      $svc_acct->username,
-      $cpassword,
-      '',
-      '',
-      '',
-      '',
-      '',
-      '',
-      '',
-    ), "\n";
-
-  }
-
-  #!!! flock(SHADOW,LOCK_UN);
-  #!!! flock(PASSWD,LOCK_UN);
-  close SHADOW;
-  close PASSWD;
-
-  $rsync->exec( {
-    src  => "$prefix/shadow",
-    dest => "root\@$machine:/etc/shadow"
-  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
-
-  $rsync->exec( {
-    src  => "$prefix/passwd",
-    dest => "root\@$machine:/etc/passwd"
-  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
-
-  # UNLOCK!!
-}
diff --git a/conf/agent_defaultpkg b/conf/agent_defaultpkg
deleted file mode 100644
index e69de29bb..000000000
diff --git a/conf/alerter_template b/conf/alerter_template
deleted file mode 100644
index 4d8a012ef..000000000
--- a/conf/alerter_template
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-Ivan Kohler
-1339 Hayes St.
-San Francisco, CA  94117
-
-
-{ $first; } { $last; }:
-
-  We thank you for your continuing patronage.  This notice is to remind you
-that your { $payby } used to pay SISD.COM for Internet
-service will expire on { use Date::Format; time2str("%x", $expdate); }.  Please provide us with new billing
-information so that we may continue your service uninterrupted.
-
-Very Truly Yours,
-
-  SISD Service Team
-
-
-
diff --git a/conf/declinetemplate b/conf/declinetemplate
deleted file mode 100644
index 14b8c60ec..000000000
--- a/conf/declinetemplate
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi,
-
-Your credit card could not be processed for the following reason:
-  { $error }
-
-Please provide us with new billing information so that we may continue your
-service uninterrupted.
-
-Thanks.
-
diff --git a/conf/home b/conf/home
deleted file mode 100644
index 05280cb02..000000000
--- a/conf/home
+++ /dev/null
@@ -1 +0,0 @@
-/home
diff --git a/conf/invoice_from b/conf/invoice_from
deleted file mode 100644
index 110ec8f41..000000000
--- a/conf/invoice_from
+++ /dev/null
@@ -1 +0,0 @@
-ivan-unconfigured-freeside-installation@420.am
diff --git a/conf/invoice_template b/conf/invoice_template
deleted file mode 100644
index e226d636f..000000000
--- a/conf/invoice_template
+++ /dev/null
@@ -1,27 +0,0 @@
-
-                                 Invoice
-                                 { substr("Page $page of $total_pages          ", 0, 19); } { use Date::Format; time2str("%x", $date); }  FS-{ $invnum; }
-
-
-Ivan Kohler
-1339 Hayes St.
-San Francisco, CA  94117
-
-
-{ $address[0]; }
-{ $address[1]; }
-{ $address[2]; }
-{ $address[3]; }
-{ $address[4]; }
-{ $address[5]; }
-
-{
-  join("\n",
-    map {
-      my ( $desc, $price ) = @{$_};
-      "  ". substr( $desc. " "x65, 0, 65). " ". substr( $price. " "x11, 0, 11);
-    } invoice_lines(31)
-  );
-}
-
- -=> Freeside - open-source billing for ISPs - http://www.sisd.com/freeside <=-
diff --git a/conf/locale b/conf/locale
deleted file mode 100644
index 7741b83a3..000000000
--- a/conf/locale
+++ /dev/null
@@ -1 +0,0 @@
-en_US
diff --git a/conf/lpr b/conf/lpr
deleted file mode 100644
index fa1c31315..000000000
--- a/conf/lpr
+++ /dev/null
@@ -1 +0,0 @@
-lpr -h
diff --git a/conf/maxsearchrecordsperpage b/conf/maxsearchrecordsperpage
deleted file mode 100644
index 29d6383b5..000000000
--- a/conf/maxsearchrecordsperpage
+++ /dev/null
@@ -1 +0,0 @@
-100
diff --git a/conf/report_template b/conf/report_template
deleted file mode 100644
index 9c6bb2b4a..000000000
--- a/conf/report_template
+++ /dev/null
@@ -1,14 +0,0 @@
-{ sprintf("%-19s", "Page $page of $total_pages"); } { 
- my $spacer = (40 - length($title) > 0) ? 40 - length($title) : 0;
- $spacer = int($spacer / 2);
- my $titlelen = 40 - $spacer;
- sprintf("%*s%-*s", $spacer, " ", $titlelen, $title);
- } { use Date::Format; time2str("%x %X", $date); } 
-
-
-{
-  join("\n", map { $_ } report_lines(57));
-}
-
-
-
diff --git a/conf/shells b/conf/shells
deleted file mode 100644
index a41fc6209..000000000
--- a/conf/shells
+++ /dev/null
@@ -1,5 +0,0 @@
-
-/bin/sh
-/bin/csh
-/bin/bash
-/bin/false
diff --git a/conf/show-msgcat-codes b/conf/show-msgcat-codes
deleted file mode 100644
index e69de29bb..000000000
diff --git a/conf/smtpmachine b/conf/smtpmachine
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/conf/smtpmachine
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index b51eee8d5..000000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,6 +0,0 @@
-freeside for Debian
--------------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- Ivan Kohler <ivan-debian@420.am>, Thu, 12 Apr 2001 15:49:17 -0700
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 5734b1fc8..000000000
--- a/debian/changelog
+++ /dev/null
@@ -1,9 +0,0 @@
-freeside (1.3.1-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Ivan Kohler <ivan-debian@420.am>  Thu, 12 Apr 2001 15:49:17 -0700
-
-Local variables:
-mode: debian-changelog
-End:
diff --git a/debian/conffiles.ex b/debian/conffiles.ex
deleted file mode 100644
index 8686d2af8..000000000
--- a/debian/conffiles.ex
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# If you want to use this conffile, remove all comments and put files that
-# you want dpkg to process here using their absolute pathnames.
-# See section 9.1 of the packaging manual.
-#
-# for example:
-# /etc/freeside/freeside.conf
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 2f66fd395..000000000
--- a/debian/control
+++ /dev/null
@@ -1,82 +0,0 @@
-Source: freeside
-Section: admin
-Priority: optional
-Maintainer: Ivan Kohler <ivan-debian@420.am>
-Build-Depends: debhelper (>> 3.0.0)
-Standards-Version: 3.5.2
-
-Package: freeside
-Architecture: any
-Depends: freeside-lib
-Recommends: freeside-doc, freeside-ui-webui, libterm-query-perl
-Suggests: freeside-passwd-server, freeside-signup-server, freeside-session-server
-Description: Billing and administration package for ISPs.
- Freeside is a billing and account administration package for ISPs.  It stores
- customer information in an SQL database, and will update UNIX passwd and
- shadow files, and configuration for sendmail, qmail, BIND and/or Apache.
- It is also useful as a central database of accounts/domains/web-space
- for a large number of machines.
-
-Package: freeside-doc
-Architecture: all
-Description: Documentation for freeside
- This package provides the HTML documentation for Freeside, a billing and
- account administration package for ISPs.
-
-Package: freeside-lib
-Architecture: all
-Depends: libdigest-md5-perl, liburi-perl, libhtml-parser-perl, libnet-perl, liblocale-codes-perl, libnet-whois-perl, libwww-perl, libbusiness-creditcard-perl, mailtools, libtimedate-perl, libdate-manip-perl, libfile-counterfile-perl, libfreezethaw-perl, libtext-template-perl, libdbd-pg-perl
-Description: Freeside libraries and extension API
- This package contains the libraries which implement the business logic and
- backend functions of Freeside, a billing and account administration package
- for ISPs.  This package also contains the manual pages for the library API.
-
-Package: freeside-ui-web
-Architecture: all
-Depends: libstring-approx-perl, freeside-lib, libapache-mod-perl|apache-perl
-Suggests: libapache-mod-ssl|apache-ssl
-Description: Easy-to-use web interface for Freeside
- This package contains the web interface for Freeside, a billing and account
- administration package for ISPs.  This is what sales or support folks will
- typically use to add new accounts, edit exiting accounts and so on.
-
-Package: freeside-passwd-server
-Architecture: all
-Depends: freeside-lib
-Description: Freeside password server 
- This component of Freeside, a billing and account administration package for
- ISPs, 
-
-Package: freeside-passwd-client
-Architecture: all
-Depends: 
-Description: 
- <rar>
-
-Package: freeside-signup-server
-Architecture: all
-Depends: freeside-lib
-Description:
- <rar>
-
-Package: freeside-signup-client
-Architecture: all
-Depends: 
-Description:
- <rar>
-
-Package: freeside-signup-client-webui
-Architecture: all
-Depends: freeside-signup-client-lib, httpd
-Description: 
- <rar>
-
-Package: freeside-session-server
-Architecture: all
-Depends: freeside-lib
-Description:
- <rar>
-
-Package: freeside-session-client
-Architecture: all
-Depends: ssh
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index e148fcec5..000000000
--- a/debian/copyright
+++ /dev/null
@@ -1,10 +0,0 @@
-This package was debianized by Ivan Kohler <ivan-debian@420.am> on
-Thu, 12 Apr 2001 15:49:17 -0700.
-
-It was downloaded from <fill in ftp site>
-
-Upstream Author(s): <put author(s) name and email here>
-
-Copyright:
-
-<Must follow here>
diff --git a/debian/cron.d.ex b/debian/cron.d.ex
deleted file mode 100644
index 61c074da3..000000000
--- a/debian/cron.d.ex
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Regular cron jobs for the freeside package
-#
-0 4	* * *	root	freeside_maintenance
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index ca882bbb7..000000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 16636bd92..000000000
--- a/debian/docs
+++ /dev/null
@@ -1,3 +0,0 @@
-INSTALL
-README
-TODO
diff --git a/debian/ex.doc-base.package b/debian/ex.doc-base.package
deleted file mode 100644
index 2a055d199..000000000
--- a/debian/ex.doc-base.package
+++ /dev/null
@@ -1,22 +0,0 @@
-Document: freeside
-Title: Debian freeside Manual
-Author: <insert document author here>
-Abstract: This manual describes what freeside is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/share/doc/freeside/freeside.sgml.gz
-
-Format: postscript
-Files: /usr/share/doc/freeside/freeside.ps.gz
-
-Format: text
-Files: /usr/share/doc/freeside/freeside.text.gz
-
-Format: HTML
-Index: /usr/share/doc/freeside/html/index.html
-Files: /usr/share/doc/freeside/html/*.html
-
-  
diff --git a/debian/freeside-doc.docs b/debian/freeside-doc.docs
deleted file mode 100644
index 299950c58..000000000
--- a/debian/freeside-doc.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-#DOCS#
-
diff --git a/debian/freeside-doc.files b/debian/freeside-doc.files
deleted file mode 100644
index 299950c58..000000000
--- a/debian/freeside-doc.files
+++ /dev/null
@@ -1,2 +0,0 @@
-#DOCS#
-
diff --git a/debian/init.d.ex b/debian/init.d.ex
deleted file mode 100644
index 57910493a..000000000
--- a/debian/init.d.ex
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /bin/sh
-#
-# skeleton	example file to build /etc/init.d/ scripts.
-#		This file should be used to construct scripts for /etc/init.d.
-#
-#		Written by Miquel van Smoorenburg <miquels@cistron.nl>.
-#		Modified for Debian GNU/Linux
-#		by Ian Murdock <imurdock@gnu.ai.mit.edu>.
-#
-# Version:	@(#)skeleton  1.8  03-Mar-1998  miquels@cistron.nl
-#
-# This file was automatically customized by dh-make on Thu, 12 Apr 2001 15:49:17 -0700
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/freeside
-NAME=freeside
-DESC=freeside
-
-test -f $DAEMON || exit 0
-
-set -e
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON
-	echo "$NAME."
-	;;
-  stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON
-	echo "$NAME."
-	;;
-  #reload)
-	#
-	#	If the daemon can reload its config files on the fly
-	#	for example by sending it SIGHUP, do it here.
-	#
-	#	If the daemon responds to changes in its config file
-	#	directly anyway, make this a do-nothing entry.
-	#
-	# echo "Reloading $DESC configuration files."
-	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
-	#	/var/run/$NAME.pid --exec $DAEMON
-  #;;
-  restart|force-reload)
-	#
-	#	If the "reload" option is implemented, move the "force-reload"
-	#	option to the "reload" entry above. If not, "force-reload" is
-	#	just the same as "restart".
-	#
-	echo -n "Restarting $DESC: "
-	start-stop-daemon --stop --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON
-	sleep 1
-	start-stop-daemon --start --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON
-	echo "$NAME."
-	;;
-  *)
-	N=/etc/init.d/$NAME
-	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/debian/manpage.1.ex b/debian/manpage.1.ex
deleted file mode 100644
index ec542bb05..000000000
--- a/debian/manpage.1.ex
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH FREESIDE SECTION "April 12, 2001"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-freeside \- program to do something
-.SH SYNOPSIS
-.B freeside
-.RI [ options ] " files" ...
-.br
-.B bar
-.RI [ options ] " files" ...
-.SH DESCRIPTION
-This manual page documents briefly the
-.B freeside
-and
-.B bar
-commands.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-Instead, it has documentation in the GNU Info format; see below.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBfreeside\fP is a program that...
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-For a complete description, see the Info files.
-.TP
-.B \-h, \-\-help
-Show summary of options.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.SH SEE ALSO
-.BR bar (1),
-.BR baz (1).
-.br
-The programs are documented fully by
-.IR "The Rise and Fall of a Fooish Bar" ,
-available via the Info system.
-.SH AUTHOR
-This manual page was written by Ivan Kohler <ivan-debian@420.am>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/manpage.sgml.ex b/debian/manpage.sgml.ex
deleted file mode 100644
index 9bc3a8663..000000000
--- a/debian/manpage.sgml.ex
+++ /dev/null
@@ -1,143 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>">
-  <!ENTITY dhsurname   "<surname>SURNAME</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>April 12, 2001</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>">
-  <!ENTITY dhemail     "<email>ivan-debian@420.am</email>">
-  <!ENTITY dhusername  "Ivan Kohler">
-  <!ENTITY dhucpackage "<refentrytitle>FREESIDE</refentrytitle>">
-  <!ENTITY dhpackage   "freeside">
-
-  <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2001</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>program to do something</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>-e <replaceable>this</replaceable></option></arg>
-
-      <arg><option>--example <replaceable>that</replaceable></option></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> and <command>bar</command>
-      commands.</para>
-
-    <para>This manual page was written for the &debian; distribution
-      because the original program does not have a manual page.
-      Instead, it has documentation in the &gnu;
-      <application>Info</application> format; see below.</para>
-
-    <para><command>&dhpackage;</command> is a program that...</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>These programs follow the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.  For a complete description, see the
-      <application>Info</application> files.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-h</option>
-          <option>--help</option>
-        </term>
-        <listitem>
-          <para>Show summary of options.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-          <option>--version</option>
-        </term>
-        <listitem>
-          <para>Show version of program.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>bar (1), baz (1).</para>
-
-    <para>The programs are documented fully by <citetitle>The Rise and
-      Fall of a Fooish Bar</citetitle> available via the
-      <application>Info</application> system.</para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the <acronym>GNU</acronym> Free Documentation
-      License, Version 1.1 or any later version published by the Free
-      Software Foundation; with no Invariant Sections, no Front-Cover
-      Texts and no Back-Cover Texts.</para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/debian/menu.ex b/debian/menu.ex
deleted file mode 100644
index ddc947e9c..000000000
--- a/debian/menu.ex
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(freeside):needs=X11|text|vc|wm section=Apps/see-menu-manual\
-  title="freeside" command="/usr/bin/freeside"
diff --git a/debian/postinst.ex b/debian/postinst.ex
deleted file mode 100644
index c4d4bfba8..000000000
--- a/debian/postinst.ex
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# postinst script for freeside
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see /usr/share/doc/packaging-manual/
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
-
-case "$1" in
-    configure)
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/postrm.ex b/debian/postrm.ex
deleted file mode 100644
index bed8abd3d..000000000
--- a/debian/postrm.ex
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# postrm script for freeside
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see /usr/share/doc/packaging-manual/
-
-case "$1" in
-       purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-
-        ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 0
-
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-
diff --git a/debian/preinst.ex b/debian/preinst.ex
deleted file mode 100644
index 0b42bb28f..000000000
--- a/debian/preinst.ex
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# preinst script for freeside
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-#
-# For details see /usr/share/doc/packaging-manual/
-
-case "$1" in
-    install|upgrade)
-#        if [ "$1" = "upgrade" ]
-#        then
-#            start-stop-daemon --stop --quiet --oknodo  \
-#                --pidfile /var/run/freeside.pid  \
-#                --exec /usr/sbin/freeside 2>/dev/null || true
-#        fi
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/prerm.ex b/debian/prerm.ex
deleted file mode 100644
index ebb87c540..000000000
--- a/debian/prerm.ex
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# prerm script for freeside
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see /usr/share/doc/packaging-manual/
-
-case "$1" in
-    remove|upgrade|deconfigure)
-#       install-info --quiet --remove /usr/info/freeside.info.gz
-        ;;
-    failed-upgrade)
-        ;;
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 71016c406..000000000
--- a/debian/rules
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. 
-# GNU copyright 1997 by Joey Hess.
-#
-# This version is for a hypothetical package that builds an
-# architecture-dependant package, as well as an architecture-independent
-# package.
-
-# Uncomment this to turn on verbose mode. 
-#export DH_VERBOSE=1
-
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-	
-
-	touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
-
-	dh_clean
-
-install: DH_OPTIONS=
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/freeside.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/freeside
-
-	dh_movefiles
-
-# Build architecture-independent files here.
-# Pass -i to all debhelper commands in this target to reduce clutter.
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-#	dh_installdebconf -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installmenu -i
-#	dh_installlogrotate -i
-#	dh_installemacsen -i
-#	dh_installpam -i
-#	dh_installmime -i
-#	dh_installinit -i
-	dh_installcron -i
-#	dh_installman -i
-	dh_installinfo -i
-#	dh_undocumented -i
-	dh_installchangelogs  -i
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-#	dh_perl -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-#	dh_installdebconf -a
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_installmenu -a
-#	dh_installlogrotate -a
-#	dh_installemacsen -a
-#	dh_installpam -a
-#	dh_installmime -a
-#	dh_installinit -a
-	dh_installcron -a
-#	dh_installman -a
-	dh_installinfo -a
-#	dh_undocumented -a
-	dh_installchangelogs  -a
-	dh_strip -a
-	dh_link -a
-	dh_compress -a
-	dh_fixperms -a
-#	dh_makeshlibs -a
-	dh_installdeb -a
-#	dh_perl -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/watch.ex b/debian/watch.ex
deleted file mode 100644
index 3f57ae020..000000000
--- a/debian/watch.ex
+++ /dev/null
@@ -1,5 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site		Directory		Pattern			Version	Script
-sunsite.unc.edu	/pub/Linux/Incoming	freeside-(.*)\.tar\.gz	debian	uupdate
diff --git a/eg/TEMPLATE_cust_main.import b/eg/TEMPLATE_cust_main.import
deleted file mode 100755
index e91a2f1d2..000000000
--- a/eg/TEMPLATE_cust_main.import
+++ /dev/null
@@ -1,198 +0,0 @@
-#!/usr/bin/perl -w
-#
-# Template for importing legacy customer data
-#
-# $Id: TEMPLATE_cust_main.import,v 1.4 2001-08-21 02:44:47 ivan Exp $
-
-use strict;
-use Date::Parse;
-use FS::UID qw(adminsuidsetup datasrc);
-use FS::Record qw(fields qsearch qsearchs);
-use FS::cust_main;
-use FS::cust_pkg;
-use FS::cust_svc;
-use FS::svc_acct;
-use FS::pkg_svc;
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-# use these for the imported cust_main records (unless you have these in legacy
-# data)
-my($agentnum)=4;
-my($refnum)=5;
-
-# map from legacy billing data to pkgpart, maps imported field
-# LegacyBillingData to pkgpart.  your names and pkgparts will be different
-my(%pkgpart)=(
-  'Employee'          => 10,
-  'Business'          => 11,
-  'Individual'        => 12,
-  'Basic PPP'         => 13,
-  'Slave'             => 14,
-  'Co-Located Server' => 15,
-  'Virtual Web'       => 16,
-  'Perk Mail'         => 17,
-  'Credit Hold'       => 18,
-);
-
-my($file)="legacy_file";
-
-open(CLIENT,$file) 
-  or die "Can't open $file: $!"; 
-
-# put a tab-separated header atop the file, or define @fields
-#   (use these names or change them below)
-#
-# for cust_main
-#   custnum - unique
-#   last - (name)
-#   first - (name)
-#   company
-#   address1
-#   address2
-#   city
-#   state
-#   zip
-#   country
-#   daytime - (phone)
-#   night - (phone)
-#   fax
-#   payby - CARD, BILL or COMP
-#   payinfo - Credit card #, P.O. # or COMP authorization
-#   paydate - Expiration
-#   tax - 'Y' for tax exempt
-# for cust_pkg
-#   LegacyBillingData - maps via %pkgpart above to a pkgpart
-# for svc_acct
-#   username
-
-my($header);
-$header=<CLIENT>;
-chop $header;
-my(@fields)=map { /^\s*(.*[^\s]+)\s*$/; $1 } split(/\t/,$header);
-#print join("\n",@fields);
-
-my($error);
-my($link,$line)=(0,0);
-while (<CLIENT>) {
-  chop; 
-  next if /^[\s\t]*$/; #skip any blank lines
-
-  #define %svc hash for this record
-  my(@record)=split(/\t/);
-  my(%svc);
-  foreach (@fields) {
-    $svc{$_}=shift @record;   
-  }
-
-  # might need to massage some data like this
-  $svc{'payby'} =~ s/^Credit Card$/CARD/io;
-  $svc{'payby'} =~ s/^Check$/BILL/io;
-  $svc{'payby'} =~ s/^Cash$/BILL/io;
-  $svc{'payby'} =~ s/^$/BILL/o;
-  $svc{'First'} =~ s/&/and/go; 
-  $svc{'Zip'} =~ s/\s+$//go;
-
-  my($cust_main) = new FS::cust_main ( {
-    'custnum'  => $svc{'custnum'},
-    'agentnum' => $agentnum,
-    'last'     => $svc{'last'},
-    'first'    => $svc{'first'},
-    'company'  => $svc{'company'},
-    'address1' => $svc{'address1'},
-    'address2' => $svc{'address2'},
-    'city'     => $svc{'city'},
-    'state'    => $svc{'state'},
-    'zip'      => $svc{'zip'},
-    'country'  => $svc{'country'},
-    'daytime'  => $svc{'daytime'},
-    'night'    => $svc{'night'},
-    'fax'      => $svc{'fax'},
-    'payby'    => $svc{'payby'},
-    'payinfo'  => $svc{'payinfo'},
-    'paydate'  => $svc{'paydate'},
-    'payname'  => $svc{'payname'},
-    'tax'      => $svc{'tax'},
-    'refnum'   => $refnum,
-  } );
-
-  $error=$cust_main->insert;
-
-  if ( $error ) {
-    warn $cust_main->_dump;
-    warn map "$_: ". $svc{$_}. "|\n", keys %svc;
-    die $error;
-  }
-
-  my($cust_pkg)=new FS::cust_pkg ( {
-    'custnum' => $svc{'custnum'},
-    'pkgpart' => $pkgpart{$svc{'LegacyBillingData'}},
-    'setup'   => '', 
-    'bill'    => '',
-    'susp'    => '',
-    'expire'  => '',
-    'cancel'  => '',
-  } );
-
-  $error=$cust_pkg->insert;
-  if ( $error ) {
-    warn $svc{'LegacyBillingData'};
-    die $error;
-  }
-
-  unless ( $svc{'username'} ) {
-    warn "Empty login";
-  } else {
-    #find svc_acct record (imported with bin/svc_acct.import) for this username
-    my($svc_acct)=qsearchs('svc_acct',{'username'=>$svc{'username'}});
-    unless ( $svc_acct ) {
-      warn "username ", $svc{'username'}, " not found\n";
-    } else {
-      #link to the cust_pkg record we created above
-
-      #find cust_svc record for this svc_acct record
-      my($o_cust_svc)=qsearchs('cust_svc',{
-        'svcnum' => $svc_acct->svcnum,
-        'pkgnum' => '',
-      } );
-      unless ( $o_cust_svc ) {
-        warn "No unlinked cust_svc for svcnum ", $svc_acct->svcnum;
-      } else {
-
-        #make sure this svcpart is in pkgpart
-        my($pkg_svc)=qsearchs('pkg_svc',{
-          'pkgpart'  => $pkgpart{$svc{'LegacyBillingData'}},
-          'svcpart'  => $o_cust_svc->svcpart,
-          'quantity' => 1,
-        });
-        unless ( $pkg_svc ) {
-          warn "login ", $svc{'username'}, ": No svcpart ", $o_cust_svc->svcpart,
-               " for pkgpart ", $pkgpart{$svc{'Acct. Type'}}, "\n" ;
-        } else {
-
-          #create new cust_svc record linked to cust_pkg record 
-          my($n_cust_svc) = new FS::cust_svc ({
-            'svcnum'  => $o_cust_svc->svcnum,
-            'pkgnum'  => $cust_pkg->pkgnum,
-            'svcpart' => $pkg_svc->svcpart,
-          });
-          my($error) = $n_cust_svc->replace($o_cust_svc);
-          die $error if $error;
-          $link++;
-        }
-      }
-    }
-  }
-
-  $line++;
-
-}
-
-warn "\n$link of $line lines linked\n";
-
-# ---
-
-sub usage {
-  die "Usage:\n\n  cust_main.import user\n";
-}
diff --git a/eg/export_template.pm b/eg/export_template.pm
deleted file mode 100644
index 00942fd12..000000000
--- a/eg/export_template.pm
+++ /dev/null
@@ -1,50 +0,0 @@
-package FS::part_export::myexport;
-
-use vars qw(@ISA);
-use FS::part_export;
-
-@ISA = qw(FS::part_export);
-
-sub rebless { shift; }
-
-sub _export_insert {
-  my($self, $svc_something) = (shift, shift);
-  $err_or_queue = $self->myexport_queue( $svc_something->svcnum, 'insert',
-    $svc_something->username, $svc_something->_password );
-  ref($err_or_queue) ? '' : $err_or_queue;
-}
-
-sub _export_replace {
-  my( $self, $new, $old ) = (shift, shift, shift);
-  #return "can't change username with myexport"
-  #  if $old->username ne $new->username;
-  #return '' unless $old->_password ne $new->_password;
-  $err_or_queue = $self->myexport_queue( $new->svcnum,
-    'replace', $new->username, $new->_password );
-  ref($err_or_queue) ? '' : $err_or_queue;
-}
-
-sub _export_delete {
-  my( $self, $svc_something ) = (shift, shift);
-  $err_or_queue = $self->myexport_queue( $svc_something->svcnum,
-    'delete', $svc_something->username );
-  ref($err_or_queue) ? '' : $err_or_queue;
-}
-
-#a good idea to queue anything that could fail or take any time
-sub myexport_queue {
-  my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => "FS::part_export::myexport::myexport_$method",
-  };
-  $queue->insert( @_ ) or $queue;
-}
-
-sub myexport_insert { #subroutine, not method
-}
-sub myexport_replace { #subroutine, not method
-}
-sub myexport_delete { #subroutine, not method
-}
-
diff --git a/eg/table_template-svc.pm b/eg/table_template-svc.pm
deleted file mode 100644
index ebf7299d2..000000000
--- a/eg/table_template-svc.pm
+++ /dev/null
@@ -1,161 +0,0 @@
-package FS::svc_table;
-
-use strict;
-use vars qw(@ISA);
-#use FS::Record qw( qsearch qsearchs );
-use FS::svc_Common;
-use FS::cust_svc;
-
-@ISA = qw(svc_Common);
-
-=head1 NAME
-
-FS::table_name - Object methods for table_name records
-
-=head1 SYNOPSIS
-
-  use FS::table_name;
-
-  $record = new FS::table_name \%hash;
-  $record = new FS::table_name { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $error = $record->suspend;
-
-  $error = $record->unsuspend;
-
-  $error = $record->cancel;
-
-=head1 DESCRIPTION
-
-An FS::table_name object represents an example.  FS::table_name inherits from
-FS::svc_Common.  The following fields are currently supported:
-
-=over 4
-
-=item field - description
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new example.  To add the example to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-sub table { 'table_name'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
-defined.  An FS::cust_svc record will be created and inserted.
-
-=cut
-
-sub insert {
-  my $self = shift;
-  my $error;
-
-  $error = $self->SUPER::insert;
-  return $error if $error;
-
-  '';
-}
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-sub delete {
-  my $self = shift;
-  my $error;
-
-  $error = $self->SUPER::delete;
-  return $error if $error;
-
-  '';
-}
-
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-  my $error;
-
-  $error = $new->SUPER::replace($old);
-  return $error if $error;
-
-  '';
-}
-
-=item suspend
-
-Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item unsuspend
-
-Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item cancel
-
-Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item check
-
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and repalce methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $x = $self->setfixed;
-  return $x unless ref($x);
-  my $part_svc = $x;
-
-
-  ''; #no error
-}
-
-=back
-
-=head1 BUGS
-
-The author forgot to customize this manpage.
-
-=head1 SEE ALSO
-
-L<FS::svc_Common>, L<FS::Record>, L<FS::cust_svc>, L<FS::part_svc>,
-L<FS::cust_pkg>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/eg/table_template.pm b/eg/table_template.pm
deleted file mode 100644
index d609bd544..000000000
--- a/eg/table_template.pm
+++ /dev/null
@@ -1,112 +0,0 @@
-package FS::table_name;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::table_name - Object methods for table_name records
-
-=head1 SYNOPSIS
-
-  use FS::table_name;
-
-  $record = new FS::table_name \%hash;
-  $record = new FS::table_name { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::table_name object represents an example.  FS::table_name inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item field - description
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new example.  To add the example to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'table_name'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  ''; #no error
-}
-
-=back
-
-=head1 BUGS
-
-The author forgot to customize this manpage.
-
-=head1 SEE ALSO
-
-L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/eg/vpopmailrestart b/eg/vpopmailrestart
deleted file mode 100755
index c716e2e2b..000000000
--- a/eg/vpopmailrestart
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-for domain in /home/vpopmail/domains/*
-do
-  /home/vpopmail/bin/vmkpasswd `/bin/basename $domain`
-done
-
-/var/qmail/bin/qmail-newu
-
-killall -HUP qmail-send
-
diff --git a/etc/acp_logfile-parse b/etc/acp_logfile-parse
deleted file mode 100755
index 5e258991b..000000000
--- a/etc/acp_logfile-parse
+++ /dev/null
@@ -1,197 +0,0 @@
-#!/usr/bin/perl
-
-###
-# WHO WROTE THIS???
-###
-
-#require "perldb.pl";
-
-#    Compute SLIP/PPP log times
-#     Arguments    -a   Process entire file with totals
-#                  -t   Process only totals
-#                  -f   File to be processed if not current
-#                  -d   processing start date (default is entire file)
-#                  -l   to return all totals for dayuse
-#                  -w   name of tmp work file for dayuse
-#                  user names
-
-require "time.pl";
-
-$space='        ';
-
-unless (@ARGV[0]) {
-       print "Missing Arguments\n";
-       print    "-a - entire file\n";
-       print    "-t - totals only\n";
-       print    "-f - file name to be processed\n";
-       print    "-d - processing start date (yymmdd)\n";
-       print    "-l - return totals for dayuse\n";
-       print    "-w - tmp work file for dayuse\n";
-       exit;
-}     # end if test for missing arguments
-
-$infile = "/usr/annex/acp_logfile";
-$tmpfile = "/tmp/ppp";
-$n = $#ARGV;
-$start_yymmdd = "";
-for ($i = 0; $i <= $n; $i++) {
-    if ($ARGV[$i] eq "-a") {
-             $allflag = "true";
-        }
-       elsif ($ARGV[$i] eq "-t") {
-                      $totalflag = "true";
-             }
-       elsif ($ARGV[$i] eq "-f") {
-        $i++;
-          $infile = $ARGV[$i];
-             }
-        elsif ($ARGV[$i] eq "-d") {
-          $i++;
-          $start_yymmdd = $ARGV[$i];
-          }   #end start yymmdd
-        elsif ($ARGV[$i] eq "-l") {
-           $logflag = "true";
-           $totalflag = "true";
-         }  #  end log 
-       elsif ($ARGV[$i] eq "-w") {
-        $i++;
-          $tmpfile = $ARGV[$i];
-             } #  end tmp file 
-        else    {
-            ($arg_user,$arg_yymmdd) = split (/:/, $ARGV[$i]);
-                 $ip_user_date {$arg_user} = $ARGV[$i];
-             $userflag = "true";
-                }   # end else
- } # end for 1 = 1 to n
-
-open (IN,$infile)
-        || die "Can't open acp_logfile";
-
-NEXTUSER: while (<IN>) {        
-        chop;
-        ($add,$ether,$port,$date,$time,$type,$action,$user) = split(/:/);
-
-        if ($logflag) {
-          $start_yymmdd = '';
-          if ($ip_user_date{$user}) {
-             ($ip_user, $start_yymmdd) = 
-                      split (/:/, $ip_user_date{$user});
-           }  # end get date
-        }   #  end log flag
-        if ($start_yymmdd) {
-           if ($date < $start_yymmdd) {
-               next NEXTUSER;
-           }  #end date compare
-        }  #end if date
-        if ($userflag){
-          if (!$ip_user_date{$user}) {
-               next NEXTUSER;
-          }  #  end user test
-        }  #   end by user or all
-        if (($totalflag) ||
-           ($allflag) ||
-           ($ip_user_date{$user})) {
-         if (($type eq 'ppp') || ($type eq 'slip'))  {
-
-            if ($action eq 'login') {
-                        $login{$user} = "$time:$date";
-
-                }
-                  elsif ($action eq 'logout') {
-                     if (!$login{$user}) {
-                          $login{$user} = "010101:$date";
-                      } #end pad user if carry over
-                        ($stime,$sdate) = split(':',$login{$user});
-                        $start = &annex2sec($stime);
-                        $end = &annex2sec($time);
-                        
-                        #If we went through midnight, add a day;
-                        if ($end < $start) {$end += 86400;}
-                        $timeon = $end - $start;
-
-                        $elapsed{$user} += $timeon;
-                        
-                      if (!$totalflag) {
-                        print (&fmt_user($user),
-                              '  ', &fmt_date($sdate), '  In: ', 
-                                &fmt_time($stime),'  Out: ',
-                                &fmt_time($time),
-                       '  Elapsed: ', &fmt_sec($timeon), "\n");
-                      }  # end total test
-                }  #end elsif action
-        }  #  type = ppp of slip
-    }  #  check arguments
-} 
-close IN;
-
-if ($logflag) {
-    open (TMPPPP, ">$tmpfile")
-               || die "Can't open ppp tmp file";
-    foreach $user ( sort((keys(%elapsed))) ) {
-        $log_time = &fmt_sec($elapsed{$user});
-        $tmp = join (':',
-                    $user, 
-                    $log_time);
-        print (TMPPPP "$tmp\n");
-    }
-    close (TMPPPP);
-}
-    else {
-        print "\n\nTotal Time On For Period:\n";
-        print     "-------------------------\n";
-
-        foreach $user ( sort((keys(%elapsed))) ) {
-           print (&fmt_user($user), "  ",&fmt_sec($elapsed{$user}), "\n");
-        }
-    }
-exit(0);
-
-#-------------------------------------------------------
-#--------------- Subroutines Start Here ----------------
-#-------------------------------------------------------
-
-sub annex2sec {
-        local($time) = @_;
-        return( &time2sec( &break_annex($time) ) );
-}
-
-sub fmt_date {
-        local($date) = @_;
-
-        return( substr($date,2,2).'/'.substr($date,4,2).'/'.substr($date,0,2) );
-}
-
-sub fmt_time {
-        local($time) = @_;
-        local($s,$m,$h) = &break_annex($time);
-        return ("$h:$m:$s");
-}
-
-
-sub break_annex {
-        local($time) = @_;
-        local($h,$m,$s);
-
-        $h=substr($time,0,2);
-        $m=substr($time,2,2);
-        $s=substr($time,4,2);
-
-        return ($s,$m,$h);
-}       
-
-sub fmt_sec {
-        local(@t) = &sec2time(@_);
-        @t[2] += (@t[3]*24);
-
-        foreach $a (@t) {
-                if ($a < 10) {$a = "0$a";}
-        }
-
-        return ("@t[2]:@t[1]:@t[0]");
-}
-
-sub fmt_user {
-        local($user) = @_;
-        return( $user.substr($space,0,8 - length($user) ).'  ' );
-}
-
diff --git a/etc/countries.txt b/etc/countries.txt
deleted file mode 100644
index 73c3975ed..000000000
--- a/etc/countries.txt
+++ /dev/null
@@ -1,239 +0,0 @@
-AFGHANISTAN                                     AF      AFG     004
-ALBANIA                                         AL      ALB     008
-ALGERIA                                         DZ      DZA     012
-AMERICAN SAMOA                                  AS      ASM     016
-ANDORRA                                         AD      AND     020
-ANGOLA                                          AO      AGO     024
-ANGUILLA                                        AI      AIA     660
-ANTARCTICA                                      AQ      ATA     010
-ANTIGUA AND BARBUDA                             AG      ATG     028
-ARGENTINA                                       AR      ARG     032
-ARMENIA                                         AM      ARM     051
-ARUBA                                           AW      ABW     533
-AUSTRALIA                                       AU      AUS     036
-AUSTRIA                                         AT      AUT     040
-AZERBAIJAN                                      AZ      AZE     031
-BAHAMAS                                         BS      BHS     044
-BAHRAIN                                         BH      BHR     048
-BANGLADESH                                      BD      BGD     050
-BARBADOS                                        BB      BRB     052
-BELARUS                                         BY      BLR     112
-BELGIUM                                         BE      BEL     056
-BELIZE                                          BZ      BLZ     084
-BENIN                                           BJ      BEN     204
-BERMUDA                                         BM      BMU     060
-BHUTAN                                          BT      BTN     064
-BOLIVIA                                         BO      BOL     068
-BOSNIA AND HERZEGOWINA                          BA      BIH     070
-BOTSWANA                                        BW      BWA     072
-BOUVET ISLAND                                   BV      BVT     074
-BRAZIL                                          BR      BRA     076
-BRITISH INDIAN OCEAN TERRITORY                  IO      IOT     086
-BRUNEI DARUSSALAM                               BN      BRN     096
-BULGARIA                                        BG      BGR     100
-BURKINA FASO                                    BF      BFA     854
-BURUNDI                                         BI      BDI     108
-CAMBODIA                                        KH      KHM     116
-CAMEROON                                        CM      CMR     120
-CANADA                                          CA      CAN     124
-CAPE VERDE                                      CV      CPV     132
-CAYMAN ISLANDS                                  KY      CYM     136
-CENTRAL AFRICAN REPUBLIC                        CF      CAF     140
-CHAD                                            TD      TCD     148
-CHILE                                           CL      CHL     152
-CHINA                                           CN      CHN     156
-CHRISTMAS ISLAND                                CX      CXR     162
-COCOS (KEELING) ISLANDS                         CC      CCK     166
-COLOMBIA                                        CO      COL     170
-COMOROS                                         KM      COM     174
-CONGO                                           CG      COG     178
-COOK ISLANDS                                    CK      COK     184
-COSTA RICA                                      CR      CRI     188
-COTE D'IVOIRE                                   CI      CIV     384
-CROATIA (local name: Hrvatska)                  HR      HRV     191
-CUBA                                            CU      CUB     192
-CYPRUS                                          CY      CYP     196
-CZECH REPUBLIC                                  CZ      CZE     203
-DENMARK                                         DK      DNK     208
-DJIBOUTI                                        DJ      DJI     262
-DOMINICA                                        DM      DMA     212
-DOMINICAN REPUBLIC                              DO      DOM     214
-EAST TIMOR                                      TP      TMP     626
-ECUADOR                                         EC      ECU     218
-EGYPT                                           EG      EGY     818
-EL SALVADOR                                     SV      SLV     222
-EQUATORIAL GUINEA                               GQ      GNQ     226
-ERITREA                                         ER      ERI     232
-ESTONIA                                         EE      EST     233
-ETHIOPIA                                        ET      ETH     231
-FALKLAND ISLANDS (MALVINAS)                     FK      FLK     238
-FAROE ISLANDS                                   FO      FRO     234
-FIJI                                            FJ      FJI     242
-FINLAND                                         FI      FIN     246
-FRANCE                                          FR      FRA     250
-FRANCE, METROPOLITAN                            FX      FXX     249
-FRENCH GUIANA                                   GF      GUF     254
-FRENCH POLYNESIA                                PF      PYF     258
-FRENCH SOUTHERN TERRITORIES                     TF      ATF     260
-GABON                                           GA      GAB     266
-GAMBIA                                          GM      GMB     270
-GEORGIA                                         GE      GEO     268
-GERMANY                                         DE      DEU     276
-GHANA                                           GH      GHA     288
-GIBRALTAR                                       GI      GIB     292
-GREECE                                          GR      GRC     300
-GREENLAND                                       GL      GRL     304
-GRENADA                                         GD      GRD     308
-GUADELOUPE                                      GP      GLP     312
-GUAM                                            GU      GUM     316
-GUATEMALA                                       GT      GTM     320
-GUINEA                                          GN      GIN     324
-GUINEA-BISSAU                                   GW      GNB     624
-GUYANA                                          GY      GUY     328
-HAITI                                           HT      HTI     332
-HEARD AND MC DONALD ISLANDS                     HM      HMD     334
-HONDURAS                                        HN      HND     340
-HONG KONG                                       HK      HKG     344
-HUNGARY                                         HU      HUN     348
-ICELAND                                         IS      ISL     352
-INDIA                                           IN      IND     356
-INDONESIA                                       ID      IDN     360
-IRAN (ISLAMIC REPUBLIC OF)                      IR      IRN     364
-IRAQ                                            IQ      IRQ     368
-IRELAND                                         IE      IRL     372
-ISRAEL                                          IL      ISR     376
-ITALY                                           IT      ITA     380
-JAMAICA                                         JM      JAM     388
-JAPAN                                           JP      JPN     392
-JORDAN                                          JO      JOR     400
-KAZAKHSTAN                                      KZ      KAZ     398
-KENYA                                           KE      KEN     404
-KIRIBATI                                        KI      KIR     296
-KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF          KP      PRK     408
-KOREA, REPUBLIC OF                              KR      KOR     410
-KUWAIT                                          KW      KWT     414
-KYRGYZSTAN                                      KG      KGZ     417
-LAO PEOPLE'S DEMOCRATIC REPUBLIC                LA      LAO     418
-LATVIA                                          LV      LVA     428
-LEBANON                                         LB      LBN     422
-LESOTHO                                         LS      LSO     426
-LIBERIA                                         LR      LBR     430
-LIBYAN ARAB JAMAHIRIYA                          LY      LBY     434
-LIECHTENSTEIN                                   LI      LIE     438
-LITHUANIA                                       LT      LTU     440
-LUXEMBOURG                                      LU      LUX     442
-MACAU                                           MO      MAC     446
-MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF      MK      MKD     807
-MADAGASCAR                                      MG      MDG     450
-MALAWI                                          MW      MWI     454
-MALAYSIA                                        MY      MYS     458
-MALDIVES                                        MV      MDV     462
-MALI                                            ML      MLI     466
-MALTA                                           MT      MLT     470
-MARSHALL ISLANDS                                MH      MHL     584
-MARTINIQUE                                      MQ      MTQ     474
-MAURITANIA                                      MR      MRT     478
-MAURITIUS                                       MU      MUS     480
-MAYOTTE                                         YT      MYT     175
-MEXICO                                          MX      MEX     484
-MICRONESIA, FEDERATED STATES OF                 FM      FSM     583
-MOLDOVA, REPUBLIC OF                            MD      MDA     498
-MONACO                                          MC      MCO     492
-MONGOLIA                                        MN      MNG     496
-MONTSERRAT                                      MS      MSR     500
-MOROCCO                                         MA      MAR     504
-MOZAMBIQUE                                      MZ      MOZ     508
-MYANMAR                                         MM      MMR     104
-NAMIBIA                                         NA      NAM     516
-NAURU                                           NR      NRU     520
-NEPAL                                           NP      NPL     524
-NETHERLANDS                                     NL      NLD     528
-NETHERLANDS ANTILLES                            AN      ANT     530
-NEW CALEDONIA                                   NC      NCL     540
-NEW ZEALAND                                     NZ      NZL     554
-NICARAGUA                                       NI      NIC     558
-NIGER                                           NE      NER     562
-NIGERIA                                         NG      NGA     566
-NIUE                                            NU      NIU     570
-NORFOLK ISLAND                                  NF      NFK     574
-NORTHERN MARIANA ISLANDS                        MP      MNP     580
-NORWAY                                          NO      NOR     578
-OMAN                                            OM      OMN     512
-PAKISTAN                                        PK      PAK     586
-PALAU                                           PW      PLW     585
-PANAMA                                          PA      PAN     591
-PAPUA NEW GUINEA                                PG      PNG     598
-PARAGUAY                                        PY      PRY     600
-PERU                                            PE      PER     604
-PHILIPPINES                                     PH      PHL     608
-PITCAIRN                                        PN      PCN     612
-POLAND                                          PL      POL     616
-PORTUGAL                                        PT      PRT     620
-PUERTO RICO                                     PR      PRI     630
-QATAR                                           QA      QAT     634
-REUNION                                         RE      REU     638
-ROMANIA                                         RO      ROM     642
-RUSSIAN FEDERATION                              RU      RUS     643
-RWANDA                                          RW      RWA     646
-SAINT KITTS AND NEVIS                           KN      KNA     659
-SAINT LUCIA                                     LC      LCA     662
-SAINT VINCENT AND THE GRENADINES                VC      VCT     670
-SAMOA                                           WS      WSM     882
-SAN MARINO                                      SM      SMR     674
-SAO TOME AND PRINCIPE                           ST      STP     678
-SAUDI ARABIA                                    SA      SAU     682
-SENEGAL                                         SN      SEN     686
-SEYCHELLES                                      SC      SYC     690
-SIERRA LEONE                                    SL      SLE     694
-SINGAPORE                                       SG      SGP     702
-SLOVAKIA (Slovak Republic)                      SK      SVK     703
-SLOVENIA                                        SI      SVN     705
-SOLOMON ISLANDS                                 SB      SLB     090
-SOMALIA                                         SO      SOM     706
-SOUTH AFRICA                                    ZA      ZAF     710
-SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS    GS      SGS     239
-SPAIN                                           ES      ESP     724
-SRI LANKA                                       LK      LKA     144
-ST. HELENA                                      SH      SHN     654
-ST. PIERRE AND MIQUELON                         PM      SPM     666
-SUDAN                                           SD      SDN     736
-SURINAME                                        SR      SUR     740
-SVALBARD AND JAN MAYEN ISLANDS                  SJ      SJM     744
-SWAZILAND                                       SZ      SWZ     748
-SWEDEN                                          SE      SWE     752
-SWITZERLAND                                     CH      CHE     756
-SYRIAN ARAB REPUBLIC                            SY      SYR     760
-TAIWAN, PROVINCE OF CHINA                       TW      TWN     158
-TAJIKISTAN                                      TJ      TJK     762
-TANZANIA, UNITED REPUBLIC OF                    TZ      TZA     834
-THAILAND                                        TH      THA     764
-TOGO                                            TG      TGO     768
-TOKELAU                                         TK      TKL     772
-TONGA                                           TO      TON     776
-TRINIDAD AND TOBAGO                             TT      TTO     780
-TUNISIA                                         TN      TUN     788
-TURKEY                                          TR      TUR     792
-TURKMENISTAN                                    TM      TKM     795
-TURKS AND CAICOS ISLANDS                        TC      TCA     796
-TUVALU                                          TV      TUV     798
-UGANDA                                          UG      UGA     800
-UKRAINE                                         UA      UKR     804
-UNITED ARAB EMIRATES                            AE      ARE     784
-UNITED KINGDOM                                  GB      GBR     826
-UNITED STATES                                   US      USA     840
-UNITED STATES MINOR OUTLYING ISLANDS            UM      UMI     581
-URUGUAY                                         UY      URY     858
-UZBEKISTAN                                      UZ      UZB     860
-VANUATU                                         VU      VUT     548
-VATICAN CITY STATE (HOLY SEE)                   VA      VAT     336
-VENEZUELA                                       VE      VEN     862
-VIET NAM                                        VN      VNM     704
-VIRGIN ISLANDS (BRITISH)                        VG      VGB     092
-VIRGIN ISLANDS (U.S.)                           VI      VIR     850
-WALLIS AND FUTUNA ISLANDS                       WF      WLF     876
-WESTERN SAHARA                                  EH      ESH     732
-YEMEN                                           YE      YEM     887
-YUGOSLAVIA                                      YU      YUG     891
-ZAIRE                                           ZR      ZAR     180
-ZAMBIA                                          ZM      ZMB     894
-ZIMBABWE                                        ZW      ZWE     716
diff --git a/etc/domain-template.txt b/etc/domain-template.txt
deleted file mode 100644
index 8e4983ce2..000000000
--- a/etc/domain-template.txt
+++ /dev/null
@@ -1,231 +0,0 @@
-[ URL ftp://rs.internic.net/templates/domain-template.txt ] [ 03/98 ] 
-
-******* Please DO NOT REMOVE Version Number or Sections A-Q ********
-
-Domain Version Number: 4.0
-
-******* Email completed agreement to hostmaster@internic.net *******
-
-	NETWORK SOLUTIONS, INC.
-
-	DOMAIN NAME REGISTRATION AGREEMENT
-
-
-A.	Introduction. This domain name registration agreement
-("Registration Agreement") is submitted to NETWORK SOLUTIONS, INC.
-("NSI") for the purpose of applying for and registering a domain name
-on the Internet. If this Registration Agreement is accepted by NSI,
-and a domain name is registered in NSI's domain name database and
-assigned to the Registrant, Registrant ("Registrant") agrees to be
-bound by the terms of this Registration Agreement and the terms of
-NSI's Domain Name Dispute Policy ("Dispute Policy") which is
-incorporated herein by reference and made a part of this Registration
-Agreement. This Registration Agreement shall be accepted at the
-offices of NSI. 
-
-B. Fees and Payments.
-
-1) Registration or renewal (re-registration) date through March 31, 1998:
-Registrant agrees to pay a registration fee of One Hundred United States
-Dollars (US$100) as consideration for the registration of each new domain
-name or Fifty United States Dollars (US$50) to renew (re-register) an
-existing registration.
-2) Registration or renewal date on and after April 1, 1998:  Registrant
-agrees to pay a registration fee of Seventy United States Dollars (US$70) 
-as consideration for the registration of each new domain name or the 
-applicable renewal (re-registration) fee (currently Thirty-Five United 
-States Dollars (US$35)) at the time of renewal (re-registration).
-3) Period of Service:  The non-refundable fee covers a period of two (2)
-years for each new registration, and one (1) year for each renewal, 
-and includes any permitted modification(s) to the domain name record
-during the covered period.
-4) Payment:  Payment is due to Network Solutions within thirty (30) 
-days from the date of the invoice.
-
-C.	Dispute Policy. Registrant agrees, as a condition to
-submitting this Registration Agreement, and if the Registration
-Agreement is accepted by NSI, that the Registrant shall be bound by
-NSI's current Dispute Policy. The current version of the Dispute
-Policy may be found at the InterNIC Registration Services web site:
-"http://www.netsol.com/rs/dispute-policy.html". 
-
-D.	Dispute Policy Changes or Modifications. Registrant agrees
-that NSI, in its sole discretion, may change or modify the Dispute
-Policy, incorporated by reference herein, at any time. Registrant
-agrees that Registrant's maintaining the registration of a domain name
-after changes or modifications to the Dispute Policy become effective
-constitutes Registrant's continued acceptance of these changes or
-modifications. Registrant agrees that if Registrant considers any such
-changes or modifications to be unacceptable, Registrant may request
-that the domain name be deleted from the domain name database. 
-
-E.	Disputes. Registrant agrees that, if the registration of its
-domain name is challenged by any third party, the Registrant will be
-subject to the provisions specified in the Dispute Policy. 
-
-F.	Agents. Registrant agrees that if this Registration Agreement
-is completed by an agent for the Registrant, such as an ISP or
-Administrative Contact/Agent, the Registrant is nonetheless bound as a
-principal by all terms and conditions herein, including the Dispute
-Policy. 
-
-G.	Limitation of Liability. Registrant agrees that NSI shall have
-no liability to the Registrant for any loss Registrant may incur in
-connection with NSI's processing of this Registration Agreement, in
-connection with NSI's processing of any authorized modification to the
-domain name's record during the covered period, as a result of the
-Registrant's ISP's failure to pay either the initial registration fee
-or renewal fee, or as a result of the application of the provisions of
-the Dispute Policy. Registrant agrees that in no event shall the
-maximum liability of NSI under this Agreement for any matter exceed
-Five Hundred United States Dollars (US$500). 
-
-H.	Indemnity. Registrant agrees, in the event the Registration
-Agreement is accepted by NSI and a subsequent dispute arises with any
-third party, to indemnify and hold NSI harmless pursuant to the terms
-and conditions contained in the Dispute Policy. 
-
-I.	Breach. Registrant agrees that failure to abide by any
-provision of this Registration Agreement or the Dispute Policy may be
-considered by NSI to be a material breach and that NSI may provide a
-written notice, describing the breach, to the Registrant. If, within
-thirty (30) days of the date of mailing such notice, the Registrant
-fails to provide evidence, which is reasonably satisfactory to NSI,
-that it has not breached its obligations, then NSI may delete
-Registrant's registration of the domain name. Any such breach by a
-Registrant shall not be deemed to be excused simply because NSI did
-not act earlier in response to that, or any other, breach by the
-Registrant. 
-
-J.	No Guaranty. Registrant agrees that, by registration of a
-domain name, such registration does not confer immunity from objection
-to either the registration or use of the domain name. 
-
-K.	Warranty. Registrant warrants by submitting this Registration
-Agreement that, to the best of Registrant's knowledge and belief, the
-information submitted herein is true and correct, and that any future
-changes to this information will be provided to NSI in a timely manner
-according to the domain name modification procedures in place at that
-time. Breach of this warranty will constitute a material breach. 
-
-L.	Revocation. Registrant agrees that NSI may delete a
-Registrant's domain name if this Registration Agreement, or subsequent
-modification(s) thereto, contains false or misleading information, or
-conceals or omits any information NSI would likely consider material
-to its decision to approve this Registration Agreement. 
-
-M.	Right of Refusal. NSI, in its sole discretion, reserves the
-right to refuse to approve the Registration Agreement for any
-Registrant. Registrant agrees that the submission of this Registration
-Agreement does not obligate NSI to accept this Registration Agreement.
-Registrant agrees that NSI shall not be liable for loss or damages
-that may result from NSI's refusal to accept this Registration
-Agreement. 
-
-N.	Severability. Registrant agrees that the terms of this
-Registration Agreement are severable. If any term or provision is
-declared invalid, it shall not affect the remaining terms or
-provisions which shall continue to be binding. 
-
-O.	Entirety. Registrant agrees that this Registration Agreement
-and the Dispute Policy is the complete and exclusive agreement between
-Registrant and NSI regarding the registration of Registrant's domain
-name. This Registration Agreement and the Dispute Policy supersede all
-prior agreements and understandings, whether established by custom,
-practice, policy, or precedent. 
-
-P.	Governing Law. Registrant agrees that this Registration
-Agreement shall be governed in all respects by and construed in
-accordance with the laws of the Commonwealth of Virginia, United
-States of America. By submitting this Registration Agreement,
-Registrant consents to the exclusive jurisdiction and venue of the
-United States District Court for the Eastern District of Virginia,
-Alexandria Division. If there is no jurisdiction in the United States
-District Court for the Eastern District of Virginia, Alexandria
-Division, then jurisdiction shall be in the Circuit Court of Fairfax
-County, Fairfax, Virginia. 
-
-Q.	This is Domain Name Registration Agreement Version
-Number 4.0. This Registration Agreement is only for registrations
-under top-level domains: COM, ORG, NET, and EDU. By completing
-and submitting this Registration Agreement for consideration and
-acceptance by NSI, the Registrant agrees that he/she has read and
-agrees to be bound by A through P above. 
-
-
-Authorization
-0a.  (N)ew (M)odify (D)elete....:###action###
-0b.  Auth Scheme................: 
-0c.  Auth Info..................: 
-
-1.   Comments...................:###purpose###
-
-2.   Complete Domain Name.......:###domain###
-
-Organization Using Domain Name
-
-3a.  Organization Name..........:###company###
-###LOOP###
-3b.  Street Address.............:###address###
-###ENDLOOP###
-3c.  City.......................:###city###
-3d.  State......................:###state###
-3e.  Postal Code................:###zip###
-3f.  Country....................:###country###
-
-Administrative Contact
-4a.  NIC Handle (if known)......: 
-4b.  (I)ndividual (R)ole........:I
-4c.  Name (Last, First).........:###last###, ###first###
-4d.  Organization Name..........:###company###
-###LOOP###
-4e.  Street Address.............:###address###
-###ENDLOOP###
-4f.  City.......................:###city###
-4g.  State......................:###state###
-4h.  Postal Code................:###zip### 
-4i.  Country....................:###country###
-4j.  Phone Number...............:###daytime###
-4k.  Fax Number.................:###fax###
-4l.  E-Mailbox..................:###email###
-
-Technical Contact
-5a.  NIC Handle (if known)......:###tech_contact###
-5b.  (I)ndividual (R)ole........: 
-5c.  Name (Last, First).........: 
-5d.  Organization Name..........: 
-5e.  Street Address.............: 
-5f.  City.......................: 
-5g.  State......................: 
-5h.  Postal Code................: 
-5i.  Country....................: 
-5j.  Phone Number...............: 
-5k.  Fax Number.................: 
-5l.  E-Mailbox..................: 
-
-Billing Contact
-6a.  NIC Handle (if known)......: 
-6b.  (I)ndividual (R)ole........: 
-6c.  Name (Last, First).........: 
-6d.  Organization Name..........: 
-6e.  Street Address.............: 
-6f.  City.......................: 
-6g.  State......................:
-6h.  Postal Code................:
-6i.  Country....................:
-6j.  Phone Number...............:
-6k.  Fax Number.................: 
-6l.  E-Mailbox..................: 
-
-Prime Name Server
-7a.  Primary Server Hostname....:###primary###
-7b.  Primary Server Netaddress..:###primary_ip###
-
-Secondary Name Server(s)
-###LOOP###
-8a.  Secondary Server Hostname..:###secondary###
-8b.  Secondary Server Netaddress:###secondary_ip###
-###ENDLOOP###
-
-END OF AGREEMENT
-
diff --git a/etc/example-direct-cardin b/etc/example-direct-cardin
deleted file mode 100755
index 1a4097221..000000000
--- a/etc/example-direct-cardin
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/local/bin/perl
-
-###
-# THIS IS FROM CYBERCASH (is there a newer version?)
-###
-
-$paymentserverhost = 'localhost';
-$paymentserverport = 8000;
-$paymentserversecret = 'two-turntables';
-use CCLib qw(sendmserver);
-
-# first lets fake up some data 
-# use time of day and pid to give me my pretend
-# order number
-# you obviously need to get real data from somewhere...
-
-$oid = "test$$"; #fake order number.
-$amount = 'usd 42.42';
-$ramount = 'usd 24.24';
-$pan = '4111111111111111';
-$name = 'John Q. Doe';
-$addr = '17 Richard Rd.';
-$city = 'Ivyland';
-$state = 'PA';
-$zip = '18974';
-$country = 'USA';
-$exp = '7/97';
-
-
-%result = &sendmserver('mauthcapture', 
-                       'Order-ID', $oid,
-		       'Amount', $amount,
-		       'Card-Number', $pan,
-		       'Card-Name', $name,
-		       'Card-Address', $addr,
-		       'Card-City', $city,
-		       'Card-State', $state,
-		       'Card-Zip', $zip,
-		       'Card-Country', $country,
-		       'Card-Exp', $exp);
-
-#
-# just dump results to stdout.
-# you should process them...
-# to allow results to affect operation of your fulfillment...
-#
-foreach (keys(%result)) {
-   print " $_ ==> $result{$_}\n";
-}
-
-print "\n";
-
-exit;
-
-$trans=$result{'MTransactionNumber'};
-$code=$result{'MRetrievalCode'};
-
-%result = &sendmserver('return',
-                        'Order-ID', $oid,
-			'Return-Amount',$ramount,
-			'Amount',$amount,
-			);
-
-foreach (keys(%result)) {
-   print " $_ ==> $result{$_}\n";
-}
-
diff --git a/etc/megapop.pl b/etc/megapop.pl
deleted file mode 100755
index b250bcdde..000000000
--- a/etc/megapop.pl
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: megapop.pl,v 1.1 1999-04-19 10:32:44 ivan Exp $
-#
-# this will break when megapop changes the URL or format of their listing page.
-# that's stupid.  perhaps they can provide a machine-readable listing?
-
-use strict;
-use LWP::UserAgent;
-use FS::UID qw(adminsuidsetup);
-use FS::svc_acct_pop;
-
-my $url = "http://www.megapop.com/location.htm";
-
-my $user = shift or die &usage;
-adminsuidsetup($user);
-
-my %state2usps = &state2usps;
-$state2usps{'WASHINGTON STATE'} = 'WA'; #megapop's on crack
-$state2usps{'CANADA'} = 'CANADA'; #freeside's on crack
-
-my $ua = new LWP::UserAgent;
-my $request = new HTTP::Request('GET', $url);
-my $response = $ua->request($request);
-die $response->error_as_HTML unless $response->is_success;
-my $line;
-my $usps = '';
-foreach $line ( split("\n", $response->content) ) {
-  if ( $line =~ /\W(\w[\w\s]*\w)\s+LOCATIONS/i ) {
-    $usps = $state2usps{uc($1)}
-      or warn "warning: unknown state $1\n";
-  } elsif ( $line =~ /(\d{3})\-(\d{3})\-(\d{4})\s+(\w[\w\s]*\w)/ ) {
-    print "$1 $2 $3 $4 $usps\n";
-    my $svc_acct_pop = new FS::svc_acct_pop ( {
-      'city' => $4,
-      'state' => $usps,
-      'ac' => $1,
-      'exch' => $2,
-    } );
-    my $error = $svc_acct_pop->insert;
-    die $error if $error;
-  }
-}
-
-sub usage {
-  die "Usage:\n  $0 user\n";
-}
-
-sub state2usps{ (
-  'ALABAMA' => 'AL',
-  'ALASKA' => 'AK',
-  'AMERICAN SAMOA' => 'AS',
-  'ARIZONA' => 'AZ',
-  'ARKANSAS' => 'AR',
-  'CALIFORNIA' => 'CA',
-  'COLORADO' => 'CO',
-  'CONNECTICUT' => 'CT',
-  'DELAWARE' => 'DE',
-  'DISTRICT OF COLUMBIA' => 'DC',
-  'FEDERATED STATES OF MICRONESIA' => 'FM',
-  'FLORIDA' => 'FL',
-  'GEORGIA' => 'GA',
-  'GUAM' => 'GU',
-  'HAWAII' => 'HI',
-  'IDAHO' => 'ID',
-  'ILLINOIS' => 'IL',
-  'INDIANA' => 'IN',
-  'IOWA' => 'IA',
-  'KANSAS' => 'KS',
-  'KENTUCKY' => 'KY',
-  'LOUISIANA' => 'LA',
-  'MAINE' => 'ME',
-  'MARSHALL ISLANDS' => 'MH',
-  'MARYLAND' => 'MD',
-  'MASSACHUSETTS' => 'MA',
-  'MICHIGAN' => 'MI',
-  'MINNESOTA' => 'MN',
-  'MISSISSIPPI' => 'MS',
-  'MISSOURI' => 'MO',
-  'MONTANA' => 'MT',
-  'NEBRASKA' => 'NE',
-  'NEVADA' => 'NV',
-  'NEW HAMPSHIRE' => 'NH',
-  'NEW JERSEY' => 'NJ',
-  'NEW MEXICO' => 'NM',
-  'NEW YORK' => 'NY',
-  'NORTH CAROLINA' => 'NC',
-  'NORTH DAKOTA' => 'ND',
-  'NORTHERN MARIANA ISLANDS' => 'MP',
-  'OHIO' => 'OH',
-  'OKLAHOMA' => 'OK',
-  'OREGON' => 'OR',
-  'PALAU' => 'PW',
-  'PENNSYLVANIA' => 'PA',
-  'PUERTO RICO' => 'PR',
-  'RHODE ISLAND' => 'RI',
-  'SOUTH CAROLINA' => 'SC',
-  'SOUTH DAKOTA' => 'SD',
-  'TENNESSEE' => 'TN',
-  'TEXAS' => 'TX',
-  'UTAH' => 'UT',
-  'VERMONT' => 'VT',
-  'VIRGIN ISLANDS' => 'VI',
-  'VIRGINIA' => 'VA',
-  'WASHINGTON' => 'WA',
-  'WEST VIRGINIA' => 'WV',
-  'WISCONSIN' => 'WI',
-  'WYOMING' => 'WY',
-  'ARMED FORCES AFRICA' => 'AE',
-  'ARMED FORCES AMERICAS' => 'AA',
-  'ARMED FORCES CANADA' => 'AE',
-  'ARMED FORCES EUROPE' => 'AE',
-  'ARMED FORCES MIDDLE EAST' => 'AE',
-  'ARMED FORCES PACIFIC' => 'AP',
-) }
-
diff --git a/etc/sql-reserved-words.txt b/etc/sql-reserved-words.txt
deleted file mode 100644
index dc507cef5..000000000
--- a/etc/sql-reserved-words.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-From http://epoch.cs.berkeley.edu:8000/sequoia/dba/montage/FAQ/SQL.html
-  by Jean Anderson (jta@postgres.berkeley.edu)
-
-What are the SQL reserved words? 
-
-I grep'd the following list out of the sql docs available via anonymous ftp to speckle.ncsl.nist.gov:/isowg3.
-SQL3 words are not set in stone, but you'd do well to avoid them. 
-
-    From sql1992.txt:
-
-         AFTER, ALIAS, ASYNC, BEFORE, BOOLEAN, BREADTH,
-         COMPLETION, CALL, CYCLE, DATA, DEPTH, DICTIONARY, EACH, ELSEIF,
-         EQUALS, GENERAL, IF, IGNORE, LEAVE, LESS, LIMIT, LOOP, MODIFY,
-         NEW, NONE, OBJECT, OFF, OID, OLD, OPERATION, OPERATORS, OTHERS,
-         PARAMETERS, PENDANT, PREORDER, PRIVATE, PROTECTED, RECURSIVE, REF,
-         REFERENCING, REPLACE, RESIGNAL, RETURN, RETURNS, ROLE, ROUTINE,
-         ROW, SAVEPOINT, SEARCH, SENSITIVE, SEQUENCE, SIGNAL, SIMILAR,
-         SQLEXCEPTION, SQLWARNING, STRUCTURE, TEST, THERE, TRIGGER, TYPE,
-         UNDER, VARIABLE, VIRTUAL, VISIBLE, WAIT, WHILE, WITHOUT
-
-    From sql1992.txt (Annex E):
-
-         ABSOLUTE, ACTION, ADD, ALLOCATE, ALTER, ARE, ASSERTION, AT, BETWEEN,
-         BIT, BIT
-
-What are the SQL reserved words? 
-
-I grep'd the following list out of the sql docs available via anonymous ftp to speckle.ncsl.nist.gov:/isowg3.
-SQL3 words are not set in stone, but you'd do well to avoid them. 
-
-    From sql1992.txt:
-
-         AFTER, ALIAS, ASYNC, BEFORE, BOOLEAN, BREADTH,
-         COMPLETION, CALL, CYCLE, DATA, DEPTH, DICTIONARY, EACH, ELSEIF,
-         EQUALS, GENERAL, IF, IGNORE, LEAVE, LESS, LIMIT, LOOP, MODIFY,
-         NEW, NONE, OBJECT, OFF, OID, OLD, OPERATION, OPERATORS, OTHERS,
-         PARAMETERS, PENDANT, PREORDER, PRIVATE, PROTECTED, RECURSIVE, REF,
-         REFERENCING, REPLACE, RESIGNAL, RETURN, RETURNS, ROLE, ROUTINE,
-         ROW, SAVEPOINT, SEARCH, SENSITIVE, SEQUENCE, SIGNAL, SIMILAR,
-         SQLEXCEPTION, SQLWARNING, STRUCTURE, TEST, THERE, TRIGGER, TYPE,
-         UNDER, VARIABLE, VIRTUAL, VISIBLE, WAIT, WHILE, WITHOUT
-
-    From sql1992.txt (Annex E):
-
-         ABSOLUTE, ACTION, ADD, ALLOCATE, ALTER, ARE, ASSERTION, AT, BETWEEN,
-         BIT, BIT
-
-What are the SQL reserved words? 
-
-I grep'd the following list out of the sql docs available via anonymous ftp to speckle.ncsl.nist.gov:/isowg3.
-SQL3 words are not set in stone, but you'd do well to avoid them. 
-
-    From sql1992.txt:
-
-         AFTER, ALIAS, ASYNC, BEFORE, BOOLEAN, BREADTH,
-         COMPLETION, CALL, CYCLE, DATA, DEPTH, DICTIONARY, EACH, ELSEIF,
-         EQUALS, GENERAL, IF, IGNORE, LEAVE, LESS, LIMIT, LOOP, MODIFY,
-         NEW, NONE, OBJECT, OFF, OID, OLD, OPERATION, OPERATORS, OTHERS,
-         PARAMETERS, PENDANT, PREORDER, PRIVATE, PROTECTED, RECURSIVE, REF,
-         REFERENCING, REPLACE, RESIGNAL, RETURN, RETURNS, ROLE, ROUTINE,
-         ROW, SAVEPOINT, SEARCH, SENSITIVE, SEQUENCE, SIGNAL, SIMILAR,
-         SQLEXCEPTION, SQLWARNING, STRUCTURE, TEST, THERE, TRIGGER, TYPE,
-         UNDER, VARIABLE, VIRTUAL, VISIBLE, WAIT, WHILE, WITHOUT
-
-    From sql1992.txt (Annex E):
-
-         ABSOLUTE, ACTION, ADD, ALLOCATE, ALTER, ARE, ASSERTION, AT, BETWEEN,
-         BIT, BIT_LENGTH, BOTH, CASCADE, CASCADED, CASE, CAST, CATALOG,
-         CHAR_LENGTH, CHARACTER_LENGTH, COALESCE, COLLATE, COLLATION, COLUMN,
-         CONNECT, CONNECTION, CONSTRAINT, CONSTRAINTS, CONVERT, CORRESPONDING,
-         CROSS, CURRENT_DATE, CURRENT_TIME, CURRENT_TIMESTAMP, CURRENT_USER,
-         DATE, DAY, DEALLOCATE, DEFERRABLE, DEFERRED, DESCRIBE, DESCRIPTOR,
-         DIAGNOSTICS, DISCONNECT, DOMAIN, DROP, ELSE, END-EXEC, EXCEPT,
-         EXCEPTION, EXECUTE, EXTERNAL, EXTRACT, FALSE, FIRST, FULL, GET,
-         GLOBAL, HOUR, IDENTITY, IMMEDIATE, INITIALLY, INNER, INPUT,
-         INSENSITIVE, INTERSECT, INTERVAL, ISOLATION, JOIN, LAST, LEADING,
-         LEFT, LEVEL, LOCAL, LOWER, MATCH, MINUTE, MONTH, NAMES, NATIONAL,
-         NATURAL, NCHAR, NEXT, NO, NULLIF, OCTET_LENGTH, ONLY, OUTER, OUTPUT,
-         OVERLAPS, PAD, PARTIAL, POSITION, PREPARE, PRESERVE, PRIOR, READ,
-         RELATIVE, RESTRICT, REVOKE, RIGHT, ROWS, SCROLL, SECOND, SESSION,
-         SESSION_USER, SIZE, SPACE, SQLSTATE, SUBSTRING, SYSTEM_USER,
-         TEMPORARY, THEN, TIME, TIMESTAMP, TIMEZONE_HOUR, TIMEZONE_MINUTE,
-         TRAILING, TRANSACTION, TRANSLATE, TRANSLATION, TRIM, TRUE, UNKNOWN,
-         UPPER, USAGE, USING, VALUE, VARCHAR, VARYING, WHEN, WRITE, YEAR, ZONE
-
-    From sql3part2.txt (Annex E)
-
-         ACTION, ACTOR, AFTER, ALIAS, ASYNC, ATTRIBUTES, BEFORE, BOOLEAN,
-         BREADTH, COMPLETION, CURRENT_PATH, CYCLE, DATA, DEPTH, DESTROY,
-         DICTIONARY, EACH, ELEMENT, ELSEIF, EQUALS, FACTOR, GENERAL, HOLD,
-         IGNORE, INSTEAD, LESS, LIMIT, LIST, MODIFY, NEW, NEW_TABLE, NO,
-         NONE, OFF, OID, OLD, OLD_TABLE, OPERATION, OPERATOR, OPERATORS,
-         PARAMETERS, PATH, PENDANT, POSTFIX, PREFIX, PREORDER, PRIVATE,
-         PROTECTED, RECURSIVE, REFERENCING, REPLACE, ROLE, ROUTINE, ROW,
-         SAVEPOINT, SEARCH, SENSITIVE, SEQUENCE, SESSION, SIMILAR, SPACE,
-         SQLEXCEPTION, SQLWARNING, START, STATE, STRUCTURE, SYMBOL, TERM,
-         TEST, THERE, TRIGGER, TYPE, UNDER, VARIABLE, VIRTUAL, VISIBLE,
-         WAIT, WITHOUT
-
-    sql3part4.txt (ANNEX E):
-
-         CALL, DO, ELSEIF, EXCEPTION, IF, LEAVE, LOOP, OTHERS, RESIGNAL,
-         RETURN, RETURNS, SIGNAL, TUPLE, WHILE
diff --git a/fs_passwd/fs_passwd b/fs_passwd/fs_passwd
deleted file mode 100755
index 0b467aefc..000000000
--- a/fs_passwd/fs_passwd
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# fs_passwd
-#
-# portions of this script are copied from the `passwd' script in the original
-# (perl 4) camel book, now archived at 
-# http://www.perl.com/CPAN/scripts/nutshell/ch6/passwd
-#
-# ivan@sisd.com 98-mar-8
-#
-# password lengths 0,255 instead of 6,8 - we'll let the server process
-# check the data ivan@sisd.com 98-jul-17
-
-use strict;
-use Getopt::Std;
-use Socket;
-use IO::Handle;
-use vars qw($opt_f $opt_s);
-
-my($fs_passwdd_socket)="/usr/local/freeside/fs_passwdd_socket";
-my($freeside_uid)=scalar(getpwnam('freeside'));
-
-$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
-$ENV{'SHELL'} = '/bin/sh';
-$ENV{'IFS'} = " \t\n";
-$ENV{'CDPATH'} = '';
-$ENV{'ENV'} = '';
-$ENV{'BASH_ENV'} = '';
-
-$SIG{__DIE__}= sub { system '/bin/stty', 'echo'; };
-
-die "passwd program isn't running setuid to freeside\n" if $> != $freeside_uid;
-
-unshift @ARGV, "-f" if $0 =~ /chfn$/;
-unshift @ARGV, "-s" if $0 =~ /chsh$/;
-
-getopts('fs');
-
-my($me)='';
-if ( $_ = shift(@ARGV) ) {
-  /^(\w{2,8})$/;
-  $me = $1; 
-}
-die "You can't change the password for $me." if $me && $<;
-$me = (getpwuid($<))[0] unless $me;
-
-my($name,$passwd,$uid,$gid,$quota,$comment,$gcos,$dir,$shell)=
-  getpwnam $me;
-
-my($old_password,$new_password,$new_gecos,$new_shell);
-
-if ( $opt_f || $opt_s ) {
-  system '/bin/stty', '-echo';
-  print "Password:";
-  $old_password=<STDIN>;
-  system '/bin/stty', 'echo'; 
-  chop($old_password);
-  #$old_password =~ /^(.{6,8})$/ or die "\nIllegal password.\n";
-  $old_password =~ /^(.{0,255})$/ or die "\nIllegal password.\n";
-  $old_password = $1;
-
-  $new_password = '';
-
-  if ( $opt_f ) {
-    print "\nChanging gecos for $me.\n";
-    print "Gecos [", $gcos, "]: ";
-    $new_gecos=<STDIN>;
-    chop($new_gecos);
-    $new_gecos ||= $gcos;
-    $new_gecos =~ /^(.{0,255})$/ or die "\nIllegal gecos.\n";
-  } else {
-    $new_gecos = '';
-  } 
-
-  if ( $opt_s ) {
-    print "\nChanging shell for $me.\n";
-    print "Shell [", $shell, "]: ";
-    $new_shell=<STDIN>;
-    chop($new_shell);
-    $new_shell ||= $shell;
-    $new_shell =~ /^(.{0,255})$/ or die "\nIllegal shell.\n";
-  } else {
-    $new_shell = '';
-  }
-
-} else {
-
-  print "Changing password for $me.\n";
-  print "Old password:";
-  system '/bin/stty', '-echo';
-  $old_password=<STDIN>;
-  chop $old_password;
-  #$old_password =~ /^(.{6,8})$/ or die "\nIllegal password.\n";
-  $old_password =~ /^(.{0,255})$/ or die "\nIllegal password.\n";
-  $old_password = $1;
-  print "\nEnter the new password (minimum of 6, maximum of 8 characters)\n";
-  print "Please use a combination of upper and lowercase letters and numbers.\n";
-  print "New password:";
-  $new_password=<STDIN>;
-  chop($new_password);
-  #$new_password =~ /^(.{6,8})$/ or die "\nIllegal password.\n";
-  $new_password =~ /^(.{0,255})$/ or die "\nIllegal password.\n";
-  $new_password = $1;
-  print "\nRe-enter new password:";
-  my($check_new_password);
-  $check_new_password=<STDIN>;
-  chop($check_new_password);
-  die "\nThey don't match; try again.\n" unless $check_new_password eq $new_password;
-
-  $new_gecos='';
-  $new_shell='';
-}
-print "\n";
-
-system '/bin/stty', 'echo'; 
-
-socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-connect(SOCK, sockaddr_un($fs_passwdd_socket)) or die "connect: $!";
-print SOCK join("\n",$me,$old_password,$new_password,$new_gecos,$new_shell),"\n";
-SOCK->flush;
-my($error);
-$error = <SOCK>;
-chop $error;
-
-if ($error) {
-  print "\nUpdate error: $error\n";
-} else {
-  print "\nUpdate sucessful.\n";
-}
diff --git a/fs_passwd/fs_passwd.cgi b/fs_passwd/fs_passwd.cgi
deleted file mode 100755
index 3f676fff3..000000000
--- a/fs_passwd/fs_passwd.cgi
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use Getopt::Std;
-use Socket;
-use IO::Handle;
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-
-my $fs_passwdd_socket = "/usr/local/freeside/fs_passwdd_socket";
-my $freeside_uid = scalar(getpwnam('freeside'));
-
-$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
-$ENV{'SHELL'} = '/bin/sh';
-$ENV{'IFS'} = " \t\n";
-$ENV{'CDPATH'} = '';
-$ENV{'ENV'} = '';
-$ENV{'BASH_ENV'} = '';
-
-die "fs_passwd.cgi isn't running as freeside user\n" if $> != $freeside_uid;
-
-my $cgi = new CGI;
-
-$cgi->param('username') =~ /^([^\n]{0,255}$)/ or die "Illegal username";
-my $me = $1;
-
-$cgi->param('old_password') =~ /^([^\n]{0,255}$)/ or die "Illegal old_password";
-my $old_password = $1;
-
-$cgi->param('new_password') =~ /^([^\n]{0,255}$)/ or die "Illegal new_password";
-my $new_password = $1;
-
-die "New passwords don't match"
-  unless $new_password eq $cgi->param('new_password2');
-
-socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-connect(SOCK, sockaddr_un($fs_passwdd_socket)) or die "connect: $!";
-print SOCK join("\n", $me, $old_password, $new_password, '', ''), "\n";
-SOCK->flush;
-my $error = <SOCK>;
-chomp $error;
-
-if ($error) {
-  die $error;
-} else {
-  print $cgi->header(), <<END;
-<html>
-  <head>
-    <title>Password changed</title>
-  </head>
-  <body bgcolor="#e8e8e8">
-    <h3>Password changed</h3>
-<br>Your password has been changed.
-  </body>
-</html>
-END
-}
diff --git a/fs_passwd/fs_passwd.html b/fs_passwd/fs_passwd.html
deleted file mode 100644
index fadc4df8b..000000000
--- a/fs_passwd/fs_passwd.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html>
-  <head>
-    <title>Change password</title>
-  </head>
-  <body bgcolor="#e8e8e8">
-    <h3>Change password</h3>
-    <form action="/cgi-bin/fs_passwd.cgi" method="post">
-    <table bgcolor="#cccccc" border=0 cellspacing=2>
-      <tr><th align="right">Username</th>
-        <td><input type="text" name="username" size="18"></td>
-      </tr>
-      <tr><th align="right">Current password</th>
-        <td><input type="password" name="old_password" size="18"></td>
-      </tr>
-      <tr><th align="right">New password</th>
-        <td><input type="password" name="new_password" size="18"></td>
-      </tr>
-      <tr><th align="right">Re-enter new password</th>
-        <td><input type="password" name="new_password2" size="18"></td>
-      </tr>
-    </table>
-    <br><input type="submit" value="Change password">
-  </body>
-</html>
-
diff --git a/fs_passwd/fs_passwd_server b/fs_passwd/fs_passwd_server
deleted file mode 100755
index a29b2c738..000000000
--- a/fs_passwd/fs_passwd_server
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# fs_passwd_server
-#
-# portions of this script are copied from the `passwd' script in the original
-# (perl 4) camel book, now archived at 
-# http://www.perl.com/CPAN/scripts/nutshell/ch6/passwd
-#
-# ivan@sisd.com 98-mar-9
-#
-# crypt-aware, s/password/_password/; ivan@sisd.com 98-aug-23
-
-use strict;
-use vars qw($pid);
-use subs qw(killssh);
-use IO::Handle;
-use Net::SSH qw(sshopen2);
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearchs);
-use FS::svc_acct;
-
-my $user = shift or die &usage;
-adminsuidsetup $user; 
-
-my($shellmachine)=shift or die &usage;
-
-#causing trouble for some folks
-#$SIG{CHLD} = sub { wait() };
-
-$SIG{HUP} = \&killssh;
-$SIG{INT} = \&killssh;
-$SIG{QUIT} = \&killssh;
-$SIG{TERM} = \&killssh;
-$SIG{PIPE} = \&killssh;
-
-sub killssh { kill 'TERM', $pid if $pid; exit; };
-
-my($fs_passwdd)="/usr/local/sbin/fs_passwdd";
-
-while (1) {
-  my($reader,$writer)=(new IO::Handle, new IO::Handle);
-  $writer->autoflush(1);
-  $pid = sshopen2($shellmachine,$reader,$writer,$fs_passwdd);
-  while (1) {
-    my($username,$old_password,$new_password,$new_gecos,$new_shell);
-    defined($username=<$reader>) or last;
-    defined($old_password=<$reader>) or last; 
-    defined($new_password=<$reader>) or last; 
-    defined($new_gecos=<$reader>) or last; 
-    defined($new_shell=<$reader>) or last; 
-    chop($username);
-    chop($old_password);
-    chop($new_password);
-    chop($new_gecos);
-    chop($new_shell);
-    my($svc_acct);
-
-    #need to try both $old_password and encrypted $old_password
-    #maybe the crypt function in svc_acct.export needs to be a library?
-    my $salt = substr($old_password,0,2);
-    my $cold_password = crypt($old_password,$salt);
-    $svc_acct=qsearchs('svc_acct',{'username'=>$username,
-                                   '_password'=>$old_password,
-    } )
-           || qsearchs('svc_acct',{'username'=>$username,
-                                   '_password'=>$cold_password,
-    } );
-    unless ( $svc_acct ) { print $writer "Incorrect password.\n"; next; }
-
-    my(%hash)=$svc_acct->hash;
-    my($new_svc_acct) = new FS::svc_acct ( \%hash );
-    $new_svc_acct->setfield('_password',$new_password) 
-      if $new_password && $new_password ne $old_password;
-    $new_svc_acct->setfield('finger',$new_gecos) if $new_gecos;
-    $new_svc_acct->setfield('shell',$new_shell) if $new_shell;
-    my($error)=$new_svc_acct->replace($svc_acct);
-    print $writer $error,"\n";
-  }
-  close $writer;
-  close $reader;
-  sleep 60;
-  warn "Connection to $shellmachine lost!  Reconnecting...\n";
-}
-
-sub usage {
-  die "Usage:\n\n  fs_passwd_server user shellmachine\n";
-}
-
diff --git a/fs_passwd/fs_passwdd b/fs_passwd/fs_passwdd
deleted file mode 100755
index cce98e787..000000000
--- a/fs_passwd/fs_passwdd
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# fs_passwdd
-#
-# This is run REMOTELY over ssh by fs_passwd_server.
-#
-# ivan@sisd.com 98-mar-9
-
-use strict;
-use Socket;
-
-my $fs_passwdd_socket = "/usr/local/freeside/fs_passwdd_socket";
-my $pid_file = "$fs_passwdd_socket.pid";
-
-$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
-$ENV{'SHELL'} = '/bin/sh';
-$ENV{'IFS'} = " \t\n";
-$ENV{'CDPATH'} = '';
-$ENV{'ENV'} = '';
-$ENV{'BASH_ENV'} = '';
-
-$|=1;
-
-my $uaddr = sockaddr_un($fs_passwdd_socket);
-my $proto = getprotobyname('tcp');
-
-socket(Server,PF_UNIX,SOCK_STREAM,0) or die "socket: $!";
-unlink($fs_passwdd_socket);
-bind(Server, $uaddr) or die "bind: $!";
-listen(Server,SOMAXCONN) or die "listen: $!";
-
-if ( -e $pid_file ) {
-  open(PIDFILE,"<$pid_file");
-  #chomp( my $old_pid = <PIDFILE> );
-  my $old_pid = <PIDFILE>;
-  close PIDFILE;
-  $old_pid =~ /^(\d+)$/;
-  kill 'TERM', $1;
-}
-open(PIDFILE,">$pid_file");
-print PIDFILE "$$\n";
-close PIDFILE;
-
-my($paddr);
-for ( ; $paddr = accept(Client,Server); close Client) {
-  my($me,$old_password,$new_password,$new_gecos,$new_shell);
-
-  $me=<Client>;
-  $old_password=<Client>;
-  $new_password=<Client>;
-  $new_gecos=<Client>;
-  $new_shell=<Client>;
-
-  print $me,$old_password,$new_password,$new_gecos,$new_shell;
-  my($error);
-
-  $error=<STDIN>;
-  
-  print Client $error;
-  close Client;
-}
-
diff --git a/fs_radlog/fs_radlogd b/fs_radlog/fs_radlogd
deleted file mode 100755
index 74c2af361..000000000
--- a/fs_radlog/fs_radlogd
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# ivan@sisd.com 98-mar-23
-
-use strict;
-use Date::Parse; #but hopefully not
-
-$|=1;
-
-my($file,$pos)=@_;
-open(FILE,"<$file") or die "Can't open $file: $!";
-seek(FILE,$pos,0) or die "Can't seek: $!";
-
-my($datestr);
-my(%param);
-
-$SIG{'HUP'} = sub { print "EOF\n"; exit; };
-
-while (1) {
-
-  while (<FILE>) {
-    next if /^$/;
-    if ( /^\S/ ) {
-      chop($datestr=$_);
-      undef %param;
-    } else {
-      warn "Unexpected line: $_";
-    }
-    while (<FILE>) {
-      if ( /^$/ ) {
-        #if ( $param{'Acct-Status-Type'} eq 'Stop' ) {
-          print join("\t",
-            tell FILE,
-            %param,
-          ),"\n";
-        #}
-        last;
-      } elsif ( /^\s+([\w\-]+)\s\=\s\"?([\w\.\-]+)\"?\s*$/ ) {
-        $param{$1}=$2;
-      } else { 
-        warn "Unexpected line: $_";
-      }
-
-    }  
-
-  }
-  sleep 1;
-  seek(FILE,0,1);
-}
-
-
diff --git a/fs_selfadmin/FS-MailAdminServer/MailAdminClient.pm b/fs_selfadmin/FS-MailAdminServer/MailAdminClient.pm
deleted file mode 100755
index 46cde4c0d..000000000
--- a/fs_selfadmin/FS-MailAdminServer/MailAdminClient.pm
+++ /dev/null
@@ -1,541 +0,0 @@
-package FS::MailAdminClient;
-
-use strict;
-use vars qw($VERSION @ISA @EXPORT_OK $fs_mailadmind_socket);
-use Exporter;
-use Socket;
-use FileHandle;
-use IO::Handle;
-
-$VERSION = '0.01';
-
-@ISA = qw( Exporter );
-@EXPORT_OK = qw( signup_info authenticate list_packages list_mailboxes delete_mailbox password_mailbox add_mailbox list_forwards list_pkg_forwards delete_forward add_forward new_customer );
-
-$fs_mailadmind_socket = "/usr/local/freeside/fs_mailadmind_socket";
-
-$ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin';
-$ENV{'SHELL'} = '/bin/sh';
-$ENV{'IFS'} = " \t\n";
-$ENV{'CDPATH'} = '';
-$ENV{'ENV'} = '';
-$ENV{'BASH_ENV'} = '';
-
-my $freeside_uid = scalar(getpwnam('freeside'));
-die "not running as the freeside user\n" if $> != $freeside_uid;
-
-=head1 NAME
-
-FS::MailAdminClient - Freeside mail administration client API
-
-=head1 SYNOPSIS
-
-  use FS::MailAdminClient qw( signup_info list_mailboxes  new_customer );
-
-  ( $locales, $packages, $pops ) = signup_info;
-
-  ( $accounts ) = list_mailboxes;
-
-  $error = new_customer ( {
-    'first'          => $first,
-    'last'           => $last,
-    'ss'             => $ss,
-    'comapny'        => $company,
-    'address1'       => $address1,
-    'address2'       => $address2,
-    'city'           => $city,
-    'county'         => $county,
-    'state'          => $state,
-    'zip'            => $zip,
-    'country'        => $country,
-    'daytime'        => $daytime,
-    'night'          => $night,
-    'fax'            => $fax,
-    'payby'          => $payby,
-    'payinfo'        => $payinfo,
-    'paydate'        => $paydate,
-    'payname'        => $payname,
-    'invoicing_list' => $invoicing_list,
-    'pkgpart'        => $pkgpart,
-    'username'       => $username,
-    '_password'       => $password,
-    'popnum'         => $popnum,
-  } );
-
-=head1 DESCRIPTION
-
-This module provides an API for a remote mail administration server.
-
-It needs to be run as the freeside user.  Because of this, the program which
-calls these subroutines should be written very carefully.
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item signup_info
-
-Returns three array references of hash references.
-
-The first set of hash references is of allowable locales.  Each hash reference
-has the following keys:
-  taxnum
-  state
-  county
-  country
-
-The second set of hash references is of allowable packages.  Each hash
-reference has the following keys:
-  pkgpart
-  pkg
-
-The third set of hash references is of allowable POPs (Points Of Presence).
-Each hash reference has the following keys:
-  popnum
-  city
-  state
-  ac
-  exch
-
-=cut
-
-sub signup_info {
-  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
-  print SOCK "signup_info\n";
-  SOCK->flush;
-
-  chop ( my $n_cust_main_county = <SOCK> );
-  my @cust_main_county = map {
-    chop ( my $taxnum  = <SOCK> ); 
-    chop ( my $state   = <SOCK> ); 
-    chop ( my $county  = <SOCK> ); 
-    chop ( my $country = <SOCK> );
-    {
-      'taxnum'  => $taxnum,
-      'state'   => $state,
-      'county'  => $county,
-      'country' => $country,
-    };
-  } 1 .. $n_cust_main_county;
-
-  chop ( my $n_part_pkg = <SOCK> );
-  my @part_pkg = map {
-    chop ( my $pkgpart = <SOCK> ); 
-    chop ( my $pkg     = <SOCK> ); 
-    {
-      'pkgpart' => $pkgpart,
-      'pkg'     => $pkg,
-    };
-  } 1 .. $n_part_pkg;
-
-  chop ( my $n_svc_acct_pop = <SOCK> );
-  my @svc_acct_pop = map {
-    chop ( my $popnum = <SOCK> ); 
-    chop ( my $city   = <SOCK> ); 
-    chop ( my $state  = <SOCK> ); 
-    chop ( my $ac     = <SOCK> );
-    chop ( my $exch   = <SOCK> );
-    chop ( my $loc    = <SOCK> );
-    {
-      'popnum' => $popnum,
-      'city'   => $city,
-      'state'  => $state,
-      'ac'     => $ac,
-      'exch'   => $exch,
-      'loc'    => $loc,
-    };
-  } 1 .. $n_svc_acct_pop;
-
-  close SOCK;
-
-  \@cust_main_county, \@part_pkg, \@svc_acct_pop;
-}
-
-=item authenticate
-
-Authentictes against a service on the remote Freeside system.  Requires a hash
-reference as a parameter with the following keys:
-    authuser
-    _password
-
-Returns a scalar error message of the form "authuser OK|FAILED" or an error
-message.
-
-=cut
-
-sub authenticate {
-  my $hashref = shift;
-  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
-  print SOCK "authenticate", "\n";
-  SOCK->flush;
-
-  print SOCK join("\n", map { $hashref->{$_} } qw(
-    authuser _password
-  ) ), "\n";
-  SOCK->flush;
-
-  chop( my $error = <SOCK> );
-  close SOCK;
-
-  $error;
-}
-
-=item list_packages
-
-Returns one array reference of hash references.
-
-The set of hash references is of existing packages.  Each hash reference
-has the following keys:
-  pkgnum
-  domain
-  account
-
-=cut
-
-sub list_packages {
-  my $user = shift;
-  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
-  print SOCK "list_packages\n", $user, "\n";
-  SOCK->flush;
-
-  chop ( my $n_packages = <SOCK> );
-  my @packages = map {
-    chop ( my $pkgnum  = <SOCK> ); 
-    chop ( my $domain  = <SOCK> ); 
-    chop ( my $account = <SOCK> ); 
-    {
-      'pkgnum'  => $pkgnum,
-      'domain'  => $domain,
-      'account' => $account,
-    };
-  } 1 .. $n_packages;
-
-  close SOCK;
-
-  \@packages;
-}
-
-=item list_mailboxes
-
-Returns one array references of hash references.
-
-The set of hash references is of existing accounts.  Each hash reference
-has the following keys:
-  svcnum
-  username
-  _password
-
-=cut
-
-sub list_mailboxes {
-  my ($user, $package) = @_;
-  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
-  print SOCK "list_mailboxes\n", $user, "\n", $package, "\n";
-  SOCK->flush;
-
-  chop ( my $n_svc_acct = <SOCK> );
-  my @svc_acct = map {
-    chop ( my $svcnum  = <SOCK> ); 
-    chop ( my $username  = <SOCK> ); 
-    chop ( my $_password   = <SOCK> ); 
-    {
-      'svcnum'  => $svcnum,
-      'username'  => $username,
-      '_password'   => $_password,
-    };
-  } 1 .. $n_svc_acct;
-
-  close SOCK;
-
-  \@svc_acct;
-}
-
-=item delete_mailbox
-
-Deletes a mailbox service from the remote Freeside system.  Requires a hash
-reference as a paramater with the following keys:
-    authuser
-    account
-
-Returns a scalar error message, or the empty string for success.
-
-=cut
-
-sub delete_mailbox {
-  my $hashref = shift;
-  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
-  print SOCK "delete_mailbox", "\n";
-  SOCK->flush;
-
-  print SOCK join("\n", map { $hashref->{$_} } qw(
-    authuser account
-  ) ), "\n";
-  SOCK->flush;
-
-  chop( my $error = <SOCK> );
-  close SOCK;
-
-  $error;
-}
-
-=item password_mailbox
-
-Changes the password for a mailbox service on the remote Freeside system.
-  Requires a hash reference as a paramater with the following keys:
-    authuser
-    account
-    _password
-
-Returns a scalar error message, or the empty string for success.
-
-=cut
-
-sub password_mailbox {
-  my $hashref = shift;
-  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
-  print SOCK "password_mailbox", "\n";
-  SOCK->flush;
-
-  print SOCK join("\n", map { $hashref->{$_} } qw(
-    authuser account _password
-  ) ), "\n";
-  SOCK->flush;
-
-  chop( my $error = <SOCK> );
-  close SOCK;
-
-  $error;
-}
-
-=item add_mailbox
-
-Creates a mailbox service on the remote Freeside system.  Requires a hash
-reference as a parameter with the following keys:
-    authuser
-    package
-    account
-    _password
-
-Returns a scalar error message, or the empty string for success.
-
-=cut
-
-sub add_mailbox {
-  my $hashref = shift;
-  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
-  print SOCK "add_mailbox", "\n";
-  SOCK->flush;
-
-  print SOCK join("\n", map { $hashref->{$_} } qw(
-    authuser package account _password
-  ) ), "\n";
-  SOCK->flush;
-
-  chop( my $error = <SOCK> );
-  close SOCK;
-
-  $error;
-}
-
-=item list_forwards
-
-Returns one array references of hash references.
-
-The set of hash references is of existing forwards.  Each hash reference
-has the following keys:
-  svcnum
-  dest
-
-=cut
-
-sub list_forwards {
-  my ($user, $service) = @_;
-  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
-  print SOCK "list_forwards\n", $user, "\n", $service, "\n";
-  SOCK->flush;
-
-  chop ( my $n_svc_forward = <SOCK> );
-  my @svc_forward = map {
-    chop ( my $svcnum  = <SOCK> ); 
-    chop ( my $dest  = <SOCK> ); 
-    {
-      'svcnum'  => $svcnum,
-      'dest'  => $dest,
-    };
-  } 1 .. $n_svc_forward;
-
-  close SOCK;
-
-  \@svc_forward;
-}
-
-=item list_pkg_forwards
-
-Returns one array references of hash references.
-
-The set of hash references is of existing forwards.  Each hash reference
-has the following keys:
-  svcnum
-  srcsvc
-  dest
-
-=cut
-
-sub list_pkg_forwards {
-  my ($user, $package) = @_;
-  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
-  print SOCK "list_pkg_forwards\n", $user, "\n", $package, "\n";
-  SOCK->flush;
-
-  chop ( my $n_svc_forward = <SOCK> );
-  my @svc_forward = map {
-    chop ( my $svcnum  = <SOCK> ); 
-    chop ( my $srcsvc  = <SOCK> ); 
-    chop ( my $dest  = <SOCK> ); 
-    {
-      'svcnum'  => $svcnum,
-      'srcsvc'  => $srcsvc,
-      'dest'  => $dest,
-    };
-  } 1 .. $n_svc_forward;
-
-  close SOCK;
-
-  \@svc_forward;
-}
-
-=item delete_forward
-
-Deletes a forward service from the remote Freeside system.  Requires a hash
-reference as a paramater with the following keys:
-    authuser
-    svcnum
-
-Returns a scalar error message, or the empty string for success.
-
-=cut
-
-sub delete_forward {
-  my $hashref = shift;
-  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
-  print SOCK "delete_forward", "\n";
-  SOCK->flush;
-
-  print SOCK join("\n", map { $hashref->{$_} } qw(
-    authuser svcnum
-  ) ), "\n";
-  SOCK->flush;
-
-  chop( my $error = <SOCK> );
-  close SOCK;
-
-  $error;
-}
-
-=item add_forward
-
-Creates a forward service on the remote Freeside system.  Requires a hash
-reference as a parameter with the following keys:
-    authuser
-    package
-    source
-    dest
-
-Returns a scalar error message, or the empty string for success.
-
-=cut
-
-sub add_forward {
-  my $hashref = shift;
-  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
-  print SOCK "add_forward", "\n";
-  SOCK->flush;
-
-  print SOCK join("\n", map { $hashref->{$_} } qw(
-    authuser package source dest
-  ) ), "\n";
-  SOCK->flush;
-
-  chop( my $error = <SOCK> );
-  close SOCK;
-
-  $error;
-}
-
-=item new_customer HASHREF
-
-Adds a customer to the remote Freeside system.  Requires a hash reference as
-a paramater with the following keys:
-  first
-  last
-  ss
-  comapny
-  address1
-  address2
-  city
-  county
-  state
-  zip
-  country
-  daytime
-  night
-  fax
-  payby
-  payinfo
-  paydate
-  payname
-  invoicing_list
-  pkgpart
-  username
-  _password
-  popnum
-
-Returns a scalar error message, or the empty string for success.
-
-=cut
-
-sub new_customer {
-  my $hashref = shift;
-
-  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($fs_mailadmind_socket)) or die "connect: $!";
-  print SOCK "new_customer\n";
-
-  print SOCK join("\n", map { $hashref->{$_} } qw(
-    first last ss company address1 address2 city county state zip country
-    daytime night fax payby payinfo paydate payname invoicing_list
-    pkgpart username _password popnum
-  ) ), "\n";
-  SOCK->flush;
-
-  chop( my $error = <SOCK> );
-  $error;
-}
-
-=back
-
-=head1 VERSION
-
-$Id: MailAdminClient.pm,v 1.1 2001-10-18 15:04:54 jeff Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<fs_signupd>, L<FS::SignupServer>, L<FS::cust_main>
-
-=cut
-
-1;
-
diff --git a/fs_selfadmin/FS-MailAdminServer/cgi/mailadmin.cgi b/fs_selfadmin/FS-MailAdminServer/cgi/mailadmin.cgi
deleted file mode 100755
index c26c3dc42..000000000
--- a/fs_selfadmin/FS-MailAdminServer/cgi/mailadmin.cgi
+++ /dev/null
@@ -1,698 +0,0 @@
-#!/usr/bin/perl
-########################################################################
-#                                                                      #
-#    mailadmin.cgi                NCI2000                              #
-#                                 Jeff Finucane <jeff@nci2000.net>     #
-#                                 26 April 2001                        #
-#                                                                      #
-########################################################################
-
-use DBI;
-use strict;
-use CGI;
-use FS::MailAdminClient qw(authenticate list_packages list_mailboxes delete_mailbox password_mailbox add_mailbox list_forwards list_pkg_forwards delete_forward add_forward);
-
-my $sessionfile = '/usr/local/apache/htdocs/mailadmin/adminsess';   # session file
-my $tmpdir = '/usr/local/apache/htdocs/mailadmin/tmp';		# Location to store temp files
-my $cookiedomain = ".your.dom";      # domain if THIS server, should prepend with a '.'
-my $cookieexpire = '+12h';              # expire the cookie session after this much idle time
-my $sessexpire = 43200;                 # expire session after this long of no use (in seconds)
-
-my $body = "<body bgcolor=dddddd>";
-
-#### Should not have to change anything under this line ####
-my $printmainpage = 1;
-my $i = 0;
-my $printheader = 1;
-my $query = new CGI;
-my $cgi = $query->url();
-my $now = getdatetime();
-my $current_package = 0;
-my $current_account = 0;
-my $current_domname = "";
-
-# if they are trying to login we wont check the session yet
-if ($query->param('login') eq '' && $query->param('action') ne 'login') {
-  checksession();
-  printheader();
-}
-
-if ($query->param('login') ne '') {
-
-   my $username = $query->param('username');
-   my $password = $query->param('password');
-
-   if (!checkuserpass($username, $password)) {
-      printheader();
-      error('not_admin');
-   }
-
-   my @alpha = ('A'..'Z', 'a'..'z', 0..9);
-   my $sessid = '';
-   for (my $i = 0; $i < 10; $i++) {
-       $sessid .= @alpha[rand(@alpha)];
-   }
-
-   my $cookie1 = $query->cookie(-name=>'username',
-				-value=>$username,
-				-expires=>$cookieexpire,
-				-domain=>$cookiedomain);
-
-   my $cookie2 = $query->cookie(-name=>'ma_sessionid',
-				-value=>$sessid,
-				-expires=>$cookieexpire,
-				-domain=>$cookiedomain);
-
-   my $now = time();
-   open(NEWSESS, ">>$sessionfile") || error('open');
-   print NEWSESS "$username $sessid $now 0 0\n";
-   close(NEWSESS);
-
-   print $query->header(-COOKIE=>[$cookie1, $cookie2]);
- 
-   $printmainpage = 1;
-
-} elsif ($query->param('action') eq 'blankframe') {
-   
-  print "<html>$body</body></html>\n";
-   $printmainpage = 0;
-
-} elsif ($query->param('action') eq 'list_packages') {
-
-  my $username = $query->cookie(-name=>'username');  # session checked
-  my $list = list_packages($username);
-  print "<html>$body\n";
-  print "<center><table border=0>\n";
-  print "<tr><td></td><td><p>Package Number</td><td><p>Description</td></tr>\n";
-  foreach my $package ( @{$list} ) {
-    print "<tr>";
-    print "<td></td><td><p>$package->{'pkgnum'}</td><td><p>$package->{'domain'}</td>\n";
-    print "<td></td><td><a href=\"$cgi\?action=select&package=$package->{'pkgnum'}&account=$package->{'account'}&domname=$package->{'domain'}\" target=\"rightmainframe\">select</td>\n";
-    print "</tr>";
-  }
-  print "</table>\n";
-  print "</body></html>\n";
-  $printmainpage=0;
-
-} elsif ($query->param('action') eq 'list_mailboxes') {
-
-  my $username = $query->cookie(-name=>'username');  # session checked
-  select_package($username)  unless $current_package;
-  my $list = list_mailboxes($username, $current_package);
-  my $forwardlist = list_pkg_forwards($username, $current_package);
-  print "<html>$body\n";
-  print "<center><table border=0>\n";
-  print "<tr><td></td><td><p>Username</td><td><p>Password</td></tr>\n";
-  foreach my $account ( @{$list} ) {
-    print "<tr>";
-    print "<td></td><td><p>$account->{'username'}</td><td><p>$account->{'_password'}</td>\n";
-    print "<td></td><td><a href=\"$cgi\?action=change&account=$account->{'svcnum'}&mailbox=$account->{'username'}\" target=\"rightmainframe\">change</td>\n";
-    print "</tr>";
-
-#    my $forwardlist = list_forwards($username, $account->{'svcnum'});
-#    foreach my $forward ( @{$forwardlist} ) {
-#      my $label = qq!=> ! . $forward->{'dest'};
-#      print "<tr><td></td><td></td><td><p>$label</td></tr>\n";
-#    }
-    foreach my $forward ( @{$forwardlist} ) {
-      if ($forward->{'srcsvc'} == $account->{'svcnum'}) {
-        my $label = qq!=> ! . $forward->{'dest'};
-        print "<tr><td></td><td></td><td><p>$label</td></tr>\n";
-      }
-    }
-
-  }
-  print "</table>\n";
-  print "</body></html>\n";
-  $printmainpage=0;
-
-} elsif ($query->param('action') eq 'select') {
-
-  my $username = $query->cookie(-name=>'username');  # session checked
-  $current_package = $query->param('package');
-  $current_account = $query->param('account');
-  $current_domname = $query->param('domname');
-  set_package();
-  print "<html>$body\n";
-  print "<form name=form1 action=\"$cgi\" method=post target=\"rightmainframe\">\n";
-  print "<center>\n";
-  print "<p>Selected package $current_package\n";
-  print "</center>\n";
-  print "</form>\n";
-  print "</body></html>\n";
-  $printmainpage=0;
-
-} elsif ($query->param('action') eq 'change') {
-
-  my $username = $query->cookie(-name=>'username');  # session checked
-  select_package($username) unless $current_package;
-  my $account  = $query->param('account');
-  my $mailbox  = $query->param('mailbox');
-  my $list = list_forwards($username, $account);
-  print "<html>$body\n";
-  print "<form name=form1 action=\"$cgi\" method=post target=\"rightmainframe\">\n";
-  print "<center><table border=0>\n";
-  print "<tr><td></td><td><p>Username</td><td><p>$mailbox</td></tr>\n";
-  print "<input type=hidden name=\"account\" value=\"$account\">\n";
-  print "<input type=hidden name=\"mailbox\" value=\"$mailbox\">\n";
-  foreach my $forward ( @{$list} ) {
-    my $label = qq!=> ! . $forward->{'dest'};
-#    print "<tr><td></td><td></td><td><p>$label</td></tr>\n";
-    print "<tr><td></td><td></td><td><p>$label</td><td><a href=\"$cgi\?action=deleteforward&service=$forward->{'svcnum'}&mailbox=$mailbox&dest=$forward->{'dest'}\" target=\"rightmainframe\">remove</td></tr>\n";
-  }
-  print "<tr><td></td><td><p>Password</td><td><input type=text name=\"_password\" value=\"\"></td></tr>\n";
-  print "</table>\n";
-  print "<input type=submit name=\"deleteaccount\" value=\"Delete This User\">\n";
-  print "<input type=submit name=\"changepassword\" value=\"Change The Password\">\n";
-  print "<input type=submit name=\"addforward\" value=\"Add Forwarding\">\n";
-  print "</center>\n";
-  print "</form>\n";
-  print "<br>\n";
-  print "<p> You may delete this user and all mailforwarding by pressing <B>Delete This User</B>.\n";
-  print "<p> To set or change the password for this user, type the new password in the box next to <B>Password</B> and press <B>Change The Password</B>.\n";
-  print "<p> If you would like to have mail destined for this user forwarded to another email address then press the <B>Add Forwarding</B> button.\n";
-  print "</body></html>\n";
-  $printmainpage=0;
-
-} elsif ($query->param('deleteaccount') ne '') {
-
-  my $username = $query->cookie(-name=>'username');  # session checked
-  select_package($username) unless $current_package;
-  my $account  = $query->param('account');
-  my $mailbox  = $query->param('mailbox');
-  print "<html>$body\n";
-  print "<form name=form1 action=\"$cgi\" method=post target=\"rightmainframe\">\n";
-  print "<p>Are you certain you want to delete user $mailbox?\n";
-  print "<p><input type=hidden name=\"account\" value=\"$account\">\n";
-  print "<input type=submit name=\"deleteaccounty\" value=\"Confirm\">\n";
-  print "</body></html>\n";
-  $printmainpage=0;
-
-} elsif ($query->param('deleteaccounty') ne '') {
-
-  my $username = $query->cookie(-name=>'username');  # session checked
-  select_package($username) unless $current_package;
-  my $account  = $query->param('account');
-  
-  if  ( my $error = delete_mailbox ( {
-      'authuser'         => $username,
-      'account'          => $account,
-    } ) ) {
-    print "<html>$body\n";
-    print "<p>$error\n";
-    print "</body></html>\n";
-      
-  } else {
-    print "<html>$body\n";
-    print "<p>Deleted\n";
-    print "</body></html>\n";
-  }
-
-  $printmainpage=0;
-
-} elsif ($query->param('changepassword') ne '') {
-
-  my $username = $query->cookie(-name=>'username');  # session checked
-  select_package($username) unless $current_package;
-  my $account  = $query->param('account');
-  my $_password  = $query->param('_password');
-  
-  if  ( my $error = password_mailbox ( {
-      'authuser'         => $username,
-      'account'          => $account,
-      '_password'        => $_password,
-    } ) ) {
-    print "<html>$body\n";
-    print "<p>$error\n";
-    print "</body></html>\n";
-      
-  } else {
-    print "<html>$body\n";
-    print "<p>Changed\n";
-    print "</body></html>\n";
-  }
-
-  $printmainpage=0;
-
-} elsif ($query->param('action') eq 'newmailbox') {
-
-  my $username = $query->cookie(-name=>'username');  # session checked
-  select_package($username) unless $current_package;
-  print "<html>$body\n";
-  print "<form name=form1 action=\"$cgi\" method=post target=\"rightmainframe\">\n";
-  print "<center><table border=0>\n";
-  print "<tr><td></td><td><p>Username </td><td><input type=text name=\"account\" value=\"\"></td><td>@ " . $current_domname . "</td></tr>\n";
-  print "<tr><td></td><td><p>Password</td><td><input type=text name=\"_password\" value=\"\"></td></tr>\n";
-  print "</table>\n";
-  print "<input type=submit name=\"addmailbox\" value=\"Add This User\">\n";
-  print "</center>\n";
-  print "</form>\n";
-  print "<br>\n";
-  print "<p>Use this screen to add a new mailbox user.  If the domain name of the email address (the part after the <B>@</B> sign) is not what you expect then you may need to use <B>List Packages</B> to select the package with the correct domain.\n";
-  print "<p>Enter the first portion of the email address in the box adjacent to <B>Username</B> and enter the password for that user in the space next to <B>Password</B>.  Then press the button labeled <B>Add The User</B>.\n";
-  print "<p>If you do not want to add a new user at this time then select a choice from the menu at the left, such as <B>List Mailboxes</B>.\n";
-  print "</body></html>\n";
-  $printmainpage=0;
-
-} elsif ($query->param('addmailbox') ne '') {
-
-  my $username = $query->cookie(-name=>'username');  # session checked
-  select_package($username) unless $current_package;
-  my $account  = $query->param('account');
-  my $_password  = $query->param('_password');
-  
-  if  ( my $error = add_mailbox ( {
-      'authuser'         => $username,
-      'package'          => $current_package,
-      'account'          => $account,
-      '_password'        => $_password,
-    } ) ) {
-    print "<html>$body\n";
-    print "<p>$error\n";
-    print "</body></html>\n";
-      
-  } else {
-    print "<html>$body\n";
-    print "<p>Created\n";
-    print "</body></html>\n";
-  }
-
-  $printmainpage=0;
-
-} elsif ($query->param('action') eq 'deleteforward') {
-
-  my $username = $query->cookie(-name=>'username');  # session checked
-  select_package($username) unless $current_package;
-  my $svcnum   = $query->param('service');
-  my $mailbox  = $query->param('mailbox');
-  my $dest  = $query->param('dest');
-  print "<html>$body\n";
-  print "<form name=form1 action=\"$cgi\" method=post target=\"rightmainframe\">\n";
-  print "<p>Are you certain you want to remove the forwarding from $mailbox to $dest?\n";
-  print "<p><input type=hidden name=\"service\" value=\"$svcnum\">\n";
-  print "<input type=submit name=\"deleteforwardy\" value=\"Confirm\">\n";
-  print "</body></html>\n";
-  $printmainpage=0;
-
-} elsif ($query->param('deleteforwardy') ne '') {
-
-  my $username = $query->cookie(-name=>'username');  # session checked
-  select_package($username) unless $current_package;
-  my $service  = $query->param('service');
-  
-  if  ( my $error = delete_forward ( {
-      'authuser'        => $username,
-      'svcnum'          => $service,
-    } ) ) {
-    print "<html>$body\n";
-    print "<p>$error\n";
-    print "</body></html>\n";
-      
-  } else {
-    print "<html>$body\n";
-    print "<p>Forwarding Removed\n";
-    print "</body></html>\n";
-  }
-
-  $printmainpage=0;
-
-} elsif ($query->param('addforward') ne '') {
-
-  my $username = $query->cookie(-name=>'username');  # session checked
-  select_package($username) unless $current_package;
-  my $account  = $query->param('account');
-  my $mailbox  = $query->param('mailbox');
-  
-  print "<html>$body\n";
-  print "<form name=form1 action=\"$cgi\" method=post target=\"rightmainframe\">\n";
-  print "<center><table border=0>\n";
-  print "<input type=hidden name=\"account\" value=\"$account\">\n";
-  print "<input type=hidden name=\"mailbox\" value=\"$mailbox\">\n";
-  print "<tr><td>Forward mail from </td><td><p>$mailbox:</td><td> to </td></tr>\n";
-  print "<tr><td></td><td><p>Destination:</td><td><input type=text name=\"dest\" value=\"\"></td></tr>\n";
-  print "</table>\n";
-  print "<input type=submit name=\"addforwarddst\" value=\"Add the Forwarding\">\n";
-  print "</center>\n";
-  print "</form>\n";
-  print "<br>\n";
-  print "<p> If you would like mail originally destined for the above address to be forwarded to a different email address then type that email address in the box next to <B>Destination:</B> and press the <B>Add the Forwarding</B> button.\n";
-  print "<p> If you do not want to add mail forwarding then select a choice from the menu at the left, such as <B>List Accounts</B>.\n";
-
-  $printmainpage=0;
-
-} elsif ($query->param('addforwarddst') ne '') {
-
-  my $username = $query->cookie(-name=>'username');  # session checked
-  select_package($username) unless $current_package;
-  my $account  = $query->param('account');
-  my $dest  = $query->param('dest');
-  
-  if  ( my $error = add_forward ( {
-      'authuser'         => $username,
-      'package'          => $current_package,
-      'source'           => $account,
-      'dest'             => $dest,
-    } ) ) {
-    print "<html>$body\n";
-    print "<p>$error\n";
-    print "</body></html>\n";
-      
-  } else {
-    print "<html>$body\n";
-    print "<p>Forwarding Created\n";
-    print "</body></html>\n";
-  }
-
-  $printmainpage=0;
-
-} elsif ($query->param('action') eq 'navframe') {
-
-  print "<html><body bgcolor=bbbbbb>\n";
-  print "<center><h2>NCI2000 MAIL ADMIN Web Interface</h2></center>\n";
-
-  print "<br><center>Choose Action:</center><br>\n";
-  print "<center><table border=0>\n";
-  print "<ul>\n";
-  print "<tr><td><li><a href=\"$cgi\?action=logout\" target=\"_top\">Log Off</a></td><tr>\n";
-  print "<tr><td><li><a href=\"$cgi\?action=list_packages\" target=\"rightmainframe\">List Packages</a></td><tr>\n";
-  print "<tr><td><li><a href=\"$cgi\?action=list_mailboxes\" target=\"rightmainframe\">List Accounts</a></td><tr>\n";
-  print "<tr><td><li><a href=\"$cgi\?action=newmailbox\" target=\"rightmainframe\">Add Account</a></td><tr>\n";
-  print "</ul>\n";
-  print "</table></center>\n";
-
-  print "<br><br><br>\n";
-  print "</body></html>\n";
-
-  $printmainpage = 0;
-
-} elsif ($query->param('action') eq 'rightmainframe') {
-
-  print "<html>$body\n";
-  print "<br><br><br>\n";
-  print "<font size=4><----- Please choose function on the left menu</font>\n";
-  print "<br><br>\n";
-  print "<p> Choose <B>Log Off</B> when you are finished.  This helps prevent unauthorized access to your accounts.\n";
-  print "<p> Use <B>List Packages</B> when you administer multiple packages.  When you have multiple domains at NCI2000 you are likely to have multiple packages.  Use of <B>List Packages</B> is not necessary if administer only one package.\n";
-  print "<p> Use <B>List Accounts</B> to view your current arrangement of mailboxes.  From this list you my choose to make changes to existing mailboxes or delete mailboxes.  If you would like to modify the forwarding associated with a mailbox then choose it from this list.\n";
-  print "<p> Use <B>Add Account</B> when you would like an additional mailbox.  After you have added the mailbox you may choose to make additional changes from the list provided by <B>List Accounts<B>.\n";
-  print "</body></html>\n";
-
-  $printmainpage = 0;
-
-}
-
-
-if ($query->param('action') eq 'login') {
-
-    printheader();
-    printlogin();
-
-} elsif ($query->param('action') eq 'logout') {
-
-    destroysession();
-    printheader();
-    printlogin();
-
-} elsif ($printmainpage) {
-
-
-  print "<html><head><title>NCI2000 MAIL ADMIN Web Interface</title></head>\n";
-  print "<FRAMESET cols=\"160,*\" BORDER=\"3\">\n";
-  print "<FRAME NAME=\"navframe\" src=\"$cgi?action=navframe\">\n";
-  print "<FRAME NAME=\"rightmainframe\" src=\"$cgi?action=rightmainframe\">\n";
-  print "</FRAMESET>\n";
-  print "</html>\n";
-
-
-}
-
-sub getdatetime {
-  my $today = localtime(time());
-  my ($day,$mon,$dayofmon,$time,$year) = split(/\s+/,$today);
-  my @datemonths = ("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec");
-
-  my $numidx = "01";
-  my ($nummon);
-  foreach my $mons (@datemonths) {
-    if ($mon eq $mons) {
-     $nummon = $numidx;
-    }
-    $numidx++;
-  }
-
-  return "$year-$nummon-$dayofmon $time";
-
-}
-
-sub error {
-
-  my $error = shift;
-  my $arg1 = shift;
-
-   printheader();
-
-   if ($error eq 'not_admin') {
-     print "<html><head><title>Error!</title></head>\n";
-     print "$body\n";
-     print "<center><h1><font face=arial>Error!</font></h1></center>\n";
-     print "<font face=arial>Unauthorized attempt to access mail administration.</font>\n";
-     print "<br><font face=arial>Please login again if you think this is an error.</font>\n";
-     print "<form><input type=button value=\"<<Back\" OnClick=\"history.back()\"></form>\n";
-     print "</body></html>\n";
-   } elsif ($error eq 'exists') {
-     print "<html><head><title>Error!</title></head>\n";
-     print "$body\n";
-     print "<center><h1><font face=arial>Error!</font></h1></center>\n";
-     print "<font face=arial>The user you are trying to enter already exists. Please go back and enter a different username</font>\n";
-     print "</font></body></html>\n";
-   } elsif ($error eq 'ingroup') {
-     print "<html><head><title>Error!</title></head>\n";
-     print "$body\n";
-     print "<center><h1><font face=arial>Error!</font></h1></center>\n";
-     print "<font face=arial>This user is already in the group <i>$arg1</i>. Please go back and deselect group <i>$arg1</i> from the list.</font>\n";
-     print "<form><input type=button value=\"<<Back\" OnClick=\"history.back()\"></form>\n";
-     print "</font></body></html>\n";
-   } elsif ($error eq 'sess_expired') {
-     print "<html>$body\n";
-     print "<center><font size=4>Your session has expired.</font></center>\n";
-     print "<br><br><center>Please login again <a href=\"$cgi\?action=login\" target=\"_top\"> HERE</a></center>\n";
-     print "</body></html>\n";
-   } elsif ($error eq 'open') {
-     print "<html>$body\n";
-     print "<center><font size=4>Unable to open or rename file.</font></center>\n";
-     print "<br><br><center>If this continues, please contact your administrator</center>\n";
-     print "</body></html>\n";
-   }
-
-
-   exit;
-
-}
-
-
-#print a html header if not printed yet
-sub printheader {
-
-  if ($printheader) {
-     print "Content-Type: text/html\n\n";
-     $printheader = 0;
-  }
-
-}
-
-
-#verify user can access administration
-sub checksession {
-
-  my $username = $query->cookie(-name=>'username');
-  my $sessionid = $query->cookie(-name=>'ma_sessionid');
-
-  if ($sessionid eq '') {
-     printheader();
-     if ($query->param()) {
-        error('sess_expired');
-     } else {
-        printlogin();
-        exit;
-    }
-  }
-
-  my $now = time();
-  my $founduser = 0;
-  open(SESSFILE, "$sessionfile") || error('open');
-  error('open') if -l "$tmpdir/adminsess.$$";
-  open(NEWSESS, ">$tmpdir/adminsess.$$") || error('open');
-  while (<SESSFILE>) {
-	chomp();
-	my ($user, $sess, $time, $pkgnum, $svcdomain, $domname) = split(/\s+/);
-	next if $now - $sessexpire > $time;
-	if ($username eq $user && !$founduser) {
-		if ($sess eq $sessionid) {
-			$founduser = 1;
-			print NEWSESS "$user $sess $now $pkgnum $svcdomain $domname\n";
-                        $current_package=$pkgnum;
-                        $current_account=$svcdomain;
-                        $current_domname=$domname;
-			next;
-		}
-	}
-	print NEWSESS "$user $sess $time $pkgnum $svcdomain $domname\n";
-  }
-  close(SESSFILE);
-  close(NEWSESS);
-  system("mv $tmpdir/adminsess.$$ $sessionfile");
-  error('sess_expired') unless $founduser;
-
-  my $cookie1 = $query->cookie(-name=>'username',
-				-value=>$username,
-				-expires=>$cookieexpire,
-				-domain=>$cookiedomain);
-
-  my $cookie2 = $query->cookie(-name=>'ma_sessionid',
-				-value=>$sessionid,
-				-expires=>$cookieexpire,
-				-domain=>$cookiedomain);
-
-  print $query->header(-COOKIE=>[$cookie1, $cookie2]);
-  
-  $printheader = 0;
-
-  return 0;
-
-}
-
-sub destroysession {
-
-  my $username = $query->cookie(-name=>'username');
-  my $sessionid = $query->cookie(-name=>'ma_sessionid');
-
-  if ($sessionid eq '') {
-     printheader();
-     if ($query->param()) {
-        error('sess_expired');
-     } else {
-        printlogin();
-        exit;
-    }
-  }
-
-  my $now = time();
-  my $founduser = 0;
-  open(SESSFILE, "$sessionfile") || error('open');
-  error('open') if -l "$tmpdir/adminsess.$$";
-  open(NEWSESS, ">$tmpdir/adminsess.$$") || error('open');
-  while (<SESSFILE>) {
-	chomp();
-	my ($user, $sess, $time, $pkgnum, $svcdomain, $domname) = split(/\s+/);
-	next if $now - $sessexpire > $time;
-	if ($username eq $user && !$founduser) {
-		if ($sess eq $sessionid) {
-			$founduser = 1;
-			next;
-		}
-	}
-	print NEWSESS "$user $sess $time $pkgnum $svcdomain $domname\n";
-  }
-  close(SESSFILE);
-  close(NEWSESS);
-  system("mv $tmpdir/adminsess.$$ $sessionfile");
-  error('sess_expired') unless $founduser;
-
-  $printheader = 0;
-
-  return 0;
-
-}
-
-# checks the username and pass against the database
-sub checkuserpass {
-
-  my $username = shift;
-  my $password = shift;
-
-  my $error = authenticate ( {
-      'authuser'         => $username,
-      '_password'        => $password,
-    } ); 
-
-  if ($error eq "$username OK") {
-    return 1;
-  }else{
-    return 0;
-  }
-
-}
-
-#printlogin prints a login page
-sub printlogin {
-
-        print "<html>$body\n";
-        print "<center><font size=4>Please login to access MAIL ADMIN</font></center>\n";
-        print "<form action=\"$cgi\" method=post>\n";
-        print "<center>Email Address: &nbsp; <input type=text name=\"username\">\n";
-        print "<br>Email Password: <input type=password name=\"password\">\n";
-        print "<br><input type=submit name=\"login\" value=\"Login\">\n";
-        print "</form></center>\n";
-        print "</body></html>\n";
-}
-
-
-#select_package chooses a administrable package if more than one exists
-sub select_package {
-        my $user = shift;
-        my $packages = list_packages($user);
-        if (scalar(@{$packages}) eq 1) {
-          $current_package = @{$packages}[0]->{'pkgnum'};
-          set_package();
-        }
-        if (scalar(@{$packages}) > 1) {
-#          print $query->redirect("$cgi\?action=list_packages");
-           print "<p>No package selected.  You must first <a href=\"$cgi\?action=list_packages\" target=\"rightmainframe\">select a package</a>.\n";
-          exit;
-        }
-}
-
-sub set_package {
-
-  my $username = $query->cookie(-name=>'username');
-  my $sessionid = $query->cookie(-name=>'ma_sessionid');
-
-  if ($sessionid eq '') {
-     printheader();
-     if ($query->param()) {
-        error('sess_expired');
-     } else {
-        printlogin();
-        exit;
-    }
-  }
-
-  my $now = time();
-  my $founduser = 0;
-  open(SESSFILE, "$sessionfile") || error('open');
-  error('open') if -l "$tmpdir/adminsess.$$";
-  open(NEWSESS, ">$tmpdir/adminsess.$$") || error('open');
-  while (<SESSFILE>) {
-	chomp();
-	my ($user, $sess, $time, $pkgnum, $svcdomain, $domname) = split(/\s+/);
-	next if $now - $sessexpire > $time;
-	if ($username eq $user && !$founduser) {
-		if ($sess eq $sessionid) {
-			$founduser = 1;
-	                print NEWSESS "$user $sess $time $current_package $current_account $current_domname\n";
-			next;
-		}
-	}
-	print NEWSESS "$user $sess $time $pkgnum $svcdomain $domname\n";
-  }
-  close(SESSFILE);
-  close(NEWSESS);
-  system("mv $tmpdir/adminsess.$$ $sessionfile");
-  error('sess_expired') unless $founduser;
-
-  $printheader = 0;
-
-  return 0;
-
-}
-
diff --git a/fs_selfadmin/FS-MailAdminServer/fs_mailadmind b/fs_selfadmin/FS-MailAdminServer/fs_mailadmind
deleted file mode 100755
index 746d7822e..000000000
--- a/fs_selfadmin/FS-MailAdminServer/fs_mailadmind
+++ /dev/null
@@ -1,366 +0,0 @@
-#!/usr/bin/perl -Tw
-
-eval 'exec /usr/bin/perl -Tw -S $0 ${1+"$@"}'
-    if 0; # not running under some shell
-#
-# fs_mailadmind
-#
-# This is run REMOTELY over ssh by fs_mailadmin_server.
-#
-
-use strict;
-use Socket;
-
-use vars qw( $Debug );
-
-$Debug = 0;
-
-my($fs_mailadmind_socket)="/usr/local/freeside/fs_mailadmind_socket";
-
-$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
-$ENV{'SHELL'} = '/bin/sh';
-$ENV{'IFS'} = " \t\n";
-$ENV{'CDPATH'} = '';
-$ENV{'ENV'} = '';
-$ENV{'BASH_ENV'} = '';
-
-$|=1;
-
-warn "[fs_mailadmind] Reading locales...\n" if $Debug;
-chomp( my $n_cust_main_county = <STDIN> );
-my @cust_main_county = map {
-  chomp( my $taxnum = <STDIN> );
-  chomp( my $state = <STDIN> );
-  chomp( my $county = <STDIN> );
-  chomp( my $country = <STDIN> );
-  {
-    'taxnum'  => $taxnum,
-    'state'   => $state,
-    'county'  => $county,
-    'country' => $country,
-  };
-} ( 1 .. $n_cust_main_county );
-
-warn "[fs_mailadmind] Reading package definitions...\n" if $Debug;
-chomp( my $n_part_pkg = <STDIN> );
-my @part_pkg = map {
-  chomp( my $pkgpart = <STDIN> );
-  chomp( my $pkg = <STDIN> );
-  {
-    'pkgpart' => $pkgpart,
-    'pkg'     => $pkg,
-  };
-} ( 1 .. $n_part_pkg );
-
-warn "[fs_mailadmind] Reading POPs...\n" if $Debug;
-chomp( my $n_svc_acct_pop = <STDIN> );
-my @svc_acct_pop = map {
-  chomp( my $popnum = <STDIN> );
-  chomp( my $city = <STDIN> );
-  chomp( my $state = <STDIN> );
-  chomp( my $ac = <STDIN> );
-  chomp( my $exch = <STDIN> );
-  chomp( my $loc = <STDIN> );
-  {
-    'popnum' => $popnum,
-    'city'   => $city,
-    'state'  => $state,
-    'ac'     => $ac,
-    'exch'   => $exch,
-    'loc'    => $loc,
-  };
-} ( 1 .. $n_svc_acct_pop );
-
-warn "[fs_mailadmind] Creating $fs_mailadmind_socket\n" if $Debug;
-my $uaddr = sockaddr_un($fs_mailadmind_socket);
-my $proto = getprotobyname('tcp');
-socket(Server,PF_UNIX,SOCK_STREAM,0) or die "socket: $!";
-unlink($fs_mailadmind_socket);
-bind(Server, $uaddr) or die "bind: $!";
-listen(Server,SOMAXCONN) or die "listen: $!";
-
-warn "[fs_mailadmind] Entering main loop...\n" if $Debug;
-my $paddr;
-for ( ; $paddr = accept(Client,Server); close Client) {
-
-  chop( my $command = <Client> );
-
-  if ( $command eq "signup_info" ) {
-    warn "[fs_mailadmind] sending signup info...\n" if $Debug; 
-    print Client join("\n", $n_cust_main_county,
-      map {
-        $_->{taxnum},
-        $_->{state},
-        $_->{county},
-        $_->{country},
-      } @cust_main_county
-    ), "\n";
-
-    print Client join("\n", $n_part_pkg,
-      map {
-        $_->{pkgpart},
-        $_->{pkg},
-      } @part_pkg
-    ), "\n";
-
-    print Client join("\n", $n_svc_acct_pop,
-      map {
-        $_->{popnum},
-        $_->{city},
-        $_->{state},
-        $_->{ac},
-        $_->{exch},
-        $_->{loc},
-      } @svc_acct_pop
-    ), "\n";
-
-  } elsif ( $command eq "new_customer" ) {
-    warn "[fs_mailadmind] reading customer signup...\n" if $Debug;
-    my(
-      $first, $last, $ss, $company, $address1, $address2, $city, $county,
-      $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
-      $paydate, $payname, $invoicing_list, $pkgpart, $username, $password,
-      $popnum,
-    ) = map { scalar(<Client>) } ( 1 .. 23 );
-
-    warn "[fs_mailadmind] sending customer data to remote server...\n" if $Debug;
-    print 
-      $first, $last, $ss, $company, $address1, $address2, $city, $county,
-      $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
-      $paydate, $payname, $invoicing_list, $pkgpart, $username, $password,
-      $popnum,
-    ;
-
-    warn "[fs_mailadmind] reading error from remote server...\n" if $Debug;
-    my $error = <STDIN>;
-
-    warn "[fs_mailadmind] sending error to local client...\n" if $Debug;
-    print Client $error;
-
-  } elsif ( $command eq "authenticate" ) {
-    warn "[fs_mailadmind] reading user information to auth...\n" if $Debug;
-    chop( my $user = <Client> );
-    warn "[fs_mailadmind] reading authentication material...\n" if $Debug;
-    chop( my $password = <Client> );
-    warn "[fs_mailadmind] sending information to remote server...\n" if $Debug;
-    print "authenticate\n", $user, "\n", $password, "\n";
-
-    warn "[fs_mailadmind] reading error from remote server...\n" if $Debug;
-    my $error = <STDIN>;
-
-    warn "[fs_mailadmind] sending error to local client...\n" if $Debug;
-    print Client $error;
-    
-  } elsif ( $command eq "list_packages" ) {
-    warn "[fs_mailadmind] reading user information to list_packages...\n" if $Debug;
-    chop( my $user = <Client> );
-    warn "[fs_mailadmind] sending user information to remote server...\n" if $Debug;
-    print "list_packages\n", $user, "\n";
-
-    warn "[fs_mailadmind] reading data from remote server...\n" if $Debug;
-    chomp( my $n_packages = <STDIN> );
-    my @packages = map {
-      chomp( my $pkgnum  = <STDIN> );
-      chomp( my $domain  = <STDIN> );
-      chomp( my $account = <STDIN> );
-      {
-        'pkgnum'  => $pkgnum,
-        'domain'  => $domain,
-        'account' => $account,
-      };
-    } ( 1 .. $n_packages );
-
-    warn "[fs_mailadmind] sending data to local client...\n" if $Debug;
-
-    print Client join("\n", $n_packages,
-      map {
-        $_->{pkgnum},
-        $_->{domain},
-        $_->{account},
-      } @packages
-    ), "\n";
-
-  } elsif ( $command eq "list_mailboxes" ) {
-    warn "[fs_mailadmind] reading user information to list_mailboxes...\n" if $Debug;
-    chop( my $user = <Client> );
-    warn "[fs_mailadmind] reading package number to list_mailboxes...\n" if $Debug;
-    chop( my $package = <Client> );
-    warn "[fs_mailadmind] sending user information to remote server...\n" if $Debug;
-    print "list_mailboxes\n", $user, "\n", $package, "\n";
-
-    warn "[fs_mailadmind] reading data from remote server...\n" if $Debug;
-    chomp( my $n_svc_acct = <STDIN> );
-    my @svc_acct = map {
-      chomp( my $svcnum = <STDIN> );
-      chomp( my $username = <STDIN> );
-      chomp( my $_password = <STDIN> );
-      {
-        'svcnum' => $svcnum,
-        'username' => $username,
-        '_password'     => $_password,
-      };
-    } ( 1 .. $n_svc_acct );
-
-    warn "[fs_mailadmind] sending data to local client...\n" if $Debug;
-
-    print Client join("\n", $n_svc_acct,
-      map {
-        $_->{svcnum},
-        $_->{username},
-        $_->{_password},
-      } @svc_acct
-    ), "\n";
-
-  } elsif ( $command eq "delete_mailbox" ) {
-    warn "[fs_mailadmind] reading user information to auth...\n" if $Debug;
-    chop( my $user = <Client> );
-    warn "[fs_mailadmind] reading account information to delete...\n" if $Debug;
-    chop( my $account = <Client> );
-    warn "[fs_mailadmind] sending information to remote server...\n" if $Debug;
-    print "delete_mailbox\n", $user, "\n", $account, "\n";
-
-    warn "[fs_mailadmind] reading error from remote server...\n" if $Debug;
-    my $error = <STDIN>;
-
-    warn "[fs_mailadmind] sending error to local client...\n" if $Debug;
-    print Client $error;
-
-  } elsif ( $command eq "password_mailbox" ) {
-    warn "[fs_mailadmind] reading user information to auth...\n" if $Debug;
-    chop( my $user = <Client> );
-    warn "[fs_mailadmind] reading account information to password...\n" if $Debug;
-    my(
-      $account, $_password,
-    ) = map { scalar(<Client>) } ( 1 .. 2 );
-
-    warn "[fs_mailadmind] sending password data to remote server...\n" if $Debug;
-    print "password_mailbox", "\n";
-    print 
-      $user, "\n", $account, $_password,
-    ;
-
-    warn "[fs_mailadmind] reading error from remote server...\n" if $Debug;
-    my $error = <STDIN>;
-
-    warn "[fs_mailadmind] sending error to local client...\n" if $Debug;
-    print Client $error;
-
-  } elsif ( $command eq "add_mailbox" ) {
-    warn "[fs_mailadmind] reading user information to auth...\n" if $Debug;
-    chop( my $user = <Client> );
-    warn "[fs_mailadmind] reading account information to create...\n" if $Debug;
-    my(
-      $package, $account, $_password,
-    ) = map { scalar(<Client>) } ( 1 .. 3 );
-
-    warn "[fs_mailadmind] sending service data to remote server...\n" if $Debug;
-    print "add_mailbox", "\n";
-    print 
-      $user, "\n", $package, $account, $_password,
-    ;
-
-    warn "[fs_mailadmind] reading error from remote server...\n" if $Debug;
-    my $error = <STDIN>;
-
-    warn "[fs_mailadmind] sending error to local client...\n" if $Debug;
-    print Client $error;
-
-  } elsif ( $command eq "add_forward" ) {
-    warn "[fs_mailadmind] reading user information to auth...\n" if $Debug;
-    chop( my $user = <Client> );
-    warn "[fs_mailadmind] reading forward information to create...\n" if $Debug;
-    my(
-      $package, $source, $dest,
-    ) = map { scalar(<Client>) } ( 1 .. 3 );
-
-    warn "[fs_mailadmind] sending service data to remote server...\n" if $Debug;
-    print "add_forward", "\n";
-    print 
-      $user, "\n", $package, $source, $dest,
-    ;
-
-    warn "[fs_mailadmind] reading error from remote server...\n" if $Debug;
-    my $error = <STDIN>;
-
-    warn "[fs_mailadmind] sending error to local client...\n" if $Debug;
-    print Client $error;
-
-  } elsif ( $command eq "delete_forward" ) {
-    warn "[fs_mailadmind] reading user information to auth...\n" if $Debug;
-    chop( my $user = <Client> );
-    warn "[fs_mailadmind] reading forward information to delete...\n" if $Debug;
-    chop( my $service = <Client> );
-    warn "[fs_mailadmind] sending information to remote server...\n" if $Debug;
-    print "delete_forward\n", $user, "\n", $service, "\n";
-
-    warn "[fs_mailadmind] reading error from remote server...\n" if $Debug;
-    my $error = <STDIN>;
-
-    warn "[fs_mailadmind] sending error to local client...\n" if $Debug;
-    print Client $error;
-
-  } elsif ( $command eq "list_forwards" ) {
-    warn "[fs_mailadmind] reading user information to list_forwards...\n" if $Debug;
-    chop( my $user = <Client> );
-    warn "[fs_mailadmind] reading service number to list_forwards...\n" if $Debug;
-    chop( my $service = <Client> );
-    warn "[fs_mailadmind] sending user information to remote server...\n" if $Debug;
-    print "list_forwards\n", $user, "\n", $service, "\n";
-
-    warn "[fs_mailadmind] reading data from remote server...\n" if $Debug;
-    chomp( my $n_svc_forward = <STDIN> );
-    my @svc_forward = map {
-      chomp( my $svcnum = <STDIN> );
-      chomp( my $dest = <STDIN> );
-      {
-        'svcnum' => $svcnum,
-        'dest' => $dest,
-      };
-    } ( 1 .. $n_svc_forward );
-
-    warn "[fs_mailadmind] sending data to local client...\n" if $Debug;
-
-    print Client join("\n", $n_svc_forward,
-      map {
-        $_->{svcnum},
-        $_->{dest},
-      } @svc_forward
-    ), "\n";
-
-  } elsif ( $command eq "list_pkg_forwards" ) {
-    warn "[fs_mailadmind] reading user information to list_pkg_forwards...\n" if $Debug;
-    chop( my $user = <Client> );
-    warn "[fs_mailadmind] reading service number to list_forwards...\n" if $Debug;
-    chop( my $package = <Client> );
-    warn "[fs_mailadmind] sending user information to remote server...\n" if $Debug;
-    print "list_pkg_forwards\n", $user, "\n", $package, "\n";
-
-    warn "[fs_mailadmind] reading data from remote server...\n" if $Debug;
-    chomp( my $n_svc_forward = <STDIN> );
-    my @svc_forward = map {
-      chomp( my $svcnum = <STDIN> );
-      chomp( my $srcsvc = <STDIN> );
-      chomp( my $dest = <STDIN> );
-      {
-        'svcnum' => $svcnum,
-        'srcsvc' => $srcsvc,
-        'dest' => $dest,
-      };
-    } ( 1 .. $n_svc_forward );
-
-    warn "[fs_mailadmind] sending data to local client...\n" if $Debug;
-
-    print Client join("\n", $n_svc_forward,
-      map {
-        $_->{svcnum},
-        $_->{srcsvc},
-        $_->{dest},
-      } @svc_forward
-    ), "\n";
-
-  } else {
-    die "unexpected command from client: $command";
-  }
-
-}
-
diff --git a/fs_selfadmin/README b/fs_selfadmin/README
deleted file mode 100644
index d9857f054..000000000
--- a/fs_selfadmin/README
+++ /dev/null
@@ -1,27 +0,0 @@
-
-This collection of files implements a 'self-administered mail service.'
-Configuration is similar to fs_signupd
-
-Additionally you will need to modify the database:
-
-CREATE TABLE svc_acct_admin (
-  svcnum int primary key,
-  adminsvc int not null
-);
-
-creating both as keys might be good
-
-(and perform the dbdef-create)
-
-
-As it exists now, a package containing one svc_domain, at least one
-svc_acct_admin, and other services can have its svc_acct's and svc_forward's
-manipulated by the svc_acct referenced by a svc_acct_admin in the package.
-
-One svc_acct may be referenced as svc_acct_admin for multiple packages.
-
-fs_mailadmin_server contains hard coded references to service numbers which
-will require editing for your system.
-
-It's not a lot, but it might provide inspiration.
-
diff --git a/fs_selfadmin/fs_mailadmin_server b/fs_selfadmin/fs_mailadmin_server
deleted file mode 100755
index ef4788543..000000000
--- a/fs_selfadmin/fs_mailadmin_server
+++ /dev/null
@@ -1,642 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# fs_mailadmin_server
-#
-
-use strict;
-use IO::Handle;
-use FS::SSH qw(sshopen2);
-use FS::UID qw(adminsuidsetup);
-use FS::Conf;
-use FS::Record qw( qsearch qsearchs );
-use FS::cust_main_county;
-use FS::cust_main;
-use FS::svc_acct_admin;
-
-use vars qw( $opt $Debug $conf $default_domain );
-
-$Debug = 1;
-
-#my @payby = qw(CARD PREPAY);
-
-my $user = shift or die &usage;
-&adminsuidsetup( $user ); 
-
-$conf = new FS::Conf;
-$default_domain = $conf->config('domain');
-
-my $machine = shift or die &usage;
-
-my $agentnum = shift or die &usage;
-my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } ) or die &usage;
-my $pkgpart = $agent->pkgpart_hashref;
-
-my $refnum = shift or die &usage;
-
-#causing trouble for some folks
-#$SIG{CHLD} = sub { wait() };
-
-my($fs_mailadmind)=$conf->config('fs_mailadmind');
-
-while (1) {
-  my($reader,$writer)=(new IO::Handle, new IO::Handle);
-  $writer->autoflush(1);
-  warn "[fs_mailadmin_server] Connecting to $machine...\n" if $Debug;
-  sshopen2($machine,$reader,$writer,$fs_mailadmind);
-
-  my $data;
-
-  warn "[fs_mailadmin_server] Sending locales...\n" if $Debug;
-  my @cust_main_county = qsearch('cust_main_county', {} );
-  print $writer $data = join("\n",
-    ( scalar(@cust_main_county) || die "no tax rates (cust_main_county records)" ),
-    map {
-      $_->taxnum,
-      $_->state,
-      $_->county,
-      $_->country,
-    } @cust_main_county
-  ),"\n";
-  warn "[fs_mailadmin_server] $data\n" if $Debug > 2;
-
-  warn "[fs_mailadmin_server] Sending package definitions...\n" if $Debug;
-  my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } }
-    qsearch( 'part_pkg', {} );
-  print $writer $data = join("\n",
-    ( scalar(@part_pkg) || die "no usable package definitions, agent $agentnum" ),
-    map {
-      $_->pkgpart,
-      $_->pkg,
-    } @part_pkg
-  ), "\n";
-  warn "[fs_mailadmin_server] $data\n" if $Debug > 2;
-
-  warn "[fs_mailadmin_server] Sending POPs...\n" if $Debug;
-  my @svc_acct_pop = qsearch ('svc_acct_pop',{} );
-  print $writer $data = join("\n",
-    ( scalar(@svc_acct_pop) || die "No points of presence (svc_acct_pop records)" ),
-    map {
-      $_->popnum,
-      $_->city,
-      $_->state,
-      $_->ac,
-      $_->exch,
-      $_->loc,
-    } @svc_acct_pop
-  ), "\n";
-  warn "[fs_mailadmin_server] $data\n" if $Debug > 2;
-
-  warn "[fs_mailadmin_server] Entering main loop...\n" if $Debug;
-COMMAND:  while (1) {
-    warn "[fs_mailadmin_server] Reading (waiting for) command...\n" if $Debug;
-    chop( my($command, $user) = map { scalar(<$reader>) } ( 1 .. 2 ) );
-    my $domain = $default_domain;
-    $user =~ /^([\w\.\-]+)\@(([\w\-]+\.)+\w+)$/;
-    ($user, $domain) = ($1, $2);
-
-    if ($command eq 'authenticate'){
-      warn "[fs_mailadmin_server] Processing authenticate command for $user \n" if $Debug;
-      chop( my($password) = map { scalar(<$reader>) } ( 1 .. 1 ) );
-
-      my $error = '';
-
-      my @svc_domain = qsearchs('svc_domain', { 'domain'   => $domain });
-
-      if (scalar(@svc_domain) != 1) {
-        warn "Nonexistant or duplicate service account for \"$domain\"";
-        next COMMAND;
-      }
-
-      my @svc_acct = qsearchs('svc_acct', { 'username' => $user,
-                                            'domsvc'   => $svc_domain[0]->svcnum });
-      if (scalar(@svc_acct) != 1) {
-        die "Nonexistant or duplicate service account for \"$user\"";
-        next COMMAND;
-      }
-
-      if ($svc_acct[0]->_password eq $password) {
-        $error = "$user\@$domain OK";
-      }else{
-        $error = "$user\@$domain FAILED";
-      }
-      warn "[fs_mailadmin_server] Sending results...\n" if $Debug;
-      print $writer $error, "\n";
-    }
-    elsif ($command eq 'list_packages'){
-      warn "[fs_mailadmin_server] Processing list_packages command for $user \n" if $Debug;
-
-      my $error = '';
-
-      my @packages = eval {find_administrable_packages( $user, $domain )};
-      warn "$@" if $@; 
-
-      my %packages;
-      my %accounts;
-
-      foreach my $package (@packages) {
-        $packages{my $pkgnum = $package->getfield('pkgnum')} = $default_domain;
-        $accounts{$pkgnum} = 0;
-        my @services = qsearch('cust_svc', { 'pkgnum' => $pkgnum });
-        foreach my $service (@services) {
-          if ($service->getfield('svcpart') eq '4'){
-            my $account=qsearchs('svc_domain', { 'svcnum' => $service->getfield('svcnum') });
-            $packages{$pkgnum}=$account->getfield('domain');
-            $accounts{$pkgnum}=$account->getfield('svcnum');
-          }
-        }
-      }
-      
-      print $writer $data = join("\n",
-        ( scalar(keys(%packages)) ),
-        map {
-          $_,
-          $packages{$_},
-          $accounts{$_},
-        } keys(%packages)
-      ), "\n";
-      warn "[fs_mailadmin_server] $data\n" if $Debug > 2;
-
-    }elsif ($command eq 'list_mailboxes'){
-
-      warn "[fs_mailadmin_server] Processing list_mailboxes command for $user" if $Debug;
-      chop( my($pkgnum) = map { scalar(<$reader>) } ( 1 .. 1 ) );
-      warn "package $pkgnum \n" if $Debug;
-
-      my $error = '';
-
-      my @packages = eval {find_administrable_packages( $user, $domain )};
-      warn "$@" if $@; 
-
-      my @accounts;
-
-      foreach my $package (@packages) {
-        next unless ($pkgnum eq $package->getfield('pkgnum'));
-        my @services = qsearch('cust_svc', { 'pkgnum' => $package->getfield('pkgnum') });
-        foreach my $service (@services) {
-          if ($service->getfield('svcpart') eq '2'){
-            my $account=qsearchs('svc_acct', { 'svcnum' => $service->getfield('svcnum') });
-#           $accounts[$#accounts+1]=$account->getfield('username');
-            $accounts[$#accounts+1]=$account;
-          }
-        }
-      }
-      
-      print $writer $data = join("\n",
-#        ( scalar(@accounts) || die "No accounts (svc_acct records)" ),
-        ( scalar(@accounts) ),
-        map {
-          $_->svcnum,
-#          $_->username,
-          $_->email,
-#          $_->_password,
-          '*****',
-        } @accounts
-      ), "\n";
-      warn "[fs_mailadmin_server] $data\n" if $Debug > 2;
-
-      
-    } elsif ($command eq 'delete_mailbox'){
-      warn "[fs_mailadmin_server] Processing delete_mailbox command for $user " if $Debug;
-      chop( my($account) = map { scalar(<$reader>) } ( 1 .. 1 ) );
-      warn "account $account \n" if $Debug;
-
-      my $error = '';
-
-      my @packages = eval { find_administrable_packages($user, $domain) };
-      warn "$@" if $@; 
-      $error ||= "$@" if $@; 
-
-      my @svc_acct = qsearchs('svc_acct', { 'svcnum' => $account }) unless $error;
-      if (scalar(@svc_acct) != 1) { $error ||= 'Nonexistant or duplicate service account for user.' };
-      if (! $error && check_administrator(\@packages, $svc_acct[0])){
-# not sure about the next three lines... do we delete? or return error
-        foreach my $svc_forward (qsearch('svc_forward', { 'dstsvc' => $svc_acct[0]->getfield('svcnum') })) {
-          $error ||= $svc_forward->delete;
-        }
-        foreach my $svc_forward (qsearch('svc_forward', { 'srcsvc' => $svc_acct[0]->getfield('svcnum') })) {
-          $error ||= $svc_forward->delete;
-        }
-        $error ||= $svc_acct[0]->delete;
-      } else {
-        $error ||= "Illegal attempt to remove service";
-      }
-
-      
-      warn "[fs_mailadmin_server] Sending results...\n" if $Debug;
-      print $writer $error, "\n";
-      
-    } elsif ($command eq 'password_mailbox'){
-      warn "[fs_mailadmin_server] Processing password_mailbox command for $user " if $Debug;
-      chop( my($account, $_password) = map { scalar(<$reader>) } ( 1 .. 2 ) );
-      warn "account $account with password $_password \n" if $Debug;
-
-      my $error = '';
-
-      my @packages = eval { find_administrable_packages($user, $domain) };
-      warn "$@" if $@; 
-      $error ||= "$@" if $@; 
-
-      my @svc_acct = qsearchs('svc_acct', { 'svcnum' => $account }) unless $error;
-      if (scalar(@svc_acct) != 1) { $error ||= 'Nonexistant or duplicate service account.' };
-
-      if (! $error && check_administrator(\@packages, $svc_acct[0])){
-        my $new = new FS::svc_acct ({$svc_acct[0]->hash});
-        $new->setfield('_password' => $_password);
-        $error ||= $new->replace($svc_acct[0]);
-      } else {
-        $error ||= "Illegal attempt to change password";
-      }
-
-      
-      warn "[fs_mailadmin_server] Sending results...\n" if $Debug;
-      print $writer $error, "\n";
-      
-    } elsif ($command eq 'add_mailbox'){
-      warn "[fs_mailadmin_server] Processing add_mailbox command for $user " if $Debug;
-      chop( my($target_package, $account, $_password) = map { scalar(<$reader>) } ( 1 .. 3 ) );
-      warn "in package $target_package account $account with password $_password \n" if $Debug;
-
-      my $found_package;
-      my $domainsvc=0;
-      my $svcpart=2;    # this is 'email box'
-      my $svcpartsm=3;  # this is 'domain alias'
-      my $error = '';
-      my $found = 0;
-
-      my @packages = eval { find_administrable_packages($user, $domain) };
-      warn "$@" if $@; 
-      $error ||= "$@" if $@; 
-
-      foreach my $package (@packages) {
-        if ($package->getfield('pkgnum') eq $target_package) {
-          $found = 1;
-          $found_package=$package;
-          my @services = qsearch('cust_svc', { 'pkgnum' => $target_package });
-          foreach my $service (@services) {
-            if ($service->getfield('svcpart') eq '4'){
-              my @svc_domain=qsearchs('svc_domain', { 'svcnum' => $service->getfield('svcnum') });
-              if (scalar(@svc_domain) eq 1) {
-                $domainsvc=$svc_domain[0]->getfield('svcnum');
-              }
-            }
-          }
-          last;
-        }
-      }
-      warn "User $user does not have administration rights to package $target_package\n" unless $found;
-      $error ||= "User $user does not have administration rights to package $target_package\n" unless $found;
-
-      my $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$found_package->getfield('pkgpart')});
-
-      #list of services this pkgpart includes (although at the moment we only care
-      #  about $svcpart
-      my $pkg_svc;
-      my %pkg_svc = ();
-      foreach $pkg_svc ( qsearch('pkg_svc',{'pkgpart'=> $found_package->pkgpart }) ) {
-        $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity if $pkg_svc->quantity;
-      }
-
-      my @services = qsearch('cust_svc', {'pkgnum'  => $found_package->getfield('pkgnum'),
-                                          'svcpart' => $svcpart,
-                                         });
-
-      if (scalar(@services) >= $pkg_svc{$svcpart}) {
-        $error="Maximum allowed already reached.";
-      }
-      
-      my $svc_acct = new FS::svc_acct ( {
-        'pkgnum'    => $found_package->pkgnum,
-        'svcpart'   => $svcpart,
-        'username'  => $account,
-        'domsvc'    => $domainsvc,
-        '_password' => $_password,
-      } );
-
-      my $y = $svc_acct->setdefault; # arguably should be in new method
-      $error ||= $y unless ref($y);
-      #and just in case you were silly
-      $svc_acct->pkgnum($found_package->pkgnum);
-      $svc_acct->svcpart($svcpart);
-      $svc_acct->username($account);
-      $svc_acct->domsvc($domainsvc);
-      $svc_acct->_password($_password);
-
-      $error ||= $svc_acct->check;
-
-      if ( ! $error ) { #in this case, $cust_pkg should always
-                                     #be definied, but....
-        $error ||= $svc_acct->insert;
-        warn "WARNING: $error on pre-checked svc_acct record!" if $error;
-      }
-
-      warn "[fs_mailadmin_server] Sending results...\n" if $Debug;
-      print $writer $error, "\n";
-      
-    }elsif ($command eq 'list_forwards'){
-
-      warn "[fs_mailadmin_server] Processing list_forwards command for $user" if $Debug;
-      chop( my($svcnum) = map { scalar(<$reader>) } ( 1 .. 1 ) );
-      warn "service $svcnum \n" if $Debug;
-
-      my $error = '';
-
-      my @packages = eval {find_administrable_packages( $user, $domain )};
-      warn "$@" if $@; 
-
-      my @forwards;
-
-      foreach my $package (@packages) {
-#        next unless ($pkgnum eq $package->getfield('pkgnum'));
-        my @services = qsearch('cust_svc', { 'pkgnum' => $package->getfield('pkgnum') });
-        foreach my $service (@services) {
-          if ($service->getfield('svcpart') eq '10'){
-            my $forward=qsearchs('svc_forward', { 'svcnum' => $service->getfield('svcnum') });
-            $forwards[$#forwards+1]=$forward if ($forward->getfield('srcsvc') == $svcnum);
-          }
-        }
-      }
-      
-      print $writer $data = join("\n",
-        ( scalar(@forwards) ),
-        map {
-          $_->svcnum,
-          ($_->dstsvc ? qsearchs('svc_acct', {'svcnum' => $_->dstsvc})->email : $_->dst),
-        } @forwards
-      ), "\n";
-      warn "[fs_mailadmin_server] $data\n" if $Debug > 2;
-
-      
-    }elsif ($command eq 'list_pkg_forwards'){
-
-      warn "[fs_mailadmin_server] Processing list_pkg_forwards command for $user" if $Debug;
-      chop( my($pkgnum) = map { scalar(<$reader>) } ( 1 .. 1 ) );
-      warn "package $pkgnum \n" if $Debug;
-
-      my $error = '';
-
-      my @packages = eval {find_administrable_packages( $user, $domain )};
-      warn "$@" if $@; 
-
-      my @forwards;
-
-      foreach my $package (@packages) {
-        next unless ($pkgnum eq $package->getfield('pkgnum'));
-        my @services = qsearch('cust_svc', { 'pkgnum' => $package->getfield('pkgnum') });
-        foreach my $service (@services) {
-          if ($service->getfield('svcpart') eq '10'){
-            my $forward=qsearchs('svc_forward', { 'svcnum' => $service->getfield('svcnum') });
-            $forwards[$#forwards+1]=$forward;
-          }
-        }
-      }
-      
-      print $writer $data = join("\n",
-        ( scalar(@forwards) ),
-        map {
-          $_->svcnum,
-          $_->srcsvc,
-          ($_->dstsvc ? qsearchs('svc_acct', {'svcnum' => $_->dstsvc})->email : $_->dst),
-        } @forwards
-      ), "\n";
-      warn "[fs_mailadmin_server] $data\n" if $Debug > 2;
-
-      
-    } elsif ($command eq 'delete_forward'){
-      warn "[fs_mailadmin_server] Processing delete_forward command for $user " if $Debug;
-      chop( my($forward) = map { scalar(<$reader>) } ( 1 .. 1 ) );
-      warn "forward $forward \n" if $Debug;
-
-      my $error = '';
-
-      my @packages = eval { find_administrable_packages($user, $domain) };
-      warn "$@" if $@; 
-      $error ||= "$@" if $@; 
-
-      my @svc_forward = qsearchs('svc_forward', { 'svcnum' => $forward }) unless $error;
-      if (scalar(@svc_forward) != 1) { $error ||= 'Nonexistant or duplicate service account for user.' };
-      if (! $error && check_administrator(\@packages, $svc_forward[0])){
-# not sure about the next three lines... do we delete? or return error
-        $error ||= $svc_forward[0]->delete;
-      } else {
-        $error ||= "Illegal attempt to remove service";
-      }
-
-      
-      warn "[fs_mailadmin_server] Sending results...\n" if $Debug;
-      print $writer $error, "\n";
-      
-    } elsif ($command eq 'add_forward'){
-      warn "[fs_mailadmin_server] Processing add_forward command for $user " if $Debug;
-      chop( my($target_package, $source, $dest) = map { scalar(<$reader>) } ( 1 .. 3 ) );
-      warn "in package $target_package source $source with destination $dest \n" if $Debug;
-
-      my $found_package;
-      my $domainsvc=0;
-      my $svcpart=10;   # this is 'forward service'
-      my $error = '';
-      my $found = 0;
-
-      my @packages = eval { find_administrable_packages($user, $domain) };
-      warn "$@" if $@; 
-      $error ||= "$@" if $@; 
-
-      foreach my $package (@packages) {
-        if ($package->getfield('pkgnum') eq $target_package) {
-          $found = 1;
-          $found_package=$package;
-          last;
-        }
-      }
-      warn "User $user does not have administration rights to package $target_package\n" unless $found;
-      $error ||= "User $user does not have administration rights to package $target_package\n" unless $found;
-
-      my $svc_acct = qsearchs('svc_acct', { 'svcnum' => $source });
-      warn "Forwarding source $source does not exist.\n" unless $svc_acct;
-      $error ||= "Forwarding source $source does not exist.\n" unless $svc_acct;
-
-      my $cust_svc = qsearchs('cust_svc', { 'svcnum' => $source });
-      warn "Forwarding source $source not attached to any account.\n" unless $cust_svc;
-      $error ||= "Forwarding source $source not attached to any account.\n" unless $cust_svc;
-
-      if ( ! $error ) {
-        warn "Forwarding source $source is not in package $target_package\n"
-          unless ($cust_svc->getfield('pkgnum') == $target_package);
-        $error ||= "Forwarding source $source is not in package $target_package\n"
-          unless ($cust_svc->getfield('pkgnum') == $target_package);
-      }
-
-      my $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$found_package->getfield('pkgpart')});
-
-      #list of services this pkgpart includes (although at the moment we only care
-      #  about $svcpart
-      my $pkg_svc;
-      my %pkg_svc = ();
-      foreach $pkg_svc ( qsearch('pkg_svc',{'pkgpart'=> $found_package->pkgpart }) ) {
-        $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity if $pkg_svc->quantity;
-      }
-
-      my @services = qsearch('cust_svc', {'pkgnum'  => $found_package->getfield('pkgnum'),
-                                          'svcpart' => $svcpart,
-                                         });
-
-      if (scalar(@services) >= $pkg_svc{$svcpart}) {
-        $error="Maximum allowed already reached.";
-      }
-      
-      my $svc_forward = new FS::svc_forward ( {
-        'pkgnum'    => $found_package->pkgnum,
-        'svcpart'   => $svcpart,
-        'srcsvc'  => $source,
-        'dstsvc'    => 0,
-        'dst' => $dest,
-      } );
-
-      my $y = $svc_forward->setdefault; # arguably should be in new method
-      $error ||= $y unless ref($y);
-      #and just in case you were silly
-      $svc_forward->pkgnum($found_package->pkgnum);
-      $svc_forward->svcpart($svcpart);
-      $svc_forward->srcsvc($source);
-      $svc_forward->dstsvc(0);
-      $svc_forward->dst($dest);
-
-      $error ||= $svc_forward->check;
-
-      if ( ! $error ) { #in this case, $cust_pkg should always
-                                     #be definied, but....
-        $error ||= $svc_forward->insert;
-        warn "WARNING: $error on pre-checked svc_forward record!" if $error;
-      }
-
-      warn "[fs_mailadmin_server] Sending results...\n" if $Debug;
-      print $writer $error, "\n";
-      
-    } else {
-      warn "[fs_mailadmin_server] Bad command: $command \n" if $Debug;
-      print $writer "Bad command \n";
-    }
-  }
-  close $writer;
-  close $reader;
-  warn "connection to $machine lost!  waiting 60 seconds...\n";
-  sleep 60;
-  warn "reconnecting...\n";
-}
-
-sub usage {
-  die "Usage:\n\n  fs_mailadmin_server user machine agentnum refnum\n";
-}
-
-#sub find_administrable_packages {
-#      my $user = shift;
-#
-#      my $error = '';
-#
-#      my @svc_acct = qsearchs('svc_acct', { 'username' => $user });
-#      if (scalar(@svc_acct) != 1) {
-#        die "Nonexistant or duplicate service account for \"$user\"";
-#      }
-#
-#      my @cust_svc = qsearchs('cust_svc', { 'svcnum' => $svc_acct[0]->getfield('svcnum') });
-#      if (scalar(@cust_svc) != 1 ) {
-#        die "Nonexistant or duplicate customer service for \"$user\"";
-#      }
-#
-#      my @cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_svc[0]->getfield('pkgnum') });
-#      if (scalar(@cust_pkg) != 1) {
-#        die "Nonexistant or duplicate customer package for \"$user\"";
-#      }
-#
-#      my @cust_main = qsearchs('cust_main', { 'custnum' => $cust_pkg[0]->getfield('custnum') });
-#      if (scalar(@cust_main) != 1 ) {
-#        die "Nonexistant or duplicate customer for \"$user\"";
-#      }
-#
-#      my @packages = $cust_main[0]->ncancelled_pkgs;
-#}
-
-sub find_administrable_packages {
-      my $user = shift;
-      my $domain = shift;
-
-      my @packages;
-      my $error = '';
-
-      my @svc_domain = qsearchs('svc_domain', { 'domain'   => $domain });
-
-      if (scalar(@svc_domain) != 1) {
-        die "Nonexistant or duplicate service account for \"$domain\"";
-      }
-
-      my @svc_acct = qsearchs('svc_acct', { 'username' => $user,
-                                            'domsvc'   => $svc_domain[0]->svcnum });
-      if (scalar(@svc_acct) != 1) {
-        die "Nonexistant or duplicate service account for \"$user\"";
-      }
-
-      my @svc_acct_admin = qsearch('svc_acct_admin', {'adminsvc' => $svc_acct[0]->getfield('svcnum') });
-      die "Nonexistant or duplicate customer service for \"$user\"" unless scalar(@svc_acct_admin);
-
-      foreach my $svc_acct_admin (@svc_acct_admin) {
-        my @cust_svc = qsearchs('cust_svc', { 'svcnum' => $svc_acct_admin->getfield('svcnum') });
-        if (scalar(@cust_svc) != 1 ) {
-          die "Nonexistant or duplicate customer service for admin \"$svc_acct_admin->getfield('svcnum')\"";
-        }
-
-        my @cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_svc[0]->getfield('pkgnum') });
-        if (scalar(@cust_pkg) != 1) {
-          die "Nonexistant or duplicate customer package for admin \"$user\"";
-        }
-
-        push @packages, $cust_pkg[0] unless $cust_pkg[0]->getfield('cancel');
-
-      }
-      (@packages);
-}
-
-sub check_administrator {
-      my ($allowed_packages_aref, $svc_acct_ref) = @_;
-
-      my $error = '';
-      my $found = 0;
-
-      {
-        my @cust_svc = qsearchs('cust_svc', { 'svcnum' => $svc_acct_ref->getfield('svcnum') });
-        if (scalar(@cust_svc) != 1 ) {
-          warn "Nonexistant or duplicate customer service for \"$svc_acct_ref->getfield('username')\"";
-          last;
-        }
-
-        my @cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_svc[0]->getfield('pkgnum') });
-        if (scalar(@cust_pkg) != 1) {
-          warn "Nonexistant or duplicate customer package for \"$svc_acct_ref->getfield('username')\"";
-          last;
-        }
-
-        foreach my $package (@$allowed_packages_aref) {
-          if ($package->getfield('pkgnum') eq $cust_pkg[0]->getfield('pkgnum')) {
-            $found = 1;
-            last;
-          }
-        }
-      }
-
-      $found;
-}
-
-sub check_add {
-      my ($allowed_packages_aref, $target_package) = @_;
-
-      my $error = '';
-      my $found = 0;
-
-      foreach my $package (@$allowed_packages_aref) {
-        if ($package->getfield('pkgnum') eq $target_package) {
-          $found = 1;
-          last;
-        }
-      }
-
-      $found;
-}
-
diff --git a/fs_selfservice/DEPLOY b/fs_selfservice/DEPLOY
deleted file mode 100755
index 7c68e78ec..000000000
--- a/fs_selfservice/DEPLOY
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-( cd ..; make deploy; cd fs_selfservice )
-
-cd FS-SelfService
-perl Makefile.PL && make && make install
-
-cd ..
-kill `cat /var/run/freeside-selfservice-server.ivan.pid`; sleep 3
-./freeside-selfservice-server ivan localhost
-
-cp /home/ivan/freeside_current/fs_selfservice/FS-SelfService/cgi/* /var/www/MyAccount
-chown freeside /var/www/MyAccount/selfservice.cgi
-chmod 4755 /var/www/MyAccount/selfservice.cgi
-ln -s /var/www/MyAccount/selfservice.cgi /var/www/MyAccount/index.cgi
diff --git a/fs_selfservice/FS-SelfService/Changes b/fs_selfservice/FS-SelfService/Changes
deleted file mode 100644
index b9e26b7dc..000000000
--- a/fs_selfservice/FS-SelfService/Changes
+++ /dev/null
@@ -1,6 +0,0 @@
-Revision history for Perl extension FS::SelfService.
-
-0.01  Tue May 28 16:49:41 2002
-	- original version; created by h2xs 1.21 with options
-		-A -X -n FS::SelfService
-
diff --git a/fs_selfservice/FS-SelfService/MANIFEST b/fs_selfservice/FS-SelfService/MANIFEST
deleted file mode 100644
index ebd0d3b1a..000000000
--- a/fs_selfservice/FS-SelfService/MANIFEST
+++ /dev/null
@@ -1,6 +0,0 @@
-Changes
-Makefile.PL
-MANIFEST
-SelfService.pm
-test.pl
-freeside-selfservice-clientd
diff --git a/fs_selfservice/FS-SelfService/Makefile.PL b/fs_selfservice/FS-SelfService/Makefile.PL
deleted file mode 100644
index da0a0aa24..000000000
--- a/fs_selfservice/FS-SelfService/Makefile.PL
+++ /dev/null
@@ -1,15 +0,0 @@
-use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-WriteMakefile(
-    'NAME'		=> 'FS::SelfService',
-    'VERSION_FROM'	=> 'SelfService.pm', # finds $VERSION
-    'EXE_FILES'         => [ 'freeside-selfservice-clientd' ],
-    'INSTALLSCRIPT'     => '/usr/local/sbin',
-    'INSTALLSITEBIN'    => '/usr/local/sbin',
-    'PERM_RWX'          => '750',
-    'PREREQ_PM'		=> {}, # e.g., Module::Name => 1.1
-    ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
-      (ABSTRACT_FROM => 'SelfService.pm', # retrieve abstract from module
-       AUTHOR     => 'Ivan Kohler <ivan-freeside-selfservice@420.am>') : ()),
-);
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
deleted file mode 100644
index 9019ea4f8..000000000
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ /dev/null
@@ -1,112 +0,0 @@
-package FS::SelfService;
-
-use strict;
-use vars qw($VERSION @ISA @EXPORT_OK $socket %autoload );
-use Exporter;
-use Socket;
-use FileHandle;
-#use IO::Handle;
-use IO::Select;
-use Storable qw(nstore_fd fd_retrieve);
-
-$VERSION = '0.03';
-
-@ISA = qw( Exporter );
-
-$socket =  "/usr/local/freeside/selfservice_socket";
-
-%autoload = (
-  'passwd'        => 'passwd/passwd',
-  'chfn'          => 'passwd/passwd',
-  'chsh'          => 'passwd/passwd',
-  'login'         => 'MyAccount/login',
-  'customer_info' => 'MyAccount/customer_info',
-  'invoice'       => 'MyAccount/invoice',
-);
-@EXPORT_OK = keys %autoload;
-
-$ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin';
-$ENV{'SHELL'} = '/bin/sh';
-$ENV{'IFS'} = " \t\n";
-$ENV{'CDPATH'} = '';
-$ENV{'ENV'} = '';
-$ENV{'BASH_ENV'} = '';
-
-my $freeside_uid = scalar(getpwnam('freeside'));
-die "not running as the freeside user\n" if $> != $freeside_uid;
-
-=head1 NAME
-
-FS::SelfService - Freeside self-service API
-
-=head1 SYNOPSIS
-
-=head1 DESCRIPTION
-
-Use this API to implement your own client "self-service" module.
-
-If you just want to customize the look of the existing "self-service" module,
-see XXXX instead.
-
-=head1 FUNCTIONS
-
-=over 4
-
-=item passwd
-
-Returns the empty value on success, or an error message on errors.
-
-=cut
-
-foreach my $autoload ( keys %autoload ) {
-
-  my $eval =
-  "sub $autoload { ". '
-                   my $param;
-                   if ( ref($_[0]) ) {
-                     $param = shift;
-                   } else {
-                     $param = { @_ };
-                   }
-
-                   $param->{_packet} = \''. $autoload{$autoload}. '\';
-
-                   simple_packet($param);
-                 }';
-
-  eval $eval;
-  die $@ if $@;
-
-}
-
-sub simple_packet {
-  my $packet = shift;
-  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($socket)) or die "connect: $!";
-  nstore_fd($packet, \*SOCK) or die "can't send packet: $!";
-  SOCK->flush;
-
-  #shoudl trap: Magic number checking on storable file failed at blib/lib/Storable.pm (autosplit into blib/lib/auto/Storable/fd_retrieve.al) line 337, at /usr/local/share/perl/5.6.1/FS/SelfService.pm line 71
-
-  #block until there is a message on socket
-#  my $w = new IO::Select;
-#  $w->add(\*SOCK);
-#  my @wait = $w->can_read;
-  my $return = fd_retrieve(\*SOCK) or die "error reading result: $!";
-  die $return->{'_error'} if defined $return->{_error} && $return->{_error};
-
-  $return;
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<freeside-selfservice-clientd>, L<freeside-selfservice-server>
-
-=cut
-
-1;
-
diff --git a/fs_selfservice/FS-SelfService/cgi/login.html b/fs_selfservice/FS-SelfService/cgi/login.html
deleted file mode 100644
index dfbd0137a..000000000
--- a/fs_selfservice/FS-SelfService/cgi/login.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<HTML><HEAD><TITLE>Login</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=5>Login</FONT><BR><BR>
-<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
-<FORM ACTION="<%= $self_url %>" METHOD=POST>
-<INPUT TYPE="hidden" NAME="session" VALUE="login">
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=2 CELLPADDING=0>
-<TR>
-  <TH ALIGN="right">Username </TH>
-  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right">Domain </TH>
-  <TD><INPUT TYPE="text" NAME="domain" VALUE="<%= $domain %>"></TD>
-</TR>
-<!--<INPUT TYPE="hidden" NAME="domain" VALUE="myisp.com">-->
-<TR>
-  <TH ALIGN="right">Password </TH>
-  <TD><INPUT TYPE="password" NAME="password"></TD>
-</TR>
-</TABLE>
-<BR><BR><INPUT TYPE="submit" VALUE="Login">
-</FORM></BODY></HTML>
-
diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount.html b/fs_selfservice/FS-SelfService/cgi/myaccount.html
deleted file mode 100644
index f8a916eea..000000000
--- a/fs_selfservice/FS-SelfService/cgi/myaccount.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
-<%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<TABLE BORDER=0 CELLPADDING=4><TR><TD VALIGN="top" HEIGHT=384 BGCOLOR="#dddddd">
-<A HREF="<%= $url %>myaccount">MyAccount</A><BR>
-<A HREF="<%= $url %>other">SomethingElse</A><BR>
-</TD><TD VALIGN="top">
-
-Hello <%= $name %>!<BR><BR>
-Your customer number is <%= $custnum %><BR><BR>
-Your contact information<BR><%= $small_custview %>
-Your outstanding balance is $<%= $balance %><BR><BR>
-<!--<TABLE BORDER=1 CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">
-<TR><TH>Invoice</TH><TH>Date</TH><TH>Owed</TH></TR>-->
-<%=
-  if ( @open_invoices ) {
-    $OUT .= '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 BGCOLOR="#eeeeee">'.
-            '<TR><TH BGCOLOR="#ff3333" COLSPAN=5>Open Invoices</TH><TD>';
-    my $link = qq!<A HREF="<%= $selfurl %>?session=<%= $session_id %>;action=myaccount!;
-    my $col1 = "ffffff";
-    my $col2 = "dddddd";
-    my $col = $col1;
-
-    foreach my $invoice ( @open_invoices ) {
-      my $td = qq!<TD BGCOLOR="#$col">!;
-      my $a=qq!<A HREF="${url}view_invoice;invnum=!. $invoice->{'invnum'}. '">';
-      $OUT .=
-        "<TR>$td${a}Invoice #". $invoice->{'invnum'}. "</A></TD>$td</TD>".
-        "$td$a". $invoice->{'date'}. "</A></TD>$td</TD>".
-        qq!<TD BGCOLOR="#$col" ALIGN="right">$a\$!. $invoice->{'owed'}.
-          '</A></TD>'.
-        '</TR>';
-      $col = $col eq $col1 ? $col2 : $col1;
-    }
-    $OUT .= '</TABLE>';
-  } else {
-    $OUT .= 'You have no outstanding invoices.<BR><BR>';
-  }
-%>
-
-</TD></TR></TABLE>
-<HR>
-<FONT SIZE="-2">small text</FONT>
-</BODY></HTML>
-
-
-
diff --git a/fs_selfservice/FS-SelfService/cgi/passwd.html b/fs_selfservice/FS-SelfService/cgi/passwd.html
deleted file mode 100644
index fadc4df8b..000000000
--- a/fs_selfservice/FS-SelfService/cgi/passwd.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html>
-  <head>
-    <title>Change password</title>
-  </head>
-  <body bgcolor="#e8e8e8">
-    <h3>Change password</h3>
-    <form action="/cgi-bin/fs_passwd.cgi" method="post">
-    <table bgcolor="#cccccc" border=0 cellspacing=2>
-      <tr><th align="right">Username</th>
-        <td><input type="text" name="username" size="18"></td>
-      </tr>
-      <tr><th align="right">Current password</th>
-        <td><input type="password" name="old_password" size="18"></td>
-      </tr>
-      <tr><th align="right">New password</th>
-        <td><input type="password" name="new_password" size="18"></td>
-      </tr>
-      <tr><th align="right">Re-enter new password</th>
-        <td><input type="password" name="new_password2" size="18"></td>
-      </tr>
-    </table>
-    <br><input type="submit" value="Change password">
-  </body>
-</html>
-
diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
deleted file mode 100644
index eae373931..000000000
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use vars qw($cgi $session_id $form_max $template_dir);
-use subs qw(do_template);
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Text::Template;
-use FS::SelfService qw(login customer_info invoice);
-
-$template_dir = '.';
-
-$form_max = 255;
-
-$cgi = new CGI;
-
-unless ( defined $cgi->param('session') ) {
-  do_template('login',{});
-  exit;
-}
-
-if ( $cgi->param('session') eq 'login' ) {
-
-  $cgi->param('username') =~ /^\s*([a-z0-9_\-\.\&]{0,$form_max})\s*$/i
-    or die "illegal username";
-  my $username = $1;
-
-  $cgi->param('domain') =~ /^\s*([\w\-\.]{0,$form_max})\s*$/
-    or die "illegal domain";
-  my $domain = $1;
-
-  $cgi->param('password') =~ /^(.{0,$form_max})$/
-    or die "illegal password";
-  my $password = $1;
-
-  my $rv = login(
-    'username' => $username,
-    'domain'   => $domain,
-    'password' => $password,
-  );
-  if ( $rv->{error} ) {
-    do_template('login', {
-      'error'    => $rv->{error},
-      'username' => $username,
-      'domain'   => $domain,
-    } );
-    exit;
-  } else {
-    $cgi->param('session' => $rv->{session_id} );
-    $cgi->param('action'  => 'myaccount' );
-  }
-}
-
-$session_id = $cgi->param('session');
-
-$cgi->param('action') =~ /^(myaccount|view_invoice)$/
-  or die "unknown action ". $cgi->param('action');
-my $action = $1;
-
-my $result = eval "&$action();";
-die $@ if $@;
-
-if ( $result->{error} eq "Can't resume session" ) { #ick
-  do_template('login',{});
-  exit;
-}
-
-#warn $result->{'open_invoices'};
-#warn scalar(@{$result->{'open_invoices'}});
-
-do_template($action, {
-  'session_id' => $session_id,
-  %{$result}
-});
-
-#--
-
-sub myaccount { customer_info( 'session_id' => $session_id ); }
-
-sub view_invoice {
-
-  $cgi->param('invnum') =~ /^(\d+)$/ or die "illegal invnum";
-  my $invnum = $1;
-
-  invoice( 'session_id' => $session_id,
-           'invnum'     => $invnum,
-         );
-
-}
-
-#--
-
-sub do_template {
-  my $name = shift;
-  my $fill_in = shift;
-
-  $cgi->delete_all();
-  $fill_in->{'self_url'} = $cgi->self_url;
-
-  my $template = new Text::Template( TYPE    => 'FILE',
-                                     SOURCE  => "$template_dir/$name.html",
-                                     DELIMITERS => [ '<%=', '%>' ],
-                                     UNTAINT => 1,                    )
-    or die $Text::Template::ERROR;
-
-  print $cgi->header( '-expires' => 'now' ),
-        $template->fill_in( HASH => $fill_in );
-}
-
diff --git a/fs_selfservice/FS-SelfService/cgi/view_invoice.html b/fs_selfservice/FS-SelfService/cgi/view_invoice.html
deleted file mode 100644
index 33388de99..000000000
--- a/fs_selfservice/FS-SelfService/cgi/view_invoice.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
-<%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<TABLE BORDER=0 CELLPADDING=4><TR><TD VALIGN="top" HEIGHT=384 BGCOLOR="#dddddd">
-<A HREF="<%= $url %>myaccount">MyAccount</A><BR>
-<A HREF="<%= $url %>other">SomethingElse</A><BR>
-</TD><TD VALIGN="top">
-
-<A HREF="<%= $url %>myaccount"><-- back to MyAccount</A><BR><BR>
-
-<FONT SIZE="-1"><PRE>
-<%= $invoice_text %>
-</FONT></PRE>
-
-</TD></TR></TABLE>
-<HR>
-<FONT SIZE="-2">small text</FONT>
-</BODY></HTML>
-
-
-
diff --git a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
deleted file mode 100644
index 0c25c3407..000000000
--- a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/usr/bin/perl -w
-#
-# freeside-selfservice-clientd
-#
-# This is run REMOTELY over ssh by freeside-selfservice-server
-
-use strict;
-use subs qw(spawn logmsg);
-use Fcntl qw(:flock);
-use POSIX qw(:sys_wait_h);
-use Socket;
-use Storable qw(nstore_fd fd_retrieve);
-use IO::Handle qw(_IONBF);
-use IO::Select;
-use IO::File;
-
-STDOUT->setbuf('');
-
-use vars qw( $Debug );
-$Debug = 3; #2 will turn on child logging, 3 will log packet contents,
-            #including potentially compromising information
-
-my $socket = "/usr/local/freeside/selfservice_socket";
-my $pid_file = "$socket.pid";
-
-my $log_file = "/usr/local/freeside/selfservice.log";
-
-#my $me = '[client]';
-
-$|=1;
-
-$SIG{__WARN__} = \&_logmsg;
-
-#read data to be cached or something
-#warn "$me Reading init data\n" if $Debug;
-#my $signup_init = 
-
-warn "Creating $socket\n" if $Debug;
-my $uaddr = sockaddr_un($socket);
-my $proto = getprotobyname('tcp');
-socket(Server,PF_UNIX,SOCK_STREAM,0) or die "socket: $!";
-unlink($socket);
-bind(Server, $uaddr) or die "bind: $!";
-listen(Server,SOMAXCONN) or die "listen: $!";
-
-if ( -e $pid_file ) {
-  open(PIDFILE,"<$pid_file");
-  my $old_pid = <PIDFILE>;
-  close PIDFILE;
-  $old_pid =~ /^(\d+)$/;
-  kill 'TERM', $1;
-}
-open(PIDFILE,">$pid_file");
-print PIDFILE "$$\n";
-close PIDFILE;
-
-#my $waitedpid;
-#sub REAPER { $waitedpid = wait; $SIG{CHLD} = \&REAPER; }
-#$SIG{CHLD} =  \&REAPER;
-
-warn "entering main loop\n" if $Debug;
-
-my %kids;
-
-my $s = new IO::Select;
-$s->add(\*STDIN);
-$s->add(\*Server);
-
-#for ( $waitedpid = 0;
-#      accept(Client,Server) || $waitedpid;
-#      $waitedpid = 0, close Client)
-#{
-#  next if $waitedpid;
-
-#$SIG{PIPE} = sub { warn "SIGPIPE received" };
-#$SIG{CHLD} = sub { warn "SIGCHLD received" };
-
-#sub REAPER { warn "SIGCHLD received"; my $pid = wait; $SIG{CHLD} = \&REAPER; }
-#sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; }
-#sub REAPER { my $pid = wait; delete $kids{$pid}; $SIG{CHLD} = \&REAPER; }
-#$SIG{CHLD} =  \&REAPER;
-
-my $undisp = 0;
-while (1) {
-
-  &reap_kids;
-
-  warn "waiting for connection\n" if $Debug && !$undisp;
-
-  #my @handles = $s->can_read();
-  my @handles = $s->can_read(5);
-  $undisp = !scalar(@handles);
-  foreach my $handle ( @handles ) {
-
-    if ( $handle == \*STDIN ) {
-
-      warn "receiving packet from server\n" if $Debug;
-
-      my $packet = fd_retrieve(\*STDIN);
-      my $token = $packet->{'_token'};
-      warn "received packet from server with token $token\n".
-           ( $Debug > 2
-             ? join('', map { " $_=>$packet->{$_}\n" } keys %$packet )
-             : '' )
-        if $Debug;
-
-     if ( exists($kids{$token}) ) {
-        warn "sending return packet to $token via $kids{$token}\n"
-          if $Debug;
-        nstore_fd($packet, $kids{$token});
-        warn "flushing to $token\n" if $Debug;
-        until ( $kids{$token}->flush ) {
-          warn "WARNING: error flushing: $!";
-          sleep 1;
-        }
-        #no close or delete here - will block waiting for child
-        warn "done with $token\n" if $Debug;
-      } else {
-        warn "WARNING: unknown token $token, discarding message";
-      }
-
-    } elsif ( $handle == \*Server ) {
-
-      until ( accept(Client, Server) ) {
-        warn "WARNING: accept failed: $!";
-        next;
-      }
-
-      warn "received local connection; forking\n" if $Debug;
-
-      spawn sub { #child
-        warn "[child-$$] reading packet from local client" if $Debug > 1;
-        my $packet = fd_retrieve(\*Client);
-        warn "[child-$$] packet received:\n".
-             join('', map { " $_=>$packet->{$_}\n" } keys %$packet )
-          if $Debug > 2;
-        my $command = $packet->{'command'};
-        #handle some commands weirdly?
-        $packet->{_token}=$$;
-
-        warn "[child-$$] sending packet to remote server" if $Debug > 1;
-        flock(STDOUT, LOCK_EX) or die "FATAL: can't lock write stream: $!";
-        nstore_fd($packet, \*STDOUT) or die "FATAL: can't send response: $!";
-        STDOUT->flush or die "FATAL: can't flush: $!";
-        flock(STDOUT, LOCK_UN) or die "FATAL: can't release write lock: $!";
-        close STDOUT or die "FATAL: can't close write stream: $!"; #??!
-
-        warn "[child-$$] waiting for response from parent" if $Debug > 1;
-        my $w = new IO::Select;
-        $w->add(\*STDIN);
-        until ( $w->can_read ) {
-          warn "[child-$$] WARNING: interrupted select: $!\n";
-        }
-        my $rv = fd_retrieve(\*STDIN);
-
-        #close STDIN;
-
-        warn "[child-$$] sending response to local client" if $Debug > 1;
-        nstore_fd($rv, \*Client);
-        Client->flush or die "FATAL: can't flush to local client: $!";
-        close Client or die "FATAL: can't close connection to local client: $!";
-
-        warn "[child-$$] child exiting" if $Debug > 1;
-        exit;
-
-      }; #eo child
-
-      #close Client;
-
-    } else {
-      die "wtf?  $handle";
-    }
-
-  }
-  
-}
-
-sub reap_kids {
-  #warn "reaping kids\n";
-  foreach my $pid ( keys %kids ) {
-    my $kid = waitpid($pid, WNOHANG);
-    if ( $kid > 0 ) {
-      close $kids{$kid};
-      delete $kids{$kid};
-    }
-  }
-  #warn "done reaping\n";
-}
-
-sub spawn {
-    my $coderef = shift;
-
-    unless (@_ == 0 && $coderef && ref($coderef) eq 'CODE') {
-        use Carp;
-        confess "usage: spawn CODEREF";
-    }
-
-    my $pid;
-    #if (!defined($pid = fork)) {
-    my $kid = new IO::Handle;
-    if (!defined($pid = open($kid, '|-'))) {
-        warn "WARNING: cannot fork: $!";
-        return;
-    } elsif ($pid) {
-        warn "begat $pid" if $Debug;
-        $kids{$pid} = $kid;
-        #$kids{$pid}->autoflush;
-        return; # I'm the parent
-    }
-    # else I'm the child -- go spawn
-
-#    open(STDIN,  "<&Client")   || die "can't dup client to stdin";
-#    open(STDOUT, ">&Client")   || die "can't dup client to stdout";
-#     open(STDERR, ">&STDOUT") || die "can't dup stdout to stderr";
-    exit &$coderef();
-}
-
-sub _logmsg {
-  chomp( my $msg = shift );
-  my $log = new IO::File ">>$log_file";
-  flock($log, LOCK_EX);
-  seek($log, 0, 2);
-  print $log "[client] [". scalar(localtime). "] [$$] $msg\n";
-  flock($log, LOCK_UN);
-  close $log;
-}
diff --git a/fs_selfservice/FS-SelfService/test.pl b/fs_selfservice/FS-SelfService/test.pl
deleted file mode 100644
index 7468ea471..000000000
--- a/fs_selfservice/FS-SelfService/test.pl
+++ /dev/null
@@ -1,17 +0,0 @@
-# Before `make install' is performed this script should be runnable with
-# `make test'. After `make install' it should work as `perl test.pl'
-
-#########################
-
-# change 'tests => 1' to 'tests => last_test_to_print';
-
-use Test;
-BEGIN { plan tests => 1 };
-use FS::SelfService;
-ok(1); # If we made it this far, we're ok.
-
-#########################
-
-# Insert your test code below, the Test module is use()ed here so read
-# its man page ( perldoc Test ) for help writing this test script.
-
diff --git a/fs_selfservice/freeside-selfservice-server b/fs_selfservice/freeside-selfservice-server
deleted file mode 100644
index e55ca4984..000000000
--- a/fs_selfservice/freeside-selfservice-server
+++ /dev/null
@@ -1,224 +0,0 @@
-#!/usr/bin/perl -w
-#
-# freeside-selfservice-server
-
-# alas, much false laziness with freeside-queued and fs_signup_server.  at
-# least it is slated to replace fs_{signup,passwd,mailadmin}_server
-# should probably generalize the version in here, or better yet use
-# Proc::Daemon or somesuch
-
-use strict;
-use vars qw( $Debug %kids $kids $max_kids $shutdown $log_file $ssh_pid );
-use Fcntl qw(:flock);
-use POSIX qw(:sys_wait_h setsid);
-use IO::Handle;
-use IO::Select;
-use IO::File;
-use Storable qw(nstore_fd fd_retrieve);
-use Net::SSH qw(sshopen2);
-use FS::UID qw(adminsuidsetup forksuidsetup);
-use FS::ClientAPI;
-
-$Debug = 2; # >= 2 will log packet contents, including potentially compromising
-            # information
-
-$shutdown = 0;
-$max_kids = '10'; #?
-$kids = 0;
-
-my $user = shift or die &usage;
-my $machine = shift or die &usage;
-my $pid_file = "/var/run/freeside-selfservice-server.$user.pid";
-#my $pid_file = "/var/run/freeside-selfservice-server.$user.pid"; $FS::UID::datasrc not posible, but should include machine name at least, hmm
-
-&init($user);
-
-my $clientd = "/usr/local/sbin/freeside-selfservice-clientd"; #better name?
-
-my $warnkids=0;
-while (1) {
-  my($writer,$reader,$error) = (new IO::Handle, new IO::Handle, new IO::Handle);
-  warn "connecting to $machine\n" if $Debug;
-
-  $ssh_pid = sshopen2($machine,$reader,$writer,$clientd);
-
-#  nstore_fd(\*writer, {'hi'=>'there'});
-
-  warn "entering main loop\n" if $Debug;
-  my $undisp = 0;
-  my $s = IO::Select->new( $reader );
-  while (1) {
-
-    &reap_kids;
-
-    warn "waiting for packet from client\n" if $Debug && !$undisp;
-    $undisp = 1;
-    my @handles = $s->can_read(5);
-    unless ( @handles ) {
-      &shutdown if $shutdown;
-      next;
-    }
-
-    $undisp = 0;
-
-    warn "receiving packet from client\n" if $Debug;
-
-    my $packet = fd_retrieve($reader);
-    warn "packet received\n".
-         join('', map { " $_=>$packet->{$_}\n" } keys %$packet )
-      if $Debug > 1;
-
-    #prevent runaway forking
-    my $warnkids = 0;
-    while ( $kids >= $max_kids ) {
-      warn "WARNING: maximum $kids children reached\n" unless $warnkids++;
-      &reap_kids;
-      sleep 1;
-    }
-
-    warn "forking child\n" if $Debug;
-    defined( my $pid = fork ) or die "can't fork: $!";
-    if ( $pid ) {
-      $kids++;
-      $kids{$pid} = 1;
-      warn "child $pid spawned\n" if $Debug;
-    } else { #kid time
-
-      #get new db handle
-      $FS::UID::dbh->{InactiveDestroy} = 1;
-      forksuidsetup($user);
-
-      my $type = $packet->{_packet};
-      warn "calling $type handler\n" if $Debug; 
-      my $rv = eval { FS::ClientAPI->dispatch($type, $packet); };
-      if ( $@ ) {
-        warn my $error = "WARNING: error dispatching $type: $@";
-        $rv = { _error => $error };
-      }
-      $rv->{_token} = $packet->{_token}; #identifier
-
-      warn "sending response\n" if $Debug;
-      flock($writer, LOCK_EX) or die "FATAL: can't lock write stream: $!";
-      nstore_fd($rv, $writer) or die "FATAL: can't send response: $!";
-      $writer->flush or die "FATAL: can't flush: $!";
-      flock($writer, LOCK_UN) or die "WARNING: can't release write lock: $!";
-
-      warn "child exiting\n" if $Debug;
-      exit; #end-of-kid
-    }
-
-  }
-
-}
-
-###
-# utility subroutines
-###
-
-sub reap_kids {
-  #warn "reaping kids\n";
-  foreach my $pid ( keys %kids ) {
-    my $kid = waitpid($pid, WNOHANG);
-    if ( $kid > 0 ) {
-      $kids--;
-      delete $kids{$kid};
-    }
-  }
-  #warn "done reaping\n";
-}
-
-sub init {
-  my $user = shift;
-
-  chdir "/" or die "Can't chdir to /: $!";
-  open STDIN, '/dev/null' or die "Can't read /dev/null: $!";
-  defined(my $pid = fork) or die "Can't fork: $!";
-  if ( $pid ) {
-    print "freeside-selfservice-server to $machine started with pid $pid\n"; #logging to $log_file
-    exit unless $pid_file;
-    my $pidfh = new IO::File ">$pid_file" or exit;
-    print $pidfh "$pid\n";
-    exit;
-  }
-
-#  sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; $kids--; }
-#  #sub REAPER { my $pid = wait; $kids--; $SIG{CHLD} = \&REAPER; }
-#  $SIG{CHLD} =  \&REAPER;
-
-  $shutdown = 0;
-  $SIG{HUP} = sub { warn "SIGHUP received; shutting down\n"; $shutdown++; };
-  $SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $shutdown++; };
-  $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $shutdown++; };
-  $SIG{QUIT} = sub { warn "SIGQUIT received; shutting down\n"; $shutdown++; };
-  $SIG{PIPE} = sub { warn "SIGPIPE received; shutting down\n"; $shutdown++; };
-
-  #false laziness w/freeside-queued
-  my $freeside_gid = scalar(getgrnam('freeside'))
-    or die "can't setgid to freeside group\n";
-  $) = $freeside_gid;
-  $( = $freeside_gid;
-  #if freebsd can't setuid(), presumably it can't setgid() either.  grr fleabsd
-  ($(,$)) = ($),$();
-  $) = $freeside_gid;
-
-  $> = $FS::UID::freeside_uid;
-  $< = $FS::UID::freeside_uid;
-  #freebsd is sofa king broken, won't setuid()
-  ($<,$>) = ($>,$<);
-  $> = $FS::UID::freeside_uid;
-  #eslaf
-
-  $ENV{HOME} = (getpwuid($>))[7]; #for ssh
-  adminsuidsetup $user;
-
-  #$log_file = "/usr/local/etc/freeside/selfservice.". $FS::UID::datasrc; #MACHINE NAME
-  $log_file = "/usr/local/etc/freeside/selfservice.$machine.log";
-
-  open STDOUT, '>/dev/null'
-                            or die "Can't write to /dev/null: $!";
-  setsid                  or die "Can't start a new session: $!";
-  open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
-
-  $SIG{__DIE__} = \&_die;
-  $SIG{__WARN__} = \&_logmsg;
-
-  warn "freeside-selfservice-server starting\n";
-
-}
-
-sub shutdown {
-  my $wait = 12; #wait up to 1 minute
-  while ( $kids > 0 && $wait-- ) {
-    warn "waiting for $kids children to terminate";
-    sleep 5;
-  }
-  warn "abandoning $kids children" if $kids;
-  kill 'TERM', $ssh_pid if $ssh_pid;
-  die "exiting";
-}
-
-sub _die {
-  my $msg = shift;
-  unlink $pid_file if -e $pid_file;
-  _logmsg($msg);
-}
-
-sub _logmsg {
-  chomp( my $msg = shift );
-  _do_logmsg( "[server] [". scalar(localtime). "] [$$] $msg\n" );
-}
-
-sub _do_logmsg {
-  chomp( my $msg = shift );
-  my $log = new IO::File ">>$log_file";
-  flock($log, LOCK_EX);
-  seek($log, 0, 2);
-  print $log "$msg\n";
-  flock($log, LOCK_UN);
-  close $log;
-}
-
-sub usage {
-  die "Usage:\n\n  fs_signup_server user machine\n";
-}
-
diff --git a/fs_selfservice/fs_passwd_test b/fs_selfservice/fs_passwd_test
deleted file mode 100755
index 4f8b8a888..000000000
--- a/fs_selfservice/fs_passwd_test
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use FS::SelfService qw(passwd);
-
-my $rv = passwd(
-  'username' => 'ivan',
-  'old_password' => 'heyhoo',
-  'new_password' => 'haloo',
-);
-my $error = $rv->{error};
-
-if ( $error eq 'Incorrect password.' ) {
-  exit;
-} else {
-  die $error if $error;
-  die "no error";
-}
-
diff --git a/fs_sesmon/FS-SessionClient/Changes b/fs_sesmon/FS-SessionClient/Changes
deleted file mode 100644
index 390a7b946..000000000
--- a/fs_sesmon/FS-SessionClient/Changes
+++ /dev/null
@@ -1,5 +0,0 @@
-Revision history for Perl extension FS::SessionClient
-
-0.01  Wed Oct 18 16:34:36 1999
-        - original version; created by ivan 1.0
-
diff --git a/fs_sesmon/FS-SessionClient/MANIFEST b/fs_sesmon/FS-SessionClient/MANIFEST
deleted file mode 100644
index 162d4e453..000000000
--- a/fs_sesmon/FS-SessionClient/MANIFEST
+++ /dev/null
@@ -1,11 +0,0 @@
-Changes
-MANIFEST
-MANIFEST.SKIP
-Makefile.PL
-SessionClient.pm
-test.pl
-fs_sessiond
-cgi/login.cgi
-cgi/logout.cgi
-bin/freeside-login
-bin/freeside-logout
diff --git a/fs_sesmon/FS-SessionClient/MANIFEST.SKIP b/fs_sesmon/FS-SessionClient/MANIFEST.SKIP
deleted file mode 100644
index ae335e78a..000000000
--- a/fs_sesmon/FS-SessionClient/MANIFEST.SKIP
+++ /dev/null
@@ -1 +0,0 @@
-CVS/
diff --git a/fs_sesmon/FS-SessionClient/Makefile.PL b/fs_sesmon/FS-SessionClient/Makefile.PL
deleted file mode 100644
index 137b6b8bd..000000000
--- a/fs_sesmon/FS-SessionClient/Makefile.PL
+++ /dev/null
@@ -1,10 +0,0 @@
-use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-WriteMakefile(
-    'NAME'          => 'FS::SessionClient',
-    'VERSION_FROM'  => 'SessionClient.pm', # finds $VERSION
-    'EXE_FILES'     => [ qw(fs_sessiond bin/freeside-login bin/freeside-logout) ],
-    'INSTALLSCRIPT' => '/usr/local/sbin',
-    'PERM_RWX'      => '750',
-);
diff --git a/fs_sesmon/FS-SessionClient/SessionClient.pm b/fs_sesmon/FS-SessionClient/SessionClient.pm
deleted file mode 100644
index 8a0ff705f..000000000
--- a/fs_sesmon/FS-SessionClient/SessionClient.pm
+++ /dev/null
@@ -1,122 +0,0 @@
-package FS::SessionClient;
-
-use strict;
-use vars qw($AUTOLOAD $VERSION @ISA @EXPORT_OK $fs_sessiond_socket);
-use Exporter;
-use Socket;
-use FileHandle;
-use IO::Handle;
-
-$VERSION = '0.01';
-
-@ISA = qw( Exporter );
-@EXPORT_OK = qw( login logout portnum );
-
-$fs_sessiond_socket = "/usr/local/freeside/fs_sessiond_socket";
-
-$ENV{'PATH'} ='/usr/bin:/bin';
-$ENV{'SHELL'} = '/bin/sh';
-$ENV{'IFS'} = " \t\n";
-$ENV{'CDPATH'} = '';
-$ENV{'ENV'} = '';
-$ENV{'BASH_ENV'} = '';
-
-my $freeside_uid = scalar(getpwnam('freeside'));
-die "not running as the freeside user\n" if $> != $freeside_uid;
-
-=head1 NAME
-
-FS::SessionClient - Freeside session client API
-
-=head1 SYNOPSIS
-
-  use FS::SessionClient qw( login portnum logout );
-
-  $error = login ( {
-    'username' => $username,
-    'password' => $password,
-    'login'    => $timestamp,
-    'portnum'  => $portnum,
-  } );
-
-  $portnum = portnum( { 'ip' => $ip } ) or die "unknown ip!"
-  $portnum = portnum( { 'nasnum' => $nasnum, 'nasport' => $nasport } )
-    or die "unknown nasnum/nasport";
-
-  $error = logout ( {
-    'username' => $username,
-    'password' => $password,
-    'logout'   => $timestamp,
-    'portnum'  => $portnum,
-  } );
-
-=head1 DESCRIPTION
-
-This modules provides an API for a remote session application.
-
-It needs to be run as the freeside user.  Because of this, the program which
-calls these subroutines should be written very carefully.
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item login HASHREF
-
-HASHREF should have the following keys: username, password, login and portnum.
-login is a UNIX timestamp; if not specified, will default to the current time.
-Starts a new session for the specified user and portnum.  The password is
-optional, but must be correct if specified.
-
-Returns a scalar error message, or the empty string for success.
-
-=item portnum
-
-HASHREF should contain a single key: ip, or the two keys: nasnum and nasport.
-Returns a portnum suitable for the login and logout subroutines, or false
-on error.
-
-=item logout HASHREF
-
-HASHREF should have the following keys: usrename, password, logout and portnum.
-logout is a UNIX timestamp; if not specified, will default to the current time.
-Starts a new session for the specified user and portnum.  The password is
-optional, but must be correct if specified.
-
-Returns a scalar error message, or the empty string for success.
-
-=cut
-
-sub AUTOLOAD {
-  my $hashref = shift;
-  my $method = $AUTOLOAD;
-  $method =~ s/^.*:://;
-  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($fs_sessiond_socket)) or die "connect: $!";
-  print SOCK "$method\n";
-
-  print SOCK join("\n", %{$hashref}, 'END' ), "\n";
-  SOCK->flush;
-
-  chomp( my $r = <SOCK> );
-  $r;
-}
-
-=back
-
-=head1 VERSION
-
-$Id: SessionClient.pm,v 1.3 2000-12-03 20:25:20 ivan Exp $
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<fs_sessiond>
-
-=cut
-
-1;
-
-
-
diff --git a/fs_sesmon/FS-SessionClient/bin/freeside-login b/fs_sesmon/FS-SessionClient/bin/freeside-login
deleted file mode 100644
index a6d475169..000000000
--- a/fs_sesmon/FS-SessionClient/bin/freeside-login
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/perl -Tw
-
-#false-laziness hack w freeside-logout
-
-use strict;
-use FS::SessionClient qw( login portnum );
-
-my $username = shift;
-
-my $portnum;
-if ( scalar(@ARGV) == 1 ) {
-  my $arg = shift;
-  if ( $arg =~ /^(\d+)$/ ) {
-    $portnum = $1;
-  } elsif ( $arg =~ /^([\d\.]+)$/ ) {
-    $portnum = portnum( { 'ip' => $1 } ) or die "unknown ip!"
-  } else {
-    &usage;
-  }
-} elsif ( scalar(@ARGV) == 2 ) {
-  $portnum = portnum( { 'nasnum' => shift, 'nasport' => shift } )
-    or die "unknown nasnum/nasport";
-} else {
-  &usage;
-}
-
-my $error = login ( {
-  'username' => $username,
-  'portnum'  => $portnum,
-} );
-
-warn $error if $error;
-
-sub usage {
-  die "Usage:\n\n  freeside-login username ( portnum | ip | nasnum nasport )";
-}
diff --git a/fs_sesmon/FS-SessionClient/bin/freeside-logout b/fs_sesmon/FS-SessionClient/bin/freeside-logout
deleted file mode 100644
index 9b4ecfe23..000000000
--- a/fs_sesmon/FS-SessionClient/bin/freeside-logout
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/perl -Tw
-
-#false-laziness hack w freeside-login
-
-use strict;
-use FS::SessionClient qw( logout portnum );
-
-my $username = shift;
-
-my $portnum;
-if ( scalar(@ARGV) == 1 ) {
-  my $arg = shift;
-  if ( $arg =~ /^(\d+)$/ ) {
-    $portnum = $1;
-  } elsif ( $arg =~ /^([\d\.]+)$/ ) {
-    $portnum = portnum( { 'ip' => $1 } ) or die "unknown ip!"
-  } else {
-    &usage;
-  }
-} elsif ( scalar(@ARGV) == 2 ) {
-  $portnum = portnum( { 'nasnum' => shift, 'nasport' => shift } )
-    or die "unknown nasnum/nasport";
-} else {
-  &usage;
-}
-
-my $error = logout ( {
-  'username' => $username,
-  'portnum'  => $portnum,
-} );
-
-warn $error if $error;
-
-sub usage {
-  die "Usage:\n\n  freeside-logout username ( portnum | ip | nasnum nasport )";
-}
diff --git a/fs_sesmon/FS-SessionClient/cgi/login.cgi b/fs_sesmon/FS-SessionClient/cgi/login.cgi
deleted file mode 100644
index 0307c5a3d..000000000
--- a/fs_sesmon/FS-SessionClient/cgi/login.cgi
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/perl -Tw
-
-#false-laziness hack w logout.cgi
-
-use strict;
-use vars qw( $cgi $username $password $error $ip $portnum );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::SessionClient qw( login portnum );
-
-$cgi = new CGI;
-
-if ( defined $cgi->param('magic') ) {
-  $cgi->param('username') =~ /^\s*(\w{1,255})\s*$/ or do {
-    $error = "Illegal username";
-    &print_form;
-    exit;
-  };
-  $username = $1;
-  $cgi->param('password') =~ /^([^\n]{0,255})$/ or die "guru meditation #420";
-  $password = $1;
-  #$ip = $cgi->remote_host;
-  $ip = $ENV{REMOTE_ADDR};
-  $ip =~ /^([\d\.]+)$/ or die "illegal ip: $ip";
-  $ip = $1;
-  $portnum = portnum( { 'ip' => $1 } ) or do {
-    $error = "You appear to be coming from an unknown IP address.  Verify ".
-             "that your computer is set to obtain an IP address automatically ".
-             "via DHCP.";
-    &print_form;
-    exit;
-  };
-
-  ( $error = login ( {
-    'username' => $username,
-    'portnum'  => $portnum,
-    'password' => $password,
-  } ) )
-    ? &print_form()
-    : &print_okay();
-
-} else {
-  $username = '';
-  $password = '';
-  $error = '';
-  &print_form;
-}
-
-sub print_form {
-  my $self_url = $cgi->self_url;
-
-  print $cgi->header( '-expires' => 'now' ), <<END;
-<HTML><HEAD><TITLE>login</TITLE></HEAD>
-<BODY BGCOLOR="#FFFFFF">
-END
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT>! if $error;
-
-print <<END;
-<FORM ACTION="$self_url" METHOD="POST">
-<INPUT TYPE="hidden" NAME="magic" VALUE="process">
-<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="4" ALIGN="center">
-<TR>
-        <TD ALIGN="center" COLSPAN="2">
-      <STRONG>Welcome</STRONG>
-      </TD>
-</TR>
-<TR>
-      <TD ALIGN="right">
-      Username
-      </TD>
-      <TD ALIGN="left">
-      <INPUT TYPE="text" NAME="username" VALUE="$username">
-      </TD>
-</TR>
-<TR>
-      <TD ALIGN="right">
-      Password
-      </TD>
-      <TD ALIGN="left">
-      <INPUT TYPE="password" NAME="password">
-      </TD>
-</TR>
-<TR>
-      <TD ALIGN="center" COLSPAN="2">
-      <INPUT TYPE="submit" VALUE=" Login ">
-      </TD>
-</TR>
-</TABLE>
-</FORM>
-</BODY>
-</HTML>
-END
-
-}
-
-sub print_okay {
-  print $cgi->header( '-expires' => 'now' ), <<END;
-<HTML><HEAD><TITLE>login sucessful</TITLE></HEAD>
-<BODY>login successful, etc.
-</BODY>
-</HTML>
-END
-}
-
-sub usage {
-  die "Usage:\n\n  freeside-login username ( portnum | ip | nasnum nasport )";
-}
diff --git a/fs_sesmon/FS-SessionClient/cgi/logout.cgi b/fs_sesmon/FS-SessionClient/cgi/logout.cgi
deleted file mode 100644
index 95cef98d1..000000000
--- a/fs_sesmon/FS-SessionClient/cgi/logout.cgi
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/perl -Tw
-
-#false-laziness hack w login.cgi
-
-use strict;
-use vars qw( $cgi $username $password $error $ip $portnum );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::SessionClient qw( logout portnum );
-
-$cgi = new CGI;
-
-if ( defined $cgi->param('magic') ) {
-  $cgi->param('username') =~ /^\s*(\w{1,255})\s*$/ or do {
-    $error = "Illegal username";
-    &print_form;
-    exit;
-  };
-  $username = $1;
-  $cgi->param('password') =~ /^([^\n]{0,255})$/ or die "guru meditation #420";
-  $password = $1;
-  #$ip = $cgi->remote_host;
-  $ip = $ENV{REMOTE_ADDR};
-  $ip =~ /^([\d\.]+)$/ or die "illegal ip: $ip";
-  $ip = $1;
-  $portnum = portnum( { 'ip' => $1 } ) or do {
-    $error = "You appear to be coming from an unknown IP address.  Verify ".
-             "that your computer is set to obtain an IP address automatically ".
-             "via DHCP.";
-    &print_form;
-    exit;
-  };
-
-  ( $error = logout ( {
-    'username' => $username,
-    'portnum'  => $portnum,
-    'password' => $password,
-  } ) )
-    ? &print_form()
-    : &print_okay();
-
-} else {
-  $username = '';
-  $password = '';
-  $error = '';
-  &print_form;
-}
-
-sub print_form {
-  my $self_url = $cgi->self_url;
-
-  print $cgi->header( '-expires' => 'now' ), <<END;
-<HTML><HEAD><TITLE>logout</TITLE></HEAD>
-<BODY>
-END
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT>! if $error;
-
-print <<END;
-<FORM ACTION="$self_url" METHOD=POST>
-<INPUT TYPE="hidden" NAME="magic" VALUE="process">
-Username <INPUT TYPE="text" NAME="username" VALUE="$username"><BR>
-Password <INPUT TYPE="password" NAME="password"><BR>
-<INPUT TYPE="submit">
-</FORM>
-</BODY>
-</HTML>
-END
-
-}
-
-sub print_okay {
-  print $cgi->header( '-expires' => 'now' ), <<END;
-<HTML><HEAD><TITLE>logout sucessful</TITLE></HEAD>
-<BODY>logout successful, etc.
-</BODY>
-</HTML>
-END
-}
-
-sub usage {
-  die "Usage:\n\n  freeside-logout username ( portnum | ip | nasnum nasport )";
-}
diff --git a/fs_sesmon/FS-SessionClient/fs_sessiond b/fs_sesmon/FS-SessionClient/fs_sessiond
deleted file mode 100644
index bfdb20a1d..000000000
--- a/fs_sesmon/FS-SessionClient/fs_sessiond
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# fs_sessiond
-#
-# This is run REMOTELY over ssh by fs_session_server
-#
-
-use strict;
-use Socket;
-
-use vars qw( $Debug );
-
-$Debug = 1;
-
-my $fs_sessiond_socket = "/usr/local/freeside/fs_sessiond_socket";
-
-$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
-$ENV{'SHELL'} = '/bin/sh';
-$ENV{'IFS'} = " \t\n";
-$ENV{'CDPATH'} = '';
-$ENV{'ENV'} = '';
-$ENV{'BASH_ENV'} = '';
-
-$|=1;
-
-my $me = "[fs_sessiond]";
-
-warn "$me starting\n" if $Debug;
-#nothing to read from server
-
-warn "$me creating $fs_sessiond_socket\n" if $Debug;
-my $uaddr = sockaddr_un($fs_sessiond_socket);
-my $proto = getprotobyname('tcp');
-socket(Server,PF_UNIX,SOCK_STREAM,0) or die "socket: $!";
-unlink($fs_sessiond_socket);
-bind(Server, $uaddr) or die "bind: $!";
-listen(Server,SOMAXCONN) or die "listen: $!";
-
-warn "$me entering main loop\n" if $Debug;
-my $paddr;
-for ( ; $paddr = accept(Client,Server); close Client) {
-
-  chomp( my $command = <Client> );
-
-  if ( $command eq 'login' || $command eq 'logout' || $command eq 'portnum' ) {
-    warn "$me reading data from local client\n" if $Debug;
-    my @data;
-    my $dos = 0;
-    push @data, scalar(<Client>) until $dos++ == 99 || $data[$#data] eq "END\n";
-    if ( $dos == 99 ) { 
-      warn "$me WARNING: DoS attempt!" 
-    } else {
-      warn "$me sending data to remote server\n" if $Debug;
-      print "$command\n", @data;
-      warn "$me reading result from remote server\n" if $Debug;
-      my $error = <STDIN>;
-      warn "$me sending error to local client\n" if $Debug;
-      print Client $error;
-    }
-  } else {
-    warn "$me WARNING: unexpected command from client: $command";
-  }
-
-}
-
diff --git a/fs_sesmon/FS-SessionClient/test.pl b/fs_sesmon/FS-SessionClient/test.pl
deleted file mode 100644
index 4b9ae17e0..000000000
--- a/fs_sesmon/FS-SessionClient/test.pl
+++ /dev/null
@@ -1,21 +0,0 @@
-# Before `make install' is performed this script should be runnable with
-# `make test'. After `make install' it should work as `perl test.pl'
-
-######################### We start with some black magic to print on failure.
-
-# Change 1..1 below to 1..last_test_to_print .
-# (It may become useful if the test is moved to ./t subdirectory.)
-
-BEGIN { $| = 1; print "1..1\n"; }
-END {print "not ok 1\n" unless $loaded;}
-#use FS::SessionClient;
-#sigh, "not running as the freeside user"
-$loaded = 1;
-print "ok 1\n";
-
-######################### End of black magic.
-
-# Insert your test code below (better if it prints "ok 13"
-# (correspondingly "not ok 13") depending on the success of chunk 13
-# of the test code):
-
diff --git a/fs_sesmon/fs_session_server b/fs_sesmon/fs_session_server
deleted file mode 100644
index 00229f8dc..000000000
--- a/fs_sesmon/fs_session_server
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# fs_session_server
-#
-
-use strict;
-use vars qw( $opt $Debug );
-use IO::Handle;
-use Net::SSH qw(sshopen2);
-use FS::UID qw(adminsuidsetup dbh);
-use FS::Record qw( qsearchs ); #qsearch );
-#use FS::cust_main_county;
-#use FS::cust_main;
-use FS::session;
-use FS::port;
-use FS::svc_acct;
-
-#require "configfile";
-$Debug = 1;
-
-my $user = shift or die &usage;
-&adminsuidsetup( $user ); 
-
-my $machine = shift or die &usage;
-
-my $fs_sessiond = "/usr/local/sbin/fs_sessiond";
-
-my $me = "[fs_session_server]";
-
-while (1) {
-  my($reader, $writer) = (new IO::Handle, new IO::Handle);
-  $writer->autoflush(1);
-  warn "$me Connecting to $machine\n" if $Debug;
-  sshopen2($machine,$reader,$writer,$fs_sessiond);
-
-  warn "$me Entering main loop\n" if $Debug;
-  while (1) {
-    warn "$me Reading (waiting for) data\n" if $Debug;
-    my $command = scalar(<$reader>);
-    chomp $command;
-    #DoS protection here too, to protect against a compromised client?  *sigh*
-    my %hash;
-    while ( ( my $key = scalar(<$reader>) ) ne "END\n" ) {
-      chomp $key;
-      chomp( $hash{$key} = scalar(<$reader>) );
-    }
-
-    if ( $command eq 'login' ) {
-      my $error = &login(\%hash);
-      print $writer "$error\n";
-    } elsif ( $command eq 'logout' ) {
-      my $error = &logout(\%hash);
-      print $writer "$error\n";
-    } elsif ( $command eq 'portnum' ) {
-      my $port;
-      if ( exists $hash{'ip'} ) {
-        $hash{'ip'} =~ /^([\d\.]+)$/ or $1='nomatch';
-        $port = qsearchs('port', { 'ip' => $1 } );
-      } else {
-        $hash{'nasnum'} =~ /^(\d+)$/ and my $nasnum = $1;
-        $hash{'nasport'} =~ /^(\d+)$/ and my $nasport = $1;
-        $port = qsearchs('port', { 'nasnum'=>$nasnum, 'nasport'=>$nasport } );
-      }
-      print $writer ( $port ? $port->portnum : '' ), "\n";
-    } else {
-      warn "$me WARNING: unrecognized command: $command";
-    }
-  }
-  #won't ever reach without code above to throw out of loop, but...
-  close $writer;
-  close $reader;
-  warn "connection to $machine lost!\n";
-  sleep 5;
-  warn "reconnecting...\n";
-}
-
-sub login {
-  my $href = shift;
-  $href->{'username'} =~ /^([a-z0-9_\-\.]+)$/ or return "Illegal username";
-  my $username = $1;
-  my $svc_acct = qsearchs('svc_acct', { 'username' => $username } )
-    or return "Unknown user";
-  return "Incorrect password"
-    if exists($href->{'password'})
-       && $href->{'password'} ne $svc_acct->_password;
-  return "Time limit exceeded" unless $svc_acct->seconds;
-  my $session = new FS::session {
-    'portnum' => $href->{'portnum'},
-    'svcnum'  => $svc_acct->svcnum,
-    'login'   => $href->{'login'},
-  };
-  $session->insert;
-}
-
-sub logout {
-  my $href = shift;
-  $href->{'username'} =~ /^([a-z0-9_\-\.]+)$/ or return "Illegal username";
-  my $username = $1;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-  my $svc_acct =
-    qsearchs('svc_acct', { 'username' => $username }, '', 'FOR UPDATE' )
-    or return "Unknown user";
-  return "Incorrect password"
-    if exists($href->{'password'})
-       && $href->{'password'} ne $svc_acct->_password;
-  my $session = qsearchs( 'session', {
-                                       'portnum' => $href->{'portnum'},
-                                       'svcnum'  => $svc_acct->svcnum,
-                                       'logout'  => '',
-                                     },
-                          '', 'FOR UPDATE'
-  );
-  unless ( $session ) {
-    $dbh->rollback;
-    return "No currently open sessions found for that user/port!";
-  }
-  my $nsession = new FS::session ( { $session->hash } );
-  warn "$nsession replacing $session";
-  my $error = $nsession->replace($session);
-  if ( $error ) {
-    $dbh->rollback;
-    return "can't logout: $error";
-  }
-  my $time = $nsession->logout - $nsession->login;
-  my $new_svc_acct = new FS::svc_acct ( { $svc_acct->hash } );
-  my $seconds = $new_svc_acct->seconds;
-  $seconds -= $time;
-  $seconds = 0 if $seconds < 0;
-  $new_svc_acct->seconds( $seconds );
-  $error = $new_svc_acct->replace( $svc_acct );
-  warn "can't debit time: $error\n"; #don't want to rollback, though
-  $dbh->commit or die $dbh->errstr;
-  ''
-}
-
-sub usage {
-  die "Usage:\n\n  fs_session_server user machine\n";
-}
-
diff --git a/fs_signup/FS-SignupClient/Changes b/fs_signup/FS-SignupClient/Changes
deleted file mode 100644
index e750a82bc..000000000
--- a/fs_signup/FS-SignupClient/Changes
+++ /dev/null
@@ -1,5 +0,0 @@
-Revision history for Perl extension FS::SignupClient.
-
-0.01  Mon Aug 23 01:12:46 1999
-	- original version; created by h2xs 1.19
-
diff --git a/fs_signup/FS-SignupClient/MANIFEST b/fs_signup/FS-SignupClient/MANIFEST
deleted file mode 100644
index b4a9900c8..000000000
--- a/fs_signup/FS-SignupClient/MANIFEST
+++ /dev/null
@@ -1,8 +0,0 @@
-Changes
-MANIFEST
-MANIFEST.SKIP
-Makefile.PL
-SignupClient.pm
-test.pl
-fs_signupd
-cgi/signup.cgi
diff --git a/fs_signup/FS-SignupClient/MANIFEST.SKIP b/fs_signup/FS-SignupClient/MANIFEST.SKIP
deleted file mode 100644
index ae335e78a..000000000
--- a/fs_signup/FS-SignupClient/MANIFEST.SKIP
+++ /dev/null
@@ -1 +0,0 @@
-CVS/
diff --git a/fs_signup/FS-SignupClient/Makefile.PL b/fs_signup/FS-SignupClient/Makefile.PL
deleted file mode 100644
index e74051947..000000000
--- a/fs_signup/FS-SignupClient/Makefile.PL
+++ /dev/null
@@ -1,18 +0,0 @@
-use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-WriteMakefile(
-    'NAME'	    => 'FS::SignupClient',
-    'VERSION_FROM'  => 'SignupClient.pm', # finds $VERSION
-    'EXE_FILES'     => [ 'fs_signupd' ],
-    'INSTALLSCRIPT' => '/usr/local/sbin',
-    'INSTALLSITEBIN' => '/usr/local/sbin',
-    'PERM_RWX'      => '750',
-    'PREREQ_PM'     => {
-                         'Business::CreditCard' => 0,
-                         'HTTP::BrowserDetect' => 0,
-                         'HTTP::Headers::UserAgent' => 3,
-                         'Storable' => 0,
-                         'Text::Template' => 0,
-                       },
-);
diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm
deleted file mode 100644
index 0a6cbfba2..000000000
--- a/fs_signup/FS-SignupClient/SignupClient.pm
+++ /dev/null
@@ -1,187 +0,0 @@
-package FS::SignupClient;
-
-use strict;
-use vars qw($VERSION @ISA @EXPORT_OK $fs_signupd_socket);
-use Exporter;
-use Socket;
-use FileHandle;
-use IO::Handle;
-use Storable qw(nstore_fd fd_retrieve);
-
-$VERSION = '0.03';
-
-@ISA = qw( Exporter );
-@EXPORT_OK = qw( signup_info new_customer );
-
-$fs_signupd_socket = "/usr/local/freeside/fs_signupd_socket";
-
-$ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin';
-$ENV{'SHELL'} = '/bin/sh';
-$ENV{'IFS'} = " \t\n";
-$ENV{'CDPATH'} = '';
-$ENV{'ENV'} = '';
-$ENV{'BASH_ENV'} = '';
-
-my $freeside_uid = scalar(getpwnam('freeside'));
-die "not running as the freeside user\n" if $> != $freeside_uid;
-
-=head1 NAME
-
-FS::SignupClient - Freeside signup client API
-
-=head1 SYNOPSIS
-
-  use FS::SignupClient qw( signup_info new_customer );
-
-  ( $locales, $packages, $pops ) = signup_info;
-
-  $error = new_customer ( {
-    'first'            => $first,
-    'last'             => $last,
-    'ss'               => $ss,
-    'comapny'          => $company,
-    'address1'         => $address1,
-    'address2'         => $address2,
-    'city'             => $city,
-    'county'           => $county,
-    'state'            => $state,
-    'zip'              => $zip,
-    'country'          => $country,
-    'daytime'          => $daytime,
-    'night'            => $night,
-    'fax'              => $fax,
-    'payby'            => $payby,
-    'payinfo'          => $payinfo,
-    'paydate'          => $paydate,
-    'payname'          => $payname,
-    'invoicing_list'   => $invoicing_list,
-    'referral_custnum' => $referral_custnum,
-    'pkgpart'          => $pkgpart,
-    'username'         => $username,
-    '_password'        => $password,
-    'sec_phrase'       => $sec_phrase,
-    'popnum'           => $popnum,
-    'agentnum'         => $agentnum, #optional
-  } );
-
-=head1 DESCRIPTION
-
-This module provides an API for a remote signup server.
-
-It needs to be run as the freeside user.  Because of this, the program which
-calls these subroutines should be written very carefully.
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item signup_info
-
-Returns three array references of hash references.
-
-The first set of hash references is of allowable locales.  Each hash reference
-has the following keys:
-  taxnum
-  state
-  county
-  country
-
-The second set of hash references is of allowable packages.  Each hash
-reference has the following keys:
-  pkgpart
-  pkg
-
-The third set of hash references is of allowable POPs (Points Of Presence).
-Each hash reference has the following keys:
-  popnum
-  city
-  state
-  ac
-  exch
-
-(Future expansion: fourth argument is the $init_data hash reference)
-
-=cut
-
-sub signup_info {
-  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($fs_signupd_socket)) or die "connect: $!";
-  print SOCK "signup_info\n";
-  SOCK->flush;
-
-  my $init_data = fd_retrieve(\*SOCK);
-  close SOCK;
-
-  (map { $init_data->{$_} } qw( cust_main_county part_pkg svc_acct_pop ) ),
-  $init_data;
-
-}
-
-=item new_customer HASHREF
-
-Adds a customer to the remote Freeside system.  Requires a hash reference as
-a paramater with the following keys:
-  first
-  last
-  ss
-  comapny
-  address1
-  address2
-  city
-  county
-  state
-  zip
-  country
-  daytime
-  night
-  fax
-  payby
-  payinfo
-  paydate
-  payname
-  invoicing_list
-  referral_custnum
-  pkgpart
-  username
-  _password
-  sec_phrase
-  popnum
-
-Returns a scalar error message, or the empty string for success.
-
-=cut
-
-sub new_customer {
-  my $hashref = shift;
-
-  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($fs_signupd_socket)) or die "connect: $!";
-  print SOCK "new_customer\n";
-
-  my $signup_data = { map { $_ => $hashref->{$_} } qw(
-    first last ss company address1 address2 city county state zip country
-    daytime night fax payby payinfo paydate payname invoicing_list
-    referral_custnum pkgpart username _password sec_phrase popnum
-  ) };
-
-  $signup_data->{agentnum} = $hashref->{agentnum} if $hashref->{agentnum};
-
-  nstore_fd($signup_data, \*SOCK) or die "can't send customer signup: $!";
-  SOCK->flush;
-
-  chop( my $error = <SOCK> );
-  $error;
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<fs_signupd>, L<FS::cust_main>
-
-=cut
-
-1;
-
diff --git a/fs_signup/FS-SignupClient/cgi/decline.html b/fs_signup/FS-SignupClient/cgi/decline.html
deleted file mode 100644
index a37ba3ab6..000000000
--- a/fs_signup/FS-SignupClient/cgi/decline.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<HTML><HEAD><TITLE>Processing error</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Processing error</FONT><BR><BR>
-There has been an error processing your account.  Please contact customer
-support.
-</BODY></HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/signup-alternate.html b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
deleted file mode 100755
index 490cefa5e..000000000
--- a/fs_signup/FS-SignupClient/cgi/signup-alternate.html
+++ /dev/null
@@ -1,218 +0,0 @@
-<HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>ISP Signup form</FONT><BR><BR>
-<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
-<FORM NAME="dummy">
-<INPUT TYPE="hidden" NAME="magic" VALUE="process">
-<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
-<INPUT TYPE="hidden" NAME="ss" VALUE="">
-<INPUT TYPE="hidden" NAME="agentnum" VALUE="3">
-Contact Information
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Contact name<BR>(last, first)</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="last" VALUE="<%= $last %>">,
-                <INPUT TYPE="text" NAME="first" VALUE="<%= $first %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Company</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="<%= $company %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Address</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="<%= $address1 %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">&nbsp;</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="<%= $address2 %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
-  <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
-  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
-  <TD><SELECT NAME="state" SIZE="1">
-
-  <%=
-    foreach ( @{$locales} ) {
-      my $value = $_->{'state'};
-      $value .= ' ('. $_->{'county'}. ')' if $_->{'county'};
-      $value .= ' / '. $_->{'country'};
-
-      $OUT .= qq(<OPTION VALUE="$value");
-      $OUT .= ' SELECTED' if ( $state eq $_->{'state'}
-                               && $county eq $_->{'county'}
-                               && $country eq $_->{'country'}
-                             );
-      $OUT .= ">$value</OPTION>";
-    }
-  %>
-
-  </SELECT></TD>
-  <TH><font color="#ff0000">*</font>Zip</TH>
-  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Day Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="<%= $daytime %>" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Night Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="<%= $night %>" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Fax</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="<%= $fax %>" SIZE=12></TD>
-</TR>
-</TABLE><font color="#ff0000">*</font> required fields<BR>
-
-<BR><BR>
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Username</TH>
-  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Password</TH>
-  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Re-enter Password</TH>
-  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>"></TD>
-</TR>
-
-<%= if ( $init_data->{'security_phrase'} ) {
-      <<ENDOUT;
-<TR>
-  <TD ALIGN="right">Security Phrase</TD>
-  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
-  </TD>
-</TR>
-ENDOUT
-    } else {
-      '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
-    }
-%>
-
-<%= if ( scalar(@$pops) ) {
-      '<TR><TD ALIGN="right">Access number</TD><TD>'.
-           popselector($popnum). '</TD></TR>';
-    } else {
-      popselector($popnum);
-    }
-%>
-
-</TABLE><font color="#ff0000">*</font> required fields
-
-<BR><BR>First package
-
-  <%= use Tie::IxHash;
-      my %pkgpart2payby = map { $_->{pkgpart} => $_->{payby}[0] } @{$packages};
-      tie my %options, 'Tie::IxHash',
-        '' => '(none)',
-        map { $_->{pkgpart} => $_->{pkg} }
-          sort { $a->{recur} <=> $b->{recur} }
-            @{$packages} 
-      ;
-
-      use HTML::Widgets::SelectLayers 0.02;
-      my @form_text = qw( magic ref ss agentnum
-                          last first company address1 address2
-                          city zip daytime night fax
-                          username _password _password2 sec_phrase );
-      my @form_select = qw( state ); #county country
-      if ( scalar(@$pops) == 0 or scalar(@$pops) == 1 ) {
-        push @form_text, 'popnum',
-      } else {
-        push @form_select, 'popnum',
-      }
-      my $widget = new HTML::Widgets::SelectLayers(
-        options => \%options,
-        selected_layer => $pkgpart,
-        form_name => 'dummy',
-        form_action => $self_url,
-        form_text => \@form_text,
-        form_select => \@form_select,
-        layer_callback => sub {
-          my $layer = shift;
-          my $html = qq( <INPUT TYPE="hidden" NAME="pkgpart" VALUE="$layer">);
-
-          if ( $pkgpart2payby{$layer} eq 'BILL' ) {
-            $html .= <<ENDOUT;
-<INPUT TYPE="hidden" NAME="payby" VALUE="BILL">
-<INPUT TYPE="hidden" NAME="invoicing_list_POST" VALUE="">
-<INPUT TYPE="hidden" NAME="BILL_payinfo" VALUE="">
-<INPUT TYPE="hidden" NAME="BILL_month" VALUE="12">
-<INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">
-<INPUT TYPE="hidden" NAME="BILL_payname" VALUE="">
-<BR><BR><INPUT TYPE="submit" VALUE="Signup">
-ENDOUT
-          } elsif ( $pkgpart2payby{$layer} eq 'CARD' ) {
-            my $postal_checked = '';
-            my @invoicing_list = split(', ', $invoicing_list );
-            $postal_checked = 'CHECKED'
-              if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
-
-            $invoicing_list= join(', ', grep { $_ ne 'POST' } @invoicing_list );
-
-            my $expselect = expselect("CARD", $paydate);
-
-            my $cardselect = '<SELECT NAME="CARD_type"><OPTION></OPTION>';
-            my %types = (
-                          'VISA' => 'VISA card',
-                          'MasterCard' => 'MasterCard',
-                          'Discover' => 'Discover card',
-                          'American Express' => 'American Express card',
-                        );
-            foreach ( keys %types ) {
-              $selected =
-                $cgi->param('CARD_type') eq $types{$_} ? 'SELECTED' : '';
-              $cardselect .=
-                qq!<OPTION $selected VALUE="$types{$_}">$_</OPTION>!;
-            }
-            $cardselect .= '</SELECT>';
-
-            $html .= <<ENDOUT;
-<INPUT TYPE="hidden" NAME="payby" VALUE="CARD">
-<BR><BR>Billing information
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0>
-<INPUT TYPE="hidden" NAME="invoicing_list_POST" VALUE="">
-<TR>
-  <TD ALIGN="right">Email statement to </TD>
-  <TD><INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Credit card type</TH>
-  <TD>$cardselect</TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Card number</TH>
-  <TD><INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>*</font>Exp</TH>
-  <TD>$expselect</TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Name on card</TH>
-  <TD><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname"></TD>
-</TR>
-</TABLE>
-<font color="#ff0000">*</font> required fields
-<BR><BR><INPUT TYPE="submit" VALUE="Signup">
-ENDOUT
-          } else {
-            $html = <<ENDOUT;
-<BR>Please select a package.<BR>
-ENDOUT
-
-          }
-
-          $html;
-
-        },
-      );
-
-      $widget->html;
-
-
- %>
-</BODY></HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
deleted file mode 100755
index 08d8a4d45..000000000
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ /dev/null
@@ -1,656 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: signup.cgi,v 1.29 2002-05-30 22:45:20 ivan Exp $
-
-use strict;
-use vars qw( @payby $cgi $locales $packages $pops $init_data $error
-             $last $first $ss $company $address1 $address2 $city $state $county
-             $country $zip $daytime $night $fax $invoicing_list $payby $payinfo
-             $paydate $payname $referral_custnum
-             $pkgpart $username $password $password2 $sec_phrase $popnum
-             $agentnum
-             $ieak_file $ieak_template $cck_file $cck_template
-             $signup_html $signup_template
-             $success_html $success_template
-             $decline_html $decline_template
-             $ac $exch $loc
-             $email_name $pkg
-             $self_url
-           );
-use subs qw( print_form print_okay print_decline
-             signup_default success_default decline_default
-             expselect );
-use CGI;
-#use CGI::Carp qw(fatalsToBrowser);
-use Text::Template;
-use Business::CreditCard;
-use HTTP::Headers::UserAgent 2.00;
-use FS::SignupClient 0.03 qw( signup_info new_customer );
-
-#acceptable payment methods
-#
-#@payby = qw( CARD BILL COMP );
-#@payby = qw( CARD BILL );
-#@payby = qw( CARD );
-@payby = qw( CARD PREPAY );
-
-$ieak_file = '/usr/local/freeside/ieak.template';
-$cck_file = '/usr/local/freeside/cck.template';
-$signup_html = -e 'signup.html'
-                 ? 'signup.html'
-                 : '/usr/local/freeside/signup.html';
-$success_html = -e 'success.html'
-                  ? 'success.html'
-                  : '/usr/local/freeside/success.html';
-$decline_html = -e 'decline.html'
-                  ? 'decline.html'
-                  : '/usr/local/freeside/decline.html';
-
-
-if ( -e $ieak_file ) {
-  my $ieak_txt = Text::Template::_load_text($ieak_file)
-    or die $Text::Template::ERROR;
-  $ieak_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
-  $ieak_txt = $1;
-  $ieak_txt =~ s/\r//g; # don't double \r on old templates
-  $ieak_txt =~ s/\n/\r\n/g;
-  $ieak_template = new Text::Template ( TYPE => 'STRING', SOURCE => $ieak_txt )
-    or die $Text::Template::ERROR;
-} else {
-  $ieak_template = '';
-}
-
-if ( -e $cck_file ) {
-  my $cck_txt = Text::Template::_load_text($cck_file)
-    or die $Text::Template::ERROR;
-  $cck_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
-  $cck_txt = $1;
-  $cck_template = new Text::Template ( TYPE => 'STRING', SOURCE => $cck_txt )
-    or die $Text::Template::ERROR;
-} else {
-  $cck_template = '';
-}
-
-$agentnum = '';
-if ( -e $signup_html ) {
-  my $signup_txt = Text::Template::_load_text($signup_html)
-    or die $Text::Template::ERROR;
-  $signup_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
-  $signup_txt = $1;
-  $signup_template = new Text::Template ( TYPE => 'STRING',
-                                          SOURCE => $signup_txt,
-                                          DELIMITERS => [ '<%=', '%>' ]
-                                        )
-    or die $Text::Template::ERROR;
-  if ( $signup_txt =~
-         /<\s*INPUT TYPE="?hidden"?\s+NAME="?agentnum"?\s+VALUE="?(\d+)"?\s*>/si
-  ) {
-    $agentnum = $1;
-  }
-} else {
-  $signup_template = new Text::Template ( TYPE => 'STRING',
-                                          SOURCE => &signup_default,
-                                          DELIMITERS => [ '<%=', '%>' ]
-                                        )
-    or die $Text::Template::ERROR;
-}
-
-if ( -e $success_html ) {
-  my $success_txt = Text::Template::_load_text($success_html)
-    or die $Text::Template::ERROR;
-  $success_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
-  $success_txt = $1;
-  $success_template = new Text::Template ( TYPE => 'STRING',
-                                           SOURCE => $success_txt,
-                                           DELIMITERS => [ '<%=', '%>' ],
-                                         )
-    or die $Text::Template::ERROR;
-} else {
-  $success_template = new Text::Template ( TYPE => 'STRING',
-                                           SOURCE => &success_default,
-                                           DELIMITERS => [ '<%=', '%>' ],
-                                         )
-    or die $Text::Template::ERROR;
-}
-
-if ( -e $decline_html ) {
-  my $decline_txt = Text::Template::_load_text($decline_html)
-    or die $Text::Template::ERROR;
-  $decline_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
-  $decline_txt = $1;
-  $decline_template = new Text::Template ( TYPE => 'STRING',
-                                           SOURCE => $decline_txt,
-                                           DELIMITERS => [ '<%=', '%>' ],
-                                         )
-    or die $Text::Template::ERROR;
-} else {
-  $decline_template = new Text::Template ( TYPE => 'STRING',
-                                           SOURCE => &decline_default,
-                                           DELIMITERS => [ '<%=', '%>' ],
-                                         )
-    or die $Text::Template::ERROR;
-}
-
-
-( $locales, $packages, $pops, $init_data ) = signup_info();
-@payby = @{$init_data->{'payby'}} if @{$init_data->{'payby'}};
-$packages = $init_data->{agentnum2part_pkg}{$agentnum} if $agentnum;
-
-$cgi = new CGI;
-
-if ( defined $cgi->param('magic') ) {
-  if ( $cgi->param('magic') eq 'process' ) {
-
-    $cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
-      or die "Oops, illegal \"state\" param: ". $cgi->param('state');
-    $state = $1;
-    $county = $3 || '';
-    $country = $4;
-
-    $payby = $cgi->param('payby');
-    $payinfo = $cgi->param( $payby. '_payinfo' );
-    $paydate =
-      $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' );
-    $payname = $cgi->param( $payby. '_payname' );
-
-    if ( $invoicing_list = $cgi->param('invoicing_list') ) {
-      $invoicing_list .= ', POST' if $cgi->param('invoicing_list_POST');
-    } else {
-      $invoicing_list = 'POST';
-    }
-
-    $error = '';
-
-    $last             = $cgi->param('last');
-    $first            = $cgi->param('first');
-    $ss               = $cgi->param('ss');
-    $company          = $cgi->param('company');
-    $address1         = $cgi->param('address1');
-    $address2         = $cgi->param('address2');
-    $city             = $cgi->param('city');
-    #$county,
-    #$state,
-    $zip              = $cgi->param('zip');
-    #$country,
-    $daytime          = $cgi->param('daytime');
-    $night            = $cgi->param('night');
-    $fax              = $cgi->param('fax');
-    #$payby,
-    #$payinfo,
-    #$paydate,
-    #$payname,
-    #$invoicing_list,
-    $referral_custnum = $cgi->param('ref');
-    $pkgpart          = $cgi->param('pkgpart');
-    $username         = $cgi->param('username');
-    $sec_phrase       = $cgi->param('sec_phrase');
-    $password         = $cgi->param('_password');
-    $popnum           = $cgi->param('popnum');
-    #$agentnum, #         = $cgi->param('agentnum'),
-
-    if ( $cgi->param('_password') ne $cgi->param('_password2') ) {
-      $error = $init_data->{msgcat}{passwords_dont_match}; #msgcat
-      $password  = '';
-      $password2 = '';
-    } else {
-      $password2 = $cgi->param('_password2');
-
-      if ( $payby eq 'CARD' && $cgi->param('CARD_type') ) {
-        $payinfo =~ s/\D//g;
-
-        $payinfo =~ /^(\d{13,16})$/
-          or $error ||= $init_data->{msgcat}{invalid_card}; #. $self->payinfo;
-        $payinfo = $1;
-        validate($payinfo)
-          or $error ||= $init_data->{msgcat}{invalid_card}; #. $self->payinfo;
-        cardtype($payinfo) eq $cgi->param('CARD_type')
-          or $error ||= $init_data->{msgcat}{not_a}. $cgi->param('CARD_type');
-      }
-
-      $error ||= new_customer ( {
-        'last'             => $last,
-        'first'            => $first,
-        'ss'               => $ss,
-        'company'          => $company,
-        'address1'         => $address1,
-        'address2'         => $address2,
-        'city'             => $city,
-        'county'           => $county,
-        'state'            => $state,
-        'zip'              => $zip,
-        'country'          => $country,
-        'daytime'          => $daytime,
-        'night'            => $night,
-        'fax'              => $fax,
-        'payby'            => $payby,
-        'payinfo'          => $payinfo,
-        'paydate'          => $paydate,
-        'payname'          => $payname,
-        'invoicing_list'   => $invoicing_list,
-        'referral_custnum' => $referral_custnum,
-        'pkgpart'          => $pkgpart,
-        'username'         => $username,
-        'sec_phrase'       => $sec_phrase,
-        '_password'        => $password,
-        'popnum'           => $popnum,
-        'agentnum'         => $agentnum,
-      } );
-
-    }
-    
-    if ( $error eq '_decline' ) {
-      print_decline();
-    } elsif ( $error ) {
-      print_form();
-    } else {
-      print_okay();
-    }
-
-  } else {
-    die "unrecognized magic: ". $cgi->param('magic');
-  }
-} else {
-  $error = '';
-  $last = '';
-  $first = '';
-  $ss = '';
-  $company = '';
-  $address1 = '';
-  $address2 = '';
-  $city = '';
-  $state = '';
-  $county = '';
-  $country = '';
-  $zip = '';
-  $daytime = '';
-  $night = '';
-  $fax = '';
-  $invoicing_list = '';
-  $payby = '';
-  $payinfo = '';
-  $paydate = '';
-  $payname = '';
-  $pkgpart = '';
-  $username = '';
-  $password = '';
-  $password2 = '';
-  $sec_phrase = '';
-  $popnum = '';
-  $referral_custnum = $cgi->param('ref') || '';
-  print_form;
-}
-
-sub print_form {
-
-  $cgi->delete('ref');
-  $self_url = $cgi->self_url;
-
-  $error = "Error: $error" if $error;
-
-  print $cgi->header( '-expires' => 'now' ),
-        $signup_template->fill_in();
-
-}
-
-sub print_decline {
-  print $cgi->header( '-expires' => 'now' ),
-        $decline_template->fill_in();
-}
-
-sub print_okay {
-  my $user_agent = new HTTP::Headers::UserAgent $ENV{HTTP_USER_AGENT};
-
-  $cgi->param('username') =~ /^(.+)$/
-    or die "fatal: invalid username got past FS::SignupClient::new_customer";
-  my $username = $1;
-  $cgi->param('_password') =~ /^(.+)$/
-    or die "fatal: invalid password got past FS::SignupClient::new_customer";
-  my $password = $1;
-  ( $cgi->param('first'). ' '. $cgi->param('last') ) =~ /^(.*)$/
-    or die "fatal: invalid email_name got past FS::SignupClient::new_customer";
-  $email_name = $1; #global for template
-
-  my $pop = pop_info($cgi->param('popnum'));
-    #or die "fatal: invalid popnum got past FS::SignupClient::new_customer";
-  if ( $pop ) {
-    ( $ac, $exch, $loc ) = ( $pop->{'ac'}, $pop->{'exch'}, $pop->{'loc'} );
-  } else {
-    ( $ac, $exch, $loc ) = ( '', '', ''); #presumably you're not using them.
-  }
-
-  #global for template
-  $pkg = ( grep { $_->{'pkgpart'} eq $pkgpart } @$packages )[0]->{'pkg'};
-
-  if ( $ieak_template
-       && $user_agent->platform eq 'ia32'
-       && $user_agent->os =~ /^win/
-       && ($user_agent->browser)[0] eq 'IE'
-     )
-  { #send an IEAK config
-    print $cgi->header('application/x-Internet-signup'),
-          $ieak_template->fill_in();
-  } elsif ( $cck_template
-            && $user_agent->platform eq 'ia32'
-            && $user_agent->os =~ /^win/
-            && ($user_agent->browser)[0] eq 'Netscape'
-          )
-  { #send a Netscape config
-    my $cck_data = $cck_template->fill_in();
-    print $cgi->header('application/x-netscape-autoconfigure-dialer-v2'),
-          map {
-            m/(.*)\s+(.*)$/;
-            pack("N", length($1)). $1. pack("N", length($2)). $2;
-          } split(/\n/, $cck_data);
-
-  } else { #send a simple confirmation
-    print $cgi->header( '-expires' => 'now' ),
-          $success_template->fill_in();
-  }
-}
-
-sub pop_info {
-  my $popnum = shift;
-  my $pop;
-  foreach $pop ( @{$pops} ) {
-    if ( $pop->{'popnum'} == $popnum ) { return $pop; }
-  }
-  '';
-}
-
-#horrible false laziness with FS/FS/svc_acct_pop.pm::popselector
-sub popselector {
-  my( $popnum, $state ) = @_;
-
-  return '<INPUT TYPE="hidden" NAME="popnum" VALUE="">' unless @$pops;
-  return $pops->[0]{city}. ', '. $pops->[0]{state}.
-         ' ('. $pops->[0]{ac}. ')/'. $pops->[0]{exch}.
-         '<INPUT TYPE="hidden" NAME="popnum" VALUE="'. $pops->[0]{popnum}. '">'
-    if scalar(@$pops) == 1;
-
-  my %pop = ();
-  push @{ $pop{$_->{state}} }, $_ foreach @$pops;
-
-  my $text = <<END;
-    <SCRIPT>
-    function opt(what,href,text) {
-      var optionName = new Option(text, href, false, false)
-      var length = what.length;
-      what.options[length] = optionName;
-    }
-    
-    function popstate_changed(what) {
-      state = what.options[what.selectedIndex].text;
-      for (var i = what.form.popnum.length;i > 0;i--)
-                what.form.popnum.options[i] = null;
-      what.form.popnum.options[0] = new Option("", "", false, true);
-END
-
-  foreach my $popstate ( sort { $a cmp $b } keys %pop ) {
-    $text .= "\nif ( state == \"$popstate\" ) {\n";
-
-    foreach my $pop ( @{$pop{$popstate}}) {
-      my $o_popnum = $pop->{popnum};
-      my $poptext =  $pop->{city}. ', '. $pop->{state}.
-                     ' ('. $pop->{ac}. ')/'. $pop->{exch};
-
-      $text .= "opt(what.form.popnum, \"$o_popnum\", \"$poptext\");\n"
-    }
-    $text .= "}\n";
-  }
-
-  $text .= "}\n</SCRIPT>\n";
-
-  $text .=
-    qq!<SELECT NAME="popstate" SIZE=1 onChange="popstate_changed(this)">!.
-    qq!<OPTION> !;
-  $text .= "<OPTION>$_" foreach sort { $a cmp $b } keys %pop;
-  $text .= '</SELECT>'; #callback? return 3 html pieces?  #'</TD><TD>';
-
-  $text .= qq!<SELECT NAME="popnum" SIZE=1><OPTION> !;
-  foreach my $pop ( @$pops ) {
-    $text .= qq!<OPTION VALUE="!. $pop->{popnum}. '"'.
-             ( ( $popnum && $pop->{popnum} == $popnum ) ? ' SELECTED' : '' ). ">".
-             $pop->{city}. ', '. $pop->{state}.
-               ' ('. $pop->{ac}. ')/'. $pop->{exch};
-  }
-  $text .= '</SELECT>';
-
-  $text;
-}
-
-sub expselect {
-  my $prefix = shift;
-  my $date = shift || '';
-  my( $m, $y ) = ( 0, 0 );
-  if ( $date  =~ /^(\d{4})-(\d{2})-\d{2}$/ ) { #PostgreSQL date format
-    ( $m, $y ) = ( $2, $1 );
-  } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-    ( $m, $y ) = ( $1, $3 );
-  }
-  my $return = qq!<SELECT NAME="$prefix!. qq!_month" SIZE="1">!;
-  for ( 1 .. 12 ) {
-    $return .= "<OPTION";
-    $return .= " SELECTED" if $_ == $m;
-    $return .= ">$_";
-  }
-  $return .= qq!</SELECT>/<SELECT NAME="$prefix!. qq!_year" SIZE="1">!;
-  for ( 2001 .. 2037 ) {
-    $return .= "<OPTION";
-    $return .= " SELECTED" if $_ == $y;
-    $return .= ">$_";
-  }
-  $return .= "</SELECT>";
-
-  $return;
-}
-
-sub success_default { #html to use if you don't specify a success file
-  <<'END';
-<HTML><HEAD><TITLE>Signup successful</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Signup successful</FONT><BR><BR>
-Thanks for signing up!
-<BR><BR>
-Signup information for <%= $email_name %>:
-<BR><BR>
-Username: <%= $username %><BR>
-Password: <%= $password %><BR>
-Access number: (<%= $ac %>) / $exch - $local<BR>
-Package: <%= $pkg %><BR>
-</BODY></HTML>
-END
-}
-
-sub decline_default { #html to use if there is a decline
-  <<'END';
-<HTML><HEAD><TITLE>Processing error</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Processing error</FONT><BR><BR>
-There has been an error processing your account.  Please contact customer
-support.
-</BODY></HTML>
-END
-}
-
-sub signup_default { #html to use if you don't specify a template file
-  <<'END';
-<HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>ISP Signup form</FONT><BR><BR>
-<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
-<FORM ACTION="<%= $self_url %>" METHOD=POST>
-<INPUT TYPE="hidden" NAME="magic" VALUE="process">
-<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
-<INPUT TYPE="hidden" NAME="ss" VALUE="">
-Contact Information
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Contact name<BR>(last, first)</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="last" VALUE="<%= $last %>">,
-                <INPUT TYPE="text" NAME="first" VALUE="<%= $first %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Company</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="<%= $company %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Address</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="<%= $address1 %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">&nbsp;</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="<%= $address2 %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
-  <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
-  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
-  <TD><SELECT NAME="state" SIZE="1">
-
-  <%=
-    foreach ( @{$locales} ) {
-      $OUT .= '<OPTION';
-      $OUT .= ' SELECTED' if ( $state eq $_->{'state'}
-                               && $county eq $_->{'county'}
-                               && $country eq $_->{'country'}
-                             );
-      $OUT .= '>'. $_->{'state'};
-      $OUT .= ' ('. $_->{'county'}. ')' if $_->{'county'};
-      $OUT .= ' / '. $_->{'country'};
-    }
-  %>
-
-  </SELECT></TD>
-  <TH><font color="#ff0000">*</font>Zip</TH>
-  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Day Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="<%= $daytime %>" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Night Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="<%= $night %>" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Fax</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="<%= $fax %>" SIZE=12></TD>
-</TR>
-</TABLE><font color="#ff0000">*</font> required fields<BR>
-<BR>Billing information<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR><TD>
-
-  <%=
-    $OUT .= '<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"';
-    my @invoicing_list = split(', ', $invoicing_list );
-    $OUT .= ' CHECKED'
-      if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
-    $OUT .= '>';
-  %>
-
-  Postal mail invoice
-</TD></TR>
-<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="<%= join(', ', grep { $_ ne 'POST' } split(', ', $invoicing_list ) ) %>">
-</TD></TR>
-<%= scalar(@payby) > 1 ? '<TR><TD>Billing type</TD></TR>' : '' %>
-</TABLE>
-<TABLE BGCOLOR="#c0c0c0" BORDER=1 WIDTH="100%">
-<TR>
-
-  <%=
-
-    my $cardselect = '<SELECT NAME="CARD_type"><OPTION></OPTION>';
-    my %types = (
-                  'VISA' => 'VISA card',
-                  'MasterCard' => 'MasterCard',
-                  'Discover' => 'Discover card',
-                  'American Express' => 'American Express card',
-                );
-    foreach ( keys %types ) {
-      $selected = $cgi->param('CARD_type') eq $types{$_} ? 'SELECTED' : '';
-      $cardselect .= qq!<OPTION $selected VALUE="$types{$_}">$_</OPTION>!;
-    }
-    $cardselect .= '</SELECT>';
-  
-    my %payby = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", "12-2037"). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
-      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
-      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
-    );
-
-    my %paybychecked = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", $paydate). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
-      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
-      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
-    );
-
-    for (@payby) {
-      if ( scalar(@payby) == 1) {
-        $OUT .= '<TD VALIGN=TOP>'.
-                qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$_">!.
-                "$paybychecked{$_}</TD>";
-      } else {
-        $OUT .= qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
-        if ($payby eq $_) {
-          $OUT .= qq! CHECKED> $paybychecked{$_}</TD>!;
-        } else {
-          $OUT .= qq!> $payby{$_}</TD>!;
-        }
-
-      }
-    }
-  %>
-
-</TR></TABLE><font color="#ff0000">*</font> required fields for each billing type
-<BR><BR>First package
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TD COLSPAN=2><SELECT NAME="pkgpart"><OPTION VALUE="">(none)
-
-  <%=
-    foreach my $package ( @{$packages} ) {
-      $OUT .= '<OPTION VALUE="'. $package->{'pkgpart'}. '"';
-      $OUT .= ' SELECTED' if $pkgpart && $package->{'pkgpart'} == $pkgpart;
-      $OUT .= '>'. $package->{'pkg'};
-    }
-  %>
-
-  </SELECT></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Username</TD>
-  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Re-enter Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>"></TD>
-</TR>
-<%=
-  if ( $init_data->{'security_phrase'} ) {
-    $OUT .= <<ENDOUT;
-<TR>
-  <TD ALIGN="right">Security Phrase</TD>
-  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
-  </TD>
-</TR>
-ENDOUT
-  } else {
-    $OUT .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
-  }
-%>
-<%=
-  if ( scalar(@$pops) ) {
-    $OUT .= '<TR><TD ALIGN="right">Access number</TD><TD>'.
-            popselector($popnum). '</TD></TR>';
-  } else {
-    $OUT .= popselector($popnum);
-  }
-%>
-</TABLE>
-<BR><BR><INPUT TYPE="submit" VALUE="Signup">
-</FORM></BODY></HTML>
-END
-}
diff --git a/fs_signup/FS-SignupClient/cgi/signup.html b/fs_signup/FS-SignupClient/cgi/signup.html
deleted file mode 100755
index 6c601410c..000000000
--- a/fs_signup/FS-SignupClient/cgi/signup.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>ISP Signup form</FONT><BR><BR>
-<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
-<FORM ACTION="<%= $self_url %>" METHOD=POST>
-<INPUT TYPE="hidden" NAME="magic" VALUE="process">
-<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
-<INPUT TYPE="hidden" NAME="ss" VALUE="">
-Contact Information
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Contact name<BR>(last, first)</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="last" VALUE="<%= $last %>">,
-                <INPUT TYPE="text" NAME="first" VALUE="<%= $first %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Company</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="<%= $company %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Address</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="<%= $address1 %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">&nbsp;</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="<%= $address2 %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
-  <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
-  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
-  <TD><SELECT NAME="state" SIZE="1">
-
-  <%=
-    foreach ( @{$locales} ) {
-      $OUT .= '<OPTION';
-      $OUT .= ' SELECTED' if ( $state eq $_->{'state'}
-                               && $county eq $_->{'county'}
-                               && $country eq $_->{'country'}
-                             );
-      $OUT .= '>'. $_->{'state'};
-      $OUT .= ' ('. $_->{'county'}. ')' if $_->{'county'};
-      $OUT .= ' / '. $_->{'country'};
-    }
-  %>
-
-  </SELECT></TD>
-  <TH><font color="#ff0000">*</font>Zip</TH>
-  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Day Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="<%= $daytime %>" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Night Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="<%= $night %>" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Fax</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="<%= $fax %>" SIZE=12></TD>
-</TR>
-</TABLE><font color="#ff0000">*</font> required fields<BR>
-<BR>Billing information<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR><TD>
-
-  <%=
-    $OUT .= '<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"';
-    my @invoicing_list = split(', ', $invoicing_list );
-    $OUT .= ' CHECKED'
-      if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
-    $OUT .= '>';
-  %>
-
-  Postal mail invoice
-</TD></TR>
-<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="<%= join(', ', grep { $_ ne 'POST' } split(', ', $invoicing_list ) ) %>">
-</TD></TR>
-<%= scalar(@payby) > 1 ? '<TR><TD>Billing type</TD></TR>' : '' %>
-</TABLE>
-<TABLE BGCOLOR="#c0c0c0" BORDER=1 WIDTH="100%">
-<TR>
-
-  <%=
-
-    my $cardselect = '<SELECT NAME="CARD_type"><OPTION></OPTION>';
-    my %types = (
-                  'VISA' => 'VISA card',
-                  'MasterCard' => 'MasterCard',
-                  'Discover' => 'Discover card',
-                  'American Express' => 'American Express card',
-                );
-    foreach ( keys %types ) {
-      $selected = $cgi->param('CARD_type') eq $types{$_} ? 'SELECTED' : '';
-      $cardselect .= qq!<OPTION $selected VALUE="$types{$_}">$_</OPTION>!;
-    }
-    $cardselect .= '</SELECT>';
-  
-    my %payby = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", "12-2037"). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
-      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
-      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
-    );
-
-    my %paybychecked = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", $paydate). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
-      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
-      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
-    );
-
-    for (@payby) {
-      if ( scalar(@payby) == 1) {
-        $OUT .= '<TD VALIGN=TOP>'.
-                qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$_">!.
-                "$paybychecked{$_}</TD>";
-      } else {
-        $OUT .= qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
-        if ($payby eq $_) {
-          $OUT .= qq! CHECKED> $paybychecked{$_}</TD>!;
-        } else {
-          $OUT .= qq!> $payby{$_}</TD>!;
-        }
-
-      }
-    }
-  %>
-
-</TR></TABLE><font color="#ff0000">*</font> required fields for each billing type
-<BR><BR>First package
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TD COLSPAN=2><SELECT NAME="pkgpart"><OPTION VALUE="">(none)
-
-  <%=
-    foreach my $package ( @{$packages} ) {
-      $OUT .= '<OPTION VALUE="'. $package->{'pkgpart'}. '"';
-      $OUT .= ' SELECTED' if $pkgpart && $package->{'pkgpart'} == $pkgpart;
-      $OUT .= '>'. $package->{'pkg'};
-    }
-  %>
-
-  </SELECT></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Username</TD>
-  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Re-enter Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>"></TD>
-</TR>
-<%=
-  if ( $init_data->{'security_phrase'} ) {
-    $OUT .= <<ENDOUT;
-<TR>
-  <TD ALIGN="right">Security Phrase</TD>
-  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
-  </TD>
-</TR>
-ENDOUT
-  } else {
-    $OUT .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
-  }
-%>
-<%=
-  if ( scalar(@$pops) ) {
-    $OUT .= '<TR><TD ALIGN="right">Access number</TD><TD>'.
-            popselector($popnum). '</TD></TR>';
-  } else {
-    $OUT .= popselector($popnum);
-  }
-%>
-</TABLE>
-<BR><BR><INPUT TYPE="submit" VALUE="Signup">
-</FORM></BODY></HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/success.html b/fs_signup/FS-SignupClient/cgi/success.html
deleted file mode 100644
index 397cc6c30..000000000
--- a/fs_signup/FS-SignupClient/cgi/success.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<HTML><HEAD><TITLE>Signup successful</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Signup successful</FONT><BR><BR>
-Thanks for signing up!
-<BR><BR>
-Signup information for <%= $email_name %>:
-<BR><BR>
-Username: <%= $username %><BR>
-Password: <%= $password %><BR>
-Access number: (<%= $ac %>) / <%= $exch %> - <%= $local %><BR>
-Package: <%= $pkg %><BR>
-</BODY></HTML>
diff --git a/fs_signup/FS-SignupClient/fs_signupd b/fs_signup/FS-SignupClient/fs_signupd
deleted file mode 100755
index 85bd68a2f..000000000
--- a/fs_signup/FS-SignupClient/fs_signupd
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# fs_signupd
-#
-# This is run REMOTELY over ssh by fs_signup_server.
-
-use strict;
-use Socket;
-use Storable qw(nstore_fd fd_retrieve);
-use IO::Handle;
-
-use vars qw( $Debug );
-
-$Debug = 1;
-
-my $fs_signupd_socket = "/usr/local/freeside/fs_signupd_socket";
-my $pid_file = "$fs_signupd_socket.pid";
-
-$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
-$ENV{'SHELL'} = '/bin/sh';
-$ENV{'IFS'} = " \t\n";
-$ENV{'CDPATH'} = '';
-$ENV{'ENV'} = '';
-$ENV{'BASH_ENV'} = '';
-
-$|=1;
-
-warn "[fs_signupd] Reading init data...\n" if $Debug;
-my $init_data = fd_retrieve(\*STDIN);
-
-warn "[fs_signupd] Creating $fs_signupd_socket\n" if $Debug;
-my $uaddr = sockaddr_un($fs_signupd_socket);
-my $proto = getprotobyname('tcp');
-socket(Server,PF_UNIX,SOCK_STREAM,0) or die "socket: $!";
-unlink($fs_signupd_socket);
-bind(Server, $uaddr) or die "bind: $!";
-listen(Server,SOMAXCONN) or die "listen: $!";
-
-if ( -e $pid_file ) {
-  open(PIDFILE,"<$pid_file");
-  #chomp( my $old_pid = <PIDFILE> );
-  my $old_pid = <PIDFILE>;
-  close PIDFILE;
-  $old_pid =~ /^(\d+)$/;
-  kill 'TERM', $1;
-}
-open(PIDFILE,">$pid_file");
-print PIDFILE "$$\n";
-close PIDFILE;
-
-warn "[fs_signupd] Entering main loop...\n" if $Debug;
-my $paddr;
-for ( ; $paddr = accept(Client,Server); close Client) {
-
-  chop( my $command = <Client> );
-
-  if ( $command eq "signup_info" ) {
-
-    warn "[fs_signupd] sending signup info...\n" if $Debug; 
-    nstore_fd($init_data, \*Client) or die "can't send init data: $!";
-    Client->flush;
-
-  } elsif ( $command eq "new_customer" ) {
-
-    #inefficient...
-
-    warn "[fs_signupd] reading customer signup...\n" if $Debug;
-    my $signup_data = fd_retrieve(\*Client);
-
-    warn "[fs_signupd] sending customer data to remote server...\n" if $Debug;
-    nstore_fd($signup_data, \*STDOUT) or die "can't send signup data: $!";
-    STDOUT->flush;
-
-    warn "[fs_signupd] reading error from remote server...\n" if $Debug;
-    my $error = <STDIN>;
-
-    warn "[fs_signupd] sending error to local client...\n" if $Debug;
-    print Client $error;
-    Client->flush;
-
-  } else {
-    die "unexpected command from client: $command";
-  }
-
-}
-
diff --git a/fs_signup/FS-SignupClient/test.pl b/fs_signup/FS-SignupClient/test.pl
deleted file mode 100644
index b6136954d..000000000
--- a/fs_signup/FS-SignupClient/test.pl
+++ /dev/null
@@ -1,20 +0,0 @@
-# Before `make install' is performed this script should be runnable with
-# `make test'. After `make install' it should work as `perl test.pl'
-
-######################### We start with some black magic to print on failure.
-
-# Change 1..1 below to 1..last_test_to_print .
-# (It may become useful if the test is moved to ./t subdirectory.)
-
-BEGIN { $| = 1; print "1..1\n"; }
-END {print "not ok 1\n" unless $loaded;}
-#blah#use FS::SignupClient;
-$loaded = 1;
-print "ok 1\n";
-
-######################### End of black magic.
-
-# Insert your test code below (better if it prints "ok 13"
-# (correspondingly "not ok 13") depending on the success of chunk 13
-# of the test code):
-
diff --git a/fs_signup/cck.template b/fs_signup/cck.template
deleted file mode 100644
index f1db554b1..000000000
--- a/fs_signup/cck.template
+++ /dev/null
@@ -1,14 +0,0 @@
-SITE_FILE	8chrfile
-SITE_NAME	YourISP
-LOGIN	{ $username }
-PASSWORD	{ $password }
-PHONE_NUM	+1({ $ac }){ $exch }-{ $loc }
-DNS_ADDR	10.0.0.1
-DNS_ADDR2	10.0.0.2
-NNTP_HOST	news.yourisp.com
-SMTP_HOST	mail.yourisp.com
-DOMAIN_NAME	yourisp.com
-POP_SERVER	{ $username }@mail.yourisp.com
-POP_PASSWORD	{ $password }
-HOME_URL	http://www.yourisp.com
-EMAIL_ADDR	{ $username }@yourisp.com
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
deleted file mode 100755
index 7f962e057..000000000
--- a/fs_signup/fs_signup_server
+++ /dev/null
@@ -1,269 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# fs_signup_server
-#
-
-use strict;
-use vars qw($pid);
-use IO::Handle;
-use Storable qw(nstore_fd fd_retrieve);
-use Tie::RefHash;
-use Net::SSH qw(sshopen2);
-use FS::UID qw(adminsuidsetup);
-use FS::Conf;
-use FS::Record qw( qsearch qsearchs );
-use FS::cust_main_county;
-use FS::cust_main;
-use FS::Msgcat qw(gettext);
-
-use vars qw( $opt $Debug );
-
-$Debug = 2;
-
-my $user = shift or die &usage;
-&adminsuidsetup( $user ); 
-
-my $conf = new FS::Conf;
-
-#my @payby = qw(CARD PREPAY);
-my @payby = $conf->config('signup_server-payby');
-my $smtpmachine = $conf->config('smtpmachine');
-
-my $machine = shift or die &usage;
-
-my $agentnum = shift or die &usage;
-my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } ) or die &usage;
-my $pkgpart_href = $agent->pkgpart_hashref;
-
-my $refnum = shift or die &usage;
-
-#causing trouble for some folks
-#$SIG{CHLD} = sub { wait() };
-
-$SIG{HUP} = \&killssh;
-$SIG{INT} = \&killssh;
-$SIG{QUIT} = \&killssh;
-$SIG{TERM} = \&killssh;
-$SIG{PIPE} = \&killssh;
-sub killssh { kill 'TERM', $pid if $pid; exit; };
-
-my($fs_signupd)="/usr/local/sbin/fs_signupd";
-
-while (1) {
-  my($reader,$writer)=(new IO::Handle, new IO::Handle);
-  #seems to be broken - calling ->flush explicitly# $writer->autoflush(1);
-  warn "[fs_signup_server] Connecting to $machine...\n" if $Debug;
-  $pid = sshopen2($machine,$reader,$writer,$fs_signupd);
-
-  my @pops = qsearch('svc_acct_pop',{} );
-  my $init_data = {
-
-    #'_protocol' => 'signup',
-    #'_version' => '0.1',
-    #'_packet' => 'init'
-  
-    'cust_main_county' =>
-      [ map { $_->hashref } qsearch('cust_main_county', {}) ],
-      
-    'part_pkg' =>
-      [
-        #map { $_->hashref }
-        map { { 'payby' => [ $_->payby ], %{$_->hashref} } }
-          grep { $_->svcpart('svc_acct') && $pkgpart_href->{ $_->pkgpart } }
-            qsearch( 'part_pkg', { 'disabled' => '' } )
-      ],
-
-    'agentnum2part_pkg' =>
-      {
-        map {
-          my $href = $_->pkgpart_hashref;
-          $_->agentnum =>
-            [
-              map { { 'payby' => [ $_->payby ], %{$_->hashref} } }
-                grep { $_->svcpart('svc_acct') && $href->{ $_->pkgpart } }
-                  qsearch( 'part_pkg', { 'disabled' => '' } )
-            ];
-        } qsearch('agent', {} )
-      },
-
-    'svc_acct_pop' => [ map { $_->hashref } @pops ],
-
-    'security_phrase' => $conf->exists('security_phrase'),
-
-    'payby' => [ $conf->config('signup_server-payby') ],
-
-    'msgcat' => { map { $_=>gettext($_) } qw(
-      passwords_dont_match invalid_card unknown_card_type not_a
-    ) }
-
-  };
-
-  warn "[fs_signup_server] Sending init data...\n" if $Debug;
-  nstore_fd($init_data, $writer) or die "can't send init data: $!";
-  $writer->flush;
-
-  warn "[fs_signup_server] Entering main loop...\n" if $Debug;
-  while (1) {
-    warn "[fs_signup_server] Reading (waiting for) signup data...\n" if $Debug;
-    my $signup_data = fd_retrieve($reader);
-
-    if ( $Debug > 1 ) {
-      warn join('',
-        map { "  $_ => ". $signup_data->{$_}. "\n" } keys %$signup_data );
-    }
-
-    warn "[fs_signup_server] Processing signup...\n" if $Debug;
-
-    my $error = '';
-
-    #things that aren't necessary in base class, but are for signup server
-      #return "Passwords don't match"
-      #  if $hashref->{'_password'} ne $hashref->{'_password2'}
-    $error ||= gettext('empty_password') unless $signup_data->{'_password'};
-    $error ||= gettext('no_access_number_selected')
-      unless $signup_data->{'popnum'} || !scalar(@pops);
-
-    #shares some stuff with htdocs/edit/process/cust_main.cgi... take any
-    # common that are still here and library them.
-    my $cust_main = new FS::cust_main ( {
-      #'custnum'          => '',
-      'agentnum'         => $signup_data->{agentnum} || $agentnum,
-      'refnum'           => $refnum,
-
-      map { $_ => $signup_data->{$_} } qw(
-        last first ss company address1 address2 city county state zip country
-        daytime night fax payby payinfo paydate payname referral_custnum
-      ),
-
-    } );
-
-    $error ||= "Illegal payment type"
-      unless grep { $_ eq $signup_data->{'payby'} } @payby;
-
-    my @invoicing_list = split( /\s*\,\s*/, $signup_data->{'invoicing_list'} );
-
-    $signup_data->{'pkgpart'} =~ /^(\d+)$/ or '' =~ /^()$/;
-    my $pkgpart = $1;
-
-    my $part_pkg =
-      qsearchs( 'part_pkg', { 'pkgpart' => $pkgpart } )
-        or $error ||= "WARNING: unknown pkgpart: $pkgpart";
-    my $svcpart = $part_pkg->svcpart unless $error;
-
-    my $cust_pkg = new FS::cust_pkg ( {
-      #later#'custnum' => $custnum,
-      'pkgpart' => $signup_data->{'pkgpart'},
-    } );
-    $error ||= $cust_pkg->check;
-
-    my $svc_acct = new FS::svc_acct ( {
-      'svcpart'   => $svcpart,
-      map { $_ => $signup_data->{$_} }
-        qw( username _password sec_phrase popnum ),
-    } );
-
-    my $y = $svc_acct->setdefault; # arguably should be in new method
-    $error ||= $y unless ref($y);
-
-    $error ||= $svc_acct->check;
-
-    use Tie::RefHash;
-    tie my %hash, 'Tie::RefHash';
-    %hash = ( $cust_pkg => [ $svc_acct ] );
-    $error ||= $cust_main->insert( \%hash, \@invoicing_list ); #msgcat
-
-    if ( ! $error && $conf->exists('signup_server-realtime') ) {
-
-      warn "[fs_signup_server] Billing customer...\n" if $Debug;
-
-      my $bill_error = $cust_main->bill;
-      warn "[fs_signup_server] error billing new customer: $bill_error"
-        if $bill_error;
-
-      $cust_main->apply_payments;
-      $cust_main->apply_credits;
-
-      $bill_error = $cust_main->collect;
-      warn "[fs_signup_server] error collecting from new customer: $bill_error"
-        if $bill_error;
-
-      if ( $cust_main->balance > 0 ) {
-        #should check list for errors...
-        #$cust_main->suspend;
-        $cust_main->cancel;
-        $error = '_decline';
-      }
-    }
-
-    warn "[fs_signup_server] Sending results...\n" if $Debug;
-    print $writer $error, "\n";
-
-    next if $error;
-
-    if ( $conf->config('signup_server-email') ) {
-      warn "[fs_signup_server] Sending email...\n" if $Debug;
-
-      #false laziness w/FS::cust_bill::send & FS::cust_pay::delete
-      use Mail::Header;
-      use Mail::Internet 1.44;
-      use Date::Format;
-      my $from = $conf->config('invoice_from'); #??? as good as any
-      $ENV{MAILADDRESS} = $from;
-      my $header = new Mail::Header ( [
-        "From: $from",
-        "To: ". $conf->config('signup_server-email'),
-        "Sender: $from",
-        "Reply-To: $from",
-        "Date: ". time2str("%a, %d %b %Y %X %z", time),
-        "Subject: FREESIDE NOTIFICATION: Signup Server",
-      ] );
-      my $body = [
-        "This is an automatic message from your Freeside installation\n",
-        "informing you a customer has signed up via the signup server:\n",
-        "\n",
-        'custnum     : '. $cust_main->custnum. "\n",
-        'Name        : '. $cust_main->last. ", ". $cust_main->first. "\n",
-        'Agent       : '. $cust_main->agent->agent. "\n",
-        'Package     : '. $part_pkg->pkg. ' - '. $part_pkg->comment. "\n",
-        'Signup Date : '. time2str('%C', time). "\n",
-        'Username    : '. $svc_acct->username. "\n",
-        #'Password    : '. # config file to turn this on if noment insists
-        'Day phone   : '. $cust_main->daytime. "\n",
-        'Night phone : '. $cust_main->night. "\n",
-        'Address     : '. $cust_main->address1. "\n",
-        ( $cust_main->address2
-            ? '              '. $cust_main->address2. "\n"
-            : ''                                           ),
-        '              '. $cust_main->city. ', '. $cust_main->state. '  '.
-                          $cust_main->zip. "\n",
-        ( $cust_main->country eq 'US'
-            ? ''
-            : '              '. $cust_main->country. "\n" ),
-        "\n",
-      ];
-      #if ( $cust_main->balance > 0 ) {
-      #  push @$body,
-      #    "This customer has an outstanding balance and has been suspended.\n";
-      #}
-      my $message = new Mail::Internet ( 'Header' => $header, 'Body' => $body );
-      $!=0;
-      $message->smtpsend( Host => $smtpmachine )
-        or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-          or warn "[fs_signup_server] can't send email to ".
-                   $conf->config('signup_server-email').
-                   " via server $smtpmachine with SMTP: $!";
-      #end-of-send mail
-    }
-
-  }
-  close $writer;
-  close $reader;
-  warn "connection to $machine lost!  waiting 60 seconds...\n";
-  sleep 60;
-  warn "reconnecting...\n";
-}
-
-sub usage {
-  die "Usage:\n\n  fs_signup_server user machine agentnum refnum\n";
-}
-
diff --git a/fs_signup/ieak.template b/fs_signup/ieak.template
deleted file mode 100755
index 52edaa951..000000000
--- a/fs_signup/ieak.template
+++ /dev/null
@@ -1,40 +0,0 @@
-[Entry]
-Entry_Name = The Internet
-[Phone]
-Dial_As_Is=no
-Phone_Number = { $exch. $loc }
-Area_Code = { $ac }
-Country_Code = 1
-Country_Id = 1
-[Server]
-Type = PPP
-SW_Compress = Yes
-PW_Encrypt = Yes
-Negotiate_TCP/IP = Yes
-Disable_LCP = No
-[TCP/IP]
-Specify_IP_Address = No
-Specity_Server_Address = No
-IP_Header_Compress = Yes
-Gateway_On_Remote = Yes
-[User]
-Name = { $username }
-Password = { $password }
-Display_Password = Yes
-[Internet_Mail]
-Email_Name = { $email_name }
-Email_Address = { $username }\@domain.tld
-POP_Server = mail.domain.tld
-POP_Server_Port_Number = 110
-POP_Login_Name = { $username }
-POP_Login_Password = { $password }
-SMTP_Server = mail.domain.tld
-SMTP_Server_Port_Number = 25
-Install_Mail = 1
-[Internet_News]
-NNTP_Server = news.domain.tld
-NNTP_Server_Port_Number = 119
-Logon_Required = No
-Install_News = 1
-[Branding]
-Window_Title = The Internet
diff --git a/fs_webdemo/register.cgi b/fs_webdemo/register.cgi
deleted file mode 100755
index 825582262..000000000
--- a/fs_webdemo/register.cgi
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: register.cgi,v 1.5 2000-03-03 18:22:42 ivan Exp $
-
-use strict;
-use vars qw(
-             $datasrc $user $pass $x
-             $cgi $username $email 
-             $dbh $sth
-             );
-             #$freeside_bin $freeside_test $freeside_conf
-             #@pw_set @saltset
-             #$user_pw $crypt_pw 
-             #$header $msg
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use DBI;
-#use Mail::Internet;
-#use Mail::Header;
-#use Date::Format;
-
-$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
-$ENV{'SHELL'} = '/bin/sh';
-$ENV{'IFS'} = " \t\n";
-$ENV{'CDPATH'} = '';
-$ENV{'ENV'} = '';
-$ENV{'BASH_ENV'} = '';
-
-#$freeside_bin = '/home/freeside/bin/';
-#$freeside_test = '/home/freeside/test/';
-#$freeside_conf = '/usr/local/etc/freeside/';
-
-$datasrc = 'DBI:mysql:http_auth';
-$user = "freeside";
-$pass = "maelcolm";
-
-##my(@pw_set)= ( 'a'..'z', 'A'..'Z', '0'..'9', '(', ')', '#', '!', '.', ',' );
-##my(@pw_set)= ( 'a'..'z', 'A'..'Z', '0'..'9' );
-#@pw_set = ( 'a'..'z', '0'..'9' );
-#@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
-
-###
-
-$cgi = new CGI;
-
-$username = $cgi->param('username');
-$username =~ /^\s*([a-z][\w]{0,15})\s*$/i
-  or &idiot("Illegal username.  Please use 1-16 alphanumeric characters, and start your username with a letter.");
-$username = lc($1);
-
-$email = $cgi->param('email');
-$email =~ /^([\w\-\.\+]+\@[\w\-\.]+)$/
-  or &idiot("Illegal email address.");
-$email = $1;
-
-###
-
-#$user_pw = join('',map($pw_set[ int(rand $#pw_set) ], (0..7) ) );
-#$crypt_pw = crypt($user_pw,$saltset[int(rand(64))].$saltset[int(rand(64))]);
-
-###
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-###
-
-$dbh = DBI->connect( $datasrc, $user, $pass, {
-	'AutoCommit' => 'true',
-} ) or die "DBI->connect error: $DBI::errstr\n";
-$x = $DBI::errstr; #silly; to avoid "used only once" warning
-
-$sth = $dbh->prepare("INSERT INTO mysql_auth VALUES (". join(", ",
-  $dbh->quote($username),
-#  $dbh->quote("X"),
-#  $dbh->quote($crypt_pw),
-  $dbh->quote($email),
-  $dbh->quote('freeside'),
-  $dbh->quote('unconfigured'),
-). ")" );
-
-$sth->execute or &idiot("Username in use: ". $sth->errstr);
-
-$dbh->disconnect or die $dbh->errstr;
-
-###
-
-$|=1;
-print $cgi->header;
-print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Freeside demo registration successful</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#FFFFFF">
-  <table>
-    <tr><td>
-    <p align=center>
-      <img border=0 alt="Silicon Interactive Software Design" src="http://www.sisd.com/freeside/small-logo.gif">
-    </td><td>
-    <center><font color="#ff0000" size=7>freeside demo registration successful</font></center>
-    </td></tr>
-  </table>
-  <P>Your sample database has been setup.  Your password and the URL for the
-    Freeside demo have been emailed to you.
-  </BODY>
-</HTML>
-END
-
-###
-
-sub idiot {
-  my($error)=@_;
-  print $cgi->header, <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Registration error</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#FFFFFF">
-    <CENTER>
-    <H4>Registration error</H4>
-    </CENTER>
-    <P><B>$error</B>
-    <P>Hit the <I>Back</I> button in your web browser, correct this mistake,
-       and submit the form again.
-  </BODY>
-</HTML>
-END
-  
-  exit;
- 
-}
diff --git a/fs_webdemo/register.html b/fs_webdemo/register.html
deleted file mode 100644
index acf9cff7f..000000000
--- a/fs_webdemo/register.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>
-      Freeside - Billing and account administration software for ISPs
-    </TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#ffffff">
-  <table>
-    <tr><td>
-      <A HREF="http://www.sisd.com/">
-        <IMG BORDER=0 SRC="small-logo.gif" ALIGN=LEFT>
-      </A>
-    </td><td>
-      <center><font color="#ff0000" size=7 size=+4>freeside demo registration</font></center>
-    </td></tr>
-  </table>
-<P>You will need to choose a username for access to the Freeside web demo.
-
-<P><FONT SIZE=+1 COLOR="#ff0000">A password
-      and the URL for your demo will be emailed to you, so don't waste your
-      time with non-deliverable addresses.</FONT>
-We will <B>not</B> give your email address to any third party,
-      nor will we send you any unsolicited email (or in fact any email after the automatic registration).
-    <FORM ACTION="register.cgi" METHOD="POST">
-      <PRE>
-Freeside username: <INPUT TYPE="text" NAME="username" MAXLENGTH=16>
-
-Email address:     <INPUT TYPE="text" NAME="email">
-</PRE>
-<BR><INPUT TYPE="Submit" VALUE="Register">
-    </FORM>
-  </BODY>
-</HTML>
diff --git a/fs_webdemo/registerd b/fs_webdemo/registerd
deleted file mode 100755
index 6314d0af2..000000000
--- a/fs_webdemo/registerd
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/usr/bin/perl -w
-#
-# $Id: registerd,v 1.8 2000-03-03 12:27:54 ivan Exp $
-
-use strict;
-use vars qw(
-             $freeside_conf
-             $mysql_data
-             $datasrc $user $pass $x
-             $dbh $sth
-             @pw_set @saltset
-             $header $msg
-           );
-            # $freeside_bin $freeside_test 
-            # $cgi $username $name $email $user_pw $crypt_pw 
-#use CGI;
-#use CGI::Carp qw(fatalsToBrowser);
-use DBI;
-use Mail::Internet;
-use Mail::Header;
-use Date::Format;
-
-#$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
-#$ENV{'SHELL'} = '/bin/sh';
-#$ENV{'IFS'} = " \t\n";
-#$ENV{'CDPATH'} = '';
-#$ENV{'ENV'} = '';
-#$ENV{'BASH_ENV'} = '';
-
-#$freeside_bin = '/home/freeside/bin/';
-#$freeside_test = '/home/freeside/test/';
-$freeside_conf = '/usr/local/etc/freeside/';
-
-$mysql_data = "/var/lib/mysql";
-
-$datasrc = 'DBI:mysql:http_auth';
-$user = "freeside";
-$pass = "maelcolm";
-
-#my(@pw_set)= ( 'a'..'z', 'A'..'Z', '0'..'9', '(', ')', '#', '!', '.', ',' );
-#my(@pw_set)= ( 'a'..'z', 'A'..'Z', '0'..'9' );
-@pw_set = ( 'a'..'z', '0'..'9' );
-@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
-
-#die "not running as system user freeside"
-#  unless $> == scalar(getpwnam('freeside'));
-die "not running as root user"
-  unless $> == 0;
-
-$dbh = DBI->connect( $datasrc, $user, $pass, {
-	'AutoCommit' => 'true',
-} ) or die "DBI->connect error: $DBI::errstr\n";
-$x = $DBI::errstr; #silly; to avoid "used only once" warning
-
-while ( 1 ) {
-
-  $SIG{HUP} = 'IGNORE';
-  $SIG{INT} = 'IGNORE';
-  $SIG{QUIT} = 'IGNORE';
-  $SIG{TERM} = 'IGNORE';
-  $SIG{TSTP} = 'IGNORE';
-  $SIG{PIPE} = 'IGNORE';
-
-  $sth = $dbh->prepare("LOCK TABLES mysql_auth WRITE");
-  $sth->execute or die $sth->errstr;
-
-  $sth = $dbh->prepare(
-    'SELECT * FROM mysql_auth WHERE status = "unconfigured"'
-  );
-  $sth->execute or die $sth->errstr;
-  my $pending = $sth->fetchall_arrayref( {} );
-
-  $sth = $dbh->prepare(
-    'UPDATE mysql_auth SET status = "locked" WHERE status = "unconfigured"'
-  );
-  $sth->execute or die $sth->errstr;
-
-  $sth = $dbh->prepare("UNLOCK TABLES");
-  $sth->execute or die $sth->errstr;
-
-  #
-
-  foreach my $row ( @{$pending} ) {
-
-    my $username = $row->{'username'};
-    my $email = $row->{'passwd'};
-
-    system("/usr/bin/mysqladmin --user=$user --password=$pass ".
-      "create demo_$username >/dev/null");
-
-    system "cp -p $mysql_data/demo_template/* $mysql_data/demo_$username";
-
-    mkdir "${freeside_conf}conf.DBI:mysql:demo_$username", 0755;    
-    system "cp -pr ${freeside_conf}conf.DBI:mysql:demo_template/* ".
-           "${freeside_conf}conf.DBI:mysql:demo_$username";
-
-    mkdir "${freeside_conf}counters.DBI:mysql:demo_$username", 0755;    
-    system "cp -p ${freeside_conf}counters.DBI:mysql:demo_template/* ".
-           "${freeside_conf}counters.DBI:mysql:demo_$username";
-    chown scalar(getpwnam('freeside')), scalar(getgrnam('freeside')),
-           "${freeside_conf}counters.DBI:mysql:demo_$username";
-
-    system "cp -p ${freeside_conf}dbdef.DBI:mysql:demo_template ".
-           "${freeside_conf}dbdef.DBI:mysql:demo_$username";
-
-    open(INVOICE_FROM, ">${freeside_conf}conf.DBI:mysql:demo_$username/invoice_from")
-      or die "Can\'t open ${freeside_conf}conf.DBI:mysql:demo_$username/invoice_from: $!";
-    print INVOICE_FROM "$email\n";
-    close INVOICE_FROM;
-
-    open(LPR, ">${freeside_conf}conf.DBI:mysql:demo_$username/lpr")
-      or die "Can\'t open ${freeside_conf}conf.DBI:mysql:demo_$username/lpr: $!";
-    print LPR "mail $email";
-    close LPR;
-
-    open(FROM, ">${freeside_conf}conf.DBI:mysql:demo_$username/registries/internic/from")
-      or die "Can\'t open ${freeside_conf}conf.DBI:mysql:demo_$username/registries/internic/from: $!";
-    print FROM "$email\n";
-    close FROM;
-
-    open(TO, ">${freeside_conf}conf.DBI:mysql:demo_$username/registries/internic/to")
-      or die "Can\'t open ${freeside_conf}conf.DBI:mysql:demo_$username/registries/internic/to: $!";
-    print TO "$email\n";
-    close TO;
-
-    open(SECRETS, ">${freeside_conf}secrets.demo_$username")
-      or die "Can\'t open ${freeside_conf}secrets.demo_$username: $!";
-    chown scalar(getpwnam('freeside')), scalar(getgrnam('freeside')),
-          "${freeside_conf}secrets.demo_$username";
-    chmod 0600, "${freeside_conf}secrets.demo_$username";
-    print SECRETS "DBI:mysql:demo_$username\nfreeside\nmaelcolm\n";
-    close SECRETS;
-
-    open(MAPSECRETS, ">>${freeside_conf}mapsecrets")
-      or die "Can\'t open ${freeside_conf}mapsecrets: $!";
-    print MAPSECRETS "$username secrets.demo_$username\n";
-    close MAPSECRETS;
-
-    my $user_pw = join('',map($pw_set[ int(rand $#pw_set) ], (0..7) ) );
-    my $crypt_pw =
-      crypt($user_pw,$saltset[int(rand(64))].$saltset[int(rand(64))]);
-
-    $sth = $dbh->prepare(
-      qq(UPDATE mysql_auth SET passwd = "$crypt_pw", status = "done" WHERE username = "$username")
-    );
-    $sth->execute or die $sth->errstr;
-
-    $ENV{SMTPHOSTS} = "localhost";
-    $ENV{MAILADDRESS} = 'ivan-fsreg@sisd.com';
-    $ENV{TZ} = "PST8PDT";
-    $header = Mail::Header->new( [
-      'From: ivan-fsreg@sisd.com',
-      "To: $email",
-      'Bcc: ivan-fsreg_bcc@sisd.com',
-      'Sender: ivan-fsreg@sisd.com',
-      'Reply-To: ivan-fsreg@sisd.com',
-      #'Date: '. time2str("%a, %d %b %Y %X %z", time ),
-      'Date: '. time2str("%a, %d %b %Y %X ", time ). "-0800",
-      'Subject: Freeside demo information',
-    ] );
-    $msg = Mail::Internet->new(
-      'Header' => $header,
-      'Body' => [
-    "Hello,\n",
-    "\n",
-    "Your sample Freeside database has been setup.\n",
-    "\n",
-    "Point your web browswer at http://freeside.sisd.com/ and use the following\n",
-    "authentication information:\n",
-    "\n",
-    "Username: $username\n",
-    "Password: $user_pw\n",
-    "\n",
-    "-- \n",
-    "ivan\n",
-                ]
-    );
-    $msg->smtpsend or die "Can\'t send registration email!";
-
-  }
-
-  $SIG{HUP} = 'DEFAULT';
-  $SIG{INT} = 'DEFAULT';
-  $SIG{QUIT} = 'DEFAULT';
-  $SIG{TERM} = 'DEFAULT';
-  $SIG{TSTP} = 'DEFAULT';
-  $SIG{PIPE} = 'DEFAULT';
-
-  sleep 5;
-
-}
-
diff --git a/fs_webdemo/registerd.Pg b/fs_webdemo/registerd.Pg
deleted file mode 100755
index f166846b7..000000000
--- a/fs_webdemo/registerd.Pg
+++ /dev/null
@@ -1,221 +0,0 @@
-#!/usr/bin/perl -w
-#
-# $Id: registerd.Pg,v 1.11 2001-10-24 15:29:30 ivan Exp $
-
-use strict;
-use vars qw(
-             $freeside_conf
-             $mysql_data
-             $datasrc $user $pass $x
-             $dbh $sth
-             @pw_set @saltset
-             $header $msg
-           );
-            # $freeside_bin $freeside_test 
-            # $cgi $username $name $email $user_pw $crypt_pw 
-#use CGI;
-#use CGI::Carp qw(fatalsToBrowser);
-use DBI;
-use Mail::Internet;
-use Mail::Header;
-use Date::Format;
-
-#$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
-#$ENV{'SHELL'} = '/bin/sh';
-#$ENV{'IFS'} = " \t\n";
-#$ENV{'CDPATH'} = '';
-#$ENV{'ENV'} = '';
-#$ENV{'BASH_ENV'} = '';
-
-#$freeside_bin = '/home/freeside/bin/';
-#$freeside_test = '/home/freeside/test/';
-$freeside_conf = '/usr/local/etc/freeside/';
-
-#$mysql_data = "/var/lib/mysql";
-
-$datasrc = 'DBI:mysql:http_auth';
-$user = "freeside";
-$pass = "maelcolm";
-
-#my(@pw_set)= ( 'a'..'z', 'A'..'Z', '0'..'9', '(', ')', '#', '!', '.', ',' );
-#my(@pw_set)= ( 'a'..'z', 'A'..'Z', '0'..'9' );
-@pw_set = ( 'a'..'z', '0'..'9' );
-@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
-
-#die "not running as system user freeside"
-#  unless $> == scalar(getpwnam('freeside'));
-die "not running as root user"
-  unless $> == 0;
-
-$dbh = DBI->connect( $datasrc, $user, $pass, {
-	'AutoCommit' => 'true',
-} ) or die "DBI->connect error: $DBI::errstr\n";
-#$x = $DBI::errstr; #silly; to avoid "used only once" warning
-
-while ( 1 ) {
-
-  $SIG{HUP} = 'IGNORE';
-  $SIG{INT} = 'IGNORE';
-  $SIG{QUIT} = 'IGNORE';
-  $SIG{TERM} = 'IGNORE';
-  $SIG{TSTP} = 'IGNORE';
-  $SIG{PIPE} = 'IGNORE';
-
-  $sth = $dbh->prepare("LOCK TABLES mysql_auth WRITE");
-  $sth->execute or die $sth->errstr;
-
-  $sth = $dbh->prepare(
-    'SELECT * FROM mysql_auth WHERE status = "unconfigured"'
-  );
-  $sth->execute or die $sth->errstr;
-  my $pending = $sth->fetchall_arrayref( {} );
-
-  $sth = $dbh->prepare(
-    'UPDATE mysql_auth SET status = "locked" WHERE status = "unconfigured"'
-  );
-  $sth->execute or die $sth->errstr;
-
-  $sth = $dbh->prepare("UNLOCK TABLES");
-  $sth->execute or die $sth->errstr;
-
-  #
-
-  foreach my $row ( @{$pending} ) {
-
-    my $username = $row->{'username'};
-    my $email = $row->{'passwd'};
-
-    my $pdbh = DBI->connect( 'DBI:Pg:host=localhost;dbname=demo_template', 'freeside', 'maelcolm' )
-      or do { &myerr("$username: ". $DBI::errstr); next; };
-
-    my $psth = $pdbh->prepare("CREATE DATABASE demo_$username")
-      or do { &myerr("$username: ". $pdbh->errstr); next; };
-    $psth->execute()
-      or do { &myerr("$username: ". $psth->errstr); next; };
-
-    $pdbh->disconnect
-      or do { &myerr("fatal: $DBI::errstr"); die; };
-
-    open(PSQL,"|psql -U freeside demo_$username")
-      or do { &myerr("|psql -U freeside demo_$username: $!"); next; };
-    open(PSQLDATA, "</usr/local/etc/freeside/demo_template.Pg")
-      or do { &myerr("/usr/local/etc/freeside/demo_template.Pg: $!"); next; };
-    while(<PSQLDATA>) {
-      print PSQL $_;
-    }
-    close PSQLDATA
-      or do { &myerr("/usr/local/etc/freeside/demo_template.Pg: $!"); next; };
-    close PSQL
-      or do { &myerr("|psql -U freeside demo_$username: $!"); next; };
-
-    mkdir "${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username", 0755;    
-    system "cp -pr ${freeside_conf}conf.DBI:Pg:host=localhost\\;dbname=demo_template/* ".
-           "${freeside_conf}conf.DBI:Pg:host=localhost\\;dbname=demo_$username";
-
-    mkdir "${freeside_conf}counters.DBI:Pg:host=localhost;dbname=demo_$username", 0755;    
-    system "cp -p ${freeside_conf}counters.DBI:Pg:host=localhost\\;dbname=demo_template/* ".
-           "${freeside_conf}counters.DBI:Pg:host=localhost\\;dbname=demo_$username";
-    chown scalar(getpwnam('freeside')), scalar(getgrnam('freeside')),
-           "${freeside_conf}counters.DBI:Pg:host=localhost;dbname=demo_$username";
-
-    system "cp -p ${freeside_conf}dbdef.DBI:Pg:host=localhost\\;dbname=demo_template ".
-           "${freeside_conf}dbdef.DBI:Pg:host=localhost\\;dbname=demo_$username";
-
-    open(INVOICE_FROM, ">${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/invoice_from")
-      or die "Can\'t open ${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/invoice_from: $!";
-    print INVOICE_FROM "$email\n";
-    close INVOICE_FROM;
-
-    open(LPR, ">${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/lpr")
-      or die "Can\'t open ${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/lpr: $!";
-    print LPR "mail $email";
-    close LPR;
-
-#    open(FROM, ">${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/registries/internic/from")
-#      or die "Can\'t open ${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/registries/internic/from: $!";
-#    print FROM "$email\n";
-#    close FROM;
-#
-#    open(TO, ">${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/registries/internic/to")
-#      or die "Can\'t open ${freeside_conf}conf.DBI:Pg:host=localhost;dbname=demo_$username/registries/internic/to: $!";
-#    print TO "$email\n";
-#    close TO;
-
-    open(SECRETS, ">${freeside_conf}secrets.demo_$username")
-      or die "Can\'t open ${freeside_conf}secrets.demo_$username: $!";
-    chown scalar(getpwnam('freeside')), scalar(getgrnam('freeside')),
-          "${freeside_conf}secrets.demo_$username";
-    chmod 0600, "${freeside_conf}secrets.demo_$username";
-    print SECRETS "DBI:Pg:host=localhost;dbname=demo_$username\nfreeside\nmaelcolm\n";
-    close SECRETS;
-
-    open(MAPSECRETS, ">>${freeside_conf}mapsecrets")
-      or die "Can\'t open ${freeside_conf}mapsecrets: $!";
-    print MAPSECRETS "$username secrets.demo_$username\n";
-    close MAPSECRETS;
-
-    my $user_pw = join('',map($pw_set[ int(rand $#pw_set) ], (0..7) ) );
-    my $crypt_pw =
-      crypt($user_pw,$saltset[int(rand(64))].$saltset[int(rand(64))]);
-
-    $sth = $dbh->prepare(
-      qq(UPDATE mysql_auth SET passwd = "$crypt_pw", status = "done" WHERE username = "$username")
-    );
-    $sth->execute or die $sth->errstr;
-
-    #$ENV{SMTPHOSTS} = "localhost";
-    $ENV{SMTPHOSTS} = "192.168.1.1";
-    $ENV{MAILADDRESS} = 'ivan-fsreg@sisd.com';
-    $ENV{TZ} = "PST8PDT";
-    $header = Mail::Header->new( [
-      'From: ivan-fsreg@sisd.com',
-      "To: $email",
-      'Bcc: ivan-fsreg_bcc@sisd.com',
-      'Sender: ivan-fsreg@sisd.com',
-      'Reply-To: ivan-fsreg@sisd.com',
-      #'Date: '. time2str("%a, %d %b %Y %X %z", time ),
-      'Date: '. time2str("%a, %d %b %Y %X ", time ). "-0800",
-      'Subject: Freeside demo information',
-    ] );
-    $msg = Mail::Internet->new(
-      'Header' => $header,
-      'Body' => [
-    "Hello,\n",
-    "\n",
-    "Your sample Freeside database has been setup.\n",
-    "\n",
-    "Your login and database will be automatically deleted in 1-2 months.\n",
-    "\n",        
-    "Point your web browswer at http://freeside.sisd.com/ and use the following\n",
-    "authentication information:\n",
-    "\n",
-    "Username: $username\n",
-    "Password: $user_pw\n",
-    "\n",
-    "-- \n",
-    "ivan\n",
-                ]
-    );
-    $msg->smtpsend or die "Can\'t send registration email!";
-
-  }
-
-  $SIG{HUP} = 'DEFAULT';
-  $SIG{INT} = 'DEFAULT';
-  $SIG{QUIT} = 'DEFAULT';
-  $SIG{TERM} = 'DEFAULT';
-  $SIG{TSTP} = 'DEFAULT';
-  $SIG{PIPE} = 'DEFAULT';
-
-  sleep 5;
-
-}
-
-sub myerr {
-  my $msg = shift;
-  open(MAIL,"|mail ivan-fsdemoerr\@420.am");
-  print MAIL $msg, "\n\n";
-  print MAIL $msg, "\n\n";
-  close MAIL;
-};
-
diff --git a/htetc/global.asa b/htetc/global.asa
deleted file mode 100644
index d04a5edbf..000000000
--- a/htetc/global.asa
+++ /dev/null
@@ -1,83 +0,0 @@
-use strict;
-use vars qw( $cgi $p );
-use CGI;
-#use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use Date::Parse;
-use Tie::IxHash;
-use HTML::Entities;
-use IO::Handle;
-use IO::File;
-use String::Approx qw(amatch);
-use HTML::Widgets::SelectLayers 0.02;
-use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
-use FS::Record qw(qsearch qsearchs fields dbdef);
-use FS::Conf;
-use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
-               small_custview myexit);
-use FS::Msgcat qw(gettext geterror);
-
-use FS::agent;
-use FS::agent_type;
-use FS::domain_record;
-use FS::cust_bill;
-use FS::cust_bill_pay;
-use FS::cust_credit;
-use FS::cust_credit_bill;
-use FS::cust_main;
-use FS::cust_main_county;
-use FS::cust_pay;
-use FS::cust_pkg;
-use FS::cust_refund;
-use FS::cust_svc;
-use FS::nas;
-use FS::part_bill_event;
-use FS::part_pkg;
-use FS::part_referral;
-use FS::part_svc;
-use FS::pkg_svc;
-use FS::port;
-use FS::queue qw(joblisting);
-use FS::raddb;
-use FS::session;
-use FS::svc_acct;
-use FS::svc_acct_pop qw(popselector);
-use FS::svc_acct_sm;
-use FS::svc_domain;
-use FS::svc_forward;
-use FS::svc_www;
-use FS::type_pkgs;
-use FS::part_export;
-use FS::part_export_option;
-use FS::export_svc;
-use FS::msgcat;
-
-sub Script_OnStart {
-  $Response->AddHeader('Pragma' => 'no-cache');
-  $Response->AddHeader('Cache-control' => 'no-cache');
-#  $Response->AddHeader('Expires' => 0);
-  $Response->{Expires} = -36288000;
-
-  $cgi = new CGI;
-  &cgisuidsetup($cgi);
-  $p = popurl(2);
-  #print $cgi->header( '-expires' => 'now' );
-}
-
-sub Script_OnFlush {
-  my $ref = $Response->{BinaryRef};
-  $$ref = $cgi->header( @FS::CGI::header ) . $$ref;
-  if ( dbh->can('sprintProfile') ) {
-
-    $$ref =~ s/<\/BODY>[\s\n]*<\/HTML>[\s\n]*$//i
-      or warn "can't remove";
-  
-    #$$ref .= '<PRE>'. ("\n"x96). encode_entities(dbh->sprintProfile()). '</PRE>';
-    #  wtf?  konqueror...
-    $$ref .= '<PRE>'. ("\n"x4096). encode_entities(dbh->sprintProfile()). '</PRE>';
-
-    $$ref .= '</BODY></HTML>';
-    
-    dbh->{'private_profile'} = {};
-  }
-}
diff --git a/htetc/handler.pl b/htetc/handler.pl
deleted file mode 100644
index 49bcbc08c..000000000
--- a/htetc/handler.pl
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/usr/bin/perl
-#
-# This is a basic, fairly fuctional Mason handler.pl.
-#
-# For something a little more involved, check out session_handler.pl
-
-package HTML::Mason;
-
-# Bring in main Mason package.
-use HTML::Mason;
-
-# Bring in ApacheHandler, necessary for mod_perl integration.
-# Uncomment the second line (and comment the first) to use
-# Apache::Request instead of CGI.pm to parse arguments.
-use HTML::Mason::ApacheHandler;
-# use HTML::Mason::ApacheHandler (args_method=>'mod_perl');
-
-# Uncomment the next line if you plan to use the Mason previewer.
-#use HTML::Mason::Preview;
-
-use strict;
-
-# List of modules that you want to use from components (see Admin
-# manual for details)
-#{  package HTML::Mason::Commands;
-#   use CGI;
-#}
-
-# Create Mason objects
-#
-my $parser = new HTML::Mason::Parser;
-my $interp = new HTML::Mason::Interp (parser=>$parser,
-                                      comp_root=>'/var/www/masondocs',
-                                      data_dir=>'/home/ivan/freeside_current/masondata',
-                                      out_mode=>'stream',
-                                     );
-my $ah = new HTML::Mason::ApacheHandler ( interp => $interp,
-                                          #auto_send_headers => 0,
-                                        );
-
-# Activate the following if running httpd as root (the normal case).
-# Resets ownership of all files created by Mason at startup.
-#
-chown (Apache->server->uid, Apache->server->gid, $interp->files_written);
-
-sub handler
-{
-    my ($r) = @_;
-
-    # If you plan to intermix images in the same directory as
-    # components, activate the following to prevent Mason from
-    # evaluating image files as components.
-    #
-    #return -1 if $r->content_type && $r->content_type !~ m|^text/|i;
-
-    #rar
-    { package HTML::Mason::Commands;
-      use strict;
-      use vars qw( $cgi $p );
-      use CGI;
-      #use CGI::Carp qw(fatalsToBrowser);
-      use Date::Format;
-      use Date::Parse;
-      use Tie::IxHash;
-      use HTML::Entities;
-      use IO::Handle;
-      use IO::File;
-      use String::Approx qw(amatch);
-      use HTML::Widgets::SelectLayers 0.02;
-      use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
-      use FS::Record qw(qsearch qsearchs fields dbdef);
-      use FS::Conf;
-      use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
-                     small_custview myexit);
-      use FS::Msgcat qw(gettext geterror);
-
-      use FS::agent;
-      use FS::agent_type;
-      use FS::domain_record;
-      use FS::cust_bill;
-      use FS::cust_bill_pay;
-      use FS::cust_credit;
-      use FS::cust_credit_bill;
-      use FS::cust_main;
-      use FS::cust_main_county;
-      use FS::cust_pay;
-      use FS::cust_pkg;
-      use FS::cust_refund;
-      use FS::cust_svc;
-      use FS::nas;
-      use FS::part_bill_event;
-      use FS::part_pkg;
-      use FS::part_referral;
-      use FS::part_svc;
-      use FS::pkg_svc;
-      use FS::port;
-      use FS::queue qw(joblisting);
-      use FS::raddb;
-      use FS::session;
-      use FS::svc_acct;
-      use FS::svc_acct_pop qw(popselector);
-      use FS::svc_acct_sm;
-      use FS::svc_domain;
-      use FS::svc_forward;
-      use FS::svc_www;
-      use FS::type_pkgs;
-      use FS::part_export;
-      use FS::part_export_option;
-      use FS::export_svc;
-      use FS::msgcat;
-
-      *CGI::redirect = sub {
-        my( $self, $location ) = @_;
-
-        #http://www.masonhq.com/docs/faq/#how_do_i_do_an_external_redirect
-        $m->clear_buffer;
-        # The next two lines are necessary to stop Apache from re-reading
-        # POSTed data.
-        $r->method('GET');
-        $r->headers_in->unset('Content-length');
-        $r->content_type('text/html');
-        #$r->err_header_out('Location' => $location);
-        $r->header_out('Location' => $location);
-         $r->header_out('Content-Type' => 'text/html');
-         $m->abort(302);
-
-        '';
-      };
-
-      $cgi = new CGI;
-      &cgisuidsetup($cgi);
-      #&cgisuidsetup($r);
-      $p = popurl(2);
-    }
-
-    $r->content_type('text/html');
-    #eorar
-
-    my $headers = $r->headers_out;
-    $headers->{'Pragma'} = $headers->{'Cache-control'} = 'no-cache';
-    #$r->no_cache(1);
-    $headers->{'Expires'} = '0';
-
-#    $r->send_http_header;
-
-    my $status = $ah->handle_request($r);
-
-    $status;
-}
-
-1;
diff --git a/httemplate/.htaccess b/httemplate/.htaccess
deleted file mode 100755
index f8c6b9c0c..000000000
--- a/httemplate/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-AuthName        Freeside
-AuthType        Basic
-require valid-user
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
deleted file mode 100755
index cff111ca4..000000000
--- a/httemplate/browse/agent.cgi
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- mason kludge -->
-<%
-#Begin silliness
-#
-#use FS::UI::CGI;
-#use FS::UI::agent;
-#
-#$ui = new FS::UI::agent;
-#$ui->browse;
-#exit;
-#__END__
-#End silliness
-%>
-
-<%= header('Agent Listing', menubar(
-  'Main Menu'   => $p,
-  'Agent Types' => $p. 'browse/agent_type.cgi',
-#  'Add new agent' => '../edit/agent.cgi'
-)) %>
-Agents are resellers of your service. Agents may be limited to a subset of your
-full offerings (via their type).<BR><BR>
-<A HREF="<%= $p %>edit/agent.cgi"><I>Add a new agent</I></A><BR><BR>
-
-<%= table() %>
-<TR>
-  <TH COLSPAN=2>Agent</TH>
-  <TH>Type</TH>
-  <TH><FONT SIZE=-1>Freq.</FONT></TH>
-  <TH><FONT SIZE=-1>Prog.</FONT></TH>
-</TR>
-<% 
-#        <TH><FONT SIZE=-1>Agent #</FONT></TH>
-#        <TH>Agent</TH>
-
-foreach my $agent ( sort { 
-  #$a->getfield('agentnum') <=> $b->getfield('agentnum')
-  $a->getfield('agent') cmp $b->getfield('agent')
-} qsearch('agent',{}) ) {
-  my($hashref)=$agent->hashref;
-  my($typenum)=$hashref->{typenum};
-  my($agent_type)=qsearchs('agent_type',{'typenum'=>$typenum});
-  my($atype)=$agent_type->getfield('atype');
-  print <<END;
-      <TR>
-        <TD><A HREF="${p}edit/agent.cgi?$hashref->{agentnum}">
-          $hashref->{agentnum}</A></TD>
-        <TD><A HREF="${p}edit/agent.cgi?$hashref->{agentnum}">
-          $hashref->{agent}</A></TD>
-        <TD><A HREF="${p}edit/agent_type.cgi?$typenum">$atype</A></TD>
-        <TD>$hashref->{freq}</TD>
-        <TD>$hashref->{prog}</TD>
-      </TR>
-END
-
-}
-
-print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
deleted file mode 100755
index 5a8438589..000000000
--- a/httemplate/browse/agent_type.cgi
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- mason kludge -->
-<%= header("Agent Type Listing", menubar(
-  'Main Menu' => $p,
-  'Agents'    => $p. 'browse/agent.cgi',
-)) %>
-Agent types define groups of packages that you can then assign to particular
-agents.<BR><BR>
-<A HREF="<%= $p %>edit/agent_type.cgi"><I>Add a new agent type</I></A><BR><BR>
-
-<%= table() %>
-<TR>
-  <TH COLSPAN=2>Agent Type</TH>
-  <TH COLSPAN=2>Packages</TH>
-</TR>
-
-<% 
-foreach my $agent_type ( sort { 
-  $a->getfield('typenum') <=> $b->getfield('typenum')
-} qsearch('agent_type',{}) ) {
-  my($hashref)=$agent_type->hashref;
-  my(@type_pkgs)=qsearch('type_pkgs',{'typenum'=> $hashref->{typenum} });
-  my($rowspan)=scalar(@type_pkgs);
-  $rowspan = int($rowspan/2+0.5) ;
-  print <<END;
-      <TR>
-        <TD ROWSPAN=$rowspan><A HREF="${p}edit/agent_type.cgi?$hashref->{typenum}">
-          $hashref->{typenum}
-        </A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="${p}edit/agent_type.cgi?$hashref->{typenum}">$hashref->{atype}</A></TD>
-END
-
-  my($type_pkgs);
-  my($tdcount) = -1 ;
-  foreach $type_pkgs ( @type_pkgs ) {
-    my($pkgpart)=$type_pkgs->getfield('pkgpart');
-    my($part_pkg) = qsearchs('part_pkg',{'pkgpart'=> $pkgpart });
-    print qq!<TR>! if ($tdcount == 0) ;
-    $tdcount = 0 if ($tdcount == -1) ;
-    print qq!<TD><A HREF="${p}edit/part_pkg.cgi?$pkgpart">!,
-          $part_pkg->getfield('pkg'),"</A></TD>";
-    $tdcount ++ ;
-    if ($tdcount == 2)
-    {
-	print qq!</TR>\n! ;
-	$tdcount = 0 ;
-    }
-  }
-
-  print "</TR>";
-}
-
-print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
deleted file mode 100755
index 991606087..000000000
--- a/httemplate/browse/cust_main_county.cgi
+++ /dev/null
@@ -1,127 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $conf = new FS::Conf;
-my $enable_taxclasses = $conf->exists('enable_taxclasses');
-
-print header("Tax Rate Listing", menubar(
-  'Main Menu' => $p,
-  'Edit tax rates' => $p. "edit/cust_main_county.cgi",
-)),<<END;
-    Click on <u>expand country</u> to specify a country's tax rates by state.
-    <BR>Click on <u>expand state</u> to specify a state's tax rates by county.
-END
-
-if ( $enable_taxclasses ) {
-  print '<BR>Click on <u>expand taxclasses</u> to specify tax classes';
-}
-
-print '<BR><BR>'. &table(). <<END;
-      <TR>
-        <TH><FONT SIZE=-1>Country</FONT></TH>
-        <TH><FONT SIZE=-1>State</FONT></TH>
-        <TH>County</TH>
-        <TH>Taxclass</TH>
-        <TH><FONT SIZE=-1>Tax</FONT></TH>
-        <TH><FONT SIZE=-1>Exempt<BR>per<BR>month</TH>
-      </TR>
-END
-
-my @regions = sort {    $a->country  cmp $b->country
-                     or $a->state    cmp $b->state
-                     or $a->county   cmp $b->county
-                     or $a->taxclass cmp $b->taxclass
-                   } qsearch('cust_main_county',{});
-
-my $sup=0;
-#foreach $cust_main_county ( @regions ) {
-for ( my $i=0; $i<@regions; $i++ ) { 
-  my $cust_main_county = $regions[$i];
-  my $hashref = $cust_main_county->hashref;
-  print <<END;
-      <TR>
-        <TD BGCOLOR="#ffffff">$hashref->{country}</TD>
-END
-
-  my $j;
-  if ( $sup ) {
-    $sup--;
-  } else {
-
-    #lookahead
-    for ( $j=1; $i+$j<@regions; $j++ ) {
-      last if $hashref->{country} ne $regions[$i+$j]->country
-           || $hashref->{state} ne $regions[$i+$j]->state
-           || $hashref->{tax} != $regions[$i+$j]->tax
-           || $hashref->{exempt_amount} != $regions[$i+$j]->exempt_amount;
-    }
-
-    my $newsup=0;
-    if ( $j>1 && $i+$j+1 < @regions
-         && ( $hashref->{state} ne $regions[$i+$j+1]->state 
-              || $hashref->{country} ne $regions[$i+$j+1]->country
-              )
-         && ( ! $i
-              || $hashref->{state} ne $regions[$i-1]->state 
-              || $hashref->{country} ne $regions[$i-1]->country
-              )
-       ) {
-       $sup = $j-1;
-    } else {
-      $j = 1;
-    }
-
-    print "<TD ROWSPAN=$j", $hashref->{state}
-        ? ' BGCOLOR="#ffffff">'. $hashref->{state}
-        : qq! BGCOLOR="#cccccc">(ALL) <FONT SIZE=-1>!.
-          qq!<A HREF="${p}edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
-          qq!">expand country</A></FONT>!;
-
-    print qq! <FONT SIZE=-1><A HREF="${p}edit/process/cust_main_county-collapse.cgi?!. $hashref->{taxnum}. qq!">collapse state</A></FONT>! if $j>1;
-
-    print "</TD>";
-  }
-
-#  $sup=$newsup;
-
-  print "<TD";
-  if ( $hashref->{county} ) {
-    print ' BGCOLOR="#ffffff">'. $hashref->{county};
-  } else {
-    print ' BGCOLOR="#cccccc">(ALL)';
-    if ( $hashref->{state} ) {
-      print qq!<FONT SIZE=-1>!.
-          qq!<A HREF="${p}edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
-          qq!">expand state</A></FONT>!;
-    }
-  }
-  print "</TD>";
-
-  print "<TD";
-  if ( $hashref->{taxclass} ) {
-    print ' BGCOLOR="#ffffff">'. $hashref->{taxclass};
-  } else {
-    print ' BGCOLOR="#cccccc">(ALL)';
-    if ( $enable_taxclasses ) {
-      print qq!<FONT SIZE=-1>!.
-            qq!<A HREF="${p}edit/cust_main_county-expand.cgi?taxclass!.
-            $hashref->{taxnum}. qq!">expand taxclasses</A></FONT>!;
-    }
-
-  }
-  print "</TD>";
-
-  print "<TD BGCOLOR=\"#ffffff\">$hashref->{tax}%</TD>".
-        '<TD BGCOLOR="#ffffff">$'.
-          sprintf("%.2f", $hashref->{exempt_amount} || 0). '</TD>'.
-        '</TR>';
-
-}
-
-print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/browse/cust_pay_batch.cgi b/httemplate/browse/cust_pay_batch.cgi
deleted file mode 100755
index 608a58d0d..000000000
--- a/httemplate/browse/cust_pay_batch.cgi
+++ /dev/null
@@ -1,52 +0,0 @@
-<!-- mason kludge -->
-<%
-
-print header("Pending credit card batch", menubar(
-  'Main Menu' => $p,
-#  'Add new referral' => "../edit/part_referral.cgi",
-)), &table(), <<END;
-      <TR>
-        <TH>#</TH>
-        <TH><font size=-1>inv#</font></TH>
-        <TH COLSPAN=2>Customer</TH>
-        <TH>Card name</TH>
-        <TH>Card</TH>
-        <TH>Exp</TH>
-        <TH>Amount</TH>
-      </TR>
-END
-
-foreach my $cust_pay_batch ( sort { 
-  $a->getfield('paybatchnum') <=> $b->getfield('paybatchnum')
-} qsearch('cust_pay_batch',{}) ) {
-#  my $date = time2str( "%a %b %e %T %Y", $queue->_date );
-#  my $status = $hashref->{status};
-#  if ( $status eq 'failed' || $status eq 'locked' ) {
-#    $status .=
-#      qq! ( <A HREF="$p/edit/cust_pay_batch.cgi?jobnum=$jobnum&action=new">retry</A> |!.
-#      qq! <A HREF="$p/edit/cust_pay_batch.cgi?jobnum$jobnum&action=del">remove </A> )!;
-#  }
-  my $cardnum = $cust_pay_batch->{cardnum};
-  $cardnum =~ s/.{4}$/xxxx/;
-  print <<END;
-      <TR>
-        <TD>$cust_pay_batch->{paybatchnum}</TD>
-        <TD><A HREF="../view/cust_bill.cgi?$cust_pay_batch->{invnum}">$cust_pay_batch->{invnum}</TD>
-        <TD><A HREF="../view/cust_main.cgi?$cust_pay_batch->{custnum}">$cust_pay_batch->{custnum}</TD>
-        <TD>$cust_pay_batch->{last}, $cust_pay_batch->{last}</TD>
-        <TD>$cust_pay_batch->{payname}</TD>
-        <TD>$cardnum</TD>
-        <TD>$cust_pay_batch->{exp}</TD>
-        <TD align="right">\$$cust_pay_batch->{amount}</TD>
-      </TR>
-END
-
-}
-
-print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/browse/msgcat.cgi b/httemplate/browse/msgcat.cgi
deleted file mode 100755
index d4adf9f1a..000000000
--- a/httemplate/browse/msgcat.cgi
+++ /dev/null
@@ -1,50 +0,0 @@
-<!-- mason kludge -->
-<%
-
-print header("View Message catalog", menubar(
-  'Main Menu' => $p,
-  'Edit message catalog' => $p. "edit/msgcat.cgi",
-)), '<BR>';
-
-my $widget = new HTML::Widgets::SelectLayers(
-  'selected_layer' => 'en_US',
-  'options'        => { 'en_US'=>'en_US' },
-  'layer_callback' => sub {
-    my $layer = shift;
-    my $html = "<BR>Messages for locale $layer<BR>". table().
-               "<TR><TH COLSPAN=2>Code</TH>".
-               "<TH>Message</TH>";
-    $html .= "<TH>en_US Message</TH>" unless $layer eq 'en_US';
-    $html .= '</TR>';
-
-    #foreach my $msgcat ( sort { $a->msgcode cmp $b->msgcode }
-    #                       qsearch('msgcat', { 'locale' => $layer } ) ) {
-    foreach my $msgcat ( qsearch('msgcat', { 'locale' => $layer } ) ) {
-      $html .= '<TR><TD>'. $msgcat->msgnum. '</TD>'.
-               '<TD>'. $msgcat->msgcode. '</TD>'.
-               '<TD>'. $msgcat->msg. '</TD>';
-      unless ( $layer eq 'en_US' ) {
-        my $en_msgcat = qsearchs('msgcat', {
-          'locale'  => 'en_US',
-          'msgcode' => $msgcat->msgcode,
-        } );
-        $html .= '<TD>'. $en_msgcat->msg. '</TD>';
-      }
-      $html .= '</TR>';
-    }
-
-    $html .= '</TABLE>';
-    $html;
-  },
-
-);
-
-print $widget->html;
-
-print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/browse/nas.cgi b/httemplate/browse/nas.cgi
deleted file mode 100755
index 9ccbfe632..000000000
--- a/httemplate/browse/nas.cgi
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- mason kludge -->
-<%
-
-print header('NAS ports', menubar(
-  'Main Menu' => $p,
-));
-
-my $now = time;
-
-foreach my $nas ( sort { $a->nasnum <=> $b->nasnum } qsearch( 'nas', {} ) ) {
-  print $nas->nasnum. ": ". $nas->nas. " ".
-        $nas->nasfqdn. " (". $nas->nasip. ") ".
-        "as of ". time2str("%c",$nas->last).
-        " (". &pretty_interval($now - $nas->last). " ago)<br>".
-        &table(). "<TR><TH>Nas<BR>Port #</TH><TH>Global<BR>Port #</BR></TH>".
-        "<TH>IP address</TH><TH>User</TH><TH>Since</TH><TH>Duration</TH><TR>",
-  ;
-  foreach my $port ( sort {
-    $a->nasport <=> $b->nasport || $a->portnum <=> $b->portnum
-  } qsearch( 'port', { 'nasnum' => $nas->nasnum } ) ) {
-    my $session = $port->session;
-    my($user, $since, $pretty_since, $duration);
-    if ( ! $session ) {
-      $user = "(empty)";
-      $since = 0;
-      $pretty_since = "(never)";
-      $duration = '';
-    } elsif ( $session->logout ) {
-      $user = "(empty)";
-      $since = $session->logout;
-    } else {
-      my $svc_acct = $session->svc_acct;
-      $user = "<A HREF=\"$p/view/svc_acct.cgi?". $svc_acct->svcnum. "\">".
-              $svc_acct->username. "</A>";
-      $since = $session->login;
-    }
-    $pretty_since = time2str("%c", $since) if $since;
-    $duration = pretty_interval( $now - $since ). " ago"
-      unless defined($duration);
-    print "<TR><TD>". $port->nasport. "</TD><TD>". $port->portnum. "</TD><TD>".
-          $port->ip. "</TD><TD>$user</TD><TD>$pretty_since".
-          "</TD><TD>$duration</TD></TR>"
-    ;
-  }
-  print "</TABLE><BR>";
-}
-
-#Time::Duration??
-sub pretty_interval {
-  my $interval = shift;
-  my %howlong = (
-    '604800' => 'week',
-    '86400'  => 'day',
-    '3600'   => 'hour',
-    '60'     => 'minute',
-    '1'      => 'second',
-  );
-
-  my $pretty = "";
-  foreach my $key ( sort { $b <=> $a } keys %howlong ) {
-    my $value = int( $interval / $key );
-    if ( $value  ) {
-      if ( $value == 1 ) {
-        $pretty .=
-          ( $howlong{$key} eq 'hour' ? 'an ' : 'a ' ). $howlong{$key}. " "
-      } else {
-        $pretty .= $value. ' '. $howlong{$key}. 's ';
-      }
-    }
-    $interval -= $value * $key;
-  }
-  $pretty =~ /^\s*(\S.*\S)\s*$/;
-  $1;
-} 
-
-#print &table(), <<END;
-#<TR>
-#  <TH>#</TH>
-#  <TH>NAS</
-%>
diff --git a/httemplate/browse/part_bill_event.cgi b/httemplate/browse/part_bill_event.cgi
deleted file mode 100755
index 670474d48..000000000
--- a/httemplate/browse/part_bill_event.cgi
+++ /dev/null
@@ -1,71 +0,0 @@
-<!-- mason kludge -->
-<% 
-
-my %search;
-if ( $cgi->param('showdisabled') ) {
-  %search = ();
-} else {
-  %search = ( 'disabled' => '' );
-}
-
-my @part_bill_event = qsearch('part_bill_event', \%search );
-my $total = scalar(@part_bill_event);
-
-%>
-<%= header('Invoice Event Listing', menubar( 'Main Menu' => $p) ) %>
-
-    Invoice events are actions taken on overdue invoices.<BR><BR>
-<A HREF="<%= $p %>edit/part_bill_event.cgi"><I>Add a new invoice event</I></A>
-<BR><BR>
-<%= $total %> events
-<%= $cgi->param('showdisabled')
-      ? do { $cgi->param('showdisabled', 0);
-             '( <a href="'. $cgi->self_url. '">hide disabled events</a> )'; }
-      : do { $cgi->param('showdisabled', 1);
-             '( <a href="'. $cgi->self_url. '">show disabled events</a> )'; }
-%>
-<%= table() %>
-  <TR>
-    <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Event</TH>
-    <TH>Payby</TH>
-    <TH>After</TH>
-    <TH>Action</TH>
-    <TH>Options</TH>
-    <TH>Code</TH>
-  </TR>
-
-<% foreach my $part_bill_event ( sort {    $a->payby     cmp $b->payby
-                                        || $a->seconds   <=> $b->seconds
-                                        || $a->weight    <=> $b->weight
-                                        || $a->eventpart <=> $b->eventpart
-                                      } @part_bill_event ) {
-     my $url = "${p}edit/part_bill_event.cgi?". $part_bill_event->eventpart;
-     use Time::Duration;
-     my $delay = duration_exact($part_bill_event->seconds);
-     my $plandata = $part_bill_event->plandata;
-     $plandata =~ s/\n/<BR>/go;
-%>
-  <TR>
-    <TD><A HREF="<%= $url %>">
-      <%= $part_bill_event->eventpart %></A></TD>
-<% unless ( $cgi->param('showdisabled') ) { %>
-    <TD>
-      <%= $part_bill_event->disabled ? 'DISABLED' : '' %></TD>
-<% } %>
-    <TD><A HREF="<%= $url %>">
-      <%= $part_bill_event->event %></A></TD>
-    <TD>
-      <%= $part_bill_event->payby %></TD>
-    <TD>
-      <%= $delay %></TD>
-    <TD>
-      <%= $part_bill_event->plan %></TD>
-    <TD>
-      <%= $plandata %></TD>
-    <TD><FONT SIZE="-1">
-      <%= $part_bill_event->eventcode %></FONT></TD>
-  </TR>
-<% } %>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/httemplate/browse/part_export.cgi b/httemplate/browse/part_export.cgi
deleted file mode 100755
index 76662e0c9..000000000
--- a/httemplate/browse/part_export.cgi
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- mason kludge -->
-<%= header("Export Listing", menubar( 'Main Menu' => "$p#sysadmin" )) %>
-Provisioning services to external machines, databases and APIs.<BR><BR>
-<A HREF="<%= $p %>edit/part_export.cgi"><I>Add a new export</I></A><BR><BR>
-<SCRIPT>
-function part_export_areyousure(href) {
-  if (confirm("Are you sure you want to delete this export?") == true)
-    window.location.href = href;
-}
-</SCRIPT>
-
-<%= table() %>
-  <TR>
-    <TH COLSPAN=2>Export</TH>
-    <TH>Options</TH>
-  </TR>
-
-<% foreach my $part_export ( sort { 
-     $a->getfield('exportnum') <=> $b->getfield('exportnum')
-   } qsearch('part_export',{}) ) {
-%>
-  <TR>
-    <TD><A HREF="<%= $p %>edit/part_export.cgi?<%= $part_export->exportnum %>"><%= $part_export->exportnum %></A></TD>
-    <TD><%= $part_export->exporttype %> to <%= $part_export->machine %> (<A HREF="<%= $p %>edit/part_export.cgi?<%= $part_export->exportnum %>">edit</A>&nbsp;|&nbsp;<A HREF="javascript:part_export_areyousure('<%= $p %>misc/delete-part_export.cgi?<%= $part_export->exportnum %>')">delete</A>)</TD>
-    <TD>
-      <%= itable() %>
-      <% my %opt = $part_export->options;
-         foreach my $opt ( keys %opt ) { %>
-           <TR><TD><%= $opt %></TD><TD><%= $opt{$opt} %></TD></TR>
-      <% } %>
-      </TABLE>
-    </TD>
-  </TR>
-
-<% } %>
-
-</TABLE>
-</BODY>
-</HTML>
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
deleted file mode 100755
index 58422c67d..000000000
--- a/httemplate/browse/part_pkg.cgi
+++ /dev/null
@@ -1,102 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my %search;
-if ( $cgi->param('showdisabled') ) {
-  %search = ();
-} else {
-  %search = ( 'disabled' => '' );
-}
-
-my @part_pkg = qsearch('part_pkg', \%search );
-my $total = scalar(@part_pkg);
-
-%>
-<%= header("Package Definition Listing",menubar( 'Main Menu' => $p )) %>
-One or more services are grouped together into a package and given pricing
-information. Customers purchase packages rather than purchase services
-directly.<BR><BR>
-<A HREF="<%= $p %>edit/part_pkg.cgi"><I>Add a new package definition</I></A>
-<BR><BR>
-
-<%= $total %> packages
-<%
-if ( $cgi->param('showdisabled') ) {
-  $cgi->param('showdisabled', 0);
-  print qq!( <a href="!. $cgi->self_url. qq!">hide disabled packages</a> )!;
-} else {
-  $cgi->param('showdisabled', 1);
-  print qq!( <a href="!. $cgi->self_url. qq!">show disabled packages</a> )!;
-}
-
-my $colspan = $cgi->param('showdisabled') ? 2 : 3;
-print &table(), <<END;
-      <TR>
-        <TH COLSPAN=$colspan>Package</TH>
-        <TH>Comment</TH>
-        <TH><FONT SIZE=-1>Freq.</FONT></TH>
-        <TH><FONT SIZE=-1>Plan</FONT></TH>
-        <TH><FONT SIZE=-1>Data</FONT></TH>
-        <TH>Service</TH>
-        <TH><FONT SIZE=-1>Quan.</FONT></TH>
-      </TR>
-END
-
-foreach my $part_pkg ( sort { 
-  $a->getfield('pkgpart') <=> $b->getfield('pkgpart')
-} @part_pkg ) {
-  my($hashref)=$part_pkg->hashref;
-  my(@pkg_svc)=grep $_->getfield('quantity'),
-    qsearch('pkg_svc',{'pkgpart'=> $hashref->{pkgpart} });
-  my($rowspan)=scalar(@pkg_svc);
-  my $plandata;
-  if ( $hashref->{plan} ) {
-    $plandata = $hashref->{plandata};
-    $plandata =~ s/^(\w+)=/$1&nbsp;/mg;
-    $plandata =~ s/\n/<BR>/g;
-  } else {
-    $hashref->{plan} = "(legacy)";
-    $plandata = "Setup&nbsp;". $hashref->{setup}.
-                "<BR>Recur&nbsp;". $hashref->{recur};
-  }
-  print <<END;
-      <TR>
-        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">$hashref->{pkgpart}</A></TD>
-END
-
-  unless ( $cgi->param('showdisabled') ) {
-    print "<TD ROWSPAN=$rowspan>";
-    print "DISABLED" if $hashref->{disabled};
-    print '</TD>';
-  }
-
-  print <<END;
-        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">$hashref->{pkg}</A></TD>
-        <TD ROWSPAN=$rowspan>$hashref->{comment}</TD>
-        <TD ROWSPAN=$rowspan>$hashref->{freq}</TD>
-        <TD ROWSPAN=$rowspan>$hashref->{plan}</TD>
-        <TD ROWSPAN=$rowspan>$plandata</TD>
-END
-
-  my($pkg_svc);
-  my($n)="";
-  foreach $pkg_svc ( @pkg_svc ) {
-    my($svcpart)=$pkg_svc->getfield('svcpart');
-    my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart });
-    print $n,qq!<TD><A HREF="${p}edit/part_svc.cgi?$svcpart">!,
-          $part_svc->getfield('svc'),"</A></TD><TD>",
-          $pkg_svc->getfield('quantity'),"</TD></TR>\n";
-    $n="<TR>";
-  }
-
-  print "</TR>";
-}
-
-$colspan = $cgi->param('showdisabled') ? 8 : 9;
-print <<END;
-
-    </TABLE>
-  </BODY>
-</HTML>
-END
-%>
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
deleted file mode 100755
index 084c21bd0..000000000
--- a/httemplate/browse/part_referral.cgi
+++ /dev/null
@@ -1,38 +0,0 @@
-<!-- mason kludge -->
-<%= header("Advertising source Listing", menubar(
-  'Main Menu' => $p,
-#  'Add new referral' => "../edit/part_referral.cgi",
-)) %>
-Where a customer heard about your service. Tracked for informational purposes.
-<BR><BR>
-<A HREF="<%= $p %>edit/part_referral.cgi"><I>Add a new advertising source</I></A>
-<BR><BR>
-
-<%= table() %>
-<TR>
-  <TH COLSPAN=2>Advertising source</TH>
-</TR>
-
-<%
-foreach my $part_referral ( sort { 
-  $a->getfield('refnum') <=> $b->getfield('refnum')
-} qsearch('part_referral',{}) ) {
-  my($hashref)=$part_referral->hashref;
-  print <<END;
-      <TR>
-        <TD><A HREF="${p}edit/part_referral.cgi?$hashref->{refnum}">
-          $hashref->{refnum}</A></TD>
-        <TD><A HREF="${p}edit/part_referral.cgi?$hashref->{refnum}">
-          $hashref->{referral}</A></TD>
-      </TR>
-END
-
-}
-
-print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
deleted file mode 100755
index 9fb359d1d..000000000
--- a/httemplate/browse/part_svc.cgi
+++ /dev/null
@@ -1,107 +0,0 @@
-<!-- mason kludge -->
-<% 
-
-my %search;
-if ( $cgi->param('showdisabled') ) {
-  %search = ();
-} else {
-  %search = ( 'disabled' => '' );
-}
-
-my @part_svc =
-  sort { $a->getfield('svcpart') <=> $b->getfield('svcpart') }
-    qsearch('part_svc', \%search );
-my $total = scalar(@part_svc);
-
-%>
-<%= header('Service Definition Listing', menubar( 'Main Menu' => $p) ) %>
-
-<SCRIPT>
-function part_export_areyousure(href) {
-  if (confirm("Are you sure you want to delete this export?") == true)
-    window.location.href = href;
-}
-</SCRIPT>
-
-    Services are items you offer to your customers.<BR><BR>
-
-<FORM METHOD="POST" ACTION="<%= $p %>edit/part_svc.cgi"><A HREF="<%= $p %>edit/part_svc.cgi"><I>Add a new service definition</I></A>&nbsp;or&nbsp;<SELECT NAME="clone"><OPTION></OPTION>
-<% foreach my $part_svc ( @part_svc ) { %>
-  <OPTION VALUE="<%= $part_svc->svcpart %>"><%= $part_svc->svc %></OPTION>
-<% } %>
-</SELECT><INPUT TYPE="submit" VALUE="Clone existing service">
-</FORM><BR>
-
-<%= $total %> services
-<%= $cgi->param('showdisabled')
-      ? do { $cgi->param('showdisabled', 0);
-             '( <a href="'. $cgi->self_url. '">hide disabled services</a> )'; }
-      : do { $cgi->param('showdisabled', 1);
-             '( <a href="'. $cgi->self_url. '">show disabled services</a> )'; }
-%>
-<%= table() %>
-  <TR>
-    <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Service</TH>
-    <TH>Table</TH>
-    <TH>Export</TH>
-    <TH>Field</TH>
-    <TH COLSPAN=2>Modifier</TH>
-  </TR>
-
-<% foreach my $part_svc ( @part_svc ) {
-     my $hashref = $part_svc->hashref;
-     my $svcdb = $hashref->{svcdb};
-     my @dfields = fields($svcdb);
-     push @dfields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
-     my @fields =
-       grep { $_ ne 'svcnum' && $part_svc->part_svc_column($_)->columnflag }
-            @dfields;
-
-     my $rowspan = scalar(@fields) || 1;
-     my $url = "${p}edit/part_svc.cgi?$hashref->{svcpart}";
-%>
-
-  <TR>
-    <TD ROWSPAN=<%= $rowspan %>><A HREF="<%= $url %>">
-      <%= $hashref->{svcpart} %></A></TD>
-<% unless ( $cgi->param('showdisabled') ) { %>
-    <TD ROWSPAN=<%= $rowspan %>>
-      <%= $hashref->{disabled} ? 'DISABLED' : '' %></TD>
-<% } %>
-    <TD ROWSPAN=<%= $rowspan %>><A HREF="<%= $url %>">
-      <%= $hashref->{svc} %></A></TD>
-    <TD ROWSPAN=<%= $rowspan %>>
-      <%= $hashref->{svcdb} %></TD>
-    <TD ROWSPAN=<%= $rowspan %>><%= itable() %>
-<%
-#  my @part_export =
-map { qsearchs('part_export', { exportnum => $_->exportnum } ) } qsearch('export_svc', { svcpart => $part_svc->svcpart } ) ;
-  foreach my $part_export (
-    map { qsearchs('part_export', { exportnum => $_->exportnum } ) } 
-      qsearch('export_svc', { svcpart => $part_svc->svcpart } )
-  ) {
-%>
-      <TR>
-        <TD><A HREF="<%= $p %>edit/part_export.cgi?<%= $part_export->exportnum %>"><%= $part_export->exporttype %>&nbsp;to&nbsp;<%= $part_export->machine %></A></TD></TR>
-<%  } %>
-      </TABLE></TD>
-
-<%   my($n1)='';
-     foreach my $field ( @fields ) {
-       my $flag = $part_svc->part_svc_column($field)->columnflag;
-%>
-     <%= $n1 %><TD><%= $field %></TD><TD>
-
-<%     if ( $flag eq "D" ) { print "Default"; }
-         elsif ( $flag eq "F" ) { print "Fixed"; }
-         else { print "(Unknown!)"; }
-%>
-       </TD><TD><%= $part_svc->part_svc_column($field)->columnvalue%></TD>
-<%     $n1="</TR><TR>";
-     }
-%>
-  </TR>
-<% } %>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
deleted file mode 100755
index b53c1402d..000000000
--- a/httemplate/browse/queue.cgi
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- mason kludge -->
-<%
-
-print header("Job Queue", menubar( 'Main Menu' => $p, )).
-      joblisting({}). '</BODY></HTML>';
-
-%>
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
deleted file mode 100755
index e890f07bf..000000000
--- a/httemplate/browse/svc_acct_pop.cgi
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- mason kludge -->
-<%
-
-print header('Access Number Listing', menubar(
-  'Main Menu' => $p,
-)) %>
-Points of Presence<BR><BR>
-<A HREF="<%= $p %>edit/svc_acct_pop.cgi"><I>Add new Access Number</I></A><BR><BR>
-<%= table() %>
-      <TR>
-        <TH></TH>
-        <TH>City</TH>
-        <TH>State</TH>
-        <TH>Area code</TH>
-        <TH>Exchange</TH>
-        <TH>Local</TH>
-      </TR>
-
-<%
-foreach my $svc_acct_pop ( sort { 
-  #$a->getfield('popnum') <=> $b->getfield('popnum')
-  $a->state cmp $b->state || $a->city cmp $b->city
-    || $a->ac <=> $b->ac || $a->exch <=> $b->exch || $a->loc <=> $b->loc
-} qsearch('svc_acct_pop',{}) ) {
-  my($hashref)=$svc_acct_pop->hashref;
-  print <<END;
-      <TR>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{popnum}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{city}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{state}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{ac}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{exch}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{loc}</A></TD>
-      </TR>
-END
-
-}
-
-print <<END;
-      <TR>
-      </TR>
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
deleted file mode 100644
index 259713260..000000000
--- a/httemplate/config/config-process.cgi
+++ /dev/null
@@ -1,51 +0,0 @@
-<%
-  my $conf = new FS::Conf;
-  $FS::Conf::DEBUG = 1;
-  my @config_items = $conf->config_items;
-
-  foreach my $i ( @config_items ) {
-    my @touch = ();
-    my @delete = ();
-    my $n = 0;
-    foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
-      if ( $type eq '' ) {
-      } elsif ( $type eq 'textarea' ) {
-        if ( $cgi->param($i->key. $n) ne '' ) {
-          my $value = $cgi->param($i->key. $n);
-          $value =~ s/\r\n/\n/g; #browsers?
-          $conf->set($i->key, $value);
-        } else {
-          $conf->delete($i->key);
-        }
-      } elsif ( $type eq 'checkbox' ) {
-#        if ( defined($cgi->param($i->key. $n)) && $cgi->param($i->key. $n) ) {
-        if ( defined $cgi->param($i->key. $n) ) {
-          #$conf->touch($i->key);
-          push @touch, $i->key;
-        } else {
-          #$conf->delete($i->key);
-          push @delete, $i->key;
-        }
-      } elsif ( $type eq 'text' || $type eq 'select' )  {
-        if ( $cgi->param($i->key. $n) ne '' ) {
-          $conf->set($i->key, $cgi->param($i->key. $n));
-        } else {
-          $conf->delete($i->key);
-        }
-      } elsif ( $type eq 'editlist' || $type eq 'selectmultiple' )  {
-        if ( scalar(@{[ $cgi->param($i->key. $n) ]}) ) {
-          $conf->set($i->key, join("\n", @{[ $cgi->param($i->key. $n) ]} ));
-        } else {
-          $conf->delete($i->key);
-        }
-      } else {
-      }
-      $n++;
-    }
-   # warn @touch;
-    $conf->touch($_) foreach @touch;
-    $conf->delete($_) foreach @delete;
-  }
-
-%>
-<%= $cgi->redirect("config-view.cgi") %>
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
deleted file mode 100644
index bafe5a8e7..000000000
--- a/httemplate/config/config-view.cgi
+++ /dev/null
@@ -1,64 +0,0 @@
-<!-- mason kludge -->
-<%= header('View Configuration', menubar( 'Main Menu' => $p,
-                                     'Edit Configuration' => 'config.cgi' ) ) %>
-
-<% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
-
-<% foreach my $section ( qw(required billing username password UI session
-                            shell mail apache BIND
-                           ),
-                         '', 'deprecated') { %>
-  <A NAME="<%= $section || 'unclassified' %>"></A>
-  <FONT SIZE="-2">
-  <% foreach my $nav_section ( qw(required billing username password UI session
-                                  shell mail apache BIND
-                                 ),
-                               '', 'deprecated') { %>
-    <% if ( $section eq $nav_section ) { %>
-      [<A NAME="not<%= $nav_section || 'unclassified' %>" style="background-color: #cccccc"><%= ucfirst($nav_section || 'unclassified') %></A>]
-    <% } else { %>
-      [<A HREF="#<%= $nav_section || 'unclassified' %>"><%= ucfirst($nav_section || 'unclassified') %></A>]
-    <% } %>
-  <% } %>
-  </FONT><BR>
-  <%= table("#cccccc", 2) %>
-  <tr>
-    <th colspan="2" bgcolor="#dcdcdc">
-      <%= ucfirst($section || 'unclassified') %> configuration options
-    </th>
-  </tr>
-  <% foreach my $i (grep $_->section eq $section, @config_items) { %>
-    <tr>
-      <td><a name="<%= $i->key %>">
-        <b><%= $i->key %></b>&nbsp;-&nbsp;<%= $i->description %>
-      </a></td>
-      <td><table border=0>
-        <% foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
-             my $n = 0; %>
-          <% if ( $type eq '' ) { %>
-            <tr><td><font color="#ff0000">no type</font></td></tr>
-          <% } elsif (   $type eq 'textarea'
-                      || $type eq 'editlist'
-                      || $type eq 'selectmultiple' ) { %>
-            <tr><td bgcolor="#ffffff">
-<pre>
-<%= encode_entities(join("\n", $conf->config($i->key) ) ) %>
-</pre>
-            </td></tr>
-          <% } elsif ( $type eq 'checkbox' ) { %>
-            <tr><td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td></tr>
-          <% } elsif ( $type eq 'text' || $type eq 'select' )  { %>
-            <tr><td bgcolor="#ffffff"><%= $conf->exists($i->key) ? $conf->config($i->key) : '' %></td></tr>
-          <% } else { %>
-            <tr><td>
-              <font color="#ff0000">unknown type <%= $type %></font>
-            </td></tr>
-          <% } %>
-        <% $n++; } %>
-      </table></td>
-    </tr>
-  <% } %>
-  </table><br><br>
-<% } %>
-
-</body></html>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
deleted file mode 100644
index fd9a82958..000000000
--- a/httemplate/config/config.cgi
+++ /dev/null
@@ -1,176 +0,0 @@
-<!-- mason kludge -->
-<%= header('Edit Configuration', menubar( 'Main Menu' => $p ) ) %>
-<SCRIPT>
-var gSafeOnload = new Array();
-var gSafeOnsubmit = new Array();
-window.onload = SafeOnload;
-function SafeAddOnLoad(f) {
-  gSafeOnload[gSafeOnload.length] = f;
-}
-function SafeOnload() {
-  for (var i=0;i<gSafeOnload.length;i++)
-    gSafeOnload[i]();
-}
-function SafeAddOnSubmit(f) {
-  gSafeOnsubmit[gSafeOnsubmit.length] = f;
-}
-function SafeOnsubmit() {
-  for (var i=0;i<gSafeOnsubmit.length;i++)
-    gSafeOnsubmit[i]();
-}
-</SCRIPT>
-
-<% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
-
-<form name="OneTrueForm" action="config-process.cgi" METHOD="POST" onSubmit="SafeOnsubmit()">
-
-<% foreach my $section ( qw(required billing username password UI session
-                            shell mail apache BIND
-                           ),
-                         '', 'deprecated') { %>
-  <A NAME="<%= $section || 'unclassified' %>"></A>
-  <FONT SIZE="-2">
-  <% foreach my $nav_section ( qw(required billing username password UI session
-                                  shell mail apache BIND
-                                 ),
-                               '', 'deprecated') { %>
-    <% if ( $section eq $nav_section ) { %>
-      [<A NAME="not<%= $nav_section || 'unclassified' %>" style="background-color: #cccccc"><%= ucfirst($nav_section || 'unclassified') %></A>]
-    <% } else { %>
-      [<A HREF="#<%= $nav_section || 'unclassified' %>"><%= ucfirst($nav_section || 'unclassified') %></A>]
-    <% } %>
-  <% } %>
-  </FONT><BR>
-  <%= table("#cccccc", 2) %>
-  <tr>
-    <th colspan="2" bgcolor="#dcdcdc">
-      <%= ucfirst($section || 'unclassified') %> configuration options
-    </th>
-  </tr>
-  <% foreach my $i (grep $_->section eq $section, @config_items) { %>
-    <tr>
-      <td>
-        <% my $n = 0;
-           foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
-             #warn $i->key unless defined($type);
-        %>
-          <% if ( $type eq '' ) { %>
-            <font color="#ff0000">no type</font>
-          <% } elsif ( $type eq 'textarea' ) { %>
-            <textarea name="<%= $i->key. $n %>" rows=5><%= "\n". join("\n", $conf->config($i->key) ) %></textarea>
-          <% } elsif ( $type eq 'checkbox' ) { %>
-            <input name="<%= $i->key. $n %>" type="checkbox" value="1"<%= $conf->exists($i->key) ? ' CHECKED' : '' %>>
-          <% } elsif ( $type eq 'text' )  { %>
-            <input name="<%= $i->key. $n %>" type="<%= $type %>" value="<%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>">
-          <% } elsif ( $type eq 'select' || $type eq 'selectmultiple' )  { %>
-            <select name="<%= $i->key. $n %>" <%= $type eq 'selectmultiple' ? 'MULTIPLE' : '' %>>
-              <% my %saw;
-                 foreach my $value ( "", @{$i->select_enum} ) {
-                    local($^W)=0; next if $saw{$value}++; %>
-                <option value="<%= $value %>"<%= $value eq $conf->config($i->key) || ( $type eq 'selectmultiple' && grep { $_ eq $value } $conf->config($i->key) ) ? ' SELECTED' : '' %>><%= $value %>
-              <% } %>
-              <% if ( $conf->exists($i->key) && $conf->config($i->key) && ! grep { $conf->config($i->key) eq $_ } @{$i->select_enum}) { %>
-                <option value=<%= $conf->config($i->key) %> SELECTED><%= $conf->config($i->key) %>
-              <% } %>
-            </select>
-          <% } elsif ( $type eq 'editlist' )  { %>
-            <script>
-              function doremove<%= $i->key. $n %>() {
-                fromObject = document.OneTrueForm.<%= $i->key. $n %>;
-                for (var i=fromObject.options.length-1;i>-1;i--) {
-                  if (fromObject.options[i].selected)
-                    deleteOption<%= $i->key. $n %>(fromObject,i);
-                }
-              }
-              function deleteOption<%= $i->key. $n %>(object,index) {
-                object.options[index] = null;
-              }
-              function selectall<%= $i->key. $n %>() {
-                fromObject = document.OneTrueForm.<%= $i->key. $n %>;
-                for (var i=fromObject.options.length-1;i>-1;i--) {
-                  fromObject.options[i].selected = true;
-                }
-              }
-              function doadd<%= $i->key. $n %>(object) {
-                var myvalue = "";
-                <% if ( defined($i->editlist_parts) ) { %>
-
-                  <% foreach my $pnum ( 0 .. scalar(@{$i->editlist_parts})-1 ) { %>
-
-                    if ( myvalue != "" ) { myvalue = myvalue + " "; }
-                    <% if ( $i->editlist_parts->[$pnum]{type} eq 'select' ) { %>
-                      myvalue = myvalue + object.add<%= $i->key. $n . "_$pnum" %>.options[object.add<%= $i->key. $n . "_$pnum" %>.selectedIndex].value;
-                      <!-- #RESET SELECT??  maybe not... -->
-                    <% } elsif ( $i->editlist_parts->[$pnum]{type} eq 'immutable' ) { %>
-                      myvalue = myvalue + object.add<%= $i->key. $n . "_$pnum" %>.value;
-                    <% } else { %>
-                      myvalue = myvalue + object.add<%= $i->key. $n . "_$pnum" %>.value;
-                      object.add<%= $i->key. $n. "_$pnum" %>.value = "";
-                    <% } %>
-
-
-                  <% } %>
-                <% } else { %>
-                  myvalue = object.add<%= $i->key. $n. "_1" %>.value;
-                <% } %>
-                var optionName = new Option(myvalue, myvalue);
-                var length = object.<%= $i->key. $n %>.length;
-                object.<%= $i->key. $n %>.options[length] = optionName;
-              }
-            </script>
-            <select multiple size=5 name="<%= $i->key. $n %>">
-            <option selected>----------------------------------------------------------------</option>
-            <% foreach my $line ( $conf->config($i->key) ) { %>
-              <option value="<%= $line %>"><%= $line %></option>
-            <% } %>
-            </select><br>
-            <input type="button" value="remove selected" onClick="doremove<%= $i->key. $n %>()">
-            <script>SafeAddOnLoad(doremove<%= $i->key. $n %>);
-                    SafeAddOnSubmit(selectall<%= $i->key. $n %>);</script>
-            <br>
-            <%= itable() %><tr>
-            <% if ( defined $i->editlist_parts ) { %>
-              <% my $pnum=0; foreach my $part ( @{$i->editlist_parts} ) { %>
-                <td>
-                <% if ( $part->{type} eq 'text' ) { %>
-                  <input type="text" name="add<%= $i->key. $n."_$pnum" %>">
-                <% } elsif ( $part->{type} eq 'immutable' ) { %>
-                  <%= $part->{value} %><input type="hidden" name="add<%= $i->key. $n. "_$pnum" %>" value="<%= $part->{value} %>">
-                <% } elsif ( $part->{type} eq 'select' ) { %>
-                  <select name="add<%= $i->key. $n. "_$pnum" %>">
-                  <% foreach my $key ( keys %{$part->{select_enum}} ) { %>
-                    <option value="<%= $key %>"><%= $part->{select_enum}{$key} %></option>
-                  <% } %>
-                  </select>
-                <% } else { %>
-                  <font color="#ff0000">unknown type <%= $part->type %></font>
-                <% } %>
-                </td>
-              <% $pnum++; } %>
-            <% } else { %>
-              <td><input type="text" name="add<%= $i->key. $n %>_0"></td>
-            <% } %>
-            <td><input type="button" value="add" onClick="doadd<%= $i->key. $n %>(this.form)"></td>
-            </tr></table>
-          <% } else { %>
-            <font color="#ff0000">unknown type <%= $type %></font>
-          <% } %>
-        <% $n++; } %>
-      </td>
-      <td><a name="<%= $i->key %>">
-        <b><%= $i->key %></b> - <%= $i->description %>
-      </a></td>
-    </tr>
-  <% } %>
-  </table><br>
-
-  You may need to restart Apache and/or freeside-queued for configuration
-  changes to take effect.<br>
-
-  <input type="submit" value="Apply changes"><br><br>
-
-<% } %>
-
-</form>
-
-</body></html>
diff --git a/httemplate/docs/admin.html b/httemplate/docs/admin.html
deleted file mode 100755
index 50beafe78..000000000
--- a/httemplate/docs/admin.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<head>
-  <title>Administration</title>
-</head>
-<body>
-  <h1>Administration</h1>
-</body>
-<ul>
-  <li>Open up the root of the Freeside document tree in your web
-  browser.  For example, if you created the Freeside document tree in   
-  /home/httpd/html/freeside, and your web browser's DocumentRoot is
-  /home/httpd/html, open https://your_host/freeside/. Replace
-  "your_host" with the name or network address of your web server.
-  <li>Select <u>Configuration</u> from the main menu and update your configuration values.
-  <li>Next you must create a service definition.  An example of a service
-  definition would be a dial-up account or a domain.  First, it is
-  necessary to create a domain definition.  Click on <u>View/Edit service
-  definitions</u> and <u>Add a new service definition</u> with <i>Table</i>
-  <b>svc_domain</b> (and no modifiers).
-
-  <li>Now that you have created your first service, you must create a package
-  including this service which you can sell to customers.  Zero, one, or many
-  services are bundled into a package.  Click on <u>View/Edit package
-  definitions</u> and <u>Add a new package definition</u> which includes
-  quantity <b>1</b> of the svc_domain service you created above.
-
-  <li>After you create your first package, then you must define who is
-  able to sell that package by creating an agent type.  An example of
-  an agent type would be an internal sales representitive which sells
-  regular and promotional packages, as opposed to an external sales
-  representitive which would only sell regular packages of services.  Click on
-  <u>View/Edit agent types</u> and <u>Add a new agent type</u>.  Allow this
-  agent type to sell the package you created above.
-
-  <li>After creating a new agent type, you must create an agent.  Click on
-  <u>View/Edit agents</u> and <u>Add a new agent</u>.
-
-  <li>Set up at least one Advertising source.  Advertising sources will help
-  you keep track of how effective your advertising is, tracking where customers
-  heard of your service offerings.  You must create at least one advertising 
-  source.  If you do not wish to use the referral functionality, simply create
-  a single advertising source only.  Click on <u>View/Edit advertising
-  sources</u> and <u>Add a new advertising source</u>.
-
-  <li>Click on <u>New Customer</u> and create a new customer for your system
-  accounts with billing type <b>Complimentary</b>.  
-
-  <li>From the Customer View screen of the newly created customer, order the
-  package you defined above.
-
-  <li>From the Package View screen of the newly created package, choose
-  <u>(Provision)</u> to add the customer's service for this new package.
-
-  <li>Add your own domain.
-
-  <li>Go back to <u>View/Edit service definitions</u> on the main menu, and
-  <u>Add a new service definition</u> with <i>Table</i> <b>svc_acct</b>.
-  Select your domain in the <b>domsvc</b> Modifier.  Set <b>Fixed</b> to define
-  a service locked-in to this domain, or <b>Default</b> to define a service
-  which may select from among this domain and the customer's domains.
-
-  <li><table><tr>
-    <td> Create at least POP (Point of Presence) by selecting
-        <u>View/Edit POPs</u> from the main menu.</td>
-    <th align="left"> OR </th>
-    <td>If you are not doing dialup, set slipip to fixed and blank for all your
-        Service Definitions which have Table <b>svc_acct</b>.</td>
-  </tr></table>
-
-  <li>If you are using Freeside to keep track of sales taxes, define tax
-  information for your locales by clicking on the <u>View/Edit locales and tax
-  rates</b> on the main menu.
-
-  <li>If you would like Freeside to notify your customers when their credit
-  cards and other billing arrangements are about to expire, arrange for
-  <b>freeside-expiration-alerter</b> to be run daily by cron or similar
-  facility.  The message it sends can be configured from the
-  <u>Configuration</u> choice of the main menu as <u>alerter_template</u>.
-
-</ul>
-</body>
-</html>
diff --git a/httemplate/docs/billing.html b/httemplate/docs/billing.html
deleted file mode 100644
index c78a87f04..000000000
--- a/httemplate/docs/billing.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<head>
-  <title>Billing</title>
-</head>
-<body>
-  <h1>Billing</h1>
-  <ul>
-    <li>You can bill individual customers by clicking on the <i>Bill now</i> link on the main customer view.
-    <li>The <a href="man/bin/freeside-daily.html"><b>freeside-daily</b></a> script should be run daily to bill customers and run invoice collection events.
-    <li>Real-time credit card processing: Install the <a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a> module for your processor.  Configure the <a href="../config/config-view.cgi#business-onlinepayment">business-onlinepayment</a> configuration option.  Disable the default <b>Batch card</b> <a href="../browse/part_bill_event.cgi">invoice event</a> and add one for Business::OnlinePayment.
-    <li>Optional: Credit card expiration alerts: Customize <a href="../config/config.cgi#alerter_template">alerter_template</a> configuration option and run <a href="man/bin/freeside-expiration-alerter.html">freeside-expiration-alerter</a> daily.
-    <li>Credit card decline alerts: Customize the <a href="../config/config.cgi#declinetemplate">declinetemplate</a> configuration option and set the <a href="../config/config.cgi#emaildecline">emaildecline</a> configuration option.
-    <li>Optional: Invoice template customization
-      <ul>
-        <li>See the <a href="http://search.cpan.org/doc/MJD/Text-Template-1.42/Template.pm">Text::Template</a> documentation for details on the substitution language.
-        <li>You <b>must</b> call the invoice_lines() function at least once - pass it a number of lines, and it returns a list of array references, each of two elements: a service description column, and a price column.  Alternatively, call invoice_lines() with no arguments, and pagination will be disabled - all invoice line items will print on one page, with no padding (recommended for email invoices).
-        <li>In addition, the following variables are available:
-          <ul>
-            <li>$invnum - invoice number
-            <li>$date - as a UNIX timestamp (see <a href="http://search.cpan.org/doc/GBARR/TimeDate-1.09/lib/Date/Format.pm">Date::Format</a> for conversion functions).
-            <li>$page - current page
-            <li>$total_pages - total pages
-            <li>@address - A six-element array containing the customer name, company, and address.
-<!--            <li>$overdue - true if this invoice is overdue -->
-          </ul>
-      </ul>
-    <li>Batch credit card processing
-      <ul>
-        <li>After <a href="man/bin/freeside-daily.html"><b>freeside-daily</b></a> is run, a credit card batch will be in the <a href="schema.html#cust_pay_batch">cust_pay_batch</a> table.  Export this table to your credit card batching.
-        <li>When your batch completes, erase the cust_pay_batch records in that batch and add any necessary paymants to the <a href="schema.html#cust_pay">cust_pay</a> table.  Example code to add payments is:
-        <pre>use FS::cust_pay;
-
-# loop over all records in batch
-
-my $payment=create FS::cust_pay (
-  'invnum' => $invnum,
-  'paid' => $paid,
-  '_date' => $_date,
-  'payby' => $payby,
-  'payinfo' => $payinfo,
-  'paybatch' => $paybatch,
-);
-
-my $error=$payment->insert;
-if ( $error ) {
-  #process error
-}
-
-# end loop
-</pre>
-All fields except paybatch are contained in the cust_pay_batch table.  You can use paybatch field to track particular batches and/or particular transactions within a batch.
-    </ul>
-<!--      <li>The <a href="man/bin/freeside-print-batch.html"><b>freeside-print-batch</b></a> script can print or email pending credit card batches for manual entry. -->
-  </ul>
-</body>
diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
deleted file mode 100644
index 9caf3bb3a..000000000
--- a/httemplate/docs/config.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<head>
-  <title>Configuration files</title>
-</head>
-<body>
-  <h1>Configuration files</h1>
-<font size="+1" color="#ff0000">Configuration is now done by the top-level Makefile and web interface.  The instructions below are no longer necessary.</font>
-<ul>
-  <li>Create the <b>/usr/local/etc/freeside</b> directory to hold your configuration.
-  <li>Setting up <a href="http://www.apache.org/docs/misc/FAQ.html#user-authentication">Apache user authetication</a> is mandatory.
-  <li>Create the <b>/usr/local/etc/freeside/mapsecrets</b> file, which maps Apache users to a secrets file which contains a DBI data source, username and password.  Every
-line in <b>/usr/local/etc/freeside/mapsecrets</b> should contain a username and
-filename, separated by whitespace.  Note that these are not local usernames -
-they are passed from Apache.  <a href="http://www.apache.org/docs/misc/FAQ.html#user-authentication">
-Apache user authetication</a> is mandatory.  For example, if you had the Apache users admin,
-john, and sam,  
-you mapsecrets file might look like:
-<pre>
-admin secretfile
-john secretfile
-sam secretfile
-</pre>
-  <li>Next, the filename(s) referenced in <b>/usr/local/etc/freeside/mapsecrets</b> file should be created in the <b>/usr/local/etc/freeside/</b> directory.  Each file contains three lines: <a href="http://search.cpan.org/doc/TIMB/DBI-1.20/DBI.pm">DBI data source</a> (for example,
-  <tt>DBI:mysql:freeside</tt> or <tt>DBI:Pg:host=localhost;dbname=freeside</tt>), database username, and database password.
-  These files should not be world readable.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.20/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD">manpage for your DBD</a> for the exact syntax of a DBI data source.  In a normal installation such as the example above, a single file <b>/usr/local/etc/freeside/secretfile</b> would be created - for example:
-<pre>
-DBI:Pg:host=localhost;dbname=freeside
-dbusername
-dbpassword
-</pre>
-<li>Create the <b>/usr/local/etc/freeside/conf.<i>datasource</i></b> directory, for example, <b>/usr/local/etc/freeside/conf.DBI:Pg:host=localhost;dbname=freeside</b> (remember to backslash-escape the ; character when creating directories in the shell:
-<pre>mkdir&nbsp;/usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=freeside
-</pre>
-<li>The rest of the configuration can be done with the web interface.  Select <u>Configuration</u> from the main menu and update your configuration values.
-</ul>
-</body>
-</html>
diff --git a/httemplate/docs/export.html b/httemplate/docs/export.html
deleted file mode 100755
index 71e3acf1f..000000000
--- a/httemplate/docs/export.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<head>
-  <title>File exporting</title>
-</head>
-<body>
-  <h1>File exporting</h1>
-  <font size="+2">NOTE: This file is OUT OF DATE with the landing of the new export code and is only here for reference.  DO NOT follow these instructions.  Instead use the new exports in the web interface.</font>
-  <ul>
-    <li>bin/svc_acct.export will create UNIX <b>passwd</b>, <b>shadow</b> and <b>master.passwd</b> files, ERPCD <b>acp_passwd</b> and <b>acp_dialup</b> files and a RADIUS <b>users</b> file in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Some RADIUS servers (such as <a href="http://www.open.com.au/radiator/">Radiator</a>, <a href="ftp://ftp.cheapnet.net/pub/icradius/">ICRADIUS</a> and <a href="http://www.freeradius.org/">FreeRADIUS</a>) will authenticate directly out of an SQL database.  In these cases,
-it is reccommended that you replicate (<a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">Replication in MySQL</a>) the data to an external RADIUS machine or point icradius_secrets to the external machine rather than running the RADIUS server on your Freeside machine.  Using the appropriate <a href="../config/config-view.cgi">configuration settings</a>, you can export these files to your remote machines unattended:
-      <ul>
-        <li>shellmachines - <b>passwd</b> and <b>shadow</b> are copied to the remote machine as <b>/etc/passwd.new</b> and <b>/etc/shadow.new</b> and then moved to <b>/etc/passwd</b> and <b>/etc/shadow</b> if no errors occur.
-        <li>bsdshellmachines - <b>passwd</b> and <b>master.passwd</b> are copied to the remote machine as <b>/etc/passwd.new</b> and <b>/etc/master.passwd.new</b> and moved to <b>/etc/passwd</b> and <b>/etc/master.passwd</b> if no errors occur.
-        <li>nismachines - <b>passwd</b> and <b>shadow</b> are copied to the <b>/etc/global</b> directory on the remote machine.  If no errors occur, the command <b>( cd /var/yp; make; )</b> is executed on the remote machine.
-        <li>erpcdmachines - <b>acp_passwd</b> and <b>acp_dialup</b> are copied to the <b>/usr/annex</b> directory on the remote machine.  If no errors occur, the command <b>( kill -USR1 `cat /usr/annex/erpcd.pid` )</b> is executed on the remote machine. 
-        <li>radiusmachines - <b>users</b> is copied to the <b>/etc/raddb</b> directory on the remote machine.  If no errors occur, the command <b>( builddbm )</b> is executed on the remote machine.
-        <li>icradiusmachines - Turn this option on to enable radcheck table population - by default in the Freeside database, or in the database specified by the <a href="http://rootwood.haze.st/aspside/config/config-view.cgi#icradius_secrets">icradius_secrets</a> config option (the radcheck table needs to be created manually).  You do not need to use MySQL for your Freeside database to export to an ICRADIUS/FreeRADIUS MySQL database with this option.  <blockquote><b>ADDITIONAL DEPRECATED FUNCTIONALITY</b> (instead use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or point icradius_secrets to the external database) - your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines or <a href="http://www.freeradius.org/">FreeRADIUS</a> (with MySQL authentication) machines, one per line.  Machines listed in this file will have the radcheck table exported to them.  Each line should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password.  For example: <CODE>"radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd"</CODE></blockquote>
-      </ul>
-    <li>svc_acct.pm - If a shellmachine is defined, users can be created, modified and deleted remotely; see below.
-      <ul>
-        <li>Account creation - If the <b>username</b>, <b>uid</b> and <b>dir</b> fields are defined for a new user, the command(s) specified in the <a href="../config/config-view.cgi#shellmachine-useradd">shellmachine-useradd</a> configuration file are executed on shellmachine via ssh.  If this file does not exist, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default.  If the file exists but is empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.
-        <li>Account deletion - The command(s) specified in the <a href="../config/config-view.cgi#shellmachine-userdel">shellmachine-userdel</a> configuration file are executed on shellmachine via ssh.  If this file does not exist, <code>userdel $username</code> is the default.  If the file exists but is empty, <code>rm -rf $dir</code> is the default instead.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.
-        <li>Account modification - If a user's home directory changes, the command(s) specified in the <a href="../config/config-view.cgi#shellmachine-usermod">shellmachine-usermod</a> configuration file are execute on shellmachine via ssh.  If this file does not exist or is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default.  Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.
-      </ul>
-    <li>svc_acct.pm - <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a> integration, enabled by the <a href="../config/config-view.cgi#cyrus">cyrus configuration file</a>
-      <ul>
-        <li>Account creation - (Cyrus::IMAP::Admin should be installed locally)
-        <li>Account deletion - (Cyrus::IMAP::Admin should be installed locally)
-        <li>Account modification - (not yet implemented)
-      </ul>
-    <li>bin/svc_acct_sm.export will create <a href="http://www.qmail.org">Qmail</a> <b>rcpthosts</b>, <b>recipientmap</b> and <b>virtualdomains</b> files and <a href="http://www.sendmail.org">Sendmail</a> <b>virtusertable</b> and <b>sendmail.cw</b> files in the <b>/usr/local/etc/freeside/export.<i>datasrc</i></b> directory.  Using the appropriate <a href="../config/config-view.cgi">configuration files</a>, you can export these files to your remote machines unattemded:
-      <ul>
-        <li>qmailmachines - <b>recipientmap</b>, <b>virtualdomains</b> and <b>rcpthosts</b> are copied to the <b>/var/qmail/control</b> directory on the remote machine.  Note: If you <a href="legacy.html#svc_acct_sm">imported</a> qmail configuration files, run the generated <b>/usr/local/etc/freeside/export.<i>datasrc</i>/virtualdomains.FIX</b> on a machine with your user home directories before exporting qmail configuration files.
-        <li>shellmachine - The command <b>[ -e <i>homedir</i>/.qmail-default ] || { touch <i>homedir</i>/.qmail-default; chown <i>uid</i>.<i>gid</i> <i>homedir</i>/.qmail-default; }</b> will be run on this machine for users in the virtualdomains file.
-        <li>sendmailmachines - <b>sendmail.cw</b> and <b>virtusertable</b> are copied to the remote machine as <b>/etc/sendmail.cw.new</b> and <b>/etc/virtusertable.new</b>.  If no errors occur, they are moved to <b>/etc/sendmail.cw</b> and <b>/etc/virtusertable</b> and the command specified in the <a href="../config/config-view.cgi#sendmailrestart">sendmailrestart</a> configuration file is executed.  (The path can be changed from the default <b>/etc</b> with the <a href="../config/config-view.cgi#sendmailconfigpath">sendmailconfigpath</a> configuration file.)
-      </ul>
-    <li>svc_domain.pm - If the qmailmachines configuration file exists and a shellmachine is defined, user <b>.qmail-</b> files can be updated for catchall mailboxes.
-      <ul>
-        <li>The command <pre>[ -e <i>homedir</i>/.qmail-<i>domain</i>-default ] || {
-    touch <i>homedir</i>/.qmail-<i>domain</i>-default;
-    chown <i>uid</i>.<i>gid</i> <i>homedir</i>/.qmail-<i>domain</i>-default;
-}</pre> is run.
-      </ul>
-    <li>svc_forward.pm - Not yet documented; see manpage.
-    <li>svc_www.pm - Not yet documented; see manpage.
-  </ul>
-  <br><a name=ssh>Unattended remote login</a> - Freeside can login to remote machines unattended using SSH.  This can pose a security risk if not configured correctly, and will allow an intruder who breaks into your freeside machine full access to your remote machines.  <b>Do not use this feature unless you understand what you are doing!</b>
-    <ul>
-      <li>As the freeside user (on your freeside machine), generate an authentication key using <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>.  Since this is for unattended operation, use a blank passphrase.
-      <li>Append the newly-created <code>identity.pub</code> file to <code>~root/.ssh/authorized_keys</code> on the remote machine(s).
-      <li>Some new SSH v2 implementation accept v2 style keys only.  Use the <code>-t</code> option to <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>, and append the created <code>id_dsa.pub</code> or <code>id_rsa.pub</code> to <code>~root/.ssh/authorized_keys2</code> on the remote machine(s).
-      <li>You may need to set <code>PermitRootLogin without-password</code> (meaning with keys only) in your <code>sshd_config</code> file on the remote machine(s).
-    </ul>
-
-</body>
-
diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html
deleted file mode 100644
index 00c863b0c..000000000
--- a/httemplate/docs/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<head>
-  <title>Documentation</title>
-</head>
-<body bgcolor="#ffffff">
-  <h1>Documentation</h1>
-<img src="overview.png">
-<ul>
-  <li><a href="install.html">New Installation</a>
-  <li><a href="upgrade4.html">Upgrading from 1.2.x to 1.2.2</a>
-  <li><a href="upgrade5.html">Upgrading from 1.2.2 to 1.2.3</a>
-  <li><a href="upgrade6.html">Upgrading from 1.2.3 to 1.3.0</a>
-  <li><a href="upgrade7.html">Upgrading from 1.3.0 to 1.3.1</a>
-  <li><a href="upgrade8.html">Upgrading from 1.3.1 to 1.4.0</a>
-<!--
-  <li><a href="config.html">Configuration files</a>
-!-->
-  <li><a href="admin.html">Administration</a>
-<!--
-  <li><a href="../index.html#admin">Administration</a>
-!-->
-  <li><a href="legacy.html">Importing legacy data</a>
-  <li><a href="export.html">File exporting and remote setup</a>
-  <li><a href="passwd.html">fs_passwd</a>
-  <li><a href="signup.html">Signup server</a>
-  <li><a href="session.html">Session monitor</a>
-  <li><a href="billing.html">Billing</a>
-  <li><a href="schema.html">Schema reference</a>
-  <li><a href="man/FS.html">Perl API</a>
-</ul>
-</body>
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
deleted file mode 100644
index 75f039dd1..000000000
--- a/httemplate/docs/install.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<head>
-  <title>Installation</title>
-</head>
-<body>
-<h1>Installation</h1>
-Before installing, you need:
-<ul>
-  <li><a href="http://www.perl.com/">Perl</a>  Don't enable experimental features like threads or the PerlIO abstraction layer.
-  <li><a href="http://www.apache.org">Apache</a> (<a href="http://www.modssl.org/">mod_ssl</a> or <a href="http://www.apache-ssl.org">Apache-SSL</a> highly recommended)
-  <li><a href="http://perl.apache.org/">mod_perl</a> (if compiling your own mod_perl, make sure you set the <a href="http://perl.apache.org/guide/install.html#EVERYTHING">EVERYTHING</a>=1 compile-time option)
-  <li><a href="http://www.openssh.com/">SSH</a> (<a href="http://www.openssh.com//">OpenSSH</a> is recommended.  SSH Communications Security <a href="http://www.ssh.com/products/ssh/download.cfm">commercial SSH version 3</a> has been reported incompatible with Freeside.)
-  <li><a href="http://rsync.samba.org/">rsync</a>
-  <li>A <b>transactional</b> database engine <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">supported</a> by Perl's <a href="http://dbi.perl.org">DBI</a>.
-    <ul>
-      <li><a href="http://www.postgresql.org/">PostgreSQL</a> (v7 or higher) is recommended.
-      <li>MySQL versions before 4.1 do not support standard SQL subqueries and are <b>NOT SUPPORTED</b>.  If you are a developer who wishes to contribute MySQL 3.x/4.0 support, see <a href="http://pouncequick.420.am/rt/Ticket/Display.html?id=438">ticket #438</a> in the bug-tracking system and ask on the -devel mailing list.
-<!--       <li>MySQL has been reported to work.
-         <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you want to use MySQL, you <b>must</b> use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a> or <a href="http://www.mysql.com/doc/I/n/InnoDB.html">InnoDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> or <code>--default-table-type=InnoDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> or <code>default-table-type=InnoDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>. -->
-    </ul>
-  <li>Perl modules (<a href="http://theoryx5.uwinnipeg.ca/CPAN/perl/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
-    <ul>
-<!--      <li><a href="http://search.cpan.org/search?dist=Array-PrintCols">Array-PrintCols</a>
-      <li><a href="http://search.cpan.org/search?dist=Term-Query">Term-Query</a> (make test broken; install manually) -->
-      <li><a href="http://search.cpan.org/search?dist=MIME-Base64">MIME-Base64</a>
-      <li><a href="http://search.cpan.org/search?dist=Digest-MD5">Digest-MD5</a>
-<!--      <li><a href="http://search.cpan.org/search?dist=MD5">MD5</a> -->
-      <li><a href="http://search.cpan.org/search?dist=URI">URI</a>
-      <li><a href="http://search.cpan.org/search?dist=HTML-Tagset">HTML-Tagset</a>
-      <li><a href="http://search.cpan.org/search?dist=HTML-Parser">HTML-Parser</a>
-      <li><a href="http://search.cpan.org/search?dist=libnet">libnet</a>
-      <li><a href="http://search.cpan.org/search?dist=Locale-Codes">Locale-Codes</a>
-      <li><a href="http://search.cpan.org/search?dist=Net-Whois">Net-Whois</a>
-      <li><a href="http://search.cpan.org/search?dist=libwww-perl">libwww-perl</a>
-      <li><a href="http://search.cpan.org/search?dist=Business-CreditCard">Business-CreditCard</a>
-<!--      <li><a href="http://search.cpan.org/search?dist=Data-ShowTable">Data-ShowTable</a> -->
-      <li><a href="http://search.cpan.org/search?dist=MailTools">MailTools</a>
-      <li><a href="http://search.cpan.org/search?dist=TimeDate">TimeDate</a>
-      <li><a href="http://search.cpan.org/search?dist=DateManip">DateManip</a>
-      <li><a href="http://search.cpan.org/search?dist=File-CounterFile">File-CounterFile</a>
-      <li><a href="http://search.cpan.org/search?dist=FreezeThaw">FreezeThaw</a>
-      <li><a href="http://search.cpan.org/search?dist=String-Approx">String-Approx</a>
-      <li><a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>
-      <li><a href="http://search.cpan.org/search?dist=DBI">DBI</a>
-      <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a> (<a href="http://search.cpan.org/search?dist=DBD-Pg">DBD::Pg</a> for PostgreSQL<!--, <a href="http://search.cpan.org/search?dist=DBD-mysql">DBD::mysql</a> for MySQL-->)
-      <li><a href="http://search.cpan.org/search?dist=DBIx-DataSource">DBIx-DataSource</a>
-      <li><a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>
-      <li><a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>
-      <li><a href="http://search.cpan.org/search?dist=String-ShellQuote">String-ShellQuote</a>
-      <li><a href="http://search.cpan.org/search?dist=Net-SCP">Net-SCP</a>
-      <li><a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a> (use version 1.0x - Freeside is not yet compatible with version 1.1x)
-      <li><a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a>
-      <li><a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>
-      <li><a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a>
-      <li><a href="http://search.cpan.org/search?dist=Storable">Storable</a>
-<!-- MyAccounts, maybe only for dev     <li><a href="http://search.cpan.org/search?dist=Cache-Cache">Cache::Cache</a> -->
-      <li><a href="http://search.cpan.org/search?dist=ApacheDBI">Apache::DBI</a> <i>(optional but recommended for better webinterface performance)</i>
-    </ul>
-</ul>
-Install the Freeside distribution:
-<ul>
-  <li>Add the user and group `freeside' to your system.
-  <li>Allow the freeside user full access to the freeside database.
-    <ul>
-      <li> with <a href="http://www.postgresql.org/users-lounge/docs/7.1/postgres/user-manag.html#DATABASE-USERS">PostgreSQL</a>:
-        <pre>
-$ su postgres
-$ createuser -P freeside
-Enter password for user "freeside": 
-Enter it again: 
-Shall the new user be allowed to create databases? (y/n) y
-Shall the new user be allowed to create more new users? (y/n) n
-CREATE USER</pre>
-<!--      <li> with <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#User_Account_Management">MySQL</a>:
-        <pre>
-$ mysqladmin -u root password '<i>set_a_root_database_password</i>'
-$ mysql -u root -p
-mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* TO freeside@localhost IDENTIFIED BY '<i>set_a_freeside_database_password</i>';</pre>
--->
-    </ul>
-<!--  <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>-->
-  <li>Edit the top-level Makefile:
-    <ul>
-      <li>Set <tt>DATASOURCE</tt> to your <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI data source</a>, for example, <tt>DBI:Pg:host=localhost;dbname=freeside</tt> for PostgresSQL<!-- or <tt>DBI:mysql:freeside</tt> for MySQL-->.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">manpage for your DBD</a> for the exact syntax of your DBI data source.
-      <li>Set <tt>DB_PASSWORD</tt> to the freeside database user's password.
-    </ul>
-  <li>Add the freeside database to your database engine:
-    <pre>
-$ su
-# make create-database</pre>
-    (or manually, with Postgres:)
-    <pre>
-$ su freeside
-$ createdb freeside</pre>
-<!--    (with MySQL:)
-    <pre>
-$ mysqladmin -u freeside -p create freeside </pre>
--->
-  <li>Build and install the Perl modules:
-    <pre>
-$ make perl-modules
-$ su
-# make install-perl-modules</pre>
-    <li>Create the necessary configuration files:<pre>
-$ su
-# make create-config
-</pre>
-    <li>Run a <b>separate</b> iteration of Apache[-SSL] with mod_perl enabled <b>as the freeside user</b>.
-</ul>
-<table>
-  <tr>
-    <th>Apache::ASP</th><th>Mason</th>
-  </tr>
-  <tr>
-    <td><ul>
-      <li>Run <tt>make aspdocs</tt>
-      <li>Copy <tt>aspdocs/</tt> to your web server's document space.
-      <li>Create a <a href="http://www.apache-asp.org/config.html#Global">Global</a> directory, such as <tt>/usr/local/etc/freeside/asp-global/</tt>:
-<font size="-1"><pre>
-mkdir&nbsp;/usr/local/etc/freeside/asp-global/
-chown&nbsp;freeside&nbsp;/usr/local/etc/freeside/asp-global/
-</pre></font>
-      <li>Copy <tt>htetc/global.asa</tt> to the Global directory:
-<font size="-1"><pre>
-cp&nbsp;htetc/global.asa&nbsp;/usr/local/etc/freeside/asp-global/global.asa
-</pre></font>
-      <li>Configure Apache for the Global directory and to execute .cgi files using Apache::ASP.  For example:
-<font size="-1"><pre>
-&lt;Directory&nbsp;/usr/local/apache/htdocs/freeside-asp&gt;
-&lt;Files ~ (\.cgi)&gt;
-AddHandler perl-script .cgi
-PerlHandler Apache::ASP
-&lt;/Files&gt;
-&lt;Perl&gt;
-$MLDBM::RemoveTaint = 1;
-&lt;/Perl&gt;
-PerlSetVar&nbsp;Global&nbsp;/usr/local/etc/freeside/asp-global/
-PerlSetVar Debug 2
-&lt;/Directory&gt;
-</pre></font>
-    </ul></td>
-    <td><ul>
-      <li>(use version 1.0x - Freeside is not yet compatible with version 1.1x)
-      <li>Run <tt>make masondocs</tt>
-      <li>Copy <tt>masondocs/</tt> to your web server's document space.
-      <li>Copy <tt>htetc/handler.pl</tt> to your web server's configuration directory.
-      <li>Edit <tt>handler.pl</tt> and set an appropriate <tt>data_dir</tt>, such as <tt>/usr/local/etc/freeside/mason-data</tt>
-      <li>Configure Apache to use the <tt>handler.pl</tt> file and to execute .cgi files using HTML::Mason.  For example:
-<font size="-1"><pre>
-&lt;Directory&nbsp;/usr/local/apache/htdocs/freeside-mason&gt;
-&lt;Files ~ (\.cgi)&gt;
-AddHandler perl-script .cgi
-PerlHandler HTML::Mason
-&lt;/Files&gt;
-&lt;Perl&gt;
-require&nbsp;"/usr/local/apache/conf/handler.pl";
-&lt;/Perl&gt;
-&lt;/Directory&gt;
-</pre></font>
-    </ul></td>
-  </tr>
-</table>
-<ul>
-<li>Restrict access to this web interface - see the <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache documentation on user authentication</a>.    For example, to configure user authentication with <a href="http://httpd.apache.org/docs/mod/mod_auth.html">mod_auth</a> (flat files):
-<pre>
-&lt;Directory /usr/local/apache/htdocs/freeside-asp&gt;
-PerlSetVar Global /usr/local/etc/freeside/asp-global/
-AuthName Freeside
-AuthType Basic
-AuthUserFile /usr/local/etc/freeside/htpasswd
-require valid-user
-&lt;/Directory&gt;
-</pre>
-  <li>Create one or more Freeside users (your internal sales/tech folks, not customer accounts).  These users are setup using using Apache authentication, not UNIX user accounts.  For example, using <a href="http://httpd.apache.org/docs/mod/mod_auth.html">mod_auth</a> (flat files):
-    <ul>
-      <li>First user:<font size="-1">
-<pre>$ su
-$ <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -c -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
-      <li>Additional users:<font size="-1">
-<pre>$ su
-$ <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
-    </ul>
-  <i>(using other auth types, add each user to your <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache authentication</a> and then run: <tt>freeside-adduser <b>username</b></tt></i>
-  <li>As the freeside UNIX user, run <tt>bin/fs-setup <b>username</b></tt> (in the untar'ed freeside directory) to create the database tables, passing the username of a Freeside user you created above:
-<pre>
-$ su freeside
-$ cd <b>/path/to/freeside-1.4.0/</b>
-$ bin/fs-setup <b>username</b>
-</pre>
-  <li>As the freeside UNIX user, run <tt>bin/populate-msgcat <b>username</b></tt> (in the untar'ed freeside directory) to populate the message catalog, passing the username of a Freeside user you created above:
-<pre>
-$ su freeside
-$ cd <b>/path/to/freeside-1.4.0/</b>
-$ bin/populate-msgcat <b>username</b>
-</pre>
-  <li><tt>freeside-queued</tt> was installed with the Perl modules.  Start it now and ensure that is run upon system startup (Do this manually, or edit the top-level Makefile, replacing INIT_FILE with the appropriate location on your systemand QUEUED_USER with the username of a Freeside user you created above, and run <tt>make install-init</tt>)
-  <li>Now proceed to the initial <a href="admin.html">administration</a> of your installation.
-</ul>
-</body>
diff --git a/httemplate/docs/legacy.html b/httemplate/docs/legacy.html
deleted file mode 100755
index 2db9edb0f..000000000
--- a/httemplate/docs/legacy.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<head>
-  <title>Importing legacy data</title>
-</head>
-<body>
-  <h1>Importing legacy data</h1>
-<font size="+2">In most cases, legacy data import all cases will require writing custom code to deal with your particular legacy data.  The example scripts here will not work "out-of-the-box".  Importing your legacy data will most probably involve some hacking on the example scripts noted below.  Contributions to the import process are welcome.</font>
-<br><br><i>Some import scripts may require installation of the <a href="http://search.cpan.org/search?dist=Array-PrintCols">Array-PrintCols</a> and <a href="http://search.cpan.org/search?dist=Term-Query">Term-Query</a> (make test broken; install manually) modules.</i><br>
-<ul>
-  <li><a name="bind">bin/bind.import</a> - Import domain information from BIND named
-  <li><a name="passwd">bin/passwd.import</a> - Just import `passwd' and `shadow' or `master.passwd', no RADIUS import.
-  <li><a name="svc_acct">bin/svc_acct.import</a> - Import `passwd', ( `shadow' or `master.passwd' ) and RADIUS `users'.  Before running bin/svc_acct.import, you need <a href="../browse/part_svc.cgi">services</a> (with table svc_acct) as follows:
-    <ul>
-      <li>Most accounts probably have entries in passwd and users (with Port-Limit nonexistant or 1)
-      <li>Some accounts have entries in passwd and users, but with Port-Limit 2 (or more)
-      <li>Some accounts might have entries in users only (Port-Limit 1)
-      <li>Some accounts might have entries in users only (Port-Limit >= 2)
-      <li>POP mail accounts have entries in passwd only, and have a particular shell.
-      <li>Everything else in passwd is a shell account.
-    </ul>
-  <li><a name="svc_acct_sm">bin/svc_acct_sm.import</a> - Import qmail ( `virtualdomains' and `rcpthosts' ), or sendmail ( `virtusertable' and `sendmail.cw' ) files.  Before running bin/svc_acct_sm.import, you need <a href="../browse/part_svc.cgi">services</a> as follows:
-    <ul>
-      <li>Domain (table svc_acct)
-      <li>Mail alias (table svc_acct_sm)
-    </ul>
-  <li><a name="cust_main">Importing customer data</a>
-    <ul>
-      <li>Manually
-        <ul>
-          <li>Add a <a href="../edit/cust_main.cgi">new customer</a>
-          <li>Add one or more packages for this customer
-          <li>Enter a package by clicking on the package number
-          <li>Pick the `Link to existing' option
-        </ul>
-      <li>Batch - You will need to write a script to import your particular legacy data.  You can use eg/TEMPLATE_cust_main.import as a starting point.
-    </ul>
-</ul>
-</body>
-
diff --git a/httemplate/docs/overview.dia b/httemplate/docs/overview.dia
deleted file mode 100644
index a0e34c30e..000000000
Binary files a/httemplate/docs/overview.dia and /dev/null differ
diff --git a/httemplate/docs/overview.png b/httemplate/docs/overview.png
deleted file mode 100644
index bf2dbc26c..000000000
Binary files a/httemplate/docs/overview.png and /dev/null differ
diff --git a/httemplate/docs/passwd.html b/httemplate/docs/passwd.html
deleted file mode 100755
index fc1dde956..000000000
--- a/httemplate/docs/passwd.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<head>
-  <title>fs_passwd</title>
-</head>
-<body>
-  <h1>fs_passwd</h1>
-You may use fs_passwd/fs_passwd as a "passwd", "chfn" and "chsh" replacement on your shell machine(s) to cause password, gecos and shell changes to update your freeside machine.  You can also use the fs_passwd/fs_passwd.html and fs_passwd/fs_passwd.cgi to run a public password change CGI on a public web server.  This can pose a security risk if not configured correctly.  <b>Do not use this feature unless you understand what you are doing!</b>
-<br><br>Currently it is assumed that the the crypt(3) function in the C library is the same on the Freeside machine as on the target machine.
-<ul>
-  <li>Create a freeside account on the shell or web machine(s).
-  <li>Setup SSH keys:
-    <ul>
-      <li>As the freeside user (on your freeside machine), generate an authentication key using <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>.  Since this is for unattended operation, use a blank passphrase.
-      <li>Append the newly-created <code>identity.pub</code> file to <code>~freeside
-/.ssh/authorized_keys</code> on the shell or web machine(s).
-      <li>Some new SSH v2 implementation accept v2 style keys only.  Use the <code>-t</code> option to <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>, and append the created <code>id_dsa.pub</code> or <code>id_rsa.pub</code> to <code>~freeside/.ssh/authorized_keys2</code> on the remote machine(s).
-    </ul>
-  <li>Copy fs_passwd/fs_passwdd to /usr/local/sbin on the shell or web machine(s).  (chown freeside, chmod 500)
-  <li>Create /usr/local/freeside on the shell or web machine(s). (chown freeside, chmod 700)
-  <li>Run an iteration of "fs_passwd/fs_passwd_server <i>user</i> shell.machine" as the freeside user for each shell or web machine (this is a daemon process).  <i>user</i> refers to a freeside user added by <a href="man/bin/freeside-adduser.html">freeside-adduser</a>.
-  <li>Copy fs_passwd/fs_passwd to /usr/local/bin on the shell machine(s).  (chown freeside, chmod 4755).  You may link it to passwd, chfn and chsh as well.
-  <li>Copy fs_passwd/fs_passwd.cgi to the cgi-bin directory on your web machine(s).  Use <a href="http://www.apache.org/docs/suexec.html">suEXEC</a> or <a href="http://www.perldoc.com/perl5.6.1/pod/perlsec.html">suidperl</a> to run fs_passwd.cgi as the freeside user.
-</ul>
-</body>
diff --git a/httemplate/docs/schema.dia b/httemplate/docs/schema.dia
deleted file mode 100644
index 092d2f88b..000000000
Binary files a/httemplate/docs/schema.dia and /dev/null differ
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
deleted file mode 100644
index 2b8b3a132..000000000
--- a/httemplate/docs/schema.html
+++ /dev/null
@@ -1,424 +0,0 @@
-<head>
-  <title>Schema reference</title>
-</head>
-<body>
-  <h1>Schema reference</h1>
-  Schema diagram: <a href="schema.png">as a giant .png</a> or <a href="schema.dia">dia source</a> (<a href="http://www.lysator.liu.se/~alla/dia/">dia homepage</a>).
-  <ul>
-    <li><a name="agent" href="man/FS/agent.html">agent</a> - Agents are resellers of your service.  Agents may be limited to a subset of your full offerings (via their agent type).
-      <ul>
-        <li>agentnum - primary key
-        <li>agent - name of this agent
-        <li>typenum - <a href="#agent_type">agent type</a>
-        <li>prog - (unimplemented)
-        <li>freq - (unimplemented)
-      </ul>
-    <li><a name="agent_type" href="man/FS/agent_type.html">agent_type</a> - Agent types define groups of packages that you can then assign to particular agents.
-      <ul>
-        <li>typenum - primary key
-        <li>atype - name of this agent type
-      </ul>
-    <li><a name="cust_bill" href="man/FS/cust_bill.html">cust_bill</a> - Invoices.  Declarations that a customer owes you money.  The specific charges are itemized in <a href="#cust_bill_pkg">cust_bill_pkg</a>.
-      <ul>
-        <li>invnum - primary key
-        <li>custnum - <a href="#cust_main">customer</a>
-        <li>_date
-        <li>charged - amount of this invoice
-        <li>printed - how many times this invoice has been printed automatically
-        <li>closed - books closed flag, empty or `Y'
-      </ul>
-    <li><a name="cust_bill_event" href="man/FS/cust_bill_event.html">cust_bill_event</a> - Invoice event history
-      <ul>
-        <li>eventnum - primary key
-        <li>invnum - <a href="#cust_bill">invoice</a>
-        <li>eventpart - <a href="#part_bill_event">event definition</a>
-        <li>_date
-        <li>status
-        <li>statustext
-      </ul>
-    <li><a name="part_bill_event" href="man/FS/part_bill_event.html">part_bill_event</a> - Invoice event definitions
-      <ul>
-        <li>eventpart - primary key
-        <li>payby - CARD, BILL, or COMP
-        <li>event - event name
-        <li>eventcode - event action
-        <li>seconds - how long after the invoice date (<a href="#cust_bill">cust_bill</a>._date) events of this type are triggered
-        <li>weight - ordering for events with identical seconds
-        <li>plan - eventcode plan
-        <li>plandata - additional plan data
-        <li>disabled - Disabled flag, empty or `Y'
-        <li>taxclass - Texas tax class flag, empty or "none", "access", or "hosting"
-      </ul>
-    <li><a name="cust_bill_pkg" href="man/FS/cust_bill_pkg.html">cust_bill_pkg</a> - Invoice line items
-      <ul>
-        <li>invnum - (multiple) key
-        <li>pkgnum - <a href="#cust_pkg">package</a> or 0 for the special virtual sales tax package
-        <li>setup - setup fee 
-        <li>recur - recurring fee
-        <li>sdate - starting date
-        <li>edate - ending date
-      </ul>
-    <li><a name="cust_credit" href="man/FS/cust_credit.html">cust_credit</a> - Credits.  The equivalent of a negative <a href="#cust_bill">cust_bill</a> record.
-      <ul>
-        <li>crednum - primary key
-        <li>custnum - <a href="#cust_main">customer</a>
-        <li>amount - amount credited
-        <li>_date
-        <li>otaker - order taker
-        <li>reason
-        <li>closed - books closed flag, empty or `Y'
-      </ul>
-    <li><a name="cust_credit_bill" href="man/FS/cust_credit_bill.html">cust_credit_bill</a> - Credit invoice application.  Links a credit to an invoice.
-      <ul>
-        <li>creditbillnum - primary key
-        <li>crednum - <a href="#cust_credit">credit</a> being applied
-        <li>invnum - <a href="#cust_bill">invoice</a> to which credit is applied
-        <li>amount - amount applied
-        <li>_date
-      </ul>
-    <li><a name="cust_main" href="man/FS/cust_main.html">cust_main</a> - Customers
-      <ul>
-        <li>custnum - primary key
-        <li>agentnum - <a href="#agent">agent</a>
-        <li>refnum - <a href="#part_referral">referral</a>
-        <li>first - name
-        <li>last - name
-        <li>ss - social security number
-        <li>company
-        <li>address1
-        <li>address2
-        <li>city
-        <li>county
-        <li>state
-        <li>zip
-        <li>country
-        <li>daytime - phone
-        <li>night - phone
-        <li>fax - phone
-        <li><i>ship_first</i>
-        <li><i>ship_last</i>
-        <li><i>ship_company</i>
-        <li><i>ship_address1</i>
-        <li><i>ship_address2</i>
-        <li><i>ship_city</i>
-        <li><i>ship_county</i>
-        <li><i>ship_state</i>
-        <li><i>ship_zip</i>
-        <li><i>ship_country</i>
-        <li><i>ship_daytime</i>
-        <li><i>ship_night</i>
-        <li><i>ship_fax</i>
-        <li>payby - CARD, BILL, or COMP
-        <li>payinfo - card number, P.O.#, or comp issuer
-        <li>paydate - expiration date
-        <li>payname - billing name (name on card)
-        <li>tax - tax exempt, Y or null
-        <li>otaker - order taker
-        <li>referral_custnum
-        <li>comments
-      </ul>
-      (columns in <i>italics</i> are optional)
-    <li><a name="cust_main_invoice" href="man/FS/cust_main_invoice.html">cust_main_invoice</a> - Invoice destinations for email invoices.  Note that a customer can have many email destinations for their invoice (either literal or via svcnum), but only one postal destination.
-      <ul>
-        <li>destnum - primary key
-        <li>custnum - <a href="#cust_main">customer</a>
-        <li>dest - Invoice destination.  Freeside supports three types of invoice delivery: send directly to a service defined in Freeside, send to an arbitrary email address, or print the invoice to a printer and have someone send it out via snail mail.  Freeside determines which method to use based on the contents of the dest field.  If the contents are numeric, a <a href="#svc_acct">svcnum</a> pointing to a valid service is expected in the field.  If the contents are a string, a literal email address is expected to be in the field.  If the special keyword `POST' is present, the snail mail method is used (which is the default if no cust_main_invoice records exist).  Snail mail invoices get their address information from <A name="#cust_main">cust_main</A> and are printed with the printer defined in the configuration files.
-      </ul>
-    <li><a name="cust_main_county" href="man/FS/cust_main_county.html">cust_main_county</a> - Tax rates
-      <ul>
-        <li>taxnum - primary key
-        <li>state
-        <li>county
-        <li>country
-        <li>tax - % rate
-        <li>taxclass
-        <li>exempt_amount
-      </ul>
-    <li><a name="cust_tax_exempt" href="man/FS/cust_tax_exempt.html">cust_tax_exempt</a> - Tax exemption record
-      <ul>
-        <li>exemptnum - primary key
-        <li>taxnum - <a href="#cust_main_county">tax rate</a>
-        <li>year
-        <li>month
-        <li>amount
-      </ul>
-    <li><a name="cust_pay" href="man/FS/cust_pay.html">cust_pay</a> - Payments.  Money being transferred from a customer.
-      <ul>
-        <li>paynum - primary key
-        <li>custnum - <a href="#cust_main">customer</a>
-        <li>paid - amount
-        <li>_date
-        <li>payby - CARD, BILL, or COMP
-        <li>payinfo - card number, P.O.#, or comp issuer
-        <li>paybatch - text field for tracking card processor batches
-        <li>closed - books closed flag, empty or `Y'
-      </ul>
-    <li><a name="cust_bill_pay" href="man/FS/cust_bill_pay.html">cust_bill_pay</a> - Applicaton of a payment to a specific invoice.
-      <ul>
-        <li>billpaynum
-        <li>invnum - <a href="#cust_bill">invoice</a>
-        <li>paynum - <a href="#cust_pay">payment</a>
-        <li>amount
-        <li>_date
-      </ul>
-    <li><a name="cust_pay_batch" href="man/FS/cust_pay_batch.html">cust_pay_batch</a> - Pending batch
-      <ul>
-        <li>paybatchnum
-        <li>cardnum
-        <li>exp - card expiration
-        <li>amount
-        <li>invnum - <a href="#cust_bill">invoice</a>
-        <li>custnum - <a href="#cust_main">customer</a>
-        <li>payname - name on card
-        <li>first - name
-        <li>last - name
-        <li>address1
-        <li>address2
-        <li>city
-        <li>state
-        <li>zip
-        <li>country
-      </ul>
-    <li><a name="cust_pkg" href="man/FS/cust_pkg.html">cust_pkg</a> - Customer billing items
-      <ul>
-        <li>pkgnum - primary key
-        <li>custnum - <a href="#cust_main">customer</a>
-        <li>pkgpart - <a href="#part_pkg">Package definition</a>
-        <li>setup - date
-        <li>bill - next bill date
-        <li>susp - (past) suspension date
-        <li>expire - (future) cancellation date
-        <li>cancel - (past) cancellation date
-        <li>otaker - order taker
-        <li>manual_flag - If this field is set to 1, disables the automatic unsuspensiond of this package when using the <a href="config.html#unsuspendauto">unsuspendauto</a> config file.
-      </ul>
-    <li><a name="cust_refund" href="man/FS/cust_refund.html">cust_refund</a> - Refunds.  The transfer of money to a customer; equivalent to a negative <a href="#cust_pay">cust_pay</a> record.
-      <ul>
-        <li>refundnum - primary key
-        <li>custnum - <a href="#cust_main">customer</a>
-        <li>refund - amount
-        <li>_date
-        <li>payby - CARD, BILL or COMP
-        <li>payinfo - card number, P.O.#, or comp issuer
-        <li>otaker - order taker
-        <li>closed - books closed flag, empty or `Y'
-      </ul>
-    <li><a name="cust_credit_refund" href="man/FS/cust_credit_refund.html">cust_credit_refund</a> - Applicaton of a refund to a specific credit.
-      <ul>
-        <li>creditrefundnum - primary key
-        <li>crednum - <a href="#cust_credit">credit</a>
-        <li>refundnum - <a href="#cust_refund">refund</a>
-        <li>amount
-        <li>_date
-      </ul>
-    <li><a name="cust_svc" href="man/FS/cust_svc.html">cust_svc</a> - Customer services
-      <ul>
-        <li>svcnum - primary key
-        <li>pkgnum - <a href="#cust_pkg">package</a>
-        <li>svcpart - <a href="#part_svc">Service definition</a>
-      </ul>
-    <li><a name="nas" href="man/FS/nas.html">nas</a> - Network Access Server (terminal server)
-      <ul>
-        <li>nasnum - primary key
-        <li>nas - NAS name
-        <li>nasip - NAS ip address
-        <li>nasfqdn - NAS fully-qualified domain name
-        <li>last - timestamp indicating the last instant the NAS was in a known state (used by the session monitoring).
-      </ul>
-    <li><a name="part_pkg" href="man/FS/part_pkg.html">part_pkg</a> - Package definitions
-      <ul>
-        <li>pkgpart - primary key
-        <li>pkg - package name
-        <li>comment - non-customer visable package comment
-        <li>setup - setup fee expression
-        <li>freq - recurring frequency (months)
-        <li>recur - recurring fee expression
-        <li>setuptax - Setup fee tax exempt flag, empty or `Y'
-        <li>recurtax - Recurring fee tax exempt flag, empty or `Y'
-        <li>plan - price plan
-        <li>plandata - additional price plan data
-        <li>disabled - Disabled flag, empty or `Y'
-      </ul>
-    <li><a name="part_referral" href="man/FS/part_referral.html">part_referral</a> - Referral listing
-      <ul>
-        <li>refnum - primary key
-        <li>referral - referral
-      </ul>
-    <li><a name="part_svc" href="man/FS/part_svc.html">part_svc</a> - Service definitions
-      <ul>
-        <li>svcpart - primary key
-        <li>svc - name of this service
-        <li>svcdb - table used for this service: svc_acct, svc_acct_sm, svc_forward, svc_domain, svc_charge or svc_wo
-        <li>disabled - Disabled flag, empty or `Y'
-<!--        <li><i>table</i>__<i>field</i> - Default or fixed value for <i>field</i> in <i>table</i>
-        <li><i>table</i>__<i>field</i>_flag - null, D or F
--->
-      </ul>
-    <li><a name="part_svc_column" href="man/FS/part_svc_column.html">part_svc_column</a>
-      <ul>
-        <li>columnnum - primary key
-        <li>svcpart - <a href="#part_svc">Service definition</a>
-        <li>columnname - column name in part_svc.svcdb table
-        <li>columnvalue - default or fixed value for the column
-        <li>columnflag - null, D or F
-      </ul>
-    <li><a name="pkg_svc" href="man/FS/pkg_svc.html">pkg_svc</a>
-      <ul>
-        <li>pkgpart - <a href="#part_pkg">Package definition</a>
-        <li>svcpart - <a href="#part_svc">Service definition</a>
-        <li>quantity - quantity of this service that this package includes
-      </ul>
-    <li><a name="export_svc" href="man/FS/export_svc.html">export_svc</a>
-      <ul>
-        <li>exportsvcnum - primary key
-        <li>svcpart - <a href="#part_svc">Service definition</a>
-        <li>exportnum - <a href="#exportnum">Export</a>
-      </ul>
-    <li><a name="part_export" href="man/FS/part_export.html">part_export</a> - Export to external provisioning
-      <ul>
-        <li>exportnum - primary key
-        <li>machine - Machine name 
-        <li>exporttype - Export type
-        <li>nodomain - blank or Y: usernames are exported to this service with no domain
-      </ul>
-    <li><a name="part_export_option" href="man/FS/part_export_option.html">part_export_option</a> - provisioning options
-      <ul>
-        <li>optionnum - primary key
-        <li>exportnum - <a href="#part_export">Export</a>
-        <li>optionname - option name
-        <li>optionvalue - option value
-      </ul>
-    <li><a name="port" href="man/FS/port.html">port</a> - individual port on a <a href="#nas">nas</a>
-      <ul>
-        <li>portnum - primary key
-        <li>ip - IP address of this port
-        <li>nasport - port number on the NAS
-        <li>nasnum - <a href="#nas">NAS</a>
-      </ul>
-    <li><a name="prepay_credit" href="man/FS/prepay_credit.html">prepay_credit</a>
-      <ul>
-        <li>prepaynum - primary key
-        <li>identifier - text or numeric string used to receive this credit
-        <li>amount - amount of credit
-      </ul>
-    <li><a name="session" href="man/FS/session.html">session</a>
-      <ul>
-        <li>sessionnum - primary key
-        <li>portnum - <a href="#port">Port</a>
-        <li>svcnum - <a href="#svc_acct">Account</a>
-        <li>login - timestamp indicating the beginning of this user session.
-        <li>logout - timestamp indicating the end of this user session.  May be null, which indicates a currently open session.
-      </ul>
-
-    <li><a name="svc_acct" href="man/FS/svc_acct.html">svc_acct</a> - Accounts
-      <ul>
-        <li>svcnum - <a href="#cust_svc">primary key</a>
-        <li>username
-        <li>_password
-        <li>sec_phrase - security phrase
-        <li>popnum - <a href="#svc_acct_pop">Point of Presence</a>
-        <li>uid
-        <li>gid
-        <li>finger - GECOS
-        <li>dir
-        <li>shell
-        <li>quota - (unimplementd)
-        <li>slipip - IP address
-        <li>seconds
-        <li>domsvc
-        <li>radius_<i>Radius_Reply_Attribute</i> - Radius-Reply-Attribute
-        <li>rc_<i>Radius_Check_Attribute</i> - Radius-Check-Attribute
-      </ul>
-    <li><a name="svc_acct_pop" href="man/FS/svc_acct_pop.html">svc_acct_pop</a> - Points of Presence
-      <ul>
-        <li>popnum - primary key
-        <li>city
-        <li>state
-        <li>ac - area code
-        <li>exch - exchange
-        <li>loc - rest of number
-      </ul>
-    <li><a name="part_pop_local" href="man/FS/part_pop_local.html">part_pop_local</a> - Local calling areas
-      <ul>
-        <li>localnum - primary key
-        <li>popnum - primary key
-        <li>city
-        <li>state
-        <li>npa - area code
-        <li>nxx - exchange
-      </ul>
-    <li><a name="svc_acct_sm" href="man/FS/svc_acct_sm.html">svc_acct_sm</a> - <b>DEPRECIATED</b> Domain mail aliases
-      <ul>
-        <li>svcnum - <a href="#cust_svc">primary key</a>
-        <li>domsvc - <a href="#svc_domain">Domain</a> (by svcnum)
-        <li>domuid - <a href="#svc_acct">Account</a> (by uid)
-        <li>domuser - domuser @ <a href="#svc_domain">Domain</a> forwards to <a href="#svc_acct">Account</a>
-      </ul>
-    <li><a name="svc_domain" href="man/FS/svc_domain.html">svc_domain</a> - Domains
-      <ul>
-        <li>svcnum - <a href="#cust_svc">primary key</a>
-        <li>domain
-      </ul>
-    <li><a name="svc_forward" href="man/FS/svc_forward.html">svc_forward</a> - Mail forwarding aliases
-      <ul>
-        <li>svcnum - <a href="#cust_svc">primary key</a>
-        <li>srcsvc - <a href="#svc_acct">svcnum of the source of this forward</a>
-        <li>dstsvc - <a href="#svc_acct">svcnum of the destination of this forward</a>
-        <li>dst - foreign destination (email address) - forward not local to freeside
-      </ul>
-    <li><a name="domain_record" href="man/FS/domain_record.html">domain_record</a> - Domain zone detail
-      <ul>
-        <li>recnum - primary key
-        <li>svcnum - <a href="#svc_domain">Domain</a> (by svcnum)
-        <li>reczone - zone for this line
-        <li>recaf - address family, usually <b>IN</b>
-        <li>rectype - type for this record (<b>A</b>, <b>MX</b>, etc.)
-        <li>recdata - data for this record
-      </ul>
-    <li><a name="svc_www" href="man/FS/svc_www.html">svc_www</a>
-      <ul>
-       <li>svcnum - <a href="#cust-svc">primary key</a>
-       <li>recnum - <a href="#domain_record">host</a>
-       <li>usersvc - <a href="#svc_acct">account</a>
-      </ul>
-    <li><a name="type_pkgs" href="man/FS/type_pkgs.html">type_pkgs</a>
-      <ul>
-        <li>typenum - <a href="#agent_type">agent type</a>
-        <li>pkgpart - <a href="#part_pkg">Package definition</a>
-      </ul>
-    <li><a name="queue" href="man/FS/queue.html">queue</a> - job queue
-      <ul>
-        <li>jobnum - primary key
-        <li>job
-        <li>_date
-        <li>status
-        <li>statustext
-        <li>svcnum
-      </ul>
-    <li><a name="queue_arg" href="man/FS/queue_arg.html">queue_arg</a> - job arguments
-      <ul>
-        <li>argnum - primary key
-        <li>jobnum - <a href="#queue">job</a>
-        <li>arg - argument
-      </ul>
-    <li><a name="queue_depend" href="man/FS/queue_depend.html">queue_depend</a> - job dependancies
-      <ul>
-        <li>dependnum - primary key
-        <li>jobnum - source jobnum
-        <li>depend_jobnum - dependancy jobnum
-      </ul>
-    <li><a name="radius_usergroup" href="man/FS/radius_usergroup.html">radius_usergroup</a> - Link users to RADIUS groups.
-      <ul>
-        <li>usergroupnum - primary key
-        <li>svcnum - <a href="#svc_acct">account</a>
-        <li>groupname
-      </ul>
-    <li><a name="msgcat" href="man/FS/msgcat.html">msgcat</a> - i18n message catalog
-      <ul>
-        <li>msgnum - primary key
-        <li>msgcode - message code
-        <li>locale - locale
-        <li>msg - Message text
-      </ul>
-  </ul>
-</body>
diff --git a/httemplate/docs/schema.png b/httemplate/docs/schema.png
deleted file mode 100644
index d0392e76f..000000000
Binary files a/httemplate/docs/schema.png and /dev/null differ
diff --git a/httemplate/docs/session.html b/httemplate/docs/session.html
deleted file mode 100644
index 7dac5fdf7..000000000
--- a/httemplate/docs/session.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<head>
-  <title>Session monitor</title>
-</head>
-<body>
-<h1>Session monitor</h1>
-<h2>Installation</h2>
-For security reasons, the client portion of the session montior may run on one
-or more external public machine(s).  On these machines, install:
-<ul>
-  <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at l
-east 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
-  <li><a href="man/FS/SessionClient.html">FS::SessionClient</a> (copy the fs_session/FS-SessionClient directory to the external machine, then: perl Makefile.PL; make; make install)
-</ul>
-Then:
-<ul>
-  <li>Add the user `freeside' to the the external machine.
-  <li>Create the /usr/local/freeside directory on the external machine (owned by the freeside user).
-  <li>touch /usr/local/freeside/fs_sessiond_socket; chown freeside /usr/local/freeside/fs_sessiond_socket; chmod 600 /usr/local/freeside/fs_sessiond_socket
-    <li>Append the identity.pub from the freeside user on your freeside machine to the authorized_keys file of the newly created freeside user on the external machine(s).
-  <li>Run <pre>fs_session_server <i>user</i> <i>machine</i></pre> on the Freeside machine.
-  <ul>
-    <li><i>user</i> is a user from the mapsecrets file.
-    <li><i>machine</i> is the name of the external machine.
-  </ul>
-</ul>
-<h2>Usage</h2>
-<ul>
-  <li>Web
-    <ul>
-      <li>Copy FS-SessionClient/cgi/login.cgi and logout.cgi to your web
-          server's document space.  
-      <li>Use <a href="http://www.apache.org/docs/suexec.html">suEXEC</a> or <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">setuid</a> (see <a href="install.html">install.html</a> for details) to run login.cgi and logout.cgi as the freeside user.
-    </ul>
-  <li>Command-line
-    <br><pre>freeside-login username ( portnum | ip | nasnum nasport )
-freeside-logout username ( portnum | ip | nasnum nasport )</pre>
-    <ul>
-      <li><i>username</i> is a customer username from the svc_acct table
-      <li><i>portnum</i>, <i>ip</i> or <i>nasport</i> and <i>nasnum</i> uniquely identify a port in the <a href="schema.html#port">port</a> database table.
-    </ul>
-  <li>RADIUS
-    <ul>
-      <li>Configure your RADIUS server's login and logout callbacks to use the command-line <tt>freeside-login</tt> and <tt>freeside-logout</tt> utilites.
-    </ul>
-</ul>
-<h2>Callbacks</h2>
-<ul>
-  <li>Sesstion start - The command(s) specified in the <a href="config.html#session-start">session-start</a> configuration file are executed on the Freeside machine.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
-  <li>Session end - The command(s) specified in the <a href="config.html#session-stop">session-stop</a> configuration file are executed on the Freeside machine.  The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
-</ul>
-<h2>Dropping expired users</h2>
-Run <pre>bin/freeside-session-kill username</pre> periodically from cron.
-</body>
-</html>
diff --git a/httemplate/docs/signup.html b/httemplate/docs/signup.html
deleted file mode 100644
index 5168f47d6..000000000
--- a/httemplate/docs/signup.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<head>
-  <title>Signup server</title>
-</head>
-<body>
-  <h1>Signup server</h1>
-For security reasons, the signup server should run on an external public
-webserver.  On this machine, install:
-<ul>
-  <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
-  <li><a href="ftp://ftp.cs.hut.fi/pub/ssh/">SSH</a>
-  <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series.  Don't enable experimental features like threads or the PerlIO abstraction layer.)
-  <li><a href="http://search.cpan.org/search?dist=Text-Template">Text::Template</a>
-  <li><a href="http://search.cpan.org/search?dist=Storable">Storable</a>
-  <li><a href="http://search.cpan.org/search?dist=Business-CreditCard">Business-CreditCard</a>
-  <li><a href="http://www.sisd.com/useragent">HTTP::Headers::UserAgent</a> (version 2.0 or higher; not yet indexed correctly on CPAN)
-
-  <li><a href="man/FS/SignupClient.html">FS::SignupClient</a> (copy the fs_signup/FS-SignupClient directory to the external machine, then: perl Makefile.PL; make; make install)
-</ul>
-Then:
-<ul>
-  <li>Add the user `freeside' to the the external machine.
-  <li>Copy or symlink fs_signup/FS-SignupClient/cgi/signup.cgi into the web server's document space.
-  <li>When linking to signup.cgi, you can include a referring custnum in the URL as follows: <code>http://public.web.server/path/signup.cgi?ref=1542</code>
-  <li>Enable CGI execution for files with the `.cgi' extension.  (with <a href="http://www.apache.org/docs/mod/mod_mime.html#addhandler">Apache</a>)
-  <li>Create the /usr/local/freeside directory on the external machine (owned by the freeside user).
-  <li>touch /usr/local/freeside/fs_signupd_socket; chown freeside /usr/local/freeside/fs_signupd_socket; chmod 600 /usr/local/freeside/fs_signupd_socket
-  <li>Use <a href="http://www.apache.org/docs/suexec.html">suEXEC</a> or <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">setuid</a> (see <a href="install.html">install.html</a> for details) to run signup.cgi as the freeside user.
-  <li>Append the identity.pub from the freeside user on your freeside machine to the authorized_keys file of the newly created freeside user on the external machine(s).
-  <li>Run <pre>fs_signup_server <i>user</i> <i>machine</i> <i>agentnum</i> <i>refnum</i></pre> on the Freeside machine.
-  <ul>
-    <li><i>user</i> is a user from the mapsecrets file.
-    <li><i>machine</i> is the name of the external machine.
-    <li><i>agentnum</i> and <i>refnum</i> are the <a href="schema.html#agent">agent</a> and <a href="schema.html#part_referral">referral</a>, respectively, to use for customers who sign up via this signup server.
-  </ul>
-</ul>
-Optional:
-<ul>
-  <li>If you create a <b>/usr/local/freeside/ieak.template</b> file on the external machine, it will be sent to IE users with MIME type <i>application/x-Internet-signup</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the variables listed below available.
-  (an example file is included as <b>fs_signup/ieak.template</b>)  See the <a href="http://www.microsoft.com/windows/ieak/techinfo/deploy/60/en/toc.asp">IEAK documentation</a> for more information.
-  <li>If you create a <b>/usr/local/freeside/cck.template</b> file on the external machine, the variables defined will be sent to Netscape users with MIME type <i>application/x-netscape-autoconfigure-dialer-v2</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the variables listed below available.
-  (an example file is included as <b>fs_signup/cck.template</b>).  See the <a href="http://help.netscape.com/products/client/mc/acctproc4.html">Netscape documentation</a> for more information.
-  <li>If you create a <b>/usr/local/freeside/success.html</b> file on the external machine, it will be used as the success HTML page.  Although template substiutions are available, a regular HTML file will work fine here, unlike signup.html.  An example file is included as <b>fs_signup/FS-SignupClient/cgi/success.html</b>
-  <li>Variable substitutions available in <b>ieak.template</b>, <b>cck.template</b> and <b>success.html</b>:
-    <ul>
-      <li>$ac - area code of selected POP
-      <li>$exch - exchange of selected POP
-      <li>$loc - local part of selected POP
-      <li>$username
-      <li>$password
-      <li>$email_name - first and last name
-      <li>$pkg - package name
-    </ul>
-  <li>If you create a <b>/usr/local/freeside/signup.html</b> file on the external machine, it will be used as a template for the form HTML.  This requires the template to be constructed appropriately; probably best to start with the example file included as <b>fs_signup/FS-SignupClient/cgi/signup.html</b>.
-  <li>If there are any entries in the <i>prepay_credit</i> table, a user can enter a string matching the <b>identifier</i> column to receive the credit specified in the <b>amount</b> column, and/or the time specified in the <b>seconds</b> column (for use with the <a href="session.html">session monitor</a>), after which that <b>identifier</b> is no longer valid.  This can be used to implement pre-paid "calling card" type signups.  The <i>bin/generate-prepay</i> script can be used to populate the <i>prepay_credit</i> table.
-</ul>
-</body>
diff --git a/httemplate/docs/ssh.html b/httemplate/docs/ssh.html
deleted file mode 100755
index 5503a242e..000000000
--- a/httemplate/docs/ssh.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<head>
-  <title>Unattended SSH</title>
-</head>
-<body>
-  <h1>Unattended SSH</h1>
-  <br><a name=ssh>Unattended remote login</a> - Freeside can login to remote machines unattended using SSH.  This can pose a security risk if not configured correctly, and will allow an intruder who breaks into your freeside machine full access to your remote machines.  <b>Do not use this feature unless you understand what you are doing!</b>
-    <ul>
-      <li>As the freeside user (on your freeside machine), generate an authentication key using <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>.  Since this is for unattended operation, use a blank passphrase.
-      <li>Append the newly-created <code>identity.pub</code> file to <code>~root/.ssh/authorized_keys</code> on the remote machine(s).
-      <li>Some new SSH v2 implementation accept v2 style keys only.  Use the <code>-t</code> option to <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>, and append the created <code>id_dsa.pub</code> or <code>id_rsa.pub</code> to <code>~root/.ssh/authorized_keys2</code> on the remote machine(s).
-      <li>You may need to set <code>PermitRootLogin without-password</code> (meaning with keys only) in your <code>sshd_config</code> file on the remote machine(s).
-    </ul>
-
-</body>
-
diff --git a/httemplate/docs/trouble.html b/httemplate/docs/trouble.html
deleted file mode 100755
index fce743928..000000000
--- a/httemplate/docs/trouble.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<head>
-  <title>Troubleshooting</title>
-</head>
-<body>
-  <h1>Troubleshooting</h1>
-  <ul>
-    <li>When troubleshooting the web interface, helpful information is often in your web server's error log.
-    <li>If bin/svc_acct.import fails with an "Out of memory!" error using MySQL, upgrede MySQL and recompile the Perl DBD.  There was a memory leak in some older versions of MySQL.
-    <li>If you get tons of errors in your web server's error log like this:
-<pre>
-Ambiguous use of value => resolved to "value" =>
-at /usr/lib/perl5/site_perl/File/CounterFile.pm line 132.
-</pre>
-        This clutters up your log files but is otherwise harmless.  Upgrade to the latest File::CounterFile. 
-    <li>If you get errors like this:
-<pre>
-UID.pm: Can't open /var/spool/freeside/conf/secrets: Permission denied 
-at <i>/your/path</i>/site_perl/FS/UID.pm line 26.
-BEGIN failed--compilation aborted at
-<i>/your/path</i>/edit/process/part_svc.cgi line 15.
-</pre>
-        Then the scripts are not running as the freeside freeside user.  See
-the <a href="install.html">New Installation</a> section of the documentation.
-  <li>If you receive `can not connect to server' errors using MySQL on a system that doesn't support native threading, you may need to specify the full hostname in your DBI datasource.  See the <a href="http://www.mysql.com/Manual_chapter/manual_Problems.html#Can_not_connect_to_server">MySQL documentation</a>, DBI manpage and the DBD::mysql manpage for details.
-  </ul>
-</body>
diff --git a/httemplate/docs/upgrade4.html b/httemplate/docs/upgrade4.html
deleted file mode 100644
index 1d70f8b73..000000000
--- a/httemplate/docs/upgrade4.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<head>
-  <title>Upgrading to 1.2.2</title>
-</head>
-<body>
-<h1>Upgrading to 1.2.2 from 1.2.x</h1>
-<ul>
-  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
-  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
-  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
-  <li>Back up your data and current Freeside installation.
-  <li>Install the Perl modules <a href="http://www.perl.com/CPAN/modules/by-module/Locale/">Locale-Codes</a> and <a href="http://www.perl.com/CPAN/modules/by-module/Net/">Net-Whois</a>.
-  <li>Apply the following changes to your database:
-<pre>
-ALTER TABLE cust_pay_batch CHANGE exp exp VARCHAR(11);
-</pre>
-  <li>Copy or symlink htdocs to the new copy.
-  <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
-  <li>Change to the FS directory in the new tarball, and build and install the
-      Perl modules:
-    <pre>
-$ cd FS/
-$ perl Makefile.PL
-$ make
-$ su
-# make install</pre>
-  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
-</body>
diff --git a/httemplate/docs/upgrade5.html b/httemplate/docs/upgrade5.html
deleted file mode 100644
index 3f3431653..000000000
--- a/httemplate/docs/upgrade5.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<head>
-  <title>Upgrading to 1.3.0</title>
-</head>
-<body>
-<h1>Upgrading to 1.2.3 from 1.2.2</h1>
-<ul>
-  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
-  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
-  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
-  <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
-  <li>Back up your data and current Freeside installation.
-  <li>Apply the following changes to your database:
-<pre>
-ALTER TABLE svc_acct_pop ADD loc CHAR(4);
-CREATE TABLE prepay_credit (
-  prepaynum int NOT NULL,
-  identifier varchar(80) NOT NULL,
-  amount decimal(10,2) NOT NULL,
-  PRIMARY KEY (prepaynum),
-  INDEX (identifier)
-);
-</pre>
-  <li>Copy or symlink htdocs to the new copy.
-  <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
-  <li>Change to the FS directory in the new tarball, and build and install the
-      Perl modules:
-    <pre>
-$ cd FS/
-$ perl Makefile.PL
-$ make
-$ su
-# make install</pre>
-  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
-</body>
diff --git a/httemplate/docs/upgrade6.html b/httemplate/docs/upgrade6.html
deleted file mode 100644
index dc82975f3..000000000
--- a/httemplate/docs/upgrade6.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<head>
-  <title>Upgrading to 1.3.0</title>
-</head>
-<body>
-<h1>Upgrading to 1.3.0 from 1.2.3</h1>
-<ul>
-  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
-  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
-  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
-  <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
-  <li>If migrating from less than 1.2.3, see these <a href="upgrade5.html">instructions</a> first.
-  <li>Back up your data and current Freeside installation.
-  <li>As 1.3.0 requires transactions, <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are no longer supported</b>.  Converting to <a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.  If you really want to use MySQL, convert your tables to one of the <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>.
-  <li>Copy the <i>invoice_template</i> file from the <i>conf/</i> directory in the distribution to your <a href="config.html">configuration directory</a>.
-  <li>Install the <a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>, <a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>, <a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>, <a href="http://search.cpan.org/search?dist=String-ShellQuote">String-ShellQuote</a> and <a href="http://search.cpan.org/search?dist=Net-SCP">Net-SCP</a> Perl modules.
-  <li>Apply the following changes to your database:
-<pre>
-CREATE TABLE domain_record (
-  recnum int NOT NULL,
-  svcnum int NOT NULL,
-  reczone varchar(80) NOT NULL,
-  recaf char(2) NOT NULL,
-  rectype char(5) NOT NULL,
-  recdata varchar(80) NOT NULL,
-  PRIMARY KEY (recnum)
-);
-CREATE TABLE svc_www (
-  svcnum int NOT NULL,
-  recnum int NOT NULL,
-  usersvc int NOT NULL,
-  PRIMARY KEY (svcnum)
-);
-ALTER TABLE part_svc ADD svc_www__recnum varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_www__recnum_flag char(1) NULL;
-ALTER TABLE part_svc ADD svc_www__usersvc varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_www__uesrsvc_flag char(1) NULL;
-ALTER TABLE svc_acct CHANGE _password _password varchar(50) NULL;
-ALTER TABLE svc_acct ADD seconds integer NULL;
-ALTER TABLE part_svc ADD svc_acct__seconds integer NULL;
-ALTER TABLE part_svc ADD svc_acct__seconds_flag char(1) NULL;
-ALTER TABLE prepay_credit ADD seconds integer NULL;
-
-</pre>
-  <li>If your database supports dropping columns:
-<pre>
-ALTER TABLE cust_bill DROP owed;
-ALTER TABLE cust_credit DROP credited;
-</pre>
-     Or, if your database does not support dropping columns, you can do this:
-<pre>
-ALTER TABLE cust_bill CHANGE owed depriciated decimal(10,2);
-ALTER TABLE cust_credit CHANGE credited depriciated2 decimal(10,2);
-</pre>
-
-  <li>Copy or symlink htdocs to the new copy.
-  <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
-  <li>Change to the FS directory in the new tarball, and build and install the
-      Perl modules:
-    <pre>
-$ cd FS/
-$ perl Makefile.PL
-$ make
-$ su
-# make install</pre>
-  <li>Run bin/dbdef-create.
-</body>
diff --git a/httemplate/docs/upgrade7.html b/httemplate/docs/upgrade7.html
deleted file mode 100644
index d9dcfe2ae..000000000
--- a/httemplate/docs/upgrade7.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<head>
-  <title>Upgrading to 1.3.1</title>
-</head>
-<body>
-<h1>Upgrading to 1.3.1 from 1.3.0</h1>
-<ul>
-  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
-  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
-  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
-  <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
-  <li>If migrating from less than 1.2.3, see these <a href="upgrade5.html">instructions</a> first.
-  <li>If migrating from less than 1.3.0, see these <a href="upgrade6.html">instructions</a> first.
-  <li>Back up your data and current Freeside installation.
-  <li>Copy or symlink htdocs to the new copy.
-  <li>Change to the FS directory in the new tarball, and build and install the
-      Perl modules:
-    <pre>
-$ cd FS/
-$ perl Makefile.PL
-$ make
-$ su
-# make install UNINST=1</pre>
-  <li>Run bin/dbdef-create.
-</body>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
deleted file mode 100644
index 0210430ef..000000000
--- a/httemplate/docs/upgrade8.html
+++ /dev/null
@@ -1,392 +0,0 @@
-<head>
-  <title>Upgrading to 1.4.0</title>
-</head>
-<body>
-<h1>Upgrading to 1.4.0 from 1.3.1</h1>
-<ul>
-  <li>If migrating from less than 1.3.1, see these <a href="upgrade7.html">instructions</a> first.
-  <li><font size="+2" color="#ff0000">Backup your database and current Freeside installation.</font> (with&nbsp;<a href="http://www.ca.postgresql.org/devel-corner/docs/postgres/backup.html">PostgreSQL</a>) (with&nbsp;<a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Backup">MySQL</a>)
-  <li><a href="http://perl.apache.org/">mod_perl</a> is now required.
-  <li>Install <a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>, <a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a> and <a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a> (minimum version 0.02).
-  <li>Install <a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a> (use version 1.0x - Freeside is not yet compatible with version 1.1x).
-  <li>Install <a href="http://rsync.samba.org/">rsync</a>
-</ul>
-<table>
-  <tr>
-    <th>Apache::ASP</th><th>Mason</th>
-  </tr>
-  <tr>
-    <td><ul>
-      <li>Run <tt>make aspdocs</tt>
-      <li>Copy <tt>aspdocs/</tt> to your web server's document space.
-      <li>Create a <a href="http://www.apache-asp.org/config.html#Global">Global</a> directory, such as <tt>/usr/local/etc/freeside/asp-global/</tt>
-      <li>Copy <tt>htetc/global.asa</tt> to the Global directory.
-      <li>Configure Apache for the Global directory and to execute .cgi files using Apache::ASP.  For example:
-<font size="-1"><pre>
-&lt;Directory /usr/local/apache/htdocs/freeside-asp&gt;
-&lt;Files ~ (\.cgi)&gt;
-AddHandler perl-script .cgi
-PerlHandler Apache::ASP
-&lt;/Files&gt;
-&lt;Perl&gt;
-$MLDBM::RemoveTaint = 1;
-&lt;/Perl&gt;
-PerlSetVar Global /usr/local/etc/freeside/asp-global/
-&lt;/Directory&gt;
-</pre></font>
-    </ul></td>
-    <td><ul>
-      <li>(use version 1.0x - Freeside is not yet compatible with version 1.1x)
-      <li>Run <tt>make masondocs</tt>
-      <li>Copy <tt>masondocs/</tt> to your web server's document space.
-      <li>Copy <tt>htetc/handler.pl</tt> to your web server's configuration directory.
-      <li>Edit <tt>handler.pl</tt> and set an appropriate <tt>data_dir</tt>, such as <tt>/usr/local/etc/freeside/mason-data</tt>
-      <li>Configure Apache to use the <tt>handler.pl</tt> file and to execute .cgi files using HTML::Mason.  For example:
-<font size="-1"><pre>
-&lt;Directory /usr/local/apache/htdocs/freeside-mason&gt;
-&lt;Files ~ (\.cgi)&gt;
-AddHandler perl-script .cgi
-PerlHandler HTML::Mason
-&lt;/Files&gt;
-&lt;Perl&gt;
-require "/usr/local/apache/conf/handler.pl";
-&lt;/Perl&gt;
-&lt;/Directory&gt;
-</pre></font>
-    </ul></td>
-  </tr>
-</table>
-<ul>
-  <li>Build and install the Perl modules:
-    <pre>
-$ su
-# make install-perl-modules</pre>
-   <li>Apply the following changes to your database:
-<pre>
-CREATE TABLE svc_forward (
-  svcnum int NOT NULL,
-  srcsvc int NOT NULL,
-  dstsvc int NOT NULL,
-  dst varchar(80),
-  PRIMARY KEY (svcnum)
-);
-ALTER TABLE part_svc ADD svc_forward__srcsvc varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_forward__srcsvc_flag char(1) NULL;
-ALTER TABLE part_svc ADD svc_forward__dstsvc varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_forward__dstsvc_flag char(1) NULL;
-ALTER TABLE part_svc ADD svc_forward__dst varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_forward__dst_flag char(1) NULL;
-
-CREATE TABLE cust_credit_bill (
-  creditbillnum int primary key,
-  crednum int not null,
-  invnum int not null,
-  _date int not null,
-  amount decimal(10,2) not null
-);
-
-CREATE TABLE cust_bill_pay (
-  billpaynum int primary key,
-  invnum int not null,
-  paynum int not null,
-  _date int not null,
-  amount decimal(10,2) not null
-);
-
-CREATE TABLE cust_credit_refund (
-  creditrefundnum int primary key,
-  crednum int not null,
-  refundnum int not null,
-  _date int not null,
-  amount decimal(10,2) not null
-);
-
-CREATE TABLE part_svc_column (
-  columnnum int primary key,
-  svcpart int not null,
-  columnname varchar(64) not null,
-  columnvalue varchar(80) null,
-  columnflag char(1) null
-);
-
-CREATE TABLE queue (
-  jobnum int primary key,
-  job text not null,
-  _date int not null,
-  status varchar(80) not null,
-  statustext text null,
-  svcnum int null
-);
-CREATE INDEX queue1 ON queue ( svcnum );
-CREATE INDEX queue2 ON queue ( status );
-
-CREATE TABLE queue_arg (
-  argnum int primary key,
-  jobnum int not null,
-  arg text null
-);
-CREATE INDEX queue_arg1 ON queue_arg ( jobnum );
-
-CREATE TABLE queue_depend (
-  dependnum int primary key,
-  jobnum int not null,
-  depend_jobnum int not null
-);
-CREATE INDEX queue_depend1 ON queue_depend ( jobnum );
-CREATE INDEX queue_depend2 ON queue_depend ( depend_jobnum );
-
-CREATE TABLE part_pop_local (
-  localnum int primary key,
-  popnum int not null,
-  city varchar(80) null,
-  state char(2) null,
-  npa char(3) not null,
-  nxx char(3) not null
-);
-CREATE UNIQUE INDEX part_pop_local1 ON part_pop_local ( npa, nxx );
-
-CREATE TABLE cust_bill_event (
-  eventnum int primary key,
-  invnum int not null,
-  eventpart int not null,
-  _date int not null
-);
-CREATE UNIQUE INDEX cust_bill_event1 ON cust_bill_event ( eventpart, invnum );
-CREATE INDEX cust_bill_event2 ON cust_bill_event ( invnum );
-
-CREATE TABLE part_bill_event (
-  eventpart int primary key,
-  payby char(4) not null,
-  event varchar(80) not null,
-  eventcode text null,
-  seconds int null,
-  weight int not null,
-  plan varchar(80) null,
-  plandata text null,
-  disabled char(1) null
-);
-CREATE INDEX part_bill_event1 ON part_bill_event ( payby );
-
-CREATE TABLE export_svc (
-  exportsvcnum int primary key,
-  exportnum int not null,
-  svcpart int not null
-);
-CREATE UNIQUE INDEX export_svc1 ON export_svc ( exportnum, svcpart );
-CREATE INDEX export_svc2 ON export_svc ( exportnum );
-CREATE INDEX export_svc3 ON export_svc ( svcpart );
-
-CREATE TABLE part_export (
-  exportnum int primary key,
-  machine varchar(80) not null,
-  exporttype varchar(80) not null,
-  nodomain char(1) NULL
-);
-CREATE INDEX part_export1 ON part_export ( machine );
-CREATE INDEX part_export2 ON part_export ( exporttype );
-
-CREATE TABLE part_export_option (
-  optionnum int primary key,
-  exportnum int not null,
-  optionname varchar(80) not null,
-  optionvalue text NULL
-);
-CREATE INDEX part_export_option1 ON part_export_option ( exportnum );
-CREATE INDEX part_export_option2 ON part_export_option ( optionname );
-
-CREATE TABLE radius_usergroup (
-  usergroupnum int primary key,
-  svcnum int not null,
-  groupname varchar(80) not null
-);
-CREATE INDEX radius_usergroup1 ON radius_usergroup ( svcnum );
-CREATE INDEX radius_usergroup2 ON radius_usergroup ( groupname );
-
-CREATE TABLE msgcat (
-  msgnum int primary key,
-  msgcode varchar(80) not null,
-  locale varchar(16) not null,
-  msg text not null
-);
-CREATE INDEX msgcat1 ON msgcat ( msgcode, locale );
-
-CREATE TABLE cust_tax_exempt (
-  exemptnum int primary key,
-  custnum int not null,
-  taxnum int not null,
-  year int not null,
-  month int not null,
-  amount decimal(10,2)
-);
-CREATE UNIQUE INDEX cust_tax_exempt1 ON cust_tax_exempt ( taxnum, year, month );
-
-ALTER TABLE svc_acct ADD domsvc integer NULL;
-ALTER TABLE part_svc ADD svc_acct__domsvc varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_acct__domsvc_flag char(1) NULL;
-ALTER TABLE svc_domain ADD catchall integer NULL;
-ALTER TABLE cust_main ADD referral_custnum integer NULL;
-ALTER TABLE cust_main ADD comments text NULL;
-ALTER TABLE cust_pay ADD custnum integer;
-ALTER TABLE cust_pay_batch ADD paybatchnum integer;
-ALTER TABLE cust_refund ADD custnum integer;
-ALTER TABLE cust_pkg ADD manual_flag char(1) NULL;
-ALTER TABLE part_pkg ADD plan varchar(80) NULL;
-ALTER TABLE part_pkg ADD plandata text NULL;
-ALTER TABLE part_pkg ADD setuptax char(1) NULL;
-ALTER TABLE part_pkg ADD recurtax char(1) NULL;
-ALTER TABLE part_pkg ADD disabled char(1) NULL;
-ALTER TABLE part_svc ADD disabled char(1) NULL;
-ALTER TABLE cust_bill ADD closed char(1) NULL;
-ALTER TABLE cust_pay ADD closed char(1) NULL;
-ALTER TABLE cust_credit ADD closed char(1) NULL;
-ALTER TABLE cust_refund ADD closed char(1) NULL;
-ALTER TABLE cust_bill_event ADD status varchar(80);
-ALTER TABLE cust_bill_event ADD statustext text NULL;
-ALTER TABLE svc_acct ADD sec_phrase varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_acct__sec_phrase varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_acct__sec_phrase_flag char(1) NULL;
-ALTER TABLE part_pkg ADD taxclass varchar(80) NULL;
-ALTER TABLE cust_main_county ADD taxclass varchar(80) NULL;
-ALTER TABLE cust_main_county ADD exempt_amount decimal(10,2);
-CREATE INDEX cust_main3 ON cust_main ( referral_custnum );
-CREATE INDEX cust_credit_bill1 ON cust_credit_bill ( crednum );
-CREATE INDEX cust_credit_bill2 ON cust_credit_bill ( invnum );
-CREATE INDEX cust_bill_pay1 ON cust_bill_pay ( invnum );
-CREATE INDEX cust_bill_pay2 ON cust_bill_pay ( paynum );
-CREATE INDEX cust_credit_refund1 ON cust_credit_refund ( crednum );
-CREATE INDEX cust_credit_refund2 ON cust_credit_refund ( refundnum );
-CREATE UNIQUE INDEX cust_pay_batch_pkey ON cust_pay_batch ( paybatchnum );
-CREATE UNIQUE INDEX part_svc_column1 ON part_svc_column ( svcpart, columnname );
-CREATE INDEX cust_pay2 ON cust_pay ( paynum );
-CREATE INDEX cust_pay3 ON cust_pay ( custnum );
-CREATE INDEX cust_pay4 ON cust_pay ( paybatch );
-</pre>
-
-  <li>If you are using PostgreSQL, apply the following changes to your database:
-<pre>
-CREATE UNIQUE INDEX agent_pkey ON agent ( agentnum );
-CREATE UNIQUE INDEX agent_type_pkey ON agent_type ( typenum );
-CREATE UNIQUE INDEX cust_bill_pkey ON cust_bill ( invnum );
-CREATE UNIQUE INDEX cust_credit_pkey ON cust_credit ( crednum );
-CREATE UNIQUE INDEX cust_main_pkey ON cust_main ( custnum );
-CREATE UNIQUE INDEX cust_main_county_pkey ON cust_main_county ( taxnum );
-CREATE UNIQUE INDEX cust_main_invoice_pkey ON cust_main_invoice ( destnum );
-CREATE UNIQUE INDEX cust_pay_pkey ON cust_pay ( paynum );
-CREATE UNIQUE INDEX cust_pkg_pkey ON cust_pkg ( pkgnum );
-CREATE UNIQUE INDEX cust_refund_pkey ON cust_refund ( refundnum );
-CREATE UNIQUE INDEX cust_svc_pkey ON cust_svc ( svcnum );
-CREATE UNIQUE INDEX domain_record_pkey ON domain_record ( recnum );
-CREATE UNIQUE INDEX nas_pkey ON nas ( nasnum );
-CREATE UNIQUE INDEX part_pkg_pkey ON part_pkg ( pkgpart );
-CREATE UNIQUE INDEX part_referral_pkey ON part_referral ( refnum );
-CREATE UNIQUE INDEX part_svc_pkey ON part_svc ( svcpart );
-CREATE UNIQUE INDEX port_pkey ON port ( portnum );
-CREATE UNIQUE INDEX prepay_credit_pkey ON prepay_credit ( prepaynum );
-CREATE UNIQUE INDEX session_pkey ON session ( sessionnum );
-CREATE UNIQUE INDEX svc_acct_pkey ON svc_acct ( svcnum );
-CREATE UNIQUE INDEX svc_acct_pop_pkey ON svc_acct_pop ( popnum );
-CREATE UNIQUE INDEX svc_acct_sm_pkey ON svc_acct_sm ( svcnum );
-CREATE UNIQUE INDEX svc_domain_pkey ON svc_domain ( svcnum );
-CREATE UNIQUE INDEX svc_www_pkey ON svc_www ( svcnum );
-</pre>
-  <li>If you wish to enable service/shipping addresses, apply the following
-      changes to your database:
-<pre>
-ALTER TABLE cust_main ADD COLUMN ship_last varchar(80) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_first varchar(80) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_company varchar(80) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_address1 varchar(80) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_address2 varchar(80) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_city varchar(80) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_county varchar(80) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_state varchar(80) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_zip varchar(10) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_country char(2) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_daytime varchar(20) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_night varchar(20) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_fax varchar(12) NULL;
-CREATE INDEX cust_main4 ON cust_main ( ship_last );
-CREATE INDEX cust_main5 ON cust_main ( ship_company );
-</pre>
-  <li>If you are using the signup server, reinstall it according to the <a href="signup.html">instructions</a>.  The 1.3.x signup server is not compatible with 1.4.x.
-  <li>Run <tt>bin/dbdef-create <i>username</i></tt>
-  <li>If you have svc_acct_sm records or service definitions:
-    <ul>
-      <li>Create a service definition with table svc_forward
-      <li>Run <tt>bin/fs-migrate-svc_acct_sm <i>username</i></tt>
-    </ul>
-  <li>Or if you just have svc_acct records:
-    <ul>
-      <li>Order and provision a package for your default domain and note down the <b>Service #</b> or <i>svcnum</i>.
-      <li><tt>UPDATE svc_acct SET domsvc = </tt><i>svcnum</i>
-      <li>Update your service definitions to have default (or fixed) <b>domsvc</b>.
-    </ul>
-  <li>Run <tt>bin/fs-migrate-payref<i>username</i></tt>
-  <li>Run <tt>bin/fs-migrate-part_svc<i>username</i></tt>
-  <li><b>After running bin/fs-migrate-payref</b>, apply the following changes to your database:
-  <table border><tr><th>PostgreSQL</th><th>MySQL, others</th></tr>
-<tr><td>
-<font size=-1><pre>
-CREATE TABLE cust_pay_temp (
-  paynum int primary key,
-  custnum int not null,
-  paid decimal(10,2) not null,
-  _date int null,
-  payby char(4) not null,
-  payinfo varchar(16) null,
-  paybatch varchar(80) null,
-  closed char(1) null
-);
-INSERT INTO cust_pay_temp SELECT paynum, custnum, paid, _date, payby, payinfo, paybatch, closed FROM cust_pay;
-DROP TABLE cust_pay;
-ALTER TABLE cust_pay_temp RENAME TO cust_pay;
-CREATE UNIQUE INDEX cust_pay1 ON cust_pay (paynum);
-CREATE TABLE cust_refund_temp (
-  refundnum int primary key,
-  custnum int not null,
-  _date int null,
-  refund decimal(10,2) not null,
-  otaker varchar(8) not null,
-  reason varchar(80) not null,
-  payby char(4) not null,
-  payinfo varchar(16) null,
-  paybatch varchar(80) null,
-  closed char(1) null
-);
-INSERT INTO cust_refund_temp SELECT refundnum, custnum, _date, refund, otaker, reason, payby, payinfo, '', closed from cust_refund;
-DROP TABLE cust_refund;
-ALTER TABLE cust_refund_temp RENAME TO cust_refund;
-CREATE UNIQUE INDEX cust_refund1 ON cust_refund (refundnum);
-</pre></font>
-</td><td>
-<font size=-1><pre>
-ALTER TABLE cust_pay DROP COLUMN invnum;
-ALTER TABLE cust_refund DROP COLUMN crednum;
-</pre></font>
-</td></tr></table>
-  <li><b>IMPORTANT: After applying the second set of database changes</b>, run <tt>bin/dbdef-create <i>username</i></tt> again.
-  <li><b>IMPORTANT</b>: run <tt>bin/create-history-tables <i>username</i></tt>
-  <li><b>IMPORTANT: After running bin/create-history-tables</b>, run <tt>bin/dbdef-create <i>username</i></tt> again.
-  <li>As the freeside UNIX user, run <tt>bin/populate-msgcat <i>username</i></tt
-> to populate the message catalog
-  <li>set the <a href="../config/config.cgi#username_policy">user_policy configuration value</a> as appropriate for your site.
-  <li>set the <a href="../config/config.cgi#locale">locale configuration value</a> to en_US.
-  <li>the mxmachines, nsmachines, arecords and cnamerecords configuration values have been deprecated.  Set the <a href="../config/config.cgi#defaultrecords">defaultrecords configuration value</a> instead.
-  <li>Create the `/usr/local/etc/freeside/cache.<i>datasrc</i>' directory
-      (owned by the freeside user).
-  <li>freeside-queued was installed with the Perl modules.  Start it now and ensure that is run upon system startup.
-  <li>Set appropriate <a href="../browse/part_bill_event.cgi">invoice events</a> for your site.  At the very least, you'll want to set some invoice events "<i>After 0 days</i>": a <i>BILL</i> invoice event to print invoices, a <i>CARD</i> invoice event to batch or run cards real-time, and a <i>COMP</i> invoice event to "pay" complimentary customers.  If you were using the <i>-i</i> option to <a href="man/bin/freeside-bill.html">freeside-bill</a> it should be removed.
-  <li>Use <a href="man/bin/freeside-daily.html">freeside-daily</a> instead of <a href="man/bin/freeside-bill.html">freeside-bill</a>.
-  <li>If you would like Freeside to notify your customers when their credit
-  cards and other billing arrangements are about to expire, arrange for
-  <b>freeside-expiration-alerter</b> to be run daily by cron or similar
-  facility.  The message it sends can be configured from the
-  <u>Configuration</u> choice of the main menu as <u>alerter_template</u>.
-  <li>Export has been rewritten.  If you were using the icradiusmachines,
-  icradius_mysqldest, icradius_mysqlsource, or icradius_secrets files, add
-  an appropriate "sqlradius" export to all relevant Service Definitions
-  instead.  Use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or
-  point the "sqlradius" export directly at your external ICRADIUS or FreeRADIUS
-  database (or through an SSL-necrypting proxy...)
-</ul>
-</body>
diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
deleted file mode 100755
index 0d2f1c238..000000000
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ /dev/null
@@ -1,89 +0,0 @@
-<!-- mason kludge -->
-<%
-# <!-- $Id: REAL_cust_pkg.cgi,v 1.4 2002-07-08 13:07:40 ivan Exp $ -->
-
-my $error ='';
-my $pkgnum = '';
-if ( $cgi->param('error') ) {
-  $error = $cgi->param('error');
-  $pkgnum = $cgi->param('pkgnum');
-} else {
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/ or die "no pkgnum";
-  $pkgnum = $1;
-}
-
-#get package record
-my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-die "No package!" unless $cust_pkg;
-my $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
-
-if ( $error ) {
-  #$cust_pkg->$_(str2time($cgi->param($_)) foreach qw(setup bill);
-  $cust_pkg->setup(str2time($cgi->param('setup')));
-  $cust_pkg->bill(str2time($cgi->param('bill')));
-}
-
-#my $custnum = $cust_pkg->getfield('custnum');
-print header('Package Edit'); #, menubar(
-#  "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum",
-#  'Main Menu' => popurl(2)
-#));
-
-#print info
-my($susp,$cancel,$expire)=(
-  $cust_pkg->getfield('susp'),
-  $cust_pkg->getfield('cancel'),
-  $cust_pkg->getfield('expire'),
-);
-my($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment'));
-my($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
-my $otaker = $cust_pkg->getfield('otaker');
-
-print '<FORM NAME="formname" ACTION="process/REAL_cust_pkg.cgi" METHOD="POST">',      qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT>!
-  if $error;
-
-print ntable("#cccccc",2),
-      '<TR><TD ALIGN="right">Package number</TD><TD BGCOLOR="#ffffff">',
-      $pkgnum, '</TD></TR>',
-      '<TR><TD ALIGN="right">Package</TD><TD BGCOLOR="#ffffff">',
-      $pkg,  '</TD></TR>',
-      '<TR><TD ALIGN="right">Comment</TD><TD BGCOLOR="#ffffff">',
-      $comment,  '</TD></TR>',
-      '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
-      $otaker,  '</TD></TR>',
-      '<TR><TD ALIGN="right">Setup date</TD><TD>'.
-      '<INPUT TYPE="text" NAME="setup" SIZE=32 VALUE="',
-      ( $setup ? time2str("%c %z (%Z)",$setup) : "" ), '"></TD></TR>',
-      '<TR><TD ALIGN="right">Next bill date</TD><TD>',
-      '<INPUT TYPE="text" NAME="bill" SIZE=32 VALUE="',
-      ( $bill ? time2str("%c %z (%Z)",$bill) : "" ), '"></TD></TR>',
-;
-
-print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
-       time2str("%D",$susp), '</TD></TR>'
-  if $susp;
-
-#print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
-#       time2str("%D",$expire), '</TD></TR>'
-#  if $expire;
-print '<TR><TD ALIGN="right">Expiration date'.
-      '</TD><TD>',
-      '<INPUT TYPE="text" NAME="expire" SIZE=32 VALUE="',
-      ( $expire ? time2str("%c %z (%Z)",$expire) : "" ), '">'.
-      '<BR><FONT SIZE=-1>(will <b>cancel</b> this package'.
-      ' when the date is reached)</FONT>'.
-      '</TD></TR>';
-
-print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
-       time2str("%D",$cancel), '</TD></TR>'
-  if $cancel;
-
-%>
-</TABLE>
-<BR><INPUT TYPE="submit" VALUE="Apply Changes">
-</FORM>
-</BODY>
-</HTML>
diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
deleted file mode 100755
index 449456cdd..000000000
--- a/httemplate/edit/agent.cgi
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $agent;
-if ( $cgi->param('error') ) {
-  $agent = new FS::agent ( {
-    map { $_, scalar($cgi->param($_)) } fields('agent')
-  } );
-} elsif ( $cgi->keywords ) {
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $agent = qsearchs( 'agent', { 'agentnum' => $1 } );
-} else { #adding
-  $agent = new FS::agent {};
-}
-my $action = $agent->agentnum ? 'Edit' : 'Add';
-my $hashref = $agent->hashref;
-
-print header("$action Agent", menubar(
-  'Main Menu' => $p,
-  'View all agents' => $p. 'browse/agent.cgi',
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print '<FORM ACTION="', popurl(1), 'process/agent.cgi" METHOD=POST>',
-      qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$hashref->{agentnum}">!,
-      "Agent #", $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)";
-
-print &ntable("#cccccc", 2, ''), <<END;
-<TR>
-  <TH ALIGN="right">Agent</TH>
-  <TD><INPUT TYPE="text" NAME="agent" SIZE=32 VALUE="$hashref->{agent}"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right">Agent type</TH>
-  <TD><SELECT NAME="typenum" SIZE=1>
-END
-
-foreach my $agent_type (qsearch('agent_type',{})) {
-  print "<OPTION VALUE=". $agent_type->typenum;
-  print " SELECTED"
-    if $hashref->{typenum} && ( $hashref->{typenum} == $agent_type->typenum );
-  print ">", $agent_type->getfield('typenum'), ": ",
-        $agent_type->getfield('atype'),"\n";
-}
-
-print <<END;
-</SELECT></TD>
-</TR>
-<TR>
-  <TD ALIGN="right"><!--Frequency--></TD>
-  <TD><INPUT TYPE="hidden" NAME="freq" VALUE="$hashref->{freq}"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right"><!--Program--></TD>
-  <TD><INPUT TYPE="hidden" NAME="prog" VALUE="$hashref->{prog}"></TD>
-</TR>
-</TABLE>
-END
-
-print qq!<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{agentnum} ? "Apply changes" : "Add agent",
-      qq!">!;
-
-print <<END;
-    </FORM>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
deleted file mode 100755
index 637c710ab..000000000
--- a/httemplate/edit/agent_type.cgi
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my($agent_type);
-if ( $cgi->param('error') ) {
-  $agent_type = new FS::agent_type ( {
-    map { $_, scalar($cgi->param($_)) } fields('agent')
-  } );
-} elsif ( $cgi->keywords ) { #editing
-  my( $query ) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $agent_type=qsearchs('agent_type',{'typenum'=>$1});
-} else { #adding
-  $agent_type = new FS::agent_type {};
-}
-my $action = $agent_type->typenum ? 'Edit' : 'Add';
-my $hashref = $agent_type->hashref;
-
-print header("$action Agent Type", menubar(
-  'Main Menu' => "$p",
-  'View all agent types' => "${p}browse/agent_type.cgi",
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print '<FORM ACTION="', popurl(1), 'process/agent_type.cgi" METHOD=POST>',
-      qq!<INPUT TYPE="hidden" NAME="typenum" VALUE="$hashref->{typenum}">!,
-      "Agent Type #", $hashref->{typenum} ? $hashref->{typenum} : "(NEW)";
-
-print <<END;
-<BR><BR>Agent Type <INPUT TYPE="text" NAME="atype" SIZE=32 VALUE="$hashref->{atype}">
-<BR><BR>Select which packages agents of this type may sell to customers<BR>
-END
-
-foreach my $part_pkg ( qsearch('part_pkg',{ 'disabled' => '' }) ) {
-  print qq!<BR><INPUT TYPE="checkbox" NAME="pkgpart!,
-        $part_pkg->getfield('pkgpart'), qq!" !,
-       # ( 'CHECKED 'x scalar(
-        qsearchs('type_pkgs',{
-          'typenum' => $agent_type->getfield('typenum'),
-          'pkgpart'  => $part_pkg->getfield('pkgpart'),
-        })
-          ? 'CHECKED '
-          : '',
-        qq!VALUE="ON"> !,
-    qq!<A HREF="${p}edit/part_pkg.cgi?!, $part_pkg->pkgpart, 
-    '">', $part_pkg->pkgpart. ": ". $part_pkg->getfield('pkg'), '</A>',
-  ;
-}
-
-print qq!<BR><BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{typenum} ? "Apply changes" : "Add agent type",
-      qq!">!;
-
-print <<END;
-    </FORM>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
deleted file mode 100755
index 8cdf4509a..000000000
--- a/httemplate/edit/cust_bill_pay.cgi
+++ /dev/null
@@ -1,95 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my($paynum, $amount, $invnum);
-if ( $cgi->param('error') ) {
-  $paynum = $cgi->param('paynum');
-  $amount = $cgi->param('amount');
-  $invnum = $cgi->param('invnum');
-} else {
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $paynum = $1;
-  $amount = '';
-  $invnum = '';
-}
-
-my $otaker = getotaker;
-
-my $p1 = popurl(1);
-
-print header("Apply Payment", '');
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT><BR><BR>"
-  if $cgi->param('error');
-print <<END;
-    <FORM ACTION="${p1}process/cust_bill_pay.cgi" METHOD=POST>
-END
-
-my $cust_pay = qsearchs('cust_pay', { 'paynum' => $paynum } );
-die "payment $paynum not found!" unless $cust_pay;
-
-my $unapplied = $cust_pay->unapplied;
-
-print "Payment # <B>$paynum</B>".
-      qq!<INPUT TYPE="hidden" NAME="paynum" VALUE="$paynum">!.
-      '<BR>Date: <B>'. time2str("%D", $cust_pay->_date). '</B>'.
-      '<BR>Amount: $<B>'. $cust_pay->paid. '</B>'.
-      "<BR>Unapplied amount: \$<B>$unapplied</B>"
-      ;
-
-my @cust_bill = grep $_->owed != 0,
-                qsearch('cust_bill', { 'custnum' => $cust_pay->custnum } );
-
-print <<END;
-<SCRIPT>
-function changed(what) {
-  cust_bill = what.options[what.selectedIndex].value;
-END
-
-foreach my $cust_bill ( @cust_bill ) {
-  my $invnum = $cust_bill->invnum;
-  my $changeto = $cust_bill->owed < $unapplied
-                   ? $cust_bill->owed 
-                   : $unapplied;
-  print <<END;
-  if ( cust_bill == $invnum ) {
-    what.form.amount.value = "$changeto";
-  }
-END
-}
-
-#  if ( cust_bill == "Refund" ) {
-#    what.form.amount.value = "$credited";
-#  }
-print <<END;
-}
-</SCRIPT>
-END
-
-print qq!<BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)">!,
-      '<OPTION VALUE="">';
-foreach my $cust_bill ( @cust_bill ) {
-  print '<OPTION'. ( $cust_bill->invnum eq $invnum ? ' SELECTED' : '' ).
-        ' VALUE="'. $cust_bill->invnum. '">'. $cust_bill->invnum.
-        ' -  '. time2str("%D",$cust_bill->_date).
-        ' - $'. $cust_bill->owed;
-}
-#print qq!<OPTION VALUE="Refund">Refund!;
-print "</SELECT>";
-
-print qq!<BR>Amount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
-
-print <<END;
-<BR>
-<INPUT TYPE="submit" VALUE="Apply">
-END
-
-print <<END;
-
-    </FORM>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
deleted file mode 100755
index aae0df2fc..000000000
--- a/httemplate/edit/cust_credit.cgi
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $conf = new FS::Conf;
-my($custnum, $amount, $reason);
-if ( $cgi->param('error') ) {
-  #$cust_credit = new FS::cust_credit ( {
-  #  map { $_, scalar($cgi->param($_)) } fields('cust_credit')
-  #} );
-  $custnum = $cgi->param('custnum');
-  $amount = $cgi->param('amount');
-  #$refund = $cgi->param('refund');
-  $reason = $cgi->param('reason');
-} else {
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $custnum = $1;
-  $amount = '';
-  #$refund = 'yes';
-  $reason = '';
-}
-my $_date = time;
-
-my $otaker = getotaker;
-
-my $p1 = popurl(1);
-
-print header("Post Credit", '');
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-print <<END, small_custview($custnum, $conf->config('countrydefault'));
-    <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>
-    <INPUT TYPE="hidden" NAME="crednum" VALUE="">
-    <INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">
-    <INPUT TYPE="hidden" NAME="paybatch" VALUE="">
-    <INPUT TYPE="hidden" NAME="_date" VALUE="$_date">
-    <INPUT TYPE="hidden" NAME="credited" VALUE="">
-    <INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">
-END
-
-print '<BR><BR>Credit'. ntable("#cccccc", 2).
-      '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
-      time2str("%D",$_date).  '</TD></TR>';
-
-print qq!<TR><TD ALIGN="right">Amount</TD><TD BGCOLOR="#ffffff">\$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8></TD></TR>!;
-
-#print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
-
-print qq!<TR><TD ALIGN="right">Reason</TD><TD BGCOLOR="#ffffff"><INPUT TYPE="text" NAME="reason" VALUE="$reason"></TD></TR>!;
-
-print qq!<TR><TD ALIGN="right">Auto-apply<BR>to invoices</TD><TD><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD>!;
-
-print <<END;
-</TABLE>
-<BR>
-<INPUT TYPE="submit" VALUE="Post credit">
-    </FORM>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
deleted file mode 100755
index 1a97e1312..000000000
--- a/httemplate/edit/cust_credit_bill.cgi
+++ /dev/null
@@ -1,101 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my($crednum, $amount, $invnum);
-if ( $cgi->param('error') ) {
-  #$cust_credit_bill = new FS::cust_credit_bill ( {
-  #  map { $_, scalar($cgi->param($_)) } fields('cust_credit_bill')
-  #} );
-  $crednum = $cgi->param('crednum');
-  $amount = $cgi->param('amount');
-  #$refund = $cgi->param('refund');
-  $invnum = $cgi->param('invnum');
-} else {
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $crednum = $1;
-  $amount = '';
-  #$refund = 'yes';
-  $invnum = '';
-}
-
-my $otaker = getotaker;
-
-my $p1 = popurl(1);
-
-print header("Apply Credit", '');
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT><BR><BR>"
-  if $cgi->param('error');
-print <<END;
-    <FORM ACTION="${p1}process/cust_credit_bill.cgi" METHOD=POST>
-END
-
-my $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } );
-die "credit $crednum not found!" unless $cust_credit;
-
-my $credited = $cust_credit->credited;
-
-print "Credit # <B>$crednum</B>".
-      qq!<INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!.
-      '<BR>Date: <B>'. time2str("%D", $cust_credit->_date). '</B>'.
-      '<BR>Amount: $<B>'. $cust_credit->amount. '</B>'.
-      "<BR>Unapplied amount: \$<B>$credited</B>".
-      '<BR>Reason: <B>'. $cust_credit->reason. '</B>'
-      ;
-
-my @cust_bill = grep $_->owed != 0,
-                qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } );
-
-print <<END;
-<SCRIPT>
-function changed(what) {
-  cust_bill = what.options[what.selectedIndex].value;
-END
-
-foreach my $cust_bill ( @cust_bill ) {
-  my $invnum = $cust_bill->invnum;
-  my $changeto = $cust_bill->owed < $cust_credit->credited
-                   ? $cust_bill->owed 
-                   : $cust_credit->credited;
-  print <<END;
-  if ( cust_bill == $invnum ) {
-    what.form.amount.value = "$changeto";
-  }
-END
-}
-
-print <<END;
-  if ( cust_bill == "Refund" ) {
-    what.form.amount.value = "$credited";
-  }
-}
-</SCRIPT>
-END
-
-print qq!<BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)">!,
-      '<OPTION VALUE="">';
-foreach my $cust_bill ( @cust_bill ) {
-  print '<OPTION'. ( $cust_bill->invnum eq $invnum ? ' SELECTED' : '' ).
-        ' VALUE="'. $cust_bill->invnum. '">'. $cust_bill->invnum.
-        ' -  '. time2str("%D",$cust_bill->_date).
-        ' - $'. $cust_bill->owed;
-}
-print qq!<OPTION VALUE="Refund">Refund!;
-print "</SELECT>";
-
-print qq!<BR>Amount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
-
-print <<END;
-<BR>
-<INPUT TYPE="submit" VALUE="Apply">
-END
-
-print <<END;
-
-    </FORM>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
deleted file mode 100755
index cf8de2f13..000000000
--- a/httemplate/edit/cust_main.cgi
+++ /dev/null
@@ -1,460 +0,0 @@
-<!-- mason kludge -->
-<%
-
-  #for misplaced logic below
-  #use FS::part_pkg;
-
-  #for false laziness below (now more properly lazy)
-  #use FS::svc_acct_pop;
-
-  #for (other) false laziness below
-  #use FS::agent;
-  #use FS::type_pkgs;
-
-my $conf = new FS::Conf;
-
-#get record
-
-my $error = '';
-my($custnum, $username, $password, $popnum, $cust_main, $saved_pkgpart);
-if ( $cgi->param('error') ) {
-  $error = $cgi->param('error');
-  $cust_main = new FS::cust_main ( {
-    map { $_, scalar($cgi->param($_)) } fields('cust_main')
-  } );
-  $custnum = $cust_main->custnum;
-  $saved_pkgpart = $cgi->param('pkgpart_svcpart') || '';
-  if ( $saved_pkgpart =~ /^(\d+)_/ ) {
-    $saved_pkgpart = $1;
-  } else {
-    $saved_pkgpart = '';
-  }
-  $username = $cgi->param('username');
-  $password = $cgi->param('_password');
-  $popnum = $cgi->param('popnum');
-} elsif ( $cgi->keywords ) { #editing
-  my( $query ) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $custnum=$1;
-  $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
-  $saved_pkgpart = 0;
-  $username = '';
-  $password = '';
-  $popnum = 0;
-} else {
-  $custnum='';
-  $cust_main = new FS::cust_main ( {} );
-  $cust_main->otaker( &getotaker );
-  $cust_main->referral_custnum( $cgi->param('referral_custnum') );
-  $saved_pkgpart = 0;
-  $username = '';
-  $password = '';
-  $popnum = 0;
-}
-$cgi->delete_all();
-my $action = $custnum ? 'Edit' : 'Add';
-
-# top
-
-my $p1 = popurl(1);
-print header("Customer $action", '');
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $error, "</FONT>"
-  if $error;
-
-print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST NAME="form1">!,
-      qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!,
-      qq!Customer # !, ( $custnum ? "<B>$custnum</B>" : " (NEW)" ),
-      
-;
-
-# agent
-
-my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
-
-my @agents = qsearch( 'agent', {} );
-#die "No agents created!" unless @agents;
-die "You have not created any agents.  You must create at least one agent before adding a customer.  Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents;
-my $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
-if ( scalar(@agents) == 1 ) {
-  print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!;
-} else {
-  print qq!<BR><BR>${r}Agent <SELECT NAME="agentnum" SIZE="1">!;
-  my $agent;
-  foreach $agent (sort {
-    $a->agent cmp $b->agent;
-  } @agents) {
-      print '<OPTION VALUE="', $agent->agentnum, '"',
-      " SELECTED"x($agent->agentnum==$agentnum),
-      ">". $agent->agent;
-      #">", $agent->agentnum,": ", $agent->agent;
-  }
-  print "</SELECT>";
-}
-
-#referral
-
-my $refnum = $cust_main->refnum || $conf->config('referraldefault') || 0;
-if ( $custnum && ! $conf->exists('editreferrals') ) {
-  print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
-} else {
-  my(@referrals) = qsearch('part_referral',{});
-  if ( scalar(@referrals) == 0 ) {
-    die "You have not created any advertising sources.  You must create at least one advertising source before adding a customer.  Go to ". popurl(2). "browse/part_referral.cgi and create one or more advertising sources.";
-  } elsif ( scalar(@referrals) == 1 ) {
-    $refnum ||= $referrals[0]->refnum;
-    print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
-  } else {
-    print qq!<BR><BR>${r}Advertising source <SELECT NAME="refnum" SIZE="1">!;
-    print "<OPTION> " unless $refnum;
-    my($referral);
-    foreach $referral (sort {
-      $a->refnum <=> $b->refnum;
-    } @referrals) {
-      print "<OPTION" . " SELECTED"x($referral->refnum==$refnum),
-      ">", $referral->refnum, ": ", $referral->referral;
-    }
-    print "</SELECT>";
-  }
-}
-
-#referring customer
-
-#print qq!<BR><BR>Referring Customer: !;
-if ( $cust_main->referral_custnum ) {
-  my $referring_cust_main =
-    qsearchs('cust_main', { custnum => $cust_main->referral_custnum } );
-  print '<BR><BR>Referring Customer: <A HREF="'. popurl(1). '/cust_main.cgi?'.
-        $cust_main->referral_custnum. '">'.
-        $cust_main->referral_custnum. ': '.
-        ( $referring_cust_main->company
-          || $referring_cust_main->last. ', '. $referring_cust_main->first ).
-        '</A><INPUT TYPE="hidden" NAME="referral_custnum" VALUE="'.
-        $cust_main->referral_custnum. '">';
-} elsif ( ! $conf->exists('disable_customer_referrals') ) {
-  print '<BR><BR>Referring customer number: <INPUT TYPE="text" NAME="referral_custnum" VALUE="">';
-} else {
-  print '<INPUT TYPE="hidden" NAME="referral_custnum" VALUE="">';
-}
-
-# contact info
-
-my($last,$first,$ss,$company,$address1,$address2,$city,$zip)=(
-  $cust_main->last,
-  $cust_main->first,
-  $cust_main->ss,
-  $cust_main->company,
-  $cust_main->address1,
-  $cust_main->address2,
-  $cust_main->city,
-  $cust_main->zip,
-);
-
-print "<BR><BR>Billing address", &itable("#cccccc"), <<END;
-<TR><TH ALIGN="right">${r}Contact&nbsp;name<BR>(last,&nbsp;first)</TH><TD COLSPAN=3>
-END
-
-print <<END;
-<INPUT TYPE="text" NAME="last" VALUE="$last"> , 
-<INPUT TYPE="text" NAME="first" VALUE="$first">
-</TD>
-END
-
-if ( $conf->exists('show_ss') ) {
-  print qq!<TD ALIGN="right">SS#</TD><TD><INPUT TYPE="text" NAME="ss" VALUE="$ss" SIZE=11></TD>!;
-} else {
-  print qq!<TD><INPUT TYPE="hidden" NAME="ss" VALUE="$ss"></TD>!;
-}
-
-print <<END;
-</TR>
-<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="company" VALUE="$company" SIZE=70></TD></TR>
-<TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=70></TD></TR>
-<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=70></TD></TR>
-<TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD><TH ALIGN="right">${r}State</TH><TD>
-END
-
-#false laziness with ship state
-my $countrydefault = $conf->config('countrydefault') || 'US';
-$cust_main->country( $countrydefault ) unless $cust_main->country;
-
-$cust_main->state( $conf->config('statedefault') || 'CA' )
-  unless $cust_main->state || $cust_main->country ne 'US';
-
-my($county_html, $state_html, $country_html) =
-  FS::cust_main_county::regionselector( $cust_main->county,
-                                        $cust_main->state,
-                                        $cust_main->country );
-
-print "$county_html $state_html";
-
-print qq!</TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10></TD></TR>!;
-
-my($daytime,$night,$fax)=(
-  $cust_main->daytime,
-  $cust_main->night,
-  $cust_main->fax,
-);
-
-print <<END;
-<TR><TH ALIGN="right">${r}Country</TH><TD>$country_html</TD></TR>
-<TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18></TD></TR>
-<TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18></TD></TR>
-<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12></TD></TR>
-END
-
-print "</TABLE>${r}required fields<BR>";
-
-# service address
-
-if ( defined $cust_main->dbdef_table->column('ship_last') ) {
-
-  print "\n", <<END;
-  <SCRIPT>
-  function changed(what) {
-    what.form.same.checked = false;
-  }
-  function samechanged(what) {
-    if ( what.checked ) {
-END
-print "      what.form.ship_$_.value = what.form.$_.value;\n"
-  for (qw( last first company address1 address2 city zip daytime night fax ));
-print <<END;
-      what.form.ship_country.selectedIndex = what.form.country.selectedIndex;
-      ship_country_changed(what.form.ship_country);
-      what.form.ship_state.selectedIndex = what.form.state.selectedIndex;
-      ship_state_changed(what.form.ship_state);
-      what.form.ship_county.selectedIndex = what.form.county.selectedIndex;
-    }
-  }
-  </SCRIPT>
-END
-
-  print '<BR>Service address ',
-        '(<INPUT TYPE="checkbox" NAME="same" VALUE="Y" onClick="samechanged(this)"';
-  unless ( $cust_main->ship_last ) {
-    print ' CHECKED';
-    foreach (
-      qw( last first company address1 address2 city county state zip country
-          daytime night fax )
-    ) {
-      $cust_main->set("ship_$_", $cust_main->get($_) );
-    }
-  }
-  print '>same as billing address)<BR>';
-
-  my($ship_last,$ship_first,$ship_company,$ship_address1,$ship_address2,$ship_city,$ship_zip)=(
-    $cust_main->ship_last,
-    $cust_main->ship_first,
-    $cust_main->ship_company,
-    $cust_main->ship_address1,
-    $cust_main->ship_address2,
-    $cust_main->ship_city,
-    $cust_main->ship_zip,
-  );
-
-  print &itable("#cccccc"), <<END;
-  <TR><TH ALIGN="right">${r}Contact&nbsp;name<BR>(last,&nbsp;first)</TH><TD COLSPAN=5>
-END
-
-  print <<END;
-  <INPUT TYPE="text" NAME="ship_last" VALUE="$ship_last" onChange="changed(this)"> , 
-  <INPUT TYPE="text" NAME="ship_first" VALUE="$ship_first" onChange="changed(this)">
-END
-
-  print <<END;
-  </TD></TR>
-  <TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_company" VALUE="$ship_company" SIZE=70 onChange="changed(this)"></TD></TR>
-  <TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_address1" VALUE="$ship_address1" SIZE=70 onChange="changed(this)"></TD></TR>
-  <TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_address2" VALUE="$ship_address2" SIZE=70 onChange="changed(this)"></TD></TR>
-  <TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="ship_city" VALUE="$ship_city" onChange="changed(this)"></TD><TH ALIGN="right">${r}State</TH><TD>
-END
-
-  #false laziness with regular state
-  $cust_main->ship_country( $countrydefault ) unless $cust_main->ship_country;
-
-  $cust_main->ship_state( $conf->config('statedefault') || 'CA' )
-    unless $cust_main->ship_state || $cust_main->ship_country ne 'US';
-
-  my($ship_county_html, $ship_state_html, $ship_country_html) =
-    FS::cust_main_county::regionselector( $cust_main->ship_county,
-                                          $cust_main->ship_state,
-                                          $cust_main->ship_country,
-                                          'ship_',
-                                          'changed(this)', );
-
-  print "$ship_county_html $ship_state_html";
-
-  print qq!</TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="ship_zip" VALUE="$ship_zip" SIZE=10 onChange="changed(this)"></TD></TR>!;
-
-  my($ship_daytime,$ship_night,$ship_fax)=(
-    $cust_main->ship_daytime,
-    $cust_main->ship_night,
-    $cust_main->ship_fax,
-  );
-
-  print <<END;
-  <TR><TH ALIGN="right">${r}Country</TH><TD>$ship_country_html</TD></TR>
-  <TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_daytime" VALUE="$ship_daytime" SIZE=18 onChange="changed(this)"></TD></TR>
-  <TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_night" VALUE="$ship_night" SIZE=18 onChange="changed(this)"></TD></TR>
-  <TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_fax" VALUE="$ship_fax" SIZE=12 onChange="changed(this)"></TD></TR>
-END
-
-  print "</TABLE>${r}required fields<BR>";
-
-}
-
-# billing info
-
-sub expselect {
-  my $prefix = shift;
-  my( $m, $y ) = (0, 0);
-  if ( scalar(@_) ) {
-    my $date = shift || '01-2000';
-    if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
-      ( $m, $y ) = ( $2, $1 );
-    } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-      ( $m, $y ) = ( $1, $3 );
-    } else {
-      die "unrecognized expiration date format: $date";
-    }
-  }
-
-  my $return = qq!<SELECT NAME="$prefix!. qq!_month" SIZE="1">!;
-  for ( 1 .. 12 ) {
-    $return .= "<OPTION";
-    $return .= " SELECTED" if $_ == $m;
-    $return .= ">$_";
-  }
-  $return .= qq!</SELECT>/<SELECT NAME="$prefix!. qq!_year" SIZE="1">!;
-  for ( 2001 .. 2037 ) {
-    $return .= "<OPTION";
-    $return .= " SELECTED" if $_ == $y;
-    $return .= ">$_";
-  }
-  $return .= "</SELECT>";
-
-  $return;
-}
-
-print "<BR>Billing information", &itable("#cccccc"),
-      qq!<TR><TD><INPUT TYPE="checkbox" NAME="tax" VALUE="Y"!;
-print qq! CHECKED! if $cust_main->tax eq "Y";
-print qq!>Tax Exempt</TD></TR>!;
-print qq!<TR><TD><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
-my @invoicing_list = $cust_main->invoicing_list;
-print qq! CHECKED!
-  if ( ! @invoicing_list && ! $conf->exists('disablepostalinvoicedefault') )
-     || grep { $_ eq 'POST' } @invoicing_list;
-print qq!>Postal mail invoice</TD></TR>!;
-my $invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
-print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
-
-print "<TR><TD>Billing type</TD></TR>",
-      "</TABLE>",
-      &table("#cccccc"), "<TR>";
-
-my($payinfo, $payname)=(
-  $cust_main->payinfo,
-  $cust_main->payname,
-);
-
-my %payby = (
-  'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
-  'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
-);
-my %paybychecked = (
-  'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
-  'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
-);
-for (qw(CARD BILL COMP)) {
-  print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
-  if ($cust_main->payby eq "$_") {
-    print qq! CHECKED> $paybychecked{$_}</TD>!;
-  } else {
-    print qq!> $payby{$_}</TD>!;
-  }
-}
-
-print "</TR></TABLE>$r required fields for each billing type";
-
-if ( defined $cust_main->dbdef_table->column('comments') ) {
-    print "<BR><BR>Comments", &itable("#cccccc"),
-          qq!<TR><TD><TEXTAREA COLS=80 ROWS=5 WRAP="HARD" NAME="comments">!,
-          $cust_main->comments, "</TEXTAREA>",
-          "</TD></TR></TABLE>";
-}
-
-unless ( $custnum ) {
-  # pry the wrong place for this logic.  also pretty expensive
-  #use FS::part_pkg;
-
-  #false laziness, copied from FS::cust_pkg::order
-  my $pkgpart;
-  if ( scalar(@agents) == 1 ) {
-    # $pkgpart->{PKGPART} is true iff $custnum may purchase PKGPART
-    my($agent)=qsearchs('agent',{'agentnum'=> $agentnum });
-    $pkgpart = $agent->pkgpart_hashref;
-  } else {
-    #can't know (agent not chosen), so, allow all
-    my %typenum;
-    foreach my $agent ( @agents ) {
-      next if $typenum{$agent->typenum}++;
-      #fixed in 5.004_05 #$pkgpart->{$_}++ foreach keys %{ $agent->pkgpart_hashref }
-      foreach ( keys %{ $agent->pkgpart_hashref } ) { $pkgpart->{$_}++; } #5.004_04 workaround
-    }
-  }
-  #eslaf
-
-  my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } }
-    qsearch( 'part_pkg', { 'disabled' => '' } );
-
-  if ( @part_pkg ) {
-
-#    print "<BR><BR>First package", &itable("#cccccc", "0 ALIGN=LEFT"),
-#apiabuse & undesirable wrapping
-    print "<BR><BR>First package", &itable("#cccccc"),
-          qq!<TR><TD COLSPAN=2><SELECT NAME="pkgpart_svcpart">!;
-
-    print qq!<OPTION VALUE="">(none)!;
-
-    foreach my $part_pkg ( @part_pkg ) {
-      print qq!<OPTION VALUE="!,
-#              $part_pkg->pkgpart. "_". $pkgpart{ $part_pkg->pkgpart }, '"';
-              $part_pkg->pkgpart. "_". $part_pkg->svcpart, '"';
-      print " SELECTED" if $saved_pkgpart && ( $part_pkg->pkgpart == $saved_pkgpart );
-      print ">", $part_pkg->pkg, " - ", $part_pkg->comment;
-    }
-    print "</SELECT></TD></TR>";
-
-    #false laziness: (mostly) copied from edit/svc_acct.cgi
-    #$ulen = $svc_acct->dbdef_table->column('username')->length;
-    my $ulen = dbdef->table('svc_acct')->column('username')->length;
-    my $ulen2 = $ulen+2;
-    my $passwordmax = $conf->config('passwordmax') || 8;
-    my $pmax2 = $passwordmax + 2;
-    print <<END;
-<TR><TD ALIGN="right">Username</TD>
-<TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
-<TR><TD ALIGN="right">Password</TD>
-<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=$pmax2 MAXLENGTH=$passwordmax>
-(blank to generate)</TD></TR>
-END
-
-    print '<TR><TD ALIGN="right">Access number</TD><TD WIDTH="100%">'
-          .
-          &FS::svc_acct_pop::popselector($popnum).
-          '</TD></TR></TABLE>'
-          ;
-  }
-}
-
-my $otaker = $cust_main->otaker;
-print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!,
-      qq!<BR><INPUT TYPE="submit" VALUE="!,
-      $custnum ?  "Apply Changes" : "Add Customer", qq!">!,
-      "</FORM></BODY></HTML>",
-;
-
-%>
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
deleted file mode 100755
index 9f314a457..000000000
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ /dev/null
@@ -1,54 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my($taxnum, $delim, $expansion, $taxclass );
-my($query) = $cgi->keywords;
-if ( $cgi->param('error') ) {
-  $taxnum = $cgi->param('taxnum');
-  $delim = $cgi->param('delim');
-  $expansion = $cgi->param('expansion');
-  $taxclass = $cgi->param('taxclass');
-} else {
-  $query =~ /^(taxclass)?(\d+)$/
-    or die "Illegal taxnum (query $query)";
-  $taxclass = $1 ? 'taxclass' : '';
-  $taxnum = $2;
-  $delim = 'n';
-  $expansion = '';
-}
-
-my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
-  or die "cust_main_county.taxnum $taxnum not found";
-die "Can't expand entry!" if $cust_main_county->getfield('county');
-
-my $p1 = popurl(1);
-print header("Tax Rate (expand)", menubar(
-  'Main Menu' => popurl(2),
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print <<END;
-    <FORM ACTION="${p1}process/cust_main_county-expand.cgi" METHOD=POST>
-      <INPUT TYPE="hidden" NAME="taxnum" VALUE="$taxnum">
-      <INPUT TYPE="hidden" NAME="taxclass" VALUE="$taxclass">
-      Separate by
-END
-print '<INPUT TYPE="radio" NAME="delim" VALUE="n"';
-print ' CHECKED' if $delim eq 'n';
-print '>line (broken on some browsers) or',
-      '<INPUT TYPE="radio" NAME="delim" VALUE="s"';
-print ' CHECKED' if $delim eq 's';
-print '>whitespace.';
-print <<END;
-      <BR><INPUT TYPE="submit" VALUE="Submit">
-      <BR><TEXTAREA NAME="expansion" ROWS=100>$expansion</TEXTAREA>
-    </FORM>
-    </CENTER>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
deleted file mode 100755
index 7ef37a48d..000000000
--- a/httemplate/edit/cust_main_county.cgi
+++ /dev/null
@@ -1,66 +0,0 @@
-<!-- mason kludge -->
-<%
-
-print header("Edit tax rates", menubar(
-  'Main Menu' => popurl(2),
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print qq!<FORM ACTION="!, popurl(1),
-    qq!process/cust_main_county.cgi" METHOD=POST>!, &table(), <<END;
-      <TR>
-        <TH><FONT SIZE=-1>Country</FONT></TH>
-        <TH><FONT SIZE=-1>State</FONT></TH>
-        <TH><FONT SIZE=-1>County</FONT></TH>
-        <TH><FONT SIZE=-1>Taxclass</FONT></TH>
-        <TH><FONT SIZE=-1>Tax</FONT></TH>
-        <TH><FONT SIZE=-1>Exempt<BR>per<BR>month</TH>
-      </TR>
-END
-
-foreach my $cust_main_county ( sort {    $a->country cmp $b->country
-                                      or $a->state   cmp $b->state
-                                      or $a->county  cmp $b->county
-                                    } qsearch('cust_main_county',{}) ) {
-  my($hashref)=$cust_main_county->hashref;
-  print <<END;
-      <TR>
-        <TD BGCOLOR="#ffffff">$hashref->{country}</TD>
-END
-
-  print "<TD", $hashref->{state}
-      ? ' BGCOLOR="#ffffff">'.$hashref->{state}
-      : ' BGCOLOR="#cccccc">(ALL)'
-    , "</TD>";
-
-  print "<TD", $hashref->{county}
-      ? ' BGCOLOR="#ffffff">'. $hashref->{county}
-      : ' BGCOLOR="#cccccc">(ALL)'
-    , "</TD>";
-
-  print "<TD", $hashref->{taxclass}
-      ? ' BGCOLOR="#ffffff">'. $hashref->{taxclass}
-      : ' BGCOLOR="#cccccc">(ALL)'
-    , "</TD>";
-
-  print qq!<TD><INPUT TYPE="text" NAME="tax!, $hashref->{taxnum},
-        qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6>%</TD>!;
-  print qq!<TD>\$<INPUT TYPE="text" NAME="exempt_amount!, $hashref->{taxnum},
-        qq!" VALUE="!, $hashref->{exempt_amount}||0, qq!" SIZE=6></TD>!;
-  print '</TR>';
-
-}
-
-print <<END;
-    </TABLE>
-    <INPUT TYPE="submit" VALUE="Apply changes">
-    </FORM>
-    </CENTER>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
deleted file mode 100755
index f6ae7b299..000000000
--- a/httemplate/edit/cust_pay.cgi
+++ /dev/null
@@ -1,129 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $conf = new FS::Conf;
-
-my($link, $linknum, $paid, $payby, $payinfo, $quickpay); 
-if ( $cgi->param('error') ) {
-  $link = $cgi->param('link');
-  $linknum = $cgi->param('linknum');
-  $paid = $cgi->param('paid');
-  $payby = $cgi->param('payby');
-  $payinfo = $cgi->param('payinfo');
-  $quickpay = $cgi->param('quickpay');
-} elsif ($cgi->keywords) {
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $link = 'invnum';
-  $linknum = $1;
-  $paid = '';
-  $payby = 'BILL';
-  $payinfo = "";
-  $quickpay = '';
-} elsif ( $cgi->param('custnum')  =~ /^(\d+)$/ ) {
-  $link = 'custnum';
-  $linknum = $1;
-  $paid = '';
-  $payby = 'BILL';
-  $payinfo = '';
-  $quickpay = $cgi->param('quickpay');
-} else {
-  die "illegal query ". $cgi->keywords;
-}
-my $_date = time;
-
-my $paybatch = "webui-$_date-$$-". rand() * 2**32;
-
-my $p1 = popurl(1);
-print header("Post payment", '');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT><BR><BR>"
-  if $cgi->param('error');
-
-print <<END, ntable("#cccccc",2);
-    <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
-    <INPUT TYPE="hidden" NAME="link" VALUE="$link">
-    <INPUT TYPE="hidden" NAME="linknum" VALUE="$linknum">
-    <INPUT TYPE="hidden" NAME="quickpay" VALUE="$quickpay">
-END
-
-my $custnum;
-if ( $link eq 'invnum' ) {
-
-  my $cust_bill = qsearchs('cust_bill', { 'invnum' => $linknum } )
-    or die "unknown invnum $linknum";
-  print "Invoice #<B>$linknum</B>". ntable("#cccccc",2).
-        '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
-        time2str("%D", $cust_bill->_date). '</TD></TR>'.
-        '<TR><TD ALIGN="right" VALIGN="top">Items</TD><TD BGCOLOR="#ffffff">';
-  foreach ( $cust_bill->cust_bill_pkg ) { #false laziness with FS::cust_bill
-    if ( $_->pkgnum ) {
-
-      my($cust_pkg)=qsearchs('cust_pkg', { 'pkgnum', $_->pkgnum } );
-      my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->pkgpart});
-      my($pkg)=$part_pkg->pkg;
-
-      if ( $_->setup != 0 ) {
-        print "$pkg Setup<BR>"; # $money_char. sprintf("%10.2f",$_->setup);
-        print join('<BR>',
-          map { "  ". $_->[0]. ": ". $_->[1] } $cust_pkg->labels
-        ). '<BR>';
-      }
-
-      if ( $_->recur != 0 ) {
-        print
-          "$pkg (" . time2str("%x",$_->sdate) . " - " .
-                                time2str("%x",$_->edate) . ")<BR>";
-          #$money_char. sprintf("%10.2f",$_->recur)
-        print join('<BR>',
-          map { '--->'. $_->[0]. ": ". $_->[1] } $cust_pkg->labels
-        ). '<BR>';
-      }
-
-    } else { #pkgnum Tax
-      print "Tax<BR>" # $money_char. sprintf("%10.2f",$_->setup)
-        if $_->setup != 0;
-    }
-
-  }
-  print '</TD></TR></TABLE><BR><BR>';
-
-  $custnum = $cust_bill->custnum;
-
-} elsif ( $link eq 'custnum' ) {
-  $custnum = $linknum;
-}
-
-print small_custview($custnum, $conf->config('countrydefault'));
-
-print qq!<INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
-print qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$payby">!;
-
-print '<BR><BR>Payment'. ntable("#cccccc", 2).
-      '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
-      time2str("%D",$_date).  '</TD></TR>';
-
-print qq!<TR><TD ALIGN="right">Amount</TD><TD BGCOLOR="#ffffff">\$<INPUT TYPE="text" NAME="paid" VALUE="$paid" SIZE=8 MAXLENGTH=8></TD></TR>!;
-
-print qq!<TR><TD ALIGN="right">Payby</TD><TD BGCOLOR="#ffffff">$payby</TD></TR>!;
-
-#payinfo (check # now as payby="BILL" hardcoded.. what to do later?)
-print qq!<TR><TD ALIGN="right">Check #</TD><TD BGCOLOR="#ffffff"><INPUT TYPE="text" NAME="payinfo" VALUE="$payinfo"></TD></TR>!;
-
-print qq!<TR><TD ALIGN="right">Auto-apply<BR>to invoices</TD><TD><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD>!;
-
-print "</TABLE>";
-
-#paybatch
-print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="$paybatch">!;
-
-print <<END;
-<BR>
-<INPUT TYPE="submit" VALUE="Post payment">
-    </FORM>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
deleted file mode 100755
index 485d601eb..000000000
--- a/httemplate/edit/cust_pkg.cgi
+++ /dev/null
@@ -1,117 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my %pkg = ();
-my %comment = ();
-my %all_pkg = ();
-my %all_comment = ();
-#foreach (qsearch('part_pkg', { 'disabled' => '' })) {
-#  $pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
-#  $comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
-#}
-foreach (qsearch('part_pkg', {} )) {
-  $all_pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
-  $all_comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
-  next if $_->disabled;
-  $pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
-  $comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
-}
-
-my($custnum, %remove_pkg);
-if ( $cgi->param('error') ) {
-  $custnum = $cgi->param('custnum');
-  %remove_pkg = map { $_ => 1 } $cgi->param('remove_pkg');
-} else {
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $custnum = $1;
-  %remove_pkg = ();
-}
-
-my $p1 = popurl(1);
-print header("Add/Edit Packages", '');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print qq!<FORM ACTION="${p1}process/cust_pkg.cgi" METHOD=POST>!;
-
-print qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
-
-#current packages
-my @cust_pkg = qsearch('cust_pkg',{ 'custnum' => $custnum, 'cancel' => '' } );
-
-if (@cust_pkg) {
-  print <<END;
-Current packages - select to remove (services are moved to a new package below)
-<BR><BR>
-END
-
-  my $count = 0 ;
-  print qq!<TABLE>! ;
-  foreach (@cust_pkg) {
-    print '<TR>' if $count == 0;
-    my($pkgnum,$pkgpart)=( $_->getfield('pkgnum'), $_->getfield('pkgpart') );
-    print qq!<TD><INPUT TYPE="checkbox" NAME="remove_pkg" VALUE="$pkgnum"!;
-    print " CHECKED" if $remove_pkg{$pkgnum};
-    print qq!>$pkgnum: $all_pkg{$pkgpart} - $all_comment{$pkgpart}</TD>\n!;
-    $count ++ ;
-    if ($count == 2)
-    {
-      $count = 0 ;
-      print qq!</TR>\n! ;
-    }
-  }
-  print qq!</TABLE><BR><BR>!;
-}
-
-print <<END;
-Order new packages<BR><BR>
-END
-
-my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
-my $agent = qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
-
-my $count = 0;
-my $pkgparts = 0;
-print qq!<TABLE>!;
-foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
-  $pkgparts++;
-  my($pkgpart)=$type_pkgs->pkgpart;
-  next unless exists $pkg{$pkgpart}; #skip disabled ones
-  print qq!<TR>! if ( $count == 0 );
-  my $value = $cgi->param("pkg$pkgpart") || 0;
-  print <<END;
-  <TD>
-  <INPUT TYPE="text" NAME="pkg$pkgpart" VALUE="$value" SIZE="2" MAXLENGTH="2">
-  $pkgpart: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n
-END
-  $count ++ ;
-  if ( $count == 2 ) {
-    print qq!</TR>\n! ;
-    $count = 0;
-  }
-}
-print qq!</TABLE>!;
-
-unless ( $pkgparts ) {
-  my $p2 = popurl(2);
-  my $typenum = $agent->typenum;
-  my $agent_type = qsearchs( 'agent_type', { 'typenum' => $typenum } );
-  my $atype = $agent_type->atype;
-  print <<END;
-(No <a href="${p2}browse/part_pkg.cgi">package definitions</a>, or agent type
-<a href="${p2}edit/agent_type.cgi?$typenum">$atype</a> not allowed to purchase
-any packages.)
-END
-}
-
-#submit
-print <<END;
-<P><INPUT TYPE="submit" VALUE="Order">
-    </FORM>
-  </BODY>
-</HTML>
-END
-%>
diff --git a/httemplate/edit/msgcat.cgi b/httemplate/edit/msgcat.cgi
deleted file mode 100755
index ee9b1c6b3..000000000
--- a/httemplate/edit/msgcat.cgi
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- mason kludge -->
-<%
-
-print header("Edit Message catalog", menubar(
-#  'Main Menu' => $p,
-)), '<BR>';
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !. $cgi->param('error').
-      '</FONT><BR><BR>'
-  if $cgi->param('error');
-
-my $widget = new HTML::Widgets::SelectLayers(
-  'selected_layer' => 'en_US',
-  'options'        => { 'en_US'=>'en_US' },
-  'form_action'    => 'process/msgcat.cgi',
-  'layer_callback' => sub {
-    my $layer = shift;
-    my $html = qq!<INPUT TYPE="hidden" NAME="locale" VALUE="$layer">!.
-               "<BR>Messages for locale $layer<BR>". table().
-               "<TR><TH COLSPAN=2>Code</TH>".
-               "<TH>Message</TH>";
-    $html .= "<TH>en_US Message</TH>" unless $layer eq 'en_US';
-    $html .= '</TR>';
-
-    #foreach my $msgcat ( sort { $a->msgcode cmp $b->msgcode }
-    #                       qsearch('msgcat', { 'locale' => $layer } ) ) {
-    foreach my $msgcat ( qsearch('msgcat', { 'locale' => $layer } ) ) {
-      $html .=
-        '<TR><TD>'. $msgcat->msgnum. '</TD><TD>'. $msgcat->msgcode. '</TD>'.
-        '<TD><INPUT TYPE="text" SIZE=32 '.
-        qq! NAME="!. $msgcat->msgnum. '" '.
-        qq!VALUE="!. ($cgi->param($msgcat->msgnum)||$msgcat->msg). qq!"></TD>!;
-      unless ( $layer eq 'en_US' ) {
-        my $en_msgcat = qsearchs('msgcat', {
-          'locale'  => 'en_US',
-          'msgcode' => $msgcat->msgcode,
-        } );
-        $html .= '<TD>'. $en_msgcat->msg. '</TD>';
-      }
-      $html .= '</TR>';
-    }
-
-    $html .= '</TABLE><BR><INPUT TYPE="submit" VALUE="Apply changes">';
-
-    $html;
-  },
-
-);
-
-print $widget->html;
-
-print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
deleted file mode 100755
index 324daeb90..000000000
--- a/httemplate/edit/part_bill_event.cgi
+++ /dev/null
@@ -1,192 +0,0 @@
-<!-- mason kludge -->
-<%
-
-if ( $cgi->param('eventpart') && $cgi->param('eventpart') =~ /^(\d+)$/ ) {
-  $cgi->param('eventpart', $1);
-} else {
-  $cgi->param('eventpart', '');
-}
-
-my ($query) = $cgi->keywords;
-my $action = '';
-my $part_bill_event = '';
-if ( $cgi->param('error') ) {
-  $part_bill_event = new FS::part_bill_event ( {
-    map { $_, scalar($cgi->param($_)) } fields('part_bill_event')
-  } );
-}
-if ( $query && $query =~ /^(\d+)$/ ) {
-  $part_bill_event ||= qsearchs('part_bill_event',{'eventpart'=>$1});
-} else {
-  $part_bill_event ||= new FS::part_bill_event {};
-}
-$action ||= $part_bill_event->pkgpart ? 'Edit' : 'Add';
-my $hashref = $part_bill_event->hashref;
-
-print header("$action Invoice Event Definition", menubar(
-  'Main Menu' => popurl(2),
-  'View all invoice events' => popurl(2). 'browse/part_bill_event.cgi',
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print '<FORM ACTION="', popurl(1), 'process/part_bill_event.cgi" METHOD=POST>'.
-      '<INPUT TYPE="hidden" NAME="eventpart" VALUE="'.
-      $part_bill_event->eventpart  .'">';
-print "Invoice Event #", $hashref->{eventpart} ? $hashref->{eventpart} : "(NEW)";
-
-print ntable("#cccccc",2), <<END;
-<TR><TD ALIGN="right">Payby</TD><TD><SELECT NAME="payby">
-END
-
-for (qw(CARD BILL COMP)) {
-  print qq!<OPTION VALUE="$_"!;
-  if ($part_bill_event->payby eq $_) {
-    print " SELECTED>$_</OPTION>";
-  } else {
-    print ">$_</OPTION>";
-  }
-}
-
-my $days = $hashref->{seconds}/86400;
-
-print <<END;
-</SELECT></TD></TR>
-<TR><TD ALIGN="right">Event</TD><TD><INPUT TYPE="text" NAME="event" VALUE="$hashref->{event}"></TD></TR>
-<TR><TD ALIGN="right">After</TD><TD><INPUT TYPE="text" NAME="days" VALUE="$days"> days</TD></TR>
-END
-
-print '<TR><TD ALIGN="right">Disabled</TD><TD>';
-print '<INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"';
-print ' CHECKED' if $hashref->{disabled} eq "Y";
-print '>';
-print '</TD></TR>';
-
-print '<TR><TD ALIGN="right">Action</TD><TD>';
-
-#print ntable();
-
-#this is pretty kludgy right here.
-tie my %events, 'Tie::IxHash',
-
-  'fee' => {
-    'name'   => 'Late fee',
-    'code'   => '$cust_main->charge( %%%charge%%%, \'%%%reason%%%\' );',
-    'html'   => 
-      'Amount <INPUT TYPE="text" SIZE="7" NAME="charge" VALUE="%%%charge%%%">'.
-      '<BR>Reason <INPUT TYPE="text" NAME="reason" VALUE="%%%reason%%%">',
-    'weight' => 10,
-  },
-  'suspend' => {
-    'name'   => 'Suspend',
-    'code'   => '$cust_main->suspend();',
-    'weight' => 10,
-  },
-  'cancel' => {
-    'name'   => 'Cancel',
-    'code'   => '$cust_main->cancel();',
-    'weight' => 10,
-  },
-
-  'addpost' => {
-    'name' => 'Add postal invoicing',
-    'code' => '$cust_main->invoicing_list_addpost(); "";',
-    'weight'  => 20,
-  },
-
-  'comp' => {
-    'name' => 'Pay invoice with a complimentary "payment"',
-    'code' => '$cust_bill->comp();',
-    'weight' => 30,
-  },
-
-  'realtime-card' => {
-    'name' => 'Run card with a <a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a> realtime gateway',
-    'code' => '$cust_bill->realtime_card();',
-    'weight' => 30,
-  },
-
-  'realtime-card-cybercash' => {
-    'name' => '(<b>deprecated</b>) Run card with <a href="http://www.cybercash.com/cashregister">CyberCash CashRegister</a> realtime gateway',
-    'code' => '$cust_bill->realtime_card_cybercash();',
-    'weight' => 30,
-  },
-
-  'batch-card' => {
-    'name' => 'Add card to the pending credit card batch',
-    'code' => '$cust_bill->batch_card();',
-    'weight' => 40,
-  },
-
-  'send' => {
-    'name' => 'Send invoice (email/print)',
-    'code' => '$cust_bill->send();',
-    'weight' => 50,
-  },
-
-  'send_alternate' => {
-    'name' => 'Send invoice (email/print) with alternate template',
-    'code' => '$cust_bill->send(\'%%%templatename%%%\');',
-    'html' =>
-        '<INPUT TYPE="text" NAME="templatename" VALUE="%%%templatename%%%">',
-    'weight' => 50,
-  },
-
-  'bill' => {
-    'name' => 'Generate invoices (normally only used with a <i>Late Fee</i> event)',
-    'code' => '$cust_main->bill();',
-    'weight'  => 60,
-  },
-
-  'apply' => {
-    'name' => 'Apply unapplied payments and credits',
-    'code' => '$cust_main->apply_payments; $cust_main->apply_credits; "";',
-    'weight'  => 70,
-  },
-
-  'collect' => {
-    'name' => 'Collect on invoices (normally only used with a <i>Late Fee</i> and <i>Generate Invoice</i> events)',
-    'code' => '$cust_main->collect();',
-    'weight'  => 80,
-  },
-
-;
-
-foreach my $event ( keys %events ) {
-  my %plandata = map { /^(\w+) (.*)$/; ($1, $2); }
-                   split(/\n/, $part_bill_event->plandata);
-  my $html = $events{$event}{html};
-  while ( $html =~ /%%%(\w+)%%%/ ) {
-    my $field = $1;
-    $html =~ s/%%%$field%%%/$plandata{$field}/;
-  }
-
-  print ntable( "#cccccc", 2).
-        qq!<TR><TD><INPUT TYPE="radio" NAME="plan_weight_eventcode" !;
-  print "CHECKED " if $event eq $part_bill_event->plan;
-  print qq!VALUE="!.  $event. ":". $events{$event}{weight}. ":".
-        encode_entities($events{$event}{code}).
-        qq!">$events{$event}{name}</TD>!;
-  print '<TD>'. $html. '</TD>' if $html;
-  print qq!</TR>!;
-  print '</TABLE>';
-}
-
-#print '</TABLE>';
-
-print <<END;
-</TD></TR>
-</TABLE>
-END
-
-print qq!<INPUT TYPE="submit" VALUE="!,
-      $hashref->{eventpart} ? "Apply changes" : "Add invoice event",
-      qq!">!;
-%>
-
-    </FORM>
-  </BODY>
-</HTML>
-
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
deleted file mode 100644
index 486bd4300..000000000
--- a/httemplate/edit/part_export.cgi
+++ /dev/null
@@ -1,117 +0,0 @@
-<!-- mason kludge -->
-<%
-
-#if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
-#  $cgi->param('clone', $1);
-#} else {
-#  $cgi->param('clone', '');
-#}
-
-my($query) = $cgi->keywords;
-my $action = '';
-my $part_export = '';
-if ( $cgi->param('error') ) {
-  $part_export = new FS::part_export ( {
-    map { $_, scalar($cgi->param($_)) } fields('part_export')
-  } );
-} elsif ( $query =~ /^(\d+)$/ ) {
-  $part_export = qsearchs('part_export', { 'exportnum' => $1 } );
-} else {
-  $part_export = new FS::part_export;
-}
-$action ||= $part_export->exportnum ? 'Edit' : 'Add';
-
-#my $exports = FS::part_export::export_info($svcdb);
-my $exports = FS::part_export::export_info();
-
-my %layers = map { $_ => "$_ - ". $exports->{$_}{desc} } keys %$exports;
-$layers{''}='';
-
-my $widget = new HTML::Widgets::SelectLayers(
-  'selected_layer' => $part_export->exporttype,
-  'options'        => \%layers,
-  'form_name'      => 'dummy',
-  'form_action'    => 'process/part_export.cgi',
-  'form_text'      => [qw( exportnum machine )],
-#  'form_checkbox'  => [qw()],
-  'html_between'    => "</TD></TR></TABLE>\n",
-  'layer_callback'  => sub {
-    my $layer = shift;
-    my $html = qq!<INPUT TYPE="hidden" NAME="exporttype" VALUE="$layer">!.
-               ntable("#cccccc",2);
-
-    $html .= '<TR><TD ALIGN="right">Description</TD><TD BGCOLOR=#ffffff>'.
-             $exports->{$layer}{notes}. '</TD></TR>'
-      if $layer;
-
-    foreach my $option ( keys %{$exports->{$layer}{options}} ) {
-      my $optinfo = $exports->{$layer}{options}{$option};
-      my $label = $optinfo->{label};
-      my $type = defined($optinfo->{type}) ? $optinfo->{type} : 'text';
-      my $value = $cgi->param($option)
-                  || $part_export->option($option)
-                  || (exists $optinfo->{default} ? $optinfo->{default} : '');
-      $html .= qq!<TR><TD ALIGN="right">$label</TD><TD>!;
-      if ( $type eq 'select' ) {
-        $html .= qq!<SELECT NAME="$option">!;
-        foreach my $select_option ( @{$optinfo->{options}} ) {
-          #if ( ref($select_option) ) {
-          #} else {
-            $selected = $select_option eq $value ? ' SELECTED' : '';
-            $html .= qq!<OPTION VALUE="$select_option"$selected>!.
-                     qq!$select_option</OPTION>!;
-          #}
-        }
-        $html .= '</SELECT>';
-      } elsif ( $type eq 'textarea' ) {
-        $html .= qq!<TEXTAREA NAME="$option">$value</TEXTAREA>!;
-      } elsif ( $type eq 'text' ) {
-        $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
-      } else {
-        $html .= "unknown type $type";
-      }
-      $html .= '</TD></TR>';
-    }
-    $html .= '</TABLE>';
-
-    $html .= '<INPUT TYPE="hidden" NAME="options" VALUE="'.
-             join(',', keys %{$exports->{$layer}{options}} ). '">';
-
-    $html .= '<INPUT TYPE="hidden" NAME="nodomain" VALUE="'.
-             $exports->{$layer}{nodomain}. '">';
-
-    $html .= '<INPUT TYPE="submit" VALUE="'.
-             ( $part_export->exportnum ? "Apply changes" : "Add export" ).
-             '">';
-
-    $html;
-  },
-);
-
-%>
-<%= header("$action Export", menubar(
-  'Main Menu' => popurl(2),
-), ' onLoad="visualize()"')
-%>
-
-<% if ( $cgi->param('error') ) { %>
-  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
-  <BR><BR>
-<% } %>
-
-<FORM NAME="dummy">
-<INPUT TYPE="hidden" NAME="exportnum" VALUE="<%= $part_export->exportnum %>">
-
-<%= ntable("#cccccc",2) %>
-<TR>
-  <TD ALIGN="right">Export host</TD>
-  <TD>
-    <INPUT TYPE="text" NAME="machine" VALUE="<%= $part_export->machine %>">
-  </TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Export</TD>
-  <TD><%= $widget->html %>
-</BODY>
-</HTML>
-
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
deleted file mode 100755
index b6ecff2d0..000000000
--- a/httemplate/edit/part_pkg.cgi
+++ /dev/null
@@ -1,464 +0,0 @@
-<!-- mason kludge -->
-<%
-
-if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
-  $cgi->param('clone', $1);
-} else {
-  $cgi->param('clone', '');
-}
-if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
-  $cgi->param('pkgnum', $1);
-} else {
-  $cgi->param('pkgnum', '');
-}
-
-my ($query) = $cgi->keywords;
-my $action = '';
-my $part_pkg = '';
-if ( $cgi->param('error') ) {
-  $part_pkg = new FS::part_pkg ( {
-    map { $_, scalar($cgi->param($_)) } fields('part_pkg')
-  } );
-}
-if ( $cgi->param('clone') ) {
-  $action='Custom Pricing';
-  my $old_part_pkg =
-    qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
-  $part_pkg ||= $old_part_pkg->clone;
-  $part_pkg->disabled('Y');
-} elsif ( $query && $query =~ /^(\d+)$/ ) {
-  $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
-} else {
-  unless ( $part_pkg ) {
-    $part_pkg = new FS::part_pkg {};
-    $part_pkg->plan('flat');
-  }
-}
-unless ( $part_pkg->plan ) { #backwards-compat
-  $part_pkg->plan('flat');
-  $part_pkg->plandata("setup_fee=". $part_pkg->setup. "\n".
-                      "recur_fee=". $part_pkg->recur. "\n");
-}
-$action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
-my $hashref = $part_pkg->hashref;
-
-
-print header("$action Package Definition", menubar(
-  'Main Menu' => popurl(2),
-  'View all packages' => popurl(2). 'browse/part_pkg.cgi',
-));
-#), ' onLoad="visualize()"');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-#print '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>';
-print '<FORM NAME="dummy">';
-
-#if ( $cgi->param('clone') ) {
-#  print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
-#}
-#if ( $cgi->param('pkgnum') ) {
-#  print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $cgi->param('pkgnum'), qq!">!;
-#}
-#
-#print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
-print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
-
-print ntable("#cccccc",2), <<END;
-<TR><TD ALIGN="right">Package (customer-visable)</TD><TD><INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}"></TD></TR>
-<TR><TD ALIGN="right">Comment (customer-hidden)</TD><TD><INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}"></TD></TR>
-<TR><TD ALIGN="right">Frequency (months) of recurring fee</TD><TD><INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}" SIZE=3>&nbsp;&nbsp;<I>0=no recurring fee, 1=monthly, 3=quarterly, 12=yearly</TD></TR>
-<TR><TD ALIGN="right">Setup fee tax exempt</TD><TD>
-END
-
-print '<INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y"';
-print ' CHECKED' if $hashref->{setuptax} eq "Y";
-print '>';
-
-print <<END;
-</TD></TR>
-<TR><TD ALIGN="right">Recurring fee tax exempt</TD><TD>
-END
-
-print '<INPUT TYPE="checkbox" NAME="recurtax" VALUE="Y"';
-print ' CHECKED' if $hashref->{recurtax} eq "Y";
-print '>';
-
-print '</TD></TR>';
-
-my $conf = new FS::Conf;
-#false laziness w/ view/cust_main.cgi quick order
-if ( $conf->exists('enable_taxclasses') ) {
-  print '<TR><TD ALIGN="right">Tax class</TD><TD><SELECT NAME="taxclass">';
-  my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
-    or die dbh->errstr;
-  $sth->execute or die $sth->errstr;
-  foreach my $taxclass ( map $_->[0], @{$sth->fetchall_arrayref} ) {
-    print qq!<OPTION VALUE="$taxclass"!;
-    print ' SELECTED' if $taxclass eq $hashref->{taxclass};
-    print qq!>$taxclass</OPTION>!;
-  }
-  print '</SELECT></TD></TR>';
-} else {
-  print
-    '<INPUT TYPE="hidden" NAME="taxclass" VALUE="'. $hashref->{taxclass}. '">';
-}
-
-print '<TR><TD ALIGN="right">Disable new orders</TD><TD>';
-print '<INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"';
-print ' CHECKED' if $hashref->{disabled} eq "Y";
-print '>';
-print '</TD></TR></TABLE>';
-
-my $thead =  "\n\n". ntable('#cccccc', 2). <<END;
-<TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH><TH BGCOLOR="#dcdcdc">Service</TH></TR>
-END
-
-#unless ( $cgi->param('clone') ) {
-#dunno why...
-unless ( 0 ) {
-  #print <<END, $thead;
-  print <<END, itable(), '<TR><TD VALIGN="top">', $thead;
-<BR><BR>Enter the quantity of each service this package includes.<BR><BR>
-END
-}
-
-my @fixups = ();
-my $count = 0;
-my $columns = 3;
-my @part_svc = qsearch( 'part_svc', { 'disabled' => '' } );
-foreach my $part_svc ( @part_svc ) {
-  my $svcpart = $part_svc->svcpart;
-  my $pkg_svc = qsearchs( 'pkg_svc', {
-    'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
-    'svcpart'  => $svcpart,
-  } ) || new FS::pkg_svc ( {
-    'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
-    'svcpart'  => $svcpart,
-    'quantity' => 0,
-  });
-  #? #next unless $pkg_svc;
-
-  push @fixups, "pkg_svc$svcpart";
-
-  #unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) {
-  #dunno why...
-  unless ( 0 ) {
-    print '<TR>'; # if $count == 0 ;
-    print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=4 MAXLENGTH=3 VALUE="!,
-          $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0,
-          qq!"></TD><TD><A HREF="part_svc.cgi?!,$part_svc->svcpart,
-          qq!">!, $part_svc->getfield('svc'), "</A></TD></TR>";
-#    print "</TABLE></TD><TD>$thead" if ++$count == int(scalar(@part_svc) / 2);
-    $count+=1;
-    foreach ( 1 .. $columns-1 ) {
-      print "</TABLE></TD><TD VALIGN=\"top\">$thead"
-        if $count == int( $_ * scalar(@part_svc) / $columns );
-    }
-  } else {
-    print qq!<INPUT TYPE="hidden" NAME="pkg_svc$svcpart" VALUE="!,
-          $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0, qq!">\n!;
-  }
-}
-
-#unless ( $cgi->param('clone') ) {
-#dunno why...
-unless ( 0 ) {
-  print "</TR></TABLE></TD></TR></TABLE>";
-  #print "</TR></TABLE>";
-}
-
-foreach my $f ( qw( clone pkgnum ) ) {
-  print qq!<INPUT TYPE="hidden" NAME="$f" VALUE="!. $cgi->param($f). '">';
-}
-print '<INPUT TYPE="hidden" NAME="pkgpart" VALUE="'. $part_pkg->pkgpart. '">';
-
-# prolly should be in database
-tie my %plans, 'Tie::IxHash',
-  'flat' => {
-    'name' => 'Flat rate (anniversary billing)',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                      },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => 'what.recur_fee.value',
-  },
-
-  'flat_delayed' => {
-    'name' => 'Free for X days, then flat rate (anniversary billing)',
-    'fields' =>  {
-      'free_days' => { 'name' => 'Initial free days',
-                       'default' => 0,
-                     },
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                      },
-    },
-    'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee' ],
-    'setup' => '\'my $d = $cust_pkg->bill || $time; $d += 86400 * \' + what.free_days.value + \'; $cust_pkg->bill($d); $cust_pkg_mod_flag=1; \' + what.setup_fee.value',
-    'recur' => 'what.recur_fee.value',
-  },
-
-  'prorate' => {
-    'name' => 'First partial month pro-rated, then flat-rate (1st of month billing)',
-    'fields' =>  {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                      },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; my $mstart = timelocal(0,0,0,1,$mon,$year); my $mend = timelocal(0,0,0,1, $mon == 11 ? 0 : $mon+1, $year+($mon==11)); $sdate = $mstart; ( $part_pkg->freq - 1 ) * \' + what.recur_fee.value + \' / $part_pkg->freq + \' + what.recur_fee.value + \' / $part_pkg->freq * ($mend-$mnow) / ($mend-$mstart) ; \'',
-  },
-
-  'subscription' => {
-    'name' => 'First partial month full charge, then flat-rate (1st of month billing)',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                      },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; $sdate = timelocal(0,0,0,1,$mon,$year); \' + what.recur_fee.value',
-  },
-
-  'flat_comission_cust' => {
-    'name' => 'Flat rate with recurring commission per active customer',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                     },
-      'comission_amount' => { 'name' => 'Commission amount per month (per active customer)',
-                              'default' => 0,
-                            },
-      'comission_depth'  => { 'name' => 'Number of layers',
-                              'default' => 1,
-                            },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_main_ncancelled(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
-  },
-
-  'flat_comission' => {
-    'name' => 'Flat rate with recurring commission per (any) active package',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                     },
-      'comission_amount' => { 'name' => 'Commission amount per month (per active package)',
-                              'default' => 0,
-                            },
-      'comission_depth'  => { 'name' => 'Number of layers',
-                              'default' => 1,
-                            },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
-  },
-
-  'flat_comission_pkg' => {
-    'name' => 'Flat rate with recurring commission per (selected) active package',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                     },
-      'comission_amount' => { 'name' => 'Commission amount per month (per uncancelled package)',
-                              'default' => 0,
-                            },
-      'comission_depth'  => { 'name' => 'Number of layers',
-                              'default' => 1,
-                            },
-      'comission_pkgpart' => { 'name' => 'Applicable packages<BR><FONT SIZE="-1">(hold <b>ctrl</b> to select multiple packages)</FONT>',
-                               'type' => 'select_multiple',
-                               'select_table' => 'part_pkg',
-                               'select_hash'  => { 'disabled' => '' } ,
-                               'select_key'   => 'pkgpart',
-                               'select_label' => 'pkg',
-                             },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount', 'comission_pkgpart' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '""; var pkgparts = ""; for ( var c=0; c < document.flat_comission_pkg.comission_pkgpart.options.length; c++ ) { if (document.flat_comission_pkg.comission_pkgpart.options[c].selected) { pkgparts = pkgparts + document.flat_comission_pkg.comission_pkgpart.options[c].value + \', \'; } } what.recur.value = \'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar( grep { my $pkgpart = $_->pkgpart; grep { $_ == $pkgpart } ( \' + pkgparts + \'  ) } $cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
-  },
-
-
-
-  'sesmon_hour' => {
-    'name' => 'Base charge plus charge per-hour from the session monitor',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_flat' => { 'name' => 'Base monthly charge for this package',
-                        'default' => 0,
-                      },
-      'recur_included_hours' => { 'name' => 'Hours included',
-                                  'default' => 0,
-                                },
-      'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
-                                 'default' => 0,
-                               },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $hours = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
-  },
-
-  'sesmon_minute' => {
-    'name' => 'Base charge plus charge per-minute from the session monitor',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_flat' => { 'name' => 'Base monthly charge for this package',
-                        'default' => 0,
-                      },
-      'recur_included_min' => { 'name' => 'Minutes included',
-                                'default' => 0,
-                                },
-      'recur_minly_charge' => { 'name' => 'Additional charge per minute',
-                                'default' => 0,
-                              },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_min', 'recur_minly_charge' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $min = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_flat.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
-
-  },
-
-;
-
-my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
-                    split("\n", $part_pkg->plandata );
-
-tie my %options, 'Tie::IxHash', map { $_=>$plans{$_}->{'name'} } keys %plans;
-
-my @form_select = ();
-if ( $conf->exists('enable_taxclasses') ) {
-  push @form_select, 'taxclass';
-} else {
-  push @fixups, 'taxclass'; #hidden
-}
-
-
-my $widget = new HTML::Widgets::SelectLayers(
-  'selected_layer' => $part_pkg->plan,
-  'options'        => \%options,
-  'form_name'      => 'dummy',
-  'form_action'    => 'process/part_pkg.cgi',
-  'form_text'      => [ qw(pkg comment freq clone pkgnum pkgpart), @fixups ],
-  'form_checkbox'  => [ qw(setuptax recurtax disabled) ],
-  'form_select'    => [ @form_select ],
-  'fixup_callback' => sub {
-                        #my $ = @_;
-                        my $html = '';
-                        for my $p ( keys %plans ) {
-                          $html .= "if ( what.plan.value == \"$p\" ) {
-                                      what.setup.value = $plans{$p}->{setup} ;
-                                      what.recur.value = $plans{$p}->{recur} ;
-                                    }\n";
-                        }
-                        $html;
-                      },
-  'layer_callback' => sub {
-    my $layer = shift;
-    my $html = qq!<INPUT TYPE="hidden" NAME="plan" VALUE="$layer">!.
-               ntable("#cccccc",2);
-    my $href = $plans{$layer}->{'fields'};
-    foreach my $field ( exists($plans{$layer}->{'fieldorder'})
-                          ? @{$plans{$layer}->{'fieldorder'}}
-                          : keys %{ $href }
-                      ) {
-
-      $html .= '<TR><TD ALIGN="right">'. $href->{$field}{'name'}. '</TD><TD>';
-
-      if ( ! exists($href->{$field}{'type'}) ) {
-        $html .= qq!<INPUT TYPE="text" NAME="$field" VALUE="!.
-                 ( exists($plandata{$field})
-                     ? $plandata{$field}
-                     : $href->{$field}{'default'} ).
-                 qq!" onChange="fchanged(this)">!;
-      } elsif ( $href->{$field}{'type'} eq 'select_multiple' ) {
-        $html .= qq!<SELECT MULTIPLE NAME="$field" onChange="fchanged(this)">!;
-        foreach my $record (
-          qsearch( $href->{$field}{'select_table'},
-                   $href->{$field}{'select_hash'}   )
-        ) {
-          my $value = $record->getfield($href->{$field}{'select_key'});
-          $html .= qq!<OPTION VALUE="$value"!.
-                   (  $plandata{$field} =~ /(^|, *)$value *(,|$)/
-                        ? ' SELECTED'
-                        : ''          ).
-                   '>'. $record->getfield($href->{$field}{'select_label'})
-        }
-        $html .= '</SELECT>';
-      }
-
-      $html .= '</TD></TR>';
-    }
-    $html .= '</TABLE>';
-
-    $html .= '<INPUT TYPE="hidden" NAME="plandata" VALUE="'.
-             join(',', keys %{ $href } ). '">'.
-             '<BR><BR>';
-             
-    $html .= '<INPUT TYPE="submit" VALUE="'.
-             ( $hashref->{pkgpart} ? "Apply changes" : "Add package" ).
-             '" onClick="fchanged(this)">';
-
-    $html .= '<BR><BR>don\'t edit this unless you know what you\'re doing '.
-             '<INPUT TYPE="button" VALUE="refresh expressions" '.
-               'onClick="fchanged(this)">'.
-             ntable("#cccccc",2).
-             '<TR><TD>'.
-             '<FONT SIZE="1">Setup expression<BR>'.
-             '<INPUT TYPE="text" NAME="setup" SIZE="160" VALUE="'.
-               $hashref->{setup}. '" onLoad="fchanged(this)">'.
-             '</FONT><BR>'.
-             '<FONT SIZE="1">Recurring espression<BR>'.
-             '<INPUT TYPE="text" NAME="recur" SIZE="160" VALUE="'.
-               $hashref->{recur}. '" onLoad="fchanged(this)">'.
-             '</FONT>'.
-             '</TR></TD>'.
-             '</TABLE>';
-
-    $html;
-
-  },
-);
-
-%>
-
-<BR>
-Price plan <%= $widget->html %>
-  </BODY>
-</HTML>
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
deleted file mode 100755
index f784dfa3e..000000000
--- a/httemplate/edit/part_referral.cgi
+++ /dev/null
@@ -1,48 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $part_referral;
-if ( $cgi->param('error') ) {
-  $part_referral = new FS::part_referral ( {
-    map { $_, scalar($cgi->param($_)) } fields('part_referral')
-  } );
-} elsif ( $cgi->keywords ) {
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $part_referral = qsearchs( 'part_referral', { 'refnum' => $1 } );
-} else { #adding
-  $part_referral = new FS::part_referral {};
-}
-my $action = $part_referral->refnum ? 'Edit' : 'Add';
-my $hashref = $part_referral->hashref;
-
-my $p1 = popurl(1);
-print header("$action Advertising source", menubar(
-  'Main Menu' => popurl(2),
-  'View all advertising sources' => popurl(2). "browse/part_referral.cgi",
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print qq!<FORM ACTION="${p1}process/part_referral.cgi" METHOD=POST>!;
-
-print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$hashref->{refnum}">!;
-#print "Referral #", $hashref->{refnum} ? $hashref->{refnum} : "(NEW)";
-
-print <<END;
-Advertising source <INPUT TYPE="text" NAME="referral" SIZE=32 VALUE="$hashref->{referral}">
-END
-
-print qq!<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{refnum} ? "Apply changes" : "Add advertising source",
-      qq!">!;
-
-print <<END;
-    </FORM>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
deleted file mode 100755
index 4ccb770fb..000000000
--- a/httemplate/edit/part_svc.cgi
+++ /dev/null
@@ -1,232 +0,0 @@
-<!-- mason kludge -->
-<% 
-   my $part_svc;
-   my $clone = '';
-   if ( $cgi->param('error') ) { #error
-     $part_svc = new FS::part_svc ( {
-       map { $_, scalar($cgi->param($_)) } fields('part_svc')
-     } );
-   } elsif ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {#clone
-     #$cgi->param('clone') =~ /^(\d+)$/ or die "malformed query: $query";
-     $part_svc = qsearchs('part_svc', { 'svcpart'=>$1 } )
-       or die "unknown svcpart: $1";
-     $clone = $part_svc->svcpart;
-     $part_svc->svcpart('');
-   } elsif ( $cgi->keywords ) { #edit
-     my($query) = $cgi->keywords;
-     $query =~ /^(\d+)$/ or die "malformed query: $query";
-     $part_svc=qsearchs('part_svc', { 'svcpart'=>$1 } )
-       or die "unknown svcpart: $1";
-   } else { #adding
-     $part_svc = new FS::part_svc {};
-   }
-   my $action = $part_svc->svcpart ? 'Edit' : 'Add';
-   my $hashref = $part_svc->hashref;
-#   my $p_svcdb = $part_svc->svcdb || 'svc_acct';
-
-
-           #" onLoad=\"visualize()\""
-%>
-
-<%= header("$action Service Definition",
-           menubar( 'Main Menu'         => $p,
-                    'View all service definitions' => "${p}browse/part_svc.cgi"
-                  ),
-           )
-%>
-
-<% if ( $cgi->param('error') ) { %>
-<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
-<% } %>
-
-<FORM NAME="dummy">
-
-      Service Part #<%= $part_svc->svcpart ? $part_svc->svcpart : "(NEW)" %>
-<BR><BR>
-Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>"><BR>
-Disable new orders <INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref->{disabled} eq 'Y' ? ' CHECKED' : '' %>><BR>
-<INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $hashref->{svcpart} %>">
-<BR>
-Services are items you offer to your customers.
-<UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
-    <LI>svc_domain - Domains
-    <LI>svc_acct_sm - <B>deprecated</B> (use svc_forward for new installations) Virtual domain mail aliasing.
-    <LI>svc_forward - mail forwarding
-    <LI>svc_www - Virtual domain website
-<!--   <LI>svc_charge - One-time charges (Partially unimplemented)
-       <LI>svc_wo - Work orders (Partially unimplemented)
--->
-</UL>
-For the selected table, you can give fields default or fixed (unchangable)
-values.  For example, a SLIP/PPP account may have a default (or perhaps fixed)
-<B>slipip</B> of <B>0.0.0.0</B>, while a POP mailbox will probably have a fixed
-blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
-<B>/usr/bin/passwd</B>.
-<BR><BR>
-
-<%
-#these might belong somewhere else for other user interfaces 
-#pry need to eventually create stuff that's shared amount UIs
-my %defs = (
-  'svc_acct' => {
-    'dir'       => 'Home directory',
-    'uid'       => 'UID (set to fixed and blank for dial-only)',
-    'slipip'    => 'IP address (Set to fixed and blank to disable dialin, or, set a value to be exported to RADIUS Framed-IP-Address.  Use the special value <code>0e0</code> [zero e zero] to enable export to RADIUS without a Framed-IP-Address.)',
-#    'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
-    'popnum'    => {
-                     desc => 'Access number',
-                     type => 'select',
-                     select_table => 'svc_acct_pop',
-                     select_key   => 'popnum',
-                     select_label => 'city',
-                   },
-    'username'  => 'Username',
-    'quota'     => '',
-    '_password' => 'Password',
-    'gid'       => 'GID (when blank, defaults to UID)',
-    'shell'     => 'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file)',
-    'finger'    => 'GECOS',
-    'domsvc'    => {
-                     desc =>'svcnum from svc_domain',
-                     type =>'select',
-                     select_table => 'svc_domain',
-                     select_key   => 'svcnum',
-                     select_label => 'domain',
-                   },
-    'usergroup' => {
-                     desc =>'ICRADIUS/FreeRADIUS groups',
-                     type =>'radius_usergroup_selector',
-                   },
-  },
-  'svc_domain' => {
-    'domain'    => 'Domain',
-  },
-  'svc_acct_sm' => {
-    'domuser'   => 'domuser@virtualdomain.com',
-    'domuid'    => 'UID where domuser@virtualdomain.com mail is forwarded',
-    'domsvc'    => 'svcnum from svc_domain for virtualdomain.com',
-  },
-  'svc_forward' => {
-    'srcsvc'    => 'service from which mail is to be forwarded',
-    'dstsvc'    => 'service to which mail is to be forwarded',
-    'dst'       => 'someone@another.domain.com to use when dstsvc is 0',
-  },
-  'svc_charge' => {
-    'amount'    => 'amount',
-  },
-  'svc_wo' => {
-    'worker'    => 'Worker',
-    '_date'      => 'Date',
-  },
-  'svc_www' => {
-    #'recnum' => '',
-    #'usersvc' => '',
-  },
-);
-
-  my @dbs = $hashref->{svcdb}
-             ? ( $hashref->{svcdb} )
-             : qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www );
-
-  tie my %svcdb, 'Tie::IxHash', map { $_=>$_ } @dbs;
-  my $widget = new HTML::Widgets::SelectLayers(
-    #'selected_layer' => $p_svcdb,
-    'selected_layer' => $hashref->{svcdb} || 'svc_acct',
-    'options'        => \%svcdb,
-    'form_name'      => 'dummy',
-    'form_action'    => 'process/part_svc.cgi',
-    'form_text'      => [ qw( svc svcpart ) ],
-    'form_checkbox'  => [ 'disabled' ],
-    'layer_callback' => sub {
-      my $layer = shift;
-      my $html = qq!<INPUT TYPE="hidden" NAME="svcdb" VALUE="$layer">!;
-
-      my $columns = 3;
-      my $count = 0;
-      my @part_export =
-        map { qsearch( 'part_export', {exporttype => $_ } ) }
-          keys %{FS::part_export::export_info($layer)};
-     $html .= '<BR><BR>'. table().
-               table(). "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
-      foreach my $part_export ( @part_export ) {
-        $html .= '<TD><INPUT TYPE="checkbox"'.
-                 ' NAME="exportnum'. $part_export->exportnum. '"  VALUE="1" ';
-        $html .= 'CHECKED'
-          if qsearchs( 'export_svc', {
-                                   exportnum => $part_export->exportnum,
-                                   svcpart   => $clone || $part_svc->svcpart });
-        $html .= '> '. $part_export->exporttype. ' to '. $part_export->machine.
-                 '</TD>';
-        $count++;
-        $html .= '</TR><TR>' unless $count % $columns;
-      }
-      $html .= '</TR></TABLE><BR><BR>';
-
-      $html .=  table(). "<TH>Field</TH><TH COLSPAN=2>Modifier</TH>";
-      #yucky kludge
-      my @fields = defined( $FS::Record::dbdef->table($layer) )
-                      ? grep { $_ ne 'svcnum' } fields($layer)
-                      : ();
-      push @fields, 'usergroup' if $layer eq 'svc_acct'; #kludge
-      $part_svc->svcpart($clone) if $clone; #haha, undone below
-      foreach my $field (@fields) {
-        my $part_svc_column = $part_svc->part_svc_column($field);
-        my $value = $cgi->param('error')
-                      ? $cgi->param("${layer}__${field}")
-                      : $part_svc_column->columnvalue;
-        my $flag = $cgi->param('error')
-                     ? $cgi->param("${layer}__${field}_flag")
-                     : $part_svc_column->columnflag;
-        my $def = $defs{$layer}{$field};
-        my $desc = ref($def) ? $def->{desc} : $def;
-        
-        $html .= "<TR><TD>$field";
-        $html .= "- <FONT SIZE=-1>$desc</FONT>" if $desc;
-        $html .=  "</TD>";
-        $html .=
-          qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE=""!.
-          ' CHECKED'x($flag eq ''). ">Off</TD>".
-          qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="D"!.
-          ' CHECKED'x($flag eq 'D'). ">Default ".
-          qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="F"!.
-          ' CHECKED'x($flag eq 'F'). ">Fixed ".
-          '<BR>';
-        if ( ref($def) ) {
-          if ( $def->{type} eq 'select' ) {
-            $html .= qq!<SELECT NAME="${layer}__${field}">!;
-            $html .= '<OPTION> </OPTION>' unless $value;
-            foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
-              my $rvalue = $record->getfield($def->{select_key});
-              $html .= qq!<OPTION VALUE="$rvalue"!.
-                       ( $rvalue==$value ? ' SELECTED>' : '>' ).
-                       $record->getfield($def->{select_label}). '</OPTION>';
-            }
-            $html .= '</SELECT>';
-          } elsif ( $def->{type} eq 'radius_usergroup_selector' ) {
-            $html .= FS::svc_acct::radius_usergroup_selector(
-              [ split(',', $value) ], "${layer}__${field}" );
-          } else {
-            $html .= '<font color="#ff0000">unknown type'. $def->{type};
-          }
-        } else {
-          $html .=
-            qq!<INPUT TYPE="text" NAME="${layer}__${field}" VALUE="$value">!;
-        }
-        $html .= "</TD></TR>\n";
-      }
-      $part_svc->svcpart('') if $clone; #undone
-      $html .= "</TABLE>";
-
-      $html .= '<BR><INPUT TYPE="submit" VALUE="'.
-               ($hashref->{svcpart} ? 'Apply changes' : 'Add service'). '">';
-
-      $html;
-
-    },
-  );
-
-%>
-Table <%= $widget->html %>
-  </BODY>
-</HTML>
-
diff --git a/httemplate/edit/process/REAL_cust_pkg.cgi b/httemplate/edit/process/REAL_cust_pkg.cgi
deleted file mode 100755
index 2e0352c76..000000000
--- a/httemplate/edit/process/REAL_cust_pkg.cgi
+++ /dev/null
@@ -1,20 +0,0 @@
-<%
-
-my $pkgnum = $cgi->param('pkgnum') or die;
-my $old = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-my %hash = $old->hash;
-$hash{'setup'} = $cgi->param('setup') ? str2time($cgi->param('setup')) : '';
-$hash{'bill'} = $cgi->param('bill') ? str2time($cgi->param('bill')) : '';
-$hash{'expire'} = $cgi->param('expire') ? str2time($cgi->param('expire')) : '';
-my $new = new FS::cust_pkg \%hash;
-
-my $error = $new->replace($old);
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "REAL_cust_pkg.cgi?". $cgi->query_string );
-} else { 
-  print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?". $pkgnum);
-}
-
-%>
diff --git a/httemplate/edit/process/agent.cgi b/httemplate/edit/process/agent.cgi
deleted file mode 100755
index 182eeab41..000000000
--- a/httemplate/edit/process/agent.cgi
+++ /dev/null
@@ -1,28 +0,0 @@
-<%
-
-my $agentnum = $cgi->param('agentnum');
-
-my $old = qsearchs('agent',{'agentnum'=>$agentnum}) if $agentnum;
-
-my $new = new FS::agent ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('agent')
-} );
-
-my $error;
-if ( $agentnum ) {
-  $error=$new->replace($old);
-} else {
-  $error=$new->insert;
-  $agentnum=$new->getfield('agentnum');
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "agent.cgi?". $cgi->query_string );
-} else { 
-  print $cgi->redirect(popurl(3). "browse/agent.cgi");
-}
-
-%>
diff --git a/httemplate/edit/process/agent_type.cgi b/httemplate/edit/process/agent_type.cgi
deleted file mode 100755
index 516594573..000000000
--- a/httemplate/edit/process/agent_type.cgi
+++ /dev/null
@@ -1,55 +0,0 @@
-<%
-
-my $typenum = $cgi->param('typenum');
-my $old = qsearchs('agent_type',{'typenum'=>$typenum}) if $typenum;
-
-my $new = new FS::agent_type ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('agent_type')
-} );
-
-my $error;
-if ( $typenum ) {
-  $error=$new->replace($old);
-} else {
-  $error=$new->insert;
-  $typenum=$new->getfield('typenum');
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "agent_type.cgi?". $cgi->query_string );
-} else {
-
-  #false laziness w/ edit/process/part_svc.cgi
-  foreach my $part_pkg (qsearch('part_pkg',{})) {
-    my($pkgpart)=$part_pkg->getfield('pkgpart');
-
-    my($type_pkgs)=qsearchs('type_pkgs',{
-        'typenum' => $typenum,
-        'pkgpart' => $pkgpart,
-    });
-    if ( $type_pkgs && ! $cgi->param("pkgpart$pkgpart") ) {
-      my($d_type_pkgs)=$type_pkgs; #need to save $type_pkgs for below.
-      $error=$d_type_pkgs->delete;
-      die $error if $error;
-
-    } elsif ( $cgi->param("pkgpart$pkgpart")
-              && ! $type_pkgs
-    ) {
-      #ok to clobber it now (but bad form nonetheless?)
-      $type_pkgs=new FS::type_pkgs ({
-        'typenum' => $typenum,
-        'pkgpart' => $pkgpart,
-      });
-      $error= $type_pkgs->insert;
-      die $error if $error;
-    }
-
-  }
-
-  print $cgi->redirect(popurl(3). "browse/agent_type.cgi");
-}
-
-%>
diff --git a/httemplate/edit/process/cust_bill_pay.cgi b/httemplate/edit/process/cust_bill_pay.cgi
deleted file mode 100755
index 0c33506a8..000000000
--- a/httemplate/edit/process/cust_bill_pay.cgi
+++ /dev/null
@@ -1,31 +0,0 @@
-<%
-
-$cgi->param('paynum') =~ /^(\d*)$/ or die "Illegal paynum!";
-my $paynum = $1;
-
-my $cust_pay = qsearchs('cust_pay', { 'paynum' => $paynum } )
-  or die "No such paynum";
-
-my $cust_main = qsearchs('cust_main', { 'custnum' => $cust_pay->custnum } )
-  or die "Bogus credit:  not attached to customer";
-
-my $custnum = $cust_main->custnum;
-
-my $new = new FS::cust_bill_pay ( {
-  map {
-    $_, scalar($cgi->param($_));
-  #} qw(custnum _date amount invnum)
-  } fields('cust_bill_pay')
-} );
-
-my $error = $new->insert;
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "cust_bill_pay.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
-}
-
-
-%>
diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
deleted file mode 100755
index ac92631f8..000000000
--- a/httemplate/edit/process/cust_credit.cgi
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-
-$cgi->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
-my $custnum = $1;
-
-$cgi->param('otaker',getotaker);
-
-my $new = new FS::cust_credit ( {
-  map {
-    $_, scalar($cgi->param($_));
-  #} qw(custnum _date amount otaker reason)
-  } fields('cust_credit')
-} );
-
-my $error = $new->insert;
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "cust_credit.cgi?". $cgi->query_string );
-} else {
-  if ( $cgi->param('apply') eq 'yes' ) {
-    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum })
-      or die "unknown custnum $custnum";
-    $cust_main->apply_credits;
-  }
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
-}
-
-
-%>
diff --git a/httemplate/edit/process/cust_credit_bill.cgi b/httemplate/edit/process/cust_credit_bill.cgi
deleted file mode 100755
index 23e2e6ce5..000000000
--- a/httemplate/edit/process/cust_credit_bill.cgi
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-
-$cgi->param('crednum') =~ /^(\d*)$/ or die "Illegal crednum!";
-my $crednum = $1;
-
-my $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } )
-  or die "No such crednum";
-
-my $cust_main = qsearchs('cust_main', { 'custnum' => $cust_credit->custnum } )
-  or die "Bogus credit:  not attached to customer";
-
-my $custnum = $cust_main->custnum;
-
-my $new;
-if ($cgi->param('invnum') =~ /^Refund$/) {
-  $new = new FS::cust_refund ( {
-    'reason'  => $cust_credit->reason,
-    'refund'  => $cgi->param('amount'),
-    'payby'   => 'BILL',
-    #'_date'   => $cgi->param('_date'),
-    'payinfo' => 'Cash',
-    'crednum' => $crednum,
-  } );
-} else {
-  $new = new FS::cust_credit_bill ( {
-    map {
-      $_, scalar($cgi->param($_));
-    #} qw(custnum _date amount invnum)
-    } fields('cust_credit_bill')
-  } );
-}
-
-my $error = $new->insert;
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "cust_credit_bill.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
-}
-
-
-%>
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
deleted file mode 100755
index 6ce60d14a..000000000
--- a/httemplate/edit/process/cust_main.cgi
+++ /dev/null
@@ -1,119 +0,0 @@
-<%
-
-my $error = '';
-
-#unmunge stuff
-
-$cgi->param('tax','') unless defined $cgi->param('tax');
-
-$cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
-
-my $payby = $cgi->param('payby');
-if ( $payby ) {
-  $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
-  $cgi->param('paydate',
-  $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
-  $cgi->param('payname', $cgi->param( $payby. '_payname' ) );
-}
-
-$cgi->param('otaker', &getotaker );
-
-my @invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
-push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
-
-#create new record object
-
-my $new = new FS::cust_main ( {
-  map {
-    $_, scalar($cgi->param($_))
-#  } qw(custnum agentnum last first ss company address1 address2 city county
-#       state zip daytime night fax payby payinfo paydate payname tax
-#       otaker refnum)
-  } fields('cust_main')
-} );
-
-if ( defined($cgi->param('same')) && $cgi->param('same') eq "Y" ) {
-  $new->setfield("ship_$_", '') foreach qw(
-    last first company address1 address2 city county state zip
-    country daytime night fax
-  );
-}
-
-#perhaps this stuff should go to cust_main.pm
-my $cust_pkg = '';
-my $svc_acct = '';
-if ( $new->custnum eq '' ) {
-
-  if ( $cgi->param('pkgpart_svcpart') ) {
-    my $x = $cgi->param('pkgpart_svcpart');
-    $x =~ /^(\d+)_(\d+)$/;
-    my($pkgpart, $svcpart) = ($1, $2);
-    #false laziness: copied from FS::cust_pkg::order (which should become a
-    #FS::cust_main method)
-    my(%part_pkg);
-    # generate %part_pkg
-    # $part_pkg{$pkgpart} is true iff $custnum may purchase $pkgpart
-    my $agent = qsearchs('agent',{'agentnum'=> $new->agentnum });
-    	#my($type_pkgs);
-    	#foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
-    	#  my($pkgpart)=$type_pkgs->pkgpart;
-    	#  $part_pkg{$pkgpart}++;
-    	#}
-    # $pkgpart_href->{PKGPART} is true iff $custnum may purchase $pkgpart
-    my $pkgpart_href = $agent->pkgpart_hashref;
-    #eslaf
-
-    # this should wind up in FS::cust_pkg!
-    $error ||= "Agent ". $new->agentnum. " (type ". $agent->typenum. ") can't".
-               "purchase pkgpart ". $pkgpart
-      #unless $part_pkg{ $pkgpart };
-      unless $pkgpart_href->{ $pkgpart };
-
-    $cust_pkg = new FS::cust_pkg ( {
-      #later         'custnum' => $custnum,
-      'pkgpart' => $pkgpart,
-    } );
-    $error ||= $cust_pkg->check;
-
-    #$cust_svc = new FS::cust_svc ( { 'svcpart' => $svcpart } );
-
-    #$error ||= $cust_svc->check;
-
-    $svc_acct = new FS::svc_acct ( {
-                                     'svcpart'   => $svcpart,
-                                     'username'  => $cgi->param('username'),
-                                     '_password' => $cgi->param('_password'),
-                                     'popnum'    => $cgi->param('popnum'),
-                                   } );
-
-    my $y = $svc_acct->setdefault; # arguably should be in new method
-    $error ||= $y unless ref($y);
-    #and just in case you were silly
-    $svc_acct->svcpart($svcpart);
-    $svc_acct->username($cgi->param('username'));
-    $svc_acct->_password($cgi->param('_password'));
-    $svc_acct->popnum($cgi->param('popnum'));
-
-    $error ||= $svc_acct->check;
-
-  } elsif ( $cgi->param('username') ) { #good thing to catch
-    $error = "Can't assign username without a package!";
-  }
-
-  use Tie::RefHash;
-  tie my %hash, 'Tie::RefHash';
-  %hash = ( $cust_pkg => [ $svc_acct ] ) if $cust_pkg;
-  $error ||= $new->insert( \%hash, \@invoicing_list );
-} else { #create old record object
-  my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } ); 
-  $error ||= "Old record not found!" unless $old;
-  $error ||= $new->replace($old, \@invoicing_list);
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "cust_main.cgi?". $cgi->query_string );
-} else { 
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new->custnum);
-} 
-%>
diff --git a/httemplate/edit/process/cust_main_county-collapse.cgi b/httemplate/edit/process/cust_main_county-collapse.cgi
deleted file mode 100755
index 8e67140a8..000000000
--- a/httemplate/edit/process/cust_main_county-collapse.cgi
+++ /dev/null
@@ -1,35 +0,0 @@
-<%
-
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/ or die "Illegal taxnum!";
-my $taxnum = $1;
-my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
-  or die ("Unknown taxnum!");
-
-#really should do this in a .pm & start transaction
-
-foreach my $delete ( qsearch('cust_main_county', {
-                    'country' => $cust_main_county->country,
-                    'state' => $cust_main_county->state  
-                 } ) ) {
-#  unless ( qsearch('cust_main',{
-#    'state'  => $cust_main_county->getfield('state'),
-#    'county' => $cust_main_county->getfield('county'),
-#    'country' =>  $cust_main_county->getfield('country'),
-#  } ) ) {
-    my $error = $delete->delete;
-    die $error if $error;
-#  } else {
-    #should really fix the $cust_main record
-#  }
-
-}
-
-$cust_main_county->taxnum('');
-$cust_main_county->county('');
-my $error = $cust_main_county->insert;
-die $error if $error;
-
-print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi");
-
-%>
diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
deleted file mode 100755
index a452711c1..000000000
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ /dev/null
@@ -1,58 +0,0 @@
-<%
-
-$cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
-my $taxnum = $1;
-my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
-  or die ("Unknown taxnum!");
-
-my @expansion;
-if ( $cgi->param('delim') eq 'n' ) {
-  @expansion=split(/\n/,$cgi->param('expansion'));
-} elsif ( $cgi->param('delim') eq 's' ) {
-  @expansion=split(' ',$cgi->param('expansion'));
-} else {
-  die "Illegal delim!";
-}
-
-@expansion=map {
-  unless ( /^\s*([\w\- ]+)\s*$/ ) {
-    $cgi->param('error', "Illegal item in expansion");
-    print $cgi->redirect(popurl(2). "cust_main_county-expand.cgi?". $cgi->query_string );
-    myexit();
-  }
-  $1;
-} @expansion;
-
-foreach ( @expansion) {
-  my(%hash)=$cust_main_county->hash;
-  my($new)=new FS::cust_main_county \%hash;
-  $new->setfield('taxnum','');
-  if ( $cgi->param('taxclass') ) {
-    $new->setfield('taxclass', $_);
-  } elsif ( ! $cust_main_county->state ) {
-    $new->setfield('state',$_);
-  } else {
-    $new->setfield('county',$_);
-  }
-  #if (datasrc =~ m/Pg/)
-  #{
-  #    $new->setfield('tax',0.0);
-  #}
-  my($error)=$new->insert;
-  die $error if $error;
-}
-
-unless ( qsearch( 'cust_main', {
-                                 'state'  => $cust_main_county->state,
-                                 'county' => $cust_main_county->county,
-                                 'country' =>  $cust_main_county->country,
-                               } )
-         || ! @expansion
-) {
-  my($error)=($cust_main_county->delete);
-  die $error if $error;
-}
-
-print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi");
-
-%>
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
deleted file mode 100755
index 990a23919..000000000
--- a/httemplate/edit/process/cust_main_county.cgi
+++ /dev/null
@@ -1,25 +0,0 @@
-<%
-
-foreach ( grep { /^tax\d+$/ } $cgi->param ) {
-  /^tax(\d+)$/ or die "Illegal form $_!";
-  my($taxnum)=$1;
-  my($old)=qsearchs('cust_main_county',{'taxnum'=>$taxnum})
-    or die "Couldn't find taxnum $taxnum!";
-  my $exempt_amount = $cgi->param("exempt_amount$taxnum");
-  next unless $old->tax ne $cgi->param("tax$taxnum")
-              || $old->exempt_amount ne $exempt_amount;
-  my %hash = $old->hash;
-  $hash{tax} = $cgi->param("tax$taxnum");
-  $hash{exempt_amount} = $exempt_amount;
-  my($new)=new FS::cust_main_county \%hash;
-  my($error)=$new->replace($old);
-  if ( $error ) {
-    $cgi->param('error', $error);
-    print $cgi->redirect(popurl(2). "cust_main_county.cgi?". $cgi->query_string );
-    myexit();
-  }
-}
-
-print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi");
-
-%>
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
deleted file mode 100755
index 82442ae00..000000000
--- a/httemplate/edit/process/cust_pay.cgi
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-
-$cgi->param('linknum') =~ /^(\d+)$/
-  or die "Illegal linknum: ". $cgi->param('linknum');
-my $linknum = $1;
-
-$cgi->param('link') =~ /^(custnum|invnum)$/
-  or die "Illegal link: ". $cgi->param('link');
-my $link = $1;
-
-my $new = new FS::cust_pay ( {
-  $link => $linknum,
-  map {
-    $_, scalar($cgi->param($_));
-  } qw(paid _date payby payinfo paybatch)
-  #} fields('cust_pay')
-} );
-
-my $error = $new->insert;
-
-if ($error) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). 'cust_pay.cgi?'. $cgi->query_string );
-} elsif ( $link eq 'invnum' ) {
-  print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$linknum");
-} elsif ( $link eq 'custnum' ) {
-  if ( $cgi->param('apply') eq 'yes' ) {
-    my $cust_main = qsearchs('cust_main', { 'custnum' => $linknum })
-      or die "unknown custnum $linknum";
-    $cust_main->apply_payments;
-  }
-  if ( $cgi->param('quickpay') eq 'yes' ) {
-    print $cgi->redirect(popurl(3). "search/cust_main-quickpay.html");
-  } else {
-    print $cgi->redirect(popurl(3). "view/cust_main.cgi?$linknum");
-  }
-}
-
-%>
diff --git a/httemplate/edit/process/cust_pkg.cgi b/httemplate/edit/process/cust_pkg.cgi
deleted file mode 100755
index f8c9f5151..000000000
--- a/httemplate/edit/process/cust_pkg.cgi
+++ /dev/null
@@ -1,36 +0,0 @@
-<%
-
-my $error = '';
-
-#untaint custnum
-$cgi->param('custnum') =~ /^(\d+)$/;
-my $custnum = $1;
-
-my @remove_pkgnums = map {
-  /^(\d+)$/ or die "Illegal remove_pkg value!";
-  $1;
-} $cgi->param('remove_pkg');
-
-my @pkgparts;
-foreach my $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
-  if ( $cgi->param("pkg$pkgpart") =~ /^(\d+)$/ ) {
-    my $num_pkgs = $1;
-    while ( $num_pkgs-- ) {
-      push @pkgparts,$pkgpart;
-    }
-  } else {
-    $error = "Illegal quantity";
-    last;
-  }
-}
-
-$error ||= FS::cust_pkg::order($custnum,\@pkgparts,\@remove_pkgnums);
-
-if ($error) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "cust_pkg.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
-}
-
-%>
diff --git a/httemplate/edit/process/domain_record.cgi b/httemplate/edit/process/domain_record.cgi
deleted file mode 100755
index b8c3f62a1..000000000
--- a/httemplate/edit/process/domain_record.cgi
+++ /dev/null
@@ -1,34 +0,0 @@
-<%
-
-my $recnum = $cgi->param('recnum');
-
-my $old = qsearchs('agent',{'recnum'=>$recnum}) if $recnum;
-
-my $new = new FS::domain_record ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('domain_record')
-} );
-
-my $error;
-if ( $recnum ) {
-  $error=$new->replace($old);
-} else {
-  $error=$new->insert;
-  $recnum=$new->getfield('recnum');
-}
-
-if ( $error ) {
-#  $cgi->param('error', $error);
-#  print $cgi->redirect(popurl(2). "agent.cgi?". $cgi->query_string );
-  #no edit screen to send them back to
-%>
-<!-- mason kludge -->
-<%
-  eidiot($error);
-} else { 
-  my $svcnum = $new->svcnum;
-  print $cgi->redirect(popurl(3). "view/svc_domain.cgi?$svcnum");
-}
-
-%>
diff --git a/httemplate/edit/process/msgcat.cgi b/httemplate/edit/process/msgcat.cgi
deleted file mode 100644
index 1f94f6668..000000000
--- a/httemplate/edit/process/msgcat.cgi
+++ /dev/null
@@ -1,20 +0,0 @@
-<%
-
-my $error;
-foreach my $param ( grep { /^\d+$/ } $cgi->param ) {
-  my $old = qsearchs('msgcat', { msgnum=>$param } );
-  next if $old->msg eq $cgi->param($param); #no need to update identical records
-  my $new = new FS::msgcat { $old->hash };
-  $new->msg($cgi->param($param));
-  $error = $new->replace($old);
-  last if $error;
-}
-
-if ( $error ) {
-  $cgi->param('error',$error);
-  print $cgi->redirect($p. "msgcat.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "browse/msgcat.cgi");
-}
-
-%>
diff --git a/httemplate/edit/process/part_bill_event.cgi b/httemplate/edit/process/part_bill_event.cgi
deleted file mode 100755
index 4049ade80..000000000
--- a/httemplate/edit/process/part_bill_event.cgi
+++ /dev/null
@@ -1,53 +0,0 @@
-<%
-
-my $eventpart = $cgi->param('eventpart');
-
-my $old = qsearchs('part_bill_event',{'eventpart'=>$eventpart}) if $eventpart;
-
-#s/days/seconds/
-$cgi->param('seconds', $cgi->param('days') * 86400 );
-
-my $error;
-if ( ! $cgi->param('plan_weight_eventcode') ) {
-  $error = "Must select an action";
-} else {
-
-  $cgi->param('plan_weight_eventcode') =~ /^([\w\-]+):(\d+):(.*)$/
-    or die "illegal plan_weight_eventcode:".
-           $cgi->param('plan_weight_eventcode');
-  $cgi->param('plan', $1);
-  $cgi->param('weight', $2);
-  my $eventcode = $3;
-  my $plandata = '';
-  while ( $eventcode =~ /%%%(\w+)%%%/ ) {
-    my $field = $1;
-    my $value = $cgi->param($field);
-    $eventcode =~ s/%%%$field%%%/$value/;
-    $plandata .= "$field $value\n";
-  }
-  $cgi->param('eventcode', $eventcode);
-  $cgi->param('plandata', $plandata);
-
-  my $new = new FS::part_bill_event ( {
-    map {
-      $_, scalar($cgi->param($_));
-    } fields('part_bill_event'),
-  } );
-
-  if ( $eventpart ) {
-    $error = $new->replace($old);
-  } else {
-    $error = $new->insert;
-    $eventpart = $new->getfield('eventpart');
-  }
-} 
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "part_bill_event.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3)."browse/part_bill_event.cgi");
-}
-
-%>
-
diff --git a/httemplate/edit/process/part_export.cgi b/httemplate/edit/process/part_export.cgi
deleted file mode 100644
index fa009edbb..000000000
--- a/httemplate/edit/process/part_export.cgi
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-
-my $exportnum = $cgi->param('exportnum');
-
-my $old = qsearchs('part_export', { 'exportnum'=>$exportnum } ) if $exportnum;
-
-#fixup options
-#warn join('-', split(',',$cgi->param('options')));
-my %options = map {
-  my $value = $cgi->param($_);
-  $value =~ s/\r\n/\n/g; #browsers? (textarea)
-  $_ => $value;
-} split(',', $cgi->param('options'));
-
-my $new = new FS::part_export ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('part_export')
-} );
-
-my $error;
-if ( $exportnum ) {
-  #warn $old;
-  #warn $exportnum;
-  #warn $new->machine;
-  $error = $new->replace($old,\%options);
-} else {
-  $error = $new->insert(\%options);
-#  $exportnum = $new->exportnum;
-}
-
-if ( $error ) {
-  $cgi->param('error', $error );
-  print $cgi->redirect(popurl(2). "part_export.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "browse/part_export.cgi");
-}
-
-%>
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
deleted file mode 100755
index d489426f9..000000000
--- a/httemplate/edit/process/part_pkg.cgi
+++ /dev/null
@@ -1,109 +0,0 @@
-<%
-
-my $dbh = dbh;
-
-my $pkgpart = $cgi->param('pkgpart');
-
-my $old = qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
-
-#fixup plandata
-my $plandata = $cgi->param('plandata');
-my @plandata = split(',', $plandata);
-$cgi->param('plandata', 
-  join('', map { "$_=". join(', ', $cgi->param($_)). "\n" } @plandata )
-);
-
-foreach (qw( setuptax recurtax disabled )) {
-  $cgi->param($_, '') unless defined $cgi->param($_);
-}
-
-my $new = new FS::part_pkg ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('part_pkg')
-} );
-
-#warn "setuptax: ". $new->setuptax;
-#warn "recurtax: ". $new->recurtax;
-
-#most of the stuff below should move to part_pkg.pm
-
-foreach my $part_svc ( qsearch('part_svc', {} ) ) {
-  my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
-  unless ( $quantity =~ /^(\d+)$/ ) {
-    $cgi->param('error', "Illegal quantity" );
-    print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
-    myexit();
-  }
-}
-
-local $SIG{HUP} = 'IGNORE';
-local $SIG{INT} = 'IGNORE';
-local $SIG{QUIT} = 'IGNORE';
-local $SIG{TERM} = 'IGNORE';
-local $SIG{TSTP} = 'IGNORE';
-local $SIG{PIPE} = 'IGNORE';
-
-local $FS::UID::AutoCommit = 0;
-
-my $error;
-if ( $pkgpart ) {
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-  $pkgpart=$new->pkgpart;
-}
-if ( $error ) {
-  $dbh->rollback;
-  $cgi->param('error', $error );
-  print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
-  myexit();
-}
-
-foreach my $part_svc (qsearch('part_svc',{})) {
-  my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
-  my $old_pkg_svc = qsearchs('pkg_svc', {
-    'pkgpart' => $pkgpart,
-    'svcpart' => $part_svc->svcpart,
-  } );
-  my $old_quantity = $old_pkg_svc ? $old_pkg_svc->quantity : 0;
-  next unless $old_quantity != $quantity; #!here
-  my $new_pkg_svc = new FS::pkg_svc( {
-    'pkgpart'  => $pkgpart,
-    'svcpart'  => $part_svc->svcpart,
-    'quantity' => $quantity, 
-  } );
-  if ( $old_pkg_svc ) {
-    my $myerror = $new_pkg_svc->replace($old_pkg_svc);
-    if ( $myerror ) {
-      $dbh->rollback;
-      die $myerror;
-    }
-  } else {
-    my $myerror = $new_pkg_svc->insert;
-    if ( $myerror ) {
-      $dbh->rollback;
-      die $myerror;
-    }
-  }
-}
-
-unless ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
-  $dbh->commit or die $dbh->errstr;
-  print $cgi->redirect(popurl(3). "browse/part_pkg.cgi");
-} else {
-  my($old_cust_pkg) = qsearchs( 'cust_pkg', { 'pkgnum' => $1 } );
-  my %hash = $old_cust_pkg->hash;
-  $hash{'pkgpart'} = $pkgpart;
-  my($new_cust_pkg) = new FS::cust_pkg \%hash;
-  my $myerror = $new_cust_pkg->replace($old_cust_pkg);
-  if ( $myerror ) {
-    $dbh->rollback;
-    die "Error modifying cust_pkg record: $myerror\n";
-  }
-
-  $dbh->commit or die $dbh->errstr;
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new_cust_pkg->custnum);
-}
-
-%>
diff --git a/httemplate/edit/process/part_referral.cgi b/httemplate/edit/process/part_referral.cgi
deleted file mode 100755
index fd2c01506..000000000
--- a/httemplate/edit/process/part_referral.cgi
+++ /dev/null
@@ -1,28 +0,0 @@
-<%
-
-my $refnum = $cgi->param('refnum');
-
-my $new = new FS::part_referral ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('part_referral')
-} );
-
-my $error;
-if ( $refnum ) {
-  my $old = qsearchs( 'part_referral', { 'refnum' =>$ refnum } );
-  die "(Old) Record not found!" unless $old;
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-}
-$refnum=$new->refnum;
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "part_referral.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "browse/part_referral.cgi");
-}
-
-%>
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
deleted file mode 100755
index 859670b17..000000000
--- a/httemplate/edit/process/part_svc.cgi
+++ /dev/null
@@ -1,62 +0,0 @@
-<%
-
-my $svcpart = $cgi->param('svcpart');
-
-my $old = qsearchs('part_svc',{'svcpart'=>$svcpart}) if $svcpart;
-
-$cgi->param( 'svc_acct__usergroup',
-             join(',', $cgi->param('svc_acct__usergroup') ) );
-
-my $new = new FS::part_svc ( {
-  map {
-    $_, scalar($cgi->param($_));
-#  } qw(svcpart svc svcdb)
-  } ( fields('part_svc'),
-      map { my $svcdb = $_;
-            my @fields = fields($svcdb);
-            push @fields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
-            map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  } @fields;
-          } grep defined( $FS::Record::dbdef->table($_) ),
-                 qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www )
-    )
-} );
-
-my $error;
-if ( $svcpart ) {
-  $error = $new->replace($old, '1.3-COMPAT', [ 'usergroup' ] );
-} else {
-  $error = $new->insert( [ 'usergroup' ] );
-  $svcpart=$new->getfield('svcpart');
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "part_svc.cgi?". $cgi->query_string );
-} else {
-
-  #false laziness w/ edit/process/agent_type.cgi
-  foreach my $part_export (qsearch('part_export',{})) {
-    my $exportnum = $part_export->exportnum;
-    my $export_svc = qsearchs('export_svc', {
-      'exportnum' => $part_export->exportnum,
-      'svcpart'   => $new->svcpart,
-    } );
-    if ( $export_svc && ! $cgi->param("exportnum". $part_export->exportnum) ) {
-      $error = $export_svc->delete;
-      die $error if $error;
-    } elsif ( $cgi->param("exportnum". $part_export->exportnum)
-              && ! $export_svc ) {
-      $export_svc = new FS::export_svc ( {
-        'exportnum' => $part_export->exportnum,
-        'svcpart'   => $new->svcpart,
-      } );
-      $error = $export_svc->insert;
-      die $error if $error;
-    }
-
-  }
-
-  print $cgi->redirect(popurl(3)."browse/part_svc.cgi");
-}
-
-%>
diff --git a/httemplate/edit/process/quick-charge.cgi b/httemplate/edit/process/quick-charge.cgi
deleted file mode 100644
index 477f58508..000000000
--- a/httemplate/edit/process/quick-charge.cgi
+++ /dev/null
@@ -1,32 +0,0 @@
-<%
-
-#untaint custnum
-$cgi->param('custnum') =~ /^(\d+)$/
-  or die 'illegal custnum '. $cgi->param('custnum');
-my $custnum = $1;
-
-$cgi->param('amount') =~ /^\s*(\d+(\.\d{1,2})?)\s*$/
-  or die 'illegal amount '. $cgi->param('amount');
-my $amount = $1;
-
-my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
-  or die "unknown custnum $custnum";
-
-my $error = $cust_main->charge(
-  $amount,
-  $cgi->param('pkg'),
-  '$'. sprintf("%.2f",$amount),
-  $cgi->param('taxclass')
-);
-
-if ($error) {
-%>
-<!-- mason kludge -->
-<%
-  eidiot($error);
-} else {
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum" );
-}
-
-%>
-
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
deleted file mode 100644
index a8f5b1453..000000000
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ /dev/null
@@ -1,24 +0,0 @@
-<%
-
-#untaint custnum
-$cgi->param('custnum') =~ /^(\d+)$/
-  or die 'illegal custnum '. $cgi->param('custnum');
-my $custnum = $1;
-$cgi->param('pkgpart') =~ /^(\d+)$/
-  or die 'illegal pkgpart '. $cgi->param('pkgpart');
-my $pkgpart = $1;
-
-my @cust_pkg = ();
-my $error = FS::cust_pkg::order($custnum, [ $pkgpart ], [], \@cust_pkg, );
-
-if ($error) {
-%>
-<!-- mason kludge -->
-<%
-  eidiot($error);
-} else {
-  print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?". $cust_pkg[0]->pkgnum );
-}
-
-%>
-
diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi
deleted file mode 100755
index 950a8602f..000000000
--- a/httemplate/edit/process/svc_acct.cgi
+++ /dev/null
@@ -1,49 +0,0 @@
-<%
-
-$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-my $svcnum = $1;
-
-my $old;
-if ( $svcnum ) {
-  $old = qsearchs('svc_acct', { 'svcnum' => $svcnum } )
-    or die "fatal: can't find account (svcnum $svcnum)!";
-} else {
-  $old = '';
-}
-
-#unmunge popnum
-$cgi->param('popnum', (split(/:/, $cgi->param('popnum') ))[0] );
-
-#unmunge passwd
-if ( $cgi->param('_password') eq '*HIDDEN*' ) {
-  die "fatal: no previous account to recall hidden password from!" unless $old;
-  $cgi->param('_password',$old->getfield('_password'));
-}
-
-#unmunge usergroup
-$cgi->param('usergroup', [ $cgi->param('radius_usergroup') ] );
-
-my $new = new FS::svc_acct ( {
-  map {
-    $_, scalar($cgi->param($_));
-  #} qw(svcnum pkgnum svcpart username _password popnum uid gid finger dir
-  #  shell quota slipip)
-  } ( fields('svc_acct'), qw( pkgnum svcpart usergroup ) )
-} );
-
-my $error;
-if ( $svcnum ) {
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-  $svcnum = $new->svcnum;
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "svc_acct.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/svc_acct.cgi?" . $svcnum );
-}
-
-%>
diff --git a/httemplate/edit/process/svc_acct_pop.cgi b/httemplate/edit/process/svc_acct_pop.cgi
deleted file mode 100755
index 46ad74d62..000000000
--- a/httemplate/edit/process/svc_acct_pop.cgi
+++ /dev/null
@@ -1,28 +0,0 @@
-<%
-
-my $popnum = $cgi->param('popnum');
-
-my $old = qsearchs('svc_acct_pop',{'popnum'=>$popnum}) if $popnum;
-
-my $new = new FS::svc_acct_pop ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('svc_acct_pop')
-} );
-
-my $error = '';
-if ( $popnum ) {
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-  $popnum=$new->getfield('popnum');
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "svc_acct_pop.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "browse/svc_acct_pop.cgi");
-}
-
-%>
diff --git a/httemplate/edit/process/svc_acct_sm.cgi b/httemplate/edit/process/svc_acct_sm.cgi
deleted file mode 100755
index 41d03fb92..000000000
--- a/httemplate/edit/process/svc_acct_sm.cgi
+++ /dev/null
@@ -1,34 +0,0 @@
-<%
-
-$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-my $svcnum =$1;
-
-my $old = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
-
-#unmunge domsvc and domuid
-#$cgi->param('domsvc',(split(/:/, $cgi->param('domsvc') ))[0] );
-#$cgi->param('domuid',(split(/:/, $cgi->param('domuid') ))[0] );
-
-my $new = new FS::svc_acct_sm ( {
-  map {
-    ($_, scalar($cgi->param($_)));
-  #} qw(svcnum pkgnum svcpart domuser domuid domsvc)
-  } ( fields('svc_acct_sm'), qw( pkgnum svcpart ) )
-} );
-
-my $error = '';
-if ( $svcnum ) {
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-  $svcnum = $new->getfield('svcnum');
-} 
-
-if ($error) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "svc_acct_sm.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/svc_acct_sm.cgi?$svcnum");
-}
-
-%>
diff --git a/httemplate/edit/process/svc_domain.cgi b/httemplate/edit/process/svc_domain.cgi
deleted file mode 100755
index 19f8eb4f8..000000000
--- a/httemplate/edit/process/svc_domain.cgi
+++ /dev/null
@@ -1,31 +0,0 @@
-<%
-
-#remove this to actually test the domains!
-$FS::svc_domain::whois_hack = 1;
-
-$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-my $svcnum = $1;
-
-my $new = new FS::svc_domain ( {
-  map {
-    $_, scalar($cgi->param($_));
-  #} qw(svcnum pkgnum svcpart domain action purpose)
-  } ( fields('svc_domain'), qw( pkgnum svcpart action purpose ) )
-} );
-
-my $error = '';
-if ($cgi->param('svcnum')) {
-  $error="Can't modify a domain!";
-} else {
-  $error=$new->insert;
-  $svcnum=$new->svcnum;
-}
-
-if ($error) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "svc_domain.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/svc_domain.cgi?$svcnum");
-}
-
-%>
diff --git a/httemplate/edit/process/svc_forward.cgi b/httemplate/edit/process/svc_forward.cgi
deleted file mode 100755
index bb066d8a6..000000000
--- a/httemplate/edit/process/svc_forward.cgi
+++ /dev/null
@@ -1,29 +0,0 @@
-<%
-
-$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-my $svcnum =$1;
-
-my $old = qsearchs('svc_forward',{'svcnum'=>$svcnum}) if $svcnum;
-
-my $new = new FS::svc_forward ( {
-  map {
-    ($_, scalar($cgi->param($_)));
-  } ( fields('svc_forward'), qw( pkgnum svcpart ) )
-} );
-
-my $error = '';
-if ( $svcnum ) {
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-  $svcnum = $new->getfield('svcnum');
-} 
-
-if ($error) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "svc_forward.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/svc_forward.cgi?$svcnum");
-}
-
-%>
diff --git a/httemplate/edit/process/svc_www.cgi b/httemplate/edit/process/svc_www.cgi
deleted file mode 100644
index 40913145a..000000000
--- a/httemplate/edit/process/svc_www.cgi
+++ /dev/null
@@ -1,36 +0,0 @@
-<%
-
-$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-my $svcnum = $1;
-
-my $old;
-if ( $svcnum ) {
-  $old = qsearchs('svc_www', { 'svcnum' => $svcnum } )
-    or die "fatal: can't find website (svcnum $svcnum)!";
-} else {
-  $old = '';
-}
-
-my $new = new FS::svc_www ( {
-  map {
-    ($_, scalar($cgi->param($_)));
-  #} qw(svcnum pkgnum svcpart recnum usersvc)
-  } ( fields('svc_www'), qw( pkgnum svcpart ) )
-} );
-
-my $error;
-if ( $svcnum ) {
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-  $svcnum = $new->svcnum;
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "svc_www.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/svc_www.cgi?" . $svcnum );
-}
-
-%>
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
deleted file mode 100755
index 90b26324a..000000000
--- a/httemplate/edit/svc_acct.cgi
+++ /dev/null
@@ -1,278 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $conf = new FS::Conf;
-my @shells = $conf->config('shells');
-
-my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct, @groups);
-if ( $cgi->param('error') ) {
-  $svc_acct = new FS::svc_acct ( {
-    map { $_, scalar($cgi->param($_)) } fields('svc_acct')
-  } );
-  $svcnum = $svc_acct->svcnum;
-  $pkgnum = $cgi->param('pkgnum');
-  $svcpart = $cgi->param('svcpart');
-  $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
-  die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
-  @groups = $cgi->param('radius_usergroup');
-} else {
-  my($query) = $cgi->keywords;
-  if ( $query =~ /^(\d+)$/ ) { #editing
-    $svcnum=$1;
-    $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svcnum})
-      or die "Unknown (svc_acct) svcnum!";
-
-    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-      or die "Unknown (cust_svc) svcnum!";
-
-    $pkgnum=$cust_svc->pkgnum;
-    $svcpart=$cust_svc->svcpart;
-
-    $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
-    die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
-
-    @groups = $svc_acct->radius_groups;
-
-  } else { #adding
-
-    $svc_acct = new FS::svc_acct({}); 
-
-    foreach $_ (split(/-/,$query)) {
-      $pkgnum=$1 if /^pkgnum(\d+)$/;
-      $svcpart=$1 if /^svcpart(\d+)$/;
-    }
-    $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
-    die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
-
-    $svcnum='';
-
-    #set gecos
-    my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-    if ($cust_pkg) {
-      my($cust_main)=qsearchs('cust_main',{'custnum'=> $cust_pkg->custnum } );
-      unless ( $part_svc->part_svc_column('uid')->columnflag eq 'F' ) {
-        $svc_acct->setfield('finger',
-          $cust_main->getfield('first') . " " . $cust_main->getfield('last')
-        );
-      }
-    }
-
-    #set fixed and default fields from part_svc
-    foreach my $part_svc_column (
-      grep { $_->columnflag } $part_svc->all_part_svc_column
-    ) {
-      if ( $part_svc_column->columnname eq 'usergroup' ) {
-        @groups = split(',', $part_svc_column->columnvalue);
-      } else {
-        $svc_acct->setfield( $part_svc_column->columnname,
-                             $part_svc_column->columnvalue,
-                           );
-      }
-    }
-
-  }
-}
-my $action = $svcnum ? 'Edit' : 'Add';
-
-my $svc = $part_svc->getfield('svc');
-
-my $otaker = getotaker;
-
-my $username = $svc_acct->username;
-my $password;
-if ( $svc_acct->_password ) {
-  if ( $conf->exists('showpasswords') || ! $svcnum ) {
-    $password = $svc_acct->_password;
-  } else {
-    $password = "*HIDDEN*";
-  }
-} else {
-  $password = '';
-}
-
-my $ulen = $conf->config('usernamemax')
-           || $svc_acct->dbdef_table->column('username')->length;
-my $ulen2 = $ulen+2;
-
-my $pmax = $conf->config('passwordmax') || 8;
-my $pmax2 = $pmax+2;
-
-my $p1 = popurl(1);
-print header("$action $svc account");
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT><BR><BR>"
-  if $cgi->param('error');
-
-print 'Service # '. ( $svcnum ? "<B>$svcnum</B>" : " (NEW)" ). '<BR>'.
-      'Service: <B>'. $part_svc->svc. '</B><BR><BR>'.
-      <<END;
-    <FORM NAME="OneTrueForm" ACTION="${p1}process/svc_acct.cgi" METHOD=POST>
-      <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
-      <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
-      <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
-END
-
-print &ntable("#cccccc",2), <<END;
-<TR><TD ALIGN="right">Username</TD>
-<TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
-<TR><TD ALIGN="right">Password</TD>
-<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=$pmax2 MAXLENGTH=$pmax>
-(blank to generate)</TD>
-</TR>
-END
-
-my $sec_phrase = $svc_acct->sec_phrase;
-if ( $conf->exists('security_phrase') ) {
-  print <<END;
-  <TR><TD ALIGN="right">Security phrase</TD>
-  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase" SIZE=32>
-    (for forgotten passwords)</TD>
-  </TD>
-END
-} else {
-  print qq!<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="$sec_phrase">!;
-}
-
-#domain
-my $domsvc = $svc_acct->domsvc || 0;
-if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
-  print qq!<INPUT TYPE="hidden" NAME="domsvc" VALUE="$domsvc">!;
-} else { 
-  my %svc_domain = ();
-
-  if ( $domsvc ) {
-    my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $domsvc, } );
-    if ( $svc_domain ) {
-      $svc_domain{$svc_domain->svcnum} = $svc_domain;
-    } else {
-      warn "unknown svc_domain.svcnum for svc_acct.domsvc: $domsvc";
-    }
-  }
-
-  if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'D' ) {
-    my $svc_domain = qsearchs('svc_domain', {
-      'svcnum' => $part_svc->part_svc_column('domsvc')->columnvalue,
-    } );
-    if ( $svc_domain ) {
-      $svc_domain{$svc_domain->svcnum} = $svc_domain;
-    } else {
-      warn "unknown svc_domain.svcnum for part_svc_column domsvc: ".
-           $part_svc->part_svc_column('domsvc')->columnvalue;
-    }
-  }
-
-  my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
-  if ($cust_pkg) {
-    my @cust_svc =
-      map { qsearch('cust_svc', { 'pkgnum' => $_->pkgnum } ) }
-          qsearch('cust_pkg', { 'custnum' => $cust_pkg->custnum } );
-    foreach my $cust_svc ( @cust_svc ) {
-      my $svc_domain =
-        qsearchs('svc_domain', { 'svcnum' => $cust_svc->svcnum } );
-     $svc_domain{$svc_domain->svcnum} = $svc_domain if $svc_domain;
-    }
-  } else {
-    %svc_domain = map { $_->svcnum => $_ } qsearch('svc_domain', {} );
-  }
-  print qq!<TR><TD ALIGN="right">Domain</TD>!.
-        qq!<TD><SELECT NAME="domsvc" SIZE=1>\n!;
-  foreach my $svcnum (
-    sort { $svc_domain{$a}->domain cmp $svc_domain{$b}->domain }
-      keys %svc_domain
-  ) {
-    my $svc_domain = $svc_domain{$svcnum};
-    print qq!<OPTION VALUE="!. $svc_domain->svcnum. qq!"!.
-          ( $svc_domain->svcnum == $domsvc ? ' SELECTED' : '' ).
-          '>'. $svc_domain->domain. "\n" ;
-  }
-  print "</SELECT></TD></TR>";
-}
-
-#pop
-my $popnum = $svc_acct->popnum || 0;
-if ( $part_svc->part_svc_column('popnum')->columnflag eq "F" ) {
-  print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$popnum">!;
-} else { 
-  print qq!<TR><TD ALIGN="right">Access number</TD>!.
-        qq!<TD>!. FS::svc_acct_pop::popselector($popnum). '</TD></TR>';
-}
-
-my($uid,$gid,$finger,$dir)=(
-  $svc_acct->uid,
-  $svc_acct->gid,
-  $svc_acct->finger,
-  $svc_acct->dir,
-);
-
-print <<END;
-<INPUT TYPE="hidden" NAME="uid" VALUE="$uid">
-<INPUT TYPE="hidden" NAME="gid" VALUE="$gid">
-END
-
-if ( !$finger && $part_svc->part_svc_column('uid')->columnflag eq 'F' ) {
-  print '<INPUT TYPE="hidden" NAME="finger" VALUE="">';
-} else {
-  print '<TR><TD ALIGN="right">GECOS</TD>'.
-        qq!<TD><INPUT TYPE="text" NAME="finger" VALUE="$finger"></TD></TR>!;
-}
-print qq!<INPUT TYPE="hidden" NAME="dir" VALUE="$dir">!;
-
-my $shell = $svc_acct->shell;
-if ( $part_svc->part_svc_column('shell')->columnflag eq "F"
-     || ( !$shell && $part_svc->part_svc_column('uid')->columnflag eq 'F' )
-   ) {
-  print qq!<INPUT TYPE="hidden" NAME="shell" VALUE="$shell">!;
-} else {
-  print qq!<TR><TD ALIGN="right">Shell</TD><TD><SELECT NAME="shell" SIZE=1>!;
-  my($etc_shell);
-  foreach $etc_shell (@shells) {
-    print "<OPTION", $etc_shell eq $shell ? ' SELECTED' : '', ">",
-          $etc_shell, "\n";
-  }
-  print "</SELECT></TD></TR>";
-}
-
-my($quota,$slipip)=(
-  $svc_acct->quota,
-  $svc_acct->slipip,
-);
-
-print qq!<INPUT TYPE="hidden" NAME="quota" VALUE="$quota">!;
-
-if ( $part_svc->part_svc_column('slipip')->columnflag eq "F" ) {
-  print qq!<INPUT TYPE="hidden" NAME="slipip" VALUE="$slipip">!;
-} else {
-  print qq!<TR><TD ALIGN="right">IP</TD><TD><INPUT TYPE="text" NAME="slipip" VALUE="$slipip"></TD></TR>!;
-}
-
-foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
-  $r =~ /^^r(adius|[cr])_(.+)$/ or next; #?
-  my $a = $2;
-  if ( $part_svc->part_svc_column($r)->columnflag eq 'F' ) {
-    print qq!<INPUT TYPE="hidden" NAME="$r" VALUE="!.
-          $svc_acct->getfield($r). '">';
-  } else {
-    print qq!<TR><TD ALIGN="right">$FS::raddb::attrib{$a}</TD><TD><INPUT TYPE="text" NAME="$r" VALUE="!.
-          $svc_acct->getfield($r). '"></TD></TR>';
-  }
-}
-
-print '<TR><TD ALIGN="right">RADIUS groups</TD>';
-if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) {
-  print '<TD BGCOLOR="#ffffff">'. join('<BR>', @groups);
-} else {
-  print '<TD>'. &FS::svc_acct::radius_usergroup_selector( \@groups );
-}
-print '</TD></TR>';
-
-#submit
-print qq!</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">!; 
-
-print <<END;
-    </FORM>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
deleted file mode 100755
index 399502a70..000000000
--- a/httemplate/edit/svc_acct_pop.cgi
+++ /dev/null
@@ -1,56 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $svc_acct_pop;
-if ( $cgi->param('error') ) {
-  $svc_acct_pop = new FS::svc_acct_pop ( {
-    map { $_, scalar($cgi->param($_)) } fields('svc_acct_pop')
-  } );
-} elsif ( $cgi->keywords ) { #editing
-  my($query)=$cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $svc_acct_pop=qsearchs('svc_acct_pop',{'popnum'=>$1});
-} else { #adding
-  $svc_acct_pop = new FS::svc_acct_pop {};
-}
-my $action = $svc_acct_pop->popnum ? 'Edit' : 'Add';
-my $hashref = $svc_acct_pop->hashref;
-
-my $p1 = popurl(1);
-print header("$action Access Number", menubar(
-  'Main Menu' => popurl(2),
-  'View all Access Numbers' => popurl(2). "browse/svc_acct_pop.cgi",
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print qq!<FORM ACTION="${p1}process/svc_acct_pop.cgi" METHOD=POST>!;
-
-#display
-
-print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$hashref->{popnum}">!,
-      "POP #", $hashref->{popnum} ? $hashref->{popnum} : "(NEW)";
-
-print <<END;
-<PRE>
-City      <INPUT TYPE="text" NAME="city" SIZE=32 VALUE="$hashref->{city}">
-State     <INPUT TYPE="text" NAME="state" SIZE=16 MAXLENGTH=16 VALUE="$hashref->{state}">
-Area Code <INPUT TYPE="text" NAME="ac" SIZE=4 MAXLENGTH=3 VALUE="$hashref->{ac}">
-Exchange  <INPUT TYPE="text" NAME="exch" SIZE=4 MAXLENGTH=3 VALUE="$hashref->{exch}">
-Local     <INPUT TYPE="text" NAME="loc" SIZE=5 MAXLENGTH=4 VALUE="$hashref->{loc}">
-</PRE>
-END
-
-print qq!<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{popnum} ? "Apply changes" : "Add Access Number",
-      qq!">!;
-
-print <<END;
-    </FORM>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
deleted file mode 100755
index 0fd5f7622..000000000
--- a/httemplate/edit/svc_acct_sm.cgi
+++ /dev/null
@@ -1,178 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
-
-my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct_sm );
-if ( $cgi->param('error') ) {
-  $svc_acct_sm = new FS::svc_acct_sm ( {
-    map { $_, scalar($cgi->param($_)) } fields('svc_acct_sm')
-  } );
-  $svcnum = $svc_acct_sm->svcnum;
-  $pkgnum = $cgi->param('pkgnum');
-  $svcpart = $cgi->param('svcpart');
-  #$part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  #die "No part_svc entry!" unless $part_svc;
-} else {
-  my($query) = $cgi->keywords;
-  if ( $query =~ /^(\d+)$/ ) { #editing
-    $svcnum=$1;
-    $svc_acct_sm=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum})
-      or die "Unknown (svc_acct_sm) svcnum!";
-
-    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-      or die "Unknown (cust_svc) svcnum!";
-
-    $pkgnum=$cust_svc->pkgnum;
-    $svcpart=$cust_svc->svcpart;
-  
-    #$part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    #die "No part_svc entry!" unless $part_svc;
-
-  } else { #adding
-
-    $svc_acct_sm = new FS::svc_acct_sm({});
-
-    foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
-      $pkgnum=$1 if /^pkgnum(\d+)$/;
-      $svcpart=$1 if /^svcpart(\d+)$/;
-    }
-    my $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
-
-    $svcnum='';
-
-    #set fixed and default fields from part_svc
-    foreach my $part_svc_column (
-      grep { $_->columnflag } $part_svc->all_part_svc_column
-    ) {
-      $svc_acct_sm->setfield( $part_svc_column->columnname,
-                              $part_svc_column->columnvalue,
-                            );
-    }
-
-  }
-}
-my $action = $svc_acct_sm->svcnum ? 'Edit' : 'Add';
-
-my %username = ();
-my %domain = ();
-if ($pkgnum) {
-
-  #find all possible uids (and usernames)
-
-  my @u_acct_svcparts = ();
-  foreach my $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
-    push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
-  }
-
-  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-  my($custnum)=$cust_pkg->getfield('custnum');
-  foreach my $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
-    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
-    my($acct_svcpart);
-    foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
-                                              #record(s) in cust_svc ( for this
-                                              #pkgnum ! )
-      my($i_cust_svc);
-      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
-        my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
-        $username{$svc_acct->getfield('uid')}=$svc_acct->getfield('username');
-      }  
-    }
-  }
-
-  #find all possible domains (and domsvc's)
-
-  my @d_acct_svcparts = ();
-  foreach my $d_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_domain'}) ) {
-    push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
-  }
-
-  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
-    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
-    my($acct_svcpart);
-    foreach $acct_svcpart (@d_acct_svcparts) {
-      my($i_cust_svc);
-      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
-        my($svc_domain)=qsearch('svc_domain',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
-        $domain{$svc_domain->getfield('svcnum')}=$svc_domain->getfield('domain');
-      }
-    }
-  }
-
-} elsif ( $action eq 'Edit' ) {
-
-  my($svc_acct)=qsearchs('svc_acct',{'uid'=>$svc_acct_sm->domuid});
-  $username{$svc_acct_sm->uid} = $svc_acct->username;
-
-  my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$svc_acct_sm->domsvc});
-  $domain{$svc_acct_sm->domsvc} = $svc_domain->domain;
-
-} else {
-  die "\$action eq Add, but \$pkgnum is null!\n";
-}
-
-my $p1 = popurl(1);
-print header("Mail Alias $action", '');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print qq!<FORM ACTION="${p1}process/svc_acct_sm.cgi" METHOD=POST>!;
-
-#display
-
-	#formatting
-	print "<PRE>";
-
-#svcnum
-print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
-print qq!Service #<FONT SIZE=+1><B>!, $svcnum ? $svcnum : " (NEW)", "</B></FONT>";
-
-#pkgnum
-print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
- 
-#svcpart
-print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
-
-my($domuser,$domsvc,$domuid)=(
-  $svc_acct_sm->domuser,
-  $svc_acct_sm->domsvc,
-  $svc_acct_sm->domuid,
-);
-
-#domuser
-print qq!\n\nMail to <INPUT TYPE="text" NAME="domuser" VALUE="$domuser"> <I>( * for anything )</I>!;
-
-#domsvc
-print qq! \@ <SELECT NAME="domsvc" SIZE=1>!;
-foreach $_ (keys %domain) {
-  print "<OPTION", $_ eq $domsvc ? " SELECTED" : "",
-        qq! VALUE="$_">$domain{$_}!;
-}
-print "</SELECT>";
-
-#uid
-print qq!\nforwards to <SELECT NAME="domuid" SIZE=1>!;
-foreach $_ (keys %username) {
-  print "<OPTION", ($_ eq $domuid) ? " SELECTED" : "",
-        qq! VALUE="$_">$username{$_}!;
-}
-print "</SELECT>\@$mydomain mailbox.";
-
-	#formatting
-	print "</PRE>\n";
-
-print qq!<CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>!;
-
-print <<END;
-
-    </FORM>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
deleted file mode 100755
index d20e1f336..000000000
--- a/httemplate/edit/svc_domain.cgi
+++ /dev/null
@@ -1,98 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my($svcnum, $pkgnum, $svcpart, $kludge_action, $purpose, $part_svc,
-   $svc_domain);
-if ( $cgi->param('error') ) {
-  $svc_domain = new FS::svc_domain ( {
-    map { $_, scalar($cgi->param($_)) } fields('svc_domain')
-  } );
-  $svcnum = $svc_domain->svcnum;
-  $pkgnum = $cgi->param('pkgnum');
-  $svcpart = $cgi->param('svcpart');
-  $kludge_action = $cgi->param('action');
-  $purpose = $cgi->param('purpose');
-  $part_svc = qsearchs('part_svc', { 'svcpart' => $svcpart } );
-  die "No part_svc entry!" unless $part_svc;
-} else {
-  $kludge_action = '';
-  $purpose = '';
-  my($query) = $cgi->keywords;
-  if ( $query =~ /^(\d+)$/ ) { #editing
-    $svcnum=$1;
-    $svc_domain=qsearchs('svc_domain',{'svcnum'=>$svcnum})
-      or die "Unknown (svc_domain) svcnum!";
-
-    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-      or die "Unknown (cust_svc) svcnum!";
-
-    $pkgnum=$cust_svc->pkgnum;
-    $svcpart=$cust_svc->svcpart;
-
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
-
-  } else { #adding
-
-    $svc_domain = new FS::svc_domain({});
-  
-    foreach $_ (split(/-/,$query)) {
-      $pkgnum=$1 if /^pkgnum(\d+)$/;
-      $svcpart=$1 if /^svcpart(\d+)$/;
-    }
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
-
-    $svcnum='';
-
-    #set fixed and default fields from part_svc
-    foreach my $part_svc_column (
-      grep { $_->columnflag } $part_svc->all_part_svc_column
-    ) {
-      $svc_domain->setfield( $part_svc_column->columnname,
-                             $part_svc_column->columnvalue,
-                           );
-    }
-
-  }
-
-}
-my $action = $svcnum ? 'Edit' : 'Add';
-
-my $svc = $part_svc->getfield('svc');
-
-my $otaker = getotaker;
-
-my $domain = $svc_domain->domain;
-
-my $p1 = popurl(1);
-print header("$action $svc", '');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print <<END;
-    <FORM ACTION="${p1}process/svc_domain.cgi" METHOD=POST>
-      <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
-      <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
-      <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
-END
-
-print qq!<INPUT TYPE="radio" NAME="action" VALUE="N"!;
-print ' CHECKED' if $kludge_action eq 'N';
-print qq!>New!;
-print qq!<BR><INPUT TYPE="radio" NAME="action" VALUE="M"!;
-print ' CHECKED' if $kludge_action eq 'M';
-print qq!>Transfer!;
-
-print <<END;
-<P>Domain <INPUT TYPE="text" NAME="domain" VALUE="$domain" SIZE=28 MAXLENGTH=26>
-<BR>Purpose/Description: <INPUT TYPE="text" NAME="purpose" VALUE="$purpose" SIZE=64>
-<P><INPUT TYPE="submit" VALUE="Submit">
-    </FORM>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
deleted file mode 100755
index bc19fe1de..000000000
--- a/httemplate/edit/svc_forward.cgi
+++ /dev/null
@@ -1,176 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
-
-my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_forward);
-if ( $cgi->param('error') ) {
-  $svc_forward = new FS::svc_forward ( {
-    map { $_, scalar($cgi->param($_)) } fields('svc_forward')
-  } );
-  $svcnum = $svc_forward->svcnum;
-  $pkgnum = $cgi->param('pkgnum');
-  $svcpart = $cgi->param('svcpart');
-  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  die "No part_svc entry!" unless $part_svc;
-} else {
-
-  my($query) = $cgi->keywords;
-
-  if ( $query =~ /^(\d+)$/ ) { #editing
-    $svcnum=$1;
-    $svc_forward=qsearchs('svc_forward',{'svcnum'=>$svcnum})
-      or die "Unknown (svc_forward) svcnum!";
-
-    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-      or die "Unknown (cust_svc) svcnum!";
-
-    $pkgnum=$cust_svc->pkgnum;
-    $svcpart=$cust_svc->svcpart;
-  
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
-
-  } else { #adding
-
-    $svc_forward = new FS::svc_forward({});
-
-    foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
-      $pkgnum=$1 if /^pkgnum(\d+)$/;
-      $svcpart=$1 if /^svcpart(\d+)$/;
-    }
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
-
-    $svcnum='';
-
-    #set fixed and default fields from part_svc
-    foreach my $part_svc_column (
-      grep { $_->columnflag } $part_svc->all_part_svc_column
-    ) {
-      $svc_forward->setfield( $part_svc_column->columnname,
-                              $part_svc_column->columnvalue,
-                            );
-    }
-  }
-
-}
-my $action = $svc_forward->svcnum ? 'Edit' : 'Add';
-
-my %email;
-if ($pkgnum) {
-
-  #find all possible user svcnums (and emails)
-
-  #starting with those currently attached
-  if ( $svc_forward->srcsvc ) {
-    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $svc_forward->srcsvc } );
-    $email{$svc_forward->srcsvc} = $svc_acct->email;
-  }
-  if ( $svc_forward->dstsvc ) {
-    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $svc_forward->dstsvc } );
-    $email{$svc_forward->dstsvc} = $svc_acct->email;
-  }
-
-  #and including the rest for this customer
-  my($u_part_svc,@u_acct_svcparts);
-  foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
-    push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
-  }
-
-  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-  my($custnum)=$cust_pkg->getfield('custnum');
-  my($i_cust_pkg);
-  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
-    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
-    my($acct_svcpart);
-    foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
-                                              #record(s) in cust_svc ( for this
-                                              #pkgnum ! )
-      foreach my $i_cust_svc (
-        qsearch( 'cust_svc', { 'pkgnum'  => $cust_pkgnum,
-                               'svcpart' => $acct_svcpart } )
-      ) {
-        my $svc_acct =
-          qsearchs( 'svc_acct', { 'svcnum' => $i_cust_svc->svcnum } );
-        $email{$svc_acct->svcnum} = $svc_acct->email;
-      }  
-    }
-  }
-
-} elsif ( $action eq 'Edit' ) {
-
-  my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svc_forward->srcsvc});
-  $email{$svc_forward->srcsvc} = $svc_acct->email;
-
-  $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svc_forward->dstsvc});
-  $email{$svc_forward->dstsvc} = $svc_acct->email;
-
-} else {
-  die "\$action eq Add, but \$pkgnum is null!\n";
-}
-
-my($srcsvc,$dstsvc,$dst)=(
-  $svc_forward->srcsvc,
-  $svc_forward->dstsvc,
-  $svc_forward->dst,
-);
-
-#display
-
-%>
-
-<%= header("Mail Forward $action") %>
-
-<% if ( $cgi->param('error') ) { %>
-  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
-  <BR><BR>
-<% } %>
-
-Service #<%= $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
-Service: <B><%= $part_svc->svc %></B><BR><BR>
-
-<FORM NAME="dummy">
-
-<%= ntable("#cccccc",2) %>
-<TR><TD ALIGN="right">Email to</TD><TD><SELECT NAME="srcsvc" SIZE=1>
-<% foreach $_ (keys %email) { %>
-  <OPTION<%= $_ eq $srcsvc ? " SELECTED" : "" %> VALUE="<%= $_ %>"><%= $email{$_} %></OPTION>
-<% } %>
-</SELECT></TD></TR>
-
-<%
-  tie my %tied_email, 'Tie::IxHash',
-    ''  => 'SELECT DESTINATION',
-    %email,
-    '0' => '(other email address)';
-  my $widget = new HTML::Widgets::SelectLayers(
-    'selected_layer' => $dstsvc,
-    'options'        => \%tied_email,
-    'form_name'      => 'dummy',
-    'form_action'    => 'process/svc_forward.cgi',
-    'form_select'    => ['srcsvc'],
-    'html_between'   => '</TD></TR></TABLE>',
-    'layer_callback' => sub {
-      my $layer = shift;
-      my $html = qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!.
-                 qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!.
-                 qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!.
-                 qq!<INPUT TYPE="hidden" NAME="dstsvc" VALUE="$layer">!;
-      if ( $layer eq '0' ) {
-        $html .= ntable("#cccccc",2).
-                 '<TR><TD ALIGN="right">Destination email</TD>'.
-                 qq!<TD><INPUT TYPE="text" NAME="dst" VALUE="$dst"></TD>!.
-                 '</TR></TABLE>';
-      }
-      $html .= '<BR><INPUT TYPE="submit" VALUE="Submit">';
-      $html;
-    },
-  );
-%>
-
-<TR><TD ALIGN="right">Forwards to</TD>
-<TD><%= $widget->html %>
-  </BODY>
-</HTML>
diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
deleted file mode 100644
index d2c9ade5c..000000000
--- a/httemplate/edit/svc_www.cgi
+++ /dev/null
@@ -1,178 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my( $svcnum,  $pkgnum, $svcpart, $part_svc, $svc_www );
-if ( $cgi->param('error') ) {
-  $svc_www = new FS::svc_www ( {
-    map { $_, scalar($cgi->param($_)) } fields('svc_www')
-  } );
-  $svcnum = $svc_www->svcnum;
-  $pkgnum = $cgi->param('pkgnum');
-  $svcpart = $cgi->param('svcpart');
-  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  die "No part_svc entry!" unless $part_svc;
-} else {
-  my($query) = $cgi->keywords;
-  if ( $query =~ /^(\d+)$/ ) { #editing
-    $svcnum=$1;
-    $svc_www=qsearchs('svc_www',{'svcnum'=>$svcnum})
-      or die "Unknown (svc_www) svcnum!";
-
-    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-      or die "Unknown (cust_svc) svcnum!";
-
-    $pkgnum=$cust_svc->pkgnum;
-    $svcpart=$cust_svc->svcpart;
-  
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
-
-  } else { #adding
-
-    $svc_www = new FS::svc_www({});
-
-    foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
-      $pkgnum=$1 if /^pkgnum(\d+)$/;
-      $svcpart=$1 if /^svcpart(\d+)$/;
-    }
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
-
-    $svcnum='';
-
-    #set fixed and default fields from part_svc
-    foreach my $part_svc_column (
-      grep { $_->columnflag } $part_svc->all_part_svc_column
-    ) {
-      $svc_www->setfield( $part_svc_column->columnname,
-                          $part_svc_column->columnvalue,
-                        );
-    }
-
-  }
-}
-my $action = $svc_www->svcnum ? 'Edit' : 'Add';
-
-my( %username, %arec );
-if ($pkgnum) {
-
-  my($u_part_svc,@u_acct_svcparts);
-  foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
-    push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
-  }
-
-  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-  my($custnum)=$cust_pkg->getfield('custnum');
-  my($i_cust_pkg);
-  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
-    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
-    my($acct_svcpart);
-    foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
-                                              #record(s) in cust_svc ( for this
-                                              #pkgnum ! )
-      my($i_cust_svc);
-      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
-        my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
-        $username{$svc_acct->getfield('svcnum')}=$svc_acct->getfield('username');
-      }  
-    }
-  }
-
-
-  my($d_part_svc,@d_acct_svcparts);
-  foreach $d_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_domain'}) ) {
-    push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
-  }
-
-  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
-    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
-    my($acct_svcpart);
-    foreach $acct_svcpart (@d_acct_svcparts) {
-      my($i_cust_svc);
-      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
-        my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
-        my $domain_rec;
-        foreach $domain_rec ( qsearch('domain_record',{
-            'svcnum'  => $svc_domain->svcnum,
-            'rectype' => 'A' } ),
-        qsearch('domain_record',{
-            'svcnum'  => $svc_domain->svcnum,
-            'rectype' => 'CNAME'
-            } ) ) {
-          $arec{$domain_rec->recnum} =
-            $domain_rec->reczone eq '@'
-              ? $svc_domain->domain
-              : $domain_rec->reczone. '.'. $svc_domain->domain;
-        }
-        $arec{'@.'. $svc_domain->domain} = $svc_domain->domain
-          unless qsearchs('domain_record', { svcnum  => $svc_domain->svcnum,
-                                             reczone => '@',                } );
-        $arec{'www.'. $svc_domain->domain} = 'www.'. $svc_domain->domain
-          unless qsearchs('domain_record', { svcnum  => $svc_domain->svcnum,
-                                             reczone => 'www',              } );
-      }
-    }
-  }
-
-} elsif ( $action eq 'Edit' ) {
-
-  my($domain_rec) = qsearchs('domain_record', { 'recnum'=>$svc_www->recnum });
-  $arec{$svc_www->recnum} = join '.', $domain_rec->recdata, $domain_rec->reczone;
-
-} else {
-  die "\$action eq Add, but \$pkgnum is null!\n";
-}
-
-
-my $p1 = popurl(1);
-print header("Web Hosting $action", '');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print qq!<FORM ACTION="${p1}process/svc_www.cgi" METHOD=POST>!;
-
-#display
-
- 
-
-#svcnum
-print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
-print qq!Service #<B>!, $svcnum ? $svcnum : "(NEW)", "</B><BR><BR>";
-
-#pkgnum
-print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
- 
-#svcpart
-print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
-
-my($recnum,$usersvc)=(
-  $svc_www->recnum,
-  $svc_www->usersvc,
-);
-
-print &ntable("#cccccc",2),
-      '<TR><TD ALIGN="right">Zone</TD><TD><SELECT NAME="recnum" SIZE=1>';
-foreach $_ (keys %arec) {
-  print "<OPTION", $_ eq $recnum ? " SELECTED" : "",
-        qq! VALUE="$_">$arec{$_}!;
-}
-print "</SELECT></TD></TR>";
-
-print '<TR><TD ALIGN="right">Username</TD><TD><SELECT NAME="usersvc" SIZE=1>';
-foreach $_ (keys %username) {
-  print "<OPTION", ($_ eq $usersvc) ? " SELECTED" : "",
-        qq! VALUE="$_">$username{$_}!;
-}
-print "</SELECT></TD></TR>";
-
-print '</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">';
-
-print <<END;
-
-    </FORM>
-  </BODY>
-</HTML>
-END
-%>
diff --git a/httemplate/images/mid-logo.png b/httemplate/images/mid-logo.png
deleted file mode 100644
index d993419cc..000000000
Binary files a/httemplate/images/mid-logo.png and /dev/null differ
diff --git a/httemplate/images/small-logo.png b/httemplate/images/small-logo.png
deleted file mode 100644
index 406a36980..000000000
Binary files a/httemplate/images/small-logo.png and /dev/null differ
diff --git a/httemplate/index.html b/httemplate/index.html
deleted file mode 100644
index 29dd3b471..000000000
--- a/httemplate/index.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>
-      Freeside Main Menu
-    </TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#FFFFFF">
-  <table width="100%">
-    <tr><td>
-        <IMG BORDER=0 ALT="Silicon Interactive Software Design" SRC="images/small-logo.png">
-    </td><td>
-      <font color="#ff0000" size=7>freeside main menu</font>
-    </td><td align=right valign=bottom>
-      version 1.4.0
-      <BR><A HREF="http://www.sisd.com/freeside">Freeside home page</A>
-      <BR><A HREF="docs/">Documentation</A>
-    </td></tr>
-  </table>
-
-<BR>
-[<A NAME="customer_service" style="background-color: #cccccc"> Sales / Customer service </A>]
-[ <A HREF="#bookkeeping">Bookkeeping / Collections</A> ]
-[ <A HREF="#reports">Reports</A> ]
-[ <A HREF="#sysadmin">Sysadmin</A> ]
-    <TABLE CELLSPACING=2 CELLPADDING=0 BORDERCOLOR="#000000" WIDTH="100%" BGCOLOR="#eeeeee">
-    <TR><TH BGCOLOR="#cccccc">Sales / Customer service</TH></TR>
-    <TR><TD>
-        <BR><FONT SIZE="+1"><A HREF="edit/cust_main.cgi">New Customer</A></FONT>
-        <BR>
-        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="custnum_on" VALUE="1">Customer # <INPUT TYPE="text" NAME="custnum_text"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=custnum">all customers by customer number</A></FORM>
-        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><SELECT NAME="last_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A></FORM>
-        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><SELECT NAME="company_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A></FORM>
-<!--        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="address2_on" VALUE="1">Unit <INPUT TYPE="text" NAME="address2_text"><INPUT TYPE="submit" VALUE="Search"></FORM>-->
-        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="phone_on" VALUE="1">Phone # <INPUT TYPE="text" NAME="phone_text"><INPUT TYPE="submit" VALUE="Search"></FORM>
-        <BR><FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><SELECT NAME="username_type"><OPTION VALUE="All">(all)</OPTION><OPTION>Fuzzy</OPTION><OPTION>Substring</OPTION><OPTION SELECTED>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A> or <A HREF="search/svc_acct.cgi?uid">uid</A></FORM>
-        <BR><FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
-<!--        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>-->
-<!--        <LI><A HREF="search/svc_forward.html">mail forwards (by ?)</A>-->
-      <BR>
-    </TD></TR>
-    </TABLE>
-
-
-
-    <BR><BR><BR>
-
-
-[ <A HREF="#customer_service">Sales / Customer service</A> ]
-[<A NAME="bookkeeping" style="background-color: #cccccc"> Bookkeeping / Collections </A>]
-[ <A HREF="#reports">Reports</A> ]
-[ <A HREF="#sysadmin">Sysadmin</A> ]
-    <TABLE CELLSPACING=2 CELLPADDING=0 BORDERCOLOR="#000000" WIDTH="100%" BGCOLOR="#eeeeee">
-    <TR><TH BGCOLOR="#cccccc">Bookkeeping / Collections</TH></TR>
-    <TR><TD>
-      <BR><A HREF="search/cust_main-quickpay.html">Quick payment entry</A>
-      <BR>
-      <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST">Credit card # <INPUT TYPE="hidden" NAME="card_on" VALUE="1"><INPUT TYPE="text" NAME="card"><INPUT TYPE="submit" VALUE="Search"></FORM>
-      <FORM ACTION="search/cust_bill.cgi" METHOD="POST">Invoice # <INPUT TYPE="text" NAME="invnum" SIZE="8"><INPUT TYPE="submit" VALUE="Search"></FORM>
-      <FORM ACTION="search/cust_pay.cgi" METHOD="POST">Check # <INPUT TYPE="text" NAME="payinfo" SIZE="8"><INPUT TYPE="hidden" NAME="payby" VALUE="BILL"><INPUT TYPE="submit" VALUE="Search"></FORM>
-      <BR><A HREF="browse/cust_pay_batch.cgi">View pending credit card batch</A>      <BR><BR><A HREF="search/cust_pkg.html">Packages (by next bill date range)</A>
-      <BR><BR>Invoice reports
-            <UL>
-              <LI><a href="search/cust_bill_event.html">Invoice event errors (failed credit cards)</a>
-              <LI>open invoices (<A HREF="search/cust_bill.cgi?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN_custnum">by customer number</A>)
-              <LI>30 day open invoices (<A HREF="search/cust_bill.cgi?OPEN30_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN30_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN30_custnum">by customer number</A>)
-              <LI>60 day open invoices (<A HREF="search/cust_bill.cgi?OPEN60_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN60_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN60_custnum">by customer number</A>)
-              <LI>90 day open invoices (<A HREF="search/cust_bill.cgi?OPEN90_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN90_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN90_custnum">by customer number</A>)
-              <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
-              <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
-            </UL>
-      Financial reports
-            <UL>
-              <LI> <A HREF="search/report_receivables.cgi">current receivables</A>
-              <LI> <A HREF="search/report_tax.html">tax reports</A>
-              <LI> <A HREF="search/report_cc.html">credit card receipts</A>
-              <LI> <A HREF="search/report_credit.html">credit memos</A>
-            </UL>
-      <CENTER><HR WIDTH="94%" NOSHADE></CENTER><BR>
-      <A NAME="admin">Administration</a>
-        <ul>
-          <LI><A HREF="browse/part_pkg.cgi">View/Edit package definitions</A>
-            - One or more services are grouped together into a package and
-              given pricing information.  Customers purchase packages, not
-              services.
-<!--          <LI><A HREF="browse/agent_type.cgi">View/Edit agent types</A>
-            - Agent types define groups of package definitions that you can
-              then assign to particular agents.
-          <LI><A HREF="browse/agent.cgi">View/Edit agents</A>
-            - Agents are resellers of your service.  Agents may be limited
-              to a subset of your full offerings (via their type).
--->
-          <LI><A HREF="browse/cust_main_county.cgi">View/Edit locales and tax rates</A>
-            - Change tax rates, or break down a country into states, or a state
-              into counties and assign different tax rates to each.
-          <LI><A HREF="browse/part_bill_event.cgi">View/Edit invoice events</A> - Actions for overdue invoices
-        </ul>
-      <BR>
-    </TD></TR>
-    </TABLE>
-
-
-
-    <BR><BR><BR>
-
-
-
-[ <A HREF="#customer_service">Sales / Customer service</A> ]
-[ <A HREF="#bookkeeping">Bookkeeping / Collections</A> ]
-[<A NAME="reports" style="background-color: #cccccc"> Reports </A>]
-[ <A HREF="#sysadmin">Sysadmin</A> ]
-    <TABLE CELLSPACING=2 CELLPADDING=0 BORDERCOLOR="#000000" WIDTH="100%" BGCOLOR="#eeeeee">
-    <TR><TH BGCOLOR="#cccccc">Reports</TH></TR>
-    <TR><TD>
-      <BR>
-      Auditing pre-Freeside services with no customer record
-      <UL>
-        <LI>unlinked accounts (<A HREF="search/svc_acct.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?UN_username">by username</A>) (<A HREF="search/svc_acct.cgi?UN_uid">by uid</A>)
-        <LI>unlinked mail forwards (<A HREF="search/svc_forward.cgi?UN_svcnum">by service number</A>) (by ?))
-        <LI>unlinked domains (<A HREF="search/svc_domain.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?UN_domain">by domain</A>)
-      </UL>
-      Packages
-      <UL>
-        <LI><A HREF="search/cust_pkg.cgi?pkgnum">packages (by package number)</A>
-        <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
-        <LI><A HREF="search/cust_pkg.html">packages (by next bill date range)</A>
-      </UL>
-      Invoices
-      <UL>
-        <LI><a href="search/cust_bill_event.html">Invoice event errors (failed credit cards)</a>
-        <LI>open invoices (<A HREF="search/cust_bill.cgi?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN_custnum">by customer number</A>)
-        <LI>30 day open invoices (<A HREF="search/cust_bill.cgi?OPEN30_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN30_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN30_custnum">by customer number</A>)
-        <LI>60 day open invoices (<A HREF="search/cust_bill.cgi?OPEN60_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN60_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN60_custnum">by customer number</A>)
-        <LI>90 day open invoices (<A HREF="search/cust_bill.cgi?OPEN90_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN90_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN90_custnum">by customer number</A>)
-        <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
-        <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
-      </UL>
-    Financial reports
-            <UL>
-              <LI> <A HREF="search/report_receivables.cgi">current receivables</A>
-              <LI> <A HREF="search/report_tax.html">tax reports</A>
-              <LI> <A HREF="search/report_cc.html">credit card receipts</A>
-              <LI> <A HREF="search/report_credit.html">credit memos</A>
-            </UL>
-    Customers
-      <UL>
-        <LI><A HREF="search/cust_main-otaker.cgi">Search customers by order-taker</A>
-      </UL>
-    <FORM ACTION="search/sql.cgi" METHOD="POST">SQL query: <TT>SELECT </TT><INPUT TYPE="text" NAME="sql" SIZE=32><INPUT TYPE="submit" VALUE="Query"></FORM>
-
-    <BR>
-    </TD></TR>
-    </TABLE>
-
-
-
-    <BR><BR><BR>
-
-
-[ <A HREF="#customer_service">Sales / Customer service</A> ]
-[ <A HREF="#bookkeeping">Bookkeeping / Collections</A> ]
-[ <A HREF="#reports">Reports</A> ]
-[<A NAME="sysadmin" style="background-color: #cccccc"> Sysadmin </A>]
-    <TABLE CELLSPACING=2 CELLPADDING=0 BORDERCOLOR="#000000" WIDTH="100%" BGCOLOR="#eeeeee">
-    <TR><TH BGCOLOR="#cccccc">Sysadmin</TH></TR>
-    <TR><TD>
-      <BR>
-      <A HREF="browse/nas.cgi">View active NAS ports</A>
-      <BR><A HREF="browse/queue.cgi">View pending job queue</A>
-      <BR><BR><CENTER><HR WIDTH="94%" NOSHADE></CENTER><BR>
-      <A NAME="config" HREF="config/config-view.cgi">Configuration</a><!-- - <font size="+2" color="#ff0000">start here</font> -->
-      <BR><BR><A NAME="admin">Administration</a>
-        <ul>
-          <LI><A HREF="browse/part_export.cgi">View/Edit exports</A>
-            - Provisioning services to external machines, databases and APIs.
-          <LI><A HREF="browse/part_svc.cgi">View/Edit service definitions</A>
-            - Services are items you offer to your customers.
-          <LI><A HREF="browse/part_pkg.cgi">View/Edit package definitions</A>
-            - One or more services are grouped together into a package and
-              given pricing information.  Customers purchase packages, not
-              services.
-          <LI><A HREF="browse/agent_type.cgi">View/Edit agent types</A>
-            - Agent types define groups of package definitions that you can
-              then assign to particular agents.
-          <LI><A HREF="browse/agent.cgi">View/Edit agents</A>
-            - Agents are resellers of your service.  Agents may be limited
-              to a subset of your full offerings (via their type).
-          <LI><A HREF="browse/part_referral.cgi">View/Edit advertising sources</A>
-            - Where a customer heard about your service.  Tracked for
-              informational purposes.
-          <LI><A HREF="browse/cust_main_county.cgi">View/Edit locales and tax rates</A>
-            - Change tax rates, or break down a country into states, or a state
-              into counties and assign different tax rates to each.
-          <LI><A HREF="browse/svc_acct_pop.cgi">View/Edit Access Numbers</A>
-            - Points of Presence 
-          <LI><A HREF="browse/part_bill_event.cgi">View/Edit invoice events</A> - Actions for overdue invoices
-          <LI><A HREF="browse/msgcat.cgi">View/Edit message catalog</A> - Change error messages and other customizable labels.
-        </ul>
-        <BR>
-      </TD></TR>
-      </TABLE>
-      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-  </BODY>
-</HTML>
diff --git a/httemplate/misc/bill.cgi b/httemplate/misc/bill.cgi
deleted file mode 100755
index f048e5559..000000000
--- a/httemplate/misc/bill.cgi
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-
-#untaint custnum
-my($query) = $cgi->keywords;
-$query =~ /^(\d*)$/;
-my $custnum = $1;
-my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
-die "Can't find customer!\n" unless $cust_main;
-
-my $error = $cust_main->bill(
-#                          'time'=>$time
-                         );
-#&eidiot($error) if $error;
-
-unless ( $error ) {
-  $cust_main->apply_payments;
-  $cust_main->apply_credits;
-
-  $error = $cust_main->collect(
-  #                             'invoice-time'=>$time,
-                               #'batch_card'=> 'yes',
-                               #'batch_card'=> 'no',
-                               #'report_badcard'=> 'yes',
-                               'retry_card' => 'yes',
-                              );
-}
-#&eidiot($error) if $error;
-
-if ( $error ) {
-%>
-<!-- mason kludge -->
-<%
-  &idiot($error);
-} else {
-  print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum");
-}
-%>
diff --git a/httemplate/misc/cancel-unaudited.cgi b/httemplate/misc/cancel-unaudited.cgi
deleted file mode 100755
index 11cde968d..000000000
--- a/httemplate/misc/cancel-unaudited.cgi
+++ /dev/null
@@ -1,31 +0,0 @@
-<%
-
-my $dbh = dbh;
- 
-#untaint svcnum
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $svcnum = $1;
-
-#my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
-#die "Unknown svcnum!" unless $svc_acct;
-
-my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-die "Unknown svcnum!" unless $cust_svc;
-&eidiot(qq!This account has already been audited.  Cancel the 
-    <A HREF="!. popurl(2). qq!view/cust_pkg.cgi?! . $cust_svc->getfield('pkgnum') .
-    qq!pkgnum"> package</A> instead.!) 
-  if $cust_svc->pkgnum ne '' && $cust_svc->pkgnum ne '0';
-
-my $error = $cust_svc->cancel;
-
-if ( $error ) {
-  %>
-<!-- mason kludge -->
-<%
-  &eidiot($error);
-} else {
-  print $cgi->redirect(popurl(2));
-}
-
-%>
diff --git a/httemplate/misc/cancel_pkg.cgi b/httemplate/misc/cancel_pkg.cgi
deleted file mode 100755
index 0487677df..000000000
--- a/httemplate/misc/cancel_pkg.cgi
+++ /dev/null
@@ -1,15 +0,0 @@
-<%
-
-#untaint pkgnum
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/ || die "Illegal pkgnum";
-my $pkgnum = $1;
-
-my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-
-my $error = $cust_pkg->cancel;
-eidiot($error) if $error;
-
-print $cgi->redirect($p. "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
-
-%>
diff --git a/httemplate/misc/catchall.cgi b/httemplate/misc/catchall.cgi
deleted file mode 100755
index 9aa84be18..000000000
--- a/httemplate/misc/catchall.cgi
+++ /dev/null
@@ -1,133 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $conf = new FS::Conf;
-
-my($svc_domain, $svcnum, $pkgnum, $svcpart, $part_svc);
-if ( $cgi->param('error') ) {
-  $svc_domain = new FS::svc_domain ( {
-    map { $_, scalar($cgi->param($_)) } fields('svc_domain')
-  } );
-  $svcnum = $svc_domain->svcnum;
-  $pkgnum = $cgi->param('pkgnum');
-  $svcpart = $cgi->param('svcpart');
-  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  die "No part_svc entry!" unless $part_svc;
-} else {
-  my($query) = $cgi->keywords;
-  if ( $query =~ /^(\d+)$/ ) { #editing
-    $svcnum=$1;
-    $svc_domain=qsearchs('svc_domain',{'svcnum'=>$svcnum})
-      or die "Unknown (svc_domain) svcnum!";
-
-    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-      or die "Unknown (cust_svc) svcnum!";
-
-    $pkgnum=$cust_svc->pkgnum;
-    $svcpart=$cust_svc->svcpart;
-  
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
-
-  } else { 
-
-    die "Invalid (svc_domain) svcnum!";
-
-  }
-}
-
-my %email;
-if ($pkgnum) {
-
-  #find all possible user svcnums (and emails)
-
-  #starting with that currently attached
-  if ($svc_domain->catchall) {
-    my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svc_domain->catchall});
-    $email{$svc_domain->catchall} = $svc_acct->email;
-  }
-
-  #and including the rest for this customer
-  my($u_part_svc,@u_acct_svcparts);
-  foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
-    push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
-  }
-
-  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-  my($custnum)=$cust_pkg->getfield('custnum');
-  my($i_cust_pkg);
-  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
-    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
-    my($acct_svcpart);
-    foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
-                                              #record(s) in cust_svc ( for this
-                                              #pkgnum ! )
-      my($i_cust_svc);
-      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
-        my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
-        $email{$svc_acct->getfield('svcnum')}=$svc_acct->email;
-      }  
-    }
-  }
-
-} else {
-
-  my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svc_domain->catchall});
-  $email{$svc_domain->catchall} = $svc_acct->email;
-}
-
-# add an absence of a catchall
-$email{0} = "(none)";
-
-my $p1 = popurl(1);
-print header("Domain Catchall Edit", '');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print qq!<FORM ACTION="${p1}process/catchall.cgi" METHOD=POST>!;
-
-#display
-
-	#formatting
-	print "<PRE>";
-
-#svcnum
-print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
-print qq!Service #<FONT SIZE=+1><B>!, $svcnum ? $svcnum : " (NEW)", "</B></FONT>";
-
-#pkgnum
-print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
- 
-#svcpart
-print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
-
-my($domain,$catchall)=(
-  $svc_domain->domain,
-  $svc_domain->catchall,
-);
-
-print qq!<INPUT TYPE="hidden" NAME="domain" VALUE="$domain">!;
-
-#catchall
-print qq!\n\nMail to <I>(anything)</I>@<B>$domain</B> forwards to <SELECT NAME="catchall" SIZE=1>!;
-foreach $_ (keys %email) {
-  print "<OPTION", $_ eq $catchall ? " SELECTED" : "",
-        qq! VALUE="$_">$email{$_}!;
-}
-print "</SELECT>";
-
-	#formatting
-	print "</PRE>\n";
-
-print qq!<CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>!;
-
-print <<END;
-
-    </FORM>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/misc/delete-cust_pay.cgi b/httemplate/misc/delete-cust_pay.cgi
deleted file mode 100755
index 3efd918ab..000000000
--- a/httemplate/misc/delete-cust_pay.cgi
+++ /dev/null
@@ -1,16 +0,0 @@
-<%
-
-#untaint paynum
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/ || die "Illegal paynum";
-my $paynum = $1;
-
-my $cust_pay = qsearchs('cust_pay',{'paynum'=>$paynum});
-my $custnum = $cust_pay->custnum;
-
-my $error = $cust_pay->delete;
-eidiot($error) if $error;
-
-print $cgi->redirect($p. "view/cust_main.cgi?". $custnum);
-
-%>
diff --git a/httemplate/misc/delete-customer.cgi b/httemplate/misc/delete-customer.cgi
deleted file mode 100755
index 430231737..000000000
--- a/httemplate/misc/delete-customer.cgi
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $conf = new FS::Conf;
-die "Customer deletions not enabled" unless $conf->exists('deletecustomers');
-
-my($custnum, $new_custnum);
-if ( $cgi->param('error') ) {
-  $custnum = $cgi->param('custnum');
-  $new_custnum = $cgi->param('new_custnum');
-} else {
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/ or die "Illegal query: $query";
-  $custnum = $1;
-  $new_custnum = '';
-}
-my $cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } )
-  or die "Customer not found: $custnum";
-
-print header('Delete customer');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print 
-  qq!<form action="!, popurl(1), qq!process/delete-customer.cgi" method=post>!,
-  qq!<input type="hidden" name="custnum" value="$custnum">!;
-
-if ( qsearch('cust_pkg', { 'custnum' => $custnum, 'cancel' => '' } ) ) {
-  print "Move uncancelled packages to customer number ",
-        qq!<input type="text" name="new_custnum" value="$new_custnum"><br><br>!;
-}
-
-print <<END;
-This will <b>completely remove</b> all traces of this customer record.  This
-is <B>not</B> what you want if this is a real customer who has simply
-canceled service with you.  For that, cancel all of the customer's packages.
-(you can optionally hide cancelled customers with the <a href="../config/config-view.cgi#hidecancelledcustomers">hidecancelledcustomers</a> configuration option)
-<br>
-<br>Are you <b>absolutely sure</b> you want to delete this customer?
-<br><input type="submit" value="Yes">
-</form></body></html>
-END
-
-#Deleting a customer you have financial records on (i.e. credits) is
-#typically considered fraudulant bookkeeping.  Remember, deleting   
-#customers should ONLY be used for completely bogus records.  You should
-#NOT delete real customers who simply discontinue service.
-#
-#For real customers who simply discontinue service, cancel all of the
-#customer's packages.  Customers with all cancelled packages are not  
-#billed.  There is no need to take further action to prevent billing on
-#customers with all cancelled packages.
-#
-#Also see the "hidecancelledcustomers" and "hidecancelledpackages"
-#configuration options, which will allow you to surpress the display of
-#cancelled customers and packages, respectively.
-
-%>
diff --git a/httemplate/misc/delete-domain_record.cgi b/httemplate/misc/delete-domain_record.cgi
deleted file mode 100755
index dcc2d5022..000000000
--- a/httemplate/misc/delete-domain_record.cgi
+++ /dev/null
@@ -1,15 +0,0 @@
-<%
-
-#untaint recnum
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/ || die "Illegal recnum";
-my $recnum = $1;
-
-my $domain_record = qsearchs('domain_record',{'recnum'=>$recnum});
-
-my $error = $domain_record->delete;
-eidiot($error) if $error;
-
-print $cgi->redirect($p. "view/svc_domain.cgi?". $domain_record->svcnum);
-
-%>
diff --git a/httemplate/misc/delete-part_export.cgi b/httemplate/misc/delete-part_export.cgi
deleted file mode 100755
index 7c4ab8b9d..000000000
--- a/httemplate/misc/delete-part_export.cgi
+++ /dev/null
@@ -1,15 +0,0 @@
-<%
-
-#untaint exportnum
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/ || die "Illegal exportnum";
-my $exportnum = $1;
-
-my $part_export = qsearchs('part_export',{'exportnum'=>$exportnum});
-
-my $error = $part_export->delete;
-eidiot($error) if $error;
-
-print $cgi->redirect($p. "browse/part_export.cgi");
-
-%>
diff --git a/httemplate/misc/expire_pkg.cgi b/httemplate/misc/expire_pkg.cgi
deleted file mode 100755
index 9e4ce8b62..000000000
--- a/httemplate/misc/expire_pkg.cgi
+++ /dev/null
@@ -1,25 +0,0 @@
-<%
-
-#untaint date & pkgnum
-
-my $date;
-if ( $cgi->param('date') ) {
-  str2time($cgi->param('date')) =~ /^(\d+)$/ or die "Illegal date";
-  $date=$1;
-} else {
-  $date='';
-}
-
-$cgi->param('pkgnum') =~ /^(\d+)$/ or die "Illegal pkgnum";
-my $pkgnum = $1;
-
-my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-my %hash = $cust_pkg->hash;
-$hash{expire}=$date;
-my $new = new FS::cust_pkg ( \%hash );
-my $error = $new->replace($cust_pkg);
-&eidiot($error) if $error;
-
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
-
-%>
diff --git a/httemplate/misc/link.cgi b/httemplate/misc/link.cgi
deleted file mode 100755
index efc762cc5..000000000
--- a/httemplate/misc/link.cgi
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my %link_field = (
-  'svc_acct'    => 'username',
-  'svc_domain'  => 'domain',
-  'svc_acct_sm' => '',
-  'svc_charge'  => '',
-  'svc_wo'      => '',
-);
-
-my($query) = $cgi->keywords;
-my($pkgnum, $svcpart) = ('', '');
-foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
-  $pkgnum=$1 if /^pkgnum(\d+)$/;
-  $svcpart=$1 if /^svcpart(\d+)$/;
-}
-
-my $part_svc = qsearchs('part_svc',{'svcpart'=>$svcpart});
-my $svc = $part_svc->getfield('svc');
-my $svcdb = $part_svc->getfield('svcdb');
-my $link_field = $link_field{$svcdb};
-
-print header("Link to existing $svc"),
-      qq!<FORM ACTION="!, popurl(1), qq!process/link.cgi" METHOD=POST>!;
-
-if ( $link_field ) { 
-  print <<END;
-  <INPUT TYPE="hidden" NAME="svcnum" VALUE="">
-  <INPUT TYPE="hidden" NAME="link_field" VALUE="$link_field">
-  $link_field of existing service: <INPUT TYPE="text" NAME="link_value">
-END
-} else {
-  print qq!Service # of existing service: <INPUT TYPE="text" NAME="svcnum" VALUE="">!;
-}
-
-print <<END;
-<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
-<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
-<P><CENTER><INPUT TYPE="submit" VALUE="Link"></CENTER>
-    </FORM>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/misc/print-invoice.cgi b/httemplate/misc/print-invoice.cgi
deleted file mode 100755
index a5500bff2..000000000
--- a/httemplate/misc/print-invoice.cgi
+++ /dev/null
@@ -1,23 +0,0 @@
-<%
-
-my $conf = new FS::Conf;
-my $lpr = $conf->config('lpr');
-
-#untaint invnum
-my($query) = $cgi->keywords;
-$query =~ /^(\d*)$/;
-my $invnum = $1;
-my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
-die "Can't find invoice!\n" unless $cust_bill;
-
-        open(LPR,"|$lpr") or die "Can't open $lpr: $!";
-        print LPR $cust_bill->print_text; #( date )
-        close LPR
-          or die $! ? "Error closing $lpr: $!"
-                       : "Exit status $? from $lpr";
-
-my $custnum = $cust_bill->getfield('custnum');
-
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum#history");
-
-%>
diff --git a/httemplate/misc/process/catchall.cgi b/httemplate/misc/process/catchall.cgi
deleted file mode 100755
index 44a63f9f8..000000000
--- a/httemplate/misc/process/catchall.cgi
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-
-$FS::svc_domain::whois_hack=1;
-
-$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-my $svcnum =$1;
-
-my $old = qsearchs('svc_domain',{'svcnum'=>$svcnum}) if $svcnum;
-
-my $new = new FS::svc_domain ( {
-  map {
-    ($_, scalar($cgi->param($_)));
-  } ( fields('svc_domain'), qw( pkgnum svcpart ) )
-} );
-
-$new->setfield('action' => 'M');
-
-my $error;
-if ( $svcnum ) {
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-  $svcnum = $new->getfield('svcnum');
-} 
-
-if ($error) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "catchall.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/svc_domain.cgi?$svcnum");
-}
-
-%>
diff --git a/httemplate/misc/process/delete-customer.cgi b/httemplate/misc/process/delete-customer.cgi
deleted file mode 100755
index 16bdbaea8..000000000
--- a/httemplate/misc/process/delete-customer.cgi
+++ /dev/null
@@ -1,29 +0,0 @@
-<%
-
-my $conf = new FS::Conf;
-die "Customer deletions not enabled" unless $conf->exists('deletecustomers');
-
-$cgi->param('custnum') =~ /^(\d+)$/;
-my $custnum = $1;
-my $new_custnum;
-if ( $cgi->param('new_custnum') ) {
-  $cgi->param('new_custnum') =~ /^(\d+)$/
-    or die "Illegal new customer number: ". $cgi->param('new_custnum');
-  $new_custnum = $1;
-} else {
-  $new_custnum = '';
-}
-my $cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } )
-  or die "Customer not found: $custnum";
-
-my $error = $cust_main->delete($new_custnum);
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "delete-customer.cgi?". $cgi->query_string );
-} elsif ( $new_custnum ) {
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$new_custnum");
-} else {
-  print $cgi->redirect(popurl(3));
-}
-%>
diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
deleted file mode 100755
index 4b220a867..000000000
--- a/httemplate/misc/process/link.cgi
+++ /dev/null
@@ -1,40 +0,0 @@
-<%
-
-$cgi->param('pkgnum') =~ /^(\d+)$/;
-my $pkgnum = $1;
-$cgi->param('svcpart') =~ /^(\d+)$/;
-my $svcpart = $1;
-$cgi->param('svcnum') =~ /^(\d*)$/;
-my $svcnum = $1;
-
-unless ( $svcnum ) {
-  my($part_svc) = qsearchs('part_svc',{'svcpart'=>$svcpart});
-  my($svcdb) = $part_svc->getfield('svcdb');
-  $cgi->param('link_field') =~ /^(\w+)$/; my($link_field)=$1;
-  my($svc_x)=qsearchs($svcdb,{$link_field => $cgi->param('link_value') });
-  eidiot("$link_field not found!") unless $svc_x;
-  $svcnum=$svc_x->svcnum;
-}
-
-my $old = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-die "svcnum not found!" unless $old;
-#die "svcnum $svcnum already linked to package ". $old->pkgnum if $old->pkgnum;
-my $new = new FS::cust_svc ({
-  'svcnum' => $svcnum,
-  'pkgnum' => $pkgnum,
-  'svcpart' => $svcpart,
-});
-
-my $error = $new->replace($old);
-
-unless ($error) {
-  #no errors, so let's view this customer.
-  print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?$pkgnum");
-} else {
-%>
-<!-- mason kludge -->
-<%
-  idiot($error);
-}
-
-%>
diff --git a/httemplate/misc/queue.cgi b/httemplate/misc/queue.cgi
deleted file mode 100644
index ce9c8fbd3..000000000
--- a/httemplate/misc/queue.cgi
+++ /dev/null
@@ -1,47 +0,0 @@
-<%
-
-$cgi->param('action') =~ /^(new|del|(retry|remove) selected)$/
-  or die "Illegal action";
-my $action = $1;
-
-my $job;
-if ( $action eq 'new' || $action eq 'del' ) {
-  $cgi->param('jobnum') =~ /^(\d+)$/ or die "Illegal jobnum";
-  my $jobnum = $1;
-  $job = qsearchs('queue', { 'jobnum' => $1 })
-    or die "unknown jobnum $jobnum - ".
-           "it probably completed normally or was removed by another user";
-}
-
-if ( $action eq 'new' ) {
-  my %hash = $job->hash;
-  $hash{'status'} = 'new';
-  $hash{'statustext'} = '';
-  my $new = new FS::queue \%hash;
-  my $error = $new->replace($job);
-  die $error if $error;
-} elsif ( $action eq 'del' ) {
-  my $error = $job->delete;
-  die $error if $error;
-} elsif ( $action =~ /^(retry|remove) selected$/ ) {
-  foreach my $jobnum (
-    map { /^jobnum(\d+)$/; $1; } grep /^jobnum\d+$/, $cgi->param
-  ) {
-    my $job = qsearchs('queue', { 'jobnum' => $jobnum });
-    if ( $action eq 'retry selected' && $job ) { #new
-      my %hash = $job->hash;
-      $hash{'status'} = 'new';
-      $hash{'statustext'} = '';
-      my $new = new FS::queue \%hash;
-      my $error = $new->replace($job);
-      die $error if $error;
-    } elsif ( $action eq 'remove selected' && $job ) { #del
-      my $error = $job->delete;
-      die $error if $error;
-    }
-  }
-}
-
-print $cgi->redirect(popurl(2). "browse/queue.cgi");
-
-%>
diff --git a/httemplate/misc/susp_pkg.cgi b/httemplate/misc/susp_pkg.cgi
deleted file mode 100755
index 4a19fa830..000000000
--- a/httemplate/misc/susp_pkg.cgi
+++ /dev/null
@@ -1,15 +0,0 @@
-<%
-
-#untaint pkgnum
-my ($query) = $cgi->keywords;
-$query =~ /^(\d+)$/ || die "Illegal pkgnum";
-my $pkgnum = $1;
-
-my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-
-my $error = $cust_pkg->suspend;
-&eidiot($error) if $error;
-
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
-
-%>
diff --git a/httemplate/misc/unsusp_pkg.cgi b/httemplate/misc/unsusp_pkg.cgi
deleted file mode 100755
index 500872983..000000000
--- a/httemplate/misc/unsusp_pkg.cgi
+++ /dev/null
@@ -1,15 +0,0 @@
-<%
-
-#untaint pkgnum
-my ($query) = $cgi->keywords;
-$query =~ /^(\d+)$/ || die "Illegal pkgnum";
-my $pkgnum = $1;
-
-my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-
-my $error = $cust_pkg->unsuspend;
-&eidiot($error) if $error;
-
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
-
-%>
diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
deleted file mode 100755
index 586399a41..000000000
--- a/httemplate/search/cust_bill.cgi
+++ /dev/null
@@ -1,165 +0,0 @@
-<%
-
-my $conf = new FS::Conf;
-my $maxrecords = $conf->config('maxsearchrecordsperpage');
-
-my $orderby = ''; #removeme
-
-my $limit = '';
-$limit .= "LIMIT $maxrecords" if $maxrecords;
-
-my $offset = $cgi->param('offset') || 0;
-$limit .= " OFFSET $offset" if $offset;
-
-my $total;
-
-my(@cust_bill);
-if ( $cgi->keywords ) {
-  my($query) = $cgi->keywords;
-  my $owed = "charged - ( select coalesce(sum(amount),0) from cust_bill_pay
-                          where cust_bill_pay.invnum = cust_bill.invnum )
-                      - ( select coalesce(sum(amount),0) from cust_credit_bill
-                          where cust_credit_bill.invnum = cust_bill.invnum )";
-  my @where;
-  if ( $query =~ /^(OPEN(\d*)_)?(invnum|date|custnum)$/ ) {
-    my($open, $days, $field) = ($1, $2, $3);
-    $field = "_date" if $field eq 'date';
-    $orderby = "ORDER BY cust_bill.$field";
-    push @where, "0 != $owed" if $open;
-    push @where, "cust_bill._date < ". (time-86400*$days) if $days;
-  } else {
-    die "unknown query string $query";
-  }
-
-  my $extra_sql = scalar(@where) ? 'WHERE '. join(' AND ', @where) : '';
-
-  my $statement = "SELECT COUNT(*), sum(charged), sum($owed)
-                   FROM cust_bill $extra_sql";
-  my $sth = dbh->prepare($statement) or die dbh->errstr. " doing $statement";
-  $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
-
-  ( $total, $tot_amount, $tot_balance ) = @{$sth->fetchrow_arrayref};
-
-  @cust_bill = qsearch(
-    'cust_bill',
-    {},
-    "cust_bill.*, $owed as owed",
-    "$extra_sql $orderby $limit"
-  );
-} else {
-  $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
-  my $invnum = $2;
-  @cust_bill = qsearchs('cust_bill', { 'invnum' => $invnum } );
-  $total = scalar(@cust_bill);
-}
-
-#if ( scalar(@cust_bill) == 1 ) {
-if ( $total == 1 ) {
-  my $invnum = $cust_bill[0]->invnum;
-  print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
-} elsif ( scalar(@cust_bill) == 0 ) {
-%>
-<!-- mason kludge -->
-<%
-  eidiot("Invoice not found.");
-} else {
-%>
-<!-- mason kludge -->
-<%
-
-  #begin pager
-  my $pager = '';
-  if ( $total != scalar(@cust_bill) && $maxrecords ) {
-    unless ( $offset == 0 ) {
-      $cgi->param('offset', $offset - $maxrecords);
-      $pager .= '<A HREF="'. $cgi->self_url.
-                '"><B><FONT SIZE="+1">Previous</FONT></B></A> ';
-    }
-    my $poff;
-    my $page;
-    for ( $poff = 0; $poff < $total; $poff += $maxrecords ) {
-      $page++;
-      if ( $offset == $poff ) {
-        $pager .= qq!<FONT SIZE="+2">$page</FONT> !;
-      } else {
-        $cgi->param('offset', $poff);
-        $pager .= qq!<A HREF="!. $cgi->self_url. qq!">$page</A> !;
-      }
-    }
-    unless ( $offset + $maxrecords > $total ) {
-      $cgi->param('offset', $offset + $maxrecords);
-      $pager .= '<A HREF="'. $cgi->self_url.
-                '"><B><FONT SIZE="+1">Next</FONT></B></A> ';
-    }
-  }
-  #end pager
-
-  print header("Invoice Search Results", menubar(
-          'Main Menu', popurl(2)
-        )).
-        "$total matching invoices found<BR>".
-        "\$$tot_balance total balance<BR>".
-        "\$$tot_amount total amount<BR>".
-        "<BR>$pager". table(). <<END;
-      <TR>
-        <TH></TH>
-        <TH>Balance</TH>
-        <TH>Amount</TH>
-        <TH>Date</TH>
-        <TH>Contact name</TH>
-        <TH>Company</TH>
-      </TR>
-END
-
-  foreach my $cust_bill ( @cust_bill ) {
-    my($invnum, $owed, $charged, $date ) = (
-      $cust_bill->invnum,
-      sprintf("%.2f", $cust_bill->getfield('owed')),
-      sprintf("%.2f", $cust_bill->charged),
-      $cust_bill->_date,
-    );
-    my $pdate = time2str("%b %d %Y", $date);
-
-    my $rowspan = 1;
-
-    my $view = popurl(2). "view/cust_bill.cgi?$invnum";
-    print <<END;
-      <TR>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$invnum</FONT></A></TD>
-        <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view"><FONT SIZE=-1>\$$owed</FONT></A></TD>
-        <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view"><FONT SIZE=-1>\$$charged</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$pdate</FONT></A></TD>
-END
-    my $custnum = $cust_bill->custnum;
-    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
-    if ( $cust_main ) {
-      my $cview = popurl(2). "view/cust_main.cgi?". $cust_main->custnum;
-      my ( $name, $company ) = (
-        $cust_main->last. ', '. $cust_main->first,
-        $cust_main->company,
-      );
-      print <<END;
-        <TD ROWSPAN=$rowspan><A HREF="$cview"><FONT SIZE=-1>$name</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$cview"><FONT SIZE=-1>$company</FONT></A></TD>
-END
-    } else {
-      print <<END
-        <TD ROWSPAN=$rowspan COLSPAN=2>WARNING: couldn't find cust_main.custnum $custnum (cust_bill.invnum $invnum)</TD>
-END
-    }
-
-    print "</TR>";
-  }
-  $tot_balance = sprintf("%.2f", $tot_balance);
-  $tot_amount = sprintf("%.2f", $tot_amount);
-  print "</TABLE>$pager<BR>". table(). <<END;
-      <TR><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TH><FONT SIZE=-1>Total<BR>Balance</FONT></TH><TH><FONT SIZE=-1>Total<BR>Amount</FONT></TH></TR>
-      <TR><TD></TD><TD ALIGN="right"><FONT SIZE=-1>\$$tot_balance</FONT></TD><TD ALIGN="right"><FONT SIZE=-1>\$$tot_amount</FONT></TD></TD></TR>
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-}
-
-%>
diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
deleted file mode 100755
index 36e8bc91b..000000000
--- a/httemplate/search/cust_bill.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Invoice Search</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <FONT SIZE=7>
-      Invoice Search
-    </FONT>
-    <BR><BR>
-    <FORM ACTION="cust_bill.cgi" METHOD="post">
-      Search for <B>invoice #</B>: 
-      <INPUT TYPE="text" NAME="invnum">
-
-      <P><INPUT TYPE="submit" VALUE="Search">
-
-    </FORM>
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/cust_bill_event.cgi b/httemplate/search/cust_bill_event.cgi
deleted file mode 100644
index 9cb36d28e..000000000
--- a/httemplate/search/cust_bill_event.cgi
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- mason kludge -->
-<%
-
-#false laziness with view/cust_bill.cgi
-
-$cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
-my $beginning = str2time($1);
-
-$cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
-my $ending = str2time($1) + 86400;
-
-my @cust_bill_event =
-  sort { $a->_date <=> $b->_date }
-    qsearch('cust_bill_event', {
-      _date => { op=> '>=', value=>$beginning },
-      statustext => { op=> '!=', value=>'' },
-# i wish...
-#      _date => { op=> '<=', value=>$ending },
-    }, '', "AND _date <= $ending");
-
-%>
-
-<%= header('Failed billing events') %>
-
-<%= table() %>
-<TR>
-  <TH>Event</TH>
-  <TH>Date</TH>
-  <TH>Status</TH>
-  <TH>Invoice</TH>
-  <TH>(bill) name</TH>
-  <TH>company</TH>
-<% if ( defined dbdef->table('cust_main')->column('ship_last') ) { %>
-  <TH>(service) name</TH>
-  <TH>company</TH>
-<% } %>
-</TR>
-
-<% foreach my $cust_bill_event ( @cust_bill_event ) {
-   my $status = $cust_bill_event->status;
-   $status .= ': '.$cust_bill_event->statustext if $cust_bill_event->statustext;
-   my $cust_bill = $cust_bill_event->cust_bill;
-   my $cust_main = $cust_bill->cust_main;
-   my $invlink = "${p}view/cust_bill.cgi?". $cust_bill->invnum;
-   my $custlink = "${p}view/cust_main.cgi?". $cust_main->custnum;
-%>
-<TR>
-  <TD><%= $cust_bill_event->part_bill_event->event %></TD>
-  <TD><%= time2str("%a %b %e %T %Y", $cust_bill_event->_date) %></TD>
-  <TD><%= $status %></TD>
-  <TD><A HREF="<%=$invlink%>">Invoice #<%= $cust_bill->invnum %> (<%= time2str("%D", $cust_bill->_date ) %>)</A></TD>
-  <TD><A HREF="<%=$custlink%>"><%= $cust_main->last. ', '. $cust_main->first %></A></TD>
-  <TD><A HREF="<%=$custlink%>"><%= $cust_main->company %></A></TD>
-  <% if ( defined dbdef->table('cust_main')->column('ship_last') ) { %>
-    <TD><A HREF="<%=$custlink%>"><%= $cust_main->ship_last. ', '. $cust_main->ship_first %></A></TD>
-    <TD><A HREF="<%=$custlink%>"><%= $cust_main->ship_company %></A></TD>
-  <% } %>
-</TR>
-<% } %>
-</TABLE>
-
-</BODY></HTML>
diff --git a/httemplate/search/cust_bill_event.html b/httemplate/search/cust_bill_event.html
deleted file mode 100755
index d76ce3c8c..000000000
--- a/httemplate/search/cust_bill_event.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Failed billing events</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Failed billing events</H1>
-    </CENTER>
-    <HR>
-    <FORM ACTION="cust_bill_event.cgi" METHOD="post">
-      Return <B>failed billing events</B> for period: 
-      from <INPUT TYPE="text" NAME="beginning"> <i>m/d/y</i>
-      to <INPUT TYPE="text" NAME="ending"> <i>m/d/y</i>
-
-      <P><INPUT TYPE="submit" VALUE="Get Report">
-
-    </FORM>
-
-  <HR>
-
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/cust_main-otaker.cgi b/httemplate/search/cust_main-otaker.cgi
deleted file mode 100755
index b7173c49c..000000000
--- a/httemplate/search/cust_main-otaker.cgi
+++ /dev/null
@@ -1,29 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Customer Search</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <FONT SIZE=7>
-      Customer Search
-    </FONT>
-    <BR>
-    <FORM ACTION="cust_main.cgi" METHOD="post">
-      Search for <B>Order taker</B>: 
-      <INPUT TYPE="hidden" NAME="otaker_on" VALUE="TRUE">
-      <% my $dbh = dbh;
-         my $sth = dbh->prepare("SELECT DISTINCT otaker FROM cust_main")
-           or eidiot $dbh->errstr;
-         $sth->execute() or eidiot $sth->errstr;
-#         my @otakers = map { $_->[0] } @{$sth->selectall_arrayref};
-      %>
-      <SELECT NAME="otaker">
-      <% my $otaker; while ( $otaker = $sth->fetchrow_arrayref ) { %>
-        <OPTION><%= $otaker->[0] %></OTAKER>
-      <% } %>
-      </SELECT>
-      <P><INPUT TYPE="submit" VALUE="Search">
-
-    </FORM>
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/cust_main-payinfo.html b/httemplate/search/cust_main-payinfo.html
deleted file mode 100755
index 671b5ef08..000000000
--- a/httemplate/search/cust_main-payinfo.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Customer Search</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <FONT SIZE=7>
-      Customer Search
-    </FONT>
-    <BR>
-    <FORM ACTION="cust_main.cgi" METHOD="post">
-      Search for <B>Credit card #</B>: 
-      <INPUT TYPE="hidden" NAME="card_on" VALUE="TRUE">
-      <INPUT TYPE="text" NAME="card">
-
-      <P><INPUT TYPE="submit" VALUE="Search">
-
-    </FORM>
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/cust_main-quickpay.html b/httemplate/search/cust_main-quickpay.html
deleted file mode 100755
index 9f39db914..000000000
--- a/httemplate/search/cust_main-quickpay.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Quick payment entry</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <FONT SIZE=7>
-      Quick payment entry
-    </FONT>
-    <BR><BR>
-    <FORM ACTION="cust_main.cgi" METHOD="post">
-      <INPUT TYPE="hidden" NAME="quickpay" VALUE="yes">
-      <INPUT TYPE="checkbox" NAME="last_on" CHECKED> Search for <B>last name</B>: 
-      <INPUT TYPE="text" NAME="last_text">
-      using search method: <SELECT NAME="last_type">
-        <OPTION SELECTED>All
-        <OPTION>Fuzzy
-        <OPTION>Substring
-        <OPTION>Exact
-      </SELECT>
-
-      <P><INPUT TYPE="checkbox" NAME="company_on" CHECKED> Search for <B>company</B>: 
-      <INPUT TYPE="text" NAME="company_text">
-      using search methods: <SELECT NAME="company_type">
-        <OPTION SELECTED>All
-        <OPTION>Fuzzy
-        <OPTION>Substring
-        <OPTION>Exact
-      </SELECT>
-
-      <P><INPUT TYPE="submit" VALUE="Search"> Note: Fuzzy searching can take a while.  Please be patient.
-
-    </FORM>
-
-  <HR>Explanation of search methods:
-  <UL>
-    <LI><B>All</B> - Try all search methods.
-    <LI><B>Fuzzy</B> - Searches for matches that are close to your text.
-    <LI><B>Substring</B> - Searches for matches that contain your text.
-    <LI><B>Exact</B> - Finds exact matches only, but much faster than the other search methods.
-  </UL>
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
deleted file mode 100755
index 586f8d991..000000000
--- a/httemplate/search/cust_main.cgi
+++ /dev/null
@@ -1,659 +0,0 @@
-<%
-
-my $conf = new FS::Conf;
-my $maxrecords = $conf->config('maxsearchrecordsperpage');
-
-#my $cache;
-
-#my $monsterjoin = <<END;
-#cust_main left outer join (
-#  ( cust_pkg left outer join part_pkg using(pkgpart)
-#  ) left outer join (
-#    (
-#      (
-#        ( cust_svc left outer join part_svc using (svcpart)
-#        ) left outer join svc_acct using (svcnum)
-#      ) left outer join svc_domain using(svcnum)
-#    ) left outer join svc_forward using(svcnum)
-#  ) using (pkgnum)
-#) using (custnum)
-#END
-
-#my $monsterjoin = <<END;
-#cust_main left outer join (
-#  ( cust_pkg left outer join part_pkg using(pkgpart)
-#  ) left outer join (
-#    (
-#      (
-#        ( cust_svc left outer join part_svc using (svcpart)
-#        ) left outer join (
-#          svc_acct left outer join (
-#            select svcnum, domain, catchall from svc_domain
-#            ) as svc_acct_domsvc (
-#              svc_acct_svcnum, svc_acct_domain, svc_acct_catchall
-#          ) on svc_acct.domsvc = svc_acct_domsvc.svc_acct_svcnum
-#        ) using (svcnum)
-#      ) left outer join svc_domain using(svcnum)
-#    ) left outer join svc_forward using(svcnum)
-#  ) using (pkgnum)
-#) using (custnum)
-#END
-
-my $limit = '';
-$limit .= "LIMIT $maxrecords" if $maxrecords;
-
-my $offset = $cgi->param('offset') || 0;
-$limit .= " OFFSET $offset" if $offset;
-
-my $total = 0;
-
-my(@cust_main, $sortby, $orderby);
-if ( $cgi->param('browse')
-     || $cgi->param('otaker_on')
-) {
-
-  my %search = ();
-  if ( $cgi->param('browse') ) {
-    my $query = $cgi->param('browse');
-    if ( $query eq 'custnum' ) {
-      $sortby=\*custnum_sort;
-      $orderby = "ORDER BY custnum";
-    } elsif ( $query eq 'last' ) {
-      $sortby=\*last_sort;
-      $orderby = "ORDER BY LOWER(last || ' ' || first)";
-    } elsif ( $query eq 'company' ) {
-      $sortby=\*company_sort;
-      $orderby = "ORDER BY LOWER(company || ' ' || last || ' ' || first )";
-    } else {
-      die "unknown browse field $query";
-    }
-  } else {
-    $sortby = \*last_sort; #??
-    $orderby = "ORDER BY LOWER(last || ' ' || first)"; #??
-    if ( $cgi->param('otaker_on') ) {
-      $cgi->param('otaker') =~ /^(\w{1,32})$/ or eidiot "Illegal otaker\n";
-      $search{otaker} = $1;
-    } else {
-      die "unknown query...";
-    }
-  }
-
-  my $ncancelled = '';
-
-  if ( driver_name eq 'mysql' ) {
-
-       my $query = "CREATE TEMPORARY TABLE temp1_$$ TYPE=MYISAM
-                      SELECT cust_pkg.custnum,COUNT(*) as count
-                        FROM cust_pkg,cust_main
-                          WHERE cust_pkg.custnum = cust_main.custnum
-                                AND ( cust_pkg.cancel IS NULL
-                                      OR cust_pkg.cancel = 0 )
-                          GROUP BY cust_pkg.custnum";
-       my $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
-       $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
-       $query = "CREATE TEMPORARY TABLE temp2_$$ TYPE=MYISAM
-                   SELECT cust_pkg.custnum,COUNT(*) as count
-                     FROM cust_pkg,cust_main
-                       WHERE cust_pkg.custnum = cust_main.custnum
-                       GROUP BY cust_pkg.custnum";
-       my $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
-       $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
-  }
-
-  if (  $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
-       || ( $conf->exists('hidecancelledcustomers')
-             && ! $cgi->param('showcancelledcustomers') )
-     ) {
-    #grep { $_->ncancelled_pkgs || ! $_->all_pkgs }
-    if ( driver_name eq 'mysql' ) {
-       $ncancelled = "
-          temp1_$$.custnum = cust_main.custnum
-               AND temp2_$$.custnum = cust_main.custnum
-               AND (temp1_$$.count > 0
-                       OR temp2_$$.count = 0 )
-       ";
-    } else {
-       $ncancelled = "
-          0 < ( SELECT COUNT(*) FROM cust_pkg
-                       WHERE cust_pkg.custnum = cust_main.custnum
-                         AND ( cust_pkg.cancel IS NULL
-                               OR cust_pkg.cancel = 0
-                             )
-                   )
-            OR 0 = ( SELECT COUNT(*) FROM cust_pkg
-                       WHERE cust_pkg.custnum = cust_main.custnum
-                   )
-       ";
-    }
-
-  }
-
-  #EWWWWWW
-  my $qual = join(' AND ',
-            map { "$_ = ". dbh->quote($search{$_}) } keys %search );
-
-  if ( $ncancelled ) {
-    $qual .= ' AND ' if $qual;
-    $qual .= $ncancelled;
-  }
-    
-  $qual = " WHERE $qual" if $qual;
-  my $statement;
-  if ( driver_name eq 'mysql' ) {
-    $statement = "SELECT COUNT(*) FROM cust_main";
-    $statement .= ", temp1_$$, temp2_$$ $qual" if $qual;
-  } else {
-    $statement = "SELECT COUNT(*) FROM cust_main $qual";
-  }
-  my $sth = dbh->prepare($statement) or die dbh->errstr." preparing $statement";
-  $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
-
-  $total = $sth->fetchrow_arrayref->[0];
-
-  if ( $ncancelled ) {
-    if ( %search ) {
-      $ncancelled = " AND $ncancelled";
-    } else {
-      $ncancelled = " WHERE $ncancelled";
-    }
-  }
-
-  my @just_cust_main;
-  if ( driver_name eq 'mysql' ) {
-    @just_cust_main = qsearch('cust_main', \%search, 'cust_main.*',
-                              ",temp1_$$,temp2_$$ $ncancelled $orderby $limit");
-  } else {
-    @just_cust_main = qsearch('cust_main', \%search, '',   
-                              "$ncancelled $orderby $limit" );
-  }
-  if ( driver_name eq 'mysql' ) {
-    $query = "DROP TABLE temp1_$$,temp2_$$;";
-    my $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
-    $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
-  }
-  @cust_main = @just_cust_main;
-
-#  foreach my $cust_main ( @just_cust_main ) {
-#
-#    my @one_cust_main;
-#    $FS::Record::DEBUG=1;
-#    ( $cache, @one_cust_main ) = jsearch(
-#      "$monsterjoin",
-#      { 'custnum' => $cust_main->custnum },
-#      '',
-#      '',
-#      'cust_main',
-#      'custnum',
-#    );
-#    push @cust_main, @one_cust_main;
-#  }
-
-} else {
-  @cust_main=();
-  $sortby = \*last_sort;
-
-  push @cust_main, @{&custnumsearch}
-    if $cgi->param('custnum_on') && $cgi->param('custnum_text');
-  push @cust_main, @{&cardsearch}
-    if $cgi->param('card_on') && $cgi->param('card');
-  push @cust_main, @{&lastsearch}
-    if $cgi->param('last_on') && $cgi->param('last_text');
-  push @cust_main, @{&companysearch}
-    if $cgi->param('company_on') && $cgi->param('company_text');
-  push @cust_main, @{&address2search}
-    if $cgi->param('address2_on') && $cgi->param('address2_text');
-  push @cust_main, @{&phonesearch}
-    if $cgi->param('phone_on') && $cgi->param('phone_text');
-  push @cust_main, @{&referralsearch}
-    if $cgi->param('referral_custnum');
-
-  if ( $cgi->param('company_on') && $cgi->param('company_text') ) {
-    $sortby = \*company_sort;
-    push @cust_main, @{&companysearch};
-  }
-
-  @cust_main = grep { $_->ncancelled_pkgs || ! $_->all_pkgs } @cust_main
-    if $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
-       || ( $conf->exists('hidecancelledcustomers')
-             && ! $cgi->param('showcancelledcustomers') );
-
-  my %saw = ();
-  @cust_main = grep { !$saw{$_->custnum}++ } @cust_main;
-}
-
-my %all_pkgs;
-if ( $conf->exists('hidecancelledpackages' ) ) {
-  %all_pkgs = map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
-} else {
-  %all_pkgs = map { $_->custnum => [ $_->all_pkgs ] } @cust_main;
-}
-#%all_pkgs = ();
-
-if ( scalar(@cust_main) == 1 && ! $cgi->param('referral_custnum') ) {
-  if ( $cgi->param('quickpay') eq 'yes' ) {
-    print $cgi->redirect(popurl(2). "edit/cust_pay.cgi?quickpay=yes;custnum=". $cust_main[0]->custnum);
-  } else {
-    print $cgi->redirect(popurl(2). "view/cust_main.cgi?". $cust_main[0]->custnum);
-  }
-  #exit;
-} elsif ( scalar(@cust_main) == 0 ) {
-%>
-<!-- mason kludge -->
-<%
-  eidiot "No matching customers found!\n";
-} else { 
-%>
-<!-- mason kludge -->
-<%
-
-  $total ||= scalar(@cust_main);
-  print header("Customer Search Results",menubar(
-    'Main Menu', popurl(2)
-  )), "$total matching customers found ";
-
-  #begin pager
-  my $pager = '';
-  if ( $total != scalar(@cust_main) && $maxrecords ) {
-    unless ( $offset == 0 ) {
-      $cgi->param('offset', $offset - $maxrecords);
-      $pager .= '<A HREF="'. $cgi->self_url.
-                '"><B><FONT SIZE="+1">Previous</FONT></B></A> ';
-    }
-    my $poff;
-    my $page;
-    for ( $poff = 0; $poff < $total; $poff += $maxrecords ) {
-      $page++;
-      if ( $offset == $poff ) {
-        $pager .= qq!<FONT SIZE="+2">$page</FONT> !;
-      } else {
-        $cgi->param('offset', $poff);
-        $pager .= qq!<A HREF="!. $cgi->self_url. qq!">$page</A> !;
-      }
-    }
-    unless ( $offset + $maxrecords > $total ) {
-      $cgi->param('offset', $offset + $maxrecords);
-      $pager .= '<A HREF="'. $cgi->self_url.
-                '"><B><FONT SIZE="+1">Next</FONT></B></A> ';
-    }
-  }
-  #end pager
-  
-  if ( $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
-       || ( $conf->exists('hidecancelledcustomers')
-            && ! $cgi->param('showcancelledcustomers')
-          )
-     ) {
-    $cgi->param('showcancelledcustomers', 1);
-    $cgi->param('offset', 0);
-    print qq!( <a href="!. $cgi->self_url. qq!">show cancelled customers</a> )!;
-  } else {
-    $cgi->param('showcancelledcustomers', 0);
-    $cgi->param('offset', 0);
-    print qq!( <a href="!. $cgi->self_url. qq!">hide cancelled customers</a> )!;
-  }
-  if ( $cgi->param('referral_custnum') ) {
-    $cgi->param('referral_custnum') =~ /^(\d+)$/
-      or eidiot "Illegal referral_custnum\n";
-    my $referral_custnum = $1;
-    my $cust_main = qsearchs('cust_main', { custnum => $referral_custnum } );
-    print '<FORM METHOD=POST>'.
-          qq!<INPUT TYPE="hidden" NAME="referral_custnum" VALUE="$referral_custnum">!.
-          'referrals of <A HREF="'. popurl(2).
-          "view/cust_main.cgi?$referral_custnum\">$referral_custnum: ".
-          ( $cust_main->company
-            || $cust_main->last. ', '. $cust_main->first ).
-          '</A>';
-    print "\n",<<END;
-      <SCRIPT>
-      function changed(what) {
-        what.form.submit();
-      }
-      </SCRIPT>
-END
-    print ' <SELECT NAME="referral_depth" SIZE="1" onChange="changed(this)">';
-    my $max = 8; #config file
-    $cgi->param('referral_depth') =~ /^(\d*)$/ 
-      or eidiot "Illegal referral_depth";
-    my $referral_depth = $1;
-
-    foreach my $depth ( 1 .. $max ) {
-      print '<OPTION',
-            ' SELECTED'x($depth == $referral_depth),
-            ">$depth";
-    }
-    print "</SELECT> levels deep".
-          '<NOSCRIPT> <INPUT TYPE="submit" VALUE="change"></NOSCRIPT>'.
-          '</FORM>';
-  }
-
-  print "<BR><BR>". $pager. &table(). <<END;
-      <TR>
-        <TH></TH>
-        <TH>(bill) name</TH>
-        <TH>company</TH>
-END
-
-if ( defined dbdef->table('cust_main')->column('ship_last') ) {
-  print <<END;
-      <TH>(service) name</TH>
-      <TH>company</TH>
-END
-}
-
-print <<END;
-        <TH>Packages</TH>
-        <TH COLSPAN=2>Services</TH>
-      </TR>
-END
-
-  my(%saw,$cust_main);
-  my $p = popurl(2);
-  foreach $cust_main (
-    sort $sortby grep(!$saw{$_->custnum}++, @cust_main)
-  ) {
-    my($custnum,$last,$first,$company)=(
-      $cust_main->custnum,
-      $cust_main->getfield('last'),
-      $cust_main->getfield('first'),
-      $cust_main->company,
-    );
-
-    my(@lol_cust_svc);
-    my($rowspan)=0;#scalar( @{$all_pkgs{$custnum}} );
-    foreach ( @{$all_pkgs{$custnum}} ) {
-      #my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
-      my @cust_svc = $_->cust_svc;
-      push @lol_cust_svc, \@cust_svc;
-      $rowspan += scalar(@cust_svc) || 1;
-    }
-
-    #my($rowspan) = scalar(@{$all_pkgs{$custnum}});
-    my $view;
-    if ( defined $cgi->param('quickpay') && $cgi->param('quickpay') eq 'yes' ) {
-      $view = $p. 'edit/cust_pay.cgi?quickpay=yes;custnum='. $custnum;
-    } else {
-      $view = $p. 'view/cust_main.cgi?'. $custnum;
-    }
-    my $pcompany = $company
-      ? qq!<A HREF="$view"><FONT SIZE=-1>$company</FONT></A>!
-      : '<FONT SIZE=-1>&nbsp;</FONT>';
-    print <<END;
-    <TR>
-      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$custnum</FONT></A></TD>
-      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$last, $first</FONT></A></TD>
-      <TD ROWSPAN=$rowspan>$pcompany</TD>
-END
-    if ( defined dbdef->table('cust_main')->column('ship_last') ) {
-      my($ship_last,$ship_first,$ship_company)=(
-        $cust_main->ship_last || $cust_main->getfield('last'),
-        $cust_main->ship_last ? $cust_main->ship_first : $cust_main->first,
-        $cust_main->ship_last ? $cust_main->ship_company : $cust_main->company,
-      );
-      my $pship_company = $ship_company
-        ? qq!<A HREF="$view"><FONT SIZE=-1>$ship_company</FONT></A>!
-        : '<FONT SIZE=-1>&nbsp;</FONT>';
-      print <<END;
-      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$ship_last, $ship_first</FONT></A></TD>
-      <TD ROWSPAN=$rowspan>$pship_company</A></TD>
-END
-    }
-
-    my($n1)='';
-    foreach ( @{$all_pkgs{$custnum}} ) {
-      my $pkgnum = $_->pkgnum;
-#      my $part_pkg = qsearchs( 'part_pkg', { pkgpart => $_->pkgpart } );
-      my $part_pkg = $_->part_pkg;
-
-      my $pkg = $part_pkg->pkg;
-      my $comment = $part_pkg->comment;
-      my $pkgview = $p. 'view/cust_pkg.cgi?'. $pkgnum;
-      my @cust_svc = @{shift @lol_cust_svc};
-      #my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
-      my $rowspan = scalar(@cust_svc) || 1;
-
-      print $n1, qq!<TD ROWSPAN=$rowspan><A HREF="$pkgview"><FONT SIZE=-1>$pkg - $comment</FONT></A></TD>!;
-      my($n2)='';
-      foreach my $cust_svc ( @cust_svc ) {
-         my($label, $value, $svcdb) = $cust_svc->label;
-         my($svcnum) = $cust_svc->svcnum;
-         my($sview) = $p.'view';
-         print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
-               qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
-         $n2="</TR><TR>";
-      }
-      #print qq!</TR><TR>\n!;
-      $n1="</TR><TR>";
-    }
-    print "</TR>";
-  }
- 
-  print "</TABLE>$pager</BODY></HTML>";
-
-}
-
-#undef $cache; #does this help?
-
-#
-
-sub last_sort {
-  lc($a->getfield('last')) cmp lc($b->getfield('last'))
-  || lc($a->first) cmp lc($b->first);
-}
-
-sub company_sort {
-  return -1 if $a->company && ! $b->company;
-  return 1 if ! $a->company && $b->company;
-  lc($a->company) cmp lc($b->company)
-  || lc($a->getfield('last')) cmp lc($b->getfield('last'))
-  || lc($a->first) cmp lc($b->first);;
-}
-
-sub custnum_sort {
-  $a->getfield('custnum') <=> $b->getfield('custnum');
-}
-
-sub custnumsearch {
-
-  my $custnum = $cgi->param('custnum_text');
-  $custnum =~ s/\D//g;
-  $custnum =~ /^(\d{1,23})$/ or eidiot "Illegal customer number\n";
-  my $custnum = $1;
-  
-  [ qsearchs('cust_main', { 'custnum' => $custnum } ) ];
-}
-
-sub cardsearch {
-
-  my($card)=$cgi->param('card');
-  $card =~ s/\D//g;
-  $card =~ /^(\d{13,16})$/ or eidiot "Illegal card number\n";
-  my($payinfo)=$1;
-
-  [ qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'CARD'}) ];
-}
-
-sub referralsearch {
-  $cgi->param('referral_custnum') =~ /^(\d+)$/
-    or eidiot "Illegal referral_custnum";
-  my $cust_main = qsearchs('cust_main', { 'custnum' => $1 } )
-    or eidiot "Customer $1 not found";
-  my $depth;
-  if ( $cgi->param('referral_depth') ) {
-    $cgi->param('referral_depth') =~ /^(\d+)$/
-      or eidiot "Illegal referral_depth";
-    $depth = $1;
-  } else {
-    $depth = 1;
-  }
-  [ $cust_main->referral_cust_main($depth) ];
-}
-
-sub lastsearch {
-  my(%last_type);
-  my @cust_main;
-  foreach ( $cgi->param('last_type') ) {
-    $last_type{$_}++;
-  }
-
-  $cgi->param('last_text') =~ /^([\w \,\.\-\']*)$/
-    or eidiot "Illegal last name";
-  my($last)=$1;
-
-  if ( $last_type{'Exact'} || $last_type{'Fuzzy'} ) {
-    push @cust_main, qsearch( 'cust_main',
-                              { 'last' => { 'op'    => 'ILIKE',
-                                            'value' => $last    } } );
-
-    push @cust_main, qsearch( 'cust_main',
-                              { 'ship_last' => { 'op'    => 'ILIKE',
-                                                 'value' => $last    } } )
-      if defined dbdef->table('cust_main')->column('ship_last');
-  }
-
-  if ( $last_type{'Substring'} || $last_type{'All'} ) {
-
-    push @cust_main, qsearch( 'cust_main',
-                              { 'last' => { 'op'    => 'ILIKE',
-                                            'value' => "%$last%" } } );
-
-    push @cust_main, qsearch( 'cust_main',
-                              { 'ship_last' => { 'op'    => 'ILIKE',
-                                                 'value' => "%$last%" } } )
-      if defined dbdef->table('cust_main')->column('ship_last');
-
-  }
-
-  if ( $last_type{'Fuzzy'} || $last_type{'All'} ) {
-
-    &FS::cust_main::check_and_rebuild_fuzzyfiles;
-    my $all_last = &FS::cust_main::all_last;
-
-    my %last;
-    if ( $last_type{'Fuzzy'} || $last_type{'All'} ) { 
-      foreach ( amatch($last, [ qw(i) ], @$all_last) ) {
-        $last{$_}++; 
-      }
-    }
-
-    #if ($last_type{'Sound-alike'}) {
-    #}
-
-    foreach ( keys %last ) {
-      push @cust_main, qsearch('cust_main',{'last'=>$_});
-      push @cust_main, qsearch('cust_main',{'ship_last'=>$_})
-        if defined dbdef->table('cust_main')->column('ship_last');
-    }
-
-  }
-
-  \@cust_main;
-}
-
-sub companysearch {
-
-  my(%company_type);
-  my @cust_main;
-  foreach ( $cgi->param('company_type') ) {
-    $company_type{$_}++ 
-  };
-
-  $cgi->param('company_text') =~
-    /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=]*)$/
-      or eidiot "Illegal company";
-  my $company = $1;
-
-  if ( $company_type{'Exact'} || $company_type{'Fuzzy'} ) {
-    push @cust_main, qsearch( 'cust_main',
-                              { 'company' => { 'op'    => 'ILIKE',
-                                               'value' => $company } } );
-
-    push @cust_main, qsearch( 'cust_main',
-                              { 'ship_company' => { 'op'    => 'ILIKE',
-                                                    'value' => $company } } )
-      if defined dbdef->table('cust_main')->column('ship_last');
-  }
-
-  if ( $company_type{'Substring'} || $company_type{'All'} ) {
-
-    push @cust_main, qsearch( 'cust_main',
-                              { 'company' => { 'op'    => 'ILIKE',
-                                               'value' => "%$company%" } } );
-
-    push @cust_main, qsearch( 'cust_main',
-                              { 'ship_company' => { 'op'    => 'ILIKE',
-                                                    'value' => "%$company%" } })
-      if defined dbdef->table('cust_main')->column('ship_last');
-
-  }
-
-  if ( $company_type{'Fuzzy'} || $company_type{'All'} ) {
-
-    &FS::cust_main::check_and_rebuild_fuzzyfiles;
-    my $all_company = &FS::cust_main::all_company;
-
-    my %company;
-    if ( $company_type{'Fuzzy'} || $company_type{'All'} ) { 
-      foreach ( amatch($company, [ qw(i) ], @$all_company ) ) {
-        $company{$_}++;
-      }
-    }
-
-    #if ($company_type{'Sound-alike'}) {
-    #}
-
-    foreach ( keys %company ) {
-      push @cust_main, qsearch('cust_main',{'company'=>$_});
-      push @cust_main, qsearch('cust_main',{'ship_company'=>$_})
-        if defined dbdef->table('cust_main')->column('ship_last');
-    }
-
-  }
-
-  \@cust_main;
-}
-
-sub address2search {
-  my @cust_main;
-
-  $cgi->param('address2_text') =~
-    /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=]*)$/
-      or eidiot "Illegal address2";
-  my $address2 = $1;
-
-  push @cust_main, qsearch( 'cust_main',
-                            { 'address2' => { 'op'    => 'ILIKE',
-                                              'value' => $address2 } } );
-  push @cust_main, qsearch( 'cust_main',
-                            { 'address2' => { 'op'    => 'ILIKE',
-                                              'value' => $address2 } } )
-    if defined dbdef->table('cust_main')->column('ship_last');
-
-  \@cust_main;
-}
-
-sub phonesearch {
-  my @cust_main;
-
-  my $phone = $cgi->param('phone_text');
-
-  #false laziness with Record::ut_phonen, only works with US/CA numbers...
-  $phone =~ s/\D//g;
-  $phone =~ /^(\d{3})(\d{3})(\d{4})(\d*)$/
-    or eidiot gettext('illegal_phone'). ": $phone";
-  $phone = "$1-$2-$3";
-  $phone .= " x$4" if $4;
-
-  my @fields = qw(daytime night fax);
-  push @fields, qw(ship_daytime ship_night ship_fax)
-    if defined dbdef->table('cust_main')->column('ship_last');
-
-  for my $field ( @fields ) {
-    push @cust_main, qsearch ( 'cust_main', 
-                               { $field => { 'op'    => 'LIKE',
-                                             'value' => "$phone%" } } );
-  }
-
-  \@cust_main;
-}
-
-%>
diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html
deleted file mode 100755
index 5a066e453..000000000
--- a/httemplate/search/cust_main.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Customer Search</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <FONT SIZE=7>
-      Customer Search
-    </FONT>
-    <BR><BR>
-    <FORM ACTION="cust_main.cgi" METHOD="post">
-      <INPUT TYPE="checkbox" NAME="last_on" CHECKED> Search for <B>last name</B>: 
-      <INPUT TYPE="text" NAME="last_text">
-      using search method: <SELECT NAME="last_type">
-        <OPTION SELECTED>All
-        <OPTION>Fuzzy
-        <OPTION>Substring
-        <OPTION>Exact
-      </SELECT>
-
-      <P><INPUT TYPE="checkbox" NAME="company_on" CHECKED> Search for <B>company</B>: 
-      <INPUT TYPE="text" NAME="company_text">
-      using search methods: <SELECT NAME="company_type">
-        <OPTION SELECTED>All
-        <OPTION>Fuzzy
-        <OPTION>Substring
-        <OPTION>Exact
-      </SELECT>
-
-      <P><INPUT TYPE="submit" VALUE="Search"> Note: Fuzzy searching can take a while.  Please be patient.
-
-    </FORM>
-
-  <HR>Explanation of search methods:
-  <UL>
-    <LI><B>All</B> - Try all search methods.
-    <LI><B>Fuzzy</B> - Searches for matches that are close to your text.
-    <LI><B>Substring</B> - Searches for matches that contain your text.
-    <LI><B>Exact</B> - Finds exact matches only, but much faster than the other search methods.
-  </UL>
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi
deleted file mode 100755
index b5bdf8296..000000000
--- a/httemplate/search/cust_pay.cgi
+++ /dev/null
@@ -1,103 +0,0 @@
-<%
-
-$cgi->param('payinfo') =~ /^\s*(\d+)\s*$/ or die "illegal payinfo";
-my $payinfo = $1;
-$cgi->param('payby') =~ /^(\w+)$/ or die "illegal payby";
-my $payby = $1;
-my @cust_pay = qsearch('cust_pay', { 'payinfo' => $payinfo,
-                                     'payby'   => $payby    } );
-my $sortby = \*date_sort;
-
-if (0) {
-#if ( scalar(@cust_pay) == 1 ) {
-#  my $invnum = $cust_bill[0]->invnum;
-#  print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
-} elsif ( scalar(@cust_pay) == 0 ) {
-%>
-<!-- mason kludge -->
-<%
-  idiot("Check # not found.");
-  #exit;
-} else {
-  my $total = scalar(@cust_pay);
-  my $s = $total > 1 ? 's' : '';
-%>
-<!-- mason kludge -->
-<%
-  print header("Check # Search Results", menubar(
-          'Main Menu', popurl(2)
-        )), "$total matching check$s found<BR>", &table(), <<END;
-      <TR>
-        <TH></TH>
-        <TH>Amount</TH>
-        <TH>Date</TH>
-        <TH>Contact name</TH>
-        <TH>Company</TH>
-      </TR>
-END
-
-  my(%saw, $cust_pay);
-  foreach my $cust_pay (
-    sort $sortby grep(!$saw{$_->paynum}++, @cust_pay)
-  ) {
-    my($paynum, $custnum, $payinfo, $amount, $date ) = (
-      $cust_pay->paynum,
-      $cust_pay->custnum,
-      $cust_pay->payinfo,
-      sprintf("%.2f", $cust_pay->paid),
-      $cust_pay->_date,
-    );
-    my $pdate = time2str("%b %d %Y", $date);
-
-    my $rowspan = 1;
-
-    my $view = popurl(2). "view/cust_main.cgi?". $custnum. 
-               "#". $payby. $payinfo;
-
-    print <<END;
-      <TR>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$payinfo</FONT></A></TD>
-        <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view"><FONT SIZE=-1>\$$amount</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$pdate</FONT></A></TD>
-END
-    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
-    if ( $cust_main ) {
-      #my $cview = popurl(2). "view/cust_main.cgi?". $cust_main->custnum;
-      my ( $name, $company ) = (
-        $cust_main->last. ', '. $cust_main->first,
-        $cust_main->company,
-      );
-      print <<END;
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$name</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$company</FONT></A></TD>
-END
-    } else {
-      print <<END
-        <TD ROWSPAN=$rowspan COLSPAN=2>WARNING: couldn't find cust_main.custnum $custnum (cust_pay.paynum $paynum)</TD>
-END
-    }
-
-    print "</TR>";
-  }
-  print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-}
-
-#
-
-#sub invnum_sort {
-#  $a->invnum <=> $b->invnum;
-#}
-#
-#sub custnum_sort {
-#  $a->custnum <=> $b->custnum || $a->invnum <=> $b->invnum;
-#}
-
-sub date_sort {
-  $a->_date <=> $b->_date || $a->invnum <=> $b->invnum;
-}
-%>
diff --git a/httemplate/search/cust_pay.html b/httemplate/search/cust_pay.html
deleted file mode 100755
index 3848d66f7..000000000
--- a/httemplate/search/cust_pay.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Check # Search</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <FONT SIZE=7>
-      Check # Search
-    </FONT>
-    <BR><BR>
-    <FORM ACTION="cust_pay.cgi" METHOD="post">
-      Search for <B>check #</B>:
-      <INPUT TYPE="text" NAME="payinfo">
-      <INPUT TYPE="hidden" NAME="payby" VALUE="BILL">
-      <BR><BR><INPUT TYPE="submit" VALUE="Search">
-    </FORM>
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
deleted file mode 100755
index abf6eee4c..000000000
--- a/httemplate/search/cust_pkg.cgi
+++ /dev/null
@@ -1,319 +0,0 @@
-<%
-
-my $conf = new FS::Conf;
-my $maxrecords = $conf->config('maxsearchrecordsperpage');
-
-my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
-
-my $limit = '';
-$limit .= "LIMIT $maxrecords" if $maxrecords;
-
-my $offset = $cgi->param('offset') || 0;
-$limit .= " OFFSET $offset" if $offset;
-
-my $total;
-
-my($query) = $cgi->keywords;
-my $sortby;
-my @cust_pkg;
-
-if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
-  $sortby=\*bill_sort;
-  my $range = '';
-  if ( $cgi->param('beginning')
-       && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
-    my $beginning = str2time($1);
-    $range = " WHERE bill >= $beginning ";
-  }
-  if ( $cgi->param('ending')
-            && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
-    my $ending = str2time($1) + 86400;
-    $range .= ( $range ? ' AND ' : ' WHERE ' ). " bill <= $ending ";
-  }
-
-  #false laziness with below
-  my $statement = "SELECT COUNT(*) FROM cust_pkg $range";
-  warn $statement;
-  my $sth = dbh->prepare($statement) or die dbh->errstr." preparing $statement";
-  $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
-  
-  $total = $sth->fetchrow_arrayref->[0];
-  
-  @cust_pkg = qsearch('cust_pkg',{}, '', " $range ORDER BY bill $limit" );
-
-} else {
-
-  my $unconf = '';
-  if ( $query eq 'pkgnum' ) {
-    $sortby=\*pkgnum_sort;
-
-  } elsif ( $query eq 'APKG_pkgnum' ) {
-  
-    $sortby=\*pkgnum_sort;
-  
-    #@cust_pkg=();
-    ##perhaps this should go in cust_pkg as a qsearch-like constructor?
-    #my($cust_pkg);
-    #foreach $cust_pkg (
-    #  qsearch('cust_pkg',{}, '', "ORDER BY pkgnum $limit" )
-    #) {
-    #  my($flag)=0;
-    #  my($pkg_svc);
-    #  PKG_SVC: 
-    #  foreach $pkg_svc (qsearch('pkg_svc',{ 'pkgpart' => $cust_pkg->pkgpart })) {
-    #    if ( $pkg_svc->quantity 
-    #         > scalar(qsearch('cust_svc',{
-    #             'pkgnum' => $cust_pkg->pkgnum,
-    #             'svcpart' => $pkg_svc->svcpart,
-    #           }))
-    #       )
-    #    {
-    #      $flag=1;
-    #      last PKG_SVC;
-    #    }
-    #  }
-    #  push @cust_pkg, $cust_pkg if $flag;
-    #}
-
-    if ( driver_name eq 'mysql' ) {
-      #$query = "DROP TABLE temp1_$$,temp2_$$;";
-      #my $sth = dbh->prepare($query);
-      #$sth->execute;
-
-      $query = "CREATE TEMPORARY TABLE temp1_$$ TYPE=MYISAM
-                  SELECT cust_svc.pkgnum,cust_svc.svcpart,COUNT(*) as count
-                    FROM cust_pkg,cust_svc,pkg_svc
-                      WHERE cust_pkg.pkgnum = cust_svc.pkgnum
-                      AND cust_svc.svcpart = pkg_svc.svcpart
-                      AND cust_pkg.pkgpart = pkg_svc.pkgpart
-                      GROUP BY cust_svc.pkgnum,cust_svc.svcpart";
-      $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
-         
-      $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
-  
-      $query = "CREATE TEMPORARY TABLE temp2_$$ TYPE=MYISAM
-                  SELECT cust_pkg.pkgnum FROM cust_pkg
-                    LEFT JOIN pkg_svc ON (cust_pkg.pkgpart=pkg_svc.pkgpart)
-                    LEFT JOIN temp1_$$ ON (cust_pkg.pkgnum = temp1_$$.pkgnum
-                                           AND pkg_svc.svcpart=temp1_$$.svcpart)
-                    WHERE ( pkg_svc.quantity > temp1_$$.count
-                            OR temp1_$$.pkgnum IS NULL )
-                          AND pkg_svc.quantity != 0;";
-      $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";   
-      $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
-      $unconf = " LEFT JOIN temp2_$$ ON cust_pkg.pkgnum = temp2_$$.pkgnum
-                    WHERE temp2_$$.pkgnum IS NOT NULL";
-
-    } else {
-
-     $unconf = "
-       WHERE 0 <
-         ( SELECT count(*) FROM pkg_svc
-             WHERE pkg_svc.pkgpart = cust_pkg.pkgpart
-               AND pkg_svc.quantity > ( SELECT count(*) FROM cust_svc
-                                        WHERE cust_svc.pkgnum = cust_pkg.pkgnum
-                                          AND cust_svc.svcpart = pkg_svc.svcpart
-                                      )
-         )
-     ";
-
-    }
-    
-  } else {
-    die "Empty QUERY_STRING!";
-  }
-  
-  my $statement = "SELECT COUNT(*) FROM cust_pkg $unconf";
-  my $sth = dbh->prepare($statement) or die dbh->errstr." preparing $statement";
-  $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
-  
-  $total = $sth->fetchrow_arrayref->[0];
-
-  my $tblname = driver_name eq 'mysql' ? 'cust_pkg.' : '';
-  @cust_pkg =
-    qsearch('cust_pkg',{}, '', "$unconf ORDER BY ${tblname}pkgnum $limit" );
-
-  if ( driver_name eq 'mysql' ) {
-    $query = "DROP TABLE temp1_$$,temp2_$$;";
-    my $sth = dbh->prepare($query) or die dbh->errstr. " doing $query";
-    $sth->execute; # or die "Error executing \"$query\": ". $sth->errstr;
-  }
-  
-}
-
-if ( scalar(@cust_pkg) == 1 ) {
-  my($pkgnum)=$cust_pkg[0]->pkgnum;
-  print $cgi->redirect(popurl(2). "view/cust_pkg.cgi?$pkgnum");
-  #exit;
-} elsif ( scalar(@cust_pkg) == 0 ) { #error
-%>
-<!-- mason kludge -->
-<%
-  eidiot("No packages found");
-} else {
-%>
-<!-- mason kludge -->
-<%
-  $total ||= scalar(@cust_pkg);
-
-  #begin pager
-  my $pager = '';
-  if ( $total != scalar(@cust_pkg) && $maxrecords ) {
-    unless ( $offset == 0 ) {
-      $cgi->param('offset', $offset - $maxrecords);
-      $pager .= '<A HREF="'. $cgi->self_url.
-                '"><B><FONT SIZE="+1">Previous</FONT></B></A> ';
-    }
-    my $poff;
-    my $page;
-    for ( $poff = 0; $poff < $total; $poff += $maxrecords ) {
-      $page++;
-      if ( $offset == $poff ) {
-        $pager .= qq!<FONT SIZE="+2">$page</FONT> !;
-      } else {
-        $cgi->param('offset', $poff);
-        $pager .= qq!<A HREF="!. $cgi->self_url. qq!">$page</A> !;
-      }
-    }
-    unless ( $offset + $maxrecords > $total ) {
-      $cgi->param('offset', $offset + $maxrecords);
-      $pager .= '<A HREF="'. $cgi->self_url.
-                '"><B><FONT SIZE="+1">Next</FONT></B></A> ';
-    }
-  }
-  #end pager
-  
-  print header('Package Search Results',''),
-        "$total matching packages found<BR><BR>$pager", &table(), <<END;
-      <TR>
-        <TH>Package</TH>
-        <TH><FONT SIZE=-1>Setup</FONT></TH>
-        <TH><FONT SIZE=-1>Next<BR>bill</FONT></TH>
-        <TH><FONT SIZE=-1>Susp.</FONT></TH>
-        <TH><FONT SIZE=-1>Expire</FONT></TH>
-        <TH><FONT SIZE=-1>Cancel</FONT></TH>
-        <TH><FONT SIZE=-1>Cust#</FONT></TH>
-        <TH>(bill) name</TH>
-        <TH>company</TH>
-END
-
-if ( defined dbdef->table('cust_main')->column('ship_last') ) {
-  print <<END;
-      <TH>(service) name</TH>
-      <TH>company</TH>
-END
-}
-
-print <<END;
-        <TH COLSPAN=2>Services</TH>
-      </TR>
-END
-
-  my $n1 = '<TR>';
-  my(%saw,$cust_pkg);
-  foreach $cust_pkg (
-    sort $sortby grep(!$saw{$_->pkgnum}++, @cust_pkg)
-  ) {
-    my($cust_main)=qsearchs('cust_main',{'custnum'=>$cust_pkg->custnum});
-    my($pkgnum, $setup, $bill, $susp, $expire, $cancel,
-       $custnum, $last, $first, $company ) = (
-      $cust_pkg->pkgnum,
-      $cust_pkg->getfield('setup')
-        ? time2str("%D", $cust_pkg->getfield('setup') )
-        : '',
-      $cust_pkg->getfield('bill')
-        ? time2str("%D", $cust_pkg->getfield('bill') )
-        : '',
-      $cust_pkg->getfield('susp')
-        ? time2str("%D", $cust_pkg->getfield('susp') )
-        : '',
-      $cust_pkg->getfield('expire')
-        ? time2str("%D", $cust_pkg->getfield('expire') )
-        : '',
-      $cust_pkg->getfield('cancel')
-        ? time2str("%D", $cust_pkg->getfield('cancel') )
-        : '',
-      $cust_pkg->custnum,
-      $cust_main ? $cust_main->last : '',
-      $cust_main ? $cust_main->first : '',
-      $cust_main ? $cust_main->company : '',
-    );
-    my($ship_last, $ship_first, $ship_company);
-    if ( defined dbdef->table('cust_main')->column('ship_last') ) {
-      ($ship_last, $ship_first, $ship_company) = (
-        $cust_main
-          ? ( $cust_main->ship_last || $cust_main->getfield('last') )
-          : '',
-        $cust_main 
-          ? ( $cust_main->ship_last
-              ? $cust_main->ship_first
-              : $cust_main->first )
-          : '',
-        $cust_main 
-          ? ( $cust_main->ship_last
-              ? $cust_main->ship_company
-              : $cust_main->company )
-          : '',
-      );
-    }
-    my $pkg = $part_pkg{$cust_pkg->pkgpart}->pkg;
-    #$pkg .= ' - '. $part_pkg{$cust_pkg->pkgpart}->comment;
-    my @cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
-    my $rowspan = scalar(@cust_svc) || 1;
-    my $p = popurl(2);
-    print $n1, <<END;
-      <TD ROWSPAN=$rowspan><A HREF="${p}view/cust_pkg.cgi?$pkgnum"><FONT SIZE=-1>$pkgnum - $pkg</FONT></A></TD>
-      <TD>$setup</TD>
-      <TD>$bill</TD>
-      <TD>$susp</TD>
-      <TD>$expire</TD>
-      <TD>$cancel</TD>
-END
-    if ( $cust_main ) {
-      print <<END;
-      <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$custnum</A></FONT></TD>
-      <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$last, $first</A></FONT></TD>
-      <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$company</A></FONT></TD>
-END
-      if ( defined dbdef->table('cust_main')->column('ship_last') ) {
-        print <<END;
-      <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$ship_last, $ship_first</A></FONT></TD>
-      <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$ship_company</A></FONT></TD>
-END
-      }
-    } else {
-      my $colspan = defined dbdef->table('cust_main')->column('ship_last')
-                    ? 5 : 3;
-      print <<END;
-      <TD ROWSPAN=$rowspan COLSPAN=$colspan>WARNING: couldn't find cust_main.custnum $custnum (cust_pkg.pkgnum $pkgnum)</TD>
-END
-    }
-
-    my $n2 = '';
-    foreach my $cust_svc ( @cust_svc ) {
-      my($label, $value, $svcdb) = $cust_svc->label;
-      my $svcnum = $cust_svc->svcnum;
-      my $sview = $p. "view";
-      print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
-            qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
-      $n2="</TR><TR>";
-    }
-
-    $n1 = "</TR><TR>";
-
-  }
-    print '</TR>';
- 
-  print "</TABLE>$pager</BODY></HTML>";
-
-}
-
-sub pkgnum_sort {
-  $a->getfield('pkgnum') <=> $b->getfield('pkgnum');
-}
-
-sub bill_sort {
-  $a->getfield('bill') <=> $b->getfield('bill');
-}
-
-%>
diff --git a/httemplate/search/cust_pkg.html b/httemplate/search/cust_pkg.html
deleted file mode 100755
index bb0a5407c..000000000
--- a/httemplate/search/cust_pkg.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Packages</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Packages</H1>
-    </CENTER>
-    <HR>
-    <FORM ACTION="cust_pkg.cgi" METHOD="post">
-    <INPUT TYPE="hidden" NAME="magic" VALUE="bill">
-      Return <B>packages</B> with next bill date: 
-      from <INPUT TYPE="text" NAME="beginning"> <i>m/d/y</i>
-      to <INPUT TYPE="text" NAME="ending"> <i>m/d/y</i>
-
-      <P><INPUT TYPE="submit" VALUE="Get Report">
-
-    </FORM>
-
-  <HR>
-
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/report_cc.cgi b/httemplate/search/report_cc.cgi
deleted file mode 100755
index c2ab726b6..000000000
--- a/httemplate/search/report_cc.cgi
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $user = getotaker;
-
-$cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
-my $beginning = $1;
-
-$cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
-my $ending = $1;
-
-print header('Credit Card Recipt Report Results');
-
-open (REPORT, "freeside-cc-receipts-report -v -s $beginning -f $ending $user |");
-
-print '<PRE>';
-while(<REPORT>) {
-  print $_;
-}
-print '</PRE>';
-
-print '</BODY></HTML>';
-
-%>
-
diff --git a/httemplate/search/report_cc.html b/httemplate/search/report_cc.html
deleted file mode 100755
index 8653dcc69..000000000
--- a/httemplate/search/report_cc.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Credit Card Receipt Report Criteria</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Credit Card Receipt Report Criteria</H1>
-    </CENTER>
-    <HR>
-    <FORM ACTION="report_cc.cgi" METHOD="post">
-      Return <B>credit card receipt report</B> for period: 
-      from <INPUT TYPE="text" NAME="beginning"> <i>m/d/y</i>
-      to <INPUT TYPE="text" NAME="ending"> <i>m/d/y</i>
-
-      <P><INPUT TYPE="submit" VALUE="Get Report">
-
-    </FORM>
-
-  <HR>
-
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/report_credit.cgi b/httemplate/search/report_credit.cgi
deleted file mode 100755
index 2adafc06e..000000000
--- a/httemplate/search/report_credit.cgi
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $user = getotaker;
-
-$cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
-my $beginning = $1;
-
-$cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
-my $ending = $1;
-
-print header('In House Credit Report Results');
-
-open (REPORT, "freeside-credit-report -v -s $beginning -f $ending $user |");
-
-print '<PRE>';
-while(<REPORT>) {
-  print $_;
-}
-print '</PRE>';
-
-print '</BODY></HTML>';
-
-%>
-
diff --git a/httemplate/search/report_credit.html b/httemplate/search/report_credit.html
deleted file mode 100755
index df9b9581f..000000000
--- a/httemplate/search/report_credit.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>In House Credit Report Criteria</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>In House Credit Report Criteria</H1>
-    </CENTER>
-    <HR>
-    <FORM ACTION="report_credit.cgi" METHOD="post">
-      Return <B>in house credit report</B> for period: 
-      from <INPUT TYPE="text" NAME="beginning"> <i>m/d/y</i>
-      to <INPUT TYPE="text" NAME="ending"> <i>m/d/y</i>
-
-      <P><INPUT TYPE="submit" VALUE="Get Report">
-
-    </FORM>
-
-  <HR>
-
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
deleted file mode 100755
index fdd3779a9..000000000
--- a/httemplate/search/report_receivables.cgi
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $user = getotaker;
-
-print header('Current Receivables Report Results');
-
-open (REPORT, "freeside-receivables-report -v $user |");
-
-print '<PRE>';
-while(<REPORT>) {
-  print $_;
-}
-print '</PRE>';
-
-print '</BODY></HTML>';
-
-%>
-
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
deleted file mode 100755
index ac76fad6e..000000000
--- a/httemplate/search/report_tax.cgi
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $user = getotaker;
-
-$cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
-my $beginning = $1;
-
-$cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
-my $ending = $1;
-
-print header('Tax Report Results');
-
-open (REPORT, "freeside-tax-report -v -s $beginning -f $ending $user |");
-
-print '<PRE>';
-while(<REPORT>) {
-  print $_;
-}
-print '</PRE>';
-
-print '</BODY></HTML>';
-
-%>
-
diff --git a/httemplate/search/report_tax.html b/httemplate/search/report_tax.html
deleted file mode 100755
index 7bf681b42..000000000
--- a/httemplate/search/report_tax.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Tax Report Criteria</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Tax Report Criteria</H1>
-    </CENTER>
-    <HR>
-    <FORM ACTION="report_tax.cgi" METHOD="post">
-      Return <B>tax report</B> for period: 
-      from <INPUT TYPE="text" NAME="beginning"> <i>m/d/y</i>
-      to <INPUT TYPE="text" NAME="ending"> <i>m/d/y</i>
-
-      <P><INPUT TYPE="submit" VALUE="Get Report">
-
-    </FORM>
-
-  <HR>
-
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/sql.cgi b/httemplate/search/sql.cgi
deleted file mode 100755
index b83ef039f..000000000
--- a/httemplate/search/sql.cgi
+++ /dev/null
@@ -1,76 +0,0 @@
-<%
-
-my $conf = new FS::Conf;
-my $maxrecords = $conf->config('maxsearchrecordsperpage');
-
-my $limit = '';
-$limit .= "LIMIT $maxrecords" if $maxrecords;
-
-my $offset = $cgi->param('offset') || 0;
-$limit .= " OFFSET $offset" if $offset;
-
-my $total;
-
-my $sql = $cgi->param('sql');
-$sql =~ s/^\s*SELECT//i;
-
-my $count_sql = $sql;
-$count_sql =~ s/^(.*)\s+FROM\s/COUNT(*) FROM /i;
-
-my $sth = dbh->prepare("SELECT $count_sql")
-  or eidiot dbh->errstr. " doing $count_sql\n";
-$sth->execute or eidiot "Error executing \"$count_sql\": ". $sth->errstr;
-
-$total = $sth->fetchrow_arrayref->[0];
-
-my $sth = dbh->prepare("SELECT $sql $limit")
-  or eidiot dbh->errstr. " doing $sql\n";
-$sth->execute or eidiot "Error executing \"$sql\": ". $sth->errstr;
-my $rows = $sth->fetchall_arrayref;
-
-%>
-<!-- mason kludge -->
-<%
-
-  #begin pager
-  my $pager = '';
-  if ( $total != scalar(@$rows) && $maxrecords ) {
-    unless ( $offset == 0 ) {
-      $cgi->param('offset', $offset - $maxrecords);
-      $pager .= '<A HREF="'. $cgi->self_url.
-                '"><B><FONT SIZE="+1">Previous</FONT></B></A> ';
-    }
-    my $poff;
-    my $page;
-    for ( $poff = 0; $poff < $total; $poff += $maxrecords ) {
-      $page++;
-      if ( $offset == $poff ) {
-        $pager .= qq!<FONT SIZE="+2">$page</FONT> !;
-      } else {
-        $cgi->param('offset', $poff);
-        $pager .= qq!<A HREF="!. $cgi->self_url. qq!">$page</A> !;
-      }
-    }
-    unless ( $offset + $maxrecords > $total ) {
-      $cgi->param('offset', $offset + $maxrecords);
-      $pager .= '<A HREF="'. $cgi->self_url.
-                '"><B><FONT SIZE="+1">Next</FONT></B></A> ';
-    }
-  }
-  #end pager
-
-  print header('Query Results', menubar('Main Menu'=>$p) ).
-        "$total total rows<BR><BR>$pager". table().
-        "<TR>";
-  print "<TH>$_</TH>" foreach @{$sth->{NAME}};
-  print "</TR>";
-
-  foreach $row ( @$rows ) {
-    print "<TR>";
-    print "<TD>$_</TD>" foreach @$row;
-    print "</TR>";
-  }
-
-  print "</TABLE>$pager</BODY></HTML>";
-
-%>
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
deleted file mode 100755
index 549231d3f..000000000
--- a/httemplate/search/svc_acct.cgi
+++ /dev/null
@@ -1,294 +0,0 @@
-<%
-
-my $mydomain = '';
-
-my $conf = new FS::Conf;
-my $maxrecords = $conf->config('maxsearchrecordsperpage');
-
-my $orderby = ''; #removeme
-
-my $limit = '';
-$limit .= "LIMIT $maxrecords" if $maxrecords;
-
-my $offset = $cgi->param('offset') || 0;
-$limit .= " OFFSET $offset" if $offset;
-
-my $total;
-
-my($query)=$cgi->keywords;
-$query ||= ''; #to avoid use of unitialized value errors
-
-my $unlinked = '';
-if ( $query =~ /^UN_(.*)$/ ) {
-  $query = $1;
-  my $empty = driver_name eq 'Pg' ? qq('') : qq("");
-  if ( driver_name eq 'mysql' ) {
-    $unlinked = "LEFT JOIN cust_svc ON cust_svc.svcnum = svc_acct.svcnum
-                 WHERE cust_svc.pkgnum IS NULL
-                    OR cust_svc.pkgnum = 0
-                    OR cust_svc.pkgnum = $empty";
-  } else {
-    $unlinked = "
-      WHERE 0 <
-        ( SELECT count(*) FROM cust_svc
-            WHERE cust_svc.svcnum = svc_acct.svcnum
-              AND ( pkgnum IS NULL OR pkgnum = 0 OR pkgnum = $empty )
-        )
-    ";
-  }
-}
-
-my $tblname = driver_name eq 'mysql' ? 'svc_acct.' : '';
-my(@svc_acct, $sortby);
-if ( $query eq 'svcnum' ) {
-  $sortby=\*svcnum_sort;
-  $orderby = "ORDER BY ${tblname}svcnum";
-} elsif ( $query eq 'username' ) {
-  $sortby=\*username_sort;
-  $orderby = "ORDER BY ${tblname}username";
-} elsif ( $query eq 'uid' ) {
-  $sortby=\*uid_sort;
-  $orderby = ( $unlinked ? 'AND' : 'WHERE' ).
-             " ${tblname}uid IS NOT NULL ORDER BY ${tblname}uid";
-} else {
-  $sortby=\*uid_sort;
-  @svc_acct = @{&usernamesearch};
-}
-
-if ( $query eq 'svcnum' || $query eq 'username' || $query eq 'uid' ) {
-
-  my $statement = "SELECT COUNT(*) FROM svc_acct $unlinked";
-  my $sth = dbh->prepare($statement)
-    or die dbh->errstr. " doing $statement";
-  $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
-
-  $total = $sth->fetchrow_arrayref->[0];
-
-  @svc_acct = qsearch('svc_acct', {}, '', "$unlinked $orderby $limit");
-
-}
-
-if ( scalar(@svc_acct) == 1 ) {
-  my($svcnum)=$svc_acct[0]->svcnum;
-  print $cgi->redirect(popurl(2). "view/svc_acct.cgi?$svcnum");  #redirect
-  #exit;
-} elsif ( scalar(@svc_acct) == 0 ) { #error
-%>
-<!-- mason kludge -->
-<%
-  idiot("Account not found");
-} else {
-%>
-<!-- mason kludge -->
-<%
-  $total ||= scalar(@svc_acct);
-
-  #begin pager
-  my $pager = '';
-  if ( $total != scalar(@svc_acct) && $maxrecords ) {
-    unless ( $offset == 0 ) {
-      $cgi->param('offset', $offset - $maxrecords);
-      $pager .= '<A HREF="'. $cgi->self_url.
-                '"><B><FONT SIZE="+1">Previous</FONT></B></A> ';
-    }
-    my $poff;
-    my $page;
-    for ( $poff = 0; $poff < $total; $poff += $maxrecords ) {
-      $page++;
-      if ( $offset == $poff ) {
-        $pager .= qq!<FONT SIZE="+2">$page</FONT> !;
-      } else {
-        $cgi->param('offset', $poff);
-        $pager .= qq!<A HREF="!. $cgi->self_url. qq!">$page</A> !;
-      }
-    }
-    unless ( $offset + $maxrecords > $total ) {
-      $cgi->param('offset', $offset + $maxrecords);
-      $pager .= '<A HREF="'. $cgi->self_url.
-                '"><B><FONT SIZE="+1">Next</FONT></B></A> ';
-    }
-  }
-  #end pager
-
-  print header("Account Search Results",menubar('Main Menu'=>popurl(2))),
-        "$total matching accounts found<BR><BR>$pager",
-        &table(), <<END;
-      <TR>
-        <TH><FONT SIZE=-1>#</FONT></TH>
-        <TH><FONT SIZE=-1>Username</FONT></TH>
-        <TH><FONT SIZE=-1>Domain</FONT></TH>
-        <TH><FONT SIZE=-1>UID</FONT></TH>
-        <TH><FONT SIZE=-1>Service</FONT></TH>
-        <TH><FONT SIZE=-1>Cust#</FONT></TH>
-        <TH><FONT SIZE=-1>(bill) name</FONT></TH>
-        <TH><FONT SIZE=-1>company</FONT></TH>
-END
-  if ( defined dbdef->table('cust_main')->column('ship_last') ) {
-    print <<END;
-        <TH><FONT SIZE=-1>(service) name</FONT></TH>
-        <TH><FONT SIZE=-1>company</FONT></TH>
-END
-  }
-  print "</TR>";
-
-  my(%saw,$svc_acct);
-  my $p = popurl(2);
-  foreach $svc_acct (
-    sort $sortby grep(!$saw{$_->svcnum}++, @svc_acct)
-  ) {
-    my $cust_svc = qsearchs('cust_svc', { 'svcnum' => $svc_acct->svcnum })
-      or die "No cust_svc record for svcnum ". $svc_acct->svcnum;
-    my $part_svc = qsearchs('part_svc', { 'svcpart' => $cust_svc->svcpart })
-      or die "No part_svc record for svcpart ". $cust_svc->svcpart;
-
-    my $domain;
-    my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc });
-    if ( $svc_domain ) {
-      $domain = "<A HREF=\"${p}view/svc_domain.cgi?". $svc_domain->svcnum.
-                "\">". $svc_domain->domain. "</A>";
-    } else {
-      unless ( $mydomain ) {
-        my $conf = new FS::Conf;
-        unless ( $mydomain = $conf->config('domain') ) {
-          die "No legacy domain config file and no svc_domain.svcnum record ".
-              "for svc_acct.domsvc: ". $svc_acct->domsvc;
-        }
-      }
-      $domain = "<i>$mydomain</i><FONT COLOR=\"#FF0000\">*</FONT>";
-    }
-    my($cust_pkg,$cust_main);
-    if ( $cust_svc->pkgnum ) {
-      $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_svc->pkgnum })
-        or die "No cust_pkg record for pkgnum ". $cust_svc->pkgnum;
-      $cust_main = qsearchs('cust_main', { 'custnum' => $cust_pkg->custnum })
-        or die "No cust_main record for custnum ". $cust_pkg->custnum;
-    }
-    my($svcnum, $username, $uid, $svc, $custnum, $last, $first, $company) = (
-      $svc_acct->svcnum,
-      $svc_acct->getfield('username'),
-      $svc_acct->getfield('uid'),
-      $part_svc->svc,
-      $cust_svc->pkgnum ? $cust_main->custnum : '',
-      $cust_svc->pkgnum ? $cust_main->getfield('last') : '',
-      $cust_svc->pkgnum ? $cust_main->getfield('first') : '',
-      $cust_svc->pkgnum ? $cust_main->company : '',
-    );
-    my($pcustnum) = $custnum
-      ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\"><FONT SIZE=-1>$custnum</FONT></A>"
-      : "<I>(unlinked)</I>"
-    ;
-    my $pname = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$last, $first</A>" : '';
-    my $pcompany = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$company</A>" : '';
-    my($pship_name, $pship_company);
-    if ( defined dbdef->table('cust_main')->column('ship_last') ) {
-      my($ship_last, $ship_first, $ship_company) = (
-        $cust_svc->pkgnum ? ( $cust_main->ship_last || $last ) : '',
-        $cust_svc->pkgnum ? ( $cust_main->ship_last
-                              ? $cust_main->ship_first
-                              : $first
-                            ) : '',
-        $cust_svc->pkgnum ? ( $cust_main->ship_last
-                              ? $cust_main->ship_company
-                              : $company
-                            ) : '',
-      );
-      $pship_name = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$ship_last, $ship_first</A>" : '';
-      $pship_company = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$ship_company</A>" : '';
-    }
-    print <<END;
-    <TR>
-      <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
-      <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$username</FONT></A></TD>
-      <TD><FONT SIZE=-1>$domain</FONT></TD>
-      <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$uid</FONT></A></TD>
-      <TD><FONT SIZE=-1>$svc</FONT></TH>
-      <TD><FONT SIZE=-1>$pcustnum</FONT></TH>
-      <TD><FONT SIZE=-1>$pname<FONT></TH>
-      <TD><FONT SIZE=-1>$pcompany</FONT></TH>
-END
-    if ( defined dbdef->table('cust_main')->column('ship_last') ) {
-      print <<END;
-      <TD><FONT SIZE=-1>$pship_name<FONT></TH>
-      <TD><FONT SIZE=-1>$pship_company</FONT></TH>
-END
-    }
-    print "</TR>";
-
-  }
- 
-  print "</TABLE>$pager<BR>";
-
-  if ( $mydomain ) {
-    print "<BR><FONT COLOR=\"#FF0000\">*</FONT> The <I>$mydomain</I> domain ".
-          "is contained in your legacy <CODE>domain</CODE> ".
-          "<A HREF=\"${p}docs/config.html#domain\">configuration file</A>.  ".
-          "You should run the <CODE>bin/fs-migrate-svc_acct_sm</CODE> script ".
-          "to create a proper svc_domain record for this domain.";
-  }
-
-  print '</BODY></HTML>';
-
-}
-
-sub svcnum_sort {
-  $a->getfield('svcnum') <=> $b->getfield('svcnum');
-}
-
-sub username_sort {
-  $a->getfield('username') cmp $b->getfield('username');
-}
-
-sub uid_sort {
-  $a->getfield('uid') <=> $b->getfield('uid');
-}
-
-sub usernamesearch {
-
-  my @svc_acct;
-
-  my %username_type;
-  foreach ( $cgi->param('username_type') ) {
-    $username_type{$_}++;
-  }
-
-  $cgi->param('username') =~ /^([\w\-\.\&]+)$/; #untaint username_text
-  my $username = $1;
-
-  if ( $username_type{'Exact'} || $username_type{'Fuzzy'} ) {
-    push @svc_acct, qsearch( 'svc_acct',
-                             { 'username' => { 'op'    => 'ILIKE',
-                                               'value' => $username } } );
-  }
-
-  if ( $username_type{'Substring'} || $username_type{'All'} ) {
-    push @svc_acct, qsearch( 'svc_acct',
-                             { 'username' => { 'op'    => 'ILIKE',
-                                               'value' => "%$username%" } } );
-  }
-
-  if ( $username_type{'Fuzzy'} || $username_type{'All'} ) {
-    &FS::svc_acct::check_and_rebuild_fuzzyfiles;
-    my $all_username = &FS::svc_acct::all_username;
-
-    my %username;
-    if ( $username_type{'Fuzzy'} || $username_type{'All'} ) { 
-      foreach ( amatch($username, [ qw(i) ], @$all_username) ) {
-        $username{$_}++; 
-      }
-    }
-
-    #if ($username_type{'Sound-alike'}) {
-    #}
-
-    foreach ( keys %username ) {
-      push @svc_acct, qsearch('svc_acct',{'username'=>$_});
-    }
-
-  }
-
-  #[ qsearch('svc_acct',{'username'=>$username}) ];
-  \@svc_acct;
-
-}
-
-%>
diff --git a/httemplate/search/svc_acct.html b/httemplate/search/svc_acct.html
deleted file mode 100755
index 742360596..000000000
--- a/httemplate/search/svc_acct.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Account Search</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <FONT SIZE=7>
-      Account Search
-    </FONT>
-    <BR><BR>
-    <FORM ACTION="svc_acct.cgi" METHOD="post">
-      Search for <B>username</B>: 
-      <INPUT TYPE="text" NAME="username">
-
-      <P><INPUT TYPE="submit" VALUE="Search">
-
-    </FORM>
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/svc_acct_sm.cgi b/httemplate/search/svc_acct_sm.cgi
deleted file mode 100755
index 4ee300612..000000000
--- a/httemplate/search/svc_acct_sm.cgi
+++ /dev/null
@@ -1,84 +0,0 @@
-<%
-
-my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
-
-$cgi->param('domuser') =~ /^([a-z0-9_\-]{0,32})$/;
-my $domuser = $1;
-
-$cgi->param('domain') =~ /^([\w\-\.]+)$/ or die "Illegal domain";
-my $svc_domain = qsearchs('svc_domain',{'domain'=>$1})
-  or die "Unknown domain";
-my $domsvc = $svc_domain->svcnum;
-
-my @svc_acct_sm;
-if ($domuser) {
-  @svc_acct_sm=qsearch('svc_acct_sm',{
-    'domuser' => $domuser,
-    'domsvc'  => $domsvc,
-  });
-} else {
-  @svc_acct_sm=qsearch('svc_acct_sm',{'domsvc' => $domsvc});
-}
-
-if ( scalar(@svc_acct_sm) == 1 ) {
-  my($svcnum)=$svc_acct_sm[0]->svcnum;
-  print $cgi->redirect(popurl(2). "view/svc_acct_sm.cgi?$svcnum");
-} elsif ( scalar(@svc_acct_sm) > 1 ) {
-%>
-<!-- mason kludge -->
-<%
-  print header('Mail Alias Search Results'), &table(), <<END;
-      <TR>
-        <TH>Mail to<BR><FONT SIZE=-1>(click to view mail alias)</FONT></TH>
-        <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
-      </TR>
-END
-
-  my($svc_acct_sm);
-  foreach $svc_acct_sm (@svc_acct_sm) {
-    my($svcnum,$domuser,$domuid,$domsvc)=(
-      $svc_acct_sm->svcnum,
-      $svc_acct_sm->domuser,
-      $svc_acct_sm->domuid,
-      $svc_acct_sm->domsvc,
-    );
-
-    my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $domsvc } );
-    if ( $svc_domain ) {
-      my $domain = $svc_domain->domain;
-
-      print qq!<TR><TD><A HREF="!. popurl(2). qq!view/svc_acct_sm.cgi?$svcnum">!,
-      #print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
-            ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ),
-            qq!\@$domain</A> </TD>!,
-      ;
-    } else {
-      my $warning = "couldn't find svc_domain.svcnum $svcnum ( svc_acct_sm.svcnum $svcnum";
-      warn $warning;
-      print "<TR><TD>WARNING: $warning</TD>";
-    }
-
-    my $svc_acct = qsearchs( 'svc_acct', { 'uid' => $domuid } );
-    if ( $svc_acct ) {
-      my $username = $svc_acct->username;
-      my $svc_acct_svcnum =$svc_acct->svcnum;
-      print qq!<TD><A HREF="!, popurl(2),
-            qq!view/svc_acct.cgi?$svc_acct_svcnum">$username\@$mydomain</A>!,
-            qq!</TD></TR>!
-      ;
-    } else {
-      my $warning = "couldn't find svc_acct.uid $domuid (svc_acct_sm.svcnum $svcnum)!";
-      warn $warning;
-      print "<TD>WARNING: $warning</TD></TR>";
-    }
-
-  }
-
-  print '</TABLE></BODY></HTML>';
-
-} else { #error
-  idiot("Mail Alias not found");
-}
-
-%>
diff --git a/httemplate/search/svc_acct_sm.html b/httemplate/search/svc_acct_sm.html
deleted file mode 100755
index 0719856db..000000000
--- a/httemplate/search/svc_acct_sm.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Mail Alias Search</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Mail Alias Search</H1>
-    </CENTER>
-    <HR>
-    <FORM ACTION="svc_acct_sm.cgi" METHOD="post">
-      Search for <B>mail alias</B>: 
-      <INPUT TYPE="text" NAME="domuser"><FONT SIZE=-1>(opt.)</FONT> @
-      <INPUT TYPE="text" NAME="domain"><FONT SIZE=-1>(req.)</FONT>
-
-      <P><INPUT TYPE="submit" VALUE="Search">
-
-    </FORM>
-
-  <HR>
-
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
deleted file mode 100755
index fb372db14..000000000
--- a/httemplate/search/svc_domain.cgi
+++ /dev/null
@@ -1,163 +0,0 @@
-<%
-
-my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
-
-my($query)=$cgi->keywords;
-$query ||= ''; #to avoid use of unitialized value errors
-my(@svc_domain,$sortby);
-if ( $query eq 'svcnum' ) {
-  $sortby=\*svcnum_sort;
-  @svc_domain=qsearch('svc_domain',{});
-} elsif ( $query eq 'domain' ) {
-  $sortby=\*domain_sort;
-  @svc_domain=qsearch('svc_domain',{});
-} elsif ( $query eq 'UN_svcnum' ) {
-  $sortby=\*svcnum_sort;
-  @svc_domain = grep qsearchs('cust_svc',{
-      'svcnum' => $_->svcnum,
-      'pkgnum' => '',
-    }), qsearch('svc_domain',{});
-} elsif ( $query eq 'UN_domain' ) {
-  $sortby=\*domain_sort;
-  @svc_domain = grep qsearchs('cust_svc',{
-      'svcnum' => $_->svcnum,
-      'pkgnum' => '',
-    }), qsearch('svc_domain',{});
-} else {
-  $cgi->param('domain') =~ /^([\w\-\.]+)$/; 
-  my($domain)=$1;
-  #push @svc_domain, qsearchs('svc_domain',{'domain'=>$domain});
-  @svc_domain = qsearchs('svc_domain',{'domain'=>$domain});
-}
-
-if ( scalar(@svc_domain) == 1 ) {
-  print $cgi->redirect(popurl(2). "view/svc_domain.cgi?". $svc_domain[0]->svcnum);
-  #exit;
-} elsif ( scalar(@svc_domain) == 0 ) {
-%>
-<!-- mason kludge -->
-<%
-  eidiot "No matching domains found!\n";
-} else {
-%>
-<!-- mason kludge -->
-<%
-  my($total)=scalar(@svc_domain);
-  print header("Domain Search Results",''), <<END;
-
-    $total matching domains found
-    <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
-      <TR>
-        <TH>Service #</TH>
-        <TH>Domain</TH>
-        <TH>Mail to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
-        <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
-      </TR>
-END
-
-#  my(%saw);                 # if we've multiple domains with the same
-                             # svcnum, then we've a corrupt database
-
-  foreach my $svc_domain (
-#    sort $sortby grep(!$saw{$_->svcnum}++, @svc_domain)
-    sort $sortby (@svc_domain)
-  ) {
-    my($svcnum,$domain)=(
-      $svc_domain->svcnum,
-      $svc_domain->domain,
-    );
-    #my($malias);
-    #if ( qsearch('svc_acct_sm',{'domsvc'=>$svcnum}) ) {
-    #  $malias=(
-    #    qq|<FORM ACTION="svc_acct_sm.cgi" METHOD="post">|.
-    #      qq|<INPUT TYPE="hidden" NAME="domuser" VALUE="">|.
-    #      qq|<INPUT TYPE="hidden" NAME="domain" VALUE="$domain">|.
-    #      qq|<INPUT TYPE="submit" VALUE="(mail aliases)">|.
-    #      qq|</FORM>|
-    #  );
-    #} else {
-    #  $malias='';
-    #}
-
-    my @svc_acct=qsearch('svc_acct',{'domsvc' => $svcnum});
-    my $rowspan = 0;
-
-    my $n1 = '';
-    my($svc_acct, @rows);
-    foreach $svc_acct (
-      sort {$b->getfield('username') cmp $a->getfield('username')} (@svc_acct)
-    ) {
-
-      my (@forwards) = ();
-
-      my($svcnum,$username)=(
-        $svc_acct->svcnum,
-        $svc_acct->username,
-      );
-
-      my @svc_forward = qsearch( 'svc_forward', { 'srcsvc' => $svcnum } );
-      my $svc_forward;
-      foreach $svc_forward (@svc_forward) {
-        my($dstsvc,$dst) = (
-          $svc_forward->dstsvc,
-          $svc_forward->dst,
-        );
-        if ($dstsvc) {
-          my $dst_svc_acct=qsearchs( 'svc_acct', { 'svcnum' => $dstsvc } );
-          my $destination=$dst_svc_acct->email;
-          push @forwards, qq!<TD><A HREF="!, popurl(2),
-                qq!view/svc_acct.cgi?$dstsvc">$destination</A>!,
-                qq!</TD></TR>!
-          ;
-        }else{
-          push @forwards, qq!<TD>$dst</TD></TR>!
-          ;
-        }
-      }
-
-      push @rows, qq!$n1<TD ROWSPAN=!, (scalar(@svc_forward) || 1),
-            qq!><A HREF="!. popurl(2). qq!view/svc_acct.cgi?$svcnum">!,
-      #print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
-            ( ($username eq '*') ? "<I>(anything)</I>" : $username ),
-            qq!\@$domain</A> </TD>!,
-      ;
-
-      push @rows, @forwards;
-
-      $rowspan += (scalar(@svc_forward) || 1);
-      $n1 = "</TR><TR>";
-    }
-    #end of false laziness
-
-
-
-    print <<END;
-    <TR>
-      <TD ROWSPAN=$rowspan><A HREF="${p}view/svc_domain.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
-      <TD ROWSPAN=$rowspan>$domain</TD>
-END
-
-    print @rows;
-    print "</TR>";
-
-  }
- 
-  print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-}
-
-sub svcnum_sort {
-  $a->getfield('svcnum') <=> $b->getfield('svcnum');
-}
-
-sub domain_sort {
-  $a->getfield('domain') cmp $b->getfield('domain');
-}
-
-
-%>
diff --git a/httemplate/search/svc_domain.html b/httemplate/search/svc_domain.html
deleted file mode 100755
index 94bb9a66d..000000000
--- a/httemplate/search/svc_domain.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Domain Search</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <FONT SIZE=7>
-      Domain Search
-    </FONT>
-    <BR><BR>
-    <FORM ACTION="svc_domain.cgi" METHOD="post">
-      Search for <B>domain</B>: 
-      <INPUT TYPE="text" NAME="domain">
-
-      <P><INPUT TYPE="submit" VALUE="Search">
-
-    </FORM>
-  </BODY>
-</HTML>
-
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
deleted file mode 100755
index 53d7bc051..000000000
--- a/httemplate/view/cust_bill.cgi
+++ /dev/null
@@ -1,48 +0,0 @@
-<!-- mason kludge -->
-<%
-
-#untaint invnum
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $invnum = $1;
-
-my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
-die "Invoice #$invnum not found!" unless $cust_bill;
-my $custnum = $cust_bill->getfield('custnum');
-
-#my $printed = $cust_bill->printed;
-
-print header('Invoice View', menubar(
-  "Main Menu" => $p,
-  "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-));
-
-print qq!<A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) against this invoice</A> | !
-  if $cust_bill->owed > 0;
-
-print qq!<A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>!.      '<BR><BR>';
-
-#false laziness with search/cust_bill_event.cgi
-
-print table(). '<TR><TH>Event</TH><TH>Date</TH><TH>Status</TH></TR>';
-foreach my $cust_bill_event (
-  sort { $a->_date <=> $b->_date } $cust_bill->cust_bill_event
-) {
-  my $status = $cust_bill_event->status;
-  $status .= ': '. $cust_bill_event->statustext if $cust_bill_event->statustext;
-  print '<TR><TD>'. $cust_bill_event->part_bill_event->event. '</TD><TD>'.
-        time2str("%a %b %e %T %Y", $cust_bill_event->_date). '</TD><TD>'.
-        $status. '</TD></TR>';
-}
-print '</TABLE><BR><PRE>';
-
-print $cust_bill->print_text;
-
-	#formatting
-	print <<END;
-    </PRE></FONT>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
deleted file mode 100755
index 421bd98a4..000000000
--- a/httemplate/view/cust_main.cgi
+++ /dev/null
@@ -1,653 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $conf = new FS::Conf;
-
-#false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
-my %uiview = ();
-my %uiadd = ();
-foreach my $part_svc ( qsearch('part_svc',{}) ) {
-  $uiview{$part_svc->svcpart} = popurl(2). "view/". $part_svc->svcdb . ".cgi";
-  $uiadd{$part_svc->svcpart}= popurl(2). "edit/". $part_svc->svcdb . ".cgi";
-}
-
-print header("Customer View", menubar(
-  'Main Menu' => popurl(2)
-));
-
-die "No customer specified (bad URL)!" unless $cgi->keywords;
-my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
-$query =~ /^(\d+)$/;
-my $custnum = $1;
-my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
-die "Customer not found!" unless $cust_main;
-
-print qq!<A HREF="!, popurl(2), 
-      qq!edit/cust_main.cgi?$custnum">Edit this customer</A>!;
-print qq! | <A HREF="!, popurl(2), 
-      qq!misc/delete-customer.cgi?$custnum"> Delete this customer</A>!
-  if $conf->exists('deletecustomers');
-
-unless ( $conf->exists('disable_customer_referrals') ) {
-  print qq! | <A HREF="!, popurl(2),
-        qq!edit/cust_main.cgi?referral_custnum=$custnum">!,
-        qq!Refer a new customer</A>!;
-
-  print qq! | <A HREF="!, popurl(2),
-        qq!search/cust_main.cgi?referral_custnum=$custnum">!,
-        qq!View this customer's referrals</A>!;
-}
-
-print '<BR><BR>';
-
-my $signupurl = $conf->config('signupurl');
-if ( $signupurl ) {
-print "This customer's signup URL: ".
-      "<a href=\"$signupurl?ref=$custnum\">$signupurl?ref=$custnum</a><BR><BR>";
-}
-
-print '<A NAME="cust_main"></A>';
-
-print &itable(), '<TR>';
-
-print '<TD VALIGN="top">';
-
-  print "Billing address", &ntable("#cccccc"), "<TR><TD>",
-        &ntable("#cccccc",2),
-    '<TR><TD ALIGN="right">Contact name</TD>',
-      '<TD COLSPAN=3 BGCOLOR="#ffffff">',
-      $cust_main->last, ', ', $cust_main->first,
-      '</TD>';
-print '<TD ALIGN="right">SS#</TD><TD BGCOLOR="#ffffff">',
-      $cust_main->ss || '&nbsp', '</TD>'
-  if $conf->exists('show_ss');
-
-print '</TR>',
-    '<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-      $cust_main->company,
-      '</TD></TR>',
-    '<TR><TD ALIGN="right">Address</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-      $cust_main->address1,
-      '</TD></TR>',
-  ;
-  print '<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-        $cust_main->address2, '</TD></TR>'
-    if $cust_main->address2;
-  print '<TR><TD ALIGN="right">City</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->city,
-          '</TD><TD ALIGN="right">State</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->state,
-          '</TD><TD ALIGN="right">Zip</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->zip, '</TD></TR>',
-        '<TR><TD ALIGN="right">Country</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->country,
-          '</TD></TR>',
-  ;
-  print '<TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-          $cust_main->daytime || '&nbsp', '</TD></TR>',
-       '<TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-          $cust_main->night || '&nbsp', '</TD></TR>',
-        '<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-          $cust_main->fax || '&nbsp', '</TD></TR>',
-        '</TABLE>', "</TD></TR></TABLE>"
-  ;
-
-  if ( defined $cust_main->dbdef_table->column('ship_last') ) {
-
-    my $pre = $cust_main->ship_last ? 'ship_' : '';
-
-    print "<BR>Service address", &ntable("#cccccc"), "<TR><TD>",
-          &ntable("#cccccc",2),
-      '<TR><TD ALIGN="right">Contact name</TD>',
-        '<TD COLSPAN=5 BGCOLOR="#ffffff">',
-        $cust_main->get("${pre}last"), ', ', $cust_main->get("${pre}first"),
-        '</TD></TR>',
-      '<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-        $cust_main->get("${pre}company"),
-        '</TD></TR>',
-      '<TR><TD ALIGN="right">Address</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-        $cust_main->get("${pre}address1"),
-        '</TD></TR>',
-    ;
-    print '<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-          $cust_main->get("${pre}address2"), '</TD></TR>'
-      if $cust_main->get("${pre}address2");
-    print '<TR><TD ALIGN="right">City</TD><TD BGCOLOR="#ffffff">',
-            $cust_main->get("${pre}city"),
-            '</TD><TD ALIGN="right">State</TD><TD BGCOLOR="#ffffff">',
-            $cust_main->get("${pre}state"),
-            '</TD><TD ALIGN="right">Zip</TD><TD BGCOLOR="#ffffff">',
-            $cust_main->get("${pre}zip"), '</TD></TR>',
-          '<TR><TD ALIGN="right">Country</TD><TD BGCOLOR="#ffffff">',
-            $cust_main->get("${pre}country"),
-            '</TD></TR>',
-    ;
-    print '<TR><TD ALIGN="right">Day Phone</TD>',
-          '<TD COLSPAN=5 BGCOLOR="#ffffff">',
-            $cust_main->get("${pre}daytime") || '&nbsp', '</TD></TR>',
-          '<TR><TD ALIGN="right">Night Phone</TD>'.
-          '<TD COLSPAN=5 BGCOLOR="#ffffff">',
-            $cust_main->get("${pre}night") || '&nbsp', '</TD></TR>',
-          '<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-            $cust_main->get("${pre}fax") || '&nbsp', '</TD></TR>',
-          '</TABLE>', "</TD></TR></TABLE>"
-    ;
-
-  }
-
-print '</TD>';
-
-print '<TD VALIGN="top">';
-
-  print &ntable("#cccccc"), "<TR><TD>", &ntable("#cccccc",2),
-        '<TR><TD ALIGN="right">Customer number</TD><TD BGCOLOR="#ffffff">',
-        $custnum, '</TD></TR>',
-  ;
-
-  my @agents = qsearch( 'agent', {} );
-  my $agent;
-  unless ( scalar(@agents) == 1 ) {
-    $agent = qsearchs('agent',{ 'agentnum' => $cust_main->agentnum } );
-    print '<TR><TD ALIGN="right">Agent</TD><TD BGCOLOR="#ffffff">',
-        $agent->agentnum, ": ", $agent->agent, '</TD></TR>';
-  } else {
-    $agent = $agents[0];
-  }
-  my @referrals = qsearch( 'part_referral', {} );
-  unless ( scalar(@referrals) == 1 ) {
-    my $referral = qsearchs('part_referral', {
-      'refnum' => $cust_main->refnum
-    } );
-    print '<TR><TD ALIGN="right">Advertising source</TD><TD BGCOLOR="#ffffff">',
-          $referral->refnum, ": ", $referral->referral, '</TD></TR>';
-  }
-  print '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
-    $cust_main->otaker, '</TD></TR>';
-
-  print '<TR><TD ALIGN="right">Referring Customer</TD><TD BGCOLOR="#ffffff">';
-  my $referring_cust_main = '';
-  if ( $cust_main->referral_custnum
-       && ( $referring_cust_main =
-            qsearchs('cust_main', { custnum => $cust_main->referral_custnum } )
-          )
-     ) {
-    print '<A HREF="'. popurl(1). 'cust_main.cgi?'.
-          $cust_main->referral_custnum. '">'.
-          $cust_main->referral_custnum. ': '.
-          ( $referring_cust_main->company
-              ? $referring_cust_main->company. ' ('.
-                  $referring_cust_main->last. ', '. $referring_cust_main->first.
-                  ')'
-              : $referring_cust_main->last. ', '. $referring_cust_main->first
-          ).
-          '</A>';
-  }
-  print '</TD></TR>';
-
-  print '</TABLE></TD></TR></TABLE>';
-
-print '<BR>';
-
-  my @invoicing_list = $cust_main->invoicing_list;
-  print "Billing information (",
-       qq!<A HREF="!, popurl(2), qq!misc/bill.cgi?$custnum">!, "Bill now</A>)",
-        &ntable("#cccccc"), "<TR><TD>", &ntable("#cccccc",2),
-        '<TR><TD ALIGN="right">Tax exempt</TD><TD BGCOLOR="#ffffff">',
-        $cust_main->tax ? 'yes' : 'no',
-        '</TD></TR>',
-        '<TR><TD ALIGN="right">Postal invoices</TD><TD BGCOLOR="#ffffff">',
-        ( grep { $_ eq 'POST' } @invoicing_list ) ? 'yes' : 'no',
-        '</TD></TR>',
-        '<TR><TD ALIGN="right">Email invoices</TD><TD BGCOLOR="#ffffff">',
-        join(', ', grep { $_ ne 'POST' } @invoicing_list ) || 'no',
-        '</TD></TR>',
-        '<TR><TD ALIGN="right">Billing type</TD><TD BGCOLOR="#ffffff">',
-  ;
-
-  if ( $cust_main->payby eq 'CARD' ) {
-    my $payinfo = $cust_main->payinfo;
-    $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
-    print 'Credit card</TD></TR>',
-          '<TR><TD ALIGN="right">Card number</TD><TD BGCOLOR="#ffffff">',
-          $payinfo, '</TD></TR>',
-          '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->paydate, '</TD></TR>',
-          '<TR><TD ALIGN="right">Name on card</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->payname, '</TD></TR>'
-    ;
-  } elsif ( $cust_main->payby eq 'BILL' ) {
-    print 'Billing</TD></TR>';
-    print '<TR><TD ALIGN="right">P.O. </TD><TD BGCOLOR="#ffffff">',
-          $cust_main->payinfo, '</TD></TR>',
-      if $cust_main->payinfo;
-    print '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->paydate, '</TD></TR>',
-          '<TR><TD ALIGN="right">Attention</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->payname, '</TD></TR>',
-    ;
-  } elsif ( $cust_main->payby eq 'COMP' ) {
-    print 'Complimentary</TD></TR>',
-          '<TR><TD ALIGN="right">Authorized by</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->payinfo, '</TD></TR>',
-          '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->paydate, '</TD></TR>',
-    ;
-  }
-
-  print "</TABLE></TD></TR></TABLE>";
-
-print '</TD></TR></TABLE>';
-
-if ( defined $cust_main->dbdef_table->column('comments')
-     && $cust_main->comments )
-{
-  print "<BR>Comments", &ntable("#cccccc"), "<TR><TD>",
-        &ntable("#cccccc",2),
-        '<TR><TD BGCOLOR="#ffffff"><PRE>', $cust_main->comments,
-        '</PRE></TD></TR></TABLE></TABLE>';
-}
-
-print '</TD></TR></TABLE>';
-
-print '<BR>'.
-  '<FORM ACTION="'.popurl(2).'edit/process/quick-cust_pkg.cgi" METHOD="POST">'.
-  qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
-  '<SELECT NAME="pkgpart"><OPTION> ';
-
-foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
-  my $pkgpart = $type_pkgs->pkgpart;
-#  my $part_pkg = qsearchs('part_pkg', { 'pkgpart' => $pkgpart } )
-#    or do { warn "unknown type_pkgs.pkgpart $pkgpart"; next; };
-  my $part_pkg =
-    qsearchs('part_pkg', { 'pkgpart' => $pkgpart, 'disabled' => '' } )
-    or next;
-  print qq!<OPTION VALUE="$pkgpart">!. $part_pkg->pkg. ' - '.
-        $part_pkg->comment;
-}
-
-print '</SELECT><INPUT TYPE="submit" VALUE="Order Package"></FORM><BR>';
-
-print '<BR>'.
-  qq!<FORM ACTION="${p}edit/process/quick-charge.cgi" METHOD="POST">!.
-  qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
-  qq!Description:<INPUT TYPE="text" NAME="pkg">!.
-  qq!&nbsp;Amount:<INPUT TYPE="text" NAME="amount" SIZE=6>!.
-  qq!&nbsp;!;
-
-#false laziness w/ edit/part_pkg.cgi
-if ( $conf->exists('enable_taxclasses') ) {
-  print '<SELECT NAME="taxclass">';
-  my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
-    or die dbh->errstr;
-  $sth->execute or die $sth->errstr;
-  foreach my $taxclass ( map $_->[0], @{$sth->fetchall_arrayref} ) {
-    print qq!<OPTION VALUE="$taxclass"!;
-    #print ' SELECTED' if $taxclass eq $hashref->{taxclass};
-    print qq!>$taxclass</OPTION>!;
-  }
-  print '</SELECT>';
-} else {
-  print '<INPUT TYPE="hidden" NAME="taxclass" VALUE="">';
-}
-
-print qq!<INPUT TYPE="submit" VALUE="One-time charge"></FORM><BR>!;
-
-print <<END;
-<SCRIPT>
-function cust_pkg_areyousure(href) {
-    if (confirm("Permanently delete included services and cancel this package?") == true)
-        window.location.href = href;
-}
-</SCRIPT>
-END
-
-print qq!<BR><A NAME="cust_pkg">Packages</A> !,
-#      qq!<BR>Click on package number to view/edit package.!,
-      qq!( <A HREF="!, popurl(2), qq!edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> (preserves services) )!,
-;
-
-#display packages
-
-#formatting
-print qq!!, &table(), "\n",
-      qq!<TR><TH COLSPAN=2 ROWSPAN=2>Package</TH><TH COLSPAN=5>!,
-      qq!Dates</TH><TH COLSPAN=2 ROWSPAN=2>Services</TH></TR>\n!,
-      qq!<TR><TH><FONT SIZE=-1>Setup</FONT></TH><TH>!,
-      qq!<FONT SIZE=-1>Next bill</FONT>!,
-      qq!</TH><TH><FONT SIZE=-1>Susp.</FONT></TH><TH><FONT SIZE=-1>Expire!,
-      qq!</FONT></TH>!,
-      qq!<TH><FONT SIZE=-1>Cancel</FONT></TH>!,
-      qq!</TR>\n!;
-
-#get package info
-my @packages;
-if ( $conf->exists('hidecancelledpackages') ) {
-  @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->ncancelled_pkgs);
-} else {
-  @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->all_pkgs);
-}
-
-my $n1 = '<TR>';
-foreach my $package (@packages) {
-  my $pkgnum = $package->pkgnum;
-  my $pkg = $package->part_pkg->pkg;
-  my $comment = $package->part_pkg->comment;
-  my $pkgview = popurl(2). "view/cust_pkg.cgi?$pkgnum";
-
-  #my @cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
-  #my $rowspan = scalar(@cust_svc) || 1;
-  my @cust_svc = ();
-  my $rowspan = 0;
-  my %pkg_svc = ();
-  unless ( $package->getfield('cancel') ) {
-    foreach my $pkg_svc (
-      grep { $_->quantity }
-        qsearch('pkg_svc',{'pkgpart'=> $package->pkgpart })
-    ) {
-      $rowspan += ( $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity );
-    }
-  } else {
-    #@cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
-    @cust_svc = ();
-    $rowspan = scalar(@cust_svc) || 1;
-  }
-  $rowspan ||= 1;
-
-  my $button_cgi = new CGI;
-  $button_cgi->param('clone', $package->part_pkg->pkgpart);
-  $button_cgi->param('pkgnum', $package->pkgnum);
-  my $button_url = popurl(2). "edit/part_pkg.cgi?". $button_cgi->query_string;
-
-  #print $n1, qq!<TD ROWSPAN=$rowspan><A HREF="$pkgview">$pkgnum</A></TD>!,
-  print $n1, qq!<TD ROWSPAN=$rowspan>$pkgnum</TD>!,
-        qq!<TD ROWSPAN=$rowspan><FONT SIZE=-1>!,
-        #qq!<A HREF="$pkgview">$pkg - $comment</A>!,
-        qq!$pkg - $comment (&nbsp;<a href="$pkgview">Details</a>&nbsp;)!;
-       # | !;
-
-  #false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
-  unless ( $package->getfield('cancel') ) {
-    print ' (&nbsp;';
-    if ( $package->getfield('susp') ) {
-      print qq!<A HREF="${p}misc/unsusp_pkg.cgi?$pkgnum">Unsuspend</A>!;
-    } else {
-      print qq!<A HREF="${p}misc/susp_pkg.cgi?$pkgnum">Suspend</A>!;
-    }
-    print '&nbsp;|&nbsp;<A HREF="javascript:cust_pkg_areyousure(\''. popurl(2).
-          'misc/cancel_pkg.cgi?'. $pkgnum.  '\')">Cancel</A>';
-  
-    print '&nbsp;) ';
-
-    print ' (&nbsp;<A HREF="'. popurl(2). 'edit/REAL_cust_pkg.cgi?'. $pkgnum.
-          '">Edit&nbsp;dates</A>&nbsp;|&nbsp;';
-        
-    print qq!<A HREF="$button_url">Customize</A>&nbsp;)!;
-
-  }
-  print '</FONT></TD>';
-
-  for ( qw( setup bill susp expire cancel ) ) {
-    print "<TD ROWSPAN=$rowspan><FONT SIZE=-1>", ( $package->getfield($_)
-            ? time2str("%D</FONT><BR><FONT SIZE=-3>%l:%M:%S%P&nbsp;%z</FONT>",
-              $package->getfield($_) )
-            :  '&nbsp'
-          ), '</FONT></TD>',
-    ;
-  }
-
-  my $n2 = '';
-  #false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
-  #foreach my $cust_svc ( @cust_svc ) {
-  foreach my $svcpart ( sort { $a<=>$b } keys %pkg_svc ) {
-    my $svc = qsearchs('part_svc',{'svcpart'=>$svcpart})->getfield('svc');
-    my(@cust_svc)=qsearch('cust_svc',{'pkgnum'=>$pkgnum, 
-                                      'svcpart'=>$svcpart,
-                                    });
-    for my $enum ( 1 .. $pkg_svc{$svcpart} ) {
-      my $cust_svc;
-      if ( $cust_svc = shift @cust_svc ) {
-        my($label, $value, $svcdb) = $cust_svc->label;
-        my($svcnum) = $cust_svc->svcnum;
-        my($sview) = popurl(2). "view";
-        print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
-              qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
-      } else {
-        print $n2, qq!<TD COLSPAN=2><A HREF="$uiadd{$svcpart}?pkgnum$pkgnum-svcpart$svcpart"><b><font size="+1" color="#ff0000">!.
-              qq!Provision $svc</A></b></font>!;
-
-        print qq!<BR><A HREF="../misc/link.cgi?pkgnum$pkgnum-svcpart$svcpart">!.
-              qq!<b><font size="+1" color="#ff0000">Link to legacy $svc</A></b></font>!
-          if $conf->exists('legacy_link');
-
-        print '</TD>';
-      }
-      $n2="</TR><TR>";
-    }
-  }
-
-  $n1="</TR><TR>";
-}  
-print "</TR>";
-
-#formatting
-print "</TABLE>";
-
-print <<END;
-<SCRIPT>
-function cust_pay_areyousure(href) {
-    if (confirm("Are you sure you want to delete this payment?")
- == true)
-        window.location.href = href;
-}
-</SCRIPT>
-END
-
-#formatting
-print qq!<BR><BR><A NAME="history">Payment History!.
-      qq!</A> ( !.
-      qq!<A HREF="!. popurl(2). qq!edit/cust_pay.cgi?custnum=$custnum">!.
-      qq!Post payment</A> | !.
-      qq!<A HREF="!. popurl(2). qq!edit/cust_credit.cgi?$custnum">!.
-      qq!Post credit</A> )!;
-
-#get payment history
-#
-# major problem: this whole thing is way too sloppy.
-# minor problem: the description lines need better formatting.
-
-my @history = (); #needed for mod_perl :)
-
-my %target = ();
-
-my @bills = qsearch('cust_bill',{'custnum'=>$custnum});
-foreach my $bill (@bills) {
-  my($bref)=$bill->hashref;
-  my $bpre = ( $bill->owed > 0 )
-               ? '<b><font size="+1" color="#ff0000"> Open '
-               : '';
-  my $bpost = ( $bill->owed > 0 ) ? '</font></b>' : '';
-  push @history,
-    $bref->{_date} . qq!\t<A HREF="!. popurl(2). qq!view/cust_bill.cgi?! .
-    $bref->{invnum} . qq!">${bpre}Invoice #! . $bref->{invnum} .
-    qq! (Balance \$! . $bill->owed . qq!)$bpost</A>\t! .
-    $bref->{charged} . qq!\t\t\t!;
-
-  my(@cust_bill_pay)=qsearch('cust_bill_pay',{'invnum'=> $bref->{invnum} } );
-#  my(@payments)=qsearch('cust_pay',{'invnum'=> $bref->{invnum} } );
-#  my($payment);
-#  foreach $payment (@payments) {
-  foreach my $cust_bill_pay (@cust_bill_pay) {
-    my $payment = $cust_bill_pay->cust_pay;
-    my($date,$invnum,$payby,$payinfo,$paid)=($payment->_date,
-                                             $cust_bill_pay->invnum,
-                                             $payment->payby,
-                                             $payment->payinfo,
-                                             $cust_bill_pay->amount,
-                      );
-    $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
-      if $payby eq 'CARD';
-    my $target = "$payby$payinfo";
-    $payby =~ s/^BILL$/Check #/ if $payinfo;
-    $payby =~ s/^(CARD|COMP)$/$1 /;
-    my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
-                   ? qq! (<A HREF="javascript:cust_pay_areyousure('${p}misc/delete-cust_pay.cgi?!. $payment->paynum. qq!')">delete</A>)!
-                   : '';
-    push @history,
-      "$date\tPayment, Invoice #$invnum ($payby$payinfo)$delete\t\t$paid\t\t\t$target";
-  }
-
-  my(@cust_credit_bill)=
-    qsearch('cust_credit_bill', { 'invnum'=> $bref->{invnum} } );
-  foreach my $cust_credit_bill (@cust_credit_bill) {
-    my $cust_credit = $cust_credit_bill->cust_credit;
-    my($date, $invnum, $crednum, $amount, $reason, $app_date ) = (
-      $cust_credit->_date,
-      $cust_credit_bill->invnum,
-      $cust_credit_bill->crednum,
-      $cust_credit_bill->amount,
-      $cust_credit->reason,
-      time2str("%D", $cust_credit_bill->_date),
-    );
-    push @history,
-      "$date\tCredit #$crednum: $reason<BR>".
-      "(applied to invoice #$invnum on $app_date)\t\t\t$amount\t";
-  }
-}
-
-my @credits = grep { scalar(my @array = $_->cust_credit_refund) }
-           qsearch('cust_credit',{'custnum'=>$custnum});
-foreach my $credit (@credits) {
-  my($cref)=$credit->hashref;
-  my(@cust_credit_refund)=
-    qsearch('cust_credit_refund', { 'crednum'=> $cref->{crednum} } );
-  foreach my $cust_credit_refund (@cust_credit_refund) {
-    my $cust_refund = $cust_credit_refund->cust_credit;
-    my($date, $crednum, $amount, $reason, $app_date ) = (
-      $credit->_date,
-      $credit->crednum,
-      $cust_credit_refund->amount,
-      $credit->reason,
-      time2str("%D", $cust_credit_refund->_date),
-    );
-    push @history,
-      "$date\tCredit #$crednum: $reason<BR>".
-      "(applied to refund on $app_date)\t\t\t$amount\t";
-  }
-}
-
-@credits = grep { $_->credited  > 0 }
-           qsearch('cust_credit',{'custnum'=>$custnum});
-foreach my $credit (@credits) {
-  my($cref)=$credit->hashref;
-  push @history,
-    $cref->{_date} . "\t" .
-    qq!<A HREF="! . popurl(2). qq!edit/cust_credit_bill.cgi?!. $cref->{crednum} . qq!">!.
-    '<b><font size="+1" color="#ff0000">Unapplied credit #' .
-    $cref->{crednum} . "</font></b></A>: ".
-    $cref->{reason} . "\t\t\t" . $credit->credited . "\t";
-}
-
-my(@refunds)=qsearch('cust_refund',{'custnum'=> $custnum } );
-foreach my $refund (@refunds) {
-  my($rref)=$refund->hashref;
-  my($refundnum) = (
-    $refund->refundnum,
-  );
-
-  push @history,
-    $rref->{_date} . "\tRefund #$refundnum, (" .
-    $rref->{payby} . " " . $rref->{payinfo} . ") by " .
-    $rref->{otaker} . " - ". $rref->{reason} . "\t\t\t\t" .
-    $rref->{refund};
-}
-
-my @unapplied_payments =
-  grep { $_->unapplied > 0 } qsearch('cust_pay', { 'custnum' => $custnum } );
-foreach my $payment (@unapplied_payments) {
-  my $payby = $payment->payby;
-  my $payinfo = $payment->payinfo;
-  #false laziness w/above
-  $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
-    if $payby eq 'CARD';
-  my $target = "$payby$payinfo";
-  $payby =~ s/^BILL$/Check #/ if $payinfo;
-  $payby =~ s/^(CARD|COMP)$/$1 /;
-  my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
-                 ? qq! (<A HREF="javascript:cust_pay_areyousure('${p}misc/delete-cust_pay.cgi?!. $payment->paynum. qq!')">delete</A>)!
-                 : '';
-  push @history,
-    $payment->_date. "\t".
-    '<b><font size="+1" color="#ff0000">Unapplied payment #' .
-    $payment->paynum . " ($payby$payinfo)</font></b> ".
-    '(<A HREF="'. popurl(2). 'edit/cust_bill_pay.cgi?'. $payment->paynum. '">'.
-    "apply</A>)$delete".
-    "\t\t" . $payment->unapplied . "\t\t\t$target";
-}
-
-        #formatting
-        print &table(), <<END;
-<TR>
-  <TH>Date</TH>
-  <TH>Description</TH>
-  <TH><FONT SIZE=-1>Charge</FONT></TH>
-  <TH><FONT SIZE=-1>Payment</FONT></TH>
-  <TH><FONT SIZE=-1>In-house<BR>Credit</FONT></TH>
-  <TH><FONT SIZE=-1>Refund</FONT></TH>
-  <TH><FONT SIZE=-1>Balance</FONT></TH>
-</TR>
-END
-
-#display payment history
-
-my $balance = 0;
-foreach my $item (sort keyfield_numerically @history) {
-  my($date,$desc,$charge,$payment,$credit,$refund,$target)=split(/\t/,$item);
-  $charge ||= 0;
-  $payment ||= 0;
-  $credit ||= 0;
-  $refund ||= 0;
-  $balance += $charge - $payment;
-  $balance -= $credit - $refund;
-  $balance = sprintf("%.2f", $balance);
-  $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
-  $target = '' unless defined $target;
-
-  print "<TR><TD><FONT SIZE=-1>";
-  print qq!<A NAME="$target">! unless $target && $target{$target}++;
-  print time2str("%D",$date);
-  print '</A>' if $target && $target{$target} == 1;
-  print "</FONT></TD>",
-	"<TD><FONT SIZE=-1>$desc</FONT></TD>",
-	"<TD><FONT SIZE=-1>",
-        ( $charge ? "\$".sprintf("%.2f",$charge) : '' ),
-        "</FONT></TD>",
-	"<TD><FONT SIZE=-1>",
-        ( $payment ? "-&nbsp;\$".sprintf("%.2f",$payment) : '' ),
-        "</FONT></TD>",
-	"<TD><FONT SIZE=-1>",
-        ( $credit ? "-&nbsp;\$".sprintf("%.2f",$credit) : '' ),
-        "</FONT></TD>",
-	"<TD><FONT SIZE=-1>",
-        ( $refund ? "\$".sprintf("%.2f",$refund) : '' ),
-        "</FONT></TD>",
-	"<TD><FONT SIZE=-1>\$" . $balance,
-        "</FONT></TD>",
-        "\n";
-}
-
-#formatting
-print "</TABLE>";
-
-#end
-
-#formatting
-print <<END;
-
-  </BODY>
-</HTML>
-END
-
-#subroutiens
-sub keyfield_numerically { (split(/\t/,$a))[0] <=> (split(/\t/,$b))[0] ; }
-
-%>
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
deleted file mode 100755
index 09a2a7a8b..000000000
--- a/httemplate/view/cust_pkg.cgi
+++ /dev/null
@@ -1,157 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $conf = new FS::Conf;
-
-my %uiview = ();
-my %uiadd = ();
-foreach my $part_svc ( qsearch('part_svc',{}) ) {
-  $uiview{$part_svc->svcpart} = popurl(2). "view/". $part_svc->svcdb . ".cgi";
-  $uiadd{$part_svc->svcpart}= popurl(2). "edit/". $part_svc->svcdb . ".cgi";
-}
-
-my ($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $pkgnum = $1;
-
-#get package record
-my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-die "No package!" unless $cust_pkg;
-my $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
-
-my $custnum = $cust_pkg->getfield('custnum');
-print header('Package View', menubar(
-  "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum",
-  'Main Menu' => popurl(2)
-));
-
-#print info
-my ($susp,$cancel,$expire)=(
-  $cust_pkg->getfield('susp'),
-  $cust_pkg->getfield('cancel'),
-  $cust_pkg->getfield('expire'),
-);
-my($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment'));
-my($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
-my $otaker = $cust_pkg->getfield('otaker');
-
-print <<END;
-<SCRIPT>
-function areyousure(href) {
-    if (confirm("Permanently delete included services and cancel this package?") == true)
-        window.location.href = href;
-}
-</SCRIPT>
-END
-
-print "Package information";
-print ' (<A HREF="'. popurl(2). 'misc/unsusp_pkg.cgi?'. $pkgnum.
-      '">unsuspend</A>)'
-  if ( $susp && ! $cancel );
-
-print ' (<A HREF="'. popurl(2). 'misc/susp_pkg.cgi?'. $pkgnum.
-      '">suspend</A>)'
-  unless ( $susp || $cancel );
-
-print ' (<A HREF="javascript:areyousure(\''. popurl(2). 'misc/cancel_pkg.cgi?'.
-      $pkgnum.  '\')">cancel</A>)'
-  unless $cancel;
-
-print ' (<A HREF="'. popurl(2). 'edit/REAL_cust_pkg.cgi?'. $pkgnum.
-      '">edit dates</A>)';
-
-print &ntable("#cccccc"), '<TR><TD>', &ntable("#cccccc",2),
-      '<TR><TD ALIGN="right">Package number</TD><TD BGCOLOR="#ffffff">',
-      $pkgnum, '</TD></TR>',
-      '<TR><TD ALIGN="right">Package</TD><TD BGCOLOR="#ffffff">',
-      $pkg,  '</TD></TR>',
-      '<TR><TD ALIGN="right">Comment</TD><TD BGCOLOR="#ffffff">',
-      $comment,  '</TD></TR>',
-      '<TR><TD ALIGN="right">Setup date</TD><TD BGCOLOR="#ffffff">',
-      ( $setup ? time2str("%D",$setup) : "(Not setup)" ), '</TD></TR>',
-      '<TR><TD ALIGN="right">Next bill date</TD><TD BGCOLOR="#ffffff">',
-      ( $bill ? time2str("%D",$bill) : "&nbsp;" ), '</TD></TR>',
-;
-print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
-       time2str("%D",$susp), '</TD></TR>' if $susp;
-print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
-       time2str("%D",$expire), '</TD></TR>' if $expire;
-print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
-       time2str("%D",$cancel), '</TD></TR>' if $cancel;
-print  '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
-      $otaker,  '</TD></TR>',
-      '</TABLE></TD></TR></TABLE>'
-;
-
-#  print <<END;
-#<FORM ACTION="../misc/expire_pkg.cgi" METHOD="post">
-#<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
-#Expire (date): <INPUT TYPE="text" NAME="date" VALUE="" >
-#<INPUT TYPE="submit" VALUE="Cancel later">
-#END
-
-unless ($cancel) {
-
-  #services
-  print '<BR>Service Information', &table();
-
-  #list of services this pkgpart includes
-  my $pkg_svc;
-  my %pkg_svc = ();
-  foreach $pkg_svc ( qsearch('pkg_svc',{'pkgpart'=> $cust_pkg->pkgpart }) ) {
-    $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity if $pkg_svc->quantity;
-  }
-
-  #list of records from cust_svc
-  my $svcpart;
-  foreach $svcpart (sort {$a <=> $b} keys %pkg_svc) {
-
-    my($svc)=qsearchs('part_svc',{'svcpart'=>$svcpart})->getfield('svc');
-
-    my(@cust_svc)=qsearch('cust_svc',{'pkgnum'=>$pkgnum, 
-                                      'svcpart'=>$svcpart,
-                                     });
-
-    my($enum);
-    for $enum ( 1 .. $pkg_svc{$svcpart} ) {
-
-      my($cust_svc);
-      if ( $cust_svc=shift @cust_svc ) {
-        my($svcnum)=$cust_svc->svcnum;
-        my($label, $value, $svcdb) = $cust_svc->label;
-        print <<END;
-<TR><TD><A HREF="$uiview{$svcpart}?$svcnum">(View/Edit) $svc: $value<A></TD></TR>
-END
-      } else {
-        print qq!<TR><TD>!.
-              qq!<A HREF="$uiadd{$svcpart}?pkgnum$pkgnum-svcpart$svcpart">!.
-              qq!(Provision) $svc</A>!;
-
-        print qq! or <A HREF="../misc/link.cgi?pkgnum$pkgnum-svcpart$svcpart">!.
-              qq!(Link to legacy) $svc</A>!
-          if $conf->exists('legacy_link');
-
-        print '</TD></TR>';
-      }
-
-    }
-    warn "WARNING: Leftover services pkgnum $pkgnum!" if @cust_svc;; 
-  }
-
-  print "</TABLE><FONT SIZE=-1>",
-        "Choose (View/Edit) to view or edit an existing service<BR>",
-        "Choose (Provision) to setup a new service<BR>";
-
-  print "Choose (Link to legacy) to link to a legacy (pre-Freeside) service"
-    if $conf->exists('legacy_link');
-
-  print "</FONT>";
-}
-
-#formatting
-print <<END;
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
deleted file mode 100755
index f6c1b026c..000000000
--- a/httemplate/view/svc_acct.cgi
+++ /dev/null
@@ -1,156 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
-
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $svcnum = $1;
-my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
-die "Unknown svcnum" unless $svc_acct;
-
-#false laziness w/all svc_*.cgi
-my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );
-my $pkgnum = $cust_svc->getfield('pkgnum');
-my($cust_pkg, $custnum);
-if ($pkgnum) {
-  $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
-  $custnum = $cust_pkg->custnum;
-} else {
-  $cust_pkg = '';
-  $custnum = '';
-}
-#eofalse
-
-my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
-die "Unknown svcpart" unless $part_svc;
-
-my $domain;
-if ( $svc_acct->domsvc ) {
-  my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
-  die "Unknown domain" unless $svc_domain;
-  $domain = $svc_domain->domain;
-} else {
-  unless ( $mydomain ) {
-    die "No legacy domain config file and no svc_domain.svcnum record ".
-        "for svc_acct.domsvc: ". $cust_svc->domsvc;
-  }
-  $domain = $mydomain;
-}
-
-%>
-
-<SCRIPT>
-function areyousure(href) {
-    if (confirm("Permanently delete this account?") == true)
-        window.location.href = href;
-}
-</SCRIPT>
-
-<%= header('Account View', menubar(
-  ( ( $pkgnum || $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-      )
-    : ( "Cancel this (unaudited) account" =>
-          "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')" )
-  ),
-  "Main menu" => $p,
-)) %>
-
-<%
-
-#print qq!<BR><A HREF="../misc/sendconfig.cgi?$svcnum">Send account information</A>!;
-
-print qq!<A HREF="${p}edit/svc_acct.cgi?$svcnum">Edit this information</A><BR>!.
-      &ntable("#cccccc"). '<TR><TD>'. &ntable("#cccccc",2).
-      "<TR><TD ALIGN=\"right\">Service number</TD>".
-        "<TD BGCOLOR=\"#ffffff\">$svcnum</TD></TR>".
-      "<TR><TD ALIGN=\"right\">Service</TD>".
-        "<TD BGCOLOR=\"#ffffff\">". $part_svc->svc. "</TD></TR>".
-      "<TR><TD ALIGN=\"right\">Username</TD>".
-        "<TD BGCOLOR=\"#ffffff\">". $svc_acct->username. "</TD></TR>"
-;
-
-print "<TR><TD ALIGN=\"right\">Domain</TD>".
-        "<TD BGCOLOR=\"#ffffff\">". $domain, "</TD></TR>";
-
-print "<TR><TD ALIGN=\"right\">Password</TD><TD BGCOLOR=\"#ffffff\">";
-my $password = $svc_acct->_password;
-if ( $password =~ /^\*\w+\* (.*)$/ ) {
-  $password = $1;
-  print "<I>(login disabled)</I> ";
-}
-if ( $conf->exists('showpasswords') ) {
-  print "$password";
-} else {
-  print "<I>(hidden)</I>";
-}
-print "</TR></TD>";
-$password = '';
-
-if ( $conf->exists('security_phrase') ) {
-  my $sec_phrase = $svc_acct->sec_phrase;
-  print '<TR><TD ALIGN="right">Security phrase</TD><TD BGCOLOR="#ffffff">'.
-        $svc_acct->sec_phrase. '</TD></TR>';
-}
-
-my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
-print "<TR><TD ALIGN=\"right\">Access number</TD>".
-      "<TD BGCOLOR=\"#ffffff\">". $svc_acct_pop->text. '</TD></TR>'
-  if $svc_acct_pop;
-
-if ($svc_acct->uid ne '') {
-  print "<TR><TD ALIGN=\"right\">Uid</TD>".
-          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->uid. "</TD></TR>",
-        "<TR><TD ALIGN=\"right\">Gid</TD>".
-          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->gid. "</TD></TR>",
-        "<TR><TD ALIGN=\"right\">GECOS</TD>".
-          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->finger. "</TD></TR>",
-        "<TR><TD ALIGN=\"right\">Home directory</TD>".
-          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->dir. "</TD></TR>",
-        "<TR><TD ALIGN=\"right\">Shell</TD>".
-          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->shell. "</TD></TR>",
-        "<TR><TD ALIGN=\"right\">Quota</TD>".
-          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->quota. "</TD></TR>"
-  ;
-} else {
-  print "<TR><TH COLSPAN=2>(No shell account)</TH></TR>";
-}
-
-if ($svc_acct->slipip) {
-  print "<TR><TD ALIGN=\"right\">IP address</TD><TD BGCOLOR=\"#ffffff\">".
-        ( ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' )
-          ? "<I>(Dynamic)</I>"
-          : $svc_acct->slipip
-        ). "</TD>";
-  my($attribute);
-  foreach $attribute ( grep /^radius_/, fields('svc_acct') ) {
-    #warn $attribute;
-    $attribute =~ /^radius_(.*)$/;
-    my $pattribute = $FS::raddb::attrib{$1};
-    print "<TR><TD ALIGN=\"right\">Radius (reply) $pattribute</TD>".
-          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->getfield($attribute).
-          "</TD></TR>";
-  }
-  foreach $attribute ( grep /^rc_/, fields('svc_acct') ) {
-    #warn $attribute;
-    $attribute =~ /^rc_(.*)$/;
-    my $pattribute = $FS::raddb::attrib{$1};
-    print "<TR><TD ALIGN=\"right\">Radius (check) $pattribute: </TD>".
-          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->getfield($attribute).
-          "</TD></TR>";
-  }
-} else {
-  print "<TR><TH COLSPAN=2>(No SLIP/PPP account)</TH></TR>";
-}
-
-print '<TR><TD ALIGN="right">RADIUS groups</TD><TD BGCOLOR="#ffffff">'.
-      join('<BR>', $svc_acct->radius_groups). '</TD></TR>';
-
-print "</TABLE></TD></TR></TABLE>".
-      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
-      "</BODY></HTML>";
-
-%>
diff --git a/httemplate/view/svc_acct_sm.cgi b/httemplate/view/svc_acct_sm.cgi
deleted file mode 100755
index 4e5acc427..000000000
--- a/httemplate/view/svc_acct_sm.cgi
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
-
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $svcnum = $1;
-my $svc_acct_sm = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum});
-die "Unknown svcnum" unless $svc_acct_sm;
-
-my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-my $pkgnum = $cust_svc->getfield('pkgnum');
-my($cust_pkg, $custnum);
-if ($pkgnum) {
-  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-  $custnum=$cust_pkg->getfield('custnum');
-} else {
-  $cust_pkg = '';
-  $custnum = '';
-}
-
-my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
-  or die "Unkonwn svcpart";
-
-print header('Mail Alias View', menubar(
-  ( ( $pkgnum || $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-      )
-    : ( "Cancel this (unaudited) account" =>
-          "${p}misc/cancel-unaudited.cgi?$svcnum" )
-  ),
-  "Main menu" => $p,
-));
-
-my($domsvc,$domuid,$domuser) = (
-  $svc_acct_sm->domsvc,
-  $svc_acct_sm->domuid,
-  $svc_acct_sm->domuser,
-);
-my $svc = $part_svc->svc;
-my $svc_domain = qsearchs('svc_domain',{'svcnum'=>$domsvc})
-  or die "Corrupted database: no svc_domain.svcnum matching domsvc $domsvc";
-my $domain = $svc_domain->domain;
-my $svc_acct = qsearchs('svc_acct',{'uid'=>$domuid})
-  or die "Corrupted database: no svc_acct.uid matching domuid $domuid";
-my $username = $svc_acct->username;
-
-print qq!<A HREF="${p}edit/svc_acct_sm.cgi?$svcnum">Edit this information</A>!,
-      "<BR>Service #$svcnum",
-      "<BR>Service: <B>$svc</B>",
-      qq!<BR>Mail to <B>!, ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ) , qq!</B>\@<B>$domain</B> forwards to <B>$username</B>\@$mydomain mailbox.!,
-      '</BODY></HTML>'
-;
-
-%>
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
deleted file mode 100755
index b70ac8f90..000000000
--- a/httemplate/view/svc_domain.cgi
+++ /dev/null
@@ -1,106 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $svcnum = $1;
-my $svc_domain = qsearchs('svc_domain',{'svcnum'=>$svcnum});
-die "Unknown svcnum" unless $svc_domain;
-
-my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-my $pkgnum = $cust_svc->getfield('pkgnum');
-my($cust_pkg, $custnum);
-if ($pkgnum) {
-  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-  $custnum=$cust_pkg->getfield('custnum');
-} else {
-  $cust_pkg = '';
-  $custnum = '';
-}
-
-my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
-die "Unknown svcpart" unless $part_svc;
-
-my $email = '';
-if ($svc_domain->catchall) {
-  my $svc_acct = qsearchs('svc_acct',{'svcnum'=> $svc_domain->catchall } );
-  die "Unknown svcpart" unless $svc_acct;
-  $email = $svc_acct->email;
-}
-
-my $domain = $svc_domain->domain;
-
-%>
-
-<%= header('Domain View', menubar(
-  ( ( $pkgnum || $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-      )
-    : ( "Cancel this (unaudited) domain" =>
-          "${p}misc/cancel-unaudited.cgi?$svcnum" )
-  ),
-  "Main menu" => $p,
-)) %>
-
-Service #<%= $svcnum %>
-<BR>Service: <B><%= $part_svc->svc %></B>
-<BR>Domain name: <B><%= $domain %></B>
-<BR>Catch all email <A HREF="${p}misc/catchall.cgi?<%= $svcnum %>">(change)</A>:
-<%= $email ? "<B>$email</B>" : "<I>(none)<I>" %>
-<BR><BR><A HREF="http://www.geektools.com/cgi-bin/proxy.cgi?query=<%=$domain%>;targetnic=auto">View whois information.</A>
-<BR><BR>
-<SCRIPT>
-  function areyousure(href) {
-    if ( confirm("Remove this record?") == true )
-      window.location.href = href;
-  }
-</SCRIPT>
-
-<% my @records; if ( @records = $svc_domain->domain_record ) { %>
-  <%= ntable("",2) %>
-  <tr><th>Zone</th><th>Type</th><th>Data</th></tr>
-
-  <% foreach my $domain_record ( @records ) {
-       my $type = $domain_record->rectype eq '_mstr'
-                    ? "(slave)"
-                    : $domain_record->recaf. ' '. $domain_record->rectype;
-  %>
-
-    <tr><td><%= $domain_record->reczone %></td>
-    <td><%= $type %></td>
-    <td><%= $domain_record->recdata %>
-
-    <% unless ( $domain_record->rectype eq 'SOA' ) { %>
-      (<A HREF="javascript:areyousure('<%=$p%>misc/delete-domain_record.cgi?<%=$domain_record->recnum%>')">delete</A>)
-    <% } %>
-    </td></tr>
-  <% } %>
-  </table>
-<% } %>
-
-<BR>
-<FORM METHOD="POST" ACTION="<%=$p%>edit/process/domain_record.cgi">
-<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$svcnum%>">
-<INPUT TYPE="text" NAME="reczone"> 
-<INPUT TYPE="hidden" NAME="recaf" VALUE="IN"> IN 
- <SELECT NAME="rectype">
-<% foreach (qw( A NS CNAME MX) ) { %>
-  <OPTION VALUE="<%=$_%>"><%=$_%></OPTION>
-<% } %>
- </SELECT>
-<INPUT TYPE="text" NAME="recdata"> <INPUT TYPE="submit" VALUE="Add record">
-</FORM><BR><BR>or<BR><BR>
-<FORM METHOD="POST" ACTION="<%=$p%>edit/process/domain_record.cgi">
-<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$svcnum%>">
-
-<% if ( @records ) { %> Delete all records and <% } %>
-Slave from nameserver IP 
-<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$svcnum%>">
-<INPUT TYPE="hidden" NAME="reczone" VALUE="@"> 
-<INPUT TYPE="hidden" NAME="recaf" VALUE="IN">
-<INPUT TYPE="hidden" NAME="rectype" VALUE="_mstr">
-<INPUT TYPE="text" NAME="recdata"> <INPUT TYPE="submit" VALUE="Slave domain">
-</FORM>
-<BR><BR><%= joblisting({'svcnum'=>$svcnum}, 1) %>
-</BODY></HTML>
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
deleted file mode 100755
index c8d1d6213..000000000
--- a/httemplate/view/svc_forward.cgi
+++ /dev/null
@@ -1,69 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $conf = new FS::Conf;
-
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $svcnum = $1;
-my $svc_forward = qsearchs('svc_forward',{'svcnum'=>$svcnum});
-die "Unknown svcnum" unless $svc_forward;
-
-my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-my $pkgnum = $cust_svc->getfield('pkgnum');
-my($cust_pkg, $custnum);
-if ($pkgnum) {
-  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-  $custnum=$cust_pkg->getfield('custnum');
-} else {
-  $cust_pkg = '';
-  $custnum = '';
-}
-
-my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
-  or die "Unkonwn svcpart";
-
-print header('Mail Forward View', menubar(
-  ( ( $pkgnum || $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-      )
-    : ( "Cancel this (unaudited) account" =>
-          "${p}misc/cancel-unaudited.cgi?$svcnum" )
-  ),
-  "Main menu" => $p,
-));
-
-my($srcsvc,$dstsvc,$dst) = (
-  $svc_forward->srcsvc,
-  $svc_forward->dstsvc,
-  $svc_forward->dst,
-);
-my $svc = $part_svc->svc;
-my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc})
-  or die "Corrupted database: no svc_acct.svcnum matching srcsvc $srcsvc";
-my $source = $svc_acct->email;
-my $destination;
-if ($dstsvc) {
-  my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$dstsvc})
-    or die "Corrupted database: no svc_acct.svcnum matching dstsvc $dstsvc";
-  $destination = $svc_acct->email;
-}else{
-  $destination = $dst;
-}
-
-print qq!<A HREF="${p}edit/svc_forward.cgi?$svcnum">Edit this information</A>!.
-      ntable("#cccccc",2).
-      '<TR><TD ALIGN="right">Service number</TD>'.
-        qq!<TD BGCOLOR="#ffffff">$svcnum</TD></TR>!.
-      '<TR><TD ALIGN="right">Service</TD>'.
-        qq!<TD BGCOLOR="#ffffff">$svc</TD></TR>!.
-      qq!<TR><TD ALIGN="right">Email to</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$source</TD></TR>!.
-      qq!<TR><TD ALIGN="right">Forwards to </TD>!.
-        qq!<TD BGCOLOR="#ffffff">$destination</TD></TR></TABLE>!.
-      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
-      '</BODY></HTML>'
-;
-
-%>
diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
deleted file mode 100644
index 9fa9661b1..000000000
--- a/httemplate/view/svc_www.cgi
+++ /dev/null
@@ -1,59 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $svcnum = $1;
-my $svc_www = qsearchs( 'svc_www', { 'svcnum' => $svcnum } )
-  or die "svc_www: Unknown svcnum $svcnum";
-
-#false laziness w/all svc_*.cgi
-my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } );
-my $pkgnum = $cust_svc->getfield('pkgnum');
-my($cust_pkg, $custnum);
-if ($pkgnum) {
-  $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
-  $custnum = $cust_pkg->custnum;
-} else {
-  $cust_pkg = '';
-  $custnum = '';
-}
-#eofalse
-
-my $usersvc = $svc_www->usersvc;
-my $svc_acct = qsearchs('svc_acct', { 'svcnum' => $usersvc } )
-  or die "svc_www: Unknown usersvc $usersvc";
-my $email = $svc_acct->email;
-
-my $domain_record = qsearchs('domain_record', { 'recnum' => $svc_www->recnum } )
-  or die "svc_www: Unknown recnum ". $svc_www->recnum;
-
-my $www = $domain_record->reczone;
-unless ( $www =~ /\.$/ ) {
-  my $svc_domain = qsearchs('svc_domain', { svcnum=>$domain_record->svcnum } );
-  $www .= '.'. $svc_domain->domain;
-}
-
-print header('Website View', menubar(
-  ( ( $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-      )                                                                       
-    : ( "Cancel this (unaudited) website" =>
-          "${p}misc/cancel-unaudited.cgi?$svcnum" )
-  ),
-  "Main menu" => $p,
-)).
-      qq!<A HREF="${p}edit/svc_www.cgi?$svcnum">Edit this information</A><BR>!.
-      ntable("#cccccc"). '<TR><TD>'. ntable("#cccccc",2).
-      qq!<TR><TD ALIGN="right">Service number</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$svcnum</TD></TR>!.
-      qq!<TR><TD ALIGN="right">Website name</TD>!.
-        qq!<TD BGCOLOR="#ffffff"><A HREF="http://$www">$www<A></TD></TR>!.
-      qq!<TR><TD ALIGN="right">Account</TD>!.
-        qq!<TD BGCOLOR="#ffffff"><A HREF="${p}view/svc_acct.cgi?$usersvc">$email</A></TD></TR>!.
-      '</TABLE></TD></TR></TABLE>'.
-      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
-      '</BODY></HTML>'
-;
-%>
diff --git a/init.d/freeside-init b/init.d/freeside-init
deleted file mode 100644
index d3016b289..000000000
--- a/init.d/freeside-init
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh
-#
-# chkconfig: 345 86 16
-# description: Freeside daemons
-
-QUEUED_USER=%%%QUEUED_USER%%%
-
-FREESIDE_PATH="%%%FREESIDE_PATH%%%"
-
-PASSWD_USER=%%%PASSWD_USER%%%
-PASSWD_MACHINE=%%%PASSWD_MACHINE%%%
-
-SIGNUP_USER=%%%SIGNUP_USER%%%
-SIGNUP_MACHINE=%%%SIGNUP_MACHINE%%%
-SIGNUP_AGENTNUM=%%%SIGNUP_AGENTNUM%%%
-SIGNUP_REFNUM=%%%SIGNUP_REFNUM%%%
-
-case "$1" in
-  start)
-        # Start daemons.
-        echo -n "Starting freeside-queued: "
-        freeside-queued $QUEUED_USER
-        echo "done."
-
-        echo -n "Starting fs_passwd_server: "
-        su freeside -c "$FREESIDE_PATH/fs_passwd/fs_passwd_server $PASSWD_USER $PASSWD_MACHINE" &
-        echo "done."
-
-        echo -n "Starting fs_signup_server: "
-        su freeside -c "$FREESIDE_PATH/fs_signup/fs_signup_server $SIGNUP_USER $SIGNUP_MACHINE $SIGNUP_AGENTNUM $SIGNUP_REFNUM" &
-        echo "done."
-        ;;
-  stop)
-        # Stop daemons.
-        echo -n "Stopping freeside-queued: "
-        kill `cat /var/run/freeside-queued.pid`
-        echo "done."
-
-        echo -n "Stopping fs_passwd_server: "
-        killall fs_passwd_server
-        echo "done."
-
-        echo -n "Stopping fs_signup_server: "
-        killall fs_signup_server
-        echo "done."
-        ;;
-
-  restart)
-        $0 stop
-        $0 start
-        ;;
-  *)
-        echo "Usage: freeside {start|stop|restart}"
-        exit 1
-esac
-
-exit 0
-
diff --git a/rt/ChangeLog b/rt/ChangeLog
deleted file mode 100644
index 549a5cac7..000000000
--- a/rt/ChangeLog
+++ /dev/null
@@ -1,16016 +0,0 @@
-2002-07-19 22:47  jesse
-
-	* README:
-
-	Fixed the readme about fastcgi
-	
-2002-07-19 22:42  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.0.14
-	
-2002-07-19 01:22  jesse
-
-	* Makefile, bin/rt, webrt/Search/Bulk.html:
-
-	RT-Ticket: 1547
-	
-	Bumping the version to 2.0.14-pre4
-	Fixing a typo that pdh caught in Tickets/Bulk.html
-	
-2002-07-13 00:22  jesse
-
-	* Makefile:
-
-	Bumped to 2.0.14-pre3
-	
-2002-07-13 00:19  jesse
-
-	* bin/webmux.pl:
-
-	modperl handler now speaks Mason 1.11 properly.
-	
-2002-07-13 00:00  jesse
-
-	* etc/config.pm:
-
-	Shifted some config defaults to make things easier for newbie users
-	
-2002-07-12 13:31  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Now we properly strip long pathnames from attachments uploaded from windows boxes.
-	
-2002-07-11 01:41  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Fixing a typo in the mason 11 handler
-	
-2002-07-10 14:41  jesse
-
-	* Makefile:
-
-	Bumping the version to 2.0.14-pre2
-	
-2002-07-10 14:36  jesse
-
-	* lib/RT/User.pm:
-
-	[no log message]
-	
-2002-07-10 14:35  jesse
-
-	* lib/RT/: Queue.pm, Ticket.pm:
-
-	RT-Ticket: 1418
-	RT-Status: resolved
-	
-	minor perldoc cleanups from pdh@snapgear
-	
-2002-07-10 14:32  jesse
-
-	* bin/rt-mailgate, lib/RT/Action/SendEmail.pm:
-
-	RT-Ticket: 1425
-	RT-Status: resolved
-	RT-Milestone: 2.0.x
-	RT-Subsystem: Mail Sending
-	
-	Fixes to create more proper message ids.
-	
-2002-07-10 14:28  jesse
-
-	* lib/RT/Ticket.pm:
-
-	RT-Ticket: 1431
-	RT-Status: resolved
-	
-	Importing tickets now lets you set the "Resolved" date
-	
-2002-07-10 14:17  jesse
-
-	* lib/RT/Tickets.pm:
-
-	RT-Ticket: 1434
-	RT-Status: resolved
-	RT-Subsystem: Core
-	RT-Milestone: 2.0.x
-	
-	RT is now smarter about letting you do "or" searches on single-value
-	keyword selections. Thanks to sam hartman.
-	
-2002-07-10 14:15  jesse
-
-	* webrt/Ticket/: Display.html, ModifyAll.html:
-
-	RT-Ticket: 1433
-	RT-Status: resolved
-	RT-Milestone: 2.0.x
-	RT-Subsystem: HTML::Mason frontend
-	RT-Severity: Nice to have
-	RT-Broken In: 2.0.13
-	RT-Broken In: 2.0.12
-	RT-Broken In: 2.0.11
-	RT-Broken In: 2.0.10
-	RT-Broken In: 2.0.0
-	RT-Broken In: 2.0.1
-	RT-Broken In: 2.0.2
-	RT-Broken In: 2.0.3
-	RT-Broken In: 2.0.4
-	RT-Broken In: 2.0.5
-	RT-Broken In: 2.0.6
-	RT-Broken In: 2.0.7
-	RT-Broken In: 2.0.8
-	RT-Broken In: 2.0.9
-	
-	Some signatures weren't setting off the "don't record comments if the update
-	is only a signature" code. Fixed.
-	
-2002-07-10 13:59  jesse
-
-	* lib/RT/Transaction.pm:
-
-	RT-Ticket: 1501
-	RT-Status: resolved
-	
-	Fixing docs in Transaction.pm's Message method
-	
-2002-07-10 13:19  jesse
-
-	* bin/rt:
-
-	RT-Ticket: 1528
-	RT-Milestone: 2.0.x
-	RT-Subsystem: CLI
-	RT-Severity: Normal
-	RT-Status: resolved
-	
-	Fixed docs for cli to say that --limit-status=dead isn't a valid option
-	
-2002-06-26 15:22  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	support for mason 1.1
-	
-2002-06-26 15:19  jesse
-
-	* Makefile, bin/mason_handler.fcgi, bin/webmux.pl,
-	webrt/Admin/Queues/GroupRights.html,
-	webrt/Admin/Queues/UserRights.html, webrt/Elements/ListActions,
-	webrt/Ticket/Elements/ShowBasics, webrt/Ticket/Elements/ToolBar:
-
-	Adding support for mason 1.10
-	
-2002-06-26 15:15  jesse
-
-	* lib/RT/Action/Notify.pm:
-
-	Fixed notify cc behavior
-	
-2002-06-26 15:13  jesse
-
-	* lib/RT/Action/SendEmail.pm:
-
-	Fixed pseudo-list syntax in To: lines
-	
-2002-06-26 15:09  jesse
-
-	* webrt/Search/Bulk.html:
-
-	Added support for bulk comment/reply
-	
-2002-05-03 02:07  jesse
-
-	* lib/RT/Ticket.pm:
-
-	RT-Ticket: 1369
-	RT-Status: resolved
-	
-	When a ticket has another merged into it, it now has its "LastUpdated" date
-	updated
-	
-2002-05-03 01:58  jesse
-
-	* lib/RT/Ticket.pm:
-
-	RT-Ticket: 1412
-	RT-status: resolved
-	
-	Fixed a docs bug in Ticket->Import which didn't make it clear that Import
-	took an "Id" parameter and "Create" didn't.
-	
-2002-05-03 01:54  jesse
-
-	* webrt/autohandler:
-
-	rt-ticket: 1410
-	rt-status: resolved
-	
-	Applied a patch from rich lafferty which prevented NoAuth from not
-	requiring authentication on some fastcgi setups.
-	
-	A similar bug bit SelfService.
-	
-	This commit fixes that one too.
-	
-2002-05-03 01:51  jesse
-
-	* Makefile:
-
-	RT-Ticket: 1272
-	rt-status: resolved
-	
-	Applied a patch from Ilya Martynov which allows make insert to work
-	in a scenario where DESTDIR is being set to something funny This may be necessary when installing into AFS
-	
-2002-05-03 01:36  jesse
-
-	* lib/RT/Action/SendEmail.pm:
-
-	RT-Ticket: 1367
-	RT-Status: resolved
-	
-	Added a check which only sets precedence to bulk if it's not already set,
-	say by a template.
-	
-2002-05-03 01:30  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	RT-Ticket: 1370
-	RT-Status: resolved
-	
-	From: Jason Edgecombe <jedgecombe@carolina.rr.com>
-	To: rt-devel@lists.fsck.com
-	Subject: [rt-devel] An oversite in Interface/Email.pm
-	
-	Hi,
-	
-	   I found an problem in Interface/Email.pm when I was modifying
-	   enhanced mailgate. I have attached a diff of the modifications.
-	
-	   In the function MailError, it assumes MIMIEOBJ is defined. I added a
-	   simple "if" test to only run $MIMEOBJ->sync_headers if $MIMEOBJ is defined.
-	
-2002-05-03 01:24  jesse
-
-	* lib/RT/Action/SendEmail.pm:
-
-	RT-Ticket: 1348
-	RT-Status: resolved
-	
-	Fixed a bug in mail sending that improperly quoted the usernames of users
-	who had " in their names
-	
-2002-04-29 00:39  jesse
-
-	* lib/RT.pm:
-
-	Fixed a tiny typo
-	
-2002-04-28 23:46  jesse
-
-	* lib/RT.pm:
-
-	Fixed up the rt log messages.
-	
-2002-04-21 02:14  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Fixed a couple bugs in setting owners that were only revealed by the poor data
-	validation on rt.cpan.org
-	
-2002-04-21 02:06  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Fixed a couple bugs in setting owners that were only revealed by the poor data
-	validation on rt.cpan.org
-	
-2002-04-19 00:32  jesse
-
-	* Makefile:
-
-	Adding a new Makefile target to ease packaging.
-	
-2002-04-18 12:47  jesse
-
-	* lib/RT/GroupMember.pm:
-
-	RT-Ticket: 1385
-	RT-Broken-In: 2.0.0
-	RT-Broken-In: 2.0.1
-	RT-Broken-In: 2.0.2
-	RT-Broken-In: 2.0.3
-	RT-Broken-In: 2.0.4
-	RT-Broken-In: 2.0.5
-	RT-Broken-In: 2.0.6
-	RT-Broken-In: 2.0.7
-	RT-Broken-In: 2.0.8
-	RT-Broken-In: 2.0.9
-	RT-Broken-In: 2.0.10
-	RT-Broken-In: 2.0.11
-	RT-Broken-In: 2.0.12
-	RT-Broken-In: 2.0.13
-	RT-Status: resolved
-	
-	GroupMemmber was looking for the "ModifyGroups" right, when it should have
-	been looking for the "AdminGroups" right
-	
-2002-04-05 10:24  jesse
-
-	* webrt/Ticket/Update.html:
-
-	RT-Ticket: 1330
-	RT-Status: Resolved
-	
-	Fixed an html escaping bug in Ticket/Update.html
-	
-2002-03-27 22:59  jesse
-
-	* Makefile, lib/RT/User.pm:
-
-	Fixed a CRITICAL security bug that allowed remote administrative access
-	to RT without a password.  (Security advisory to follow)
-	
-2002-03-14 16:15  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.0.12
-	
-2002-03-06 18:57  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.0.12pre6
-	
-2002-03-06 18:57  jesse
-
-	* lib/RT/Transaction.pm:
-
-	Added an update that will make dates changed as parts of transaction updates show up in local time
-	
-2002-03-06 18:56  jesse
-
-	* webrt/Admin/Queues/Modify.html:
-
-	Added a note to the queue creation screen about defaults.
-	
-2002-03-01 01:41  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	This patch fixes a small problem with printing a message.It checks if themessage is true, not if it has length, so a message containing 0 will notbe printed.  From Blair Zajac <blair@orcaware.com>
-	
-2002-03-01 01:39  jesse
-
-	* bin/rt:
-
-	RT-Ticket:438
-	RT-Status: resolved
-	
-	Added brandon's patch to allow searching for tickets by keyword on the commandline
-	
-2002-02-28 02:03  jesse
-
-	* bin/rt:
-
-	RT-Ticket: 1258
-	RT-Milestone: 2.0.x
-	RT-Subsystem: CLI
-	RT-Severity: normal
-	RT-Broken in: 2.0-beta3
-	RT-Broken in: 2.0.1
-	RT-Broken in: 2.0.2
-	RT-Broken in: 2.0.3
-	RT-Broken in: 2.0.4
-	RT-Broken in: 2.0.5
-	RT-Broken in: 2.0.6
-	RT-Broken in: 2.0.7
-	RT-Broken in: 2.0.8
-	RT-Broken in: 2.0.9
-	RT-Broken in: 2.0.10
-	RT-Broken in: 2.0.11
-	
-	Removed a line that make --limit-priority and --limit-final-priority not
-	work
-	
-2002-02-28 01:49  jesse
-
-	* lib/RT/Action/: Autoreply.pm, SendEmail.pm:
-
-	RT-Ticket: 1196
-	RT-Status: resolved
-	
-2002-02-28 01:38  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	RT-Ticket: 1246
-	RT-Status: resolved
-	
-2002-02-28 01:38  jesse
-
-	* tools/testdeps:
-
-	Added a couple explicit dependencies to testdeps that should have been there
-	forever ago. you'll only run into this if your cpan doesn't do recursive deps.
-	
-2002-02-20 20:45  jesse
-
-	* Makefile, lib/RT/Interface/Web.pm, webrt/Admin/Users/index.html,
-	webrt/Ticket/Update.html:
-
-	Bumped the version to 2.0.12-pre5.
-	
-	Web: Fixed a typo in user administration that prevented user listing
-	
-	Web: fixed recieve to receive in ticket/update
-	
-2002-02-19 03:23  jesse
-
-	* lib/RT/Scrips.pm:
-
-	Fixed a typo. (Added a missing ;)
-	
-2002-02-19 01:04  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0.12pre4
-	
-2002-02-18 18:35  jesse
-
-	* lib/RT/Condition/Generic.pm:
-
-	RT-Ticket: 1194
-	
-	cleaned up a reference to "ApplicableTypes", a nonexistent parameter to Condition->new
-	
-2002-02-18 18:30  jesse
-
-	* webrt/Elements/Login:
-
-	RT-Ticket: 1226
-	RT-Status: resolved
-	
-	Added an explicit reset of the content-type to 'text/html' when displaying hte login page
-	
-2002-02-18 18:25  jesse
-
-	* webrt/Admin/Users/index.html:
-
-	rt-ticket: 1190
-	rt-status: resolved
-	
-	Modified administrative userlist to make it easier to click on users who have no Name attribute defined
-	
-2002-02-18 18:18  jesse
-
-	* webrt/: Elements/Header, SelfService/Elements/Header:
-
-	rt-ticket: 1176
-	rt-status: resolved
-	
-	Applied tom's patch which hides the preferences link if the user doesn't have the right to "modify self"
-	
-2002-02-18 18:14  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	RT-Ticket: 1165
-	RT-Status: resolved
-	
-	exporting the ParseAddressFromHeader subroutine so others can play with it
-	
-2002-02-18 18:06  jesse
-
-	* webrt/Ticket/Update.html:
-
-	RT-Ticket:1209
-	RT-Milestone: 2.0.x
-	RT-Status: resolved
-	
-	Removed  a bogus font tag from the Ticket update screen
-	
-2002-02-18 18:00  jesse
-
-	* lib/RT/Interface/Web.pm, webrt/Search/Listing.html:
-
-	RT-Ticket: 1243
-	RT-Status: resolved
-	RT-Milestone: 2.0.x
-	RT-Broken-In: 2.0.8
-	RT-Broken-In: 2.0.9
-	RT-Broken-In: 2.0.10
-	RT-Broken-In: 2.0.11
-	RT-Subsystem: HTML::Mason Frontend
-	RT-Severity: Normal
-	
-	Switched the web frontend to use an in-core scalar for uploaded attachment content,
-	rather than a tempfile which wasn't getting cleaned up properly
-	
-2002-02-18 16:53  jesse
-
-	* webrt/Search/Listing.html:
-
-	RT-Ticket: 1245
-	Rt-status: resolved
-	
-	Applied a patch to nuke duplicate restrictions in the webui.
-	
-2002-02-18 16:47  jesse
-
-	* webrt/Admin/Groups/Members.html:
-
-	RT-Ticket: 1421
-	RT-Status: resolved
-	
-	moved a label inside a loop to make the ui easier to understand
-	
-2002-02-18 16:36  jesse
-
-	* etc/config.pm:
-
-	Set Default for UseFriendlyToLines to 0 by default, to deal with users running
-	redhat who have trouble configuring RT.
-	
-2002-02-18 16:31  jesse
-
-	* Makefile, lib/RT/Scrip.pm, tools/insertdata:
-
-	Edited insertdata to insert scrips by default, so that users don't need
-	to go through the configuration task themselves.
-	
-	Change the Makefile's WEB_GROUP to www by default for redhat and OSX.
-	
-	Correced docs for lib/RT/Scrip new() method
-	
-2002-02-08 01:23  jesse
-
-	* webrt/SelfService/Display.html:
-
-	cleanup to "last trans" in SelfService
-	
-2002-02-08 00:53  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Generalized "Abort" function to allow other non-html error messages with
-	proper handlers
-	
-2002-02-08 00:49  jesse
-
-	* etc/: schema.Pg, schema.mysql:
-
-	removed duplicate indices
-	
-2002-02-07 16:41  jesse
-
-	* etc/config.pm:
-
-	Added some docs to the config file from Rich Lafferty
-	
-2002-02-04 12:37  jesse
-
-	* lib/RT/Template.pm:
-
-	Output template content to core rather than disk when parsing.
-	
-2002-01-28 01:01  jesse
-
-	* webrt/Ticket/Elements/ShowHistory:
-
-	closing lasttrans anchor
-	
-2002-01-28 00:59  jesse
-
-	* webrt/Ticket/Elements/ShowHistory:
-
-	Closing the #lasttrans anchor
-	
-2002-01-28 00:58  jesse
-
-	* lib/RT/Record.pm:
-
-	RT-Ticket: 1156
-	
-	Pulling forward the patch for 1156
-	
-2002-01-28 00:57  jesse
-
-	* lib/RT/Record.pm:
-
-	RT-Ticket: 1156
-	RT-Status: resolved
-	
-2002-01-28 00:47  jesse
-
-	* bin/mason_handler.fcgi:
-
-	Small fix to the fastcgi handler to make attachment display work better,
-	thanks to rich lafferty.
-	
-2002-01-28 00:47  jesse
-
-	* etc/config.pm:
-
-	Removed some extraneous slashes from the config file.
-	
-2002-01-28 00:46  jesse
-
-	* README:
-
-	Clarified some readme stuff
-	
-2002-01-28 00:44  jesse
-
-	* bin/rt-commit-handler:
-
-	Bringing forward a fix to the cvs commit handler to deal with branched
-	version #s.
-	
-2002-01-28 00:40  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.1.1
-	
-2002-01-28 00:27  jesse
-
-	* etc/RT_Config.pm:
-
-	file RT_Config.pm was initially added on branch rt-2-1.
-	
-2002-01-28 00:27  jesse
-
-	* bin/enhanced-mailgate:
-
-	file enhanced-mailgate was initially added on branch rt-2-1.
-	
-2002-01-28 00:27  jesse
-
-	* bin/rt-commit-handler:
-
-	file rt-commit-handler was initially added on branch rt-2-1.
-	
-2002-01-28 00:27  jesse
-
-	* Makefile, bin/enhanced-mailgate, bin/mason_handler.fcgi, bin/rt,
-	bin/rt-commit-handler, bin/rt-mailgate, bin/rtadmin, bin/webmux.pl,
-	etc/RT_Config.pm, etc/acl.Oracle, etc/acl.Pg, etc/acl.mysql,
-	etc/config.pm, lib/RT.pm, lib/RT/Handle.pm, lib/RT/User.pm,
-	lib/RT/Watcher.pm, lib/RT/Interface/CLI.pm,
-	lib/RT/Interface/Email.pm, tools/cpan2rpm, tools/initdb,
-	tools/insertdata, tools/testdeps:
-
-	First RT 2.1 checkin. don't expect this to run.  (though it does here)
-	
-2002-01-25 17:37  jesse
-
-	* README:
-
-	Added a warning to the readme that 2.1 is scary and people shouldn't use it
-	
-2002-01-25 17:24  jesse
-
-	* Makefile:
-
-	Branching 2.1.0  and incrementing the makefile to 2.1.
-	
-	Welcome to the future.
-	
-2002-01-24 13:30  jesse
-
-	* lib/RT/Transaction.pm:
-
-	RT-Ticket: 1201
-	RT-Status: resolved
-	
-	Better transaction display for "text" and "message" parts.
-	
-2002-01-24 13:00  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	RT-Ticket: 1166
-	RT-Status: resolved
-	
-	Implemented better URL regexp matching.
-	
-2002-01-24 10:39  jesse
-
-	* bin/rt-mailgate:
-
-	Fixed a typo in a debug message in rt-mailgate
-	
-2002-01-24 10:34  jesse
-
-	* lib/RT/Template.pm:
-
-	Switched from bogus mime parsing to using MIME::Parser like we should have
-	from the get-go.
-	
-	Used perltidy to clean up template.pm before we started working on it.
-	
-2002-01-24 10:28  jesse
-
-	* lib/RT/Record.pm:
-
-	Added a check to LoadByCols which causes postgres mode to not try to lookup
-	lc(undef)
-	
-2002-01-24 10:23  jesse
-
-	* webrt/NoAuth/webrt.css:
-
-	Added a new style to the stylesheet to support some new reports
-	
-2002-01-24 10:21  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	mail gateway now unfolds long headers on parse.
-	
-2002-01-11 15:20  jesse
-
-	* Makefile, lib/RT/Transaction.pm:
-
-	RT-Ticket: 950
-	
-	Aoolyed the recommended patch to make blank bodies not get
-	mailed in lieu of the real message
-	
-2002-01-11 15:00  jesse
-
-	* Makefile, webrt/Ticket/ModifyAll.html:
-
-	Fixed a small bug that broke the "jumbo" page after 2.0.11
-	
-2002-01-11 01:17  jesse
-
-	* bin/rt-mailgate:
-
-	Added a new flag to rt-mailgate to enable setting the owner of new tickets based on +extension
-	
-2002-01-11 01:13  jesse
-
-	* webrt/Ticket/: Modify.html, ModifyAll.html:
-
-	Adding a couple ACL checks to better deal with moving tickets to queues the user can't see
-	
-2002-01-11 01:11  jesse
-
-	* webrt/Admin/Queues/index.html:
-
-	Fixed typo in ACL check that resulted in "Create Queue" being more restrictive than
-	it needed to be
-	
-2002-01-10 19:07  jesse
-
-	* webrt/Ticket/Update.html:
-
-	more tweaking
-	
-2002-01-10 19:05  jesse
-
-	* webrt/Ticket/Update.html:
-
-	Cleaned up the Ticekt Update ui some
-	
-2002-01-10 19:02  jesse
-
-	* lib/RT/: Attachment.pm, Action/Notify.pm, Condition/Generic.pm:
-
-	Cleanups to make Also-Cc and Also-Bcc go
-	
-2002-01-10 19:01  jesse
-
-	* lib/RT/Queue.pm:
-
-	Changed a test to work the way that Test::Inline does now
-	
-2002-01-10 18:34  jesse
-
-	* lib/RT/Attachment.pm:
-
-	Changes to attachment to provide the header frobbing necessary to send mail to ccs and bccs
-	
-2002-01-10 18:32  jesse
-
-	* Makefile, README, lib/RT/Ticket.pm, tools/insertdata,
-	webrt/Ticket/Update.html, lib/RT/Action/Notify.pm:
-
-	Work on "Explicit Cc" and "Explicit Bcc" for a client
-	
-2002-01-10 18:27  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	abstracting out a number to a named variable
-	
-2002-01-09 02:24  jesse
-
-	* webrt/Admin/: Groups/index.html, Keywords/index.html:
-
-	A couple tiny ui cleanups (removed some object ids from the UI where they were just being clutter
-	
-2002-01-02 21:58  jesse
-
-	* Makefile, README, webrt/Elements/Login:
-
-	Bumped some copyright notices to 2002. bumped version to 2.0.11
-	
-2001-12-26 14:59  jesse
-
-	* Makefile:
-
-	Bumping version to 2.0.11pre1
-	
-2001-12-26 14:51  jesse
-
-	* lib/RT/Tickets.pm:
-
-	Merges were being over-zealous in what they twiddled the effective id of.
-	
-	this meant that far too many tickets would show up in ticket listings.
-	
-2001-12-24 18:58  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.0.10
-	
-2001-12-19 00:24  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0.10pre4
-	
-	fix to makefile to genereate changelog for head
-	
-2001-12-18 03:58  jesse
-
-	* lib/RT/Tickets.pm:
-
-	The "null search" was finding all tickets in 2.0.10pre3.  Fixed in CVS
-	
-2001-12-18 03:53  jesse
-
-	* bin/rt:
-
-	fixed typos in bin/rt that stopped --limit-subject --limit-requestors and --limit-body from
-	working
-	
-2001-12-17 15:13  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.0.10-test3
-	
-2001-12-17 14:58  jesse
-
-	* lib/RT/User.pm, tools/insertdata, webrt/Admin/Users/Modify.html:
-
-	RT-Ticket: 935
-	RT-Status: resolved
-	
-	cleaned up seph's patch. this enabled me to actually really properly support
-	users with no email address, which meant there were a couple other cleanups
-	to go through too.
-	
-2001-12-17 14:26  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Some small cleanups to the IsWatcher stuff.
-	
-	Added checks to make sure that watchers aren't duplicated to ticket.pm
-	
-2001-12-17 13:04  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	Fixed an unclosed anchor which caused IE to render ticket listings wrong.
-	
-2001-12-14 18:29  jesse
-
-	* lib/Makefile.PL, tools/testdeps:
-
-	Bumped DBIx::SearchBuilder dependency to 0.48
-	
-2001-12-14 18:28  jesse
-
-	* tools/testdeps, webrt/Elements/Login:
-
-	Removed code to special case for bugs in mason < 1.01.
-	Moved us up to a mason 1.02 dependency
-	
-2001-12-14 18:26  jesse
-
-	* bin/rt:
-
-	bin/rt: added support for --version, fixed --status = !closed, docced --merge-into
-	
-2001-12-14 18:25  jesse
-
-	* Makefile:
-
-	Some stylistic cleanups  to the makefile from blair.
-	
-2001-12-14 16:42  jesse
-
-	* bin/rtadmin:
-
-	rtadmin had some issues where it would assume a 'name' if called without --name for user group and queue editing.
-	
-2001-12-14 16:06  jesse
-
-	* lib/RT/Tickets.pm:
-
-	
-	Ticket listings will no longer show tickets which have been merged into others.
-	
-		-j
-	
-2001-12-14 15:27  jesse
-
-	* lib/RT/User.pm:
-
-	Prevent users from futzing with nobody or rt_System, unless you're setting an email address.
-	(Arguably, that's a bug too)
-	
-2001-12-14 14:03  jesse
-
-	* lib/RT/: ACE.pm, Group.pm, GroupMember.pm, Keyword.pm,
-	KeywordSelect.pm, Queue.pm, Scrip.pm, Template.pm, Ticket.pm:
-
-	Standardised on "Permission Denied" instead of having some "Permission denied". Thanks simon.
-	
-	        -j
-	
-2001-12-14 13:46  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Reordered the order that Basics actions are committed, so that Queue changes
-	come after other changes, so that users don't move tickets out of a queue before they have a
-	chance to update them.
-	
-2001-12-13 02:18  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Addition to Ticket->Import, so you can set owner by name.
-	
-	Fix for a bug in Ticket->AddWatcher that would let privileged watchers without
-	email addresses add others as watchers.
-	
-2001-12-03 20:13  jesse
-
-	* Makefile, lib/RT/EasySearch.pm, lib/RT/Keyword.pm,
-	lib/RT/Record.pm, lib/RT/Tickets.pm, lib/RT/User.pm:
-
-	more work on making sure that only the things we want are case sensitive
-	(IE name, content email address should always be insensitive.  when loading a row by any field other than ID, that should be case-insensitive)
-	
-2001-12-03 19:17  jesse
-
-	* Makefile:
-
-	bumped the version  to 2.0.10-test1
-	
-2001-12-03 19:14  jesse
-
-	* lib/RT/EasySearch.pm:
-
-	We now default to case sensitive searches, rather than case-insensitive ones.
-	(This should speed up Pg a LOT. We'll be adding in case-insensitive searching
-	for the 13 attributes that matter:
-	
-	Watcher->Email
-	User->name
-	User->email
-	User->gecos
-	Ticket->Subject
-	Queue->name
-	KeywordSelect->name
-	Keyword->Name
-	ObjectKeyword->Name
-	Attachment->Subject
-	Attachment->Content
-	Attachment->Headers
-	
-2001-12-03 19:13  jesse
-
-	* webrt/: Admin/Queues/Modify.html, Admin/Queues/People.html,
-	Elements/GotoTicket:
-
-	Some small UI cleanups from Hakke
-	
-2001-11-29 03:50  jesse
-
-	* webrt/: Elements/SelectEqualityOperator, Elements/SelectOwner,
-	Search/PickRestriction:
-
-	SelectOwner now passes a ticket up the line.
-	
-	Priority can now have = and != searches
-	
-2001-11-29 03:49  jesse
-
-	* tools/insertdata:
-
-	Cleaned up a template to display Ticket subject, if no transaction subject is given.
-	
-2001-11-29 03:48  jesse
-
-	* webrt/Ticket/: Update.html, Elements/EditPeople:
-
-	Now pass in ticket Id, so that "owner" can be someone who only has rights to that tikcet.
-	
-2001-11-29 03:47  jesse
-
-	* lib/RT/Ticket.pm:
-
-	FinalPriority should never get set to null if a ticket doesn't have the attribute set on create
-	
-	Untake's arguments were debognifed
-	
-2001-11-29 03:45  jesse
-
-	* webrt/SelfService/Elements/Header:
-
-	"Logout" no longer shows up when using external auth with SelfService
-	
-2001-11-29 03:44  jesse
-
-	* bin/rt:
-
-	Fix for setting priority when creating tickets with the cli
-	
-2001-11-29 03:42  jesse
-
-	* bin/rt-mailgate:
-
-	Added support for --ticket-id-from-extension to rt-mailgate
-	
-2001-11-14 14:28  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.0.9
-	
-2001-11-13 11:33  jesse
-
-	* Makefile, bin/initacls.Pg, bin/rt:
-
-	rt-ticket:1007
-	rt-status: resolved
-	
-	initacls.pg no longer has extranious spaces which break variable assignment for port and host.
-	
-	Bumped version to 2.0.9pre9
-	
-2001-11-12 13:19  jesse
-
-	* Makefile, bin/initacls.Pg:
-
-	Fix for #1007 (Typo in bin/initacls.Pg)
-	Bumped version to 2.0.9pre8
-	
-2001-11-09 18:24  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	URL higlighting should now work with mailto: urls
-	
-2001-11-09 18:15  jesse
-
-	* Makefile, webrt/Ticket/Elements/ShowTransaction:
-
-	Cleaned up the url highlighting code
-	
-	Bumped the version to 2.0.9pre7
-	
-2001-11-09 17:27  jesse
-
-	* Makefile:
-
-	Fixing the new taggy stuff
-	
-2001-11-09 17:23  jesse
-
-	* Makefile:
-
-	Fixing the new branchy stuff
-	
-2001-11-09 17:07  jesse
-
-	* Makefile, bin/rtadmin, etc/config.pm,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Added a bit of doc to etc/config.pm
-	
-	Modified ShowTransaction to more properly escape html
-	
-	Fixed some of the cli help for rtadmin
-	
-	Added support for branch specification to the makefile
-	
-2001-11-08 15:15  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	I can commit on the head. really.
-	
-2001-11-08 15:06  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Dealing with defined but blank Owner fields
-	
-2001-11-06 18:06  jesse
-
-	* tools/cpan2rpm, tools/initdb, tools/insertdata, tools/testdeps,
-	webrt/autohandler, webrt/index.html, webrt/Admin/index.html,
-	webrt/Admin/Elements/CreateQueueCalled,
-	webrt/Admin/Elements/CreateUserCalled,
-	webrt/Admin/Elements/EditUserComments,
-	webrt/Admin/Elements/GrantQueueRightsTo,
-	webrt/Admin/Elements/GroupTabs, webrt/Admin/Elements/Header,
-	webrt/Admin/Elements/ListGlobalKeywordSelects,
-	webrt/Admin/Elements/ListGlobalScrips,
-	webrt/Admin/Elements/ModifyKeyword,
-	webrt/Admin/Elements/ModifyKeywordSelect,
-	webrt/Admin/Elements/ModifyQueue,
-	webrt/Admin/Elements/ModifyTemplate,
-	webrt/Admin/Elements/ModifyUser,
-	webrt/Admin/Elements/QueueRightsForUser,
-	webrt/Admin/Elements/QueueTabs,
-	webrt/Admin/Elements/SelectKeywordSelect,
-	webrt/Admin/Elements/SelectModifyGroup,
-	webrt/Admin/Elements/SelectModifyKeyword,
-	webrt/Admin/Elements/SelectModifyKeywordSelect,
-	webrt/Admin/Elements/SelectModifyQueue,
-	webrt/Admin/Elements/SelectModifyUser,
-	webrt/Admin/Elements/SelectQueueRights,
-	webrt/Admin/Elements/SelectRights,
-	webrt/Admin/Elements/SelectScrip,
-	webrt/Admin/Elements/SelectScripAction,
-	webrt/Admin/Elements/SelectScripCondition,
-	webrt/Admin/Elements/SelectSingleOrMultiple,
-	webrt/Admin/Elements/SelectTemplate,
-	webrt/Admin/Elements/SelectUsers, webrt/Admin/Elements/SystemTabs,
-	webrt/Admin/Elements/Tabs, webrt/Admin/Elements/UserTabs,
-	webrt/Admin/Global/GroupRights.html,
-	webrt/Admin/Global/Keywords.html, webrt/Admin/Global/Scrips.html,
-	webrt/Admin/Global/Template.html,
-	webrt/Admin/Global/Templates.html,
-	webrt/Admin/Global/UserRights.html, webrt/Admin/Global/index.html,
-	webrt/Admin/Groups/Members.html, webrt/Admin/Groups/Modify.html,
-	webrt/Admin/Groups/Rights.html, webrt/Admin/Groups/index.html,
-	webrt/Admin/KeywordSelects/Modify.html,
-	webrt/Admin/KeywordSelects/index.html,
-	webrt/Admin/Keywords/Modify.html, webrt/Admin/Keywords/index.html,
-	webrt/Admin/Queues/Create.html,
-	webrt/Admin/Queues/GroupRights.html,
-	webrt/Admin/Queues/Keywords.html, webrt/Admin/Queues/Modify.html,
-	webrt/Admin/Queues/People.html, webrt/Admin/Queues/Scrips.html,
-	webrt/Admin/Queues/Template.html,
-	webrt/Admin/Queues/Templates.html,
-	webrt/Admin/Queues/UserRights.html, webrt/Admin/Queues/index.html,
-	webrt/Admin/Users/Modify.html, webrt/Admin/Users/Prefs.html,
-	webrt/Admin/Users/Rights.html, webrt/Admin/Users/index.html,
-	webrt/Elements/Checkbox, webrt/Elements/CreateTicket,
-	webrt/Elements/CustomHomepageHeader, webrt/Elements/Error,
-	webrt/Elements/Footer, webrt/Elements/GotoTicket,
-	webrt/Elements/Header, webrt/Elements/ListActions,
-	webrt/Elements/Login, webrt/Elements/MessageBox,
-	webrt/Elements/MyRequests, webrt/Elements/MyTickets,
-	webrt/Elements/Quicksearch, webrt/Elements/Refresh,
-	webrt/Elements/Section, webrt/Elements/SelectBoolean,
-	webrt/Elements/SelectDate, webrt/Elements/SelectDateRelation,
-	webrt/Elements/SelectDateType, webrt/Elements/SelectKeyword,
-	webrt/Elements/SelectKeywordOptions, webrt/Elements/SelectLinkType,
-	webrt/Elements/SelectMatch, webrt/Elements/SelectNewTicketQueue,
-	webrt/Elements/SelectOwner, webrt/Elements/SelectQueue,
-	webrt/Elements/SelectResultsPerPage,
-	webrt/Elements/SelectSortOrder, webrt/Elements/SelectStatus,
-	webrt/Elements/SelectTicketSortBy, webrt/Elements/SelectUsers,
-	webrt/Elements/SelectWatcherType, webrt/Elements/ShadedBox,
-	webrt/Elements/Submit, webrt/Elements/Tabs,
-	webrt/Elements/TitleBoxEnd, webrt/Elements/TitleBoxStart,
-	webrt/Elements/ViewUser, webrt/Elements/dayMenu,
-	webrt/Elements/monthMenu, webrt/Elements/yearMenu,
-	webrt/NoAuth/Logout.html, webrt/NoAuth/Reminder.html,
-	webrt/NoAuth/webrt.css, webrt/NoAuth/images/rt.jpg,
-	webrt/NoAuth/images/spacer.gif, webrt/Search/Bulk.html,
-	webrt/Search/Listing.html, webrt/Search/PickRestriction,
-	webrt/Search/RestrictSearch.html, webrt/Search/TicketCell,
-	webrt/SelfService/Closed.html, webrt/SelfService/Create.html,
-	webrt/SelfService/Display.html, webrt/SelfService/Error.html,
-	webrt/SelfService/Prefs.html, webrt/SelfService/Update.html,
-	webrt/SelfService/index.html,
-	webrt/SelfService/Attachment/dhandler,
-	webrt/SelfService/Elements/GotoTicket,
-	webrt/SelfService/Elements/Header,
-	webrt/SelfService/Elements/MyRequests,
-	webrt/SelfService/Elements/Tabs, webrt/Ticket/Create.html,
-	webrt/Ticket/Display.html, webrt/Ticket/History.html,
-	webrt/Ticket/Modify.html, webrt/Ticket/ModifyAll.html,
-	webrt/Ticket/ModifyDates.html, webrt/Ticket/ModifyLinks.html,
-	webrt/Ticket/ModifyPeople.html, webrt/Ticket/Update.html,
-	webrt/Ticket/Attachment/dhandler,
-	webrt/Ticket/Elements/AddWatchers,
-	webrt/Ticket/Elements/EditBasics, webrt/Ticket/Elements/EditDates,
-	webrt/Ticket/Elements/EditKeywordSelects,
-	webrt/Ticket/Elements/EditLinks, webrt/Ticket/Elements/EditPeople,
-	webrt/Ticket/Elements/EditWatchers,
-	webrt/Ticket/Elements/ShowBasics, webrt/Ticket/Elements/ShowDates,
-	webrt/Ticket/Elements/ShowDependencies,
-	webrt/Ticket/Elements/ShowHistory,
-	webrt/Ticket/Elements/ShowKeywordSelects,
-	webrt/Ticket/Elements/ShowLinks,
-	webrt/Ticket/Elements/ShowMemberOf,
-	webrt/Ticket/Elements/ShowMembers,
-	webrt/Ticket/Elements/ShowPeople,
-	webrt/Ticket/Elements/ShowReferences,
-	webrt/Ticket/Elements/ShowRequestor,
-	webrt/Ticket/Elements/ShowSummary,
-	webrt/Ticket/Elements/ShowTransaction, webrt/Ticket/Elements/Tabs,
-	webrt/Ticket/Elements/ToolBar, webrt/User/Prefs.html:
-
-	Merging rt-1-1 to the head.
-	
-	RT 1.0 now lives on the rt-1-0 branch.
-	
-2001-11-06 18:03  jesse
-
-	* Makefile, NEWS, README, TODO, bin/initacls.Oracle,
-	bin/initacls.Pg, bin/initacls.mysql, bin/mason_handler.fcgi,
-	bin/mason_handler.scgi, bin/rt, bin/rt-mailgate, bin/rtadmin,
-	bin/rtmux.pl, bin/testdeps.pl, bin/webmux.pl, docs/FAQ,
-	docs/FAQ.html, docs/README.docs, docs/Security,
-	docs/rt-templates.html, docs/rt_users_guide.html,
-	docs/design_docs/CARS, docs/design_docs/TransactionTypes.txt,
-	docs/design_docs/acls, docs/design_docs/basic-definitions.txt,
-	docs/design_docs/cli_spec, docs/design_docs/cvs_integration,
-	docs/design_docs/evil_plans, docs/design_docs/link-definitions.txt,
-	docs/design_docs/local_hacking,
-	docs/design_docs/subscription-definitions.txt,
-	docs/design_docs/users, etc/acl.Oracle, etc/acl.Pg, etc/acl.mysql,
-	etc/config.pm, etc/mysql.acl, etc/rt.spec, etc/schema,
-	etc/schema.Oracle, etc/schema.Pg, etc/schema.mysql, etc/schema.pm,
-	etc/suidrt.c, lib/MANIFEST, lib/MANIFEST.SKIP, lib/Makefile.PL,
-	lib/RT.pm, lib/test.pl, lib/RT/ACE.pm, lib/RT/ACL.pm,
-	lib/RT/Attachment.pm, lib/RT/Attachments.pm, lib/RT/CurrentUser.pm,
-	lib/RT/Date.pm, lib/RT/EasySearch.pm, lib/RT/Group.pm,
-	lib/RT/GroupMember.pm, lib/RT/GroupMembers.pm, lib/RT/Groups.pm,
-	lib/RT/Handle.pm, lib/RT/Keyword.pm, lib/RT/KeywordSelect.pm,
-	lib/RT/KeywordSelects.pm, lib/RT/Keywords.pm, lib/RT/Link.pm,
-	lib/RT/Links.pm, lib/RT/ObjectKeyword.pm, lib/RT/ObjectKeywords.pm,
-	lib/RT/Queue.pm, lib/RT/Queues.pm, lib/RT/Record.pm,
-	lib/RT/Scrip.pm, lib/RT/ScripAction.pm, lib/RT/ScripActions.pm,
-	lib/RT/ScripCondition.pm, lib/RT/ScripConditions.pm,
-	lib/RT/Scrips.pm, lib/RT/Template.pm, lib/RT/Templates.pm,
-	lib/RT/TestHarness.pm, lib/RT/Ticket.pm, lib/RT/Tickets.pm,
-	lib/RT/Transaction.pm, lib/RT/Transactions.pm, lib/RT/User.pm,
-	lib/RT/Users.pm, lib/RT/Watcher.pm, lib/RT/Watchers.pm,
-	lib/RT/Action/Autoreply.pm, lib/RT/Action/Generic.pm,
-	lib/RT/Action/Notify.pm, lib/RT/Action/NotifyAsComment.pm,
-	lib/RT/Action/OpenDependent.pm, lib/RT/Action/README.hackers,
-	lib/RT/Action/ResolveMembers.pm, lib/RT/Action/SendEmail.pm,
-	lib/RT/Action/SendPasswordEmail.pm,
-	lib/RT/Action/StallDependent.pm,
-	lib/RT/Condition/AnyTransaction.pm, lib/RT/Condition/Generic.pm,
-	lib/RT/Condition/NewDependency.pm,
-	lib/RT/Condition/StatusChange.pm, lib/RT/Interface/CLI.pm,
-	lib/RT/Interface/Email.pm, lib/RT/Interface/Web.pm:
-
-	Merging rt-1-1 to the head.
-	
-	RT 1.0 now lives on the rt-1-0 branch.
-	
-2001-11-06 17:57  jesse
-
-	* rt.spec, etc/rt.spec:
-
-	Cleaned up spec file goodness
-	
-2001-11-06 16:28  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0.9pre5
-	
-2001-11-05 00:55  jesse
-
-	* rt.spec, lib/Makefile.PL, tools/testdeps:
-
-	Bumped the searchbuilder dependency to 0.47
-	
-2001-11-05 00:54  jesse
-
-	* webrt/Ticket/Update.html:
-
-	Named the ticket update form.
-	
-2001-11-05 00:52  jesse
-
-	* etc/config.pm, lib/RT/Handle.pm:
-
-	Added support for postgres' connections-over-ssl
-	
-2001-11-05 00:49  jesse
-
-	* webrt/Admin/Elements/SelectRights:
-
-	Updated ACL selecting UI to work properly with browsers that try to auto-select
-	a value in a SELECT
-	
-2001-11-02 01:39  jesse
-
-	* Makefile:
-
-	bumped the version to 2.0.9pre4
-	
-2001-11-02 01:31  jesse
-
-	* webrt/Ticket/: Display.html, ModifyAll.html:
-
-	Fix to not automatically record comments if nothing was typed.
-	
-2001-11-02 00:52  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Fix for duplicated requestors on merge. #791
-	
-2001-11-01 17:40  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	More tweaking transaction display
-	
-2001-11-01 17:36  jesse
-
-	* webrt/: Admin/Users/Modify.html, Ticket/Elements/ShowTransaction:
-
-	Fixed newlines between ticket body and headers.
-	
-	Fix for 934: creating users doesn't completely fail (new)
-	
-2001-11-01 17:24  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	Cleanups to ShowTransaction
-	
-2001-11-01 17:10  jesse
-
-	* lib/RT/: Keyword.pm, Interface/Web.pm:
-
-	Fix for loading queue (post 2.0.8) when called by name
-	Fix for _not_ trying to load keywords when called with no value.
-	
-2001-10-31 17:38  jesse
-
-	* Makefile:
-
-	Fixed the make dist
-	
-2001-10-31 02:56  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.0.9pre3
-	
-2001-10-31 02:54  jesse
-
-	* lib/RT/Action/SendPasswordEmail.pm:
-
-	file SendPasswordEmail.pm was initially added on branch rt-1-1.
-	
-2001-10-31 02:54  jesse
-
-	* lib/RT/Action/SendPasswordEmail.pm:
-
-	Added an action to mail a password to the user.
-	
-2001-10-31 02:54  jesse
-
-	* bin/rt-mailgate:
-
-	added support to rt-mailgate for putting the queue name in a +extension
-	
-2001-10-31 02:52  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Tickets which are created in a "resolved" state will now have their "resolved"
-	date set right.
-	
-2001-10-31 02:51  jesse
-
-	* lib/RT/User.pm:
-
-	Started work on "Email password to user"
-	
-2001-10-31 02:48  jesse
-
-	* lib/RT/Watcher.pm:
-
-	Added a patch from Simon Cozens which makes sure that a requestor is always a user, rather than an email address.
-	
-2001-10-31 02:47  jesse
-
-	* lib/RT/Keyword.pm:
-
-	Added a helper Load function to Keyword to load by Id or Path
-	
-2001-10-31 02:42  jesse
-
-	* lib/RT/Template.pm:
-
-	
-	Template got new helper functions for loading queue and system templates.
-	
-2001-10-31 02:40  jesse
-
-	* bin/rt, bin/rtadmin, lib/RT/Interface/CLI.pm,
-	lib/RT/Interface/Email.pm:
-
-	Bringing forward a security fix from 2.0.8_01.  (nonusers could get superuser permissions from the CLI)
-	
-2001-10-31 02:37  jesse
-
-	* webrt/: Elements/MyRequests, Elements/MyTickets,
-	Ticket/Create.html:
-
-	Fixed a display bug in mytickets and myrequests which prevented clicking on
-	subjectless email
-	
-2001-10-31 02:04  jesse
-
-	* etc/: config.pm, schema.Pg, schema.mysql, schema.pm:
-
-	Lengthened queue name and email addresses in the default DB schema
-	
-2001-10-31 02:02  jesse
-
-	* webrt/Ticket/Update.html, lib/RT/Interface/Web.pm:
-
-	Now show the current ticket subject by default in the update subject box.
-	But don't include it in the transaction if it hasn't changed.
-	
-2001-10-31 01:09  jesse
-
-	* Makefile, bin/rt, bin/rt-mailgate, bin/rtadmin,
-	lib/RT/Interface/CLI.pm, lib/RT/Interface/Email.pm:
-
-	Security fixes per Jay at mojomole
-	
-2001-10-25 17:40  jesse
-
-	* webrt/Search/Listing.html:
-
-	Fixed a bug in new listing display. introduced after 2.0.8
-	
-2001-10-24 14:10  jesse
-
-	* Makefile, lib/RT/Ticket.pm:
-
-	Fixed the ticket status changes from open to open bug, thanks to raphael
-	at linkvest.
-	
-2001-10-23 17:34  jesse
-
-	* webrt/Ticket/Create.html:
-
-	Some cleanups to the Create form. No new functionality, just a little bit prettier
-	
-2001-10-23 17:34  jesse
-
-	* webrt/Elements/SelectTicketSortBy:
-
-	Elements/SelectTicketsSortBy now uses new list of sortable Tickets fields
-	in Tickets.pm
-	
-2001-10-23 17:32  jesse
-
-	* webrt/Search/Listing.html:
-
-	Column headings in searches are now clicky, where possible
-	
-2001-10-23 17:31  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	URLs in ticket history should now be clicky
-	
-2001-10-23 17:26  jesse
-
-	* webrt/Elements/CustomHomepageHeader:
-
-	file CustomHomepageHeader was initially added on branch rt-1-1.
-	
-2001-10-23 17:26  jesse
-
-	* webrt/: index.html, Elements/CustomHomepageHeader:
-
-	Added a hook for sites to put their own html in the top of the "Home" page
-	
-2001-10-23 17:24  jesse
-
-	* webrt/Elements/: SelectNewTicketQueue, SelectQueue:
-
-	Frefactored SelectQueue to elimintate dupicate code and enable a "too many queues" option
-	
-2001-10-23 17:22  jesse
-
-	* lib/: RT.pm, RT/Date.pm, RT/Keyword.pm, RT/KeywordSelect.pm,
-	RT/Keywords.pm, RT/Link.pm, RT/Links.pm, RT/ObjectKeywords.pm,
-	RT/Record.pm, RT/Scrip.pm, RT/ScripActions.pm,
-	RT/ScripConditions.pm, RT/Ticket.pm, RT/Action/SendEmail.pm,
-	RT/Condition/Generic.pm, RT/Interface/CLI.pm,
-	RT/Interface/Email.pm:
-
-	Simple fixes to POD from Feargal Reilly to fix complaints from pod2man
-	
-2001-10-23 17:08  jesse
-
-	* lib/RT/Tickets.pm:
-
-	Refactored Tickets.pm a bit to provide better access to fields
-	that tickets can be sorted on.
-	
-2001-10-23 17:06  jesse
-
-	* etc/: config.pm, schema.Pg, schema.mysql, schema.pm:
-
-	Added some new indices, based on recommendations from Nobel Tse at Outblaze
-	
-	Started to cleanup config.pm to not use deprecated methods when displaying
-	ticket columns.
-	
-2001-10-19 15:44  jesse
-
-	* Makefile, bin/initacls.Pg, bin/initacls.mysql, tools/initdb:
-
-	Reverting last patch. it lead to too much brokenness
-	
-2001-10-19 15:16  jesse
-
-	* Makefile, bin/initacls.Pg, bin/initacls.mysql, tools/initdb:
-
-	Work on the install procedure to automate it some more. (automatically supply
-	passwords defined in the makefile)
-	
-2001-10-19 00:49  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0.9pre1
-	
-2001-10-19 00:46  jesse
-
-	* docs/design_docs/cvs_integration:
-
-	file cvs_integration was initially added on branch rt-1-1.
-	
-2001-10-19 00:46  jesse
-
-	* webrt/NoAuth/images/rt.jpg:
-
-	file rt.jpg was initially added on branch rt-1-1.
-	
-2001-10-19 00:46  jesse
-
-	* rt.spec, docs/design_docs/cvs_integration, etc/config.pm,
-	webrt/rt.jpg, webrt/Elements/Header, webrt/Elements/TitleBoxEnd,
-	webrt/Elements/TitleBoxStart, webrt/NoAuth/images/rt.jpg,
-	webrt/SelfService/Elements/Header:
-
-	Refactored images path to have a configurable URL, so it will work with fastcgi ;)
-	
-2001-10-19 00:37  jesse
-
-	* webrt/: Elements/Footer, autohandler:
-
-	Added support for timing of page display with &Debug=1
-	
-2001-10-19 00:29  jesse
-
-	* lib/RT/User.pm:
-
-	User.pm: a fix to allow you to create multiple users with no email address.
-	
-2001-10-19 00:25  jesse
-
-	* lib/RT/Tickets.pm:
-
-	Added sub Due to Tickets.pm. fixes #910
-	
-2001-10-19 00:17  jesse
-
-	* etc/rt.spec:
-
-	file rt.spec was initially added on branch rt-1-1.
-	
-2001-10-19 00:17  jesse
-
-	* Makefile, rt.spec, etc/rt.spec:
-
-	Some work on the rpm build infrastructure
-	
-2001-10-19 00:03  jesse
-
-	* tools/cpan2rpm:
-
-	cpan2rpm doesn't repeat builds of the same distribution, even if we're looking for differnet  modules
-	
-2001-10-18 23:30  jesse
-
-	* tools/cpan2rpm:
-
-	cpan2rpm has been cleaned up a whole lot. it should actually be somewhat smarter about not doing the same work twice
-	
-2001-10-18 22:42  jesse
-
-	* tools/cpan2rpm:
-
-	Added cpan2rpm to the tools directory, for autogenerating rpms of cpan modules
-	
-2001-10-18 22:42  jesse
-
-	* tools/cpan2rpm:
-
-	file cpan2rpm was initially added on branch rt-1-1.
-	
-2001-10-18 21:20  jesse
-
-	* Makefile, rt.spec:
-
-	Added support for autobuilding an rpm with "make rpm"
-	
-2001-10-18 02:15  jesse
-
-	* tools/insertdata:
-
-	Fixed templates to include the ticket subject if it was otherwise blank
-	
-2001-10-18 02:14  jesse
-
-	* lib/RT/Interface/Web.pm, webrt/Ticket/Display.html:
-
-	work on web-based ticket creation. fixed bugs setting due dates, etc
-	
-2001-10-18 02:13  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	fixed a user creation race condition in the mail gateway
-	
-2001-10-18 02:11  jesse
-
-	* webrt/Elements/SelectStatus:
-
-	use the new status abstraction in the web ui
-	
-2001-10-18 02:08  jesse
-
-	* tools/testdeps:
-
-	moved to a dbix::searchbuilder 0.46 dependency
-	
-2001-10-18 02:07  jesse
-
-	* lib/RT/Tickets.pm:
-
-	Movign away from a deprecated API
-	
-2001-10-18 02:07  jesse
-
-	* tools/initdb:
-
-	initdb won't whine if you don't set a host
-	
-2001-10-18 02:05  jesse
-
-	* docs/design_docs/evil_plans:
-
-	Added some docs about what 2.2 might hold
-	
-2001-10-18 02:00  jesse
-
-	* lib/RT/: Ticket.pm, Queue.pm:
-
-	Abstracted out status enumeration and validation
-	
-2001-10-18 01:57  jesse
-
-	* webrt/Ticket/Elements/EditLinks:
-
-	added WebPath to fix some links in showlinks
-	
-2001-10-17 16:34  jesse
-
-	* lib/Makefile.PL:
-
-	Bumped searchbuilder dependency to 0.46
-	
-2001-10-17 16:33  jesse
-
-	* webrt/Ticket/Elements/ShowHistory:
-
-	Added an optional bit of configuration to not show the "History" header
-	
-2001-10-06 03:01  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	Added a new option "Show commands" to show tranasaction
-	
-2001-10-06 03:00  jesse
-
-	* webrt/Admin/: Keywords/index.html, Queues/index.html:
-
-	Added support for reenabling deleted queues and keywords
-	
-2001-10-06 02:57  jesse
-
-	* lib/RT/Condition/Generic.pm:
-
-	Added test harness glue
-	
-2001-10-06 02:55  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Added code to detect bogus ticket update types
-	
-2001-10-06 02:54  jesse
-
-	* lib/RT/Interface/: CLI.pm, Email.pm:
-
-	Added support for unit testing
-	
-2001-10-06 02:51  jesse
-
-	* lib/RT/Handle.pm:
-
-	Added support for unit testing
-	
-	Added a test for Database Port definition to stop perl from whining
-	
-2001-10-06 02:49  jesse
-
-	* lib/RT/: ACE.pm, ACL.pm, Action/Generic.pm, Action/SendEmail.pm,
-	Attachment.pm, Attachments.pm:
-
-	Added support for unit testing
-	
-2001-10-06 02:46  jesse
-
-	* lib/RT/: Tickets.pm, Transaction.pm, Transactions.pm, User.pm,
-	Users.pm, Watcher.pm, Watchers.pm, Queues.pm, Record.pm, Scrip.pm,
-	ScripAction.pm, ScripActions.pm, ScripCondition.pm,
-	ScripConditions.pm, Scrips.pm, Template.pm, Templates.pm:
-
-	Added support for unit testing
-	
-2001-10-06 02:43  jesse
-
-	* lib/RT/: Keyword.pm, KeywordSelect.pm, KeywordSelects.pm,
-	Keywords.pm, Link.pm, Links.pm, ObjectKeyword.pm,
-	ObjectKeywords.pm, CurrentUser.pm, Date.pm, EasySearch.pm,
-	Group.pm, GroupMember.pm, GroupMembers.pm, Groups.pm:
-
-	Added support for unit testing
-	
-2001-10-06 02:38  jesse
-
-	* lib/RT.pm:
-
-	Added the beginnings of test support to RT.pm
-	
-2001-10-06 02:22  jesse
-
-	* lib/RT/TestHarness.pm:
-
-	file TestHarness.pm was initially added on branch rt-1-1.
-	
-2001-10-06 02:22  jesse
-
-	* lib/: Makefile.PL, RT/TestHarness.pm:
-
-	First bits of glue for new RT unit testing infrastructure
-	
-2001-10-06 02:19  jesse
-
-	* bin/rt:
-
-	bin/rt: Documentation cleanups. removing an unnecessary data tainting check
-	
-2001-10-06 02:18  jesse
-
-	* bin/initacls.Pg:
-
-	Fixes to initacls.Pg to allow installation with Unix Domain sockets
-	
-2001-10-04 02:01  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.0.8
-	
-2001-10-01 02:44  jesse
-
-	* rt.spec:
-
-	Revved the version of DBIx::SearchBuilder needed in the .spec file
-	
-2001-10-01 02:42  jesse
-
-	* Makefile, lib/RT/Interface/Email.pm:
-
-	Fixed the call to MIME::Entity::Build in Email.pm
-	
-	Bumped the version to 2.0.8pre3
-	
-2001-09-30 23:03  jesse
-
-	* README, bin/rt, lib/RT/Tickets.pm, lib/RT/Interface/Email.pm,
-	webrt/Search/PickRestriction, webrt/Ticket/History.html,
-	webrt/Ticket/Elements/EditBasics,
-	webrt/Ticket/Elements/ShowHistory:
-
-	Code refactoring to allow searching for nonlocal links
-	Cleanup to the Loop prevention stuff (v. 2.0.8pre2)
-	Readme cleanup
-	CLI cleanups.  changed "return" to "exit"
-	
-2001-09-26 16:31  jesse
-
-	* tools/testdeps:
-
-	Bumped the searchbuilder dependency.  to 0.43
-	
-2001-09-26 16:28  jesse
-
-	* Makefile, bin/rt, lib/RT/Tickets.pm,
-	webrt/Admin/Queues/Scrips.html:
-
-	Added a fix for ItemsArrayRef to Tickets which causes the Next/Prev links in
-	the web ui to be smarter.
-	
-	Fixed a typo in SCrips.html
-	
-	Bumped the version to 2.0.8pre2
-	
-2001-09-24 20:10  jesse
-
-	* rt.spec:
-
-	file rt.spec was initially added on branch rt-1-1.
-	
-2001-09-24 20:10  jesse
-
-	* Makefile, rt.spec:
-
-	Added destdir support to allow building of RPMS.
-	added rt.spec for building of RPMS.
-	
-2001-09-21 16:51  jesse
-
-	* Makefile:
-
-	Bumped makefule version to 2.0.8pre1
-	
-2001-09-21 16:45  jesse
-
-	* bin/rt, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	lib/RT/Interface/Web.pm, webrt/Ticket/Elements/ShowTransaction:
-
-	Fixed a typo in the bin/rt docs
-	Allowed "Force owner change" from bulk update screen.
-	
-2001-09-20 22:34  jesse
-
-	* bin/rt, lib/RT/Action/SendEmail.pm, lib/RT/Interface/Email.pm,
-	webrt/Search/Bulk.html, webrt/Ticket/Elements/ShowTransaction:
-
-	Fixes for:
-	
-	888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888862 Re: [rt-users] how does rt --limit-last-updated work?
-	
-	863 Ticket/Elements/ShowTransaction doesn't show headers sometimes
-	
-	Fix for a bug in the code that prevents RT from looping with itself.
-	
-	Start of work for "force change owner" in Bulk.html
-	
-2001-09-19 16:49  jesse
-
-	* bin/initacls.Pg, bin/rt, etc/config.pm, lib/RT/Queue.pm,
-	lib/RT/Ticket.pm, lib/RT/Tickets.pm, webrt/Elements/Header,
-	webrt/Search/Listing.html, webrt/Ticket/Create.html,
-	webrt/Ticket/Display.html, webrt/Ticket/ModifyAll.html,
-	webrt/Ticket/Update.html, webrt/Ticket/Elements/ShowLinks:
-
-	Fixed a bug that would cause installation on postgres to lose if $PORT wasn't
-	specified
-	
-	Changed " to ' in a few places in the config file, to make file and variable
-	names with embedded metacharacters not lose as badly
-	
-	Set some logical defaults for Queue->Create, so it's not as likely to fail
-	to create a queue if you leave out some fields
-	
-	Ticket->Create: now takes a Starts date.  Also, fixed some API docs.
-	
-	Tickets: Negative searching on fields like "subject" should now work
-	
-	WebUI:  Added a pragma NO-CACHE pseudo-header, to stop overzealous browsers from caching RT's pages
-	
-	WebUI: changed the "Bookmark this search" link to "Bookmarkable URL for this search"
-	
-	WebUI: ticket create now has a "more detail" section
-	
-	WebUI: ticket updates no longer have a default subject preset.
-	
-	WebUI: fixed a bug in ShowLinks that generated bogus urls within RT if RT wasn't at / on your server
-	
-2001-09-13 00:03  jesse
-
-	* Makefile:
-
-	Bumping the version to 2.0.7
-	
-2001-09-10 02:18  jesse
-
-	* Makefile:
-
-	Bumped the makefile version to 2.0.7pre1
-	
-2001-09-10 02:11  jesse
-
-	* bin/mason_handler.fcgi, lib/RT/User.pm:
-
-	Fixed #883, a permissions caching bug.
-	
-	Added the Text::Wrapper dependency to mason_handler.fcgi
-	
-2001-09-06 15:59  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Reverted reopen on correspondence to 1.0 behaviour
-	
-2001-09-06 15:41  jesse
-
-	* webrt/SelfService/Display.html:
-
-	make row coloring alternate in selfservice transaction history
-	
-2001-09-06 15:39  jesse
-
-	* webrt/SelfService/Display.html:
-
-	Fixed cell spacing in selfservice transaction display
-	
-2001-09-06 15:33  jesse
-
-	* bin/webmux.pl, webrt/SelfService/Display.html,
-	webrt/Ticket/Display.html, webrt/Ticket/Elements/ShowHistory,
-	webrt/Ticket/Elements/ShowKeywordSelects,
-	webrt/Ticket/Elements/ShowSummary,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Cleaned up the web ticket transaction display.
-	
-2001-09-06 15:32  jesse
-
-	* lib/RT/: ObjectKeyword.pm, Queue.pm:
-
-	Added some docs.
-	Started refactoring Ticket statuses.
-	
-2001-09-06 15:32  jesse
-
-	* lib/RT/Ticket.pm:
-
-	$Ticket->SetTold  now optionally takes a date to set it to.
-	
-2001-09-06 15:30  jesse
-
-	* bin/rt:
-
-	Fixing some docs in bin/rt
-	
-2001-09-05 11:00  jesse
-
-	* webrt/Elements/: Header, Refresh:
-
-	Fix for #823 from martin@schapendonk.org
-		Refresh now allows you to turn off refresh.
-	
-2001-09-01 19:01  jesse
-
-	* webrt/Elements/MessageBox:
-
-	Fix for [fsck.com #803] Jumbo recording comments accidentally
-	
-2001-09-01 18:23  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.0.6
-	
-2001-08-28 15:49  jesse
-
-	* Makefile:
-
-	Bumped the version to pre7, fixed a typo in the makefile's install instructions.
-	
-2001-08-24 00:13  jesse
-
-	* lib/RT/Attachment.pm:
-
-	importing the Crit->crit typo fix from 2.0.5_01
-	
-2001-08-24 00:08  jesse
-
-	* Makefile, lib/RT/Interface/Email.pm:
-
-	Rolled in the 2.05 perl 5.005 compatibility fix.
-	bumped the version to 2.0.6pre6
-	
-2001-08-23 19:49  jesse
-
-	* bin/rt-mailgate, tools/initdb:
-
-	fixed initdb to not append a port= to the db connect string unless it needs one.
-	
-	added support for $SenderMustExistInExternalDatabase to mailgate.
-	
-2001-08-23 19:46  jesse
-
-	* lib/RT/Groups.pm:
-
-	Added a default alphabetical sort order to lib/RT/Groups
-	
-2001-08-23 19:45  jesse
-
-	* etc/: config.pm, schema.Pg, schema.mysql, schema.pm:
-
-	Added new indices to schema. Regenerated mysql and postgres schema.
-	
-	Cleaned up etc/config.pm's docs some more, based on comments from Christian Gimore
-	Added a default value for RT::OwnerEmail, which was documented by not defined
-	by default
-	
-2001-08-22 18:48  jesse
-
-	* bin/rt, lib/RT/Ticket.pm, webrt/Ticket/Update.html:
-
-	bin/rt --create now deals with watchers.
-	
-	fixed a typo in Ticket/Update.html introduced after 2.0.5_03
-	
-2001-08-22 01:37  jesse
-
-	* Makefile, lib/RT/Tickets.pm, webrt/Admin/Global/Keywords.html:
-
-	Bumped version to 2.0.6-pre5
-	
-	Fixed 'deep' merges.
-	
-	Fixed a typo in Global/Keywords
-	
-2001-08-22 00:41  jesse
-
-	* Makefile, lib/RT/Interface/Email.pm:
-
-	Fixed a couple of bugs in the new email db lookups
-	
-2001-08-21 23:57  jesse
-
-	* Makefile, bin/initacls.Oracle, bin/initacls.Pg,
-	bin/initacls.mysql, tools/initdb:
-
-	Added support for setting the database port for postgres and mysql
-	
-2001-08-21 23:48  jesse
-
-	* README:
-
-	Updated jesse's email address and shuffled things around a bit.
-	
-2001-08-21 23:45  jesse
-
-	* etc/config.pm:
-
-	Added more docs and updated the default config for the external db lookups
-	
-2001-08-21 23:35  jesse
-
-	* webrt/: index.html, NoAuth/webrt.css, Search/Listing.html,
-	Search/PickRestriction, Ticket/ModifyDates.html,
-	Ticket/Update.html, Ticket/Elements/ShowHistory,
-	Ticket/Elements/ShowTransaction:
-
-	Added support for autorefresh to / and /Search/Listing.html
-	
-	Tightened up Transaction display. Fixed 'full headers' display.
-	
-	Cleaned up the ui in ModifyDates a bit
-	
-	Cleaned up the ui in Ticket/Update.html
-	
-	fixed a few typos in the css file
-	
-2001-08-21 23:30  jesse
-
-	* lib/RT/Attachment.pm:
-
-	Added some documentation
-	
-2001-08-21 23:25  jesse
-
-	* bin/rt-mailgate:
-
-	Bringing forward a patch to the mailgate from 2.0.5_01
-	
-2001-08-21 23:19  jesse
-
-	* webrt/Elements/Refresh:
-
-	file Refresh was initially added on branch rt-1-1.
-	
-2001-08-21 23:19  jesse
-
-	* webrt/Elements/Refresh:
-
-	Commiting a Refresh control to cvs
-	
-2001-08-21 23:17  jesse
-
-	* bin/rtadmin:
-
-	Fixed cli group creation
-	
-2001-08-21 23:12  jesse
-
-	* webrt/Elements/MessageBox:
-
-	Fixed transaction quoting to use the new transaction content quoting method.
-	
-2001-08-21 23:07  jesse
-
-	* webrt/Elements/Login:
-
-	Display a version string in the login box.
-	
-2001-08-21 23:06  jesse
-
-	* webrt/Elements/Header:
-
-	Added support for refresh to webrt/Elements/Header
-	Don't display the logout link if using external auth.
-	
-2001-08-21 23:05  jesse
-
-	* webrt/Admin/Users/Modify.html:
-
-	Little bit of ui and code cleanup to the User editing page
-	
-2001-08-21 23:04  jesse
-
-	* lib/RT/Record.pm:
-
-	Fixed broken caching of the CreatorObj
-	
-2001-08-21 23:03  jesse
-
-	* lib/RT/Handle.pm:
-
-	Added support for Database port to Handle.pm
-	
-2001-08-21 22:50  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Added vivek khera's patch to clean up newline processing for incoming messages
-	
-	Removed debugging output from file attachment subroutine
-	
-	Added support for setting refresh interval to the search page
-	
-2001-08-21 22:46  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	Fixed the bug fixed in 2.0.5_?? which called the wrong function for finding
-	sender name
-	
-	Altered the mail interface's external user lookup function to be returned
-	 a hash of parameters
-	
-2001-08-21 22:43  jesse
-
-	* lib/RT/Transaction.pm:
-
-	Added support for Quoting a transaction to the Content sub.
-	
-2001-08-16 00:23  jesse
-
-	* Makefile, tools/testdeps:
-
-	dependency on CGI::Cookie 1.20 had reverted.
-	Bumped version to 2.0.5_03
-	
-2001-08-15 16:44  jesse
-
-	* Makefile, bin/rt-mailgate, lib/RT/Interface/Email.pm:
-
-	A couple of fixes to the mail gateway to deal with proper processing
-	of sender email addresses
-	
-2001-08-15 16:12  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	Trying for 2.0.5-01 again
-	Fixed a perl 5.6ism in Interface/Email
-	Fixed a bug in Attachment.pm that would cause a DIE on a fatal error
-	
-2001-08-15 16:12  jesse
-
-	* lib/RT/Attachment.pm:
-
-	Trying for 2.0.5-01 again
-	Fixed a bug in Attachment.pm that would cause a DIE on a fatal error
-	
-2001-08-15 16:12  jesse
-
-	* Makefile:
-
-	Trying for 2.0.5-01 again
-	
-2001-08-15 15:44  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	Fixed an error message in Attachment that should never be reached
-	Bumped the Makefile version to 2.0.5_01
-	Fixed an inadvertent perl 5.6ism in the mail gateway.
-	
-2001-08-15 15:42  jesse
-
-	* lib/RT/Attachment.pm:
-
-	Fixed an error message in Attachment that should never be reached
-	
-	Bumped the Makefile version to 2.0.5_01
-	
-2001-08-15 15:42  jesse
-
-	* Makefile:
-
-	Bumped the Makefile version to 2.0.5_01
-	
-2001-08-15 01:01  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0.6-pre1
-	
-2001-08-15 01:00  jesse
-
-	* webrt/: autohandler, Admin/Users/Modify.html, Elements/Login,
-	SelfService/Prefs.html, User/Prefs.html:
-
-	Added support for external authentication to the web ui
-	
-2001-08-15 01:00  jesse
-
-	* bin/rt-mailgate, lib/RT/Interface/Email.pm:
-
-	Added support for looking up new users in an external datasource
-	
-2001-08-15 00:58  jesse
-
-	* etc/config.pm:
-
-	Added new configuration variables for external authentication for the web ui and
-	to support looking up new users in the mail gateway from a site-defined external datasource.
-	
-2001-08-15 00:17  jesse
-
-	* tools/testdeps:
-
-	Fixed testdeps to depend on the right version of CGI.pm
-	
-2001-08-14 23:55  jesse
-
-	* Makefile:
-
-	Released RT 2.0.5  No changes since 2.0.5-test3.
-	
-2001-08-12 21:13  jesse
-
-	* Makefile, bin/webmux.pl:
-
-	Fixed a typo in webmux.pl created after 2.0.4
-	Bumped the version to 2.0.5-test3
-	
-2001-08-12 20:00  jesse
-
-	* docs/manual.pod, lib/RT/Transaction.pm:
-
-	Core:  Updated Transaction->Content to be smarter about showing the first
-	message in the transaction.
-	
-	Removed the old manual skeleton in docs in favor of the web based docs.
-	
-2001-08-12 19:58  jesse
-
-	* lib/RT/Attachment.pm:
-
-	Core: Added a convenience function to RT::Attachemnt to find Children of this attachment.
-	Core: Added code to RT::Attachemnt to allow access to the 'Parent' attribute
-	
-2001-08-12 19:55  jesse
-
-	* lib/RT/Attachments.pm:
-
-	Core: A convenience function to search for Attachments by ContentType.
-	Core: Added some docs to RT::Attachments
-	
-2001-08-12 19:53  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	WebUI: Show 'comment' and 'correspond' for multipart messages in the per-transaction listing.
-	
-2001-08-10 23:59  jesse
-
-	* README:
-
-	README: added more pointers to the 'complete' docs.
-	README: Removed the little bit of configuration info in the readme in favor of the 'complete' docs on the web
-	
-2001-08-10 23:58  jesse
-
-	* bin/rt-mailgate:
-
-	mailgate: RT is now less likely to try to send mail to senders which will cause loops
-	
-2001-08-10 23:57  jesse
-
-	* webrt/index.html:
-
-	Webui: [home] now gets greyed out when you're there
-	
-2001-08-10 15:32  jesse
-
-	* Makefile, webrt/Elements/MessageBox:
-
-	Added a pair of () in webrt/Elements/MessageBox to correct a typo in an if
-	Bumped version to 2.0.5-test2
-	
-2001-08-10 00:24  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0.5test1
-	
-2001-08-10 00:24  jesse
-
-	* lib/RT/Users.pm, webrt/Elements/MessageBox,
-	webrt/Ticket/Elements/AddWatchers, webrt/Ticket/Elements/EditDates:
-
-	Cleanup to date editing ui
-	
-	Code cleanups to Elements/MessageBox for more readable and maintainable code
-	Code cleanups to TicketElements/AddWatchers for more readable and maintainable code
-	
-2001-08-10 00:23  jesse
-
-	* webrt/Ticket/Elements/: EditLinks, ShowLinks:
-
-	Cleanup to Relationship editing and display ui
-	
-2001-08-10 00:21  jesse
-
-	* webrt/Ticket/ModifyDates.html:
-
-	UI cleanups in Ticket/ModifyDates.html
-	
-2001-08-10 00:20  jesse
-
-	* webrt/Ticket/ModifyAll.html:
-
-	Jumbo no longer loses ticket update contents.
-	
-2001-08-09 20:07  jesse
-
-	* webrt/Admin/Users/index.html:
-
-	Cleaned up Admin/Users search functionality and made it look more like
-	other user searching screens and enables searching for disabled users.
-	
-2001-08-09 20:02  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Properly strip trailing spaces from things we're trying to link to.
-	
-2001-08-09 20:00  jesse
-
-	* lib/RT/Links.pm:
-
-	By default, try to sort Links by something intelligent when displaying them
-	
-2001-08-03 01:52  jesse
-
-	* lib/RT/Action/Autoreply.pm:
-
-	Autoreplies are now from "Queuename" rather than from "RT"
-	
-2001-08-02 04:57  jesse
-
-	* webrt/: Admin/Queues/People.html, Elements/Quicksearch,
-	Elements/SelectResultsPerPage, Elements/SelectStatus,
-	Search/PickRestriction:
-
-	WebUI: Fixed a typo in hte 'bookmark this search' link display.
-	WebUI: By default, limit displayed results to 50 per page.
-	
-2001-08-02 04:57  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Documented a function in the web ui library
-	
-2001-08-02 04:56  jesse
-
-	* etc/config.pm:
-
-	Fixed a typo in the docs in the config file, thanks to sheeri.
-	
-2001-08-02 04:55  jesse
-
-	* bin/rt-mailgate:
-
-	rt-mailgate: bug-fix to properly grab 'from' addresses for purposes of determinigng whether something's a mailer-daemon
-	
-2001-08-02 04:54  jesse
-
-	* bin/rt:
-
-	Added support for merging to the CLI
-	Cli now works as described when linking tickets. Formerly, you couldn't admit the "+" before an added link
-	
-2001-08-02 04:53  jesse
-
-	* webrt/User/Prefs.html:
-
-	Bugfix to allow users to fully delete their rt signatures
-	
-2001-07-30 03:54  jesse
-
-	* docs/design_docs/evil_plans:
-
-	file evil_plans was initially added on branch rt-1-1.
-	
-2001-07-30 03:54  jesse
-
-	* Makefile, docs/design_docs/evil_plans:
-
-	bumped the version, so as not to get confused users complaining to the lists
-	
-	added some notes about what may happen for 2.2
-	
-2001-07-30 03:52  jesse
-
-	* webrt/SelfService/Display.html:
-
-	file Display.html was initially added on branch rt-1-1.
-	
-2001-07-30 03:52  jesse
-
-	* bin/mason_handler.fcgi, bin/webmux.pl, lib/RT/Interface/Web.pm,
-	webrt/SelfService/Create.html, webrt/SelfService/Details.html,
-	webrt/SelfService/Display.html, webrt/SelfService/Update.html,
-	webrt/SelfService/Elements/GotoTicket,
-	webrt/SelfService/Elements/MyRequests, webrt/Ticket/Create.html,
-	webrt/Ticket/Display.html, webrt/Ticket/Modify.html,
-	webrt/Ticket/ModifyAll.html, webrt/Ticket/ModifyDates.html,
-	webrt/Ticket/ModifyLinks.html, webrt/Ticket/ModifyPeople.html,
-	webrt/Ticket/Update.html, webrt/Ticket/Elements/EditBasics,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Switched SelfService/Details to SelfService/Display  to better jibe
-	with the regular UI.
-	
-	Added better current-page navigation hints to most per-ticket pages.
-	
-	Added support for uploading attachments on ticket create or update.
-	
-2001-07-30 03:51  jesse
-
-	* webrt/Admin/Elements/ListGlobalScrips:
-
-	file ListGlobalScrips was initially added on branch rt-1-1.
-	
-2001-07-30 03:51  jesse
-
-	* webrt/Admin/: Elements/ListGlobalKeywordSelects,
-	Elements/ListGlobalScrips, Global/Scrips.html,
-	Queues/Keywords.html, Queues/Scrips.html:
-
-	Added some ui to show global scrips and keywordselects in the queue
-	uis for adminning the same.
-	
-2001-07-30 03:51  jesse
-
-	* webrt/Admin/Elements/ListGlobalKeywordSelects:
-
-	file ListGlobalKeywordSelects was initially added on branch rt-1-1.
-	
-2001-07-30 03:49  jesse
-
-	* TODO:
-
-	Clarified the errata urls
-	
-2001-07-30 03:48  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Cleaned up the return values from Ticket->CreateLink. (always return $status, $msg);
-	
-2001-07-30 03:48  jesse
-
-	* lib/RT/Action/SendEmail.pm:
-
-	changed the case of the Managed-by header to be less grating
-	
-2001-07-30 03:45  jesse
-
-	* bin/rt-mailgate, lib/RT/Interface/Email.pm:
-
-	Moving a bunch of mail gateway library routines to the library where they
-	belong
-	
-2001-07-27 01:06  jesse
-
-	* README:
-
-	fixed a typo in the cronjob
-	
-2001-07-25 01:05  jesse
-
-	* bin/rt-mailgate, lib/RT/Tickets.pm:
-
-	Fix for mailgateway being unable to send error mail with 'sendmailpipe' mailing
-	Fix for 'blank' searches when using search bookmarking.
-	
-2001-07-25 01:00  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0.4
-	Fixed bookmarkable searches
-	Fix for sendmailpipe errors in mailgateway
-	
-2001-07-24 12:10  jesse
-
-	* Makefile, webrt/Search/PickRestriction:
-
-	Fixed a bug in Search/PickRestriction, thanks to Vivek Khera
-	Bumped version to 2.0.3
-	
-2001-07-24 00:28  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0.2
-	
-2001-07-24 00:21  jesse
-
-	* lib/RT/Tickets.pm, webrt/Elements/Submit,
-	webrt/Search/Listing.html, webrt/Search/PickRestriction:
-
-	Bookmarked searches now keep track of sorting and record count limits
-	New "Refine" button to allow faster updates of search criteria.
-	
-2001-07-24 00:01  jesse
-
-	* bin/rt:
-
-	Added support for --limit-queue to  RT cli tool
-	
-2001-07-23 10:43  jesse
-
-	* Makefile, tools/testdeps:
-
-	Testdeps was accidentally looking for Freeze::Thaw, rather than FreezeThaw
-	
-2001-07-23 00:31  jesse
-
-	* Makefile:
-
-	bumped version to 2.0.2test2
-	
-2001-07-23 00:30  jesse
-
-	* lib/RT/Tickets.pm, lib/RT/Interface/Web.pm, tools/testdeps,
-	webrt/Search/Listing.html:
-
-	Added support for bookmarkable searches.
-	
-2001-07-22 22:12  jesse
-
-	* lib/RT/: KeywordSelect.pm, User.pm:
-
-	Better error checking in User ACL checking
-	
-	Fixed an ACL check bug in KeywordSelect.pm, thanks to Matthew Stock.
-	
-2001-07-22 22:09  jesse
-
-	* webrt/Admin/Users/index.html:
-
-	Fix for a users search bug and a clarification of another search option.
-	
-2001-07-22 22:06  jesse
-
-	* lib/RT/: Keywords.pm, Queues.pm, Users.pm:
-
-	By default, order Queues, Users and Keywords alphabetically
-	
-2001-07-22 22:05  jesse
-
-	* Makefile:
-
-	Permissions fix for the data dirs for the fastcgi handler
-	
-	rt/etc is now mode 755, rather than 555.
-	
-2001-07-22 22:03  jesse
-
-	* bin/mason_handler.fcgi:
-
-	fastcgi handler no longer drops setgidness, so it can deal with session files.
-	
-2001-07-22 21:55  jesse
-
-	* etc/config.pm:
-
-	Cleaned up the config file a bit to make installation easier.
-	
-2001-07-22 21:52  jesse
-
-	* webrt/Elements/MyRequests:
-
-	Clean up phrasing of the "Tickets I own dialogbox"
-	
-2001-07-19 00:57  jesse
-
-	* Makefile:
-
-	Changed Makefile to not use MAN[13]INSTALLSITEPATH per Robert Shaw's changes
-	
-2001-07-18 16:20  jesse
-
-	* Makefile, lib/RT/Queue.pm:
-
-	Added a newline to Queue.pm to fix a pod bug
-	
-	Bumped version to 2.0.2-test1  to get some feedback
-	
-2001-07-18 16:16  jesse
-
-	* lib/RT/User.pm:
-
-	RT should now honor queue-level pseudogroup memebership for ACL checks.
-	Also, simplified some of the queue related ACL checking code.
-	
-	Reduced the ACL permissions cache from 30sec to 10sec.
-	
-2001-07-18 16:13  jesse
-
-	* lib/RT/Transaction.pm:
-
-	Added BriefDescription, which is just like Description without the "By actor"
-	at the end
-	
-	Descriptions Keyword operations should include _which_ keyword select from
-	here on in (also touched the last update to Ticket.pm)
-	
-2001-07-18 16:06  jesse
-
-	* lib/RT/Ticket.pm:
-
-	TTicket->Create no longer just adds admin ccs..unless the person doing the add
-	has the right to do so.  otherwise, there was an ACL related attack that
-	could happen. luckily none of the UI exposedd this hole yet.
-	
-	Ticket->Create should now be able to set keywords on create
-	
-	Ticket->Create now reports back non-fatal errors and how they were dealt with
-	
-	Ticket->AddKeyword got split into AddKeyword and _AddKeyword. The former
-	has the acl check and calls the latter. the latter just does the adding.
-	
-	Ticket->AddKeyword got a Silent flag, which causes a transaction not
-	to be written. useful on ticket create.
-	
-2001-07-18 15:59  jesse
-
-	* tools/testdeps:
-
-	Added tests for Apache::Cookie
-	and DBI 1.18 to testdeps
-	
-2001-07-18 15:53  jesse
-
-	* webrt/SelfService/: Details.html, Update.html:
-
-	Added the ability for requestors to use the self-service ui to comment on / reply to tickets.
-	
-2001-07-18 15:53  jesse
-
-	* webrt/SelfService/Update.html:
-
-	file Update.html was initially added on branch rt-1-1.
-	
-2001-07-17 22:12  jesse
-
-	* webrt/Admin/Queues/People.html:
-
-	Fixed a link to Users/Modify.html in Queue/People.html
-	
-2001-07-17 22:01  jesse
-
-	* bin/webmux.pl:
-
-	Fix to the solaris chown problem
-	
-2001-07-17 18:37  jesse
-
-	* README:
-
-	Fixed typo in the cron job description
-	
-2001-07-13 02:17  jesse
-
-	* lib/RT/Tickets.pm:
-
-	Work on tickets.pm to support some new searching options
-	
-2001-07-12 19:43  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0.1
-	
-2001-07-11 23:17  jesse
-
-	* etc/config.pm:
-
-	No longer log things of less than 'error' to the logfile
-	
-2001-07-11 23:16  jesse
-
-	* Makefile, bin/mason_handler.fcgi, bin/rt, bin/rt-mailgate,
-	bin/rtadmin, lib/Makefile.PL, lib/RT.pm, lib/RT/Interface/CLI.pm,
-	lib/RT/Interface/Email.pm:
-
-	Make sure that the setgid programs don't drop setgidness before trying to open logfiles
-	
-2001-07-10 20:15  jesse
-
-	* Makefile, lib/Makefile.PL, lib/RT/Tickets.pm,
-	lib/RT/Interface/Web.pm, tools/testdeps:
-
-	Fixes to allow search-by-requestor to search for requestors who don't have RT accounts
-	
-2001-07-10 13:53  jesse
-
-	* bin/webmux.pl:
-
-	Fix for the weird sessiondata permissions bug folks have seen on solaris
-	
-2001-07-10 11:47  jesse
-
-	* lib/RT/Tickets.pm:
-
-	Change to Tickets.pm to fix description of watcher limits
-	
-2001-07-10 11:36  jesse
-
-	* bin/webmux.pl, webrt/Elements/SelectMatch:
-
-	Fixed a bug in webmux.pl that prevented Apache::Cookie support from working
-	
-	Fixed a bug in the enw SelectMatch code
-	
-2001-07-10 11:20  jesse
-
-	* lib/RT/Ticket.pm, webrt/Elements/SelectMatch,
-	webrt/Search/PickRestriction:
-
-	Cleanup to SelectMatch and PickRestriction to clear up the UI issues
-	with searching for Tickets from a give nrequestor
-	
-2001-07-09 10:36  jesse
-
-	* lib/RT/Template.pm:
-
-	Fixed a typo in Template.pm that squashed templates on outgoing mail. (Bug in my untainting fix)
-	
-	Bumped version to 2.0.1-test2
-	
-2001-07-09 10:36  jesse
-
-	* Makefile:
-
-	Fixed a typo in Template.pm that squashed templates on outgoing mail. (Bug in my untainting fix)
-	
-2001-07-08 22:31  jesse
-
-	* README:
-
-	Added some polite comments about supporting the development of RT
-	with contracts, cash or gifts
-	
-2001-07-08 20:14  jesse
-
-	* Makefile, bin/mason_handler.fcgi,
-	webrt/SelfService/Elements/ShowTransaction:
-
-	Bumped version to 2.01pre1
-	
-	Fixed mason_handler header newlines
-	
-2001-07-08 20:12  jesse
-
-	* lib/RT/: ScripAction.pm, ScripCondition.pm, Template.pm,
-	Ticket.pm:
-
-	Taint fixes for ScripAction, ScripCondtion,Template.
-	Header wrapping fix in Template.pm.
-	Fix in Ticket.pm to make EffectiveId a public field.
-	
-2001-07-06 18:32  jesse
-
-	* lib/RT/Attachment.pm:
-
-	Applied a patch from ivan to deal with poorly formed mime messages
-	and clean up the attachment proccessing code.
-	
-2001-07-06 18:26  jesse
-
-	* webrt/SelfService/Attachment/dhandler:
-
-	file dhandler was initially added on branch rt-1-1.
-	
-2001-07-06 18:26  jesse
-
-	* webrt/: SelfService/Details.html,
-	Ticket/Elements/ShowTransaction, SelfService/Attachment/dhandler:
-
-	ShowTransaction now no longer displays 'Comment' and 'Reply' if the user
-	doesn't have the right rights.
-	
-	SelfService uses the 'standard' ShowTransaction.
-	
-	SelfService now displays Attachments
-	
-2001-07-06 18:21  jesse
-
-	* etc/schema.mysql:
-
-	Switched mysql to use LONGTEXT rather than LONGBLOB to get
-	case insensitive searching.
-	
-2001-07-06 18:19  jesse
-
-	* bin/mason_handler.fcgi, lib/RT/Interface/Web.pm,
-	webrt/NoAuth/Logout.html:
-
-	Cleanups to deal better with the fastcgi handler.
-	
-	Switched to CGI::Fast from FCGI
-	
-	ContentType fixes.
-	
-	Logging out now clears the session hash, rather than detaching a perfectly good session. (This gets around an obnoxious tainting issue too)
-	
-2001-07-06 16:14  jesse
-
-	* webrt/Ticket/Attachment/dhandler:
-
-	Changed default attachment type to text/plain from text/html
-	
-2001-07-05 16:48  jesse
-
-	* bin/rt-mailgate, lib/RT/Ticket.pm:
-
-	Updates to make Correspondence on a closed or stalled ticket reopen the ticket
-	
-2001-07-04 00:51  jesse
-
-	* bin/rt:
-
-	bin/rt will now show transactions of type 'text'
-	
-2001-07-04 00:36  jesse
-
-	* bin/webmux.pl:
-
-	Minor fixes to webmux.pl for content type stuff.
-	
-2001-07-03 23:15  jesse
-
-	* lib/RT/Interface/Web.pm, webrt/Admin/Queues/index.html,
-	webrt/Search/PickRestriction:
-
-	Web ui now supports 'SearchByPriority'
-	
-2001-07-03 23:14  jesse
-
-	* etc/config.pm:
-
-	Added a few comments about configuration variables
-	
-2001-07-03 23:12  jesse
-
-	* webrt/SelfService/Elements/ShowTransaction:
-
-	Now SelfService displays attachments of type 'text'
-	
-2001-07-03 23:08  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	With the web ticket display, now display attachments of type 'text' properly.
-	Also, always have a download link.
-	
-2001-07-03 23:00  jesse
-
-	* webrt/Ticket/Elements/ShowLinks:
-
-	Changed SubTickets/SuperTickets to Parents/Children
-	
-2001-07-03 22:57  jesse
-
-	* Makefile:
-
-	Added notes to the effect that the speedycgi and fastcgi handlers aren't
-	supported.
-	
-2001-07-03 22:52  jesse
-
-	* bin/webmux.pl, bin/mason_handler.fcgi,
-	webrt/Ticket/Attachment/dhandler:
-
-	Switched mod_perl hander to use Apache::Cookie
-	
-	Refactored mime type handling to properly set the mime type with the modperl
-	handler and the fastcgi handler
-	
-	Added untainting for the requirred parts of the fastcgi wrapper.
-	I'm not yet confident that it works properly, but it does the right
-	thing in the trivial case.
-	
-2001-06-27 00:11  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0 for release to the unsuspecting masses
-	
-2001-06-25 16:28  jesse
-
-	* Makefile, lib/RT/Ticket.pm:
-
-	Fix for a bug introduced by RC2  (while fixing another bug with _Links)
-	 which caused Links listings to recurse rather infinitely.
-	
-	Bumped RC2 to RC3
-	
-2001-06-25 16:25  jesse
-
-	* webrt/Admin/Elements/SelectRights:
-
-	Fix for a crashing bug when editing ACLs without permission
-	
-2001-06-25 12:19  jesse
-
-	* Makefile, lib/RT/Ticket.pm:
-
-	Fixed bug in Ticket.pm -> _Links that caused it to return an error
-	rather than an empty links object if permission denied.
-	
-	Bumped version to RC2
-	
-2001-06-23 02:48  jesse
-
-	* Makefile, README, tools/import-1.0-to-2.0:
-
-	removed 1.0-2.0 importer. (it's now in the contrib archive)
-	updated readme and makefile to know about the change.
-	
-	Bumped the version to 2.0.0-RC1. Yeah. That's right. the major version
-	number just got incremented.
-	
-2001-06-22 14:50  jesse
-
-	* Makefile, lib/RT/Ticket.pm:
-
-	hopefully a fix for everyone's favorite import bug.
-	
-2001-06-20 23:56  jesse
-
-	* webrt/Search/Bulk.html:
-
-	Display cleanups to Bulk.html.
-	Removed bogus nav items
-	
-2001-06-20 17:33  jesse
-
-	* NEWS, lib/Makefile.PL:
-
-	Removed the out of date NEWS file. It's been superceeded by the changelog
-	
-2001-06-20 17:27  jesse
-
-	* Makefile, README, lib/RT/Ticket.pm, lib/RT/User.pm,
-	lib/RT/Interface/Web.pm, tools/import-1.0-to-2.0, tools/testdeps,
-	webrt/Ticket/Display.html, webrt/Ticket/History.html:
-
-	Fixes for the import problems some folks have been seeing
-	Fixes for the Can't click on URL issues reported by mixo and Carl Potter.
-	Turned off some overly verbose debugging.
-	
-	Bumped the version to 1.3.105
-	
-2001-06-19 00:34  jesse
-
-	* Makefile:
-
-	Bumped version to 1.3.104
-	
-2001-06-19 00:25  jesse
-
-	* lib/RT/Tickets.pm:
-
-	A fix for search based on keywords that don't exist. (Some rows would be lost, due to poorly constructed SELECT statements.  This change requires DBIx::SearchBuilder 0.39
-	
-2001-06-18 15:39  jesse
-
-	* Makefile, README, webrt/Ticket/Elements/ShowTransaction:
-
-	Updated README to note new RT2 Errata list
-	Bumped version to 1.3.103
-	Added comments in ShowTransaction to let you see exact transaction / ticket Ids
-	if you view source.
-	
-2001-06-18 15:32  jesse
-
-	* bin/rt:
-
-	Better fomating for cli queue listing.
-	
-2001-06-17 16:45  jesse
-
-	* lib/RT/: Transaction.pm, User.pm:
-
-	Added PurgeTransaction datatype for Transactions.
-	
-	Removed debugging code from User.pm
-	
-2001-06-17 14:36  jesse
-
-	* webrt/Ticket/Elements/Tabs:
-
-	Fix for webui error when displaying next/prev tabs on new tix.
-	
-2001-06-15 22:23  jesse
-
-	* Makefile, README:
-
-	Bumped the version to a private pre-test 1.3.103
-	
-2001-06-15 22:19  jesse
-
-	* README, lib/RT/Ticket.pm, lib/RT/User.pm:
-
-	Debugging fixes for import oddness folks are having
-	
-2001-06-15 01:13  jesse
-
-	* webrt/Search/Bulk.html:
-
-	removed debugging output from bulk.html
-	
-2001-06-14 15:53  jesse
-
-	* Makefile, lib/RT/Transactions.pm,
-	webrt/Ticket/Elements/AddWatchers:
-
-	Installation path of man pages is now configurable
-	By default Transactions should now be ordered by date, no matter what their id sequence is.
-	Fixed an html typo in Tickets/Elements/AddWatchers
-	
-	Bumped version to 1.3.102
-	
-2001-06-14 03:21  jesse
-
-	* Makefile:
-
-	Bumped the version to 1.3.101
-	
-2001-06-14 02:47  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Interface/Web.pm, webrt/Elements/Tabs,
-	webrt/Ticket/Elements/Tabs:
-
-	Comments in Ticket.pm about less than optimal design
-	Enhancments to Interface/Web for the bulk ticket manipulation tool.
-	Search navigation was cleaned up a bunch.
-	
-2001-06-14 01:52  jesse
-
-	* webrt/Search/Bulk.html:
-
-	file Bulk.html was initially added on branch rt-1-1.
-	
-2001-06-14 01:52  jesse
-
-	* webrt/Search/: BuildSearch, Bulk.html, Listing.html, QueueFooter,
-	QueueHeader, QueueItem:
-
-	Be vewwy vewwy quiet. I'm hunting cweeping features.
-	Like the brand new Bulk Ticket manipulator
-	
-	Removed some cruft from the repository. (unused files from tobix' first
-	search implementation)
-	
-2001-06-13 03:53  jesse
-
-	* Makefile:
-
-	Bumped version to 1.3.100
-	
-2001-06-13 03:52  jesse
-
-	* bin/mason_handler.fcgi:
-
-	The fastcgi handler works for everything except attachment viewing.  I'm going to have to think a bit about how to set
-	content type properly in a nice handler-agnostic manner.
-	
-2001-06-13 03:51  jesse
-
-	* bin/rt-mailgate:
-
-	Fixed a warn -> warning in mailgate's logging
-	
-2001-06-13 03:50  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Adjusting spacing
-	
-2001-06-13 03:50  jesse
-
-	* webrt/Ticket/Elements/Tabs:
-
-	
-	Added an error check to the new navigation bars to deal with a possible lack of active search
-	
-2001-06-12 21:28  jesse
-
-	* etc/config.pm:
-
-	Clarified required permissions for the RT Logdir
-	
-2001-06-12 19:12  jesse
-
-	* etc/config.pm, lib/RT/Queue.pm, lib/RT/Transaction.pm:
-
-	Cleaned up some docs in config.pm and Queue.pm
-	Updated the Transaction Descriptions in transaction.pm to make sure
-	that the Actor is listed.
-	
-2001-06-12 18:08  jesse
-
-	* webrt/Ticket/Elements/Tabs:
-
-	Added links to navigate within an existing search.
-	
-2001-06-08 23:57  jesse
-
-	* webrt/Ticket/Elements/EditKeywordSelects:
-
-	Made "(empty)" the same between "EditKeywordSelects" and "SearchByKeywordSelect"
-	
-2001-06-08 23:51  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Ability to set owner by name when creating tickets.
-	Ability to set timeleft when creating tickets
-	
-2001-06-08 23:00  jesse
-
-	* Makefile, README, etc/schema.Pg, lib/RT/Ticket.pm:
-
-	Added an index to etc/schema.Pg
-	Ticket.pm->Create now passes through a few more values that were missing.
-	
-	Added doc on imports w/ postgres to the readme.
-	
-	bumped the version to 1.3.99
-	
-2001-06-08 18:32  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	Fix for merging more than one ticket.
-	Fix for req2rt which imported transactions in reverse order.
-	
-2001-06-07 16:02  jesse
-
-	* Makefile, lib/RT/Queue.pm, tools/import-1.0-to-2.0:
-
-	Catch a possibly undefined value in Queue::AddWatcher
-	Bumped verion to 1.3.97
-	another attempt at fixing the owner change generation code in import.
-	
-2001-06-07 14:59  jesse
-
-	* tools/import-1.0-to-2.0:
-
-	The importer now imports the root user and the general queue.
-	
-2001-06-07 12:44  jesse
-
-	* Makefile, etc/config.pm, lib/RT/Interface/Web.pm:
-
-	Support for a seperate local component root for local WebRT mods and additions.
-	
-2001-06-06 17:25  jesse
-
-	* README:
-
-	Added instructions for migrating  1.0 instances to 2.0
-	
-2001-06-06 16:15  jesse
-
-	* Makefile:
-
-	Bumped version to 1.3.95
-	
-2001-06-06 16:15  jesse
-
-	* tools/import-1.0-to-2.0:
-
-	Importer should now import tickets created by the req importer
-	
-2001-06-06 16:12  jesse
-
-	* bin/initacls.Pg:
-
-	initacls.Pg should now handle pg database on remote machine
-	
-2001-06-06 16:05  jesse
-
-	* webrt/Ticket/Elements/ShowRequestor:
-
-	Don't show the 'About this Requestor' box if the user is privileged.
-	
-2001-06-06 15:37  jesse
-
-	* lib/RT/Date.pm:
-
-	Now date comparisons against never dtrt.
-	
-2001-06-06 15:30  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Search by content now works on the web
-	
-2001-06-06 14:22  jesse
-
-	* webrt/Admin/Groups/Members.html:
-
-	Fix for #552: spurious warning when going into group membership editor
-	
-2001-06-06 14:14  jesse
-
-	* webrt/Ticket/Elements/EditKeywordSelects:
-
-	keywordSelect selction fix (fsck #555)
-	
-2001-06-06 10:57  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	Removed spurious 'u' from line 1 of importer.
-	bumped version to 1.3.95-test2
-	
-2001-06-06 09:39  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	Possible fix for jens' user import troubles.
-	bounced version to 1.3.95-test1
-	
-2001-06-06 02:12  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	Importer wasn't properly grabbing ACLs. Bumped version to 1.3.94
-	
-2001-06-06 01:33  jesse
-
-	* tools/import-1.0-to-2.0:
-
-	Fixed a bug in the 'Make users superusers' code in the importer
-	
-2001-06-06 00:41  jesse
-
-	* lib/RT/Ticket.pm:
-
-	fixed a missing =cut (end of perldoc in ticket.pm
-	
-2001-06-06 00:40  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	fixing a typo in importer's mime parser
-	
-2001-06-06 00:19  jesse
-
-	* Makefile, lib/Makefile.PL, lib/RT/Action/Notify.pm,
-	lib/RT/Action/SendEmail.pm, tools/testdeps:
-
-	Cleaned up some dependencies
-	RT should no longer send mail when there are no recipients. thanks to the nice folks at Sensarray.com for some good debugging.
-	
-2001-06-05 23:16  jesse
-
-	* Makefile, bin/webmux.pl, tools/import-1.0-to-2.0:
-
-	Fixed some bogus header parsing in import.
-	web mux now tries to chown files again. (christian's going to test it again ;)
-	Bumped to 1.3.91 for a release
-	
-2001-06-05 11:34  jesse
-
-	* webrt/Admin/Users/Modify.html:
-
-	Rephrased the "Privileged" checkbox in AdminUsers.
-	
-2001-06-05 11:18  jesse
-
-	* Makefile, bin/webmux.pl, tools/import-1.0-to-2.0,
-	webrt/NoAuth/Logout.html:
-
-	webmux no longer tries to chown its data directories on startup
-	import now handles final_priority
-	Logout.html now refreshes to a login page
-	
-2001-06-05 10:42  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	When we added support for 'priority' transactions, we accidentally broke
-	support for 'subject' transactions.  fixed now.
-	
-2001-06-05 03:25  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	Import tool now handles priority changes.
-	
-2001-06-05 02:56  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	Minor tweak to importer to try even harder to find users in the database before creating new ones.
-	
-2001-06-05 02:32  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	importer is now less likely to try to greate nonexitent empty users.
-	
-	Makefile now chgrps web ui datafiles
-	
-2001-06-05 00:06  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	Removed out of date comments in the importer
-	Made the importer grab its libraries from the makefile. (Turned off testing code)
-	
-2001-06-05 00:01  jesse
-
-	* Makefile:
-
-	Bumped the version # to 1.3.84 for immediate release
-	
-2001-06-04 23:50  jesse
-
-	* Makefile, lib/RT/Ticket.pm, tools/import-1.0-to-2.0:
-
-	Cleanups to Ticket->Import
-	import-1.0-to-2.0 now deals with dates right.
-	
-2001-06-04 20:52  jesse
-
-	* lib/RT/Link.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
-	tools/import-1.0-to-2.0:
-
-	Cleanup to Ticket, Link and User.
-	
-	merge now works on import.
-	
-	most everything in import other than ticket dates should work now.
-	
-2001-06-04 01:34  jesse
-
-	* tools/import-1.0-to-2.0:
-
-	more cleanup
-	
-2001-06-04 00:03  jesse
-
-	* tools/import-1.0-to-2.0:
-
-	First cut at importing queue adminccs and acls
-	
-2001-06-03 22:16  jesse
-
-	* tools/import-1.0-to-2.0:
-
-	Cleanup and better progress indication
-	
-2001-06-03 13:33  jesse
-
-	* lib/RT/Record.pm, lib/RT/Ticket.pm, tools/import-1.0-to-2.0:
-
-	More work on the importer. now it gets transaction creators right and catches requestor email addreses.
-	
-2001-06-03 03:43  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Transaction.pm, tools/import-1.0-to-2.0:
-
-	Transaction.pm now allows the caller to turn off scrips (for import)
-	Ticket.pm now has a mostly working import method.
-	import-1.0-to-2.0 seems to have some basic functionality.  it's not _working_ yet, but it
-	will do most of what we want it to.
-	
-2001-06-02 20:36  jesse
-
-	* webrt/Ticket/Display.html:
-
-	Fix for Ticket #537 Crash when creating ticket without permission to view ticket
-	
-2001-06-02 14:22  jesse
-
-	* tools/import-1.0-to-2.0:
-
-	added a couple of todos to the import tool
-	
-2001-06-02 14:14  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	Work on the importer. it now runs.  (note that it probably won't yet _import_ anything)
-	
-2001-06-02 12:58  jesse
-
-	* Makefile, bin/webmux.pl, lib/RT/Ticket.pm, lib/RT/Transaction.pm:
-
-	Bumped the version to 1.3.84
-	
-	Once again chown mason data directory in webmux.pl, this time
-	using more reliable, dynamic userids, rather than compiled in defaults.
-	
-	Added an 'import' method to Ticket, for the RT1 importer.
-	
-	Added a Subject method to transaction, to simplify the lives of template authors
-	
-2001-06-01 23:38  jesse
-
-	* tools/: import-1.0-to-2.0, insertdata:
-
-	Cleaned up some names and descriptions in insertdata
-	
-	First checkin of outline of code of import tool. It's never been run.
-	It's incomplete.
-	
-2001-06-01 23:38  jesse
-
-	* tools/import-1.0-to-2.0:
-
-	file import-1.0-to-2.0 was initially added on branch rt-1-1.
-	
-2001-05-31 23:27  jesse
-
-	* lib/RT/Tickets.pm:
-
-	Cleaned up Tickets->LimitQueue a bit
-	
-2001-05-31 21:22  jesse
-
-	* Makefile, tools/testdeps:
-
-	Fixed testdeps to use new searchbuilder. bumped version to 1.3.83
-	
-2001-05-31 21:14  jesse
-
-	* lib/RT/Tickets.pm, lib/RT/Interface/Web.pm,
-	webrt/Elements/SelectKeyword:
-
-	Logic fixes for keyword select negation
-	
-2001-05-31 20:30  jesse
-
-	* lib/RT/Tickets.pm, lib/RT/Interface/Web.pm,
-	webrt/Elements/SelectKeyword:
-
-	Added support for "Tickets without keyword 'foo'.
-	
-2001-05-31 17:32  jesse
-
-	* bin/webmux.pl, lib/RT/Interface/Web.pm,
-	webrt/Ticket/Attachment/dhandler:
-
-	Fix for #522: attachments without names got short shrift.
-	webRT now dies rather than run when users can't log in due to a permissions
-	bug.
-	
-2001-05-31 02:57  jesse
-
-	* etc/: schema.Pg, schema.mysql:
-
-	Cleaned up the table indices a bit. for mysql, yanked duplicate indices.
-	for Pg, added an index (we need to regen the schema for pg soon)
-	
-2001-05-31 02:46  jesse
-
-	* Makefile, lib/RT/Interface/Web.pm, webrt/Ticket/ModifyAll.html,
-	webrt/Ticket/ModifyPeople.html, webrt/Ticket/Elements/AddWatchers,
-	webrt/Ticket/Elements/EditPeople:
-
-	You can now add watchers by email address
-	Bumped version to 1.3.82
-	
-2001-05-29 15:58  jesse
-
-	* webrt/Ticket/Attachment/dhandler:
-
-	Fixed the attachments display bug.
-	
-2001-05-29 15:48  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Fix for #513 - status update without permissions returns no error message
-	
-2001-05-29 00:38  jesse
-
-	* Makefile:
-
-	Bumped version to 1.3.81
-	
-2001-05-28 20:39  jesse
-
-	* bin/webmux.pl:
-
-	Removed a bogus line from webmux
-	
-2001-05-28 20:29  jesse
-
-	* lib/RT/: Ticket.pm, Interface/Web.pm:
-
-	Work to solve 325: updating detritus in update listing
-	
-2001-05-28 17:35  jesse
-
-	* bin/rt, etc/schema.mysql, etc/schema.pm, lib/RT/Ticket.pm,
-	lib/RT/Interface/CLI.pm, webrt/Ticket/Attachment/dhandler:
-
-	Work on the CLI to resolve #482.  Can't add content when creating tix with the CLI
-	Do a bunch of better error checking on ticket creation.
-	
-	Generalized the ticket status checking code.
-	
-	Added another index on Attachments for increased speed.
-	
-2001-05-28 15:49  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Removed code which auto-opened tickets that were new.  It should
-	be a scrip and it's too late in teh release cycle to do this right now.
-	
-2001-05-28 15:24  jesse
-
-	* webrt/SelfService/: Details.html, Elements/MyRequests:
-
-	Fixed #506. Non-priv user can't see tickets
-	
-2001-05-23 23:53  jesse
-
-	* webrt/SelfService/Elements/MyRequests:
-
-	Fixed MyRequest so it shows your tickets.
-	
-2001-05-23 23:18  jesse
-
-	* Makefile:
-
-	Bumped the version to 1.3.80
-	
-2001-05-23 23:01  jesse
-
-	* bin/webmux.pl, docs/manual.pod, webrt/Elements/MyRequests,
-	webrt/Elements/MyTickets, webrt/NoAuth/Logout.html,
-	webrt/Ticket/ModifyAll.html:
-
-	Fixed logout bug from 1.3.79 http://fsck.com/rt2/Ticket/Display.html?id=500
-	Fixed bug in jumbo from 1.3.79 http://fsck.com/rt2/Ticket/Display.html?id=496
-	Added a bit of docs about templates to the manual
-	
-	Cleaned up the ui for MyRequests and MyTickets a bit.
-	
-2001-05-23 12:34  jesse
-
-	* webrt/SelfService/: Prefs.html, index.html:
-
-	Little bit of cleanup to SelfService. added prefs.
-	
-2001-05-23 12:34  jesse
-
-	* webrt/SelfService/Prefs.html:
-
-	file Prefs.html was initially added on branch rt-1-1.
-	
-2001-05-23 12:07  jesse
-
-	* Makefile:
-
-	Bumped version to 1.3.79.
-	
-2001-05-23 12:06  jesse
-
-	* README, tools/testdeps:
-
-	Added dependecy on DBIx::SearchBuilder 0.34
-	
-2001-05-23 11:43  jesse
-
-	* bin/: rt-mailgate, webmux.pl:
-
-	Made sure that the webui always writes sessions to disk
-	Fixed a typo in the mail gateway.
-	
-2001-05-23 00:09  jesse
-
-	* Makefile, bin/rt-mailgate:
-
-	Added a bit of code to rt-mailgate to deal with not properly loading users on
-	ticket creation.
-	
-2001-05-22 23:01  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Within Ticket->Create, always get a Queue object as SystemUser for like, defaults and stuff.
-	
-2001-05-21 18:12  jesse
-
-	* etc/config.pm:
-
-	Added comments from Feargal about how to configure RT for http urls.
-	
-2001-05-21 16:37  jesse
-
-	* Makefile:
-
-	bumped version to 1.3.78
-	
-2001-05-21 16:36  jesse
-
-	* lib/RT/Ticket.pm, webrt/Ticket/Display.html:
-
-	Tickets now open when they're new and get acted on.
-	
-2001-05-21 16:09  jesse
-
-	* lib/RT/Action/: Autoreply.pm, SendEmail.pm:
-
-	Fix for Ticket #481 $CorrespondAddress= variable in config.pm doesn't work
-	
-2001-05-21 15:54  jesse
-
-	* webrt/Elements/MessageBox:
-
-	Added a space at teh end of the line, per the standard convention for signature
-	dashes.
-	
-2001-05-21 15:54  jesse
-
-	* webrt/Elements/MessageBox:
-
-	If the user doesn't have a signature, don't include signature dashes
-	
-2001-05-21 15:17  jesse
-
-	* lib/RT/Tickets.pm, webrt/Ticket/ModifyAll.html:
-
-	Dead tickets aren't searchable via the ui anymore.
-	ModifyAll is a bit smarter about what to let people do.
-	
-2001-05-21 14:02  jesse
-
-	* lib/RT/Keyword.pm, webrt/Admin/Keywords/index.html:
-
-	Editing keywords without permission now actually tells you so.
-	
-2001-05-21 13:32  jesse
-
-	* webrt/Admin/: Global/Scrips.html, Queues/Scrips.html:
-
-	Users without permission to delete scrips now get a proper permission denied.
-	
-2001-05-21 13:20  jesse
-
-	* webrt/Ticket/: Update.html, Elements/Tabs:
-
-	The ticket update form is now a little smarter about only letting people perform
-	updates that they have the right to perform.
-	
-2001-05-17 23:09  jesse
-
-	* Makefile:
-
-	Chmod the makefile in the make dist procedure.
-	
-2001-05-17 23:05  jesse
-
-	* README:
-
-	Cleaned up some instructions. Thanks Feargal.
-	
-2001-05-17 22:50  jesse
-
-	* Makefile, lib/RT/Transaction.pm, lib/RT/Action/SendEmail.pm,
-	tools/insertdata:
-
-	Fixed scrip actions to activate when there's a missing scripcontent.
-	
-	Added a Content method to Transaction.pm
-	Fixed Tempates to use new Content method.
-	
-2001-05-17 16:19  jesse
-
-	* lib/RT/Transaction.pm, lib/RT/Action/SendEmail.pm,
-	webrt/Ticket/Display.html, webrt/Ticket/Update.html:
-
-	Better debugging info for some scrips.
-	
-	Fixed bugs which prevented status and owner to change on correspondence
-	and comment.
-	
-2001-05-17 12:36  jesse
-
-	* Makefile, README:
-
-	Bumped the version. Added Mark Vevers to the thansk in the readme.
-	
-2001-05-17 12:34  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Removed some obsolete code. fixed a bug in Comment recording from Mark Vevers
-	
-2001-05-16 18:51  jesse
-
-	* Makefile, tools/testdeps:
-
-	Fixed testdeps to not install bogus new DBD::mysql rev.
-	Bumped rev to 1.3.75
-	
-2001-05-16 17:30  jesse
-
-	* Makefile:
-
-	bumped to 1.3.74
-	
-2001-05-16 17:30  jesse
-
-	* webrt/Admin/Groups/Modify.html:
-
-	Fixed a small bug in Groups editing
-	
-2001-05-16 17:21  jesse
-
-	* tools/testdeps:
-
-	Bumped version to 1.3.73.
-	Bumped dependency on searchbuilder to 0.33
-	
-2001-05-16 17:15  jesse
-
-	* webrt/: Elements/TitleBoxStart, Ticket/Update.html,
-	Ticket/Elements/Tabs:
-
-	The quick link for 'Resolve' now requests that the user enter a ticket update
-	
-2001-05-16 15:45  jesse
-
-	* README, lib/RT/Interface/Web.pm, tools/testdeps,
-	webrt/Ticket/Display.html:
-
-	Added some documentation about what to do if the install fails.
-	
-	Specified a minimum working version of DBD::mysql.
-	
-	Fixed support for entering updates via the webui.
-	
-2001-05-15 00:55  jesse
-
-	* lib/RT/Action/Autoreply.pm:
-
-	Fixed a typo that broke autoreplies
-	
-2001-05-15 00:37  jesse
-
-	* tools/testdeps:
-
-	added Errno dependency
-	
-2001-05-14 23:44  jesse
-
-	* etc/config.pm, tools/insertdata, webrt/Admin/Queues/People.html:
-
-	Cleaned up a bit of phrasing. cleaned up some extra /s in urls.
-	
-2001-05-14 22:49  jesse
-
-	* Makefile, bin/mason_handler.fcgi, bin/mason_handler.scgi, bin/rt,
-	bin/webmux.pl, lib/Makefile.PL, lib/RT/Date.pm,
-	lib/RT/Interface/Web.pm, tools/testdeps:
-
-	Switched from Date::Manip To Graham Barr's Date::Parse
-	
-2001-05-14 18:58  jesse
-
-	* lib/RT/Scrips.pm, lib/RT/Ticket.pm, lib/RT/Interface/Web.pm,
-	webrt/Ticket/Display.html, webrt/Ticket/Elements/Tabs:
-
-	Work on the web frontend. the "quick" links have been cleaned up and decomplexified.
-	
-2001-05-14 17:11  jesse
-
-	* lib/RT/User.pm, lib/RT/Interface/Web.pm,
-	webrt/Admin/Groups/Modify.html, webrt/Admin/Users/Modify.html:
-
-	Cleaned up bugs related to spurious extra display of information in user and group modification and ACL deletion
-	when the user didn't have the right to do so.
-	
-2001-05-13 23:05  jesse
-
-	* webrt/Admin/Users/index.html:
-
-	no longer provide a link to create a new user to someone who doesn't have rights to do so.
-	
-2001-05-13 22:49  jesse
-
-	* lib/RT/Ticket.pm, tools/insertdata, webrt/Ticket/Modify.html:
-
-	yanked bogus Ticket Queue caching
-	rephrased ticket creation autoreply
-	
-2001-05-13 22:15  jesse
-
-	* webrt/User/Prefs.html:
-
-	Added a hack to make sure that session gets written to disk
-	
-2001-05-13 22:11  jesse
-
-	* webrt/User/Prefs.html:
-
-	more work on letting users edit their own passwords
-	
-2001-05-13 21:40  jesse
-
-	* webrt/Ticket/: Attachment/dhandler, Elements/ShowTransaction:
-
-	Fix for #433. now attachements are displayable after merges.
-	
-2001-05-12 17:46  jesse
-
-	* Makefile, lib/Makefile.PL, tools/testdeps, webrt/User/Prefs.html:
-
-	Started work on user prefs. password changing is untested
-	
-	Fixed dependency on SB to .31 and bumped version
-	
-2001-05-11 12:32  jesse
-
-	* lib/RT/Record.pm:
-
-	turned on use of DBIx::SearchBuilder::Record::Cachable
-	
-2001-05-11 12:30  jesse
-
-	* lib/RT/User.pm, webrt/Elements/Quicksearch:
-
-	Redid how the ACL checking works for great perf gains.
-	Added stalled lists to quicksearch.
-	
-2001-05-09 20:11  jesse
-
-	* Makefile:
-
-	Bumping the version # so people working off cvs get less confused.
-	
-2001-05-09 20:11  jesse
-
-	* bin/rt-mailgate, lib/RT/Queue.pm, lib/RT/Action/Autoreply.pm,
-	lib/RT/Action/Notify.pm, lib/RT/Action/NotifyAsComment.pm,
-	lib/RT/Action/SendEmail.pm:
-
-	Cleanup in the mail sending stuff.
-		fix for ticket 403:  RT should no longer send mail when it has
-		no recipients
-	
-		fix for #404: Squelch-Replies-To should be a bit more intelligent,
-		since it was rewritten from scratch
-	
-		RT should now properly send mail to queue ccs and queue admin ccs
-		when you ask it to
-	
-		internally, RT's mail sending stuff now lets you pass around
-		arrays of addresses to send mail to, rather than comma delimited
-		strings. More flexible down the line.
-	
-2001-05-09 16:39  jesse
-
-	* README:
-
-	Updated the readme to note the dependency on setuid perl
-	
-2001-05-09 16:08  jesse
-
-	* webrt/Ticket/Elements/ShowLinks:
-
-	fix for RT/fsck.com: Ticket #440 [rt-devel] 'Depended on by' doesn't work
-	
-2001-05-08 20:48  jesse
-
-	* etc/schema.mysql, etc/schema.pm, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm, webrt/Admin/Elements/UserTabs,
-	webrt/Admin/Queues/People.html, webrt/Elements/MyRequests,
-	webrt/Elements/MyTickets, webrt/Elements/Tabs,
-	webrt/Ticket/Elements/ShowBasics,
-	webrt/Ticket/Elements/ShowRequestor:
-
-	Schema.pm now has a few more indices. the mysql schema has been regenerated, but not
-	the Pg or oracle schemas.
-	
-	in Ticket.pm, a message got the queue id replaced with the queue name
-	
-	removed a spurious variable localization in Transaction.pm
-	
-	Removed a pointer to a nonexistent page  on admin/user/modify
-	
-	Modifying queue watchers now has a more coherent title
-	
-	"This user's tickets, My requests and My tickets are now limited to the 25 highest priority items
-	attached to you.
-	
-	The "Administration" tab has been changed to the "Configuration" tab
-	
-2001-04-04 16:55  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Fixing a comment in the web interface. no functional changes.
-	
-2001-04-04 16:52  jesse
-
-	* Makefile:
-
-	
-	Bumping the version to 1.3.70 for release
-	
-2001-04-04 16:51  jesse
-
-	* lib/RT/User.pm:
-
-	lib/RT/User no longer treats "ModifySelf" as equivalent to "AdminUsers" for the current user.
-	
-2001-04-04 15:08  jesse
-
-	* lib/RT/KeywordSelect.pm, lib/RT/Action/Autoreply.pm,
-	webrt/Admin/Global/Keywords.html, webrt/Admin/Queues/Keywords.html:
-
-	Fixed a crashing bug and an ACL violation on keywordselect deletion
-	
-2001-04-04 00:19  jesse
-
-	* Makefile:
-
-	bumping version for release
-	
-2001-04-03 21:14  jesse
-
-	* Makefile:
-
-	Bumped the version
-	
-2001-04-03 21:08  jesse
-
-	* etc/config.pm, lib/RT/Action/Notify.pm:
-
-	Added configuration tweak to not set a :; To header if the user doesn't want it.
-	
-2001-04-03 17:32  jesse
-
-	* lib/RT/Action/Notify.pm:
-
-	Fix for sendmail null list syntax.  : ;  is not the same as :; to sendmail
-	
-2001-04-03 17:05  jesse
-
-	* webrt/Admin/Queues/: GroupRights.html, UserRights.html:
-
-	removed a couple of stray 's in the html
-	
-2001-04-03 16:50  jesse
-
-	* webrt/Elements/Header:
-
-	Dropped doctype back to 4.0 because 4.01 makes mozilla render things funny
-	
-2001-04-03 16:47  jesse
-
-	* webrt/Elements/Quicksearch:
-
-	<TABLE>
-	should have been </TABLE>
-	
-2001-04-03 16:30  jesse
-
-	* webrt/Elements/Quicksearch:
-
-	Added a feature request/patch from nick@netability.ie
-	http://fsck.com/rt2/Ticket/Display.html?id=345
-	
-2001-04-03 16:01  jesse
-
-	* tools/testdeps:
-
-	Adding in testing for params::validate 0.02
-	
-2001-04-03 15:46  jesse
-
-	* Makefile:
-
-	Bumped the version slightly for a prerelease
-	
-2001-04-03 15:40  jesse
-
-	* lib/RT/Action/Autoreply.pm, lib/RT/Action/SendEmail.pm,
-	tools/insertdata:
-
-	Fixed autoreply by adding a new scrip. some misc. cleanup in SendEmail (method calls were on the wrong object)
-	
-2001-04-03 15:40  jesse
-
-	* lib/RT/Action/Autoreply.pm:
-
-	file Autoreply.pm was initially added on branch rt-1-1.
-	
-2001-04-03 15:15  jesse
-
-	* lib/RT/Action/SendEmail.pm:
-
-	Fixed a bug in the 'blacklist' regexp
-	
-2001-04-03 15:04  jesse
-
-	* etc/config.pm, lib/RT/Action/SendEmail.pm,
-	lib/RT/Interface/Web.pm, webrt/Ticket/Elements/ShowRequestor:
-
-	Two seperate fixes for the "RT doesn't send mail" problem. One that helps fix Mail::Internet->send
-	and one that provides an alternative.
-	
-	A fix for a bad link in ShowRequestor.
-	
-	Updating fields via the web ui should now be a bit more descriptive
-	
-2001-04-03 02:31  jesse
-
-	* webrt/Ticket/ModifyPeople.html:
-
-	Missed one of the mason fixes
-	
-2001-04-03 02:31  jesse
-
-	* Makefile, bin/rt-mailgate, etc/config.pm, lib/RT/Date.pm,
-	lib/RT/Ticket.pm, lib/RT/Transaction.pm, lib/RT/Watcher.pm,
-	lib/RT/Interface/Web.pm, webrt/Admin/Global/GroupRights.html,
-	webrt/Admin/Global/Keywords.html, webrt/Admin/Global/Scrips.html,
-	webrt/Admin/Global/UserRights.html,
-	webrt/Admin/Keywords/index.html,
-	webrt/Admin/Queues/GroupRights.html,
-	webrt/Admin/Queues/Keywords.html, webrt/Admin/Queues/People.html,
-	webrt/Admin/Queues/Scrips.html, webrt/Admin/Queues/UserRights.html,
-	webrt/Ticket/Modify.html, webrt/Ticket/ModifyAll.html,
-	webrt/Ticket/ModifyDates.html, webrt/Ticket/ModifyPeople.html:
-
-	Added support for parsing Cc and To in the mail gateway
-	(resolves the last work item for beta 2 - #219)
-	
-	Ticket due date is no longer set to "right now" if the queue has an
-	undefined "default due in"
-	
-	Cleanup warnings in date, ticket and watcher
-	
-	fixes for a bunch of mason 1.01 related bugs (Mason changed handling of combined GET and POST, thus breaking RT)
-	
-2001-04-02 23:15  jesse
-
-	* README, bin/webmux.pl:
-
-	Cleanup for mason 1.01.
-	Moved Apache::DBI out of the webmux into the instructions
-	
-2001-04-02 17:56  jesse
-
-	* tools/initdb:
-
-	Typo fix from  "Nick Hilliard" <nick@netability.ie>
-	
-2001-04-02 15:32  jesse
-
-	* Makefile, lib/RT/Keyword.pm, webrt/NoAuth/Logout.html:
-
-	Makefile cleanup.
-	Fix for #342 - reported by ivan
-	
-	Fix for a bug that clobbered logouts.
-	
-2001-04-02 03:09  jesse
-
-	* Makefile:
-
-	Bumped version for release
-	
-2001-04-01 19:19  jesse
-
-	* bin/rtadmin, lib/RT/ACE.pm, lib/RT/Interface/Web.pm,
-	webrt/Admin/Elements/SelectRights,
-	webrt/Admin/Global/GroupRights.html,
-	webrt/Admin/Global/UserRights.html,
-	webrt/Admin/Queues/GroupRights.html,
-	webrt/Admin/Queues/UserRights.html:
-
-	Redid the ACL editor so that it's much much faster. and easier to use...if not quite as pretty.
-	
-2001-04-01 17:31  jesse
-
-	* webrt/Ticket/Elements/: ShowDates, ShowRequestor:
-
-	fixing a couple of html typos
-	
-2001-03-31 03:07  jesse
-
-	* Makefile:
-
-	fixing Changelog generation
-	
-2001-03-31 02:52  jesse
-
-	* Makefile:
-
-	Bumped the version.
-	
-2001-03-31 02:52  jesse
-
-	* webrt/User/Prefs.html:
-
-	Cleaned up user preferences somewhat. removed things that don't do anything.
-	
-		-j
-	
-2001-03-31 01:59  jesse
-
-	* bin/rt:
-
-	Fix for #88   RT now lets you use the CLI to search for tickets, based on links to other tickets
-	
-2001-03-31 01:20  jesse
-
-	* README:
-
-	Fix for #216: Web session files need better handling and cleanup
-	
-2001-03-31 00:49  jesse
-
-	* Makefile, README, bin/rtadmin, bin/webmux.pl, etc/config.pm:
-
-	Moved RT Session data out of /tmp to somewhere that makes more sense.
-	This is the first half of the fix for #216.  Now we just need to document the cronjob reaper to kill old sessions
-	
-	Cleaned up creation of queues and users in bin/rtadmin
-	
-	Updates to the README
-	
-2001-03-30 23:44  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Fix for http://fsck.com/rt2/Ticket/Display.html?id=324
-	mail from requestors does not reopen ticket
-	
-2001-03-30 23:19  jesse
-
-	* bin/rtadmin, lib/RT/Queue.pm, lib/RT/Watcher.pm:
-
-	Work on Watchers and editing watchers from the CLI tool.  added support for --list-{queues|users|groups}
-	
-2001-03-30 19:31  jesse
-
-	* bin/rt, lib/RT/ACE.pm, lib/RT/Queue.pm, lib/RT/Ticket.pm,
-	lib/RT/Tickets.pm, lib/RT/Watcher.pm, lib/RT/Action/SendEmail.pm,
-	lib/RT/Interface/Web.pm:
-
-	A bunch of reworking of access control for watchers. should be much more robust
-	and more flexible.
-	
-	Resolves http://fsck.com/rt2/Ticket/Display.html?id=253 by adding the "Watch" and "WatchAsAdminCc" rights.
-	
-2001-03-30 15:41  jesse
-
-	* lib/RT/: Action/Notify.pm, Interface/Web.pm:
-
-	Tiny cleanup in Interface/Web.pm.  no functional difference there just being more explicit.
-	
-	Fix for #292: Sender of a message is no longer notified of that message.
-	
-2001-03-30 02:55  jesse
-
-	* Makefile:
-
-	Bumped the version
-	
-2001-03-30 02:37  jesse
-
-	* webrt/Elements/SelectDate:
-
-	Fixed an as-yet-untickled bug in SelectDate that incremented things too much
-	
-2001-03-30 02:32  jesse
-
-	* lib/RT/Template.pm, webrt/Admin/Global/Scrips.html:
-
-	Fixes to template creation. stupid typo.
-	Global scrips creation should now work better
-	
-2001-03-30 02:12  jesse
-
-	* webrt/: Admin/Elements/GroupTabs, Admin/Groups/Members.html,
-	Admin/Groups/Modify.html, Admin/Users/Modify.html,
-	Elements/ListActions:
-
-	Fix for PseudoGroups having a prompt to add members.
-	some cleanups to not make the "Results" box pop up when it's not wanted.
-	
-2001-03-30 01:41  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Attached is a patch to implement the ShowTicketComments in the
-	display of transactions of a ticket.
-	
-			Arthur de Jong <arthur@West.NL>
-	
-2001-03-30 01:34  jesse
-
-	* lib/RT/Scrip.pm, webrt/Admin/Global/Scrips.html,
-	webrt/Admin/Queues/Scrips.html:
-
-	Fix for 328: Re: [rt-users] 1.3.64 & postgres & scrips
-	there was an ACL bug.
-	
-2001-03-28 22:15  jesse
-
-	* Makefile, webrt/autohandler:
-
-	Fixed a tiny bug in the new authandler that caused logout to fail
-	
-2001-03-27 22:30  jesse
-
-	* webrt/index.html:
-
-	fixed index.html
-	
-2001-03-27 22:26  jesse
-
-	* Makefile, webrt/Admin/Groups/Members.html,
-	webrt/Ticket/Update.html:
-
-	Added a couple of fixes from Arthur at west.nl
-	Groups/Members deals better with multiple selections
-	Ticket/Update now displays queue watchers.
-	bumped the version to 1.3.63
-	
-2001-03-27 04:25  jesse
-
-	* docs/manual.pod, webrt/autohandler, webrt/index.html,
-	webrt/Admin/Users/index.html, webrt/Elements/ShadedBox,
-	webrt/Search/Listing.html:
-
-	Lots of cleanup of the auothandler.
-	a tiny bit of doc about an alternative apache configuration.
-	some web ui cleanup so that when you are on a page, your location is more properly hilighted.
-	admin/users includes some more verbiage explaining what's going on.
-	
-2001-03-25 00:44  jesse
-
-	* Makefile, lib/RT/Interface/Web.pm:
-
-	Bumped the version.
-	cosmetic fix in Interface/Web.pm
-	
-2001-03-23 20:33  jesse
-
-	* lib/RT/: Action/SendEmail.pm, Interface/Web.pm:
-
-	Fixed for TEXTAREA newline bug and Correspondence subject bug.
-	
-2001-03-23 00:34  jesse
-
-	* lib/RT/Action/Notify.pm:
-
-	: goes outside the '' in undisclosed recipients
-	
-2001-03-23 00:30  jesse
-
-	* lib/RT/: ACL.pm, ObjectKeywords.pm:
-
-	Removed some very loud uneccesary debugging statements
-	
-2001-03-23 00:27  jesse
-
-	* Makefile, lib/RT/Action/Notify.pm, lib/RT/Action/SendEmail.pm:
-
-	Work on mail sending routines to be more careful about newlines in subjects.
-	And about Undisclosed recipients
-	
-2001-03-22 23:17  jesse
-
-	* lib/RT/Action/Notify.pm:
-
-	yet another typo in notify.pm
-	
-2001-03-22 23:12  jesse
-
-	* lib/RT/Action/Notify.pm:
-
-	typo fix
-	
-2001-03-22 23:09  jesse
-
-	* lib/RT/Action/: Notify.pm, SendEmail.pm:
-
-	Cleanups and fixes to Notify and SendEmail
-	
-2001-03-22 19:46  jesse
-
-	* webrt/Ticket/ModifyAll.html:
-
-	TicketObj->Ticket
-	
-2001-03-22 19:42  jesse
-
-	* lib/RT/Action/Notify.pm:
-
-	A more functional Undisclosed Recipients;
-	
-2001-03-22 19:28  jesse
-
-	* webrt/Ticket/: ModifyAll.html, Elements/Tabs:
-
-	Elements/Tabs now does better access control checking before making
-	buttons available to people.
-	
-	ModifyAll.html has a better title and should now update objectkeywords.
-	
-2001-03-22 18:18  jesse
-
-	* lib/RT/: Date.pm, Ticket.pm:
-
-	Added  a routine to Date.pm to advance the date N days
-	
-	Started using queue defaults on Ticket->Create
-	
-2001-03-22 18:17  jesse
-
-	* webrt/: autohandler, Elements/Login, NoAuth/Login.html,
-	Search/autohandler, Ticket/autohandler:
-
-	Cleanup of the login process. now you can't accidentally call "Login.html"
-	when you're already logged in.
-	removed a couple of bogus old autohandlers
-	
-2001-03-22 18:17  jesse
-
-	* webrt/Elements/Login:
-
-	file Login was initially added on branch rt-1-1.
-	
-2001-03-22 14:45  jesse
-
-	* webrt/Ticket/Elements/EditPeople:
-
-	EditPeople should now enforce a list of possible owners reasonably
-	
-2001-03-21 21:40  jesse
-
-	* Makefile:
-
-	bumped the version to .60
-	
-2001-03-21 21:22  jesse
-
-	* docs/manual.pod:
-
-	Adding some content to the manual. and even more places where the manual is
-	missing content. :/
-	
-2001-03-21 12:21  jesse
-
-	* lib/RT/Action/NotifyAsComment.pm:
-
-	NotifyAsComment should now DTRT and send mail from the comments email address
-	
-2001-03-21 02:46  jesse
-
-	* Makefile:
-
-	yanked some cruft from the ChangeLog creator
-	
-2001-03-21 02:44  jesse
-
-	* Makefile, README:
-
-	Bumped the version. added some people to the readme
-	
-2001-03-21 02:39  jesse
-
-	* webrt/Ticket/Elements/ShowBasics:
-
-	Fix for 242: time left displayed via the web ui is now more intuitive
-	
-2001-03-21 02:37  jesse
-
-	* bin/rt, bin/rt-mailgate, lib/RT.pm, lib/RT/Attachment.pm,
-	lib/RT/Date.pm, lib/RT/Tickets.pm, lib/RT/User.pm:
-
-	Added more error checking and error handling to the mail gateway
-	finished code in Attachment.pm to handle too-long attachments
-	
-	added support for limiting by date to the CLI
-	
-	fixed little bugs in user, date and tickets.
-	
-2001-03-20 19:02  jesse
-
-	* docs/manual.pod:
-
-	file manual.pod was initially added on branch rt-1-1.
-	
-2001-03-20 19:02  jesse
-
-	* docs/manual.pod:
-
-	actually adding the outline of the manual
-	
-2001-03-20 19:01  jesse
-
-	* Makefile, bin/rt, docs/API, docs/README.docs, docs/Security,
-	docs/keywords, etc/config.pm:
-
-	Starting the doc cleanup
-	
-2001-03-20 15:26  jesse
-
-	* webrt/Elements/SelectTicketSortBy:
-
-	LastUpdated, not LastUpdate
-	
-2001-03-20 15:21  jesse
-
-	* webrt/Elements/: SelectDate, SelectTicketSortBy:
-
-	more things to sort by.
-	select date shouldn't insert spurious null dates.
-	
-2001-03-20 13:27  jesse
-
-	* lib/RT/Action/SendEmail.pm:
-
-	fixed a typo. $defined is not useful perl ;)
-	
-2001-03-20 13:21  jesse
-
-	* lib/RT/Action/: Notify.pm, SendEmail.pm:
-
-	Fixed a couple bugs in Notify and SendEmail that should get mail flowing
-	for transactions without content.
-	
-2001-03-20 13:08  jesse
-
-	* webrt/Ticket/: Attachment/dhandler, Elements/ShowTransaction:
-
-	Making web based attachment display deal nicely with too-long message bodies
-	
-2001-03-20 04:26  jesse
-
-	* Makefile:
-
-	bumping the version
-	
-2001-03-20 04:20  jesse
-
-	* lib/RT/Action/SendEmail.pm:
-
-	regexps with three /s need a leading s ;)
-	
-2001-03-20 04:16  jesse
-
-	* bin/rt-mailgate, lib/RT/Template.pm:
-
-	fixing scrips-related mailing stuff. some transaction mailing used to bomb out.
-	
-2001-03-20 02:46  jesse
-
-	* Makefile, bin/rt-mailgate, etc/config.pm,
-	lib/RT/Action/SendEmail.pm, tools/insertdata:
-
-	Work on robustification of the mail gateway. including single-transaction
-	blacklisting of addresses that might generate bounces.
-	
-2001-03-20 00:41  jesse
-
-	* lib/RT/User.pm:
-
-	Work on user.pm to allow users to be disabled.
-	
-2001-03-19 18:03  jesse
-
-	* webrt/: autohandler, Elements/MyRequests, NoAuth/Login.html,
-	NoAuth/Reminder.html:
-
-	fixed the MyRequests bug that caused them not to be listed.
-	nonexistent users no longer get shunted to SelfService.
-	
-2001-03-19 15:30  jesse
-
-	* Makefile, bin/mason_handler.fcgi, bin/mason_handler.scgi, bin/rt,
-	bin/rt-mailgate, bin/rtadmin, webrt/Admin/Elements/ModifyTemplate,
-	webrt/Admin/Elements/ModifyUser, webrt/Admin/Global/Template.html,
-	webrt/Admin/Queues/Template.html, webrt/Admin/Users/Modify.html,
-	webrt/Elements/MessageBox:
-
-	Fixes for perl path and textarea bugs noted by Arthur de Jong
-	
-2001-03-18 14:58  jesse
-
-	* lib/RT/Attachment.pm:
-
-	Removed an extra signature attachment
-	
-2001-03-17 14:57  jesse
-
-	* Makefile:
-
-	bumped version
-	
-2001-03-17 14:55  jesse
-
-	* lib/Makefile.PL, lib/RT/Tickets.pm, lib/RT/Interface/Web.pm,
-	webrt/Elements/Quicksearch, webrt/Elements/SelectDate,
-	webrt/Elements/SelectDateType, webrt/Elements/TitleBoxEnd,
-	webrt/Search/PickRestriction:
-
-	Fixed a bug on simple actions reported by christian.
-	Implemented search by date via web ui
-	
-2001-03-16 03:55  jesse
-
-	* Makefile, lib/RT/Interface/Web.pm, webrt/Elements/Header:
-
-	Fixed a tiny typo that prevented objectkeyword editing
-	
-2001-03-16 02:29  jesse
-
-	* Makefile:
-
-	Bumped the version.
-	
-2001-03-16 02:27  jesse
-
-	* Makefile, README, bin/initacls.Oracle, bin/initacls.Pg,
-	bin/initacls.mysql, bin/initdb.Oracle, tools/initdb:
-
-	some clarifications to the install procedure.
-	
-2001-03-16 02:10  jesse
-
-	* lib/RT/Tickets.pm, webrt/Search/Listing.html:
-
-	Fixed #2 WebRT doesn't refresh searches properly. the oldest bug in the bug tracking
-	system ;)
-	
-	Fixed Tickets->Count
-	
-2001-03-16 01:39  jesse
-
-	* webrt/Admin/: Global/Template.html, Global/Templates.html,
-	Queues/Modify.html, Queues/Template.html, Queues/Templates.html:
-
-	now you can create templates with the web ui.
-	
-2001-03-16 00:39  jesse
-
-	* webrt/Ticket/Elements/EditLinks:
-
-	file EditLinks was initially added on branch rt-1-1.
-	
-2001-03-16 00:39  jesse
-
-	* webrt/Ticket/ModifyAll.html:
-
-	file ModifyAll.html was initially added on branch rt-1-1.
-	
-2001-03-16 00:39  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Interface/Web.pm, webrt/Elements/Tabs,
-	webrt/Ticket/Modify.html, webrt/Ticket/ModifyAll.html,
-	webrt/Ticket/ModifyDates.html, webrt/Ticket/ModifyLinks.html,
-	webrt/Ticket/ModifyPeople.html, webrt/Ticket/ValidateUpdate.html,
-	webrt/Ticket/Elements/EditKeywordSelects,
-	webrt/Ticket/Elements/EditLinks, webrt/Ticket/Elements/EditPeople,
-	webrt/Ticket/Elements/Tabs:
-
-	A bunch of Ticket modification refactoring and cleanup.
-	Added a "ModifyAll" at sam hartman's suggestion
-	
-2001-03-14 21:20  jesse
-
-	* bin/rt:
-
-	--id=43-45 should now work. there was a regex typo
-	
-2001-03-14 04:37  jesse
-
-	* Makefile, bin/initacls.Oracle, etc/acl.Oracle, etc/acl.mysql,
-	etc/schema.Oracle, etc/user.Oracle, tools/initdb, tools/testdeps:
-
-	reworked init procedures, oracle schema and
-	acl setup for mysql and postgres and oracle.
-	
-	RT2 now runs on oracle.
-	
-2001-03-14 02:08  jesse
-
-	* etc/acl.Oracle, etc/schema.Oracle, tools/initdb:
-
-	hacking to make oracle work. we're much of the way there. next up:
-	schema updates
-	
-2001-03-14 02:08  jesse
-
-	* etc/acl.Oracle:
-
-	file acl.Oracle was initially added on branch rt-1-1.
-	
-2001-03-14 01:03  jesse
-
-	* webrt/Admin/Queues/GroupRights.html:
-
-	file GroupRights.html was initially added on branch rt-1-1.
-	
-2001-03-14 01:03  jesse
-
-	* webrt/Admin/Queues/UserRights.html:
-
-	file UserRights.html was initially added on branch rt-1-1.
-	
-2001-03-14 01:03  jesse
-
-	* Makefile, lib/RT/ACE.pm, lib/RT/Interface/Web.pm, tools/initdb,
-	webrt/Admin/Elements/QueueTabs,
-	webrt/Admin/Global/GroupRights.html, webrt/Admin/Queues/ACL.html,
-	webrt/Admin/Queues/GroupRights.html,
-	webrt/Admin/Queues/UserRights.html, webrt/Elements/Tabs,
-	webrt/NoAuth/webrt.css:
-
-	Cleanup to the ACL editors (consistency)
-	a bit of web ui tuning.
-	
-	fixes for initdb issues (thanks, jhutz)
-	
-	minor cleanups to ACE.pm
-	
-2001-03-13 22:44  jesse
-
-	* lib/RT/Transaction.pm, lib/RT/Transactions.pm, tools/testdeps:
-
-	Updated DBIx::SearchBuilder dependency
-	
-	code cleanup and sketching in Transaction.pm and Transactions.pm
-	
-2001-03-12 21:14  jesse
-
-	* Makefile, etc/schema.Pg, etc/schema.mysql, tools/initdb,
-	tools/testdeps:
-
-	initdb now caches schema, eliminating the install-time dependency on DBIx::DBSchema.
-	
-	this is 1.3.50, folks. it has what I believe to be functional postgres support
-	
-2001-03-11 21:58  jesse
-
-	* etc/config.pm, etc/schema.pm, lib/RT/Attachment.pm,
-	lib/RT/Ticket.pm, tools/initdb:
-
-	Cleanup in Ticket.pm
-	Bugfixes to Attachment.pm (for postgres mimencoding supporT)
-	
-	reconfigured to use the new DBIx::DBSchema (which isn't out yet. but should
-	be soon)
-	
-	still need to do a bit more work on attachments configuration.
-	
-2001-03-11 02:45  jesse
-
-	* bin/rt-mailgate:
-
-	file rt-mailgate was initially added on branch rt-1-1.
-	
-2001-03-11 02:45  jesse
-
-	* Makefile, README, bin/rt-mailgate, bin/rtmux.pl, bin/webmux.pl,
-	etc/config.pm, etc/schema.Oracle, etc/schema.pm, lib/RT.pm,
-	lib/RT/Attachment.pm, lib/RT/ScripAction.pm, lib/RT/Ticket.pm,
-	lib/RT/Action/SendEmail.pm, lib/RT/Interface/CLI.pm,
-	lib/RT/Interface/Email.pm, tools/insertdata:
-
-	This is a bit more of a 'comprehensive' diff than I'd intended. That's what
-	I get for working for 1/2 a week at my parents place without real net ;)
-	
-	Cleanups in the makefile and readme to make installation simpler and more
-	sensical.
-	
-	removed outdated rtmux.pl
-	moved old Interface/Email.pm to bin/rt-mailgate
-	started new baseclass for new mail gateways (Interface/Email.pm)
-	
-	first cut implementation of attachment size limits.
-	
-	switched mysql to use 'longblob' rather than just 'blob', so
-	that users can submit > 64k attachments.  with the next release
-	of DBIx::DBSchema, we should have what we need to get
-	PG attachmetns of more reasonable sizes working.
-	
-	first cut implementation of base64 encoding for MIME objects
-	on databases that don't support BLOBs (postgres)
-	
-	restructured initdb so we'll be able to support databases
-	for which we need to hand-hack schema.
-	
-	added the 'Owner' pseudogroup to insertdata
-	
-	fixed the bug in logging for the mail gateway that caused
-	lots of warnings about joins.
-	
-	lots of work on the mail gateway to start to clean up and restructure
-	things.
-	
-2001-03-10 18:53  jesse
-
-	* tools/initdb:
-
-	Refactoring initdb to make it easier to do things like add oracle support. yay
-	
-2001-03-09 15:19  jesse
-
-	* lib/RT/Condition/StatusChange.pm:
-
-	file StatusChange.pm was initially added on branch rt-1-1.
-	
-2001-03-09 15:19  jesse
-
-	* Makefile, etc/config.pm, lib/RT/Attachment.pm, lib/RT/Link.pm,
-	lib/RT/Ticket.pm, lib/RT/Transaction.pm, lib/RT/Watcher.pm,
-	lib/RT/Action/SendEmail.pm, lib/RT/Condition/AnyTransaction.pm,
-	lib/RT/Condition/Generic.pm, lib/RT/Condition/StatusChange.pm,
-	tools/insertdata, tools/testdeps:
-
-	OnResolve scrip now works.
-	some cleanup on Scrips and Watchers.
-	commented out some debug messages that aren't immediately useful
-	
-2001-03-09 15:15  jesse
-
-	* webrt/Ticket/: ModifyDates.html, Elements/EditWatchers:
-
-	Two bugfixes:
-		one, editdates no longer errors out on 5.005
-		two, links from watchers to the ModifyUser page now work properly
-	
-2001-03-08 15:21  jesse
-
-	* Makefile, lib/RT/User.pm, tools/insertdata:
-
-	
-	Fixed a bootstrapping bug introduced with the new acls on Create.
-	bumped version to 1.3.49_01
-	
-2001-03-07 00:40  jesse
-
-	* lib/: test.pl, RT/ACE.pm, RT/CurrentUser.pm, RT/Group.pm,
-	RT/GroupMember.pm, RT/Keyword.pm, RT/KeywordSelect.pm, RT/Link.pm,
-	RT/Queue.pm, RT/Scrip.pm, RT/ScripAction.pm, RT/Template.pm,
-	RT/Ticket.pm, RT/Transaction.pm, RT/User.pm, RT/Watcher.pm:
-
-	acls for Delete methods that needed them.
-	flat lockouts on Delete methods that needed them.
-	
-	test.pl got 'use *' added to it
-	
-2001-03-06 18:07  jesse
-
-	* lib/RT/Attachment.pm:
-
-	Backing out changes that broke ->Content
-	
-2001-03-06 17:42  jesse
-
-	* Makefile, lib/RT/Attachment.pm, lib/RT/Record.pm,
-	lib/RT/Interface/Web.pm, webrt/Elements/SelectSortOrder,
-	webrt/Search/Listing.html, webrt/Search/PickRestriction:
-
-	work on Attachments.
-	cleanup on sorting and limiting.
-	
-2001-03-06 16:26  jesse
-
-	* webrt/Search/PickRestriction:
-
-	adding a header
-	
-2001-03-04 19:46  jesse
-
-	* etc/schema.pm:
-
-	Schema change to support postgres
-	
-2001-03-04 19:44  jesse
-
-	* lib/RT/Record.pm:
-
-	Small change for new DBIx::SearchBuilder::Record PrimaryKey behaviors..
-	
-2001-03-04 19:15  jesse
-
-	* bin/rt:
-
-	rt --id=<int> should work now
-	
-2001-03-02 00:26  jesse
-
-	* etc/config.pm, lib/RT/Date.pm, lib/RT/Ticket.pm,
-	webrt/Ticket/ModifyDates.html:
-
-	first pass on dates and timezones...seems to work. for common ops
-	
-2001-02-28 16:34  jesse
-
-	* lib/RT/User.pm:
-
-	fix for RT/fsck.com: Ticket #208 User->Create needs more argument checking
-		added a check to User->Create to make sure a name was specified
-	
-2001-02-28 08:56  jesse
-
-	* Makefile, bin/rtadmin:
-
-	Enabled the ability to set a user's password via the CLI
-	
-2001-02-27 22:09  jesse
-
-	* lib/Makefile.PL, tools/testdeps:
-
-	Bumping required version of searchbuilder in testdeps and lib/Makefile.pl
-	
-2001-02-27 22:00  jesse
-
-	* webrt/Elements/SelectKeyword:
-
-	allowing undef keywords
-	
-2001-02-27 21:43  jesse
-
-	* webrt/Admin/Queues/Scrips.html:
-
-	Fix for ticket #50. grammar in per queue scrip descriptions
-	
-2001-02-27 21:41  jesse
-
-	* tools/insertdata:
-
-	resolving ticket #181- extra \s in the autoreply template
-	
-2001-02-27 21:36  jesse
-
-	* Makefile, lib/RT/Transaction.pm, tools/testdeps:
-
-	testdeps now erorrs out if you don't specify a db type.
-	
-	queue change transaction descriptions are better.
-	
-	bumped the version
-	
-2001-02-27 21:12  jesse
-
-	* webrt/Elements/SelectTicketSortBy:
-
-	file SelectTicketSortBy was initially added on branch rt-1-1.
-	
-2001-02-27 21:12  jesse
-
-	* webrt/Elements/SelectSortOrder:
-
-	file SelectSortOrder was initially added on branch rt-1-1.
-	
-2001-02-27 21:12  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/Interface/Web.pm,
-	webrt/Elements/SelectKeyword, webrt/Elements/SelectResultsPerPage,
-	webrt/Elements/SelectSortOrder, webrt/Elements/SelectTicketSortBy,
-	webrt/Search/Listing.html, webrt/Search/PickRestriction:
-
-	Basic ticket sorting has been implemented.
-	Ticket listing by pages works too.
-	
-	a bit of cleanup in the ticket listing.  now select by keywords uses the component designed for that purpose
-	
-2001-02-26 15:44  jesse
-
-	* lib/RT/Ticket.pm:
-
-	No longer generate spurious watchers transactions when merging tickets.
-	
-2001-02-26 03:08  jesse
-
-	* lib/RT/Ticket.pm:
-
-	fixed a typo in a debug message that prevented compilation
-	
-2001-02-26 02:53  jesse
-
-	* Makefile:
-
-	bumped the version for release. again.
-	
-2001-02-26 02:52  jesse
-
-	* lib/RT/: ACE.pm, Ticket.pm:
-
-	Fixed a variable redef in ticket and an acl granting bug in ACE
-	
-2001-02-26 01:24  jesse
-
-	* Makefile, webrt/Ticket/ModifyLinks.html:
-
-	A bit more merging support.
-	Bumped version for release
-	
-2001-02-25 22:28  jesse
-
-	* webrt/Ticket/Elements/: ShowHistory, ShowTransaction:
-
-	Cleaning up the transaction display.
-	
-2001-02-25 22:22  jesse
-
-	* lib/RT/: Scrip.pm, ScripCondition.pm, Ticket.pm:
-
-	Some bug fixes for merging.
-	Fixed a bug in Scrips that caused an infinite loop if the user had no rights.
-	
-2001-02-24 02:42  jesse
-
-	* Makefile, lib/RT/Ticket.pm:
-
-	Fixed a bug that prevented ticket loading from appearing to work
-	
-2001-02-23 19:17  jesse
-
-	* Makefile, lib/RT/Ticket.pm, lib/RT/Interface/Web.pm:
-
-	Fixed a typo in Ticket.pm that prevented transaction lists from working
-	fixed a paste error in Web.pm
-	
-2001-02-23 17:41  jesse
-
-	* Makefile:
-
-	Bumped the version # for release
-	
-2001-02-23 17:31  jesse
-
-	* Makefile, README, bin/initacls.mysql, bin/webmux.pl,
-	lib/RT/ACE.pm, lib/RT/ACL.pm, lib/RT/Link.pm, lib/RT/Queue.pm,
-	lib/RT/Ticket.pm, lib/RT/User.pm, lib/RT/Interface/Web.pm,
-	tools/initdb, tools/testdeps:
-
-	Fixed a bug that made a first install with mysql fail
-	yanked a UNIVERSAL::AUTOLOADER handler I inserted to test things out.
-	Fixed several ACL creation bugs.
-	Initial implementation of merge for the core.
-	Testdeps now does database testing.
-	
-	Made Ticket->Load smarter. (nolonger needs a seperate LoadByURI sub.
-	
-	fixed bugs in the readme
-	
-2001-02-22 01:03  jesse
-
-	* tools/testdeps:
-
-	Updated dependencies.
-	
-2001-02-21 17:49  jesse
-
-	* lib/RT/: Ticket.pm, Tickets.pm:
-
-	Cache Queue in Ticket.pm for added perf.
-	formatting cleanup in Tickets.pm
-	
-2001-02-20 14:38  jesse
-
-	* webrt/Ticket/Display.html:
-
-	Uncompressed history on summary page...
-	
-2001-02-20 14:18  jesse
-
-	* lib/RT/ScripCondition.pm:
-
-	fixed a pod typo
-	
-2001-02-20 14:07  jesse
-
-	* Makefile, etc/schema.pm, lib/MANIFEST, tools/insertdata,
-	webrt/Admin/Users/Modify.html,
-	webrt/SelfService/Elements/ShowTransaction,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	removed a false unique index from schema. pm.
-	make web interface and insertdata deal properly with the fact that email addresses
-	should be unique.
-	
-	cleaned up ShowTransaction for the webui. (now uses CreatorObj rather than Creator,
-	as it was confusing
-	
-2001-02-20 01:42  jesse
-
-	* lib/RT/: ACE.pm, ACL.pm, Attachment.pm, Attachments.pm,
-	CurrentUser.pm, EasySearch.pm, Group.pm, GroupMember.pm,
-	GroupMembers.pm, Groups.pm, Keyword.pm, KeywordSelect.pm,
-	Keywords.pm, Link.pm, Links.pm, ObjectKeyword.pm,
-	ObjectKeywords.pm, Queue.pm, Queues.pm, Record.pm, Scrip.pm,
-	ScripAction.pm, ScripActions.pm, ScripCondition.pm,
-	ScripConditions.pm, Scrips.pm, Template.pm, Templates.pm,
-	Ticket.pm, Tickets.pm, Transaction.pm, Transactions.pm, User.pm,
-	Users.pm, Utils.pm, Watcher.pm, Watchers.pm, Action/SendEmail.pm:
-
-	A major security audit of the codebase has taken place.  I was primarily out for
-	ACL related issues, but took care of a number of other minor cleanups at the same time.
-	
-2001-02-19 17:16  jesse
-
-	* NEWS:
-
-	fixed a typo in cli_respond_req
-	
-2001-02-15 18:02  jesse
-
-	* webrt/SelfService/: Details.html, Error.html:
-
-	fixing bug #90: SelfService calls to Abort use the 'standard' handler. which includes the wrong header.
-	
-2001-02-15 18:02  jesse
-
-	* webrt/SelfService/Error.html:
-
-	file Error.html was initially added on branch rt-1-1.
-	
-2001-02-15 17:39  jesse
-
-	* webrt/Admin/Elements/SelectSingleOrMultiple:
-
-	file SelectSingleOrMultiple was initially added on branch rt-1-1.
-	
-2001-02-15 17:39  jesse
-
-	* lib/RT/Keyword.pm, lib/RT/KeywordSelect.pm,
-	webrt/Admin/Elements/SelectKeywordSelect,
-	webrt/Admin/Elements/SelectSingleOrMultiple,
-	webrt/Admin/Global/Keywords.html, webrt/Admin/Queues/Keywords.html,
-	webrt/Elements/SelectKeyword, webrt/Elements/SelectKeywordOptions,
-	webrt/Ticket/Elements/ModifyTicket:
-
-	KeywordSelect.pm got an ACL bug fixed.
-	Keyword.pm now does recursive searches in Descendants properly.
-	
-	KeyworSelect editing via the webui is now much smarter. and cleaner. and better. and faster, and resolving bug 123
-	
-2001-02-15 17:39  jesse
-
-	* webrt/Admin/Elements/SelectKeywordSelect:
-
-	file SelectKeywordSelect was initially added on branch rt-1-1.
-	
-2001-02-13 22:54  jesse
-
-	* lib/: Makefile.PL, RT/ACE.pm, RT/Keyword.pm, RT/KeywordSelect.pm,
-	RT/Scrip.pm:
-
-	Better ACL handling for ACEs, Keywords and KeywordSelects.
-	specified more accurate versions of some dependencies in lib/Makefile.PL
-	
-2001-02-13 12:51  jesse
-
-	* bin/rtadmin, etc/schema.pm, lib/RT/Keyword.pm,
-	lib/RT/KeywordSelect.pm, lib/RT/KeywordSelects.pm,
-	lib/RT/Keywords.pm, lib/RT/Queue.pm, lib/RT/Queues.pm,
-	lib/RT/User.pm, lib/RT/Users.pm, webrt/Admin/Global/Keywords.html,
-	webrt/Admin/Keywords/index.html, webrt/Admin/Queues/Keywords.html,
-	webrt/Admin/Queues/Modify.html, webrt/Admin/Users/Modify.html:
-
-	Implemented 'Disabled' for Keywords, KeywordSelects, Queues and Users.
-	This supplants 'Delete' for these objects which need to exist to guarantee
-	referential integrity.
-	
-	Implemented cli and web interfaces to support the new code.
-	
-2001-02-12 18:27  jesse
-
-	* README, bin/rtadmin, etc/schema.pm, lib/RT/Attachment.pm,
-	lib/RT/EasySearch.pm, lib/RT/Link.pm, lib/RT/ObjectKeyword.pm,
-	lib/RT/Queue.pm, lib/RT/Queues.pm, lib/RT/Record.pm,
-	lib/RT/ScripAction.pm, lib/RT/ScripCondition.pm,
-	lib/RT/Template.pm, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	lib/RT/Watcher.pm, tools/testdeps:
-
-	Cleaned up LastUpdated / Created/ LastUpdatedBy / Creator to all get set on
-	create for all relevant objects.
-	
-	Based on discussions with ivan, changed the 'Deleted' flag on various objects to 'Disabled'
-	to better represent its purpose.
-	
-	Fully implemented Disable for queue as a prototype.
-	
-	fixed queue attribute editing in cli.
-	
-2001-02-12 13:59  jesse
-
-	* tools/testdeps:
-
-	specified a minimum known good version of Getopt::Long
-	
-2001-02-12 12:38  jesse
-
-	* lib/RT/Queue.pm, webrt/Ticket/Elements/ShowTransaction:
-
-	transaction links work again.
-	admin ccs get listed.
-	
-2001-02-11 22:16  jesse
-
-	* Makefile:
-
-	bumped the version # for a new release
-	
-2001-02-11 22:13  jesse
-
-	* lib/RT/Queue.pm, lib/RT/Template.pm, tools/insertdata:
-
-	cleaning up queue create.
-	
-2001-02-11 22:12  jesse
-
-	* etc/schema.pm:
-
-	started the work on dealing with Deleting records that need to exist to guarantee ref. integrity
-	
-2001-02-11 18:40  jesse
-
-	* NEWS:
-
-	imported brandon's url importing code
-	
-2001-02-06 22:59  jesse
-
-	* lib/RT/Queue.pm, webrt/Admin/Queues/Modify.html,
-	webrt/Admin/Users/index.html:
-
-	Fixes to Queue.pm to stop it from clobbering the Name.
-	
-	fixed a typo in the webui Admin/Users/index.html
-	
-2001-02-06 15:22  jesse
-
-	* lib/RT/Queue.pm, webrt/Admin/Elements/QueueRightsForUser,
-	webrt/Admin/Elements/SelectRights,
-	webrt/Ticket/Elements/ShowMembers:
-
-	ACL fixes in Queue.pm.
-	ACL search fies for the web ui.
-	fixed a recursive subticket display bug.
-	
-2001-02-06 12:49  jesse
-
-	* Makefile:
-
-	removed the old rt 1.0 lib/rt directory forever. yay
-	
-2001-02-06 12:48  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	Added a tiny patch from ivan to not extract nested messages. not totally sure about this one yet.
-	
-2001-02-02 01:26  jesse
-
-	* Makefile:
-
-	version bumpin
-	
-2001-02-02 01:11  jesse
-
-	* bin/rtadmin, lib/RT/Keyword.pm:
-
-	keyword creation, editing and deletion now works via the cli tool.
-	
-	This means that for alpha 4, we're *gasp* feature complete.  now to fix lots of bugs.
-	
-2001-02-01 02:46  jesse
-
-	* bin/rtadmin, lib/RT/Group.pm, lib/RT/Keyword.pm,
-	lib/RT/KeywordSelect.pm, tools/testdeps, webrt/Ticket/Display.html,
-	webrt/Ticket/Elements/ShowHistory,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Commandline editing of keywordselects now works.
-	
-	Added in a patch to collapse history on the ticket listing
-	page from Byron Ellacott
-	
-	Bumped a few dependecy versions. added a File::Spec dependency, since File::Temp
-	gets it not quote right.
-	
-2001-01-31 02:08  jesse
-
-	* bin/rtadmin, lib/RT/Group.pm, webrt/Admin/Groups/Members.html:
-
-	Commandline group editing now works. yay. group membership even.
-	the api changed to be easier to work with and more consistent with other functions
-	
-2001-01-30 23:12  jesse
-
-	* lib/RT/Interface/Email.pm, webrt/Ticket/Elements/ShowLinks,
-	webrt/Ticket/Elements/ShowRequestor:
-
-	The email interface now uses tempdir from File::Temp for increased security.
-	
-	A couple of webui cleanups to display more sensible things.
-	
-2001-01-30 16:42  jesse
-
-	* etc/config.pm, lib/RT/User.pm, lib/RT/Interface/Email.pm:
-
-	Added mail-on-error to the mail gateway. now it should tell you when it fails.
-	
-	turned off debugging output from ACLs....
-	
-2001-01-29 23:58  jesse
-
-	* bin/rtadmin, lib/RT/ACE.pm, lib/RT/ACL.pm, lib/RT/Scrip.pm,
-	lib/RT/ScripAction.pm, lib/RT/ScripCondition.pm, lib/RT/Scrips.pm,
-	lib/RT/Template.pm, lib/RT/Templates.pm, lib/RT/User.pm,
-	lib/RT/Interface/CLI.pm, lib/RT/Interface/Web.pm,
-	webrt/Admin/Elements/SelectTemplate,
-	webrt/Admin/Global/Template.html,
-	webrt/Admin/Global/Templates.html,
-	webrt/Admin/Queues/Template.html:
-
-	A bunch of work on the admin cli (acl editor now works)
-	
-	a couple API changes to standardize method names across classes
-	template editing via the web should work better now.
-	
-2001-01-29 23:56  jesse
-
-	* webrt/Elements/: TitleBoxEnd, TitleBoxStart:
-
-	Futzing with the title box to make it a bit more consistent
-	
-2001-01-29 23:54  jesse
-
-	* lib/RT/Record.pm:
-
-	Removed a redundant sub new
-	
-2001-01-29 22:22  jesse
-
-	* lib/RT/Group.pm:
-
-	Groups can now be loaded by name.
-	
-2001-01-23 15:46  jesse
-
-	* bin/rtadmin, etc/schema.pm, lib/RT/Queue.pm, lib/RT/Template.pm,
-	lib/RT/Ticket.pm, lib/RT/User.pm, lib/RT/Interface/CLI.pm,
-	tools/initdb:
-
-	initdb now punts on database creation for oracle.
-	
-	Ticket->Name removed from code (retargeted to post 2.0 and its own table)
-	Some better error checking in User and Queue.
-	
-	Can now edit templates (And create them) from the CLI.
-	
-2001-01-22 12:51  jesse
-
-	* lib/RT/Action/Notify.pm:
-
-	
-	It's amazing how much effect 3 little letters can have. with this patch,
-	scrips that depend on notify (most everything other than autoreply)
-	just work. woo!
-	
-2001-01-22 06:18  jesse
-
-	* lib/RT/Template.pm:
-
-	Fixed a couple ACL bugs in Template::_Set
-	
-2001-01-22 05:04  jesse
-
-	* Makefile:
-
-	Bumped the version # because of the schema change
-	
-2001-01-22 04:51  jesse
-
-	* lib/RT/Interface/CLI.pm:
-
-	file CLI.pm was initially added on branch rt-1-1.
-	
-2001-01-22 04:51  jesse
-
-	* lib/RT/Interface/CLI.pm:
-
-	Added CLI.pm, which rt and adminrt are dependant on
-	
-2001-01-22 04:46  jesse
-
-	* bin/rtadmin, lib/MANIFEST, lib/RT/Template.pm:
-
-	a bit more work on rtadmin (the start of template editing)
-	
-	added Interface/CLI to the manifest.
-	added a comment to Template.pm
-	
-2001-01-22 02:51  jesse
-
-	* Makefile, TODO, bin/mason_handler.scgi, bin/rt, bin/rtadmin,
-	bin/rtmux.pl, bin/webmux.pl, etc/config.pm, etc/schema.Oracle,
-	etc/schema.pm, lib/RT.pm, lib/RT/Attachment.pm,
-	lib/RT/CurrentUser.pm, lib/RT/Group.pm, lib/RT/Link.pm,
-	lib/RT/ObjectKeywords.pm, lib/RT/Queue.pm, lib/RT/Template.pm,
-	lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/Transaction.pm,
-	lib/RT/User.pm, lib/RT/Users.pm, lib/RT/Watchers.pm,
-	lib/RT/Interface/Email.pm, tools/insertdata,
-	webrt/Admin/Elements/CreateQueueCalled,
-	webrt/Admin/Elements/CreateUserCalled,
-	webrt/Admin/Elements/GrantQueueRightsTo,
-	webrt/Admin/Elements/ModifyKeywordSelect,
-	webrt/Admin/Elements/ModifyQueue,
-	webrt/Admin/Elements/ModifyTemplate,
-	webrt/Admin/Elements/ModifyUser,
-	webrt/Admin/Elements/SelectModifyQueue,
-	webrt/Admin/Elements/SelectModifyUser,
-	webrt/Admin/Elements/SelectTemplate,
-	webrt/Admin/Elements/SelectUsers, webrt/Admin/Global/Scrips.html,
-	webrt/Admin/Global/Template.html,
-	webrt/Admin/Global/Templates.html,
-	webrt/Admin/Global/UserRights.html,
-	webrt/Admin/Groups/Members.html,
-	webrt/Admin/KeywordSelects/index.html, webrt/Admin/Queues/ACL.html,
-	webrt/Admin/Queues/Create.html, webrt/Admin/Queues/Keywords.html,
-	webrt/Admin/Queues/Modify.html, webrt/Admin/Queues/People.html,
-	webrt/Admin/Queues/Scrips.html, webrt/Admin/Queues/Template.html,
-	webrt/Admin/Queues/Templates.html, webrt/Admin/Queues/index.html,
-	webrt/Admin/Users/Modify.html, webrt/Admin/Users/Prefs.html,
-	webrt/Admin/Users/index.html, webrt/Elements/Header,
-	webrt/Elements/MyRequests, webrt/Elements/MyTickets,
-	webrt/Elements/Quicksearch, webrt/Elements/SelectNewTicketQueue,
-	webrt/Elements/SelectOwner, webrt/Elements/SelectQueue,
-	webrt/Elements/SelectUsers, webrt/SelfService/Details.html,
-	webrt/SelfService/Elements/Header,
-	webrt/SelfService/Elements/MyRequests,
-	webrt/SelfService/Elements/ShowTransaction,
-	webrt/Ticket/Create.html, webrt/Ticket/ModifyLinks.html,
-	webrt/Ticket/autohandler, webrt/Ticket/Elements/AddWatchers,
-	webrt/Ticket/Elements/ShowBasics, webrt/Ticket/Elements/ShowDates,
-	webrt/Ticket/Elements/ShowDependencies,
-	webrt/Ticket/Elements/ShowLinks, webrt/Ticket/Elements/ShowPeople,
-	webrt/Ticket/Elements/ShowReferences,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	In prep for a true schema freeze, I fixed a number of attribute names that were troublesome for
-	one reason or another.
-	
-	        Queue->QueueId and User->UserId have been changed to Queue->Name and User->Name, so
-	        as not to conflict with queue->id and user->id any more.  A number of tables
-	        used "Alias" and "Title" and things like that, rather than the somewhat
-	        more standard "Name" and "Description"
-	
-	Abstracted a bunch of the CLI setup stuff out into lib/RT/Interface/CLI
-	
-	Abstracted some of the core DB startup code into RT.pm
-	
-	fixed the makefile to handle the new rtadmin.
-	
-	lots of updates to the new rtadmin (which works for user editing!)
-	
-	fixed a bug in ObjectKeywords->LoadByName....
-	
-2001-01-19 04:23  jesse
-
-	* bin/rtadmin:
-
-	A bit of cleanup and a bit more docs.  it's now actually implementable with getopt::long
-	
-2001-01-19 04:16  jesse
-
-	* bin/rtadmin:
-
-	file rtadmin was initially added on branch rt-1-1.
-	
-2001-01-19 04:16  jesse
-
-	* bin/rtadmin:
-
-	Docced the proposed cli for the new rtadmin tool. It's rather more intense than I'd intended
-	
-2001-01-19 02:15  jesse
-
-	* lib/RT/User.pm:
-
-	Fixed ACL bug that prevented by-group auth from working
-	
-2001-01-19 00:52  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/User.pm, webrt/SelfService/Details.html:
-
-	Work on SelfService (fixing the a permission denied bug)
-	
-2001-01-19 00:21  jesse
-
-	* webrt/NoAuth/webrt.css:
-
-	file webrt.css was initially added on branch rt-1-1.
-	
-2001-01-19 00:21  jesse
-
-	* webrt/: webrt.css, Elements/Header, NoAuth/webrt.css,
-	SelfService/Details.html, SelfService/Elements/Header:
-
-	webui cleanups
-	
-2001-01-19 00:07  jesse
-
-	* bin/rt:
-
-	bug-fixing in bin/rt
-	
-2001-01-18 23:47  jesse
-
-	* lib/RT/Link.pm, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	webrt/Ticket/ModifyLinks.html, webrt/Ticket/Elements/ShowLinks,
-	webrt/Ticket/Elements/ShowMembers,
-	webrt/Ticket/Elements/ShowReferences,
-	webrt/Ticket/Elements/ShowSummary:
-
-	A bunch of work on links.
-	API cleanups.
-	Ticket-> Members and MemberOf  now return Links objects rather than Tickets Objects
-	Edit links via the webui works now
-	
-2001-01-18 15:11  jesse
-
-	* HACKING, docs/API:
-
-	Added a bit more documentation and philosophy
-	to the API file. yanked tobix' old out of date "HACKING"
-	doc
-	
-2001-01-18 03:18  jesse
-
-	* Makefile, NEWS:
-
-	Headers in incoming mail are now parsed case insensitively.
-	
-	Version is now 1.0.7
-	
-2001-01-17 16:41  jesse
-
-	* Makefile, tools/testdeps:
-
-	updated searchbuilder dependency in testdeps
-	
-	revved version in Makefile for release.
-	
-2001-01-17 14:27  jesse
-
-	* Makefile, bin/rt, lib/RT/Date.pm:
-
-	Fixed #45 Permissions bug on redhat 6.0
-	Fixed #51 RT CLI doesn't check for valid user
-	
-	Implemented a bunch more searching in bin/rt
-	
-	Refactored RT::Date a bit.
-	
-	Fixed some unreported permissions eits.
-	
-2001-01-16 11:43  jesse
-
-	* webrt/Ticket/Elements/: ShowLinks, ShowMemberOf, ShowMembers,
-	ShowPeople, ShowSummary:
-
-	Cleaned up and shortened the Ticket Display screen
-	
-2001-01-16 10:56  jesse
-
-	* lib/RT/Ticket.pm, webrt/Ticket/Modify.html:
-
-	Cleaned up and better documented Ticket->SetStatus
-	Ticket/Modify.html got rid of a whole bunch of evals.
-	
-2001-01-15 23:57  jesse
-
-	* Makefile, lib/MANIFEST, lib/RT/Tickets.pm:
-
-	Removed a deleted file from the manifest. revved the version
-	
-2001-01-15 15:19  jesse
-
-	* lib/RT/: KeywordSelect.pm, Queue.pm:
-
-	Adding the ability to load keyword selects by name.
-	
-2001-01-15 03:49  jesse
-
-	* lib/RT/Ticket.pm, webrt/Ticket/Elements/EditKeywordSelects:
-
-	keyword display now cleaner. doesn't force you to select a keyword if none
-	is selected yet.
-	
-2001-01-15 03:36  jesse
-
-	* lib/RT/Ticket.pm:
-
-	SetQueue is no-longer heinously broken. thanks eoin
-	
-2001-01-15 03:10  jesse
-
-	* lib/RT/: Queue.pm, User.pm, Action/Notify.pm, Action/Spam.pm:
-
-	removed an old RT::Action that didn't actually do anything useful these days.  it'll get replaced later.
-	
-	Scrips which sign watchers up for things _actually seem to work_
-	(required some frobbing of watchers)
-	
-2001-01-15 02:44  jesse
-
-	* bin/rt, etc/schema.pm, lib/RT/ObjectKeywords.pm, lib/RT/Queue.pm,
-	lib/RT/Template.pm, lib/RT/Ticket.pm, lib/RT/Tickets.pm,
-	lib/RT/Watchers.pm, webrt/Elements/ViewUser,
-	webrt/Ticket/Elements/ShowRequestor:
-
-	Added a 'Type' column to templates, to more easily allow for insertable templates for quick responses from customer service folks ,etc.
-	Reworked a bunch of the watchers code to not do its own potentially very bogus caching and to reuse more core code.
-	Oh. and it always returns the expected object type now.
-	
-	Redid tobias' old "ViewUser" box to use a set of tickets, rather than a bogus search for watchers (ignoring tickets).
-	
-	Fixed a bug in searching for tickets by watcher.
-	
-2001-01-15 00:53  jesse
-
-	* bin/rt, webrt/Elements/SelectOwner, webrt/Elements/TitleBoxStart,
-	webrt/NoAuth/Login.html, webrt/Ticket/Elements/ShowSummary:
-
-	Added a bunch of doc to bin/rt. probably should have check to see if it runs ;)
-	TitleBoxStart got the attributes:  class, title_href and titleright_href. makes calls to it cleaner.
-	showsummary got a few more links to the places things should go.
-	selectOwner now will actually default to nobody if that's the right value.
-	
-2001-01-13 03:22  jesse
-
-	* TODO:
-
-	Changed the TODO file to point to the current TODO list
-	
-2001-01-13 03:18  jesse
-
-	* Makefile:
-
-	Bumped version # for release
-	
-2001-01-13 03:11  jesse
-
-	* bin/rtmux.pl, lib/RT/Queue.pm, lib/RT/Action/SendEmail.pm:
-
-	Fixing a couple minor things in rtmux and Queue.pm so that the mail interfaces work ok.
-	
-2001-01-13 02:34  jesse
-
-	* lib/RT/User.pm:
-
-	Added the ability to generate a random password to RT::User.  we don't yet
-	have a nice way to email this information to the user. which is a real bummer.
-	
-2001-01-12 17:35  jesse
-
-	* etc/config.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
-	lib/RT/Interface/Web.pm, webrt/Admin/Users/Modify.html,
-	webrt/SelfService/Create.html, webrt/SelfService/Details.html,
-	webrt/SelfService/Elements/Header, webrt/SelfService/Elements/Tabs:
-
-	Made ACLs for 'Everyone' work. fixed a few other small ACL bugs.
-	Made the 'Requestor-mode' ticket create tool work.
-	
-2001-01-12 12:27  jesse
-
-	* webrt/Elements/: SelectDate, SelectOwner:
-
-	Commented out unimplemented select relative date bits.
-	SelectOwner now lets you pick nobody.
-	
-2001-01-12 03:16  jesse
-
-	* bin/rt, bin/rtmux.pl, lib/RT/Ticket.pm, tools/testdeps:
-
-	Comments and Correspondence work from the cli now. with and without --source (for source data) and --no-edit (to disable invocation of $EDITOR)
-	
-	rt and rtmux.pl now drop setgidness as soon as they can. it's happier this
-	way. really :)
-	
-	testdeps now installs File::Temp, which is needed to do safe tempfile usage.
-	
-2001-01-12 00:11  jesse
-
-	* webrt/Elements/: MyRequests, MyTickets:
-
-	Bug fix for #47 (Id flows into subject on 'home' screen)
-	
-2001-01-11 03:34  jesse
-
-	* webrt/Elements/Header:
-
-	Removed extra spaces from the header
-	
-2001-01-11 02:57  jesse
-
-	* webrt/Elements/SelectOwner:
-
-	Made SelectOwner actually show all the right people
-	
-2001-01-11 02:53  jesse
-
-	* tools/testdeps:
-
-	Added a requirement for the current DBIx::SearchBuilder to testdeps
-	
-2001-01-11 02:28  jesse
-
-	* Makefile:
-
-	revved the version for distribution
-	
-2001-01-11 02:28  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Interface/Web.pm,
-	webrt/Elements/Quicksearch, webrt/Elements/TitleBoxStart,
-	webrt/Ticket/Display.html, webrt/Ticket/Elements/EditBasics:
-
-	fixed a couple of UI bugs. the 'quick' links in the web ticket view should now all work.
-	Logger->warn  -> Logger->warning in the web ui
-	
-2001-01-10 17:42  jesse
-
-	* Makefile:
-
-	Bumped to 1.3.33
-	
-2001-01-10 01:46  jesse
-
-	* webrt/Ticket/Attachment/dhandler:
-
-	Date: Wed, 10 Jan 2001 16:22:43 +1000 (EST)                                     From: Byron Ellacott <bje@apnic.net>                                            To: rt-devel@fsck.com                                                           Subject: Re: [rt-devel] [rt-announce] RT 1.3.30 released                        List-Id: RT Development <rt-devel.lists.fsck.com>                                                                                                               [-- Attachment #1 --]                                                           [-- Type: text/PLAIN, Encoding: 7bit, Size: 0.7K --]                                                                                                            On Wed, 3 Jan 2001, Jesse wrote:                                                                                                                                [snip]                                                                                                                                                          I noticed 1-3-31 sitting around, so I installed that.  I'm giving a             demonstration tomorrow, so I've been running through the web UI.  I             noticed a problem with attachments - HTML::Mason was munging everything to      be HTML-nice, but a jpg doesn't display if its < characters are changed to      &lt;, and it's not good to have </BODY></HTML> on the end of binary             attachments.
-	
-2001-01-10 00:24  jesse
-
-	* Makefile:
-
-	Revved the version to 1.3.32
-	
-2001-01-09 23:57  jesse
-
-	* webrt/Admin/Users/Rights.html:
-
-	file Rights.html was initially added on branch rt-1-1.
-	
-2001-01-09 23:57  jesse
-
-	* lib/RT/Record.pm, lib/RT/User.pm, lib/RT/Interface/Email.pm,
-	tools/insertdata, webrt/Admin/Elements/UserTabs,
-	webrt/Admin/Users/Modify.html, webrt/Admin/Users/Rights.html,
-	webrt/Elements/Quicksearch, webrt/Elements/TitleBoxEnd,
-	webrt/Elements/TitleBoxStart:
-
-	Did some work on User creation to check for duplicate userids on create.
-	Better user create error checking.
-	Switched the TitleBox UI to a compromise between new and old.
-	
-	Did a bit of ui work on web based user modification
-	
-2001-01-09 02:15  jesse
-
-	* Makefile, lib/RT/User.pm, tools/insertdata,
-	webrt/Admin/Users/Modify.html:
-
-	shuffling around hte user password stuff. hopefully the user modification issues seen in 1.3.30 will be fixed.
-	
-2001-01-09 00:48  jesse
-
-	* webrt/Ticket/History.html:
-
-	file History.html was initially added on branch rt-1-1.
-	
-2001-01-09 00:48  jesse
-
-	* docs/keywords:
-
-	file keywords was initially added on branch rt-1-1.
-	
-2001-01-09 00:48  jesse
-
-	* bin/mason_handler.scgi:
-
-	file mason_handler.scgi was initially added on branch rt-1-1.
-	
-2001-01-09 00:48  jesse
-
-	* Makefile, bin/mason_handler.scgi, bin/webmux.pl, docs/keywords,
-	lib/RT/Tickets.pm, lib/RT/Interface/Web.pm,
-	webrt/Admin/Elements/GrantQueueRightsTo~,
-	webrt/Ticket/History.html:
-
-	Started to write out notes on a testsuite.
-	Started work on a CGI/SpeedyCGI frontend
-	added a file that was missing in 1.3.30
-	
-2001-01-08 14:04  jesse
-
-	* NEWS, README:
-
-	Added a web based due-date patch.
-	
-2001-01-06 15:17  jesse
-
-	* etc/schema.pm:
-
-	Added 'Deleted' attributes for tables whose entries can not be safely
-	removed from the database for ref. integrity problems.
-	
-2001-01-03 23:07  jesse
-
-	* Makefile:
-
-	Bumped version to 1.3.30
-	
-2001-01-03 23:02  jesse
-
-	* tools/testdeps:
-
-	file testdeps was initially added on branch rt-1-1.
-	
-2001-01-03 23:02  jesse
-
-	* README, bin/testdeps.pl, lib/Makefile.PL, tools/testdeps,
-	webrt/Elements/TitleBoxStart:
-
-	a bit of quick UI work.
-	an update to depend on DBIx::SearchBuilder 0.15 (just releaseD)
-	testdeps moved to tools
-	
-2001-01-03 03:21  jesse
-
-	* bin/rt, lib/RT/Tickets.pm:
-
-	ticket searches for integers are a bit more flexible now (and the code's tighter)
-	
-	the rtq section of the new bin/rt appears functional, if underdocced.
-	
-2001-01-02 22:55  jesse
-
-	* lib/RT/Tickets.pm, lib/RT/Interface/Web.pm,
-	webrt/Search/PickRestriction:
-
-	Imported ivan's keyword search patch, along with a modification to allow
-	for _not_ selecting keywords.
-	
-2001-01-02 21:45  jesse
-
-	* Makefile, bin/testdeps.pl, lib/RT/KeywordSelect.pm,
-	lib/RT/ObjectKeyword.pm, lib/RT/ObjectKeywords.pm,
-	lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/Watchers.pm,
-	lib/RT/Interface/Web.pm, tools/insertdata, webrt/webrt.css,
-	webrt/Elements/Header, webrt/Elements/TitleBoxStart,
-	webrt/Elements/ViewUser, webrt/Search/Listing.html,
-	webrt/Search/PickRestriction, webrt/Ticket/Create.html,
-	webrt/Ticket/Display.html, webrt/Ticket/Elements/ShowBasics,
-	webrt/Ticket/Elements/ShowSummary,
-	webrt/Ticket/Elements/ShowTransaction, webrt/Ticket/Elements/Tabs:
-
-	Fixed a warning in testdeps (Well, worked around it, anyway)
-	Added some helper functions for keywords and keyword selects.
-	
-	did a bunch of UI cleanup. started to color-code the webui
-	
-	started work on a generic queue listing format in Tickets.pm
-	
-2001-01-02 15:02  jesse
-
-	* webrt/SelfService/Elements/ShowTransaction:
-
-	file ShowTransaction was initially added on branch rt-1-1.
-	
-2001-01-02 15:02  jesse
-
-	* webrt/SelfService/: Create.html, Details.html,
-	Elements/GotoTicket, Elements/Header, Elements/ShowTransaction,
-	Elements/Tabs:
-
-	Fleshed out more of the requestor UI.
-	It's good enough for the alpha. yay!
-	
-2001-01-02 15:02  jesse
-
-	* webrt/SelfService/Elements/GotoTicket:
-
-	file GotoTicket was initially added on branch rt-1-1.
-	
-2001-01-01 19:06  jesse
-
-	* webrt/Ticket/: Modify.html, ModifyDates.html, ModifyPeople.html,
-	Elements/EditBasics, Elements/EditKeywordSelects,
-	Elements/ShowDates, Elements/ShowSummary:
-
-	Even yet still more Technicolor!
-	
-2001-01-01 18:42  jesse
-
-	* webrt/NoAuth/images/spacer.gif:
-
-	file spacer.gif was initially added on branch rt-1-1.
-	
-2001-01-01 18:42  jesse
-
-	* webrt/NoAuth/Reminder.html:
-
-	file Reminder.html was initially added on branch rt-1-1.
-	
-2001-01-01 18:42  jesse
-
-	* webrt/Elements/Section:
-
-	file Section was initially added on branch rt-1-1.
-	
-2001-01-01 18:42  jesse
-
-	* lib/RT/CurrentUser.pm, lib/RT/KeywordSelect.pm, webrt/webrt.css,
-	webrt/Admin/Keywords/index.html, webrt/Admin/Queues/People.html,
-	webrt/Elements/Header, webrt/Elements/ListActions,
-	webrt/Elements/MyRequests, webrt/Elements/MyTickets,
-	webrt/Elements/Section, webrt/Elements/Submit,
-	webrt/Elements/TitleBoxEnd, webrt/Elements/TitleBoxStart,
-	webrt/NoAuth/Login.html, webrt/NoAuth/Reminder.html,
-	webrt/NoAuth/images/spacer.gif, webrt/Ticket/Display.html,
-	webrt/Ticket/ModifyPeople.html, webrt/Ticket/Elements/ShowSummary,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	A bunch of UI work.
-	Ticket Display is significantly different. and _much_ faster loading.
-	A color style guide for the web ui is forthcoming.
-	
-	removed a Die from CurrentUser.
-	
-2000-12-30 03:27  jesse
-
-	* webrt/Elements/Tabs:
-
-	fixed a ui nit from ivan
-	
-2000-12-30 03:03  jesse
-
-	* webrt/Ticket/Elements/ShowSummary:
-
-	fixed a hyperlink.
-	
-2000-12-30 00:07  jesse
-
-	* Makefile:
-
-	bumped version for release
-	
-2000-12-30 00:03  jesse
-
-	* etc/config.pm, lib/RT/User.pm,
-	webrt/Admin/Elements/ModifyKeywordSelect,
-	webrt/Admin/Global/Keywords.html,
-	webrt/Admin/KeywordSelects/index.html,
-	webrt/Admin/Keywords/Modify.html, webrt/Admin/Keywords/index.html,
-	webrt/Admin/Queues/Keywords.html, webrt/Admin/Users/index.html:
-
-	Fixed a bug in keyword creation that caused urls and param values to get buggered.
-	
-	Passwords are now encrypted in the database
-	
-2000-12-29 05:54  jesse
-
-	* bin/rt, lib/RT/Link.pm, lib/RT/Ticket.pm,
-	lib/RT/Interface/Web.pm, webrt/Ticket/Display.html,
-	webrt/Ticket/Elements/ShowDependencies,
-	webrt/Ticket/Elements/ShowLinks:
-
-	Did a bunch of work on the linking interface. It's now got
-	a much easier API. and it's twice as functional (you can delete links)
-	
-	Did the proof-of concept for the link code in the CLI. it'll need
-	fleshing out tomorrow.
-	
-	Fleshed out other parts of the CLI.
-	
-	stayed up way too late.
-	
-2000-12-29 00:30  jesse
-
-	* Makefile, bin/rt, lib/RT/Keyword.pm, lib/RT/Ticket.pm:
-
-	Added keyword support to the CLI.
-	fixed a couple of Keyword core bugs
-	
-2000-12-28 03:56  jesse
-
-	* bin/rt, bin/testdeps.pl, lib/RT/Keyword.pm,
-	lib/RT/KeywordSelect.pm, lib/RT/User.pm:
-
-	Removed unused keyword related code. added in a bit of
-	new keyword related code to get "relative" paths of keywords.
-	
-	fixed a longstanding warning in ACL checking.
-	
-	first 1/2 of keywords support for the new rt cli.
-	
-	added Tie::IxHash to testdeps.pl (keywords needs it)
-	
-2000-12-27 02:19  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	missed a comma
-	
-2000-12-27 01:21  jesse
-
-	* webrt/Admin/Global/Keywords.html:
-
-	file Keywords.html was initially added on branch rt-1-1.
-	
-2000-12-27 01:21  jesse
-
-	* etc/schema.pm, lib/RT/ACE.pm, lib/RT/KeywordSelect.pm,
-	lib/RT/KeywordSelects.pm, lib/RT/Queue.pm, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm, webrt/Admin/Elements/SystemTabs,
-	webrt/Admin/Global/Keywords.html, webrt/Admin/Queues/Keywords.html,
-	webrt/Ticket/Create.html, webrt/Ticket/ModifyPeople.html,
-	webrt/Ticket/Elements/EditKeywordSelects,
-	webrt/Ticket/Elements/ShowKeywordSelects,
-	webrt/Ticket/Elements/ShowSummary,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Added the ability to name keyword selects.
-	first round of ACLing for keywords.
-	
-	Added the ability to create KeywordSelects which apply to all queues (Rather than just
-	a single queue)
-	
-	misc bigfixes.
-	
-2000-12-26 02:56  jesse
-
-	* webrt/Elements/SelectKeywordOptions:
-
-	file SelectKeywordOptions was initially added on branch rt-1-1.
-	
-2000-12-26 02:56  jesse
-
-	* webrt/Admin/Keywords/index.html:
-
-	file index.html was initially added on branch rt-1-1.
-	
-2000-12-26 02:56  jesse
-
-	* webrt/Admin/Queues/Keywords.html:
-
-	file Keywords.html was initially added on branch rt-1-1.
-	
-2000-12-26 02:56  jesse
-
-	* webrt/Elements/SelectKeyword:
-
-	file SelectKeyword was initially added on branch rt-1-1.
-	
-2000-12-26 02:56  jesse
-
-	* bin/webmux.pl, etc/schema.pm, lib/RT/Keyword.pm,
-	lib/RT/KeywordSelect.pm, lib/RT/KeywordSelects.pm,
-	lib/RT/Keywords.pm, lib/RT/ObjectKeyword.pm,
-	lib/RT/ObjectKeywords.pm, lib/RT/Queue.pm, lib/RT/Ticket.pm,
-	lib/RT/Watchers.pm, webrt/Admin/Elements/ModifyKeyword,
-	webrt/Admin/Elements/ModifyKeywordSelect,
-	webrt/Admin/Elements/QueueTabs, webrt/Admin/Elements/Tabs,
-	webrt/Admin/KeywordSelects/index.html,
-	webrt/Admin/Keywords/Modify.html, webrt/Admin/Keywords/index.html,
-	webrt/Admin/Queues/Keywords.html, webrt/Elements/SelectKeyword,
-	webrt/Elements/SelectKeywordOptions, webrt/Ticket/Modify.html,
-	webrt/Ticket/Elements/EditKeywordSelects,
-	webrt/Ticket/Elements/ShowKeywordSelects:
-
-	My first pass at making the keywords stuff work more like the rest of the RT core.
-	A couple of minor fixes on non-keywords things, but mostly this was an
-	edit of the keywords code to:
-		1. make the admin UI work more like the rest of the admin ui
-		(still need to do "global" keyword selections)
-	
-		2. bring the coding style of the keywords stuff more into line
-		with the rest of the codebase
-	
-		3. flesh out the helper methods in the keywords modules.
-	
-2000-12-24 02:04  jesse
-
-	* lib/RT/: Keyword.pm, KeywordSelect.pm, ObjectKeyword.pm:
-
-	A first round of commentary and cleanup on a few modules
-	
-2000-12-24 01:34  jesse
-
-	* webrt/Ticket/Elements/ShowKeywordSelects:
-
-	file ShowKeywordSelects was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* webrt/Ticket/Elements/EditKeywordSelects:
-
-	file EditKeywordSelects was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* webrt/Admin/: KeywordSelects/Modify.html, Keywords/Modify.html:
-
-	file Modify.html was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* webrt/Admin/KeywordSelects/index.html:
-
-	file index.html was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* webrt/Admin/Elements/ModifyKeyword:
-
-	file ModifyKeyword was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* webrt/Admin/Elements/ModifyKeywordSelect:
-
-	file ModifyKeywordSelect was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* webrt/Admin/Elements/SelectModifyKeyword:
-
-	file SelectModifyKeyword was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* webrt/Admin/Elements/SelectModifyKeywordSelect:
-
-	file SelectModifyKeywordSelect was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/RT/ObjectKeyword.pm:
-
-	file ObjectKeyword.pm was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/RT/Keyword.pm:
-
-	file Keyword.pm was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/RT/KeywordSelect.pm:
-
-	file KeywordSelect.pm was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/test.pl:
-
-	file test.pl was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/RT/ObjectKeywords.pm:
-
-	file ObjectKeywords.pm was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/RT/KeywordSelects.pm:
-
-	file KeywordSelects.pm was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/RT/Keywords.pm:
-
-	file Keywords.pm was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* Makefile, etc/acl.Pg, etc/schema.pm, lib/MANIFEST,
-	lib/MANIFEST.SKIP, lib/Makefile.PL, lib/RT.pm, lib/test.pl,
-	lib/RT/Keyword.pm, lib/RT/KeywordSelect.pm,
-	lib/RT/KeywordSelects.pm, lib/RT/Keywords.pm,
-	lib/RT/ObjectKeyword.pm, lib/RT/ObjectKeywords.pm,
-	lib/RT/Ticket.pm, webrt/Admin/Elements/ModifyKeyword,
-	webrt/Admin/Elements/ModifyKeywordSelect,
-	webrt/Admin/Elements/SelectModifyKeyword,
-	webrt/Admin/Elements/SelectModifyKeywordSelect,
-	webrt/Admin/Elements/Tabs, webrt/Admin/KeywordSelects/Modify.html,
-	webrt/Admin/KeywordSelects/index.html,
-	webrt/Admin/Keywords/Modify.html, webrt/Ticket/Modify.html,
-	webrt/Ticket/Elements/EditBasics,
-	webrt/Ticket/Elements/EditKeywordSelects,
-	webrt/Ticket/Elements/ShowKeywordSelects,
-	webrt/Ticket/Elements/ShowSummary:
-
-	Importing two largish patches from ivan@420.am:
-		First up, ivan switched lib/RT over to using MakeMaker..so now
-		we get man pages for the core modules and a bunch of other cool stuff.
-	
-		Second: ivan handed us an almost complete keywords system.  Over the next
-		week or two, I'm going to be adding ACL support to the keywords system
-		and starting to integrate bits of it better into the rest of the core
-		(though it's nearly all done already).
-	
-			Thanks, ivan!
-	
-2000-12-24 01:34  jesse
-
-	* lib/MANIFEST:
-
-	file MANIFEST was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/Makefile.PL:
-
-	file Makefile.PL was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/RT.pm:
-
-	file RT.pm was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/MANIFEST.SKIP:
-
-	file MANIFEST.SKIP was initially added on branch rt-1-1.
-	
-2000-12-23 23:45  jesse
-
-	* Makefile, webrt/Ticket/Elements/Tabs:
-
-	made the links in the ticket tool bar point to the right places.
-	
-2000-12-23 23:15  jesse
-
-	* lib/RT/Ticket.pm:
-
-	fixing a typo and the docs.
-	
-2000-12-23 23:12  jesse
-
-	* lib/RT/Ticket.pm:
-
-	the internal function _SetTold shouldn't be hitting an ACL check.
-	
-2000-12-23 17:37  jesse
-
-	* lib/RT/Ticket.pm, webrt/Ticket/Display.html,
-	webrt/Ticket/Modify.html, webrt/Ticket/ModifyDates.html,
-	webrt/Ticket/ModifyLinks.html, webrt/Ticket/ModifyPeople.html,
-	webrt/Ticket/Update.html, webrt/Ticket/Elements/Tabs,
-	webrt/Ticket/Elements/TicketToolBox:
-
-	Cleaned up a bit of date diff related functionality.
-	
-	Did work on the ticket tool bar.
-	
-2000-12-23 16:46  jesse
-
-	* lib/RT/Record.pm:
-
-	Lets try that again..
-	
-2000-12-23 16:39  jesse
-
-	* lib/RT/Record.pm:
-
-	LongSinceUpdatedAsString is now actually relative :)
-	
-2000-12-23 16:09  jesse
-
-	* lib/RT/Tickets.pm:
-
-	added a default to LimitStatus.
-	
-2000-12-23 01:47  jesse
-
-	* bin/: rt, testdeps.pl:
-
-	updated testdeps to require the latest mason (for ease of debugging)
-	the new combined bin/rt actually implements the behavior of rtq and rt -show
-	fully (I believe). next up, more ticket modification and a code cleanup
-	
-2000-12-22 18:37  jesse
-
-	* Makefile:
-
-	bumped to 1.3.28 for release
-	
-2000-12-19 22:38  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/Transaction.pm,
-	lib/RT/Interface/Web.pm, webrt/Elements/Tabs,
-	webrt/Ticket/ModifyPeople.html, webrt/Ticket/Elements/EditPeople,
-	webrt/User/Prefs.html:
-
-	Removed outdated CC request to and BCC request to
-	did some UI touchups.
-	
-	started a bit of work in tickets.pm for the new CLI (more explicit searching)
-	
-2000-12-19 21:50  jesse
-
-	* bin/rt:
-
-	Modifying ticket requestors from the commandline works. yay.
-	Simplified the commandline arguments a bit too.
-	
-2000-12-19 18:37  jesse
-
-	* bin/: mason_handler.fcgi, webmux.pl:
-
-	updaes to webmux.pl to work on with new versions of HTML::Mason
-	
-2000-12-19 14:05  jesse
-
-	* webrt/Ticket/Display.html:
-
-	Fixed a bug in Ticket/Display.html that caused navigation not to work within new tickets.
-	
-2000-12-19 04:03  jesse
-
-	* bin/rt:
-
-	implemented --history (show ticket history)
-	and --limit-status (limit to a ticket status)
-	just to make sure that this works at all.  it does.
-	
-	With the new ui, you'll be able to trivially perform actions on large #s of tickets.
-	
-2000-12-19 03:38  jesse
-
-	* bin/rt:
-
-	After playing with a few Getopt variants, I've settled on Getopt::Long for now...
-	and implemented the skeleton of the new RT cli.  I suspect that with another day's work,
-	it should be mostly functional. yay.
-	
-2000-12-19 03:38  jesse
-
-	* bin/rt:
-
-	file rt was initially added on branch rt-1-1.
-	
-2000-12-18 19:34  jesse
-
-	* docs/design_docs/cli_spec:
-
-	file cli_spec was initially added on branch rt-1-1.
-	
-2000-12-18 19:34  jesse
-
-	* docs/design_docs/cli_spec:
-
-	Added the CLI spec from deborah.
-	
-2000-12-18 02:11  jesse
-
-	* webrt/Elements/: CreateTicket, GotoTicket:
-
-	Fixed a basepath error.
-	
-2000-12-18 01:19  jesse
-
-	* webrt/Elements/CreateTicket:
-
-	file CreateTicket was initially added on branch rt-1-1.
-	
-2000-12-18 01:19  jesse
-
-	* webrt/Elements/GotoTicket:
-
-	file GotoTicket was initially added on branch rt-1-1.
-	
-2000-12-18 01:19  jesse
-
-	* README, webrt/Admin/Queues/Modify.html,
-	webrt/Admin/Users/Modify.html, webrt/Elements/CreateTicket,
-	webrt/Elements/GotoTicket, webrt/Search/Listing.html:
-
-	A few more changes from Lee Ann and a couple of files I missed on the earlier  checkins.
-	
-2000-12-18 01:14  jesse
-
-	* webrt/Admin/Groups/Rights.html:
-
-	file Rights.html was initially added on branch rt-1-1.
-	
-2000-12-18 01:14  jesse
-
-	* webrt/Admin/Groups/: Members.html, Rights.html:
-
-	a couple UI tweaks from Lee Ann Goldstein
-	
-2000-12-18 00:51  jesse
-
-	* webrt/: Admin/Elements/SystemTabs, Admin/Groups/index.html,
-	Admin/Users/index.html, Elements/Submit, Elements/Tabs:
-
-	More UI hacking. whee
-	
-2000-12-17 23:55  jesse
-
-	* webrt/: Elements/SelectNewTicketQueue, Elements/SelectOwner,
-	Elements/Tabs, Ticket/Create.html, Ticket/Elements/Tabs:
-
-	ui hacking to add the "Create Ticket" and "Goto Ticket" ui elements at the top.
-	
-2000-12-17 22:17  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	webrt/Elements/MessageBox, webrt/Ticket/Modify.html,
-	webrt/Ticket/ModifyPeople.html:
-
-	Fixing bugs 7,8,28
-	
-2000-12-17 02:38  jesse
-
-	* webrt/Ticket/Elements/ShowDates:
-
-	*sigh* typo in ShowDates.
-	
-2000-12-17 02:34  jesse
-
-	* lib/RT/Date.pm, webrt/Ticket/Elements/EditDates,
-	webrt/Ticket/Elements/ShowDates:
-
-	A bit of work on Dates. a postgres fix from ivan and some display prettification.
-	
-2000-12-17 02:15  jesse
-
-	* Makefile, webrt/Ticket/Elements/TicketToolBox:
-
-	commeted out some toolbar actions which don't work yet.
-	
-	bumped the version to 1.3.27 for imminent release.
-	
-2000-12-17 01:51  jesse
-
-	* lib/RT/Attachment.pm:
-
-	The ACL problem on attachments was a bootstrapping issue. couldn't check acls because it
-	couldn't necessarily see what to check
-	
-2000-12-17 01:44  jesse
-
-	* lib/RT/Attachment.pm:
-
-	acl fix for attachments.
-	
-2000-12-17 01:15  jesse
-
-	* lib/RT/Ticket.pm:
-
-	fixing ugly disgusting ACL bugs
-	
-2000-12-17 00:35  jesse
-
-	* lib/RT/Transaction.pm, lib/RT/User.pm,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Fixing bugs in Transaction ACLs.
-	
-2000-12-16 03:56  jesse
-
-	* webrt/Admin/Groups/Members.html:
-
-	ui nit in admin/groups/members.
-	
-2000-12-16 03:31  jesse
-
-	* lib/RT/: Group.pm, GroupMember.pm:
-
-	$object->$SUPER::Foo is wrong. $object->SUPER::Foo is not.
-	
-2000-12-16 03:28  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Rights checks for ticket ownership work best when the right that's set is the same
-	as the right that's checked for *sigh*
-	
-2000-12-16 03:26  jesse
-
-	* webrt/Admin/Groups/Members.html:
-
-	Fixed a couple bugs in Group mebership administration code.
-	
-2000-12-16 03:04  jesse
-
-	* webrt/: Admin/Elements/GroupTabs, Admin/Elements/QueueTabs,
-	Admin/Elements/SystemTabs, Admin/Elements/Tabs,
-	Admin/Elements/UserTabs, Admin/Global/index.html,
-	Admin/Groups/Modify.html, Admin/Groups/index.html,
-	Admin/Queues/People.html, Admin/Queues/index.html,
-	Admin/Users/Modify.html, Admin/Users/index.html,
-	Elements/SelectWatcherType, Elements/Tabs, Ticket/Create.html,
-	Ticket/Display.html, Ticket/Elements/Tabs:
-
-	Bugfix in user admin (no longer automatically revokes "privileged status)
-	a bunch of tab-related UI cleanup. the start of tabs that reflect the current page.
-	
-	added the ability to configure queue watchers from the web ui
-	
-2000-12-16 03:04  jesse
-
-	* webrt/Admin/Queues/People.html:
-
-	file People.html was initially added on branch rt-1-1.
-	
-2000-12-16 00:58  jesse
-
-	* webrt/Admin/Users/index.html:
-
-	typo fixing.
-	
-2000-12-15 19:12  jesse
-
-	* webrt/Admin/Global/GroupRights.html:
-
-	file GroupRights.html was initially added on branch rt-1-1.
-	
-2000-12-15 19:12  jesse
-
-	* webrt/Admin/Global/UserRights.html:
-
-	file UserRights.html was initially added on branch rt-1-1.
-	
-2000-12-15 19:12  jesse
-
-	* webrt/Admin/Elements/GroupTabs:
-
-	file GroupTabs was initially added on branch rt-1-1.
-	
-2000-12-15 19:12  jesse
-
-	* lib/RT/ACE.pm, lib/RT/Group.pm, lib/RT/Groups.pm,
-	lib/RT/Record.pm, lib/RT/Scrip.pm, lib/RT/ScripAction.pm,
-	lib/RT/Ticket.pm, lib/RT/Transaction.pm, lib/RT/User.pm,
-	lib/RT/Users.pm, tools/insertdata, webrt/Admin/Elements/GroupTabs,
-	webrt/Admin/Elements/SystemTabs, webrt/Admin/Global/ACL.html,
-	webrt/Admin/Global/GroupRights.html,
-	webrt/Admin/Global/UserRights.html,
-	webrt/Admin/Groups/Members.html, webrt/Admin/Groups/Modify.html,
-	webrt/Admin/Groups/index.html, webrt/Admin/Users/Modify.html,
-	webrt/Admin/Users/index.html:
-
-	A bunch of cleanup work on Users and Groups (and a couple of small bugfixes, one
-	which might prevent install of Alpha 2) mostly aimed at improving the admin ui.
-	
-	We now have two levels of "Privileged" for a user, 1 which means "can be granted rights"
-	and 2 which means "should not be futzed with by the user"
-	
-2000-12-14 23:04  jesse
-
-	* webrt/Ticket/Attachment/dhandler:
-
-	Accidentally left out of the last rev. sorry about that.
-	
-2000-12-14 23:04  jesse
-
-	* webrt/Ticket/Attachment/dhandler:
-
-	file dhandler was initially added on branch rt-1-1.
-	
-2000-12-12 20:44  jesse
-
-	* Makefile:
-
-	Bumped version to 1.3.26. This is RT2 Alpha 2, folks.
-	
-2000-12-12 20:34  jesse
-
-	* lib/RT/Attachment.pm, lib/RT/Record.pm, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm, lib/RT/User.pm,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Attachment display in the webui now just works [tm] RT2 Alpha 2 will be rolled later tonight.
-	
-2000-12-12 19:03  jesse
-
-	* webrt/Admin/Global/Template.html:
-
-	file Template.html was initially added on branch rt-1-1.
-	
-2000-12-12 19:03  jesse
-
-	* webrt/Admin/Global/Templates.html:
-
-	file Templates.html was initially added on branch rt-1-1.
-	
-2000-12-12 19:03  jesse
-
-	* README, bin/webmux.pl, lib/RT/Attachment.pm, lib/RT/Template.pm,
-	lib/RT/Transaction.pm, webrt/Admin/Elements/SelectTemplate,
-	webrt/Admin/Elements/SystemTabs, webrt/Admin/Global/Template.html,
-	webrt/Admin/Global/Templates.html,
-	webrt/Admin/Queues/Templates.html,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Working on attachments support.
-	
-	did some work on global templates
-	
-2000-12-12 15:15  jesse
-
-	* lib/RT/Template.pm, lib/RT/Templates.pm, tools/insertdata:
-
-	Core support for system-scoped templates
-	
-2000-12-12 14:12  jesse
-
-	* webrt/Admin/: Queues/Modify.html, Users/Create.html,
-	Users/Modify.html:
-
-	Fixed queue and user creation problems.
-	
-2000-12-12 03:05  jesse
-
-	* webrt/Ticket/: Link.html, ModifyLinks.html, Elements/ShowSummary,
-	Elements/Tabs:
-
-	Brought the still basic link editing ui into conformance with the rest of the ticket ui
-	
-2000-12-12 03:05  jesse
-
-	* webrt/Ticket/ModifyLinks.html:
-
-	file ModifyLinks.html was initially added on branch rt-1-1.
-	
-2000-12-12 02:41  jesse
-
-	* webrt/Ticket/: ModifyDates.html, ModifyPeople.html:
-
-	split out the ticket modify screen into 3 more bite-sized pages.
-	
-2000-12-12 02:41  jesse
-
-	* webrt/Ticket/ModifyPeople.html:
-
-	file ModifyPeople.html was initially added on branch rt-1-1.
-	
-2000-12-12 02:41  jesse
-
-	* webrt/Ticket/ModifyDates.html:
-
-	file ModifyDates.html was initially added on branch rt-1-1.
-	
-2000-12-12 02:41  jesse
-
-	* webrt/Ticket/: Modify.html, Elements/Tabs:
-
-	[no log message]
-	
-2000-12-11 15:01  jesse
-
-	* webrt/NoAuth/Login.html:
-
-	file Login.html was initially added on branch rt-1-1.
-	
-2000-12-11 15:01  jesse
-
-	* webrt/NoAuth/Logout.html:
-
-	file Logout.html was initially added on branch rt-1-1.
-	
-2000-12-11 15:01  jesse
-
-	* webrt/: Login.html, Logout.html, autohandler, Elements/Footer,
-	Elements/Header, NoAuth/Login.html, NoAuth/Logout.html:
-
-	Moving Login and Logout around so they work right with the new NoAuth scheme
-	
-2000-12-11 05:00  jesse
-
-	* webrt/: Login.html, autohandler:
-
-	fixed a couple login bugs. implemented some logic to deal with different auth classes:
-	/NoAuth/ and /SelfService/
-	
-2000-12-11 01:46  jesse
-
-	* webrt/: rt.jpg, Elements/Header, Elements/MyRequests,
-	Elements/MyTickets, Search/Listing.html, Ticket/Create.html,
-	Ticket/Create_Detail.html, Ticket/Display.html, Ticket/Modify.html,
-	Ticket/Update.html, Ticket/Elements/ShowTransaction,
-	Ticket/Elements/Tabs, Ticket/Elements/TicketToolBox:
-
-	 Work on ticket display. we're getting there.
-	
-2000-12-10 23:53  jesse
-
-	* webrt/Admin/Queues/Template.html:
-
-	file Template.html was initially added on branch rt-1-1.
-	
-2000-12-10 23:53  jesse
-
-	* webrt/Admin/Queues/Templates.html:
-
-	file Templates.html was initially added on branch rt-1-1.
-	
-2000-12-10 23:53  jesse
-
-	* webrt/Admin/Elements/QueueTabs:
-
-	file QueueTabs was initially added on branch rt-1-1.
-	
-2000-12-10 23:53  jesse
-
-	* webrt/Admin/Elements/SystemTabs:
-
-	file SystemTabs was initially added on branch rt-1-1.
-	
-2000-12-10 23:53  jesse
-
-	* webrt/Admin/: Global/Scrips.html, Queues/Scrips.html:
-
-	file Scrips.html was initially added on branch rt-1-1.
-	
-2000-12-10 23:53  jesse
-
-	* webrt/Admin/Elements/UserTabs:
-
-	file UserTabs was initially added on branch rt-1-1.
-	
-2000-12-10 23:53  jesse
-
-	* webrt/Admin/: Global/ACL.html, Queues/ACL.html:
-
-	file ACL.html was initially added on branch rt-1-1.
-	
-2000-12-10 23:53  jesse
-
-	* webrt/Admin/Global/index.html:
-
-	file index.html was initially added on branch rt-1-1.
-	
-2000-12-10 23:53  jesse
-
-	* Makefile, webrt/index.html, webrt/Admin/ModifyUser,
-	webrt/Admin/index.html, webrt/Admin/Elements/Header,
-	webrt/Admin/Elements/QueueTabs, webrt/Admin/Elements/SystemTabs,
-	webrt/Admin/Elements/Tabs, webrt/Admin/Elements/UserTabs,
-	webrt/Admin/Global/ACL.html, webrt/Admin/Global/Scrips.html,
-	webrt/Admin/Global/index.html, webrt/Admin/Queues/ACL.html,
-	webrt/Admin/Queues/Modify.html, webrt/Admin/Queues/Scrips.html,
-	webrt/Admin/Queues/Template.html,
-	webrt/Admin/Queues/Templates.html, webrt/Admin/Queues/index.html,
-	webrt/Admin/Users/Modify.html, webrt/Admin/Users/index.html,
-	webrt/Elements/Header, webrt/Elements/Tabs:
-
-	Bunch of work on the web administration framework.
-	Lots of stuff should be much cleaner now.
-	
-2000-12-10 01:21  jesse
-
-	* Makefile:
-
-	Bumped version to 1.3.25 for release
-	
-2000-12-10 01:15  jesse
-
-	* webrt/: Elements/TitleBoxEnd, Elements/TitleBoxStart,
-	SelfService/Elements/MyRequests, SelfService/Elements/Tabs,
-	Ticket/Update.html, User/Prefs.html:
-
-	Work on SSRI and a bit of overall UI tweaking
-	
-2000-12-09 22:48  jesse
-
-	* webrt/SelfService/Elements/Header:
-
-	file Header was initially added on branch rt-1-1.
-	
-2000-12-09 22:48  jesse
-
-	* webrt/SelfService/Elements/: Header, MyRequests, Tabs:
-
-	Missed a couple files for SSRI
-	
-2000-12-09 22:48  jesse
-
-	* webrt/SelfService/Elements/MyRequests:
-
-	file MyRequests was initially added on branch rt-1-1.
-	
-2000-12-09 22:48  jesse
-
-	* webrt/SelfService/Elements/Tabs:
-
-	file Tabs was initially added on branch rt-1-1.
-	
-2000-12-09 22:43  jesse
-
-	* webrt/SelfService/Create.html:
-
-	file Create.html was initially added on branch rt-1-1.
-	
-2000-12-09 22:43  jesse
-
-	* webrt/SelfService/Details.html:
-
-	file Details.html was initially added on branch rt-1-1.
-	
-2000-12-09 22:43  jesse
-
-	* webrt/SelfService/index.html:
-
-	file index.html was initially added on branch rt-1-1.
-	
-2000-12-09 22:43  jesse
-
-	* webrt/SelfService/Closed.html:
-
-	file Closed.html was initially added on branch rt-1-1.
-	
-2000-12-09 22:43  jesse
-
-	* webrt/Elements/SelectNewTicketQueue:
-
-	file SelectNewTicketQueue was initially added on branch rt-1-1.
-	
-2000-12-09 22:43  jesse
-
-	* webrt/Admin/Groups/Members.html:
-
-	file Members.html was initially added on branch rt-1-1.
-	
-2000-12-09 22:43  jesse
-
-	* webrt/Admin/Elements/SelectUsers:
-
-	file SelectUsers was initially added on branch rt-1-1.
-	
-2000-12-09 22:43  jesse
-
-	* lib/RT/CurrentUser.pm, lib/RT/Group.pm, lib/RT/GroupMember.pm,
-	lib/RT/Record.pm, lib/RT/User.pm, lib/RT/Users.pm,
-	webrt/Login.html, webrt/autohandler,
-	webrt/Admin/Elements/SelectModifyGroup,
-	webrt/Admin/Elements/SelectUsers, webrt/Admin/Groups/Members.html,
-	webrt/Admin/Groups/Modify.html, webrt/Admin/Groups/index.html,
-	webrt/Admin/Users/Modify.html, webrt/Admin/Users/index.html,
-	webrt/Elements/Header, webrt/Elements/SelectNewTicketQueue,
-	webrt/SelfService/Closed.html, webrt/SelfService/Create.html,
-	webrt/SelfService/Details.html, webrt/SelfService/index.html,
-	webrt/User/Prefs.html:
-
-	First rev of SSRI, the Self Service Requestor Interface.
-	Did a bunch of work on groups and the admin UI
-	
-2000-12-05 23:24  jesse
-
-	* webrt/Admin/Groups/Modify.html:
-
-	file Modify.html was initially added on branch rt-1-1.
-	
-2000-12-05 23:24  jesse
-
-	* webrt/Admin/Groups/index.html:
-
-	file index.html was initially added on branch rt-1-1.
-	
-2000-12-05 23:24  jesse
-
-	* webrt/Admin/Elements/SelectModifyGroup:
-
-	file SelectModifyGroup was initially added on branch rt-1-1.
-	
-2000-12-05 23:24  jesse
-
-	* lib/RT/Action/NotifyAsComment.pm:
-
-	file NotifyAsComment.pm was initially added on branch rt-1-1.
-	
-2000-12-05 23:24  jesse
-
-	* lib/RT/Group.pm, lib/RT/GroupMembers.pm, lib/RT/Scrip.pm,
-	lib/RT/Action/Notify.pm, lib/RT/Action/NotifyAsComment.pm,
-	lib/RT/Action/SendEmail.pm, tools/insertdata,
-	webrt/Admin/Elements/SelectModifyGroup,
-	webrt/Admin/Groups/Modify.html, webrt/Admin/Groups/index.html,
-	webrt/Admin/Queues/Modify.html, webrt/Admin/Queues/index.html:
-
-	Lots of work on groups. I think the core is basically set.  UI has been started
-	
-	Scrips got even more work and more code. they now work at least as well as
-	they ever have _and_ they now do it for the right reasons.
-	
-2000-12-02 13:44  jesse
-
-	* Makefile:
-
-	
-	fixed a local customization in the makefile
-	
-2000-12-02 13:34  jesse
-
-	* Makefile:
-
-	bumped version to 1.0.6
-	
-2000-12-02 03:22  jesse
-
-	* webrt/Ticket/Link.html:
-
-	file Link.html was initially added on branch rt-1-1.
-	
-2000-12-02 03:22  jesse
-
-	* lib/RT/Scrip.pm, lib/RT/ScripActions.pm, lib/RT/Scrips.pm,
-	webrt/Ticket/Link.html:
-
-	catching some stragglers.
-	
-2000-12-02 03:22  jesse
-
-	* lib/RT/ScripActions.pm:
-
-	file ScripActions.pm was initially added on branch rt-1-1.
-	
-2000-12-02 03:20  jesse
-
-	* webrt/Admin/Elements/SelectScripAction:
-
-	file SelectScripAction was initially added on branch rt-1-1.
-	
-2000-12-02 03:20  jesse
-
-	* webrt/Admin/Elements/SelectScripCondition:
-
-	file SelectScripCondition was initially added on branch rt-1-1.
-	
-2000-12-02 03:20  jesse
-
-	* lib/RT/: Action/Generic.pm, Condition/Generic.pm:
-
-	file Generic.pm was initially added on branch rt-1-1.
-	
-2000-12-02 03:20  jesse
-
-	* lib/RT/Condition/AnyTransaction.pm:
-
-	file AnyTransaction.pm was initially added on branch rt-1-1.
-	
-2000-12-02 03:20  jesse
-
-	* lib/RT/Condition/NewDependency.pm:
-
-	file NewDependency.pm was initially added on branch rt-1-1.
-	
-2000-12-02 03:20  jesse
-
-	* lib/RT/ScripAction.pm:
-
-	file ScripAction.pm was initially added on branch rt-1-1.
-	
-2000-12-02 03:20  jesse
-
-	* lib/RT/ScripCondition.pm:
-
-	file ScripCondition.pm was initially added on branch rt-1-1.
-	
-2000-12-02 03:20  jesse
-
-	* lib/RT/ScripConditions.pm:
-
-	file ScripConditions.pm was initially added on branch rt-1-1.
-	
-2000-12-02 03:20  jesse
-
-	* bin/webmux.pl, docs/design_docs/subscription-definitions.txt,
-	etc/schema.pm, lib/RT/Action.pm, lib/RT/Scrip.pm,
-	lib/RT/ScripAction.pm, lib/RT/ScripCondition.pm,
-	lib/RT/ScripConditions.pm, lib/RT/ScripScope.pm,
-	lib/RT/ScripScopes.pm, lib/RT/Scrips.pm, lib/RT/Transaction.pm,
-	lib/RT/Action/Generic.pm, lib/RT/Action/Notify.pm,
-	lib/RT/Action/OpenDependent.pm, lib/RT/Action/ResolveMembers.pm,
-	lib/RT/Action/SendEmail.pm, lib/RT/Action/SendEmailOnResolve.pm,
-	lib/RT/Action/StallDependent.pm,
-	lib/RT/Condition/AnyTransaction.pm, lib/RT/Condition/Generic.pm,
-	lib/RT/Condition/NewDependency.pm, tools/insertdata,
-	webrt/Admin/Elements/SelectScripAction,
-	webrt/Admin/Elements/SelectScripCondition:
-
-	Major major major work on scrips
-	scrips now specify a 'Stage' which has only one value for now but should be easier to add in other
-	points in the code where they get called
-	
-	What used to be called Scrip got split into ScripCondition and ScripAction
-	
-	ScripScope got renamed 'Scrip', like it should have been from the getgo.
-	
-	Did some work to the scrip mailing routines.All in all, scrips are much
-	cleaner and more flexible. and at least as functional as they were last night.
-	
-	I'll be adjusting the templates as I get to them
-	
-2000-12-01 14:02  jesse
-
-	* NEWS:
-
-	fixed a display bug in how we split messages for the webui
-	
-2000-11-30 02:18  jesse
-
-	* lib/RT/Action/AutoReply.pm, lib/RT/Action/SendEmail.pm,
-	tools/insertdata:
-
-	Working on cleaning up the Scrips system.  The whole templating system
-	was really, really incredibly overdesigned and badly implemented on the first go-round.
-	Over the next few checkins, I'll be cleaning it up and cleaning it out...
-	
-2000-11-29 16:31  jesse
-
-	* bin/testdeps.pl:
-
-	updated apache::session dependency
-	
-2000-11-29 01:32  jesse
-
-	* lib/RT/ACE.pm, lib/RT/ScripScope.pm, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm, lib/RT/User.pm, lib/RT/Action/AutoReply.pm,
-	lib/RT/Action/SendEmail.pm, lib/RT/Interface/Email.pm,
-	webrt/Admin/Elements/SelectScrip,
-	webrt/Admin/Elements/SelectTemplate,
-	webrt/Ticket/Create_Detail.html:
-
-	Work on scrips all around:
-		web ui cleanups
-		Action::SendEmail cleanups
-	
-	work on acls for Ticket creation.
-	now users who only have "CreateTicket" can actually create tickets,
-	even if they can't see the ticket once created.
-	RT1's "allow nonmembers to create requests" can be replicated by
-	granting  the metagroup 'requestors' the right "CreateTicket".
-	
-	Mail gateway got a lot of debugging stubs. mail gateway now uses
-	modern semantics for Create.
-	
-2000-11-28 17:46  jesse
-
-	* lib/RT/User.pm:
-
-	cacheed acl decisions are now properly granular.
-	
-2000-11-28 17:39  jesse
-
-	* lib/RT/User.pm:
-
-	Cached ACL decisions are now expire after 2 minutes.
-	
-2000-11-28 03:37  jesse
-
-	* etc/config.pm, lib/RT/Ticket.pm, webrt/Ticket/Update.html,
-	webrt/Ticket/Elements/ShowReferences,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	fixed a small bug in ticket update.
-	fixed a set of bugs in "external" links that were discovered when my roommate suggested
-	that RT could be used as an mp3 playlist server.  Now it can. no, you really don't want to.
-	At least until we have asset managment.
-	
-2000-11-28 00:20  jesse
-
-	* Makefile, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	lib/RT/Action/SendEmail.pm:
-
-	a couple little tweask to transaction and sendemail.
-	
-	bumped the version #
-	
-2000-11-28 00:12  jesse
-
-	* webrt/Ticket/: Display.html, LinkIt.html, ProcessUpdate.html,
-	Update.html, Elements/ShowSummary, Elements/ShowTransaction,
-	Elements/TicketToolBox:
-
-	Work on cleaning up the web ui. got rid of processupdate.html.
-	cleaned up the code in display.html..  linking is no longer nearly as offensive.
-	
-2000-11-27 20:26  jesse
-
-	* webrt/Ticket/Elements/ShowRequestor:
-
-	small display fix to not show nobody as a possible requestor
-	
-2000-11-27 20:05  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/User.pm, webrt/Ticket/Display.html:
-
-	Updates to how Create handles Requestor, Cc and Admin Cc.
-	it's now much more flexible, cleaner and simpler. yay.
-	
-2000-11-27 04:01  jesse
-
-	* webrt/Elements/: Error, Header, MyRequests:
-
-	Web error reporting tweaks.
-	added MyRequests to the front page
-	
-2000-11-27 04:01  jesse
-
-	* webrt/Elements/MyRequests:
-
-	file MyRequests was initially added on branch rt-1-1.
-	
-2000-11-27 03:30  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Interface/Web.pm,
-	webrt/Ticket/Display.html, webrt/Ticket/Elements/ShowHistory:
-
-	more work on ACLs
-	
-	Ticket.pm has been fully ACLed.
-	Did work on web ticket create.  it's no longer a festering pile of garbage.
-	Now it's more of an office wastepaper basket full of clean white 20lb paper.
-	Seriously, though, it's cleaner. I got rid of some of Tobias' temporary ticket creation
-	code.
-	
-2000-11-26 23:45  jesse
-
-	* lib/RT/ACE.pm, lib/RT/GroupMember.pm, lib/RT/Queue.pm,
-	lib/RT/Queues.pm, lib/RT/Template.pm, lib/RT/Ticket.pm,
-	lib/RT/User.pm, lib/RT/Interface/Web.pm, tools/insertdata,
-	webrt/Admin/Elements/ModifyQueue, webrt/Elements/Header,
-	webrt/Elements/Tabs:
-
-	
-	
-	lots more ACL work.
-	a little bit of UI cleanup.
-	
-2000-11-25 01:56  jesse
-
-	* lib/RT/Tickets.pm, webrt/index.html,
-	webrt/Ticket/Elements/ShowDates:
-
-	made "my requests" doable.
-	fixed some ui in showdates.
-	
-2000-11-24 20:14  jesse
-
-	* lib/RT/: Queue.pm, User.pm:
-
-	Fixed a couple of bugs in HasSystemRight that make RT install correctly again.
-	
-2000-11-24 19:21  jesse
-
-	* etc/schema.pm:
-
-	schema fix to make pg happy
-	
-2000-11-22 03:08  jesse
-
-	* webrt/Ticket/Update.html:
-
-	cleaned up the ticket udpdate form. made it more concise.::
-	
-2000-11-22 03:04  jesse
-
-	* webrt/Ticket/Update.html:
-
-	cleaning up the ticket update form
-	
-2000-11-22 02:49  jesse
-
-	* bin/testdeps.pl:
-
-	bumped searchbuilder dependency to the version now in CPAN...
-	
-2000-11-22 02:31  jesse
-
-	* Makefile, lib/RT/ACE.pm, lib/RT/ACL.pm, lib/RT/Action.pm,
-	lib/RT/Attachment.pm, lib/RT/Attachments.pm, lib/RT/CurrentUser.pm,
-	lib/RT/Date.pm, lib/RT/EasySearch.pm, lib/RT/Group.pm,
-	lib/RT/GroupMember.pm, lib/RT/GroupMembers.pm, lib/RT/Groups.pm,
-	lib/RT/Handle.pm, lib/RT/Link.pm, lib/RT/Links.pm, lib/RT/Queue.pm,
-	lib/RT/Queues.pm, lib/RT/Record.pm, lib/RT/Scrip.pm,
-	lib/RT/ScripScope.pm, lib/RT/ScripScopes.pm, lib/RT/Scrips.pm,
-	lib/RT/Template.pm, lib/RT/Templates.pm, lib/RT/Ticket.pm,
-	lib/RT/Tickets.pm, lib/RT/Transaction.pm, lib/RT/Transactions.pm,
-	lib/RT/User.pm, lib/RT/Users.pm, lib/RT/Utils.pm,
-	lib/RT/Watcher.pm, lib/RT/Watchers.pm:
-
-	Bumped version to 1.3.23
-	Added pod headers to most core modules?
-	
-2000-11-21 23:05  jesse
-
-	* webrt/Ticket/Elements/ShowSummary:
-
-	removed a dead link
-	
-2000-11-21 04:07  jesse
-
-	* Makefile, lib/RT/Queue.pm, lib/RT/Scrip.pm, lib/RT/ScripScope.pm,
-	lib/RT/Transaction.pm, lib/RT/User.pm:
-
-	tmp logfiles now go in /tmp
-	oh. and SCRIPS NOW WORK. RT can send mail.
-	and recieve mail. life is good.
-	
-2000-11-21 02:55  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Implemented Ticket->IsWatcher.
-	This is what we needed to make pseudogroup based ACLs work
-	
-2000-11-21 00:55  jesse
-
-	* lib/RT/Queue.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
-	webrt/Elements/Tabs:
-
-	fixed a couple of bugs while I was out and about.
-	Oh. and most of the rest of the ACL core is implemented now.
-	rights for requestor/owner/cc/admincc should now work.
-	
-2000-11-20 11:59  jesse
-
-	* lib/RT/ACE.pm, lib/RT/User.pm, tools/insertdata:
-
-	Added "Requestor" and "Everyone" metagroups to tools/insertdata
-	
-	Fixed a bug with yet another way to call HasQueueRight.
-	
-2000-11-20 00:39  jesse
-
-	* Makefile:
-
-	bumped to 1.3.22 for release
-	
-2000-11-20 00:24  jesse
-
-	* webrt/Search/Listing.html:
-
-	fixed a big triggered when clearing empty ticket searches
-	
-2000-11-19 23:55  jesse
-
-	* bin/webmux.pl, lib/RT/User.pm:
-
-	fixed a bug that stopped you from specifying an owner on ticket create
-	Watcher and Watchers are now preloaded in the App server.
-	
-2000-11-19 23:20  jesse
-
-	* webrt/Ticket/Elements/Tabs:
-
-	file Tabs was initially added on branch rt-1-1.
-	
-2000-11-19 23:20  jesse
-
-	* webrt/: index.html, Admin/Elements/Tabs, Elements/Header,
-	Elements/Tabs, Search/Listing.html, Search/RestrictSearch.html,
-	Ticket/Create.html, Ticket/Create_Detail.html, Ticket/Display.html,
-	Ticket/EditWatchers.html, Ticket/Modify.html, Ticket/Update.html,
-	Ticket/Elements/Tabs:
-
-	more UI tweaking. yay.
-	
-2000-11-19 17:57  jesse
-
-	* webrt/Elements/Quicksearch:
-
-	file Quicksearch was initially added on branch rt-1-1.
-	
-2000-11-19 17:57  jesse
-
-	* webrt/Elements/MyTickets:
-
-	file MyTickets was initially added on branch rt-1-1.
-	
-2000-11-19 17:57  jesse
-
-	* webrt/rt.jpg:
-
-	file rt.jpg was initially added on branch rt-1-1.
-	
-2000-11-19 17:57  jesse
-
-	* lib/RT/ACE.pm, lib/RT/Ticket.pm, lib/RT/Tickets.pm,
-	lib/RT/Interface/Web.pm, webrt/index.html, webrt/rt.jpg,
-	webrt/Elements/MyTickets, webrt/Elements/Quicksearch,
-	webrt/Search/Listing.html:
-
-	A bunch of UI work. we now have a placeholder logo
-	
-2000-11-18 03:03  jesse
-
-	* lib/RT/: User.pm, Interface/Web.pm:
-
-	ACL  change messages are now properly scoped. so now they don't hang out
-	between sessions
-	
-	if a user has a system right, that right now applies to all queues.
-	
-2000-11-17 00:19  jesse
-
-	* Makefile:
-
-	Rolled rev 1.3.21. now with an ACL editor.
-	
-2000-11-17 00:15  jesse
-
-	* webrt/Admin/Elements/SelectRights:
-
-	file SelectRights was initially added on branch rt-1-1.
-	
-2000-11-17 00:15  jesse
-
-	* lib/RT/ACE.pm, lib/RT/Group.pm, lib/RT/Queue.pm,
-	lib/RT/Template.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
-	lib/RT/Interface/Web.pm, webrt/Admin/Elements/SelectRights:
-
-	Woo! the ACL editor is now much cleaner. and it works. :)
-	
-2000-11-16 01:17  jesse
-
-	* lib/RT/: ACE.pm, ACL.pm, Attachment.pm, Attachments.pm,
-	CurrentUser.pm, EasySearch.pm, Group.pm, GroupMember.pm,
-	GroupMembers.pm, Groups.pm, Link.pm, Links.pm, Queue.pm, Queues.pm,
-	Record.pm, Scrip.pm, ScripScope.pm, ScripScopes.pm, Scrips.pm,
-	Template.pm, Templates.pm, Ticket.pm, Transaction.pm,
-	Transactions.pm, User.pm, Users.pm, Watcher.pm, Watchers.pm,
-	Interface/Web.pm:
-
-	
-	LEANED UP A WHOLE BUNCH OF NEW ROUTINES. FIXED A FREW ACL BUGS.
-	
-2000-11-15 02:29  jesse
-
-	* lib/RT/ACE.pm, lib/RT/ACL.pm, lib/RT/CurrentUser.pm,
-	lib/RT/Queue.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
-	webrt/Admin/Elements/Tabs, webrt/Elements/Submit:
-
-	refactored ACLS to take out a layer of complexity or two.
-	
-2000-11-14 13:17  jesse
-
-	* Makefile:
-
-	bumped the makefuile version
-	
-2000-11-13 23:19  jesse
-
-	* bin/webmux.pl, lib/RT/ACL.pm, lib/RT/EasySearch.pm,
-	lib/RT/Group.pm, lib/RT/GroupMember.pm, lib/RT/Record.pm,
-	lib/RT/User.pm:
-
-	A bunch of refactoring to make ACL editable. Lots of work on the ACL editor.
-	Basic user ACLs are now editable.
-	It needs some more refactoring, since I stopped being on quite as much crack
-	over the wekeend and figured out a much less intense way to do a bunch of stuff. Yay.
-	
-2000-11-08 14:55  jesse
-
-	* Makefile, NEWS:
-
-	all mail sent out is now sent out precedence "bulk" like it should be.
-	
-2000-11-08 01:24  jesse
-
-	* webrt/Admin/Elements/SelectScrip:
-
-	file SelectScrip was initially added on branch rt-1-1.
-	
-2000-11-08 01:24  jesse
-
-	* webrt/Admin/Elements/SelectTemplate:
-
-	file SelectTemplate was initially added on branch rt-1-1.
-	
-2000-11-08 01:24  jesse
-
-	* etc/schema.pm, lib/RT/ACE.pm, lib/RT/ACL.pm,
-	lib/RT/CurrentUser.pm, lib/RT/Group.pm, lib/RT/Ticket.pm,
-	lib/RT/Tickets.pm, lib/RT/Transaction.pm, lib/RT/User.pm,
-	lib/RT/Users.pm, tools/insertdata,
-	webrt/Admin/Elements/SelectScrip,
-	webrt/Admin/Elements/SelectTemplate:
-
-	A whole slew of work on ACLs and assorted other related things.
-	This involved a lot of cleanup of ACL related code and things it touched.
-	ACL decisions are now being made. (Yes, you're all still superusers) but I
-	think I've got a bunch of the infrastructure cleaned up, so it should be
-	easier to finish off the ACL editor. yay!
-	
-	As part of this, I had to add more groups support. all you groups-maniacs should be pleased ;)
-	
-2000-11-06 11:55  jesse
-
-	* Makefile:
-
-	Fixed yet another typo in manipulate.pm.
-	
-	Bumped version to 1.0.5
-	
-2000-11-05 15:24  jesse
-
-	* Makefile:
-
-	A fix for action vs actions in mail manipulate.
-	fixed a typo normailize -> normalize in database/manipulate.pm
-	
-2000-11-03 17:54  jesse
-
-	* README, etc/schema.pm, lib/RT/ACE.pm, lib/RT/ACL.pm,
-	lib/RT/CurrentUser.pm, lib/RT/GroupMember.pm, lib/RT/Queue.pm,
-	lib/RT/Ticket.pm, lib/RT/User.pm, lib/RT/Users.pm,
-	lib/RT/Interface/Email.pm, lib/RT/Interface/Web.pm,
-	tools/insertdata, webrt/Admin/ModifyUser,
-	webrt/Admin/Elements/QueueRightsForUser, webrt/Admin/Elements/Tabs,
-	webrt/Elements/SelectOwner:
-
-	A bunch of work on the ACLs. we're getting closer to having a workable ACL
-	editor.
-	
-2000-11-03 15:37  jesse
-
-	* Makefile, NEWS:
-
-	We now deal better with merging merged tickets.
-	
-	We now properly ignore Precedence: {junk|bulk} headers
-	
-2000-10-31 00:06  jesse
-
-	* lib/RT/: ACE.pm, ScripScope.pm:
-
-	Added ACL support to the ScripScope system.
-	
-2000-10-29 21:31  jesse
-
-	* Makefile, README, bin/webmux.pl, lib/RT/ACE.pm, lib/RT/Group.pm,
-	lib/RT/Groups.pm, lib/RT/Queue.pm, lib/RT/ScripScope.pm,
-	lib/RT/ScripScopes.pm, lib/RT/Scrips.pm, lib/RT/Template.pm,
-	lib/RT/Templates.pm, lib/RT/Transaction.pm, tools/insertdata:
-
-	A bunch of hacking to the ScripScopes system.
-	
-	You can now edit scrips for a given queue.
-	but hey, scrips have no ACL checking yet.
-	
-2000-10-29 17:51  jesse
-
-	* etc/schema.pm:
-
-	Added a whole lot of documentation to schema.pm.
-	
-2000-10-25 21:09  jesse
-
-	* Makefile, bin/testdeps.pl, etc/schema.pm:
-
-	Updated schema.pm and testdeps to jibe with the current CPAN versions of things.
-	And I bumped the version to 1.3.20
-	
-2000-10-23 16:53  jesse
-
-	* Makefile, lib/RT/Date.pm:
-
-	Reverted to using mysql by default.
-	Finished off the postgresql support in the rt core. (well, at least finished the initial support)
-	
-2000-10-23 16:35  jesse
-
-	* Makefile, lib/RT/ACE.pm, lib/RT/Ticket.pm, tools/insertdata:
-
-	Cleanups related to making postgres support work right.
-	
-2000-10-22 20:57  jesse
-
-	* Makefile, bin/initacls.Pg, bin/testdeps.pl, etc/acl.Pg,
-	etc/config.pm, etc/schema.pm, lib/RT/Link.pm, lib/RT/Ticket.pm,
-	lib/RT/Tickets.pm, tools/initdb, tools/insertdata,
-	webrt/Ticket/Display.html:
-
-	merged in ivan's postgres patches.
-	made local ticket links work again. *sigh* SQL evil. eeeeevil.
-	
-2000-10-16 16:32  jesse
-
-	* docs/Security:
-
-	file Security was initially added on branch rt-1-1.
-	
-2000-10-16 16:32  jesse
-
-	* docs/Security:
-
-	some initial notes on security. targetted at RT admins.
-	
-2000-10-16 03:01  jesse
-
-	* lib/RT/: Link.pm, Links.pm, Ticket.pm:
-
-	Fixed a couple of typos in link and links.
-	Ticket->Load will now do the right hting with ticket uris or aliases.
-	
-2000-10-16 00:47  jesse
-
-	* etc/config.pm, lib/RT/Link.pm, lib/RT/Links.pm, lib/RT/Ticket.pm:
-
-	The linking interface now uses URIs internally. and it does lots of
-	sanity checking.
-	
-	Tickets now understand what their uris should be. you can load tickets by
-	uri. and by alias.
-	
-	We need a bit more work to make alias support just transparent, but we're
-	getting really close.
-	
-	You shouldn't be able to link to nonexistent local objects any mroe.
-	
-2000-10-15 01:57  jesse
-
-	* lib/RT/CurrentUser.pm:
-
-	Added CurrentUser->LoadByGecos.
-	The CLI now uses LoadByGecos to load the currentuser.
-	This means that users other than root might actually be able to use the cli now
-	VS: ----------------------------------------------------------------------
-	
-2000-10-15 01:11  jesse
-
-	* Makefile:
-
-	Significantly redid the installation procedure. we're now _much_
-	more careful about what gets installed where and what's owned by whom.
-	
-	Oh. and RT's now setgid, rather than setuid. and there's no setuid wrapper anymore
-	
-2000-10-15 01:08  jesse
-
-	* etc/: config.pm, suidrt.c:
-
-	Yanked suidrt.c, since we now run setgid.
-	
-	rt now logs to /tmp/rt.log.pid.userid
-	
-2000-10-14 02:56  jesse
-
-	* bin/rtmux.pl, bin/webmux.pl, etc/schema.pm,
-	lib/RT/CurrentUser.pm, lib/RT/Interface/Email.pm, tools/initdb,
-	tools/insertdata:
-
-	CurrentUser.pm had LoadByEmail and LoadByUserId methods added and they're now
-	actually used most everywhere.
-	
-	insertdata doesn't force ids for users now.
-	
-	the schema now actually enforces a lot of important uniqueness constraints.
-	
-2000-10-13 10:59  jesse
-
-	* etc/schema.mysql:
-
-	Removed the old schema.mysql, lest it lead people astray
-	
-2000-10-13 02:27  jesse
-
-	* webrt/Ticket/Elements/: EditPeople, ShowMembers:
-
-	Removed some old warning text that's not true any more.
-	Fixed a relative url problem in "show memebers"
-	
-2000-10-12 23:22  jesse
-
-	* Makefile, bin/testdeps.pl:
-
-	updated testdeps.
-	Makefile now defaults to installing rt2 in /opt/rt2
-	
-2000-10-12 22:54  jesse
-
-	* Makefile, lib/RT/ACL.pm, lib/RT/Queue.pm, lib/RT/Ticket.pm,
-	lib/RT/User.pm, lib/RT/Users.pm, tools/insertdata,
-	webrt/index.html:
-
-	A couple of links on the front page.
-	Makefile now assumes www-data instead of nobody as the web user. this is not quite right.
-	
-	Fixed a little bit of the POD in User.pm.
-	
-	Redid how Ticket.pm deals with Owner on create. the new logic should actually catch errors
-	instead of easily letting referential integrity checks just _fail_.
-	
-	Insertdata got cleaned up a little bit.
-	
-	ACL got its cleaned up a bit
-	
-2000-10-11 23:22  jesse
-
-	* webrt/Admin/Elements/QueueRightsForUser:
-
-	file QueueRightsForUser was initially added on branch rt-1-1.
-	
-2000-10-11 23:22  jesse
-
-	* lib/RT/Users.pm, webrt/Admin/Elements/QueueRightsForUser:
-
-	Work on ACLs. and the ACL editor
-	
-2000-10-11 21:23  jesse
-
-	* tools/insertdata:
-
-	gave root a password
-	
-2000-10-11 12:28  jesse
-
-	* Makefile, tools/initdb:
-
-	Databasename changed from RT2 to rt2 to make postgres happier.
-	
-	initdb quoting bug fixed.
-	
-	debug mode in initdb turned off.
-	
-	If you're using mysql and running with ivan's current CVS version of DBIx::DBSchema, RT should once again work.
-	
-2000-10-09 02:32  jesse
-
-	* etc/schema.pm, tools/initdb:
-
-	a debugging hook in initdb and defaults (though they don't work just right yet)
-	in schema.pm. Note that we now need DBIx::DBSchema from CVS.
-	
-2000-10-09 01:59  jesse
-
-	* Makefile, NEWS, etc/suidrt.c:
-
-	Jan Kujawa fixed a bug in the setuid wrapper
-	Jan Okrouhly fixed some bugs in the merged ticket resolution in the cli.
-	
-	Rolled 1.0.5pre3
-	
-2000-10-05 17:30  jesse
-
-	* lib/RT/: ACE.pm, ACL.pm:
-
-	more work on RT's acl core
-	
-2000-10-05 17:30  jesse
-
-	* webrt/Admin/Elements/: GrantQueueRightsTo, GrantQueueRightsTo~,
-	SelectQueueRights:
-
-	more acl work
-	
-2000-10-05 17:30  jesse
-
-	* webrt/Admin/Elements/GrantQueueRightsTo~:
-
-	file GrantQueueRightsTo~ was initially added on branch rt-1-1.
-	
-2000-10-05 17:30  jesse
-
-	* webrt/Admin/Elements/GrantQueueRightsTo:
-
-	file GrantQueueRightsTo was initially added on branch rt-1-1.
-	
-2000-10-05 17:30  jesse
-
-	* webrt/Admin/Elements/SelectQueueRights:
-
-	file SelectQueueRights was initially added on branch rt-1-1.
-	
-2000-10-05 15:49  jesse
-
-	* etc/suidrt.c:
-
-	reordering things in suidrt.c seemed to make them happier.
-	
-2000-10-05 15:39  jesse
-
-	* etc/suidrt.c:
-
-	missed a comma
-	
-2000-10-05 15:03  jesse
-
-	* bin/testdeps.pl:
-
-	added a dependency test script to make installation by newbies easier.
-	
-2000-10-05 15:03  jesse
-
-	* Makefile, README, etc/suidrt.c:
-
-	Major rewrite of suidrt.c by jan kujawa.
-	A couple of bugfixes from Jan Okrouhly
-		Public history should now work right in the cli
-		Web viewing of merged tickets by their old # should now work better.
-	
-2000-10-03 20:22  jesse
-
-	* bin/testdeps.pl:
-
-	cleaned up testedeps.pl output
-	
-2000-10-03 02:41  jesse
-
-	* tools/insertdata:
-
-	file insertdata was initially added on branch rt-1-1.
-	
-2000-10-03 02:41  jesse
-
-	* tools/initdb:
-
-	file initdb was initially added on branch rt-1-1.
-	
-2000-10-03 02:41  jesse
-
-	* etc/schema.pm:
-
-	file schema.pm was initially added on branch rt-1-1.
-	
-2000-10-03 02:41  jesse
-
-	* Makefile, bin/initdb.Oracle, bin/initdb.Pg, bin/initdb.mysql,
-	bin/testdeps.pl, etc/schema.Pg, etc/schema.pm, lib/RT/ACE.pm,
-	lib/RT/Queue.pm, lib/RT/Scrip.pm, lib/RT/User.pm, tools/initdb,
-	tools/insertdata:
-
-	Fairly massive installation changes.
-		We now use ivan's really cool DBIx::DBschema, which, when things
-	settle out a bit mean that the oracle and postgres (and possibly other) ports
-	get their schema updated automatically.
-	
-	The initial seed data is now inserted by tools/insertdata through the RT API.
-	
-	ACE::Create now actually works.
-	Same with Scrip::Create.
-	and Queue::Create.
-	
-	There are a couple of new installation-only dependencies. One of them (DBSchema) may become a build-only
-	dependency if people whine enough :)
-	
-	date/time handling was a casualty of the changes. some things will be handled oddly for now.
-	Once Ivan releases the next DBSchema update, this should get better again. it was
-	the result of a namespace collision between pg and mysql. the timestamp column has
-	different behavior. go fig.
-	
-	This version will require DBIx::SearchBuilder 0.06 (aka what I'm about to check in)
-	
-2000-10-03 02:07  jesse
-
-	* tools/test:
-
-	blew away old, crufty "extras"
-	
-2000-09-28 13:55  jesse
-
-	* lib/RT/Group.pm:
-
-	file Group.pm was initially added on branch rt-1-1.
-	
-2000-09-28 13:55  jesse
-
-	* lib/RT/: Group.pm, GroupMember.pm, GroupMembers.pm, Groups.pm:
-
-	Long overdue adding of completely untested (and unused) code for groups in RT.
-	note that this implementation does not assume recursive group membership
-	
-2000-09-28 13:55  jesse
-
-	* lib/RT/GroupMember.pm:
-
-	file GroupMember.pm was initially added on branch rt-1-1.
-	
-2000-09-28 13:55  jesse
-
-	* lib/RT/GroupMembers.pm:
-
-	file GroupMembers.pm was initially added on branch rt-1-1.
-	
-2000-09-28 13:55  jesse
-
-	* lib/RT/Groups.pm:
-
-	file Groups.pm was initially added on branch rt-1-1.
-	
-2000-09-18 01:57  jesse
-
-	* lib/RT/: ACE.pm, Queue.pm, Ticket.pm:
-
-	Lots of work on Queue.pm  Most cleanups related to queue watchers, but I
-	also added a bit more documentation and fixed a bug that could cause DelWatcher
-	in ticket.pm to delete watchers it shouldn't
-	
-2000-09-18 00:03  jesse
-
-	* docs/API, docs/FAQ, docs/README.oracle, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm:
-
-	More documentation. removed outdated docs.
-	
-	docs/API now talks about what those of you writing your own RT client
-	code shouldn't be doing. (Which objects you shouldn't touch).
-	
-2000-09-18 00:00  jesse
-
-	* README:
-
-	Clarified license terms. RT is available under Version 2 of the GPL.
-	Not version 1. Not some as-yet-unwritten version 3 that says you can only
-	use it if you agree to license your children under the GPL. Version 2.
-	
-2000-09-17 19:57  jesse
-
-	* lib/RT/: TicketCollection.pm, User.pm, Interface/Email.pm:
-
-	Removed bogus signature code.
-	Documented User->IsPassword
-	removed --area flag from Mailgateway (We ain't got no stinking areas)
-	
-2000-09-17 19:21  jesse
-
-	* etc/schema.Oracle, etc/schema.mysql, lib/RT/ACE.pm,
-	lib/RT/ACL.pm, lib/RT/Scrip.pm, lib/RT/User.pm:
-
-	Ugh. Mysql isn't respecting SQL92 reserved words. which meant that I didn't
-	notice that I was using "Type" and "Action" in my schema.
-	This required a bit of churn to the ACE and User modules.
-	
-2000-09-17 17:38  jesse
-
-	* Makefile:
-
-	Ok. I think I've got it now. This is RT 1.3.18. aka RT2 - Alpha 1.
-	        The "Bear Suit" Release.
-	
-	        A formal release announcement is forthcoming.
-	
-2000-09-17 17:29  jesse
-
-	* Makefile:
-
-	work on the changelog generator
-	
-2000-09-17 17:19  jesse
-
-	* HACKING, Makefile, README, bin/initdb.mysql, bin/testdeps.pl:
-
-	Bumped the required version of SearchBuilder in testdeps, now that it's
-	propagated throughout CPAN
-	
-	Replaced initdb.mysql with ivan's new version.
-	
-	Tweaked ivan's initdb.mysql to be a little friendlier, create the schema
-	(it was missing a FILEHANDLE in a print statement and deal
-	better with omitted passwords.
-	
-	Updated the readme some more.
-	
-	Added experimental ChangeLog generation to the make dist process
-	
-	Bumped the version number to 1.3.18 for release as alpha1 for RT2 today.
-	
-2000-09-17 01:40  jesse
-
-	* Makefile, README, bin/initacls.mysql, bin/testdeps.pl,
-	bin/webmux.pl:
-
-	Bumped the Mason version requirement up, so we avoid the poisoned v 0.88
-	Applied ivan's alpha-1 patches.
-	Did some tweaking for the alpha 1 release.
-	Cleaned up the readme a bit
-	
-2000-09-15 01:21  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-2000-09-15 01:17  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	Mail gateway now handles followup correspondence properly
-	(It gets the ticket # right)
-	
-2000-09-15 01:06  jesse
-
-	* lib/RT/Watcher.pm:
-
-	fixed a typo (left off a > ) in Watcher.pm
-	
-2000-09-15 00:59  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Watcher.pm, webrt/Ticket/Modify.html:
-
-	Editing ticket watchers from the webui now works.
-	this required a bunch of work on the internal wathers stuff
-	in ticket.pm.
-	Also added documentation and watcher-related sanity checks
-	
-2000-09-14 00:04  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Watcher.pm,
-	webrt/Elements/SelectWatcherType, webrt/Ticket/Elements/EditPeople,
-	webrt/Ticket/Elements/EditWatchers,
-	webrt/Ticket/Elements/ModifyTicket:
-
-	Some cleanup to Watcher and Ticket. (mainly documentation updates)
-	Added an IsUser sub to Watcher.pm (which tells you if the watcher
-	object refers to a local user or a remote email address)
-	
-	the ui for editing tickets should work now.
-	note that the backend for the watchers side of this isn't there
-	yet.
-	
-	        -j
-	
-2000-09-13 18:10  jesse
-
-	* etc/config.pm:
-
-	fixed a configfile typo that would break a new installation
-	
-2000-09-12 01:28  jesse
-
-	* lib/RT/Date.pm, lib/RT/Ticket.pm, webrt/Elements/ListActions,
-	webrt/Elements/SelectDate, webrt/Elements/SelectUsers,
-	webrt/Elements/SelectWatcherType, webrt/Ticket/Modify.html,
-	webrt/Ticket/Elements/AddWatchers, webrt/Ticket/Elements/EditDates,
-	webrt/Ticket/Elements/EditPeople,
-	webrt/Ticket/Elements/ModifyTicket:
-
-	TimeWorked is now read/write (which may be a bad idea. but I'm willing to try it.
-	RT::Date now better understands that "never" doesn't mean 1970.
-	
-	The web modify interface is getting closer to working.
-	I mainly need to finish making the watchers column go.
-	
-2000-09-11 00:37  jesse
-
-	* etc/config.pm:
-
-	Some sanity cleanups to the web queue listing.
-	
-2000-09-11 00:35  jesse
-
-	* webrt/Ticket/Elements/EditDates:
-
-	file EditDates was initially added on branch rt-1-1.
-	
-2000-09-11 00:35  jesse
-
-	* webrt/Ticket/Elements/EditWatchers:
-
-	file EditWatchers was initially added on branch rt-1-1.
-	
-2000-09-11 00:35  jesse
-
-	* webrt/Ticket/Elements/AddWatchers:
-
-	file AddWatchers was initially added on branch rt-1-1.
-	
-2000-09-11 00:35  jesse
-
-	* webrt/Ticket/Elements/EditBasics:
-
-	file EditBasics was initially added on branch rt-1-1.
-	
-2000-09-11 00:35  jesse
-
-	* webrt/Ticket/Elements/EditPeople:
-
-	file EditPeople was initially added on branch rt-1-1.
-	
-2000-09-11 00:35  jesse
-
-	* webrt/Ticket/Elements/ModifyTicket:
-
-	file ModifyTicket was initially added on branch rt-1-1.
-	
-2000-09-11 00:35  jesse
-
-	* webrt/: Login.html, webrt.css, Elements/SelectDate,
-	Elements/SelectMatch, Elements/SelectQueue, Elements/SelectUsers,
-	Elements/ShadedBox, Ticket/EditWatchers.html, Ticket/Modify.html,
-	Ticket/Elements/AddWatchers, Ticket/Elements/EditBasics,
-	Ticket/Elements/EditDates, Ticket/Elements/EditPeople,
-	Ticket/Elements/EditWatcherList, Ticket/Elements/EditWatchers,
-	Ticket/Elements/ModifyTicket, Ticket/Elements/ShowBasics,
-	Ticket/Elements/ShowDates, Ticket/Elements/ShowDependencies,
-	Ticket/Elements/ShowHistory, Ticket/Elements/ShowPeople,
-	Ticket/Elements/ShowSummary, Ticket/Elements/TicketToolBox:
-
-	Lots and lots of work on the webui.
-	The display UI has been cleaned up a bit and the modify UI has been started.
-	It's not in its final for yet, nor is there any logic backing many of the new ui features, but those will come next.
-	
-	If I'm remebering my list correctly, this is the one "biggie" before Alpha 1.
-	
-	Yay!
-	
-2000-09-11 00:35  jesse
-
-	* webrt/Elements/SelectUsers:
-
-	file SelectUsers was initially added on branch rt-1-1.
-	
-2000-09-07 00:52  jesse
-
-	* webrt/: Login.html, autohandler, Ticket/Elements/ShowSummary:
-
-	Replaced tobias' web arg preservation code with something that's actually based on _mason_ rather than the external apache object. This should make the fastcgi port easier
-	
-	Fixed a bug in showsummary (unqualified WebPath)
-	
-2000-09-07 00:30  jesse
-
-	* Makefile, bin/rtmux.pl, lib/RT/Handle.pm:
-
-	Look ma! it should install again (i'd flubbed a bit of the
-	fastcgi mason handler install.
-	
-	Oh. and oracle support should work now.
-	
-2000-09-06 00:52  jesse
-
-	* webrt/Logout.html:
-
-	Logout.html links you to the right place now
-	
-2000-09-05 23:47  jesse
-
-	* webrt/Search/Listing.html:
-
-	YA typo fix
-	
-2000-09-05 23:45  jesse
-
-	* webrt/Search/Listing.html:
-
-	Damn I wish I could type tonight. :/ missed an $RT::
-	
-2000-09-05 23:43  jesse
-
-	* webrt/: Search/Listing.html, Ticket/Elements/ShowSummary:
-
-	Fixed a few more Absolute url bugs
-	
-2000-09-05 23:35  jesse
-
-	* webrt/Elements/Tabs:
-
-	Tabs needed / as the final character for transparent proxying
-	
-2000-09-05 22:39  jesse
-
-	* webrt/: Login.html, Admin/Elements/CreateUserCalled,
-	Admin/Elements/ModifyQueue, Admin/Elements/ModifyTemplate,
-	Admin/Elements/ModifyUser, Admin/Users/index.html:
-
-	more work on proper absolute pathing
-	
-2000-09-05 22:08  jesse
-
-	* webrt/: Login.html, Admin/Elements/CreateQueueCalled,
-	Admin/Elements/CreateUserCalled, Admin/Elements/ModifyUser,
-	Admin/Users/index.html:
-
-	A bunch of the admin tools weren't properly dealing with absolute pathed requests. it made it impossible to have RT2 anywhere other than at the / of your webserver
-	
-2000-09-05 21:40  jesse
-
-	* lib/RT/Handle.pm:
-
-	file Handle.pm was initially added on branch rt-1-1.
-	
-2000-09-05 21:40  jesse
-
-	* bin/mason_handler.fcgi:
-
-	file mason_handler.fcgi was initially added on branch rt-1-1.
-	
-2000-09-05 21:40  jesse
-
-	* Makefile, bin/mason_handler.fcgi, bin/testdeps.pl,
-	lib/RT/Handle.pm:
-
-	Updated testdeps to ask for the new version of mailtools
-	Added in the new fastcgi handler (not working yet)
-	and RT::Handle, which is a wrapper for SearchBuilder::Handle
-	
-2000-09-04 22:52  jesse
-
-	* Makefile, TODO, bin/rtmux.pl, bin/webmux.pl, etc/config.pm,
-	lib/RT/Record.pm, lib/RT/User.pm, lib/RT/Interface/Web.pm,
-	webrt/Ticket/Display.html, webrt/Ticket/Elements/ShowRequestor,
-	webrt/Ticket/Elements/TicketToolBox:
-
-	A couple of bugfixes related to the switch to SearchBuilder.
-	A few webui cleanups.
-	A bit of abstraction to make the eventual fastcgi port easier.
-	
-2000-09-04 12:48  jesse
-
-	* bin/testdeps.pl, lib/RT/Attachments.pm, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm, lib/RT/Watcher.pm, lib/RT/Watchers.pm,
-	lib/RT/Interface/Web.pm, webrt/Ticket/Elements/ShowDates:
-
-	Several batched updates from when pallas was off-net
-	
-	UpdateTold changed to SetTold.
-	A bunch of work to get Scrips working.
-	Lots more POD in Ticket.pm
-	Transaction->Describe  is better about printing what really happened.
-	Attachments.pm had a typo that prevented it from dealing with multipart messages.
-	
-2000-08-31 02:18  jesse
-
-	* Makefile, NEWS, etc/suidrt.c:
-
-	Added ENV squashing to suidrt.c
-	
-2000-08-30 14:46  jesse
-
-	* bin/rtmux.pl:
-
-	Rolling in some oracle changes...they're not done yet, but nothing should
-	break with mysql. fixed a typo in rtmux.pl that was introduced with the switch to searchbuilder.
-	
-2000-08-29 17:02  jesse
-
-	* README, bin/rtmux.pl, bin/testdeps.pl, bin/webmux.pl,
-	lib/RT/EasySearch.pm, lib/RT/Record.pm:
-
-	MAJOR CHANGE: Switched to the new name of the DBIx:: modules.
-	We now use DBIx::SearchBuilder rather than DBIx::EasySearch and friends.
-	Note that this is only a name and structure change for the module set.
-	The functionality is the same...though seperating out oracle and mysql
-	specific features comes soon.
-	
-2000-08-29 16:57  jesse
-
-	* etc/schema.Oracle:
-
-	updated the schema.Oracle
-	
-2000-08-29 02:02  jesse
-
-	* webrt/: Elements/SelectWatcherType, Ticket/EditWatchers.html,
-	Ticket/Update.html:
-
-	Started hacking on watchers and ticket update webui a bit.
-	they need a lot more work
-	
-2000-08-29 01:51  jesse
-
-	* webrt/Ticket/: Display.html, DisplayHistory, DisplayTransaction,
-	Elements/ShowHistory, Elements/ShowTransaction:
-
-	Made FullHeaders/BriefHeaders work in the webui
-	
-2000-08-28 01:46  jesse
-
-	* webrt/Admin/Elements/: CreateUserCalled, ModifyUser:
-
-	Fixed some display buglets from tobi oetiker
-	
-2000-08-28 01:31  jesse
-
-	* webrt/Ticket/Update.html:
-
-	Removed some text that harassed the user. that's generally bad policy
-	
-2000-08-27 23:56  jesse
-
-	* webrt/: Admin/Elements/Header, Admin/Elements/ModifyTemplate,
-	Admin/Elements/Tabs, Elements/ListActions, Elements/Tabs:
-
-	A few more added helper elements from the webui
-	
-2000-08-27 23:56  jesse
-
-	* webrt/Admin/Elements/Header:
-
-	file Header was initially added on branch rt-1-1.
-	
-2000-08-27 23:56  jesse
-
-	* webrt/: Admin/Elements/Tabs, Elements/Tabs:
-
-	file Tabs was initially added on branch rt-1-1.
-	
-2000-08-27 23:56  jesse
-
-	* webrt/Admin/Elements/ModifyTemplate:
-
-	file ModifyTemplate was initially added on branch rt-1-1.
-	
-2000-08-27 23:56  jesse
-
-	* webrt/Elements/ListActions:
-
-	file ListActions was initially added on branch rt-1-1.
-	
-2000-08-27 23:54  jesse
-
-	* webrt/Admin/Users/Prefs.html:
-
-	file Prefs.html was initially added on branch rt-1-1.
-	
-2000-08-27 23:54  jesse
-
-	* webrt/Admin/: Queues/Create.html, Users/Create.html:
-
-	file Create.html was initially added on branch rt-1-1.
-	
-2000-08-27 23:54  jesse
-
-	* webrt/Admin/: Queues/Modify.html, Users/Modify.html:
-
-	file Modify.html was initially added on branch rt-1-1.
-	
-2000-08-27 23:54  jesse
-
-	* webrt/Admin/: Queues/index.html, Users/index.html:
-
-	file index.html was initially added on branch rt-1-1.
-	
-2000-08-27 23:54  jesse
-
-	* bin/webmux.pl, lib/RT/Area.pm, lib/RT/Areas.pm, lib/RT/Queue.pm,
-	lib/RT/ScripScopes.pm, lib/RT/Template.pm, lib/RT/Templates.pm,
-	webrt/Admin/CreateQueue.html, webrt/Admin/CreateUser.html,
-	webrt/Admin/EditUser.html, webrt/Admin/ModifyQueue.html,
-	webrt/Admin/ModifyUser.html, webrt/Admin/index.html,
-	webrt/Admin/Elements/CreateQueueCalled,
-	webrt/Admin/Elements/CreateUserCalled,
-	webrt/Admin/Elements/ModifyQueue, webrt/Admin/Elements/ModifyUser,
-	webrt/Admin/Elements/SelectModifyQueue,
-	webrt/Admin/Elements/SelectModifyUser,
-	webrt/Admin/Queues/Create.html, webrt/Admin/Queues/Modify.html,
-	webrt/Admin/Queues/index.html, webrt/Admin/Users/Create.html,
-	webrt/Admin/Users/Modify.html, webrt/Admin/Users/Prefs.html,
-	webrt/Admin/Users/index.html:
-
-	Lots of work on the web admin ui. basic user and queue editing working.
-	and template editing
-	
-2000-08-24 15:53  jesse
-
-	* Makefile, README, bin/rtmux.pl, etc/config.pm,
-	lib/RT/Action/SendEmail.pm, webrt/Elements/Footer,
-	webrt/Elements/Header, webrt/Elements/ViewUser,
-	webrt/Ticket/Elements/EditWatcherList:
-
-	The first cut at better configuration.
-	
-	Updated the readme
-	
-	Made the mail send routine in lib/RT/Action/Email.pm somewhat
-	more configurable (though we're still using printing to a pipe
-	because Mail::Mailer is busted :/)
-	
-	Most options moved out of the makefile..this will make packaging
-	possible.
-	
-	Fixed a couple places where tobias had been using a non-relative
-	url unnecessarily.
-	
-2000-08-22 03:08  jesse
-
-	* Makefile:
-
-	Getting version #s in sync for RT 1.3.15
-	
-2000-08-22 03:05  jesse
-
-	* lib/RT/: Scrip.pm, Transaction.pm, Action/AutoReply.pm,
-	Action/SendEmail.pm:
-
-	Work on making sure mail gets sent. It's not "right" yet but it's getting
-	closer.
-	
-2000-08-21 19:46  jesse
-
-	* webrt/autohandler:
-
-	Fixed a minor issue that let people "log in as ''"
-	
-2000-08-21 01:12  jesse
-
-	* bin/rtmux.pl, etc/config.pm, lib/RT/Ticket.pm, lib/RT/Tickets.pm:
-
-	Set a default type in ticket.pm
-	allowed restriction based on type in tickets.pm
-	
-	now set the timezone in the config file rather than the rtmux.
-	means it effects webmux.pl too.
-	
-2000-08-20 23:41  jesse
-
-	* etc/schema.mysql, lib/RT/Date.pm, webrt/Elements/SelectOwner:
-
-	Standardized StartsBy to Starts.
-	Removed a warning from SelectOwner
-	Fixed a bug in RT::Date->Set(Format => 'unknown')
-	
-2000-08-20 01:46  jesse
-
-	* lib/RT/Ticket.pm, webrt/Search/Listing.html,
-	webrt/Ticket/Elements/ShowMemberOf,
-	webrt/Ticket/Elements/ShowMembers:
-
-	Work on MemberOf and Members in Ticket.pm
-	they're both now Tickets objects rather than links objects.
-	and the things that use them have been updated
-	
-2000-08-19 03:03  jesse
-
-	* Makefile:
-
-	Bumped the version 1.3.14
-	
-2000-08-19 02:49  jesse
-
-	* README, etc/config.pm, lib/RT/Ticket.pm:
-
-	Did some work on logging. switched some carping to some logging.
-	
-2000-08-18 02:04  jesse
-
-	* Makefile, README:
-
-	Minor readme updates.
-	
-	Bumped the version to 1.3.13
-	
-2000-08-18 01:04  jesse
-
-	* lib/RT/Transaction.pm:
-
-	CurrentUser objects act on things. not user Objects.  Thanks, Jens
-	
-2000-08-17 23:55  jesse
-
-	* webrt/Elements/: SelectOwner, Submit:
-
-	notes in select owner. a bit of tweaking in submit ot make it more visible
-	
-2000-08-17 16:16  jesse
-
-	* Makefile:
-
-	Changes to rt-mailgate to properly respect authenticated users
-	when performing %RT RESOLVE commands.
-	
-2000-08-17 03:01  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Missed a checkin on Web.pm. sorry about that
-	
-2000-08-17 02:53  jesse
-
-	* bin/webmux.pl, lib/RT/Database.pm, lib/RT/Date.pm,
-	lib/RT/Ticket.pm, lib/RT/Interface/Web.pm:
-
-	Yanked the ancient lib/RT/Database.pm. It  never served any purpose
-	added some functionality to RT::Date. it can now take a date type
-	of 'unknown.'  This will "require" Date::Manip and parse it into
-	an ISO style date.  note that this should NEVER be called from RT's
-	core due to overhead. It is useful from web interfaces and CLI tools....
-	
-	added date::manip as a requirement to webmux.pl (so it gets loaded before
-	client hits)
-	
-	cleaned up Interface/Web.pm
-	
-	rationalized some of the routines dealing with date stuff in ticket.pm.
-	
-	Actual working web date changing should be coming "soon." (where soon is
-	defined as sometime this week)
-	
-2000-08-16 14:46  jesse
-
-	* webrt/Elements/Submit:
-
-	file Submit was initially added on branch rt-1-1.
-	
-2000-08-16 14:46  jesse
-
-	* webrt/: Login.html, index.html, Elements/Footer, Elements/Header,
-	Elements/Submit, Ticket/Elements/ShowBasics,
-	Ticket/Elements/ShowTransaction:
-
-	Various bits of webui cleanup
-	
-2000-08-16 14:16  jesse
-
-	* lib/RT/: Tickets.pm, Interface/Email.pm:
-
-	We can now search for tickets by relationship
-	
-2000-08-16 13:18  jesse
-
-	* lib/RT/CurrentUser.pm:
-
-	the real oneline patch that should make rt-mailgate work for new users again.
-	
-2000-08-15 01:17  jesse
-
-	* lib/RT/: Tickets.pm, Interface/Web.pm:
-
-	The first round of convenience methods in RT/Tickets.pm
-	Still need to do the ticket relations methods and the
-	date methods
-	
-2000-08-14 23:47  jesse
-
-	* webrt/Elements/SelectDateType:
-
-	file SelectDateType was initially added on branch rt-1-1.
-	
-2000-08-14 23:47  jesse
-
-	* webrt/Elements/SelectDateType:
-
-	ack. missed this in the wackiness with tonight's earlier checkin.
-	
-2000-08-14 19:35  jesse
-
-	* webrt/: Elements/Header, Elements/SelectDate,
-	Elements/SelectQueue, Elements/TitleBoxStart, Search/Listing.html,
-	Search/PickRestriction:
-
-	The rest of the previous commit.
-	
-2000-08-14 19:27  jesse
-
-	* etc/config.pm, webrt/Login.html, webrt/Logout.html,
-	webrt/autohandler, webrt/index.html, webrt/webrt.css,
-	webrt/Ticket/autohandler, webrt/Ticket/Elements/ShowMemberOf,
-	webrt/Ticket/Elements/ShowMembers,
-	webrt/Ticket/Elements/ShowSummary,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Cleaned up the ticket display a bit.
-	made logout actually properly erase session data
-	protected _everything_ with an autohandler in /
-	prettified Login.html
-	added some options to /Elements/TitleBoxHead...which seems to have been missed
-	
-2000-08-14 14:37  jesse
-
-	* README:
-
-	Added a warning about postmaster from JD
-	
-2000-08-13 21:57  jesse
-
-	* lib/RT/TicketCollection.pm, lib/RT/Tickets.pm,
-	lib/RT/Interface/Web.pm, webrt/Elements/SelectBoolean,
-	webrt/Elements/SelectDate, webrt/Elements/SelectMatch,
-	webrt/Elements/SelectOwner, webrt/Elements/SelectQueue,
-	webrt/Elements/SelectStatus, webrt/Elements/SelectWatcherType,
-	webrt/Search/Listing.html, webrt/Search/PickRestriction,
-	webrt/Search/TicketCell:
-
-	Significant work on the search and display code.
-	I'm not convinced that this doesn't introduce new bugs.
-	However, you can now search by ticket content.
-	
-	I will be reworking Tickets.pm a bit more to add a bunch of convenience methods
-	over then next week or so.
-	
-2000-08-12 18:07  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Fixed a bug in WatchersAsString. (RT::Watchers wasn't required early enough)
-	this whole routine needs to be redone :/
-	
-2000-08-12 18:06  jesse
-
-	* lib/RT/User.pm:
-
-	User->Create CanManipulate now defaults to 0.
-	
-2000-08-12 18:05  jesse
-
-	* etc/schema.mysql:
-
-	Updated the default user entries in schema.mysql to have the "CanManipulate"
-	flag set so they'd show up in owner lists.
-	
-2000-08-10 19:16  jesse
-
-	* README:
-
-	updated instructions for Apache install
-	
-2000-08-10 18:59  jesse
-
-	* etc/schema.mysql:
-
-	the queue values for the first queue were wrong
-	
-2000-08-10 17:55  jesse
-
-	* lib/RT/Ticket.pm:
-
-	BUGFIX: _UpdateTold now doesn't record a transaction, as things should be
-	
-2000-08-10 15:43  jesse
-
-	* etc/config.pm, etc/schema.Oracle, etc/schema.mysql,
-	lib/RT/Attachment.pm, lib/RT/Record.pm, lib/RT/Scrip.pm,
-	lib/RT/ScripScope.pm, lib/RT/Ticket.pm, lib/RT/TicketCollection.pm,
-	lib/RT/Tickets.pm, lib/RT/Transaction.pm, lib/RT/User.pm,
-	lib/RT/Action/AutoReply.pm, lib/RT/Action/Notify.pm,
-	lib/RT/Action/SendEmail.pm, lib/RT/Interface/Web.pm,
-	webrt/autohandler, webrt/Elements/Error,
-	webrt/Elements/SelectStatus, webrt/Ticket/Update.html,
-	webrt/Ticket/Elements/ShowBasics,
-	webrt/Ticket/Elements/ShowDependencies,
-	webrt/Ticket/Elements/ShowMemberOf,
-	webrt/Ticket/Elements/ShowMembers,
-	webrt/Ticket/Elements/ShowPeople,
-	webrt/Ticket/Elements/ShowReferences,
-	webrt/Ticket/Elements/ShowRequestor,
-	webrt/Ticket/Elements/TicketToolBox:
-
-	Fixed ACL caching bugs
-	Finished adding status "new"
-	cli searching based on status works better.
-	
-	API Change. Queue is NO LONGER the Queue Object for a ticket
-	API Change. Owner is NO LONGER the Owner Object for a ticket
-	
-	instead, both point to their proper database values and OwnerObj and QueueObj
-	do the right thing throughout. This was rather more code churn than I was hoping for, but we've now got a cleaner, more consistent API that's easier to work
-	with.
-	
-	little bits of POD update.
-	
-	Cleaned out some unused code.
-	
-	Made some error messages more professional.
-	
-	We now keep track of date started as well as a "start by" date.  these both
-	need a bit more work.
-	
-	Calling convention for _Set changed. Rather than three different calling
-	conventions which weren't very extensible, DBIx::Record::_Set and all its
-	subclasses now use paramhash style calling. it's much more extensible and
-	flexible now. (This was necessary for some ACL work, among other things)
-	
-2000-08-09 01:11  jesse
-
-	* lib/RT/Record.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
-	webrt/Elements/SelectStatus, webrt/Elements/dayMenu,
-	webrt/Elements/monthMenu, webrt/Elements/yearMenu:
-
-	ACL Decisions are now cached
-	date menus have a "never" option in the webui
-	added a new status. "new" for tickets that aren't yet open
-	
-2000-08-08 01:45  jesse
-
-	* etc/schema.mysql, lib/RT/Queue.pm:
-
-	schema updates.
-	fixed queue->Create
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/ModifyQueue.html:
-
-	file ModifyQueue.html was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/: CreateQueue.html, CreateUser.html,
-	ModifyQueue.html, ModifyUser.html, index.html,
-	Elements/CreateQueueCalled, Elements/CreateUserCalled,
-	Elements/ModifyQueue, Elements/ModifyUser,
-	Elements/SelectModifyQueue, Elements/SelectModifyUser:
-
-	Started the new web admin interface.
-	it can now edit queues and users and create queues and users
-	I'm fairly leery of its user handling stuff. particularly passwords
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/CreateUser.html:
-
-	file CreateUser.html was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/Elements/SelectModifyUser:
-
-	file SelectModifyUser was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/Elements/ModifyUser:
-
-	file ModifyUser was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/Elements/CreateUserCalled:
-
-	file CreateUserCalled was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/ModifyUser.html:
-
-	file ModifyUser.html was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/index.html:
-
-	file index.html was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/CreateQueue.html:
-
-	file CreateQueue.html was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/Elements/ModifyQueue:
-
-	file ModifyQueue was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/Elements/SelectModifyQueue:
-
-	file SelectModifyQueue was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/Elements/CreateQueueCalled:
-
-	file CreateQueueCalled was initially added on branch rt-1-1.
-	
-2000-08-07 22:28  jesse
-
-	* etc/schema.mysql, lib/RT/Date.pm, lib/RT/Ticket.pm,
-	lib/RT/Users.pm:
-
-	added a few ticket attributes for forwards compatibility
-	fixed another ACL problem in users.pm
-	fixed a date display bug
-	
-2000-08-07 01:03  jesse
-
-	* lib/RT/Transaction.pm, webrt/Ticket/Create.html,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Transaction.pm had some lingering ACL bugs ($CurrentUser) isn't a reasonable
-	global in core library routines :/
-	
-	Working on spawning subtickets.
-	
-2000-08-07 00:31  jesse
-
-	* webrt/User/Prefs.html:
-
-	file Prefs.html was initially added on branch rt-1-1.
-	
-2000-08-07 00:31  jesse
-
-	* webrt/Ticket/Elements/ShowDependencies:
-
-	file ShowDependencies was initially added on branch rt-1-1.
-	
-2000-08-07 00:31  jesse
-
-	* webrt/Ticket/Elements/ShowReferences:
-
-	file ShowReferences was initially added on branch rt-1-1.
-	
-2000-08-07 00:31  jesse
-
-	* webrt/Ticket/Elements/ShowMembers:
-
-	file ShowMembers was initially added on branch rt-1-1.
-	
-2000-08-07 00:31  jesse
-
-	* webrt/Ticket/Elements/ShowMemberOf:
-
-	file ShowMemberOf was initially added on branch rt-1-1.
-	
-2000-08-07 00:31  jesse
-
-	* webrt/Admin/EditUser.html:
-
-	file EditUser.html was initially added on branch rt-1-1.
-	
-2000-08-07 00:31  jesse
-
-	* webrt/Admin/Elements/EditUserComments:
-
-	file EditUserComments was initially added on branch rt-1-1.
-	
-2000-08-07 00:31  jesse
-
-	* etc/config.pm, lib/RT/Ticket.pm, webrt/EditUserComments.html,
-	webrt/ViewUser.html, webrt/webrt.css, webrt/Admin/EditUser.html,
-	webrt/Admin/ModifyUser, webrt/Admin/Elements/EditUserComments,
-	webrt/Elements/Error, webrt/Elements/Header,
-	webrt/Elements/SelectOwner, webrt/Ticket/Create.html,
-	webrt/Ticket/Create_Detail.html, webrt/Ticket/Display.html,
-	webrt/Ticket/Elements/EditWatcherList,
-	webrt/Ticket/Elements/ShowDependencies,
-	webrt/Ticket/Elements/ShowMemberOf,
-	webrt/Ticket/Elements/ShowMembers,
-	webrt/Ticket/Elements/ShowPeople,
-	webrt/Ticket/Elements/ShowReferences,
-	webrt/Ticket/Elements/ShowSummary, webrt/User/Prefs.html:
-
-	Did a bunch of work on the webui. cleaned up a lot of the link display stuff
-	did some work on ticket create
-	
-	dependencies and subtickets are now listed in the ticketview. yay!
-	
-2000-08-05 19:47  jesse
-
-	* lib/RT/Ticket.pm, webrt/Ticket/Elements/ShowSummary:
-
-	more Nobody fixes in Ticket.pm
-	justification fixes in ShowSummary
-	
-2000-08-05 18:50  jesse
-
-	* webrt/Ticket/ProcessUpdate.html:
-
-	The webui can now process updates.
-	it needed YA currentuser fix
-	
-2000-08-05 18:43  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Ticket::Create(Owner =>  now takes either a user object or a userid.
-	and defaults to nobody.
-	
-2000-08-05 17:51  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-2000-08-05 17:49  jesse
-
-	* lib/RT/: Date.pm, Interface/Email.pm:
-
-	fixed a few more bugs in the mailgateway. it can create tickets now.
-	fixed an undefined default in the cli query
-	made the date routine not spit out a stupid warning
-	
-2000-08-05 17:21  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	fixed typos in the mailgate. thanks gary
-	
-2000-08-05 00:16  jesse
-
-	* Makefile, NEWS, webrt/Login.html, webrt/autohandler,
-	webrt/webrt.css:
-
-	little tweaks to the webui.
-	bumped the version to 1.3.11 for distribution
-	
-2000-08-04 18:45  jesse
-
-	* README, bin/rtmux.pl, bin/webmux.pl, lib/RT/Areas.pm,
-	lib/RT/Attachments.pm, lib/RT/Date.pm, lib/RT/Link.pm,
-	lib/RT/Links.pm, lib/RT/Queue.pm, lib/RT/Queues.pm,
-	lib/RT/Record.pm, lib/RT/ScripScopes.pm, lib/RT/Scrips.pm,
-	lib/RT/Template.pm, lib/RT/Ticket.pm, lib/RT/Tickets.pm,
-	lib/RT/Transaction.pm, lib/RT/Transactions.pm, lib/RT/Users.pm,
-	lib/RT/Watchers.pm, lib/RT/Interface/Web.pm,
-	webrt/Admin/ModifyUser, webrt/Elements/SelectOwner,
-	webrt/Elements/SelectQueue, webrt/Elements/ViewUser,
-	webrt/Ticket/Display.html, webrt/Ticket/LinkIt.html,
-	webrt/Ticket/Elements/ShowPeople:
-
-	When creating an object, you ALWAYS need to pass in the current user
-	or acls break. we were a bit too lax about this before.
-	
-	this was a major round of bugfixing for the webui
-	
-2000-08-04 15:41  jesse
-
-	* Makefile, lib/RT/CurrentUser.pm, lib/RT/User.pm, webrt/webrt.css,
-	webrt/Elements/Header, webrt/Search/Listing.html,
-	webrt/Search/autohandler, webrt/Ticket/autohandler:
-
-	Queue listing doesn't have that ugly blue any more. And its code for
-	setting row color is a bit cleaner.
-	
-	we now actually _check_ passwords for web logins.
-	
-	webrt.css now has slightly darker hyperlinks.
-	
-	CurrentUser->IsPassword now uses the UserObj
-	
-	users can't use null passwords for authentication.
-	
-2000-08-03 02:19  jesse
-
-	* lib/RT/Interface/Web.pm, webrt/Elements/ShadedBox,
-	webrt/Elements/TitleBoxStart:
-
-	misc fixes to the webui and a leftover fix to the cli.
-	
-	the webui needs to have some of its internals gutted and
-	put back together. it feels very kludgy and not really "planned"
-	
-2000-08-03 02:04  jesse
-
-	* lib/RT/: Record.pm, Scrip.pm, Ticket.pm, Tickets.pm,
-	Transaction.pm, Action/SendEmail.pm:
-
-	made status changes work. (RT::Action::SendEmail was being stupid
-	and not error checking until it was too late)
-	
-	removed more use of hardwired SQL "now()"
-	
-	moved the handling of LastUpdated into RT::Record. from DBIx::Record
-	
-2000-08-03 01:09  jesse
-
-	* lib/RT/Queue.pm:
-
-	fixed a bug in the cli that kept ticket creates from working.
-	queue->hasright's calling convention changed.
-	
-2000-08-03 00:59  jesse
-
-	* Makefile:
-
-	fixed a makefile typo. added back the comment about pg
-	
-2000-08-03 00:42  jesse
-
-	* docs/design_docs/users:
-
-	file users was initially added on branch rt-1-1.
-	
-2000-08-03 00:42  jesse
-
-	* etc/user.Oracle:
-
-	file user.Oracle was initially added on branch rt-1-1.
-	
-2000-08-03 00:42  jesse
-
-	* etc/schema.Oracle:
-
-	file schema.Oracle was initially added on branch rt-1-1.
-	
-2000-08-03 00:42  jesse
-
-	* bin/initacls.Oracle, bin/initdb.Oracle, docs/README.oracle,
-	docs/design_docs/users, etc/schema.Oracle, etc/user.Oracle:
-
-	A first cut at oracle support from Dave Morgan <dmorgan@bartertrust.com>.
-	It is pretty much untested and guaranteed to break. Among other
-	things, the schema isn't current. but it's a start.
-	Thanks, Dave!
-	
-2000-08-03 00:42  jesse
-
-	* docs/README.oracle:
-
-	file README.oracle was initially added on branch rt-1-1.
-	
-2000-08-03 00:42  jesse
-
-	* bin/initacls.Oracle:
-
-	file initacls.Oracle was initially added on branch rt-1-1.
-	
-2000-08-03 00:42  jesse
-
-	* bin/initdb.Oracle:
-
-	file initdb.Oracle was initially added on branch rt-1-1.
-	
-2000-08-03 00:31  jesse
-
-	* docs/design_docs/local_hacking:
-
-	file local_hacking was initially added on branch rt-1-1.
-	
-2000-08-03 00:31  jesse
-
-	* HACKING, Makefile, docs/FAQ.html, docs/actions.html,
-	docs/admin.html, docs/attributes.html, docs/outline.html,
-	docs/rt_users_guide.html, docs/design_docs/local_hacking:
-
-	doc updates. removed outdated 1.x docs
-	
-2000-08-02 23:53  jesse
-
-	* etc/config.pm:
-
-	added some comments from tobias
-	
-2000-08-02 00:20  jesse
-
-	* Makefile, NEWS, TODO, etc/config.pm, etc/schema.mysql,
-	lib/RT/ACE.pm, lib/RT/ACL.pm, lib/RT/CurrentUser.pm,
-	lib/RT/Date.pm, lib/RT/Queue.pm, lib/RT/Record.pm,
-	lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/User.pm,
-	lib/RT/Interface/Email.pm:
-
-	
-	Weekend of 1 Aug 2000
-	---------------------
-	I spent the weekend in DC visiting family.   This meant I got a bit of
-	code written ;)  Sadly, I have no access to the CVS server,
-	so I'll be batching a bunch of commits.
-	
-	1. Enabled CLI admin tool
-	2. Added ACL listing functionality to the CLI admin tool.
-	3. Enhanced RT::Queue->Grant such that it works with the structure of RT2
-	   ACLs
-	4. Made the Logging framework actually log errors to STDERR.
-	   (This makes debugging the CLI tools much easier. It also means
-	    that the cli tools explain _why_ they're dying.)
-	5. Fully expunged use of Mysql's SQL keyword "now()". I'd have left this
-	   stuff in, except mysql doesn't seem to deal well with the idea that the
-	   entire world isn't one timezone.  On top of that, it doesn't seem to
-	   have a way to force it into GMT mode that doesn't involve modifying init
-	   scripts. *sigh*
-	6. Did a whole bunch more work on the ACL checking in RT::User
-	7. Wrote up some preliminary docs on local hacks to RT
-	8. Added in a routine to allow local canonicalization of email addresses
-	9. Added in the concept of "Disabled users"  To preserve RT2's database
-	   Integrity, whacking user accounts would be a bad thing. So, instead,
-	   we've got the concept of 'disabled' users. A disabled user fails ANY
-	   ACL check, ANY password check and doesn't appear in any lists of ACLs.
-	   (note that the lastmost statement isn't yet true)
-	
-	10. rtadmin user -enable and rtadmin user -disable now work.
-	11. ACLs are now enforced for many ticket related actions.
-	    (this does mean that you'll want to insert some acls like those below)
-	
-	INSERT INTO ACL VALUES (1,0,'User','SuperUser','Queue',0);
-	INSERT INTO ACL VALUES (2,3,'User','CreateTicket','Queue',0);
-	INSERT INTO ACL VALUES (3,3,'User','ShowTicket','Ticket',0);
-	INSERT INTO ACL VALUES (4,3,'User','ShowTicketHistory','Ticket',0);
-	INSERT INTO ACL VALUES (6,3,'User','CreateTicket','Queue',1);
-	INSERT INTO ACL VALUES (7,3,'User','ModifyTicket','Ticket',1);
-	INSERT INTO ACL VALUES (8,1,'User','Superuser','System',0);
-	INSERT INTO ACL VALUES (9,0,'Everyone','Superuser','System',0);
-	
-2000-08-02 00:17  jesse
-
-	* bin/: rtmux.pl, testdeps.pl:
-
-	Bumped us up to requiring Log::Dispatch 1.6.
-	Cleaned up testdeps a bit. Now, you knwo it passes.
-	
-2000-07-27 03:01  jesse
-
-	* Makefile:
-
-	Bumped the version to 1.3.9
-	Rolled RT 1.3.9
-	
-2000-07-27 02:37  jesse
-
-	* lib/RT/Date.pm, lib/RT/Ticket.pm, webrt/Elements/ViewUser,
-	webrt/Ticket/Elements/ShowDates, webrt/Ticket/Elements/ShowSummary,
-	webrt/Ticket/Elements/ShowTransaction, bin/webmux.pl:
-
-	Fixed a bug with null due dates.
-	Made RT/Date deal with a time of -1 as "Never"
-	made html escaping on included entities on webrt default.
-	
-2000-07-27 02:01  jesse
-
-	* lib/RT/Date.pm:
-
-	file Date.pm was initially added on branch rt-1-1.
-	
-2000-07-27 02:01  jesse
-
-	* README, lib/RT/Date.pm, lib/RT/Record.pm, lib/RT/Ticket.pm,
-	bin/testdeps.pl:
-
-	Moved Date managment routines from DBIx::Record to RT::Record.
-	Initial Checkin of RT::Date, a lightweight Date object capable
-	of doing everything RT needs. Oh. and it's fully documented in POD.
-	
-	Converted RT::Record and RT::Ticket and the cli to use RT::Date instead
-	of Date::Kronos.  The CLI now feels _much_ zippier and code within
-	RT::Ticket is a bit easier to read.
-	
-2000-07-27 01:55  jesse
-
-	* etc/schema.mysql:
-
-	removed extraneous whitespace
-	
-2000-07-27 01:51  jesse
-
-	* lib/RT/Attachment.pm:
-
-	changed the header on attachment.pm
-	
-2000-07-24 10:17  tobiasb
-
-	* lib/RT/Interface/Web.pm, webrt/ViewUser.html,
-	webrt/Search/TicketCell, webrt/Ticket/Display.html,
-	webrt/Ticket/ProcessUpdate.html, webrt/Ticket/Update.html:
-
-	Moved some things to Web.pm, made some nifty options for getting tickets from the listing in a new window
-	
-2000-07-24 06:56  tobiasb
-
-	* lib/RT/User.pm:
-
-	Some TODOs
-	
-2000-07-24 06:54  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	Some comments and TODOs.
-	
-	I fixed one simple TODO about putting in pid + rand into the name of
-	the temp directory needed for parsing the mime entity.
-	
-2000-07-24 00:52  jesse
-
-	* lib/RT/User.pm:
-
-	Added a few comments where they really should be
-	
-2000-07-24 00:48  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	Did a bunch of cleanup work on Interface/Email.pm
-		It could still use more.
-	
-2000-07-23 03:50  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Added the method 'TimeWorkedAsString'.  Ok, I'll start looking into Date::Kronos shortly :)
-	
-2000-07-22 20:10  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	[no log message]
-	
-2000-07-22 20:05  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	Inserted a reference to [fsck 290] in a TODO-comment.
-	
-2000-07-22 13:06  tobiasb
-
-	* lib/RT/Interface/Web.pm, webrt/Search/Listing.html:
-
-	Moved stuff from Listing.html to Web.pm, sub ProcessSearchQuery (suggestions to a better name for the sub?)
-	
-2000-07-21 15:11  tobiasb
-
-	* lib/RT/Ticket.pm, lib/RT/Interface/Web.pm,
-	webrt/Search/Listing.html:
-
-	bugfixing
-	
-2000-07-21 11:09  tobiasb
-
-	* etc/schema.mysql:
-
-	Bugfix
-	
-2000-07-21 10:57  tobiasb
-
-	* webrt/index.html:
-
-	Now it's possible to select queue from the start page
-	
-2000-07-21 10:35  tobiasb
-
-	* lib/RT/Attachment.pm, lib/RT/Ticket.pm, webrt/Elements/Header,
-	webrt/Elements/SelectOwner, webrt/Ticket/Elements/EditWatcherList:
-
-	bugfixes, comments.  I restricted the Owner-list to those that CanManipulate - this should eventually go away when we have proper access control.  Tiny improvement of EditWatcherList - it's now possible to edit user information if the user is found.
-	
-2000-07-21 05:48  tobiasb
-
-	* lib/RT/CurrentUser.pm:
-
-	bugfix
-	
-2000-07-21 00:08  jesse
-
-	* lib/RT/ACE.pm, lib/RT/Attachment.pm, lib/RT/Queue.pm,
-	lib/RT/Ticket.pm, lib/RT/User.pm, webrt/EditUserComments.html:
-
-	Cleaned up language in EditUserComments
-	
-	did work on watchers in ui/cli/admin and Ticket.pm and User.pm
-	cleaned up code in Ticket.pm
-	
-	Start of some work on acls in Queue.pm
-	
-2000-07-20 22:13  tobiasb
-
-	* lib/RT/Interface/Web.pm, webrt/Elements/SelectWatcherType,
-	webrt/Ticket/Display.html, webrt/Ticket/EditWatchers.html,
-	webrt/Ticket/Elements/EditWatcherList,
-	webrt/Ticket/Elements/ShowHistory, webrt/Ticket/Elements/ShowLinks,
-	webrt/Ticket/Elements/TicketToolBox:
-
-	Some code improvements, added one popular demand here; to avoid spending too much time clicking around, it should be possible to show all histoies of member requests at the same page.
-	
-2000-07-20 18:31  tobiasb
-
-	* lib/RT/CurrentUser.pm:
-
-	Fixing a bit.  Please try to remember to test code before committing
-	it :)
-	
-2000-07-20 18:09  tobiasb
-
-	* webrt/Ticket/ProcessUpdate.html:
-
-	once more I've committed without testing..
-	
-2000-07-20 18:02  tobiasb
-
-	* lib/RT/CurrentUser.pm:
-
-	Removed a compile-time bug
-	
-2000-07-20 17:48  tobiasb
-
-	* lib/RT/User.pm:
-
-	bugfix
-	
-2000-07-20 17:39  tobiasb
-
-	* etc/config.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
-	lib/RT/Watcher.pm, lib/RT/Interface/Web.pm,
-	webrt/Ticket/Display.html:
-
-	bugfixes + conflict resolving at the signature + moved something to Web.pm from Display.html
-	
-2000-07-20 17:31  jesse
-
-	* lib/RT/: CurrentUser.pm, User.pm:
-
-	Culled some not-for-now signature stuff.
-	Cleaned up and optimised CurrentUser->UserObj
-	
-2000-07-20 16:39  jesse
-
-	* Makefile, NEWS:
-
-	doing some work for a customer.  rt-mailgate --help should tell you
-	about the fabulous new mail mode
-	
-2000-07-20 15:39  tobiasb
-
-	* lib/RT/Interface/Web.pm, webrt/Ticket/Display.html:
-
-	moving things from the template to Web.pm was not as straight-forwarded as I had hoped.
-	
-2000-07-20 15:20  tobiasb
-
-	* lib/RT/Attachment.pm, lib/RT/CurrentUser.pm, lib/RT/User.pm,
-	lib/RT/Interface/Web.pm, webrt/Ticket/Display.html:
-
-	Started moving stuff to Web.pm, fixed and tested signatures
-	
-2000-07-20 14:50  tobiasb
-
-	* lib/RT/: CurrentUser.pm, User.pm:
-
-	moved signature from currentuser to user (but does it make sense, anyway?  Signatures is something 'personal' that belongs only to the current user?)
-	
-2000-07-20 14:43  tobiasb
-
-	* webrt/ViewUser.html:
-
-	bugfix ... hmpf, always test before committing .. always test before committing ...
-	
-2000-07-20 14:33  tobiasb
-
-	* lib/RT/Interface/Web.pm, webrt/ViewUser.html:
-
-	bugfix
-	
-2000-07-20 14:11  tobiasb
-
-	* lib/RT/Interface/Web.pm:
-
-	file Web.pm was initially added on branch rt-1-1.
-	
-2000-07-20 14:11  tobiasb
-
-	* lib/RT/Interface/Web.pm:
-
-	I'm considering to move things from Display.html and ProcessUpdate.html to Web.pm.  Comments?
-	
-2000-07-20 14:06  jesse
-
-	* lib/RT/Watcher.pm:
-
-	Removed the bogus code frol lib/RT/Watcher.pm
-	
-2000-07-20 13:39  jesse
-
-	* lib/RT/User.pm:
-
-	reversed some bogus code
-	
-2000-07-20 11:44  tobiasb
-
-	* webrt/Ticket/Elements/EditWatcherList:
-
-	file EditWatcherList was initially added on branch rt-1-1.
-	
-2000-07-20 11:44  tobiasb
-
-	* webrt/Elements/SelectWatcherType:
-
-	file SelectWatcherType was initially added on branch rt-1-1.
-	
-2000-07-20 11:44  tobiasb
-
-	* webrt/: Elements/SelectWatcherType,
-	Ticket/Elements/EditWatcherList:
-
-	Now it's possible to edit ticket and queue watchers.  It's really horrible, but at least it works
-	
-2000-07-20 11:43  tobiasb
-
-	* webrt/Ticket/: EditWatchers.html, Update.html:
-
-	Small comment
-	
-2000-07-20 11:40  tobiasb
-
-	* webrt/Ticket/Update.html:
-
-	Linked in the 'edit watchers' functionality
-	
-2000-07-20 11:27  tobiasb
-
-	* lib/RT/Ticket.pm, lib/RT/Watcher.pm,
-	webrt/Ticket/EditWatchers.html:
-
-	Now it's possible to edit ticket and queue watchers.  It's really horrible, but at least it works
-	
-2000-07-20 11:27  tobiasb
-
-	* lib/RT/User.pm:
-
-	bugfix
-	
-2000-07-20 11:23  tobiasb
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	This is sort of a local hack, I guess it should be separated ... but maybe not.  if content-type =~ /^text/(?\!plain)/, there is now a link for 'view this as plain text', which might be useful for unknown text formats and for viewing 'code'
-	
-2000-07-20 02:59  jesse
-
-	* lib/RT/: ACE.pm, ACL.pm:
-
-	I'm committing ACE.pm and ACL.pm so people can get a bit of a taste of what I'm doing. They don't work, they probably don't even compile yet, but they're not getting called from the rest of the code yet.
-	
-	These aren't the droids you're looking for.
-	
-2000-07-20 02:58  jesse
-
-	* lib/RT/User.pm:
-
-	updated User.pm to match the schema
-	
-2000-07-19 16:45  tobiasb
-
-	* webrt/Ticket/EditWatchers.html:
-
-	file EditWatchers.html was initially added on branch rt-1-1.
-	
-2000-07-19 16:45  tobiasb
-
-	* webrt/Ticket/EditWatchers.html:
-
-	This should be a template for adding and removing watchers; will be completed tomorrow
-	
-2000-07-19 16:10  tobiasb
-
-	* webrt/: Logout.html, ViewUser.html, Search/Listing.html,
-	Ticket/Display.html, Ticket/Update.html,
-	Ticket/Elements/ShowPeople, Ticket/Elements/ShowSummary:
-
-	It's now possible to edit user data (realname, userid, email) from the web ui
-	
-2000-07-19 16:04  tobiasb
-
-	* lib/RT/: CurrentUser.pm, Ticket.pm, Watcher.pm,
-	Interface/Email.pm:
-
-	Worked a bit with requestors; 1) if we already have a user object at the requestor, we should use it.  2) it should be possible to edit the users email without also updating the watcher email if those are the same.  3) if a user enters an email with a different from address, but can be identified as a previous user (by equal real name or other means of authentication), the email field in the watcher table should be used
-	
-2000-07-19 10:06  tobiasb
-
-	* webrt/Elements/Header:
-
-	bugfixing
-	
-2000-07-19 08:53  tobiasb
-
-	* webrt/webrt.css:
-
-	Our web designer didn't like red table borders
-	
-2000-07-19 08:52  tobiasb
-
-	* webrt/: Elements/Header, Search/Listing.html:
-
-	Fun #440: Popular wish: Fixed alternating colours at the lines in Listing.html
-	
-2000-07-19 07:41  tobiasb
-
-	* webrt/webrt.css:
-
-	oddline for use in Listing.html
-	
-2000-07-19 06:54  tobiasb
-
-	* webrt/Elements/Header:
-
-	nicer
-	
-2000-07-19 06:51  tobiasb
-
-	* webrt/: index.html, Elements/Header:
-
-	Fun #666; Form 'view bug #xxx' from display and the front page
-	
-2000-07-18 04:17  tobiasb
-
-	* etc/schema.mysql:
-
-	bug #286; two nines in schema.sql
-	
-2000-07-14 11:40  tobiasb
-
-	* webrt/Search/TicketCell:
-
-	I'm currently trying to fix it so that each user can put in options in the session information (or should it rather be in the DB?) about whether they want tickets to pop up in separate windows or not.
-	
-2000-07-14 10:47  tobiasb
-
-	* etc/schema.mysql, lib/RT/Link.pm, lib/RT/Ticket.pm,
-	lib/RT/Action/StallDependent.pm,
-	webrt/Ticket/Elements/TicketToolBox:
-
-	added a scrip for stalling members upon membership linking ... now it's impossible for a request to make a link to itself ... now it's possible to open a request from the ticket display
-	
-2000-07-14 09:29  tobiasb
-
-	* webrt/Ticket/ProcessUpdate.html:
-
-	TODO: Public comments are currently beeing threated as private
-	comments (that's better than it beeing ignored ... at least at the
-	moment)
-	
-	Now it skips trying to build a MIME entity if there are no message.
-	
-2000-07-14 09:11  tobiasb
-
-	* webrt/ViewUser.html:
-
-	Bugfix
-	
-2000-07-14 09:09  tobiasb
-
-	* webrt/Search/Listing.html:
-
-	Killed a warning
-	
-2000-07-13 13:31  tobiasb
-
-	* webrt/index.html:
-
-	Typo
-	
-2000-07-13 11:44  tobiasb
-
-	* webrt/Elements/Header:
-
-	huh?  seems like I've lost the control of CVS a bit today :)
-	
-2000-07-13 11:43  tobiasb
-
-	* webrt/Elements/Header:
-
-	[no log message]
-	
-2000-07-13 11:36  jesse
-
-	* webrt/index.html:
-
-	tobix missed a &>
-	
-2000-07-13 11:08  tobiasb
-
-	* webrt/: Search/RestrictSearch.html, Ticket/Display.html,
-	Ticket/ProcessUpdate.html, Ticket/Update.html:
-
-	Dealt with the footer; it does not need overriding anywhere, and is thus placed in the autohandler
-	
-2000-07-13 11:04  tobiasb
-
-	* webrt/: Logout.html, ViewUser.html, autohandler, index.html,
-	Elements/Header, Search/Listing.html, Ticket/Modify.html,
-	Ticket/ValidateUpdate.html:
-
-	Dealt with the header module; it's now in the .html templates, not in autohandler ... the title should be nice and informative in all the templates ... and the instance name is viewed along with the header
-	
-2000-07-13 07:26  tobiasb
-
-	* lib/RT/Link.pm, lib/RT/Ticket.pm, webrt/index.html,
-	webrt/Elements/SelectResultsPerPage, webrt/Search/Listing.html,
-	webrt/Search/PickRestriction:
-
-	small bugfix + better handling of LimitResultsOnPage
-	
-2000-07-12 14:09  tobiasb
-
-	* lib/RT/: Ticket.pm, Transaction.pm:
-
-	bugfix'es.  duplicated linking actions are now turned down.
-	
-2000-07-12 01:39  jesse
-
-	* etc/schema.mysql:
-
-	updated the schema for User objects. now they've got _even more_ data.
-	and better extension capabilities.
-	
-2000-07-12 00:10  tobiasb
-
-	* lib/RT/Attachment.pm, lib/RT/Scrip.pm, lib/RT/ScripScope.pm,
-	lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	lib/RT/Action/SendEmail.pm, lib/RT/Action/StallDependent.pm,
-	webrt/Elements/SelectResultsPerPage, webrt/Elements/ViewUser,
-	webrt/Ticket/Create.html, webrt/Ticket/Elements/ShowTransaction:
-
-	Debugged a bit and removed some critical bugs
-	
-2000-07-11 14:43  tobiasb
-
-	* webrt/Elements/ViewUser:
-
-		<% $User->Comments || "No comment entered about this user" |h %>
-	
-	"|h" seems like some random noise, or have I misunderstood something?
-	
-2000-07-11 12:19  tobiasb
-
-	* etc/schema.mysql:
-
-	Comments
-	
-2000-07-11 11:30  tobiasb
-
-	* lib/RT/Transaction.pm, lib/RT/Action/AutoReply.pm,
-	webrt/Logout.html, webrt/ViewUser.html:
-
-	more debug logging + some bugfixing (exception handling)
-	
-2000-07-10 20:09  jesse
-
-	* bin/testdeps.pl, etc/schema.mysql, lib/RT/Ticket.pm:
-
-	work on ACLs. some acl decisions are now made.
-	
-2000-07-10 17:13  jesse
-
-	* etc/schema.mysql, lib/RT/ACL.pm, lib/RT/CurrentUser.pm,
-	lib/RT/Queue.pm, lib/RT/Record.pm, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm, lib/RT/User.pm, lib/RT/Interface/Email.pm,
-	webrt/Ticket/Display.html:
-
-	Wow. all kinds of work.
-	
-	Beginning of implementation of ACLs. lots of code cleanup.
-	
-	schema changes for Groups and Acls.
-	
-	we now use MIMEObj EVERYWHERE instead of MIMEEntity.
-	
-2000-06-29 20:36  jesse
-
-	* Makefile:
-
-	bumped to 1.0.4pre2
-	fixed perms issue for lib/templates
-	
-2000-06-29 16:11  jesse
-
-	* Makefile, etc/schema:
-
-	makefile fixes. bump to 1.0.4pre1
-	schema.mysql has a longer phone number field
-	
-2000-06-26 15:35  jesse
-
-	* README:
-
-	[no log message]
-	
-2000-06-26 15:10  jesse
-
-	* Makefile, bin/rtmux.pl, bin/testdeps.pl:
-
-	added Date::Manip to testdeps.pl
-	set $ENV{'TZ'} in bin/rtmux.pl to deal with a bug in Date::Manip
-	bumped the version to 1.3.8
-	
-2000-06-26 14:38  jesse
-
-	* bin/testdeps.pl:
-
-	added Date::Kronos to testdeps.pl
-	
-2000-06-26 14:36  jesse
-
-	* bin/testdeps.pl:
-
-	added Time::Seconds to testdeps.pl
-	
-2000-06-26 14:31  jesse
-
-	* bin/testdeps.pl, webrt/autohandler, webrt/webrt.css,
-	webrt/Elements/ViewUser, webrt/Ticket/Elements/ShowTransaction:
-
-	various hacking for RTCon pilsen. a much enhanced testdeps.pl
-	
-2000-06-16 10:51  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	some commentary.
-	
-2000-06-16 08:57  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	Sort of a bugfix
-	
-2000-06-16 08:56  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	Removed some old garbage
-	
-	TODO: Fix message trailer
-	
-2000-06-16 04:37  tobiasb
-
-	* lib/RT/: Attachment.pm, Record.pm, Ticket.pm, Transaction.pm:
-
-	It's no longer mandatory to have a Creator in every RT table.  It's just to set them 'read/auto'-accessible.  This should fix bug #275
-	
-2000-06-15 16:43  tobiasb
-
-	* etc/config.pm, lib/RT/Attachment.pm, lib/RT/Link.pm,
-	lib/RT/Ticket.pm, webrt/Elements/MessageBox,
-	webrt/Ticket/Display.html, webrt/Ticket/LinkIt.html,
-	webrt/Ticket/ProcessUpdate.html, webrt/Ticket/Update.html,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	some few bugfixes + some work to get 'reply-linking' working.  In my local version of RT (only changes in the config.pm) people can now enter a 'FAQ-tag', and the right article from KB is automaticly inserted in the reply.
-	
-2000-06-15 12:22  tobiasb
-
-	* webrt/ViewUser.html:
-
-	file ViewUser.html was initially added on branch rt-1-1.
-	
-2000-06-15 12:22  tobiasb
-
-	* lib/RT/Attachment.pm, lib/RT/CurrentUser.pm, lib/RT/Ticket.pm,
-	lib/RT/User.pm, lib/RT/Interface/Email.pm, webrt/ViewUser.html,
-	webrt/autohandler, webrt/Elements/Error, webrt/Elements/Footer,
-	webrt/Elements/Header, webrt/Elements/ViewUser,
-	webrt/Ticket/ProcessUpdate.html, webrt/Ticket/Update.html,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	lots of bugfixes and some enhancements:
-	- signature in replies
-	- Creator, LastUpdated etc. should be updated in User.pm
-	- The message headers of inbound requests is now decoded ... this is
-	  some sort of a hack as it discards charset information in the header.
-	  Anyway, in those cases where the header data will be in the same charset
-	  as the body, this works out nicely.
-	- I'm allowing a user to see what data is stored at him.  We might need ACLs
-	  for the user comment.  Also, this one is placed directly on the root, so
-	  it will break if the user is not logged in.  Also, the page and the module
-	  is 'ViewUser', 'ShowUser' would be more consistent.
-	- Prettified the ShowTransaction header
-	
-2000-06-15 09:02  tobiasb
-
-	* etc/schema.mysql:
-
-	Added "Signature" to the Users table and worked a bit at the comments
-	
-2000-06-14 09:24  tobiasb
-
-	* lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	webrt/Ticket/Display.html, webrt/Ticket/Elements/TicketToolBox:
-
-	Tons of minor bugfixes and enhancements
-	
-2000-06-14 09:19  tobiasb
-
-	* etc/schema.mysql:
-
-	Added this:
-	
-	##TODO: Get Notify.pm to support OldOwner + fix a template
-	#INSERT INTO Scrips VALUES (20, 'NotifyOldOwnerOnSteal',
-	#			  'Sends mail to the old owner when the ticket is stolen',
-	#			  'Steal','Notify',10,'OldOwner',1,NULL,1,NULL);
-	
-2000-06-14 06:54  tobiasb
-
-	* etc/schema.mysql, lib/RT/Attachment.pm, lib/RT/Record.pm,
-	lib/RT/Ticket.pm, webrt/Ticket/Display.html,
-	webrt/Ticket/Elements/ShowDates:
-
-	minor enhancements and bugfixes
-	
-2000-06-14 03:30  tobiasb
-
-	* etc/schema.mysql:
-
-	I just noticed that Jesse already had a 'resolution' attribute in the ticket.  I guess that covers the same as my 'state' attribute
-	
-2000-06-14 00:12  tobiasb
-
-	* lib/RT/Attachment.pm, webrt/Elements/ViewUser,
-	webrt/Search/Listing.html, webrt/Search/PickRestriction,
-	webrt/Ticket/Elements/ShowDates:
-
-	Some enhancements and bugfixes
-	
-2000-06-13 23:26  tobiasb
-
-	* webrt/Ticket/Elements/ShowDates:
-
-	improved
-	
-2000-06-13 20:42  tobiasb
-
-	* etc/schema.mysql:
-
-	Bugfix
-	
-2000-06-13 15:53  tobiasb
-
-	* lib/RT/TicketCollection.pm, webrt/Search/Listing.html:
-
-	Trying to get search on requestor to work - unsuccessful so far :/
-	
-2000-06-13 10:23  tobiasb
-
-	* webrt/: autohandler, Ticket/Display.html,
-	Ticket/Elements/TicketToolBox:
-
-	Some bugfixes
-	
-2000-06-13 06:41  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Bugfix
-	
-2000-06-09 14:43  tobiasb
-
-	* webrt/EditUserComments.html:
-
-	Hm, aaaalways check if everything is working before committing.  Argh.
-	
-2000-06-09 14:30  tobiasb
-
-	* webrt/: EditUserComments.html, autohandler, Elements/Error,
-	Elements/ViewUser:
-
-	added a minimum interface for editing comments about users
-	
-2000-06-09 12:53  tobiasb
-
-	* webrt/Ticket/Elements/ShowRequestor:
-
-	file ShowRequestor was initially added on branch rt-1-1.
-	
-2000-06-09 12:53  tobiasb
-
-	* webrt/Elements/ViewUser:
-
-	file ViewUser was initially added on branch rt-1-1.
-	
-2000-06-09 12:53  tobiasb
-
-	* webrt/EditUserComments.html:
-
-	file EditUserComments.html was initially added on branch rt-1-1.
-	
-2000-06-09 12:53  tobiasb
-
-	* etc/schema.mysql, lib/RT/Ticket.pm, lib/RT/User.pm,
-	lib/RT/Users.pm, lib/RT/Watcher.pm, lib/RT/Interface/Email.pm,
-	webrt/EditUserComments.html, webrt/Elements/ViewUser,
-	webrt/Ticket/ProcessUpdate.html, webrt/Ticket/Elements/ShowPeople,
-	webrt/Ticket/Elements/ShowRequestor,
-	webrt/Ticket/Elements/ShowSummary:
-
-	added a large section in the ticket view for earlier requests (stubbed) by the same requestor and comments about the requestor (the interface for editing those comments are stubbed)
-	
-2000-06-09 04:32  tobiasb
-
-	* etc/schema.mysql:
-
-	Added "Lang" to the users table
-	
-2000-06-08 10:17  tobiasb
-
-	* etc/config.pm, etc/schema.mysql, lib/RT/Ticket.pm,
-	webrt/Elements/SelectMatch, webrt/Ticket/Display.html,
-	webrt/Ticket/Elements/TicketToolBox:
-
-	Added 'UpdateTold' sub to Tickets.  Some minor bugfixes and enhancements.  Not much testing done.
-	
-2000-06-08 08:19  tobiasb
-
-	* lib/RT/Ticket.pm, lib/RT/Transaction.pm, lib/RT/Watcher.pm,
-	lib/RT/Action/SendEmail.pm, lib/RT/Interface/Email.pm,
-	webrt/Ticket/Update.html:
-
-	A bit of debugging, and I managed to remove some annoying warnings
-	
-2000-06-08 08:10  tobiasb
-
-	* etc/schema.mysql:
-
-	bugfix
-	
-2000-06-08 07:59  tobiasb
-
-	* etc/schema.mysql:
-
-	Removed the area in one template.
-	
-2000-06-08 07:55  tobiasb
-
-	* etc/schema.mysql:
-
-	# I think it might make sense replacing "TIMESTAMP" with "DATETIME"
-	# for mysql.  Yes, indeed, I'll do that right away.
-	
-2000-06-08 06:53  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Removed some redundant lines.
-	
-2000-06-08 06:38  tobiasb
-
-	* etc/schema.mysql:
-
-	Inserted table AlternateEmails (commented out as for now).
-	
-	One bugfix (typo) in the ACL table.
-	
-2000-06-08 06:31  tobiasb
-
-	* etc/schema.mysql:
-
-	Grouped into folders
-	
-2000-06-08 05:47  tobiasb
-
-	* lib/RT/Attachment.pm, lib/RT/Ticket.pm, webrt/Login.html,
-	webrt/Search/Listing.html, webrt/Ticket/ProcessUpdate.html,
-	webrt/Ticket/Elements/ShowTransaction,
-	webrt/Ticket/Elements/TicketToolBox:
-
-	bugfixes + improvements requested from the support team; kill & take link from the front page, table borders in listing, reduced header printing ...
-	
-2000-06-07 16:15  tobiasb
-
-	* lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	webrt/Elements/MessageBox, webrt/Ticket/Elements/ShowTransaction:
-
-	bugfixes
-	
-2000-06-07 15:46  tobiasb
-
-	* etc/schema.mysql:
-
-	bugfix
-	
-2000-06-07 15:42  tobiasb
-
-	* lib/RT/: Ticket.pm, Transaction.pm:
-
-	bugfixes
-	
-2000-06-07 15:22  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Now, if some Record decendant can _Accessible('Created', auto) and _Accessible('LastUpdated', auto), they will be set automaticly (at least, that's the theory)
-	
-2000-06-07 14:16  tobiasb
-
-	* etc/schema.mysql:
-
-	mysql autosets the first TIMESTAMP in the table on every
-	update/insert.
-	
-2000-06-07 12:33  tobiasb
-
-	* webrt/autohandler:
-
-	The error handling here seems to work now ... but only for documents
-	at the root.  I thought those autohandlers were called recursively?
-	
-2000-06-07 12:12  tobiasb
-
-	* etc/config.pm, lib/RT/Record.pm, lib/RT/Ticket.pm:
-
-	working with those pesky dates
-	
-2000-06-07 11:51  tobiasb
-
-	* bin/webmux.pl:
-
-	bugfix
-	
-2000-06-07 08:37  tobiasb
-
-	* README:
-
-	Added Date::Kronos (not on CPAN yet) to README
-	
-2000-06-07 08:17  tobiasb
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	Different Comment and Reply links.  They link to the same page, but the default
-	action is changed.
-	
-2000-06-07 07:36  tobiasb
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	Now it doesn't display looooong text/plain attachments.
-	
-	We have a lot of ~1M text/plain attachments in our RT queue.
-	
-	I'm trying to hack my webrt.cgi to show attachments upon a
-	"PickUpTransaction" parameter.  I don't know how to do it in the
-	mason/mod_perl model.
-	
-2000-06-07 04:09  tobiasb
-
-	* webrt/Elements/MessageBox:
-
-	bugfix
-	
-2000-06-06 18:44  jesse
-
-	* etc/schema.mysql:
-
-	removed an outdated table
-	
-2000-06-06 15:42  jesse
-
-	* webrt/Login.html:
-
-	changed the name of the mason package to RT::Mason, so it didn't conflict with other instances
-	on the same webserver
-	
-	fixed a couple of Log::Dispatch(warn)s to (warning)s
-	
-	removed tobix' weird session crunching code that was messign me up
-	
-2000-06-06 15:42  jesse
-
-	* etc/config.pm, lib/RT/Ticket.pm:
-
-	changed the name of the mason package to RT::Mason, so it didn't conflict with other instances
-	on the same webserver
-	
-	fixed a couple of Log::Dispatch(warn)s to (warning)s
-	
-2000-06-06 15:41  jesse
-
-	* bin/webmux.pl:
-
-	changed the name of the mason package to RT::Mason, so it didn't conflict with other instances
-	on the same webserver
-	
-	f
-	
-2000-06-06 15:41  jesse
-
-	* README:
-
-	changed the name of the mason package to RT::Mason, so it didn't conflict with other instances
-	on the same webserver
-	
-2000-06-06 14:40  tobiasb
-
-	* webrt/Ticket/: Update.html, Elements/TicketToolBox:
-
-	I'm trying to set default action in Update.html dependent on which link the
-	user clicked at (update, comment or reply).  I'll continue tomorrow (dinnertime
-	now :)
-	
-2000-06-06 14:11  tobiasb
-
-	* webrt/Ticket/ProcessUpdate.html:
-
-	bugfix
-	
-2000-06-06 13:48  jesse
-
-	* etc/config.pm:
-
-	changed Log::Dispatch::VERSION (1.2) which didn't work
-	to the more standard perl syntax:  use Log::Dispatch 1.2;
-	
-	\ed an @ that tobix left in rtmux.pl
-	
-2000-06-06 13:47  jesse
-
-	* bin/rtmux.pl:
-
-	\ed an @ that tobix left in rtmux.pl
-	
-2000-06-06 13:32  jesse
-
-	* Makefile:
-
-	:%s/        /	/ in the makefile (convert spaces to tabs)
-	
-2000-06-06 13:15  tobiasb
-
-	* README:
-
-	Mostly doc changes
-	
-2000-06-06 11:36  tobiasb
-
-	* etc/config.pm:
-
-	bugfix
-	
-2000-06-06 11:15  tobiasb
-
-	* docs/FAQ:
-
-	Added some few tips
-	
-2000-06-06 11:05  tobiasb
-
-	* bin/rtmux.pl:
-
-	putted in some warnings about things that doesn't work
-	
-2000-06-06 04:21  tobiasb
-
-	* README:
-
-	added comments about DBMS'es
-	
-2000-06-05 16:54  tobiasb
-
-	* Makefile:
-
-	more bugfixes
-	
-2000-06-05 16:46  tobiasb
-
-	* Makefile:
-
-	bgfx
-	
-2000-06-05 14:01  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-2000-06-05 09:26  tobiasb
-
-	* README, etc/config.pm, etc/schema.mysql, webrt/autohandler:
-
-	done some documentation fixes
-	
-2000-06-05 07:14  tobiasb
-
-	* README:
-
-	updated the STATUS
-	
-2000-06-02 03:32  tobiasb
-
-	* etc/schema.mysql, lib/RT/Action/SendEmail.pm,
-	lib/RT/Interface/Email.pm, webrt/autohandler, webrt/Elements/Error:
-
-	bugfix
-	
-2000-06-01 23:28  tobiasb
-
-	* webrt/Ticket/Elements/TicketToolBox:
-
-	file TicketToolBox was initially added on branch rt-1-1.
-	
-2000-06-01 23:28  tobiasb
-
-	* etc/config.pm, etc/schema.mysql, lib/RT/Link.pm,
-	lib/RT/Ticket.pm, lib/RT/Action/SendEmail.pm,
-	lib/RT/Interface/Email.pm, webrt/autohandler, webrt/Elements/Error,
-	webrt/Elements/SelectOwner, webrt/Ticket/Create_Detail.html,
-	webrt/Ticket/Display.html, webrt/Ticket/ProcessUpdate.html,
-	webrt/Ticket/Update.html, webrt/Ticket/Elements/TicketToolBox:
-
-	 ... better logging (logs a warning when it's dieing during an eval) ... maybe the URL in the mails will work now ... misc bugfixes ... some better foldings ... better error handling in the WebUI (not tested!  You should absolutely see this, I have a feeling it's unsmart.  Check autohandler and Elements/Error) ... misc features added (default values on selectowners now work, auto-fill-in of requestor on create, auto-fill-in of subject on spawn, viewing actions on the ProcessUpdate, ProcessUpdate fixed up a bit ... hm, that's it)
-	
-2000-06-01 20:54  tobiasb
-
-	* bin/testdeps.pl:
-
-	Added Text::Wrapper for quoting of wide messages
-	
-2000-06-01 20:50  tobiasb
-
-	* lib/RT/Transaction.pm, lib/RT/Action/StallDependent.pm,
-	lib/RT/Interface/Email.pm, webrt/Login.html,
-	webrt/Ticket/autohandler, webrt/Ticket/Elements/ShowLinks:
-
-	lots of bugfixes and minor enhancements
-	
-2000-06-01 02:58  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-2000-06-01 02:20  jesse
-
-	* Makefile, NEWS:
-
-	work on the web ui. cleanups to the comment and reply pages as well as the
-	queue view and the ticket detail page
-	
-2000-05-31 14:28  tobiasb
-
-	* etc/config.pm, webrt/Search/Listing.html,
-	webrt/Search/TicketCell, webrt/Ticket/Display.html:
-
-	Popular demand: A link for taking an action from the listing page (reduces the change for concurrency problems)
-	
-2000-05-31 13:59  tobiasb
-
-	* webrt/Search/autohandler:
-
-	Uh, some weird debugging stuff came into the last commit - I should
-	have checked better.
-	
-	Some of those autohandlers seems like copies of each other.  There
-	must be better ways to do this (i.e. separating all the common stuff
-	into some module)?
-	
-2000-05-31 13:52  tobiasb
-
-	* lib/RT/Transaction.pm, lib/RT/Interface/Email.pm,
-	webrt/Search/Listing.html, webrt/Search/PickRestriction,
-	webrt/Search/autohandler, webrt/Ticket/Display.html,
-	webrt/Ticket/Elements/ShowHistory:
-
-	popular demands; more navigation ({back to listing} and {last transaction}) and misc details
-	
-2000-05-31 12:20  tobiasb
-
-	* webrt/Elements/SelectMatch:
-
-	This one is plain ugly at the moment.  Anyway, it's ment for a more advanced 'regexp match / glob match / word match / substring match / total match'
-	
-2000-05-31 12:20  tobiasb
-
-	* webrt/Elements/SelectMatch:
-
-	file SelectMatch was initially added on branch rt-1-1.
-	
-2000-05-31 11:55  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	bugfix
-	
-2000-05-31 09:53  tobiasb
-
-	* webrt/: Elements/SelectStatus, Ticket/Update.html:
-
-	Some popular demands from the support dept;
-	
-	I've made it possible to kill by selecting status dead
-	
-	Response is the default action.  I've added a cryptical line which
-	might or might not give a warning.  Ideally, I guess we should do the comment /
-	reply selection through submit buttons rather than through a select menu - what
-	di you think?
-	
-2000-05-30 22:46  tobiasb
-
-	* etc/config.pm, lib/RT/Attachment.pm:
-
-	Ah ... I had forgotten signatures.  Some stubbed work, I'll continue tomorrow
-	
-2000-05-30 22:31  tobiasb
-
-	* lib/RT/Attachment.pm, lib/RT/Attachments.pm, lib/RT/Record.pm,
-	lib/RT/Ticket.pm, lib/RT/Transaction.pm, webrt/Login.html,
-	webrt/Elements/MessageBox, webrt/Search/Listing.html,
-	webrt/Ticket/autohandler, webrt/Ticket/Elements/ShowTransaction:
-
-	Quoting works now ... fixed some other misc details + bugfixes ... and I've moved the date handling to RT::Record, it will be completed tomorrow (I hopecvs diff -uw | less)
-	
-2000-05-30 20:31  tobiasb
-
-	* webrt/Ticket/Create_Detail.html:
-
-	Removed those annoying blink tags.. :)
-	
-2000-05-30 20:14  tobiasb
-
-	* webrt/: Elements/MessageBox, Ticket/Create_Detail.html:
-
-	Still working on that MessageBox
-	
-2000-05-30 20:09  tobiasb
-
-	* webrt/: Elements/MessageBox, Ticket/Update.html:
-
-	Separated out the MessageBox
-	
-2000-05-30 20:09  tobiasb
-
-	* webrt/Elements/MessageBox:
-
-	file MessageBox was initially added on branch rt-1-1.
-	
-2000-05-30 19:56  tobiasb
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	Changed <BLOCKQUOTE> to <pre> for the message content.
-	
-	TODO: We really should HTML'ify and/or HTML-escape the Content.
-	
-2000-05-29 06:59  tobiasb
-
-	* Makefile:
-
-	Some bugfixes, but absolutely not tested.
-	
-2000-05-26 12:11  tobiasb
-
-	* webrt/Search/Listing.html:
-
-	Now it runs /Elements/Header - I was a bit annoyed because it was missing Title
-	
-2000-05-26 10:11  tobiasb
-
-	* webrt/Ticket/Display.html:
-
-	Seems like I had introduced an error here
-	
-2000-05-24 21:50  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/TicketCollection.pm, lib/RT/Tickets.pm,
-	webrt/Search/Listing.html, webrt/Ticket/Display.html:
-
-	Working on persistable web queries. Introduced RT::TicketCollection
-	Arguably this should be in RT::Tickets. and may be some day
-	
-2000-05-24 21:50  jesse
-
-	* lib/RT/TicketCollection.pm:
-
-	file TicketCollection.pm was initially added on branch rt-1-1.
-	
-2000-05-24 08:00  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	It should also be possible to "unlink" something (i.e. if a link was
-	wrongly set).  This is not implemented, but at least mails with
-	an "unlink" command will not bounce now.
-	
-2000-05-23 18:49  tobiasb
-
-	* lib/RT/Transaction.pm:
-
-	Made the transaction text from a link action a bit more readable,
-	though this still needs quite some work.
-	
-2000-05-23 16:57  jesse
-
-	* Makefile:
-
-	Bumped to 1.3.7
-	
-2000-05-23 10:12  tobiasb
-
-	* etc/config.pm, lib/RT/Link.pm, lib/RT/Ticket.pm,
-	lib/RT/Interface/Email.pm, webrt/Ticket/Display.html:
-
-	I've started looking at the mail interface.  Now linking works through the mailgate, though we need some info in the docs.  I'm proposing that it should accept both commands in the headerlines ("RT-Command: Link/Resolve/Whatever blahblah") and traditional commands in the mail ("%RT Link", "%RT Resolve", etc), though I've only supported the first one yet.  Look at the comments in Email.pm for details.
-	
-2000-05-23 10:04  tobiasb
-
-	* lib/RT/Scrip.pm:
-
-	Bugfix/optimalization or something?
-	
-2000-05-22 19:09  tobiasb
-
-	* lib/RT/Ticket.pm, webrt/Ticket/Create_Detail.html,
-	webrt/Ticket/Display.html, webrt/Ticket/LinkIt.html:
-
-	I'm not very happy about some comprimises, choises and short-cuts I've done here, but anyway linking & spawning seems to work now.
-	
-2000-05-22 18:05  tobiasb
-
-	* lib/RT/Transaction.pm, lib/RT/Action/AutoReply.pm,
-	webrt/Ticket/Create.html, webrt/Ticket/Create_Detail.html,
-	webrt/Ticket/Display.html, webrt/Ticket/LinkIt.html:
-
-	all changes here are either related to getting the Create working from the web, or harmless details
-	
-2000-05-22 17:39  tobiasb
-
-	* webrt/Ticket/Display.html:
-
-	$Subject => $Subject||(no subject given)
-	
-	TODO: HTML-escape
-	
-2000-05-22 17:38  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Removed VerboseSubject and HTMLSubject
-	
-2000-05-22 17:24  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	I do use $Ticket->Subject (and other stuff as well) frequently when
-	I'm editing Mason.  There is two issues;
-	
-	1) Things might look freaked if the ticket has no subject, i.e. Display.html
-	
-	2) Things might get totally whacko if the subject contains HTML code.
-	
-	I could ensure the "right" behaviour all the places by using
-	HTML::Entities::encode (I've done it one place), and by always using
-	$Subject||"(No subject)".  Anyway, I think it might be more
-	appropriate to have a sub RT::Ticket::VerboseSubject and
-	RT::Ticket::HTMLSubject.
-	
-	What do you think?
-	
-2000-05-22 16:51  tobiasb
-
-	* webrt/Ticket/Display.html:
-
-	It seems like it can create and view new transactions now.
-	
-	My next step will be to fix linking
-	
-2000-05-22 16:47  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	I should never commit before testing ... I should never commit before testing ... I should never commit before ...
-	
-	bugfix.
-	
-2000-05-22 16:38  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	I'm trying to get a better propagation of error messages.  I'm a bit
-	amused to find lots of things that shouldn't pass `perl -w' and `use
-	strict'?
-	
-2000-05-22 15:52  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Removed a debug (?) line that was commented out:
-	
-	#      print "From is $From\n";
-	
-	...and inserted some other logging:
-	
-	- logs an info message with ticket id, subject and queue upon
-	successful message creation.
-	
-	- logs a warning if it couldn't be created.
-	
-2000-05-22 14:11  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	In RT::Ticket::Create: Defaulting queue to 'general', and warning when it's not set
-	
-2000-05-22 14:06  tobiasb
-
-	* README:
-
-	Added a 'rt-comment' to the recommended mail configuration
-	
-2000-05-22 14:04  tobiasb
-
-	* Makefile:
-
-	added a comment-mail-alias
-	
-2000-05-22 14:03  tobiasb
-
-	* etc/config.pm:
-
-	Hm ... $RT::CorrespondAddress is used in AutoReply.pm, while only
-	$MailAlias is set in config.pm.  I'm not sure if this is the Right(tm)
-	solution, but anyway ... I added those two lines, additions to the
-	Makefile and README file is coming up shortly ...
-	
-	$CorrespondAddress=$MailAlias;
-	$CommentAddress="!!RT_COMMENT_MAIL_ALIAS!!";
-	
-2000-05-22 12:53  tobiasb
-
-	* webrt/Ticket/Create_Detail.html:
-
-	fixed up a bug caused by too quick usage of cut&paste
-	
-2000-05-22 12:01  tobiasb
-
-	* webrt/Ticket/Create_Detail.html:
-
-	Done some work making this page look OK.  Now I will put in some logic
-	in Display.html for creating and linking requests.
-	
-2000-05-22 05:30  tobiasb
-
-	* webrt/Elements/SelectOwner:
-
-	# TODO: respect the ACLs!!
-	# This will be a list of some thousands requestors with the current scheme.
-	
-2000-05-19 12:37  tobiasb
-
-	* webrt/Ticket/Create.html:
-
-	Added a box for setting link information.  Only a web mockup, the
-	logic doesn't work yet.  Feel free to do whatever you'd like with this
-	one.  It might make sense to move this to the details page.
-	
-2000-05-19 12:17  jesse
-
-	* webrt/Ticket/LinkIt.html:
-
-	Code and formatting cleanups
-	
-2000-05-19 11:23  tobiasb
-
-	* etc/config.pm:
-
-	Removed some weird stuff
-	
-2000-05-19 10:59  jesse
-
-	* webrt/: index.html, Search/PickRestriction:
-
-	fixed some typos
-	
-2000-05-19 10:59  jesse
-
-	* etc/config.pm:
-
-	cleaned up the config file a bit
-	
-	<M-}>CVS: 	etc/config.pm
-	
-2000-05-19 08:42  tobiasb
-
-	* bin/testdeps.pl, bin/webmux.pl, webrt/Elements/SelectLinkType,
-	webrt/Ticket/Display.html, webrt/Ticket/LinkIt.html,
-	webrt/Ticket/ProcessUpdate.html, webrt/Ticket/Elements/ShowSummary,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Started the work getting links to work.  While the linking doesn't work yet, this is a hint about how I think things might work
-	
-2000-05-19 08:42  tobiasb
-
-	* webrt/Elements/SelectLinkType:
-
-	file SelectLinkType was initially added on branch rt-1-1.
-	
-2000-05-19 08:42  tobiasb
-
-	* webrt/Ticket/LinkIt.html:
-
-	file LinkIt.html was initially added on branch rt-1-1.
-	
-2000-05-18 14:46  jesse
-
-	* lib/RT/Ticket.pm:
-
-	a tiny bit of doc added to Ticket.pm
-	still not happy with the format
-	
-2000-05-18 10:56  tobiasb
-
-	* webrt/Ticket/autohandler:
-
-	undo of last commit; only local modifications for debugging
-	
-2000-05-18 10:51  tobiasb
-
-	* webrt/: Search/Listing.html, Ticket/Elements/ShowTransaction:
-
-	the previous commit had wrong loginfo; those files are modified according to the latest changes in etc/config.pm
-	
-2000-05-18 10:42  jesse
-
-	* webrt/Elements/SelectResultsPerPage:
-
-	adding missing file
-	
-2000-05-18 10:41  tobiasb
-
-	* webrt/: index.html, Search/Listing.html, Ticket/autohandler,
-	Ticket/Elements/ShowTransaction:
-
-	A front page for navigation.  This one needs work; Masonifying, generalizing and possibilities for customizations needs to be implemented
-	
-2000-05-18 10:41  tobiasb
-
-	* webrt/index.html:
-
-	file index.html was initially added on branch rt-1-1.
-	
-2000-05-18 10:36  tobiasb
-
-	* webrt/Elements/SelectResultsPerPage:
-
-	Added an empty file as for now
-	
-2000-05-18 10:36  tobiasb
-
-	* webrt/Elements/SelectResultsPerPage:
-
-	file SelectResultsPerPage was initially added on branch rt-1-1.
-	
-2000-05-18 05:48  tobiasb
-
-	* etc/config.pm:
-
-	I'm planning to deal with web customizations with one hash RT::WebOptions in config.pm.  This hash might contain callbacks and maybe names of extra Mason modules to pull in.  What do you think?
-	
-2000-05-17 19:08  jesse
-
-	* webrt/Search/autohandler:
-
-	file autohandler was initially added on branch rt-1-1.
-	
-2000-05-17 19:08  jesse
-
-	* webrt/Search/: Listing.html, PickRestriction, autohandler:
-
-	Work on searches. in the cli  -maxitems <n> now does the right thing
-	
-2000-05-16 17:48  jesse
-
-	* webrt/Ticket/Elements/ShowLinks:
-
-	file ShowLinks was initially added on branch rt-1-1.
-	
-2000-05-16 17:48  jesse
-
-	* bin/rtmux.pl, bin/webmux.pl, lib/RT/Link.pm, lib/RT/Ticket.pm,
-	lib/RT/Action/OpenDependent.pm, lib/RT/Action/ResolveMembers.pm,
-	lib/RT/Action/Spam.pm, lib/RT/Action/StallDependent.pm,
-	webrt/Elements/Error, webrt/Ticket/Elements/ShowLinks,
-	webrt/Ticket/Elements/ShowSummary:
-
-	Converted the new link code to a fully oo setup, rahter than a mishmash of
-	procedural and oo.  seperated out webrt/Ticket/Elements/ShowLinks
-	
-	It's by no means done, but it does seem to work.
-	
-	jesse
-	
-2000-05-16 12:30  tobiasb
-
-	* Makefile, etc/config.pm, lib/RT/Link.pm, lib/RT/Ticket.pm,
-	webrt/Ticket/Elements/ShowSummary:
-
-	Done quite some work at the right hand 'Other Links' window (well, it's not good enough, and it also lists dependencies as for now).  Jesse, you might want to do something with ShowSummary, my Mason code seems horribly ugly.
-	
-2000-05-16 09:18  tobiasb
-
-	* etc/config.pm:
-
-	(...)
-	# A hash table of convertion subs to be used for transforming RT Link
-	# URIs to URLs in the web interface.  If you want to use RT towards
-	# locally installed databases, this is the right place to configure it.
-	# (TODO!)
-	my %URI2HTML=
-	    (
-	     'fsck.com-rt' => sub {warn "stub!";},
-	     'mozilla.com-bugzilla' => sub {warn "stub!";},
-	     'fsck.com-kb' => sub {warn "stub!"}
-	     );
-	(...)
-	
-	I will also make a sub RT::Links::URI2HTML which gives smart links to
-	internal references, and passes other URIs to this hash table, and
-	eventually we should make default subs for KB and RT.
-	
-	What do you think of this idea?
-	
-2000-05-16 04:58  tobiasb
-
-	* lib/RT/: Link.pm, Ticket.pm:
-
-	Enabled link display in the CLI
-	
-2000-05-16 04:43  tobiasb
-
-	* lib/RT/Transaction.pm:
-
-	Seems like I had broken something...(bugfix)
-	
-2000-05-13 19:56  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Right, we need to work a bit with the links API.
-	
-	- we need an AllLinks sub.  How to tell EasySearch to give both links
-	where we're BASE and were we're TARGET?
-	
-	- we need an "unresolved dependencies" according to the current
-	design.  How to tell if a dependency is unresolved?  Dependencies can
-	point out of this RT instance!
-	
-	- we might need more subs, but not right now anyway.
-	
-2000-05-12 11:32  tobiasb
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	partly a bugfix; 'QouteTransaction=attachment-id' doesn't work very well for transactions without attachment.  Maybe that link should only be for attachments, and not for transactions.  Anyway, I changed it to transaction-id instead.  And I also added 'spawn' to the title; I think 'spawning' should be done through the same page.  'spawn' is when creating a new request that is linked up somehow to the old one.  Maybe it rather should be titled 'forward' or 'create new' or something?
-	
-2000-05-12 07:54  tobiasb
-
-	* webrt/: Elements/Error, Ticket/Display.html:
-
-	Bugfixing ... ehrm, why don't I test things before committing? :)
-	
-2000-05-12 07:34  tobiasb
-
-	* webrt/Elements/Error:
-
-	It logs errors now
-	
-2000-05-12 07:32  tobiasb
-
-	* webrt/Ticket/Display.html:
-
-	dies if element can't be loaded
-	
-2000-05-12 06:55  tobiasb
-
-	* webrt/Login.html:
-
-	seems like CGI won't take a combined get+post
-	
-2000-05-12 06:51  tobiasb
-
-	* etc/config.pm:
-
-	bugfix
-	
-2000-05-11 12:45  jesse
-
-	* webrt/Elements/ShadedBox:
-
-	file ShadedBox was initially added on branch rt-1-1.
-	
-2000-05-11 12:45  jesse
-
-	* webrt/Elements/ShadedBox:
-
-	missed this one before. it's somewhat misnamed right now. basically, it
-	prints a title and content.
-	
-2000-05-11 12:39  jesse
-
-	* webrt/Elements/: TitleBoxEnd, TitleBoxStart:
-
-	the title box for webui
-	
-2000-05-11 12:39  jesse
-
-	* webrt/Elements/TitleBoxStart:
-
-	file TitleBoxStart was initially added on branch rt-1-1.
-	
-2000-05-11 12:39  jesse
-
-	* webrt/Elements/TitleBoxEnd:
-
-	file TitleBoxEnd was initially added on branch rt-1-1.
-	
-2000-05-11 12:37  jesse
-
-	* webrt/Ticket/: Display.html, Elements/ShowSummary:
-
-	hrml cleanup. it's not as pretty, but man does it render faster
-	
-2000-05-11 01:07  jesse
-
-	* webrt/: Elements/Footer, Elements/Header, Ticket/Display.html,
-	Ticket/Elements/ShowHistory, Ticket/Elements/ShowSummary,
-	Ticket/Elements/ShowTransaction:
-
-	
-	Cleanup
-	\
-	
-2000-05-11 00:46  tobiasb
-
-	* TODO:
-
-	Added a list
-	
-2000-05-10 23:43  jesse
-
-	* webrt/webrt.css:
-
-	file webrt.css was initially added on branch rt-1-1.
-	
-2000-05-10 23:43  jesse
-
-	* webrt/webrt.css:
-
-	The base stylesheet.
-	
-2000-05-10 23:41  jesse
-
-	* webrt/Ticket/Elements/ShowSummary:
-
-	file ShowSummary was initially added on branch rt-1-1.
-	
-2000-05-10 23:41  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	file ShowTransaction was initially added on branch rt-1-1.
-	
-2000-05-10 23:41  jesse
-
-	* webrt/Ticket/Elements/ShowDates:
-
-	file ShowDates was initially added on branch rt-1-1.
-	
-2000-05-10 23:41  jesse
-
-	* webrt/Ticket/Elements/ShowHistory:
-
-	file ShowHistory was initially added on branch rt-1-1.
-	
-2000-05-10 23:41  jesse
-
-	* webrt/Ticket/Elements/ToolBar:
-
-	file ToolBar was initially added on branch rt-1-1.
-	
-2000-05-10 23:41  jesse
-
-	* webrt/Ticket/Elements/ShowBasics:
-
-	file ShowBasics was initially added on branch rt-1-1.
-	
-2000-05-10 23:41  jesse
-
-	* webrt/Ticket/Elements/ShowPeople:
-
-	file ShowPeople was initially added on branch rt-1-1.
-	
-2000-05-10 23:41  jesse
-
-	* webrt/: Elements/Header, Ticket/Display.html,
-	Ticket/DisplayHeader, Ticket/DisplaySummary, Ticket/DisplayTicket,
-	Ticket/ProcessUpdate.html, Ticket/ToolBar, Ticket/autohandler,
-	Ticket/Elements/ShowBasics, Ticket/Elements/ShowDates,
-	Ticket/Elements/ShowHistory, Ticket/Elements/ShowPeople,
-	Ticket/Elements/ShowSummary, Ticket/Elements/ShowTransaction,
-	Ticket/Elements/ToolBar:
-
-	Work on the web ui. mostly on the ticket display interface
-	
-2000-05-10 15:43  tobiasb
-
-	* README:
-
-	Added a comment about how to do the CGI :) Well:
-	
-		To get it up running even without mod_perl, you will need to
-	consult Tobix or the rt-devel mailinglist.  Tobix is actively working
-	on a (Fast)CGI version, but as for now he has been too lazy to update
-	the template for the cgi executable.
-	
-2000-05-10 15:39  tobiasb
-
-	* webrt/Ticket/Create_Detail.html:
-
-	added a require statement.  No effect for the mod_perl version, but makes sense for a CGI version.
-	
-2000-05-09 05:35  tobiasb
-
-	* bin/webmux.pl:
-
-	Better formatting
-	
-2000-05-08 05:01  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	bugfix
-	
-2000-05-05 19:20  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	This one shouldn't loop now - though it's not tested :)
-	
-2000-05-05 19:15  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	Fixing up the loop control.  When a possible loop occurs, an error
-	flag is set, and a new header field RT-Loop-Alarm appears.  I feel a
-	bit bad about the latter, we are indeed changing an email after it
-	arrived to the system, which I think is a bad thing - but anyway not
-	as bad as dropping the email completely.  My idea is that the Actions,
-	particularly the SendEmail.pm Action remain silent when this header
-	field is set.
-	
-2000-05-05 19:01  tobiasb
-
-	* etc/config.pm:
-
-	Added this about logging to the comments:
-	
-	# It might generally make sense to send error and higher by email to
-	# some administrator.  For heavens sake; be sure that the email goes
-	# directly to a mailbox, and not via RT :) Mail loops will generate a
-	# critical log message.
-	
-2000-05-05 16:47  jesse
-
-	* bin/testdeps.pl:
-
-	Added Log::Dispatch to testdeps.pl
-	
-2000-05-05 13:04  tobiasb
-
-	* lib/RT/Transaction.pm:
-
-	bugfix
-	
-2000-05-05 12:47  tobiasb
-
-	* etc/config.pm:
-
-	I need help, I can't really figure out from this;
-	
-	When commenting out the $SIG{__DIE__} stuff, everything works fine.
-	
-	When having this line in the config:
-	
-	$SIG{__DIE__}  = sub {$RT::Logger->log(level=>'crit',message=>$_[0]); print STDERR $_[0]; exit(-1);};
-	
-	I get this error:
-	
-	Can't locate Mail/Field/addrlist.pm in @INC (@INC contains: /tmp/FunRT /tmp/DBIx /etc/rt /usr/local/lib/perl5/5.6.0/i686-linux /usr/local/lib/perl5/5.6.0 /usr/local/lib/perl5/site_perl/5.6.0/i686-linux /usr/local/lib/perl5/site_perl/5.6.0 /usr/local/lib/perl5/site_perl .) at (eval 115)[/usr/local/lib/perl5/site_perl/5.6.0/Mail/Field.pm:87] line 3.
-	
-	WTF???
-	
-2000-05-05 10:29  tobiasb
-
-	* bin/rtmux.pl:
-
-	I guess this should block that stupid warnings
-	
-2000-05-05 10:01  tobiasb
-
-	* etc/config.pm:
-
-	Added Log::Dispatch.  I also have added those comments, which I would
-	like comments on (:
-	
-	# Most (if not all?) $RT:: global variables should be here.  I'd
-	# suggest putting session information in another Namespace (main:: or
-	# RT::main or maybe something like that).
-	
-	#use strict;
-	
-	#use vars qw/%SitePolicy $dirmode $transactionmode $DatabasePassword $rtname $domain $host $DatabaseHost $DatabaseUser $RT::DatabaseName $DatabaseType $user_passwd_min $MailAlias $WebrtImagePath $web_auth_mechanism $web_auth_cookies_allow_no_path $DefaultLocale $LocalePath $Nobody $Logger/;
-	
-	I'm not sure if "use strict" breaks, but at least "use vars" breaks
-	bigtime as we are using it other places (like rtmux.pl).  I suggest
-	using another package name for the execution logic.  What do you
-	think?
-	
-2000-05-05 08:07  tobiasb
-
-	* Makefile:
-
-	Added RT_LOGFILE, and comments on how to fix advanced logging
-	
-2000-05-05 02:31  jesse
-
-	* bin/rtmux.pl:
-
-	a bit of performance hacking. now require mason and cgi rather than 'use'ing them
-	
-2000-05-05 02:22  jesse
-
-	* lib/RT/: Action.pm, Scrip.pm, ScripScope.pm, Template.pm,
-	Ticket.pm, Transaction.pm, Action/AutoReply.pm,
-	Action/SendEmail.pm, Action/Spam.pm:
-
-	Cleaned up a couple minor things (like precedence, again) and changed "FixSubject" to "SetSubjectTag"
-	
-	Fixed the memory leak in Transaction.pm (it wasn't letting go of Scrip objects)
-	The fix was a bit of a "large mallet on a small nail" in that I'm now _explicitly_ destroying ScripObjects two different ways and don't quite understand why I have to do it. It does, however, work.
-	
-2000-05-04 09:00  tobiasb
-
-	* lib/RT/Action/Spam.pm:
-
-	Completely untested - but I guess this should do real spamming, that
-	is one email for each request(or).
-	
-2000-05-04 08:59  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	bugfix
-	
-2000-05-04 07:04  tobiasb
-
-	* lib/RT/Action/: AutoReply.pm, SendEmail.pm:
-
-	Precedence: Bulk should only be set for AutoReply
-	
-2000-05-04 05:29  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	sub FixSubject sets the RT tag (unless it is already there).  I moved
-	it out from Prepare because I need to override this behaviour when
-	Spamming people.
-	
-2000-05-04 01:34  jesse
-
-	* etc/schema.mysql:
-
-	spec some defaults in the schema
-	
-2000-05-04 01:32  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Bugfix to ticket.pm for better handling of default values for some queue fields
-	
-2000-05-03 14:19  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Sorry, the last commit on this file was not really a bugfix.  I'd say all Ticket (Transaction) Actions should return status, message and eventually optional things after the message.
-	
-2000-05-03 14:16  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Bugfix
-	
-2000-05-03 14:13  tobiasb
-
-	* lib/RT/Action/: ResolveMembers.pm, Spam.pm:
-
-	Those actually seems to work :)
-	
-2000-05-03 14:13  tobiasb
-
-	* lib/RT/Action/Spam.pm:
-
-	file Spam.pm was initially added on branch rt-1-1.
-	
-2000-05-03 14:13  tobiasb
-
-	* lib/RT/Action/ResolveMembers.pm:
-
-	file ResolveMembers.pm was initially added on branch rt-1-1.
-	
-2000-05-03 14:13  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	gubfix
-	
-2000-05-03 14:00  tobiasb
-
-	* etc/schema.mysql:
-
-	Bugfix
-	
-2000-05-03 13:29  tobiasb
-
-	* etc/schema.mysql:
-
-	Commented out the AutoReplies table.
-	
-2000-05-03 13:17  tobiasb
-
-	* lib/RT/Action/AutoReply.pm:
-
-	Putted in "#TODO: " comments for avoiding duplicate AutoReplies.
-	
-2000-05-03 13:15  tobiasb
-
-	* etc/schema.mysql:
-
-	Added a table AutoReplies to avoid sending the same autoreply template
-	more than once to each requestor.
-	
-	Eventually entries should be removed (i.e. after a week) through the
-	(upcoming?) timer system (eventually through the good, old crontab(5))
-	
-2000-05-03 11:48  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	LinkTo and LinkFrom are tested a bit, and they seem to work OK now.
-	
-2000-05-03 11:02  tobiasb
-
-	* etc/schema.mysql:
-
-	Bugfix.
-	
-2000-05-03 07:40  tobiasb
-
-	* etc/schema.mysql:
-
-	I'm putting ResolveGroupTicket on hold.  It's just not important.
-	
-2000-05-02 18:05  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Starting to add a bit of inline pod documentation. the style isn't finalized yet
-	
-2000-05-02 14:30  tobiasb
-
-	* lib/RT/Action/OpenDependent.pm:
-
-	file OpenDependent.pm was initially added on branch rt-1-1.
-	
-2000-05-02 14:30  tobiasb
-
-	* etc/schema.mysql, lib/RT/Link.pm, lib/RT/Ticket.pm,
-	lib/RT/Action/OpenDependent.pm, lib/RT/Action/StallDependent.pm:
-
-	I just got DependsOn Links to work as they should in the CLI :)
-	
-2000-05-02 13:36  tobiasb
-
-	* lib/RT/Links.pm:
-
-	file Links.pm was initially added on branch rt-1-1.
-	
-2000-05-02 13:36  tobiasb
-
-	* lib/RT/: Links.pm, Ticket.pm, Action/StallDependent.pm:
-
-	[no log message]
-	
-2000-05-02 13:07  tobiasb
-
-	* lib/RT/Action/StallDependent.pm:
-
-	Bugfix.  Also, only Open requests should be Stalled.
-	
-2000-05-02 13:01  tobiasb
-
-	* lib/RT/: Ticket.pm, Action/StallDependent.pm:
-
-	Bugfixing
-	
-2000-05-02 12:21  tobiasb
-
-	* lib/RT/: Ticket.pm, Action/StallDependent.pm:
-
-	bugfixes
-	
-2000-05-02 11:55  tobiasb
-
-	* etc/schema.mysql:
-
-	Added TobiX-style logic scrips for DependsOn link and MemberOf link.
-	
-2000-05-02 07:55  tobiasb
-
-	* lib/RT/: Link.pm, Ticket.pm:
-
-	oup, forgot to keep a consistant style
-	base => Base
-	target => Target
-	etc
-	
-2000-05-02 07:55  tobiasb
-
-	* Makefile, etc/config.pm:
-
-	forgot to commit those changes ... configuration for the URI method
-	
-2000-05-02 05:45  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Agh, compile error.
-	
-2000-05-02 05:30  tobiasb
-
-	* lib/RT/Action/StallDependent.pm:
-
-	file StallDependent.pm was initially added on branch rt-1-1.
-	
-2000-05-02 05:30  tobiasb
-
-	* lib/RT/Action/: README.hackers, StallDependent.pm:
-
-	Ok, so lets put all Actions into one directory - though I'd say it would be better for future hackers to orient themselves if we grouped them somehow.
-	
-2000-05-02 00:11  jesse
-
-	* Makefile:
-
-	Version bumping
-	
-2000-05-01 17:16  jesse
-
-	* lib/RT/Ticket.pm:
-
-	moved URIIsLocal closer to other linking routines.
-	
-2000-05-01 10:16  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Made the transaction data a bit "nicer", should look something like:
-	
-	THIS DependsOn 4323 as of 342
-	<URI> DependsOn THIS as of 343
-	
-2000-05-01 08:58  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Changed URL -> URI
-	
-	Changed NewLink and ReverseLink to LinkTo and LinkFrom
-	
-	Added one byte to indicate if it's a From-link or a To-link in the
-	transaction data.
-	
-2000-05-01 01:52  jesse
-
-	* etc/schema.mysql:
-
-	fixed a few typos in the schema
-	
-2000-05-01 01:50  jesse
-
-	* lib/RT/ACL.pm:
-
-	Initial sketches at RT::ACL.pm. there's no running code here yet.
-	
-2000-05-01 01:48  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Fixed Ticket->URL. changed queue->load to queue->Load
-	
-2000-05-01 01:04  jesse
-
-	* bin/rtmux.pl:
-
-	Fixed improper rt program selection code.
-	
-2000-05-01 00:14  jesse
-
-	* lib/RT/Queue.pm:
-
-	a stub for ACL work.
-	
-2000-04-30 13:28  tobiasb
-
-	* lib/RT/Link.pm:
-
-	file Link.pm was initially added on branch rt-1-1.
-	
-2000-04-30 13:28  tobiasb
-
-	* lib/RT/: Link.pm, Ticket.pm:
-
-	Link.pm
-	
-2000-04-30 13:13  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Added a static method URIIsLocal which checks if it's a local URI or not.
-	
-2000-04-28 14:20  jesse
-
-	* lib/RT/Transaction.pm:
-
-	Cleaned up some comments and formatting. and did a bit of reorganizing
-	of routines to more closely model other files. Oh. i finally have
-	emacs doing proper indenting per perlstyle. so we'll hopefully start
-	to get better about that :) Tobix has only been bugging me for a year
-	
-2000-04-28 09:05  tobiasb
-
-	* lib/RT/Action/README.hackers:
-
-	Just some documentation for future hackers :)
-	
-2000-04-28 09:05  tobiasb
-
-	* lib/RT/Action/README.hackers:
-
-	file README.hackers was initially added on branch rt-1-1.
-	
-2000-04-28 08:20  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Started the work of implementing links
-	
-2000-04-28 04:40  tobiasb
-
-	* etc/schema.mysql:
-
-	Didn't we once agree that we needed "state" (user-configurable logic)
-	and "status" (fixed open/stalled/resolved/dead)? :)
-	
-2000-04-28 01:17  jesse
-
-	* lib/RT/Ticket.pm:
-
-	didn't balance parens. grr
-	
-2000-04-28 00:54  jesse
-
-	* lib/RT/Ticket.pm:
-
-	a bunch of cleanup.. a bunch more folding mode braces.
-	a few minor (still not in any codepath) changes for the start of some
-	acls work
-	
-2000-04-28 00:51  jesse
-
-	* docs/design_docs/link-definitions.txt:
-
-	a few comments, additions and clarifications. nothing really major
-	
-2000-04-27 02:06  jesse
-
-	* docs/design_docs/acls:
-
-	more thoughts on ACLs. this time including some code snippits.
-	
-2000-04-27 02:01  jesse
-
-	* etc/schema.mysql:
-
-	added the schema for the new ACL system.
-	responded to tobix' comments about GECOS.
-	
-2000-04-26 14:58  tobiasb
-
-	* docs/design_docs/subscription-definitions.txt:
-
-	marginal updates to reflect that scrips/actions can be used for more things than subscriptions (the whole document might need a rename)
-	
-2000-04-26 14:50  tobiasb
-
-	* docs/design_docs/link-definitions.txt, etc/schema.mysql:
-
-	only insignificant comments - some made weeks ago
-	
-2000-04-26 12:59  jesse
-
-	* docs/design_docs/link-definitions.txt:
-
-	some comments on link definitions
-	my comments are marked with # as the first character of the line.
-	
-2000-04-26 02:27  tobiasb
-
-	* docs/design_docs/: link-definitions.txt,
-	subscription-definitions.txt:
-
-	updates
-	
-2000-04-26 00:14  jesse
-
-	* docs/design_docs/acls:
-
-	some more hacking on acls design
-	
-2000-04-25 17:58  jesse
-
-	* docs/design_docs/acls:
-
-	thoughts on acls
-	
-2000-04-24 00:17  jesse
-
-	* webrt/Ticket/Create_Detail.html:
-
-	file Create_Detail.html was initially added on branch rt-1-1.
-	
-2000-04-24 00:17  jesse
-
-	* webrt/Ticket/Create_Detail.html:
-
-	some work on create. nothing ready for consumption yet.
-	
-2000-04-24 00:16  jesse
-
-	* webrt/: Logout.html, Elements/Footer, Elements/Header,
-	Elements/SelectQueue, Ticket/Create.html, Ticket/Display.html,
-	Ticket/ProcessUpdate.html, Ticket/SetOwner, Ticket/SetStatus,
-	Ticket/Update.html, Ticket/autohandler:
-
-	Look ma, $session{'CurrentUser'} contains the current user object.
-	you can depend on this being set if the user's authenticated.
-	
-2000-04-24 00:16  jesse
-
-	* webrt/Logout.html:
-
-	file Logout.html was initially added on branch rt-1-1.
-	
-2000-04-24 00:14  jesse
-
-	* Makefile, bin/testdeps.pl, bin/webmux.pl:
-
-	Added Apache::Session support to the HTML::Mason version of things.
-	
-2000-04-23 19:45  jesse
-
-	* bin/testdeps.pl:
-
-	added a little script to test perl dependencies.
-	it should probably get integrated into the makefile
-	
-2000-04-23 19:45  jesse
-
-	* bin/testdeps.pl:
-
-	file testdeps.pl was initially added on branch rt-1-1.
-	
-2000-04-23 17:28  jesse
-
-	* Makefile, docs/design_docs/acls, etc/schema.mysql:
-
-	installation seems to work a bit better now
-	
-2000-04-20 02:18  jesse
-
-	* webrt/Login.html:
-
-	Removing cruft from login.html
-	
-2000-04-20 02:17  jesse
-
-	* webrt/Ticket/autohandler:
-
-	Look ma! this autohandler seems to make webauth (with $pass = $user ) work.
-	
-2000-04-20 02:09  jesse
-
-	* webrt/: autohandler, Ticket/autohandler:
-
-	file autohandler was initially added on branch rt-1-1.
-	
-2000-04-20 02:09  jesse
-
-	* webrt/Login.html:
-
-	file Login.html was initially added on branch rt-1-1.
-	
-2000-04-20 02:09  jesse
-
-	* Makefile, bin/webmux.pl, webrt/Login.html, webrt/autohandler,
-	webrt/Ticket/autohandler:
-
-	Doing work on cookie-based authentication for WebRT. The basic idea
-	is that the autohandler in each directory (unless the global handlers can be made to work) will check to see if the user is authenticated. If they are, then it keeps going happily. otherwise, it forces the user to login with the form in /Login.html, which should eventually be smart enough to put them back to where they want to go.
-	
-2000-04-18 02:43  jesse
-
-	* docs/design_docs/acls:
-
-	checking in design work on ACLs. a bit more work, such as notes
-	on order of evaluation and a rough implementation plan and then I'll
-	implement
-	
-2000-04-13 11:58  tobiasb
-
-	* etc/config.pm:
-
-	Introduced all columns we need locally, that is all columns as of RT
-	1.0, except due, area and priorities.  I guess somebody might want to
-	add those columns as well :)
-	
-2000-04-13 11:52  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	hrmwell, you did introduse a slight bug here.. :)
-	
-2000-04-13 11:26  tobiasb
-
-	* webrt/Search/: Listing.html, TicketCell:
-
-	Looks gruesome, but hey - it works\!
-	
-2000-04-13 11:26  tobiasb
-
-	* webrt/Search/TicketCell:
-
-	file TicketCell was initially added on branch rt-1-1.
-	
-2000-04-13 10:52  tobiasb
-
-	* etc/config.pm:
-
-	agh..
-	
-2000-04-13 10:50  tobiasb
-
-	* etc/config.pm:
-
-	Added the site configurable option "QueueListingCols".  It should also
-	be possible to override this one at least through the query, but it
-	might not be trivial.  (maybe you have better suggestions?)
-	
-2000-04-13 10:23  tobiasb
-
-	* webrt/Search/QueueItem:
-
-	I think I want to remove this one, I have other thoughts about how to
-	handle this - let's discuss it more when I've made some implementation :)
-	
-2000-04-13 10:05  tobiasb
-
-	* webrt/Search/Listing.html:
-
-	Added this:
-	
-	# TODO: This one should _not_ be here, rather somewhere else
-	# (suggestions?).  It might eventually read the cookies, user
-	# configuration information from the DB, queue configuration information
-	# from the DB, etc.  It should be object oriented.  But what object can
-	# it belong to, and how should it get access to all this data?
-	
-	sub _cfg {
-	  my $key=shift;
-	  return $ARGS{$key} || $RT::SitePolicy{$key};
-	}
-	
-2000-04-13 10:05  tobiasb
-
-	* etc/config.pm:
-
-	Added a hash for "tunable" configurations:
-	
-	# This is where RT's preferences are kept track of
-	
-	package RT;
-	
-	# Different "tunable" configuration options should be in this hash:
-	%SitePolicy=();
-	
-2000-04-13 02:30  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Ticket::clean became Ticket::_CleanAddressesAsString
-	references to clean changed accordingly. i feel a bit dirty not
-	making this $self->_CleanAddressesAsString.
-	
-2000-04-12 08:53  tobiasb
-
-	* webrt/: Elements/SelectStatus, Ticket/ProcessUpdate.html,
-	Ticket/Update.html:
-
-	bugfixes and insignificant enhancements
-	
-2000-04-12 07:14  tobiasb
-
-	* webrt/Elements/yearMenu:
-
-	"Last year" is now (by default) available
-	
-2000-04-12 07:11  tobiasb
-
-	* webrt/Search/PickRestriction:
-
-	Changed the default to select one queue, not select "anything but" a queue.
-	
-2000-04-12 07:07  tobiasb
-
-	* webrt/Search/PickRestriction:
-
-	Added a stupid "under construction" message.
-	
-2000-04-12 07:00  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	Ehm .. the last commit message should be more descriptive;
-	
-	From the README:
-	
-	        rt:     |"/path/to/rt/bin/rt-mailgate general correspond"
-	                                                    |          |
-	                                   <<queue-name>----/          |
-	                                                               |
-	                <<correspond or comment depending on whether   |
-	                 the mail shoud be resent to the requestor>---/
-	                 "action" here will make this address only
-	                  parse actions in the message without
-	                  recording the message as a transaction
-	                  of its own"
-	
-	...while the implementation required "correspond general"
-	
-2000-04-12 06:58  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	This was not in sync with the README
-	
-2000-04-12 06:50  tobiasb
-
-	* webrt/Search/PickRestriction:
-
-	Bugfix
-	
-2000-04-12 06:45  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Agh, should have tested before committing :)
-	
-2000-04-12 06:44  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Fixd SetOwner to allow stealing and to respect the new Nobody user
-	
-2000-04-12 05:19  tobiasb
-
-	* webrt/Elements/SelectQueue:
-
-	Now this one actually works
-	
-2000-04-11 07:30  tobiasb
-
-	* webrt/Elements/SelectQueue:
-
-	This won't work yet.
-	
-2000-04-11 07:17  tobiasb
-
-	* lib/RT/Transaction.pm:
-
-	Ehr...right.  Still fixing at the same bug; the IsInbound sub didn't work....well
-	
-2000-04-11 07:08  tobiasb
-
-	* lib/RT/: Ticket.pm, Transaction.pm:
-
-	argh .. I should learn to test the bugfixes before committing
-	
-2000-04-11 06:46  tobiasb
-
-	* lib/RT/Transaction.pm:
-
-	bugfix
-	
-2000-04-11 06:42  tobiasb
-
-	* lib/RT/Template.pm, lib/RT/Ticket.pm, webrt/Elements/SelectOwner,
-	webrt/Ticket/ProcessUpdate.html:
-
-	bugfixes
-	
-2000-04-11 05:47  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	bugfixing
-	
-2000-04-11 04:46  tobiasb
-
-	* lib/RT/Watchers.pm:
-
-	Bugfix
-	
-2000-04-11 04:41  tobiasb
-
-	* etc/config.pm, lib/RT/Ticket.pm:
-
-	I'm trying to fix this nobody user..
-	
-2000-04-11 04:36  tobiasb
-
-	* etc/schema.mysql:
-
-	I'm trying to fix this nobody user..
-	
-2000-04-11 04:29  tobiasb
-
-	* lib/RT/Queue.pm, webrt/Ticket/ProcessUpdate.html:
-
-	Bugfixing
-	
-2000-04-11 03:16  tobiasb
-
-	* webrt/Search/Listing.html:
-
-	Insignificant.  Oh, how should errors be trapped?
-	
-2000-04-11 00:40  jesse
-
-	* lib/RT/: Queue.pm, Ticket.pm, Watchers.pm:
-
-	all the watcher types now have AsString methods. this was done by dropping
-	an EmailsAsString method into RT::Watcher
-	
-2000-04-10 23:04  tobiasb
-
-	* webrt/Ticket/ProcessUpdate.html:
-
-	Added those use statements
-	
-	This page seems very broken in Netscape.
-	
-2000-04-10 23:00  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Darn, I thought I had tested this.  Well, now it should work!?
-	
-2000-04-10 22:54  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	...some work is needed to get Watchers work OK.  I commented out my
-	try on it, so now it will ignore queue watchers (it simply ignored all
-	watchers as it was).
-	
-2000-04-10 14:29  tobiasb
-
-	* webrt/Ticket/: DisplayTicket, DisplayTransaction:
-
-	Update and Modify-links
-	
-2000-04-10 14:20  tobiasb
-
-	* webrt/Ticket/DisplayTransaction:
-
-	Added an "act" link and touched the comments
-	
-2000-04-10 14:11  tobiasb
-
-	* webrt/Ticket/DisplaySummary:
-
-	Reinserted the "Last Contact" and "Last Update" lines, but they're "cleaned" a bit.
-	
-	(btw, this seems like a crude copy from the cli, does the cli have similar problems?)
-	
-2000-04-10 13:51  tobiasb
-
-	* webrt/Ticket/DisplaySummary:
-
-	Hacking a bit on this
-	
-2000-04-10 13:48  tobiasb
-
-	* webrt/Ticket/: DisplayTransaction, Update.html:
-
-	Hacking a bit on this
-	
-2000-04-10 13:18  tobiasb
-
-	* webrt/Ticket/Modify.html:
-
-	'undo' (well, not really :)
-	
-2000-04-10 13:13  tobiasb
-
-	* webrt/Ticket/Update.html:
-
-	This 'fix' is maybe only temporary?
-	
-2000-04-10 13:08  tobiasb
-
-	* webrt/Ticket/Modify.html:
-
-	I'd daresay this one is superceded by Update.html?
-	
-2000-04-10 13:07  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	just added some comments
-	
-2000-04-10 12:52  tobiasb
-
-	* webrt/Ticket/DisplaySummary:
-
-	This 'fix' is maybe only temporary?
-	
-2000-04-10 10:35  tobiasb
-
-	* webrt/: Elements/SelectBoolean, Search/Listing.html:
-
-	insignificant changes
-	
-2000-04-10 06:53  tobiasb
-
-	* webrt/Elements/SelectOwner:
-
-	Insignificant fix (wouldn't work here without)
-	
-2000-04-10 05:38  tobiasb
-
-	* bin/rtmux.pl:
-
-	Might be a bugfix
-	
-2000-04-09 16:56  jesse
-
-	* lib/RT/Users.pm, webrt/Elements/SelectBoolean,
-	webrt/Elements/SelectOwner, webrt/Search/Listing.html,
-	webrt/Search/PickRestriction:
-
-	I can now get a listing of tickets whose owner is or isn't a given owner.
-	and it even lists them. Next, I'll probably make searches for
-	other attributes work.
-	the plan of attack is requestor, then probably ticket content (as a test
-	of whether this whole system works ;)
-	
-2000-04-07 20:41  jesse
-
-	* webrt/Search/Listing.html:
-
-	Added the first bit of code to support queue/owner/requestor/subject search.
-	This will make up the core of the  web search functionality of the first release of the webui. (not the 2.0 release, but the "tobix needs it now) release.
-	
-2000-04-07 14:53  tobiasb
-
-	* etc/schema.mysql, lib/RT/Ticket.pm, lib/RT/Watchers.pm,
-	lib/RT/Action/SendEmail.pm:
-
-	hm ... seems like I forgot to commit my last work
-	
-2000-04-07 03:55  tobiasb
-
-	* lib/RT/: Ticket.pm, Transaction.pm:
-
-	it almost works now
-	
-2000-04-06 17:40  tobiasb
-
-	* lib/RT/Transaction.pm:
-
-	development
-	
-2000-04-06 17:21  tobiasb
-
-	* lib/RT/: Ticket.pm, Transaction.pm, Action/Notify.pm,
-	Action/SendEmail.pm:
-
-	ouch, found a lot of fatal stubs
-	
-2000-04-06 16:54  tobiasb
-
-	* etc/schema.mysql, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	lib/RT/Action/Notify.pm, lib/RT/Action/SendEmail.pm:
-
-	still fighting with the mail handling
-	
-2000-04-06 16:12  tobiasb
-
-	* etc/schema.mysql, lib/RT/Scrips.pm, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm, lib/RT/Action/Notify.pm:
-
-	New snapshot of development.  Note the change I've done in the Type recognizion
-	when selecting the right Scrips in Transaction::Create - it should be more
-	flexible this way (replaced "ne" with "!~").  Check the change to schema for
-	an example of how this is more flexible.
-	
-2000-04-06 15:36  tobiasb
-
-	* lib/RT/Action/Notify.pm:
-
-	Recipient finder
-	
-2000-04-06 15:35  tobiasb
-
-	* etc/schema.mysql, lib/RT/Template.pm, lib/RT/Action/SendEmail.pm:
-
-	Snapshot; I'm not finished debugging yet, but this should (hopefully) be
-	very close to actually work.
-	
-2000-04-06 11:38  tobiasb
-
-	* docs/FAQ:
-
-	this clearly needs a lot more work ...
-	
-2000-04-06 11:31  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	...ah, this felt good.
-	
-	Checked the recent version of Mailtools at CPAN, so I used the "right"
-	method for sending emails.
-	
-	I also added back again the SetRecipients method, and documented it in
-	the POD.
-	
-	I think I will get this working in a couple of hours, so please don't
-	disturb me saying that you disagree very much to those changes.. :)
-	
-2000-04-06 10:46  tobiasb
-
-	* etc/schema.mysql:
-
-	Bugfixing
-	
-2000-04-06 10:40  tobiasb
-
-	* etc/schema.mysql:
-
-	I think that I will get this up working during the next few hours.
-	
-	If I eventually get it working, I'd really appreciate that you don't
-	wreck it until the web interface is working and until we've discussed
-	the design thoroughly and come down to some consensus about it.
-	
-2000-04-06 06:22  tobiasb
-
-	* webrt/Elements/Checkbox:
-
-	This is not my turf ... and I don't know what I'm doing ... anyway, it didn't work, but now it works (?) :)
-	
-2000-04-06 01:49  jesse
-
-	* lib/RT/Action/SendEmailOnResolve.pm:
-
-	file SendEmailOnResolve.pm was initially added on branch rt-1-1.
-	
-2000-04-06 01:49  jesse
-
-	* Makefile, etc/schema.mysql, lib/RT/Template.pm,
-	lib/RT/Action/MailComment.pm, lib/RT/Action/MailCorrespondence.pm,
-	lib/RT/Action/Notify.pm, lib/RT/Action/NotifyOnResolve.pm,
-	lib/RT/Action/SendEmail.pm, lib/RT/Action/SendEmailOnResolve.pm:
-
-	Ok, i think i significantly cut down the complexity of the actions we've got
-	so far. I nuked the old notify rules, as they were superceeded by my more
-	capable SendEmail.pm There are still a few things I'm not happy with...
-	like, the way that scrips, scripscopes and templates are related. it needs
-	some thought and cleanup. but i think it'll work just fine for now.
-	
-	I redid the templates and scrips to fit with the revised actions and added
-	some more docs to SendEmail.pm
-	
-	the generic RT::Action should deal with templates, not SendEmail, I think,
-	but I'm leaving that abstraction for another day.
-	
-	Oh, the Argument from the scrip is now passed into the template as $T::Argument.
-	
-2000-04-05 23:24  jesse
-
-	* webrt/Elements/Checkbox:
-
-	stylistic cleanup
-	using an explicit defined ($foo)
-	
-2000-04-05 18:02  tobiasb
-
-	* webrt/: Elements/Checkbox, Search/PickRestriction:
-
-	Only minor corrections
-	
-2000-04-05 17:43  tobiasb
-
-	* webrt/Search/PickRestriction:
-
-	It certainly doesn't work okay ... I think I should look into it a bit ...
-	
-2000-04-05 17:08  tobiasb
-
-	* webrt/Search/PickRestriction:
-
-	Added ugly submit button
-	
-2000-04-05 10:34  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Temporary implementation of kill
-	
-	As mentionated earlier, I think the right thing is to just set status
-	'dead' and then eventually do some garbage collection later.
-	
-2000-04-05 08:55  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	More error handling
-	
-2000-04-05 08:51  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	added some comments around the dies pointing out that we need better error handling.
-	
-2000-04-05 05:34  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	Doh...I'm really stupid sometimes...
-	
-2000-04-05 05:31  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	For some weird reason (perl 5.6.0 bug?) it wouldn't work here without this fix.
-	
-2000-04-05 00:35  jesse
-
-	* docs/design_docs/acls:
-
-	initial musings on acls for 2.0
-	
-2000-04-05 00:35  jesse
-
-	* docs/design_docs/acls:
-
-	file acls was initially added on branch rt-1-1.
-	
-2000-04-04 09:52  tobiasb
-
-	* etc/schema.mysql:
-
-	Language idea
-	
-2000-04-04 02:17  jesse
-
-	* Makefile, README, bin/rtmux.pl, etc/config.pm:
-
-	The first little bits of structure for future L10n support
-	
-2000-04-03 12:40  tobiasb
-
-	* Makefile, bin/rtmux.pl:
-
-	Cleaned out yet some more visible configuration bugs
-	
-2000-04-03 12:29  tobiasb
-
-	* README:
-
-	Some fixes
-	
-2000-04-03 10:44  tobiasb
-
-	* Makefile, bin/rtmux.pl:
-
-	Just a configuration fix.
-	
-2000-04-03 01:26  jesse
-
-	* Makefile, bin/rtmux.pl:
-
-	Ok, I've modified rtmux.pl and Makefile to add in the first bits of stub
-	code for running Mason as a cgi. it compiles and appears to invoke.
-	but I haven't tested it under a webserver. I've gotta get to sleep now, but
-	figured this would give tobias a leg up with his testing today.
-	
-	Subject:      RE: [Mason] Mason under CGI (was: replacing storyserver)
-	Author:       Ilmari Karonen <iltzu@sci.fi>
-	Date:         Fri, 17 Sep 1999 15:10:20 +0300 (EET DST)
-	
-	On Thu, 16 Sep 1999, Ben Munoz wrote:
-	> I'm running Apache 1.3.6 on NT.  I'm looking to install HTML::Mason and see
-	> what it can do, but from what I've read, I can't install mod_perl with the
-	> current version of ActiveState's Perl, which I have installed on my machine.
-	
-	I realize this is probably not what you were asking for, but I'd like to
-	mention here my recent (yesterday) experience in setting up Mason under
-	plain ol' CGI.
-	
-	Setting: One Mason top level component plus a few subcomponents on a
-	development server with mod_perl and Mason. One production server with the
-	least possible selection of modules. (Not even mod_so!)
-	
-	Needed to quickly get the Mason component up and running on the second
-	server. Installing Mason itself and a few other perl modules was easy.
-	But adding mod_perl was definitely out of the question.
-	
-	What I did was take the usual handler.pl, copy it to cgi-bin, deleting
-	everything from "my $ah = new HTML::Mason::ApacheHandler" onward
-	inclusive, and replacing it with the following:
-	
-	    use CGI;
-	    my $q = new CGI;
-	
-	    # This routine comes from ApacheHandler.pm:
-	    my (%args);
-	    foreach my $key ( $q->param ) {
-	      foreach my $value ( $q->param($key) ) {
-	        if (exists($args{$key})) {
-	          if (ref($args{$key})) {
-	            $args{$key} = [@{$args{$key}}, $value];
-	          } else {
-	            $args{$key} = [$args{$key}, $value];
-	          }
-	        } else {
-	          $args{$key} = $value;
-	        }
-	    }
-	
-	    my $comp = $ENV{'PATH_TRANSLATED'};
-	    my $root = $interp->comp_root;
-	    $comp ~= s/^$root//  or die "Component outside comp_root";
-	
-	    $interp->exec($comp, %args);
-	
-	This, plus an Action line in httpd.conf mapping *.mas to this script, has
-	so far done the job just fine.
-	
-	One problem I noticed was that this all would've been much harder if I
-	hadn't been familiar with the way ApacheHandler.pm uses CGI.pm and hadn't
-	known where to find that parsing routine. IMHO it'd be a good idea to
-	separate this loop into a user-callable subroutine.
-	
-	(Note: this was Mason 0.6.mumble - I have no experience with the newer
-	versions.)
-	
-	--
-	Ilmari Karonen (iltzu@sci.fi)
-	http://www.sci.fi/~iltzu/
-	
-	_______________________________________________
-	Mason maillist  -  Mason@netizen.com.au
-	http://netizen.com.au/mailman/listinfo/mason
-	
-2000-04-03 00:49  jesse
-
-	* bin/rtmux.pl, etc/schema.mysql, lib/RT/Action.pm,
-	lib/RT/CurrentUser.pm, lib/RT/Scrip.pm, lib/RT/ScripScopes.pm,
-	lib/RT/Template.pm, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	lib/RT/Watchers.pm, lib/RT/Action/AutoReply.pm,
-	lib/RT/Action/SendEmail.pm:
-
-	Well, that was an exciting afternoon! Er, an exciting evening!
-	*grin* AutoReply now works. which means that all the infrastructure for
-	scrips is back in place.  It required refactoring things a bit. as cool
-	as making RT::Template a MIME::Entity seemed, I just couldn't get it to work
-	right, so now, it just creates a MIME::Entity when it needs it, which is
-	probably better anyway.  I simplified templates a bit. Now they only have
-	access to the Ticket and Transaction. This may not be wise, but we'll see.
-	
-	Also, I merged the two blobs per template (headers and body).
-	
-2000-03-31 08:25  tobiasb
-
-	* bin/webmux.pl:
-
-	rmvd dupl line
-	
-2000-03-31 02:47  jesse
-
-	* Makefile:
-
-	removed old webui hooks from the makefile. bumped the version to 1.3.0
-	
-2000-03-31 02:32  jesse
-
-	* webrt/Elements/Error:
-
-	file Error was initially added on branch rt-1-1.
-	
-2000-03-31 02:32  jesse
-
-	* webrt/Ticket/DisplayTicket:
-
-	file DisplayTicket was initially added on branch rt-1-1.
-	
-2000-03-31 02:32  jesse
-
-	* webrt/: Elements/Error, Elements/SelectStatus,
-	Ticket/Display.html, Ticket/DisplayTicket,
-	Ticket/DisplayTransaction, Ticket/ProcessUpdate.html,
-	Ticket/Update.html:
-
-	Ticket/Update.html will now allow you to submit a ticket update.
-	It's the RT2 equivalent of RT1.0's "comment" and "correspond" pages...
-	with a bit of added value. it's not a global "modify ticket" page. that comes
-	next. but it's where 90% of your single-ticket action will take place.
-	
-2000-03-31 02:28  jesse
-
-	* lib/RT/Ticket.pm:
-
-	TimeTaken should increment now
-	
-2000-03-31 02:26  jesse
-
-	* README:
-
-	added the mason dependency to the README
-	
-2000-03-31 02:25  jesse
-
-	* bin/webmux.pl:
-
-	added some uses to the webmux so I don't have to add them to each page that
-	calls them
-	
-2000-03-30 00:44  jesse
-
-	* webrt/Search/PickRestriction:
-
-	made the variable names in PickRestriction look more like the parameter names
-	in EasySearch. Wanna guess why?
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Search/RestrictSearch.html:
-
-	file RestrictSearch.html was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Search/PickRestriction:
-
-	file PickRestriction was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/Footer:
-
-	file Footer was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/: Elements/Checkbox, Elements/Footer, Elements/Header,
-	Elements/SelectBoolean, Elements/SelectDate,
-	Elements/SelectDateRelation, Elements/SelectOwner,
-	Elements/SelectQueue, Elements/SelectStatus, Elements/dayMenu,
-	Elements/monthMenu, Elements/yearMenu, Search/PickRestriction,
-	Search/RestrictSearch.html:
-
-	A bunch of infrasturcture work on the Ticket Search interface. it doesn't
-	have any real logic behind it. that's next.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/SelectBoolean:
-
-	file SelectBoolean was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/dayMenu:
-
-	file dayMenu was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/SelectStatus:
-
-	file SelectStatus was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/SelectQueue:
-
-	file SelectQueue was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/yearMenu:
-
-	file yearMenu was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/Checkbox:
-
-	file Checkbox was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/Header:
-
-	file Header was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/SelectOwner:
-
-	file SelectOwner was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/monthMenu:
-
-	file monthMenu was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/SelectDateRelation:
-
-	file SelectDateRelation was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/SelectDate:
-
-	file SelectDate was initially added on branch rt-1-1.
-	
-2000-03-29 00:33  jesse
-
-	* etc/schema.mysql:
-
-	added a generic "RefersTo" ticket type to the comments.
-	changed the types of Link.Base and Link.Target to VARCHAR(255) from INT(11)
-	
-2000-03-28 05:16  tobiasb
-
-	* README, tools/test:
-
-	darn, it seems like I'll need to install mod-perl ... actually I haven't done that earlier..
-	
-2000-03-28 00:13  jesse
-
-	* Makefile, lib/RT/Record.pm, lib/RT/Transaction.pm,
-	webrt/Search/Listing.html, webrt/Search/QueueItem:
-
-	webrt/Search/Listing.html now gives a basic listing of all open tickets
-	It even has links to the _still display only_ Display.html for each ticket
-	
-2000-03-27 23:55  jesse
-
-	* webrt/Ticket/DisplayTransaction:
-
-	missed this one. sorry.
-	
-2000-03-27 23:55  jesse
-
-	* webrt/Ticket/DisplayTransaction:
-
-	file DisplayTransaction was initially added on branch rt-1-1.
-	
-2000-03-27 23:54  jesse
-
-	* webrt/Ticket/: Display.html, DisplayHistory:
-
-	Hey. Look Ticket/Display.html?id=<int> works!
-	
-2000-03-27 22:35  jesse
-
-	* webrt/Ticket/ToolBar:
-
-	file ToolBar was initially added on branch rt-1-1.
-	
-2000-03-27 22:35  jesse
-
-	* webrt/Ticket/DisplaySummary:
-
-	file DisplaySummary was initially added on branch rt-1-1.
-	
-2000-03-27 22:35  jesse
-
-	* webrt/Ticket/DisplayHistory:
-
-	file DisplayHistory was initially added on branch rt-1-1.
-	
-2000-03-27 22:35  jesse
-
-	* README, webrt/Ticket/DisplayHistory, webrt/Ticket/DisplaySummary,
-	webrt/Ticket/ToolBar:
-
-	Work on WebRT, including a README update!
-	
-	check out  http://s.ly/~jesse/2000_03_28_171606_shot.jpg
-	
-2000-03-27 22:31  jesse
-
-	* lib/RT/Watchers.pm:
-
-	Bugfix in Watchers AdministrativeCc -> AdminCc
-	
-2000-03-27 22:30  jesse
-
-	* webrt/Ticket/: Display.html, Displaysummary, Update.html:
-
-	Work on WebUI. Display.html has slight functionality
-	
-2000-03-27 22:13  tobiasb
-
-	* docs/design_docs/basic-definitions.txt, tools/test:
-
-	minor
-	
-2000-03-27 21:50  tobiasb
-
-	* tools/test:
-
-	added some stuff to the test script
-	
-2000-03-27 21:32  tobiasb
-
-	* lib/RT/: ScripScope.pm, Transaction.pm:
-
-	bugfixing
-	
-2000-03-27 21:22  tobiasb
-
-	* lib/RT/Transaction.pm:
-
-	...well, even more bugs...
-	
-2000-03-27 21:09  tobiasb
-
-	* lib/RT/: Scrip.pm, ScripScope.pm, Template.pm, Transaction.pm:
-
-	First level bugfixing completed; Now the create (from the cli) calls up the action (though as earlier mentionated no emails are sent).
-	
-2000-03-27 20:54  tobiasb
-
-	* lib/RT/Scrip.pm:
-
-	bgfx
-	
-2000-03-27 20:47  tobiasb
-
-	* lib/RT/Scrip.pm:
-
-	Bugfix
-	
-2000-03-27 20:22  tobiasb
-
-	* lib/RT/ScripScope.pm:
-
-	bugfix
-	
-2000-03-27 20:19  tobiasb
-
-	* docs/design_docs/basic-definitions.txt:
-
-	clarified
-	
-2000-03-27 18:58  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	The recipients aren't set anywhere as far as I can see ... and I'm really uncertain what you've thought of with SetEnvelopeTo vs SetTo, etc.  You'd better take a look.  Obviously, this won't work until the recipients are set somehow
-	
-2000-03-27 18:40  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	I've mostly only added comments.  Anyway, I must say that I like this
-	code. (maybe I'll say something different when I've tried debugging it
-	;)
-	
-2000-03-27 17:59  tobiasb
-
-	* lib/RT/ScripScope.pm:
-
-	bugfix
-	
-2000-03-27 17:57  tobiasb
-
-	* lib/RT/Action.pm:
-
-	comment/folding bugfix
-	
-2000-03-27 17:56  tobiasb
-
-	* docs/design_docs/basic-definitions.txt:
-
-	file basic-definitions.txt was initially added on branch rt-1-1.
-	
-2000-03-27 17:56  tobiasb
-
-	* docs/design_docs/basic-definitions.txt:
-
-	(no comment :)
-	
-2000-03-27 17:55  tobiasb
-
-	* docs/design_docs/link-definitions.txt:
-
-	I think maybe those additions might be appreciated by Rouillard ... and this was (hopefully) the last thing I do with design documentation/discussion until 1.3 is finished :)
-	
-2000-03-27 17:33  tobiasb
-
-	* docs/design_docs/link-definitions.txt:
-
-	Doh ... I really shouldn't waste my time on this now ...
-	
-2000-03-27 17:17  tobiasb
-
-	* lib/RT/Scrip.pm:
-
-	Did you ever try to see if those modules would pass `perl -c'? :)
-	
-2000-03-27 16:44  jesse
-
-	* etc/schema.mysql, lib/RT/Action.pm, lib/RT/Scrip.pm,
-	lib/RT/ScripScope.pm, lib/RT/Action/AutoReply.pm,
-	lib/RT/Action/SendEmail.pm:
-
-	Lots of works on Scrip, ScripScope, Action. Tobias: wanna take a look?
-	Basically, now Templates are autoloaded by RT::Scrip.pm and passed into
-	the Action as TemplateObj.  Also, Templates are now of type MIME::Entity,
-	which means that they have all the attributes of mail messages and can
-	just be sent.
-	
-2000-03-27 16:20  tobiasb
-
-	* docs/design_docs/: TransactionTypes.txt, link-definitions.txt:
-
-	Linking definitions
-	
-2000-03-27 16:20  tobiasb
-
-	* docs/design_docs/link-definitions.txt:
-
-	file link-definitions.txt was initially added on branch rt-1-1.
-	
-2000-03-27 16:01  tobiasb
-
-	* docs/README.docs:
-
-	Updated the README to reflect that the docs are old :)
-	
-2000-03-27 15:45  tobiasb
-
-	* README:
-
-	status update
-	
-2000-03-27 15:41  tobiasb
-
-	* lib/RT/ScripScope.pm:
-
-	minor string fix
-	
-2000-03-27 15:36  tobiasb
-
-	* docs/design_docs/subscription-definitions.txt:
-
-	How does the system determinate whom to send mail to?
-	
-	The ScripScope table in the DB should indicate whether a Scrip is relevant
-	for a queue or not /* TobiX thinks that this might eventually be extended to
-	keywords, tickets, etc, and not only Queues */ ... the Scope table should
-	indicate whether the Scrip is relevant for a given transaction type ... then
-	the given Action should determinate whether it applies or not, and finally
-	the Action has to find out (via the Watchers table) whom it applies to, and
-	how to contact them ... and the Template tells how the mails that are sent
-	out should look like.
-	
-2000-03-27 12:33  jesse
-
-	* lib/RT/ScripScopes.pm:
-
-	file ScripScopes.pm was initially added on branch rt-1-1.
-	
-2000-03-27 12:33  jesse
-
-	* lib/RT/: ScripScope.pm, ScripScopes.pm:
-
-	a bit more stub work on ScripScopes for tobias.
-	more work after lunch
-	
-2000-03-27 07:18  tobiasb
-
-	* lib/RT/ScripScope.pm:
-
-	test..?
-	
-2000-03-27 07:04  tobiasb
-
-	* lib/RT/: ScripScope.pm, Scrips.pm:
-
-	Initiated work to get the code understand the Scrips/Scripscope split
-	
-2000-03-27 07:04  tobiasb
-
-	* lib/RT/ScripScope.pm:
-
-	file ScripScope.pm was initially added on branch rt-1-1.
-	
-2000-03-27 06:55  tobiasb
-
-	* etc/schema.mysql:
-
-	Added yet a stupid design thought as a comment:
-	
-	# {{{ TABLE ScripScope
-	  (...)
-	  Queue INT(11), #Queue Id 0 for global
-			 # (maybe there might be conditions where otherb
-	                 # Scopes apply, i.e. a ticket, keyword, owner, etc?)
-	
-2000-03-27 00:45  jesse
-
-	* lib/RT/Action/Notify.pm:
-
-	Oops. forgot to commit Notify.pm
-	
-2000-03-27 00:45  jesse
-
-	* lib/RT/Action/Notify.pm:
-
-	file Notify.pm was initially added on branch rt-1-1.
-	
-2000-03-27 00:44  jesse
-
-	* lib/RT/Action/NotifyOnResolve.pm:
-
-	file NotifyOnResolve.pm was initially added on branch rt-1-1.
-	
-2000-03-27 00:44  jesse
-
-	* etc/schema.mysql, lib/RT/Ticket.pm,
-	lib/RT/Action/NotifyOnResolve.pm, lib/RT/Action/NotifyWatchers.pm:
-
-	Work on Notify (Formerly NotifyWatchers)
-	Work on NotifyOnResolve (Formerly NotifyWatchersOnResolve)
-	
-	They don't _work_ per se. But they're getting closer. I'm wondering
-	whether we want to do something smarter with all the addresses we're passing
-	in to make it easier to remove specific ones...for example, we currently
-	have no way to _not_ send mail to the reuqestor.
-	
-2000-03-26 18:13  jesse
-
-	* lib/RT/Action/: AutoReply.pm, SendEmail.pm:
-
-	AutoReply is now a proper subclass of SendEmail.pm
-	Maybe tonight, I'll try to get through some work on the Scrips and ScripScope stuff to make it work again.
-	then to wrok on NotifyWatchers.pm
-	
-2000-03-25 01:03  jesse
-
-	* Makefile, lib/RT/Template.pm, lib/RT/Ticket.pm,
-	lib/RT/Action/SendEmail.pm:
-
-	Work on the templating system. I actually gutted Template.pm and SendEmail.pm
-	(sorry tobix :/)  Basically RT::Template is now A MIME::Entity object, which
-	means that the various things one can do to mail messages can now be done to
-	RT::Template objects, once you run $TemplateObj->Parse on them..
-	SendEmail was cleaned up somewhat to be less intimidating to people who aren't
-	as comfortable with big chunks of fairly dense perl.  Oh and it's a heck of a
-	lot more subclassable now ;)
-	
-	Fixed a tiny bug in Ticket.pm resulting from the changes to Watchers.
-	
-2000-03-24 08:29  tobiasb
-
-	* tools/test:
-
-	I'm making a test suite which is intended to be run off from the Makefile after an install
-	
-2000-03-24 08:29  tobiasb
-
-	* tools/test:
-
-	file test was initially added on branch rt-1-1.
-	
-2000-03-24 08:06  tobiasb
-
-	* etc/schema.mysql:
-
-	Added some more noise
-	
-2000-03-23 23:41  jesse
-
-	* subscription-definitions.txt,
-	docs/design_docs/subscription-definitions.txt, etc/schema.mysql,
-	lib/RT/Action/NotifyWatchers.pm, lib/RT/Action/SendEmail.pm:
-
-	A little bit of cleanup to the SendEmail and NotifyWatchers actions.
-	I probably did more damage than good, but that's what I get for messing
-	with code that makes little sense to me.
-	
-2000-03-23 23:41  jesse
-
-	* docs/design_docs/subscription-definitions.txt:
-
-	file subscription-definitions.txt was initially added on branch rt-1-1.
-	
-2000-03-23 22:19  jesse
-
-	* webrt/Search/BuildSearch:
-
-	Testing the setgid repository. commiting an empty file
-	
-2000-03-23 22:19  jesse
-
-	* webrt/Search/BuildSearch:
-
-	file BuildSearch was initially added on branch rt-1-1.
-	
-2000-03-23 00:50  jesse
-
-	* webrt/Search/QueueFooter:
-
-	file QueueFooter was initially added on branch rt-1-1.
-	
-2000-03-23 00:50  jesse
-
-	* webrt/Search/QueueItem:
-
-	file QueueItem was initially added on branch rt-1-1.
-	
-2000-03-23 00:50  jesse
-
-	* webrt/Search/QueueHeader:
-
-	file QueueHeader was initially added on branch rt-1-1.
-	
-2000-03-23 00:50  jesse
-
-	* webrt/Admin/ModifyUser:
-
-	file ModifyUser was initially added on branch rt-1-1.
-	
-2000-03-23 00:50  jesse
-
-	* lib/RT/Action/NotifyWatchers.pm:
-
-	file NotifyWatchers.pm was initially added on branch rt-1-1.
-	
-2000-03-23 00:50  jesse
-
-	* Makefile, bin/rtmux.pl, etc/schema.mysql, lib/RT/Queue.pm,
-	lib/RT/Scrip.pm, lib/RT/Ticket.pm, lib/RT/Watcher.pm,
-	lib/RT/Action/NotifyWatchers.pm, webrt/Admin/ModifyUser,
-	webrt/Search/Listing.html, webrt/Search/QueueFooter,
-	webrt/Search/QueueHeader, webrt/Search/QueueItem,
-	webrt/Ticket/Displaysummary:
-
-	Did a bit of hacking on webrt2
-	Redid the watchers system according to what I posted earlier to rt-devel
-	Scrips have now broken..but we'll get them working again really soon.
-	Queue Cc and AdminCc now exist in cli adminrt.
-	
-2000-03-22 14:56  tobiasb
-
-	* subscription-definitions.txt:
-
-	definitions in the subscription system
-	
-2000-03-22 14:56  tobiasb
-
-	* subscription-definitions.txt:
-
-	file subscription-definitions.txt was initially added on branch rt-1-1.
-	
-2000-03-22 14:42  tobiasb
-
-	* etc/schema.mysql:
-
-	This is a suggestion about a simple splitting of the Scrips table.  I
-	think the admin tools will be significantly easier to set up if we do
-	it this way.  An administrator can through some UI just add and remove
-	Scrips from a queue.
-	
-2000-03-22 01:02  jesse
-
-	* lib/RT/: ACE.pm, ACL.pm, Action.pm, Area.pm, Areas.pm,
-	Attachment.pm, Attachments.pm, CurrentUser.pm, EasySearch.pm,
-	Queue.pm, Queues.pm, Record.pm, Scrip.pm, Scrips.pm, Template.pm,
-	Templates.pm, Ticket.pm, Tickets.pm, Transaction.pm,
-	Transactions.pm, User.pm, Users.pm, Utils.pm, Watcher.pm,
-	Watchers.pm, Action/AutoReply.pm, Action/MailComment.pm,
-	Action/SendEmail.pm, Interface/Email.pm:
-
-	This may look like a lot of code. but it's not.
-	It's merely the result of running
-	
-	perl -pi.bak -e 's/sub (.*?){\n/# {{{ sub $1\nsub $1 {\n/; s/^}$/}\n# }}}/'
-	
-	basically, this adds # {{{ sub function
-		         and # }}}
-	around all the function names. The main reason to do this is for
-	emacs fold-minor-mode.  It makes things a lot easier to read.
-	In an ideal world, we'd have perl-aware folding editor and there'd be
-	no need for this markup
-	
-2000-03-21 20:38  jesse
-
-	* lib/RT/: Queue.pm, Ticket.pm, Watcher.pm, Watchers.pm:
-
-	Work on watchers.
-	
-2000-03-20 15:21  jesse
-
-	* etc/schema.mysql:
-
-	Modified the schema for my "New Improved Watchers" system. Basically,
-	now you'll be able to tie a template to a given watch. along with a
-	boolean "send mail" flag.  We'll need a special "Mail Watchers" action to
-	make this all work..but the code should be pretty easy.
-	
-		jesse
-	
-2000-03-20 05:27  tobiasb
-
-	* bin/initdb.mysql:
-
-	bugfix
-	
-2000-03-17 15:20  jesse
-
-	* webrt/Ticket/Create.html:
-
-	file Create.html was initially added on branch rt-1-1.
-	
-2000-03-17 15:20  jesse
-
-	* webrt/Ticket/DisplayHeader:
-
-	file DisplayHeader was initially added on branch rt-1-1.
-	
-2000-03-17 15:20  jesse
-
-	* webrt/Ticket/SetOwner:
-
-	file SetOwner was initially added on branch rt-1-1.
-	
-2000-03-17 15:20  jesse
-
-	* webrt/Ticket/SetStatus:
-
-	file SetStatus was initially added on branch rt-1-1.
-	
-2000-03-17 15:20  jesse
-
-	* webrt/Ticket/: Create.html, Display.html, DisplayHeader,
-	Displaysummary, SetOwner, SetStatus, Update.html:
-
-	More work on the basic webui
-	
-2000-03-17 15:20  jesse
-
-	* webrt/Ticket/Displaysummary:
-
-	file Displaysummary was initially added on branch rt-1-1.
-	
-2000-03-17 11:32  tobiasb
-
-	* bin/initdb.mysql:
-
-	Bugfix, the password passing didn't work as it should.
-	
-2000-03-17 10:52  tobiasb
-
-	* etc/schema.mysql:
-
-	- Slashed away the old "MailQueueMembersOn..." junk.
-	
-	- Added Scrips to the Watchers table.  ... the Watchers/Scrips system
-	seems quite flexible .. BUT .. I have a certain feeling that it might
-	be hard to make administration tools that helps a non-hacking
-	administrator to find out which mails are sent where, etc.  Well,
-	that's something we'll have to worry about later :)
-	
-2000-03-17 08:47  tobiasb
-
-	* Makefile, etc/schema.mysql:
-
-	removed some instanses of 'su' that really shouldn't be needed, and which also broke on anything but GNU shellutils
-	
-2000-03-17 07:32  tobiasb
-
-	* README:
-
-	Some additions and changes to reflect that this is, after all, a
-	development version.  Meri, do you subscribe to cvs-commit? :)
-	
-2000-03-17 06:01  tobiasb
-
-	* etc/schema.mysql:
-
-	# Those subscription field are not used in RT 1.1 as I see it.
-	# I think we should modify the Scrips system so it by default
-	# respects those fields.
-	 MailOwnerOnTransaction INT,             # notify owner on transaction
-	 MailMembersOnTransaction INT,		# notify list members on transaction
-	 MailRequestorOnTransaction INT,	# notify requestor on transaction
-	 MailRequestorOnCreation INT,		# notify user on creation
-	 MailMembersOnCorrespondence INT,		# notify members on creation
-	 MailMembersOnComment INT,		# notify members on comment
-	
-2000-03-16 16:31  jesse
-
-	* webrt/: Search/Listing.html, Ticket/Display.html,
-	Ticket/Modify.html, Ticket/ProcessUpdate.html, Ticket/Update.html,
-	Ticket/ValidateUpdate.html:
-
-	The beginnings of the All New! Web UI based around HTML::Mason
-	There's nothing functional here yet. but it's a start at a framework.
-	Ticket/Update.html is probably the closest to "real" code so far.
-	
-2000-03-16 16:31  jesse
-
-	* webrt/Ticket/ValidateUpdate.html:
-
-	file ValidateUpdate.html was initially added on branch rt-1-1.
-	
-2000-03-16 16:31  jesse
-
-	* webrt/Ticket/Display.html:
-
-	file Display.html was initially added on branch rt-1-1.
-	
-2000-03-16 16:31  jesse
-
-	* webrt/Ticket/Modify.html:
-
-	file Modify.html was initially added on branch rt-1-1.
-	
-2000-03-16 16:31  jesse
-
-	* webrt/Search/Listing.html:
-
-	file Listing.html was initially added on branch rt-1-1.
-	
-2000-03-16 16:31  jesse
-
-	* webrt/Ticket/ProcessUpdate.html:
-
-	file ProcessUpdate.html was initially added on branch rt-1-1.
-	
-2000-03-16 16:31  jesse
-
-	* webrt/Ticket/Update.html:
-
-	file Update.html was initially added on branch rt-1-1.
-	
-2000-03-16 14:46  tobiasb
-
-	* Makefile:
-
-	Changed the default database name from rt to RT to avoid confusion with previously installed versions of rt
-	
-2000-03-16 02:34  tobiasb
-
-	* lib/RT/User.pm:
-
-	Bugfixes:  It was impossible not to give requests to somebody.
-	
-2000-03-16 01:32  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	Bugfixes
-	
-	was
-	
-	  if ($CurrentUser->Id == 0) {
-	    #If it fails, create a user
-	
-	now
-	
-	  unless ($CurrentUser->Id) {
-	    #If it fails, create a user
-	
-	as Id returned undef.
-	
-	Changed 'Queue' to 'QueueTag'.
-	
-	Added some few comments
-	
-2000-03-14 00:40  jesse
-
-	* README:
-
-	Modified the README for the beginnings of the new webui
-	
-2000-03-14 00:39  jesse
-
-	* bin/: rtmux.pl, webmux.pl:
-
-	added webmux. modified rtmux.pl to clean out some cruft
-	
-2000-03-14 00:39  jesse
-
-	* bin/webmux.pl:
-
-	file webmux.pl was initially added on branch rt-1-1.
-	
-2000-03-13 12:53  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	rt-mailgate has now recieved and logged correspondence and comments with current schema.
-	
-2000-03-08 23:26  jesse
-
-	* lib/RT/: Ticket.pm, Transaction.pm:
-
-	DBIx cleanups to deal with load by id when id is null
-	Work on comment and correspond. Eventually, we'll get the
-	per-transaction cc and bcc working.
-	
-2000-03-08 18:22  jesse
-
-	* bin/rtmux.pl, lib/RT/Queue.pm, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm, lib/RT/User.pm:
-
-	rtq works a bit better
-	rtadmin works again.
-	rtadmin -user create
-		-user modify
-	 both seem to work ok
-	
-	rt -create now makes sure a queue exists and permits ticket creation
-	rt -create now make sure a prospective owner has queue membership.
-	
-2000-03-02 17:23  tobiasb
-
-	* lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	lib/RT/Action/SendEmail.pm, etc/schema.mysql:
-
-	resolve, open, take (if unowned, at least) seems to work
-	
-2000-03-02 16:10  tobiasb
-
-	* lib/RT/: Ticket.pm, Ticket.pm:
-
-	Bugfixing
-	
-2000-03-02 14:35  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Correspondence almost works
-	
-2000-03-02 13:26  tobiasb
-
-	* lib/RT/Ticket.pm, lib/RT/Action/MailComment.pm, etc/schema.mysql:
-
-	Comments almost work now (from the cli)
-	
-2000-03-02 12:38  tobiasb
-
-	* lib/RT/Action/: MailComment.pm, MailCorrespondence.pm:
-
-	one minor bugfix + some comments
-	
-2000-03-01 23:58  jesse
-
-	* NEWS:
-
-	brought the news up to date.
-	nuked old /contrib
-	nuked old /etc/templates.
-	
-	bedtime now.
-	
-2000-03-01 23:57  jesse
-
-	* NEWS:
-
-	brought the news up to date (a bit)
-	
-2000-03-01 23:50  jesse
-
-	* Makefile:
-
-	removed a lot of outdated cruft.
-	Bumped the version to 1.1.11 for a release later this week.
-	
-2000-03-01 23:18  jesse
-
-	* lib/RT/: Ticket.pm, Interface/Email.pm:
-
-	The mail gateway now lets you create, comment and correspond on tickets.
-	Ticket->Owner now deals better when the owner is NULL
-	
-2000-03-01 21:27  jesse
-
-	* HACKING:
-
-	minor comments added to hacking
-	
-2000-03-01 21:20  jesse
-
-	* HACKING:
-
-	Trivial change to HACKING to test commitinfo
-	
-2000-03-01 21:09  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	file Email.pm was initially added on branch rt-1-1.
-	
-2000-03-01 21:09  jesse
-
-	* bin/rtmux.pl, lib/RT/Interface/Email.pm:
-
-	work on mailgate
-	
-2000-03-01 18:36  tobiasb
-
-	* docs/design_docs/TransactionTypes.txt, etc/schema.mysql:
-
-	Some loose thoughts only ... as comments and a doc which I'm not sure
-	if it's possible to understand by others than me anyway :)
-	
-	Anyway, it is too complex.  We'll just continue following the current design.
-	
-2000-03-01 18:36  tobiasb
-
-	* docs/design_docs/TransactionTypes.txt:
-
-	file TransactionTypes.txt was initially added on branch rt-1-1.
-	
-2000-03-01 17:51  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Seems like it's a lot of things that doesn't work here.
-	
-2000-03-01 16:26  tobiasb
-
-	* etc/schema.mysql:
-
-	Ehm ... maybe I forgot to commit this one.  It contains some fixes.
-	
-2000-03-01 16:08  jesse
-
-	* TODO:
-
-	ripped a bit of obsolete code from rtmux.pl
-	updated the TODO to reference the production instance of RT.
-	
-2000-03-01 14:48  jesse
-
-	* bin/rtmux.pl:
-
-	removed the old web ui hooks from rtmux.pl
-	
-2000-03-01 12:12  tobiasb
-
-	* lib/RT/: Action.pm, Scrip.pm, Template.pm, Ticket.pm,
-	Watchers.pm, Action/AutoReply.pm, Action/SendEmail.pm:
-
-	I've done some debugging and polishing.  I hope it won't break with stuff you're eventually working with
-	
-2000-02-29 16:58  tobiasb
-
-	* lib/RT/: Queue.pm, Ticket.pm, Watchers.pm:
-
-	One sort of bugfix..
-	
-2000-02-29 16:35  tobiasb
-
-	* lib/RT/: Queue.pm, Template.pm, Ticket.pm, Watcher.pm,
-	Watchers.pm, Action/SendEmail.pm:
-
-	Scrips work for me.  Well, I'm not that sure anyway.  I had actually
-	expected one email to drop in for each Scrip - but I only got the
-	AutoReply and the Correspondence.  Maybe I should debug even more.
-	
-2000-02-29 14:29  tobiasb
-
-	* lib/RT/Watchers.pm:
-
-	LimitToTicket updated (not tested, though)
-	LimitToQueue added     (not tested, though)
-	
-2000-02-29 14:27  tobiasb
-
-	* etc/schema.mysql:
-
-	
-	# Primarly used by RT::Actions::SendEmail as well as some subclasses
-	# to determinate whom to send emails to.  This scheme should work out
-	# better than the scheme under RT 1.0, and should suit most users.
-	# For more fine grained control, it's possible to create tables as you
-	# like and make a new subclass of RT::Actions::SendEmail where the
-	# SetRecepients sub is overloaded :)
-	
-	CREATE TABLE Watchers (
-	   id int(11) AUTO_INCREMENT PRIMARY KEY,
-	   Value int(11),
-	   Scope varchar(16), # Might be "Queue" and "Ticket" as for now
-	                      # ... might be extended to "Keywords", "Owners", etc.
-	   Email VARCHAR(255),
-	   Type VARCHAR(16), #Requestor, Cc, Bcc
-	   Creator INT(11),
-	   Created TIMESTAMP,
-	   LastUpdatedBy INT(11),
-	   LastUpdated TIMESTAMP
-	)\g
-	
-2000-02-29 13:40  tobiasb
-
-	* etc/schema.mysql:
-
-	CREATE TABLE Watchers (
-	   id int(11) AUTO_INCREMENT PRIMARY KEY,
-	   Ticket int(11), # 0 for all
-	   Queue int(11), # 0 for all
-		# We might consider adding more power here,
-		# i.e. TransactionType, Scrip, etc
-	   Email VARCHAR(255),
-	   Type VARCHAR(16), #Requestor, Cc, Bcc
-	   Creator INT(11),
-	   Created TIMESTAMP,
-	   LastUpdatedBy INT(11),
-	   LastUpdated TIMESTAMP
-	)\g
-	
-2000-02-29 10:43  tobiasb
-
-	* etc/schema.mysql:
-
-	Template.{content and title} => Content and Title - since we use
-	UpperCase in the rest of the DD.
-	
-2000-02-29 10:31  tobiasb
-
-	* etc/schema.mysql:
-
-	Blob, that is..
-	
-2000-02-29 10:12  tobiasb
-
-	* etc/schema.mysql:
-
-	Added ExtraHeaders as VARCHAR(255).  255 characters should be enough
-	for storing some few extra header lines, but anyway maybe it should
-	have been blob instead?
-	
-2000-02-29 09:51  tobiasb
-
-	* lib/RT/: Attachment.pm, Action/AutoReply.pm, Action/SendEmail.pm:
-
-	I've continued the work on mail sending.  There is still some missing
-	stuff:
-	
-	1. EasySearch/Scrips issue - currently it doesn't properly output "
-	all scrips that has (queue=0 or queue=this) and (type="any" or type=this)".
-	
-	2. A serious stub in RT::Action::SendEmail - I don't know where to find
-	"interessted parties".  I think it could be nice putting queue watchers
-	in the same table as ticket watchers.
-	
-2000-02-29 09:42  tobiasb
-
-	* lib/RT/Scrips.pm:
-
-	Hack - everything that applies for a Correspondence action also
-	applies for a Create action (I'd daresay).
-	
-2000-02-29 07:02  tobiasb
-
-	* lib/RT/Transaction.pm:
-
-	Some insignificant changes.  Well, one marginally significant; it
-	shouldn't $Scrip->Commit unless $Scrip->Prepare()
-	
-2000-02-29 04:12  tobiasb
-
-	* etc/schema.mysql:
-
-	I've started at general transaction emails.
-	
-2000-02-29 03:58  tobiasb
-
-	* lib/RT/Watchers.pm:
-
-	Added an Emails method.  It can be used like:
-	
-	   print join(",", @{$Watchers->Emails("Requestors")});
-	
-	or
-	
-	   $Watchers->LimitToRequestors;
-	   $Emails=$Watchers->Emails;
-	
-	...
-	
-2000-02-29 02:31  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	Sender => RT-Originator
-	
-2000-02-29 00:40  jesse
-
-	* README:
-
-	Added Into Netowrks and Funcom to the thanks at the top of the readme
-	`
-	
-2000-02-28 23:20  jesse
-
-	* Makefile:
-
-	RT 1.1.10 released. Tobix has autoreply basically working :)
-	
-2000-02-28 22:49  jesse
-
-	* Makefile, NEWS, README:
-
-	Fixed a longstanding bug in the WebRT administrator
-	added a note about stripmime to the readme.
-	added a bit of code from curl.com that adds functionality to rtq for reporting
-	
-2000-02-28 22:17  jesse
-
-	* Makefile, NEWS:
-
-	bumped the version for release of 1.0.2
-	
-2000-02-28 11:33  tobiasb
-
-	* lib/RT/: Template.pm, Transaction.pm, Action/AutoReply.pm,
-	Action/SendEmail.pm:
-
-	AutoReply seems to work now ... except that rtadmin didn't set email
-	aliases for the queue, so the mail bounces with invalid from address.
-	I won't look more at this until tomorrow.  You're very welcome to take
-	over for a while if you feel like it :)
-	
-2000-02-28 11:29  tobiasb
-
-	* etc/schema.mysql:
-
-	AutoReply seems to work now
-	
-2000-02-28 08:18  tobiasb
-
-	* HACKING:
-
-	Added some hints and misc.  Please look through.
-	
-2000-02-28 05:25  tobiasb
-
-	* lib/RT/: Ticket.pm, Transaction.pm, Action/AutoReply.pm,
-	Action/SendEmail.pm:
-
-	- The queue tag rather than queue id is delievered from the cli, this
-	  broke in Ticket::Create.  Fixed.
-	
-	- The Attachments have to be assigned to a transaction before Scrips
-	   is run.  Now the Attachments are delievered as a part of the parameters
-	   to Transaction::Create
-	
-2000-02-27 23:28  tobiasb
-
-	* etc/schema.mysql:
-
-	Fixed the AutoReply template ... still not tested, though.
-	
-2000-02-27 22:04  tobiasb
-
-	* lib/RT/Action/: AutoReply.pm, SendEmail.pm:
-
-	I think we can nuke the old rt/lib/rt/support/mail.pm now - everything
-	should be located in SendEmail.pm, AutoReply.pm and Template.pm by now :)
-	
-	It's not tested yet, and the templates needs upgrading.  Anyway, I will
-	probably not mess more around with the perl code as for now.
-	
-2000-02-27 21:43  tobiasb
-
-	* bin/rtmux.pl:
-
-	Seems like $rtversion="!!RT_VERSION!!" had disappeared.  I renamed the
-	variable to $VERSION.
-	
-2000-02-27 21:22  jesse
-
-	* lib/RT/Ticket.pm:
-
-	dates now display in the cli.
-	
-2000-02-27 20:53  tobiasb
-
-	* lib/RT/Templates.pm:
-
-	Fixed DBIx::EasySearch => RT::EasySearch
-	
-2000-02-27 20:53  tobiasb
-
-	* lib/RT/Template.pm:
-
-	Method Template::Parse added, Text::Template used for the moment.
-	
-	(sigh ... that means my next worktask will be to update the
-	templates...)
-	
-2000-02-27 20:49  jesse
-
-	* lib/RT/Ticket.pm:
-
-	so. Ticket->Create now actually figures out ccs and bccs and requestors from the mime
-	object passed in to it.
-	
-2000-02-27 19:05  jesse
-
-	* lib/RT/Transaction.pm:
-
-	added a comment for tobias about a new line that didn't make sense.
-	
-2000-02-27 18:46  jesse
-
-	* lib/RT/: Ticket.pm, Watchers.pm:
-
-	watchers updates.
-	
-2000-02-27 17:25  tobiasb
-
-	* lib/RT/Template.pm:
-
-	file Template.pm was initially added on branch rt-1-1.
-	
-2000-02-27 17:25  tobiasb
-
-	* lib/RT/: Attachment.pm, Template.pm, Templates.pm,
-	Action/AutoReply.pm, Action/SendEmail.pm:
-
-	Development snapshot.  I guess I'll have it working in half an hour
-	with _efficient_ working, that is some four hours working at my
-	current efficiency rate :/
-	
-2000-02-27 17:25  tobiasb
-
-	* lib/RT/Templates.pm:
-
-	file Templates.pm was initially added on branch rt-1-1.
-	
-2000-02-27 16:43  tobiasb
-
-	* etc/schema.mysql:
-
-	Added some templates
-	
-2000-02-27 11:19  tobiasb
-
-	* lib/RT/: Scrip.pm, Transaction.pm:
-
-	development snapshot
-	
-2000-02-27 10:31  tobiasb
-
-	* lib/RT/Action/: AutoReply.pm, MailComment.pm,
-	MailCorrespondence.pm, SendEmail.pm:
-
-	I've started bashing at the mail sending functionallity.  It seemed quite
-	stubbed to me.
-	
-2000-02-24 03:44  tobiasb
-
-	* etc/schema.mysql:
-
-	minor bug in comment
-	
-2000-02-24 03:24  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	clearing out a potential weird bug
-	
-2000-02-24 00:27  jesse
-
-	* lib/RT/Scrips.pm:
-
-	Fixed a typo in my code near tobix' changes to Scrips.pm. his changes look good.
-	
-2000-02-24 00:03  jesse
-
-	* Makefile, NEWS, README:
-
-	little fix to mail manipulate from "Heather L. Sherman" <heather@idealab.com>
-	
-2000-02-23 17:06  tobiasb
-
-	* lib/RT/: Scrips.pm, Action/SendEmail.pm:
-
-	Some small fixes.  You'd better look through it, as I'm not completely sure what I'm doing :)
-	
-2000-02-23 16:07  tobiasb
-
-	* etc/schema.mysql:
-
-	An insert entry here reffers to SendMail.pm, while the file is SendEmail.pm
-	
-2000-02-23 15:26  jesse
-
-	* docs/rt-templates.html:
-
-	[no log message]
-	
-2000-02-23 11:38  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Could not get 'rt -create' working.  It seems more sane now, but I'm not really sure what I'm doing ... so you should have a peek at it.  I changed  $Id->SUPER::_Set("EffectiveId",$id); to $self->SUPER::_Set etc
-	
-2000-02-22 23:35  jesse
-
-	* lib/RT/InterestedParty.pm:
-
-	removed vestigal code
-	
-2000-02-22 23:25  jesse
-
-	* etc/schema.mysql, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	lib/RT/Transactions.pm, lib/RT/Watchers.pm:
-
-	A bit more work on watchers. we're getting close.
-	rtq works today.
-	rt -create basically works.
-	rt -take works.
-	
-	rt -show will now start to show ownership changes.
-	
-2000-02-22 08:06  jesse
-
-	* Makefile, etc/schema.mysql, lib/RT/Ticket.pm:
-
-	Work on Watchers.  Most of the code needed to make this work is now
-	present. sadly I haven't even _tried_ to run it yet.
-	
-2000-02-21 01:33  jesse
-
-	* lib/RT/Watcher.pm:
-
-	file Watcher.pm was initially added on branch rt-1-1.
-	
-2000-02-21 01:33  jesse
-
-	* lib/RT/: InterestedParties.pm, InterestedParties.pm~,
-	Notification.pm, Ticket.pm, Watcher.pm, Watchers.pm:
-
-	Renamed interested parties to "Watchers"
-	Watchers are now keyed by EmailAddress rather than UserId. Not every CC will have an rt account, i think
-	
-2000-02-21 01:33  jesse
-
-	* lib/RT/Watchers.pm:
-
-	file Watchers.pm was initially added on branch rt-1-1.
-	
-2000-02-20 18:28  jesse
-
-	* lib/RT/InterestedParties.pm~:
-
-	file InterestedParties.pm~ was initially added on branch rt-1-1.
-	
-2000-02-20 18:28  jesse
-
-	* lib/RT/InterestedParties.pm:
-
-	file InterestedParties.pm was initially added on branch rt-1-1.
-	
-2000-02-20 18:28  jesse
-
-	* lib/RT/InterestedParty.pm:
-
-	file InterestedParty.pm was initially added on branch rt-1-1.
-	
-2000-02-20 18:28  jesse
-
-	* lib/RT/: InterestedParties.pm, InterestedParties.pm~,
-	InterestedParty.pm:
-
-	[no log message]
-	
-2000-02-20 18:24  jesse
-
-	* etc/schema.mysql, lib/RT/Ticket.pm:
-
-	[no log message]
-	
-2000-02-20 15:27  jesse
-
-	* etc/schema.mysql, lib/RT/Action.pm, lib/RT/Scrip.pm,
-	lib/RT/Action/AutoReply.pm, lib/RT/Action/SendEmail.pm:
-
-	Work on scrips. stubs for the webui
-	
-2000-02-19 17:45  jesse
-
-	* lib/RT/: Action.pm, Scrip.pm:
-
-	work on actions. checking in for eric to take a look
-	
-2000-02-19 16:48  jesse
-
-	* lib/RT/Action/AutoReply.pm:
-
-	file AutoReply.pm was initially added on branch rt-1-1.
-	
-2000-02-19 16:48  jesse
-
-	* lib/RT/Action/MailCorrespondence.pm:
-
-	file MailCorrespondence.pm was initially added on branch rt-1-1.
-	
-2000-02-19 16:48  jesse
-
-	* lib/RT/Action.pm:
-
-	file Action.pm was initially added on branch rt-1-1.
-	
-2000-02-19 16:48  jesse
-
-	* lib/RT/Action/MailComment.pm:
-
-	file MailComment.pm was initially added on branch rt-1-1.
-	
-2000-02-19 16:48  jesse
-
-	* lib/RT/: Action.pm, Action/AutoReply.pm, Action/MailComment.pm,
-	Action/MailCorrespondence.pm, Action/SendEmail.pm:
-
-	As it turns out, Action needed to be abstracted a bit and renamed.
-	
-	I'm also making the Object syntax a bit.
-	
-2000-02-19 16:48  jesse
-
-	* lib/RT/Action/SendEmail.pm:
-
-	file SendEmail.pm was initially added on branch rt-1-1.
-	
-2000-02-17 09:19  jesse
-
-	* etc/schema.mysql, lib/RT/Scrip.pm, lib/RT/Scrips.pm,
-	lib/RT/Transaction.pm:
-
-	The base architecture for Scrips to work should now be in place.
-	Next up: write example "Actions" (gotta move the Scrips directory to Actions)
-	for the scrip handlers to use.
-	
-2000-02-16 09:59  jesse
-
-	* lib/RT/: Scrip.pm, Transaction.pm:
-
-	Starting to make scrips actually work
-	
-2000-02-10 23:24  jesse
-
-	* lib/RT/Scrips.pm:
-
-	file Scrips.pm was initially added on branch rt-1-1.
-	
-2000-02-10 23:24  jesse
-
-	* lib/RT/: Scrip.pm, Scrips.pm, Transaction.pm:
-
-	more work stubbing scrips. but now my arms hurt badly enough that i'm going to log out.
-	
-2000-02-10 23:24  jesse
-
-	* lib/RT/Scrip.pm:
-
-	file Scrip.pm was initially added on branch rt-1-1.
-	
-2000-01-31 02:38  tobiasb
-
-	* README, lib/RT/Attachments.pm:
-
-	does the commit automail work now?
-	
-2000-01-30 23:54  jesse
-
-	* NEWS, README, etc/schema.mysql, lib/RT/CurrentUser.pm,
-	lib/RT/Record.pm, lib/RT/User.pm:
-
-	Work on the User object.
-	The mail gateway now autocreates users. (This will make more sense
-	once we start tying tickets to users by means of the InterestedParties table.
-	
-2000-01-29 01:33  jesse
-
-	* Makefile:
-
-	makefile cleanup. including removing the C compiler and template and
-	transaction directories
-	
-2000-01-29 01:30  jesse
-
-	* Makefile:
-
-	removed C compiler from the makefile
-	
-2000-01-29 01:25  jesse
-
-	* Makefile:
-
-	Removed C compiler from the makefile. we just don't need it anymore
-	
-2000-01-29 01:22  jesse
-
-	* Makefile:
-
-	bumped version to 1-1-8
-	
-2000-01-29 01:20  jesse
-
-	* Makefile:
-
-	removed template and transaction paths from the makefile.
-	(to test new cvs wrappers and cuz they should be gona anyway)
-	
-2000-01-29 00:26  jesse
-
-	* etc/schema.mysql:
-
-	Started to do work on scrips. see the schema for how it would work.
-	
-2000-01-28 20:04  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Some modifications and bugfixes on the messages popping up after a `successful' correspondence/comment
-	
-2000-01-28 19:47  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Removed some annoying warnings.  I don't know if this is the "right"
-	way to remove them, but it works (for me, at least), it's an easy
-	way to do it, and it's harmless;
-	
-	instead of writing
-		$var_that_might_be_undef
-	I write
-		$var_that_might_be_undef || ""
-	eventually with parantheses, and eventually with "" replaced by 0, or maybe
-	(not tested) even undef.
-	
-2000-01-28 13:22  tobiasb
-
-	* Makefile:
-
-	Two substitution parameters was forgotten in config.pm
-	
-2000-01-28 13:12  tobiasb
-
-	* etc/schema.mysql:
-
-	Oups, committed the wrong file
-	
-2000-01-28 13:10  tobiasb
-
-	* Makefile, etc/schema.mysql:
-
-	Two substitution parameters was forgotten in config.pm
-	
-2000-01-27 04:09  tobiasb
-
-	* Makefile, bin/initdb.mysql:
-
-	small password fix
-	
-2000-01-25 23:26  jesse
-
-	* Makefile:
-
-	bumped the version to 1.1.7 for tonight's release.
-	
-2000-01-25 23:12  jesse
-
-	* lib/RT/: Attachments.pm, Ticket.pm, Transaction.pm:
-
-	DBIx::EasySearch now has a -> First method. which is like -> Next, but picks
-	the first element
-	
-	DBIx::Record -> now returns '' rather than undef for null values. it's less
-	likely to break interfaces.
-	
-2000-01-25 16:36  tobiasb
-
-	* README:
-
-	aargh
-	
-2000-01-25 16:31  tobiasb
-
-	* TODO:
-
-	test
-	
-2000-01-25 14:57  tobiasb
-
-	* etc/schema.mysql:
-
-	bugfix
-	
-2000-01-25 14:44  tobiasb
-
-	* Makefile:
-
-	removed obsoleteness
-	
-2000-01-25 14:37  tobiasb
-
-	* README:
-
-	The UPGRADE section of the README was inaccurate
-	
-2000-01-25 14:31  tobiasb
-
-	* lib/RT/Transaction.pm:
-
-	comment bug
-	
-2000-01-24 01:45  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-2000-01-24 01:43  jesse
-
-	* Makefile, NEWS, lib/RT/Attachment.pm, lib/RT/Attachments.pm,
-	lib/RT/Record.pm, lib/RT/Ticket.pm, lib/RT/Tickets.pm,
-	lib/RT/Transaction.pm, lib/RT/Transactions.pm:
-
-	
-	* Attachments support in code. rtq now basically works
-	  Mailgate creates new tickets
-	  rt -show now works a bit (doesn't display transaction content yet)
-	  rt -subject works. several other commandline tools work
-	
-2000-01-23 18:32  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-2000-01-23 18:27  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-2000-01-23 18:19  jesse
-
-	* etc/schema.mysql, lib/RT/Attachment.pm, lib/RT/Attachments.pm,
-	lib/RT/Ticket.pm, lib/RT/Transaction.pm:
-
-	Work to make attachments work. So far we've got something that puts attachments
-	in the database.
-	
-2000-01-21 12:25  tobiasb
-
-	* README:
-
-	doc-bugfix
-	
-2000-01-18 23:56  jesse
-
-	* lib/RT/Ticket.pm:
-
-	work on the mail gateway. (mainly disemboweled it)
-	
-2000-01-18 00:34  jesse
-
-	* lib/RT/Attachments.pm:
-
-	file Attachments.pm was initially added on branch rt-1-1.
-	
-2000-01-18 00:34  jesse
-
-	* docs/API:
-
-	file API was initially added on branch rt-1-1.
-	
-2000-01-18 00:34  jesse
-
-	* lib/RT/Attachment.pm:
-
-	file Attachment.pm was initially added on branch rt-1-1.
-	
-2000-01-18 00:34  jesse
-
-	* HACKING:
-
-	file HACKING was initially added on branch rt-1-1.
-	
-2000-01-18 00:34  jesse
-
-	* HACKING, Makefile, docs/API, etc/schema.mysql,
-	lib/RT/Attachment.pm, lib/RT/Attachments.pm, lib/RT/CurrentUser.pm,
-	lib/RT/Queue.pm, lib/RT/Record.pm, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm, lib/RT/Utils.pm:
-
-	work on attachments.
-	work on structure
-	
-2000-01-17 12:59  jesse
-
-	* Makefile, etc/schema.mysql, lib/RT/ACE.pm, lib/RT/ACL.pm,
-	lib/RT/CurrentUser.pm, lib/RT/Queue.pm, lib/RT/Queues.pm,
-	lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/Transaction.pm,
-	lib/RT/Transactions.pm, lib/RT/User.pm, lib/RT/Users.pm:
-
-	work on create. work on attachments. upcased the table names.
-	
-2000-01-14 15:34  jesse
-
-	* etc/schema.mysql:
-
-	work on schema
-	
-2000-01-14 14:47  jesse
-
-	* NEWS, etc/schema:
-
-	schema change to make long email addresses work better for queue members.
-	
-2000-01-14 01:07  jesse
-
-	* lib/RT/: EasySearch.pm, Record.pm, Ticket.pm, Tickets.pm,
-	Transaction.pm:
-
-	basic searches now work.
-	comments almost work.
-	creates are having an issue with effectiveid not getting set.
-	
-2000-01-13 18:04  jesse
-
-	* Makefile, lib/RT/EasySearch.pm, lib/RT/Tickets.pm:
-
-	[no log message]
-	
-2000-01-13 15:03  jesse
-
-	* lib/RT/Utils.pm:
-
-	file Utils.pm was initially added on branch rt-1-1.
-	
-2000-01-13 15:03  jesse
-
-	* lib/RT/Utils.pm:
-
-	[no log message]
-	
-2000-01-09 20:38  jesse
-
-	* lib/RT/EasySearch.pm:
-
-	file EasySearch.pm was initially added on branch rt-1-1.
-	
-2000-01-09 20:38  jesse
-
-	* lib/RT/: EasySearch.pm, Queue.pm, Queues.pm, Record.pm,
-	Tickets.pm:
-
-	added RT/EasySearch.pm
-	
-	rtadmin queue -list will now show all queues.
-	removed some debugging output
-	
-2000-01-04 01:21  jesse
-
-	* etc/schema.mysql, lib/RT/CurrentUser.pm, lib/RT/Queue.pm,
-	lib/RT/Record.pm, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	lib/RT/User.pm:
-
-	Lots of work. first working ticket update.
-	
-2000-01-04 01:21  jesse
-
-	* lib/RT/CurrentUser.pm:
-
-	file CurrentUser.pm was initially added on branch rt-1-1.
-	
-2000-01-03 07:40  tobiasb
-
-	* README, README:
-
-	bugfix
-	
-2000-01-03 01:39  jesse
-
-	* lib/RT/: Record.pm, Ticket.pm, User.pm:
-
-	basic create support working.
-	more boackend and abstraction work
-	
-2000-01-02 22:04  jesse
-
-	* lib/RT/Ticket.pm:
-
-	[no log message]
-	
-2000-01-02 20:31  jesse
-
-	* lib/RT/: ACE.pm, Area.pm, Queue.pm, Record.pm, Ticket.pm,
-	Transaction.pm, User.pm:
-
-	work on a buit more abstraction
-	
-2000-01-01 19:01  jesse
-
-	* etc/schema.mysql, lib/RT/ACE.pm, lib/RT/Ticket.pm,
-	lib/RT/User.pm:
-
-	work on Ticket.pm, schema.
-	things are starting to use immutable ids when referring to other tables.
-	
-1999-12-30 02:13  jesse
-
-	* Makefile, etc/schema.mysql, lib/RT/Queue.pm, lib/RT/Record.pm,
-	lib/RT/User.pm:
-
-	reworked things to use autoloaded functions.
-	
-1999-12-29 00:24  jesse
-
-	* Makefile, bin/rtmux.pl, etc/schema.mysql, lib/RT/ACE.pm,
-	lib/RT/Area.pm, lib/RT/Queue.pm, lib/RT/Record.pm,
-	lib/RT/Ticket.pm, lib/RT/Transaction.pm, lib/RT/User.pm:
-
-	lots of changes. some of them not quite done perfectly.
-	but admin is closer
-	
-1999-12-28 01:39  jesse
-
-	* bin/rtmux.pl, etc/config.pm, lib/RT/ACE.pm, lib/RT/ACL.pm,
-	lib/RT/Area.pm, lib/RT/Areas.pm, lib/RT/Notification.pm,
-	lib/RT/Queue.pm, lib/RT/Queues.pm, lib/RT/Record.pm,
-	lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/Transaction.pm,
-	lib/RT/Transactions.pm, lib/RT/User.pm, lib/RT/Users.pm:
-
-	rtadmin will now invoke and exit.
-	
-1999-12-27 19:54  jesse
-
-	* Makefile, bin/initacls.mysql, bin/rtmux.pl, etc/acl.mysql,
-	etc/config.pm, lib/RT/Record.pm:
-
-	first steps toward runability
-	
-1999-12-27 01:51  jesse
-
-	* Makefile, bin/rtmux.pl, etc/config.pm:
-
-	trying to get the config worked out
-	
-1999-12-26 21:58  jesse
-
-	* Makefile, Makefile:
-
-	[no log message]
-	
-1999-12-26 21:55  jesse
-
-	* Makefile, Makefile:
-
-	[no log message]
-	
-1999-12-26 21:53  jesse
-
-	* Makefile, Makefile, Makefile:
-
-	[no log message]
-	
-1999-12-26 21:51  jesse
-
-	* Makefile, Makefile, Makefile:
-
-	[no log message]
-	
-1999-12-26 21:45  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1999-12-26 21:42  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1999-12-26 21:34  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1999-12-26 21:19  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1999-12-26 18:35  jesse
-
-	* Makefile:
-
-	work on the makefile
-	
-1999-12-26 17:42  jesse
-
-	* lib/RT/User.pm:
-
-	more fixes for the new Handle object
-	
-1999-12-26 17:03  jesse
-
-	* bin/rtmux.pl, lib/RT/ACL.pm, lib/RT/Areas.pm, lib/RT/Queues.pm,
-	lib/RT/Tickets.pm, lib/RT/Transactions.pm, lib/RT/Users.pm:
-
-	more work on making everything use DBIx::Handle
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Ticket.pm:
-
-	file Ticket.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Queue.pm:
-
-	file Queue.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Transaction.pm:
-
-	file Transaction.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Notification.pm:
-
-	file Notification.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/ACE.pm:
-
-	file ACE.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Areas.pm:
-
-	file Areas.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/ACL.pm:
-
-	file ACL.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Users.pm:
-
-	file Users.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Database.pm:
-
-	file Database.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Tickets.pm:
-
-	file Tickets.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Queues.pm:
-
-	file Queues.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Transactions.pm:
-
-	file Transactions.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Area.pm:
-
-	file Area.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/: ACE.pm, ACL.pm, Area.pm, Areas.pm, Database.pm,
-	Notification.pm, Queue.pm, Queues.pm, Record.pm, Ticket.pm,
-	Tickets.pm, Transaction.pm, Transactions.pm, User.pm, Users.pm:
-
-	moving things to a more sane directory
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Record.pm:
-
-	file Record.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/User.pm:
-
-	file User.pm was initially added on branch rt-1-1.
-	
-1999-12-23 01:05  jesse
-
-	* Makefile, NEWS:
-
-	23 Dec 1999
-	-----------
-	
-	* Enabled a status = unresolved option for the web ui. thanks to
-	  brandon allbery <allbery@ece.cmu.edu> and Marion Hakanson <hakanson@cse.ogi.edu>
-	
-	* Made most of the permissions and directory changes from Marion
-	  Hakanson <hakanson@cse.ogi.edu> generally cleaned things up. but DID not
-	  include the changes to the directory creation, file copying and permission
-	  fixing code to enable RT_VAR_DIR
-	
-	* Made the web ui use $MESSAGE_FONT when putting up the compose window.
-	    Marion Hakanson <hakanson@cse.ogi.edu>
-	
-	* Genericised the templates to not mention the mythical "systems group"
-	
-1999-12-19 01:54  jesse
-
-	* Makefile, etc/schema.mysql:
-
-	work on ticket, transaction.
-	schema cleanup
-	
-1999-12-18 13:25  jesse
-
-	* etc/schema:
-
-	removed obsolete schema
-	
-1999-12-17 01:28  jesse
-
-	* Makefile:
-
-	set version
-	
-1999-12-17 01:27  jesse
-
-	* etc/: config.pm, schema.mysql:
-
-	more cleanup. we're getting there. just another zillion hours or so
-	
-1999-12-15 23:56  jesse
-
-	* docs/: FAQ, FAQ.html:
-
-	faq updates committed
-	
-1999-12-15 23:26  jesse
-
-	* README:
-
-	updates to tobix' additions
-	
-1999-12-15 18:32  tobiasb
-
-	* README:
-
-	duh
-	
-1999-12-15 18:04  tobiasb
-
-	* README:
-
-	Some few pitfalls mentionated
-	
-1999-12-09 00:38  jesse
-
-	* etc/schema.mysql:
-
-	work on Ticket and Transaction.
-	we're getting there.
-	
-1999-12-08 03:40  tobiasb
-
-	* etc/suidrt.c:
-
-	bugfixes
-	
-1999-12-06 21:41  jesse
-
-	* Makefile, NEWS:
-
-	[no log message]
-	
-1999-12-06 06:27  tobiasb
-
-	* Makefile:
-
-	insignificant output fix
-	
-1999-12-04 03:30  jesse
-
-	* NEWS, etc/schema.mysql:
-
-	[no log message]
-	
-1999-12-04 01:46  jesse
-
-	* NEWS:
-
-	Fixed tobix-induced bug in lib/rt/database/manipulate.pm
-	that'll teach him to make untested fixes to the stable branch.
-	
-1999-12-02 13:18  tobiasb
-
-	* etc/schema:
-
-	I'm unfortunately not even half on the way in my merging. I'm in a hurry, some small notes:
-	
-	1.1:
-	- work on dependencies done
-	- work on mail distribution done.
-	- requires sub dist_list
-	- requires sub open_parents
-	- requires sub add_link
-	
-	Dependencies & linking in general.
-	
-	Mail distribution. The distribution list is set by a &dist_list
-	sub. The transaction mail is never sent out for comments and
-	correspondence, but people who subscribe all transactions will get the
-	comments and correspondence.
-	
-1999-12-02 03:10  tobiasb
-
-	* etc/mysql.acl:
-
-	This file is renamed
-	
-1999-12-02 03:05  tobiasb
-
-	* etc/: schema.Pg, schema.mysql:
-
-	This file was fucked up, I don't know why. I'll just truncate it for now
-	
-1999-12-02 02:56  jesse
-
-	* Makefile:
-
-	bumped version
-	
-1999-12-02 02:54  tobiasb
-
-	* etc/schema:
-
-	Added links (dependency + knowledge db)
-	
-1999-12-02 01:42  jesse
-
-	* Makefile:
-
-	some makefile cleanup
-	
-1999-12-01 23:16  jesse
-
-	* NEWS:
-
-	[no log message]
-	
-1999-12-01 23:10  jesse
-
-	* bin/rtmux.pl, etc/schema.mysql:
-
-	mots of work on the new backend.
-	cliadmin is mostly up to date.
-	no, i haven't run any of the code :)
-	
-1999-11-30 21:52  jesse
-
-	* etc/: acl.Pg, schema.mysql:
-
-	[no log message]
-	
-1999-11-23 17:21  jesse
-
-	* docs/design_docs/CARS:
-
-	file CARS was initially added on branch rt-1-1.
-	
-1999-11-23 17:21  jesse
-
-	* README, docs/design_docs/CARS, etc/schema.mysql:
-
-	schema hacking for rt-1-1 features.
-	
-1999-11-18 21:40  jesse
-
-	* Makefile, Makefile, Makefile:
-
-	[no log message]
-	
-1999-11-17 17:36  tobiasb
-
-	* NEWS:
-
-	merged in changes from 1.0
-	
-1999-11-16 23:09  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1999-11-08 20:54  jesse
-
-	* NEWS:
-
-	fixed a longstanding bug in cli/query
-	
-1999-11-08 18:02  jesse
-
-	* Makefile, NEWS, etc/config.pm:
-
-	[no log message]
-	
-1999-11-05 03:50  tobiasb
-
-	* Makefile, NEWS, README, bin/initacls.mysql, bin/initdb.mysql,
-	etc/acl.mysql, etc/config.pm:
-
-	patch from khamer integrated - no testing done, however
-	
-1999-10-22 14:09  tobiasb
-
-	* etc/schema:
-
-	merged 1.1-changes
-	
-1999-10-22 12:14  tobiasb
-
-	* NEWS, etc/mysql.acl, etc/schema:
-
-	Merged in changes from 1.0. I haven't checked that things works quite well, anyway.
-	
-1999-10-21 16:21  jesse
-
-	* Makefile, NEWS:
-
-	changes to date_diff, some of the oldest code in RT
-	
-1999-10-21 07:07  tobiasb
-
-	* docs/actions.txt, docs/admin.txt, docs/attributes.txt,
-	docs/outline.txt, docs/rt_users_guide.html, etc/config.pm:
-
-	merged from 1.0
-	
-1999-10-20 23:16  jesse
-
-	* NEWS:
-
-	[no log message]
-	
-1999-10-20 22:25  jesse
-
-	* NEWS:
-
-	[no log message]
-	
-1999-10-20 21:58  jesse
-
-	* NEWS:
-
-	[no log message]
-	
-1999-10-20 21:43  jesse
-
-	* Makefile, NEWS:
-
-	[no log message]
-	
-1999-10-20 10:33  tobiasb
-
-	* Makefile, NEWS, README, README.91UPGRADE, TODO,
-	bin/initacls.mysql, bin/initdb.mysql, docs/README.docs:
-
-	Merged 1.0-development into 1.1
-	
-1999-10-20 01:23  jesse
-
-	* Makefile, NEWS:
-
-	
-	20 Oct 1999
-	-----------
-	* RT now uses a queue's mail alias when sending mail.
-	
-1999-10-20 00:44  jesse
-
-	* Makefile, NEWS:
-
-	
-	20 Oct 1999
-	-----------
-	
-	* Using the web UI to send correspondence should no longer not
-	  sent the correspondence if there are CCs, BCCs or the actor is
-	  the same as the requestor. thanks to <douglas@arepa.com> for
-	  pointing out the deficiency.
-	
-1999-10-13 19:32  jesse
-
-	* Makefile, TODO:
-
-	Released version 1.0 Updated the TODO file.
-	
-1999-10-06 18:01  jesse
-
-	* Makefile:
-
-	bumped version
-	
-1999-10-06 17:57  jesse
-
-	* Makefile, NEWS, README, docs/README.docs:
-
-	[no log message]
-	
-1999-10-06 17:48  jesse
-
-	* docs/: FAQ, FAQ.html, README.docs, actions.html, actions.txt,
-	admin.html, admin.txt, attributes.html, attributes.txt,
-	outline.html, outline.txt, rt_users_guide.html:
-
-	major documentation updates from mbrader
-	
-1999-10-04 14:22  jesse
-
-	* Makefile, NEWS:
-
-	bumped the version to 1.0.0pre2
-	
-1999-10-01 01:39  jesse
-
-	* Makefile:
-
-	fixed a makefile typo
-	
-1999-10-01 01:37  jesse
-
-	* NEWS, README, README.91UPGRADE:
-
-	updated readme
-	
-1999-10-01 01:07  jesse
-
-	* NEWS:
-
-	[no log message]
-	
-1999-10-01 00:22  jesse
-
-	* NEWS, etc/config.pm:
-
-	
-	30 Sep 1999
-	-----------
-	
-	*  Fixed a bug which caused RT to go crazy when comments were submitted
-	   by may without a ticket #.
-	
-	The following changes are from johnl@microware.com
-	
-	   1. Directories were not getting created with the correct modes under            /usr/local/rt/transactions.                                                         The umask() takes an octal file mode mask, not a file mode.                                                                                                     In addition I read the comments about $dirmode not working when             doing the mkdir's in content.pm.  I also fixed content.pm to use                $dirmode.  The main problem was the $dirmode was being set to a string          instead of an octal number.
-	
-	  Fixes to database.pm
-	    1.  The first hunk fixes problem where the call to write_content is             passing $time.  This variable does not exist.   It looked like $time was        supposed to be the current time.  ($time always == 0).  I changed all           occurances of $time to time (IE: time()).                                                                                                                       2.  The first hunk also passes $in_time instead of $time.                                                                                                       3.  The rest of the hunks fix $time and replace them with time().
-	
-	27 Sep 1999
-	-----------
-	Fixed a bug which caused the priority not to get set to the default
-	when requests were created in the webui. Thanks to <Elmar.Knipp@knipp.de>
-	
-1999-09-23 23:16  anoncvs
-
-	* Makefile:
-
-	[no log message]
-	
-1999-09-23 23:09  anoncvs
-
-	* Makefile, Makefile:
-
-	[no log message]
-	
-1999-09-23 23:07  anoncvs
-
-	* Makefile:
-
-	[no log message]
-	
-1999-09-23 23:01  anoncvs
-
-	* Makefile:
-
-	[no log message]
-	
-1999-09-23 22:52  anoncvs
-
-	* Makefile:
-
-	[no log message]
-	
-1999-08-08 22:20  tobiasb
-
-	* etc/schema:
-
-	ups
-	
-1999-08-07 02:27  tobiasb
-
-	* etc/schema:
-
-	in-work
-	
-1999-08-04 02:48  tobiasb
-
-	* Makefile, NEWS:
-
-	Merge
-	
-1999-08-03 22:38  jesse
-
-	* NEWS:
-
-	first cut of -trans
-	
-1999-08-03 22:27  jesse
-
-	* Makefile, NEWS:
-
-	reved the version to .99.9. tiny mail manipulate fix
-	
-1999-08-03 11:31  tobiasb
-
-	* bin/initdb.mysql:
-
-	file initdb.mysql was initially added on branch rt-1-1.
-	
-1999-08-03 11:31  tobiasb
-
-	* bin/initdb.Pg:
-
-	file initdb.Pg was initially added on branch rt-1-1.
-	
-1999-08-03 11:31  tobiasb
-
-	* bin/initacls.mysql:
-
-	file initacls.mysql was initially added on branch rt-1-1.
-	
-1999-08-03 11:31  tobiasb
-
-	* bin/: initacls.Pg, initacls.mysql, initdb.Pg, initdb.mysql:
-
-	Scripts for initing the DB
-	
-1999-08-03 11:31  tobiasb
-
-	* bin/initacls.Pg:
-
-	file initacls.Pg was initially added on branch rt-1-1.
-	
-1999-08-03 10:31  tobiasb
-
-	* etc/schema.mysql:
-
-	file schema.mysql was initially added on branch rt-1-1.
-	
-1999-08-03 10:31  tobiasb
-
-	* etc/schema.Pg:
-
-	file schema.Pg was initially added on branch rt-1-1.
-	
-1999-08-03 10:31  tobiasb
-
-	* etc/acl.mysql:
-
-	file acl.mysql was initially added on branch rt-1-1.
-	
-1999-08-03 10:31  tobiasb
-
-	* etc/acl.Pg:
-
-	file acl.Pg was initially added on branch rt-1-1.
-	
-1999-08-03 10:31  tobiasb
-
-	* Makefile, etc/acl.Pg, etc/acl.mysql, etc/mysql.acl, etc/schema,
-	etc/schema.Pg, etc/schema.mysql:
-
-	More work on the move to a DBMS-independent RT. The Makefile and executables _really_ need some testing and eventually debugging.
-	
-1999-08-03 02:14  tobiasb
-
-	* Makefile, etc/config.pm:
-
-	It seems to me that I've somehow managed to go to DBI...WebRT seems to work locally, but that's the only testing I've done
-	
-1999-08-02 07:07  tobiasb
-
-	* etc/schema:
-
-	in-work
-	
-1999-07-29 02:55  tobiasb
-
-	* etc/schema:
-
-	uuuurghh
-	
-1999-07-28 10:42  tobiasb
-
-	* README:
-
-	One small update on the work to link requests...
-	
-1999-07-27 07:08  tobiasb
-
-	* NEWS:
-
-	1.0-gospel
-	
-1999-07-27 06:48  tobiasb
-
-	* etc/schema:
-
-	asdfjlsadfhjkhdfawhi
-	
-1999-07-26 21:21  jesse
-
-	* Makefile, NEWS:
-
-	fixes to the mail gateway header handling
-	added cli rtq flags to the help
-	
-1999-07-26 07:03  tobiasb
-
-	* NEWS:
-
-	Merge
-	
-1999-07-24 20:43  jesse
-
-	* Makefile:
-
-	bumpted the version
-	
-1999-07-24 20:40  jesse
-
-	* NEWS:
-
-	added a few options to the cli query engine. area limitying and display of due dates.
-	
-1999-07-23 03:20  tobiasb
-
-	* NEWS:
-
-	Some merges
-	
-1999-07-23 02:56  tobiasb
-
-	* etc/schema:
-
-	With generic links
-	
-1999-07-22 23:13  jesse
-
-	* Makefile, NEWS:
-
-	22 Jul 99 (Jesse)
-	-----------------
-	Inital cleanup to the web ticket view. I'd like to significantly
-	compact and simplify that display.  More tables are probably in
-	order.  Additionally, I want to get rid of all those buttons "I
-	changed this." There's just no need for them. we can write logic
-	to do that for us.  Also, I bumped the version to 1.1.1.  I'd like
-	to do this 'linux-kernel-esque' The 1.1.x
-	series will be a development series leading toward 1.2.  Once we
-	get the DB changes in, I'll feel comfortable rolling a 'releaseable'
-	1.1 version for people who like pain.
-	
-1999-07-21 23:47  jesse
-
-	* Makefile, NEWS:
-
-	21 July 1999
-	------------
-	
-	Fix for [fsck #102] Better checks in is_not_a_requestor. this should fix
-	        issues with external users being equated with queue members.
-	
-	Fix for [fsck #114] Comment from bin/rt was accidentaly access controlled.
-	
-	Fix for [fsck #113] Display of requests users can't manipulate should now give
-	        ian error
-	
-1999-07-20 23:40  tobiasb
-
-	* etc/schema:
-
-	For a general way of linking WebRT requests to other web-based DBs
-	
-1999-07-20 21:42  tobiasb
-
-	* NEWS:
-
-	[no log message]
-	
-1999-07-20 21:11  tobiasb
-
-	* NEWS:
-
-	Hmf.
-	
-1999-07-20 21:07  tobiasb
-
-	* README, etc/config.pm:
-
-	updated for Internet::Mail
-	
-1999-07-20 21:01  tobiasb
-
-	* Makefile:
-
-	updated for Internet::Mail
-	
-1999-07-20 01:21  jesse
-
-	* NEWS:
-
-	Fix for [fsck #88] WebUI area SELECT bug.
-	
-	Fix for [fsck #90] A small html bug in WebRT
-	
-	Fix for [fsck #92] "Allow non-members to create requests" appeared twice
-	        in the WebAdmin
-	
-	Fix for [fsck #94] web ui forms are now 78 chars wide
-	
-1999-07-20 00:09  jesse
-
-	* NEWS:
-
-	19 July 1999
-	------------
-	Fix for [fsck #104]  We no longer try to reset the user's uid after writing
-	        transaction content to the filesystem. This should help out Net/OpenBSD
-	        compatibility
-	
-	Removed some legacy support for glimpse searching
-	
-	Fix for [fsck #115] The web ticket list should now wrap reasonably, so it's
-	        printable.
-	
-1999-07-19 03:26  tobiasb
-
-	* NEWS:
-
-	some updates
-	
-1999-07-17 13:14  tobiasb
-
-	* NEWS:
-
-	Updated a bit
-	
-1999-07-16 23:42  tobiasb
-
-	* Makefile:
-
-	Version number 1.pre1.1 - what do you think about it?
-	
-1999-07-16 22:49  tobiasb
-
-	* bin/rtmux.pl:
-
-	Filled in a missing comment
-	
-1999-07-16 22:46  tobiasb
-
-	* Makefile:
-
-	Set version to 1.1.0pre1, and changed /opt/rt to /usr/local/rt, I'd
-	daresay the next is more widely preffered.
-	
-1999-07-16 18:36  tobiasb
-
-	* COPYING, Makefile, NEWS, README, README.91UPGRADE, TODO,
-	bin/rtmux.pl, docs/FAQ, docs/FAQ.html, docs/README.docs,
-	docs/actions.html, docs/actions.txt, docs/admin.html,
-	docs/admin.txt, docs/attributes.html, docs/attributes.txt,
-	docs/outline.html, docs/outline.txt, etc/config.pm, etc/mysql.acl,
-	etc/schema, etc/suidrt.c:
-
-	Imported Tobix' current version
-	
-1999-07-08 02:10  jesse
-
-	* Makefile, NEWS, TODO:
-
-	Rolled .99.8
-	
-1999-07-07 15:37  jesse
-
-	* NEWS:
-
-	[no log message]
-	
-1999-07-07 00:45  jesse
-
-	* Makefile, NEWS:
-
-	updated makefile and news.
-	
-1999-07-06 22:58  jesse
-
-	* NEWS:
-
-	6 Jul 99
-	--------
-	Now, if you move a request to a new queue, it won't disown it if the same person can own reqs in the new queue. [fsck #75] (untested)
-	
-	Fixed a problem with cli create not properly handling due dates ([fsck #67])
-	Fixed a duplicate --help entry for bin/rt [fsck #69]
-	Fixed bugs fsck  #68/77: Odness Merging RT requests
-	
-	Transactions from merged requests will now be displayed along with the request id of the request that transaction was originially associated with.
-	
-	Fixed [fsck #74], which was reported by charlie brady:
-	   Messages are sent out from the mail interface with content first, then
-	   "--- Headers Follow ---", then the headers. In our vanilla sendmail setup,
-	   before the headers is a UUCP style deliver notification "From blah Tue Jul
-	   6 18:13:01 1999" line. This is interpreted by many mail agents as a
-	   message delimiter, so that what is seen in the mail agent is not one, but
-	   two messages. This is easily fixed by using the conventional quoting
-	   mechanism...
-	Fixed [fsck #71] WebRT: "User" should be "Requestor"
-	
-1999-07-06 21:35  jesse
-
-	* NEWS:
-
-	resovled #71, #74. worked on merge functionality
-	
-1999-06-29 17:39  jesse
-
-	* Makefile, NEWS:
-
-	[no log message]
-	
-1999-06-29 17:20  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1999-06-24 00:52  jesse
-
-	* Makefile, NEWS, README, TODO:
-
-	lots of touchups.
-	
-1999-06-23 23:29  jesse
-
-	* NEWS:
-
-	moved to CGI.pm's form parser.
-	
-1999-06-17 01:49  jesse
-
-	* NEWS:
-
-	edited news
-	
-1999-06-16 23:21  jesse
-
-	* Makefile, NEWS:
-
-	Fixed an auth bug.
-	
-1999-06-15 02:13  jesse
-
-	* Makefile:
-
-	upped the version to .99.8pre5
-	
-1999-06-15 02:09  jesse
-
-	* Makefile, NEWS:
-
-	lots of misc changes. see the diff to the news file
-	
-1999-05-12 20:37  jesse
-
-	* Makefile, NEWS:
-
-	cookies hacked to deal with the fact that netscape can't handle path=/
-	
-1999-05-12 01:57  jesse
-
-	* Makefile:
-
-	bumped the version number to .99.8pre3
-	
-1999-05-12 01:56  jesse
-
-	* NEWS:
-
-	Made error messages on the web admin interface more prominent.
-	
-	All the following changes are from tobix:
-	
-		Correspondence from RT now properly reflect the name of the sender
-		in the "from" header.
-	
-		Automated messages now properly have a "Precedence: bulk" header
-	
-		A stupid error with rt::mail_alias has been fixed
-	
-		Tobix' patch removes headers from all correspondence.  I'm relatively
-		afraid of this change, so I'm going to comment it out for now.
-	
-		rtadmin (the commandline has a new tool) :
-		     -update <passwd> <admin> [<users>]  updates user(s) from the
-	                   /etc/passwd file. If no users are specified, ALL
-	                   of /etc/passwd will be processed.
-	
-1999-05-11 16:46  jesse
-
-	* Makefile, NEWS, README:
-
-	mail loop fix from toby
-	
-1999-05-09 20:35  jesse
-
-	* Makefile:
-
-	bumped version numbers
-	
-1999-05-09 20:35  jesse
-
-	* Makefile, NEWS, README:
-
-	updated makefile and news
-	
-1999-05-09 20:17  jesse
-
-	* bin/rtmux.pl:
-
-	modifications to cookies support to md5 hash the password.
-	modification to allow non-nph web ui
-	
-1999-05-05 02:39  jesse
-
-	* NEWS:
-
-	fixed some cookies/frames problems
-	
-1999-05-05 02:10  jesse
-
-	* Makefile, NEWS:
-
-	fixed bugs in web auth from charlie brady
-	
-1999-05-03 21:44  jesse
-
-	* Makefile:
-
-	bumped the version #
-	
-1999-04-28 16:03  jesse
-
-	* Makefile:
-
-	bumped version
-	
-1999-04-28 16:03  jesse
-
-	* NEWS:
-
-	updated content.pm to spit errors.
-	
-1999-04-27 02:58  jesse
-
-	* Makefile:
-
-	downed the makefile version
-	
-1999-04-27 02:57  jesse
-
-	* Makefile:
-
-	fixed a makefile bug
-	
-1999-04-26 21:57  jesse
-
-	* NEWS, README:
-
-	added configuration info about mod_auth_mysql
-	
-1999-04-26 21:45  jesse
-
-	* Makefile, etc/config.pm:
-
-	Updated authetication stuff with patches from ingo. updated them further.
-	Added the ability to configure whether external authentication is done for webrt
-	added the ability to turn off ie compatibility mode
-	
-1999-04-23 19:31  jesse
-
-	* Makefile, NEWS, README, TODO:
-
-	started to update the README and Makefile
-	
-1999-04-13 04:00  jesse
-
-	* Makefile:
-
-	fixed totally fuxored makefile
-	
-1999-04-13 03:28  jesse
-
-	* README:
-
-	noted that there's a dependency on gnu make
-	
-1999-04-13 03:07  jesse
-
-	* Makefile:
-
-	bumped version
-	
-1999-04-13 03:06  jesse
-
-	* NEWS:
-
-	updated news
-	
-1999-04-08 04:36  jesse
-
-	* docs/rt.gif:
-
-	added the gif to the docs
-	
-1999-04-08 04:35  jesse
-
-	* NEWS:
-
-	fixes for new mysql modules
-	
-1999-04-07 23:57  jesse
-
-	* NEWS:
-
-	updates
-	
-1999-04-07 02:14  jesse
-
-	* NEWS:
-
-	[no log message]
-	
-1999-04-07 02:09  jesse
-
-	* Makefile, README:
-
-	fixes for cookie auth from charlie brady
-	
-1999-04-06 06:30  jesse
-
-	* Makefile, NEWS, README:
-
-	misc changes to support cookie authentication
-	
-1999-04-03 04:57  jesse
-
-	* NEWS, docs/FAQ, docs/FAQ.html, docs/README.docs,
-	docs/actions.html, docs/actions.txt, docs/admin.html,
-	docs/admin.txt, docs/attributes.html, docs/attributes.txt,
-	docs/outline.html, docs/outline.txt:
-
-	major update of the docs from adam.
-	
-1999-04-03 04:49  jesse
-
-	* Makefile:
-
-	makefile hackery to ease installs slightly.
-	
-1999-03-21 20:24  jesse
-
-	* Makefile:
-
-	updated makefile
-	
-1999-03-21 20:22  jesse
-
-	* NEWS, README:
-
-	mail changes
-	
-1999-03-08 14:50  jesse
-
-	* NEWS:
-
-	turned off the troll
-	
-1999-03-08 14:02  jesse
-
-	* Makefile:
-
-	fixed makefile bogosity for ACLs
-	
-1999-03-04 01:50  jesse
-
-	* Makefile, NEWS:
-
-	fixed a subject line parsing error.
-	
-1999-02-26 22:29  jesse
-
-	* NEWS:
-
-	added a check to make sure you don't merge ar equest into a non-existent other request
-	
-1999-02-26 21:43  jesse
-
-	* README.91UPGRADE, README.FIRST, TODO:
-
-	moved readme.fdirst to readmne.91upgrade
-	
-1999-02-26 19:59  jesse
-
-	* Makefile, NEWS:
-
-	updated makefile: added upgrade-noclobber
-	
-1999-02-24 19:11  jesse
-
-	* NEWS:
-
-	[no log message]
-	
-1999-02-23 14:41  jesse
-
-	* NEWS:
-
-	updated bnews
-	
-1999-02-23 03:20  jesse
-
-	* docs/: actions.txt, admin.txt, attributes.txt:
-
-	added updates for adam for the docs.
-	
-	updated the news
-	
-1999-02-23 03:20  jesse
-
-	* NEWS:
-
-	updated the news
-	
-1999-02-21 01:56  jesse
-
-	* Makefile:
-
-	fixed the .4
-	
-1999-02-21 01:53  jesse
-
-	* Makefile:
-
-	fixed make pre
-	
-1999-02-20 23:27  jesse
-
-	* Makefile:
-
-	addded back predist
-	
-1999-02-20 16:36  jesse
-
-	* NEWS:
-
-	edited the news to reflect changes
-	
-1999-02-20 14:56  jesse
-
-	* Makefile, NEWS:
-
-	bumped the version to .99.4 for testing.
-	
-1999-02-20 14:48  jesse
-
-	* etc/mysql.acl:
-
-	updated acls so they'll work with newer versions of mysql 3.22
-	
-1999-01-20 02:21  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1999-01-20 02:13  jesse
-
-	* Makefile:
-
-	On another note, here is a fix for the "HTML turd" reported by Benji
-	Cline in lib/rt/ui/web/forms.pm:
-	==========                                                                      diff -r0.99.2 forms.pm
-	87c87                                                                           <               $u = 0;
-	---                                                                             >               $u = 1;
-	91c91                                                                           <                       $u = 1;                                                 ---                                                                             >                       $u = 0;
-	==========
-	
-	With this patch applied, v0.99.2 (0.99.3?)                                      appears to be as solid as v0.9.18, if not more
-	so.
-	
-	Upgraded the version to .99.3
-	
-1999-01-16 20:44  jesse
-
-	* NEWS:
-
-	[no log message]
-	
-1999-01-16 20:39  jesse
-
-	* Makefile:
-
-	fixed a web acls bug. incremented the version.
-	
-1999-01-16 01:22  jesse
-
-	* Makefile:
-
-	bumped version to .99.1
-	
-1999-01-16 01:20  jesse
-
-	* Makefile, NEWS:
-
-	fixed some web admin sillyness..acls work better.
-	we no longer dump back to the main menu quite as gratuitously.
-	acls are no longer broken on the CLI either.
-	
-1998-12-16 01:31  jesse
-
-	* Makefile:
-
-	fixed the following things:
-	
-	From owner-rt-users@horked.fsck.com  Tue Nov 24 02:24:03 1998
-	Return-Path: <owner-rt-users@lists.fsck.com>
-	Received: (from majordomo@localhost)
-		by horked.fsck.com (8.8.7/8.8.7) id CAA11181
-		for rt-users-outgoing; Tue, 24 Nov 1998 02:24:01 -0500
-	X-Authentication-Warning: horked.fsck.com: majordomo set sender to owner-rt-users@lists.fsck.com using -f
-	Received: from modgud.nordicdms.com (h21-168-107.nordicdms.com [207.21.168.107] (may be forged))
-		by horked.fsck.com (8.8.7/8.8.7) with SMTP id CAA11177
-		for <rt-users@lists.fsck.com>; Tue, 24 Nov 1998 02:23:58 -0500
-	Received: (qmail 6211 invoked by alias); 24 Nov 1998 07:25:59 -0000
-	Message-ID: <19981124072559.6209.qmail@modgud.nordicdms.com>
-	Received: (qmail 6197 invoked from network); 24 Nov 1998 07:25:59 -0000
-	Received: from mail-ftp.nordicdms.com (HELO mail-ftp) (207.21.168.100)
-	  by mail.nordicdms.com with SMTP; 24 Nov 1998 07:25:59 -0000
-	From: "Dave Walton" <walton@nordicdms.com>
-	Organization: Nordic Entertainment Worldwide
-	To: Jesse <jrvincent@wesleyan.edu>, rt-users@lists.fsck.com
-	Date: Mon, 23 Nov 1998 23:25:58 -0800
-	MIME-Version: 1.0
-	Content-type: text/plain; charset=US-ASCII
-	Content-transfer-encoding: 7BIT
-	Subject: Two bugfixes
-	Reply-to: walton@nordicdms.com
-	In-reply-to: <19981013013318.H18644@horked.fsck.com>
-	References: <19981013042506.9798.qmail@modgud.nordicdms.com>; from Dave Walton on Mon, Oct 12, 1998 at 09:25:06PM -0700
-	X-mailer: Pegasus Mail for Win32 (v3.01d)
-	Sender: owner-rt-users@lists.fsck.com
-	Precedence: bulk
-	
-	1.  A backwards search was causing lib/rt/ui/web/support.pm to
-	crash when data that looks like an invalid regex is present in the
-	message headers.
-	------------------------------------------------------------
-	# diff support.old.pm support.pm
-	44c44
-	<               ($headers_ignore !~ /$field/i)) {
-	---
-	>               ($field !~ /$headers_ignore/i)) {
-	------------------------------------------------------------
-	
-	2.  HTML buglet in lib/rt/ui/web/manipulate.pm.
-	------------------------------------------------------------
-	# diff manipulate.old.pm manipulate.pm
-	894c894
-	< <font color=\"\$fg_color\">
-	---
-	> <font color=\"$fg_color\">
-	------------------------------------------------------------
-	
-	Dave
-	
-	----------------------------------------------------------------------
-	Dave Walton
-	Webmaster, Postmaster                   Nordic Entertainment Worldwide
-	walton@nordicdms.com                          http://www.nordicdms.com
-	----------------------------------------------------------------------
-	
-	From benji@hnt.com  Fri Nov 20 14:28:44 1998
-	Return-Path: <benji@hnt.com>
-	Received: from horked.fsck.com (jesse@localhost [127.0.0.1])
-		by horked.fsck.com (8.8.7/8.8.7) with ESMTP id OAA04739
-		for <jesse@localhost>; Fri, 20 Nov 1998 14:28:44 -0500
-	Received: from mail.wesleyan.edu
-		by horked.fsck.com (fetchmail-4.3.2 POP3 run by jrvincent)
-		for <jesse@localhost> (single-drop); Fri Nov 20 14:28:44 1998
-	Received: from columbus.hnt.com (columbus.hnt.com [208.221.11.10]) by mail.wesleyan.edu (8.8.6/8.7.3) with ESMTP id OAA18408 for <jrvincent@wesleyan.edu>; Fri, 20 Nov 1998 14:30:34 -0500 (EST)
-	Received: from peppermint.hnt.com (peppermint.hnt.com [208.221.11.51])
-		by columbus.hnt.com (8.9.1/8.9.1/HnT-980729) with ESMTP id OAA26134
-		for <jrvincent@wesleyan.edu>; Fri, 20 Nov 1998 14:30:32 -0500 (EST)
-	Received: from localhost by peppermint.hnt.com (8.9.1/8.9.1/HnT-nullclient-980724) with ESMTP id OAA02733
-		for <jrvincent@wesleyan.edu>; Fri, 20 Nov 1998 14:30:32 -0500 (EST)
-	X-Authentication-Warning: peppermint.hnt.com: benji owned process doing -bs
-	Date: Fri, 20 Nov 1998 14:30:31 -0500 (EST)
-	From: Benjamin Cline <benji@hnt.com>
-	To: Jesse <jrvincent@mail.wesleyan.edu>
-	Subject: Re: 0.9.20 is out
-	In-Reply-To: <19981120005718.F28841@horked.fsck.com>
-	Message-ID: <Pine.GSO.4.05.9811201427100.2438-100000@peppermint.hnt.com>
-	MIME-Version: 1.0
-	Content-Type: TEXT/PLAIN; charset=US-ASCII
-	X-UIDL: 4f1695a69f7cdbefcfce9198121fef95
-	
-	I think I've found a buglet in 0.9.20, I had to add an extra curly bracket
-	("}") to the end of lib/rt/database/admin.pm (just before the "1;") to get
-	it to work right.
-	
-		benji
-	
-	P.S. Sorry if that's not the most coherent bug report/fix, I'm afraid I'm
-	not much of a perl hacker.
-	
-	On Fri, 20 Nov 1998, Jesse wrote:
-	
-	> ftp://horked.fsck.com/pub/rt/devel/rt-0.9.20.tar.gz
-	>
-	> 19 Nov 98
-	> ---------
-	>
-	> Incorportated patches from Dave Walton to fix a typo, replace an
-	> accidentally
-	> blown away library and add a "last acted" column to the web ui.
-	> incremented version to .9.20
-	>
-	>
-	> 	jesse
-	>
-	> --
-	> jesse reed vincent -- jrvincent@wesleyan.edu -- jesse@fsck.com
-	> pgp keyprint:  50 41 9C 03 D0 BC BC C8 2C B9 77 26 6F E1 EB 91
-	> --------------------------------------------------------------
-	> They'll take my private key when they pry it from my cold dead fingers!
-	>
-	
-	--
-	Benjamin R. Cline       Harrison & Troxell, Inc.         benji@hnt.com
-	                     Quis Custodiet Ipsos Custodes?
-	
-	From adam@baz.org  Fri Nov 13 17:07:09 1998
-	Return-Path: <adam@baz.org>
-	Received: from horked.fsck.com (jesse@localhost [127.0.0.1])
-		by horked.fsck.com (8.8.7/8.8.7) with ESMTP id RAA10943
-		for <jesse@localhost>; Fri, 13 Nov 1998 17:07:09 -0500
-	Received: from mail.wesleyan.edu
-		by horked.fsck.com (fetchmail-4.3.2 POP3 run by jrvincent)
-		for <jesse@localhost> (single-drop); Fri Nov 13 17:07:09 1998
-	Received: from impei.baz.org (adam@impei.baz.org [139.167.64.229]) by mail.wesleyan.edu (8.8.6/8.7.3) with ESMTP id RAA08425 for <jrvincent@wesleyan.edu>; Fri, 13 Nov 1998 17:08:38 -0500 (EST)
-	Received: (from adam@localhost)
-		by impei.baz.org (8.8.7/8.8.8) id RAA18674
-		for jrvincent@wesleyan.edu; Fri, 13 Nov 1998 17:08:38 -0500
-	Message-ID: <19981113170837.A18668@baz.org>
-	Date: Fri, 13 Nov 1998 17:08:37 -0500
-	From: secret agent man <adam@baz.org>
-	To: "J.R.Ewing" <jrvincent@mail.wesleyan.edu>
-	Subject: RT bug, mebbe?
-	Mime-Version: 1.0
-	X-Mailer: Mutt 0.93.2i
-	Content-Type: text/plain; charset=us-ascii
-	X-UIDL: 5563064ca159a5eee88e16843932a45f
-	
-	<jailbait> q: If you leave the field blank when clicking on "create new
-	(queue|user) named", it goes to the create screen with an empty field that
-	can't be filled. It should either be editable there or it should reject
-	you.
-	
-	A
-	
-	--
-	Everything I needed to know about life I learned       <adam@baz.org>
-	from killing smarter people and eating their brains.    adam hirsch
-	
-1998-11-20 00:45  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1998-11-20 00:28  jesse
-
-	* Makefile, NEWS:
-
-	19 Nov 98
-	---------
-	
-	Incorportated patches from Dave Walton to fix a typo, replace an accidentally
-	blown away library and add a "last acted" column to the web ui.
-	incremented version to .9.20
-	
-1998-11-18 02:26  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1998-10-13 03:37  jesse
-
-	* Makefile, README, etc/mysql.acl:
-
-	shiny:% cat >> changes                                          ~ 10:53PM:tt
-	2.  Made comments and replies update date_acted.
-	
-	        -- Dave Walton
-	
-	Ok.. I know this is being picky, but, in rt/lib/ui/web/support.pm, the
-	subroutine "content_header", at line 290, should have:
-	    print "<head><title>WebRT</title></head>\n";
-	
-	Otherwise, when running in frames, you never get a title on the page. :(
-	
-	No biggie...
-	
-	-Rich
-	
-	Oh, one other.
-	
-	8.  etc/mysql.acl, line 5
-	The RT_MYSQL_HOST entry on that line doesn't make any sense
-	when MySQL is on a different host than RT.  That should be
-	RT_HOST, or some such thing.
-	
-	Dave
-	
-	After just upgrading to Apache 1.3.0 from 1.2.5, I figured I would make it
-	known that, in the file <apache_src_dir>/src/main/util_script.c, you have
-	to define SECURITY_HOLE_PASS_AUTHORIZATION to allow for RT's authorization
-	to work properly.
-	-Rich
-	
-	On Tue, Oct 06, 1998 at 09:19:07PM -0700, Dave Walton wrote:
-	> I just discovered that if there is an error in add_correspondence, the
-	> mail interface discards the incoming mail without comment.  To
-	> correct this, I took the following steps:
-	>
-	In mail.pm, there's a space before :
-	
-	From: $rt::mail_alias
-	
-	This causes problems in some mail clients, putting the From: line on the
-	same line as the subject.  If the spaces are removed this is fixed.
-	
-	Regards,
-	From: "Andrew Foster" <adf@fl.net.au>
-	
-1998-09-11 01:15  jesse
-
-	* docs/README.docs:
-
-	updated lists for rt docs.
-	
-1998-09-08 03:23  jesse
-
-	* NEWS:
-
-	updated news
-	
-1998-09-08 03:18  jesse
-
-	* Makefile, NEWS, README, etc/config.pm:
-
-	Final bug fixes for .9.18
-	
-1998-08-09 17:43  jesse
-
-	* NEWS, README, TODO:
-
-	All kinds of crazy updates for .9.18. Mostly from serge zhuk
-	
-1998-08-04 03:09  jesse
-
-	* NEWS:
-
-	first round of updates from serge
-	
-1998-06-26 17:07  jesse
-
-	* Makefile, NEWS:
-
-	modified makefile and news
-	
-1998-06-26 16:34  jesse
-
-	* docs/: README.docs, actions.txt, admin.txt, attributes.txt,
-	outline.txt:
-
-	Added documentation from <adam@apocalypse.org>
-	
-1998-06-25 17:06  jesse
-
-	* Makefile, README, etc/config.pm:
-
-	removed refs to glimpse
-	
-1998-06-25 15:46  jesse
-
-	* Makefile:
-
-	dist fixes
-	
-1998-06-25 15:44  jesse
-
-	* Makefile:
-
-	dist fixes
-	
-1998-06-25 14:09  jesse
-
-	* Makefile:
-
-	edited dist. maker
-	
-1998-05-21 22:40  jesse
-
-	* Makefile:
-
-	added httpd.conf configurator for cern
-	
-1998-04-27 20:17  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1998-04-20 14:53  jesse
-
-	* Makefile:
-
-	bumped version to .9.14.
-	
-1998-04-20 14:53  jesse
-
-	* Makefile:
-
-	bumped version to .9.13.1
-	
-1998-04-19 03:14  jesse
-
-	* Makefile:
-
-	updated version number.
-	now explicitly create rt-etc-dir
-	
-1998-04-16 21:40  jesse
-
-	* bin/rtmux.pl:
-
-	removed a spurious addition to the lib path from the mux
-	abstracted a bunch of stuff out of the mux and throughout the makefile.
-	like program names.
-	
-1998-04-16 21:39  jesse
-
-	* Makefile:
-
-	abstracted a bunch of stuff out of the mux and throughout the makefile.
-	like program names.
-	
-1998-04-16 19:47  jesse
-
-	* COPYING, Makefile, NEWS, README, README.FIRST, TODO:
-
-	commiting updates
-	
-1998-04-08 13:35  jesse
-
-	* etc/config.pm:
-
-	fixed typos in config.pm that prevented mail from working with .9.11
-	bumped version to .12
-	
-1998-04-08 13:34  jesse
-
-	* Makefile:
-
-	bumped version to .12
-	
-1998-04-02 21:30  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1998-04-02 21:27  jesse
-
-	* Makefile:
-
-	fixed make dist
-	
-1998-04-02 15:36  jesse
-
-	* Makefile, Makefile:
-
-	[no log message]
-	
-1998-04-02 15:29  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1998-04-02 15:25  jesse
-
-	* etc/config.pm:
-
-	split mail program and mail program flags
-	hopefully fixed make dist
-	
-1998-04-02 15:25  jesse
-
-	* Makefile:
-
-	hopefully fixed make dist
-	
-1998-04-02 11:02  jesse
-
-	* Makefile, NEWS:
-
-	updated news
-	
-1998-04-02 10:55  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1998-04-02 10:31  jesse
-
-	* etc/config.pm:
-
-	reshuffled files that the user won't be changing out of etc and into lib
-	this includes generic templates and images for the web ui
-	updated src and makefiles accordingly.
-	verbosifoed part of config.pm
-	
-1998-04-02 10:31  jesse
-
-	* Makefile:
-
-	reshuffled files that the user won't be changing out of etc and into lib
-	this includes generic templates and images for the web ui
-	updated src and makefiles accordingly.
-	
-1998-04-02 10:20  jesse
-
-	* Makefile:
-
-	built more auto-dist stuff
-	
-1998-04-02 03:22  jesse
-
-	* README:
-
-	added apache patch to readme
-	
-1998-04-02 03:13  jesse
-
-	* Makefile, README, TODO, etc/config.pm:
-
-	updated makefile and readme and todo
-	added toggle for mysql 3.21
-	moved sendmail flags to makefile for compat w 8.6
-	
-1998-02-08 21:12  jesse
-
-	* Makefile:
-
-	make upgrade now calls mux-install
-	
-1998-01-30 22:31  jesse
-
-	* Makefile, README, README.FIRST:
-
-	added bits to upgrade from .9.1
-	made make upgrade upgrade the conf file
-	
-1998-01-27 01:56  jesse
-
-	* NEWS:
-
-	updated news
-	
-1998-01-27 01:48  jesse
-
-	* Makefile:
-
-	started a make dist
-	
-1998-01-26 17:59  jesse
-
-	* Makefile, README, README.FIRST:
-
-	updated readme
-	
-1998-01-21 18:37  jesse
-
-	* Makefile:
-
-	fixes to makefile to allow for proper specification of database as local.
-	added "you are logged in as..." to web/support...
-	changed sendmail options in mail.pm/
-	
-1998-01-14 23:49  jesse
-
-	* Makefile, etc/mysql.acl:
-
-	incremented version number
-	
-1998-01-09 14:48  jesse
-
-	* bin/rtmux.pl:
-
-	added taint safeness for $ENV{'ENV}
-	updated makefile version number
-	
-1998-01-09 14:47  jesse
-
-	* Makefile:
-
-	updated makefile version number
-	
-1998-01-08 16:17  jesse
-
-	* README.FIRST:
-
-	ipdated readme.first.
-	
-1998-01-08 14:53  jesse
-
-	* etc/suidrt.c:
-
-	made suidrt.c work
-	updated the mux
-	
-1998-01-08 14:53  jesse
-
-	* bin/rtmux.pl:
-
-	updated the mux
-	
-1998-01-08 13:10  jesse
-
-	* Makefile:
-
-	more fixes to make suid wrapper stuff work.
-	
-1998-01-08 12:51  jesse
-
-	* bin/rtmux.pl:
-
-	made rtmux attempt to work with the suid wrapper
-	
-1998-01-08 12:48  jesse
-
-	* etc/suidrt.c:
-
-	added back suidrt.c. blech.
-	
-1998-01-08 12:44  jesse
-
-	* Makefile, bin/rtmux.pl:
-
-	brought back suidrt.c
-	bleck.
-	
-1998-01-07 18:06  jesse
-
-	* Makefile:
-
-	added a sane mode for $(RT_PATH)
-	
-1998-01-07 00:37  jesse
-
-	* Makefile, README.FIRST:
-
-	added basic old upgrade instructions.
-	added info to README.FIRST about upgrading.
-	
-1998-01-07 00:31  jesse
-
-	* bin/rtmux.pl:
-
-	made mailing work.
-	
-1998-01-06 10:27  jesse
-
-	* bin/rtmux.pl:
-
-	made the mux require ui::mail before it tried to invoke it.
-	
-1998-01-04 02:26  jesse
-
-	* README:
-
-	told users to read readme.first.
-	
-1998-01-04 02:25  jesse
-
-	* README, README.FIRST:
-
-	added readme.first
-	
-1998-01-04 02:12  jesse
-
-	* Makefile:
-
-	updated webadmin interface. fixed some logout problems. fixed an html bug in web-manip.
-	
-1998-01-02 01:14  jesse
-
-	* Makefile, bin/rtmux.pl:
-
-	fixed more problems w/ making cliadmin run
-	merged mux-install and mux-links into one section of makefile
-	
-1998-01-02 00:59  jesse
-
-	* Makefile, NEWS, README, TODO, bin/rtmux.pl, etc/config.pm:
-
-	fixed typo in Makefile: install-libs -> libs-install
-	
-1998-01-01 03:07  jesse
-
-	* Makefile, bin/rtmux.pl:
-
-	commented makefile better
-	added more stuff for taint checks to rtmux.pl
-	fixed a non-frames web bug in FormComment
-	
-1997-12-31 01:55  jesse
-
-	* Makefile, bin/rtmux.pl, etc/config.pm:
-
-	lots of cleanup to get web interface running.
-	beginnigs of taint-safe scripts.
-	
-1997-12-30 23:49  jesse
-
-	* Makefile, bin/rtmux.pl:
-
-	cleanup in cli admin.pm, cli query.pm, the mux, the makefile
-	database routines now assign an effective serial # to a request when you get
-	the fact's serial number
-	
-1997-12-30 22:56  jesse
-
-	* Makefile, README, bin/rtmux.pl:
-
-	remodded rtmux to use correct vars for command line arguments.
-	moved RT_VERSION to makefile.
-	updated README for new install procedure
-	
-1997-12-30 01:09  jesse
-
-	* Makefile, etc/config.pm, etc/mysql.acl:
-
-	fixed typo in web/admin.pm
-	set up config.pm mysql.acl and rtmux.pl to get themselves parsed from the makefile.
-	removed last vestiges of C
-	
-1997-12-28 18:59  jesse
-
-	* Makefile, etc/schema:
-
-	removed suidrt for a preparation to move to a c-free system
-	added provisions for token-parsing to makefile
-	
-1997-12-28 03:10  jesse
-
-	* etc/schema:
-
-	added tags to schema
-	
-1997-12-28 02:48  jesse
-
-	* Makefile:
-
-	started to modify toplevel makefile
-	
-1997-12-19 03:04  jesse
-
-	* lib/rtmux.pl:
-
-	moved the executable rtmux.pl to bin, where it belongs.
-	made sure bin/cgi gets created on checkout
-	
-1997-12-19 03:03  jesse
-
-	* bin/rtmux.pl:
-
-	moved the executable rtmux.pl to bin, where it belongs.
-	
-1997-12-18 19:05  jesse
-
-	* lib/rtmux.pl:
-
-	worked on the mux
-	
-1997-12-09 15:14  jesse
-
-	* TODO:
-
-	added things for v1.0 to the todo list
-	
-1997-12-09 02:03  jesse
-
-	* etc/config.pm:
-
-	broke configuration out into config.pm
-	
-1997-12-09 01:54  jesse
-
-	* COPYING, Makefile, NEWS, README, TODO, etc/mysql.acl, etc/schema:
-
-	initial commit after i nuked the repository
-	
-1997-12-09 01:54  jesse
-
-	* COPYING, Makefile, NEWS, README, TODO, etc/mysql.acl, etc/schema:
-
-	Initial revision
-	
diff --git a/rt/TODO b/rt/TODO
deleted file mode 100755
index 3d1b7d02e..000000000
--- a/rt/TODO
+++ /dev/null
@@ -1,9 +0,0 @@
-Errata for RT 2.x can be found at http://fsck.com/rt2/NoAuth/Errata.html
-
-A list of all open issues, including those which haven't been added
-to the official Errata lists,  can be found at 
-http://fsck.com/rt2/NoAuth/Buglist.html
-
-If you want to look at bugs in more detail, you may need to login as guest with a password of 'guest'
-
-
diff --git a/rt/bin/initacls.Oracle b/rt/bin/initacls.Oracle
deleted file mode 100644
index 8d05f45e1..000000000
--- a/rt/bin/initacls.Oracle
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-DATABASEHOME=$1
-HOSTNAME=$2
-PORT=$3
-DATABASEADMIN=$4
-DBAPASSWD=$5
-DATABASENAME=$6
-DATABASEACLS=$7
-
-BINDIR=${DATABASEHOME}/bin
-
-echo "DBHOME = $DATABASEHOME"
-echo "HOSTNAME = $HOSTNAME"
-echo "PORT = $PORT"
-echo "DATABASEADMIN = $DATABASEADMIN"
-echo "DBAPASSWD = $DBAPASSWD"
-echo "DATABASENAME = $DATABASENAME"
-
-PATH=$PATH:$BINDIR
-export PATH
-
-echo "Please enter ${DATABASEADMIN}'s  password for the SID ${DATABASENAME} to create an rt user";
-
-$BINDIR/sqlplus ${DATABASEADMIN}@${DATABASENAME}  @$DATABASEACLS
-
diff --git a/rt/bin/initacls.Pg b/rt/bin/initacls.Pg
deleted file mode 100755
index 82e32de74..000000000
--- a/rt/bin/initacls.Pg
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-DATABASEHOME=$1
-HOSTNAME=$2
-PORT=$3
-DATABASEADMIN=$4
-DBAPASSWD=$5
-DATABASENAME=$6
-DATABASEACLS=$7
-
-BINDIR=${DATABASEHOME}/bin
-
-
-PATH=$PATH:$BINDIR
-export PATH
-
-echo "Enter the postgres administrator's database password to create a new user for rt"
-
-if [ "fnord$PORT" != "fnord" ]; then
-	PORT="-p $PORT"
-fi;
-
-if [ "fnord$HOSTNAME" != "fnord" ]; then
-	HOSTNAME="-h $HOSTNAME"
-fi;
-
-psql $HOSTNAME $PORT -d $DATABASENAME -f $DATABASEACLS -U $DATABASEADMIN
-
diff --git a/rt/bin/initacls.mysql b/rt/bin/initacls.mysql
deleted file mode 100755
index 17e63f837..000000000
--- a/rt/bin/initacls.mysql
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-DATABASEHOME=$1
-HOSTNAME=$2
-PORT=$3
-DATABASEADMIN=$4
-DBAPASSWD=$5
-DATABASENAME=$6
-DATABASEACLS=$7
-
-BINDIR=${DATABASEHOME}/bin
-
-PATH=$PATH:$BINDIR
-export PATH
-
-echo "Enter the mysql administrator's database password to create a new user for RT"
-$BINDIR/mysql --host=${HOSTNAME} --port=${PORT} --user=${DATABASEADMIN} -p${DBAPASSWD} mysql < $DATABASEACLS
-
-echo "Enter the mysql administrator's database password to nondestructively reload the database"
-$BINDIR/mysqladmin --host=${HOSTNAME} --port=${PORT} --user=${DATABASEADMIN} -p${DBAPASSWD} reload
diff --git a/rt/bin/rtadmin b/rt/bin/rtadmin
deleted file mode 100644
index 25ba1b06a..000000000
--- a/rt/bin/rtadmin
+++ /dev/null
@@ -1,1040 +0,0 @@
-#!!!PERL!! -w
-#
-# $Header: /home/cvs/cvsroot/freeside/rt/bin/Attic/rtadmin,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# RT is (c) 1996-2001 Jesse Vincent <jesse@fsck.com>
-
-use strict;
-use Carp;
-use Getopt::Long qw(:config pass_through);
-
-use lib "!!RT_LIB_PATH!!";
-use lib "!!RT_ETC_PATH!!";
-
-use RT::Interface::CLI  qw(CleanEnv LoadConfig DBConnect 
-			   GetCurrentUser GetMessageContent);
-
-#Clean out all the nasties from the environment
-CleanEnv();
-
-#Load etc/config.pm and drop privs
-LoadConfig();
-
-#Connect to the database and get RT::SystemUser and RT::Nobody loaded
-DBConnect();
-
-#Drop setgid permissions
-RT::DropSetGIDPermissions();
-
-#Get the current user all loaded
-my $CurrentUser = GetCurrentUser();
-
-unless ($CurrentUser->Id) {
-        print "No RT user found. Please consult your RT administrator.\n";   
-        exit(1);
-}
-
-
-
-
-PickMode();
-
-
-# {{{ Help
-
-sub Help {
-
-    # {{{ help_acl
-my $help_acl ="
-        Access control
-	--grant-right <right> 
-	--revoke-right <right>
-	  --userid <user>
-          --groupid <group>
-	--list-rights";
-
-# }}}
-    
-    # {{{ help_keyword_sel
-my $help_keyword_sel = "
-       Keyword Selections
-       --add-keyword-select
-       --modify-keyword-select <name>
-          --ks-name <name>
-          --ks-keyword <keyword>
-          --ks-single 
-          --ks-multiple
-          --ks-depth  <int>
-
-        --disable-keyword-select <name>";
-# }}}
-    
-    # {{{ help_scrip
-my $help_scrip = "
-        Scrips
-        --create-scrip
-           --scrip-condition <condition name or id>
-           --scrip-action <action name or id>
-           --scrip-template <template name or id>
-
-        --delete-scrip <id>
-	--list-scrips";
-
-# }}}
-    
-    # {{{ help_template  
-my $help_template = "      
-        Templates
-        --delete-template [<id>|<name>]
-        --display-template [<id>|<name>]
-
-         --create-template
-         --modify-template [<id>|<name>]
-           Flags for --create-template and --modify-template
-           --template-name
-           --template-description
-           --template-edit-content
-         
-         --list-templates";
-
-# }}}
-    
-    
-print <<EOF;
-
-USAGE:  rtadmin --user <userid> [Userflags]
-	rtadmin --list-users
-	rtadmin --queue <queueid> [Queueflags]
-	rtadmin --list-queues
-	rtadmin --group [groupflags]
-	rtadmin --list-groups
-	rtadmin --system  [SystemFlags]
-	rtadmin --keyword [keywordflags]
-
-User configuration for --user <userid>
-   
-  	--disable
-  	--create
-	--display
-
-  Core Attributes
-	--userid
-	--gecos
-	--password
-	--emailaddress
-	--privileged
-	--comments
-	--signature
-	--organization
-
-  Names	
-	--realname
-	--nickname
-	
-  Auth and external info
-	--externalcontactinfoid
-	--contactinfosystem
-	--externalauthid
-	--authsystem
-
-  Phone numbers
-	--pagerphone
-	--workphone
-	--mobilemphone
-	--homephone
-
-  Paper address
-	--address1
-	--address2
-	--city
-	--state
-	--zip
-	--country
-	--freeformcontactqinfo	
-
-
-Group Configuration for --group <groupid>
-	--create 
-	--delete
-	--display
-
-	--name <new name>
-	--description <new description>
-
-
-
-	--add-member <userid>
-	--delete-member <userid>
-	--list-members	
-
-Queue Configuration for --queue <queueid>
-	--create
-	--disable
-	--display
-
-	--name <name>
-	--correspondaddress <email address>
-	--commentaddress <email address>
-	--initialpriority <int>
-	--finalpriority <int>
-	--defaultduein <days>
-
-	--add-cc <email address>
-	--delete-cc <email address>
-	--add-admincc <email address>
-	--delete-admincc <email address>
-        --list-watchers
-
-	
-
-$help_acl
-
-$help_keyword_sel
-
-$help_template
-
-$help_scrip
-
-
-System configuration for --system 
-
-$help_acl
-
-$help_keyword_sel
-
-$help_template
-
-$help_scrip
-
-
-Keyword configuration for --keyword  <fully qualified name>
-	--list-children
-  	--create-child <name>
-	--disable
-	--name <new name>
-	--description <new description>
-
-EOF
-
-
-
-}
-
-# }}}
-
-# {{{ PickMode
-
-sub PickMode {
-    my ($user,$group, $queue, $system, $keyword, $listusers, 
-	$listgroups, $listqueues, $help);
-
-
-    GetOptions ('help|h|usage' => \$help,
-		'user=s' => \$user,
-		'queue=s' => \$queue,
-		'group=s' => \$group,
-		'system' => \$system,
-		'keyword=s', => \$keyword,
-		'list-users' => \$listusers,
-		'list-queues' => \$listqueues,
-		'list-groups' => \$listgroups,
-	       );
-    
-
-    
-    if ($user)          { AdminUser($user) }  
-    elsif ($group)      { AdminGroup($group) }
-    elsif ($queue)      { AdminQueue($queue) }
-    elsif ($system)     { AdminSystem($system) }
-    elsif ($keyword)    { AdminKeywords($keyword) }
-    elsif ($listusers)  { ListUsers() }
-    elsif ($listgroups) { ListGroups()  }
-    elsif ($listqueues) { ListQueues() }
-    elsif ($help)       { Help()}
-    else {
-	print "No command found\n";
-    }
-    exit(0);
-}	
-
-# }}}
-
-# {{{ AdminUser
-
-sub AdminUser {
-    my $user=shift;
-    my %args;
-
-    GetOptions(\%args,
-	   'create', 'disable|delete', 'display',
-	   'Name=s', 'Gecos=s', 'Password=s',
-	   'EmailAddress=s', 'Privileged=s', 'Comments=s', 'Signature=s',
-	   'Organization=s', 'RealName=s', 'NickName=s',  
-	   'ExternalContactInfoId=s', 'ContactInfoSystem=s', 
-           'ExternalAuthId=s', 'AuthSystem=s',
-	   'HomePhone=s', 'WorkPhone=s', 'MobilePhone=s', 'PagerPhone=s',
-           'Address1=s', 'Address2=s', 'City=s', 'State=s', 'Zip=s', 
-           'Country=s', 'FreeformContactInfo=s');
-
-    my $user_obj = new RT::User($CurrentUser);
-    
- 
-    #Create the user if we need to 
-    if ($args{'create'}) {
-	my ($status, $msg) = 
-	  $user_obj->Create( Name => ($args{'Name'} || $user),
-			     Gecos => $args{'Gecos'},
-			     Password => $args{'Password'},
-			     EmailAddress => $args{'EmailAddress'},
-			     Privileged => $args{'Privileged'},
-			     Comments => $args{'Comments'},
-			     Signature => $args{'Signature'},
-			     Organization => $args{'Organization'},
-			     RealName => $args{'RealName'},
-			     NickName => $args{'NickName'},
-			     ExternalContactInfoId => $args{'ExternalContactInfoId'},
-			     ContactInfoSystem => $args{'ContactInfoSystem'},
-			     ExternalAuthId => $args{'ExternalAuthId'},
-			     AuthSystem => $args{'AuthSystem'},
-			     HomePhone => $args{'HomePhone'},
-			     WorkPhone => $args{'WorkPhone'},
-			     MobilePhone => $args{'MobilePhone'},
-			     PagerPhone => $args{'PagerPhone'},
-			     Address1 => $args{'Address1'},
-			     Address2 => $args{'Address2'},
-			     City  => $args{'City'},
-			     State => $args{'State'},
-			     Zip => $args{'Zip'},
-			     FreeformContactInfo => $args{'FreeformContactInfo'}
-			   );
-	
-	print "$msg\n";
-	return();
-	
-    }
-    else {
-	
-	
-	#Load the user
-	$user_obj->Load($user);
-	
-	unless ($user_obj->id) {
-	    print "User '$user' not found\n";
-	    return();
-	}	
-	
-	
-	
-	#modify the user if we need to
-	my @attributes = ('Name', 'Gecos',
-			  'EmailAddress', 'Privileged', 'Comments', 'Signature',
-			  'Organization', 'RealName', 'NickName',  
-			  'ExternalContactInfoId', 'ContactInfoSystem', 
-			  'ExternalAuthId', 'AuthSystem',
-			  'HomePhone', 'WorkPhone', 'MobilePhone', 'PagerPhone',
-			  'Address1', 'Address2', 'City', 'State', 'Zip', 
-			  'Country', 'FreeformContactInfo');
-	foreach my $attrib (@attributes) {
-	    if ( (exists ($args{"$attrib"})) and
-		 ($user_obj->$attrib() ne $args{"$attrib"})) {
-		
-		my $method = "Set$attrib";
-		my ($val, $msg) = $user_obj->$method($args{"$attrib"});
-		print "User ".$user_obj->Name. " $attrib:  $msg\n";
-		
-	    }
-	}		
-	
-	if (exists ($args{'Password'})) {
-	    my ($code, $msg);
-	    ($code, $msg) = $user_obj->SetPassword($args{'Password'});
-	    print "User ". $user_obj->Name. ' Password: '. $msg . "\n";
-	}
-	
-	#Check if we need to display the user
-	if ($args{'display'}) {
-	    foreach my $attrib (@attributes) {
-		next if ($attrib eq 'Password'); #Can't see the password
-		printf("%22.22s %-64s\n",$attrib, ($user_obj->$attrib()||'(undefined)'));
-		
-	    }	
-	}	
-	
-	#Check if we need to delete the user
-	if ($args{'disable'}) {
-	    my ($val, $msg) = $user_obj->SetDisabled(1);
-	    print "$msg\n";
-	}	
-	
-    }
-}
-
-# }}}
-
-# {{{ AdminQueue
-
-sub AdminQueue {
-    my $queue=shift;
-    my %args;
-
-    GetOptions(\%args,
-	       'create', 'disable|delete', 'display',
-	       'Name=s', 'CorrespondAddress=s', 'Description=s',
-	       'CommentAddress=s', 'InitialPriority=n', 'FinalPriority=n',
-	       'DefaultDueIn=n',
-	       
-	       'add-cc=s@', 'add-admincc=s@', 
-	       'delete-cc=s@', 'delete-admincc=s@',
-	       'list-watchers', 'create-template'
-	       );
-
-    use RT::Queue;
-    my $queue_obj = new RT::Queue($CurrentUser);
-    
-    #Create the queue if we need to 
-    if ($args{'create'}) {
-	my ($status, $msg) = 
-	  $queue_obj->Create(
-			     Name => ($args{'Name'} || $queue) ,
-			     CorrespondAddress => $args{'CorrespondAddress'},
-			     Description => $args{'Description'},
-			     CommentAddress  => $args{'CommentAddress'},
-			     InitialPriority => $args{'InitialPriority'},
-			     FinalPriority => $args{'FinalPriority'},
-			     DefaultDueIn => $args{'DefaultDueIn'}
-			    );
-	
-	print "$msg\n";
-    }
-    else {
-	#Load the queue
-	$queue_obj->Load($queue);
-	
-	unless ($queue_obj->id) {
-	    print "Queue '$queue' not found\n";
-	    return();
-	}	
-		
-        #modify if we need to
-	my @attributes = qw(Name CorrespondAddress Description
-			    CommentAddress InitialPriority FinalPriority
-			    DefaultDueIn
-			 );
-	foreach my $attrib (@attributes) {
-	    if ( (exists ($args{"$attrib"})) and
-		 ($queue_obj->$attrib() ne $args{"$attrib"})) {
-		
-		my $method = "Set$attrib";
-		my ($val, $msg) = $queue_obj->$method($args{"$attrib"});
-		print "Queue ".$queue_obj->Name. " $attrib:  $msg\n";
-		
-	    }
-	}		
-	    
-	
-	#Check if we need to display the queue
-	if ($args{'display'}) {
-	    foreach my $attrib (@attributes) {
-		printf("%22.22s %-64s\n",$attrib, ($queue_obj->$attrib()||'(undefined)'));
-		
-	    }	
-	}	
-       	
-	foreach my $person (@{$args{'add-cc'}}) {
-	    my ($val, $msg) = $queue_obj->AddCc(Email => $person);
-	    print "$msg\n";
-	}
-	foreach my $person (@{$args{'add-admincc'}}) {
-	    my ($val, $msg) = $queue_obj->AddAdminCc(Email => $person);
-	    print "$msg\n";
-	}
-
-	foreach my $person (@{$args{'delete-cc'}}) {
-	    my ($val, $msg) = $queue_obj->DeleteCc($person);
-	    print "$msg\n";
-	}
-	foreach my $person (@{$args{'delete-admincc'}}) {
-	    my ($val, $msg) = $queue_obj->DeleteAdminCc($person);
-	    print "$msg\n";
-	}
-
-	if ($args{'list-watchers'}) {
-	    require RT::Watchers;
-	    my $watchers = new RT::Watchers($CurrentUser);
-	    $watchers->LimitToQueue($queue_obj->id);
-	    while (my $watcher = $watchers->Next()) {
-		printf("%10s %-60s\n",
-		       $watcher->Type, $watcher->Email );
-	    }	
-	}	
-
-        AdminTemplates($queue_obj->Id());
-        AdminScrips($queue_obj->Id());
-	AdminRights($queue_obj->Id());
-	AdminKeywordSelects($queue_obj->Id());
-
-	#Check if we need to delete the queue
-	if ($args{'disable'}) {
-	    my ($val, $msg) = $queue_obj->SetDisabled(1);
-	    print "$msg\n";
-	}	
-	
-    }
-}
-
-# }}}
-
-# {{{ AdminKeywords
-
-sub AdminKeywords {
-    my $keyword = shift;
-    
-    my %args;
-    GetOptions(\%args, 'list-children', 'create-child=s', 'disable|delete', 'Name=s', 'Description=s');
-    
-    use RT::Keyword;
-    
-    my $key_obj = new RT::Keyword($CurrentUser);
-    my $key_id;
-    
-    #If we're dealing with the root of the keyword list
-    if ($keyword eq '/') {
-	$key_id=0;
-    }	
-    else {
-	my ($val, $msg) = $key_obj->LoadByPath( $keyword );
-	unless ($val) {
-	    print $msg ."\n";
-	}
-	$key_id = $key_obj->Id();
-    }	
-    
-    if ($args{'create-child'}) {
-	my $child = new RT::Keyword($CurrentUser);
-	
-	my ($val, $msg) = $child->Create( Parent => $key_id,
-					  Name => $args{'create-child'},
-					);
-	print $msg ."\n";
-    }	
-    
-    elsif ($args{'list-children'}) {
-	my $keywords;
-	if ($key_obj->id) {
-	    $keywords = $key_obj->Children();
-	}	
-	#If we didn't actually have a keyword object, we need to create our own Keywords object.
-	else {
-	    $keywords = new RT::Keywords($CurrentUser);
-	    $keywords->LimitToParent(0); 
-	}
-	
-	while (my $key=$keywords->Next) {
-	    print $key->Name;
-	    if ($key->Description) {
-		print " (" . $key->Description .")";
-	    }	
-	    print "\n";
-	}	
-	      
-
-    }	
-    
-    #Else we wanna do some modification.
-    else {
-	
-	#If we didn't load a keyword, get out
-	return(undef) unless ($key_obj->Id);
-	
-	
-	my @attributes = qw( Name Description );
-	foreach my $attrib (@attributes) {
-	    if ( (exists ($args{"$attrib"})) and
-		 ($key_obj->$attrib() ne $args{"$attrib"})) {
-		
-		my $method = "Set$attrib";
-		my ($val, $msg) = $key_obj->$method($args{"$attrib"});
-		
-		print "Keyword ".$key_obj->Name. " $attrib:  $msg\n";	    }
-	}
-	
-	if ($args{'disable'}) {
-	    $key_obj->SetDisabled(1);
-	    
-	}
-	
-    }
-}
-
-# }}}
-
-# {{{ AdminKeywordSelects
-
-sub AdminKeywordSelects {
-    my $queue = shift;
-    # O for queue means global
-
-    my %args;
-    GetOptions(\%args, 'add-keyword-select','disable-keyword-select|delete-keyword-select=s',
-	       'modify-keyword-select=s', 
-	       'keyword-select-Keyword|ks-keyword=s', 
-	       'keyword-select-Single|ks-single', 
-	       'keyword-select-Multiple|ks-multiple', 
-	       'keyword-select-Depth|ks-depth=i', 
-	       'keyword-select-Name|ks-name=s'
-	      );
-
-    # sanitize single vs multiple.
-    if ($args{'keyword-select-Multiple'}) {
-	$args{'keyword-select-Single'} = 0;
-    }
-    
-    use RT::KeywordSelect;
-    my $keysel_obj = new RT::KeywordSelect($CurrentUser);
-    if ($args{'add-keyword-select'}) {
-	
-	my ($val, $msg) = $keysel_obj->Create( Keyword => $args{'keyword-select-Keyword'},
-					       Depth => $args{'keyword-select-Depth'},
-					       Single => $args{'keyword-select-Single'},
-					       Name => $args{'keyword-select-Name'},
-					       ObjectType => 'Ticket',
-					       ObjectField => 'Queue',
-					       ObjectValue => $queue);
-	print $msg ."\n";
-    }	
-    elsif ($args{'modify-keyword-select'}) {
-	$keysel_obj->LoadByName(Name => $args{'modify-keyword-select'},
-				Queue => $queue
-			       );
-	
-	unless ($keysel_obj->Id()) {
-	    print "Keyword select not found\n";
-	    return();
-	}	
-	my @attributes = qw( Name Keyword Single Depth );
-	foreach my $attrib (@attributes) {
-	    if ( (exists ($args{"keyword-select-$attrib"})) and
-		 ($keysel_obj->$attrib() ne $args{"keyword-select-$attrib"})) {
-		
-		my $method = "Set$attrib";
-		my ($val, $msg) = $keysel_obj->$method($args{"keyword-select-$attrib"});
-				
-		print "Keyword select ".$keysel_obj->Name. " $attrib:  $msg\n";	    }
-	}
-
-
-    }	
-
-    
-    elsif ($args{'disable-keyword-select'}) {
-	$keysel_obj->LoadByName(Name => $args{'disable-keyword-select'},
-				Queue => $queue);
-	
-	$keysel_obj->SetDisabled(1);
-	
-    }
-}
-
-# }}}
-
-# {{{ AdminGroup
-
-sub AdminGroup {
-    my $group = shift;
-
-    my (%args);
-
-    GetOptions(\%args,
-	       'create', 'delete', 'display',
-	       'Name=s', 'Description=s',
-	       	       
-	       'add-member=s@', 'delete-member=s@',
-	       'list-members'
-	       );
-
-
-    use RT::Group;
-    my $group_obj = new RT::Group($CurrentUser);
-    unless ($group) {
-	print "Group not specified.\n";
-	return();
-    }	
-    
-
-    #Create the group if we need to
-    if ($args{'create'}) {
-	my ($val, $msg) = $group_obj->Create( Name => ($args{'Name'} || $group),
-					      Description => $args{'Description'} );
-	print $msg ."\n";
-    }	
-    #otherwise we load it
-    else {
-	$group_obj->Load($group);
-    }	
-    
-    #If we have no group object, get the hell out
-    unless ($group_obj->Id) {
-	print "Group not found.\n";
-    }
-
-    if ($args{'delete'}) {
-	my ($val, $msg) = $group_obj->Delete();
-	print $msg ."\n";
-	return();
-    }	
-
-
-    
-    #modify if we need to
-    my @attributes = qw(Name Description
-			
-		       );
-    foreach my $attrib (@attributes) {
-	if ( (exists ($args{"$attrib"})) and
-	     ($group_obj->$attrib() ne $args{"$attrib"})) {
-		
-	    my $method = "Set$attrib";
-	    my ($val, $msg) = $group_obj->$method($args{"$attrib"});
-	    print "Group ".$group_obj->Name. " $attrib:  $msg\n";
-	    
-	    }
-    }		
-    
-    foreach my $user (@{$args{'add-member'}}) {
-	my ($val, $msg) = $group_obj->AddMember($user);
-	print $msg. "\n";
-    }
-    foreach my $user (@{$args{'delete-member'}}) {
-	my ($val, $msg) = $group_obj->DeleteMember($user);
-	print $msg ."\n";
-    }
-    
-    if ($args{'list-members'}) {
-	my $members = $group_obj->MembersObj();
-	while (my $member = $members->Next()) {
-	    print $member->UserObj->Name() ."\n";
-	}
-    }	
-    
-}
-
-# }}}
-
-# {{{ AdminSystem
-sub AdminSystem {
-    print "In AdminSystem\n";
-
-    AdminTemplates(0);
-    AdminScrips(0);
-    AdminRights(0);
-    AdminKeywordSelects(0);
-}
-# }}}
-
-# {{{ sub AdminTemplates
-
-sub AdminTemplates {
-    my $queue = shift;
-    #Queue = 0 means 'global';
-
-    my %args;
-
-    
-    GetOptions(\%args, 'list-templates', 'create-template','modify-template=s',
-	       'delete-template=s', 'display-template=s',
-	       'template-Name=s', 'template-Description=s',
-	       'template-edit-content!');
-    
-    # {{{ List templates
-    if ($args{'list-templates'}) {
-	print "Templates for $queue\n";
-	require RT::Templates;
-	my $templates = new RT::Templates($CurrentUser);
-	if ($queue != 0) {
-	    $templates->LimitToQueue($queue);
-	}	
-	else {
-	    $templates->LimitToGlobal();
-	}	
-	while (my $template = $templates->Next) {
-	    print $template->Id.": ".$template->Name." - " . $template->Description ."\n";
-	}	
-    }
-
-    # }}}
-
-    require RT::Template;	
-    my $template = new RT::Template($CurrentUser);
-    if ($args{'delete-template'}) {
-	$template->Load($args{'delete-template'});
-	unless ($template->id) {
-	    print "Couldn't load template";
-	    return(undef);
-	}
-	my ($val, $msg) = $template->Delete();
-	print "$msg\n";
-    }
-    elsif ($args{'create-template'}) {
-	#TODO edit the template content
-	my $content;
-
-	my $linesref = GetMessageContent(CurrentUser => $CurrentUser,
-				      Edit => 1);
-	
-	$content = join("\n", @{$linesref});
-	
-
-	my ($val, $msg) = $template->Create(Name => $args{'template-Name'},
-					    Description => $args{'template-Description'},
-					    Content => $content,
-					    Queue => $queue);
-	print "$msg\n";
-    }	
-    elsif ($args{'modify-template'}) {
-	
-	$template->Load($args{'modify-template'});
-	unless ($template->Id()) {
-	    print "Template not found\n";
-	    return();
-	}	
-	my @attributes = qw( Name Description );
-	foreach my $attrib (@attributes) {
-	    if ( (exists ($args{"template-$attrib"})) and
-		 ($template->$attrib() ne $args{"template-$attrib"})) {
-		
-		my $method = "Set$attrib";
-		my $val = $template->$method($args{"template-$attrib"});
-				
-	    }
-	}
-	if ($args{'template-edit-content'}) {
-	    
-	    my $linesref = GetMessageContent(CurrentUser => $CurrentUser,
-					     Content => $template->Content,
-					     Edit => 1);
-	    
-	    my $content = join("\n", @{$linesref});	    
-	    my ($val) = $template->SetContent($content);
-	    print $val."\n";
-	}	
-
-    }	
-    if ($args{'display-template'}) {
-	$template->Load($args{'display-template'});
-	print $template->Name . "\n". $template->Description ."\n". $template->Content."\n";
-    }	
-}	
-
-# }}}
-
-# {{{ sub AdminScrips
-
-sub AdminScrips {
-    my $queue = shift;
-    #Queue = 0 means 'global';
-
-    my %args;
-
-    
-    GetOptions(\%args, 'list-scrips', 'create-scrip','modify-scrip=s',
-	       'scrip-action=s', 'scrip-template=s', 'scrip-condition=s',
-	       'delete-scrip=s');
-
-    
-    # {{{ List entries
-    if ($args{'list-scrips'}) {
-	print "Scrips for $queue\n";
-	require RT::Scrips;
-	my $scrips = new RT::Scrips($CurrentUser);
-	if ($queue != 0) {
-	    $scrips->LimitToQueue($queue);
-	}	
-	else {
-	    $scrips->LimitToGlobal();
-	}	
-	while (my $scrip = $scrips->Next) {
-	    print $scrip->Id.": If ".
-	      $scrip->ConditionObj->Name." then " .
-		$scrip->ActionObj->Name." with template " .
-		  $scrip->TemplateObj->Name."\n";
-	}	
-    }
-
-    # }}}
-
-    require RT::Scrip;
-    my $scrip = new RT::Scrip($CurrentUser);
-    if ($args{'delete-scrip'}) {
-	$scrip->Load($args{'delete-scrip'});
-	unless ($scrip->id) {
-	    print "Couldn't load scrip";
-	      return(undef);
-	}
-	my ($val, $msg) = $scrip->Delete();
-	print "$msg\n";
-    }
-    elsif ($args{'create-scrip'}) {
-	my ($val, $msg) = $scrip->Create( ScripAction => $args{'scrip-action'},
-					  ScripCondition => $args{'scrip-condition'},
-					  Template => $args{'scrip-template'},
-					  Queue => $queue);
-
-	print "$msg\n";
-    }	
-}	
-
-# }}}
-
-# {{{ sub AdminRights
-
-sub AdminRights {
-    my $queue = shift;
-    #Queue = 0 means 'global';
-
-    my ($scope, $appliesto);
-    if ($queue == 0) {
-	$scope = 'System';
-	$appliesto = 0;
-    }	
-    else {
-	$scope =  'Queue';
-	$appliesto = $queue;
-    }	
-
-    my %args;    
-    GetOptions(\%args, 
-	       'grant-right|add-right|new-right|create-right=s@',
-	       'revoke-right|del-right|delete-right=s@',
-	       'list-rights', 'userid=s@', 'groupid=s@',
-	      );
-    
-    
-    # {{{ List entries
-    if ($args{'list-rights'}) {
-	require RT::ACL;
-	my $acl = new RT::ACL($CurrentUser);
-	if ($queue != 0) {
-	    $acl->LimitToQueue($queue);
-	}	
-	else {
-	    $acl->LimitToSystem();
-	}	
-	while (my $ace = $acl->Next) {
-	    print $ace->RightScope;
-	    
-	    #Print the queue name if we have it.
-	    print " " . $ace->AppliesToObj->Name if (defined $ace->AppliesToObj);
-	    
-	    print ": ". $ace->PrincipalType . " " .$ace->PrincipalObj->Name .
-	      " has right " . $ace->RightName ."\n";
-	      
-	}	
-    }
-
-    # }}}
-
-    require RT::ACE;    
-
-    # {{{ Build up an array of principals
-    my (@principals);
-    my $i = 0;
-    foreach my $group (@{$args{'groupid'}}) { 
-
-
-	my $princ = new RT::Group($CurrentUser);
-	$princ->Load("$group");
-	if ($princ->id) {
-	    $principals[$i]->{'type'} = 'Group';
-	    $principals[$i]->{'id'} = $princ->id();
-	    $i++;
-	}	
-	else {
-	    print "Could not find group $group\n";
-	}	
-    }	
-
-
-    foreach my $user (@{$args{'userid'}}) { 
-	my $princ = new RT::User($CurrentUser);
-	$princ->Load("$user");
-	if ($princ->id) {
-	    $principals[$i]->{'type'} = 'User';
-	    $principals[$i]->{'id'} = $princ->id();
-	    $i++;
-	}	
-	else {
-	    print "Could not find user $user.\n";
-	    }
-    }
-    # }}}
-
-
-    foreach my $principal (@principals) {
-
-	# {{{ Delete rights that need deleting
-	foreach my $right (@{$args{'revoke-right'}}) {
-	    my $ace = new RT::ACE($CurrentUser);
-	    $RT::Logger->debug("Trying to delete a right: $right \n");
-	    my ($val, $msg) = $ace->LoadByValues( RightName => $right,
-						  RightScope => $scope,
-						  PrincipalType => $principal->{'type'},
-						  PrincipalId => $principal->{'id'},
-						  RightAppliesTo => $appliesto);
-	    
-	    unless ($val) {
-		print "Right $right not found for" . $principal->{'type'} . " " .
-		  $principal->{'id'} . " in scope $scope ($appliesto)\n";
-		next;
-	    }	
-	    my ($delval, $delmsg) =$ace->Delete;
-	    print "$delmsg\n";
-	    
-	    
-	}
-
-	# }}}
-	
-	# {{{ grant rights that need granting
-	foreach my $right (@{$args{'grant-right'}}) {
-	    my $ace = new RT::ACE($CurrentUser);
-	    my ($val, $msg) = $ace->Create(RightName => $right,
-					   PrincipalType => $principal->{'type'},
-					   PrincipalId => $principal->{'id'},
-					   RightScope => $scope,
-					   RightAppliesTo => $appliesto);
-	    
-	    print $msg . "\n";
-	}
-
-	# }}}
-    }	
-
-}
-
-# }}}
-
-
-sub ListUsers {
-    require RT::Users;
-    my $users = new RT::Users($CurrentUser);
-    $users->UnLimit();
-    while (my $user = $users->Next()) {
-	printf ("%16s %-16s\n",$user->Name(), $user->EmailAddress());
-    }
-}
-sub ListQueues {
-    require RT::Queues;
-    my $queues = new RT::Queues($CurrentUser);
-    $queues->UnLimit();
-    while (my $queue = $queues->Next()) {
-	printf ("%16s %-16s\n",$queue->Name(), $queue->Description());
-    }
-}
-
-sub ListGroups {
-    require RT::Groups;
-    my $groups = new RT::Groups($CurrentUser);
-    $groups->UnLimit();
-    while (my $group = $groups->Next()) {
-	printf ("%16s %-16s\n",$group->Name(), $group->Description());
-    }	
-}
diff --git a/rt/docs/design_docs/basic-definitions.txt b/rt/docs/design_docs/basic-definitions.txt
deleted file mode 100644
index 23d2c5748..000000000
--- a/rt/docs/design_docs/basic-definitions.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-(todo ... basically, those are untouched from 1.0)
-Ticket
-Queue
-(...more?)
-
-Requestor
-
-  (...definition of a requestor .. blahblah)
-
-  I'm often doing a distinction between "Internal Requestors" and "External
-  Requestors" (see below).  The system doesn't make any difference between
-  requestors, but the distinction might be useful to discuss usage patterns,
-  templates and configurations.
-
-
-External Requestor
-
-  Might be a customer or a potential customer.  The External Requestor
-  should be treated as a VIP.  (S)he shouldn't need to see too much of RT.
-  The support (s)he gets should be as personal as possible.  The external
-  requestor might eventually get access to the Web UI, but only to track
-  her/his own requests.  If you're not planning to use RT for handling
-  external customers, all your requestors are probably "Internal
-  Requestors".
-
-
-Watcher
-
-  Somebody that are "subscribing" to a queue or a ticket (or something
-  differently).  Basicly, somebody watching a queue or a ticket should get
-  all updates by email.  A requestor is a (special) watcher.
-
-
-Regular Watcher
-
-  People within the same organization, people that have read access to whole
-  queues.
-
-  I consider "Regular Watchers" as well as "Internal Requestors" as more
-  robust and capable human beeings than the fragile customers.  We don't
-  mind letting them get entagled with RT, and we let them access the Web UI.
-  They can live with beeing just the Cc or Bcc at an email.
-
-
-Internal Requestor
-
-  An Internal Requestor is usually internal to the company.  He might be 1st
-  line support sending matters to tech support or similar. Might be an
-  internal employee sending matters to tech support (or even 1st line
-  support if he's not sure where to send matters).  It might also be that
-  "ordinary" requestors actually might be treated as intelligent human
-  beeings rather than VIPs, i.e. in open source projects ... we'll still
-  call them "Internal Requestors" as they don't need the special VIP
-  treatment.
diff --git a/rt/docs/design_docs/local_hacking b/rt/docs/design_docs/local_hacking
deleted file mode 100644
index c06d1126d..000000000
--- a/rt/docs/design_docs/local_hacking
+++ /dev/null
@@ -1,32 +0,0 @@
-To facilitate local hacking, RT needs a mechanism to allow site administrators
-to easily add HTML templates for the web ui and to replace sections
-of code in RT's core modules _without_ having to modify those modules
-
-We'll use several methods to achieve this goal.
-
-	Webui
-		HTML::Mason allows users to create multiple
-component hierarchies.  RT should ship with a local component root
-defined and available. This root should be configured as the "primary"
-component root.
-
-
-	Core modules
-
-	This gets a bit trickier. we want to allow people to trivially
-subclass core modules and to use those subclasses throughout the code.
-
-The way we're going to handle this is by setting up a number of subroutines
-in config.pm that look something like this:
-
-sub NewTicketObj {
-	eval "require $TicketClass";
-	my $object = new $TicketClass;
-	return ($object);
-}
-
-# This variable is used for ref type checking
-$TicketClass = "RT::Ticket";
-
-we could use an eval around the require and thus completely avoid specifying
-the object in two places. which feels like a win. but i'm worried about perf.
diff --git a/rt/docs/rt.gif b/rt/docs/rt.gif
deleted file mode 100755
index 693b06238..000000000
Binary files a/rt/docs/rt.gif and /dev/null differ
diff --git a/rt/etc/config.pm b/rt/etc/config.pm
deleted file mode 100755
index 52b1a0b25..000000000
--- a/rt/etc/config.pm
+++ /dev/null
@@ -1,473 +0,0 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/etc/Attic/config.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $	
-
-package RT;
-
-# {{{ Base Configuration
-
-# $rtname the string that RT will look for in mail messages to
-# figure out what ticket a new piece of mail belongs to
-
-# Your domain name is recommended, so as not to pollute the namespace.
-# once you start using a given tag, you should probably never change it. 
-# (otherwise, mail for existing tickets won't get put in the right place
-
-$rtname="example.com";  
-
-# You should set this to your organization's DNS domain. For example,
-# fsck.com or asylum.arkham.ma.us. It's used by the linking interface to 
-# guarantee that ticket URIs are unique and easy to construct.
-
-$Organization = "example.com";
-
-# $user_passwd_min defines the minimum length for user passwords. Setting
-# it to 0 disables this check
-$MinimumPasswordLength = "5";
-
-# $Timezone is used to convert times entered by users into GMT and back again
-# It should be set to a timezone recognized by your local unix box.
-$Timezone =  'US/Eastern'; 
-
-# LogDir is where RT writes its logfiles.
-# This directory should be writable by your rt group
-$LogDir = "!!RT_LOG_PATH!!";
-
-# }}}
-
-# {{{ Database Configuration
-
-# Database driver beeing used - i.e. MySQL.
-$DatabaseType="!!DB_TYPE!!";
-
-# The domain name of your database server
-# If you're running mysql and it's on localhost,
-# leave it blank for enhanced performance
-$DatabaseHost="!!DB_HOST!!";
-
-# The port that your database server is running on.  Ignored unless it's 
-# a positive integer. It's usually safe to leave this blank
-$DatabasePort="!!DB_PORT!!";
-
-
-#The name of the database user (inside the database) 
-$DatabaseUser='!!DB_RT_USER!!';
-
-# Password the DatabaseUser should use to access the database
-$DatabasePassword='!!DB_RT_PASS!!';
-
-
-# The name of the RT's database on your database server
-$DatabaseName='!!DB_DATABASE!!';
-
-# If you're using Postgres and have compiled in SSL support, 
-# set DatabaseRequireSSL to 1 to turn on SSL communication
-$DatabaseRequireSSL=undef;
-
-# }}}
-
-# {{{ Incoming mail gateway configuration
-
-
-# OwnerEmail is the address of a human who manages RT. RT will send
-# errors generated by the mail gateway to this address.  This address
-# should _not_ be an address that's managed by your RT instance.
-
-$OwnerEmail = 'root';
-
-# If $LoopsToRTOwner is defined, RT will send mail that it believes 
-# might be a loop to $RT::OwnerEmail 
-
-$LoopsToRTOwner = 1;
-
-# If $StoreLoopss is defined, RT will record messages that it believes 
-# to be part of mail loops.
-# As it does this, it will try to be careful not to send mail to the 
-# sender of these messages 
-
-$StoreLoops = undef;
-
-
-# $MaxAttachmentSize sets the maximum size (in bytes) of attachments stored
-# in the database. 
-
-# For mysql and oracle, we set this size at 10 megabytes.
-# If you're running a postgres version earlier than 7.1, you will need
-# to drop this to 8192. (8k)
-
-$MaxAttachmentSize = 10000000;  
-
-# $TruncateLongAttachments: if this is set to a non-undef value,
-# RT will truncate attachments longer than MaxAttachmentLength. 
-
-$TruncateLongAttachments = undef;
-
-
-# $DropLongAttachments: if this is set to a non-undef value,
-# RT will silently drop attachments longer than MaxAttachmentLength. 
-
-$DropLongAttachments = undef;
-
-# If $ParseNewMessageForTicketCcs is true, RT will attempt to divine
-# Ticket 'Cc' watchers from the To and Cc lines of incoming messages
-# Be forewarned that if you have _any_ addresses which forward mail to
-# RT automatically and you enable this option without modifying 
-# "IsRTAddress" below, you will get yourself into a heap of trouble.
-# And well, this is free software, so there isn't a warrantee, but
-# I disclaim all ability to help you if you do enable this without
-# modifying IsRTAddress below.
-
-$ParseNewMessageForTicketCcs = undef;
-
-# IsRTAddress is used to make sure RT doesn't add itself as a ticket CC if
-# the setting above is enabled.
-
-sub IsRTAddress {
-    my $address = shift;
-
-    # Example: the following rule would tell RT not to Cc 
-    #	"tickets@noc.example.com"
-    # return(1) if ($address =~ /^tickets\@noc.example.com$/i);
-    
-    return(undef)
-}
-
-# CanonicalizeAddress converts email addresses into canonical form.
-# it takes one email address in and returns the proper canonical
-# form. You can dump whatever your proper local config is in here
-
-sub CanonicalizeAddress {
-    my $email = shift;
-    # Example: the following rule would treat all email
-    # coming from a subdomain as coming from second level domain
-    # foo.com
-    #$email =~ s/\@(.*).foo.com/\@foo.com/;
-    return ($email)
-}
-
-# If $LookupSenderInExternalDatabase is defined, RT will attempt to
-# verify the incoming message sender with a known source, using the 
-# LookupExternalUserInfo routine below
-
-$LookupSenderInExternalDatabase = undef;
-
-# If $SenderMustExistInExternalDatabase is true, RT will refuse to
-# create non-privileged accounts for unknown users if you are using 
-# the "LookupSenderInExternalDatabase" option.
-# Instead, an error message will be mailed and RT will forward the 
-# message to $RTOwner.
-#
-# If you are not using $LookupSenderInExternalDatabase, this option
-# has no effect.
-#
-# If you define an AutoRejectRequest template, RT will use this   
-# template for the rejection message.
-
-$SenderMustExistInExternalDatabase = undef;
-
-# LookupExternalUserInfo is a site-definable method for synchronizing
-# incoming users with an external data source. 
-#
-# This routine takes a tuple of EmailAddress and FriendlyName
-# 	EmailAddress is the user's email address, ususally taken from
-#  		an email message's From: header.
-# 	FriendlyName is a freeform string, ususally taken from the "comment" 
-#		portion	of an email message's From: header.
-#
-# It returns (FoundInExternalDatabase, ParamHash);
-#
-#   FoundInExternalDatabase must  be set to 1 before return if the user was
-#   found in the external database.
-#
-#   ParamHash is a Perl parameter hash which can contain at least the following
-#   fields. These fields are used to populate RT's users database when the user 
-#   is created
-#
-# 	EmailAddress is the email address that RT should use for this user.  
-# 	Name is the 'Name' attribute RT should use for this user. 
-#   	     'Name' is used for things like access control and user lookups.
-# 	RealName is what RT should display as the user's name when displaying 
-#   	     'friendly' names
-
-sub LookupExternalUserInfo {
-  my ($EmailAddress, $RealName) = @_;
-
-  my $FoundInExternalDatabase = 1;
-  my %params = {};
-  
-  #Name is the RT username you want to use for this user.
-  $params{'Name'} = $EmailAddress;
-  $params{'EmailAddress'} = $EmailAddress;
-  $params{'RealName'} = $RealName;
-
-  # See RT's contributed code for examples.
-  # http://www.fsck.com/pub/rt/contrib/
-  return ($FoundInExternalDatabase, %params); 
-}
-
-# }}}
-
-# {{{ Outgoing mail configuration
-
-# RT is designed such that any mail which already has a ticket-id associated
-# with it will get to the right place automatically.
-
-# $CorrespondAddress and $CommentAddress are the default addresses 
-# that will be listed in From: and Reply-To: headers of correspondence
-# and comment mail tracked by RT, unless overridden by a queue-specific
-# address. 
-
-$CorrespondAddress='RT::CorrespondAddress.not.set';
-
-$CommentAddress='RT::CommentAddress.not.set';
-
-
-#Sendmail Configuration
-
-# $MailCommand defines which method RT will use to try to send mail
-# We know that 'sendmailpipe' works fairly well.
-# If 'sendmailpipe' doesn't work well for you, try 'sendmail' 
-#
-# Note that you should remove the '-t' from $SendmailArguments 
-# if you use 'sendmail rather than 'sendmailpipe'
-
-$MailCommand = 'sendmailpipe';
-
-# $SendmailArguments defines what flags to pass to $Sendmail
-# assuming you picked 'sendmail' or 'sendmailpipe' as the $MailCommand above.
-# If you picked 'sendmailpipe', you MUST add a -t flag to $SendmailArguments
-
-# These options are good for most sendmail wrappers and workalikes
-$SendmailArguments="-oi -t";
-
-# These arguments are good for sendmail brand sendmail 8 and newer
-#$SendmailArguments="-oi -t -ODeliveryMode=b -OErrorMode=m";
-
-# If you selected 'sendmailpipe' above, you MUST specify the path
-# to your sendmail binary in $SendmailPath.  
-# !! If you did not # select 'sendmailpipe' above, this has no effect!!
-$SendmailPath = "/usr/sbin/sendmail";
-
-# RT can optionally set a "Friendly" 'To:' header when sending messages to 
-# Ccs or AdminCcs (rather than having a blank 'To:' header.
-
-# This feature DOES NOT WORK WITH SENDMAIL[tm] BRAND SENDMAIL
-# If you are using sendmail, rather than postfix, qmail, exim or some other MTA,
-# you _must_ disable this option.
-
-$UseFriendlyToLine = 0;
-
-
-# }}}
-
-# {{{ Logging
-
-# Logging.  The default is to log anything except debugging
-# information to a logfile.  Check the Log::Dispatch POD for
-# information about how to get things by syslog, mail or anything
-# else, get debugging info in the log, etc. 
-
-#  It might generally make
-# sense to send error and higher by email to some administrator. 
-# If you do this, be careful that this email isn't sent to this RT instance.
-
-
-# the minimum level error that will be logged to the specific device.
-# levels from lowest to highest:  
-#  debug info notice warning error critical alert emergency 
-
-
-#  Mail loops will generate a critical log message.
-
-$LogToScreen = 'error';
-$LogToFile = 'error';
-#$LogToFileNamed = "$LogDir/rt.log.".$$.".".$<; #log to rt.log.<pid>.<user>
-$LogToFileNamed = "$LogDir/rt.log".$<; #log to rt.log.user;
-
-# }}}
-
-# {{{ Web interface configuration
-
-
-
-# Define the directory name to be used for images in rt web
-# documents.
-
-# If you're putting the web ui somewhere other than at the root of
-# your server
-# $WebPath requires a leading / but no trailing /     
-
-$WebPath = "";
-
-# This is the Scheme, server and port for constructing urls to webrt
-# $WebBaseURL doesn't need a trailing /                                                                            
-
-$WebBaseURL = "http://RT::WebBaseURL.not.configured:80";
-
-$WebURL = $WebBaseURL . $WebPath . "/";
-
-
-
-# $WebImagesURL points to the base URL where RT can find its images.
-# If you're running the FastCGI version of the RT web interface,
-# you should make RT's WebRT/html/NoAuth/images directory available on 
-# a static web server and supply that URL as $WebImagesURL.
-
-$WebImagesURL = $WebURL."NoAuth/images/";
-
-# $RTLogoURL points to the URL of the RT logo displayed in the web UI
-
-$LogoURL = $WebImagesURL."rt.jpg";
-
-# If $WebExternalAuth is defined, RT will defer to the environment's
-# REMOTE_USER variable.
-
-$WebExternalAuth = undef;
-
-# $MasonComponentRoot is where your rt instance keeps its mason html files
-# (this should be autoconfigured during 'make install' or 'make upgrade')
-
-$MasonComponentRoot = "!!MASON_HTML_PATH!!";
-
-# $MasonLocalComponentRoot is where your rt instance keeps its site-local
-# mason html files.
-# (this should be autoconfigured during 'make install' or 'make upgrade')
-
-$MasonLocalComponentRoot = "!!MASON_LOCAL_HTML_PATH!!";
-
-# $MasonDataDir Where mason keeps its datafiles
-# (this should be autoconfigured during 'make install' or 'make upgrade')
-
-$MasonDataDir = "!!MASON_DATA_PATH!!";
-
-# RT needs to put session data (for preserving state between connections
-# via the web interface)
-$MasonSessionDir = "!!MASON_SESSION_PATH!!";
-
-
-
-#This is from tobias' prototype web search UI. it may stay and it may go.
-%WebOptions=
-    (
-     # This is for putting in more user-actions at the Transaction
-     # bar.  I will typically add "Enter bug in Bugzilla" here.:
-     ExtraTransactionActions => sub { return ""; },
-
-     # Here you can modify the list view.  Be aware that the web
-     # interface might crash if TicketAttribute is wrongly set.
-     
-     QueueListingCols => 
-      [
-       { Header     => 'Id',
-	 TicketLink => 1,
-	 TicketAttribute => 'Id'
-	 },
-
-      { Header     => 'Subject',
-	 TicketAttribute => 'Subject'
-	 },
-       { Header => 'Requestor(s)',
-	 TicketAttribute => 'RequestorsAsString'
-	 },
-       { Header => 'Status',
-	 TicketAttribute => 'Status'
-	 },
-
-
-       { Header => 'Queue',
-	 TicketAttribute => 'QueueObj->Name'
-	 },
-
-
-
-       { Header => 'Told',
-	 TicketAttribute => 'ToldObj->AgeAsString'
-	 },
-
-       { Header => 'Age',
-	 TicketAttribute => 'CreatedObj->AgeAsString'
-	 },
-
-       { Header => 'Last',
-	 TicketAttribute => 'LastUpdatedObj->AgeAsString'
-	 },
-
-       # TODO: It would be nice with a link here to the Owner and all
-       # other request owned by this Owner.
-       { Header => 'Owner',
-	 TicketAttribute => 'OwnerObj->Name'
-       },
-   
- 
-       { Header     => 'Take',
-	 TicketLink => 1,
-	 Constant   => 'Take',
-	 ExtraLinks => '&Action=Take'
-	 },
-
-      ]
-     );
-
-# }}}
-
-# {{{ RT Linking Interface
-
-# $TicketBaseURI is the Base path of the URI for local tickets
-
-# You shouldn't need to touch this. it's used to link tickets both locally
-# and remotely
-
-$TicketBaseURI = "fsck.com-rt://$Organization/$rtname/ticket/";
-
-# A hash table of conversion subs to be used for transforming RT Link
-# URIs to URLs in the web interface.  If you want to use RT towards
-# locally installed databases, this is the right place to configure it.
-
-%URI2HTTP=
-    (
-      'http' => sub {return @_;},
-      'https' => sub {return @_;},
-      'ftp' => sub {return @_;},
-     'fsck.com-rt' => sub {warn "stub!";},
-     'mozilla.org-bugzilla' => sub {warn "stub!"},
-     'fsck.com-kb' => sub {warn "stub!"}
-     );
-
-
-# A hash table of subs for fetching content from an URI
-%ContentFromURI=   
-    (
-     'fsck.com-rt' => sub {warn "stub!";},
-     'mozilla.org-bugzilla' => sub {warn "stub!"},
-     'fsck.com-kb' => sub {warn "stub!"}
-     );
-
-# }}}
-
-# {{{ No User servicable parts inside 
-
-############################################
-############################################
-############################################
-#
-#  Don't edit anything below this line unless you really know
-#  what you're doing
-#
-#
-############################################
-############################################
-
-# TODO: get this stuff out of the config file and into RT.pm
-
-#Set up us the timezone
-$ENV{'TZ'} = $Timezone; #TODO: Bogus hack to deal with Date::Manip whining
-
-# Configure sendmail if we're using Entity->send('sendmail')
-if ($MailCommand eq 'sendmail') {
-    $MailParams = $SendmailArguments;
-}
-
-
-
-# }}}
-
-
-1;
diff --git a/rt/etc/schema.pm b/rt/etc/schema.pm
deleted file mode 100644
index 44e143ecd..000000000
--- a/rt/etc/schema.pm
+++ /dev/null
@@ -1,349 +0,0 @@
-#   column, type, nullability, length, default, database-local
-
-my $gratuitous = {
-
-'Groups' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'Name', 'varchar', 'NULL', '16', '', '',
-    'Description', 'varchar', 'NULL', '64', '', '',
-    'Pseudo', 'integer', '', '', '0', '',
-  ],
-  'primary_key' => 'id',
-  'unique' => [ ['Name'] ],
-  'index' => [  ],
-},
-
-'ACL' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'PrincipalId', 'integer', 'NULL', '', '', '',
-    'PrincipalType', 'varchar', 'NULL', '25', '', '',
-    'RightName', 'varchar', 'NULL', '25', '', '',
-    'RightScope', 'varchar', 'NULL', '25', '', '',
-    'RightAppliesTo', 'integer', 'NULL', '', '', '',
-  ],
-  'primary_key' => 'id',
-  'unique' => [  ],
-  'index' => [ ['RightScope', 'PrincipalId'], 
-  	       ['RightScope','RightAppliesTo','RightName','PrincipalType','PrincipalId'] ],
-},
-
-'Watchers' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'Type', 'varchar', 'NULL', '16', '', '',
-    'Scope', 'varchar', 'NULL', '16', '', '',
-    'Value', 'integer', 'NULL', '', '', '',
-    'Email', 'varchar', 'NULL', '255', '', '',
-    'Quiet', 'integer', 'NULL', '', '', '',
-    'Owner', 'integer', 'NULL', '', '', '',
-    'Creator', 'integer', 'NULL', '', '', '',
-    'Created', 'timestamp', 'NULL', '', '', '',
-    'LastUpdatedBy', 'integer', 'NULL', '', '', '',
-    'LastUpdated', 'timestamp', 'NULL', '', '', '',
-  ],
-  'primary_key' => 'id',
-  'unique' => [  ],
-  'index' => [ ['Scope','Value','Type','Owner'] ],
-},
-
-'Links' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'Base', 'varchar', 'NULL', '240', '', '',
-    'Target', 'varchar', 'NULL', '240', '', '',
-    'Type', 'varchar', '', '20', '', '',
-    'LocalTarget', 'integer', 'NULL', '', '', '',
-    'LocalBase', 'integer', 'NULL', '', '', '',
-    'LastUpdatedBy', 'integer', 'NULL', '', '', '',
-    'LastUpdated', 'timestamp', 'NULL', '', '', '',
-    'Creator', 'integer', 'NULL', '', '', '',
-    'Created', 'timestamp', 'NULL', '', '', '',
-  ],
-  'primary_key' => 'id',
-  'unique' => [ ['Base', 'Target', 'Type'] ],
-  'index' => [  ],
-},
-
-'Users' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'Name', 'varchar', '', '120', '', '',
-    'Password', 'varchar', 'NULL', '40', '', '',
-    'Comments', 'blob', 'NULL', '', '', '',
-    'Signature', 'blob', 'NULL', '', '', '',
-    'EmailAddress', 'varchar', 'NULL', '120', '', '',
-    'FreeformContactInfo', 'blob', 'NULL', '', '', '',
-    'Organization', 'varchar', 'NULL', '200', '', '',
-    'Privileged', 'integer', 'NULL', '', '', '',
-    'RealName', 'varchar', 'NULL', '120', '', '',
-    'Nickname', 'varchar', 'NULL', '16', '', '',
-    'Lang', 'varchar', 'NULL', '16', '', '',
-    'EmailEncoding', 'varchar', 'NULL', '16', '', '',
-    'WebEncoding', 'varchar', 'NULL', '16', '', '',
-    'ExternalContactInfoId', 'varchar', 'NULL', '100', '', '',
-    'ContactInfoSystem', 'varchar', 'NULL', '30', '', '',
-    'ExternalAuthId', 'varchar', 'NULL', '100', '', '',
-    'AuthSystem', 'varchar', 'NULL', '30', '', '',
-    'Gecos', 'varchar', 'NULL', '16', '', '',
-    'HomePhone', 'varchar', 'NULL', '30', '', '',
-    'WorkPhone', 'varchar', 'NULL', '30', '', '',
-    'MobilePhone', 'varchar', 'NULL', '30', '', '',
-    'PagerPhone', 'varchar', 'NULL', '30', '', '',
-    'Address1', 'varchar', 'NULL', '200', '', '',
-    'Address2', 'varchar', 'NULL', '200', '', '',
-    'City', 'varchar', 'NULL', '100', '', '',
-    'State', 'varchar', 'NULL', '100', '', '',
-    'Zip', 'varchar', 'NULL', '16', '', '',
-    'Country', 'varchar', 'NULL', '50', '', '',
-    'Creator', 'integer', 'NULL', '', '', '',
-    'Created', 'timestamp', 'NULL', '', '', '',
-    'LastUpdatedBy', 'integer', 'NULL', '', '', '',
-    'LastUpdated', 'timestamp', 'NULL', '', '', '',
-    'Disabled', 'int2', '','','0','',
-  ],
-  'primary_key' => 'id',
-  'unique' => [ ['Name'] ],
-  'index' => [ ['Name'], 
-  	       ['id', 'EmailAddress'],
-  	       ['EmailAddress'] ],
-},
-
-'Tickets' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'EffectiveId', 'integer', 'NULL', '', '', '',
-    'Queue', 'integer', 'NULL', '', '', '',
-    'Type', 'varchar', 'NULL', '16', '', '',
-    'IssueStatement', 'integer', 'NULL', '', '', '',
-    'Resolution', 'integer', 'NULL', '', '', '',
-    'Owner', 'integer', 'NULL', '', '', '',
-    'Subject', 'varchar', 'NULL', '200', '[no subject]', '',
-    'InitialPriority', 'integer', 'NULL', '', '', '',
-    'FinalPriority', 'integer', 'NULL', '', '', '',
-    'Priority', 'integer', 'NULL', '', '', '',
-    'Status', 'varchar', 'NULL', '10', '', '',
-    'TimeWorked', 'integer', 'NULL', '', '', '',
-    'TimeLeft', 'integer', 'NULL', '', '', '',
-    'Told', 'timestamp', 'NULL', '', '', '',
-    'Starts', 'timestamp', 'NULL', '', '', '',
-    'Started', 'timestamp', 'NULL', '', '', '',
-    'Due', 'timestamp', 'NULL', '', '', '',
-    'Resolved', 'timestamp', 'NULL', '', '', '',
-    'LastUpdatedBy', 'integer', 'NULL', '', '', '',
-    'LastUpdated', 'timestamp', 'NULL', '', '', '',
-    'Creator', 'integer', 'NULL', '', '', '',
-    'Created', 'timestamp', 'NULL', '', '', '',
-    'Disabled', 'int2', '','','0','',
-  ],
-  'primary_key' => 'id',
-  'unique' => [ [] ],
-  'index' => [ ['Queue', 'Status'], 
-  	       ['Owner'], 
-	       ['EffectiveId'], 
-	       ['id', 'Status'], 
-	       ['id', 'EffectiveId'] ],
-},
-
-'GroupMembers' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'GroupId', 'integer', 'NULL', '', '', '', #foreign key, Groups::id
-    'UserId', 'integer', 'NULL', '', '', '', #foreign key, Users::id
-  ],
-  'primary_key' => 'id',
-  'unique' => [ ['GroupId', 'UserId']  ],
-  'index' => [  ],
-},
-
-'Queues' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'Name', 'varchar', '', '120', '', '', #Textual 'name' for this queue
-    'Description', 'varchar', 'NULL', '120', '', '', #Textual descr. of this
-    #queue
-    'CorrespondAddress', 'varchar', 'NULL', '120', '', '',
-    'CommentAddress', 'varchar', 'NULL', '120', '', '',
-    'InitialPriority', 'integer', 'NULL', '', '', '',
-    'FinalPriority', 'integer', 'NULL', '', '', '',
-    'DefaultDueIn', 'integer', 'NULL', '', '', '',
-
-    'Creator', 'integer', 'NULL', '', '', '',
-    'Created', 'timestamp', 'NULL', '', '', '',
-    'LastUpdatedBy', 'integer', 'NULL', '', '', '',
-    'LastUpdated', 'timestamp', 'NULL', '', '', '',
-    'Disabled', 'int2', '','','0','',
-  ],
-  'primary_key' => 'id',
-  'unique' => [ ['Name'] ],
-  'index' => [  ],
-},
-
-'Transactions' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'EffectiveTicket', 'integer', 'NULL', '', '', '', 
-    'Ticket', 'integer', 'NULL', '', '', '',  #Foreign key Ticket::id
-    'TimeTaken', 'integer', 'NULL', '', '', '', #Time spent on this trans in min
-    'Type', 'varchar', 'NULL', '20', '', '',
-    'Field', 'varchar', 'NULL', '40', '', '', #If it's a "Set" transaction, what
-    #field was set.
-    'OldValue', 'varchar', 'NULL', '255', '', '', 
-    'NewValue', 'varchar', 'NULL', '255', '', '',
-    'Data', 'varchar', 'NULL', '100', '', '',
-
-
-    'Creator', 'integer', 'NULL', '', '', '',
-    'Created', 'timestamp', 'NULL', '', '', '',
-
-  ],
-  'primary_key' => 'id',
-  'unique' => [  ],
-  'index' => [ ['Ticket'], ['EffectiveTicket'] ],
-},
-
-'ScripActions' => {
-  'columns' => [
-		'id', 'serial', '', '', '', '',
-		'Name', 'varchar', 'NULL', '255', '', '',  # Alias
-		'Description', 'varchar', 'NULL', '255', '', '', #Textual description
-		'ExecModule', 'varchar', 'NULL', '60', '', '', #This calles RT::Action::___
-		'Argument', 'varchar', 'NULL', '255', '', '', #We can pass a single argument
-		#to the scrip. sometimes, it's who to send mail to.
-		'Creator', 'integer', 'NULL', '', '', '',
-		'Created', 'timestamp', 'NULL', '', '', '',
-		'LastUpdatedBy', 'integer', 'NULL', '', '', '',
-		'LastUpdated', 'timestamp', 'NULL', '', '', '',
-  ],
-  'primary_key' => 'id',
-  'unique' => [  ],
-  'index' => [  ],
-},
-
-'ScripConditions' => {
-  'columns' => [
-		'id', 'serial', '', '', '', '',
-		'Name', 'varchar', 'NULL', '255', '', '',  # Alias
-		'Description', 'varchar', 'NULL', '255', '', '', #Textual description
-		'ExecModule', 'varchar', 'NULL', '60', '', '', #This calles RT::Condition::
-		'Argument', 'varchar', 'NULL', '255', '', '', #We can pass a single argument
-		#to the scrip. sometimes, it's who to send mail to.
-		'ApplicableTransTypes', 'varchar', 'NULL', '60', '', '',#Transaction types this scrip
-		# acts on. comma or / delimited is just great.
-		'Creator', 'integer', 'NULL', '', '', '',
-		'Created', 'timestamp', 'NULL', '', '', '',
-		'LastUpdatedBy', 'integer', 'NULL', '', '', '',
-		'LastUpdated', 'timestamp', 'NULL', '', '', '',
-  ],
-  'primary_key' => 'id',
-  'unique' => [  ],
-  'index' => [  ],
-},
-'Scrips' => {
-		 'columns' => [
-			       'id', 'serial', '', '', '', '',
-			       'ScripCondition', 'integer', 'NULL', '', '', '', #Foreign key ScripConditions::id
-			       'ScripAction', 'integer', 'NULL', '', '', '', #Foreign key ScripActions::id
-			       'Stage', 'varchar', 'NULL', '32','','', #What stage does this scrip
-			       #Happen in.  for now, everything is 'TransactionCreate',
-			       'Queue', 'integer', 'NULL', '', '', '', #Foreign key Queues::id
-			       'Template', 'integer', 'NULL', '', '', '', #Foreign key Templates::id
-			       
-			       'Creator', 'integer', 'NULL', '', '', '',
-			       'Created', 'timestamp', 'NULL', '', '', '',
-			       'LastUpdatedBy', 'integer', 'NULL', '', '', '',
-			       'LastUpdated', 'timestamp', 'NULL', '', '', '',
-			      ],
-		 'primary_key' => 'id',
-		 'unique' => [  ],
-		 'index' => [  ],
-},
-
-'Attachments' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'TransactionId', 'integer', '', '', '', '', #Foreign key Transactions::Id
-    'Parent', 'integer', 'NULL', '', '', '', # Attachments::Id
-    'MessageId', 'varchar', 'NULL', '160', '', '', #RFC822 messageid, if any
-    'Subject', 'varchar', 'NULL', '255', '', '', 
-    'Filename', 'varchar', 'NULL', '255', '', '',
-    'ContentType', 'varchar', 'NULL', '80', '', '',
-    'ContentEncoding', 'varchar', 'NULL', '80', '', '',
-    'Content', 'long varbinary', 'NULL', '', '', '',
-    'Headers', 'long varbinary', 'NULL', '', '', '',
-
-    'Creator', 'integer', 'NULL', '', '', '',
-    'Created', 'timestamp', 'NULL', '', '', '',
-
-  ],
-  'primary_key' => 'id',
-  'unique' => [  ],
-  'index' => [ ['Parent'], ['TransactionId'], ['Parent', 'TransactionId'] ],
-},
-
-'Templates' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'Queue', 'integer', 'NOT NULL', '', '0', '',
-    'Name', 'varchar', '', '40', '', '',
-    'Description', 'varchar', 'NULL', '120', '', '',
-    'Type', 'varchar', 'NULL', '16', '','',
-    'Language', 'varchar', 'NULL', '16', '', '',
-    'TranslationOf', 'integer', 'NULL', '', '', '',
-    'Content', 'blob', 'NULL', '', '', '',
-    'LastUpdated', 'timestamp', 'NULL', '', '', '',
-    'LastUpdatedBy', 'integer', 'NULL', '', '', '',
-    'Creator', 'integer', 'NULL', '', '', '',
-    'Created', 'timestamp', 'NULL', '', '', '',
-  ],
-  'primary_key' => 'id',
-  'unique' => [ [''] ],
-  'index' => [  ],
-},
-
-'Keywords' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'Name', 'varchar', 'NOT NULL', '255', '', '',
-    'Description', 'varchar', 'NULL', '255', '', '',
-    'Parent', 'integer', 'NULL', '', '', '',
-    'Disabled', 'int2', '','','0','',
-],
-  'primary_key' => 'id',
-  'unique' => [ [ 'Name', 'Parent' ] ],
-  'index' => [ [ 'Name', ], [ 'Parent' ] ],
-},
-
-'ObjectKeywords' => {
-  'columns' =>  [
-    'id', 'serial', '', '', '', '',
-    'Keyword', 'integer', 'NOT NULL', '', '', '',
-    'KeywordSelect', 'integer', 'NOT NULL', '', '', '',
-    'ObjectType', 'varchar', 'NOT NULL', '32', '', '',
-    'ObjectId', 'integer', 'NOT NULL', '', '', '',
-  ],
-  'primary_key' => 'id',
-  'unique' => [ [  'ObjectId', 'ObjectType','KeywordSelect', 'Keyword' ] ],
-  'index' => [ [ 'ObjectId', 'ObjectType'  ] , ['Keyword'] ],
-
-},
-
-'KeywordSelects' => {
-  'columns' =>  [
-    'id', 'serial', '', '', '', '',
-    'Name','varchar','NULL','255','','',
-    'Keyword', 'integer', 'NULL', '', '', '',
-    'Single', 'integer', 'NULL', '', '', '',
-    'Depth', 'integer', 'NOT NULL', '', 0, '',
-    'ObjectType', 'varchar', 'NOT NULL',  '32', '', '',
-    'ObjectField', 'varchar', 'NULL', '32', '', '',
-    'ObjectValue', 'varchar', 'NULL', '255', '', '',
-    'Disabled', 'int2', '','','0','',
-  ],
-  'primary_key' => 'id',
-  'unique' => [ [ ] ],
-  'index' => [ [ 'Keyword' ], [ 'ObjectType', 'ObjectField', 'ObjectValue'] ],
-},
-
-};
diff --git a/rt/lib/MANIFEST b/rt/lib/MANIFEST
deleted file mode 100644
index cda386be5..000000000
--- a/rt/lib/MANIFEST
+++ /dev/null
@@ -1,57 +0,0 @@
-MANIFEST
-MANIFEST.SKIP
-Makefile.PL
-RT.pm
-test.pl
-RT/ACE.pm
-RT/ACL.pm
-RT/Action/Generic.pm
-RT/Action/NotifyAsComment.pm
-RT/Action/OpenDependent.pm
-RT/Action/SendEmail.pm
-RT/Action/StallDependent.pm
-RT/Action/Notify.pm
-RT/Action/ResolveMembers.pm
-RT/Attachment.pm
-RT/Attachments.pm
-RT/Condition/AnyTransaction.pm
-RT/Condition/Generic.pm
-RT/Condition/NewDependency.pm
-RT/CurrentUser.pm
-RT/Date.pm
-RT/EasySearch.pm
-RT/Group.pm
-RT/GroupMember.pm
-RT/GroupMembers.pm
-RT/Groups.pm
-RT/Handle.pm
-RT/Interface/CLI.pm
-RT/Interface/Email.pm
-RT/Interface/Web.pm
-RT/Keyword.pm
-RT/Keywords.pm
-RT/KeywordSelect.pm
-RT/KeywordSelects.pm
-RT/Link.pm
-RT/Links.pm
-RT/ObjectKeyword.pm
-RT/ObjectKeywords.pm
-RT/Queue.pm
-RT/Queues.pm
-RT/Record.pm
-RT/Scrip.pm
-RT/Scrips.pm
-RT/ScripAction.pm
-RT/ScripActions.pm
-RT/ScripCondition.pm
-RT/ScripConditions.pm
-RT/Template.pm
-RT/Templates.pm
-RT/Ticket.pm
-RT/Tickets.pm
-RT/Transaction.pm
-RT/Transactions.pm
-RT/User.pm
-RT/Users.pm
-RT/Watcher.pm
-RT/Watchers.pm
diff --git a/rt/lib/MANIFEST.SKIP b/rt/lib/MANIFEST.SKIP
deleted file mode 100644
index ae335e78a..000000000
--- a/rt/lib/MANIFEST.SKIP
+++ /dev/null
@@ -1 +0,0 @@
-CVS/
diff --git a/rt/lib/Makefile.PL b/rt/lib/Makefile.PL
deleted file mode 100644
index c0e1af28c..000000000
--- a/rt/lib/Makefile.PL
+++ /dev/null
@@ -1,49 +0,0 @@
-use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-WriteMakefile(
-    'NAME'      => 'RT',
-    'VERSION_FROM' => 'RT.pm', # finds $VERSION
-    'PREREQ_PM' => {
-                     'DBI'                 => 1.16,
-                     'DBIx::SearchBuilder' => '0.48',
-                     'Date::Parse'         => 0,
-                     'Date::Format'        => 0,
-                     'MIME::Entity'        => 5.108,
-                     'Mail::Mailer'        => '1.20',
-                     'Log::Dispatch'       => 1.6,
-                     'HTML::Entities'      => 0,
-                     'Text::Wrapper'       => 0,
-                     'Text::Template'      => 0,
-		     'Getopt::Long'        => 2.24,
-                   },
-);
-
-     {
-                   package MY;
-                   sub top_targets {
-                       my($self) = @_;
-                       my $out = "POD2TEST_EXE = pod2test\n";
-
-                       $out .= $self->SUPER::top_targets(@_);
-                       # $out =~ s/^(pure_all\b.*)/$1 testifypods/m;
-
-                       $out .= "\n\ntestifypods : \n";
-
-			my @pods = (keys %{$self->{MAN1PODS}},
-				     keys %{$self->{MAN3PODS}});
-
-                       foreach my $pod (@pods) {
-                           (my $test = $pod) =~ s/\.(pm|pod)$//;
-                           $test =~ s/^lib\W//;
-                           $test =~ s/\W/-/;
-			   $test =~ s/\//__/g;
-                           $test = "autogen-$test.t";
-                           $out .= "\t$self->{NOECHO}\$(POD2TEST_EXE) ".
-                                   "$pod t/$test \n";
-                       }
-
-                       return $out;
-                   }
-               }
-
diff --git a/rt/lib/RT/Action/OpenDependent.pm b/rt/lib/RT/Action/OpenDependent.pm
deleted file mode 100644
index b271e4709..000000000
--- a/rt/lib/RT/Action/OpenDependent.pm
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/Attic/OpenDependent.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# This Action will open the BASE if a dependent is resolved.
-
-package RT::Action::OpenDependent;
-require RT::Action::Generic;
-require RT::Links;
-@ISA=qw(RT::Action::Generic);
-
-#Do what we need to do and send it out.
-
-#What does this type of Action does
-
-# {{{ sub Describe 
-sub Describe  {
-  my $self = shift;
-  return (ref $self . " will stall a [local] BASE if it's open and a dependency link is created.");
-}
-# }}}
-
-
-# {{{ sub Prepare 
-sub Prepare  {
-    # nothing to prepare
-    return 1;
-}
-# }}}
-
-sub Commit {
-    my $self = shift;
-
-    my $Links=RT::Links->new($RT::SystemUser);
-    $Links->Limit(FIELD => 'Type', VALUE => 'DependsOn');
-    $Links->Limit(FIELD => 'Target', VALUE => $self->TicketObj->id);
-
-    while (my $Link=$Links->Next()) {
-	next unless $Link->BaseIsLocal;
-	my $base=RT::Ticket->new($self->TicketObj->CurrentUser);
-	# Todo: Only work if Base is a plain ticket num:
-	$base->Load($Link->Base);
-        $base->Open if $base->Status eq 'stalled';
-    }
-}
-
-
-# Applicability checked in Commit.
-
-# {{{ sub IsApplicable 
-sub IsApplicable  {
-  my $self = shift;
-  1;  
-  return 1;
-}
-# }}}
-
-1;
diff --git a/rt/lib/RT/Action/SendPasswordEmail.pm b/rt/lib/RT/Action/SendPasswordEmail.pm
deleted file mode 100755
index 91bb3c1cb..000000000
--- a/rt/lib/RT/Action/SendPasswordEmail.pm
+++ /dev/null
@@ -1,170 +0,0 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/Attic/SendPasswordEmail.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Copyright 2001  Jesse Vincent <jesse@fsck.com>
-# Released under the terms of the GNU Public License
-
-package RT::Action::SendPasswordEmail;
-require RT::Action::Generic;
-
-@ISA = qw(RT::Action::Generic);
-
-
-=head1 NAME
-
-  RT::Action::SendGenericEmail - An Action which users can use to send mail 
-  or can subclassed for more specialized mail sending behavior. 
-
-
-
-=head1 SYNOPSIS
-
-  require RT::Action::SendPasswordEmail;
-
-
-=head1 DESCRIPTION
-
-Basically, you create another module RT::Action::YourAction which ISA
-RT::Action::SendEmail.
-
-If you want to set the recipients of the mail to something other than
-the addresses mentioned in the To, Cc, Bcc and headers in
-the template, you should subclass RT::Action::SendEmail and override
-either the SetRecipients method or the SetTo, SetCc, etc methods (see
-the comments for the SetRecipients sub).
-
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Action::SendPasswordEmail);
-
-=end testing
-
-
-=head1 AUTHOR
-
-Jesse Vincent <jesse@bestpractical.com>
-
-=head1 SEE ALSO
-
-perl(1).
-
-=cut
-
-# {{{ Scrip methods (_Init, Commit, Prepare, IsApplicable)
-
-# {{{ sub Commit 
-
-#Do what we need to do and send it out.
-
-sub Commit  {
-    my $self = shift;
-    #send the email
-    
-    
-    
-
-    
-    my $MIMEObj = $self->TemplateObj->MIMEObj;
-    
-    
-    $MIMEObj->make_singlepart;
-    
-    #If we don\'t have any recipients to send to, don\'t send a message;
-    unless ($MIMEObj->head->get('To')) {
-	$RT::Logger->debug("$self: No recipients found. Not sending.\n");
-	return(1);
-    }
-    
-    if ($RT::MailCommand eq 'sendmailpipe') {
-	open (MAIL, "|$RT::SendmailPath $RT::SendmailArguments") || return(0);
-	print MAIL $MIMEObj->as_string;
-	close(MAIL);
-    }
-    else {
-	unless ($MIMEObj->send($RT::MailCommand, $RT::MailParams)) {
-	    $RT::Logger->crit("$self: Could not send mail for ".
-			      $self->TransactionObj . "\n");
-	    return(0);
-	}
-    }
-    
-    return (1);
-    
-}
-# }}}
-
-# {{{ sub Prepare 
-
-sub Prepare  {
-    my $self = shift;
-    
-    # This actually populates the MIME::Entity fields in the Template Object
-    
-    unless ($self->TemplateObj) {
-	$RT::Logger->warning("No template object handed to $self\n");
-    }
-    
-    
-    unless ($self->TemplateObj->MIMEObj->head->get('Reply-To')) {
-	$self->SetHeader('Reply-To',$RT::CorrespondAddress );
-    }
-
-    
-    $self->SetHeader('Precedence', "bulk");
-    $self->SetHeader('X-RT-Loop-Prevention', $RT::rtname); 
-    $self->SetHeader
-      ('Managed-by',"Request Tracker $RT::VERSION (http://www.fsck.com/projects/rt/)");
-    
-    $self->TemplateObj->Parse(Argument => $self->Argument);
-    
-    
-    return 1;
-}
-
-# }}}
-
-# }}}
-
-
-# {{{ sub SetTo
-
-=head2 SetTo EMAIL
-
-Sets this message's "To" field to EMAIL
-
-=cut
-
-sub SetTo {
-    my $self = shift;
-    my $to = shift;
-    $self->SetHeader('To',$to);
-}
-
-# }}}
-
-# {{{ sub SetHeader
-
-sub SetHeader {
-  my $self = shift;
-  my $field = shift;
-  my $val = shift;
-
-  chomp $val;                                                                  
-  chomp $field;                                                                
-  $self->TemplateObj->MIMEObj->head->fold_length($field,10000);     
-  $self->TemplateObj->MIMEObj->head->add($field, $val);
-  return $self->TemplateObj->MIMEObj->head->get($field);
-}
-
-# }}}
-
-
-
-__END__
-
-# {{{ POD
-
-# }}}
-
-1;
-
diff --git a/rt/lib/RT/Action/StallDependent.pm b/rt/lib/RT/Action/StallDependent.pm
deleted file mode 100644
index 09d3448a8..000000000
--- a/rt/lib/RT/Action/StallDependent.pm
+++ /dev/null
@@ -1,68 +0,0 @@
-# This Action will stall the BASE if a dependency or membership link
-# (according to argument) is created and if BASE is open.
-
-# TODO: Rename this .pm
-
-package RT::Action::StallDependent;
-require RT::Action::Generic;
-@ISA=qw|RT::Action::Generic|;
-
-# {{{ sub Describe 
-sub Describe  {
-  my $self = shift;
-  return (ref $self . " will stall a [local] BASE if it's dependent [or member] of a linked up request.");
-}
-# }}}
-
-
-# {{{ sub Prepare 
-sub Prepare  {
-    # nothing to prepare
-    return 1;
-}
-# }}}
-
-sub Commit {
-    my $self = shift;
-    # Find all Dependent
-    my $arg=$self->Argument || "DependsOn";
-    unless ($self->TransactionObj->Data =~ /^([^ ]+) $arg /) {
-	warn; return 0;
-    }
-    my $base_id=$1;
-    my $base;
-    if ($1 eq "THIS") {
-	$base=$self->TicketObj;
-    } else {
-	$base_id=&RT::Link::_IsLocal(undef, $base_id) || return 0;
-	$base=RT::Ticket->new($self->TicketObj->CurrentUser);
-	$base->Load($base_id);
-    }
-    $base->Stall if $base->Status eq 'open';
-    return 0;
-}
-
-
-# {{{ sub IsApplicable 
-
-# Only applicable if:
-# 1. the link action is a dependency
-# 2. BASE is a local ticket
-
-sub IsApplicable  {
-  my $self = shift;
-
-  my $arg=$self->Argument || "DependsOn";
-
-  # 1:
-  $self->TransactionObj->Data =~ /^([^ ]*) $arg / || return 0;
-
-  # 2:
-  # (dirty!)
-  &RT::Link::_IsLocal(undef,$1) || return 0;
-
-  return 1;
-}
-# }}}
-
-1;
diff --git a/rt/lib/RT/Condition/NewDependency.pm b/rt/lib/RT/Condition/NewDependency.pm
deleted file mode 100644
index e69de29bb..000000000
diff --git a/rt/lib/RT/EasySearch.pm b/rt/lib/RT/EasySearch.pm
deleted file mode 100755
index bcbfa01b2..000000000
--- a/rt/lib/RT/EasySearch.pm
+++ /dev/null
@@ -1,115 +0,0 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/EasySearch.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
-=head1 NAME
-
-  RT::EasySearch - a baseclass for RT collection objects
-
-=head1 SYNOPSIS
-
-=head1 DESCRIPTION
-
-
-=head1 METHODS
-
-
-=begin testing
-
-ok (require RT::EasySearch);
-
-=end testing
-
-
-=cut
-
-package RT::EasySearch;
-use DBIx::SearchBuilder;
-@ISA= qw(DBIx::SearchBuilder);
-
-# {{{ sub _Init 
-sub _Init  {
-    my $self = shift;
-    
-    $self->{'user'} = shift;
-    unless(defined($self->CurrentUser)) {
-	use Carp;
-	Carp::confess("$self was created without a CurrentUser");
-	$RT::Logger->err("$self was created without a CurrentUser\n"); 
-	return(0);
-    }
-    $self->SUPER::_Init( 'Handle' => $RT::Handle);
-}
-# }}}
-
-# {{{ sub LimitToEnabled
-
-=head2 LimitToEnabled
-
-Only find items that haven\'t been disabled
-
-=cut
-
-sub LimitToEnabled {
-    my $self = shift;
-    
-    $self->Limit( FIELD => 'Disabled',
-		  VALUE => '0',
-		  OPERATOR => '=' );
-}
-# }}}
-
-# {{{ sub LimitToDisabled
-
-=head2 LimitToDeleted
-
-Only find items that have been deleted.
-
-=cut
-
-sub LimitToDeleted {
-    my $self = shift;
-    
-    $self->{'find_disabled_rows'} = 1;
-    $self->Limit( FIELD => 'Disabled',
-		  OPERATOR => '=',
-		  VALUE => '1'
-		);
-}
-# }}}
-
-
-# {{{ sub Limit 
-
-=head2 Limit PARAMHASH
-
-This Limit sub calls SUPER::Limit, but defaults "CASESENSITIVE" to 1, thus
-making sure that by default lots of things don't do extra work trying to 
-match lower(colname) agaist lc($val);
-
-=cut
-
-sub Limit {
-	my $self = shift;
-	my %args = ( CASESENSITIVE => 1,
-		     @_ );
-
-   return $self->SUPER::Limit(%args);
-}
-
-# {{{ sub CurrentUser 
-
-=head2 CurrentUser
-
-  Returns the current user as an RT::User object.
-
-=cut
-
-sub CurrentUser  {
-  my $self = shift;
-  return ($self->{'user'});
-}
-# }}}
-    
-
-1;
-
-
diff --git a/rt/lib/RT/Keyword.pm b/rt/lib/RT/Keyword.pm
deleted file mode 100644
index a41e0a585..000000000
--- a/rt/lib/RT/Keyword.pm
+++ /dev/null
@@ -1,446 +0,0 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/Keyword.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
-=head1 NAME
-
- RT::Keyword - Manipulate an RT::Keyword record
-
-=head1 SYNOPSIS
-
-  use RT::Keyword;
-
-  my $keyword = RT::Keyword->new($CurrentUser);
-  $keyword->Create( Name => 'tofu',
-		    Description => 'fermented soy beans',
-		  );
-  
-
-  my $keyword2 = RT::Keyword->new($CurrentUser);
-  $keyword2->Create( Name   => 'beast',
-		    Description => 'a wild animal',
-		    Parent => $keyword->id(),
-		  );
-
-=head1 DESCRIPTION
-
-An B<RT::Keyword> object is an arbitrary string. 
-
-=head1 METHODS
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Scrip);
-
-=end testing
-
-
-=cut 
-package RT::Keyword;
-
-use strict;
-use vars qw(@ISA);
-use Tie::IxHash;
-use RT::Record;
-use RT::Keywords;
-
-@ISA = qw(RT::Record);
-
-# {{{ Core methods
-
-sub _Init {
-    my $self = shift;
-    $self->{'table'} = "Keywords";
-    $self->SUPER::_Init(@_);
-}
-
-sub _Accessible {
-    my $self = shift;
-    my %cols = (
-		Name        => 'read/write', #the keyword itself
-		Description => 'read/write', #a description of the keyword
-		Parent      => 'read/write', #optional id of another B<RT::Keyword>, allowing keywords to be arranged hierarchically
-		Disabled    => 'read/write'
-	       );
-    return ($self->SUPER::_Accessible( @_, %cols));
-    
-}
-
-# }}}
-
-
-=over 4
-
-=item new CURRENT_USER
-
-Takes a single argument, an RT::CurrentUser object.  Instantiates a new
-(uncreated) RT::Keyword object.
-
-=cut
-
-# {{{ sub Create
-
-=item Create KEY => VALUE, ...
-
-Takes a list of key/value pairs and creates a the object.  Returns the id of
-the newly created record, or false if there was an error.
-
-Keys are:
-
-Name - the keyword itself
-Description - (not yet used)
-Parent - optional link to another B<RT::Keyword>, allowing keyword to be arranged in a hierarchical fashion.  Can be specified by id or Name.
-
-=cut
-
-sub Create {
-    my $self = shift;
-    my %args = (Name => undef,
-		Description => undef,
-		Parent => 0,
-		@_);
-    
-    unless ($self->CurrentUserHasRight('AdminKeywords')) {
-	return (0, 'Permission Denied');
-    }    
-  
-    if ( $args{'Parent'} && $args{'Parent'} !~ /^\d+$/ ) {
-	$RT::Logger->err( "can't yet specify parents by name, sorry: ". $args{'Parent'});
-	return(0,'Parent must be specified by id');
-    }
-    
-    my $val = $self->SUPER::Create(Name => $args{'Name'},
-				   Description => $args{'Description'},
-				   Parent => $args{'Parent'}
-				  );
-    if ($val) {
-	return ($val, 'Keyword created');
-    }
-    else {
-	return(0,'Could not create keyword');
-    }	
-}
-
-# }}}
-
-# {{{ sub Delete
-
-sub Delete {
-    my $self = shift;
-    
-    return (0, 'Deleting this object would break referential integrity.');
-}
-
-# }}}
-
-# {{{ sub LoadByPath 
-
-=head2 LoadByPath STRING
-
-LoadByPath takes a string.  Whatever character starts the string is assumed to be a delimter.  The routine parses the keyword path description and tries to load the keyword
-described by that path.  It returns a numerical status and a textual message.
-A non-zero status means 'Success'.
-
-=cut
-
-sub LoadByPath {
-    my $self = shift;
-
-    my $path = shift;
-    
-    my $delimiter = substr($path,0,1);
-    my @path_elements = split($delimiter, $path);
-    
-    #throw awya the first bogus path element
-    shift @path_elements;
-    
-    my $parent = 0;
-    my ($tempkey);
-    #iterate through all the path elements loading up a
-    #keyword object. when we're done, this object becomes 
-    #whatever the last tempkey object was.
-    while (my $name = shift @path_elements) {
-	
-	$tempkey = new RT::Keyword($self->CurrentUser);
-
-	my $loaded = $tempkey->LoadByNameAndParentId($name, $parent);
-	
-	#Set the new parent for loading its child.
-	$parent = $tempkey->Id;
-	
-	#If the parent Id is 0, then we're not recursing through the tree
-	# time to bail
-	return (0, "Couldn't find keyword") unless ($tempkey->id());
-
-    }	
-    #Now that we're through with the loop, the last keyword loaded
-    # is the the one we wanted.
-    # we shouldn't need to explicitly load it like this. but we do. Thanks SQL
-    
-    $self->Load($tempkey->Id);
-    
-    return (1, 'Keyword loaded');
-}
-
-
-# }}}
-
-# {{{ sub LoadByNameAndParentId
-
-=head2 LoadByNameAndParentId NAME PARENT_ID
-  
-Takes two arguments, a keyword name and a parent id. Loads a keyword into 
-  the current object.
-
-=cut
-  
-sub LoadByNameAndParentId {
-    my $self = shift;
-    my $name = shift;
-    my $parentid = shift;
-    
-    my $val = $self->LoadByCols( Name => $name, Parent => $parentid);
-    if ($self->Id) {
-	return ($self->Id, 'Keyword loaded');
-    }	
-    else {
-	return (0, 'Keyword could not be found');
-    }
-  }
-
-# }}}
-
-
-# {{{ sub Load
-
-=head2 Load KEYWORD
-
-Loads KEYWORD, either by id if it's an integer or by Path, otherwise
-
-=cut
-
-sub Load {
-    my $self = shift;
-    my $id = shift;
-
-    if (!$id) {
-	return (0, 'No keyword defined');
-    }	
-    if ($id =~ /^(\d+)$/) {
-	 return ($self->SUPER::Load($id));
-    }
-    else {
-	 return($self->LoadByPath($id));
-    }
-}
-
-
-# }}}
-
-# {{{ sub Path
-
-=item Path
-
-  Returns this Keyword's full path going back to the root. (eg /OS/Unix/Linux/Redhat if 
-this keyword is "Redhat" )
-
-=cut
-
-sub Path {
-    my $self = shift;
-    
-    if ($self->Parent == 0) {
-	return ("/".$self->Name);
-    }
-    else {
-	return ( $self->ParentObj->Path . "/" . $self->Name);
-    }	
-    
-}
-
-# }}}
-
-# {{{ sub RelativePath 
-
-=head2 RelativePath KEYWORD_OBJ
-
-Takes a keyword object.  Returns this keyword's path relative to that
-keyword.  
-
-=item Bugs
-
-Currently assumes that the "other" keyword is a predecessor of this keyword
-
-=cut
-
-sub RelativePath {
-    my $self = shift;
-    my $OtherKey = shift;
-    
-    my $OtherPath = $OtherKey->Path();
-    my $MyPath = $self->Path;
-    $MyPath =~ s/^$OtherPath\///g;
-    return ($MyPath);
-}
-
-
-# }}}
-
-# {{{ sub ParentObj
-
-=item ParentObj
-
-  Returns an RT::Keyword object of this Keyword's 'parents'
-
-=cut
-
-sub ParentObj {
-    my $self = shift;
-    
-    my $ParentObj = new RT::Keyword($self->CurrentUser);
-    $ParentObj->Load($self->Parent);
-    return ($ParentObj);
-}
-
-# }}}
-
-# {{{ sub Children
-
-=item Children
-
-Return an RT::Keywords object  this Object's children.
-
-=cut
-
-sub Children {
-    my $self = shift;
-    
-    my $Children = new RT::Keywords($self->CurrentUser);
-    $Children->LimitToParent($self->id);
-    return ($Children);
-}
-
-# }}}
-
-# {{{ sub Descendents
-
-=item Descendents [ NUM_GENERATIONS [ EXCLUDE_HASHREF ]  ]
-
-Returns an ordered (see L<Tie::IxHash>) hash reference of the descendents of
-this keyword, possibly limited to a given number of generations.  The keys
-are B<RT::Keyword> I<id>s, and the values are strings containing the I<Name>s
-of those B<RT::Keyword>s.
-
-=cut
-
-sub Descendents {
-    my $self = shift;
-    my $generations = shift || 0;
-    my $exclude = shift || {};
-    my %results;
-    
-
-    tie %results, 'Tie::IxHash';
-    my $Keywords = new RT::Keywords($self->CurrentUser);
-    $Keywords->LimitToParent($self->id || 0 ); #If we have no id, start at the top
-    
-    while ( my $Keyword = $Keywords->Next ) {
-	
-	next if defined $exclude->{ $Keyword->id };
-	$results{ $Keyword->id } = $Keyword->Name;
-		
-	if ( $generations == 0 || $generations > 1 ) {
-	    #if we're limiting to some number of generations,
-	    # decrement the number of generations
-
-	    my $nextgen = $generations;
-	    $nextgen-- if ( $nextgen > 1 );
-	    
-	    my $kids = $Keyword->Descendents($nextgen, \%results);
-	    
-	    foreach my $kid ( keys %{$kids}) {
-		$results{"$kid"} = $Keyword->Name. "/". $kids->{"$kid"};
-	    }
-	}
-    }
-    return(\%results);
-}
-
-# }}}
-
-# {{{ ACL related methods
-
-# {{{ sub _Set
-
-# does an acl check and then passes off the call
-sub _Set {
-    my $self = shift;
-    
-    unless ($self->CurrentUserHasRight('AdminKeywords')) {
-	return (0,'Permission Denied');
-    }
-    return $self->SUPER::_Set(@_);
-}
-
-# }}}
-
-# {{{ sub CurrentUserHasRight
-
-=head2 CurrentUserHasRight
-
-Helper menthod for HasRight. Presets Principal to CurrentUser then 
-calls HasRight.
-
-=cut
-
-sub CurrentUserHasRight {
-    my $self = shift;
-    my $right = shift;
-    return ($self->HasRight( Principal => $self->CurrentUser->UserObj,
-                             Right => $right ));
-    
-}
-
-# }}}
-
-# {{{ sub HasRight
-
-=head2 HasRight
-
-Takes a param-hash consisting of "Right" and "Principal"  Principal is 
-an RT::User object or an RT::CurrentUser object. "Right" is a textual
-Right string that applies to Keywords.
-
-=cut
-
-sub HasRight {
-    my $self = shift;
-    my %args = ( Right => undef,
-                 Principal => undef,
-                 @_ );
-
-    return( $args{'Principal'}->HasSystemRight( $args{'Right'}) );
-
-}
-# }}}
-
-# }}}
-
-=back
-
-=head1 AUTHOR
-
-Ivan Kohler <ivan-rt@420.am>
-
-=head1 BUGS
-
-Yes.
-
-=head1 SEE ALSO
-
-L<RT::Keywords>, L<RT::ObjectKeyword>, L<RT::ObjectKeywords>, L<RT::Ticket>,
-L<RT::Record>
-
-[A=cut
-
-1;
-
diff --git a/rt/lib/RT/KeywordSelect.pm b/rt/lib/RT/KeywordSelect.pm
deleted file mode 100644
index 6865216fd..000000000
--- a/rt/lib/RT/KeywordSelect.pm
+++ /dev/null
@@ -1,452 +0,0 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/KeywordSelect.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
-package RT::KeywordSelect;
-
-use strict;
-use vars qw(@ISA);
-use RT::Record;
-use RT::Keyword;
-
-@ISA = qw(RT::Record);
-
-# {{{ POD
-
-=head1 NAME
-
- RT::KeywordSelect - Manipulate an RT::KeywordSelect record
-
-=head1 SYNOPSIS
-
-  use RT::KeywordSelect;
-
-  my $keyword_select = RT::KeywordSelect->new($CurrentUser);
-  $keyword_select->Create(
-    Keyword     => 20,
-    ObjectType => 'Ticket',
-    Name       => 'Choices'
-  );
-
-  my $keyword_select = RT::KeywordSelect->new($CurrentUser);
-  $keyword_select->Create(
-    Name        => 'Choices',			  
-    Keyword     => 20,
-    ObjectType  => 'Ticket',
-    ObjectField => 'Queue',
-    ObjectValue => 1,
-    Single      => 1,
-    Depth => 4,
-  );
-
-=head1 DESCRIPTION
-
-An B<RT::KeywordSelect> object is a link between a Keyword and a object
-type (one of: Ticket), titled by the I<Name> field of the B<RT::Keyword> such
-that:
-
-=over 4
-
-=item Object display will contain a field, titled with the I<Name> field and
-  showing any descendent keywords which are related to this object via the
-  B<RT::ObjectKeywords> table.
-
-=item Object creation for this object will contain a field titled with the
-  I<Name> field and containing the descendents of the B<RT::Keyword> as
-  choices.  If the I<Single> field of this B<RT::KeywordSelect> is true, each
-  object must be associated (via an B<RT::ObjectKeywords> record) to a single
-  descendent.  If the I<Single> field is false, each object may be connect to
-  zero, one, or many descendents.
-
-=item Searches for this object type will contain a selection field titled with
-  the I<Name> field and containing the descendents of the B<RT::Keyword> as
-  choices.
-
-=item If I<ObjectField> is defined (one of: Queue), all of the above apply only
-  when the value of I<ObjectField> (Queue) in B<ObjectType> (Ticket) matches
-  I<ObjectValue>.
-
-=back
-
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::KeywordSelects);
-
-=end testing
-
-
-=head1 METHODS
-
-
-=cut
-
-
-=over 4
-
-=item new CURRENT_USER
-
-Takes a single argument, an RT::CurrentUser object.  Instantiates a new
-(uncreated) RT::KeywordSelect object.
-
-=cut
-# }}}
-
-# {{{ sub _Init
-sub _Init {
-    my $self = shift;
-    $self->{'table'} = "KeywordSelects";
-    $self->SUPER::_Init(@_);
-}
-# }}}
-
-# {{{ sub _Accessible
-sub _Accessible {
-    my $self = shift;
-    my %Cols = (
-		Name => 'read/write',
-		Keyword => 'read/write', # link to Keywords.  Can be specified by id
-		Single => 'read/write', # bool (described below)
-
-		Depth => 'read/write', #- If non-zero, limits the descendents to this number of levels deep.
-		ObjectType  => 'read/write', # currently only C<Ticket>
-		ObjectField => 'read/write', #optional, currently only C<Queue>
-		ObjectValue => 'read/write', #constrains KeywordSelect function to when B<ObjectType>.I<ObjectField> equals I<ObjectValue>
-		Disabled => 'read/write'
-	       );
-    return($self->SUPER::_Accessible(@_, %Cols));  
-}
-# }}}
-
-# {{{ sub LoadByName
-
-=head2 LoadByName( Name => [NAME], Queue => [QUEUE_ID])
-.  Takes a queue id and a keyword select name. 
-    tries to load the keyword select for that queue. if that fails, it tries to load it
-    without a queue specified.
-
-=cut
-
-
-sub LoadByName {
-    my $self = shift;
-    my %args = ( Name => undef,
-		 Queue => undef,
-		 @_
-	       );
-    if ($args{'Queue'}) {
-	#Try to get the keyword select for this queue
-	$self->LoadByCols( Name => $args{'Name'}, 
-			   ObjectType => 'Ticket', 
-			   ObjectField => 'Queue', 
-			   ObjectValue => $args{'Queue'});
-    }	
-    unless ($self->Id) { #if that failed to load an object
-	#Try to get the keyword select of that name that's global
-	$self->LoadByCols( Name => $args{'Name'}, 
-			   ObjectType => 'Ticket', 
-			   ObjectField => 'Queue', 
-			   ObjectValue => '0');
-    }
-    
-    return($self->Id);
-    
-}
-
-# }}}
-
-# {{{ sub Create
-=item Create KEY => VALUE, ...
-
-Takes a list of key/value pairs and creates a the object.  Returns the id of
-the newly created record, or false if there was an error.
-
-Keys are:
-
-Keyword - link to Keywords.  Can be specified by id.
-Name - A name for this KeywordSelect
-Single - bool (described above)
-Depth - If non-zero, limits the descendents to this number of levels deep.
-ObjectType - currently only C<Ticket>
-ObjectField - optional, currently only C<Queue>
-ObjectValue - constrains KeywordSelect function to when B<ObjectType>.I<ObjectField> equals I<ObjectValue>
-
-=cut
-
-sub Create {
-    my $self = shift;
-    my %args = ( Keyword => undef,
-		 Single => 1,
-		 Depth => 0,
-		 Name => undef,
-		 ObjectType => undef,
-		 ObjectField => undef,
-		 ObjectValue => undef,
-		 @_);
-
-    #If we're talking about a keyword select based on a ticket's 'Queue' field
-    if  ( ($args{'ObjectField'} eq 'Queue') and
-	  ($args{'ObjectType'} eq 'Ticket')) {
-	
-	#If we're talking about a keywordselect for all queues
-	if ($args{'ObjectValue'} == 0) {
-	    unless( $self->CurrentUserHasSystemRight('AdminKeywordSelects')) {
-		return (0, 'Permission Denied');
-	    }
-	}  
-	#otherwise, we're talking about a keywordselect for a specific queue
-	else {
-	    unless ($self->CurrentUserHasQueueRight( Right => 'AdminKeywordSelects',
-						     Queue => $args{'ObjectValue'})) {
-		return (0, 'Permission Denied');
-	    }
-	}
-    }
-    else {
-	return (0, "Can't create a KeywordSelect for that object/field combo");
-    }
-
-    my $Keyword = new RT::Keyword($self->CurrentUser);
-
-    if ( $args{'Keyword'} && $args{'Keyword'} !~ /^\d+$/ ) {
-	$Keyword->LoadByPath($args{'Keyword'});
-    }	
-    else {
-	$Keyword->Load($args{'Keyword'});
-    }
-
-    unless ($Keyword->Id) {
-	$RT::Logger->debug("Keyword ".$args{'Keyword'} ." not found\n");
-	return(0, 'Keyword not found');
-    }
-    
-    $args{'Name'} = $Keyword->Name if  (!$args{'Name'});
-    
-    my $val = $self->SUPER::Create( Name => $args{'Name'},
-				    Keyword => $Keyword->Id,
-				    Single => $args{'Single'},
-				    Depth => $args{'Depth'},
-				    ObjectType => $args{'ObjectType'},
-				    ObjectField => $args{'ObjectField'},
-				    ObjectValue => $args{'ObjectValue'});
-    if ($val) {
-	return ($val, 'KeywordSelect Created');
-    }
-    else {
-	return (0, 'System error. KeywordSelect not created');
-	
-    }
-}
-# }}}
-
-# {{{ sub Delete
-
-sub Delete {
-    my $self = shift;
-    
-    return (0, 'Deleting this object would break referential integrity.');
-}
-
-# }}}
-
-
-# {{{ sub SetDisabled
-
-=head2 Sub SetDisabled
-
-Toggles the KeywordSelect's disabled flag.
-
-
-=cut 
-
-sub SetDisabled {
-    my $self = shift;
-    my $value = shift;
-
-    unless ($self->CurrentUserHasRight('AdminKeywordSelects')) {
-	return (0, "Permission Denied");
-    }
-    return($self->_Set(Field => 'Disabled', Value => $value));
-}
-
-# }}}
-
-# {{{ sub KeywordObj
-
-=item KeywordObj
-
-Returns the B<RT::Keyword> referenced by the I<Keyword> field.
-
-=cut
-
-sub KeywordObj {
-    my $self = shift;
-
-    my $Keyword = new RT::Keyword($self->CurrentUser);
-    $Keyword->Load( $self->Keyword ); #or ?
-    return($Keyword);
-} 
-# }}}
-
-# {{{ sub Object
-
-=item Object
-
-Returns the object (currently only RT::Queue) specified by ObjectField and ObjectValue.
-
-=cut
-
-sub Object {
-    my $self = shift;
-    if ( $self->ObjectField eq 'Queue' ) {
-	my $Queue = new RT::Queue($self->CurrentUser);
-	$Queue->Load( $self->ObjectValue );
-	return ($Queue);
-    } else {
-	$RT::Logger->error("$self trying to load an object value for a non-queue object");
-	return (undef);
-    }
-}
-
-# }}}
-
-# {{{ sub _Set
-
-# does an acl check, then passes off the call
-sub _Set {
-    my $self = shift;
-
-    unless ($self->CurrentUserHasRight('AdminKeywordSelects')) {
-	return (0, "Permission Denied");
-    }
-    
-    return ($self->SUPER::_Set(@_));
-
-}
-
-# }}}
-
-
-# {{{ sub CurrentUserHasQueueRight 
-
-=head2 CurrentUserHasQueueRight ( Queue => QUEUEID, Right => RIGHTNANAME )
-
-Check to see whether the current user has the specified right for the specified queue.
-
-=cut
-
-sub CurrentUserHasQueueRight {
-    my $self = shift;
-    my %args = (Queue => undef,
-		Right => undef,
-		@_
-		);
-    return ($self->HasRight( Right => $args{'Right'},
-			     Principal => $self->CurrentUser->UserObj,
-			     Queue => $args{'Queue'}));
-}
-
-# }}}
-
-# {{{ sub CurrentUserHasSystemRight 
-
-=head2 CurrentUserHasSystemRight RIGHTNAME
-
-Check to see whether the current user has the specified right for the 'system' scope.
-
-=cut
-
-sub CurrentUserHasSystemRight {
-    my $self = shift;
-    my $right = shift;
-    $RT::Logger->debug("$self in hashsysright for right $right\n");
-    return ($self->HasRight( Right => $right,
-			     System => 1,
-			     Principal => $self->CurrentUser->UserObj));
-}
-
-# }}}
-
-# {{{ sub CurrentUserHasRight
-
-=item CurrentUserHasRight RIGHT  [QUEUEID]
-
-Takes a rightname as a string. Can take a queue id as a second
-optional parameter, which can be useful to a routine like create.
-Helper menthod for HasRight. Presets Principal to CurrentUser then 
-calls HasRight.
-
-=cut
-
-sub CurrentUserHasRight {
-    my $self = shift;
-    my $right = shift;
-    return ($self->HasRight( Principal => $self->CurrentUser->UserObj,
-                             Right => $right,
-			   ));
-}
-
-# }}}
-
-# {{{ sub HasRight
-
-=item HasRight
-
-Takes a param-hash consisting of "Right" and "Principal"  Principal is 
-an RT::User object or an RT::CurrentUser object. "Right" is a textual
-Right string that applies to KeywordSelects
-
-=cut
-
-sub HasRight {
-    my $self = shift;
-    my %args = ( Right => undef,
-                 Principal => undef,
-		 Queue => undef,
-		 System => undef,
-                 @_ );
-
-    #If we're explicitly specifying a queue, as we need to do on create
-    if ($args{'Queue'}) {
-	return ($args{'Principal'}->HasQueueRight(Right => $args{'Right'},
-						  Queue => $args{'Queue'}));
-    }
-    #else if we're specifying to check a system right
-    elsif ($args{'System'}) {
-        return( $args{'Principal'}->HasSystemRight( $args{'Right'} ));
-    }	
-
-    #else if we 're using the object's queue
-    elsif (($self->__Value('ObjectField') eq 'Queue') and
-	   ($self->__Value('ObjectValue') > 0 )) {
-        return ($args{'Principal'}->HasQueueRight(Right => $args{'Right'},
-						  Queue => $self->__Value('ObjectValue') )); 
-    }
-    
-    #If the object is system scoped.
-    else {
-        return( $args{'Principal'}->HasSystemRight( $args{'Right'} ));
-    }
-}
-
-# }}}
-
-=back
-
-=head1 AUTHORS
-
-Ivan Kohler <ivan-rt@420.am>, Jesse Vincent <jesse@fsck.com>
-
-=head1 BUGS
-
-The ACL system for this object is more byzantine than it should be.  reworking it eventually
-would be a good thing.
-
-=head1 SEE ALSO
-
-L<RT::KeywordSelects>, L<RT::Keyword>, L<RT::Keywords>, L<RT::ObjectKeyword>,
-L<RT::ObjectKeywords>, L<RT::Record>
-
-=cut
-
-1;
-
diff --git a/rt/lib/RT/KeywordSelects.pm b/rt/lib/RT/KeywordSelects.pm
deleted file mode 100644
index c220b39f9..000000000
--- a/rt/lib/RT/KeywordSelects.pm
+++ /dev/null
@@ -1,143 +0,0 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/KeywordSelects.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
-
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Scrip);
-
-=end testing
-
-=cut
-
-
-package RT::KeywordSelects;
-
-use strict;
-use vars qw( @ISA );
-use RT::EasySearch;
-use RT::KeywordSelect;
-
-@ISA = qw( RT::EasySearch );
-
-# {{{ _Init
-sub _Init {
-  my $self = shift;
-  $self->{'table'} = 'KeywordSelects';
-  $self->{'primary_key'} = 'id';
-  return ($self->SUPER::_Init(@_));
-}
-# }}}
-
-# {{{ sub _DoSearch 
-
-=head2 _DoSearch
-
-  A subclass of DBIx::SearchBuilder::_DoSearch that makes sure that _Disabled rows never get seen unless
-we're explicitly trying to see them.
-
-=cut
-
-sub _DoSearch {
-    my $self = shift;
-    
-    #unless we really want to find disabled rows, make sure we\'re only finding enabled ones.
-    unless($self->{'find_disabled_rows'}) {
-	$self->LimitToEnabled();
-    }
-    
-    return($self->SUPER::_DoSearch(@_));
-    
-}
-
-# }}}
-
-# {{{ sub LimitToQueue
-=head2 LimitToQueue 
-
-Takes a queue id. Limits the returned set to KeywordSelects for that queue.
-Repeated calls will be OR'd together.
-
-=cut
-
-sub LimitToQueue {
-    my $self = shift;
-    my $queue = shift;
-
-    $self->Limit( FIELD => 'ObjectValue',
-		  VALUE => $queue,
-		  OPERATOR => '=',
-		  ENTRYAGGREGATOR => 'OR'
-		);
-
-    $self->Limit( FIELD => 'ObjectType',
-		  VALUE => 'Ticket',
-		  OPERATOR => '=');
-
-    $self->Limit( FIELD => 'ObjectField',
-		  VALUE => 'Queue',
-		  OPERATOR => '=');
-
-    
-}
-# }}}
-
-# {{{ sub LimitToGlobals
-
-=head2 LimitToGlobals
-
-Limits the returned set to KeywordSelects for all queues.
-Repeated calls will be OR'd together.
-
-=cut
-
-sub LimitToGlobals {
-    my $self = shift;
-
-    $self->Limit( FIELD => 'ObjectType',
-		  VALUE => 'Ticket',
-		  OPERATOR => '=');
-
-    $self->Limit( FIELD => 'ObjectField',
-		  VALUE => 'Queue',
-		  OPERATOR => '=');
-
-    $self->Limit( FIELD => 'ObjectValue',
-		  VALUE => '0',
-		  OPERATOR => '=',
-		  ENTRYAGGREGATOR => 'OR'
-		);
-    
-}
-# }}}
-
-# {{{ sub IncludeGlobals
-=head2 IncludeGlobals
-
-Include KeywordSelects which apply globally in the set of returned results
-
-=cut
-
-
-sub IncludeGlobals {
-    my $self = shift;
-    $self->Limit( FIELD => 'ObjectValue',
-		  VALUE => '0',
-		  OPERATOR => '=',
-		  ENTRYAGGREGATOR => 'OR'
-		);
-    
-
-}
-# }}}
-
-# {{{ sub NewItem
-sub NewItem {
-    my $self = shift;
-    #my $Handle = shift;
-    return (new RT::KeywordSelect($self->CurrentUser));
-}
-# }}}
-1;
-
diff --git a/rt/lib/RT/Keywords.pm b/rt/lib/RT/Keywords.pm
deleted file mode 100644
index a9ecda2bc..000000000
--- a/rt/lib/RT/Keywords.pm
+++ /dev/null
@@ -1,106 +0,0 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/Keywords.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
-=head1 NAME
-
-  RT::Keywords - a collection of RT::Keyword objects
-
-=head1 SYNOPSIS
-
-  use RT::Keywords;
-  my $keywords = RT::Keywords->new($user);
-  $keywords->LimitToParent(0);
-  while my ($keyword = $keywords->Next()) {
-     print $keyword->Name ."\n";
-  }
-
-
-=head1 DESCRIPTION
-
-
-=head1 METHODS
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Keywords);
-
-=end testing
-
-=cut
-
-package RT::Keywords;
-
-use strict;
-use vars qw( @ISA );
-use RT::EasySearch;
-use RT::Keyword;
-
-@ISA = qw( RT::EasySearch );
-
-
-# {{{ sub _Init
-
-sub _Init {
-    my $self = shift;
-    $self->{'table'} = 'Keywords';
-    $self->{'primary_key'} = 'id';
-
-    # By default, order by name
-    $self->OrderBy( ALIAS => 'main',
-		    FIELD => 'Name',
-		    ORDER => 'ASC');
-
-    return ($self->SUPER::_Init(@_));
-}
-# }}}
-
-# {{{ sub _DoSearch 
-
-=head2 _DoSearch
-
-  A subclass of DBIx::SearchBuilder::_DoSearch that makes sure that _Disabled rows never get seen unless
-we're explicitly trying to see them.
-
-=cut
-
-sub _DoSearch {
-    my $self = shift;
-    
-    #unless we really want to find disabled rows, make sure we\'re only finding enabled ones.
-    unless($self->{'find_disabled_rows'}) {
-	$self->LimitToEnabled();
-    }
-    
-    return($self->SUPER::_DoSearch(@_));
-    
-}
-
-# }}}
-
-# {{{ sub NewItem 
-sub NewItem {
-    my $self = shift;
-    return (RT::Keyword->new($self->CurrentUser));
-}
-# }}}
-
-# {{{ sub LimitToParent
-
-=head2 LimitToParent
-
-Takes a parent id and limits the returned keywords to children of that parent.
-
-=cut
-
-sub LimitToParent {
-    my $self = shift;
-    my $parent = shift;
-    $self->Limit( FIELD => 'Parent',
-		  VALUE => $parent,
-		  OPERATOR => '=',
-		  ENTRYAGGREGATOR => 'OR' );
-}	
-# }}}
-
-1;
-
diff --git a/rt/lib/RT/ObjectKeyword.pm b/rt/lib/RT/ObjectKeyword.pm
deleted file mode 100644
index 287d41fab..000000000
--- a/rt/lib/RT/ObjectKeyword.pm
+++ /dev/null
@@ -1,192 +0,0 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/ObjectKeyword.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Released under the terms of the GNU Public License
-
-=head1 NAME
-
-  RT::ObjectKeyword -- a keyword tied to an object in the database
-
-=head1 SYNOPSIS
-
-  use RT::ObjectKeyword;
-
-
-=head1 DESCRIPTION
-
-This module should never be called directly by client code. it's an internal module which
-should only be accessed through exported APIs in Ticket, Queue and other similar objects.
-
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::ObjectKeyword);
-
-=end testing
-
-=head1 METHODS
-
-=cut
-
-package RT::ObjectKeyword;
-
-use strict;
-use vars qw(@ISA);
-use RT::Record;
-
-@ISA = qw(RT::Record);
-
-sub _Init {
-    my $self = shift;
-    $self->{'table'} = "ObjectKeywords";
-    $self->SUPER::_Init(@_);
-}
-
-sub _Accessible {
-    my $self = shift;
-    
-    my %cols = (
-		Keyword       => 'read/write', #link to the B<RT::Keyword>
-		KeywordSelect => 'read/write', #link to the B<RT::KeywordSelect>
-		ObjectType    => 'read/write', #currently only C<Ticket>
-		ObjectId      => 'read/write', #link to the object specified in I<ObjectType>
-	       );
-    return ($self->SUPER::_Accessible( @_, %cols));
-}
-
-
-
-# TODO - post 2.0. add in _Set and _Value, so we can ACL them.  protected at another API level
-
-
-=head1 NAME
-
- RT::ObjectKeyword - Manipulate an RT::ObjectKeyword record
-
-=head1 SYNOPSIS
-
-  use RT::ObjectKeyword;
-
-  my $keyword = RT::ObjectKeyword->new($CurrentUser);
-  $keyword->Create;
-
-=head1 DESCRIPTION
-
-An B<RT::ObjectKeyword> object associates an B<RT::Keyword> with another
-object (currently only B<RT::Ticket>.
-
-This module should B<NEVER> be called directly by client code. its API is entirely through RT ticket or other objects which can have keywords assigned.
-
-
-=head1 METHODS
-
-=over 4
-
-=item new CURRENT_USER
-
-Takes a single argument, an RT::CurrentUser object.  Instantiates a new
-(uncreated) RT::ObjectKeyword object.
-
-=cut
-
-# {{{ sub Create
-
-=item Create KEY => VALUE, ...
-
-Takes a list of key/value pairs and creates a the object.  Returns the id of
-the newly created record, or false if there was an error.
-
-Keys are:
-
-Keyword - link to the B<RT::Keyword>
-ObjectType - currently only C<Ticket>
-ObjectId - link to the object specified in I<ObjectType>
-
-=cut
-
-
-sub Create {
-    my $self = shift;
-    my %args = (Keyword => undef,
-		KeywordSelect => undef,
-		ObjectType => undef,
-		ObjectId => undef,
-		@_);
-    
-    #TODO post 2.0 ACL check
-    
-    return ($self->SUPER::Create( Keyword => $args{'Keyword'}, 
-				  KeywordSelect => $args{'KeywordSelect'},
-				  ObjectType => $args{'ObjectType'}, 
-				  ObjectId => $args{'ObjectId'}))
-}
-# }}}
-
-# {{{ sub KeywordObj
-
-=item KeywordObj 
-
-Returns an B<RT::Keyword> object of the Keyword associated with this ObjectKeyword.
-
-=cut
-
-sub KeywordObj {
-    my $self = shift;
-    my $keyword = new RT::Keyword($self->CurrentUser);
-    $keyword->Load($self->Keyword);
-    return ($keyword);
-}
-# }}}
-
-# {{{ sub KeywordSelectObj
-
-=item KeywordSelectObj 
-
-Returns an B<RT::KeywordSelect> object of the KeywordSelect associated with this ObjectKeyword.
-
-=cut
-
-sub KeywordSelectObj {
-    my $self = shift;
-    my $keyword_sel = new RT::KeywordSelect($self->CurrentUser);
-    $keyword_sel->Load($self->KeywordSelect);
-    return ($keyword_sel);
-}
-# }}}
-
-# {{{ sub KeywordRelativePath
-
-=item KeywordRelativePath
-
-Returns a string of the Keyword's path relative to this ObjectKeyword's KeywordSelect
-
-
-
-=cut
-
-sub KeywordRelativePath {
-    my $self = shift;
-    return($self->KeywordObj->RelativePath(
-              $self->KeywordSelectObj->KeywordObj->Path));
-    
-}
-# }}}
-
-=back
-
-=head1 AUTHOR
-
-Ivan Kohler <ivan-rt@420.am>
-
-=head1 BUGS
-
-Yes.
-
-=head1 SEE ALSO
-
-L<RT::ObjectKeywords>, L<RT::Keyword>, L<RT::Keywords>, L<RT::Ticket>,
-L<RT::Record>
-
-=cut
-
-1;
-
diff --git a/rt/lib/RT/ObjectKeywords.pm b/rt/lib/RT/ObjectKeywords.pm
deleted file mode 100644
index 5df996e37..000000000
--- a/rt/lib/RT/ObjectKeywords.pm
+++ /dev/null
@@ -1,234 +0,0 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/ObjectKeywords.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
-package RT::ObjectKeywords;
-
-use strict;
-use vars qw( @ISA );
-
-=head1 NAME
-
-	RT::ObjectKeywords - note warning
-
-=head1 WARNING
-
-This module should B<NEVER> be called directly by client code. its API is entirely through RT ticket or other objects which can have keywords assigned.
-
-=head1 SYNOPSIS
-
-=head1 DESCRIPTION
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::ObjectKeywords);
-
-=end testing
-
-=cut
-
-use RT::EasySearch;
-use RT::ObjectKeyword;
-
-@ISA = qw( RT::EasySearch );
-
-# {{{ sub _Init
-sub _Init {
-    my $self = shift;
-    $self->{'table'} = 'ObjectKeywords';
-    $self->{'primary_key'} = 'id';
-    return ($self->SUPER::_Init(@_));
-}
-# }}}
-
-# {{{ sub NewItem
-sub NewItem {
-    my $self = shift;
-    return (new RT::ObjectKeyword($self->CurrentUser));
-}
-# }}}
-
-# {{{ sub LimitToKeywordSelect
-
-=head2 LimitToKeywordSelect
-
-  Takes a B<RT::KeywordSelect> id or Nameas its single argument. limits the returned set of ObjectKeywords
-to ObjectKeywords which apply to that ticket
-
-=cut
-
-
-sub LimitToKeywordSelect {
-    my $self = shift;
-    my $keywordselect = shift;
-    
-    if ($keywordselect =~ /^\d+$/) {
-
-	$self->Limit(FIELD => 'KeywordSelect',
-		     OPERATOR => '=',
-		     ENTRYAGGREGATOR => 'OR',
-		     VALUE => "$keywordselect");
-    }
-
-    #We're limiting by name. time to be klever
-    else {
-	my $ks = $self->NewAlias('KeywordSelects');
-	$self->Join(ALIAS1 => $ks, FIELD1 => 'id',
-		    ALIAS2 => 'main', FIELD2 => 'KeywordSelect');
-	
-	$self->Limit( ALIAS => "$ks",
-		       FIELD => 'Name',
-		       VALUE => "$keywordselect",
-		       OPERATOR => "=",
-		       ENTRYAGGREGATOR => "OR");
-
-	$self->Limit ( ALIAS => "$ks",
-		       FIELD => 'ObjectType',
-		       VALUE => 'Ticket',
-		       OPERATOR => '=',
-		     );
-
-	$self->Limit ( ALIAS => "$ks",
-		       FIELD => 'ObjectField',
-		       VALUE => 'Queue',
-		       OPERATOR => '=',
-		     );
-
-
-	# TODO +++ we need to be able to limit the returned
-	# keywordselects to ones that apply only to this queue
-	#	$self->Limit( ALIAS => "$ks",
-	#		       FIELD => 'ObjectValue',
-	#		       VALUE => $self->QueueObj->Id,
-	#		       OPERATOR => "=",
-	#		       ENTRYAGGREGATOR => "OR");	
-
-    }
-
-
-
-}
-
-# }}}
-
-# {{{ LimitToTicket
-
-=head2 LimitToTicket TICKET_ID
-
-  Takes an B<RT::Ticket> id as its single argument. limits the returned set of ObjectKeywords
-to ObjectKeywords which apply to that ticket
-
-=cut
-
-sub LimitToTicket {
-    my $self = shift;
-    my $ticket = shift;
-    $self->Limit(FIELD => 'ObjectId',
-		 OPERATOR => '=',
-		 ENTRYAGGREGATOR => 'OR',
-		 VALUE => "$ticket");
-
-    $self->Limit(FIELD => 'ObjectType',
-		 OPERATOR => '=',
-		 ENTRYAGGREGATOR => 'OR',
-		 VALUE => "Ticket");
-    
-}
-
-# }}}
-
-# {{{ sub _DoSearch
-#wrap around _DoSearch  so that we can build the hash of returned
-#values 
-
-sub _DoSearch {
-    my $self = shift;
-   # $RT::Logger->debug("Now in ".$self."->_DoSearch");
-    my $return = $self->SUPER::_DoSearch(@_);
-  #  $RT::Logger->debug("In $self ->_DoSearch. return from SUPER::_DoSearch was $return\n");
-    $self->_BuildHash();
-    return ($return);
-}
-# }}}
-
-# {{{ sub _BuildHash
-#Build a hash of this ACL's entries.
-sub _BuildHash {
-    my $self = shift;
-
-    while (my $entry = $self->Next) {
-
-	my $hashkey = $entry->Keyword;
-        $self->{'as_hash'}->{"$hashkey"} =1;
-    }
-
-}
-# }}}
-
-# {{{ HasEntry
-
-=head2 HasEntry KEYWORD_ID
-  
-  Takes a keyword id and returns true if this ObjectKeywords object has an entry for that
-keyword.  Returns undef otherwise.
-
-=cut
-
-sub HasEntry {
-
-    my $self = shift;
-    my $keyword = shift;
-
-
-    #if we haven't done the search yet, do it now.
-    $self->_DoSearch();
-    
-    #    $RT::Logger->debug("Now in ".$self."->HasEntry\n");
-    
-    
-    if ($self->{'as_hash'}->{ $keyword } == 1) {
-	return(1);
-    }
-    else {
-	return(undef);
-    }
-}
-
-# }}}
-
-# {{{ sub RelativePaths
-
-=head2 RelativePaths
-
-# Return a (reference to a) list of KeywordRelativePaths
-
-=cut
-
-sub RelativePaths  {
-    my $self = shift;
-
-    my @list;
-
-    # Here $key is a RT::ObjectKeyword
-    while (my $key=$self->Next()) {
-	push(@list, $key->KeywordRelativePath);
-    }
-    return(\@list);
-}
-# }}}
-
-# {{{ sub RelativePathsAsString
-
-=head2 RelativePathsAsString
-
-# Returns the RT::ObjectKeywords->RelativePaths as a comma seperated string
-
-=cut
-
-sub RelativePathsAsString {
-    my $self = shift;
-    return(join(", ",@{$self->KeywordRelativePaths}));
-}
-# }}}
-
-1;
-
diff --git a/rt/lib/RT/TestHarness.pm b/rt/lib/RT/TestHarness.pm
deleted file mode 100644
index 160e9e636..000000000
--- a/rt/lib/RT/TestHarness.pm
+++ /dev/null
@@ -1,14 +0,0 @@
-use lib "/opt/rt2/etc/";
-
-use RT::Interface::CLI  qw(CleanEnv LoadConfig DBConnect 
-			   GetCurrentUser GetMessageContent);
-
-#Clean out all the nasties from the environment
-CleanEnv();
-
-#Load etc/config.pm and drop privs
-LoadConfig();
-
-
-use RT;
-RT::Init;
diff --git a/rt/lib/RT/Watcher.pm b/rt/lib/RT/Watcher.pm
deleted file mode 100755
index c7c6100cf..000000000
--- a/rt/lib/RT/Watcher.pm
+++ /dev/null
@@ -1,313 +0,0 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/Watcher.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-2001 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
-
-=head1 NAME
-
-  RT::Watcher - RT Watcher object
-
-=head1 SYNOPSIS
-
-  use RT::Watcher;
-
-
-=head1 DESCRIPTION
-
-This module should never be called directly by client code. it\'s an internal module which
-should only be accessed through exported APIs in Ticket, Queue and other similar objects.
-
-=head1 METHODS
-
-=begin testing
-
-ok(require RT::TestHarness);
-ok(require RT::Watcher);
-
-=end testing
-
-=cut
-
-package RT::Watcher;
-use RT::Record;
-@ISA= qw(RT::Record);
-
-
-# {{{ sub _Init 
-
-sub _Init {
-  my $self = shift;
-  
-  $self->{'table'} = "Watchers";
-  return ($self->SUPER::_Init(@_));
-
-}
-# }}}
-
-# {{{ sub Create 
-
-=head2 Create PARAMHASH
-
-Create a new watcher object with the following Attributes:
-
-Scope:  Ticket or Queue
-Value: Ticket or queue id
-Type: Requestor, Cc or AdminCc.  Requestor is not supported for a scope of \'Queue\'
-Email: The email address of the watcher.  If the email address maps to an RT User, this is resolved
-to an Owner object instead.
-Owner: The RT user id of the \'owner\' of this watcher object. 
-
-=cut
-
-sub Create  {
-    my $self = shift;
-    my %args = (
-		Owner => undef,
-		Email => undef,
-		Value => undef,
-		Scope => undef,
-		Type => undef,
-		Quiet => 0,
-		@_ # get the real argumentlist
-	       );
-    
-    #Do we have someone this applies to?
-    unless (($args{'Owner'} =~ /^(\d+)$/) || ($args{'Email'} =~ /\@/)) {
-	return (0, "No user or email address specified");
-    }
-    
-    #if we only have an email address, try to resolve it to an owner
-    if ($args{'Owner'} == 0) {
-        my $User = new RT::User($RT::SystemUser);
-        $User->LoadByEmail($args{'Email'});
-        if ($User->id) {
-            $args{'Owner'} = $User->id;
-   	    delete $args{'Email'};
-	}
-    }
-    
-    
-    if ($args{'Type'} eq "Requestor" and $args{'Owner'} == 0) {
-	# Requestors *MUST* have an account
-	
-	my $Address = RT::CanonicalizeAddress($args{'Email'});
-	
-	my $NewUser = RT::User->new($RT::SystemUser);
-	my ($Val, $Message) =
-	  $NewUser->Create(Name => $Address,
-			   EmailAddress => $Address,
-			   RealName => $Address,
-			   Password => undef,
-			   Privileged => 0,
-			   Comments => 'Autocreated on ticket submission'
-			  );
-	return (0, "Could not create watcher for requestor")
-	  unless $Val;
-	if ($NewUser->id) {
-	    $args{'Owner'} = $NewUser->id;
-	    delete $args{'Email'};
-	}
-    }
-    
-    
-    
-    
-    #Make sure we\'ve got a valid type
-    #TODO --- move this to ValidateType 
-    return (0, "Invalid Type")
-      unless ($args{'Type'} =~ /^(Requestor|Cc|AdminCc)$/i);
-
-    my $id = $self->SUPER::Create(%args);
-    if ($id) {
-	return (1,"Interest noted");
-    }
-    else {
-	return (0, "Error adding watcher");
-    }
-}
-# }}}
-
-# {{{ sub Load 
-
-=head2 Load ID
-  
-  Loads a watcher by the primary key of the watchers table ($Watcher->id)
-  
-=cut
-
-sub Load  {
-    my $self = shift;
-    my $identifier = shift;
-    
-    if ($identifier !~ /\D/) {
-	$self->SUPER::LoadById($identifier);
-    }
-    else {
-	return (0, "That's not a numerical id");
-    }
-}
-
-# }}}
-
-# {{{ sub LoadByValue
-
-=head2 LoadByValue PARAMHASH
-  
-LoadByValue takes a parameter hash with the following attributes:
-
-  Email, Owner, Scope, Type, Value
-
-The same rules enforced at create are enforced by Load.
-
-Returns a tuple of (retval, msg). Retval is 1 on success and 0 on failure.
-msg describes what happened in a human readable form.
-
-=cut
-
-sub LoadByValue {
-    my $self = shift;
-    my %args = ( Email => undef, 
-		 Owner => undef,
-		 Scope => undef,
-		 Type => undef,
-		 Value => undef,
-		 @_);
-    
-    #TODO: all this code is being copied from Create. that\'s silly
-    
-    #Do we have someone this applies to?
-    unless (($args{'Owner'} =~ /^(\d*)$/) || ($args{'Email'} =~ /\@/)) {
-	return (0, "No user or email address specified");
-    }
-    
-    #if we only have an email address, try to resolve it to an owner
-    unless ($args{'Owner'}) {
-        my $User = new RT::User($RT::SystemUser);
-        $User->LoadByEmail($args{'Email'});
-        if ($User->id > 0) {
-            $args{'Owner'} = $User->id;
-   	    delete $args{'Email'};
-	}
-    }
-    
-    if ((defined ($args{'Type'})) and 
-	($args{'Type'} !~ /^(Requestor|Cc|AdminCc)$/i)) {
-	return (0, "Invalid Type");
-    }
-    if ($args{'Owner'}) {
-	$self->LoadByCols( Type => $args{'Type'},
-			   Value => $args{'Value'},
-			   Owner => $args{'Owner'},
-			   Scope => $args{'Scope'},
-			 );
-    }
-    else {
-	$self->LoadByCols( Type => $args{'Type'},
-			   Email => $args{'Email'},
-			   Value => $args{'Value'},
-			   Scope => $args{'Scope'},
-			 );
-    }	
-    unless ($self->Id) {
-	return(0, "Couldn\'t find that watcher");
-    }
-    return (1, "Watcher loaded");
-}
-
-# }}}
-
-# {{{ sub OwnerObj 
-
-=head2 OwnerObj
-
-Return an RT Owner Object for this Watcher, if we have one
-
-=cut
-
-sub OwnerObj  {
-    my $self = shift;
-    if (!defined $self->{'OwnerObj'}) {
-	require RT::User;
-	$self->{'OwnerObj'} = RT::User->new($self->CurrentUser);
-	if ($self->Owner) {
-	    $self->{'OwnerObj'}->Load($self->Owner);
-	} else {
-	    return $RT::Nobody->UserObj;
-	}
-    }
-    return ($self->{'OwnerObj'});
-}
-# }}}
-
-# {{{ sub Email
-
-=head2 Email
-
-This custom data accessor does the right thing and returns
-the 'Email' attribute of this Watcher object. If that's undefined,
-it returns the 'EmailAddress' attribute of its 'Owner' object, which is
-an RT::User object.
-
-=cut
-
-sub Email {
-    my $self = shift;
-    
-    # IF Email is defined, return that. Otherwise, return the Owner's email address
-    if (defined($self->__Value('Email'))) {
-	return ($self->__Value('Email'));
-    }
-    elsif ($self->Owner) {
-	return ($self->OwnerObj->EmailAddress);
-    }
-    else {
-	return ("Data error");
-    }
-}
-# }}}
-  
-# {{{ sub IsUser
-
-=head2 IsUser
-
-Returns true if this watcher object is tied to a user object. (IE it
-isn't sending to some other email address).
-Otherwise, returns undef
-
-=cut
-
-sub IsUser {
-    my $self = shift;
-    # if this watcher has an email address glued onto it,
-    # return undef
-
-    if (defined($self->__Value('Email'))) {
-        return undef;
-    }
-    else {
-        return 1;
-    }
-}
-
-# }}}
-
-# {{{ sub _Accessible 
-sub _Accessible  {
-  my $self = shift;
-  my %Cols = (
-	      Email => 'read/write',
-	      Scope => 'read/write',
-	      Value => 'read/write',
-	      Type => 'read/write',
-	      Quiet => 'read/write',
-	      Owner => 'read/write',	      
-	      Creator => 'read/auto',
-	      Created => 'read/auto',
-	      LastUpdatedBy => 'read/auto',
-	      LastUpdated => 'read/auto'
-	     );
-  return($self->SUPER::_Accessible(@_, %Cols));
-}
-# }}}
-
-1;
- 
diff --git a/rt/lib/RT/Watchers.pm b/rt/lib/RT/Watchers.pm
deleted file mode 100755
index c55adda3f..000000000
--- a/rt/lib/RT/Watchers.pm
+++ /dev/null
@@ -1,226 +0,0 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/Watchers.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-2000 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
-
-=head1 NAME
-
-  RT::Watchers - Collection of RT Watcher objects
-
-=head1 SYNOPSIS
-
-  use RT::Watchers;
-  my $watchers = new RT::Watchers($CurrentUser);
-  while (my $watcher = $watchers->Next()) {
-    print $watcher->Id . "is a watcher";
-  }  
-
-=head1 DESCRIPTION
-
-This module should never be called directly by client code. it's an internal module which
-should only be accessed through exported APIs in Ticket, Queue and other similar objects.
-
-
-=head1 METHODS
-
-=begin testing
-
-ok(require RT::TestHarness);
-ok(require RT::Watchers);
-
-=end testing
-
-=cut
-
-package RT::Watchers;
-
-use strict;
-use vars qw( @ISA );
-
-
-require RT::EasySearch;
-require RT::Watcher;
-@ISA= qw(RT::EasySearch);
-
-
-# {{{ sub _Init
-sub _Init  {
-  my $self = shift;
-  
-  $self->{'table'} = "Watchers";
-  $self->{'primary_key'} = "id";
-  return($self->SUPER::_Init(@_));
-}
-# }}}
-
-# {{{ sub Limit 
-
-=head2 Limit
-
-  A wrapper around RT::EasySearch::Limit which sets
-the default entry aggregator to 'AND'
-
-=cut
-
-sub Limit  {
-  my $self = shift;
-  my %args = ( ENTRYAGGREGATOR => 'AND',
-	       @_);
-
-  $self->SUPER::Limit(%args);
-}
-# }}}
-
-# {{{ sub LimitToTicket
-
-=head2 LimitToTicket
-
-Takes a single arg which is a ticket id
-Limits to watchers of that ticket
-
-=cut
-
-sub LimitToTicket { 
-  my $self = shift;
-  my $ticket = shift;
-  $self->Limit( ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Value',
-		VALUE => $ticket);
-  $self->Limit (ENTRYAGGREGATOR => 'AND',
-		FIELD => 'Scope',
-		VALUE => 'Ticket');
-}
-# }}}
-
-# {{{ sub LimitToQueue 
-
-=head2 LimitToQueue
-
-Takes a single arg, which is a queue id
-Limits to watchers of that queue.
-
-=cut
-
-sub LimitToQueue  {
-  my $self = shift;
-  my $queue = shift;
-  $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Value',
-		VALUE => $queue);
-  $self->Limit (ENTRYAGGREGATOR => 'AND',
-		FIELD => 'Scope',
-		VALUE => 'Queue');
-}
-# }}}
-
-# {{{ sub LimitToType 
-
-=head2 LimitToType
-
-Takes a single string as its argument. That string is a watcher type
-which is one of 'Requestor', 'Cc' or 'AdminCc'
-Limits to watchers of that type
-
-=cut
-
-
-sub LimitToType  {
-  my $self = shift;
-  my $type = shift;
-  $self->Limit(FIELD => 'Type',
-	       VALUE => "$type");
-}
-# }}}
-
-# {{{ sub LimitToRequestors 
-
-=head2 LimitToRequestors
-
-Limits to watchers of type 'Requestor'
-
-=cut
-
-sub LimitToRequestors  {
-  my $self = shift;
-  $self->LimitToType("Requestor");
-}
-# }}}
-
-# {{{ sub LimitToCc 
-
-=head2 LimitToCc
-
-Limits to watchers of type 'Cc'
-
-=cut
-
-sub LimitToCc  {
-    my $self = shift;
-    $self->LimitToType("Cc");
-}
-# }}}
-
-# {{{ sub LimitToAdminCc 
-
-=head2 LimitToAdminCc
-
-Limits to watchers of type AdminCc
-
-=cut
-
-sub LimitToAdminCc  {
-    my $self = shift;
-    $self->LimitToType("AdminCc");
-}
-# }}}
-
-# {{{ sub Emails 
-
-=head2 Emails
-
-# Return a (reference to a) list of emails
-
-=cut
-
-sub Emails  {
-    my $self = shift;
-    my @list;    # List is a list of watcher email addresses
-
-    # $watcher is an RT::Watcher object
-    while (my $watcher=$self->Next()) {
-	push(@list, $watcher->Email);
-    }
-    return \@list;
-}
-# }}}
-
-# {{{ sub EmailsAsString
-
-=head2 EmailsAsString
-
-# Returns the RT::Watchers->Emails as a comma seperated string
-
-=cut
-
-sub EmailsAsString {
-    my $self = shift;
-    return(join(", ",@{$self->Emails}));
-}
-# }}}
-
-# {{{ sub NewItem 
-
-
-
-sub NewItem  {
-    my $self = shift;
-    
-    use RT::Watcher;
-    my  $item = new RT::Watcher($self->CurrentUser);
-    return($item);
-}
-# }}}
-1;
-
-
-
-
diff --git a/rt/lib/test.pl b/rt/lib/test.pl
deleted file mode 100644
index f0da5df27..000000000
--- a/rt/lib/test.pl
+++ /dev/null
@@ -1,52 +0,0 @@
-# Before `make install' is performed this script should be runnable with
-# `make test'. After `make install' it should work as `perl test.pl'
-
-######################### We start with some black magic to print on failure.
-
-# Change 1..1 below to 1..last_test_to_print .
-# (It may become useful if the test is moved to ./t subdirectory.)
-
-BEGIN { $| = 1; print "1..1\n"; }
-END {print "not ok 1\n" unless $loaded;}
-use RT;
-$loaded = 1;
-print "ok 1\n";
-
-######################### End of black magic.
-
-# Insert your test code below (better if it prints "ok 13"
-# (correspondingly "not ok 13") depending on the success of chunk 13
-# of the test code):
-
-use RT::Record;
-use RT::EasySearch;
-use RT::Handle;
-use RT::Ticket;
-use RT::Tickets;
-use RT::ACE;
-use RT::ACL;
-use RT::Watcher;
-use RT::Watchers;
-use RT::Scrip;
-use RT::Scrips;
-use RT::ScripAction;
-use RT::ScripCondition;
-use RT::ScripActions;
-use RT::ScripConditions;
-use RT::Transaction;
-use RT::Transactions;
-use RT::Group;
-use RT::GroupMembers;
-use RT::User;
-use RT::Users;
-use RT::CurrentUser;
-use RT::Attachment;
-use RT::Attachments;
-use RT::Keyword;
-use RT::Keywords;
-use RT::KeywordSelect;
-use RT::KeywordSelects;
-use RT::ObjectKeyword;
-use RT::ObjectKeywords;
-use RT::Date;
-
diff --git a/rt/tools/cpan2rpm b/rt/tools/cpan2rpm
deleted file mode 100644
index 9b54cb912..000000000
--- a/rt/tools/cpan2rpm
+++ /dev/null
@@ -1,299 +0,0 @@
-#!/usr/bin/perl -w
-
-
-# Take a perl tarball and make a specfile for it. Now with bundles.
-#
-# Copyright 2000,2001 Simon Wilkinson. All rights reserved.
-#
-# 10/18/2001 - <jesse@bestpractical.com>
-#		Added resolution of prereq_pm modules
-#
-# This program is free software; you can redistribute it 
-# and/or modify it under the same terms as Perl itself.
-#
-
-use strict;
-
-use CPAN;
-use POSIX;
-use Sys::Hostname;
-use File::Basename;
-use Getopt::Long;
-
-use vars qw ($DEBUG $ARCH $builddir $seen @report);
-
-$ARCH = 'i386';
-
-$DEBUG = 0;
-# Icky globals
-
-my $release;
-my $package;
-
-$seen = {};
-
-
-sub usage 
-{
-  print STDERR <<EOM;
-
-Usage: cpan2rpm [--release <release>] [--builddir <rpm build dir>]  <Perl::Module>
-
-Where:
-<release> is the release number of the RPM you wish to produce
-<Perl::Module> is the name of the module to build
-EOM
-  exit(1);
-}
-
-
-my $ret=GetOptions("release" => \$release,
-		   "builddir=s" => \$builddir);
-
-$package=$ARGV[0];
-usage() if !$package;
-$release=1 if !$release;
-
-
-$builddir=ExtractRpmMacro($ENV{HOME}."/.rpmmacros","_topdir") if !$builddir;
-$builddir=ExtractRpmMacro("/etc/rpm/macros","_topdir") if !$builddir;
-$builddir=getcwd() if !$builddir;
-  
-die "Build directory $builddir doesn't look like an RPM build root\n"
-    if ((! -d "$builddir/SPECS") || (! -d "$builddir/SOURCES"));
-
-process($package,$release);
-
-print join("\n",@report)."\n";
-
-sub process {
-  my ($infile,$release)=@_;
-
-  
-
-# Convert our installation list into an unbundled one
-  unbundle($infile);
-
-  print "Building $infile\n";
-
-    cpan2rpm($infile,$builddir,$release);
-
-}
-
-# Given a Module, try to split it into its required components - this
-# currently only handles Bundles, but could also be extended to deal with
-# prereqs as well.
-
-sub unbundle {
-  my ($item) = @_;
-
-  if ($item=~/Bundle::/) {
-    my $obj=CPAN::Shell->expand('Bundle',$item);
-
-    foreach my $kid ($obj->contains) {
-     	process($kid,$release);
-    }
-  }
-}
-
-
-sub cpan2rpm($$$) {
-  my ($infile,$builddir,$release) = @_;
-
-  my $ret;
-
-  my $obj=CPAN::Shell->expand('Module',$infile);
-
-  print "CPAN tells us the following about $infile:\n",$obj->as_string if ($DEBUG);
-
-  $ret=fetch_source($obj,$builddir);
-  $ret=build_specfile($obj,$builddir,$release) if !$ret;
-  
-  return $ret;
-}
-
-# FIXME: Some error handling in the function below wouldn't go amiss ...
-sub fetch_source {
-  my ($obj,$builddir)=@_;
-
-  # Minor Sanity checks
-  my $id=$obj->{ID};
-
-  return "Error: No file for $id\n" 
-     if $obj->cpan_file eq "N/A";
-  return "Error: $id says 'Contact Author'\n" 
-     if $obj->cpan_file =~ /^Contact Author/;
-  return "Error: $id is contained within Perl itself!\n"
-     if ($obj->cpan_file =~/perl-5\.\d?\.\d?\.tar\.gz/xo);
-
-  # We do this so we can take advantage of CPAN's object caching. This is
-  # pinched from the CPAN::Distribution::get method, which we can't use
-  # directly, as it untars the package as well - which we let RPM do.
- 
-  my $dist = $CPAN::META->instance('CPAN::Distribution',$obj->cpan_file);
-
-
-  my($local_wanted) =
-       MM->catfile($CPAN::Config->{keep_source_where},
-                   "authors",
-                   "id",
-                   split("/",$dist->{ID})
-                   );
-
-  my $local_file = CPAN::FTP->localize("authors/id/$dist->{ID}", $local_wanted);
-  
-  $dist->{localfile} = $local_file;
-
-  $dist->verifyMD5 if ($CPAN::META->has_inst('MD5'));
-
-
-  # Find all the prereqs for this distribution, then build em.
-  # TODO this should be somewhere else
-
-  $dist->make;
-  build_prereqs( $dist->prereq_pm());
-
-
-
-  my $infile=basename($obj->cpan_file);
-
-  File::Copy::copy($local_file,"$builddir/SOURCES/$infile");
-
-  return undef;
-}
-
-
-sub build_prereqs($) {
-  my ($prereqs) = @_;
-  
-  foreach my $prereq (keys %{$prereqs}) {
-	process ($prereq, $release);
-  }
-}
-sub build_specfile($$$) {
-  my ($obj,$builddir,$release) = @_;
-
-  my $source=basename($obj->cpan_file);
-
-  # don't go through dependencies on something we've already dealt with
-  return() if ($seen->{$source});
-  $seen->{$source} = 1; 
-
-my ($name,$version)=($source=~/(.*)-(.*)\.tar\.gz/);
-  return "Couldn't get a name for $source\n" if !$name;
-  return "Couldn't get a version for $source\n" if !$version; 
-  
-  my $summary="$name module for perl";
-  my $description=$obj->{description};
-  $description= $summary if !$description;
-
-  open(SPEC, ">$builddir/SPECS/perl-$name.spec")
-    or die "Couldn't open perl-$name.spec for writing.";
-  print SPEC <<EOF;
-
-Summary: $summary
-Name: perl-$name
-Version: $version
-Release: $release
-Copyright: distributable
-Group: Applications/CPAN
-Source0: $source
-Url: http://www.cpan.org
-BuildRoot: /var/tmp/perl-${name}-buildroot/
-Requires: perl 
-
-%description
-This is a perl module, autogenerated by cpan2rpm. The original package's
-description was:
-
-$description
-
-%prep
-%setup -q -n $name-%{version}
-
-%build
-CFLAGS="\$RPM_OPT_FLAGS" perl Makefile.PL
-make
-
-%clean
-rm -rf \$RPM_BUILD_ROOT
-
-%install
-rm -rf \$RPM_BUILD_ROOT
-eval `perl '-V:installarchlib'`
-mkdir -p \$RPM_BUILD_ROOT/\$installarchlib
-make PREFIX=\$RPM_BUILD_ROOT/usr install
-/usr/lib/rpm/brp-compress
-find \$RPM_BUILD_ROOT/usr -type f -print | sed "s\@^\$RPM_BUILD_ROOT\@\@g" | grep -v perllocal.pod > $name-$version-filelist
-
-%files -f ${name}-${version}-filelist
-%defattr(-,root,root)
-
-%changelog
-EOF
-  print SPEC "* ",POSIX::strftime("%a %b %d %Y",localtime()), " ",$ENV{USER}," <",$ENV{USER},"\@",hostname(),">\n";
-  print SPEC "- Spec file automatically generated by cpan2rpm\n";
-
-  close(SPEC);
-
-  system("rpm -ba $builddir/SPECS/perl-$name.spec >/dev/null") == 0
-    or push (@report,  "RPM of $source failed with : $!\n"); 
- 
-  system("rpm -Uvh $builddir/RPMS/$ARCH/perl-$name-$version-$release.$ARCH.rpm") == 0
-    or warn "RPM of $source could not be installed: $!\n";
-
-  push (@report,  "Built perl-$name-$version-$release.$ARCH.rpm");
-}
-
-sub ExtractRpmMacro {
-  my ($file,$macro) = @_;
-
-  my $handle=new IO::File;
-
-  if (!$handle->open($file)) {
-    return undef;
-  }
-
-  while(<$handle>) {
-    if (/\%$macro (.*)/) {
-       return $1;
-    }
-  }
-
-  return undef;
-}
-
-=head1 NAME
-
-cpan2rpm - fetch and convert CPAN packages to RPMs
-
-=head1 SYNOPSIS
-
-cpan2rpm --release <release> <package>
-
-=head1 DESCRIPTION
-
-cpan2rpm provides a quick way of creating RPM packages from perl modules
-published on CPAN. It interfaces with the perl CPAN module to fetch the
-file from the selected mirror, and then creates a spec file from the 
-information in CPAN, and invokes RPM on that spec file.
-
-Files are created in the users RPM build root.
-
-=head1 OPTIONS
-
-=over 4
-
-=item release
-
-Sets the release number of the created RPMs.
-
-=back
-
-=head1 SEE ALSO
-
-rpm(1)
-
-=head1 AUTHOR
-
-Simon Wilkinson <sxw@sxw.org.uk>
diff --git a/rt/tools/initdb b/rt/tools/initdb
deleted file mode 100644
index ffb1ae3b0..000000000
--- a/rt/tools/initdb
+++ /dev/null
@@ -1,216 +0,0 @@
-#!/usr/bin/perl -w
-# $Header: /home/cvs/cvsroot/freeside/rt/tools/Attic/initdb,v 1.1 2002-08-12 06:17:08 ivan Exp $
-
-use strict;
-use vars qw($PROMPT $SCHEMA_FILE $SCHEMA_DIR
-	    $ACTION $DEBUG $DB_TYPE $DB_HOME 
-	    $DB_HOST $DB_PORT $DB_DBA $DB_DATABASE $DB_DBA_PASSWORD);
-
-use DBI;
-use DBIx::DataSource qw( create_database drop_database );
-
-
-$|=1; #unbuffer that output.
-
-$DEBUG=0;
-$PROMPT = 1; #by default, should at least *ask* before nuking databases
-$SCHEMA_DIR ="etc";
-$SCHEMA_FILE = "$SCHEMA_DIR/schema.pm"; #hmm
-
-($DB_TYPE, $DB_HOME, $DB_HOST, $DB_PORT, $DB_DBA, $DB_DATABASE, $ACTION) = @ARGV;
-
-
-if ($DEBUG) {
-  print_config_params();
-}
-my $dsn = "dbi:$DB_TYPE:";
-
-if (($DB_TYPE eq 'Pg') or ($DB_TYPE eq 'mysql')) {
-   $dsn .= "dbname=$DB_DATABASE";
-   if ($DB_HOST) {
-	$dsn .= ";host=$DB_HOST";
-    }
-   if ($DB_PORT) {
- 	$dsn .= ";port=$DB_PORT";
-   }
-}
-elsif ($DB_TYPE eq 'Oracle') {
-   $dsn .= "$DB_DATABASE";
-}
-
-
-if ($ACTION eq 'create') {
-    unless ($DB_TYPE eq 'Oracle') {
-        print "Now creating a database for RT.\n";
-	prompt_for_dba_password();
-	create_db();
-    }
-}
-elsif ($ACTION eq 'drop' ) {
-    unless ($DB_TYPE eq 'Oracle') {
-	print "Now dropping the RT2 database.\n";
-        prompt_for_dba_password();
-        drop_db();
-    }
-}
-elsif ($ACTION eq 'insert' ) {
-    print "Now populating database schema.\n";
-    prompt_for_dba_password();
-    insert_schema();
-}
-elsif ($ACTION eq 'generate') {
-    prompt_for_dba_password();
-    generate_schema();
-}
-else {
-    print STDERR '$ACTION unspecified. Makefile error. It was '.$ACTION ;
-    exit(-1);
-}
-
-
-# {{{ sub prompt_for_dba_password
-
-sub prompt_for_dba_password {
-    print "Enter the $DB_TYPE password for $DB_DBA: ";
-
-    system "stty -echo";
-    $DB_DBA_PASSWORD = scalar(<STDIN>); #keep off commandline
-    system "stty echo";
-    chomp $DB_DBA_PASSWORD;
-
-}
-# }}}
-
-# {{{ sub print_config_params
-sub print_config_params {
-    print <<END;
-Database creation parameters:
-
-DB_TYPE         = $DB_TYPE
-DB_HOME         = $DB_HOME
-DB_HOST         = $DB_HOST
-DB_DBA          = $DB_DBA
-DB_DBA_PASSWORD = <hidden>
-DB_DATABASE     = $DB_DATABASE
-END
-}
-# }}}
-
-# {{{ sub drop_db
-sub drop_db {
-    
-    if ( $PROMPT ) {
-	print <<END;
-
-About to drop $DB_TYPE database $DB_DATABASE.
-WARNING: This will erase all data in $DB_DATABASE.
-If you have an existing RT 2.x installation, this will destroy all your data.
-i
-END
-	exit unless _yesno();
-	
-    }
-    
-
-  print "\nDropping $DB_TYPE database $DB_DATABASE.\n";
-  drop_database( $dsn, $DB_DBA, $DB_DBA_PASSWORD )
-    or warn $DBIx::DataSource::errstr;
-
-
-}
-# }}}
-
-# {{{ sub generate_schema
-sub generate_schema {
-    my @schema = generate_schema_from_hash();
-    print "Generating schema for $DB_TYPE...";
-    
-    system('mv', "$SCHEMA_DIR/schema.$DB_TYPE", "$SCHEMA_DIR/schema.$DB_TYPE.bak")
-      if (-f "$SCHEMA_DIR/schema.$DB_TYPE");
-    open(SCHEMA, ">$SCHEMA_DIR/schema.$DB_TYPE");
-    foreach my $line (@schema) {
-	print SCHEMA "$line;\n";
-    }
-    close(SCHEMA);
-    print "done.\n";
-}
-# }}}
-
-# {{{ sub insert_schema
-sub insert_schema {
-    my (@schema);
-    print "\nCreating database schema.\n";
-   
-    my $dbh = DBI->connect( $dsn, $DB_DBA, $DB_DBA_PASSWORD ) or die $DBI::errstr;    
-    
-    if ( -f "$SCHEMA_DIR/schema.$DB_TYPE") {
-	open (SCHEMA, "<$SCHEMA_DIR/schema.$DB_TYPE");
-	my $statement = "";
-	foreach my $line (<SCHEMA>) {
-	    $statement .= $line;
-	    if ($line =~ /;$/) {
-		$statement =~ s/;$//g;
-		push @schema, $statement;
-		$statement = "";
-	    }
-	}	
-    }	
-    
-    else {
-	 @schema = generate_schema_from_hash();
-     }
-    
-    foreach my $statement (@schema) {
-	print STDERR $statement if $DEBUG;
-	my $sth = $dbh->prepare($statement) or die $dbh->errstr;
-	unless ($sth->execute) {
-	    print STDERR "Problem with statement:\n $statement\n";
-	    die $sth->errstr;
-	}
-    }
-    
-    
-    $dbh->disconnect;
-    print "schema sucessfully inserted\n";
-    
-}
-# }}}
-
-# {{{ sub generate_schema_from_hash
-sub generate_schema_from_hash {
-    my (@schema);
-    
-    require DBIx::DBSchema;    
-    my $schema_href = do "$SCHEMA_FILE" or die $@ || $!;
-    my $schema = DBIx::DBSchema->pretty_read($schema_href);
-    
-    
-    foreach my $statement ( $schema->sql($dsn, $DB_DBA, $DB_DBA_PASSWORD ) ) {
-	print STDERR $statement if $DEBUG;
-	chomp $statement;
-	push @schema, $statement;
-	
-    }
-    return (@schema);
-    
-}
-# }}}
-
-# {{{ sub create_db
-sub create_db {
-    
-    print "\nCreating $DB_TYPE database $DB_DATABASE.\n";
-    create_database( $dsn, $DB_DBA, $DB_DBA_PASSWORD )
-      or die $DBIx::DataSource::errstr;
-
-}
-# }}}
-
-# {{{ sub _yesno
-sub _yesno {
-    print "Proceed [y/N]:";
-    my $x = scalar(<STDIN>);
-    $x =~ /^y/i;
-}
-
-# }}}
diff --git a/rt/tools/insertdata b/rt/tools/insertdata
deleted file mode 100755
index b3e76e623..000000000
--- a/rt/tools/insertdata
+++ /dev/null
@@ -1,618 +0,0 @@
-#!/usr/bin/perl -w
-#
-# $Header: /home/cvs/cvsroot/freeside/rt/tools/Attic/insertdata,v 1.1 2002-08-12 06:17:08 ivan Exp $
-# RT is (c) 1996-2002 Jesse Vincent (jesse@bestpractical.com);
-
-package RT;
-use strict;
-use vars qw($VERSION $Handle $Nobody $SystemUser $item);
-
-use lib "!!RT_LIB_PATH!!";
-use lib "!!RT_ETC_PATH!!";
-
-#This drags in  RT's config.pm
-use config;
-use Carp;
-
-use RT::Handle;
-use RT::User;
-use RT::CurrentUser;
-
-# 
-my $LastVersion = shift || undef;
-my $LastMinorVersion = undef;
-
-#connect to the db
-$RT::Handle = new RT::Handle($RT::DatabaseType);
-$RT::Handle->Connect();
-
-#Put together a current user object so we can create a User object
-my $CurrentUser = new RT::CurrentUser();
-
-if ($LastVersion) {
-    if ( $LastVersion =~ /^2.0.(\d+)$/ ) {
-        $LastMinorVersion = $1;
-        print "Looking for new objects to add to the database"
-          . " since $LastVersion\n\n";
-    }
-    else {
-        print "This tool does not support upgrades from development releases "
-          . "or non 2.0.x versions";
-    }
-}
-else {    # this is a virgin install
-    print "Checking for existing system user...";
-    my $test_user = RT::User->new($CurrentUser);
-    $test_user->Load('RT_System');
-    if ( $test_user->id ) {
-        print "Found!\n\nYou appear to have already run insertdata.\n"
-          . "Exiting, so as not to clobber your existing data. To ERASE your\n"
-          . "RT database and start over, type 'make dropdb; make install' in\n"
-          . "the RT installation directory. If you just meant to upgrade the\n"
-          . "content of your database, rerun this program as: \n",
-          "       $0 <version>\n"
-          . "where <version> is the last RELEASED version of RT you installed\n"
-          . "for example, if you're upgrading from 2.0.4, you'd type:\n"
-          . "       $0 2.0.4\n";
-        exit(-1);
-
-    }
-    else {
-        print "not found.  This appears to be a new installation";
-    }
-
-    print "Creating system user...";
-    my $RT_System = new RT::User($CurrentUser);
-
-    my ( $val, $msg ) = $RT_System->_BootstrapCreate(
-        Name     => 'RT_System',
-        RealName => 'The RT System itself',
-        Comments =>
-'Do not delete or modify this user. It is integral to RT\'s internal database structures',
-        Privileged => '2',
-        Creator    => '1'
-    );
-
-    if ($val) {
-        print "done.\n";
-    }
-    else {
-        print "$msg\n";
-        exit(1);
-    }
-
-}
-
-#now that we bootstrapped that little bit, we can use the standard RT cli
-# helpers  to do what we need
-
-use RT::Interface::CLI qw(CleanEnv LoadConfig DBConnect
-  GetCurrentUser GetMessageContent);
-
-#Clean out all the nasties from the environment
-CleanEnv();
-
-#Load etc/config.pm and drop privs
-LoadConfig();
-
-#Connect to the database and get RT::SystemUser and RT::Nobody loaded
-DBConnect();
-
-$CurrentUser->LoadByName('RT_System');
-
-# {{{ Users
-
-my @users;
-
-unless ($LastVersion) {
-    @users = (
-        {
-            Name     => 'Nobody',
-            RealName => 'Nobody in particular',
-            Comments => 'Do not delete or modify this user. It is integral '
-              . 'to RT\'s internal data structures',
-            Privileged => '2',
-        },
-
-        {
-            Name         => 'root',
-            Gecos        => 'root',
-            RealName     => 'Enoch Root',
-            Password     => 'password',
-            EmailAddress => "root\@localhost",
-            Comments     => 'SuperUser',
-            Privileged   => '1',
-        }
-    );
-}
-
-# }}}
-
-# {{{ Groups 
-
-my @groups;
-unless ($LastVersion) {
-    @groups = (
-        {
-            Name        => 'Everyone',
-            Description => 'Pseudogroup for internal use',
-            Pseudo      => '1',
-        },
-        {
-            Name        => 'Owner',
-            Description => 'Pseudogroup for internal use',
-            Pseudo      => '1',
-        },
-        {
-            Name        => 'Requestor',
-            Description => 'Pseudogroup for internal use',
-            Pseudo      => '1',
-        },
-        {
-            Name        => 'Cc',
-            Description => 'Pseudogroup for internal use',
-            Pseudo      => '1',
-        },
-        {
-            Name        => 'AdminCc',
-            Description => 'Pseudogroup for internal use',
-            Pseudo      => '1',
-        },
-    );
-}
-
-# }}}
-
-# {{{ ACL
-my @acl;
-
-unless ($LastVersion) {
-    @acl = (    #TODO: make this actually take the serial # granted to root.
-        {
-            PrincipalId    => '1',
-            PrincipalType  => 'User',
-            RightName      => 'SuperUser',
-            RightScope     => 'System',
-            RightAppliesTo => '0'
-        },
-        {
-            PrincipalId    => '2',
-            PrincipalType  => 'User',
-            RightName      => 'SuperUser',
-            RightScope     => 'System',
-            RightAppliesTo => '0'
-        },
-
-        {
-            PrincipalId    => '3',
-            PrincipalType  => 'User',
-            RightName      => 'SuperUser',
-            RightScope     => 'System',
-            RightAppliesTo => '0'
-        }
-
-    );
-}
-
-# }}}
-
-# {{{ Queues
-
-my @queues;
-unless ($LastVersion) {
-    @queues = (
-        {
-            Name              => 'general',
-            Description       => 'The default queue',
-            CorrespondAddress => "rt\@localhost",
-            CommentAddress    => "rt-comment\@localhost"
-        }
-    );
-}
-
-# }}}
-
-# {{{ ScripActions
-
-my @ScripActions;
-
-unless ($LastVersion) {
-    @ScripActions = (
-
-        {
-            Name        => 'AutoreplyToRequestors',
-            Description =>
-'Always sends a message to the requestors independent of message sender',
-            ExecModule => 'Autoreply',
-            Argument   => 'Requestor'
-        },
-        {
-            Name        => 'NotifyRequestors',
-            Description => 'Sends a message to the requestors',
-            ExecModule  => 'Notify',
-            Argument    => 'Requestor'
-        },
-        {
-            Name        => 'NotifyOwnerAsComment',
-            Description => 'Sends mail to the owner',
-            ExecModule  => 'NotifyAsComment',
-            Argument    => 'Owner'
-        },
-        {
-            Name        => 'NotifyOwner',
-            Description => 'Sends mail to the owner',
-            ExecModule  => 'Notify',
-            Argument    => 'Owner'
-        },
-        {
-            Name        => 'NotifyAdminCcsAsComment',
-            Description => 'Sends mail to the administrative Ccs as a comment',
-            ExecModule  => 'NotifyAsComment',
-            Argument    => 'AdminCc'
-        },
-        {
-            Name        => 'NotifyAdminCcs',
-            Description => 'Sends mail to the administrative Ccs',
-            ExecModule  => 'Notify',
-            Argument    => 'AdminCc'
-        },
-
-        {
-            Name        => 'NotifyRequestorsAndCcsAsComment',
-            Description => 'Send mail to requestors and Ccs as a comment',
-            ExecModule  => 'NotifyAsComment',
-            Argument    => 'Requestor,Cc'
-        },
-
-        {
-            Name        => 'NotifyRequestorsAndCcs',
-            Description => 'Send mail to requestors and Ccs',
-            ExecModule  => 'Notify',
-            Argument    => 'Requestor,Cc'
-        },
-
-        {
-            Name        => 'NotifyAllWatchersAsComment',
-            Description => 'Send mail to all watchers',
-            ExecModule  => 'NotifyAsComment',
-            Argument    => 'All'
-        },
-        {
-            Name        => 'NotifyAllWatchers',
-            Description => 'Send mail to all watchers',
-            ExecModule  => 'Notify',
-            Argument    => 'All'
-        },
-    );
-}
-
-if ( $LastMinorVersion < 12 ) {
-    push (
-        @ScripActions,
-        {
-            Name        => 'NotifyOtherRecipientsAsComment',
-            Description => 'Sends mail to explicitly listed Ccs and Bccs',
-            ExecModule  => 'NotifyAsComment',
-            Argument    => 'OtherRecipients'
-        },
-        {
-            Name        => 'NotifyOtherRecipients',
-            Description => 'Sends mail to explicitly listed Ccs and Bccs',
-            ExecModule  => 'Notify',
-            Argument    => 'OtherRecipients'
-        },
-    );
-}
-
-# }}}
-
-# {{{ ScripConditions
-
-my @ScripConditions;
-unless ($LastVersion) {
-    @ScripConditions = (
-        {
-            Name                 => 'OnCreate',
-            Description          => 'When a ticket is created',
-            ApplicableTransTypes => 'Create',
-            ExecModule           => 'AnyTransaction',
-        },
-
-        {
-            Name                 => 'OnTransaction',
-            Description          => 'When anything happens',
-            ApplicableTransTypes => 'Any',
-            ExecModule           => 'AnyTransaction',
-        },
-        {
-
-            Name                 => 'OnCorrespond',
-            Description          => 'Whenever correspondence comes in',
-            ApplicableTransTypes => 'Correspond',
-            ExecModule           => 'AnyTransaction',
-        },
-
-        {
-
-            Name                 => 'OnComment',
-            Description          => 'Whenever comments come in',
-            ApplicableTransTypes => 'Comment',
-            ExecModule           => 'AnyTransaction'
-        },
-        {
-
-            Name                 => 'OnStatus',
-            Description          => 'Whenever a ticket\'s status changes',
-            ApplicableTransTypes => 'Status',
-            ExecModule           => 'AnyTransaction',
-
-        },
-        {
-            Name                 => 'OnResolve',
-            Description          => 'Whenever a ticket is resolved.',
-            ApplicableTransTypes => 'Status',
-            ExecModule           => 'StatusChange',
-            Argument             => 'resolved'
-
-        },
-
-    );
-}
-
-# }}}
-
-# {{{ Templates
-my @templates;
-
-unless ($LastVersion) {
-    @templates = (
-        {
-            Queue       => '0',
-            Name        => 'Autoreply',
-            Description => 'Default Autoresponse Template',
-            Content     => 'Subject: AutoReply: {$Ticket->Subject}
-
-
-Greetings,
-
-This message has been automatically generated in response to the
-creation of a trouble ticket regarding:
-	"{$Ticket->Subject()}", 
-a summary of which appears below.
-
-There is no need to reply to this message right now.  Your ticket has been
-assigned an ID of [{$rtname} #{$Ticket->id()}].
-
-Please include the string:
-
-         [{$rtname} #{$Ticket->id}]
-
-in the subject line of all future correspondence about this issue. To do so, 
-you may reply to this message.
-
-                        Thank you,
-                        {$Ticket->QueueObj->CorrespondAddress()}
-
--------------------------------------------------------------------------
-{$Transaction->Content()}
-'
-        },
-
-        {
-
-            #                  id => 2,
-            Queue       => '0',
-            Name        => 'Transaction',
-            Description => 'Default transaction template',
-            Content     => '
-
-
-{$Transaction->CreatedAsString}: Request {$Ticket->id} was acted upon.
-Transaction: {$Transaction->Description}
-       Queue: {$Ticket->QueueObj->Name}
-     Subject: {$Transaction->Subject || $Ticket->Subject || "(No subject given)"}
-       Owner: {$Ticket->OwnerObj->Name}
-  Requestors: {$Ticket->Requestors->EmailsAsString()}
-      Status: {$Ticket->Status}
- Ticket <URL: {$RT::WebURL}Ticket/Display.html?id={$Ticket->id} >
--------------------------------------------------------------------------
-{$Transaction->Content()}'
-        },
-
-        {
-
-            Queue       => '0',
-            Name        => 'AdminCorrespondence',
-            Description => 'Default admin correspondence template',
-            Content     => '
-
-
-<URL: {$RT::WebURL}Ticket/Display.html?id={$Ticket->id} >
-
-{$Transaction->Content()}'
-        },
-
-        {
-            Queue       => '0',
-            Name        => 'Correspondence',
-            Description => 'Default correspondence template',
-            Content     => '
-
-{$Transaction->Content()}'
-        },
-
-        {
-            Queue       => '0',
-            Name        => 'AdminComment',
-            Description => 'Default admin comment template',
-            Content     =>
-'Subject: [Comment] {my $s=($Transaction->Subject||$Ticket->Subject); $s =~ s/\\[Comment\\]//g; $comment =~ s/^Re//i; $s;}
-
-
-{$RT::WebURL}Ticket/Display.html?id={$Ticket->id}
-This is a comment.  It is not sent to the Requestor(s):
-
-{$Transaction->Content()}
-'
-        },
-
-        {
-            Queue       => '0',
-            Name        => 'StatusChange',
-            Description => 'Ticket status changed',
-            Content     => 'Subject: Status Changed to: {$Transaction->NewValue}
-
-
-{$RT::WebURL}Ticket/Display.html?id={$Ticket->id}
-
-{$Transaction->Content()}
-'
-        },
-
-        {
-
-            Queue       => '0',
-            Name        => 'Resolved',
-            Description => 'Ticket Resolved',
-            Content     => 'Subject: Ticket Resolved
-
-According to our records, your request has been resolved. If you have any
-further questions or concerns, please respond to this message.
-'
-        }
-    );
-}
-
-# }}}
-
-# {{{ Scrips;
-
-my @scrips;
-unless ($LastVersion) {
-     @scrips = (
-                { Queue => 0,
-                  ScripCondition => 'OnCreate',
-                  ScripAction => 'AutoreplyToRequestors',
-                  Template => 'Autoreply'
-                },
-                { Queue => 0,
-                  ScripCondition => 'OnCreate',
-                  ScripAction => 'NotifyAdminCcs',
-                  Template => 'Transaction',
-                },
-                { Queue => 0,
-                  ScripCondition => 'OnCorrespond',
-                  ScripAction => 'NotifyAllWatchers',
-                  Template => 'Correspondence',
-                },
-                { Queue => 0,
-                  ScripCondition => 'OnComment',
-                  ScripAction => 'NotifyAdminCcsAsComment',
-                  Template => 'AdminComment',
-                },
-     ) 
-}
-if ( $LastMinorVersion < 12 ) {
-    push (
-        @scrips,
-                { Queue => 0,
-                  ScripCondition => 'OnComment',
-                  ScripAction => 'NotifyOtherRecipientsAsComment',
-                  Template => 'Correspondence',
-                },
-                { Queue => 0,
-                  ScripCondition => 'OnCorrespond',
-                  ScripAction => 'NotifyOtherRecipients',
-                  Template => 'Correspondence',
-                },
-        );
-}
-# }}}
-
-print "Creating ACL...";
-use RT::ACE;
-for $item (@acl) {
-    my $new_entry = new RT::ACE($CurrentUser);
-
-    #Using an internal function. this should never be used outside of the bootstrap script
-    my $return = $new_entry->_BootstrapRight(%$item);
-    print $return. ".";
-}
-print "done.\n";
-
-print "Creating users...";
-use RT::User;
-foreach $item (@users) {
-    my $new_entry = new RT::User($CurrentUser);
-    my ( $return, $msg ) = $new_entry->Create(%$item);
-    print "(Error: $msg)" unless ($return);
-    print $return. ".";
-}
-print "done.\n";
-
-print "Creating groups...";
-use RT::Group;
-foreach $item (@groups) {
-    my $new_entry = new RT::Group($CurrentUser);
-    my $return    = $new_entry->Create(%$item);
-    print $return. ".";
-}
-print "done.\n";
-
-print "Creating queues...";
-use RT::Queue;
-for $item (@queues) {
-    my $new_entry = new RT::Queue($CurrentUser);
-    my ( $return, $msg ) = $new_entry->Create(%$item);
-    print "(Error: $msg)" unless ($return);
-    print $return. ".";
-}
-
-print "done.\n";
-print "Creating ScripActions...";
-
-use RT::ScripAction;
-for $item (@ScripActions) {
-    my $new_entry = new RT::ScripAction($CurrentUser);
-    my $return    = $new_entry->Create(%$item);
-    print $return. ".";
-}
-
-print "done.\n";
-print "Creating ScripConditions...";
-
-use RT::ScripCondition;
-for $item (@ScripConditions) {
-    my $new_entry = new RT::ScripCondition($CurrentUser);
-    my $return    = $new_entry->Create(%$item);
-    print $return. ".";
-}
-
-print "done.\n";
-
-print "Creating templates...";
-
-use RT::Template;
-for $item (@templates) {
-    my $new_entry = new RT::Template($CurrentUser);
-    my $return    = $new_entry->Create(%$item);
-    print $return. ".";
-}
-print "done.\n";
-
-print "Creating Scrips...";
-
-use RT::Scrip;
-for $item (@scrips) {
-        my $new_entry = RT::Scrip->new($CurrentUser);
-        my ($return,$msg) = $new_entry->Create(%$item);
-        print "(Error: $msg)" unless ($return);
-        print $return.".";
-
-}
-print "done.\n";
-
-$RT::Handle->Disconnect();
-
-1;
-
diff --git a/rt/tools/testdeps b/rt/tools/testdeps
deleted file mode 100644
index ddc338107..000000000
--- a/rt/tools/testdeps
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/bin/perl -w
-
-# $Header: /home/cvs/cvsroot/freeside/rt/tools/Attic/testdeps,v 1.1 2002-08-12 06:17:08 ivan Exp $
-
-# Copyright 2000 Jesse Vincent <jesse@fsck.com>
-# Distributed under the GNU General Public License
-# 
-
-#
-# This is just a basic script that checks to make sure that all
-# the modules needed by RT before you can install it.
-#
-
-use strict;
-
-use vars qw($mode $dbd $module @modules);
-
-$mode = shift || print_help();
-$dbd = shift || print_help();
-
-@modules = qw(
-Digest::MD5
-Storable
-DBI 1.18
-DBIx::DataSource 0.02
-DBIx::SearchBuilder 0.48
-HTML::Entities 
-MLDBM
-Net::Domain
-Net::SMTP
-Params::Validate 0.02
-HTML::Mason 1.02
-CGI::Cookie 1.20
-Apache::Cookie
-Apache::Session 1.53
-Date::Parse
-Date::Format 
-MIME::Entity 5.108
-Mail::Mailer 1.20
-Getopt::Long 2.24
-Tie::IxHash 
-Text::Wrapper 
-Text::Template
-File::Spec 0.8
-Errno
-FreezeThaw
-File::Temp 
-Log::Dispatch 1.6
-);
-
-
-if ($dbd =~ /mysql/i) {
-	push @modules, ('DBD::mysql','2.0416'); 
-}
-elsif ($dbd =~ /oracle/i) {
-	push @modules, ('DBD::Oracle','');
-}
-elsif ($dbd =~ /pg/i) {
-	push @modules, ('DBD::Pg','');
-}
-use CPAN;
-
-while ($module= shift @modules) {
-	my $version = "";
-	$version = " ". shift (@modules) . " " if ($modules[0] =~ /^([\d\.]*)$/);
-	print "Checking for $module$version";
-	eval "use $module$version" ;
-	if ($@) {
-	&resolve_dependency($module, $version) 
-	}
-	else {
-	print "...found\n";
-	}
-}
-
-sub print_help {
-print <<EOF;
-
-$0 FLAG DBTYPE
-
-
-$0 is a tool for RT that will tell you if you've got all
-the modules RT depends on properly installed.
-
-Flags: (only one flag is valid for a given run)
-
--quiet will check to see if we've got everything we need
-	and will exit with a return code of (1) if we don't.
-
--warn will tell you what isn't properly installed
-
--fix will use CPAN to magically make everything better
-
-DBTYPE is one of:
-	oracle, pg, mysql
-
-EOF
-
-exit(0);
-}
-
-sub resolve_dependency {
-	my $module = shift;
-	my $version = shift;
-        print "....$module$version not installed.";
-    if ($mode =~ /-f/) {
-	$module = "DBD::mysql::Install" if ($module =~ /DBD::mysql/);
-	
-        print "Installing with CPAN...";
-        CPAN::install($module);
-     }
-     print "\n";
-	exit(1) if ($mode =~ /-q/);
-}	
-	
diff --git a/rt/webrt/Admin/Elements/CreateQueueCalled b/rt/webrt/Admin/Elements/CreateQueueCalled
deleted file mode 100755
index aeed6e786..000000000
--- a/rt/webrt/Admin/Elements/CreateQueueCalled
+++ /dev/null
@@ -1,3 +0,0 @@
-<FORM METHOD=get ACTION="<% $RT::WebPath %>/Admin/Queues/Create.html">
-Create a queue called <INPUT NAME="Name" size=10><input type=submit>
-</form>
diff --git a/rt/webrt/Admin/Elements/CreateUserCalled b/rt/webrt/Admin/Elements/CreateUserCalled
deleted file mode 100755
index 7e4bb7554..000000000
--- a/rt/webrt/Admin/Elements/CreateUserCalled
+++ /dev/null
@@ -1,3 +0,0 @@
-<FORM METHOD=get ACTION="<%$RT::WebPath%>/Admin/Users/Create.html">
-New user called <INPUT NAME="Name" size=10><input type=submit value="Create">
-</form>
diff --git a/rt/webrt/Admin/Elements/EditUserComments b/rt/webrt/Admin/Elements/EditUserComments
deleted file mode 100755
index 1ac7e187f..000000000
--- a/rt/webrt/Admin/Elements/EditUserComments
+++ /dev/null
@@ -1,9 +0,0 @@
-<& /Elements/Header, Title => "Comments about $name" &>
-These comments aren't generally visible to the user:<br>
-<input type="hidden" name="id" value="<%$id%>">
-<TEXTAREA COLS=60 ROWS=15 WRAP=SOFT NAME="Comments"><% $UserObj->Comments %></TEXTAREA>
-</FORM>
-
-<%ARGS>
-$UserObj => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/GrantQueueRightsTo b/rt/webrt/Admin/Elements/GrantQueueRightsTo
deleted file mode 100755
index 3850a18f2..000000000
--- a/rt/webrt/Admin/Elements/GrantQueueRightsTo
+++ /dev/null
@@ -1,30 +0,0 @@
-<BR>
-
-% if ($msg) {
-<%$msg%>
-% } elsif ($Users) {
-<ul>
-% while (my $u = $Users->Next ) {
-<li> <%$u->Name%> (<%$u->RealName%>) <& SelectQueueRights, Name => "GrantTo".$u->id &>
-% }
-</ul>
-% }
-
-<%INIT>
-my ($msg, $Users);
-if (!$ARGS{'UserString'}) {
-$msg = "No users selected.";
- }
-else {
-    $Users = new RT::Users($session{'CurrentUser'});
-    $Users->Limit(FIELD => $ARGS{'UserField'},
-                 VALUE => $ARGS{'UserString'},
-                 OPERATOR => $ARGS{'UserOp'});
-     }
-</%INIT>
-
-<%ARGS>
-$UserField => 'Name'
-$UserOp => '='
-$UserString => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/GroupTabs b/rt/webrt/Admin/Elements/GroupTabs
deleted file mode 100755
index 261bef1e2..000000000
--- a/rt/webrt/Admin/Elements/GroupTabs
+++ /dev/null
@@ -1,18 +0,0 @@
-<& /Admin/Elements/Tabs, subtabs => $subtabs, current_tab => 'Admin/Groups/' &>
-<hr>
-<%INIT>
-my $subtabs = { 
-             Basics => { title => 'Basics',
-                         path => "Admin/Groups/Modify.html?id=". $GroupObj->id
-                       }
-	};
-
-unless ($GroupObj->Pseudo) {
-$subtabs->{'Members'} = { title => 'Members',
-                         path => "Admin/Groups/Members.html?id=".$GroupObj->id };
-}
-</%INIT>
-
-<%ARGS>
-$GroupObj => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/Header b/rt/webrt/Admin/Elements/Header
deleted file mode 100755
index 95acdac7e..000000000
--- a/rt/webrt/Admin/Elements/Header
+++ /dev/null
@@ -1,5 +0,0 @@
-<& /Elements/Header, Title => $Title &>
-
-<%ARGS>
-$Title => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/ListGlobalKeywordSelects b/rt/webrt/Admin/Elements/ListGlobalKeywordSelects
deleted file mode 100644
index b24d68989..000000000
--- a/rt/webrt/Admin/Elements/ListGlobalKeywordSelects
+++ /dev/null
@@ -1,15 +0,0 @@
-% while (my $KeywordSelect = $KeywordSelects->Next()) {
-
-<%$KeywordSelect->Name %>:
-<% $KeywordSelect->Single ? 'Single' : 'Multiple' %>
-children of
-<% $KeywordSelect->KeywordObj->Path %>
-% if ($KeywordSelect->Depth) {
-	  up to <%$KeywordSelect->Depth%> levels deep
-% }
-<BR>
-%} 
-<%INIT>
-my $KeywordSelects = RT::KeywordSelects->new($session{'CurrentUser'});
-$KeywordSelects->LimitToGlobals();
-</%INIT>
diff --git a/rt/webrt/Admin/Elements/ListGlobalScrips b/rt/webrt/Admin/Elements/ListGlobalScrips
deleted file mode 100755
index 2f044bf52..000000000
--- a/rt/webrt/Admin/Elements/ListGlobalScrips
+++ /dev/null
@@ -1,10 +0,0 @@
-%  while (my $scrip = $Scrips->Next ) {
-<% $scrip->ConditionObj->Name %> 
-<% $scrip->ActionObj->Name %> 
-with template <% $scrip->TemplateObj->Name %>
-<BR>
-%   }
-<%init>
-my $Scrips = new RT::Scrips ($session{'CurrentUser'});
-$Scrips->LimitToGlobal();
-</%INIT>
diff --git a/rt/webrt/Admin/Elements/ModifyKeyword b/rt/webrt/Admin/Elements/ModifyKeyword
deleted file mode 100644
index 4b01c3692..000000000
--- a/rt/webrt/Admin/Elements/ModifyKeyword
+++ /dev/null
@@ -1,95 +0,0 @@
-<FORM METHOD="get" ACTION="<%$RT::WebPath%>/Admin/Keywords/Modify.html">
-[<%$title |n %>]<BR>
-
-<INPUT TYPE="hidden" NAME="id" VALUE="<% $id %>">
-Keyword <INPUT NAME="Name" VALUE="<% $Keyword->Name %>"><BR>
-
-Parent <SELECT NAME="Parent">
-	      <OPTION VALUE=""<% defined($Keyword->Parent) ? '' : ' SELECTED' %>>-</OPTION>
-%while ( $parent = $parents->Next ) {
-	      <OPTION VALUE="<% $parent->id %>"<% defined($Keyword->Parent) && $parent->id == $Keyword->Parent ? ' SELECTED' : '' %>><% $parent->Name %></OPTION>
-%}
-</SELECT>
-
-
-Kids <FONT SIZE="-2">(separate by
-<INPUT TYPE="radio" NAME="delim" VALUE="n"<% $delim eq 'n' ? ' CHECKED' : '' %>>
-line or
-<INPUT TYPE="radio" NAME="delim" VALUE="s"<% $delim eq 's' ? ' CHECKED' : '' %>>
-whitespace)</FONT><BR>
-
-<TEXTAREA NAME="Kids" ROWS=4><% $kidstring %></TEXTAREA>
-<BR>
-
-<& /Elements/Submit, Label => $submit &>
-</FORM>
-
-<%INIT>
-
-my $Keyword = new RT::Keyword($session{CurrentUser});
-my ($title, $submit, %kids, $kid);
-
-if ( $Create ) {
-    $title = "Create a new Keyword";
-    $submit = "Create";
-    $id = "new";
-    %kids = ();
-    $Parent = ''; #silence 
-} elsif ( $id eq 'new' ) {
-    $id = $Keyword->Create( Name => $Name, Parent => $Parent )
-      or Abort("can't create keyword Name=>$Name, Parent=>$Parent");
-} else {
-    $Keyword->Load($id) || Abort("Can't load keyword id $id");
-    #foreach my $field ( grep eval "defined(\$$_)", qw( Name Parent )) {
-    #  eval "\$Keyword->Set(\$field=>\$$field); #sigh
-    #}
-    $Keyword->SetName($Name) if defined($Name);
-    $Keyword->SetParent($Parent) if defined($Parent);
-}
-
-$title = "Modify the Keyword <B>". $Keyword->Name. "</B>";
-$submit = "Modify";
-
-my $kids = new RT::Keywords($session{CurrentUser});
-$kids->Limit( FIELD => 'Parent', VALUE => $id, OPERATOR => '=' );
-$kids{$kid->Name} = $kid while $kid = $kids->Next;
-
-if ( defined($Kids) ) {
-    my %newkids;
-    if ( $delim eq 'n' ) {
-	%newkids = map { $_=>1 } split(/\n/, $Kids);
-    } elsif ( $delim eq 's' ) {
-	%newkids = map { $_=>1 } split(' ', $Kids);
-    } else {
-	Abort("'$delim' isn't a valid keyword delimiter.");
-    }
-    foreach ( grep { ! defined($newkids{$_}) } keys %kids ) {
-	$kids{$_}->Delete;
-	delete $kids{$_};
-    }
-    foreach ( grep { ! defined($kids{$_}) } keys %newkids ) {
-	$kids{$_} = new RT::Keyword($session{CurrentUser});
-	$kids{$_}->Create( Name => $_, Parent => $id )
-	  or Abort("can't create keyword Name=>$_, Parent=>$id");
-    }
-
-}
-
-
-my $parent;
-my $parents = new RT::Keywords($session{CurrentUser});
-$parents->UnLimit;
-
-$delim = ( grep /\s/, keys %kids ) ? 'n' : 's';
-my $kidstring = join("\n", keys %kids);
-
-</%INIT>
-
-<%ARGS>
-$id => undef
-$Create => undef
-$Name => undef
-$Parent => undef
-$Kids => undef
-$delim => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/ModifyKeywordSelect b/rt/webrt/Admin/Elements/ModifyKeywordSelect
deleted file mode 100644
index 470e62929..000000000
--- a/rt/webrt/Admin/Elements/ModifyKeywordSelect
+++ /dev/null
@@ -1,120 +0,0 @@
-  <FORM NAME="ModifyKeywordSelect" METHOD=POST ACTION="<%$RT::WebPath%>/Admin/KeywordSelects/Modify.html">
-
-    [<%$title |n %>]
-    <BR>
-      
-      <INPUT TYPE="hidden" NAME="id" VALUE="<% $id %>">
-	Keyword 
-	<SELECT NAME="Parent">
-	  
-%while ( $parent = $parents->Next ) {
-	  
-	  <OPTION VALUE="<% $parent->id %>" <% defined($KeywordSelect->Parent) && $parent->id == $KeywordSelect->Parent ? ' SELECTED' : '' %>><% $parent->Name %></OPTION>
-	  
-% }
-	  
-	</SELECT>
-	<BR>
-	  Object 
-	  <SELECT NAME="ObjectType">
-	    <OPTION SELECTED>Ticket</OPTION>
-	  </SELECT>
-	  <BR>
-	    
-<SCRIPT>
-function addOption(text, value, defaultselected, selected) {
-  var option = new Option(text, value, defaultselected, selected )
-  var length = document.ModifyKeywordSelect.ObjectValue.length;
-  document.ModifyKeywordSelect.ObjectValue.options[length] = option
-}
-function ChangeObjectValue(what) {
-  Value = what.options[what.selectedIndex].value
-  if ( Value == "(none)" ) {
-    document.ModifyKeywordSelect.ObjectValue.options.length = 0
-    addOption("(n/a)", "", false, false)
-  }
-  if ( Value == "Queue" ) {
-    document.ModifyKeywordSelect.ObjectValue.options.length = 0
-%foreach $queue ( keys %queues ) {
-    addOption("<% $queues{$queue} %>", "<% $queue %>", false, <% $queue == $KeywordSelect->ObjectValue ? 'true' : 'false' %> )
-%}
-  }
-}
-</SCRIPT>
-	    
-	    Limit to <SELECT NAME="ObjectField" onChange="ChangeObjectValue(this)">
-	      <OPTION VALUE="" <% $KeywordSelect->ObjectField ? '' : ' SELECTED' %>>(none)</OPTION>
-	      <OPTION VALUE="Queue" <% $KeywordSelect->ObjectField eq 'Queue' ? ' SELECTED' : '' %>>Queue</OPTION>
-	    </SELECT> 
-	    <SELECT NAME="ObjectValue">
-	      <OPTION VALUE="<% $KeywordSelect->ObjectValue %>">
-		<% $KeywordSelect->ObjectField ? $queues{$KeywordSelect->ObjectValue} : "(n/a)" %></OPTION>
-	    </SELECT><BR>
-	      <INPUT TYPE="hidden" NAME="SingleMagic" VALUE="1">
-		<INPUT TYPE="checkbox" NAME="Single" VALUE="1" <% $KeywordSelect->Single ? ' CHECKED' : '' %>>Allow single selection only<BR>
-		    Limit to <INPUT TYPE="text" NAME="Generations" SIZE="2" VALUE="<% $KeywordSelect->Generations %>"> generations (0 = no limit)<BR>
-			<& /Elements/Submit, Label => $submit &>
-
-</FORM>
-
-<%INIT>
-
-
-my $KeywordSelect = new RT::KeywordSelect($session{CurrentUser});
-  
-my($title, $submit);
-  
-if ( $Create ) {
-      $title = "Create a new KeywordSelect";
-      $submit = "Create";
-      $id = "new";
-} else {
-    if  ( $id eq 'new' ) {
-	$id = $KeywordSelect->Create (
-				      Parent      => $Parent,
-				      ObjectType  => $ObjectType,
-				      ObjectField => $ObjectField,
-				      ObjectValue => $ObjectValue,
-				      Single      => $Single,
-				      Generations => $Generations,
-				     ) or Abort "can't create KeywordSelect";
-    } else {
-	$KeywordSelect->Load($id) || Abort("Can't load keyword id $id");
-	#false laziness
-	$KeywordSelect->SetParent($Parent) if defined($Parent);
-	$KeywordSelect->SetObjectType($ObjectType) if defined($ObjectType);
-	$KeywordSelect->SetObjectField($ObjectField) if defined($ObjectField);
-	$KeywordSelect->SetObjectValue($ObjectValue) if defined($ObjectValue);
-	$KeywordSelect->SetSingle($Single) if defined($SingleMagic);
-	$KeywordSelect->SetGenerations($Generations) if defined($Generations);
-    }
-    $title = "Modify the KeywordSelect <B>". $KeywordSelect->KeywordObj->Name. "</B>";
-    $submit = "Modify";
-    
-}
-  
-  my $parents = new RT::Keywords($session{CurrentUser});
-  $parents->UnLimit;
-  my $parent;
-
-my $queues = new RT::Queues($session{CurrentUser});
-$queues->UnLimit;
-
-my %queues;
-my $queue;
-$queues{$queue->id} = $queue->Name while $queue = $queues->Next;
-
-</%INIT>
-
-<%ARGS>
-$id => undef
-$Create => undef
-$Parent => undef
-$ObjectType => undef
-$ObjectField => undef
-$ObjectValue => undef
-$Single => undef
-$SingleMagic => undef
-$Generations => undef
-</%ARGS>
-
diff --git a/rt/webrt/Admin/Elements/ModifyQueue b/rt/webrt/Admin/Elements/ModifyQueue
deleted file mode 100755
index a641c81af..000000000
--- a/rt/webrt/Admin/Elements/ModifyQueue
+++ /dev/null
@@ -1,56 +0,0 @@
-
-<& /Elements/TitleBoxStart, title => 'Editing Configuration for queue '.$QueueObj->Id &>
-
-<FORM ACTION="<%$RT::WebPath%>/Admin/Queues/Modify.html" METHOD=POST>
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$QueueObj->Id%>">
-<TABLE>
-<TR><TD ALIGN=RIGHT>
-Queue Name: 
-</TD>
-<TD><INPUT name="Name" value="<%$QueueObj->Name%>"></TD>
-</TR><TR>
-<TD ALIGN=RIGHT>
-Description:</TD><TD COLSPAN=3><INPUT name="Description" value="<%$QueueObj->Description%>" size=60></TD></TR>
-<TR>
-<TD ALIGN=RIGHT>
-Correspondence Address:
-</TD><TD>
-<INPUT name="CorrespondAddress" value="<%$QueueObj->CorrespondAddress%>">
-</TD>
-<TD ALIGN=RIGHT>
-
-Comment Address: </TD><TD>
-<INPUT NAME="CommentAddress" value="<%$QueueObj->CommentAddress%>">
-</TD>
-</TR><TR>
-
-<TD ALIGN=RIGHT>
-Priority starts at: 
-</TD><TD><INPUT NAME="InitialPriority" value="<%$QueueObj->InitialPriority %>">
-</TD>
-<TD ALIGN=RIGHT>
-Over time, priority moves toward:
-</TD><TD><INPUT NAME="FinalPriority" value="<%$QueueObj->FinalPriority %>">
-</TD>
-</TR>
-<TR>
-<TD ALIGN=RIGHT>
-Requests should be due in:
-</TD><TD>
-<INPUT NAME="DefaultDueIn" VALUE="<%$QueueObj->DefaultDueIn%>"> days.
-</TD>
-</TR>
-</TABLE>
-<& /Elements/Submit &>
-</form>
-<& /Elements/TitleBoxEnd &>
-
-<%INIT>
-
-</%INIT>
-
-<%ARGS>
-
-
-$QueueObj => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/ModifyTemplate b/rt/webrt/Admin/Elements/ModifyTemplate
deleted file mode 100755
index 6e4f8a379..000000000
--- a/rt/webrt/Admin/Elements/ModifyTemplate
+++ /dev/null
@@ -1,78 +0,0 @@
-
-<& /Elements/TitleBoxStart, title => 'Editing Configuration for user '.$UserObj->Name &>
-
-<FORM ACTION="<%$RT::WebPath%>/Admin/ModifyUser.html" METHOD=POST>
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$UserObj->Id%>">
-
-Name: <input name="Name" value="<%$UserObj->Name%>">
-<BR>
-New Password: <input type=password name="Pass1"><BR>
-Retype Password: <input type=password name="Pass2"><BR>
-
-Comments: <TEXTAREA name="Comments" COLS=20 ROWS=5>
-<%$UserObj->Comments%></TEXTAREA>
-
-<BR>
-Signature: <TEXTAREA COLS=80 ROWS=5 name="Signature">
-<%$UserObj->Signature%>"></TEXTAREA>
-<BR>
-EmailAddress: <input name="EmailAddress" value="<%$UserObj->EmailAddress%>">
-<BR>
-FreeformContactInfo: <input name="FreeformContactInfo" value="<%$UserObj->FreeformContactInfo%>">
-<BR>
-Organization: <input name="Organization" value="<%$UserObj->Organization%>">
-<BR>
-RealName: <input name="RealName" value="<%$UserObj->RealName%>">
-<BR>
-NickName: <input name="NickName" value="<%$UserObj->NickName%>">
-<BR>
-Lang: <input name="Lang" value="<%$UserObj->Lang%>">
-<BR>
-EmailEncoding: <input name="EmailEncoding" value="<%$UserObj->EmailEncoding%>">
-<BR>
-WebEncoding: <input name="WebEncoding" value="<%$UserObj->WebEncoding%>">
-<BR>
-ExternalContactInfoId: <input name="ExternalContactInfoId" value="<%$UserObj->ExternalContactInfoId%>">
-<BR>
-ContactInfoSystem: <input name="ContactInfoSystem" value="<%$UserObj->ContactInfoSystem%>">
-<BR>
-Gecos: <input name="Gecos" value="<%$UserObj->Gecos%>">
-<BR>
-ExternalAuthId: <input name="ExternalAuthId" value="<%$UserObj->ExternalAuthId%>">
-<BR>
-AuthSystem: <input name="AuthSystem" value="<%$UserObj->AuthSystem%>">
-<BR>
-HomePhone: <input name="HomePhone" value="<%$UserObj->HomePhone%>">
-<BR>
-WorkPhone: <input name="WorkPhone" value="<%$UserObj->WorkPhone%>">
-<BR>
-MobilePhone: <input name="MobilePhone" value="<%$UserObj->MobilePhone%>">
-<BR>
-PagerPhone: <input name="PagerPhone" value="<%$UserObj->PagerPhone%>">
-<BR>
-Address1: <input name="Address1" value="<%$UserObj->Address1%>">
-<BR>
-Address2: <input name="Address2" value="<%$UserObj->Address2%>">
-<BR>
-City: <input name="City" value="<%$UserObj->City%>">
-<BR>
-State: <input name="State" value="<%$UserObj->State%>">
-<BR>
-Zip: <input name="Zip" value="<%$UserObj->Zip%>">
-<BR>
-Country: <input name="Country" value="<%$UserObj->Country%>">
-<BR>
-
-<input type=submit>
-</form>
-<& /Elements/TitleBoxEnd &>
-
-<%INIT>
-
-</%INIT>
-
-<%ARGS>
-
-
-$UserObj => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/ModifyUser b/rt/webrt/Admin/Elements/ModifyUser
deleted file mode 100755
index 53aa027c0..000000000
--- a/rt/webrt/Admin/Elements/ModifyUser
+++ /dev/null
@@ -1,77 +0,0 @@
-
-<& /Elements/TitleBoxStart, title => 'Editing Configuration for user '.$UserObj->Name &>
-
-<FORM ACTION="<%$RT::WebPath%>/Admin/Users/Modify.html" METHOD=POST>
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$UserObj->Id%>">
-
-Name: <input name="Name" value="<%$UserObj->Name%>">
-<BR>
-New Password: <input type=password name="Pass1"><BR>
-Retype Password: <input type=password name="Pass2"><BR>
-
-Comments: <TEXTAREA name="Comments" COLS=80 ROWS=5 WRAP=VIRTUAL>
-<%$UserObj->Comments%></TEXTAREA>
-
-<BR>
-Signature: <TEXTAREA COLS=80 ROWS=5 name="Signature" WRAP=HARD>
-<%$UserObj->Signature%></TEXTAREA>
-<BR>
-EmailAddress: <input name="EmailAddress" value="<%$UserObj->EmailAddress%>">
-<BR>
-FreeformContactInfo: <input name="FreeformContactInfo" value="<%$UserObj->FreeformContactInfo%>">
-<BR>
-Organization: <input name="Organization" value="<%$UserObj->Organization%>">
-<BR>
-RealName: <input name="RealName" value="<%$UserObj->RealName%>">
-<BR>
-NickName: <input name="NickName" value="<%$UserObj->NickName%>">
-<BR>
-Lang: <input name="Lang" value="<%$UserObj->Lang%>">
-<BR>
-EmailEncoding: <input name="EmailEncoding" value="<%$UserObj->EmailEncoding%>">
-<BR>
-WebEncoding: <input name="WebEncoding" value="<%$UserObj->WebEncoding%>">
-<BR>
-ExternalContactInfoId: <input name="ExternalContactInfoId" value="<%$UserObj->ExternalContactInfoId%>">
-<BR>
-ContactInfoSystem: <input name="ContactInfoSystem" value="<%$UserObj->ContactInfoSystem%>">
-<BR>
-Gecos: <input name="Gecos" value="<%$UserObj->Gecos%>">
-<BR>
-ExternalAuthId: <input name="ExternalAuthId" value="<%$UserObj->ExternalAuthId%>">
-<BR>
-AuthSystem: <input name="AuthSystem" value="<%$UserObj->AuthSystem%>">
-<BR>
-HomePhone: <input name="HomePhone" value="<%$UserObj->HomePhone%>">
-<BR>
-WorkPhone: <input name="WorkPhone" value="<%$UserObj->WorkPhone%>">
-<BR>
-MobilePhone: <input name="MobilePhone" value="<%$UserObj->MobilePhone%>">
-<BR>
-PagerPhone: <input name="PagerPhone" value="<%$UserObj->PagerPhone%>">
-<BR>
-Address1: <input name="Address1" value="<%$UserObj->Address1%>">
-<BR>
-Address2: <input name="Address2" value="<%$UserObj->Address2%>">
-<BR>
-City: <input name="City" value="<%$UserObj->City%>">
-<BR>
-State: <input name="State" value="<%$UserObj->State%>">
-<BR>
-Zip: <input name="Zip" value="<%$UserObj->Zip%>">
-<BR>
-Country: <input name="Country" value="<%$UserObj->Country%>">
-<BR>
-<& /Elements/Submit &>
-</form>
-<& /Elements/TitleBoxEnd &>
-
-<%INIT>
-
-</%INIT>
-
-<%ARGS>
-
-
-$UserObj => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/QueueRightsForUser b/rt/webrt/Admin/Elements/QueueRightsForUser
deleted file mode 100644
index e62a124ce..000000000
--- a/rt/webrt/Admin/Elements/QueueRightsForUser
+++ /dev/null
@@ -1,17 +0,0 @@
-<UL>
-%while(my $ACE = $ACL->Next) {
-
-<LI><checkbox name="delete_ace_<%$ACE->id%>"> <%$ACE->RightName%> (<%$ACE->UserObj->RealName%>)
-
-%}
-</UL>
-
-<%INIT>
-my $ACL = new RT::ACL($session{'CurrentUser'});
-$ACL->LimitToQueue($QueueObj->id);
-$ACL->LimitPrincipalToUser($PrincipalId);
-</%INIT>
-<%ARGS>
-$PrincipalId => undef
-$QueueObj => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/QueueTabs b/rt/webrt/Admin/Elements/QueueTabs
deleted file mode 100755
index b7da7e007..000000000
--- a/rt/webrt/Admin/Elements/QueueTabs
+++ /dev/null
@@ -1,36 +0,0 @@
-<& /Admin/Elements/Tabs, subtabs => $subtabs, current_tab => 'Admin/Queues/' &>
-<hr>
-<%INIT>
-  my $subtabs = {
-		 A => { title => 'Basics',
-  		     	path => "Admin/Queues/Modify.html?id=".$id,
-			   },
-		 B => { title => 'Watchers',
-		 	path => "Admin/Queues/People.html?id=".$id,
-		      },
-
-		 C => { title => 'Scrips',
-			     path => "Admin/Queues/Scrips.html?id=".$id,
-			   },
-		 D => { title => 'Templates',
-				path => "Admin/Queues/Templates.html?id=".$id,
-			      },
-		 E => { title => 'Keyword Selections',
-				path => "Admin/Queues/Keywords.html?id=".$id,
-			},
-		 F => { title => 'Group Rights',
-			  path => "Admin/Queues/GroupRights.html?id=".$id,
-			},	
-		 G => { title => 'User Rights',
-			  path => "Admin/Queues/UserRights.html?id=".$id,
-			},
-
-
-		 
-};
-</%INIT>
-
-  
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectKeywordSelect b/rt/webrt/Admin/Elements/SelectKeywordSelect
deleted file mode 100644
index f5a8d77cd..000000000
--- a/rt/webrt/Admin/Elements/SelectKeywordSelect
+++ /dev/null
@@ -1,22 +0,0 @@
-<input size=10 name="<%$NamePrefix%>-Name" value="<% $KeywordSelect->Name %>">:
-<& /Admin/Elements/SelectSingleOrMultiple, 
-	  Name => $NamePrefix.'-Single',
-	  Default => $KeywordSelect->Single &>
-	  
-children of
-<& /Elements/SelectKeyword, Root => '0', 
-	                    Name => $NamePrefix.'-Keyword',
-                            Default => $KeywordSelect->KeywordObj->Id &>
-	  up to <input name="<%$NamePrefix%>-Depth" size=2 value="<%$KeywordSelect->Depth%>"> levels deep.
-<%INIT>
-unless ($NamePrefix) {
-	$NamePrefix = $KeywordSelect->Id;
-}
-$NamePrefix = "KeywordSelect-$NamePrefix";
-
-</%INIT>
-
-<%ARGS>
-$KeywordSelect => undef
-$NamePrefix => undef
-</%ARGS>
\ No newline at end of file
diff --git a/rt/webrt/Admin/Elements/SelectModifyGroup b/rt/webrt/Admin/Elements/SelectModifyGroup
deleted file mode 100644
index 45d437f41..000000000
--- a/rt/webrt/Admin/Elements/SelectModifyGroup
+++ /dev/null
@@ -1,10 +0,0 @@
-%while ( $Group = $Groups->Next) {
-<A HREF="Modify.html?id=<%$Group->id%>"><%$Group->id%>: <%$Group->Name%></a><BR>
-%}
-<%INIT>
-my ($Group);
-my $Groups = new RT::Groups($session{'CurrentUser'});
-$Groups->UnLimit;
-</%INIT>
-<%ARGS>
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectModifyKeyword b/rt/webrt/Admin/Elements/SelectModifyKeyword
deleted file mode 100644
index 6af223229..000000000
--- a/rt/webrt/Admin/Elements/SelectModifyKeyword
+++ /dev/null
@@ -1,13 +0,0 @@
-%while ( $keyword = $keywords->Next ) {
-<A HREF="/Admin/Keywords/Modify.html?id=<%$keyword->id%>"><%$keyword->id%>: <%$keyword->Name%></a><BR>
-%}
-
-<%INIT>
-
-use RT::Keywords;
-
-my $keyword;
-my $keywords = new RT::Keywords $session{CurrentUser};
-$keywords->UnLimit;
-</%INIT>
-
diff --git a/rt/webrt/Admin/Elements/SelectModifyKeywordSelect b/rt/webrt/Admin/Elements/SelectModifyKeywordSelect
deleted file mode 100644
index c91eb6cfe..000000000
--- a/rt/webrt/Admin/Elements/SelectModifyKeywordSelect
+++ /dev/null
@@ -1,13 +0,0 @@
-%while ( $keywordselect = $keywordselects->Next ) {
-<A HREF="/Admin/KeywordSelects/Modify.html?id=<%$keywordselect->id%>"><%$keywordselect->id%>: ( <%$keywordselect->Parent%>: <%$keywordselect->KeywordObj->Name%> )</a><BR>
-%}
-
-<%INIT>
-
-use RT::KeywordSelects;
-
-my $keywordselect;
-my $keywordselects = new RT::KeywordSelects $session{CurrentUser};
-$keywordselects->UnLimit;
-</%INIT>
-
diff --git a/rt/webrt/Admin/Elements/SelectModifyQueue b/rt/webrt/Admin/Elements/SelectModifyQueue
deleted file mode 100755
index 1c6cd7d5e..000000000
--- a/rt/webrt/Admin/Elements/SelectModifyQueue
+++ /dev/null
@@ -1,10 +0,0 @@
-%while ( $queue = $queues->Next) {
-<A HREF="Modify.html?id=<%$queue->id%>"><%$queue->id%>: <%$queue->Name%></a><BR>
-%}
-<%INIT>
-my ($queue);
-my $queues = new RT::Queues($session{'CurrentUser'});
-$queues->UnLimit;
-</%INIT>
-<%ARGS>
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectModifyUser b/rt/webrt/Admin/Elements/SelectModifyUser
deleted file mode 100755
index da49212e4..000000000
--- a/rt/webrt/Admin/Elements/SelectModifyUser
+++ /dev/null
@@ -1,26 +0,0 @@
-%while ( $user = $users->Next) {
-<A HREF="Modify.html?id=<%$user->id%>"><%$user->id%>: <%$user->Name%></a><BR>
-%}
-<%INIT>
-my ($user);
-my $users = new RT::Users($session{'CurrentUser'});
-$users->Limit(FIELD => 'id',
-              VALUE => $RT::SystemUser->id,
-              OPERATOR => '!=' );
-
-if (defined $IdLike) {
-$users->Limit(FIELD => 'Name',
-              VALUE => $IdLike,
-              OPERATOR => 'LIKE' );
-}
-if (defined $EmailLike) {
-$users->Limit(FIELD => 'EmailAddress',
-              VALUE => $EmailLike,
-              OPERATOR => 'LIKE');
-
-}
-</%INIT>
-<%ARGS>
-$IdLike => undef
-$EmailLike => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectQueueRights b/rt/webrt/Admin/Elements/SelectQueueRights
deleted file mode 100755
index 6861d40c6..000000000
--- a/rt/webrt/Admin/Elements/SelectQueueRights
+++ /dev/null
@@ -1,29 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Admin/Elements/Attic/SelectQueueRights,v 1.1 2002-08-12 06:17:08 ivan Exp $
-
-<SELECT NAME ="<%$Name%>">
-<OPTION VALUE="">-</OPTION>
-%foreach $right (@rights) {
-<OPTION VALUE="<%$right%>" <%($Default eq $right) && 'SELECTED'%>><%$right%></OPTION>
-% }
-</SELECT>
-<%ONCE>
-
-use RT::ACE;
-my $ACE = new RT::ACE($session{'CurrentUser'});
-my %QueueRights = $ACE->QueueRights;
-my %TicketRights = $ACE->TicketRights;
-
-my ($key, $right, @rights);
-
-foreach $key (sort keys %QueueRights) {
-push (@rights, $QueueRights{$key} . " ($key)");
-}
-foreach $key (sort keys %TicketRights) {
-push (@rights, $TicketRights{$key} . " ($key)");
-}
-</%ONCE>
-<%ARGS>
-$Name => undef
-$Default => undef
- 
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectRights b/rt/webrt/Admin/Elements/SelectRights
deleted file mode 100644
index 0ac774985..000000000
--- a/rt/webrt/Admin/Elements/SelectRights
+++ /dev/null
@@ -1,58 +0,0 @@
-<INPUT TYPE=HIDDEN NAME="CheckACL"  VALUE="<%$ACLDesc%>">
-     <TABLE BORDER=0>
-<TR>
-<TD valign=top>
-<h3>New rights</h3> 
-<SELECT SIZE=5  MULTIPLE  NAME="GrantACE-<%$ACLDesc%>">
-% foreach $right (sort keys %Rights) {
-      <OPTION VALUE="<%$right%>"  
-	><%$right%></OPTION>
-% }
-<OPTION VALUE="" SELECTED>(no value)</OPTION>
-</SELECT>
-</TD>
-<TD valign=top> 
-<h3>Current rights</h3>
-<i>(Check box to revoke right)</i> <BR>
-% while (my $right = $ACLObj->Next()) {
-% if ($right->RightName) {
-<input type=checkbox value="<%$right->Id%>" name="RevokeACE"> <%$right->RightName%><br>
-% }
-%  }
-</TD>
-</TR>
-</TABLE>
-<%INIT>
-    my ($right, $ACLDesc, $AppliesTo, %Rights);
-   
-       
-    my $ACLObj = new RT::ACL($session{'CurrentUser'});
-    my $ACE = new RT::ACE($session{'CurrentUser'});
-
-    if ($Scope eq 'Queue') { 
-        $AppliesTo = $QueueObj->Id;
-        $ACLObj->LimitToQueue($AppliesTo);
-        %Rights = $ACE->QueueRights();
-    } 
-    elsif ($Scope eq 'System') {
-        $AppliesTo = 0;
-        $ACLObj->LimitToSystem();
-        %Rights =  ( $ACE->SystemRights , $ACE->QueueRights());
-    }
-
-    if ($PrincipalType eq 'Group') {
-        $ACLObj->LimitPrincipalToGroup($PrincipalObj->Id);
-    } 
-    elsif ($PrincipalType eq 'User') {
-        $ACLObj->LimitPrincipalToUser($PrincipalObj->Id);
-    } 
-    
-    $ACLDesc = "$PrincipalType-".$PrincipalObj->Id."-$Scope-$AppliesTo";
-</%INIT>
-    
-<%ARGS>
-$PrincipalType => undef
-$PrincipalObj => undef
-$Scope => undef
-$QueueObj => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectScrip b/rt/webrt/Admin/Elements/SelectScrip
deleted file mode 100755
index 4ae15d8c3..000000000
--- a/rt/webrt/Admin/Elements/SelectScrip
+++ /dev/null
@@ -1,25 +0,0 @@
-<SELECT NAME=<%$Name%>>
-<OPTION VALUE="" 
-<% $Default eq undef && 'SELECTED' %>
->-</OPTION>
-%while  (my $Scrip = $Scrips->Next) {
-<OPTION VALUE=<%$Scrip->Id%>
-<% $Scrip->Id == $Default && 'SELECTED' %>
-><%$Scrip->Name%>
-</OPTION>
-%}
-</SELECT>
-
-<%INIT>
-my $Scrips = RT::Scrips->new($session{'CurrentUser'});
-$Scrips->UnLimit;
-
-
-
-</%INIT>
-<%ARGS>
-
-$Default => undef
-$Name => 'Scrip'
-
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectScripAction b/rt/webrt/Admin/Elements/SelectScripAction
deleted file mode 100644
index 08a173493..000000000
--- a/rt/webrt/Admin/Elements/SelectScripAction
+++ /dev/null
@@ -1,25 +0,0 @@
-<SELECT NAME=<%$Name%>>
-<OPTION VALUE="" 
-<% $Default eq undef && 'SELECTED' %>
->-</OPTION>
-%while  (my $ScripAction = $ScripActions->Next) {
-<OPTION VALUE=<%$ScripAction->Id%>
-<% $ScripAction->Id == $Default && 'SELECTED' %>
-><%$ScripAction->Name%>
-</OPTION>
-%}
-</SELECT>
-
-<%INIT>
-my $ScripActions = RT::ScripActions->new($session{'CurrentUser'});
-$ScripActions->UnLimit;
-
-
-
-</%INIT>
-<%ARGS>
-
-$Default => undef
-$Name => 'ScripAction'
-
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectScripCondition b/rt/webrt/Admin/Elements/SelectScripCondition
deleted file mode 100644
index 434f0c4ae..000000000
--- a/rt/webrt/Admin/Elements/SelectScripCondition
+++ /dev/null
@@ -1,25 +0,0 @@
-<SELECT NAME=<%$Name%>>
-<OPTION VALUE="" 
-<% $Default eq undef && 'SELECTED' %>
->-</OPTION>
-%while  (my $ScripCondition = $ScripConditions->Next) {
-<OPTION VALUE=<%$ScripCondition->Id%>
-<% $ScripCondition->Id == $Default && 'SELECTED' %>
-><%$ScripCondition->Name%>
-</OPTION>
-%}
-</SELECT>
-
-<%INIT>
-my $ScripConditions = RT::ScripConditions->new($session{'CurrentUser'});
-$ScripConditions->UnLimit;
-
-
-
-</%INIT>
-<%ARGS>
-
-$Default => undef
-$Name => 'ScripCondition'
-
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectSingleOrMultiple b/rt/webrt/Admin/Elements/SelectSingleOrMultiple
deleted file mode 100644
index 307b0211c..000000000
--- a/rt/webrt/Admin/Elements/SelectSingleOrMultiple
+++ /dev/null
@@ -1,20 +0,0 @@
-  <select name="<%$Name%>">
-    <option value="1" <%$SingleDefault%>>Single</option>
-    <option value="0" <%$MultipleDefault%>>Multiple</option>
-  </select>	
-
-
-<%INIT>
-my ($SingleDefault, $MultipleDefault);
-if ($Default == 1) {
-    $SingleDefault = "SELECTED";
-}
-elsif ($Default == 0 ) {
-    $MultipleDefault = "SELECTED";
-}
-
-</%INIT>
-<%ARGS>
-$Name => 'Single'
-$Default => 1
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectTemplate b/rt/webrt/Admin/Elements/SelectTemplate
deleted file mode 100755
index 76550dc4e..000000000
--- a/rt/webrt/Admin/Elements/SelectTemplate
+++ /dev/null
@@ -1,37 +0,0 @@
-<SELECT NAME=<%$Name%>>
-<OPTION VALUE="" 
-<% $Default eq 'none' && 'SELECTED' %>
->-</OPTION>
-%while  (my $Template = $PrimaryTemplates->Next) {
-<OPTION VALUE=<%$Template->Id%>
-<% ($Template->Id == $Default) && 'SELECTED' %>
-><%$Template->Name%>
-</OPTION>
-%}
-%while  (my $Template = $OtherTemplates->Next) {
-<OPTION VALUE=<%$Template->Id%>
-<% ($Template->Id == $Default)  && 'SELECTED'%>
->Global template: <%$Template->Name%>
-</OPTION>
-%}
-</SELECT>
-
-<%INIT>
-
-
-my $PrimaryTemplates = RT::Templates->new($session{'CurrentUser'});
-if ($DefaultQueue != 0) {
-$PrimaryTemplates->LimitToQueue($DefaultQueue);
-}
-
-my $OtherTemplates = RT::Templates->new($session{'CurrentUser'});
-$OtherTemplates->LimitToGlobal($DefaultQueue);
-
-</%INIT>
-<%ARGS>
-
-$Default => 'none'
-$DefaultQueue => undef
-$Name => 'Template'
-
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectUsers b/rt/webrt/Admin/Elements/SelectUsers
deleted file mode 100644
index af51c60f9..000000000
--- a/rt/webrt/Admin/Elements/SelectUsers
+++ /dev/null
@@ -1,17 +0,0 @@
-<SELECT MULTIPLE NAME="<%$Name%>"  SIZE=10>
-%while (my $user = $users->Next) {
-<OPTION VALUE="<%$user->id%>"><%$user->Name%>
-%}
-</SELECT>
-
-<%INIT>
-my $users = new RT::Users($session{'CurrentUser'});
-
-$users->Limit(FIELD => 'id', VALUE => $RT::SystemUser->id, OPERATOR => '!=' );
-$users->Limit(FIELD => 'id', VALUE => $RT::Nobody->id, OPERATOR => '!=' );
-$users->LimitToPrivileged();
-
-</%INIT>
-<%ARGS>
-$Name => 'Users'
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SystemTabs b/rt/webrt/Admin/Elements/SystemTabs
deleted file mode 100755
index f8b23128b..000000000
--- a/rt/webrt/Admin/Elements/SystemTabs
+++ /dev/null
@@ -1,31 +0,0 @@
-<& /Admin/Elements/Tabs, subtabs => $subtabs, current_tab => 'Admin/Global/', current_subtab => $current_subtab &>
-<hr>
-<%INIT>
-  my $subtabs = {
-		
-	       A => { title => 'Scrips',
-			   path => 'Admin/Global/Scrips.html',
-			 },
-	       Ba => { title => 'Keyword Selections',		
-			        path => 'Admin/Global/Keywords.html',
-		      },
-
-	       B => { title => 'Templates',
-			path => 'Admin/Global/Templates.html',
-		      },
-	        C => { title => 'Group Rights',
-			        path => 'Admin/Global/GroupRights.html',
-		      },
-	        D => { title => 'User Rights',
-			        path => 'Admin/Global/UserRights.html',
-		      }
-
-
-};
-</%INIT>
-
-  
-<%ARGS>
-$id => undef
-$current_subtab => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/Tabs b/rt/webrt/Admin/Elements/Tabs
deleted file mode 100755
index ee6d82b58..000000000
--- a/rt/webrt/Admin/Elements/Tabs
+++ /dev/null
@@ -1,31 +0,0 @@
-<& /Elements/Tabs, tabs => $tabs, subtabs => $subtabs, current_toptab => 'Admin/', current_tab => $current_tab, current_subtab => $current_subtab&>
-
-<hr>
-  
-<%INIT>
-  my $tabs = { Users => { title => 'Users',
-			  path => 'Admin/Users/',
-			},
-	       Groups => { title => 'Groups',
-			   path => 'Admin/Groups/',
-			 },
-	       Queues => { title => 'Queues',
-			   path => 'Admin/Queues/',
-			 },
-	       System => { 'title' => 'Global',
-			   path => 'Admin/Global/',
-			 },
-               Keywords => { title => 'Keywords',
-                                   path => 'Admin/Keywords/',
-                                 },
-
-	       
-	     };
-</%INIT>
-
-
-<%ARGS>
-$subtabs => undef
-$current_tab => undef
-$current_subtab => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/UserTabs b/rt/webrt/Admin/Elements/UserTabs
deleted file mode 100755
index bbf17314d..000000000
--- a/rt/webrt/Admin/Elements/UserTabs
+++ /dev/null
@@ -1,21 +0,0 @@
-<& /Admin/Elements/Tabs, subtabs => $subtabs,
-			 current_tab => 'Admin/Users/', 
-                         current_subtab => $current_subtab &>
-<hr>
-<%INIT>
-my $subtabs = {
-	       Queues => { title => 'Basics',
-			   path => "Admin/Users/Modify.html?id=".$id
-			 },
-#	       Scrips => { title => 'Rights',
-#			   path => "Admin/Users/Rights.html?id=".$id
-#			 }
-	       
-	      };
-</%INIT>
-  
-  
-<%ARGS>
-$id => undef
-$current_subtab => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Global/GroupRights.html b/rt/webrt/Admin/Global/GroupRights.html
deleted file mode 100755
index 26b7e1fe2..000000000
--- a/rt/webrt/Admin/Global/GroupRights.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Modify System ACLS' &>
-<& /Admin/Elements/SystemTabs &>
-  
-<& /Elements/ListActions, actions => \@results &>
-  <FORM METHOD=POST action="GroupRights.html">
-      
-
-
-<h2>Modify global rights for groups</h2>
-
-<TABLE>
-<TR><TD>Pseudogroups</TD></TR>
-% while (my $GroupObj = $PseudoGroups->Next()) {
-	      
-	      <TR ALIGN=RIGHT> 
-		<TD VALIGN=TOP>
-		  <% $GroupObj->Name %>
-		</TD>
-		<TD>
-	    <& /Admin/Elements/SelectRights, PrincipalObj => $GroupObj, 
-                                   PrincipalType => 'Group',
-                                   Scope => 'System' &>
-		</TD>
-	      </TR>
-	
-% }
-
-<TR><TD>Groups</TD></TR>
-
-% while (my $GroupObj = $Groups->Next()) {
-	      
-	      <TR ALIGN=RIGHT> 
-		<TD VALIGN=TOP>
-		  <% $GroupObj->Name %>
-		</TD>
-		<TD>
-	    <& /Admin/Elements/SelectRights, PrincipalObj => $GroupObj, 
-                                   PrincipalType => 'Group',
-                                   Scope => 'System' &>
-		</TD>
-	      </TR>
-	
-% }
-	
-      </TABLE>
-    <& /Elements/Submit, Caption => "Be sure to save your changes", Reset => 1 &>
-  </FORM>
-  
-  <%INIT>
- 
-   #Update the acls.
- my @results =  ProcessACLChanges(\@CheckACL, \%ARGS);
-
-        
-    # {{{ do basic initialization.
-    
-  
-  
-  # Find out which groups we want to display ACL selects for.
-  my $Groups = new RT::Groups($session{'CurrentUser'});
-  #TODO: limit this to non-pseudogroups
-  $Groups->LimitToReal();
-
-
-  my $PseudoGroups = new RT::Groups($session{'CurrentUser'});
-  #TODO: limit this to non-pseudogroups
-  $PseudoGroups->LimitToPseudo;
-
-  # }}}
-    
-  
-
-  
-  </%INIT>
-
-<%ARGS>
-@CheckACL => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Global/Keywords.html b/rt/webrt/Admin/Global/Keywords.html
deleted file mode 100644
index bf7bbd266..000000000
--- a/rt/webrt/Admin/Global/Keywords.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Edit keywords' &>
-<& /Admin/Elements/SystemTabs &>
-<& /Elements/ListActions, actions => \@actions &>
-
-<& /Elements/TitleBoxStart, title => $description &>
-  
-  <FORM METHOD=POST ACTION="Keywords.html">
-
-% if ($KeywordSelects->Count > 0 ) {
-<TABLE>
-<TR><TD>Delete</TD></TR>
-%  while (my $keywordselect = $KeywordSelects->Next ) {
-<TR>
-  <TD><INPUT TYPE="CHECKBOX" NAME="KeywordSelect-<%$keywordselect->Id%>-Delete"></TD>
-  <TD><& /Admin/Elements/SelectKeywordSelect, KeywordSelect => $keywordselect &></TD>
-</TR>
-%  }
-</TABLE>
-% }
-
-Add a global keyword selection:
-%my $ks = new RT::KeywordSelect($session{'CurrentUser'});
-<ul>
-<li><& /Admin/Elements/SelectKeywordSelect, KeywordSelect => $ks, NamePrefix => 'new' &></li>
-</ul>
-
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit &>
-</FORM>
-
-
-
-<%init>
-my (@actions);
-
-my $description = "Modify global Keyword selections";
-
-my $KeywordSelects = new RT::KeywordSelects ($session{'CurrentUser'});
-
-unless ($KeywordSelects->LimitToGlobals()) {
-    Abort("Couldn't load KeywordSelects.");
-}
-
-
-# {{{ if we're trying to create a new keyword select
-
-if ($ARGS{'KeywordSelect-new-Name'}) {
-    my $NewKeywordSelect = new RT::KeywordSelect($session{'CurrentUser'});
-    
-    my ($retval, $msg) = $NewKeywordSelect->Create ( Keyword => $ARGS{'KeywordSelect-new-Keyword'},
-					     ObjectField => 'Queue',
-					     ObjectType => 'Ticket',
-					     ObjectValue => 0,
-					     Name => $ARGS{'KeywordSelect-new-Name'},
-					     Single => $ARGS{'KeywordSelect-new-Single'},
-					     Depth => $ARGS{'KeywordSelect-new-Depth'}
-					   );
-	push (@actions, $msg);
-}
-# }}}
-
-# {{{ if we're trying to delete the keywordselect
-foreach my $key (keys %ARGS) {
-    if ($key =~ /^KeywordSelect-(\d+)-Delete$/) {
-	my $id = $1;
-	my $keywordselect = new RT::KeywordSelect($session{'CurrentUser'});
-	$keywordselect->Load($id) || push @actions, "Couldn't load keywordSelect";
-	my ($val, $msg) = $keywordselect->SetDisabled(1);
-	if ($val) {
-	    push @actions, 'KeywordSelect disabled.';
-	}	
-	else {
-	    push @actions, $msg;
-	}	
-    }
-}
-# }}}
-# {{{ if we're modifying keyword selects
-my @fields = qw(Name Keyword Single Depth);
-
-while (my $ks = $KeywordSelects->Next) {
-    foreach my $field (@fields) {
-	if (defined ($ARGS{"KeywordSelect-".$ks->Id."-".$field}) &&
-	    ($ARGS{"KeywordSelect-".$ks->Id."-".$field} ne $ks->$field())) {
-	    
-	    my $method = "Set$field";
-	    my ($val, $msg) = $ks->$method($ARGS{"KeywordSelect-".$ks->Id."-".$field});
-	    push @actions, "Keyword Select ". $ks->Name."/$field:".$msg;
-	}	
-    }
-}
-# }}}
-
-</%init>
-
-<%ARGS>
-</%ARGS>
diff --git a/rt/webrt/Admin/Global/Scrips.html b/rt/webrt/Admin/Global/Scrips.html
deleted file mode 100755
index e55f8b3de..000000000
--- a/rt/webrt/Admin/Global/Scrips.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Edit scrips' &>
-<& /Admin/Elements/SystemTabs &>
-
-<& /Elements/ListActions, actions => \@actions &>
-
-<& /Elements/TitleBoxStart, title => "Modify global scrips" &>
-  
-  <FORM METHOD=POST ACTION="Scrips.html">
-
-% if ($Scrips->Count > 0 ) {
-<TABLE>
-<TR>
-<TD>Delete
-</TD>
-<TD>
-</TR>
-
-%   while (my $scrip = $Scrips->Next ) {
-<TR>
-<TD>
-<INPUT TYPE="CHECKBOX" NAME="DeleteScrip-<%$scrip->Id%>">
-</TD>
-<TD>
-<% $scrip->ConditionObj->Name %> 
-<% $scrip->ActionObj->Name %> 
-with template <% $scrip->TemplateObj->Name %>
-</TD>
-</TR>
-%   }
-
-</TABLE>
-
-% }
-Add a scrip which will apply to all queues:
-<ul>
-<li>Condition: <& /Admin/Elements/SelectScripCondition, Name => 'NewScripCondition' &>
-	  Action: <& /Admin/Elements/SelectScripAction, Name => 'NewScripAction' &>
-	  Template: <& /Admin/Elements/SelectTemplate, Name => 'NewScripTemplate' &>
-
-</ul>
-
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit &>
-</FORM>
-<%init>
-my (@actions, $description);
-
-my $Scrips = new RT::Scrips ($session{'CurrentUser'});
-$Scrips->LimitToGlobal();
-
-
-
-
-if ($NewScripAction and $NewScripCondition) {
-    my $NewScrip = new RT::Scrip($session{'CurrentUser'});
-    
-    my ($retval, $msg) = $NewScrip->Create ( ScripAction => $NewScripAction,
-				     ScripCondition => $NewScripCondition,
-				     Stage => 'TransactionCreate',
-				     Queue => 0,
-				     Template => $NewScripTemplate);
-    if (defined $retval) {
-        push @actions, $msg;
-    }
-    else {
-        push @actions, $msg;
-    }
-}
-
-# {{{ deal with modifying and deleting existing scrips
-my ($key );
-foreach $key (keys %ARGS) {
-  # {{{ if we're trying to delete the scrip
-  if ($key =~ /^DeleteScrip-(\d+)/) {
-    my $id = $1;
-    my $scrip = new RT::Scrip($session{'CurrentUser'});
-    $scrip->Load($id);
-    my ($retval, $msg) = $scrip->Delete;
-    if ($retval) {
-      push @actions, "Scrip deleted";
-    }
-    else {
-      push @actions, $msg;
-    }
-  }
-  # }}}
-}
-# }}}
-</%init>
-
-<%ARGS>
-$NewScripCondition => undef
-$NewScripAction => undef
-$NewScripTemplate => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Global/Template.html b/rt/webrt/Admin/Global/Template.html
deleted file mode 100755
index 856d2ee8f..000000000
--- a/rt/webrt/Admin/Global/Template.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<& /Admin/Elements/Header, title => "Modify template ".$TemplateObj->id&>
-<& /Admin/Elements/SystemTabs &>
-<& /Elements/ListActions, actions => \@results &>
-
-<& /Elements/TitleBoxStart, title => $title &>
-
-<FORM METHOD=POST ACTION="Template.html">
-%if ($create ) {
-<INPUT TYPE=HIDDEN NAME=template VALUE="new">
-% } else {
-<INPUT TYPE=HIDDEN NAME=template VALUE="<%$TemplateObj->Id%>">
-% }
-
-%# hang onto the queue id
-<INPUT TYPE=HIDDEN name="Queue" value="<%$Queue%>">
-
-
-Name: <input name="Name" VALUE="<%$TemplateObj->Name%>" SIZE=20><BR>
-Description: <input name="Description" VALUE="<%$TemplateObj->Description%>" SIZE=80><BR>
-
-<TEXTAREA NAME=Content ROWS=25 COLS=80 WRAP=SOFT>
-<%$TemplateObj->Content%></TEXTAREA>
-
-<& /Elements/TitleBoxEnd&>
-<&/Elements/Submit&>
-</FORM>
-
-
-
-<%INIT>
-
-my $TemplateObj = new RT::Template($session{'CurrentUser'});
-my  ($title, @results);
-
-if ($create) {
-  $title = "Create a template";
-}
-
-else {
-  if ($template eq 'new') {
-      my ($val, $msg) =  $TemplateObj->Create(Queue => $Queue, Name => $Name);
-      Abort("Could not create template: $msg") unless ($val);
-     push @results, $msg;
-     $title = 'Created template ' . $TemplateObj->Name(); 
-    }
-    else {
-       $TemplateObj->Load($template) || Abort('No Template');
-      $title = 'Editing template ' . $TemplateObj->Name(); 
-    }
-  
-    
-}
-if ($TemplateObj->Id()) {
-  my @attribs = qw( Description Content Queue Name);
-  my @aresults = UpdateRecordObject( AttributesRef => \@attribs, 
-				     Object => $TemplateObj, 
-				     ARGSRef => \%ARGS);
-  push @results, @aresults;
-}
-</%INIT>
-<%ARGS>
-$Queue => undef
-$template => undef
-$create => undef
-$Name => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Global/Templates.html b/rt/webrt/Admin/Global/Templates.html
deleted file mode 100755
index cf388e521..000000000
--- a/rt/webrt/Admin/Global/Templates.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Edit system templates' &>
-<& /Admin/Elements/SystemTabs &>
-
-<& /Elements/TitleBoxStart, title => 'Edit system templates' &>
-<UL>
-<LI><A href="Template.html?create=1&Queue=0">Create a new template</A><BR><BR>
-
-
-%while  (my $TemplateObj = $Templates->Next) { 
-
-<LI><A HREF="Template.html?template=<%$TemplateObj->id()%>"><%$TemplateObj->id()%>/<%$TemplateObj->Name%>: <%$TemplateObj->Description%></a><BR>
-
-%}
-
-<& /Elements/TitleBoxEnd &>
-<%INIT>
-
-my $Templates = RT::Templates->new($session{'CurrentUser'});
-$Templates->LimitToGlobal();
-
-</%INIT>
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Global/UserRights.html b/rt/webrt/Admin/Global/UserRights.html
deleted file mode 100755
index 351f4b8c6..000000000
--- a/rt/webrt/Admin/Global/UserRights.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Modify System ACLS' &>
-<& /Admin/Elements/SystemTabs &>
-  
-<& /Elements/ListActions, actions => \@results &>
-  <FORM METHOD=POST action="UserRights.html">
-      
-
-<h2>Modify global rights for users</h2>
-<TABLE>
-%	while (my $UserObj = $Users->Next()) {
-  <TR ALIGN=RIGHT> 
-	<TD VALIGN=TOP>
-	  <A HREF="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$UserObj->id%>"><% $UserObj->Name %></A>
-	</TD>
-	<TD>
-	  <& /Admin/Elements/SelectRights, PrincipalObj => $UserObj, 
-	      PrincipalType => 'User',
-	      Scope => 'System' &>
-	  
-	</TD>
-      </TR>
-	
-% }
-    </TABLE>
-    
-    <& /Elements/Submit, Caption => "Be sure to save your changes", Reset => 1 &>
-  </FORM>
-  
-<%INIT>
- 
- my @results =  ProcessACLChanges(\@CheckACL, \%ARGS);
-
- # Find out which users we want to display ACL selects for
- my $Users = new RT::Users($session{'CurrentUser'});
-
- $Users->LimitToPrivileged();
-  
-</%INIT>
-
-<%ARGS>
-@CheckACL => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Global/index.html b/rt/webrt/Admin/Global/index.html
deleted file mode 100755
index 5907ed1e8..000000000
--- a/rt/webrt/Admin/Global/index.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Admin/Global configuration' &>
-<& /Admin/Elements/SystemTabs &>
diff --git a/rt/webrt/Admin/Groups/Members.html b/rt/webrt/Admin/Groups/Members.html
deleted file mode 100644
index 4b0e0d04f..000000000
--- a/rt/webrt/Admin/Groups/Members.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<& /Admin/Elements/Header, Title => "RT/Admin/Edit the group ". $Group->Name &>
-<& /Admin/Elements/GroupTabs, GroupObj => $Group &>
-<& /Elements/ListActions, actions => \@results &>
-
-
-<& /Elements/TitleBoxStart, title => 'Editing membership for group '.$Group->Name &>
-
-<FORM ACTION="<%$RT::WebPath%>/Admin/Groups/Members.html" METHOD=POST>
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Group->Id%>">
-<TABLE WIDTH="100%">
-<TR>
-<TD>
-Add members
-</TD>
-<TD>
-Current members
-</TD>
-</TR>
-
-<TR>
-<TD VALIGN=TOP>
-<& /Admin/Elements/SelectUsers, Name => "AddMembers" &>
-</TD>
-<TD VALIGN=TOP>
-% if ($Group->MembersObj->Count == 0 ) {
-<i>(No members)</i>
-% } else {
-(Check box to delete group member)
-<UL>
-% while (my $member = $Group->MembersObj->Next()) {
-<LI><INPUT TYPE=CHECKBOX Name="DeleteMember-<%$member->UserObj->id%>">
-<%$member->UserObj->Name%> (<%$member->UserObj->RealName%>)
-% }
-% }
-</UL>
-</TD>
-</TR>
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit &>
-</form>
-
-
-<%INIT>
-
-my $Group = new RT::Group($session{'CurrentUser'});
-$Group->Load($id) || Abort('Could not load group');
-
-my (@results);
-
-my $key;
-foreach $key (keys %ARGS) {
-
-if ($key =~ /^DeleteMember-(\d+)$/) {
-    my $id = $1; 
-    my ($val,$msg) = $Group->DeleteMember($id);
-    push (@results, $msg);
-}
-}
-
-# Make sure AddMembers is always an array
-my @AddMembers = (ref $AddMembers eq 'ARRAY') ? @{$AddMembers} : ($AddMembers);
-
-foreach my $member (@AddMembers) {
-    next unless ($member);
-    my ($val, $msg) = $Group->AddMember($member);
-    push (@results, $msg);
-}
-
-
-</%INIT>
-
-<%ARGS>
-$AddMembers => undef
-$id => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Groups/Modify.html b/rt/webrt/Admin/Groups/Modify.html
deleted file mode 100644
index 7104a6937..000000000
--- a/rt/webrt/Admin/Groups/Modify.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<& /Admin/Elements/Header, Title => $title &>
-
-<& /Admin/Elements/GroupTabs, GroupObj => $Group &>
-<& /Elements/ListActions, actions => \@results &>
-
-
-<& /Elements/TitleBoxStart, title => $title &>
-
-<FORM ACTION="<%$RT::WebPath%>/Admin/Groups/Modify.html" METHOD=POST>
-
-%unless ($Group->Id) {
-<INPUT TYPE=HIDDEN NAME=id VALUE="new">
-% } else {
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Group->Id%>">
-% }
-<TABLE>
-<TR><TD ALIGN=RIGHT>
-Name: 
-</TD>
-<TD><INPUT name="Name" value="<%$Group->Name%>"></TD>
-</TR><TR>
-<TD ALIGN=RIGHT>
-Description:</TD><TD COLSPAN=3><INPUT name="Description" value="<%$Group->Description%>" size=60></TD></TR>
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-
-<& /Elements/Submit &>
-</form>
-<%INIT>
-
-my ($title);
-my (@results);
-
-my $Group = new RT::Group($session{'CurrentUser'});
-
-if ($Create) {
-    $title = "Create a new group";
-} 
-
-else {
-    
-    if ($id eq 'new' ) {
-	
-	$Group->Create(Name => "$Name") || Abort ("Group could not be created.");
-	$id = $Group->Id;
-    }
-    else {
-	$Group->Load($id) || Abort('Could not load group');
-    }
-
-
-    if ($id) {
-	$title = "Modify the group ". $Group->Name;
-
-    }	
-
-    # If the create failed
-    else {
-	$title = "Create a new group";
-	$Create = 1;
-    }    
-    
-}
-
-if ($id) {
-    
-    my @fields = qw(Description Name );
-    my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
-					    Object => $Group,
-					    ARGSRef => \%ARGS );
-    push (@results,@fieldresults);
-}
-
-
-</%INIT>
-
-
-<%ARGS>
-$Create => undef
-$Name => undef
-$Description => undef
-$id => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Groups/Rights.html b/rt/webrt/Admin/Groups/Rights.html
deleted file mode 100644
index 5c842a301..000000000
--- a/rt/webrt/Admin/Groups/Rights.html
+++ /dev/null
@@ -1 +0,0 @@
-Not yet implemented....
diff --git a/rt/webrt/Admin/Groups/index.html b/rt/webrt/Admin/Groups/index.html
deleted file mode 100644
index d419e7f73..000000000
--- a/rt/webrt/Admin/Groups/index.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<& /Admin/Elements/Header, Title => 'Admin/Groups' &>
-<& /Admin/Elements/Tabs, current_tab => 'Admin/Groups/' &>
-
-<& /Elements/TitleBoxStart, title => 'Select a group' &>
-
-Pseudogroups:<BR>
-<UL>
-%while ( $Group = $PseudoGroups->Next) {
-<LI><A HREF="Modify.html?id=<%$Group->id%>"><%$Group->Name%></a><BR>
-%}
-
-</UL>
-
-Groups:<BR>
-<UL>
-<LI><A HREF="Modify.html?Create=1">Create a new group</A><BR><BR></LI>
-%while ( $Group = $Groups->Next) {
-<LI><A HREF="Modify.html?id=<%$Group->id%>"><%$Group->Name%></a><BR>
-%}
-</UL>
-
-<& /Elements/TitleBoxEnd &>
-<%INIT>
-my ($Group);
-my $PseudoGroups = new RT::Groups($session{'CurrentUser'});
-$PseudoGroups->LimitToPseudo;
-my $Groups = new RT::Groups($session{'CurrentUser'});
-$Groups->LimitToReal;
-
-</%INIT>
-<%ARGS>
-</%ARGS>
diff --git a/rt/webrt/Admin/KeywordSelects/Modify.html b/rt/webrt/Admin/KeywordSelects/Modify.html
deleted file mode 100644
index e753c6622..000000000
--- a/rt/webrt/Admin/KeywordSelects/Modify.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Admin KeywordSelects' &>
-<& /Admin/Elements/Tabs &>
-
-<& /Admin/Elements/ModifyKeywordSelect, Create=>$Create, id=>$id, Parent=>$Parent, ObjectType=>$ObjectType, ObjectField=>$ObjectField, ObjectValue=>$ObjectValue, Single=>$Single, SingleMagic=>$SingleMagic, Generations=>$Generations &>
-
-<%ARGS>
-$Create => undef
-$id => undef
-$Parent => undef
-$ObjectType => undef
-$ObjectField => undef
-$ObjectValue => undef
-$Single => undef
-$SingleMagic => undef
-$Generations => undef
-</%ARGS>
- 
diff --git a/rt/webrt/Admin/KeywordSelects/index.html b/rt/webrt/Admin/KeywordSelects/index.html
deleted file mode 100644
index ba3da9f0c..000000000
--- a/rt/webrt/Admin/KeywordSelects/index.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Admin KeywordSelects' &>
-<& /Admin/Elements/Tabs, current_tab => 'Admin/KeywordSelects/' &>
-
-A <B>KeywordSelect</B> is a link between a <B>Keyword</B> and a object
-(currently just <B>Tickets</B>), titled by the <I>Name</I> field of the Keyword such that:
-<ul>
-<li>Object display will contain a field, titled with the <I>Name</I> field of
-the <B>Keyword</B> and showing any descendent keywords.
-<li>Object creation for this field will contain a field, titled with the
-<I>Name</I> field of the <B>Keyword</B> and containing the descendents of
-the <B>Keyword</B> as choices.
-<li>Searches for this object type will contain a selection field titled with
-the <I>Name</I> field of the <B>Keyword</B> and containing the descendents
-of the <B>Keyword</B> as choices.
-<TABLE WIDTH=100%>
-
-
-
-  <TD VALIGN=TOP>
-    <h2>Create KeywordSelect</h2>
-  <FORM NAME="ModifyKeywordSelect" METHOD="POST" ACTION="<%$RT::WebPath%>/Admin/KeywordSelects/Modify.html">
-    [<%$title |n %>]
-    <BR>
-      
-      <INPUT TYPE="hidden" NAME="id" VALUE="<% $id %>">
-	Keyword 
-	<SELECT NAME="Parent">
-	  
-%while ( $parent = $parents->Next ) {
-	  
-	  <OPTION VALUE="<% $parent->id %>" <% defined($KeywordSelect->Parent) && $parent->id == $KeywordSelect->Parent ? ' SELECTED' : '' %>><% $parent->Name %></OPTION>
-	  
-% }
-	  
-	</SELECT>
-	<BR>
-	  Object 
-	  <SELECT NAME="ObjectType">
-	    <OPTION SELECTED>Ticket</OPTION>
-	  </SELECT>
-	  <BR>
-	    
-%foreach $queue ( keys %queues ) {
-    addOption("<% $queues{$queue} %>", "<% $queue %>", false, <% $queue == $KeywordSelect->ObjectValue ? 'true' : 'false' %> )
-%}
-  }
-}
-</SCRIPT>
-	    
-	    Limit to <SELECT NAME="ObjectField" onChange="ChangeObjectValue(this)">
-	      <OPTION VALUE="" <% $KeywordSelect->ObjectField ? '' : ' SELECTED' %>>(none)</OPTION>
-	      <OPTION VALUE="Queue" <% $KeywordSelect->ObjectField eq 'Queue' ? ' SELECTED' : '' %>>Queue</OPTION>
-	    </SELECT> 
-	    <SELECT NAME="ObjectValue">
-	      <OPTION VALUE="<% $KeywordSelect->ObjectValue %>">
-		<% $KeywordSelect->ObjectField ? $queues{$KeywordSelect->ObjectValue} : "(n/a)" %></OPTION>
-	    </SELECT><BR>
-	      <INPUT TYPE="hidden" NAME="SingleMagic" VALUE="1">
-		<INPUT TYPE="checkbox" NAME="Single" VALUE="1" <% $KeywordSelect->Single ? ' CHECKED' : '' %>>Allow single selection only<BR>
-		    Limit to <INPUT TYPE="text" NAME="Generations" SIZE="2" VALUE="<% $KeywordSelect->Generations %>"> generations (0 = no limit)<BR>
-			<& /Elements/Submit, Label => $submit &>
-
-</FORM>
-
-<%INIT>
-
-
-my $KeywordSelect = new RT::KeywordSelect($session{CurrentUser});
-  
-my($title, $submit);
-  
-if ( $Create ) {
-      $title = "Create a new KeywordSelect";
-      $submit = "Create";
-      $id = "new";
-} else {
-    if  ( $id eq 'new' ) {
-	$id = $KeywordSelect->Create (
-				      Parent      => $Parent,
-				      ObjectType  => $ObjectType,
-				      ObjectField => $ObjectField,
-				      ObjectValue => $ObjectValue,
-				      Single      => $Single,
-				      Generations => $Generations,
-				     ) or Abort "can't create KeywordSelect";
-    } else {
-	$KeywordSelect->Load($id) || Abort("Can't load keyword id $id");
-	#false laziness
-	$KeywordSelect->SetParent($Parent) if defined($Parent);
-	$KeywordSelect->SetObjectType($ObjectType) if defined($ObjectType);
-	$KeywordSelect->SetObjectField($ObjectField) if defined($ObjectField);
-	$KeywordSelect->SetObjectValue($ObjectValue) if defined($ObjectValue);
-	$KeywordSelect->SetSingle($Single) if defined($SingleMagic);
-	$KeywordSelect->SetGenerations($Generations) if defined($Generations);
-    }
-    $title = "Modify the KeywordSelect <B>". $KeywordSelect->KeywordObj->Name. "</B>";
-    $submit = "Modify";
-    
-}
-  
-  my $parents = new RT::Keywords($session{CurrentUser});
-  $parents->UnLimit;
-  my $parent;
-
-my $queues = new RT::Queues($session{CurrentUser});
-$queues->UnLimit;
-
-my %queues;
-my $queue;
-$queues{$queue->id} = $queue->Name while $queue = $queues->Next;
-
-</%INIT>
-
-<%ARGS>
-$id => undef
-$Create => undef
-$Parent => undef
-$ObjectType => undef
-$ObjectField => undef
-$ObjectValue => undef
-$Single => undef
-$SingleMagic => undef
-$Generations => undef
-</%ARGS>
-
-
-    <& /Admin/Elements/ModifyKeywordSelect, 'Create'=>'1' &>
-  </TD>
-
-  <TD VALIGN=TOP>
-    <H2>Modify KeywordSelect</H2>
-
-    <& /Admin/Elements/SelectModifyKeywordSelect &>
-  </TD>
-</TR>
-
-</TABLE>
diff --git a/rt/webrt/Admin/Keywords/Modify.html b/rt/webrt/Admin/Keywords/Modify.html
deleted file mode 100644
index bb7e2db8c..000000000
--- a/rt/webrt/Admin/Keywords/Modify.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/Tabs &>
-
-
-<& /Elements/TitleBoxStart, title => %$title  &>
-<FORM METHOD="POST" ACTION="<%$RT::WebPath%>/Admin/Keywords/Modify.html">
-<INPUT TYPE="hidden" NAME="id" VALUE="<% $id %>">
-Keyword <INPUT NAME="Name" VALUE="<% $Keyword->Name %>"><BR>
-
-Parent <SELECT NAME="Parent">
-	      <OPTION VALUE=""<% defined($Keyword->Parent) ? '' : ' SELECTED' %>>-</OPTION>
-%while ( $parent = $parents->Next ) {
-	      <OPTION VALUE="<% $parent->id %>"<% defined($Keyword->Parent) && $parent->id == $Keyword->Parent ? ' SELECTED' : '' %>><% $parent->Name %></OPTION>
-%}
-</SELECT>
-
-
-New children of this keyword. one per line.
-<TEXTAREA NAME="Kids" ROWS=4><% $kidstring %></TEXTAREA>
-<BR>
-
-<& /Elements/Submit, Label => $submit &>
-</FORM>
-<& /Elements/TitleBoxEnd &>
-
-<%INIT>
-
-my $Keyword = new RT::Keyword($session{CurrentUser});
-my ($title, $submit, %kids, $kid);
-
-if ( $Create ) {
-    $title = "Create a new Keyword";
-    $submit = "Create";
-    $id = "new";
-    %kids = ();
-    $Parent = ''; #silence 
-} 
-else {
-    if ( $id eq 'new' ) {
-	$id = $Keyword->Create( Name => $Name, Parent => $Parent )
-	  or Abort("can't create keyword Name=>$Name, Parent=>$Parent");
-    } else {
-	$Keyword->Load($id) || Abort("Can't load keyword id $id");
-	
-	#foreach my $field ( grep eval "defined(\$$_)", qw( Name Parent )) {
-	#  eval "\$Keyword->Set(\$field=>\$$field); #sigh
-	#}
-	
-	$Keyword->SetName($Name) if defined($Name);
-	$Keyword->SetParent($Parent) if defined($Parent);
-    }
-
-    $title = "Modify the Keyword <B>". $Keyword->Name. "</B>";
-    $submit = "Modify";
-}
-
-
-my $kids = $Keyword->Children(new RT::Keywords($session{CurrentUser}));
-
-$kids{$kid->Name} = $kid while $kid = $kids->Next;
-
-if ( defined($Kids) ) {
-    my %newkids;
-
-	%newkids = map { $_=>1 } split(/\r/, $Kids);
-
-    }
-    foreach ( grep { ! defined($newkids{$_}) } keys %kids ) {
-	$kids{$_}->Delete;
-	delete $kids{$_};
-    }
-    foreach ( grep { ! defined($kids{$_}) } keys %newkids ) {
-	$kids{$_} = new RT::Keyword($session{CurrentUser});
-	$kids{$_}->Create( Name => $_, Parent => $id )
-	  or Abort("can't create keyword Name=>$_, Parent=>$id");
-    }
-
-}
-
-
-my $parent;
-my $parents = new RT::Keywords($session{CurrentUser});
-$parents->UnLimit;
-
-my $kidstring = join("\r", keys %kids);
-
-</%INIT>
-
-<%ARGS>
-$id => undef
-$Create => undef
-$Name => undef
-$Parent => undef
-$Kids => undef
-
-</%ARGS>
diff --git a/rt/webrt/Admin/Keywords/index.html b/rt/webrt/Admin/Keywords/index.html
deleted file mode 100644
index 12814ec03..000000000
--- a/rt/webrt/Admin/Keywords/index.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<& /Elements/Header, Title => 'Admin/Keywords' &>
-<& /Admin/Elements/Tabs, current_tab => 'Admin/Keywords/' &>
-
-<& /Elements/ListActions, actions => \@Actions &>
-
-<& /Elements/TitleBoxStart, title => 'Keywords' &>
-<a href="<%$RT::WebPath%>/Admin/Keywords/?RootId=<%$Root->Parent%>"><%$Root->Path%></a>
-<UL>
-<FORM METHOD=POST ACTION="index.html">
-<input type=hidden name=RootId value="<%$RootId%>">
-
-
-% while (my $key = $Keywords->Next) {
-    <LI>
-% if ($Edit == $key->id) {
-      <input name="KeyName-<%$key->id%>" value="<%$key->Name%>">
-	  <input type=submit value="Update">
-	    <input type=submit name="Disable-<%$key->id%>" value="Disable">
-% } else {
-	      <A HREF="?RootId=<%$key->id%>"><%$key->Name%></A>
-% if ($key->Disabled) {
-	<input type=submit name="Enable-<%$key->id%>" value="Enable">
-% } else {
-      [<a href="?Edit=<%$key->id%>&RootId=<%$Root->Id%>">edit</a>]
-% }
-% }
-
-
-	  </LI>
-% }
-	  <LI>
-	    <input name="KeyName-New"> <input type=submit value="Add">
-</UL>
-<BR>
-	  <input type="checkbox" name="ShowDisabled"> Include disabled items in listing.
-	<input type=submit value="Go!">
-
-</FORM>
-
-<& /Elements/TitleBoxEnd &>
-<%INIT>
-my (@Actions);
-  
-if ($ARGS{'KeyName-New'}) {
-    my $NewKey = new RT::Keyword($session{'CurrentUser'});
-    my ($val, $msg) = $NewKey->Create( Parent => $RootId, Name => $ARGS{'KeyName-New'});
-    push (@Actions, $msg);
-}
-
-my $arg;
-foreach $arg (keys %ARGS) {
-    if ($arg =~ /^Disable-(\d*)$/) {
-	my $id = $1;
-	my $keyword = new RT::Keyword($session{'CurrentUser'});
-	$keyword->Load($id);
-	my ($val, $msg) = $keyword->SetDisabled(1);
-	push (@Actions, $msg);
-
-
-    }	
-    elsif ($arg =~ /^Enable-(\d*)$/) {
-	my $id = $1;
-	my $keyword = new RT::Keyword($session{'CurrentUser'});
-	$keyword->Load($id);
-	my ($val, $msg) = $keyword->SetDisabled(0);
-	push (@Actions, $msg);
-    }
-    elsif ($arg =~ /^KeyName-(\d*)$/) {
-	my $id = $1;
-	my $keyword = new RT::Keyword ($session{'CurrentUser'});
-	$keyword->Load($id);
-	if ($keyword->Name() ne $ARGS{"$arg"}) {
-	    my ($val, $msg) = $keyword->SetName($ARGS{"$arg"});
-	    push (@Actions, $msg);
-	}	
-	if (($ARGS{"KeyParent-$id"}) && 
-	    ($keyword->Parent ne $ARGS{"KeyParent-$id"})) {
-	    my ($val, $msg) = $keyword->SetParent($ARGS{"KeyParent-$id"});
-	    push (@Actions, $msg);
-	}	
-    }	
-}
-
-
-my $Root = new RT::Keyword($session{'CurrentUser'});
-my $Keywords;
-#If we have a root load it.
-if ($RootId != 0) {
-    $Root->Load($RootId);
-    $Keywords = $Root->Children();
-    
-}
-else {
-    $Keywords = new RT::Keywords($session{'CurrentUser'});
-    $Keywords->LimitToParent(0);
-}
-
-if ($ShowDisabled) {
-    $Keywords->{'find_disabled_rows'} = 1;
-}
-
-
-
-
-</%INIT>
-<%ARGS>
-$RootId => 0
-$Edit => undef
-$ShowDisabled => 0
-</%ARGS>
diff --git a/rt/webrt/Admin/Queues/Create.html b/rt/webrt/Admin/Queues/Create.html
deleted file mode 100755
index b39d6590c..000000000
--- a/rt/webrt/Admin/Queues/Create.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Create a queue' &>
-    <h1>Create a queue</h1>
-
-<& /Admin/Elements/ModifyQueue, QueueObj => $QueueObj &>
-
-<%INIT>
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-$QueueObj->Create(Name => "$Name");
-</%INIT>
-
-<%ARGS>
-$Name => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Queues/GroupRights.html b/rt/webrt/Admin/Queues/GroupRights.html
deleted file mode 100755
index a2c669083..000000000
--- a/rt/webrt/Admin/Queues/GroupRights.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Modify group rights for queue '. $QueueObj->Name &>
-<& /Admin/Elements/QueueTabs, id => $id &>  
-<& /Elements/ListActions, actions => \@results &>
-
-  <FORM METHOD=POST ACTION="GroupRights.html">
-    <INPUT TYPE=HIDDEN NAME=id VALUE="<% $QueueObj->id %>">
-      
-
-
-<& /Elements/TitleBoxStart, title => 'Modify group rights for queue '.$QueueObj->Name &>
-
-<TABLE>
-<TR><TD>Pseudogroups</TD></TR>
-% while (my $GroupObj = $PseudoGroups->Next()) {
-	      
-	      <TR ALIGN=RIGHT> 
-		<TD VALIGN=TOP>
-		  <% $GroupObj->Name %>
-		</TD>
-		<TD>
-	    <& /Admin/Elements/SelectRights, PrincipalObj => $GroupObj, 
-                                   PrincipalType => 'Group',
-	                           QueueObj => $QueueObj,
-                                   Scope => 'Queue' &>
-
-		</TD>
-	      </TR>
-	
-% }
-
-<TR><TD>Groups</TD></TR>
-
-% while (my $GroupObj = $Groups->Next()) {
-	      
-	      <TR ALIGN=RIGHT> 
-		<TD VALIGN=TOP>
-		  <% $GroupObj->Name %>
-		</TD>
-		<TD>
-	    <& /Admin/Elements/SelectRights, PrincipalObj => $GroupObj, 
-                                   PrincipalType => 'Group',
-	                           QueueObj => $QueueObj,
-                                   Scope => 'Queue' &>
-
-		</TD>
-	      </TR>
-	
-% }
-	
-      </TABLE>
-
-      <& /Elements/TitleBoxEnd &>
-      <& /Elements/Submit, Caption => "Be sure to save your changes", Reset => 1 &>
-  </FORM>
-  
-<%INIT>
- 
-#Update the acls.
-my @results =  ProcessACLChanges(\@CheckACL, \%ARGS);
-
-# {{{ Deal with setting up the display of current rights.
-
-# {{{ do basic initialization.
-
-#Define vars used in html above
-my ($GroupObj);
-
-my ($right);
-
-
-if (!defined $id) {
-    Abort("No Queue defined");
-}
-
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-$QueueObj->Load($id) ||
-  Abort("Couldn't load queue $id");
-  
-  # Find out which groups we want to display ACL selects for.
-  my $Groups = new RT::Groups($session{'CurrentUser'});
-  #TODO: limit this to non-pseudogroups
-  $Groups->LimitToReal();
-
-
-  my $PseudoGroups = new RT::Groups($session{'CurrentUser'});
-  #TODO: limit this to non-pseudogroups
-  $PseudoGroups->LimitToPseudo;
-
-
-# }}}
-    
-  
-  # }}}
-
-</%INIT>
-
-<%ARGS>
-$id => undef
-$UserString => undef
-$UserOp => undef
-$UserField => undef
-@CheckACL => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Queues/Keywords.html b/rt/webrt/Admin/Queues/Keywords.html
deleted file mode 100644
index 7809805c5..000000000
--- a/rt/webrt/Admin/Queues/Keywords.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Edit keywords' &>
-<& /Admin/Elements/QueueTabs, id => $QueueObj->Id &>
-
-<& /Elements/ListActions, actions => \@actions &>
-
-<& /Elements/TitleBoxStart, title => $description &>
-
-<h2>Global Keyword Selections</h2>
-<& /Admin/Elements/ListGlobalKeywordSelects &>
-<BR>
-  
-  <FORM METHOD=POST ACTION="Keywords.html">
-    <INPUT TYPE=HIDDEN NAME=id VALUE="<%$id%>">
-
-% if ($KeywordSelects->Count > 0 ) {
-
-
-<h2>Queue Keyword Selections</h2>
-<TABLE>
-<TR><TD>Delete</TD></TR>
-%  while (my $keywordselect = $KeywordSelects->Next ) {
-<TR>
-  <TD><INPUT TYPE="CHECKBOX" NAME="KeywordSelect-<%$keywordselect->Id%>-Delete"></TD>
-  <TD><& /Admin/Elements/SelectKeywordSelect, KeywordSelect => $keywordselect &></TD>
-</TR>
-%  }
-</TABLE>
-% }
-
-Add a keyword selection to this queue:
-%my $ks = new RT::KeywordSelect($session{'CurrentUser'});
-<ul>
-<li><& /Admin/Elements/SelectKeywordSelect, KeywordSelect => $ks, NamePrefix => 'new' &></li>
-</ul>
-
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit &>
-
-</FORM>
-<%init>
-my (@actions);
-
-
-
-my $KeywordSelects = new RT::KeywordSelects ($session{'CurrentUser'});
-unless ($id =~ /^\d+$/) {
-    Abort("$id isn't a valid Queue id.");
-}
-
-unless ($KeywordSelects->LimitToQueue($id)) {
-    Abort("Couldn't load KeywordSelects.");
-}
-
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-$QueueObj->Load($id);
-
-my $description = "Modify Keyword selections for queue '". $QueueObj->Name ."'";
-
-
-
-# {{{ if we're trying to create a new keyword select
-
-if ($ARGS{'KeywordSelect-new-Name'}) {
-    my $NewKeywordSelect = new RT::KeywordSelect($session{'CurrentUser'});
-    
-    my ($retval, $msg) = $NewKeywordSelect->Create ( Keyword => $ARGS{'KeywordSelect-new-Keyword'},
-					     ObjectField => 'Queue',
-					     ObjectType => 'Ticket',
-					     ObjectValue => $QueueObj->Id,
-					     Name => $ARGS{'KeywordSelect-new-Name'},
-					     Single => $ARGS{'KeywordSelect-new-Single'},
-					     Depth => $ARGS{'KeywordSelect-new-Depth'}
-					   );
-	push (@actions, $msg);
-}
-# }}}
-# {{{ if we're trying to delete the keywordselect
-foreach my $key (keys %ARGS) {
-    if ($key =~ /^KeywordSelect-(\d+)-Delete$/) {
-	my $id = $1;
-	my $keywordselect = new RT::KeywordSelect($session{'CurrentUser'});
-	$keywordselect->Load($id) || push @actions, "Couldn't load keywordSelect";
-	my ($val, $msg) = $keywordselect->SetDisabled(1);
-	if ($val) {
-	    push @actions, 'KeywordSelect disabled.';
-	}	
-	else {
-	    push @actions, $msg;
-	}	
-    }
-}
-# }}}
-# {{{ if we're modifying keyword selects
-my @fields = qw(Name Keyword Single Depth);
-
-while (my $ks = $KeywordSelects->Next) {
-    foreach my $field (@fields) {
-	if (defined ($ARGS{"KeywordSelect-".$ks->Id."-".$field}) &&
-	    ($ARGS{"KeywordSelect-".$ks->Id."-".$field} ne $ks->$field())) {
-	    
-	    my $method = "Set$field";
-	    my ($val, $msg) = $ks->$method($ARGS{"KeywordSelect-".$ks->Id."-".$field});
-	    push @actions, "Keyword Select ". $ks->Name."/$field:".$msg;
-	}	
-    }
-}
-# }}}
-
-</%init>
-
-<%ARGS>
-$id => undef         #some identifier that a Queue could 
-
-</%ARGS>
diff --git a/rt/webrt/Admin/Queues/Modify.html b/rt/webrt/Admin/Queues/Modify.html
deleted file mode 100755
index 7a200df92..000000000
--- a/rt/webrt/Admin/Queues/Modify.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Admin/Queue/Basics' &>
-<& /Admin/Elements/QueueTabs, id => $QueueObj->id &>
-<& /Elements/ListActions, actions => \@results &>
-
-
-
-<& /Elements/TitleBoxStart, title => $title &>
-
-
-<FORM ACTION="<%$RT::WebPath%>/Admin/Queues/Modify.html" METHOD=POST>
-%if ($Create ) {
-<INPUT TYPE=HIDDEN NAME=id VALUE="new">
-% } else {
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$QueueObj->Id%>">
-% }
-
-<TABLE>
-<TR><TD ALIGN=RIGHT>
-Queue Name: 
-</TD>
-<TD><INPUT name="Name" value="<%$QueueObj->Name%>"></TD>
-</TR><TR>
-<TD ALIGN=RIGHT>
-Description:</TD><TD COLSPAN=3><INPUT name="Description" value="<%$QueueObj->Description%>" size=60></TD></TR>
-<TR>
-<TD ALIGN=RIGHT>
-Correspondence Address:
-</TD><TD>
-<INPUT name="CorrespondAddress" value="<%$QueueObj->CorrespondAddress%>">
-<BR><font size="-1"><i>(If left blank, will default to <%$RT::CorrespondAddress%></i></font>
-</TD>
-<TD ALIGN=RIGHT>
-
-Comment Address: </TD><TD>
-<INPUT NAME="CommentAddress" value="<%$QueueObj->CommentAddress%>">
-<BR><font size="-1"><i>(If left blank, will default to <%$RT::CommentAddress%></i></font>
-</TD>
-</TR><TR>
-
-<TD ALIGN=RIGHT>
-Priority starts at: 
-</TD><TD><INPUT NAME="InitialPriority" value="<%$QueueObj->InitialPriority %>">
-</TD>
-<TD ALIGN=RIGHT>
-Over time, priority moves toward:
-</TD><TD><INPUT NAME="FinalPriority" value="<%$QueueObj->FinalPriority %>">
-</TD>
-</TR>
-<TR>
-<TD ALIGN=RIGHT>
-Requests should be due in:
-</TD><TD>
-<INPUT NAME="DefaultDueIn" VALUE="<%$QueueObj->DefaultDueIn%>"> days.
-</TD>
-</TR>
-<TR>
-<TD>
-</TD>
-<TD COLSPAN=4><INPUT TYPE=HIDDEN NAME="SetEnabled" VALUE="1">
-<INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>> Enabled (Unchecking this box disables this queue)<BR>
-</TD>
-</TR>
-
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit &>
-</form>
-
-
-
-<%INIT>
-
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-my  ($title, @results, $Disabled, $EnabledChecked);
-
-if ($Create) {
-    $title = "Create a queue";
-}
-
-else {
-    if ($id eq 'new') {
-       my ($val, $msg) =  $QueueObj->Create(Name => $Name);
-       if ($val == 0 ) {
-           Abort("Could not create queue: $msg");
-	}
-	else {
-		push @results, $msg;
-	}    
-     }
-     else {
-        $QueueObj->Load($id) || $QueueObj->Load($Name) || Abort("Couldn't load queue '$Name'");
-    }
-        $title = 'Editing Configuration for queue '.$QueueObj->Name;
-    
-}
-if ($QueueObj->Id()) {
-my @attribs= qw(Description CorrespondAddress CommentAddress Name 
-                InitialPriority FinalPriority DefaultDueIn);
-
-  @results = UpdateRecordObject( AttributesRef => \@attribs, 
-				    Object => $QueueObj, 
-				    ARGSRef => \%ARGS);
-
-}
-
-#we're asking about enabled on the web page but really care about disabled.
-if ($Enabled == 1) {
-    $Disabled = 0;
-}	
-else {
-    $Disabled = 1;
-}
-if  ( ($SetEnabled) and ( $Disabled != $QueueObj->Disabled) ) { 
-    my  ($code, $msg) = $QueueObj->SetDisabled($Disabled);
-    push @results, 'Enabled status '. $msg;
-}
-
-unless ($QueueObj->Disabled()) {
-    $EnabledChecked ="CHECKED";
-}
-</%INIT>
-
-
-<%ARGS>
-$id => undef
-$result => undef
-$Name => undef
-$Create => undef
-$Description => undef
-$CorrespondAddress => undef
-$CommentAddress => undef
-$InitialPriority => undef
-$FinalPriority => undef
-$DefaultDueIn => undef
-$SetEnabled => undef
-$Enabled => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Queues/People.html b/rt/webrt/Admin/Queues/People.html
deleted file mode 100755
index b495400ed..000000000
--- a/rt/webrt/Admin/Queues/People.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<& /Elements/Header, Title => 'Modify people related to queue ' . $QueueObj->Name &>
-<& /Admin/Elements/QueueTabs, id => $id  &>
-
-<& /Elements/ListActions, actions => \@results &>
-
- 
-<FORM METHOD=POST ACTION="People.html">
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$QueueObj->Id%>">
-<& /Elements/TitleBoxStart, title => 'Modify watchers for queue \''.$QueueObj->Name ."'",   width => "100%" &>
-
-<TABLE WIDTH=100%>
-<TR>
-<TD VALIGN=TOP >
-
-<h3>Current watchers</h3>
-<i>(Check box to delete)</i><br><BR>
-
-
-Cc:
-
-<ul>
-
-%# Print out a placeholder if there are none.
-%if ($cc->Count == 0 ) {
-<li><i>none</i>
-% }
-
-%while (my $watcher=$cc->Next) {
-<li>
-<INPUT TYPE=CHECKBOX NAME="DelWatcher<%$watcher->id%>" UNCHECKED>
-%# account
-%if ($watcher->IsUser) { 
-<a href="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$watcher->OwnerObj->id%>">
-<%$watcher->OwnerObj->RealName%></a>:
-%} else {
-Email address:
-%}
-<i><%$watcher->Email%></i>
-%}
-</ul>
-
-
-Administrative Cc:
-<UL>
-%# Print out a placeholder if there are none.
-%if ($admincc->Count == 0 ) {
-<li><i>none</i>
-% }
-
-%while (my $watcher=$admincc->Next) {
-<li><INPUT TYPE=CHECKBOX NAME="DelWatcher<%$watcher->id%>" UNCHECKED>
-%# account
-%if ($watcher->IsUser) { 
-<a href="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$watcher->OwnerObj->id%>">
-<%$watcher->OwnerObj->RealName%></a>:
-%} else {
-Email address:
-%}
-<i><%$watcher->Email%></i>
-%}
-</UL>
-</TD>
-
-<TD VALIGN=TOP>
-<h3>New watchers</h3>
-Find people whose<BR>
-<& /Elements/SelectUsers &>
-
-<BR>
-Add new watchers:<br>
-
-% if ($msg) {
-<i><%$msg%></i>
-% } elsif ($Users) {
-<ul>
-% while (my $u = $Users->Next ) {
-<li><&/Elements/SelectWatcherType, Scope=>'queue', Name => "WatcherTypeUser".$u->Id &> <%$u->Name%>
-(<%$u->RealName%>)
-% }
-</ul>
-% }
-
-</TD>
-</TR>
-</TABLE>
-
-
-
-
-
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit, Label => 'Save Changes', Caption => "If you've updated anything above, be sure to" &>
-</form>
-
-<%INIT>
-
-my ($field, @results, $User, $Users, $watcher, $key, $msg);
-# {{{ Load the queue
-#If we get handed two ids, mason will make them an array. bleck.
-# We want teh first one. Just because there's no other sensible way
-# to deal
-
-
-
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-$QueueObj->Load($id) || Abort("Couldn't load queue '$id'");
-# }}}
-
-# {{{ Delete deletable watchers
-
-foreach $key (keys %ARGS) {
-    if (($key =~ /^DelWatcher(\d*)$/) and
-	($ARGS{$key})) {
-	$RT::Logger->debug("Deleting watcher $1\n");
-	my ($code, $msg) = $QueueObj->DeleteWatcher($1);
-	
-	push @results, $msg;
-    }
-}
-# }}}
-
-# {{{ Add new watchers
-foreach $key (keys %ARGS) {
-    #They're in this order because otherwise $1 gets clobbered :/
-    if ( ($ARGS{$key} =~ /^(AdminCc|Cc)$/) and
-	 ($key =~ /^WatcherTypeUser(\d*)$/) ) {
-	$RT::Logger->debug("Adding a watcher $1 to ".$ARGS{$key}."\n");
-	my ($code, $msg) = 
-	  $QueueObj->AddWatcher(Type => $ARGS{$key},
-				 Owner => $1);
-	push @results, $msg;
-    }
-}
-
-# }}}
-
-
-
-my $admincc = $QueueObj->AdminCc;
-my $cc = $QueueObj->Cc;
- 
-
-if (!$ARGS{'UserString'}) {
-$msg = "No users selected.";
- }
-else {
-    $Users = new RT::Users($session{'CurrentUser'});
-    $Users->Limit(FIELD => $ARGS{'UserField'},
-                 VALUE => $ARGS{'UserString'},
-                 OPERATOR => $ARGS{'UserOp'});
-     }
-</%INIT>
-
-<%ARGS>
-$UserField => 'Name'
-$UserOp => '='
-$UserString => undef
-$Type => undef
-$id => undef
-</%ARGS>
-
diff --git a/rt/webrt/Admin/Queues/Scrips.html b/rt/webrt/Admin/Queues/Scrips.html
deleted file mode 100755
index 95b8c4378..000000000
--- a/rt/webrt/Admin/Queues/Scrips.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Edit scrips' &>
-<& /Admin/Elements/QueueTabs, id => $QueueObj->Id &>
-
-<& /Elements/ListActions, actions => \@actions &>
-
-<& /Elements/TitleBoxStart, title => $description &>
- 
-<h2>Global Scrips</h2>
-<& /Admin/Elements/ListGlobalScrips &>
-<BR> 
-  <FORM METHOD=POST ACTION="Scrips.html">
-    <INPUT TYPE=HIDDEN NAME=id VALUE=<%$id%>>
-<h2>Queue Scrips</h2>
-% if ($Scrips->Count > 0 ) {
-<TABLE>
-<TR>
-<TD>Delete
-</TD>
-<TD>
-</TR>
-% while (my $scrip = $Scrips->Next ) {
-<TR>
-<TD>
-<INPUT TYPE="CHECKBOX" NAME="DeleteScrip-<%$scrip->Id%>">
-</TD>
-<TD>
-<% $scrip->ConditionObj->Name %> 
-<% $scrip->ActionObj->Name %> with template
-<% $scrip->TemplateObj->Name %>
-</TD>
-</TR>
-% }
-</TABLE>
-% }
-<BR>
-<h2>Add a scrip to this queue</h2>
-Condition: <& /Admin/Elements/SelectScripCondition, Name => 'NewScripCondition' &>
-	  Action: <& /Admin/Elements/SelectScripAction, Name => 'NewScripAction' &>
-	  Template: <& /Admin/Elements/SelectTemplate, Name => 'NewScripTemplate', DefaultQueue => $id &>
-
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit &>
-</FORM>
-<%init>
-my (@actions, $description);
-
-my $Scrips = new RT::Scrips ($session{'CurrentUser'});
-unless ($id =~ /^\d+$/) {
-    Abort("$id isn't a valid Queue id.");
-}
-
-unless ($Scrips->LimitToQueue($id)) {
-    Abort("Couldn't load Scrips.");
-        }
-
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-$QueueObj->Load($id);
-
-if ($QueueObj->id) {
-    $description = "Modify scrips for queue '". $QueueObj->Name ."'";
-}
-else {
-    $description = "Modify global scrips";
-}
-
-
-if ($NewScripAction and $NewScripCondition) {
-    my $NewScrip = new RT::Scrip($session{'CurrentUser'});
-    
-    my ($retval, $msg) = $NewScrip->Create ( ScripAction => $NewScripAction,
-				     ScripCondition => $NewScripCondition,
-				     Stage => 'TransactionCreate',
-				     Queue => $id,
-				     Template => $NewScripTemplate);
-    if (defined $retval) {
-        push @actions, $msg;
-    }
-    else {
-        push @actions, $msg;
-    }
-}
-
-# {{{ deal with modifying and deleting existing scrips
-my ($key );
-foreach $key (keys %ARGS) {
-	# {{{ if we're trying to delete the scrip
-    if ($key =~ /^DeleteScrip-(\d+)/) {
-            my $id = $1;
-	        my $scrip = new RT::Scrip($session{'CurrentUser'});
-	        $scrip->Load($id);
-    	    my ($retval, $msg) = $scrip->Delete;
-	    if ($retval) {
-	        push @actions, 'Scrip deleted';
-	    }
-	    else {
-		push @actions, $msg;
-	    }
-	}
-	# }}}
-
-    
-}
-# }}}
-</%init>
-
-<%ARGS>
-$NewScripCondition => undef
-$NewScripAction => undef
-$NewScripTemplate => undef
-$id => undef         #some identifier that a Queue could 
-</%ARGS>
diff --git a/rt/webrt/Admin/Queues/Template.html b/rt/webrt/Admin/Queues/Template.html
deleted file mode 100755
index 61ee418a6..000000000
--- a/rt/webrt/Admin/Queues/Template.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<& /Admin/Elements/Header, title => "Modify template ".$TemplateObj->id&>
-<& /Admin/Elements/QueueTabs, id => $Queue &>
-<& /Elements/ListActions, actions => \@results &>
-
-<& /Elements/TitleBoxStart, title => $title &>
-
-<FORM METHOD=POST ACTION="Template.html">
-%if ($create ) {
-<INPUT TYPE=HIDDEN NAME=template VALUE="new">
-% } else {
-<INPUT TYPE=HIDDEN NAME=template VALUE="<%$TemplateObj->Id%>">
-% }
-
-%# hang onto the queue id
-<INPUT TYPE=HIDDEN name="Queue" value="<%$Queue%>">
-
-
-Name: <input name="Name" VALUE="<%$TemplateObj->Name%>" SIZE=20><BR>
-Description: <input name="Description" VALUE="<%$TemplateObj->Description%>" SIZE=80><BR>
-
-<TEXTAREA NAME=Content ROWS=25 COLS=80 WRAP=SOFT>
-<%$TemplateObj->Content%></TEXTAREA>
-
-<& /Elements/TitleBoxEnd&>
-<&/Elements/Submit&>
-</FORM>
-
-
-
-<%INIT>
-
-my $TemplateObj = new RT::Template($session{'CurrentUser'});
-my  ($title, @results);
-
-if ($create) {
-  $title = "Create a template";
-}
-
-else {
-  if ($template eq 'new') {
-      my ($val, $msg) =  $TemplateObj->Create(Queue => $Queue, Name => $Name);
-      Abort("Could not create template: $msg") unless ($val);
-     push @results, $msg;
-     $title = 'Created template ' . $TemplateObj->Name(); 
-    }
-    else {
-       $TemplateObj->Load($template) || Abort('No Template');
-      $title = 'Editing template ' . $TemplateObj->Name(); 
-    }
-  
-    
-}
-if ($TemplateObj->Id()) {
-  $Queue = $TemplateObj->Queue;
-
-  my @attribs = qw( Description Content Queue Name);
-  my @aresults = UpdateRecordObject( AttributesRef => \@attribs, 
-				     Object => $TemplateObj, 
-				     ARGSRef => \%ARGS);
-  push @results, @aresults;
-}
-</%INIT>
-<%ARGS>
-$Queue => undef
-$template => undef
-$create => undef
-$Name => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Queues/Templates.html b/rt/webrt/Admin/Queues/Templates.html
deleted file mode 100755
index 218d41dc9..000000000
--- a/rt/webrt/Admin/Queues/Templates.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Edit templates for '.$Queue->Name &>
-<& /Admin/Elements/QueueTabs, id => $Queue->id &>
-
-<& /Elements/TitleBoxStart, title => 'Edit templates for '.$Queue->Name &>
-<UL>
-<LI><A href="Template.html?create=1&Queue=<%$Queue->id%>">Create a new template</A><BR><BR>
-
-%while  (my $TemplateObj = $Templates->Next) { 
-
-<LI><A HREF="Template.html?Queue=<%$id%>&template=<%$TemplateObj->id()%>"><%$TemplateObj->id()%>/<%$TemplateObj->Name%>: <%$TemplateObj->Description%></a><BR>
-
-%}
-
-<& /Elements/TitleBoxEnd &>
-<%INIT>
-
-my $Queue = new RT::Queue($session{'CurrentUser'});
-$Queue->Load($id);
-my $Templates = $Queue->Templates;
-
-</%INIT>
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Queues/UserRights.html b/rt/webrt/Admin/Queues/UserRights.html
deleted file mode 100755
index 75d9cb282..000000000
--- a/rt/webrt/Admin/Queues/UserRights.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Modify user rights for queue '. $QueueObj->Name &>
-<& /Admin/Elements/QueueTabs, id => $id &>  
-<& /Elements/ListActions, actions => \@results &>
-
-  <FORM METHOD=POST ACTION="UserRights.html">
-    <INPUT TYPE=HIDDEN NAME=id VALUE="<% $QueueObj->id %>">
-      
-<& /Elements/TitleBoxStart, title => 'Modify user rights for queue '.$QueueObj->Name &>
-      
-<TABLE>
-        
-%	while (my $UserObj = $Users->Next()) {
-  <TR ALIGN=RIGHT> 
-	<TD VALIGN=TOP>
-	    <% $UserObj->Name %>
-		  </TD>
-	  <TD>
-	    <& /Admin/Elements/SelectRights, PrincipalObj => $UserObj,
-		    PrincipalType => 'User',
-		      Scope => 'Queue',
-			QueueObj => $QueueObj &>
-	  </TD>
-	</TR>
-% }
-      </TABLE>
-            
-      <& /Elements/TitleBoxEnd &>
-      <& /Elements/Submit, Caption => "Be sure to save your changes", Reset => 1 &>
-      
-  </FORM>
-  
-<%INIT>
- 
-  #Update the acls.
-  my @results =  ProcessACLChanges(\@CheckACL, \%ARGS);
-
-# {{{ Deal with setting up the display of current rights.
-
-# {{{ do basic initialization.
-
-#Define vars used in html above
-my ($GroupObj);
-
-my ($right);
-
-
-if (!defined $id) {
-    Abort("No Queue defined");
-}
-
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-$QueueObj->Load($id) ||
-  Abort("Couldn't load queue $id");
-
-# Find out which users we want to display ACL selects for
-my $Users = new RT::Users($session{'CurrentUser'});
-$Users->LimitToPrivileged();
-
-# }}}
-    
-  
-# }}}
-    
-</%INIT>
-
-<%ARGS>
-$id => undef
-$UserString => undef
-$UserOp => undef
-$UserField => undef
-@CheckACL => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Queues/index.html b/rt/webrt/Admin/Queues/index.html
deleted file mode 100755
index 52dfb73c8..000000000
--- a/rt/webrt/Admin/Queues/index.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Admin queues' &>
-<& /Admin/Elements/Tabs, current_tab => 'Admin/Queues/' &>
-
-
-<& /Elements/TitleBoxStart, title => 'Select a queue' &>
-
-<TABLE>
-<TR>
-<TD VALIGN=TOP>
-
-<FORM METHOD=POST ACTION="<% $RT::WebPath %>/Admin/Queues/">
-
-<input type="checkbox" name="FindDisabledQueues"> Include disabled queues in listing.
-<BR>
-<div align=right><input type=submit value="Go!"></div> 
-</FORM>
-</TD>
-<TD VALIGN=TOP>
-<UL>
-% if ($session{'CurrentUser'}->HasSystemRight('AdminQueue')) {
-<LI><A HREF="<%$RT::WebPath%>/Admin/Queues/Modify.html?Create=1">Create a new queue</A><BR><BR></LI>
-</UL>
-% }
-
-<%$caption%><BR>
-<UL>
-%if ($queues->Count == 0) {
-<LI> <i>No queues matching search criteria found.</i>
-% }
-%while ( $queue = $queues->Next) {
-<LI><A HREF="Modify.html?id=<%$queue->id%>"><%$queue->Name%></a></LI>
-%}
-
-</UL>
-</TD>
-</TR>
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-
-<%INIT>
-my ($queue, $caption);
-my $queues = new RT::Queues($session{'CurrentUser'});
-$queues->UnLimit();
-
-if ($FindDisabledQueues) {
-	$queues->{'find_disabled_rows'} = 1;
-}
-
-</%INIT>
-<%ARGS>
-$FindDisabledQueues => 0
-</%ARGS>
diff --git a/rt/webrt/Admin/Users/Modify.html b/rt/webrt/Admin/Users/Modify.html
deleted file mode 100755
index b6daed49b..000000000
--- a/rt/webrt/Admin/Users/Modify.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/UserTabs, id => $id, current_subtab => '/Admin/Elements/Modify.html?id='.$id &>
-
-<& /Elements/ListActions, actions => \@results &>
-
-<FORM ACTION="<%$RT::WebPath%>/Admin/Users/Modify.html" METHOD=POST>
-%if ($Create) {
-<INPUT TYPE=HIDDEN NAME=id VALUE="new">
-% } else {
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$UserObj->Id%>">
-% }
-
-<TABLE WIDTH=100% BORDER=0>
-<TR>
-
-<TD VALIGN=TOP ROWSPAN=2>
-<& /Elements/TitleBoxStart, title => 'Identity' &>
-
-Username: <input name="Name" value="<%$UserObj->Name%>"> <b>(required)</b> <BR>
-Email: <input name="EmailAddress" value="<%$UserObj->EmailAddress%>"><BR>
-Real Name: <input name="RealName" value="<%$UserObj->RealName%>"> <BR>
-Nickname: <input name="NickName" value="<%$UserObj->NickName%>">
-<BR>
-Unix login: <input name="Gecos" value="<%$UserObj->Gecos%>">
-<BR>
-Extra info: <textarea name="FreeformContactInfo" cols=20 rows=5><%$UserObj->FreeformContactInfo%></TEXTAREA>
-<& /Elements/TitleBoxEnd &>
-</TD>
-<TD VALIGN=TOP>
-<& /Elements/TitleBoxStart, title => 'Access control' &>
-<INPUT TYPE=HIDDEN NAME="SetEnabled" VALUE="1">
-<INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>>
-Let this user access RT<BR>
-
-
-<INPUT TYPE=HIDDEN NAME="SetPrivileged" VALUE="1">
-<INPUT TYPE=CHECKBOX NAME="Privileged" VALUE="1" <%$PrivilegedChecked%>> Let this user be granted rights<BR>
-		    
-% unless ($RT::WebExternalAuth) {
-<TABLE>
-<TR>
-<TD ALIGN=RIGHT>
-New Password:
-</TD>
-<TD ALIGN=LEFT>
-<input type=password name="Pass1">
-</TD>
-</TR>
-<TR><TD ALIGN=RIGHT>
-Retype Password:
-</TD>
-<TD>
-<input type=password name="Pass2">
-</TD>
-</TR>
-</TABLE>
-% }
-<& /Elements/TitleBoxEnd &>
-</TD>
-<TR>
-
-<TD VALIGN=TOP>
-<& /Elements/TitleBoxStart, title => 'Location' &>
-Organization: <input name="Organization" value="<%$UserObj->Organization%>">
-<BR>
-Address1: <input name="Address1" value="<%$UserObj->Address1%>">
-<BR>
-Address2: <input name="Address2" value="<%$UserObj->Address2%>">
-<BR>
-City: <input name="City" value="<%$UserObj->City%>" size=14>
-
-State: <input name="State" value="<%$UserObj->State%>" size=3>
-
-Zip: <input name="Zip" value="<%$UserObj->Zip%>" size=9>
-<BR>
-Country: <input name="Country" value="<%$UserObj->Country%>">
-<BR>
-
-
-<& /Elements/TitleBoxEnd &>
-</TD>
-</TR>
-<TR>
-<TD COLSPAN=2 VALIGN=TOP>
-
-
-<& /Elements/TitleBoxStart, title => 'Phone numbers' &>
-Home: <input name="HomePhone" value="<%$UserObj->HomePhone%>" size=13>
-
-Work: <input name="WorkPhone" value="<%$UserObj->WorkPhone%>" size=13>
-
-Mobile: <input name="MobilePhone" value="<%$UserObj->MobilePhone%>" size=13>
-
-Pager: <input name="PagerPhone" value="<%$UserObj->PagerPhone%>" size=13>
-<& /Elements/TitleBoxEnd &>
-<BR>
-<& /Elements/TitleBoxStart, title => 'Comments about this user' &>
-<TEXTAREA name="Comments" COLS=80 ROWS=5 WRAP=VIRTUAL><%$UserObj->Comments%></TEXTAREA>
-<& /Elements/TitleBoxEnd &>
-
-
-%if ($UserObj->Privileged) {
-<BR>
-<& /Elements/TitleBoxStart, title => 'Signature' &>
-<TEXTAREA COLS=80 ROWS=5 name="Signature" WRAP=HARD>
-<%$UserObj->Signature%></TEXTAREA>
-<& /Elements/TitleBoxEnd &>
-% }
-
-</TD>
-
-</TR>
-</TABLE>
-
-
-<& /Elements/Submit &>
-</form>
-
-
-<%INIT>
-
-my $UserObj = new RT::User($session{'CurrentUser'});
-my ($title, $PrivilegedChecked, $EnabledChecked, $Disabled, $result, @results);
-
-my ($val, $msg);
-
-if ($Create) {
-    $title = "Create a new user";
-} 
-else {
-
-    if ($id eq 'new') {
-	($val, $msg) = $UserObj->Create( Name => $Name,
-					 EmailAddress => $ARGS{'EmailAddress'}
-				       );
-	if ($val) {
-		push @results, $msg;
-	} else {
-		push @results, 'User could not be created: '. $msg;
-	}	
-	
-    }
-    else {
-	$UserObj->Load($id) || $UserObj->Load($Name) || Abort("Couldn't load user '$Name'");
-	$val = $UserObj->Id();
-    }
-
-    if ($val) {
-	$title = "Modify the user ". $UserObj->Name;
-    }	
-
-    # If the create failed
-    else {
-	$title = "Create a new user";
-	$Create = 1;
-    }    
-
-    
-
-}
-
-
-
-
-# If we have a user to modify, lets try. 
-if ($UserObj->Id) {
-    
-    my @fields = qw(Name Comments Signature EmailAddress FreeformContactInfo 
-		    Organization RealName NickName Lang EmailEncoding WebEncoding 
-		    ExternalContactInfoId ContactInfoSystem Gecos ExternalAuthId 
-		    AuthSystem HomePhone WorkPhone MobilePhone PagerPhone Address1
-		Address2 City State Zip Country 
-		   );
-    
-    my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
-					    Object => $UserObj,
-					    ARGSRef => \%ARGS );
-    push (@results,@fieldresults);
-
-
-# {{{ Deal with special fields: Privileged, Enabled and Password
-if  ( ($SetPrivileged) and ( $Privileged != $UserObj->Privileged) ) {
-my  ($code, $msg) = $UserObj->SetPrivileged($Privileged);
-     push @results, 'Privileged status: '. $msg;
-}
-
-#we're asking about enabled on the web page but really care about disabled.
-if ($Enabled == 1) {
-    $Disabled = 0;
-}	
-else {
-    $Disabled = 1;
-}
-if  ( ($SetEnabled) and ( $Disabled != $UserObj->Disabled) ) { 
-    my  ($code, $msg) = $UserObj->SetDisabled($Disabled);
-    push @results, 'Enabled status '. $msg;
-}
-
-
-#TODO: make this report errors properly
-if ((defined $Pass1) and ($Pass1 ne '') and ($Pass1 eq $Pass2) and (!$UserObj->IsPassword($Pass1))) {
-    my ($code, $msg);
-    ($code, $msg) = $UserObj->SetPassword($Pass1);
-    push @results, 'Password: '. $msg;
-}
-
-# }}}
-}
-
-
-# {{{ Do some setup for the ui
-unless ($UserObj->Disabled()) {
-    $EnabledChecked ="CHECKED";
-}
-
-if ($UserObj->Privileged()) {  
-    $PrivilegedChecked = "CHECKED";
-}
-
-# }}}
-</%INIT>
-
-
-<%ARGS>
-$id => undef
-$Name  => undef
-$Comments  => undef
-$Signature  => undef
-$EmailAddress  => undef
-$FreeformContactInfo => undef
-$Organization  => undef
-$RealName  => undef
-$NickName  => undef
-$Privileged => undef
-$SetPrivileged => undef
-$Enabled => undef
-$SetEnabled => undef
-$Lang  => undef
-$EmailEncoding  => undef
-$WebEncoding => undef
-$ExternalContactInfoId  => undef
-$ContactInfoSystem  => undef
-$Gecos => undef
-$ExternalAuthId  => undef
-$AuthSystem  => undef
-$HomePhone => undef
-$WorkPhone  => undef
-$MobilePhone  => undef
-$PagerPhone  => undef
-$Address1 => undef
-$Address2  => undef
-$City  => undef
-$State  => undef
-$Zip  => undef
-$Country => undef
-$Pass1 => undef
-$Pass2=> undef
-$Create=> undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Users/Prefs.html b/rt/webrt/Admin/Users/Prefs.html
deleted file mode 100755
index 4a9fc5cdf..000000000
--- a/rt/webrt/Admin/Users/Prefs.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<& /Elements/Header, Title=>"User view" &>
-
-<& /Elements/ViewUser, User=>$u &>
-
-%if ($session{CurrentUser} && ($session{CurrentUser}->Id == $id)) {
-	<& /Elements/TitleBoxStart, title => 'Signature'  &>
-<form method=post>
-<input type="hidden" name="id" value=<%$id%>>
-<TEXTAREA COLS=72 ROWS=4 WRAP=HARD NAME="Signature"><% $u->Signature %></TEXTAREA><br><br>
-<input type="submit" value="Update signature">
-</form>
-	  <& /Elements/TitleBoxEnd &>
-	  <form method=post>
-	  Open tickets (from listing) in another window: <input type="checkbox" name="NewWindowOption" <%exists $session{NewWindowOption} && "CHECKED"%>><br>
-	  Open tickets (from listing) in a new window: <input type="checkbox" name="AlwaysNewWindowOption" <%exists $session{AlwaysNewWindowOption} && "CHECKED"%>><br>
-	  <input type="submit" name="NewWindowSetting" value="New window setting">
-	  </form>
-%}
-
-	<& /Elements/TitleBoxStart, title => 'Email'  &>
-<form method=post>
-<input type="hidden" name="id" value="<%$id%>">
-<input name="Email" value="<% $u->EmailAddress %>"><input type="submit" value="Update email">
-</form>
-	  <& /Elements/TitleBoxEnd &>
-	<& /Elements/TitleBoxStart, title => 'Real Name'  &>
-<form method=post>
-<input type="hidden" name="id" value="<%$id%>">
-<input name="RealName" value="<% $u->RealName %>"><input type="submit" value="Update name">
-</form>
-	  <& /Elements/TitleBoxEnd &>
-
-	<& /Elements/TitleBoxStart, title => 'User ID'  &>
-<form method=post>
-<input type="hidden" name="id" value="<%$id%>">
-<input name="Name" value="<% $u->Name %>"><input type="submit" value="Update ID">
-</form>
-	  <& /Elements/TitleBoxEnd &>
-
-%# TODO: alternative email addresses + merging users
-
-<%ARGS>
-$id => $session{CurrentUser} ? $session{CurrentUser}->Id : 0
-$Signature => undef
-$Email => undef
-$RealName => undef
-$Name => undef
-</%ARGS>
-
-<%INIT>
-require RT::User;
-my $u=RT::User->new($session{CurrentUser});
-$u->Load($id) || die "Couldn't load that user ($id)";
-if ($Signature) {
-my ($val, $msg)=$u->SetSignature($Signature);
-$RT::Logger->log(level=>($val ? 'info' : 'error'), message=>$msg);
-}
-
-if ($Email) {
-my ($val, $msg)=$u->SetEmailAddress($Email);
-$RT::Logger->log(level=>($val ? 'info' : 'error'), message=>$msg);
-}
-
-if ($RealName) {
-my ($val, $msg)=$u->SetRealName($RealName);
-$RT::Logger->log(level=>($val ? 'info' : 'error'), message=>$msg);
-}
-
-if ($Name) {
-my ($val, $msg)=$u->SetName($Name);
-$RT::Logger->log(level=>($val ? 'info' : 'error'), message=>$msg);
-}
-
-if ($ARGS{NewWindowSetting}) {
-if ($ARGS{NewWindowOption}) {
-$session{NewWindowOption}=1;
-} else {
-delete $session{NewWindowOption};
-}
-if ($ARGS{AlwaysNewWindowOption}) {
-$session{NewWindowOption}=1;
-$session{AlwaysNewWindowOption}=1;
-} else {
-delete $session{AlwaysNewWindowOption};
-}
-}
-
-</%INIT>
-
-
-
-
-
-
-
-
-
diff --git a/rt/webrt/Admin/Users/Rights.html b/rt/webrt/Admin/Users/Rights.html
deleted file mode 100644
index 3b94f9157..000000000
--- a/rt/webrt/Admin/Users/Rights.html
+++ /dev/null
@@ -1 +0,0 @@
-Placeholder
diff --git a/rt/webrt/Admin/Users/index.html b/rt/webrt/Admin/Users/index.html
deleted file mode 100755
index 383513710..000000000
--- a/rt/webrt/Admin/Users/index.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Admin users' &>
-<& /Admin/Elements/Tabs, current_tab => 'Admin/Users/' &>
-
-
-<& /Elements/TitleBoxStart, title => 'Select a user' &>
-
-<TABLE>
-<TR>
-<TD VALIGN=TOP>
-
-<FORM METHOD=POST ACTION="<% $RT::WebPath %>/Admin/Users/">
-
-Find people whose <& /Elements/SelectUsers &><BR>
-<input type="checkbox" name="FindDisabledUsers"> Include disabled users in search.
-<BR>
-<div align=right><input type=submit value="Go!"></div> 
-</FORM>
-</TD>
-<TD VALIGN=TOP>
-<UL>
-% if ($session{'CurrentUser'}->HasSystemRight('AdminUsers')) {
-<LI><A HREF="<%$RT::WebPath%>/Admin/Users/Modify.html?Create=1">Create a new user</A><BR><BR></LI>
-</UL>
-% }
-
-<%$caption%><BR>
-<UL>
-%if ($users->Count == 0) {
-<LI> <i>No users matching search criteria found.</i>
-% }
-%while ( $user = $users->Next) {
-<LI><A HREF="Modify.html?id=<%$user->id%>"><%$user->Name || '(no name listed)'%></a></LI>
-%}
-
-</UL>
-</TD>
-</TR>
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-
-<%INIT>
-my ($user, $caption);
-my $users = new RT::Users($session{'CurrentUser'});
-
-if ($FindDisabledUsers) {
-	$users->{'find_disabled_rows'} = 1;
-}
-
-unless (defined $UserString) {
-    $users->LimitToPrivileged();
-    $caption = "Privileged users";
-}
-else {
-    $caption = "Users matching search criteria";
-
-  if ($UserString) {
-	$users->Limit( FIELD => $UserField,
-		        OPERATOR => $UserOp,
-		       VALUE => $UserString); 
-
-}
-}
-</%INIT>
-<%ARGS>
-$UserString => undef
-$UserOp => '='
-$UserField => 'Name'
-$IdLike => undef
-$EmailLike => undef
-$FindDisabledUsers => 0
-</%ARGS>
diff --git a/rt/webrt/Admin/index.html b/rt/webrt/Admin/index.html
deleted file mode 100755
index 1ed973f7e..000000000
--- a/rt/webrt/Admin/index.html
+++ /dev/null
@@ -1,4 +0,0 @@
-  <& /Admin/Elements/Header, Title => 'RT Administration' &>
-<& /Admin/Elements/Tabs &>
-
-
diff --git a/rt/webrt/Elements/Checkbox b/rt/webrt/Elements/Checkbox
deleted file mode 100755
index 964c482ba..000000000
--- a/rt/webrt/Elements/Checkbox
+++ /dev/null
@@ -1,17 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/Checkbox,v 1.1 2002-08-12 06:17:08 ivan Exp $
-<INPUT TYPE="Checkbox" NAME ="<%$Name%>" <%$IsChecked%>>
-
-<%ARGS>
-$Name => undef
-$Default => undef
-$True => undef
-$False => undef
-$IsChecked => undef
-</%ARGS>
-
-<%INIT>
-$IsChecked = 
-  ($Default && $Default =~ /checked/i)
-    ? " CHECKED " : "";
-1;
-</%INIT>
diff --git a/rt/webrt/Elements/CreateTicket b/rt/webrt/Elements/CreateTicket
deleted file mode 100644
index 1270f6ebe..000000000
--- a/rt/webrt/Elements/CreateTicket
+++ /dev/null
@@ -1 +0,0 @@
-<FORM ACTION="<% $RT::WebPath%>/Ticket/Create.html"><input type=submit value="New ticket in">&nbsp;<& /Elements/SelectNewTicketQueue &></FORM>
diff --git a/rt/webrt/Elements/CustomHomepageHeader b/rt/webrt/Elements/CustomHomepageHeader
deleted file mode 100644
index e69de29bb..000000000
diff --git a/rt/webrt/Elements/Error b/rt/webrt/Elements/Error
deleted file mode 100755
index ec2cf511f..000000000
--- a/rt/webrt/Elements/Error
+++ /dev/null
@@ -1,23 +0,0 @@
-<& /Elements/Header, Code => $Code, Why => $Why &>
-<& /Elements/Tabs &>
-<& /Elements/TitleBoxStart, title => $Title &>
-<%$Why%>
-<br>
-<font size=-1>
-<%$Details%>
-</font>
-<& /Elements/TitleBoxEnd &>
-</body>
-</HTML>
-
-
-<%args>
-$Code => undef
-$Details => undef
-$Title => "RT Error"
-$Why => "the calling component did not specify why"
-</%args>
-
-<%INIT>
-$RT::Logger->error("WebRT: $Why ($Details)");
-</%INIT>
diff --git a/rt/webrt/Elements/Footer b/rt/webrt/Elements/Footer
deleted file mode 100755
index 776c219bb..000000000
--- a/rt/webrt/Elements/Footer
+++ /dev/null
@@ -1,10 +0,0 @@
-% if ($Debug) {
-<HR>
-<b>Time to display: <%time - $m->{'rt_base_time'} %></b>
-% }
-</BODY>
-</HTML>
-
-<%ARGS>
-$Debug => 0
-</%ARGS>
diff --git a/rt/webrt/Elements/GotoTicket b/rt/webrt/Elements/GotoTicket
deleted file mode 100644
index 21d2bcdf8..000000000
--- a/rt/webrt/Elements/GotoTicket
+++ /dev/null
@@ -1 +0,0 @@
-<FORM ACTION="<%$RT::WebPath%>/Ticket/Display.html"><input type=submit value="Goto ticket">&nbsp;<input size=5 name=id></FORM>
diff --git a/rt/webrt/Elements/Header b/rt/webrt/Elements/Header
deleted file mode 100755
index 471331be2..000000000
--- a/rt/webrt/Elements/Header
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<HEAD>
-<TITLE><%$Title%></TITLE>
-<META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
-
-%# TODO this gets called from error. but I have no idea what it might
-%# be used for. can we whack it?  -jesse
-% if ($Code) {
-<META HTTP-EQUIV VALUE="<%$Code%> <%$Why%>">
-% }
-% if ($Refresh > 0) {
-<META HTTP-EQUIV="REFRESH" CONTENT="<%$Refresh%>">
-% }
-
-<link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/webrt.css" type="text/css">
-</HEAD>
-<BODY BGCOLOR="<%$BgColor%>">
-% if ($ShowBar) {
-<TABLE BORDER=0 WIDTH=100% CELLSPACING=0 BGCOLOR="#993333">
-<TR VALIGN=TOP>
-<TD><IMG SRC="<%$RT::LogoURL%>" alt="RT"></TD>
-<TD VALIGN=CENTER ALIGN=LEFT>
-<font size=+2 color="#ffffff">
-<B>
-<%$Title%>
-</B>
-</font>
-</TD>
-<TD ALIGN=RIGHT>
-<font color="#ffffff">
-% if ($session{'CurrentUser'}) {
-Signed in as <b><%$session{'CurrentUser'}->Name%></b>.<BR>
-% if ($session{'CurrentUser'}->HasSystemRight('ModifySelf')) {
-[<A class='inverse' HREF="<%$RT::WebPath%>/User/Prefs.html" >Preferences</A>] 
-% }
-% unless ($RT::WebExternalAuth) { 
-[<A class='inverse' HREF="<%$RT::WebPath%>/NoAuth/Logout.html">Logout</a>]
-% }
-% } else {
-Not logged in.
-% }
-</font>
-</TD>
-</TR>
-</TABLE>
-
-<BR>
-% }
-<%ARGS>
-$Title => 'WebRT'
-$Code => undef
-$Refresh => undef
-$Why => undef
-$BgColor => '#ffffff'
-$ShowBar => 1
-</%ARGS>
-<%INIT>
-$Title = "RT/$RT::rtname: ".$Title;
-</%INIT>
-
diff --git a/rt/webrt/Elements/ListActions b/rt/webrt/Elements/ListActions
deleted file mode 100755
index 3fc9b0ba5..000000000
--- a/rt/webrt/Elements/ListActions
+++ /dev/null
@@ -1,14 +0,0 @@
-% if (@actions ) {
-<& /Elements/TitleBoxStart, title => 'Results' &>
-<UL>
-% foreach my $action (@actions) {
-% next unless ($action);
-<LI><%$action%></LI>
-% }
-</UL>
-<& /Elements/TitleBoxEnd &>
-<BR>
-% }
-<%ARGS>
-@actions => undef
-</%ARGS>
diff --git a/rt/webrt/Elements/Login b/rt/webrt/Elements/Login
deleted file mode 100755
index 27ec98281..000000000
--- a/rt/webrt/Elements/Login
+++ /dev/null
@@ -1,69 +0,0 @@
-<& /Elements/Header, Title=>"Login" , &>
-
-<DIV ALIGN=CENTER>
-% if ($Error) {
-<& /Elements/TitleBoxStart, title => 'Error' &>
-<% $Error %>
-<& /Elements/TitleBoxEnd &>
-% }
-<BR>
-<& /Elements/TitleBoxStart, width=> "40%", titleright => "RT $RT::VERSION for $RT::rtname", title => 'Login' ,
-contentbg=>"#cccccc" &>
-
-
-% unless ($RT::WebExternalAuth) {
-<FORM METHOD=POST >
-<TABLE BORDER=0 WIDTH=100%>
-<TR ALIGN=RIGHT>
-<TD ALIGN=RIGHT>Username:</TD><TD ALIGN=LEFT><input name=user value="<%$user%>"></TD></TR>
-<TR><TD ALIGN=RIGHT>Password:</TD><TD ALIGN=LEFT><input type=password name=pass></TD></TR>
-<TR><TD colspan=2 align=right>
-<input type=submit Value="Login">
-</TD></TR>
-</TABLE>
-<&/Elements/TitleBoxEnd&>
-% # From mason 1.0.1 forward, this doesn't work. in fact, it breaks things.
-% if (0) {
-% # The code below iterates through everything in the passed in arguments
-% # Preserving all the old parameters
-% # This would be easier, except mason is 'smart' and calls multiple values
-% # arrays rather than multiple hash keys
-% my $key; my $val;
-% foreach $key (keys %ARGS) {
-%  if (($key ne 'user') and ($key ne 'pass')) {
-% 	if (ref($ARGS{$key}) =~ /ARRAY/) {
-% 		foreach $val (@{$ARGS{$key}}) {
-<input type=hidden name="<%$key %>" value="<% $val %>">
-% 		}
-% 	}
-%	else {
-<input type="hidden" name="<% $key %>" value="<% $ARGS{$key} %>">
-% 	}
-% }
-%}
-% }
-</FORM>
-% }
-</DIV>
-
-<BR>
-<!-- TODO: not yet implemented
-If you've forgotten your username or password, RT can <A
-href="/NoAuth/Reminder.html">send you a reminder</a>.
--->
-<BR>
-<HR>
-RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is
-distributed under <a href="http://www.gnu.org/copyleft/gpl.html">Version 2 of the GNU General Public License.</a>
-
-
-<%ARGS>
-$user => ""
-$pass => undef
-$goto => undef
-$Error => undef
-</%ARGS>
-
-<%INIT>
-SetContentType('text/html');
-</%INIT>
diff --git a/rt/webrt/Elements/MessageBox b/rt/webrt/Elements/MessageBox
deleted file mode 100644
index aa081a380..000000000
--- a/rt/webrt/Elements/MessageBox
+++ /dev/null
@@ -1,30 +0,0 @@
-<TEXTAREA COLS=<%$Width%> ROWS=15 WRAP=HARD NAME="<%$Name%>"><% $Default %><%$message%><%$signature%></TEXTAREA>
-<%INIT>
-
-my ($message);
-
-if ($MessageURI) {
-	my $code;
-	($code, $Default)=RT::Link->GetContent($MessageURI);
-}
-if ($QuoteTransaction) {
-    my $transaction=RT::Transaction->new($session{'CurrentUser'});
-    $transaction->Load($QuoteTransaction);
-    $message=$transaction->Content(Quote => 1);
-}
-
-my $signature = '';
-if ($session{'CurrentUser'}->UserObj->Signature) {
-	$signature = "-- \n".$session{'CurrentUser'}->UserObj->Signature;
-}
-
-</%INIT>
-<%ARGS>
-$QuoteTransaction => undef
-$Name => 'Content'
-$Default => ''
-$DefaultURI => undef
-$Width => 72
-$MessageURI => undef
-</%ARGS>
-
diff --git a/rt/webrt/Elements/MyRequests b/rt/webrt/Elements/MyRequests
deleted file mode 100644
index 67817296c..000000000
--- a/rt/webrt/Elements/MyRequests
+++ /dev/null
@@ -1,45 +0,0 @@
-<& /Elements/TitleBoxStart, title => "25 highest priority tickets I requested..." &>
-<TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>
-<TR>
-<TH align=right>#</TH>
-<TH align=left>Subject</TH>
-<TH align=left>Queue</TH>
-<TH align=left>Status</TH>
-<TH align=left>Owner</TH>
-<TH>&nbsp;</TH>
-</TR>
-% while (my $Ticket = $MyTickets->Next) {
-<TR>
-<TD ALIGN=RIGHT>
-<%$Ticket->Id%>
-</TD>
-<TD>
-<A HREF="<% $RT::WebPath %>/Ticket/Display.html?id=<%$Ticket->Id%>">
-<%$Ticket->Subject || '[no subject]'%>
-</A>
-</TD>
-<TD>
-<%$Ticket->QueueObj->Name%>
-</TD><TD>
-<%$Ticket->Status%>
-</TD><TD>
-<%$Ticket->OwnerObj->Name%>
-</TD><TD ALIGN=RIGHT>
-[<A HREF="<% $RT::WebPath %>/Ticket/Display.html?id=<%$Ticket->Id%>">Display</A>]
-</TD>
-</TR>
-% }
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-
-
-<%INIT>
-my $MyTickets;
-$MyTickets = new RT::Tickets ($session{'CurrentUser'});
-$MyTickets->LimitRequestor(VALUE => $session{'CurrentUser'}->EmailAddress);
-$MyTickets->LimitStatus(VALUE => "open");
-$MyTickets->LimitStatus(VALUE => "new");
-$MyTickets->OrderBy(FIELD => 'Priority', ORDER => 'DESC');
-$MyTickets->RowsPerPage(25);
-
-</%INIT>
diff --git a/rt/webrt/Elements/MyTickets b/rt/webrt/Elements/MyTickets
deleted file mode 100644
index 64a2ba7cc..000000000
--- a/rt/webrt/Elements/MyTickets
+++ /dev/null
@@ -1,43 +0,0 @@
-<& /Elements/TitleBoxStart, title => "25 highest priority tickets I own..." &>
-<TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>
-<TR>
-<TH ALIGN=RIGHT>#</TH>
-<TH ALIGN=LEFT>Subject</TH>
-<TH ALIGN=LEFT>Queue</TH>
-<TH ALIGN=LEFT>Status</TH>
-<TH ALIGN=LEFT>&nbsp;</TH>
-</TR>
-% while (my $Ticket = $MyTickets->Next) {
-<TR>
-<TD ALIGN=RIGHT>
-<%$Ticket->Id%>
-</TD>
-<TD>
-<A HREF="<% $RT::WebPath %>/Ticket/Display.html?id=<%$Ticket->Id%>">
-<%$Ticket->Subject || '[no subject]'%>
-</A>
-</TD>
-<TD>
-<%$Ticket->QueueObj->Name%>
-</TD><TD>
-<%$Ticket->Status%>
-</TD>
-<TD ALIGN=RIGHT>
-[<A HREF="<% $RT::WebPath %>/Ticket/Update.html?id=<%$Ticket->Id%>">Update</A>]
-</TD>
-</TR>
-% }
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-
-
-<%INIT>
-my $MyTickets;
-$MyTickets = new RT::Tickets ($session{'CurrentUser'});
-$MyTickets->LimitOwner(VALUE => $session{'CurrentUser'}->Id);
-$MyTickets->LimitStatus(VALUE => "open");
-$MyTickets->LimitStatus(VALUE => "new");
-$MyTickets->OrderBy(FIELD => 'Priority', ORDER => 'DESC');
-$MyTickets->RowsPerPage(25);
-
-</%INIT>
diff --git a/rt/webrt/Elements/Quicksearch b/rt/webrt/Elements/Quicksearch
deleted file mode 100644
index d44c996fa..000000000
--- a/rt/webrt/Elements/Quicksearch
+++ /dev/null
@@ -1,41 +0,0 @@
-<& /Elements/TitleBoxStart, title => "Find new/open tickets", titleright => "<A class='inverse' href=\"$RT::WebPath/Search/Listing.html?NewSearch=1\">Advanced Search</A>" &>
-
-<TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>                       
-<tr>                                                                          
-       <th align=left>Queue</th>                                         
-       <th align=left><font size=-1>New</font></th>
-       <th align=left><font size=-1>Open</font></th>          
-       <th align=left><font size=-1>Stalled</font></th>          
-</tr>
-
-<%PERL>
-while (my $queue = $Queues->Next) {
-     $Tickets->ClearRestrictions;                                           
-     $Tickets->LimitStatus(VALUE => "open");                                
-     $Tickets->LimitQueue(VALUE => $queue->id, OPERATOR => '=');            
-     my $open = $Tickets->Count();
-
-     $Tickets->ClearRestrictions;                                           
-     $Tickets->LimitStatus(VALUE => "new");
-     $Tickets->LimitQueue(VALUE => $queue->id, OPERATOR => '=');            
-     my $new = $Tickets->Count();
-
-     $Tickets->ClearRestrictions; 
-     $Tickets->LimitStatus(VALUE => "stalled");
-     $Tickets->LimitQueue(VALUE => $queue->id, OPERATOR => '=');            
-     my $stalled = $Tickets->Count();
-</%PERL>
-<TR><TD><A HREF="<% $RT::WebPath%>/Search/Listing.html?ValueOfStatus=open&ValueOfStatus=new&StatusOp=%3D&QueueOp=%3D&ValueOfQueue=<%$queue->Id%>&RowsPerPage=50&NewSearch=1"><%$queue->Name%></a></TD>
-<TD><%$new%></TD>
-<TD><%$open%></TD>
-<TD><%$stalled%></TD>
-</TR>
-% }
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-
-<%INIT>
-my $Queues = new RT::Queues($session{'CurrentUser'}); 
-$Queues->UnLimit();
-my $Tickets = new RT::Tickets ($session{'CurrentUser'});
-</%INIT>
diff --git a/rt/webrt/Elements/Refresh b/rt/webrt/Elements/Refresh
deleted file mode 100644
index 6949d8c24..000000000
--- a/rt/webrt/Elements/Refresh
+++ /dev/null
@@ -1,22 +0,0 @@
-<SELECT NAME="<%$Name%>">
-<OPTION VALUE="-1"
-%unless ($Default) {
- SELECTED
-%}
->Don't refresh this page.</OPTION>
-%foreach my $value (@refreshevery) {
-<OPTION VALUE="<%$value%>"
-% if ($value == $Default) {
-SELECTED 
-% }
->Refresh this page every <%$value/60%> minutes.
-%}
-</SELECT>
-
-<%INIT>
-my @refreshevery = qw(120 300 600 1200 3600 7200);
-</%INIT>
-<%ARGS>
-$Name => undef
-$Default => undef
-</%ARGS>
diff --git a/rt/webrt/Elements/Section b/rt/webrt/Elements/Section
deleted file mode 100755
index 067311d9e..000000000
--- a/rt/webrt/Elements/Section
+++ /dev/null
@@ -1,11 +0,0 @@
-<TABLE WIDTH=100%>
-<TR>
-<TD>
-<font size=+4><%$title%></font>
-</TD>
-</TR>
-</TABLE>
-
-<%ARGS>
-$title => undef
-</%ARGS>
\ No newline at end of file
diff --git a/rt/webrt/Elements/SelectBoolean b/rt/webrt/Elements/SelectBoolean
deleted file mode 100755
index 93b78ce76..000000000
--- a/rt/webrt/Elements/SelectBoolean
+++ /dev/null
@@ -1,24 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectBoolean,v 1.1 2002-08-12 06:17:08 ivan Exp $
-<SELECT NAME ="<%$Name%>">
-<OPTION VALUE="<%$TrueVal%>" <%$TrueDefault%>><%$True%></OPTION>
-<OPTION VALUE="<%$FalseVal%>" <%$FalseDefault%>><%$False%></OPTION>
-</SELECT>
-
-<%ARGS>
-$Name => undef
-$True => "is"
-$Default => 'true'
-$TrueVal => 1
-$FalseVal => 0
-$False => "isn't"
-</%ARGS>
-
-<%INIT>
-my ($TrueDefault, $FalseDefault);
-if ($Default && $Default !~ /true/i) {
-	$FalseDefault = "SELECTED";
-}
-else {
-	$TrueDefault = "SELECTED";
-}
-</%INIT>
diff --git a/rt/webrt/Elements/SelectDate b/rt/webrt/Elements/SelectDate
deleted file mode 100755
index 6fafbf170..000000000
--- a/rt/webrt/Elements/SelectDate
+++ /dev/null
@@ -1,25 +0,0 @@
-<INPUT NAME="<%$Name%>" VALUE="<%$Default%>" size=16> 
-
-<%init>
-unless ((defined $Default) or 
-	($current <= 0)) {
-	my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
-                                            localtime($current);
-        $Default = sprintf("%04d-%02d-%02d %02d:%02d",                         
-                           $year+1900,$mon+1,$mday,                            
-                           $hour,$min);   
-}
-
-unless ($Name) {
-	$Name = $menu_prefix. "_Date";
-}
-</%init>
-
-<%args>
-
-$ShowTime => undef
-$menu_prefix=>''
-$current=>time
-$Default => undef
-$Name => undef
-</%args>
diff --git a/rt/webrt/Elements/SelectDateRelation b/rt/webrt/Elements/SelectDateRelation
deleted file mode 100755
index c5849c8e2..000000000
--- a/rt/webrt/Elements/SelectDateRelation
+++ /dev/null
@@ -1,14 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectDateRelation,v 1.1 2002-08-12 06:17:08 ivan Exp $
-<SELECT NAME ="<%$Name%>">
-<OPTION VALUE="&lt;"><%$Before%></OPTION>
-<OPTION VALUE="="><%$On%></OPTION>
-<OPTION VALUE="&gt;"><%$After%></OPTION>
-</SELECT>
-
-<%ARGS>
-$Name => undef
-$Default => undef
-$Before => 'Before'
-$On => 	'On'
-$After => 'After'
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectDateType b/rt/webrt/Elements/SelectDateType
deleted file mode 100755
index 65c0e9b4b..000000000
--- a/rt/webrt/Elements/SelectDateType
+++ /dev/null
@@ -1,12 +0,0 @@
-<SELECT NAME="<%$Name%>">
-<OPTION VALUE="Created">Created</OPTION>
-<OPTION VALUE="Started">Started</OPTION>
-<OPTION VALUE="Resolved">Resolved</OPTION>
-<OPTION VALUE="Told">Last Contacted</OPTION>
-<OPTION VALUE="LastUpdated">Last Updated</OPTION>
-<OPTION VALUE="StartsBy">Starts By</OPTION>
-<OPTION VALUE="Due">Due</OPTION>
-</SELECT>
-<%ARGS>
-$Name => 'DateType'
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectEqualityOperator b/rt/webrt/Elements/SelectEqualityOperator
deleted file mode 100755
index f93dc1af2..000000000
--- a/rt/webrt/Elements/SelectEqualityOperator
+++ /dev/null
@@ -1,18 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectEqualityOperator,v 1.1 2002-08-12 06:17:08 ivan Exp $
-<SELECT NAME ="<%$Name%>">
-% while (my $option = shift @Options) {
-% my $value = shift @Values;
-<OPTION VALUE="<%$value%>"
-% if ($Default eq '$value') {
-SELECTED
-% }
-><%$option%></OPTION>
-% }
-</SELECT>
-
-<%ARGS>
-$Name => undef
-@Options => ('less than', 'equal to', 'greater than', 'not equal to')
-@Values => qw(< = > !=)
-$Default => undef
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectKeyword b/rt/webrt/Elements/SelectKeyword
deleted file mode 100644
index c4bd9e1aa..000000000
--- a/rt/webrt/Elements/SelectKeyword
+++ /dev/null
@@ -1,38 +0,0 @@
-<SELECT NAME=<%$Name%> <%$Size%> <%$Multiple%>>
-<OPTION VALUE="">-</OPTION>
-<OPTION VALUE="NULL">(empty)</OPTION>
-%   foreach my $kid ( keys %{$Descendents} ) {
-<OPTION VALUE="<% $kid %>" 
-%if ($kid == $Default) {
-SELECTED
-%}
-><% $Descendents->{$kid} %></OPTION>
-% }
-</SELECT>
-
-
-<%INIT>
-
-unless (defined $KeywordObj) {
-    $KeywordObj = new RT::Keyword($session{'CurrentUser'});
-    $KeywordObj->Load($Root);
-}
-my $Descendents = $KeywordObj->Descendents();
-
-if ($Multiple) {
-	$Multiple = "MULTIPLE";
-}
-if ($Size) {
-	$Size="SIZE=$Size";
-}	
-
-
-</%INIT>
-<%ARGS>
-$Multiple => undef
-$Size => undef
-$Name => 'Keyword'
-$KeywordObj => undef
-$Root => 0
-$Default => undef
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectKeywordOptions b/rt/webrt/Elements/SelectKeywordOptions
deleted file mode 100644
index f56dfe52c..000000000
--- a/rt/webrt/Elements/SelectKeywordOptions
+++ /dev/null
@@ -1,18 +0,0 @@
-<PERL>
-while (my $keyword = $keywords->Next()) {
-    my ($selected);
-    if $keyword->Id == $default
-</PERL>
-<OPTION VALUE="<%$keyword->id%>"><% '-' x $depth %><%$keyword->Name%></OPTION>
-<& SelectKeywordOptions, depth => ($depth+1), root => $keyword->id &>
-%}
-<%INIT>
-
-my $keywords = new RT::Keywords($session{'CurrentUser'});
-$keywords->LimitToParent($root);
-
-</%INIT>
-<%ARGS>
-$root => undef
-$depth => 0
-</%ARGS>
\ No newline at end of file
diff --git a/rt/webrt/Elements/SelectLinkType b/rt/webrt/Elements/SelectLinkType
deleted file mode 100644
index 22cde3dff..000000000
--- a/rt/webrt/Elements/SelectLinkType
+++ /dev/null
@@ -1,16 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectLinkType,v 1.1 2002-08-12 06:17:08 ivan Exp $
-
-<SELECT NAME ="<%$Name%>">
-% foreach ('MemberOf', 'DependsOn', 'RefersTo') { # TODO: Merging!
-<OPTION VALUE="<%$_%>"><%$_%></OPTION>
-% }
-</SELECT>
-
-<%ARGS>
-$Name => "LinkType"
-$Default => undef
-</%ARGS>
-
-<%INIT>
-# TODO handle Default
-</%INIT>
diff --git a/rt/webrt/Elements/SelectMatch b/rt/webrt/Elements/SelectMatch
deleted file mode 100644
index 7f3a94fae..000000000
--- a/rt/webrt/Elements/SelectMatch
+++ /dev/null
@@ -1,31 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectMatch,v 1.1 2002-08-12 06:17:08 ivan Exp $
-<SELECT NAME ="<%$Name%>">
-<OPTION VALUE="LIKE" <%$LikeDefault%>><%$Like%></OPTION>
-<OPTION VALUE="NOT LIKE" <%$NotLikeDefault%>><%$NotLike%></OPTION>
-<OPTION VALUE="=" <%$TrueDefault%>><%$True%></OPTION>
-<OPTION VALUE="!=" <%$FalseDefault%>><%$False%></OPTION>
-</SELECT>
-
-<%ARGS>
-$Name => undef
-$Like => 'contains'
-$NotLike => "doesn't contain"
-$True => 'is'
-$False => "isn't"
-$Default => undef
-</%ARGS>
-<%INIT>
-my ($TrueDefault, $FalseDefault, $LikeDefault, $NotLikeDefault);
-if ($Default && $Default !~ /true/i) {
-	$FalseDefault = "SELECTED";
-}
-elsif ($Default && $Default !~ /false/i) {
-	$TrueDefault = "SELECTED";
-} 
-elsif ($Default && $Default !~ /notlike/i) {
-	$NotLikeDefault = "SELECTED";
-}
-else {
-	$LikeDefault = "SELECTED";
-}
-</%INIT>
diff --git a/rt/webrt/Elements/SelectNewTicketQueue b/rt/webrt/Elements/SelectNewTicketQueue
deleted file mode 100755
index 9f5cd2871..000000000
--- a/rt/webrt/Elements/SelectNewTicketQueue
+++ /dev/null
@@ -1,9 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectNewTicketQueue,v 1.1 2002-08-12 06:17:08 ivan Exp $
-<& SelectQueue, Name => $Name, Verbose => $Verbose, Default => $Default,
-	ShowAllQueues => 0, ShowNullOption => 0 &>
-
-<%ARGS>
-$Name => 'Queue'
-$Verbose => undef
-$Default => undef
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectOwner b/rt/webrt/Elements/SelectOwner
deleted file mode 100755
index 59ebf3631..000000000
--- a/rt/webrt/Elements/SelectOwner
+++ /dev/null
@@ -1,22 +0,0 @@
-<SELECT NAME="<%$Name%>">
-<OPTION VALUE="">-</OPTION>
-<OPTION <% ($RT::Nobody->Id() == $Default) && "SELECTED" %> VALUE="<%$RT::Nobody->Id%>"><%$RT::Nobody->Name%></OPTION>
-%while ( my $User = $Users->Next())  {
-% if ((!defined $QueueObj) || ($User->HasQueueRight(Right => 'OwnTicket', QueueObj => $QueueObj, TicketObj => $TicketObj))){
-<OPTION VALUE="<%$User->Id()%>" <% ($User->Id() == $Default) && "SELECTED" %>><%$User->Name()%></OPTION>
-% }
-%}
-</SELECT>
-
-<%INIT>
-my $Users = RT::Users->new($session{CurrentUser});
-$Users->LimitToPrivileged;
-</%INIT>
-
-<%ARGS>
-$QueueObj => undef
-$Name => undef
-$Default => undef
-$User => undef
-$TicketObj => undef
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectQueue b/rt/webrt/Elements/SelectQueue
deleted file mode 100755
index d63b17b4e..000000000
--- a/rt/webrt/Elements/SelectQueue
+++ /dev/null
@@ -1,38 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectQueue,v 1.1 2002-08-12 06:17:08 ivan Exp $
-
-% if ($Lite) {
-<INPUT NAME="<%$Name%>" size=25 DEFAULT="<%$d->Name%>">
-% } else {
-<SELECT NAME ="<%$Name%>">
-% if ($ShowNullOption) {
-<OPTION VALUE="">-</OPTION>
-% }
-% while (my $queue=$q->Next) {
-% if ($ShowAllQueues || $queue->CurrentUserHasRight('CreateTicket')) {
-<OPTION VALUE="<%$queue->Id%>" <%($queue->Id == $Default) && 'SELECTED'%>><%$queue->Name%>
-%   if (($Verbose) and ($queue->Description) ){
-(<%$queue->Description%>)
-%  }
-</OPTION>
-% }
-% }
-</SELECT>
-% }
-<%ARGS>
-$ShowNullOption => 1
-$ShowAllQueues => 1
-$Name => undef
-$Verbose => undef
-$Default => undef
-$Lite => 0
-</%ARGS>
-
-<%INIT>
-
-my $q=new RT::Queues($session{'CurrentUser'});
-$q->UnLimit;
-
-my $d = new RT::Queue($session{'CurrentUser'});
-$d->Load($Default);
-
-</%INIT>
diff --git a/rt/webrt/Elements/SelectResultsPerPage b/rt/webrt/Elements/SelectResultsPerPage
deleted file mode 100644
index 0699c6868..000000000
--- a/rt/webrt/Elements/SelectResultsPerPage
+++ /dev/null
@@ -1,22 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectResultsPerPage,v 1.1 2002-08-12 06:17:08 ivan Exp $
-
-%# TODO: Better default handling
-
-<SELECT NAME ="<%$Name%>">
-% foreach my $value (@values) {
-<OPTION VALUE="<%$value%>" <% $value == $Default && 'SELECTED' %>>
-<% shift @labels %>
-</OPTION>
-% }
-</SELECT>
-
-<%INIT>
-my @values = qw(0 10 25 50 100);
-my @labels = qw(Unlimited 10 25 50 100);
-</%INIT>
-<%ARGS>
-
-$Name => undef
-$Default => 50
-
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectSortOrder b/rt/webrt/Elements/SelectSortOrder
deleted file mode 100644
index 6dc900631..000000000
--- a/rt/webrt/Elements/SelectSortOrder
+++ /dev/null
@@ -1,18 +0,0 @@
-<SELECT NAME="<%$Name%>">
-%foreach my $order (@orders) {
-<OPTION VALUE="<%$order%>" <%$order eq $Default && 'SELECTED' %>>
-<% shift @order_names %>
-</OPTION>
-% }
-</SELECT>
-
-<%INIT>
-my @orders = qw (ASC DESC);
-my @order_names = qw (Ascending Descending);
-
-</%INIT>
-
-<%ARGS>
-$Name => 'SortOrder'
-$Default => 'ASC'
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectStatus b/rt/webrt/Elements/SelectStatus
deleted file mode 100755
index 92df7c619..000000000
--- a/rt/webrt/Elements/SelectStatus
+++ /dev/null
@@ -1,17 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectStatus,v 1.1 2002-08-12 06:17:08 ivan Exp $
-
-<SELECT NAME ="<%$Name%>">
-<OPTION VALUE="">-</OPTION>
-%foreach my $status (@status) {
-<OPTION VALUE="<%$status%>" <%($Default eq $status) && 'SELECTED'%>><%$status%></OPTION>
-% }
-</SELECT>
-<%ONCE>
-my $queue = new RT::Queue($session{'CurrentUser'});
-my @status = $queue->StatusArray();
-</%ONCE>
-<%ARGS>
-$Name => undef
-$Default => undef
- 
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectTicketSortBy b/rt/webrt/Elements/SelectTicketSortBy
deleted file mode 100644
index 02021decc..000000000
--- a/rt/webrt/Elements/SelectTicketSortBy
+++ /dev/null
@@ -1,15 +0,0 @@
-<SELECT NAME="<%$Name%>">
-% foreach my $field (@sortfields) {
-<OPTION VALUE="<%$field%>" <%$field eq $Default && 'SELECTED'%>><%$field%></OPTION>
-% }
-</SELECT>
-
-<%INIT>
-my $tickets = new RT::Tickets($session{'CurrentUser'});
-my @sortfields = $tickets->SortFields();
-
-</%INIT>
-<%ARGS>
-$Name => 'SortTicketsBy'
-$Default => 'id'
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectUsers b/rt/webrt/Elements/SelectUsers
deleted file mode 100755
index f517d3510..000000000
--- a/rt/webrt/Elements/SelectUsers
+++ /dev/null
@@ -1,8 +0,0 @@
-<select name="UserField">
-<option value="Name">User Id
-<option value="EmailAddress">Email
-<option value="RealName">Name
-<option value="Organization">Organization
-</select>
-<& /Elements/SelectMatch, Name=> 'UserOp' &>
-<input size=8 name="UserString">
diff --git a/rt/webrt/Elements/SelectWatcherType b/rt/webrt/Elements/SelectWatcherType
deleted file mode 100644
index 5a855192c..000000000
--- a/rt/webrt/Elements/SelectWatcherType
+++ /dev/null
@@ -1,26 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectWatcherType,v 1.1 2002-08-12 06:17:08 ivan Exp $
-%# portions Copyright 2000 Tobias Brox <tobix@fsck.com>
-%# Request Tracker is Copyright 1996-2000 Jesse Vincent <jesse@fsck.com>
-
-<SELECT NAME ="<%$Name%>">
-<OPTION VALUE="none">-</OPTION>
-%# Make nice options:
-%for my $option (@types) {
-<OPTION VALUE="<%$option%>" <%$option eq $Default && "SELECTED"%>><%$option%></OPTION>
-%}
-</SELECT>
-
-<%INIT>
-my @types;
-if ($Scope =~ 'queue') {
-   @types = qw(Cc AdminCc);
-}
-else { 
-   @types = qw(Requestor Cc AdminCc);
-}
-</%INIT>
-<%ARGS>
-$Default=>undef
-$Scope => 'ticket'
-$Name => 'WatcherType'
-</%ARGS>
diff --git a/rt/webrt/Elements/ShadedBox b/rt/webrt/Elements/ShadedBox
deleted file mode 100755
index 334b57975..000000000
--- a/rt/webrt/Elements/ShadedBox
+++ /dev/null
@@ -1,5 +0,0 @@
-<div align="left"><span class=label><%$title |n %></span><br><b><%$content |n %></b></div>
-<%ARGS>
-$title => undef
-$content => "&nbsp;"
-</%ARGS>
diff --git a/rt/webrt/Elements/Submit b/rt/webrt/Elements/Submit
deleted file mode 100755
index 7b75e9e98..000000000
--- a/rt/webrt/Elements/Submit
+++ /dev/null
@@ -1,44 +0,0 @@
-<TABLE WIDTH=100% BGCOLOR="<%$color%>" CELLSPACING=0 BORDER=0 CELLPADDING=0 >
-<TR>
-% if ($Reset) {
-<TD>
-<FONT COLOR=#ffd800 >
-<INPUT TYPE=RESET VALUE="<%$ResetLabel%>">
-</FONT>
-</TD>
-%}
-<TD>
-&nbsp;
-</TD>
-<TD ALIGN=RIGHT VALIGN=CENTER>
-
-<FONT COLOR=#ffd800>
-
-% if ($AlternateLabel) {
-<B><%$AlternateCaption%>
-<INPUT TYPE=SUBMIT
-%if ($Name) {
-NAME="<%$Name%>"
-%}
-VALUE='<%$AlternateLabel%>'></B>
-% }
-
-<B><%$Caption%>
-<INPUT TYPE=SUBMIT
-%if ($Name) {
-NAME="<%$Name%>"
-% }
- VALUE='<%$Label%>'></B></FONT>
-</TD>
-</TR>
-</TABLE>
-<%ARGS>
-$color => "#336699"
-$Caption => undef
-$AlternateCaption => undef
-$AlternateLabel => undef
-$Label => 'Submit'
-$Name => undef
-$Reset => undef
-$ResetLabel => 'Reset'
-</%ARGS>
diff --git a/rt/webrt/Elements/Tabs b/rt/webrt/Elements/Tabs
deleted file mode 100755
index 6eacf391a..000000000
--- a/rt/webrt/Elements/Tabs
+++ /dev/null
@@ -1,133 +0,0 @@
-<TABLE WIDTH=100%>
-    <TR>
-      <TD VALIGN=TOP>
-	<TABLE cellspacing=1>
-	  <TR>
-% foreach $tab (sort keys %{$toptabs}) {
-	    <TD ALIGN=CENTER>
-	      <font size=+1>
-		[<A 
-% if ($current_toptab eq $toptabs->{$tab}->{'path'}) {
-class='currenttab'
-% } 
-	HREF="<%$RT::WebPath%>/<% $toptabs->{$tab}->{'path'}%>"><% $toptabs->{$tab}->{'title'}%></A>]
-
-
-	      </font>
-	    </TD>
-% }
-	  </TR>
-	</TABLE>
-<BR>
-% if ($tabs_scalar) {
-<% $tabs_scalar |n%>
-% }
-% if ($tabs) {
-	
-	<TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0>	
-	  <TR>
-% foreach $tab (sort keys %{$tabs}) {
-	    <TD ALIGN=CENTER VALIGN=TOP>
-[<A 
-% if ($current_tab eq $tabs->{$tab}->{'path'}) {
-class='currenttab' 
-% } 
-HREF="<%$RT::WebPath%>/<% $tabs->{$tab}->{'path'}%>"><% $tabs->{$tab}->{'title'}%></A>]</TD>
-%}
-	  </TR>
-	</TABLE>
-%}
-
-<BR>
-% if ($subtabs_scalar) {
-<% $subtabs_scalar |n%>
-% }
-% if ($subtabs) {
-	<TABLE>	
-	  <TR>
-% foreach $tab (sort keys %{$subtabs}) {
-	    <TD ALIGN=CENTER>
-	      [<A HREF="<%$RT::WebPath%>/<% $subtabs->{$tab}->{'path'}%>"><% $subtabs->{$tab}->{'title'}%></A>]
-	    </TD>
-%}
-	  </TR>
-	</TABLE>
-%}
-      </TD>
-      <TD VALIGN=TOP ALIGN=RIGHT>
-<TABLE>
-<TR>
-
-% foreach $action (sort keys %{$topactions}) {
-<TD><font size=-1><%$topactions->{"$action"}->{'html'} |n %></font></TD>
-% }
-</TR>
-</TABLE>
-	
-
-	
-% if ($actions) {
-<TABLE><TR>
-%  foreach $action (sort keys %{$actions}) {
-<TD>
-<FONT SIZE=-1>
-% if ($actions->{"$action"}->{'html'}) {
-<%$actions->{"$action"}->{'html'} |n%>
-% } else {
-<A HREF="<%$RT::WebPath%>/<% $actions->{$action}->{'path'}%>"><% $actions->{$action}->{'title'}%></A>
-% }
-</FONT>
-</TD>
-%  }
-</TR></TABLE>
-% }
-	
-% if ($subactions_scalar) {
-<% $subactions_scalar |n%>
-% }
-% if ($subactions) {
-<BR>|&nbsp;
-%  foreach $action (sort keys %{$subactions}) {
-<%$subactions->{"$action"}->{'html'} |n%>&nbsp;|
-%  }
-% }
-      </TD>
-    </TR>
-  </TABLE>
-
-
-<%INIT>
-my ($tab, $action);
-my $toptabs = {    A => { title => 'Home',
-                           path => '',
-                         },
-                    B => { title => 'Search',
-                        path => 'Search/Listing.html'
-                      },
-
-                    D => { title => 'Configuration',
-                           path => 'Admin/'
-                         }
-                 };
-                    
-
-my $topactions = {
-	A => { html => $m->scomp('/Elements/CreateTicket')	
-		},
-	B => { html => $m->scomp('/Elements/GotoTicket') 
-		}
-	};
-</%INIT>
-<%ARGS>
-$current_toptab =>  "none"
-$current_tab => "none"
-$current_subtab => "none"
-$tabs => undef
-$tabs_scalar => undef
-$subtabs => undef
-$actions => undef
-$subactions => undef
-$subtabs_scalar => undef
-$subactions_scalar => undef
-</%ARGS>
-
diff --git a/rt/webrt/Elements/TitleBoxEnd b/rt/webrt/Elements/TitleBoxEnd
deleted file mode 100755
index bdd41065a..000000000
--- a/rt/webrt/Elements/TitleBoxEnd
+++ /dev/null
@@ -1,10 +0,0 @@
-</TD></TR></TABLE>
-</TD>
-</TR>
-<TR><TD COLSPAN=4><IMG SRC="<%$RT::WebImagesURL%>spacer.gif" height=1 ALT="&nbsp;"width=1></TD>
-</TABLE>
-<%ARGS>
-$title => undef
-$content => undef
-</%ARGS>
-
diff --git a/rt/webrt/Elements/TitleBoxStart b/rt/webrt/Elements/TitleBoxStart
deleted file mode 100755
index 6d0f1f91a..000000000
--- a/rt/webrt/Elements/TitleBoxStart
+++ /dev/null
@@ -1,20 +0,0 @@
-<TABLE CLASS="<%$class%>" BGCOLOR="<%$color%>" CELLSPACING=0 BORDER=0 CELLPADDING=0 WIDTH="<%$width%>">
-<TR><TD ROWSPAN=2><IMG SRC="<%$RT::WebImagesURL%>spacer.gif" width=1 height=1 ALT=""></TD>
-<TD valign=middle align=left bgcolor="<%$color%>">&nbsp;<font size=-1 color="#ffffff"><b><% $title_href && "<A CLASS=\"$title_class\" HREF=\"$title_href\">"|n%><%$title |n %><%  $title_href && "</A>" |n%></b></font></TD>
-<TD  ALIGN="right" valign=middle bgcolor="<%$color%>"><FONT color="#ffffff" SIZE=-1><%$titleright |n %></FONT>&nbsp;</TD>
-<TD ROWSPAN=2><IMG SRC="<%$RT::WebImagesURL%>spacer.gif" width=1 height=1 ALT=""></TD></TR>
-<TR><TD COLSPAN=2 bgcolor="<%$contentbg%>" valign=top align=left WIDTH=100%>
-<TABLE CELLPADDING=2 WIDTH=100%><TR><TD>
-<%ARGS>
-$width => "100%"
-$class => undef
-
-$title_href => undef
-$title => undef
-$title_class => undef
-
-$titleright_href => undef
-$titleright => undef
-$contentbg => "#dddddd"
-$color => "#336699"
-</%ARGS>
diff --git a/rt/webrt/Elements/ViewUser b/rt/webrt/Elements/ViewUser
deleted file mode 100644
index 92446e6ef..000000000
--- a/rt/webrt/Elements/ViewUser
+++ /dev/null
@@ -1,29 +0,0 @@
-
-<& /Elements/TitleBoxStart, 
-	title => "<a class='inverse' href=\"$RT::WebPath/Search/Listing.html?LimitRequestorById=1&IdOfRequestor=".$User->id."\">Tickets from $name</a>",
-	titleright=> "<a class='inverse' href=\"$RT::WebPath/EditUserComments.html?id=".$User->id."\">Comments about $name</a>" &>
-<TABLE WIDTH="100%">
-<tr>
-<td halign=left valign=top>
-%while (my $w=$tickets->Next) {
-<%$w->Id%>: <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$w->id%>"><%$w->Subject%></a> (<%$w->Status%>)<BR>
-%}
-</td>
-<td align=right valign=top>
-	<% ($User->Comments || "No comment entered about this user") %>
-</tr>
-</table>
-<& /Elements/TitleBoxEnd &>
-
-<%ARGS>
-$User=>undef
-</%ARGS>
-
-<%INIT>
-my $name=$User->RealName || $User->EmailAddress;	
-
-my $tickets = new RT::Tickets($session{'CurrentUser'});
-$tickets->LimitRequestor(VALUE => $User->EmailAddress);
-
-
-</%INIT>
diff --git a/rt/webrt/Elements/dayMenu b/rt/webrt/Elements/dayMenu
deleted file mode 100755
index 6591b05d2..000000000
--- a/rt/webrt/Elements/dayMenu
+++ /dev/null
@@ -1,19 +0,0 @@
-<%doc>-------------------------------------------------------------------
-dayMenu: Display a pulldown menu of days of the month (1 to 31)
-
-Optional arguments:
-$menu_name - Name of menu, defaults to 'day'
-$current - Selected day value (1 to 31)
--------------------------------------------------------------------</%doc>
-
-<select name="<% $menu_name %>">
-<option value="-1">-
-% foreach my $day (1..31) {
-<option value="<% $day %>" <% $day==$current ? "selected" : "" %>><% sprintf("%02d",$day) %>
-% }
-</select>
-
-<%args>
-$menu_name=>'day'
-$current=>undef
-</%args>
diff --git a/rt/webrt/Elements/monthMenu b/rt/webrt/Elements/monthMenu
deleted file mode 100755
index b9a71d3f9..000000000
--- a/rt/webrt/Elements/monthMenu
+++ /dev/null
@@ -1,37 +0,0 @@
-<%doc>-------------------------------------------------------------------
-monthMenu: Display a pulldown menu of months
-
-Optional arguments:
-$menu_name - Name of menu, defaults to 'month'
-$current - Selected month value (1 to 12)
-$format - Choice of month labels:
-   'full'    (January, February, ...)
-   'short'   (Jan, Feb, ...)
-   'numeric' (1, 2, ...)
-  Defaults to 'full'. The format only affects appearance; the menu
-  values are always numeric.
--------------------------------------------------------------------</%doc>
-
-<select name="<% $menu_name %>">
-<option value="-1">-
-% foreach my $month (1..12) {
-<option value="<% $month %>" <% $month==$current ? "selected" : "" %>>
-%   if ($format eq 'full') {
-<% $month_names[$month-1] %>
-%   } elsif ($format eq 'short') {
-<% substr($month_names[$month-1],0,3) %>
-%   } elsif ($format eq 'numeric') {
-<% sprintf("%02d",$month) %>
-%   }
-% }
-</select>
-
-<%init>
-my @month_names = qw(January February March April May June July August September October November December);
-</%init>
-
-<%args>
-$menu_name=>'month'
-$current=>undef
-$format=>'full'
-</%args>
diff --git a/rt/webrt/Elements/yearMenu b/rt/webrt/Elements/yearMenu
deleted file mode 100755
index 4a0e7a772..000000000
--- a/rt/webrt/Elements/yearMenu
+++ /dev/null
@@ -1,24 +0,0 @@
-<%doc>-------------------------------------------------------------------
-yearMenu: Display a pulldown menu of years.
-
-Optional arguments:
-$menu_name - Name of menu, defaults to 'year'
-$current - Selected year value
-$min - Minimum year appearing in menu; defaults to current year
-$max - Maximum year appearing in menus; defaults to $min plus 10.
--------------------------------------------------------------------</%doc>
-
-<select name="<% $menu_name %>">
-<option value="-1">-
-% foreach my $year ($min..$max) {
-<option value="<% $year %>" <% $year==$current ? "selected" : "" %>>
-<% $year %>
-% }
-</select>
-
-<%args>
-$menu_name=>'year'
-$current=>(localtime)[5]+1900
-$min=>(localtime)[5]+1900-1
-$max=>$min+10
-</%args>
diff --git a/rt/webrt/NoAuth/Logout.html b/rt/webrt/NoAuth/Logout.html
deleted file mode 100755
index a00ae9675..000000000
--- a/rt/webrt/NoAuth/Logout.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>RT: Logout</TITLE>
- <META HTTP-EQUIV="Refresh" CONTENT="0;URL=<%$RT::WebPath%>/">
-</HEAD>
-<BODY>
-<p>You have been logged out of RT.
-
-
-<br>
-<br>
-<A HREF="<%$RT::WebPath%>/">You're welcome to login again</a>
-
-
-<%PERL>
-if (defined %session) {
-	%session = undef;
-}
-$m->abort();
-</%PERL>
-
-
diff --git a/rt/webrt/NoAuth/Reminder.html b/rt/webrt/NoAuth/Reminder.html
deleted file mode 100755
index a814a912f..000000000
--- a/rt/webrt/NoAuth/Reminder.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<& /Elements/Header, title => 'Password Reminder' &>
-
-Not yet implemented.
diff --git a/rt/webrt/NoAuth/images/rt.jpg b/rt/webrt/NoAuth/images/rt.jpg
deleted file mode 100644
index a137a932b..000000000
Binary files a/rt/webrt/NoAuth/images/rt.jpg and /dev/null differ
diff --git a/rt/webrt/NoAuth/images/spacer.gif b/rt/webrt/NoAuth/images/spacer.gif
deleted file mode 100644
index 5bfd67a2d..000000000
Binary files a/rt/webrt/NoAuth/images/spacer.gif and /dev/null differ
diff --git a/rt/webrt/NoAuth/webrt.css b/rt/webrt/NoAuth/webrt.css
deleted file mode 100755
index a71d05720..000000000
--- a/rt/webrt/NoAuth/webrt.css
+++ /dev/null
@@ -1,102 +0,0 @@
-BODY, TD {font-family: Helvetica, Arial, sans-serif}
-TD {border-color: #cccccc }
-
-BLOCKQUOTE.message {
-	font-size: 80%;
-	font-family: "Helvetica", sans-serif;
-}
-
-
-BODY {
-  color: #000;
-  background: #FFFFFF;
-  font-family: "Helvetica", sans-serif;
-
-
-}
-
-TD, TH { /* ns workaround */
-  font-family: "Helvetica", sans-serif;
-}
-
-TR.oddline { 
-    background-color : #eeeeee;
-}
-
-H1, H2, H3 { 
-  margin-top: 0.2em;
-  color: #336699;
-  font-family: "Helvetica", sans-serif;
-
-  clear: both;
-}
-
-
-DIV.endmatter { margin-left: -7% }
-
-
-
-A { font-weight: bold; 
-      		color: #000000;
-	    /* border: none -- breaks NS 4.x */ }
-
-.currenttab { background-color: #cccccc; }
-
-.inverse { color: #ffffff; }
-
-
-
-A:link IMG, A:visited IMG { border-style: none }
-
-A IMG { color: white } /* The only way to hide the border in NS 4.x */
-
-.hide {
-  display: none;
-  color: white;
-}
-
-SPAN.date { font-size: 0.8em }
-
-SPAN.attribution {
-  font-weight: bold
-}
-
-SPAN.label { font-size: 0.8em; 
-}
-
-BLOCKQUOTE {
-  font-style: italic;
-  /* color: #990; */
-}
-
-ADDRESS { 
-  text-align: right;
-  font-weight: bold;
-  font-style: italic 
-}
-
-BLOCKQUOTE P {			/* Try to avoid space above the attribution */
-  margin-bottom: 0;
-}
-BLOCKQUOTE ADDRESS {
-  margin: 0;
-}
-
-.motto, .motto A {font: italic 120%/1.3 Georgia, serif; color: #990}
-
-.emphasized {
-  font-weight: bold
-}
-
-/* Why o why does this break Netscape 4.x?
-IMG { 
-  border: none
-}
-*/
-
-P.map-also { font-style: italic; margin-left: 15%; text-align: right }
-
-.oddline { 
-background-color : #eeeeee;
-
-}
diff --git a/rt/webrt/Search/Bulk.html b/rt/webrt/Search/Bulk.html
deleted file mode 100755
index ac688d7cd..000000000
--- a/rt/webrt/Search/Bulk.html
+++ /dev/null
@@ -1,186 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Search/Attic/Bulk.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2001 Jesse Vincent <jesse@fsck.com>
-<& /Elements/Header, Title => "Bulk ticket update" &>
-<& /Elements/Tabs &>
-
-<& /Elements/ListActions, actions => \@results &>
-
-<FORM METHOD=POST>
-<TABLE WIDTH=100% border=0 cellpadding=3 CELLSPACING=0>
-<TR>
-<TH>Update</TH>
-%foreach my $col (@cols) {
-% my $colalias = $col;
-% $colalias =~ s/(Obj\-\>|)(Name|AsString)//;
-
-<TH ><% $colalias %>&nbsp;</TH>
-%}
-</TR>
-
-<%PERL>
-
-my $i;
-
-
-      
-$session{'tickets'}->RedoSearch();
-while (my $Ticket = $session{'tickets'}->Next) {
- $i++;
- if ($i % 2) {
-     $bgcolor = "#dddddd";
- }
- else {
-     $bgcolor = "#ffffff";
- }
-      </%PERL>
-<TR bgcolor="<%$bgcolor%>">
-<TD><input type=checkbox name="UpdateTicket<%$Ticket->Id%>" CHECKED></TD>
-%# The ticket view is controlled by config.pm, WebOptions
-%foreach my $col (@cols) {
-<TD>
-% if ($col eq 'id') {
-<A HREF="<% $RT::WebPath%>/Ticket/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id()%></A>
-% }
-%else {
-<% eval "\$Ticket->$col()" %>&nbsp;
-%}
-</TD>
-%}
-</TR>
-%}
-
-
-
-</TABLE>
-
-<HR>
-
-
-<& /Elements/TitleBoxStart, title => 'Update selected tickets' &>
-<TABLE>
-<TR>
-<TD VALIGN=TOP>
-<UL>
-<li> Make Owner <& /Elements/SelectOwner, Name => "Owner" &>
-(<input type=checkbox name="ForceOwnerChange"> Force change)
-<li> Add Requestor <INPUT Name="AddRequestor" SIZE=20>
-<li> Remove Requestor <INPUT Name="DeleteRequestor" SIZE=20>
-<li> Add Cc <INPUT Name="AddCc" SIZE=20>
-<li> Remove Cc <INPUT Name="DeleteCc" SIZE=20>
-<li> Add AdminCc <INPUT Name="AddAdminCc" SIZE=20>
-<li> Remove AdminCc <INPUT Name="DeleteAdminCc" SIZE=20>
-</UL>
-</TD>
-<TD VALIGN=TOP>
-<UL>
-<li> Make subject <INPUT Name="Subject" SIZE=20>
-<li> Make priority <INPUT Name="Priority" SIZE=4>
-<li> Make queue <& /Elements/SelectQueue, Name => "Queue" &>
-
-<li>Make Status <& /Elements/SelectStatus, Name => "Status" &>
-
-
-
-<li> Make date Starts <& /Elements/SelectDate, Name => "Starts_Date", ShowTime => 0, Default => '' &>
-<li> Make date Started <& /Elements/SelectDate, Name => "Started_Date", ShowTime => 0, Default => '' &>
-<li> Make date Told <& /Elements/SelectDate, Name => "Told_Date", ShowTime => 0, Default => '' &>
-<li> Make date Due <& /Elements/SelectDate, Name => "Due_Date", ShowTime => 0, Default => '' &>
-<li> Make date Resolved <& /Elements/SelectDate, Name => "Resolved_Date", ShowTime => 0, Default => '' &>
-
-
-% while ( my $KeywordSelect = $KeywordSelects->Next ) {
-
-<li> Add <% $KeywordSelect->Name %> <& /Elements/SelectKeyword, Name => "AddToKeywordSelect".$KeywordSelect->id, KeywordObj => $KeywordSelect->KeywordObj &>
-<li> Remove <% $KeywordSelect->Name %> <& /Elements/SelectKeyword, Name => "DeleteFromKeywordSelect".$KeywordSelect->id, KeywordObj => $KeywordSelect->KeywordObj &>
-% }
-
-</UL>
-
-
-</TD>
-</TR>
-</table>
-<& /Elements/TitleBoxEnd&>
-<& /Elements/TitleBoxStart, title => 'Add comments or replies to selected tickets' &>
-<table>
-<tr><td align=right>Update Type:</td>
-<td><select name="UpdateType">
-  <option value="private" >Comments (not sent to requestors)</option>
-<option value="response" >Response to requestors</option>
-</select> 
-</td></tr>
-<tr><td align=right>Subject:</td><td> <input name="UpdateSubject" size=60 value=""></td></tr>
- <tr><td align=right>Attach:</td><td><input name="UpdateAttachment" type="file"></td></tr>
- <tr><td colspan="2">
- <& /Elements/MessageBox, Name=>"UpdateContent"&>
- </td></tr>
- </table>
-<& /Elements/TitleBoxEnd &>
-
-
-
-
-<& /Elements/Submit &>
-
-
-</FORM>
-<%INIT>
-
-# Iterate through the ARGS hash and remove anything with a null value.
-map ($ARGS{$_} =~ /^$/ && (delete $ARGS{$_}), keys %ARGS);
-
-my ($bgcolor, @results);
-my @cols = qw(id Status Priority Subject QueueObj->Name OwnerObj->Name RequestorsAsString DueAsString );
-
-Abort("No search to operate on.") unless ($session{'tickets'});
-
-
-my $do_comment_reply=0;
-# Prepare for ticket updates
-$ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
-chomp ($ARGS{'UpdateContent'}) ;
-
-if ($ARGS{'UpdateContent'} &&
-    $ARGS{'UpdateContent'} ne '' &&
-    $ARGS{'UpdateContent'} ne  "-- \n" .
-    $session{'CurrentUser'}->UserObj->Signature) {
-            $do_comment_reply=1;
-}
-
-my $KeywordSelects = new RT::KeywordSelects $session{'CurrentUser'};
-foreach ( $session{'tickets'}->RestrictionValues('Queue') ) {
-    $KeywordSelects->LimitToQueue($_);
-}
-
-$KeywordSelects->IncludeGlobals;
-
-
-#Iterate through each ticket we've been handed
-
-while (my $Ticket = $session{'tickets'}->Next) {
-    $RT::Logger->debug( "Checking Ticket ".$Ticket->Id ."\n");
-    next unless ($ARGS{"UpdateTicket".$Ticket->Id});
-    $RT::Logger->debug ("Matched\n");
-    #Update the basics.
-    my @basicresults = ProcessTicketBasics(TicketObj => $Ticket, ARGSRef => \%ARGS);
-    my @dateresults = ProcessTicketDates(TicketObj => $Ticket, ARGSRef => \%ARGS);
-    my @watchresults = ProcessTicketWatchers(TicketObj => $Ticket, ARGSRef => \%ARGS);    
-    my @selectresults = ProcessTicketObjectKeywords(TicketObj => $Ticket, ARGSRef => \%ARGS);
-    
-   
-     my @updateresults; 
-     if ($do_comment_reply) {
-     ProcessUpdateMessage(TicketObj => $Ticket, ARGSRef => \%ARGS, Actions => \
-@updateresults); 
-    } 
-    my @tempresults = (@watchresults, @basicresults, @dateresults, @updateresults);
-    @tempresults = map { "Ticket ".$Ticket->Id. ": ".$_ } @tempresults;
-
-    
-    #Update the keyword selects
-    #Update the watchers
-    $RT::Logger->debug(join("\n",@tempresults));
-    @results = (@results, @tempresults);
-}
-
-</%INIT>
diff --git a/rt/webrt/Search/Listing.html b/rt/webrt/Search/Listing.html
deleted file mode 100755
index da927fec7..000000000
--- a/rt/webrt/Search/Listing.html
+++ /dev/null
@@ -1,134 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Search/Attic/Listing.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2001 Jesse Vincent <jesse@fsck.com>
-<& /Elements/Header, Title => "Search", Refresh => $session{'tickets_refresh_interval'} &>
-<& /Elements/Tabs, current_toptab => 'Search/Listing.html' &>
-
-
-% unless ($ARGS{'Action'} eq 'Refine') {
-<TABLE WIDTH=100% border=0 cellpadding=3 CELLSPACING=1>
-<TR>
-%foreach my $col (@{Config(\%ARGS, 'QueueListingCols')}) {
-<TH>
-
-<%PERL>	
-my ($order);
- my $attr = $col->{'TicketAttribute'};
- $attr =~ s/Obj->(Name|AsString|AgeAsString)//g;
-  if ($session{'tickets_sort_order'} =~ /^asc$/i) {
-   $order = 'DESC';
- } else {
-   $order = 'ASC';
- }
-</%PERL>
-
-% if (grep (/^$attr$/i, $session{'tickets'}->SortFields)) {
-<A 
-% if ($attr eq $session{'tickets_sort_by'}) {
-class="currenttab"
-% }
-HREF="<% $RT::WebPath%>/Search/Listing.html?Bookmark=<%$session{'tickets'}->FreezeLimits()|u%>&TicketsSortBy=<%$attr%>&TicketsSortOrder=<%$order%>&RowsPerPage=<%$session{'tickets_rows_per_page'}%>">
-<%$col->{Header}%>
-</A>
-% } else {
-<% $col->{Header} %>
-% }
-</TH>
-%}
-</TR>
-
-<%PERL>
-
-my $i;
-      
-$session{'tickets'}->RedoSearch();
-while (my $Ticket = $session{'tickets'}->Next) {
- $i++;
- if ($i % 2) {
-     $bgcolor = "#dddddd";
- }
- else {
-     $bgcolor = "#ffffff";
- }
-      </%PERL>
-<TR bgcolor="<%$bgcolor%>" >
-%# The ticket view is controlled by config.pm, WebOptions
-%foreach my $col (@{Config(\%ARGS,'QueueListingCols')}) {
-<TD><& TicketCell , Ticket=>$Ticket,  Column=>$col &></TD>
-%}
-</TR>
-%}
-
-
-
-</TABLE>
-
-<div align=center>
-<font size=2>
-<a href="Listing.html?GotoPage=1">First page</a>
-&nbsp;&nbsp;
-<a href="Listing.html?GotoPage=Prev">&lt;Previous page</a>
-&nbsp;&nbsp;
-<a href="Listing.html?GotoPage=Next">Next page&gt;</a>
-%#&nbsp;&nbsp;<form method=get action="Listing.html">Goto page <input name=GotoPage size=2></form>
-</font>
-</div>
-% if ($session{'tickets'}->Count()) { 
-<div align=right>
-<a href="Bulk.html">Update all these tickets at once</a>
-</div>
-% }
-<HR>
-
-% } #endif {$ARGS{'Action'} eq 'Refine')
-<TABLE WIDTH="100%">
-<TR>
-<TD VALIGN="TOP">
-<& /Elements/TitleBoxStart, title => 'Search Criteria'&>
-
-<A HREF="<% $RT::WebPath%>/Search/Listing.html?ClearRestrictions=1">New search</a><br>
-<A HREF="<% $RT::WebPath%>/Search/Listing.html?Bookmark=<%$session{'tickets'}->FreezeLimits()|u%>&TicketsSortBy=<%$session{'tickets_sort_by'}%>&TicketsSortOrder=<%$session{'tickets_sort_order'}%>&RowsPerPage=<%$session{'tickets_rows_per_page'}%>">Bookmarkable URL for this search</a>
-<BR>
-<BR>
-% my %restrictions=$session{'tickets'}->DescribeRestrictions();
-% my %seen_restrictions=();
-% foreach $row (keys %restrictions){
-%  my $tmp=$restrictions{"$row"};
-%  if( ! defined( $seen_restrictions{"$tmp"} ) ){
-<%$restrictions{"$row"}%> <A HREF="<% $RT::WebPath%>/Search/Listing.html?DeleteRestriction=<%$row%>">[delete]</a><br>
-%   } else {
-%     $session{'tickets'}->DeleteRestriction($row);
-<b>Deleted Duplicate Restriction <i><%$tmp%></i></b><br>
-% }
-% $seen_restrictions{"$tmp"}++;
-%}
-<& /Elements/TitleBoxEnd&>
-</TD>
-<TD>
-
-<& PickRestriction &>
-
-</TD>
-</TR>
-</TABLE>
-
-<%INIT>
-
-my $bgcolor;
-require RT::Interface::Web;
-
-$session{'i'}++;
-if ($session{'tickets'}) {
-    if ( ($ARGS{'ClearRestrictions'}) ||
-	 ($ARGS{'NewSearch'}) ) {
-	$session{'tickets'}->ClearRestrictions;
-    }
-    
-    if ($ARGS{'DeleteRestriction'}) {
-	$session{'tickets'}->DeleteRestriction($ARGS{'DeleteRestriction'});
-    }
-}
-&ProcessSearchQuery(ARGS=>\%ARGS);
-
-my $row;
-
-</%INIT>
diff --git a/rt/webrt/Search/PickRestriction b/rt/webrt/Search/PickRestriction
deleted file mode 100755
index 82f576c1f..000000000
--- a/rt/webrt/Search/PickRestriction
+++ /dev/null
@@ -1,112 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Search/Attic/PickRestriction,v 1.1 2002-08-12 06:17:09 ivan Exp $
-<FORM ACTION="Listing.html" METHOD="GET">
-<INPUT TYPE=HIDDEN NAME="Bookmark" VALUE="<% $session{'tickets'}->FreezeLimits()|u %>">
-<& /Elements/TitleBoxStart, title => 'Refine Search'&>
-<INPUT TYPE=HIDDEN NAME="CompileRestriction" VALUE=1>
-
-<ul>
-<li>Owner is  <& /Elements/SelectBoolean, Name => "OwnerOp", 
-					  TrueVal=> '=', 
-					  FalseVal => '!=' 
-&> 
-<& /Elements/SelectOwner, Name => "ValueOfOwner" &>
-
-<li>
-Requestor email address 
-<& /Elements/SelectMatch, Name => "RequestorOp" &>
-<INPUT Name="ValueOfRequestor" SIZE=20>
-
-<li>
-Subject <& /Elements/SelectMatch, Name => "SubjectOp" &> 
-<INPUT Name="ValueOfSubject" SIZE=20>
-
-<li>Queue  <& /Elements/SelectBoolean,  Name => "QueueOp" , 
-					True => "is", 
-					False => "isn't", 
-					TrueVal=> '=', 
-					FalseVal => '!=' &>
-<& /Elements/SelectQueue, Name => "ValueOfQueue" &>
-
-
-<li>Priority  <& /Elements/SelectEqualityOperator,  Name => "PriorityOp" &>
-
-<INPUT Name="ValueOfPriority" SIZE=5>
-
-
-<li>
-<& /Elements/SelectDateType, Name => 'DateType' &>
-<& /Elements/SelectDateRelation, Name=>"DateOp" &>
-<& /Elements/SelectDate, Name => "ValueOfDate", ShowTime => 0, Default => '' &>
-
-<li>Ticket content 
-<& /Elements/SelectBoolean, Name => "ContentOp", 
-			    True => "matches", 
-			    False => "does not match", 
-			    TrueVal => 'LIKE', 
-			    FalseVal => 'NOT LIKE' 
-&> 
-<Input Name="ValueOfContent" Size=20>
-
-<li>Status 
-<& /Elements/SelectBoolean, Name => "StatusOp", 
-			    True => "is", 
-  			    False => "isn't", 
-			    TrueVal=> '=', 
-			    FalseVal => '!=' 
-&>  
-<& /Elements/SelectStatus, Name => "ValueOfStatus" &>
-
-% while ( my $KeywordSelect = $KeywordSelects->Next ) {
-
-<li><% $KeywordSelect->Name %> 
-	<& /Elements/SelectBoolean, Name => "KeywordSelectOp". $KeywordSelect->id, 
-				    True => "is", False => "isn't", 
-  				    TrueVal=> '=', FalseVal => '!=' &>
-
-<& /Elements/SelectKeyword, Name => "KeywordSelect".$KeywordSelect->id,
-			    KeywordObj => $KeywordSelect->KeywordObj
-			    &>
-% }
-
-</UL>
-
-<& /Elements/TitleBoxEnd &>
-
-<& /Elements/TitleBoxStart, title => 'Ordering and sorting'&>
-
-<UL>
-
-<li>Results per page <& /Elements/SelectResultsPerPage, Name => "RowsPerPage", 
-							Default => $session{'tickets_rows_per_page'} || '50'
-&>
-
-<li>Sort results by <& /Elements/SelectTicketSortBy, Name => "TicketsSortBy", 
-						     Default => $session{'tickets_sort_by'} 
-&> 
-<& /Elements/SelectSortOrder, Name => 'TicketsSortOrder', Default => $session{'tickets_sort_order'} &>
-
-<li> <& /Elements/Refresh, Name => 'RefreshSearchInterval' , Default => $session{'tickets_refresh_interval'} &>
-
-
-</UL>
-
-
-</DIV>
-
-
-
-<& /Elements/TitleBoxEnd &>
-
-<& /Elements/Submit, Label => 'Show Results', AlternateLabel => 'Refine', Name => 'Action'&>
-
-</FORM>
-
-
- <%INIT>
- my $KeywordSelects = new RT::KeywordSelects $session{'CurrentUser'};
- foreach ( $session{'tickets'}->RestrictionValues('Queue') ) {
-        $KeywordSelects->LimitToQueue($_);
- }
-
- $KeywordSelects->IncludeGlobals;
-</%INIT>
diff --git a/rt/webrt/Search/RestrictSearch.html b/rt/webrt/Search/RestrictSearch.html
deleted file mode 100755
index 977308e3b..000000000
--- a/rt/webrt/Search/RestrictSearch.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<& /Elements/Header, Title=>"Compile Restrictions" &>
-<& /Elements/Tabs &>
-<& PickRestriction &>
diff --git a/rt/webrt/Search/TicketCell b/rt/webrt/Search/TicketCell
deleted file mode 100644
index aaded88e9..000000000
--- a/rt/webrt/Search/TicketCell
+++ /dev/null
@@ -1,28 +0,0 @@
-%#$Header: /home/cvs/cvsroot/freeside/rt/webrt/Search/Attic/TicketCell,v 1.1 2002-08-12 06:17:09 ivan Exp $
-<% $link |n%><%$Column->{Constant} || eval("\$Ticket->$Column->{TicketAttribute}") || "-" %><% $endlink|n %>
-<%INIT>
-
-my $link = "";
-my $endlink = "";
-if ($Column->{TicketLink}) {
-	$link = "<A HREF=\"";
-	if ($Column->{TicketLink} == 1 ) {
-		$link .= "../Ticket/Display.html?";
-	}
-	else {
-		$link .= $Column->{TicketLink};
-	}
-
-	$link .= "id=".$Ticket->Id . $Column->{ExtraLinks};
-
-	if ($session{NewWindowOption}) {
-		$link .= "TARGET=\"TicketDisplay".$session{AlwaysNewWindowOption} && (time() . rand(1024))."\" ";
-	}
-	$link .= "\">";
-	$endlink = "</a>";
-}
-</%INIT>
-<%ARGS>
-$Ticket => undef
-$Column => undef
-</%ARGS>
diff --git a/rt/webrt/SelfService/Attachment/dhandler b/rt/webrt/SelfService/Attachment/dhandler
deleted file mode 100644
index 0d646cc0b..000000000
--- a/rt/webrt/SelfService/Attachment/dhandler
+++ /dev/null
@@ -1,27 +0,0 @@
-<%perl>
-     my ($ticket, $trans,$attach, $filename);
-     my $arg = $m->dhandler_arg;                # get rest of path
-     if ($arg =~ '^(\d+)/(\d+)') {
-        $trans = $1;
-        $attach = $2;
-     }
-    else {
-        Abort("Corrupted attachment URL.");
-        }
-     my $AttachmentObj = new RT::Attachment($session{'CurrentUser'});
-     $AttachmentObj->Load($attach) || Abort("Attachment '$attach' could not be loaded");
-
-
-     unless ($AttachmentObj->id) {
-        Abort("Bad attachment id. Couldn't find attachment '$attach'\n");
-    }
-     unless ($AttachmentObj->TransactionId() == $trans ) {
-        Abort("Bad transaction number for attachment. $trans should be".$AttachmentObj->TransactionId() ."\n");
-
-     }
-     my $content_type = $AttachmentObj->ContentType || 'text/plain';
-     SetContentType($content_type);
-     $m->out($AttachmentObj->Content); 
-     $m->abort; 
-</%perl>
-
diff --git a/rt/webrt/SelfService/Closed.html b/rt/webrt/SelfService/Closed.html
deleted file mode 100644
index a35936092..000000000
--- a/rt/webrt/SelfService/Closed.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<& /SelfService/Elements/Header, title => 'RT Self Service / Closed Tickets' &>
-
-<& /SelfService/Elements/MyRequests, status => ['resolved'], friendly_status =>
-'closed' &>
diff --git a/rt/webrt/SelfService/Create.html b/rt/webrt/SelfService/Create.html
deleted file mode 100755
index 60110cb5a..000000000
--- a/rt/webrt/SelfService/Create.html
+++ /dev/null
@@ -1,63 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/SelfService/Attic/Create.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2001 Jesse Vincent <jesse@fsck.com>
-
-<& Elements/Header, Title => "Create a request" &>
-
-
-<FORM ACTION="Display.html" METHOD="POST" ENCTYPE="multipart/form-data">
-<INPUT TYPE=HIDDEN Name="id" VALUE="new">
-<& /Elements/TitleBoxStart, contentbg => "#cccccc", title => "Create a new ticket" &>
-
-<TABLE>
-<TR>
-<TD>
-Queue:
-</TD>
-<TD>
-<& /Elements/SelectNewTicketQueue, Verbose => 'True' &>
-</TD>
-</TR>
-<TR>
-<TD>
-Requestors: 
-</TD>
-<TD>
-<INPUT Name="Requestors" Value="<%$session{CurrentUser}->EmailAddress%>" SIZE=20>
-</TD>
-</TR>
-<TR>
-<TD>
-Cc:
-</TD>
-<TD>
- <INPUT NAME="Cc" SIZE=20>
-</TD>
-</TR>
-<TR>
-<TD>
-Subject:
-</TD>
-<TD>
-<INPUT Name="Subject" SIZE=60 MAXSIZE=100 value="">
-</TD>
-</TR>
-<TR>
-<TD>
-Attach file:
-</TD>
-<TD>
-<INPUT Name="Attach" type=file>
-</TD>
-</TR>
-<TR>
-<TD COLSPAN=2>
-Describe the issue below:<br>
-<& /Elements/MessageBox &>
-</TD>
-</TR>
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit, Label => "Create ticket"&>
-
-
-</FORM>
diff --git a/rt/webrt/SelfService/Display.html b/rt/webrt/SelfService/Display.html
deleted file mode 100755
index 2d44f148e..000000000
--- a/rt/webrt/SelfService/Display.html
+++ /dev/null
@@ -1,190 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/SelfService/Attic/Display.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2001 Jesse Vincent <jesse@fsck.com>
-
-<& /SelfService/Elements/Header, Title => 'Display ticket #'.$Ticket->id &>
-
-
-<& /Elements/ListActions, actions => \@results &>
-
-<TABLE>
-    <TR>
-	<TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
-	Ticket Id
-	</TD>
-      <TD>
-	<%$Ticket->Id%>
-	</TD>
-      </TR>
-    <TR>	
-      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
-	Requestors
-	</TD>
-      <TD>
-	<%$Ticket->RequestorsAsString%>
-      </TD>
-      </TR>
-    <TR>	
-      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
-	Cc
-	</TD>
-      <TD>
-	<%$Ticket->CcAsString%>
-      </TD>
-    </TR>
-
-  <TR>	
-      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
-	Status
-	</TD>
-      <TD>
-	<%$Ticket->Status%>
-      </TD>
-    </TR>
-
-    <TR>	
-      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
-	Queue
-	</TD>
-      <TD>
-	<%$Ticket->QueueObj->Name%> (<%$Ticket->QueueObj->Description%>)
-      </TD>
-    </TR>
-    <TR>	
-      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
-	Priority
-      </TD>
-      <TD>
-	<%$Ticket->Priority %>
-      </TD>
-    </TR>
- 
-%  if ($Ticket->TimeWorked) {
-   <TR>	
-      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
-	Worked
-      </TD>
-      <TD>
-	<%$Ticket->TimeWorked %> minutes
-      </TD>
-    </TR>
-% }
-    
-% my $selects = $Ticket->QueueObj->KeywordSelects;
-% while (my $select = $selects->Next) {
-    <TR>
-      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
-	<%$select->Name%>
-      </TD>
-      <TD>
-% my $object_keywords = $Ticket->KeywordsObj($select->id);	
-% while (my $keyword = $object_keywords->Next) {
-	<%$keyword->KeywordObj->RelativePath($select->KeywordObj)%>
-% }
-%}
-	</TD>
-      </TR>
-
-
-
-
-	</TABLE>
-<TABLE BORDER=0 CELLSPACING=0>
-% my ($i);
-%while (my $Transaction = $Transactions->Next) {
-% $i++;
-%	if ($Transactions->IsLast) {
-	<a name="lasttrans"></a>
-% 	}
-	<& /Ticket/Elements/ShowTransaction, Transaction => $Transaction, 
-					     RowNum => $i,
-					     Ticket => $Ticket &>
-
-%}
-</TABLE>
-
-
-<%INIT>
-
-my ($field, @results);
-
-# {{{ Load the ticket
-#If we get handed two ids, mason will make them an array. bleck.
-# We want teh first one. Just because there's no other sensible way
-# to deal
-my @id = (ref $id eq 'ARRAY') ? @{$id} : ($id);                
-
-
-my $Ticket = new RT::Ticket($session{'CurrentUser'});
-if ($id[0] eq 'new') {
-    # {{{ Create a new ticket
-    
-    my $Queue = new RT::Queue($session{'CurrentUser'});	
-    unless ($Queue->Load($ARGS{'Queue'})) {
-	$m->comp('Error.html', Why => 'Queue not found');
-	$m->abort;
-    }
-    
-    unless ($Queue->CurrentUserHasRight('CreateTicket')) {
-	$m->comp('Error.html', Why => 'You have no permission to create tickets in that queue.');
-  	$m->abort; 
-    }
-    
-    my @Requestors = split(/,/,$ARGS{'Requestors'});
-    my @Cc = split(/,/,$ARGS{'Cc'});
-    
-
-    my $MIMEObj = MakeMIMEEntity ( Subject => $ARGS{'Subject'},
-				   From => $ARGS{'From'},
-				   Cc => $ARGS{'Cc'},
-				   Body => $ARGS{'Content'},
-				   AttachmentFieldName => 'Attach');
-
-    #TODO in Create_Details.html: priorities and due-date      
-    my ($id, $Trans, $ErrMsg)= $Ticket->Create(Queue=>$ARGS{Queue},
-					       Requestor=> \@Requestors,
-					       Cc => \@Cc,
-					       Subject=>$ARGS{Subject},
-					       MIMEObj => $MIMEObj	  
-					      );         
-    unless ($id && $Trans) {
-	$m->comp('Error.html', Why => $ErrMsg);
-   	$m->abort(); 
-    }
-
-    push(@results, $ErrMsg);
-
-    # }}}
-}
-else {
-    unless ($Ticket->Load($id[0])) {
-	$m->comp('Error.html', Why =>"Couldn't load ticket '$id'");
-	$m->abort();
-    }
-}
-# }}}
-
-unless ($session{'CurrentUser'}->HasQueueRight ( TicketObj => $Ticket,
-						 Right => 'ShowTicket')) {
-    $m->comp('Error.html', Why => "No permission to display that ticket");
-    $m->abort();
-}
-
-my ($code, $msg);
-
-#Update the status
-if ((defined $ARGS{'Status'}) and 
-    ($ARGS{'Status'} ne $Ticket->Status)) {
-    ($code, $msg) = $Ticket->SetStatus($ARGS{'Status'});
-    push @results, "$msg";
-}
-
-ProcessUpdateMessage(ARGSRef=>\%ARGS, Actions=>\@results, TicketObj=>$Ticket);
-
-my $Transactions = $Ticket->Transactions;
-
-</%INIT>
-
-
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/webrt/SelfService/Elements/GotoTicket b/rt/webrt/SelfService/Elements/GotoTicket
deleted file mode 100755
index 0c0c8b67a..000000000
--- a/rt/webrt/SelfService/Elements/GotoTicket
+++ /dev/null
@@ -1 +0,0 @@
-<FORM ACTION="<%$RT::WebPath%>/SelfService/Display.html"><input type=submit value="Goto ticket">&nbsp;<input size=4 name=id></FORM>
diff --git a/rt/webrt/SelfService/Elements/Header b/rt/webrt/SelfService/Elements/Header
deleted file mode 100755
index ecf58f461..000000000
--- a/rt/webrt/SelfService/Elements/Header
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-     "http://www.w3.org/TR/REC-html40/loose.dtd"> 
-<HTML>
-<HEAD>
-<TITLE><%$Title%></TITLE>
-% if ($Code) {
-<META NAME="HTTP-EQUIV" VALUE="<%$Code%> <%$Why%>">
-% }
-
-<link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/webrt.css" type="text/css">
-</HEAD>
-<BODY BGCOLOR="<%$BgColor%>">
-<TABLE BORDER=0 WIDTH=100% CELLSPACING=0 BGCOLOR="#993333">
-<TR VALIGN=TOP>
-<TD WIDTH=32>
-        <IMG SRC="<%$RT::LogoURL%>" alt="RT">
-</TD>
-<TD VALIGN=CENTER ALIGN=LEFT>
-<font size=+2 color=#ffffff>
-<B>
-<%$Title%>
-</B>
-</font>
-</TD>
-<TD ALIGN=RIGHT>
-<font color="#ffffff">
-% if ($session{'CurrentUser'} ) {
-Signed in as <b><%$session{'CurrentUser'}->Name%></b>.<BR>
-% if ($session{'CurrentUser'}->HasSystemRight('ModifySelf')) {
-[<A class='inverse' HREF="<%$RT::WebPath%>/SelfService/Prefs.html" >Preferences</A>]
-% }
-% unless ($RT::WebExternalAuth) { 
- [<A class='inverse' HREF="<%$RT::WebPath%>/NoAuth/Logout.html">Logout</a>]
-% }
-% } else {
-Not logged in.
-% }
-</font>
-</TD>
-</TR>
-</TABLE>
-
-<BR>
-<& /SelfService/Elements/Tabs &>
-
-<%ARGS>
-$Title => ''
-$Code => undef
-$Why => undef
-$BgColor => '#ffffff'
-</%ARGS>
-<%INIT>
-$Title = "RT/$RT::rtname: ".$Title;
-</%INIT>
-
diff --git a/rt/webrt/SelfService/Elements/MyRequests b/rt/webrt/SelfService/Elements/MyRequests
deleted file mode 100644
index ce268d58d..000000000
--- a/rt/webrt/SelfService/Elements/MyRequests
+++ /dev/null
@@ -1,41 +0,0 @@
-<& /Elements/TitleBoxStart, title => "Your $friendly_status requests" &>
-<TABLE BORDER=0 cellspacing=1 cellpadding=1 BGCOLOR="#eeeeee" WIDTH=100%>
-<TR>
-<TH>Subject</TH>
-<TH>Status</TH>
-<TH>Owner</TH>
-<TH>&nbsp;</TH>
-</TR>
-<TR>
-% while (my $Ticket = $MyTickets->Next) {
-<TR>
-<TD>
-<%$Ticket->Id%>: <%$Ticket->Subject%>
-</TD>
-<TD>
-<%$Ticket->Status%>
-</TD><TD>
-<%$Ticket->OwnerObj->Name%>
-</TD><TD ALIGN=RIGHT>
-[<A HREF="<% $RT::WebPath %>/SelfService/Display.html?id=<%$Ticket->Id%>">Details</A>]
-</TD>
-</TR>
-% }
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-
-
-<%INIT>
-my $MyTickets;
-$MyTickets = new RT::Tickets ($session{'CurrentUser'});
-$MyTickets->LimitRequestor(VALUE => $session{'CurrentUser'}->EmailAddress);
-
-foreach my $status (@status) {
-
-        $MyTickets->LimitStatus(VALUE => $status);
-}
-</%INIT>
-<%ARGS>
-$friendly_status => 'open'
-@status => ('open', 'new', 'stalled')
-</%ARGS>
diff --git a/rt/webrt/SelfService/Elements/Tabs b/rt/webrt/SelfService/Elements/Tabs
deleted file mode 100644
index d689d8a72..000000000
--- a/rt/webrt/SelfService/Elements/Tabs
+++ /dev/null
@@ -1,49 +0,0 @@
-<TABLE WIDTH=100%>
-<TR>
-% foreach $tab (sort keys %{$tabs}) {
-<TD ALIGN=CENTER>
-[<A HREF="<%$RT::WebPath%>/<% $tabs->{"$tab"}->{'path'}%>"><% $tabs->{"$tab"}->{'title'}%></A>]
-</TD>
-%}
-
-% if ($actions) {
-
-<TD ALIGN=RIGHT>
-<TABLE><TR>
-%  foreach my $action (sort keys %{$actions}) {
-<TD>
-<FONT SIZE=-1>
-% if ($actions->{"$action"}->{'html'}) {
-<%$actions->{"$action"}->{'html'} |n%>
-% } else {
-<A HREF="<%$RT::WebPath%>/<% $actions->{$action}->{'path'}%>"><% $actions->{$action}->{'title'}%></A>
-% }
-</FONT>
-</TD>
-%  }
-</TR>
-</TABLE>
-</TD>
-%}
-</TR>
-</TABLE>
-<hr>
-<%INIT>
-my ($tab);
-my $tabs = { A  => { title => 'Open requests',
-                        path => 'SelfService/',
-                      },
-             B => { title => 'Closed requests',
-                         path => 'SelfService/Closed.html',
-                       },
-             C => { title => 'New request',
-                    path => 'SelfService/Create.html'
-                    }
-           };
-my $actions = {
-	B => { html => $m->scomp('GotoTicket') 
-		}
-	};
-</%INIT>
-
-
diff --git a/rt/webrt/SelfService/Error.html b/rt/webrt/SelfService/Error.html
deleted file mode 100755
index 19b79e68b..000000000
--- a/rt/webrt/SelfService/Error.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<& /SelfService/Elements/Header, Title => 'Error' &>
-<& /Elements/TitleBoxStart, title => $Title &>
-<%$Why%>
-<br>
-<font size=-1>
-<%$Details%>
-</font>
-<& /Elements/TitleBoxEnd &>
-</body>
-</HTML>
-
-
-<%args>
-$Code => undef
-$Details => undef
-$Title => "RT Error"
-$Why => "the calling component did not specify why"
-</%args>
-
-<%INIT>
-$RT::Logger->error("WebRT: $Why ($Details)");
-</%INIT>
diff --git a/rt/webrt/SelfService/Prefs.html b/rt/webrt/SelfService/Prefs.html
deleted file mode 100755
index 9c614e9fd..000000000
--- a/rt/webrt/SelfService/Prefs.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<& /SelfService/Elements/Header, title => 'Preferences' &>
-
-<& /Elements/ListActions, actions => \@results &>
-<form method=post>
-
-% unless ($RT::WebExternalAuth) {
-<& /Elements/TitleBoxStart, title => 'Change password'  &>
-New password: <input type=password name="NewPass1" size=16>
-Confirm: <input type=password name="NewPass2" size=16>
-<& /Elements/TitleBoxEnd &>
-<BR>
-% }
-<& /Elements/TitleBoxStart, title => 'Signature'  &>
-
-<TEXTAREA COLS=72 ROWS=4 WRAP=HARD NAME="Signature"><% $session{'CurrentUser'}->UserObj->Signature %></TEXTAREA>
-<br>
-<BR>
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit &>
-	  </form>
-
-
-<%INIT>
-my @results;
-
-if ($NewPass1) {
-    if ($NewPass1 ne $NewPass2) {
-	push (@results, "Passwords did not match.");
-    }	
-    else {
-	my ($val, $msg)=$session{'CurrentUser'}->UserObj->SetPassword($NewPass1);
-	push (@results, "Password: ".$msg);
-    }	
-}
-if ($Signature) {
-    $Signature =~ s/(\r\n|\r)/\n/g;
-    if ($Signature ne $session{'CurrentUser'}->UserObj->Signature) {
-	my ($val, $msg)=$session{'CurrentUser'}->UserObj->SetSignature($Signature);
-	push (@results, "Signature: ".$msg);
-    }
-}
-#A hack to make sure that session gets rewritten.
-
-$session{'i'}++;
-</%INIT>
-
-<%ARGS>
-$Signature => undef
-$NewPass1 => undef
-$NewPass2 => undef
-</%ARGS>
diff --git a/rt/webrt/SelfService/Update.html b/rt/webrt/SelfService/Update.html
deleted file mode 100755
index 17f1618a3..000000000
--- a/rt/webrt/SelfService/Update.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<& /SelfService/Elements/Header, Title => 'Update ticket #'.$Ticket->id &>
-
-
-<FORM ACTION="Display.html" METHOD=POST ENCTYPE="multipart/form-data">
-
-Status:
-<& /Elements/SelectStatus, Name=>"Status", Default => $DefaultStatus &> 
-<input type=hidden name="UpdateType" value="response">
-
-Subject: <input name="UpdateSubject" size=60 value="Re: <% $Ticket->Subject %>"> <br>
-Attach: <input name="UpdateAttachment" type=file><br>
-<& /Elements/MessageBox, Name=>"UpdateContent", QuoteTransaction=>$ARGS{QuoteTransaction} &>
-		<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>"><br>
-
-
-<& /Elements/Submit &>
-  </FORM>
-
-
-
-<%INIT>
-
-my $Ticket = LoadTicket($id);
-
-my $title = "Update ticket #" . $Ticket->id;
-
-$DefaultStatus = $Ticket->Status() unless ($DefaultStatus);
-
-
-Abort("No permission to view update ticket") 
-	unless ( $Ticket->CurrentUserHasRight('ReplyToTicket') or
-                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
-
-</%INIT>
-
-<%ARGS>
-$id => undef
-$Action => undef
-$DefaultStatus => undef
-</%ARGS>
diff --git a/rt/webrt/SelfService/index.html b/rt/webrt/SelfService/index.html
deleted file mode 100644
index a377d8cff..000000000
--- a/rt/webrt/SelfService/index.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<& /SelfService/Elements/Header, title => 'Self Service' &>
-
-<& /SelfService/Elements/MyRequests &>
diff --git a/rt/webrt/Ticket/Attachment/dhandler b/rt/webrt/Ticket/Attachment/dhandler
deleted file mode 100644
index 0d646cc0b..000000000
--- a/rt/webrt/Ticket/Attachment/dhandler
+++ /dev/null
@@ -1,27 +0,0 @@
-<%perl>
-     my ($ticket, $trans,$attach, $filename);
-     my $arg = $m->dhandler_arg;                # get rest of path
-     if ($arg =~ '^(\d+)/(\d+)') {
-        $trans = $1;
-        $attach = $2;
-     }
-    else {
-        Abort("Corrupted attachment URL.");
-        }
-     my $AttachmentObj = new RT::Attachment($session{'CurrentUser'});
-     $AttachmentObj->Load($attach) || Abort("Attachment '$attach' could not be loaded");
-
-
-     unless ($AttachmentObj->id) {
-        Abort("Bad attachment id. Couldn't find attachment '$attach'\n");
-    }
-     unless ($AttachmentObj->TransactionId() == $trans ) {
-        Abort("Bad transaction number for attachment. $trans should be".$AttachmentObj->TransactionId() ."\n");
-
-     }
-     my $content_type = $AttachmentObj->ContentType || 'text/plain';
-     SetContentType($content_type);
-     $m->out($AttachmentObj->Content); 
-     $m->abort; 
-</%perl>
-
diff --git a/rt/webrt/Ticket/Create.html b/rt/webrt/Ticket/Create.html
deleted file mode 100755
index 2c61de03a..000000000
--- a/rt/webrt/Ticket/Create.html
+++ /dev/null
@@ -1,199 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Ticket/Attic/Create.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2000 Jesse Vincent <jesse@fsck.com> 
-
-<& /Elements/Header, Title => "Create a new ticket" &>
-<& /Elements/Tabs, current_toptab => "Ticket/Create.html" &>
-<FORM ACTION="Display.html" METHOD="POST" ENCTYPE="multipart/form-data">
-<INPUT TYPE=HIDDEN Name="id" VALUE="new">
-<A NAME="top">
-	
-	
-[<a class="currenttab">Show basics</a>] [<A HREF="#detail">Show details</a>]
-<BR>
-<& /Elements/TitleBoxStart, contentbg => "#cccccc", title => "Create a new ticket"&>
-<div align=right><input type=submit value="Create"></div>
-<TABLE border=0 cellpadding=0 cellspacing=0>
-<TR><TD>Queue</TD>
-<TD><% $QueueObj->Name %>
-<INPUT TYPE=HIDDEN NAME=Queue Value="<%$QueueObj->Name%>">
-</TD>
-<TD>Status:
-</TD>
-<TD>
-<& /Elements/SelectStatus, Name => "Status", Default=> 'new' &>
-</TD>
-<TD>
-Owner: 
-</TD>
-<TD>
-<& /Elements/SelectOwner, Name => "ValueOfOwner", QueueObj => $QueueObj &>
-</TD>
-</TR>
-<TR>
-<TD>
-Requestors: 
-</TD>
-<TD COLSPAN=5>
-<INPUT Name="Requestors" Value="<%$session{CurrentUser}->EmailAddress%>" SIZE=40>
-</TD>
-</TR>
-<TR>
-<TD>
-Cc:
-</TD>
-<TD COLSPAN=5>
- <INPUT NAME="Cc" SIZE=40>
-</TD>
-</TR>
-<TR>
-<TD>
-Admin Cc:
-</TD>
-<TD COLSPAN=5>
- <INPUT NAME="AdminCc" SIZE=40>
-</TD>
-</TR>
-<TR>
-<TD>
-Subject:
-</TD>
-<TD COLSPAN=5>
-<INPUT Name="Subject" SIZE=60 MAXSIZE=100 value="">
-</TD>
-</TR>
-<TR>
-<TD>
-Attach file:
-</TD>
-<TD COLSPAN=5>
-<INPUT TYPE=FILE NAME="Attach">
-</TD>
-</TR>
-<TR>
-<TD COLSPAN=6>
-Describe the issue below:<br>
-<& /Elements/MessageBox, QuoteTransaction => $QuoteTransaction &>
-
-<BR>
-</TD>
-</TR>
-<TR>
-<TD ALIGN=RIGHT COLSPAN=2>
-</TD>
-</TR>
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit, Label => "Create"&>
-
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-
-<A NAME="detail">
-	[<A HREF="#top">Show basics</a>] [<a class="currenttab">Show details</a>]
-<BR>
-<TABLE WIDTH="100%" BORDER=0>
-<TR>
-<TD WIDTH="50%" VALIGN=TOP>
-
-	  <& /Elements/TitleBoxStart, title => 'The Basics', 
-		title_class=> 'inverse',  
-		color => "#993333" &>
-<TABLE BORDER=0>
-<TR><TD ALIGN=RIGHT>Priority:</TD><TD><input size=3 name="InitialPriority" value="<%$QueueObj->InitialPriority%>"></TD></TR>
-<TR><TD ALIGN=RIGHT>Final Priority:</TD><TD><input size=3 name="FinalPriority" value="<%$QueueObj->FinalPriority%>"></TD></TR>
-<TR><TD ALIGN=RIGHT>Time Worked:</TD><TD><input size=3 name="TimeWorked"></TD></TR>
-<TR><TD ALIGN=RIGHT>Time Left:</TD><TD><input size=3 name="TimeLeft"></TD></TR>
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-<BR>
-<BR>
-
-
- <& /Elements/TitleBoxStart, 
-		title_class=> 'inverse',  
-		title => "Keyword Selections", color => "#993300"
-  &>
-<TABLE BORDER=0>
-% while ( my $KeywordSelect = $KeywordSelects->Next ) {
-%   my $Descendents = $KeywordSelect->KeywordObj->Descendents;
-     <TR><TD ALIGN=RIGHT>
-	<% $KeywordSelect->Name %></TD><TD>
-	  <INPUT TYPE="hidden" NAME="KeywordSelectMagic<% $KeywordSelect->id %>" VALUE="1">
-	    <SELECT NAME="KeywordSelect-<% $KeywordSelect->id %>"
-	      <% $KeywordSelect->Single ? "" : " MULTIPLE " %> SIZE=5>
-%#
-%#  All of this cruft is so we have a 'no keyword' selector for single
-%#  keywords that's only selected when there's no value.
-%
-% foreach my $kid ( keys %{$Descendents} ) {
-	      <OPTION VALUE="<% $kid %>"><% $Descendents->{$kid} %></OPTION>
-%   }
-%   if ( $KeywordSelect->Single) {
-<OPTION VALUE="" SELECTED>(empty)</OPTION>
-% }
-	    </SELECT>
-      </TD></TR>
-% }
-  
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-
-</TD>
-
-<TD VALIGN="TOP">
-<& /Elements/TitleBoxStart, title => "Dates",
-		title_class=> 'inverse',  
-		 color => "#663366" &>
-
-<TABLE BORDER=0>
-<TR><TD ALIGN=RIGHT>Starts:</TD><TD><input size=10 name="Starts"></TD></TR>
-<TR><TD ALIGN=RIGHT>Due:</TD><TD><input size=10 name="Due"></TD></TR>
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-<BR>
-<& /Elements/TitleBoxStart, title => 'Relationships', 
-	title_class=> 'inverse',  
-	titleright => '', color=> "#336633" &>
-
-<i>(Enter ticket ids or URLs, seperated with spaces)</i>
-<TABLE BORDER=0>
-<TR><TD ALIGN=RIGHT>Depends on</TD><TD><input size=10 name="new-DependsOn"></TD></TR>
-<TR><TD ALIGN=RIGHT>Depended on by</TD><TD><input size=10 name="DependsOn-new"></TD></TR>
-<TR><TD ALIGN=RIGHT>Parents</TD><TD><input size=10 name="new-MemberOf"></TD></TR>
-<TR><TD ALIGN=RIGHT>Children</TD><TD><input size=10 name="MemberOf-new"></TD></TR>
-<TR><TD ALIGN=RIGHT>Refers to</TD><TD><input size=10 name="new-RefersTo"></TD></TR>
-<TR><TD ALIGN=RIGHT>Referred to by</TD><TD><input size=10 name="RefersTo-new"></TD></TR>
-
-
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-<BR>
-
-</TD>
-</TR>
-</TABLE>
-<& /Elements/Submit, Label => "Create"&>
-</FORM>
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-
-<%INIT>
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-$QueueObj->Load($Queue) || Abort("Queue could not be loaded.");
-my $KeywordSelects = $QueueObj->KeywordSelects;
-
-</%INIT>
-
-<%ARGS>
-$DependsOn => undef
-$DependedOnBy => undef
-$MemberOf => undef
-$QuoteTransaction => undef
-$Queue => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Display.html b/rt/webrt/Ticket/Display.html
deleted file mode 100755
index cb0dc2501..000000000
--- a/rt/webrt/Ticket/Display.html
+++ /dev/null
@@ -1,152 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Ticket/Attic/Display.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2000 Jesse Vincent <jesse@fsck.com>
-
-<& /Elements/Header, Title => "Ticket #".$Ticket->Id ." ".$Ticket->Subject &>
-<& /Ticket/Elements/Tabs, Ticket => $Ticket, current_tab => 'Ticket/Display.html?id='.$Ticket->id &>
-
-<& /Elements/ListActions, actions => \@Actions &>
-
-<& /Ticket/Elements/ShowSummary,  Ticket => $Ticket &>
-
-
-<BR>
-<& /Ticket/Elements/ShowHistory , 
-      Ticket => $Ticket, 
-      Collapsed => $ARGS{'Collapsed'}, 
-      ShowHeaders => $ARGS{'ShowHeaders'} &> 
-
-  
-<%ARGS>
-$id => undef
-$Create => undef
-$ShowHeaders => undef
-$Collapsed => undef
-</%ARGS>
-
-<%INIT>
-
-  
-  my ($linkid, $message, $tid, $Ticket, @Actions);  
-
-$Ticket = new RT::Ticket($session{'CurrentUser'});
-
-unless ($id) {
-    Abort('No ticket specified');
-}
-
-if ($ARGS{'id'} eq 'new') {
-    # {{{ Create a new ticket
-    
-    my $Queue = new RT::Queue($session{'CurrentUser'});	
-    unless ($Queue->Load($ARGS{'Queue'})) {
-	Abort('Queue not found');
-    }
-    
-    unless ($Queue->CurrentUserHasRight('CreateTicket')) {
-	Abort('You have no permission to create tickets in that queue.');
-    }
-   
-    my $due = new RT::Date($session{'CurrentUser'});
-    $due->Set(Format => 'unknown', Value => $ARGS{'Due'});
-    my $starts = new RT::Date($session{'CurrentUser'});
-    $starts->Set(Format => 'unknown', Value => $ARGS{'Starts'});
-    
- 
-    my @Requestors = split(/,/,$ARGS{'Requestors'});
-    my @Cc = split(/,/,$ARGS{'Cc'});
-    my @AdminCc = split(/,/,$ARGS{'AdminCc'});
-    
-    my $MIMEObj = MakeMIMEEntity( Subject => $ARGS{'Subject'},
-				  From => $ARGS{'From'},
-				  Cc => $ARGS{'Cc'},
-				  Body => $ARGS{'Content'},
-				  AttachmentFieldName => 'Attach');
- 
-				  
-    my %create_args = ( 
-		       Queue=>$ARGS{Queue},
-		       Owner=>$ARGS{ValueOfOwner},
-		       InitialPriority=> $ARGS{InitialPriority},
-		       FinalPriority=> $ARGS{FinalPriority},
-		       TimeLeft => $ARGS{TimeLeft},
-		       TimeWorked => $ARGS{TimeWorked},
-		       Requestor=> \@Requestors,
-		       Cc => \@Cc,
-		       AdminCc => \@AdminCc,
-		       Subject=>$ARGS{Subject},
-		       Status=>$ARGS{Status},
-		       Due => $due->ISO,
-		       Starts => $starts->ISO,
-		       MIMEObj => $MIMEObj	  
-		      );         
-
-    
-    # we need to get any KeywordSelect-<integer> fields into %create_args..
-    grep { $_ =~ /^KeywordSelect-/ && {$create_args{$_} = $ARGS{$_}}} %ARGS;
-
-    my ($id, $Trans, $ErrMsg)= $Ticket->Create(%create_args);
-    unless ($id && $Trans) {
-	Abort($ErrMsg);
-    }
-    my @linktypes = qw( DependsOn MemberOf RefersTo );
-    
-    foreach my $linktype (@linktypes) {
-      foreach my $luri (split (/ /,$ARGS{"new-$linktype"})) {
-	$luri =~ s/\s*$//; # Strip trailing whitespace
-	my ($val, $msg) = $Ticket->AddLink( Target => $luri,
-					    Type => $linktype);
-	push @Actions, $msg;
-      }
-      
-      foreach my $luri (split (/ /,$ARGS{"$linktype-new"})) {
-	my ($val, $msg) = $Ticket->AddLink( Base => $luri,
-					    Type => $linktype);
-	
-	push @Actions, $msg;
-      }
-    }
-    # don't try to change queue to the current queue
-    delete $ARGS{'Queue'};
-
-    push(@Actions, $ErrMsg);
-    unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
-      Abort("No permission to view newly created ticket #".$Ticket->id.".");
-    }
-    # }}}
-}
-
-else { 
-    $Ticket = LoadTicket($ARGS{'id'});
-    unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
-	Abort("No permission to view ticket");
-    }
-
-
-if (defined $ARGS{'Action'}) {
-  if ($ARGS{'Action'} =~ /^(Steal|Kill|Take|SetTold)$/) {
-    my $action = $1;
-    my ($res, $msg)=$Ticket->$action();
-    push(@Actions, $msg);
-  }
-}
-    $ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
-
-    if ($ARGS{'UpdateContent'} &&
-        $ARGS{'UpdateContent'} ne '' &&
-        $ARGS{'UpdateContent'} ne  "-- \n" .
-                                $session{'CurrentUser'}->UserObj->Signature
-       ) {
-	    ProcessUpdateMessage(ARGSRef=>\%ARGS, 
-				 Actions=>\@Actions, 
-				 TicketObj=>$Ticket);
-	}
-#Process status updates
-my @BasicActions = ProcessTicketBasics(ARGSRef => \%ARGS, TicketObj=>$Ticket);
-
-push (@Actions, @BasicActions);
-}
-</%INIT>
-
-
-
-
diff --git a/rt/webrt/Ticket/Elements/AddWatchers b/rt/webrt/Ticket/Elements/AddWatchers
deleted file mode 100755
index 053cff122..000000000
--- a/rt/webrt/Ticket/Elements/AddWatchers
+++ /dev/null
@@ -1,54 +0,0 @@
-<BR>
-<%$msg%><br>
-
-Add new watchers:<br>
-
-<table>
-% if ($Users) {
-<tr><td>
-Type
-</td><td>
-Username
-</td></tr>
-% while (my $u = $Users->Next ) {
-<tr><td><&/Elements/SelectWatcherType, Name => "WatcherTypeUser".$u->Id &></td><td><%$u->Name%> (<%$u->RealName%>)</td></tr>
-% }
-% }
-
-<tr><td>
-Type
-</td><td>
-Email
-</td></tr>
-<tr><td>
-<&/Elements/SelectWatcherType, Name => "WatcherTypeEmail1" &>
-</td><td>
-<input name="WatcherAddressEmail1" size=15>
-</td></tr>
-<tr><td>
-<&/Elements/SelectWatcherType, Name => "WatcherTypeEmail2" &> 
-</td><td>
-<input name="WatcherAddressEmail2" size=15>
-</td></tr>
-<tr><td>
-<&/Elements/SelectWatcherType, Name => "WatcherTypeEmail3" &>
-</td><td>
-<input name="WatcherAddressEmail3" size=15>
-</td></tr>
-</table>
-
-<%INIT>
-my ($msg, $Users);
-if ($UserString) {
-    $Users = new RT::Users($session{'CurrentUser'});
-    $Users->Limit(FIELD => $UserField,
-                 VALUE => $UserString,
-                 OPERATOR => $UserOp);
-     }
-</%INIT>
-
-<%ARGS>
-$UserField => 'Name'
-$UserOp => '='
-$UserString => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/EditBasics b/rt/webrt/Ticket/Elements/EditBasics
deleted file mode 100755
index 12142879e..000000000
--- a/rt/webrt/Ticket/Elements/EditBasics
+++ /dev/null
@@ -1,62 +0,0 @@
-<TABLE>
-<TR>
-<TD COLSPAN=6>
-        Subject<BR>
-        <input name=Subject value="<%$TicketObj->Subject|h%>"  SIZE=50>
-</TD>
-</TR>
-<TR>
-<TD>
-<& /Elements/ShadedBox, 
-        title => 'Status',
-        content => $SelectStatus
-&>
-</TD>
-<TD>
-
-<& /Elements/ShadedBox,
-	title => 'Time Worked',
-	content => "<input name=TimeWorked value=\"".$TicketObj->TimeWorked."\" SIZE=5>" 
-&>
-
-</TD>
-<TD>
-<& /Elements/ShadedBox,
-	title => 'Time Left',
-	content => "<input name=TimeLeft value=\"".$TicketObj->TimeLeft."\" SIZE=5>" 
-&>
-</TD>
-<TD>
-<& /Elements/ShadedBox,
-	title => 'Priority',
-	content => "<input name=Priority value=\"".$TicketObj->Priority."\" SIZE=3>"
-&>
-
-</TD>
-<TD>
-<& /Elements/ShadedBox,
-	title => 'Final Priority',
-	content => "<input name=FinalPriority value=\"".$TicketObj->FinalPriority."\" SIZE=3>"
-&>
-
-
-</TD>
-<TD>
-<& /Elements/ShadedBox,
-        title => 'Queue',
-        content => "$SelectQueue"
- &>
-</TD>
-</TR>
-</TABLE>
-
-<%INIT>
-#It's hard to do this inline, so we'll preload the html of the selectstatus in here.
-my $SelectStatus = $m->scomp("/Elements/SelectStatus", Name => 'Status', Default=> $TicketObj->Status);
-my $SelectQueue = $m->scomp("/Elements/SelectQueue", Name => 'Queue', Default =>$TicketObj->QueueObj->Id);
-
-</%INIT>
-<%ARGS>
-
-$TicketObj => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/EditDates b/rt/webrt/Ticket/Elements/EditDates
deleted file mode 100755
index f04130bde..000000000
--- a/rt/webrt/Ticket/Elements/EditDates
+++ /dev/null
@@ -1,46 +0,0 @@
-<TABLE>
-<TR>
-<TD>
-Starts: 
-</TD>
-<TD>
-<& /Elements/SelectDate, menu_prefix => 'Starts', current => 0 &> 
-        (<% $TicketObj->StartsObj->AsString %>)
-</TD>
-</TR>
-<TR>
-<TD>
-Started:
-</TD>
-<TD>
-<& /Elements/SelectDate, menu_prefix => 'Started', current => 0 &> (<%$TicketObj->StartedObj->AsString %>)
-
-
-
-</TD>
-</TR>
-
-<TR>
-<TD>
-Last Contact:
-</TD>
-<TD>
-<& /Elements/SelectDate, menu_prefix => 'Told', current => 0 &> (<% $TicketObj->ToldObj->AsString %>)
-
-</TD>
-</TR>
-<TR>
-<TD>
-Due:
-</TD>
-<TD>
-
-<& /Elements/SelectDate, menu_prefix => 'Due', current => 0 &> (<% $TicketObj->DueObj->AsString %>)
-</TD>
-</TR>
-
-</TABLE>
-<%ARGS>
-$TicketObj => undef
-</%ARGS>
-
diff --git a/rt/webrt/Ticket/Elements/EditKeywordSelects b/rt/webrt/Ticket/Elements/EditKeywordSelects
deleted file mode 100644
index 34ade9f25..000000000
--- a/rt/webrt/Ticket/Elements/EditKeywordSelects
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<TABLE>
-    <TR>
-% while ( my $KeywordSelect = $KeywordSelects->Next ) {
-% my $CurrentKeywords = $TicketObj->KeywordsObj($KeywordSelect->id);	
-%   my $Descendents = $KeywordSelect->KeywordObj->Descendents;
-      <TD VALIGN=TOP>
-	<% $KeywordSelect->Name %>
-	<BR>
-	  <INPUT TYPE="hidden" NAME="KeywordSelectMagic<% $KeywordSelect->id %>" VALUE="1">
-	    <SELECT NAME="KeywordSelect<% $KeywordSelect->id %>"
-	      <% $KeywordSelect->Single ? "" : " MULTIPLE " %> SIZE=5>
-%#
-%#
-%#  All of this cruft is so we have a 'no keyword' selector for single
-%#  keywords that's only selected when there's no value.
-%
-% my $selected_keywords = 0;
-% foreach my $kid ( keys %{$Descendents} ) {
-% my $selected = 0;
-% if ($CurrentKeywords->HasEntry($kid)) { $selected_keywords++; $selected=1;}
-	      <OPTION VALUE="<% $kid %>" 
-		<% $selected && 'SELECTED'%>>
-		<% $Descendents->{$kid} %>
-	      </OPTION>
-%   }
-%   if ( $KeywordSelect->Single) {
-<OPTION VALUE="" <% ($selected_keywords == 0) && 'SELECTED' %> >(empty)</OPTION>
-% }
-	    </SELECT>
-      </TD>
-% }
-    </TR>
-  
-</TABLE>
-
-
-<%INIT>
-my $KeywordSelects = $TicketObj->QueueObj->KeywordSelects;
-</%INIT>
-
-<%ARGS>
-$TicketObj => undef
-</%ARGS>
-
diff --git a/rt/webrt/Ticket/Elements/EditLinks b/rt/webrt/Ticket/Elements/EditLinks
deleted file mode 100755
index b0296fce1..000000000
--- a/rt/webrt/Ticket/Elements/EditLinks
+++ /dev/null
@@ -1,109 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Ticket/Elements/Attic/EditLinks,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2000 Jesse Vincent <jesse@fsck.com>
-
-
-<TABLE>
-<TR>
-<TD VALIGN=TOP>
-<h3>New Relationships</h3>
-<i>Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces.</i><br>
-<TABLE>
-<TR><TD>Merge into:</TD><TD><input name="<%$Ticket->Id%>-MergeInto"> <i>(only one ticket)</i></TD></TR>
-<TR><TD>Depends on:</TD><TD><input name="<%$Ticket->Id%>-DependsOn"></TD></TR>
-<TR><TD>Depended on by:</TD><TD><input name="DependsOn-<%$Ticket->Id%>"></TD></TR>
-<TR><TD>Parents:</TD><TD><input name="<%$Ticket->Id%>-MemberOf"></TD></TR>
-<TR><TD>Children:</TD><TD> <input name="MemberOf-<%$Ticket->Id%>"></TD></TR>
-<TR><TD>Refers to:</TD><TD><input name="<%$Ticket->Id%>-RefersTo"></TD></TR>
-<TR><TD>Referred to by:</TD><TD> <input name="RefersTo-<%$Ticket->Id%>"></TD></TR>
-</TABLE>
-</TD>
-<TD VALIGN=TOP WIDTH=50%>
-<h3>Current Relationships</h3>
-<i>(Check boxes to delete)</i><br>
-
-Depends on:<BR>
-<UL>
-% while (my $link = $Ticket->DependsOn->Next) {
-% my $member = $link->TargetObj;
-<LI>
-<INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
-[<%$member->Status%>]
-
-% }
-</UL>
-
-Depended on by:<BR>
-<UL>
-% while (my $link = $Ticket->DependedOnBy->Next) {
-% my $member = $link->BaseObj;
-<LI>
-<INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-">
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> 
-[<%$member->Status%>]
-% }
-</UL>
-
-Parents:<BR>
-<UL>
-% while (my $link = $Ticket->MemberOf->Next) {
-% my $member = $link->TargetObj;
-<LI>
-<INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
-[<%$member->Status%>]
-
-% }
-</UL>
-
-Children:<BR>
-<UL>
-% while (my $link = $Ticket->Members->Next) {
-<LI>
-<INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-">
-% my $member = $link->BaseObj;
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> 
-[<%$member->Status%>]
-% }
-</UL>
-
-
-Refers to:<BR>
-<UL>
-% while (my $link = $Ticket->RefersTo->Next) {
-<LI>
-<INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
-% if ($link->TargetIsLocal) {
-% my $member = $link->TargetObj;
-
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
-% } else {
-<A HREF="<%$link->TargetAsHREF%>"><%$link->Target%></A>
-% }
-%}
-</UL>
-
-Referred to by:<BR>
-<UL>
-% while (my $link = $Ticket->ReferredToBy->Next) {
-<LI>
-<INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-">
-% if ($link->BaseIsLocal) {
-% my $member = $link->BaseObj;
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
-% } else {
-<A HREF="<%$link->BaseAsHREF%>"><%$link->Base%></A>
-%}
-% }
-</UL>
-
-			    
-</TD>
-</TR>
-</TABLE>
-
-
-      
-<%ARGS>
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/EditPeople b/rt/webrt/Ticket/Elements/EditPeople
deleted file mode 100755
index 4f69af970..000000000
--- a/rt/webrt/Ticket/Elements/EditPeople
+++ /dev/null
@@ -1,37 +0,0 @@
-
-<TABLE>
-<TR>
-<TD VALIGN=TOP>
-
-<h3>New watchers</h3>
-Find people whose<BR>
-<& /Elements/SelectUsers &>
-<input type=submit name="OnlySearchForPeople" value="Go!">
-
-<& AddWatchers, Ticket => $Ticket, UserString => $UserString,
-        UserOp => $UserOp, UserField => $UserField &> 
-</TD><TD VALIGN=TOP>
-<h3>Owner</h3>
-Owner: <& /Elements/SelectOwner, Name => 'Owner', QueueObj => $Ticket->QueueObj, TicketObj => $Ticket, Default => $Ticket->OwnerObj->Id &>
-<h3>Current watchers</h3>
-(Check box to delete)<br>
-
-Requestors:
-<& EditWatchers, TicketObj => $Ticket, Type => 'requestors' &>
-
-Cc:
-<& EditWatchers, TicketObj => $Ticket, Type => 'cc' &>
-
-Administrative Cc:
-<& EditWatchers, TicketObj => $Ticket, Type => 'admincc' &>
-
-</TD>
-</TR>
-</TABLE>
-
-<%ARGS>
-$UserField => undef
-$UserOp => undef
-$UserString => undef
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/EditWatchers b/rt/webrt/Ticket/Elements/EditWatchers
deleted file mode 100755
index 00185e8f9..000000000
--- a/rt/webrt/Ticket/Elements/EditWatchers
+++ /dev/null
@@ -1,46 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Ticket/Elements/Attic/EditWatchers,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2000 Jesse Vincent <jesse@fsck.com>
-
-<ul>
-
-%# Print out a placeholder if there are none.
-%if ($watchers->Count == 0 ) {
-<li><i>none</i>
-% }
-
-
-%while (my $watcher=$watchers->Next) {
-<li>
-<INPUT TYPE=CHECKBOX NAME="DelWatcher<%$watcher->id%>" UNCHECKED>
-%#If there's a principal backing this user, lets give a link to their
-%# account
-%if ($watcher->IsUser) { 
-<a href="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$watcher->OwnerObj->id%>">
-<%$watcher->OwnerObj->RealName%></a>:
-%} else {
-Email address:
-%}
-<i><%$watcher->Email%></i>
-%}
-</ul>
-<%INIT>
-my ($watchers, $watcher, $set);
-if ($Type  =~ /^request/i) {
-       $watchers = $TicketObj->Requestors;
-       }
-elsif ($Type =~ /^admin/i) {
-        $watchers = $TicketObj->AdminCc;
-        }
-elsif ($Type =~ /^cc/i) {
-        $watchers = $TicketObj->Cc;
-      }
-else { $watchers = $TicketObj->Watchers;
-       }
-</%INIT>
-<%ARGS>
-$TicketObj => undef
-$Type => undef
-</%ARGS>
-
-
-
diff --git a/rt/webrt/Ticket/Elements/ShowBasics b/rt/webrt/Ticket/Elements/ShowBasics
deleted file mode 100755
index 97c84c9d0..000000000
--- a/rt/webrt/Ticket/Elements/ShowBasics
+++ /dev/null
@@ -1,29 +0,0 @@
- <TABLE WIDTH="100%">
-      <TR>
-	<TD VALIGN=TOP WIDTH="20%">
-	  <& /Elements/ShadedBox, title => 'Id' , content => $Ticket->Id &>
-	</TD>
-	<TD VALIGN=TOP WIDTH="20%"> <& /Elements/ShadedBox, title => 'Status' , content => $Ticket->Status &>
-	</TD>
-	<TD VALIGN=TOP WIDTH="20%">
-        <& /Elements/ShadedBox, title => 'Worked' , content => $TimeWorked ." min" &>
-	</TD>
-	<TD VALIGN=TOP WIDTH="20%">
-	  <& /Elements/ShadedBox, title => 'Priority', content=> $Ticket->Priority."/".$Ticket->FinalPriority &>
-	</TD>
-	<TD VALIGN=TOP WIDTH="20%">
-	  <& /Elements/ShadedBox, title => 'Queue', content=> $Ticket->QueueObj->Name &>
-	</TD>	
-
-
-      </TR>
-    </TABLE>
-<%INIT>
-my $TimeWorked = $Ticket->TimeWorked;
-if ($Ticket->TimeLeft > 0 ) {
-        $TimeWorked = $Ticket->TimeWorked."/".$Ticket->TimeLeft;
-}
-</%INIT>
-<%ARGS>
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowDates b/rt/webrt/Ticket/Elements/ShowDates
deleted file mode 100755
index e17e31355..000000000
--- a/rt/webrt/Ticket/Elements/ShowDates
+++ /dev/null
@@ -1,54 +0,0 @@
-<TABLE>
-<TR>
-<TD>
-Created:
-</TD>
-<TD>
-<% $Ticket->CreatedObj->AsString %>
-</TD>
-</TR>
-<TR>
-<TD>
-Starts: 
-</TD>
-<TD>
-<% $Ticket->StartsObj->AsString %> <BR>
-</TD>
-</TR>
-<TR>
-<TD>
-Started:
-</TD>
-<TD>
-<% $Ticket->StartedObj->AsString %>
-</TD>
-</TR>
-
-<TR>
-<TD>
-<a href="Display.html?id=<%$Ticket->id%>&Action=SetTold">Last Contact</a>:
-</TD>
-<TD>
-<% $Ticket->ToldObj->AsString %>
-</TD>
-</TR>
-<TR>
-<TD>
-Due:
-</TD>
-<TD><% $Ticket->DueObj->AsString  %>
-</TD>
-</TR>
-<TR>
-<TD>
-Updated:
-</TD>
-<TD>
-<A HREF="#lasttrans">
-<% $Ticket->LastUpdated ? ($Ticket->LastUpdatedAsString ." by ".$Ticket->LastUpdatedByObj->Name) : "Never" | h %></a>
-</TD>
-</TR>
-</TABLE>
-<%ARGS>
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowDependencies b/rt/webrt/Ticket/Elements/ShowDependencies
deleted file mode 100755
index 488652f83..000000000
--- a/rt/webrt/Ticket/Elements/ShowDependencies
+++ /dev/null
@@ -1,18 +0,0 @@
-Depends on:<BR>
-% while (my $Link = $Ticket->DependsOn->Next) {
-% my $member = $Link->TargetObj;
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
-[<%$member->Status%>]
- <br>
-% }
-Depended on by:<BR>
-% while (my $Link = $Ticket->DependedOnBy->Next) {
-% my $member = $Link->TargetObj;
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> 
-[<%$member->Status%>]
- <br>
-% }
-
-<%ARGS>
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowHistory b/rt/webrt/Ticket/Elements/ShowHistory
deleted file mode 100755
index 155eaaabd..000000000
--- a/rt/webrt/Ticket/Elements/ShowHistory
+++ /dev/null
@@ -1,43 +0,0 @@
-<TABLE BORDER=0 width="100%">
-<TR>
-<TD ALIGN=LEFT>
-% if ($ShowTitle) {
-<font size=+3>History</font>
-% }
-&nbsp;</TD>
-<TD align=right><font size=-1>Display mode: 
-%  if ($ShowHeaders == $Ticket->Id) {
-[<A HREF="<%$URIFile%>?id=<%$Ticket->id%>">Brief headers</a>]
-<b>[Full headers]</b>
-% } else {
-<b>[Brief headers]</b>
-[<A HREF="<%$URIFile%>?ShowHeaders=<%$Ticket->Id%>&id=<%$Ticket->id%>">Full headers</a>]
-%  }
-</font>
-</TD>
-</TR>
-</TABLE>
-
-<TABLE WIDTH=100% CELLSPACING=0 CELLPADDING=2 BORDER=0>
-% while (my $Transaction = $Transactions->Next) {
-% $i++;
-%	if ($Transactions->IsLast) {
-	<a name="lasttrans"></a>
-% 	}
-	    <& ShowTransaction, Ticket => $Ticket, Transaction => $Transaction, ShowHeaders => $ShowHeaders, Collapsed => $Collapsed, RowNum => $i  &>
-% }
-</TABLE>
-<%INIT>
-
-my $Transactions = $Ticket->Transactions;
-my $i;
-
-
-</%INIT>
-<%ARGS>
-$URIFile => 'Display.html'
-$Ticket => undef
-$ShowHeaders => undef
-$Collapsed => undef
-$ShowTitle => 1
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowKeywordSelects b/rt/webrt/Ticket/Elements/ShowKeywordSelects
deleted file mode 100644
index 4f8a1786b..000000000
--- a/rt/webrt/Ticket/Elements/ShowKeywordSelects
+++ /dev/null
@@ -1,26 +0,0 @@
-<TABLE>
-% while ( my $KeywordSelect = $KeywordSelects->Next ) {
-    <TR>
-      <TD VALIGN=TOP>
-	<% $KeywordSelect->Name %><BR>
-      </TD>
-      <TD VALIGN=TOP>
-	<UL>
-% my $Keywords = $Ticket->KeywordsObj($KeywordSelect->Id);
-% while (my $Keyword = $Keywords->Next) { 
-	<li><% $Keyword->KeywordObj->RelativePath($KeywordSelect->KeywordObj) |n %></li>
-
-%   }
-	</ul>
-      </TD>
-    </TR>
-% }
-</TABLE>
-
-<%INIT>
-my $KeywordSelects = $Ticket->QueueObj->KeywordSelects;
-</%INIT>
-
-<%ARGS>
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowLinks b/rt/webrt/Ticket/Elements/ShowLinks
deleted file mode 100755
index 49795959e..000000000
--- a/rt/webrt/Ticket/Elements/ShowLinks
+++ /dev/null
@@ -1,61 +0,0 @@
-Depends on:<BR>
-<UL>
-% while (my $Link = $Ticket->DependsOn->Next) {
-% my $member = $Link->TargetObj;
-<LI><a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
-[<%$member->Status%>]
-
-% }
-</UL>
-
-Depended on by:<BR>
-<UL>
-% while (my $Link = $Ticket->DependedOnBy->Next) {
-% my $member = $Link->BaseObj;
-<LI><a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> 
-[<%$member->Status%>]
-% }
-</UL>
-Parents:<BR>	
-<UL>
-% while (my $Link = $Ticket->MemberOf->Next) {
-% my $member = $Link->TargetObj;
-<LI><a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
-[<%$member->Status%>]
-
-% }
-</UL>
-
-Children:<BR>
-<& /Ticket/Elements/ShowMembers, Ticket => $Ticket &>
-<BR>
-Refers to:<BR>
-<UL>
-% while (my $Link = $Ticket->RefersTo->Next) {
-<LI>
-% if ($Link->TargetIsLocal) {
-% my $member = $Link->TargetObj;
-
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
-% } else {
-<A HREF="<%$Link->TargetAsHREF%>"><%$Link->Target%></A>
-% }
-%}
-</UL>
-
-Referred to by:<BR>
-<UL>
-% while (my $Link = $Ticket->ReferredToBy->Next) {
-<LI>
-% if ($Link->BaseIsLocal) {
-% my $member = $Link->BaseObj;
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
-% } else {
-<A HREF="<%$Link->BaseAsHREF%>"><%$Link->Base%></A>
-%}
-% }
-</UL>
-
-<%ARGS>
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowMemberOf b/rt/webrt/Ticket/Elements/ShowMemberOf
deleted file mode 100755
index df5dc92b0..000000000
--- a/rt/webrt/Ticket/Elements/ShowMemberOf
+++ /dev/null
@@ -1,12 +0,0 @@
-<UL>
-% my $memberof = $Ticket->MemberOf;
-% while (my $member_of = $memberof->Next) {
-<LI><a href="/Ticket/Display.html?id=<%$member_of->Id%>"><%$member_of->Id%></a>: <%$member_of->Subject%> [<%$member_of->Status%>]
-% }
-</UL>
-
-<%INIT>
-</%INIT>
-<%ARGS>
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowMembers b/rt/webrt/Ticket/Elements/ShowMembers
deleted file mode 100755
index 0a6f12377..000000000
--- a/rt/webrt/Ticket/Elements/ShowMembers
+++ /dev/null
@@ -1,22 +0,0 @@
-% if ($members->Count) {
-<UL>
-% while (my $link = $members->Next) {
-% my $member= $link->BaseObj;
-<LI><a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: <%$member->Subject%> [<%$member->Status%>]<br>
-% if ($depth < 8) {
-<&/Ticket/Elements/ShowMembers, Ticket => $member, depth => ($depth+1) &> 
-% }
-% }
-</UL>
-% }
-
-<%INIT>
-
-my $members = $Ticket->Members;
-
-</%INIT>
-
-<%ARGS>
-$Ticket => undef
-$depth => 1
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowPeople b/rt/webrt/Ticket/Elements/ShowPeople
deleted file mode 100755
index ff35f484d..000000000
--- a/rt/webrt/Ticket/Elements/ShowPeople
+++ /dev/null
@@ -1,12 +0,0 @@
-Owner<BR>
-&nbsp;<B><%$Ticket->OwnerObj->Name%></B><BR>
-Requestors<BR>
-&nbsp;<B><%$Ticket->RequestorsAsString%></B><BR>
-Cc<BR>
-&nbsp;<B><%$Ticket->CcAsString%></B><BR>
-AdminCc<BR>
-&nbsp;<B><%$Ticket->AdminCcAsString%></B>
-<%ARGS>
-$Ticket => undef
-</%ARGS>
-
diff --git a/rt/webrt/Ticket/Elements/ShowReferences b/rt/webrt/Ticket/Elements/ShowReferences
deleted file mode 100755
index 37e2fdece..000000000
--- a/rt/webrt/Ticket/Elements/ShowReferences
+++ /dev/null
@@ -1,27 +0,0 @@
-<UL>
-% while (my $Link = $Ticket->RefersTo->Next) {
-<LI>
-% if ($Link->TargetIsLocal) {
-% my $member = $Link->TargetObj;
-
-<a href="/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
-% } else {
-<A HREF="<%$Link->TargetAsHREF%>"><%$Link->Target%></A>
-% }
-%}
-
-
-
-% while (my $Link = $Ticket->ReferredToBy->Next) {
-<LI>
-% if ($Link->BaseIsLocal) {
-% my $member = $Link->BaseObj;
-<a href="/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
-% } else {
-<A HREF="<%$Link->BaseAsHREF%>"><%$Link->Base%></A>
-%}
-% }
-</UL>
-<%ARGS>
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowRequestor b/rt/webrt/Ticket/Elements/ShowRequestor
deleted file mode 100644
index fcbe71df1..000000000
--- a/rt/webrt/Ticket/Elements/ShowRequestor
+++ /dev/null
@@ -1,35 +0,0 @@
-<%PERL>
-my $people = $Ticket->Requestors;
-while (my $requestor=$people->Next) {
-if (($requestor->Owner ) && (my $user=$requestor->OwnerObj)) {
-my $name=$user->RealName || $user->EmailAddress;	
-my $tickets = new RT::Tickets($session{'CurrentUser'});
-$tickets->LimitRequestor(VALUE => $user->EmailAddress);
-$tickets->LimitStatus( VALUE => 'open');
-$tickets->LimitStatus( VALUE => 'new');
-$tickets->RowsPerPage(25);
-$tickets->OrderBy(FIELD => 'Priority',
-		  ORDER => 'DESC');
-</%PERL>
-
-% unless ($user->Privileged) {
-<& /Elements/TitleBoxStart, 
-	title => "<a class='inverse' href=\"$RT::WebPath/Admin/Users/Modify.html?id=".$user->id."\">More about $name</a>" &>
-
-Comments about this user:<BR>
-<B><% ($user->Comments || "No comment entered about this user") %></B><BR>
-
-This user's 25 highest priority tickets:<BR>
-<UL>
-%while (my $w=$tickets->Next) {
-<LI><%$w->Id%>: <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$w->id%>"><%$w->Subject%></a> (<%$w->Status%>)
-%}
-</UL>
-<& /Elements/TitleBoxEnd &>
-
-% }
-% }
-%}
-<%ARGS>
-$Ticket=>undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowSummary b/rt/webrt/Ticket/Elements/ShowSummary
deleted file mode 100755
index b80ceb4fd..000000000
--- a/rt/webrt/Ticket/Elements/ShowSummary
+++ /dev/null
@@ -1,61 +0,0 @@
-      <TABLE WIDTH="100%" >
-      <TR>
-	<TD VALIGN=TOP >
-	  <& /Elements/TitleBoxStart, title => 'The Basics', 
-		title_href =>"$RT::WebPath/Ticket/Modify.html?id=".$Ticket->Id, 
-		title_class=> 'inverse',  
-		color => "#993333" &>
-	  <& /Ticket/Elements/ShowBasics, Ticket => $Ticket &>
-	  <& /Elements/TitleBoxEnd &>
-
-	<BR>
-
-	  <& /Elements/TitleBoxStart, 
-		title_href =>"$RT::WebPath/Ticket/Modify.html?id=".$Ticket->Id, 
-		title_class=> 'inverse',  
-		title => "Keyword Selections", color => "#993300"
-	  &>
-	  <& /Ticket/Elements/ShowKeywordSelects, Ticket => $Ticket &>
-	  <& /Elements/TitleBoxEnd &>
-
-	
-
-	<BR>
-	  <& /Elements/TitleBoxStart, title => 'Relationships', 
-		title_href => "$RT::WebPath/Ticket/ModifyLinks.html?id=".$Ticket->Id, 
-		title_class=> 'inverse',  
-		titleright => '', color=> "#336633" &>
-	  <& /Ticket/Elements/ShowLinks, Ticket => $Ticket &>
-	<& /Elements/TitleBoxEnd &>
-	</TD>
-	<BR>
-	<TD VALIGN=TOP >
-
-	  <& /Elements/TitleBoxStart, title => "Dates",
-		title_href =>"$RT::WebPath/Ticket/ModifyDates.html?id=".$Ticket->Id, 
-		title_class=> 'inverse',  
-		 color => "#663366" &>
-	  <& /Ticket/Elements/ShowDates, Ticket => $Ticket &>
-	  <& /Elements/TitleBoxEnd &>
-	<BR>  
-	  <& /Elements/TitleBoxStart, title => 'People', 
-		title_href =>"$RT::WebPath/Ticket/ModifyPeople.html?id=".$Ticket->Id, 
-		title_class=> 'inverse',  
-		color => "#333399" &>
-	  <& /Ticket/Elements/ShowPeople, Ticket => $Ticket &>
-	  <& /Elements/TitleBoxEnd &>
-	<BR>
-
-	  <& /Ticket/Elements/ShowRequestor, Ticket => $Ticket &>
-
-
-	</TD>
-      </TR>
-    </TABLE>
-<%ARGS>
-$Ticket => undef
-</%ARGS>
-
-
-
-
diff --git a/rt/webrt/Ticket/Elements/ShowTransaction b/rt/webrt/Ticket/Elements/ShowTransaction
deleted file mode 100755
index a0da008b3..000000000
--- a/rt/webrt/Ticket/Elements/ShowTransaction
+++ /dev/null
@@ -1,162 +0,0 @@
-<TR bgcolor="<%$rowbgcolor%>">
-<TD bgcolor="<%$bgcolor%>"><A NAME="#<%$Transaction->Id%>"></A>&nbsp&nbsp;</TD>
-<TD>&nbsp&nbsp;</TD>
-<TD><font size=-2><% $transdate|n %></font>&nbsp;</TD>
-<TD ALIGN="LEFT"><b><%$Transaction->CreatorObj->Name%> - <%$TicketString%> <%$Transaction->BriefDescription%>
-
-</b></TD>
-<TD><%$TimeTaken%>&nbsp;</TD>
-<TD ALIGN="RIGHT"><font size=-1><%$titlebar_commands|n%></font></TD>
-</TR>
-<%PERL>
-
-unless ($Collapsed) {
- $attachments->GotoFirstItem;
- while (my $message=$attachments->Next) {
-     #we don't want to show any empty transactions, unless they have kids
-     next unless (length $message->Content || $message->Children->Count);
-     my ($headers, $content);
-     
-    </%PERL>
-
-
-<%PERL>
-  if ($message->Parent == 0) {
-      if ($ShowHeaders == $Ticket->Id) {
-	  $headers = $message->Headers;
-      } else {
-	  $headers = $message->NiceHeaders;
-      }
-      chomp $headers;
-      $headers .= "\n\n" if ($headers);
-  }
-     # 13456 is a random # of about the biggest size we want to see inline text
-     my $MAX_INLINE_BODY = 13456;
-     if ($message->ContentType =~ m{^(text/plain|message|text$)}i && 
-				    length($message->Content)< $MAX_INLINE_BODY ) {
-
-	 $content = $message->Content;
-
-	 my $wrapper = new Text::Wrapper (columns=>85);
-	 $content = $wrapper->wrap($content);
-         $content =~ s/&/&amp;/g;
-	 $content =~ s/</&lt;/g;
-	 $content =~ s/>/&gt;/g;
-         $content =~ s!((?:http|https|ftp|mailto):\S*?)([\s"']|&gt;|\.[\n])!<A HREF=\"$1\" TARGET=new>$1</A>$2!g;
-
-
-     }
-     else {
-	 $content = "&nbsp;";
-     }
-        
-</%PERL>
-<TR BGCOLOR="<%$rowbgcolor%>">
-      <TD BGCOLOR="<%$bgcolor%>">&nbsp;&nbsp;</TD>
-      <TD>&nbsp&nbsp;</TD>
-      <TD COLSPAN=3 VALIGN=TOP>
-	<PRE>
-<%$headers%><%$content|n%>
-</PRE>
-      </TD>
-      <TD VALIGN=TOP ALIGN=RIGHT>
-	
-% if ($message->Parent == 0  ) {
-<BR>
-% }
-<%PERL>
-my $size = length($message->Content());
-
-if ($size) {
-    if ($size > 1024) {
-	$size = int($size/102.4)/10 . "k";
-    }
-    else {
-	$size = $size ."b";
-    }
-</%PERL>
-<font size=-1><A HREF="Attachment/<%$Transaction->Id%>/<%$message->Id%>/<%$message->Filename%>">Download <%$message->Filename|| '(untitled)'%></a> <% $size %></font>
-% }
-</TD>
-</TR>
-% }
-% }
-
-
-
-<%ARGS>
-$Ticket => undef
-$Transaction => undef
-$ShowHeaders => undef
-$Collapsed => undef
-$ShowTitleBarCommands => 1
-$RowNum => 1
-</%ARGS>
-
-<%INIT>
-
-
-my ($TimeTaken, $TicketString, $bgcolor, $rowbgcolor);
-
-my $transdate = $Transaction->CreatedAsString();
-$transdate =~ s/\s/&nbsp;/g;
-
-if ($RowNum % 2) {
-	$rowbgcolor="#cccccc";
-} else {
-	$rowbgcolor="#ffffff";
-}
-
-if ($Transaction->Type =~ /^(Create|Correspond|Comment$)/) {
-	if ($Transaction->IsInbound) {
-		$bgcolor="#336699";
-	}
-	else {
-		$bgcolor="#339999";
-	}
-} elsif (($Transaction->Field =~ /^Owner$/) or 
-	 ($Transaction->Type =~ /^(AddWatcher|DelWatcher)$/)) {
-	$bgcolor="#333399";
-
-} elsif ($Transaction->Type =~ /^(AddLink|DeleteLink)$/) {
-	$bgcolor="#336633";
-} elsif ($Transaction->Type =~ /^(Status|Set|Keyword|Told)$/) {
-	if ($Transaction->Field =~ /^(Told|Starts|Started|Due)$/) {
-		$bgcolor="#663366";	
-	}
-	else {
-		$bgcolor="#993333";
-	}
-}
-else {
-	$bgcolor="#cccccc";
-}
-
-if ($Ticket->Id != $Transaction->Ticket) {
-	$TicketString = "Ticket ".$Transaction->Ticket .": ";
-}
-
-if ($Transaction->TimeTaken > 0) {
-	$TimeTaken = $Transaction->TimeTaken." min"
-}
-my $attachments = $Transaction->Attachments;
-
-my $titlebar_commands='&nbsp;';
-
-# If the transaction has anything attached to it at all
-if ($Transaction->Message->First && $ShowTitleBarCommands) {
-	if ($Transaction->TicketObj->CurrentUserHasRight('ReplyToTicket')) {
-		$titlebar_commands .= 
-	  	  "[<a href=\"Update.html?id=".
-		  $Transaction->Ticket . "&QuoteTransaction=".$Transaction->Id.
-		  "&Action=Respond\">Reply</a>]&nbsp;";
-	}
-	if ($Transaction->TicketObj->CurrentUserHasRight('CommentOnTicket')) {
-	     $titlebar_commands .= 
-	     "[<a href=\"Update.html?id=".$Transaction->Ticket. 
-	     "&QuoteTransaction=".$Transaction->Id.
-	     "&Action=Comment\">Comment</a>]";
-	}
-}
-
-</%INIT>
diff --git a/rt/webrt/Ticket/Elements/Tabs b/rt/webrt/Ticket/Elements/Tabs
deleted file mode 100755
index 8cce197de..000000000
--- a/rt/webrt/Ticket/Elements/Tabs
+++ /dev/null
@@ -1,126 +0,0 @@
-<& /Elements/Tabs, tabs => $tabs, actions => $actions, current_tab => $current_tab, tabs_scalar => $tabs_scalar &>
-<%INIT>
-	
-  my $id = $Ticket->id();
-  my $tabs_scalar = '';
-  my $tabs = {
-		 A => { title => 'Display',
-			path => "Ticket/Display.html?id=".$id,
-		      },
-	      
-	      Ab => { title => 'History',
-		      path => "Ticket/History.html?id=".$id,
-		       },
-	      B => { title => 'Basics',
-		     path => "Ticket/Modify.html?id=".$id,
-		   },
-	      
-	      C => { title => 'Dates',
-		     path => "Ticket/ModifyDates.html?id=".$id,
-		   },
-	      
-	      D => { title => 'People',
-		     path => "Ticket/ModifyPeople.html?id=".$id,
-		   },
-	      E => { title => 'Links',
-		     path => "Ticket/ModifyLinks.html?id=".$id,
-		   },
-	      F => { title => 'Jumbo',
-		     path => "Ticket/ModifyAll.html?id=".$id,
-		   },
-	      
-	     };
-
-my $actions;
-if ($Ticket->CurrentUserHasRight('ModifyTicket') or 
-    $Ticket->CurrentUserHasRight('CommentOnTicket')) {
-    $actions->{'Comment'} = 
-      { 
-       title => 'Comment',
-	path => "Ticket/Update.html?Action=Comment&id=".$id,
-      }
-  };
-
-if ($Ticket->CurrentUserHasRight('ModifyTicket') or 
-    $Ticket->CurrentUserHasRight('ReplyToTicket')) {
-    $actions->{'Reply'} = 
-      { 
-       title => 'Reply',
-       path => "Ticket/Update.html?Action=Respond&id=".$id,
-      }
-  };
-
-if ($Ticket->CurrentUserHasRight('OwnTicket')) {
-    if ($Ticket->OwnerObj->id == $RT::Nobody->id)  {
-	$actions->{'Take'} = 	
-	  { 
-	   path => "Ticket/Display.html?Action=Take&id=".$id,
-	   title => 'Take'
-	  };
-    }
-    elsif ( $Ticket->OwnerObj->id != $session{CurrentUser}->id) {
-	$actions->{'Steal'} = 	
-	  { 
-	   path => "Ticket/Display.html?Action=Steal&id=".$id,
-	   title => 'Steal' 
-	  };
-    }
-}
-
-if ($Ticket->CurrentUserHasRight('ModifyTicket')) {
-    if ($Ticket->Status ne 'resolved') {
-	$actions->{'Resolve'} = 
-	  { 
-
-           path => "Ticket/Update.html?Action=Comment&DefaultStatus=resolved&id=".$id,
-	   title => 'Resolve'
-	  };
-    }	
-    if ($Ticket->Status ne 'open') {	
-	$actions->{'Open'} = 
-	  { 
-	   path => "Ticket/Display.html?Status=open&id=". $id,
-	   title => 'Open'
-	  };
-    }
-}
-
-
-
-
-if (defined $session{'tickets'}) {
-    my $items = $session{'tickets'}->ItemsArrayRef();
-    my @indexs = grep(($items->[$_]->id == $Ticket->Id), 0 .. $#{$items});
-
-    if ($items->[0]) {
-
-    if ($items->[$indexs[0]]->id == $Ticket->Id) {
-	# Don't display prev links if we're on the first ticket
- 	if ( $items->[0]->id != $Ticket->id ) {
-	    $tabs_scalar .= '[<A HREF="Display.html?id='.
-	      $items->[0]->id.
-		'">&lt;&lt; First</a>] ';
-	    $tabs_scalar .= '[<A HREF="Display.html?id='.
-	      $items->[$indexs[0]-1]->id.
-		'">&lt; Prev</a>] ';
-	}
-	# Don't display next links if we're on the last ticket
-	if ( $Ticket->id != $items->[-1]->id ) {
-	    $tabs_scalar .= '[<A HREF="Display.html?id='.
-	      $items->[$indexs[0]+1]->id.
-		'">Next &gt;</a>] ';
-	    $tabs_scalar .= '[<A HREF="Display.html?id='.
-	      $items->[-1]->id.
-		'">Last &gt;&gt</a>]';
-	}
-	$tabs_scalar .= "<BR><BR>";
-    }
-    }
-}
-</%INIT>
-
-  
-<%ARGS>
-$Ticket => undef
-$current_tab => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ToolBar b/rt/webrt/Ticket/Elements/ToolBar
deleted file mode 100755
index 108e2f784..000000000
--- a/rt/webrt/Ticket/Elements/ToolBar
+++ /dev/null
@@ -1,3 +0,0 @@
-<%ARGS>
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/History.html b/rt/webrt/Ticket/History.html
deleted file mode 100755
index e0a5fe15a..000000000
--- a/rt/webrt/Ticket/History.html
+++ /dev/null
@@ -1,30 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Ticket/Attic/History.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2000 Jesse Vincent <jesse@fsck.com>
-
-<& /Elements/Header, Title => "Ticket History #".$Ticket->Id ." ".$Ticket->Subject &>
-<& /Ticket/Elements/Tabs, Ticket => $Ticket, current_tab => 'Ticket/History.html?id='.$Ticket->id  &>
-
-<BR>
-      
-<& /Ticket/Elements/ShowHistory , Ticket => $Ticket, ShowHeaders => $ARGS{'ShowHeaders'}, URIFile => 'History.html' &> 
-
-
-<%ARGS>
-$id => undef
-</%ARGS>
-
-<%INIT>
-
-  
-
-my $Ticket = LoadTicket ($id);
-
-unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
-	Abort("No permission to view ticket");
-}
-
-</%INIT>
-
-
-
-
diff --git a/rt/webrt/Ticket/Modify.html b/rt/webrt/Ticket/Modify.html
deleted file mode 100755
index 7a8a79216..000000000
--- a/rt/webrt/Ticket/Modify.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<& /Elements/Header, Title => 'Modify ticket #'.$TicketObj->Id &>
-<& /Ticket/Elements/Tabs, Ticket => $TicketObj, current_tab => "Ticket/Modify.html?id=".$TicketObj->Id  &>
-
-<& /Elements/ListActions, actions => \@results &>
-<FORM METHOD=POST ACTION="Modify.html">
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$TicketObj->Id%>">
-
-<& /Elements/TitleBoxStart, title => 'Modify ticket #'.$TicketObj->Id, 
-  color=> "#993333", width => "100%" &>
-<& Elements/EditBasics, TicketObj => $TicketObj &>
-<& /Elements/TitleBoxEnd &>
-
-<& /Elements/TitleBoxStart, title => 'Keywords', color =>"#993333"&>
-<& Elements/EditKeywordSelects, TicketObj=>$TicketObj &>
-<& /Elements/TitleBoxEnd &>
-
-<& /Elements/Submit, Label => 'Save Changes', Caption => "If you've updated anything above, be sure to", color => "#993333" &>
-</form>
-<%INIT>
-  
-my $TicketObj = LoadTicket($id);
-
-my @results = ProcessTicketBasics(TicketObj => $TicketObj, ARGSRef => \%ARGS);
-my @okresults = ProcessTicketObjectKeywords(TicketObj => $TicketObj, ARGSRef => \%ARGS);
-
-push (@results, @okresults);
-
-# TODO: display the results, even if we can't display the ticket
-
-unless ($TicketObj->CurrentUserHasRight('ShowTicket')) {
-     Abort("No permission to view ticket");
-} 
-
-</%INIT>
-
-
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/ModifyAll.html b/rt/webrt/Ticket/ModifyAll.html
deleted file mode 100755
index ad913739d..000000000
--- a/rt/webrt/Ticket/ModifyAll.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<& /Elements/Header, Title => "Ticket #".$Ticket->Id ." Jumbo update: ".$Ticket->Subject &>
-<& /Ticket/Elements/Tabs, Ticket => $Ticket , current_tab => "Ticket/ModifyAll.html?id=".$Ticket->Id &>
-
-<& /Elements/ListActions, actions => \@results &>
-
-<FORM METHOD=POST ACTION="ModifyAll.html" ENCTYPE="multipart/form-data">
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>">
-
-
-<& /Elements/TitleBoxStart, title => 'Modify ticket #'.$Ticket->Id,   color=> "#993333", width => "100%" &>
-<& Elements/EditBasics, TicketObj => $Ticket &>
-<& /Elements/TitleBoxEnd &>
-
-<BR>
-
-<& /Elements/TitleBoxStart, title => 'Dates',  width => "100%", color => "#663366"  &>
-<& Elements/EditDates, TicketObj => $Ticket &>
-<& /Elements/TitleBoxEnd &>
-
-<BR>
-
-<& /Elements/TitleBoxStart, title => 'Keywords', color =>"#993333"&>
-<& Elements/EditKeywordSelects, TicketObj=>$Ticket &>
-<& /Elements/TitleBoxEnd &>
-
-<BR>
-
-<& /Elements/TitleBoxStart, title => 'People',width => "100%", color=> "#333399" &>
-<& Elements/EditPeople, Ticket => $Ticket, UserField => $UserField, UserString => $UserString, UserOp => $UserOp &>
-<& /Elements/TitleBoxEnd &>
-
-<BR>
-
-<& /Elements/TitleBoxStart, title => 'Relationships', color => "#336633"&>
-<& Elements/EditLinks, Ticket => $Ticket &>
-<& /Elements/TitleBoxEnd &>
-
-<BR>
-
-<& /Elements/TitleBoxStart, title => 'Update ticket' &>
-<hr>
-Update Type: <select name="UpdateType">
-% if ($CanComment) {
-  <option value="private" >Comments (Not sent to requestors)</option>
-% }
-% if ($CanRespond) {
-   <option value="response">Response to requestors</option>
-% }
-</select> 
-<br>
-
-Subject: <input name="UpdateSubject" size=60 value=""> <br>
-Attach: <input name="UpdateAttachment" type=file> <br>
-<& /Elements/MessageBox, Name=>"UpdateContent", QuoteTransaction=>$ARGS{QuoteTransaction} &>
-<& /Elements/TitleBoxEnd &>
-
-
-<& /Elements/Submit, Label => 'Save Changes', Caption => "If you've updated anything above, be sure to", color => "#333399" &>
-</form>
-
-<%INIT>
-
-
-
-my $Ticket = LoadTicket($id);
-
-my $CanRespond = 0;
-my $CanComment = 0;
-
-
-$CanRespond = 1 if ( $Ticket->CurrentUserHasRight('ReplyToTicket') or
-                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
-
-$CanComment = 1 if ( $Ticket->CurrentUserHasRight('CommentOnTicket') or
-                     $Ticket->CurrentUserHasRight('ModifyTicket') );
-
-
-my (@wresults, @results, @okresults, @dresults, @lresults);
-
-unless ($OnlySearchForPeople) {
-    @wresults = ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS);
-    @results = ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS);
-    @okresults = ProcessTicketObjectKeywords(TicketObj => $Ticket, ARGSRef => \%ARGS);
-
-    @dresults = ProcessTicketDates( TicketObj => $Ticket, ARGSRef => \%ARGS);
-    @lresults = ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);
-
-    $ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
-
-    if ($ARGS{'UpdateContent'} && 
-	$ARGS{'UpdateContent'} ne '' && 
-	$ARGS{'UpdateContent'} ne  "-- \n" . 
-				$session{'CurrentUser'}->UserObj->Signature
-       ) {
-   	 ProcessUpdateMessage(TicketObj => $Ticket, 
-			      ARGSRef=>\%ARGS, 
-                              Actions=>\@results);
-	}
-}
-push @results, @wresults;
-push @results, @dresults;
-push @results, @lresults;
-push @results, @okresults;
-
-# If they've gone and moved the ticket to somewhere they can't see, etc...
-# TODO: display the results, even if we can't display the ticket.
-
-unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
-   Abort("No permission to view ticket");
-}
-
-
-</%INIT>
-
-
-
-<%ARGS>
-$OnlySearchForPeople => undef
-$UserField => undef
-$UserOp => undef
-$UserString => undef
-$id => undef
-</%ARGS>
-
diff --git a/rt/webrt/Ticket/ModifyDates.html b/rt/webrt/Ticket/ModifyDates.html
deleted file mode 100755
index b2ecb68fb..000000000
--- a/rt/webrt/Ticket/ModifyDates.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<& /Elements/Header, Title => 'Modify dates for #'. $TicketObj->Id &>
-<& /Ticket/Elements/Tabs, Ticket => $TicketObj, current_tab => "Ticket/ModifyDates.html?id=".$TicketObj->Id  &> 
-
-<& /Elements/ListActions, actions => \@results &>
-
-<FORM METHOD=POST ACTION="ModifyDates.html">
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$TicketObj->Id%>">
-<& /Elements/TitleBoxStart, title => 'Modify dates for ticket #'.$TicketObj->Id,  width => "100%", color => "#663366"  &>
-
-<& Elements/EditDates, TicketObj => $TicketObj &>
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit, color => "#663366" &>
-</form>
-
-
-<%INIT>
-
-my $TicketObj = LoadTicket($id);
-my @results = ProcessTicketDates( TicketObj => $TicketObj, ARGSRef => \%ARGS);
-
-</%INIT>
-
-
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/ModifyLinks.html b/rt/webrt/Ticket/ModifyLinks.html
deleted file mode 100755
index 14c939d43..000000000
--- a/rt/webrt/Ticket/ModifyLinks.html
+++ /dev/null
@@ -1,31 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Ticket/Attic/ModifyLinks.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2000 Jesse Vincent <jesse@fsck.com>
-
-<& /Elements/Header, Title => "Link ticket ".$Ticket->Id &>
-<& /Ticket/Elements/Tabs, Ticket => $Ticket, current_tab => "Ticket/ModifyLinks.html?id=".$Ticket->Id &>
-
-<& /Elements/ListActions, actions => \@results &>
-
-<form action="ModifyLinks.html" method="post">
-<input type="hidden" name="id" value="<%$Ticket->id%>">
-
-<& /Elements/TitleBoxStart, title => 'Edit Relationships', color => "#336633"&>
-<& Elements/EditLinks, Ticket => $Ticket &>
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit, color => "#336633", Caption=> 'Save changes' &>
-</form>
-
-
-
-
-<%INIT>
-  
-my $Ticket = LoadTicket($id);
-my @results = ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);
-    
-</%INIT>
-      
-      
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/ModifyPeople.html b/rt/webrt/Ticket/ModifyPeople.html
deleted file mode 100755
index fecf09192..000000000
--- a/rt/webrt/Ticket/ModifyPeople.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<& /Elements/Header, Title => 'Modify people related to ticket # ' . $Ticket->id &>
-<& /Ticket/Elements/Tabs, Ticket => $Ticket , current_tab => "Ticket/ModifyPeople.html?id=".$Ticket->Id &>
-
-<& /Elements/ListActions, actions => \@results &>
-
-<FORM METHOD=POST ACTION="ModifyPeople.html">
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>">
-<& /Elements/TitleBoxStart, title => 'Modify people related to ticket #'.$Ticket->Id,   width => "100%", color=> "#333399" &>
-<& Elements/EditPeople, Ticket => $Ticket, UserField => $UserField, UserString => $UserString, UserOp => $UserOp &>
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit, Label => 'Save Changes', Caption => "If you've updated anything above, be sure to", color => "#333399" &>
-</form>
-
-<%INIT>
-
-my (@results, @wresults);
-
-my $Ticket = LoadTicket($id);
-
-# if we're trying to search for watchers and nothing else
-unless ($OnlySearchForPeople) {
-    @results = ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS);
-    @wresults = ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS);
-}
-
-push @results, @wresults;
-</%INIT>
-
-
-
-<%ARGS>
-$OnlySearchForPeople => undef
-$UserField => undef
-$UserOp => undef
-$UserString => undef
-$id => undef
-</%ARGS>
-
diff --git a/rt/webrt/Ticket/Update.html b/rt/webrt/Ticket/Update.html
deleted file mode 100755
index be2266663..000000000
--- a/rt/webrt/Ticket/Update.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<& /Elements/Header, Title=> $title  &>
-<& /Ticket/Elements/Tabs, Ticket => $Ticket &>
-<& /Elements/TitleBoxStart, title => "Update ticket" &>
-
-<FORM ACTION="Display.html" NAME="TicketUpdate" 
-	METHOD=POST enctype="multipart/form-data">
-
-<TABLE>
-<TR><TD>
-<a href="ModifyPeople.html?id=<%$Ticket->Id%>">Ticket watchers</A></TD><TD align=right>
-Requestor:
-</TD><TD>
-<b><% $Ticket->RequestorsAsString %></b>
-</TD></TR>
-<TR><TD>&nbsp;</TD><TD align=right>
-Cc:
-</TD><TD>
-<b><% $Ticket->CcAsString %></b>
-</TD></TR>
-<TR><TD>&nbsp;</TD><TD align=right>
-AdminCc:
-</TD><TD>
-<b><% $Ticket->AdminCcAsString %></b>
-</TD></TR>
-</TR>
-</TABLE>
-<hr>
-
-<TABLE BORDER=0>
-
-<tr><td align=right>Status:</td>
-<td>
-<& /Elements/SelectStatus, Name=>"Status", Default => $DefaultStatus &>
-Owner:  
-<& /Elements/SelectOwner, Name=>"Owner", Default => $Ticket->OwnerObj->Id(), QueueObj => $Ticket->QueueObj, TicketObj => $Ticket &>
-Worked: <input size=4 name="UpdateTimeWorked"> minutes</td></tr>
-<tr><td align=right>Update Type:</td>
-<td><select name="UpdateType">
-% if ($CanComment) {
-  <option value="private" <%$CommentDefault%>>Comments (Not sent to requestors)</option>
-% }
-% if ($CanRespond) {
-   <option value="response" <%$ResponseDefault%>>Response to requestors</option>
-% }
-</select> 
-</td></tr>
-<tr><td align=right>Subject:</td><td> <input name="UpdateSubject" size=60 value="<%$Ticket->Subject()%>"></td></tr>
-<tr><td align=right>Cc:</td><td> <input name="UpdateCc" size=60><BR>
-<i><font size=-2>(Sends a carbon-copy of this update to a comma-delimited list
-of email addresses. Does <b>not</b> change who will receive future updates.)</font></i>
-</td></tr>
-<tr><td align=right>Bcc:</td><td> <input name="UpdateBcc" size=60><BR>
-<i><font size=-2>(Sends a blind carbon-copy of this update to a comma-delimited list
-of email addresses. Does <b>not</b> change who will receive future updates.)</font></i>
-</td></tr>
-<tr><td align=right>Attach:</td><td><input name="UpdateAttachment" type="file"></td></tr>
-</table>
-<& /Elements/MessageBox, Name=>"UpdateContent", QuoteTransaction=>$ARGS{QuoteTransaction} &>
-		<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>"><br>
-
-
-
-
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit &>
-  </FORM>
-
-
-
-<%INIT>
-
-my $CanRespond = 0;
-my $CanComment = 0;
-my $title;
-
-my $Ticket = LoadTicket($id);
-
-
-if ($DefaultStatus eq 'resolved') {
-	$title = "Resolve";
-} else {
-	$title = "Update";
-}
-
-$title .= " ticket #" . $Ticket->id . " (" .$Ticket->Subject.")";
-
-# Things needed in the template - we'll do the processing here, just
-# for the convinience:
-my $CommentDefault=$Action eq "Comment" ? "SELECTED" : "";
-my $ResponseDefault=$Action eq "Respond" ? "SELECTED" : "";
-
-$DefaultStatus = $Ticket->Status() unless ($DefaultStatus);
-
-$CanRespond = 1 if ( $Ticket->CurrentUserHasRight('ReplyToTicket') or
-                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
-
-$CanComment = 1 if ( $Ticket->CurrentUserHasRight('CommentOnTicket') or
-                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
-	
-
-     
-     
-
-</%INIT>
-
-<%ARGS>
-$id => undef
-$Action => undef
-$DefaultStatus => undef
-</%ARGS>
diff --git a/rt/webrt/User/Prefs.html b/rt/webrt/User/Prefs.html
deleted file mode 100755
index d769977f9..000000000
--- a/rt/webrt/User/Prefs.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<& /Elements/Header, Title=>"Preferences" &>
-<& /Elements/Tabs &>
-
-<& /Elements/ListActions, actions => \@results &>
-<form method=post>
-
-% unless ($RT::WebExternalAuth) {
-<& /Elements/TitleBoxStart, title => 'Change password'  &>
-New password: <input type=password name="NewPass1" size=16>
-Confirm: <input type=password name="NewPass2" size=16>
-<& /Elements/TitleBoxEnd &>
-<BR>
-% }
-<& /Elements/TitleBoxStart, title => 'Signature'  &>
-<INPUT TYPE=HIDDEN NAME="SignatureMagic" VALUE=1>
-<TEXTAREA COLS=72 ROWS=4 WRAP=HARD NAME="Signature"><% $session{'CurrentUser'}->UserObj->Signature %></TEXTAREA>
-<br>
-<BR>
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit &>
-	  </form>
-
-
-<%INIT>
-my @results;
-
-if ($NewPass1) {
-    if ($NewPass1 ne $NewPass2) {
-	push (@results, "Passwords did not match.");
-    }	
-    else {
-	my ($val, $msg)=$session{'CurrentUser'}->UserObj->SetPassword($NewPass1);
-	push (@results, "Password: ".$msg);
-    }	
-}
-if ($Signature || $SignatureMagic) {
-    $Signature =~ s/(\r\n|\r)/\n/g;
-    if ($Signature ne $session{'CurrentUser'}->UserObj->Signature) {
-	my ($val, $msg)=$session{'CurrentUser'}->UserObj->SetSignature($Signature);
-	push (@results, "Signature: ".$msg);
-    }
-}
-#A hack to make sure that session gets rewritten.
-
-$session{'i'}++;
-</%INIT>
-
-<%ARGS>
-$Signature => undef
-$SignatureMagic => undef
-$NewPass1 => undef
-$NewPass2 => undef
-</%ARGS>
diff --git a/rt/webrt/autohandler b/rt/webrt/autohandler
deleted file mode 100755
index 16cdbc79b..000000000
--- a/rt/webrt/autohandler
+++ /dev/null
@@ -1,73 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Attic/autohandler,v 1.1 2002-08-12 06:17:08 ivan Exp $
-<& /Elements/Footer, %ARGS &>
-
-<%INIT>
-
-$m->{'rt_base_time'} = time;
-
-#if it's a noauth file, don't ask for auth.
-if ($m->base_comp->path =~ '^/+NoAuth/') {
-        $m->call_next();
-	$m->abort();
-}
-
-# If RT is configured for external auth, let's get REMOTE_USER
-# We intentionally don't test for REMOTE_USER to meet our policy
-elsif ($RT::WebExternalAuth){
-
-    $user = $ENV{'REMOTE_USER'};
-    $session{'CurrentUser'} = RT::CurrentUser->new();
-    $session{'CurrentUser'}->Load($user);
-    unless ($session{'CurrentUser'}->id() ) {
-        delete $session{'CurrentUser'};
-        $m->comp('/Elements/Login', %ARGS, Error=> 'You are not an authorized user');
-        $m->abort();
-    }
-}
- 
-# If the user is loging in, let's authenticate
-elsif (defined ($user) && defined ($pass)){
-    
-    $session{'CurrentUser'} = RT::CurrentUser->new();
-    $session{'CurrentUser'}->Load($user);
-    unless ($session{'CurrentUser'}->id() ) {
-	delete $session{'CurrentUser'};
-	$m->comp('/Elements/Login', %ARGS, Error=> 'Your username or password is incorrect');
-        $m->abort();
-    };
-    unless ($session{'CurrentUser'}->IsPassword($pass)) {
-	delete $session{'CurrentUser'};
-	
-	$m->comp('/Elements/Login', Error => 'Your username or password is incorrect', %ARGS);
-	$m->abort();
-    }
-}
-  
-
-#If we've got credentials, lets serve the file up.
-if ( (defined $session{'CurrentUser'}) and 
-     ( $session{'CurrentUser'}->Id) ) {
-    
-    # If the user isn\'t privileged, they can only see SelfService
-    if ((! $session{'CurrentUser'}->Privileged) and
-	($m->base_comp->path !~ '^/+SelfService/') ) {
-	$m->comp('/SelfService/index.html');
-	$m->abort();
-    }
-    else {
-	$m->call_next;
-    }
-}
-
-#If we have no credentials
-else {
-    $m->comp('/Elements/Login', %ARGS);
-    $m->abort();
-}
-
-</%INIT>
-
-<%ARGS>
-$user => undef
-$pass => undef
-</%ARGS>
diff --git a/rt/webrt/index.html b/rt/webrt/index.html
deleted file mode 100644
index 0c1091abb..000000000
--- a/rt/webrt/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<& /Elements/Header, Title=>"Start page", Refresh => $session{'home_refresh_interval'} &>
-<& /Elements/Tabs, current_toptab => '' &>
-<TABLE BORDER=0 WIDTH=100%>
-<TR VALIGN=TOP>
-<TD WIDTH=70%>
-<& /Elements/CustomHomepageHeader, %ARGS &>
-<& /Elements/MyTickets &>
-<BR>
-<& /Elements/MyRequests &>
-</TD>
-<TD>
-<& /Elements/Quicksearch &>
-<BR>
-<form method=get action="index.html">
-<& /Elements/Refresh, Name => 'HomeRefreshInterval', Default => $session {'home_refresh_interval'} &>
-<div align=right><input type=submit value="Go!"></div>
-</form>
-</TD>
-</TR>
-</TABLE>
-<%init>
-if ($ARGS{'HomeRefreshInterval'}) {
-	$session{'home_refresh_interval'} = $ARGS{'HomeRefreshInterval'};
-}
-</%init>
diff --git a/test/cgi-test b/test/cgi-test
deleted file mode 100755
index 2dda4849b..000000000
--- a/test/cgi-test
+++ /dev/null
@@ -1,560 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: cgi-test,v 1.3 2001-08-21 02:32:54 ivan Exp $
-#
-# This is the beginning of a test suite for the web interface.
-# It's also excellent for populating your database with some meaningful test
-# data.  (a derivative is used by the web demo)
-# It only works on an empty database (probably need empty counters too, and
-# no arbirary RADIUS attributes).
-# Usage: cgi-test http://base.freeside.url/with/path/ username password
-# (Yes, if you were properly paranoid and are using SSL, you'll need to get
-#  libwww-perl working with SSL to use this.)
-
-use strict;
-#use diagnostics;
-use subs qw( big_ugly_data_structure );
-use CGI;
-use LWP::UserAgent;
-
-my ( $base_url, $username, $password ) = ( shift, shift, shift );
-#trust 'em
-$base_url =~ /^(.*)$/; $base_url = $1;
-$username =~ /^(.*)$/; $username = $1;
-$password =~ /^(.*)$/; $password = $1;
-
-my @data = &big_ugly_data_structure;
-
-my $ua = new LWP::UserAgent;
-{
-  local $^W = 0;
-  eval '
-    sub LWP::UserAgent::get_basic_credentials {
-      #my $self = shift;
-      ( $username, $password );
-    }
-  ';
-}
-
-my $data;
-while ( $data = shift @data ) {
-  my $cgi = new CGI ( $data->{'params'} );
-  my $full_url = $base_url. $data->{'url'}. '?'. $cgi->query_string;
-  #my $request = new HTTP::Request( 'POST', $full_url );
-  my $request = new HTTP::Request( 'GET', $full_url );
-  my $response = $ua->request( $request );
-  if ( $response->is_redirect ) {
-    die "Unexpected redirect!\n".
-           "URL: $full_url\n".
-           "To: ". $response->base. "\n"
-    ;
-  } elsif ( $response->is_success ) {
-    my $location = $response->base;
-    my $expected_location = $data->{'location'};
-    #if ( $location =~ /^$base_url$expected_location$/ ) {
-    if ( $location eq $base_url. $expected_location ) {
-      #warn "cool, got expected response $location from $full_url\n";
-    } else {
-      die "Strange, regular response, but unexpected base!\n".
-        "URL: $full_url\n".
-        "Base    : ". $response->base. "\n".
-        "Expected: $base_url$expected_location\n".
-        "Output: ". $response->content. "\n"
-      ;
-    }
-  } elsif ( $response->is_error ) {
-    die "Strange, I got an error\n".
-        "URL: $full_url\n".
-        "Error: ". $response->error_as_HTML. "\n".
-        "Output: ". $response->content. "\n"
-    ;
-  } elsif ( $response->is_info ) {
-    die "Strange, I got an info reponse\n".
-        "URL: $full_url\n".
-        "Output: ". $response->content. "\n"
-    ;
-  } else {
-    die "Really strange, got an unrecognized response from LWP::UserAgent!\n";
-  }
-}
-
-#---
-
-sub big_ugly_data_structure {
-
-  (
-    { 'url'      => 'edit/process/part_svc.cgi',
-      'params'   => {
-                      'svcpart' => '',
-                      'svc'     => 'Shell',
-                      'svcdb'   => 'svc_acct',
-                      'svc_acct__popnum_flag' => '',
-                      'svc_acct__popnum' => '',
-                      'svc_acct__dir_flag' => '',
-                      'svc_acct__dir' => '',
-                      'svc_acct__username_flag' => '',
-                      'svc_acct__username' => '',
-                      'svc_acct__uid_flag' => '',
-                      'svc_acct__uid' => '',
-                      'svc_acct__quota_flag' => 'F',
-                      'svc_acct__quota' => '10',
-                      'svc_acct__slipip_flag' => 'F',
-                      'svc_acct__slipip' => '',
-                      'svc_acct___password_flag' => '',
-                      'svc_acct___password' => '',
-                      'svc_acct__gid_flag' => '',
-                      'svc_acct__gid' => '',
-                      'svc_acct__shell_flag' => 'D',
-                      'svc_acct__shell' => '/bin/sh',
-                      'svc_acct__finger_flag' => '',
-                      'svc_acct__finger' => '',
-                      'svc_domain__domain_flag' => '',
-                      'svc_domain__domain' => '',
-                      'svc_acct_sm__domuser_flag' => '',
-                      'svc_acct_sm__domuser' => '',
-                      'svc_acct_sm__domuid_flag' => '',
-                      'svc_acct_sm__domuid' => '',
-                      'svc_acct_sm__domsvc_flag' => '',
-                      'svc_acct_sm__domsvc' => '',
-                    },
-      'location' => 'browse/part_svc.cgi',
-    },
-    { 'url'      => 'edit/process/part_svc.cgi',
-      'params'   => {
-                      'svcpart' => '',
-                      'svc'     => 'SLIP/PPP',
-                      'svcdb'   => 'svc_acct',
-                      'svc_acct__popnum_flag' => '',
-                      'svc_acct__popnum' => '',
-                      'svc_acct__dir_flag' => '',
-                      'svc_acct__dir' => '',
-                      'svc_acct__username_flag' => '',
-                      'svc_acct__username' => '',
-                      'svc_acct__uid_flag' => '',
-                      'svc_acct__uid' => '',
-                      'svc_acct__quota_flag' => 'F',
-                      'svc_acct__quota' => '10',
-                      'svc_acct__slipip_flag' => 'D',
-                      'svc_acct__slipip' => '0.0.0.0',
-                      'svc_acct___password_flag' => '',
-                      'svc_acct___password' => '',
-                      'svc_acct__gid_flag' => '',
-                      'svc_acct__gid' => '',
-                      'svc_acct__shell_flag' => 'D',
-                      'svc_acct__shell' => '/bin/sh',
-                      'svc_acct__finger_flag' => '',
-                      'svc_acct__finger' => '',
-                      'svc_domain__domain_flag' => '',
-                      'svc_domain__domain' => '',
-                      'svc_acct_sm__domuser_flag' => '',
-                      'svc_acct_sm__domuser' => '',
-                      'svc_acct_sm__domuid_flag' => '',
-                      'svc_acct_sm__domuid' => '',
-                      'svc_acct_sm__domsvc_flag' => '',
-                      'svc_acct_sm__domsvc' => '',
-                    },
-      'location' => 'browse/part_svc.cgi',
-    },
-    { 'url'      => 'edit/process/part_svc.cgi',
-      'params'   => {
-                      'svcpart' => '',
-                      'svc'     => 'POP Mailbox',
-                      'svcdb'   => 'svc_acct',,
-                      'svc_acct__popnum_flag' => 'F',
-                      'svc_acct__popnum' => '',
-                      'svc_acct__dir_flag' => '',
-                      'svc_acct__dir' => '',
-                      'svc_acct__username_flag' => '',
-                      'svc_acct__username' => '',
-                      'svc_acct__uid_flag' => '',
-                      'svc_acct__uid' => '',
-                      'svc_acct__quota_flag' => 'F',
-                      'svc_acct__quota' => '10',
-                      'svc_acct__slipip_flag' => 'F',
-                      'svc_acct__slipip' => '',
-                      'svc_acct___password_flag' => '',
-                      'svc_acct___password' => '',
-                      'svc_acct__gid_flag' => '',
-                      'svc_acct__gid' => '',
-                      'svc_acct__shell_flag' => 'F',
-                      'svc_acct__shell' => '/bin/passwd',
-                      'svc_acct__finger_flag' => '',
-                      'svc_acct__finger' => '',
-                      'svc_domain__domain_flag' => '',
-                      'svc_domain__domain' => '',
-                      'svc_acct_sm__domuser_flag' => '',
-                      'svc_acct_sm__domuser' => '',
-                      'svc_acct_sm__domuid_flag' => '',
-                      'svc_acct_sm__domuid' => '',
-                      'svc_acct_sm__domsvc_flag' => '',
-                      'svc_acct_sm__domsvc' => '',
-                    },
-      'location' => 'browse/part_svc.cgi',
-    },
-    { 'url'      => 'edit/process/part_svc.cgi',
-      'params'   => {
-                      'svcpart' => '',
-                      'svc'     => 'Domain',
-                      'svcdb'   => 'svc_domain',,
-                      'svc_acct__popnum_flag' => '',
-                      'svc_acct__popnum' => '',
-                      'svc_acct__dir_flag' => '',
-                      'svc_acct__dir' => '',
-                      'svc_acct__username_flag' => '',
-                      'svc_acct__username' => '',
-                      'svc_acct__uid_flag' => '',
-                      'svc_acct__uid' => '',
-                      'svc_acct__quota_flag' => '',
-                      'svc_acct__quota' => '',
-                      'svc_acct__slipip_flag' => '',
-                      'svc_acct__slipip' => '',
-                      'svc_acct___password_flag' => '',
-                      'svc_acct___password' => '',
-                      'svc_acct__gid_flag' => '',
-                      'svc_acct__gid' => '',
-                      'svc_acct__shell_flag' => '',
-                      'svc_acct__shell' => '',
-                      'svc_acct__finger_flag' => '',
-                      'svc_acct__finger' => '',
-                      'svc_domain__domain_flag' => '',
-                      'svc_domain__domain' => '',
-                      'svc_acct_sm__domuser_flag' => '',
-                      'svc_acct_sm__domuser' => '',
-                      'svc_acct_sm__domuid_flag' => '',
-                      'svc_acct_sm__domuid' => '',
-                      'svc_acct_sm__domsvc_flag' => '',
-                      'svc_acct_sm__domsvc' => '',
-                    },
-      'location' => 'browse/part_svc.cgi',
-    },
-    { 'url'      => 'edit/process/part_svc.cgi',
-      'params'   => {
-                      'svcpart' => '',
-                      'svc'     => 'Domain email alias',
-                      'svcdb'   => 'svc_acct_sm',,
-                      'svc_acct__popnum_flag' => '',
-                      'svc_acct__popnum' => '',
-                      'svc_acct__dir_flag' => '',
-                      'svc_acct__dir' => '',
-                      'svc_acct__username_flag' => '',
-                      'svc_acct__username' => '',
-                      'svc_acct__uid_flag' => '',
-                      'svc_acct__uid' => '',
-                      'svc_acct__quota_flag' => '',
-                      'svc_acct__quota' => '',
-                      'svc_acct__slipip_flag' => '',
-                      'svc_acct__slipip' => '',
-                      'svc_acct___password_flag' => '',
-                      'svc_acct___password' => '',
-                      'svc_acct__gid_flag' => '',
-                      'svc_acct__gid' => '',
-                      'svc_acct__shell_flag' => '',
-                      'svc_acct__shell' => '',
-                      'svc_acct__finger_flag' => '',
-                      'svc_acct__finger' => '',
-                      'svc_domain__domain_flag' => '',
-                      'svc_domain__domain' => '',
-                      'svc_acct_sm__domuser_flag' => '',
-                      'svc_acct_sm__domuser' => '',
-                      'svc_acct_sm__domuid_flag' => '',
-                      'svc_acct_sm__domuid' => '',
-                      'svc_acct_sm__domsvc_flag' => '',
-                      'svc_acct_sm__domsvc' => '',
-                    },
-      'location' => 'browse/part_svc.cgi',
-    },
-
-    { 'url'      => 'edit/process/part_pkg.cgi',
-      'params'   => {
-                      'pkgpart' => '',
-                      'pkg' => 'Personal SLIP/PPP',
-                      'comment' => '$30/setup, $19.99/month',
-                      'setup' => '30',
-                      'recur' => '19.99',
-                      'freq' => '1',
-                      'pkg_svc1' => '0',
-                      'pkg_svc2' => '1',
-                      'pkg_svc3' => '0',
-                      'pkg_svc4' => '0',
-                      'pkg_svc5' => '0',
-                    },
-      'location' => 'browse/part_pkg.cgi',
-    },
-    { 'url'      => 'edit/process/part_pkg.cgi',
-      'params'   => {
-                      'pkgpart' => '',
-                      'pkg' => 'Personal SLIP/PPP',
-                      'comment' => '$0/setup, $179.88/year',
-                      'setup' => '0',
-                      'recur' => '179.88',
-                      'freq' => '12',
-                      'pkg_svc1' => '0',
-                      'pkg_svc2' => '1',
-                      'pkg_svc3' => '0',
-                      'pkg_svc4' => '0',
-                      'pkg_svc5' => '0',
-                    },
-      'location' => 'browse/part_pkg.cgi',
-    },
-    { 'url'      => 'edit/process/part_pkg.cgi',
-      'params'   => {
-                      'pkgpart' => '',
-                      'pkg' => 'Personal POP mailbox',
-                      'comment' => '$10/setup, $5/month',
-                      'setup' => '10',
-                      'recur' => '5',
-                      'freq' => '1',
-                      'pkg_svc1' => '0',
-                      'pkg_svc2' => '0',
-                      'pkg_svc3' => '1',
-                      'pkg_svc4' => '0',
-                      'pkg_svc5' => '0',
-                    },
-      'location' => 'browse/part_pkg.cgi',
-    },
-    { 'url'      => 'edit/process/part_pkg.cgi',
-      'params'   => {
-                      'pkgpart' => '',
-                      'pkg' => 'Business SLIP/PPP',
-                      'comment' => '$30/setup, $29.99/month',
-                      'setup' => '30',
-                      'recur' => '29.99',
-                      'freq' => '1',
-                      'pkg_svc1' => '0',
-                      'pkg_svc2' => '1',
-                      'pkg_svc3' => '0',
-                      'pkg_svc4' => '1',
-                      'pkg_svc5' => '1',
-                    },
-      'location' => 'browse/part_pkg.cgi',
-    },
-    { 'url'      => 'edit/process/part_pkg.cgi',
-      'params'   => {
-                      'pkgpart' => '',
-                      'pkg' => 'Business SLIP/PPP',
-                      'comment' => '$0/setup, $299.88/year',
-                      'setup' => '0',
-                      'recur' => '299.88',
-                      'freq' => '12',
-                      'pkg_svc1' => '0',
-                      'pkg_svc2' => '1',
-                      'pkg_svc3' => '0',
-                      'pkg_svc4' => '1',
-                      'pkg_svc5' => '1',
-                    },
-      'location' => 'browse/part_pkg.cgi',
-    },
-    { 'url'      => 'edit/process/part_pkg.cgi',
-      'params'   => {
-                      'pkgpart' => '',
-                      'pkg' => 'Business POP mailbox',
-                      'comment' => '$10/setup, $5/month',
-                      'setup' => '10',
-                      'recur' => '5',
-                      'freq' => '1',
-                      'pkg_svc1' => '0',
-                      'pkg_svc2' => '0',
-                      'pkg_svc3' => '1',
-                      'pkg_svc4' => '0',
-                      'pkg_svc5' => '1',
-                    },
-      'location' => 'browse/part_pkg.cgi',
-    },
-    { 'url'      => 'edit/process/part_pkg.cgi',
-      'params'   => {
-                      'pkgpart' => '',
-                      'pkg' => 'UNIX shell',
-                      'comment' => '$20/setup, $9.99/month',
-                      'setup' => '20',
-                      'recur' => '9.99',
-                      'freq' => '1',
-                      'pkg_svc1' => '1',
-                      'pkg_svc2' => '0',
-                      'pkg_svc3' => '0',
-                      'pkg_svc4' => '0',
-                      'pkg_svc5' => '0',
-                    },
-      'location' => 'browse/part_pkg.cgi',
-    },
-    { 'url'      => 'edit/process/part_pkg.cgi',
-      'params'   => {
-                      'pkgpart' => '',
-                      'pkg' => 'Point-to-point T1',
-                      'comment' => '$1000/setup, $1000/month',
-                      'setup' => '1000',
-                      'recur' => '1000',
-                      'freq' => '1',
-                      'pkg_svc1' => '0',
-                      'pkg_svc2' => '0',
-                      'pkg_svc3' => '5',
-                      'pkg_svc4' => '1',
-                      'pkg_svc5' => '5',
-                    },
-      'location' => 'browse/part_pkg.cgi',
-    },
-    { 'url'      => 'edit/process/part_pkg.cgi',
-      'params'   => {
-                      'pkgpart' => '',
-                      'pkg' => 'Cisco 2501 Router',
-                      'comment' => '$2500',
-                      'setup' => '2500',
-                      'recur' => '0',
-                      'freq' => '0',
-                      'pkg_svc1' => '0',
-                      'pkg_svc2' => '0',
-                      'pkg_svc3' => '0',
-                      'pkg_svc4' => '0',
-                      'pkg_svc5' => '0',
-                    },
-      'location' => 'browse/part_pkg.cgi',
-    },
-
-    { 'url'      => 'edit/process/agent_type.cgi',
-      'params'   => {
-                      'typenum' => '',
-                      'atype' => 'Internal Sales',
-                      'pkgpart1' => 'ON',
-                      'pkgpart2' => 'ON',
-                      'pkgpart3' => 'ON',
-                      'pkgpart4' => 'ON',
-                      'pkgpart5' => 'ON',
-                      'pkgpart6' => 'ON',
-                      'pkgpart7' => 'ON',
-                      'pkgpart8' => 'ON',
-                      'pkgpart9' => 'ON',
-                    },
-      'location' => 'browse/agent_type.cgi',
-    },
-
-    { 'url'      => 'edit/process/agent.cgi',
-      'params'   => {
-                      'agentnum' => '',
-                      'agent' => 'Internal Sales',
-                      'typenum' => '1',
-                      'freq' => '',
-                      'prog' => '',
-                    },
-      'location' => 'browse/agent.cgi',
-    },
-
-    { 'url'      => 'edit/process/part_referral.cgi',
-      'params'   => {
-                      'refnum' => '',
-                      'referral' => 'Another customer',
-                    },
-      'location' => 'browse/part_referral.cgi',
-    },
-    { 'url'      => 'edit/process/part_referral.cgi',
-      'params'   => {
-                      'refnum' => '',
-                      'referral' => 'Newspaper ad',
-                    },
-      'location' => 'browse/part_referral.cgi',
-    },
-
-    { 'url'      => 'edit/process/svc_acct_pop.cgi',
-      'params'   => {
-                      'popnum' => '',
-                      'city' => 'Line Lexington',
-                      'state' => 'PA',
-                      'ac' => '215',
-                      'exch' => '996',
-                    },
-      'location' => 'browse/svc_acct_pop.cgi',
-    },
-    { 'url'      => 'edit/process/svc_acct_pop.cgi',
-      'params'   => {
-                      'popnum' => '',
-                      'city' => 'Oakland',
-                      'state' => 'CA',
-                      'ac' => '510',
-                      'exch' => '208',
-                    },
-      'location' => 'browse/svc_acct_pop.cgi',
-    },
-
-    { 'url'      => 'edit/process/cust_main.cgi',
-      'params'   => {
-                      'custnum' => '',
-                      'agentnum' => '1',
-                      'refnum' => '1',
-                      'last' => 'Hogan',
-                      'first' => 'Shawn D.',
-                      'ss' => '',
-                      'company' => 'Digital Point Solutions',
-                      'address1' => '3570 Tony Drive',
-                      'address2' => '',
-                      'city' => 'San Diego',
-                      'state' => 'CA / US',
-                      'zip' => '92122-2307',
-                      'daytime' => '',
-                      'night' => '',
-                      'fax' => '',
-                      'tax' => '',
-                      'invoicing_list_POST' => '',
-                      'invoicing_list' => '',
-                      'payby' => 'BILL',
-                      'CARD_payinfo' => '',
-                      'CARD_month' => '1',
-                      'CARD_year' => '1999',
-                      'CARD_payname' => '',
-                      'BILL_payinfo' => '',
-                      'BILL_month' => '12',
-                      'BILL_year' => '2037',
-                      'BILL_payname' => 'Accounts Payable',
-                      'COMP_payinfo' => '',
-                      'COMP_month' => '1',
-                      'COMP_year' => '1999',
-                      'pkgpart_svcpart' => '1_2',
-                      'username' => 'cyborg',
-                      '_password' => '',
-                      'popnum' => '1',
-                      'otaker' => 'example',
-                    },
-      'location' => 'view/cust_main.cgi?1',
-    },
-    { 'url'      => 'edit/process/cust_main.cgi',
-      'params'   => {
-                      'custnum' => '',
-                      'agentnum' => '1',
-                      'refnum' => '2',
-                      'last' => 'Ford',
-                      'first' => 'Bill',
-                      'ss' => '',
-                      'company' => 'Boardtown Corporation',
-                      'address1' => '116 East Main Street',
-                      'address2' => '',
-                      'city' => 'Starkville',
-                      'state' => 'MS / US',
-                      'zip' => '39759',
-                      'daytime' => '',
-                      'night' => '',
-                      'fax' => '',
-                      'tax' => '',
-                      'invoicing_list_POST' => '',
-                      'invoicing_list' => '',
-                      'payby' => 'BILL',
-                      'CARD_payinfo' => '',
-                      'CARD_month' => '1',
-                      'CARD_year' => '1999',
-                      'CARD_payname' => '',
-                      'BILL_payinfo' => '',
-                      'BILL_month' => '12',
-                      'BILL_year' => '2037',
-                      'BILL_payname' => 'Accounts Payable',
-                      'COMP_payinfo' => '',
-                      'COMP_month' => '1',
-                      'COMP_year' => '1999',
-                      'pkgpart_svcpart' => '3_3',
-                      'username' => 'billf',
-                      '_password' => '',
-                      'popnum' => '',
-                      'otaker' => 'example',
-                    },
-      'location' => 'view/cust_main.cgi?2',
-    },
-
-           
-  );
-}
-
-- 
cgit v1.2.1


From bd3a0f6ac3ce9370ee13b9c325e137e2ab533fce Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 19 Aug 2002 23:08:15 +0000
Subject: encode_entities for comments entries

---
 httemplate/view/cust_main.cgi | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 421bd98a4..7d2d87315 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -241,9 +241,10 @@ print '</TD></TR></TABLE>';
 if ( defined $cust_main->dbdef_table->column('comments')
      && $cust_main->comments )
 {
-  print "<BR>Comments", &ntable("#cccccc"), "<TR><TD>",
-        &ntable("#cccccc",2),
-        '<TR><TD BGCOLOR="#ffffff"><PRE>', $cust_main->comments,
+  print "<BR>Comments". &ntable("#cccccc"). "<TR><TD>".
+        &ntable("#cccccc",2).
+        '<TR><TD BGCOLOR="#ffffff"><PRE>'.
+        encode_entities($cust_main->comments).
         '</PRE></TD></TR></TABLE></TABLE>';
 }
 
-- 
cgit v1.2.1


From eb6cb474f653dc738b26c9f8ca9b43e9b6f1e546 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Aug 2002 23:43:51 +0000
Subject: add domain_shellcommands export

---
 FS/FS/part_export.pm                      |  19 +++++
 FS/FS/part_export/domain_shellcommands.pm | 113 ++++++++++++++++++++++++++++++
 FS/MANIFEST                               |   2 +
 FS/t/part_export-domain_shellcommands.t   |   5 ++
 4 files changed, 139 insertions(+)
 create mode 100644 FS/FS/part_export/domain_shellcommands.pm
 create mode 100644 FS/t/part_export-domain_shellcommands.t

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 4f45fbeec..67b3cade5 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -594,6 +594,19 @@ tie my %www_shellcommands_options, 'Tie::IxHash',
                 },
 ;
 
+tie my %domain_shellcommands_options, 'Tie::IxHash',
+  'user' => { lable=>'Remote username', default=>'root' },
+  'useradd' => { label=>'Insert command',
+                 default=>'',
+               },
+  'userdel'  => { label=>'Delete command',
+                  default=>'',
+                },
+  'usermod'  => { label=>'Modify command',
+                  default=>'',
+                },
+;
+
 tie my %textradius_options, 'Tie::IxHash',
   'user' => { label=>'Remote username', default=>'root' },
   'users' => { label=>'users file location', default=>'/etc/raddb/users' },
@@ -797,6 +810,12 @@ tie my %sqlmail_options, 'Tie::IxHash',
       'notes' => 'Database schema can be made to work with Courier IMAP and Exim.  Others could work but are untested. (...extended description from pc-intouch?...)',
     },
 
+    'domain_shellcommands' => {
+      'desc' => 'Run remote commands via SSH, for domains.',
+      'options' => \%domain_shellcommands_options,
+      'notes'    => 'Run remote commands via SSH, for domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.',
+    },
+
 
   },
 
diff --git a/FS/FS/part_export/domain_shellcommands.pm b/FS/FS/part_export/domain_shellcommands.pm
new file mode 100644
index 000000000..d2f55e5ad
--- /dev/null
+++ b/FS/FS/part_export/domain_shellcommands.pm
@@ -0,0 +1,113 @@
+package FS::part_export::domain_shellcommands;
+
+use strict;
+use vars qw(@ISA);
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my($self) = shift;
+  $self->_export_command('useradd', @_);
+}
+
+sub _export_delete {
+  my($self) = shift;
+  $self->_export_command('userdel', @_);
+}
+
+sub _export_command {
+  my ( $self, $action, $svc_domain) = (shift, shift, shift);
+  my $command = $self->option($action);
+
+  #set variable for the command
+  {
+    no strict 'refs';
+    ${$_} = $svc_domain->getfield($_) foreach $svc_domain->fields;
+  }
+
+#  my $domain_record = $svc_www->domain_record; # or die ?
+#  my $zone = $domain_record->reczone; # or die ?
+#  unless ( $zone =~ /\.$/ ) {
+#    my $svc_domain = $domain_record->svc_domain; # or die ?
+#    $zone .= '.'. $svc_domain->domain;
+#  }
+
+#  my $svc_acct = $svc_www->svc_acct; # or die ?
+#  my $username = $svc_acct->username;
+#  my $homedir = $svc_acct->dir; # or die ?
+
+  #done setting variables for the command
+
+  $self->shellcommands_queue( $svc_domain->svcnum,
+    user         => $self->option('user')||'root',
+    host         => $self->machine,
+    command      => eval(qq("$command")),
+  );
+}
+
+sub _export_replace {
+  my($self, $new, $old ) = (shift, shift, shift);
+  my $command = $self->option('usermod');
+  
+  #set variable for the command
+  {
+    no strict 'refs';
+    ${"old_$_"} = $old->getfield($_) foreach $old->fields;
+    ${"new_$_"} = $new->getfield($_) foreach $new->fields;
+  }
+#  my $old_domain_record = $old->domain_record; # or die ?
+#  my $old_zone = $old_domain_record->reczone; # or die ?
+#  unless ( $old_zone =~ /\.$/ ) {
+#    my $old_svc_domain = $old_domain_record->svc_domain; # or die ?
+#    $old_zone .= '.'. $old_svc_domain->domain;
+#  }
+#
+#  my $old_svc_acct = $old->svc_acct; # or die ?
+#  my $old_username = $old_svc_acct->username;
+#  my $old_homedir = $old_svc_acct->dir; # or die ?
+#
+#  my $new_domain_record = $new->domain_record; # or die ?
+#  my $new_zone = $new_domain_record->reczone; # or die ?
+#  unless ( $new_zone =~ /\.$/ ) {
+#    my $new_svc_domain = $new_domain_record->svc_domain; # or die ?
+#    $new_zone .= '.'. $new_svc_domain->domain;
+#  }
+
+#  my $new_svc_acct = $new->svc_acct; # or die ?
+#  my $new_username = $new_svc_acct->username;
+#  my $new_homedir = $new_svc_acct->dir; # or die ?
+
+  #done setting variables for the command
+
+  $self->shellcommands_queue( $new->svcnum,
+    user         => $self->option('user')||'root',
+    host         => $self->machine,
+    command      => eval(qq("$command")),
+  );
+}
+
+#a good idea to queue anything that could fail or take any time
+sub shellcommands_queue {
+  my( $self, $svcnum ) = (shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => "FS::part_export::domain_shellcommands::ssh_cmd",
+  };
+  $queue->insert( @_ );
+}
+
+sub ssh_cmd { #subroutine, not method
+  use Net::SSH '0.06';
+  &Net::SSH::ssh_cmd( { @_ } );
+}
+
+#sub shellcommands_insert { #subroutine, not method
+#}
+#sub shellcommands_replace { #subroutine, not method
+#}
+#sub shellcommands_delete { #subroutine, not method
+#}
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 8355e40fb..5737d620f 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -59,6 +59,7 @@ FS/part_export/bind_slave.pm
 FS/part_export/bsdshell.pm
 FS/part_export/cp.pm
 FS/part_export/cyrus.pm
+FS/part_export/domain_shellcommands.pm
 FS/part_export/http.pm
 FS/part_export/infostreet.pm
 FS/part_export/null.pm
@@ -132,6 +133,7 @@ t/part_export-bind_slave.t
 t/part_export-bsdshell.t
 t/part_export-cp.t
 t/part_export-cyrus.t
+t/part_export-domain_shellcommands.t
 t/part_export-http.t
 t/part_export-infostreet.t
 t/part_export-null.t
diff --git a/FS/t/part_export-domain_shellcommands.t b/FS/t/part_export-domain_shellcommands.t
new file mode 100644
index 000000000..a2a44fbfb
--- /dev/null
+++ b/FS/t/part_export-domain_shellcommands.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::domain_shellcommands;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From 5ba6bdd59b4a8a10c92e71b0519e87ca4ab99043 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 24 Aug 2002 00:16:26 +0000
Subject: Added Files: bin/freeside-addoutsource

---
 FS/MANIFEST                  |  1 +
 FS/bin/freeside-addoutsource | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 FS/bin/freeside-addoutsource

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 5737d620f..18842df23 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -7,6 +7,7 @@ bin/freeside-bill
 bin/freeside-daily
 bin/freeside-email
 bin/freeside-queued
+bin/freeside-addoutsource
 bin/freeside-apply-credits
 bin/freeside-adduser
 bin/freeside-setinvoice
diff --git a/FS/bin/freeside-addoutsource b/FS/bin/freeside-addoutsource
new file mode 100644
index 000000000..39ecba6ad
--- /dev/null
+++ b/FS/bin/freeside-addoutsource
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+domain=$1
+
+createdb $domain && \
+\
+mkdir /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain && \
+\
+chown freeside /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain && \
+\
+cp /home/ivan/freeside/conf[a-z]* /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain && \
+\
+touch /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain/secrets && \
+\
+chown freeside /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain/secrets && \
+\
+chmod 600 /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain/secrets && \
+\
+echo -e "DBI:Pg:host=localhost;dbname=$domain\nfreeside\n" >/usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain/secrets && \
+\
+mkdir /usr/local/etc/freeside/counters.DBI:Pg:host=localhost\;dbname=$domain && \
+mkdir /usr/local/etc/freeside/cache.DBI:Pg:host=localhost\;dbname=$domain && \
+mkdir /usr/local/etc/freeside/export.DBI:Pg:host=localhost\;dbname=$domain
+
-- 
cgit v1.2.1


From b3daa2af67efdfa3a2380db0b5a977455964e751 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 24 Aug 2002 00:51:27 +0000
Subject: UI

---
 httemplate/view/cust_main.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 7d2d87315..a9d40fa27 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -401,6 +401,7 @@ foreach my $package (@packages) {
   #foreach my $cust_svc ( @cust_svc ) {
   foreach my $svcpart ( sort { $a<=>$b } keys %pkg_svc ) {
     my $svc = qsearchs('part_svc',{'svcpart'=>$svcpart})->getfield('svc');
+    $svc =~ s/ /&nbsp;/g;
     my(@cust_svc)=qsearch('cust_svc',{'pkgnum'=>$pkgnum, 
                                       'svcpart'=>$svcpart,
                                     });
@@ -414,10 +415,10 @@ foreach my $package (@packages) {
               qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
       } else {
         print $n2, qq!<TD COLSPAN=2><A HREF="$uiadd{$svcpart}?pkgnum$pkgnum-svcpart$svcpart"><b><font size="+1" color="#ff0000">!.
-              qq!Provision $svc</A></b></font>!;
+              qq!Provision&nbsp;$svc</A></b></font>!;
 
         print qq!<BR><A HREF="../misc/link.cgi?pkgnum$pkgnum-svcpart$svcpart">!.
-              qq!<b><font size="+1" color="#ff0000">Link to legacy $svc</A></b></font>!
+              qq!<b><font size="+1" color="#ff0000">Link&nbsp;to&nbsp;legacy&nbsp;$svc</A></b></font>!
           if $conf->exists('legacy_link');
 
         print '</TD>';
-- 
cgit v1.2.1


From 748983cb2a2cd21a82950c5000088508a416d670 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 24 Aug 2002 01:53:55 +0000
Subject: depend on Net::SSH 0.07, for -T fix

---
 FS/bin/freeside-queued | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 83074b9e4..311fe62f9 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -15,7 +15,7 @@ use FS::queue_depend;
 # no autoloading just yet
 use FS::cust_main;
 use FS::svc_acct;
-use Net::SSH 0.06;
+use Net::SSH 0.07;
 use FS::part_export;
 
 $max_kids = '10'; #guess it should be a config file...
-- 
cgit v1.2.1


From e0729955b2ad10fba02399afafec68fe5ccab97a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 24 Aug 2002 02:10:54 +0000
Subject: fix path

---
 FS/bin/freeside-addoutsource | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-addoutsource b/FS/bin/freeside-addoutsource
index 39ecba6ad..5cec17f46 100644
--- a/FS/bin/freeside-addoutsource
+++ b/FS/bin/freeside-addoutsource
@@ -8,7 +8,7 @@ mkdir /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain && \
 \
 chown freeside /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain && \
 \
-cp /home/ivan/freeside/conf[a-z]* /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain && \
+cp /home/ivan/freeside/conf/[a-z]* /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain && \
 \
 touch /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain/secrets && \
 \
-- 
cgit v1.2.1


From 96fd4cf172f2b9fbdd00f7b7fe7a7797132b88c2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 24 Aug 2002 03:29:16 +0000
Subject: unprovision a single service

---
 httemplate/misc/unprovision.cgi | 33 +++++++++++++++++++++++++++++++++
 httemplate/view/cust_main.cgi   |  6 +++++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100755 httemplate/misc/unprovision.cgi

diff --git a/httemplate/misc/unprovision.cgi b/httemplate/misc/unprovision.cgi
new file mode 100755
index 000000000..8f2a7d13d
--- /dev/null
+++ b/httemplate/misc/unprovision.cgi
@@ -0,0 +1,33 @@
+<%
+
+my $dbh = dbh;
+ 
+#untaint svcnum
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+my $svcnum = $1;
+
+#my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
+#die "Unknown svcnum!" unless $svc_acct;
+
+my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+die "Unknown svcnum!" unless $cust_svc;
+#&eidiot(qq!This account has already been audited.  Cancel the 
+#    <A HREF="!. popurl(2). qq!view/cust_pkg.cgi?! . $cust_svc->getfield('pkgnum') .
+#    qq!pkgnum"> package</A> instead.!) 
+#  if $cust_svc->pkgnum ne '' && $cust_svc->pkgnum ne '0';
+
+my $custnum = $cust_svc->cust_pkg->custnum;
+
+my $error = $cust_svc->cancel;
+
+if ( $error ) {
+  %>
+<!-- mason kludge -->
+<%
+  &eidiot($error);
+} else {
+  print $cgi->redirect(popurl(2)."view/cust_main.cgi?$custnum");
+}
+
+%>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index a9d40fa27..0610bc324 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -299,6 +299,10 @@ function cust_pkg_areyousure(href) {
     if (confirm("Permanently delete included services and cancel this package?") == true)
         window.location.href = href;
 }
+function svc_areyousure(href) {
+    if (confirm("Permanently unprovision and delete this service?") == true)
+        window.location.href = href;
+}
 </SCRIPT>
 END
 
@@ -412,7 +416,7 @@ foreach my $package (@packages) {
         my($svcnum) = $cust_svc->svcnum;
         my($sview) = popurl(2). "view";
         print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
-              qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
+              qq!<TD><FONT SIZE=-1><A HREF="$sview/$svcdb.cgi?$svcnum">$value</A><BR>(&nbsp;<A HREF="javascript:svc_areyousure('${p}misc/unprovision.cgi?$svcnum')">Unprovision</A>&nbsp;)</FONT></TD>!;
       } else {
         print $n2, qq!<TD COLSPAN=2><A HREF="$uiadd{$svcpart}?pkgnum$pkgnum-svcpart$svcpart"><b><font size="+1" color="#ff0000">!.
               qq!Provision&nbsp;$svc</A></b></font>!;
-- 
cgit v1.2.1


From 22abdc37d4ec5699b62d295dc7ec1e41a8daf23b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 24 Aug 2002 06:41:50 +0000
Subject: - depend on Net::SSH 0.07, for OpenSSH -T fix - no strict 'vars';
 when necessary

---
 FS/FS/part_export/domain_shellcommands.pm | 4 +++-
 FS/FS/part_export/shellcommands.pm        | 4 +++-
 FS/FS/part_export/www_shellcommands.pm    | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/FS/FS/part_export/domain_shellcommands.pm b/FS/FS/part_export/domain_shellcommands.pm
index d2f55e5ad..5b3cd5d79 100644
--- a/FS/FS/part_export/domain_shellcommands.pm
+++ b/FS/FS/part_export/domain_shellcommands.pm
@@ -23,6 +23,7 @@ sub _export_command {
   my $command = $self->option($action);
 
   #set variable for the command
+  no strict 'vars';
   {
     no strict 'refs';
     ${$_} = $svc_domain->getfield($_) foreach $svc_domain->fields;
@@ -53,6 +54,7 @@ sub _export_replace {
   my $command = $self->option('usermod');
   
   #set variable for the command
+  no strict 'vars';
   {
     no strict 'refs';
     ${"old_$_"} = $old->getfield($_) foreach $old->fields;
@@ -100,7 +102,7 @@ sub shellcommands_queue {
 }
 
 sub ssh_cmd { #subroutine, not method
-  use Net::SSH '0.06';
+  use Net::SSH '0.07';
   &Net::SSH::ssh_cmd( { @_ } );
 }
 
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index e4005761b..869544da5 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -24,6 +24,7 @@ sub _export_command {
   my ( $self, $action, $svc_acct) = (shift, shift, shift);
   my $command = $self->option($action);
   my $stdin = $self->option($action."_stdin");
+  no strict 'vars';
   {
     no strict 'refs';
     ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
@@ -44,6 +45,7 @@ sub _export_replace {
   my($self, $new, $old ) = (shift, shift, shift);
   my $command = $self->option('usermod');
   my $stdin = $self->option('usermod_stdin');
+  no strict 'vars';
   {
     no strict 'refs';
     ${"old_$_"} = $old->getfield($_) foreach $old->fields;
@@ -72,7 +74,7 @@ sub shellcommands_queue {
 }
 
 sub ssh_cmd { #subroutine, not method
-  use Net::SSH '0.06';
+  use Net::SSH '0.07';
   &Net::SSH::ssh_cmd( { @_ } );
 }
 
diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index 84c162761..e5b95dc1f 100644
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -23,6 +23,7 @@ sub _export_command {
   my $command = $self->option($action);
 
   #set variable for the command
+  no strict 'vars';
   {
     no strict 'refs';
     ${$_} = $svc_www->getfield($_) foreach $svc_www->fields;
@@ -52,6 +53,7 @@ sub _export_replace {
   my $command = $self->option('usermod');
   
   #set variable for the command
+  no strict 'vars';
   {
     no strict 'refs';
     ${"old_$_"} = $old->getfield($_) foreach $old->fields;
@@ -99,7 +101,7 @@ sub shellcommands_queue {
 }
 
 sub ssh_cmd { #subroutine, not method
-  use Net::SSH '0.06';
+  use Net::SSH '0.07';
   &Net::SSH::ssh_cmd( { @_ } );
 }
 
-- 
cgit v1.2.1


From 86dccb51c86156fcf06b981a48fd2a40d204cc53 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 24 Aug 2002 07:20:24 +0000
Subject: don't substitute defaults for empty options when editing exports

---
 httemplate/edit/part_export.cgi | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 486bd4300..bd427aa40 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -50,7 +50,10 @@ my $widget = new HTML::Widgets::SelectLayers(
       my $type = defined($optinfo->{type}) ? $optinfo->{type} : 'text';
       my $value = $cgi->param($option)
                   || $part_export->option($option)
-                  || (exists $optinfo->{default} ? $optinfo->{default} : '');
+                  || ( (exists $optinfo->{default} && !$part_export->exportnum)
+                       ? $optinfo->{default}
+                       : ''
+                     );
       $html .= qq!<TR><TD ALIGN="right">$label</TD><TD>!;
       if ( $type eq 'select' ) {
         $html .= qq!<SELECT NAME="$option">!;
-- 
cgit v1.2.1


From 04b8684b43afb358a77fe1af8dea18519111ef54 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 24 Aug 2002 07:43:18 +0000
Subject: allow $domain as a variable in commands

---
 FS/FS/part_export/shellcommands.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 869544da5..d69848f22 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -30,6 +30,7 @@ sub _export_command {
     ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
   }
   $finger = shell_quote $finger;
+  $domain = $svc_acct->domain;
   $crypt_password = ''; #surpress "used only once" warnings
   $crypt_password = crypt( $svc_acct->_password,
                              $saltset[int(rand(64))].$saltset[int(rand(64))] );
@@ -52,6 +53,7 @@ sub _export_replace {
     ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   }
   $new_finger = shell_quote $new_finger;
+  $new_domain = $new->domain;
   $new_crypt_password = ''; #surpress "used only once" warnings
   $new_crypt_password = crypt( $new->_password,
                                $saltset[int(rand(64))].$saltset[int(rand(64))]);
-- 
cgit v1.2.1


From 621e56df7cb76802799f7939424e0d0c8bab40fd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 24 Aug 2002 08:13:25 +0000
Subject: also do -b flag

---
 FS/bin/freeside-adduser | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index 9d424634b..3ac3cffa1 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,21 +1,23 @@
 #!/usr/bin/perl -w
 #
-# $Id: freeside-adduser,v 1.4 2002-02-06 14:58:05 ivan Exp $
+# $Id: freeside-adduser,v 1.5 2002-08-24 08:13:25 ivan Exp $
 
 use strict;
-use vars qw($opt_h $opt_c $opt_s);
+use vars qw($opt_h $opt_b $opt_c $opt_s);
 use Getopt::Std;
 
 my $FREESIDE_CONF = "/usr/local/etc/freeside";
 
-getopts("ch:s:");
+getopts("bch:s:");
 die &usage if $opt_c && ! $opt_h;
 my $user = shift or die &usage;
 
 if ( $opt_h ) {
   my @args = ( 'htpasswd' );
+  push @args, '-b' if $opt_b;
   push @args, '-c' if $opt_c;
   push @args, $opt_h, $user;
+  push @args, shift if $opt_b;
   system(@args) == 0 or die "htpasswd failed: $?";
 }
 
-- 
cgit v1.2.1


From 8675d7f9367456118663ddc28907bcd69d6dae94 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 25 Aug 2002 01:09:50 +0000
Subject: doc

---
 FS/bin/freeside-adduser |    8 +-
 FS/bin/freeside-setup   | 1031 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1036 insertions(+), 3 deletions(-)
 create mode 100755 FS/bin/freeside-setup

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index 3ac3cffa1..e9b300823 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: freeside-adduser,v 1.5 2002-08-24 08:13:25 ivan Exp $
+# $Id: freeside-adduser,v 1.6 2002-08-25 01:09:50 ivan Exp $
 
 use strict;
 use vars qw($opt_h $opt_b $opt_c $opt_s);
@@ -47,13 +47,15 @@ sales/tech folks) to the web interface, not for adding customer accounts.
 
   -h: Also call htpasswd for this user with the given filename
 
-  -c: Passed to htpasswd
+  -c: Passed to htpasswd(1)
 
   -s: Specify an alternate secret file
 
+  -b: same as htpasswd(1), probably insecure, not recommended
+
 =head1 SEE ALSO
 
-L<htpasswd>, base Freeside documentation
+L<htpasswd>(1), base Freeside documentation
 
 =cut
 
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
new file mode 100755
index 000000000..21defa6e5
--- /dev/null
+++ b/FS/bin/freeside-setup
@@ -0,0 +1,1031 @@
+#!/usr/bin/perl -Tw
+
+#to delay loading dbdef until we're ready
+BEGIN { $FS::Record::setup_hack = 1; }
+
+use strict;
+use DBI;
+use DBIx::DBSchema 0.20;
+use DBIx::DBSchema::Table;
+use DBIx::DBSchema::Column;
+use DBIx::DBSchema::ColGroup::Unique;
+use DBIx::DBSchema::ColGroup::Index;
+use FS::UID qw(adminsuidsetup datasrc checkeuid getsecrets);
+use FS::Record;
+use FS::cust_main_county;
+use FS::raddb;
+use FS::part_bill_event;
+
+die "Not running uid freeside!" unless checkeuid();
+
+my %attrib2db =
+  map { lc($FS::raddb::attrib{$_}) => $_ } keys %FS::raddb::attrib;
+
+my $user = shift or die &usage;
+getsecrets($user);
+
+#needs to match FS::Record
+my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;
+
+###
+
+#print "\nEnter the maximum username length: ";
+#my($username_len)=&getvalue;
+my $username_len = 32; #usernamemax config file
+
+print "\n\n", <<END, ":";
+Freeside tracks the RADIUS User-Name, check attribute Password and
+reply attribute Framed-IP-Address for each user.  You can specify additional
+check and reply attributes (or you can add them later with the
+fs-radius-add-check and fs-radius-add-reply programs).
+
+First enter any additional RADIUS check attributes you need to track for each 
+user, separated by whitespace.
+END
+my @check_attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
+                         split(" ",&getvalue);
+
+print "\n\n", <<END, ":";
+Now enter any additional reply attributes you need to track for each user,
+separated by whitespace.
+END
+my @attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
+                   split(" ",&getvalue);
+
+print "\n\n", <<END, ":";
+Do you wish to enable the tracking of a second, separate shipping/service
+address?
+END
+my $ship = &_yesno;
+
+sub getvalue {
+  my($x)=scalar(<STDIN>);
+  chop $x;
+  $x;
+}
+
+sub _yesno {
+  print " [y/N]:";
+  my $x = scalar(<STDIN>);
+  $x =~ /^y/i;
+}
+
+###
+
+my($char_d) = 80; #default maxlength for text fields
+
+#my(@date_type)  = ( 'timestamp', '', ''     );
+my(@date_type)  = ( 'int', 'NULL', ''     );
+my(@perl_type) = ( 'text', 'NULL', ''  ); 
+my @money_type = ( 'decimal',   '', '10,2' );
+
+###
+# create a dbdef object from the old data structure
+###
+
+my(%tables)=&tables_hash_hack;
+
+#turn it into objects
+my($dbdef) = new DBIx::DBSchema ( map {  
+  my(@columns);
+  while (@{$tables{$_}{'columns'}}) {
+    my($name,$type,$null,$length)=splice @{$tables{$_}{'columns'}}, 0, 4;
+    push @columns, new DBIx::DBSchema::Column ( $name,$type,$null,$length );
+  }
+  DBIx::DBSchema::Table->new(
+    $_,
+    $tables{$_}{'primary_key'},
+    DBIx::DBSchema::ColGroup::Unique->new($tables{$_}{'unique'}),
+    DBIx::DBSchema::ColGroup::Index->new($tables{$_}{'index'}),
+    @columns,
+  );
+} (keys %tables) );
+
+my $cust_main = $dbdef->table('cust_main');
+unless ($ship) { #remove ship_ from cust_main
+  $cust_main->delcolumn($_) foreach ( grep /^ship_/, $cust_main->columns );
+} else { #add indices on ship_last and ship_company
+  push @{$cust_main->index->lol_ref}, ( ['ship_last'], ['ship_company'] ) 
+}
+
+#add radius attributes to svc_acct
+
+my($svc_acct)=$dbdef->table('svc_acct');
+
+my($attribute);
+foreach $attribute (@attributes) {
+  $svc_acct->addcolumn ( new DBIx::DBSchema::Column (
+    'radius_'. $attribute,
+    'varchar',
+    'NULL',
+    $char_d,
+  ));
+}
+
+foreach $attribute (@check_attributes) {
+  $svc_acct->addcolumn( new DBIx::DBSchema::Column (
+    'rc_'. $attribute,
+    'varchar',
+    'NULL',
+    $char_d,
+  ));
+}
+
+##make part_svc table (but now as object)
+#
+#my($part_svc)=$dbdef->table('part_svc');
+#
+##because of svc_acct_pop
+##foreach (grep /^svc_/, $dbdef->tables) { 
+##foreach (qw(svc_acct svc_acct_sm svc_charge svc_domain svc_wo)) {
+#foreach (qw(svc_acct svc_domain svc_forward svc_www)) {
+#  my($table)=$dbdef->table($_);
+#  my($col);
+#  foreach $col ( $table->columns ) {
+#    next if $col =~ /^svcnum$/;
+#    $part_svc->addcolumn( new DBIx::DBSchema::Column (
+#      $table->name. '__' . $table->column($col)->name,
+#      'varchar', #$table->column($col)->type, 
+#      'NULL',
+#      $char_d, #$table->column($col)->length,
+#    ));
+#    $part_svc->addcolumn ( new DBIx::DBSchema::Column (
+#      $table->name. '__'. $table->column($col)->name . "_flag",
+#      'char',
+#      'NULL',
+#      1,
+#    ));
+#  }
+#}
+
+#create history tables (false laziness w/create-history-tables)
+foreach my $table ( grep { ! /^h_/ } $dbdef->tables ) {
+  my $tableobj = $dbdef->table($table)
+    or die "unknown table $table";
+
+  die "unique->lol_ref undefined for $table"
+    unless defined $tableobj->unique->lol_ref;
+  die "index->lol_ref undefined for $table"
+    unless defined $tableobj->index->lol_ref;
+
+  my $h_tableobj = DBIx::DBSchema::Table->new( {
+    name        => "h_$table",
+    primary_key => 'historynum',
+    unique      => DBIx::DBSchema::ColGroup::Unique->new( [] ),
+    'index'     => DBIx::DBSchema::ColGroup::Index->new( [
+                     @{$tableobj->unique->lol_ref},
+                     @{$tableobj->index->lol_ref}
+                   ] ),
+    columns     => [
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'historynum',
+                       'type'    => 'serial',
+                       'null'    => 'NOT NULL',
+                       'length'  => '',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'history_date',
+                       'type'    => 'int',
+                       'null'    => 'NULL',
+                       'length'  => '',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'history_user',
+                       'type'    => 'varchar',
+                       'null'    => 'NOT NULL',
+                       'length'  => '80',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'history_action',
+                       'type'    => 'varchar',
+                       'null'    => 'NOT NULL',
+                       'length'  => '80',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     map { $tableobj->column($_) } $tableobj->columns
+                   ],
+  } );
+  $dbdef->addtable($h_tableobj);
+}
+
+#important
+$dbdef->save($dbdef_file);
+&FS::Record::reload_dbdef($dbdef_file);
+
+###
+# create 'em
+###
+
+my($dbh)=adminsuidsetup $user;
+
+#create tables
+$|=1;
+
+foreach my $statement ( $dbdef->sql($dbh) ) {
+  $dbh->do( $statement )
+    or die "CREATE error: ". $dbh->errstr. "\ndoing statement: $statement";
+}
+
+#not really sample data (and shouldn't default to US)
+
+#cust_main_county
+
+#USPS state codes
+foreach ( qw(
+AL AK AS AZ AR CA CO CT DC DE FM FL GA GU HI ID IL IN IA KS KY LA
+ME MH MD MA MI MN MS MO MT NC ND NE NH NJ NM NV NY MP OH OK OR PA PW PR RI 
+SC SD TN TX UT VT VI VA WA WV WI WY AE AA AP
+) ) {
+  my($cust_main_county)=new FS::cust_main_county({
+    'state' => $_,
+    'tax'   => 0,
+    'country' => 'US',
+  });  
+  my($error);
+  $error=$cust_main_county->insert;
+  die $error if $error;
+}
+
+#AU "offical" state codes ala mark.williamson@ebbs.com.au (Mark Williamson)
+foreach ( qw(
+VIC NSW NT QLD TAS ACT WA SA
+) ) {
+  my($cust_main_county)=new FS::cust_main_county({
+    'state' => $_,
+    'tax'   => 0,
+    'country' => 'AU',
+  });  
+  my($error);
+  $error=$cust_main_county->insert;
+  die $error if $error;
+}
+
+#ISO 2-letter country codes (same as country TLDs) except US and AU
+foreach ( qw(
+AF AL DZ AS AD AO AI AQ AG AR AM AW AT AZ BS BH BD BB BY BE BZ BJ BM BT BO
+BA BW BV BR IO BN BG BF BI KH CM CA CV KY CF TD CL CN CX CC CO KM CG CK CR CI
+HR CU CY CZ DK DJ DM DO TP EC EG SV GQ ER EE ET FK FO FJ FI FR FX GF PF TF GA
+GM GE DE GH GI GR GL GD GP GU GT GN GW GY HT HM HN HK HU IS IN ID IR IQ IE IL
+IT JM JP JO KZ KE KI KP KR KW KG LA LV LB LS LR LY LI LT LU MO MK MG MW MY MV
+ML MT MH MQ MR MU YT MX FM MD MC MN MS MA MZ MM NA NR NP NL AN NC NZ NI NE NG
+NU NF MP NO OM PK PW PA PG PY PE PH PN PL PT PR QA RE RO RU RW KN LC VC WS SM
+ST SA SN SC SL SG SK SI SB SO ZA GS ES LK SH PM SD SR SJ SZ SE CH SY TW TJ TZ
+TH TG TK TO TT TN TR TM TC TV UG UA AE GB UM UY UZ VU VA VE VN VG VI WF EH
+YE YU ZR ZM ZW
+) ) {
+  my($cust_main_county)=new FS::cust_main_county({
+    'tax'   => 0,
+    'country' => $_,
+  });  
+  my($error);
+  $error=$cust_main_county->insert;
+  die $error if $error;
+}
+
+#billing events
+foreach my $aref ( 
+  [ 'COMP', 'Comp invoice', '$cust_bill->comp();', 30, 'comp' ],
+  [ 'CARD', 'Batch card', '$cust_bill->batch_card();', 40, 'batch-card' ],
+  [ 'BILL', 'Send invoice', '$cust_bill->send();', 50, 'send' ],
+) {
+
+  my $part_bill_event = new FS::part_bill_event({
+    'payby' => $aref->[0],
+    'event' => $aref->[1],
+    'eventcode' => $aref->[2],
+    'seconds' => 0,
+    'weight' => $aref->[3],
+    'plan' => $aref->[4],
+  });
+  my($error);
+  $error=$part_bill_event->insert;
+  die $error if $error;
+
+}
+
+$dbh->commit or die $dbh->errstr;
+$dbh->disconnect or die $dbh->errstr;
+
+print "Freeside database initialized sucessfully\n";
+
+sub usage {
+  die "Usage:\n  fs-setup user\n"; 
+}
+
+###
+# Now it becomes an object.  much better.
+###
+sub tables_hash_hack {
+
+  #note that s/(date|change)/_$1/; to avoid keyword conflict.
+  #put a kludge in FS::Record to catch this or? (pry need some date-handling
+  #stuff anyway also)
+
+  my(%tables)=( #yech.}
+
+    'agent' => {
+      'columns' => [
+        'agentnum', 'int',            '',     '',
+        'agent',    'varchar',           '',     $char_d,
+        'typenum',  'int',            '',     '',
+        'freq',     'int',       'NULL', '',
+        'prog',     @perl_type,
+      ],
+      'primary_key' => 'agentnum',
+      'unique' => [],
+      'index' => [ ['typenum'] ],
+    },
+
+    'agent_type' => {
+      'columns' => [
+        'typenum',   'int',  '', '',
+        'atype',     'varchar', '', $char_d,
+      ],
+      'primary_key' => 'typenum',
+      'unique' => [],
+      'index' => [],
+    },
+
+    'type_pkgs' => {
+      'columns' => [
+        'typenum',   'int',  '', '',
+        'pkgpart',   'int',  '', '',
+      ],
+      'primary_key' => '',
+      'unique' => [ ['typenum', 'pkgpart'] ],
+      'index' => [ ['typenum'] ],
+    },
+
+    'cust_bill' => {
+      'columns' => [
+        'invnum',    'int',  '', '',
+        'custnum',   'int',  '', '',
+        '_date',     @date_type,
+        'charged',   @money_type,
+        'printed',   'int',  '', '',
+        'closed',    'char', 'NULL', 1,
+      ],
+      'primary_key' => 'invnum',
+      'unique' => [],
+      'index' => [ ['custnum'] ],
+    },
+
+    'cust_bill_event' => {
+      'columns' => [
+        'eventnum',    'int',  '', '',
+        'invnum',   'int',  '', '',
+        'eventpart',   'int',  '', '',
+        '_date',     @date_type,
+        'status', 'varchar', '', $char_d,
+        'statustext', 'text', 'NULL', '',
+      ],
+      'primary_key' => 'eventnum',
+      #no... there are retries now #'unique' => [ [ 'eventpart', 'invnum' ] ],
+      'unique' => [],
+      'index' => [ ['invnum'], ['status'] ],
+    },
+
+    'part_bill_event' => {
+      'columns' => [
+        'eventpart',    'int',  '', '',
+        'payby',       'char',  '', 4,
+        'event',       'varchar',           '',     $char_d,
+        'eventcode',    @perl_type,
+        'seconds',     'int', 'NULL', '',
+        'weight',      'int', '', '',
+        'plan',       'varchar', 'NULL', $char_d,
+        'plandata',   'text', 'NULL', '',
+        'disabled',     'char', 'NULL', 1,
+      ],
+      'primary_key' => 'eventpart',
+      'unique' => [],
+      'index' => [ ['payby'] ],
+    },
+
+    'cust_bill_pkg' => {
+      'columns' => [
+        'pkgnum',  'int', '', '',
+        'invnum',  'int', '', '',
+        'setup',   @money_type,
+        'recur',   @money_type,
+        'sdate',   @date_type,
+        'edate',   @date_type,
+      ],
+      'primary_key' => '',
+      'unique' => [ ['pkgnum', 'invnum'] ],
+      'index' => [ ['invnum'] ],
+    },
+
+    'cust_credit' => {
+      'columns' => [
+        'crednum',  'int', '', '',
+        'custnum',  'int', '', '',
+        '_date',    @date_type,
+        'amount',   @money_type,
+        'otaker',   'varchar', '', 8,
+        'reason',   'text', 'NULL', '',
+        'closed',    'char', 'NULL', 1,
+      ],
+      'primary_key' => 'crednum',
+      'unique' => [],
+      'index' => [ ['custnum'] ],
+    },
+
+    'cust_credit_bill' => {
+      'columns' => [
+        'creditbillnum', 'int', '', '',
+        'crednum',  'int', '', '',
+        'invnum',  'int', '', '',
+        '_date',    @date_type,
+        'amount',   @money_type,
+      ],
+      'primary_key' => 'creditbillnum',
+      'unique' => [],
+      'index' => [ ['crednum'], ['invnum'] ],
+    },
+
+    'cust_main' => {
+      'columns' => [
+        'custnum',  'int',  '',     '',
+        'agentnum', 'int',  '',     '',
+#        'titlenum', 'int',  'NULL',   '',
+        'last',     'varchar', '',     $char_d,
+#        'middle',   'varchar', 'NULL', $char_d,
+        'first',    'varchar', '',     $char_d,
+        'ss',       'char', 'NULL', 11,
+        'company',  'varchar', 'NULL', $char_d,
+        'address1', 'varchar', '',     $char_d,
+        'address2', 'varchar', 'NULL', $char_d,
+        'city',     'varchar', '',     $char_d,
+        'county',   'varchar', 'NULL', $char_d,
+        'state',    'varchar', 'NULL', $char_d,
+        'zip',      'varchar', '',     10,
+        'country',  'char', '',     2,
+        'daytime',  'varchar', 'NULL', 20,
+        'night',    'varchar', 'NULL', 20,
+        'fax',      'varchar', 'NULL', 12,
+        'ship_last',     'varchar', 'NULL', $char_d,
+#        'ship_middle',   'varchar', 'NULL', $char_d,
+        'ship_first',    'varchar', 'NULL', $char_d,
+        'ship_company',  'varchar', 'NULL', $char_d,
+        'ship_address1', 'varchar', 'NULL', $char_d,
+        'ship_address2', 'varchar', 'NULL', $char_d,
+        'ship_city',     'varchar', 'NULL', $char_d,
+        'ship_county',   'varchar', 'NULL', $char_d,
+        'ship_state',    'varchar', 'NULL', $char_d,
+        'ship_zip',      'varchar', 'NULL', 10,
+        'ship_country',  'char', 'NULL', 2,
+        'ship_daytime',  'varchar', 'NULL', 20,
+        'ship_night',    'varchar', 'NULL', 20,
+        'ship_fax',      'varchar', 'NULL', 12,
+        'payby',    'char', '',     4,
+        'payinfo',  'varchar', 'NULL', $char_d,
+        #'paydate',  @date_type,
+        'paydate',  'varchar', 'NULL', 10,
+        'payname',  'varchar', 'NULL', $char_d,
+        'tax',      'char', 'NULL', 1,
+        'otaker',   'varchar', '',     8,
+        'refnum',   'int',  '',     '',
+        'referral_custnum', 'int',  'NULL', '',
+        'comments', 'text', 'NULL', '',
+      ],
+      'primary_key' => 'custnum',
+      'unique' => [],
+      #'index' => [ ['last'], ['company'] ],
+      'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ] ],
+    },
+
+    'cust_main_invoice' => {
+      'columns' => [
+        'destnum',  'int',  '',     '',
+        'custnum',  'int',  '',     '',
+        'dest',     'varchar', '',  $char_d,
+      ],
+      'primary_key' => 'destnum',
+      'unique' => [],
+      'index' => [ ['custnum'], ],
+    },
+
+    'cust_main_county' => { #county+state+country are checked off the
+                            #cust_main_county for validation and to provide
+                            # a tax rate.
+      'columns' => [
+        'taxnum',   'int',   '',    '',
+        'state',    'varchar',  'NULL',    $char_d,
+        'county',   'varchar',  'NULL',    $char_d,
+        'country',  'char',  '', 2, 
+        'taxclass',   'varchar', 'NULL', $char_d,
+        'exempt_amount', @money_type,
+        'tax',      'real',  '',    '', #tax %
+      ],
+      'primary_key' => 'taxnum',
+      'unique' => [],
+  #    'unique' => [ ['taxnum'], ['state', 'county'] ],
+      'index' => [],
+    },
+
+    'cust_pay' => {
+      'columns' => [
+        'paynum',   'int',    '',   '',
+        #now cust_bill_pay #'invnum',   'int',    '',   '',
+        'custnum',  'int',    '',   '',
+        'paid',     @money_type,
+        '_date',    @date_type,
+        'payby',    'char',   '',     4, # CARD/BILL/COMP, should be index into
+                                         # payment type table.
+        'payinfo',  'varchar',   'NULL', 16,  #see cust_main above
+        'paybatch', 'varchar',   'NULL', $char_d, #for auditing purposes.
+        'closed',    'char', 'NULL', 1,
+      ],
+      'primary_key' => 'paynum',
+      'unique' => [],
+      'index' => [ [ 'custnum' ], [ 'paybatch' ] ],
+    },
+
+    'cust_bill_pay' => {
+      'columns' => [
+        'billpaynum', 'int',     '',   '',
+        'invnum',  'int',     '',   '',
+        'paynum',  'int',     '',   '',
+        'amount',  @money_type,
+        '_date',   @date_type
+      ],
+      'primary_key' => 'billpaynum',
+      'unique' => [],
+      'index' => [ [ 'paynum' ], [ 'invnum' ] ],
+    },
+
+    'cust_pay_batch' => { #what's this used for again?  list of customers
+                          #in current CARD batch? (necessarily CARD?)
+      'columns' => [
+        'paybatchnum',   'int',    '',   '',
+        'invnum',   'int',    '',   '',
+        'custnum',   'int',    '',   '',
+        'last',     'varchar', '',     $char_d,
+        'first',    'varchar', '',     $char_d,
+        'address1', 'varchar', '',     $char_d,
+        'address2', 'varchar', 'NULL', $char_d,
+        'city',     'varchar', '',     $char_d,
+        'state',    'varchar', 'NULL', $char_d,
+        'zip',      'varchar', '',     10,
+        'country',  'char', '',     2,
+#        'trancode', 'int', '', '',
+        'cardnum',  'varchar', '',     16,
+        #'exp',      @date_type,
+        'exp',      'varchar', '',     11,
+        'payname',  'varchar', 'NULL', $char_d,
+        'amount',   @money_type,
+      ],
+      'primary_key' => 'paybatchnum',
+      'unique' => [],
+      'index' => [ ['invnum'], ['custnum'] ],
+    },
+
+    'cust_pkg' => {
+      'columns' => [
+        'pkgnum',    'int',    '',   '',
+        'custnum',   'int',    '',   '',
+        'pkgpart',   'int',    '',   '',
+        'otaker',    'varchar', '', 8,
+        'setup',     @date_type,
+        'bill',      @date_type,
+        'susp',      @date_type,
+        'cancel',    @date_type,
+        'expire',    @date_type,
+        'manual_flag', 'char', 'NULL', 1,
+      ],
+      'primary_key' => 'pkgnum',
+      'unique' => [],
+      'index' => [ ['custnum'] ],
+    },
+
+    'cust_refund' => {
+      'columns' => [
+        'refundnum',    'int',    '',   '',
+        #now cust_credit_refund #'crednum',      'int',    '',   '',
+        'custnum',  'int',    '',   '',
+        '_date',        @date_type,
+        'refund',       @money_type,
+        'otaker',       'varchar',   '',   8,
+        'reason',       'varchar',   '',   $char_d,
+        'payby',        'char',   '',     4, # CARD/BILL/COMP, should be index
+                                             # into payment type table.
+        'payinfo',      'varchar',   'NULL', 16,  #see cust_main above
+        'paybatch',     'varchar',   'NULL', $char_d,
+        'closed',    'char', 'NULL', 1,
+      ],
+      'primary_key' => 'refundnum',
+      'unique' => [],
+      'index' => [],
+    },
+
+    'cust_credit_refund' => {
+      'columns' => [
+        'creditrefundnum', 'int',     '',   '',
+        'crednum',  'int',     '',   '',
+        'refundnum',  'int',     '',   '',
+        'amount',  @money_type,
+        '_date',   @date_type
+      ],
+      'primary_key' => 'creditrefundnum',
+      'unique' => [],
+      'index' => [ [ 'crednum', 'refundnum' ] ],
+    },
+
+
+    'cust_svc' => {
+      'columns' => [
+        'svcnum',    'int',    '',   '',
+        'pkgnum',    'int',    'NULL',   '',
+        'svcpart',   'int',    '',   '',
+      ],
+      'primary_key' => 'svcnum',
+      'unique' => [],
+      'index' => [ ['svcnum'], ['pkgnum'], ['svcpart'] ],
+    },
+
+    'part_pkg' => {
+      'columns' => [
+        'pkgpart',    'int',    '',   '',
+        'pkg',        'varchar',   '',   $char_d,
+        'comment',    'varchar',   '',   $char_d,
+        'setup',      @perl_type,
+        'freq',       'int', '', '',  #billing frequency (months)
+        'recur',      @perl_type,
+        'setuptax',  'char', 'NULL', 1,
+        'recurtax',  'char', 'NULL', 1,
+        'plan',       'varchar', 'NULL', $char_d,
+        'plandata',   'text', 'NULL', '',
+        'disabled',   'char', 'NULL', 1,
+        'taxclass',   'varchar', 'NULL', $char_d,
+      ],
+      'primary_key' => 'pkgpart',
+      'unique' => [],
+      'index' => [],
+    },
+
+#    'part_title' => {
+#      'columns' => [
+#        'titlenum',   'int',    '',   '',
+#        'title',      'varchar',   '',   $char_d,
+#      ],
+#      'primary_key' => 'titlenum',
+#      'unique' => [ [] ],
+#      'index' => [ [] ],
+#    },
+
+    'pkg_svc' => {
+      'columns' => [
+        'pkgpart',    'int',    '',   '',
+        'svcpart',    'int',    '',   '',
+        'quantity',   'int',    '',   '',
+      ],
+      'primary_key' => '',
+      'unique' => [ ['pkgpart', 'svcpart'] ],
+      'index' => [ ['pkgpart'] ],
+    },
+
+    'part_referral' => {
+      'columns' => [
+        'refnum',   'int',    '',   '',
+        'referral', 'varchar',   '',   $char_d,
+      ],
+      'primary_key' => 'refnum',
+      'unique' => [],
+      'index' => [],
+    },
+
+    'part_svc' => {
+      'columns' => [
+        'svcpart',    'int',    '',   '',
+        'svc',        'varchar',   '',   $char_d,
+        'svcdb',      'varchar',   '',   $char_d,
+        'disabled',   'char',  'NULL',   1,
+      ],
+      'primary_key' => 'svcpart',
+      'unique' => [],
+      'index' => [],
+    },
+
+    'part_svc_column' => {
+      'columns' => [
+        'columnnum',   'int',         '', '',
+        'svcpart',     'int',         '', '',
+        'columnname',  'varchar',     '', 64,
+        'columnvalue', 'varchar', 'NULL', $char_d,
+        'columnflag',  'char',    'NULL', 1, 
+      ],
+      'primary_key' => 'columnnum',
+      'unique' => [ [ 'svcpart', 'columnname' ] ],
+      'index' => [ [ 'svcpart' ] ],
+    },
+
+    #(this should be renamed to part_pop)
+    'svc_acct_pop' => {
+      'columns' => [
+        'popnum',    'int',    '',   '',
+        'city',      'varchar',   '',   $char_d,
+        'state',     'varchar',   '',   $char_d,
+        'ac',        'char',   '',   3,
+        'exch',      'char',   '',   3,
+        'loc',       'char',   'NULL',   4, #NULL for legacy purposes
+      ],
+      'primary_key' => 'popnum',
+      'unique' => [],
+      'index' => [ [ 'state' ] ],
+    },
+
+    'part_pop_local' => {
+      'columns' => [
+        'localnum',  'int',     '',     '',
+        'popnum',    'int',     '',     '',
+        'city',      'varchar', 'NULL', $char_d,
+        'state',     'char',    'NULL', 2,
+        'npa',       'char',    '',     3,
+        'nxx',       'char',    '',     3,
+      ],
+      'primary_key' => 'localnum',
+      'unique' => [],
+      'index' => [ [ 'npa', 'nxx' ], [ 'popnum' ] ],
+    },
+
+    'svc_acct' => {
+      'columns' => [
+        'svcnum',    'int',    '',   '',
+        'username',  'varchar',   '',   $username_len, #unique (& remove dup code)
+        '_password', 'varchar',   '',   50, #13 for encryped pw's plus ' *SUSPENDED* (mp5 passwords can be 34)
+        'sec_phrase', 'varchar',  'NULL',   $char_d,
+        'popnum',    'int',    'NULL',   '',
+        'uid',       'int', 'NULL',   '',
+        'gid',       'int', 'NULL',   '',
+        'finger',    'varchar',   'NULL',   $char_d,
+        'dir',       'varchar',   'NULL',   $char_d,
+        'shell',     'varchar',   'NULL',   $char_d,
+        'quota',     'varchar',   'NULL',   $char_d,
+        'slipip',    'varchar',   'NULL',   15, #four TINYINTs, bah.
+        'seconds',   'int', 'NULL',   '', #uhhhh
+        'domsvc',    'int', '',   '',
+      ],
+      'primary_key' => 'svcnum',
+      #'unique' => [ [ 'username', 'domsvc' ] ],
+      'unique' => [],
+      'index' => [ ['username'], ['domsvc'] ],
+    },
+
+#    'svc_acct_sm' => {
+#      'columns' => [
+#        'svcnum',    'int',    '',   '',
+#        'domsvc',    'int',    '',   '',
+#        'domuid',    'int', '',   '',
+#        'domuser',   'varchar',   '',   $char_d,
+#      ],
+#      'primary_key' => 'svcnum',
+#      'unique' => [ [] ],
+#      'index' => [ ['domsvc'], ['domuid'] ], 
+#    },
+
+    #'svc_charge' => {
+    #  'columns' => [
+    #    'svcnum',    'int',    '',   '',
+    #    'amount',    @money_type,
+    #  ],
+    #  'primary_key' => 'svcnum',
+    #  'unique' => [ [] ],
+    #  'index' => [ [] ],
+    #},
+
+    'svc_domain' => {
+      'columns' => [
+        'svcnum',    'int',    '',   '',
+        'domain',    'varchar',    '',   $char_d,
+        'catchall',  'int', 'NULL',    '',
+      ],
+      'primary_key' => 'svcnum',
+      'unique' => [ ['domain'] ],
+      'index' => [],
+    },
+
+    'domain_record' => {
+      'columns' => [
+        'recnum',    'int',     '',  '',
+        'svcnum',    'int',     '',  '',
+        'reczone',   'varchar', '',  $char_d,
+        'recaf',     'char',    '',  2,
+        'rectype',   'char',    '',  5,
+        'recdata',   'varchar', '',  $char_d,
+      ],
+      'primary_key' => 'recnum',
+      'unique'      => [],
+      'index'       => [ ['svcnum'] ],
+    },
+
+    'svc_forward' => {
+      'columns' => [
+        'svcnum',   'int',    '',  '',
+        'srcsvc',   'int',    '',  '',
+        'dstsvc',   'int',    '',  '',
+        'dst',      'varchar',    'NULL',  $char_d,
+      ],
+      'primary_key' => 'svcnum',
+      'unique'      => [],
+      'index'       => [ ['srcsvc'], ['dstsvc'] ],
+    },
+
+    'svc_www' => {
+      'columns' => [
+        'svcnum',   'int',    '',  '',
+        'recnum',   'int',    '',  '',
+        'usersvc',  'int',    '',  '',
+      ],
+      'primary_key' => 'svcnum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    #'svc_wo' => {
+    #  'columns' => [
+    #    'svcnum',    'int',    '',   '',
+    #    'svcnum',    'int',    '',   '',
+    #    'svcnum',    'int',    '',   '',
+    #    'worker',    'varchar',   '',   $char_d,
+    #    '_date',     @date_type,
+    #  ],
+    #  'primary_key' => 'svcnum',
+    #  'unique' => [ [] ],
+    #  'index' => [ [] ],
+    #},
+
+    'prepay_credit' => {
+      'columns' => [
+        'prepaynum',   'int',     '',   '',
+        'identifier',  'varchar', '', $char_d,
+        'amount',      @money_type,
+        'seconds',     'int',     'NULL', '',
+      ],
+      'primary_key' => 'prepaynum',
+      'unique'      => [ ['identifier'] ],
+      'index'       => [],
+    },
+
+    'port' => {
+      'columns' => [
+        'portnum',  'int',     '',   '',
+        'ip',       'varchar', 'NULL', 15,
+        'nasport',  'int',     'NULL', '',
+        'nasnum',   'int',     '',   '',
+      ],
+      'primary_key' => 'portnum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'nas' => {
+      'columns' => [
+        'nasnum',   'int',     '',    '',
+        'nas',      'varchar', '',    $char_d,
+        'nasip',    'varchar', '',    15,
+        'nasfqdn',  'varchar', '',    $char_d,
+        'last',     'int',     '',    '',
+      ],
+      'primary_key' => 'nasnum',
+      'unique'      => [ [ 'nas' ], [ 'nasip' ] ],
+      'index'       => [ [ 'last' ] ],
+    },
+
+    'session' => {
+      'columns' => [
+        'sessionnum', 'int',       '',   '',
+        'portnum',    'int',       '',   '',
+        'svcnum',     'int',       '',   '',
+        'login',      @date_type,
+        'logout',     @date_type,
+      ],
+      'primary_key' => 'sessionnum',
+      'unique'      => [],
+      'index'       => [ [ 'portnum' ] ],
+    },
+
+    'queue' => {
+      'columns' => [
+        'jobnum', 'int', '', '',
+        'job', 'text', '', '',
+        '_date', 'int', '', '',
+        'status', 'varchar', '', $char_d,
+        'statustext', 'text', 'NULL', '',
+        'svcnum', 'int', 'NULL', '',
+      ],
+      'primary_key' => 'jobnum',
+      'unique'      => [],
+      'index'       => [ [ 'svcnum' ], [ 'status' ] ],
+    },
+
+    'queue_arg' => {
+      'columns' => [
+        'argnum', 'int', '', '',
+        'jobnum', 'int', '', '',
+        'arg', 'text', 'NULL', '',
+      ],
+      'primary_key' => 'argnum',
+      'unique'      => [],
+      'index'       => [ [ 'jobnum' ] ],
+    },
+
+    'queue_depend' => {
+      'columns' => [
+        'dependnum', 'int', '', '',
+        'jobnum', 'int', '', '',
+        'depend_jobnum', 'int', '', '',
+      ],
+      'primary_key' => 'dependnum',
+      'unique'      => [],
+      'index'       => [ [ 'jobnum' ], [ 'depend_jobnum' ] ],
+    },
+
+    'export_svc' => {
+      'columns' => [
+        'exportsvcnum' => 'int', '', '',
+        'exportnum'    => 'int', '', '',
+        'svcpart'      => 'int', '', '',
+      ],
+      'primary_key' => 'exportsvcnum',
+      'unique'      => [ [ 'exportnum', 'svcpart' ] ],
+      'index'       => [ [ 'exportnum' ], [ 'svcpart' ] ],
+    },
+
+    'part_export' => {
+      'columns' => [
+        'exportnum', 'int', '', '',
+        #'svcpart',   'int', '', '',
+        'machine', 'varchar', '', $char_d,
+        'exporttype', 'varchar', '', $char_d,
+        'nodomain',     'char', 'NULL', 1,
+      ],
+      'primary_key' => 'exportnum',
+      'unique'      => [],
+      'index'       => [ [ 'machine' ], [ 'exporttype' ] ],
+    },
+
+    'part_export_option' => {
+      'columns' => [
+        'optionnum', 'int', '', '',
+        'exportnum', 'int', '', '',
+        'optionname', 'varchar', '', $char_d,
+        'optionvalue', 'text', 'NULL', '',
+      ],
+      'primary_key' => 'optionnum',
+      'unique'      => [],
+      'index'       => [ [ 'exportnum' ], [ 'optionname' ] ],
+    },
+
+    'radius_usergroup' => {
+      'columns' => [
+        'usergroupnum', 'int', '', '',
+        'svcnum',       'int', '', '',
+        'groupname',    'varchar', '', $char_d,
+      ],
+      'primary_key' => 'usergroupnum',
+      'unique'      => [],
+      'index'       => [ [ 'svcnum' ], [ 'groupname' ] ],
+    },
+
+    'msgcat' => {
+      'columns' => [
+        'msgnum', 'int', '', '',
+        'msgcode', 'varchar', '', $char_d,
+        'locale', 'varchar', '', 16,
+        'msg', 'text', '', '',
+      ],
+      'primary_key' => 'msgnum',
+      'unique'      => [ [ 'msgcode', 'locale' ] ],
+      'index'       => [],
+    },
+
+    'cust_tax_exempt' => {
+      'columns' => [
+        'exemptnum', 'int', '', '',
+        'custnum',   'int', '', '',
+        'taxnum',    'int', '', '',
+        'year',      'int', '', '',
+        'month',     'int', '', '',
+        'amount',   @money_type,
+      ],
+      'primary_key' => 'exemptnum',
+      'unique'      => [ [ 'custnum', 'taxnum', 'year', 'month' ] ],
+      'index'       => [],
+    },
+
+
+
+  );
+
+  %tables;
+
+}
+
-- 
cgit v1.2.1


From ef92d87d1980598a4f786905ac7aff1af0ead2b8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 25 Aug 2002 01:14:16 +0000
Subject: noninteractive freeside-setup

---
 FS/bin/freeside-setup | 77 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 35 deletions(-)

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 21defa6e5..a14f0e12b 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -4,6 +4,8 @@
 BEGIN { $FS::Record::setup_hack = 1; }
 
 use strict;
+use vars qw($opt_s);
+use Getopt::Std;
 use DBI;
 use DBIx::DBSchema 0.20;
 use DBIx::DBSchema::Table;
@@ -21,6 +23,7 @@ die "Not running uid freeside!" unless checkeuid();
 my %attrib2db =
   map { lc($FS::raddb::attrib{$_}) => $_ } keys %FS::raddb::attrib;
 
+getopts("s");
 my $user = shift or die &usage;
 getsecrets($user);
 
@@ -33,42 +36,46 @@ my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;
 #my($username_len)=&getvalue;
 my $username_len = 32; #usernamemax config file
 
-print "\n\n", <<END, ":";
-Freeside tracks the RADIUS User-Name, check attribute Password and
-reply attribute Framed-IP-Address for each user.  You can specify additional
-check and reply attributes (or you can add them later with the
-fs-radius-add-check and fs-radius-add-reply programs).
-
-First enter any additional RADIUS check attributes you need to track for each 
-user, separated by whitespace.
-END
-my @check_attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
-                         split(" ",&getvalue);
-
-print "\n\n", <<END, ":";
-Now enter any additional reply attributes you need to track for each user,
-separated by whitespace.
-END
-my @attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
-                   split(" ",&getvalue);
-
-print "\n\n", <<END, ":";
-Do you wish to enable the tracking of a second, separate shipping/service
-address?
-END
-my $ship = &_yesno;
-
-sub getvalue {
-  my($x)=scalar(<STDIN>);
-  chop $x;
-  $x;
-}
+#print "\n\n", <<END, ":";
+#Freeside tracks the RADIUS User-Name, check attribute Password and
+#reply attribute Framed-IP-Address for each user.  You can specify additional
+#check and reply attributes (or you can add them later with the
+#fs-radius-add-check and fs-radius-add-reply programs).
+#
+#First enter any additional RADIUS check attributes you need to track for each 
+#user, separated by whitespace.
+#END
+#my @check_attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
+#                         split(" ",&getvalue);
+#
+#print "\n\n", <<END, ":";
+#Now enter any additional reply attributes you need to track for each user,
+#separated by whitespace.
+#END
+#my @attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
+#                   split(" ",&getvalue);
+#
+#print "\n\n", <<END, ":";
+#Do you wish to enable the tracking of a second, separate shipping/service
+#address?
+#END
+#my $ship = &_yesno;
+#
+#sub getvalue {
+#  my($x)=scalar(<STDIN>);
+#  chop $x;
+#  $x;
+#}
+#
+#sub _yesno {
+#  print " [y/N]:";
+#  my $x = scalar(<STDIN>);
+#  $x =~ /^y/i;
+#}
 
-sub _yesno {
-  print " [y/N]:";
-  my $x = scalar(<STDIN>);
-  $x =~ /^y/i;
-}
+my @check_attributes = (); #add later
+my @attributes = (); #add later
+my $ship = $opt_s;
 
 ###
 
-- 
cgit v1.2.1


From 3dc9eeed220e7f7adbf08526f109a190deb3f552 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 25 Aug 2002 01:16:30 +0000
Subject: doc

---
 FS/bin/freeside-adduser | 4 ++--
 FS/bin/freeside-setup   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index e9b300823..424123226 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: freeside-adduser,v 1.6 2002-08-25 01:09:50 ivan Exp $
+# $Id: freeside-adduser,v 1.7 2002-08-25 01:16:30 ivan Exp $
 
 use strict;
 use vars qw($opt_h $opt_b $opt_c $opt_s);
@@ -29,7 +29,7 @@ print MAPSECRETS "$user $secretfile\n";
 close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
 
 sub usage {
-  die "Usage:\n\n  freeside-adduser [ -h htpasswd_file [ -c ] ] [ -s secretfile ] username"
+  die "Usage:\n\n  freeside-adduser [ -h htpasswd_file [ -c ] [ -b ] ] [ -s secretfile ] username"
 }
 
 =head1 NAME
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index a14f0e12b..78a03385c 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -320,10 +320,10 @@ foreach my $aref (
 $dbh->commit or die $dbh->errstr;
 $dbh->disconnect or die $dbh->errstr;
 
-print "Freeside database initialized sucessfully\n";
+#print "Freeside database initialized sucessfully\n";
 
 sub usage {
-  die "Usage:\n  fs-setup user\n"; 
+  die "Usage:\n  freeside-setup [ -s ] user\n"; 
 }
 
 ###
-- 
cgit v1.2.1


From f8a3854cc6186ae9dc2bfafd3a756224ed999cd7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 25 Aug 2002 01:48:06 +0000
Subject: Added Files: bin/freeside-addoutsourceuser

---
 FS/MANIFEST                      |  2 ++
 FS/bin/freeside-addoutsourceuser | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 FS/bin/freeside-addoutsourceuser

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 18842df23..fff95c8c8 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -8,8 +8,10 @@ bin/freeside-daily
 bin/freeside-email
 bin/freeside-queued
 bin/freeside-addoutsource
+bin/freeside-addoutsourceuser
 bin/freeside-apply-credits
 bin/freeside-adduser
+bin/freeside-setup
 bin/freeside-setinvoice
 bin/freeside-overdue
 bin/freeside-receivables-report
diff --git a/FS/bin/freeside-addoutsourceuser b/FS/bin/freeside-addoutsourceuser
new file mode 100644
index 000000000..f76f39808
--- /dev/null
+++ b/FS/bin/freeside-addoutsourceuser
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+username=$1
+domain=$2
+
+freeside-adduser -h /usr/local/etc/freeside/htpasswd \
+ -s /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain/secrets \
+ -b \
+ $username $password
+
+[ -e /usr/local/etc/freeside/dbdef.DBI:Pg:host=localhost\;dbname=$domain ] \
+ || ( freeside-setup $username; \
+      /home/ivan/freeside/bin/populate-msgcat $username )
+
-- 
cgit v1.2.1


From b181fa835716ef11055281416d685ef1f9242b0d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 25 Aug 2002 01:48:38 +0000
Subject: password

---
 FS/bin/freeside-addoutsourceuser | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/bin/freeside-addoutsourceuser b/FS/bin/freeside-addoutsourceuser
index f76f39808..5f18bdfac 100644
--- a/FS/bin/freeside-addoutsourceuser
+++ b/FS/bin/freeside-addoutsourceuser
@@ -2,6 +2,7 @@
 
 username=$1
 domain=$2
+password=$3
 
 freeside-adduser -h /usr/local/etc/freeside/htpasswd \
  -s /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain/secrets \
-- 
cgit v1.2.1


From 8c90a85bd16e7d2aa1afeb1fdd38662d60645869 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 25 Aug 2002 02:26:30 +0000
Subject: properly quote password as well as finger

---
 FS/FS/part_export/shellcommands.pm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index d69848f22..3e9ac4a08 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -30,6 +30,7 @@ sub _export_command {
     ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
   }
   $finger = shell_quote $finger;
+  $_password = shell_quote $_password;
   $domain = $svc_acct->domain;
   $crypt_password = ''; #surpress "used only once" warnings
   $crypt_password = crypt( $svc_acct->_password,
@@ -52,7 +53,9 @@ sub _export_replace {
     ${"old_$_"} = $old->getfield($_) foreach $old->fields;
     ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   }
+  $old__password = shell_quote $old__password;
   $new_finger = shell_quote $new_finger;
+  $new__password = shell_quote $new__password;
   $new_domain = $new->domain;
   $new_crypt_password = ''; #surpress "used only once" warnings
   $new_crypt_password = crypt( $new->_password,
-- 
cgit v1.2.1


From 77d08ccf7db6719dc7ad0e58eec8a8ca41f4115a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 25 Aug 2002 02:35:05 +0000
Subject: separate vars for quoted passwords

---
 FS/FS/part_export/shellcommands.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 3e9ac4a08..a514f9375 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -30,7 +30,7 @@ sub _export_command {
     ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
   }
   $finger = shell_quote $finger;
-  $_password = shell_quote $_password;
+  $quoted_password = shell_quote $_password;
   $domain = $svc_acct->domain;
   $crypt_password = ''; #surpress "used only once" warnings
   $crypt_password = crypt( $svc_acct->_password,
@@ -53,9 +53,8 @@ sub _export_replace {
     ${"old_$_"} = $old->getfield($_) foreach $old->fields;
     ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   }
-  $old__password = shell_quote $old__password;
   $new_finger = shell_quote $new_finger;
-  $new__password = shell_quote $new__password;
+  $quoted_new__password = shell_quote $new__password;
   $new_domain = $new->domain;
   $new_crypt_password = ''; #surpress "used only once" warnings
   $new_crypt_password = crypt( $new->_password,
-- 
cgit v1.2.1


From 84eacf59708f768adb4161c5d3e250663d7f53dd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 25 Aug 2002 03:42:25 +0000
Subject: correct secrets file path

---
 FS/bin/freeside-addoutsourceuser | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/bin/freeside-addoutsourceuser b/FS/bin/freeside-addoutsourceuser
index 5f18bdfac..ab8734042 100644
--- a/FS/bin/freeside-addoutsourceuser
+++ b/FS/bin/freeside-addoutsourceuser
@@ -5,9 +5,9 @@ domain=$2
 password=$3
 
 freeside-adduser -h /usr/local/etc/freeside/htpasswd \
- -s /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain/secrets \
- -b \
- $username $password
+                 -s conf.DBI:Pg:host=localhost\;dbname=$domain/secrets \
+                 -b \
+                 $username $password
 
 [ -e /usr/local/etc/freeside/dbdef.DBI:Pg:host=localhost\;dbname=$domain ] \
  || ( freeside-setup $username; \
-- 
cgit v1.2.1


From 47b1210b68864ad65b157170d5a21544b6dc3dde Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 25 Aug 2002 03:54:45 +0000
Subject: ?

---
 FS/bin/freeside-addoutsourceuser | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/bin/freeside-addoutsourceuser b/FS/bin/freeside-addoutsourceuser
index ab8734042..bbad8aa3f 100644
--- a/FS/bin/freeside-addoutsourceuser
+++ b/FS/bin/freeside-addoutsourceuser
@@ -7,9 +7,9 @@ password=$3
 freeside-adduser -h /usr/local/etc/freeside/htpasswd \
                  -s conf.DBI:Pg:host=localhost\;dbname=$domain/secrets \
                  -b \
-                 $username $password
+                 $username $password 2>/dev/null
 
 [ -e /usr/local/etc/freeside/dbdef.DBI:Pg:host=localhost\;dbname=$domain ] \
- || ( freeside-setup $username; \
-      /home/ivan/freeside/bin/populate-msgcat $username )
+ || ( freeside-setup $username 2>/dev/null; \
+      /home/ivan/freeside/bin/populate-msgcat $username; 2>/dev/null )
 
-- 
cgit v1.2.1


From f94fc16ea404c31c0d2ff063fc35ff06a1d2c97a Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 26 Aug 2002 19:07:10 +0000
Subject: Fancy three-stage popselector a la javascript

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 86 +++++++++++++++++++++++---------
 1 file changed, 63 insertions(+), 23 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 08d8a4d45..816b8213b 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.29 2002-05-30 22:45:20 ivan Exp $
+# $Id: signup.cgi,v 1.30 2002-08-26 19:07:10 khoff Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -359,7 +359,8 @@ sub pop_info {
 
 #horrible false laziness with FS/FS/svc_acct_pop.pm::popselector
 sub popselector {
-  my( $popnum, $state ) = @_;
+
+  my( $popnum ) = @_;
 
   return '<INPUT TYPE="hidden" NAME="popnum" VALUE="">' unless @$pops;
   return $pops->[0]{city}. ', '. $pops->[0]{state}.
@@ -368,7 +369,9 @@ sub popselector {
     if scalar(@$pops) == 1;
 
   my %pop = ();
-  push @{ $pop{$_->{state}} }, $_ foreach @$pops;
+  foreach (@$pops) {
+    push @{ $pop{ $_->{state} }->{ $_->{ac} } }, $_;
+  }
 
   my $text = <<END;
     <SCRIPT>
@@ -377,45 +380,82 @@ sub popselector {
       var length = what.length;
       what.options[length] = optionName;
     }
-    
-    function popstate_changed(what) {
+
+    function acstate_changed(what) {
       state = what.options[what.selectedIndex].text;
-      for (var i = what.form.popnum.length;i > 0;i--)
-                what.form.popnum.options[i] = null;
-      what.form.popnum.options[0] = new Option("", "", false, true);
+      for (var i = what.form.popac.length;i > 0;i--)
+                what.form.popac.options[i] = null;
+      what.form.popac.options[0] = new Option("Area code", "-1", false, true);
 END
 
-  foreach my $popstate ( sort { $a cmp $b } keys %pop ) {
-    $text .= "\nif ( state == \"$popstate\" ) {\n";
-
-    foreach my $pop ( @{$pop{$popstate}}) {
-      my $o_popnum = $pop->{popnum};
-      my $poptext =  $pop->{city}. ', '. $pop->{state}.
-                     ' ('. $pop->{ac}. ')/'. $pop->{exch};
+  foreach my $state ( sort { $a cmp $b } keys %pop ) {
+    $text .= "\nif ( state == \"$state\" ) {\n";
 
-      $text .= "opt(what.form.popnum, \"$o_popnum\", \"$poptext\");\n"
+    foreach my $ac ( sort { $a cmp $b } keys %{ $pop{$state} }) {
+      $text .= "opt(what.form.popac, \"$ac\", \"$ac\");\n";
+      if ($ac eq $cgi->param('popac')) {
+        $text .= "what.form.popac.options[what.form.popac.length-1].selected = true;\n";
+      }
     }
     $text .= "}\n";
   }
+  $text .= "popac_changed(what.form.popac)}\n";
+
+  $text .= <<END;
+  function popac_changed(what) {
+    ac = what.options[what.selectedIndex].text;
+    for (var i = what.form.popnum.length;i > 0;i--)
+        what.form.popnum.options[i] = null;
+    what.form.popnum.options[0] = new Option("City", "-1", false, true);
+
+END
+
+  foreach my $state ( keys %pop ) {
+    foreach my $popac ( keys %{ $pop{$state} } ) {
+      $text .= "\nif ( ac == \"$popac\" ) {\n";
+
+      foreach my $pop ( @{$pop{$state}->{$popac}}) {
+        my $o_popnum = $pop->{popnum};
+        my $poptext =  $pop->{city}. ', '. $pop->{state}.
+                       ' ('. $pop->{ac}. ')/'. $pop->{exch};
+
+        $text .= "opt(what.form.popnum, \"$o_popnum\", \"$poptext\");\n";
+        if ($popnum == $o_popnum) {
+          $text .= "what.form.popnum.options[what.form.popnum.length-1].selected = true;\n";
+        }
+      }
+      $text .= "}\n";
+    }
+  }
+
 
   $text .= "}\n</SCRIPT>\n";
 
   $text .=
-    qq!<SELECT NAME="popstate" SIZE=1 onChange="popstate_changed(this)">!.
-    qq!<OPTION> !;
-  $text .= "<OPTION>$_" foreach sort { $a cmp $b } keys %pop;
-  $text .= '</SELECT>'; #callback? return 3 html pieces?  #'</TD><TD>';
+    qq!<TABLE CELLPADDING="0"><TR><TD><SELECT NAME="acstate"! .
+    qq!SIZE=1 onChange="acstate_changed(this)"><OPTION VALUE=-1>State!;
+  $text .= "<OPTION" . ($_ eq $cgi->param('acstate') ? " SELECTED" : "") .
+           ">$_" foreach sort { $a cmp $b } keys %pop;
+  $text .= '</SELECT>'; #callback? return 3 html pieces?  #'</TD>';
 
-  $text .= qq!<SELECT NAME="popnum" SIZE=1><OPTION> !;
-  foreach my $pop ( @$pops ) {
+  $text .=
+    qq!<SELECT NAME="popac" SIZE=1 onChange="popac_changed(this)">!.
+    qq!<OPTION>Area code</SELECT></TR><TR VALIGN="top">!;
+
+  $text .= qq!<TR><TD><SELECT NAME="popnum" SIZE=1 STYLE="width: 20em"><OPTION>City!;
+
+  #comment this block to disable initial list polulation
+  foreach my $pop ( sort { $a->{state} cmp $b->{state} } @$pops ) {
     $text .= qq!<OPTION VALUE="!. $pop->{popnum}. '"'.
              ( ( $popnum && $pop->{popnum} == $popnum ) ? ' SELECTED' : '' ). ">".
              $pop->{city}. ', '. $pop->{state}.
                ' ('. $pop->{ac}. ')/'. $pop->{exch};
   }
-  $text .= '</SELECT>';
+
+  $text .= qq!</SELECT></TD></TR></TABLE>!;
 
   $text;
+
 }
 
 sub expselect {
-- 
cgit v1.2.1


From b9e48e4f10f9ae0657d22385a48c628abd16ce5c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 26 Aug 2002 20:40:55 +0000
Subject: allow . and - in otaker usernames

---
 FS/FS/cust_pkg.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 8b65ac4bd..12508e1aa 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -229,7 +229,7 @@ sub check {
     unless qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
 
   $self->otaker(getotaker) unless $self->otaker;
-  $self->otaker =~ /^(\w{0,16})$/ or return "Illegal otaker";
+  $self->otaker =~ /^([\w\.\-]{0,16})$/ or return "Illegal otaker";
   $self->otaker($1);
 
   if ( $self->dbdef_table->column('manual_flag') ) {
@@ -679,7 +679,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.22 2002-05-22 12:17:06 ivan Exp $
+$Id: cust_pkg.pm,v 1.23 2002-08-26 20:40:55 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From fea7f83baf7d460a00ca2d79fde71ce5f07884b3 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Tue, 27 Aug 2002 07:26:10 +0000
Subject: Yip yip, I sprained my brain

---
 FS/FS/Record.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index e6126a13b..c247ed2db 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -930,7 +930,7 @@ sub ut_ip {
   $self->getfield($field) =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/
     or return "Illegal (IP address) $field: ". $self->getfield($field);
   for ( $1, $2, $3, $4 ) { return "Illegal (IP address) $field" if $_ > 255; }
-  $self->setfield($field, "$1.$2.$3.$3");
+  $self->setfield($field, "$1.$2.$3.$4");
   '';
 }
 
-- 
cgit v1.2.1


From df3365357d0b1cae7fd3159585db186f28953ce5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Aug 2002 05:57:47 +0000
Subject: password viewing UI change

---
 httemplate/view/svc_acct.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index f6c1b026c..19953bafd 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -83,7 +83,7 @@ if ( $password =~ /^\*\w+\* (.*)$/ ) {
   print "<I>(login disabled)</I> ";
 }
 if ( $conf->exists('showpasswords') ) {
-  print "$password";
+  print '<PRE>'. encode_entities($password). '</PRE>';
 } else {
   print "<I>(hidden)</I>";
 }
-- 
cgit v1.2.1


From 63e5dad29d03b3cfabc3c71a11c24eea593860ac Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Aug 2002 06:02:52 +0000
Subject: stupid kludge until schema otakers are not 8 chars

---
 FS/FS/UID.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 0b10612c5..8934d49fc 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -171,7 +171,9 @@ Returns the current Freeside user.
 =cut
 
 sub getotaker {
-  $user;
+  #$user;
+  #stupid kludge until schema otaker fields are not 8 chars
+  substr($user,0,8);
 }
 
 =item cgisetotaker
@@ -256,7 +258,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.18 2002-07-03 11:23:25 ivan Exp $
+$Id: UID.pm,v 1.19 2002-08-29 06:02:52 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From f97fd1dc04ae1bc8a130aecff0038a0e52cef82b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Aug 2002 07:50:46 +0000
Subject: vpopmail updates

---
 FS/FS/part_export.pm          |  2 +-
 FS/FS/part_export/vpopmail.pm | 53 ++++++++++++++++++++++++++++++++++---------
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 67b3cade5..9645feb98 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -778,7 +778,7 @@ tie my %sqlmail_options, 'Tie::IxHash',
     'vpopmail' => {
       'desc' => 'Real-time export to vpopmail text files',
       'options' => \%vpopmail_options,
-      'notes' => 'Real time export to <a href="http://inter7.com/vpopmail/">vpopmail</a> text files (...extended description from jeff?...)',
+      'notes' => 'Real time export to <a href="http://inter7.com/vpopmail/">vpopmail</a> text files (...extended description from jeff?...)  <a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a> must be installed.',
     },
 
   },
diff --git a/FS/FS/part_export/vpopmail.pm b/FS/FS/part_export/vpopmail.pm
index 6a486faa1..c0105c045 100644
--- a/FS/FS/part_export/vpopmail.pm
+++ b/FS/FS/part_export/vpopmail.pm
@@ -20,6 +20,7 @@ sub _export_insert {
     $svc_acct->username,
     crypt($svc_acct->_password,$saltset[int(rand(64))].$saltset[int(rand(64))]),
     $svc_acct->domain,
+    $svc_acct->quota,
   );
 }
 
@@ -47,7 +48,7 @@ sub _export_replace {
   return '' unless $old->_password ne $new->_password;
 
   $self->vpopmail_queue( $new->svcnum, 'replace',
-    $new->username, $cpassword, $new->domain );
+    $new->username, $cpassword, $new->domain, $new->quota );
 }
 
 sub _export_delete {
@@ -76,7 +77,7 @@ sub vpopmail_queue {
 
 sub vpopmail_insert { #subroutine, not method
   my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
-  my( $username, $password, $domain ) = @_;
+  my( $username, $password, $domain, $quota ) = @_;
   
   (open(VPASSWD, ">>$exportdir/domains/$domain/vpasswd")
     and flock(VPASSWD,LOCK_EX)
@@ -87,9 +88,9 @@ sub vpopmail_insert { #subroutine, not method
     $password,
     '1',
     '0',
-    $username,
+    $finger,
     "$dir/domains/$domain/$username",
-    'NOQUOTA',
+    $quota ? $quota.'S' : 'NOQUOTA',
   ), "\n";
 
   flock(VPASSWD,LOCK_UN);
@@ -118,10 +119,21 @@ sub vpopmail_replace { #subroutine, not method
     or die "Can't open $exportdir/domains/$domain/vpasswd.tmp: $!";
 
   while (<VPASSWD>) {
-    my ($mailbox, $pw, @rest) = split(':', $_);
-    print VPASSWDTMP $_ unless $username eq $mailbox;
-    print VPASSWDTMP join (':', ($mailbox, $password, @rest))
-      if $username eq $mailbox;
+    my ($mailbox, $pw, $vuid, $vgid, $vfinger, $vdir, $vquota, @rest) =
+      split(':', $_);
+    if ( $username ne $mailbox ) {
+      print VPASSWDTMP $_;
+      next
+    }
+    print VPASSWDTMP join (':',
+      $mailbox,
+      $password,
+      '1',
+      '0',
+      $finger,
+      $dir,
+      $quota ? $quota.'S' : 'NOQUOTA',
+    ), "\n";
   }
 
   close(VPASSWDTMP);
@@ -171,9 +183,28 @@ sub vpopmail_sync {
   my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
   
   chdir $exportdir;
-  my @args = ( $rsync, "-rlpt", "-e", $ssh, "domains/",
-               "vpopmail\@$machine:$dir/domains/"  );
-  system {$args[0]} @args;
+#  my @args = ( $rsync, "-rlpt", "-e", $ssh, "domains/",
+#               "vpopmail\@$machine:$dir/domains/"  );
+#  system {$args[0]} @args;
+
+  eval "use File::Rsync;";
+  die $@ if $@;
+
+  my $rsync = File::Rsync->new({ rsh => 'ssh' });
+
+  $rsync->exec( {
+    recursive => 1,
+    perms     => 1,
+    times     => 1,
+    src       => "$exportdir/domains/",
+    dest      => "vpopmail\@$machine:$dir/domains/",
+  } ); # true/false return value from exec is not working, alas
+  if ( $rsync->err ) {
+    die "error uploading to vpopmail\@$machine:$dir/domains/ : ".
+        'exit status: '. $rsync->status. ', '.
+        'STDERR: '. join(" / ", $rsync->err). ', '.
+        'STDOUT: '. join(" / ", $rsync->out);
+  }
 }
 
 
-- 
cgit v1.2.1


From 54d3c9d101bf35702c00b63f02a6db57ef0f867c Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Thu, 29 Aug 2002 08:13:55 +0000
Subject: Missing Mason/Apache::ASP tags

---
 httemplate/view/svc_domain.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index b70ac8f90..cc3cdb6bf 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -46,7 +46,7 @@ my $domain = $svc_domain->domain;
 Service #<%= $svcnum %>
 <BR>Service: <B><%= $part_svc->svc %></B>
 <BR>Domain name: <B><%= $domain %></B>
-<BR>Catch all email <A HREF="${p}misc/catchall.cgi?<%= $svcnum %>">(change)</A>:
+<BR>Catch all email <A HREF="<%= ${p} %>misc/catchall.cgi?<%= $svcnum %>">(change)</A>:
 <%= $email ? "<B>$email</B>" : "<I>(none)<I>" %>
 <BR><BR><A HREF="http://www.geektools.com/cgi-bin/proxy.cgi?query=<%=$domain%>;targetnic=auto">View whois information.</A>
 <BR><BR>
-- 
cgit v1.2.1


From 7171a6086a6ba39c73d45ea6aae37c63cdfe5713 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Aug 2002 09:11:28 +0000
Subject: dont require uid for finger and quota, fix md5 import, make
 username/password for unexported services conflict at least with self

---
 FS/FS/svc_acct.pm | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index c95df94cf..6fe26c8d5 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -246,7 +246,8 @@ sub insert {
 
   if ( @dup_user || @dup_userdomain || @dup_uid ) {
     my $exports = FS::part_export::export_info('svc_acct');
-    my( %conflict_user_svcpart, %conflict_userdomain_svcpart );
+    my %conflict_user_svcpart;
+    my %conflict_userdomain_svcpart = ( $self->svcpart => 'SELF', );
 
     foreach my $part_export ( $part_svc->part_export ) {
 
@@ -705,12 +706,6 @@ sub check {
          && $recref->{username} ne 'root'
          && $recref->{username} ne 'toor';
 
-#    $error = $self->ut_textn('finger');
-#    return $error if $error;
-    $self->getfield('finger') =~
-      /^([\w \t\!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\*\<\>]*)$/
-        or return "Illegal finger: ". $self->getfield('finger');
-    $self->setfield('finger', $1);
 
     $recref->{dir} =~ /^([\/\w\-\.\&]*)$/
       or return "Illegal directory";
@@ -745,22 +740,25 @@ sub check {
       $recref->{shell} = '/bin/sync';
     }
 
-    $recref->{quota} =~ /^(\d*)$/ or return "Illegal quota (unimplemented)";
-    $recref->{quota} = $1;
-
   } else {
     $recref->{gid} ne '' ? 
       return "Can't have gid without uid" : ( $recref->{gid}='' );
-    $recref->{finger} ne '' ? 
-      return "Can't have finger-name without uid" : ( $recref->{finger}='' );
     $recref->{dir} ne '' ? 
       return "Can't have directory without uid" : ( $recref->{dir}='' );
     $recref->{shell} ne '' ? 
       return "Can't have shell without uid" : ( $recref->{shell}='' );
-    $recref->{quota} ne '' ? 
-      return "Can't have quota without uid" : ( $recref->{quota}='' );
   }
 
+  #  $error = $self->ut_textn('finger');
+  #  return $error if $error;
+  $self->getfield('finger') =~
+    /^([\w \t\!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\*\<\>]*)$/
+      or return "Illegal finger: ". $self->getfield('finger');
+  $self->setfield('finger', $1);
+
+  $recref->{quota} =~ /^(\d*)$/ or return "Illegal quota";
+  $recref->{quota} = $1;
+
   unless ( $part_svc->part_svc_column('slipip')->columnflag eq 'F' ) {
     unless ( $recref->{slipip} eq '0e0' ) {
       $recref->{slipip} =~ /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/
@@ -791,7 +789,7 @@ sub check {
     #$recref->{password} = $1.
     #  crypt($3,$saltset[int(rand(64))].$saltset[int(rand(64))]
     #;
-  } elsif ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([\w\.\/\$]{13,34})$/ ) {
+  } elsif ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([\w\.\/\$\;]{13,34})$/ ) {
     $recref->{_password} = $1.$3;
   } elsif ( $recref->{_password} eq '*' ) {
     $recref->{_password} = '*';
-- 
cgit v1.2.1


From 068eda26651713cf318f69908b82d7d34f9716b4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Aug 2002 14:11:00 +0000
Subject: UI ROWSPAN fix

---
 httemplate/search/cust_pkg.cgi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index abf6eee4c..5f0782b8c 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -263,11 +263,11 @@ END
     my $p = popurl(2);
     print $n1, <<END;
       <TD ROWSPAN=$rowspan><A HREF="${p}view/cust_pkg.cgi?$pkgnum"><FONT SIZE=-1>$pkgnum - $pkg</FONT></A></TD>
-      <TD>$setup</TD>
-      <TD>$bill</TD>
-      <TD>$susp</TD>
-      <TD>$expire</TD>
-      <TD>$cancel</TD>
+      <TD ROWSPAN=$rowspan>$setup</TD>
+      <TD ROWSPAN=$rowspan>$bill</TD>
+      <TD ROWSPAN=$rowspan>$susp</TD>
+      <TD ROWSPAN=$rowspan>$expire</TD>
+      <TD ROWSPAN=$rowspan>$cancel</TD>
 END
     if ( $cust_main ) {
       print <<END;
-- 
cgit v1.2.1


From 315fcc7ecfdb0c50ef856be546b570667609e0c3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Aug 2002 10:25:54 +0000
Subject: silly conf/registries dir still hanging around in CVS checkouts

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index a3f61585a..d7dce2064 100644
--- a/Makefile
+++ b/Makefile
@@ -138,6 +138,7 @@ create-config: install-perl-modules
 	chown freeside ${FREESIDE_CONF}/secrets
 
 	mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
+	rm -rf conf/registries #old dirs just won't go away
 	cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
 	chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
 
-- 
cgit v1.2.1


From 0ccfb017d1075a2def6e151fb78b1a162eb6c0e8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Aug 2002 11:33:53 +0000
Subject: use eidiot rather than die for (hopefully) better error message

---
 httemplate/edit/cust_main.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index cf8de2f13..831b2ab97 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -73,7 +73,7 @@ my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
 my @agents = qsearch( 'agent', {} );
 #die "No agents created!" unless @agents;
-die "You have not created any agents.  You must create at least one agent before adding a customer.  Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents;
+eidiot "You have not created any agents.  You must create at least one agent before adding a customer.  Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents;
 my $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
 if ( scalar(@agents) == 1 ) {
   print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!;
@@ -99,7 +99,7 @@ if ( $custnum && ! $conf->exists('editreferrals') ) {
 } else {
   my(@referrals) = qsearch('part_referral',{});
   if ( scalar(@referrals) == 0 ) {
-    die "You have not created any advertising sources.  You must create at least one advertising source before adding a customer.  Go to ". popurl(2). "browse/part_referral.cgi and create one or more advertising sources.";
+    eidiot "You have not created any advertising sources.  You must create at least one advertising source before adding a customer.  Go to ". popurl(2). "browse/part_referral.cgi and create one or more advertising sources.";
   } elsif ( scalar(@referrals) == 1 ) {
     $refnum ||= $referrals[0]->refnum;
     print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
-- 
cgit v1.2.1


From 04af7174c8f52ff484af7851f687e98f4d88670c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Aug 2002 17:34:06 +0000
Subject: working CSV import for crcmn

---
 FS/FS/cust_main.pm                           | 91 +++++++++++++++++++++++++++-
 httemplate/index.html                        |  1 +
 httemplate/misc/cust_main-import.cgi         | 51 ++++++++++++++++
 httemplate/misc/process/cust_main-import.cgi | 30 +++++++++
 4 files changed, 172 insertions(+), 1 deletion(-)
 create mode 100644 httemplate/misc/cust_main-import.cgi
 create mode 100644 httemplate/misc/process/cust_main-import.cgi

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index eb468d981..eae760bd3 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -713,7 +713,8 @@ sub check {
     my $y = length($2) == 4 ? $2 : "20$2";
     $self->paydate("$y-$1-01");
     my($nowm,$nowy)=(localtime(time))[4,5]; $nowm++; $nowy+=1900;
-    return gettext('expired_card') if $y<$nowy || ( $y==$nowy && $1<$nowm );
+    return gettext('expired_card')
+      if !$import && ( $y<$nowy || ( $y==$nowy && $1<$nowm ) );
   }
 
   if ( $self->payname eq '' &&
@@ -1964,6 +1965,94 @@ sub append_fuzzyfiles {
   1;
 }
 
+=item batch_import
+
+=cut
+
+sub batch_import {
+  my $param = shift;
+  #warn join('-',keys %$param);
+  my $fh = $param->{filehandle};
+  my $agentnum = $param->{agentnum};
+  my $refnum = $param->{refnum};
+  my $pkgpart = $param->{pkgpart};
+  my @fields = @{$param->{fields}};
+
+  eval "use Date::Parse;";
+  die $@ if $@;
+  eval "use Text::CSV_XS;";
+  die $@ if $@;
+
+  my $csv = new Text::CSV_XS;
+  #warn $csv;
+  #warn $fh;
+
+  my $imported = 0;
+  #my $columns;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+  
+  #while ( $columns = $csv->getline($fh) ) {
+  my $line;
+  while ( defined($line=<$fh>) ) {
+
+    $csv->parse($line) or do {
+      $dbh->rollback if $oldAutoCommit;
+      return "can't parse: ". $csv->error_input();
+    };
+
+    my @columns = $csv->fields();
+    #warn join('-',@columns);
+
+    my %cust_main = (
+      agentnum => $agentnum,
+      refnum   => $refnum,
+      country  => 'US', #default
+      payby    => 'BILL', #default
+      paydate  => '12/2037', #default
+    );
+    my %cust_pkg = ( pkgpart => $pkgpart );
+    foreach my $field ( @fields ) {
+      if ( $field =~ /^cust_pkg\.(setup|bill|susp|expire|cancel)$/ ) {
+        #$cust_pkg{$1} = str2time( shift @$columns );
+        $cust_pkg{$1} = str2time( shift @columns );
+      } else {
+        #$cust_main{$field} = shift @$columns; 
+        $cust_main{$field} = shift @columns; 
+      }
+    }
+
+    my $cust_pkg = new FS::cust_pkg ( \%cust_pkg ) if $pkgpart;
+    my $cust_main = new FS::cust_main ( \%cust_main );
+    use Tie::RefHash;
+    tie my %hash, 'Tie::RefHash'; #this part is important
+    $hash{$cust_pkg} = [] if $pkgpart;
+    my $error = $cust_main->insert( \%hash );
+
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "can't insert customer for $line: $error";
+    }
+    $imported++;
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  return "Empty file!" unless $imported;
+
+  ''; #no error
+
+}
+
 =back
 
 =head1 BUGS
diff --git a/httemplate/index.html b/httemplate/index.html
index 29dd3b471..cd9a20376 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -166,6 +166,7 @@
       <BR>
       <A HREF="browse/nas.cgi">View active NAS ports</A>
       <BR><A HREF="browse/queue.cgi">View pending job queue</A>
+      <BR><A HREF="misc/cust_main-import.cgi">Batch import customers from CSV file</A>
       <BR><BR><CENTER><HR WIDTH="94%" NOSHADE></CENTER><BR>
       <A NAME="config" HREF="config/config-view.cgi">Configuration</a><!-- - <font size="+2" color="#ff0000">start here</font> -->
       <BR><BR><A NAME="admin">Administration</a>
diff --git a/httemplate/misc/cust_main-import.cgi b/httemplate/misc/cust_main-import.cgi
new file mode 100644
index 000000000..6b36f478d
--- /dev/null
+++ b/httemplate/misc/cust_main-import.cgi
@@ -0,0 +1,51 @@
+<!-- mason kludge -->
+<%= header('Batch Customer Import') %>
+<FORM ACTION="process/cust_main-import.cgi" METHOD="post" ENCTYPE="multipart/form-data">
+Import a CSV file containing customer records.<BR><BR>
+Default file format is CSV, with the following field order: <i>cust_pkg.setup, dayphone, first, last, address1, address2, city, state, zip, comments</i><BR><BR>
+
+<%
+  #false laziness with edit/cust_main.cgi
+  my @agents = qsearch( 'agent', {} );
+  die "No agents created!" unless @agents;
+  my $agentnum = $agents[0]->agentnum; #default to first
+
+  if ( scalar(@agents) == 1 ) {
+%>
+    <INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agentnum %>">
+<% } else { %>
+    <BR><BR>Agent <SELECT NAME="agentnum" SIZE="1">
+  <% foreach my $agent (sort { $a->agent cmp $b->agent } @agents) { %>
+    <OPTION VALUE="<%= $agent->agentnum %>" <%= " SELECTED"x($agent->agentnum==$agentnum) %>><%= $agent->agent %></OPTION>
+  <% } %>
+    </SELECT><BR><BR>
+<% } %>
+
+<%
+  my @referrals = qsearch('part_referral',{});
+  die "No advertising sources created!" unless @referrals;
+  my $refnum = $referrals[0]->refnum; #default to first
+
+  if ( scalar(@referrals) == 1 ) {
+%>
+    <INPUT TYPE="hidden" NAME="refnum" VALUE="<%= $refnum %>">
+<% } else { %>
+    <BR><BR>Advertising source <SELECT NAME="refnum" SIZE="1">
+  <% foreach my $referral ( sort { $a->referral <=> $b->referral } @referrals) { %>
+    <OPTION VALUE="<%= $referral->refnum %>" <%= " SELECTED"x($referral->refnum==$refnum) %>><%= $referral->refnum %>: <%= $referral->referral %></OPTION>
+  <% } %>
+    </SELECT><BR><BR>
+<% } %>
+
+    First package: <SELECT NAME="pkgpart"><OPTION VALUE="">(none)</OPTION>
+<% foreach my $part_pkg ( qsearch('part_pkg',{'disabled'=>'' }) ) { %>
+     <OPTION VALUE="<%= $part_pkg->pkgpart %>"><%= $part_pkg->pkg. ' - '. $part_pkg->comment %></OPTION>
+<% } %>
+</SELECT><BR><BR>
+
+    CSV Filename: <INPUT TYPE="file" NAME="csvfile"><BR><BR>
+    <INPUT TYPE="submit" VALUE="Import">
+    </FORM>
+  </BODY>
+<HTML>
+
diff --git a/httemplate/misc/process/cust_main-import.cgi b/httemplate/misc/process/cust_main-import.cgi
new file mode 100644
index 000000000..9e1adce54
--- /dev/null
+++ b/httemplate/misc/process/cust_main-import.cgi
@@ -0,0 +1,30 @@
+<%
+
+  my $fh = $cgi->upload('csvfile');
+  #warn $cgi;
+  #warn $fh;
+
+  my $error = defined($fh)
+    ? FS::cust_main::batch_import( {
+        filehandle => $fh,
+        agentnum   => scalar($cgi->param('agentnum')),
+        refnum     => scalar($cgi->param('refnum')),
+        pkgpart    => scalar($cgi->param('pkgpart')),
+        'fields'    => [qw( cust_pkg.setup dayphone first last address1 address2
+                           city state zip comments                          )],
+      } )
+    : 'No file';
+
+  if ( $error ) {
+    %>
+    <!-- mason kludge -->
+    <%
+    eidiot($error);
+#    $cgi->param('error', $error);
+#    print $cgi->redirect( "${p}cust_main-import.cgi
+  } else {
+    %>
+    <!-- mason kludge -->
+    <%= header('Import sucessful') %> <%
+  }
+%>
-- 
cgit v1.2.1


From 971a48bc316c52aa1471d195d75ba0137c286040 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Aug 2002 23:17:31 +0000
Subject: bill batch imported customers immediately (as of their cust_pkg.bill
 date) - setting cust_pkg.bill date directly bypasses setup fee

---
 FS/FS/cust_main.pm | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index eae760bd3..8e47f23d5 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2020,11 +2020,16 @@ sub batch_import {
       payby    => 'BILL', #default
       paydate  => '12/2037', #default
     );
+    my $billtime = time;
     my %cust_pkg = ( pkgpart => $pkgpart );
     foreach my $field ( @fields ) {
       if ( $field =~ /^cust_pkg\.(setup|bill|susp|expire|cancel)$/ ) {
         #$cust_pkg{$1} = str2time( shift @$columns );
-        $cust_pkg{$1} = str2time( shift @columns );
+        if ( $1 eq 'setup' ) {
+          $billtime = str2time(shift @columns);
+        } else {
+          $cust_pkg{$1} = str2time( shift @columns );
+        }
       } else {
         #$cust_main{$field} = shift @$columns; 
         $cust_main{$field} = shift @columns; 
@@ -2042,6 +2047,23 @@ sub batch_import {
       $dbh->rollback if $oldAutoCommit;
       return "can't insert customer for $line: $error";
     }
+
+    #false laziness w/bill.cgi
+    $error = $cust_main->bill( 'time' => $billtime );
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "can't bill customer for $line: $error";
+    }
+
+    $cust_main->apply_payments;
+    $cust_main->apply_credits;
+
+    $error = $cust_main->collect();
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "can't collect customer for $line: $error";
+    }
+
     $imported++;
   }
 
-- 
cgit v1.2.1


From 10adfb99055cc684f96cf446da34a7423cac3459 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Aug 2002 23:42:47 +0000
Subject: new invoice event: upload a CSV file

---
 FS/FS/cust_bill.pm                          | 150 +++++++++++++++++++++++++++-
 httemplate/edit/part_bill_event.cgi         |  24 +++++
 httemplate/edit/process/part_bill_event.cgi |   2 +-
 3 files changed, 174 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 5a9fdd09b..a10a6c41a 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -11,6 +11,7 @@ use Date::Format;
 use Mail::Internet 1.44;
 use Mail::Header;
 use Text::Template;
+use FS::UID qw( datasrc );
 use FS::Record qw( qsearch qsearchs );
 use FS::cust_main;
 use FS::cust_bill_pkg;
@@ -410,6 +411,153 @@ sub send {
 
 }
 
+=item send_csv OPTIONS
+
+Sends invoice as a CSV data-file to a remote host with the specified protocol.
+
+Options are:
+
+protocol - currently only "ftp"
+server
+username
+password
+dir
+
+The file will be named "N-YYYYMMDDHHMMSS.csv" where N is the invoice number
+and YYMMDDHHMMSS is a timestamp.
+
+The fields of the CSV file is as follows:
+
+record_type, invnum, custnum, _date, charged, first, last, company, address1, address2, city, state, zip, country, pkg, setup, recur, sdate, edate
+
+=over 4
+
+=item record type - B<record_type> is either C<cust_bill> or C<cust_bill_pkg>
+
+If B<record_type> is C<cust_bill>, this is a primary invoice record.  The
+last five fields (B<pkg> through B<edate>) are irrelevant, and all other
+fields are filled in.
+
+If B<record_type> is C<cust_bill_pkg>, this is a line item record.  Only the
+first two fields (B<record_type> and B<invnum>) and the last five fields
+(B<pkg> through B<edate>) are filled in.
+
+=item invnum - invoice number
+=item custnum - customer number
+=item _date - invoice date
+=item charged - total invoice amount
+=item first - customer first name
+=item last - customer first name
+=item company - company name
+=item address1 - address line 1
+=item address2 - address line 1
+=item city
+=item state
+=item zip
+=item country
+
+=item pkg - line item description
+=item setup - line item setup fee (only or both of B<setup> and B<recur> will be defined)
+=item recur - line item recurring fee (only or both of B<setup> and B<recur> will be defined)
+=item sdate - start date for recurring fee
+=item edate - end date for recurring fee
+
+=back
+
+=cut
+
+sub send_csv {
+  my($self, %opt) = @_;
+
+  #part one: create file
+
+  my $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/cust_bill";
+  mkdir $spooldir, 0700 unless -d $spooldir;
+
+  my $file = $spooldir. '/'. $self->invnum. time2str('-%Y%m%d%H%M%S.csv', time);
+
+  open(CSV, ">$file") or die "can't open $file: $!";
+
+  eval "use Text::CSV_XS";
+  die $@ if $@;
+
+  my $csv = Text::CSV_XS->new({'always_quote'=>1});
+
+  my $cust_main = $self->cust_main;
+
+  $csv->combine(
+    'cust_bill',
+    $self->invnum,
+    $self->custnum,
+    time2str("%x", $self->_date),
+    ( map { $cust_main->getfield($_) }
+        qw( first last company address1 address2 city state zip country ) ),
+    map { '' } (1..5),
+  ) or die "can't create csv";
+  print CSV $csv->string. "\n";
+
+  #new charges (false laziness w/print_text)
+  foreach my $cust_bill_pkg ( $self->cust_bill_pkg ) {
+
+    my($pkg, $setup, $recur, $sdate, $edate);
+    if ( $cust_bill_pkg->pkgnum ) {
+    
+      ($pkg, $setup, $recur, $sdate, $edate) = (
+        $cust_bill_pkg->cust_pkg->part_pkg->pkg,
+        ( $cust_bill_pkg->setup != 0
+          ? sprintf("%.2f", $cust_bill_pkg->setup )
+          : '' ),
+        ( $cust_bill_pkg->recur != 0
+          ? sprintf("%.2f", $cust_bill_pkg->recur )
+          : '' ),
+        time2str("%x", $cust_bill_pkg->sdate),
+        time2str("%x", $cust_bill_pkg->edate),
+      );
+
+    } else { #pkgnum Tax
+      next unless $cust_bill_pkg->setup != 0;
+      ($pkg, $setup, $recur, $sdate, $edate) =
+        ( 'Tax', sprintf("%10.2f",$cust_bill_pkg->setup), '', '', '' );
+    }
+
+    $csv->combine(
+      'cust_bill_pkg',
+      $self->invnum,
+      ( map { '' } (1..11) ),
+      ($pkg, $setup, $recur, $sdate, $edate)
+    ) or die "can't create csv";
+    print CSV $csv->string. "\n";
+
+  }
+
+  close CSV or die "can't close CSV: $!";
+
+  #part two: upload it
+
+  my $net;
+  if ( $opt{protocol} eq 'ftp' ) {
+    eval "use Net::FTP;";
+    die $@ if $@;
+    $net = Net::FTP->new($opt{server}) or die @$;
+  } else {
+    die "unknown protocol: $opt{protocol}";
+  }
+
+  $net->login( $opt{username}, $opt{password} )
+    or die "can't FTP to $opt{username}\@$opt{server}: login error: $@";
+
+  $net->binary or die "can't set binary mode";
+
+  $net->cwd($opt{dir}) or die "can't cwd to $opt{dir}";
+
+  $net->put($file) or die "can't put $file: $!";
+
+  $net->quit;
+
+  unlink $file;
+
+}
+
 =item comp
 
 Pays this invoice with a compliemntary payment.  If there is an error,
@@ -952,7 +1100,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.38 2002-06-26 02:37:48 ivan Exp $
+$Id: cust_bill.pm,v 1.39 2002-08-30 23:42:47 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 324daeb90..a10a186a9 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -134,6 +134,30 @@ tie my %events, 'Tie::IxHash',
     'weight' => 50,
   },
 
+  'send_csv_ftp' => {
+    'name' => 'Upload CSV invoice data to an FTP server',
+    'code' => '$cust_bill->send_csv( protocol => \'ftp\',
+                                     server   => \'%%%ftpserver%%%\',
+                                     username => \'%%%ftpusername%%%\',
+                                     password => \'%%%ftppassword%%%\',
+                                     dir      => \'%%%ftpdir%%%\'       );',
+    'html' =>
+        '<TABLE BORDER=0><TR><TD ALIGN="right">FTP server: </TD>'.
+          '<TD><INPUT TYPE="text" NAME="ftpserver" VALUE="%%%ftpserver%%%">'.
+          '</TD></TR>'.
+        '<TR><TD ALIGN="right">FTP username: </TD><TD>'.
+          '<INPUT TYPE="text" NAME="ftpusername" VALUE="%%%ftpusername%%%">'.
+          '</TD></TR>'.
+        '<TR><TD ALIGN="right">FTP password: </TD><TD>'.
+          '<INPUT TYPE="text" NAME="ftppassword" VALUE="%%%ftppassword%%%">'.
+          '</TD></TR>'.
+        '<TR><TD ALIGN="right">FTP directory: </TD>'.
+          '<TD><INPUT TYPE="text" NAME="ftpdir" VALUE="%%%ftpdir%%%">'.
+          '</TD></TR>'.
+        '</TABLE>',
+    'weight' => 50,
+  },
+
   'bill' => {
     'name' => 'Generate invoices (normally only used with a <i>Late Fee</i> event)',
     'code' => '$cust_main->bill();',
diff --git a/httemplate/edit/process/part_bill_event.cgi b/httemplate/edit/process/part_bill_event.cgi
index 4049ade80..e224bf634 100755
--- a/httemplate/edit/process/part_bill_event.cgi
+++ b/httemplate/edit/process/part_bill_event.cgi
@@ -12,7 +12,7 @@ if ( ! $cgi->param('plan_weight_eventcode') ) {
   $error = "Must select an action";
 } else {
 
-  $cgi->param('plan_weight_eventcode') =~ /^([\w\-]+):(\d+):(.*)$/
+  $cgi->param('plan_weight_eventcode') =~ /^([\w\-]+):(\d+):(.*)$/s
     or die "illegal plan_weight_eventcode:".
            $cgi->param('plan_weight_eventcode');
   $cgi->param('plan', $1);
-- 
cgit v1.2.1


From 249c7b31d464d2f3fe436623cd3ae84f2ce12915 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Aug 2002 23:48:43 +0000
Subject: oops, missing charged column in csv exports

---
 FS/FS/cust_bill.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index a10a6c41a..fd79f238c 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -490,6 +490,7 @@ sub send_csv {
     $self->invnum,
     $self->custnum,
     time2str("%x", $self->_date),
+    sprintf("%.2f", $self->charged),
     ( map { $cust_main->getfield($_) }
         qw( first last company address1 address2 city state zip country ) ),
     map { '' } (1..5),
@@ -1100,7 +1101,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.39 2002-08-30 23:42:47 ivan Exp $
+$Id: cust_bill.pm,v 1.40 2002-08-30 23:48:43 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 83b1806aa999a09a2825f3d8343e85d48e803f12 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Sep 2002 08:42:23 +0000
Subject: spelling

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index b6ecff2d0..38d7358a5 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -67,7 +67,7 @@ print '<FORM NAME="dummy">';
 print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
 
 print ntable("#cccccc",2), <<END;
-<TR><TD ALIGN="right">Package (customer-visable)</TD><TD><INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}"></TD></TR>
+<TR><TD ALIGN="right">Package (customer-visible)</TD><TD><INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}"></TD></TR>
 <TR><TD ALIGN="right">Comment (customer-hidden)</TD><TD><INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}"></TD></TR>
 <TR><TD ALIGN="right">Frequency (months) of recurring fee</TD><TD><INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}" SIZE=3>&nbsp;&nbsp;<I>0=no recurring fee, 1=monthly, 3=quarterly, 12=yearly</TD></TR>
 <TR><TD ALIGN="right">Setup fee tax exempt</TD><TD>
-- 
cgit v1.2.1


From 6b1038b81b5d5824b54376abf7b1e562cde17cb9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Sep 2002 12:43:07 +0000
Subject: 1.4.1beta1

---
 Makefile              | 11 +++++++++--
 httemplate/index.html |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index d7dce2064..6ec108c02 100644
--- a/Makefile
+++ b/Makefile
@@ -40,8 +40,8 @@ SIGNUP_REFNUM = 2
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.4.0
-TAG=freeside_1_4_0
+VERSION=1.4.1beta1
+TAG=freeside_1_4_1beta1
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -54,14 +54,21 @@ help:
 aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
 	rm -rf aspdocs
 	cp -pr httemplate aspdocs
+	perl -p -i -e "\
+	  s/%%%VERSION%%%/${VERSION}/g;\
+	" aspdocs/index.html
 	touch aspdocs
 
+
 masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
 	rm -rf masondocs
 	cp -pr httemplate masondocs
 	( cd masondocs; \
 	  ../bin/masonize; \
 	)
+	perl -p -i -e "\
+	  s/%%%VERSION%%%/${VERSION}/g;\
+	" masondocs/index.html
 	touch masondocs
 
 alldocs: aspdocs masondocs
diff --git a/httemplate/index.html b/httemplate/index.html
index cd9a20376..35a5fc19c 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -11,7 +11,7 @@
     </td><td>
       <font color="#ff0000" size=7>freeside main menu</font>
     </td><td align=right valign=bottom>
-      version 1.4.0
+      version %%%VERSION%%%
       <BR><A HREF="http://www.sisd.com/freeside">Freeside home page</A>
       <BR><A HREF="docs/">Documentation</A>
     </td></tr>
-- 
cgit v1.2.1


From 535b26281b31fc784923db3aabbde7766ca35a59 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 5 Sep 2002 09:10:55 +0000
Subject: get rid of extraneous `vpopmail machine' field

---
 FS/FS/part_export.pm          | 2 +-
 FS/FS/part_export/vpopmail.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 9645feb98..251184371 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -641,7 +641,7 @@ tie my %infostreet_options, 'Tie::IxHash',
 ;
 
 tie my %vpopmail_options, 'Tie::IxHash',
-  'machine' => { label=>'vpopmail machine', },
+  #'machine' => { label=>'vpopmail machine', },
   'dir'     => { label=>'directory', }, # ?more info? default?
   'uid'     => { label=>'vpopmail uid' },
   'gid'     => { label=>'vpopmail gid' },
diff --git a/FS/FS/part_export/vpopmail.pm b/FS/FS/part_export/vpopmail.pm
index c0105c045..cc8136e25 100644
--- a/FS/FS/part_export/vpopmail.pm
+++ b/FS/FS/part_export/vpopmail.pm
@@ -67,7 +67,7 @@ sub vpopmail_queue {
   };
   $queue->insert(
     $exportdir,
-    $self->option('machine'),
+    $self->machine,
     $self->option('dir'),
     $self->option('uid'),
     $self->option('gid'),
-- 
cgit v1.2.1


From 9a665a351155da6130b0669dbd99f28a40bc5bc5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 5 Sep 2002 13:01:03 +0000
Subject: show illegal dir in error msg

---
 FS/FS/svc_acct.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 6fe26c8d5..e62cdd7bb 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -708,7 +708,7 @@ sub check {
 
 
     $recref->{dir} =~ /^([\/\w\-\.\&]*)$/
-      or return "Illegal directory";
+      or return "Illegal directory: ". $recref->{dir};
     $recref->{dir} = $1;
     return "Illegal directory"
       if $recref->{dir} =~ /(^|\/)\.+(\/|$)/; #no .. component
-- 
cgit v1.2.1


From 10ffb6447a6e045b379f38bb78a7cb154076c2fd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 5 Sep 2002 13:28:00 +0000
Subject: batch charge/credit import

---
 FS/FS/cust_main.pm                                 | 85 ++++++++++++++++++++++
 httemplate/index.html                              |  1 +
 httemplate/misc/cust_main-import_charges.cgi       | 14 ++++
 .../misc/process/cust_main-import_charges.cgi      | 26 +++++++
 4 files changed, 126 insertions(+)
 create mode 100644 httemplate/misc/cust_main-import_charges.cgi
 create mode 100644 httemplate/misc/process/cust_main-import_charges.cgi

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 8e47f23d5..cfa6b8bb6 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2075,6 +2075,91 @@ sub batch_import {
 
 }
 
+=item batch_charge
+
+=cut
+
+sub batch_charge {
+  my $param = shift;
+  #warn join('-',keys %$param);
+  my $fh = $param->{filehandle};
+  my @fields = @{$param->{fields}};
+
+  eval "use Date::Parse;";
+  die $@ if $@;
+  eval "use Text::CSV_XS;";
+  die $@ if $@;
+
+  my $csv = new Text::CSV_XS;
+  #warn $csv;
+  #warn $fh;
+
+  my $imported = 0;
+  #my $columns;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+  
+  #while ( $columns = $csv->getline($fh) ) {
+  my $line;
+  while ( defined($line=<$fh>) ) {
+
+    $csv->parse($line) or do {
+      $dbh->rollback if $oldAutoCommit;
+      return "can't parse: ". $csv->error_input();
+    };
+
+    my @columns = $csv->fields();
+    #warn join('-',@columns);
+
+    my %row = ();
+    foreach my $field ( @fields ) {
+      $row{$field} = shift @columns;
+    }
+
+    my $cust_main = qsearchs('cust_main', { 'custnum' => $row{'custnum'} } );
+    unless ( $cust_main ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "unknown custnum $row{'custnum'}";
+    }
+
+    if ( $row{'amount'} > 0 ) {
+      my $error = $cust_main->charge($row{'amount'}, $row{'pkg'});
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
+      $imported++;
+    } elsif ( $row{'amount'} < 0 ) {
+      my $error = $cust_main->credit( sprintf( "%.2f", 0-$row{'amount'} ),
+                                      $row{'pkg'}                         );
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
+      $imported++;
+    } else {
+      #hmm?
+    }
+
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  return "Empty file!" unless $imported;
+
+  ''; #no error
+
+}
+
 =back
 
 =head1 BUGS
diff --git a/httemplate/index.html b/httemplate/index.html
index 35a5fc19c..dce020b1b 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -167,6 +167,7 @@
       <A HREF="browse/nas.cgi">View active NAS ports</A>
       <BR><A HREF="browse/queue.cgi">View pending job queue</A>
       <BR><A HREF="misc/cust_main-import.cgi">Batch import customers from CSV file</A>
+      <BR><A HREF="misc/cust_main-import_charges.cgi">Batch import charges from CSV file</A>
       <BR><BR><CENTER><HR WIDTH="94%" NOSHADE></CENTER><BR>
       <A NAME="config" HREF="config/config-view.cgi">Configuration</a><!-- - <font size="+2" color="#ff0000">start here</font> -->
       <BR><BR><A NAME="admin">Administration</a>
diff --git a/httemplate/misc/cust_main-import_charges.cgi b/httemplate/misc/cust_main-import_charges.cgi
new file mode 100644
index 000000000..0822b9eb6
--- /dev/null
+++ b/httemplate/misc/cust_main-import_charges.cgi
@@ -0,0 +1,14 @@
+<!-- mason kludge -->
+<%= header('Batch Customer Charge') %>
+<FORM ACTION="process/cust_main-import_charges.cgi" METHOD="post" ENCTYPE="multipart/form-data">
+Import a CSV file containing customer charges.<BR><BR>
+Default file format is CSV, with the following field order: <i>custnum, amount, description</i><BR><BR>
+If <i>amount</i> is negative, a credit will be applied instead.<BR><BR>
+<BR><BR>
+
+    CSV Filename: <INPUT TYPE="file" NAME="csvfile"><BR><BR>
+    <INPUT TYPE="submit" VALUE="Import">
+    </FORM>
+  </BODY>
+<HTML>
+
diff --git a/httemplate/misc/process/cust_main-import_charges.cgi b/httemplate/misc/process/cust_main-import_charges.cgi
new file mode 100644
index 000000000..14df1bd8d
--- /dev/null
+++ b/httemplate/misc/process/cust_main-import_charges.cgi
@@ -0,0 +1,26 @@
+<%
+
+  my $fh = $cgi->upload('csvfile');
+  #warn $cgi;
+  #warn $fh;
+
+  my $error = defined($fh)
+    ? FS::cust_main::batch_charge( {
+        filehandle => $fh,
+        'fields'    => [qw( custnum amount pkg )],
+      } )
+    : 'No file';
+
+  if ( $error ) {
+    %>
+    <!-- mason kludge -->
+    <%
+    eidiot($error);
+#    $cgi->param('error', $error);
+#    print $cgi->redirect( "${p}cust_main-import_charges.cgi
+  } else {
+    %>
+    <!-- mason kludge -->
+    <%= header('Import sucessful') %> <%
+  }
+%>
-- 
cgit v1.2.1


From 3566041f835ed1e823f0b949c01153a6c6fa1739 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 5 Sep 2002 13:50:35 +0000
Subject: don't show "clone an existing service definition" if there aren't any
 yet

---
 httemplate/browse/part_svc.cgi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 9fb359d1d..0a06d8ddb 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -25,11 +25,13 @@ function part_export_areyousure(href) {
 
     Services are items you offer to your customers.<BR><BR>
 
-<FORM METHOD="POST" ACTION="<%= $p %>edit/part_svc.cgi"><A HREF="<%= $p %>edit/part_svc.cgi"><I>Add a new service definition</I></A>&nbsp;or&nbsp;<SELECT NAME="clone"><OPTION></OPTION>
+<FORM METHOD="POST" ACTION="<%= $p %>edit/part_svc.cgi">
+<A HREF="<%= $p %>edit/part_svc.cgi"><I>Add a new service definition</I></A><% if ( @part_svc ) { %>&nbsp;or&nbsp;<SELECT NAME="clone"><OPTION></OPTION>
 <% foreach my $part_svc ( @part_svc ) { %>
   <OPTION VALUE="<%= $part_svc->svcpart %>"><%= $part_svc->svc %></OPTION>
 <% } %>
 </SELECT><INPUT TYPE="submit" VALUE="Clone existing service">
+<% } %>
 </FORM><BR>
 
 <%= $total %> services
-- 
cgit v1.2.1


From a236f83c748fef330e75480fd4f2ee50bb25985c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 5 Sep 2002 13:59:48 +0000
Subject: naw

---
 ANNOUCE.1.4.0 | 50 --------------------------------------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 ANNOUCE.1.4.0

diff --git a/ANNOUCE.1.4.0 b/ANNOUCE.1.4.0
deleted file mode 100644
index d110c6f3a..000000000
--- a/ANNOUCE.1.4.0
+++ /dev/null
@@ -1,50 +0,0 @@
-Hi,
-
-I'm pleased to announce the first beta release of Freeside 1.4.0.
-Freeside is a web-based, open-source billing and account administration
-package for ISPs, web hosts, and similar businesses.
-
-You can see a web demo, read the documentation, and download the new beta
-at <http://www.sisd.com/freeside/>.
-
-Although Freeside is free software, it is supported commercially with
-installation, customization, training and support services.  Please
-consider our services and help support the development of the software!
-
-
-Major new features in 1.4.0 include:
-
-- Billing engine has been rewritten and now has support for easily added
-  "price plans".  Included price plans include anniversary billing,
-  1st-of-the-month billing (pro-rated and subscription), free for N days,
-  commissions for referrals and per-minute/per-hour charges.
-
-- Customer-to-customer referrals, tracking and commissions.
-
-- Configurable invoice events triggered for delinquent customers can
-  re-send invoices, suspend accounts, charge late fees, and so on.
-
-- Export and provisioning system has been rewritten.  New provisioning
-  methods can now be "plugged-in" for any service type.  Included exports
-  include BSD and Linux password files, configurable shell commands,
-  RADIUS (both text and SQL, including groups), BIND configuration files,
-  Cyrus, vpopmail, and many others.
-
-- Complete set of history tables tracking all changes to the database.
-
-- Job queue with display and retry for provisioning tasks.
-
-- UI overhaul - easier to navigate and use.  Quick package order and
-  one-time charges.  Separate billing and service contact information.
-  Customer comments.
-
-- Performance optimizations.
-
-- Financials have been rewritten.  Apply payments and credits against
-  specific invoices (in whole or in part), or have the system apply
-  automatically.
-
-- Texas tax.
-
-- Improved documentation and easier install.
-
-- 
cgit v1.2.1


From e1cfff0375b46aaf2b5fef7fb2f9e62d7567f41f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 5 Sep 2002 16:51:49 +0000
Subject: Business::OnlinePayment::VitualNet compatibility

---
 FS/FS/cust_bill.pm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index fd79f238c..5e041ea59 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -681,7 +681,8 @@ sub realtime_card {
     my $capture =
       new Business::OnlinePayment( $bop_processor, @bop_options );
 
-    $capture->content(
+    my %capture = (
+      type           => 'CC',
       action         => $action2,
       login          => $bop_login,
       password       => $bop_password,
@@ -689,8 +690,18 @@ sub realtime_card {
       amount         => $amount,
       authorization  => $auth,
       description    => $description,
+      card_number    => $cust_main->payinfo,
+      expiration     => $exp,
     );
 
+    foreach my $field (qw( authorization_source_code returned_ACI                                          transaction_identifier validation_code           
+                           transaction_sequence_num local_transaction_date    
+                           local_transaction_time AVS_result_code          )) {
+      $capture{$field} = $transaction->$field() if $transaction->can($field);
+    }
+
+    $capture->content( %capture );
+
     $capture->submit();
 
     unless ( $capture->is_success ) {
@@ -1101,7 +1112,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.40 2002-08-30 23:48:43 ivan Exp $
+$Id: cust_bill.pm,v 1.41 2002-09-05 16:51:49 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From afb81dcb0fd47759bb5234d7f5989dc8df0aa502 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 5 Sep 2002 17:01:36 +0000
Subject: "same as billing address" box would uncheck itself on errors (only
 looked at previous ship_last, not CGI checkbox value too)  Closes: Bug#448

---
 httemplate/edit/cust_main.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 831b2ab97..3a5df086f 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -231,7 +231,7 @@ END
 
   print '<BR>Service address ',
         '(<INPUT TYPE="checkbox" NAME="same" VALUE="Y" onClick="samechanged(this)"';
-  unless ( $cust_main->ship_last ) {
+  unless ( $cust_main->ship_last && $cgi->param('same') ne 'Y' ) {
     print ' CHECKED';
     foreach (
       qw( last first company address1 address2 city county state zip country
-- 
cgit v1.2.1


From 03fad632a9f62a63486bf69c9a663fc800764f58 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 5 Sep 2002 18:51:01 +0000
Subject: clear up directory silliness ick

---
 FS/FS/part_export/vpopmail.pm | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/FS/FS/part_export/vpopmail.pm b/FS/FS/part_export/vpopmail.pm
index cc8136e25..4ec6dd0e4 100644
--- a/FS/FS/part_export/vpopmail.pm
+++ b/FS/FS/part_export/vpopmail.pm
@@ -1,6 +1,6 @@
 package FS::part_export::vpopmail;
 
-use vars qw(@ISA @saltset $exportdir $rsync $ssh);
+use vars qw(@ISA @saltset $exportdir);
 use File::Path;
 use FS::UID qw( datasrc );
 use FS::part_export;
@@ -9,9 +9,6 @@ use FS::part_export;
 
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
 
-$rsync = "rsync";
-$ssh = "ssh";
-
 sub rebless { shift; }
 
 sub _export_insert {
@@ -60,7 +57,15 @@ sub _export_delete {
 #a good idea to queue anything that could fail or take any time
 sub vpopmail_queue {
   my( $self, $svcnum, $method ) = (shift, shift, shift);
+
   my $exportdir = "/usr/local/etc/freeside/export." . datasrc;
+  mkdir $exportdir, 0700 or die $! unless -d $exportdir;
+  $exportdir .= "/vpopmail";
+  mkdir $exportdir, 0700 or die $! unless -d $exportdir;
+  $exportdir .= '/'. $self->machine;
+  mkdir $exportdir, 0700 or die $! unless -d $exportdir;
+  mkdir "$exportdir/domains", 0700 or die $! unless -d "$exportdir/domains";
+
   my $queue = new FS::queue {
     'svcnum' => $svcnum,
     'job'    => "FS::part_export::vpopmail::vpopmail_$method",
@@ -78,7 +83,10 @@ sub vpopmail_queue {
 sub vpopmail_insert { #subroutine, not method
   my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
   my( $username, $password, $domain, $quota ) = @_;
-  
+
+  mkdir "$exportdir/domains/$domain", 0700 or die $!
+    unless -d "$exportdir/domains/$domain";
+
   (open(VPASSWD, ">>$exportdir/domains/$domain/vpasswd")
     and flock(VPASSWD,LOCK_EX)
   ) or die "can't open vpasswd file for $username\@$domain: ".
-- 
cgit v1.2.1


From fa6635340ee1841271ba70594aeb2353e3793105 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 7 Sep 2002 02:19:21 +0000
Subject: import flocking constants

---
 FS/FS/part_export/vpopmail.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/FS/part_export/vpopmail.pm b/FS/FS/part_export/vpopmail.pm
index 4ec6dd0e4..561e2742a 100644
--- a/FS/FS/part_export/vpopmail.pm
+++ b/FS/FS/part_export/vpopmail.pm
@@ -1,6 +1,7 @@
 package FS::part_export::vpopmail;
 
 use vars qw(@ISA @saltset $exportdir);
+use Fcntl qw(:flock);
 use File::Path;
 use FS::UID qw( datasrc );
 use FS::part_export;
-- 
cgit v1.2.1


From 1d48d6cbd56f815d8a047ca2ee38ba758f56856c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 7 Sep 2002 02:27:10 +0000
Subject: 1.4.1

---
 httemplate/docs/index.html    |  1 +
 httemplate/docs/upgrade9.html | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 httemplate/docs/upgrade9.html

diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html
index 00c863b0c..eaa5b9b92 100644
--- a/httemplate/docs/index.html
+++ b/httemplate/docs/index.html
@@ -11,6 +11,7 @@
   <li><a href="upgrade6.html">Upgrading from 1.2.3 to 1.3.0</a>
   <li><a href="upgrade7.html">Upgrading from 1.3.0 to 1.3.1</a>
   <li><a href="upgrade8.html">Upgrading from 1.3.1 to 1.4.0</a>
+  <li><a href="upgrade9.html">Upgrading from 1.4.0 to 1.4.1</a>
 <!--
   <li><a href="config.html">Configuration files</a>
 !-->
diff --git a/httemplate/docs/upgrade9.html b/httemplate/docs/upgrade9.html
new file mode 100644
index 000000000..fff1d8690
--- /dev/null
+++ b/httemplate/docs/upgrade9.html
@@ -0,0 +1,13 @@
+<head>
+  <title>Upgrading to 1.4.1</title>
+</head>
+<body>
+<h1>Upgrading to 1.4.1 from 1.4.0</h1>
+<ul>
+  <li>If migrating from less than 1.4.0, see these <a href="upgrade8.html">instructions</a> first.
+  <li>Back up your data and current Freeside installation.
+  <li>Run <code>make aspdocs</code> or <code>make masondocs</code>.
+  <li>Copy <code>aspdocs/</code> or <code>masondocs/</code> to your web server's document space.
+  <li>Run <code>make install-perl-modules</code>.
+  <li>Restart Apache and freeside-queued.
+</body>
-- 
cgit v1.2.1


From 2e0e79ccc2d4a3612b47d323a53120611cb24ce0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 7 Sep 2002 14:20:06 +0000
Subject: mention docs/ssh.html in vpopmail description, give up hoping for a
 better description of the export from jeff

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 251184371..3c1a3de8e 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -778,7 +778,7 @@ tie my %sqlmail_options, 'Tie::IxHash',
     'vpopmail' => {
       'desc' => 'Real-time export to vpopmail text files',
       'options' => \%vpopmail_options,
-      'notes' => 'Real time export to <a href="http://inter7.com/vpopmail/">vpopmail</a> text files (...extended description from jeff?...)  <a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a> must be installed.',
+      'notes' => 'Real time export to <a href="http://inter7.com/vpopmail/">vpopmail</a> text files.  <a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a> must be installed, and you will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>',
     },
 
   },
-- 
cgit v1.2.1


From 49dcd82c523fac610fc7d55dc013339873e89a21 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 8 Sep 2002 09:49:13 +0000
Subject: some useful default domain files

---
 conf/soadefaultttl | 1 +
 conf/soaexpire     | 1 +
 conf/soarefresh    | 1 +
 conf/soaretry      | 1 +
 4 files changed, 4 insertions(+)
 create mode 100644 conf/soadefaultttl
 create mode 100644 conf/soaexpire
 create mode 100644 conf/soarefresh
 create mode 100644 conf/soaretry

diff --git a/conf/soadefaultttl b/conf/soadefaultttl
new file mode 100644
index 000000000..92f616fb8
--- /dev/null
+++ b/conf/soadefaultttl
@@ -0,0 +1 @@
+259200
diff --git a/conf/soaexpire b/conf/soaexpire
new file mode 100644
index 000000000..d235b91b6
--- /dev/null
+++ b/conf/soaexpire
@@ -0,0 +1 @@
+3600000
diff --git a/conf/soarefresh b/conf/soarefresh
new file mode 100644
index 000000000..9f35f8e81
--- /dev/null
+++ b/conf/soarefresh
@@ -0,0 +1 @@
+10800
diff --git a/conf/soaretry b/conf/soaretry
new file mode 100644
index 000000000..bb08106db
--- /dev/null
+++ b/conf/soaretry
@@ -0,0 +1 @@
+1800
-- 
cgit v1.2.1


From d710375eb3f0341d124a43919687817f5ee35d68 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 8 Sep 2002 11:36:16 +0000
Subject: 1.4.1

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 91e625386..2951ceeab 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Freeside 1.4.0
+Freeside
 
 Copyright (C) 2000,2001 Ivan Kohler
 Copyright (C) 1999 Silicon Interactive Software Design
-- 
cgit v1.2.1


From 0b62b95185b28bfb2a4eec5639abb2a7d1207ffe Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 8 Sep 2002 12:40:31 +0000
Subject: error out if can't open .HEADER files

---
 bin/bind.export | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/bind.export b/bin/bind.export
index 7d1452dc6..63fb0f60c 100755
--- a/bin/bind.export
+++ b/bin/bind.export
@@ -38,7 +38,8 @@ foreach my $export ( @exports ) {
   open(NAMED_CONF,">$prefix/named.conf")
     or die "can't open $prefix/named.conf: $!";
 
-  open(CONF_HEADER,"<$prefix/named.conf.HEADER"); #or die
+  open(CONF_HEADER,"<$prefix/named.conf.HEADER")
+    or die "can't open $prefix/named.conf.HEADER: $!"
   while (<CONF_HEADER>) { print NAMED_CONF $_; }
   close CONF_HEADER;
 
@@ -137,7 +138,8 @@ foreach my $sexport ( @sexports ) { #false laziness with above
   open(NAMED_CONF,">$prefix/named.conf")
     or die "can't open $prefix/named.conf: $!";
 
-  open(CONF_HEADER,"<$prefix/named.conf.HEADER"); #or die
+  open(CONF_HEADER,"<$prefix/named.conf.HEADER")
+    or die "can't open $prefix/named.conf.HEADER: $!"
   while (<CONF_HEADER>) { print NAMED_CONF $_; }
   close CONF_HEADER;
 
-- 
cgit v1.2.1


From 49006303c63cc2a6fffb5df5d1d3f8947f700b02 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 8 Sep 2002 12:58:00 +0000
Subject: ordering fix on delete: domain_record records first, then svc_domain

---
 FS/FS/svc_domain.pm | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index b06d03013..637d0493c 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -269,12 +269,6 @@ sub delete {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  my $error = $self->SUPER::delete;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
   foreach my $domain_record ( reverse $self->domain_record ) {
     my $error = $domain_record->delete;
     if ( $error ) {
@@ -282,6 +276,13 @@ sub delete {
       return $error;
     }
   }
+
+  my $error = $self->SUPER::delete;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 }
 
@@ -448,10 +449,6 @@ sub submit_internic {
 
 =back
 
-=head1 VERSION
-
-$Id: svc_domain.pm,v 1.31 2002-06-10 02:52:48 ivan Exp $
-
 =head1 BUGS
 
 All BIND/DNS fields should be included (and exported).
-- 
cgit v1.2.1


From a7013a87b67301d8b43c7847b84e06be4802d948 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Sep 2002 12:34:55 +0000
Subject: : is not legal in GECOS

---
 FS/FS/ClientAPI.pm        | 4 ++--
 FS/FS/ClientAPI/passwd.pm | 9 +++++----
 FS/FS/InitHandler.pm      | 4 ++++
 FS/FS/svc_acct.pm         | 2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/FS/FS/ClientAPI.pm b/FS/FS/ClientAPI.pm
index f7b8eb028..7cbbdbf67 100644
--- a/FS/FS/ClientAPI.pm
+++ b/FS/FS/ClientAPI.pm
@@ -1,13 +1,13 @@
 package FS::ClientAPI;
 
 use strict;
-use vars qw(%handler);
+use vars qw(%handler $domain);
 
 %handler = ();
 
 #find modules
 foreach my $INC ( @INC ) {
-  foreach my $file ( glob("$INC/FS/ClientAPI/*") ) {
+  foreach my $file ( glob("$INC/FS/ClientAPI/*.pm") ) {
     $file =~ /\/(\w+)\.pm$/ or do {
       warn "unrecognized ClientAPI file: $file";
       next
diff --git a/FS/FS/ClientAPI/passwd.pm b/FS/FS/ClientAPI/passwd.pm
index 29606227d..016ebff79 100644
--- a/FS/FS/ClientAPI/passwd.pm
+++ b/FS/FS/ClientAPI/passwd.pm
@@ -15,8 +15,9 @@ FS::ClientAPI->register_handlers(
 sub passwd {
   my $packet = shift;
 
-  #my $domain = qsearchs('svc_domain', { 'domain' => $packet->{'domain'} } )
-  #  or return { error => "Domain $domain not found" };
+  my $domain = $FS::ClientAPI::domain || $packet->{'domain'};
+  my $svc_domain = qsearchs('svc_domain', { 'domain' => $domain } )
+    or return { error => "Domain $domain not found" };
 
   my $old_password = $packet->{'old_password'};
   my $new_password = $packet->{'new_password'};
@@ -27,11 +28,11 @@ sub passwd {
   my $svc_acct =
     ( length($old_password) < 13
       && qsearchs( 'svc_acct', { 'username'  => $packet->{'username'},
-                                 #'domsvc'    => $svc_domain->svcnum,
+                                 'domsvc'    => $svc_domain->svcnum,
                                  '_password' => $old_password } )
     )
     || qsearchs( 'svc_acct', { 'username'  => $packet->{'username'},
-                               #'domsvc'    => $svc_domain->svcnum,
+                               'domsvc'    => $svc_domain->svcnum,
                                '_password' => $old_password } );
 
   unless ( $svc_acct ) { return { error => 'Incorrect password.' } }
diff --git a/FS/FS/InitHandler.pm b/FS/FS/InitHandler.pm
index 87f507c22..0216615da 100644
--- a/FS/FS/InitHandler.pm
+++ b/FS/FS/InitHandler.pm
@@ -1,5 +1,9 @@
 package FS::InitHandler;
 
+# this leaks memory under graceful restarts and i wouldn't use it on any
+# modern server.  useful for very slow machines with memory to spare, just
+# always do a full restart
+
 use strict;
 use vars qw($DEBUG);
 use FS::UID qw(adminsuidsetup);
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index e62cdd7bb..9032e20c1 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -752,7 +752,7 @@ sub check {
   #  $error = $self->ut_textn('finger');
   #  return $error if $error;
   $self->getfield('finger') =~
-    /^([\w \t\!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\*\<\>]*)$/
+    /^([\w \t\!\@\#\$\%\&\(\)\-\+\;\'\"\,\.\?\/\*\<\>]*)$/
       or return "Illegal finger: ". $self->getfield('finger');
   $self->setfield('finger', $1);
 
-- 
cgit v1.2.1


From ed0c10c5969c60fd2be050a9a5f3830bc347739a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Sep 2002 19:54:00 +0000
Subject: doc clarification about users

---
 httemplate/docs/ssh.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/docs/ssh.html b/httemplate/docs/ssh.html
index 5503a242e..9716f1e86 100755
--- a/httemplate/docs/ssh.html
+++ b/httemplate/docs/ssh.html
@@ -6,8 +6,8 @@
   <br><a name=ssh>Unattended remote login</a> - Freeside can login to remote machines unattended using SSH.  This can pose a security risk if not configured correctly, and will allow an intruder who breaks into your freeside machine full access to your remote machines.  <b>Do not use this feature unless you understand what you are doing!</b>
     <ul>
       <li>As the freeside user (on your freeside machine), generate an authentication key using <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>.  Since this is for unattended operation, use a blank passphrase.
-      <li>Append the newly-created <code>identity.pub</code> file to <code>~root/.ssh/authorized_keys</code> on the remote machine(s).
-      <li>Some new SSH v2 implementation accept v2 style keys only.  Use the <code>-t</code> option to <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>, and append the created <code>id_dsa.pub</code> or <code>id_rsa.pub</code> to <code>~root/.ssh/authorized_keys2</code> on the remote machine(s).
+      <li>Append the newly-created <code>identity.pub</code> file to <code>~root/.ssh/authorized_keys</code> (or the appopriate <code>~username/.ssh/authorized_keys</code>) on the remote machine(s).
+      <li>Some new SSH v2 implementation accept v2 style keys only.  Use the <code>-t</code> option to <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>, and append the created <code>id_dsa.pub</code> or <code>id_rsa.pub</code> to <code>~root/.ssh/authorized_keys2</code> (or the appopriate <code>~username/.ssh/authorized_keys</code>) on the remote machine(s).
       <li>You may need to set <code>PermitRootLogin without-password</code> (meaning with keys only) in your <code>sshd_config</code> file on the remote machine(s).
     </ul>
 
-- 
cgit v1.2.1


From bcd23d236c4846bee6285c1ff862e7e3c3f59cd9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Sep 2002 19:56:06 +0000
Subject: vpopmail export doc clarification: ssh as vpopmail user

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 3c1a3de8e..bc6a4d735 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -778,7 +778,7 @@ tie my %sqlmail_options, 'Tie::IxHash',
     'vpopmail' => {
       'desc' => 'Real-time export to vpopmail text files',
       'options' => \%vpopmail_options,
-      'notes' => 'Real time export to <a href="http://inter7.com/vpopmail/">vpopmail</a> text files.  <a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a> must be installed, and you will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>',
+      'notes' => 'Real time export to <a href="http://inter7.com/vpopmail/">vpopmail</a> text files.  <a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a> must be installed, and you will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a> to <b>vpopmail</b>@<i>export.host</i>.',
     },
 
   },
-- 
cgit v1.2.1


From eb46cd3822674cecdc474b175b1e6f3ede8cc49b Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 9 Sep 2002 22:56:14 +0000
Subject: svc_broadband merge

---
 FS/MANIFEST | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/FS/MANIFEST b/FS/MANIFEST
index fff95c8c8..4a250d77b 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -36,6 +36,9 @@ FS/UI/Gtk.pm
 FS/UI/agent.pm
 FS/UID.pm
 FS/Msgcat.pm
+FS/ac.pm
+FS/ac_block.pm
+FS/ac_type.pm
 FS/agent.pm
 FS/agent_type.pm
 FS/cust_bill.pm
@@ -54,6 +57,7 @@ FS/cust_refund.pm
 FS/cust_credit_refund.pm
 FS/cust_svc.pm
 FS/part_bill_event.pm
+FS/part_ac_field.pm
 FS/export_svc.pm
 FS/part_export.pm
 FS/part_export_option.pm
@@ -84,6 +88,7 @@ FS/svc_Common.pm
 FS/svc_acct.pm
 FS/svc_acct_pop.pm
 FS/svc_acct_sm.pm
+FS/svc_broadband.pm
 FS/svc_domain.pm
 FS/type_pkgs.pm
 FS/nas.pm
-- 
cgit v1.2.1


From 91292eadb6254740a9b72e5dc95f575593f6a35d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Sep 2002 22:57:34 +0000
Subject: allow . in untaint_argv, for usernames

---
 FS/bin/freeside-cc-receipts-report | 4 ++--
 FS/bin/freeside-credit-report      | 4 ++--
 FS/bin/freeside-receivables-report | 4 ++--
 FS/bin/freeside-tax-report         | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/FS/bin/freeside-cc-receipts-report b/FS/bin/freeside-cc-receipts-report
index 06e3aba81..136851aec 100755
--- a/FS/bin/freeside-cc-receipts-report
+++ b/FS/bin/freeside-cc-receipts-report
@@ -206,7 +206,7 @@ if($email && $opt_m)
 # subroutines
 sub untaint_argv {
   foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    $ARGV[$_] =~ /^([\w\-\/ :]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
+    $ARGV[$_] =~ /^([\w\-\/ :\.]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
     $ARGV[$_]=$1;
   }
 }
@@ -245,7 +245,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-cc-receipts-report,v 1.4 2002-03-07 19:50:23 jeff Exp $
+$Id: freeside-cc-receipts-report,v 1.5 2002-09-09 22:57:34 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-credit-report b/FS/bin/freeside-credit-report
index 7699daf4d..410dabe8f 100755
--- a/FS/bin/freeside-credit-report
+++ b/FS/bin/freeside-credit-report
@@ -160,7 +160,7 @@ if($email && $opt_m)
 # subroutines
 sub untaint_argv {
   foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    $ARGV[$_] =~ /^([\w\-\/ :]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
+    $ARGV[$_] =~ /^([\w\-\/ :\.]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
     $ARGV[$_]=$1;
   }
 }
@@ -199,7 +199,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-credit-report,v 1.4 2002-03-07 19:50:24 jeff Exp $
+$Id: freeside-credit-report,v 1.5 2002-09-09 22:57:34 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-receivables-report b/FS/bin/freeside-receivables-report
index b5a49031e..f3ad2a1a6 100755
--- a/FS/bin/freeside-receivables-report
+++ b/FS/bin/freeside-receivables-report
@@ -157,7 +157,7 @@ if($email && $opt_m)
 
 sub untaint_argv {
   foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    $ARGV[$_] =~ /^([\w\-\/ ]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
+    $ARGV[$_] =~ /^([\w\-\/ \.]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
     $ARGV[$_]=$1;
   }
 }
@@ -192,7 +192,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-receivables-report,v 1.5 2002-03-07 19:50:24 jeff Exp $
+$Id: freeside-receivables-report,v 1.6 2002-09-09 22:57:34 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-tax-report b/FS/bin/freeside-tax-report
index 8d5021358..240f3ad37 100755
--- a/FS/bin/freeside-tax-report
+++ b/FS/bin/freeside-tax-report
@@ -228,7 +228,7 @@ if($email && $opt_m)
 # subroutines
 sub untaint_argv {
   foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    $ARGV[$_] =~ /^([\w\-\/ :]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
+    $ARGV[$_] =~ /^([\w\-\/ :\.]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
     $ARGV[$_]=$1;
   }
 }
@@ -267,7 +267,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-tax-report,v 1.4 2002-03-07 19:50:24 jeff Exp $
+$Id: freeside-tax-report,v 1.5 2002-09-09 22:57:34 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 44398c83f25bf4e43838df9f39331c29fdeff19d Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 9 Sep 2002 23:05:30 +0000
Subject: svc_broadband merge

---
 FS/FS/ac.pm                               | 148 +++++++++++++++
 FS/FS/ac_block.pm                         | 148 +++++++++++++++
 FS/FS/ac_field.pm                         | 138 ++++++++++++++
 FS/FS/ac_type.pm                          | 128 +++++++++++++
 FS/FS/cust_svc.pm                         |   4 +-
 FS/FS/part_ac_field.pm                    | 102 +++++++++++
 FS/FS/part_export.pm                      |   3 +
 FS/FS/svc_broadband.pm                    | 295 ++++++++++++++++++++++++++++++
 bin/fs-setup                              |  72 +++++++-
 htetc/global.asa                          |   6 +
 httemplate/browse/ac.cgi                  |  57 ++++++
 httemplate/browse/ac_type.cgi             |  47 +++++
 httemplate/edit/ac.cgi                    | 163 +++++++++++++++++
 httemplate/edit/ac_type.cgi               | 106 +++++++++++
 httemplate/edit/part_svc.cgi              |  13 +-
 httemplate/edit/process/ac.cgi            |  28 +++
 httemplate/edit/process/ac_block.cgi      |  21 +++
 httemplate/edit/process/ac_field.cgi      |  21 +++
 httemplate/edit/process/ac_type.cgi       |  28 +++
 httemplate/edit/process/part_ac_field.cgi |  21 +++
 httemplate/edit/process/part_svc.cgi      |   2 +-
 httemplate/edit/process/svc_broadband.cgi |  45 +++++
 httemplate/edit/svc_broadband.cgi         | 219 ++++++++++++++++++++++
 httemplate/index.html                     |   4 +
 httemplate/view/svc_broadband.cgi         |  75 ++++++++
 25 files changed, 1890 insertions(+), 4 deletions(-)
 create mode 100644 FS/FS/ac.pm
 create mode 100755 FS/FS/ac_block.pm
 create mode 100755 FS/FS/ac_field.pm
 create mode 100755 FS/FS/ac_type.pm
 create mode 100755 FS/FS/part_ac_field.pm
 create mode 100755 FS/FS/svc_broadband.pm
 create mode 100755 httemplate/browse/ac.cgi
 create mode 100755 httemplate/browse/ac_type.cgi
 create mode 100755 httemplate/edit/ac.cgi
 create mode 100755 httemplate/edit/ac_type.cgi
 create mode 100755 httemplate/edit/process/ac.cgi
 create mode 100755 httemplate/edit/process/ac_block.cgi
 create mode 100755 httemplate/edit/process/ac_field.cgi
 create mode 100755 httemplate/edit/process/ac_type.cgi
 create mode 100755 httemplate/edit/process/part_ac_field.cgi
 create mode 100644 httemplate/edit/process/svc_broadband.cgi
 create mode 100644 httemplate/edit/svc_broadband.cgi
 create mode 100644 httemplate/view/svc_broadband.cgi

diff --git a/FS/FS/ac.pm b/FS/FS/ac.pm
new file mode 100644
index 000000000..5a2b36079
--- /dev/null
+++ b/FS/FS/ac.pm
@@ -0,0 +1,148 @@
+package FS::ac;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs qsearch );
+use FS::ac_type;
+use FS::ac_block;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::ac - Object methods for ac records
+
+=head1 SYNOPSIS
+
+  use FS::ac;
+
+  $record = new FS::ac \%hash;
+  $record = new FS::ac { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::ac record describes a broadband Access Concentrator, such as a DSLAM
+or a wireless access point.  FS::ac inherits from FS::Record.  The following 
+fields are currently supported:
+
+narf
+
+=over 4
+
+=item acnum - primary key
+
+=item actypenum - AC type, see L<FS::ac_type>
+
+=item acname - descriptive name for the AC
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Create a new record.  To add the record to the database, see L<"insert">.
+
+=cut
+
+sub table { 'ac'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error =
+    $self->ut_numbern('acnum')
+    || $self->ut_number('actypenum')
+    || $self->ut_text('acname');
+  return $error if $error;
+
+  return "Unknown actypenum"
+    unless $self->ac_type;
+  '';
+}
+
+=item ac_type
+
+Returns the L<FS::ac_type> object corresponding to this object.
+
+=cut
+
+sub ac_type {
+  my $self = shift;
+  return qsearchs('ac_type', { actypenum => $self->actypenum });
+}
+
+=item ac_block
+
+Returns a list of L<FS::ac_block> objects (address blocks) associated
+with this object.
+
+=cut
+
+sub ac_block {
+  my $self = shift;
+  return qsearch('ac_block', { acnum => $self->acnum });
+}
+
+=item ac_field
+
+Returns a hash of L<FS::ac_field> objects assigned to this object.
+
+=cut
+
+sub ac_field {
+  my $self = shift;
+
+  return qsearch('ac_field', { acnum => $self->acnum });
+}
+
+=back
+
+=head1 VERSION
+
+$Id:
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::svc_broadband>, L<FS::ac>, L<FS::ac_block>, L<FS::ac_field>,  schema.html
+from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/ac_block.pm b/FS/FS/ac_block.pm
new file mode 100755
index 000000000..09de6a4d8
--- /dev/null
+++ b/FS/FS/ac_block.pm
@@ -0,0 +1,148 @@
+package FS::ac_block;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs qsearch );
+use FS::ac_type;
+use FS::ac;
+use FS::svc_broadband;
+use NetAddr::IP;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::ac - Object methods for ac records
+
+=head1 SYNOPSIS
+
+  use FS::ac_block;
+
+  $record = new FS::ac_block \%hash;
+  $record = new FS::ac_block { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::ac_block record describes an address block assigned for broadband 
+access.  FS::ac_block inherits from FS::Record.  The following fields are 
+currently supported:
+
+=over 4
+
+=item acnum - the access concentrator (see L<FS::ac_type>) to which this 
+block is assigned.
+
+=item ip_gateway - the gateway address used by customers within this block.  
+This functions as the primary key.
+
+=item ip_netmask - the netmask of the block, expressed as an integer.
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Create a new record.  To add the record to the database, see L<"insert">.
+
+=cut
+
+sub table { 'ac_block'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error =
+    $self->ut_number('acnum')
+    || $self->ut_ip('ip_gateway')
+    || $self->ut_number('ip_netmask')
+  ;
+  return $error if $error;
+
+  return "Unknown acnum"
+    unless $self->ac;
+
+  my $self_addr = new NetAddr::IP ($self->ip_gateway, $self->ip_netmask);
+  return "Cannot parse address: ". $self->ip_gateway . '/' . $self->ip_netmask
+    unless $self_addr;
+
+  my @block = grep {
+    my $block_addr = new NetAddr::IP ($_->ip_gateway, $_->ip_netmask);
+    if($block_addr->contains($self_addr) 
+    or $self_addr->contains($block_addr)) { $_; };
+  } qsearch( 'ac_block', {});
+
+  foreach(@block) {
+    return "Block intersects existing block ".$_->ip_gateway."/".$_->ip_netmask;
+  }
+
+  '';
+}
+
+
+=item ac
+
+Returns the L<FS::ac> object corresponding to this object.
+
+=cut
+
+sub ac {
+  my $self = shift;
+  return qsearchs('ac', { acnum => $self->acnum });
+}
+
+=item svc_broadband
+
+Returns a list of L<FS::svc_broadband> objects associated
+with this object.
+
+=cut
+
+#sub svc_broadband {
+#  my $self = shift;
+#  my @svc = qsearch('svc_broadband', { actypenum => $self->ac->ac_type->actypenum });
+#  return grep { 
+#    my $svc_addr = new NetAddr::IP($_->ip_addr, $_->ip_netmask);
+#    $self_addr->contains($svc_addr);
+#  } @svc;
+#}
+
+=back
+
+=cut
+
+1;
+
diff --git a/FS/FS/ac_field.pm b/FS/FS/ac_field.pm
new file mode 100755
index 000000000..f6011192f
--- /dev/null
+++ b/FS/FS/ac_field.pm
@@ -0,0 +1,138 @@
+package FS::ac_field;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs );
+use FS::part_ac_field;
+use FS::ac;
+
+use UNIVERSAL qw( can );
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::ac_field - Object methods for ac_field records
+
+=head1 SYNOPSIS
+
+  use FS::ac_field;
+
+  $record = new FS::ac_field \%hash;
+  $record = new FS::ac_field { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+L<FS::ac_field> contains values of fields defined by L<FS::part_ac_field>
+for an L<FS::ac>.  Values must be of the data type defined by ut_type in
+L<FS::part_ac_field>.
+Supported fields as follows:
+
+=over 4
+
+=item acfieldpart - Type of ac_field as defined by L<FS::part_ac_field>
+
+=item acnum - The L<FS::ac> to which this value belongs.
+
+=item value - The contents of the field.
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Create a new record.  To add the record to the database, see L<"insert">.
+
+=cut
+
+sub table { 'ac_field'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  return "acnum must be defined" unless $self->acnum;
+  return "acfieldpart must be defined" unless $self->acfieldpart;
+
+  my $ut_func = $self->can("ut_" . $self->part_ac_field->ut_type);
+  my $error = $self->$ut_func('value');
+
+  return $error if $error;
+
+  ''; #no error
+}
+
+=item part_ac_field
+
+Returns a reference to the L<FS:part_ac_field> that defines this L<FS::ac_field>
+
+=cut
+
+sub part_ac_field {
+  my $self = shift;
+
+  return qsearchs('part_ac_field', { acfieldpart => $self->acfieldpart });
+}
+
+=item ac
+
+Returns a reference to the L<FS::ac> to which this L<FS::ac_field> belongs.
+
+=cut
+
+sub ac {
+  my $self = shift;
+
+  return qsearchs('ac', { acnum => $self->acnum });
+}
+
+=back
+
+=head1 VERSION
+
+$Id: 
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::svc_broadband>, L<FS::ac>, L<FS::ac_block>, L<FS::ac_field>,  schema.html
+from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/ac_type.pm b/FS/FS/ac_type.pm
new file mode 100755
index 000000000..e83c5c5f0
--- /dev/null
+++ b/FS/FS/ac_type.pm
@@ -0,0 +1,128 @@
+package FS::ac_type;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs );
+use FS::ac;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::ac_type - Object methods for ac_type records
+
+=head1 SYNOPSIS
+
+  use FS::ac_type;
+
+  $record = new FS::ac_type \%hash;
+  $record = new FS::ac_type { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+L<FS::ac_type> refers to a type of access concentrator.  L<FS::svc_broadband>
+records refer to a specific L<FS::ac_type> limiting the choice of access
+concentrator to one of the chosen type.  This should be set as a fixed
+default in part_svc to prevent provisioning the wrong type of service for
+a given package or service type.  Supported fields as follows:
+
+=over 4
+
+=item actypenum - Primary key.  see L<FS::ac>
+
+=item actypename - Text identifier for access concentrator type.
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Create a new record.  To add the record to the database, see L<"insert">.
+
+=cut
+
+sub table { 'ac_type'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  # What do we check?
+
+  ''; #no error
+}
+
+=item ac
+
+Returns a list of all L<FS::ac> records of this type.
+
+=cut
+
+sub ac {
+  my $self = shift;
+
+  return qsearch('ac', { actypenum => $self->actypenum });
+}
+
+=item part_ac_field
+
+Returns a list of all L<FS::part_ac_field> records of this type.
+
+=cut
+
+sub part_ac_field {
+  my $self = shift;
+
+  return qsearch('part_ac_field', { actypenum => $self->actypenum });
+}
+
+=back
+
+=head1 VERSION
+
+$Id: 
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::svc_broadband>, L<FS::ac>, L<FS::ac_block>, L<FS::ac_field>,  schema.html
+from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index c7cc4b322..d54fb2d40 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -295,6 +295,8 @@ sub label {
   } elsif ( $svcdb eq 'svc_www' ) {
     my $domain = qsearchs( 'domain_record', { 'recnum' => $svc_x->recnum } );
     $tag = $domain->reczone;
+  } elsif ( $svcdb eq 'svc_broadband' ) {
+    $tag = $svc_x->ip_addr . '/' . $svc_x->ip_netmask;
   } else {
     cluck "warning: asked for label of unsupported svcdb; using svcnum";
     $tag = $svc_x->getfield('svcnum');
@@ -344,7 +346,7 @@ sub seconds_since {
 
 =head1 VERSION
 
-$Id: cust_svc.pm,v 1.15 2002-05-22 12:17:06 ivan Exp $
+$Id: cust_svc.pm,v 1.16 2002-09-09 23:01:35 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_ac_field.pm b/FS/FS/part_ac_field.pm
new file mode 100755
index 000000000..dcb445253
--- /dev/null
+++ b/FS/FS/part_ac_field.pm
@@ -0,0 +1,102 @@
+package FS::part_ac_field;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs );
+use FS::ac_field;
+use FS::ac;
+
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::part_ac_field - Object methods for part_ac_field records
+
+=head1 SYNOPSIS
+
+  use FS::part_ac_field;
+
+  $record = new FS::part_ac_field \%hash;
+  $record = new FS::part_ac_field { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+
+=over 4
+
+=item blank
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Create a new record.  To add the record to the database, see L<"insert">.
+
+=cut
+
+sub table { 'part_ac_field'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+  my $error = '';
+
+  $self->name =~ /^([a-z0-9_\-\.]{1,15})$/i
+    or return "Invalid field name for part_ac_field";
+
+  ''; #no error
+}
+
+
+=back
+
+=head1 VERSION
+
+$Id: 
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::svc_broadband>, L<FS::ac>, L<FS::ac_block>, L<FS::ac_field>,  schema.html
+from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index bc6a4d735..69cd8058b 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -839,6 +839,9 @@ tie my %sqlmail_options, 'Tie::IxHash',
 
   },
 
+  'svc_broadband' => {
+  },
+
 );
 
 =back
diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
new file mode 100755
index 000000000..ab92fb3d7
--- /dev/null
+++ b/FS/FS/svc_broadband.pm
@@ -0,0 +1,295 @@
+package FS::svc_broadband;
+
+use strict;
+use vars qw(@ISA $conf);
+#use FS::Record qw( qsearch qsearchs );
+use FS::Record qw( qsearchs qsearch dbh );
+use FS::svc_Common;
+use FS::cust_svc;
+use NetAddr::IP;
+
+@ISA = qw( FS::svc_Common );
+
+$FS::UID::callback{'FS::svc_broadband'} = sub { 
+  $conf = new FS::Conf;
+};
+
+=head1 NAME
+
+FS::svc_broadband - Object methods for svc_broadband records
+
+=head1 SYNOPSIS
+
+  use FS::svc_broadband;
+
+  $record = new FS::svc_broadband \%hash;
+  $record = new FS::svc_broadband { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $error = $record->suspend;
+
+  $error = $record->unsuspend;
+
+  $error = $record->cancel;
+
+=head1 DESCRIPTION
+
+An FS::svc_broadband object represents a 'broadband' Internet connection, such
+as a DSL, cable modem, or fixed wireless link.  These services are assumed to
+have the following properties:
+
+=over 2
+
+=item
+The network consists of one or more 'Access Concentrators' (ACs), such as
+DSLAMs or wireless access points.  (See L<FS::ac>.)
+
+=item
+Each AC provides connectivity to one or more contiguous blocks of IP addresses,
+each described by a gateway address and a netmask.  (See L<FS::ac_block>.)
+
+=item
+Each connection has one or more static IP addresses within one of these blocks.
+
+=item
+The details of configuring routers and other devices are to be handled by a 
+site-specific L<FS::part_export> subclass.
+
+=back
+
+FS::svc_broadband inherits from FS::svc_Common.  The following fields are
+currently supported:
+
+=over 4
+
+=item svcnum - primary key
+
+=item
+actypenum - access concentrator type; see L<FS::ac_type>.  This is included here
+so that a part_svc can specifically be a 'wireless' or 'DSL' service by
+designating actypenum as a fixed field.  It does create a redundant functional
+dependency between this table and ac_type, in that the matching ac_type could
+be found by looking up the IP address in ac_block and then finding the block's
+AC, but part_svc can't do that, and we don't feel like hacking it so that it
+can.
+
+=item
+speed_up - maximum upload speed, in bits per second.  If set to zero, upload
+speed will be unlimited.  Exports that do traffic shaping should handle this
+correctly, and not blindly set the upload speed to zero and kill the customer's
+connection.
+
+=item
+speed_down - maximum download speed, as above
+
+=item
+ip_addr - the customer's IP address.  If the customer needs more than one IP
+address, set this to the address of the customer's router.  As a result, the
+customer's router will have the same address for both it's internal and external
+interfaces thus saving address space.  This has been found to work on most NAT
+routers available.
+
+=item
+ip_netmask - the customer's netmask, as a single integer in the range 0-32.
+(E.g. '24', not '255.255.255.0'.  We assume that address blocks are contiguous.)
+This should be 32 unless the customer has multiple IP addresses.
+
+=item
+mac_addr - the MAC address of the customer's router or other device directly
+connected to the network, if needed.  Some systems (e.g. DHCP, MAC address-based
+access control) may need this.  If not, you may leave it blank.
+
+=item
+location - a human-readable description of the location of the connected site,
+such as its address.  This should not be used for billing or contact purposes;
+that information is stored in L<FS::cust_main>.
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new svc_broadband.  To add the record to the database, see
+L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub table { 'svc_broadband'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
+defined.  An FS::cust_svc record will be created and inserted.
+
+=cut
+
+# sub insert {}
+# Standard FS::svc_Common::insert
+# (any necessary Deep Magic is handled by exports)
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# Standard FS::svc_Common::delete
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# Standard FS::svc_Common::replace
+# Notice a pattern here?
+
+=item suspend
+
+Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item unsuspend
+
+Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item cancel
+
+Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item check
+
+Checks all fields to make sure this is a valid broadband service.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+  my $x = $self->setfixed;
+
+  return $x unless ref($x);
+
+  my $error =
+    $self->ut_numbern('svcnum')
+    || $self->ut_foreign_key('actypenum', 'ac_type', 'actypenum')
+    || $self->ut_number('speed_up')
+    || $self->ut_number('speed_down')
+    || $self->ut_ip('ip_addr')
+    || $self->ut_numbern('ip_netmask')
+    || $self->ut_textn('mac_addr')
+    || $self->ut_textn('location')
+  ;
+  return $error if $error;
+
+  if($self->speed_up < 0) { return 'speed_up must be positive'; }
+  if($self->speed_down < 0) { return 'speed_down must be positive'; }
+
+  # This should catch errors in the ip_addr and ip_netmask.  If it doesn't,
+  # they'll almost certainly not map into a valid block anyway.
+  my $self_addr = new NetAddr::IP ($self->ip_addr, $self->ip_netmask);
+  return 'Cannot parse address: ' . $self->ip_addr . '/' . $self->ip_netmask unless $self_addr;
+
+  my @block = grep { 
+    my $block_addr = new NetAddr::IP ($_->ip_gateway, $_->ip_netmask);
+    if ($block_addr->contains($self_addr)) { $_ };
+  } qsearch( 'ac_block', { acnum => $self->acnum });
+
+  if(scalar @block == 0) {
+    return 'Block not found for address '.$self->ip_addr.' in actype '.$self->actypenum;
+  } elsif(scalar @block > 1) {
+    return 'ERROR: Intersecting blocks found for address '.$self->ip_addr.' :'.
+        join ', ', map {$_->ip_addr . '/' . $_->ip_netmask} @block;
+  }
+  # OK, we've found a valid block.  We don't actually _do_ anything with it, though; we 
+  # just take comfort in the knowledge that it exists.
+
+  # A simple qsearchs won't work here.  Since we can assign blocks to customers,
+  # we have to make sure the new address doesn't fall within someone else's
+  # block.  Ugh.
+
+  my @conflicts = grep {
+    my $cust_addr = new NetAddr::IP($_->ip_addr, $_->ip_netmask);
+    if (($cust_addr->contains($self_addr)) and
+        ($_->svcnum ne $self->svcnum)) { $_; };
+  } qsearch('svc_broadband', {});
+
+  if (scalar @conflicts > 0) {
+    return 'Address in use by existing service';
+  }
+
+  # Are we trying to use a network, broadcast, or the AC's address?
+  foreach (qsearch('ac_block', { acnum => $self->acnum })) {
+    my $block_addr = new NetAddr::IP($_->ip_gateway, $_->ip_netmask);
+    if ($block_addr->network->addr eq $self_addr->addr) {
+      return 'Address is network address for block '. $block_addr->network;
+    }
+    if ($block_addr->broadcast->addr eq $self_addr->addr) {
+      return 'Address is broadcast address for block '. $block_addr->network;
+    }
+    if ($block_addr->addr eq $self_addr->addr) {
+      return 'Address belongs to the access concentrator: '. $block_addr->addr;
+    }
+  }
+
+  ''; #no error
+}
+
+=item ac_block
+
+Returns the FS::ac_block record (i.e. the address block) for this broadband service.
+
+=cut
+
+sub ac_block {
+  my $self = shift;
+  my $self_addr = new NetAddr::IP ($self->ip_addr, $self->ip_netmask);
+
+  foreach my $block (qsearch( 'ac_block', {} )) {
+    my $block_addr = new NetAddr::IP ($block->ip_addr, $block->ip_netmask);
+    if($block_addr->contains($self_addr)) { return $block; }
+  }
+  return '';
+}
+
+=item ac_type
+
+Returns the FS::ac_type record for this broadband service.
+
+=cut
+
+sub ac_type {
+  my $self = shift;
+  return qsearchs('ac_type', { actypenum => $self->actypenum });
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::svc_Common>, L<FS::Record>, L<FS::ac_type>, L<FS::ac_block>,
+L<FS::part_svc>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/bin/fs-setup b/bin/fs-setup
index 9522ce370..81f1c26b0 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.96 2002-07-06 12:13:49 ivan Exp $
+# $Id: fs-setup,v 1.97 2002-09-09 23:01:36 khoff Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -1023,7 +1023,77 @@ sub tables_hash_hack {
       'index'       => [],
     },
 
+    'ac_type' => {
+      'columns' => [
+        'actypenum', 'int', '', '',
+        'actypename', 'varchar', '', 15,
+      ],
+      'primary_key' => 'actypenum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'ac' => {
+      'columns' => [
+        'acnum', 'int', '', '',
+        'actypenum', 'int', '', '',
+        'acname', 'varchar', '', 15,
+      ],
+      'primary_key' => 'acnum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'part_ac_field' => {
+      'columns' => [
+        'acfieldpart', 'int', '', '',
+        'actypenum', 'int', '', '',
+        'name', 'varchar', '', 15,
+        'ut_type', 'varchar', '', 15,
+      ],
+      'primary_key' => 'acfieldpart',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'ac_field' => {
+      'columns' => [
+        'acfieldpart', 'int', '', '',
+        'acnum', 'int', '', '',
+        'value', 'varchar', '', 127,
+      ],
+      'primary_key' => '',
+      'unique'      => [ [ 'acfieldpart', 'acnum' ] ],
+      'index'       => [],
+    },
+
+    'ac_block' => {
+      'columns' => [
+        'acnum', 'int', '', '',
+        'ip_gateway', 'char', '', 15,
+        'ip_netmask', 'int', '', '',
+      ],
+      'primary_key' => '',
+      'unique'      => [],
+      'index'       => [],
+    },
 
+    'svc_broadband' => {
+      'columns' => [
+        'svcnum', 'int', '', '',
+        'actypenum', 'int', '', '',
+        'speed_up', 'int', '', '',
+        'speed_down', 'int', '', '',
+        'acnum', 'int', '', '',
+        'ip_addr', 'char', '', 15,
+        'ip_netmask', 'int', '', '',
+        'mac_addr', 'char', '', 17,
+        'location', 'varchar', '', 127,
+      ],
+      'primary_key' => 'svcnum',
+      'unique'      => [],
+      'index'       => [],
+    },
 
   );
 
diff --git a/htetc/global.asa b/htetc/global.asa
index d04a5edbf..3c8380fd4 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -46,6 +46,12 @@ use FS::svc_acct_sm;
 use FS::svc_domain;
 use FS::svc_forward;
 use FS::svc_www;
+use FS::ac_type;
+use FS::ac;
+use FS::part_ac_field;
+use FS::ac_field;
+use FS::ac_block;
+use FS::svc_broadband;
 use FS::type_pkgs;
 use FS::part_export;
 use FS::part_export_option;
diff --git a/httemplate/browse/ac.cgi b/httemplate/browse/ac.cgi
new file mode 100755
index 000000000..0ae138d3b
--- /dev/null
+++ b/httemplate/browse/ac.cgi
@@ -0,0 +1,57 @@
+<!-- mason kludge -->
+<%= header('Access Concentrator Listing', menubar(
+  'Main Menu'   => $p,
+  'Access Concentrator Types' => $p. 'browse/ac_type.cgi',
+)) %>
+<BR>
+<A HREF="<%= $p %>edit/ac.cgi"><I>Add a new Access Concentrator</I></A><BR><BR>
+
+<%= table() %>
+<TR>
+  <TH COLSPAN=2>AC</TH>
+  <TH>AC Type</TH>
+  <TH>Fields</TH>
+  <TH>Network/Mask</TH>
+</TR>
+<% 
+
+foreach my $ac ( qsearch('ac',{}) ) {
+  my($hashref)=$ac->hashref;
+  my($actypenum)=$hashref->{actypenum};
+  my($ac_type)=qsearchs('ac_type',{'actypenum'=>$actypenum});
+  my($actypename)=$ac_type->getfield('actypename');
+  print <<END;
+      <TR>
+        <TD><A HREF="${p}edit/ac.cgi?$hashref->{acnum}">
+          $hashref->{acnum}</A></TD>
+        <TD><A HREF="${p}edit/ac.cgi?$hashref->{acnum}">
+          $hashref->{acname}</A></TD>
+        <TD><A HREF="${p}edit/ac_type.cgi?$actypenum">$actypename</A></TD>
+        <TD>
+END
+
+  foreach my $ac_field ( qsearch('ac_field', { acnum => $hashref->{acnum} }) ) {
+    my $part_ac_field = qsearchs('part_ac_field',
+                         { acfieldpart => $ac_field->getfield('acfieldpart') });
+    print $part_ac_field->getfield('name') . ' ';
+    print $ac_field->getfield('value') . '<BR>';
+  }
+  print '</TD><TD>';
+
+  foreach (qsearch('ac_block', { acnum => $hashref->{acnum} })) {
+    my $net_addr = new NetAddr::IP($_->getfield('ip_gateway'),
+                                   $_->getfield('ip_netmask'));
+    print $net_addr->network->addr . '/' . $net_addr->network->mask . '<BR>';
+  }
+
+  print "<TR>\n";
+
+}
+
+print <<END;
+    </TABLE>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/browse/ac_type.cgi b/httemplate/browse/ac_type.cgi
new file mode 100755
index 000000000..0ad8271d3
--- /dev/null
+++ b/httemplate/browse/ac_type.cgi
@@ -0,0 +1,47 @@
+<!-- mason kludge -->
+<%
+
+print header('Access Concentrator Types', menubar(
+  'Main Menu' => $p,
+  'Access Concentrators' => $p. 'browse/ac.cgi',
+)) %>
+<BR>
+<A HREF="<%= $p %>edit/ac_type.cgi"><I>Add new AC Type</I></A><BR><BR>
+<%= table() %>
+      <TR>
+        <TH></TH>
+        <TH>Type</TH>
+        <TH>Fields</TH>
+      </TR>
+
+<%
+foreach my $ac_type ( qsearch('ac_type',{}) ) {
+  my($hashref)=$ac_type->hashref;
+  print <<END;
+      <TR>
+        <TD><A HREF="${p}edit/ac_type.cgi?$hashref->{actypenum}">
+          $hashref->{actypenum}</A></TD>
+        <TD><A HREF="${p}edit/ac_type.cgi?$hashref->{actypenum}">
+          $hashref->{actypename}</A></TD>
+        <TD>
+END
+
+  foreach ( qsearch('part_ac_field', { actypenum => $hashref->{actypenum} }) ) {
+    my ($part_ac_field) = $_->hashref;
+    print $part_ac_field->{'name'} .
+          ' (' . $part_ac_field->{'ut_type'} . ')<BR>';
+  }
+
+}
+
+print <<END;
+       </TD>
+      </TR>
+      <TR>
+      </TR>
+    </TABLE>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/ac.cgi b/httemplate/edit/ac.cgi
new file mode 100755
index 000000000..86b05a4a1
--- /dev/null
+++ b/httemplate/edit/ac.cgi
@@ -0,0 +1,163 @@
+<!-- mason kludge -->
+<%
+
+my($ac);
+if ( $cgi->param('error') ) {
+  $ac = new FS::ac ( {
+    map { $_, scalar($cgi->param($_)) } fields('ac')
+  } );
+} elsif ( $cgi->keywords ) { #editing
+  my( $query ) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $ac=qsearchs('ac',{'acnum'=>$1});
+} else { #adding
+  $ac = new FS::ac {};
+}
+my $action = $ac->acnum ? 'Edit' : 'Add';
+my $hashref = $ac->hashref;
+
+print header("$action Access Concentrator", menubar(
+  'Main Menu' => "$p",
+  'View all access concentrators' => "${p}browse/ac.cgi",
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print '<FORM ACTION="', popurl(1), 'process/ac.cgi" METHOD=POST>',
+      qq!<INPUT TYPE="hidden" NAME="acnum" VALUE="$hashref->{acnum}">!,
+      "Access Concentrator #", $hashref->{acnum} ? $hashref->{acnum} : "(NEW)";
+
+print <<END;
+
+<TABLE COLOR="#cccccc">
+  <TR>
+    <TH ALIGN="RIGHT">Access Concentrator</TH>
+    <TD>
+      <INPUT TYPE="text" NAME="acname" SIZE=15 VALUE="$hashref->{acname}">
+    </TD>
+  </TD>
+END
+
+
+if (! $ac->acnum) {
+  print <<END;
+  <TR>
+    <TH ALIGN="RIGHT">Access Concentrator Type</TH>
+    <TD><SELECT NAME="actypenum" SIZE="1"><OPTION VALUE=""></OPTION>
+END
+
+  foreach (qsearch('ac_type', {})) {
+    my $narf = $_->hashref;
+    print qq!<OPTION! .
+          ($narf->{actypenum} eq $hashref->{actypenum} ? ' SELECTED' : '') .
+          qq! VALUE="$narf->{actypenum}">$narf->{actypenum}: $narf->{actypename}! .
+          qq!</OPTION>!;
+  }
+
+  print '</TD></TR></TABLE>';
+} else {
+  print '</TABLE>';
+  print qq!<INPUT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">!;
+}
+
+print qq!</TABLE><BR><BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{acnum} ? "Apply changes" : "Add access concentrator",
+      qq!"></FORM>!;
+
+if ($hashref->{acnum}) {
+  print table();
+  print <<END;
+    Additional Fields:<BR>
+    <TH>
+      <TD>Field Name</TD>
+      <TD COLSPAN=2>Field Value</TD>
+    </TH>
+END
+
+  #my @ac_fields = qsearch('ac_field', { acnum => $hashref->{acnum} });
+  my @ac_fields = $ac->ac_field;
+  foreach (@ac_fields) {
+    print qq!\n<TR><TD></TD>!;
+    my $part_ac_field = qsearchs('part_ac_field',
+                          { acfieldpart => $_->getfield('acfieldpart') });
+    print '<TD>' . $part_ac_field->getfield('name') .
+          '</TD><TD>' . $_->getfield('value') . '</TD></TR>';
+    print "\n";
+  }
+
+  print '<FORM ACTION="', popurl(1), 'process/ac_field.cgi" METHOD=POST>';
+  print <<END;
+    <TR>
+      <TD><INPUT TYPE="hidden" NAME="acnum" VALUE="$hashref->{acnum}">
+          <INPUT TYPE="hidden" NAME="acname" VALUE="$hashref->{acname}">
+          <INPuT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">
+          <SMALL>(NEW)</SMALL>
+      </TD>
+      <TD><SELECT NAME="acfieldpart"><OPTION></OPTION>
+END
+
+  my @part_ac_fields = qsearch('part_ac_field',
+                         { actypenum => $hashref->{actypenum} });
+  foreach my $part_ac_field (@part_ac_fields) {
+    my $acfieldpart = $part_ac_field->getfield('acfieldpart');
+    if (grep {$_->getfield('acfieldpart') eq $acfieldpart} @ac_fields) {next;}
+    print qq!<OPTION VALUE="${acfieldpart}">! .
+          $part_ac_field->getfield('name') . '</OPTION>';
+  }
+
+  print <<END;
+        </SELECT>
+      </TD>
+      <TD><INPUT TYPE="text" SIZE="15" NAME="value"></TD>
+      <TD><INPUT TYPE="submit" VALUE="Add"></TD>
+    </TR>
+    </FORM>
+  </TABLE>
+END
+
+}
+
+if ($hashref->{acnum}) {
+
+  print qq!<BR><BR>IP Address Blocks:<BR>! . table() .
+        qq!<TR><TH></TH><TH>Network/Mask</TH>! .
+        qq!<TH>Gateway Address</TH><TH>Mask length</TH></TR>\n!;
+
+  foreach (qsearch('ac_block', { acnum => $hashref->{acnum} })) {
+    my $ip_addr = new NetAddr::IP($_->getfield('ip_gateway'),
+                                  $_->getfield('ip_netmask'));
+    print qq!<TR><TD></TD><TD>! . $ip_addr->network->addr() . '/' .
+          $ip_addr->network->mask() . qq!</TD>!;
+
+    print qq!<TD>! . $_->getfield('ip_gateway') . qq!</TD>\n! .
+          qq!<TD>! . $_->getfield('ip_netmask') . qq!</TD></TR>!;
+
+  }
+
+  print '<FORM ACTION="', popurl(1), 'process/ac_block.cgi" METHOD=POST>';
+  print <<END;
+  <TR>
+    <TD><INPUT TYPE="hidden" NAME="acnum" VALUE="$hashref->{acnum}">
+        <INPUT TYPE="hidden" NAME="acname" VALUE="$hashref->{acname}">
+        <INPuT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">
+       <SMALL>(NEW)</SMALL>
+    </TD>
+    <TD></TD>
+    <TD><INPUT TYPE="text" NAME="ip_gateway" SIZE="15"></TD>
+    <TD><INPUT TYPE="text" NAME="ip_netmask" SIZE="2"></TD>
+    <TD><INPUT TYPE="submit" VALUE="Add"></TD>
+  </TR>
+  </FORM>
+</TABLE>
+END
+
+}
+
+print <<END;
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/ac_type.cgi b/httemplate/edit/ac_type.cgi
new file mode 100755
index 000000000..ccc3d579c
--- /dev/null
+++ b/httemplate/edit/ac_type.cgi
@@ -0,0 +1,106 @@
+<!-- mason kludge -->
+<%
+
+my $ac_type;
+if ( $cgi->param('error') ) {
+  $ac_type = new FS::ac_type ( {
+    map { $_, scalar($cgi->param($_)) } fields('ac_type')
+  } );
+} elsif ( $cgi->keywords ) { #editing
+  my($query)=$cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $ac_type=qsearchs('ac_type',{'actypenum'=>$1});
+} else { #adding
+  $ac_type = new FS::ac_type {};
+}
+my $action = $ac_type->actypenum ? 'Edit' : 'Add';
+my $hashref = $ac_type->hashref;
+
+my @ut_types = qw( float number text alpha anything ip domain );
+
+my $p1 = popurl(1);
+print header("$action Access Concentrator Type", menubar(
+  'Main Menu' => popurl(2),
+  'View all Access Concentrator types' => popurl(2). "browse/ac_type.cgi",
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/ac_type.cgi" METHOD=POST>!;
+
+#display
+
+print qq!<INPUT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">!,
+      "AC Type #", $hashref->{actypenum} ? $hashref->{actypenum} : "(NEW)";
+
+print <<TROZ;
+<PRE>
+AC Type Name <INPUT TYPE="text" NAME="actypename" SIZE=15 VALUE="$hashref->{actypename}">
+</PRE>
+
+TROZ
+
+print qq!<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{actypenum} ? "Apply changes" : "Add AC Type",
+      qq!"></FORM>!;
+
+
+if ($hashref->{actypenum}) {
+  print qq!   <BR>Available fields:<BR>! .  table();
+
+  print qq!    <TH><TD>Field name</TD><TD>Field type</TD><TD></TD></TH>!;
+
+  my @part_ac_field = qsearch ( 'part_ac_field',
+                                { actypenum => $hashref->{actypenum} } );
+  foreach ( @part_ac_field ) {
+    my $pf_hashref = $_->hashref;
+    print <<END;
+      <TR>
+        <TD>$pf_hashref->{acfieldpart}</TD>
+        <TD>$pf_hashref->{name}</TD>
+        <TD>$pf_hashref->{ut_type}</TD>
+      </TR>
+END
+  }
+
+  my $name, $ut_type = '';
+  if ($cgi->param('error')) {
+    $name = $cgi->param('name');
+    $ut_type = $cgi->param('ut_type');
+  }
+
+  print <<END;
+      <FORM ACTION="${p1}process/part_ac_field.cgi" METHOD=GET>
+      <TR>
+       <TD><SMALL>(NEW)</SMALL>
+         <INPUT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">
+       </TD>
+       <TD>
+         <INPUT TYPE="text" NAME="name" VALUE="${name}">
+       </TD>
+       <TD>
+         <SELECT NAME="ut_type" SIZE=1><OPTION>
+END
+
+  foreach ( @ut_types ) {
+    print qq!<OPTION! . ($ut_type ? " SELECTED>$_" : ">$_");
+  }
+
+  print <<END;
+        </SELECT>
+      </TD>
+      <TD><INPUT TYPE="submit" VALUE="Add"></TD>
+    </TR>
+    </FORM>
+  </TABLE>
+END
+
+}
+
+%>
+
+ </BODY>
+</HTML>
+
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 4ccb770fb..a23107a40 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -53,6 +53,7 @@ Services are items you offer to your customers.
     <LI>svc_acct_sm - <B>deprecated</B> (use svc_forward for new installations) Virtual domain mail aliasing.
     <LI>svc_forward - mail forwarding
     <LI>svc_www - Virtual domain website
+    <LI>svc_broadband - Broadband/High-speed Internet service
 <!--   <LI>svc_charge - One-time charges (Partially unimplemented)
        <LI>svc_wo - Work orders (Partially unimplemented)
 -->
@@ -122,11 +123,21 @@ my %defs = (
     #'recnum' => '',
     #'usersvc' => '',
   },
+  'svc_broadband' => {
+    'actypenum' => 'This is the actypenum that refers to the type of AC that can be provisioned for this service.  This field must be set fixed.',
+    'speed_down' => 'Maximum download speed for this service in Kbps.  0 denotes unlimited.',
+    'speed_up' => 'Maximum upload speed for this service in Kbps.  0 denotes unlimited.',
+    'acnum' => 'acnum of a specific AC that this service is restricted to.  Not required',
+    'ip_addr' => 'IP address.  Leave blank for automatic assignment.',
+    'ip_netmask' => 'Mask length, aka. netmask bits.  (Eg. 255.255.255.0 == 24)',
+    'mac_addr' => 'MAC address which is used by some ACs for access control.  Specified by 6 colon seperated hex octets. (Eg. 00:00:0a:bc:1a:2b)',
+    'location' => 'Defines the physically location at which this service was installed.  This is not necessarily the billing address',
+  },
 );
 
   my @dbs = $hashref->{svcdb}
              ? ( $hashref->{svcdb} )
-             : qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www );
+             : qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www svc_broadband );
 
   tie my %svcdb, 'Tie::IxHash', map { $_=>$_ } @dbs;
   my $widget = new HTML::Widgets::SelectLayers(
diff --git a/httemplate/edit/process/ac.cgi b/httemplate/edit/process/ac.cgi
new file mode 100755
index 000000000..fc434a807
--- /dev/null
+++ b/httemplate/edit/process/ac.cgi
@@ -0,0 +1,28 @@
+<%
+
+my $acnum = $cgi->param('acnum');
+
+my $old = qsearchs('ac',{'acnum'=>$acnum}) if $acnum;
+
+my $new = new FS::ac ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('ac')
+} );
+
+my $error = '';
+if ( $acnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $acnum=$new->getfield('acnum');
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "browse/ac.cgi");
+}
+
+%>
diff --git a/httemplate/edit/process/ac_block.cgi b/httemplate/edit/process/ac_block.cgi
new file mode 100755
index 000000000..b1c3c726b
--- /dev/null
+++ b/httemplate/edit/process/ac_block.cgi
@@ -0,0 +1,21 @@
+<%
+
+my $new = new FS::ac_block ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('ac_block')
+} );
+
+my $error = '';
+$error = $new->check;
+
+unless ( $error ) { $error = $new->insert; }
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->param('acnum'));
+}
+
+%>
diff --git a/httemplate/edit/process/ac_field.cgi b/httemplate/edit/process/ac_field.cgi
new file mode 100755
index 000000000..2bfe3312f
--- /dev/null
+++ b/httemplate/edit/process/ac_field.cgi
@@ -0,0 +1,21 @@
+<%
+
+my $new = new FS::ac_field ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('ac_field')
+} );
+
+my $error = '';
+$error = $new->check;
+
+unless ( $error ) { $error = $new->insert; }
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->param('acnum'));
+}
+
+%>
diff --git a/httemplate/edit/process/ac_type.cgi b/httemplate/edit/process/ac_type.cgi
new file mode 100755
index 000000000..ca232ba58
--- /dev/null
+++ b/httemplate/edit/process/ac_type.cgi
@@ -0,0 +1,28 @@
+<%
+
+my $actypenum = $cgi->param('actypenum');
+
+my $old = qsearchs('ac_type',{'actypenum'=>$actypenum}) if $actypenum;
+
+my $new = new FS::ac_type ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('ac_type')
+} );
+
+my $error = '';
+if ( $actypenum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $actypenum=$new->getfield('actypenum');
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "ac_type.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "browse/ac_type.cgi");
+}
+
+%>
diff --git a/httemplate/edit/process/part_ac_field.cgi b/httemplate/edit/process/part_ac_field.cgi
new file mode 100755
index 000000000..38ad586f7
--- /dev/null
+++ b/httemplate/edit/process/part_ac_field.cgi
@@ -0,0 +1,21 @@
+<%
+
+my $new = new FS::part_ac_field ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('part_ac_field')
+} );
+
+my $error = '';
+$error = $new->check;
+
+unless ( $error ) { $error = $new->insert; }
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "ac_type.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(2). "ac_type.cgi?". $cgi->param('actypenum'));
+}
+
+%>
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 859670b17..69e8ac2fa 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -17,7 +17,7 @@ my $new = new FS::part_svc ( {
             push @fields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
             map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  } @fields;
           } grep defined( $FS::Record::dbdef->table($_) ),
-                 qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www )
+                 qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www svc_broadband )
     )
 } );
 
diff --git a/httemplate/edit/process/svc_broadband.cgi b/httemplate/edit/process/svc_broadband.cgi
new file mode 100644
index 000000000..fd7ba20d5
--- /dev/null
+++ b/httemplate/edit/process/svc_broadband.cgi
@@ -0,0 +1,45 @@
+<%
+
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+my $svcnum = $1;
+
+my $old;
+if ( $svcnum ) {
+  $old = qsearchs('svc_broadband', { 'svcnum' => $svcnum } )
+    or die "fatal: can't find broadband service (svcnum $svcnum)!";
+} else {
+  $old = '';
+}
+
+my $new = new FS::svc_broadband ( {
+  map {
+    ($_, scalar($cgi->param($_)));
+  } ( fields('svc_broadband'), qw( pkgnum svcpart ) )
+} );
+
+unless ( $new->ip_addr ) {
+  $new->ip_addr(join('.', (map $cgi->param('ip_addr_'.$_), (a..d))));
+}
+
+unless ( $new->mac_addr) {
+  $new->mac_addr(join(':', (map $cgi->param('mac_addr_'.$_), (a..f))));
+}
+
+my $error;
+if ( $svcnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $svcnum = $new->svcnum;
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  $cgi->param('ip_addr', $new->ip_addr);
+  $cgi->param('mac_addr', $new->mac_addr);
+  print $cgi->redirect(popurl(2). "svc_broadband.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/svc_broadband.cgi?" . $svcnum );
+}
+
+%>
diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
new file mode 100644
index 000000000..d8a1f7a2a
--- /dev/null
+++ b/httemplate/edit/svc_broadband.cgi
@@ -0,0 +1,219 @@
+<!-- mason kludge -->
+<%
+
+my( $svcnum,  $pkgnum, $svcpart, $part_svc, $svc_broadband );
+if ( $cgi->param('error') ) {
+  $svc_broadband = new FS::svc_broadband ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_broadband')
+  } );
+  $svcnum = $svc_broadband->svcnum;
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $svcnum=$1;
+    $svc_broadband=qsearchs('svc_broadband',{'svcnum'=>$svcnum})
+      or die "Unknown (svc_broadband) svcnum!";
+
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+      or die "Unknown (cust_svc) svcnum!";
+
+    $pkgnum=$cust_svc->pkgnum;
+    $svcpart=$cust_svc->svcpart;
+  
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+  } else { #adding
+
+    $svc_broadband = new FS::svc_broadband({});
+
+    foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
+      $pkgnum=$1 if /^pkgnum(\d+)$/;
+      $svcpart=$1 if /^svcpart(\d+)$/;
+    }
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+    $svcnum='';
+
+    #set fixed and default fields from part_svc
+    foreach my $part_svc_column (
+      grep { $_->columnflag } $part_svc->all_part_svc_column
+    ) {
+      $svc_broadband->setfield( $part_svc_column->columnname,
+                                $part_svc_column->columnvalue,
+                              );
+    }
+
+  }
+}
+my $action = $svc_broadband->svcnum ? 'Edit' : 'Add';
+
+my @ac_list;
+
+if ($pkgnum) {
+
+  unless ($svc_broadband->actypenum) {die "actypenum must be set fixed";};
+  @ac_list = qsearch('ac', { actypenum => $svc_broadband->getfield('actypenum') });
+
+} elsif ( $action eq 'Edit' ) {
+
+  #Nothing?
+
+} else {
+  die "\$action eq Add, but \$pkgnum is null!\n";
+}
+
+
+my $p1 = popurl(1);
+print header("Broadband Service $action", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/svc_broadband.cgi" METHOD=POST>!;
+
+#display
+
+ 
+
+#svcnum
+print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
+print qq!Service #<B>!, $svcnum ? $svcnum : "(NEW)", "</B><BR><BR>";
+
+#pkgnum
+print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
+ 
+#svcpart
+print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
+
+#actypenum
+print '<INPUT TYPE="hidden" NAME="actypenum" VALUE="' .
+      $svc_broadband->actypenum . '">';
+
+
+print &ntable("#cccccc",2) . qq!<TR><TD ALIGN="right">AC</TD><TD>!;
+
+#acnum
+if (( $part_svc->part_svc_column('acnum')->columnflag eq 'F' ) or
+    ( !$pkgnum )) {
+
+  my $ac = qsearchs('ac', { acnum => $svc_broadband->acnum });
+  my ($acnum, $acname) = ($ac->acnum, $ac->acname);
+
+  print qq!<INPUT TYPE="hidden" NAME="acnum" VALUE="${acnum}">! .
+        qq!${acnum}: ${acname}</TD></TR>!;
+
+} else {
+
+  my @ac_list = qsearch('ac', { actypenum => $svc_broadband->actypenum });
+  print qq!<SELECT NAME="acnum" SIZE="1"><OPTION VALUE=""></OPTION>!;
+
+  foreach ( @ac_list ) {
+    my ($acnum, $acname) = ($_->acnum, $_->acname);
+    print qq!<OPTION VALUE="${acnum}"! .
+          ($acnum == $svc_broadband->acnum ? ' SELECTED>' : '>') .
+          qq!${acname}</OPTION>!;
+  }
+  print '</TD></TR>';
+
+}
+
+#speed_up & speed_down
+my ($speed_up, $speed_down) = ($svc_broadband->speed_up,
+                               $svc_broadband->speed_down);
+
+print '<TR><TD ALIGN="right">Download speed</TD><TD>';
+if ( $part_svc->part_svc_column('speed_down')->columnflag eq 'F' ) {
+  print qq!<INPUT TYPE="hidden" NAME="speed_down" VALUE="${speed_down}">! .
+        qq!${speed_down}Kbps</TD></TR>!;
+} else {
+  print qq!<INPUT TYPE="text" NAME="speed_down" SIZE=5 VALUE="${speed_down}">! .
+        qq!Kbps</TD></TR>!;
+}
+
+print '<TR><TD ALIGN="right">Upload speed</TD><TD>';
+if ( $part_svc->part_svc_column('speed_up')->columnflag eq 'F' ) {
+  print qq!<INPUT TYPE="hidden" NAME="speed_up" VALUE="${speed_up}">! .
+        qq!${speed_up}Kbps</TD></TR>!;
+} else {
+  print qq!<INPUT TYPE="text" NAME="speed_up" SIZE=5 VALUE="${speed_up}">! .
+        qq!Kbps</TD></TR>!;
+}
+
+#ip_addr & ip_netmask
+#We're assuming that ip_netmask is fixed if ip_addr is fixed.
+#If it isn't, well, <shudder> what the heck are you doing!?!?
+
+my ($ip_addr, $ip_netmask) = ($svc_broadband->ip_addr,
+                              $svc_broadband->ip_netmask);
+
+print '<TR><TD ALIGN="right">IP address/Mask</TD><TD>';
+if ( $part_svc->part_svc_column('ip_addr')->columnflag eq 'F' ) {
+  print qq!<INPUT TYPE="hidden" NAME="ip_addr" VALUE="${ip_addr}">! .
+        qq!<INPUT TYPE="hidden" NAME="ip_netmask" VALUE="${ip_netmask}">! .
+        qq!${ip_addr}/${ip_netmask}</TD></TR>!;
+} else {
+  $ip_addr =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/;
+  print <<END;
+  <INPUT TYPE="text" NAME="ip_addr_a" SIZE="3" MAXLENGTH="3" VALUE="${1}">.
+  <INPUT TYPE="text" NAME="ip_addr_b" SIZE="3" MAXLENGTH="3" VALUE="${2}">.
+  <INPUT TYPE="text" NAME="ip_addr_c" SIZE="3" MAXLENGTH="3" VALUE="${3}">.
+  <INPUT TYPE="text" NAME="ip_addr_d" SIZE="3" MAXLENGTH="3" VALUE="${4}">/
+  <INPUT TYPE="text" NAME="ip_netmask" SIZE="2" MAXLENGTH="2" VALUE="${ip_netmask}">
+</TD></TR>
+<TR><TD COLSPAN="2" WIDTH="300">
+<P><SMALL>Leave the IP address and netmask blank for automatic assignment of a /32 address.  Specifing the netmask and not the address will force assignment of a larger block.</SMALL></P>
+</TD></TR>
+END
+}
+
+#mac_addr
+my $mac_addr = $svc_broadband->mac_addr;
+
+unless (( $part_svc->part_svc_column('mac_addr')->columnflag eq 'F' ) and
+        ( $mac_addr eq '' )) {
+  print '<TR><TD ALIGN="right">MAC Address</TD><TD>';
+  if ( $part_svc->part_svc_column('mac_addr')->columnflag eq 'F' ) { #Why?
+    print qq!<INPUT TYPE="hidden" NAME="mac_addr" VALUE="${mac_addr}">! .
+          qq!${mac_addr}</TD></TR>!;
+  } else {
+    #Ewwww
+    $mac_addr =~ /^([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2})$/i;
+    print <<END;
+  <INPUT TYPE="text" NAME="mac_addr_a" SIZE="2" MACLENGTH="2" VALUE="${1}">:
+  <INPUT TYPE="text" NAME="mac_addr_b" SIZE="2" MACLENGTH="2" VALUE="${2}">:
+  <INPUT TYPE="text" NAME="mac_addr_c" SIZE="2" MACLENGTH="2" VALUE="${3}">:
+  <INPUT TYPE="text" NAME="mac_addr_d" SIZE="2" MACLENGTH="2" VALUE="${4}">:
+  <INPUT TYPE="text" NAME="mac_addr_e" SIZE="2" MACLENGTH="2" VALUE="${5}">:
+  <INPUT TYPE="text" NAME="mac_addr_f" SIZE="2" MACLENGTH="2" VALUE="${6}">
+</TD></TR>
+END
+
+  }
+}
+
+#location
+my $location = $svc_broadband->location;
+
+print '<TR><TD VALIGN="top" ALIGN="right">Location</TD><TD BGCOLOR="#e8e8e8">';
+if ( $part_svc->part_svc_column('location')->columnflag eq 'F' ) {
+  print qq!<PRE>${location}</PRE></TD></TR>!;
+} else {
+  print qq!<TEXTAREA ROWS="4" COLS="30" NAME="location">${location}</TEXTAREA>!;
+}
+
+print '</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">';
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+%>
diff --git a/httemplate/index.html b/httemplate/index.html
index dce020b1b..2cb707326 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -194,6 +194,10 @@
               into counties and assign different tax rates to each.
           <LI><A HREF="browse/svc_acct_pop.cgi">View/Edit Access Numbers</A>
             - Points of Presence 
+          <LI><A HREF="browse/ac_type.cgi">View/Edit AC Types</A>
+            - Broadband service access concentrator types.
+          <LI><A HREF="browse/ac.cgi">View/Edit AC</A>
+            - Broadband service access concentrators.
           <LI><A HREF="browse/part_bill_event.cgi">View/Edit invoice events</A> - Actions for overdue invoices
           <LI><A HREF="browse/msgcat.cgi">View/Edit message catalog</A> - Change error messages and other customizable labels.
         </ul>
diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
new file mode 100644
index 000000000..156edfaec
--- /dev/null
+++ b/httemplate/view/svc_broadband.cgi
@@ -0,0 +1,75 @@
+<!-- mason kludge -->
+<%
+
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+my $svcnum = $1;
+my $svc_broadband = qsearchs( 'svc_broadband', { 'svcnum' => $svcnum } )
+  or die "svc_broadband: Unknown svcnum $svcnum";
+
+#false laziness w/all svc_*.cgi
+my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } );
+my $pkgnum = $cust_svc->getfield('pkgnum');
+my($cust_pkg, $custnum);
+if ($pkgnum) {
+  $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
+  $custnum = $cust_pkg->custnum;
+} else {
+  $cust_pkg = '';
+  $custnum = '';
+}
+#eofalse
+
+my $ac = qsearchs('ac', { acnum => $svc_broadband->getfield('acnum') });
+
+my (
+     $acname,
+     $acnum,
+     $speed_down,
+     $speed_up,
+     $ip_addr,
+     $ip_netmask,
+     $mac_addr,
+     $location
+   ) = (
+     $ac->getfield('acname'),
+     $ac->getfield('acnum'),
+     $svc_broadband->getfield('speed_down'),
+     $svc_broadband->getfield('speed_up'),
+     $svc_broadband->getfield('ip_addr'),
+     $svc_broadband->getfield('ip_netmask'),
+     $svc_broadband->getfield('mac_addr'),
+     $svc_broadband->getfield('location')
+   );
+
+print header('Broadband Service View', menubar(
+  ( ( $custnum )
+    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
+        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+      )                                                                       
+    : ( "Cancel this (unaudited) website" =>
+          "${p}misc/cancel-unaudited.cgi?$svcnum" )
+  ),
+  "Main menu" => $p,
+)).
+      qq!<A HREF="${p}edit/svc_broadband.cgi?$svcnum">Edit this information</A><BR>!.
+      ntable("#cccccc"). '<TR><TD>'. ntable("#cccccc",2).
+      qq!<TR><TD ALIGN="right">Service number</TD>!.
+        qq!<TD BGCOLOR="#ffffff">$svcnum</TD></TR>!.
+      qq!<TR><TD ALIGN="right">AC</TD>!.
+        qq!<TD BGCOLOR="#ffffff">$acnum: $acname</TD></TR>!.
+      qq!<TR><TD ALIGN="right">Download Speed</TD>!.
+        qq!<TD BGCOLOR="#ffffff">$speed_down</TD></TR>!.
+      qq!<TR><TD ALIGN="right">Upload Speed</TD>!.
+        qq!<TD BGCOLOR="#ffffff">$speed_up</TD></TR>!.
+      qq!<TR><TD ALIGN="right">IP Address/Mask</TD>!.
+        qq!<TD BGCOLOR="#ffffff">$ip_addr/$ip_netmask</TD></TR>!.
+      qq!<TR><TD ALIGN="right">MAC Address</TD>!.
+        qq!<TD BGCOLOR="#ffffff">$mac_addr</TD></TR>!.
+      qq!<TR><TD ALIGN="right" VALIGN="TOP">Location</TD>!.
+        qq!<TD BGCOLOR="#ffffff"><PRE>$location</PRE></TD></TR>!.
+      '</TABLE></TD></TR></TABLE>'.
+      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
+      '</BODY></HTML>'
+;
+%>
-- 
cgit v1.2.1


From 88357d0c76bd7c257d4d87da0a59f8814f925049 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 10 Sep 2002 00:37:36 +0000
Subject: doc: need Net::SSH 0.07 for 1.4.1

---
 httemplate/docs/upgrade9.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/httemplate/docs/upgrade9.html b/httemplate/docs/upgrade9.html
index fff1d8690..efd25887d 100644
--- a/httemplate/docs/upgrade9.html
+++ b/httemplate/docs/upgrade9.html
@@ -9,5 +9,6 @@
   <li>Run <code>make aspdocs</code> or <code>make masondocs</code>.
   <li>Copy <code>aspdocs/</code> or <code>masondocs/</code> to your web server's document space.
   <li>Run <code>make install-perl-modules</code>.
+  <li>Install <a href="http://search.cpan.org/search?dist=Net-SSH">Net::SSH</a> minimum version 0.07
   <li>Restart Apache and freeside-queued.
 </body>
-- 
cgit v1.2.1


From 27b1e8e41b7d4ace60b286ec02a171009aee83f2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 10 Sep 2002 03:31:00 +0000
Subject: Business::OnlinePaymet fix for processors w/o order numbers, like
 VirtualNet

---
 FS/FS/cust_bill.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 5e041ea59..d49657e2e 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -674,7 +674,9 @@ sub realtime_card {
 
   if ( $transaction->is_success() && $action2 ) {
     my $auth = $transaction->authorization;
-    my $ordernum = $transaction->order_number;
+    my $ordernum = $transaction->can('order_number')
+                   ? $transaction->order_number
+                   : '';
 
     #warn "********* $auth ***********\n";
     #warn "********* $ordernum ***********\n";
@@ -1112,7 +1114,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.41 2002-09-05 16:51:49 ivan Exp $
+$Id: cust_bill.pm,v 1.42 2002-09-10 03:31:00 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 93773ff8f4e002cb70a07cb4f7956279eb630acf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 11 Sep 2002 09:09:23 +0000
Subject: mason warnings

---
 httemplate/search/cust_main.cgi | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 586f8d991..0a98b1891 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -82,22 +82,22 @@ if ( $cgi->param('browse')
 
   if ( driver_name eq 'mysql' ) {
 
-       my $query = "CREATE TEMPORARY TABLE temp1_$$ TYPE=MYISAM
-                      SELECT cust_pkg.custnum,COUNT(*) as count
-                        FROM cust_pkg,cust_main
-                          WHERE cust_pkg.custnum = cust_main.custnum
-                                AND ( cust_pkg.cancel IS NULL
-                                      OR cust_pkg.cancel = 0 )
-                          GROUP BY cust_pkg.custnum";
-       my $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
-       $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
-       $query = "CREATE TEMPORARY TABLE temp2_$$ TYPE=MYISAM
-                   SELECT cust_pkg.custnum,COUNT(*) as count
-                     FROM cust_pkg,cust_main
-                       WHERE cust_pkg.custnum = cust_main.custnum
-                       GROUP BY cust_pkg.custnum";
-       my $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
-       $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
+       my $sql = "CREATE TEMPORARY TABLE temp1_$$ TYPE=MYISAM
+                    SELECT cust_pkg.custnum,COUNT(*) as count
+                      FROM cust_pkg,cust_main
+                        WHERE cust_pkg.custnum = cust_main.custnum
+                              AND ( cust_pkg.cancel IS NULL
+                                    OR cust_pkg.cancel = 0 )
+                        GROUP BY cust_pkg.custnum";
+       my $sth = dbh->prepare($sql) or die dbh->errstr. " preparing $sql";
+       $sth->execute or die "Error executing \"$sql\": ". $sth->errstr;
+       $sql = "CREATE TEMPORARY TABLE temp2_$$ TYPE=MYISAM
+                 SELECT cust_pkg.custnum,COUNT(*) as count
+                   FROM cust_pkg,cust_main
+                     WHERE cust_pkg.custnum = cust_main.custnum
+                     GROUP BY cust_pkg.custnum";
+       $sth = dbh->prepare($sql) or die dbh->errstr. " preparing $sql";
+       $sth->execute or die "Error executing \"$sql\": ". $sth->errstr;
   }
 
   if (  $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
@@ -167,9 +167,9 @@ if ( $cgi->param('browse')
                               "$ncancelled $orderby $limit" );
   }
   if ( driver_name eq 'mysql' ) {
-    $query = "DROP TABLE temp1_$$,temp2_$$;";
-    my $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
-    $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
+    my $sql = "DROP TABLE temp1_$$,temp2_$$;";
+    my $sth = dbh->prepare($sql) or die dbh->errstr. " preparing $sql";
+    $sth->execute or die "Error executing \"$sql\": ". $sth->errstr;
   }
   @cust_main = @just_cust_main;
 
@@ -457,7 +457,7 @@ sub custnumsearch {
   my $custnum = $cgi->param('custnum_text');
   $custnum =~ s/\D//g;
   $custnum =~ /^(\d{1,23})$/ or eidiot "Illegal customer number\n";
-  my $custnum = $1;
+  $custnum = $1;
   
   [ qsearchs('cust_main', { 'custnum' => $custnum } ) ];
 }
-- 
cgit v1.2.1


From 1a4ba4fc23449a4bb189c8e7a69a10a2a793efc3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 11 Sep 2002 09:28:13 +0000
Subject: mason error

---
 httemplate/browse/svc_acct_pop.cgi | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index e890f07bf..8d35cb56a 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -1,9 +1,5 @@
 <!-- mason kludge -->
-<%
-
-print header('Access Number Listing', menubar(
-  'Main Menu' => $p,
-)) %>
+<%= header('Access Number Listing', menubar( 'Main Menu' => $p )) %>
 Points of Presence<BR><BR>
 <A HREF="<%= $p %>edit/svc_acct_pop.cgi"><I>Add new Access Number</I></A><BR><BR>
 <%= table() %>
-- 
cgit v1.2.1


From 3548c2951a51ece84687e3bfb5e435008191a713 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 16 Sep 2002 09:27:14 +0000
Subject: skip empty expiration dates

---
 FS/bin/freeside-expiration-alerter | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/FS/bin/freeside-expiration-alerter b/FS/bin/freeside-expiration-alerter
index ee3c1fb92..5399f6d22 100755
--- a/FS/bin/freeside-expiration-alerter
+++ b/FS/bin/freeside-expiration-alerter
@@ -80,16 +80,18 @@ $alerter->compile() or die "can't compile template:  Text::Template::ERROR";
 # Now I can start looping
 foreach my $customer (@customers)
 {
+  my $paydate = $customer->getfield('paydate');
+  next if $paydate =~ /^\s*$/; #skip empty expiration dates
+
   my $custnum = $customer->getfield('custnum');
   my $first = $customer->getfield('first');
   my $last = $customer->getfield('last');
   my $company = $customer->getfield('company');
   my $payby = $customer->getfield('payby');
   my $payinfo = $customer->getfield('payinfo');
-  my $paydate = $customer->getfield('paydate');
   my $daytime = $customer->getfield('daytime');
   my $night = $customer->getfield('night');
-	
+
   my ($payyear,$paymonth,$payday) = split (/-/,$paydate);
 
   my $expire_time = timelocal(0,0,0,$payday,--$paymonth,$payyear);
@@ -200,7 +202,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-expiration-alerter,v 1.3 2002-04-16 09:38:19 ivan Exp $
+$Id: freeside-expiration-alerter,v 1.4 2002-09-16 09:27:14 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From bc7312f2a83c76674aa3478ba989d6f9fb7a5cb3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Sep 2002 00:33:17 +0000
Subject:   - "emailinvoiceauto" implementation rewritten to work properly,
 stop     overwriting existing invoice destinations

---
 FS/FS/Conf.pm      |  2 +-
 FS/FS/cust_bill.pm |  4 ++--
 FS/FS/cust_main.pm | 25 ++++++++++++++++++-------
 FS/FS/svc_acct.pm  | 15 ++++++++++++---
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e93eaf3fc..e50cb29b9 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -369,7 +369,7 @@ httemplate/docs/config.html
   {
     'key'         => 'emailinvoiceauto',
     'section'     => 'billing',
-    'description' => 'Automatically adds new accounts to the email invoice list upon customer creation',
+    'description' => 'Automatically adds new accounts to the email invoice list',
     'type'       => 'checkbox',
   },
 
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index d49657e2e..65c41d5c9 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -623,7 +623,7 @@ sub realtime_card {
   my @invoicing_list = grep { $_ ne 'POST' } $cust_main->invoicing_list;
   if ( $conf->exists('emailinvoiceauto')
        || ( $conf->exists('emailinvoiceonly') && ! @invoicing_list ) ) {
-    push @invoicing_list, $cust_main->default_invoicing_list;
+    push @invoicing_list, $cust_main->all_emails;
   }
   my $email = $invoicing_list[0];
 
@@ -1114,7 +1114,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.42 2002-09-10 03:31:00 ivan Exp $
+$Id: cust_bill.pm,v 1.43 2002-09-17 00:33:17 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index cfa6b8bb6..84fd3d150 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1584,7 +1584,6 @@ sub invoicing_list {
     }
     my %seen = map { $_->address => 1 } @cust_main_invoice;
     foreach my $address ( @{$arrayref} ) {
-      #unless ( grep { $address eq $_->address } @cust_main_invoice ) {
       next if exists $seen{$address} && $seen{$address};
       $seen{$address} = 1;
       my $cust_main_invoice = new FS::cust_main_invoice ( {
@@ -1626,24 +1625,36 @@ sub check_invoicing_list {
   '';
 }
 
-=item default_invoicing_list
+=item set_default_invoicing_list
 
-Sets the invoicing list to all accounts associated with this customer.
+Sets the invoicing list to all accounts associated with this customer,
+overwriting any previous invoicing list.
 
 =cut
 
-sub default_invoicing_list {
+sub set_default_invoicing_list {
   my $self = shift;
-  my @list = ();
+  $self->invoicing_list($self->all_emails);
+}
+
+=item all_emails
+
+Returns the email addresses of all accounts provisioned for this customer.
+
+=cut
+
+sub all_emails {
+  my $self = shift;
+  my %list;
   foreach my $cust_pkg ( $self->all_pkgs ) {
     my @cust_svc = qsearch('cust_svc', { 'pkgnum' => $cust_pkg->pkgnum } );
     my @svc_acct =
       map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
         grep { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
           @cust_svc;
-    push @list, map { $_->email } @svc_acct;
+    $list{$_}=1 foreach map { $_->email } @svc_acct;
   }
-  $self->invoicing_list(\@list);
+  keys %list;
 }
 
 =item invoicing_list_addpost
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 9032e20c1..f73ab82da 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -341,11 +341,20 @@ sub insert {
     return "queueing job (transaction rolled back): $error";
   }
 
-  #welcome email
   my $cust_pkg = $self->cust_svc->cust_pkg;
-  my( $cust_main, $to ) = ( '', '' );
+  my $cust_main = $cust_pkg->cust_main;
+
+  my $cust_pkg = $self->cust_svc->cust_pkg;
+
+  if ( $conf->exists('emailinvoiceauto') ) {
+    my @invoicing_list = $cust_main->invoicing_list;
+    push @invoicing_list, $self->email;
+    $cust_main->invoicing_list(@invoicing_list);
+  }
+
+  #welcome email
+  my $to = '';
   if ( $welcome_template && $cust_pkg ) {
-    my $cust_main = $cust_pkg->cust_main;
     my $to = join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list );
     if ( $to ) {
       my $wqueue = new FS::queue {
-- 
cgit v1.2.1


From 3999cc30d219a7ebf6db985d0904ffe42b79860e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Sep 2002 00:40:07 +0000
Subject: send_ftp doc fix

---
 FS/FS/cust_bill.pm | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 65c41d5c9..52fc94235 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -443,23 +443,39 @@ first two fields (B<record_type> and B<invnum>) and the last five fields
 (B<pkg> through B<edate>) are filled in.
 
 =item invnum - invoice number
+
 =item custnum - customer number
+
 =item _date - invoice date
+
 =item charged - total invoice amount
+
 =item first - customer first name
+
 =item last - customer first name
+
 =item company - company name
+
 =item address1 - address line 1
+
 =item address2 - address line 1
+
 =item city
+
 =item state
+
 =item zip
+
 =item country
 
 =item pkg - line item description
-=item setup - line item setup fee (only or both of B<setup> and B<recur> will be defined)
-=item recur - line item recurring fee (only or both of B<setup> and B<recur> will be defined)
+
+=item setup - line item setup fee (one or both of B<setup> and B<recur> will be defined)
+
+=item recur - line item recurring fee (one or both of B<setup> and B<recur> will be defined)
+
 =item sdate - start date for recurring fee
+
 =item edate - end date for recurring fee
 
 =back
@@ -1114,7 +1130,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.43 2002-09-17 00:33:17 ivan Exp $
+$Id: cust_bill.pm,v 1.44 2002-09-17 00:40:07 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 3595c874f8e476e58b98b7ab6d86918d4dbb1d5c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Sep 2002 09:19:42 +0000
Subject: remove svc_acct_sm

---
 FS/FS.pm                                |   2 -
 FS/FS/InitHandler.pm                    |   1 -
 FS/FS/cust_pkg.pm                       |  14 +-
 FS/FS/part_export.pm                    |   2 -
 FS/FS/part_svc.pm                       |  27 +---
 FS/FS/svc_acct.pm                       |   9 +-
 FS/FS/svc_acct_sm.pm                    | 260 --------------------------------
 FS/MANIFEST                             |   2 -
 FS/t/svc_acct_sm.t                      |   5 -
 httemplate/docs/schema.dia              | Bin 14414 -> 14438 bytes
 httemplate/docs/schema.html             |   9 +-
 httemplate/edit/part_svc.cgi            |   8 +-
 httemplate/edit/process/part_svc.cgi    |   2 +-
 httemplate/edit/process/svc_acct_sm.cgi |  34 -----
 httemplate/edit/svc_acct_sm.cgi         | 178 ----------------------
 httemplate/index.html                   |   1 -
 httemplate/misc/link.cgi                |   1 -
 httemplate/search/svc_acct_sm.cgi       |  84 -----------
 httemplate/search/svc_acct_sm.html      |  23 ---
 httemplate/search/svc_domain.cgi        |  12 --
 httemplate/view/svc_acct_sm.cgi         |  58 -------
 21 files changed, 12 insertions(+), 720 deletions(-)
 delete mode 100644 FS/FS/svc_acct_sm.pm
 delete mode 100644 FS/t/svc_acct_sm.t
 delete mode 100755 httemplate/edit/process/svc_acct_sm.cgi
 delete mode 100755 httemplate/edit/svc_acct_sm.cgi
 delete mode 100755 httemplate/search/svc_acct_sm.cgi
 delete mode 100755 httemplate/search/svc_acct_sm.html
 delete mode 100755 httemplate/view/svc_acct_sm.cgi

diff --git a/FS/FS.pm b/FS/FS.pm
index 963c73548..c22557a2d 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -62,8 +62,6 @@ L<FS::domain_record> - DNS zone entries
 
 L<FS::svc_forward> - Mail forwarding class
 
-L<FS::svc_acct_sm> - (Depreciated) Vitual mail alias class
-
 L<FS::svc_www> - Web virtual host class.
 
 L<FS::part_svc> - Service definition class
diff --git a/FS/FS/InitHandler.pm b/FS/FS/InitHandler.pm
index 0216615da..5038cf352 100644
--- a/FS/FS/InitHandler.pm
+++ b/FS/FS/InitHandler.pm
@@ -52,7 +52,6 @@ sub handler {
   use FS::session;
   use FS::svc_acct;
   use FS::svc_acct_pop;
-  use FS::svc_acct_sm;
   use FS::svc_domain;
   use FS::svc_forward;
   use FS::svc_www;
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 12508e1aa..0c71435e1 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -14,7 +14,6 @@ use FS::pkg_svc;
 # setup }
 # because they load configuraion by setting FS::UID::callback (see TODO)
 use FS::svc_acct;
-use FS::svc_acct_sm;
 use FS::svc_domain;
 use FS::svc_www;
 use FS::svc_forward;
@@ -679,7 +678,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.23 2002-08-26 20:40:55 ivan Exp $
+$Id: cust_pkg.pm,v 1.24 2002-09-17 09:19:06 ivan Exp $
 
 =head1 BUGS
 
@@ -690,11 +689,12 @@ In sub order, the @pkgparts array (passed by reference) is clobbered.
 Also in sub order, no money is adjusted.  Once FS::part_pkg defines a standard
 method to pass dates to the recur_prog expression, it should do so.
 
-FS::svc_acct, FS::svc_acct_sm, and FS::svc_domain are loaded via 'use' at 
-compile time, rather than via 'require' in sub { setup, suspend, unsuspend,
-cancel } because they use %FS::UID::callback to load configuration values.
-Probably need a subroutine which decides what to do based on whether or not
-we've fetched the user yet, rather than a hash.  See FS::UID and the TODO.
+FS::svc_acct, FS::svc_domain, FS::svc_www and FS::svc_forward are loaded via
+'use' at compile time, rather than via 'require' in sub
+{ setup, suspend, unsuspend, cancel } because they use %FS::UID::callback to
+load configuration values.  Probably need a subroutine which decides what to
+do based on whether or not we've fetched the user yet, rather than a hash.
+See FS::UID and the TODO.
 
 Now that things are transactional should the check in the insert method be
 moved to check ?
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 69cd8058b..647666b86 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -819,8 +819,6 @@ tie my %sqlmail_options, 'Tie::IxHash',
 
   },
 
-  'svc_acct_sm' => {},
-
   'svc_forward' => {
     'sqlmail' => {
       'desc' => 'Real-time export to SQL-backed mail server',
diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 959a3f887..7c6acdbcd 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -254,31 +254,6 @@ sub check {
   my @fields = eval { fields( $recref->{svcdb} ) }; #might die
   return "Unknown svcdb!" unless @fields;
 
-##REPLACED BY part_svc_column
-#  my $svcdb;
-#  foreach $svcdb ( qw(
-#    svc_acct svc_acct_sm svc_domain
-#  ) ) {
-#    my @rows = map { /^${svcdb}__(.*)$/; $1 }
-#      grep ! /_flag$/,
-#        grep /^${svcdb}__/,
-#          fields('part_svc');
-#    foreach my $row (@rows) {
-#      unless ( $svcdb eq $recref->{svcdb} ) {
-#        $recref->{$svcdb.'__'.$row}='';
-#        $recref->{$svcdb.'__'.$row.'_flag'}='';
-#        next;
-#      }
-#      $recref->{$svcdb.'__'.$row.'_flag'} =~ /^([DF]?)$/
-#        or return "Illegal flag for $svcdb $row";
-#      $recref->{$svcdb.'__'.$row.'_flag'} = $1;
-#
-#      my $error = $self->ut_anything($svcdb.'__'.$row);
-#      return $error if $error;
-#
-#    }
-#  }
-
   ''; #no error
 }
 
@@ -325,7 +300,7 @@ sub part_export {
 
 =head1 VERSION
 
-$Id: part_svc.pm,v 1.13 2002-04-11 22:05:31 ivan Exp $
+$Id: part_svc.pm,v 1.14 2002-09-17 09:19:06 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index f73ab82da..bd348f8ed 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -18,11 +18,9 @@ use FS::UID qw( datasrc );
 use FS::Conf;
 use FS::Record qw( qsearch qsearchs fields dbh );
 use FS::svc_Common;
-use Net::SSH;
 use FS::cust_svc;
 use FS::part_svc;
 use FS::svc_acct_pop;
-use FS::svc_acct_sm;
 use FS::cust_main_invoice;
 use FS::svc_domain;
 use FS::raddb;
@@ -410,11 +408,6 @@ The corresponding FS::cust_svc record will be deleted as well.
 sub delete {
   my $self = shift;
 
-  if ( defined( $FS::Record::dbdef->table('svc_acct_sm') ) ) {
-    return "Can't delete an account which has (svc_acct_sm) mail aliases!"
-      if $self->uid && qsearch( 'svc_acct_sm', { 'domuid' => $self->uid } );
-  }
-
   return "Can't delete an account which is a (svc_forward) source!"
     if qsearch( 'svc_forward', { 'srcsvc' => $self->svcnum } );
 
@@ -1148,7 +1141,7 @@ probably live somewhere else...
 L<FS::svc_Common>, edit/part_svc.cgi from an installed web interface,
 export.html from the base documentation, L<FS::Record>, L<FS::Conf>,
 L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>, L<FS::queue>,
-L<freeside-queued>), L<Net::SSH>, L<ssh>, L<FS::svc_acct_pop>,
+L<freeside-queued>), L<FS::svc_acct_pop>,
 schema.html from the base documentation.
 
 =cut
diff --git a/FS/FS/svc_acct_sm.pm b/FS/FS/svc_acct_sm.pm
deleted file mode 100644
index c92f1421f..000000000
--- a/FS/FS/svc_acct_sm.pm
+++ /dev/null
@@ -1,260 +0,0 @@
-package FS::svc_acct_sm;
-
-use strict;
-use vars qw( @ISA $nossh_hack $conf $shellmachine @qmailmachines );
-use FS::Record qw( fields qsearch qsearchs );
-use FS::svc_Common;
-use FS::cust_svc;
-use Net::SSH qw(ssh);
-use FS::Conf;
-use FS::svc_acct;
-use FS::svc_domain;
-
-@ISA = qw( FS::svc_Common );
-
-#ask FS::UID to run this stuff for us later
-#$FS::UID::callback{'FS::svc_acct_sm'} = sub { 
-#  $conf = new FS::Conf;
-#  $shellmachine = $conf->exists('qmailmachines')
-#                  ? $conf->config('shellmachine')
-#                  : '';
-#};
-
-=head1 NAME
-
-FS::svc_acct_sm - Object methods for svc_acct_sm records
-
-=head1 SYNOPSIS
-
-  use FS::svc_acct_sm;
-
-  $record = new FS::svc_acct_sm \%hash;
-  $record = new FS::svc_acct_sm { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-  $error = $record->suspend;
-
-  $error = $record->unsuspend;
-
-  $error = $record->cancel;
-
-=head1 WARNING
-
-FS::svc_acct_sm is B<depreciated>.  This class is only included for migration
-purposes.  See L<FS::svc_forward>.
-
-=head1 DESCRIPTION
-
-An FS::svc_acct_sm object represents a virtual mail alias.  FS::svc_acct_sm
-inherits from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item svcnum - primary key (assigned automatcially for new accounts)
-
-=item domsvc - svcnum of the virtual domain (see L<FS::svc_domain>)
-
-=item domuid - uid of the target account (see L<FS::svc_acct>)
-
-=item domuser - virtual username
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new virtual mail alias.  To add the virtual mail alias to the
-database, see L<"insert">.
-
-=cut
-
-sub table { 'svc_acct_sm'; }
-
-=item insert
-
-Adds this virtual mail alias to the database.  If there is an error, returns
-the error, otherwise returns false.
-
-The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
-defined.  An FS::cust_svc record will be created and inserted.
-
- #If the configuration values (see L<FS::Conf>) shellmachine and qmailmachines
- #exist, and domuser is `*' (meaning a catch-all mailbox), the command:
- #
- #  [ -e $dir/.qmail-$qdomain-default ] || {
- #    touch $dir/.qmail-$qdomain-default;
- #    chown $uid:$gid $dir/.qmail-$qdomain-default;
- #  }
- #
- #is executed on shellmachine via ssh (see L<dot-qmail/"EXTENSION ADDRESSES">).
- #This behaviour can be surpressed by setting $FS::svc_acct_sm::nossh_hack true.
-
-=cut
-
-sub insert {
-  my $self = shift;
-  my $error;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  $error=$self->check;
-  return $error if $error;
-
-  return "Domain username (domuser) in use for this domain (domsvc)"
-    if qsearchs('svc_acct_sm',{ 'domuser'=> $self->domuser,
-                                'domsvc' => $self->domsvc,
-                              } );
-
-  return "First domain username (domuser) for domain (domsvc) must be " .
-         qq='*' (catch-all)!=
-    if $self->domuser ne '*'
-       && ! qsearch('svc_acct_sm',{ 'domsvc' => $self->domsvc } )
-       && ! $conf->exists('maildisablecatchall');
-
-  $error = $self->SUPER::insert;
-  return $error if $error;
-
-  #my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } );
-  #my $svc_acct = qsearchs( 'svc_acct', { 'uid' => $self->domuid } );
-  #my ( $uid, $gid, $dir, $domain ) = (
-  #  $svc_acct->uid,
-  #  $svc_acct->gid,
-  #  $svc_acct->dir,
-  #  $svc_domain->domain,
-  #);
-  #my $qdomain = $domain;
-  #$qdomain =~ s/\./:/g; #see manpage for 'dot-qmail': EXTENSION ADDRESSES
-  #ssh("root\@$shellmachine","[ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }")  
-  #  if ( ! $nossh_hack && $shellmachine && $dir && $self->domuser eq '*' );
-
-  ''; #no error
-
-}
-
-=item delete
-
-Deletes this virtual mail alias from the database.  If there is an error,
-returns the error, otherwise returns false.
-
-The corresponding FS::cust_svc record will be deleted as well.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-  my $error;
-
-  return "Domain username (domuser) in use for this domain (domsvc)"
-    if ( $old->domuser ne $new->domuser
-         || $old->domsvc != $new->domsvc
-       )  && qsearchs('svc_acct_sm',{
-         'domuser'=> $new->domuser,
-         'domsvc' => $new->domsvc,
-       } )
-     ;
-
- $new->SUPER::replace($old);
-
-}
-
-=item suspend
-
-Just returns false (no error) for now.
-
-Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item unsuspend
-
-Just returns false (no error) for now.
-
-Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item cancel
-
-Just returns false (no error) for now.
-
-Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
-
-=item check
-
-Checks all fields to make sure this is a valid virtual mail alias.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert and
-replace methods.
-
-Sets any fixed values; see L<FS::part_svc>.
-
-=cut
-
-sub check {
-  my $self = shift;
-  my $error;
-
-  my $x = $self->setfixed;
-  return $x unless ref($x);
-  #my $part_svc = $x;
-
-  my($recref) = $self->hashref;
-
-  $recref->{domuser} =~ /^(\*|[a-z0-9_\-]{2,32})$/
-    or return "Illegal domain username (domuser)";
-  $recref->{domuser} = $1;
-
-  $recref->{domsvc} =~ /^(\d+)$/ or return "Illegal domsvc";
-  $recref->{domsvc} = $1;
-  my($svc_domain);
-  return "Unknown domsvc" unless
-    $svc_domain=qsearchs('svc_domain',{'svcnum'=> $recref->{domsvc} } );
-
-  $recref->{domuid} =~ /^(\d+)$/ or return "Illegal uid";
-  $recref->{domuid} = $1;
-  my($svc_acct);
-  return "Unknown uid" unless
-    $svc_acct=qsearchs('svc_acct',{'uid'=> $recref->{domuid} } );
-
-  ''; #no error
-}
-
-=back
-
-=head1 VERSION
-
-$Id: svc_acct_sm.pm,v 1.5 2001-09-06 20:41:59 ivan Exp $
-
-=head1 BUGS
-
-The remote commands should be configurable.
-
-The $recref stuff in sub check should be cleaned up.
-
-=head1 SEE ALSO
-
-L<FS::svc_forward>
-
-L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
-L<FS::svc_acct>, L<FS::svc_domain>, L<Net::SSH>, L<ssh>, L<dot-qmail>,
-schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 4a250d77b..3cf4c2ba3 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -87,7 +87,6 @@ FS/pkg_svc.pm
 FS/svc_Common.pm
 FS/svc_acct.pm
 FS/svc_acct_pop.pm
-FS/svc_acct_sm.pm
 FS/svc_broadband.pm
 FS/svc_domain.pm
 FS/type_pkgs.pm
@@ -165,7 +164,6 @@ t/radius_usergroup.t
 t/session.t
 t/svc_acct.t
 t/svc_acct_pop.t
-t/svc_acct_sm.t
 t/svc_Common.t
 t/svc_domain.t
 t/svc_forward.t
diff --git a/FS/t/svc_acct_sm.t b/FS/t/svc_acct_sm.t
deleted file mode 100644
index 1082f2cdb..000000000
--- a/FS/t/svc_acct_sm.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::svc_acct_sm;
-$loaded=1;
-print "ok 1\n";
diff --git a/httemplate/docs/schema.dia b/httemplate/docs/schema.dia
index 092d2f88b..c0842a602 100644
Binary files a/httemplate/docs/schema.dia and b/httemplate/docs/schema.dia differ
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 2b8b3a132..54adec3a7 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -248,7 +248,7 @@
       <ul>
         <li>svcpart - primary key
         <li>svc - name of this service
-        <li>svcdb - table used for this service: svc_acct, svc_acct_sm, svc_forward, svc_domain, svc_charge or svc_wo
+        <li>svcdb - table used for this service: svc_acct, svc_forward, svc_domain, svc_charge or svc_wo
         <li>disabled - Disabled flag, empty or `Y'
 <!--        <li><i>table</i>__<i>field</i> - Default or fixed value for <i>field</i> in <i>table</i>
         <li><i>table</i>__<i>field</i>_flag - null, D or F
@@ -347,13 +347,6 @@
         <li>npa - area code
         <li>nxx - exchange
       </ul>
-    <li><a name="svc_acct_sm" href="man/FS/svc_acct_sm.html">svc_acct_sm</a> - <b>DEPRECIATED</b> Domain mail aliases
-      <ul>
-        <li>svcnum - <a href="#cust_svc">primary key</a>
-        <li>domsvc - <a href="#svc_domain">Domain</a> (by svcnum)
-        <li>domuid - <a href="#svc_acct">Account</a> (by uid)
-        <li>domuser - domuser @ <a href="#svc_domain">Domain</a> forwards to <a href="#svc_acct">Account</a>
-      </ul>
     <li><a name="svc_domain" href="man/FS/svc_domain.html">svc_domain</a> - Domains
       <ul>
         <li>svcnum - <a href="#cust_svc">primary key</a>
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index a23107a40..b2862f5a3 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -50,7 +50,6 @@ Disable new orders <INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref-
 Services are items you offer to your customers.
 <UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
     <LI>svc_domain - Domains
-    <LI>svc_acct_sm - <B>deprecated</B> (use svc_forward for new installations) Virtual domain mail aliasing.
     <LI>svc_forward - mail forwarding
     <LI>svc_www - Virtual domain website
     <LI>svc_broadband - Broadband/High-speed Internet service
@@ -102,11 +101,6 @@ my %defs = (
   'svc_domain' => {
     'domain'    => 'Domain',
   },
-  'svc_acct_sm' => {
-    'domuser'   => 'domuser@virtualdomain.com',
-    'domuid'    => 'UID where domuser@virtualdomain.com mail is forwarded',
-    'domsvc'    => 'svcnum from svc_domain for virtualdomain.com',
-  },
   'svc_forward' => {
     'srcsvc'    => 'service from which mail is to be forwarded',
     'dstsvc'    => 'service to which mail is to be forwarded',
@@ -137,7 +131,7 @@ my %defs = (
 
   my @dbs = $hashref->{svcdb}
              ? ( $hashref->{svcdb} )
-             : qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www svc_broadband );
+             : qw( svc_acct svc_domain svc_forward svc_www svc_broadband );
 
   tie my %svcdb, 'Tie::IxHash', map { $_=>$_ } @dbs;
   my $widget = new HTML::Widgets::SelectLayers(
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 69e8ac2fa..9633fabdf 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -17,7 +17,7 @@ my $new = new FS::part_svc ( {
             push @fields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
             map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  } @fields;
           } grep defined( $FS::Record::dbdef->table($_) ),
-                 qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www svc_broadband )
+                 qw( svc_acct svc_domain svc_forward svc_www svc_broadband )
     )
 } );
 
diff --git a/httemplate/edit/process/svc_acct_sm.cgi b/httemplate/edit/process/svc_acct_sm.cgi
deleted file mode 100755
index 41d03fb92..000000000
--- a/httemplate/edit/process/svc_acct_sm.cgi
+++ /dev/null
@@ -1,34 +0,0 @@
-<%
-
-$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-my $svcnum =$1;
-
-my $old = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
-
-#unmunge domsvc and domuid
-#$cgi->param('domsvc',(split(/:/, $cgi->param('domsvc') ))[0] );
-#$cgi->param('domuid',(split(/:/, $cgi->param('domuid') ))[0] );
-
-my $new = new FS::svc_acct_sm ( {
-  map {
-    ($_, scalar($cgi->param($_)));
-  #} qw(svcnum pkgnum svcpart domuser domuid domsvc)
-  } ( fields('svc_acct_sm'), qw( pkgnum svcpart ) )
-} );
-
-my $error = '';
-if ( $svcnum ) {
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-  $svcnum = $new->getfield('svcnum');
-} 
-
-if ($error) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "svc_acct_sm.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/svc_acct_sm.cgi?$svcnum");
-}
-
-%>
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
deleted file mode 100755
index 0fd5f7622..000000000
--- a/httemplate/edit/svc_acct_sm.cgi
+++ /dev/null
@@ -1,178 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
-
-my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct_sm );
-if ( $cgi->param('error') ) {
-  $svc_acct_sm = new FS::svc_acct_sm ( {
-    map { $_, scalar($cgi->param($_)) } fields('svc_acct_sm')
-  } );
-  $svcnum = $svc_acct_sm->svcnum;
-  $pkgnum = $cgi->param('pkgnum');
-  $svcpart = $cgi->param('svcpart');
-  #$part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  #die "No part_svc entry!" unless $part_svc;
-} else {
-  my($query) = $cgi->keywords;
-  if ( $query =~ /^(\d+)$/ ) { #editing
-    $svcnum=$1;
-    $svc_acct_sm=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum})
-      or die "Unknown (svc_acct_sm) svcnum!";
-
-    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-      or die "Unknown (cust_svc) svcnum!";
-
-    $pkgnum=$cust_svc->pkgnum;
-    $svcpart=$cust_svc->svcpart;
-  
-    #$part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    #die "No part_svc entry!" unless $part_svc;
-
-  } else { #adding
-
-    $svc_acct_sm = new FS::svc_acct_sm({});
-
-    foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
-      $pkgnum=$1 if /^pkgnum(\d+)$/;
-      $svcpart=$1 if /^svcpart(\d+)$/;
-    }
-    my $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
-
-    $svcnum='';
-
-    #set fixed and default fields from part_svc
-    foreach my $part_svc_column (
-      grep { $_->columnflag } $part_svc->all_part_svc_column
-    ) {
-      $svc_acct_sm->setfield( $part_svc_column->columnname,
-                              $part_svc_column->columnvalue,
-                            );
-    }
-
-  }
-}
-my $action = $svc_acct_sm->svcnum ? 'Edit' : 'Add';
-
-my %username = ();
-my %domain = ();
-if ($pkgnum) {
-
-  #find all possible uids (and usernames)
-
-  my @u_acct_svcparts = ();
-  foreach my $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
-    push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
-  }
-
-  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-  my($custnum)=$cust_pkg->getfield('custnum');
-  foreach my $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
-    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
-    my($acct_svcpart);
-    foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
-                                              #record(s) in cust_svc ( for this
-                                              #pkgnum ! )
-      my($i_cust_svc);
-      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
-        my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
-        $username{$svc_acct->getfield('uid')}=$svc_acct->getfield('username');
-      }  
-    }
-  }
-
-  #find all possible domains (and domsvc's)
-
-  my @d_acct_svcparts = ();
-  foreach my $d_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_domain'}) ) {
-    push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
-  }
-
-  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
-    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
-    my($acct_svcpart);
-    foreach $acct_svcpart (@d_acct_svcparts) {
-      my($i_cust_svc);
-      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
-        my($svc_domain)=qsearch('svc_domain',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
-        $domain{$svc_domain->getfield('svcnum')}=$svc_domain->getfield('domain');
-      }
-    }
-  }
-
-} elsif ( $action eq 'Edit' ) {
-
-  my($svc_acct)=qsearchs('svc_acct',{'uid'=>$svc_acct_sm->domuid});
-  $username{$svc_acct_sm->uid} = $svc_acct->username;
-
-  my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$svc_acct_sm->domsvc});
-  $domain{$svc_acct_sm->domsvc} = $svc_domain->domain;
-
-} else {
-  die "\$action eq Add, but \$pkgnum is null!\n";
-}
-
-my $p1 = popurl(1);
-print header("Mail Alias $action", '');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print qq!<FORM ACTION="${p1}process/svc_acct_sm.cgi" METHOD=POST>!;
-
-#display
-
-	#formatting
-	print "<PRE>";
-
-#svcnum
-print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
-print qq!Service #<FONT SIZE=+1><B>!, $svcnum ? $svcnum : " (NEW)", "</B></FONT>";
-
-#pkgnum
-print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
- 
-#svcpart
-print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
-
-my($domuser,$domsvc,$domuid)=(
-  $svc_acct_sm->domuser,
-  $svc_acct_sm->domsvc,
-  $svc_acct_sm->domuid,
-);
-
-#domuser
-print qq!\n\nMail to <INPUT TYPE="text" NAME="domuser" VALUE="$domuser"> <I>( * for anything )</I>!;
-
-#domsvc
-print qq! \@ <SELECT NAME="domsvc" SIZE=1>!;
-foreach $_ (keys %domain) {
-  print "<OPTION", $_ eq $domsvc ? " SELECTED" : "",
-        qq! VALUE="$_">$domain{$_}!;
-}
-print "</SELECT>";
-
-#uid
-print qq!\nforwards to <SELECT NAME="domuid" SIZE=1>!;
-foreach $_ (keys %username) {
-  print "<OPTION", ($_ eq $domuid) ? " SELECTED" : "",
-        qq! VALUE="$_">$username{$_}!;
-}
-print "</SELECT>\@$mydomain mailbox.";
-
-	#formatting
-	print "</PRE>\n";
-
-print qq!<CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>!;
-
-print <<END;
-
-    </FORM>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/index.html b/httemplate/index.html
index 2cb707326..f17639d44 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -34,7 +34,6 @@
         <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="phone_on" VALUE="1">Phone # <INPUT TYPE="text" NAME="phone_text"><INPUT TYPE="submit" VALUE="Search"></FORM>
         <BR><FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><SELECT NAME="username_type"><OPTION VALUE="All">(all)</OPTION><OPTION>Fuzzy</OPTION><OPTION>Substring</OPTION><OPTION SELECTED>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A> or <A HREF="search/svc_acct.cgi?uid">uid</A></FORM>
         <BR><FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
-<!--        <LI><A HREF="search/svc_acct_sm.html">mail aliases (by domain, and optionally username)</A>-->
 <!--        <LI><A HREF="search/svc_forward.html">mail forwards (by ?)</A>-->
       <BR>
     </TD></TR>
diff --git a/httemplate/misc/link.cgi b/httemplate/misc/link.cgi
index efc762cc5..79adce88c 100755
--- a/httemplate/misc/link.cgi
+++ b/httemplate/misc/link.cgi
@@ -4,7 +4,6 @@
 my %link_field = (
   'svc_acct'    => 'username',
   'svc_domain'  => 'domain',
-  'svc_acct_sm' => '',
   'svc_charge'  => '',
   'svc_wo'      => '',
 );
diff --git a/httemplate/search/svc_acct_sm.cgi b/httemplate/search/svc_acct_sm.cgi
deleted file mode 100755
index 4ee300612..000000000
--- a/httemplate/search/svc_acct_sm.cgi
+++ /dev/null
@@ -1,84 +0,0 @@
-<%
-
-my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
-
-$cgi->param('domuser') =~ /^([a-z0-9_\-]{0,32})$/;
-my $domuser = $1;
-
-$cgi->param('domain') =~ /^([\w\-\.]+)$/ or die "Illegal domain";
-my $svc_domain = qsearchs('svc_domain',{'domain'=>$1})
-  or die "Unknown domain";
-my $domsvc = $svc_domain->svcnum;
-
-my @svc_acct_sm;
-if ($domuser) {
-  @svc_acct_sm=qsearch('svc_acct_sm',{
-    'domuser' => $domuser,
-    'domsvc'  => $domsvc,
-  });
-} else {
-  @svc_acct_sm=qsearch('svc_acct_sm',{'domsvc' => $domsvc});
-}
-
-if ( scalar(@svc_acct_sm) == 1 ) {
-  my($svcnum)=$svc_acct_sm[0]->svcnum;
-  print $cgi->redirect(popurl(2). "view/svc_acct_sm.cgi?$svcnum");
-} elsif ( scalar(@svc_acct_sm) > 1 ) {
-%>
-<!-- mason kludge -->
-<%
-  print header('Mail Alias Search Results'), &table(), <<END;
-      <TR>
-        <TH>Mail to<BR><FONT SIZE=-1>(click to view mail alias)</FONT></TH>
-        <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
-      </TR>
-END
-
-  my($svc_acct_sm);
-  foreach $svc_acct_sm (@svc_acct_sm) {
-    my($svcnum,$domuser,$domuid,$domsvc)=(
-      $svc_acct_sm->svcnum,
-      $svc_acct_sm->domuser,
-      $svc_acct_sm->domuid,
-      $svc_acct_sm->domsvc,
-    );
-
-    my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $domsvc } );
-    if ( $svc_domain ) {
-      my $domain = $svc_domain->domain;
-
-      print qq!<TR><TD><A HREF="!. popurl(2). qq!view/svc_acct_sm.cgi?$svcnum">!,
-      #print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
-            ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ),
-            qq!\@$domain</A> </TD>!,
-      ;
-    } else {
-      my $warning = "couldn't find svc_domain.svcnum $svcnum ( svc_acct_sm.svcnum $svcnum";
-      warn $warning;
-      print "<TR><TD>WARNING: $warning</TD>";
-    }
-
-    my $svc_acct = qsearchs( 'svc_acct', { 'uid' => $domuid } );
-    if ( $svc_acct ) {
-      my $username = $svc_acct->username;
-      my $svc_acct_svcnum =$svc_acct->svcnum;
-      print qq!<TD><A HREF="!, popurl(2),
-            qq!view/svc_acct.cgi?$svc_acct_svcnum">$username\@$mydomain</A>!,
-            qq!</TD></TR>!
-      ;
-    } else {
-      my $warning = "couldn't find svc_acct.uid $domuid (svc_acct_sm.svcnum $svcnum)!";
-      warn $warning;
-      print "<TD>WARNING: $warning</TD></TR>";
-    }
-
-  }
-
-  print '</TABLE></BODY></HTML>';
-
-} else { #error
-  idiot("Mail Alias not found");
-}
-
-%>
diff --git a/httemplate/search/svc_acct_sm.html b/httemplate/search/svc_acct_sm.html
deleted file mode 100755
index 0719856db..000000000
--- a/httemplate/search/svc_acct_sm.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Mail Alias Search</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Mail Alias Search</H1>
-    </CENTER>
-    <HR>
-    <FORM ACTION="svc_acct_sm.cgi" METHOD="post">
-      Search for <B>mail alias</B>: 
-      <INPUT TYPE="text" NAME="domuser"><FONT SIZE=-1>(opt.)</FONT> @
-      <INPUT TYPE="text" NAME="domain"><FONT SIZE=-1>(req.)</FONT>
-
-      <P><INPUT TYPE="submit" VALUE="Search">
-
-    </FORM>
-
-  <HR>
-
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index fb372db14..0bb39f191 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -67,18 +67,6 @@ END
       $svc_domain->svcnum,
       $svc_domain->domain,
     );
-    #my($malias);
-    #if ( qsearch('svc_acct_sm',{'domsvc'=>$svcnum}) ) {
-    #  $malias=(
-    #    qq|<FORM ACTION="svc_acct_sm.cgi" METHOD="post">|.
-    #      qq|<INPUT TYPE="hidden" NAME="domuser" VALUE="">|.
-    #      qq|<INPUT TYPE="hidden" NAME="domain" VALUE="$domain">|.
-    #      qq|<INPUT TYPE="submit" VALUE="(mail aliases)">|.
-    #      qq|</FORM>|
-    #  );
-    #} else {
-    #  $malias='';
-    #}
 
     my @svc_acct=qsearch('svc_acct',{'domsvc' => $svcnum});
     my $rowspan = 0;
diff --git a/httemplate/view/svc_acct_sm.cgi b/httemplate/view/svc_acct_sm.cgi
deleted file mode 100755
index 4e5acc427..000000000
--- a/httemplate/view/svc_acct_sm.cgi
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
-
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $svcnum = $1;
-my $svc_acct_sm = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum});
-die "Unknown svcnum" unless $svc_acct_sm;
-
-my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-my $pkgnum = $cust_svc->getfield('pkgnum');
-my($cust_pkg, $custnum);
-if ($pkgnum) {
-  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-  $custnum=$cust_pkg->getfield('custnum');
-} else {
-  $cust_pkg = '';
-  $custnum = '';
-}
-
-my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
-  or die "Unkonwn svcpart";
-
-print header('Mail Alias View', menubar(
-  ( ( $pkgnum || $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-      )
-    : ( "Cancel this (unaudited) account" =>
-          "${p}misc/cancel-unaudited.cgi?$svcnum" )
-  ),
-  "Main menu" => $p,
-));
-
-my($domsvc,$domuid,$domuser) = (
-  $svc_acct_sm->domsvc,
-  $svc_acct_sm->domuid,
-  $svc_acct_sm->domuser,
-);
-my $svc = $part_svc->svc;
-my $svc_domain = qsearchs('svc_domain',{'svcnum'=>$domsvc})
-  or die "Corrupted database: no svc_domain.svcnum matching domsvc $domsvc";
-my $domain = $svc_domain->domain;
-my $svc_acct = qsearchs('svc_acct',{'uid'=>$domuid})
-  or die "Corrupted database: no svc_acct.uid matching domuid $domuid";
-my $username = $svc_acct->username;
-
-print qq!<A HREF="${p}edit/svc_acct_sm.cgi?$svcnum">Edit this information</A>!,
-      "<BR>Service #$svcnum",
-      "<BR>Service: <B>$svc</B>",
-      qq!<BR>Mail to <B>!, ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ) , qq!</B>\@<B>$domain</B> forwards to <B>$username</B>\@$mydomain mailbox.!,
-      '</BODY></HTML>'
-;
-
-%>
-- 
cgit v1.2.1


From 0c9f7a9f0e0cb21407051b7804f8454e85421f14 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Sep 2002 10:21:47 +0000
Subject: remove obsolete cybercash support

---
 FS/FS/Conf.pm                       |   7 ---
 FS/FS/cust_bill.pm                  | 103 +-----------------------------------
 httemplate/edit/part_bill_event.cgi |   6 ---
 3 files changed, 2 insertions(+), 114 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e50cb29b9..36ee69a36 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -289,13 +289,6 @@ httemplate/docs/config.html
     'type'        => 'text',
   },
 
-  {
-    'key'         => 'cybercash3.2',
-    'section'     => 'billing',
-    'description' => '<a href="http://www.cybercash.com/cashregister/">CyberCash Cashregister v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly\' or `mauthcapture\').',
-    'type'        => 'textarea',
-  },
-
   {
     'key'         => 'cyrus',
     'section'     => 'deprecated',
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 52fc94235..258b32e15 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -35,28 +35,7 @@ $FS::UID::callback{'FS::cust_bill'} = sub {
   $invoice_from = $conf->config('invoice_from');
   $smtpmachine = $conf->config('smtpmachine');
 
-  if ( $conf->exists('cybercash3.2') ) {
-    require CCMckLib3_2;
-      #qw($MCKversion %Config InitConfig CCError CCDebug CCDebug2);
-    require CCMckDirectLib3_2;
-      #qw(SendCC2_1Server);
-    require CCMckErrno3_2;
-      #qw(MCKGetErrorMessage $E_NoErr);
-    import CCMckErrno3_2 qw($E_NoErr);
-
-    my $merchant_conf;
-    ($merchant_conf,$xaction)= $conf->config('cybercash3.2');
-    my $status = &CCMckLib3_2::InitConfig($merchant_conf);
-    if ( $status != $E_NoErr ) {
-      warn "CCMckLib3_2::InitConfig error:\n";
-      foreach my $key (keys %CCMckLib3_2::Config) {
-        warn "  $key => $CCMckLib3_2::Config{$key}\n"
-      }
-      my($errmsg) = &CCMckErrno3_2::MCKGetErrorMessage($status);
-      die "CCMckLib3_2::InitConfig fatal error: $errmsg\n";
-    }
-    $processor='cybercash3.2';
-  } elsif ( $conf->exists('business-onlinepayment') ) {
+  if ( $conf->exists('business-onlinepayment') ) {
     ( $bop_processor,
       $bop_login,
       $bop_password,
@@ -800,84 +779,6 @@ sub realtime_card {
 
 }
 
-=item realtime_card_cybercash
-
-Attempts to pay this invoice with the CyberCash CashRegister realtime gateway.
-
-=cut
-
-sub realtime_card_cybercash {
-  my $self = shift;
-  my $cust_main = $self->cust_main;
-  my $amount = $self->owed;
-
-  return "CyberCash CashRegister real-time card processing not enabled!"
-    unless $processor eq 'cybercash3.2';
-
-  my $address = $cust_main->address1;
-  $address .= ", ". $cust_main->address2 if $cust_main->address2;
-
-  #fix exp. date
-  #$cust_main->paydate =~ /^(\d+)\/\d*(\d{2})$/;
-  $cust_main->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
-  my $exp = "$2/$1";
-
-  #
-
-  my $paybatch = $self->invnum. 
-                  '-' . time2str("%y%m%d%H%M%S", time);
-
-  my $payname = $cust_main->payname ||
-                $cust_main->getfield('first').' '.$cust_main->getfield('last');
-
-  my $country = $cust_main->country eq 'US' ? 'USA' : $cust_main->country;
-
-  my @full_xaction = ( $xaction,
-    'Order-ID'     => $paybatch,
-    'Amount'       => "usd $amount",
-    'Card-Number'  => $cust_main->getfield('payinfo'),
-    'Card-Name'    => $payname,
-    'Card-Address' => $address,
-    'Card-City'    => $cust_main->getfield('city'),
-    'Card-State'   => $cust_main->getfield('state'),
-    'Card-Zip'     => $cust_main->getfield('zip'),
-    'Card-Country' => $country,
-    'Card-Exp'     => $exp,
-  );
-
-  my %result;
-  %result = &CCMckDirectLib3_2::SendCC2_1Server(@full_xaction);
-  
-  if ( $result{'MStatus'} eq 'success' ) { #cybercash smps v.2 or 3
-    my $cust_pay = new FS::cust_pay ( {
-       'invnum'   => $self->invnum,
-       'paid'     => $amount,
-       '_date'     => '',
-       'payby'    => 'CARD',
-       'payinfo'  => $cust_main->payinfo,
-       'paybatch' => "$processor:$paybatch",
-    } );
-    my $error = $cust_pay->insert;
-    if ( $error ) {
-      # gah, even with transactions.
-      my $e = 'WARNING: Card debited but database not updated - '.
-              'error applying payment, invnum #' . $self->invnum.
-              " (CyberCash Order-ID $paybatch): $error";
-      warn $e;
-      return $e;
-    } else {
-      return '';
-    }
-#  } elsif ( $result{'Mstatus'} ne 'failure-bad-money'
-#            || $options{'report_badcard'}
-#          ) {
-  } else {
-     return 'Cybercash error, invnum #' . 
-       $self->invnum. ':'. $result{'MErrMsg'};
-  }
-
-}
-
 =item batch_card
 
 Adds a payment for this invoice to the pending credit card batch (see
@@ -1130,7 +1031,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.44 2002-09-17 00:40:07 ivan Exp $
+$Id: cust_bill.pm,v 1.45 2002-09-17 10:21:47 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index a10a186a9..1b20ef1d2 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -108,12 +108,6 @@ tie my %events, 'Tie::IxHash',
     'weight' => 30,
   },
 
-  'realtime-card-cybercash' => {
-    'name' => '(<b>deprecated</b>) Run card with <a href="http://www.cybercash.com/cashregister">CyberCash CashRegister</a> realtime gateway',
-    'code' => '$cust_bill->realtime_card_cybercash();',
-    'weight' => 30,
-  },
-
   'batch-card' => {
     'name' => 'Add card to the pending credit card batch',
     'code' => '$cust_bill->batch_card();',
-- 
cgit v1.2.1


From 63f70756521f544ce1a1a36ae9847dc9865e17f4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 18 Sep 2002 12:10:07 +0000
Subject: doc

---
 httemplate/docs/index.html    |  3 --
 httemplate/docs/legacy.html   |  3 +-
 httemplate/docs/upgrade4.html | 27 ------------------
 httemplate/docs/upgrade5.html | 34 ----------------------
 httemplate/docs/upgrade6.html | 66 -------------------------------------------
 5 files changed, 2 insertions(+), 131 deletions(-)
 delete mode 100644 httemplate/docs/upgrade4.html
 delete mode 100644 httemplate/docs/upgrade5.html
 delete mode 100644 httemplate/docs/upgrade6.html

diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html
index eaa5b9b92..8f6f91378 100644
--- a/httemplate/docs/index.html
+++ b/httemplate/docs/index.html
@@ -6,9 +6,6 @@
 <img src="overview.png">
 <ul>
   <li><a href="install.html">New Installation</a>
-  <li><a href="upgrade4.html">Upgrading from 1.2.x to 1.2.2</a>
-  <li><a href="upgrade5.html">Upgrading from 1.2.2 to 1.2.3</a>
-  <li><a href="upgrade6.html">Upgrading from 1.2.3 to 1.3.0</a>
   <li><a href="upgrade7.html">Upgrading from 1.3.0 to 1.3.1</a>
   <li><a href="upgrade8.html">Upgrading from 1.3.1 to 1.4.0</a>
   <li><a href="upgrade9.html">Upgrading from 1.4.0 to 1.4.1</a>
diff --git a/httemplate/docs/legacy.html b/httemplate/docs/legacy.html
index 2db9edb0f..678780962 100755
--- a/httemplate/docs/legacy.html
+++ b/httemplate/docs/legacy.html
@@ -17,11 +17,12 @@
       <li>POP mail accounts have entries in passwd only, and have a particular shell.
       <li>Everything else in passwd is a shell account.
     </ul>
-  <li><a name="svc_acct_sm">bin/svc_acct_sm.import</a> - Import qmail ( `virtualdomains' and `rcpthosts' ), or sendmail ( `virtusertable' and `sendmail.cw' ) files.  Before running bin/svc_acct_sm.import, you need <a href="../browse/part_svc.cgi">services</a> as follows:
+<!--  <li><a name="svc_acct_sm">bin/svc_acct_sm.import</a> - Import qmail ( `virtualdomains' and `rcpthosts' ), or sendmail ( `virtusertable' and `sendmail.cw' ) files.  Before running bin/svc_acct_sm.import, you need <a href="../browse/part_svc.cgi">services</a> as follows:
     <ul>
       <li>Domain (table svc_acct)
       <li>Mail alias (table svc_acct_sm)
     </ul>
+-->
   <li><a name="cust_main">Importing customer data</a>
     <ul>
       <li>Manually
diff --git a/httemplate/docs/upgrade4.html b/httemplate/docs/upgrade4.html
deleted file mode 100644
index 1d70f8b73..000000000
--- a/httemplate/docs/upgrade4.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<head>
-  <title>Upgrading to 1.2.2</title>
-</head>
-<body>
-<h1>Upgrading to 1.2.2 from 1.2.x</h1>
-<ul>
-  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
-  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
-  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
-  <li>Back up your data and current Freeside installation.
-  <li>Install the Perl modules <a href="http://www.perl.com/CPAN/modules/by-module/Locale/">Locale-Codes</a> and <a href="http://www.perl.com/CPAN/modules/by-module/Net/">Net-Whois</a>.
-  <li>Apply the following changes to your database:
-<pre>
-ALTER TABLE cust_pay_batch CHANGE exp exp VARCHAR(11);
-</pre>
-  <li>Copy or symlink htdocs to the new copy.
-  <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
-  <li>Change to the FS directory in the new tarball, and build and install the
-      Perl modules:
-    <pre>
-$ cd FS/
-$ perl Makefile.PL
-$ make
-$ su
-# make install</pre>
-  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
-</body>
diff --git a/httemplate/docs/upgrade5.html b/httemplate/docs/upgrade5.html
deleted file mode 100644
index 3f3431653..000000000
--- a/httemplate/docs/upgrade5.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<head>
-  <title>Upgrading to 1.3.0</title>
-</head>
-<body>
-<h1>Upgrading to 1.2.3 from 1.2.2</h1>
-<ul>
-  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
-  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
-  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
-  <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
-  <li>Back up your data and current Freeside installation.
-  <li>Apply the following changes to your database:
-<pre>
-ALTER TABLE svc_acct_pop ADD loc CHAR(4);
-CREATE TABLE prepay_credit (
-  prepaynum int NOT NULL,
-  identifier varchar(80) NOT NULL,
-  amount decimal(10,2) NOT NULL,
-  PRIMARY KEY (prepaynum),
-  INDEX (identifier)
-);
-</pre>
-  <li>Copy or symlink htdocs to the new copy.
-  <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
-  <li>Change to the FS directory in the new tarball, and build and install the
-      Perl modules:
-    <pre>
-$ cd FS/
-$ perl Makefile.PL
-$ make
-$ su
-# make install</pre>
-  <li>Run bin/dbdef-create.  This file uses MySQL-specific syntax.  If you are running a different database engine you will need to modify it slightly.
-</body>
diff --git a/httemplate/docs/upgrade6.html b/httemplate/docs/upgrade6.html
deleted file mode 100644
index dc82975f3..000000000
--- a/httemplate/docs/upgrade6.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<head>
-  <title>Upgrading to 1.3.0</title>
-</head>
-<body>
-<h1>Upgrading to 1.3.0 from 1.2.3</h1>
-<ul>
-  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
-  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
-  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
-  <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
-  <li>If migrating from less than 1.2.3, see these <a href="upgrade5.html">instructions</a> first.
-  <li>Back up your data and current Freeside installation.
-  <li>As 1.3.0 requires transactions, <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are no longer supported</b>.  Converting to <a href="http://www.postgresql.org/">PostgreSQL</a> is recommended.  If you really want to use MySQL, convert your tables to one of the <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a>.
-  <li>Copy the <i>invoice_template</i> file from the <i>conf/</i> directory in the distribution to your <a href="config.html">configuration directory</a>.
-  <li>Install the <a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>, <a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>, <a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>, <a href="http://search.cpan.org/search?dist=String-ShellQuote">String-ShellQuote</a> and <a href="http://search.cpan.org/search?dist=Net-SCP">Net-SCP</a> Perl modules.
-  <li>Apply the following changes to your database:
-<pre>
-CREATE TABLE domain_record (
-  recnum int NOT NULL,
-  svcnum int NOT NULL,
-  reczone varchar(80) NOT NULL,
-  recaf char(2) NOT NULL,
-  rectype char(5) NOT NULL,
-  recdata varchar(80) NOT NULL,
-  PRIMARY KEY (recnum)
-);
-CREATE TABLE svc_www (
-  svcnum int NOT NULL,
-  recnum int NOT NULL,
-  usersvc int NOT NULL,
-  PRIMARY KEY (svcnum)
-);
-ALTER TABLE part_svc ADD svc_www__recnum varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_www__recnum_flag char(1) NULL;
-ALTER TABLE part_svc ADD svc_www__usersvc varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_www__uesrsvc_flag char(1) NULL;
-ALTER TABLE svc_acct CHANGE _password _password varchar(50) NULL;
-ALTER TABLE svc_acct ADD seconds integer NULL;
-ALTER TABLE part_svc ADD svc_acct__seconds integer NULL;
-ALTER TABLE part_svc ADD svc_acct__seconds_flag char(1) NULL;
-ALTER TABLE prepay_credit ADD seconds integer NULL;
-
-</pre>
-  <li>If your database supports dropping columns:
-<pre>
-ALTER TABLE cust_bill DROP owed;
-ALTER TABLE cust_credit DROP credited;
-</pre>
-     Or, if your database does not support dropping columns, you can do this:
-<pre>
-ALTER TABLE cust_bill CHANGE owed depriciated decimal(10,2);
-ALTER TABLE cust_credit CHANGE credited depriciated2 decimal(10,2);
-</pre>
-
-  <li>Copy or symlink htdocs to the new copy.
-  <li>Remove the symlink or directory <i>(your_site_perl_directory)</i>/FS.
-  <li>Change to the FS directory in the new tarball, and build and install the
-      Perl modules:
-    <pre>
-$ cd FS/
-$ perl Makefile.PL
-$ make
-$ su
-# make install</pre>
-  <li>Run bin/dbdef-create.
-</body>
-- 
cgit v1.2.1


From 89d15555270a63ab09116107f3dc327e86d831c5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 18 Sep 2002 22:39:01 +0000
Subject: removing svc_acct_sm

---
 FS/FS/cust_svc.pm   | 8 +-------
 FS/FS/svc_domain.pm | 4 ----
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index d54fb2d40..9d510b38a 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -9,7 +9,6 @@ use FS::part_pkg;
 use FS::part_svc;
 use FS::pkg_svc;
 use FS::svc_acct;
-use FS::svc_acct_sm;
 use FS::svc_domain;
 use FS::svc_forward;
 use FS::domain_record;
@@ -276,11 +275,6 @@ sub label {
   my $tag;
   if ( $svcdb eq 'svc_acct' ) {
     $tag = $svc_x->email;
-  } elsif ( $svcdb eq 'svc_acct_sm' ) {
-    my $domuser = $svc_x->domuser eq '*' ? '(anything)' : $svc_x->domuser;
-    my $svc_domain = qsearchs ( 'svc_domain', { 'svcnum' => $svc_x->domsvc } );
-    my $domain = $svc_domain->domain;
-    $tag = "$domuser\@$domain";
   } elsif ( $svcdb eq 'svc_forward' ) {
     my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $svc_x->srcsvc } );
     $tag = $svc_acct->email. '->';
@@ -346,7 +340,7 @@ sub seconds_since {
 
 =head1 VERSION
 
-$Id: cust_svc.pm,v 1.16 2002-09-09 23:01:35 khoff Exp $
+$Id: cust_svc.pm,v 1.17 2002-09-18 22:39:01 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 637d0493c..0d71b2775 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -251,10 +251,6 @@ sub delete {
   return "Can't delete a domain which has accounts!"
     if qsearch( 'svc_acct', { 'domsvc' => $self->svcnum } );
 
-  return "Can't delete a domain with (svc_acct_sm) mail aliases!"
-    if defined( $FS::Record::dbdef->table('svc_acct_sm') )
-       && qsearch('svc_acct_sm', { 'domsvc' => $self->svcnum } );
-
   #return "Can't delete a domain with (domain_record) zone entries!"
   #  if qsearch('domain_record', { 'svcnum' => $self->svcnum } );
 
-- 
cgit v1.2.1


From c1e33a61324f4e06157c522af7882a97a021830f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 18 Sep 2002 22:50:44 +0000
Subject: remove domain config file, closes: Bug#269

---
 FS/FS/Conf.pm                    |  7 -------
 FS/FS/cust_main_invoice.pm       |  9 +--------
 FS/FS/svc_acct.pm                | 14 ++++----------
 FS/bin/freeside-email            |  6 ++----
 httemplate/edit/svc_forward.cgi  |  1 -
 httemplate/search/svc_acct.cgi   | 25 ++++---------------------
 httemplate/search/svc_domain.cgi |  1 -
 httemplate/view/svc_acct.cgi     |  7 +------
 8 files changed, 12 insertions(+), 58 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 36ee69a36..e9defdafd 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -331,13 +331,6 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
-  {
-    'key'         => 'domain',
-    'section'     => 'deprecated',
-    'description' => 'Your domain name.',
-    'type'        => 'text',
-  },
-
   {
     'key'         => 'editreferrals',
     'section'     => 'UI',
diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm
index a5533a088..bcb1437af 100644
--- a/FS/FS/cust_main_invoice.pm
+++ b/FS/FS/cust_main_invoice.pm
@@ -134,13 +134,6 @@ sub checkdest {
       unless qsearchs( 'svc_acct', { 'svcnum' => $self->dest } );
   } elsif ( $self->dest =~ /^([\w\.\-\&\+]+)\@(([\w\.\-]+\.)+\w+)$/ ) {
     my($user, $domain) = ($1, $2);
-#    if ( $domain eq $mydomain ) {
-#      my $svc_acct = qsearchs( 'svc_acct', { 'username' => $user } );
-#      return "Unknown local account: $user\@$domain (specified literally)"
-#        unless $svc_acct;
-#      $svc_acct->svcnum =~ /^(\d+)$/ or die "Non-numeric svcnum?!";
-#      $self->dest($1);
-#    }
     $self->dest("$1\@$2");
   } else {
     return gettext("illegal_email_invoice_address");
@@ -170,7 +163,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.12 2002-04-12 13:22:02 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.13 2002-09-18 22:50:44 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index bd348f8ed..420c6f422 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -7,7 +7,6 @@ use vars qw( @ISA $noexport_hack $conf
              $username_ampersand $username_letter $username_letterfirst
              $username_noperiod $username_nounderscore $username_nodash
              $username_uppercase
-             $mydomain
              $welcome_template $welcome_from $welcome_subject $welcome_mimetype
              $smtpmachine
              $dirhash
@@ -48,7 +47,6 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
   $username_nodash = $conf->exists('username-nodash');
   $username_uppercase = $conf->exists('username-uppercase');
   $username_ampersand = $conf->exists('username-ampersand');
-  $mydomain = $conf->config('domain');
   $dirhash = $conf->config('dirhash') || 0;
   if ( $conf->exists('welcome_email') ) {
     $welcome_template = new Text::Template (
@@ -875,14 +873,10 @@ Returns the domain associated with this account.
 
 sub domain {
   my $self = shift;
-  if ( $self->domsvc ) {
-    #$self->svc_domain->domain;
-    my $svc_domain = $self->svc_domain
-      or die "no svc_domain.svcnum for svc_acct.domsvc ". $self->domsvc;
-    $svc_domain->domain;
-  } else {
-    $mydomain or die "svc_acct.domsvc is null and no legacy domain config file";
-  }
+  die "svc_acct.domsvc is null for svcnum ". $self->svcnum unless $self->domsvc;
+  my $svc_domain = $self->svc_domain
+    or die "no svc_domain.svcnum for svc_acct.domsvc ". $self->domsvc;
+  $svc_domain->domain;
 }
 
 =item svc_domain
diff --git a/FS/bin/freeside-email b/FS/bin/freeside-email
index c7ff41114..400dc2ac7 100755
--- a/FS/bin/freeside-email
+++ b/FS/bin/freeside-email
@@ -12,11 +12,9 @@ my $user = shift or die &usage;
 adminsuidsetup $user;
 
 my $conf = new FS::Conf;
-my $domain = $conf->config('domain');
 
 my @svc_acct = qsearch('svc_acct', {});
-my @usernames = map $_->username, @svc_acct;
-my @emails = map "$_\@$domain", @usernames;
+my @emails = map $_->email, @svc_acct;
 
 print join("\n", @emails), "\n";
 
@@ -51,7 +49,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-email,v 1.1 2001-05-15 07:52:34 ivan Exp $
+$Id: freeside-email,v 1.2 2002-09-18 22:50:44 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index bc19fe1de..0d815b9e5 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -2,7 +2,6 @@
 <%
 
 my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
 
 my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_forward);
 if ( $cgi->param('error') ) {
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 549231d3f..dcf261296 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,7 +1,5 @@
 <%
 
-my $mydomain = '';
-
 my $conf = new FS::Conf;
 my $maxrecords = $conf->config('maxsearchrecordsperpage');
 
@@ -147,14 +145,8 @@ END
       $domain = "<A HREF=\"${p}view/svc_domain.cgi?". $svc_domain->svcnum.
                 "\">". $svc_domain->domain. "</A>";
     } else {
-      unless ( $mydomain ) {
-        my $conf = new FS::Conf;
-        unless ( $mydomain = $conf->config('domain') ) {
-          die "No legacy domain config file and no svc_domain.svcnum record ".
-              "for svc_acct.domsvc: ". $svc_acct->domsvc;
-        }
-      }
-      $domain = "<i>$mydomain</i><FONT COLOR=\"#FF0000\">*</FONT>";
+      die "No svc_domain.svcnum record for svc_acct.domsvc: ".'
+          $svc_acct->domsvc;
     }
     my($cust_pkg,$cust_main);
     if ( $cust_svc->pkgnum ) {
@@ -216,17 +208,8 @@ END
 
   }
  
-  print "</TABLE>$pager<BR>";
-
-  if ( $mydomain ) {
-    print "<BR><FONT COLOR=\"#FF0000\">*</FONT> The <I>$mydomain</I> domain ".
-          "is contained in your legacy <CODE>domain</CODE> ".
-          "<A HREF=\"${p}docs/config.html#domain\">configuration file</A>.  ".
-          "You should run the <CODE>bin/fs-migrate-svc_acct_sm</CODE> script ".
-          "to create a proper svc_domain record for this domain.";
-  }
-
-  print '</BODY></HTML>';
+  print "</TABLE>$pager<BR>".
+        '</BODY></HTML>';
 
 }
 
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index 0bb39f191..60f1f8c81 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -1,7 +1,6 @@
 <%
 
 my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
 
 my($query)=$cgi->keywords;
 $query ||= ''; #to avoid use of unitialized value errors
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 19953bafd..df55e85bf 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -2,7 +2,6 @@
 <%
 
 my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
 
 my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
@@ -32,11 +31,7 @@ if ( $svc_acct->domsvc ) {
   die "Unknown domain" unless $svc_domain;
   $domain = $svc_domain->domain;
 } else {
-  unless ( $mydomain ) {
-    die "No legacy domain config file and no svc_domain.svcnum record ".
-        "for svc_acct.domsvc: ". $cust_svc->domsvc;
-  }
-  $domain = $mydomain;
+  die "No svc_domain.svcnum record for svc_acct.domsvc: ". $cust_svc->domsvc;
 }
 
 %>
-- 
cgit v1.2.1


From 641abe71e152f194c551d21ceeb26c15265795f6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 19 Sep 2002 07:15:03 +0000
Subject: cancel later in view UI... hmm

---
 httemplate/view/cust_pkg.cgi | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index 09a2a7a8b..aa3b3b15a 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -83,12 +83,14 @@ print  '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
       '</TABLE></TD></TR></TABLE>'
 ;
 
-#  print <<END;
-#<FORM ACTION="../misc/expire_pkg.cgi" METHOD="post">
-#<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
-#Expire (date): <INPUT TYPE="text" NAME="date" VALUE="" >
-#<INPUT TYPE="submit" VALUE="Cancel later">
-#END
+unless ($expire) {
+  print <<END;
+<FORM ACTION="../misc/expire_pkg.cgi" METHOD="post">
+<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
+Expire (date): <INPUT TYPE="text" NAME="date" VALUE="" >
+<INPUT TYPE="submit" VALUE="Cancel later">
+END
+}
 
 unless ($cancel) {
 
-- 
cgit v1.2.1


From cf730711a39c28c720d475cc9e3a94d712c2b798 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 19 Sep 2002 08:34:41 +0000
Subject: remove extra definition of $cust_pkg

---
 FS/FS/svc_acct.pm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 420c6f422..991bbef48 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -340,8 +340,6 @@ sub insert {
   my $cust_pkg = $self->cust_svc->cust_pkg;
   my $cust_main = $cust_pkg->cust_main;
 
-  my $cust_pkg = $self->cust_svc->cust_pkg;
-
   if ( $conf->exists('emailinvoiceauto') ) {
     my @invoicing_list = $cust_main->invoicing_list;
     push @invoicing_list, $self->email;
-- 
cgit v1.2.1


From 0f5ad6c181cccbbdec6c48ea74e41d92ef5e3a26 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 19 Sep 2002 08:43:03 +0000
Subject: package expiration

---
 FS/bin/freeside-daily | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 142b0c73a..22bf2c963 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -28,15 +28,23 @@ my($time)= $opt_d ? str2time($opt_d) : $^T;
 my($cust_main,%saw);
 foreach $cust_main ( @cust_main ) {
 
-  my $error;
+  # $^T not $time because -d is for pre-printing invoices
+  foreach my $cust_pkg (
+    grep { $_->expire && $_->expire >= $^T } $cust_main->ncancelled_pkgs
+  ) {
+    my $error = $cust_pkg->cancel;
+    warn "Error cancelling expired pkg ". $cust_pkg->pkgnum. " for custnum ".
+         $cust_main->custnum. ": $error"
+      if $error;
+  }
 
-  $error = $cust_main->bill( 'time' => $time );
+  my $error = $cust_main->bill( 'time' => $time );
   warn "Error billing, custnum ". $cust_main->custnum. ": $error" if $error;
 
   $cust_main->apply_payments;
   $cust_main->apply_credits;
 
-  $error=$cust_main->collect( 'invoice_time' => $time );
+  $error = $cust_main->collect( 'invoice_time' => $time );
   warn "Error collecting, custnum". $cust_main->custnum. ": $error" if $error;
 
 }
-- 
cgit v1.2.1


From c956b311e4cb0c7db17e3da9c5f2449ff07fd7de Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 19 Sep 2002 13:25:27 +0000
Subject: preliminary upgrade instructions

---
 README.1.5.0pre1 | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 README.1.5.0pre1

diff --git a/README.1.5.0pre1 b/README.1.5.0pre1
new file mode 100644
index 000000000..776899e31
--- /dev/null
+++ b/README.1.5.0pre1
@@ -0,0 +1,12 @@
+preliminary upgrade instructions
+
+schema changes:
+  *** get svc_broadband changes from pc-intouch
+  *** otaker changes
+  *** optional: sequence changes
+
+install DBIx::DBSchema 0.21
+
+Run dbdef-create
+something about history tables
+Restart apache and freeside-queued
-- 
cgit v1.2.1


From 4c5b1b08168b20da1a87e9b82ee87ad18cb3ddd6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 19 Sep 2002 13:34:52 +0000
Subject: use database SERIAL or AUTO_INCREMENT for primary keys, finally, yay!
 closes: bug#69

---
 FS/FS/Record.pm  | 142 ++++++++++++++++++++++++++++++++++++++-----------------
 bin/dbdef-create |   4 +-
 bin/fs-setup     | 123 ++++++++++++++++-------------------------------
 3 files changed, 143 insertions(+), 126 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index c247ed2db..8778dee79 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -9,8 +9,8 @@ use Carp qw(carp cluck croak confess);
 use File::CounterFile;
 use Locale::Country;
 use DBI qw(:sql_types);
-use DBIx::DBSchema 0.19;
-use FS::UID qw(dbh checkruid getotaker datasrc driver_name);
+use DBIx::DBSchema 0.21;
+use FS::UID qw(dbh getotaker datasrc driver_name);
 use FS::SearchCache;
 use FS::Msgcat qw(gettext);
 
@@ -60,14 +60,12 @@ FS::Record - Database record objects
     $hashref = $record->hashref;
 
     $error = $record->insert;
-    #$error = $record->add; #deprecated
 
     $error = $record->delete;
-    #$error = $record->del; #deprecated
 
     $error = $new_record->replace($old_record);
-    #$error = $new_record->rep($old_record); #deprecated
 
+    # external use deprecated - handled by the database (at least for Pg, mysql)
     $value = $record->unique('column');
 
     $error = $record->ut_float('column');
@@ -88,7 +86,7 @@ FS::Record - Database record objects
 
     $quoted_value = _quote($value,'table','field');
 
-    #depriciated
+    #deprecated
     $fields = hfields('table');
     if ( $fields->{Field} ) { # etc.
 
@@ -167,7 +165,7 @@ sub create {
   my $self = {};
   bless ($self, $class);
   if ( defined $self->table ) {
-    cluck "create constructor is depriciated, use new!";
+    cluck "create constructor is deprecated, use new!";
     $self->new(@_);
   } else {
     croak "FS::Record::create called (not from a subclass)!";
@@ -212,25 +210,25 @@ sub qsearch {
       my $op = '=';
       if ( ref($record->{$_}) ) {
         $op = $record->{$_}{'op'} if $record->{$_}{'op'};
-        $op = 'LIKE' if $op =~ /^ILIKE$/i && driver_name !~ /^Pg$/i;
+        $op = 'LIKE' if $op =~ /^ILIKE$/i && driver_name ne 'Pg';
         $record->{$_} = $record->{$_}{'value'}
       }
 
       if ( ! defined( $record->{$_} ) || $record->{$_} eq '' ) {
         if ( $op eq '=' ) {
-          if ( driver_name =~ /^Pg$/i ) {
+          if ( driver_name eq 'Pg' ) {
             qq-( $_ IS NULL OR $_ = '' )-;
           } else {
             qq-( $_ IS NULL OR $_ = "" )-;
           }
         } elsif ( $op eq '!=' ) {
-          if ( driver_name =~ /^Pg$/i ) {
+          if ( driver_name eq 'Pg' ) {
             qq-( $_ IS NOT NULL AND $_ != '' )-;
           } else {
             qq-( $_ IS NOT NULL AND $_ != "" )-;
           }
         } else {
-          if ( driver_name =~ /^Pg$/i ) {
+          if ( driver_name eq 'Pg' ) {
             qq-( $_ $op '' )-;
           } else {
             qq-( $_ $op "" )-;
@@ -345,7 +343,7 @@ Returns the table name.
 =cut
 
 sub table {
-#  cluck "warning: FS::Record::table depriciated; supply one in subclass!";
+#  cluck "warning: FS::Record::table deprecated; supply one in subclass!";
   my $self = shift;
   $self -> {'Table'};
 }
@@ -472,24 +470,33 @@ sub insert {
   return $error if $error;
 
   #single-field unique keys are given a value if false
-  #(like MySQL's AUTO_INCREMENT)
+  #(like MySQL's AUTO_INCREMENT or Pg SERIAL)
   foreach ( $self->dbdef_table->unique->singles ) {
     $self->unique($_) unless $self->getfield($_);
   }
-  #and also the primary key
+
+  #and also the primary key, if the database isn't going to
   my $primary_key = $self->dbdef_table->primary_key;
-  $self->unique($primary_key) 
-    if $primary_key && ! $self->getfield($primary_key);
+  my $db_seq = 0;
+  if ( $primary_key ) {
+    my $col = $self->dbdef_table->column($primary_key);
+    my $db_seq =
+      uc($col->type) eq 'SERIAL'
+      || ( driver_name eq 'Pg'    && $col->default =~ /^nextval\(/i     )
+      || ( driver_name eq 'mysql' && $col->local   =~ /AUTO_INCREMENT/i );
+    $self->unique($primary_key) unless $self->getfield($primary_key) || $db_seq;
+  }
 
+  my $table = $self->table;
   #false laziness w/delete
   my @fields =
     grep defined($self->getfield($_)) && $self->getfield($_) ne "",
     $self->fields
   ;
-  my @values = map { _quote( $self->getfield($_), $self->table, $_) } @fields;
+  my @values = map { _quote( $self->getfield($_), $table, $_) } @fields;
   #eslaf
 
-  my $statement = "INSERT INTO ". $self->table. " ( ".
+  my $statement = "INSERT INTO $table ( ".
       join( ', ', @fields ).
     ") VALUES (".
       join( ', ', @values ).
@@ -498,15 +505,6 @@ sub insert {
   warn "[debug]$me $statement\n" if $DEBUG > 1;
   my $sth = dbh->prepare($statement) or return dbh->errstr;
 
-  my $h_sth;
-  if ( defined $dbdef->table('h_'. $self->table) ) {
-    my $h_statement = $self->_h_statement('insert');
-    warn "[debug]$me $h_statement\n" if $DEBUG > 2;
-    $h_sth = dbh->prepare($h_statement) or return dbh->errstr;
-  } else {
-    $h_sth = '';
-  }
-
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE'; 
@@ -515,7 +513,63 @@ sub insert {
   local $SIG{PIPE} = 'IGNORE';
 
   $sth->execute or return $sth->errstr;
+
+  if ( $db_seq ) { # get inserted id from the database, if applicable
+    my $insertid = '';
+    if ( driver_name eq 'Pg' ) {
+
+      my $oid = $sth->{'pg_oid_status'};
+      my $i_sql = "SELECT id FROM $table WHERE oid = ?";
+      my $i_sth = dbh->prepare($i_sql) or do {
+        dbh->rollback if $FS::UID::AutoCommit;
+        return dbh->errstr;
+      };
+      $i_sth->execute($oid) or do {
+        dbh->rollback if $FS::UID::AutoCommit;
+        return $i_sth->errstr;
+      };
+      $insertid = $i_sth->fetchrow_arrayref->[0];
+
+    } elsif ( driver_name eq 'mysql' ) {
+
+      $insertid = dbh->{'mysql_insertid'};
+      # work around mysql_insertid being null some of the time, ala RT :/
+      unless ( $insertid ) {
+        warn "WARNING: DBD::mysql didn't return mysql_insertid; ".
+             "using SELECT LAST_INSERT_ID();";
+        my $i_sql = "SELECT LAST_INSERT_ID()";
+        my $i_sth = dbh->prepare($i_sql) or do {
+          dbh->rollback if $FS::UID::AutoCommit;
+          return dbh->errstr;
+        };
+        $i_sth->execute or do {
+          dbh->rollback if $FS::UID::AutoCommit;
+          return $i_sth->errstr;
+        };
+        $insertid = $i_sth->fetchrow_arrayref->[0];
+      }
+
+    } else {
+      dbh->rollback if $FS::UID::AutoCommit;
+      return "don't know how to retreive inserted ids from ". driver_name. 
+             ", try using counterfiles (maybe run dbdef-create?)";
+    }
+    $self->setfield($primary_key, $insertid);
+  }
+
+  my $h_sth;
+  if ( defined $dbdef->table('h_'. $table) ) {
+    my $h_statement = $self->_h_statement('insert');
+    warn "[debug]$me $h_statement\n" if $DEBUG > 2;
+    $h_sth = dbh->prepare($h_statement) or do {
+      dbh->rollback if $FS::UID::AutoCommit;
+      return dbh->errstr;
+    };
+  } else {
+    $h_sth = '';
+  }
   $h_sth->execute or return $h_sth->errstr if $h_sth;
+
   dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
 
   '';
@@ -528,7 +582,7 @@ Depriciated (use insert instead).
 =cut
 
 sub add {
-  cluck "warning: FS::Record::add depriciated!";
+  cluck "warning: FS::Record::add deprecated!";
   insert @_; #call method in this scope
 }
 
@@ -546,7 +600,7 @@ sub delete {
     map {
       $self->getfield($_) eq ''
         #? "( $_ IS NULL OR $_ = \"\" )"
-        ? ( driver_name =~ /^Pg$/i
+        ? ( driver_name eq 'Pg'
               ? "$_ IS NULL"
               : "( $_ IS NULL OR $_ = \"\" )"
           )
@@ -592,7 +646,7 @@ Depriciated (use delete instead).
 =cut
 
 sub del {
-  cluck "warning: FS::Record::del depriciated!";
+  cluck "warning: FS::Record::del deprecated!";
   &delete(@_); #call method in this scope
 }
 
@@ -632,7 +686,7 @@ sub replace {
       map {
         $old->getfield($_) eq ''
           #? "( $_ IS NULL OR $_ = \"\" )"
-          ? ( driver_name =~ /^Pg$/i
+          ? ( driver_name eq 'Pg'
                 ? "$_ IS NULL"
                 : "( $_ IS NULL OR $_ = \"\" )"
             )
@@ -685,7 +739,7 @@ Depriciated (use replace instead).
 =cut
 
 sub rep {
-  cluck "warning: FS::Record::rep depriciated!";
+  cluck "warning: FS::Record::rep deprecated!";
   replace @_; #call method in this scope
 }
 
@@ -718,8 +772,13 @@ sub _h_statement {
 
 =item unique COLUMN
 
-Replaces COLUMN in record with a unique number.  Called by the B<add> method
-on primary keys and single-field unique columns (see L<DBIx::DBSchema::Table>).
+B<Warning>: External use is B<deprecated>.  
+
+Replaces COLUMN in record with a unique number, using counters in the
+filesystem.  Used by the B<insert> method on single-field unique columns
+(see L<DBIx::DBSchema::Table>) and also as a fallback for primary keys
+that aren't SERIAL (Pg) or AUTO_INCREMENT (mysql).
+
 Returns the new value.
 
 =cut
@@ -728,8 +787,6 @@ sub unique {
   my($self,$field) = @_;
   my($table)=$self->table;
 
-  #croak("&FS::UID::checkruid failed") unless &checkruid;
-
   croak "Unique called on field $field, but it is ",
         $self->getfield($field),
         ", not null!"
@@ -745,9 +802,8 @@ sub unique {
 #  my($counter) = new File::CounterFile "$user/$table.$field",0;
 # endhack
 
-  my($index)=$counter->inc;
-  $index=$counter->inc
-    while qsearchs($table,{$field=>$index}); #just in case
+  my $index = $counter->inc;
+  $index = $counter->inc while qsearchs($table, { $field=>$index } );
 
   $index =~ /^(\d*)$/;
   $index=$1;
@@ -1165,14 +1221,14 @@ sub _quote {
 
 =item hfields TABLE
 
-This is depriciated.  Don't use it.
+This is deprecated.  Don't use it.
 
 It returns a hash-type list with the fields of this record's table set true.
 
 =cut
 
 sub hfields {
-  carp "warning: hfields is depriciated";
+  carp "warning: hfields is deprecated";
   my($table)=@_;
   my(%hash);
   foreach (fields($table)) {
@@ -1208,7 +1264,7 @@ sub DESTROY { return; }
 This module should probably be renamed, since much of the functionality is
 of general use.  It is not completely unlike Adapter::DBI (see below).
 
-Exported qsearch and qsearchs should be depriciated in favor of method calls
+Exported qsearch and qsearchs should be deprecated in favor of method calls
 (against an FS::Record object like the old search and searchs that qsearch
 and qsearchs were on top of.)
 
@@ -1216,7 +1272,7 @@ The whole fields / hfields mess should be removed.
 
 The various WHERE clauses should be subroutined.
 
-table string should be depriciated in favor of DBIx::DBSchema::Table.
+table string should be deprecated in favor of DBIx::DBSchema::Table.
 
 No doubt we could benefit from a Tied hash.  Documenting how exists / defined
 true maps to the database (and WHERE clauses) would also help.
diff --git a/bin/dbdef-create b/bin/dbdef-create
index 0b297b9e6..c977f876e 100755
--- a/bin/dbdef-create
+++ b/bin/dbdef-create
@@ -1,10 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: dbdef-create,v 1.5 2001-08-21 02:43:18 ivan Exp $
+# $Id: dbdef-create,v 1.6 2002-09-19 13:34:52 ivan Exp $
 
 use strict;
 use DBI;
-use DBIx::DBSchema;
+use DBIx::DBSchema 0.21;
 use FS::UID qw(adminsuidsetup datasrc driver_name);
 
 my $user = shift or die &usage;
diff --git a/bin/fs-setup b/bin/fs-setup
index 81f1c26b0..aeaacbc00 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.97 2002-09-09 23:01:36 khoff Exp $
+# $Id: fs-setup,v 1.98 2002-09-19 13:34:51 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -133,33 +133,6 @@ foreach $attribute (@check_attributes) {
   ));
 }
 
-##make part_svc table (but now as object)
-#
-#my($part_svc)=$dbdef->table('part_svc');
-#
-##because of svc_acct_pop
-##foreach (grep /^svc_/, $dbdef->tables) { 
-##foreach (qw(svc_acct svc_acct_sm svc_charge svc_domain svc_wo)) {
-#foreach (qw(svc_acct svc_domain svc_forward svc_www)) {
-#  my($table)=$dbdef->table($_);
-#  my($col);
-#  foreach $col ( $table->columns ) {
-#    next if $col =~ /^svcnum$/;
-#    $part_svc->addcolumn( new DBIx::DBSchema::Column (
-#      $table->name. '__' . $table->column($col)->name,
-#      'varchar', #$table->column($col)->type, 
-#      'NULL',
-#      $char_d, #$table->column($col)->length,
-#    ));
-#    $part_svc->addcolumn ( new DBIx::DBSchema::Column (
-#      $table->name. '__'. $table->column($col)->name . "_flag",
-#      'char',
-#      'NULL',
-#      1,
-#    ));
-#  }
-#}
-
 #create history tables (false laziness w/create-history-tables)
 foreach my $table ( grep { ! /^h_/ } $dbdef->tables ) {
   my $tableobj = $dbdef->table($table)
@@ -334,7 +307,7 @@ sub tables_hash_hack {
 
     'agent' => {
       'columns' => [
-        'agentnum', 'int',            '',     '',
+        'agentnum', 'serial',            '',     '',
         'agent',    'varchar',           '',     $char_d,
         'typenum',  'int',            '',     '',
         'freq',     'int',       'NULL', '',
@@ -347,7 +320,7 @@ sub tables_hash_hack {
 
     'agent_type' => {
       'columns' => [
-        'typenum',   'int',  '', '',
+        'typenum',   'serial',  '', '',
         'atype',     'varchar', '', $char_d,
       ],
       'primary_key' => 'typenum',
@@ -367,7 +340,7 @@ sub tables_hash_hack {
 
     'cust_bill' => {
       'columns' => [
-        'invnum',    'int',  '', '',
+        'invnum',    'serial',  '', '',
         'custnum',   'int',  '', '',
         '_date',     @date_type,
         'charged',   @money_type,
@@ -381,7 +354,7 @@ sub tables_hash_hack {
 
     'cust_bill_event' => {
       'columns' => [
-        'eventnum',    'int',  '', '',
+        'eventnum',    'serial',  '', '',
         'invnum',   'int',  '', '',
         'eventpart',   'int',  '', '',
         '_date',     @date_type,
@@ -396,7 +369,7 @@ sub tables_hash_hack {
 
     'part_bill_event' => {
       'columns' => [
-        'eventpart',    'int',  '', '',
+        'eventpart',    'serial',  '', '',
         'payby',       'char',  '', 4,
         'event',       'varchar',           '',     $char_d,
         'eventcode',    @perl_type,
@@ -427,7 +400,7 @@ sub tables_hash_hack {
 
     'cust_credit' => {
       'columns' => [
-        'crednum',  'int', '', '',
+        'crednum',  'serial', '', '',
         'custnum',  'int', '', '',
         '_date',    @date_type,
         'amount',   @money_type,
@@ -442,7 +415,7 @@ sub tables_hash_hack {
 
     'cust_credit_bill' => {
       'columns' => [
-        'creditbillnum', 'int', '', '',
+        'creditbillnum', 'serial', '', '',
         'crednum',  'int', '', '',
         'invnum',  'int', '', '',
         '_date',    @date_type,
@@ -455,7 +428,7 @@ sub tables_hash_hack {
 
     'cust_main' => {
       'columns' => [
-        'custnum',  'int',  '',     '',
+        'custnum',  'serial',  '',     '',
         'agentnum', 'int',  '',     '',
 #        'titlenum', 'int',  'NULL',   '',
         'last',     'varchar', '',     $char_d,
@@ -506,7 +479,7 @@ sub tables_hash_hack {
 
     'cust_main_invoice' => {
       'columns' => [
-        'destnum',  'int',  '',     '',
+        'destnum',  'serial',  '',     '',
         'custnum',  'int',  '',     '',
         'dest',     'varchar', '',  $char_d,
       ],
@@ -519,7 +492,7 @@ sub tables_hash_hack {
                             #cust_main_county for validation and to provide
                             # a tax rate.
       'columns' => [
-        'taxnum',   'int',   '',    '',
+        'taxnum',   'serial',   '',    '',
         'state',    'varchar',  'NULL',    $char_d,
         'county',   'varchar',  'NULL',    $char_d,
         'country',  'char',  '', 2, 
@@ -535,7 +508,7 @@ sub tables_hash_hack {
 
     'cust_pay' => {
       'columns' => [
-        'paynum',   'int',    '',   '',
+        'paynum',   'serial',    '',   '',
         #now cust_bill_pay #'invnum',   'int',    '',   '',
         'custnum',  'int',    '',   '',
         'paid',     @money_type,
@@ -553,7 +526,7 @@ sub tables_hash_hack {
 
     'cust_bill_pay' => {
       'columns' => [
-        'billpaynum', 'int',     '',   '',
+        'billpaynum', 'serial',     '',   '',
         'invnum',  'int',     '',   '',
         'paynum',  'int',     '',   '',
         'amount',  @money_type,
@@ -567,7 +540,7 @@ sub tables_hash_hack {
     'cust_pay_batch' => { #what's this used for again?  list of customers
                           #in current CARD batch? (necessarily CARD?)
       'columns' => [
-        'paybatchnum',   'int',    '',   '',
+        'paybatchnum',   'serial',    '',   '',
         'invnum',   'int',    '',   '',
         'custnum',   'int',    '',   '',
         'last',     'varchar', '',     $char_d,
@@ -592,7 +565,7 @@ sub tables_hash_hack {
 
     'cust_pkg' => {
       'columns' => [
-        'pkgnum',    'int',    '',   '',
+        'pkgnum',    'serial',    '',   '',
         'custnum',   'int',    '',   '',
         'pkgpart',   'int',    '',   '',
         'otaker',    'varchar', '', 8,
@@ -610,7 +583,7 @@ sub tables_hash_hack {
 
     'cust_refund' => {
       'columns' => [
-        'refundnum',    'int',    '',   '',
+        'refundnum',    'serial',    '',   '',
         #now cust_credit_refund #'crednum',      'int',    '',   '',
         'custnum',  'int',    '',   '',
         '_date',        @date_type,
@@ -630,7 +603,7 @@ sub tables_hash_hack {
 
     'cust_credit_refund' => {
       'columns' => [
-        'creditrefundnum', 'int',     '',   '',
+        'creditrefundnum', 'serial',     '',   '',
         'crednum',  'int',     '',   '',
         'refundnum',  'int',     '',   '',
         'amount',  @money_type,
@@ -644,7 +617,7 @@ sub tables_hash_hack {
 
     'cust_svc' => {
       'columns' => [
-        'svcnum',    'int',    '',   '',
+        'svcnum',    'serial',    '',   '',
         'pkgnum',    'int',    'NULL',   '',
         'svcpart',   'int',    '',   '',
       ],
@@ -655,7 +628,7 @@ sub tables_hash_hack {
 
     'part_pkg' => {
       'columns' => [
-        'pkgpart',    'int',    '',   '',
+        'pkgpart',    'serial',    '',   '',
         'pkg',        'varchar',   '',   $char_d,
         'comment',    'varchar',   '',   $char_d,
         'setup',      @perl_type,
@@ -696,7 +669,7 @@ sub tables_hash_hack {
 
     'part_referral' => {
       'columns' => [
-        'refnum',   'int',    '',   '',
+        'refnum',   'serial',    '',   '',
         'referral', 'varchar',   '',   $char_d,
       ],
       'primary_key' => 'refnum',
@@ -706,7 +679,7 @@ sub tables_hash_hack {
 
     'part_svc' => {
       'columns' => [
-        'svcpart',    'int',    '',   '',
+        'svcpart',    'serial',    '',   '',
         'svc',        'varchar',   '',   $char_d,
         'svcdb',      'varchar',   '',   $char_d,
         'disabled',   'char',  'NULL',   1,
@@ -718,7 +691,7 @@ sub tables_hash_hack {
 
     'part_svc_column' => {
       'columns' => [
-        'columnnum',   'int',         '', '',
+        'columnnum',   'serial',         '', '',
         'svcpart',     'int',         '', '',
         'columnname',  'varchar',     '', 64,
         'columnvalue', 'varchar', 'NULL', $char_d,
@@ -732,7 +705,7 @@ sub tables_hash_hack {
     #(this should be renamed to part_pop)
     'svc_acct_pop' => {
       'columns' => [
-        'popnum',    'int',    '',   '',
+        'popnum',    'serial',    '',   '',
         'city',      'varchar',   '',   $char_d,
         'state',     'varchar',   '',   $char_d,
         'ac',        'char',   '',   3,
@@ -746,7 +719,7 @@ sub tables_hash_hack {
 
     'part_pop_local' => {
       'columns' => [
-        'localnum',  'int',     '',     '',
+        'localnum',  'serial',     '',     '',
         'popnum',    'int',     '',     '',
         'city',      'varchar', 'NULL', $char_d,
         'state',     'char',    'NULL', 2,
@@ -781,18 +754,6 @@ sub tables_hash_hack {
       'index' => [ ['username'], ['domsvc'] ],
     },
 
-#    'svc_acct_sm' => {
-#      'columns' => [
-#        'svcnum',    'int',    '',   '',
-#        'domsvc',    'int',    '',   '',
-#        'domuid',    'int', '',   '',
-#        'domuser',   'varchar',   '',   $char_d,
-#      ],
-#      'primary_key' => 'svcnum',
-#      'unique' => [ [] ],
-#      'index' => [ ['domsvc'], ['domuid'] ], 
-#    },
-
     #'svc_charge' => {
     #  'columns' => [
     #    'svcnum',    'int',    '',   '',
@@ -816,7 +777,7 @@ sub tables_hash_hack {
 
     'domain_record' => {
       'columns' => [
-        'recnum',    'int',     '',  '',
+        'recnum',    'serial',     '',  '',
         'svcnum',    'int',     '',  '',
         'reczone',   'varchar', '',  $char_d,
         'recaf',     'char',    '',  2,
@@ -866,7 +827,7 @@ sub tables_hash_hack {
 
     'prepay_credit' => {
       'columns' => [
-        'prepaynum',   'int',     '',   '',
+        'prepaynum',   'serial',     '',   '',
         'identifier',  'varchar', '', $char_d,
         'amount',      @money_type,
         'seconds',     'int',     'NULL', '',
@@ -878,7 +839,7 @@ sub tables_hash_hack {
 
     'port' => {
       'columns' => [
-        'portnum',  'int',     '',   '',
+        'portnum',  'serial',     '',   '',
         'ip',       'varchar', 'NULL', 15,
         'nasport',  'int',     'NULL', '',
         'nasnum',   'int',     '',   '',
@@ -890,7 +851,7 @@ sub tables_hash_hack {
 
     'nas' => {
       'columns' => [
-        'nasnum',   'int',     '',    '',
+        'nasnum',   'serial',     '',    '',
         'nas',      'varchar', '',    $char_d,
         'nasip',    'varchar', '',    15,
         'nasfqdn',  'varchar', '',    $char_d,
@@ -903,7 +864,7 @@ sub tables_hash_hack {
 
     'session' => {
       'columns' => [
-        'sessionnum', 'int',       '',   '',
+        'sessionnum', 'serial',       '',   '',
         'portnum',    'int',       '',   '',
         'svcnum',     'int',       '',   '',
         'login',      @date_type,
@@ -916,7 +877,7 @@ sub tables_hash_hack {
 
     'queue' => {
       'columns' => [
-        'jobnum', 'int', '', '',
+        'jobnum', 'serial', '', '',
         'job', 'text', '', '',
         '_date', 'int', '', '',
         'status', 'varchar', '', $char_d,
@@ -930,7 +891,7 @@ sub tables_hash_hack {
 
     'queue_arg' => {
       'columns' => [
-        'argnum', 'int', '', '',
+        'argnum', 'serial', '', '',
         'jobnum', 'int', '', '',
         'arg', 'text', 'NULL', '',
       ],
@@ -941,7 +902,7 @@ sub tables_hash_hack {
 
     'queue_depend' => {
       'columns' => [
-        'dependnum', 'int', '', '',
+        'dependnum', 'serial', '', '',
         'jobnum', 'int', '', '',
         'depend_jobnum', 'int', '', '',
       ],
@@ -952,7 +913,7 @@ sub tables_hash_hack {
 
     'export_svc' => {
       'columns' => [
-        'exportsvcnum' => 'int', '', '',
+        'exportsvcnum' => 'serial', '', '',
         'exportnum'    => 'int', '', '',
         'svcpart'      => 'int', '', '',
       ],
@@ -963,7 +924,7 @@ sub tables_hash_hack {
 
     'part_export' => {
       'columns' => [
-        'exportnum', 'int', '', '',
+        'exportnum', 'serial', '', '',
         #'svcpart',   'int', '', '',
         'machine', 'varchar', '', $char_d,
         'exporttype', 'varchar', '', $char_d,
@@ -976,7 +937,7 @@ sub tables_hash_hack {
 
     'part_export_option' => {
       'columns' => [
-        'optionnum', 'int', '', '',
+        'optionnum', 'serial', '', '',
         'exportnum', 'int', '', '',
         'optionname', 'varchar', '', $char_d,
         'optionvalue', 'text', 'NULL', '',
@@ -988,7 +949,7 @@ sub tables_hash_hack {
 
     'radius_usergroup' => {
       'columns' => [
-        'usergroupnum', 'int', '', '',
+        'usergroupnum', 'serial', '', '',
         'svcnum',       'int', '', '',
         'groupname',    'varchar', '', $char_d,
       ],
@@ -999,7 +960,7 @@ sub tables_hash_hack {
 
     'msgcat' => {
       'columns' => [
-        'msgnum', 'int', '', '',
+        'msgnum', 'serial', '', '',
         'msgcode', 'varchar', '', $char_d,
         'locale', 'varchar', '', 16,
         'msg', 'text', '', '',
@@ -1011,7 +972,7 @@ sub tables_hash_hack {
 
     'cust_tax_exempt' => {
       'columns' => [
-        'exemptnum', 'int', '', '',
+        'exemptnum', 'serial', '', '',
         'custnum',   'int', '', '',
         'taxnum',    'int', '', '',
         'year',      'int', '', '',
@@ -1025,7 +986,7 @@ sub tables_hash_hack {
 
     'ac_type' => {
       'columns' => [
-        'actypenum', 'int', '', '',
+        'actypenum', 'serial', '', '',
         'actypename', 'varchar', '', 15,
       ],
       'primary_key' => 'actypenum',
@@ -1035,7 +996,7 @@ sub tables_hash_hack {
 
     'ac' => {
       'columns' => [
-        'acnum', 'int', '', '',
+        'acnum', 'serial', '', '',
         'actypenum', 'int', '', '',
         'acname', 'varchar', '', 15,
       ],
@@ -1046,7 +1007,7 @@ sub tables_hash_hack {
 
     'part_ac_field' => {
       'columns' => [
-        'acfieldpart', 'int', '', '',
+        'acfieldpart', 'serial', '', '',
         'actypenum', 'int', '', '',
         'name', 'varchar', '', 15,
         'ut_type', 'varchar', '', 15,
@@ -1080,7 +1041,7 @@ sub tables_hash_hack {
 
     'svc_broadband' => {
       'columns' => [
-        'svcnum', 'int', '', '',
+        'svcnum', 'serial', '', '',
         'actypenum', 'int', '', '',
         'speed_up', 'int', '', '',
         'speed_down', 'int', '', '',
-- 
cgit v1.2.1


From 0ff15e0670be23954e18d9abbf992993a0fe1b3e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 20 Sep 2002 10:16:28 +0000
Subject: change otaker fields to 32 chars

---
 FS/FS/UID.pm     |  6 ++----
 README.1.5.0pre1 |  2 +-
 bin/fs-setup     | 10 +++++-----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 8934d49fc..6962b2768 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -171,9 +171,7 @@ Returns the current Freeside user.
 =cut
 
 sub getotaker {
-  #$user;
-  #stupid kludge until schema otaker fields are not 8 chars
-  substr($user,0,8);
+  $user;
 }
 
 =item cgisetotaker
@@ -258,7 +256,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.19 2002-08-29 06:02:52 ivan Exp $
+$Id: UID.pm,v 1.20 2002-09-20 10:16:28 ivan Exp $
 
 =head1 BUGS
 
diff --git a/README.1.5.0pre1 b/README.1.5.0pre1
index 776899e31..ab2f3ab53 100644
--- a/README.1.5.0pre1
+++ b/README.1.5.0pre1
@@ -2,7 +2,7 @@ preliminary upgrade instructions
 
 schema changes:
   *** get svc_broadband changes from pc-intouch
-  *** otaker changes
+  *** otaker changes s/8/32 all otkaer fields
   *** optional: sequence changes
 
 install DBIx::DBSchema 0.21
diff --git a/bin/fs-setup b/bin/fs-setup
index aeaacbc00..c17c936e7 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.98 2002-09-19 13:34:51 ivan Exp $
+# $Id: fs-setup,v 1.99 2002-09-20 10:16:28 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -404,7 +404,7 @@ sub tables_hash_hack {
         'custnum',  'int', '', '',
         '_date',    @date_type,
         'amount',   @money_type,
-        'otaker',   'varchar', '', 8,
+        'otaker',   'varchar', '', 32,
         'reason',   'text', 'NULL', '',
         'closed',    'char', 'NULL', 1,
       ],
@@ -466,7 +466,7 @@ sub tables_hash_hack {
         'paydate',  'varchar', 'NULL', 10,
         'payname',  'varchar', 'NULL', $char_d,
         'tax',      'char', 'NULL', 1,
-        'otaker',   'varchar', '',     8,
+        'otaker',   'varchar', '',    32,
         'refnum',   'int',  '',     '',
         'referral_custnum', 'int',  'NULL', '',
         'comments', 'text', 'NULL', '',
@@ -568,7 +568,7 @@ sub tables_hash_hack {
         'pkgnum',    'serial',    '',   '',
         'custnum',   'int',    '',   '',
         'pkgpart',   'int',    '',   '',
-        'otaker',    'varchar', '', 8,
+        'otaker',    'varchar', '', 32,
         'setup',     @date_type,
         'bill',      @date_type,
         'susp',      @date_type,
@@ -588,7 +588,7 @@ sub tables_hash_hack {
         'custnum',  'int',    '',   '',
         '_date',        @date_type,
         'refund',       @money_type,
-        'otaker',       'varchar',   '',   8,
+        'otaker',       'varchar',   '',   32,
         'reason',       'varchar',   '',   $char_d,
         'payby',        'char',   '',     4, # CARD/BILL/COMP, should be index
                                              # into payment type table.
-- 
cgit v1.2.1


From 5dc522149a7ad8363ce46f8ff6b3133b2d3d3cdf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 20 Sep 2002 12:04:17 +0000
Subject: doc NetAddr::IP dependancy

---
 README.1.5.0pre1             | 1 +
 httemplate/docs/install.html | 1 +
 2 files changed, 2 insertions(+)

diff --git a/README.1.5.0pre1 b/README.1.5.0pre1
index ab2f3ab53..ff3e5a6cc 100644
--- a/README.1.5.0pre1
+++ b/README.1.5.0pre1
@@ -6,6 +6,7 @@ schema changes:
   *** optional: sequence changes
 
 install DBIx::DBSchema 0.21
+install NetAddr::IP
 
 Run dbdef-create
 something about history tables
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 75f039dd1..e6f6f59de 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -53,6 +53,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a>
       <li><a href="http://search.cpan.org/search?dist=Storable">Storable</a>
 <!-- MyAccounts, maybe only for dev     <li><a href="http://search.cpan.org/search?dist=Cache-Cache">Cache::Cache</a> -->
+      <li><a href="http://search.cpan.org/search?dist=NetAddr-IP">NetAddr-IP</a>
       <li><a href="http://search.cpan.org/search?dist=ApacheDBI">Apache::DBI</a> <i>(optional but recommended for better webinterface performance)</i>
     </ul>
 </ul>
-- 
cgit v1.2.1


From eb0d04842631ae16247c6246cc6a1d8896169ff9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 20 Sep 2002 12:50:30 +0000
Subject: move from bin/fs-setup to FS/bin/freeside-setup

---
 FS/bin/freeside-setup        |  191 ++++----
 bin/fs-setup                 | 1064 ------------------------------------------
 httemplate/docs/install.html |    6 +-
 3 files changed, 114 insertions(+), 1147 deletions(-)
 delete mode 100755 bin/fs-setup

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 78a03385c..cb74e64c8 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -138,33 +138,6 @@ foreach $attribute (@check_attributes) {
   ));
 }
 
-##make part_svc table (but now as object)
-#
-#my($part_svc)=$dbdef->table('part_svc');
-#
-##because of svc_acct_pop
-##foreach (grep /^svc_/, $dbdef->tables) { 
-##foreach (qw(svc_acct svc_acct_sm svc_charge svc_domain svc_wo)) {
-#foreach (qw(svc_acct svc_domain svc_forward svc_www)) {
-#  my($table)=$dbdef->table($_);
-#  my($col);
-#  foreach $col ( $table->columns ) {
-#    next if $col =~ /^svcnum$/;
-#    $part_svc->addcolumn( new DBIx::DBSchema::Column (
-#      $table->name. '__' . $table->column($col)->name,
-#      'varchar', #$table->column($col)->type, 
-#      'NULL',
-#      $char_d, #$table->column($col)->length,
-#    ));
-#    $part_svc->addcolumn ( new DBIx::DBSchema::Column (
-#      $table->name. '__'. $table->column($col)->name . "_flag",
-#      'char',
-#      'NULL',
-#      1,
-#    ));
-#  }
-#}
-
 #create history tables (false laziness w/create-history-tables)
 foreach my $table ( grep { ! /^h_/ } $dbdef->tables ) {
   my $tableobj = $dbdef->table($table)
@@ -339,7 +312,7 @@ sub tables_hash_hack {
 
     'agent' => {
       'columns' => [
-        'agentnum', 'int',            '',     '',
+        'agentnum', 'serial',            '',     '',
         'agent',    'varchar',           '',     $char_d,
         'typenum',  'int',            '',     '',
         'freq',     'int',       'NULL', '',
@@ -352,7 +325,7 @@ sub tables_hash_hack {
 
     'agent_type' => {
       'columns' => [
-        'typenum',   'int',  '', '',
+        'typenum',   'serial',  '', '',
         'atype',     'varchar', '', $char_d,
       ],
       'primary_key' => 'typenum',
@@ -372,7 +345,7 @@ sub tables_hash_hack {
 
     'cust_bill' => {
       'columns' => [
-        'invnum',    'int',  '', '',
+        'invnum',    'serial',  '', '',
         'custnum',   'int',  '', '',
         '_date',     @date_type,
         'charged',   @money_type,
@@ -386,7 +359,7 @@ sub tables_hash_hack {
 
     'cust_bill_event' => {
       'columns' => [
-        'eventnum',    'int',  '', '',
+        'eventnum',    'serial',  '', '',
         'invnum',   'int',  '', '',
         'eventpart',   'int',  '', '',
         '_date',     @date_type,
@@ -401,7 +374,7 @@ sub tables_hash_hack {
 
     'part_bill_event' => {
       'columns' => [
-        'eventpart',    'int',  '', '',
+        'eventpart',    'serial',  '', '',
         'payby',       'char',  '', 4,
         'event',       'varchar',           '',     $char_d,
         'eventcode',    @perl_type,
@@ -432,11 +405,11 @@ sub tables_hash_hack {
 
     'cust_credit' => {
       'columns' => [
-        'crednum',  'int', '', '',
+        'crednum',  'serial', '', '',
         'custnum',  'int', '', '',
         '_date',    @date_type,
         'amount',   @money_type,
-        'otaker',   'varchar', '', 8,
+        'otaker',   'varchar', '', 32,
         'reason',   'text', 'NULL', '',
         'closed',    'char', 'NULL', 1,
       ],
@@ -447,7 +420,7 @@ sub tables_hash_hack {
 
     'cust_credit_bill' => {
       'columns' => [
-        'creditbillnum', 'int', '', '',
+        'creditbillnum', 'serial', '', '',
         'crednum',  'int', '', '',
         'invnum',  'int', '', '',
         '_date',    @date_type,
@@ -460,7 +433,7 @@ sub tables_hash_hack {
 
     'cust_main' => {
       'columns' => [
-        'custnum',  'int',  '',     '',
+        'custnum',  'serial',  '',     '',
         'agentnum', 'int',  '',     '',
 #        'titlenum', 'int',  'NULL',   '',
         'last',     'varchar', '',     $char_d,
@@ -498,7 +471,7 @@ sub tables_hash_hack {
         'paydate',  'varchar', 'NULL', 10,
         'payname',  'varchar', 'NULL', $char_d,
         'tax',      'char', 'NULL', 1,
-        'otaker',   'varchar', '',     8,
+        'otaker',   'varchar', '',    32,
         'refnum',   'int',  '',     '',
         'referral_custnum', 'int',  'NULL', '',
         'comments', 'text', 'NULL', '',
@@ -511,7 +484,7 @@ sub tables_hash_hack {
 
     'cust_main_invoice' => {
       'columns' => [
-        'destnum',  'int',  '',     '',
+        'destnum',  'serial',  '',     '',
         'custnum',  'int',  '',     '',
         'dest',     'varchar', '',  $char_d,
       ],
@@ -524,7 +497,7 @@ sub tables_hash_hack {
                             #cust_main_county for validation and to provide
                             # a tax rate.
       'columns' => [
-        'taxnum',   'int',   '',    '',
+        'taxnum',   'serial',   '',    '',
         'state',    'varchar',  'NULL',    $char_d,
         'county',   'varchar',  'NULL',    $char_d,
         'country',  'char',  '', 2, 
@@ -540,7 +513,7 @@ sub tables_hash_hack {
 
     'cust_pay' => {
       'columns' => [
-        'paynum',   'int',    '',   '',
+        'paynum',   'serial',    '',   '',
         #now cust_bill_pay #'invnum',   'int',    '',   '',
         'custnum',  'int',    '',   '',
         'paid',     @money_type,
@@ -558,7 +531,7 @@ sub tables_hash_hack {
 
     'cust_bill_pay' => {
       'columns' => [
-        'billpaynum', 'int',     '',   '',
+        'billpaynum', 'serial',     '',   '',
         'invnum',  'int',     '',   '',
         'paynum',  'int',     '',   '',
         'amount',  @money_type,
@@ -572,7 +545,7 @@ sub tables_hash_hack {
     'cust_pay_batch' => { #what's this used for again?  list of customers
                           #in current CARD batch? (necessarily CARD?)
       'columns' => [
-        'paybatchnum',   'int',    '',   '',
+        'paybatchnum',   'serial',    '',   '',
         'invnum',   'int',    '',   '',
         'custnum',   'int',    '',   '',
         'last',     'varchar', '',     $char_d,
@@ -597,10 +570,10 @@ sub tables_hash_hack {
 
     'cust_pkg' => {
       'columns' => [
-        'pkgnum',    'int',    '',   '',
+        'pkgnum',    'serial',    '',   '',
         'custnum',   'int',    '',   '',
         'pkgpart',   'int',    '',   '',
-        'otaker',    'varchar', '', 8,
+        'otaker',    'varchar', '', 32,
         'setup',     @date_type,
         'bill',      @date_type,
         'susp',      @date_type,
@@ -615,12 +588,12 @@ sub tables_hash_hack {
 
     'cust_refund' => {
       'columns' => [
-        'refundnum',    'int',    '',   '',
+        'refundnum',    'serial',    '',   '',
         #now cust_credit_refund #'crednum',      'int',    '',   '',
         'custnum',  'int',    '',   '',
         '_date',        @date_type,
         'refund',       @money_type,
-        'otaker',       'varchar',   '',   8,
+        'otaker',       'varchar',   '',   32,
         'reason',       'varchar',   '',   $char_d,
         'payby',        'char',   '',     4, # CARD/BILL/COMP, should be index
                                              # into payment type table.
@@ -635,7 +608,7 @@ sub tables_hash_hack {
 
     'cust_credit_refund' => {
       'columns' => [
-        'creditrefundnum', 'int',     '',   '',
+        'creditrefundnum', 'serial',     '',   '',
         'crednum',  'int',     '',   '',
         'refundnum',  'int',     '',   '',
         'amount',  @money_type,
@@ -649,7 +622,7 @@ sub tables_hash_hack {
 
     'cust_svc' => {
       'columns' => [
-        'svcnum',    'int',    '',   '',
+        'svcnum',    'serial',    '',   '',
         'pkgnum',    'int',    'NULL',   '',
         'svcpart',   'int',    '',   '',
       ],
@@ -660,7 +633,7 @@ sub tables_hash_hack {
 
     'part_pkg' => {
       'columns' => [
-        'pkgpart',    'int',    '',   '',
+        'pkgpart',    'serial',    '',   '',
         'pkg',        'varchar',   '',   $char_d,
         'comment',    'varchar',   '',   $char_d,
         'setup',      @perl_type,
@@ -701,7 +674,7 @@ sub tables_hash_hack {
 
     'part_referral' => {
       'columns' => [
-        'refnum',   'int',    '',   '',
+        'refnum',   'serial',    '',   '',
         'referral', 'varchar',   '',   $char_d,
       ],
       'primary_key' => 'refnum',
@@ -711,7 +684,7 @@ sub tables_hash_hack {
 
     'part_svc' => {
       'columns' => [
-        'svcpart',    'int',    '',   '',
+        'svcpart',    'serial',    '',   '',
         'svc',        'varchar',   '',   $char_d,
         'svcdb',      'varchar',   '',   $char_d,
         'disabled',   'char',  'NULL',   1,
@@ -723,7 +696,7 @@ sub tables_hash_hack {
 
     'part_svc_column' => {
       'columns' => [
-        'columnnum',   'int',         '', '',
+        'columnnum',   'serial',         '', '',
         'svcpart',     'int',         '', '',
         'columnname',  'varchar',     '', 64,
         'columnvalue', 'varchar', 'NULL', $char_d,
@@ -737,7 +710,7 @@ sub tables_hash_hack {
     #(this should be renamed to part_pop)
     'svc_acct_pop' => {
       'columns' => [
-        'popnum',    'int',    '',   '',
+        'popnum',    'serial',    '',   '',
         'city',      'varchar',   '',   $char_d,
         'state',     'varchar',   '',   $char_d,
         'ac',        'char',   '',   3,
@@ -751,7 +724,7 @@ sub tables_hash_hack {
 
     'part_pop_local' => {
       'columns' => [
-        'localnum',  'int',     '',     '',
+        'localnum',  'serial',     '',     '',
         'popnum',    'int',     '',     '',
         'city',      'varchar', 'NULL', $char_d,
         'state',     'char',    'NULL', 2,
@@ -786,18 +759,6 @@ sub tables_hash_hack {
       'index' => [ ['username'], ['domsvc'] ],
     },
 
-#    'svc_acct_sm' => {
-#      'columns' => [
-#        'svcnum',    'int',    '',   '',
-#        'domsvc',    'int',    '',   '',
-#        'domuid',    'int', '',   '',
-#        'domuser',   'varchar',   '',   $char_d,
-#      ],
-#      'primary_key' => 'svcnum',
-#      'unique' => [ [] ],
-#      'index' => [ ['domsvc'], ['domuid'] ], 
-#    },
-
     #'svc_charge' => {
     #  'columns' => [
     #    'svcnum',    'int',    '',   '',
@@ -821,7 +782,7 @@ sub tables_hash_hack {
 
     'domain_record' => {
       'columns' => [
-        'recnum',    'int',     '',  '',
+        'recnum',    'serial',     '',  '',
         'svcnum',    'int',     '',  '',
         'reczone',   'varchar', '',  $char_d,
         'recaf',     'char',    '',  2,
@@ -871,7 +832,7 @@ sub tables_hash_hack {
 
     'prepay_credit' => {
       'columns' => [
-        'prepaynum',   'int',     '',   '',
+        'prepaynum',   'serial',     '',   '',
         'identifier',  'varchar', '', $char_d,
         'amount',      @money_type,
         'seconds',     'int',     'NULL', '',
@@ -883,7 +844,7 @@ sub tables_hash_hack {
 
     'port' => {
       'columns' => [
-        'portnum',  'int',     '',   '',
+        'portnum',  'serial',     '',   '',
         'ip',       'varchar', 'NULL', 15,
         'nasport',  'int',     'NULL', '',
         'nasnum',   'int',     '',   '',
@@ -895,7 +856,7 @@ sub tables_hash_hack {
 
     'nas' => {
       'columns' => [
-        'nasnum',   'int',     '',    '',
+        'nasnum',   'serial',     '',    '',
         'nas',      'varchar', '',    $char_d,
         'nasip',    'varchar', '',    15,
         'nasfqdn',  'varchar', '',    $char_d,
@@ -908,7 +869,7 @@ sub tables_hash_hack {
 
     'session' => {
       'columns' => [
-        'sessionnum', 'int',       '',   '',
+        'sessionnum', 'serial',       '',   '',
         'portnum',    'int',       '',   '',
         'svcnum',     'int',       '',   '',
         'login',      @date_type,
@@ -921,7 +882,7 @@ sub tables_hash_hack {
 
     'queue' => {
       'columns' => [
-        'jobnum', 'int', '', '',
+        'jobnum', 'serial', '', '',
         'job', 'text', '', '',
         '_date', 'int', '', '',
         'status', 'varchar', '', $char_d,
@@ -935,7 +896,7 @@ sub tables_hash_hack {
 
     'queue_arg' => {
       'columns' => [
-        'argnum', 'int', '', '',
+        'argnum', 'serial', '', '',
         'jobnum', 'int', '', '',
         'arg', 'text', 'NULL', '',
       ],
@@ -946,7 +907,7 @@ sub tables_hash_hack {
 
     'queue_depend' => {
       'columns' => [
-        'dependnum', 'int', '', '',
+        'dependnum', 'serial', '', '',
         'jobnum', 'int', '', '',
         'depend_jobnum', 'int', '', '',
       ],
@@ -957,7 +918,7 @@ sub tables_hash_hack {
 
     'export_svc' => {
       'columns' => [
-        'exportsvcnum' => 'int', '', '',
+        'exportsvcnum' => 'serial', '', '',
         'exportnum'    => 'int', '', '',
         'svcpart'      => 'int', '', '',
       ],
@@ -968,7 +929,7 @@ sub tables_hash_hack {
 
     'part_export' => {
       'columns' => [
-        'exportnum', 'int', '', '',
+        'exportnum', 'serial', '', '',
         #'svcpart',   'int', '', '',
         'machine', 'varchar', '', $char_d,
         'exporttype', 'varchar', '', $char_d,
@@ -981,7 +942,7 @@ sub tables_hash_hack {
 
     'part_export_option' => {
       'columns' => [
-        'optionnum', 'int', '', '',
+        'optionnum', 'serial', '', '',
         'exportnum', 'int', '', '',
         'optionname', 'varchar', '', $char_d,
         'optionvalue', 'text', 'NULL', '',
@@ -993,7 +954,7 @@ sub tables_hash_hack {
 
     'radius_usergroup' => {
       'columns' => [
-        'usergroupnum', 'int', '', '',
+        'usergroupnum', 'serial', '', '',
         'svcnum',       'int', '', '',
         'groupname',    'varchar', '', $char_d,
       ],
@@ -1004,7 +965,7 @@ sub tables_hash_hack {
 
     'msgcat' => {
       'columns' => [
-        'msgnum', 'int', '', '',
+        'msgnum', 'serial', '', '',
         'msgcode', 'varchar', '', $char_d,
         'locale', 'varchar', '', 16,
         'msg', 'text', '', '',
@@ -1016,7 +977,7 @@ sub tables_hash_hack {
 
     'cust_tax_exempt' => {
       'columns' => [
-        'exemptnum', 'int', '', '',
+        'exemptnum', 'serial', '', '',
         'custnum',   'int', '', '',
         'taxnum',    'int', '', '',
         'year',      'int', '', '',
@@ -1028,7 +989,77 @@ sub tables_hash_hack {
       'index'       => [],
     },
 
+    'ac_type' => {
+      'columns' => [
+        'actypenum', 'serial', '', '',
+        'actypename', 'varchar', '', $char_d,
+      ],
+      'primary_key' => 'actypenum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'ac' => {
+      'columns' => [
+        'acnum', 'serial', '', '',
+        'actypenum', 'int', '', '',
+        'acname', 'varchar', '', $char_d,
+      ],
+      'primary_key' => 'acnum',
+      'unique'      => [],
+      'index'       => [ [ 'actypenum' ] ],
+    },
+
+    'part_ac_field' => {
+      'columns' => [
+        'acfieldpart', 'serial', '', '',
+        'actypenum', 'int', '', '',
+        'name', 'varchar', '', $char_d,
+        'ut_type', 'varchar', '', $char_d,
+      ],
+      'primary_key' => 'acfieldpart',
+      'unique'      => [],
+      'index'       => [ [ 'actypenum' ] ],
+    },
+
+    'ac_field' => {
+      'columns' => [
+        'acfieldpart', 'int', '', '',
+        'acnum', 'int', '', '',
+        'value', 'text', '', '',
+      ],
+      'primary_key' => '',
+      'unique'      => [ [ 'acfieldpart', 'acnum' ] ],
+      'index'       => [ [ 'acnum' ] ],
+    },
+
+    'ac_block' => {
+      'columns' => [
+        'acnum', 'int', '', '',
+        'ip_gateway', 'varchar', '', 15,
+        'ip_netmask', 'int', '', '',
+      ],
+      'primary_key' => '',
+      'unique'      => [],
+      'index'       => [ [ 'acnum' ] ],
+    },
 
+    'svc_broadband' => {
+      'columns' => [
+        'svcnum', 'int', '', '',
+        'actypenum', 'int', '', '',
+        'speed_up', 'int', '', '',
+        'speed_down', 'int', '', '',
+        'acnum', 'int', '', '',
+        'ip_addr', 'varchar', '', 15,
+        'ip_netmask', 'int', '', '',
+        'mac_addr', 'char', '', 17,
+        'location', 'varchar', '', $char_d,
+      ],
+      'primary_key' => 'svcnum',
+      'unique'      => [],
+      'index'       => [ [ 'actypenum' ] ],
+    },
 
   );
 
diff --git a/bin/fs-setup b/bin/fs-setup
deleted file mode 100755
index c17c936e7..000000000
--- a/bin/fs-setup
+++ /dev/null
@@ -1,1064 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: fs-setup,v 1.99 2002-09-20 10:16:28 ivan Exp $
-
-#to delay loading dbdef until we're ready
-BEGIN { $FS::Record::setup_hack = 1; }
-
-use strict;
-use DBI;
-use DBIx::DBSchema 0.20;
-use DBIx::DBSchema::Table;
-use DBIx::DBSchema::Column;
-use DBIx::DBSchema::ColGroup::Unique;
-use DBIx::DBSchema::ColGroup::Index;
-use FS::UID qw(adminsuidsetup datasrc checkeuid getsecrets);
-use FS::Record;
-use FS::cust_main_county;
-use FS::raddb;
-use FS::part_bill_event;
-
-die "Not running uid freeside!" unless checkeuid();
-
-my %attrib2db =
-  map { lc($FS::raddb::attrib{$_}) => $_ } keys %FS::raddb::attrib;
-
-my $user = shift or die &usage;
-getsecrets($user);
-
-#needs to match FS::Record
-my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;
-
-###
-
-#print "\nEnter the maximum username length: ";
-#my($username_len)=&getvalue;
-my $username_len = 32; #usernamemax config file
-
-print "\n\n", <<END, ":";
-Freeside tracks the RADIUS User-Name, check attribute Password and
-reply attribute Framed-IP-Address for each user.  You can specify additional
-check and reply attributes (or you can add them later with the
-fs-radius-add-check and fs-radius-add-reply programs).
-
-First enter any additional RADIUS check attributes you need to track for each 
-user, separated by whitespace.
-END
-my @check_attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
-                         split(" ",&getvalue);
-
-print "\n\n", <<END, ":";
-Now enter any additional reply attributes you need to track for each user,
-separated by whitespace.
-END
-my @attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
-                   split(" ",&getvalue);
-
-print "\n\n", <<END, ":";
-Do you wish to enable the tracking of a second, separate shipping/service
-address?
-END
-my $ship = &_yesno;
-
-sub getvalue {
-  my($x)=scalar(<STDIN>);
-  chop $x;
-  $x;
-}
-
-sub _yesno {
-  print " [y/N]:";
-  my $x = scalar(<STDIN>);
-  $x =~ /^y/i;
-}
-
-###
-
-my($char_d) = 80; #default maxlength for text fields
-
-#my(@date_type)  = ( 'timestamp', '', ''     );
-my(@date_type)  = ( 'int', 'NULL', ''     );
-my(@perl_type) = ( 'text', 'NULL', ''  ); 
-my @money_type = ( 'decimal',   '', '10,2' );
-
-###
-# create a dbdef object from the old data structure
-###
-
-my(%tables)=&tables_hash_hack;
-
-#turn it into objects
-my($dbdef) = new DBIx::DBSchema ( map {  
-  my(@columns);
-  while (@{$tables{$_}{'columns'}}) {
-    my($name,$type,$null,$length)=splice @{$tables{$_}{'columns'}}, 0, 4;
-    push @columns, new DBIx::DBSchema::Column ( $name,$type,$null,$length );
-  }
-  DBIx::DBSchema::Table->new(
-    $_,
-    $tables{$_}{'primary_key'},
-    DBIx::DBSchema::ColGroup::Unique->new($tables{$_}{'unique'}),
-    DBIx::DBSchema::ColGroup::Index->new($tables{$_}{'index'}),
-    @columns,
-  );
-} (keys %tables) );
-
-my $cust_main = $dbdef->table('cust_main');
-unless ($ship) { #remove ship_ from cust_main
-  $cust_main->delcolumn($_) foreach ( grep /^ship_/, $cust_main->columns );
-} else { #add indices on ship_last and ship_company
-  push @{$cust_main->index->lol_ref}, ( ['ship_last'], ['ship_company'] ) 
-}
-
-#add radius attributes to svc_acct
-
-my($svc_acct)=$dbdef->table('svc_acct');
-
-my($attribute);
-foreach $attribute (@attributes) {
-  $svc_acct->addcolumn ( new DBIx::DBSchema::Column (
-    'radius_'. $attribute,
-    'varchar',
-    'NULL',
-    $char_d,
-  ));
-}
-
-foreach $attribute (@check_attributes) {
-  $svc_acct->addcolumn( new DBIx::DBSchema::Column (
-    'rc_'. $attribute,
-    'varchar',
-    'NULL',
-    $char_d,
-  ));
-}
-
-#create history tables (false laziness w/create-history-tables)
-foreach my $table ( grep { ! /^h_/ } $dbdef->tables ) {
-  my $tableobj = $dbdef->table($table)
-    or die "unknown table $table";
-
-  die "unique->lol_ref undefined for $table"
-    unless defined $tableobj->unique->lol_ref;
-  die "index->lol_ref undefined for $table"
-    unless defined $tableobj->index->lol_ref;
-
-  my $h_tableobj = DBIx::DBSchema::Table->new( {
-    name        => "h_$table",
-    primary_key => 'historynum',
-    unique      => DBIx::DBSchema::ColGroup::Unique->new( [] ),
-    'index'     => DBIx::DBSchema::ColGroup::Index->new( [
-                     @{$tableobj->unique->lol_ref},
-                     @{$tableobj->index->lol_ref}
-                   ] ),
-    columns     => [
-                     DBIx::DBSchema::Column->new( {
-                       'name'    => 'historynum',
-                       'type'    => 'serial',
-                       'null'    => 'NOT NULL',
-                       'length'  => '',
-                       'default' => '',
-                       'local'   => '',
-                     } ),
-                     DBIx::DBSchema::Column->new( {
-                       'name'    => 'history_date',
-                       'type'    => 'int',
-                       'null'    => 'NULL',
-                       'length'  => '',
-                       'default' => '',
-                       'local'   => '',
-                     } ),
-                     DBIx::DBSchema::Column->new( {
-                       'name'    => 'history_user',
-                       'type'    => 'varchar',
-                       'null'    => 'NOT NULL',
-                       'length'  => '80',
-                       'default' => '',
-                       'local'   => '',
-                     } ),
-                     DBIx::DBSchema::Column->new( {
-                       'name'    => 'history_action',
-                       'type'    => 'varchar',
-                       'null'    => 'NOT NULL',
-                       'length'  => '80',
-                       'default' => '',
-                       'local'   => '',
-                     } ),
-                     map { $tableobj->column($_) } $tableobj->columns
-                   ],
-  } );
-  $dbdef->addtable($h_tableobj);
-}
-
-#important
-$dbdef->save($dbdef_file);
-&FS::Record::reload_dbdef($dbdef_file);
-
-###
-# create 'em
-###
-
-my($dbh)=adminsuidsetup $user;
-
-#create tables
-$|=1;
-
-foreach my $statement ( $dbdef->sql($dbh) ) {
-  $dbh->do( $statement )
-    or die "CREATE error: ". $dbh->errstr. "\ndoing statement: $statement";
-}
-
-#not really sample data (and shouldn't default to US)
-
-#cust_main_county
-
-#USPS state codes
-foreach ( qw(
-AL AK AS AZ AR CA CO CT DC DE FM FL GA GU HI ID IL IN IA KS KY LA
-ME MH MD MA MI MN MS MO MT NC ND NE NH NJ NM NV NY MP OH OK OR PA PW PR RI 
-SC SD TN TX UT VT VI VA WA WV WI WY AE AA AP
-) ) {
-  my($cust_main_county)=new FS::cust_main_county({
-    'state' => $_,
-    'tax'   => 0,
-    'country' => 'US',
-  });  
-  my($error);
-  $error=$cust_main_county->insert;
-  die $error if $error;
-}
-
-#AU "offical" state codes ala mark.williamson@ebbs.com.au (Mark Williamson)
-foreach ( qw(
-VIC NSW NT QLD TAS ACT WA SA
-) ) {
-  my($cust_main_county)=new FS::cust_main_county({
-    'state' => $_,
-    'tax'   => 0,
-    'country' => 'AU',
-  });  
-  my($error);
-  $error=$cust_main_county->insert;
-  die $error if $error;
-}
-
-#ISO 2-letter country codes (same as country TLDs) except US and AU
-foreach ( qw(
-AF AL DZ AS AD AO AI AQ AG AR AM AW AT AZ BS BH BD BB BY BE BZ BJ BM BT BO
-BA BW BV BR IO BN BG BF BI KH CM CA CV KY CF TD CL CN CX CC CO KM CG CK CR CI
-HR CU CY CZ DK DJ DM DO TP EC EG SV GQ ER EE ET FK FO FJ FI FR FX GF PF TF GA
-GM GE DE GH GI GR GL GD GP GU GT GN GW GY HT HM HN HK HU IS IN ID IR IQ IE IL
-IT JM JP JO KZ KE KI KP KR KW KG LA LV LB LS LR LY LI LT LU MO MK MG MW MY MV
-ML MT MH MQ MR MU YT MX FM MD MC MN MS MA MZ MM NA NR NP NL AN NC NZ NI NE NG
-NU NF MP NO OM PK PW PA PG PY PE PH PN PL PT PR QA RE RO RU RW KN LC VC WS SM
-ST SA SN SC SL SG SK SI SB SO ZA GS ES LK SH PM SD SR SJ SZ SE CH SY TW TJ TZ
-TH TG TK TO TT TN TR TM TC TV UG UA AE GB UM UY UZ VU VA VE VN VG VI WF EH
-YE YU ZR ZM ZW
-) ) {
-  my($cust_main_county)=new FS::cust_main_county({
-    'tax'   => 0,
-    'country' => $_,
-  });  
-  my($error);
-  $error=$cust_main_county->insert;
-  die $error if $error;
-}
-
-#billing events
-foreach my $aref ( 
-  [ 'COMP', 'Comp invoice', '$cust_bill->comp();', 30, 'comp' ],
-  [ 'CARD', 'Batch card', '$cust_bill->batch_card();', 40, 'batch-card' ],
-  [ 'BILL', 'Send invoice', '$cust_bill->send();', 50, 'send' ],
-) {
-
-  my $part_bill_event = new FS::part_bill_event({
-    'payby' => $aref->[0],
-    'event' => $aref->[1],
-    'eventcode' => $aref->[2],
-    'seconds' => 0,
-    'weight' => $aref->[3],
-    'plan' => $aref->[4],
-  });
-  my($error);
-  $error=$part_bill_event->insert;
-  die $error if $error;
-
-}
-
-$dbh->commit or die $dbh->errstr;
-$dbh->disconnect or die $dbh->errstr;
-
-print "Freeside database initialized sucessfully\n";
-
-sub usage {
-  die "Usage:\n  fs-setup user\n"; 
-}
-
-###
-# Now it becomes an object.  much better.
-###
-sub tables_hash_hack {
-
-  #note that s/(date|change)/_$1/; to avoid keyword conflict.
-  #put a kludge in FS::Record to catch this or? (pry need some date-handling
-  #stuff anyway also)
-
-  my(%tables)=( #yech.}
-
-    'agent' => {
-      'columns' => [
-        'agentnum', 'serial',            '',     '',
-        'agent',    'varchar',           '',     $char_d,
-        'typenum',  'int',            '',     '',
-        'freq',     'int',       'NULL', '',
-        'prog',     @perl_type,
-      ],
-      'primary_key' => 'agentnum',
-      'unique' => [],
-      'index' => [ ['typenum'] ],
-    },
-
-    'agent_type' => {
-      'columns' => [
-        'typenum',   'serial',  '', '',
-        'atype',     'varchar', '', $char_d,
-      ],
-      'primary_key' => 'typenum',
-      'unique' => [],
-      'index' => [],
-    },
-
-    'type_pkgs' => {
-      'columns' => [
-        'typenum',   'int',  '', '',
-        'pkgpart',   'int',  '', '',
-      ],
-      'primary_key' => '',
-      'unique' => [ ['typenum', 'pkgpart'] ],
-      'index' => [ ['typenum'] ],
-    },
-
-    'cust_bill' => {
-      'columns' => [
-        'invnum',    'serial',  '', '',
-        'custnum',   'int',  '', '',
-        '_date',     @date_type,
-        'charged',   @money_type,
-        'printed',   'int',  '', '',
-        'closed',    'char', 'NULL', 1,
-      ],
-      'primary_key' => 'invnum',
-      'unique' => [],
-      'index' => [ ['custnum'] ],
-    },
-
-    'cust_bill_event' => {
-      'columns' => [
-        'eventnum',    'serial',  '', '',
-        'invnum',   'int',  '', '',
-        'eventpart',   'int',  '', '',
-        '_date',     @date_type,
-        'status', 'varchar', '', $char_d,
-        'statustext', 'text', 'NULL', '',
-      ],
-      'primary_key' => 'eventnum',
-      #no... there are retries now #'unique' => [ [ 'eventpart', 'invnum' ] ],
-      'unique' => [],
-      'index' => [ ['invnum'], ['status'] ],
-    },
-
-    'part_bill_event' => {
-      'columns' => [
-        'eventpart',    'serial',  '', '',
-        'payby',       'char',  '', 4,
-        'event',       'varchar',           '',     $char_d,
-        'eventcode',    @perl_type,
-        'seconds',     'int', 'NULL', '',
-        'weight',      'int', '', '',
-        'plan',       'varchar', 'NULL', $char_d,
-        'plandata',   'text', 'NULL', '',
-        'disabled',     'char', 'NULL', 1,
-      ],
-      'primary_key' => 'eventpart',
-      'unique' => [],
-      'index' => [ ['payby'] ],
-    },
-
-    'cust_bill_pkg' => {
-      'columns' => [
-        'pkgnum',  'int', '', '',
-        'invnum',  'int', '', '',
-        'setup',   @money_type,
-        'recur',   @money_type,
-        'sdate',   @date_type,
-        'edate',   @date_type,
-      ],
-      'primary_key' => '',
-      'unique' => [ ['pkgnum', 'invnum'] ],
-      'index' => [ ['invnum'] ],
-    },
-
-    'cust_credit' => {
-      'columns' => [
-        'crednum',  'serial', '', '',
-        'custnum',  'int', '', '',
-        '_date',    @date_type,
-        'amount',   @money_type,
-        'otaker',   'varchar', '', 32,
-        'reason',   'text', 'NULL', '',
-        'closed',    'char', 'NULL', 1,
-      ],
-      'primary_key' => 'crednum',
-      'unique' => [],
-      'index' => [ ['custnum'] ],
-    },
-
-    'cust_credit_bill' => {
-      'columns' => [
-        'creditbillnum', 'serial', '', '',
-        'crednum',  'int', '', '',
-        'invnum',  'int', '', '',
-        '_date',    @date_type,
-        'amount',   @money_type,
-      ],
-      'primary_key' => 'creditbillnum',
-      'unique' => [],
-      'index' => [ ['crednum'], ['invnum'] ],
-    },
-
-    'cust_main' => {
-      'columns' => [
-        'custnum',  'serial',  '',     '',
-        'agentnum', 'int',  '',     '',
-#        'titlenum', 'int',  'NULL',   '',
-        'last',     'varchar', '',     $char_d,
-#        'middle',   'varchar', 'NULL', $char_d,
-        'first',    'varchar', '',     $char_d,
-        'ss',       'char', 'NULL', 11,
-        'company',  'varchar', 'NULL', $char_d,
-        'address1', 'varchar', '',     $char_d,
-        'address2', 'varchar', 'NULL', $char_d,
-        'city',     'varchar', '',     $char_d,
-        'county',   'varchar', 'NULL', $char_d,
-        'state',    'varchar', 'NULL', $char_d,
-        'zip',      'varchar', '',     10,
-        'country',  'char', '',     2,
-        'daytime',  'varchar', 'NULL', 20,
-        'night',    'varchar', 'NULL', 20,
-        'fax',      'varchar', 'NULL', 12,
-        'ship_last',     'varchar', 'NULL', $char_d,
-#        'ship_middle',   'varchar', 'NULL', $char_d,
-        'ship_first',    'varchar', 'NULL', $char_d,
-        'ship_company',  'varchar', 'NULL', $char_d,
-        'ship_address1', 'varchar', 'NULL', $char_d,
-        'ship_address2', 'varchar', 'NULL', $char_d,
-        'ship_city',     'varchar', 'NULL', $char_d,
-        'ship_county',   'varchar', 'NULL', $char_d,
-        'ship_state',    'varchar', 'NULL', $char_d,
-        'ship_zip',      'varchar', 'NULL', 10,
-        'ship_country',  'char', 'NULL', 2,
-        'ship_daytime',  'varchar', 'NULL', 20,
-        'ship_night',    'varchar', 'NULL', 20,
-        'ship_fax',      'varchar', 'NULL', 12,
-        'payby',    'char', '',     4,
-        'payinfo',  'varchar', 'NULL', $char_d,
-        #'paydate',  @date_type,
-        'paydate',  'varchar', 'NULL', 10,
-        'payname',  'varchar', 'NULL', $char_d,
-        'tax',      'char', 'NULL', 1,
-        'otaker',   'varchar', '',    32,
-        'refnum',   'int',  '',     '',
-        'referral_custnum', 'int',  'NULL', '',
-        'comments', 'text', 'NULL', '',
-      ],
-      'primary_key' => 'custnum',
-      'unique' => [],
-      #'index' => [ ['last'], ['company'] ],
-      'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ] ],
-    },
-
-    'cust_main_invoice' => {
-      'columns' => [
-        'destnum',  'serial',  '',     '',
-        'custnum',  'int',  '',     '',
-        'dest',     'varchar', '',  $char_d,
-      ],
-      'primary_key' => 'destnum',
-      'unique' => [],
-      'index' => [ ['custnum'], ],
-    },
-
-    'cust_main_county' => { #county+state+country are checked off the
-                            #cust_main_county for validation and to provide
-                            # a tax rate.
-      'columns' => [
-        'taxnum',   'serial',   '',    '',
-        'state',    'varchar',  'NULL',    $char_d,
-        'county',   'varchar',  'NULL',    $char_d,
-        'country',  'char',  '', 2, 
-        'taxclass',   'varchar', 'NULL', $char_d,
-        'exempt_amount', @money_type,
-        'tax',      'real',  '',    '', #tax %
-      ],
-      'primary_key' => 'taxnum',
-      'unique' => [],
-  #    'unique' => [ ['taxnum'], ['state', 'county'] ],
-      'index' => [],
-    },
-
-    'cust_pay' => {
-      'columns' => [
-        'paynum',   'serial',    '',   '',
-        #now cust_bill_pay #'invnum',   'int',    '',   '',
-        'custnum',  'int',    '',   '',
-        'paid',     @money_type,
-        '_date',    @date_type,
-        'payby',    'char',   '',     4, # CARD/BILL/COMP, should be index into
-                                         # payment type table.
-        'payinfo',  'varchar',   'NULL', 16,  #see cust_main above
-        'paybatch', 'varchar',   'NULL', $char_d, #for auditing purposes.
-        'closed',    'char', 'NULL', 1,
-      ],
-      'primary_key' => 'paynum',
-      'unique' => [],
-      'index' => [ [ 'custnum' ], [ 'paybatch' ] ],
-    },
-
-    'cust_bill_pay' => {
-      'columns' => [
-        'billpaynum', 'serial',     '',   '',
-        'invnum',  'int',     '',   '',
-        'paynum',  'int',     '',   '',
-        'amount',  @money_type,
-        '_date',   @date_type
-      ],
-      'primary_key' => 'billpaynum',
-      'unique' => [],
-      'index' => [ [ 'paynum' ], [ 'invnum' ] ],
-    },
-
-    'cust_pay_batch' => { #what's this used for again?  list of customers
-                          #in current CARD batch? (necessarily CARD?)
-      'columns' => [
-        'paybatchnum',   'serial',    '',   '',
-        'invnum',   'int',    '',   '',
-        'custnum',   'int',    '',   '',
-        'last',     'varchar', '',     $char_d,
-        'first',    'varchar', '',     $char_d,
-        'address1', 'varchar', '',     $char_d,
-        'address2', 'varchar', 'NULL', $char_d,
-        'city',     'varchar', '',     $char_d,
-        'state',    'varchar', 'NULL', $char_d,
-        'zip',      'varchar', '',     10,
-        'country',  'char', '',     2,
-#        'trancode', 'int', '', '',
-        'cardnum',  'varchar', '',     16,
-        #'exp',      @date_type,
-        'exp',      'varchar', '',     11,
-        'payname',  'varchar', 'NULL', $char_d,
-        'amount',   @money_type,
-      ],
-      'primary_key' => 'paybatchnum',
-      'unique' => [],
-      'index' => [ ['invnum'], ['custnum'] ],
-    },
-
-    'cust_pkg' => {
-      'columns' => [
-        'pkgnum',    'serial',    '',   '',
-        'custnum',   'int',    '',   '',
-        'pkgpart',   'int',    '',   '',
-        'otaker',    'varchar', '', 32,
-        'setup',     @date_type,
-        'bill',      @date_type,
-        'susp',      @date_type,
-        'cancel',    @date_type,
-        'expire',    @date_type,
-        'manual_flag', 'char', 'NULL', 1,
-      ],
-      'primary_key' => 'pkgnum',
-      'unique' => [],
-      'index' => [ ['custnum'] ],
-    },
-
-    'cust_refund' => {
-      'columns' => [
-        'refundnum',    'serial',    '',   '',
-        #now cust_credit_refund #'crednum',      'int',    '',   '',
-        'custnum',  'int',    '',   '',
-        '_date',        @date_type,
-        'refund',       @money_type,
-        'otaker',       'varchar',   '',   32,
-        'reason',       'varchar',   '',   $char_d,
-        'payby',        'char',   '',     4, # CARD/BILL/COMP, should be index
-                                             # into payment type table.
-        'payinfo',      'varchar',   'NULL', 16,  #see cust_main above
-        'paybatch',     'varchar',   'NULL', $char_d,
-        'closed',    'char', 'NULL', 1,
-      ],
-      'primary_key' => 'refundnum',
-      'unique' => [],
-      'index' => [],
-    },
-
-    'cust_credit_refund' => {
-      'columns' => [
-        'creditrefundnum', 'serial',     '',   '',
-        'crednum',  'int',     '',   '',
-        'refundnum',  'int',     '',   '',
-        'amount',  @money_type,
-        '_date',   @date_type
-      ],
-      'primary_key' => 'creditrefundnum',
-      'unique' => [],
-      'index' => [ [ 'crednum', 'refundnum' ] ],
-    },
-
-
-    'cust_svc' => {
-      'columns' => [
-        'svcnum',    'serial',    '',   '',
-        'pkgnum',    'int',    'NULL',   '',
-        'svcpart',   'int',    '',   '',
-      ],
-      'primary_key' => 'svcnum',
-      'unique' => [],
-      'index' => [ ['svcnum'], ['pkgnum'], ['svcpart'] ],
-    },
-
-    'part_pkg' => {
-      'columns' => [
-        'pkgpart',    'serial',    '',   '',
-        'pkg',        'varchar',   '',   $char_d,
-        'comment',    'varchar',   '',   $char_d,
-        'setup',      @perl_type,
-        'freq',       'int', '', '',  #billing frequency (months)
-        'recur',      @perl_type,
-        'setuptax',  'char', 'NULL', 1,
-        'recurtax',  'char', 'NULL', 1,
-        'plan',       'varchar', 'NULL', $char_d,
-        'plandata',   'text', 'NULL', '',
-        'disabled',   'char', 'NULL', 1,
-        'taxclass',   'varchar', 'NULL', $char_d,
-      ],
-      'primary_key' => 'pkgpart',
-      'unique' => [],
-      'index' => [],
-    },
-
-#    'part_title' => {
-#      'columns' => [
-#        'titlenum',   'int',    '',   '',
-#        'title',      'varchar',   '',   $char_d,
-#      ],
-#      'primary_key' => 'titlenum',
-#      'unique' => [ [] ],
-#      'index' => [ [] ],
-#    },
-
-    'pkg_svc' => {
-      'columns' => [
-        'pkgpart',    'int',    '',   '',
-        'svcpart',    'int',    '',   '',
-        'quantity',   'int',    '',   '',
-      ],
-      'primary_key' => '',
-      'unique' => [ ['pkgpart', 'svcpart'] ],
-      'index' => [ ['pkgpart'] ],
-    },
-
-    'part_referral' => {
-      'columns' => [
-        'refnum',   'serial',    '',   '',
-        'referral', 'varchar',   '',   $char_d,
-      ],
-      'primary_key' => 'refnum',
-      'unique' => [],
-      'index' => [],
-    },
-
-    'part_svc' => {
-      'columns' => [
-        'svcpart',    'serial',    '',   '',
-        'svc',        'varchar',   '',   $char_d,
-        'svcdb',      'varchar',   '',   $char_d,
-        'disabled',   'char',  'NULL',   1,
-      ],
-      'primary_key' => 'svcpart',
-      'unique' => [],
-      'index' => [],
-    },
-
-    'part_svc_column' => {
-      'columns' => [
-        'columnnum',   'serial',         '', '',
-        'svcpart',     'int',         '', '',
-        'columnname',  'varchar',     '', 64,
-        'columnvalue', 'varchar', 'NULL', $char_d,
-        'columnflag',  'char',    'NULL', 1, 
-      ],
-      'primary_key' => 'columnnum',
-      'unique' => [ [ 'svcpart', 'columnname' ] ],
-      'index' => [ [ 'svcpart' ] ],
-    },
-
-    #(this should be renamed to part_pop)
-    'svc_acct_pop' => {
-      'columns' => [
-        'popnum',    'serial',    '',   '',
-        'city',      'varchar',   '',   $char_d,
-        'state',     'varchar',   '',   $char_d,
-        'ac',        'char',   '',   3,
-        'exch',      'char',   '',   3,
-        'loc',       'char',   'NULL',   4, #NULL for legacy purposes
-      ],
-      'primary_key' => 'popnum',
-      'unique' => [],
-      'index' => [ [ 'state' ] ],
-    },
-
-    'part_pop_local' => {
-      'columns' => [
-        'localnum',  'serial',     '',     '',
-        'popnum',    'int',     '',     '',
-        'city',      'varchar', 'NULL', $char_d,
-        'state',     'char',    'NULL', 2,
-        'npa',       'char',    '',     3,
-        'nxx',       'char',    '',     3,
-      ],
-      'primary_key' => 'localnum',
-      'unique' => [],
-      'index' => [ [ 'npa', 'nxx' ], [ 'popnum' ] ],
-    },
-
-    'svc_acct' => {
-      'columns' => [
-        'svcnum',    'int',    '',   '',
-        'username',  'varchar',   '',   $username_len, #unique (& remove dup code)
-        '_password', 'varchar',   '',   50, #13 for encryped pw's plus ' *SUSPENDED* (mp5 passwords can be 34)
-        'sec_phrase', 'varchar',  'NULL',   $char_d,
-        'popnum',    'int',    'NULL',   '',
-        'uid',       'int', 'NULL',   '',
-        'gid',       'int', 'NULL',   '',
-        'finger',    'varchar',   'NULL',   $char_d,
-        'dir',       'varchar',   'NULL',   $char_d,
-        'shell',     'varchar',   'NULL',   $char_d,
-        'quota',     'varchar',   'NULL',   $char_d,
-        'slipip',    'varchar',   'NULL',   15, #four TINYINTs, bah.
-        'seconds',   'int', 'NULL',   '', #uhhhh
-        'domsvc',    'int', '',   '',
-      ],
-      'primary_key' => 'svcnum',
-      #'unique' => [ [ 'username', 'domsvc' ] ],
-      'unique' => [],
-      'index' => [ ['username'], ['domsvc'] ],
-    },
-
-    #'svc_charge' => {
-    #  'columns' => [
-    #    'svcnum',    'int',    '',   '',
-    #    'amount',    @money_type,
-    #  ],
-    #  'primary_key' => 'svcnum',
-    #  'unique' => [ [] ],
-    #  'index' => [ [] ],
-    #},
-
-    'svc_domain' => {
-      'columns' => [
-        'svcnum',    'int',    '',   '',
-        'domain',    'varchar',    '',   $char_d,
-        'catchall',  'int', 'NULL',    '',
-      ],
-      'primary_key' => 'svcnum',
-      'unique' => [ ['domain'] ],
-      'index' => [],
-    },
-
-    'domain_record' => {
-      'columns' => [
-        'recnum',    'serial',     '',  '',
-        'svcnum',    'int',     '',  '',
-        'reczone',   'varchar', '',  $char_d,
-        'recaf',     'char',    '',  2,
-        'rectype',   'char',    '',  5,
-        'recdata',   'varchar', '',  $char_d,
-      ],
-      'primary_key' => 'recnum',
-      'unique'      => [],
-      'index'       => [ ['svcnum'] ],
-    },
-
-    'svc_forward' => {
-      'columns' => [
-        'svcnum',   'int',    '',  '',
-        'srcsvc',   'int',    '',  '',
-        'dstsvc',   'int',    '',  '',
-        'dst',      'varchar',    'NULL',  $char_d,
-      ],
-      'primary_key' => 'svcnum',
-      'unique'      => [],
-      'index'       => [ ['srcsvc'], ['dstsvc'] ],
-    },
-
-    'svc_www' => {
-      'columns' => [
-        'svcnum',   'int',    '',  '',
-        'recnum',   'int',    '',  '',
-        'usersvc',  'int',    '',  '',
-      ],
-      'primary_key' => 'svcnum',
-      'unique'      => [],
-      'index'       => [],
-    },
-
-    #'svc_wo' => {
-    #  'columns' => [
-    #    'svcnum',    'int',    '',   '',
-    #    'svcnum',    'int',    '',   '',
-    #    'svcnum',    'int',    '',   '',
-    #    'worker',    'varchar',   '',   $char_d,
-    #    '_date',     @date_type,
-    #  ],
-    #  'primary_key' => 'svcnum',
-    #  'unique' => [ [] ],
-    #  'index' => [ [] ],
-    #},
-
-    'prepay_credit' => {
-      'columns' => [
-        'prepaynum',   'serial',     '',   '',
-        'identifier',  'varchar', '', $char_d,
-        'amount',      @money_type,
-        'seconds',     'int',     'NULL', '',
-      ],
-      'primary_key' => 'prepaynum',
-      'unique'      => [ ['identifier'] ],
-      'index'       => [],
-    },
-
-    'port' => {
-      'columns' => [
-        'portnum',  'serial',     '',   '',
-        'ip',       'varchar', 'NULL', 15,
-        'nasport',  'int',     'NULL', '',
-        'nasnum',   'int',     '',   '',
-      ],
-      'primary_key' => 'portnum',
-      'unique'      => [],
-      'index'       => [],
-    },
-
-    'nas' => {
-      'columns' => [
-        'nasnum',   'serial',     '',    '',
-        'nas',      'varchar', '',    $char_d,
-        'nasip',    'varchar', '',    15,
-        'nasfqdn',  'varchar', '',    $char_d,
-        'last',     'int',     '',    '',
-      ],
-      'primary_key' => 'nasnum',
-      'unique'      => [ [ 'nas' ], [ 'nasip' ] ],
-      'index'       => [ [ 'last' ] ],
-    },
-
-    'session' => {
-      'columns' => [
-        'sessionnum', 'serial',       '',   '',
-        'portnum',    'int',       '',   '',
-        'svcnum',     'int',       '',   '',
-        'login',      @date_type,
-        'logout',     @date_type,
-      ],
-      'primary_key' => 'sessionnum',
-      'unique'      => [],
-      'index'       => [ [ 'portnum' ] ],
-    },
-
-    'queue' => {
-      'columns' => [
-        'jobnum', 'serial', '', '',
-        'job', 'text', '', '',
-        '_date', 'int', '', '',
-        'status', 'varchar', '', $char_d,
-        'statustext', 'text', 'NULL', '',
-        'svcnum', 'int', 'NULL', '',
-      ],
-      'primary_key' => 'jobnum',
-      'unique'      => [],
-      'index'       => [ [ 'svcnum' ], [ 'status' ] ],
-    },
-
-    'queue_arg' => {
-      'columns' => [
-        'argnum', 'serial', '', '',
-        'jobnum', 'int', '', '',
-        'arg', 'text', 'NULL', '',
-      ],
-      'primary_key' => 'argnum',
-      'unique'      => [],
-      'index'       => [ [ 'jobnum' ] ],
-    },
-
-    'queue_depend' => {
-      'columns' => [
-        'dependnum', 'serial', '', '',
-        'jobnum', 'int', '', '',
-        'depend_jobnum', 'int', '', '',
-      ],
-      'primary_key' => 'dependnum',
-      'unique'      => [],
-      'index'       => [ [ 'jobnum' ], [ 'depend_jobnum' ] ],
-    },
-
-    'export_svc' => {
-      'columns' => [
-        'exportsvcnum' => 'serial', '', '',
-        'exportnum'    => 'int', '', '',
-        'svcpart'      => 'int', '', '',
-      ],
-      'primary_key' => 'exportsvcnum',
-      'unique'      => [ [ 'exportnum', 'svcpart' ] ],
-      'index'       => [ [ 'exportnum' ], [ 'svcpart' ] ],
-    },
-
-    'part_export' => {
-      'columns' => [
-        'exportnum', 'serial', '', '',
-        #'svcpart',   'int', '', '',
-        'machine', 'varchar', '', $char_d,
-        'exporttype', 'varchar', '', $char_d,
-        'nodomain',     'char', 'NULL', 1,
-      ],
-      'primary_key' => 'exportnum',
-      'unique'      => [],
-      'index'       => [ [ 'machine' ], [ 'exporttype' ] ],
-    },
-
-    'part_export_option' => {
-      'columns' => [
-        'optionnum', 'serial', '', '',
-        'exportnum', 'int', '', '',
-        'optionname', 'varchar', '', $char_d,
-        'optionvalue', 'text', 'NULL', '',
-      ],
-      'primary_key' => 'optionnum',
-      'unique'      => [],
-      'index'       => [ [ 'exportnum' ], [ 'optionname' ] ],
-    },
-
-    'radius_usergroup' => {
-      'columns' => [
-        'usergroupnum', 'serial', '', '',
-        'svcnum',       'int', '', '',
-        'groupname',    'varchar', '', $char_d,
-      ],
-      'primary_key' => 'usergroupnum',
-      'unique'      => [],
-      'index'       => [ [ 'svcnum' ], [ 'groupname' ] ],
-    },
-
-    'msgcat' => {
-      'columns' => [
-        'msgnum', 'serial', '', '',
-        'msgcode', 'varchar', '', $char_d,
-        'locale', 'varchar', '', 16,
-        'msg', 'text', '', '',
-      ],
-      'primary_key' => 'msgnum',
-      'unique'      => [ [ 'msgcode', 'locale' ] ],
-      'index'       => [],
-    },
-
-    'cust_tax_exempt' => {
-      'columns' => [
-        'exemptnum', 'serial', '', '',
-        'custnum',   'int', '', '',
-        'taxnum',    'int', '', '',
-        'year',      'int', '', '',
-        'month',     'int', '', '',
-        'amount',   @money_type,
-      ],
-      'primary_key' => 'exemptnum',
-      'unique'      => [ [ 'custnum', 'taxnum', 'year', 'month' ] ],
-      'index'       => [],
-    },
-
-    'ac_type' => {
-      'columns' => [
-        'actypenum', 'serial', '', '',
-        'actypename', 'varchar', '', 15,
-      ],
-      'primary_key' => 'actypenum',
-      'unique'      => [],
-      'index'       => [],
-    },
-
-    'ac' => {
-      'columns' => [
-        'acnum', 'serial', '', '',
-        'actypenum', 'int', '', '',
-        'acname', 'varchar', '', 15,
-      ],
-      'primary_key' => 'acnum',
-      'unique'      => [],
-      'index'       => [],
-    },
-
-    'part_ac_field' => {
-      'columns' => [
-        'acfieldpart', 'serial', '', '',
-        'actypenum', 'int', '', '',
-        'name', 'varchar', '', 15,
-        'ut_type', 'varchar', '', 15,
-      ],
-      'primary_key' => 'acfieldpart',
-      'unique'      => [],
-      'index'       => [],
-    },
-
-    'ac_field' => {
-      'columns' => [
-        'acfieldpart', 'int', '', '',
-        'acnum', 'int', '', '',
-        'value', 'varchar', '', 127,
-      ],
-      'primary_key' => '',
-      'unique'      => [ [ 'acfieldpart', 'acnum' ] ],
-      'index'       => [],
-    },
-
-    'ac_block' => {
-      'columns' => [
-        'acnum', 'int', '', '',
-        'ip_gateway', 'char', '', 15,
-        'ip_netmask', 'int', '', '',
-      ],
-      'primary_key' => '',
-      'unique'      => [],
-      'index'       => [],
-    },
-
-    'svc_broadband' => {
-      'columns' => [
-        'svcnum', 'serial', '', '',
-        'actypenum', 'int', '', '',
-        'speed_up', 'int', '', '',
-        'speed_down', 'int', '', '',
-        'acnum', 'int', '', '',
-        'ip_addr', 'char', '', 15,
-        'ip_netmask', 'int', '', '',
-        'mac_addr', 'char', '', 17,
-        'location', 'varchar', '', 127,
-      ],
-      'primary_key' => 'svcnum',
-      'unique'      => [],
-      'index'       => [],
-    },
-
-  );
-
-  %tables;
-
-}
-
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index e6f6f59de..e6f4edbbc 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -181,12 +181,12 @@ $ <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -c -h /usr/local/
 $ <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
     </ul>
   <i>(using other auth types, add each user to your <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache authentication</a> and then run: <tt>freeside-adduser <b>username</b></tt></i>
-  <li>As the freeside UNIX user, run <tt>bin/fs-setup <b>username</b></tt> (in the untar'ed freeside directory) to create the database tables, passing the username of a Freeside user you created above:
+  <li>As the freeside UNIX user, run <tt>freeside--setup <b>username</b></tt> (in the untar'ed freeside directory) to create the database tables, passing the username of a Freeside user you created above:
 <pre>
 $ su freeside
-$ cd <b>/path/to/freeside-1.4.0/</b>
-$ bin/fs-setup <b>username</b>
+$ freeside-setup <b>username</b>
 </pre>
+  Alternately, use the -s option to enable shipping addresses: <tt>freeside-setup -s <b>username</b></tt>
   <li>As the freeside UNIX user, run <tt>bin/populate-msgcat <b>username</b></tt> (in the untar'ed freeside directory) to populate the message catalog, passing the username of a Freeside user you created above:
 <pre>
 $ su freeside
-- 
cgit v1.2.1


From 9c3fb2a84c655cbbaafed99586f1431e08c218d5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 20 Sep 2002 14:48:35 +0000
Subject: extraneous warn

---
 FS/FS/part_export.pm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 647666b86..1b402e014 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -274,8 +274,6 @@ sub check {
   ;
   return $error if $error;
 
-  warn $self->machine. "!!!\n";
-
   $self->machine =~ /^([\w\-\.]*)$/
     or return "Illegal machine: ". $self->machine;
   $self->machine($1);
-- 
cgit v1.2.1


From b59cf43f0814ea4d484d4b09833dd3c2d493455f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 20 Sep 2002 15:46:29 +0000
Subject: fix database sequence code, closes: Bug#69

---
 FS/FS/Record.pm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 8778dee79..a23f37a62 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -480,10 +480,17 @@ sub insert {
   my $db_seq = 0;
   if ( $primary_key ) {
     my $col = $self->dbdef_table->column($primary_key);
-    my $db_seq =
+    
+    $db_seq =
       uc($col->type) eq 'SERIAL'
-      || ( driver_name eq 'Pg'    && $col->default =~ /^nextval\(/i     )
-      || ( driver_name eq 'mysql' && $col->local   =~ /AUTO_INCREMENT/i );
+      || ( driver_name eq 'Pg'
+             && defined($col->default)
+             && $col->default =~ /^nextval\(/i
+         )
+      || ( driver_name eq 'mysql'
+             && defined($col->local)
+             && $col->local =~ /AUTO_INCREMENT/i
+         );
     $self->unique($primary_key) unless $self->getfield($primary_key) || $db_seq;
   }
 
@@ -515,11 +522,12 @@ sub insert {
   $sth->execute or return $sth->errstr;
 
   if ( $db_seq ) { # get inserted id from the database, if applicable
+    warn "[debug]$me retreiving sequence from database\n" if $DEBUG;
     my $insertid = '';
     if ( driver_name eq 'Pg' ) {
 
       my $oid = $sth->{'pg_oid_status'};
-      my $i_sql = "SELECT id FROM $table WHERE oid = ?";
+      my $i_sql = "SELECT $primary_key FROM $table WHERE oid = ?";
       my $i_sth = dbh->prepare($i_sql) or do {
         dbh->rollback if $FS::UID::AutoCommit;
         return dbh->errstr;
-- 
cgit v1.2.1


From 70a4b5227943108ce91c68e1c4e7509a9a6c33f9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 20 Sep 2002 15:47:58 +0000
Subject: add freeside-deluser, freeside-deloutsource and
 freeside-deloutsourceuser

---
 FS/MANIFEST                      |  3 ++
 FS/bin/freeside-addoutsourceuser |  2 +-
 FS/bin/freeside-deloutsource     | 11 +++++++
 FS/bin/freeside-deloutsourceuser |  6 ++++
 FS/bin/freeside-deluser          | 64 ++++++++++++++++++++++++++++++++++++++++
 FS/bin/freeside-setup            |  2 +-
 bin/populate-msgcat              |  2 +-
 7 files changed, 87 insertions(+), 3 deletions(-)
 create mode 100644 FS/bin/freeside-deloutsource
 create mode 100644 FS/bin/freeside-deloutsourceuser
 create mode 100644 FS/bin/freeside-deluser

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 3cf4c2ba3..24fef1748 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -9,8 +9,11 @@ bin/freeside-email
 bin/freeside-queued
 bin/freeside-addoutsource
 bin/freeside-addoutsourceuser
+bin/freeside-deloutsource
+bin/freeside-deloutsourceuser
 bin/freeside-apply-credits
 bin/freeside-adduser
+bin/freeside-deluser
 bin/freeside-setup
 bin/freeside-setinvoice
 bin/freeside-overdue
diff --git a/FS/bin/freeside-addoutsourceuser b/FS/bin/freeside-addoutsourceuser
index bbad8aa3f..180cd9399 100644
--- a/FS/bin/freeside-addoutsourceuser
+++ b/FS/bin/freeside-addoutsourceuser
@@ -11,5 +11,5 @@ freeside-adduser -h /usr/local/etc/freeside/htpasswd \
 
 [ -e /usr/local/etc/freeside/dbdef.DBI:Pg:host=localhost\;dbname=$domain ] \
  || ( freeside-setup $username 2>/dev/null; \
-      /home/ivan/freeside/bin/populate-msgcat $username; 2>/dev/null )
+      /home/ivan/freeside/bin/populate-msgcat $username )
 
diff --git a/FS/bin/freeside-deloutsource b/FS/bin/freeside-deloutsource
new file mode 100644
index 000000000..561853539
--- /dev/null
+++ b/FS/bin/freeside-deloutsource
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+domain=$1
+
+dropdb $domain && \
+rm -rf /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain && \
+rm -rf /usr/local/etc/freeside/counters.DBI:Pg:host=localhost\;dbname=$domain && \
+rm -rf /usr/local/etc/freeside/cache.DBI:Pg:host=localhost\;dbname=$domain && \
+rm -rf /usr/local/etc/freeside/export.DBI:Pg:host=localhost\;dbname=$domain && \
+rm /usr/local/etc/freeside/dbdef.DBI:Pg:host=localhost\;dbname=$domain
+
diff --git a/FS/bin/freeside-deloutsourceuser b/FS/bin/freeside-deloutsourceuser
new file mode 100644
index 000000000..96871e50c
--- /dev/null
+++ b/FS/bin/freeside-deloutsourceuser
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+username=$1
+
+freeside-deluser -h /usr/local/etc/freeside/htpasswd $username 2>/dev/null
+
diff --git a/FS/bin/freeside-deluser b/FS/bin/freeside-deluser
new file mode 100644
index 000000000..57d6ce165
--- /dev/null
+++ b/FS/bin/freeside-deluser
@@ -0,0 +1,64 @@
+#!/usr/bin/perl -w
+
+use strict;
+use vars qw($opt_h);
+use Fcntl qw(:flock);
+use Getopt::Std;
+
+my $FREESIDE_CONF = "/usr/local/etc/freeside";
+
+getopts("h:");
+my $user = shift or die &usage;
+
+if ( $opt_h ) {
+  open(HTPASSWD,"<$opt_h")
+    and flock(HTPASSWD,LOCK_EX)
+      or die "can't open $opt_h: $!";
+  open(HTPASSWD_TMP,">$opt_h.tmp") or die "can't open $opt_h.tmp: $!";
+  while (<HTPASSWD>) {
+    print HTPASSWD_TMP $_ unless /^$user:/;
+  }
+  close HTPASSWD_TMP;
+  rename "$opt_h.tmp", "$opt_h" or die $!;
+  flock(HTPASSWD,LOCK_UN);
+  close HTPASSWD;
+}
+
+open(MAPSECRETS,"<$FREESIDE_CONF/mapsecrets")
+  and flock(MAPSECRETS,LOCK_EX)
+    or die "can't open $FREESIDE_CONF/mapsecrets: $!";
+open(MAPSECRETS_TMP,">>$FREESIDE_CONF/mapsecrets.tmp")
+  or die "can't open $FREESIDE_CONF/mapsecrets.tmp: $!";
+while (<MAPSECRETS>) {
+  print MAPSECRETS_TMP $_ unless /^$user\s/;
+}
+close MAPSECRETS_TMP;
+rename "$FREESIDE_CONF/mapsecrets.tmp", "$FREESIDE_CONF/mapsecrets" or die $!;
+flock(MAPSECRETS,LOCK_UN);
+close MAPSECRETS;
+
+sub usage {
+  die "Usage:\n\n  freeside-deluser [ -h htpasswd_file ] username"
+}
+
+=head1 NAME
+
+freeside-deluser - Command line interface to add (freeside) users.
+
+=head1 SYNOPSIS
+
+  freeside-deluser [ -h htpasswd_file ] username
+
+=head1 DESCRIPTION
+
+Adds a user to the Freeside billing system.  This is for adding users (internal
+sales/tech folks) to the web interface, not for adding customer accounts.
+
+  -h: Also delete from the given htpasswd filename
+
+=head1 SEE ALSO
+
+L<freeside-adduser>, L<htpasswd>(1), base Freeside documentation
+
+=cut
+
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index cb74e64c8..e8bb7ec62 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -7,7 +7,7 @@ use strict;
 use vars qw($opt_s);
 use Getopt::Std;
 use DBI;
-use DBIx::DBSchema 0.20;
+use DBIx::DBSchema 0.21;
 use DBIx::DBSchema::Table;
 use DBIx::DBSchema::Column;
 use DBIx::DBSchema::ColGroup::Unique;
diff --git a/bin/populate-msgcat b/bin/populate-msgcat
index f8e23cfa0..3b198f718 100755
--- a/bin/populate-msgcat
+++ b/bin/populate-msgcat
@@ -27,7 +27,7 @@ foreach my $msgcode ( keys %messages ) {
   }
 }
 
-print "Message catalog initialized sucessfully\n";
+#print "Message catalog initialized sucessfully\n";
 
 sub messages {
 
-- 
cgit v1.2.1


From 0f6dcbb5c3e51dc9caa8fe44d03991ad998f8319 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 20 Sep 2002 15:48:28 +0000
Subject: 1.5.0

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 6ec108c02..b97142734 100644
--- a/Makefile
+++ b/Makefile
@@ -40,8 +40,8 @@ SIGNUP_REFNUM = 2
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.4.1beta1
-TAG=freeside_1_4_1beta1
+VERSION=1.5.0pre1
+TAG=freeside_1_5_0pre1
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -170,7 +170,7 @@ upload-docs: forcehtmlman
 	scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs
 
 release: upload-docs
-	cd /home/ivan/freeside_current
+	cd /home/ivan/freeside
 	#cvs tag ${TAG}
 	cvs tag -F ${TAG}
 
-- 
cgit v1.2.1


From 2488e8c0b94101a8015369e10e37de660f662f5f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 20 Sep 2002 15:48:52 +0000
Subject: doc

---
 FS/FS.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS.pm b/FS/FS.pm
index c22557a2d..a2df6f175 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -185,7 +185,7 @@ first time, the suggested order will tend to reduce the number of forward
 references."
 
 If you've never used OO modules before,
-http://www.cpan.org/doc/FMTEYEWTK/easy_objects.html might help you out.
+http://www.perl.com/doc/FMTEYEWTK/easy_objects.html might help you out.
 
 =head1 DESCRIPTION
 
-- 
cgit v1.2.1


From e2a6a581a52e61521cc86140cb4ef57a3af84f48 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 20 Sep 2002 15:49:10 +0000
Subject: installing into /usr/bin, bah

---
 FS/Makefile.PL | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/FS/Makefile.PL b/FS/Makefile.PL
index ab4c2281b..1647f8eef 100644
--- a/FS/Makefile.PL
+++ b/FS/Makefile.PL
@@ -5,4 +5,6 @@ WriteMakefile(
     'NAME'	   => 'FS',
     'VERSION_FROM' => 'FS.pm', # finds $VERSION
     'EXE_FILES'    => [ glob 'bin/*' ],
+    'INSTALLSCRIPT'  => '/usr/local/bin',
+    'INSTALLSITEBIN' => '/usr/local/bin',
 );
-- 
cgit v1.2.1


From bfd2c9a7e80f665beca0254065d3f3c7945c23ca Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 20 Sep 2002 15:49:19 +0000
Subject: d

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 2951ceeab..44692e6f9 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 Freeside
 
-Copyright (C) 2000,2001 Ivan Kohler
+Copyright (C) 2000,2001,2002 Ivan Kohler
 Copyright (C) 1999 Silicon Interactive Software Design
 All rights reserved
 
-- 
cgit v1.2.1


From 8965012fa53fd05d851d2f5abed4e056ab758797 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Sep 2002 11:17:39 +0000
Subject: all taxes now have names.  closes: Bug#15

---
 FS/FS/cust_bill.pm                           |  20 ++++++++++++++------
 FS/FS/cust_bill_pkg.pm                       |   5 ++++-
 FS/FS/cust_main.pm                           |  24 +++++++++++++++---------
 FS/FS/cust_main_county.pm                    |   3 +++
 FS/bin/freeside-setup                        |  22 ++++++++++++++++++++--
 README.1.5.0pre1                             |   3 +++
 bin/create-history-tables                    |  13 +++++++++++--
 httemplate/browse/cust_main_county.cgi       |  11 ++++++++++-
 httemplate/docs/schema.dia                   | Bin 14438 -> 14438 bytes
 httemplate/docs/schema.html                  |   2 ++
 httemplate/edit/cust_main_county.cgi         |   5 ++++-
 httemplate/edit/process/cust_main_county.cgi |  17 +++++++++--------
 12 files changed, 95 insertions(+), 30 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 258b32e15..f0667258c 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -510,10 +510,13 @@ sub send_csv {
         time2str("%x", $cust_bill_pkg->edate),
       );
 
-    } else { #pkgnum Tax
+    } else { #pkgnum tax
       next unless $cust_bill_pkg->setup != 0;
+      my $itemdesc = defined $cust_bill_pkg->dbdef_table->column('itemdesc')
+                       ? ( $cust_bill_pkg->itemdesc || 'Tax' )
+                       : 'Tax';
       ($pkg, $setup, $recur, $sdate, $edate) =
-        ( 'Tax', sprintf("%10.2f",$cust_bill_pkg->setup), '', '', '' );
+        ( $itemdesc, sprintf("%10.2f",$cust_bill_pkg->setup), '', '', '' );
     }
 
     $csv->combine(
@@ -858,7 +861,9 @@ sub print_text {
   }
 
   #new charges
-  foreach ( $self->cust_bill_pkg ) {
+  foreach ( ( grep {   $_->pkgnum } $self->cust_bill_pkg ),  #packages first
+            ( grep { ! $_->pkgnum } $self->cust_bill_pkg ),  #then taxes
+  ) {
 
     if ( $_->pkgnum ) {
 
@@ -882,8 +887,11 @@ sub print_text {
           map { [ "  ". $_->[0]. ": ". $_->[1], '' ] } $cust_pkg->labels;
       }
 
-    } else { #pkgnum Tax
-      push @buf,["Tax", $money_char. sprintf("%10.2f",$_->setup) ] 
+    } else { #pkgnum tax
+      my $itemdesc = defined $_->dbdef_table->column('itemdesc')
+                     ? ( $_->itemdesc || 'Tax' )
+                     : 'Tax';
+      push @buf,[$itemdesc, $money_char. sprintf("%10.2f",$_->setup) ] 
         if $_->setup != 0;
     }
   }
@@ -1031,7 +1039,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.45 2002-09-17 10:21:47 ivan Exp $
+$Id: cust_bill.pm,v 1.46 2002-09-21 11:17:39 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index 72f9ce4a9..5a1dcd2aa 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -47,6 +47,8 @@ supported:
 
 =item edate - ending date of recurring fee
 
+=item itemdesc - Line item description (currentlty used only when pkgnum is 0)
+
 =back
 
 sdate and edate are specified as UNIX timestamps; see L<perlfunc/"time">.  Also
@@ -111,6 +113,7 @@ sub check {
       || $self->ut_money('recur')
       || $self->ut_numbern('sdate')
       || $self->ut_numbern('edate')
+      || $self->ut_textn('itemdesc')
   ;
   return $error if $error;
 
@@ -140,7 +143,7 @@ sub cust_pkg {
 
 =head1 VERSION
 
-$Id: cust_bill_pkg.pm,v 1.3 2002-04-06 22:32:43 ivan Exp $
+$Id: cust_bill_pkg.pm,v 1.4 2002-09-21 11:17:39 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 84fd3d150..2701ac35d 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -904,10 +904,12 @@ sub bill {
   my( $total_setup, $total_recur ) = ( 0, 0 );
   #my( $taxable_setup, $taxable_recur ) = ( 0, 0 );
   my @cust_bill_pkg = ();
-  my $tax = 0;##
+  #my $tax = 0;##
   #my $taxable_charged = 0;##
   #my $charged = 0;##
 
+  my %tax;
+
   foreach my $cust_pkg (
     qsearch('cust_pkg', { 'custnum' => $self->custnum } )
   ) {
@@ -1101,7 +1103,10 @@ sub bill {
           } #if $cust_main_county->exempt_amount
 
           $taxable_charged = sprintf( "%.2f", $taxable_charged);
-          $tax += $taxable_charged * $cust_main_county->tax / 100
+
+          #$tax += $taxable_charged * $cust_main_county->tax / 100
+          $tax{ $cust_main_county->taxname || 'Tax' } +=
+            $taxable_charged * $cust_main_county->tax / 100
 
         } #unless $self->tax =~ /Y/i
           #       || $self->payby eq 'COMP'
@@ -1134,16 +1139,17 @@ sub bill {
 #      $taxable_charged * ( $cust_main_county->getfield('tax') / 100 )
 #    );
 
-  $tax = sprintf("%.2f", $tax);
-  if ( $tax > 0 ) {
+  foreach my $taxname ( grep { $tax{$_} > 0 } keys %tax ) {
+    my $tax = sprintf("%.2f", $tax{$taxname} );
     $charged = sprintf( "%.2f", $charged+$tax );
 
     my $cust_bill_pkg = new FS::cust_bill_pkg ({
-      'pkgnum' => 0,
-      'setup'  => $tax,
-      'recur'  => 0,
-      'sdate'  => '',
-      'edate'  => '',
+      'pkgnum'   => 0,
+      'setup'    => $tax,
+      'recur'    => 0,
+      'sdate'    => '',
+      'edate'    => '',
+      'itemdesc' => $taxname,
     });
     push @cust_bill_pkg, $cust_bill_pkg;
   }
diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index e41564d21..d8796e451 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -61,6 +61,8 @@ currently supported:
 
 =item exempt_amount
 
+=item taxname - if defined, printed on invoices instead of "Tax"
+
 =back
 
 =head1 METHODS
@@ -110,6 +112,7 @@ sub check {
     || $self->ut_float('tax')
     || $self->ut_textn('taxclass') # ...
     || $self->ut_money('exempt_amount')
+    || $self->ut_textn('taxname')
   ;
 
 }
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index e8bb7ec62..f6a543fc8 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -189,7 +189,23 @@ foreach my $table ( grep { ! /^h_/ } $dbdef->tables ) {
                        'default' => '',
                        'local'   => '',
                      } ),
-                     map { $tableobj->column($_) } $tableobj->columns
+                     map {
+                       my $column = $tableobj->column($_);
+
+                       #clone so as to not disturb the original
+                       $column = DBIx::DBSchema::Column->new( {
+                         map { $_ => $column->$_() }
+                           qw( name type null length default local )
+                       } );
+
+                       $column->type('int')
+                         if $column->type eq 'serial';
+                       #$column->default('')
+                       #  if $column->default =~ /^nextval\(/i;
+                       #( my $local = $column->local ) =~ s/AUTO_INCREMENT//i;
+                       #$column->local($local);
+                       $column;
+                     } $tableobj->columns
                    ],
   } );
   $dbdef->addtable($h_tableobj);
@@ -397,9 +413,10 @@ sub tables_hash_hack {
         'recur',   @money_type,
         'sdate',   @date_type,
         'edate',   @date_type,
+        'itemdesc', 'varchar', 'NULL', $char_d,
       ],
       'primary_key' => '',
-      'unique' => [ ['pkgnum', 'invnum'] ],
+      'unique' => [],
       'index' => [ ['invnum'] ],
     },
 
@@ -504,6 +521,7 @@ sub tables_hash_hack {
         'taxclass',   'varchar', 'NULL', $char_d,
         'exempt_amount', @money_type,
         'tax',      'real',  '',    '', #tax %
+        'taxname',  'varchar',  'NULL',    $char_d,
       ],
       'primary_key' => 'taxnum',
       'unique' => [],
diff --git a/README.1.5.0pre1 b/README.1.5.0pre1
index ff3e5a6cc..57fc36af6 100644
--- a/README.1.5.0pre1
+++ b/README.1.5.0pre1
@@ -4,6 +4,9 @@ schema changes:
   *** get svc_broadband changes from pc-intouch
   *** otaker changes s/8/32 all otkaer fields
   *** optional: sequence changes
+  *** add column cust_main_county.taxname
+  *** add column cust_bill_pkg.itemdesc
+  *** drop index cust_bill_pkg1
 
 install DBIx::DBSchema 0.21
 install NetAddr::IP
diff --git a/bin/create-history-tables b/bin/create-history-tables
index d37d682d8..33eb0e5a3 100755
--- a/bin/create-history-tables
+++ b/bin/create-history-tables
@@ -2,7 +2,7 @@
 
 use strict;
 use DBI;
-use DBIx::DBSchema 0.20;
+use DBIx::DBSchema 0.21;
 use DBIx::DBSchema::Table;
 use DBIx::DBSchema::Column;
 use DBIx::DBSchema::ColGroup::Unique;
@@ -64,7 +64,16 @@ foreach my $table ( @tables ) {
                        'default' => '',
                        'local'   => '',
                      } ),
-                     map { $tableobj->column($_) } $tableobj->columns
+                     map {
+                       my $column = $tableobj->column($_);
+                       $column->type('int')
+                         if $column->type eq 'serial';
+                       $column->default('')
+                         if $column->default =~ /^nextval\(/i;
+                       ( my $local = $column->local ) =~ s/AUTO_INCREMENT//i;
+                       $column->local($local);
+                       $column;
+                     } $tableobj->columns
                    ],
   } );
   foreach my $statement ( $h_tableobj->sql_create_table($dbh) ) {
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index 991606087..c2473c4c8 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -21,7 +21,8 @@ print '<BR><BR>'. &table(). <<END;
         <TH><FONT SIZE=-1>Country</FONT></TH>
         <TH><FONT SIZE=-1>State</FONT></TH>
         <TH>County</TH>
-        <TH>Taxclass</TH>
+        <TH>Taxclass<BR><FONT SIZE=-1>(per-package classification)</FONT></TH>
+        <TH>Tax name<BR><FONT SIZE=-1>(printed on invoices)</FONT></TH>
         <TH><FONT SIZE=-1>Tax</FONT></TH>
         <TH><FONT SIZE=-1>Exempt<BR>per<BR>month</TH>
       </TR>
@@ -111,6 +112,14 @@ END
   }
   print "</TD>";
 
+  print "<TD";
+  if ( $hashref->{taxname} ) {
+    print ' BGCOLOR="#ffffff">'. $hashref->{taxname};
+  } else {
+    print ' BGCOLOR="#cccccc">Tax';
+  }
+  print "</TD>";
+
   print "<TD BGCOLOR=\"#ffffff\">$hashref->{tax}%</TD>".
         '<TD BGCOLOR="#ffffff">$'.
           sprintf("%.2f", $hashref->{exempt_amount} || 0). '</TD>'.
diff --git a/httemplate/docs/schema.dia b/httemplate/docs/schema.dia
index c0842a602..746561550 100644
Binary files a/httemplate/docs/schema.dia and b/httemplate/docs/schema.dia differ
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 54adec3a7..c518d4a4d 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -57,6 +57,7 @@
         <li>recur - recurring fee
         <li>sdate - starting date
         <li>edate - ending date
+        <li>itemdesc - Line item description (currently used only when pkgnum is 0)
       </ul>
     <li><a name="cust_credit" href="man/FS/cust_credit.html">cust_credit</a> - Credits.  The equivalent of a negative <a href="#cust_bill">cust_bill</a> record.
       <ul>
@@ -133,6 +134,7 @@
         <li>tax - % rate
         <li>taxclass
         <li>exempt_amount
+        <li>taxname - if defined, printed on invoices instead of "Tax"
       </ul>
     <li><a name="cust_tax_exempt" href="man/FS/cust_tax_exempt.html">cust_tax_exempt</a> - Tax exemption record
       <ul>
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index 7ef37a48d..f3d28825a 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -15,7 +15,8 @@ print qq!<FORM ACTION="!, popurl(1),
         <TH><FONT SIZE=-1>Country</FONT></TH>
         <TH><FONT SIZE=-1>State</FONT></TH>
         <TH><FONT SIZE=-1>County</FONT></TH>
-        <TH><FONT SIZE=-1>Taxclass</FONT></TH>
+        <TH><FONT SIZE=-1>Taxclass</FONT><BR><FONT SIZE=-2>(per-package classification)</FONT></TH>
+        <TH><FONT SIZE=-1>Tax name</FONT><BR><FONT SIZE=-2>(printed on invoices)</FONT></TH>
         <TH><FONT SIZE=-1>Tax</FONT></TH>
         <TH><FONT SIZE=-1>Exempt<BR>per<BR>month</TH>
       </TR>
@@ -46,6 +47,8 @@ END
       : ' BGCOLOR="#cccccc">(ALL)'
     , "</TD>";
 
+  print qq!<TD><INPUT TYPE="text" NAME="taxname!, $hashref->{taxnum},
+        qq!" VALUE="!, $hashref->{taxname}, qq!"></TD>!;
   print qq!<TD><INPUT TYPE="text" NAME="tax!, $hashref->{taxnum},
         qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6>%</TD>!;
   print qq!<TD>\$<INPUT TYPE="text" NAME="exempt_amount!, $hashref->{taxnum},
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
index 990a23919..6d80ad512 100755
--- a/httemplate/edit/process/cust_main_county.cgi
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -2,17 +2,18 @@
 
 foreach ( grep { /^tax\d+$/ } $cgi->param ) {
   /^tax(\d+)$/ or die "Illegal form $_!";
-  my($taxnum)=$1;
-  my($old)=qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+  my $taxnum = $1;
+  my $old = qsearchs('cust_main_county', { 'taxnum' => $taxnum })
     or die "Couldn't find taxnum $taxnum!";
-  my $exempt_amount = $cgi->param("exempt_amount$taxnum");
-  next unless $old->tax ne $cgi->param("tax$taxnum")
-              || $old->exempt_amount ne $exempt_amount;
+  next unless    $old->tax           != $cgi->param("tax$taxnum")
+              || $old->exempt_amount != $cgi->param("exempt_amount$taxnum")
+              || $old->taxname       ne $cgi->param("taxname$taxnum");
   my %hash = $old->hash;
   $hash{tax} = $cgi->param("tax$taxnum");
-  $hash{exempt_amount} = $exempt_amount;
-  my($new)=new FS::cust_main_county \%hash;
-  my($error)=$new->replace($old);
+  $hash{exempt_amount} = $cgi->param("exempt_amount$taxnum");
+  $hash{taxname} = $cgi->param("taxname$taxnum");
+  my $new = new FS::cust_main_county \%hash;
+  my $error = $new->replace($old);
   if ( $error ) {
     $cgi->param('error', $error);
     print $cgi->redirect(popurl(2). "cust_main_county.cgi?". $cgi->query_string );
-- 
cgit v1.2.1


From f95dffea25ebcdac0b6a4e0355a3c087ea28de0c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Sep 2002 08:50:42 +0000
Subject: better default Pg datasource

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b97142734..6e9ef650b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #!/usr/bin/make
 
-DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
+DATASOURCE = DBI:Pg:dbname=freeside
 #DATASOURCE=DBI:mysql:freeside
 
 DB_USER = freeside
-- 
cgit v1.2.1


From 536d684c3e17375d45a5d62bc5d748fec0224860 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Sep 2002 14:27:28 +0000
Subject: global.asa changes for profiling redirects header-handling changes
 necessary for chart .cgis

---
 FS/FS/CGI.pm     |  34 +++++++++++++++-
 htetc/global.asa | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 htetc/handler.pl |   4 +-
 3 files changed, 143 insertions(+), 12 deletions(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index e44ebcc0a..d69aad2fc 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -10,7 +10,7 @@ use FS::UID;
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable
-                small_custview myexit);
+                small_custview myexit http_header);
 
 =head1 NAME
 
@@ -68,6 +68,38 @@ END
   $x;
 }
 
+=item http_header
+
+Sets an http header.
+
+=cut
+
+sub http_header {
+  my ( $header, $value ) = @_;
+  if (exists $ENV{MOD_PERL}) {
+    if ( defined $main::Response
+         && $main::Response->isa('Apache::ASP::Response') ) {  #Apache::ASP
+      if ( $header =~ /^Content-Type$/ ) {
+        $main::Response->{ContentType} = $value;
+      } else {
+        $main::Response->AddHeader( $header => $value );
+      }
+    } elsif ( defined $HTML::Mason::Commands::r  ) { #Mason
+      ## is this the correct pacakge for $r ???  for 1.0x and 1.1x ?
+      if ( $header =~ /^Content-Type$/ ) {
+        $HTML::Mason::Commands::r->content_type($value);
+      } else {
+        $HTML::Mason::Commands::r->header_out( $header => $value );
+      }
+    } else {
+      die "http_header called in unknown environment";
+    }
+  } else {
+    die "http_header called not running under mod_perl";
+  }
+
+}
+
 =item menubar ITEM, URL, ...
 
 Returns an HTML menubar.
diff --git a/htetc/global.asa b/htetc/global.asa
index 3c8380fd4..4f1ca45d3 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -1,20 +1,26 @@
+#BEGIN { eval "use Devel::AutoProfiler;"; } #only if installed...
+#BEGIN { package Devel::AutoProfiler; use vars qw(%caller_info); }
+use Devel::AutoProfiler;
+
 use strict;
 use vars qw( $cgi $p );
 use CGI;
 #use CGI::Carp qw(fatalsToBrowser);
 use Date::Format;
 use Date::Parse;
+use Time::Local;
 use Tie::IxHash;
 use HTML::Entities;
 use IO::Handle;
 use IO::File;
 use String::Approx qw(amatch);
+use Chart::LinesPoints;
 use HTML::Widgets::SelectLayers 0.02;
 use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
 use FS::Record qw(qsearch qsearchs fields dbdef);
 use FS::Conf;
 use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
-               small_custview myexit);
+               small_custview myexit http_header);
 use FS::Msgcat qw(gettext geterror);
 
 use FS::agent;
@@ -68,22 +74,113 @@ sub Script_OnStart {
   &cgisuidsetup($cgi);
   $p = popurl(2);
   #print $cgi->header( '-expires' => 'now' );
+  dbh->{'private_profile'} = {} if dbh->can('sprintProfile');
+
+  #really should check for FS::Profiler or something
+    # Devel::AutoProfiler _our_ VERSION?  thanks a fucking lot
+  if ( Devel::AutoProfiler->can('__recursively_fetch_subs_in_package') ) {
+    #should check to see it's my special version.  well, switch to FS::Profiler
+
+    #nicked from Devel::AutoProfiler::INIT
+    my %subs = Devel::AutoProfiler::__recursively_fetch_subs_in_package('main');
+
+
+    SUB : while( my ($name, $ref) = each(%subs) )
+      {
+        #next if $name =~ /^(main::)?Apache::/;
+        next unless $name =~ /FS/;
+        foreach my $sub (@Devel::AutoProfiler::do_not_instrument_this_sub)
+          {
+            if ($name =~ /$sub/)
+              {
+                next SUB;
+              }
+          }
+        next if ($Devel::AutoProfiler::do_not_instrument_this_sub{$name});
+        #warn "INIT name is $name \n";
+        Devel::AutoProfiler::__instrument_sub($name, $ref);
+      }
+
+  }
+
 }
 
 sub Script_OnFlush {
   my $ref = $Response->{BinaryRef};
-  $$ref = $cgi->header( @FS::CGI::header ) . $$ref;
+  #$$ref = $cgi->header( @FS::CGI::header ) . $$ref;
+  #$$ref = $cgi->header() . $$ref;
   if ( dbh->can('sprintProfile') ) {
-
-    $$ref =~ s/<\/BODY>[\s\n]*<\/HTML>[\s\n]*$//i
-      or warn "can't remove";
+    if ( lc($Response->{ContentType}) eq 'text/html' ) {
+      $$ref =~ s/<\/BODY>[\s\n]*<\/HTML>[\s\n]*$//i
+        or warn "can't remove";
   
-    #$$ref .= '<PRE>'. ("\n"x96). encode_entities(dbh->sprintProfile()). '</PRE>';
-    #  wtf?  konqueror...
-    $$ref .= '<PRE>'. ("\n"x4096). encode_entities(dbh->sprintProfile()). '</PRE>';
+      #$$ref .= '<PRE>'. ("\n"x96). encode_entities(dbh->sprintProfile()). '</PRE>';
+      #  wtf?  konqueror...
+      $$ref .= '<PRE>'. ("\n"x4096). encode_entities(dbh->sprintProfile()).
+               "\n\n". &sprintAutoProfile(). '</PRE>';
 
-    $$ref .= '</BODY></HTML>';
-    
+      $$ref .= '</BODY></HTML>';
+    }
     dbh->{'private_profile'} = {};
   }
 }
+
+if ( defined(@DBIx::Profile::ISA) && DBIx::Profile::db->can('sprintProfile') ) {
+
+  #warn "enabling profiling redirects";
+  *CGI::redirect = sub {
+    my( $self, $location) = @_;
+    my $page =
+      $cgi->header.
+      qq!<HTML><BODY>Redirect to <A HREF="$location">$location</A><BR><BR>!.
+      '<PRE>'. encode_entities(dbh->sprintProfile()).
+      "\n\n". &sprintAutoProfile().  '</PRE>'.
+      '</BODY></HTML>';
+    dbh->{'private_profile'} = {};
+    return $page;
+  };
+
+}
+
+sub by_total_time 
+{ 
+  return $a->{total_time_in_sub} <=> $b->{total_time_in_sub}; 
+}
+
+sub sprintAutoProfile {
+  my %caller_info = %Devel::AutoProfiler::caller_info;
+  return unless keys %caller_info;
+
+  %Devel::AutoProfiler::caller_info = ();
+
+  my @keys = keys(%caller_info);
+
+  foreach my $key (@keys)
+    {
+      my $href = $caller_info{$key};
+
+      $href->{who_am_i} = $key;
+    }
+
+  my @subs = values(%caller_info);
+
+  #my @sorted = sort by_total_time ( @subs );
+  my @sorted = reverse sort by_total_time ( @subs );
+
+  # print Dumper \@sorted;
+
+  my @readable_info;
+
+  foreach my $sort (@sorted)
+    {
+      push(@readable_info, delete($sort->{who_am_i}));
+      push(@readable_info, $sort);
+    }
+
+  use Data::Dumper;
+  return encode_entities(Dumper(\@readable_info));
+
+}
+
+1;
+
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 49bcbc08c..d55ba3310 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -61,17 +61,19 @@ sub handler
       #use CGI::Carp qw(fatalsToBrowser);
       use Date::Format;
       use Date::Parse;
+      use Time::Local;
       use Tie::IxHash;
       use HTML::Entities;
       use IO::Handle;
       use IO::File;
       use String::Approx qw(amatch);
+      use Chart::LinesPoints;
       use HTML::Widgets::SelectLayers 0.02;
       use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
       use FS::Record qw(qsearch qsearchs fields dbdef);
       use FS::Conf;
       use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
-                     small_custview myexit);
+                     small_custview myexit http_header);
       use FS::Msgcat qw(gettext geterror);
 
       use FS::agent;
-- 
cgit v1.2.1


From c7c842f3767e8f11914d3b76c31de591854c9654 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 24 Sep 2002 08:31:25 +0000
Subject: deprecate vpopmailrestart config value

---
 FS/FS/Conf.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e9defdafd..788127a7f 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -803,8 +803,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'vpopmailrestart',
-    'section'     => 'mail',
-    'description' => 'If defined, the shell commands to run on vpopmail machines after files are copied.  An example can be found in eg/vpopmailrestart of the source distribution.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add a <i>vpopmail</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to define the shell commands to run on vpopmail machines after files are copied.  An example can be found in eg/vpopmailrestart of the source distribution.',
     'type'        => 'textarea',
   },
 
-- 
cgit v1.2.1


From 7445e66a13a90015eb100d22aab90d0bc1c92ccd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Sep 2002 09:09:26 +0000
Subject: regenerate raddb.pm from freeradius-0.4 dicts add
 "Authentication-Type" for netc.net.au (radiator?)

---
 FS/FS/raddb.pm | 2081 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 1048 insertions(+), 1033 deletions(-)

diff --git a/FS/FS/raddb.pm b/FS/FS/raddb.pm
index 497d98450..a35a757f5 100644
--- a/FS/FS/raddb.pm
+++ b/FS/FS/raddb.pm
@@ -2,1090 +2,1105 @@ package FS::raddb;
 use vars qw(%attrib);
 
 %attrib = (
-  'ascend_bi_directional_au' => 'Ascend-Bi-Directional-Auth',
-  'h323_connect_time' => 'h323-connect-time',
-  'connect_rate' => 'Connect-Rate',
-  'bind_auth_service_grp' => 'Bind_Auth_Service_Grp',
-  'usr_callback_type' => 'USR-Callback-Type',
-  'erx_primary_wins' => 'ERX-Primary-Wins',
-  'ascend_x25_x121_address' => 'Ascend-X25-X121-Address',
-  'usr_log_filter_packets' => 'USR-Log-Filter-Packets',
-  'annex_addr_resolution_pr' => 'Annex-Addr-Resolution-Protocol',
-  'usr_ip_rip_simple_auth_p' => 'USR-IP-RIP-Simple-Auth-Password',
-  'dialback_name' => 'Dialback-Name',
-  'x_ascend_fr_dce_n392' => 'X-Ascend-FR-DCE-N392',
-  'usr_host_type' => 'USR-Host-Type',
-  'le_modem_info' => 'LE-Modem-Info',
-  'x_ascend_menu_selector' => 'X-Ascend-Menu-Selector',
-  'x_ascend_fr_dce_n393' => 'X-Ascend-FR-DCE-N393',
-  'ascend_ip_direct' => 'Ascend-IP-Direct',
-  'x_ascend_pre_output_octe' => 'X-Ascend-Pre-Output-Octets',
-  'x_ascend_ft1_caller' => 'X-Ascend-FT1-Caller',
-  'usr_last_callers_number_' => 'USR-Last-Callers-Number-ANI',
-  'usr_rmmie_product_code' => 'USR-RMMIE-Product-Code',
-  'usr_igmp_robustness' => 'USR-IGMP-Robustness',
-  'ms_chap2_success' => 'MS-CHAP2-Success',
-  'ascend_home_agent_passwo' => 'Ascend-Home-Agent-Password',
-  'acc_bridging_support' => 'Acc-Bridging-Support',
-  'annex_transmit_speed' => 'Annex-Transmit-Speed',
-  'old_password' => 'Old-Password',
-  'x_ascend_metric' => 'X-Ascend-Metric',
-  'acc_clearing_location' => 'Acc-Clearing-Location',
-  'ascend_multilink_id' => 'Ascend-Multilink-ID',
-  'ascend_egress_enabled' => 'Ascend-Egress-Enabled',
-  'usr_bridging' => 'USR-Bridging',
-  'ascend_assign_ip_server' => 'Ascend-Assign-IP-Server',
-  'acc_dns_server_sec' => 'Acc-Dns-Server-Sec',
-  'ascend_home_agent_ip_add' => 'Ascend-Home-Agent-IP-Addr',
-  'usr_dnis_reauthenticatio' => 'USR-DNIS-ReAuthentication',
-  'acc_modem_error_protocol' => 'Acc-Modem-Error-Protocol',
-  'ascend_backup' => 'Ascend-Backup',
-  'usr_connect_time' => 'USR-Connect-Time',
-  'ascend_cbcp_mode' => 'Ascend-CBCP-Mode',
-  'usr_rmmie_x2_status' => 'USR-RMMIE-x2-Status',
-  'ascend_multicast_gleave_' => 'Ascend-Multicast-GLeave-Delay',
-  'erx_ingress_statistics' => 'ERX-Ingress-Statistics',
-  'cisco_nas_port' => 'Cisco-NAS-Port',
-  'le_admin_group' => 'LE-Admin-Group',
-  'annex_mrru' => 'Annex-MRRU',
-  'x_ascend_add_seconds' => 'X-Ascend-Add-Seconds',
-  'ascend_token_expiry' => 'Ascend-Token-Expiry',
-  'usr_igmp_maximum_respons' => 'USR-IGMP-Maximum-Response-Time',
-  'ascend_calling_id_presen' => 'Ascend-Calling-Id-Presentatn',
-  'connect_info' => 'Connect-Info',
-  'ascend_access_intercept_' => 'Ascend-Access-Intercept-LEA',
-  'x_ascend_dba_monitor' => 'X-Ascend-DBA-Monitor',
-  'client_dns_pri' => 'Client_DNS_Pri',
-  'ip_host_addr' => 'Ip_Host_Addr',
-  'callback_id' => 'Callback-Id',
-  'acct_mcast_out_octets' => 'Acct_Mcast_Out_Octets',
-  'acct_input_octets_64' => 'Acct_Input_Octets_64',
-  'tunnel_function' => 'Tunnel_Function',
-  'ascend_fr_direct_profile' => 'Ascend-FR-Direct-Profile',
-  'h323_incoming_conf_id' => 'h323-incoming-conf-id',
-  'ascend_ppp_vj_1172' => 'Ascend-PPP-VJ-1172',
-  'ms_new_arap_password' => 'MS-New-ARAP-Password',
-  'h323_voice_quality' => 'h323-voice-quality',
-  'framed_appletalk_network' => 'Framed-AppleTalk-Network',
-  'bind_int_interface_name' => 'Bind_Int_Interface_Name',
-  'event_timestamp' => 'Event-Timestamp',
-  'ascend_bir_enable' => 'Ascend-BIR-Enable',
-  'usr_fallback_enabled' => 'USR-Fallback-Enabled',
-  'ascend_dhcp_pool_number' => 'Ascend-DHCP-Pool-Number',
-  'acct_session_id' => 'Acct-Session-Id',
-  'ascend_private_route_req' => 'Ascend-Private-Route-Required',
-  'usr_rmmie_pwrlvl_farecho' => 'USR-RMMIE-PwrLvl-FarEcho-Canc',
-  'usr_at_input_filter' => 'USR-AT-Input-Filter',
-  'erx_egress_statistics' => 'ERX-Egress-Statistics',
-  'x_ascend_call_type' => 'X-Ascend-Call-Type',
-  'acct_tunnel_client_endpo' => 'Acct-Tunnel-Client-Endpoint',
-  'x_ascend_assign_ip_clien' => 'X-Ascend-Assign-IP-Client',
-  'ascend_if_netmask' => 'Ascend-IF-Netmask',
-  'ascend_dhcp_maximum_leas' => 'Ascend-DHCP-Maximum-Leases',
-  'usr_at_output_filter' => 'USR-AT-Output-Filter',
-  'usr_rad_dvmrp_metric' => 'USR-Rad-Dvmrp-Metric',
-  'rate_limit_rate' => 'Rate_Limit_Rate',
-  'prefix' => 'Prefix',
-  'ascend_x25_pad_banner' => 'Ascend-X25-Pad-Banner',
-  'usr_rmmie_rcv_pwrlvl_375' => 'USR-RMMIE-Rcv-PwrLvl-3750Hz',
-  'x_ascend_user_acct_key' => 'X-Ascend-User-Acct-Key',
-  'group_name' => 'Group-Name',
-  'ascend_receive_secret' => 'Ascend-Receive-Secret',
-  'reply_message' => 'Reply-Message',
-  'le_nat_sess_dir_fail_act' => 'LE-NAT-Sess-Dir-Fail-Action',
-  'framed_callback_id' => 'Framed-Callback-Id',
-  'cisco_disconnect_cause' => 'Cisco-Disconnect-Cause',
-  'stripped_user_name' => 'Stripped-User-Name',
-  'annex_keypress_timeout' => 'Annex-Keypress-Timeout',
-  'annex_receive_speed' => 'Annex-Receive-Speed',
-  'ms_chap_domain' => 'MS-CHAP-Domain',
-  'ascend_atm_connect_group' => 'Ascend-ATM-Connect-Group',
-  'usr_send_name' => 'USR-Send-Name',
-  'usr_local_framed_ip_addr' => 'USR-Local-Framed-IP-Addr',
-  'erx_alternate_cli_vroute' => 'ERX-Alternate-Cli-Vrouter-Name',
-  'usr_fallback_limit' => 'USR-Fallback-Limit',
-  'ascend_pri_number_type' => 'Ascend-PRI-Number-Type',
-  'x_ascend_minimum_channel' => 'X-Ascend-Minimum-Channels',
-  'x_ascend_fr_direct_dlci' => 'X-Ascend-FR-Direct-DLCI',
-  'ascend_fr_link_mgt' => 'Ascend-FR-Link-Mgt',
-  'annex_host_allow' => 'Annex-Host-Allow',
-  'x_ascend_force_56' => 'X-Ascend-Force-56',
-  'police_burst' => 'Police_Burst',
-  'pvc_profile_name' => 'PVC_Profile_Name',
-  'ms_filter' => 'MS-Filter',
-  'rate_limit_burst' => 'Rate_Limit_Burst',
-  'ascend_number_sessions' => 'Ascend-Number-Sessions',
-  'cisco_call_filter' => 'Cisco-Call-Filter',
-  'erx_igmp_enable' => 'ERX-Igmp-Enable',
-  'ascend_filter_required' => 'Ascend-Filter-Required',
-  'erx_cli_allow_all_vr_acc' => 'ERX-Cli-Allow-All-VR-Access',
-  'acc_callback_delay' => 'Acc-Callback-Delay',
-  'usr_default_dte_data_rat' => 'USR-Default-DTE-Data-Rate',
-  'le_ip_pool' => 'LE-IP-Pool',
-  'cisco_pre_output_packets' => 'Cisco-Pre-Output-Packets',
-  'x_ascend_group' => 'X-Ascend-Group',
-  'usr_channel_connected_to' => 'USR-Channel-Connected-To',
-  'usr_ipx_rip_output_filte' => 'USR-IPX-RIP-Output-Filter',
-  'usr_esn' => 'USR-ESN',
-  'annex_user_level' => 'Annex-User-Level',
-  'x_ascend_primary_home_ag' => 'X-Ascend-Primary-Home-Agent',
-  'no_such_attribute' => 'No-Such-Attribute',
-  'x_ascend_pri_number_type' => 'X-Ascend-PRI-Number-Type',
-  'ms_mppe_send_key' => 'MS-MPPE-Send-Key',
-  'usr_actual_voltage' => 'USR-Actual-Voltage',
-  'annex_acct_servers' => 'Annex-Acct-Servers',
-  'ascend_handle_ipx' => 'Ascend-Handle-IPX',
-  'cisco_xmit_rate' => 'Cisco-Xmit-Rate',
-  'acc_service_profile' => 'Acc-Service-Profile',
-  'x_ascend_ara_pw' => 'X-Ascend-Ara-PW',
-  'ascend_ckt_type' => 'Ascend-Ckt-Type',
-  'cisco_data_rate' => 'Cisco-Data-Rate',
-  'group' => 'Group',
-  'nas_port' => 'NAS-Port',
-  'usr_ipx_call_output_filt' => 'USR-IPX-Call-Output-Filter',
-  'tunnel_type' => 'Tunnel-Type',
-  'usr_rmmie_manufacturer_i' => 'USR-RMMIE-Manufacturer-ID',
-  'user_name_is_star' => 'User-Name-Is-Star',
-  'usr_call_arrival_in_gmt' => 'USR-Call-Arrival-in-GMT',
-  'x_ascend_number_sessions' => 'X-Ascend-Number-Sessions',
-  'ascend_send_auth' => 'Ascend-Send-Auth',
-  'user_service_type' => 'User-Service-Type',
-  'annex_cli_filter' => 'Annex-CLI-Filter',
-  'erx_cli_initial_access_l' => 'ERX-Cli-Initial-Access-Level',
-  'ascend_call_direction' => 'Ascend-Call-Direction',
-  'usr_chassis_temp_thresho' => 'USR-Chassis-Temp-Threshold',
-  'usr_pw_usr_ofilter_ipx' => 'USR-PW_USR_OFilter_IPX',
-  'tunnel_session_auth' => 'Tunnel_Session_Auth',
-  'x_ascend_connect_progres' => 'X-Ascend-Connect-Progress',
-  'ascend_atm_connect_vci' => 'Ascend-ATM-Connect-Vci',
-  'x_ascend_maximum_call_du' => 'X-Ascend-Maximum-Call-Duration',
-  'usr_rmmie_planned_discon' => 'USR-RMMIE-Planned-Disconnect',
-  'x_ascend_fr_dte_n392' => 'X-Ascend-FR-DTE-N392',
-  'login_host' => 'Login-Host',
-  'ascend_user_acct_host' => 'Ascend-User-Acct-Host',
-  'x_ascend_fr_dte_n393' => 'X-Ascend-FR-DTE-N393',
-  'acc_tunnel_secret' => 'Acc-Tunnel-Secret',
-  'usr_at_rtmp_input_filter' => 'USR-AT-RTMP-Input-Filter',
-  'framed_protocol' => 'Framed-Protocol',
-  'login_callback_number' => 'Login-Callback-Number',
-  'ascend_dsl_rate_type' => 'Ascend-Dsl-Rate-Type',
-  'ascend_pre_output_packet' => 'Ascend-Pre-Output-Packets',
-  'proxy_state' => 'Proxy-State',
-  'usr_pw_usr_ofilter_ip' => 'USR-PW_USR_OFilter_IP',
-  'cisco_data_filter' => 'Cisco-Data-Filter',
-  'cisco_target_util' => 'Cisco-Target-Util',
-  'usr_ids0_call_type' => 'USR-IDS0-Call-Type',
-  'usr_blocks_resent' => 'USR-Blocks-Resent',
-  'usr_terminal_type' => 'USR-Terminal-Type',
-  'ascend_history_weigh_typ' => 'Ascend-History-Weigh-Type',
-  'framed_routing' => 'Framed-Routing',
-  'ascend_client_assign_dns' => 'Ascend-Client-Assign-DNS',
-  'ascend_atm_group' => 'Ascend-ATM-Group',
-  'bind_bypass_bypass' => 'Bind_Bypass_Bypass',
-  'le_ip_gateway' => 'LE-IP-Gateway',
-  'cisco_ip_pool_definition' => 'Cisco-IP-Pool-Definition',
-  'x_ascend_maximum_time' => 'X-Ascend-Maximum-Time',
-  'usr_request_type' => 'USR-Request-Type',
-  'usr_call_arrival_time' => 'USR-Call-Arrival-Time',
-  'tunnel_domain' => 'Tunnel_Domain',
-  'ms_chap_nt_enc_pw' => 'MS-CHAP-NT-Enc-PW',
-  'shiva_calling_number' => 'Shiva-Calling-Number',
-  'ip_address_pool_name' => 'Ip_Address_Pool_Name',
-  'erx_secondary_dns' => 'ERX-Secondary-Dns',
-  'x_ascend_pre_input_octet' => 'X-Ascend-Pre-Input-Octets',
-  'ascend_home_agent_udp_po' => 'Ascend-Home-Agent-UDP-Port',
-  'le_nat_outsource_inmap' => 'LE-NAT-Outsource-Inmap',
-  'x_ascend_home_agent_pass' => 'X-Ascend-Home-Agent-Password',
-  'tunnel_password' => 'Tunnel-Password',
-  'usr_compression_type' => 'USR-Compression-Type',
-  'usr_connect_speed' => 'USR-Connect-Speed',
-  'usr_connect_time_limit' => 'USR-Connect-Time-Limit',
-  'arap_challenge_response' => 'ARAP-Challenge-Response',
-  'ms_link_utilization_thre' => 'MS-Link-Utilization-Threshold',
-  'usr_mp_edo' => 'USR-MP-EDO',
-  'usr_primary_nbns_server' => 'USR-Primary_NBNS_Server',
-  'usr_imsi' => 'USR-IMSI',
-  'ascend_fr_direct' => 'Ascend-FR-Direct',
-  'ascend_vrouter_name' => 'Ascend-VRouter-Name',
-  'ascend_preempt_limit' => 'Ascend-Preempt-Limit',
-  'ascend_ip_pool_definitio' => 'Ascend-IP-Pool-Definition',
-  'h323_gw_id' => 'h323-gw-id',
-  'usr_framed_ipx_route' => 'USR-Framed-IPX-Route',
-  'x_ascend_maximum_channel' => 'X-Ascend-Maximum-Channels',
-  'login_lat_node' => 'Login-LAT-Node',
-  'acct_session_time' => 'Acct-Session-Time',
-  'ascend_disconnect_cause' => 'Ascend-Disconnect-Cause',
-  'ms_mppe_encryption_polic' => 'MS-MPPE-Encryption-Policy',
-  'ms_ras_version' => 'MS-RAS-Version',
-  'class' => 'Class',
-  'caller_id' => 'Caller-ID',
-  'ascend_access_intercept_' => 'Ascend-Access-Intercept-Log',
-  'ascend_service_type' => 'Ascend-Service-Type',
-  'ascend_h323_dialed_time' => 'Ascend-H323-Dialed-Time',
-  'exec_program_wait' => 'Exec-Program-Wait',
-  'ascend_x25_nui_password_' => 'Ascend-X25-Nui-Password-Prompt',
-  'ascend_appletalk_peer_mo' => 'Ascend-Appletalk-Peer-Mode',
-  'login_lat_group' => 'Login-LAT-Group',
-  'strip_user_name' => 'Strip-User-Name',
-  'nas_ip_address' => 'NAS-IP-Address',
-  'ascend_maximum_time' => 'Ascend-Maximum-Time',
-  'erx_atm_pcr' => 'ERX-Atm-PCR',
-  'ascend_client_primary_dn' => 'Ascend-Client-Primary-DNS',
-  'auth_type' => 'Auth-Type',
-  'ascend_secondary_home_ag' => 'Ascend-Secondary-Home-Agent',
-  'x_ascend_idle_limit' => 'X-Ascend-Idle-Limit',
-  'ms_ras_vendor' => 'MS-RAS-Vendor',
-  'ascend_pre_input_packets' => 'Ascend-Pre-Input-Packets',
-  'ascend_bridge' => 'Ascend-Bridge',
-  'h323_redirect_number' => 'h323-redirect-number',
-  'usr_simplified_mnp_level' => 'USR-Simplified-MNP-Levels',
-  'annex_edo' => 'Annex-EDO',
-  'acc_nbns_server_sec' => 'Acc-Nbns-Server-Sec',
-  'ascend_cbcp_trunk_group' => 'Ascend-CBCP-Trunk-Group',
-  'x_ascend_data_svc' => 'X-Ascend-Data-Svc',
-  'le_terminate_detail' => 'LE-Terminate-Detail',
-  'acct_output_octets' => 'Acct-Output-Octets',
-  'usr_calling_party_number' => 'USR-Calling-Party-Number',
-  'x_ascend_dhcp_maximum_le' => 'X-Ascend-DHCP-Maximum-Leases',
-  'ascend_force_56' => 'Ascend-Force-56',
-  'shiva_acct_serv_switch' => 'Shiva-Acct-Serv-Switch',
-  'tunnel_algorithm' => 'Tunnel_Algorithm',
-  'usr_max_channels' => 'USR-Max-Channels',
-  'usr_port_tap_priority' => 'USR-Port-Tap-Priority',
-  'le_nat_outmap' => 'LE-NAT-Outmap',
-  'usr_call_connecting_time' => 'USR-Call-Connecting-Time',
-  'usr_supports_tags' => 'USR-Supports-Tags',
-  'idle_timeout' => 'Idle-Timeout',
-  'usr_ip_rip_input_filter' => 'USR-IP-RIP-Input-Filter',
-  'erx_ingress_policy_name' => 'ERX-Ingress-Policy-Name',
-  'usr_pw_cutoff' => 'USR-PW_Cutoff',
-  'usr_channel_expansion' => 'USR-Channel-Expansion',
-  'x_ascend_send_secret' => 'X-Ascend-Send-Secret',
-  'h323_call_origin' => 'h323-call-origin',
-  'h323_preferred_lang' => 'h323-preferred-lang',
-  'ascend_base_channel_coun' => 'Ascend-Base-Channel-Count',
-  'bind_auth_context' => 'Bind_Auth_Context',
-  'ascend_calling_id_number' => 'Ascend-Calling-Id-Number-Plan',
-  'ascend_modem_shelfno' => 'Ascend-Modem-ShelfNo',
-  'tunnel_police_burst' => 'Tunnel_Police_Burst',
-  'pvc_circuit_padding' => 'PVC_Circuit_Padding',
-  'acc_ml_call_threshold' => 'Acc-ML-Call-Threshold',
-  'usr_end_time' => 'USR-End-Time',
-  'usr_ipx' => 'USR-IPX',
-  'ms_primary_dns_server' => 'MS-Primary-DNS-Server',
-  'ascend_dsl_upstream_limi' => 'Ascend-Dsl-Upstream-Limit',
-  'usr_blocks_sent' => 'USR-Blocks-Sent',
-  'bind_dot1q_vlan_tag_id' => 'Bind_Dot1q_Vlan_Tag_Id',
-  'ascend_private_route' => 'Ascend-Private-Route',
-  'usr_back_channel_data_ra' => 'USR-Back-Channel-Data-Rate',
-  'ascend_dropped_packets' => 'Ascend-Dropped-Packets',
-  'cisco_route_ip' => 'Cisco-Route-IP',
-  'nas_identifier' => 'NAS-Identifier',
-  'ascend_presession_time' => 'Ascend-PreSession-Time',
-  'usr_call_type' => 'USR-Call-Type',
-  'usr_acct_reason_code' => 'USR-Acct-Reason-Code',
-  'acc_dialout_auth_passwor' => 'Acc-Dialout-Auth-Password',
-  'acc_connect_tx_speed' => 'Acc-Connect-Tx-Speed',
-  'cisco_pre_input_octets' => 'Cisco-Pre-Input-Octets',
-  'x_ascend_send_passwd' => 'X-Ascend-Send-Passwd',
-  'ascend_bir_bridge_group' => 'Ascend-BIR-Bridge-Group',
-  'ascend_fr_profile_name' => 'Ascend-FR-Profile-Name',
-  'ascend_group' => 'Ascend-Group',
-  'crypt_password' => 'Crypt-Password',
-  'usr_port_tap_address' => 'USR-Port-Tap-Address',
-  'le_nat_outsource_outmap' => 'LE-NAT-Outsource-Outmap',
-  'usr_vpn_encrypter' => 'USR-VPN-Encrypter',
+  'usr_at_zip_output_filter' => 'USR-AT-Zip-Output-Filter',
+  'ms_filter' => 'MS-Filter',
   'usr_blocks_received' => 'USR-Blocks-Received',
-  'tunnel_group' => 'Tunnel_Group',
-  'ascend_shared_profile_en' => 'Ascend-Shared-Profile-Enable',
-  'replicate_to_realm' => 'Replicate-To-Realm',
-  'usr_mobile_ip_address' => 'USR-Mobile-IP-Address',
-  'x_ascend_authen_alias' => 'X-Ascend-Authen-Alias',
-  'ascend_fr_linkup' => 'Ascend-FR-LinkUp',
-  'tunnel_rate_limit_rate' => 'Tunnel_Rate_Limit_Rate',
-  'acc_access_community' => 'Acc-Access-Community',
-  'x_ascend_presession_time' => 'X-Ascend-PreSession-Time',
-  'ms_chap_cpw_1' => 'MS-CHAP-CPW-1',
-  'ms_chap_cpw_2' => 'MS-CHAP-CPW-2',
-  'erx_primary_dns' => 'ERX-Primary-Dns',
-  'ascend_fr_circuit_name' => 'Ascend-FR-Circuit-Name',
-  'ascend_token_immediate' => 'Ascend-Token-Immediate',
-  'cisco_idle_limit' => 'Cisco-Idle-Limit',
-  'usr_speed_of_connection' => 'USR-Speed-Of-Connection',
-  'shiva_links_in_bundle' => 'Shiva-Links-In-Bundle',
-  'x_ascend_fr_profile_name' => 'X-Ascend-FR-Profile-Name',
-  'cisco_multilink_id' => 'Cisco-Multilink-ID',
-  'x_ascend_preempt_limit' => 'X-Ascend-Preempt-Limit',
-  'ascend_assign_ip_client' => 'Ascend-Assign-IP-Client',
-  'usr_iwf_ip_address' => 'USR-IWF-IP-Address',
-  'acct_unique_session_id' => 'Acct-Unique-Session-Id',
-  'framed_pool' => 'Framed-Pool',
-  'usr_igmp_version' => 'USR-IGMP-Version',
-  'tunnel_max_tunnels' => 'Tunnel_Max_Tunnels',
-  'annex_unauthenticated_ti' => 'Annex-Unauthenticated-Time',
-  'bg_path_cost' => 'BG_Path_Cost',
-  'ascend_client_assign_win' => 'Ascend-Client-Assign-WINS',
-  'x_ascend_dial_number' => 'X-Ascend-Dial-Number',
-  'cisco_maximum_channels' => 'Cisco-Maximum-Channels',
-  'usr_pw_framed_routing_v2' => 'USR-PW_Framed_Routing_V2',
-  'usr_channel_decrement' => 'USR-Channel-Decrement',
-  'x_ascend_route_ipx' => 'X-Ascend-Route-IPX',
-  'port_limit' => 'Port-Limit',
-  'ascend_dsl_downstream_li' => 'Ascend-Dsl-Downstream-Limit',
-  'ascend_ip_tos_precedence' => 'Ascend-IP-TOS-Precedence',
-  'usr_multicast_receive' => 'USR-Multicast-Receive',
-  'usr_auth_mode' => 'USR-Auth-Mode',
-  'expiration' => 'Expiration',
-  'x_ascend_fr_circuit_name' => 'X-Ascend-FR-Circuit-Name',
-  'x_ascend_token_immediate' => 'X-Ascend-Token-Immediate',
-  'ascend_ft1_caller' => 'Ascend-FT1-Caller',
-  'shiva_event_flags' => 'Shiva-Event-Flags',
-  'framed_netmask' => 'Framed-Netmask',
-  'ascend_minimum_channels' => 'Ascend-Minimum-Channels',
-  'acc_ml_damping_factor' => 'Acc-ML-Damping-Factor',
-  'bind_sub_password' => 'Bind_Sub_Password',
-  'ascend_ip_tos_apply_to' => 'Ascend-IP-TOS-Apply-To',
-  'x_ascend_home_agent_udp_' => 'X-Ascend-Home-Agent-UDP-Port',
-  'x_ascend_menu_item' => 'X-Ascend-Menu-Item',
-  'ascend_session_type' => 'Ascend-Session-Type',
-  'usr_pw_packet' => 'USR-PW_Packet',
-  'session' => 'Session',
-  'usr_mic' => 'USR-MIC',
-  'usr_line_reversals' => 'USR-Line-Reversals',
-  'assigned_ip_address' => 'Assigned_IP_Address',
-  'cisco_ip_direct' => 'Cisco-IP-Direct',
-  'le_ipsec_log_options' => 'LE-IPSec-Log-Options',
-  'tunnel_rate_limit_burst' => 'Tunnel_Rate_Limit_Burst',
-  'x_ascend_assign_ip_globa' => 'X-Ascend-Assign-IP-Global-Pool',
-  'x_ascend_inc_channel_cou' => 'X-Ascend-Inc-Channel-Count',
-  'h323_return_code' => 'h323-return-code',
-  'shiva_disconnect_reason' => 'Shiva-Disconnect-Reason',
-  'filter_id' => 'Filter-Id',
-  'usr_appletalk_network_ra' => 'USR-Appletalk-Network-Range',
-  'ascend_temporary_rtes' => 'Ascend-Temporary-Rtes',
-  'ascend_h323_conference_i' => 'Ascend-H323-Conference-Id',
-  'h323_billing_model' => 'h323-billing-model',
-  'usr_bearer_capabilities' => 'USR-Bearer-Capabilities',
-  'framed_appletalk_zone' => 'Framed-AppleTalk-Zone',
-  'usr_harc_disconnect_code' => 'USR-HARC-Disconnect-Code',
-  'usr_ipx_rip_input_filter' => 'USR-IPX-RIP-Input-Filter',
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Bound',
-  'ascend_pw_lifetime' => 'Ascend-PW-Lifetime',
-  'acc_dialout_auth_usernam' => 'Acc-Dialout-Auth-Username',
-  'ascend_x25_pad_x3_parame' => 'Ascend-X25-Pad-X3-Parameters',
-  'bind_dot1q_slot' => 'Bind_Dot1q_Slot',
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-RtLim',
-  'x_ascend_multicast_clien' => 'X-Ascend-Multicast-Client',
-  'ascend_authen_alias' => 'Ascend-Authen-Alias',
-  'ascend_dec_channel_count' => 'Ascend-Dec-Channel-Count',
-  'dhcp_max_leases' => 'DHCP_Max_Leases',
   'shiva_called_number' => 'Shiva-Called-Number',
-  'annex_tunnel_authen_mode' => 'Annex-Tunnel-Authen-Mode',
-  'usr_call_error_code' => 'USR-Call-Error-Code',
-  'x_ascend_user_acct_type' => 'X-Ascend-User-Acct-Type',
-  'ascend_atm_connect_vpi' => 'Ascend-ATM-Connect-Vpi',
-  'ascend_x25_pad_x3_profil' => 'Ascend-X25-Pad-X3-Profile',
-  'usr_mobileip_home_agent_' => 'USR-MobileIP-Home-Agent-Address',
-  'suffix' => 'Suffix',
-  'bind_tun_context' => 'Bind_Tun_Context',
-  'x_ascend_ppp_address' => 'X-Ascend-PPP-Address',
-  'usr_dtr_false_timeout' => 'USR-DTR-False-Timeout',
-  'usr_final_rx_link_data_r' => 'USR-Final-Rx-Link-Data-Rate',
-  'ms_chap_error' => 'MS-CHAP-Error',
-  'x_ascend_home_agent_ip_a' => 'X-Ascend-Home-Agent-IP-Addr',
-  'ascend_data_svc' => 'Ascend-Data-Svc',
-  'usr_rmmie_pwrlvl_noise_l' => 'USR-RMMIE-PwrLvl-Noise-Lvl',
-  'usr_dtr_true_timeout' => 'USR-DTR-True-Timeout',
-  'context_name' => 'Context-Name',
-  'usr_card_type' => 'USR-Card-Type',
-  'ascend_fr_link_status_dl' => 'Ascend-FR-Link-Status-DLCI',
-  'annex_sec_profile_index' => 'Annex-Sec-Profile-Index',
-  'usr_pw_usr_ofilter_sap' => 'USR-PW_USR_OFilter_SAP',
-  'tunnel_medium_type' => 'Tunnel-Medium-Type',
-  'x_ascend_require_auth' => 'X-Ascend-Require-Auth',
-  'ascend_connect_progress' => 'Ascend-Connect-Progress',
-  'x_ascend_modem_shelfno' => 'X-Ascend-Modem-ShelfNo',
-  'cisco_pre_input_packets' => 'Cisco-Pre-Input-Packets',
-  'ascend_fr_dce_n392' => 'Ascend-FR-DCE-N392',
-  'ascend_fr_dce_n393' => 'Ascend-FR-DCE-N393',
-  'ascend_client_primary_wi' => 'Ascend-Client-Primary-WINS',
-  'shiva_link_protocol' => 'Shiva-Link-Protocol',
-  'bridge_group' => 'Bridge_Group',
-  'client_port_dnis' => 'Client-Port-DNIS',
-  'usr_mpip_tunnel_originat' => 'USR-MPIP-Tunnel-Originator',
-  'le_nat_log_options' => 'LE-NAT-Log-Options',
-  'usr_number_of_rings_limi' => 'USR-Number-of-Rings-Limit',
-  'usr_retrains_granted' => 'USR-Retrains-Granted',
-  'acc_ip_gateway_pri' => 'Acc-Ip-Gateway-Pri',
-  'usr_number_of_fallbacks' => 'USR-Number-of-Fallbacks',
-  'usr_tunnel_auth_hostname' => 'USR-Tunnel-Auth-Hostname',
   'annex_filter' => 'Annex-Filter',
-  'ascend_mtu' => 'Ascend-MTU',
-  'ms_arap_pw_change_reason' => 'MS-ARAP-PW-Change-Reason',
-  'private_group_id' => 'Private-Group-Id',
-  'ascend_cache_time' => 'Ascend-Cache-Time',
-  'acc_ml_clear_threshold' => 'Acc-ML-Clear-Threshold',
-  'x_ascend_dhcp_reply' => 'X-Ascend-DHCP-Reply',
-  'ascend_h323_gatekeeper' => 'Ascend-H323-Gatekeeper',
-  'x_ascend_xmit_rate' => 'X-Ascend-Xmit-Rate',
-  'usr_last_number_dialed_o' => 'USR-Last-Number-Dialed-Out',
-  'acc_connect_rx_speed' => 'Acc-Connect-Rx-Speed',
-  'acc_clearing_cause' => 'Acc-Clearing-Cause',
-  'ascend_call_attempt_limi' => 'Ascend-Call-Attempt-Limit',
-  'x_ascend_data_rate' => 'X-Ascend-Data-Rate',
-  'termination_action' => 'Termination-Action',
-  'ascend_pre_input_octets' => 'Ascend-Pre-Input-Octets',
-  'x_ascend_ipx_route' => 'X-Ascend-IPX-Route',
-  'x_ascend_ts_idle_mode' => 'X-Ascend-TS-Idle-Mode',
-  'client_ip_address' => 'Client-IP-Address',
-  'ascend_add_seconds' => 'Ascend-Add-Seconds',
-  'login_ip_host' => 'Login-IP-Host',
-  'annex_sw_version' => 'Annex-SW-Version',
-  'huntgroup_name' => 'Huntgroup-Name',
-  'usr_pw_vpn_gateway' => 'USR-PW_VPN_Gateway',
-  'ascend_x25_reverse_charg' => 'Ascend-X25-Reverse-Charging',
-  'lac_real_port' => 'LAC_Real_Port',
-  'ascend_dba_monitor' => 'Ascend-DBA-Monitor',
+  'usr_channel_expansion' => 'USR-Channel-Expansion',
+  'session_timeout' => 'Session-Timeout',
+  'usr_simplified_mnp_level' => 'USR-Simplified-MNP-Levels',
+  'ascend_route_ipx' => 'Ascend-Route-IPX',
   'annex_user_server_locati' => 'Annex-User-Server-Location',
-  'ascend_h323_fegw_address' => 'Ascend-H323-Fegw-Address',
-  'acct_output_gigawords' => 'Acct-Output-Gigawords',
-  'bind_l2tp_tunnel_name' => 'Bind_L2TP_Tunnel_Name',
-  'x_ascend_token_idle' => 'X-Ascend-Token-Idle',
-  'acc_apsm_oversubscribed' => 'Acc-Apsm-Oversubscribed',
-  'ip_tos_field' => 'IP_TOS_Field',
-  'ascend_dsl_cir_xmit_limi' => 'Ascend-Dsl-CIR-Xmit-Limit',
-  'usr_number_of_link_naks' => 'USR-Number-of-Link-NAKs',
-  'framed_address' => 'Framed-Address',
-  'x_ascend_num_in_multilin' => 'X-Ascend-Num-In-Multilink',
-  'hint' => 'Hint',
-  'ascend_source_ip_check' => 'Ascend-Source-IP-Check',
-  'arap_zone_access' => 'ARAP-Zone-Access',
-  'x_ascend_fr_direct_profi' => 'X-Ascend-FR-Direct-Profile',
+  'acc_callback_mode' => 'Acc-Callback-Mode',
+  'usr_filter_zones' => 'USR-Filter-Zones',
+  'ascend_session_svr_key' => 'Ascend-Session-Svr-Key',
+  'le_nat_tcp_session_timeo' => 'LE-NAT-TCP-Session-Timeout',
+  'ascend_ts_idle_limit' => 'Ascend-TS-Idle-Limit',
+  'usr_port_tap_priority' => 'USR-Port-Tap-Priority',
+  'ascend_private_route' => 'Ascend-Private-Route',
+  'prompt' => 'Prompt',
+  'acct_link_count' => 'Acct-Link-Count',
+  'login_lat_node' => 'Login-LAT-Node',
+  'usr_mbi_ct_pri_card_slot' => 'USR-Mbi_Ct_PRI_Card_Slot',
+  'erx_ingress_statistics' => 'ERX-Ingress-Statistics',
+  'annex_system_disc_reason' => 'Annex-System-Disc-Reason',
+  'usr_call_arrival_time' => 'USR-Call-Arrival-Time',
+  'ascend_disconnect_cause' => 'Ascend-Disconnect-Cause',
+  'ascend_user_acct_time' => 'Ascend-User-Acct-Time',
+  'ascend_appletalk_peer_mo' => 'Ascend-Appletalk-Peer-Mode',
+  'chap_challenge' => 'CHAP-Challenge',
+  'ascend_mpp_idle_percent' => 'Ascend-MPP-Idle-Percent',
+  'ascend_user_acct_port' => 'Ascend-User-Acct-Port',
+  'ascend_numbering_plan_id' => 'Ascend-Numbering-Plan-ID',
+  'ascend_access_intercept_' => 'Ascend-Access-Intercept-LEA',
+  'pvc_encapsulation_type' => 'PVC_Encapsulation_Type',
+  'ascend_bir_bridge_group' => 'Ascend-BIR-Bridge-Group',
+  'ascend_atm_group' => 'Ascend-ATM-Group',
+  'ascend_fr_svc_addr' => 'Ascend-FR-SVC-Addr',
+  'x_ascend_send_auth' => 'X-Ascend-Send-Auth',
+  'le_ip_pool' => 'LE-IP-Pool',
+  'annex_addr_resolution_se' => 'Annex-Addr-Resolution-Servers',
+  'usr_last_callers_number_' => 'USR-Last-Callers-Number-ANI',
+  'login_port' => 'Login-Port',
+  'ms_chap2_response' => 'MS-CHAP2-Response',
+  'annex_secondary_dns_serv' => 'Annex-Secondary-DNS-Server',
+  'ascend_ipsec_profile' => 'Ascend-IPSEC-Profile',
+  'usr_accm_type' => 'USR-ACCM-Type',
+  'simultaneous_use' => 'Simultaneous-Use',
+  'framed_protocol' => 'Framed-Protocol',
+  'ascend_recv_name' => 'Ascend-Recv-Name',
+  'usr_call_connecting_time' => 'USR-Call-Connecting-Time',
+  'tunnel_remote_name' => 'Tunnel_Remote_Name',
+  'usr_vts_session_key' => 'USR-VTS-Session-Key',
+  'ascend_fr_dce_n393' => 'Ascend-FR-DCE-N393',
+  'login_host' => 'Login-Host',
+  'usr_reply_script3' => 'USR-Reply-Script3',
+  'ascend_pppoe_enable' => 'Ascend-PPPoE-Enable',
+  'annex_primary_dns_server' => 'Annex-Primary-DNS-Server',
   'x_ascend_bridge_address' => 'X-Ascend-Bridge-Address',
-  'usr_iwf_call_identifier' => 'USR-IWF-Call-Identifier',
+  'usr_number_of_link_naks' => 'USR-Number-of-Link-NAKs',
+  'annex_cli_command' => 'Annex-CLI-Command',
+  'usr_pw_framed_routing_v2' => 'USR-PW_Framed_Routing_V2',
+  'usr_tunnel_switch_endpoi' => 'USR-Tunnel-Switch-Endpoint',
+  'ascend_call_by_call' => 'Ascend-Call-By-Call',
+  'ascend_first_dest' => 'Ascend-First-Dest',
+  'usr_appletalk_network_ra' => 'USR-Appletalk-Network-Range',
+  'annex_tunnel_authen_type' => 'Annex-Tunnel-Authen-Type',
+  'sql_user_name' => 'SQL-User-Name',
+  'erx_secondary_dns' => 'ERX-Secondary-Dns',
+  'h323_return_code' => 'h323-return-code',
+  'annex_host_allow' => 'Annex-Host-Allow',
+  'x_ascend_require_auth' => 'X-Ascend-Require-Auth',
+  'le_ipsec_deny_action' => 'LE-IPSec-Deny-Action',
+  'annex_edo' => 'Annex-EDO',
+  'acct_delay_time' => 'Acct-Delay-Time',
+  'ascend_call_block_durati' => 'Ascend-Call-Block-Duration',
+  'login_tcp_port' => 'Login-TCP-Port',
+  'ascend_temporary_rtes' => 'Ascend-Temporary-Rtes',
+  'ascend_dialed_number' => 'Ascend-Dialed-Number',
+  'x_ascend_dec_channel_cou' => 'X-Ascend-Dec-Channel-Count',
+  'ascend_fr_dlci' => 'Ascend-FR-DLCI',
+  'annex_modem_disc_reason' => 'Annex-Modem-Disc-Reason',
+  'x_ascend_receive_secret' => 'X-Ascend-Receive-Secret',
+  'char_noecho' => 'Char-Noecho',
+  'ascend_pri_number_type' => 'Ascend-PRI-Number-Type',
+  'ascend_dsl_upstream_limi' => 'Ascend-Dsl-Upstream-Limit',
+  'x_ascend_modem_shelfno' => 'X-Ascend-Modem-ShelfNo',
+  'prefix' => 'Prefix',
+  'usr_rad_dvmrp_metric' => 'USR-Rad-Dvmrp-Metric',
+  'usr_ip_saa_filter' => 'USR-IP-SAA-Filter',
+  'ms_link_utilization_thre' => 'MS-Link-Utilization-Threshold',
   'ascend_home_network_name' => 'Ascend-Home-Network-Name',
+  'acc_customer_id' => 'Acc-Customer-Id',
+  'message_authenticator' => 'Message-Authenticator',
+  'ascend_secondary_home_ag' => 'Ascend-Secondary-Home-Agent',
+  'x_ascend_pre_output_octe' => 'X-Ascend-Pre-Output-Octets',
+  'usr_multicast_forwarding' => 'USR-Multicast-Forwarding',
+  'ascend_call_direction' => 'Ascend-Call-Direction',
+  'acc_connect_rx_speed' => 'Acc-Connect-Rx-Speed',
+  'ascend_force_56' => 'Ascend-Force-56',
+  'usr_harc_disconnect_code' => 'USR-HARC-Disconnect-Code',
+  'shasta_service_profile' => 'Shasta-Service-Profile',
+  'cisco_maximum_time' => 'Cisco-Maximum-Time',
+  'usr_tunnel_auth_hostname' => 'USR-Tunnel-Auth-Hostname',
+  'ascend_client_assign_win' => 'Ascend-Client-Assign-WINS',
+  'acc_modem_modulation_typ' => 'Acc-Modem-Modulation-Type',
+  'acc_ip_gateway_pri' => 'Acc-Ip-Gateway-Pri',
+  'ascend_bridge_address' => 'Ascend-Bridge-Address',
+  'x_ascend_fr_link_mgt' => 'X-Ascend-FR-Link-Mgt',
+  'ascend_handle_ipx' => 'Ascend-Handle-IPX',
+  'ascend_x25_pad_alias_2' => 'Ascend-X25-Pad-Alias-2',
+  'ascend_group' => 'Ascend-Group',
+  'ascend_dsl_rate_type' => 'Ascend-Dsl-Rate-Type',
   'ascend_require_auth' => 'Ascend-Require-Auth',
-  'source_validation' => 'Source_Validation',
-  'ms_primary_nbns_server' => 'MS-Primary-NBNS-Server',
-  'h323_setup_time' => 'h323-setup-time',
-  'tunnel_remote_name' => 'Tunnel_Remote_Name',
-  'ascend_maximum_channels' => 'Ascend-Maximum-Channels',
+  'x_ascend_billing_number' => 'X-Ascend-Billing-Number',
+  'usr_orig_nas_type' => 'USR-Orig-NAS-Type',
+  'ascend_remote_fw' => 'Ascend-Remote-FW',
+  'acct_output_packets' => 'Acct-Output-Packets',
+  'lm_password' => 'LM-Password',
+  'tunnel_window' => 'Tunnel_Window',
+  'x_ascend_link_compressio' => 'X-Ascend-Link-Compression',
+  'x_ascend_base_channel_co' => 'X-Ascend-Base-Channel-Count',
+  'cisco_avpair' => 'Cisco-AVPair',
+  'shiva_event_flags' => 'Shiva-Event-Flags',
+  'usr_number_of_rings_limi' => 'USR-Number-of-Rings-Limit',
+  'ascend_ts_idle_mode' => 'Ascend-TS-Idle-Mode',
+  'ascend_bi_directional_au' => 'Ascend-Bi-Directional-Auth',
+  'state' => 'State',
+  'usr_keypress_timeout' => 'USR-Keypress-Timeout',
+  'usr_pw_vpn_neighbor' => 'USR-PW_VPN_Neighbor',
+  'ldap_userdn' => 'Ldap-UserDn',
+  'x_ascend_fr_n391' => 'X-Ascend-FR-N391',
   'ascend_tunneling_protoco' => 'Ascend-Tunneling-Protocol',
-  'arap_security_data' => 'ARAP-Security-Data',
-  'ascend_ipx_peer_mode' => 'Ascend-IPX-Peer-Mode',
-  'ascend_cir_timer' => 'Ascend-CIR-Timer',
-  'ascend_ts_idle_limit' => 'Ascend-TS-Idle-Limit',
-  'ascend_cache_refresh' => 'Ascend-Cache-Refresh',
-  'usr_rmmie_status' => 'USR-RMMIE-Status',
-  'annex_callback_portlist' => 'Annex-Callback-Portlist',
-  'usr_port_tap' => 'USR-Port-Tap',
-  'ascend_client_secondary_' => 'Ascend-Client-Secondary-DNS',
+  'x_ascend_fr_direct' => 'X-Ascend-FR-Direct',
+  'nas_ip_address' => 'NAS-IP-Address',
+  'usr_call_end_time' => 'USR-Call-End-Time',
+  'tunnel_algorithm' => 'Tunnel_Algorithm',
+  'usr_vpn_encrypter' => 'USR-VPN-Encrypter',
+  'ascend_atm_connect_group' => 'Ascend-ATM-Connect-Group',
+  'x_ascend_ft1_caller' => 'X-Ascend-FT1-Caller',
+  'login_callback_number' => 'Login-Callback-Number',
+  'usr_ip_rip_input_filter' => 'USR-IP-RIP-Input-Filter',
+  'usr_rmmie_last_update_ev' => 'USR-RMMIE-Last-Update-Event',
+  'h323_disconnect_cause' => 'h323-disconnect-cause',
+  'x_ascend_handle_ipx' => 'X-Ascend-Handle-IPX',
+  'usr_igmp_version' => 'USR-IGMP-Version',
+  'usr_imsi' => 'USR-IMSI',
+  'group_name' => 'Group-Name',
+  'usr_nas_type' => 'USR-NAS-Type',
+  'ascend_ip_tos' => 'Ascend-IP-TOS',
+  'x_ascend_token_immediate' => 'X-Ascend-Token-Immediate',
+  'ascend_private_route_tab' => 'Ascend-Private-Route-Table-ID',
+  'ms_chap2_cpw' => 'MS-CHAP2-CPW',
+  'tunnel_session_auth_ctx' => 'Tunnel_Session_Auth_Ctx',
+  'usr_mobile_numbytes_rxed' => 'USR-Mobile-NumBytes-Rxed',
+  'usr_mbi_ct_tdm_time_slot' => 'USR-Mbi_Ct_TDM_Time_Slot',
+  'ascend_x25_nui' => 'Ascend-X25-Nui',
   'x_ascend_first_dest' => 'X-Ascend-First-Dest',
-  'lac_port' => 'LAC_Port',
-  'acc_callback_cbcp_type' => 'Acc-Callback-CBCP-Type',
-  'usr_call_reference_numbe' => 'USR-Call-Reference-Number',
-  'mcast_receive' => 'Mcast_Receive',
-  'x_ascend_link_compressio' => 'X-Ascend-Link-Compression',
-  'ascend_inter_arrival_jit' => 'Ascend-Inter-Arrival-Jitter',
-  'x_ascend_assign_ip_pool' => 'X-Ascend-Assign-IP-Pool',
-  'usr_chassis_call_span' => 'USR-Chassis-Call-Span',
-  'arap_password' => 'ARAP-Password',
-  'usr_ip_default_route_opt' => 'USR-IP-Default-Route-Option',
-  'ascend_endpoint_disc' => 'Ascend-Endpoint-Disc',
-  'tunnel_dnis' => 'Tunnel_DNIS',
+  'x_ascend_num_in_multilin' => 'X-Ascend-Num-In-Multilink',
+  'usr_send_password' => 'USR-Send-Password',
+  'x_ascend_fr_t391' => 'X-Ascend-FR-T391',
+  'acct_input_octets' => 'Acct-Input-Octets',
+  'bridge_group' => 'Bridge_Group',
+  'annex_sec_profile_index' => 'Annex-Sec-Profile-Index',
+  'acc_dns_server_pri' => 'Acc-Dns-Server-Pri',
   'ms_acct_auth_type' => 'MS-Acct-Auth-Type',
-  'ascend_ts_idle_mode' => 'Ascend-TS-Idle-Mode',
-  'shasta_service_profile' => 'Shasta-Service-Profile',
-  'usr_cdma_call_reference_' => 'USR-CDMA-Call-Reference-Number',
-  'usr_at_zip_input_filter' => 'USR-AT-Zip-Input-Filter',
-  'x_ascend_pw_warntime' => 'X-Ascend-PW-Warntime',
-  'ascend_fr_direct_dlci' => 'Ascend-FR-Direct-DLCI',
-  'usr_dte_ring_no_answer_l' => 'USR-DTE-Ring-No-Answer-Limit',
-  'ascend_multicast_rate_li' => 'Ascend-Multicast-Rate-Limit',
-  'usr_routing_protocol' => 'USR-Routing-Protocol',
-  'pam_auth' => 'Pam-Auth',
-  'client_dns_sec' => 'Client_DNS_Sec',
-  'bg_trans_bpdu' => 'BG_Trans_BPDU',
-  'police_rate' => 'Police_Rate',
+  'tunnel_password' => 'Tunnel-Password',
+  'usr_reply_script5' => 'USR-Reply-Script5',
+  'shiva_links_in_bundle' => 'Shiva-Links-In-Bundle',
+  'ascend_fr_profile_name' => 'Ascend-FR-Profile-Name',
+  'ascend_mtu' => 'Ascend-MTU',
+  'cisco_ppp_async_map' => 'Cisco-PPP-Async-Map',
+  'cisco_num_in_multilink' => 'Cisco-Num-In-Multilink',
+  'usr_mobile_ip_address' => 'USR-Mobile-IP-Address',
+  'ascend_bridge' => 'Ascend-Bridge',
+  'x_ascend_presession_time' => 'X-Ascend-PreSession-Time',
+  'tunnel_cmd_timeout' => 'Tunnel_Cmd_Timeout',
+  'ascend_multicast_client' => 'Ascend-Multicast-Client',
+  'tunnel_private_group_id' => 'Tunnel-Private-Group-Id',
+  'usr_rmmie_rcv_tot_pwrlvl' => 'USR-RMMIE-Rcv-Tot-PwrLvl',
   'calling_station_id' => 'Calling-Station-Id',
+  'tunnel_rate_limit_burst' => 'Tunnel_Rate_Limit_Burst',
+  'usr_device_connected_to' => 'USR-Device-Connected-To',
+  'login_lat_service' => 'Login-LAT-Service',
+  'x_ascend_home_network_na' => 'X-Ascend-Home-Network-Name',
+  'ascend_h323_fegw_address' => 'Ascend-H323-Fegw-Address',
   'usr_called_party_number' => 'USR-Called-Party-Number',
-  'shiva_network_protocols' => 'Shiva-Network-Protocols',
+  'ascend_remove_seconds' => 'Ascend-Remove-Seconds',
+  'shiva_user_attributes' => 'Shiva-User-Attributes',
+  'x_ascend_route_ipx' => 'X-Ascend-Route-IPX',
+  'acc_route_policy' => 'Acc-Route-Policy',
   'x_ascend_client_gateway' => 'X-Ascend-Client-Gateway',
-  'acct_input_octets' => 'Acct-Input-Octets',
-  'ascend_call_type' => 'Ascend-Call-Type',
-  'annex_product_name' => 'Annex-Product-Name',
-  'framed_compression' => 'Framed-Compression',
+  'ms_mppe_encryption_polic' => 'MS-MPPE-Encryption-Policy',
+  'x_ascend_data_filter' => 'X-Ascend-Data-Filter',
   'ascend_atm_direct' => 'Ascend-ATM-Direct',
-  'x_ascend_remote_addr' => 'X-Ascend-Remote-Addr',
-  'usr_tunneled_mlpp' => 'USR-Tunneled-MLPP',
-  'le_ipsec_outsource_profi' => 'LE-IPSec-Outsource-Profile',
-  'ascend_atm_vci' => 'Ascend-ATM-Vci',
-  'usr_number_of_link_timeo' => 'USR-Number-of-Link-Timeouts',
-  'usr_et_bridge_input_filt' => 'USR-ET-Bridge-Input-Filter',
-  'x_ascend_fr_t391' => 'X-Ascend-FR-T391',
-  'x_ascend_fr_t392' => 'X-Ascend-FR-T392',
-  'h323_conf_id' => 'h323-conf-id',
-  'usr_call_end_date_time' => 'USR-Call-End-Date-Time',
-  'ascend_fr_t391' => 'Ascend-FR-T391',
-  'bg_aging_time' => 'BG_Aging_Time',
-  'x_ascend_pre_output_pack' => 'X-Ascend-Pre-Output-Packets',
-  'acc_dialout_auth_mode' => 'Acc-Dialout-Auth-Mode',
-  'ascend_calling_subaddres' => 'Ascend-Calling-Subaddress',
-  'ascend_fr_t392' => 'Ascend-FR-T392',
-  'acct_link_count' => 'Acct-Link-Count',
-  'usr_chassis_call_slot' => 'USR-Chassis-Call-Slot',
-  'h323_credit_time' => 'h323-credit-time',
-  'nas_port_id' => 'NAS-Port-Id',
-  'x_ascend_call_filter' => 'X-Ascend-Call-Filter',
-  'ascend_destination_nas_p' => 'Ascend-Destination-Nas-Port',
-  'arap_features' => 'ARAP-Features',
-  'x_ascend_history_weigh_t' => 'X-Ascend-History-Weigh-Type',
-  'annex_host_restrict' => 'Annex-Host-Restrict',
-  'usr_compression_reset_mo' => 'USR-Compression-Reset-Mode',
-  'cisco_maximum_time' => 'Cisco-Maximum-Time',
+  'ascend_session_type' => 'Ascend-Session-Type',
+  'x_ascend_fr_linkup' => 'X-Ascend-FR-LinkUp',
+  'ascend_metric' => 'Ascend-Metric',
+  'usr_speed_of_connection' => 'USR-Speed-Of-Connection',
+  'le_nat_outsource_outmap' => 'LE-NAT-Outsource-Outmap',
+  'pppoe_url' => 'PPPOE_URL',
+  'acct_mcast_out_octets' => 'Acct_Mcast_Out_Octets',
+  'ascend_callback' => 'Ascend-Callback',
+  'tunnel_client_auth_id' => 'Tunnel-Client-Auth-Id',
+  'acct_unique_session_id' => 'Acct-Unique-Session-Id',
+  'usr_port_tap_format' => 'USR-Port-Tap-Format',
+  'ascend_ckt_type' => 'Ascend-Ckt-Type',
+  'ascend_ppp_async_map' => 'Ascend-PPP-Async-Map',
+  'usr_acct_reason_code' => 'USR-Acct-Reason-Code',
+  'ascend_filter' => 'Ascend-Filter',
+  'h323_redirect_number' => 'h323-redirect-number',
+  'port_limit' => 'Port-Limit',
+  'x_ascend_shared_profile_' => 'X-Ascend-Shared-Profile-Enable',
+  'tunnel_police_rate' => 'Tunnel_Police_Rate',
+  'ascend_calling_id_screen' => 'Ascend-Calling-Id-Screening',
+  'usr_multicast_proxy' => 'USR-Multicast-Proxy',
+  'usr_bridging' => 'USR-Bridging',
+  'usr_originate_answer_mod' => 'USR-Originate-Answer-Mode',
+  'x_ascend_fr_dlci' => 'X-Ascend-FR-DLCI',
+  'usr_request_type' => 'USR-Request-Type',
+  'acc_dialout_auth_usernam' => 'Acc-Dialout-Auth-Username',
+  'ascend_host_info' => 'Ascend-Host-Info',
+  'usr_rmmie_num_of_updates' => 'USR-RMMIE-Num-Of-Updates',
+  'x_ascend_fr_profile_name' => 'X-Ascend-FR-Profile-Name',
+  'ascend_fr_direct_profile' => 'Ascend-FR-Direct-Profile',
+  'x_ascend_bridge' => 'X-Ascend-Bridge',
+  'tunnel_deadtime' => 'Tunnel_Deadtime',
+  'ms_chap_error' => 'MS-CHAP-Error',
+  'framed_route' => 'Framed-Route',
+  'expiration' => 'Expiration',
+  'ascend_backup' => 'Ascend-Backup',
+  'ascend_pre_output_octets' => 'Ascend-Pre-Output-Octets',
+  'framed_appletalk_zone' => 'Framed-AppleTalk-Zone',
+  'annex_audit_level' => 'Annex-Audit-Level',
+  'bind_auth_context' => 'Bind_Auth_Context',
+  'cisco_asing_ip_pool' => 'Cisco-Asing-IP-Pool',
+  'ascend_user_acct_base' => 'Ascend-User-Acct-Base',
+  'mcast_receive' => 'Mcast_Receive',
+  'usr_ds0' => 'USR-DS0',
+  'ms_ras_vendor' => 'MS-RAS-Vendor',
+  'tunnel_domain' => 'Tunnel_Domain',
+  'usr_secondary_nbns_serve' => 'USR-Secondary_NBNS_Server',
   'tunnel_max_sessions' => 'Tunnel_Max_Sessions',
-  'bind_ses_context' => 'Bind_Ses_Context',
-  'x_ascend_ppp_vj_slot_com' => 'X-Ascend-PPP-VJ-Slot-Comp',
-  'usr_mobile_numbytes_rxed' => 'USR-Mobile-NumBytes-Rxed',
-  'usr_rmmie_last_update_ti' => 'USR-RMMIE-Last-Update-Time',
-  'ascend_atm_loopback_cell' => 'Ascend-ATM-Loopback-Cell-Loss',
-  'ascend_bir_proxy' => 'Ascend-BIR-Proxy',
-  'acct_mcast_in_packets' => 'Acct_Mcast_In_Packets',
-  'shiva_type_of_service' => 'Shiva-Type-Of-Service',
+  'ascend_ip_direct' => 'Ascend-IP-Direct',
+  'idle_timeout' => 'Idle-Timeout',
+  'tunnel_server_auth_id' => 'Tunnel-Server-Auth-Id',
+  'usr_start_time' => 'USR-Start-Time',
+  'usr_ip' => 'USR-IP',
+  'usr_gateway_ip_address' => 'USR-Gateway-IP-Address',
+  'usr_number_of_characters' => 'USR-Number-Of-Characters-Lost',
+  'ascend_dba_monitor' => 'Ascend-DBA-Monitor',
+  'ms_chap_domain' => 'MS-CHAP-Domain',
+  'cisco_pre_input_octets' => 'Cisco-Pre-Input-Octets',
+  'acct_session_time' => 'Acct-Session-Time',
+  'framed_ip_address' => 'Framed-IP-Address',
+  'x_ascend_ip_pool_definit' => 'X-Ascend-IP-Pool-Definition',
+  'erx_alternate_cli_access' => 'ERX-Alternate-Cli-Access-Level',
+  'medium_type' => 'Medium_Type',
+  'acct_output_octets_64' => 'Acct_Output_Octets_64',
+  'ascend_cir_timer' => 'Ascend-CIR-Timer',
+  'police_rate' => 'Police_Rate',
+  'ms_mppe_send_key' => 'MS-MPPE-Send-Key',
+  'ascend_multicast_gleave_' => 'Ascend-Multicast-GLeave-Delay',
+  'x_ascend_host_info' => 'X-Ascend-Host-Info',
+  'erx_egress_policy_name' => 'ERX-Egress-Policy-Name',
+  'user_name' => 'User-Name',
+  'bind_bypass_bypass' => 'Bind_Bypass_Bypass',
+  'annex_acct_servers' => 'Annex-Acct-Servers',
+  'usr_chassis_call_channel' => 'USR-Chassis-Call-Channel',
+  'annex_input_filter' => 'Annex-Input-Filter',
+  'ascend_home_agent_passwo' => 'Ascend-Home-Agent-Password',
+  'nas_port_type' => 'NAS-Port-Type',
+  'ascend_endpoint_disc' => 'Ascend-Endpoint-Disc',
+  'tunnel_police_burst' => 'Tunnel_Police_Burst',
+  'bind_auth_max_sessions' => 'Bind_Auth_Max_Sessions',
+  'x_ascend_fr_dce_n392' => 'X-Ascend-FR-DCE-N392',
+  'usr_connect_term_reason' => 'USR-Connect-Term-Reason',
+  'usr_mbi_ct_pri_card_span' => 'USR-Mbi_Ct_PRI_Card_Span_Line',
+  'erx_egress_statistics' => 'ERX-Egress-Statistics',
   'ascend_fr_dte_n392' => 'Ascend-FR-DTE-N392',
-  'usr_at_call_input_filter' => 'USR-AT-Call-Input-Filter',
-  'ascend_fr_dte_n393' => 'Ascend-FR-DTE-N393',
-  'x_ascend_backup' => 'X-Ascend-Backup',
-  'char_noecho' => 'Char-Noecho',
-  'usr_rmmie_last_update_ev' => 'USR-RMMIE-Last-Update-Event',
-  'le_advice_of_charge' => 'LE-Advice-of-Charge',
-  'ascend_calling_id_type_o' => 'Ascend-Calling-Id-Type-Of-Num',
-  'ascend_pppoe_enable' => 'Ascend-PPPoE-Enable',
+  'usr_esn' => 'USR-ESN',
+  'x_ascend_fr_dte_n392' => 'X-Ascend-FR-DTE-N392',
+  'x_ascend_fr_nailed_grp' => 'X-Ascend-FR-Nailed-Grp',
+  'ascend_bridge_non_pppoe' => 'Ascend-Bridge-Non-PPPoE',
+  'ascend_ipx_alias' => 'Ascend-IPX-Alias',
+  'acc_tunnel_port' => 'Acc-Tunnel-Port',
+  'acct_input_gigawords' => 'Acct-Input-Gigawords',
+  'ascend_maximum_channels' => 'Ascend-Maximum-Channels',
+  'x_ascend_ppp_async_map' => 'X-Ascend-PPP-Async-Map',
+  'usr_retrains_requested' => 'USR-Retrains-Requested',
+  'x_ascend_metric' => 'X-Ascend-Metric',
+  'acc_apsm_oversubscribed' => 'Acc-Apsm-Oversubscribed',
+  'erx_atm_pcr' => 'ERX-Atm-PCR',
+  'usr_ipx_routing' => 'USR-IPX-Routing',
+  'usr_tunneled_mlpp' => 'USR-Tunneled-MLPP',
+  'usr_send_script5' => 'USR-Send-Script5',
+  'ascend_traffic_shaper' => 'Ascend-Traffic-Shaper',
+  'ascend_bacp_enable' => 'Ascend-BACP-Enable',
+  'login_time' => 'Login-Time',
+  'ascend_call_type' => 'Ascend-Call-Type',
+  'erx_address_pool_name' => 'ERX-Address-Pool-Name',
+  'h323_incoming_conf_id' => 'h323-incoming-conf-id',
+  'packet_type' => 'Packet-Type',
+  'usr_security_resp_limit' => 'USR-Security-Resp-Limit',
+  'ip_address_pool_name' => 'Ip_Address_Pool_Name',
+  'ascend_cbcp_trunk_group' => 'Ascend-CBCP-Trunk-Group',
+  'ascend_ipx_node_addr' => 'Ascend-IPX-Node-Addr',
+  'ascend_menu_selector' => 'Ascend-Menu-Selector',
+  'usr_ds0s' => 'USR-DS0s',
+  'usr_actual_voltage' => 'USR-Actual-Voltage',
+  'annex_sw_version' => 'Annex-SW-Version',
+  'ascend_history_weigh_typ' => 'Ascend-History-Weigh-Type',
+  'ascend_receive_secret' => 'Ascend-Receive-Secret',
+  'usr_ip_rip_policies' => 'USR-IP-RIP-Policies',
+  'ascend_pw_warntime' => 'Ascend-PW-Warntime',
+  'x_ascend_assign_ip_serve' => 'X-Ascend-Assign-IP-Server',
+  'tunnel_session_auth_serv' => 'Tunnel_Session_Auth_Service_Grp',
+  'usr_blocks_resent' => 'USR-Blocks-Resent',
+  'usr_fallback_enabled' => 'USR-Fallback-Enabled',
+  'arap_challenge_response' => 'ARAP-Challenge-Response',
+  'tunnel_session_auth' => 'Tunnel_Session_Auth',
   'usr_sync_async_mode' => 'USR-Sync-Async-Mode',
-  'state' => 'State',
-  'x_ascend_user_acct_base' => 'X-Ascend-User-Acct-Base',
-  'x_ascend_ipx_alias' => 'X-Ascend-IPX-Alias',
-  'ascend_ip_tos' => 'Ascend-IP-TOS',
-  'annex_secondary_dns_serv' => 'Annex-Secondary-DNS-Server',
-  'tunnel_session_auth_ctx' => 'Tunnel_Session_Auth_Ctx',
-  'usr_mbi_ct_pri_card_span' => 'USR-Mbi_Ct_PRI_Card_Span_Line',
+  'client_port_dnis' => 'Client-Port-DNIS',
+  'ascend_ppp_vj_1172' => 'Ascend-PPP-VJ-1172',
+  'ascend_remote_addr' => 'Ascend-Remote-Addr',
+  'ascend_fr_n391' => 'Ascend-FR-N391',
+  'client_port_id' => 'Client-Port-Id',
+  'usr_num_fax_pages_proces' => 'USR-Num-Fax-Pages-Processed',
+  'le_ipsec_active_profile' => 'LE-IPSec-Active-Profile',
+  'usr_port_tap_facility' => 'USR-Port-Tap-Facility',
+  'usr_callback_type' => 'USR-Callback-Type',
+  'login_lat_group' => 'Login-LAT-Group',
+  'x_ascend_call_type' => 'X-Ascend-Call-Type',
+  'ascend_route_ip' => 'Ascend-Route-IP',
+  'usr_pw_vpn_id' => 'USR-PW_VPN_ID',
+  'le_nat_sess_dir_fail_act' => 'LE-NAT-Sess-Dir-Fail-Action',
+  'cisco_pre_output_octets' => 'Cisco-Pre-Output-Octets',
+  'h323_billing_model' => 'h323-billing-model',
+  'usr_equalization_type' => 'USR-Equalization-Type',
+  'acc_clearing_cause' => 'Acc-Clearing-Cause',
+  'x_ascend_menu_selector' => 'X-Ascend-Menu-Selector',
+  'x_ascend_netware_timeout' => 'X-Ascend-Netware-timeout',
+  'ascend_fr_linkup' => 'Ascend-FR-LinkUp',
+  'police_burst' => 'Police_Burst',
+  'ascend_filter_required' => 'Ascend-Filter-Required',
+  'usr_compression_algorith' => 'USR-Compression-Algorithm',
+  'le_ipsec_outsource_profi' => 'LE-IPSec-Outsource-Profile',
+  'x_ascend_idle_limit' => 'X-Ascend-Idle-Limit',
+  'usr_call_terminate_in_gm' => 'USR-Call-Terminate-in-GMT',
+  'usr_ipx_call_output_filt' => 'USR-IPX-Call-Output-Filter',
+  'ip_tos_field' => 'IP_TOS_Field',
+  'ascend_ip_tos_apply_to' => 'Ascend-IP-TOS-Apply-To',
+  'tunnel_l2f_second_passwo' => 'Tunnel_L2F_Second_Password',
   'usr_call_event_code' => 'USR-Call-Event-Code',
-  'chap_password' => 'CHAP-Password',
-  'le_nat_tcp_session_timeo' => 'LE-NAT-TCP-Session-Timeout',
-  'usr_call_start_date_time' => 'USR-Call-Start-Date-Time',
-  'usr_multicast_forwarding' => 'USR-Multicast-Forwarding',
-  'client_id' => 'Client-Id',
-  'sql_user_name' => 'SQL-User-Name',
-  'x_ascend_billing_number' => 'X-Ascend-Billing-Number',
-  'ms_secondary_nbns_server' => 'MS-Secondary-NBNS-Server',
-  'cisco_num_in_multilink' => 'Cisco-Num-In-Multilink',
-  'x_ascend_client_assign_d' => 'X-Ascend-Client-Assign-DNS',
+  'usr_rmmie_product_code' => 'USR-RMMIE-Product-Code',
+  'usr_host_type' => 'USR-Host-Type',
+  'ascend_send_auth' => 'Ascend-Send-Auth',
+  'shiva_compression_type' => 'Shiva-Compression-Type',
+  'filter_id' => 'Filter-Id',
+  'ascend_ft1_caller' => 'Ascend-FT1-Caller',
+  'erx_cli_initial_access_l' => 'ERX-Cli-Initial-Access-Level',
+  'usr_log_filter_packets' => 'USR-Log-Filter-Packets',
+  'ascend_fr_nailed_grp' => 'Ascend-FR-Nailed-Grp',
+  'usr_initial_tx_link_data' => 'USR-Initial-Tx-Link-Data-Rate',
+  'acc_input_errors' => 'Acc-Input-Errors',
   'x_ascend_user_acct_port' => 'X-Ascend-User-Acct-Port',
-  'usr_local_ip_address' => 'USR-Local-IP-Address',
-  'x_ascend_ip_pool_definit' => 'X-Ascend-IP-Pool-Definition',
-  'ascend_metric' => 'Ascend-Metric',
-  'x_ascend_bacp_enable' => 'X-Ascend-BACP-Enable',
-  'x_ascend_user_acct_time' => 'X-Ascend-User-Acct-Time',
-  'x_ascend_mpp_idle_percen' => 'X-Ascend-MPP-Idle-Percent',
-  'annex_authen_servers' => 'Annex-Authen-Servers',
-  'x_ascend_data_filter' => 'X-Ascend-Data-Filter',
-  'ascend_idle_limit' => 'Ascend-Idle-Limit',
-  'ldap_userdn' => 'Ldap-UserDn',
-  'x_ascend_target_util' => 'X-Ascend-Target-Util',
-  'shiva_connect_reason' => 'Shiva-Connect-Reason',
-  'usr_ds0' => 'USR-DS0',
-  'annex_re_chap_timeout' => 'Annex-Re-CHAP-Timeout',
-  'shasta_vpn_name' => 'Shasta-VPN-Name',
-  'acct_tunnel_connection_i' => 'Acct-Tunnel-Connection-Id',
-  'h323_prompt_id' => 'h323-prompt-id',
-  'x_ascend_ipx_peer_mode' => 'X-Ascend-IPX-Peer-Mode',
-  'ascend_numbering_plan_id' => 'Ascend-Numbering-Plan-ID',
-  'x_ascend_ts_idle_limit' => 'X-Ascend-TS-Idle-Limit',
-  'ascend_atm_fault_managem' => 'Ascend-ATM-Fault-Management',
-  'annex_primary_nbns_serve' => 'Annex-Primary-NBNS-Server',
-  'lac_port_type' => 'LAC_Port_Type',
-  'usr_initial_rx_link_data' => 'USR-Initial-Rx-Link-Data-Rate',
-  'usr_interface_index' => 'USR-Interface-Index',
-  'usr_expansion_algorithm' => 'USR-Expansion-Algorithm',
-  'ascend_tunnel_vrouter_na' => 'Ascend-Tunnel-VRouter-Name',
-  'usr_pw_vpn_neighbor' => 'USR-PW_VPN_Neighbor',
+  'erx_secondary_wins' => 'ERX-Secondary-Wins',
+  'usr_rmmie_serial_number' => 'USR-RMMIE-Serial-Number',
+  'ascend_client_primary_dn' => 'Ascend-Client-Primary-DNS',
+  'usr_slot_connected_to' => 'USR-Slot-Connected-To',
+  'shiva_disconnect_reason' => 'Shiva-Disconnect-Reason',
+  'usr_receive_acc_map' => 'USR-Receive-Acc-Map',
+  'usr_compression_reset_mo' => 'USR-Compression-Reset-Mode',
+  'usr_rmmie_planned_discon' => 'USR-RMMIE-Planned-Disconnect',
+  'ascend_client_assign_dns' => 'Ascend-Client-Assign-DNS',
+  'ascend_fr_type' => 'Ascend-FR-Type',
+  'tunnel_client_endpoint' => 'Tunnel-Client-Endpoint',
+  'x_ascend_send_secret' => 'X-Ascend-Send-Secret',
+  'x_ascend_call_filter' => 'X-Ascend-Call-Filter',
+  'usr_ipx_rip_input_filter' => 'USR-IPX-RIP-Input-Filter',
+  'x_ascend_maximum_time' => 'X-Ascend-Maximum-Time',
+  'ascend_x25_pad_x3_profil' => 'Ascend-X25-Pad-X3-Profile',
+  'pvc_profile_name' => 'PVC_Profile_Name',
+  'ascend_global_call_id' => 'Ascend-Global-Call-Id',
+  'tunnel_local_name' => 'Tunnel_Local_Name',
+  'ascend_fr_t392' => 'Ascend-FR-T392',
+  'usr_dnis_reauthenticatio' => 'USR-DNIS-ReAuthentication',
+  'ascend_pre_output_packet' => 'Ascend-Pre-Output-Packets',
+  'ascend_token_immediate' => 'Ascend-Token-Immediate',
+  'usr_chassis_call_slot' => 'USR-Chassis-Call-Slot',
+  'rate_limit_burst' => 'Rate_Limit_Burst',
+  'cisco_route_ip' => 'Cisco-Route-IP',
+  'dhcp_max_leases' => 'DHCP_Max_Leases',
+  'user_category' => 'User-Category',
+  'x_ascend_maximum_call_du' => 'X-Ascend-Maximum-Call-Duration',
   'bind_type' => 'Bind_Type',
-  'acc_ccp_option' => 'Acc-Ccp-Option',
+  'usr_framed_ipx_route' => 'USR-Framed-IPX-Route',
+  'rate_limit_rate' => 'Rate_Limit_Rate',
+  'ascend_atm_connect_vpi' => 'Ascend-ATM-Connect-Vpi',
+  'x_ascend_inc_channel_cou' => 'X-Ascend-Inc-Channel-Count',
+  'connect_info' => 'Connect-Info',
+  'x_ascend_pre_input_packe' => 'X-Ascend-Pre-Input-Packets',
+  'usr_port_tap_address' => 'USR-Port-Tap-Address',
+  'ascend_home_agent_udp_po' => 'Ascend-Home-Agent-UDP-Port',
+  'usr_final_rx_link_data_r' => 'USR-Final-Rx-Link-Data-Rate',
+  'usr_pw_usr_ifilter_ip' => 'USR-PW_USR_IFilter_IP',
   'ascend_route_appletalk' => 'Ascend-Route-Appletalk',
-  'erx_alternate_cli_access' => 'ERX-Alternate-Cli-Access-Level',
-  'usr_at_rtmp_output_filte' => 'USR-AT-RTMP-Output-Filter',
-  'erx_atm_mbs' => 'ERX-Atm-MBS',
-  'usr_at_call_output_filte' => 'USR-AT-Call-Output-Filter',
-  'ms_old_arap_password' => 'MS-Old-ARAP-Password',
-  'x_ascend_client_primary_' => 'X-Ascend-Client-Primary-DNS',
-  'x_ascend_host_info' => 'X-Ascend-Host-Info',
-  'bind_auth_protocol' => 'Bind_Auth_Protocol',
-  'cisco_link_compression' => 'Cisco-Link-Compression',
-  'annex_syslog_tap' => 'Annex-Syslog-Tap',
-  'tunnel_window' => 'Tunnel_Window',
-  'usr_gateway_ip_address' => 'USR-Gateway-IP-Address',
-  'ascend_redirect_number' => 'Ascend-Redirect-Number',
+  'ms_chap_lm_enc_pw' => 'MS-CHAP-LM-Enc-PW',
+  'ascend_callback_delay' => 'Ascend-Callback-Delay',
+  'x_ascend_bacp_enable' => 'X-Ascend-BACP-Enable',
+  'bg_trans_bpdu' => 'BG_Trans_BPDU',
+  'huntgroup_name' => 'Huntgroup-Name',
+  'x_ascend_ipx_alias' => 'X-Ascend-IPX-Alias',
   'x_ascend_secondary_home_' => 'X-Ascend-Secondary-Home-Agent',
-  'usr_pw_index' => 'USR-PW_Index',
-  'le_multicast_client' => 'LE-Multicast-Client',
-  'annex_modem_disc_reason' => 'Annex-Modem-Disc-Reason',
-  'annex_primary_dns_server' => 'Annex-Primary-DNS-Server',
-  'erx_secondary_wins' => 'ERX-Secondary-Wins',
-  'fall_through' => 'Fall-Through',
-  'acct_mcast_out_packets' => 'Acct_Mcast_Out_Packets',
-  'x_ascend_transit_number' => 'X-Ascend-Transit-Number',
-  'usr_unauthenticated_time' => 'USR-Unauthenticated-Time',
-  'le_ipsec_active_profile' => 'LE-IPSec-Active-Profile',
-  'ascend_ip_pool_chaining' => 'Ascend-IP-Pool-Chaining',
-  'usr_syslog_tap' => 'USR-Syslog-Tap',
-  'ascend_multicast_client' => 'Ascend-Multicast-Client',
-  'usr_device_connected_to' => 'USR-Device-Connected-To',
-  'tunnel_l2f_second_passwo' => 'Tunnel_L2F_Second_Password',
-  'add_prefix' => 'Add-Prefix',
-  'tunnel_cmd_timeout' => 'Tunnel_Cmd_Timeout',
-  'x_ascend_remove_seconds' => 'X-Ascend-Remove-Seconds',
-  'acct_mcast_in_octets' => 'Acct_Mcast_In_Octets',
-  'ascend_appletalk_route' => 'Ascend-Appletalk-Route',
-  'ascend_fcp_parameter' => 'Ascend-FCP-Parameter',
-  'acc_ip_compression' => 'Acc-Ip-Compression',
-  'usr_modem_training_time' => 'USR-Modem-Training-Time',
-  'usr_primary_dns_server' => 'USR-Primary_DNS_Server',
-  'erx_egress_policy_name' => 'ERX-Egress-Policy-Name',
-  'x_ascend_base_channel_co' => 'X-Ascend-Base-Channel-Count',
-  'x_ascend_pre_input_packe' => 'X-Ascend-Pre-Input-Packets',
-  'password_retry' => 'Password-Retry',
-  'ascend_source_auth' => 'Ascend-Source-Auth',
-  'cisco_pw_lifetime' => 'Cisco-PW-Lifetime',
-  'acc_dns_server_pri' => 'Acc-Dns-Server-Pri',
-  'ascend_netware_timeout' => 'Ascend-Netware-timeout',
-  'ascend_ppp_async_map' => 'Ascend-PPP-Async-Map',
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Ttl',
-  'x_ascend_modem_slotno' => 'X-Ascend-Modem-SlotNo',
-  'x_ascend_ip_direct' => 'X-Ascend-IP-Direct',
-  'simultaneous_use' => 'Simultaneous-Use',
-  'erx_virtual_router_name' => 'ERX-Virtual-Router-Name',
-  'ascend_bridge_non_pppoe' => 'Ascend-Bridge-Non-PPPoE',
-  'ascend_fr_08_mode' => 'Ascend-FR-08-Mode',
-  'h323_call_type' => 'h323-call-type',
-  'tunnel_context' => 'Tunnel_Context',
-  'usr_transmit_acc_map' => 'USR-Transmit-Acc-Map',
   'usr_ipx_wan' => 'USR-IPX-WAN',
-  'usr_ip_call_input_filter' => 'USR-IP-Call-Input-Filter',
+  'menu' => 'Menu',
+  'x_ascend_fr_direct_dlci' => 'X-Ascend-FR-Direct-DLCI',
+  'acct_status_type' => 'Acct-Status-Type',
+  'ascend_port_redir_server' => 'Ascend-Port-Redir-Server',
+  'acc_dns_server_sec' => 'Acc-Dns-Server-Sec',
+  'ascend_minimum_channels' => 'Ascend-Minimum-Channels',
+  'ascend_telnet_profile' => 'Ascend-Telnet-Profile',
+  'ascend_ipx_route' => 'Ascend-IPX-Route',
   'usr_call_connect_in_gmt' => 'USR-Call-Connect-in-GMT',
-  'acct_multi_session_id' => 'Acct-Multi-Session-Id',
-  'usr_reply_script1' => 'USR-Reply-Script1',
+  'x_ascend_dba_monitor' => 'X-Ascend-DBA-Monitor',
+  'usr_event_id' => 'USR-Event-Id',
+  'ascend_inc_channel_count' => 'Ascend-Inc-Channel-Count',
+  'usr_send_script3' => 'USR-Send-Script3',
+  'framed_callback_id' => 'Framed-Callback-Id',
+  'arap_zone_access' => 'ARAP-Zone-Access',
+  'service_type' => 'Service-Type',
+  'usr_nfas_id' => 'USR-NFAS-ID',
+  'shiva_calling_number' => 'Shiva-Calling-Number',
+  'ascend_user_acct_host' => 'Ascend-User-Acct-Host',
+  'ascend_fr_link_mgt' => 'Ascend-FR-Link-Mgt',
+  'ms_primary_nbns_server' => 'MS-Primary-NBNS-Server',
+  'quintum_avpair' => 'Quintum-AVPair',
+  'x_ascend_home_agent_pass' => 'X-Ascend-Home-Agent-Password',
+  'ascend_transit_number' => 'Ascend-Transit-Number',
+  'ascend_cache_refresh' => 'Ascend-Cache-Refresh',
+  'versanet_termination_cau' => 'Versanet-Termination-Cause',
+  'ascend_user_acct_type' => 'Ascend-User-Acct-Type',
+  'usr_mic' => 'USR-MIC',
+  'ascend_base_channel_coun' => 'Ascend-Base-Channel-Count',
+  'x_ascend_dhcp_pool_numbe' => 'X-Ascend-DHCP-Pool-Number',
+  'ms_chap2_success' => 'MS-CHAP2-Success',
+  'cisco_idle_limit' => 'Cisco-Idle-Limit',
+  'ascend_pw_lifetime' => 'Ascend-PW-Lifetime',
+  'usr_packet_bus_session' => 'USR-Packet-Bus-Session',
+  'ascend_atm_loopback_cell' => 'Ascend-ATM-Loopback-Cell-Loss',
+  'acct_input_packets_64' => 'Acct_Input_Packets_64',
+  'ascend_modem_slotno' => 'Ascend-Modem-SlotNo',
+  'usr_characters_received' => 'USR-Characters-Received',
+  'ms_bap_usage' => 'MS-BAP-Usage',
+  'cisco_data_filter' => 'Cisco-Data-Filter',
+  'ascend_seconds_of_histor' => 'Ascend-Seconds-Of-History',
+  'h323_setup_time' => 'h323-setup-time',
+  'acc_dialout_auth_passwor' => 'Acc-Dialout-Auth-Password',
+  'le_nat_outsource_inmap' => 'LE-NAT-Outsource-Inmap',
+  'usr_sap_filter_in' => 'USR-SAP-Filter-In',
+  'framed_appletalk_link' => 'Framed-AppleTalk-Link',
+  'usr_initial_rx_link_data' => 'USR-Initial-Rx-Link-Data-Rate',
+  'usr_ospf_addressless_ind' => 'USR-OSPF-Addressless-Index',
+  'usr_ipx' => 'USR-IPX',
+  'shiva_connect_reason' => 'Shiva-Connect-Reason',
   'cisco_ppp_vj_slot_comp' => 'Cisco-PPP-VJ-Slot-Comp',
+  'ascend_atm_vpi' => 'Ascend-ATM-Vpi',
+  'acc_ml_mlx_admin_state' => 'Acc-ML-MLX-Admin-State',
+  'usr_igmp_robustness' => 'USR-IGMP-Robustness',
+  'add_prefix' => 'Add-Prefix',
+  'x_ascend_call_by_call' => 'X-Ascend-Call-By-Call',
+  'x_ascend_connect_progres' => 'X-Ascend-Connect-Progress',
+  'usr_at_rtmp_input_filter' => 'USR-AT-RTMP-Input-Filter',
+  'erx_igmp_enable' => 'ERX-Igmp-Enable',
+  'usr_rmmie_rcv_pwrlvl_375' => 'USR-RMMIE-Rcv-PwrLvl-3750Hz',
+  'usr_pw_packet' => 'USR-PW_Packet',
+  'dialback_no' => 'Dialback-No',
+  'ascend_ip_tos_precedence' => 'Ascend-IP-TOS-Precedence',
+  'annex_cli_filter' => 'Annex-CLI-Filter',
+  'x_ascend_dial_number' => 'X-Ascend-Dial-Number',
+  'usr_iwf_call_identifier' => 'USR-IWF-Call-Identifier',
+  'ms_secondary_dns_server' => 'MS-Secondary-DNS-Server',
+  'ascend_client_secondary_' => 'Ascend-Client-Secondary-WINS',
+  'shiva_type_of_service' => 'Shiva-Type-Of-Service',
+  'usr_framed_ip_address_po' => 'USR-Framed_IP_Address_Pool_Name',
+  'bind_ses_context' => 'Bind_Ses_Context',
+  'acc_reason_code' => 'Acc-Reason-Code',
+  'ms_chap_cpw_1' => 'MS-CHAP-CPW-1',
+  'h323_call_type' => 'h323-call-type',
+  'ascend_fr_08_mode' => 'Ascend-FR-08-Mode',
+  'usr_calling_party_number' => 'USR-Calling-Party-Number',
+  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-RtLim',
   'usr_reply_script2' => 'USR-Reply-Script2',
-  'usr_reply_script3' => 'USR-Reply-Script3',
-  'usr_reply_script4' => 'USR-Reply-Script4',
-  'usr_reply_script5' => 'USR-Reply-Script5',
-  'usr_reply_script6' => 'USR-Reply-Script6',
-  'user_category' => 'User-Category',
-  'mcast_send' => 'Mcast_Send',
-  'ascend_send_secret' => 'Ascend-Send-Secret',
-  'usr_tunnel_switch_endpoi' => 'USR-Tunnel-Switch-Endpoint',
-  'tunnel_retransmit' => 'Tunnel_Retransmit',
-  'add_port_to_ip_address' => 'Add-Port-To-IP-Address',
-  'ascend_ipx_node_addr' => 'Ascend-IPX-Node-Addr',
-  'x_ascend_netware_timeout' => 'X-Ascend-Netware-timeout',
-  'erx_sa_validate' => 'ERX-Sa-Validate',
-  'le_ipsec_passive_profile' => 'LE-IPSec-Passive-Profile',
-  'usr_chassis_slot' => 'USR-Chassis-Slot',
-  'usr_final_tx_link_data_r' => 'USR-Final-Tx-Link-Data-Rate',
-  'usr_nfas_id' => 'USR-NFAS-ID',
-  'called_station_id' => 'Called-Station-Id',
-  'login_lat_port' => 'Login-LAT-Port',
-  'ascend_dialed_number' => 'Ascend-Dialed-Number',
-  'h323_credit_amount' => 'h323-credit-amount',
-  'tunnel_local_name' => 'Tunnel_Local_Name',
-  'framed_ip_netmask' => 'Framed-IP-Netmask',
-  'client_port_id' => 'Client-Port-Id',
-  'bg_span_dis' => 'BG_Span_Dis',
+  'usr_security_login_limit' => 'USR-Security-Login-Limit',
+  'cisco_link_compression' => 'Cisco-Link-Compression',
+  'usr_et_bridge_output_fil' => 'USR-ET-Bridge-Output-Filter',
+  'ascend_vrouter_name' => 'Ascend-VRouter-Name',
+  'usr_modem_setup_time' => 'USR-Modem-Setup-Time',
+  'cisco_ip_direct' => 'Cisco-IP-Direct',
+  'x_ascend_temporary_rtes' => 'X-Ascend-Temporary-Rtes',
+  'ascend_x25_pad_alias_3' => 'Ascend-X25-Pad-Alias-3',
+  'usr_rmmie_pwrlvl_xmit_lv' => 'USR-RMMIE-PwrLvl-Xmit-Lvl',
+  'configuration_token' => 'Configuration-Token',
+  'usr_at_rtmp_output_filte' => 'USR-AT-RTMP-Output-Filter',
+  'usr_ip_default_route_opt' => 'USR-IP-Default-Route-Option',
+  'ascend_calling_subaddres' => 'Ascend-Calling-Subaddress',
+  'stripped_user_name' => 'Stripped-User-Name',
+  'cisco_call_filter' => 'Cisco-Call-Filter',
+  'termination_menu' => 'Termination-Menu',
+  'port_message' => 'Port-Message',
+  'usr_igmp_maximum_respons' => 'USR-IGMP-Maximum-Response-Time',
+  'erx_ingress_policy_name' => 'ERX-Ingress-Policy-Name',
+  'ascend_call_attempt_limi' => 'Ascend-Call-Attempt-Limit',
+  'acc_service_profile' => 'Acc-Service-Profile',
+  'ascend_bir_proxy' => 'Ascend-BIR-Proxy',
+  'ascend_x25_nui_prompt' => 'Ascend-X25-Nui-Prompt',
+  'usr_rmmie_pwrlvl_noise_l' => 'USR-RMMIE-PwrLvl-Noise-Lvl',
+  'usr_rmmie_pwrlvl_nearech' => 'USR-RMMIE-PwrLvl-NearEcho-Canc',
+  'x_ascend_multicast_clien' => 'X-Ascend-Multicast-Client',
+  'usr_unauthenticated_time' => 'USR-Unauthenticated-Time',
+  'acc_callback_cbcp_type' => 'Acc-Callback-CBCP-Type',
+  'login_service' => 'Login-Service',
+  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Bound',
+  'ascend_dial_number' => 'Ascend-Dial-Number',
+  'x_ascend_remote_addr' => 'X-Ascend-Remote-Addr',
+  'usr_rmmie_rcv_pwrlvl_330' => 'USR-RMMIE-Rcv-PwrLvl-3300Hz',
+  'usr_call_end_date_time' => 'USR-Call-End-Date-Time',
+  'bind_dot1q_slot' => 'Bind_Dot1q_Slot',
+  'le_connect_detail' => 'LE-Connect-Detail',
+  'annex_user_level' => 'Annex-User-Level',
+  'tunnel_dnis' => 'Tunnel_DNIS',
+  'assigned_ip_address' => 'Assigned_IP_Address',
+  'acc_bridging_support' => 'Acc-Bridging-Support',
+  'usr_channel' => 'USR-Channel',
+  'arap_security_data' => 'ARAP-Security-Data',
+  'bind_auth_service_grp' => 'Bind_Auth_Service_Grp',
+  'x_ascend_pre_output_pack' => 'X-Ascend-Pre-Output-Packets',
+  'x_ascend_seconds_of_hist' => 'X-Ascend-Seconds-Of-History',
+  'h323_voice_quality' => 'h323-voice-quality',
+  'usr_rmmie_last_update_ti' => 'USR-RMMIE-Last-Update-Time',
+  'usr_disconnect_cause_ind' => 'USR-Disconnect-Cause-Indicator',
+  'usr_channel_connected_to' => 'USR-Channel-Connected-To',
+  'ascend_calling_id_number' => 'Ascend-Calling-Id-Number-Plan',
+  'usr_number_of_fallbacks' => 'USR-Number-of-Fallbacks',
+  'usr_ip_call_output_filte' => 'USR-IP-Call-Output-Filter',
+  'ascend_bir_enable' => 'Ascend-BIR-Enable',
+  'usr_connect_time_limit' => 'USR-Connect-Time-Limit',
+  'ascend_presession_time' => 'Ascend-PreSession-Time',
+  'ascend_private_route_req' => 'Ascend-Private-Route-Required',
+  'ascend_dsl_cir_xmit_limi' => 'Ascend-Dsl-CIR-Xmit-Limit',
+  'framed_compression' => 'Framed-Compression',
+  'ascend_svc_enabled' => 'Ascend-SVC-Enabled',
+  'proxy_state' => 'Proxy-State',
+  'ascend_tunnel_vrouter_na' => 'Ascend-Tunnel-VRouter-Name',
+  'usr_ipx_call_input_filte' => 'USR-IPX-Call-Input-Filter',
+  'x_ascend_assign_ip_globa' => 'X-Ascend-Assign-IP-Global-Pool',
+  'erx_alternate_cli_vroute' => 'ERX-Alternate-Cli-Vrouter-Name',
+  'ascend_dhcp_maximum_leas' => 'Ascend-DHCP-Maximum-Leases',
+  'ascend_modem_shelfno' => 'Ascend-Modem-ShelfNo',
+  'bind_auth_protocol' => 'Bind_Auth_Protocol',
+  'shasta_user_privilege' => 'Shasta-User-Privilege',
+  'acct_interim_interval' => 'Acct-Interim-Interval',
+  'hint' => 'Hint',
+  'x_ascend_target_util' => 'X-Ascend-Target-Util',
+  'ms_link_drop_time_limit' => 'MS-Link-Drop-Time-Limit',
+  'acc_access_partition' => 'Acc-Access-Partition',
+  'x_ascend_multilink_id' => 'X-Ascend-Multilink-ID',
+  'usr_power_supply_number' => 'USR-Power-Supply-Number',
+  'acc_ipx_compression' => 'Acc-Ipx-Compression',
+  'nomadix_bw_down' => 'Nomadix-Bw-Down',
+  'usr_call_reference_numbe' => 'USR-Call-Reference-Number',
+  'cisco_target_util' => 'Cisco-Target-Util',
+  'usr_back_channel_data_ra' => 'USR-Back-Channel-Data-Rate',
+  'acc_ip_gateway_sec' => 'Acc-Ip-Gateway-Sec',
+  'usr_dte_ring_no_answer_l' => 'USR-DTE-Ring-No-Answer-Limit',
+  'usr_connect_time' => 'USR-Connect-Time',
+  'ascend_ip_pool_definitio' => 'Ascend-IP-Pool-Definition',
+  'usr_call_start_date_time' => 'USR-Call-Start-Date-Time',
+  'dialback_name' => 'Dialback-Name',
+  'bind_tun_context' => 'Bind_Tun_Context',
+  'h323_redirect_ip_address' => 'h323-redirect-ip-address',
+  'annex_keypress_timeout' => 'Annex-Keypress-Timeout',
+  'ascend_x25_pad_alias_1' => 'Ascend-X25-Pad-Alias-1',
+  'ms_chap_response' => 'MS-CHAP-Response',
+  'usr_max_channels' => 'USR-Max-Channels',
+  'ascend_fr_dte_n393' => 'Ascend-FR-DTE-N393',
+  'ascend_pre_input_octets' => 'Ascend-Pre-Input-Octets',
+  'erx_atm_mbs' => 'ERX-Atm-MBS',
+  'usr_line_reversals' => 'USR-Line-Reversals',
+  'x_ascend_third_prompt' => 'X-Ascend-Third-Prompt',
+  'x_ascend_pw_warntime' => 'X-Ascend-PW-Warntime',
+  'ascend_data_filter' => 'Ascend-Data-Filter',
+  'framed_address' => 'Framed-Address',
+  'context_name' => 'Context-Name',
+  'usr_send_script2' => 'USR-Send-Script2',
+  'ms_arap_pw_change_reason' => 'MS-ARAP-PW-Change-Reason',
+  'acct_session_id' => 'Acct-Session-Id',
+  'initial_modulation_type' => 'Initial-Modulation-Type',
+  'ascend_h323_gatekeeper' => 'Ascend-H323-Gatekeeper',
+  'x_ascend_fcp_parameter' => 'X-Ascend-FCP-Parameter',
+  'tunnel_type' => 'Tunnel-Type',
   'multi_link_flag' => 'Multi-Link-Flag',
-  'bind_sub_user_at_context' => 'Bind_Sub_User_At_Context',
-  'usr_ipx_routing' => 'USR-IPX-Routing',
-  'ascend_fr_nailed_grp' => 'Ascend-FR-Nailed-Grp',
-  'ascend_pre_output_octets' => 'Ascend-Pre-Output-Octets',
-  'pppoe_url' => 'PPPOE_URL',
-  'ascend_ara_pw' => 'Ascend-Ara-PW',
-  'acc_callback_mode' => 'Acc-Callback-Mode',
-  'usr_server_time' => 'USR-Server-Time',
-  'ascend_seconds_of_histor' => 'Ascend-Seconds-Of-History',
+  'ascend_idle_limit' => 'Ascend-Idle-Limit',
+  'password_retry' => 'Password-Retry',
+  'h323_remote_address' => 'h323-remote-address',
+  'erx_atm_service_category' => 'ERX-Atm-Service-Category',
+  'acct_input_packets' => 'Acct-Input-Packets',
+  'h323_disconnect_time' => 'h323-disconnect-time',
+  'ascend_billing_number' => 'Ascend-Billing-Number',
+  'usr_syslog_tap' => 'USR-Syslog-Tap',
+  'ms_mppe_encryption_type' => 'MS-MPPE-Encryption-Type',
+  'ascend_assign_ip_pool' => 'Ascend-Assign-IP-Pool',
+  'usr_routing_protocol' => 'USR-Routing-Protocol',
+  'usr_rad_location_type' => 'USR-Rad-Location-Type',
+  'usr_characters_sent' => 'USR-Characters-Sent',
+  'usr_mp_edo_hiper' => 'USR-MP-EDO-HIPER',
+  'annex_host_restrict' => 'Annex-Host-Restrict',
+  'user_service_type' => 'User-Service-Type',
+  'acct_multi_session_id' => 'Acct-Multi-Session-Id',
+  'ms_chap_cpw_2' => 'MS-CHAP-CPW-2',
+  'x_ascend_primary_home_ag' => 'X-Ascend-Primary-Home-Agent',
+  'x_ascend_dialout_allowed' => 'X-Ascend-Dialout-Allowed',
+  'ascend_connect_progress' => 'Ascend-Connect-Progress',
+  'x_ascend_ara_pw' => 'X-Ascend-Ara-PW',
   'ns_mta_md5_password' => 'NS-MTA-MD5-Password',
-  'tunnel_server_endpoint' => 'Tunnel-Server-Endpoint',
-  'usr_channel' => 'USR-Channel',
+  'callback_number' => 'Callback-Number',
+  'acct_output_packets_64' => 'Acct_Output_Packets_64',
+  'x_ascend_user_acct_key' => 'X-Ascend-User-Acct-Key',
+  'ascend_modem_portno' => 'Ascend-Modem-PortNo',
+  'ascend_assign_ip_server' => 'Ascend-Assign-IP-Server',
+  'ascend_fcp_parameter' => 'Ascend-FCP-Parameter',
+  'ascend_inter_arrival_jit' => 'Ascend-Inter-Arrival-Jitter',
+  'client_ip_address' => 'Client-IP-Address',
+  'usr_number_of_link_timeo' => 'USR-Number-of-Link-Timeouts',
   'ascend_dsl_cir_recv_limi' => 'Ascend-Dsl-CIR-Recv-Limit',
-  'acct_session_start_time' => 'Acct-Session-Start-Time',
-  'ascend_send_passwd' => 'Ascend-Send-Passwd',
-  'ascend_num_in_multilink' => 'Ascend-Num-In-Multilink',
-  'usr_ip_rip_policies' => 'USR-IP-RIP-Policies',
-  'vendor_specific' => 'Vendor-Specific',
+  'ms_acct_eap_type' => 'MS-Acct-EAP-Type',
+  'x_ascend_user_acct_type' => 'X-Ascend-User-Acct-Type',
+  'usr_rmmie_x2_status' => 'USR-RMMIE-x2-Status',
+  'ascend_dsl_downstream_li' => 'Ascend-Dsl-Downstream-Limit',
+  'shiva_customer_id' => 'Shiva-Customer-Id',
+  'lac_real_port' => 'LAC_Real_Port',
+  'h323_connect_time' => 'h323-connect-time',
+  'old_password' => 'Old-Password',
+  'usr_vpn_gw_location_id' => 'USR-VPN-GW-Location-Id',
+  'x_ascend_if_netmask' => 'X-Ascend-IF-Netmask',
+  'add_suffix' => 'Add-Suffix',
+  'x_ascend_client_assign_d' => 'X-Ascend-Client-Assign-DNS',
+  'usr_q931_call_reference_' => 'USR-Q931-Call-Reference-Value',
+  'usr_terminal_type' => 'USR-Terminal-Type',
+  'usr_spoofing' => 'USR-Spoofing',
+  'erx_tunnel_password' => 'ERX-Tunnel-Password',
+  'ascend_assign_ip_client' => 'Ascend-Assign-IP-Client',
+  'usr_server_time' => 'USR-Server-Time',
+  'ascend_data_svc' => 'Ascend-Data-Svc',
+  'annex_authen_servers' => 'Annex-Authen-Servers',
+  'nomadix_bw_up' => 'Nomadix-Bw-Up',
+  'shiva_link_speed' => 'Shiva-Link-Speed',
+  'usr_reply_script6' => 'USR-Reply-Script6',
+  'usr_expansion_algorithm' => 'USR-Expansion-Algorithm',
+  'x_ascend_mpp_idle_percen' => 'X-Ascend-MPP-Idle-Percent',
+  'cisco_data_rate' => 'Cisco-Data-Rate',
+  'usr_primary_dns_server' => 'USR-Primary_DNS_Server',
+  'erx_local_loopback_inter' => 'ERX-Local-Loopback-Interface',
+  'ascend_target_util' => 'Ascend-Target-Util',
+  'usr_default_dte_data_rat' => 'USR-Default-DTE-Data-Rate',
   'x_ascend_event_type' => 'X-Ascend-Event-Type',
-  'lac_real_port_type' => 'LAC_Real_Port_Type',
-  'x_ascend_modem_portno' => 'X-Ascend-Modem-PortNo',
-  'usr_originate_answer_mod' => 'USR-Originate-Answer-Mode',
-  'framed_ipx_network' => 'Framed-IPX-Network',
-  'ascend_modem_slotno' => 'Ascend-Modem-SlotNo',
-  'ms_mppe_encryption_type' => 'MS-MPPE-Encryption-Type',
-  'annex_cli_command' => 'Annex-CLI-Command',
-  'acct_status_type' => 'Acct-Status-Type',
-  'usr_et_bridge_call_outpu' => 'USR-ET-Bridge-Call-Output-Filte',
-  'usr_pw_vpn_id' => 'USR-PW_VPN_ID',
-  'usr_sap_filter_in' => 'USR-SAP-Filter-In',
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Proto',
-  'annex_audit_level' => 'Annex-Audit-Level',
-  'x_ascend_shared_profile_' => 'X-Ascend-Shared-Profile-Enable',
-  'ascend_dial_number' => 'Ascend-Dial-Number',
-  'ascend_link_compression' => 'Ascend-Link-Compression',
-  'usr_event_date_time' => 'USR-Event-Date-Time',
-  'usr_mp_edo_hiper' => 'USR-MP-EDO-HIPER',
-  'usr_re_chap_timeout' => 'USR-Re-Chap-Timeout',
-  'x_ascend_third_prompt' => 'X-Ascend-Third-Prompt',
-  'x_ascend_ppp_vj_1172' => 'X-Ascend-PPP-VJ-1172',
-  'annex_disconnect_reason' => 'Annex-Disconnect-Reason',
-  'ascend_fr_svc_addr' => 'Ascend-FR-SVC-Addr',
-  'nas_real_port' => 'NAS_Real_Port',
-  'usr_power_supply_number' => 'USR-Power-Supply-Number',
-  'ms_secondary_dns_server' => 'MS-Secondary-DNS-Server',
-  'ascend_port_redir_server' => 'Ascend-Port-Redir-Server',
-  'ascend_x25_pad_alias_1' => 'Ascend-X25-Pad-Alias-1',
-  'x_ascend_fcp_parameter' => 'X-Ascend-FCP-Parameter',
-  'ascend_x25_pad_alias_2' => 'Ascend-X25-Pad-Alias-2',
-  'ascend_ipsec_profile' => 'Ascend-IPSEC-Profile',
-  'ascend_x25_pad_alias_3' => 'Ascend-X25-Pad-Alias-3',
-  'usr_mobile_numbytes_txed' => 'USR-Mobile-NumBytes-Txed',
-  'ascend_atm_vpi' => 'Ascend-ATM-Vpi',
-  'annex_input_filter' => 'Annex-Input-Filter',
-  'menu' => 'Menu',
-  'x_ascend_route_ip' => 'X-Ascend-Route-IP',
-  'usr_rmmie_num_of_updates' => 'USR-RMMIE-Num-Of-Updates',
-  'acc_request_type' => 'Acc-Request-Type',
-  'ascend_dhcp_reply' => 'Ascend-DHCP-Reply',
-  'usr_number_of_upshifts' => 'USR-Number-of-Upshifts',
-  'usr_rmmie_firmware_versi' => 'USR-RMMIE-Firmware-Version',
+  'usr_mp_mrru' => 'USR-MP-MRRU',
   'bind_bypass_context' => 'Bind_Bypass_Context',
-  'ascend_dialout_allowed' => 'Ascend-Dialout-Allowed',
-  'annex_tunnel_authen_type' => 'Annex-Tunnel-Authen-Type',
-  'x_ascend_bridge' => 'X-Ascend-Bridge',
-  'ascend_client_secondary_' => 'Ascend-Client-Secondary-WINS',
-  'erx_local_loopback_inter' => 'ERX-Local-Loopback-Interface',
-  'acct_input_gigawords' => 'Acct-Input-Gigawords',
-  'usr_equalization_type' => 'USR-Equalization-Type',
-  'usr_port_tap_format' => 'USR-Port-Tap-Format',
-  'x_ascend_ppp_async_map' => 'X-Ascend-PPP-Async-Map',
-  'acc_ipx_compression' => 'Acc-Ipx-Compression',
-  'ascend_nas_port_format' => 'Ascend-NAS-Port-Format',
-  'acc_modem_modulation_typ' => 'Acc-Modem-Modulation-Type',
-  'ascend_modem_portno' => 'Ascend-Modem-PortNo',
-  'usr_et_bridge_output_fil' => 'USR-ET-Bridge-Output-Filter',
-  'ascend_ipx_header_compre' => 'Ascend-IPX-Header-Compression',
-  'framed_appletalk_link' => 'Framed-AppleTalk-Link',
-  'x_ascend_receive_secret' => 'X-Ascend-Receive-Secret',
-  'ascend_route_ipx' => 'Ascend-Route-IPX',
-  'ascend_user_acct_type' => 'Ascend-User-Acct-Type',
-  'ascend_token_idle' => 'Ascend-Token-Idle',
-  'framed_ip_address' => 'Framed-IP-Address',
-  'ascend_call_block_durati' => 'Ascend-Call-Block-Duration',
-  'ascend_ppp_address' => 'Ascend-PPP-Address',
-  'usr_mbi_ct_pri_card_slot' => 'USR-Mbi_Ct_PRI_Card_Slot',
-  'x_ascend_dec_channel_cou' => 'X-Ascend-Dec-Channel-Count',
-  'x_ascend_send_auth' => 'X-Ascend-Send-Auth',
-  'usr_characters_received' => 'USR-Characters-Received',
+  'no_such_attribute' => 'No-Such-Attribute',
+  'acct_mcast_out_packets' => 'Acct_Mcast_Out_Packets',
+  'tunnel_medium_type' => 'Tunnel-Medium-Type',
+  'acc_callback_delay' => 'Acc-Callback-Delay',
+  'x_ascend_home_agent_udp_' => 'X-Ascend-Home-Agent-UDP-Port',
+  'acct_input_octets_64' => 'Acct_Input_Octets_64',
+  'ascend_atm_connect_vci' => 'Ascend-ATM-Connect-Vci',
+  'erx_primary_dns' => 'ERX-Primary-Dns',
+  'ascend_xmit_rate' => 'Ascend-Xmit-Rate',
+  'ms_new_arap_password' => 'MS-New-ARAP-Password',
+  'usr_call_error_code' => 'USR-Call-Error-Code',
+  'acct_output_octets' => 'Acct-Output-Octets',
+  'usr_failure_to_connect_r' => 'USR-Failure-to-Connect-Reason',
+  'ascend_num_in_multilink' => 'Ascend-Num-In-Multilink',
+  'x_ascend_number_sessions' => 'X-Ascend-Number-Sessions',
+  'usr_ip_rip_output_filter' => 'USR-IP-RIP-Output-Filter',
+  'usr_chassis_temp_thresho' => 'USR-Chassis-Temp-Threshold',
+  'usr_blocks_sent' => 'USR-Blocks-Sent',
+  'usr_ids0_call_type' => 'USR-IDS0-Call-Type',
+  'acc_ccp_option' => 'Acc-Ccp-Option',
+  'ascend_client_gateway' => 'Ascend-Client-Gateway',
+  'x_ascend_multicast_rate_' => 'X-Ascend-Multicast-Rate-Limit',
+  'le_ipsec_passive_profile' => 'LE-IPSec-Passive-Profile',
+  'usr_chassis_call_span' => 'USR-Chassis-Call-Span',
+  'usr_mobileip_home_agent_' => 'USR-MobileIP-Home-Agent-Address',
+  'password' => 'Password',
+  'le_nat_log_options' => 'LE-NAT-Log-Options',
+  'x_ascend_ppp_address' => 'X-Ascend-PPP-Address',
+  'usr_fallback_limit' => 'USR-Fallback-Limit',
+  'suffix' => 'Suffix',
+  'usr_multicast_receive' => 'USR-Multicast-Receive',
+  'client_dns_sec' => 'Client_DNS_Sec',
+  'annex_product_name' => 'Annex-Product-Name',
+  'cisco_pw_lifetime' => 'Cisco-PW-Lifetime',
+  'x_ascend_fr_dce_n393' => 'X-Ascend-FR-DCE-N393',
+  'x_ascend_ts_idle_limit' => 'X-Ascend-TS-Idle-Limit',
+  'usr_last_number_dialed_o' => 'USR-Last-Number-Dialed-Out',
+  'mcast_send' => 'Mcast_Send',
+  'pppoe_motm' => 'PPPOE_MOTM',
+  'usr_pw_usr_ifilter_ipx' => 'USR-PW_USR_IFilter_IPX',
   'usr_pw_tunnel_authentica' => 'USR-PW_Tunnel_Authentication',
-  'usr_call_end_time' => 'USR-Call-End-Time',
-  'x_ascend_dialout_allowed' => 'X-Ascend-Dialout-Allowed',
-  'x_ascend_call_attempt_li' => 'X-Ascend-Call-Attempt-Limit',
-  'initial_modulation_type' => 'Initial-Modulation-Type',
-  'usr_packet_bus_session' => 'USR-Packet-Bus-Session',
-  'x_ascend_ipx_node_addr' => 'X-Ascend-IPX-Node-Addr',
-  'ascend_ppp_vj_slot_comp' => 'Ascend-PPP-VJ-Slot-Comp',
+  'ascend_source_ip_check' => 'Ascend-Source-IP-Check',
+  'ascend_assign_ip_global_' => 'Ascend-Assign-IP-Global-Pool',
+  'ms_ras_version' => 'MS-RAS-Version',
+  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Ttl',
+  'x_ascend_modem_slotno' => 'X-Ascend-Modem-SlotNo',
+  'acc_ml_call_threshold' => 'Acc-ML-Call-Threshold',
   'ascend_menu_item' => 'Ascend-Menu-Item',
-  'x_ascend_fr_link_mgt' => 'X-Ascend-FR-Link-Mgt',
-  'usr_rmmie_serial_number' => 'USR-RMMIE-Serial-Number',
-  'message_authenticator' => 'Message-Authenticator',
-  'usr_dte_data_idle_timout' => 'USR-DTE-Data-Idle-Timout',
-  'usr_port_tap_facility' => 'USR-Port-Tap-Facility',
-  'acc_ml_mlx_admin_state' => 'Acc-ML-MLX-Admin-State',
-  'usr_modem_group' => 'USR-Modem-Group',
-  'x_ascend_callback' => 'X-Ascend-Callback',
-  'acct_input_packets_64' => 'Acct_Input_Packets_64',
-  'ascend_third_prompt' => 'Ascend-Third-Prompt',
-  'configuration_token' => 'Configuration-Token',
-  'x_ascend_fr_nailed_grp' => 'X-Ascend-FR-Nailed-Grp',
-  'acct_output_octets_64' => 'Acct_Output_Octets_64',
-  'h323_time_and_day' => 'h323-time-and-day',
-  'ascend_port_redir_portnu' => 'Ascend-Port-Redir-Portnum',
-  'acct_interim_interval' => 'Acct-Interim-Interval',
-  'ascend_uu_info' => 'Ascend-UU-Info',
-  'usr_pw_vpn_name' => 'USR-PW_VPN_Name',
+  'usr_cdma_call_reference_' => 'USR-CDMA-Call-Reference-Number',
+  'callback_id' => 'Callback-Id',
+  'framed_ipx_network' => 'Framed-IPX-Network',
+  'x_ascend_disconnect_caus' => 'X-Ascend-Disconnect-Cause',
+  'ascend_user_acct_key' => 'Ascend-User-Acct-Key',
+  'x_ascend_pw_lifetime' => 'X-Ascend-PW-Lifetime',
+  'user_name_is_star' => 'User-Name-Is-Star',
+  'x_ascend_authen_alias' => 'X-Ascend-Authen-Alias',
+  'framed_pool' => 'Framed-Pool',
+  'ms_primary_dns_server' => 'MS-Primary-DNS-Server',
+  'realm' => 'Realm',
+  'arap_features' => 'ARAP-Features',
+  'acc_connect_tx_speed' => 'Acc-Connect-Tx-Speed',
+  'usr_last_number_dialed_i' => 'USR-Last-Number-Dialed-In-DNIS',
+  'usr_chassis_temperature' => 'USR-Chassis-Temperature',
+  'x_ascend_xmit_rate' => 'X-Ascend-Xmit-Rate',
+  'x_ascend_send_passwd' => 'X-Ascend-Send-Passwd',
+  'le_modem_info' => 'LE-Modem-Info',
+  'ascend_ipx_peer_mode' => 'Ascend-IPX-Peer-Mode',
+  'le_nat_other_session_tim' => 'LE-NAT-Other-Session-Timeout',
+  'tunnel_rate_limit_rate' => 'Tunnel_Rate_Limit_Rate',
   'ascend_maximum_call_dura' => 'Ascend-Maximum-Call-Duration',
-  'ascend_atm_direct_profil' => 'Ascend-ATM-Direct-Profile',
-  'acc_input_errors' => 'Acc-Input-Errors',
-  'bind_dot1q_port' => 'Bind_Dot1q_Port',
-  'ascend_first_dest' => 'Ascend-First-Dest',
-  'x_ascend_if_netmask' => 'X-Ascend-IF-Netmask',
-  'tunnel_session_auth_serv' => 'Tunnel_Session_Auth_Service_Grp',
-  'annex_local_ip_address' => 'Annex-Local-IP-Address',
-  'termination_menu' => 'Termination-Menu',
-  'ms_chap2_cpw' => 'MS-CHAP2-CPW',
-  'ascend_mpp_idle_percent' => 'Ascend-MPP-Idle-Percent',
-  'usr_characters_sent' => 'USR-Characters-Sent',
-  'eap_message' => 'EAP-Message',
-  'acct_delay_time' => 'Acct-Delay-Time',
-  'ascend_remote_fw' => 'Ascend-Remote-FW',
-  'x_ascend_tunneling_proto' => 'X-Ascend-Tunneling-Protocol',
-  'shiva_session_id' => 'Shiva-Session-Id',
-  'usr_igmp_query_interval' => 'USR-IGMP-Query-Interval',
-  'usr_accm_type' => 'USR-ACCM-Type',
-  'usr_call_terminate_in_gm' => 'USR-Call-Terminate-in-GMT',
-  'usr_rad_location_type' => 'USR-Rad-Location-Type',
-  'ascend_filter' => 'Ascend-Filter',
-  'ascend_primary_home_agen' => 'Ascend-Primary-Home-Agent',
-  'x_ascend_user_acct_host' => 'X-Ascend-User-Acct-Host',
-  'chap_challenge' => 'CHAP-Challenge',
-  'acct_output_packets_64' => 'Acct_Output_Packets_64',
-  'bind_auth_max_sessions' => 'Bind_Auth_Max_Sessions',
-  'cisco_pre_output_octets' => 'Cisco-Pre-Output-Octets',
-  'x_ascend_fr_direct' => 'X-Ascend-FR-Direct',
-  'x_ascend_client_secondar' => 'X-Ascend-Client-Secondary-DNS',
-  'usr_rmmie_pwrlvl_nearech' => 'USR-RMMIE-PwrLvl-NearEcho-Canc',
-  'ascend_bridge_address' => 'Ascend-Bridge-Address',
-  'user_name' => 'User-Name',
-  'usr_rmmie_firmware_build' => 'USR-RMMIE-Firmware-Build-Date',
-  'ms_chap_mppe_keys' => 'MS-CHAP-MPPE-Keys',
-  'usr_number_of_characters' => 'USR-Number-Of-Characters-Lost',
-  'usr_physical_state' => 'USR-Physical-State',
-  'x_ascend_assign_ip_serve' => 'X-Ascend-Assign-IP-Server',
-  'bind_int_context' => 'Bind_Int_Context',
-  'erx_tunnel_virtual_route' => 'ERX-Tunnel-Virtual-Router',
-  'ascend_xmit_rate' => 'Ascend-Xmit-Rate',
-  'usr_secondary_dns_server' => 'USR-Secondary_DNS_Server',
+  'ascend_dhcp_pool_number' => 'Ascend-DHCP-Pool-Number',
+  'x_ascend_callback' => 'X-Ascend-Callback',
+  'ascend_access_intercept_' => 'Ascend-Access-Intercept-Log',
+  'usr_iwf_ip_address' => 'USR-IWF-IP-Address',
+  'nas_port_id' => 'NAS-Port-Id',
+  'le_advice_of_charge' => 'LE-Advice-of-Charge',
+  'ascend_add_seconds' => 'Ascend-Add-Seconds',
+  'annex_transmit_speed' => 'Annex-Transmit-Speed',
+  'usr_port_tap' => 'USR-Port-Tap',
+  'usr_at_call_input_filter' => 'USR-AT-Call-Input-Filter',
+  'ascend_qos_downstream' => 'Ascend-QOS-Downstream',
+  'ascend_x25_reverse_charg' => 'Ascend-X25-Reverse-Charging',
+  'lac_port' => 'LAC_Port',
+  'tunnel_assignment_id' => 'Tunnel-Assignment-Id',
+  'fall_through' => 'Fall-Through',
+  'cisco_disconnect_cause' => 'Cisco-Disconnect-Cause',
+  'module_message' => 'Module-Message',
+  'framed_ip_netmask' => 'Framed-IP-Netmask',
+  'ascend_egress_enabled' => 'Ascend-Egress-Enabled',
   'ascend_dsl_rate_mode' => 'Ascend-Dsl-Rate-Mode',
-  'ascend_data_rate' => 'Ascend-Data-Rate',
-  'realm' => 'Realm',
-  'usr_ipx_call_input_filte' => 'USR-IPX-Call-Input-Filter',
-  'ascend_ipx_route' => 'Ascend-IPX-Route',
-  'usr_failure_to_connect_r' => 'USR-Failure-to-Connect-Reason',
-  'x_ascend_home_network_na' => 'X-Ascend-Home-Network-Name',
-  'acc_nbns_server_pri' => 'Acc-Nbns-Server-Pri',
+  'x_ascend_client_primary_' => 'X-Ascend-Client-Primary-DNS',
+  'usr_pw_usr_ofilter_sap' => 'USR-PW_USR_OFilter_SAP',
+  'acct_terminate_cause' => 'Acct-Terminate-Cause',
+  'x_ascend_fr_dte_n393' => 'X-Ascend-FR-DTE-N393',
+  'x_ascend_call_block_dura' => 'X-Ascend-Call-Block-Duration',
+  'ascend_ppp_address' => 'Ascend-PPP-Address',
+  'caller_id' => 'Caller-ID',
+  'bind_int_interface_name' => 'Bind_Int_Interface_Name',
+  'x_ascend_ppp_vj_slot_com' => 'X-Ascend-PPP-VJ-Slot-Comp',
+  'usr_modem_group' => 'USR-Modem-Group',
+  'cisco_maximum_channels' => 'Cisco-Maximum-Channels',
+  'ascend_link_compression' => 'Ascend-Link-Compression',
+  'usr_retrains_granted' => 'USR-Retrains-Granted',
+  'ascend_dropped_packets' => 'Ascend-Dropped-Packets',
+  'usr_pw_usr_ofilter_ip' => 'USR-PW_USR_OFilter_IP',
+  'quintum_nas_port' => 'Quintum-NAS-Port',
+  'annex_tunnel_authen_mode' => 'Annex-Tunnel-Authen-Mode',
+  'tunnel_function' => 'Tunnel_Function',
+  'usr_mp_edo' => 'USR-MP-EDO',
+  'le_nat_outmap' => 'LE-NAT-Outmap',
   'usr_modulation_type' => 'USR-Modulation-Type',
-  'service_type' => 'Service-Type',
-  'ascend_callback_delay' => 'Ascend-Callback-Delay',
-  'ascend_owner_ip_addr' => 'Ascend-Owner-IP-Addr',
-  'x_ascend_handle_ipx' => 'X-Ascend-Handle-IPX',
-  'usr_connect_term_reason' => 'USR-Connect-Term-Reason',
-  'x_ascend_multicast_rate_' => 'X-Ascend-Multicast-Rate-Limit',
-  'h323_disconnect_time' => 'h323-disconnect-time',
-  'acc_ip_gateway_sec' => 'Acc-Ip-Gateway-Sec',
-  'usr_number_of_blers' => 'USR-Number-of-Blers',
-  'x_ascend_fr_type' => 'X-Ascend-FR-Type',
-  'ascend_assign_ip_pool' => 'Ascend-Assign-IP-Pool',
-  'ascend_qos_upstream' => 'Ascend-QOS-Upstream',
-  'usr_nas_type' => 'USR-NAS-Type',
-  'acc_dial_port_index' => 'Acc-Dial-Port-Index',
-  'usr_initial_tx_link_data' => 'USR-Initial-Tx-Link-Data-Rate',
-  'ascend_fr_type' => 'Ascend-FR-Type',
-  'usr_mbi_ct_tdm_time_slot' => 'USR-Mbi_Ct_TDM_Time_Slot',
-  'usr_rmmie_pwrlvl_xmit_lv' => 'USR-RMMIE-PwrLvl-Xmit-Lvl',
-  'erx_atm_service_category' => 'ERX-Atm-Service-Category',
-  'usr_appletalk' => 'USR-Appletalk',
-  'usr_send_script1' => 'USR-Send-Script1',
-  'usr_send_script2' => 'USR-Send-Script2',
-  'usr_send_script3' => 'USR-Send-Script3',
-  'usr_ospf_addressless_ind' => 'USR-OSPF-Addressless-Index',
-  'acct_input_packets' => 'Acct-Input-Packets',
-  'usr_send_script4' => 'USR-Send-Script4',
-  'usr_send_script5' => 'USR-Send-Script5',
+  'ascend_maximum_time' => 'Ascend-Maximum-Time',
+  'annex_callback_portlist' => 'Annex-Callback-Portlist',
+  'x_ascend_remove_seconds' => 'X-Ascend-Remove-Seconds',
+  'tunnel_server_endpoint' => 'Tunnel-Server-Endpoint',
+  'arap_password' => 'ARAP-Password',
+  'ms_chap_mppe_keys' => 'MS-CHAP-MPPE-Keys',
+  'ascend_source_auth' => 'Ascend-Source-Auth',
+  'group' => 'Group',
   'usr_send_script6' => 'USR-Send-Script6',
-  'usr_service_option' => 'USR-Service-Option',
-  'ascend_dropped_octets' => 'Ascend-Dropped-Octets',
-  'usr_ip' => 'USR-IP',
-  'usr_tunnel_security' => 'USR-Tunnel-Security',
+  'le_nat_inmap' => 'LE-NAT-Inmap',
+  'chap_password' => 'CHAP-Password',
+  'annex_primary_nbns_serve' => 'Annex-Primary-NBNS-Server',
+  'annex_receive_speed' => 'Annex-Receive-Speed',
+  'usr_rmmie_manufacturer_i' => 'USR-RMMIE-Manufacturer-ID',
+  'bind_l2tp_flow_control' => 'Bind_L2TP_Flow_Control',
+  'smb_account_ctrl' => 'SMB-Account-CTRL',
+  'ascend_calling_id_presen' => 'Ascend-Calling-Id-Presentatn',
+  'ascend_ip_pool_chaining' => 'Ascend-IP-Pool-Chaining',
+  'le_admin_group' => 'LE-Admin-Group',
+  'nas_identifier' => 'NAS-Identifier',
+  'x_ascend_history_weigh_t' => 'X-Ascend-History-Weigh-Type',
+  'tunnel_connection_id' => 'Tunnel-Connection-Id',
+  'nas_real_port' => 'NAS_Real_Port',
+  'ms_old_arap_password' => 'MS-Old-ARAP-Password',
+  'usr_ip_rip_simple_auth_p' => 'USR-IP-RIP-Simple-Auth-Password',
+  'erx_primary_wins' => 'ERX-Primary-Wins',
+  'usr_pw_index' => 'USR-PW_Index',
+  'erx_cli_allow_all_vr_acc' => 'ERX-Cli-Allow-All-VR-Access',
+  'le_ipsec_log_options' => 'LE-IPSec-Log-Options',
+  'ascend_home_agent_ip_add' => 'Ascend-Home-Agent-IP-Addr',
+  'annex_re_chap_timeout' => 'Annex-Re-CHAP-Timeout',
+  'usr_final_tx_link_data_r' => 'USR-Final-Tx-Link-Data-Rate',
+  'client_dns_pri' => 'Client_DNS_Pri',
+  'usr_primary_nbns_server' => 'USR-Primary_NBNS_Server',
+  'usr_cusr_hat_script_rule' => 'USR-CUSR-hat-Script-Rules',
+  'ascend_multicast_rate_li' => 'Ascend-Multicast-Rate-Limit',
+  'usr_rmmie_pwrlvl_farecho' => 'USR-RMMIE-PwrLvl-FarEcho-Canc',
   'acc_acct_on_off_reason' => 'Acc-Acct-On-Off-Reason',
-  'shiva_compression_type' => 'Shiva-Compression-Type',
-  'ascend_pw_warntime' => 'Ascend-PW-Warntime',
-  'usr_security_resp_limit' => 'USR-Security-Resp-Limit',
-  'ascend_x25_pad_prompt' => 'Ascend-X25-Pad-Prompt',
-  'cisco_asing_ip_pool' => 'Cisco-Asing-IP-Pool',
-  'acc_route_policy' => 'Acc-Route-Policy',
-  'annex_local_username' => 'Annex-Local-Username',
-  'x_ascend_call_by_call' => 'X-Ascend-Call-By-Call',
-  'ascend_calling_id_screen' => 'Ascend-Calling-Id-Screening',
-  'x_ascend_dhcp_pool_numbe' => 'X-Ascend-DHCP-Pool-Number',
-  'nas_port_type' => 'NAS-Port-Type',
-  'ascend_route_ip' => 'Ascend-Route-IP',
-  'ascend_client_gateway' => 'Ascend-Client-Gateway',
-  'ascend_qos_downstream' => 'Ascend-QOS-Downstream',
-  'ms_bap_usage' => 'MS-BAP-Usage',
-  'usr_vts_session_key' => 'USR-VTS-Session-Key',
-  'usr_receive_acc_map' => 'USR-Receive-Acc-Map',
-  'ascend_expect_callback' => 'Ascend-Expect-Callback',
-  'password' => 'Password',
-  'packet_type' => 'Packet-Type',
-  'ascend_remote_addr' => 'Ascend-Remote-Addr',
-  'ascend_recv_name' => 'Ascend-Recv-Name',
-  'ms_acct_eap_type' => 'MS-Acct-EAP-Type',
-  'usr_filter_zones' => 'USR-Filter-Zones',
-  'annex_output_filter' => 'Annex-Output-Filter',
-  'usr_rmmie_rcv_tot_pwrlvl' => 'USR-RMMIE-Rcv-Tot-PwrLvl',
-  'usr_mp_mrru' => 'USR-MP-MRRU',
-  'ascend_call_filter' => 'Ascend-Call-Filter',
-  'usr_keypress_timeout' => 'USR-Keypress-Timeout',
-  'usr_modem_setup_time' => 'USR-Modem-Setup-Time',
-  'acct_authentic' => 'Acct-Authentic',
-  'pppoe_motm' => 'PPPOE_MOTM',
-  'x_ascend_expect_callback' => 'X-Ascend-Expect-Callback',
-  'erx_atm_scr' => 'ERX-Atm-SCR',
-  'erx_address_pool_name' => 'ERX-Address-Pool-Name',
-  'challenge_state' => 'Challenge-State',
-  'usr_multicast_proxy' => 'USR-Multicast-Proxy',
-  'framed_filter_id' => 'Framed-Filter-Id',
-  'add_suffix' => 'Add-Suffix',
-  'ascend_auth_type' => 'Ascend-Auth-Type',
-  'session_timeout' => 'Session-Timeout',
-  'ascend_callback' => 'Ascend-Callback',
-  'usr_chat_script_name' => 'USR-Chat-Script-Name',
-  'port_message' => 'Port-Message',
-  'acct_output_packets' => 'Acct-Output-Packets',
-  'ascend_session_svr_key' => 'Ascend-Session-Svr-Key',
-  'login_tcp_port' => 'Login-TCP-Port',
-  'erx_tunnel_password' => 'ERX-Tunnel-Password',
-  'shasta_user_privilege' => 'Shasta-User-Privilege',
-  'usr_secondary_nbns_serve' => 'USR-Secondary_NBNS_Server',
-  'usr_security_login_limit' => 'USR-Security-Login-Limit',
-  'usr_start_time' => 'USR-Start-Time',
-  'acc_access_partition' => 'Acc-Access-Partition',
-  'versanet_termination_cau' => 'Versanet-Termination-Cause',
-  'x_ascend_call_block_dura' => 'X-Ascend-Call-Block-Duration',
-  'mcast_maxgroups' => 'Mcast_MaxGroups',
-  'ascend_user_acct_base' => 'Ascend-User-Acct-Base',
-  'usr_vpn_gw_location_id' => 'USR-VPN-GW-Location-Id',
-  'usr_block_error_count_li' => 'USR-Block-Error-Count-Limit',
-  'ascend_telnet_profile' => 'Ascend-Telnet-Profile',
-  'ascend_port_redir_protoc' => 'Ascend-Port-Redir-Protocol',
-  'ascend_call_by_call' => 'Ascend-Call-By-Call',
-  'usr_disconnect_cause_ind' => 'USR-Disconnect-Cause-Indicator',
-  'x_ascend_fr_linkup' => 'X-Ascend-FR-LinkUp',
-  'ascend_billing_number' => 'Ascend-Billing-Number',
-  'usr_ds0s' => 'USR-DS0s',
-  'usr_at_zip_output_filter' => 'USR-AT-Zip-Output-Filter',
-  'ascend_user_acct_port' => 'Ascend-User-Acct-Port',
-  'login_port' => 'Login-Port',
-  'arap_security' => 'ARAP-Security',
-  'tunnel_deadtime' => 'Tunnel_Deadtime',
-  'ascend_user_acct_time' => 'Ascend-User-Acct-Time',
+  'le_multicast_client' => 'LE-Multicast-Client',
+  'ascend_send_passwd' => 'Ascend-Send-Passwd',
+  'annex_unauthenticated_ti' => 'Annex-Unauthenticated-Time',
+  'tunnel_context' => 'Tunnel_Context',
+  'acc_nbns_server_sec' => 'Acc-Nbns-Server-Sec',
+  'usr_channel_decrement' => 'USR-Channel-Decrement',
+  'usr_rmmie_firmware_versi' => 'USR-RMMIE-Firmware-Version',
   'ms_chap_challenge' => 'MS-CHAP-Challenge',
+  'x_ascend_client_secondar' => 'X-Ascend-Client-Secondary-DNS',
+  'ascend_cbcp_mode' => 'Ascend-CBCP-Mode',
   'ascend_x25_rpoa' => 'Ascend-X25-Rpoa',
-  'login_time' => 'Login-Time',
-  'current_time' => 'Current-Time',
-  'login_service' => 'Login-Service',
-  'ascend_menu_selector' => 'Ascend-Menu-Selector',
-  'ascend_bacp_enable' => 'Ascend-BACP-Enable',
-  'shiva_link_speed' => 'Shiva-Link-Speed',
-  'ascend_private_route_tab' => 'Ascend-Private-Route-Table-ID',
-  'x_ascend_session_svr_key' => 'X-Ascend-Session-Svr-Key',
-  'ascend_data_filter' => 'Ascend-Data-Filter',
-  'ascend_target_util' => 'Ascend-Target-Util',
+  'usr_dtr_false_timeout' => 'USR-DTR-False-Timeout',
+  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Proto',
+  'ascend_x25_pad_x3_parame' => 'Ascend-X25-Pad-X3-Parameters',
+  'usr_physical_state' => 'USR-Physical-State',
+  'ascend_fr_t391' => 'Ascend-FR-T391',
+  'bind_dot1q_port' => 'Bind_Dot1q_Port',
+  'lac_port_type' => 'LAC_Port_Type',
+  'bg_aging_time' => 'BG_Aging_Time',
+  'erx_atm_scr' => 'ERX-Atm-SCR',
+  'x_ascend_menu_item' => 'X-Ascend-Menu-Item',
+  'ascend_x25_pad_banner' => 'Ascend-X25-Pad-Banner',
+  'h323_gw_id' => 'h323-gw-id',
+  'h323_preferred_lang' => 'h323-preferred-lang',
+  'usr_min_compression_size' => 'USR-Min-Compression-Size',
+  'usr_compression_type' => 'USR-Compression-Type',
+  'x_ascend_call_attempt_li' => 'X-Ascend-Call-Attempt-Limit',
+  'ascend_dialout_allowed' => 'Ascend-Dialout-Allowed',
+  'annex_local_username' => 'Annex-Local-Username',
+  'cisco_pre_input_packets' => 'Cisco-Pre-Input-Packets',
+  'ascend_send_secret' => 'Ascend-Send-Secret',
   'shiva_function' => 'Shiva-Function',
-  'usr_pw_usr_ifilter_ip' => 'USR-PW_USR_IFilter_IP',
-  'usr_igmp_routing' => 'USR-IGMP-Routing',
-  'acc_tunnel_port' => 'Acc-Tunnel-Port',
-  'x_ascend_fr_n391' => 'X-Ascend-FR-N391',
-  'medium_type' => 'Medium_Type',
-  'annex_domain_name' => 'Annex-Domain-Name',
-  'ascend_fr_n391' => 'Ascend-FR-N391',
-  'callback_number' => 'Callback-Number',
-  'usr_chassis_temperature' => 'USR-Chassis-Temperature',
-  'dialback_no' => 'Dialback-No',
-  'ms_mppe_recv_key' => 'MS-MPPE-Recv-Key',
-  'ascend_ipx_alias' => 'Ascend-IPX-Alias',
-  'le_nat_inmap' => 'LE-NAT-Inmap',
-  'tunnel_police_rate' => 'Tunnel_Police_Rate',
-  'acct_terminate_cause' => 'Acct-Terminate-Cause',
-  'le_nat_other_session_tim' => 'LE-NAT-Other-Session-Timeout',
-  'usr_ip_rip_output_filter' => 'USR-IP-RIP-Output-Filter',
+  'usr_dte_data_idle_timout' => 'USR-DTE-Data-Idle-Timout',
+  'usr_number_of_blers' => 'USR-Number-of-Blers',
+  'usr_card_type' => 'USR-Card-Type',
+  'ascend_token_idle' => 'Ascend-Token-Idle',
+  'x_ascend_group' => 'X-Ascend-Group',
+  'nt_password' => 'NT-Password',
+  'acct_mcast_in_packets' => 'Acct_Mcast_In_Packets',
+  'usr_supports_tags' => 'USR-Supports-Tags',
+  'ascend_number_sessions' => 'Ascend-Number-Sessions',
+  'x_ascend_add_seconds' => 'X-Ascend-Add-Seconds',
+  'usr_number_of_upshifts' => 'USR-Number-of-Upshifts',
+  'proxy_to_realm' => 'Proxy-To-Realm',
+  'acc_callback_num_valid' => 'Acc-Callback-Num-Valid',
+  'x_ascend_maximum_channel' => 'X-Ascend-Maximum-Channels',
+  'acc_access_community' => 'Acc-Access-Community',
+  'x_ascend_fr_direct_profi' => 'X-Ascend-FR-Direct-Profile',
+  'usr_send_name' => 'USR-Send-Name',
+  'usr_chassis_slot' => 'USR-Chassis-Slot',
+  'login_ip_host' => 'Login-IP-Host',
+  'ascend_netware_timeout' => 'Ascend-Netware-timeout',
+  'vendor_specific' => 'Vendor-Specific',
+  'bind_sub_user_at_context' => 'Bind_Sub_User_At_Context',
+  'ascend_fr_direct_dlci' => 'Ascend-FR-Direct-DLCI',
+  'ascend_atm_fault_managem' => 'Ascend-ATM-Fault-Management',
+  'ascend_qos_upstream' => 'Ascend-QOS-Upstream',
+  'source_validation' => 'Source_Validation',
+  'x_ascend_token_expiry' => 'X-Ascend-Token-Expiry',
+  'ascend_dec_channel_count' => 'Ascend-Dec-Channel-Count',
+  'usr_local_framed_ip_addr' => 'USR-Local-Framed-IP-Addr',
+  'usr_service_option' => 'USR-Service-Option',
+  'usr_transmit_acc_map' => 'USR-Transmit-Acc-Map',
+  'ascend_fr_direct' => 'Ascend-FR-Direct',
+  'x_ascend_expect_callback' => 'X-Ascend-Expect-Callback',
+  'acc_ml_damping_factor' => 'Acc-ML-Damping-Factor',
+  'framed_netmask' => 'Framed-Netmask',
+  'usr_connect_speed' => 'USR-Connect-Speed',
+  'ascend_client_primary_wi' => 'Ascend-Client-Primary-WINS',
+  'cisco_multilink_id' => 'Cisco-Multilink-ID',
+  'bg_span_dis' => 'BG_Span_Dis',
+  'ascend_multilink_id' => 'Ascend-Multilink-ID',
+  'tunnel_max_tunnels' => 'Tunnel_Max_Tunnels',
+  'ascend_dhcp_reply' => 'Ascend-DHCP-Reply',
+  'ascend_x25_cug' => 'Ascend-X25-Cug',
+  'shiva_network_protocols' => 'Shiva-Network-Protocols',
+  'ascend_ara_pw' => 'Ascend-Ara-PW',
+  'ip_host_addr' => 'Ip_Host_Addr',
+  'le_ip_gateway' => 'LE-IP-Gateway',
+  'usr_mobile_numbytes_txed' => 'USR-Mobile-NumBytes-Txed',
+  'x_ascend_fr_t392' => 'X-Ascend-FR-T392',
+  'cisco_pre_output_packets' => 'Cisco-Pre-Output-Packets',
+  'tunnel_group' => 'Tunnel_Group',
+  'bind_sub_password' => 'Bind_Sub_Password',
+  'eap_message' => 'EAP-Message',
   'exec_program' => 'Exec-Program',
-  'h323_disconnect_cause' => 'h323-disconnect-cause',
-  'usr_chassis_call_channel' => 'USR-Chassis-Call-Channel',
-  'x_ascend_fr_dlci' => 'X-Ascend-FR-DLCI',
-  'ms_link_drop_time_limit' => 'MS-Link-Drop-Time-Limit',
-  'acc_callback_num_valid' => 'Acc-Callback-Num-Valid',
-  'cisco_presession_time' => 'Cisco-PreSession-Time',
-  'ms_chap_response' => 'MS-CHAP-Response',
-  'usr_spoofing' => 'USR-Spoofing',
-  'usr_num_fax_pages_proces' => 'USR-Num-Fax-Pages-Processed',
-  'ascend_x25_cug' => 'Ascend-X25-Cug',
-  'ascend_fr_dlci' => 'Ascend-FR-DLCI',
-  'shiva_user_attributes' => 'Shiva-User-Attributes',
-  'ms_chap_lm_enc_pw' => 'MS-CHAP-LM-Enc-PW',
-  'ascend_transit_number' => 'Ascend-Transit-Number',
-  'usr_last_number_dialed_i' => 'USR-Last-Number-Dialed-In-DNIS',
-  'usr_ip_saa_filter' => 'USR-IP-SAA-Filter',
-  'usr_pw_usr_ifilter_ipx' => 'USR-PW_USR_IFilter_IPX',
-  'ascend_remove_seconds' => 'Ascend-Remove-Seconds',
-  'le_connect_detail' => 'LE-Connect-Detail',
-  'ascend_assign_ip_global_' => 'Ascend-Assign-IP-Global-Pool',
-  'proxy_to_realm' => 'Proxy-To-Realm',
-  'usr_retrains_requested' => 'USR-Retrains-Requested',
-  'h323_remote_address' => 'h323-remote-address',
-  'ascend_x25_nui_prompt' => 'Ascend-X25-Nui-Prompt',
-  'acc_customer_id' => 'Acc-Customer-Id',
-  'ms_chap2_response' => 'MS-CHAP2-Response',
-  'ascend_host_info' => 'Ascend-Host-Info',
-  'annex_addr_resolution_se' => 'Annex-Addr-Resolution-Servers',
-  'x_ascend_multilink_id' => 'X-Ascend-Multilink-ID',
-  'login_lat_service' => 'Login-LAT-Service',
-  'usr_rmmie_rcv_pwrlvl_330' => 'USR-RMMIE-Rcv-PwrLvl-3300Hz',
-  'ascend_event_type' => 'Ascend-Event-Type',
-  'ascend_inc_channel_count' => 'Ascend-Inc-Channel-Count',
-  'cisco_ppp_async_map' => 'Cisco-PPP-Async-Map',
-  'usr_min_compression_size' => 'USR-Min-Compression-Size',
-  'ascend_traffic_shaper' => 'Ascend-Traffic-Shaper',
-  'ascend_user_acct_key' => 'Ascend-User-Acct-Key',
-  'usr_port_tap_output' => 'USR-Port-Tap-Output',
-  'ascend_x25_nui' => 'Ascend-X25-Nui',
-  'x_ascend_disconnect_caus' => 'X-Ascend-Disconnect-Cause',
+  'bg_path_cost' => 'BG_Path_Cost',
+  'auth_type' => 'Auth-Type',
+  'usr_modem_training_time' => 'USR-Modem-Training-Time',
   'ascend_cbcp_enable' => 'Ascend-CBCP-Enable',
-  'usr_framed_ip_address_po' => 'USR-Framed_IP_Address_Pool_Name',
+  'x_ascend_ipx_route' => 'X-Ascend-IPX-Route',
+  'ascend_redirect_number' => 'Ascend-Redirect-Number',
+  'h323_credit_time' => 'h323-credit-time',
+  'ascend_appletalk_route' => 'Ascend-Appletalk-Route',
+  'shiva_link_protocol' => 'Shiva-Link-Protocol',
+  'x_ascend_fr_circuit_name' => 'X-Ascend-FR-Circuit-Name',
+  'client_id' => 'Client-Id',
+  'usr_appletalk' => 'USR-Appletalk',
+  'usr_mpip_tunnel_originat' => 'USR-MPIP-Tunnel-Originator',
+  'annex_output_filter' => 'Annex-Output-Filter',
+  'pvc_circuit_padding' => 'PVC_Circuit_Padding',
+  'x_ascend_minimum_channel' => 'X-Ascend-Minimum-Channels',
+  'h323_time_and_day' => 'h323-time-and-day',
+  'ascend_ipx_header_compre' => 'Ascend-IPX-Header-Compression',
+  'termination_action' => 'Termination-Action',
+  'x_ascend_modem_portno' => 'X-Ascend-Modem-PortNo',
+  'acct_tunnel_packets_lost' => 'Acct-Tunnel-Packets-Lost',
+  'framed_filter_id' => 'Framed-Filter-Id',
+  'usr_ccp_algorithm' => 'USR-CCP-Algorithm',
+  'ascend_token_expiry' => 'Ascend-Token-Expiry',
+  'annex_secondary_nbns_ser' => 'Annex-Secondary-NBNS-Server',
+  'usr_et_bridge_call_outpu' => 'USR-ET-Bridge-Call-Output-Filte',
+  'acc_modem_error_protocol' => 'Acc-Modem-Error-Protocol',
+  'acc_request_type' => 'Acc-Request-Type',
+  'x_ascend_ipx_peer_mode' => 'X-Ascend-IPX-Peer-Mode',
+  'ascend_ppp_vj_slot_comp' => 'Ascend-PPP-VJ-Slot-Comp',
+  'cisco_presession_time' => 'Cisco-PreSession-Time',
+  'usr_chat_script_name' => 'USR-Chat-Script-Name',
+  'ascend_fr_circuit_name' => 'Ascend-FR-Circuit-Name',
+  'ascend_expect_callback' => 'Ascend-Expect-Callback',
+  'framed_mtu' => 'Framed-MTU',
+  'ascend_port_redir_protoc' => 'Ascend-Port-Redir-Protocol',
+  'usr_pw_vpn_name' => 'USR-PW_VPN_Name',
+  'ascend_nas_port_format' => 'Ascend-NAS-Port-Format',
+  'shasta_vpn_name' => 'Shasta-VPN-Name',
+  'usr_dtr_true_timeout' => 'USR-DTR-True-Timeout',
+  'ascend_third_prompt' => 'Ascend-Third-Prompt',
+  'connect_rate' => 'Connect-Rate',
+  'usr_block_error_count_li' => 'USR-Block-Error-Count-Limit',
+  'called_station_id' => 'Called-Station-Id',
+  'usr_pw_cutoff' => 'USR-PW_Cutoff',
+  'ascend_data_rate' => 'Ascend-Data-Rate',
+  'x_ascend_ts_idle_mode' => 'X-Ascend-TS-Idle-Mode',
+  'ascend_x25_pad_prompt' => 'Ascend-X25-Pad-Prompt',
+  'x_ascend_dhcp_reply' => 'X-Ascend-DHCP-Reply',
+  'acc_nbns_server_pri' => 'Acc-Nbns-Server-Pri',
+  'ascend_call_filter' => 'Ascend-Call-Filter',
+  'acc_tunnel_secret' => 'Acc-Tunnel-Secret',
+  'usr_simplified_v42bis_us' => 'USR-Simplified-V42bis-Usage',
+  'bind_int_context' => 'Bind_Int_Context',
+  'erx_virtual_router_name' => 'ERX-Virtual-Router-Name',
+  'crypt_password' => 'Crypt-Password',
+  'challenge_state' => 'Challenge-State',
+  'ascend_client_secondary_' => 'Ascend-Client-Secondary-DNS',
+  'strip_user_name' => 'Strip-User-Name',
+  'x_ascend_user_acct_host' => 'X-Ascend-User-Acct-Host',
+  'x_ascend_route_ip' => 'X-Ascend-Route-IP',
+  'x_ascend_assign_ip_clien' => 'X-Ascend-Assign-IP-Client',
+  'usr_mbi_ct_bchannel_used' => 'USR-Mbi_Ct_BChannel_Used',
   'ascend_x25_profile_name' => 'Ascend-X25-Profile-Name',
-  'usr_orig_nas_type' => 'USR-Orig-NAS-Type',
+  'usr_call_type' => 'USR-Call-Type',
+  'x_ascend_user_acct_base' => 'X-Ascend-User-Acct-Base',
+  'acct_output_gigawords' => 'Acct-Output-Gigawords',
+  'usr_rmmie_firmware_build' => 'USR-RMMIE-Firmware-Build-Date',
+  'ascend_fr_link_status_dl' => 'Ascend-FR-Link-Status-DLCI',
+  'login_lat_port' => 'Login-LAT-Port',
+  'usr_call_arrival_in_gmt' => 'USR-Call-Arrival-in-GMT',
+  'acct_mcast_in_octets' => 'Acct_Mcast_In_Octets',
+  'erx_sa_validate' => 'ERX-Sa-Validate',
+  'ascend_service_type' => 'Ascend-Service-Type',
+  'ascend_x25_nui_password_' => 'Ascend-X25-Nui-Password-Prompt',
+  'usr_pw_vpn_gateway' => 'USR-PW_VPN_Gateway',
+  'ascend_fr_dce_n392' => 'Ascend-FR-DCE-N392',
+  'acc_ip_compression' => 'Acc-Ip-Compression',
+  'lac_real_port_type' => 'LAC_Real_Port_Type',
+  'ascend_if_netmask' => 'Ascend-IF-Netmask',
+  'acct_session_start_time' => 'Acct-Session-Start-Time',
+  'ms_chap_nt_enc_pw' => 'MS-CHAP-NT-Enc-PW',
+  'ascend_port_redir_portnu' => 'Ascend-Port-Redir-Portnum',
+  'mcast_maxgroups' => 'Mcast_MaxGroups',
+  'x_ascend_home_agent_ip_a' => 'X-Ascend-Home-Agent-IP-Addr',
+  'ascend_cache_time' => 'Ascend-Cache-Time',
+  'x_ascend_data_svc' => 'X-Ascend-Data-Svc',
+  'erx_tunnel_virtual_route' => 'ERX-Tunnel-Virtual-Router',
+  'usr_re_chap_timeout' => 'USR-Re-Chap-Timeout',
+  'x_ascend_ppp_vj_1172' => 'X-Ascend-PPP-VJ-1172',
+  'usr_igmp_routing' => 'USR-IGMP-Routing',
+  'h323_prompt_id' => 'h323-prompt-id',
+  'le_terminate_detail' => 'LE-Terminate-Detail',
+  'acc_ml_clear_threshold' => 'Acc-ML-Clear-Threshold',
+  'x_ascend_ip_direct' => 'X-Ascend-IP-Direct',
+  'nas_port' => 'NAS-Port',
+  'x_ascend_data_rate' => 'X-Ascend-Data-Rate',
+  'usr_ip_call_input_filter' => 'USR-IP-Call-Input-Filter',
+  'ascend_auth_type' => 'Ascend-Auth-Type',
+  'x_ascend_preempt_limit' => 'X-Ascend-Preempt-Limit',
+  'h323_credit_amount' => 'h323-credit-amount',
+  'usr_reply_script1' => 'USR-Reply-Script1',
+  'usr_et_bridge_input_filt' => 'USR-ET-Bridge-Input-Filter',
+  'current_time' => 'Current-Time',
+  'cisco_xmit_rate' => 'Cisco-Xmit-Rate',
+  'ascend_authen_alias' => 'Ascend-Authen-Alias',
+  'x_ascend_session_svr_key' => 'X-Ascend-Session-Svr-Key',
+  'acc_dialout_auth_mode' => 'Acc-Dialout-Auth-Mode',
+  'usr_event_date_time' => 'USR-Event-Date-Time',
+  'x_ascend_ipx_node_addr' => 'X-Ascend-IPX-Node-Addr',
+  'ascend_primary_home_agen' => 'Ascend-Primary-Home-Agent',
+  'x_ascend_user_acct_time' => 'X-Ascend-User-Acct-Time',
+  'usr_at_call_output_filte' => 'USR-AT-Call-Output-Filter',
   'acc_output_errors' => 'Acc-Output-Errors',
-  'h323_redirect_ip_address' => 'h323-redirect-ip-address',
-  'usr_ip_call_output_filte' => 'USR-IP-Call-Output-Filter',
-  'cisco_avpair' => 'Cisco-AVPair',
-  'usr_slot_connected_to' => 'USR-Slot-Connected-To',
-  'framed_route' => 'Framed-Route',
-  'ascend_global_call_id' => 'Ascend-Global-Call-Id',
-  'x_ascend_seconds_of_hist' => 'X-Ascend-Seconds-Of-History',
-  'x_ascend_temporary_rtes' => 'X-Ascend-Temporary-Rtes',
+  'usr_ipx_rip_output_filte' => 'USR-IPX-RIP-Output-Filter',
+  'x_ascend_pri_number_type' => 'X-Ascend-PRI-Number-Type',
+  'bind_l2tp_tunnel_name' => 'Bind_L2TP_Tunnel_Name',
+  'replicate_to_realm' => 'Replicate-To-Realm',
+  'usr_at_zip_input_filter' => 'USR-AT-Zip-Input-Filter',
+  'annex_mrru' => 'Annex-MRRU',
+  'event_timestamp' => 'Event-Timestamp',
+  'ascend_pre_input_packets' => 'Ascend-Pre-Input-Packets',
+  'h323_call_origin' => 'h323-call-origin',
+  'x_ascend_fr_type' => 'X-Ascend-FR-Type',
+  'x_ascend_token_idle' => 'X-Ascend-Token-Idle',
+  'usr_igmp_query_interval' => 'USR-IGMP-Query-Interval',
+  'ascend_atm_vci' => 'Ascend-ATM-Vci',
+  'usr_port_tap_output' => 'USR-Port-Tap-Output',
+  'session' => 'Session',
+  'ascend_uu_info' => 'Ascend-UU-Info',
+  'ms_mppe_recv_key' => 'MS-MPPE-Recv-Key',
+  'usr_secondary_dns_server' => 'USR-Secondary_DNS_Server',
+  'x_ascend_tunneling_proto' => 'X-Ascend-Tunneling-Protocol',
+  'acc_dial_port_index' => 'Acc-Dial-Port-Index',
+  'cisco_nas_port' => 'Cisco-NAS-Port',
+  'usr_send_script1' => 'USR-Send-Script1',
+  'usr_tunnel_security' => 'USR-Tunnel-Security',
+  'arap_security' => 'ARAP-Security',
+  'tunnel_preference' => 'Tunnel-Preference',
+  'usr_reply_script4' => 'USR-Reply-Script4',
   'h323_currency_type' => 'h323-currency-type',
-  'x_ascend_token_expiry' => 'X-Ascend-Token-Expiry',
-  'pvc_encapsulation_type' => 'PVC_Encapsulation_Type',
-  'x_ascend_pw_lifetime' => 'X-Ascend-PW-Lifetime',
+  'usr_rmmie_status' => 'USR-RMMIE-Status',
+  'ascend_shared_profile_en' => 'Ascend-Shared-Profile-Enable',
+  'annex_syslog_tap' => 'Annex-Syslog-Tap',
+  'usr_send_script4' => 'USR-Send-Script4',
+  'acc_clearing_location' => 'Acc-Clearing-Location',
+  'annex_disconnect_reason' => 'Annex-Disconnect-Reason',
+  'x_ascend_dhcp_maximum_le' => 'X-Ascend-DHCP-Maximum-Leases',
+  'usr_at_input_filter' => 'USR-AT-Input-Filter',
+  'usr_auth_mode' => 'USR-Auth-Mode',
+  'shiva_session_id' => 'Shiva-Session-Id',
   'usr_expected_voltage' => 'USR-Expected-Voltage',
-  'usr_simplified_v42bis_us' => 'USR-Simplified-V42bis-Usage',
-  'shiva_customer_id' => 'Shiva-Customer-Id',
-  'usr_compression_algorith' => 'USR-Compression-Algorithm',
-  'annex_system_disc_reason' => 'Annex-System-Disc-Reason',
-  'annex_secondary_nbns_ser' => 'Annex-Secondary-NBNS-Server',
-  'usr_q931_call_reference_' => 'USR-Q931-Call-Reference-Value',
-  'usr_send_password' => 'USR-Send-Password',
-  'prompt' => 'Prompt',
-  'usr_cusr_hat_script_rule' => 'USR-CUSR-hat-Script-Rules',
-  'usr_event_id' => 'USR-Event-Id',
-  'usr_ccp_algorithm' => 'USR-CCP-Algorithm',
-  'usr_mbi_ct_bchannel_used' => 'USR-Mbi_Ct_BChannel_Used',
-  'ascend_svc_enabled' => 'Ascend-SVC-Enabled',
-  'framed_mtu' => 'Framed-MTU',
-  'acc_reason_code' => 'Acc-Reason-Code',
-  'bind_l2tp_flow_control' => 'Bind_L2TP_Flow_Control',
+  'ascend_owner_ip_addr' => 'Ascend-Owner-IP-Addr',
+  'ascend_atm_direct_profil' => 'Ascend-ATM-Direct-Profile',
+  'usr_pw_usr_ofilter_ipx' => 'USR-PW_USR_OFilter_IPX',
+  'framed_routing' => 'Framed-Routing',
+  'pam_auth' => 'Pam-Auth',
+  'usr_interface_index' => 'USR-Interface-Index',
+  'x_ascend_transit_number' => 'X-Ascend-Transit-Number',
+  'usr_end_time' => 'USR-End-Time',
+  'x_ascend_assign_ip_pool' => 'X-Ascend-Assign-IP-Pool',
+  'ms_secondary_nbns_server' => 'MS-Secondary-NBNS-Server',
+  'bind_dot1q_vlan_tag_id' => 'Bind_Dot1q_Vlan_Tag_Id',
+  'acct_tunnel_connection' => 'Acct-Tunnel-Connection',
+  'tunnel_retransmit' => 'Tunnel_Retransmit',
+  'x_ascend_backup' => 'X-Ascend-Backup',
+  'usr_bearer_capabilities' => 'USR-Bearer-Capabilities',
+  'ascend_calling_id_type_o' => 'Ascend-Calling-Id-Type-Of-Num',
+  'shiva_acct_serv_switch' => 'Shiva-Acct-Serv-Switch',
+  'ascend_h323_conference_i' => 'Ascend-H323-Conference-Id',
+  'acct_authentic' => 'Acct-Authentic',
+  'x_ascend_force_56' => 'X-Ascend-Force-56',
+  'framed_appletalk_network' => 'Framed-AppleTalk-Network',
+  'reply_message' => 'Reply-Message',
+  'annex_addr_resolution_pr' => 'Annex-Addr-Resolution-Protocol',
+  'class' => 'Class',
+  'h323_conf_id' => 'h323-conf-id',
   'ascend_cbcp_delay' => 'Ascend-CBCP-Delay',
-  'le_ipsec_deny_action' => 'LE-IPSec-Deny-Action',
+  'ascend_dropped_octets' => 'Ascend-Dropped-Octets',
+  'ascend_h323_dialed_time' => 'Ascend-H323-Dialed-Time',
+  'usr_local_ip_address' => 'USR-Local-IP-Address',
+  'ascend_x25_x121_address' => 'Ascend-X25-X121-Address',
+  'ascend_destination_nas_p' => 'Ascend-Destination-Nas-Port',
+  'annex_local_ip_address' => 'Annex-Local-IP-Address',
+  'usr_at_output_filter' => 'USR-AT-Output-Filter',
+  'cisco_ip_pool_definition' => 'Cisco-IP-Pool-Definition',
+  'annex_domain_name' => 'Annex-Domain-Name',
+  'ascend_preempt_limit' => 'Ascend-Preempt-Limit',
+  'ascend_event_type' => 'Ascend-Event-Type',
+  'x_ascend_pre_input_octet' => 'X-Ascend-Pre-Input-Octets',
+  'exec_program_wait' => 'Exec-Program-Wait',
 
   #NOMENT
-  'nomadix_bw_down' => 'Nomadix-Bw-Down',
-  'nomadix_bw_up' => 'Nomadix-Bw-Up',
   'nomadix_ip_upsell' => 'Nomadix-IP-Upsell',
+
+  #NETC.NET.AU (RADIATOR?)
+  'authentication_type' => 'Authentication-Type',
+
 );
 
 1;
-- 
cgit v1.2.1


From 25fdab941288302f1aa8063d4e237f62876c59b8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Sep 2002 09:11:13 +0000
Subject: doc

---
 Makefile                     | 17 +++++++++++++++--
 httemplate/docs/install.html |  9 ++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 6e9ef650b..adb9d61df 100644
--- a/Makefile
+++ b/Makefile
@@ -11,18 +11,31 @@ TEMPLATE = asp
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
+#deb, others?
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
+#freebsd
+#FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
 
+#deb, others?
 INIT_FILE = /etc/init.d/freeside
+#freebsd
+#INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
 
+#deb, others?
 HTTPD_RESTART = /etc/init.d/apache restart
-FREESIDE_RESTART = /etc/init.d/freeside restart
+#freebsd
+#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
 
+FREESIDE_RESTART = $INIT_FILE restart
+
+#deb, others?
 INSTALLGROUP = root
+#freebsd
+INSTALLGROUP = wheel
 
 #edit the stuff below to have the daemons start
 
-QUEUED_USER=ivan
+QUEUED_USER=fs_queue
 
 #eventually this shouldn't be needed
 FREESIDE_PATH = `pwd`
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index e6f4edbbc..3d19e4d35 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -64,7 +64,7 @@ Install the Freeside distribution:
     <ul>
       <li> with <a href="http://www.postgresql.org/users-lounge/docs/7.1/postgres/user-manag.html#DATABASE-USERS">PostgreSQL</a>:
         <pre>
-$ su postgres
+$ su postgres (pgsql on some distributions)
 $ createuser -P freeside
 Enter password for user "freeside": 
 Enter it again: 
@@ -81,7 +81,7 @@ mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* T
 <!--  <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>-->
   <li>Edit the top-level Makefile:
     <ul>
-      <li>Set <tt>DATASOURCE</tt> to your <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI data source</a>, for example, <tt>DBI:Pg:host=localhost;dbname=freeside</tt> for PostgresSQL<!-- or <tt>DBI:mysql:freeside</tt> for MySQL-->.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">manpage for your DBD</a> for the exact syntax of your DBI data source.
+      <li>Set <tt>DATASOURCE</tt> to your <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI data source</a>, for example, <tt>DBI:Pg:dbname=freeside</tt> for PostgresSQL<!-- or <tt>DBI:mysql:freeside</tt> for MySQL-->.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">manpage for your DBD</a> for the exact syntax of your DBI data source.
       <li>Set <tt>DB_PASSWORD</tt> to the freeside database user's password.
     </ul>
   <li>Add the freeside database to your database engine:
@@ -164,7 +164,6 @@ require&nbsp;"/usr/local/apache/conf/handler.pl";
 <li>Restrict access to this web interface - see the <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache documentation on user authentication</a>.    For example, to configure user authentication with <a href="http://httpd.apache.org/docs/mod/mod_auth.html">mod_auth</a> (flat files):
 <pre>
 &lt;Directory /usr/local/apache/htdocs/freeside-asp&gt;
-PerlSetVar Global /usr/local/etc/freeside/asp-global/
 AuthName Freeside
 AuthType Basic
 AuthUserFile /usr/local/etc/freeside/htpasswd
@@ -181,7 +180,7 @@ $ <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -c -h /usr/local/
 $ <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
     </ul>
   <i>(using other auth types, add each user to your <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache authentication</a> and then run: <tt>freeside-adduser <b>username</b></tt></i>
-  <li>As the freeside UNIX user, run <tt>freeside--setup <b>username</b></tt> (in the untar'ed freeside directory) to create the database tables, passing the username of a Freeside user you created above:
+  <li>As the freeside UNIX user, run <tt>freeside-setup <b>username</b></tt> to create the database tables, passing the username of a Freeside user you created above:
 <pre>
 $ su freeside
 $ freeside-setup <b>username</b>
@@ -190,7 +189,7 @@ $ freeside-setup <b>username</b>
   <li>As the freeside UNIX user, run <tt>bin/populate-msgcat <b>username</b></tt> (in the untar'ed freeside directory) to populate the message catalog, passing the username of a Freeside user you created above:
 <pre>
 $ su freeside
-$ cd <b>/path/to/freeside-1.4.0/</b>
+$ cd <b>/path/to/freeside/</b>
 $ bin/populate-msgcat <b>username</b>
 </pre>
   <li><tt>freeside-queued</tt> was installed with the Perl modules.  Start it now and ensure that is run upon system startup (Do this manually, or edit the top-level Makefile, replacing INIT_FILE with the appropriate location on your systemand QUEUED_USER with the username of a Freeside user you created above, and run <tt>make install-init</tt>)
-- 
cgit v1.2.1


From abfd68d00c867c64c033915374f8fc6b1ff7e6d2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Sep 2002 04:45:21 +0000
Subject: tyop

---
 httemplate/search/svc_acct.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index dcf261296..b2ed723e2 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -145,7 +145,7 @@ END
       $domain = "<A HREF=\"${p}view/svc_domain.cgi?". $svc_domain->svcnum.
                 "\">". $svc_domain->domain. "</A>";
     } else {
-      die "No svc_domain.svcnum record for svc_acct.domsvc: ".'
+      die "No svc_domain.svcnum record for svc_acct.domsvc: ".
           $svc_acct->domsvc;
     }
     my($cust_pkg,$cust_main);
-- 
cgit v1.2.1


From b51f1d29bb0c6b81c23e8f14dc88e3876a5f2815 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Sep 2002 05:25:38 +0000
Subject: oops

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index adb9d61df..1c5f1d40d 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ FREESIDE_RESTART = $INIT_FILE restart
 #deb, others?
 INSTALLGROUP = root
 #freebsd
-INSTALLGROUP = wheel
+#INSTALLGROUP = wheel
 
 #edit the stuff below to have the daemons start
 
-- 
cgit v1.2.1


From c7b4ef5e2731387e15d369d6561db679ad070cfa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Sep 2002 05:26:05 +0000
Subject: fix for inserting un-audited accounts

---
 FS/FS/svc_acct.pm | 84 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 44 insertions(+), 40 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 991bbef48..04a86a8e0 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -338,53 +338,57 @@ sub insert {
   }
 
   my $cust_pkg = $self->cust_svc->cust_pkg;
-  my $cust_main = $cust_pkg->cust_main;
 
-  if ( $conf->exists('emailinvoiceauto') ) {
-    my @invoicing_list = $cust_main->invoicing_list;
-    push @invoicing_list, $self->email;
-    $cust_main->invoicing_list(@invoicing_list);
-  }
+  if ( $cust_pkg ) {
+    my $cust_main = $cust_pkg->cust_main;
 
-  #welcome email
-  my $to = '';
-  if ( $welcome_template && $cust_pkg ) {
-    my $to = join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list );
-    if ( $to ) {
-      my $wqueue = new FS::queue {
-        'svcnum' => $self->svcnum,
-        'job'    => 'FS::svc_acct::send_email'
-      };
-      warn "attempting to queue email to $to";
-      my $error = $wqueue->insert(
-        'to'       => $to,
-        'from'     => $welcome_from,
-        'subject'  => $welcome_subject,
-        'mimetype' => $welcome_mimetype,
-        'body'     => $welcome_template->fill_in( HASH => {
-                        'username' => $self->username,
-                        'password' => $self->_password,
-                        'first'    => $cust_main->first,
-                        'last'     => $cust_main->getfield('last'),
-                        'pkg'      => $cust_pkg->part_pkg->pkg,
-                      } ),
-      );
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "queuing welcome email: $error";
-      }
-  
-      foreach my $jobnum ( @jobnums ) {
-        my $error = $wqueue->depend_insert($jobnum);
+    if ( $conf->exists('emailinvoiceauto') ) {
+      my @invoicing_list = $cust_main->invoicing_list;
+      push @invoicing_list, $self->email;
+      $cust_main->invoicing_list(\@invoicing_list);
+    }
+
+    #welcome email
+    my $to = '';
+    if ( $welcome_template && $cust_pkg ) {
+      my $to = join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list );
+      if ( $to ) {
+        my $wqueue = new FS::queue {
+          'svcnum' => $self->svcnum,
+          'job'    => 'FS::svc_acct::send_email'
+        };
+        warn "attempting to queue email to $to";
+        my $error = $wqueue->insert(
+          'to'       => $to,
+          'from'     => $welcome_from,
+          'subject'  => $welcome_subject,
+          'mimetype' => $welcome_mimetype,
+          'body'     => $welcome_template->fill_in( HASH => {
+                          'username' => $self->username,
+                          'password' => $self->_password,
+                          'first'    => $cust_main->first,
+                          'last'     => $cust_main->getfield('last'),
+                          'pkg'      => $cust_pkg->part_pkg->pkg,
+                        } ),
+        );
         if ( $error ) {
           $dbh->rollback if $oldAutoCommit;
-          return "queuing welcome email job dependancy: $error";
+          return "queuing welcome email: $error";
         }
+
+        foreach my $jobnum ( @jobnums ) {
+          my $error = $wqueue->depend_insert($jobnum);
+          if ( $error ) {
+            $dbh->rollback if $oldAutoCommit;
+            return "queuing welcome email job dependancy: $error";
+          }
+        }
+
       }
 
     }
-  
-  }
+
+  } # if ( $cust_pkg )
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
@@ -760,7 +764,7 @@ sub check {
   unless ( $part_svc->part_svc_column('slipip')->columnflag eq 'F' ) {
     unless ( $recref->{slipip} eq '0e0' ) {
       $recref->{slipip} =~ /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/
-        or return "Illegal slipip". $self->slipip;
+        or return "Illegal slipip: ". $self->slipip;
       $recref->{slipip} = $1;
     } else {
       $recref->{slipip} = '0e0';
-- 
cgit v1.2.1


From 191efe9f769091cab0ebcf66d906736bfc0745a9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Sep 2002 05:28:11 +0000
Subject: fix $INIT_FILE usage

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1c5f1d40d..b2b2fcdbc 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ HTTPD_RESTART = /etc/init.d/apache restart
 #freebsd
 #HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
 
-FREESIDE_RESTART = $INIT_FILE restart
+FREESIDE_RESTART = ${INIT_FILE} restart
 
 #deb, others?
 INSTALLGROUP = root
-- 
cgit v1.2.1


From e88050711de04bdd33f298d84a35c943bc6dec24 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 27 Sep 2002 05:36:29 +0000
Subject: lock mapsecrets file

---
 FS/bin/freeside-adduser | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index 424123226..c3ee05b9b 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,9 +1,10 @@
 #!/usr/bin/perl -w
 #
-# $Id: freeside-adduser,v 1.7 2002-08-25 01:16:30 ivan Exp $
+# $Id: freeside-adduser,v 1.8 2002-09-27 05:36:29 ivan Exp $
 
 use strict;
 use vars qw($opt_h $opt_b $opt_c $opt_s);
+use Fcntl qw(:flock);
 use Getopt::Std;
 
 my $FREESIDE_CONF = "/usr/local/etc/freeside";
@@ -24,7 +25,8 @@ if ( $opt_h ) {
 my $secretfile = $opt_s || 'secrets';
 
 open(MAPSECRETS,">>$FREESIDE_CONF/mapsecrets")
-  or die "can't open $FREESIDE_CONF/mapsecrets: $!";
+  and flock(MAPSECRETS,LOCK_EX)
+    or die "can't open $FREESIDE_CONF/mapsecrets: $!";
 print MAPSECRETS "$user $secretfile\n";
 close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
 
-- 
cgit v1.2.1


From 13988e77a2e52f427783f13f3a5b0131fcb7b01b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 27 Sep 2002 06:00:37 +0000
Subject: only load Devel::AutoProfiler if it is installed

---
 htetc/global.asa | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htetc/global.asa b/htetc/global.asa
index 4f1ca45d3..a2d8dee12 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -1,6 +1,6 @@
-#BEGIN { eval "use Devel::AutoProfiler;"; } #only if installed...
+BEGIN { eval "use Devel::AutoProfiler;"; } #only if installed...
 #BEGIN { package Devel::AutoProfiler; use vars qw(%caller_info); }
-use Devel::AutoProfiler;
+#use Devel::AutoProfiler;
 
 use strict;
 use vars qw( $cgi $p );
-- 
cgit v1.2.1


From bbcf7a70f3e87872b991cef23fc15ae27a4c6bec Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 27 Sep 2002 12:14:12 +0000
Subject: don't chop blanks

---
 FS/FS/UID.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 6962b2768..ebf9b96e5 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -87,7 +87,7 @@ sub forksuidsetup {
   getsecrets;
   $dbh = DBI->connect($datasrc,$db_user,$db_pass, {
                           'AutoCommit' => 0,
-                          'ChopBlanks' => 1,
+                          #'ChopBlanks' => 1,
   } ) or die "DBI->connect error: $DBI::errstr\n";
 
   foreach ( keys %callback ) {
@@ -256,7 +256,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.20 2002-09-20 10:16:28 ivan Exp $
+$Id: UID.pm,v 1.21 2002-09-27 12:14:12 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 70353b6415b4a9b07a78b3f108bc26272d603847 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 27 Sep 2002 12:14:32 +0000
Subject: allow + in md5 encrypted passwords

---
 FS/FS/svc_acct.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 04a86a8e0..44f3ef45f 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -791,7 +791,7 @@ sub check {
     #$recref->{password} = $1.
     #  crypt($3,$saltset[int(rand(64))].$saltset[int(rand(64))]
     #;
-  } elsif ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([\w\.\/\$\;]{13,34})$/ ) {
+  } elsif ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([\w\.\/\$\;\+]{13,34})$/ ) {
     $recref->{_password} = $1.$3;
   } elsif ( $recref->{_password} eq '*' ) {
     $recref->{_password} = '*';
-- 
cgit v1.2.1


From b3c55b5f123b1b5c8ebedfa1826cbf19a0dcc013 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 3 Oct 2002 15:29:14 +0000
Subject: fix implicit RADIUS password attribute to be Crypt-Password for
 encrypted pw's

---
 FS/FS/svc_acct.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 44f3ef45f..6c0807df2 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -857,7 +857,9 @@ expected to change in the future.
 
 sub radius_check {
   my $self = shift;
-  ( 'Password' => $self->_password,
+  my $password = $self->_password;
+  my $pw_attrib = length($password) <= 12 ? 'Password' : 'Crypt-Password';
+  ( $pw_attrib => $password,
     map {
       /^(rc_(.*))$/;
       my($column, $attrib) = ($1, $2);
-- 
cgit v1.2.1


From a47374ae5aba9530e999f630ca5a21eb758cc0b5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Oct 2002 12:09:21 +0000
Subject: default for customers with no invoices   was: print   is now: send
 email to invoice from address

---
 FS/FS/cust_bill.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index f0667258c..296c8b6a6 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -352,7 +352,11 @@ sub send {
   my @print_text = $self->print_text('', $template);
   my @invoicing_list = $self->cust_main->invoicing_list;
 
-  if ( grep { $_ ne 'POST' } @invoicing_list ) { #email invoice
+  if ( grep { $_ ne 'POST' } @invoicing_list or !@invoicing_list  ) { #email
+
+    #better to notify this person than silence
+    @invoicing_list = ($invoice_from) unless @invoicing_list;
+
     #false laziness w/FS::cust_pay::delete & fs_signup_server && ::realtime_card
     #$ENV{SMTPHOSTS} = $smtpmachine;
     $ENV{MAILADDRESS} = $invoice_from;
@@ -377,7 +381,7 @@ sub send {
 
   }
 
-  if ( ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list ) { #postal
+  if ( grep { $_ eq 'POST' } @invoicing_list ) { #postal
     open(LPR, "|$lpr")
       or return "Can't open pipe to $lpr: $!";
     print LPR @print_text;
@@ -1039,7 +1043,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.46 2002-09-21 11:17:39 ivan Exp $
+$Id: cust_bill.pm,v 1.47 2002-10-04 12:09:21 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 2f742fce69ed1d168f95478f36a5e70b381d64a9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Oct 2002 12:30:19 +0000
Subject: adding

---
 FS/bin/freeside-count-active-customers | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100755 FS/bin/freeside-count-active-customers

diff --git a/FS/bin/freeside-count-active-customers b/FS/bin/freeside-count-active-customers
new file mode 100755
index 000000000..759085a73
--- /dev/null
+++ b/FS/bin/freeside-count-active-customers
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+domain=$1
+
+echo "\t
+select count(*) from cust_main where 
+          0 < ( SELECT COUNT(*) FROM cust_pkg
+                       WHERE cust_pkg.custnum = cust_main.custnum
+                         AND ( cust_pkg.cancel IS NULL
+                               OR cust_pkg.cancel = 0
+                             )
+                   )
+            OR 0 = ( SELECT COUNT(*) FROM cust_pkg
+                       WHERE cust_pkg.custnum = cust_main.custnum
+                   );
+" | psql -U freeside -q $domain | head -1
+
-- 
cgit v1.2.1


From 54a27b35957baddb725e2b7544d9f134989bfd99 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Oct 2002 12:39:29 +0000
Subject: turn on AutoCommit when vacuuming

---
 FS/bin/freeside-daily | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 22bf2c963..52028b773 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -50,6 +50,7 @@ foreach $cust_main ( @cust_main ) {
 }
 
 if ( driver_name eq 'Pg' ) {
+  dbh->{AutoCommit} = 1; #so we can vacuum
   foreach my $statement ( 'vacuum', 'vacuum analyze' ) {
     my $sth = dbh->prepare($statement) or die dbh->errstr;
     $sth->execute or die $sth->errstr;
-- 
cgit v1.2.1


From c4d2226e0cc4bdd6d9f689b061b5f4f5b9609b0b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Oct 2002 12:57:06 +0000
Subject: working on the road:   - easier "change package" link for changing
 one package to another   - sqlradius export now compatible with Pg   -
 indices on phone numbers   - install instructions specify Pg 7.1 (at least
 until ILIKE thing is changed)   - searching on phone number fragments

---
 FS/FS/part_export/sqlradius.pm       |  8 ++---
 FS/FS/type_pkgs.pm                   | 15 +++++++-
 FS/bin/freeside-setup                |  9 +++--
 httemplate/docs/install.html         |  2 +-
 httemplate/edit/process/cust_pkg.cgi | 25 +++++++++-----
 httemplate/misc/change_pkg.cgi       | 66 ++++++++++++++++++++++++++++++++++++
 httemplate/search/cust_main.cgi      | 19 +++++++----
 httemplate/view/cust_main.cgi        |  3 ++
 8 files changed, 123 insertions(+), 24 deletions(-)
 create mode 100755 httemplate/misc/change_pkg.cgi

diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index 3c781c043..0f93703ae 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -187,10 +187,10 @@ sub sqlradius_insert { #subroutine, not method
     } else {
 
       my $i_sth = $dbh->prepare(
-        "INSERT INTO rad$table ( id, UserName, Attribute, Value ) ".
-          "VALUES ( ?, ?, ?, ? )"
+        "INSERT INTO rad$table ( UserName, Attribute, Value ) ".
+          "VALUES ( ?, ?, ? )"
       ) or die $dbh->errstr;
-      $i_sth->execute( '', $username, $attribute, $attributes{$attribute} )
+      $i_sth->execute( $username, $attribute, $attributes{$attribute} )
         or die $i_sth->errstr;
 
     }
@@ -204,7 +204,7 @@ sub sqlradius_usergroup_insert { #subroutine, not method
   my( $username, @groups ) = @_;
 
   my $sth = $dbh->prepare( 
-    "INSERT INTO usergroup ( id, UserName, GroupName ) VALUES ( ?, ?, ? )"
+    "INSERT INTO usergroup ( UserName, GroupName ) VALUES ( ?, ? )"
   ) or die $dbh->errstr;
   foreach my $group ( @groups ) {
     $sth->execute( '', $username, $group )
diff --git a/FS/FS/type_pkgs.pm b/FS/FS/type_pkgs.pm
index 8e0d4ef56..efba60dbd 100644
--- a/FS/FS/type_pkgs.pm
+++ b/FS/FS/type_pkgs.pm
@@ -94,11 +94,24 @@ sub check {
   ''; #no error
 }
 
+=item part_pkg
+
+Returns the FS::part_pkg object associated with this record.
+
+=cut
+
+sub part_pkg {
+  my $self = shift;
+  qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
+}
+
+=cut
+
 =back
 
 =head1 VERSION
 
-$Id: type_pkgs.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: type_pkgs.pm,v 1.2 2002-10-04 12:57:06 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index f6a543fc8..d61e8b0bf 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -111,8 +111,9 @@ my($dbdef) = new DBIx::DBSchema ( map {
 my $cust_main = $dbdef->table('cust_main');
 unless ($ship) { #remove ship_ from cust_main
   $cust_main->delcolumn($_) foreach ( grep /^ship_/, $cust_main->columns );
-} else { #add indices on ship_last and ship_company
-  push @{$cust_main->index->lol_ref}, ( ['ship_last'], ['ship_company'] ) 
+} else { #add indices
+  push @{$cust_main->index->lol_ref},
+    map { [ "ship_$_" ] } qw( last company daytime night fax );
 }
 
 #add radius attributes to svc_acct
@@ -496,7 +497,9 @@ sub tables_hash_hack {
       'primary_key' => 'custnum',
       'unique' => [],
       #'index' => [ ['last'], ['company'] ],
-      'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ] ],
+      'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ],
+                   [ 'daytime' ], [ 'night' ], [ 'fax' ],
+                 ],
     },
 
     'cust_main_invoice' => {
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 3d19e4d35..3c48a746f 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -12,7 +12,7 @@ Before installing, you need:
   <li><a href="http://rsync.samba.org/">rsync</a>
   <li>A <b>transactional</b> database engine <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">supported</a> by Perl's <a href="http://dbi.perl.org">DBI</a>.
     <ul>
-      <li><a href="http://www.postgresql.org/">PostgreSQL</a> (v7 or higher) is recommended.
+      <li><a href="http://www.postgresql.org/">PostgreSQL</a> is recommended (v7.1.x or later, not 7.0.x).
       <li>MySQL versions before 4.1 do not support standard SQL subqueries and are <b>NOT SUPPORTED</b>.  If you are a developer who wishes to contribute MySQL 3.x/4.0 support, see <a href="http://pouncequick.420.am/rt/Ticket/Display.html?id=438">ticket #438</a> in the bug-tracking system and ask on the -devel mailing list.
 <!--       <li>MySQL has been reported to work.
          <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you want to use MySQL, you <b>must</b> use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a> or <a href="http://www.mysql.com/doc/I/n/InnoDB.html">InnoDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> or <code>--default-table-type=InnoDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> or <code>default-table-type=InnoDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>. -->
diff --git a/httemplate/edit/process/cust_pkg.cgi b/httemplate/edit/process/cust_pkg.cgi
index f8c9f5151..df8471c27 100755
--- a/httemplate/edit/process/cust_pkg.cgi
+++ b/httemplate/edit/process/cust_pkg.cgi
@@ -11,16 +11,23 @@ my @remove_pkgnums = map {
   $1;
 } $cgi->param('remove_pkg');
 
+my $error_redirect;
 my @pkgparts;
-foreach my $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
-  if ( $cgi->param("pkg$pkgpart") =~ /^(\d+)$/ ) {
-    my $num_pkgs = $1;
-    while ( $num_pkgs-- ) {
-      push @pkgparts,$pkgpart;
+if ( $cgi->param('new_pkgpart') =~ /^(\d+)$/ ) { #came from misc/change_pkg.cgi
+  $error_redirect = "misc/change_pkg.cgi";
+  @pkgparts = ($1);
+} else { #came from edit/cust_pkg.cgi
+  $error_redirect = "edit/cust_pkg.cgi";
+  foreach my $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
+    if ( $cgi->param("pkg$pkgpart") =~ /^(\d+)$/ ) {
+      my $num_pkgs = $1;
+      while ( $num_pkgs-- ) {
+        push @pkgparts,$pkgpart;
+      }
+    } else {
+      $error = "Illegal quantity";
+      last;
     }
-  } else {
-    $error = "Illegal quantity";
-    last;
   }
 }
 
@@ -28,7 +35,7 @@ $error ||= FS::cust_pkg::order($custnum,\@pkgparts,\@remove_pkgnums);
 
 if ($error) {
   $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "cust_pkg.cgi?". $cgi->query_string );
+  print $cgi->redirect(popurl(3). $error_redirect. '?'. $cgi->query_string );
 } else {
   print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
 }
diff --git a/httemplate/misc/change_pkg.cgi b/httemplate/misc/change_pkg.cgi
new file mode 100755
index 000000000..5346fd9d8
--- /dev/null
+++ b/httemplate/misc/change_pkg.cgi
@@ -0,0 +1,66 @@
+<!-- mason kludge -->
+<%
+
+my $pkgnum;
+if ( $cgi->param('error') ) {
+  #$custnum = $cgi->param('custnum');
+  #%remove_pkg = map { $_ => 1 } $cgi->param('remove_pkg');
+  $pkgnum = ($cgi->param('remove_pkg'))[0];
+} else {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  #$custnum = $1;
+  $pkgnum = $1;
+  #%remove_pkg = ();
+}
+
+my $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } )
+  or die "unknown pkgnum $pkgnum";
+my $custnum = $cust_pkg->custnum;
+
+my $conf = new FS::Conf;
+
+my $p1 = popurl(1);
+
+my $cust_main = $cust_pkg->cust_main
+  or die "can't get cust_main record for custnum ". $cust_pkg->custnum.
+         " ( pkgnum ". cust_pkg->pkgnum. ")";
+my $agent = $cust_main->agent;
+
+print header("Change Package",  menubar(
+  "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+  'Main Menu' => $p,
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT><BR><BR>"
+  if $cgi->param('error');
+
+my $part_pkg = $cust_pkg->part_pkg;
+
+print small_custview( $cust_main, $conf->config('countrydefault') ).
+      qq!<FORM ACTION="${p}edit/process/cust_pkg.cgi" METHOD=POST>!.
+      qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
+      qq!<INPUT TYPE="hidden" NAME="remove_pkg" VALUE="$pkgnum">!.
+      '<BR>Current package: '. $part_pkg->pkg. ' - '. $part_pkg->comment.
+      qq!<BR>New package: <SELECT NAME="new_pkgpart"><OPTION VALUE=0></OPTION>!;
+
+foreach my $part_pkg (
+  grep { ! $_->disabled && $_->pkgpart != $cust_pkg->pkgpart }
+    map { $_->part_pkg } $agent->agent_type->type_pkgs
+) {
+  my $pkgpart = $part_pkg->pkgpart;
+  print qq!<OPTION VALUE="$pkgpart"!;
+  print ' SELECTED' if $cgi->param('error')
+                       && $cgi->param('new_pkgpart') == $pkgpart;
+  print qq!>$pkgpart: !. $part_pkg->pkg. ' - '. $part_pkg->comment. '</OPTION>';
+}
+
+print <<END;
+</SELECT>
+<BR><BR><INPUT TYPE="submit" VALUE="Change package">
+    </FORM>
+  </BODY>
+</HTML>
+END
+%>
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 0a98b1891..ac238b63e 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -636,12 +636,19 @@ sub phonesearch {
 
   my $phone = $cgi->param('phone_text');
 
-  #false laziness with Record::ut_phonen, only works with US/CA numbers...
+  #(no longer really) false laziness with Record::ut_phonen
+  #only works with US/CA numbers...
   $phone =~ s/\D//g;
-  $phone =~ /^(\d{3})(\d{3})(\d{4})(\d*)$/
-    or eidiot gettext('illegal_phone'). ": $phone";
-  $phone = "$1-$2-$3";
-  $phone .= " x$4" if $4;
+  if ( $phone =~ /^(\d{3})(\d{3})(\d{4})(\d*)$/ ) {
+    $phone = "$1-$2-$3";
+    $phone .= " x$4" if $4;
+  } elsif ( $phone =~ /^(\d{3})(\d{4})$/ ) {
+    $phone = "$1-$2";
+  } elsif ( $phone =~ /^(\d{3,4})$/ ) {
+    $phone = $1;
+  } else {
+    eidiot gettext('illegal_phone'). ": $phone";
+  }
 
   my @fields = qw(daytime night fax);
   push @fields, qw(ship_daytime ship_night ship_fax)
@@ -650,7 +657,7 @@ sub phonesearch {
   for my $field ( @fields ) {
     push @cust_main, qsearch ( 'cust_main', 
                                { $field => { 'op'    => 'LIKE',
-                                             'value' => "$phone%" } } );
+                                             'value' => "%$phone%" } } );
   }
 
   \@cust_main;
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 0610bc324..707de8d70 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -370,6 +370,9 @@ foreach my $package (@packages) {
         qq!$pkg - $comment (&nbsp;<a href="$pkgview">Details</a>&nbsp;)!;
        # | !;
 
+  print qq! (&nbsp;<A HREF="${p}misc/change_pkg.cgi?$pkgnum">!.
+        'Change&nbsp;package</A>&nbsp;)';
+
   #false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
   unless ( $package->getfield('cancel') ) {
     print ' (&nbsp;';
-- 
cgit v1.2.1


From 5c0de69821c0145e89403e173986b4d8b5b52725 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 5 Oct 2002 11:14:08 +0000
Subject: fix sqlradius export to not set blank id fields

---
 FS/FS/part_export/sqlradius.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index 0f93703ae..ccf9a7687 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -207,7 +207,7 @@ sub sqlradius_usergroup_insert { #subroutine, not method
     "INSERT INTO usergroup ( UserName, GroupName ) VALUES ( ?, ? )"
   ) or die $dbh->errstr;
   foreach my $group ( @groups ) {
-    $sth->execute( '', $username, $group )
+    $sth->execute( $username, $group )
       or die "can't insert into groupname table: ". $sth->errstr;
   }
   $dbh->disconnect;
-- 
cgit v1.2.1


From 656b802d26a8eb0dfd6fd71dbcdebfab156041e9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 7 Oct 2002 08:47:10 +0000
Subject: cancel when it is *after* expiration date, not when it is *before*

---
 FS/bin/freeside-daily | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 52028b773..17ee798ff 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -30,7 +30,7 @@ foreach $cust_main ( @cust_main ) {
 
   # $^T not $time because -d is for pre-printing invoices
   foreach my $cust_pkg (
-    grep { $_->expire && $_->expire >= $^T } $cust_main->ncancelled_pkgs
+    grep { $_->expire && $_->expire <= $^T } $cust_main->ncancelled_pkgs
   ) {
     my $error = $cust_pkg->cancel;
     warn "Error cancelling expired pkg ". $cust_pkg->pkgnum. " for custnum ".
-- 
cgit v1.2.1


From b97ccb2b958567490841cfc93d2c4a401d98cdb0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 8 Oct 2002 04:46:40 +0000
Subject: payby-default config option, with special "HIDE" option to disable
 billing information in the web interface (closes: Bug#468)

---
 FS/FS/Conf.pm                 |   9 +
 httemplate/edit/cust_main.cgi | 120 ++++++++----
 httemplate/view/cust_main.cgi | 429 +++++++++++++++++++++---------------------
 3 files changed, 308 insertions(+), 250 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 788127a7f..1c4ad04a3 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -952,6 +952,15 @@ httemplate/docs/config.html
     'select_enum' => [ 'text/plain', 'text/html' ],
   },
 
+  {
+    'key'         => 'payby-default',
+    'section'     => 'UI',
+    'description' => 'Default payment type.  HIDE disables display of billing information and sets customers to BILL.',
+    'type'        => 'select',
+    'select_enum' => [ '', 'CARD', 'BILL', 'COMP', 'HIDE' ],
+  },
+
+
 );
 
 1;
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 3a5df086f..a76cd36d1 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -336,48 +336,94 @@ sub expselect {
   $return;
 }
 
-print "<BR>Billing information", &itable("#cccccc"),
-      qq!<TR><TD><INPUT TYPE="checkbox" NAME="tax" VALUE="Y"!;
-print qq! CHECKED! if $cust_main->tax eq "Y";
-print qq!>Tax Exempt</TD></TR>!;
-print qq!<TR><TD><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
-my @invoicing_list = $cust_main->invoicing_list;
-print qq! CHECKED!
-  if ( ! @invoicing_list && ! $conf->exists('disablepostalinvoicedefault') )
-     || grep { $_ eq 'POST' } @invoicing_list;
-print qq!>Postal mail invoice</TD></TR>!;
-my $invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
-print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
-
-print "<TR><TD>Billing type</TD></TR>",
-      "</TABLE>",
-      &table("#cccccc"), "<TR>";
-
-my($payinfo, $payname)=(
-  $cust_main->payinfo,
-  $cust_main->payname,
-);
+my $payby_default = $conf->config('payby-default');
+
+if ( $payby_default eq 'HIDE' ) {
+
+  $cust_main->payby('BILL') unless $cust_main->payby;
+
+  foreach my $field (qw( tax payby )) {
+    print qq!<INPUT TYPE="hidden" NAME="$field" VALUE="!.
+          $cust_main->getfield($field). '">';
+  }
+
+  print qq!<INPUT TYPE="hidden" NAME="invoicing_list" VALUE="!.
+        join(', ', $cust_main->invoicing_list). '">';
+
+  foreach my $payby (qw( CARD BILL COMP )) {
+    foreach my $field (qw( payinfo payname )) {
+      print qq!<INPUT TYPE="hidden" NAME="${payby}_$field" VALUE="!.
+            $cust_main->getfield($field). '">';
+    }
+
+    #false laziness w/expselect
+    my( $m, $y ) = (0, 0);
+    if ( scalar(@_) ) {
+      my $date = shift || '01-2000';
+      if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
+        ( $m, $y ) = ( $2, $1 );
+      } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+        ( $m, $y ) = ( $1, $3 );
+      } else {
+        die "unrecognized expiration date format: $date";
+      }
+    }
+
+    print qq!<INPUT TYPE="hidden" NAME="${payby}_month" VALUE="$m"!.
+          qq!<INPUT TYPE="hidden" NAME="${payby}_year"  VALUE="$y"!;
+
+  }
 
-my %payby = (
-  'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
-  'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
+} else {
+
+  print "<BR>Billing information", &itable("#cccccc"),
+        qq!<TR><TD><INPUT TYPE="checkbox" NAME="tax" VALUE="Y"!;
+  print qq! CHECKED! if $cust_main->tax eq "Y";
+  print qq!>Tax Exempt</TD></TR><TR><TD>!.
+        qq!<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
+
+  my @invoicing_list = $cust_main->invoicing_list;
+  print qq! CHECKED!
+    if ( ! @invoicing_list && ! $conf->exists('disablepostalinvoicedefault') )
+       || grep { $_ eq 'POST' } @invoicing_list;
+  print qq!>Postal mail invoice</TD></TR>!;
+  my $invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
+  print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
+
+  print "<TR><TD>Billing type</TD></TR>",
+        "</TABLE>",
+        &table("#cccccc"), "<TR>";
+
+  my($payinfo, $payname)=(
+    $cust_main->payinfo,
+    $cust_main->payname,
+  );
+
+  my %payby = (
+    'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
+    'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
 );
-my %paybychecked = (
-  'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
-  'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
+
+  my %paybychecked = (
+    'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+    'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
 );
-for (qw(CARD BILL COMP)) {
-  print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
-  if ($cust_main->payby eq "$_") {
-    print qq! CHECKED> $paybychecked{$_}</TD>!;
-  } else {
-    print qq!> $payby{$_}</TD>!;
+
+  $cust_main->payby($payby_default) unless $cust_main->payby;
+  for (qw(CARD BILL COMP)) {
+    print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
+    if ($cust_main->payby eq "$_") {
+      print qq! CHECKED> $paybychecked{$_}</TD>!;
+    } else {
+      print qq!> $payby{$_}</TD>!;
+    }
   }
-}
 
-print "</TR></TABLE>$r required fields for each billing type";
+  print "</TR></TABLE>$r required fields for each billing type";
+
+}
 
 if ( defined $cust_main->dbdef_table->column('comments') ) {
     print "<BR><BR>Comments", &itable("#cccccc"),
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 707de8d70..25260fa3c 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -188,6 +188,8 @@ print '<TD VALIGN="top">';
 
 print '<BR>';
 
+if ( $conf->config('payby-default') ne 'HIDE' ) {
+
   my @invoicing_list = $cust_main->invoicing_list;
   print "Billing information (",
        qq!<A HREF="!, popurl(2), qq!misc/bill.cgi?$custnum">!, "Bill now</A>)",
@@ -236,6 +238,8 @@ print '<BR>';
 
   print "</TABLE></TD></TR></TABLE>";
 
+}
+
 print '</TD></TR></TABLE>';
 
 if ( defined $cust_main->dbdef_table->column('comments')
@@ -268,30 +272,34 @@ foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
 
 print '</SELECT><INPUT TYPE="submit" VALUE="Order Package"></FORM><BR>';
 
-print '<BR>'.
-  qq!<FORM ACTION="${p}edit/process/quick-charge.cgi" METHOD="POST">!.
-  qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
-  qq!Description:<INPUT TYPE="text" NAME="pkg">!.
-  qq!&nbsp;Amount:<INPUT TYPE="text" NAME="amount" SIZE=6>!.
-  qq!&nbsp;!;
-
-#false laziness w/ edit/part_pkg.cgi
-if ( $conf->exists('enable_taxclasses') ) {
-  print '<SELECT NAME="taxclass">';
-  my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
-    or die dbh->errstr;
-  $sth->execute or die $sth->errstr;
-  foreach my $taxclass ( map $_->[0], @{$sth->fetchall_arrayref} ) {
-    print qq!<OPTION VALUE="$taxclass"!;
-    #print ' SELECTED' if $taxclass eq $hashref->{taxclass};
-    print qq!>$taxclass</OPTION>!;
+if ( $conf->config('payby-default') ne 'HIDE' ) {
+
+  print '<BR>'.
+    qq!<FORM ACTION="${p}edit/process/quick-charge.cgi" METHOD="POST">!.
+    qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
+    qq!Description:<INPUT TYPE="text" NAME="pkg">!.
+    qq!&nbsp;Amount:<INPUT TYPE="text" NAME="amount" SIZE=6>!.
+    qq!&nbsp;!;
+  
+  #false laziness w/ edit/part_pkg.cgi
+  if ( $conf->exists('enable_taxclasses') ) {
+    print '<SELECT NAME="taxclass">';
+    my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
+      or die dbh->errstr;
+    $sth->execute or die $sth->errstr;
+    foreach my $taxclass ( map $_->[0], @{$sth->fetchall_arrayref} ) {
+      print qq!<OPTION VALUE="$taxclass"!;
+      #print ' SELECTED' if $taxclass eq $hashref->{taxclass};
+      print qq!>$taxclass</OPTION>!;
+    }
+    print '</SELECT>';
+  } else {
+    print '<INPUT TYPE="hidden" NAME="taxclass" VALUE="">';
   }
-  print '</SELECT>';
-} else {
-  print '<INPUT TYPE="hidden" NAME="taxclass" VALUE="">';
-}
+  
+  print qq!<INPUT TYPE="submit" VALUE="One-time charge"></FORM><BR>!;
 
-print qq!<INPUT TYPE="submit" VALUE="One-time charge"></FORM><BR>!;
+}
 
 print <<END;
 <SCRIPT>
@@ -451,48 +459,132 @@ function cust_pay_areyousure(href) {
 </SCRIPT>
 END
 
-#formatting
-print qq!<BR><BR><A NAME="history">Payment History!.
-      qq!</A> ( !.
-      qq!<A HREF="!. popurl(2). qq!edit/cust_pay.cgi?custnum=$custnum">!.
-      qq!Post payment</A> | !.
-      qq!<A HREF="!. popurl(2). qq!edit/cust_credit.cgi?$custnum">!.
-      qq!Post credit</A> )!;
-
-#get payment history
-#
-# major problem: this whole thing is way too sloppy.
-# minor problem: the description lines need better formatting.
-
-my @history = (); #needed for mod_perl :)
-
-my %target = ();
-
-my @bills = qsearch('cust_bill',{'custnum'=>$custnum});
-foreach my $bill (@bills) {
-  my($bref)=$bill->hashref;
-  my $bpre = ( $bill->owed > 0 )
-               ? '<b><font size="+1" color="#ff0000"> Open '
-               : '';
-  my $bpost = ( $bill->owed > 0 ) ? '</font></b>' : '';
-  push @history,
-    $bref->{_date} . qq!\t<A HREF="!. popurl(2). qq!view/cust_bill.cgi?! .
-    $bref->{invnum} . qq!">${bpre}Invoice #! . $bref->{invnum} .
-    qq! (Balance \$! . $bill->owed . qq!)$bpost</A>\t! .
-    $bref->{charged} . qq!\t\t\t!;
-
-  my(@cust_bill_pay)=qsearch('cust_bill_pay',{'invnum'=> $bref->{invnum} } );
-#  my(@payments)=qsearch('cust_pay',{'invnum'=> $bref->{invnum} } );
-#  my($payment);
-#  foreach $payment (@payments) {
-  foreach my $cust_bill_pay (@cust_bill_pay) {
-    my $payment = $cust_bill_pay->cust_pay;
-    my($date,$invnum,$payby,$payinfo,$paid)=($payment->_date,
-                                             $cust_bill_pay->invnum,
-                                             $payment->payby,
-                                             $payment->payinfo,
-                                             $cust_bill_pay->amount,
-                      );
+if ( $conf->config('payby-default') ne 'HIDE' ) {
+  
+  #formatting
+  print qq!<BR><BR><A NAME="history">Payment History!.
+        qq!</A> ( !.
+        qq!<A HREF="!. popurl(2). qq!edit/cust_pay.cgi?custnum=$custnum">!.
+        qq!Post payment</A> | !.
+        qq!<A HREF="!. popurl(2). qq!edit/cust_credit.cgi?$custnum">!.
+        qq!Post credit</A> )!;
+  
+  #get payment history
+  #
+  # major problem: this whole thing is way too sloppy.
+  # minor problem: the description lines need better formatting.
+  
+  my @history = (); #needed for mod_perl :)
+  
+  my %target = ();
+  
+  my @bills = qsearch('cust_bill',{'custnum'=>$custnum});
+  foreach my $bill (@bills) {
+    my($bref)=$bill->hashref;
+    my $bpre = ( $bill->owed > 0 )
+                 ? '<b><font size="+1" color="#ff0000"> Open '
+                 : '';
+    my $bpost = ( $bill->owed > 0 ) ? '</font></b>' : '';
+    push @history,
+      $bref->{_date} . qq!\t<A HREF="!. popurl(2). qq!view/cust_bill.cgi?! .
+      $bref->{invnum} . qq!">${bpre}Invoice #! . $bref->{invnum} .
+      qq! (Balance \$! . $bill->owed . qq!)$bpost</A>\t! .
+      $bref->{charged} . qq!\t\t\t!;
+  
+    my(@cust_bill_pay)=qsearch('cust_bill_pay',{'invnum'=> $bref->{invnum} } );
+  #  my(@payments)=qsearch('cust_pay',{'invnum'=> $bref->{invnum} } );
+  #  my($payment);
+    foreach my $cust_bill_pay (@cust_bill_pay) {
+      my $payment = $cust_bill_pay->cust_pay;
+      my($date,$invnum,$payby,$payinfo,$paid)=($payment->_date,
+                                               $cust_bill_pay->invnum,
+                                               $payment->payby,
+                                               $payment->payinfo,
+                                               $cust_bill_pay->amount,
+                        );
+      $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
+        if $payby eq 'CARD';
+      my $target = "$payby$payinfo";
+      $payby =~ s/^BILL$/Check #/ if $payinfo;
+      $payby =~ s/^(CARD|COMP)$/$1 /;
+      my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
+                     ? qq! (<A HREF="javascript:cust_pay_areyousure('${p}misc/delete-cust_pay.cgi?!. $payment->paynum. qq!')">delete</A>)!
+                     : '';
+      push @history,
+        "$date\tPayment, Invoice #$invnum ($payby$payinfo)$delete\t\t$paid\t\t\t$target";
+    }
+  
+    my(@cust_credit_bill)=
+      qsearch('cust_credit_bill', { 'invnum'=> $bref->{invnum} } );
+    foreach my $cust_credit_bill (@cust_credit_bill) {
+      my $cust_credit = $cust_credit_bill->cust_credit;
+      my($date, $invnum, $crednum, $amount, $reason, $app_date ) = (
+        $cust_credit->_date,
+        $cust_credit_bill->invnum,
+        $cust_credit_bill->crednum,
+        $cust_credit_bill->amount,
+        $cust_credit->reason,
+        time2str("%D", $cust_credit_bill->_date),
+      );
+      push @history,
+        "$date\tCredit #$crednum: $reason<BR>".
+        "(applied to invoice #$invnum on $app_date)\t\t\t$amount\t";
+    }
+  }
+  
+  my @credits = grep { scalar(my @array = $_->cust_credit_refund) }
+             qsearch('cust_credit',{'custnum'=>$custnum});
+  foreach my $credit (@credits) {
+    my($cref)=$credit->hashref;
+    my(@cust_credit_refund)=
+      qsearch('cust_credit_refund', { 'crednum'=> $cref->{crednum} } );
+    foreach my $cust_credit_refund (@cust_credit_refund) {
+      my $cust_refund = $cust_credit_refund->cust_credit;
+      my($date, $crednum, $amount, $reason, $app_date ) = (
+        $credit->_date,
+        $credit->crednum,
+        $cust_credit_refund->amount,
+        $credit->reason,
+        time2str("%D", $cust_credit_refund->_date),
+      );
+      push @history,
+        "$date\tCredit #$crednum: $reason<BR>".
+        "(applied to refund on $app_date)\t\t\t$amount\t";
+    }
+  }
+  
+  @credits = grep { $_->credited  > 0 }
+             qsearch('cust_credit',{'custnum'=>$custnum});
+  foreach my $credit (@credits) {
+    my($cref)=$credit->hashref;
+    push @history,
+      $cref->{_date} . "\t" .
+      qq!<A HREF="! . popurl(2). qq!edit/cust_credit_bill.cgi?!. $cref->{crednum} . qq!">!.
+      '<b><font size="+1" color="#ff0000">Unapplied credit #' .
+      $cref->{crednum} . "</font></b></A>: ".
+      $cref->{reason} . "\t\t\t" . $credit->credited . "\t";
+  }
+  
+  my(@refunds)=qsearch('cust_refund',{'custnum'=> $custnum } );
+  foreach my $refund (@refunds) {
+    my($rref)=$refund->hashref;
+    my($refundnum) = (
+      $refund->refundnum,
+    );
+  
+    push @history,
+      $rref->{_date} . "\tRefund #$refundnum, (" .
+      $rref->{payby} . " " . $rref->{payinfo} . ") by " .
+      $rref->{otaker} . " - ". $rref->{reason} . "\t\t\t\t" .
+      $rref->{refund};
+  }
+  
+  my @unapplied_payments =
+    grep { $_->unapplied > 0 } qsearch('cust_pay', { 'custnum' => $custnum } );
+  foreach my $payment (@unapplied_payments) {
+    my $payby = $payment->payby;
+    my $payinfo = $payment->payinfo;
+    #false laziness w/above
     $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
       if $payby eq 'CARD';
     my $target = "$payby$payinfo";
@@ -502,161 +594,72 @@ foreach my $bill (@bills) {
                    ? qq! (<A HREF="javascript:cust_pay_areyousure('${p}misc/delete-cust_pay.cgi?!. $payment->paynum. qq!')">delete</A>)!
                    : '';
     push @history,
-      "$date\tPayment, Invoice #$invnum ($payby$payinfo)$delete\t\t$paid\t\t\t$target";
-  }
-
-  my(@cust_credit_bill)=
-    qsearch('cust_credit_bill', { 'invnum'=> $bref->{invnum} } );
-  foreach my $cust_credit_bill (@cust_credit_bill) {
-    my $cust_credit = $cust_credit_bill->cust_credit;
-    my($date, $invnum, $crednum, $amount, $reason, $app_date ) = (
-      $cust_credit->_date,
-      $cust_credit_bill->invnum,
-      $cust_credit_bill->crednum,
-      $cust_credit_bill->amount,
-      $cust_credit->reason,
-      time2str("%D", $cust_credit_bill->_date),
-    );
-    push @history,
-      "$date\tCredit #$crednum: $reason<BR>".
-      "(applied to invoice #$invnum on $app_date)\t\t\t$amount\t";
-  }
-}
-
-my @credits = grep { scalar(my @array = $_->cust_credit_refund) }
-           qsearch('cust_credit',{'custnum'=>$custnum});
-foreach my $credit (@credits) {
-  my($cref)=$credit->hashref;
-  my(@cust_credit_refund)=
-    qsearch('cust_credit_refund', { 'crednum'=> $cref->{crednum} } );
-  foreach my $cust_credit_refund (@cust_credit_refund) {
-    my $cust_refund = $cust_credit_refund->cust_credit;
-    my($date, $crednum, $amount, $reason, $app_date ) = (
-      $credit->_date,
-      $credit->crednum,
-      $cust_credit_refund->amount,
-      $credit->reason,
-      time2str("%D", $cust_credit_refund->_date),
-    );
-    push @history,
-      "$date\tCredit #$crednum: $reason<BR>".
-      "(applied to refund on $app_date)\t\t\t$amount\t";
+      $payment->_date. "\t".
+      '<b><font size="+1" color="#ff0000">Unapplied payment #' .
+      $payment->paynum . " ($payby$payinfo)</font></b> ".
+      '(<A HREF="'. popurl(2). 'edit/cust_bill_pay.cgi?'. $payment->paynum. '">'.
+      "apply</A>)$delete".
+      "\t\t" . $payment->unapplied . "\t\t\t$target";
   }
-}
-
-@credits = grep { $_->credited  > 0 }
-           qsearch('cust_credit',{'custnum'=>$custnum});
-foreach my $credit (@credits) {
-  my($cref)=$credit->hashref;
-  push @history,
-    $cref->{_date} . "\t" .
-    qq!<A HREF="! . popurl(2). qq!edit/cust_credit_bill.cgi?!. $cref->{crednum} . qq!">!.
-    '<b><font size="+1" color="#ff0000">Unapplied credit #' .
-    $cref->{crednum} . "</font></b></A>: ".
-    $cref->{reason} . "\t\t\t" . $credit->credited . "\t";
-}
-
-my(@refunds)=qsearch('cust_refund',{'custnum'=> $custnum } );
-foreach my $refund (@refunds) {
-  my($rref)=$refund->hashref;
-  my($refundnum) = (
-    $refund->refundnum,
-  );
-
-  push @history,
-    $rref->{_date} . "\tRefund #$refundnum, (" .
-    $rref->{payby} . " " . $rref->{payinfo} . ") by " .
-    $rref->{otaker} . " - ". $rref->{reason} . "\t\t\t\t" .
-    $rref->{refund};
-}
-
-my @unapplied_payments =
-  grep { $_->unapplied > 0 } qsearch('cust_pay', { 'custnum' => $custnum } );
-foreach my $payment (@unapplied_payments) {
-  my $payby = $payment->payby;
-  my $payinfo = $payment->payinfo;
-  #false laziness w/above
-  $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
-    if $payby eq 'CARD';
-  my $target = "$payby$payinfo";
-  $payby =~ s/^BILL$/Check #/ if $payinfo;
-  $payby =~ s/^(CARD|COMP)$/$1 /;
-  my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
-                 ? qq! (<A HREF="javascript:cust_pay_areyousure('${p}misc/delete-cust_pay.cgi?!. $payment->paynum. qq!')">delete</A>)!
-                 : '';
-  push @history,
-    $payment->_date. "\t".
-    '<b><font size="+1" color="#ff0000">Unapplied payment #' .
-    $payment->paynum . " ($payby$payinfo)</font></b> ".
-    '(<A HREF="'. popurl(2). 'edit/cust_bill_pay.cgi?'. $payment->paynum. '">'.
-    "apply</A>)$delete".
-    "\t\t" . $payment->unapplied . "\t\t\t$target";
-}
-
-        #formatting
-        print &table(), <<END;
-<TR>
-  <TH>Date</TH>
-  <TH>Description</TH>
-  <TH><FONT SIZE=-1>Charge</FONT></TH>
-  <TH><FONT SIZE=-1>Payment</FONT></TH>
-  <TH><FONT SIZE=-1>In-house<BR>Credit</FONT></TH>
-  <TH><FONT SIZE=-1>Refund</FONT></TH>
-  <TH><FONT SIZE=-1>Balance</FONT></TH>
-</TR>
+  
+          #formatting
+          print &table(), <<END;
+  <TR>
+    <TH>Date</TH>
+    <TH>Description</TH>
+    <TH><FONT SIZE=-1>Charge</FONT></TH>
+    <TH><FONT SIZE=-1>Payment</FONT></TH>
+    <TH><FONT SIZE=-1>In-house<BR>Credit</FONT></TH>
+    <TH><FONT SIZE=-1>Refund</FONT></TH>
+    <TH><FONT SIZE=-1>Balance</FONT></TH>
+  </TR>
 END
+  
+  #display payment history
+  
+  my $balance = 0;
+  foreach my $item (sort keyfield_numerically @history) {
+    my($date,$desc,$charge,$payment,$credit,$refund,$target)=split(/\t/,$item);
+    $charge ||= 0;
+    $payment ||= 0;
+    $credit ||= 0;
+    $refund ||= 0;
+    $balance += $charge - $payment;
+    $balance -= $credit - $refund;
+    $balance = sprintf("%.2f", $balance);
+    $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
+    $target = '' unless defined $target;
+  
+    print "<TR><TD><FONT SIZE=-1>";
+    print qq!<A NAME="$target">! unless $target && $target{$target}++;
+    print time2str("%D",$date);
+    print '</A>' if $target && $target{$target} == 1;
+    print "</FONT></TD>",
+  	"<TD><FONT SIZE=-1>$desc</FONT></TD>",
+  	"<TD><FONT SIZE=-1>",
+          ( $charge ? "\$".sprintf("%.2f",$charge) : '' ),
+          "</FONT></TD>",
+  	"<TD><FONT SIZE=-1>",
+          ( $payment ? "-&nbsp;\$".sprintf("%.2f",$payment) : '' ),
+          "</FONT></TD>",
+  	"<TD><FONT SIZE=-1>",
+          ( $credit ? "-&nbsp;\$".sprintf("%.2f",$credit) : '' ),
+          "</FONT></TD>",
+  	"<TD><FONT SIZE=-1>",
+          ( $refund ? "\$".sprintf("%.2f",$refund) : '' ),
+          "</FONT></TD>",
+  	"<TD><FONT SIZE=-1>\$" . $balance,
+          "</FONT></TD>",
+          "\n";
+  }
+  
+  print "</TABLE>";
 
-#display payment history
-
-my $balance = 0;
-foreach my $item (sort keyfield_numerically @history) {
-  my($date,$desc,$charge,$payment,$credit,$refund,$target)=split(/\t/,$item);
-  $charge ||= 0;
-  $payment ||= 0;
-  $credit ||= 0;
-  $refund ||= 0;
-  $balance += $charge - $payment;
-  $balance -= $credit - $refund;
-  $balance = sprintf("%.2f", $balance);
-  $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
-  $target = '' unless defined $target;
-
-  print "<TR><TD><FONT SIZE=-1>";
-  print qq!<A NAME="$target">! unless $target && $target{$target}++;
-  print time2str("%D",$date);
-  print '</A>' if $target && $target{$target} == 1;
-  print "</FONT></TD>",
-	"<TD><FONT SIZE=-1>$desc</FONT></TD>",
-	"<TD><FONT SIZE=-1>",
-        ( $charge ? "\$".sprintf("%.2f",$charge) : '' ),
-        "</FONT></TD>",
-	"<TD><FONT SIZE=-1>",
-        ( $payment ? "-&nbsp;\$".sprintf("%.2f",$payment) : '' ),
-        "</FONT></TD>",
-	"<TD><FONT SIZE=-1>",
-        ( $credit ? "-&nbsp;\$".sprintf("%.2f",$credit) : '' ),
-        "</FONT></TD>",
-	"<TD><FONT SIZE=-1>",
-        ( $refund ? "\$".sprintf("%.2f",$refund) : '' ),
-        "</FONT></TD>",
-	"<TD><FONT SIZE=-1>\$" . $balance,
-        "</FONT></TD>",
-        "\n";
 }
 
-#formatting
-print "</TABLE>";
-
-#end
-
-#formatting
-print <<END;
-
-  </BODY>
-</HTML>
-END
+print '</BODY></HTML>';
 
 #subroutiens
-sub keyfield_numerically { (split(/\t/,$a))[0] <=> (split(/\t/,$b))[0] ; }
+sub keyfield_numerically { (split(/\t/,$a))[0] <=> (split(/\t/,$b))[0]; }
 
 %>
-- 
cgit v1.2.1


From 69f92e8567d1952bc4cbf29d944b97051467bd11 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 8 Oct 2002 08:33:27 +0000
Subject: svc_acct-notes displays static HTML on account view (closes: Bug#465)

---
 FS/FS/Conf.pm                | 6 ++++++
 httemplate/view/svc_acct.cgi | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 1c4ad04a3..3fdaf218a 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -960,6 +960,12 @@ httemplate/docs/config.html
     'select_enum' => [ '', 'CARD', 'BILL', 'COMP', 'HIDE' ],
   },
 
+  {
+    'key'         => 'svc_acct-notes',
+    'section'     => 'UI',
+    'description' => 'Extra HTML to be displayed on the Account View screen.',
+    'type'        => 'textarea',
+  },
 
 );
 
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index df55e85bf..f2228424c 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -144,8 +144,8 @@ if ($svc_acct->slipip) {
 print '<TR><TD ALIGN="right">RADIUS groups</TD><TD BGCOLOR="#ffffff">'.
       join('<BR>', $svc_acct->radius_groups). '</TD></TR>';
 
-print "</TABLE></TD></TR></TABLE>".
-      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
-      "</BODY></HTML>";
+print '</TABLE></TD></TR></TABLE><BR><BR>'.
+      join("\n", $conf->config('svc_acct-notes') ).
+      '<BR><BR>'. joblisting({'svcnum'=>$svcnum}, 1). '</BODY></HTML>';
 
 %>
-- 
cgit v1.2.1


From 2a2fa626446a69e7e1a5953b8bb693b5e4274d8b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 8 Oct 2002 10:50:43 +0000
Subject: slightly less sucky

---
 eg/export_template.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eg/export_template.pm b/eg/export_template.pm
index 00942fd12..ca58d4bed 100644
--- a/eg/export_template.pm
+++ b/eg/export_template.pm
@@ -42,9 +42,15 @@ sub myexport_queue {
 }
 
 sub myexport_insert { #subroutine, not method
+  my( $username, $password ) = @_;
+  #do things with $username and $password
 }
+
 sub myexport_replace { #subroutine, not method
 }
+
 sub myexport_delete { #subroutine, not method
+  my( $username ) = @_;
+  #do things with $username
 }
 
-- 
cgit v1.2.1


From 61e25db54f2da624a79ecedb6bf3d678c7fdefc5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 8 Oct 2002 11:10:51 +0000
Subject: add suspended package browse (closes: Bug#467)

---
 httemplate/index.html          |  3 ++-
 httemplate/search/cust_pkg.cgi | 20 +++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index f17639d44..017a2cc3a 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -119,7 +119,8 @@
       </UL>
       Packages
       <UL>
-        <LI><A HREF="search/cust_pkg.cgi?pkgnum">packages (by package number)</A>
+        <LI><A HREF="search/cust_pkg.cgi?pkgnum">all packages (by package number)</A>
+        <LI><A HREF="search/cust_pkg.cgi?SUSP_pkgnum">suspended packages (by package number)</A>
         <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
         <LI><A HREF="search/cust_pkg.html">packages (by next bill date range)</A>
       </UL>
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 5f0782b8c..78a5bb3bb 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -43,10 +43,16 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
 
 } else {
 
-  my $unconf = '';
+  my $qual = '';
   if ( $query eq 'pkgnum' ) {
     $sortby=\*pkgnum_sort;
 
+  } elsif ( $query eq 'SUSP_pkgnum' ) {
+
+    $sortby=\*pkgnum_sort;
+
+    $qual = 'WHERE susp IS NOT NULL AND susp != 0';
+
   } elsif ( $query eq 'APKG_pkgnum' ) {
   
     $sortby=\*pkgnum_sort;
@@ -101,12 +107,12 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
                           AND pkg_svc.quantity != 0;";
       $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";   
       $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
-      $unconf = " LEFT JOIN temp2_$$ ON cust_pkg.pkgnum = temp2_$$.pkgnum
-                    WHERE temp2_$$.pkgnum IS NOT NULL";
+      $qual = " LEFT JOIN temp2_$$ ON cust_pkg.pkgnum = temp2_$$.pkgnum
+                  WHERE temp2_$$.pkgnum IS NOT NULL";
 
     } else {
 
-     $unconf = "
+     $qual = "
        WHERE 0 <
          ( SELECT count(*) FROM pkg_svc
              WHERE pkg_svc.pkgpart = cust_pkg.pkgpart
@@ -120,10 +126,10 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
     }
     
   } else {
-    die "Empty QUERY_STRING!";
+    die "Empty or unknown QUERY_STRING!";
   }
   
-  my $statement = "SELECT COUNT(*) FROM cust_pkg $unconf";
+  my $statement = "SELECT COUNT(*) FROM cust_pkg $qual";
   my $sth = dbh->prepare($statement) or die dbh->errstr." preparing $statement";
   $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
   
@@ -131,7 +137,7 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
 
   my $tblname = driver_name eq 'mysql' ? 'cust_pkg.' : '';
   @cust_pkg =
-    qsearch('cust_pkg',{}, '', "$unconf ORDER BY ${tblname}pkgnum $limit" );
+    qsearch('cust_pkg',{}, '', "$qual ORDER BY ${tblname}pkgnum $limit" );
 
   if ( driver_name eq 'mysql' ) {
     $query = "DROP TABLE temp1_$$,temp2_$$;";
-- 
cgit v1.2.1


From 3fcc6847417cbda9fd027a4286db5e59aea6d901 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Oct 2002 13:07:54 +0000
Subject: radius-password config value to set the attribute used for plaintext
 pw's

---
 FS/FS/Conf.pm     | 8 ++++++++
 FS/FS/svc_acct.pm | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 3fdaf218a..4dd80c121 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -967,6 +967,14 @@ httemplate/docs/config.html
     'type'        => 'textarea',
   },
 
+  {
+    'key'         => 'raidus-password',
+    'section'     => 'unclassified',
+    'description' => 'RADIUS attribute for plain-text passwords.',
+    'type'        => 'select',
+    'select_enum' => [ 'Password', 'User-Password' ],
+  },
+
 );
 
 1;
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 6c0807df2..b5ade6fac 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -9,6 +9,7 @@ use vars qw( @ISA $noexport_hack $conf
              $username_uppercase
              $welcome_template $welcome_from $welcome_subject $welcome_mimetype
              $smtpmachine
+             $radius_password
              $dirhash
              @saltset @pw_set );
 use Carp;
@@ -60,6 +61,7 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
     $welcome_template = '';
   }
   $smtpmachine = $conf->config('smtpmachine');
+  $radius_password = $conf->config('radius-password') || 'Password';
 };
 
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
@@ -858,7 +860,7 @@ expected to change in the future.
 sub radius_check {
   my $self = shift;
   my $password = $self->_password;
-  my $pw_attrib = length($password) <= 12 ? 'Password' : 'Crypt-Password';
+  my $pw_attrib = length($password) <= 12 ? $radius_password : 'Crypt-Password';
   ( $pw_attrib => $password,
     map {
       /^(rc_(.*))$/;
-- 
cgit v1.2.1


From 229c7bbe00221452e62e81f2e34d8f126fb4b47e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Oct 2002 13:43:07 +0000
Subject: don't error out trying to create existing directories in vpopmail
 export

---
 FS/FS/part_export/vpopmail.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/vpopmail.pm b/FS/FS/part_export/vpopmail.pm
index 561e2742a..2ca44016a 100644
--- a/FS/FS/part_export/vpopmail.pm
+++ b/FS/FS/part_export/vpopmail.pm
@@ -106,8 +106,8 @@ sub vpopmail_insert { #subroutine, not method
   close(VPASSWD);
 
   for my $mkdir (
-    map { "$exportdir/domains/$domain/$username$_" }
-      ( '', qw( /Maildir /Maildir/cur /Maildir/new /Maildir/tmp ) )
+    grep { ! -d $_ } map { "$exportdir/domains/$domain/$username$_" }
+        ( '', qw( /Maildir /Maildir/cur /Maildir/new /Maildir/tmp ) )
   ) {
     mkdir $mkdir, 0700 or die "can't mkdir $mkdir: $!";
   }
-- 
cgit v1.2.1


From e34a817fc92eda8b6f9596b3a925c40bfb7e3887 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Oct 2002 13:59:44 +0000
Subject: don't explicitly specify unclassified config section

---
 FS/FS/Conf.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 4dd80c121..6d21802c8 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -969,7 +969,7 @@ httemplate/docs/config.html
 
   {
     'key'         => 'raidus-password',
-    'section'     => 'unclassified',
+    'section'     => '',
     'description' => 'RADIUS attribute for plain-text passwords.',
     'type'        => 'select',
     'select_enum' => [ 'Password', 'User-Password' ],
-- 
cgit v1.2.1


From 0288a8d21086022a4b867aa5a8853bec47171ec2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Oct 2002 14:30:02 +0000
Subject: nasty typo

---
 FS/FS/Conf.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 6d21802c8..20e42183b 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -968,7 +968,7 @@ httemplate/docs/config.html
   },
 
   {
-    'key'         => 'raidus-password',
+    'key'         => 'radius-password',
     'section'     => '',
     'description' => 'RADIUS attribute for plain-text passwords.',
     'type'        => 'select',
-- 
cgit v1.2.1


From f5571d9d6c79d04e65f8da92be923c3f3ae5c54a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 10 Oct 2002 16:28:58 +0000
Subject: expiration date bugfix for HIDE

---
 httemplate/edit/cust_main.cgi | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index a76cd36d1..38d8d2b7e 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -357,16 +357,14 @@ if ( $payby_default eq 'HIDE' ) {
     }
 
     #false laziness w/expselect
-    my( $m, $y ) = (0, 0);
-    if ( scalar(@_) ) {
-      my $date = shift || '01-2000';
-      if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
-        ( $m, $y ) = ( $2, $1 );
-      } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-        ( $m, $y ) = ( $1, $3 );
-      } else {
-        die "unrecognized expiration date format: $date";
-      }
+    my( $m, $y );
+    my $date = $cust_main->paydate || '12-2037';
+    if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
+      ( $m, $y ) = ( $2, $1 );
+    } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+      ( $m, $y ) = ( $1, $3 );
+    } else {
+      die "unrecognized expiration date format: $date";
     }
 
     print qq!<INPUT TYPE="hidden" NAME="${payby}_month" VALUE="$m"!.
-- 
cgit v1.2.1


From 5f062fcd57e44d412cdf036649c38db5353a72f9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 10 Oct 2002 16:48:09 +0000
Subject: bugfix in payby-default HIDE expiration dates

---
 httemplate/edit/cust_main.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 38d8d2b7e..0921cb373 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -367,8 +367,8 @@ if ( $payby_default eq 'HIDE' ) {
       die "unrecognized expiration date format: $date";
     }
 
-    print qq!<INPUT TYPE="hidden" NAME="${payby}_month" VALUE="$m"!.
-          qq!<INPUT TYPE="hidden" NAME="${payby}_year"  VALUE="$y"!;
+    print qq!<INPUT TYPE="hidden" NAME="${payby}_month" VALUE="$m">!.
+          qq!<INPUT TYPE="hidden" NAME="${payby}_year"  VALUE="$y">!;
 
   }
 
-- 
cgit v1.2.1


From eb9d5b215af1fbe867b75c12328126f650f9fb06 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Oct 2002 10:15:55 +0000
Subject: ACH support

---
 FS/FS/Conf.pm                            |  4 +-
 FS/FS/cust_bill.pm                       | 73 +++++++++++++++++++++++---------
 FS/FS/cust_main.pm                       | 20 ++++++---
 FS/FS/cust_pay.pm                        |  7 +--
 FS/FS/cust_refund.pm                     |  7 +--
 FS/FS/part_bill_event.pm                 |  2 +-
 fs_signup/FS-SignupClient/cgi/signup.cgi | 10 +++--
 httemplate/edit/cust_main.cgi            | 12 ++++--
 httemplate/edit/process/cust_main.cgi    |  9 +++-
 httemplate/view/cust_main.cgi            | 10 +++++
 10 files changed, 109 insertions(+), 45 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 20e42183b..204d26af3 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -870,7 +870,7 @@ httemplate/docs/config.html
     'section'     => '',
     'description' => 'Acceptable payment types for the signup server',
     'type'        => 'selectmultiple',
-    'select_enum' => [ qw(CARD PREPAY BILL COMP) ],
+    'select_enum' => [ qw(CARD CHEK PREPAY BILL COMP) ],
   },
 
   {
@@ -957,7 +957,7 @@ httemplate/docs/config.html
     'section'     => 'UI',
     'description' => 'Default payment type.  HIDE disables display of billing information and sets customers to BILL.',
     'type'        => 'select',
-    'select_enum' => [ '', 'CARD', 'BILL', 'COMP', 'HIDE' ],
+    'select_enum' => [ '', qw(CARD CHEK BILL COMP HIDE) ],
   },
 
   {
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 296c8b6a6..e875f5229 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -583,32 +583,48 @@ sub comp {
 
 =item realtime_card
 
-Attempts to pay this invoice with a Business::OnlinePayment realtime gateway.
-See http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment
-for supproted processors.
+Attempts to pay this invoice with a credit card payment via a
+Business::OnlinePayment realtime gateway.  See
+http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment
+for supported processors.
 
 =cut
 
 sub realtime_card {
   my $self = shift;
+  $self->realtime_bop('CC', @_);
+}
+
+=item realtime_ach
+
+Attempts to pay this invoice with an electronic check (ACH) payment via a
+Business::OnlinePayment realtime gateway.  See
+http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment
+for supported processors.
+
+=cut
+
+sub realtime_ach {
+  my $self = shift;
+  $self->realtime_bop('ECHECK', @_);
+}
+
+sub realtime_bop {
+  my $self = shift;
+  my $method = shift;
   my $cust_main = $self->cust_main;
   my $amount = $self->owed;
 
   unless ( $processor =~ /^Business::OnlinePayment::(.*)$/ ) {
-    return "Real-time card processing not enabled (processor $processor)";
+    return "Real-time card/ACH processing not enabled (processor $processor)";
   }
   my $bop_processor = $1; #hmm?
 
   my $address = $cust_main->address1;
   $address .= ", ". $cust_main->address2 if $cust_main->address2;
 
-  #fix exp. date
-  #$cust_main->paydate =~ /^(\d+)\/\d*(\d{2})$/;
-  $cust_main->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
-  my $exp = "$2/$1";
-
   my($payname, $payfirst, $paylast);
-  if ( $cust_main->payname ) {
+  if ( $cust_main->payname && $method ne 'ECHECK' ) {
     $payname = $cust_main->payname;
     $payname =~ /^\s*([\w \,\.\-\']*)?\s+([\w\,\.\-\']+)\s*$/
       or do {
@@ -646,11 +662,24 @@ sub realtime_card {
     $description = eval qq("$dtempl");
 
   }
+
+  my %content;
+  if ( $method eq 'CC' ) { 
+    $content{card_number} = $cust_main->payinfo;
+    $cust_main->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
+    $content{expiration} = "$2/$1";
+  } elsif ( $method eq 'ECHECK' ) {
+    my($account_number,$routing_code) = $cust_main->payinfo
+    ( $content{account_number}, $content{routing_code} ) =
+      split('@', $cust_main->payinfo);
+    $content{bank_name} = $cust_main->payname;
+  }
   
   my $transaction =
     new Business::OnlinePayment( $bop_processor, @bop_options );
   $transaction->content(
-    'type'           => 'CC',
+    %content,
+    'type'           => $method,
     'login'          => $bop_login,
     'password'       => $bop_password,
     'action'         => $action1,
@@ -666,8 +695,6 @@ sub realtime_card {
     'state'          => $cust_main->state,
     'zip'            => $cust_main->zip,
     'country'        => $cust_main->country,
-    'card_number'    => $cust_main->payinfo,
-    'expiration'     => $exp,
     'referer'        => 'http://cleanwhisker.420.am/',
     'email'          => $email,
     'phone'          => $cust_main->daytime || $cust_main->night,
@@ -686,7 +713,8 @@ sub realtime_card {
       new Business::OnlinePayment( $bop_processor, @bop_options );
 
     my %capture = (
-      type           => 'CC',
+      %content,
+      type           => $method,
       action         => $action2,
       login          => $bop_login,
       password       => $bop_password,
@@ -694,8 +722,6 @@ sub realtime_card {
       amount         => $amount,
       authorization  => $auth,
       description    => $description,
-      card_number    => $cust_main->payinfo,
-      expiration     => $exp,
     );
 
     foreach my $field (qw( authorization_source_code returned_ACI                                          transaction_identifier validation_code           
@@ -720,18 +746,23 @@ sub realtime_card {
 
   if ( $transaction->is_success() ) {
 
+    my %method2payby = (
+      'CC'     => 'CARD',
+      'ECHECK' => 'CHEK',
+    );
+
     my $cust_pay = new FS::cust_pay ( {
        'invnum'   => $self->invnum,
        'paid'     => $amount,
        '_date'     => '',
-       'payby'    => 'CARD',
+       'payby'    => method2payby{$method},
        'payinfo'  => $cust_main->payinfo,
        'paybatch' => "$processor:". $transaction->authorization,
     } );
     my $error = $cust_pay->insert;
     if ( $error ) {
       # gah, even with transactions.
-      my $e = 'WARNING: Card debited but database not updated - '.
+      my $e = 'WARNING: Card/ACH debited but database not updated - '.
               'error applying payment, invnum #' . $self->invnum.
               " ($processor): $error";
       warn $e;
@@ -766,7 +797,7 @@ sub realtime_card {
         "Sender: $invoice_from",
         "Reply-To: $invoice_from",
         "Date: ". time2str("%a, %d %b %Y %X %z", time),
-        "Subject: Your credit card could not be processed",
+        "Subject: Your payment could not be processed",
       ] );
       my $message = new Mail::Internet (
         'Header' => $header,
@@ -838,7 +869,7 @@ sub print_text {
 #  my $invnum = $self->invnum;
   my $cust_main = qsearchs('cust_main', { 'custnum', $self->custnum } );
   $cust_main->payname( $cust_main->first. ' '. $cust_main->getfield('last') )
-    unless $cust_main->payname;
+    unless $cust_main->payname && $cust_main->payby ne 'CHEK';
 
   my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
 #  my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
@@ -1043,7 +1074,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.47 2002-10-04 12:09:21 ivan Exp $
+$Id: cust_bill.pm,v 1.48 2002-10-12 10:15:55 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 2701ac35d..d6e4bc1e3 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -158,7 +158,7 @@ FS::Record.  The following fields are currently supported:
 
 =item ship_fax - phone (optional)
 
-=item payby - `CARD' (credit cards), `BILL' (billing), `COMP' (free), or `PREPAY' (special billing type: applies a credit - see L<FS::prepay_credit> and sets billing type to BILL)
+=item payby - `CARD' (credit cards), `CHEK' (electronic check), `BILL' (billing), `COMP' (free), or `PREPAY' (special billing type: applies a credit - see L<FS::prepay_credit> and sets billing type to BILL)
 
 =item payinfo - card number, P.O., comp issuer (4-8 lowercase alphanumerics; think username) or prepayment identifier (see L<FS::prepay_credit>)
 
@@ -482,9 +482,9 @@ sub replace {
     $self->invoicing_list( $invoicing_list );
   }
 
-  if ( $self->payby eq 'CARD' &&
+  if ( $self->payby =~ /^(CARD|CHEK)$/ &&
        grep { $self->get($_) ne $old->get($_) } qw(payinfo paydate payname) ) {
-    # card info has changed, want to retry realtime_card invoice events
+    # card/check info has changed, want to retry realtime_card invoice events
     #false laziness w/collect
     foreach my $cust_bill_event (
       grep {
@@ -664,7 +664,7 @@ sub check {
     }
   }
 
-  $self->payby =~ /^(CARD|BILL|COMP|PREPAY)$/
+  $self->payby =~ /^(CARD|CHEK|BILL|COMP|PREPAY)$/
     or return "Illegal payby: ". $self->payby;
   $self->payby($1);
 
@@ -681,6 +681,14 @@ sub check {
     return gettext('unknown_card_type')
       if cardtype($self->payinfo) eq "Unknown";
 
+  } elsif ( $self->payby eq 'CHEK' ) {
+
+    my $payinfo = $self->payinfo;
+    $payinfo =~ s/[\D\@]//g;
+    $payinfo =~ /^(\d+)\@(\d{9})$/ or return 'invalid echeck account@aba';
+    $payinfo = "$1\@$2";
+    $self->payinfo($payinfo);
+
   } elsif ( $self->payby eq 'BILL' ) {
 
     $error = $self->ut_textn('payinfo');
@@ -705,7 +713,7 @@ sub check {
 
   if ( $self->paydate eq '' || $self->paydate eq '-' ) {
     return "Expriation date required"
-      unless $self->payby eq 'BILL' || $self->payby eq 'PREPAY';
+      unless $self->payby =~ /^(BILL|PREPAY|CHEK)$/;
     $self->paydate('');
   } else {
     $self->paydate =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/
@@ -717,7 +725,7 @@ sub check {
       if !$import && ( $y<$nowy || ( $y==$nowy && $1<$nowm ) );
   }
 
-  if ( $self->payname eq '' &&
+  if ( $self->payname eq '' && $self->payby ne 'CHEK' &&
        ( ! $conf->exists('require_cardname') || $self->payby ne 'CARD' ) ) {
     $self->payname( $self->first. " ". $self->getfield('last') );
   } else {
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 98eba704b..222691408 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -60,7 +60,8 @@ currently supported:
 =item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
 L<Time::Local> and L<Date::Parse> for conversion functions.
 
-=item payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
+=item payby - `CARD' (credit cards), `CHEK' (electronic check/ACH),
+`BILL' (billing), or `COMP' (free)
 
 =item payinfo - card number, check #, or comp issuer (4-8 lowercase alphanumerics; think username), respectively
 
@@ -346,7 +347,7 @@ sub check {
 
   $self->_date(time) unless $self->_date;
 
-  $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
+  $self->payby =~ /^(CARD|CHEK|BILL|COMP)$/ or return "Illegal payby";
   $self->payby($1);
 
   #false laziness with cust_refund::check
@@ -405,7 +406,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.21 2002-06-04 14:35:52 ivan Exp $
+$Id: cust_pay.pm,v 1.22 2002-10-12 10:15:55 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 8fe6876d3..aac320e61 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -47,7 +47,8 @@ inherits from FS::Record.  The following fields are currently supported:
 =item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
 L<Time::Local> and L<Date::Parse> for conversion functions.
 
-=item payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
+=item payby - `CARD' (credit cards), `CHEK' (electronic check/ACH),
+`BILL' (billing), or `COMP' (free)
 
 =item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
 
@@ -234,7 +235,7 @@ sub check {
     unless $self->crednum 
            || qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
 
-  $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
+  $self->payby =~ /^(CARD|CHEK|BILL|COMP)$/ or return "Illegal payby";
   $self->payby($1);
 
   #false laziness with cust_pay::check
@@ -266,7 +267,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.18 2002-02-19 03:22:39 jeff Exp $
+$Id: cust_refund.pm,v 1.19 2002-10-12 10:15:55 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
index a31b09b36..991616bb8 100644
--- a/FS/FS/part_bill_event.pm
+++ b/FS/FS/part_bill_event.pm
@@ -124,7 +124,7 @@ sub check {
 
     $c =~ /^\s*\$cust_main\->(suspend|cancel|invoicing_list_addpost|bill|collect)\(\);\s*("";)?\s*$/
 
-      or $c =~ /^\s*\$cust_bill\->(comp|realtime_card|realtime_card_cybercash|batch_card|send)\(\);\s*$/
+      or $c =~ /^\s*\$cust_bill\->(comp|realtime_card|realtime_ach|realtime_card_cybercash|batch_card|send)\(\);\s*$/
 
       or $c =~ /^\s*\$cust_bill\->send\(\'\w+\'\);\s*$/
 
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 816b8213b..333a88cf8 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.30 2002-08-26 19:07:10 khoff Exp $
+# $Id: signup.cgi,v 1.31 2002-10-12 10:15:55 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -611,14 +611,18 @@ Contact Information
   
     my %payby = (
       'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", "12-2037"). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
+      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
       'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
       'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
     );
 
+  my( $account, $aba ) = split('@', $payinfo);
+
     my %paybychecked = (
       'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", $paydate). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+    'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
       'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
       'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
     );
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 0921cb373..9e62b00ef 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -350,7 +350,7 @@ if ( $payby_default eq 'HIDE' ) {
   print qq!<INPUT TYPE="hidden" NAME="invoicing_list" VALUE="!.
         join(', ', $cust_main->invoicing_list). '">';
 
-  foreach my $payby (qw( CARD BILL COMP )) {
+  foreach my $payby (qw( CARD CHEK BILL COMP )) {
     foreach my $field (qw( payinfo payname )) {
       print qq!<INPUT TYPE="hidden" NAME="${payby}_$field" VALUE="!.
             $cust_main->getfield($field). '">';
@@ -399,18 +399,22 @@ if ( $payby_default eq 'HIDE' ) {
 
   my %payby = (
     'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
+    'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
 );
 
+  my( $account, $aba ) = split('@', $payinfo);
+
   my %paybychecked = (
     'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+    'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
 );
 
   $cust_main->payby($payby_default) unless $cust_main->payby;
-  for (qw(CARD BILL COMP)) {
+  for (qw(CARD CHEK BILL COMP)) {
     print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
     if ($cust_main->payby eq "$_") {
       print qq! CHECKED> $paybychecked{$_}</TD>!;
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 6ce60d14a..c15ea0321 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -10,9 +10,14 @@ $cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
 
 my $payby = $cgi->param('payby');
 if ( $payby ) {
-  $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
+  if ( $payby eq 'CHEK' ) {
+    $cgi->param('payinfo',
+      $cgi->param('CHEK_payinfo1'). '@'. $cgi->param('CHEK_payinfo2') );
+  } else {
+    $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
+  }
   $cgi->param('paydate',
-  $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
+    $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
   $cgi->param('payname', $cgi->param( $payby. '_payname' ) );
 }
 
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 25260fa3c..f7906cfa3 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -217,6 +217,16 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
           '<TR><TD ALIGN="right">Name on card</TD><TD BGCOLOR="#ffffff">',
           $cust_main->payname, '</TD></TR>'
     ;
+  } elsif ( $cust_main->payby eq 'CHEK' ) {
+    my( $account, $aba ) = split('@', $cust_main->payinfo );
+    print 'Electronic check</TD></TR>',
+          '<TR><TD ALIGN="right">Account number</TD><TD BGCOLOR="#ffffff">',
+          $account, '</TD></TR>',
+          '<TR><TD ALIGN="right">ABA/Routing code</TD><TD BGCOLOR="#ffffff">',
+          $aba, '</TD></TR>',
+          '<TR><TD ALIGN="right">Bank name</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->payname, '</TD></TR>'
+    ;
   } elsif ( $cust_main->payby eq 'BILL' ) {
     print 'Billing</TD></TR>';
     print '<TR><TD ALIGN="right">P.O. </TD><TD BGCOLOR="#ffffff">',
-- 
cgit v1.2.1


From 6f8a6c416174bcf8095c959085d14ba820425aad Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Oct 2002 13:26:46 +0000
Subject: sqlradacct_hour price plan to charge per-hour against an external
 radacct table

---
 FS/FS/cust_pkg.pm            | 41 ++++++++++++++++++++-
 FS/FS/cust_svc.pm            | 87 +++++++++++++++++++++++++++++++++++++++++++-
 FS/FS/svc_acct.pm            | 27 +++++++++++++-
 httemplate/edit/part_pkg.cgi | 31 ++++++++++++++++
 4 files changed, 181 insertions(+), 5 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 0c71435e1..b16d08137 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -475,7 +475,7 @@ sub cust_main {
 =item seconds_since TIMESTAMP
 
 Returns the number of seconds all accounts (see L<FS::svc_acct>) in this
-package have been online since TIMESTAMP.
+package have been online since TIMESTAMP, according to the session monitor.
 
 TIMESTAMP is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
 L<Time::Local> and L<Date::Parse> for conversion functions.
@@ -496,6 +496,43 @@ sub seconds_since {
 
 }
 
+=item seconds_since_sqlradacct TIMESTAMP_START TIMESTAMP_END DATASRC DB_USERNAME DB_PASSWORD
+
+Returns the numbers of seconds all accounts (see L<FS::svc_acct>) in this
+package have been online between TIMESTAMP_START (inclusive) and TIMESTAMP_END
+(exclusive), according to an external SQL radacct table, such as those
+generated by ICRADIUS or FreeRADIUS.  Sessions which started in the specified
+range but are still open are counted from session start to the end of the
+range.  Also, sessions which end in the range but started earlier are counted
+from the start of the range to session end.  Finally, sessions which start
+before the range but end after (or are still open) are counted for the entire
+range.
+
+TIMESTAMP_START and TIMESTAMP_END are specified as UNIX timestamps; see
+L<perlfunc/"time">.  Also see L<Time::Local> and L<Date::Parse> for conversion
+functions.
+
+
+=cut
+
+sub seconds_since_sqlradacct {
+  my($self, $start, $end, $datasrc, $db_user, $db_pass) = @_;
+
+  my $dbh = DBI->connect($datasrc, $db_user, $db_pass)
+    or die "can't connect to $datasrc: ". $DBI::errstr;
+
+  my $seconds = 0;
+
+  foreach my $cust_svc (
+    grep { $_->part_svc->svcdb eq 'svc_acct' } $self->cust_svc
+  ) {
+    $seconds += $cust_svc->seconds_since_sqlradacct($start, $end, $dbh);
+  }
+
+  $seconds;
+
+}
+
 =back
 
 =head1 SUBROUTINES
@@ -678,7 +715,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.24 2002-09-17 09:19:06 ivan Exp $
+$Id: cust_pkg.pm,v 1.25 2002-10-12 13:26:45 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 9d510b38a..4fc663450 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -336,11 +336,93 @@ sub seconds_since {
   $sth->fetchrow_arrayref->[0];
 }
 
+=item seconds_since_sqlradacct TIMESTAMP_START TIMESTAMP_END ( DBI_DATABASE_HANDLE | DATASRC DB_USERNAME DB_PASSWORD )
+
+See L<FS::svc_acct/seconds_since_sqlradacct>.  Equivalent to
+$cust_svc->svc_x->seconds_since, but more efficient.  Meaningless for records
+where B<svcdb> is not "svc_acct".
+
+NOTE: specifying a DATASRC/USERNAME/PASSWORD instead of a DBI database handle
+is not yet implemented.
+
+=cut
+
+#note: implementation here, POD in FS::svc_acct
+sub seconds_since_sqlradacct {
+  my($self, $start, $end, $dbh) = @_;
+
+  my $username = $self->svc_x->username;
+
+  #select a unix time conversion function based on database type
+  my $str2time;
+  if ( $dbh->{Driver}->{Name} eq 'mysql' ) {
+    $str2time = 'UNIX_TIMESTAMP(';
+  } elsif ( $dbh->{Driver}->{Name} eq 'Pg' ) {
+    $str2time = 'EXTRACT( EPOCH FROM ';
+  } else {
+    warn "warning: unknown database type ". $dbh->{Driver}->{Name}.
+         "; guessing how to convert to UNIX timestamps";
+    $str2time = 'extract(epoch from ';
+  }
+
+  #find sessions completely within the given range
+  my $sth = $dbh->prepare("SELECT SUM(acctsessiontime)
+                             FROM radacct
+                             WHERE UserName = ?
+                               AND $str2time AcctStartTime) >= ?
+                               AND $str2time AcctStopTime ) <  ?
+                               AND AcctStopTime =! 0
+                               AND AcctStopTime IS NOT NULL"
+  ) or die $dbh->errstr;
+  $sth->execute($username, $start, $end) or die $sth->errstr;
+  my $regular = $sth->fetchrow_arrayref->[0];
+
+  #find open sessions which start in the range, count session start->range end
+  $sth = $dbh->prepare("SELECT SUM( ? - $str2time AcctStartTime ) )
+                          FROM radacct
+                          WHERE UserName = ?
+                            AND AcctStartTime >= ?
+                            AND (    AcctStopTime = 0
+                                  OR AcctStopTime IS NULL )"
+  ) or die $dbh->errstr;
+  $sth->execute($end, $username, $start) or die $sth->errstr;
+  my $start_during = $sth->fetchrow_arrayref->[0];
+
+  #find closed sessions which start before the range but stop during,
+  #count range start->session end
+  $sth = $dbh->prepare("SELECT SUM( $str2time AcctStopTime ) - ? ) 
+                          FROM radacct
+                          WHERE UserName = ?
+                            AND AcctStartTime < ?
+                            AND AcctStopTime >= ?
+                            AND AcctStopTime <  ?
+                            AND AcctStopTime != 0
+                            AND AcctStopTime IS NOT NULL"
+  ) or die $dbh->errstr;
+  $sth->execute($start, $username, $start, $start, $end ) or die $sth->errstr;
+  my $end_during = $sth->fetchrow_arrayref->[0];
+
+  #find closed or open sessions which start before the range but stop
+  # after, or are still open, count range start->range end
+  $sth = $dbh->prepare("SELECT COUNT(*)
+                          FROM radacct
+                          WHERE UserName = ?
+                            AND AcctStartTime < ?
+                            AND (    AcctStopTime >= ?
+                                  OR AcctStopTime =  0
+                                  OR AcctStopTime IS NULL )"
+  ) or die $dbh->errstr;
+  $sth->execute($username, $start, $end ) or die $sth->errstr;
+  my $entire_range = ($end-$start) * $sth->fetchrow_arrayref->[0];
+
+  $regular + $end_during + $start_during + $entire_range;
+}
+
 =back
 
 =head1 VERSION
 
-$Id: cust_svc.pm,v 1.17 2002-09-18 22:39:01 ivan Exp $
+$Id: cust_svc.pm,v 1.18 2002-10-12 13:26:45 ivan Exp $
 
 =head1 BUGS
 
@@ -352,6 +434,9 @@ pkg_svc records are not checked in general (here).
 Deleting this record doesn't check or delete the svc_* record associated
 with this record.
 
+In seconds_since_sqlradacct, specifying a DATASRC/USERNAME/PASSWORD instead of
+a DBI database handle is not yet implemented.
+
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::cust_pkg>, L<FS::part_svc>, L<FS::pkg_svc>, 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index b5ade6fac..3afee7f64 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -921,8 +921,8 @@ sub email {
 
 =item seconds_since TIMESTAMP
 
-Returns the number of seconds this account has been online since TIMESTAMP.
-See L<FS::session>
+Returns the number of seconds this account has been online since TIMESTAMP,
+according to the session monitor (see L<FS::Session>).
 
 TIMESTAMP is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
 L<Time::Local> and L<Date::Parse> for conversion functions.
@@ -935,6 +935,29 @@ sub seconds_since {
   $self->cust_svc->seconds_since(@_);
 }
 
+=item seconds_since_sqlradacct TIMESTAMP_START TIMESTAMP_END DATASRC DB_USERNAME DB_PASSWORD
+
+Returns the numbers of seconds this account has been online between
+TIMESTAMP_START (inclusive) and TIMESTAMP_END (exclusive), according to an
+external SQL radacct table, such as those generated by ICRADIUS or FreeRADIUS.
+Sessions which started in the specified range but are still open are counted
+from session start to the end of the range.  Also, sessions which end in the
+range but started earlier are counted from the start of the range to session
+end.  Finally, sessions which start before the range but end after (or are
+still open) are counted for the entire range.
+
+TIMESTAMP_START and TIMESTAMP_END are specified as UNIX timestamps; see
+L<perlfunc/"time">.  Also see L<Time::Local> and L<Date::Parse> for conversion
+functions.
+
+=cut
+
+#note: POD here, implementation in FS::cust_svc
+sub seconds_since_sqlradacct {
+  my $self = shift;
+  $self->cust_svc->seconds_since_sqlradacct(@_);
+}
+
 =item radius_groups
 
 Returns all RADIUS groups for this account (see L<FS::radius_usergroup>).
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 38d7358a5..ddd86765a 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -355,6 +355,37 @@ tie my %plans, 'Tie::IxHash',
 
   },
 
+  'sqlradacct_hour' => {
+    'name' => 'Base charge plus charge per-hour from an external SQL radacct table',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'sql_datasrc' => { 'name' => 'DBI data source',
+                         'default' => 'DBI:mysql:host=radius.server.name;dbname=radius',
+                       },
+      'sql_username' => { 'name' => 'Database username',
+                          'default' => 'radius',
+                        },
+      'sql_password' => { 'name' => 'Database password',
+                          'default' => '',
+                        },
+      'recur_included_hours' => { 'name' => 'Hours included',
+                                  'default' => 0,
+                                },
+      'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
+                                 'default' => 0,
+                               },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ],
+    'setup' => 'what.setup_fee.value',
+    'recur' => '\'my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate))[0,1,2,3,4,5]; $mon+=$part_pkg->freq; until ($mon<12) { $mon-=12; $year++ }; $edate = timelocal($sec,$min,$hour,$mday,$mon,$year); my $hours = $cust_pkg->seconds_since_sqlradacct($sdate, $edate, \' + what.sql_datasrc + \', \' + what.sql_username + \', \' + what.sql_password + \' ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
+  },
+
+
 ;
 
 my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
-- 
cgit v1.2.1


From ac96a7afbae06cc3b594b3e461bec8a34d65cfe5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Oct 2002 13:46:16 +0000
Subject: dayphone/nightphone as customizable labels, closes: Bug#464

---
 bin/populate-msgcat           |  8 ++++++++
 httemplate/edit/cust_main.cgi | 11 +++++++----
 httemplate/view/cust_main.cgi | 10 ++++++----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/bin/populate-msgcat b/bin/populate-msgcat
index 3b198f718..719d33046 100755
--- a/bin/populate-msgcat
+++ b/bin/populate-msgcat
@@ -110,6 +110,14 @@ sub messages {
       'en_US' => 'Expired card',
     },
 
+    'daytime' => {
+      'en_US' => 'Day Phone',
+    },
+
+    'night' => {
+      'en_US' => 'Night Phone',
+    },
+
   );
 }
 
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 9e62b00ef..d99b54aed 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -195,10 +195,13 @@ my($daytime,$night,$fax)=(
   $cust_main->fax,
 );
 
+my $daytime_label = gettext('daytime') || 'Day Phone';
+my $night_label = gettext('night') || 'Night Phone';
+
 print <<END;
 <TR><TH ALIGN="right">${r}Country</TH><TD>$country_html</TD></TR>
-<TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18></TD></TR>
-<TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18></TD></TR>
+<TR><TD ALIGN="right">$daytime_label</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18></TD></TR>
+<TR><TD ALIGN="right">$night_label</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18></TD></TR>
 <TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12></TD></TR>
 END
 
@@ -294,8 +297,8 @@ END
 
   print <<END;
   <TR><TH ALIGN="right">${r}Country</TH><TD>$ship_country_html</TD></TR>
-  <TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_daytime" VALUE="$ship_daytime" SIZE=18 onChange="changed(this)"></TD></TR>
-  <TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_night" VALUE="$ship_night" SIZE=18 onChange="changed(this)"></TD></TR>
+  <TR><TD ALIGN="right">$daytime_label</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_daytime" VALUE="$ship_daytime" SIZE=18 onChange="changed(this)"></TD></TR>
+  <TR><TD ALIGN="right">$night_label</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_night" VALUE="$ship_night" SIZE=18 onChange="changed(this)"></TD></TR>
   <TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_fax" VALUE="$ship_fax" SIZE=12 onChange="changed(this)"></TD></TR>
 END
 
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index f7906cfa3..d157be397 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -83,9 +83,11 @@ print '</TR>',
           $cust_main->country,
           '</TD></TR>',
   ;
-  print '<TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+  my $daytime_label = gettext('daytime') || 'Day Phone';
+  my $night_label = gettext('night') || 'Night Phone';
+  print '<TR><TD ALIGN="right">$daytime_label</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
           $cust_main->daytime || '&nbsp', '</TD></TR>',
-       '<TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+       '<TR><TD ALIGN="right">$night_label</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
           $cust_main->night || '&nbsp', '</TD></TR>',
         '<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
           $cust_main->fax || '&nbsp', '</TD></TR>',
@@ -122,10 +124,10 @@ print '</TR>',
             $cust_main->get("${pre}country"),
             '</TD></TR>',
     ;
-    print '<TR><TD ALIGN="right">Day Phone</TD>',
+    print '<TR><TD ALIGN="right">$daytime_label</TD>',
           '<TD COLSPAN=5 BGCOLOR="#ffffff">',
             $cust_main->get("${pre}daytime") || '&nbsp', '</TD></TR>',
-          '<TR><TD ALIGN="right">Night Phone</TD>'.
+          '<TR><TD ALIGN="right">$night_label</TD>'.
           '<TD COLSPAN=5 BGCOLOR="#ffffff">',
             $cust_main->get("${pre}night") || '&nbsp', '</TD></TR>',
           '<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-- 
cgit v1.2.1


From dcef219e16a1b4b6d552b8ea2ae17fd58fb2be3a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Oct 2002 14:21:17 +0000
Subject: fix dayphone/nightphone msgcat

---
 httemplate/edit/cust_main.cgi |  4 ++--
 httemplate/view/cust_main.cgi | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index d99b54aed..8f2fe7cee 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -195,8 +195,8 @@ my($daytime,$night,$fax)=(
   $cust_main->fax,
 );
 
-my $daytime_label = gettext('daytime') || 'Day Phone';
-my $night_label = gettext('night') || 'Night Phone';
+my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day Phone';
+my $night_label = FS::Msgcat::_gettext('night') || 'Night Phone';
 
 print <<END;
 <TR><TH ALIGN="right">${r}Country</TH><TD>$country_html</TD></TR>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index d157be397..a1a47ea74 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -83,11 +83,13 @@ print '</TR>',
           $cust_main->country,
           '</TD></TR>',
   ;
-  my $daytime_label = gettext('daytime') || 'Day Phone';
-  my $night_label = gettext('night') || 'Night Phone';
-  print '<TR><TD ALIGN="right">$daytime_label</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+  my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day Phone';
+  my $night_label = FS::Msgcat::_gettext('night') || 'Night Phone';
+  print '<TR><TD ALIGN="right">'. $daytime_label.
+          '</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
           $cust_main->daytime || '&nbsp', '</TD></TR>',
-       '<TR><TD ALIGN="right">$night_label</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+        '<TR><TD ALIGN="right">'. $night_label. 
+          '</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
           $cust_main->night || '&nbsp', '</TD></TR>',
         '<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
           $cust_main->fax || '&nbsp', '</TD></TR>',
@@ -124,10 +126,10 @@ print '</TR>',
             $cust_main->get("${pre}country"),
             '</TD></TR>',
     ;
-    print '<TR><TD ALIGN="right">$daytime_label</TD>',
+    print '<TR><TD ALIGN="right">'. $daytime_label. '</TD>',
           '<TD COLSPAN=5 BGCOLOR="#ffffff">',
             $cust_main->get("${pre}daytime") || '&nbsp', '</TD></TR>',
-          '<TR><TD ALIGN="right">$night_label</TD>'.
+          '<TR><TD ALIGN="right">'. $night_label. '</TD>'.
           '<TD COLSPAN=5 BGCOLOR="#ffffff">',
             $cust_main->get("${pre}night") || '&nbsp', '</TD></TR>',
           '<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-- 
cgit v1.2.1


From ec8b028d52fea91a4f970c0be377eaccde682997 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 13 Oct 2002 01:05:29 +0000
Subject: bug fix in new ACH code

---
 FS/FS/cust_bill.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index e875f5229..bdd60dbe0 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -669,7 +669,7 @@ sub realtime_bop {
     $cust_main->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
     $content{expiration} = "$2/$1";
   } elsif ( $method eq 'ECHECK' ) {
-    my($account_number,$routing_code) = $cust_main->payinfo
+    my($account_number,$routing_code) = $cust_main->payinfo;
     ( $content{account_number}, $content{routing_code} ) =
       split('@', $cust_main->payinfo);
     $content{bank_name} = $cust_main->payname;
@@ -1074,7 +1074,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.48 2002-10-12 10:15:55 ivan Exp $
+$Id: cust_bill.pm,v 1.49 2002-10-13 01:05:29 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 80b9d734807f0358403c47dfa3d86fb80f75cdd0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 13 Oct 2002 01:14:34 +0000
Subject: change ILIKE into LOWER() for compatibility with non-Pg and Pg before
 7.1

---
 FS/FS/Record.pm | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index a23f37a62..ebcbbb497 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -208,34 +208,40 @@ sub qsearch {
     $statement .= ' WHERE '. join(' AND ', map {
 
       my $op = '=';
+      my $column = $_;
       if ( ref($record->{$_}) ) {
         $op = $record->{$_}{'op'} if $record->{$_}{'op'};
-        $op = 'LIKE' if $op =~ /^ILIKE$/i && driver_name ne 'Pg';
+        #$op = 'LIKE' if $op =~ /^ILIKE$/i && driver_name ne 'Pg';
+        if ( uc($op) eq 'ILIKE' ) {
+          $op = 'LIKE';
+          $record->{$_}{'value'} = lc($record->{$_}{'value'});
+          $column = "LOWER($_)";
+        }
         $record->{$_} = $record->{$_}{'value'}
       }
 
       if ( ! defined( $record->{$_} ) || $record->{$_} eq '' ) {
         if ( $op eq '=' ) {
           if ( driver_name eq 'Pg' ) {
-            qq-( $_ IS NULL OR $_ = '' )-;
+            qq-( $column IS NULL OR $column = '' )-;
           } else {
-            qq-( $_ IS NULL OR $_ = "" )-;
+            qq-( $column IS NULL OR $column = "" )-;
           }
         } elsif ( $op eq '!=' ) {
           if ( driver_name eq 'Pg' ) {
-            qq-( $_ IS NOT NULL AND $_ != '' )-;
+            qq-( $column IS NOT NULL AND $column != '' )-;
           } else {
-            qq-( $_ IS NOT NULL AND $_ != "" )-;
+            qq-( $column IS NOT NULL AND $column != "" )-;
           }
         } else {
           if ( driver_name eq 'Pg' ) {
-            qq-( $_ $op '' )-;
+            qq-( $column $op '' )-;
           } else {
-            qq-( $_ $op "" )-;
+            qq-( $column $op "" )-;
           }
         }
       } else {
-        "$_ $op ?";
+        "$column $op ?";
       }
     } @fields );
   }
-- 
cgit v1.2.1


From f2b66016c409270f51b8b76c4c61e7886f363366 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 13 Oct 2002 06:49:27 +0000
Subject: don't use ILIKE (7.1-ism) anymore

---
 httemplate/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 3c48a746f..100a3cc64 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -12,7 +12,7 @@ Before installing, you need:
   <li><a href="http://rsync.samba.org/">rsync</a>
   <li>A <b>transactional</b> database engine <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">supported</a> by Perl's <a href="http://dbi.perl.org">DBI</a>.
     <ul>
-      <li><a href="http://www.postgresql.org/">PostgreSQL</a> is recommended (v7.1.x or later, not 7.0.x).
+      <li><a href="http://www.postgresql.org/">PostgreSQL</a> is recommended (v7or later).
       <li>MySQL versions before 4.1 do not support standard SQL subqueries and are <b>NOT SUPPORTED</b>.  If you are a developer who wishes to contribute MySQL 3.x/4.0 support, see <a href="http://pouncequick.420.am/rt/Ticket/Display.html?id=438">ticket #438</a> in the bug-tracking system and ask on the -devel mailing list.
 <!--       <li>MySQL has been reported to work.
          <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you want to use MySQL, you <b>must</b> use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a> or <a href="http://www.mysql.com/doc/I/n/InnoDB.html">InnoDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> or <code>--default-table-type=InnoDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> or <code>default-table-type=InnoDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>. -->
-- 
cgit v1.2.1


From a5dfbdaabced96bb6a4d00026459297230a3bf5b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 13 Oct 2002 07:13:52 +0000
Subject: msgcat docs for upgrade

---
 httemplate/docs/upgrade9.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/httemplate/docs/upgrade9.html b/httemplate/docs/upgrade9.html
index efd25887d..478f8aa4f 100644
--- a/httemplate/docs/upgrade9.html
+++ b/httemplate/docs/upgrade9.html
@@ -10,5 +10,10 @@
   <li>Copy <code>aspdocs/</code> or <code>masondocs/</code> to your web server's document space.
   <li>Run <code>make install-perl-modules</code>.
   <li>Install <a href="http://search.cpan.org/search?dist=Net-SSH">Net::SSH</a> minimum version 0.07
+  <li>Apply the following changes to your database:
+<pre>
+INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 17, 'daytime', 'en_US', 'Day Phone' );
+INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 18, 'nigh', 'en_US', 'Night Phone' );
+</pre>
   <li>Restart Apache and freeside-queued.
 </body>
-- 
cgit v1.2.1


From 225f258fc288fd8891a3681597f153e5c5c5265c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 13 Oct 2002 07:14:59 +0000
Subject: doh

---
 httemplate/docs/session.html  | 7 ++++++-
 httemplate/docs/upgrade9.html | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/httemplate/docs/session.html b/httemplate/docs/session.html
index 7dac5fdf7..72e16424e 100644
--- a/httemplate/docs/session.html
+++ b/httemplate/docs/session.html
@@ -38,9 +38,14 @@ freeside-logout username ( portnum | ip | nasnum nasport )</pre>
       <li><i>username</i> is a customer username from the svc_acct table
       <li><i>portnum</i>, <i>ip</i> or <i>nasport</i> and <i>nasnum</i> uniquely identify a port in the <a href="schema.html#port">port</a> database table.
     </ul>
-  <li>RADIUS
+  <li>RADIUS - One of:
     <ul>
+      <li>Run the <b>freeside-sqlradius-radacctd</b> daemon to import radacct
+        records from all configured sqlradius exports:
+          <tt>freeside-sqlradius-radacctd username</tt>
       <li>Configure your RADIUS server's login and logout callbacks to use the command-line <tt>freeside-login</tt> and <tt>freeside-logout</tt> utilites.
+      <li> <i>(incomplete)</i>Use the <b>fs_radlog/fs_radlogd</b> tool to
+        import records from a text radacct file.
     </ul>
 </ul>
 <h2>Callbacks</h2>
diff --git a/httemplate/docs/upgrade9.html b/httemplate/docs/upgrade9.html
index 478f8aa4f..7cf44ea31 100644
--- a/httemplate/docs/upgrade9.html
+++ b/httemplate/docs/upgrade9.html
@@ -13,7 +13,7 @@
   <li>Apply the following changes to your database:
 <pre>
 INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 17, 'daytime', 'en_US', 'Day Phone' );
-INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 18, 'nigh', 'en_US', 'Night Phone' );
+INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 18, 'night', 'en_US', 'Night Phone' );
 </pre>
   <li>Restart Apache and freeside-queued.
 </body>
-- 
cgit v1.2.1


From 05030dc1852f7886f3b792b5a5fe469dcaa36199 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 14 Oct 2002 06:16:07 +0000
Subject: show time online this billing cycle on view account screen

---
 httemplate/view/svc_acct.cgi | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index f2228424c..e755f87d7 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -144,8 +144,38 @@ if ($svc_acct->slipip) {
 print '<TR><TD ALIGN="right">RADIUS groups</TD><TD BGCOLOR="#ffffff">'.
       join('<BR>', $svc_acct->radius_groups). '</TD></TR>';
 
-print '</TABLE></TD></TR></TABLE><BR><BR>'.
-      join("\n", $conf->config('svc_acct-notes') ).
-      '<BR><BR>'. joblisting({'svcnum'=>$svcnum}, 1). '</BODY></HTML>';
+print '</TABLE></TD></TR></TABLE><BR><BR>';
+
+if ( $cust_pkg && $cust_pkg->part_pkg->plan eq 'sqlradacct_hour' ) {
+
+  #false laziness w/httemplate/edit/part_pkg... this stuff doesn't really
+  #belong in plan data
+  my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
+                    split("\n", $cust_pkg->part_pkg->plandata );
+
+  my $last_bill = $cust_pkg->last_bill;
+  my $seconds = $svc_acct->seconds_since_sqlradacct(
+    $last_bill,
+    time,
+    $plandata{sql_datasrc},
+    $plandata{sql_username},
+    $plandata{sql_password},
+  );
+  my $h = int($seconds/3600);
+  my $m = int( ($seconds%3600) / 60 );
+  my $s = $seconds%60;
+  if ( $seconds ) {
+    print 'Online $h h $m m $s s this billing cycle (since '.
+          time2str(%C, $last_bill). ') - '. 
+          $plandata{recur_included_hours}. ' total hours in plan<BR><BR>';
+  } else {
+    print 'Has not logged on this billing cycle (since '.
+          time2str(%C, $last_bill). ')<BR><BR>';
+  }
+
+}
+
+print join("\n", $conf->config('svc_acct-notes') ).  '<BR><BR>'.
+      joblisting({'svcnum'=>$svcnum}, 1). '</BODY></HTML>';
 
 %>
-- 
cgit v1.2.1


From 7bb23c47594c1111aecb5fe8fdb2042e509cca86 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 14 Oct 2002 06:17:14 +0000
Subject: fix sql radacct billing

---
 FS/FS/cust_pkg.pm            | 19 +++++++++++++++++--
 httemplate/edit/part_pkg.cgi |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index b16d08137..803fa3c16 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -9,6 +9,7 @@ use FS::part_pkg;
 use FS::cust_main;
 use FS::type_pkgs;
 use FS::pkg_svc;
+use FS::cust_bill_pkg;
 
 # need to 'use' these instead of 'require' in sub { cancel, suspend, unsuspend,
 # setup }
@@ -90,7 +91,7 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item setup - date
 
-=item bill - date
+=item bill - date (next bill date)
 
 =item susp - date
 
@@ -418,6 +419,20 @@ sub unsuspend {
   ''; #no errors
 }
 
+=item last_bill
+
+Returns the last bill date, or if there is no last bill date, the setup date.
+Useful for billing metered services.
+
+=cut
+
+sub last_bill {
+  my $self = shift;
+  my $cust_bill_pkg = qsearchs('cust_bill_pkg', { 'pkgnum' => $self->pkgnum,
+                                                  'edate'  => $self->bill,  } );
+  $cust_bill_pkg ? $cust_bill_pkg->sdate : $self->setup || 0;
+}
+
 =item part_pkg
 
 Returns the definition for this billing item, as an FS::part_pkg object (see
@@ -715,7 +730,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.25 2002-10-12 13:26:45 ivan Exp $
+$Id: cust_pkg.pm,v 1.26 2002-10-14 06:17:14 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index ddd86765a..5fbcd0bd1 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -382,7 +382,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate))[0,1,2,3,4,5]; $mon+=$part_pkg->freq; until ($mon<12) { $mon-=12; $year++ }; $edate = timelocal($sec,$min,$hour,$mday,$mon,$year); my $hours = $cust_pkg->seconds_since_sqlradacct($sdate, $edate, \' + what.sql_datasrc + \', \' + what.sql_username + \', \' + what.sql_password + \' ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
+    'recur' => '\'my $hours = $cust_pkg->seconds_since_sqlradacct($cust_pkg->last_bill, $sdate, \' + what.sql_datasrc + \', \' + what.sql_username + \', \' + what.sql_password + \' ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
   },
 
 
-- 
cgit v1.2.1


From ab6a6774557598dc7cdfc57c941a4bf48f3bb64a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 14 Oct 2002 07:30:30 +0000
Subject: svc-acct-alldomains config file allows selection of accounts from any
 domain

---
 FS/FS/Conf.pm                | 7 +++++++
 httemplate/edit/svc_acct.cgi | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 204d26af3..c4d1a39d2 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -975,6 +975,13 @@ httemplate/docs/config.html
     'select_enum' => [ 'Password', 'User-Password' ],
   },
 
+  {
+    'key'         => 'svc_acct-alldomains',
+    'section'     => '',
+    'description' => 'Allow accounts to select any domain in the database.  Normally accounts can only select from the domain set in the service definition and those purchased by the customer.',
+    'type'        => 'bool',
+  },
+
 );
 
 1;
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 90b26324a..c27bab88a 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -163,7 +163,7 @@ if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
   }
 
   my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
-  if ($cust_pkg) {
+  if ($cust_pkg && !$conf->exists('svc_acct-alldomains') ) {
     my @cust_svc =
       map { qsearch('cust_svc', { 'pkgnum' => $_->pkgnum } ) }
           qsearch('cust_pkg', { 'custnum' => $cust_pkg->custnum } );
-- 
cgit v1.2.1


From 196f70d25dc9dda5c765ab534734c307644dee0c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 14 Oct 2002 07:44:50 +0000
Subject: s/bool/checkbox/

---
 FS/FS/Conf.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index c4d1a39d2..cf874aa35 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -979,7 +979,7 @@ httemplate/docs/config.html
     'key'         => 'svc_acct-alldomains',
     'section'     => '',
     'description' => 'Allow accounts to select any domain in the database.  Normally accounts can only select from the domain set in the service definition and those purchased by the customer.',
-    'type'        => 'bool',
+    'type'        => 'checkbox',
   },
 
 );
-- 
cgit v1.2.1


From 1b2fb3324740555200590d8f75e339e44acf447a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 14 Oct 2002 09:28:14 +0000
Subject: close invoices which are declined.  closes: Bug#408

---
 fs_signup/fs_signup_server | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 7f962e057..703c76ec7 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -188,9 +188,15 @@ while (1) {
         if $bill_error;
 
       if ( $cust_main->balance > 0 ) {
+
+        #this makes sense.  credit is "un-doing" the invoice
+        $cust_main->credit( $cust_main->balance, 'signup server decline' );
+        $cust_main->apply_credits;
+
         #should check list for errors...
         #$cust_main->suspend;
         $cust_main->cancel;
+
         $error = '_decline';
       }
     }
-- 
cgit v1.2.1


From 88d237b8fe396b4e85a16e20eccfeb4e22e94e24 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 15 Oct 2002 09:54:24 +0000
Subject: ach fix s/ECHECK/CHECK/

---
 FS/FS/cust_bill.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index bdd60dbe0..54641ee35 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -606,7 +606,7 @@ for supported processors.
 
 sub realtime_ach {
   my $self = shift;
-  $self->realtime_bop('ECHECK', @_);
+  $self->realtime_bop('CHECK', @_);
 }
 
 sub realtime_bop {
@@ -624,7 +624,7 @@ sub realtime_bop {
   $address .= ", ". $cust_main->address2 if $cust_main->address2;
 
   my($payname, $payfirst, $paylast);
-  if ( $cust_main->payname && $method ne 'ECHECK' ) {
+  if ( $cust_main->payname && $method ne 'CHECK' ) {
     $payname = $cust_main->payname;
     $payname =~ /^\s*([\w \,\.\-\']*)?\s+([\w\,\.\-\']+)\s*$/
       or do {
@@ -668,7 +668,7 @@ sub realtime_bop {
     $content{card_number} = $cust_main->payinfo;
     $cust_main->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
     $content{expiration} = "$2/$1";
-  } elsif ( $method eq 'ECHECK' ) {
+  } elsif ( $method eq 'CHECK' ) {
     my($account_number,$routing_code) = $cust_main->payinfo;
     ( $content{account_number}, $content{routing_code} ) =
       split('@', $cust_main->payinfo);
@@ -747,8 +747,8 @@ sub realtime_bop {
   if ( $transaction->is_success() ) {
 
     my %method2payby = (
-      'CC'     => 'CARD',
-      'ECHECK' => 'CHEK',
+      'CC'    => 'CARD',
+      'CHECK' => 'CHEK',
     );
 
     my $cust_pay = new FS::cust_pay ( {
@@ -1074,7 +1074,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.49 2002-10-13 01:05:29 ivan Exp $
+$Id: cust_bill.pm,v 1.50 2002-10-15 09:54:24 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From bc1639be3d9f32711b4740324c6de1f3bffb0124 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Oct 2002 11:17:50 +0000
Subject: another mason fix, this one from 5

---
 httemplate/search/cust_bill.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 586399a41..985e3dbf5 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -11,7 +11,7 @@ $limit .= "LIMIT $maxrecords" if $maxrecords;
 my $offset = $cgi->param('offset') || 0;
 $limit .= " OFFSET $offset" if $offset;
 
-my $total;
+my($total, $tot_amount, $tot_balance);
 
 my(@cust_bill);
 if ( $cgi->keywords ) {
-- 
cgit v1.2.1


From acfb0f48c226a5cba64fbe391677391128a6cbf7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Oct 2002 14:16:17 +0000
Subject: radacct update: use sqlradius for datasrc, not plandata options
 (whew)

---
 FS/FS/cust_pkg.pm            |  19 ++----
 FS/FS/cust_svc.pm            | 150 ++++++++++++++++++++++++-------------------
 FS/FS/part_svc.pm            |  15 +++--
 FS/FS/svc_acct.pm            |  15 +++--
 httemplate/edit/part_pkg.cgi |  13 +---
 httemplate/view/svc_acct.cgi |  16 +----
 6 files changed, 110 insertions(+), 118 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 803fa3c16..55ee37d9d 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -511,17 +511,11 @@ sub seconds_since {
 
 }
 
-=item seconds_since_sqlradacct TIMESTAMP_START TIMESTAMP_END DATASRC DB_USERNAME DB_PASSWORD
+=item seconds_since_sqlradacct TIMESTAMP_START TIMESTAMP_END
 
 Returns the numbers of seconds all accounts (see L<FS::svc_acct>) in this
 package have been online between TIMESTAMP_START (inclusive) and TIMESTAMP_END
-(exclusive), according to an external SQL radacct table, such as those
-generated by ICRADIUS or FreeRADIUS.  Sessions which started in the specified
-range but are still open are counted from session start to the end of the
-range.  Also, sessions which end in the range but started earlier are counted
-from the start of the range to session end.  Finally, sessions which start
-before the range but end after (or are still open) are counted for the entire
-range.
+(exclusive).
 
 TIMESTAMP_START and TIMESTAMP_END are specified as UNIX timestamps; see
 L<perlfunc/"time">.  Also see L<Time::Local> and L<Date::Parse> for conversion
@@ -531,17 +525,14 @@ functions.
 =cut
 
 sub seconds_since_sqlradacct {
-  my($self, $start, $end, $datasrc, $db_user, $db_pass) = @_;
-
-  my $dbh = DBI->connect($datasrc, $db_user, $db_pass)
-    or die "can't connect to $datasrc: ". $DBI::errstr;
+  my($self, $start, $end) = @_;
 
   my $seconds = 0;
 
   foreach my $cust_svc (
     grep { $_->part_svc->svcdb eq 'svc_acct' } $self->cust_svc
   ) {
-    $seconds += $cust_svc->seconds_since_sqlradacct($start, $end, $dbh);
+    $seconds += $cust_svc->seconds_since_sqlradacct($start, $end);
   }
 
   $seconds;
@@ -730,7 +721,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.26 2002-10-14 06:17:14 ivan Exp $
+$Id: cust_pkg.pm,v 1.27 2002-10-17 14:16:17 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 4fc663450..50d94452a 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -12,6 +12,7 @@ use FS::svc_acct;
 use FS::svc_domain;
 use FS::svc_forward;
 use FS::domain_record;
+use FS::part_export;
 
 @ISA = qw( FS::Record );
 
@@ -336,93 +337,110 @@ sub seconds_since {
   $sth->fetchrow_arrayref->[0];
 }
 
-=item seconds_since_sqlradacct TIMESTAMP_START TIMESTAMP_END ( DBI_DATABASE_HANDLE | DATASRC DB_USERNAME DB_PASSWORD )
+=item seconds_since_sqlradacct TIMESTAMP_START TIMESTAMP_END 
 
 See L<FS::svc_acct/seconds_since_sqlradacct>.  Equivalent to
 $cust_svc->svc_x->seconds_since, but more efficient.  Meaningless for records
 where B<svcdb> is not "svc_acct".
 
-NOTE: specifying a DATASRC/USERNAME/PASSWORD instead of a DBI database handle
-is not yet implemented.
-
 =cut
 
 #note: implementation here, POD in FS::svc_acct
 sub seconds_since_sqlradacct {
-  my($self, $start, $end, $dbh) = @_;
+  my($self, $start, $end) = @_;
 
   my $username = $self->svc_x->username;
 
-  #select a unix time conversion function based on database type
-  my $str2time;
-  if ( $dbh->{Driver}->{Name} eq 'mysql' ) {
-    $str2time = 'UNIX_TIMESTAMP(';
-  } elsif ( $dbh->{Driver}->{Name} eq 'Pg' ) {
-    $str2time = 'EXTRACT( EPOCH FROM ';
-  } else {
-    warn "warning: unknown database type ". $dbh->{Driver}->{Name}.
-         "; guessing how to convert to UNIX timestamps";
-    $str2time = 'extract(epoch from ';
+  my @part_export = $self->part_svc->part_export('sqlradius')
+    or die "no sqlradius export configured for this service type";
+    #or return undef;
+
+  my $seconds = 0;
+  foreach my $part_export ( @part_export ) {
+
+    my $dbh = DBI->connect( map { $part_export->option($_) }
+                            qw(datasrc username password)    )
+      or die "can't connect to sqlradius database: ". $DBI::errstr;
+  
+    #select a unix time conversion function based on database type
+    my $str2time;
+    if ( $dbh->{Driver}->{Name} eq 'mysql' ) {
+      $str2time = 'UNIX_TIMESTAMP(';
+    } elsif ( $dbh->{Driver}->{Name} eq 'Pg' ) {
+      $str2time = 'EXTRACT( EPOCH FROM ';
+    } else {
+      warn "warning: unknown database type ". $dbh->{Driver}->{Name}.
+           "; guessing how to convert to UNIX timestamps";
+      $str2time = 'extract(epoch from ';
+    }
+  
+    #find closed sessions completely within the given range
+    my $sth = $dbh->prepare("SELECT SUM(acctsessiontime)
+                               FROM radacct
+                               WHERE UserName = ?
+                                 AND $str2time AcctStartTime) >= ?
+                                 AND $str2time AcctStopTime ) <  ?
+                                 AND AcctStopTime =! 0
+                                 AND AcctStopTime IS NOT NULL"
+    ) or die $dbh->errstr;
+    $sth->execute($username, $start, $end) or die $sth->errstr;
+    my $regular = $sth->fetchrow_arrayref->[0];
+  
+    #find open sessions which start in the range, count session start->range end
+    # don't count them if they are over 1 day old (probably missing stop record)
+    $sth = $dbh->prepare("SELECT SUM( ? - $str2time AcctStartTime ) )
+                            FROM radacct
+                            WHERE UserName = ?
+                              AND $str2time AcctStartTime ) >= ?
+                              AND ( ? - $str2time AcctStartTime ) < 86400
+                              AND (    AcctStopTime = 0
+                                    OR AcctStopTime IS NULL )"
+    ) or die $dbh->errstr;
+    $sth->execute($end, $username, $start, $end) or die $sth->errstr;
+    my $start_during = $sth->fetchrow_arrayref->[0];
+  
+    #find closed sessions which start before the range but stop during,
+    #count range start->session end
+    $sth = $dbh->prepare("SELECT SUM( $str2time AcctStopTime ) - ? ) 
+                            FROM radacct
+                            WHERE UserName = ?
+                              AND $str2time AcctStartTime ) < ?
+                              AND $str2time AcctStopTime  ) >= ?
+                              AND $str2time AcctStopTime  ) <  ?
+                              AND AcctStopTime != 0
+                              AND AcctStopTime IS NOT NULL"
+    ) or die $dbh->errstr;
+    $sth->execute($start, $username, $start, $start, $end ) or die $sth->errstr;
+    my $end_during = $sth->fetchrow_arrayref->[0];
+  
+    #find closed (not anymore - or open) sessions which start before the range
+    # but stop # after, or are still open, count range start->range end
+    # don't count open sessions (probably missing stop record)
+    $sth = $dbh->prepare("SELECT COUNT(*)
+                            FROM radacct
+                            WHERE UserName = ?
+                              AND $str2time AcctStartTime ) < ?
+                              AND ( $str2time AcctStopTime ) >= ?
+                                                            )"
+                              #      OR AcctStopTime =  0
+                              #      OR AcctStopTime IS NULL )"
+    ) or die $dbh->errstr;
+    $sth->execute($username, $start, $end ) or die $sth->errstr;
+    my $entire_range = ($end-$start) * $sth->fetchrow_arrayref->[0];
+  
+    $seconds += $regular + $end_during + $start_during + $entire_range;
+
   }
 
-  #find sessions completely within the given range
-  my $sth = $dbh->prepare("SELECT SUM(acctsessiontime)
-                             FROM radacct
-                             WHERE UserName = ?
-                               AND $str2time AcctStartTime) >= ?
-                               AND $str2time AcctStopTime ) <  ?
-                               AND AcctStopTime =! 0
-                               AND AcctStopTime IS NOT NULL"
-  ) or die $dbh->errstr;
-  $sth->execute($username, $start, $end) or die $sth->errstr;
-  my $regular = $sth->fetchrow_arrayref->[0];
-
-  #find open sessions which start in the range, count session start->range end
-  $sth = $dbh->prepare("SELECT SUM( ? - $str2time AcctStartTime ) )
-                          FROM radacct
-                          WHERE UserName = ?
-                            AND AcctStartTime >= ?
-                            AND (    AcctStopTime = 0
-                                  OR AcctStopTime IS NULL )"
-  ) or die $dbh->errstr;
-  $sth->execute($end, $username, $start) or die $sth->errstr;
-  my $start_during = $sth->fetchrow_arrayref->[0];
-
-  #find closed sessions which start before the range but stop during,
-  #count range start->session end
-  $sth = $dbh->prepare("SELECT SUM( $str2time AcctStopTime ) - ? ) 
-                          FROM radacct
-                          WHERE UserName = ?
-                            AND AcctStartTime < ?
-                            AND AcctStopTime >= ?
-                            AND AcctStopTime <  ?
-                            AND AcctStopTime != 0
-                            AND AcctStopTime IS NOT NULL"
-  ) or die $dbh->errstr;
-  $sth->execute($start, $username, $start, $start, $end ) or die $sth->errstr;
-  my $end_during = $sth->fetchrow_arrayref->[0];
-
-  #find closed or open sessions which start before the range but stop
-  # after, or are still open, count range start->range end
-  $sth = $dbh->prepare("SELECT COUNT(*)
-                          FROM radacct
-                          WHERE UserName = ?
-                            AND AcctStartTime < ?
-                            AND (    AcctStopTime >= ?
-                                  OR AcctStopTime =  0
-                                  OR AcctStopTime IS NULL )"
-  ) or die $dbh->errstr;
-  $sth->execute($username, $start, $end ) or die $sth->errstr;
-  my $entire_range = ($end-$start) * $sth->fetchrow_arrayref->[0];
+  $seconds;
 
-  $regular + $end_during + $start_during + $entire_range;
 }
 
 =back
 
 =head1 VERSION
 
-$Id: cust_svc.pm,v 1.18 2002-10-12 13:26:45 ivan Exp $
+$Id: cust_svc.pm,v 1.19 2002-10-17 14:16:17 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 7c6acdbcd..06c15ed2a 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -286,22 +286,23 @@ sub all_part_svc_column {
   qsearch('part_svc_column', { 'svcpart' => $self->svcpart } );
 }
 
-=item part_export
+=item part_export [ EXPORTTYPE ]
+
+Returns all exports (see L<FS::part_export>) for this service, or, if an
+export type is specified, only returns exports of the given type.
 
 =cut
 
 sub part_export {
   my $self = shift;
-  map { qsearchs('part_export', { 'exportnum' => $_->exportnum } ) }
+  my %search;
+  $search{'exporttype'} = shift if @_;
+  map { qsearchs('part_export', { 'exportnum' => $_->exportnum, %search } ) }
     qsearch('export_svc', { 'svcpart' => $self->svcpart } );
 }
 
 =back
 
-=head1 VERSION
-
-$Id: part_svc.pm,v 1.14 2002-09-17 09:19:06 ivan Exp $
-
 =head1 BUGS
 
 Delete is unimplemented.
@@ -309,7 +310,7 @@ Delete is unimplemented.
 The list of svc_* tables is hardcoded.  When svc_acct_pop is renamed, this
 should be fixed.
 
-all_part_svc_column and part_export methods should be documented
+all_part_svc_column method should be documented
 
 =head1 SEE ALSO
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 3afee7f64..c41c30602 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -935,16 +935,17 @@ sub seconds_since {
   $self->cust_svc->seconds_since(@_);
 }
 
-=item seconds_since_sqlradacct TIMESTAMP_START TIMESTAMP_END DATASRC DB_USERNAME DB_PASSWORD
+=item seconds_since_sqlradacct TIMESTAMP_START TIMESTAMP_END
 
 Returns the numbers of seconds this account has been online between
 TIMESTAMP_START (inclusive) and TIMESTAMP_END (exclusive), according to an
-external SQL radacct table, such as those generated by ICRADIUS or FreeRADIUS.
-Sessions which started in the specified range but are still open are counted
-from session start to the end of the range.  Also, sessions which end in the
-range but started earlier are counted from the start of the range to session
-end.  Finally, sessions which start before the range but end after (or are
-still open) are counted for the entire range.
+external SQL radacct table, specified via sqlradius export.  Sessions which
+started in the specified range but are still open are counted from session
+start to the end of the range (unless they are over 1 day old, in which case
+they are presumed missing their stop record and not counted).  Also, sessions
+which end in therange but started earlier are counted from the start of the
+range to session end.  Finally, sessions which start before the range but end
+after are counted for the entire range.
 
 TIMESTAMP_START and TIMESTAMP_END are specified as UNIX timestamps; see
 L<perlfunc/"time">.  Also see L<Time::Local> and L<Date::Parse> for conversion
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 5fbcd0bd1..187578a35 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -356,7 +356,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'sqlradacct_hour' => {
-    'name' => 'Base charge plus charge per-hour from an external SQL radacct table',
+    'name' => 'Base charge plus charge per-hour from an external sqlradius radacct table',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -364,15 +364,6 @@ tie my %plans, 'Tie::IxHash',
       'recur_flat' => { 'name' => 'Base monthly charge for this package',
                         'default' => 0,
                       },
-      'sql_datasrc' => { 'name' => 'DBI data source',
-                         'default' => 'DBI:mysql:host=radius.server.name;dbname=radius',
-                       },
-      'sql_username' => { 'name' => 'Database username',
-                          'default' => 'radius',
-                        },
-      'sql_password' => { 'name' => 'Database password',
-                          'default' => '',
-                        },
       'recur_included_hours' => { 'name' => 'Hours included',
                                   'default' => 0,
                                 },
@@ -382,7 +373,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $hours = $cust_pkg->seconds_since_sqlradacct($cust_pkg->last_bill, $sdate, \' + what.sql_datasrc + \', \' + what.sql_username + \', \' + what.sql_password + \' ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
+    'recur' => '\'my $hours = $cust_pkg->seconds_since_sqlradacct($cust_pkg->last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
   },
 
 
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index e755f87d7..dd242b980 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -146,21 +146,11 @@ print '<TR><TD ALIGN="right">RADIUS groups</TD><TD BGCOLOR="#ffffff">'.
 
 print '</TABLE></TD></TR></TABLE><BR><BR>';
 
-if ( $cust_pkg && $cust_pkg->part_pkg->plan eq 'sqlradacct_hour' ) {
-
-  #false laziness w/httemplate/edit/part_pkg... this stuff doesn't really
-  #belong in plan data
-  my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
-                    split("\n", $cust_pkg->part_pkg->plandata );
+#if ( $cust_pkg && $cust_pkg->part_pkg->plan eq 'sqlradacct_hour' ) {
+if ( $cust_pkg && $part_svc->part_export('sqlradius') ) {
 
   my $last_bill = $cust_pkg->last_bill;
-  my $seconds = $svc_acct->seconds_since_sqlradacct(
-    $last_bill,
-    time,
-    $plandata{sql_datasrc},
-    $plandata{sql_username},
-    $plandata{sql_password},
-  );
+  my $seconds = $svc_acct->seconds_since_sqlradacct( $last_bill, time );
   my $h = int($seconds/3600);
   my $m = int( ($seconds%3600) / 60 );
   my $s = $seconds%60;
-- 
cgit v1.2.1


From 8dc221c91266dc284655942bb5de6392beecbbb3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Oct 2002 14:33:13 +0000
Subject: sqlradacct hour update

---
 httemplate/view/svc_acct.cgi | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index dd242b980..d50241d40 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -147,20 +147,36 @@ print '<TR><TD ALIGN="right">RADIUS groups</TD><TD BGCOLOR="#ffffff">'.
 print '</TABLE></TD></TR></TABLE><BR><BR>';
 
 #if ( $cust_pkg && $cust_pkg->part_pkg->plan eq 'sqlradacct_hour' ) {
-if ( $cust_pkg && $part_svc->part_export('sqlradius') ) {
+if ( $part_svc->part_export('sqlradius') ) {
+
+  my $last_bill;
+  if ( $cust_pkg ) {
+    #false laziness w/httemplate/edit/part_pkg... this stuff doesn't really
+    #belong in plan data
+     my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
+                      split("\n", $cust_pkg->part_pkg->plandata );
+
+    $last_bill = $cust_pkg->last_bill;
+  } else {
+    $last_bill = 0;
+  }
 
-  my $last_bill = $cust_pkg->last_bill;
   my $seconds = $svc_acct->seconds_since_sqlradacct( $last_bill, time );
   my $h = int($seconds/3600);
   my $m = int( ($seconds%3600) / 60 );
   my $s = $seconds%60;
+
   if ( $seconds ) {
-    print 'Online $h h $m m $s s this billing cycle (since '.
-          time2str(%C, $last_bill). ') - '. 
+    print "Online ${h}h ${m}m ${s}s";
+  } else {
+    print 'Has not logged on';
+  }
+
+  if ( $cust_pkg ) {
+    print ' this billing cycle (since '. time2str(%C, $last_bill). ') - '. 
           $plandata{recur_included_hours}. ' total hours in plan<BR><BR>';
   } else {
-    print 'Has not logged on this billing cycle (since '.
-          time2str(%C, $last_bill). ')<BR><BR>';
+    print ' (no billing cycle available for unaudited package)<BR><BR>';
   }
 
 }
-- 
cgit v1.2.1


From dbcf3603c7929de3a0f2011d6516b996541e93fa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Oct 2002 14:37:58 +0000
Subject: fix sqlradacct calculations for old Pg

---
 FS/FS/cust_svc.pm | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 50d94452a..bed6a0ab3 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -380,7 +380,7 @@ sub seconds_since_sqlradacct {
                                WHERE UserName = ?
                                  AND $str2time AcctStartTime) >= ?
                                  AND $str2time AcctStopTime ) <  ?
-                                 AND AcctStopTime =! 0
+                                 AND $str2time AcctStopTime ) =! 0
                                  AND AcctStopTime IS NOT NULL"
     ) or die $dbh->errstr;
     $sth->execute($username, $start, $end) or die $sth->errstr;
@@ -393,7 +393,7 @@ sub seconds_since_sqlradacct {
                             WHERE UserName = ?
                               AND $str2time AcctStartTime ) >= ?
                               AND ( ? - $str2time AcctStartTime ) < 86400
-                              AND (    AcctStopTime = 0
+                              AND (    $str2time AcctStopTime ) = 0
                                     OR AcctStopTime IS NULL )"
     ) or die $dbh->errstr;
     $sth->execute($end, $username, $start, $end) or die $sth->errstr;
@@ -407,7 +407,7 @@ sub seconds_since_sqlradacct {
                               AND $str2time AcctStartTime ) < ?
                               AND $str2time AcctStopTime  ) >= ?
                               AND $str2time AcctStopTime  ) <  ?
-                              AND AcctStopTime != 0
+                              AND $str2time AcctStopTime ) != 0
                               AND AcctStopTime IS NOT NULL"
     ) or die $dbh->errstr;
     $sth->execute($start, $username, $start, $start, $end ) or die $sth->errstr;
@@ -438,10 +438,6 @@ sub seconds_since_sqlradacct {
 
 =back
 
-=head1 VERSION
-
-$Id: cust_svc.pm,v 1.19 2002-10-17 14:16:17 ivan Exp $
-
 =head1 BUGS
 
 Behaviour of changing the svcpart of cust_svc records is undefined and should
-- 
cgit v1.2.1


From ee083facc9f4e18f27df07f829b224366483a56e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Oct 2002 14:46:04 +0000
Subject: really fix sqlradacct for old Pg

---
 FS/FS/cust_svc.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index bed6a0ab3..6ce12cbe9 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -380,7 +380,7 @@ sub seconds_since_sqlradacct {
                                WHERE UserName = ?
                                  AND $str2time AcctStartTime) >= ?
                                  AND $str2time AcctStopTime ) <  ?
-                                 AND $str2time AcctStopTime ) =! 0
+                                 AND $str2time AcctStopTime ) > 0
                                  AND AcctStopTime IS NOT NULL"
     ) or die $dbh->errstr;
     $sth->execute($username, $start, $end) or die $sth->errstr;
@@ -407,7 +407,7 @@ sub seconds_since_sqlradacct {
                               AND $str2time AcctStartTime ) < ?
                               AND $str2time AcctStopTime  ) >= ?
                               AND $str2time AcctStopTime  ) <  ?
-                              AND $str2time AcctStopTime ) != 0
+                              AND $str2time AcctStopTime ) > 0
                               AND AcctStopTime IS NOT NULL"
     ) or die $dbh->errstr;
     $sth->execute($start, $username, $start, $start, $end ) or die $sth->errstr;
-- 
cgit v1.2.1


From 23bc7fbb197d8dc58ddab651c49f825324044614 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Oct 2002 14:50:11 +0000
Subject: *sigh* better debugging

---
 FS/FS/cust_svc.pm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 6ce12cbe9..d6ed7ee6b 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -373,6 +373,8 @@ sub seconds_since_sqlradacct {
            "; guessing how to convert to UNIX timestamps";
       $str2time = 'extract(epoch from ';
     }
+
+    my $query;
   
     #find closed sessions completely within the given range
     my $sth = $dbh->prepare("SELECT SUM(acctsessiontime)
@@ -387,16 +389,16 @@ sub seconds_since_sqlradacct {
     my $regular = $sth->fetchrow_arrayref->[0];
   
     #find open sessions which start in the range, count session start->range end
-    # don't count them if they are over 1 day old (probably missing stop record)
-    $sth = $dbh->prepare("SELECT SUM( ? - $str2time AcctStartTime ) )
-                            FROM radacct
-                            WHERE UserName = ?
-                              AND $str2time AcctStartTime ) >= ?
-                              AND ( ? - $str2time AcctStartTime ) < 86400
-                              AND (    $str2time AcctStopTime ) = 0
-                                    OR AcctStopTime IS NULL )"
-    ) or die $dbh->errstr;
-    $sth->execute($end, $username, $start, $end) or die $sth->errstr;
+    $query = "SELECT SUM( ? - $str2time AcctStartTime ) )
+                FROM radacct
+                WHERE UserName = ?
+                  AND $str2time AcctStartTime ) >= ?
+                  AND ( ? - $str2time AcctStartTime ) < 86400
+                  AND (    $str2time AcctStopTime ) = 0
+                                    OR AcctStopTime IS NULL )";
+    $sth = $dbh->prepare($query) or die $dbh->errstr;
+    $sth->execute($end, $username, $start, $end)
+      or die $sth->errstr. " executing query $query";
     my $start_during = $sth->fetchrow_arrayref->[0];
   
     #find closed sessions which start before the range but stop during,
-- 
cgit v1.2.1


From d6ebf4c35d7c7b7d559828bfac3744c770dbf3eb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Oct 2002 14:59:29 +0000
Subject: yay missing paren

---
 FS/FS/cust_svc.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index d6ed7ee6b..211b0ad23 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -393,7 +393,7 @@ sub seconds_since_sqlradacct {
                 FROM radacct
                 WHERE UserName = ?
                   AND $str2time AcctStartTime ) >= ?
-                  AND ( ? - $str2time AcctStartTime ) < 86400
+                  AND ( ? - $str2time AcctStartTime ) ) < 86400
                   AND (    $str2time AcctStopTime ) = 0
                                     OR AcctStopTime IS NULL )";
     $sth = $dbh->prepare($query) or die $dbh->errstr;
-- 
cgit v1.2.1


From 2f91e1d377e1e03f567ea1ec6bcd9fab0bedff5e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Oct 2002 15:05:55 +0000
Subject: UI change for hour info

---
 httemplate/view/svc_acct.cgi | 70 ++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index d50241d40..c79f71f5d 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -56,6 +56,41 @@ function areyousure(href) {
 
 <%
 
+#if ( $cust_pkg && $cust_pkg->part_pkg->plan eq 'sqlradacct_hour' ) {
+if ( $part_svc->part_export('sqlradius') ) {
+
+  my $last_bill;
+  if ( $cust_pkg ) {
+    #false laziness w/httemplate/edit/part_pkg... this stuff doesn't really
+    #belong in plan data
+     my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
+                      split("\n", $cust_pkg->part_pkg->plandata );
+
+    $last_bill = $cust_pkg->last_bill;
+  } else {
+    $last_bill = 0;
+  }
+
+  my $seconds = $svc_acct->seconds_since_sqlradacct( $last_bill, time );
+  my $h = int($seconds/3600);
+  my $m = int( ($seconds%3600) / 60 );
+  my $s = $seconds%60;
+
+  if ( $seconds ) {
+    print "Online <B>$h</B>h <B>$m</B>m <B>$s</B>s";
+  } else {
+    print 'Has not logged on';
+  }
+
+  if ( $cust_pkg ) {
+    print ' this billing cycle (since '. time2str(%C, $last_bill). ') - '. 
+          $plandata{recur_included_hours}. ' total hours in plan<BR><BR>';
+  } else {
+    print ' (no billing cycle available for unaudited package)<BR><BR>';
+  }
+
+}
+
 #print qq!<BR><A HREF="../misc/sendconfig.cgi?$svcnum">Send account information</A>!;
 
 print qq!<A HREF="${p}edit/svc_acct.cgi?$svcnum">Edit this information</A><BR>!.
@@ -146,41 +181,6 @@ print '<TR><TD ALIGN="right">RADIUS groups</TD><TD BGCOLOR="#ffffff">'.
 
 print '</TABLE></TD></TR></TABLE><BR><BR>';
 
-#if ( $cust_pkg && $cust_pkg->part_pkg->plan eq 'sqlradacct_hour' ) {
-if ( $part_svc->part_export('sqlradius') ) {
-
-  my $last_bill;
-  if ( $cust_pkg ) {
-    #false laziness w/httemplate/edit/part_pkg... this stuff doesn't really
-    #belong in plan data
-     my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
-                      split("\n", $cust_pkg->part_pkg->plandata );
-
-    $last_bill = $cust_pkg->last_bill;
-  } else {
-    $last_bill = 0;
-  }
-
-  my $seconds = $svc_acct->seconds_since_sqlradacct( $last_bill, time );
-  my $h = int($seconds/3600);
-  my $m = int( ($seconds%3600) / 60 );
-  my $s = $seconds%60;
-
-  if ( $seconds ) {
-    print "Online ${h}h ${m}m ${s}s";
-  } else {
-    print 'Has not logged on';
-  }
-
-  if ( $cust_pkg ) {
-    print ' this billing cycle (since '. time2str(%C, $last_bill). ') - '. 
-          $plandata{recur_included_hours}. ' total hours in plan<BR><BR>';
-  } else {
-    print ' (no billing cycle available for unaudited package)<BR><BR>';
-  }
-
-}
-
 print join("\n", $conf->config('svc_acct-notes') ).  '<BR><BR>'.
       joblisting({'svcnum'=>$svcnum}, 1). '</BODY></HTML>';
 
-- 
cgit v1.2.1


From 497bd20a2aa6a33cff22c25232929b3d7aeaac86 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Oct 2002 15:06:48 +0000
Subject: use consistant terminology

---
 httemplate/view/svc_acct.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index c79f71f5d..3fb9156cc 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -86,7 +86,7 @@ if ( $part_svc->part_export('sqlradius') ) {
     print ' this billing cycle (since '. time2str(%C, $last_bill). ') - '. 
           $plandata{recur_included_hours}. ' total hours in plan<BR><BR>';
   } else {
-    print ' (no billing cycle available for unaudited package)<BR><BR>';
+    print ' (no billing cycle available for unaudited account)<BR><BR>';
   }
 
 }
-- 
cgit v1.2.1


From 94fb4aafeae9abf099a8a4ee87b72de86c812ce0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Oct 2002 10:28:46 +0000
Subject: adding

---
 FS/MANIFEST              |  3 ++
 FS/bin/freeside-radgroup | 76 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 FS/bin/freeside-radgroup

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 24fef1748..e37216e19 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -17,7 +17,10 @@ bin/freeside-deluser
 bin/freeside-setup
 bin/freeside-setinvoice
 bin/freeside-overdue
+bin/freeside-radgroup
 bin/freeside-receivables-report
+bin/freeside-sqlradius-radacctd
+bin/freeside-sqlradius-reset
 bin/freeside-tax-report
 bin/freeside-cc-receipts-report
 bin/freeside-credit-report
diff --git a/FS/bin/freeside-radgroup b/FS/bin/freeside-radgroup
new file mode 100644
index 000000000..e1a819788
--- /dev/null
+++ b/FS/bin/freeside-radgroup
@@ -0,0 +1,76 @@
+#!/usr/bin/perl -w
+
+use strict;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch);
+use FS::cust_svc;
+use FS::svc_acct;
+
+&untaint_argv;  #what it sounds like  (eww)
+
+my($user, $action, $groupname, $svcpart) = @ARGV;
+
+adminsuidsetup $user;
+
+my @svc_acct = map { $_->svc_x } qsearch('cust_svc', { svcpart => $svcpart } );
+
+if ( lc($action) eq 'add' ) {
+  foreach my $svc_acct ( @svc_acct ) {
+    my @groups = $svc_acct->radius_groups;
+    next if grep { $_ eq $groupname } @groups;
+    push @groups, $groupname;
+    my %hash = $svc_acct->hash;
+    $hash{radius_groups} = \@groups;
+    my $new = new FS::svc_acct \%hash;
+    my $error = $new->replace($svc_acct);
+    die $error if $error;
+  }
+} else {
+  die &usage;
+}
+
+# subroutines
+
+sub untaint_argv {
+  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
+    $ARGV[$_] =~ /^(.*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
+    $ARGV[$_]=$1;
+  }
+}
+
+sub usage {
+  die "Usage:\n\n  freeside-radgroup user action groupname svcpart\n";
+}
+
+=head1 NAME
+
+freeside-radgroup - Command line utility to manipulate radius groups
+
+=head1 SYNOPSIS
+
+  freeside-addgroup user action groupname svcpart 
+
+=head1 DESCRIPTION
+
+  B<user> is a freeside user as added with freeside-adduser.
+
+  B<command> is the action to take.  Available actions are: I<add>
+
+  B<groupname> is the group to add (or remove, etc.)
+
+  B<svcpart> specifies which accounts will be updated.
+
+=head1 EXAMPLES
+
+freeside-radgroup freesideuser add groupname 3
+
+Adds I<groupname> to all accounts with service definition 3.
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<freeside-adduser>, L<FS::svc_acct>, L<FS::part_svc>
+
+=cut
+
-- 
cgit v1.2.1


From b75341fcfedbdcb2d39c6616690a1d59e4b233fc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Oct 2002 13:23:27 +0000
Subject: don't re-insert non-changed usernames to fuzzy cache

---
 FS/FS/svc_acct.pm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index c41c30602..b33f3ae29 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -562,18 +562,19 @@ sub replace {
     return $error if $error;
   }
 
-  #false laziness with sub insert (and cust_main)
-  my $queue = new FS::queue {
-    'svcnum' => $new->svcnum,
-    'job'    => 'FS::svc_acct::append_fuzzyfiles'
-  };
-  $error = $queue->insert($new->username);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "queueing job (transaction rolled back): $error";
+  if ( $new->username ne $old->username ) {
+    #false laziness with sub insert (and cust_main)
+    my $queue = new FS::queue {
+      'svcnum' => $new->svcnum,
+      'job'    => 'FS::svc_acct::append_fuzzyfiles'
+    };
+    $error = $queue->insert($new->username);
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
   }
 
-
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
 }
-- 
cgit v1.2.1


From 9b1a8ec900ec1f5cd7d1f622f49066510c8f547c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Oct 2002 13:28:03 +0000
Subject: argh

---
 FS/bin/freeside-radgroup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-radgroup b/FS/bin/freeside-radgroup
index e1a819788..ed85626d2 100644
--- a/FS/bin/freeside-radgroup
+++ b/FS/bin/freeside-radgroup
@@ -20,7 +20,7 @@ if ( lc($action) eq 'add' ) {
     next if grep { $_ eq $groupname } @groups;
     push @groups, $groupname;
     my %hash = $svc_acct->hash;
-    $hash{radius_groups} = \@groups;
+    $hash{usergroup} = \@groups;
     my $new = new FS::svc_acct \%hash;
     my $error = $new->replace($svc_acct);
     die $error if $error;
-- 
cgit v1.2.1


From f3175f9f238b54db37d701a7a7a5ede425b5753b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Oct 2002 16:54:01 +0000
Subject: force executable permissions on bin/pod2x

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index b2b2fcdbc..c47720b80 100644
--- a/Makefile
+++ b/Makefile
@@ -95,6 +95,7 @@ htmlman:
 	[ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
 	[ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
 	[ -e ./httemplate/docs/man/FS/part_export ] || mkdir httemplate/docs/man/FS/part_export
+	chmod a+rx bin/pod2x
 	[ -e DONT_REBUILD_DOCS ] || bin/pod2x
 
 forcehtmlman:
-- 
cgit v1.2.1


From e6f6f496883b8e8be42f4d92f01b61dbc2c590be Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 20 Oct 2002 03:28:23 +0000
Subject: vpopmail restart export option

---
 FS/FS/part_export.pm          |  3 +++
 FS/FS/part_export/vpopmail.pm | 29 ++++++++++++++++++-----------
 eg/vpopmailrestart            | 11 -----------
 3 files changed, 21 insertions(+), 22 deletions(-)
 delete mode 100755 eg/vpopmailrestart

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 1b402e014..c9ae41fc1 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -643,6 +643,9 @@ tie my %vpopmail_options, 'Tie::IxHash',
   'dir'     => { label=>'directory', }, # ?more info? default?
   'uid'     => { label=>'vpopmail uid' },
   'gid'     => { label=>'vpopmail gid' },
+  'restart' => { label=> 'vpopmail restart command',
+                 default=> 'cd /home/vpopmail/domains; for domain in *; do /home/vpopmail/bin/vmkpasswd $domain; done; /var/qmail/bin/qmail-newu; killall -HUP qmail-send',
+               },
 ;
 
 tie my %bind_options, 'Tie::IxHash',
diff --git a/FS/FS/part_export/vpopmail.pm b/FS/FS/part_export/vpopmail.pm
index 2ca44016a..bddf175ee 100644
--- a/FS/FS/part_export/vpopmail.pm
+++ b/FS/FS/part_export/vpopmail.pm
@@ -19,6 +19,7 @@ sub _export_insert {
     crypt($svc_acct->_password,$saltset[int(rand(64))].$saltset[int(rand(64))]),
     $svc_acct->domain,
     $svc_acct->quota,
+    $svc_acct->finger,
   );
 }
 
@@ -46,7 +47,7 @@ sub _export_replace {
   return '' unless $old->_password ne $new->_password;
 
   $self->vpopmail_queue( $new->svcnum, 'replace',
-    $new->username, $cpassword, $new->domain, $new->quota );
+    $new->username, $cpassword, $new->domain, $new->quota, $new->finger );
 }
 
 sub _export_delete {
@@ -77,13 +78,14 @@ sub vpopmail_queue {
     $self->option('dir'),
     $self->option('uid'),
     $self->option('gid'),
+    $self->option('restart'),
     @_
   );
 }
 
 sub vpopmail_insert { #subroutine, not method
-  my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
-  my( $username, $password, $domain, $quota ) = @_;
+  my( $exportdir, $machine, $dir, $uid, $gid, $restart ) = splice @_,0,6;
+  my( $username, $password, $domain, $quota, $finger ) = @_;
 
   mkdir "$exportdir/domains/$domain", 0700 or die $!
     unless -d "$exportdir/domains/$domain";
@@ -112,13 +114,13 @@ sub vpopmail_insert { #subroutine, not method
     mkdir $mkdir, 0700 or die "can't mkdir $mkdir: $!";
   }
 
-  vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid );
+  vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid, $restart );
 
 }
 
 sub vpopmail_replace { #subroutine, not method
-  my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
-  my( $username, $password, $domain ) = @_;
+  my( $exportdir, $machine, $dir, $uid, $gid, $restart ) = splice @_,0,6;
+  my( $username, $password, $domain, $quota, $finger ) = @_;
   
   (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
     and flock(VPASSWD,LOCK_EX)
@@ -140,7 +142,7 @@ sub vpopmail_replace { #subroutine, not method
       '1',
       '0',
       $finger,
-      $dir,
+      "$dir/domains/$domain/$username", #$vdir
       $quota ? $quota.'S' : 'NOQUOTA',
     ), "\n";
   }
@@ -153,12 +155,12 @@ sub vpopmail_replace { #subroutine, not method
   flock(VPASSWD,LOCK_UN);
   close(VPASSWD);
 
-  vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid );
+  vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid, $restart );
 
 }
 
 sub vpopmail_delete { #subroutine, not method
-  my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
+  my( $exportdir, $machine, $dir, $uid, $gid, $restart ) = splice @_,0,6;
   my( $username, $domain ) = @_;
   
   (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
@@ -185,11 +187,11 @@ sub vpopmail_delete { #subroutine, not method
   rmtree "$exportdir/domains/$domain/$username"
     or die "can't rmtree $exportdir/domains/$domain/$username: $!";
 
-  vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid );
+  vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid, $restart );
 }
 
 sub vpopmail_sync {
-  my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
+  my( $exportdir, $machine, $dir, $uid, $gid, $restart ) = splice @_,0,6;
   
   chdir $exportdir;
 #  my @args = ( $rsync, "-rlpt", "-e", $ssh, "domains/",
@@ -214,6 +216,11 @@ sub vpopmail_sync {
         'STDERR: '. join(" / ", $rsync->err). ', '.
         'STDOUT: '. join(" / ", $rsync->out);
   }
+
+  eval "use Net::SSH;";
+  die $@ if $@;
+
+  ssh("vpopmail\@$machine", $restart);
 }
 
 
diff --git a/eg/vpopmailrestart b/eg/vpopmailrestart
deleted file mode 100755
index c716e2e2b..000000000
--- a/eg/vpopmailrestart
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-for domain in /home/vpopmail/domains/*
-do
-  /home/vpopmail/bin/vmkpasswd `/bin/basename $domain`
-done
-
-/var/qmail/bin/qmail-newu
-
-killall -HUP qmail-send
-
-- 
cgit v1.2.1


From e31feacedbd07e333183b83360d20d21bcb611bd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 20 Oct 2002 07:26:54 +0000
Subject: don't run restart command unless there is one

---
 FS/FS/part_export/vpopmail.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export/vpopmail.pm b/FS/FS/part_export/vpopmail.pm
index bddf175ee..646af44cd 100644
--- a/FS/FS/part_export/vpopmail.pm
+++ b/FS/FS/part_export/vpopmail.pm
@@ -220,7 +220,7 @@ sub vpopmail_sync {
   eval "use Net::SSH;";
   die $@ if $@;
 
-  ssh("vpopmail\@$machine", $restart);
+  ssh("vpopmail\@$machine", $restart) if $restart;
 }
 
 
-- 
cgit v1.2.1


From d927a8b53105cb9b715f6d6f430e3bfee3fcfd95 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 20 Oct 2002 08:27:52 +0000
Subject: enable shellcommands suspension/unsuspension hooks

---
 FS/FS/part_export.pm               | 24 ++++++++++++++++++++++++
 FS/FS/part_export/shellcommands.pm | 10 ++++++++++
 2 files changed, 34 insertions(+)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index c9ae41fc1..5d725ab22 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -552,6 +552,18 @@ tie my %shellcommands_options, 'Tie::IxHash',
                        type =>'textarea',
                        default=>'',
                      },
+  'suspend' => { label=>'Suspension command',
+                 default=>'',
+               },
+  'suspend_stdin' => { label=>'Suspension command STDIN',
+                       default=>'',
+                     },
+  'unsuspend' => { label=>'Unsuspension command',
+                   default=>'',
+                 },
+  'unsuspend_stdin' => { label=>'Unsuspension command STDIN',
+                         default=>'',
+                       },
 ;
 
 tie my %shellcommands_withdomain_options, 'Tie::IxHash',
@@ -577,6 +589,18 @@ tie my %shellcommands_withdomain_options, 'Tie::IxHash',
                        type =>'textarea',
                        #default=>"$_password\n$_password\n",
                      },
+  'suspend' => { label=>'Suspension command',
+                 default=>'',
+               },
+  'suspend_stdin' => { label=>'Suspension command STDIN',
+                       default=>'',
+                     },
+  'unsuspend' => { label=>'Unsuspension command',
+                   default=>'',
+                 },
+  'unsuspend_stdin' => { label=>'Unsuspension command STDIN',
+                         default=>'',
+                       },
 ;
 
 tie my %www_shellcommands_options, 'Tie::IxHash',
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index a514f9375..da6f4c46c 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -20,6 +20,16 @@ sub _export_delete {
   $self->_export_command('userdel', @_);
 }
 
+sub _export_suspend {
+  my($self) = shift;
+  $self->_export_command('suspend', @_);
+}
+
+sub _export_unsuspend {
+  my($self) = shift;
+  $self->_export_command('unsuspend', @_);
+}
+
 sub _export_command {
   my ( $self, $action, $svc_acct) = (shift, shift, shift);
   my $command = $self->option($action);
-- 
cgit v1.2.1


From f076e082da5f5ec892e2ff6919e478baa1fd2274 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Oct 2002 15:14:07 +0000
Subject: Prevent a fixed or default username or password from being defined

---
 httemplate/edit/part_svc.cgi | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index b2862f5a3..f1d42f341 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -80,7 +80,10 @@ my %defs = (
                      select_key   => 'popnum',
                      select_label => 'city',
                    },
-    'username'  => 'Username',
+    'username'  => {
+                      desc => 'Username',
+                      type => 'disabled',
+                   },
     'quota'     => '',
     '_password' => 'Password',
     'gid'       => 'GID (when blank, defaults to UID)',
@@ -188,15 +191,20 @@ my %defs = (
         $html .= "<TR><TD>$field";
         $html .= "- <FONT SIZE=-1>$desc</FONT>" if $desc;
         $html .=  "</TD>";
-        $html .=
-          qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE=""!.
-          ' CHECKED'x($flag eq ''). ">Off</TD>".
-          qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="D"!.
-          ' CHECKED'x($flag eq 'D'). ">Default ".
-          qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="F"!.
-          ' CHECKED'x($flag eq 'F'). ">Fixed ".
-          '<BR>';
         if ( ref($def) ) {
+          $flag = '' if $def->{type} eq 'disabled';
+          $html .=
+            qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE=""!.
+            ' CHECKED'x($flag eq ''). ">Off</TD>".
+            '<TD>';
+          unless ( $def->{type} eq 'disabled' ) {
+            $html .= 
+              qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="D"!.
+              ' CHECKED'x($flag eq 'D'). ">Default ".
+              qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="F"!.
+              ' CHECKED'x($flag eq 'F'). ">Fixed ".
+              '<BR>';
+          }
           if ( $def->{type} eq 'select' ) {
             $html .= qq!<SELECT NAME="${layer}__${field}">!;
             $html .= '<OPTION> </OPTION>' unless $value;
@@ -210,6 +218,9 @@ my %defs = (
           } elsif ( $def->{type} eq 'radius_usergroup_selector' ) {
             $html .= FS::svc_acct::radius_usergroup_selector(
               [ split(',', $value) ], "${layer}__${field}" );
+          } elsif ( $def->{type} eq 'disabled' ) {
+            $html .=
+              qq!<INPUT TYPE="hidden" NAME="${layer}__${field}" VALUE="">!;
           } else {
             $html .= '<font color="#ff0000">unknown type'. $def->{type};
           }
-- 
cgit v1.2.1


From 7c220a811b73a1d237cf0ffd09c48a80ff985a3b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Oct 2002 15:20:41 +0000
Subject: don't disable for all items

---
 httemplate/edit/part_svc.cgi | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index f1d42f341..5fbec4f88 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -191,20 +191,20 @@ my %defs = (
         $html .= "<TR><TD>$field";
         $html .= "- <FONT SIZE=-1>$desc</FONT>" if $desc;
         $html .=  "</TD>";
+        $flag = '' if ref($def) && $def->{type} eq 'disabled';
+        $html .=
+          qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE=""!.
+          ' CHECKED'x($flag eq ''). ">Off</TD>".
+          '<TD>';
+        unless ( ref($def) && $def->{type} eq 'disabled' ) {
+          $html .= 
+            qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="D"!.
+            ' CHECKED'x($flag eq 'D'). ">Default ".
+            qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="F"!.
+            ' CHECKED'x($flag eq 'F'). ">Fixed ".
+            '<BR>';
+        }
         if ( ref($def) ) {
-          $flag = '' if $def->{type} eq 'disabled';
-          $html .=
-            qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE=""!.
-            ' CHECKED'x($flag eq ''). ">Off</TD>".
-            '<TD>';
-          unless ( $def->{type} eq 'disabled' ) {
-            $html .= 
-              qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="D"!.
-              ' CHECKED'x($flag eq 'D'). ">Default ".
-              qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="F"!.
-              ' CHECKED'x($flag eq 'F'). ">Fixed ".
-              '<BR>';
-          }
           if ( $def->{type} eq 'select' ) {
             $html .= qq!<SELECT NAME="${layer}__${field}">!;
             $html .= '<OPTION> </OPTION>' unless $value;
-- 
cgit v1.2.1


From 37e3aa89ddad4fce6b5829946925ce53745cdcc3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Oct 2002 06:28:13 +0000
Subject: oops - allow adding CHECK invoice events too

---
 httemplate/edit/part_bill_event.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 1b20ef1d2..5486b1855 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -41,7 +41,7 @@ print ntable("#cccccc",2), <<END;
 <TR><TD ALIGN="right">Payby</TD><TD><SELECT NAME="payby">
 END
 
-for (qw(CARD BILL COMP)) {
+for (qw(CARD CHEK BILL COMP)) {
   print qq!<OPTION VALUE="$_"!;
   if ($part_bill_event->payby eq $_) {
     print " SELECTED>$_</OPTION>";
-- 
cgit v1.2.1


From 28a584bc4a0ea3e868871cf1e2471e6412bfb3f3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Oct 2002 08:13:06 +0000
Subject: ACH fixes from s5

---
 FS/FS/part_bill_event.pm            | 4 ++--
 httemplate/edit/part_bill_event.cgi | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
index 991616bb8..e86b5c1fb 100644
--- a/FS/FS/part_bill_event.pm
+++ b/FS/FS/part_bill_event.pm
@@ -37,7 +37,7 @@ FS::Record.  The following fields are currently supported:
 
 =item eventpart - primary key
 
-=item payby - CARD, BILL, or COMP
+=item payby - CARD, CHEK, BILL, or COMP
 
 =item event - event name
 
@@ -140,7 +140,7 @@ sub check {
   }
 
   my $error = $self->ut_numbern('eventpart')
-    || $self->ut_enum('payby', [qw( CARD BILL COMP )] )
+    || $self->ut_enum('payby', [qw( CARD CHEK BILL COMP )] )
     || $self->ut_text('event')
     || $self->ut_anything('eventcode')
     || $self->ut_number('seconds')
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 5486b1855..70aca99eb 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -108,6 +108,12 @@ tie my %events, 'Tie::IxHash',
     'weight' => 30,
   },
 
+  'realtime-check' => {
+    'name' => 'Run check with a <a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a> realtime gateway',
+    'code' => '$cust_bill->realtime_ach();',
+    'weight' => 30,
+  },
+
   'batch-card' => {
     'name' => 'Add card to the pending credit card batch',
     'code' => '$cust_bill->batch_card();',
-- 
cgit v1.2.1


From b7440710b9bca319aba4d2782b8fdcf076abe2b7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Oct 2002 09:15:59 +0000
Subject: bugfix in vpopmail restart

---
 FS/FS/part_export/vpopmail.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export/vpopmail.pm b/FS/FS/part_export/vpopmail.pm
index 646af44cd..a505a0f47 100644
--- a/FS/FS/part_export/vpopmail.pm
+++ b/FS/FS/part_export/vpopmail.pm
@@ -217,7 +217,7 @@ sub vpopmail_sync {
         'STDOUT: '. join(" / ", $rsync->out);
   }
 
-  eval "use Net::SSH;";
+  eval "use Net::SSH qw(ssh);";
   die $@ if $@;
 
   ssh("vpopmail\@$machine", $restart) if $restart;
-- 
cgit v1.2.1


From 9f96bd19b87cb0084dda17da070f3bb5dadd4823 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Oct 2002 15:49:44 +0000
Subject: add option to unapply payments

---
 FS/FS/Conf.pm                        |  7 +++++++
 httemplate/misc/unapply-cust_pay.cgi | 18 ++++++++++++++++++
 httemplate/view/cust_main.cgi        | 11 ++++++++++-
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100755 httemplate/misc/unapply-cust_pay.cgi

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index cf874aa35..b3fffe327 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -317,6 +317,13 @@ httemplate/docs/config.html
     'type'        => [qw( checkbox text )],
   },
 
+  {
+    'key'         => 'unapplypayments',
+    'section'     => 'UI',
+    'description' => 'Enable "unapplication" of unclosed payments.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'dirhash',
     'section'     => 'shell',
diff --git a/httemplate/misc/unapply-cust_pay.cgi b/httemplate/misc/unapply-cust_pay.cgi
new file mode 100755
index 000000000..28643ef6e
--- /dev/null
+++ b/httemplate/misc/unapply-cust_pay.cgi
@@ -0,0 +1,18 @@
+<%
+
+#untaint paynum
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ || die "Illegal paynum";
+my $paynum = $1;
+
+my $cust_pay = qsearchs('cust_pay', { 'paynum' => $paynum } );
+my $custnum = $cust_pay->custnum;
+
+foreach my $cust_bill_pay ( $cust_pay->cust_bill_pay ) {
+  my $error = $cust_bill_pay->delete;
+  eidiot($error) if $error;
+}
+
+print $cgi->redirect($p. "view/cust_main.cgi?". $custnum);
+
+%>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index a1a47ea74..7dbdc1356 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -470,6 +470,11 @@ function cust_pay_areyousure(href) {
  == true)
         window.location.href = href;
 }
+function cust_pay_unapply_areyousure(href) {
+    if (confirm("Are you sure you want to unapply this payment?")
+ == true)
+        window.location.href = href;
+}
 </SCRIPT>
 END
 
@@ -524,8 +529,12 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
       my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
                      ? qq! (<A HREF="javascript:cust_pay_areyousure('${p}misc/delete-cust_pay.cgi?!. $payment->paynum. qq!')">delete</A>)!
                      : '';
+      my $unapply =
+        $payment->closed !~ /^Y/i && $conf->exists('unapplypayments')
+          ? qq! (<A HREF="javascript:cust_pay_unapply_areyousure('${p}misc/unapply-cust_pay.cgi?!. $payment->paynum. qq!')">unapply</A>)!
+          : '';
       push @history,
-        "$date\tPayment, Invoice #$invnum ($payby$payinfo)$delete\t\t$paid\t\t\t$target";
+        "$date\tPayment, Invoice #$invnum ($payby$payinfo)$delete$unapply\t\t$paid\t\t\t$target";
     }
   
     my(@cust_credit_bill)=
-- 
cgit v1.2.1


From 1583472a6afefb1ad33e05656fd206674f37d9df Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Oct 2002 17:07:59 +0000
Subject: database dump & scp support

---
 FS/FS/Conf.pm         |  7 +++++++
 FS/bin/freeside-daily | 19 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index b3fffe327..c007a501a 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -989,6 +989,13 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'dump-scpdest',
+    'section'     => '',
+    'description' => 'destination for scp database dumps: user@host:/path',
+    'type'        => 'text',
+  },
+
 );
 
 1;
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 17ee798ff..1db786120 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -4,8 +4,9 @@ use strict;
 use Fcntl qw(:flock);
 use Date::Parse;
 use Getopt::Std;
-use FS::UID qw(adminsuidsetup driver_name dbh);
+use FS::UID qw(adminsuidsetup driver_name dbh datasrc);
 use FS::Record qw(qsearch qsearchs);
+use FS::Conf;
 use FS::cust_main;
 
 &untaint_argv;	#what it sounds like  (eww)
@@ -57,6 +58,22 @@ if ( driver_name eq 'Pg' ) {
   }
 }
 
+#local hack
+my $conf = new FS::Conf;
+my $dest = $conf->config('dump-scpdest');
+if ( $dest ) {
+  datasrc =~ /dbname=([\w\.]+)$/ or die "unparsable datasrc ". datasrc;
+  my $database = $1;
+  eval "use Net::SCP qw(scp);";
+  if ( driver_name eq 'Pg' ) {
+    system("pg_dump $database >/var/tmp/$database.sql")
+  } else {
+    die "database dumps not yet supported for ". driver_name;
+  }
+  scp("/var/tmp/$database.sql", $dest);
+  unlink "/var/tmp/$database.sql" or die $!;
+}
+
 # subroutines
 
 sub untaint_argv {
-- 
cgit v1.2.1


From bcc33ffd55343ce8c2e8f576997ce10018b9d716 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 25 Oct 2002 13:39:02 +0000
Subject: show export numbers

---
 httemplate/browse/part_svc.cgi | 2 +-
 httemplate/edit/part_svc.cgi   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 0a06d8ddb..ee7a2622a 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -84,7 +84,7 @@ map { qsearchs('part_export', { exportnum => $_->exportnum } ) } qsearch('export
   ) {
 %>
       <TR>
-        <TD><A HREF="<%= $p %>edit/part_export.cgi?<%= $part_export->exportnum %>"><%= $part_export->exporttype %>&nbsp;to&nbsp;<%= $part_export->machine %></A></TD></TR>
+        <TD><A HREF="<%= $p %>edit/part_export.cgi?<%= $part_export->exportnum %>"><%= $part_export->exportnum %>:&nbsp;<%= $part_export->exporttype %>&nbsp;to&nbsp;<%= $part_export->machine %></A></TD></TR>
 <%  } %>
       </TABLE></TD>
 
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 5fbec4f88..0ee0a468a 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -154,7 +154,7 @@ my %defs = (
       my @part_export =
         map { qsearch( 'part_export', {exporttype => $_ } ) }
           keys %{FS::part_export::export_info($layer)};
-     $html .= '<BR><BR>'. table().
+      $html .= '<BR><BR>'. table().
                table(). "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
       foreach my $part_export ( @part_export ) {
         $html .= '<TD><INPUT TYPE="checkbox"'.
@@ -163,8 +163,8 @@ my %defs = (
           if qsearchs( 'export_svc', {
                                    exportnum => $part_export->exportnum,
                                    svcpart   => $clone || $part_svc->svcpart });
-        $html .= '> '. $part_export->exporttype. ' to '. $part_export->machine.
-                 '</TD>';
+        $html .= '>'. $part_export->exportnum. ': '.  $part_export->exporttype.
+                 ' to '. $part_export->machine. '</TD>';
         $count++;
         $html .= '</TR><TR>' unless $count % $columns;
       }
-- 
cgit v1.2.1


From 3702269ee9f6a63572f6e915ace56d70b5080033 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 25 Oct 2002 21:24:55 +0000
Subject: make $old_domain available too

---
 FS/FS/part_export/shellcommands.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index da6f4c46c..04e5041c3 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -65,6 +65,7 @@ sub _export_replace {
   }
   $new_finger = shell_quote $new_finger;
   $quoted_new__password = shell_quote $new__password;
+  $old_domain = $old->domain;
   $new_domain = $new->domain;
   $new_crypt_password = ''; #surpress "used only once" warnings
   $new_crypt_password = crypt( $new->_password,
-- 
cgit v1.2.1


From 749cce349c6801e6d75834065197c3aceddda599 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 28 Oct 2002 13:22:45 +0000
Subject: signal-less queued child handling (closes: Bug#477)

---
 FS/bin/freeside-queued | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 311fe62f9..6ea27c05f 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -1,10 +1,10 @@
 #!/usr/bin/perl -w
 
 use strict;
-use vars qw( $log_file $sigterm $sigint $kids $max_kids );
+use vars qw( $log_file $sigterm $sigint $kids $max_kids %kids );
 use subs qw( _die _logmsg );
 use Fcntl qw(:flock);
-use POSIX qw(setsid);
+use POSIX qw(:sys_wait_h setsid);
 use Date::Format;
 use IO::File;
 use FS::UID qw(adminsuidsetup forksuidsetup driver_name dbh);
@@ -28,8 +28,8 @@ my $pid_file = "/var/run/freeside-queued.pid";
 
 &daemonize1;
 
-sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; $kids--; }
-$SIG{CHLD} =  \&REAPER;
+#sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; $kids--; }
+#$SIG{CHLD} =  \&REAPER;
 
 $sigterm = 0;
 $sigint = 0;
@@ -65,9 +65,11 @@ warn "freeside-queued starting\n";
 my $warnkids=0;
 while (1) {
 
+  &reap_kids;
   #prevent runaway forking
   if ( $kids >= $max_kids ) {
     warn "WARNING: maximum $kids children reached\n" unless $warnkids++;
+    &reap_kids;
     sleep 1; #waiting for signals is cheap
     next;
   }
@@ -131,6 +133,7 @@ while (1) {
 
   if ( $pid ) {
     $kids++;
+    $kids{$pid} = 1;
   } else { #kid time
 
     #get new db handle
@@ -230,6 +233,16 @@ sub daemonize2 {
   open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
 }
 
+sub reap_kids {
+  foreach my $pid ( keys %kids ) {
+    my $kid = waitpid($pid, WNOHANG);
+    if ( $kid > 0 ) {
+      $kids--;
+      delete $kids{$kid};
+    }
+  }
+}
+
 =head1 NAME
 
 freeside-queued - Job queue daemon
-- 
cgit v1.2.1


From dfaabf0c82291f2839922065aa80b2590bab25b0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 2 Nov 2002 00:13:33 +0000
Subject: whew, glad i had a copy of this

---
 httemplate/graph/money_time-graph.cgi | 96 +++++++++++++++++++++++++++++++++++
 httemplate/graph/money_time.cgi       | 43 ++++++++++++++++
 2 files changed, 139 insertions(+)
 create mode 100755 httemplate/graph/money_time-graph.cgi
 create mode 100644 httemplate/graph/money_time.cgi

diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi
new file mode 100755
index 000000000..93a80d165
--- /dev/null
+++ b/httemplate/graph/money_time-graph.cgi
@@ -0,0 +1,96 @@
+<%
+
+#find first month
+my $syear = 2001;
+my $smonth = 8;
+
+#find last month
+my $eyear = 2002;
+my $emonth = 11;
+
+my @labels;
+my %data;
+
+while ( $syear < $eyear || ( $syear == $eyear && $smonth < $emonth ) ) {
+  push @labels, "$smonth/$syear";
+
+  my $speriod = timelocal(0,0,0,1,$smonth-1,$syear);
+  if ( ++$smonth == 13 ) { $syear++; $smonth=1; }
+  my $eperiod = timelocal(0,0,0,1,$smonth-1,$syear);
+
+  my $where = "WHERE _date >= $speriod AND _date < $eperiod";
+
+  # Invoiced
+  my $charged_sql = "SELECT SUM(charged) FROM cust_bill $where";
+  my $charged_sth = dbh->prepare($charged_sql) or die dbh->errstr;
+  $charged_sth->execute or die $charged_sth->errstr;
+  my $charged = $charged_sth->fetchrow_arrayref->[0] || 0;
+
+  push @{$data{charged}}, $charged;
+
+  #accounts receivable
+#  my $ar_sql2 = "SELECT SUM(amount) FROM cust_credit $where";
+  my $credited_sql = "SELECT SUM(cust_credit_bill.amount) FROM cust_credit_bill, cust_bill WHERE cust_bill.invnum = cust_credit_bill.invnum AND cust_bill._date >= $speriod AND cust_bill._date < $eperiod";
+  my $credited_sth = dbh->prepare($credited_sql) or die dbh->errstr;
+  $credited_sth->execute or die $credited_sth->errstr;
+  my $credited = $credited_sth->fetchrow_arrayref->[0] || 0;
+
+    #horrible local kludge
+    my $expenses_sql = "SELECT SUM(cust_bill_pkg.setup) FROM cust_bill_pkg, cust_bill, cust_pkg, part_pkg WHERE cust_bill.invnum = cust_bill_pkg.invnum AND cust_bill._date >= $speriod AND cust_bill._date < $eperiod AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum AND cust_pkg.pkgpart = part_pkg.pkgpart AND LOWER(part_pkg.pkg) LIKE 'expense _%'";
+    my $expenses_sth = dbh->prepare($expenses_sql) or die dbh->errstr;
+    $expenses_sth->execute or die $expenses_sth->errstr;
+    my $expenses = $expenses_sth->fetchrow_arrayref->[0] || 0;
+
+  push @{$data{ar}}, $charged-$credited-$expenses;
+
+  #deferred revenue
+#  push @{$data{defer}}, '0';
+
+  #cashflow
+  my $paid_sql = "SELECT SUM(paid) FROM cust_pay $where";
+  my $paid_sth = dbh->prepare($paid_sql) or die dbh->errstr;
+  $paid_sth->execute or die $paid_sth->errstr;
+  my $paid = $paid_sth->fetchrow_arrayref->[0] || 0;
+
+  my $refunded_sql = "SELECT SUM(refund) FROM cust_refund $where";
+  my $refunded_sth = dbh->prepare($refunded_sql) or die dbh->errstr;
+  $refunded_sth->execute or die $refunded_sth->errstr;
+  my $refunded = $refunded_sth->fetchrow_arrayref->[0] || 0;
+
+  push @{$data{cash}}, $paid-$refunded;
+
+}
+
+#my $chart = Chart::LinesPoints->new(1024,480);
+my $chart = Chart::LinesPoints->new(768,480);
+
+$chart->set(
+  #'min_val' => 0,
+  'legend' => 'bottom',
+  'legend_labels' => [ #'Invoiced (cust_bill)',
+                       'Accounts receivable (invoices - applied credits)',
+                       #'Deferred revenue',
+                       'Actual cashflow (payments - refunds)' ],
+);
+
+my @data = ( \@labels,
+             #map $data{$_}, qw( ar defer cash )
+             #map $data{$_}, qw( charged ar cash )
+             map $data{$_}, qw( ar cash )
+           );
+
+#my $gd = $chart->plot(\@data);
+#open (IMG, ">i_r_c.png");
+#print IMG $gd->png;
+#close IMG;
+
+#$chart->png("i_r_c.png", \@data);
+
+#$chart->cgi_png(\@data);
+
+http_header('Content-Type' => 'image/png' );
+$Response->{ContentType} = 'image/png';
+
+$chart->_set_colors();
+
+%><%= $chart->scalar_png(\@data) %>
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
new file mode 100644
index 000000000..d6c35434b
--- /dev/null
+++ b/httemplate/graph/money_time.cgi
@@ -0,0 +1,43 @@
+<HTML>
+  <HEAD>
+    <TITLE>Graphing monetary values over time</TITLE>
+  </HEAD>
+<BODY BGCOLOR="#e8e8e8">
+<IMG SRC="money_time-graph.cgi" WIDTH="768" HEIGHT="480">
+<BR>
+<FORM METHOD="POST">
+<INPUT TYPE="checkbox" NAME="ar">
+  Accounts receivable (invoices - applied credits)<BR>
+<INPUT TYPE="checkbox" NAME="charged">
+  Just Invoices<BR>
+<INPUT TYPE="checkbox" NAME="defer">
+  Accounts receivable, with deferred revenue (invoices - applied credits, with charges for annual/semi-annual/quarterly/etc. services deferred over applicable time period) (there has got to be a shorter description for this)<BR>
+<INPUT TYPE="checkbox" NAME="cash">
+  Cashflow (payments - refunds)<BR>
+<BR>
+From <SELECT NAME="smonth">
+<% my @m = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
+   foreach my $m ( 1..12 ) { %>
+<OPTION VALUE="<%= $m %>"><%= $m[$m-1] %>
+<% } %>
+</SELECT>
+<SELECT NAME="syear">
+<% foreach my $y ( 1999 .. 2010 ) { %>
+<OPTION VALUE="<%= $y %>"><%= $y %>
+<% } %>
+</SELECT>
+ to <SELECT NAME="emonth">
+<% foreach my $m ( 1..12 ) { %>
+<OPTION VALUE="<%= $m %>"><%= $m[$m-1] %>
+<% } %>
+</SELECT>
+<SELECT NAME="eyear">
+<% foreach my $y ( 1999 .. 2010 ) { %>
+<OPTION VALUE="<%= $y %>"><%= $y %>
+<% } %>
+</SELECT>
+
+<INPUT TYPE="submit" VALUE="Graph">
+</FORM>
+</BODY>
+</HTML>
-- 
cgit v1.2.1


From 62e07cc34e38055a59ce160e1c06fcc5edb26927 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 4 Nov 2002 20:51:43 +0000
Subject: fix cosmetic bug on online time view

---
 httemplate/view/svc_acct.cgi | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 3fb9156cc..e86d43f30 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -60,15 +60,17 @@ function areyousure(href) {
 if ( $part_svc->part_export('sqlradius') ) {
 
   my $last_bill;
+  my %plandata;
   if ( $cust_pkg ) {
     #false laziness w/httemplate/edit/part_pkg... this stuff doesn't really
     #belong in plan data
-     my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
-                      split("\n", $cust_pkg->part_pkg->plandata );
+    %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
+                    split("\n", $cust_pkg->part_pkg->plandata );
 
     $last_bill = $cust_pkg->last_bill;
   } else {
     $last_bill = 0;
+    %plandata = ();
   }
 
   my $seconds = $svc_acct->seconds_since_sqlradacct( $last_bill, time );
@@ -83,7 +85,7 @@ if ( $part_svc->part_export('sqlradius') ) {
   }
 
   if ( $cust_pkg ) {
-    print ' this billing cycle (since '. time2str(%C, $last_bill). ') - '. 
+    print ' this billing cycle (since '. time2str("%C", $last_bill). ') - '. 
           $plandata{recur_included_hours}. ' total hours in plan<BR><BR>';
   } else {
     print ' (no billing cycle available for unaudited account)<BR><BR>';
-- 
cgit v1.2.1


From d036b0227eb84732140866c72fd0d62cc3b92d7a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 4 Nov 2002 21:20:44 +0000
Subject: doc

---
 httemplate/docs/upgrade9.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/docs/upgrade9.html b/httemplate/docs/upgrade9.html
index 7cf44ea31..bcd3f4d5a 100644
--- a/httemplate/docs/upgrade9.html
+++ b/httemplate/docs/upgrade9.html
@@ -12,8 +12,8 @@
   <li>Install <a href="http://search.cpan.org/search?dist=Net-SSH">Net::SSH</a> minimum version 0.07
   <li>Apply the following changes to your database:
 <pre>
-INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 17, 'daytime', 'en_US', 'Day Phone' );
-INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 18, 'night', 'en_US', 'Night Phone' );
+INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 18, 'daytime', 'en_US', 'Day Phone' );
+INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 19, 'night', 'en_US', 'Night Phone' );
 </pre>
   <li>Restart Apache and freeside-queued.
 </body>
-- 
cgit v1.2.1


From baaa14867224a536143b843ff33787f74d1c5032 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 4 Nov 2002 23:40:55 +0000
Subject: balance on small_custview

---
 FS/FS/CGI.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index d69aad2fc..86d20f6cb 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -322,6 +322,10 @@ sub small_custview {
 
   $html .= '</TR></TABLE>';
 
+  $html .= '<BR>Balance: <B>$'. $cust_main->balance. '</B><BR>';
+
+  # last payment might be good here too?
+
   $html;
 }
 
-- 
cgit v1.2.1


From 6e98f45f5fb306a76bef37c746a6eaf9c9184f88 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Nov 2002 02:15:41 +0000
Subject: local kludge

---
 httemplate/graph/money_time-graph.cgi | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi
index 93a80d165..32c2d89e3 100755
--- a/httemplate/graph/money_time-graph.cgi
+++ b/httemplate/graph/money_time-graph.cgi
@@ -57,7 +57,15 @@ while ( $syear < $eyear || ( $syear == $eyear && $smonth < $emonth ) ) {
   $refunded_sth->execute or die $refunded_sth->errstr;
   my $refunded = $refunded_sth->fetchrow_arrayref->[0] || 0;
 
-  push @{$data{cash}}, $paid-$refunded;
+    #horrible local kludge that doesn't even really work right
+    my $expenses_sql = "SELECT SUM(cust_bill_pay.amount) FROM cust_bill_pay, cust_bill WHERE cust_bill_pay.invnum = cust_bill.invnum AND cust_bill_pay._date >= $speriod AND cust_bill_pay._date < $eperiod AND 0 < ( select count(*) from cust_bill_pkg, cust_pkg, part_pkg WHERE cust_bill.invnum = cust_bill_pkg.invnum AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum AND cust_pkg.pkgpart = part_pkg.pkgpart AND LOWER(part_pkg.pkg) LIKE 'expense _%' )";
+
+#    my $expenses_sql = "SELECT SUM(cust_bill_pay.amount) FROM cust_bill_pay, cust_bill_pkg, cust_bill, cust_pkg, part_pkg WHERE cust_bill_pay.invnum = cust_bill.invnum AND cust_bill.invnum = cust_bill_pkg.invnum AND cust_bill_pay._date >= $speriod AND cust_bill_pay._date < $eperiod AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum AND cust_pkg.pkgpart = part_pkg.pkgpart AND LOWER(part_pkg.pkg) LIKE 'expense _%'";
+    my $expenses_sth = dbh->prepare($expenses_sql) or die dbh->errstr;
+    $expenses_sth->execute or die $expenses_sth->errstr;
+    my $expenses = $expenses_sth->fetchrow_arrayref->[0] || 0;
+
+  push @{$data{cash}}, $paid-$refunded-$expenses;
 
 }
 
-- 
cgit v1.2.1


From fc3b6024fcf0bf0394e6239639cbe31786b0cad8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Nov 2002 20:29:57 +0000
Subject: lost?

---
 FS/bin/freeside-sqlradius-radacctd | 180 +++++++++++++++++++++++++++++++++++++
 1 file changed, 180 insertions(+)
 create mode 100644 FS/bin/freeside-sqlradius-radacctd

diff --git a/FS/bin/freeside-sqlradius-radacctd b/FS/bin/freeside-sqlradius-radacctd
new file mode 100644
index 000000000..4e8d57c51
--- /dev/null
+++ b/FS/bin/freeside-sqlradius-radacctd
@@ -0,0 +1,180 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use vars qw( $log_file $sigterm $sigint );
+use subs qw( _die _logmsg );
+use Fcntl qw(:flock);
+use POSIX qw(setsid);
+use Date::Format;
+use IO::File;
+use FS::UID qw(adminsuidsetup);
+#use FS::Record qw(qsearch qsearchs);
+#use FS::part_export;
+#use FS::svc_acct;
+#use FS::cust_svc;
+
+#lots of false laziness w/freeside-queued
+
+my $user = shift or die &usage;
+
+#my $pid_file = "/var/run/freeside-sqlradius-radacctd.$user.pid";
+my $pid_file = "/var/run/freeside-sqlradius-radacctd.pid";
+
+&daemonize1;
+
+#sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; $kids--; }
+#$SIG{CHLD} =  \&REAPER;
+
+$sigterm = 0;
+$sigint = 0;
+$SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $sigint++; };
+$SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
+
+my $freeside_gid = scalar(getgrnam('freeside'))
+  or die "can't setgid to freeside group\n";
+$) = $freeside_gid;
+$( = $freeside_gid;
+#if freebsd can't setuid(), presumably it can't setgid() either.  grr fleabsd
+($(,$)) = ($),$();
+$) = $freeside_gid;
+
+$> = $FS::UID::freeside_uid;
+$< = $FS::UID::freeside_uid;
+#freebsd is sofa king broken, won't setuid()
+($<,$>) = ($>,$<);
+$> = $FS::UID::freeside_uid;
+
+#$ENV{HOME} = (getpwuid($>))[7]; #for ssh
+adminsuidsetup $user;
+
+$log_file= "/usr/local/etc/freeside/sqlradius-radacctd-log.". $FS::UID::datasrc;
+
+&daemonize2;
+
+$SIG{__DIE__} = \&_die;
+$SIG{__WARN__} = \&_logmsg;
+
+warn "freeside-sqlradius-radacctd starting\n";
+
+#eslaf
+
+#my $machine = shift or die &usage; #would need to be up higher for real
+my @exports = qsearch('part_export', { 'exporttype' => 'sqlradius' } );
+
+while (1) {
+
+  my %seen = ();
+  foreach my $export ( @exports ) {
+    next if $seen{$export->option('datasrc')}++;
+    my $dbh = DBI->connect(
+      map { $export->option($_) } qw( datasrc username password )
+    ) or do {
+      warn "can't connect to ". $export->option('datasrc'). ": ". $DBI::errstr;
+      next;
+    }
+
+    # find old radacct position
+    #$lastid = 0;
+
+    # get new radacct records
+    my $sth = $dbh->prepare('SELECT * FROM radacct WHERE radacctid > ?') or do {
+      warn "can't select in radacct table from ". $export->option('datasrc').
+           ": ". $dbh->errstr;
+      next;
+    };
+
+    while ( my $radacct = $sth->fetchrow_arrayref({}) ) {
+
+      my $session = new FS::session {
+        portnum =>
+        svcnum  => 
+        login   =>
+        #logout  =>
+      };
+
+    }
+
+    # look for updated radacct records & replace them
+
+  }
+
+  sleep 5;
+
+}
+
+#more false laziness w/freeside-queued
+
+sub usage {
+  die "Usage:\n\n  freeside-sqlradius-radacctd user\n";
+}
+
+sub _die {
+  my $msg = shift;
+  unlink $pid_file if -e $pid_file;
+  _logmsg($msg);
+}
+
+sub _logmsg {
+  chomp( my $msg = shift );
+  my $log = new IO::File ">>$log_file";
+  flock($log, LOCK_EX);
+  seek($log, 0, 2);
+  print $log "[". time2str("%a %b %e %T %Y",time). "] [$$] $msg\n";
+  flock($log, LOCK_UN);
+  close $log;
+}
+
+sub daemonize1 {
+
+  chdir "/" or die "Can't chdir to /: $!";
+  open STDIN, '/dev/null'   or die "Can't read /dev/null: $!";
+  defined(my $pid = fork) or die "Can't fork: $!";
+  if ( $pid ) {
+    print "freeside-sqlradius-radacctd started with pid $pid\n";
+          #logging to $log_file\n";
+    exit unless $pid_file;
+    my $pidfh = new IO::File ">$pid_file" or exit;
+    print $pidfh "$pid\n";
+    exit;
+  }
+  #open STDOUT, '>/dev/null'
+  #                          or die "Can't write to /dev/null: $!";
+  #setsid                  or die "Can't start a new session: $!";
+  #open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
+
+}
+
+sub daemonize2 {
+  open STDOUT, '>/dev/null'
+                            or die "Can't write to /dev/null: $!";
+  setsid                  or die "Can't start a new session: $!";
+  open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
+}
+
+
+#eslaf
+
+=head1 NAME
+
+freeside-sqlradius-radacctd - Real-time radacct import daemon
+
+=head1 SYNOPSIS
+
+  freeside-sqlradius-radacctd username
+
+=head1 DESCRIPTION
+
+Imports records from an SQL radacct table in real-time into the session
+monitor.
+
+This enables per-minute or per-hour charges as well as the
+"View active NAS ports" function.
+
+B<username> is a username added by freeside-adduser.
+
+=head1 SEE ALSO
+
+session.html from the base documentation.
+
+=cut
+
-- 
cgit v1.2.1


From 548a47b0ec1040320e56f17cfac71f716785cb95 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Nov 2002 23:29:38 +0000
Subject: bandwidth charges from sqlradius

---
 FS/FS/cust_pkg.pm            | 54 ++++++++++++++++++++++++++-------
 FS/FS/cust_svc.pm            | 72 +++++++++++++++++++++++++++++++++++++++-----
 FS/FS/svc_acct.pm            | 18 +++++++++++
 httemplate/edit/part_pkg.cgi | 29 +++++++++++++++---
 httemplate/view/svc_acct.cgi | 18 +++++++++--
 5 files changed, 165 insertions(+), 26 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 55ee37d9d..e83b95156 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -530,7 +530,11 @@ sub seconds_since_sqlradacct {
   my $seconds = 0;
 
   foreach my $cust_svc (
-    grep { $_->part_svc->svcdb eq 'svc_acct' } $self->cust_svc
+    grep {
+      my $part_svc = $_->part_svc;
+      $part_svc->svcdb eq 'svc_acct'
+        && scalar($part_svc->part_export('sqlradius'));
+    } $self->cust_svc
   ) {
     $seconds += $cust_svc->seconds_since_sqlradacct($start, $end);
   }
@@ -539,6 +543,38 @@ sub seconds_since_sqlradacct {
 
 }
 
+=item attribute_since_sqlradacct TIMESTAMP_START TIMESTAMP_END ATTRIBUTE
+
+Returns the sum of the given attribute for all accounts (see L<FS::svc_acct>)
+in this package for sessions ending between TIMESTAMP_START (inclusive) and
+TIMESTAMP_END
+(exclusive).
+
+TIMESTAMP_START and TIMESTAMP_END are specified as UNIX timestamps; see
+L<perlfunc/"time">.  Also see L<Time::Local> and L<Date::Parse> for conversion
+functions.
+
+=cut
+
+sub attribute_since_sqlradacct {
+  my($self, $start, $end, $attrib) = @_;
+
+  my $sum = 0;
+
+  foreach my $cust_svc (
+    grep {
+      my $part_svc = $_->part_svc;
+      $part_svc->svcdb eq 'svc_acct'
+        && scalar($part_svc->part_export('sqlradius'));
+    } $self->cust_svc
+  ) {
+    $sum += $cust_svc->attribute_since_sqlradacct($start, $end, $attrib);
+  }
+
+  $sum;
+
+}
+
 =back
 
 =head1 SUBROUTINES
@@ -719,10 +755,6 @@ sub order {
 
 =back
 
-=head1 VERSION
-
-$Id: cust_pkg.pm,v 1.27 2002-10-17 14:16:17 ivan Exp $
-
 =head1 BUGS
 
 sub order is not OO.  Perhaps it should be moved to FS::cust_main and made so?
@@ -732,12 +764,12 @@ In sub order, the @pkgparts array (passed by reference) is clobbered.
 Also in sub order, no money is adjusted.  Once FS::part_pkg defines a standard
 method to pass dates to the recur_prog expression, it should do so.
 
-FS::svc_acct, FS::svc_domain, FS::svc_www and FS::svc_forward are loaded via
-'use' at compile time, rather than via 'require' in sub
-{ setup, suspend, unsuspend, cancel } because they use %FS::UID::callback to
-load configuration values.  Probably need a subroutine which decides what to
-do based on whether or not we've fetched the user yet, rather than a hash.
-See FS::UID and the TODO.
+FS::svc_acct, FS::svc_domain, FS::svc_www, FS::svc_ip and FS::svc_forward are
+loaded via 'use' at compile time, rather than via 'require' in sub { setup,
+suspend, unsuspend, cancel } because they use %FS::UID::callback to load
+configuration values.  Probably need a subroutine which decides what to do
+based on whether or not we've fetched the user yet, rather than a hash.  See
+FS::UID and the TODO.
 
 Now that things are transactional should the check in the insert method be
 moved to check ?
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 211b0ad23..e0d582b51 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -337,11 +337,11 @@ sub seconds_since {
   $sth->fetchrow_arrayref->[0];
 }
 
-=item seconds_since_sqlradacct TIMESTAMP_START TIMESTAMP_END 
+=item seconds_since_sqlradacct TIMESTAMP_START TIMESTAMP_END
 
 See L<FS::svc_acct/seconds_since_sqlradacct>.  Equivalent to
-$cust_svc->svc_x->seconds_since, but more efficient.  Meaningless for records
-where B<svcdb> is not "svc_acct".
+$cust_svc->svc_x->seconds_since_sqlradacct, but more efficient.  Meaningless
+for records where B<svcdb> is not "svc_acct".
 
 =cut
 
@@ -361,7 +361,7 @@ sub seconds_since_sqlradacct {
     my $dbh = DBI->connect( map { $part_export->option($_) }
                             qw(datasrc username password)    )
       or die "can't connect to sqlradius database: ". $DBI::errstr;
-  
+
     #select a unix time conversion function based on database type
     my $str2time;
     if ( $dbh->{Driver}->{Name} eq 'mysql' ) {
@@ -416,20 +416,20 @@ sub seconds_since_sqlradacct {
     my $end_during = $sth->fetchrow_arrayref->[0];
   
     #find closed (not anymore - or open) sessions which start before the range
-    # but stop # after, or are still open, count range start->range end
+    # but stop after, or are still open, count range start->range end
     # don't count open sessions (probably missing stop record)
     $sth = $dbh->prepare("SELECT COUNT(*)
                             FROM radacct
                             WHERE UserName = ?
                               AND $str2time AcctStartTime ) < ?
                               AND ( $str2time AcctStopTime ) >= ?
-                                                            )"
+                                                                  )"
                               #      OR AcctStopTime =  0
-                              #      OR AcctStopTime IS NULL )"
+                              #      OR AcctStopTime IS NULL       )"
     ) or die $dbh->errstr;
     $sth->execute($username, $start, $end ) or die $sth->errstr;
     my $entire_range = ($end-$start) * $sth->fetchrow_arrayref->[0];
-  
+
     $seconds += $regular + $end_during + $start_during + $entire_range;
 
   }
@@ -438,6 +438,62 @@ sub seconds_since_sqlradacct {
 
 }
 
+=item attribute_since_sqlradacct TIMESTAMP_START TIMESTAMP_END ATTRIBUTE
+
+See L<FS::svc_acct/attribute_since_sqlradacct>.  Equivalent to
+$cust_svc->svc_x->attribute_since_sqlradacct, but more efficient.  Meaningless
+for records where B<svcdb> is not "svc_acct".
+
+=cut
+
+#note: implementation here, POD in FS::svc_acct
+#(false laziness w/seconds_since_sqlradacct above)
+sub attribute_since_sqlradacct {
+  my($self, $start, $end, $attrib) = @_;
+
+  my $username = $self->svc_x->username;
+
+  my @part_export = $self->part_svc->part_export('sqlradius')
+    or die "no sqlradius export configured for this service type";
+    #or return undef;
+
+  my $sum = 0;
+
+  foreach my $part_export ( @part_export ) {
+
+    my $dbh = DBI->connect( map { $part_export->option($_) }
+                            qw(datasrc username password)    )
+      or die "can't connect to sqlradius database: ". $DBI::errstr;
+
+    #select a unix time conversion function based on database type
+    my $str2time;
+    if ( $dbh->{Driver}->{Name} eq 'mysql' ) {
+      $str2time = 'UNIX_TIMESTAMP(';
+    } elsif ( $dbh->{Driver}->{Name} eq 'Pg' ) {
+      $str2time = 'EXTRACT( EPOCH FROM ';
+    } else {
+      warn "warning: unknown database type ". $dbh->{Driver}->{Name}.
+           "; guessing how to convert to UNIX timestamps";
+      $str2time = 'extract(epoch from ';
+    }
+
+    my $sth = $dbh->prepare("SELECT SUM(?)
+                               FROM radacct
+                               WHERE UserName = ?
+                                 AND $str2time AcctStopTime ) >= ?
+                                 AND $str2time AcctStopTime ) <  ?
+                                 AND AcctStopTime IS NOT NULL"
+    ) or die $dbh->errstr;
+    $sth->execute($attrib, $username, $start, $end) or die $sth->errstr;
+
+    $sum += $sth->fetchrow_arrayref->[0];
+
+  }
+
+  $sum;
+
+}
+
 =back
 
 =head1 BUGS
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index b33f3ae29..c808aeea4 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -960,6 +960,24 @@ sub seconds_since_sqlradacct {
   $self->cust_svc->seconds_since_sqlradacct(@_);
 }
 
+=item attribute_since_sqlradacct TIMESTAMP_START TIMESTAMP_END ATTRIBUTE
+
+Returns the sum of the given attribute for all accounts (see L<FS::svc_acct>)
+in this package for sessions ending between TIMESTAMP_START (inclusive) and
+TIMESTAMP_END (exclusive).
+
+TIMESTAMP_START and TIMESTAMP_END are specified as UNIX timestamps; see
+L<perlfunc/"time">.  Also see L<Time::Local> and L<Date::Parse> for conversion
+functions.
+
+=cut
+
+#note: POD here, implementation in FS::cust_svc
+sub attribute_since_sqlradacct {
+  my $self = shift;
+  $self->cust_svc->attribute_since_sqlradacct(@_);
+}
+
 =item radius_groups
 
 Returns all RADIUS groups for this account (see L<FS::radius_usergroup>).
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 187578a35..6141c0083 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -356,7 +356,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'sqlradacct_hour' => {
-    'name' => 'Base charge plus charge per-hour from an external sqlradius radacct table',
+    'name' => 'Base charge plus charge per-hour (and for data) from an external sqlradius radacct table',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -370,13 +370,34 @@ tie my %plans, 'Tie::IxHash',
       'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
                                  'default' => 0,
                                },
+      'recur_included_input' => { 'name' => 'Input megabytes included',
+                                  'default' => 0,
+                                },
+      'recur_input_charge' => { 'name' =>
+                                        'Additional charge per input megabyte',
+                                'default' => 0,
+                              },
+      'recur_included_output' => { 'name' => 'Output megabytes included',
+                                   'default' => 0,
+                                },
+      'recur_output_charge' => { 'name' =>
+                                       'Additional charge per output megabyte',
+                                'default' => 0,
+                              },
+      'recur_included_total' => { 'name' =>
+                                       'Total input+output megabytes included',
+                                  'default' => 0,
+                                },
+      'recur_total_charge' => { 'name' =>
+                                 'Additional charge per input+output megabyte',
+                                'default' => 0,
+                              },
     },
-    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ],
+    'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_input recur_output_charge recur_included_total recur_total_charge )],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $hours = $cust_pkg->seconds_since_sqlradacct($cust_pkg->last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
+    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "Acct-Input-Octets" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "Acct-Output-Octets" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours + \' + what.recur_input_charge + \' * $input + \' + what.recur_output_charge + \' * $output + \' + what.recur_total_charge + \' * $total ;\'',
   },
 
-
 ;
 
 my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index e86d43f30..7295f577d 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -78,6 +78,13 @@ if ( $part_svc->part_export('sqlradius') ) {
   my $m = int( ($seconds%3600) / 60 );
   my $s = $seconds%60;
 
+  my $input = $svc_acct->attribute_since_sqlradacct(
+    $last_bill, time, 'Acct-Input-Octets'
+  ) / 1048576;
+  my $output = $svc_acct->attribute_since_sqlradacct(
+    $last_bill, time, 'Acct-Output-Octets'
+  ) / 1048576;
+
   if ( $seconds ) {
     print "Online <B>$h</B>h <B>$m</B>m <B>$s</B>s";
   } else {
@@ -86,11 +93,16 @@ if ( $part_svc->part_export('sqlradius') ) {
 
   if ( $cust_pkg ) {
     print ' this billing cycle (since '. time2str("%C", $last_bill). ') - '. 
-          $plandata{recur_included_hours}. ' total hours in plan<BR><BR>';
+          $plandata{recur_included_hours}. ' total hours in plan<BR>';
   } else {
-    print ' (no billing cycle available for unaudited account)<BR><BR>';
+    print ' (no billing cycle available for unaudited account)<BR>';
   }
 
+  print 'Input: <B>'. sprintf("%.3f", $input). ' megabytes<BR>';
+  print 'Output: <B>'. sprintf("%.3f", $output). ' megabytes<BR>';
+
+  print '<BR>';
+
 }
 
 #print qq!<BR><A HREF="../misc/sendconfig.cgi?$svcnum">Send account information</A>!;
@@ -183,7 +195,7 @@ print '<TR><TD ALIGN="right">RADIUS groups</TD><TD BGCOLOR="#ffffff">'.
 
 print '</TABLE></TD></TR></TABLE><BR><BR>';
 
-print join("\n", $conf->config('svc_acct-notes') ).  '<BR><BR>'.
+print join("\n", $conf->config('svc_acct-notes') ). '<BR><BR>'.
       joblisting({'svcnum'=>$svcnum}, 1). '</BODY></HTML>';
 
 %>
-- 
cgit v1.2.1


From d32ae4e36b14a3418979856e3ee3f662c5290d65 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Nov 2002 23:34:11 +0000
Subject: can't use placeholders in SELECT SUM(?)

---
 FS/FS/cust_svc.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index e0d582b51..7516be599 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -477,14 +477,14 @@ sub attribute_since_sqlradacct {
       $str2time = 'extract(epoch from ';
     }
 
-    my $sth = $dbh->prepare("SELECT SUM(?)
+    my $sth = $dbh->prepare("SELECT SUM($attrib)
                                FROM radacct
                                WHERE UserName = ?
                                  AND $str2time AcctStopTime ) >= ?
                                  AND $str2time AcctStopTime ) <  ?
                                  AND AcctStopTime IS NOT NULL"
     ) or die $dbh->errstr;
-    $sth->execute($attrib, $username, $start, $end) or die $sth->errstr;
+    $sth->execute($username, $start, $end) or die $sth->errstr;
 
     $sum += $sth->fetchrow_arrayref->[0];
 
-- 
cgit v1.2.1


From b4206f7dd4e3f00b1fac73245ade1d28388f2ad3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Nov 2002 23:41:07 +0000
Subject: fix for correct radacct column names

---
 httemplate/edit/part_pkg.cgi | 2 +-
 httemplate/view/svc_acct.cgi | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 6141c0083..bbecd0c52 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -395,7 +395,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_input recur_output_charge recur_included_total recur_total_charge )],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "Acct-Input-Octets" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "Acct-Output-Octets" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours + \' + what.recur_input_charge + \' * $input + \' + what.recur_output_charge + \' * $output + \' + what.recur_total_charge + \' * $total ;\'',
+    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctInputOctets" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctOutputOctets" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours + \' + what.recur_input_charge + \' * $input + \' + what.recur_output_charge + \' * $output + \' + what.recur_total_charge + \' * $total ;\'',
   },
 
 ;
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 7295f577d..30480d1e8 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -79,10 +79,10 @@ if ( $part_svc->part_export('sqlradius') ) {
   my $s = $seconds%60;
 
   my $input = $svc_acct->attribute_since_sqlradacct(
-    $last_bill, time, 'Acct-Input-Octets'
+    $last_bill, time, 'AcctInputOctets'
   ) / 1048576;
   my $output = $svc_acct->attribute_since_sqlradacct(
-    $last_bill, time, 'Acct-Output-Octets'
+    $last_bill, time, 'AcctOutputOctets'
   ) / 1048576;
 
   if ( $seconds ) {
-- 
cgit v1.2.1


From 4ff72381c99c7508f6028d2c44a2ec5c455e4670 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Nov 2002 23:43:20 +0000
Subject: ui

---
 httemplate/view/svc_acct.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 30480d1e8..e00562ace 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -98,8 +98,8 @@ if ( $part_svc->part_export('sqlradius') ) {
     print ' (no billing cycle available for unaudited account)<BR>';
   }
 
-  print 'Input: <B>'. sprintf("%.3f", $input). ' megabytes<BR>';
-  print 'Output: <B>'. sprintf("%.3f", $output). ' megabytes<BR>';
+  print 'Input: <B>'. sprintf("%.3f", $input). '</B> megabytes<BR>';
+  print 'Output: <B>'. sprintf("%.3f", $output). '</B> megabytes<BR>';
 
   print '<BR>';
 
-- 
cgit v1.2.1


From 456021fddfef45aaf2d629af509fda9074db00cf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 6 Nov 2002 03:58:42 +0000
Subject: data charging

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index bbecd0c52..be52e5b77 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -393,7 +393,7 @@ tie my %plans, 'Tie::IxHash',
                                 'default' => 0,
                               },
     },
-    'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_input recur_output_charge recur_included_total recur_total_charge )],
+    'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
     'setup' => 'what.setup_fee.value',
     'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctInputOctets" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctOutputOctets" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours + \' + what.recur_input_charge + \' * $input + \' + what.recur_output_charge + \' * $output + \' + what.recur_total_charge + \' * $total ;\'',
   },
-- 
cgit v1.2.1


From 928c6b2dbe79b079eb79eca941bc8f1e24dd5795 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 6 Nov 2002 04:11:44 +0000
Subject: data billing

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index be52e5b77..bea6dcb7f 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -395,7 +395,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctInputOctets" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctOutputOctets" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours + \' + what.recur_input_charge + \' * $input + \' + what.recur_output_charge + \' * $output + \' + what.recur_total_charge + \' * $total ;\'',
+    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctInputOctets" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctOutputOctets" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours + \' + what.recur_input_charge.value + \' * $input + \' + what.recur_output_charge.value + \' * $output + \' + what.recur_total_charge.value + \' * $total ;\'',
   },
 
 ;
-- 
cgit v1.2.1


From 4014161f196408567c02ce3fe5a0cd3c27f633c7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 6 Nov 2002 04:23:22 +0000
Subject: safe regex for sqlradius hour/data billing, closes: Bug#474

---
 FS/FS/part_pkg.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index e914636e4..f290420df 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -218,6 +218,8 @@ sub check {
 
       or $r =~ /^my \$min = \$cust_pkg\->seconds_since\(\$cust_pkg\->bill \|\| 0\) \/ 60 \- \s*\d*\.?\d*\s*; \$min = 0 if \$min < 0; \s*\d*\.?\d*\s* \+ \s*\d*\.?\d*\s* \* \$min;\s*$/
 
+      or $r =~ /^my \$last_bill = \$cust_pkg\->last_bill; my \$hours = \$cust_pkg\->seconds_since_sqlradacct\(\$last_bill, \$sdate \) \/ 3600 - \s*\d\.?\d*\s*; \$hours = 0 if \$hours < 0; my \$input = \$cust_pkg\->attribute_since_sqlradacct\(\$last_bill, \$sdate, "AcctInputOctets" \) \/ 1048576; my \$output = \$cust_pkg\->attribute_since_sqlradacct\(\$last_bill, \$sdate, "AcctOutputOctets" \) \/ 1048576; my \$total = \$input \+ \$output \- \s*\d\.?\d*\s*; \$total = 0 if \$total < 0; my \$input = \$input - \s*\d\.?\d*\s*; \$input = 0 if \$input < 0; my \$output = \$output - \s*\d\.?\d*\s*; \$output = 0 if \$output < 0; \s*\d\.?\d*\s* \+ \s*\d\.?\d*\s* \* \$hours \+ \s*\d\.?\d*\s* \* \$input \+ \s*\d\.?\d*\s* \* \$output \+ \s*\d\.?\d*\s* \* \$total *;\s*$/
+
       or do {
         #log!
         return "illegal recur: $r";
@@ -295,10 +297,6 @@ sub payby {
 
 =back
 
-=head1 VERSION
-
-$Id: part_pkg.pm,v 1.16 2002-06-10 01:39:50 khoff Exp $
-
 =head1 BUGS
 
 The delete method is unimplemented.
-- 
cgit v1.2.1


From d2f7bc5bcdb39f689d4a72946f0728325d0c09c8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 6 Nov 2002 05:41:13 +0000
Subject: lala

---
 httemplate/graph/money_time-graph.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi
index 32c2d89e3..ca8f6e86b 100755
--- a/httemplate/graph/money_time-graph.cgi
+++ b/httemplate/graph/money_time-graph.cgi
@@ -6,7 +6,7 @@ my $smonth = 8;
 
 #find last month
 my $eyear = 2002;
-my $emonth = 11;
+my $emonth = 12;
 
 my @labels;
 my %data;
-- 
cgit v1.2.1


From 825c291369542af6f66fa6e08d1762374b5388a1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 7 Nov 2002 22:53:53 +0000
Subject: doc

---
 FS/FS/cust_main.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index d6e4bc1e3..f9f473db9 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -172,6 +172,8 @@ FS::Record.  The following fields are currently supported:
 
 =item comments - comments (optional)
 
+=item referral_custnum - referring customer number
+
 =back
 
 =head1 METHODS
-- 
cgit v1.2.1


From db7c28d12dae1ff90383fa64725893b198007865 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 9 Nov 2002 10:59:08 +0000
Subject: javascript quoting problem in per-hour charging

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index bea6dcb7f..1fd634961 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -395,7 +395,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctInputOctets" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctOutputOctets" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours + \' + what.recur_input_charge.value + \' * $input + \' + what.recur_output_charge.value + \' * $output + \' + what.recur_total_charge.value + \' * $total ;\'',
+    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours + \' + what.recur_input_charge.value + \' * $input + \' + what.recur_output_charge.value + \' * $output + \' + what.recur_total_charge.value + \' * $total ;\'',
   },
 
 ;
-- 
cgit v1.2.1


From 9efddfba948a749413d11970e6106651b9a41d2d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 16 Nov 2002 10:33:16 +0000
Subject: separate ACH processor support

---
 FS/FS/Conf.pm      | 11 ++++++++--
 FS/FS/cust_bill.pm | 60 +++++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index c007a501a..e76ea3873 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -268,6 +268,13 @@ httemplate/docs/config.html
     'type'        => 'textarea',
   },
 
+  {
+    'key'         => 'business-onlinepayment-ach',
+    'section'     => 'billing',
+    'description' => 'Alternate <a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a> support for ACH transactions (defaults to regular <b>business-onlinepayment</b>).  At least three lines: processor, login, and password.  An optional fourth line specifies the action or actions (multiple actions are separated with `,\': for example: `Authorization Only, Post Authorization\').    Optional additional lines are passed to Business::OnlinePayment as %processor_options.',
+    'type'        => 'textarea',
+  },
+
   {
     'key'         => 'business-onlinepayment-description',
     'section'     => 'billing',
@@ -877,7 +884,7 @@ httemplate/docs/config.html
     'section'     => '',
     'description' => 'Acceptable payment types for the signup server',
     'type'        => 'selectmultiple',
-    'select_enum' => [ qw(CARD CHEK PREPAY BILL COMP) ],
+    'select_enum' => [ qw(CARD CHEK LECB PREPAY BILL COMP) ],
   },
 
   {
@@ -964,7 +971,7 @@ httemplate/docs/config.html
     'section'     => 'UI',
     'description' => 'Default payment type.  HIDE disables display of billing information and sets customers to BILL.',
     'type'        => 'select',
-    'select_enum' => [ '', qw(CARD CHEK BILL COMP HIDE) ],
+    'select_enum' => [ '', qw(CARD CHEK LECB BILL COMP HIDE) ],
   },
 
   {
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 54641ee35..708b99746 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -3,9 +3,9 @@ package FS::cust_bill;
 use strict;
 use vars qw( @ISA $conf $money_char );
 use vars qw( $lpr $invoice_from $smtpmachine );
-use vars qw( $processor );
 use vars qw( $xaction $E_NoErr );
 use vars qw( $bop_processor $bop_login $bop_password $bop_action @bop_options );
+use vars qw( $ach_processor $ach_login $ach_password $ach_action @ach_options );
 use vars qw( $invoice_lines @buf ); #yuck
 use Date::Format;
 use Mail::Internet 1.44;
@@ -43,8 +43,20 @@ $FS::UID::callback{'FS::cust_bill'} = sub {
       @bop_options
     ) = $conf->config('business-onlinepayment');
     $bop_action ||= 'normal authorization';
+    ( $ach_processor, $ach_login, $ach_password, $ach_action, @ach_options ) =
+      ( $bop_processor, $bop_login, $bop_password, $bop_action, @bop_options );
+    eval "use Business::OnlinePayment";  
+  }
+
+  if ( $conf->exists('business-onlinepayment-ach') ) {
+    ( $ach_processor,
+      $ach_login,
+      $ach_password,
+      $ach_action,
+      @ach_options
+    ) = $conf->config('business-onlinepayment-ach');
+    $ach_action ||= 'normal authorization';
     eval "use Business::OnlinePayment";  
-    $processor="Business::OnlinePayment::$bop_processor";
   }
 
 };
@@ -592,7 +604,15 @@ for supported processors.
 
 sub realtime_card {
   my $self = shift;
-  $self->realtime_bop('CC', @_);
+  $self->realtime_bop(
+    'CC',
+    $bop_processor,
+    $bop_login,
+    $bop_password,
+    $bop_action,
+    \@bop_options,
+    @_
+  );
 }
 
 =item realtime_ach
@@ -606,20 +626,22 @@ for supported processors.
 
 sub realtime_ach {
   my $self = shift;
-  $self->realtime_bop('CHECK', @_);
+  $self->realtime_bop(
+    'CHECK',
+    $ach_processor,
+    $ach_login,
+    $ach_password,
+    $ach_action,
+    \@ach_options,
+    @_
+  );
 }
 
 sub realtime_bop {
-  my $self = shift;
-  my $method = shift;
+  my( $self, $method, $processor, $login, $password, $action, $options ) = @_;
   my $cust_main = $self->cust_main;
   my $amount = $self->owed;
 
-  unless ( $processor =~ /^Business::OnlinePayment::(.*)$/ ) {
-    return "Real-time card/ACH processing not enabled (processor $processor)";
-  }
-  my $bop_processor = $1; #hmm?
-
   my $address = $cust_main->address1;
   $address .= ", ". $cust_main->address2 if $cust_main->address2;
 
@@ -645,7 +667,7 @@ sub realtime_bop {
   }
   my $email = $invoicing_list[0];
 
-  my( $action1, $action2 ) = split(/\s*\,\s*/, $bop_action );
+  my( $action1, $action2 ) = split(/\s*\,\s*/, $action );
 
   my $description = 'Internet Services';
   if ( $conf->exists('business-onlinepayment-description') ) {
@@ -676,12 +698,12 @@ sub realtime_bop {
   }
   
   my $transaction =
-    new Business::OnlinePayment( $bop_processor, @bop_options );
+    new Business::OnlinePayment( $processor, @$options );
   $transaction->content(
     %content,
     'type'           => $method,
-    'login'          => $bop_login,
-    'password'       => $bop_password,
+    'login'          => $login,
+    'password'       => $password,
     'action'         => $action1,
     'description'    => $description,
     'amount'         => $amount,
@@ -710,14 +732,14 @@ sub realtime_bop {
     #warn "********* $auth ***********\n";
     #warn "********* $ordernum ***********\n";
     my $capture =
-      new Business::OnlinePayment( $bop_processor, @bop_options );
+      new Business::OnlinePayment( $processor, @$options );
 
     my %capture = (
       %content,
       type           => $method,
       action         => $action2,
-      login          => $bop_login,
-      password       => $bop_password,
+      login          => $login,
+      password       => $password,
       order_number   => $ordernum,
       amount         => $amount,
       authorization  => $auth,
@@ -1074,7 +1096,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.50 2002-10-15 09:54:24 ivan Exp $
+$Id: cust_bill.pm,v 1.51 2002-11-16 10:33:16 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From b0995f6ec4eeaad9c72be4963970f1d69fe1ef02 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Nov 2002 10:15:37 +0000
Subject: preliminary ldap export

---
 FS/FS/part_export.pm            |  32 ++++++
 FS/FS/part_export/ldap.pm       | 238 ++++++++++++++++++++++++++++++++++++++++
 FS/MANIFEST                     |   2 +
 FS/t/part_export-ldap.t         |   5 +
 httemplate/edit/part_export.cgi |   2 +
 5 files changed, 279 insertions(+)
 create mode 100644 FS/FS/part_export/ldap.pm
 create mode 100644 FS/t/part_export-ldap.t

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 5d725ab22..79fe91396 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -724,6 +724,32 @@ tie my %sqlmail_options, 'Tie::IxHash',
   'password' => { label=>'Database password' },
 ;
 
+tie my %ldap_options, 'Tie::IxHash',
+  'dn'         => { label=>'DN' },
+  'password'   => { label=>'Optional DN password' },
+  'attributes' => { label=>'Attributes',
+                    type=>'textarea',
+                    default=>join("\n",
+                      'uid $username',
+                      'mail $username\@$domain',
+                      'uidno $uid',
+                      'gidno $gid',
+                      'cn $first',
+                      'sn $last',
+                      'mailquota $quota',
+                      'vmail',
+                      'location',
+                      'mailtag',
+                      'mailhost',
+                      'mailmessagestore $dir',
+                      'userpassword $crypt_password',
+                      'hint',
+                      'answer $sec_phrase',
+                    ),
+                  },
+  'radius'     => { label=>'Export RADIUS attributes', type=>'checkbox', },
+;
+
 
 #export names cannot have dashes...
 %exports = (
@@ -766,6 +792,12 @@ tie my %sqlmail_options, 'Tie::IxHash',
       'notes' => 'Run remote commands via SSH.  username@domain (rather than just usernames) are considered unique (also see shellcommands).  You probably want this if the commands you are running will accept a domain as a parameter, and will allow the same username with different domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.',
     },
 
+    'ldap' => {
+      'desc' => 'Real-time export to LDAP',
+      'options' => \%ldap_options,
+      'notes' => 'Real-time export to arbitrary LDAP attributes.  Requires installation of <a href="http://search.cpan.org/search?dist=Net-LDAP">Net::LDAP</a> from CPAN.',
+    },
+
     'sqlradius' => {
       'desc' => 'Real-time export to SQL-backed RADIUS (ICRADIUS, FreeRADIUS)',
       'options' => \%sqlradius_options,
diff --git a/FS/FS/part_export/ldap.pm b/FS/FS/part_export/ldap.pm
new file mode 100644
index 000000000..40f27d695
--- /dev/null
+++ b/FS/FS/part_export/ldap.pm
@@ -0,0 +1,238 @@
+package FS::part_export::ldap;
+
+use vars qw(@ISA);
+use FS::Record qw( dbh );
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my($self, $svc_acct) = (shift, shift);
+
+  #false laziness w/shellcommands.pm
+  {
+    no strict 'refs';
+    ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
+    ${$_} = $svc_acct->$_() foreach qw( domain );
+    my $cust_pkg = $svc_acct->cust_svc->cust_pkg;
+    if ( $cust_pkg ) {
+      my $cust_main = $cust_pkg->cust_main;
+      ${$_} = $cust_main->getfield($_) foreach qw(first last);
+    }
+  }
+  $crypt_password = ''; #surpress "used only once" warnings
+  $crypt_password = crypt( $svc_acct->_password,
+                             $saltset[int(rand(64))].$saltset[int(rand(64))] );
+
+
+  my %attrib = map    { /^\s*(\w+)\s+(.*\S)\s*$/; ( $1 => eval(qq("$2")) ); }
+                 grep { /^\s*(\w+)\s+(.*\S)\s*$/ }
+                   split("\n", $self->option('attributes'));
+
+  if ( $self->option('radius') {
+    foreach my $table (qw(reply check)) {
+      my $method = "radius_$table";
+      my %radius = $svc_acct->$method();
+      foreach my $radius ( keys %radius ) {
+        ( my $ldap = $radius ) =~ s/\-//g;
+        $attrib{$ldap} = $radius{$radius};
+      }
+    }
+  }
+
+  my $err_or_queue = $self->ldap_queue( $svc_acct->svcnum, 'insert',
+    #$svc_acct->username,
+    %attrib );
+  return $err_or_queue unless ref($err_or_queue);
+
+  #groups with LDAP?
+  #my @groups = $svc_acct->radius_groups;
+  #if ( @groups ) {
+  #  my $err_or_queue = $self->ldap_queue(
+  #    $svc_acct->svcnum, 'usergroup_insert',
+  #    $svc_acct->username, @groups );
+  #  return $err_or_queue unless ref($err_or_queue);
+  #}
+
+  '';
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = (shift, shift, shift);
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  return "can't (yet?) change username with ldap"
+    if $old->username ne $new->username;
+
+  return "ldap replace unimplemented";
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $jobnum = '';
+  #if ( $old->username ne $new->username ) {
+  #  my $err_or_queue = $self->ldap_queue( $new->svcnum, 'rename',
+  #    $new->username, $old->username );
+  #  unless ( ref($err_or_queue) ) {
+  #    $dbh->rollback if $oldAutoCommit;
+  #    return $err_or_queue;
+  #  }
+  #  $jobnum = $err_or_queue->jobnum;
+  #}
+
+  foreach my $table (qw(reply check)) {
+    my $method = "radius_$table";
+    my %new = $new->$method();
+    my %old = $old->$method();
+    if ( grep { !exists $old{$_} #new attributes
+                || $new{$_} ne $old{$_} #changed
+              } keys %new
+    ) {
+      my $err_or_queue = $self->ldap_queue( $new->svcnum, 'insert',
+        $table, $new->username, %new );
+      unless ( ref($err_or_queue) ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $err_or_queue;
+      }
+      if ( $jobnum ) {
+        my $error = $err_or_queue->depend_insert( $jobnum );
+        if ( $error ) {
+          $dbh->rollback if $oldAutoCommit;
+          return $error;
+        }
+      }
+    }
+
+    my @del = grep { !exists $new{$_} } keys %old;
+    if ( @del ) {
+      my $err_or_queue = $self->ldap_queue( $new->svcnum, 'attrib_delete',
+        $table, $new->username, @del );
+      unless ( ref($err_or_queue) ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $err_or_queue;
+      }
+      if ( $jobnum ) {
+        my $error = $err_or_queue->depend_insert( $jobnum );
+        if ( $error ) {
+          $dbh->rollback if $oldAutoCommit;
+          return $error;
+        }
+      }
+    }
+  }
+
+  # (sorta) false laziness with FS::svc_acct::replace
+  my @oldgroups = @{$old->usergroup}; #uuuh
+  my @newgroups = $new->radius_groups;
+  my @delgroups = ();
+  foreach my $oldgroup ( @oldgroups ) {
+    if ( grep { $oldgroup eq $_ } @newgroups ) {
+      @newgroups = grep { $oldgroup ne $_ } @newgroups;
+      next;
+    }
+    push @delgroups, $oldgroup;
+  }
+
+  if ( @delgroups ) {
+    my $err_or_queue = $self->ldap_queue( $new->svcnum, 'usergroup_delete',
+      $new->username, @delgroups );
+    unless ( ref($err_or_queue) ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $err_or_queue;
+    }
+    if ( $jobnum ) {
+      my $error = $err_or_queue->depend_insert( $jobnum );
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
+    }
+  }
+
+  if ( @newgroups ) {
+    my $err_or_queue = $self->ldap_queue( $new->svcnum, 'usergroup_insert',
+      $new->username, @newgroups );
+    unless ( ref($err_or_queue) ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $err_or_queue;
+    }
+    if ( $jobnum ) {
+      my $error = $err_or_queue->depend_insert( $jobnum );
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+}
+
+sub _export_delete {
+  my( $self, $svc_acct ) = (shift, shift);
+  return "ldap delete unimplemented";
+  my $err_or_queue = $self->ldap_queue( $svc_acct->svcnum, 'delete',
+    $svc_acct->username );
+  ref($err_or_queue) ? '' : $err_or_queue;
+}
+
+sub ldap_queue {
+  my( $self, $svcnum, $method ) = (shift, shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => "FS::part_export::ldap::ldap_$method",
+  };
+  $queue->insert(
+    $self->machine,
+    $self->option('dn'),
+    $self->option('password'),
+    @_,
+  ) or $queue;
+}
+
+sub ldap_insert { #subroutine, not method
+  my $dn = ldap_connect(shift, shift, shift);
+  my %attrib = @_;
+
+  my $status = $ldap->add( $dn, attrs => [ %attrib ] );
+  die $status->error if $status->is_error;
+
+  $ldap->unbind;
+}
+
+#sub ldap_delete { #subroutine, not method
+#  my $dbh = ldap_connect(shift, shift, shift);
+#  my $username = shift;
+#
+#  foreach my $table (qw( radcheck radreply usergroup )) {
+#    my $sth = $dbh->prepare( "DELETE FROM $table WHERE UserName = ?" );
+#    $sth->execute($username)
+#      or die "can't delete from $table table: ". $sth->errstr;
+#  }
+#  $dbh->disconnect;
+#}
+
+sub ldap_connect {
+  my( $machine, $dn, $password ) = @_;
+
+  eval "use Net::LDAP";
+  die $@ if $@;
+
+  my $ldap = Net::LDAP->net($machine) or die $@;
+  my $status = $ldap->bind( $dn, password=>$password );
+  die $status->error if $status->is_error;
+
+  $dn;
+}
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index e37216e19..47c3bf206 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -75,6 +75,7 @@ FS/part_export/cyrus.pm
 FS/part_export/domain_shellcommands.pm
 FS/part_export/http.pm
 FS/part_export/infostreet.pm
+FS/part_export/ldap.pm
 FS/part_export/null.pm
 FS/part_export/shellcommands.pm
 FS/part_export/shellcommands_withdomain.pm
@@ -149,6 +150,7 @@ t/part_export-cyrus.t
 t/part_export-domain_shellcommands.t
 t/part_export-http.t
 t/part_export-infostreet.t
+t/part_export-ldap.t
 t/part_export-null.t
 t/part_export-shellcommands.t
 t/part_export-shellcommands_withdomain.t
diff --git a/FS/t/part_export-ldap.t b/FS/t/part_export-ldap.t
new file mode 100644
index 000000000..826c3418d
--- /dev/null
+++ b/FS/t/part_export-ldap.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::ldap;
+$loaded=1;
+print "ok 1\n";
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index bd427aa40..d64526dd4 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -70,6 +70,8 @@ my $widget = new HTML::Widgets::SelectLayers(
         $html .= qq!<TEXTAREA NAME="$option">$value</TEXTAREA>!;
       } elsif ( $type eq 'text' ) {
         $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
+      } elsif ( $type eq 'checkbox' ) {
+        $html .= qq!<INPUT TYPE="checkbox" NAME="$option" VALUE="1">!;
       } else {
         $html .= "unknown type $type";
       }
-- 
cgit v1.2.1


From d9877cfc04344365f799b52057a13fc39c5743b7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Nov 2002 05:17:46 +0000
Subject: oops, remove 10 digit account number limit

---
 httemplate/edit/cust_main.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 8f2fe7cee..c8db6b206 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -402,7 +402,7 @@ if ( $payby_default eq 'HIDE' ) {
 
   my %payby = (
     'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-    'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+    'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE=""><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
 );
-- 
cgit v1.2.1


From 789c34c5251f4b831a7cb27bd2a9af700ccf2ced Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Nov 2002 09:51:59 +0000
Subject: add LEC billing

---
 FS/FS/cust_bill.pm                        |  29 ++++-
 FS/FS/cust_main.pm                        |  17 ++-
 FS/FS/cust_pay.pm                         |   6 +-
 FS/FS/cust_refund.pm                      |   6 +-
 FS/FS/part_bill_event.pm                  |   4 +-
 FS/FS/part_export/ldap.pm                 |   2 +-
 FS/FS/part_pkg.pm                         |   2 +
 fs_signup/FS-SignupClient/cgi/signup.cgi  | 204 ++----------------------------
 fs_signup/FS-SignupClient/cgi/signup.html |   5 +
 httemplate/docs/schema.html               |   8 +-
 httemplate/edit/cust_main.cgi             |   6 +-
 httemplate/edit/part_bill_event.cgi       |   2 +-
 httemplate/view/cust_main.cgi             |   7 +
 13 files changed, 81 insertions(+), 217 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 708b99746..a682c5958 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -637,6 +637,28 @@ sub realtime_ach {
   );
 }
 
+=item realtime_lec
+
+Attempts to pay this invoice with phone bill (LEC) payment via a
+Business::OnlinePayment realtime gateway.  See
+http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment
+for supported processors.
+
+=cut
+
+sub realtime_ach {
+  my $self = shift;
+  $self->realtime_bop(
+    'LEC',
+    $bop_processor,
+    $bop_login,
+    $bop_password,
+    $bop_action,
+    \@bop_options,
+    @_
+  );
+}
+
 sub realtime_bop {
   my( $self, $method, $processor, $login, $password, $action, $options ) = @_;
   my $cust_main = $self->cust_main;
@@ -695,12 +717,13 @@ sub realtime_bop {
     ( $content{account_number}, $content{routing_code} ) =
       split('@', $cust_main->payinfo);
     $content{bank_name} = $cust_main->payname;
+  } elsif ( $method eq 'LEC' ) {
+    $content{phone} = $cust_main->payinfo;
   }
   
   my $transaction =
     new Business::OnlinePayment( $processor, @$options );
   $transaction->content(
-    %content,
     'type'           => $method,
     'login'          => $login,
     'password'       => $password,
@@ -720,6 +743,7 @@ sub realtime_bop {
     'referer'        => 'http://cleanwhisker.420.am/',
     'email'          => $email,
     'phone'          => $cust_main->daytime || $cust_main->night,
+    %content, #after
   );
   $transaction->submit();
 
@@ -771,6 +795,7 @@ sub realtime_bop {
     my %method2payby = (
       'CC'    => 'CARD',
       'CHECK' => 'CHEK',
+      'LEC'   => 'LECB',
     );
 
     my $cust_pay = new FS::cust_pay ( {
@@ -1096,7 +1121,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.51 2002-11-16 10:33:16 ivan Exp $
+$Id: cust_bill.pm,v 1.52 2002-11-19 09:51:58 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index f9f473db9..4a5cff2fc 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -158,7 +158,7 @@ FS::Record.  The following fields are currently supported:
 
 =item ship_fax - phone (optional)
 
-=item payby - `CARD' (credit cards), `CHEK' (electronic check), `BILL' (billing), `COMP' (free), or `PREPAY' (special billing type: applies a credit - see L<FS::prepay_credit> and sets billing type to BILL)
+=item payby - `CARD' (credit cards), `CHEK' (electronic check), `LECB' (Phone bill billing), `BILL' (billing), `COMP' (free), or `PREPAY' (special billing type: applies a credit - see L<FS::prepay_credit> and sets billing type to BILL)
 
 =item payinfo - card number, P.O., comp issuer (4-8 lowercase alphanumerics; think username) or prepayment identifier (see L<FS::prepay_credit>)
 
@@ -484,14 +484,15 @@ sub replace {
     $self->invoicing_list( $invoicing_list );
   }
 
-  if ( $self->payby =~ /^(CARD|CHEK)$/ &&
+  if ( $self->payby =~ /^(CARD|CHEK|LECB)$/ &&
        grep { $self->get($_) ne $old->get($_) } qw(payinfo paydate payname) ) {
     # card/check info has changed, want to retry realtime_card invoice events
     #false laziness w/collect
     foreach my $cust_bill_event (
       grep {
              #$_->part_bill_event->plan eq 'realtime-card'
-             $_->part_bill_event->eventcode eq '$cust_bill->realtime_card();'
+             $_->part_bill_event->eventcode =~
+                 /^\$cust_bill\->realtime_(card|ach|lec)\(\);$/
                && $_->status eq 'done'
                && $_->statustext
            }
@@ -691,6 +692,14 @@ sub check {
     $payinfo = "$1\@$2";
     $self->payinfo($payinfo);
 
+  } elsif ( $self->payby eq 'LECB' ) {
+
+    my $payinfo = $self->payinfo;
+    $payinfo =~ s/\D//g;
+    $payinfo =~ /^1?(\d{10})$/ or return 'invalid btn billing telephone number';
+    $payinfo = $1;
+    $self->payinfo($payinfo);
+
   } elsif ( $self->payby eq 'BILL' ) {
 
     $error = $self->ut_textn('payinfo');
@@ -715,7 +724,7 @@ sub check {
 
   if ( $self->paydate eq '' || $self->paydate eq '-' ) {
     return "Expriation date required"
-      unless $self->payby =~ /^(BILL|PREPAY|CHEK)$/;
+      unless $self->payby =~ /^(BILL|PREPAY|CHEK|LECB)$/;
     $self->paydate('');
   } else {
     $self->paydate =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 222691408..79cf82755 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -61,7 +61,7 @@ currently supported:
 L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =item payby - `CARD' (credit cards), `CHEK' (electronic check/ACH),
-`BILL' (billing), or `COMP' (free)
+`LECB' (phone bill billing), `BILL' (billing), or `COMP' (free)
 
 =item payinfo - card number, check #, or comp issuer (4-8 lowercase alphanumerics; think username), respectively
 
@@ -347,7 +347,7 @@ sub check {
 
   $self->_date(time) unless $self->_date;
 
-  $self->payby =~ /^(CARD|CHEK|BILL|COMP)$/ or return "Illegal payby";
+  $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP)$/ or return "Illegal payby";
   $self->payby($1);
 
   #false laziness with cust_refund::check
@@ -406,7 +406,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.22 2002-10-12 10:15:55 ivan Exp $
+$Id: cust_pay.pm,v 1.23 2002-11-19 09:51:58 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index aac320e61..763671736 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -48,7 +48,7 @@ inherits from FS::Record.  The following fields are currently supported:
 L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =item payby - `CARD' (credit cards), `CHEK' (electronic check/ACH),
-`BILL' (billing), or `COMP' (free)
+`LECB' (Phone bill billing), `BILL' (billing), or `COMP' (free)
 
 =item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
 
@@ -235,7 +235,7 @@ sub check {
     unless $self->crednum 
            || qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
 
-  $self->payby =~ /^(CARD|CHEK|BILL|COMP)$/ or return "Illegal payby";
+  $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP)$/ or return "Illegal payby";
   $self->payby($1);
 
   #false laziness with cust_pay::check
@@ -267,7 +267,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.19 2002-10-12 10:15:55 ivan Exp $
+$Id: cust_refund.pm,v 1.20 2002-11-19 09:51:58 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
index e86b5c1fb..dc10be879 100644
--- a/FS/FS/part_bill_event.pm
+++ b/FS/FS/part_bill_event.pm
@@ -37,7 +37,7 @@ FS::Record.  The following fields are currently supported:
 
 =item eventpart - primary key
 
-=item payby - CARD, CHEK, BILL, or COMP
+=item payby - CARD, CHEK, LECB, BILL, or COMP
 
 =item event - event name
 
@@ -140,7 +140,7 @@ sub check {
   }
 
   my $error = $self->ut_numbern('eventpart')
-    || $self->ut_enum('payby', [qw( CARD CHEK BILL COMP )] )
+    || $self->ut_enum('payby', [qw( CARD CHEK LECB BILL COMP )] )
     || $self->ut_text('event')
     || $self->ut_anything('eventcode')
     || $self->ut_number('seconds')
diff --git a/FS/FS/part_export/ldap.pm b/FS/FS/part_export/ldap.pm
index 40f27d695..ec1d37fd5 100644
--- a/FS/FS/part_export/ldap.pm
+++ b/FS/FS/part_export/ldap.pm
@@ -31,7 +31,7 @@ sub _export_insert {
                  grep { /^\s*(\w+)\s+(.*\S)\s*$/ }
                    split("\n", $self->option('attributes'));
 
-  if ( $self->option('radius') {
+  if ( $self->option('radius') ) {
     foreach my $table (qw(reply check)) {
       my $method = "radius_$table";
       my %radius = $svc_acct->$method();
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index f290420df..99d88d56a 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -282,6 +282,8 @@ following logic instead;
 If the package has B<0> setup and B<0> recur, the single item B<BILL> is
 returned, otherwise, the single item B<CARD> is returned.
 
+(CHEK?  LEC?  Probably shouldn't accept those by default, prone to abuse)
+
 =cut
 
 sub payby {
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 333a88cf8..1eb0613ba 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.31 2002-10-12 10:15:55 ivan Exp $
+# $Id: signup.cgi,v 1.32 2002-11-19 09:51:59 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -18,7 +18,7 @@ use vars qw( @payby $cgi $locales $packages $pops $init_data $error
              $self_url
            );
 use subs qw( print_form print_okay print_decline
-             signup_default success_default decline_default
+             success_default decline_default
              expselect );
 use CGI;
 #use CGI::Carp qw(fatalsToBrowser);
@@ -88,11 +88,13 @@ if ( -e $signup_html ) {
     $agentnum = $1;
   }
 } else {
-  $signup_template = new Text::Template ( TYPE => 'STRING',
-                                          SOURCE => &signup_default,
-                                          DELIMITERS => [ '<%=', '%>' ]
-                                        )
-    or die $Text::Template::ERROR;
+  #too much maintenance hassle to keep in this file
+  die "can't find ./signup.html or /usr/local/freeside/signup.html";
+  #$signup_template = new Text::Template ( TYPE => 'STRING',
+  #                                        SOURCE => &signup_default,
+  #                                        DELIMITERS => [ '<%=', '%>' ]
+  #                                      )
+  #  or die $Text::Template::ERROR;
 }
 
 if ( -e $success_html ) {
@@ -510,191 +512,3 @@ support.
 END
 }
 
-sub signup_default { #html to use if you don't specify a template file
-  <<'END';
-<HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>ISP Signup form</FONT><BR><BR>
-<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
-<FORM ACTION="<%= $self_url %>" METHOD=POST>
-<INPUT TYPE="hidden" NAME="magic" VALUE="process">
-<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
-<INPUT TYPE="hidden" NAME="ss" VALUE="">
-Contact Information
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Contact name<BR>(last, first)</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="last" VALUE="<%= $last %>">,
-                <INPUT TYPE="text" NAME="first" VALUE="<%= $first %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Company</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="<%= $company %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Address</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="<%= $address1 %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">&nbsp;</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="<%= $address2 %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
-  <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
-  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
-  <TD><SELECT NAME="state" SIZE="1">
-
-  <%=
-    foreach ( @{$locales} ) {
-      $OUT .= '<OPTION';
-      $OUT .= ' SELECTED' if ( $state eq $_->{'state'}
-                               && $county eq $_->{'county'}
-                               && $country eq $_->{'country'}
-                             );
-      $OUT .= '>'. $_->{'state'};
-      $OUT .= ' ('. $_->{'county'}. ')' if $_->{'county'};
-      $OUT .= ' / '. $_->{'country'};
-    }
-  %>
-
-  </SELECT></TD>
-  <TH><font color="#ff0000">*</font>Zip</TH>
-  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Day Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="<%= $daytime %>" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Night Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="<%= $night %>" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Fax</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="<%= $fax %>" SIZE=12></TD>
-</TR>
-</TABLE><font color="#ff0000">*</font> required fields<BR>
-<BR>Billing information<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR><TD>
-
-  <%=
-    $OUT .= '<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"';
-    my @invoicing_list = split(', ', $invoicing_list );
-    $OUT .= ' CHECKED'
-      if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
-    $OUT .= '>';
-  %>
-
-  Postal mail invoice
-</TD></TR>
-<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="<%= join(', ', grep { $_ ne 'POST' } split(', ', $invoicing_list ) ) %>">
-</TD></TR>
-<%= scalar(@payby) > 1 ? '<TR><TD>Billing type</TD></TR>' : '' %>
-</TABLE>
-<TABLE BGCOLOR="#c0c0c0" BORDER=1 WIDTH="100%">
-<TR>
-
-  <%=
-
-    my $cardselect = '<SELECT NAME="CARD_type"><OPTION></OPTION>';
-    my %types = (
-                  'VISA' => 'VISA card',
-                  'MasterCard' => 'MasterCard',
-                  'Discover' => 'Discover card',
-                  'American Express' => 'American Express card',
-                );
-    foreach ( keys %types ) {
-      $selected = $cgi->param('CARD_type') eq $types{$_} ? 'SELECTED' : '';
-      $cardselect .= qq!<OPTION $selected VALUE="$types{$_}">$_</OPTION>!;
-    }
-    $cardselect .= '</SELECT>';
-  
-    my %payby = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
-      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
-      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
-      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
-    );
-
-  my( $account, $aba ) = split('@', $payinfo);
-
-    my %paybychecked = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-    'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
-      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
-      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
-      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
-    );
-
-    for (@payby) {
-      if ( scalar(@payby) == 1) {
-        $OUT .= '<TD VALIGN=TOP>'.
-                qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$_">!.
-                "$paybychecked{$_}</TD>";
-      } else {
-        $OUT .= qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
-        if ($payby eq $_) {
-          $OUT .= qq! CHECKED> $paybychecked{$_}</TD>!;
-        } else {
-          $OUT .= qq!> $payby{$_}</TD>!;
-        }
-
-      }
-    }
-  %>
-
-</TR></TABLE><font color="#ff0000">*</font> required fields for each billing type
-<BR><BR>First package
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TD COLSPAN=2><SELECT NAME="pkgpart"><OPTION VALUE="">(none)
-
-  <%=
-    foreach my $package ( @{$packages} ) {
-      $OUT .= '<OPTION VALUE="'. $package->{'pkgpart'}. '"';
-      $OUT .= ' SELECTED' if $pkgpart && $package->{'pkgpart'} == $pkgpart;
-      $OUT .= '>'. $package->{'pkg'};
-    }
-  %>
-
-  </SELECT></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Username</TD>
-  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Re-enter Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>"></TD>
-</TR>
-<%=
-  if ( $init_data->{'security_phrase'} ) {
-    $OUT .= <<ENDOUT;
-<TR>
-  <TD ALIGN="right">Security Phrase</TD>
-  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
-  </TD>
-</TR>
-ENDOUT
-  } else {
-    $OUT .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
-  }
-%>
-<%=
-  if ( scalar(@$pops) ) {
-    $OUT .= '<TR><TD ALIGN="right">Access number</TD><TD>'.
-            popselector($popnum). '</TD></TR>';
-  } else {
-    $OUT .= popselector($popnum);
-  }
-%>
-</TABLE>
-<BR><BR><INPUT TYPE="submit" VALUE="Signup">
-</FORM></BODY></HTML>
-END
-}
diff --git a/fs_signup/FS-SignupClient/cgi/signup.html b/fs_signup/FS-SignupClient/cgi/signup.html
index 6c601410c..d89b6854b 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.html
+++ b/fs_signup/FS-SignupClient/cgi/signup.html
@@ -97,13 +97,18 @@ Contact Information
   
     my %payby = (
       'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
       'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", "12-2037"). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
       'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
       'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
     );
 
+    my( $account, $aba ) = split('@', $payinfo);
     my %paybychecked = (
       'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
       'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", $paydate). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
       'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
       'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index c518d4a4d..b4d21f3b9 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -39,7 +39,7 @@
     <li><a name="part_bill_event" href="man/FS/part_bill_event.html">part_bill_event</a> - Invoice event definitions
       <ul>
         <li>eventpart - primary key
-        <li>payby - CARD, BILL, or COMP
+        <li>payby - CARD, CHEK, LECB, BILL, or COMP
         <li>event - event name
         <li>eventcode - event action
         <li>seconds - how long after the invoice date (<a href="#cust_bill">cust_bill</a>._date) events of this type are triggered
@@ -109,7 +109,7 @@
         <li><i>ship_daytime</i>
         <li><i>ship_night</i>
         <li><i>ship_fax</i>
-        <li>payby - CARD, BILL, or COMP
+        <li>payby - CARD, CHEK, LECB, BILL, or COMP
         <li>payinfo - card number, P.O.#, or comp issuer
         <li>paydate - expiration date
         <li>payname - billing name (name on card)
@@ -150,7 +150,7 @@
         <li>custnum - <a href="#cust_main">customer</a>
         <li>paid - amount
         <li>_date
-        <li>payby - CARD, BILL, or COMP
+        <li>payby - CARD, CHEK, LECB, BILL, or COMP
         <li>payinfo - card number, P.O.#, or comp issuer
         <li>paybatch - text field for tracking card processor batches
         <li>closed - books closed flag, empty or `Y'
@@ -200,7 +200,7 @@
         <li>custnum - <a href="#cust_main">customer</a>
         <li>refund - amount
         <li>_date
-        <li>payby - CARD, BILL or COMP
+        <li>payby - CARD, CHEK, LECB, BILL or COMP
         <li>payinfo - card number, P.O.#, or comp issuer
         <li>otaker - order taker
         <li>closed - books closed flag, empty or `Y'
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index c8db6b206..5642604d2 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -353,7 +353,7 @@ if ( $payby_default eq 'HIDE' ) {
   print qq!<INPUT TYPE="hidden" NAME="invoicing_list" VALUE="!.
         join(', ', $cust_main->invoicing_list). '">';
 
-  foreach my $payby (qw( CARD CHEK BILL COMP )) {
+  foreach my $payby (qw( CARD CHEK LECB BILL COMP )) {
     foreach my $field (qw( payinfo payname )) {
       print qq!<INPUT TYPE="hidden" NAME="${payby}_$field" VALUE="!.
             $cust_main->getfield($field). '">';
@@ -403,6 +403,7 @@ if ( $payby_default eq 'HIDE' ) {
   my %payby = (
     'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
     'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE=""><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+    'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
 );
@@ -412,12 +413,13 @@ if ( $payby_default eq 'HIDE' ) {
   my %paybychecked = (
     'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
     'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+    'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
 );
 
   $cust_main->payby($payby_default) unless $cust_main->payby;
-  for (qw(CARD CHEK BILL COMP)) {
+  for (qw(CARD CHEK LECB BILL COMP)) {
     print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
     if ($cust_main->payby eq "$_") {
       print qq! CHECKED> $paybychecked{$_}</TD>!;
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 70aca99eb..30a60ea41 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -41,7 +41,7 @@ print ntable("#cccccc",2), <<END;
 <TR><TD ALIGN="right">Payby</TD><TD><SELECT NAME="payby">
 END
 
-for (qw(CARD CHEK BILL COMP)) {
+for (qw(CARD CHEK LECB BILL COMP)) {
   print qq!<OPTION VALUE="$_"!;
   if ($part_bill_event->payby eq $_) {
     print " SELECTED>$_</OPTION>";
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 7dbdc1356..c49efa653 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -231,6 +231,13 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
           '<TR><TD ALIGN="right">Bank name</TD><TD BGCOLOR="#ffffff">',
           $cust_main->payname, '</TD></TR>'
     ;
+  } elsif ( $cust_main->payby eq 'LECB' ) {
+    $cust_main->payinfo =~ /^(\d{3})(\d{3})(\d{4})$/;
+    my $payinfo = "$1-$2-$3";
+    print 'Phone bill billing</TD></TR>',
+          '<TR><TD ALIGN="right">Phone number</TD><TD BGCOLOR="#ffffff">',
+          $payinfo, '</TD></TR>',
+    ;
   } elsif ( $cust_main->payby eq 'BILL' ) {
     print 'Billing</TD></TR>';
     print '<TR><TD ALIGN="right">P.O. </TD><TD BGCOLOR="#ffffff">',
-- 
cgit v1.2.1


From ec28c4e3c2a08f0057020b81907174e84a654d25 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Nov 2002 10:02:19 +0000
Subject: silly regex bug parsing echeck info

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 4a5cff2fc..a8b1dc291 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -687,7 +687,7 @@ sub check {
   } elsif ( $self->payby eq 'CHEK' ) {
 
     my $payinfo = $self->payinfo;
-    $payinfo =~ s/[\D\@]//g;
+    $payinfo =~ s/[^\d\@]//g;
     $payinfo =~ /^(\d+)\@(\d{9})$/ or return 'invalid echeck account@aba';
     $payinfo = "$1\@$2";
     $self->payinfo($payinfo);
-- 
cgit v1.2.1


From 103cdcd9ea5630d3b1ce263345c48cd8d261e34c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Nov 2002 10:09:34 +0000
Subject: typo adding lec transactions

---
 FS/FS/cust_bill.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index a682c5958..3e9377802 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -646,7 +646,7 @@ for supported processors.
 
 =cut
 
-sub realtime_ach {
+sub realtime_lec {
   my $self = shift;
   $self->realtime_bop(
     'LEC',
@@ -1121,7 +1121,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.52 2002-11-19 09:51:58 ivan Exp $
+$Id: cust_bill.pm,v 1.53 2002-11-19 10:09:34 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 55bfcaa26d8cc7729a8fbaa3a5325e4372588e8b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Nov 2002 20:36:43 +0000
Subject: increase length of reczone and recdata fields in domain_record

---
 FS/bin/freeside-setup | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index d61e8b0bf..587f0158b 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -805,10 +805,12 @@ sub tables_hash_hack {
       'columns' => [
         'recnum',    'serial',     '',  '',
         'svcnum',    'int',     '',  '',
-        'reczone',   'varchar', '',  $char_d,
+        #'reczone',   'varchar', '',  $char_d,
+        'reczone',   'varchar', '',  255,
         'recaf',     'char',    '',  2,
         'rectype',   'char',    '',  5,
-        'recdata',   'varchar', '',  $char_d,
+        #'recdata',   'varchar', '',  $char_d,
+        'recdata',   'varchar', '',  255,
       ],
       'primary_key' => 'recnum',
       'unique'      => [],
-- 
cgit v1.2.1


From f5be6be6a52ee4461243eeaadcf769c14571b82f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Nov 2002 20:56:12 +0000
Subject: ldap export update

---
 FS/FS/part_export/ldap.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export/ldap.pm b/FS/FS/part_export/ldap.pm
index ec1d37fd5..6077b7418 100644
--- a/FS/FS/part_export/ldap.pm
+++ b/FS/FS/part_export/ldap.pm
@@ -229,7 +229,7 @@ sub ldap_connect {
   eval "use Net::LDAP";
   die $@ if $@;
 
-  my $ldap = Net::LDAP->net($machine) or die $@;
+  my $ldap = Net::LDAP->new($machine) or die $@;
   my $status = $ldap->bind( $dn, password=>$password );
   die $status->error if $status->is_error;
 
-- 
cgit v1.2.1


From bf79e1879f8f6b309391a71c9d563d9ee8782e36 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Nov 2002 21:20:03 +0000
Subject: ldap export: don't use password if not given

---
 FS/FS/part_export/ldap.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_export/ldap.pm b/FS/FS/part_export/ldap.pm
index 6077b7418..776814c59 100644
--- a/FS/FS/part_export/ldap.pm
+++ b/FS/FS/part_export/ldap.pm
@@ -225,12 +225,14 @@ sub ldap_insert { #subroutine, not method
 
 sub ldap_connect {
   my( $machine, $dn, $password ) = @_;
+  my %bind_options;
+  $bind_options{password} = $password if length($password);
 
   eval "use Net::LDAP";
   die $@ if $@;
 
   my $ldap = Net::LDAP->new($machine) or die $@;
-  my $status = $ldap->bind( $dn, password=>$password );
+  my $status = $ldap->bind( $dn, %bind_options );
   die $status->error if $status->is_error;
 
   $dn;
-- 
cgit v1.2.1


From 34928158d52fb8456aa665c4bacd1f915b9cae0d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Nov 2002 22:48:02 +0000
Subject: Business::OnlinePayment type is ECHECK not CHECK

---
 FS/FS/cust_bill.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 3e9377802..75e2b1718 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -627,7 +627,7 @@ for supported processors.
 sub realtime_ach {
   my $self = shift;
   $self->realtime_bop(
-    'CHECK',
+    'ECHECK',
     $ach_processor,
     $ach_login,
     $ach_password,
@@ -668,7 +668,7 @@ sub realtime_bop {
   $address .= ", ". $cust_main->address2 if $cust_main->address2;
 
   my($payname, $payfirst, $paylast);
-  if ( $cust_main->payname && $method ne 'CHECK' ) {
+  if ( $cust_main->payname && $method ne 'ECHECK' ) {
     $payname = $cust_main->payname;
     $payname =~ /^\s*([\w \,\.\-\']*)?\s+([\w\,\.\-\']+)\s*$/
       or do {
@@ -712,7 +712,7 @@ sub realtime_bop {
     $content{card_number} = $cust_main->payinfo;
     $cust_main->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
     $content{expiration} = "$2/$1";
-  } elsif ( $method eq 'CHECK' ) {
+  } elsif ( $method eq 'ECHECK' ) {
     my($account_number,$routing_code) = $cust_main->payinfo;
     ( $content{account_number}, $content{routing_code} ) =
       split('@', $cust_main->payinfo);
@@ -793,9 +793,9 @@ sub realtime_bop {
   if ( $transaction->is_success() ) {
 
     my %method2payby = (
-      'CC'    => 'CARD',
-      'CHECK' => 'CHEK',
-      'LEC'   => 'LECB',
+      ' CC'    => 'CARD',
+      'ECHECK' => 'CHEK',
+      'LEC'    => 'LECB',
     );
 
     my $cust_pay = new FS::cust_pay ( {
@@ -1121,7 +1121,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.53 2002-11-19 10:09:34 ivan Exp $
+$Id: cust_bill.pm,v 1.54 2002-11-19 22:48:02 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 26da8f3994e58ca5cf80ac62f034b3ad64539e47 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Nov 2002 22:55:06 +0000
Subject: give better error message on bad invnum, also 'use FS::cust_bill'
 here

---
 FS/FS/cust_bill_event.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill_event.pm b/FS/FS/cust_bill_event.pm
index f631987aa..44e4d4797 100644
--- a/FS/FS/cust_bill_event.pm
+++ b/FS/FS/cust_bill_event.pm
@@ -3,6 +3,7 @@ package FS::cust_bill_event;
 use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs );
+use FS::cust_bill;
 use FS::part_bill_event;
 
 @ISA = qw(FS::Record);
@@ -111,10 +112,10 @@ sub check {
     || $self->ut_textn('statustext')
   ;
 
-  return "Unknown invnum"
+  return "Unknown invnum ". $self->invnum
     unless qsearchs( 'cust_bill' ,{ 'invnum' => $self->invnum } );
 
-  return "Unknown eventpart"
+  return "Unknown eventpart ". $self->eventpart
     unless qsearchs( 'part_bill_event' ,{ 'eventpart' => $self->eventpart } );
 
   ''; #no error
-- 
cgit v1.2.1


From cfd4d4d5fd2c64f0f0512905a465aeb4abce484c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Nov 2002 09:07:27 +0000
Subject: ugh... need to increase length of payinfo field in cust_pay and
 cust_refund for ACH

---
 FS/bin/freeside-setup         | 4 ++--
 httemplate/docs/upgrade9.html | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 587f0158b..8f3d99fd5 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -541,7 +541,7 @@ sub tables_hash_hack {
         '_date',    @date_type,
         'payby',    'char',   '',     4, # CARD/BILL/COMP, should be index into
                                          # payment type table.
-        'payinfo',  'varchar',   'NULL', 16,  #see cust_main above
+        'payinfo',  'varchar',   'NULL', $char_d,  #see cust_main above
         'paybatch', 'varchar',   'NULL', $char_d, #for auditing purposes.
         'closed',    'char', 'NULL', 1,
       ],
@@ -618,7 +618,7 @@ sub tables_hash_hack {
         'reason',       'varchar',   '',   $char_d,
         'payby',        'char',   '',     4, # CARD/BILL/COMP, should be index
                                              # into payment type table.
-        'payinfo',      'varchar',   'NULL', 16,  #see cust_main above
+        'payinfo',      'varchar',   'NULL', $char_d,  #see cust_main above
         'paybatch',     'varchar',   'NULL', $char_d,
         'closed',    'char', 'NULL', 1,
       ],
diff --git a/httemplate/docs/upgrade9.html b/httemplate/docs/upgrade9.html
index bcd3f4d5a..da5b643fb 100644
--- a/httemplate/docs/upgrade9.html
+++ b/httemplate/docs/upgrade9.html
@@ -15,5 +15,6 @@
 INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 18, 'daytime', 'en_US', 'Day Phone' );
 INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 19, 'night', 'en_US', 'Night Phone' );
 </pre>
+  <li>If you want to use ACH (electronic checks), you will need to make changes to your database.  The easiest way to make these changes is to dump your database (with pg_dump), change the payinfo field in the cust_pay, cust_refund, h_cust_pay and h_cust_refund tables from varchar(16) to varchar(80), reload the database from the dump, and run dbdef-create
   <li>Restart Apache and freeside-queued.
 </body>
-- 
cgit v1.2.1


From 4631154982b0607405c2cabc8f1a718445307f4d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Nov 2002 09:10:02 +0000
Subject: fix silly bug in ldap export

---
 FS/FS/part_export/ldap.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/ldap.pm b/FS/FS/part_export/ldap.pm
index 776814c59..57d213af0 100644
--- a/FS/FS/part_export/ldap.pm
+++ b/FS/FS/part_export/ldap.pm
@@ -202,7 +202,7 @@ sub ldap_queue {
 }
 
 sub ldap_insert { #subroutine, not method
-  my $dn = ldap_connect(shift, shift, shift);
+  my $ldap = ldap_connect(shift, (my $dn = shift), shift);
   my %attrib = @_;
 
   my $status = $ldap->add( $dn, attrs => [ %attrib ] );
@@ -235,6 +235,6 @@ sub ldap_connect {
   my $status = $ldap->bind( $dn, %bind_options );
   die $status->error if $status->is_error;
 
-  $dn;
+  $ldap;
 }
 
-- 
cgit v1.2.1


From eb694678cbb835267b44c5eb9ff574ee1d7ce115 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Nov 2002 10:09:19 +0000
Subject: hmm, so you add the username to the DN for the add call...?  i don't
 get LDAP

---
 FS/FS/part_export/ldap.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/ldap.pm b/FS/FS/part_export/ldap.pm
index 57d213af0..6ff9abe12 100644
--- a/FS/FS/part_export/ldap.pm
+++ b/FS/FS/part_export/ldap.pm
@@ -27,7 +27,10 @@ sub _export_insert {
                              $saltset[int(rand(64))].$saltset[int(rand(64))] );
 
 
-  my %attrib = map    { /^\s*(\w+)\s+(.*\S)\s*$/; ( $1 => eval(qq("$2")) ); }
+  my $username_attrib;
+  my %attrib = map    { /^\s*(\w+)\s+(.*\S)\s*$/;
+                        $username_attrib = $1 if $2 eq '$username';
+                        ( $1 => eval(qq("$2")) );                   }
                  grep { /^\s*(\w+)\s+(.*\S)\s*$/ }
                    split("\n", $self->option('attributes'));
 
@@ -44,6 +47,7 @@ sub _export_insert {
 
   my $err_or_queue = $self->ldap_queue( $svc_acct->svcnum, 'insert',
     #$svc_acct->username,
+    $username_attrib,
     %attrib );
   return $err_or_queue unless ref($err_or_queue);
 
@@ -203,7 +207,8 @@ sub ldap_queue {
 
 sub ldap_insert { #subroutine, not method
   my $ldap = ldap_connect(shift, (my $dn = shift), shift);
-  my %attrib = @_;
+  my( $username_attrib, %attrib ) = @_;
+  $dn = "$username_attrib=$attrib{$username_attrib}, $dn" if $username_attrib;
 
   my $status = $ldap->add( $dn, attrs => [ %attrib ] );
   die $status->error if $status->is_error;
-- 
cgit v1.2.1


From 96c1150cabe382dbafbdc8f4e89a2719fe24d605 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Nov 2002 21:13:52 +0000
Subject: add objectclass and ability to have multiple comma-separated values
 to LDAP export

---
 FS/FS/part_export.pm      | 1 +
 FS/FS/part_export/ldap.pm | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 79fe91396..86bd4240e 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -745,6 +745,7 @@ tie my %ldap_options, 'Tie::IxHash',
                       'userpassword $crypt_password',
                       'hint',
                       'answer $sec_phrase',
+                      'objectclass top,person,inetOrgPerson',
                     ),
                   },
   'radius'     => { label=>'Export RADIUS attributes', type=>'checkbox', },
diff --git a/FS/FS/part_export/ldap.pm b/FS/FS/part_export/ldap.pm
index 6ff9abe12..a28504313 100644
--- a/FS/FS/part_export/ldap.pm
+++ b/FS/FS/part_export/ldap.pm
@@ -208,7 +208,12 @@ sub ldap_queue {
 sub ldap_insert { #subroutine, not method
   my $ldap = ldap_connect(shift, (my $dn = shift), shift);
   my( $username_attrib, %attrib ) = @_;
+
   $dn = "$username_attrib=$attrib{$username_attrib}, $dn" if $username_attrib;
+  #icky hack, but should be unsurprising to the LDAPers
+  foreach my $key ( grep { $attrib{$_} =~ /,/ } keys %attrib ) {
+    $attrib{$key} = [ split(/,/, $attrib{$key}) ]; 
+  }
 
   my $status = $ldap->add( $dn, attrs => [ %attrib ] );
   die $status->error if $status->is_error;
-- 
cgit v1.2.1


From 4d04b87cf2223bea7c913f587a248c111862f070 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 21 Nov 2002 20:44:45 +0000
Subject: change DN labeling for those obtuse blockheads at netmagic

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 86bd4240e..8e8a828e7 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -725,7 +725,7 @@ tie my %sqlmail_options, 'Tie::IxHash',
 ;
 
 tie my %ldap_options, 'Tie::IxHash',
-  'dn'         => { label=>'DN' },
+  'dn'         => { label=>'Root DN' },
   'password'   => { label=>'Optional DN password' },
   'attributes' => { label=>'Attributes',
                     type=>'textarea',
-- 
cgit v1.2.1


From 66c7798152b9abecd00727d4814af5c10bcc84b3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Nov 2002 00:14:22 +0000
Subject: signup server: use 'daytime' for LECB payinfo

---
 fs_signup/fs_signup_server | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 703c76ec7..0f83ec31d 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -140,6 +140,9 @@ while (1) {
     $error ||= "Illegal payment type"
       unless grep { $_ eq $signup_data->{'payby'} } @payby;
 
+    $cust_main->payinfo = $cust_main->daytime
+      if $cust_main->payby eq 'LECB' && ! $cust_main->payinfo;
+
     my @invoicing_list = split( /\s*\,\s*/, $signup_data->{'invoicing_list'} );
 
     $signup_data->{'pkgpart'} =~ /^(\d+)$/ or '' =~ /^()$/;
-- 
cgit v1.2.1


From 7a94fd2dd84ccb204e97e8cbd9ce4162e93fd12e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Nov 2002 07:50:23 +0000
Subject: separate root and user dn in ldap export

---
 FS/FS/part_export.pm      |  3 ++-
 FS/FS/part_export/ldap.pm | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 8e8a828e7..4b15f44ca 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -726,7 +726,8 @@ tie my %sqlmail_options, 'Tie::IxHash',
 
 tie my %ldap_options, 'Tie::IxHash',
   'dn'         => { label=>'Root DN' },
-  'password'   => { label=>'Optional DN password' },
+  'password'   => { label=>'Root DN password' },
+  'userdn'     => { label=>'User DN' },
   'attributes' => { label=>'Attributes',
                     type=>'textarea',
                     default=>join("\n",
diff --git a/FS/FS/part_export/ldap.pm b/FS/FS/part_export/ldap.pm
index a28504313..68a63528e 100644
--- a/FS/FS/part_export/ldap.pm
+++ b/FS/FS/part_export/ldap.pm
@@ -201,21 +201,23 @@ sub ldap_queue {
     $self->machine,
     $self->option('dn'),
     $self->option('password'),
+    $self->option('userdn'),
     @_,
   ) or $queue;
 }
 
 sub ldap_insert { #subroutine, not method
-  my $ldap = ldap_connect(shift, (my $dn = shift), shift);
-  my( $username_attrib, %attrib ) = @_;
+  my $ldap = ldap_connect(shift, shift, shift);
+  my( $userdn, $username_attrib, %attrib ) = @_;
 
-  $dn = "$username_attrib=$attrib{$username_attrib}, $dn" if $username_attrib;
+  $userdn = "$username_attrib=$attrib{$username_attrib}, $userdn"
+    if $username_attrib;
   #icky hack, but should be unsurprising to the LDAPers
   foreach my $key ( grep { $attrib{$_} =~ /,/ } keys %attrib ) {
     $attrib{$key} = [ split(/,/, $attrib{$key}) ]; 
   }
 
-  my $status = $ldap->add( $dn, attrs => [ %attrib ] );
+  my $status = $ldap->add( $userdn, attrs => [ %attrib ] );
   die $status->error if $status->is_error;
 
   $ldap->unbind;
-- 
cgit v1.2.1


From 3b6dc7455da7e713b7400bc543921e7e4b620152 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Nov 2002 08:06:54 +0000
Subject: silly LECB error in signup server

---
 fs_signup/fs_signup_server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 0f83ec31d..4b7e898f6 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -140,7 +140,7 @@ while (1) {
     $error ||= "Illegal payment type"
       unless grep { $_ eq $signup_data->{'payby'} } @payby;
 
-    $cust_main->payinfo = $cust_main->daytime
+    $cust_main->payinfo($cust_main->daytime)
       if $cust_main->payby eq 'LECB' && ! $cust_main->payinfo;
 
     my @invoicing_list = split( /\s*\,\s*/, $signup_data->{'invoicing_list'} );
-- 
cgit v1.2.1


From 071c5ee7dfb91ff3106310cedd002cff0554b9aa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Nov 2002 10:48:34 +0000
Subject: oops, one last LECB change

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index a8b1dc291..237abcddb 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -667,7 +667,7 @@ sub check {
     }
   }
 
-  $self->payby =~ /^(CARD|CHEK|BILL|COMP|PREPAY)$/
+  $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP|PREPAY)$/
     or return "Illegal payby: ". $self->payby;
   $self->payby($1);
 
-- 
cgit v1.2.1


From 37dc3ebec42104e6ba77dae9a4d8dbdf31364678 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Nov 2002 11:14:04 +0000
Subject: add lec billing event

---
 FS/FS/part_bill_event.pm            | 2 +-
 httemplate/edit/part_bill_event.cgi | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
index dc10be879..a75a011b0 100644
--- a/FS/FS/part_bill_event.pm
+++ b/FS/FS/part_bill_event.pm
@@ -124,7 +124,7 @@ sub check {
 
     $c =~ /^\s*\$cust_main\->(suspend|cancel|invoicing_list_addpost|bill|collect)\(\);\s*("";)?\s*$/
 
-      or $c =~ /^\s*\$cust_bill\->(comp|realtime_card|realtime_ach|realtime_card_cybercash|batch_card|send)\(\);\s*$/
+      or $c =~ /^\s*\$cust_bill\->(comp|realtime_(card|ach|lec)|realtime_card_cybercash|batch_card|send)\(\);\s*$/
 
       or $c =~ /^\s*\$cust_bill\->send\(\'\w+\'\);\s*$/
 
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 30a60ea41..2104b4530 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -114,6 +114,12 @@ tie my %events, 'Tie::IxHash',
     'weight' => 30,
   },
 
+  'realtime-lec' => {
+    'name' => 'Run phone bill ("LEC") billing with a <a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a> realtime gateway',
+    'code' => '$cust_bill->realtime_lec();',
+    'weight' => 30,
+  },
+
   'batch-card' => {
     'name' => 'Add card to the pending credit card batch',
     'code' => '$cust_bill->batch_card();',
-- 
cgit v1.2.1


From edb6a2341e74b303ea6278a294be9162ddc46c01 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Nov 2002 12:19:15 +0000
Subject: fix nasty typo which would affect credit card payments

---
 FS/FS/cust_bill.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 75e2b1718..3481a9a86 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -793,7 +793,7 @@ sub realtime_bop {
   if ( $transaction->is_success() ) {
 
     my %method2payby = (
-      ' CC'    => 'CARD',
+      'CC'     => 'CARD',
       'ECHECK' => 'CHEK',
       'LEC'    => 'LECB',
     );
@@ -1121,7 +1121,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.54 2002-11-19 22:48:02 ivan Exp $
+$Id: cust_bill.pm,v 1.55 2002-11-22 12:19:15 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From a2ce67a0ef3090d9c8c117f562f6aeebe4fefc13 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 23 Nov 2002 03:39:03 +0000
Subject: eww get rid of black border on konq3

---
 httemplate/index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index 017a2cc3a..e8c3681b4 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -22,7 +22,7 @@
 [ <A HREF="#bookkeeping">Bookkeeping / Collections</A> ]
 [ <A HREF="#reports">Reports</A> ]
 [ <A HREF="#sysadmin">Sysadmin</A> ]
-    <TABLE CELLSPACING=2 CELLPADDING=0 BORDERCOLOR="#000000" WIDTH="100%" BGCOLOR="#eeeeee">
+    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0" WIDTH="100%" BGCOLOR="#eeeeee">
     <TR><TH BGCOLOR="#cccccc">Sales / Customer service</TH></TR>
     <TR><TD>
         <BR><FONT SIZE="+1"><A HREF="edit/cust_main.cgi">New Customer</A></FONT>
@@ -48,7 +48,7 @@
 [<A NAME="bookkeeping" style="background-color: #cccccc"> Bookkeeping / Collections </A>]
 [ <A HREF="#reports">Reports</A> ]
 [ <A HREF="#sysadmin">Sysadmin</A> ]
-    <TABLE CELLSPACING=2 CELLPADDING=0 BORDERCOLOR="#000000" WIDTH="100%" BGCOLOR="#eeeeee">
+    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0 WIDTH="100%" BGCOLOR="#eeeeee">
     <TR><TH BGCOLOR="#cccccc">Bookkeeping / Collections</TH></TR>
     <TR><TD>
       <BR><A HREF="search/cust_main-quickpay.html">Quick payment entry</A>
@@ -107,7 +107,7 @@
 [ <A HREF="#bookkeeping">Bookkeeping / Collections</A> ]
 [<A NAME="reports" style="background-color: #cccccc"> Reports </A>]
 [ <A HREF="#sysadmin">Sysadmin</A> ]
-    <TABLE CELLSPACING=2 CELLPADDING=0 BORDERCOLOR="#000000" WIDTH="100%" BGCOLOR="#eeeeee">
+    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0 WIDTH="100%" BGCOLOR="#eeeeee">
     <TR><TH BGCOLOR="#cccccc">Reports</TH></TR>
     <TR><TD>
       <BR>
@@ -160,7 +160,7 @@
 [ <A HREF="#bookkeeping">Bookkeeping / Collections</A> ]
 [ <A HREF="#reports">Reports</A> ]
 [<A NAME="sysadmin" style="background-color: #cccccc"> Sysadmin </A>]
-    <TABLE CELLSPACING=2 CELLPADDING=0 BORDERCOLOR="#000000" WIDTH="100%" BGCOLOR="#eeeeee">
+    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0 WIDTH="100%" BGCOLOR="#eeeeee">
     <TR><TH BGCOLOR="#cccccc">Sysadmin</TH></TR>
     <TR><TD>
       <BR>
-- 
cgit v1.2.1


From f4ea75e514763082b64e1b3654cfbbba2ddf1c01 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 25 Nov 2002 10:46:55 +0000
Subject: fix disappearing radius group bug, whew

---
 FS/FS/svc_acct.pm            | 12 +++++++++++-
 httemplate/edit/svc_acct.cgi |  6 ++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index c808aeea4..141133403 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1,7 +1,7 @@
 package FS::svc_acct;
 
 use strict;
-use vars qw( @ISA $noexport_hack $conf
+use vars qw( @ISA $DEBUG $me $noexport_hack $conf
              $dir_prefix @shells $usernamemin
              $usernamemax $passwordmin $passwordmax
              $username_ampersand $username_letter $username_letterfirst
@@ -32,6 +32,9 @@ use FS::Msgcat qw(gettext);
 
 @ISA = qw( FS::svc_Common );
 
+$DEBUG = 0;
+$me = '[FS::svc_acct]';
+
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::svc_acct'} = sub { 
   $conf = new FS::Conf;
@@ -496,6 +499,7 @@ sqlradius export only)
 sub replace {
   my ( $new, $old ) = ( shift, shift );
   my $error;
+  warn "$me replacing $old with $new\n" if $DEBUG;
 
   return "Username in use"
     if $old->username ne $new->username &&
@@ -522,7 +526,13 @@ sub replace {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
+  # redundant, but so $new->usergroup gets set
+  my $error = $new->check;
+  return $error if $error;
+
   $old->usergroup( [ $old->radius_groups ] );
+  warn "old groups: ". join(' ',@{$old->usergroup}). "\n" if $DEBUG;
+  warn "new groups: ". join(' ',@{$new->usergroup}). "\n" if $DEBUG;
   if ( $new->usergroup ) {
     #(sorta) false laziness with FS::part_export::sqlradius::_export_replace
     my @newgroups = @{$new->usergroup};
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index c27bab88a..d4c9a738d 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -72,6 +72,12 @@ if ( $cgi->param('error') ) {
 
   }
 }
+
+#fixed radius groups always override & display
+if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) {
+  @groups = split(',', $part_svc->part_svc_column('usergroup')->columnvalue);
+}
+
 my $action = $svcnum ? 'Edit' : 'Add';
 
 my $svc = $part_svc->getfield('svc');
-- 
cgit v1.2.1


From 1caff2f971082d5ccce9928726b4b2e88678ee7a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Nov 2002 05:42:19 +0000
Subject: remove harmless re-my to silence warning

---
 FS/FS/svc_acct.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 141133403..388b8dd88 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -527,7 +527,7 @@ sub replace {
   my $dbh = dbh;
 
   # redundant, but so $new->usergroup gets set
-  my $error = $new->check;
+  $error = $new->check;
   return $error if $error;
 
   $old->usergroup( [ $old->radius_groups ] );
-- 
cgit v1.2.1


From 3ac3bd76d4716016ba3a51f51a83a02732d9d2de Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Nov 2002 10:25:55 +0000
Subject: ldap export: fix $crypt_password

---
 FS/FS/part_export/ldap.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/FS/FS/part_export/ldap.pm b/FS/FS/part_export/ldap.pm
index 68a63528e..fd7f11d90 100644
--- a/FS/FS/part_export/ldap.pm
+++ b/FS/FS/part_export/ldap.pm
@@ -1,11 +1,13 @@
 package FS::part_export::ldap;
 
-use vars qw(@ISA);
+use vars qw(@ISA @saltset);
 use FS::Record qw( dbh );
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+
 sub rebless { shift; }
 
 sub _export_insert {
@@ -26,7 +28,6 @@ sub _export_insert {
   $crypt_password = crypt( $svc_acct->_password,
                              $saltset[int(rand(64))].$saltset[int(rand(64))] );
 
-
   my $username_attrib;
   my %attrib = map    { /^\s*(\w+)\s+(.*\S)\s*$/;
                         $username_attrib = $1 if $2 eq '$username';
@@ -218,7 +219,7 @@ sub ldap_insert { #subroutine, not method
   }
 
   my $status = $ldap->add( $userdn, attrs => [ %attrib ] );
-  die $status->error if $status->is_error;
+  die 'LDAP error: '. $status->error. "\n" if $status->is_error;
 
   $ldap->unbind;
 }
@@ -245,7 +246,7 @@ sub ldap_connect {
 
   my $ldap = Net::LDAP->new($machine) or die $@;
   my $status = $ldap->bind( $dn, %bind_options );
-  die $status->error if $status->is_error;
+  die 'LDAP error: '. $status->error. "\n" if $status->is_error;
 
   $ldap;
 }
-- 
cgit v1.2.1


From 69a956aecd4bc89c683e60f9ec3fe0c9e11ea0d7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Nov 2002 11:58:14 +0000
Subject: link by username now only links to same svcpart

---
 httemplate/misc/process/link.cgi | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
index 4b220a867..5d80adeb9 100755
--- a/httemplate/misc/process/link.cgi
+++ b/httemplate/misc/process/link.cgi
@@ -8,12 +8,15 @@ $cgi->param('svcnum') =~ /^(\d*)$/;
 my $svcnum = $1;
 
 unless ( $svcnum ) {
-  my($part_svc) = qsearchs('part_svc',{'svcpart'=>$svcpart});
-  my($svcdb) = $part_svc->getfield('svcdb');
-  $cgi->param('link_field') =~ /^(\w+)$/; my($link_field)=$1;
-  my($svc_x)=qsearchs($svcdb,{$link_field => $cgi->param('link_value') });
+  my $part_svc = qsearchs('part_svc',{'svcpart'=>$svcpart});
+  my $svcdb = $part_svc->getfield('svcdb');
+  $cgi->param('link_field') =~ /^(\w+)$/;
+  my $link_field = $1;
+  my $svc_x = ( grep { $_->cust_svc->svcpart == $svcpart } 
+                  qsearch( $svcdb, { $link_field => $cgi->param('link_value') })
+              )[0];
   eidiot("$link_field not found!") unless $svc_x;
-  $svcnum=$svc_x->svcnum;
+  $svcnum = $svc_x->svcnum;
 }
 
 my $old = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-- 
cgit v1.2.1


From 5153f40717ef15e1d41aeb86d29b204e84c81509 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 28 Nov 2002 05:10:33 +0000
Subject: deprecate username_policy

---
 FS/FS/Conf.pm                 | 2 +-
 httemplate/docs/upgrade8.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e76ea3873..6de311596 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -801,7 +801,7 @@ httemplate/docs/config.html
 
   {
     'key'         => 'username_policy',
-    'section'     => '',
+    'section'     => 'deprecated',
     'description' => 'This file controls the mechanism for preventing duplicate usernames in passwd/radius files exported from svc_accts.  This should be one of \'prepend domsvc\' \'append domsvc\' \'append domain\' or \'append @domain\'',
     'type'        => 'select',
     'select_enum' => [ 'prepend domsvc', 'append domsvc', 'append domain', 'append @domain' ],
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 0210430ef..cf60a8582 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -369,7 +369,7 @@ ALTER TABLE cust_refund DROP COLUMN crednum;
   <li><b>IMPORTANT: After running bin/create-history-tables</b>, run <tt>bin/dbdef-create <i>username</i></tt> again.
   <li>As the freeside UNIX user, run <tt>bin/populate-msgcat <i>username</i></tt
 > to populate the message catalog
-  <li>set the <a href="../config/config.cgi#username_policy">user_policy configuration value</a> as appropriate for your site.
+<!--  <li>set the <a href="../config/config.cgi#username_policy">user_policy configuration value</a> as appropriate for your site. -->
   <li>set the <a href="../config/config.cgi#locale">locale configuration value</a> to en_US.
   <li>the mxmachines, nsmachines, arecords and cnamerecords configuration values have been deprecated.  Set the <a href="../config/config.cgi#defaultrecords">defaultrecords configuration value</a> instead.
   <li>Create the `/usr/local/etc/freeside/cache.<i>datasrc</i>' directory
-- 
cgit v1.2.1


From 3926b0ad41690f96041284fc12eb75e5f9b10357 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 28 Nov 2002 05:44:19 +0000
Subject: add -g FreeBSD shellcommands export as per "Stephen Bechard"
 <steve@destek.net>

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 4b15f44ca..d62bef50d 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -785,7 +785,7 @@ tie my %ldap_options, 'Tie::IxHash',
       'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
       'options' => \%shellcommands_options,
       'nodomain' => 'Y',
-      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = "";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -c $finger -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "pw userdel $username -r"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0"; this.form.usermod_stdin.value = "$new__password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>',
+      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = "";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "pw userdel $username -r"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0"; this.form.usermod_stdin.value = "$new__password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>',
     },
 
     'shellcommands_withdomain' => {
-- 
cgit v1.2.1


From 36ebe10e75936261aad914bbb5e5e2154323412c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 28 Nov 2002 10:54:13 +0000
Subject: separate state and country <SELECT> in signup server also, closes:
 Bug#353

---
 fs_signup/FS-SignupClient/cgi/signup.cgi  | 123 +++++++++++++++++++++++++++++-
 fs_signup/FS-SignupClient/cgi/signup.html |  27 +++----
 fs_signup/fs_signup_server                |   6 +-
 3 files changed, 136 insertions(+), 20 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 1eb0613ba..b6cc08a47 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.32 2002-11-19 09:51:59 ivan Exp $
+# $Id: signup.cgi,v 1.33 2002-11-28 10:54:13 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -260,9 +260,9 @@ if ( defined $cgi->param('magic') ) {
   $address1 = '';
   $address2 = '';
   $city = '';
-  $state = '';
+  $state = $init_data->{statedefault};
   $county = '';
-  $country = '';
+  $country = $init_data->{countrydefault};
   $zip = '';
   $daytime = '';
   $night = '';
@@ -486,6 +486,123 @@ sub expselect {
   $return;
 }
 
+#false laziness w/FS::cust_main_county
+sub regionselector {
+  my ( $selected_county, $selected_state, $selected_country,
+       $prefix, $onchange ) = @_;
+
+  my $prefix = '' unless defined $prefix;
+
+  my $countyflag = 0;
+
+  my %cust_main_county;
+
+#  unless ( @cust_main_county ) { #cache 
+    #@cust_main_county = qsearch('cust_main_county', {} );
+    #foreach my $c ( @cust_main_county ) {
+    foreach my $c ( @$locales ) {
+      #$countyflag=1 if $c->county;
+      $countyflag=1 if $c->{county};
+      #push @{$cust_main_county{$c->country}{$c->state}}, $c->county;
+      #$cust_main_county{$c->country}{$c->state}{$c->county} = 1;
+      $cust_main_county{$c->{country}}{$c->{state}}{$c->{county}} = 1;
+    }
+#  }
+  $countyflag=1 if $selected_county;
+
+  my $script_html = <<END;
+    <SCRIPT>
+    function opt(what,value,text) {
+      var optionName = new Option(text, value, false, false);
+      var length = what.length;
+      what.options[length] = optionName;
+    }
+    function ${prefix}country_changed(what) {
+      country = what.options[what.selectedIndex].text;
+      for ( var i = what.form.${prefix}state.length; i >= 0; i-- )
+          what.form.${prefix}state.options[i] = null;
+END
+      #what.form.${prefix}state.options[0] = new Option('', '', false, true);
+
+  foreach my $country ( sort keys %cust_main_county ) {
+    $script_html .= "\nif ( country == \"$country\" ) {\n";
+    foreach my $state ( sort keys %{$cust_main_county{$country}} ) {
+      my $text = $state || '(n/a)';
+      $script_html .= qq!opt(what.form.${prefix}state, "$state", "$text");\n!;
+    }
+    $script_html .= "}\n";
+  }
+
+  $script_html .= <<END;
+    }
+    function ${prefix}state_changed(what) {
+END
+
+  if ( $countyflag ) {
+    $script_html .= <<END;
+      state = what.options[what.selectedIndex].text;
+      country = what.form.${prefix}country.options[what.form.${prefix}country.selectedIndex].text;
+      for ( var i = what.form.${prefix}county.length; i >= 0; i-- )
+          what.form.${prefix}county.options[i] = null;
+END
+
+    foreach my $country ( sort keys %cust_main_county ) {
+      $script_html .= "\nif ( country == \"$country\" ) {\n";
+      foreach my $state ( sort keys %{$cust_main_county{$country}} ) {
+        $script_html .= "\nif ( state == \"$state\" ) {\n";
+          #foreach my $county ( sort @{$cust_main_county{$country}{$state}} ) {
+          foreach my $county ( sort keys %{$cust_main_county{$country}{$state}} ) {
+            my $text = $county || '(n/a)';
+            $script_html .=
+              qq!opt(what.form.${prefix}county, "$county", "$text");\n!;
+          }
+        $script_html .= "}\n";
+      }
+      $script_html .= "}\n";
+    }
+  }
+
+  $script_html .= <<END;
+    }
+    </SCRIPT>
+END
+
+  my $county_html = $script_html;
+  if ( $countyflag ) {
+    $county_html .= qq!<SELECT NAME="${prefix}county" onChange="$onchange">!;
+    $county_html .= '</SELECT>';
+  } else {
+    $county_html .=
+      qq!<INPUT TYPE="hidden" NAME="${prefix}county" VALUE="$selected_county">!;
+  }
+
+  my $state_html = qq!<SELECT NAME="${prefix}state" !.
+                   qq!onChange="${prefix}state_changed(this); $onchange">!;
+  foreach my $state ( sort keys %{ $cust_main_county{$selected_country} } ) {
+    my $text = $state || '(n/a)';
+    my $selected = $state eq $selected_state ? 'SELECTED' : '';
+    $state_html .= "\n<OPTION $selected VALUE=$state>$text</OPTION>"
+  }
+  $state_html .= '</SELECT>';
+
+  $state_html .= '</SELECT>';
+
+  my $country_html = qq!<SELECT NAME="${prefix}country" !.
+                     qq!onChange="${prefix}country_changed(this); $onchange">!;
+  my $countrydefault = $init_data->{countrydefault} || 'US';
+  foreach my $country (
+    sort { ($b eq $countrydefault) <=> ($a eq $countrydefault) or $a cmp $b }
+      keys %cust_main_county
+  ) {
+    my $selected = $country eq $selected_country ? ' SELECTED' : '';
+    $country_html .= "\n<OPTION$selected>$country</OPTION>"
+  }
+  $country_html .= '</SELECT>';
+
+  ($county_html, $state_html, $country_html);
+
+}
+
 sub success_default { #html to use if you don't specify a success file
   <<'END';
 <HTML><HEAD><TITLE>Signup successful</TITLE></HEAD>
diff --git a/fs_signup/FS-SignupClient/cgi/signup.html b/fs_signup/FS-SignupClient/cgi/signup.html
index d89b6854b..724ffd7f8 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.html
+++ b/fs_signup/FS-SignupClient/cgi/signup.html
@@ -28,25 +28,20 @@ Contact Information
   <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
   <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
   <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
-  <TD><SELECT NAME="state" SIZE="1">
-
-  <%=
-    foreach ( @{$locales} ) {
-      $OUT .= '<OPTION';
-      $OUT .= ' SELECTED' if ( $state eq $_->{'state'}
-                               && $county eq $_->{'county'}
-                               && $country eq $_->{'country'}
-                             );
-      $OUT .= '>'. $_->{'state'};
-      $OUT .= ' ('. $_->{'county'}. ')' if $_->{'county'};
-      $OUT .= ' / '. $_->{'country'};
-    }
-  %>
-
-  </SELECT></TD>
+  <TD>
+    <%=
+        ($county_html, $state_html, $country_html) =
+          regionselector( $county, $state, $country );
+ 
+        "$county_html $state_html";
+    %>
+  </TD>
   <TH><font color="#ff0000">*</font>Zip</TH>
   <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>
 </TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Country</TH>
+  <TD><%= $country_html %></TD>
 <TR>
   <TD ALIGN="right">Day Phone</TD>
   <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="<%= $daytime %>" SIZE=18></TD>
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 4b7e898f6..e0fa9ba5f 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -94,7 +94,11 @@ while (1) {
 
     'msgcat' => { map { $_=>gettext($_) } qw(
       passwords_dont_match invalid_card unknown_card_type not_a
-    ) }
+    ) },
+
+    'statedefault' => $conf->config('statedefault') || 'CA',
+
+    'countrydefault' => $conf->config('countrydefault') || 'US',
 
   };
 
-- 
cgit v1.2.1


From f096f7efd2093da376b9a31e3e5a872577bdc9b4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 29 Nov 2002 05:14:21 +0000
Subject: accept unmunged state/county/country

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index b6cc08a47..dc242bdcf 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.33 2002-11-28 10:54:13 ivan Exp $
+# $Id: signup.cgi,v 1.34 2002-11-29 05:14:21 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -143,11 +143,21 @@ $cgi = new CGI;
 if ( defined $cgi->param('magic') ) {
   if ( $cgi->param('magic') eq 'process' ) {
 
-    $cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
-      or die "Oops, illegal \"state\" param: ". $cgi->param('state');
-    $state = $1;
-    $county = $3 || '';
-    $country = $4;
+    if ( $cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/ ) {
+      $state = $1;
+      $county = $3 || '';
+      $country = $4;
+    } elsif ( $cgi->param('state') =~ /^(\w*)$/ ) {
+      $state = $1;
+      $cgi->param('county') =~ /^([\w ]*)$/
+        or die "illegal county: ". $cgi->param('county');
+      $county = $1;
+      $cgi->param('country') =~ /^(\w+)$/
+        or die "illegal country: ". $cgi->param('country');
+      $country = $1;
+    } else {
+      die "illegal state: ". $cgi->param('state');
+    }
 
     $payby = $cgi->param('payby');
     $payinfo = $cgi->param( $payby. '_payinfo' );
-- 
cgit v1.2.1


From 20f37c06d04ecf57e9b464bad23998fce6ac1e80 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Dec 2002 12:31:49 +0000
Subject: empty invoice_lines() fix

---
 FS/FS/cust_bill.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 3481a9a86..1742f604f 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1092,16 +1092,14 @@ sub print_text {
 	#  );
 
   #and subroutine for the template
-
   sub FS::cust_bill::_template::invoice_lines {
-    my $lines = shift or return @buf;
+    my $lines = shift || scalar(@buf);
     map { 
       scalar(@buf) ? shift @buf : [ '', '' ];
     }
     ( 1 .. $lines );
   }
 
-
   #and fill it in
   $FS::cust_bill::_template::page = 1;
   my $lines;
@@ -1121,7 +1119,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.55 2002-11-22 12:19:15 ivan Exp $
+$Id: cust_bill.pm,v 1.56 2002-12-04 12:31:49 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 5b1348a5b82cb153e6f42be8187de1a7c84dfb6d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Dec 2002 12:37:49 +0000
Subject: oops, typo

---
 bin/bind.export | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/bind.export b/bin/bind.export
index 63fb0f60c..b1594ae6b 100755
--- a/bin/bind.export
+++ b/bin/bind.export
@@ -39,7 +39,7 @@ foreach my $export ( @exports ) {
     or die "can't open $prefix/named.conf: $!";
 
   open(CONF_HEADER,"<$prefix/named.conf.HEADER")
-    or die "can't open $prefix/named.conf.HEADER: $!"
+    or die "can't open $prefix/named.conf.HEADER: $!";
   while (<CONF_HEADER>) { print NAMED_CONF $_; }
   close CONF_HEADER;
 
-- 
cgit v1.2.1


From d75b4ad13df9e8e3cb570060252fa45ef4e80def Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Dec 2002 12:43:17 +0000
Subject: really fixed now

---
 bin/bind.export | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/bind.export b/bin/bind.export
index b1594ae6b..943aefbb0 100755
--- a/bin/bind.export
+++ b/bin/bind.export
@@ -139,7 +139,7 @@ foreach my $sexport ( @sexports ) { #false laziness with above
     or die "can't open $prefix/named.conf: $!";
 
   open(CONF_HEADER,"<$prefix/named.conf.HEADER")
-    or die "can't open $prefix/named.conf.HEADER: $!"
+    or die "can't open $prefix/named.conf.HEADER: $!";
   while (<CONF_HEADER>) { print NAMED_CONF $_; }
   close CONF_HEADER;
 
-- 
cgit v1.2.1


From 2f1f5c47edd9df2af61d104b512b9a1be12c3ad1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Dec 2002 10:54:24 +0000
Subject: doc

---
 httemplate/docs/install.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 100a3cc64..d22915176 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -114,7 +114,10 @@ $ su
   <tr>
     <td><ul>
       <li>Run <tt>make aspdocs</tt>
-      <li>Copy <tt>aspdocs/</tt> to your web server's document space.
+      <li>Copy <tt>aspdocs/</tt> to your web server's document space:
+<font size="-1"><pre>
+cp&nbsp;aspdocs&nbsp;/usr/local/apache/htdocs/freeside-asp
+</pre></font>
       <li>Create a <a href="http://www.apache-asp.org/config.html#Global">Global</a> directory, such as <tt>/usr/local/etc/freeside/asp-global/</tt>:
 <font size="-1"><pre>
 mkdir&nbsp;/usr/local/etc/freeside/asp-global/
-- 
cgit v1.2.1


From 6addb511875324241cb002b2fe96225c066d0ddc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 11 Dec 2002 00:12:22 +0000
Subject: beginning of web-based data importer

---
 httemplate/misc/meta-import.cgi         |  52 ++++++++++++
 httemplate/misc/process/meta-import.cgi | 145 ++++++++++++++++++++++++++++++++
 2 files changed, 197 insertions(+)
 create mode 100644 httemplate/misc/meta-import.cgi
 create mode 100644 httemplate/misc/process/meta-import.cgi

diff --git a/httemplate/misc/meta-import.cgi b/httemplate/misc/meta-import.cgi
new file mode 100644
index 000000000..ebd2a7e2f
--- /dev/null
+++ b/httemplate/misc/meta-import.cgi
@@ -0,0 +1,52 @@
+<!-- mason kludge -->
+<%= header('Import') %>
+<FORM ACTION="process/meta-import.cgi" METHOD="post" ENCTYPE="multipart/form-data">
+Import a CSV file containing customer records (zip tar etc).<BR><BR>
+
+##no##Default file format is CSV, with the following field order: <i>cust_pkg.setup, dayphone, first, last, address1, address2, city, state, zip, comments</i><BR><BR>
+
+<%
+  #false laziness with edit/cust_main.cgi
+  my @agents = qsearch( 'agent', {} );
+  die "No agents created!" unless @agents;
+  my $agentnum = $agents[0]->agentnum; #default to first
+
+  if ( scalar(@agents) == 1 ) {
+%>
+    <INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agentnum %>">
+<% } else { %>
+    <BR><BR>Agent <SELECT NAME="agentnum" SIZE="1">
+  <% foreach my $agent (sort { $a->agent cmp $b->agent } @agents) { %>
+    <OPTION VALUE="<%= $agent->agentnum %>" <%= " SELECTED"x($agent->agentnum==$agentnum) %>><%= $agent->agent %></OPTION>
+  <% } %>
+    </SELECT><BR><BR>
+<% } %>
+
+<%
+  my @referrals = qsearch('part_referral',{});
+  die "No advertising sources created!" unless @referrals;
+  my $refnum = $referrals[0]->refnum; #default to first
+
+  if ( scalar(@referrals) == 1 ) {
+%>
+    <INPUT TYPE="hidden" NAME="refnum" VALUE="<%= $refnum %>">
+<% } else { %>
+    <BR><BR>Advertising source <SELECT NAME="refnum" SIZE="1">
+  <% foreach my $referral ( sort { $a->referral <=> $b->referral } @referrals) { %>
+    <OPTION VALUE="<%= $referral->refnum %>" <%= " SELECTED"x($referral->refnum==$refnum) %>><%= $referral->refnum %>: <%= $referral->referral %></OPTION>
+  <% } %>
+    </SELECT><BR><BR>
+<% } %>
+
+    First package: <SELECT NAME="pkgpart"><OPTION VALUE="">(none)</OPTION>
+<% foreach my $part_pkg ( qsearch('part_pkg',{'disabled'=>'' }) ) { %>
+     <OPTION VALUE="<%= $part_pkg->pkgpart %>"><%= $part_pkg->pkg. ' - '. $part_pkg->comment %></OPTION>
+<% } %>
+</SELECT><BR><BR>
+
+    CSV (zip, tar etc) Filename: <INPUT TYPE="file" NAME="csvfile"><BR><BR>
+    <INPUT TYPE="submit" VALUE="Import">
+    </FORM>
+  </BODY>
+<HTML>
+
diff --git a/httemplate/misc/process/meta-import.cgi b/httemplate/misc/process/meta-import.cgi
new file mode 100644
index 000000000..d42d6d466
--- /dev/null
+++ b/httemplate/misc/process/meta-import.cgi
@@ -0,0 +1,145 @@
+<!-- mason kludge -->
+<%= header('Map tables') %>
+<SCRIPT>
+var gSafeOnload = new Array();
+var gSafeOnsubmit = new Array();
+window.onload = SafeOnload;
+function SafeAddOnLoad(f) {
+  gSafeOnload[gSafeOnload.length] = f;
+}
+function SafeOnload() {
+  for (var i=0;i<gSafeOnload.length;i++)
+    gSafeOnload[i]();
+}
+function SafeAddOnSubmit(f) {
+  gSafeOnsubmit[gSafeOnsubmit.length] = f;
+}
+function SafeOnsubmit() {
+  for (var i=0;i<gSafeOnsubmit.length;i++)
+    gSafeOnsubmit[i]();
+}
+</SCRIPT>
+<%
+  #one
+  unless ( $cgi->param('magic') ) {
+
+    #oops, silly
+    #my $fh = $cgi->upload('csvfile');
+    ##warn $cgi;
+    ##warn $fh;
+    #
+    #use Archive::Tar;
+    #$tar = Archive::Tar->new();
+    #$tar->create_archive($fh); #or die $tar->error;
+
+    #haha for now
+    my @files = qw(
+authserv  credtype  dunprev  invoice  pmtdet    product   taxplan
+ccdet     customer  genlog   ledger   pops      pubvars   
+cchist    discplan  glacct   origco   prodcat   recur     users
+credcode  dundet    invline  payment  prodclas  repforms  webserv
+    );
+
+    %>
+    <FORM NAME="OneTrueForm" METHOD="POST" ACTION="meta-import.cgi">
+    <INPUT TYPE="hidden" NAME="magic" VALUE="process">
+    <%= hashmaker('schema', \@files, [ grep { ! /^h_/ } dbdef->tables ] ) %>
+    <br><INPUT TYPE="submit" VALUE="done">
+    </FORM>
+    </BODY>
+    </HTML>
+    <%
+
+  } elsif ( $cgi->param('magic') eq 'process' ) {
+
+    %>
+    <FORM NAME="OneTrueForm" METHOD="POST" ACTION="meta-import.cgi">
+    <INPUT TYPE="hidden" NAME="magic" VALUE="process2">
+    <%
+
+    my $schema_string = $cgi->param('schema');
+    my %schema = map { /^\s*(\w+)\s*=>\s*(\w+)\s*$/
+                         or die "guru meditation #420: $_";
+                       ( $1 => $2 );
+                     }
+                 split( /\n/, $schema_string );
+
+    #*** should be in global.asa/handler.pl like the rest
+    eval 'use Text::CSV_XS;';
+
+    foreach my $table ( keys %schema ) {
+
+      my $csv = Text::CSV_XS->new({ 'binary'=>1 });
+      open(FILE,"</home/ivan/intergate/legacy/csvdir/$table")
+        or die "can't /home/ivan/intergate/legacy/csvdir/$table: $!";
+      my $header = lc(<FILE>);
+      close FILE;
+      $csv->parse($header) or die;
+      my @from_columns = $csv->fields;
+
+      my @fs_columns = dbdef->table($schema{$table})->columns;
+
+      %>
+      <%= hashmaker($table, \@from_columns, \@fs_columns, $table, $schema{$table} ) %>
+      <br><hr><br>
+      <%
+
+    }
+
+    %>
+    <br><INPUT TYPE="submit" VALUE="done">
+    </FORM>
+    </BODY>
+    </HTML>
+    <%
+
+  } elsif ( $cgi->param('magic') eq 'process' ) {
+
+    %>
+    print results!!
+    <%
+  }
+
+  #hashmaker widget
+  sub hashmaker {
+    my($name, $from, $to, $labelfrom, $labelto) = @_;
+    $fromsize = scalar(@$from);
+    $tosize = scalar(@$to);
+    "<TABLE><TR><TH>$labelfrom</TH><TH>$labelto</TH></TR><TR><TD>".
+        qq!<SELECT NAME="${name}_from" SIZE=$fromsize>\n!.
+        join("\n", map { qq!<OPTION VALUE="$_">$_</OPTION>! } sort { $a cmp $b } @$from ).
+        "</SELECT>\n".
+      '</TD><TD>'.
+        qq!<SELECT NAME="${name}_to" SIZE=$tosize>\n!.
+        join("\n", map { qq!<OPTION VALUE="$_">$_</OPTION>! } sort { $a cmp $b } @$to ).
+        "</SELECT>\n".
+      '</TD></TR>'.
+      '<TR><TD COLSPAN=2>'.
+        qq!<INPUT TYPE="button" VALUE="map" onClick="toke_$name(this.form)">!.
+      '</TD></TR><TR><TD COLSPAN=2>'.
+      qq!<TEXTAREA NAME="$name" COLS=80 ROWS=8></TEXTAREA>!.
+      '</TD></TR></TABLE>'.
+      "<script>
+            function toke_$name() {
+              fromObject = document.OneTrueForm.${name}_from;
+              for (var i=fromObject.options.length-1;i>-1;i--) {
+                if (fromObject.options[i].selected)
+                  fromname = deleteOption_$name(fromObject,i);
+              }
+              toObject = document.OneTrueForm.${name}_to;
+              for (var i=toObject.options.length-1;i>-1;i--) {
+                if (toObject.options[i].selected)
+                  toname = deleteOption_$name(toObject,i);
+              }
+              document.OneTrueForm.$name.value = document.OneTrueForm.$name.value + fromname + ' => ' + toname + '\\n';
+            }
+            function deleteOption_$name(object,index) {
+              value = object.options[index].value;
+              object.options[index] = null;
+              return value;
+            }
+      </script>".
+      '';
+  }
+
+%>
-- 
cgit v1.2.1


From 59aa696fb295598b6ceecaa45009617ef6d56aaf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Dec 2002 21:44:28 +0000
Subject: custnum in welcome email

---
 FS/FS/svc_acct.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 388b8dd88..2062eb9ba 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -369,6 +369,7 @@ sub insert {
           'subject'  => $welcome_subject,
           'mimetype' => $welcome_mimetype,
           'body'     => $welcome_template->fill_in( HASH => {
+                          'custnum'  => $self->custnum,
                           'username' => $self->username,
                           'password' => $self->_password,
                           'first'    => $cust_main->first,
-- 
cgit v1.2.1


From 64d21fc13eddf275f614f54ff9e17eca74dcd858 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Dec 2002 00:31:32 +0000
Subject: taxclass fix (?)

---
 FS/FS/cust_main.pm                      | 23 ++++++++-------
 httemplate/misc/process/meta-import.cgi | 50 +++++++++++++++++++++++++--------
 2 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 237abcddb..890371de7 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1058,26 +1058,25 @@ sub bill {
                  || $self->payby eq 'COMP'
                  || $taxable_charged == 0 ) {
 
-          my $cust_main_county =
-            qsearchs('cust_main_county',{
+          my $cust_main_county = qsearchs('cust_main_county',{
               'state'    => $self->state,
               'county'   => $self->county,
               'country'  => $self->country,
               'taxclass' => $part_pkg->taxclass,
-            } )
-            or qsearchs('cust_main_county',{
+          } );
+          $cust_main_county ||= qsearchs('cust_main_county',{
               'state'    => $self->state,
               'county'   => $self->county,
               'country'  => $self->country,
               'taxclass' => '',
-            } )
-            or do {
-              $dbh->rollback if $oldAutoCommit;
-              return
-                "fatal: can't find tax rate for state/county/country/taxclass ".
-                join('/', ( map $self->$_(), qw(state county country) ),
-                          $part_pkg->taxclass ).  "\n";
-            };
+          } );
+          unless ( $cust_main_county ) {
+            $dbh->rollback if $oldAutoCommit;
+            return
+              "fatal: can't find tax rate for state/county/country/taxclass ".
+              join('/', ( map $self->$_(), qw(state county country) ),
+                        $part_pkg->taxclass ).  "\n";
+          }
 
           if ( $cust_main_county->exempt_amount ) {
             my ($mon,$year) = (localtime($sdate) )[4,5];
diff --git a/httemplate/misc/process/meta-import.cgi b/httemplate/misc/process/meta-import.cgi
index d42d6d466..4c3c7d665 100644
--- a/httemplate/misc/process/meta-import.cgi
+++ b/httemplate/misc/process/meta-import.cgi
@@ -19,6 +19,7 @@ function SafeOnsubmit() {
     gSafeOnsubmit[i]();
 }
 </SCRIPT>
+<FORM NAME="OneTrueForm" METHOD="POST" ACTION="meta-import.cgi">
 <%
   #one
   unless ( $cgi->param('magic') ) {
@@ -41,23 +42,19 @@ credcode  dundet    invline  payment  prodclas  repforms  webserv
     );
 
     %>
-    <FORM NAME="OneTrueForm" METHOD="POST" ACTION="meta-import.cgi">
     <INPUT TYPE="hidden" NAME="magic" VALUE="process">
     <%= hashmaker('schema', \@files, [ grep { ! /^h_/ } dbdef->tables ] ) %>
     <br><INPUT TYPE="submit" VALUE="done">
-    </FORM>
-    </BODY>
-    </HTML>
     <%
 
   } elsif ( $cgi->param('magic') eq 'process' ) {
 
     %>
-    <FORM NAME="OneTrueForm" METHOD="POST" ACTION="meta-import.cgi">
     <INPUT TYPE="hidden" NAME="magic" VALUE="process2">
     <%
 
     my $schema_string = $cgi->param('schema');
+    %><INPUT TYPE="hidden" NAME="schema" VALUE="<%=$schema_string%>"><%
     my %schema = map { /^\s*(\w+)\s*=>\s*(\w+)\s*$/
                          or die "guru meditation #420: $_";
                        ( $1 => $2 );
@@ -88,18 +85,47 @@ credcode  dundet    invline  payment  prodclas  repforms  webserv
 
     %>
     <br><INPUT TYPE="submit" VALUE="done">
-    </FORM>
-    </BODY>
-    </HTML>
     <%
 
-  } elsif ( $cgi->param('magic') eq 'process' ) {
+  } elsif ( $cgi->param('magic') eq 'process2' ) {
 
-    %>
-    print results!!
-    <%
+    print "<pre>\n";
+    #false laziness with above
+    my $schema_string = $cgi->param('schema');
+    my %schema = map { /^\s*(\w+)\s*=>\s*(\w+)\s*$/
+                         or die "guru meditation #420: $_";
+                       ( $1 => $2 );
+                     }
+                 split( /\n/, $schema_string );
+    foreach my $table ( keys %schema ) {
+      ( my $spaces = $table ) =~ s/./ /g;
+      print "'$table' => { 'table' => '$schema{$table}',\n".
+            #(length($table) x ' '). "         'map'   => {\n";
+            "$spaces        'map'   => {\n";
+      my %map = map { /^\s*(\w+)\s*=>\s*(\w+)\s*$/
+                         or die "guru meditation #420: $_";
+                       ( $1 => $2 );
+                     }
+                 split( /\n/, $cgi->param($table) );
+      foreach ( keys %map ) {
+        print "$spaces                     '$_' => '$map{$_}',\n";
+      }
+      print "$spaces                   },\n";
+      print "$spaces      },\n";
+
+    }
+    print "\n</pre>";
+
+  } else {
+    warn "unrecognized magic: ". $cgi->param('magic');
   }
 
+  %>
+</FORM>
+</BODY>
+</HTML>
+
+  <%
   #hashmaker widget
   sub hashmaker {
     my($name, $from, $to, $labelfrom, $labelto) = @_;
-- 
cgit v1.2.1


From edbcab06936c79a4f8d4edc0d0222139fa8c312c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 14 Dec 2002 21:18:23 +0000
Subject: fix for auditing packages

---
 FS/FS/cust_svc.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 7516be599..8bcb0fcca 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -220,6 +220,7 @@ sub check {
     # or new FS::pkg_svc ( { 'pkgpart'  => $cust_pkg->pkgpart,
     #                        'svcpart'  => $self->svcpart,
     #                        'quantity' => 0                   } );
+    my $quantity = $pkg_svc ? $pkg_svc->quantity : 0;
 
     my @cust_svc = qsearch('cust_svc', {
       'pkgnum'  => $self->pkgnum,
@@ -227,7 +228,7 @@ sub check {
     });
     return "Already ". scalar(@cust_svc). " ". $part_svc->svc.
            " services for pkgnum ". $self->pkgnum
-      if scalar(@cust_svc) >= $pkg_svc->quantity;
+      if scalar(@cust_svc) >= $quantity;
   }
 
   ''; #no error
-- 
cgit v1.2.1


From 7b636e0d0a90e05e37ebe778bde29709f3323813 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 16 Dec 2002 10:47:38 +0000
Subject: working date range selector that defaults to the past year!

---
 httemplate/graph/money_time-graph.cgi | 12 ++++++++----
 httemplate/graph/money_time.cgi       | 26 +++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi
index ca8f6e86b..944019a7a 100755
--- a/httemplate/graph/money_time-graph.cgi
+++ b/httemplate/graph/money_time-graph.cgi
@@ -1,12 +1,16 @@
 <%
 
+#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+my ($curmon,$curyear) = (localtime(time))[4,5];
+
 #find first month
-my $syear = 2001;
-my $smonth = 8;
+my $syear = $cgi->param('syear') || 1899+$curyear;
+my $smonth = $cgi->param('smonth') || $curmon+1;
 
 #find last month
-my $eyear = 2002;
-my $emonth = 12;
+my $eyear = $cgi->param('eyear') || 1900+$curyear;
+my $emonth = $cgi->param('emonth') || $curmon+1;
+if ( $emonth++>12 ) { $emonth-=12; $eyear++; }
 
 my @labels;
 my %data;
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index d6c35434b..e24157ccb 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -1,9 +1,25 @@
+<!-- mason kludge %>
+<%
+
+#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+my ($curmon,$curyear) = (localtime(time))[4,5];
+
+#find first month
+my $syear = $cgi->param('syear') || 1899+$curyear;
+my $smonth = $cgi->param('smonth') || $curmon+1;
+
+#find last month
+my $eyear = $cgi->param('eyear') || 1900+$curyear;
+my $emonth = $cgi->param('emonth') || $curmon+1;
+
+%>
+
 <HTML>
   <HEAD>
     <TITLE>Graphing monetary values over time</TITLE>
   </HEAD>
 <BODY BGCOLOR="#e8e8e8">
-<IMG SRC="money_time-graph.cgi" WIDTH="768" HEIGHT="480">
+<IMG SRC="money_time-graph.cgi?<%= $cgi->query_string %>" WIDTH="768" HEIGHT="480">
 <BR>
 <FORM METHOD="POST">
 <INPUT TYPE="checkbox" NAME="ar">
@@ -18,22 +34,22 @@
 From <SELECT NAME="smonth">
 <% my @m = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
    foreach my $m ( 1..12 ) { %>
-<OPTION VALUE="<%= $m %>"><%= $m[$m-1] %>
+<OPTION VALUE="<%= $m %>"<%= $m == $smonth ? ' SELECTED' : '' %>><%= $m[$m-1] %>
 <% } %>
 </SELECT>
 <SELECT NAME="syear">
 <% foreach my $y ( 1999 .. 2010 ) { %>
-<OPTION VALUE="<%= $y %>"><%= $y %>
+<OPTION VALUE="<%= $y %>"<%= $y == $syear ? ' SELECTED' : '' %>><%= $y %>
 <% } %>
 </SELECT>
  to <SELECT NAME="emonth">
 <% foreach my $m ( 1..12 ) { %>
-<OPTION VALUE="<%= $m %>"><%= $m[$m-1] %>
+<OPTION VALUE="<%= $m %>"<%= $m == $emonth ? ' SELECTED' : '' %>><%= $m[$m-1] %>
 <% } %>
 </SELECT>
 <SELECT NAME="eyear">
 <% foreach my $y ( 1999 .. 2010 ) { %>
-<OPTION VALUE="<%= $y %>"><%= $y %>
+<OPTION VALUE="<%= $y %>"<%= $y == $eyear ? ' SELECTED' : '' %>><%= $y %>
 <% } %>
 </SELECT>
 
-- 
cgit v1.2.1


From 1eda1b0330897a8bc3b6717cfd970d177b691e48 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 16 Dec 2002 18:53:35 +0000
Subject: add PTR record to domain edit

---
 httemplate/view/svc_domain.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index cc3cdb6bf..fd017de46 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -85,7 +85,7 @@ Service #<%= $svcnum %>
 <INPUT TYPE="text" NAME="reczone"> 
 <INPUT TYPE="hidden" NAME="recaf" VALUE="IN"> IN 
  <SELECT NAME="rectype">
-<% foreach (qw( A NS CNAME MX) ) { %>
+<% foreach (qw( A NS CNAME MX PTR) ) { %>
   <OPTION VALUE="<%=$_%>"><%=$_%></OPTION>
 <% } %>
  </SELECT>
-- 
cgit v1.2.1


From 50dbca8812cac271c584cbe5629d4583cd11a01c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 16 Dec 2002 21:52:01 +0000
Subject: fix for Pg 7.3, are there others?

---
 FS/FS/part_svc.pm            | 12 ++++++------
 httemplate/edit/part_svc.cgi |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 06c15ed2a..63bc2ad1c 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -265,12 +265,12 @@ COLUMNNAME, or a new part_svc_column object if none exists.
 =cut
 
 sub part_svc_column {
-  my $self = shift;
-  my $columnname = shift;
-  qsearchs('part_svc_column',  {
-                                 'svcpart'    => $self->svcpart,
-                                 'columnname' => $columnname,
-                               }
+  my( $self, $columnname) = @_;
+  $self->svcpart &&
+    qsearchs('part_svc_column',  {
+                                   'svcpart'    => $self->svcpart,
+                                   'columnname' => $columnname,
+                                 }
   ) or new FS::part_svc_column {
                                  'svcpart'    => $self->svcpart,
                                  'columnname' => $columnname,
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 0ee0a468a..d0cc9b645 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -160,7 +160,8 @@ my %defs = (
         $html .= '<TD><INPUT TYPE="checkbox"'.
                  ' NAME="exportnum'. $part_export->exportnum. '"  VALUE="1" ';
         $html .= 'CHECKED'
-          if qsearchs( 'export_svc', {
+          if ( $clone || $part_svc->svcpart ) #null svcpart search causing error
+              && qsearchs( 'export_svc', {
                                    exportnum => $part_export->exportnum,
                                    svcpart   => $clone || $part_svc->svcpart });
         $html .= '>'. $part_export->exportnum. ': '.  $part_export->exporttype.
-- 
cgit v1.2.1


From 8f6bfc01809119b3c7e90b1418650ea4a329cf49 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 06:36:40 +0000
Subject: add PerlModule commands to install instructions

---
 httemplate/docs/install.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index d22915176..36b8ae0e7 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -129,6 +129,7 @@ cp&nbsp;htetc/global.asa&nbsp;/usr/local/etc/freeside/asp-global/global.asa
 </pre></font>
       <li>Configure Apache for the Global directory and to execute .cgi files using Apache::ASP.  For example:
 <font size="-1"><pre>
+PerlModule Apache::ASP
 &lt;Directory&nbsp;/usr/local/apache/htdocs/freeside-asp&gt;
 &lt;Files ~ (\.cgi)&gt;
 AddHandler perl-script .cgi
@@ -150,6 +151,7 @@ PerlSetVar Debug 2
       <li>Edit <tt>handler.pl</tt> and set an appropriate <tt>data_dir</tt>, such as <tt>/usr/local/etc/freeside/mason-data</tt>
       <li>Configure Apache to use the <tt>handler.pl</tt> file and to execute .cgi files using HTML::Mason.  For example:
 <font size="-1"><pre>
+PerlModule HTML::Mason
 &lt;Directory&nbsp;/usr/local/apache/htdocs/freeside-mason&gt;
 &lt;Files ~ (\.cgi)&gt;
 AddHandler perl-script .cgi
-- 
cgit v1.2.1


From 99076cc92a72f9c578c95d527b14b741434b4a8f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:24:59 +0000
Subject: adding freeside-sqlradius-seconds

---
 FS/MANIFEST                       |  1 +
 FS/bin/freeside-sqlradius-seconds | 57 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 FS/bin/freeside-sqlradius-seconds

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 47c3bf206..9c387d42e 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -21,6 +21,7 @@ bin/freeside-radgroup
 bin/freeside-receivables-report
 bin/freeside-sqlradius-radacctd
 bin/freeside-sqlradius-reset
+bin/freeside-sqlradius-seconds
 bin/freeside-tax-report
 bin/freeside-cc-receipts-report
 bin/freeside-credit-report
diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
new file mode 100644
index 000000000..e65b87f89
--- /dev/null
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -0,0 +1,57 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use Date::Parse;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearchs);
+use FS::svc_acct;
+
+my $fs_user = shift or die &usage;
+adminsuidsetup( $fs_user );
+
+my $target_user = shift or die &usage;
+my $start = shift or die &usage;
+my $stop = shift || time;
+
+my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
+die "username $target_user not found\n" unless $svc_acct;
+
+print $svc_acct->seconds_since_sqlradacct( str2time($start), str2time($stop) );
+
+sub usage {
+  die "Usage:\n\n  freeside-sqlradius-seconds freeside_username target_username start_date stop_date\n";
+}
+
+
+=head1 NAME
+
+freeside-sqlradius-seconds - Real-time radacct import daemon
+
+=head1 SYNOPSIS
+
+  freeside-sqlradius-seconds freeside_username target_username start_date [ stop_date ]
+
+=head1 DESCRIPTION
+
+Returns the number of seconds the specified username has been online between
+start_date (inclusive) and stop_date (exclusive).
+See L<FS::svc_acct/seconds_since_sqlradacct>
+
+B<freeside_username> is a username added by freeside-adduser.
+B<target_username> is the username of the user account to query.
+B<start_date> and B<stop_date> are in any format Date::Parse is happy with.
+B<stop_date> defaults to now if not specified.
+
+=head1 BUGS
+
+Selection of the account in question is rather simplistic in that
+B<target_username> doesn't necessarily identify a unique account (and wouldn't
+even if a domain was specified), and no sqlradius export is checked for.
+
+=head1 SEE ALSO
+
+L<FS::svc_acct/seconds_since_sqlradacct>
+
+=cut
+
+1;
-- 
cgit v1.2.1


From 414b0f5b52ac15a4fdec9706727ff541d3bca039 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:30:52 +0000
Subject: carriage return helps alot

---
 FS/bin/freeside-sqlradius-seconds | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index e65b87f89..f785e23c2 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -16,7 +16,8 @@ my $stop = shift || time;
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
 
-print $svc_acct->seconds_since_sqlradacct( str2time($start), str2time($stop) );
+print $svc_acct->seconds_since_sqlradacct( str2time($start), str2time($stop) ).
+      "\n";
 
 sub usage {
   die "Usage:\n\n  freeside-sqlradius-seconds freeside_username target_username start_date stop_date\n";
-- 
cgit v1.2.1


From d86fad39ef5038a76c87e15b03b579f5151eb55b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:35:36 +0000
Subject: doh

---
 FS/bin/freeside-sqlradius-seconds | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index f785e23c2..e40dc91b6 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -16,7 +16,9 @@ my $stop = shift || time;
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
 
-print $svc_acct->seconds_since_sqlradacct( str2time($start), str2time($stop) ).
+print $svc_acct->seconds_since_sqlradacct(
+                                           str2time($start),
+                                           $stop ? str2time($stop) : time  ).
       "\n";
 
 sub usage {
-- 
cgit v1.2.1


From eb3e4b97673b20b626774b9e000c5c327c991d5b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:37:12 +0000
Subject: grr double doh

---
 FS/bin/freeside-sqlradius-seconds | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index e40dc91b6..d2358cd5e 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -11,7 +11,7 @@ adminsuidsetup( $fs_user );
 
 my $target_user = shift or die &usage;
 my $start = shift or die &usage;
-my $stop = shift || time;
+my $stop = scalar(@_) ? shift : '';
 
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
-- 
cgit v1.2.1


From d37105c93eae1366ee72ef93ae3d79cc5b04ade6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:47:06 +0000
Subject: is this broken or is the calculation?

---
 FS/bin/freeside-sqlradius-seconds | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index d2358cd5e..0539cb4d2 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -10,16 +10,13 @@ my $fs_user = shift or die &usage;
 adminsuidsetup( $fs_user );
 
 my $target_user = shift or die &usage;
-my $start = shift or die &usage;
-my $stop = scalar(@_) ? shift : '';
+my $start = scalar(@_) && str2time(shift) or die &usage;
+my $stop =  scalar(@_) ?  str2time(shift) :  time;
 
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
 
-print $svc_acct->seconds_since_sqlradacct(
-                                           str2time($start),
-                                           $stop ? str2time($stop) : time  ).
-      "\n";
+print $svc_acct->seconds_since_sqlradacct( $start, $stop ). "\n";
 
 sub usage {
   die "Usage:\n\n  freeside-sqlradius-seconds freeside_username target_username start_date stop_date\n";
-- 
cgit v1.2.1


From 9f981d37086cea91e17aa2aefeee43388c60eb19 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:48:46 +0000
Subject: sigh

---
 FS/bin/freeside-sqlradius-seconds | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index 0539cb4d2..31450bd2c 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -10,8 +10,8 @@ my $fs_user = shift or die &usage;
 adminsuidsetup( $fs_user );
 
 my $target_user = shift or die &usage;
-my $start = scalar(@_) && str2time(shift) or die &usage;
-my $stop =  scalar(@_) ?  str2time(shift) :  time;
+my $start = scalar(@_) ? str2time(shift) : die &usage;
+my $stop =  scalar(@_) ? str2time(shift) :  time;
 
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
-- 
cgit v1.2.1


From 0d6147067e8d5317d01692f8588b3a0167c664c8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:52:46 +0000
Subject: sheesh

---
 FS/bin/freeside-sqlradius-seconds | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index 31450bd2c..a61e97730 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -10,8 +10,9 @@ my $fs_user = shift or die &usage;
 adminsuidsetup( $fs_user );
 
 my $target_user = shift or die &usage;
-my $start = scalar(@_) ? str2time(shift) : die &usage;
-my $stop =  scalar(@_) ? str2time(shift) :  time;
+my $start = shift or die &usage;
+$start = str2time($start);
+my $stop =  scalar(@_) ? str2time(shift) : time;
 
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
-- 
cgit v1.2.1


From 641e3f253b22c54c8970213ef86e04337caab948 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 10:36:39 +0000
Subject: sqlradius time calculation fix wrt open sessions

---
 FS/FS/cust_svc.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 8bcb0fcca..66daec17b 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -394,11 +394,12 @@ sub seconds_since_sqlradacct {
                 FROM radacct
                 WHERE UserName = ?
                   AND $str2time AcctStartTime ) >= ?
+                  AND $str2time AcctStartTime ) <  ?
                   AND ( ? - $str2time AcctStartTime ) ) < 86400
                   AND (    $str2time AcctStopTime ) = 0
                                     OR AcctStopTime IS NULL )";
     $sth = $dbh->prepare($query) or die $dbh->errstr;
-    $sth->execute($end, $username, $start, $end)
+    $sth->execute($end, $username, $start, $end, $end)
       or die $sth->errstr. " executing query $query";
     my $start_during = $sth->fetchrow_arrayref->[0];
   
-- 
cgit v1.2.1


From 869f3b5401b5111789bf03a7a4cc5699ad2993a7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 10:42:26 +0000
Subject: doh!  but finally fixed

---
 FS/bin/freeside-sqlradius-seconds | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index a61e97730..1c978fa8a 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -12,7 +12,7 @@ adminsuidsetup( $fs_user );
 my $target_user = shift or die &usage;
 my $start = shift or die &usage;
 $start = str2time($start);
-my $stop =  scalar(@_) ? str2time(shift) : time;
+my $stop =  scalar(@ARGV) ? str2time(shift) : time;
 
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
-- 
cgit v1.2.1


From fcaa42e4801db37d29efd02a429911bfe3ad0cdf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 13:02:39 +0000
Subject: change wording

---
 httemplate/view/svc_acct.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index e00562ace..2e324c13c 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -92,7 +92,7 @@ if ( $part_svc->part_export('sqlradius') ) {
   }
 
   if ( $cust_pkg ) {
-    print ' this billing cycle (since '. time2str("%C", $last_bill). ') - '. 
+    print ' since last bill ('. time2str("%C", $last_bill). ') - '. 
           $plandata{recur_included_hours}. ' total hours in plan<BR>';
   } else {
     print ' (no billing cycle available for unaudited account)<BR>';
-- 
cgit v1.2.1


From f800872bff0d887ee096dfef186e6da7275ce5ae Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 21:31:20 +0000
Subject: invoice_lines() fix

---
 FS/FS/cust_bill.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 1742f604f..23e8731dc 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1032,9 +1032,9 @@ sub print_text {
   or die "cannot load config file $templatefile";
   $invoice_lines = 0;
   my $wasfunc = 0;
-  foreach ( grep /invoice_lines\(\d+\)/, @invoice_template ) { #kludgy
-    /invoice_lines\((\d+)\)/;
-    $invoice_lines += $1;
+  foreach ( grep /invoice_lines\(\d*\)/, @invoice_template ) { #kludgy
+    /invoice_lines\((\d*)\)/;
+    $invoice_lines += $1 || scalar(@buf);
     $wasfunc=1;
   }
   die "no invoice_lines() functions in template?" unless $wasfunc;
@@ -1119,7 +1119,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.56 2002-12-04 12:31:49 ivan Exp $
+$Id: cust_bill.pm,v 1.57 2002-12-17 21:31:20 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 587a93086f6d47881d95462d292cf7d260a9d6a1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 20 Dec 2002 03:29:37 +0000
Subject: no changing cancelled packages

---
 httemplate/view/cust_main.cgi | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index c49efa653..62e961dfa 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -399,11 +399,12 @@ foreach my $package (@packages) {
         qq!$pkg - $comment (&nbsp;<a href="$pkgview">Details</a>&nbsp;)!;
        # | !;
 
-  print qq! (&nbsp;<A HREF="${p}misc/change_pkg.cgi?$pkgnum">!.
-        'Change&nbsp;package</A>&nbsp;)';
-
   #false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
   unless ( $package->getfield('cancel') ) {
+
+    print qq! (&nbsp;<A HREF="${p}misc/change_pkg.cgi?$pkgnum">!.
+          'Change&nbsp;package</A>&nbsp;)';
+
     print ' (&nbsp;';
     if ( $package->getfield('susp') ) {
       print qq!<A HREF="${p}misc/unsusp_pkg.cgi?$pkgnum">Unsuspend</A>!;
-- 
cgit v1.2.1


From a6339c3ac72353911a0b7f585b758a4b6aada899 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Dec 2002 04:31:05 +0000
Subject: kludge around uninitialized value errors

---
 FS/FS/svc_acct.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 2062eb9ba..83af6ff52 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -266,7 +266,11 @@ sub insert {
       #    qsearch('export_svc', { 'exportnum' => $part_export->exportnum });
       #}
 
-      my $nodomain = $exports->{$part_export->exporttype}{'nodomain'};
+      #my $nodomain = $exports->{$part_export->exporttype}{'nodomain'};
+      #silly kludge to avoid uninitialized value errors
+      my $nodomain = exists( $exports->{$part_export->exporttype}{'nodomain'} )
+                     ? $exports->{$part_export->exporttype}{'nodomain'}
+                     : '';
       if ( $nodomain =~ /^Y/i ) {
         $conflict_user_svcpart{$_} = $part_export->exportnum
           foreach @svcparts;
-- 
cgit v1.2.1


From 8c679e623c0e21d3d4e1b1966b310db61871e119 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Dec 2002 07:36:52 +0000
Subject: $noexport hack moved to svc_Common

---
 FS/FS/svc_acct.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 83af6ff52..659835626 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1,7 +1,7 @@
 package FS::svc_acct;
 
 use strict;
-use vars qw( @ISA $DEBUG $me $noexport_hack $conf
+use vars qw( @ISA $DEBUG $me $conf
              $dir_prefix @shells $usernamemin
              $usernamemax $passwordmin $passwordmax
              $username_ampersand $username_letter $username_letterfirst
@@ -186,7 +186,7 @@ sqlradius export only)
 
 (TODOC: L<FS::queue> and L<freeside-queued>)
 
-(TODOC: new exports! $noexport_hack)
+(TODOC: new exports!)
 
 =cut
 
@@ -411,7 +411,7 @@ error, otherwise returns false.
 
 The corresponding FS::cust_svc record will be deleted as well.
 
-(TODOC: new exports! $noexport_hack)
+(TODOC: new exports!)
 
 =cut
 
-- 
cgit v1.2.1


From 3ed2aae6b3e6b303b4058f9cd6e54ea377196b0a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Dec 2002 10:02:24 +0000
Subject: better qsearchs warning

---
 FS/FS/Record.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index ebcbbb497..40215100f 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -330,9 +330,11 @@ for a single item, or your data is corrupted.
 =cut
 
 sub qsearchs { # $result_record = &FS::Record:qsearchs('table',\%hash);
+  my $table = $_[0];
   my(@result) = qsearch(@_);
-  carp "warning: Multiple records in scalar search!" if scalar(@result) > 1;
-    #should warn more vehemently if the search was on a primary key?
+  carp "warning: Multiple records in scalar search ($table)"
+    if scalar(@result) > 1;
+  #should warn more vehemently if the search was on a primary key?
   scalar(@result) ? ($result[0]) : ();
 }
 
-- 
cgit v1.2.1


From cbb506ec10170d3f77d618596ca8cd25d08b2bd2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Dec 2002 10:14:48 +0000
Subject: could be multiple returns from these searches, with taxclasses

---
 FS/FS/cust_main.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 890371de7..1727c4b94 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -591,13 +591,13 @@ sub check {
 
 # bad idea to disable, causes billing to fail because of no tax rates later
 #  unless ( $import ) {
-    unless ( qsearchs('cust_main_county', {
+    unless ( qsearch('cust_main_county', {
       'country' => $self->country,
       'state'   => '',
      } ) ) {
       return "Unknown state/county/country: ".
         $self->state. "/". $self->county. "/". $self->country
-        unless qsearchs('cust_main_county',{
+        unless qsearch('cust_main_county',{
           'state'   => $self->state,
           'county'  => $self->county,
           'country' => $self->country,
-- 
cgit v1.2.1


From 38198ddef5f92e95ae3f0a151759931400a6ad44 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Dec 2002 23:44:14 +0000
Subject: don't display all accounts in each domain

---
 httemplate/search/svc_domain.cgi | 110 ++++++++++++++++++++-------------------
 1 file changed, 57 insertions(+), 53 deletions(-)

diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index 60f1f8c81..c397714e5 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -50,8 +50,9 @@ if ( scalar(@svc_domain) == 1 ) {
       <TR>
         <TH>Service #</TH>
         <TH>Domain</TH>
-        <TH>Mail to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
+<!--        <TH>Mail to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
         <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
+-->
       </TR>
 END
 
@@ -67,57 +68,60 @@ END
       $svc_domain->domain,
     );
 
-    my @svc_acct=qsearch('svc_acct',{'domsvc' => $svcnum});
-    my $rowspan = 0;
-
-    my $n1 = '';
-    my($svc_acct, @rows);
-    foreach $svc_acct (
-      sort {$b->getfield('username') cmp $a->getfield('username')} (@svc_acct)
-    ) {
-
-      my (@forwards) = ();
-
-      my($svcnum,$username)=(
-        $svc_acct->svcnum,
-        $svc_acct->username,
-      );
-
-      my @svc_forward = qsearch( 'svc_forward', { 'srcsvc' => $svcnum } );
-      my $svc_forward;
-      foreach $svc_forward (@svc_forward) {
-        my($dstsvc,$dst) = (
-          $svc_forward->dstsvc,
-          $svc_forward->dst,
-        );
-        if ($dstsvc) {
-          my $dst_svc_acct=qsearchs( 'svc_acct', { 'svcnum' => $dstsvc } );
-          my $destination=$dst_svc_acct->email;
-          push @forwards, qq!<TD><A HREF="!, popurl(2),
-                qq!view/svc_acct.cgi?$dstsvc">$destination</A>!,
-                qq!</TD></TR>!
-          ;
-        }else{
-          push @forwards, qq!<TD>$dst</TD></TR>!
-          ;
-        }
-      }
-
-      push @rows, qq!$n1<TD ROWSPAN=!, (scalar(@svc_forward) || 1),
-            qq!><A HREF="!. popurl(2). qq!view/svc_acct.cgi?$svcnum">!,
-      #print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
-            ( ($username eq '*') ? "<I>(anything)</I>" : $username ),
-            qq!\@$domain</A> </TD>!,
-      ;
-
-      push @rows, @forwards;
-
-      $rowspan += (scalar(@svc_forward) || 1);
-      $n1 = "</TR><TR>";
-    }
-    #end of false laziness
-
-
+    #don't display all accounts here
+    my $rowspan = 1;
+
+    #my @svc_acct=qsearch('svc_acct',{'domsvc' => $svcnum});
+    #my $rowspan = 0;
+    #
+    #my $n1 = '';
+    #my($svc_acct, @rows);
+    #foreach $svc_acct (
+    #  sort {$b->getfield('username') cmp $a->getfield('username')} (@svc_acct)
+    #) {
+    #
+    #  my (@forwards) = ();
+    #
+    #  my($svcnum,$username)=(
+    #    $svc_acct->svcnum,
+    #    $svc_acct->username,
+    #  );
+    #
+    #  my @svc_forward = qsearch( 'svc_forward', { 'srcsvc' => $svcnum } );
+    #  my $svc_forward;
+    #  foreach $svc_forward (@svc_forward) {
+    #    my($dstsvc,$dst) = (
+    #      $svc_forward->dstsvc,
+    #      $svc_forward->dst,
+    #    );
+    #    if ($dstsvc) {
+    #      my $dst_svc_acct=qsearchs( 'svc_acct', { 'svcnum' => $dstsvc } );
+    #      my $destination=$dst_svc_acct->email;
+    #      push @forwards, qq!<TD><A HREF="!, popurl(2),
+    #            qq!view/svc_acct.cgi?$dstsvc">$destination</A>!,
+    #            qq!</TD></TR>!
+    #      ;
+    #    }else{
+    #      push @forwards, qq!<TD>$dst</TD></TR>!
+    #      ;
+    #    }
+    #  }
+    #
+    #  push @rows, qq!$n1<TD ROWSPAN=!, (scalar(@svc_forward) || 1),
+    #        qq!><A HREF="!. popurl(2). qq!view/svc_acct.cgi?$svcnum">!,
+    #  #print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
+    #        ( ($username eq '*') ? "<I>(anything)</I>" : $username ),
+    #        qq!\@$domain</A> </TD>!,
+    #  ;
+    #
+    #  push @rows, @forwards;
+    #
+    #  $rowspan += (scalar(@svc_forward) || 1);
+    #  $n1 = "</TR><TR>";
+    #}
+    ##end of false laziness
+    #
+    #
 
     print <<END;
     <TR>
@@ -125,7 +129,7 @@ END
       <TD ROWSPAN=$rowspan>$domain</TD>
 END
 
-    print @rows;
+    #print @rows;
     print "</TR>";
 
   }
-- 
cgit v1.2.1


From b3cf415f88878300916d3e85910693b7315ef7b3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Dec 2002 23:48:00 +0000
Subject: UI

---
 httemplate/search/svc_domain.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index c397714e5..c0acf1143 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -125,8 +125,8 @@ END
 
     print <<END;
     <TR>
-      <TD ROWSPAN=$rowspan><A HREF="${p}view/svc_domain.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
-      <TD ROWSPAN=$rowspan>$domain</TD>
+      <TD ROWSPAN=$rowspan><A HREF="${p}view/svc_domain.cgi?$svcnum">$svcnum</A></TD>
+      <TD ROWSPAN=$rowspan><A HREF="${p}view/svc_domain.cgi?$svcnum">$domain</A></TD>
 END
 
     #print @rows;
-- 
cgit v1.2.1


From 1a7b34a94745208217187050c1daec5bb31b7eb7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 22 Dec 2002 08:53:25 +0000
Subject: -p option for freeside-daily to only run for a particular payby
 $disable_agentcheck option for cust_pkg for import optimization

---
 FS/FS/cust_pkg.pm     | 15 ++++++++++-----
 FS/bin/freeside-daily | 15 +++++++++++----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index e83b95156..c15e2fe9d 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1,7 +1,7 @@
 package FS::cust_pkg;
 
 use strict;
-use vars qw(@ISA);
+use vars qw(@ISA $disable_agentcheck);
 use FS::UID qw( getotaker dbh );
 use FS::Record qw( qsearch qsearchs );
 use FS::cust_svc;
@@ -21,6 +21,8 @@ use FS::svc_forward;
 
 @ISA = qw( FS::Record );
 
+$disable_agentcheck = 0;
+
 sub _cache {
   my $self = shift;
   my ( $hashref, $cache ) = @_;
@@ -142,10 +144,13 @@ sub insert {
   my $cust_main = $self->cust_main;
   return "Unknown customer ". $self->custnum unless $cust_main;
 
-  my $agent = qsearchs( 'agent', { 'agentnum' => $cust_main->agentnum } );
-  my $pkgpart_href = $agent->pkgpart_hashref;
-  return "agent ". $agent->agentnum. " can't purchase pkgpart ". $self->pkgpart
-    unless $pkgpart_href->{ $self->pkgpart };
+  unless ( $disable_agentcheck ) {
+    my $agent = qsearchs( 'agent', { 'agentnum' => $cust_main->agentnum } );
+    my $pkgpart_href = $agent->pkgpart_hashref;
+    return "agent ". $agent->agentnum.
+           " can't purchase pkgpart ". $self->pkgpart
+      unless $pkgpart_href->{ $self->pkgpart };
+  }
 
   $self->SUPER::insert;
 
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 1db786120..c82dc07a0 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -11,16 +11,19 @@ use FS::cust_main;
 
 &untaint_argv;	#what it sounds like  (eww)
 use vars qw($opt_d $opt_v);
-getopts("d:v");
+getopts("p:d:v");
 my $user = shift or die &usage;
 
 adminsuidsetup $user;
 
 $FS::cust_main::Debug = 1 if $opt_v;
 
+my %search;
+$search{'payby'} = $opt_p if $opt_p;
+
 my @cust_main = @ARGV
-  ? map { qsearchs('cust_main', { custnum => $_ } ) } @ARGV
-  : qsearch('cust_main', {} )
+  ? map { qsearchs('cust_main', { custnum => $_, %search } ) } @ARGV
+  : qsearch('cust_main', \%search )
 ;
 
 #we're at now now (and later).
@@ -95,7 +98,7 @@ freeside-daily - Run daily billing and invoice collection events.
 
 =head1 SYNOPSIS
 
-  freeside-daily [ -d 'date' ] user [ custnum custnum ... ]
+  freeside-daily [ -d 'date' ] [ -p 'payby' ] [ -v ] user [ custnum custnum ... ]
 
 =head1 DESCRIPTION
 
@@ -110,6 +113,10 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
   -d: Pretend it's 'date'.  Date is in any format Date::Parse is happy with,
       but be careful.
 
+  -p: Only process customers with the specified payby (CARD, CHEK, BILL, COMP, LECB)
+
+  -v: enable debugging
+
 user: From the mapsecrets file - see config.html from the base documentation
 
 custnum: if one or more customer numbers are specified, only bills those
-- 
cgit v1.2.1


From a7ac7ab3af0dd4f9773aec7c59515fefc8eaedec Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Mon, 23 Dec 2002 14:24:06 +0000
Subject: added stuff for selfservice_server-quiet, signup_server-quiet, and
 emailcancel messages.

---
 FS/FS/Conf.pm      | 35 +++++++++++++++++++++++++++++++++++
 FS/FS/cust_bill.pm |  5 +++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 6de311596..f0a4c9f45 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -879,6 +879,20 @@ httemplate/docs/config.html
     'select_enum' => [ qw(en_US) ],
   },
 
+  {
+    'key'         => 'selfservice_server-quiet',
+    'section'     => '',
+    'description' => 'Disable decline and cancel emails generated by transactions initiated by the selfservice server. Not recommended, unless the customer will get instant feedback from a customer service UI, and receiving an email would be confusing/overkill.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'signup_server-quiet',
+    'section'     => '',
+    'description' => 'Disable decline and cancel emails generated by transactions initiated by the signup server. Not recommended, unless the customer will get instant feedback from a customer service UI, and receiving an email would be confusing/overkill. Does not disable welcome emails.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'signup_server-payby',
     'section'     => '',
@@ -923,6 +937,27 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'cancelmessage',
+    'section'     => 'billing',
+    'description' => 'Template file for cancellation emails.',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'cancelsubject',
+    'section'     => 'billing',
+    'description' => 'Subject line for cancellation emails.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'emailcancel',
+    'section'     => 'billing',
+    'description' => 'Enable emailing of cancellation notices.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'require_cardname',
     'section'     => 'billing',
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 23e8731dc..48315199a 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -7,6 +7,7 @@ use vars qw( $xaction $E_NoErr );
 use vars qw( $bop_processor $bop_login $bop_password $bop_action @bop_options );
 use vars qw( $ach_processor $ach_login $ach_password $ach_action @ach_options );
 use vars qw( $invoice_lines @buf ); #yuck
+use vars qw( $quiet );
 use Date::Format;
 use Mail::Internet 1.44;
 use Mail::Header;
@@ -823,7 +824,7 @@ sub realtime_bop {
     my $perror = "$processor error, invnum #". $self->invnum. ': '.
                  $transaction->result_code. ": ". $transaction->error_message;
 
-    if ( $conf->exists('emaildecline')
+    if ( !$quiet && $conf->exists('emaildecline')
          && grep { $_ ne 'POST' } $cust_main->invoicing_list
     ) {
       my @templ = $conf->config('declinetemplate');
@@ -1119,7 +1120,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.57 2002-12-17 21:31:20 ivan Exp $
+$Id: cust_bill.pm,v 1.58 2002-12-23 14:22:48 steve Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From c35cabf3a4100f03b62800e3894077eb6a3df349 Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Mon, 23 Dec 2002 14:36:20 +0000
Subject: added stuff for selfservice_server-quiet, signup_server-quiet, and
 emailcancel messages.

signup server can set user's comment field.
---
 fs_signup/FS-SignupClient/SignupClient.pm | 4 +++-
 fs_signup/fs_signup_server                | 9 ++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm
index 0a6cbfba2..842064de6 100644
--- a/fs_signup/FS-SignupClient/SignupClient.pm
+++ b/fs_signup/FS-SignupClient/SignupClient.pm
@@ -56,6 +56,7 @@ FS::SignupClient - Freeside signup client API
     'payname'          => $payname,
     'invoicing_list'   => $invoicing_list,
     'referral_custnum' => $referral_custnum,
+    'comments'         => $comments,
     'pkgpart'          => $pkgpart,
     'username'         => $username,
     '_password'        => $password,
@@ -141,6 +142,7 @@ a paramater with the following keys:
   payname
   invoicing_list
   referral_custnum
+  comments
   pkgpart
   username
   _password
@@ -161,7 +163,7 @@ sub new_customer {
   my $signup_data = { map { $_ => $hashref->{$_} } qw(
     first last ss company address1 address2 city county state zip country
     daytime night fax payby payinfo paydate payname invoicing_list
-    referral_custnum pkgpart username _password sec_phrase popnum
+    referral_custnum comments pkgpart username _password sec_phrase popnum
   ) };
 
   $signup_data->{agentnum} = $hashref->{agentnum} if $hashref->{agentnum};
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index e0fa9ba5f..36af40a57 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -14,6 +14,8 @@ use FS::Conf;
 use FS::Record qw( qsearch qsearchs );
 use FS::cust_main_county;
 use FS::cust_main;
+use FS::cust_bill;
+use FS::cust_pkg;
 use FS::Msgcat qw(gettext);
 
 use vars qw( $opt $Debug );
@@ -25,6 +27,11 @@ my $user = shift or die &usage;
 
 my $conf = new FS::Conf;
 
+if ($conf->exists('signup_server-quiet')) {
+    $FS::cust_bill::quiet = 1;
+    $FS::cust_pkg::quiet = 1;
+}
+
 #my @payby = qw(CARD PREPAY);
 my @payby = $conf->config('signup_server-payby');
 my $smtpmachine = $conf->config('smtpmachine');
@@ -136,7 +143,7 @@ while (1) {
 
       map { $_ => $signup_data->{$_} } qw(
         last first ss company address1 address2 city county state zip country
-        daytime night fax payby payinfo paydate payname referral_custnum
+        daytime night fax payby payinfo paydate payname referral_custnum comments
       ),
 
     } );
-- 
cgit v1.2.1


From a09332084464d9319cd98aaabae901ad1be0ebb7 Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Mon, 23 Dec 2002 14:38:51 +0000
Subject: added stuff for selfservice_server-quiet, signup_server-quiet, and
 emailcancel messages.

---
 fs_selfservice/freeside-selfservice-server | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/fs_selfservice/freeside-selfservice-server b/fs_selfservice/freeside-selfservice-server
index e55ca4984..264cbc56d 100644
--- a/fs_selfservice/freeside-selfservice-server
+++ b/fs_selfservice/freeside-selfservice-server
@@ -19,6 +19,10 @@ use Net::SSH qw(sshopen2);
 use FS::UID qw(adminsuidsetup forksuidsetup);
 use FS::ClientAPI;
 
+use FS::Conf;
+use FS::cust_bill;
+use FS::cust_pkg;
+
 $Debug = 2; # >= 2 will log packet contents, including potentially compromising
             # information
 
@@ -33,6 +37,13 @@ my $pid_file = "/var/run/freeside-selfservice-server.$user.pid";
 
 &init($user);
 
+my $conf = new FS::Conf;
+
+if ($conf->exists('selfservice_server-quiet')) {
+    $FS::cust_bill::quiet = 1;
+    $FS::cust_pkg::quiet = 1;
+}
+
 my $clientd = "/usr/local/sbin/freeside-selfservice-clientd"; #better name?
 
 my $warnkids=0;
-- 
cgit v1.2.1


From b47b05fdc4af937a2df1a3b4017f550183814efc Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Mon, 23 Dec 2002 14:54:24 +0000
Subject: added stuff for selfservice_server-quiet, signup_server-quiet, and
 emailcancel messages.

---
 FS/FS/cust_pkg.pm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index c15e2fe9d..88ffd4d17 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2,6 +2,7 @@ package FS::cust_pkg;
 
 use strict;
 use vars qw(@ISA $disable_agentcheck);
+use vars qw( $quiet );
 use FS::UID qw( getotaker dbh );
 use FS::Record qw( qsearch qsearchs );
 use FS::cust_svc;
@@ -19,6 +20,13 @@ use FS::svc_domain;
 use FS::svc_www;
 use FS::svc_forward;
 
+# need all this for sending cancel emails in sub cancel
+
+use FS::Conf;
+use Date::Format;
+use Mail::Internet 1.44;
+use Mail::Header;
+
 @ISA = qw( FS::Record );
 
 $disable_agentcheck = 0;
@@ -295,7 +303,43 @@ sub cancel {
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
+  my $conf = new FS::Conf;
+
+  if ( !$quiet && $conf->exists('emailcancel')
+       && grep { $_ ne 'POST' } $self->cust_main->invoicing_list) {
+  
+      my @invoicing_list = $self->cust_main->invoicing_list;
+  
+      my $invoice_from = $conf->config('invoice_from');
+      my @print_text = map "$_\n", $conf->config('cancelmessage');
+      my $subject = $conf->config('cancelsubject');
+      my $smtpmachine = $conf->config('smtpmachine');
+      
+      if ( grep { $_ ne 'POST' } @invoicing_list ) { #email invoice
+	  #false laziness w/FS::cust_pay::delete & fs_signup_server && ::realtime_card
+	  #$ENV{SMTPHOSTS} = $smtpmachine;
+	  $ENV{MAILADDRESS} = $invoice_from;
+	  my $header = new Mail::Header ( [
+              "From: $invoice_from",
+	      "To: ". join(', ', grep { $_ ne 'POST' } @invoicing_list ),
+              "Sender: $invoice_from",
+              "Reply-To: $invoice_from",
+              "Date: ". time2str("%a, %d %b %Y %X %z", time),
+              "Subject: $subject",           
+                                     ] );
+	  my $message = new Mail::Internet (
+              'Header' => $header,
+              'Body' => [ @print_text ],      
+                                      );
+	  $!=0;
+	  $message->smtpsend( Host => $smtpmachine )
+	      or $message->smtpsend( Host => $smtpmachine, Debug => 1 );
+	  #should this return an error?
+	  }
+  }
+
   ''; #no errors
+
 }
 
 =item suspend
-- 
cgit v1.2.1


From 21771a118aaf154f605cfae05ee830eaeb4dd818 Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Mon, 23 Dec 2002 15:05:10 +0000
Subject: add email address to shellcommands

don't error out when importing unaudited accounts (even though should
probably be using $FS::svc_Common::noexport_hack anyway)
---
 FS/FS/part_export/shellcommands.pm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 04e5041c3..dbd4017f8 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -34,17 +34,27 @@ sub _export_command {
   my ( $self, $action, $svc_acct) = (shift, shift, shift);
   my $command = $self->option($action);
   my $stdin = $self->option($action."_stdin");
+
   no strict 'vars';
   {
     no strict 'refs';
     ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
   }
+
+  my $cust_pkg = $svc_acct->cust_svc->cust_pkg;
+  if ( $cust_pkg ) {
+    $email = ( grep { $_ ne 'POST' } $cust_pkg->cust_main->invoicing_list )[0];
+  } else {
+    $email = '';
+  }
+
   $finger = shell_quote $finger;
   $quoted_password = shell_quote $_password;
   $domain = $svc_acct->domain;
   $crypt_password = ''; #surpress "used only once" warnings
   $crypt_password = crypt( $svc_acct->_password,
                              $saltset[int(rand(64))].$saltset[int(rand(64))] );
+
   $self->shellcommands_queue( $svc_acct->svcnum,
     user         => $self->option('user')||'root',
     host         => $self->machine,
-- 
cgit v1.2.1


From 1014e988be16a7158ff7ca0d0a6e7aac730517a0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Dec 2002 15:21:55 +0000
Subject: make agent available to invoice templates

---
 FS/FS/cust_bill.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 48315199a..331c809bc 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1048,11 +1048,12 @@ sub print_text {
 
   #setup template variables
   package FS::cust_bill::_template; #!
-  use vars qw( $invnum $date $page $total_pages @address $overdue @buf );
+  use vars qw( $invnum $date $page $total_pages @address $overdue @buf $agent );
 
   $invnum = $self->invnum;
   $date = $self->_date;
   $page = 1;
+  $agent = $self->cust_main->agent->agent;
 
   if ( $FS::cust_bill::invoice_lines ) {
     $total_pages =
@@ -1120,7 +1121,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.58 2002-12-23 14:22:48 steve Exp $
+$Id: cust_bill.pm,v 1.59 2002-12-23 15:21:55 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 022f47d636bcec1699a0e8ebce394f5756af5f8c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Dec 2002 23:56:26 +0000
Subject: remove gratuitous warning and better error messages

---
 FS/FS/svc_acct.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 659835626..456c965af 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -366,7 +366,6 @@ sub insert {
           'svcnum' => $self->svcnum,
           'job'    => 'FS::svc_acct::send_email'
         };
-        warn "attempting to queue email to $to";
         my $error = $wqueue->insert(
           'to'       => $to,
           'from'     => $welcome_from,
@@ -383,14 +382,14 @@ sub insert {
         );
         if ( $error ) {
           $dbh->rollback if $oldAutoCommit;
-          return "queuing welcome email: $error";
+          return "error queuing welcome email: $error";
         }
 
         foreach my $jobnum ( @jobnums ) {
           my $error = $wqueue->depend_insert($jobnum);
           if ( $error ) {
             $dbh->rollback if $oldAutoCommit;
-            return "queuing welcome email job dependancy: $error";
+            return "error queuing welcome email job dependancy: $error";
           }
         }
 
-- 
cgit v1.2.1


From b1d4c3b5b5a05d38a4baf9c49bd7fdfb6990531d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 24 Dec 2002 22:41:23 +0000
Subject: optimization for ginourmous numbers of packages for intergate, whew

---
 FS/bin/freeside-setup         |  4 ++--
 README.1.5.0pre1              |  1 +
 httemplate/view/cust_main.cgi | 16 ++++++++--------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 8f3d99fd5..8b7466222 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -669,7 +669,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'pkgpart',
       'unique' => [],
-      'index' => [],
+      'index' => [ [ disabled ], ],
     },
 
 #    'part_title' => {
@@ -712,7 +712,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'svcpart',
       'unique' => [],
-      'index' => [],
+      'index' => [ [ 'disabled' ] ],
     },
 
     'part_svc_column' => {
diff --git a/README.1.5.0pre1 b/README.1.5.0pre1
index 57fc36af6..0de86bce0 100644
--- a/README.1.5.0pre1
+++ b/README.1.5.0pre1
@@ -7,6 +7,7 @@ schema changes:
   *** add column cust_main_county.taxname
   *** add column cust_bill_pkg.itemdesc
   *** drop index cust_bill_pkg1
+  *** add index part_pkg1 and part_svc1
 
 install DBIx::DBSchema 0.21
 install NetAddr::IP
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 62e961dfa..6fe759bd9 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -280,14 +280,14 @@ print '<BR>'.
   qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
   '<SELECT NAME="pkgpart"><OPTION> ';
 
-foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
-  my $pkgpart = $type_pkgs->pkgpart;
-#  my $part_pkg = qsearchs('part_pkg', { 'pkgpart' => $pkgpart } )
-#    or do { warn "unknown type_pkgs.pkgpart $pkgpart"; next; };
-  my $part_pkg =
-    qsearchs('part_pkg', { 'pkgpart' => $pkgpart, 'disabled' => '' } )
-    or next;
-  print qq!<OPTION VALUE="$pkgpart">!. $part_pkg->pkg. ' - '.
+foreach my $part_pkg (
+  qsearch( 'part_pkg', { 'disabled' => '' }, '',
+           ' AND 0 < ( SELECT COUNT(*) FROM type_pkgs '.
+           '             WHERE typenum = '. $agent->typenum.
+           '             AND type_pkgs.pkgpart = part_pkg.pkgpart )'
+         )
+) {
+  print '<OPTION VALUE="'. $part_pkg->pkgpart. '">'. $part_pkg->pkg. ' - '.
         $part_pkg->comment;
 }
 
-- 
cgit v1.2.1


From 619b551fc1f58c1bdd0a2f7c4df7783c0542cbdd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 24 Dec 2002 23:03:27 +0000
Subject: electronic checks work in signup.cgi

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index dc242bdcf..6672e605c 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.34 2002-11-29 05:14:21 ivan Exp $
+# $Id: signup.cgi,v 1.35 2002-12-24 23:03:27 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -160,7 +160,12 @@ if ( defined $cgi->param('magic') ) {
     }
 
     $payby = $cgi->param('payby');
-    $payinfo = $cgi->param( $payby. '_payinfo' );
+    if ( $payby eq 'CHEK' ) {
+      #$payinfo = join('@', map { $cgi->param( $payby. "_payinfo$_" ) } (1,2) );
+      $payinfo = $cgi->param('CHEK_payinfo1').'@'.$cgi->param('CHEK_payinfo2');
+    } else {
+      $payinfo = $cgi->param( $payby. '_payinfo' );
+    }
     $paydate =
       $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' );
     $payname = $cgi->param( $payby. '_payname' );
-- 
cgit v1.2.1


From 7926d92e41b592b08f15d250ac5e78f75a2a29c7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Dec 2002 06:59:09 +0000
Subject: declare $opt_p usage

---
 FS/bin/freeside-daily | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index c82dc07a0..579d071ac 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -10,7 +10,7 @@ use FS::Conf;
 use FS::cust_main;
 
 &untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_d $opt_v);
+use vars qw($opt_d $opt_v $opt_p);
 getopts("p:d:v");
 my $user = shift or die &usage;
 
-- 
cgit v1.2.1


From 652526712a97a71381b08b89b389d526bcbc85d1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 27 Dec 2002 12:56:58 +0000
Subject: better times on failed billing events

---
 FS/FS/cust_main.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 1727c4b94..91ffa451a 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1335,7 +1335,8 @@ sub collect {
       my $cust_bill_event = new FS::cust_bill_event {
         'invnum'     => $cust_bill->invnum,
         'eventpart'  => $part_bill_event->eventpart,
-        '_date'      => $invoice_time,
+        #'_date'      => $invoice_time,
+        '_date'      => time,
         'status'     => $status,
         'statustext' => $statustext,
       };
-- 
cgit v1.2.1


From c423f1b4bdad5f4dea96c27f998215ca18745f6f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 28 Dec 2002 09:16:49 +0000
Subject: prevent edge-case business-onlinepayment mod_perl leakage in
 multi-database installs.  ugh.

---
 FS/FS/cust_bill.pm | 7 ++++++-
 FS/FS/svc_acct.pm  | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 331c809bc..af248a7a8 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -36,6 +36,11 @@ $FS::UID::callback{'FS::cust_bill'} = sub {
   $invoice_from = $conf->config('invoice_from');
   $smtpmachine = $conf->config('smtpmachine');
 
+  ( $bop_processor,$bop_login, $bop_password, $bop_action ) = ( '', '', '', '');
+  @bop_options = ();
+  ( $ach_processor,$ach_login, $ach_password, $ach_action ) = ( '', '', '', '');
+  @ach_options = ();
+
   if ( $conf->exists('business-onlinepayment') ) {
     ( $bop_processor,
       $bop_login,
@@ -1121,7 +1126,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.59 2002-12-23 15:21:55 ivan Exp $
+$Id: cust_bill.pm,v 1.60 2002-12-28 09:16:49 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 456c965af..9b953eac8 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -62,6 +62,9 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
     $welcome_mimetype = $conf->config('welcome_email-mimetype') || 'text/plain';
   } else {
     $welcome_template = '';
+    $welcome_from = '';
+    $welcome_subject = '';
+    $welcome_mimetype = '';
   }
   $smtpmachine = $conf->config('smtpmachine');
   $radius_password = $conf->config('radius-password') || 'Password';
-- 
cgit v1.2.1


From fd69668cd33e9cfc2f1c8469c6e6b7089243d3e6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 10 Jan 2003 07:41:05 +0000
Subject: pop off an extra blank line in business-onlinepayment options

---
 FS/FS/cust_bill.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index af248a7a8..c661baa95 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -667,6 +667,10 @@ sub realtime_lec {
 
 sub realtime_bop {
   my( $self, $method, $processor, $login, $password, $action, $options ) = @_;
+
+  #trim an extraneous blank line
+  pop @$options if scalar(@$options) % 2 && $options->[-1] =~ /^\s*$/;
+
   my $cust_main = $self->cust_main;
   my $amount = $self->owed;
 
@@ -1126,7 +1130,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.60 2002-12-28 09:16:49 ivan Exp $
+$Id: cust_bill.pm,v 1.61 2003-01-10 07:41:05 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From db57fc8a00107bdbf5830b5c11b53dd0cfd7ec3b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 13 Jan 2003 06:19:50 +0000
Subject: whitespace inconsistancy causing extraneous diffs

---
 httemplate/edit/part_svc.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index d0cc9b645..d4bb4704c 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -164,7 +164,7 @@ my %defs = (
               && qsearchs( 'export_svc', {
                                    exportnum => $part_export->exportnum,
                                    svcpart   => $clone || $part_svc->svcpart });
-        $html .= '>'. $part_export->exportnum. ': '.  $part_export->exporttype.
+        $html .= '>'. $part_export->exportnum. ': '. $part_export->exporttype.
                  ' to '. $part_export->machine. '</TD>';
         $count++;
         $html .= '</TR><TR>' unless $count % $columns;
-- 
cgit v1.2.1


From 27ee26568a1a58b0fb65b7269a43cd3da6d66b35 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 13 Jan 2003 07:26:52 +0000
Subject: another Pg 7.3 fix

---
 httemplate/edit/part_export.cgi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index d64526dd4..bdf41e2b2 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -49,11 +49,11 @@ my $widget = new HTML::Widgets::SelectLayers(
       my $label = $optinfo->{label};
       my $type = defined($optinfo->{type}) ? $optinfo->{type} : 'text';
       my $value = $cgi->param($option)
-                  || $part_export->option($option)
-                  || ( (exists $optinfo->{default} && !$part_export->exportnum)
-                       ? $optinfo->{default}
-                       : ''
-                     );
+                 || ( $part_export->exportnum && $part_export->option($option) )
+                 || ( (exists $optinfo->{default} && !$part_export->exportnum)
+                      ? $optinfo->{default}
+                      : ''
+                    );
       $html .= qq!<TR><TD ALIGN="right">$label</TD><TD>!;
       if ( $type eq 'select' ) {
         $html .= qq!<SELECT NAME="$option">!;
-- 
cgit v1.2.1


From 2f9eb7976dca75dc6c585ea9c62f1b0898e3e953 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 14 Jan 2003 08:49:57 +0000
Subject: add freeside-selfservice-server to init script add domsvc checking as
 a foreign key

---
 FS/FS/svc_acct.pm    |  3 ++-
 Makefile             |  3 +++
 init.d/freeside-init | 12 ++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 9b953eac8..e0c4662b2 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -673,7 +673,8 @@ sub check {
   }
 
   my $error = $self->ut_numbern('svcnum')
-              || $self->ut_number('domsvc')
+              #|| $self->ut_number('domsvc')
+              || $self->ut_foreign_key('domsvc', 'svc_domain', 'svcnum' )
               || $self->ut_textn('sec_phrase')
   ;
   return $error if $error;
diff --git a/Makefile b/Makefile
index c47720b80..da56c7342 100644
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,9 @@ SIGNUP_MACHINE = localhost
 SIGNUP_AGENTNUM = 2
 SIGNUP_REFNUM = 2
 
+SELFSERVICE_USER = nostart
+SELFSERVICE_MACHINE = localhost
+
 #---
 
 #not changable yet
diff --git a/init.d/freeside-init b/init.d/freeside-init
index d3016b289..37ced73d4 100644
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -15,6 +15,9 @@ SIGNUP_MACHINE=%%%SIGNUP_MACHINE%%%
 SIGNUP_AGENTNUM=%%%SIGNUP_AGENTNUM%%%
 SIGNUP_REFNUM=%%%SIGNUP_REFNUM%%%
 
+SELFSERVICE_USER=%%%SELFSERVICE_USER%%%
+SELFSERVICE_MACHINE=%%%SELFSERVICE_MACHINE%%%
+
 case "$1" in
   start)
         # Start daemons.
@@ -29,6 +32,11 @@ case "$1" in
         echo -n "Starting fs_signup_server: "
         su freeside -c "$FREESIDE_PATH/fs_signup/fs_signup_server $SIGNUP_USER $SIGNUP_MACHINE $SIGNUP_AGENTNUM $SIGNUP_REFNUM" &
         echo "done."
+
+        echo -n "Starting freeside-selfservice-server: "
+        $FREESIDE_PATH/fs_selfservice/freeside-selfservice-server $SELFSERVICE_USER $SELFSERVICE_MACHINE
+        echo "done."
+
         ;;
   stop)
         # Stop daemons.
@@ -43,6 +51,10 @@ case "$1" in
         echo -n "Stopping fs_signup_server: "
         killall fs_signup_server
         echo "done."
+
+        echo -n "Stopping freeside-selfservice-server: "
+        kill `cat /var/run/freeside-selfservice-server.pid`
+        echo "done."
         ;;
 
   restart)
-- 
cgit v1.2.1


From 1bfcd9ce4738e5c9f3c8a309775235e823b2f82c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 14 Jan 2003 09:26:49 +0000
Subject: move freeside-selfservice-server to proper MakeMaker install location

---
 FS/MANIFEST                                |   1 +
 FS/bin/freeside-selfservice-server         | 235 +++++++++++++++++++++++++++++
 fs_selfservice/freeside-selfservice-server | 235 -----------------------------
 init.d/freeside-init                       |   2 +-
 4 files changed, 237 insertions(+), 236 deletions(-)
 create mode 100644 FS/bin/freeside-selfservice-server
 delete mode 100644 fs_selfservice/freeside-selfservice-server

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 9c387d42e..b3de623d7 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -19,6 +19,7 @@ bin/freeside-setinvoice
 bin/freeside-overdue
 bin/freeside-radgroup
 bin/freeside-receivables-report
+bin/freeside-selfservice-server
 bin/freeside-sqlradius-radacctd
 bin/freeside-sqlradius-reset
 bin/freeside-sqlradius-seconds
diff --git a/FS/bin/freeside-selfservice-server b/FS/bin/freeside-selfservice-server
new file mode 100644
index 000000000..264cbc56d
--- /dev/null
+++ b/FS/bin/freeside-selfservice-server
@@ -0,0 +1,235 @@
+#!/usr/bin/perl -w
+#
+# freeside-selfservice-server
+
+# alas, much false laziness with freeside-queued and fs_signup_server.  at
+# least it is slated to replace fs_{signup,passwd,mailadmin}_server
+# should probably generalize the version in here, or better yet use
+# Proc::Daemon or somesuch
+
+use strict;
+use vars qw( $Debug %kids $kids $max_kids $shutdown $log_file $ssh_pid );
+use Fcntl qw(:flock);
+use POSIX qw(:sys_wait_h setsid);
+use IO::Handle;
+use IO::Select;
+use IO::File;
+use Storable qw(nstore_fd fd_retrieve);
+use Net::SSH qw(sshopen2);
+use FS::UID qw(adminsuidsetup forksuidsetup);
+use FS::ClientAPI;
+
+use FS::Conf;
+use FS::cust_bill;
+use FS::cust_pkg;
+
+$Debug = 2; # >= 2 will log packet contents, including potentially compromising
+            # information
+
+$shutdown = 0;
+$max_kids = '10'; #?
+$kids = 0;
+
+my $user = shift or die &usage;
+my $machine = shift or die &usage;
+my $pid_file = "/var/run/freeside-selfservice-server.$user.pid";
+#my $pid_file = "/var/run/freeside-selfservice-server.$user.pid"; $FS::UID::datasrc not posible, but should include machine name at least, hmm
+
+&init($user);
+
+my $conf = new FS::Conf;
+
+if ($conf->exists('selfservice_server-quiet')) {
+    $FS::cust_bill::quiet = 1;
+    $FS::cust_pkg::quiet = 1;
+}
+
+my $clientd = "/usr/local/sbin/freeside-selfservice-clientd"; #better name?
+
+my $warnkids=0;
+while (1) {
+  my($writer,$reader,$error) = (new IO::Handle, new IO::Handle, new IO::Handle);
+  warn "connecting to $machine\n" if $Debug;
+
+  $ssh_pid = sshopen2($machine,$reader,$writer,$clientd);
+
+#  nstore_fd(\*writer, {'hi'=>'there'});
+
+  warn "entering main loop\n" if $Debug;
+  my $undisp = 0;
+  my $s = IO::Select->new( $reader );
+  while (1) {
+
+    &reap_kids;
+
+    warn "waiting for packet from client\n" if $Debug && !$undisp;
+    $undisp = 1;
+    my @handles = $s->can_read(5);
+    unless ( @handles ) {
+      &shutdown if $shutdown;
+      next;
+    }
+
+    $undisp = 0;
+
+    warn "receiving packet from client\n" if $Debug;
+
+    my $packet = fd_retrieve($reader);
+    warn "packet received\n".
+         join('', map { " $_=>$packet->{$_}\n" } keys %$packet )
+      if $Debug > 1;
+
+    #prevent runaway forking
+    my $warnkids = 0;
+    while ( $kids >= $max_kids ) {
+      warn "WARNING: maximum $kids children reached\n" unless $warnkids++;
+      &reap_kids;
+      sleep 1;
+    }
+
+    warn "forking child\n" if $Debug;
+    defined( my $pid = fork ) or die "can't fork: $!";
+    if ( $pid ) {
+      $kids++;
+      $kids{$pid} = 1;
+      warn "child $pid spawned\n" if $Debug;
+    } else { #kid time
+
+      #get new db handle
+      $FS::UID::dbh->{InactiveDestroy} = 1;
+      forksuidsetup($user);
+
+      my $type = $packet->{_packet};
+      warn "calling $type handler\n" if $Debug; 
+      my $rv = eval { FS::ClientAPI->dispatch($type, $packet); };
+      if ( $@ ) {
+        warn my $error = "WARNING: error dispatching $type: $@";
+        $rv = { _error => $error };
+      }
+      $rv->{_token} = $packet->{_token}; #identifier
+
+      warn "sending response\n" if $Debug;
+      flock($writer, LOCK_EX) or die "FATAL: can't lock write stream: $!";
+      nstore_fd($rv, $writer) or die "FATAL: can't send response: $!";
+      $writer->flush or die "FATAL: can't flush: $!";
+      flock($writer, LOCK_UN) or die "WARNING: can't release write lock: $!";
+
+      warn "child exiting\n" if $Debug;
+      exit; #end-of-kid
+    }
+
+  }
+
+}
+
+###
+# utility subroutines
+###
+
+sub reap_kids {
+  #warn "reaping kids\n";
+  foreach my $pid ( keys %kids ) {
+    my $kid = waitpid($pid, WNOHANG);
+    if ( $kid > 0 ) {
+      $kids--;
+      delete $kids{$kid};
+    }
+  }
+  #warn "done reaping\n";
+}
+
+sub init {
+  my $user = shift;
+
+  chdir "/" or die "Can't chdir to /: $!";
+  open STDIN, '/dev/null' or die "Can't read /dev/null: $!";
+  defined(my $pid = fork) or die "Can't fork: $!";
+  if ( $pid ) {
+    print "freeside-selfservice-server to $machine started with pid $pid\n"; #logging to $log_file
+    exit unless $pid_file;
+    my $pidfh = new IO::File ">$pid_file" or exit;
+    print $pidfh "$pid\n";
+    exit;
+  }
+
+#  sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; $kids--; }
+#  #sub REAPER { my $pid = wait; $kids--; $SIG{CHLD} = \&REAPER; }
+#  $SIG{CHLD} =  \&REAPER;
+
+  $shutdown = 0;
+  $SIG{HUP} = sub { warn "SIGHUP received; shutting down\n"; $shutdown++; };
+  $SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $shutdown++; };
+  $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $shutdown++; };
+  $SIG{QUIT} = sub { warn "SIGQUIT received; shutting down\n"; $shutdown++; };
+  $SIG{PIPE} = sub { warn "SIGPIPE received; shutting down\n"; $shutdown++; };
+
+  #false laziness w/freeside-queued
+  my $freeside_gid = scalar(getgrnam('freeside'))
+    or die "can't setgid to freeside group\n";
+  $) = $freeside_gid;
+  $( = $freeside_gid;
+  #if freebsd can't setuid(), presumably it can't setgid() either.  grr fleabsd
+  ($(,$)) = ($),$();
+  $) = $freeside_gid;
+
+  $> = $FS::UID::freeside_uid;
+  $< = $FS::UID::freeside_uid;
+  #freebsd is sofa king broken, won't setuid()
+  ($<,$>) = ($>,$<);
+  $> = $FS::UID::freeside_uid;
+  #eslaf
+
+  $ENV{HOME} = (getpwuid($>))[7]; #for ssh
+  adminsuidsetup $user;
+
+  #$log_file = "/usr/local/etc/freeside/selfservice.". $FS::UID::datasrc; #MACHINE NAME
+  $log_file = "/usr/local/etc/freeside/selfservice.$machine.log";
+
+  open STDOUT, '>/dev/null'
+                            or die "Can't write to /dev/null: $!";
+  setsid                  or die "Can't start a new session: $!";
+  open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
+
+  $SIG{__DIE__} = \&_die;
+  $SIG{__WARN__} = \&_logmsg;
+
+  warn "freeside-selfservice-server starting\n";
+
+}
+
+sub shutdown {
+  my $wait = 12; #wait up to 1 minute
+  while ( $kids > 0 && $wait-- ) {
+    warn "waiting for $kids children to terminate";
+    sleep 5;
+  }
+  warn "abandoning $kids children" if $kids;
+  kill 'TERM', $ssh_pid if $ssh_pid;
+  die "exiting";
+}
+
+sub _die {
+  my $msg = shift;
+  unlink $pid_file if -e $pid_file;
+  _logmsg($msg);
+}
+
+sub _logmsg {
+  chomp( my $msg = shift );
+  _do_logmsg( "[server] [". scalar(localtime). "] [$$] $msg\n" );
+}
+
+sub _do_logmsg {
+  chomp( my $msg = shift );
+  my $log = new IO::File ">>$log_file";
+  flock($log, LOCK_EX);
+  seek($log, 0, 2);
+  print $log "$msg\n";
+  flock($log, LOCK_UN);
+  close $log;
+}
+
+sub usage {
+  die "Usage:\n\n  fs_signup_server user machine\n";
+}
+
diff --git a/fs_selfservice/freeside-selfservice-server b/fs_selfservice/freeside-selfservice-server
deleted file mode 100644
index 264cbc56d..000000000
--- a/fs_selfservice/freeside-selfservice-server
+++ /dev/null
@@ -1,235 +0,0 @@
-#!/usr/bin/perl -w
-#
-# freeside-selfservice-server
-
-# alas, much false laziness with freeside-queued and fs_signup_server.  at
-# least it is slated to replace fs_{signup,passwd,mailadmin}_server
-# should probably generalize the version in here, or better yet use
-# Proc::Daemon or somesuch
-
-use strict;
-use vars qw( $Debug %kids $kids $max_kids $shutdown $log_file $ssh_pid );
-use Fcntl qw(:flock);
-use POSIX qw(:sys_wait_h setsid);
-use IO::Handle;
-use IO::Select;
-use IO::File;
-use Storable qw(nstore_fd fd_retrieve);
-use Net::SSH qw(sshopen2);
-use FS::UID qw(adminsuidsetup forksuidsetup);
-use FS::ClientAPI;
-
-use FS::Conf;
-use FS::cust_bill;
-use FS::cust_pkg;
-
-$Debug = 2; # >= 2 will log packet contents, including potentially compromising
-            # information
-
-$shutdown = 0;
-$max_kids = '10'; #?
-$kids = 0;
-
-my $user = shift or die &usage;
-my $machine = shift or die &usage;
-my $pid_file = "/var/run/freeside-selfservice-server.$user.pid";
-#my $pid_file = "/var/run/freeside-selfservice-server.$user.pid"; $FS::UID::datasrc not posible, but should include machine name at least, hmm
-
-&init($user);
-
-my $conf = new FS::Conf;
-
-if ($conf->exists('selfservice_server-quiet')) {
-    $FS::cust_bill::quiet = 1;
-    $FS::cust_pkg::quiet = 1;
-}
-
-my $clientd = "/usr/local/sbin/freeside-selfservice-clientd"; #better name?
-
-my $warnkids=0;
-while (1) {
-  my($writer,$reader,$error) = (new IO::Handle, new IO::Handle, new IO::Handle);
-  warn "connecting to $machine\n" if $Debug;
-
-  $ssh_pid = sshopen2($machine,$reader,$writer,$clientd);
-
-#  nstore_fd(\*writer, {'hi'=>'there'});
-
-  warn "entering main loop\n" if $Debug;
-  my $undisp = 0;
-  my $s = IO::Select->new( $reader );
-  while (1) {
-
-    &reap_kids;
-
-    warn "waiting for packet from client\n" if $Debug && !$undisp;
-    $undisp = 1;
-    my @handles = $s->can_read(5);
-    unless ( @handles ) {
-      &shutdown if $shutdown;
-      next;
-    }
-
-    $undisp = 0;
-
-    warn "receiving packet from client\n" if $Debug;
-
-    my $packet = fd_retrieve($reader);
-    warn "packet received\n".
-         join('', map { " $_=>$packet->{$_}\n" } keys %$packet )
-      if $Debug > 1;
-
-    #prevent runaway forking
-    my $warnkids = 0;
-    while ( $kids >= $max_kids ) {
-      warn "WARNING: maximum $kids children reached\n" unless $warnkids++;
-      &reap_kids;
-      sleep 1;
-    }
-
-    warn "forking child\n" if $Debug;
-    defined( my $pid = fork ) or die "can't fork: $!";
-    if ( $pid ) {
-      $kids++;
-      $kids{$pid} = 1;
-      warn "child $pid spawned\n" if $Debug;
-    } else { #kid time
-
-      #get new db handle
-      $FS::UID::dbh->{InactiveDestroy} = 1;
-      forksuidsetup($user);
-
-      my $type = $packet->{_packet};
-      warn "calling $type handler\n" if $Debug; 
-      my $rv = eval { FS::ClientAPI->dispatch($type, $packet); };
-      if ( $@ ) {
-        warn my $error = "WARNING: error dispatching $type: $@";
-        $rv = { _error => $error };
-      }
-      $rv->{_token} = $packet->{_token}; #identifier
-
-      warn "sending response\n" if $Debug;
-      flock($writer, LOCK_EX) or die "FATAL: can't lock write stream: $!";
-      nstore_fd($rv, $writer) or die "FATAL: can't send response: $!";
-      $writer->flush or die "FATAL: can't flush: $!";
-      flock($writer, LOCK_UN) or die "WARNING: can't release write lock: $!";
-
-      warn "child exiting\n" if $Debug;
-      exit; #end-of-kid
-    }
-
-  }
-
-}
-
-###
-# utility subroutines
-###
-
-sub reap_kids {
-  #warn "reaping kids\n";
-  foreach my $pid ( keys %kids ) {
-    my $kid = waitpid($pid, WNOHANG);
-    if ( $kid > 0 ) {
-      $kids--;
-      delete $kids{$kid};
-    }
-  }
-  #warn "done reaping\n";
-}
-
-sub init {
-  my $user = shift;
-
-  chdir "/" or die "Can't chdir to /: $!";
-  open STDIN, '/dev/null' or die "Can't read /dev/null: $!";
-  defined(my $pid = fork) or die "Can't fork: $!";
-  if ( $pid ) {
-    print "freeside-selfservice-server to $machine started with pid $pid\n"; #logging to $log_file
-    exit unless $pid_file;
-    my $pidfh = new IO::File ">$pid_file" or exit;
-    print $pidfh "$pid\n";
-    exit;
-  }
-
-#  sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; $kids--; }
-#  #sub REAPER { my $pid = wait; $kids--; $SIG{CHLD} = \&REAPER; }
-#  $SIG{CHLD} =  \&REAPER;
-
-  $shutdown = 0;
-  $SIG{HUP} = sub { warn "SIGHUP received; shutting down\n"; $shutdown++; };
-  $SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $shutdown++; };
-  $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $shutdown++; };
-  $SIG{QUIT} = sub { warn "SIGQUIT received; shutting down\n"; $shutdown++; };
-  $SIG{PIPE} = sub { warn "SIGPIPE received; shutting down\n"; $shutdown++; };
-
-  #false laziness w/freeside-queued
-  my $freeside_gid = scalar(getgrnam('freeside'))
-    or die "can't setgid to freeside group\n";
-  $) = $freeside_gid;
-  $( = $freeside_gid;
-  #if freebsd can't setuid(), presumably it can't setgid() either.  grr fleabsd
-  ($(,$)) = ($),$();
-  $) = $freeside_gid;
-
-  $> = $FS::UID::freeside_uid;
-  $< = $FS::UID::freeside_uid;
-  #freebsd is sofa king broken, won't setuid()
-  ($<,$>) = ($>,$<);
-  $> = $FS::UID::freeside_uid;
-  #eslaf
-
-  $ENV{HOME} = (getpwuid($>))[7]; #for ssh
-  adminsuidsetup $user;
-
-  #$log_file = "/usr/local/etc/freeside/selfservice.". $FS::UID::datasrc; #MACHINE NAME
-  $log_file = "/usr/local/etc/freeside/selfservice.$machine.log";
-
-  open STDOUT, '>/dev/null'
-                            or die "Can't write to /dev/null: $!";
-  setsid                  or die "Can't start a new session: $!";
-  open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
-
-  $SIG{__DIE__} = \&_die;
-  $SIG{__WARN__} = \&_logmsg;
-
-  warn "freeside-selfservice-server starting\n";
-
-}
-
-sub shutdown {
-  my $wait = 12; #wait up to 1 minute
-  while ( $kids > 0 && $wait-- ) {
-    warn "waiting for $kids children to terminate";
-    sleep 5;
-  }
-  warn "abandoning $kids children" if $kids;
-  kill 'TERM', $ssh_pid if $ssh_pid;
-  die "exiting";
-}
-
-sub _die {
-  my $msg = shift;
-  unlink $pid_file if -e $pid_file;
-  _logmsg($msg);
-}
-
-sub _logmsg {
-  chomp( my $msg = shift );
-  _do_logmsg( "[server] [". scalar(localtime). "] [$$] $msg\n" );
-}
-
-sub _do_logmsg {
-  chomp( my $msg = shift );
-  my $log = new IO::File ">>$log_file";
-  flock($log, LOCK_EX);
-  seek($log, 0, 2);
-  print $log "$msg\n";
-  flock($log, LOCK_UN);
-  close $log;
-}
-
-sub usage {
-  die "Usage:\n\n  fs_signup_server user machine\n";
-}
-
diff --git a/init.d/freeside-init b/init.d/freeside-init
index 37ced73d4..68cba8da3 100644
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -34,7 +34,7 @@ case "$1" in
         echo "done."
 
         echo -n "Starting freeside-selfservice-server: "
-        $FREESIDE_PATH/fs_selfservice/freeside-selfservice-server $SELFSERVICE_USER $SELFSERVICE_MACHINE
+        freeside-selfservice-server $SELFSERVICE_USER $SELFSERVICE_MACHINE
         echo "done."
 
         ;;
-- 
cgit v1.2.1


From 07efe8b9d3726845228538df46fcfa2610f89eb8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 14 Jan 2003 10:15:26 +0000
Subject: selfservice

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index da56c7342..3362ca832 100644
--- a/Makefile
+++ b/Makefile
@@ -137,6 +137,8 @@ install-init:
 	  s/%%%SIGNUP_MACHINE%%%/${SIGNUP_MACHINE}/g;\
 	  s/%%%SIGNUP_AGENTNUM%%%/${SIGNUP_AGENTNUM}/g;\
 	  s/%%%SIGNUP_REFNUM%%%/${SIGNUP_REFNUM}/g;\
+	  s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
+	  s/%%%SELFSERVICE_MACHINE%%%/${SELFSERVICE_MACHINE}/g;\
 	" ${INIT_FILE}
 
 install: install-perl-modules install-docs install-init
-- 
cgit v1.2.1


From 2485346165b7ebb0e6d2052baa1b03546d44bece Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 16 Jan 2003 02:58:22 +0000
Subject: don't run empty shellcommands

---
 FS/FS/part_export/shellcommands.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index dbd4017f8..f592a838a 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -33,6 +33,7 @@ sub _export_unsuspend {
 sub _export_command {
   my ( $self, $action, $svc_acct) = (shift, shift, shift);
   my $command = $self->option($action);
+  return '' if $command =~ /^\s*$/;
   my $stdin = $self->option($action."_stdin");
 
   no strict 'vars';
-- 
cgit v1.2.1


From e5e992881cee6c8bb5c64c101d1985d47fd62cd6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Jan 2003 06:21:38 +0000
Subject: selfservice cancel functionality

---
 FS/FS/ClientAPI/MyAccount.pm                 | 20 ++++++++++++++++++++
 fs_selfservice/FS-SelfService/SelfService.pm |  1 +
 2 files changed, 21 insertions(+)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 674785524..9983b5d26 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -18,6 +18,7 @@ FS::ClientAPI->register_handlers(
   'MyAccount/login'         => \&login,
   'MyAccount/customer_info' => \&customer_info,
   'MyAccount/invoice'       => \&invoice,
+  'MyAccount/cancel'        => \&cancel,
 );
 
 #store in db?
@@ -133,4 +134,23 @@ sub invoice {
 
 }
 
+sub cancel {
+  my $p = shift;
+  my $session = $cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  my $custnum = $session->{'custnum'};
+
+  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+    or return { 'error' => "unknown custnum $custnum" };
+
+  my @errors = $cust_main->cancel;
+
+  my $error = scalar(@errors) ? join(' / ', @errors) : '';
+
+  return { 'error' => $error };
+
+}
+
+1;
 
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 9019ea4f8..4d68d614a 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -22,6 +22,7 @@ $socket =  "/usr/local/freeside/selfservice_socket";
   'login'         => 'MyAccount/login',
   'customer_info' => 'MyAccount/customer_info',
   'invoice'       => 'MyAccount/invoice',
+  'cancel'        => 'MyAccount/cancel',
 );
 @EXPORT_OK = keys %autoload;
 
-- 
cgit v1.2.1


From 561c9be9d086604225956da6cfdf9a9050176174 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 28 Jan 2003 06:08:39 +0000
Subject: crypt password export to ldap fix from dave denney <daud@kaosol.net>

---
 FS/FS/part_export/ldap.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export/ldap.pm b/FS/FS/part_export/ldap.pm
index fd7f11d90..57fd1f3f4 100644
--- a/FS/FS/part_export/ldap.pm
+++ b/FS/FS/part_export/ldap.pm
@@ -25,7 +25,7 @@ sub _export_insert {
     }
   }
   $crypt_password = ''; #surpress "used only once" warnings
-  $crypt_password = crypt( $svc_acct->_password,
+  $crypt_password = '{crypt}'. crypt( $svc_acct->_password,
                              $saltset[int(rand(64))].$saltset[int(rand(64))] );
 
   my $username_attrib;
-- 
cgit v1.2.1


From 39b71146259e7c2eab3b0c3326000087a7dd75b1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 28 Jan 2003 07:47:52 +0000
Subject: eek, and this is what caused connectup to fail too

---
 FS/bin/freeside-setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 8b7466222..0ef3fc81b 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -669,7 +669,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'pkgpart',
       'unique' => [],
-      'index' => [ [ disabled ], ],
+      'index' => [ [ 'disabled' ], ],
     },
 
 #    'part_title' => {
-- 
cgit v1.2.1


From 66729728e57c13e44eaac51dc8deaf37e47b7530 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Feb 2003 22:04:31 +0000
Subject: 1.5-specific fixes

---
 htetc/global.asa             | 1 -
 httemplate/docs/install.html | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/htetc/global.asa b/htetc/global.asa
index a2d8dee12..7d84600ed 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -48,7 +48,6 @@ use FS::raddb;
 use FS::session;
 use FS::svc_acct;
 use FS::svc_acct_pop qw(popselector);
-use FS::svc_acct_sm;
 use FS::svc_domain;
 use FS::svc_forward;
 use FS::svc_www;
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 36b8ae0e7..51dce4da5 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -54,6 +54,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=Storable">Storable</a>
 <!-- MyAccounts, maybe only for dev     <li><a href="http://search.cpan.org/search?dist=Cache-Cache">Cache::Cache</a> -->
       <li><a href="http://search.cpan.org/search?dist=NetAddr-IP">NetAddr-IP</a>
+      <li><a href="http://search.cpan.org/search?dist=Chart">Chart</a>
       <li><a href="http://search.cpan.org/search?dist=ApacheDBI">Apache::DBI</a> <i>(optional but recommended for better webinterface performance)</i>
     </ul>
 </ul>
-- 
cgit v1.2.1


From c89aa83639038cc1946fec07a2dda252f64e5144 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 5 Feb 2003 22:06:14 +0000
Subject: ip_netmask is gone now

---
 FS/FS/cust_svc.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 66daec17b..5117eff45 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -292,7 +292,7 @@ sub label {
     my $domain = qsearchs( 'domain_record', { 'recnum' => $svc_x->recnum } );
     $tag = $domain->reczone;
   } elsif ( $svcdb eq 'svc_broadband' ) {
-    $tag = $svc_x->ip_addr . '/' . $svc_x->ip_netmask;
+    $tag = $svc_x->ip_addr;
   } else {
     cluck "warning: asked for label of unsupported svcdb; using svcnum";
     $tag = $svc_x->getfield('svcnum');
-- 
cgit v1.2.1


From 0354f39ed0e74fd2eae1d9da13906625b4f56591 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 5 Feb 2003 23:17:17 +0000
Subject: svc_broadband rewrite

---
 FS/FS/addr_block.pm                               | 322 ++++++++++++++++++++++
 FS/FS/part_router_field.pm                        | 134 +++++++++
 FS/FS/part_sb_field.pm                            | 267 ++++++++++++++++++
 FS/FS/part_svc_router.pm                          |  32 +++
 FS/FS/router.pm                                   | 156 +++++++++++
 FS/FS/router_field.pm                             | 146 ++++++++++
 FS/FS/sb_field.pm                                 | 148 ++++++++++
 FS/FS/svc_broadband.pm                            | 225 ++++++++-------
 FS/bin/freeside-setup                             |  89 +++---
 htetc/global.asa                                  |  12 +-
 htetc/handler.pl                                  |   8 +
 httemplate/browse/addr_block.cgi                  |  76 +++++
 httemplate/browse/generic.cgi                     |  46 ++++
 httemplate/browse/part_sb_field.cgi               |  31 +++
 httemplate/browse/router.cgi                      |  37 +++
 httemplate/edit/part_router_field.cgi             |  70 +++++
 httemplate/edit/part_sb_field.cgi                 |  79 ++++++
 httemplate/edit/process/addr_block/add.cgi        |  20 ++
 httemplate/edit/process/addr_block/allocate.cgi   |  25 ++
 httemplate/edit/process/addr_block/deallocate.cgi |  24 ++
 httemplate/edit/process/addr_block/split.cgi      |  19 ++
 httemplate/edit/process/generic.cgi               |  69 +++++
 httemplate/edit/process/router.cgi                | 100 +++++++
 httemplate/edit/process/svc_broadband.cgi         |  54 +++-
 httemplate/edit/router.cgi                        |  88 ++++++
 httemplate/edit/svc_broadband.cgi                 | 251 ++++++++---------
 httemplate/index.html                             |  14 +-
 httemplate/view/svc_broadband.cgi                 |  62 +++--
 28 files changed, 2269 insertions(+), 335 deletions(-)
 create mode 100755 FS/FS/addr_block.pm
 create mode 100755 FS/FS/part_router_field.pm
 create mode 100755 FS/FS/part_sb_field.pm
 create mode 100755 FS/FS/part_svc_router.pm
 create mode 100755 FS/FS/router.pm
 create mode 100755 FS/FS/router_field.pm
 create mode 100755 FS/FS/sb_field.pm
 create mode 100644 httemplate/browse/addr_block.cgi
 create mode 100644 httemplate/browse/generic.cgi
 create mode 100644 httemplate/browse/part_sb_field.cgi
 create mode 100644 httemplate/browse/router.cgi
 create mode 100644 httemplate/edit/part_router_field.cgi
 create mode 100644 httemplate/edit/part_sb_field.cgi
 create mode 100755 httemplate/edit/process/addr_block/add.cgi
 create mode 100755 httemplate/edit/process/addr_block/allocate.cgi
 create mode 100755 httemplate/edit/process/addr_block/deallocate.cgi
 create mode 100755 httemplate/edit/process/addr_block/split.cgi
 create mode 100644 httemplate/edit/process/generic.cgi
 create mode 100644 httemplate/edit/process/router.cgi
 create mode 100755 httemplate/edit/router.cgi

diff --git a/FS/FS/addr_block.pm b/FS/FS/addr_block.pm
new file mode 100755
index 000000000..b671723aa
--- /dev/null
+++ b/FS/FS/addr_block.pm
@@ -0,0 +1,322 @@
+package FS::addr_block;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs qsearch dbh );
+use FS::router;
+use FS::svc_broadband;
+use NetAddr::IP;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::addr_block - Object methods for addr_block records
+
+=head1 SYNOPSIS
+
+  use FS::addr_block;
+
+  $record = new FS::addr_block \%hash;
+  $record = new FS::addr_block { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::addr_block record describes an address block assigned for broadband 
+access.  FS::addr_block inherits from FS::Record.  The following fields are 
+currently supported:
+
+=over 4
+
+=item blocknum - primary key, used in FS::svc_broadband to associate 
+services to the block.
+
+=item routernum - the router (see FS::router) to which this 
+block is assigned.
+
+=item ip_gateway - the gateway address used by customers within this block.  
+
+=item ip_netmask - the netmask of the block, expressed as an integer.
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Create a new record.  To add the record to the database, see "insert".
+
+=cut
+
+sub table { 'addr_block'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+sub delete {
+  my $self = shift;
+  return 'Block must be deallocated before deletion'
+    if $self->router;
+
+  $self->SUPER::delete;
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error =
+    $self->ut_number('routernum')
+    || $self->ut_ip('ip_gateway')
+    || $self->ut_number('ip_netmask')
+  ;
+  return $error if $error;
+
+
+  # A routernum of 0 indicates an unassigned block and is allowed
+  return "Unknown routernum"
+    if ($self->routernum and not $self->router);
+
+  my $self_addr = $self->NetAddr;
+  return "Cannot parse address: ". $self->ip_gateway . '/' . $self->ip_netmask
+    unless $self_addr;
+
+  if (not $self->blocknum) {
+    my @block = grep {
+      my $block_addr = $_->NetAddr;
+      if($block_addr->contains($self_addr) 
+      or $self_addr->contains($block_addr)) { $_; };
+    } qsearch( 'addr_block', {});
+    foreach(@block) {
+      return "Block intersects existing block ".$_->ip_gateway."/".$_->ip_netmask;
+    }
+  }
+
+  '';
+}
+
+
+=item router
+
+Returns the FS::router object corresponding to this object.  If the 
+block is unassigned, returns undef.
+
+=cut
+
+sub router {
+  my $self = shift;
+  return qsearchs('router', { routernum => $self->routernum });
+}
+
+=item svc_broadband
+
+Returns a list of FS::svc_broadband objects associated
+with this object.
+
+=cut
+
+sub svc_broadband {
+  my $self = shift;
+  return qsearch('svc_broadband', { blocknum => $self->blocknum });
+}
+
+=item NetAddr
+
+Returns a NetAddr::IP object for this block's address and netmask.
+
+=cut
+
+sub NetAddr {
+  my $self = shift;
+
+  return new NetAddr::IP ($self->ip_gateway, $self->ip_netmask);
+}
+
+=item next_free_addr
+
+Returns a NetAddr::IP object corresponding to the first unassigned address 
+in the block (other than the network, broadcast, or gateway address).  If 
+there are no free addresses, returns false.
+
+=cut
+
+sub next_free_addr {
+  my $self = shift;
+
+  my @used = map { $_->NetAddr->addr } 
+      ($self, 
+       qsearch('svc_broadband', { blocknum => $self->blocknum }) );
+
+  my @free = $self->NetAddr->hostenum;
+  while (my $ip = shift @free) {
+    if (not grep {$_ eq $ip->addr;} @used) { return $ip; };
+  }
+
+  '';
+
+}
+
+=item allocate
+
+Allocates this address block to a router.  Takes an FS::router object 
+as an argument.
+
+At present it's not possible to reallocate a block to a different router 
+except by deallocating it first, which requires that none of its addresses 
+be assigned.  This is probably as it should be.
+
+=cut
+
+sub allocate {
+  my ($self, $router) = @_;
+
+  return 'Block is already allocated'
+    if($self->router);
+
+  return 'Block must be allocated to a router'
+    unless(ref $router eq 'FS::router');
+
+  my @svc = $self->svc_broadband;
+  if (@svc) {
+    return 'Block has assigned addresses: '. join ', ', map {$_->ip_addr} @svc;
+  }
+
+  my $new = new FS::addr_block {$self->hash};
+  $new->routernum($router->routernum);
+  return $new->replace($self);
+
+}
+
+=item deallocate
+
+Deallocates the block (i.e. sets the routernum to 0).  If any addresses in the 
+block are assigned to services, it fails.
+
+=cut
+
+sub deallocate {
+  my $self = shift;
+
+  my @svc = $self->svc_broadband;
+  if (@svc) {
+    return 'Block has assigned addresses: '. join ', ', map {$_->ip_addr} @svc;
+  }
+
+  my $new = new FS::addr_block {$self->hash};
+  $new->routernum(0);
+  return $new->replace($self);
+}
+
+=item split_block
+
+Splits this address block into two equal blocks, occupying the same space as
+the original block.  The first of the two will also have the same blocknum.
+The gateway address of each block will be set to the first usable address, i.e.
+(network address)+1.  Since this method is designed for use on unallocated
+blocks, this is probably the correct behavior.
+
+(At present, splitting allocated blocks is disallowed.  Anyone who wants to
+implement this is reminded that each split costs three addresses, and any
+customers who were using these addresses will have to be moved; depending on
+how full the block was before being split, they might have to be moved to a
+different block.  Anyone who I<still> wants to implement it is asked to tie it
+to a configuration switch so that site admins can disallow it.)
+
+=cut
+
+sub split_block {
+
+  # We should consider using Attribute::Handlers/Aspect/Hook::LexWrap/
+  # something to atomicize functions, so that we can say 
+  #
+  # sub split_block : atomic {
+  # 
+  # instead of repeating all this AutoCommit verbage in every 
+  # sub that does more than one database operation.
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $self = shift;
+  my $error;
+
+  if ($self->router) {
+    return 'Block is already allocated';
+  }
+
+  #TODO: Smallest allowed block should be a config option.
+  if ($self->NetAddr->masklen() ge 30) {
+    return 'Cannot split blocks with a mask length >= 30';
+  }
+
+  my (@new, @ip);
+  $ip[0] = $self->NetAddr;
+  @ip = map {$_->first()} $ip[0]->split($self->ip_netmask + 1);
+
+  foreach (0,1) {
+    $new[$_] = new FS::addr_block {$self->hash};
+    $new[$_]->ip_gateway($ip[$_]->addr);
+    $new[$_]->ip_netmask($ip[$_]->masklen);
+  }
+
+  $new[1]->blocknum('');
+
+  $error = $new[0]->replace($self);
+  if ($error) {
+    $dbh->rollback;
+    return $error;
+  }
+
+  $error = $new[1]->insert;
+  if ($error) {
+    $dbh->rollback;
+    return $error;
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  return '';
+}
+
+=item merge
+
+To be implemented.
+
+=back
+
+=head1 BUGS
+
+Minimum block size should be a config option.  It's hardcoded at /30 right
+now because that's the smallest block that makes any sense at all.
+
+1;
+
diff --git a/FS/FS/part_router_field.pm b/FS/FS/part_router_field.pm
new file mode 100755
index 000000000..73ca50fb6
--- /dev/null
+++ b/FS/FS/part_router_field.pm
@@ -0,0 +1,134 @@
+package FS::part_router_field;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs );
+use FS::router_field;
+use FS::router;
+
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::part_router_field - Object methods for part_router_field records
+
+=head1 SYNOPSIS
+
+  use FS::part_router_field;
+
+  $record = new FS::part_router_field \%hash;
+  $record = new FS::part_router_field { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+A part_router_field represents an xfield definition for routers.  For more
+information on xfields, see L<FS::part_sb_field>.
+
+The following fields are supported:
+
+=over 4
+
+=item routerfieldpart - primary key (assigned automatically)
+
+=item name - name of field
+
+=item length
+
+=item check_block
+
+=item list_source
+
+(See L<FS::part_sb_field> for details on these fields.)
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Create a new record.  To add the record to the database, see "insert".
+
+=cut
+
+sub table { 'part_router_field'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+  my $error = '';
+
+  $self->name =~ /^([a-z0-9_\-\.]{1,15})$/i
+    or return "Invalid field name for part_router_field";
+
+  ''; #no error
+}
+
+=item list_values
+
+Equivalent to "eval($part_router_field->list_source)".
+
+=cut
+
+sub list_values {
+  my $self = shift;
+  return () unless $self->list_source;
+  my @opts = eval($self->list_source);
+  if($@) { 
+    warn $@;
+    return ();
+  } else { 
+    return @opts;
+  }
+}
+
+=back
+
+=head1 VERSION
+
+$Id: 
+
+=head1 BUGS
+
+Needless duplication of much of FS::part_sb_field, with the result that most of
+the warnings about it apply here also.
+
+=head1 SEE ALSO
+
+FS::svc_broadband, FS::router, FS::router_field,  schema.html
+from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/part_sb_field.pm b/FS/FS/part_sb_field.pm
new file mode 100755
index 000000000..8dca946b5
--- /dev/null
+++ b/FS/FS/part_sb_field.pm
@@ -0,0 +1,267 @@
+package FS::part_sb_field;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs );
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::part_sb_field - Object methods for part_sb_field records
+
+=head1 SYNOPSIS
+
+  use FS::part_sb_field;
+
+  $record = new FS::part_sb_field \%hash;
+  $record = new FS::part_sb_field { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::part_sb_field object represents an extended field (xfield) definition 
+for svc_broadband's sb_field mechanism (see L<FS::svc_broadband>).  
+FS::part_sb_field inherits from FS::Record.  The following fields are 
+currently supported:
+
+=over 2
+
+=item sbfieldpart - primary key (assigned automatically)
+
+=item name - name of the field
+
+=item svcpart - service type for which this field is available (see L<FS::part_svc>)
+
+=item length - length of the contents of the field (see note #1)
+
+=item check_block - validation routine (see note #2)
+
+=item list_source - enumeration routine (see note #3)
+
+=back
+
+=head1 BACKGROUND
+
+Broadband services, unlike dialup services, are provided over a wide 
+variety of physical media (DSL, wireless, cable modems, digital circuits) 
+and network architectures (Ethernet, PPP, ATM).  For many of these access 
+mechanisms, adding a new customer requires knowledge of some properties 
+of the physical connection (circuit number, the type of CPE in use, etc.).
+It is unreasonable to expect ISPs to alter Freeside's schema (and the 
+associated library and UI code) to make each of these parameters a field in 
+svc_broadband.
+
+Hence sb_field and part_sb_field.  They allow the Freeside administrator to
+define 'extended fields' ('xfields') associated with svc_broadband records.
+These are I<not> processed in any way by Freeside itself; they exist solely for
+use by exports (see L<FS::part_export>) and technical support staff.
+
+For a parallel mechanism (at the per-router level rather than per-service), 
+see L<FS::part_router_field>.
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Create a new record.  To add the record to the database, see "insert".
+
+=cut
+
+sub table { 'part_sb_field'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+  my $error = '';
+
+  $error = $self->ut_numbern('svcpart');
+  return $error if $error;
+
+  unless (qsearchs('part_svc', { svcpart => $self->svcpart }))
+    { return "Unknown svcpart: " . $self->svcpart;}
+
+  $self->name =~ /^([a-z0-9_\-\.]{1,15})$/i
+    or return "Invalid field name for part_sb_field";
+
+  #How to check input_block, display_block, and check_block?
+
+  ''; #no error
+}
+
+=item list_values
+
+If the I<list_source> field is set, this method eval()s it and 
+returns its output.  If the field is empty, list_values returns 
+an empty list.
+
+Any arguments passed to this method will be received by the list_source 
+code, but this behavior is a fortuitous accident and may be removed in 
+the future.
+
+=cut
+
+sub list_values {
+  my $self = shift;
+  return () unless $self->list_source;
+
+  my @opts = eval($self->list_source);
+  if($@) {
+    warn $@;
+    return ();
+  } else {
+    return @opts;
+  }
+}
+
+=item part_svc
+
+Returns the FS::part_svc object associated with this field definition.
+
+=cut
+
+sub part_svc {
+  my $self = shift;
+  return qsearchs('part_svc', { svcpart => $self->svcpart });
+}
+
+=back
+
+=head1 VERSION
+
+$Id: 
+
+=head1 NOTES
+
+=over
+
+=item 1.
+
+The I<length> field is not enforced.  It provides a hint to UI
+code about how to display the field on a form.  If you want to enforce a
+minimum or maximum length for a field, use a I<check_block>.
+
+=item 2.
+
+The check_block mechanism used here as well as in
+FS::part_router_field allows the user to define validation rules.
+
+When FS::sb_field::check is called, the proposed value of the xfield is
+assigned to $_.  The check_block is then eval()'d and its return value
+captured.  If the return value is false (empty/zero/undef), $_ is then assigned
+back into the field and stored in the database.
+
+Therefore a check_block can do three different things with the value: allow
+it, allow it with a modification, or reject it.  This is very flexible, but
+somewhat dangerous.  Some warnings:
+
+=over 2
+
+=item *
+
+Assume that $_ has had I<no> error checking prior to the
+check_block.  That's what the check_block is for, after all.  It could
+contain I<anything>: evil shell commands in backquotes, 100kb JPEG images,
+the Klez virus, whatever.
+
+=item *
+
+If your check_block modifies the input value, it should probably
+produce a value that wouldn't be modified by going through the same
+check_block again.  (That is, it should map input values into its own
+eigenspace.)  The reason is that if someone calls $new->replace($old),
+where $new and $old contain the same value for the field, they probably
+want the field to keep its old value, not to get transformed by the
+check_block again.  So don't do silly things like '$_++' or
+'tr/A-Za-z/a-zA-Z/'.
+
+=item *
+
+Don't alter the contents of the database.  I<Reading> the database
+is perfectly reasonable, but writing to it is a bad idea.  Remember that
+check() might get called more than once, as described above.
+
+=item *
+
+The check_block probably won't even get called if the user submits
+an I<empty> sb_field.  So at present, you can't set up a default value with
+something like 's/^$/foo/'.  Conversely, don't replace the submitted value
+with an empty string.  It probably will get stored, but might be deleted at
+any time.
+
+=back
+
+=item 3.
+
+The list_source mechanism is a UI hint (like length) to generate
+drop-down or list boxes.  If list_source contains a value, the UI code can
+eval() it and use the results as the options on the list.
+
+Note 'can'.  This is not a substitute for check_block.  The HTML interface
+currently requires that the user pick one of the options on the list
+because that's the way HTML drop-down boxes work, but in the future the UI
+code might add an 'Other (please specify)' option and a text box so that
+the user can enter something else.  Or it might ignore list_source and just
+generate a text box.  Or the interface might be rewritten in MS Access,
+where drop-down boxes have text boxes built in.  Data validation is the job
+of check(), not the front end.
+
+Note also that a list of literals evaluates to itself, so a list_source
+like
+
+C<('Windows', 'MacOS', 'Linux')>
+
+or
+
+C<qw(Windows MacOS Linux)>
+
+means exactly what you'd think.
+
+=head1 BUGS
+
+The lack of any way to do default values.  We might add this as another UI
+hint (since, for the most part, it's the UI's job to figure out which fields
+have had values entered into them).  In fact, there are lots of things we
+should add as UI hints.
+
+Oh, and the documentation is probably full of lies.
+
+=head1 SEE ALSO
+
+FS::svc_broadband, FS::sb_field, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/part_svc_router.pm b/FS/FS/part_svc_router.pm
new file mode 100755
index 000000000..0b23ab580
--- /dev/null
+++ b/FS/FS/part_svc_router.pm
@@ -0,0 +1,32 @@
+package FS::part_svc_router;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw(qsearchs);
+use FS::router;
+use FS::part_svc;
+
+@ISA = qw(FS::Record);
+
+sub table { 'part_svc_router'; }
+
+sub check {
+  my $self = shift;
+  my $error =
+    $self->ut_foreign_key('svcpart', 'part_svc', 'svcpart')
+    || $self->ut_foreign_key('routernum', 'router', 'routernum');
+  return $error if $error;
+  ''; #no error
+}
+
+sub router {
+  my $self = shift;
+  return qsearchs('router', { routernum => $self->routernum });
+}
+
+sub part_svc {
+  my $self = shift;
+  return qsearchs('part_svc', { svcpart => $self->svcpart });
+}
+
+1;
diff --git a/FS/FS/router.pm b/FS/FS/router.pm
new file mode 100755
index 000000000..3f9459a01
--- /dev/null
+++ b/FS/FS/router.pm
@@ -0,0 +1,156 @@
+package FS::router;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs qsearch );
+use FS::addr_block;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::router - Object methods for router records
+
+=head1 SYNOPSIS
+
+  use FS::router;
+
+  $record = new FS::router \%hash;
+  $record = new FS::router { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::router record describes a broadband router, such as a DSLAM or a wireless
+ access point.  FS::router inherits from FS::Record.  The following 
+fields are currently supported:
+
+=over 4
+
+=item routernum - primary key
+
+=item routername - descriptive name for the router
+
+=item svcnum - svcnum of the owning FS::svc_broadband, if appropriate
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Create a new record.  To add the record to the database, see "insert".
+
+=cut
+
+sub table { 'router'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error =
+    $self->ut_numbern('routernum')
+    || $self->ut_text('routername');
+  return $error if $error;
+
+  '';
+}
+
+=item addr_block
+
+Returns a list of FS::addr_block objects (address blocks) associated
+with this object.
+
+=cut
+
+sub addr_block {
+  my $self = shift;
+  return qsearch('addr_block', { routernum => $self->routernum });
+}
+
+=item router_field
+
+Returns a list of FS::router_field objects assigned to this object.
+
+=cut
+
+sub router_field {
+  my $self = shift;
+
+  return qsearch('router_field', { routernum => $self->routernum });
+}
+
+=item part_svc_router
+
+Returns a list of FS::part_svc_router objects associated with this 
+object.  This is unlikely to be useful for any purpose other than retrieving 
+the associated FS::part_svc objects.  See below.
+
+=cut
+
+sub part_svc_router {
+  my $self = shift;
+  return qsearch('part_svc_router', { routernum => $self->routernum });
+}
+
+=item part_svc
+
+Returns a list of FS::part_svc objects associated with this object.
+
+=cut
+
+sub part_svc {
+  my $self = shift;
+  return map { qsearchs('part_svc', { svcpart => $_->svcpart }) }
+      $self->part_svc_router;
+}
+
+=back
+
+=head1 VERSION
+
+$Id:
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+FS::svc_broadband, FS::router, FS::addr_block, FS::router_field, FS::part_svc,
+schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/router_field.pm b/FS/FS/router_field.pm
new file mode 100755
index 000000000..eee21ab89
--- /dev/null
+++ b/FS/FS/router_field.pm
@@ -0,0 +1,146 @@
+package FS::router_field;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs );
+use FS::part_router_field;
+use FS::router;
+
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::router_field - Object methods for router_field records
+
+=head1 SYNOPSIS
+
+  use FS::router_field;
+
+  $record = new FS::router_field \%hash;
+  $record = new FS::router_field { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+FS::router_field contains values of router xfields.  See FS::part_sb_field 
+for details on the xfield mechanism.
+
+=over 4
+
+=item routerfieldpart - Type of router_field as defined by 
+FS::part_router_field
+
+=item routernum - The FS::router to which this value belongs.
+
+=item value - The contents of the field.
+
+=back
+
+=head1 METHODS
+
+
+=over 4
+
+=item new HASHREF
+
+Create a new record.  To add the record to the database, see "insert".
+
+=cut
+
+sub table { 'router_field'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is an error,
+returns the error, otherwise returns false.  Called by the insert and replace
+methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  return "routernum must be defined" unless $self->routernum;
+  return "routerfieldpart must be defined" unless $self->routerfieldpart;
+
+  my $part_router_field = $self->part_router_field;
+  $_ = $self->value;
+
+  my $check_block = $part_router_field->check_block;
+  if ($check_block) {
+    $@ = '';
+    my $error = (eval($check_block) or $@);
+    return $error if $error;
+    $self->setfield('value' => $_);
+  }
+
+  ''; #no error
+}
+
+=item part_router_field
+
+Returns a reference to the FS:part_router_field that defines this 
+FS::router_field
+
+=cut
+
+sub part_router_field {
+  my $self = shift;
+
+  return qsearchs('part_router_field', 
+    { routerfieldpart => $self->routerfieldpart });
+}
+
+=item router
+
+Returns a reference to the FS::router to which this FS::router_field 
+belongs.
+
+=cut
+
+sub router {
+  my $self = shift;
+
+  return qsearchs('router', { routernum => $self->routernum });
+}
+
+=back
+
+=head1 VERSION
+
+$Id: 
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+FS::svc_broadband, FS::router, FS::router_block, FS::router_field,  
+schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/sb_field.pm b/FS/FS/sb_field.pm
new file mode 100755
index 000000000..d4eb37844
--- /dev/null
+++ b/FS/FS/sb_field.pm
@@ -0,0 +1,148 @@
+package FS::sb_field;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs );
+use FS::part_sb_field;
+
+use UNIVERSAL qw( can );
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::sb_field - Object methods for sb_field records
+
+=head1 SYNOPSIS
+
+  use FS::sb_field;
+
+  $record = new FS::sb_field \%hash;
+  $record = new FS::sb_field { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+See L<FS::part_sb_field> for details on this table's mission in life.
+FS::sb_field contains the actual values of the xfields defined in
+part_sb_field.
+
+The following fields are supported:
+
+=over 4
+
+=item sbfieldpart - Type of sb_field as defined by FS::part_sb_field
+
+=item svcnum - The svc_broadband to which this value belongs.
+
+=item value - The contents of the field.
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Create a new record.  To add the record to the database, see L<"insert">.
+
+=cut
+
+sub table { 'sb_field'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks the value against the check_block of the corresponding part_sb_field.
+Returns whatever the check_block returned (unless the check_block dies, in 
+which case check returns the die message).  Therefore, if the check_block 
+wants to allow the value to be stored, it must return false.  See 
+L<FS::part_sb_field> for details.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  return "svcnum must be defined" unless $self->svcnum;
+  return "sbfieldpart must be defined" unless $self->sbfieldpart;
+
+  my $part_sb_field = $self->part_sb_field;
+
+  $_ = $self->value;
+
+  my $check_block = $self->part_sb_field->check_block;
+  if ($check_block) {
+    $@ = '';
+    my $error = (eval($check_block) or $@); # treat fatal errors as errors
+    return $error if $error;
+    $self->setfield('value' => $_);
+  }
+
+  ''; #no error
+}
+
+=item part_sb_field
+
+Returns a reference to the FS::part_sb_field that defines this FS::sb_field.
+
+=cut
+
+sub part_sb_field {
+  my $self = shift;
+
+  return qsearchs('part_sb_field', { sbfieldpart => $self->sbfieldpart });
+}
+
+=back
+
+=item svc_broadband
+
+Returns a reference to the FS::svc_broadband to which this value is attached.
+Nobody's ever going to use this function, but here it is anyway.
+
+=cut
+
+sub svc_broadband {
+  my $self = shift;
+
+  return qsearchs('svc_broadband', { svcnum => $self->svcnum });
+}
+
+=head1 VERSION
+
+$Id: 
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::svc_broadband>, schema.html
+from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index ab92fb3d7..45f6c3601 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -2,10 +2,10 @@ package FS::svc_broadband;
 
 use strict;
 use vars qw(@ISA $conf);
-#use FS::Record qw( qsearch qsearchs );
 use FS::Record qw( qsearchs qsearch dbh );
 use FS::svc_Common;
 use FS::cust_svc;
+use FS::addr_block;
 use NetAddr::IP;
 
 @ISA = qw( FS::svc_Common );
@@ -45,25 +45,6 @@ An FS::svc_broadband object represents a 'broadband' Internet connection, such
 as a DSL, cable modem, or fixed wireless link.  These services are assumed to
 have the following properties:
 
-=over 2
-
-=item
-The network consists of one or more 'Access Concentrators' (ACs), such as
-DSLAMs or wireless access points.  (See L<FS::ac>.)
-
-=item
-Each AC provides connectivity to one or more contiguous blocks of IP addresses,
-each described by a gateway address and a netmask.  (See L<FS::ac_block>.)
-
-=item
-Each connection has one or more static IP addresses within one of these blocks.
-
-=item
-The details of configuring routers and other devices are to be handled by a 
-site-specific L<FS::part_export> subclass.
-
-=back
-
 FS::svc_broadband inherits from FS::svc_Common.  The following fields are
 currently supported:
 
@@ -71,14 +52,7 @@ currently supported:
 
 =item svcnum - primary key
 
-=item
-actypenum - access concentrator type; see L<FS::ac_type>.  This is included here
-so that a part_svc can specifically be a 'wireless' or 'DSL' service by
-designating actypenum as a fixed field.  It does create a redundant functional
-dependency between this table and ac_type, in that the matching ac_type could
-be found by looking up the IP address in ac_block and then finding the block's
-AC, but part_svc can't do that, and we don't feel like hacking it so that it
-can.
+=item blocknum - see FS::addr_block
 
 =item
 speed_up - maximum upload speed, in bits per second.  If set to zero, upload
@@ -89,28 +63,12 @@ connection.
 =item
 speed_down - maximum download speed, as above
 
-=item
-ip_addr - the customer's IP address.  If the customer needs more than one IP
-address, set this to the address of the customer's router.  As a result, the
-customer's router will have the same address for both it's internal and external
+=item ip_addr - the customer's IP address.  If the customer needs more than one
+IP address, set this to the address of the customer's router.  As a result, the
+customer's router will have the same address for both its internal and external
 interfaces thus saving address space.  This has been found to work on most NAT
 routers available.
 
-=item
-ip_netmask - the customer's netmask, as a single integer in the range 0-32.
-(E.g. '24', not '255.255.255.0'.  We assume that address blocks are contiguous.)
-This should be 32 unless the customer has multiple IP addresses.
-
-=item
-mac_addr - the MAC address of the customer's router or other device directly
-connected to the network, if needed.  Some systems (e.g. DHCP, MAC address-based
-access control) may need this.  If not, you may leave it blank.
-
-=item
-location - a human-readable description of the location of the connected site,
-such as its address.  This should not be used for billing or contact purposes;
-that information is stored in L<FS::cust_main>.
-
 =back
 
 =head1 METHODS
@@ -120,7 +78,7 @@ that information is stored in L<FS::cust_main>.
 =item new HASHREF
 
 Creates a new svc_broadband.  To add the record to the database, see
-L<"insert">.
+"insert".
 
 Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the I<hash> method.
@@ -134,14 +92,12 @@ sub table { 'svc_broadband'; }
 Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
 
-The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
+The additional fields pkgnum and svcpart (see FS::cust_svc) should be 
 defined.  An FS::cust_svc record will be created and inserted.
 
 =cut
 
-# sub insert {}
 # Standard FS::svc_Common::insert
-# (any necessary Deep Magic is handled by exports)
 
 =item delete
 
@@ -159,19 +115,62 @@ returns the error, otherwise returns false.
 =cut
 
 # Standard FS::svc_Common::replace
-# Notice a pattern here?
+
+=item sb_field
+
+Returns a list of FS::sb_field objects assigned to this object.
+
+=cut
+
+sub sb_field {
+  my $self = shift;
+
+  return qsearch( 'sb_field', { svcnum => $self->svcnum } );
+}
+
+=item sb_field_hashref
+
+Returns a hashref of the FS::sb_field key/value pairs for this object.
+
+Deprecated.  Please don't use it.
+
+=cut
+
+# Kristian wrote this, but don't hold it against him.  He was under a powerful
+# distracting influence whom he evidently found much more interesting than
+# svc_broadband.pm.  I can't say I blame him.
+
+sub sb_field_hashref {
+  my $self = shift;
+  my $svcpart = shift;
+
+  if ((not $svcpart) && ($self->cust_svc)) {
+    $svcpart = $self->cust_svc->svcpart;
+  }
+
+  my $hashref = {};
+
+  map {
+    my $sb_field = qsearchs('sb_field', { sbfieldpart => $_->sbfieldpart,
+                                          svcnum => $self->svcnum });
+    $hashref->{$_->getfield('name')} = $sb_field ? $sb_field->getfield('value') : '';
+  } qsearch('part_sb_field', { svcpart => $svcpart });
+
+  return $hashref;
+
+}
 
 =item suspend
 
-Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+Called by the suspend method of FS::cust_pkg (see FS::cust_pkg).
 
 =item unsuspend
 
-Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+Called by the unsuspend method of FS::cust_pkg (see FS::cust_pkg).
 
 =item cancel
 
-Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
+Called by the cancel method of FS::cust_pkg (see FS::cust_pkg).
 
 =item check
 
@@ -189,105 +188,99 @@ sub check {
 
   my $error =
     $self->ut_numbern('svcnum')
-    || $self->ut_foreign_key('actypenum', 'ac_type', 'actypenum')
+    || $self->ut_foreign_key('blocknum', 'addr_block', 'blocknum')
     || $self->ut_number('speed_up')
     || $self->ut_number('speed_down')
-    || $self->ut_ip('ip_addr')
-    || $self->ut_numbern('ip_netmask')
-    || $self->ut_textn('mac_addr')
-    || $self->ut_textn('location')
+    || $self->ut_ipn('ip_addr')
   ;
   return $error if $error;
 
   if($self->speed_up < 0) { return 'speed_up must be positive'; }
   if($self->speed_down < 0) { return 'speed_down must be positive'; }
 
-  # This should catch errors in the ip_addr and ip_netmask.  If it doesn't,
-  # they'll almost certainly not map into a valid block anyway.
-  my $self_addr = new NetAddr::IP ($self->ip_addr, $self->ip_netmask);
-  return 'Cannot parse address: ' . $self->ip_addr . '/' . $self->ip_netmask unless $self_addr;
-
-  my @block = grep { 
-    my $block_addr = new NetAddr::IP ($_->ip_gateway, $_->ip_netmask);
-    if ($block_addr->contains($self_addr)) { $_ };
-  } qsearch( 'ac_block', { acnum => $self->acnum });
-
-  if(scalar @block == 0) {
-    return 'Block not found for address '.$self->ip_addr.' in actype '.$self->actypenum;
-  } elsif(scalar @block > 1) {
-    return 'ERROR: Intersecting blocks found for address '.$self->ip_addr.' :'.
-        join ', ', map {$_->ip_addr . '/' . $_->ip_netmask} @block;
+  if (not($self->ip_addr) or $self->ip_addr eq '0.0.0.0') {
+    $self->ip_addr($self->addr_block->next_free_addr->addr);
+    if (not $self->ip_addr) {
+      return "No free addresses in addr_block (blocknum: ".$self->blocknum.")";
+    }
   }
-  # OK, we've found a valid block.  We don't actually _do_ anything with it, though; we 
-  # just take comfort in the knowledge that it exists.
 
-  # A simple qsearchs won't work here.  Since we can assign blocks to customers,
-  # we have to make sure the new address doesn't fall within someone else's
-  # block.  Ugh.
+  # This should catch errors in the ip_addr.  If it doesn't,
+  # they'll almost certainly not map into the block anyway.
+  my $self_addr = $self->NetAddr; #netmask is /32
+  return ('Cannot parse address: ' . $self->ip_addr) unless $self_addr;
 
-  my @conflicts = grep {
-    my $cust_addr = new NetAddr::IP($_->ip_addr, $_->ip_netmask);
-    if (($cust_addr->contains($self_addr)) and
-        ($_->svcnum ne $self->svcnum)) { $_; };
-  } qsearch('svc_broadband', {});
-
-  if (scalar @conflicts > 0) {
-    return 'Address in use by existing service';
+  my $block_addr = $self->addr_block->NetAddr;
+  unless ($block_addr->contains($self_addr)) {
+    return 'blocknum '.$self->blocknum.' does not contain address '.$self->ip_addr;
   }
 
-  # Are we trying to use a network, broadcast, or the AC's address?
-  foreach (qsearch('ac_block', { acnum => $self->acnum })) {
-    my $block_addr = new NetAddr::IP($_->ip_gateway, $_->ip_netmask);
-    if ($block_addr->network->addr eq $self_addr->addr) {
-      return 'Address is network address for block '. $block_addr->network;
-    }
-    if ($block_addr->broadcast->addr eq $self_addr->addr) {
-      return 'Address is broadcast address for block '. $block_addr->network;
-    }
-    if ($block_addr->addr eq $self_addr->addr) {
-      return 'Address belongs to the access concentrator: '. $block_addr->addr;
-    }
+  my $router = $self->addr_block->router 
+    or return 'Cannot assign address from unallocated block:'.$self->addr_block->blocknum;
+  if(grep { $_->routernum == $router->routernum} $self->allowed_routers) {
+  } # do nothing
+  else {
+    return 'Router '.$router->routernum.' cannot provide svcpart '.$self->svcpart;
   }
 
+
   ''; #no error
 }
 
-=item ac_block
+=item NetAddr
 
-Returns the FS::ac_block record (i.e. the address block) for this broadband service.
+Returns a NetAddr::IP object containing the IP address of this service.  The netmask 
+is /32.
 
 =cut
 
-sub ac_block {
+sub NetAddr {
   my $self = shift;
-  my $self_addr = new NetAddr::IP ($self->ip_addr, $self->ip_netmask);
-
-  foreach my $block (qsearch( 'ac_block', {} )) {
-    my $block_addr = new NetAddr::IP ($block->ip_addr, $block->ip_netmask);
-    if($block_addr->contains($self_addr)) { return $block; }
-  }
-  return '';
+  return new NetAddr::IP ($self->ip_addr);
 }
 
-=item ac_type
+=item addr_block
 
-Returns the FS::ac_type record for this broadband service.
+Returns the FS::addr_block record (i.e. the address block) for this broadband service.
 
 =cut
 
-sub ac_type {
+sub addr_block {
   my $self = shift;
-  return qsearchs('ac_type', { actypenum => $self->actypenum });
+
+  return qsearchs('addr_block', { blocknum => $self->blocknum });
 }
 
 =back
 
+=item allowed_routers
+
+Returns a list of allowed FS::router objects.
+
+=cut
+
+sub allowed_routers {
+  my $self = shift;
+
+  return map { $_->router } qsearch('part_svc_router', { svcpart => $self->svcpart });
+}
+
 =head1 BUGS
 
+I think there's one place in the code where we actually use sb_field_hashref.
+That's a bug in itself.
+
+The real problem with it is that we're still grappling with the question of how
+tightly xfields should be integrated with real fields.  There are a few
+different directions we could go with it--we I<could> override several
+functions in Record so that xfields behave almost exactly like real fields (can
+be set with setfield(), appear in fields() and hash(), used as criteria in
+qsearch(), etc.).
+
 =head1 SEE ALSO
 
-L<FS::svc_Common>, L<FS::Record>, L<FS::ac_type>, L<FS::ac_block>,
-L<FS::part_svc>, schema.html from the base documentation.
+FS::svc_Common, FS::Record, FS::addr_block, FS::sb_field,
+FS::part_svc, schema.html from the base documentation.
 
 =cut
 
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 0ef3fc81b..19483765e 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -1012,76 +1012,99 @@ sub tables_hash_hack {
       'index'       => [],
     },
 
-    'ac_type' => {
+    'router' => {
       'columns' => [
-        'actypenum', 'serial', '', '',
-        'actypename', 'varchar', '', $char_d,
+        'routernum', 'serial', '', '',
+        'routername', 'varchar', '', $char_d,
+        'svcnum', 'int', '0', '',
       ],
-      'primary_key' => 'actypenum',
+      'primary_key' => 'routernum',
       'unique'      => [],
       'index'       => [],
     },
 
-    'ac' => {
+    'part_svc_router' => {
       'columns' => [
-        'acnum', 'serial', '', '',
-        'actypenum', 'int', '', '',
-        'acname', 'varchar', '', $char_d,
-      ],
-      'primary_key' => 'acnum',
+        'svcpart', 'int', '', '',
+	'routernum', 'int', '', '',
+      ];
+      'primary_key' => '',
       'unique'      => [],
-      'index'       => [ [ 'actypenum' ] ],
+      'index'       => [],
     },
 
-    'part_ac_field' => {
+    'part_router_field' => {
       'columns' => [
-        'acfieldpart', 'serial', '', '',
-        'actypenum', 'int', '', '',
+        'routerfieldpart', 'serial', '', '',
         'name', 'varchar', '', $char_d,
-        'ut_type', 'varchar', '', $char_d,
+	'length', 'int', '', '',
+	'check_block', 'text', 'NULL', '',
+	'list_source', 'text', 'NULL', '',
       ],
-      'primary_key' => 'acfieldpart',
+      'primary_key' => 'routerfieldpart',
       'unique'      => [],
-      'index'       => [ [ 'actypenum' ] ],
+      'index'       => [],
     },
 
-    'ac_field' => {
+    'router_field' => {
       'columns' => [
-        'acfieldpart', 'int', '', '',
-        'acnum', 'int', '', '',
-        'value', 'text', '', '',
+        'routerfieldpart', 'int', '', '',
+        'routernum', 'int', '', '',
+        'value', 'varchar', '', 128,
       ],
       'primary_key' => '',
-      'unique'      => [ [ 'acfieldpart', 'acnum' ] ],
-      'index'       => [ [ 'acnum' ] ],
+      'unique'      => [ [ 'routerfieldpart', 'routernum' ] ],
+      'index'       => [],
     },
 
-    'ac_block' => {
+    'addr_block' => {
       'columns' => [
-        'acnum', 'int', '', '',
+        'blocknum', 'int', '', '',
+	'routernum', 'int', '', '',
         'ip_gateway', 'varchar', '', 15,
         'ip_netmask', 'int', '', '',
       ],
+      'primary_key' => 'blocknum',
+      'unique'      => [ [ 'blocknum', 'routernum' ] ],
+      'index'       => [],
+    },
+
+    'part_sb_field' => {
+      'columns' => [
+        'sbfieldpart', 'int', '', '',
+	'svcpart', 'int', '', '',
+	'name', 'varchar', '', $char_d,
+	'length', 'int', '', '',
+	'check_block', 'text', 'NULL', '',
+	'list_source', 'text', 'NULL', '',
+      ],
+      'primary_key' => 'sbfieldpart',
+      'unique'      => [ [ 'sbfieldpart', 'svcpart' ] ],
+      'index'       => [],
+    },
+
+    'sb_field' => {
+      'columns' => [
+        'sbfieldpart', 'int', '', '',
+	'svcnum', 'int', '', '',
+	'value', 'varchar', '', 128,
+      ],
       'primary_key' => '',
-      'unique'      => [],
-      'index'       => [ [ 'acnum' ] ],
+      'unique'      => [ [ 'sbfieldpart', 'svcnum' ] ],
+      'index'       => [],
     },
 
     'svc_broadband' => {
       'columns' => [
         'svcnum', 'int', '', '',
-        'actypenum', 'int', '', '',
+        'blocknum', 'int', '', '',
         'speed_up', 'int', '', '',
         'speed_down', 'int', '', '',
-        'acnum', 'int', '', '',
         'ip_addr', 'varchar', '', 15,
-        'ip_netmask', 'int', '', '',
-        'mac_addr', 'char', '', 17,
-        'location', 'varchar', '', $char_d,
       ],
       'primary_key' => 'svcnum',
       'unique'      => [],
-      'index'       => [ [ 'actypenum' ] ],
+      'index'       => [],
     },
 
   );
diff --git a/htetc/global.asa b/htetc/global.asa
index 7d84600ed..5fd89957f 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -41,6 +41,7 @@ use FS::part_bill_event;
 use FS::part_pkg;
 use FS::part_referral;
 use FS::part_svc;
+use FS::part_svc_router;
 use FS::pkg_svc;
 use FS::port;
 use FS::queue qw(joblisting);
@@ -51,11 +52,12 @@ use FS::svc_acct_pop qw(popselector);
 use FS::svc_domain;
 use FS::svc_forward;
 use FS::svc_www;
-use FS::ac_type;
-use FS::ac;
-use FS::part_ac_field;
-use FS::ac_field;
-use FS::ac_block;
+use FS::router;
+use FS::part_router_field;
+use FS::router_field;
+use FS::addr_block;
+use FS::part_sb_field;
+use FS::sb_field;
 use FS::svc_broadband;
 use FS::type_pkgs;
 use FS::part_export;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index d55ba3310..768ebffec 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -94,6 +94,7 @@ sub handler
       use FS::part_pkg;
       use FS::part_referral;
       use FS::part_svc;
+      use FS::part_svc_router;
       use FS::pkg_svc;
       use FS::port;
       use FS::queue qw(joblisting);
@@ -105,6 +106,13 @@ sub handler
       use FS::svc_domain;
       use FS::svc_forward;
       use FS::svc_www;
+      use FS::router;
+      use FS::part_router_field;
+      use FS::router_field;
+      use FS::addr_block;
+      use FS::part_sb_field;
+      use FS::sb_field;
+      use FS::svc_broadband;
       use FS::type_pkgs;
       use FS::part_export;
       use FS::part_export_option;
diff --git a/httemplate/browse/addr_block.cgi b/httemplate/browse/addr_block.cgi
new file mode 100644
index 000000000..06ac556cf
--- /dev/null
+++ b/httemplate/browse/addr_block.cgi
@@ -0,0 +1,76 @@
+<%= header('Address Blocks', menubar('Main Menu'   => $p)) %>
+<%
+
+use NetAddr::IP;
+
+my @addr_block = qsearch('addr_block', {});
+my @router = qsearch('router', {});
+my $block;
+my $p2 = popurl(2);
+my $path = $p2 . "edit/process/addr_block";
+
+%>
+
+<% if ($cgi->param('error')) { %>
+   <FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT>
+   <BR><BR>
+<% } %>
+
+<%=table()%>
+
+<% foreach $block (sort {$a->NetAddr cmp $b->NetAddr} @addr_block) { %>
+  <TR>
+    <TD><%=$block->NetAddr%></TD>
+  <% if (my $router = $block->router) { %>
+    <% if (scalar($block->svc_broadband) == 0) { %>
+    <TD>
+      <%=$router->routername%>
+    </TD>
+    <TD>
+      <FORM ACTION="<%=$path%>/deallocate.cgi" METHOD="POST">
+        <INPUT TYPE="hidden" NAME="blocknum" VALUE="<%=$block->blocknum%>">
+        <INPUT TYPE="submit" NAME="submit" VALUE="Deallocate">
+      </FORM>
+    </TD>
+    <% } else { %>
+    <TD COLSPAN="2">
+    <%=$router->routername%>
+    </TD>
+    <% } %>
+  <% } else { %>
+    <TD>
+      <FORM ACTION="<%=$path%>/allocate.cgi" METHOD="POST">
+        <INPUT TYPE="hidden" NAME="blocknum" VALUE="<%=$block->blocknum%>">
+        <SELECT NAME="routernum" SIZE="1">
+    <% foreach (@router) { %>
+          <OPTION VALUE="<%=$_->routernum %>"><%=$_->routername%></OPTION>
+    <% } %>
+        </SELECT>
+        <INPUT TYPE="submit" NAME="submit" VALUE="Allocate">
+      </FORM>
+    </TD>
+    <TD>
+      <FORM ACTION="<%=$path%>/split.cgi" METHOD="POST">
+        <INPUT TYPE="hidden" NAME="blocknum" VALUE="<%=$block->blocknum%>">
+        <INPUT TYPE="submit" NAME="submit" VALUE="Split">
+      </FORM>
+    </TD>
+  </TR>
+<% }
+ } %>
+  <TR><TD COLSPAN="3"><BR></TD></TR>
+  <TR>
+    <FORM ACTION="<%=$path%>/add.cgi" METHOD="POST">
+    <TD>Gateway/Netmask</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="ip_gateway" SIZE="15">/<INPUT TYPE="text" NAME="ip_netmask" SIZE="2">
+    </TD>
+    <TD>
+      <INPUT TYPE="submit" NAME="submit" VALUE="Add">
+    </TD>
+    </FORM>
+  </TR>
+</TABLE>
+</BODY>
+</HTML>
+
diff --git a/httemplate/browse/generic.cgi b/httemplate/browse/generic.cgi
new file mode 100644
index 000000000..9ac0f2391
--- /dev/null
+++ b/httemplate/browse/generic.cgi
@@ -0,0 +1,46 @@
+<%
+
+use FS::Record qw(qsearch dbdef);
+use DBIx::DBSchema;
+use DBIx::DBSchema::Table;
+
+my $error;
+my $p2 = popurl(2);
+my ($table) = $cgi->keywords;
+my $dbdef = dbdef or die "Cannot fetch dbdef!";
+my $dbdef_table = $dbdef->table($table) or die "Cannot fetch schema for $table";
+
+my $pkey = $dbdef_table->primary_key or die "Cannot fetch pkey for $table";
+print header("Browse $table", menubar('Main Menu'   => $p));
+
+my @rec = qsearch($table, {});
+my @col = $dbdef_table->columns;
+
+if ($cgi->param('error')) { %>
+   <FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT>
+   <BR><BR>
+<% } 
+%>
+<A HREF="<%=$p2%>edit/<%=$table%>.cgi"><I>Add a new <%=$table%></I></A><BR><BR>
+
+<%=table()%>
+<TH>
+<% foreach (grep { $_ ne $pkey } @col) {
+  %><TD><%=$_%></TD>
+  <% } %>
+</TH>
+<% foreach $rec (sort {$a->getfield($pkey) cmp $b->getfield($pkey) } @rec) { 
+  %>
+  <TR>
+    <TD>
+      <A HREF="<%=$p2%>edit/<%=$table%>.cgi?<%=$rec->getfield($pkey)%>">
+      <%=$rec->getfield($pkey)%></A> </TD> <%
+  foreach $col (grep { $_ ne $pkey } @col)  { %>
+    <TD><%=$rec->getfield($col)%></TD> <% } %>
+  </A>
+  </TR>
+<% } %>
+</TABLE>
+</BODY>
+</HTML>
+
diff --git a/httemplate/browse/part_sb_field.cgi b/httemplate/browse/part_sb_field.cgi
new file mode 100644
index 000000000..4c9641e86
--- /dev/null
+++ b/httemplate/browse/part_sb_field.cgi
@@ -0,0 +1,31 @@
+<%= header('svc_broadband extended fields', menubar('Main Menu'   => $p)) %>
+<%
+
+my @psf = qsearch('part_sb_field', {});
+my $block;
+my $p2 = popurl(2);
+
+%>
+
+<% if ($cgi->param('error')) { %>
+   <FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT>
+   <BR><BR>
+<% } %>
+
+<A HREF="<%=$p2%>edit/part_sb_field.cgi"><I>Add a new field</I></A><BR><BR>
+
+<%=table()%>
+<TH><TD>Field name</TD><TD>Service type</TD></TH>
+<% foreach $psf (sort {$a->name cmp $b->name} @psf) { %>
+  <TR>
+    <TD></TD>
+    <TD>
+      <A HREF="<%=$p2%>edit/part_sb_field.cgi?<%=$psf->sbfieldpart%>">
+        <%=$psf->name%></A></TD>
+    <TD><%=$psf->part_svc->svc%></TD>
+  </TR>
+<% } %>
+</TABLE>
+</BODY>
+</HTML>
+
diff --git a/httemplate/browse/router.cgi b/httemplate/browse/router.cgi
new file mode 100644
index 000000000..8864936d9
--- /dev/null
+++ b/httemplate/browse/router.cgi
@@ -0,0 +1,37 @@
+<%= header('Routers', menubar('Main Menu'   => $p)) %>
+<%
+
+my @router = qsearch('router', {});
+my $p2 = popurl(2);
+
+%>
+
+<% if ($cgi->param('error')) { %>
+   <FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT>
+   <BR><BR>
+<% } %>
+
+<A HREF="<%=$p2%>edit/router.cgi"><I>Add a new router</I></A><BR><BR>
+
+<%=table()%>
+<!-- <TH><TD>Field name</TD><TD>Field value</TD></TH> -->
+<% foreach $router (sort {$a->routernum <=> $b->routernum} @router) { %>
+  <TR>
+<!--    <TD ROWSPAN="<%=scalar($router->router_field) + 2%>"> -->
+    <TD>
+      <A HREF="<%=$p2%>edit/router.cgi?<%=$router->routernum%>"><%=$router->routername%></A>
+    </TD>
+  <!-- 
+  <% foreach (sort { $a->part_router_field->name cmp $b->part_router_field->name } $router->router_field )  { %>
+  <TR>
+    <TD BGCOLOR="#cccccc" ALIGN="right"><%=$_->part_router_field->name%></TD>
+    <TD BGCOLOR="#ffffff"><%=$_->value%></TD>
+  </TR>
+  <% } %>
+  -->
+  </TR>
+<% } %>
+</TABLE>
+</BODY>
+</HTML>
+
diff --git a/httemplate/edit/part_router_field.cgi b/httemplate/edit/part_router_field.cgi
new file mode 100644
index 000000000..c3e99be2c
--- /dev/null
+++ b/httemplate/edit/part_router_field.cgi
@@ -0,0 +1,70 @@
+<!-- mason kludge -->
+<%
+my ($routerfieldpart, $part_router_field);
+
+if ( $cgi->param('error') ) {
+  $part_router_field = new FS::part_router_field ( {
+    map { $_, scalar($cgi->param($_)) } fields('part_router_field')});
+  $routerfieldpart = $part_router_field->routerfieldpart;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $routerfieldpart=$1;
+    $part_router_field=qsearchs('part_router_field',
+        {'routerfieldpart' => $routerfieldpart})
+      or die "Unknown routerfieldpart!";
+  
+  } else { #adding
+    $part_router_field = new FS::part_router_field({});
+  }
+}
+my $action = $part_router_field->routerfieldpart ? 'Edit' : 'Add';
+
+my $p1 = popurl(1);
+print header("$action Router Extended Field Definition", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+%>
+<FORM ACTION="<%=$p1%>process/generic.cgi" METHOD=POST>
+
+<INPUT TYPE="hidden" NAME="table" VALUE="part_router_field">
+<INPUT TYPE="hidden" NAME="redirect_ok" 
+    VALUE="<%=$p1%>part_router_field.cgi">
+<INPUT TYPE="hidden" NAME="routerfieldpart" VALUE="<%=
+  $routerfieldpart%>">
+Field #<B><%=$routerfieldpart or "(NEW)"%></B><BR><BR>
+
+<%=ntable("#cccccc",2)%>
+  <TR>
+    <TD ALIGN="right">Name</TD>
+    <TD><INPUT TYPE="text" NAME="name" MAXLENGTH=15 VALUE="<%=
+    $part_router_field->name%>"></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Length</TD>
+    <TD><INPUT TYPE="text" NAME="length" MAXLENGTH=4 VALUE="<%=
+    $part_router_field->length%>"></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">check_block</TD>
+    <TD><TEXTAREA COLS="20" ROWS="4" NAME="check_block"><%=
+    $part_router_field->check_block%></TEXTAREA></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">list_source</TD>
+    <TD><TEXTAREA COLS="20" ROWS="4" NAME="list_source"><%=
+    $part_router_field->list_source%></TEXTAREA></TD>
+  </TR>
+</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">
+
+</FORM>
+
+<BR><BR>
+<FONT SIZE=-2>If you don't understand what <I>check_block</I> and 
+<I>list_source</I> mean, <B>LEAVE THEM BLANK</B>.  We mean it.</FONT>
+
+
+</BODY>
+</HTML>
diff --git a/httemplate/edit/part_sb_field.cgi b/httemplate/edit/part_sb_field.cgi
new file mode 100644
index 000000000..9e0cc9e4f
--- /dev/null
+++ b/httemplate/edit/part_sb_field.cgi
@@ -0,0 +1,79 @@
+<!-- mason kludge -->
+<%
+my ($sbfieldpart, $part_sb_field);
+
+if ( $cgi->param('error') ) {
+  $part_sb_field = new FS::part_sb_field ( {
+    map { $_, scalar($cgi->param($_)) } fields('part_sb_field')});
+  $sbfieldpart = $part_sb_field->sbfieldpart;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $sbfieldpart=$1;
+    $part_sb_field=qsearchs('part_sb_field',
+        {'sbfieldpart' => $sbfieldpart})
+      or die "Unknown sbfieldpart!";
+  
+  } else { #adding
+    $part_sb_field = new FS::part_sb_field({});
+  }
+}
+my $action = $part_sb_field->sbfieldpart ? 'Edit' : 'Add';
+
+my $p1 = popurl(1);
+print header("$action svc_broadband Extended Field Definition", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+%>
+<FORM ACTION="<%=$p1%>process/generic.cgi" METHOD="POST">
+
+<INPUT TYPE="hidden" NAME="table" VALUE="part_sb_field">
+<INPUT TYPE="hidden" NAME="redirect_ok" 
+    VALUE="<%=popurl(2)%>browse/part_sb_field.cgi">
+<INPUT TYPE="hidden" NAME="sbfieldpart" VALUE="<%=
+  $sbfieldpart%>">
+Field #<B><%=$sbfieldpart or "(NEW)"%></B><BR><BR>
+
+<%=ntable("#cccccc",2)%>
+  <TR>
+    <TD ALIGN="right">Name</TD>
+    <TD><INPUT TYPE="text" NAME="name" MAXLENGTH=15 VALUE="<%=
+    $part_sb_field->name%>"></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Length</TD>
+    <TD><INPUT TYPE="text" NAME="length" MAXLENGTH=4 VALUE="<%=
+    $part_sb_field->length%>"></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Service</TD>
+    <TD><SELECT SIZE=1 NAME="svcpart"><%
+      foreach my $part_svc (qsearch('part_svc', {svcdb => 'svc_broadband'})) {
+        %><OPTION VALUE="<%=$part_svc->svcpart%>"<%=
+	  ($part_svc->svcpart == $part_sb_field->svcpart) ? ' SELECTED' : ''%>">
+	  <%=$part_svc->svc%>
+      <% } %>
+      </SELECT></TD>
+  <TR>
+    <TD ALIGN="right">check_block</TD>
+    <TD><TEXTAREA COLS="20" ROWS="4" NAME="check_block"><%=
+    $part_sb_field->check_block%></TEXTAREA></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">list_source</TD>
+    <TD><TEXTAREA COLS="20" ROWS="4" NAME="list_source"><%=
+    $part_sb_field->list_source%></TEXTAREA></TD>
+  </TR>
+</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">
+
+</FORM>
+
+<BR><BR>
+<FONT SIZE=-2>If you don't understand what <I>check_block</I> and 
+<I>list_source</I> mean, <B>LEAVE THEM BLANK</B>.  We mean it.</FONT>
+
+
+</BODY>
+</HTML>
diff --git a/httemplate/edit/process/addr_block/add.cgi b/httemplate/edit/process/addr_block/add.cgi
new file mode 100755
index 000000000..34d799ccd
--- /dev/null
+++ b/httemplate/edit/process/addr_block/add.cgi
@@ -0,0 +1,20 @@
+<%
+
+my $error = '';
+my $ip_gateway = $cgi->param('ip_gateway');
+my $ip_netmask = $cgi->param('ip_netmask');
+
+my $new = new FS::addr_block {
+    ip_gateway => $ip_gateway,
+    ip_netmask => $ip_netmask,
+    routernum  => 0 };
+
+$error = $new->insert;
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(4). "browse/addr_block.cgi?". $cgi->query_string );
+} else { 
+  print $cgi->redirect(popurl(4). "browse/addr_block.cgi");
+} 
+%>
diff --git a/httemplate/edit/process/addr_block/allocate.cgi b/httemplate/edit/process/addr_block/allocate.cgi
new file mode 100755
index 000000000..85b0d7a7a
--- /dev/null
+++ b/httemplate/edit/process/addr_block/allocate.cgi
@@ -0,0 +1,25 @@
+<%
+my $error = '';
+my $blocknum = $cgi->param('blocknum');
+my $routernum = $cgi->param('routernum');
+
+my $addr_block = qsearchs('addr_block', { blocknum => $blocknum });
+my $router = qsearchs('router', { routernum => $routernum });
+
+if($addr_block) {
+  if ($router) {
+    $error = $addr_block->allocate($router);
+  } else {
+    $error = "Cannot find router with routernum $routernum";
+  }
+} else {
+  $error = "Cannot find block with blocknum $blocknum";
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(4). "browse/addr_block.cgi?" . $cgi->query_string);
+} else { 
+  print $cgi->redirect(popurl(4). "browse/addr_block.cgi");
+}
+%>
diff --git a/httemplate/edit/process/addr_block/deallocate.cgi b/httemplate/edit/process/addr_block/deallocate.cgi
new file mode 100755
index 000000000..cfb7ed04d
--- /dev/null
+++ b/httemplate/edit/process/addr_block/deallocate.cgi
@@ -0,0 +1,24 @@
+<%
+my $error = '';
+my $blocknum = $cgi->param('blocknum');
+
+my $addr_block = qsearchs('addr_block', { blocknum => $blocknum });
+
+if($addr_block) {
+  my $router = $addr_block->router;
+  if ($router) {
+    $error = $addr_block->deallocate($router);
+  } else {
+    $error = "Block is not allocated to a router";
+  }
+} else {
+  $error = "Cannot find block with blocknum $blocknum";
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(4). "browse/addr_block.cgi?" . $cgi->query_string);
+} else { 
+  print $cgi->redirect(popurl(4). "browse/addr_block.cgi");
+}
+%>
diff --git a/httemplate/edit/process/addr_block/split.cgi b/httemplate/edit/process/addr_block/split.cgi
new file mode 100755
index 000000000..bb6d4ba3e
--- /dev/null
+++ b/httemplate/edit/process/addr_block/split.cgi
@@ -0,0 +1,19 @@
+<%
+my $error = '';
+my $blocknum = $cgi->param('blocknum');
+my $addr_block = qsearchs('addr_block', { blocknum => $blocknum });
+
+if ( $addr_block) {
+  $error = $addr_block->split_block;
+} else {
+  $error = "Unknown blocknum: $blocknum";
+}
+
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(4). "browse/addr_block.cgi?". $cgi->query_string );
+} else { 
+  print $cgi->redirect(popurl(4). "browse/addr_block.cgi");
+} 
+%>
diff --git a/httemplate/edit/process/generic.cgi b/httemplate/edit/process/generic.cgi
new file mode 100644
index 000000000..751987f7a
--- /dev/null
+++ b/httemplate/edit/process/generic.cgi
@@ -0,0 +1,69 @@
+<%
+
+# Welcome to generic.cgi.
+# 
+# This script provides a generic edit/process/ backend for simple table 
+# editing.  All it knows how to do is take the values entered into 
+# the script and insert them into the table specified by $cgi->param('table').
+# If there's an existing record with the same primary key, it will be 
+# replaced.  (Deletion will be added in the future.)
+# 
+# Special cgi params for this script:
+# table: the name of the table to be edited.  The script will die horribly 
+#        if it can't find the table.
+# redirect_ok: URL to be displayed after a successful edit.  The value of 
+#              the record's primary key will be passed as a keyword.
+#              Defaults to (freeside root)/view/$table.cgi.
+# redirect_error: URL to be displayed if there's an error.  The original 
+#                 query string, plus the error message, will be passed.
+#                 Defaults to $cgi->referer() (i.e. go back where you 
+#                 came from).
+
+
+use FS::Record qw(qsearchs dbdef);
+use DBIx::DBSchema;
+use DBIx::DBSchema::Table;
+
+
+my $error;
+my $p2 = popurl(2);
+my $table = $cgi->param('table');
+my $dbdef = dbdef or die "Cannot fetch dbdef!";
+
+my $dbdef_table = $dbdef->table($table) or die "Cannot fetch schema for $table";
+
+my $pkey = $dbdef_table->primary_key or die "Cannot fetch pkey for $table";
+my $pkey_val = $cgi->param($pkey);
+
+
+#warn "new FS::Record ( $table, (hashref) )";
+my $new = FS::Record::new ( "FS::$table", {
+    map { $_, scalar($cgi->param($_)) } fields($table) 
+} );
+
+#warn 'created $new of class '.ref($new);
+
+if($pkey_val and (my $old = qsearchs($table, { $pkey, $pkey_val} ))) {
+  # edit
+  $error = $new->replace($old);
+} else {
+  #add
+  $error = $new->insert;
+  $pkey_val = $new->getfield($pkey);
+  # New records usually don't have their primary keys set until after 
+  # they've been checked/inserted, so grab the new $pkey_val so we can 
+  # redirect to it.
+}
+
+my $redirect_ok = (($cgi->param('redirect_ok')) ?
+                    $cgi->param('redirect_ok') : $p2."view/$table.cgi");
+my $redirect_error = (($cgi->param('redirect_error')) ?
+                       $cgi->param('redirect_error') : $cgi->referer());
+
+if($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect($redirect_error . '?' . $cgi->query_string);
+} else {
+  print $cgi->redirect($redirect_ok . '?' .$pkey_val);
+}
+%>
diff --git a/httemplate/edit/process/router.cgi b/httemplate/edit/process/router.cgi
new file mode 100644
index 000000000..c0cb884f0
--- /dev/null
+++ b/httemplate/edit/process/router.cgi
@@ -0,0 +1,100 @@
+<%
+
+use FS::UID qw(dbh);
+
+my $dbh = dbh;
+local $FS::UID::AutoCommit=0;
+
+sub check {
+  my $error = shift;
+  if($error) {
+    $cgi->param('error', $error);
+    print $cgi->redirect(popurl(3) . "edit/router.cgi?". $cgi->query_string);
+    $dbh->rollback;
+    exit;
+  }
+}
+
+my $error = '';
+my $routernum  = $cgi->param('routernum');
+my $routername = $cgi->param('routername');
+my $old = qsearchs('router', { routernum => $routernum });
+my @old_rf;
+my @old_psr;
+
+my $new = new FS::router {
+    routernum  => $routernum,
+    routername => $routername,
+    svcnum     => 0
+    };
+
+if($old) {
+  if($old->routername ne $new->routername) {
+    $error = $new->replace($old);
+  } #else do nothing
+} else {
+  $error = $new->insert;
+}
+
+check($error);
+
+if ($old) {
+  @old_psr = $old->part_svc_router;
+  foreach $psr (@old_psr) {
+    if($cgi->param('svcpart_'.$psr->svcpart) eq 'ON') {
+      # do nothing
+    } else {
+      $error = $psr->delete;
+    }
+  }
+  check($error);
+  @old_rf = $old->router_field;
+  foreach $rf (@old_rf) {
+    if(my $new_val = $cgi->param('rf_'.$rf->routerfieldpart)) {
+      if($new_val ne $rf->value) {
+        my $new_rf = new FS::router_field 
+	  { routernum       => $routernum,
+	    value           => $new_val,
+	    routerfieldpart => $rf->routerfieldpart };
+	$error = $new_rf->replace($rf);
+      } #else do nothing
+    } else {
+      $error = $rf->delete;
+    }
+    check($error);
+  }
+}
+
+foreach($cgi->param) {
+  if($cgi->param($_) eq 'ON' and /^svcpart_(\d+)$/) {
+    my $svcpart = $1;
+    if(grep {$_->svcpart == $svcpart} @old_psr) {
+      # do nothing
+    } else {
+      my $new_psr = new FS::part_svc_router { svcpart   => $svcpart,
+                                              routernum => $routernum };
+      $error = $new_psr->insert;
+    }
+    check($error);
+  } elsif($cgi->param($_) ne '' and /^rf_(\d+)$/) {
+    my $part = $1;
+    if(my @x = grep {$_->routerfieldpart == $part} @old_rf) {
+      # already handled all of these
+    } else {
+      my $new_rf = new FS::router_field
+        { routernum       => $routernum,
+	  value           => $cgi->param('rf_'.$part),
+	  routerfieldpart => $part };
+      $error = $new_rf->insert;
+      check($error);
+    }
+  }
+}
+
+
+
+# Yay, everything worked!
+$dbh->commit or die $dbh->errstr;
+print $cgi->redirect(popurl(3). "edit/router.cgi?$routernum");
+
+%>
diff --git a/httemplate/edit/process/svc_broadband.cgi b/httemplate/edit/process/svc_broadband.cgi
index fd7ba20d5..ab8b9f9d8 100644
--- a/httemplate/edit/process/svc_broadband.cgi
+++ b/httemplate/edit/process/svc_broadband.cgi
@@ -1,12 +1,19 @@
 <%
 
+# If it's stupid but it works, it's not stupid.
+# -- U.S. Army
+
+local $FS::UID::AutoCommit = 0;
+my $dbh = FS::UID::dbh;
+
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 my $svcnum = $1;
 
-my $old;
+my $old; my @old_sbf;
 if ( $svcnum ) {
   $old = qsearchs('svc_broadband', { 'svcnum' => $svcnum } )
     or die "fatal: can't find broadband service (svcnum $svcnum)!";
+  @old_sbf = $old->sb_field;
 } else {
   $old = '';
 }
@@ -17,14 +24,6 @@ my $new = new FS::svc_broadband ( {
   } ( fields('svc_broadband'), qw( pkgnum svcpart ) )
 } );
 
-unless ( $new->ip_addr ) {
-  $new->ip_addr(join('.', (map $cgi->param('ip_addr_'.$_), (a..d))));
-}
-
-unless ( $new->mac_addr) {
-  $new->mac_addr(join(':', (map $cgi->param('mac_addr_'.$_), (a..f))));
-}
-
 my $error;
 if ( $svcnum ) {
   $error = $new->replace($old);
@@ -33,12 +32,47 @@ if ( $svcnum ) {
   $svcnum = $new->svcnum;
 }
 
+unless ($error) {
+  my $sb_field;
+
+  foreach ($cgi->param) {
+    #warn "\$cgi->param $_: " . $cgi->param($_);
+    if(/^sbf_(\d+)/) {
+      my $part = $1;
+      #warn "\$part $part";
+      $sb_field = new FS::sb_field 
+        { svcnum      => $svcnum,
+          value       => $cgi->param($_),
+          sbfieldpart => $part };
+      if (my @x = grep { $_->sbfieldpart eq $part } @old_sbf) {
+      #if (my $old_sb_field = (grep { $_->sbfieldpart eq $part} @old_Sbf)[0]) {
+        #warn "array: " . scalar(@x);
+        if (length($sb_field->value) && ($sb_field->value ne $x[0]->value)) { 
+          #warn "replacing " . $x[0]->value . " with " . $sb_field->value;
+          $error = $sb_field->replace($x[0]);
+          #$error = $sb_field->replace($old_sb_field);
+        } elsif (length($sb_field->value) == 0) { 
+          #warn "delete";
+          $error = $x[0]->delete;
+        }
+      } else {
+        if (length($sb_field->value) > 0) { 
+          #warn "insert";
+          $error = $sb_field->insert;
+        }
+        # else do nothing
+      }
+    }
+  }
+}
+
 if ( $error ) {
   $cgi->param('error', $error);
   $cgi->param('ip_addr', $new->ip_addr);
-  $cgi->param('mac_addr', $new->mac_addr);
+  $dbh->rollback;
   print $cgi->redirect(popurl(2). "svc_broadband.cgi?". $cgi->query_string );
 } else {
+  $dbh->commit or die $dbh->errstr;
   print $cgi->redirect(popurl(3). "view/svc_broadband.cgi?" . $svcnum );
 }
 
diff --git a/httemplate/edit/router.cgi b/httemplate/edit/router.cgi
new file mode 100755
index 000000000..d2279ff00
--- /dev/null
+++ b/httemplate/edit/router.cgi
@@ -0,0 +1,88 @@
+<HTML><BODY>
+
+<%
+
+my $router;
+if ( $cgi->keywords ) {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $router = qsearchs('router', { routernum => $1 }) 
+      or print $cgi->redirect(popurl(2)."browse/router.cgi") ;
+} else {
+  $router = new FS::router ( {
+    map { $_, scalar($cgi->param($_)) } fields('router')
+  } );
+}
+
+my $routernum = $router->routernum;
+my $action = $routernum ? 'Edit' : 'Add';
+my $hashref = $router->hashref;
+
+print header("$action Router", menubar(
+  'Main Menu' => "$p",
+  'View all routers' => "${p}browse/router.cgi",
+));
+
+if($cgi->param('error')) {
+%> <FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT>
+<% } %>
+
+<FORM ACTION="<%=popurl(1)%>process/router.cgi" METHOD=POST>
+  <INPUT TYPE="hidden" NAME="routernum" VALUE="<%=$routernum%>">
+    Router #<%=$routernum or "(NEW)"%>
+
+<BR><BR>Name <INPUT TYPE="text" NAME="routername" SIZE=32 VALUE="<%=$hashref->{routername}%>">
+<%=table() %>
+
+<%
+# I know, I know.  Massive false laziness with edit/svc_broadband.cgi.  But 
+# Kristian won't let me generalize the custom field mechanism to every table in 
+# the database, so this is what we get.  <snarl>
+# -- MW
+
+my @part_router_field = qsearch('part_router_field', { });
+my %rf = map { $_->part_router_field->name, $_->value } $router->router_field;
+foreach (sort { $a->name cmp $b->name } @part_router_field) {
+  %>
+  <TR>
+    <TD ALIGN="right"><%=$_->name%></TD>
+    <TD><%
+  if(my @opts = $_->list_values) {
+    %>  <SELECT NAME="rf_<%=$_->routerfieldpart%>" SIZE="1">
+          <%
+    foreach $opt (@opts) {
+      %>  <OPTION VALUE="<%=$opt%>"<%=($opt eq $rf{$_->name}) 
+              ? ' SELECTED' : ''%>>
+            <%=$opt%>
+	  </OPTION>
+   <% } %>
+	</SELECT>
+ <% } else { %>
+        <INPUT NAME="rf_<%=$_->routerfieldpart%>"
+        VALUE="<%=$rf{$_->name}%>"
+        <%=$_->length ? 'SIZE="'.$_->length.'"' : ''%>>
+  <% } %></TD>
+  </TR>
+<% } %>
+</TABLE>
+
+
+
+<BR><BR>Select the service types available on this router<BR>
+<%
+
+foreach my $part_svc ( qsearch('part_svc', { svcdb    => 'svc_broadband',
+                                             disabled => '' }) ) {
+  %>
+  <BR>
+  <INPUT TYPE="checkbox" NAME="svcpart_<%=$part_svc->svcpart%>"<%=
+      qsearchs('part_svc_router', { svcpart   => $part_svc->svcpart, 
+                                    routernum => $routernum } ) ? 'CHECKED' : ''%> VALUE="ON">
+  <A HREF="<%=${p}%>edit/part_svc.cgi?<%=$part_svc->svcpart%>">
+    <%=$part_svc->svcpart%>: <%=$part_svc->svc%></A>
+  <% } %>
+
+  <BR><BR><INPUT TYPE="submit" VALUE="Apply changes">
+  </FORM>
+</BODY></HTML>
+
diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index d8a1f7a2a..f017d7a6e 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -1,6 +1,13 @@
 <!-- mason kludge -->
 <%
 
+# If it's stupid but it works, it's still stupid.
+#  -Kristian
+
+
+use HTML::Widgets::SelectLayers;
+use Tie::IxHash;
+
 my( $svcnum,  $pkgnum, $svcpart, $part_svc, $svc_broadband );
 if ( $cgi->param('error') ) {
   $svc_broadband = new FS::svc_broadband ( {
@@ -38,6 +45,8 @@ if ( $cgi->param('error') ) {
     $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
     die "No part_svc entry!" unless $part_svc;
 
+    $svc_broadband->setfield('svcpart', $svcpart);
+
     $svcnum='';
 
     #set fixed and default fields from part_svc
@@ -53,12 +62,9 @@ if ( $cgi->param('error') ) {
 }
 my $action = $svc_broadband->svcnum ? 'Edit' : 'Add';
 
-my @ac_list;
-
 if ($pkgnum) {
 
-  unless ($svc_broadband->actypenum) {die "actypenum must be set fixed";};
-  @ac_list = qsearch('ac', { actypenum => $svc_broadband->getfield('actypenum') });
+  #Nothing?
 
 } elsif ( $action eq 'Edit' ) {
 
@@ -68,152 +74,111 @@ if ($pkgnum) {
   die "\$action eq Add, but \$pkgnum is null!\n";
 }
 
-
 my $p1 = popurl(1);
-print header("Broadband Service $action", '');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print qq!<FORM ACTION="${p1}process/svc_broadband.cgi" METHOD=POST>!;
-
-#display
-
- 
-
-#svcnum
-print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
-print qq!Service #<B>!, $svcnum ? $svcnum : "(NEW)", "</B><BR><BR>";
-
-#pkgnum
-print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
- 
-#svcpart
-print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
-
-#actypenum
-print '<INPUT TYPE="hidden" NAME="actypenum" VALUE="' .
-      $svc_broadband->actypenum . '">';
-
-
-print &ntable("#cccccc",2) . qq!<TR><TD ALIGN="right">AC</TD><TD>!;
-
-#acnum
-if (( $part_svc->part_svc_column('acnum')->columnflag eq 'F' ) or
-    ( !$pkgnum )) {
-
-  my $ac = qsearchs('ac', { acnum => $svc_broadband->acnum });
-  my ($acnum, $acname) = ($ac->acnum, $ac->acname);
-
-  print qq!<INPUT TYPE="hidden" NAME="acnum" VALUE="${acnum}">! .
-        qq!${acnum}: ${acname}</TD></TR>!;
-
-} else {
-
-  my @ac_list = qsearch('ac', { actypenum => $svc_broadband->actypenum });
-  print qq!<SELECT NAME="acnum" SIZE="1"><OPTION VALUE=""></OPTION>!;
-
-  foreach ( @ac_list ) {
-    my ($acnum, $acname) = ($_->acnum, $_->acname);
-    print qq!<OPTION VALUE="${acnum}"! .
-          ($acnum == $svc_broadband->acnum ? ' SELECTED>' : '>') .
-          qq!${acname}</OPTION>!;
-  }
-  print '</TD></TR>';
-
-}
-
-#speed_up & speed_down
-my ($speed_up, $speed_down) = ($svc_broadband->speed_up,
-                               $svc_broadband->speed_down);
 
-print '<TR><TD ALIGN="right">Download speed</TD><TD>';
-if ( $part_svc->part_svc_column('speed_down')->columnflag eq 'F' ) {
-  print qq!<INPUT TYPE="hidden" NAME="speed_down" VALUE="${speed_down}">! .
-        qq!${speed_down}Kbps</TD></TR>!;
-} else {
-  print qq!<INPUT TYPE="text" NAME="speed_down" SIZE=5 VALUE="${speed_down}">! .
-        qq!Kbps</TD></TR>!;
-}
-
-print '<TR><TD ALIGN="right">Upload speed</TD><TD>';
-if ( $part_svc->part_svc_column('speed_up')->columnflag eq 'F' ) {
-  print qq!<INPUT TYPE="hidden" NAME="speed_up" VALUE="${speed_up}">! .
-        qq!${speed_up}Kbps</TD></TR>!;
-} else {
-  print qq!<INPUT TYPE="text" NAME="speed_up" SIZE=5 VALUE="${speed_up}">! .
-        qq!Kbps</TD></TR>!;
-}
+my ($ip_addr, $speed_up, $speed_down, $blocknum) =
+    ($svc_broadband->ip_addr,
+     $svc_broadband->speed_up,
+     $svc_broadband->speed_down,
+     $svc_broadband->blocknum);
 
-#ip_addr & ip_netmask
-#We're assuming that ip_netmask is fixed if ip_addr is fixed.
-#If it isn't, well, <shudder> what the heck are you doing!?!?
-
-my ($ip_addr, $ip_netmask) = ($svc_broadband->ip_addr,
-                              $svc_broadband->ip_netmask);
-
-print '<TR><TD ALIGN="right">IP address/Mask</TD><TD>';
-if ( $part_svc->part_svc_column('ip_addr')->columnflag eq 'F' ) {
-  print qq!<INPUT TYPE="hidden" NAME="ip_addr" VALUE="${ip_addr}">! .
-        qq!<INPUT TYPE="hidden" NAME="ip_netmask" VALUE="${ip_netmask}">! .
-        qq!${ip_addr}/${ip_netmask}</TD></TR>!;
-} else {
-  $ip_addr =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/;
-  print <<END;
-  <INPUT TYPE="text" NAME="ip_addr_a" SIZE="3" MAXLENGTH="3" VALUE="${1}">.
-  <INPUT TYPE="text" NAME="ip_addr_b" SIZE="3" MAXLENGTH="3" VALUE="${2}">.
-  <INPUT TYPE="text" NAME="ip_addr_c" SIZE="3" MAXLENGTH="3" VALUE="${3}">.
-  <INPUT TYPE="text" NAME="ip_addr_d" SIZE="3" MAXLENGTH="3" VALUE="${4}">/
-  <INPUT TYPE="text" NAME="ip_netmask" SIZE="2" MAXLENGTH="2" VALUE="${ip_netmask}">
-</TD></TR>
-<TR><TD COLSPAN="2" WIDTH="300">
-<P><SMALL>Leave the IP address and netmask blank for automatic assignment of a /32 address.  Specifing the netmask and not the address will force assignment of a larger block.</SMALL></P>
-</TD></TR>
-END
-}
-
-#mac_addr
-my $mac_addr = $svc_broadband->mac_addr;
-
-unless (( $part_svc->part_svc_column('mac_addr')->columnflag eq 'F' ) and
-        ( $mac_addr eq '' )) {
-  print '<TR><TD ALIGN="right">MAC Address</TD><TD>';
-  if ( $part_svc->part_svc_column('mac_addr')->columnflag eq 'F' ) { #Why?
-    print qq!<INPUT TYPE="hidden" NAME="mac_addr" VALUE="${mac_addr}">! .
-          qq!${mac_addr}</TD></TR>!;
-  } else {
-    #Ewwww
-    $mac_addr =~ /^([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2})$/i;
-    print <<END;
-  <INPUT TYPE="text" NAME="mac_addr_a" SIZE="2" MACLENGTH="2" VALUE="${1}">:
-  <INPUT TYPE="text" NAME="mac_addr_b" SIZE="2" MACLENGTH="2" VALUE="${2}">:
-  <INPUT TYPE="text" NAME="mac_addr_c" SIZE="2" MACLENGTH="2" VALUE="${3}">:
-  <INPUT TYPE="text" NAME="mac_addr_d" SIZE="2" MACLENGTH="2" VALUE="${4}">:
-  <INPUT TYPE="text" NAME="mac_addr_e" SIZE="2" MACLENGTH="2" VALUE="${5}">:
-  <INPUT TYPE="text" NAME="mac_addr_f" SIZE="2" MACLENGTH="2" VALUE="${6}">
-</TD></TR>
-END
+%>
 
+<%=header("Broadband Service $action", '')%>
+
+<% if ($cgi->param('error')) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT><BR>
+<% } %>
+
+Service #<B><%=$svcnum ? $svcnum : "(NEW)"%></B><BR><BR>
+
+<FORM ACTION="<%=${p1}%>process/svc_broadband.cgi" METHOD=POST>
+  <INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$svcnum%>">
+  <INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%=$pkgnum%>">
+  <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%=$svcpart%>">
+  <INPUT TYPE="hidden" NAME="ip_addr" VALUE="<%=$ip_addr%>">
+
+  <%=&ntable("#cccccc",2)%>
+
+    <TR>
+      <TD ALIGN="right">Download speed</TD>
+      <TD BGCOLOR="#ffffff">
+<% if ( $part_svc->part_svc_column('speed_down')->columnflag eq 'F' ) { %>
+        <INPUT TYPE="hidden" NAME="speed_down" VALUE="<%=$speed_down%>"><%=$speed_down%>Kbps
+<% } else { %>
+    <INPUT TYPE="text" NAME="speed_down" SIZE=5 VALUE="<%=$speed_down%>">Kbps
+<% } %>
+      </TD>
+    </TR>
+    <TR>
+      <TD ALIGN="right">Upload speed</TD>
+      <TD BGCOLOR="#ffffff">
+<% if ( $part_svc->part_svc_column('speed_up')->columnflag eq 'F' ) { %>
+        <INPUT TYPE="hidden" NAME="speed_up" VALUE="<%=$speed_up%>"><%=$speed_up%>Kbps
+<% } else { %>
+        <INPUT TYPE="text" NAME="speed_up" SIZE=5 VALUE="<%=$speed_up%>">Kbps
+<% } %>
+      </TD>
+    </TR>
+<% if ($action eq 'Add') { %>
+    <TR>
+      <TD ALIGN="right">Router/Block</TD>
+      <TD BGCOLOR="#ffffff">
+        <SELECT NAME="blocknum">
+<%
+  foreach my $router ($svc_broadband->allowed_routers) {
+    foreach my $addr_block ($router->addr_block) {
+%>
+        <OPTION VALUE="<%=$addr_block->blocknum%>"<%=($addr_block->blocknum eq $blocknum) ? ' SELECTED' : ''%>>
+          <%=$router->routername%>:<%=$addr_block->ip_gateway%>/<%=$addr_block->ip_netmask%></OPTION>
+<%
+    }
   }
-}
-
-#location
-my $location = $svc_broadband->location;
+%>
+        </SELECT>
+      </TD>
+    </TR>
+<% } else { %>
 
-print '<TR><TD VALIGN="top" ALIGN="right">Location</TD><TD BGCOLOR="#e8e8e8">';
-if ( $part_svc->part_svc_column('location')->columnflag eq 'F' ) {
-  print qq!<PRE>${location}</PRE></TD></TR>!;
-} else {
-  print qq!<TEXTAREA ROWS="4" COLS="30" NAME="location">${location}</TEXTAREA>!;
-}
+    <TR>
+      <TD ALIGN="right">Router/Block</TD>
+      <TD BGCOLOR="#ffffff">
+        <%=$svc_broadband->addr_block->router->routername%>:<%=$svc_broadband->addr_block->NetAddr%>
+        <INPUT TYPE="hidden" NAME="blocknum" VALUE="<%=$svc_broadband->blocknum%>">
+      </TD>
+    </TR>
 
-print '</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">';
+<% } %>
 
-print <<END;
+<%
 
-    </FORM>
-  </BODY>
+  my @part_sb_field = qsearch('part_sb_field', { svcpart => $svcpart });
+  my $sbf_hashref = $svc_broadband->sb_field_hashref($svcpart);
+  foreach (sort { $a->name cmp $b->name } @part_sb_field) {
+    %>
+    <TR>
+      <TD ALIGN="right"><%=$_->name%></TD>
+      <TD><%
+      if(my @opts = $_->list_values) {
+        %>
+	<SELECT NAME="sbf_<%=$_->sbfieldpart%>" SIZE=1> <%
+        foreach $opt (@opts) { %>
+          <OPTION VALUE="<%=$opt%>"<%=
+	    ($opt eq $sbf_hashref->{$_->name}) ? ' SELECTED' : ''%>>
+	    <%=$opt%></OPTION><%
+        } %></SELECT>
+   <% } else { %>
+        <INPUT NAME="sbf_<%=$_->sbfieldpart%>"
+	    VALUE="<%=$sbf_hashref->{$_->name}%>"
+     <%=$_->length ? 'SIZE="'.$_->length.'"' : ''%>>
+   <% } %>
+      </TD>
+    </TR>
+<% } %>
+  </TABLE>
+  <BR>
+  <INPUT TYPE="submit" NAME="submit" VALUE="Submit">
+</FORM>
+</BODY>
 </HTML>
-END
-%>
+
diff --git a/httemplate/index.html b/httemplate/index.html
index e8c3681b4..d13649b07 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -194,12 +194,16 @@
               into counties and assign different tax rates to each.
           <LI><A HREF="browse/svc_acct_pop.cgi">View/Edit Access Numbers</A>
             - Points of Presence 
-          <LI><A HREF="browse/ac_type.cgi">View/Edit AC Types</A>
-            - Broadband service access concentrator types.
-          <LI><A HREF="browse/ac.cgi">View/Edit AC</A>
-            - Broadband service access concentrators.
           <LI><A HREF="browse/part_bill_event.cgi">View/Edit invoice events</A> - Actions for overdue invoices
-          <LI><A HREF="browse/msgcat.cgi">View/Edit message catalog</A> - Change error messages and other customizable labels.
+	  <LI><A HREF="browse/msgcat.cgi">View/Edit message catalog</A> - Change error messages and other customizable labels.
+	  <LI><A HREF="browse/part_sb_field.cgi">View/Edit custom svc_broadband fields</A>
+	  - Custom broadband service fields for site-specific export/informational data.
+	  <LI><A HREF="browse/generic.cgi?part_router_field">View/Edit custom router fields</A>
+	  - Custom router fields for site-specific export data.
+	  <LI><A HREF="browse/router.cgi">View/Edit routers</A>
+	  - Broadband access routers
+	  <LI><A HREF="browse/addr_block.cgi">View/Edit address blocks</A>
+	  - Manage address blocks and block assignments to broadband routers.
         </ul>
         <BR>
       </TD></TR>
diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index 156edfaec..164b5b22c 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -20,28 +20,26 @@ if ($pkgnum) {
 }
 #eofalse
 
-my $ac = qsearchs('ac', { acnum => $svc_broadband->getfield('acnum') });
+my $router = $svc_broadband->addr_block->router;
+
+if (not $router) { die "Could not lookup router for svc_broadband (svcnum $svcnum)" };
 
 my (
-     $acname,
-     $acnum,
+     $routername,
+     $routernum,
      $speed_down,
      $speed_up,
-     $ip_addr,
-     $ip_netmask,
-     $mac_addr,
-     $location
+     $ip_addr
    ) = (
-     $ac->getfield('acname'),
-     $ac->getfield('acnum'),
+     $router->getfield('routername'),
+     $router->getfield('routernum'),
      $svc_broadband->getfield('speed_down'),
      $svc_broadband->getfield('speed_up'),
-     $svc_broadband->getfield('ip_addr'),
-     $svc_broadband->getfield('ip_netmask'),
-     $svc_broadband->getfield('mac_addr'),
-     $svc_broadband->getfield('location')
+     $svc_broadband->getfield('ip_addr')
    );
 
+
+
 print header('Broadband Service View', menubar(
   ( ( $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
@@ -56,20 +54,38 @@ print header('Broadband Service View', menubar(
       ntable("#cccccc"). '<TR><TD>'. ntable("#cccccc",2).
       qq!<TR><TD ALIGN="right">Service number</TD>!.
         qq!<TD BGCOLOR="#ffffff">$svcnum</TD></TR>!.
-      qq!<TR><TD ALIGN="right">AC</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$acnum: $acname</TD></TR>!.
+      qq!<TR><TD ALIGN="right">Router</TD>!.
+        qq!<TD BGCOLOR="#ffffff">$routernum: $routername</TD></TR>!.
       qq!<TR><TD ALIGN="right">Download Speed</TD>!.
         qq!<TD BGCOLOR="#ffffff">$speed_down</TD></TR>!.
       qq!<TR><TD ALIGN="right">Upload Speed</TD>!.
         qq!<TD BGCOLOR="#ffffff">$speed_up</TD></TR>!.
-      qq!<TR><TD ALIGN="right">IP Address/Mask</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$ip_addr/$ip_netmask</TD></TR>!.
-      qq!<TR><TD ALIGN="right">MAC Address</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$mac_addr</TD></TR>!.
-      qq!<TR><TD ALIGN="right" VALIGN="TOP">Location</TD>!.
-        qq!<TD BGCOLOR="#ffffff"><PRE>$location</PRE></TD></TR>!.
-      '</TABLE></TD></TR></TABLE>'.
-      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
+      qq!<TR><TD ALIGN="right">IP Address</TD>!.
+        qq!<TD BGCOLOR="#ffffff">$ip_addr</TD></TR>!.
+      '</TD></TR><TR ROWSPAN="1"><TD></TD></TR>';
+
+
+#  foreach my $sb_field 
+#      ( qsearch('sb_field', { svcnum => $svcnum }) ) {
+#    my $part_sb_field = qsearchs('part_sb_field',
+#                         { sbfieldpart => $sb_field->sbfieldpart });
+#    print q!<TR><TD ALIGN="right">! . $part_sb_field->name . 
+#          q!</TD><TD BGCOLOR="#ffffff">! . $sb_field->value . 
+#          q!</TD></TR>!;
+#  }
+#  print '</TABLE>';
+
+
+  my $sb_field = $svc_broadband->sb_field_hashref;
+  foreach (sort { $a cmp $b } keys(%{$sb_field})) {
+    print q!<TR><TD ALIGN="right">! . $_ . 
+          q!</TD><TD BGCOLOR="#ffffff">! . $sb_field->{$_} .
+          q!</TD></TR>!;
+  }
+  print '</TABLE>';
+
+
+print '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
       '</BODY></HTML>'
 ;
 %>
-- 
cgit v1.2.1


From 6e2dcb26245ef419438f60e99c91873a8d762625 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 5 Feb 2003 23:23:00 +0000
Subject: svc_broadband rewrite

---
 FS/FS/ac.pm                               | 148 ---------------------------
 FS/FS/ac_block.pm                         | 148 ---------------------------
 FS/FS/ac_field.pm                         | 138 -------------------------
 FS/FS/ac_type.pm                          | 128 -----------------------
 FS/FS/part_ac_field.pm                    | 102 -------------------
 httemplate/browse/ac.cgi                  |  57 -----------
 httemplate/browse/ac_type.cgi             |  47 ---------
 httemplate/edit/ac.cgi                    | 163 ------------------------------
 httemplate/edit/ac_type.cgi               | 106 -------------------
 httemplate/edit/process/ac.cgi            |  28 -----
 httemplate/edit/process/ac_block.cgi      |  21 ----
 httemplate/edit/process/ac_field.cgi      |  21 ----
 httemplate/edit/process/ac_type.cgi       |  28 -----
 httemplate/edit/process/part_ac_field.cgi |  21 ----
 14 files changed, 1156 deletions(-)
 delete mode 100644 FS/FS/ac.pm
 delete mode 100755 FS/FS/ac_block.pm
 delete mode 100755 FS/FS/ac_field.pm
 delete mode 100755 FS/FS/ac_type.pm
 delete mode 100755 FS/FS/part_ac_field.pm
 delete mode 100755 httemplate/browse/ac.cgi
 delete mode 100755 httemplate/browse/ac_type.cgi
 delete mode 100755 httemplate/edit/ac.cgi
 delete mode 100755 httemplate/edit/ac_type.cgi
 delete mode 100755 httemplate/edit/process/ac.cgi
 delete mode 100755 httemplate/edit/process/ac_block.cgi
 delete mode 100755 httemplate/edit/process/ac_field.cgi
 delete mode 100755 httemplate/edit/process/ac_type.cgi
 delete mode 100755 httemplate/edit/process/part_ac_field.cgi

diff --git a/FS/FS/ac.pm b/FS/FS/ac.pm
deleted file mode 100644
index 5a2b36079..000000000
--- a/FS/FS/ac.pm
+++ /dev/null
@@ -1,148 +0,0 @@
-package FS::ac;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs qsearch );
-use FS::ac_type;
-use FS::ac_block;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::ac - Object methods for ac records
-
-=head1 SYNOPSIS
-
-  use FS::ac;
-
-  $record = new FS::ac \%hash;
-  $record = new FS::ac { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::ac record describes a broadband Access Concentrator, such as a DSLAM
-or a wireless access point.  FS::ac inherits from FS::Record.  The following 
-fields are currently supported:
-
-narf
-
-=over 4
-
-=item acnum - primary key
-
-=item actypenum - AC type, see L<FS::ac_type>
-
-=item acname - descriptive name for the AC
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Create a new record.  To add the record to the database, see L<"insert">.
-
-=cut
-
-sub table { 'ac'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error =
-    $self->ut_numbern('acnum')
-    || $self->ut_number('actypenum')
-    || $self->ut_text('acname');
-  return $error if $error;
-
-  return "Unknown actypenum"
-    unless $self->ac_type;
-  '';
-}
-
-=item ac_type
-
-Returns the L<FS::ac_type> object corresponding to this object.
-
-=cut
-
-sub ac_type {
-  my $self = shift;
-  return qsearchs('ac_type', { actypenum => $self->actypenum });
-}
-
-=item ac_block
-
-Returns a list of L<FS::ac_block> objects (address blocks) associated
-with this object.
-
-=cut
-
-sub ac_block {
-  my $self = shift;
-  return qsearch('ac_block', { acnum => $self->acnum });
-}
-
-=item ac_field
-
-Returns a hash of L<FS::ac_field> objects assigned to this object.
-
-=cut
-
-sub ac_field {
-  my $self = shift;
-
-  return qsearch('ac_field', { acnum => $self->acnum });
-}
-
-=back
-
-=head1 VERSION
-
-$Id:
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::svc_broadband>, L<FS::ac>, L<FS::ac_block>, L<FS::ac_field>,  schema.html
-from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/ac_block.pm b/FS/FS/ac_block.pm
deleted file mode 100755
index 09de6a4d8..000000000
--- a/FS/FS/ac_block.pm
+++ /dev/null
@@ -1,148 +0,0 @@
-package FS::ac_block;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs qsearch );
-use FS::ac_type;
-use FS::ac;
-use FS::svc_broadband;
-use NetAddr::IP;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::ac - Object methods for ac records
-
-=head1 SYNOPSIS
-
-  use FS::ac_block;
-
-  $record = new FS::ac_block \%hash;
-  $record = new FS::ac_block { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::ac_block record describes an address block assigned for broadband 
-access.  FS::ac_block inherits from FS::Record.  The following fields are 
-currently supported:
-
-=over 4
-
-=item acnum - the access concentrator (see L<FS::ac_type>) to which this 
-block is assigned.
-
-=item ip_gateway - the gateway address used by customers within this block.  
-This functions as the primary key.
-
-=item ip_netmask - the netmask of the block, expressed as an integer.
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Create a new record.  To add the record to the database, see L<"insert">.
-
-=cut
-
-sub table { 'ac_block'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my $error =
-    $self->ut_number('acnum')
-    || $self->ut_ip('ip_gateway')
-    || $self->ut_number('ip_netmask')
-  ;
-  return $error if $error;
-
-  return "Unknown acnum"
-    unless $self->ac;
-
-  my $self_addr = new NetAddr::IP ($self->ip_gateway, $self->ip_netmask);
-  return "Cannot parse address: ". $self->ip_gateway . '/' . $self->ip_netmask
-    unless $self_addr;
-
-  my @block = grep {
-    my $block_addr = new NetAddr::IP ($_->ip_gateway, $_->ip_netmask);
-    if($block_addr->contains($self_addr) 
-    or $self_addr->contains($block_addr)) { $_; };
-  } qsearch( 'ac_block', {});
-
-  foreach(@block) {
-    return "Block intersects existing block ".$_->ip_gateway."/".$_->ip_netmask;
-  }
-
-  '';
-}
-
-
-=item ac
-
-Returns the L<FS::ac> object corresponding to this object.
-
-=cut
-
-sub ac {
-  my $self = shift;
-  return qsearchs('ac', { acnum => $self->acnum });
-}
-
-=item svc_broadband
-
-Returns a list of L<FS::svc_broadband> objects associated
-with this object.
-
-=cut
-
-#sub svc_broadband {
-#  my $self = shift;
-#  my @svc = qsearch('svc_broadband', { actypenum => $self->ac->ac_type->actypenum });
-#  return grep { 
-#    my $svc_addr = new NetAddr::IP($_->ip_addr, $_->ip_netmask);
-#    $self_addr->contains($svc_addr);
-#  } @svc;
-#}
-
-=back
-
-=cut
-
-1;
-
diff --git a/FS/FS/ac_field.pm b/FS/FS/ac_field.pm
deleted file mode 100755
index f6011192f..000000000
--- a/FS/FS/ac_field.pm
+++ /dev/null
@@ -1,138 +0,0 @@
-package FS::ac_field;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs );
-use FS::part_ac_field;
-use FS::ac;
-
-use UNIVERSAL qw( can );
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::ac_field - Object methods for ac_field records
-
-=head1 SYNOPSIS
-
-  use FS::ac_field;
-
-  $record = new FS::ac_field \%hash;
-  $record = new FS::ac_field { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-L<FS::ac_field> contains values of fields defined by L<FS::part_ac_field>
-for an L<FS::ac>.  Values must be of the data type defined by ut_type in
-L<FS::part_ac_field>.
-Supported fields as follows:
-
-=over 4
-
-=item acfieldpart - Type of ac_field as defined by L<FS::part_ac_field>
-
-=item acnum - The L<FS::ac> to which this value belongs.
-
-=item value - The contents of the field.
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Create a new record.  To add the record to the database, see L<"insert">.
-
-=cut
-
-sub table { 'ac_field'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  return "acnum must be defined" unless $self->acnum;
-  return "acfieldpart must be defined" unless $self->acfieldpart;
-
-  my $ut_func = $self->can("ut_" . $self->part_ac_field->ut_type);
-  my $error = $self->$ut_func('value');
-
-  return $error if $error;
-
-  ''; #no error
-}
-
-=item part_ac_field
-
-Returns a reference to the L<FS:part_ac_field> that defines this L<FS::ac_field>
-
-=cut
-
-sub part_ac_field {
-  my $self = shift;
-
-  return qsearchs('part_ac_field', { acfieldpart => $self->acfieldpart });
-}
-
-=item ac
-
-Returns a reference to the L<FS::ac> to which this L<FS::ac_field> belongs.
-
-=cut
-
-sub ac {
-  my $self = shift;
-
-  return qsearchs('ac', { acnum => $self->acnum });
-}
-
-=back
-
-=head1 VERSION
-
-$Id: 
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::svc_broadband>, L<FS::ac>, L<FS::ac_block>, L<FS::ac_field>,  schema.html
-from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/ac_type.pm b/FS/FS/ac_type.pm
deleted file mode 100755
index e83c5c5f0..000000000
--- a/FS/FS/ac_type.pm
+++ /dev/null
@@ -1,128 +0,0 @@
-package FS::ac_type;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs );
-use FS::ac;
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::ac_type - Object methods for ac_type records
-
-=head1 SYNOPSIS
-
-  use FS::ac_type;
-
-  $record = new FS::ac_type \%hash;
-  $record = new FS::ac_type { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-L<FS::ac_type> refers to a type of access concentrator.  L<FS::svc_broadband>
-records refer to a specific L<FS::ac_type> limiting the choice of access
-concentrator to one of the chosen type.  This should be set as a fixed
-default in part_svc to prevent provisioning the wrong type of service for
-a given package or service type.  Supported fields as follows:
-
-=over 4
-
-=item actypenum - Primary key.  see L<FS::ac>
-
-=item actypename - Text identifier for access concentrator type.
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Create a new record.  To add the record to the database, see L<"insert">.
-
-=cut
-
-sub table { 'ac_type'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  # What do we check?
-
-  ''; #no error
-}
-
-=item ac
-
-Returns a list of all L<FS::ac> records of this type.
-
-=cut
-
-sub ac {
-  my $self = shift;
-
-  return qsearch('ac', { actypenum => $self->actypenum });
-}
-
-=item part_ac_field
-
-Returns a list of all L<FS::part_ac_field> records of this type.
-
-=cut
-
-sub part_ac_field {
-  my $self = shift;
-
-  return qsearch('part_ac_field', { actypenum => $self->actypenum });
-}
-
-=back
-
-=head1 VERSION
-
-$Id: 
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::svc_broadband>, L<FS::ac>, L<FS::ac_block>, L<FS::ac_field>,  schema.html
-from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/part_ac_field.pm b/FS/FS/part_ac_field.pm
deleted file mode 100755
index dcb445253..000000000
--- a/FS/FS/part_ac_field.pm
+++ /dev/null
@@ -1,102 +0,0 @@
-package FS::part_ac_field;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs );
-use FS::ac_field;
-use FS::ac;
-
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::part_ac_field - Object methods for part_ac_field records
-
-=head1 SYNOPSIS
-
-  use FS::part_ac_field;
-
-  $record = new FS::part_ac_field \%hash;
-  $record = new FS::part_ac_field { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-
-=over 4
-
-=item blank
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Create a new record.  To add the record to the database, see L<"insert">.
-
-=cut
-
-sub table { 'part_ac_field'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-  my $error = '';
-
-  $self->name =~ /^([a-z0-9_\-\.]{1,15})$/i
-    or return "Invalid field name for part_ac_field";
-
-  ''; #no error
-}
-
-
-=back
-
-=head1 VERSION
-
-$Id: 
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::svc_broadband>, L<FS::ac>, L<FS::ac_block>, L<FS::ac_field>,  schema.html
-from the base documentation.
-
-=cut
-
-1;
-
diff --git a/httemplate/browse/ac.cgi b/httemplate/browse/ac.cgi
deleted file mode 100755
index 0ae138d3b..000000000
--- a/httemplate/browse/ac.cgi
+++ /dev/null
@@ -1,57 +0,0 @@
-<!-- mason kludge -->
-<%= header('Access Concentrator Listing', menubar(
-  'Main Menu'   => $p,
-  'Access Concentrator Types' => $p. 'browse/ac_type.cgi',
-)) %>
-<BR>
-<A HREF="<%= $p %>edit/ac.cgi"><I>Add a new Access Concentrator</I></A><BR><BR>
-
-<%= table() %>
-<TR>
-  <TH COLSPAN=2>AC</TH>
-  <TH>AC Type</TH>
-  <TH>Fields</TH>
-  <TH>Network/Mask</TH>
-</TR>
-<% 
-
-foreach my $ac ( qsearch('ac',{}) ) {
-  my($hashref)=$ac->hashref;
-  my($actypenum)=$hashref->{actypenum};
-  my($ac_type)=qsearchs('ac_type',{'actypenum'=>$actypenum});
-  my($actypename)=$ac_type->getfield('actypename');
-  print <<END;
-      <TR>
-        <TD><A HREF="${p}edit/ac.cgi?$hashref->{acnum}">
-          $hashref->{acnum}</A></TD>
-        <TD><A HREF="${p}edit/ac.cgi?$hashref->{acnum}">
-          $hashref->{acname}</A></TD>
-        <TD><A HREF="${p}edit/ac_type.cgi?$actypenum">$actypename</A></TD>
-        <TD>
-END
-
-  foreach my $ac_field ( qsearch('ac_field', { acnum => $hashref->{acnum} }) ) {
-    my $part_ac_field = qsearchs('part_ac_field',
-                         { acfieldpart => $ac_field->getfield('acfieldpart') });
-    print $part_ac_field->getfield('name') . ' ';
-    print $ac_field->getfield('value') . '<BR>';
-  }
-  print '</TD><TD>';
-
-  foreach (qsearch('ac_block', { acnum => $hashref->{acnum} })) {
-    my $net_addr = new NetAddr::IP($_->getfield('ip_gateway'),
-                                   $_->getfield('ip_netmask'));
-    print $net_addr->network->addr . '/' . $net_addr->network->mask . '<BR>';
-  }
-
-  print "<TR>\n";
-
-}
-
-print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/browse/ac_type.cgi b/httemplate/browse/ac_type.cgi
deleted file mode 100755
index 0ad8271d3..000000000
--- a/httemplate/browse/ac_type.cgi
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- mason kludge -->
-<%
-
-print header('Access Concentrator Types', menubar(
-  'Main Menu' => $p,
-  'Access Concentrators' => $p. 'browse/ac.cgi',
-)) %>
-<BR>
-<A HREF="<%= $p %>edit/ac_type.cgi"><I>Add new AC Type</I></A><BR><BR>
-<%= table() %>
-      <TR>
-        <TH></TH>
-        <TH>Type</TH>
-        <TH>Fields</TH>
-      </TR>
-
-<%
-foreach my $ac_type ( qsearch('ac_type',{}) ) {
-  my($hashref)=$ac_type->hashref;
-  print <<END;
-      <TR>
-        <TD><A HREF="${p}edit/ac_type.cgi?$hashref->{actypenum}">
-          $hashref->{actypenum}</A></TD>
-        <TD><A HREF="${p}edit/ac_type.cgi?$hashref->{actypenum}">
-          $hashref->{actypename}</A></TD>
-        <TD>
-END
-
-  foreach ( qsearch('part_ac_field', { actypenum => $hashref->{actypenum} }) ) {
-    my ($part_ac_field) = $_->hashref;
-    print $part_ac_field->{'name'} .
-          ' (' . $part_ac_field->{'ut_type'} . ')<BR>';
-  }
-
-}
-
-print <<END;
-       </TD>
-      </TR>
-      <TR>
-      </TR>
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/edit/ac.cgi b/httemplate/edit/ac.cgi
deleted file mode 100755
index 86b05a4a1..000000000
--- a/httemplate/edit/ac.cgi
+++ /dev/null
@@ -1,163 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my($ac);
-if ( $cgi->param('error') ) {
-  $ac = new FS::ac ( {
-    map { $_, scalar($cgi->param($_)) } fields('ac')
-  } );
-} elsif ( $cgi->keywords ) { #editing
-  my( $query ) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $ac=qsearchs('ac',{'acnum'=>$1});
-} else { #adding
-  $ac = new FS::ac {};
-}
-my $action = $ac->acnum ? 'Edit' : 'Add';
-my $hashref = $ac->hashref;
-
-print header("$action Access Concentrator", menubar(
-  'Main Menu' => "$p",
-  'View all access concentrators' => "${p}browse/ac.cgi",
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print '<FORM ACTION="', popurl(1), 'process/ac.cgi" METHOD=POST>',
-      qq!<INPUT TYPE="hidden" NAME="acnum" VALUE="$hashref->{acnum}">!,
-      "Access Concentrator #", $hashref->{acnum} ? $hashref->{acnum} : "(NEW)";
-
-print <<END;
-
-<TABLE COLOR="#cccccc">
-  <TR>
-    <TH ALIGN="RIGHT">Access Concentrator</TH>
-    <TD>
-      <INPUT TYPE="text" NAME="acname" SIZE=15 VALUE="$hashref->{acname}">
-    </TD>
-  </TD>
-END
-
-
-if (! $ac->acnum) {
-  print <<END;
-  <TR>
-    <TH ALIGN="RIGHT">Access Concentrator Type</TH>
-    <TD><SELECT NAME="actypenum" SIZE="1"><OPTION VALUE=""></OPTION>
-END
-
-  foreach (qsearch('ac_type', {})) {
-    my $narf = $_->hashref;
-    print qq!<OPTION! .
-          ($narf->{actypenum} eq $hashref->{actypenum} ? ' SELECTED' : '') .
-          qq! VALUE="$narf->{actypenum}">$narf->{actypenum}: $narf->{actypename}! .
-          qq!</OPTION>!;
-  }
-
-  print '</TD></TR></TABLE>';
-} else {
-  print '</TABLE>';
-  print qq!<INPUT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">!;
-}
-
-print qq!</TABLE><BR><BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{acnum} ? "Apply changes" : "Add access concentrator",
-      qq!"></FORM>!;
-
-if ($hashref->{acnum}) {
-  print table();
-  print <<END;
-    Additional Fields:<BR>
-    <TH>
-      <TD>Field Name</TD>
-      <TD COLSPAN=2>Field Value</TD>
-    </TH>
-END
-
-  #my @ac_fields = qsearch('ac_field', { acnum => $hashref->{acnum} });
-  my @ac_fields = $ac->ac_field;
-  foreach (@ac_fields) {
-    print qq!\n<TR><TD></TD>!;
-    my $part_ac_field = qsearchs('part_ac_field',
-                          { acfieldpart => $_->getfield('acfieldpart') });
-    print '<TD>' . $part_ac_field->getfield('name') .
-          '</TD><TD>' . $_->getfield('value') . '</TD></TR>';
-    print "\n";
-  }
-
-  print '<FORM ACTION="', popurl(1), 'process/ac_field.cgi" METHOD=POST>';
-  print <<END;
-    <TR>
-      <TD><INPUT TYPE="hidden" NAME="acnum" VALUE="$hashref->{acnum}">
-          <INPUT TYPE="hidden" NAME="acname" VALUE="$hashref->{acname}">
-          <INPuT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">
-          <SMALL>(NEW)</SMALL>
-      </TD>
-      <TD><SELECT NAME="acfieldpart"><OPTION></OPTION>
-END
-
-  my @part_ac_fields = qsearch('part_ac_field',
-                         { actypenum => $hashref->{actypenum} });
-  foreach my $part_ac_field (@part_ac_fields) {
-    my $acfieldpart = $part_ac_field->getfield('acfieldpart');
-    if (grep {$_->getfield('acfieldpart') eq $acfieldpart} @ac_fields) {next;}
-    print qq!<OPTION VALUE="${acfieldpart}">! .
-          $part_ac_field->getfield('name') . '</OPTION>';
-  }
-
-  print <<END;
-        </SELECT>
-      </TD>
-      <TD><INPUT TYPE="text" SIZE="15" NAME="value"></TD>
-      <TD><INPUT TYPE="submit" VALUE="Add"></TD>
-    </TR>
-    </FORM>
-  </TABLE>
-END
-
-}
-
-if ($hashref->{acnum}) {
-
-  print qq!<BR><BR>IP Address Blocks:<BR>! . table() .
-        qq!<TR><TH></TH><TH>Network/Mask</TH>! .
-        qq!<TH>Gateway Address</TH><TH>Mask length</TH></TR>\n!;
-
-  foreach (qsearch('ac_block', { acnum => $hashref->{acnum} })) {
-    my $ip_addr = new NetAddr::IP($_->getfield('ip_gateway'),
-                                  $_->getfield('ip_netmask'));
-    print qq!<TR><TD></TD><TD>! . $ip_addr->network->addr() . '/' .
-          $ip_addr->network->mask() . qq!</TD>!;
-
-    print qq!<TD>! . $_->getfield('ip_gateway') . qq!</TD>\n! .
-          qq!<TD>! . $_->getfield('ip_netmask') . qq!</TD></TR>!;
-
-  }
-
-  print '<FORM ACTION="', popurl(1), 'process/ac_block.cgi" METHOD=POST>';
-  print <<END;
-  <TR>
-    <TD><INPUT TYPE="hidden" NAME="acnum" VALUE="$hashref->{acnum}">
-        <INPUT TYPE="hidden" NAME="acname" VALUE="$hashref->{acname}">
-        <INPuT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">
-       <SMALL>(NEW)</SMALL>
-    </TD>
-    <TD></TD>
-    <TD><INPUT TYPE="text" NAME="ip_gateway" SIZE="15"></TD>
-    <TD><INPUT TYPE="text" NAME="ip_netmask" SIZE="2"></TD>
-    <TD><INPUT TYPE="submit" VALUE="Add"></TD>
-  </TR>
-  </FORM>
-</TABLE>
-END
-
-}
-
-print <<END;
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/edit/ac_type.cgi b/httemplate/edit/ac_type.cgi
deleted file mode 100755
index ccc3d579c..000000000
--- a/httemplate/edit/ac_type.cgi
+++ /dev/null
@@ -1,106 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $ac_type;
-if ( $cgi->param('error') ) {
-  $ac_type = new FS::ac_type ( {
-    map { $_, scalar($cgi->param($_)) } fields('ac_type')
-  } );
-} elsif ( $cgi->keywords ) { #editing
-  my($query)=$cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $ac_type=qsearchs('ac_type',{'actypenum'=>$1});
-} else { #adding
-  $ac_type = new FS::ac_type {};
-}
-my $action = $ac_type->actypenum ? 'Edit' : 'Add';
-my $hashref = $ac_type->hashref;
-
-my @ut_types = qw( float number text alpha anything ip domain );
-
-my $p1 = popurl(1);
-print header("$action Access Concentrator Type", menubar(
-  'Main Menu' => popurl(2),
-  'View all Access Concentrator types' => popurl(2). "browse/ac_type.cgi",
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print qq!<FORM ACTION="${p1}process/ac_type.cgi" METHOD=POST>!;
-
-#display
-
-print qq!<INPUT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">!,
-      "AC Type #", $hashref->{actypenum} ? $hashref->{actypenum} : "(NEW)";
-
-print <<TROZ;
-<PRE>
-AC Type Name <INPUT TYPE="text" NAME="actypename" SIZE=15 VALUE="$hashref->{actypename}">
-</PRE>
-
-TROZ
-
-print qq!<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{actypenum} ? "Apply changes" : "Add AC Type",
-      qq!"></FORM>!;
-
-
-if ($hashref->{actypenum}) {
-  print qq!   <BR>Available fields:<BR>! .  table();
-
-  print qq!    <TH><TD>Field name</TD><TD>Field type</TD><TD></TD></TH>!;
-
-  my @part_ac_field = qsearch ( 'part_ac_field',
-                                { actypenum => $hashref->{actypenum} } );
-  foreach ( @part_ac_field ) {
-    my $pf_hashref = $_->hashref;
-    print <<END;
-      <TR>
-        <TD>$pf_hashref->{acfieldpart}</TD>
-        <TD>$pf_hashref->{name}</TD>
-        <TD>$pf_hashref->{ut_type}</TD>
-      </TR>
-END
-  }
-
-  my $name, $ut_type = '';
-  if ($cgi->param('error')) {
-    $name = $cgi->param('name');
-    $ut_type = $cgi->param('ut_type');
-  }
-
-  print <<END;
-      <FORM ACTION="${p1}process/part_ac_field.cgi" METHOD=GET>
-      <TR>
-       <TD><SMALL>(NEW)</SMALL>
-         <INPUT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">
-       </TD>
-       <TD>
-         <INPUT TYPE="text" NAME="name" VALUE="${name}">
-       </TD>
-       <TD>
-         <SELECT NAME="ut_type" SIZE=1><OPTION>
-END
-
-  foreach ( @ut_types ) {
-    print qq!<OPTION! . ($ut_type ? " SELECTED>$_" : ">$_");
-  }
-
-  print <<END;
-        </SELECT>
-      </TD>
-      <TD><INPUT TYPE="submit" VALUE="Add"></TD>
-    </TR>
-    </FORM>
-  </TABLE>
-END
-
-}
-
-%>
-
- </BODY>
-</HTML>
-
diff --git a/httemplate/edit/process/ac.cgi b/httemplate/edit/process/ac.cgi
deleted file mode 100755
index fc434a807..000000000
--- a/httemplate/edit/process/ac.cgi
+++ /dev/null
@@ -1,28 +0,0 @@
-<%
-
-my $acnum = $cgi->param('acnum');
-
-my $old = qsearchs('ac',{'acnum'=>$acnum}) if $acnum;
-
-my $new = new FS::ac ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('ac')
-} );
-
-my $error = '';
-if ( $acnum ) {
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-  $acnum=$new->getfield('acnum');
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "browse/ac.cgi");
-}
-
-%>
diff --git a/httemplate/edit/process/ac_block.cgi b/httemplate/edit/process/ac_block.cgi
deleted file mode 100755
index b1c3c726b..000000000
--- a/httemplate/edit/process/ac_block.cgi
+++ /dev/null
@@ -1,21 +0,0 @@
-<%
-
-my $new = new FS::ac_block ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('ac_block')
-} );
-
-my $error = '';
-$error = $new->check;
-
-unless ( $error ) { $error = $new->insert; }
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->param('acnum'));
-}
-
-%>
diff --git a/httemplate/edit/process/ac_field.cgi b/httemplate/edit/process/ac_field.cgi
deleted file mode 100755
index 2bfe3312f..000000000
--- a/httemplate/edit/process/ac_field.cgi
+++ /dev/null
@@ -1,21 +0,0 @@
-<%
-
-my $new = new FS::ac_field ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('ac_field')
-} );
-
-my $error = '';
-$error = $new->check;
-
-unless ( $error ) { $error = $new->insert; }
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->param('acnum'));
-}
-
-%>
diff --git a/httemplate/edit/process/ac_type.cgi b/httemplate/edit/process/ac_type.cgi
deleted file mode 100755
index ca232ba58..000000000
--- a/httemplate/edit/process/ac_type.cgi
+++ /dev/null
@@ -1,28 +0,0 @@
-<%
-
-my $actypenum = $cgi->param('actypenum');
-
-my $old = qsearchs('ac_type',{'actypenum'=>$actypenum}) if $actypenum;
-
-my $new = new FS::ac_type ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('ac_type')
-} );
-
-my $error = '';
-if ( $actypenum ) {
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-  $actypenum=$new->getfield('actypenum');
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "ac_type.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "browse/ac_type.cgi");
-}
-
-%>
diff --git a/httemplate/edit/process/part_ac_field.cgi b/httemplate/edit/process/part_ac_field.cgi
deleted file mode 100755
index 38ad586f7..000000000
--- a/httemplate/edit/process/part_ac_field.cgi
+++ /dev/null
@@ -1,21 +0,0 @@
-<%
-
-my $new = new FS::part_ac_field ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('part_ac_field')
-} );
-
-my $error = '';
-$error = $new->check;
-
-unless ( $error ) { $error = $new->insert; }
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "ac_type.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(2). "ac_type.cgi?". $cgi->param('actypenum'));
-}
-
-%>
-- 
cgit v1.2.1


From c232fac0743999105f6948b9fa352fe2293b09f8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Feb 2003 05:26:50 +0000
Subject: time/data detail on invoices

---
 FS/FS.pm                       |   2 +
 FS/FS/cust_bill.pm             |  41 +++++++-------
 FS/FS/cust_bill_pkg.pm         |  67 ++++++++++++++++++++--
 FS/FS/cust_bill_pkg_detail.pm  | 123 +++++++++++++++++++++++++++++++++++++++++
 FS/FS/cust_main.pm             |  13 +++--
 FS/MANIFEST                    |   2 +
 FS/bin/freeside-setup          |  12 ++++
 FS/t/cust_bill_pkg_detail.t    |   5 ++
 httemplate/docs/schema.html    |   7 +++
 httemplate/docs/upgrade10.html |  11 ++++
 httemplate/edit/part_pkg.cgi   |   6 +-
 11 files changed, 256 insertions(+), 33 deletions(-)
 create mode 100644 FS/FS/cust_bill_pkg_detail.pm
 create mode 100644 FS/t/cust_bill_pkg_detail.t
 create mode 100644 httemplate/docs/upgrade10.html

diff --git a/FS/FS.pm b/FS/FS.pm
index a2df6f175..e4a32082c 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -102,6 +102,8 @@ L<FS::cust_bill> - Invoice class
 
 L<FS::cust_bill_pkg> - Invoice line item class
 
+L<FS::cust_bill_pkg_detail> - Invoice line item detail class
+
 L<FS::part_bill_event> - Invoice event definition class
 
 L<FS::cust_bill_event> - Completed invoice event class
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index c661baa95..aa82eb6f8 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -953,38 +953,43 @@ sub print_text {
   }
 
   #new charges
-  foreach ( ( grep {   $_->pkgnum } $self->cust_bill_pkg ),  #packages first
-            ( grep { ! $_->pkgnum } $self->cust_bill_pkg ),  #then taxes
+  foreach my $cust_bill_pkg (
+    ( grep {   $_->pkgnum } $self->cust_bill_pkg ),  #packages first
+    ( grep { ! $_->pkgnum } $self->cust_bill_pkg ),  #then taxes
   ) {
 
-    if ( $_->pkgnum ) {
+    if ( $cust_bill_pkg->pkgnum ) {
 
-      my($cust_pkg)=qsearchs('cust_pkg', { 'pkgnum', $_->pkgnum } );
-      my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->pkgpart});
-      my($pkg)=$part_pkg->pkg;
+      my $cust_pkg = qsearchs('cust_pkg', { pkgnum =>$cust_bill_pkg->pkgnum } );
+      my $part_pkg = qsearchs('part_pkg', { pkgpart=>$cust_pkg->pkgpart } );
+      my $pkg = $part_pkg->pkg;
 
-      if ( $_->setup != 0 ) {
-        push @buf, [ "$pkg Setup", $money_char. sprintf("%10.2f",$_->setup) ];
+      if ( $cust_bill_pkg->setup != 0 ) {
+        push @buf, [ "$pkg Setup",
+                     $money_char. sprintf("%10.2f", $cust_bill_pkg->setup) ];
         push @buf,
           map { [ "  ". $_->[0]. ": ". $_->[1], '' ] } $cust_pkg->labels;
       }
 
-      if ( $_->recur != 0 ) {
+      if ( $cust_bill_pkg->recur != 0 ) {
         push @buf, [
-          "$pkg (" . time2str("%x",$_->sdate) . " - " .
-                                time2str("%x",$_->edate) . ")",
-          $money_char. sprintf("%10.2f",$_->recur)
+          "$pkg (" . time2str("%x", $cust_bill_pkg->sdate) . " - " .
+                                time2str("%x", $cust_bill_pkg->edate) . ")",
+          $money_char. sprintf("%10.2f", $cust_bill_pkg->recur)
         ];
         push @buf,
           map { [ "  ". $_->[0]. ": ". $_->[1], '' ] } $cust_pkg->labels;
       }
 
+      push @buf, map { [ "  $_", '' ] } $cust_bill_pkg->details;
+
     } else { #pkgnum tax
-      my $itemdesc = defined $_->dbdef_table->column('itemdesc')
-                     ? ( $_->itemdesc || 'Tax' )
+      my $itemdesc = defined $cust_bill_pkg->dbdef_table->column('itemdesc')
+                     ? ( $cust_bill_pkg->itemdesc || 'Tax' )
                      : 'Tax';
-      push @buf,[$itemdesc, $money_char. sprintf("%10.2f",$_->setup) ] 
-        if $_->setup != 0;
+      push @buf, [ $itemdesc,
+                   $money_char. sprintf("%10.2f", $cust_bill_pkg->setup) ] 
+        if $cust_bill_pkg->setup != 0;
     }
   }
 
@@ -1128,10 +1133,6 @@ sub print_text {
 
 =back
 
-=head1 VERSION
-
-$Id: cust_bill.pm,v 1.61 2003-01-10 07:41:05 ivan Exp $
-
 =head1 BUGS
 
 The delete method.
diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index 5a1dcd2aa..a6615d05d 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -2,11 +2,12 @@ package FS::cust_bill_pkg;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw( qsearchs );
+use FS::Record qw( qsearch qsearchs dbdef dbh );
 use FS::cust_pkg;
 use FS::cust_bill;
+use FS::cust_bill_pkg_detail;
 
-@ISA = qw(FS::Record );
+@ISA = qw( FS::Record );
 
 =head1 NAME
 
@@ -73,6 +74,51 @@ sub table { 'cust_bill_pkg'; }
 Adds this line item to the database.  If there is an error, returns the error,
 otherwise returns false.
 
+=cut
+
+sub insert {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  unless ( defined dbdef->table('cust_bill_pkg_detail') && $self->get('details') ) {
+    $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+    return '';
+  }
+
+  foreach my $detail ( @{$self->get('details')} ) {
+    my $cust_bill_pkg_detail = new FS::cust_bill_pkg_detail {
+      'pkgnum' => $self->pkgnum,
+      'invnum' => $self->invnum,
+      'detail' => $detail,
+    };
+    $error = $cust_bill_pkg_detail->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+
+}
+
 =item delete
 
 Currently unimplemented.  I don't remove line items because there would then be
@@ -139,11 +185,22 @@ sub cust_pkg {
   qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
 }
 
-=back
+=item details
+
+Returns an array of detail information for the invoice line item.
 
-=head1 VERSION
+=cut
 
-$Id: cust_bill_pkg.pm,v 1.4 2002-09-21 11:17:39 ivan Exp $
+sub details {
+  my $self = shift;
+  return () unless defined dbdef->table('cust_bill_pkg_detail');
+  map { $_->detail }
+    qsearch ( 'cust_bill_pkg_detail', { 'pkgnum' => $self->pkgnum,
+                                        'invnum' => $self->invnum, } );
+    #qsearch ( 'cust_bill_pkg_detail', { 'lineitemnum' => $self->lineitemnum });
+}
+
+=back
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_bill_pkg_detail.pm b/FS/FS/cust_bill_pkg_detail.pm
new file mode 100644
index 000000000..199de439b
--- /dev/null
+++ b/FS/FS/cust_bill_pkg_detail.pm
@@ -0,0 +1,123 @@
+package FS::cust_bill_pkg_detail;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::cust_bill_pkg_detail - Object methods for cust_bill_pkg_detail records
+
+=head1 SYNOPSIS
+
+  use FS::cust_bill_pkg_detail;
+
+  $record = new FS::cust_bill_pkg_detail \%hash;
+  $record = new FS::cust_bill_pkg_detail { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_bill_pkg_detail object represents additional detail information for
+an invoice line item (see L<FS::cust_bill_pkg>).  FS::cust_bill_pkg_detail
+inherits from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item detailnum - primary key
+
+=item pkgnum -
+
+=item invnum -
+
+=item detail - detail description
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new line item detail.  To add the line item detail to the database,
+see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'cust_bill_pkg_detail'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid line item detail.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  $self->ut_numbern('detailnum')
+    || $self->ut_foreign_key('pkgnum', 'cust_pkg', 'pkgnum')
+    || $self->ut_foreign_key('invnum', 'cust_pkg', 'invnum')
+    || $self->ut_text('detail')
+  ;
+
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::cust_bill_pkg>, L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 91ffa451a..807fadbcc 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -947,6 +947,8 @@ sub bill {
     my %hash = $cust_pkg->hash;
     my $old_cust_pkg = new FS::cust_pkg \%hash;
 
+    my @details = ();
+
     # bill setup
     my $setup = 0;
     unless ( $cust_pkg->setup ) {
@@ -1040,11 +1042,12 @@ sub bill {
       }
       if ( $setup > 0 || $recur > 0 ) {
         my $cust_bill_pkg = new FS::cust_bill_pkg ({
-          'pkgnum' => $cust_pkg->pkgnum,
-          'setup'  => $setup,
-          'recur'  => $recur,
-          'sdate'  => $sdate,
-          'edate'  => $cust_pkg->bill,
+          'pkgnum'  => $cust_pkg->pkgnum,
+          'setup'   => $setup,
+          'recur'   => $recur,
+          'sdate'   => $sdate,
+          'edate'   => $cust_pkg->bill,
+          'details' => \@details,
         });
         push @cust_bill_pkg, $cust_bill_pkg;
         $total_setup += $setup;
diff --git a/FS/MANIFEST b/FS/MANIFEST
index b3de623d7..e8b1da7a7 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -51,6 +51,7 @@ FS/agent.pm
 FS/agent_type.pm
 FS/cust_bill.pm
 FS/cust_bill_pkg.pm
+FS/cust_bill_pkg_detail.pm
 FS/cust_credit.pm
 FS/cust_credit_bill.pm
 FS/cust_main.pm
@@ -127,6 +128,7 @@ t/cust_bill.t
 t/cust_bill_event.t
 t/cust_bill_pay.t
 t/cust_bill_pkg.t
+t/cust_bill_pkg_detail.t
 t/cust_credit.t
 t/cust_credit_bill.t
 t/cust_credit_refund.t
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 19483765e..cf009c249 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -421,6 +421,18 @@ sub tables_hash_hack {
       'index' => [ ['invnum'] ],
     },
 
+    'cust_bill_pkg_detail' => {
+      'columns' => [
+        'detailnum', 'serial', '', '',
+        'pkgnum',  'int', '', '',
+        'invnum',  'int', '', '',
+        'detail',  'varchar', '', $char_d,
+      ],
+      'primary_key' => 'detailnum',
+      'unique' => [],
+      'index' => [ [ 'pkgnum', 'invnum' ] ],
+    },
+
     'cust_credit' => {
       'columns' => [
         'crednum',  'serial', '', '',
diff --git a/FS/t/cust_bill_pkg_detail.t b/FS/t/cust_bill_pkg_detail.t
new file mode 100644
index 000000000..ea6e3d125
--- /dev/null
+++ b/FS/t/cust_bill_pkg_detail.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_bill_pkg_detail;
+$loaded=1;
+print "ok 1\n";
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index b4d21f3b9..6522b041a 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -59,6 +59,13 @@
         <li>edate - ending date
         <li>itemdesc - Line item description (currently used only when pkgnum is 0)
       </ul>
+    <li><a name="cust_bill_pkg_detail" href="man/FS/cust_bill_pkg_detail.html">cust_bill_pkg_detail</a> - Invoice line items detail
+      <ul>
+        <li>detailnum - primary key
+        <li>pkgnum -
+        <li>invnum - 
+        <li>detail - Detail description
+      </ul>
     <li><a name="cust_credit" href="man/FS/cust_credit.html">cust_credit</a> - Credits.  The equivalent of a negative <a href="#cust_bill">cust_bill</a> record.
       <ul>
         <li>crednum - primary key
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
new file mode 100644
index 000000000..7aa26f698
--- /dev/null
+++ b/httemplate/docs/upgrade10.html
@@ -0,0 +1,11 @@
+this is very incomplete
+
+CREATE TABLE cust_bill_pkg_detail (
+  detailnum serial,
+  pkgnum int NOT NULL,
+  invnum int NOT NULL,
+  detail varchar(80),
+  PRIMARY KEY (detailnum)
+);
+CREATE INDEX cust_bill_pkg_detail1 ON cust_bill_pkg_detail ( pkgnum, invnum );
+
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 1fd634961..851d3aa4d 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -395,7 +395,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours + \' + what.recur_input_charge.value + \' * $input + \' + what.recur_output_charge.value + \' * $output + \' + what.recur_total_charge.value + \' * $total ;\'',
+    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); push @details, \"Last month\\\'s excess data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\", \"Last month\\\'s excess time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; \' + what.recur_flat.value + \' + $hourscharge + \' + what.recur_input_charge.value + \' * $input + \' + what.recur_output_charge.value + \' * $output + $totalcharge ;\'',
   },
 
 ;
@@ -485,11 +485,11 @@ my $widget = new HTML::Widgets::SelectLayers(
              '<TR><TD>'.
              '<FONT SIZE="1">Setup expression<BR>'.
              '<INPUT TYPE="text" NAME="setup" SIZE="160" VALUE="'.
-               $hashref->{setup}. '" onLoad="fchanged(this)">'.
+               encode_entities($hashref->{setup}). '" onLoad="fchanged(this)">'.
              '</FONT><BR>'.
              '<FONT SIZE="1">Recurring espression<BR>'.
              '<INPUT TYPE="text" NAME="recur" SIZE="160" VALUE="'.
-               $hashref->{recur}. '" onLoad="fchanged(this)">'.
+               encode_entities($hashref->{recur}). '" onLoad="fchanged(this)">'.
              '</FONT>'.
              '</TR></TD>'.
              '</TABLE>';
-- 
cgit v1.2.1


From 2fc87c32cbb509992070b044ed66e2a0e9828a17 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 12 Feb 2003 01:21:50 +0000
Subject: s/;/,/

---
 FS/bin/freeside-setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index cf009c249..b3cdb3384 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -1039,7 +1039,7 @@ sub tables_hash_hack {
       'columns' => [
         'svcpart', 'int', '', '',
 	'routernum', 'int', '', '',
-      ];
+      ],
       'primary_key' => '',
       'unique'      => [],
       'index'       => [],
-- 
cgit v1.2.1


From 7a168617da5f6702422c098d714a11586d7655e9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 25 Feb 2003 05:40:36 +0000
Subject: remove max length on ACH account number

---
 httemplate/edit/cust_main.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 5642604d2..6fc086a12 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -412,7 +412,7 @@ if ( $payby_default eq 'HIDE' ) {
 
   my %paybychecked = (
     'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-    'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+    'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
     'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
-- 
cgit v1.2.1


From 47acc8a99bd1fcdba4fce00e1838926046cd2f81 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 1 Mar 2003 03:15:01 +0000
Subject: change next bill date comparison from < to <=

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 807fadbcc..6331fda6d 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -979,7 +979,7 @@ sub bill {
     my $sdate;
     if ( $part_pkg->getfield('freq') > 0 &&
          ! $cust_pkg->getfield('susp') &&
-         ( $cust_pkg->getfield('bill') || 0 ) < $time
+         ( $cust_pkg->getfield('bill') || 0 ) <= $time
     ) {
       my $recur_prog = $part_pkg->getfield('recur');
       $recur_prog =~ /^(.*)$/ or do {
-- 
cgit v1.2.1


From 97320dbd0747826bc4082a466cfe0ea4e8168628 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Tue, 4 Mar 2003 01:56:10 +0000
Subject: updated for svc_broadband changes

---
 FS/MANIFEST | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/FS/MANIFEST b/FS/MANIFEST
index e8b1da7a7..782286544 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -44,9 +44,6 @@ FS/UI/Gtk.pm
 FS/UI/agent.pm
 FS/UID.pm
 FS/Msgcat.pm
-FS/ac.pm
-FS/ac_block.pm
-FS/ac_type.pm
 FS/agent.pm
 FS/agent_type.pm
 FS/cust_bill.pm
@@ -66,7 +63,6 @@ FS/cust_refund.pm
 FS/cust_credit_refund.pm
 FS/cust_svc.pm
 FS/part_bill_event.pm
-FS/part_ac_field.pm
 FS/export_svc.pm
 FS/part_export.pm
 FS/part_export_option.pm
@@ -93,12 +89,17 @@ FS/part_pop_local.pm
 FS/part_referral.pm
 FS/part_svc.pm
 FS/part_svc_column.pm
+FS/part_router_field.pm
+FS/part_sb_field.pm
+FS/part_svc_router.pm
 FS/pkg_svc.pm
 FS/svc_Common.pm
 FS/svc_acct.pm
 FS/svc_acct_pop.pm
 FS/svc_broadband.pm
 FS/svc_domain.pm
+FS/router.pm
+FS/router_field.pm
 FS/type_pkgs.pm
 FS/nas.pm
 FS/port.pm
@@ -107,6 +108,7 @@ FS/domain_record.pm
 FS/prepay_credit.pm
 FS/svc_www.pm
 FS/svc_forward.pm
+FS/sb_field.pm
 FS/raddb.pm
 FS/radius_usergroup.pm
 FS/queue.pm
-- 
cgit v1.2.1


From 8df8fb820c0cd6559ee6fef3adffaf43df167353 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Mar 2003 10:41:52 +0000
Subject: another pg7.3 fix

---
 httemplate/edit/part_pkg.cgi | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 851d3aa4d..dee356250 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -131,11 +131,12 @@ my $columns = 3;
 my @part_svc = qsearch( 'part_svc', { 'disabled' => '' } );
 foreach my $part_svc ( @part_svc ) {
   my $svcpart = $part_svc->svcpart;
-  my $pkg_svc = qsearchs( 'pkg_svc', {
-    'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
+  my $pkgpart = $cgi->param('clone') || $part_pkg->pkgpart;
+  my $pkg_svc = $pkgpart && qsearchs( 'pkg_svc', {
+    'pkgpart'  => $pkgpart,
     'svcpart'  => $svcpart,
   } ) || new FS::pkg_svc ( {
-    'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
+    'pkgpart'  => $pkgpart,
     'svcpart'  => $svcpart,
     'quantity' => 0,
   });
-- 
cgit v1.2.1


From c174642d32c139d1233597e3fa6a467586207023 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Mar 2003 11:36:51 +0000
Subject: minor meta import webUI updates

---
 httemplate/misc/meta-import.cgi         | 24 +++++++---
 httemplate/misc/process/meta-import.cgi | 82 +++++++++++++--------------------
 2 files changed, 50 insertions(+), 56 deletions(-)

diff --git a/httemplate/misc/meta-import.cgi b/httemplate/misc/meta-import.cgi
index ebd2a7e2f..2f3b7380d 100644
--- a/httemplate/misc/meta-import.cgi
+++ b/httemplate/misc/meta-import.cgi
@@ -1,9 +1,7 @@
 <!-- mason kludge -->
 <%= header('Import') %>
 <FORM ACTION="process/meta-import.cgi" METHOD="post" ENCTYPE="multipart/form-data">
-Import a CSV file containing customer records (zip tar etc).<BR><BR>
-
-##no##Default file format is CSV, with the following field order: <i>cust_pkg.setup, dayphone, first, last, address1, address2, city, state, zip, comments</i><BR><BR>
+Import data from a DBI data source<BR><BR>
 
 <%
   #false laziness with edit/cust_main.cgi
@@ -44,9 +42,23 @@ Import a CSV file containing customer records (zip tar etc).<BR><BR>
 <% } %>
 </SELECT><BR><BR>
 
-    CSV (zip, tar etc) Filename: <INPUT TYPE="file" NAME="csvfile"><BR><BR>
-    <INPUT TYPE="submit" VALUE="Import">
-    </FORM>
+  <table>
+    <tr>
+      <td align="right">DBI data source: </td>
+      <td><INPUT TYPE="text" NAME="data_source"></td>
+    </tr>
+    <tr>
+      <td align="right">DBI username: </td>
+      <td><INPUT TYPE="text" NAME="username"></td>
+    </tr>
+    <tr>
+      <td align="right">DBI password: </td>
+      <td><INPUT TYPE="text" NAME="password"></td>
+    </tr>
+  </table>
+  <INPUT TYPE="submit" VALUE="Import">
+
+  </FORM>
   </BODY>
 <HTML>
 
diff --git a/httemplate/misc/process/meta-import.cgi b/httemplate/misc/process/meta-import.cgi
index 4c3c7d665..9e374b508 100644
--- a/httemplate/misc/process/meta-import.cgi
+++ b/httemplate/misc/process/meta-import.cgi
@@ -1,5 +1,6 @@
 <!-- mason kludge -->
 <%= header('Map tables') %>
+
 <SCRIPT>
 var gSafeOnload = new Array();
 var gSafeOnsubmit = new Array();
@@ -19,65 +20,51 @@ function SafeOnsubmit() {
     gSafeOnsubmit[i]();
 }
 </SCRIPT>
+
 <FORM NAME="OneTrueForm" METHOD="POST" ACTION="meta-import.cgi">
+
 <%
-  #one
-  unless ( $cgi->param('magic') ) {
-
-    #oops, silly
-    #my $fh = $cgi->upload('csvfile');
-    ##warn $cgi;
-    ##warn $fh;
-    #
-    #use Archive::Tar;
-    #$tar = Archive::Tar->new();
-    #$tar->create_archive($fh); #or die $tar->error;
-
-    #haha for now
-    my @files = qw(
-authserv  credtype  dunprev  invoice  pmtdet    product   taxplan
-ccdet     customer  genlog   ledger   pops      pubvars   
-cchist    discplan  glacct   origco   prodcat   recur     users
-credcode  dundet    invline  payment  prodclas  repforms  webserv
-    );
+  #use DBIx::DBSchema;
+  my $schema = new_native DBIx::DBSchema
+                 map { $cgi->param($_) } qw( data_source username password );
+  foreach my $field (qw( data_source username password )) { %>
+    <INPUT TYPE="hidden" NAME=<%= $field %> VALUE="<%= $cgi->param($field) %>">
+  <% }
+
+  my %schema = ();
+  if ( $cgi->param('schema') ) {
+    my $schema_string = $cgi->param('schema');
+    %> <INPUT TYPE="hidden" NAME="schema" VALUE="<%=$schema_string%>"> <%
+    %schema = map { /^\s*(\w+)\s*=>\s*(\w+)\s*$/
+                      or die "guru meditation #420: $_";
+                    ( $1 => $2 );
+                  }
+              split( /\n/, $schema_string );
+  }
+
+  #first page
+  unless ( $cgi->param('magic') ) { %>
 
-    %>
     <INPUT TYPE="hidden" NAME="magic" VALUE="process">
-    <%= hashmaker('schema', \@files, [ grep { ! /^h_/ } dbdef->tables ] ) %>
+    <%= hashmaker('schema', [ $schema->tables ],
+                            [ grep !/^h_/, dbdef->tables ],  ) %>
     <br><INPUT TYPE="submit" VALUE="done">
     <%
 
-  } elsif ( $cgi->param('magic') eq 'process' ) {
+  #second page
+  } elsif ( $cgi->param('magic') eq 'process' ) { %>
 
-    %>
     <INPUT TYPE="hidden" NAME="magic" VALUE="process2">
     <%
 
-    my $schema_string = $cgi->param('schema');
-    %><INPUT TYPE="hidden" NAME="schema" VALUE="<%=$schema_string%>"><%
-    my %schema = map { /^\s*(\w+)\s*=>\s*(\w+)\s*$/
-                         or die "guru meditation #420: $_";
-                       ( $1 => $2 );
-                     }
-                 split( /\n/, $schema_string );
-
-    #*** should be in global.asa/handler.pl like the rest
-    eval 'use Text::CSV_XS;';
-
     foreach my $table ( keys %schema ) {
 
-      my $csv = Text::CSV_XS->new({ 'binary'=>1 });
-      open(FILE,"</home/ivan/intergate/legacy/csvdir/$table")
-        or die "can't /home/ivan/intergate/legacy/csvdir/$table: $!";
-      my $header = lc(<FILE>);
-      close FILE;
-      $csv->parse($header) or die;
-      my @from_columns = $csv->fields;
-
+      my @from_columns = $schema->table($table)->columns;
       my @fs_columns = dbdef->table($schema{$table})->columns;
 
       %>
-      <%= hashmaker($table, \@from_columns, \@fs_columns, $table, $schema{$table} ) %>
+      <%= hashmaker($table, \@from_columns => \@fs_columns,
+                            $table         =>  $schema{$table}, ) %>
       <br><hr><br>
       <%
 
@@ -87,16 +74,11 @@ credcode  dundet    invline  payment  prodclas  repforms  webserv
     <br><INPUT TYPE="submit" VALUE="done">
     <%
 
+  #third (results)
   } elsif ( $cgi->param('magic') eq 'process2' ) {
 
     print "<pre>\n";
-    #false laziness with above
-    my $schema_string = $cgi->param('schema');
-    my %schema = map { /^\s*(\w+)\s*=>\s*(\w+)\s*$/
-                         or die "guru meditation #420: $_";
-                       ( $1 => $2 );
-                     }
-                 split( /\n/, $schema_string );
+
     foreach my $table ( keys %schema ) {
       ( my $spaces = $table ) =~ s/./ /g;
       print "'$table' => { 'table' => '$schema{$table}',\n".
-- 
cgit v1.2.1


From 0857c5465840060a13b93e6c5a15af6ed6476a1f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Mar 2003 11:40:35 +0000
Subject: another pg7.3 fix

---
 FS/FS/svc_domain.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 0d71b2775..3941d6eff 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -382,8 +382,10 @@ sub check {
   $recref->{action} =~ /^(M|N)$/ or return "Illegal action";
   $recref->{action} = $1;
 
-  my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $recref->{catchall} } );
-  return "Unknown catchall" unless $svc_acct || ! $recref->{catchall};
+  if ( $recref->{catchall} ne '' ) {
+    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $recref->{catchall} } );
+    return "Unknown catchall" unless $svc_acct;
+  }
 
   $self->ut_textn('purpose');
 
-- 
cgit v1.2.1


From 6609285a50f6c9110ae8d5a26a767fd895f1e325 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 Mar 2003 00:44:23 +0000
Subject: doc from 1.4 branch

---
 httemplate/docs/upgrade9.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/httemplate/docs/upgrade9.html b/httemplate/docs/upgrade9.html
index da5b643fb..c6afe2b0f 100644
--- a/httemplate/docs/upgrade9.html
+++ b/httemplate/docs/upgrade9.html
@@ -14,6 +14,11 @@
 <pre>
 INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 18, 'daytime', 'en_US', 'Day Phone' );
 INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 19, 'night', 'en_US', 'Night Phone' );
+</pre>
+  <li>Optionally, apply the following changes to your database (performance improvement for large numbers of services or packages):
+<pre>
+CREATE INDEX part_pkg1 ON part_pkg ( disabled );
+CREATE INDEX part_svc1 ON part_svc ( disabled );
 </pre>
   <li>If you want to use ACH (electronic checks), you will need to make changes to your database.  The easiest way to make these changes is to dump your database (with pg_dump), change the payinfo field in the cust_pay, cust_refund, h_cust_pay and h_cust_refund tables from varchar(16) to varchar(80), reload the database from the dump, and run dbdef-create
   <li>Restart Apache and freeside-queued.
-- 
cgit v1.2.1


From 9aec22e5fd00800c6e7952ae5b85cc639d4b1e78 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Mar 2003 03:41:03 +0000
Subject: apache export!

---
 FS/FS/domain_record.pm      |  4 +--
 FS/FS/part_export.pm        | 28 ++++++++++++++++++-
 FS/FS/part_export/apache.pm |  7 +++++
 FS/MANIFEST                 |  1 +
 FS/t/part_export-apache.t   |  5 ++++
 bin/apache.export           | 65 +++++++++++++++++++++++++++++++++++++++++++++
 bin/bind.export             |  7 +----
 bin/bsdshell.export         |  7 +----
 bin/sysvshell.export        |  7 +----
 9 files changed, 110 insertions(+), 21 deletions(-)
 create mode 100644 FS/FS/part_export/apache.pm
 create mode 100644 FS/t/part_export-apache.t
 create mode 100755 bin/apache.export

diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 37cc6c9e8..3297e6bfb 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -261,7 +261,7 @@ sub check {
       or return "Illegal data for PTR record: ". $self->recdata;
     $self->recdata($1);
   } elsif ( $self->rectype eq 'CNAME' ) {
-    $self->recdata =~ /^([a-z0-9\.\-]+)$/i
+    $self->recdata =~ /^([a-z0-9\.\-]+|\@)$/i
       or return "Illegal data for CNAME record: ". $self->recdata;
     $self->recdata($1);
   } elsif ( $self->rectype eq '_mstr' ) {
@@ -313,7 +313,7 @@ sub svc_domain {
 
 =head1 VERSION
 
-$Id: domain_record.pm,v 1.11 2002-06-23 19:16:45 ivan Exp $
+$Id: domain_record.pm,v 1.12 2003-03-20 03:41:03 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index d62bef50d..b46d8439e 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -604,7 +604,7 @@ tie my %shellcommands_withdomain_options, 'Tie::IxHash',
 ;
 
 tie my %www_shellcommands_options, 'Tie::IxHash',
-  'user' => { lable=>'Remote username', default=>'root' },
+  'user' => { label=>'Remote username', default=>'root' },
   'useradd' => { label=>'Insert command',
                  default=>'mkdir /var/www/$zone; chown $username /var/www/$zone; ln -s /var/www/$zone $homedir/$zone',
                },
@@ -616,6 +616,27 @@ tie my %www_shellcommands_options, 'Tie::IxHash',
                 },
 ;
 
+tie my %apache_options, 'Tie::IxHash',
+  'user'       => { label=>'Remote username', default=>'root' },
+  'httpd_conf' => { label=>'httpd.conf snippet location',
+                    default=>'/etc/apache/httpd-freeside.conf', },
+  'template'   => {
+    label   => 'Template',
+    type    => 'textarea',
+    default => <<'END',
+<VirtualHost $domain> #generic
+#<VirtualHost ip.addr> #preferred, http://httpd.apache.org/docs/dns-caveats.html
+DocumentRoot /var/www/$zone
+ServerName $zone
+ServerAlias *.$zone
+#BandWidthModule On
+#LargeFileLimit 4096 12288
+</VirtualHost>
+
+END
+  },
+;
+
 tie my %domain_shellcommands_options, 'Tie::IxHash',
   'user' => { lable=>'Remote username', default=>'root' },
   'useradd' => { label=>'Insert command',
@@ -894,6 +915,11 @@ tie my %ldap_options, 'Tie::IxHash',
       'notes'    => 'Run remote commands via SSH, for virtual web sites.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.',
     },
 
+    'apache' => {
+      'desc' => 'Export an Apache httpd.conf file snippet.',
+      'options' => \%apache_options,
+      'notes' => 'Batch export of an httpd.conf snippet from a template.  Typically used with something like <code>Include /etc/apache/httpd-freeside.conf</code> in httpd.conf.  <a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a> must be installed.  Run bin/apache.export to export the files.',
+    },
   },
 
   'svc_broadband' => {
diff --git a/FS/FS/part_export/apache.pm b/FS/FS/part_export/apache.pm
new file mode 100644
index 000000000..b72c9bdb0
--- /dev/null
+++ b/FS/FS/part_export/apache.pm
@@ -0,0 +1,7 @@
+package FS::part_export::bind;
+
+use vars qw(@ISA);
+use FS::part_export::null;
+
+@ISA = qw(FS::part_export::null);
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 782286544..32a4e4f59 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -66,6 +66,7 @@ FS/part_bill_event.pm
 FS/export_svc.pm
 FS/part_export.pm
 FS/part_export_option.pm
+FS/part_export/apache.pm
 FS/part_export/bind.pm
 FS/part_export/bind_slave.pm
 FS/part_export/bsdshell.pm
diff --git a/FS/t/part_export-apache.t b/FS/t/part_export-apache.t
new file mode 100644
index 000000000..b9995080f
--- /dev/null
+++ b/FS/t/part_export-apache.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::apache;
+$loaded=1;
+print "ok 1\n";
diff --git a/bin/apache.export b/bin/apache.export
new file mode 100755
index 000000000..6142c92b4
--- /dev/null
+++ b/bin/apache.export
@@ -0,0 +1,65 @@
+#!/usr/bin/perl -w
+
+use strict;
+#use File::Path;
+use File::Rsync;
+use Net::SSH qw(ssh);
+use FS::UID qw(adminsuidsetup datasrc);
+use FS::Record qw(qsearch qsearchs);
+use FS::part_export;
+use FS::cust_svc;
+use FS::svc_www;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+#needs the export number in there somewhere too...?
+my $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/apache";
+mkdir $spooldir, 0700 unless -d $spooldir;
+
+my @exports = qsearch('part_export', { 'exporttype' => 'apache' } );
+
+my $rsync = File::Rsync->new({
+  rsh     => 'ssh',
+#  dry_run => 1,
+});
+
+foreach my $export ( @exports ) {
+
+  my $machine = $export->machine;
+  my $file = "$spooldir/$machine.conf";
+
+  open(HTTPD_CONF,">$file") or die "can't open $file: $!";
+
+  my $template = $export->option('template');
+
+  my @svc_www = $export->svc_x;
+
+  foreach my $svc_www ( @svc_www ) {
+    use vars qw($zone $username);
+    $zone = $svc_www->domain_record->zone;
+    $username = $svc_www->svc_acct->username;
+    print HTTPD_CONF eval(qq("$template"));
+  }
+
+  my $user = $export->option('user');
+  my $httpd_conf = $export->option('httpd_conf')
+
+  $rsync->exec( {
+    src       => $file,
+    dest      => "$user\@$machine:$httpd_conf",
+  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
+ # warn $rsync->out;
+
+  ssh("root\@$machine", 'ndc reload');
+
+}
+
+close NAMED_CONF;
+
+# -----
+
+sub usage {
+  die "Usage:\n  export.export user\n"; 
+}
+
diff --git a/bin/bind.export b/bin/bind.export
index 943aefbb0..055782a20 100755
--- a/bin/bind.export
+++ b/bin/bind.export
@@ -46,12 +46,7 @@ foreach my $export ( @exports ) {
   my $zonepath = $export->option('zonepath');
   $zonepath =~ s/\/$//;
 
-  #false laziness with  freeside-sqlradius-reset and shell.export
-  my @svc_domain =
-    map { qsearchs('svc_domain', { 'svcnum' => $_->svcnum } ) }
-      map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-        grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-          $export->export_svc;
+  my @svc_domain = $export->svc_x;
 
   foreach my $svc_domain ( @svc_domain ) {
     my $domain = $svc_domain->domain;
diff --git a/bin/bsdshell.export b/bin/bsdshell.export
index 10c27671e..6e0d1037e 100755
--- a/bin/bsdshell.export
+++ b/bin/bsdshell.export
@@ -43,12 +43,7 @@ foreach my $export ( @bsd_exports ) {
   chmod 0644, "$prefix/passwd";
   chmod 0600, "$prefix/master.passwd";
 
-  #false laziness with  freeside-sqlradius-reset and bind.export
-  my @svc_acct = 
-    map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
-      map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-        grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-          $export->export_svc;
+  my @svc_acct = $export->svc_x;
 
   next unless @svc_acct;
 
diff --git a/bin/sysvshell.export b/bin/sysvshell.export
index 859766103..c13912c3f 100755
--- a/bin/sysvshell.export
+++ b/bin/sysvshell.export
@@ -43,12 +43,7 @@ foreach my $export ( @sysv_exports ) {
   chmod 0644, "$prefix/passwd";
   chmod 0600, "$prefix/shadow";
 
-  #false laziness with  freeside-sqlradius-reset and bind.export
-  my @svc_acct = 
-    map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) }
-      map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-        grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-          $export->export_svc;
+  my @svc_acct = $export->svc_x;
 
   next unless @svc_acct;
 
-- 
cgit v1.2.1


From 7f089ef86f1e695fabf6b046e00f8cef14af9000 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Mar 2003 04:00:33 +0000
Subject: wide textareas

---
 httemplate/edit/part_export.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index bdf41e2b2..8a829e57a 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -67,7 +67,7 @@ my $widget = new HTML::Widgets::SelectLayers(
         }
         $html .= '</SELECT>';
       } elsif ( $type eq 'textarea' ) {
-        $html .= qq!<TEXTAREA NAME="$option">$value</TEXTAREA>!;
+        $html .= qq!<TEXTAREA NAME="$option" COLS=80>$value</TEXTAREA>!;
       } elsif ( $type eq 'text' ) {
         $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
       } elsif ( $type eq 'checkbox' ) {
-- 
cgit v1.2.1


From 7f938ee850989e3bb2405dffaff72ede945b9f08 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Mar 2003 04:09:12 +0000
Subject: wrap this textbox hard

---
 httemplate/edit/part_export.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 8a829e57a..31d6134e2 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -67,7 +67,8 @@ my $widget = new HTML::Widgets::SelectLayers(
         }
         $html .= '</SELECT>';
       } elsif ( $type eq 'textarea' ) {
-        $html .= qq!<TEXTAREA NAME="$option" COLS=80>$value</TEXTAREA>!;
+        $html .= qq!<TEXTAREA NAME="$option" COLS=80 WRAP="hard">!.
+                 qq!$value</TEXTAREA>!;
       } elsif ( $type eq 'text' ) {
         $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
       } elsif ( $type eq 'checkbox' ) {
-- 
cgit v1.2.1


From 6b081fe282b98f7075b83c107bc598d4fa3b7b2f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Mar 2003 04:36:23 +0000
Subject: virtual wrap...

---
 httemplate/edit/part_export.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 31d6134e2..839a114fb 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -67,7 +67,7 @@ my $widget = new HTML::Widgets::SelectLayers(
         }
         $html .= '</SELECT>';
       } elsif ( $type eq 'textarea' ) {
-        $html .= qq!<TEXTAREA NAME="$option" COLS=80 WRAP="hard">!.
+        $html .= qq!<TEXTAREA NAME="$option" COLS=80 WRAP="virtual">!.
                  qq!$value</TEXTAREA>!;
       } elsif ( $type eq 'text' ) {
         $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
-- 
cgit v1.2.1


From ad90599960b1c4f44a96985e9716c1bc5d04d596 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 24 Mar 2003 08:30:35 +0000
Subject: another Pg7.3 fix

---
 httemplate/search/svc_acct.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index b2ed723e2..e43f4f79b 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -30,7 +30,7 @@ if ( $query =~ /^UN_(.*)$/ ) {
       WHERE 0 <
         ( SELECT count(*) FROM cust_svc
             WHERE cust_svc.svcnum = svc_acct.svcnum
-              AND ( pkgnum IS NULL OR pkgnum = 0 OR pkgnum = $empty )
+              AND ( pkgnum IS NULL OR pkgnum = 0 )
         )
     ";
   }
-- 
cgit v1.2.1


From fef2bffbf0315a3bd03d63c1d049d2b2afd9f1a7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Mar 2003 21:43:11 +0000
Subject: oops in null apache export

---
 FS/FS/part_export/apache.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export/apache.pm b/FS/FS/part_export/apache.pm
index b72c9bdb0..9161d72b3 100644
--- a/FS/FS/part_export/apache.pm
+++ b/FS/FS/part_export/apache.pm
@@ -1,4 +1,4 @@
-package FS::part_export::bind;
+package FS::part_export::apache;
 
 use vars qw(@ISA);
 use FS::part_export::null;
-- 
cgit v1.2.1


From 51ddce1cd517621308c85fac1a04e7f970ba8eba Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Mar 2003 21:59:16 +0000
Subject: fix missing semicolon in apache export

---
 bin/apache.export | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/apache.export b/bin/apache.export
index 6142c92b4..ed85df7cf 100755
--- a/bin/apache.export
+++ b/bin/apache.export
@@ -43,7 +43,7 @@ foreach my $export ( @exports ) {
   }
 
   my $user = $export->option('user');
-  my $httpd_conf = $export->option('httpd_conf')
+  my $httpd_conf = $export->option('httpd_conf');
 
   $rsync->exec( {
     src       => $file,
@@ -55,7 +55,7 @@ foreach my $export ( @exports ) {
 
 }
 
-close NAMED_CONF;
+close HTTPD_CONF;
 
 # -----
 
-- 
cgit v1.2.1


From 5ffebc5c151bd680cdae15e4720ba788ad51121b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 29 Mar 2003 02:19:44 +0000
Subject: cust_svc and svc_x methods

---
 FS/FS/part_export.pm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index b46d8439e..789e8450d 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -305,6 +305,30 @@ sub part_svc {
   #confess "FS::part_export::part_svc deprecated";
 }
 
+=item svc_x
+
+Returns a list of associate FS::svc_* records.
+
+=cut
+
+sub svc_x {
+  my $self = shift;
+  map { $_->svc_x } $self->cust_svc;
+}
+
+=item cust_svc
+
+Returns a list of associated FS::cust_svc records.
+
+=cut
+
+sub cust_svc {
+  my $self = shift;
+  map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+    grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+      $self->export_svc;
+}
+
 =item export_svc
 
 Returns a list of associated FS::export_svc records.
-- 
cgit v1.2.1


From 7c5c428f8f102c672dd18ff0c02aaee82f5753d4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 29 Mar 2003 02:35:49 +0000
Subject: trim leading @. off zones

---
 FS/FS/part_export/www_shellcommands.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index e5b95dc1f..b3bfdfeff 100644
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -30,9 +30,12 @@ sub _export_command {
   }
   my $domain_record = $svc_www->domain_record; # or die ?
   my $zone = $domain_record->reczone; # or die ?
-  unless ( $zone =~ /\.$/ ) {
+  if ( $zone =~ /\.$/ ) {
+    $zone =~ s/\.$//;
+  } else {
     my $svc_domain = $domain_record->svc_domain; # or die ?
     $zone .= '.'. $svc_domain->domain;
+    $zone =~ s/^\@\.//;
   }
 
   my $svc_acct = $svc_www->svc_acct; # or die ?
-- 
cgit v1.2.1


From 48f60f666bab22a3ca5196cf6cd573b8691e4aae Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 29 Mar 2003 04:53:44 +0000
Subject: correct web UI for svc_www services & no more @.domain in
 www_shellcommands export

---
 FS/FS/cust_svc.pm                      |  2 +-
 FS/FS/domain_record.pm                 | 21 ++++++++++++++++++++-
 FS/FS/part_export/www_shellcommands.pm | 10 +---------
 httemplate/view/svc_www.cgi            |  6 +-----
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 5117eff45..26e6274a1 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -290,7 +290,7 @@ sub label {
     $tag = $svc_x->getfield('domain');
   } elsif ( $svcdb eq 'svc_www' ) {
     my $domain = qsearchs( 'domain_record', { 'recnum' => $svc_x->recnum } );
-    $tag = $domain->reczone;
+    $tag = $domain->zone;
   } elsif ( $svcdb eq 'svc_broadband' ) {
     $tag = $svc_x->ip_addr;
   } else {
diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 3297e6bfb..2f7e270dc 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -309,11 +309,30 @@ sub svc_domain {
   qsearchs('svc_domain', { svcnum => $self->svcnum } );
 }
 
+=item zone
+
+Returns the canonical zone name.
+
+=cut
+
+sub zone {
+  my $self = shift;
+  my $zone = $self->reczone; # or die ?
+  if ( $zone =~ /\.$/ ) {
+    $zone =~ s/\.$//;
+  } else {
+    my $svc_domain = $self->svc_domain; # or die ?
+    $zone .= '.'. $svc_domain->domain;
+    $zone =~ s/^\@\.//;
+  }
+  $zone;
+}
+
 =back
 
 =head1 VERSION
 
-$Id: domain_record.pm,v 1.12 2003-03-20 03:41:03 ivan Exp $
+$Id: domain_record.pm,v 1.13 2003-03-29 04:53:44 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index b3bfdfeff..20658c7a2 100644
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -29,15 +29,7 @@ sub _export_command {
     ${$_} = $svc_www->getfield($_) foreach $svc_www->fields;
   }
   my $domain_record = $svc_www->domain_record; # or die ?
-  my $zone = $domain_record->reczone; # or die ?
-  if ( $zone =~ /\.$/ ) {
-    $zone =~ s/\.$//;
-  } else {
-    my $svc_domain = $domain_record->svc_domain; # or die ?
-    $zone .= '.'. $svc_domain->domain;
-    $zone =~ s/^\@\.//;
-  }
-
+  my $zone = $domain_record->zone; # or die ?
   my $svc_acct = $svc_www->svc_acct; # or die ?
   my $username = $svc_acct->username;
   my $homedir = $svc_acct->dir; # or die ?
diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index 9fa9661b1..442614491 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -28,11 +28,7 @@ my $email = $svc_acct->email;
 my $domain_record = qsearchs('domain_record', { 'recnum' => $svc_www->recnum } )
   or die "svc_www: Unknown recnum ". $svc_www->recnum;
 
-my $www = $domain_record->reczone;
-unless ( $www =~ /\.$/ ) {
-  my $svc_domain = qsearchs('svc_domain', { svcnum=>$domain_record->svcnum } );
-  $www .= '.'. $svc_domain->domain;
-}
+my $www = $domain_record->zone;
 
 print header('Website View', menubar(
   ( ( $custnum )
-- 
cgit v1.2.1


From 5b48517a06a9d43171d5d5a4fe57a18f8f5aa99e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 29 Mar 2003 05:35:21 +0000
Subject: restart apache, not bind!

---
 bin/apache.export | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/apache.export b/bin/apache.export
index ed85df7cf..399fb0377 100755
--- a/bin/apache.export
+++ b/bin/apache.export
@@ -51,7 +51,7 @@ foreach my $export ( @exports ) {
   } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
  # warn $rsync->out;
 
-  ssh("root\@$machine", 'ndc reload');
+  ssh("root\@$machine", 'apachectl graceful');
 
 }
 
-- 
cgit v1.2.1


From f9dbf311aeddb4356855362d586d1c4643b4f538 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 31 Mar 2003 23:48:31 +0000
Subject: add 'last_bill' column

---
 FS/bin/freeside-setup | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index b3cdb3384..010ec4c14 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -609,6 +609,7 @@ sub tables_hash_hack {
         'otaker',    'varchar', '', 32,
         'setup',     @date_type,
         'bill',      @date_type,
+        'last_bill', @date_type,
         'susp',      @date_type,
         'cancel',    @date_type,
         'expire',    @date_type,
-- 
cgit v1.2.1


From 4063ea45f3ab0a9cb2582834e55ac3afc71425f9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 31 Mar 2003 23:49:54 +0000
Subject: added last_bill column

---
 httemplate/docs/schema.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 6522b041a..593ea82a0 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -195,6 +195,7 @@
         <li>pkgpart - <a href="#part_pkg">Package definition</a>
         <li>setup - date
         <li>bill - next bill date
+        <li>last_bill - last bill date
         <li>susp - (past) suspension date
         <li>expire - (future) cancellation date
         <li>cancel - (past) cancellation date
-- 
cgit v1.2.1


From f3b8b72d2a07683b2deb2774f29407e25e725b5a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 1 Apr 2003 01:22:25 +0000
Subject: correct last_bill problems with $0 invoice (non-existant) edge cases

---
 FS/FS/cust_main.pm                        |  2 ++
 FS/FS/cust_pkg.pm                         |  4 ++++
 debian/changelog                          |  2 +-
 debian/control                            | 22 +++++++++++++------
 httemplate/edit/REAL_cust_pkg.cgi         | 18 +++++++++++-----
 httemplate/edit/process/REAL_cust_pkg.cgi |  2 ++
 httemplate/search/cust_pkg.cgi            | 31 ++++++++++++++++++---------
 httemplate/view/cust_main.cgi             | 35 ++++++++++++++++++++-----------
 httemplate/view/cust_pkg.cgi              | 17 +++++++++------
 9 files changed, 93 insertions(+), 40 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 6331fda6d..d1e975406 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1011,6 +1011,8 @@ sub bill {
       # only for figuring next bill date, nothing else, so, reset $sdate again
       # here
       $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
+      $cust_pkg->last_bill($sdate)
+        if $cust_pkg->dbdef_table->column('last_bill');
 
       $mon += $part_pkg->freq;
       until ( $mon < 12 ) { $mon -= 12; $year++; }
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 88ffd4d17..4eea2c087 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -477,6 +477,10 @@ Useful for billing metered services.
 
 sub last_bill {
   my $self = shift;
+  if ( $self->dbdef_table->column('manual_flag') ) {
+    return $self->setfield('last_bill', $_[1]) if @_;
+    return $self->getfield('last_bill') if $self->getfield('last_bill');
+  }    
   my $cust_bill_pkg = qsearchs('cust_bill_pkg', { 'pkgnum' => $self->pkgnum,
                                                   'edate'  => $self->bill,  } );
   $cust_bill_pkg ? $cust_bill_pkg->sdate : $self->setup || 0;
diff --git a/debian/changelog b/debian/changelog
index 5734b1fc8..d8283b5d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-freeside (1.3.1-1) unstable; urgency=low
+freeside (1.4.1-1) unstable; urgency=low
 
   * Initial Release.
 
diff --git a/debian/control b/debian/control
index 2f66fd395..de2820d83 100644
--- a/debian/control
+++ b/debian/control
@@ -8,14 +8,14 @@ Standards-Version: 3.5.2
 Package: freeside
 Architecture: any
 Depends: freeside-lib
-Recommends: freeside-doc, freeside-ui-webui, libterm-query-perl
-Suggests: freeside-passwd-server, freeside-signup-server, freeside-session-server
+Recommends: freeside-doc, freeside-ui-web, libterm-query-perl
+Suggests: freeside-passwd-server, freeside-signup-server, freeside-session-server, freeside-selfservice-server
 Description: Billing and administration package for ISPs.
  Freeside is a billing and account administration package for ISPs.  It stores
  customer information in an SQL database, and will update UNIX passwd and
- shadow files, and configuration for sendmail, qmail, BIND and/or Apache.
- It is also useful as a central database of accounts/domains/web-space
- for a large number of machines.
+ shadow files, RADIUS users file and SQL databases, and configuration for
+ sendmail, qmail, BIND and/or Apache.  It is also useful as a central database
+ of accounts/domains/web-space for a large number of machines.
 
 Package: freeside-doc
 Architecture: all
@@ -25,7 +25,7 @@ Description: Documentation for freeside
 
 Package: freeside-lib
 Architecture: all
-Depends: libdigest-md5-perl, liburi-perl, libhtml-parser-perl, libnet-perl, liblocale-codes-perl, libnet-whois-perl, libwww-perl, libbusiness-creditcard-perl, mailtools, libtimedate-perl, libdate-manip-perl, libfile-counterfile-perl, libfreezethaw-perl, libtext-template-perl, libdbd-pg-perl
+Depends: libmime-base64-perl, libdigest-md5-perl, liburi-perl, libhtml-tagset-perl, libhtml-parser-perl, libnet-perl, liblocale-codes-perl, libnet-whois-perl, libwww-perl, libbusiness-creditcard-perl, libmailtools-perl, libtimedate-perl, libdate-manip-perl, libfile-counterfile-perl, libfreezethaw-perl, libtext-template-perl, libdbd-pg-perl, libdbix-datasource-perl, libdbix-dbschema-perl, libnet-ssh-perl, libnet-scp-perl, libapache-asp-perl, libtie-ixhash-perl, libtime-duration-perl, libhtml-widgets-selectlayers-perl, libstorable-perl, libapache-dbi-perl
 Description: Freeside libraries and extension API
  This package contains the libraries which implement the business logic and
  backend functions of Freeside, a billing and account administration package
@@ -80,3 +80,13 @@ Description:
 Package: freeside-session-client
 Architecture: all
 Depends: ssh
+Description: 
+ <rar>
+
+Package: freeside-selfservice-server
+Architecture: all
+Depends:
+Description:
+ <rar>
+
+
diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index 0d2f1c238..e44acba3c 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -1,6 +1,6 @@
 <!-- mason kludge -->
 <%
-# <!-- $Id: REAL_cust_pkg.cgi,v 1.4 2002-07-08 13:07:40 ivan Exp $ -->
+# <!-- $Id: REAL_cust_pkg.cgi,v 1.5 2003-04-01 01:22:24 ivan Exp $ -->
 
 my $error ='';
 my $pkgnum = '';
@@ -56,11 +56,19 @@ print ntable("#cccccc",2),
       $otaker,  '</TD></TR>',
       '<TR><TD ALIGN="right">Setup date</TD><TD>'.
       '<INPUT TYPE="text" NAME="setup" SIZE=32 VALUE="',
-      ( $setup ? time2str("%c %z (%Z)",$setup) : "" ), '"></TD></TR>',
-      '<TR><TD ALIGN="right">Next bill date</TD><TD>',
+      ( $setup ? time2str("%c %z (%Z)",$setup) : "" ), '"></TD></TR>';
+
+print '<TR><TD ALIGN="right">Last bill date</TD><TD>',
+      '<INPUT TYPE="text" NAME="last_bill" SIZE=32 VALUE="',
+      ( $cust_pkg->last_bill
+        ? time2str("%c %z (%Z)", $cust_pkg->last_bill)
+        : ""                                          ),
+      '"></TD></TR>'
+  if $cust_pkg->dbdef_table->column('last_bill');
+
+print '<TR><TD ALIGN="right">Next bill date</TD><TD>',
       '<INPUT TYPE="text" NAME="bill" SIZE=32 VALUE="',
-      ( $bill ? time2str("%c %z (%Z)",$bill) : "" ), '"></TD></TR>',
-;
+      ( $bill ? time2str("%c %z (%Z)",$bill) : "" ), '"></TD></TR>';
 
 print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
        time2str("%D",$susp), '</TD></TR>'
diff --git a/httemplate/edit/process/REAL_cust_pkg.cgi b/httemplate/edit/process/REAL_cust_pkg.cgi
index 2e0352c76..7f5c5e49c 100755
--- a/httemplate/edit/process/REAL_cust_pkg.cgi
+++ b/httemplate/edit/process/REAL_cust_pkg.cgi
@@ -5,6 +5,8 @@ my $old = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
 my %hash = $old->hash;
 $hash{'setup'} = $cgi->param('setup') ? str2time($cgi->param('setup')) : '';
 $hash{'bill'} = $cgi->param('bill') ? str2time($cgi->param('bill')) : '';
+$hash{'last_bill'} =
+  $cgi->param('last_bill') ? str2time($cgi->param('last_bill')) : '';
 $hash{'expire'} = $cgi->param('expire') ? str2time($cgi->param('expire')) : '';
 my $new = new FS::cust_pkg \%hash;
 
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 78a5bb3bb..3cc520fa8 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -194,6 +194,12 @@ if ( scalar(@cust_pkg) == 1 ) {
       <TR>
         <TH>Package</TH>
         <TH><FONT SIZE=-1>Setup</FONT></TH>
+END
+
+  print '<TH><FONT SIZE=-1>Next<BR>bill</FONT></TH>'
+    if defined dbdef->table('cust_pkg')->column('last_bill');
+
+  print <<END;
         <TH><FONT SIZE=-1>Next<BR>bill</FONT></TH>
         <TH><FONT SIZE=-1>Susp.</FONT></TH>
         <TH><FONT SIZE=-1>Expire</FONT></TH>
@@ -203,17 +209,10 @@ if ( scalar(@cust_pkg) == 1 ) {
         <TH>company</TH>
 END
 
-if ( defined dbdef->table('cust_main')->column('ship_last') ) {
-  print <<END;
-      <TH>(service) name</TH>
-      <TH>company</TH>
-END
-}
+  print '<TH>(service) name</TH><TH>company</TH>'
+    if defined dbdef->table('cust_main')->column('ship_last');
 
-print <<END;
-        <TH COLSPAN=2>Services</TH>
-      </TR>
-END
+  print '<TH COLSPAN=2>Services</TH></TR>';
 
   my $n1 = '<TR>';
   my(%saw,$cust_pkg);
@@ -244,6 +243,12 @@ END
       $cust_main ? $cust_main->first : '',
       $cust_main ? $cust_main->company : '',
     );
+
+    my $last_bill = $cust_pkg->getfield('last_bill')
+                      ? time2str("%D", $cust_pkg->getfield('last_bill') )
+                      : ''
+      if defined dbdef->table('cust_pkg')->column('last_bill');
+
     my($ship_last, $ship_first, $ship_company);
     if ( defined dbdef->table('cust_main')->column('ship_last') ) {
       ($ship_last, $ship_first, $ship_company) = (
@@ -270,6 +275,12 @@ END
     print $n1, <<END;
       <TD ROWSPAN=$rowspan><A HREF="${p}view/cust_pkg.cgi?$pkgnum"><FONT SIZE=-1>$pkgnum - $pkg</FONT></A></TD>
       <TD ROWSPAN=$rowspan>$setup</TD>
+END
+
+    print "<TD ROWSPAN=$rowspan>$last_bill</TD>"
+      if defined dbdef->table('cust_pkg')->column('last_bill');
+
+    print <<END;
       <TD ROWSPAN=$rowspan>$bill</TD>
       <TD ROWSPAN=$rowspan>$susp</TD>
       <TD ROWSPAN=$rowspan>$expire</TD>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 6fe759bd9..9b7b5d029 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -342,17 +342,6 @@ print qq!<BR><A NAME="cust_pkg">Packages</A> !,
 
 #display packages
 
-#formatting
-print qq!!, &table(), "\n",
-      qq!<TR><TH COLSPAN=2 ROWSPAN=2>Package</TH><TH COLSPAN=5>!,
-      qq!Dates</TH><TH COLSPAN=2 ROWSPAN=2>Services</TH></TR>\n!,
-      qq!<TR><TH><FONT SIZE=-1>Setup</FONT></TH><TH>!,
-      qq!<FONT SIZE=-1>Next bill</FONT>!,
-      qq!</TH><TH><FONT SIZE=-1>Susp.</FONT></TH><TH><FONT SIZE=-1>Expire!,
-      qq!</FONT></TH>!,
-      qq!<TH><FONT SIZE=-1>Cancel</FONT></TH>!,
-      qq!</TR>\n!;
-
 #get package info
 my @packages;
 if ( $conf->exists('hidecancelledpackages') ) {
@@ -361,6 +350,23 @@ if ( $conf->exists('hidecancelledpackages') ) {
   @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->all_pkgs);
 }
 
+if ( @packages ) {
+  #formatting
+  print &table(), "\n",
+        qq!<TR><TH COLSPAN=2 ROWSPAN=2>Package</TH><TH COLSPAN=5>!,
+        qq!Dates</TH><TH COLSPAN=2 ROWSPAN=2>Services</TH></TR>\n<TR>!,
+        qq!<TH><FONT SIZE=-1>Setup</FONT></TH>!;
+
+  print qq!<TH><FONT SIZE=-1>Last bill</FONT></TH>!
+    if $packages[0]->dbdef_table->column('last_bill');
+
+  print qq!<TH><FONT SIZE=-1>Next bill</FONT></TH>!,
+        qq!<TH><FONT SIZE=-1>Susp.</FONT></TH>!,
+        qq!<TH><FONT SIZE=-1>Expire!</FONT></TH>!,
+        qq!<TH><FONT SIZE=-1>Cancel</FONT></TH>!,
+        qq!</TR>\n!;
+}
+
 my $n1 = '<TR>';
 foreach my $package (@packages) {
   my $pkgnum = $package->pkgnum;
@@ -424,7 +430,11 @@ foreach my $package (@packages) {
   }
   print '</FONT></TD>';
 
-  for ( qw( setup bill susp expire cancel ) ) {
+  my @fields = qw( setup );
+  push @fields, qw( last_bill ) if $package->dbdef_table->column('last_bill');
+  push @fields, qw( bill susp expire cancel);
+
+  for ( @fields ) {
     print "<TD ROWSPAN=$rowspan><FONT SIZE=-1>", ( $package->getfield($_)
             ? time2str("%D</FONT><BR><FONT SIZE=-3>%l:%M:%S%P&nbsp;%z</FONT>",
               $package->getfield($_) )
@@ -471,6 +481,7 @@ print "</TR>";
 #formatting
 print "</TABLE>";
 
+
 print <<END;
 <SCRIPT>
 function cust_pay_areyousure(href) {
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index aa3b3b15a..c3880114c 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -68,10 +68,16 @@ print &ntable("#cccccc"), '<TR><TD>', &ntable("#cccccc",2),
       '<TR><TD ALIGN="right">Comment</TD><TD BGCOLOR="#ffffff">',
       $comment,  '</TD></TR>',
       '<TR><TD ALIGN="right">Setup date</TD><TD BGCOLOR="#ffffff">',
-      ( $setup ? time2str("%D",$setup) : "(Not setup)" ), '</TD></TR>',
-      '<TR><TD ALIGN="right">Next bill date</TD><TD BGCOLOR="#ffffff">',
-      ( $bill ? time2str("%D",$bill) : "&nbsp;" ), '</TD></TR>',
-;
+      ( $setup ? time2str("%D",$setup) : "(Not setup)" ), '</TD></TR>';
+
+print '<TR><TD ALIGN="right">Last bill date</TD><TD BGCOLOR="#ffffff">',
+      ( $cust_pkg->last_bill ? time2str("%D",$cust_pkg->last_bill) : "&nbsp;" ),
+      '</TD></TR>'
+  if $cust_pkg->dbdef_table->column('last_bill');
+
+print '<TR><TD ALIGN="right">Next bill date</TD><TD BGCOLOR="#ffffff">',
+      ( $bill ? time2str("%D",$bill) : "&nbsp;" ), '</TD></TR>';
+      
 print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
        time2str("%D",$susp), '</TD></TR>' if $susp;
 print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
@@ -80,8 +86,7 @@ print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
        time2str("%D",$cancel), '</TD></TR>' if $cancel;
 print  '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
       $otaker,  '</TD></TR>',
-      '</TABLE></TD></TR></TABLE>'
-;
+      '</TABLE></TD></TR></TABLE>';
 
 unless ($expire) {
   print <<END;
-- 
cgit v1.2.1


From 26deea8eb085dcb06295e6795f72f2844bcd3fe1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 1 Apr 2003 06:55:01 +0000
Subject: cancel button for customers (closes: Bug#25)

---
 httemplate/misc/cust_main-cancel.cgi | 16 ++++++++++++++++
 httemplate/view/cust_main.cgi        | 21 +++++++++++++++++----
 2 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100755 httemplate/misc/cust_main-cancel.cgi

diff --git a/httemplate/misc/cust_main-cancel.cgi b/httemplate/misc/cust_main-cancel.cgi
new file mode 100755
index 000000000..526e128a4
--- /dev/null
+++ b/httemplate/misc/cust_main-cancel.cgi
@@ -0,0 +1,16 @@
+<%
+
+#untaint custnum
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ || die "Illegal custnum";
+my $custnum = $1;
+
+my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
+
+my $error = $cust_main->cancel;
+eidiot($error) if $error;
+
+#print $cgi->redirect($p. "view/cust_main.cgi?". $cust_main->custnum);
+print $cgi->redirect($p);
+
+%>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 9b7b5d029..1d6243e23 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -22,10 +22,23 @@ my $custnum = $1;
 my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
 die "Customer not found!" unless $cust_main;
 
-print qq!<A HREF="!, popurl(2), 
-      qq!edit/cust_main.cgi?$custnum">Edit this customer</A>!;
-print qq! | <A HREF="!, popurl(2), 
-      qq!misc/delete-customer.cgi?$custnum"> Delete this customer</A>!
+print qq!<A HREF="${p}edit/cust_main.cgi?$custnum">Edit this customer</A>!;
+
+print <<END;
+<SCRIPT>
+function cancel_areyousure(href) {
+    if (confirm("Perminantly delete all services and cancel this customer?") == true)
+        window.location.href = href;
+}
+</SCRIPT>
+END
+
+print qq! | <A HREF="javascript:cancel_areyousure('${p}misc/cust_main-cancel.cgi?$custnum')">!.
+      'Cancel this customer</A>'
+  if $cust_main->ncancelled_pkgs;
+
+print qq! | <A HREF="${p}misc/delete-customer.cgi?$custnum">!.
+      'Delete this customer</A>'
   if $conf->exists('deletecustomers');
 
 unless ( $conf->exists('disable_customer_referrals') ) {
-- 
cgit v1.2.1


From 94494835be39e34474d8564a8cde9fdd389fcdbe Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 1 Apr 2003 08:03:22 +0000
Subject: - update qsearch for Pg 7.3 - preliminary 1.5.0 upgrade docs - syntax
 error in main customer view

---
 FS/FS/Record.pm                | 12 ++++++++++--
 httemplate/docs/index.html     |  1 +
 httemplate/docs/upgrade10.html |  6 ++++++
 httemplate/view/cust_main.cgi  |  7 +++++--
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 40215100f..c711f1214 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -223,13 +223,21 @@ sub qsearch {
       if ( ! defined( $record->{$_} ) || $record->{$_} eq '' ) {
         if ( $op eq '=' ) {
           if ( driver_name eq 'Pg' ) {
-            qq-( $column IS NULL OR $column = '' )-;
+            if ( $dbdef->table($table)->column($column)->type =~ /(int)/i ) {
+              qq-( $column IS NULL )-;
+            } else {
+              qq-( $column IS NULL OR $column = '' )-;
+            }
           } else {
             qq-( $column IS NULL OR $column = "" )-;
           }
         } elsif ( $op eq '!=' ) {
           if ( driver_name eq 'Pg' ) {
-            qq-( $column IS NOT NULL AND $column != '' )-;
+            if ( $dbdef->table($table)->column($column)->type =~ /(int)/i ) {
+              qq-( $column IS NOT NULL )-;
+            } else {
+              qq-( $column IS NOT NULL AND $column != '' )-;
+            }
           } else {
             qq-( $column IS NOT NULL AND $column != "" )-;
           }
diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html
index 8f6f91378..b57b06feb 100644
--- a/httemplate/docs/index.html
+++ b/httemplate/docs/index.html
@@ -9,6 +9,7 @@
   <li><a href="upgrade7.html">Upgrading from 1.3.0 to 1.3.1</a>
   <li><a href="upgrade8.html">Upgrading from 1.3.1 to 1.4.0</a>
   <li><a href="upgrade9.html">Upgrading from 1.4.0 to 1.4.1</a>
+  <li><a href="upgrade10.html">Upgrading from 1.4.1 (or 1.4.2?) to 1.5.0</a>
 <!--
   <li><a href="config.html">Configuration files</a>
 !-->
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 7aa26f698..6c4fe0c37 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -1,5 +1,8 @@
+<pre>
 this is very incomplete
 
+install NetAddr::IP and Chart
+
 CREATE TABLE cust_bill_pkg_detail (
   detailnum serial,
   pkgnum int NOT NULL,
@@ -9,3 +12,6 @@ CREATE TABLE cust_bill_pkg_detail (
 );
 CREATE INDEX cust_bill_pkg_detail1 ON cust_bill_pkg_detail ( pkgnum, invnum );
 
+create all of the new broadband tables
+
+</pre>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 1d6243e23..01ad57373 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -365,8 +365,11 @@ if ( $conf->exists('hidecancelledpackages') ) {
 
 if ( @packages ) {
   #formatting
+
+  my $colspan = $packages[0]->dbdef_table->column('last_bill') ? 6 : 5;
+  
   print &table(), "\n",
-        qq!<TR><TH COLSPAN=2 ROWSPAN=2>Package</TH><TH COLSPAN=5>!,
+        qq!<TR><TH COLSPAN=2 ROWSPAN=2>Package</TH><TH COLSPAN=$colspan>!,
         qq!Dates</TH><TH COLSPAN=2 ROWSPAN=2>Services</TH></TR>\n<TR>!,
         qq!<TH><FONT SIZE=-1>Setup</FONT></TH>!;
 
@@ -375,7 +378,7 @@ if ( @packages ) {
 
   print qq!<TH><FONT SIZE=-1>Next bill</FONT></TH>!,
         qq!<TH><FONT SIZE=-1>Susp.</FONT></TH>!,
-        qq!<TH><FONT SIZE=-1>Expire!</FONT></TH>!,
+        qq!<TH><FONT SIZE=-1>Expire</FONT></TH>!,
         qq!<TH><FONT SIZE=-1>Cancel</FONT></TH>!,
         qq!</TR>\n!;
 }
-- 
cgit v1.2.1


From 2a5963390ddd68ecb2e40568ca272c0a2f8b831a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 2 Apr 2003 03:25:15 +0000
Subject: fix disappearing email invoice on errors, finally (closes: Bug#35)

---
 httemplate/edit/cust_main.cgi         | 6 +++++-
 httemplate/edit/process/cust_main.cgi | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 6fc086a12..706526865 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -17,6 +17,7 @@ my $conf = new FS::Conf;
 
 my $error = '';
 my($custnum, $username, $password, $popnum, $cust_main, $saved_pkgpart);
+my(@invoicing_list);
 if ( $cgi->param('error') ) {
   $error = $cgi->param('error');
   $cust_main = new FS::cust_main ( {
@@ -32,6 +33,7 @@ if ( $cgi->param('error') ) {
   $username = $cgi->param('username');
   $password = $cgi->param('_password');
   $popnum = $cgi->param('popnum');
+  @invoicing_list = split( /\s*,\s*/, $cgi->param('invoicing_list') );
 } elsif ( $cgi->keywords ) { #editing
   my( $query ) = $cgi->keywords;
   $query =~ /^(\d+)$/;
@@ -41,6 +43,7 @@ if ( $cgi->param('error') ) {
   $username = '';
   $password = '';
   $popnum = 0;
+  @invoicing_list = $cust_main->invoicing_list;
 } else {
   $custnum='';
   $cust_main = new FS::cust_main ( {} );
@@ -50,6 +53,7 @@ if ( $cgi->param('error') ) {
   $username = '';
   $password = '';
   $popnum = 0;
+  @invoicing_list = ();
 }
 $cgi->delete_all();
 my $action = $custnum ? 'Edit' : 'Add';
@@ -383,7 +387,7 @@ if ( $payby_default eq 'HIDE' ) {
   print qq!>Tax Exempt</TD></TR><TR><TD>!.
         qq!<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
 
-  my @invoicing_list = $cust_main->invoicing_list;
+  #my @invoicing_list = $cust_main->invoicing_list;
   print qq! CHECKED!
     if ( ! @invoicing_list && ! $conf->exists('disablepostalinvoicedefault') )
        || grep { $_ eq 'POST' } @invoicing_list;
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index c15ea0321..5e6000c05 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -25,6 +25,7 @@ $cgi->param('otaker', &getotaker );
 
 my @invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
 push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
+$cgi->param('invoicing_list', join(',', @invoicing_list) );
 
 #create new record object
 
-- 
cgit v1.2.1


From 856a62ca215f921ef3e9ddf4080626565727532a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 2 Apr 2003 09:46:50 +0000
Subject: updated meta-import web UI to allow duplicate import tables

---
 httemplate/misc/process/meta-import.cgi | 37 +++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/httemplate/misc/process/meta-import.cgi b/httemplate/misc/process/meta-import.cgi
index 9e374b508..2939c8fb2 100644
--- a/httemplate/misc/process/meta-import.cgi
+++ b/httemplate/misc/process/meta-import.cgi
@@ -31,7 +31,9 @@ function SafeOnsubmit() {
     <INPUT TYPE="hidden" NAME=<%= $field %> VALUE="<%= $cgi->param($field) %>">
   <% }
 
-  my %schema = ();
+  my %schema;
+  use Tie::DxHash;
+  tie %schema, 'Tie::DxHash';
   if ( $cgi->param('schema') ) {
     my $schema_string = $cgi->param('schema');
     %> <INPUT TYPE="hidden" NAME="schema" VALUE="<%=$schema_string%>"> <%
@@ -57,14 +59,16 @@ function SafeOnsubmit() {
     <INPUT TYPE="hidden" NAME="magic" VALUE="process2">
     <%
 
+    my %unique;
     foreach my $table ( keys %schema ) {
 
       my @from_columns = $schema->table($table)->columns;
       my @fs_columns = dbdef->table($schema{$table})->columns;
 
       %>
-      <%= hashmaker($table, \@from_columns => \@fs_columns,
-                            $table         =>  $schema{$table}, ) %>
+      <%= hashmaker( $table.'__'.$unique{$table}++,
+                     \@from_columns => \@fs_columns,
+                     $table         =>  $schema{$table}, ) %>
       <br><hr><br>
       <%
 
@@ -79,6 +83,7 @@ function SafeOnsubmit() {
 
     print "<pre>\n";
 
+    my %unique;
     foreach my $table ( keys %schema ) {
       ( my $spaces = $table ) =~ s/./ /g;
       print "'$table' => { 'table' => '$schema{$table}',\n".
@@ -88,7 +93,7 @@ function SafeOnsubmit() {
                          or die "guru meditation #420: $_";
                        ( $1 => $2 );
                      }
-                 split( /\n/, $cgi->param($table) );
+                 split( /\n/, $cgi->param($table.'__'.$unique{$table}++) );
       foreach ( keys %map ) {
         print "$spaces                     '$_' => '$map{$_}',\n";
       }
@@ -116,11 +121,13 @@ function SafeOnsubmit() {
     "<TABLE><TR><TH>$labelfrom</TH><TH>$labelto</TH></TR><TR><TD>".
         qq!<SELECT NAME="${name}_from" SIZE=$fromsize>\n!.
         join("\n", map { qq!<OPTION VALUE="$_">$_</OPTION>! } sort { $a cmp $b } @$from ).
-        "</SELECT>\n".
+        "</SELECT>\n<BR>".
+      qq!<INPUT TYPE="button" VALUE="refill" onClick="repack_${name}_from()">!.
       '</TD><TD>'.
         qq!<SELECT NAME="${name}_to" SIZE=$tosize>\n!.
         join("\n", map { qq!<OPTION VALUE="$_">$_</OPTION>! } sort { $a cmp $b } @$to ).
-        "</SELECT>\n".
+        "</SELECT>\n<BR>".
+      qq!<INPUT TYPE="button" VALUE="refill" onClick="repack_${name}_to()">!.
       '</TD></TR>'.
       '<TR><TD COLSPAN=2>'.
         qq!<INPUT TYPE="button" VALUE="map" onClick="toke_$name(this.form)">!.
@@ -146,6 +153,24 @@ function SafeOnsubmit() {
               object.options[index] = null;
               return value;
             }
+            function repack_${name}_from() {
+              var object = document.OneTrueForm.${name}_from;
+              object.options.length = 0;
+              ". join("\n", 
+                   map { "addOption_$name(object, '$_');\n" }
+                       ( sort { $a cmp $b } @$from )           ). "
+            }
+            function repack_${name}_to() {
+              var object = document.OneTrueForm.${name}_to;
+              object.options.length = 0;
+              ". join("\n", 
+                   map { "addOption_$name(object, '$_');\n" }
+                       ( sort { $a cmp $b } @$to )           ). "
+            }
+            function addOption_$name(object,value) {
+              var length = object.length;
+              object.options[length] = new Option(value, value, false, false);
+            }
       </script>".
       '';
   }
-- 
cgit v1.2.1


From 7ab5168716fcb97c01f0501d38780a85b9dfeaec Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 2 Apr 2003 11:38:51 +0000
Subject: better callbacks

---
 FS/FS/UID.pm       | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
 FS/FS/cust_main.pm |  3 ++-
 2 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index ebf9b96e5..f67005151 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -3,8 +3,8 @@ package FS::UID;
 use strict;
 use vars qw(
   @ISA @EXPORT_OK $cgi $dbh $freeside_uid $user 
-  $conf_dir $secrets $datasrc $db_user $db_pass %callback $driver_name
-  $AutoCommit
+  $conf_dir $secrets $datasrc $db_user $db_pass %callback @callback
+  $driver_name $AutoCommit
 );
 use subs qw(
   getsecrets cgisetotaker
@@ -95,9 +95,33 @@ sub forksuidsetup {
     # breaks multi-database installs # delete $callback{$_}; #run once
   }
 
+  &{$_} foreach @callback;
+
   $dbh;
 }
 
+=item install_callback
+
+A package can install a callback to be run in adminsuidsetup by passing
+a coderef to the FS::UID->install_callback class method.  If adminsuidsetup has
+run already, the callback will also be run immediately.
+
+    $coderef = sub { warn "Hi, I'm returning your call!" };
+    FS::UID->install_callback($coderef);
+
+    install_callback FS::UID sub { 
+      warn "Hi, I'm returning your call!"
+    };
+
+=cut
+
+sub install_callback {
+  my $class = shift;
+  my $callback = shift;
+  push @callback, $callback;
+  &{$callback} if $dbh;
+}
+
 =item cgisuidsetup CGI_object
 
 Takes a single argument, which is a CGI (see L<CGI>) or Apache (see L<Apache>)
@@ -246,17 +270,28 @@ sub getsecrets {
 
 =head1 CALLBACKS
 
-Warning: this interface is likely to change in future releases.
+Warning: this interface is (still) likely to change in future releases.
 
-A package can install a callback to be run in adminsuidsetup by putting a
-coderef into the hash %FS::UID::callback :
+New (experimental) callback interface:
+
+A package can install a callback to be run in adminsuidsetup by passing
+a coderef to the FS::UID->install_callback class method.  If adminsuidsetup has
+run already, the callback will also be run immediately.
 
     $coderef = sub { warn "Hi, I'm returning your call!" };
-    $FS::UID::callback{'Package::Name'};
+    FS::UID->install_callback($coderef);
+
+    install_callback FS::UID sub { 
+      warn "Hi, I'm returning your call!"
+    };
 
-=head1 VERSION
+Old (deprecated) callback interface:
 
-$Id: UID.pm,v 1.21 2002-09-27 12:14:12 ivan Exp $
+A package can install a callback to be run in adminsuidsetup by putting a
+coderef into the hash %FS::UID::callback :
+
+    $coderef = sub { warn "Hi, I'm returning your call!" };
+    $FS::UID::callback{'Package::Name'} = $coderef;
 
 =head1 BUGS
 
@@ -269,7 +304,7 @@ cgisuidsetup will go away as well.
 
 Goes through contortions to support non-OO syntax with multiple datasrc's.
 
-Callbacks are inelegant.
+Callbacks are (still) inelegant.
 
 =head1 SEE ALSO
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index d1e975406..886d492c4 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -38,7 +38,8 @@ $Debug = 0;
 $import = 0;
 
 #ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::cust_main'} = sub { 
+#$FS::UID::callback{'FS::cust_main'} = sub { 
+install_callback FS::UID sub { 
   $conf = new FS::Conf;
   #yes, need it for stuff below (prolly should be cached)
 };
-- 
cgit v1.2.1


From a3d47fd14478fdd6df79d6d26ee5d5c37ad99d5e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 2 Apr 2003 14:52:01 +0000
Subject: added order_pkgs sub

---
 FS/FS/cust_main.pm | 72 +++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 52 insertions(+), 20 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 886d492c4..cde370c68 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -277,26 +277,10 @@ sub insert {
   }
 
   # packages
-  foreach my $cust_pkg ( keys %$cust_pkgs ) {
-    $cust_pkg->custnum( $self->custnum );
-    $error = $cust_pkg->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "inserting cust_pkg (transaction rolled back): $error";
-    }
-    foreach my $svc_something ( @{$cust_pkgs->{$cust_pkg}} ) {
-      $svc_something->pkgnum( $cust_pkg->pkgnum );
-      if ( $seconds && $svc_something->isa('FS::svc_acct') ) {
-        $svc_something->seconds( $svc_something->seconds + $seconds );
-        $seconds = 0;
-      }
-      $error = $svc_something->insert;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        #return "inserting svc_ (transaction rolled back): $error";
-        return $error;
-      }
-    }
+  $error = $self->order_pkgs($cust_pkgs, \$seconds);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
   }
 
   if ( $seconds ) {
@@ -339,6 +323,54 @@ sub insert {
 
 }
 
+=item order_pkgs
+
+document me.  like ->insert(%cust_pkg) on an existing record
+
+=cut
+
+sub order_pkgs {
+  my $self = shift;
+  my $cust_pkgs = shift;
+  my $seconds = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  foreach my $cust_pkg ( keys %$cust_pkgs ) {
+    $cust_pkg->custnum( $self->custnum );
+    my $error = $cust_pkg->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "inserting cust_pkg (transaction rolled back): $error";
+    }
+    foreach my $svc_something ( @{$cust_pkgs->{$cust_pkg}} ) {
+      $svc_something->pkgnum( $cust_pkg->pkgnum );
+      if ( $seconds && $$seconds && $svc_something->isa('FS::svc_acct') ) {
+        $svc_something->seconds( $svc_something->seconds + $$seconds );
+        $$seconds = 0;
+      }
+      $error = $svc_something->insert;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        #return "inserting svc_ (transaction rolled back): $error";
+        return $error;
+      }
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  ''; #no error
+}
+
 =item delete NEW_CUSTNUM
 
 This deletes the customer.  If there is an error, returns the error, otherwise
-- 
cgit v1.2.1


From 2e9ff8b770519382f5767faf7a1dd15eb79eb7fe Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Apr 2003 03:29:24 +0000
Subject: YA pg7.3 fix

---
 httemplate/view/svc_acct.cgi | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 2e324c13c..f04e47163 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,4 +1,4 @@
-<!-- mason kludge -->
+<-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
@@ -140,7 +140,9 @@ if ( $conf->exists('security_phrase') ) {
         $svc_acct->sec_phrase. '</TD></TR>';
 }
 
-my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
+my $svc_acct_pop = $svc_acct->popnum
+                     ? qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum})
+                     : '';
 print "<TR><TD ALIGN=\"right\">Access number</TD>".
       "<TD BGCOLOR=\"#ffffff\">". $svc_acct_pop->text. '</TD></TR>'
   if $svc_acct_pop;
-- 
cgit v1.2.1


From fdccb39f148b8fb2a8a7818e9a7999c20b2e05bd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 19 Apr 2003 17:51:27 +0000
Subject: /^\s*$/ setup/recur expressions now failsafe to 0 (closes: Bug#498)
 deprecate old 1.3-style qmail integration

---
 FS/FS/Conf.pm     | 4 ++--
 FS/FS/part_pkg.pm | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index f0a4c9f45..b00e78255 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -527,8 +527,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'qmailmachines',
-    'section'     => 'mail',
-    'description' => 'Your qmail machines, one per line.  This enables export of `/var/qmail/control/virtualdomains\', `/var/qmail/control/recipientmap\', and `/var/qmail/control/rcpthosts\'.  Setting this option (even if empty) also turns on user `.qmail-extension\' file maintenance in conjunction with the <b>shellmachine</b> option.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add <i>qmail</i> and <i>shellcommands</i> <a href="../browse/part_export.cgi">exports</a> instead.  This option used to export `/var/qmail/control/virtualdomains\', `/var/qmail/control/recipientmap\', and `/var/qmail/control/rcpthosts\'.  Setting this option (even if empty) also turns on user `.qmail-extension\' file maintenance in conjunction with the <b>shellmachine</b> option.',
     'type'        => [qw( checkbox textarea )],
   },
 
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 99d88d56a..60b0e01f9 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -180,6 +180,8 @@ insert and replace methods.
 sub check {
   my $self = shift;
 
+  for (qw(setup recur)) { $self->set($_=>0) if $self->get($_) =~ /^\s*$/; }
+
   my $conf = new FS::Conf;
   if ( $conf->exists('safe-part_pkg') ) {
 
-- 
cgit v1.2.1


From 4eaa305a53b129021c3a40e9ed49196f4b4d8907 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 21 Apr 2003 20:27:10 +0000
Subject: excludeaddr option for svc_broadband

---
 FS/FS/Conf.pm       |  7 +++++++
 FS/FS/addr_block.pm | 10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index b00e78255..cb404ff03 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -373,6 +373,13 @@ httemplate/docs/config.html
     'type'       => 'checkbox',
   },
 
+  {
+    'key'         => 'excludeaddr',
+    'section'     => 'deprecated',
+    'description' => 'Addresses to exclude from assignment, one per line.',
+    'type'        => 'textarea',
+  },
+  
   {
     'key'         => 'erpcdmachines',
     'section'     => '',
diff --git a/FS/FS/addr_block.pm b/FS/FS/addr_block.pm
index b671723aa..c9305f6af 100755
--- a/FS/FS/addr_block.pm
+++ b/FS/FS/addr_block.pm
@@ -5,6 +5,7 @@ use vars qw( @ISA );
 use FS::Record qw( qsearchs qsearch dbh );
 use FS::router;
 use FS::svc_broadband;
+use FS::Conf;
 use NetAddr::IP;
 
 @ISA = qw( FS::Record );
@@ -172,9 +173,14 @@ there are no free addresses, returns false.
 sub next_free_addr {
   my $self = shift;
 
-  my @used = map { $_->NetAddr->addr } 
+  my $conf = new FS::Conf;
+  my @excludeaddr = $conf->config('excludeaddr');
+  
+  my @used = (
+    map { $_->NetAddr->addr } 
       ($self, 
-       qsearch('svc_broadband', { blocknum => $self->blocknum }) );
+       qsearch('svc_broadband', { blocknum => $self->blocknum }) ),
+     @excludeaddr );
 
   my @free = $self->NetAddr->hostenum;
   while (my $ip = shift @free) {
-- 
cgit v1.2.1


From 6eedae5614eee808d0e0c4b9d9b3fe7d1217b776 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 21 Apr 2003 20:31:20 +0000
Subject: Bug fixes for sqlmail.  Added support for courier and dovecot
 authentication.

---
 FS/FS/part_export.pm         |  26 ++++++--
 FS/FS/part_export/sqlmail.pm | 152 +++++++++++++++++++++++++++++++------------
 2 files changed, 132 insertions(+), 46 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 789e8450d..4471d6e00 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -764,9 +764,27 @@ tie my %http_options, 'Tie::IxHash',
 ;
 
 tie my %sqlmail_options, 'Tie::IxHash',
-  'datasrc'  => { label=>'DBI data source' },
-  'username' => { label=>'Database username' },
-  'password' => { label=>'Database password' },
+  'datasrc'            => { label => 'DBI data source' },
+  'username'           => { label => 'Database username' },
+  'password'           => { label => 'Database password' },
+  'server_type'        => {
+    label   => 'Server type',
+    type    => 'select',
+    options => [qw(dovecot_plain dovecot_crypt dovecot_digest_md5 courier_plain
+                   courier_crypt)],
+    default => ['dovecot_plain'], },
+  'svc_acct_table'     => { label => 'User Table', default => 'user_acct' },
+  'svc_forward_table'  => { label => 'Forward Table', default => 'forward' },
+  'svc_domain_table'   => { label => 'Domain Table', default => 'domain' },
+  'svc_acct_fields'    => { label => 'svc_acct Export Fields',
+                            default => 'username _password domsvc svcnum' },
+  'svc_forward_fields' => { label => 'svc_forward Export Fields',
+                            default => 'domain svcnum catchall' },
+  'svc_domain_fields'  => { label => 'svc_domain Export Fields',
+                            default => 'srcsvc dstsvc dst' },
+  'resolve_dstsvc'     => { label => q{Resolve svc_forward.dstsvc to an email address and store it in dst. (Doesn't require that you also export dstsvc.)},
+                            type => 'checkbox' },
+
 ;
 
 tie my %ldap_options, 'Tie::IxHash',
@@ -855,7 +873,7 @@ tie my %ldap_options, 'Tie::IxHash',
     'sqlmail' => {
       'desc' => 'Real-time export to SQL-backed mail server',
       'options' => \%sqlmail_options,
-      'nodomain' => 'Y',
+      'nodomain' => 'N',
       'notes' => 'Database schema can be made to work with Courier IMAP and Exim.  Others could work but are untested. (...extended description from pc-intouch?...)',
     },
 
diff --git a/FS/FS/part_export/sqlmail.pm b/FS/FS/part_export/sqlmail.pm
index 4194daf0c..0c0cb367b 100644
--- a/FS/FS/part_export/sqlmail.pm
+++ b/FS/FS/part_export/sqlmail.pm
@@ -1,54 +1,74 @@
 package FS::part_export::sqlmail;
 
-use vars qw(@ISA %fs_mail_table %fields);
+use vars qw(@ISA);
+use FS::Record qw(qsearchs);
 use FS::part_export;
+use Digest::MD5 qw(md5_hex);
 
 @ISA = qw(FS::part_export);
 
-%fs_mail_table = ( svc_acct => 'user',
-                   svc_domain => 'domain' );
-
-# fields that need to be copied into the fs_mail tables
-$fields{user} = [qw(username _password finger domsvc svcnum )];
-$fields{domain} = [qw(domain svcnum catchall )];
-
 sub rebless { shift; }
 
 sub _export_insert {
   my($self, $svc) = (shift, shift);
   # this is a svc_something.
 
-  my $table = $fs_mail_table{$svc->cust_svc->part_svc->svcdb};
-  my @attrib = map {$svc->$_} @{$fields{$table}};
+  my $svcdb = $svc->cust_svc->part_svc->svcdb;
+  my $export_table = $self->option($svcdb . '_table')
+    or die('Export table not defined for svcdb: ' . $svcdb);
+  my @export_fields = split(/\s+/, $self->option($svcdb . '_fields'));
+  my $svchash = update_values($self, $svc, $svcdb);
+
+  foreach my $key (keys(%$svchash)) {
+    unless (grep { $key eq $_ } @export_fields) {
+      delete $svchash->{$key};
+    }
+  }
+
   my $error = $self->sqlmail_queue( $svc->svcnum, 'insert',
-      $table, @attrib );
+    $self->option('server_type'), $export_table,
+    (map { ($_, $svchash->{$_}); } keys(%$svchash)));
   return $error if $error;
   '';
+
 }
 
 sub _export_replace {
   my( $self, $new, $old ) = (shift, shift, shift);
 
-  my $table = $fs_mail_table{$new->cust_svc->part_svc->svcdb};
-
-  my @old = ($old->svcnum, 'delete', $table, $old->svcnum);
-  my @narf = map {$new->$_} @{$fields{$table}};
-  $self->sqlmail_queue($new->svcnum, 'replace', $table, 
-      $new->svcnum, @narf);
-
+  my $svcdb = $new->cust_svc->part_svc->svcdb;
+  my $export_table = $self->option($svcdb . '_table')
+    or die('Export table not defined for svcdb: ' . $svcdb);
+  my @export_fields = split(/\s+/, $self->option($svcdb . '_fields'));
+  my $svchash = update_values($self, $new, $svcdb);
+
+  foreach my $key (keys(%$svchash)) {
+    unless (grep { $key eq $_ } @export_fields) {
+      delete $svchash->{$key};
+    }
+  }
+
+  my $error = $self->sqlmail_queue( $new->svcnum, 'replace',
+    $old->svcnum, $self->option('server_type'), $export_table,
+    (map { ($_, $svchash->{$_}); } keys(%$svchash)));
   return $error if $error;
   '';
+
 }
 
 sub _export_delete {
   my( $self, $svc ) = (shift, shift);
-  my $table = $fs_mail_table{$new->cust_svc->part_svc->svcdb};
+
+  my $svcdb = $svc->cust_svc->part_svc->svcdb;
+  my $table = $self->option($svcdb . '_table')
+    or die('Export table not defined for svcdb: ' . $svcdb);
+
   $self->sqlmail_queue( $svc->svcnum, 'delete', $table,
     $svc->svcnum );
 }
 
 sub sqlmail_queue {
-  my( $self, $svcnum, $method, $table ) = (shift, shift, shift);
+  my( $self, $svcnum, $method ) = (shift, shift, shift);
   my $queue = new FS::queue {
     'svcnum' => $svcnum,
     'job'    => "FS::part_export::sqlmail::sqlmail_$method",
@@ -63,49 +83,97 @@ sub sqlmail_queue {
 
 sub sqlmail_insert { #subroutine, not method
   my $dbh = sqlmail_connect(shift, shift, shift);
-  my( $table, @attrib ) = @_;
+  my( $server_type, $table ) = (shift, shift);
 
-  my $sth = $dbh->prepare(
-    "INSERT INTO $table (" . join (',', @{$fields{$table}}) .
-    ") VALUES ('" . join ("','", @attrib) . "')"
-  ) or die $dbh->errstr;
-  $sth->execute() or die $sth->errstr;
+  my %attrs = @_;
 
+  map { $attrs{$_} = $attrs{$_} ? qq!'$attrs{$_}'! : 'NULL'; } keys(%attrs);
+  my $query = sprintf("INSERT INTO %s (%s) values (%s)",
+                      $table, join(",", keys(%attrs)),
+                      join(',', values(%attrs)));
+
+  $dbh->do($query) or die $dbh->errstr;
   $dbh->disconnect;
+
+  '';
 }
 
 sub sqlmail_delete { #subroutine, not method
   my $dbh = sqlmail_connect(shift, shift, shift);
   my( $table, $svcnum ) = @_;
 
-  my $sth = $dbh->prepare(
-    "DELETE FROM $table WHERE svcnum = $svcnum"
-  ) or die $dbh->errstr;
-  $sth->execute() or die $sth->errstr;
-
+  $dbh->do("DELETE FROM $table WHERE svcnum = $svcnum") or die $dbh->errstr;
   $dbh->disconnect;
+
+  '';
 }
 
 sub sqlmail_replace {
   my $dbh = sqlmail_connect(shift, shift, shift);
-  my( $table, $svcnum, @attrib ) = @_;
+  my($oldsvcnum, $server_type, $table) = (shift, shift, shift);
+
+  my %attrs = @_;
+  map { $attrs{$_} = $attrs{$_} ? qq!'$attrs{$_}'! : 'NULL'; } keys(%attrs);
 
-  my %data;
-  @data{@{$fields{$table}}} = @attrib;
+  my $query = sprintf('UPDATE %s SET %s WHERE svcnum = %s',
+                      $table, join(', ', map {"$_ = $attrs{$_}"} keys(%attrs)),
+                      $oldsvcnum);
 
-  my $sth = $dbh->prepare(
-    "UPDATE $table SET " .
-    ( join ',',  map {$_ . "='" . $data{$_} . "'"} keys(%data) ) .
-    " WHERE svcnum = $svcnum"
-    ) or die $dbh->errstr;
-  $sth->execute() or die $sth->errstr;
+  my $rv = $dbh->do($query) or die $dbh->errstr;
+
+  if ($rv == 0) {
+    $query = sprintf("INSERT INTO %s (%s) values (%s)",
+                     $table, join(",", keys(%attrs)),
+                     join(',', values(%attrs)));
+    $dbh->do($query) or die $dbh->errstr;
+  }
 
   $dbh->disconnect;
+
+  '';
 }
 
 sub sqlmail_connect {
-  #my($datasrc, $username, $password) = @_;
-  #DBI->connect($datasrc, $username, $password) or die $DBI::errstr;
   DBI->connect(@_) or die $DBI::errstr;
 }
 
+sub update_values {
+
+  # Update records to conform to a particular server_type.
+
+  my ($self, $svc, $svcdb) = (shift,shift,shift);
+  my $svchash = $svc->hashref or return '';
+
+  if ($svcdb eq 'svc_acct') {
+    if ($self->option('server_type') eq 'courier_crypt') {
+      my $salt = join '', ('.', '/', 0..9,'A'..'Z', 'a'..'z')[rand 64, rand 64];
+      $svchash->{_password} = crypt($svchash->{_password}, $salt);
+
+    } elsif ($self->option('server_type') eq 'dovecot_plain') {
+      $svchash->{_password} = '{PLAIN}' . $svchash->{_password};
+      
+    } elsif ($self->option('server_type') eq 'dovecot_crypt') {
+      my $salt = join '', ('.', '/', 0..9,'A'..'Z', 'a'..'z')[rand 64, rand 64];
+      $svchash->{_password} = '{CRYPT}' . crypt($svchash->{_password}, $salt);
+
+    } elsif ($self->option('server_type') eq 'dovecot_digest_md5') {
+      my $svc_domain = qsearchs('svc_domain', { svcnum => $svc->domsvc });
+      die('Unable to lookup svc_domain with domsvc: ' . $svc->domsvc)
+        unless ($svc_domain);
+
+      my $domain = $svc_domain->domain;
+      my $md5hash = '{DIGEST-MD5}' . md5_hex(join(':', $svchash->{username},
+                                             $domain, $svchash->{_password}));
+      $svchash->{_password} = $md5hash;
+    }
+  } elsif ($svcdb eq 'svc_forward') {
+    if ($self->option('resolve_dstsvc') && $svc->dstsvc_acct) {
+      $svchash->{dst} = $svc->dstsvc_acct->username . '@' .
+                        $svc->dstsvc_acct->svc_domain->domain;
+    }
+  }
+
+  return($svchash);
+
+}
+
-- 
cgit v1.2.1


From 030bef17868168b05a67d9f5866b55da1bb9439c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Apr 2003 20:53:57 +0000
Subject: on-demand vs. automatic cards & checks: added DCRD and DCHK payment
 types

---
 FS/FS/Conf.pm                             |  4 ++--
 FS/FS/cust_main.pm                        | 17 ++++++++++-------
 FS/FS/part_bill_event.pm                  |  4 ++--
 FS/bin/freeside-daily                     |  2 +-
 FS/bin/freeside-expiration-alerter        |  6 +++---
 FS/bin/freeside-setup                     |  2 ++
 fs_signup/FS-SignupClient/cgi/signup.cgi  |  9 +++++----
 fs_signup/FS-SignupClient/cgi/signup.html |  4 ++++
 httemplate/docs/schema.html               |  4 ++--
 httemplate/edit/cust_main.cgi             | 16 ++++++++++------
 httemplate/edit/part_bill_event.cgi       |  2 +-
 httemplate/edit/process/cust_main.cgi     |  4 ++--
 httemplate/search/cust_main.cgi           |  4 +++-
 httemplate/view/cust_main.cgi             | 12 ++++++++----
 14 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index cb404ff03..5681dde38 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -905,7 +905,7 @@ httemplate/docs/config.html
     'section'     => '',
     'description' => 'Acceptable payment types for the signup server',
     'type'        => 'selectmultiple',
-    'select_enum' => [ qw(CARD CHEK LECB PREPAY BILL COMP) ],
+    'select_enum' => [ qw(CARD DCRD CHEK DCHK LECB PREPAY BILL COMP) ],
   },
 
   {
@@ -1013,7 +1013,7 @@ httemplate/docs/config.html
     'section'     => 'UI',
     'description' => 'Default payment type.  HIDE disables display of billing information and sets customers to BILL.',
     'type'        => 'select',
-    'select_enum' => [ '', qw(CARD CHEK LECB BILL COMP HIDE) ],
+    'select_enum' => [ '', qw(CARD DCRD CHEK DCHK LECB BILL COMP HIDE) ],
   },
 
   {
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index cde370c68..cefc7648f 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -159,7 +159,7 @@ FS::Record.  The following fields are currently supported:
 
 =item ship_fax - phone (optional)
 
-=item payby - `CARD' (credit cards), `CHEK' (electronic check), `LECB' (Phone bill billing), `BILL' (billing), `COMP' (free), or `PREPAY' (special billing type: applies a credit - see L<FS::prepay_credit> and sets billing type to BILL)
+=item payby - I<CARD> (credit card - automatic), I<DCRD> (credit card - on-demand), I<CHEK> (electronic check - automatic), I<DCHK> (electronic check - on-demand), I<LECB> (Phone bill billing), I<BILL> (billing), I<COMP> (free), or I<PREPAY> (special billing type: applies a credit - see L<FS::prepay_credit> and sets billing type to I<BILL>)
 
 =item payinfo - card number, P.O., comp issuer (4-8 lowercase alphanumerics; think username) or prepayment identifier (see L<FS::prepay_credit>)
 
@@ -700,11 +700,11 @@ sub check {
     }
   }
 
-  $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP|PREPAY)$/
+  $self->payby =~ /^(CARD|DCRD|CHEK|DCHK|LECB|BILL|COMP|PREPAY)$/
     or return "Illegal payby: ". $self->payby;
   $self->payby($1);
 
-  if ( $self->payby eq 'CARD' ) {
+  if ( $self->payby eq 'CARD' || $self->payby eq 'DCRD' ) {
 
     my $payinfo = $self->payinfo;
     $payinfo =~ s/\D//g;
@@ -717,7 +717,7 @@ sub check {
     return gettext('unknown_card_type')
       if cardtype($self->payinfo) eq "Unknown";
 
-  } elsif ( $self->payby eq 'CHEK' ) {
+  } elsif ( $self->payby eq 'CHEK' || $self->payby eq 'DCHK' ) {
 
     my $payinfo = $self->payinfo;
     $payinfo =~ s/[^\d\@]//g;
@@ -770,7 +770,9 @@ sub check {
   }
 
   if ( $self->payname eq '' && $self->payby ne 'CHEK' &&
-       ( ! $conf->exists('require_cardname') || $self->payby ne 'CARD' ) ) {
+       ( ! $conf->exists('require_cardname')
+         || $self->payby !~ /^(CARD|DCRD)$/  ) 
+  ) {
     $self->payname( $self->first. " ". $self->getfield('last') );
   } else {
     $self->payname =~ /^([\w \,\.\-\']+)$/
@@ -1244,8 +1246,9 @@ sub bill {
 (Attempt to) collect money for this customer's outstanding invoices (see
 L<FS::cust_bill>).  Usually used after the bill method.
 
-Depending on the value of `payby', this may print an invoice (`BILL'), charge
-a credit card (`CARD'), or just add any necessary (pseudo-)payment (`COMP').
+Depending on the value of `payby', this may print or email an invoice (I<BILL>,
+I<DCRD>, or I<DCHK>), charge a credit card (I<CARD>), charge via electronic
+check/ACH (I<CHEK>), or just add any necessary (pseudo-)payment (I<COMP>).
 
 Most actions are now triggered by invoice events; see L<FS::part_bill_event>
 and the invoice events web interface.
diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
index a75a011b0..e0e4f3f19 100644
--- a/FS/FS/part_bill_event.pm
+++ b/FS/FS/part_bill_event.pm
@@ -37,7 +37,7 @@ FS::Record.  The following fields are currently supported:
 
 =item eventpart - primary key
 
-=item payby - CARD, CHEK, LECB, BILL, or COMP
+=item payby - CARD, DCRD, CHEK, DCHK, LECB, BILL, or COMP
 
 =item event - event name
 
@@ -140,7 +140,7 @@ sub check {
   }
 
   my $error = $self->ut_numbern('eventpart')
-    || $self->ut_enum('payby', [qw( CARD CHEK LECB BILL COMP )] )
+    || $self->ut_enum('payby', [qw( CARD DCRD CHEK DCHK LECB BILL COMP )] )
     || $self->ut_text('event')
     || $self->ut_anything('eventcode')
     || $self->ut_number('seconds')
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 579d071ac..63e621b57 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -113,7 +113,7 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
   -d: Pretend it's 'date'.  Date is in any format Date::Parse is happy with,
       but be careful.
 
-  -p: Only process customers with the specified payby (CARD, CHEK, BILL, COMP, LECB)
+  -p: Only process customers with the specified payby (I<CARD>, I<DCRD>, I<CHEK>, I<DCHK>, I<BILL>, I<COMP>, I<LECB>)
 
   -v: enable debugging
 
diff --git a/FS/bin/freeside-expiration-alerter b/FS/bin/freeside-expiration-alerter
index 5399f6d22..691fd3aa5 100755
--- a/FS/bin/freeside-expiration-alerter
+++ b/FS/bin/freeside-expiration-alerter
@@ -97,7 +97,7 @@ foreach my $customer (@customers)
   my $expire_time = timelocal(0,0,0,$payday,--$paymonth,$payyear);
 
   #credit cards expire at the end of the month/year of their exp date
-  if ($payby eq 'CARD') {
+  if ($payby eq 'CARD' || $payby eq 'DCRD') {
     ($paymonth < 11) ? $paymonth++ : ($paymonth=0, $payyear++);
     $expire_time = timelocal(0,0,0,$payday,$paymonth,$payyear);
     $expire_time--;
@@ -127,7 +127,7 @@ foreach my $customer (@customers)
         $FS::alerter::_template::first = $first;
         $FS::alerter::_template::last = $last;
         $FS::alerter::_template::company = $company;
-        if ($payby eq 'CARD') {
+        if ($payby eq 'CARD' || $payby eq 'DCRD') {
           $FS::alerter::_template::payby = "credit card (" .
             substr($payinfo, 0, 2) . "xxxxxxxxxx" .
             substr($payinfo, -4) . ")";
@@ -202,7 +202,7 @@ user: From the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
 
-$Id: freeside-expiration-alerter,v 1.4 2002-09-16 09:27:14 ivan Exp $
+$Id: freeside-expiration-alerter,v 1.5 2003-04-21 20:53:57 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 010ec4c14..8ec014186 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -291,6 +291,8 @@ foreach my $aref (
   [ 'COMP', 'Comp invoice', '$cust_bill->comp();', 30, 'comp' ],
   [ 'CARD', 'Batch card', '$cust_bill->batch_card();', 40, 'batch-card' ],
   [ 'BILL', 'Send invoice', '$cust_bill->send();', 50, 'send' ],
+  [ 'DCRD', 'Send invoice', '$cust_bill->send();', 50, 'send' ],
+  [ 'DCHK', 'Send invoice', '$cust_bill->send();', 50, 'send' ],
 ) {
 
   my $part_bill_event = new FS::part_bill_event({
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 6672e605c..e384aaf8e 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.35 2002-12-24 23:03:27 ivan Exp $
+# $Id: signup.cgi,v 1.36 2003-04-21 20:53:57 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -160,9 +160,10 @@ if ( defined $cgi->param('magic') ) {
     }
 
     $payby = $cgi->param('payby');
-    if ( $payby eq 'CHEK' ) {
+    if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) {
       #$payinfo = join('@', map { $cgi->param( $payby. "_payinfo$_" ) } (1,2) );
-      $payinfo = $cgi->param('CHEK_payinfo1').'@'.$cgi->param('CHEK_payinfo2');
+      $payinfo = $cgi->param($payby. '_payinfo1'). '@'. 
+                 $cgi->param($payby. '_payinfo2');
     } else {
       $payinfo = $cgi->param( $payby. '_payinfo' );
     }
@@ -212,7 +213,7 @@ if ( defined $cgi->param('magic') ) {
     } else {
       $password2 = $cgi->param('_password2');
 
-      if ( $payby eq 'CARD' && $cgi->param('CARD_type') ) {
+      if ( $payby =~ /^(CARD|DCRD)$/ && $cgi->param('CARD_type') ) {
         $payinfo =~ s/\D//g;
 
         $payinfo =~ /^(\d{13,16})$/
diff --git a/fs_signup/FS-SignupClient/cgi/signup.html b/fs_signup/FS-SignupClient/cgi/signup.html
index 724ffd7f8..80774099c 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.html
+++ b/fs_signup/FS-SignupClient/cgi/signup.html
@@ -92,7 +92,9 @@ Contact Information
   
     my %payby = (
       'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="">!,
       'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
       'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
       'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", "12-2037"). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
       'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
@@ -102,7 +104,9 @@ Contact Information
     my( $account, $aba ) = split('@', $payinfo);
     my %paybychecked = (
       'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="$payname">!,
       'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
       'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
       'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", $paydate). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
       'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 593ea82a0..a59755e76 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -39,7 +39,7 @@
     <li><a name="part_bill_event" href="man/FS/part_bill_event.html">part_bill_event</a> - Invoice event definitions
       <ul>
         <li>eventpart - primary key
-        <li>payby - CARD, CHEK, LECB, BILL, or COMP
+        <li>payby - CARD, DCRD, CHEK, DCHK, LECB, BILL, or COMP
         <li>event - event name
         <li>eventcode - event action
         <li>seconds - how long after the invoice date (<a href="#cust_bill">cust_bill</a>._date) events of this type are triggered
@@ -116,7 +116,7 @@
         <li><i>ship_daytime</i>
         <li><i>ship_night</i>
         <li><i>ship_fax</i>
-        <li>payby - CARD, CHEK, LECB, BILL, or COMP
+        <li>payby - CARD, DCHK, CHEK, DCHK, LECB, BILL, or COMP
         <li>payinfo - card number, P.O.#, or comp issuer
         <li>paydate - expiration date
         <li>payname - billing name (name on card)
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 706526865..d8edbcd8e 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -357,7 +357,7 @@ if ( $payby_default eq 'HIDE' ) {
   print qq!<INPUT TYPE="hidden" NAME="invoicing_list" VALUE="!.
         join(', ', $cust_main->invoicing_list). '">';
 
-  foreach my $payby (qw( CARD CHEK LECB BILL COMP )) {
+  foreach my $payby (qw( CARD DCRD CHEK DCHK LECB BILL COMP )) {
     foreach my $field (qw( payinfo payname )) {
       print qq!<INPUT TYPE="hidden" NAME="${payby}_$field" VALUE="!.
             $cust_main->getfield($field). '">';
@@ -405,8 +405,10 @@ if ( $payby_default eq 'HIDE' ) {
   );
 
   my %payby = (
-    'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-    'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE=""><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+    'CARD' => qq!Credit card (automatic)<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+    'DCRD' => qq!Credit card (on-demand)<BR>${r}<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("DCRD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="">!,
+    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE=""><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE=""><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
     'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
@@ -415,15 +417,17 @@ if ( $payby_default eq 'HIDE' ) {
   my( $account, $aba ) = split('@', $payinfo);
 
   my %paybychecked = (
-    'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-    'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+    'CARD' => qq!Credit card (automatic)<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+    'DCRD' => qq!Credit card (on-demand)<BR>${r}<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("DCRD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="$payname">!,
+    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
     'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
 );
 
   $cust_main->payby($payby_default) unless $cust_main->payby;
-  for (qw(CARD CHEK LECB BILL COMP)) {
+  for (qw(CARD DCRD CHEK DCHK LECB BILL COMP)) {
     print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
     if ($cust_main->payby eq "$_") {
       print qq! CHECKED> $paybychecked{$_}</TD>!;
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 2104b4530..6426eed93 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -41,7 +41,7 @@ print ntable("#cccccc",2), <<END;
 <TR><TD ALIGN="right">Payby</TD><TD><SELECT NAME="payby">
 END
 
-for (qw(CARD CHEK LECB BILL COMP)) {
+for (qw(CARD DCRD CHEK DCHK LECB BILL COMP)) {
   print qq!<OPTION VALUE="$_"!;
   if ($part_bill_event->payby eq $_) {
     print " SELECTED>$_</OPTION>";
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 5e6000c05..3700d9b96 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -10,9 +10,9 @@ $cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
 
 my $payby = $cgi->param('payby');
 if ( $payby ) {
-  if ( $payby eq 'CHEK' ) {
+  if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) {
     $cgi->param('payinfo',
-      $cgi->param('CHEK_payinfo1'). '@'. $cgi->param('CHEK_payinfo2') );
+      $cgi->param($payby. '_payinfo1'). '@'. $cgi->param($payby. '_payinfo2') );
   } else {
     $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
   }
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index ac238b63e..fe4ec5d05 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -469,7 +469,9 @@ sub cardsearch {
   $card =~ /^(\d{13,16})$/ or eidiot "Illegal card number\n";
   my($payinfo)=$1;
 
-  [ qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'CARD'}) ];
+  [ qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'CARD'}) 
+    qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'DCRD'})
+  ];
 }
 
 sub referralsearch {
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 01ad57373..2dc53e674 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -223,10 +223,12 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
         '<TR><TD ALIGN="right">Billing type</TD><TD BGCOLOR="#ffffff">',
   ;
 
-  if ( $cust_main->payby eq 'CARD' ) {
+  if ( $cust_main->payby eq 'CARD' && $cust_main->payby eq 'DCRD' ) {
     my $payinfo = $cust_main->payinfo;
     $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
-    print 'Credit card</TD></TR>',
+    print 'Credit card ',
+          ( $cust_main->payby eq 'CARD' ? '(automatic)' : '(on-demand)' ),
+          '</TD></TR>',
           '<TR><TD ALIGN="right">Card number</TD><TD BGCOLOR="#ffffff">',
           $payinfo, '</TD></TR>',
           '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
@@ -234,9 +236,11 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
           '<TR><TD ALIGN="right">Name on card</TD><TD BGCOLOR="#ffffff">',
           $cust_main->payname, '</TD></TR>'
     ;
-  } elsif ( $cust_main->payby eq 'CHEK' ) {
+  } elsif ( $cust_main->payby eq 'CHEK'  && $cust_main->payby eq 'DCHK') {
     my( $account, $aba ) = split('@', $cust_main->payinfo );
-    print 'Electronic check</TD></TR>',
+    print 'Electronic check',
+          ( $cust_main->payby eq 'CHEK' ? '(automatic)' : '(on-demand)' ),
+          '</TD></TR>',
           '<TR><TD ALIGN="right">Account number</TD><TD BGCOLOR="#ffffff">',
           $account, '</TD></TR>',
           '<TR><TD ALIGN="right">ABA/Routing code</TD><TD BGCOLOR="#ffffff">',
-- 
cgit v1.2.1


From 76e4bd639e70f707f7b9623b6228904146fbf07b Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 21 Apr 2003 21:12:09 +0000
Subject: Lines added for clairity

---
 httemplate/edit/router.cgi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/httemplate/edit/router.cgi b/httemplate/edit/router.cgi
index d2279ff00..b524c6494 100755
--- a/httemplate/edit/router.cgi
+++ b/httemplate/edit/router.cgi
@@ -32,6 +32,10 @@ if($cgi->param('error')) {
     Router #<%=$routernum or "(NEW)"%>
 
 <BR><BR>Name <INPUT TYPE="text" NAME="routername" SIZE=32 VALUE="<%=$hashref->{routername}%>">
+
+<BR><BR>
+Custom fields:
+<BR>
 <%=table() %>
 
 <%
-- 
cgit v1.2.1


From b938a41859030d3d3a126f39fa1b64b9211145a5 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 21 Apr 2003 21:13:20 +0000
Subject: Fixed bug with $routernum and new routers.  Navigation cleanup.

---
 httemplate/edit/process/router.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/httemplate/edit/process/router.cgi b/httemplate/edit/process/router.cgi
index c0cb884f0..1b7fc3805 100644
--- a/httemplate/edit/process/router.cgi
+++ b/httemplate/edit/process/router.cgi
@@ -34,6 +34,7 @@ if($old) {
   } #else do nothing
 } else {
   $error = $new->insert;
+  $routernum = $new->routernum;
 }
 
 check($error);
@@ -95,6 +96,6 @@ foreach($cgi->param) {
 
 # Yay, everything worked!
 $dbh->commit or die $dbh->errstr;
-print $cgi->redirect(popurl(3). "edit/router.cgi?$routernum");
+print $cgi->redirect(popurl(3). "browse/router.cgi");
 
 %>
-- 
cgit v1.2.1


From fcfad3cd469df0df1beb2d54ea990a387915ebe2 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 21 Apr 2003 21:29:35 +0000
Subject: Navigation fixes.

---
 httemplate/edit/part_router_field.cgi | 7 ++++---
 httemplate/edit/process/generic.cgi   | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/httemplate/edit/part_router_field.cgi b/httemplate/edit/part_router_field.cgi
index c3e99be2c..02962b1c0 100644
--- a/httemplate/edit/part_router_field.cgi
+++ b/httemplate/edit/part_router_field.cgi
@@ -21,7 +21,10 @@ if ( $cgi->param('error') ) {
 my $action = $part_router_field->routerfieldpart ? 'Edit' : 'Add';
 
 my $p1 = popurl(1);
-print header("$action Router Extended Field Definition", '');
+print header("$action Router Extended Field Definition",
+             menubar('Main Menu' => $p,
+                     'View all Extended Fields' => $p. 'browse/generic.cgi?part_router_field')
+            );
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
@@ -30,8 +33,6 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
 <FORM ACTION="<%=$p1%>process/generic.cgi" METHOD=POST>
 
 <INPUT TYPE="hidden" NAME="table" VALUE="part_router_field">
-<INPUT TYPE="hidden" NAME="redirect_ok" 
-    VALUE="<%=$p1%>part_router_field.cgi">
 <INPUT TYPE="hidden" NAME="routerfieldpart" VALUE="<%=
   $routerfieldpart%>">
 Field #<B><%=$routerfieldpart or "(NEW)"%></B><BR><BR>
diff --git a/httemplate/edit/process/generic.cgi b/httemplate/edit/process/generic.cgi
index 751987f7a..9c54feb1d 100644
--- a/httemplate/edit/process/generic.cgi
+++ b/httemplate/edit/process/generic.cgi
@@ -27,6 +27,7 @@ use DBIx::DBSchema::Table;
 
 my $error;
 my $p2 = popurl(2);
+my $p3 = popurl(3);
 my $table = $cgi->param('table');
 my $dbdef = dbdef or die "Cannot fetch dbdef!";
 
@@ -56,7 +57,7 @@ if($pkey_val and (my $old = qsearchs($table, { $pkey, $pkey_val} ))) {
 }
 
 my $redirect_ok = (($cgi->param('redirect_ok')) ?
-                    $cgi->param('redirect_ok') : $p2."view/$table.cgi");
+                    $cgi->param('redirect_ok') : $p3."browse/generic.cgi?$table");
 my $redirect_error = (($cgi->param('redirect_error')) ?
                        $cgi->param('redirect_error') : $cgi->referer());
 
@@ -64,6 +65,6 @@ if($error) {
   $cgi->param('error', $error);
   print $cgi->redirect($redirect_error . '?' . $cgi->query_string);
 } else {
-  print $cgi->redirect($redirect_ok . '?' .$pkey_val);
+  print $cgi->redirect($redirect_ok);
 }
 %>
-- 
cgit v1.2.1


From c302e891a8eb8dd565cb3b2dc83cdfa5c0a09537 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 21 Apr 2003 21:40:00 +0000
Subject: renamed/clarified exclude_ip_addr option.

---
 FS/FS/Conf.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 5681dde38..545d8b77e 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -374,9 +374,9 @@ httemplate/docs/config.html
   },
 
   {
-    'key'         => 'excludeaddr',
-    'section'     => 'deprecated',
-    'description' => 'Addresses to exclude from assignment, one per line.',
+    'key'         => 'exclude_ip_addr',
+    'section'     => '',
+    'description' => 'Exclude these from the list of available broadband service IP addresses. (One per line)',
     'type'        => 'textarea',
   },
   
-- 
cgit v1.2.1


From e27c01a149940c1f42da1f7246f775ab0533463b Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 21 Apr 2003 21:42:24 +0000
Subject: renamed config option excludeaddr

---
 FS/FS/addr_block.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/addr_block.pm b/FS/FS/addr_block.pm
index c9305f6af..af4e5fb79 100755
--- a/FS/FS/addr_block.pm
+++ b/FS/FS/addr_block.pm
@@ -174,7 +174,7 @@ sub next_free_addr {
   my $self = shift;
 
   my $conf = new FS::Conf;
-  my @excludeaddr = $conf->config('excludeaddr');
+  my @excludeaddr = $conf->config('exclude_ip_addr');
   
   my @used = (
     map { $_->NetAddr->addr } 
-- 
cgit v1.2.1


From 579c95a605ba3eeacd28e965d9c1ed7ad6f03374 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Apr 2003 22:40:37 +0000
Subject: typo

---
 httemplate/view/svc_acct.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index f04e47163..599c1d8b9 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,4 +1,4 @@
-<-- mason kludge -->
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
-- 
cgit v1.2.1


From 60527016538d1794227983d99ce3b77c8fcd7426 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Apr 2003 04:39:40 +0000
Subject: - mysql 4.1 is available; update documentation - remove last vestiges
 of 1.3-style qmail/vpopmail exports from svc_domain and   svc_forward; add
 appropriate exports (closes: Bug#299)

---
 FS/FS/Conf.pm                              |   2 +-
 FS/FS/part_export.pm                       |  20 ++-
 FS/FS/part_export/domain_shellcommands.pm  |  18 ++-
 FS/FS/part_export/forward_shellcommands.pm | 110 +++++++++++++++++
 FS/FS/svc_domain.pm                        |  59 ++-------
 FS/FS/svc_forward.pm                       | 192 +----------------------------
 FS/MANIFEST                                |   2 +
 FS/t/part_export-forward_shellcommands.t   |   5 +
 httemplate/docs/install.html               |  16 ++-
 9 files changed, 166 insertions(+), 258 deletions(-)
 create mode 100644 FS/FS/part_export/forward_shellcommands.pm
 create mode 100644 FS/t/part_export-forward_shellcommands.t

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 545d8b77e..d0ecf32a6 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -818,7 +818,7 @@ httemplate/docs/config.html
   {
     'key'         => 'vpopmailmachines',
     'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add a <i>cp</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain your vpopmail pop toasters, one per line.  Each line is of the form "machinename vpopdir vpopuid vpopgid".  For example: <code>poptoaster.domain.tld /home/vpopmail 508 508</code>  Note: vpopuid and vpopgid are values taken from the vpopmail machine\'s /etc/passwd',
+    'description' => '<b>DEPRECATED</b>, add a <i>vpopmail</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to contain your vpopmail pop toasters, one per line.  Each line is of the form "machinename vpopdir vpopuid vpopgid".  For example: <code>poptoaster.domain.tld /home/vpopmail 508 508</code>  Note: vpopuid and vpopgid are values taken from the vpopmail machine\'s /etc/passwd',
     'type'        => 'textarea',
   },
 
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 4471d6e00..f99dc6341 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -815,6 +815,18 @@ tie my %ldap_options, 'Tie::IxHash',
   'radius'     => { label=>'Export RADIUS attributes', type=>'checkbox', },
 ;
 
+tie my %forward_shellcommands_options, 'Tie::IxHash',
+  'user' => { lable=>'Remote username', default=>'root' },
+  'useradd' => { label=>'Insert command',
+                 default=>'',
+               },
+  'userdel'  => { label=>'Delete command',
+                  default=>'',
+                },
+  'usermod'  => { label=>'Modify command',
+                  default=>'',
+                },
+;
 
 #export names cannot have dashes...
 %exports = (
@@ -935,7 +947,7 @@ tie my %ldap_options, 'Tie::IxHash',
     'domain_shellcommands' => {
       'desc' => 'Run remote commands via SSH, for domains.',
       'options' => \%domain_shellcommands_options,
-      'notes'    => 'Run remote commands via SSH, for domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.',
+      'notes'    => 'Run remote commands via SSH, for domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="qmail catchall .qmail-domain-default maintenance" onClick=\'this.form.useradd.value = "[ \"$uid\" -a \"$gid\" -a \"$dir\" -a \"$qdomain\" ] && [ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }"; this.form.userdel.value = ""; this.form.usermod.value = "";\'></UL>',
     },
 
 
@@ -948,6 +960,12 @@ tie my %ldap_options, 'Tie::IxHash',
       #'nodomain' => 'Y',
       'notes' => 'Database schema can be made to work with Courier IMAP and Exim.  Others could work but are untested. (...extended description from pc-intouch?...)',
     },
+
+    'forward_shellcommands' => {
+      'desc' => 'Run remote commands via SSH, for forwards',
+      'options' => \%forward_shellcommands_options,
+      'notes' => 'Run remote commands via SSH, for forwards.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="text vpopmail maintenance" onClick=\'this.form.useradd.value = "[ -d /home/vpopmail/domains/$domain/$username ] && { echo \"$destination\" > /home/vpopmail/domains/$domain/$username/.qmail; chown vpopmail:vchkpw /home/vpopmail/domains/$domain/$username/.qmail; }"; this.form.userdel.value = "rm /home/vpopmail/domains/$domain/$username/.qmail"; this.form.usermod.value = "mv /home/vpopmail/domains/$old_domain/$old_username/.qmail /home/vpopmail/domains/$new_domain/$new_username; [ \"$old_destination\" != \"$new_destination\" ] && { echo \"$new_destination\" > /home/vpopmail/domains/$new_domain/$new_username/.qmail; chown vpopmail:vchkpw /home/vpopmail/domains/$new_domain/$new_username/.qmail; }";\'></UL>',
+    },
   },
 
   'svc_www' => {
diff --git a/FS/FS/part_export/domain_shellcommands.pm b/FS/FS/part_export/domain_shellcommands.pm
index 5b3cd5d79..5b100e8c6 100644
--- a/FS/FS/part_export/domain_shellcommands.pm
+++ b/FS/FS/part_export/domain_shellcommands.pm
@@ -28,17 +28,15 @@ sub _export_command {
     no strict 'refs';
     ${$_} = $svc_domain->getfield($_) foreach $svc_domain->fields;
   }
+  ( $qdomain = $domain ) =~ s/\./:/g; #see dot-qmail(5): EXTENSION ADDRESSES
 
-#  my $domain_record = $svc_www->domain_record; # or die ?
-#  my $zone = $domain_record->reczone; # or die ?
-#  unless ( $zone =~ /\.$/ ) {
-#    my $svc_domain = $domain_record->svc_domain; # or die ?
-#    $zone .= '.'. $svc_domain->domain;
-#  }
-
-#  my $svc_acct = $svc_www->svc_acct; # or die ?
-#  my $username = $svc_acct->username;
-#  my $homedir = $svc_acct->dir; # or die ?
+  if ( $svc_domain->catchall ) {
+    no strict 'refs';
+    my $svc_acct = $svc_domain->catchall_svc_acct;
+    ${$_} = $svc_acct->getfield($_) foreach qw(uid gid dir);
+  } else {
+    ${$_} = '' foreach qw(uid gid dir);
+  }
 
   #done setting variables for the command
 
diff --git a/FS/FS/part_export/forward_shellcommands.pm b/FS/FS/part_export/forward_shellcommands.pm
new file mode 100644
index 000000000..43d558a69
--- /dev/null
+++ b/FS/FS/part_export/forward_shellcommands.pm
@@ -0,0 +1,110 @@
+package FS::part_export::forward_shellcommands;
+
+use strict;
+use vars qw(@ISA);
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my($self) = shift;
+  $self->_export_command('useradd', @_);
+}
+
+sub _export_delete {
+  my($self) = shift;
+  $self->_export_command('userdel', @_);
+}
+
+sub _export_command {
+  my ( $self, $action, $svc_forward ) = (shift, shift, shift);
+  my $command = $self->option($action);
+
+  #set variable for the command
+  no strict 'vars';
+  {
+    no strict 'refs';
+    ${$_} = $svc_forward->getfield($_) foreach $svc_forward->fields;
+  }
+
+  my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->srcsvc } );
+  $username = $svc_acct->username;
+  $domain = $svc_acct->domain;
+  if ($self->dstsvc) {
+    $destination = $self->dstsvc_acct->email;
+  } else {
+    $destination = $self->dst;
+  }
+
+  #done setting variables for the command
+
+  $self->shellcommands_queue( $svc_forward->svcnum,
+    user         => $self->option('user')||'root',
+    host         => $self->machine,
+    command      => eval(qq("$command")),
+  );
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = (shift, shift, shift);
+  my $command = $self->option('usermod');
+  
+  #set variable for the command
+  no strict 'vars';
+  {
+    no strict 'refs';
+    ${"old_$_"} = $old->getfield($_) foreach $old->fields;
+    ${"new_$_"} = $new->getfield($_) foreach $new->fields;
+  }
+
+  my $old_svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->srcsvc } );
+  $old_username = $old_svc_acct->username;
+  $old_domain = $old_svc_acct->domain;
+  if ($self->dstsvc) {
+    $old_destination = $self->dstsvc_acct->email;
+  } else {
+    $old_destination = $self->dst;
+  }
+
+  my $new_svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->srcsvc } );
+  $new_username = $new_svc_acct->username;
+  $new_domain = $new_svc_acct->domain;
+  if ($self->dstsvc) {
+    $new_destination = $self->dstsvc_acct->email;
+  } else {
+    $new_destination = $self->dst;
+  }
+
+  #done setting variables for the command
+
+  $self->shellcommands_queue( $new->svcnum,
+    user         => $self->option('user')||'root',
+    host         => $self->machine,
+    command      => eval(qq("$command")),
+  );
+}
+
+#a good idea to queue anything that could fail or take any time
+sub shellcommands_queue {
+  my( $self, $svcnum ) = (shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => "FS::part_export::forward_shellcommands::ssh_cmd",
+  };
+  $queue->insert( @_ );
+}
+
+sub ssh_cmd { #subroutine, not method
+  use Net::SSH '0.07';
+  &Net::SSH::ssh_cmd( { @_ } );
+}
+
+#sub shellcommands_insert { #subroutine, not method
+#}
+#sub shellcommands_replace { #subroutine, not method
+#}
+#sub shellcommands_delete { #subroutine, not method
+#}
+
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 3941d6eff..81edc337e 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -3,14 +3,13 @@ package FS::svc_domain;
 use strict;
 use vars qw( @ISA $whois_hack $conf $smtpmachine
   @defaultrecords $soadefaultttl $soaemail $soaexpire $soamachine
-  $soarefresh $soaretry $qshellmachine $nossh_hack 
+  $soarefresh $soaretry
 );
 use Carp;
 use Mail::Internet 1.44;
 use Mail::Header;
 use Date::Format;
 use Net::Whois 1.0;
-use Net::SSH;
 use FS::Record qw(fields qsearch qsearchs dbh);
 use FS::Conf;
 use FS::svc_Common;
@@ -37,9 +36,6 @@ $FS::UID::callback{'FS::domain'} = sub {
   $soarefresh    = $conf->config('soarefresh');
   $soaretry      = $conf->config('soaretry');
 
-  $qshellmachine = $conf->exists('qmailmachines')
-                   ? $conf->config('shellmachine')
-                   : '';
 };
 
 =head1 NAME
@@ -120,21 +116,6 @@ If any records are defined in the I<defaultrecords> configuration file,
 appropriate records are added to the domain_record table (see
 L<FS::domain_record>).
 
-If a machine is defined in the I<shellmachine> configuration value, the
-I<qmailmachines> configuration file exists, and the I<catchall> field points
-to an an account with a home directory (see L<FS::svc_acct>), the command:
-
-  [ -e $dir/.qmail-$qdomain-defualt ] || {
-    touch $dir/.qmail-$qdomain-default;
-    chown $uid:$gid $dir/.qmail-$qdomain-default;
-  }
-
-is executed on shellmachine via ssh (see L<dot-qmail/"EXTENSION ADDRESSES">).
-This behaviour can be supressed by setting $FS::svc_domain::nossh_hack true.
-
-a machine is defined
-in the 
-
 =cut
 
 sub insert {
@@ -211,28 +192,6 @@ sub insert {
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
-  if ( $qshellmachine && $self->catchall && ! $nossh_hack ) {
-
-    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->catchall } )
-      or warn "WARNING: inserted unknown catchall: ". $self->catchall;
-    if ( $svc_acct && $svc_acct->dir ) {
-      my $qdomain = $self->domain;
-      $qdomain =~ s/\./:/g; #see manpage for 'dot-qmail': EXTENSION ADDRESSES
-      my ( $uid, $gid, $dir ) = (
-        $svc_acct->uid,
-        $svc_acct->gid,
-        $svc_acct->dir,
-      );
-  
-    my $queue = new FS::queue {
-      'svcnum' => $self->svcnum,
-      'job'    => 'Net::SSH::ssh_cmd',
-    };
-    $error = $queue->insert("root\@$qshellmachine", "[ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }" );
-
-    }
-  }
-
   ''; #no error
 }
 
@@ -411,6 +370,15 @@ sub domain_record {
 
 }
 
+sub catchall_svc_acct {
+  my $self = shift;
+  if ( $self->catchall ) {
+    qsearchs( 'svc_acct', { 'svcnum' => $self->catchall } );
+  } else {
+    '';
+  }
+}
+
 =item whois
 
 Returns the Net::Whois::Domain object (see L<Net::Whois>) for this domain, or
@@ -449,8 +417,6 @@ sub submit_internic {
 
 =head1 BUGS
 
-All BIND/DNS fields should be included (and exported).
-
 Delete doesn't send a registration template.
 
 All registries should be supported.
@@ -462,9 +428,8 @@ The $recref stuff in sub check should be cleaned up.
 =head1 SEE ALSO
 
 L<FS::svc_Common>, L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>,
-L<FS::part_svc>, L<FS::cust_pkg>, L<Net::Whois>, L<ssh>,
-L<dot-qmail>, schema.html from the base documentation, config.html from the
-base documentation.
+L<FS::part_svc>, L<FS::cust_pkg>, L<Net::Whois>, schema.html from the base
+documentation, config.html from the base documentation.
 
 =cut
 
diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index 1c5b5c40d..2b1fb9225 100644
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -1,9 +1,7 @@
 package FS::svc_forward;
 
 use strict;
-use vars qw( @ISA $nossh_hack $conf $shellmachine @qmailmachines
-             @vpopmailmachines );
-use Net::SSH qw(ssh);
+use vars qw( @ISA );
 use FS::Conf;
 use FS::Record qw( fields qsearch qsearchs dbh );
 use FS::svc_Common;
@@ -13,21 +11,6 @@ use FS::svc_domain;
 
 @ISA = qw( FS::svc_Common );
 
-#ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::svc_forward'} = sub { 
-  $conf = new FS::Conf;
-  if ( $conf->exists('qmailmachines') ) {
-    $shellmachine = $conf->config('shellmachine')
-  } else {
-    $shellmachine = '';
-  }
-  if ( $conf->exists('vpopmailmachines') ) {
-    @vpopmailmachines = $conf->config('vpopmailmachines');
-  } else {
-    @vpopmailmachines = ();
-  }
-};
-
 =head1 NAME
 
 FS::svc_forward - Object methods for svc_forward records
@@ -91,17 +74,6 @@ the error, otherwise returns false.
 The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
 defined.  An FS::cust_svc record will be created and inserted.
 
-If the configuration value (see L<FS::Conf>) vpopmailmachines exists, then
-the command:
-
-  [ -d $vpopdir/domains/$domain/$source ] && {
-    echo "$destination" >> $vpopdir/domains/$domain/$username/.$qmail
-    chown $vpopuid:$vpopgid $vpopdir/domains/$domain/$username/.$qmail
-  }
-
-is executed on each vpopmailmachine via ssh (see the vpopmail documentation).
-This behaviour can be supressed by setting $FS::svc_forward::nossh_hack true.
-
 =cut
 
 sub insert {
@@ -128,32 +100,6 @@ sub insert {
     return $error;
   }
 
-  my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->srcsvc } );
-  my $username = $svc_acct->username;
-  my $domain = $svc_acct->domain;
-  my $destination;
-  if ($self->dstsvc) {
-    $destination = $self->dstsvc_acct->email;
-  } else {
-    $destination = $self->dst;
-  }
-    
-  foreach my $vpopmailmachine ( @vpopmailmachines ) {
-    my($machine, $vpopdir, $vpopuid, $vpopgid) = split(/\s+/, $vpopmailmachine);
-    my $queue = new FS::queue {
-      'svcnum' => $self->svcnum,
-      'job'    => 'Net::SSH::ssh_cmd',
-    };
-    # should be neater
-    my $error = $queue->insert("root\@$machine","[ -d $vpopdir/domains/$domain/$username ] && { echo \"$destination\" >> $vpopdir/domains/$domain/$username/.qmail; chown $vpopuid:$vpopgid $vpopdir/domains/$domain/$username/.qmail; }") 
-      unless $nossh_hack;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-
-  }
-
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
 
@@ -166,19 +112,6 @@ returns the error, otherwise returns false.
 
 The corresponding FS::cust_svc record will be deleted as well.
 
-If the configuration value vpopmailmachines exists, then the command:
-
-  { sed -e '/^$destination/d' < 
-      $vpopdir/domains/$srcdomain/$srcusername/.qmail >
-      $vpopdir/domains/$srcdomain/$srcusername/.qmail.temp;
-    mv $vpopdir/domains/$srcdomain/$srcusername/.qmail.temp
-      $vpopdir/domains/$srcdomain/$srcusername/.qmail;
-    chown $vpopuid.$vpopgid $vpopdir/domains/$srcdomain/$srcusername/.qmail; }
-    
-
-is executed on each vpopmailmachine via ssh.  This behaviour can be supressed
-by setting $FS::svc_forward_nossh_hack true.
-
 =cut
 
 sub delete {
@@ -201,37 +134,6 @@ sub delete {
     return $error;
   }
 
-  my $svc_acct = $self->srcsvc_acct;
-  my $username = $svc_acct->username;
-  my $domain = $svc_acct->domain;
-  my $destination;
-  if ($self->dstsvc) {
-    $destination = $self->dstsvc_acct->email;
-  } else {
-    $destination = $self->dst;
-  }
-  foreach my $vpopmailmachine ( @vpopmailmachines ) {
-    my($machine, $vpopdir, $vpopuid, $vpopgid) =
-      split(/\s+/, $vpopmailmachine);
-    my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' };
-    # should be neater
-    my $error = $queue->insert("root\@$machine",
-      "sed -e '/^$destination/d' " .
-        "< $vpopdir/domains/$domain/$username/.qmail" .
-        "> $vpopdir/domains/$domain/$username/.qmail.temp; " .
-      "mv $vpopdir/domains/$domain/$username/.qmail.temp " .
-        "$vpopdir/domains/$domain/$username/.qmail; " .
-      "chown $vpopuid.$vpopgid $vpopdir/domains/$domain/$username/.qmail;"
-    )
-      unless $nossh_hack;
-
-    if ($error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-
-  }
-
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 }
@@ -242,29 +144,6 @@ sub delete {
 Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
-If the configuration value vpopmailmachines exists, then the command:
-
-  { sed -e '/^$destination/d' < 
-      $vpopdir/domains/$srcdomain/$srcusername/.qmail >
-      $vpopdir/domains/$srcdomain/$srcusername/.qmail.temp;
-    mv $vpopdir/domains/$srcdomain/$srcusername/.qmail.temp
-      $vpopdir/domains/$srcdomain/$srcusername/.qmail; 
-    chown $vpopuid.$vpopgid $vpopdir/domains/$srcdomain/$srcusername/.qmail; }
-    
-
-is executed on each vpopmailmachine via ssh.  This behaviour can be supressed
-by setting $FS::svc_forward_nossh_hack true.
-
-Also, if the configuration value vpopmailmachines exists, then the command:
-
-  [ -d $vpopdir/domains/$domain/$source ] && {
-    echo "$destination" >> $vpopdir/domains/$domain/$username/.$qmail
-    chown $vpopuid:$vpopgid $vpopdir/domains/$domain/$username/.$qmail
-  }
-
-is executed on each vpopmailmachine via ssh.  This behaviour can be supressed
-by setting $FS::svc_forward_nossh_hack true.
-
 =cut
 
 sub replace {
@@ -295,66 +174,6 @@ sub replace {
     return $error;
   }
 
-  my $old_svc_acct = $old->srcsvc_acct;
-  my $old_username = $old_svc_acct->username;
-  my $old_domain = $old_svc_acct->domain;
-  my $destination;
-  if ($old->dstsvc) {
-    $destination = $old->dstsvc_acct->email;
-  } else {
-    $destination = $old->dst;
-  }
-  foreach my $vpopmailmachine ( @vpopmailmachines ) {
-    my($machine, $vpopdir, $vpopuid, $vpopgid) =
-      split(/\s+/, $vpopmailmachine);
-    my $queue = new FS::queue {
-      'svcnum' => $new->svcnum,
-      'job'    => 'Net::SSH::ssh_cmd',
-    };
-    # should be neater
-    my $error = $queue->insert("root\@$machine",
-      "sed -e '/^$destination/d' " .
-        "< $vpopdir/domains/$old_domain/$old_username/.qmail" .
-        "> $vpopdir/domains/$old_domain/$old_username/.qmail.temp; " .
-      "mv $vpopdir/domains/$old_domain/$old_username/.qmail.temp " .
-        "$vpopdir/domains/$old_domain/$old_username/.qmail; " .
-      "chown $vpopuid.$vpopgid " .
-        "$vpopdir/domains/$old_domain/$old_username/.qmail;"
-    )
-      unless $nossh_hack;
-
-    if ( $error ) {
-       $dbh->rollback if $oldAutoCommit;
-       return "queueing job (transaction rolled back): $error";
-    }
-  }
-
-  #false laziness with stuff in insert, should subroutine
-  my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $new->srcsvc } );
-  my $username = $svc_acct->username;
-  my $domain = $svc_acct->domain;
-  if ($new->dstsvc) {
-    $destination = $new->dstsvc_acct->email;
-  } else {
-    $destination = $new->dst;
-  }
-  
-  foreach my $vpopmailmachine ( @vpopmailmachines ) {
-    my($machine, $vpopdir, $vpopuid, $vpopgid) = split(/\s+/, $vpopmailmachine);
-    my $queue = new FS::queue {
-      'svcnum' => $new->svcnum,
-      'job'    => 'Net::SSH::ssh_cmd',
-    };
-    # should be neater
-    my $error = $queue->insert("root\@$machine","[ -d $vpopdir/domains/$domain/$username ] && { echo \"$destination\" >> $vpopdir/domains/$domain/$username/.qmail; chown $vpopuid:$vpopgid $vpopdir/domains/$domain/$username/.qmail; }") 
-      unless $nossh_hack;
-    if ( $error ) {
-       $dbh->rollback if $oldAutoCommit;
-       return "queueing job (transaction rolled back): $error";
-    }
-  }
-  #end subroutinable bits
-
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 }
@@ -450,19 +269,12 @@ sub dstsvc_acct {
 
 =back
 
-=head1 VERSION
-
-$Id: svc_forward.pm,v 1.12 2002-05-31 17:50:37 ivan Exp $
-
 =head1 BUGS
 
-The remote commands should be configurable.
-
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
-L<FS::svc_acct>, L<FS::svc_domain>, L<Net::SSH>, L<ssh>, L<dot-qmail>,
-schema.html from the base documentation.
+L<FS::svc_acct>, L<FS::svc_domain>, schema.html from the base documentation.
 
 =cut
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 32a4e4f59..6397cc411 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -73,6 +73,7 @@ FS/part_export/bsdshell.pm
 FS/part_export/cp.pm
 FS/part_export/cyrus.pm
 FS/part_export/domain_shellcommands.pm
+FS/part_export/forward_shellcommands.pm
 FS/part_export/http.pm
 FS/part_export/infostreet.pm
 FS/part_export/ldap.pm
@@ -155,6 +156,7 @@ t/part_export-bsdshell.t
 t/part_export-cp.t
 t/part_export-cyrus.t
 t/part_export-domain_shellcommands.t
+t/part_export-forward_shellcommands.t
 t/part_export-http.t
 t/part_export-infostreet.t
 t/part_export-ldap.t
diff --git a/FS/t/part_export-forward_shellcommands.t b/FS/t/part_export-forward_shellcommands.t
new file mode 100644
index 000000000..78ca68d10
--- /dev/null
+++ b/FS/t/part_export-forward_shellcommands.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::forward_shellcommands;
+$loaded=1;
+print "ok 1\n";
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 51dce4da5..ed419a1ca 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -13,9 +13,9 @@ Before installing, you need:
   <li>A <b>transactional</b> database engine <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">supported</a> by Perl's <a href="http://dbi.perl.org">DBI</a>.
     <ul>
       <li><a href="http://www.postgresql.org/">PostgreSQL</a> is recommended (v7or later).
-      <li>MySQL versions before 4.1 do not support standard SQL subqueries and are <b>NOT SUPPORTED</b>.  If you are a developer who wishes to contribute MySQL 3.x/4.0 support, see <a href="http://pouncequick.420.am/rt/Ticket/Display.html?id=438">ticket #438</a> in the bug-tracking system and ask on the -devel mailing list.
-<!--       <li>MySQL has been reported to work.
-         <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you want to use MySQL, you <b>must</b> use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a> or <a href="http://www.mysql.com/doc/I/n/InnoDB.html">InnoDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> or <code>--default-table-type=InnoDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> or <code>default-table-type=InnoDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>. -->
+      <li><a href="http://www.mysql.com/">MySQL</a> <b>MINIMUM VERSION 4.1</b> is untested but may work.   Versions before 4.1 do not support standard SQL subqueries and are <b>NOT SUPPORTED</b>.  If you are a developer who wishes to contribute MySQL 3.x/4.0 support, see <a href="http://pouncequick.420.am/rt/Ticket/Display.html?id=438">ticket #438</a> in the bug-tracking system and ask on the -devel mailing list.
+<!--       <li>MySQL has been reported to work. -->
+         <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you want to use MySQL, you <b>must</b> use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a> or <a href="http://www.mysql.com/doc/I/n/InnoDB.html">InnoDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> or <code>--default-table-type=InnoDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> or <code>default-table-type=InnoDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
     </ul>
   <li>Perl modules (<a href="http://theoryx5.uwinnipeg.ca/CPAN/perl/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
     <ul>
@@ -41,7 +41,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=String-Approx">String-Approx</a>
       <li><a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>
       <li><a href="http://search.cpan.org/search?dist=DBI">DBI</a>
-      <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a> (<a href="http://search.cpan.org/search?dist=DBD-Pg">DBD::Pg</a> for PostgreSQL<!--, <a href="http://search.cpan.org/search?dist=DBD-mysql">DBD::mysql</a> for MySQL-->)
+      <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a> (<a href="http://search.cpan.org/search?dist=DBD-Pg">DBD::Pg</a> for PostgreSQL, <a href="http://search.cpan.org/search?dist=DBD-mysql">DBD::mysql</a> for MySQL)
       <li><a href="http://search.cpan.org/search?dist=DBIx-DataSource">DBIx-DataSource</a>
       <li><a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>
       <li><a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>
@@ -72,17 +72,16 @@ Enter it again:
 Shall the new user be allowed to create databases? (y/n) y
 Shall the new user be allowed to create more new users? (y/n) n
 CREATE USER</pre>
-<!--      <li> with <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#User_Account_Management">MySQL</a>:
+      <li> with <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#User_Account_Management">MySQL</a>:
         <pre>
 $ mysqladmin -u root password '<i>set_a_root_database_password</i>'
 $ mysql -u root -p
 mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* TO freeside@localhost IDENTIFIED BY '<i>set_a_freeside_database_password</i>';</pre>
--->
     </ul>
 <!--  <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>-->
   <li>Edit the top-level Makefile:
     <ul>
-      <li>Set <tt>DATASOURCE</tt> to your <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI data source</a>, for example, <tt>DBI:Pg:dbname=freeside</tt> for PostgresSQL<!-- or <tt>DBI:mysql:freeside</tt> for MySQL-->.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">manpage for your DBD</a> for the exact syntax of your DBI data source.
+      <li>Set <tt>DATASOURCE</tt> to your <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI data source</a>, for example, <tt>DBI:Pg:dbname=freeside</tt> for PostgresSQL or <tt>DBI:mysql:freeside</tt> for MySQL.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">manpage for your DBD</a> for the exact syntax of your DBI data source.
       <li>Set <tt>DB_PASSWORD</tt> to the freeside database user's password.
     </ul>
   <li>Add the freeside database to your database engine:
@@ -93,10 +92,9 @@ $ su
     <pre>
 $ su freeside
 $ createdb freeside</pre>
-<!--    (with MySQL:)
+    (with MySQL:)
     <pre>
 $ mysqladmin -u freeside -p create freeside </pre>
--->
   <li>Build and install the Perl modules:
     <pre>
 $ make perl-modules
-- 
cgit v1.2.1


From f1324d535989205477e37d701c910b12c045687b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Apr 2003 17:55:09 +0000
Subject: mason is more strict about variables - patch from Richard Siddall,
 thanks

---
 httemplate/edit/part_export.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 839a114fb..4defbc86f 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -60,7 +60,7 @@ my $widget = new HTML::Widgets::SelectLayers(
         foreach my $select_option ( @{$optinfo->{options}} ) {
           #if ( ref($select_option) ) {
           #} else {
-            $selected = $select_option eq $value ? ' SELECTED' : '';
+            my $selected = $select_option eq $value ? ' SELECTED' : '';
             $html .= qq!<OPTION VALUE="$select_option"$selected>!.
                      qq!$select_option</OPTION>!;
           #}
-- 
cgit v1.2.1


From a741f52db660b39a3f3c12acd0623d87bfc9108a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Apr 2003 18:46:52 +0000
Subject: properly deprecate ancient apache & sendmail config options

---
 FS/FS/Conf.pm                     | 30 +++++++++++++++---------------
 httemplate/config/config-view.cgi |  4 ++--
 httemplate/config/config.cgi      |  4 ++--
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index d0ecf32a6..84b3c26ed 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -228,8 +228,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'apacheip',
-    'section'     => 'apache',
-    'description' => 'The current IP address to assign to new virtual hosts',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add an <i>apache</i> <a href="../browse/part_export.cgi">export</a> instead.  Used to be the current IP address to assign to new virtual hosts',
     'type'        => 'text',
   },
 
@@ -242,8 +242,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'apachemachines',
-    'section'     => 'apache',
-    'description' => 'Your Apache machines, one per line.  This enables export of `/etc/apache/vhosts.conf\', which can be included in your Apache configuration via the <a href="http://www.apache.org/docs/mod/core.html#include">Include</a> directive.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add an <i>apache</i> <a href="../browse/part_export.cgi">export</a> instead.  Used to be Apache machines, one per line.  This enables export of `/etc/apache/vhosts.conf\', which can be included in your Apache configuration via the <a href="http://www.apache.org/docs/mod/core.html#include">Include</a> directive.',
     'type'        => 'textarea',
   },
 
@@ -382,8 +382,8 @@ httemplate/docs/config.html
   
   {
     'key'         => 'erpcdmachines',
-    'section'     => '',
-    'description' => 'Your ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd\' and `/usr/annex/acp_dialup\'',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, ERPCD is no longer supported.  Used to be ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd\' and `/usr/annex/acp_dialup\'',
     'type'        => 'textarea',
   },
 
@@ -418,21 +418,21 @@ httemplate/docs/config.html
   {
     'key'         => 'icradius_mysqldest',
     'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add an <i>sqlradius</i> https://billing.crosswind.net/freeside/browse/part_export.cgi">export</a> instead.  Used to be the destination directory for the MySQL databases, on the ICRADIUS/FreeRADIUS machines.  Defaults to "/usr/local/var/".',
+    'description' => '<b>DEPRECATED</b>, add an <i>sqlradius</i> <a href="../browse/part_export.cgi">export</a> instead.  Used to be the destination directory for the MySQL databases, on the ICRADIUS/FreeRADIUS machines.  Defaults to "/usr/local/var/".',
     'type'        => 'text',
   },
 
   {
     'key'         => 'icradius_mysqlsource',
     'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add an <i>sqlradius</i> https://billing.crosswind.net/freeside/browse/part_export.cgi">export</a> instead.  Used to be the source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".',
+    'description' => '<b>DEPRECATED</b>, add an <i>sqlradius</i> <a href="../browse/part_export.cgi">export</a> instead.  Used to be the source directory for for the MySQL radcheck table files, on the Freeside machine.  Defaults to "/usr/local/var/freeside".',
     'type'        => 'text',
   },
 
   {
     'key'         => 'icradius_secrets',
     'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add an <i>sqlradius</i> https://billing.crosswind.net/freeside/browse/part_export.cgi">export</a> instead.  This option used to specify a database for ICRADIUS/FreeRADIUS export.  Three lines: DBI data source, username and password.',
+    'description' => '<b>DEPRECATED</b>, add an <i>sqlradius</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to specify a database for ICRADIUS/FreeRADIUS export.  Three lines: DBI data source, username and password.',
     'type'        => 'textarea',
   },
 
@@ -576,22 +576,22 @@ httemplate/docs/config.html
 
   {
     'key'         => 'sendmailconfigpath',
-    'section'     => 'mail',
-    'description' => 'Sendmail configuration file path.  Defaults to `/etc\'.  Many newer distributions use `/etc/mail\'.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add a <i>sendmail</i> <a href="../browse/part_export.cgi">export</a> instead.  Used to be sendmail configuration file path.  Defaults to `/etc\'.  Many newer distributions use `/etc/mail\'.',
     'type'        => 'text',
   },
 
   {
     'key'         => 'sendmailmachines',
-    'section'     => 'mail',
-    'description' => 'Your sendmail machines, one per line.  This enables export of `/etc/virtusertable\' and `/etc/sendmail.cw\'.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add a <i>sendmail</i> <a href="../browse/part_export.cgi">export</a> instead.  Used to be sendmail machines, one per line.  This enables export of `/etc/virtusertable\' and `/etc/sendmail.cw\'.',
     'type'        => 'textarea',
   },
 
   {
     'key'         => 'sendmailrestart',
-    'section'     => 'mail',
-    'description' => 'If defined, the command which is run on sendmail machines after files are copied.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add a <i>sendmail</i> <a href="../browse/part_export.cgi">export</a> instead.  Used to define the command which is run on sendmail machines after files are copied.',
     'type'        => 'text',
   },
 
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index bafe5a8e7..9a0006792 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -5,13 +5,13 @@
 <% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
 
 <% foreach my $section ( qw(required billing username password UI session
-                            shell mail apache BIND
+                            shell BIND
                            ),
                          '', 'deprecated') { %>
   <A NAME="<%= $section || 'unclassified' %>"></A>
   <FONT SIZE="-2">
   <% foreach my $nav_section ( qw(required billing username password UI session
-                                  shell mail apache BIND
+                                  shell BIND
                                  ),
                                '', 'deprecated') { %>
     <% if ( $section eq $nav_section ) { %>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index fd9a82958..409869e11 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -25,13 +25,13 @@ function SafeOnsubmit() {
 <form name="OneTrueForm" action="config-process.cgi" METHOD="POST" onSubmit="SafeOnsubmit()">
 
 <% foreach my $section ( qw(required billing username password UI session
-                            shell mail apache BIND
+                            shell BIND
                            ),
                          '', 'deprecated') { %>
   <A NAME="<%= $section || 'unclassified' %>"></A>
   <FONT SIZE="-2">
   <% foreach my $nav_section ( qw(required billing username password UI session
-                                  shell mail apache BIND
+                                  shell BIND
                                  ),
                                '', 'deprecated') { %>
     <% if ( $section eq $nav_section ) { %>
-- 
cgit v1.2.1


From 970a86aec45df2ab579ac54fc67cba475c7c013b Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 23 Apr 2003 04:53:17 +0000
Subject: DBD::Pg doesn't handle char types very well.

---
 FS/bin/freeside-setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 8ec014186..518a2ad42 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -471,7 +471,7 @@ sub tables_hash_hack {
         'last',     'varchar', '',     $char_d,
 #        'middle',   'varchar', 'NULL', $char_d,
         'first',    'varchar', '',     $char_d,
-        'ss',       'char', 'NULL', 11,
+        'ss',       'varchar', 'NULL', 11,
         'company',  'varchar', 'NULL', $char_d,
         'address1', 'varchar', '',     $char_d,
         'address2', 'varchar', 'NULL', $char_d,
@@ -823,7 +823,7 @@ sub tables_hash_hack {
         #'reczone',   'varchar', '',  $char_d,
         'reczone',   'varchar', '',  255,
         'recaf',     'char',    '',  2,
-        'rectype',   'char',    '',  5,
+        'rectype',   'varchar',    '',  5,
         #'recdata',   'varchar', '',  $char_d,
         'recdata',   'varchar', '',  255,
       ],
-- 
cgit v1.2.1


From f3b99e9676baf155c46d37d56a5da4db57536072 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 23 Apr 2003 05:36:24 +0000
Subject: Missing comma.

---
 httemplate/search/cust_main.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index fe4ec5d05..5b39a09f2 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -469,7 +469,7 @@ sub cardsearch {
   $card =~ /^(\d{13,16})$/ or eidiot "Illegal card number\n";
   my($payinfo)=$1;
 
-  [ qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'CARD'}) 
+  [ qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'CARD'}),
     qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'DCRD'})
   ];
 }
-- 
cgit v1.2.1


From 40dfd062e7bf133824287d432812b51c6ea3456a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Apr 2003 22:16:55 +0000
Subject: might not be necessary, but to be safe...

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index f99dc6341..a6a67d2db 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -885,7 +885,7 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
     'sqlmail' => {
       'desc' => 'Real-time export to SQL-backed mail server',
       'options' => \%sqlmail_options,
-      'nodomain' => 'N',
+      'nodomain' => '',
       'notes' => 'Database schema can be made to work with Courier IMAP and Exim.  Others could work but are untested. (...extended description from pc-intouch?...)',
     },
 
-- 
cgit v1.2.1


From 344596452274c17c2c60bf2b002c9358cbd510a3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Apr 2003 23:12:57 +0000
Subject: compatible with mason 1.1!  closes: bug#492

---
 Makefile                     |   5 ++
 htetc/handler.pl             |  27 +++++---
 htetc/handler.pl-1.0x        | 161 +++++++++++++++++++++++++++++++++++++++++++
 httemplate/docs/install.html |   9 ++-
 4 files changed, 186 insertions(+), 16 deletions(-)
 create mode 100644 htetc/handler.pl-1.0x

diff --git a/Makefile b/Makefile
index 3362ca832..92f82067b 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,8 @@ TEMPLATE = asp
 #TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
+MASON_HANDLER = /usr/local/etc/freeside/handler.pl
+MASONDATA = /usr/local/etc/freeside/masondata
 
 #deb, others?
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
@@ -115,6 +117,9 @@ install-docs: docs
 	[ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL} || true
 	[ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
 	[ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
+	[ "${TEMPLATE}" = "mason" ] && cp htetc/handler.pl ${MASON_HANDLER} || true
+	[ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
+	[ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true
 
 perl-modules:
 	cd FS; \
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 768ebffec..9f2a483c2 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -28,20 +28,25 @@ use strict;
 
 # Create Mason objects
 #
-my $parser = new HTML::Mason::Parser;
-my $interp = new HTML::Mason::Interp (parser=>$parser,
-                                      comp_root=>'/var/www/masondocs',
-                                      data_dir=>'/home/ivan/freeside_current/masondata',
-                                      out_mode=>'stream',
-                                     );
-my $ah = new HTML::Mason::ApacheHandler ( interp => $interp,
-                                          #auto_send_headers => 0,
-                                        );
+
+#my $parser = new HTML::Mason::Parser;
+#my $interp = new HTML::Mason::Interp (parser=>$parser,
+#                                      comp_root=>'/var/www/masondocs',
+#                                      data_dir=>'/usr/local/etc/freeside/masondata',
+#                                      out_mode=>'stream',
+#                                     );
+my $ah = new HTML::Mason::ApacheHandler (
+  #interp => $interp,
+  #auto_send_headers => 0,
+  comp_root=>'/var/www/masonside',
+  data_dir=>'/usr/local/etc/freeside/masondata',
+  #out_mode=>'stream',
+);
 
 # Activate the following if running httpd as root (the normal case).
 # Resets ownership of all files created by Mason at startup.
 #
-chown (Apache->server->uid, Apache->server->gid, $interp->files_written);
+#chown (Apache->server->uid, Apache->server->gid, $interp->files_written);
 
 sub handler
 {
@@ -121,7 +126,7 @@ sub handler
 
       *CGI::redirect = sub {
         my( $self, $location ) = @_;
-
+        use vars qw($m);
         #http://www.masonhq.com/docs/faq/#how_do_i_do_an_external_redirect
         $m->clear_buffer;
         # The next two lines are necessary to stop Apache from re-reading
diff --git a/htetc/handler.pl-1.0x b/htetc/handler.pl-1.0x
new file mode 100644
index 000000000..768ebffec
--- /dev/null
+++ b/htetc/handler.pl-1.0x
@@ -0,0 +1,161 @@
+#!/usr/bin/perl
+#
+# This is a basic, fairly fuctional Mason handler.pl.
+#
+# For something a little more involved, check out session_handler.pl
+
+package HTML::Mason;
+
+# Bring in main Mason package.
+use HTML::Mason;
+
+# Bring in ApacheHandler, necessary for mod_perl integration.
+# Uncomment the second line (and comment the first) to use
+# Apache::Request instead of CGI.pm to parse arguments.
+use HTML::Mason::ApacheHandler;
+# use HTML::Mason::ApacheHandler (args_method=>'mod_perl');
+
+# Uncomment the next line if you plan to use the Mason previewer.
+#use HTML::Mason::Preview;
+
+use strict;
+
+# List of modules that you want to use from components (see Admin
+# manual for details)
+#{  package HTML::Mason::Commands;
+#   use CGI;
+#}
+
+# Create Mason objects
+#
+my $parser = new HTML::Mason::Parser;
+my $interp = new HTML::Mason::Interp (parser=>$parser,
+                                      comp_root=>'/var/www/masondocs',
+                                      data_dir=>'/home/ivan/freeside_current/masondata',
+                                      out_mode=>'stream',
+                                     );
+my $ah = new HTML::Mason::ApacheHandler ( interp => $interp,
+                                          #auto_send_headers => 0,
+                                        );
+
+# Activate the following if running httpd as root (the normal case).
+# Resets ownership of all files created by Mason at startup.
+#
+chown (Apache->server->uid, Apache->server->gid, $interp->files_written);
+
+sub handler
+{
+    my ($r) = @_;
+
+    # If you plan to intermix images in the same directory as
+    # components, activate the following to prevent Mason from
+    # evaluating image files as components.
+    #
+    #return -1 if $r->content_type && $r->content_type !~ m|^text/|i;
+
+    #rar
+    { package HTML::Mason::Commands;
+      use strict;
+      use vars qw( $cgi $p );
+      use CGI;
+      #use CGI::Carp qw(fatalsToBrowser);
+      use Date::Format;
+      use Date::Parse;
+      use Time::Local;
+      use Tie::IxHash;
+      use HTML::Entities;
+      use IO::Handle;
+      use IO::File;
+      use String::Approx qw(amatch);
+      use Chart::LinesPoints;
+      use HTML::Widgets::SelectLayers 0.02;
+      use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
+      use FS::Record qw(qsearch qsearchs fields dbdef);
+      use FS::Conf;
+      use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
+                     small_custview myexit http_header);
+      use FS::Msgcat qw(gettext geterror);
+
+      use FS::agent;
+      use FS::agent_type;
+      use FS::domain_record;
+      use FS::cust_bill;
+      use FS::cust_bill_pay;
+      use FS::cust_credit;
+      use FS::cust_credit_bill;
+      use FS::cust_main;
+      use FS::cust_main_county;
+      use FS::cust_pay;
+      use FS::cust_pkg;
+      use FS::cust_refund;
+      use FS::cust_svc;
+      use FS::nas;
+      use FS::part_bill_event;
+      use FS::part_pkg;
+      use FS::part_referral;
+      use FS::part_svc;
+      use FS::part_svc_router;
+      use FS::pkg_svc;
+      use FS::port;
+      use FS::queue qw(joblisting);
+      use FS::raddb;
+      use FS::session;
+      use FS::svc_acct;
+      use FS::svc_acct_pop qw(popselector);
+      use FS::svc_acct_sm;
+      use FS::svc_domain;
+      use FS::svc_forward;
+      use FS::svc_www;
+      use FS::router;
+      use FS::part_router_field;
+      use FS::router_field;
+      use FS::addr_block;
+      use FS::part_sb_field;
+      use FS::sb_field;
+      use FS::svc_broadband;
+      use FS::type_pkgs;
+      use FS::part_export;
+      use FS::part_export_option;
+      use FS::export_svc;
+      use FS::msgcat;
+
+      *CGI::redirect = sub {
+        my( $self, $location ) = @_;
+
+        #http://www.masonhq.com/docs/faq/#how_do_i_do_an_external_redirect
+        $m->clear_buffer;
+        # The next two lines are necessary to stop Apache from re-reading
+        # POSTed data.
+        $r->method('GET');
+        $r->headers_in->unset('Content-length');
+        $r->content_type('text/html');
+        #$r->err_header_out('Location' => $location);
+        $r->header_out('Location' => $location);
+         $r->header_out('Content-Type' => 'text/html');
+         $m->abort(302);
+
+        '';
+      };
+
+      $cgi = new CGI;
+      &cgisuidsetup($cgi);
+      #&cgisuidsetup($r);
+      $p = popurl(2);
+    }
+
+    $r->content_type('text/html');
+    #eorar
+
+    my $headers = $r->headers_out;
+    $headers->{'Pragma'} = $headers->{'Cache-control'} = 'no-cache';
+    #$r->no_cache(1);
+    $headers->{'Expires'} = '0';
+
+#    $r->send_http_header;
+
+    my $status = $ah->handle_request($r);
+
+    $status;
+}
+
+1;
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index ed419a1ca..533decb7b 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -47,7 +47,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>
       <li><a href="http://search.cpan.org/search?dist=String-ShellQuote">String-ShellQuote</a>
       <li><a href="http://search.cpan.org/search?dist=Net-SCP">Net-SCP</a>
-      <li><a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a> (use version 1.0x - Freeside is not yet compatible with version 1.1x)
+      <li><a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a>
       <li><a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a>
       <li><a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>
       <li><a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a>
@@ -143,11 +143,10 @@ PerlSetVar Debug 2
 </pre></font>
     </ul></td>
     <td><ul>
-      <li>(use version 1.0x - Freeside is not yet compatible with version 1.1x)
       <li>Run <tt>make masondocs</tt>
       <li>Copy <tt>masondocs/</tt> to your web server's document space.
-      <li>Copy <tt>htetc/handler.pl</tt> to your web server's configuration directory.
-      <li>Edit <tt>handler.pl</tt> and set an appropriate <tt>data_dir</tt>, such as <tt>/usr/local/etc/freeside/mason-data</tt>
+      <li>Copy <tt>htetc/handler.pl</tt> to an appropriate directory (use htetc/handler.pl-1.0x for Mason versions before 1.10).
+      <li>Edit <tt>handler.pl</tt> and set an appropriate <tt>data_dir</tt>, such as <tt>/usr/local/etc/freeside/masondata</tt>
       <li>Configure Apache to use the <tt>handler.pl</tt> file and to execute .cgi files using HTML::Mason.  For example:
 <font size="-1"><pre>
 PerlModule HTML::Mason
@@ -157,7 +156,7 @@ AddHandler perl-script .cgi
 PerlHandler HTML::Mason
 &lt;/Files&gt;
 &lt;Perl&gt;
-require&nbsp;"/usr/local/apache/conf/handler.pl";
+require&nbsp;"/usr/local/etc/freeside/handler.pl";
 &lt;/Perl&gt;
 &lt;/Directory&gt;
 </pre></font>
-- 
cgit v1.2.1


From d540445a9a35750e1127e3854ecba420d588a022 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Thu, 24 Apr 2003 01:00:42 +0000
Subject: Apparently deleting elements from svc_Common->hashref is bad.

---
 FS/FS/part_export/sqlmail.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export/sqlmail.pm b/FS/FS/part_export/sqlmail.pm
index 0c0cb367b..f97674c27 100644
--- a/FS/FS/part_export/sqlmail.pm
+++ b/FS/FS/part_export/sqlmail.pm
@@ -142,7 +142,7 @@ sub update_values {
   # Update records to conform to a particular server_type.
 
   my ($self, $svc, $svcdb) = (shift,shift,shift);
-  my $svchash = $svc->hashref or return '';
+  my $svchash = { %{$svc->hashref} } or return ''; # We need a copy.
 
   if ($svcdb eq 'svc_acct') {
     if ($self->option('server_type') eq 'courier_crypt') {
-- 
cgit v1.2.1


From 2c0751312ced1bcbcfa0907393895fb19d25c280 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Thu, 24 Apr 2003 01:43:10 +0000
Subject: Support for exporting to an ISC BIND9 name server

---
 FS/FS/part_export.pm | 30 +++++++++++++++++++++---------
 bin/bind.export      | 15 +++++++++++++--
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index a6a67d2db..d898d2616 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -718,18 +718,30 @@ tie my %vpopmail_options, 'Tie::IxHash',
 ;
 
 tie my %bind_options, 'Tie::IxHash',
-  #'machine'    => { label=>'named machine' },
-  'named_conf' => { label  => 'named.conf location',
-                    default=> '/etc/bind/named.conf' },
-  'zonepath'   => { label => 'path to zone files',
-                    default=> '/etc/bind/', },
+  #'machine'     => { label=>'named machine' },
+  'named_conf'   => { label  => 'named.conf location',
+                      default=> '/etc/bind/named.conf' },
+  'zonepath'     => { label => 'path to zone files',
+                      default=> '/etc/bind/', },
+  'bind_release' => { label => 'ISC BIND Release',
+                      type  => 'select',
+                      options => [qw(BIND8 BIND9)],
+                      default => 'BIND8' },
+  'bind9_minttl' => { label => 'The minttl required by bind9 and RFC1035.',
+                      default => '1D' },
 ;
 
 tie my %bind_slave_options, 'Tie::IxHash',
-  #'machine'    => { label=> 'Slave machine' },
-  'master'      => { label=> 'Master IP address(s) (semicolon-separated)' },
-  'named_conf'  => { label   => 'named.conf location',
-                     default => '/etc/bind/named.conf' },
+  #'machine'     => { label=> 'Slave machine' },
+  'master'       => { label=> 'Master IP address(s) (semicolon-separated)' },
+  'named_conf'   => { label   => 'named.conf location',
+                      default => '/etc/bind/named.conf' },
+  'bind_release' => { label => 'ISC BIND Release',
+                      type  => 'select',
+                      options => [qw(BIND8 BIND9)],
+                      default => 'BIND8' },
+  'bind9_minttl' => { label => 'The minttl required by bind9 and RFC1035.',
+                      default => '1D' },
 ;
 
 tie my %http_options, 'Tie::IxHash',
diff --git a/bin/bind.export b/bin/bind.export
index 055782a20..64d44065d 100755
--- a/bin/bind.export
+++ b/bin/bind.export
@@ -30,6 +30,10 @@ foreach my $export ( @exports ) {
   my $machine = $export->machine;
   my $prefix = "$spooldir/$machine";
 
+  my $bind_rel = $export->option('bind_release');
+  my $ndc_cmd = ($bind_rel eq 'BIND9') ? 'rndc' : 'ndc';
+  my $minttl = $export->option('bind9_minttl');
+
   #prevent old domain files from piling up
   #rmtree "$prefix" or die "can't rmtree $prefix.db: $!";
 
@@ -79,6 +83,10 @@ END
       open (DB_MASTER,">$prefix/db.$domain")
         or die "can't open $prefix/db.$domain: $!";
 
+      if ($bind_rel eq 'BIND9') {
+        print DB_MASTER "\$TTL $minttl\n\$ORIGIN $domain.\n";
+      }
+
       my @domain_records =
         qsearch('domain_record', { 'svcnum' => $svc_domain->svcnum } );
       foreach my $domain_record (
@@ -114,7 +122,7 @@ END
   } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
 #  warn $rsync->out;
 
-  ssh("root\@$machine", 'ndc reload');
+  ssh("root\@$machine", "$ndc_cmd reload");
 
 }
 
@@ -125,6 +133,9 @@ foreach my $sexport ( @sexports ) { #false laziness with above
   my $machine = $sexport->machine;
   my $prefix = "$spooldir/$machine";
 
+  my $bind_rel = $sexport->option('bind_release');
+  my $ndc_cmd = ($bind_rel eq 'BIND9') ? 'rndc' : 'ndc';
+
   #prevent old domain files from piling up
   #rmtree "$prefix" or die "can't rmtree $prefix.db: $!";
 
@@ -166,7 +177,7 @@ END
   } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
 #  warn $rsync->out;
 
-  ssh("root\@$machine", 'ndc reload');
+  ssh("root\@$machine", "$ndc_cmd reload");
 
 }
 close NAMED_CONF;
-- 
cgit v1.2.1


From 21bc19b84183312dbb4087a33ad1ce5877088f82 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Apr 2003 02:46:41 +0000
Subject: better shellcommands documentation of all sorts

---
 FS/FS/part_export.pm                      | 10 ++++----
 FS/FS/part_export/domain_shellcommands.pm | 38 ++++++++++++++-----------------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index d898d2616..8370b3f9e 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -872,13 +872,13 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
       'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
       'options' => \%shellcommands_options,
       'nodomain' => 'Y',
-      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = "";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "pw userdel $username -r"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0"; this.form.usermod_stdin.value = "$new__password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>',
+      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = "";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "pw userdel $username -r"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0"; this.form.usermod_stdin.value = "$new__password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $new_uid.$new_gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>The following variables are available for interpolation (prefixed with new_ or old_ for replace operations): <UL><LI><code>$username</code><LI><code>$_password</code><LI><code>$quoted_password</code> - unencrypted password quoted for the shell<LI><code>$crypt_password</code> - encrypted password<LI><code>$uid</code><LI><code>$gid</code><LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)<LI><code>$dir</code> - home directory<LI><code>$shell</code><LI><code>$quota</code><LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.</UL>',
     },
 
     'shellcommands_withdomain' => {
       'desc' => 'Real-time export via remote SSH.',
       'options' => \%shellcommands_withdomain_options,
-      'notes' => 'Run remote commands via SSH.  username@domain (rather than just usernames) are considered unique (also see shellcommands).  You probably want this if the commands you are running will accept a domain as a parameter, and will allow the same username with different domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.',
+      'notes' => 'Run remote commands via SSH.  username@domain (rather than just usernames) are considered unique (also see shellcommands).  You probably want this if the commands you are running will accept a domain as a parameter, and will allow the same username with different domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations): <UL><LI><code>$username</code><LI><code>$domain</code><LI><code>$_password</code><LI><code>$quoted_password</code> - unencrypted password quoted for the shell<LI><code>$crypt_password</code> - encrypted password<LI><code>$uid</code><LI><code>$gid</code><LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)<LI><code>$dir</code> - home directory<LI><code>$shell</code><LI><code>$quota</code><LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.</UL>',
     },
 
     'ldap' => {
@@ -959,7 +959,7 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
     'domain_shellcommands' => {
       'desc' => 'Run remote commands via SSH, for domains.',
       'options' => \%domain_shellcommands_options,
-      'notes'    => 'Run remote commands via SSH, for domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="qmail catchall .qmail-domain-default maintenance" onClick=\'this.form.useradd.value = "[ \"$uid\" -a \"$gid\" -a \"$dir\" -a \"$qdomain\" ] && [ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }"; this.form.userdel.value = ""; this.form.usermod.value = "";\'></UL>',
+      'notes'    => 'Run remote commands via SSH, for domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="qmail catchall .qmail-domain-default maintenance" onClick=\'this.form.useradd.value = "[ \"$uid\" -a \"$gid\" -a \"$dir\" -a \"$qdomain\" ] && [ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }"; this.form.userdel.value = ""; this.form.usermod.value = "";\'></UL>The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations): <UL><LI><code>$domain</code><LI><code>$qdomain</code> - domain with periods replaced by colons<LI><code>$uid</code> - of catchall account<LI><code>$gid</code> - of catchall account<LI><code>$dir</code> - home directory of catchall account<LI>All other fields in <a href="../docs/schema.html#svc_domain">svc_domain</a> are also available.</UL>',
     },
 
 
@@ -976,7 +976,7 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
     'forward_shellcommands' => {
       'desc' => 'Run remote commands via SSH, for forwards',
       'options' => \%forward_shellcommands_options,
-      'notes' => 'Run remote commands via SSH, for forwards.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="text vpopmail maintenance" onClick=\'this.form.useradd.value = "[ -d /home/vpopmail/domains/$domain/$username ] && { echo \"$destination\" > /home/vpopmail/domains/$domain/$username/.qmail; chown vpopmail:vchkpw /home/vpopmail/domains/$domain/$username/.qmail; }"; this.form.userdel.value = "rm /home/vpopmail/domains/$domain/$username/.qmail"; this.form.usermod.value = "mv /home/vpopmail/domains/$old_domain/$old_username/.qmail /home/vpopmail/domains/$new_domain/$new_username; [ \"$old_destination\" != \"$new_destination\" ] && { echo \"$new_destination\" > /home/vpopmail/domains/$new_domain/$new_username/.qmail; chown vpopmail:vchkpw /home/vpopmail/domains/$new_domain/$new_username/.qmail; }";\'></UL>',
+      'notes' => 'Run remote commands via SSH, for forwards.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="text vpopmail maintenance" onClick=\'this.form.useradd.value = "[ -d /home/vpopmail/domains/$domain/$username ] && { echo \"$destination\" > /home/vpopmail/domains/$domain/$username/.qmail; chown vpopmail:vchkpw /home/vpopmail/domains/$domain/$username/.qmail; }"; this.form.userdel.value = "rm /home/vpopmail/domains/$domain/$username/.qmail"; this.form.usermod.value = "mv /home/vpopmail/domains/$old_domain/$old_username/.qmail /home/vpopmail/domains/$new_domain/$new_username; [ \"$old_destination\" != \"$new_destination\" ] && { echo \"$new_destination\" > /home/vpopmail/domains/$new_domain/$new_username/.qmail; chown vpopmail:vchkpw /home/vpopmail/domains/$new_domain/$new_username/.qmail; }";\'></UL>The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations): <UL><LI><code>$username</code><LI><code>$domain</code><LI><code>$destination</code> - forward destination<LI>All other fields in <a href="../docs/schema.html#svc_forward">svc_forward</a> are also available.</UL>',
     },
   },
 
@@ -984,7 +984,7 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
     'www_shellcommands' => {
       'desc' => 'Run remote commands via SSH, for virtual web sites.',
       'options' => \%www_shellcommands_options,
-      'notes'    => 'Run remote commands via SSH, for virtual web sites.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.',
+      'notes'    => 'Run remote commands via SSH, for virtual web sites.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations): <UL><LI><code>$zone</code><LI><code>$username</code><LI><code>$homedir</code><LI>All other fields in <a href="../docs/schema.html#svc_www">svc_www</a> are also available.</UL>',
     },
 
     'apache' => {
diff --git a/FS/FS/part_export/domain_shellcommands.pm b/FS/FS/part_export/domain_shellcommands.pm
index 5b100e8c6..0edbab0dd 100644
--- a/FS/FS/part_export/domain_shellcommands.pm
+++ b/FS/FS/part_export/domain_shellcommands.pm
@@ -58,27 +58,23 @@ sub _export_replace {
     ${"old_$_"} = $old->getfield($_) foreach $old->fields;
     ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   }
-#  my $old_domain_record = $old->domain_record; # or die ?
-#  my $old_zone = $old_domain_record->reczone; # or die ?
-#  unless ( $old_zone =~ /\.$/ ) {
-#    my $old_svc_domain = $old_domain_record->svc_domain; # or die ?
-#    $old_zone .= '.'. $old_svc_domain->domain;
-#  }
-#
-#  my $old_svc_acct = $old->svc_acct; # or die ?
-#  my $old_username = $old_svc_acct->username;
-#  my $old_homedir = $old_svc_acct->dir; # or die ?
-#
-#  my $new_domain_record = $new->domain_record; # or die ?
-#  my $new_zone = $new_domain_record->reczone; # or die ?
-#  unless ( $new_zone =~ /\.$/ ) {
-#    my $new_svc_domain = $new_domain_record->svc_domain; # or die ?
-#    $new_zone .= '.'. $new_svc_domain->domain;
-#  }
-
-#  my $new_svc_acct = $new->svc_acct; # or die ?
-#  my $new_username = $new_svc_acct->username;
-#  my $new_homedir = $new_svc_acct->dir; # or die ?
+  ( $old_qdomain = $old_domain ) =~ s/\./:/g; #see dot-qmail(5): EXTENSION ADDRESSES
+  ( $new_qdomain = $new_domain ) =~ s/\./:/g; #see dot-qmail(5): EXTENSION ADDRESSES
+
+  if ( $old->catchall ) {
+    no strict 'refs';
+    my $svc_acct = $old->catchall_svc_acct;
+    ${"old_$_"} = $svc_acct->getfield($_) foreach qw(uid gid dir);
+  } else {
+    ${"old_$_"} = '' foreach qw(uid gid dir);
+  }
+  if ( $new->catchall ) {
+    no strict 'refs';
+    my $svc_acct = $new->catchall_svc_acct;
+    ${"new_$_"} = $svc_acct->getfield($_) foreach qw(uid gid dir);
+  } else {
+    ${"new_$_"} = '' foreach qw(uid gid dir);
+  }
 
   #done setting variables for the command
 
-- 
cgit v1.2.1


From fdf62da26a4a9127fd43f359163f231a89bc692d Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Thu, 24 Apr 2003 18:45:03 +0000
Subject: Support for nWnDnHnMnS time format

---
 FS/FS/domain_record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 2f7e270dc..d3682c351 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -241,7 +241,7 @@ sub check {
   if ( $self->rectype eq 'SOA' ) {
     my $recdata = $self->recdata;
     $recdata =~ s/\s+/ /g;
-    $recdata =~ /^([a-z0-9\.\-]+ [\w\-\+]+\.[a-z0-9\.\-]+ \( (\d+ ){5}\))$/i
+    $recdata =~ /^([a-z0-9\.\-]+ [\w\-\+]+\.[a-z0-9\.\-]+ \( ([\dwdhmsWDHMS]+ ){5}\))$/i
       or return "Illegal data for SOA record: $recdata";
     $self->recdata($1);
   } elsif ( $self->rectype eq 'NS' ) {
@@ -332,7 +332,7 @@ sub zone {
 
 =head1 VERSION
 
-$Id: domain_record.pm,v 1.13 2003-03-29 04:53:44 ivan Exp $
+$Id: domain_record.pm,v 1.14 2003-04-24 18:45:03 khoff Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From cc6317796afe74fd6dcbc4712abfcb09ff199598 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Thu, 24 Apr 2003 18:46:36 +0000
Subject: MySQL returns zero on an update when no values change.  We would
 insert on an rv of zero, so now we select count(*)... instead of relying on
 the rv of the update.

---
 FS/FS/part_export/sqlmail.pm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/FS/FS/part_export/sqlmail.pm b/FS/FS/part_export/sqlmail.pm
index f97674c27..64f72df07 100644
--- a/FS/FS/part_export/sqlmail.pm
+++ b/FS/FS/part_export/sqlmail.pm
@@ -115,17 +115,19 @@ sub sqlmail_replace {
   my %attrs = @_;
   map { $attrs{$_} = $attrs{$_} ? qq!'$attrs{$_}'! : 'NULL'; } keys(%attrs);
 
-  my $query = sprintf('UPDATE %s SET %s WHERE svcnum = %s',
-                      $table, join(', ', map {"$_ = $attrs{$_}"} keys(%attrs)),
-                      $oldsvcnum);
-
-  my $rv = $dbh->do($query) or die $dbh->errstr;
-
-  if ($rv == 0) {
+  my $query = "SELECT COUNT(*) FROM $table WHERE svcnum = $oldsvcnum";
+  my $result = $dbh->selectrow_arrayref($query) or die $dbh->errstr;
+  
+  if (@$result[0] == 0) {
     $query = sprintf("INSERT INTO %s (%s) values (%s)",
                      $table, join(",", keys(%attrs)),
                      join(',', values(%attrs)));
     $dbh->do($query) or die $dbh->errstr;
+  } else {
+    $query = sprintf('UPDATE %s SET %s WHERE svcnum = %s',
+                     $table, join(', ', map {"$_ = $attrs{$_}"} keys(%attrs)),
+                     $oldsvcnum);
+    $dbh->do($query) or die $dbh->errstr;
   }
 
   $dbh->disconnect;
-- 
cgit v1.2.1


From 7d0dbc7da5c736da8989b9aeb2e8911fa16462a9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Apr 2003 23:02:16 +0000
Subject: fix for bug triggered by nonexistant referring customer numbers

---
 httemplate/edit/cust_main.cgi | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index d8edbcd8e..2b7d8d0dc 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -124,9 +124,11 @@ if ( $custnum && ! $conf->exists('editreferrals') ) {
 #referring customer
 
 #print qq!<BR><BR>Referring Customer: !;
-if ( $cust_main->referral_custnum ) {
-  my $referring_cust_main =
-    qsearchs('cust_main', { custnum => $cust_main->referral_custnum } );
+my $referring_cust_main = '';
+if ( $cust_main->referral_custnum
+     and $referring_cust_main =
+           qsearchs('cust_main', { custnum => $cust_main->referral_custnum } )
+) {
   print '<BR><BR>Referring Customer: <A HREF="'. popurl(1). '/cust_main.cgi?'.
         $cust_main->referral_custnum. '">'.
         $cust_main->referral_custnum. ': '.
-- 
cgit v1.2.1


From d5aab81fa7c59695bc4bad8820bbd7d9e1d77309 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Sat, 26 Apr 2003 00:28:47 +0000
Subject: Tyop

---
 FS/FS/cust_bill.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index aa82eb6f8..76c0752ab 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -812,7 +812,7 @@ sub realtime_bop {
        'invnum'   => $self->invnum,
        'paid'     => $amount,
        '_date'     => '',
-       'payby'    => method2payby{$method},
+       'payby'    => $method2payby{$method},
        'payinfo'  => $cust_main->payinfo,
        'paybatch' => "$processor:". $transaction->authorization,
     } );
-- 
cgit v1.2.1


From 6b49613d47236c0fc01ad37021c460d0c8809c9a Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Sat, 26 Apr 2003 02:01:09 +0000
Subject: I don't like FS::Record warnings

---
 FS/FS/cust_svc.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 26e6274a1..8ac806519 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -11,6 +11,7 @@ use FS::pkg_svc;
 use FS::svc_acct;
 use FS::svc_domain;
 use FS::svc_forward;
+use FS::svc_broadband;
 use FS::domain_record;
 use FS::part_export;
 
-- 
cgit v1.2.1


From c4a7388a676878b64a3d3b2b2e0a4004e4daf669 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Tue, 29 Apr 2003 16:59:10 +0000
Subject: It helps if you can edit the ip_addr field.

---
 httemplate/edit/svc_broadband.cgi | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index f017d7a6e..ee7f8becf 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -96,10 +96,18 @@ Service #<B><%=$svcnum ? $svcnum : "(NEW)"%></B><BR><BR>
   <INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$svcnum%>">
   <INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%=$pkgnum%>">
   <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%=$svcpart%>">
-  <INPUT TYPE="hidden" NAME="ip_addr" VALUE="<%=$ip_addr%>">
 
   <%=&ntable("#cccccc",2)%>
-
+    <TR>
+      <TD ALIGN="right">IP Address</TD>
+      <TD BGCOLOR="#ffffff">
+<% if ( $part_svc->part_svc_column('ip_addr')->columnflag eq 'F' ) { %>
+        <INPUT TYPE="hidden" NAME="ip_addr" VALUE="<%=$ip_addr%>"><%=$ip_addr%>
+<% } else { %>
+        <INPUT TYPE="text" NAME="ip_addr" VALUE="<%=$ip_addr%>">
+<% } %>
+      </TD>
+    </TR>
     <TR>
       <TD ALIGN="right">Download speed</TD>
       <TD BGCOLOR="#ffffff">
-- 
cgit v1.2.1


From e77371fc4d3443c7b97a387bd25897b52200d64a Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Tue, 29 Apr 2003 18:28:50 +0000
Subject: Better SOA checking

---
 FS/FS/domain_record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index d3682c351..77b955088 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -241,7 +241,7 @@ sub check {
   if ( $self->rectype eq 'SOA' ) {
     my $recdata = $self->recdata;
     $recdata =~ s/\s+/ /g;
-    $recdata =~ /^([a-z0-9\.\-]+ [\w\-\+]+\.[a-z0-9\.\-]+ \( ([\dwdhmsWDHMS]+ ){5}\))$/i
+    $recdata =~ /^([a-z0-9\.\-]+ [\w\-\+]+\.[a-z0-9\.\-]+ \( ((\d+|((\d+[WDHMS])+)) ){5}\))$/i
       or return "Illegal data for SOA record: $recdata";
     $self->recdata($1);
   } elsif ( $self->rectype eq 'NS' ) {
@@ -332,7 +332,7 @@ sub zone {
 
 =head1 VERSION
 
-$Id: domain_record.pm,v 1.14 2003-04-24 18:45:03 khoff Exp $
+$Id: domain_record.pm,v 1.15 2003-04-29 18:28:50 khoff Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From aee635ea9986d031a996381f71e67d1446c10331 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Tue, 29 Apr 2003 19:49:37 +0000
Subject: 0 has a hash key looks like svcnum = 0.  Suprisingly, '' works.

---
 httemplate/misc/catchall.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/misc/catchall.cgi b/httemplate/misc/catchall.cgi
index 9aa84be18..3402b61e6 100755
--- a/httemplate/misc/catchall.cgi
+++ b/httemplate/misc/catchall.cgi
@@ -77,7 +77,7 @@ if ($pkgnum) {
 }
 
 # add an absence of a catchall
-$email{0} = "(none)";
+$email{''} = "(none)";
 
 my $p1 = popurl(1);
 print header("Domain Catchall Edit", '');
-- 
cgit v1.2.1


From f558d1e0e0ae2c956f7dd77d35ae647e45776087 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Fri, 2 May 2003 23:51:06 +0000
Subject: CARD && DCRD?

---
 httemplate/view/cust_main.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 2dc53e674..cea8d6321 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -223,7 +223,7 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
         '<TR><TD ALIGN="right">Billing type</TD><TD BGCOLOR="#ffffff">',
   ;
 
-  if ( $cust_main->payby eq 'CARD' && $cust_main->payby eq 'DCRD' ) {
+  if ( $cust_main->payby eq 'CARD' || $cust_main->payby eq 'DCRD' ) {
     my $payinfo = $cust_main->payinfo;
     $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
     print 'Credit card ',
@@ -236,7 +236,7 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
           '<TR><TD ALIGN="right">Name on card</TD><TD BGCOLOR="#ffffff">',
           $cust_main->payname, '</TD></TR>'
     ;
-  } elsif ( $cust_main->payby eq 'CHEK'  && $cust_main->payby eq 'DCHK') {
+  } elsif ( $cust_main->payby eq 'CHEK' || $cust_main->payby eq 'DCHK') {
     my( $account, $aba ) = split('@', $cust_main->payinfo );
     print 'Electronic check',
           ( $cust_main->payby eq 'CHEK' ? '(automatic)' : '(on-demand)' ),
-- 
cgit v1.2.1


From 5b16f111a4c03075e27bfc1f2299a9ed2c71a605 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 3 May 2003 01:30:35 +0000
Subject: clean up CVS cruft

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 8370b3f9e..9a1b9d864 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -307,7 +307,7 @@ sub part_svc {
 
 =item svc_x
 
-Returns a list of associate FS::svc_* records.
+Returns a list of associated FS::svc_* records.
 
 =cut
 
-- 
cgit v1.2.1


From 4cde7ff66b9d008668a430615264c38eb723de2b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 3 May 2003 02:03:48 +0000
Subject: typo in usage instructions

---
 bin/apache.export | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/apache.export b/bin/apache.export
index 399fb0377..908313606 100755
--- a/bin/apache.export
+++ b/bin/apache.export
@@ -60,6 +60,6 @@ close HTTPD_CONF;
 # -----
 
 sub usage {
-  die "Usage:\n  export.export user\n"; 
+  die "Usage:\n  apache.export user\n"; 
 }
 
-- 
cgit v1.2.1


From 61a2cea1f9f09fcb0482af442f45ef620277a8dc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 3 May 2003 02:06:56 +0000
Subject: enable quota maintenance in infostreet export

---
 FS/FS/part_export/infostreet.pm | 37 +++++++++++++++++++++++++++++++++++++
 httemplate/edit/svc_acct.cgi    | 11 ++++++++++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
index f2d519932..caca7c5e1 100644
--- a/FS/FS/part_export/infostreet.pm
+++ b/FS/FS/part_export/infostreet.pm
@@ -55,6 +55,12 @@ sub _export_insert {
   $err_or_queue = $self->infostreet_queueContact( $svc_acct->svcnum,
     $svc_acct->username, %contact_info );
   return $err_or_queue unless ref($err_or_queue);
+
+  # If a quota has been specified set the quota because it is not the default
+  $err_or_queue = $self->infostreet_queueSetQuota( $svc_acct->svcnum, 
+    $svc_acct->username, $svc_acct->quota ) if $svc_acct->quota;
+  return $err_or_queue unless ref($err_or_queue);
+
   my $error = $err_or_queue->depend_insert( $jobnum );
   return $error if $error;
 
@@ -68,6 +74,13 @@ sub _export_replace {
   my( $self, $new, $old ) = (shift, shift, shift);
   return "can't change username with InfoStreet"
     if $old->username ne $new->username;
+
+  # If the quota has changed then do the export to setQuota
+  my $err_or_queue = $self->infostreet_queueSetQuota( $new->svcnum, $new->username, $new->quota ) 
+        if ( $old->quota != $new->quota );  
+  return $err_or_queue unless ref($err_or_queue);
+
+
   return '' unless $old->_password ne $new->_password;
   $self->infostreet_queue( $new->svcnum,
     'passwd', $new->username, $new->_password );
@@ -150,6 +163,30 @@ sub infostreet_setContact {
 
 }
 
+sub infostreet_queueSetQuota {
+
+ my( $self, $svcnum) = (shift, shift);
+ my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => 'FS::part_export::infostreet::infostreet_setQuota',
+ };
+
+ $queue->insert(
+    $self->option('url'),
+    $self->option('login'),
+    $self->option('password'),
+    $self->option('groupID'),
+    @_,
+ ) or $queue;
+
+}
+
+sub infostreet_setQuota {
+  my($url, $is_username, $is_password, $groupID, $username, $quota) = @_;
+  infostreet_command($url, $is_username, $is_password, $groupID, 'setQuota', $username, [ 'int'=> $quota ]  );
+}
+
+
 sub infostreet_command { #subroutine, not method
   my($url, $username, $password, $groupID, $method, @args) = @_;
 
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index d4c9a738d..4420bb609 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -244,7 +244,16 @@ my($quota,$slipip)=(
   $svc_acct->slipip,
 );
 
-print qq!<INPUT TYPE="hidden" NAME="quota" VALUE="$quota">!;
+if ( $part_svc->part_svc_column('quota')->columnflag eq "F" )
+{
+  print qq!<INPUT TYPE="hidden" NAME="quota" VALUE="$quota">!;
+} else {
+  print <<END;
+    <TR><TD ALIGN="right">Quota:</TD>
+        <TD> <INPUT TYPE="text" NAME="quota" VALUE="$quota" ></TD>
+    </TR>
+END
+}
 
 if ( $part_svc->part_svc_column('slipip')->columnflag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="slipip" VALUE="$slipip">!;
-- 
cgit v1.2.1


From 903fb4a4509866ffaba09bf09fe535ba3ae02400 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Sun, 4 May 2003 20:58:01 +0000
Subject: proposed cust_main.cgi

---
 httemplate/view/cust_main_alt.cgi | 819 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 819 insertions(+)
 create mode 100644 httemplate/view/cust_main_alt.cgi

diff --git a/httemplate/view/cust_main_alt.cgi b/httemplate/view/cust_main_alt.cgi
new file mode 100644
index 000000000..80fa49e04
--- /dev/null
+++ b/httemplate/view/cust_main_alt.cgi
@@ -0,0 +1,819 @@
+<!-- mason kludge -->
+<%
+
+my $conf = new FS::Conf;
+
+#false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
+my %uiview = ();
+my %uiadd = ();
+foreach my $part_svc ( qsearch('part_svc',{}) ) {
+  $uiview{$part_svc->svcpart} = popurl(2). "view/". $part_svc->svcdb . ".cgi";
+  $uiadd{$part_svc->svcpart}= popurl(2). "edit/". $part_svc->svcdb . ".cgi";
+}
+
+print header("Customer View", menubar(
+  'Main Menu' => popurl(2)
+));
+
+print <<END;
+<STYLE TYPE="text/css">
+.package TH { font-size: medium }
+.package TR { font-size: smaller }
+.package .datehdr TH { font-size: smaller }
+.package .pkgnum { font-size: medium }
+.package .provision { font-size: larger; color: red; font-weight: bold }
+</STYLE>
+END
+
+die "No customer specified (bad URL)!" unless $cgi->keywords;
+my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
+$query =~ /^(\d+)$/;
+my $custnum = $1;
+my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
+die "Customer not found!" unless $cust_main;
+
+print qq!<A HREF="${p}edit/cust_main.cgi?$custnum">Edit this customer</A>!;
+
+print <<END;
+<SCRIPT>
+function cancel_areyousure(href) {
+    if (confirm("Perminantly delete all services and cancel this customer?") == true)
+        window.location.href = href;
+}
+</SCRIPT>
+END
+
+print qq! | <A HREF="javascript:cancel_areyousure('${p}misc/cust_main-cancel.cgi?$custnum')">!.
+      'Cancel this customer</A>'
+  if $cust_main->ncancelled_pkgs;
+
+print qq! | <A HREF="${p}misc/delete-customer.cgi?$custnum">!.
+      'Delete this customer</A>'
+  if $conf->exists('deletecustomers');
+
+unless ( $conf->exists('disable_customer_referrals') ) {
+  print qq! | <A HREF="!, popurl(2),
+        qq!edit/cust_main.cgi?referral_custnum=$custnum">!,
+        qq!Refer a new customer</A>!;
+
+  print qq! | <A HREF="!, popurl(2),
+        qq!search/cust_main.cgi?referral_custnum=$custnum">!,
+        qq!View this customer's referrals</A>!;
+}
+
+print '<BR><BR>';
+
+my $signupurl = $conf->config('signupurl');
+if ( $signupurl ) {
+print "This customer's signup URL: ".
+      "<a href=\"$signupurl?ref=$custnum\">$signupurl?ref=$custnum</a><BR><BR>";
+}
+
+print '<A NAME="cust_main"></A>';
+
+print &itable(), '<TR>';
+
+print '<TD VALIGN="top">';
+
+  print "Billing address", &ntable("#cccccc"), "<TR><TD>",
+        &ntable("#cccccc",2),
+    '<TR><TD ALIGN="right">Contact name</TD>',
+      '<TD COLSPAN=3 BGCOLOR="#ffffff">',
+      $cust_main->last, ', ', $cust_main->first,
+      '</TD>';
+print '<TD ALIGN="right">SS#</TD><TD BGCOLOR="#ffffff">',
+      $cust_main->ss || '&nbsp', '</TD>'
+  if $conf->exists('show_ss');
+
+print '</TR>',
+    '<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+      $cust_main->company,
+      '</TD></TR>',
+    '<TR><TD ALIGN="right">Address</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+      $cust_main->address1,
+      '</TD></TR>',
+  ;
+  print '<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+        $cust_main->address2, '</TD></TR>'
+    if $cust_main->address2;
+  print '<TR><TD ALIGN="right">City</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->city,
+          '</TD><TD ALIGN="right">State</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->state,
+          '</TD><TD ALIGN="right">Zip</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->zip, '</TD></TR>',
+        '<TR><TD ALIGN="right">Country</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->country,
+          '</TD></TR>',
+  ;
+  my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day Phone';
+  my $night_label = FS::Msgcat::_gettext('night') || 'Night Phone';
+  print '<TR><TD ALIGN="right">'. $daytime_label.
+          '</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+          $cust_main->daytime || '&nbsp', '</TD></TR>',
+        '<TR><TD ALIGN="right">'. $night_label. 
+          '</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+          $cust_main->night || '&nbsp', '</TD></TR>',
+        '<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+          $cust_main->fax || '&nbsp', '</TD></TR>',
+        '</TABLE>', "</TD></TR></TABLE>"
+  ;
+
+  if ( defined $cust_main->dbdef_table->column('ship_last') ) {
+
+    my $pre = $cust_main->ship_last ? 'ship_' : '';
+
+    print "<BR>Service address", &ntable("#cccccc"), "<TR><TD>",
+          &ntable("#cccccc",2),
+      '<TR><TD ALIGN="right">Contact name</TD>',
+        '<TD COLSPAN=5 BGCOLOR="#ffffff">',
+        $cust_main->get("${pre}last"), ', ', $cust_main->get("${pre}first"),
+        '</TD></TR>',
+      '<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+        $cust_main->get("${pre}company"),
+        '</TD></TR>',
+      '<TR><TD ALIGN="right">Address</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+        $cust_main->get("${pre}address1"),
+        '</TD></TR>',
+    ;
+    print '<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+          $cust_main->get("${pre}address2"), '</TD></TR>'
+      if $cust_main->get("${pre}address2");
+    print '<TR><TD ALIGN="right">City</TD><TD BGCOLOR="#ffffff">',
+            $cust_main->get("${pre}city"),
+            '</TD><TD ALIGN="right">State</TD><TD BGCOLOR="#ffffff">',
+            $cust_main->get("${pre}state"),
+            '</TD><TD ALIGN="right">Zip</TD><TD BGCOLOR="#ffffff">',
+            $cust_main->get("${pre}zip"), '</TD></TR>',
+          '<TR><TD ALIGN="right">Country</TD><TD BGCOLOR="#ffffff">',
+            $cust_main->get("${pre}country"),
+            '</TD></TR>',
+    ;
+    print '<TR><TD ALIGN="right">'. $daytime_label. '</TD>',
+          '<TD COLSPAN=5 BGCOLOR="#ffffff">',
+            $cust_main->get("${pre}daytime") || '&nbsp', '</TD></TR>',
+          '<TR><TD ALIGN="right">'. $night_label. '</TD>'.
+          '<TD COLSPAN=5 BGCOLOR="#ffffff">',
+            $cust_main->get("${pre}night") || '&nbsp', '</TD></TR>',
+          '<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
+            $cust_main->get("${pre}fax") || '&nbsp', '</TD></TR>',
+          '</TABLE>', "</TD></TR></TABLE>"
+    ;
+
+  }
+
+print '</TD>';
+
+print '<TD VALIGN="top">';
+
+  print &ntable("#cccccc"), "<TR><TD>", &ntable("#cccccc",2),
+        '<TR><TD ALIGN="right">Customer number</TD><TD BGCOLOR="#ffffff">',
+        $custnum, '</TD></TR>',
+  ;
+
+  my @agents = qsearch( 'agent', {} );
+  my $agent;
+  unless ( scalar(@agents) == 1 ) {
+    $agent = qsearchs('agent',{ 'agentnum' => $cust_main->agentnum } );
+    print '<TR><TD ALIGN="right">Agent</TD><TD BGCOLOR="#ffffff">',
+        $agent->agentnum, ": ", $agent->agent, '</TD></TR>';
+  } else {
+    $agent = $agents[0];
+  }
+  my @referrals = qsearch( 'part_referral', {} );
+  unless ( scalar(@referrals) == 1 ) {
+    my $referral = qsearchs('part_referral', {
+      'refnum' => $cust_main->refnum
+    } );
+    print '<TR><TD ALIGN="right">Advertising source</TD><TD BGCOLOR="#ffffff">',
+          $referral->refnum, ": ", $referral->referral, '</TD></TR>';
+  }
+  print '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
+    $cust_main->otaker, '</TD></TR>';
+
+  print '<TR><TD ALIGN="right">Referring Customer</TD><TD BGCOLOR="#ffffff">';
+  my $referring_cust_main = '';
+  if ( $cust_main->referral_custnum
+       && ( $referring_cust_main =
+            qsearchs('cust_main', { custnum => $cust_main->referral_custnum } )
+          )
+     ) {
+    print '<A HREF="'. popurl(1). 'cust_main.cgi?'.
+          $cust_main->referral_custnum. '">'.
+          $cust_main->referral_custnum. ': '.
+          ( $referring_cust_main->company
+              ? $referring_cust_main->company. ' ('.
+                  $referring_cust_main->last. ', '. $referring_cust_main->first.
+                  ')'
+              : $referring_cust_main->last. ', '. $referring_cust_main->first
+          ).
+          '</A>';
+  }
+  print '</TD></TR>';
+
+  print '</TABLE></TD></TR></TABLE>';
+
+print '<BR>';
+
+if ( $conf->config('payby-default') ne 'HIDE' ) {
+
+  my @invoicing_list = $cust_main->invoicing_list;
+  print "Billing information (",
+       qq!<A HREF="!, popurl(2), qq!misc/bill.cgi?$custnum">!, "Bill now</A>)",
+        &ntable("#cccccc"), "<TR><TD>", &ntable("#cccccc",2),
+        '<TR><TD ALIGN="right">Tax exempt</TD><TD BGCOLOR="#ffffff">',
+        $cust_main->tax ? 'yes' : 'no',
+        '</TD></TR>',
+        '<TR><TD ALIGN="right">Postal invoices</TD><TD BGCOLOR="#ffffff">',
+        ( grep { $_ eq 'POST' } @invoicing_list ) ? 'yes' : 'no',
+        '</TD></TR>',
+        '<TR><TD ALIGN="right">Email invoices</TD><TD BGCOLOR="#ffffff">',
+        join(', ', grep { $_ ne 'POST' } @invoicing_list ) || 'no',
+        '</TD></TR>',
+        '<TR><TD ALIGN="right">Billing type</TD><TD BGCOLOR="#ffffff">',
+  ;
+
+  if ( $cust_main->payby eq 'CARD' || $cust_main->payby eq 'DCRD' ) {
+    my $payinfo = $cust_main->payinfo;
+    $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
+    print 'Credit card ',
+          ( $cust_main->payby eq 'CARD' ? '(automatic)' : '(on-demand)' ),
+          '</TD></TR>',
+          '<TR><TD ALIGN="right">Card number</TD><TD BGCOLOR="#ffffff">',
+          $payinfo, '</TD></TR>',
+          '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->paydate, '</TD></TR>',
+          '<TR><TD ALIGN="right">Name on card</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->payname, '</TD></TR>'
+    ;
+  } elsif ( $cust_main->payby eq 'CHEK' || $cust_main->payby eq 'DCHK') {
+    my( $account, $aba ) = split('@', $cust_main->payinfo );
+    print 'Electronic check',
+          ( $cust_main->payby eq 'CHEK' ? '(automatic)' : '(on-demand)' ),
+          '</TD></TR>',
+          '<TR><TD ALIGN="right">Account number</TD><TD BGCOLOR="#ffffff">',
+          $account, '</TD></TR>',
+          '<TR><TD ALIGN="right">ABA/Routing code</TD><TD BGCOLOR="#ffffff">',
+          $aba, '</TD></TR>',
+          '<TR><TD ALIGN="right">Bank name</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->payname, '</TD></TR>'
+    ;
+  } elsif ( $cust_main->payby eq 'LECB' ) {
+    $cust_main->payinfo =~ /^(\d{3})(\d{3})(\d{4})$/;
+    my $payinfo = "$1-$2-$3";
+    print 'Phone bill billing</TD></TR>',
+          '<TR><TD ALIGN="right">Phone number</TD><TD BGCOLOR="#ffffff">',
+          $payinfo, '</TD></TR>',
+    ;
+  } elsif ( $cust_main->payby eq 'BILL' ) {
+    print 'Billing</TD></TR>';
+    print '<TR><TD ALIGN="right">P.O. </TD><TD BGCOLOR="#ffffff">',
+          $cust_main->payinfo, '</TD></TR>',
+      if $cust_main->payinfo;
+    print '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->paydate, '</TD></TR>',
+          '<TR><TD ALIGN="right">Attention</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->payname, '</TD></TR>',
+    ;
+  } elsif ( $cust_main->payby eq 'COMP' ) {
+    print 'Complimentary</TD></TR>',
+          '<TR><TD ALIGN="right">Authorized by</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->payinfo, '</TD></TR>',
+          '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
+          $cust_main->paydate, '</TD></TR>',
+    ;
+  }
+
+  print "</TABLE></TD></TR></TABLE>";
+
+}
+
+print '</TD></TR></TABLE>';
+
+if ( defined $cust_main->dbdef_table->column('comments')
+     && $cust_main->comments )
+{
+  print "<BR>Comments". &ntable("#cccccc"). "<TR><TD>".
+        &ntable("#cccccc",2).
+        '<TR><TD BGCOLOR="#ffffff"><PRE>'.
+        encode_entities($cust_main->comments).
+        '</PRE></TD></TR></TABLE></TABLE>';
+}
+
+print '</TD></TR></TABLE>';
+
+print '<BR>'.
+  '<FORM ACTION="'.popurl(2).'edit/process/quick-cust_pkg.cgi" METHOD="POST">'.
+  qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
+  '<SELECT NAME="pkgpart"><OPTION> ';
+
+foreach my $part_pkg (
+  qsearch( 'part_pkg', { 'disabled' => '' }, '',
+           ' AND 0 < ( SELECT COUNT(*) FROM type_pkgs '.
+           '             WHERE typenum = '. $agent->typenum.
+           '             AND type_pkgs.pkgpart = part_pkg.pkgpart )'
+         )
+) {
+  print '<OPTION VALUE="'. $part_pkg->pkgpart. '">'. $part_pkg->pkg. ' - '.
+        $part_pkg->comment;
+}
+
+print '</SELECT><INPUT TYPE="submit" VALUE="Order Package"></FORM><BR>';
+
+if ( $conf->config('payby-default') ne 'HIDE' ) {
+
+  print '<BR>'.
+    qq!<FORM ACTION="${p}edit/process/quick-charge.cgi" METHOD="POST">!.
+    qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
+    qq!Description:<INPUT TYPE="text" NAME="pkg">!.
+    qq!&nbsp;Amount:<INPUT TYPE="text" NAME="amount" SIZE=6>!.
+    qq!&nbsp;!;
+  
+  #false laziness w/ edit/part_pkg.cgi
+  if ( $conf->exists('enable_taxclasses') ) {
+    print '<SELECT NAME="taxclass">';
+    my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
+      or die dbh->errstr;
+    $sth->execute or die $sth->errstr;
+    foreach my $taxclass ( map $_->[0], @{$sth->fetchall_arrayref} ) {
+      print qq!<OPTION VALUE="$taxclass"!;
+      #print ' SELECTED' if $taxclass eq $hashref->{taxclass};
+      print qq!>$taxclass</OPTION>!;
+    }
+    print '</SELECT>';
+  } else {
+    print '<INPUT TYPE="hidden" NAME="taxclass" VALUE="">';
+  }
+  
+  print qq!<INPUT TYPE="submit" VALUE="One-time charge"></FORM><BR>!;
+
+}
+
+print <<END;
+<SCRIPT>
+function cust_pkg_areyousure(href) {
+    if (confirm("Permanently delete included services and cancel this package?") == true)
+        window.location.href = href;
+}
+function svc_areyousure(href) {
+    if (confirm("Permanently unprovision and delete this service?") == true)
+        window.location.href = href;
+}
+</SCRIPT>
+END
+
+print qq!<BR><A NAME="cust_pkg">Packages</A> !,
+#      qq!<BR>Click on package number to view/edit package.!,
+      qq!( <A HREF="!, popurl(2), qq!edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> (preserves services) )!,
+;
+
+#begin display packages
+
+#get package info
+
+my $packages = get_packages();
+
+if ( @$packages ) {
+%>
+<TABLE CLASS="package" BORDER=1 CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">
+<TR>
+  <TH COLSPAN=2 ROWSPAN=2>Package</TH>
+  <TH COLSPAN=6>Dates</TH>
+  <TH COLSPAN=2 ROWSPAN=2>Services</TH>
+</TR>
+<TR CLASS="datehdr">
+  <TH>Setup</TH>
+  <TH>Last bill</TH>
+  <TH>Next bill</TH>
+  <TH>Susp.</TH>
+  <TH>Expire</TH>
+  <TH>Cancel</TH>
+</TR>
+<%
+foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
+  my $rowspan = 0;
+
+  if ($pkg->{cancel}) {
+    $rowspan = 0;
+  } else {
+    foreach my $svcpart (@{$pkg->{svcparts}}) {
+      $rowspan += $svcpart->{count};
+      $rowspan++ if ($svcpart->{count} < $svcpart->{quantity});
+    }
+  } 
+
+%>
+<!--pkgnum: <%=$pkg->{pkgnum}%>-->
+<TR>
+  <TD ROWSPAN=<%=$rowspan%> CLASS="pkgnum"><%=$pkg->{pkgnum}%></TD>
+  <TD ROWSPAN=<%=$rowspan%>>
+    <%=$pkg->{pkg}%> - <%=$pkg->{comment}%> (&nbsp;<%=pkg_details_link($pkg)%>&nbsp;)<BR>
+<% unless ($pkg->{cancel}) { %>
+    (&nbsp;<%=pkg_change_link($pkg)%>&nbsp;)
+    (&nbsp;<%=($pkg->{susp}) ? pkg_unsuspend_link($pkg) : pkg_suspend_link($pkg)%> | <%=pkg_cancel_link($pkg)%>&nbsp;)
+    (&nbsp;<%=pkg_dates_link($pkg)%> | <%=pkg_customize_link($pkg)%>&nbsp;)
+<% } %>
+  </TD>
+<%
+  foreach (qw(setup last_bill next_bill susp expire cancel)) {
+    print qq!  <TD ROWSPAN=$rowspan>! . pkg_datestr($pkg,$_) . qq!</TD>\n!;
+  }
+
+  if ($rowspan == 0) { print qq!</TR>\n!; next; }
+
+  my $cnt = 0;
+  foreach my $svcpart (sort {$a->{svcpart} <=> $b->{svcpart}} @{$pkg->{svcparts}}) {
+    foreach my $service (@{$svcpart->{services}}) {
+      print '<TR>' if ($cnt > 0);
+%>
+  <TD><%=svc_link($svcpart,$service)%></TD>
+  <TD><%=svc_label_link($svcpart,$service)%><BR>(&nbsp;<%=svc_unprovision_link($service)%>&nbsp;)</TD>
+</TR>
+<%
+      $cnt++;
+    }
+    if ($svcpart->{count} < $svcpart->{quantity}) {
+      print qq!<TR>\n! if ($cnt > 0);
+      print qq!  <TD COLSPAN=2>!.svc_provision_link($pkg,$svcpart).qq!</TD>\n</TR>\n!;
+    }
+  }
+}
+print '</TABLE>'
+}
+
+#end display packages
+
+
+print <<END;
+<SCRIPT>
+function cust_pay_areyousure(href) {
+    if (confirm("Are you sure you want to delete this payment?")
+ == true)
+        window.location.href = href;
+}
+function cust_pay_unapply_areyousure(href) {
+    if (confirm("Are you sure you want to unapply this payment?")
+ == true)
+        window.location.href = href;
+}
+</SCRIPT>
+END
+
+if ( $conf->config('payby-default') ne 'HIDE' ) {
+  
+  #formatting
+  print qq!<BR><BR><A NAME="history">Payment History!.
+        qq!</A> ( !.
+        qq!<A HREF="!. popurl(2). qq!edit/cust_pay.cgi?custnum=$custnum">!.
+        qq!Post payment</A> | !.
+        qq!<A HREF="!. popurl(2). qq!edit/cust_credit.cgi?$custnum">!.
+        qq!Post credit</A> )!;
+  
+  #get payment history
+  #
+  # major problem: this whole thing is way too sloppy.
+  # minor problem: the description lines need better formatting.
+  
+  my @history = (); #needed for mod_perl :)
+  
+  my %target = ();
+  
+  my @bills = qsearch('cust_bill',{'custnum'=>$custnum});
+  foreach my $bill (@bills) {
+    my($bref)=$bill->hashref;
+    my $bpre = ( $bill->owed > 0 )
+                 ? '<b><font size="+1" color="#ff0000"> Open '
+                 : '';
+    my $bpost = ( $bill->owed > 0 ) ? '</font></b>' : '';
+    push @history,
+      $bref->{_date} . qq!\t<A HREF="!. popurl(2). qq!view/cust_bill.cgi?! .
+      $bref->{invnum} . qq!">${bpre}Invoice #! . $bref->{invnum} .
+      qq! (Balance \$! . $bill->owed . qq!)$bpost</A>\t! .
+      $bref->{charged} . qq!\t\t\t!;
+  
+    my(@cust_bill_pay)=qsearch('cust_bill_pay',{'invnum'=> $bref->{invnum} } );
+  #  my(@payments)=qsearch('cust_pay',{'invnum'=> $bref->{invnum} } );
+  #  my($payment);
+    foreach my $cust_bill_pay (@cust_bill_pay) {
+      my $payment = $cust_bill_pay->cust_pay;
+      my($date,$invnum,$payby,$payinfo,$paid)=($payment->_date,
+                                               $cust_bill_pay->invnum,
+                                               $payment->payby,
+                                               $payment->payinfo,
+                                               $cust_bill_pay->amount,
+                        );
+      $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
+        if $payby eq 'CARD';
+      my $target = "$payby$payinfo";
+      $payby =~ s/^BILL$/Check #/ if $payinfo;
+      $payby =~ s/^(CARD|COMP)$/$1 /;
+      my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
+                     ? qq! (<A HREF="javascript:cust_pay_areyousure('${p}misc/delete-cust_pay.cgi?!. $payment->paynum. qq!')">delete</A>)!
+                     : '';
+      my $unapply =
+        $payment->closed !~ /^Y/i && $conf->exists('unapplypayments')
+          ? qq! (<A HREF="javascript:cust_pay_unapply_areyousure('${p}misc/unapply-cust_pay.cgi?!. $payment->paynum. qq!')">unapply</A>)!
+          : '';
+      push @history,
+        "$date\tPayment, Invoice #$invnum ($payby$payinfo)$delete$unapply\t\t$paid\t\t\t$target";
+    }
+  
+    my(@cust_credit_bill)=
+      qsearch('cust_credit_bill', { 'invnum'=> $bref->{invnum} } );
+    foreach my $cust_credit_bill (@cust_credit_bill) {
+      my $cust_credit = $cust_credit_bill->cust_credit;
+      my($date, $invnum, $crednum, $amount, $reason, $app_date ) = (
+        $cust_credit->_date,
+        $cust_credit_bill->invnum,
+        $cust_credit_bill->crednum,
+        $cust_credit_bill->amount,
+        $cust_credit->reason,
+        time2str("%D", $cust_credit_bill->_date),
+      );
+      push @history,
+        "$date\tCredit #$crednum: $reason<BR>".
+        "(applied to invoice #$invnum on $app_date)\t\t\t$amount\t";
+    }
+  }
+  
+  my @credits = grep { scalar(my @array = $_->cust_credit_refund) }
+             qsearch('cust_credit',{'custnum'=>$custnum});
+  foreach my $credit (@credits) {
+    my($cref)=$credit->hashref;
+    my(@cust_credit_refund)=
+      qsearch('cust_credit_refund', { 'crednum'=> $cref->{crednum} } );
+    foreach my $cust_credit_refund (@cust_credit_refund) {
+      my $cust_refund = $cust_credit_refund->cust_credit;
+      my($date, $crednum, $amount, $reason, $app_date ) = (
+        $credit->_date,
+        $credit->crednum,
+        $cust_credit_refund->amount,
+        $credit->reason,
+        time2str("%D", $cust_credit_refund->_date),
+      );
+      push @history,
+        "$date\tCredit #$crednum: $reason<BR>".
+        "(applied to refund on $app_date)\t\t\t$amount\t";
+    }
+  }
+  
+  @credits = grep { $_->credited  > 0 }
+             qsearch('cust_credit',{'custnum'=>$custnum});
+  foreach my $credit (@credits) {
+    my($cref)=$credit->hashref;
+    push @history,
+      $cref->{_date} . "\t" .
+      qq!<A HREF="! . popurl(2). qq!edit/cust_credit_bill.cgi?!. $cref->{crednum} . qq!">!.
+      '<b><font size="+1" color="#ff0000">Unapplied credit #' .
+      $cref->{crednum} . "</font></b></A>: ".
+      $cref->{reason} . "\t\t\t" . $credit->credited . "\t";
+  }
+  
+  my(@refunds)=qsearch('cust_refund',{'custnum'=> $custnum } );
+  foreach my $refund (@refunds) {
+    my($rref)=$refund->hashref;
+    my($refundnum) = (
+      $refund->refundnum,
+    );
+  
+    push @history,
+      $rref->{_date} . "\tRefund #$refundnum, (" .
+      $rref->{payby} . " " . $rref->{payinfo} . ") by " .
+      $rref->{otaker} . " - ". $rref->{reason} . "\t\t\t\t" .
+      $rref->{refund};
+  }
+  
+  my @unapplied_payments =
+    grep { $_->unapplied > 0 } qsearch('cust_pay', { 'custnum' => $custnum } );
+  foreach my $payment (@unapplied_payments) {
+    my $payby = $payment->payby;
+    my $payinfo = $payment->payinfo;
+    #false laziness w/above
+    $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
+      if $payby eq 'CARD';
+    my $target = "$payby$payinfo";
+    $payby =~ s/^BILL$/Check #/ if $payinfo;
+    $payby =~ s/^(CARD|COMP)$/$1 /;
+    my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
+                   ? qq! (<A HREF="javascript:cust_pay_areyousure('${p}misc/delete-cust_pay.cgi?!. $payment->paynum. qq!')">delete</A>)!
+                   : '';
+    push @history,
+      $payment->_date. "\t".
+      '<b><font size="+1" color="#ff0000">Unapplied payment #' .
+      $payment->paynum . " ($payby$payinfo)</font></b> ".
+      '(<A HREF="'. popurl(2). 'edit/cust_bill_pay.cgi?'. $payment->paynum. '">'.
+      "apply</A>)$delete".
+      "\t\t" . $payment->unapplied . "\t\t\t$target";
+  }
+  
+          #formatting
+          print &table(), <<END;
+  <TR>
+    <TH>Date</TH>
+    <TH>Description</TH>
+    <TH><FONT SIZE=-1>Charge</FONT></TH>
+    <TH><FONT SIZE=-1>Payment</FONT></TH>
+    <TH><FONT SIZE=-1>In-house<BR>Credit</FONT></TH>
+    <TH><FONT SIZE=-1>Refund</FONT></TH>
+    <TH><FONT SIZE=-1>Balance</FONT></TH>
+  </TR>
+END
+  
+  #display payment history
+  
+  my $balance = 0;
+  foreach my $item (sort keyfield_numerically @history) {
+    my($date,$desc,$charge,$payment,$credit,$refund,$target)=split(/\t/,$item);
+    $charge ||= 0;
+    $payment ||= 0;
+    $credit ||= 0;
+    $refund ||= 0;
+    $balance += $charge - $payment;
+    $balance -= $credit - $refund;
+    $balance = sprintf("%.2f", $balance);
+    $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
+    $target = '' unless defined $target;
+  
+    print "<TR><TD><FONT SIZE=-1>";
+    print qq!<A NAME="$target">! unless $target && $target{$target}++;
+    print time2str("%D",$date);
+    print '</A>' if $target && $target{$target} == 1;
+    print "</FONT></TD>",
+  	"<TD><FONT SIZE=-1>$desc</FONT></TD>",
+  	"<TD><FONT SIZE=-1>",
+          ( $charge ? "\$".sprintf("%.2f",$charge) : '' ),
+          "</FONT></TD>",
+  	"<TD><FONT SIZE=-1>",
+          ( $payment ? "-&nbsp;\$".sprintf("%.2f",$payment) : '' ),
+          "</FONT></TD>",
+  	"<TD><FONT SIZE=-1>",
+          ( $credit ? "-&nbsp;\$".sprintf("%.2f",$credit) : '' ),
+          "</FONT></TD>",
+  	"<TD><FONT SIZE=-1>",
+          ( $refund ? "\$".sprintf("%.2f",$refund) : '' ),
+          "</FONT></TD>",
+  	"<TD><FONT SIZE=-1>\$" . $balance,
+          "</FONT></TD>",
+          "\n";
+  }
+  
+  print "</TABLE>";
+
+}
+
+print '</BODY></HTML>';
+
+#subroutiens
+sub keyfield_numerically { (split(/\t/,$a))[0] <=> (split(/\t/,$b))[0]; }
+
+%>
+
+<%
+
+
+sub get_packages {
+
+my @packages = ();
+
+foreach my $cust_pkg (($conf->exists('hidecancelledpackages') ? ($cust_main->ncancelled_pkgs)
+                                                              : ($cust_main->all_pkgs))) { 
+
+  my $part_pkg = $cust_pkg->part_pkg;
+
+  my %pkg = ();
+  $pkg{pkgnum} = $cust_pkg->pkgnum;
+  $pkg{pkg} = $part_pkg->pkg;
+  $pkg{pkgpart} = $part_pkg->pkgpart;
+  $pkg{comment} = $part_pkg->getfield('comment');
+  $pkg{setup} = $cust_pkg->getfield('setup');
+  $pkg{last_bill} = $cust_pkg->getfield('last_bill');
+  $pkg{next_bill} = $cust_pkg->getfield('bill');
+  $pkg{susp} = $cust_pkg->getfield('susp');
+  $pkg{expire} = $cust_pkg->getfield('expire');
+  $pkg{cancel} = $cust_pkg->getfield('cancel');
+
+  $pkg{svcparts} = []; 
+
+  foreach my $pkg_svc (qsearch('pkg_svc', { 'pkgpart' => $part_pkg->pkgpart })) {
+
+    next if ($pkg_svc->quantity == 0);
+
+    my $part_svc = qsearchs('part_svc', { 'svcpart' => $pkg_svc->svcpart });
+
+    my $svcpart = {};
+    $svcpart->{svcpart} = $part_svc->svcpart;
+    $svcpart->{svc} = $part_svc->svc;
+    $svcpart->{svcdb} = $part_svc->svcdb;
+    $svcpart->{quantity} = $pkg_svc->quantity;
+    $svcpart->{count} = 0;
+
+    $svcpart->{services} = [];
+
+    foreach my $cust_svc (qsearch('cust_svc', { 'pkgnum' => $cust_pkg->pkgnum,
+                                                'svcpart' => $part_svc->svcpart } )) {
+
+      my $svc = {};
+      $svc->{svcnum} = $cust_svc->svcnum;
+      $svc->{label} = ($cust_svc->label)[1];
+
+      push @{$svcpart->{services}}, $svc;
+
+      $svcpart->{count}++;
+
+    }
+
+    push @{$pkg{svcparts}}, $svcpart;
+
+  }
+
+  push @packages, \%pkg;
+
+}
+
+return \@packages;
+
+}
+
+sub svc_link {
+
+ my ($svcpart, $svc) = (shift,shift) or return '';
+ return qq!<A HREF="$p1/view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svcpart->{svc}</A>!;
+
+}
+
+sub svc_label_link {
+
+ my ($svcpart, $svc) = (shift,shift) or return '';
+ return qq!<A HREF="$p1/view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svc->{label}</A>!;
+
+}
+
+sub svc_provision_link {
+  my ($pkg, $svcpart) = (shift,shift) or return '';
+  return qq!<A CLASS="provision" HREF="${p1}/edit/$svcpart->{svcdb}.cgi?! .
+         qq!pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}">! .
+         qq!Provision $svcpart->{svc} (! . ($svcpart->{quantity} - $svcpart->{count}) . qq!)</A>!;
+}
+
+sub svc_unprovision_link {
+  my $svc = shift or return '';
+  return qq!<A HREF="javascript:svc_areyousure('${p}misc/unprovision.cgi?$svc->{svcnum}')">Unprovision</A>!;
+}
+
+# This should be generalized to use config options to determine order.
+sub pkgsort_pkgnum_cancel {
+  if ($a->{cancel} and $b->{cancel}) {
+    return ($a->{pkgnum} <=> $b->{pkgnum});
+  } elsif ($a->{cancel} or $b->{cancel}) {
+    return (-1) if ($b->{cancel});
+    return (1) if ($a->{cancel});
+    return (0);
+  } else {
+    return($a->{pkgnum} <=> $b->{pkgnum});
+  }
+}
+
+sub pkg_datestr {
+  my ($pkg,$field) = (shift,shift) or return '';
+  return $pkg->{$field} ? time2str('%D<BR><FONT SIZE=-3>%l:%M:%S%P&nbsp;%z</FONT>',
+                                   $pkg->{$field})
+                        : '&nbsp';
+}
+
+sub pkg_details_link {
+  my $pkg = shift or return '';
+  return qq!<a href="${p}view/cust_pkg.cgi?$pkg->{pkgnum}">Details</a>!;
+}
+
+sub pkg_change_link {
+  my $pkg = shift or return '';
+  return qq!<a href="${p}misc/change_pkg.cgi?$pkg->{pkgnum}">Change package</a>!;
+}
+
+sub pkg_suspend_link {
+  my $pkg = shift or return '';
+  return qq!<a href="${p}misc/susp_pkg.cgi?$pkg->{pkgnum}">Suspend</a>!;
+}
+
+sub pkg_unsuspend_link {
+  my $pkg = shift or return '';
+  return qq!<a href="${p}misc/unsusp_pkg.cgi?$pkg->{pkgnum}">Unsuspend</a>!;
+}
+
+sub pkg_cancel_link {
+  my $pkg = shift or return '';
+  return qq!<A HREF="javascript:cust_pkg_areyousure('${p}misc/cancel_pkg.cgi?$pkg->{pkgnum}')">Cancel</A>!;
+}
+
+sub pkg_dates_link {
+  my $pkg = shift or return '';
+  return qq!<A HREF="${p}edit/REAL_cust_pkg.cgi?$pkg->{pkgnum}">Edit&nbsp;dates</A>!;
+}
+
+sub pkg_customize_link {
+  my $pkg = shift or return '';
+  return qq!<A HREF="${p}edit/part_pkg.cgi?keywords=$custnum;clone=$pkg->{pkgpart};pkgnum=$pkg->{pkgnum}">Customize</A>!;
+}
+
+%>
+
-- 
cgit v1.2.1


From bc2e387fcf4cf847ef7b51e4137e276fedea5c1e Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Tue, 6 May 2003 20:33:03 +0000
Subject: Can't pull  out of thin air.

---
 httemplate/view/cust_main_alt.cgi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/httemplate/view/cust_main_alt.cgi b/httemplate/view/cust_main_alt.cgi
index 80fa49e04..01e46b59a 100644
--- a/httemplate/view/cust_main_alt.cgi
+++ b/httemplate/view/cust_main_alt.cgi
@@ -371,7 +371,7 @@ print qq!<BR><A NAME="cust_pkg">Packages</A> !,
 
 #get package info
 
-my $packages = get_packages();
+my $packages = get_packages($cust_main);
 
 if ( @$packages ) {
 %>
@@ -673,6 +673,8 @@ sub keyfield_numerically { (split(/\t/,$a))[0] <=> (split(/\t/,$b))[0]; }
 
 sub get_packages {
 
+my $cust_main = shift or return undef;
+
 my @packages = ();
 
 foreach my $cust_pkg (($conf->exists('hidecancelledpackages') ? ($cust_main->ncancelled_pkgs)
-- 
cgit v1.2.1


From 5839c5c7d8fe0b2cfe13e2bbd3a1c25128b4cecf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 May 2003 21:15:55 +0000
Subject: don't create new files in lieu of branches

---
 httemplate/view/cust_main_alt.cgi | 821 --------------------------------------
 1 file changed, 821 deletions(-)
 delete mode 100644 httemplate/view/cust_main_alt.cgi

diff --git a/httemplate/view/cust_main_alt.cgi b/httemplate/view/cust_main_alt.cgi
deleted file mode 100644
index 01e46b59a..000000000
--- a/httemplate/view/cust_main_alt.cgi
+++ /dev/null
@@ -1,821 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $conf = new FS::Conf;
-
-#false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
-my %uiview = ();
-my %uiadd = ();
-foreach my $part_svc ( qsearch('part_svc',{}) ) {
-  $uiview{$part_svc->svcpart} = popurl(2). "view/". $part_svc->svcdb . ".cgi";
-  $uiadd{$part_svc->svcpart}= popurl(2). "edit/". $part_svc->svcdb . ".cgi";
-}
-
-print header("Customer View", menubar(
-  'Main Menu' => popurl(2)
-));
-
-print <<END;
-<STYLE TYPE="text/css">
-.package TH { font-size: medium }
-.package TR { font-size: smaller }
-.package .datehdr TH { font-size: smaller }
-.package .pkgnum { font-size: medium }
-.package .provision { font-size: larger; color: red; font-weight: bold }
-</STYLE>
-END
-
-die "No customer specified (bad URL)!" unless $cgi->keywords;
-my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
-$query =~ /^(\d+)$/;
-my $custnum = $1;
-my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
-die "Customer not found!" unless $cust_main;
-
-print qq!<A HREF="${p}edit/cust_main.cgi?$custnum">Edit this customer</A>!;
-
-print <<END;
-<SCRIPT>
-function cancel_areyousure(href) {
-    if (confirm("Perminantly delete all services and cancel this customer?") == true)
-        window.location.href = href;
-}
-</SCRIPT>
-END
-
-print qq! | <A HREF="javascript:cancel_areyousure('${p}misc/cust_main-cancel.cgi?$custnum')">!.
-      'Cancel this customer</A>'
-  if $cust_main->ncancelled_pkgs;
-
-print qq! | <A HREF="${p}misc/delete-customer.cgi?$custnum">!.
-      'Delete this customer</A>'
-  if $conf->exists('deletecustomers');
-
-unless ( $conf->exists('disable_customer_referrals') ) {
-  print qq! | <A HREF="!, popurl(2),
-        qq!edit/cust_main.cgi?referral_custnum=$custnum">!,
-        qq!Refer a new customer</A>!;
-
-  print qq! | <A HREF="!, popurl(2),
-        qq!search/cust_main.cgi?referral_custnum=$custnum">!,
-        qq!View this customer's referrals</A>!;
-}
-
-print '<BR><BR>';
-
-my $signupurl = $conf->config('signupurl');
-if ( $signupurl ) {
-print "This customer's signup URL: ".
-      "<a href=\"$signupurl?ref=$custnum\">$signupurl?ref=$custnum</a><BR><BR>";
-}
-
-print '<A NAME="cust_main"></A>';
-
-print &itable(), '<TR>';
-
-print '<TD VALIGN="top">';
-
-  print "Billing address", &ntable("#cccccc"), "<TR><TD>",
-        &ntable("#cccccc",2),
-    '<TR><TD ALIGN="right">Contact name</TD>',
-      '<TD COLSPAN=3 BGCOLOR="#ffffff">',
-      $cust_main->last, ', ', $cust_main->first,
-      '</TD>';
-print '<TD ALIGN="right">SS#</TD><TD BGCOLOR="#ffffff">',
-      $cust_main->ss || '&nbsp', '</TD>'
-  if $conf->exists('show_ss');
-
-print '</TR>',
-    '<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-      $cust_main->company,
-      '</TD></TR>',
-    '<TR><TD ALIGN="right">Address</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-      $cust_main->address1,
-      '</TD></TR>',
-  ;
-  print '<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-        $cust_main->address2, '</TD></TR>'
-    if $cust_main->address2;
-  print '<TR><TD ALIGN="right">City</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->city,
-          '</TD><TD ALIGN="right">State</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->state,
-          '</TD><TD ALIGN="right">Zip</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->zip, '</TD></TR>',
-        '<TR><TD ALIGN="right">Country</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->country,
-          '</TD></TR>',
-  ;
-  my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day Phone';
-  my $night_label = FS::Msgcat::_gettext('night') || 'Night Phone';
-  print '<TR><TD ALIGN="right">'. $daytime_label.
-          '</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-          $cust_main->daytime || '&nbsp', '</TD></TR>',
-        '<TR><TD ALIGN="right">'. $night_label. 
-          '</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-          $cust_main->night || '&nbsp', '</TD></TR>',
-        '<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-          $cust_main->fax || '&nbsp', '</TD></TR>',
-        '</TABLE>', "</TD></TR></TABLE>"
-  ;
-
-  if ( defined $cust_main->dbdef_table->column('ship_last') ) {
-
-    my $pre = $cust_main->ship_last ? 'ship_' : '';
-
-    print "<BR>Service address", &ntable("#cccccc"), "<TR><TD>",
-          &ntable("#cccccc",2),
-      '<TR><TD ALIGN="right">Contact name</TD>',
-        '<TD COLSPAN=5 BGCOLOR="#ffffff">',
-        $cust_main->get("${pre}last"), ', ', $cust_main->get("${pre}first"),
-        '</TD></TR>',
-      '<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-        $cust_main->get("${pre}company"),
-        '</TD></TR>',
-      '<TR><TD ALIGN="right">Address</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-        $cust_main->get("${pre}address1"),
-        '</TD></TR>',
-    ;
-    print '<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-          $cust_main->get("${pre}address2"), '</TD></TR>'
-      if $cust_main->get("${pre}address2");
-    print '<TR><TD ALIGN="right">City</TD><TD BGCOLOR="#ffffff">',
-            $cust_main->get("${pre}city"),
-            '</TD><TD ALIGN="right">State</TD><TD BGCOLOR="#ffffff">',
-            $cust_main->get("${pre}state"),
-            '</TD><TD ALIGN="right">Zip</TD><TD BGCOLOR="#ffffff">',
-            $cust_main->get("${pre}zip"), '</TD></TR>',
-          '<TR><TD ALIGN="right">Country</TD><TD BGCOLOR="#ffffff">',
-            $cust_main->get("${pre}country"),
-            '</TD></TR>',
-    ;
-    print '<TR><TD ALIGN="right">'. $daytime_label. '</TD>',
-          '<TD COLSPAN=5 BGCOLOR="#ffffff">',
-            $cust_main->get("${pre}daytime") || '&nbsp', '</TD></TR>',
-          '<TR><TD ALIGN="right">'. $night_label. '</TD>'.
-          '<TD COLSPAN=5 BGCOLOR="#ffffff">',
-            $cust_main->get("${pre}night") || '&nbsp', '</TD></TR>',
-          '<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
-            $cust_main->get("${pre}fax") || '&nbsp', '</TD></TR>',
-          '</TABLE>', "</TD></TR></TABLE>"
-    ;
-
-  }
-
-print '</TD>';
-
-print '<TD VALIGN="top">';
-
-  print &ntable("#cccccc"), "<TR><TD>", &ntable("#cccccc",2),
-        '<TR><TD ALIGN="right">Customer number</TD><TD BGCOLOR="#ffffff">',
-        $custnum, '</TD></TR>',
-  ;
-
-  my @agents = qsearch( 'agent', {} );
-  my $agent;
-  unless ( scalar(@agents) == 1 ) {
-    $agent = qsearchs('agent',{ 'agentnum' => $cust_main->agentnum } );
-    print '<TR><TD ALIGN="right">Agent</TD><TD BGCOLOR="#ffffff">',
-        $agent->agentnum, ": ", $agent->agent, '</TD></TR>';
-  } else {
-    $agent = $agents[0];
-  }
-  my @referrals = qsearch( 'part_referral', {} );
-  unless ( scalar(@referrals) == 1 ) {
-    my $referral = qsearchs('part_referral', {
-      'refnum' => $cust_main->refnum
-    } );
-    print '<TR><TD ALIGN="right">Advertising source</TD><TD BGCOLOR="#ffffff">',
-          $referral->refnum, ": ", $referral->referral, '</TD></TR>';
-  }
-  print '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
-    $cust_main->otaker, '</TD></TR>';
-
-  print '<TR><TD ALIGN="right">Referring Customer</TD><TD BGCOLOR="#ffffff">';
-  my $referring_cust_main = '';
-  if ( $cust_main->referral_custnum
-       && ( $referring_cust_main =
-            qsearchs('cust_main', { custnum => $cust_main->referral_custnum } )
-          )
-     ) {
-    print '<A HREF="'. popurl(1). 'cust_main.cgi?'.
-          $cust_main->referral_custnum. '">'.
-          $cust_main->referral_custnum. ': '.
-          ( $referring_cust_main->company
-              ? $referring_cust_main->company. ' ('.
-                  $referring_cust_main->last. ', '. $referring_cust_main->first.
-                  ')'
-              : $referring_cust_main->last. ', '. $referring_cust_main->first
-          ).
-          '</A>';
-  }
-  print '</TD></TR>';
-
-  print '</TABLE></TD></TR></TABLE>';
-
-print '<BR>';
-
-if ( $conf->config('payby-default') ne 'HIDE' ) {
-
-  my @invoicing_list = $cust_main->invoicing_list;
-  print "Billing information (",
-       qq!<A HREF="!, popurl(2), qq!misc/bill.cgi?$custnum">!, "Bill now</A>)",
-        &ntable("#cccccc"), "<TR><TD>", &ntable("#cccccc",2),
-        '<TR><TD ALIGN="right">Tax exempt</TD><TD BGCOLOR="#ffffff">',
-        $cust_main->tax ? 'yes' : 'no',
-        '</TD></TR>',
-        '<TR><TD ALIGN="right">Postal invoices</TD><TD BGCOLOR="#ffffff">',
-        ( grep { $_ eq 'POST' } @invoicing_list ) ? 'yes' : 'no',
-        '</TD></TR>',
-        '<TR><TD ALIGN="right">Email invoices</TD><TD BGCOLOR="#ffffff">',
-        join(', ', grep { $_ ne 'POST' } @invoicing_list ) || 'no',
-        '</TD></TR>',
-        '<TR><TD ALIGN="right">Billing type</TD><TD BGCOLOR="#ffffff">',
-  ;
-
-  if ( $cust_main->payby eq 'CARD' || $cust_main->payby eq 'DCRD' ) {
-    my $payinfo = $cust_main->payinfo;
-    $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
-    print 'Credit card ',
-          ( $cust_main->payby eq 'CARD' ? '(automatic)' : '(on-demand)' ),
-          '</TD></TR>',
-          '<TR><TD ALIGN="right">Card number</TD><TD BGCOLOR="#ffffff">',
-          $payinfo, '</TD></TR>',
-          '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->paydate, '</TD></TR>',
-          '<TR><TD ALIGN="right">Name on card</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->payname, '</TD></TR>'
-    ;
-  } elsif ( $cust_main->payby eq 'CHEK' || $cust_main->payby eq 'DCHK') {
-    my( $account, $aba ) = split('@', $cust_main->payinfo );
-    print 'Electronic check',
-          ( $cust_main->payby eq 'CHEK' ? '(automatic)' : '(on-demand)' ),
-          '</TD></TR>',
-          '<TR><TD ALIGN="right">Account number</TD><TD BGCOLOR="#ffffff">',
-          $account, '</TD></TR>',
-          '<TR><TD ALIGN="right">ABA/Routing code</TD><TD BGCOLOR="#ffffff">',
-          $aba, '</TD></TR>',
-          '<TR><TD ALIGN="right">Bank name</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->payname, '</TD></TR>'
-    ;
-  } elsif ( $cust_main->payby eq 'LECB' ) {
-    $cust_main->payinfo =~ /^(\d{3})(\d{3})(\d{4})$/;
-    my $payinfo = "$1-$2-$3";
-    print 'Phone bill billing</TD></TR>',
-          '<TR><TD ALIGN="right">Phone number</TD><TD BGCOLOR="#ffffff">',
-          $payinfo, '</TD></TR>',
-    ;
-  } elsif ( $cust_main->payby eq 'BILL' ) {
-    print 'Billing</TD></TR>';
-    print '<TR><TD ALIGN="right">P.O. </TD><TD BGCOLOR="#ffffff">',
-          $cust_main->payinfo, '</TD></TR>',
-      if $cust_main->payinfo;
-    print '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->paydate, '</TD></TR>',
-          '<TR><TD ALIGN="right">Attention</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->payname, '</TD></TR>',
-    ;
-  } elsif ( $cust_main->payby eq 'COMP' ) {
-    print 'Complimentary</TD></TR>',
-          '<TR><TD ALIGN="right">Authorized by</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->payinfo, '</TD></TR>',
-          '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
-          $cust_main->paydate, '</TD></TR>',
-    ;
-  }
-
-  print "</TABLE></TD></TR></TABLE>";
-
-}
-
-print '</TD></TR></TABLE>';
-
-if ( defined $cust_main->dbdef_table->column('comments')
-     && $cust_main->comments )
-{
-  print "<BR>Comments". &ntable("#cccccc"). "<TR><TD>".
-        &ntable("#cccccc",2).
-        '<TR><TD BGCOLOR="#ffffff"><PRE>'.
-        encode_entities($cust_main->comments).
-        '</PRE></TD></TR></TABLE></TABLE>';
-}
-
-print '</TD></TR></TABLE>';
-
-print '<BR>'.
-  '<FORM ACTION="'.popurl(2).'edit/process/quick-cust_pkg.cgi" METHOD="POST">'.
-  qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
-  '<SELECT NAME="pkgpart"><OPTION> ';
-
-foreach my $part_pkg (
-  qsearch( 'part_pkg', { 'disabled' => '' }, '',
-           ' AND 0 < ( SELECT COUNT(*) FROM type_pkgs '.
-           '             WHERE typenum = '. $agent->typenum.
-           '             AND type_pkgs.pkgpart = part_pkg.pkgpart )'
-         )
-) {
-  print '<OPTION VALUE="'. $part_pkg->pkgpart. '">'. $part_pkg->pkg. ' - '.
-        $part_pkg->comment;
-}
-
-print '</SELECT><INPUT TYPE="submit" VALUE="Order Package"></FORM><BR>';
-
-if ( $conf->config('payby-default') ne 'HIDE' ) {
-
-  print '<BR>'.
-    qq!<FORM ACTION="${p}edit/process/quick-charge.cgi" METHOD="POST">!.
-    qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
-    qq!Description:<INPUT TYPE="text" NAME="pkg">!.
-    qq!&nbsp;Amount:<INPUT TYPE="text" NAME="amount" SIZE=6>!.
-    qq!&nbsp;!;
-  
-  #false laziness w/ edit/part_pkg.cgi
-  if ( $conf->exists('enable_taxclasses') ) {
-    print '<SELECT NAME="taxclass">';
-    my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
-      or die dbh->errstr;
-    $sth->execute or die $sth->errstr;
-    foreach my $taxclass ( map $_->[0], @{$sth->fetchall_arrayref} ) {
-      print qq!<OPTION VALUE="$taxclass"!;
-      #print ' SELECTED' if $taxclass eq $hashref->{taxclass};
-      print qq!>$taxclass</OPTION>!;
-    }
-    print '</SELECT>';
-  } else {
-    print '<INPUT TYPE="hidden" NAME="taxclass" VALUE="">';
-  }
-  
-  print qq!<INPUT TYPE="submit" VALUE="One-time charge"></FORM><BR>!;
-
-}
-
-print <<END;
-<SCRIPT>
-function cust_pkg_areyousure(href) {
-    if (confirm("Permanently delete included services and cancel this package?") == true)
-        window.location.href = href;
-}
-function svc_areyousure(href) {
-    if (confirm("Permanently unprovision and delete this service?") == true)
-        window.location.href = href;
-}
-</SCRIPT>
-END
-
-print qq!<BR><A NAME="cust_pkg">Packages</A> !,
-#      qq!<BR>Click on package number to view/edit package.!,
-      qq!( <A HREF="!, popurl(2), qq!edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> (preserves services) )!,
-;
-
-#begin display packages
-
-#get package info
-
-my $packages = get_packages($cust_main);
-
-if ( @$packages ) {
-%>
-<TABLE CLASS="package" BORDER=1 CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">
-<TR>
-  <TH COLSPAN=2 ROWSPAN=2>Package</TH>
-  <TH COLSPAN=6>Dates</TH>
-  <TH COLSPAN=2 ROWSPAN=2>Services</TH>
-</TR>
-<TR CLASS="datehdr">
-  <TH>Setup</TH>
-  <TH>Last bill</TH>
-  <TH>Next bill</TH>
-  <TH>Susp.</TH>
-  <TH>Expire</TH>
-  <TH>Cancel</TH>
-</TR>
-<%
-foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
-  my $rowspan = 0;
-
-  if ($pkg->{cancel}) {
-    $rowspan = 0;
-  } else {
-    foreach my $svcpart (@{$pkg->{svcparts}}) {
-      $rowspan += $svcpart->{count};
-      $rowspan++ if ($svcpart->{count} < $svcpart->{quantity});
-    }
-  } 
-
-%>
-<!--pkgnum: <%=$pkg->{pkgnum}%>-->
-<TR>
-  <TD ROWSPAN=<%=$rowspan%> CLASS="pkgnum"><%=$pkg->{pkgnum}%></TD>
-  <TD ROWSPAN=<%=$rowspan%>>
-    <%=$pkg->{pkg}%> - <%=$pkg->{comment}%> (&nbsp;<%=pkg_details_link($pkg)%>&nbsp;)<BR>
-<% unless ($pkg->{cancel}) { %>
-    (&nbsp;<%=pkg_change_link($pkg)%>&nbsp;)
-    (&nbsp;<%=($pkg->{susp}) ? pkg_unsuspend_link($pkg) : pkg_suspend_link($pkg)%> | <%=pkg_cancel_link($pkg)%>&nbsp;)
-    (&nbsp;<%=pkg_dates_link($pkg)%> | <%=pkg_customize_link($pkg)%>&nbsp;)
-<% } %>
-  </TD>
-<%
-  foreach (qw(setup last_bill next_bill susp expire cancel)) {
-    print qq!  <TD ROWSPAN=$rowspan>! . pkg_datestr($pkg,$_) . qq!</TD>\n!;
-  }
-
-  if ($rowspan == 0) { print qq!</TR>\n!; next; }
-
-  my $cnt = 0;
-  foreach my $svcpart (sort {$a->{svcpart} <=> $b->{svcpart}} @{$pkg->{svcparts}}) {
-    foreach my $service (@{$svcpart->{services}}) {
-      print '<TR>' if ($cnt > 0);
-%>
-  <TD><%=svc_link($svcpart,$service)%></TD>
-  <TD><%=svc_label_link($svcpart,$service)%><BR>(&nbsp;<%=svc_unprovision_link($service)%>&nbsp;)</TD>
-</TR>
-<%
-      $cnt++;
-    }
-    if ($svcpart->{count} < $svcpart->{quantity}) {
-      print qq!<TR>\n! if ($cnt > 0);
-      print qq!  <TD COLSPAN=2>!.svc_provision_link($pkg,$svcpart).qq!</TD>\n</TR>\n!;
-    }
-  }
-}
-print '</TABLE>'
-}
-
-#end display packages
-
-
-print <<END;
-<SCRIPT>
-function cust_pay_areyousure(href) {
-    if (confirm("Are you sure you want to delete this payment?")
- == true)
-        window.location.href = href;
-}
-function cust_pay_unapply_areyousure(href) {
-    if (confirm("Are you sure you want to unapply this payment?")
- == true)
-        window.location.href = href;
-}
-</SCRIPT>
-END
-
-if ( $conf->config('payby-default') ne 'HIDE' ) {
-  
-  #formatting
-  print qq!<BR><BR><A NAME="history">Payment History!.
-        qq!</A> ( !.
-        qq!<A HREF="!. popurl(2). qq!edit/cust_pay.cgi?custnum=$custnum">!.
-        qq!Post payment</A> | !.
-        qq!<A HREF="!. popurl(2). qq!edit/cust_credit.cgi?$custnum">!.
-        qq!Post credit</A> )!;
-  
-  #get payment history
-  #
-  # major problem: this whole thing is way too sloppy.
-  # minor problem: the description lines need better formatting.
-  
-  my @history = (); #needed for mod_perl :)
-  
-  my %target = ();
-  
-  my @bills = qsearch('cust_bill',{'custnum'=>$custnum});
-  foreach my $bill (@bills) {
-    my($bref)=$bill->hashref;
-    my $bpre = ( $bill->owed > 0 )
-                 ? '<b><font size="+1" color="#ff0000"> Open '
-                 : '';
-    my $bpost = ( $bill->owed > 0 ) ? '</font></b>' : '';
-    push @history,
-      $bref->{_date} . qq!\t<A HREF="!. popurl(2). qq!view/cust_bill.cgi?! .
-      $bref->{invnum} . qq!">${bpre}Invoice #! . $bref->{invnum} .
-      qq! (Balance \$! . $bill->owed . qq!)$bpost</A>\t! .
-      $bref->{charged} . qq!\t\t\t!;
-  
-    my(@cust_bill_pay)=qsearch('cust_bill_pay',{'invnum'=> $bref->{invnum} } );
-  #  my(@payments)=qsearch('cust_pay',{'invnum'=> $bref->{invnum} } );
-  #  my($payment);
-    foreach my $cust_bill_pay (@cust_bill_pay) {
-      my $payment = $cust_bill_pay->cust_pay;
-      my($date,$invnum,$payby,$payinfo,$paid)=($payment->_date,
-                                               $cust_bill_pay->invnum,
-                                               $payment->payby,
-                                               $payment->payinfo,
-                                               $cust_bill_pay->amount,
-                        );
-      $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
-        if $payby eq 'CARD';
-      my $target = "$payby$payinfo";
-      $payby =~ s/^BILL$/Check #/ if $payinfo;
-      $payby =~ s/^(CARD|COMP)$/$1 /;
-      my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
-                     ? qq! (<A HREF="javascript:cust_pay_areyousure('${p}misc/delete-cust_pay.cgi?!. $payment->paynum. qq!')">delete</A>)!
-                     : '';
-      my $unapply =
-        $payment->closed !~ /^Y/i && $conf->exists('unapplypayments')
-          ? qq! (<A HREF="javascript:cust_pay_unapply_areyousure('${p}misc/unapply-cust_pay.cgi?!. $payment->paynum. qq!')">unapply</A>)!
-          : '';
-      push @history,
-        "$date\tPayment, Invoice #$invnum ($payby$payinfo)$delete$unapply\t\t$paid\t\t\t$target";
-    }
-  
-    my(@cust_credit_bill)=
-      qsearch('cust_credit_bill', { 'invnum'=> $bref->{invnum} } );
-    foreach my $cust_credit_bill (@cust_credit_bill) {
-      my $cust_credit = $cust_credit_bill->cust_credit;
-      my($date, $invnum, $crednum, $amount, $reason, $app_date ) = (
-        $cust_credit->_date,
-        $cust_credit_bill->invnum,
-        $cust_credit_bill->crednum,
-        $cust_credit_bill->amount,
-        $cust_credit->reason,
-        time2str("%D", $cust_credit_bill->_date),
-      );
-      push @history,
-        "$date\tCredit #$crednum: $reason<BR>".
-        "(applied to invoice #$invnum on $app_date)\t\t\t$amount\t";
-    }
-  }
-  
-  my @credits = grep { scalar(my @array = $_->cust_credit_refund) }
-             qsearch('cust_credit',{'custnum'=>$custnum});
-  foreach my $credit (@credits) {
-    my($cref)=$credit->hashref;
-    my(@cust_credit_refund)=
-      qsearch('cust_credit_refund', { 'crednum'=> $cref->{crednum} } );
-    foreach my $cust_credit_refund (@cust_credit_refund) {
-      my $cust_refund = $cust_credit_refund->cust_credit;
-      my($date, $crednum, $amount, $reason, $app_date ) = (
-        $credit->_date,
-        $credit->crednum,
-        $cust_credit_refund->amount,
-        $credit->reason,
-        time2str("%D", $cust_credit_refund->_date),
-      );
-      push @history,
-        "$date\tCredit #$crednum: $reason<BR>".
-        "(applied to refund on $app_date)\t\t\t$amount\t";
-    }
-  }
-  
-  @credits = grep { $_->credited  > 0 }
-             qsearch('cust_credit',{'custnum'=>$custnum});
-  foreach my $credit (@credits) {
-    my($cref)=$credit->hashref;
-    push @history,
-      $cref->{_date} . "\t" .
-      qq!<A HREF="! . popurl(2). qq!edit/cust_credit_bill.cgi?!. $cref->{crednum} . qq!">!.
-      '<b><font size="+1" color="#ff0000">Unapplied credit #' .
-      $cref->{crednum} . "</font></b></A>: ".
-      $cref->{reason} . "\t\t\t" . $credit->credited . "\t";
-  }
-  
-  my(@refunds)=qsearch('cust_refund',{'custnum'=> $custnum } );
-  foreach my $refund (@refunds) {
-    my($rref)=$refund->hashref;
-    my($refundnum) = (
-      $refund->refundnum,
-    );
-  
-    push @history,
-      $rref->{_date} . "\tRefund #$refundnum, (" .
-      $rref->{payby} . " " . $rref->{payinfo} . ") by " .
-      $rref->{otaker} . " - ". $rref->{reason} . "\t\t\t\t" .
-      $rref->{refund};
-  }
-  
-  my @unapplied_payments =
-    grep { $_->unapplied > 0 } qsearch('cust_pay', { 'custnum' => $custnum } );
-  foreach my $payment (@unapplied_payments) {
-    my $payby = $payment->payby;
-    my $payinfo = $payment->payinfo;
-    #false laziness w/above
-    $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
-      if $payby eq 'CARD';
-    my $target = "$payby$payinfo";
-    $payby =~ s/^BILL$/Check #/ if $payinfo;
-    $payby =~ s/^(CARD|COMP)$/$1 /;
-    my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
-                   ? qq! (<A HREF="javascript:cust_pay_areyousure('${p}misc/delete-cust_pay.cgi?!. $payment->paynum. qq!')">delete</A>)!
-                   : '';
-    push @history,
-      $payment->_date. "\t".
-      '<b><font size="+1" color="#ff0000">Unapplied payment #' .
-      $payment->paynum . " ($payby$payinfo)</font></b> ".
-      '(<A HREF="'. popurl(2). 'edit/cust_bill_pay.cgi?'. $payment->paynum. '">'.
-      "apply</A>)$delete".
-      "\t\t" . $payment->unapplied . "\t\t\t$target";
-  }
-  
-          #formatting
-          print &table(), <<END;
-  <TR>
-    <TH>Date</TH>
-    <TH>Description</TH>
-    <TH><FONT SIZE=-1>Charge</FONT></TH>
-    <TH><FONT SIZE=-1>Payment</FONT></TH>
-    <TH><FONT SIZE=-1>In-house<BR>Credit</FONT></TH>
-    <TH><FONT SIZE=-1>Refund</FONT></TH>
-    <TH><FONT SIZE=-1>Balance</FONT></TH>
-  </TR>
-END
-  
-  #display payment history
-  
-  my $balance = 0;
-  foreach my $item (sort keyfield_numerically @history) {
-    my($date,$desc,$charge,$payment,$credit,$refund,$target)=split(/\t/,$item);
-    $charge ||= 0;
-    $payment ||= 0;
-    $credit ||= 0;
-    $refund ||= 0;
-    $balance += $charge - $payment;
-    $balance -= $credit - $refund;
-    $balance = sprintf("%.2f", $balance);
-    $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
-    $target = '' unless defined $target;
-  
-    print "<TR><TD><FONT SIZE=-1>";
-    print qq!<A NAME="$target">! unless $target && $target{$target}++;
-    print time2str("%D",$date);
-    print '</A>' if $target && $target{$target} == 1;
-    print "</FONT></TD>",
-  	"<TD><FONT SIZE=-1>$desc</FONT></TD>",
-  	"<TD><FONT SIZE=-1>",
-          ( $charge ? "\$".sprintf("%.2f",$charge) : '' ),
-          "</FONT></TD>",
-  	"<TD><FONT SIZE=-1>",
-          ( $payment ? "-&nbsp;\$".sprintf("%.2f",$payment) : '' ),
-          "</FONT></TD>",
-  	"<TD><FONT SIZE=-1>",
-          ( $credit ? "-&nbsp;\$".sprintf("%.2f",$credit) : '' ),
-          "</FONT></TD>",
-  	"<TD><FONT SIZE=-1>",
-          ( $refund ? "\$".sprintf("%.2f",$refund) : '' ),
-          "</FONT></TD>",
-  	"<TD><FONT SIZE=-1>\$" . $balance,
-          "</FONT></TD>",
-          "\n";
-  }
-  
-  print "</TABLE>";
-
-}
-
-print '</BODY></HTML>';
-
-#subroutiens
-sub keyfield_numerically { (split(/\t/,$a))[0] <=> (split(/\t/,$b))[0]; }
-
-%>
-
-<%
-
-
-sub get_packages {
-
-my $cust_main = shift or return undef;
-
-my @packages = ();
-
-foreach my $cust_pkg (($conf->exists('hidecancelledpackages') ? ($cust_main->ncancelled_pkgs)
-                                                              : ($cust_main->all_pkgs))) { 
-
-  my $part_pkg = $cust_pkg->part_pkg;
-
-  my %pkg = ();
-  $pkg{pkgnum} = $cust_pkg->pkgnum;
-  $pkg{pkg} = $part_pkg->pkg;
-  $pkg{pkgpart} = $part_pkg->pkgpart;
-  $pkg{comment} = $part_pkg->getfield('comment');
-  $pkg{setup} = $cust_pkg->getfield('setup');
-  $pkg{last_bill} = $cust_pkg->getfield('last_bill');
-  $pkg{next_bill} = $cust_pkg->getfield('bill');
-  $pkg{susp} = $cust_pkg->getfield('susp');
-  $pkg{expire} = $cust_pkg->getfield('expire');
-  $pkg{cancel} = $cust_pkg->getfield('cancel');
-
-  $pkg{svcparts} = []; 
-
-  foreach my $pkg_svc (qsearch('pkg_svc', { 'pkgpart' => $part_pkg->pkgpart })) {
-
-    next if ($pkg_svc->quantity == 0);
-
-    my $part_svc = qsearchs('part_svc', { 'svcpart' => $pkg_svc->svcpart });
-
-    my $svcpart = {};
-    $svcpart->{svcpart} = $part_svc->svcpart;
-    $svcpart->{svc} = $part_svc->svc;
-    $svcpart->{svcdb} = $part_svc->svcdb;
-    $svcpart->{quantity} = $pkg_svc->quantity;
-    $svcpart->{count} = 0;
-
-    $svcpart->{services} = [];
-
-    foreach my $cust_svc (qsearch('cust_svc', { 'pkgnum' => $cust_pkg->pkgnum,
-                                                'svcpart' => $part_svc->svcpart } )) {
-
-      my $svc = {};
-      $svc->{svcnum} = $cust_svc->svcnum;
-      $svc->{label} = ($cust_svc->label)[1];
-
-      push @{$svcpart->{services}}, $svc;
-
-      $svcpart->{count}++;
-
-    }
-
-    push @{$pkg{svcparts}}, $svcpart;
-
-  }
-
-  push @packages, \%pkg;
-
-}
-
-return \@packages;
-
-}
-
-sub svc_link {
-
- my ($svcpart, $svc) = (shift,shift) or return '';
- return qq!<A HREF="$p1/view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svcpart->{svc}</A>!;
-
-}
-
-sub svc_label_link {
-
- my ($svcpart, $svc) = (shift,shift) or return '';
- return qq!<A HREF="$p1/view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svc->{label}</A>!;
-
-}
-
-sub svc_provision_link {
-  my ($pkg, $svcpart) = (shift,shift) or return '';
-  return qq!<A CLASS="provision" HREF="${p1}/edit/$svcpart->{svcdb}.cgi?! .
-         qq!pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}">! .
-         qq!Provision $svcpart->{svc} (! . ($svcpart->{quantity} - $svcpart->{count}) . qq!)</A>!;
-}
-
-sub svc_unprovision_link {
-  my $svc = shift or return '';
-  return qq!<A HREF="javascript:svc_areyousure('${p}misc/unprovision.cgi?$svc->{svcnum}')">Unprovision</A>!;
-}
-
-# This should be generalized to use config options to determine order.
-sub pkgsort_pkgnum_cancel {
-  if ($a->{cancel} and $b->{cancel}) {
-    return ($a->{pkgnum} <=> $b->{pkgnum});
-  } elsif ($a->{cancel} or $b->{cancel}) {
-    return (-1) if ($b->{cancel});
-    return (1) if ($a->{cancel});
-    return (0);
-  } else {
-    return($a->{pkgnum} <=> $b->{pkgnum});
-  }
-}
-
-sub pkg_datestr {
-  my ($pkg,$field) = (shift,shift) or return '';
-  return $pkg->{$field} ? time2str('%D<BR><FONT SIZE=-3>%l:%M:%S%P&nbsp;%z</FONT>',
-                                   $pkg->{$field})
-                        : '&nbsp';
-}
-
-sub pkg_details_link {
-  my $pkg = shift or return '';
-  return qq!<a href="${p}view/cust_pkg.cgi?$pkg->{pkgnum}">Details</a>!;
-}
-
-sub pkg_change_link {
-  my $pkg = shift or return '';
-  return qq!<a href="${p}misc/change_pkg.cgi?$pkg->{pkgnum}">Change package</a>!;
-}
-
-sub pkg_suspend_link {
-  my $pkg = shift or return '';
-  return qq!<a href="${p}misc/susp_pkg.cgi?$pkg->{pkgnum}">Suspend</a>!;
-}
-
-sub pkg_unsuspend_link {
-  my $pkg = shift or return '';
-  return qq!<a href="${p}misc/unsusp_pkg.cgi?$pkg->{pkgnum}">Unsuspend</a>!;
-}
-
-sub pkg_cancel_link {
-  my $pkg = shift or return '';
-  return qq!<A HREF="javascript:cust_pkg_areyousure('${p}misc/cancel_pkg.cgi?$pkg->{pkgnum}')">Cancel</A>!;
-}
-
-sub pkg_dates_link {
-  my $pkg = shift or return '';
-  return qq!<A HREF="${p}edit/REAL_cust_pkg.cgi?$pkg->{pkgnum}">Edit&nbsp;dates</A>!;
-}
-
-sub pkg_customize_link {
-  my $pkg = shift or return '';
-  return qq!<A HREF="${p}edit/part_pkg.cgi?keywords=$custnum;clone=$pkg->{pkgpart};pkgnum=$pkg->{pkgnum}">Customize</A>!;
-}
-
-%>
-
-- 
cgit v1.2.1


From c97973a5145438eedd9fe16841897f5c4febb995 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 May 2003 09:34:39 +0000
Subject: general Pg 7.3 fix for setting int columns to '' / NULL

---
 FS/FS/Record.pm | 22 +++++++++++++++-------
 Makefile        |  2 +-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index c711f1214..9a724feac 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1231,15 +1231,23 @@ type (see L<DBIx::DBSchema::Column>) does not end in `char' or `binary'.
 =cut
 
 sub _quote {
-  my($value,$table,$field)=@_;
-  my($dbh)=dbh;
-  if ( $value =~ /^\d+(\.\d+)?$/ && 
-#       ! ( datatype($table,$field) =~ /^char/ ) 
-       ! $dbdef->table($table)->column($field)->type =~ /(char|binary|text)$/i 
-  ) {
+  my($value, $table, $column) = @_;
+  my $column_obj = $dbdef->table($table)->column($column);
+  my $column_type = $column_obj->type;
+
+  if ( $value eq '' && $column_type =~ /^int/ ) {
+    if ( $column_obj->null ) {
+      'NULL';
+    } else {
+      cluck "WARNING: Attempting to set non-null integer $table.$column null; ".
+            "using 0 instead";
+      0;
+    }
+  } elsif ( $value =~ /^\d+(\.\d+)?$/ && 
+            ! $column_type =~ /(char|binary|text)$/i ) {
     $value;
   } else {
-    $dbh->quote($value);
+    dbh->quote($value);
   }
 }
 
diff --git a/Makefile b/Makefile
index 92f82067b..433563e36 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ SIGNUP_MACHINE = localhost
 SIGNUP_AGENTNUM = 2
 SIGNUP_REFNUM = 2
 
-SELFSERVICE_USER = nostart
+SELFSERVICE_USER = fs_selfservice
 SELFSERVICE_MACHINE = localhost
 
 #---
-- 
cgit v1.2.1


From b18dbad124047ff74091a0fbbf4e71a7dd549ef6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 May 2003 10:28:39 +0000
Subject: credit where credit's due

---
 CREDITS | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CREDITS b/CREDITS
index d89f4f564..ec8134969 100644
--- a/CREDITS
+++ b/CREDITS
@@ -52,7 +52,8 @@ Kristian Hoffmann <khoff@pc-intouch.com> contributed Netscape CCK
 autoconfiguration support for the signup server, lots of great mailing
 lists posts which I shamelessly made into documentation, fixes to get rid of
 the embarassing and non-database-normal "owed" field, and many other things
-I'm forgetting.
+I'm forgetting.  Most recently Kristian and Mark (last name?) contributed
+the IP address tracking and svc_broadband in 1.5.
 
 Jeff Finucane <jeff@cmh.net> send in a bunch of bugfixes (for the sendmail
 export, cancel-unaudited.cgi), patches to support billing date modification,
@@ -106,5 +107,8 @@ Thanks!
 "Stephen Bechard" <steve@destek.net> sent in patches for svc_www services and
 other fixes.
 
+Charles A Beasley <cbeasley@noment.net> contributed quota editing for the
+Infostreet export.
+
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
-- 
cgit v1.2.1


From 5a2a1af55963ec6ae04661537bb6926e629c0aea Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 May 2003 00:10:07 +0000
Subject: automated install foo

---
 install/freebsd/INSTALL |  9 +++++++++
 install/freebsd/ports   | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100755 install/freebsd/INSTALL
 create mode 100644 install/freebsd/ports

diff --git a/install/freebsd/INSTALL b/install/freebsd/INSTALL
new file mode 100755
index 000000000..4840ac2be
--- /dev/null
+++ b/install/freebsd/INSTALL
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+for port in `grep -v '^ *#' ports`; do
+  cd /usr/ports/$port
+  make install || exit
+done
+
+perl -MCPAN -e"install DBIx::DBSchema HTML::Widgets::SelectLayers Time::Duration"
+
diff --git a/install/freebsd/ports b/install/freebsd/ports
new file mode 100644
index 000000000..329f084d6
--- /dev/null
+++ b/install/freebsd/ports
@@ -0,0 +1,42 @@
+shells/zsh
+misc/screen
+ftp/lftp
+www/mod_perl
+net/rsync
+databases/postgresql7
+misc/p5-Array-PrintCols
+devel/p5-Term-Query
+converters/p5-MIME-Base64
+security/p5-Digest-MD5
+security/p5-MD5
+net/p5-URI
+www/p5-HTML-Tagset
+www/p5-HTML-Parser
+www/p5-Net
+misc/p5-Locale-Codes
+net/p5-Net-Whois
+www/p5-libwww
+misc/p5-Business-CreditCard
+devel/p5-Data-ShowTable
+mail/p5-Mail-Tools
+devel/p5-TimeDate
+devel/p5-Date-Manip
+misc/p5-File-CounterFile
+devel/p5-FreezeThaw
+devel/p5-String-Approx
+textproc/p5-Text-Template
+databases/p5-DBI
+databases/p5-DBD-Pg
+#databases/p5-DBD-mysql
+databases/p5-DBIx-DataSource
+    #database/p5-DBIx-DBSchema
+    #net/p5-Net-SSH
+textproc/p5-String-ShellQuote
+    #net/p5-Net-SCP
+www/p5-Apache-ASP
+www/p5-HTML-Mason
+devel/p5-Tie-IxHash
+    #devel/p5-Time-Duration
+    #www/p5-HTML-Widgets-SelectLayers
+devel/p5-Storable
+www/p5-Apache-DBI
-- 
cgit v1.2.1


From a2e1661a6c8e41fb0e10ecc0613ddfa0ab45c173 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 May 2003 00:10:53 +0000
Subject: redhat install foo

---
 install/redhat/7.3/INSTALL      | 14 ++++++++++++++
 install/redhat/7.3/sources.list |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 install/redhat/7.3/INSTALL
 create mode 100644 install/redhat/7.3/sources.list

diff --git a/install/redhat/7.3/INSTALL b/install/redhat/7.3/INSTALL
new file mode 100644
index 000000000..4c07f88e8
--- /dev/null
+++ b/install/redhat/7.3/INSTALL
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+wget ftp://apt-rpm.tuxfamily.org/apt/redhat/7.3/en/i386/RPMS.extra/apt-*i386.rpm
+rpm -i apt*i386.rpm
+cp sources.list /etc/apt/
+apt-get update; apt-get update
+apt-get install apache mod_ssl mod_perl perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-Digest-MD5 perl-HTML-Parser perl-HTML-Tagset perl-MIME-Base64 perl-Storable perl-TimeDate perl-URI perl-libnet perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs #openssh
+
+perl -MCPAN -e"install Locale::Country, Net::Whois, Business::CreditCard, \
+                       Mail::Internet, File::CounterFile, FreezeThaw, \
+                       String::Approx, Text::Template, DBIx::DataSource, \
+                       DBIx::DBSchema, Net::SSH, String::ShellQuote, \
+                       Net::SCP, Apache::ASP, Tie::IxHash, Time::Duration, \
+                       HTML::Widgets::SelectLayers,  Apache::DBI"
diff --git a/install/redhat/7.3/sources.list b/install/redhat/7.3/sources.list
new file mode 100644
index 000000000..9a9ad5cdf
--- /dev/null
+++ b/install/redhat/7.3/sources.list
@@ -0,0 +1,2 @@
+rpm ftp://apt-rpm.tuxfamily.org/apt redhat/7.3/en/i386 os updates extra
+rpm-src ftp://apt-rpm.tuxfamily.org/apt redhat/7.3/en/i386 os updates extra
-- 
cgit v1.2.1


From 14d7fe93445d40a8ae24cfd81e30d595ea2004d6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 May 2003 01:18:02 +0000
Subject: Net::SSH and Net::SCP are in ports

---
 install/freebsd/ports | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/freebsd/ports b/install/freebsd/ports
index 329f084d6..385d6b598 100644
--- a/install/freebsd/ports
+++ b/install/freebsd/ports
@@ -30,9 +30,9 @@ databases/p5-DBD-Pg
 #databases/p5-DBD-mysql
 databases/p5-DBIx-DataSource
     #database/p5-DBIx-DBSchema
-    #net/p5-Net-SSH
+net/p5-Net-SSH
 textproc/p5-String-ShellQuote
-    #net/p5-Net-SCP
+net/p5-Net-SCP
 www/p5-Apache-ASP
 www/p5-HTML-Mason
 devel/p5-Tie-IxHash
-- 
cgit v1.2.1


From 1a6e8ccb610247daf9f475358471cfeed44f4e65 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 May 2003 06:03:53 +0000
Subject: updated freebsd install

---
 fs_selfservice/DEPLOY   |  6 +++---
 install/freebsd/INSTALL | 18 +++++++++++++++---
 install/freebsd/ports   |  8 ++++----
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/fs_selfservice/DEPLOY b/fs_selfservice/DEPLOY
index 7c68e78ec..7ab3b2a7a 100755
--- a/fs_selfservice/DEPLOY
+++ b/fs_selfservice/DEPLOY
@@ -9,7 +9,7 @@ cd ..
 kill `cat /var/run/freeside-selfservice-server.ivan.pid`; sleep 3
 ./freeside-selfservice-server ivan localhost
 
-cp /home/ivan/freeside_current/fs_selfservice/FS-SelfService/cgi/* /var/www/MyAccount
+cp /home/ivan/freeside/fs_selfservice/FS-SelfService/cgi/* /var/www/MyAccount
 chown freeside /var/www/MyAccount/selfservice.cgi
-chmod 4755 /var/www/MyAccount/selfservice.cgi
-ln -s /var/www/MyAccount/selfservice.cgi /var/www/MyAccount/index.cgi
+chmod 755 /var/www/MyAccount/selfservice.cgi
+ln -s /var/www/MyAccount/selfservice.cgi /var/www/MyAccount/index.cgi || true
diff --git a/install/freebsd/INSTALL b/install/freebsd/INSTALL
index 4840ac2be..f42699c14 100755
--- a/install/freebsd/INSTALL
+++ b/install/freebsd/INSTALL
@@ -1,9 +1,21 @@
 #!/bin/sh
 
+cd /usr/ports/sysutils/portupgrade
+make install
+
+pkgdb -u
+
+portinstall -PR cvsup-without-gui
+
+cp /usr/share/examples/cvsup/ports-supfile /root
+perl -pi -e 's/CHANGE_THIS/cvsup1/;' /root/ports-supfile
+cvsup /root/ports-supfile
+
 for port in `grep -v '^ *#' ports`; do
-  cd /usr/ports/$port
-  make install || exit
+  #cd /usr/ports/$port
+  #make install || exit
+  portinstall -P -R $port || exit
 done
 
-perl -MCPAN -e"install DBIx::DBSchema HTML::Widgets::SelectLayers Time::Duration"
+perl -MCPAN -e"install Net::SSH DBIx::DBSchema HTML::Widgets::SelectLayers Time::Duration Business::CreditCard"
 
diff --git a/install/freebsd/ports b/install/freebsd/ports
index 385d6b598..3f0d40773 100644
--- a/install/freebsd/ports
+++ b/install/freebsd/ports
@@ -12,11 +12,11 @@ security/p5-MD5
 net/p5-URI
 www/p5-HTML-Tagset
 www/p5-HTML-Parser
-www/p5-Net
+net/p5-Net
 misc/p5-Locale-Codes
 net/p5-Net-Whois
 www/p5-libwww
-misc/p5-Business-CreditCard
+     #misc/p5-Business-CreditCard
 devel/p5-Data-ShowTable
 mail/p5-Mail-Tools
 devel/p5-TimeDate
@@ -30,11 +30,11 @@ databases/p5-DBD-Pg
 #databases/p5-DBD-mysql
 databases/p5-DBIx-DataSource
     #database/p5-DBIx-DBSchema
-net/p5-Net-SSH
+    #net/p5-Net-SSH
 textproc/p5-String-ShellQuote
 net/p5-Net-SCP
 www/p5-Apache-ASP
-www/p5-HTML-Mason
+    #www/p5-HTML-Mason
 devel/p5-Tie-IxHash
     #devel/p5-Time-Duration
     #www/p5-HTML-Widgets-SelectLayers
-- 
cgit v1.2.1


From 51df5a9bad917d04e58c2686831a1481f45b667e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 May 2003 06:14:55 +0000
Subject: freebsd install

---
 install/freebsd/INSTALL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/freebsd/INSTALL b/install/freebsd/INSTALL
index f42699c14..28a453ab3 100755
--- a/install/freebsd/INSTALL
+++ b/install/freebsd/INSTALL
@@ -17,5 +17,5 @@ for port in `grep -v '^ *#' ports`; do
   portinstall -P -R $port || exit
 done
 
-perl -MCPAN -e"install Net::SSH DBIx::DBSchema HTML::Widgets::SelectLayers Time::Duration Business::CreditCard"
+for a in Net::SSH DBIx::DBSchema HTML::Widgets::SelectLayers Time::Duration Business::CreditCard; do perl -MCPAN -e"install $a"; done
 
-- 
cgit v1.2.1


From 116b7654a443c2d471834264bed034b123008407 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 May 2003 07:05:07 +0000
Subject: little bit more fbsd install automation

---
 install/freebsd/INSTALL | 23 +++++++++++++++++++++--
 install/freebsd/ports   |  1 +
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/install/freebsd/INSTALL b/install/freebsd/INSTALL
index 28a453ab3..53fc613d1 100755
--- a/install/freebsd/INSTALL
+++ b/install/freebsd/INSTALL
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-cd /usr/ports/sysutils/portupgrade
-make install
+( cd /usr/ports/sysutils/portupgrade
+  make install
+)
 
 pkgdb -u
 
@@ -19,3 +20,21 @@ done
 
 for a in Net::SSH DBIx::DBSchema HTML::Widgets::SelectLayers Time::Duration Business::CreditCard; do perl -MCPAN -e"install $a"; done
 
+su -l pgsql -c initdb
+
+/usr/local/etc/rc.d/010.pgsql.sh start
+
+pw user add freeside -m
+
+su -l pgsql -c 'createuser -P freeside'
+
+su -l freeside -c 'createdb freeside'
+
+#?
+cd ../..
+make install-perl-modules
+make create-config
+make deploy
+
+#edit apache config, etc.
+
diff --git a/install/freebsd/ports b/install/freebsd/ports
index 3f0d40773..8381e5a04 100644
--- a/install/freebsd/ports
+++ b/install/freebsd/ports
@@ -2,6 +2,7 @@ shells/zsh
 misc/screen
 ftp/lftp
 www/mod_perl
+www/apache13-modssl
 net/rsync
 databases/postgresql7
 misc/p5-Array-PrintCols
-- 
cgit v1.2.1


From 71af70d04218beec79b4351b2ca721a07a33460f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 May 2003 07:17:54 +0000
Subject: mod_ssl before mod_perl so mod_perl picks up EAPI

---
 install/freebsd/ports | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/freebsd/ports b/install/freebsd/ports
index 8381e5a04..1e04a424d 100644
--- a/install/freebsd/ports
+++ b/install/freebsd/ports
@@ -1,8 +1,8 @@
 shells/zsh
 misc/screen
 ftp/lftp
-www/mod_perl
 www/apache13-modssl
+www/mod_perl
 net/rsync
 databases/postgresql7
 misc/p5-Array-PrintCols
-- 
cgit v1.2.1


From d60478318bc9c3d94703d1845c0b40504c51a8cb Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Fri, 9 May 2003 19:30:57 +0000
Subject: Cleaned-up package view code and added CSS tags.

---
 httemplate/view/cust_main.cgi | 354 ++++++++++++++++++++++++++----------------
 1 file changed, 224 insertions(+), 130 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index cea8d6321..d392f8a39 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -15,6 +15,16 @@ print header("Customer View", menubar(
   'Main Menu' => popurl(2)
 ));
 
+print <<END;
+<STYLE TYPE="text/css">
+.package TH { font-size: medium }
+.package TR { font-size: smaller }
+.package .datehdr TH { font-size: smaller }
+.package .pkgnum { font-size: medium }
+.package .provision { font-size: larger; color: red; font-weight: bold }
+</STYLE>
+END
+
 die "No customer specified (bad URL)!" unless $cgi->keywords;
 my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
 $query =~ /^(\d+)$/;
@@ -357,149 +367,81 @@ print qq!<BR><A NAME="cust_pkg">Packages</A> !,
       qq!( <A HREF="!, popurl(2), qq!edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> (preserves services) )!,
 ;
 
-#display packages
+#begin display packages
 
 #get package info
-my @packages;
-if ( $conf->exists('hidecancelledpackages') ) {
-  @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->ncancelled_pkgs);
-} else {
-  @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->all_pkgs);
-}
-
-if ( @packages ) {
-  #formatting
 
-  my $colspan = $packages[0]->dbdef_table->column('last_bill') ? 6 : 5;
-  
-  print &table(), "\n",
-        qq!<TR><TH COLSPAN=2 ROWSPAN=2>Package</TH><TH COLSPAN=$colspan>!,
-        qq!Dates</TH><TH COLSPAN=2 ROWSPAN=2>Services</TH></TR>\n<TR>!,
-        qq!<TH><FONT SIZE=-1>Setup</FONT></TH>!;
-
-  print qq!<TH><FONT SIZE=-1>Last bill</FONT></TH>!
-    if $packages[0]->dbdef_table->column('last_bill');
-
-  print qq!<TH><FONT SIZE=-1>Next bill</FONT></TH>!,
-        qq!<TH><FONT SIZE=-1>Susp.</FONT></TH>!,
-        qq!<TH><FONT SIZE=-1>Expire</FONT></TH>!,
-        qq!<TH><FONT SIZE=-1>Cancel</FONT></TH>!,
-        qq!</TR>\n!;
-}
-
-my $n1 = '<TR>';
-foreach my $package (@packages) {
-  my $pkgnum = $package->pkgnum;
-  my $pkg = $package->part_pkg->pkg;
-  my $comment = $package->part_pkg->comment;
-  my $pkgview = popurl(2). "view/cust_pkg.cgi?$pkgnum";
+my $packages = get_packages($cust_main);
 
-  #my @cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
-  #my $rowspan = scalar(@cust_svc) || 1;
-  my @cust_svc = ();
+if ( @$packages ) {
+%>
+<TABLE CLASS="package" BORDER=1 CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">
+<TR>
+  <TH COLSPAN=2 ROWSPAN=2>Package</TH>
+  <TH COLSPAN=6>Dates</TH>
+  <TH COLSPAN=2 ROWSPAN=2>Services</TH>
+</TR>
+<TR CLASS="datehdr">
+  <TH>Setup</TH>
+  <TH>Last bill</TH>
+  <TH>Next bill</TH>
+  <TH>Susp.</TH>
+  <TH>Expire</TH>
+  <TH>Cancel</TH>
+</TR>
+<%
+foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
   my $rowspan = 0;
-  my %pkg_svc = ();
-  unless ( $package->getfield('cancel') ) {
-    foreach my $pkg_svc (
-      grep { $_->quantity }
-        qsearch('pkg_svc',{'pkgpart'=> $package->pkgpart })
-    ) {
-      $rowspan += ( $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity );
-    }
+
+  if ($pkg->{cancel}) {
+    $rowspan = 0;
   } else {
-    #@cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
-    @cust_svc = ();
-    $rowspan = scalar(@cust_svc) || 1;
-  }
-  $rowspan ||= 1;
-
-  my $button_cgi = new CGI;
-  $button_cgi->param('clone', $package->part_pkg->pkgpart);
-  $button_cgi->param('pkgnum', $package->pkgnum);
-  my $button_url = popurl(2). "edit/part_pkg.cgi?". $button_cgi->query_string;
-
-  #print $n1, qq!<TD ROWSPAN=$rowspan><A HREF="$pkgview">$pkgnum</A></TD>!,
-  print $n1, qq!<TD ROWSPAN=$rowspan>$pkgnum</TD>!,
-        qq!<TD ROWSPAN=$rowspan><FONT SIZE=-1>!,
-        #qq!<A HREF="$pkgview">$pkg - $comment</A>!,
-        qq!$pkg - $comment (&nbsp;<a href="$pkgview">Details</a>&nbsp;)!;
-       # | !;
-
-  #false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
-  unless ( $package->getfield('cancel') ) {
-
-    print qq! (&nbsp;<A HREF="${p}misc/change_pkg.cgi?$pkgnum">!.
-          'Change&nbsp;package</A>&nbsp;)';
-
-    print ' (&nbsp;';
-    if ( $package->getfield('susp') ) {
-      print qq!<A HREF="${p}misc/unsusp_pkg.cgi?$pkgnum">Unsuspend</A>!;
-    } else {
-      print qq!<A HREF="${p}misc/susp_pkg.cgi?$pkgnum">Suspend</A>!;
+    foreach my $svcpart (@{$pkg->{svcparts}}) {
+      $rowspan += $svcpart->{count};
+      $rowspan++ if ($svcpart->{count} < $svcpart->{quantity});
     }
-    print '&nbsp;|&nbsp;<A HREF="javascript:cust_pkg_areyousure(\''. popurl(2).
-          'misc/cancel_pkg.cgi?'. $pkgnum.  '\')">Cancel</A>';
-  
-    print '&nbsp;) ';
+  } 
 
-    print ' (&nbsp;<A HREF="'. popurl(2). 'edit/REAL_cust_pkg.cgi?'. $pkgnum.
-          '">Edit&nbsp;dates</A>&nbsp;|&nbsp;';
-        
-    print qq!<A HREF="$button_url">Customize</A>&nbsp;)!;
-
-  }
-  print '</FONT></TD>';
-
-  my @fields = qw( setup );
-  push @fields, qw( last_bill ) if $package->dbdef_table->column('last_bill');
-  push @fields, qw( bill susp expire cancel);
-
-  for ( @fields ) {
-    print "<TD ROWSPAN=$rowspan><FONT SIZE=-1>", ( $package->getfield($_)
-            ? time2str("%D</FONT><BR><FONT SIZE=-3>%l:%M:%S%P&nbsp;%z</FONT>",
-              $package->getfield($_) )
-            :  '&nbsp'
-          ), '</FONT></TD>',
-    ;
+%>
+<!--pkgnum: <%=$pkg->{pkgnum}%>-->
+<TR>
+  <TD ROWSPAN=<%=$rowspan%> CLASS="pkgnum"><%=$pkg->{pkgnum}%></TD>
+  <TD ROWSPAN=<%=$rowspan%>>
+    <%=$pkg->{pkg}%> - <%=$pkg->{comment}%> (&nbsp;<%=pkg_details_link($pkg)%>&nbsp;)<BR>
+<% unless ($pkg->{cancel}) { %>
+    (&nbsp;<%=pkg_change_link($pkg)%>&nbsp;)
+    (&nbsp;<%=($pkg->{susp}) ? pkg_unsuspend_link($pkg) : pkg_suspend_link($pkg)%>&nbsp;|&nbsp;<%=pkg_cancel_link($pkg)%>&nbsp;)
+    (&nbsp;<%=pkg_dates_link($pkg)%>&nbsp;|&nbsp;<%=pkg_customize_link($pkg)%>&nbsp;)
+<% } %>
+  </TD>
+<%
+  foreach (qw(setup last_bill next_bill susp expire cancel)) {
+    print qq!  <TD ROWSPAN=$rowspan>! . pkg_datestr($pkg,$_) . qq!</TD>\n!;
   }
 
-  my $n2 = '';
-  #false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
-  #foreach my $cust_svc ( @cust_svc ) {
-  foreach my $svcpart ( sort { $a<=>$b } keys %pkg_svc ) {
-    my $svc = qsearchs('part_svc',{'svcpart'=>$svcpart})->getfield('svc');
-    $svc =~ s/ /&nbsp;/g;
-    my(@cust_svc)=qsearch('cust_svc',{'pkgnum'=>$pkgnum, 
-                                      'svcpart'=>$svcpart,
-                                    });
-    for my $enum ( 1 .. $pkg_svc{$svcpart} ) {
-      my $cust_svc;
-      if ( $cust_svc = shift @cust_svc ) {
-        my($label, $value, $svcdb) = $cust_svc->label;
-        my($svcnum) = $cust_svc->svcnum;
-        my($sview) = popurl(2). "view";
-        print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
-              qq!<TD><FONT SIZE=-1><A HREF="$sview/$svcdb.cgi?$svcnum">$value</A><BR>(&nbsp;<A HREF="javascript:svc_areyousure('${p}misc/unprovision.cgi?$svcnum')">Unprovision</A>&nbsp;)</FONT></TD>!;
-      } else {
-        print $n2, qq!<TD COLSPAN=2><A HREF="$uiadd{$svcpart}?pkgnum$pkgnum-svcpart$svcpart"><b><font size="+1" color="#ff0000">!.
-              qq!Provision&nbsp;$svc</A></b></font>!;
-
-        print qq!<BR><A HREF="../misc/link.cgi?pkgnum$pkgnum-svcpart$svcpart">!.
-              qq!<b><font size="+1" color="#ff0000">Link&nbsp;to&nbsp;legacy&nbsp;$svc</A></b></font>!
-          if $conf->exists('legacy_link');
-
-        print '</TD>';
-      }
-      $n2="</TR><TR>";
+  if ($rowspan == 0) { print qq!</TR>\n!; next; }
+
+  my $cnt = 0;
+  foreach my $svcpart (sort {$a->{svcpart} <=> $b->{svcpart}} @{$pkg->{svcparts}}) {
+    foreach my $service (@{$svcpart->{services}}) {
+      print '<TR>' if ($cnt > 0);
+%>
+  <TD><%=svc_link($svcpart,$service)%></TD>
+  <TD><%=svc_label_link($svcpart,$service)%><BR>(&nbsp;<%=svc_unprovision_link($service)%>&nbsp;)</TD>
+</TR>
+<%
+      $cnt++;
+    }
+    if ($svcpart->{count} < $svcpart->{quantity}) {
+      print qq!<TR>\n! if ($cnt > 0);
+      print qq!  <TD COLSPAN=2>!.svc_provision_link($pkg,$svcpart).qq!</TD>\n</TR>\n!;
     }
   }
+}
+print '</TABLE>'
+}
 
-  $n1="</TR><TR>";
-}  
-print "</TR>";
-
-#formatting
-print "</TABLE>";
+#end display packages
 
 
 print <<END;
@@ -725,3 +667,155 @@ print '</BODY></HTML>';
 sub keyfield_numerically { (split(/\t/,$a))[0] <=> (split(/\t/,$b))[0]; }
 
 %>
+
+<%
+
+
+sub get_packages {
+
+my $cust_main = shift or return undef;
+
+my @packages = ();
+
+foreach my $cust_pkg (($conf->exists('hidecancelledpackages') ? ($cust_main->ncancelled_pkgs)
+                                                              : ($cust_main->all_pkgs))) { 
+
+  my $part_pkg = $cust_pkg->part_pkg;
+
+  my %pkg = ();
+  $pkg{pkgnum} = $cust_pkg->pkgnum;
+  $pkg{pkg} = $part_pkg->pkg;
+  $pkg{pkgpart} = $part_pkg->pkgpart;
+  $pkg{comment} = $part_pkg->getfield('comment');
+  $pkg{setup} = $cust_pkg->getfield('setup');
+  $pkg{last_bill} = $cust_pkg->getfield('last_bill');
+  $pkg{next_bill} = $cust_pkg->getfield('bill');
+  $pkg{susp} = $cust_pkg->getfield('susp');
+  $pkg{expire} = $cust_pkg->getfield('expire');
+  $pkg{cancel} = $cust_pkg->getfield('cancel');
+
+  $pkg{svcparts} = []; 
+
+  foreach my $pkg_svc (qsearch('pkg_svc', { 'pkgpart' => $part_pkg->pkgpart })) {
+
+    next if ($pkg_svc->quantity == 0);
+
+    my $part_svc = qsearchs('part_svc', { 'svcpart' => $pkg_svc->svcpart });
+
+    my $svcpart = {};
+    $svcpart->{svcpart} = $part_svc->svcpart;
+    $svcpart->{svc} = $part_svc->svc;
+    $svcpart->{svcdb} = $part_svc->svcdb;
+    $svcpart->{quantity} = $pkg_svc->quantity;
+    $svcpart->{count} = 0;
+
+    $svcpart->{services} = [];
+
+    foreach my $cust_svc (qsearch('cust_svc', { 'pkgnum' => $cust_pkg->pkgnum,
+                                                'svcpart' => $part_svc->svcpart } )) {
+
+      my $svc = {};
+      $svc->{svcnum} = $cust_svc->svcnum;
+      $svc->{label} = ($cust_svc->label)[1];
+
+      push @{$svcpart->{services}}, $svc;
+
+      $svcpart->{count}++;
+
+    }
+
+    push @{$pkg{svcparts}}, $svcpart;
+
+  }
+
+  push @packages, \%pkg;
+
+}
+
+return \@packages;
+
+}
+
+sub svc_link {
+
+ my ($svcpart, $svc) = (shift,shift) or return '';
+ return qq!<A HREF="$p1/view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svcpart->{svc}</A>!;
+
+}
+
+sub svc_label_link {
+
+ my ($svcpart, $svc) = (shift,shift) or return '';
+ return qq!<A HREF="$p1/view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svc->{label}</A>!;
+
+}
+
+sub svc_provision_link {
+  my ($pkg, $svcpart) = (shift,shift) or return '';
+  return qq!<A CLASS="provision" HREF="${p1}/edit/$svcpart->{svcdb}.cgi?! .
+         qq!pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}">! .
+         qq!Provision $svcpart->{svc} (! . ($svcpart->{quantity} - $svcpart->{count}) . qq!)</A>!;
+}
+
+sub svc_unprovision_link {
+  my $svc = shift or return '';
+  return qq!<A HREF="javascript:svc_areyousure('${p}misc/unprovision.cgi?$svc->{svcnum}')">Unprovision</A>!;
+}
+
+# This should be generalized to use config options to determine order.
+sub pkgsort_pkgnum_cancel {
+  if ($a->{cancel} and $b->{cancel}) {
+    return ($a->{pkgnum} <=> $b->{pkgnum});
+  } elsif ($a->{cancel} or $b->{cancel}) {
+    return (-1) if ($b->{cancel});
+    return (1) if ($a->{cancel});
+    return (0);
+  } else {
+    return($a->{pkgnum} <=> $b->{pkgnum});
+  }
+}
+
+sub pkg_datestr {
+  my ($pkg,$field) = (shift,shift) or return '';
+  return $pkg->{$field} ? time2str('%D<BR><FONT SIZE=-3>%l:%M:%S%P&nbsp;%z</FONT>',
+                                   $pkg->{$field})
+                        : '&nbsp';
+}
+
+sub pkg_details_link {
+  my $pkg = shift or return '';
+  return qq!<a href="${p}view/cust_pkg.cgi?$pkg->{pkgnum}">Details</a>!;
+}
+
+sub pkg_change_link {
+  my $pkg = shift or return '';
+  return qq!<a href="${p}misc/change_pkg.cgi?$pkg->{pkgnum}">Change&nbsp;package</a>!;
+}
+
+sub pkg_suspend_link {
+  my $pkg = shift or return '';
+  return qq!<a href="${p}misc/susp_pkg.cgi?$pkg->{pkgnum}">Suspend</a>!;
+}
+
+sub pkg_unsuspend_link {
+  my $pkg = shift or return '';
+  return qq!<a href="${p}misc/unsusp_pkg.cgi?$pkg->{pkgnum}">Unsuspend</a>!;
+}
+
+sub pkg_cancel_link {
+  my $pkg = shift or return '';
+  return qq!<A HREF="javascript:cust_pkg_areyousure('${p}misc/cancel_pkg.cgi?$pkg->{pkgnum}')">Cancel</A>!;
+}
+
+sub pkg_dates_link {
+  my $pkg = shift or return '';
+  return qq!<A HREF="${p}edit/REAL_cust_pkg.cgi?$pkg->{pkgnum}">Edit&nbsp;dates</A>!;
+}
+
+sub pkg_customize_link {
+  my $pkg = shift or return '';
+  return qq!<A HREF="${p}edit/part_pkg.cgi?keywords=$custnum;clone=$pkg->{pkgpart};pkgnum=$pkg->{pkgnum}">Customize</A>!;
+}
+
+%>
+
-- 
cgit v1.2.1


From 59b2ab6633c0fe401cfe3b74f5cd4e8883a6fc22 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 10 May 2003 05:40:53 +0000
Subject: - substitute '0' for existing blank setup/recur fees - use
 timelocal_nocheck instead of timelocal for proper wraparound

---
 FS/FS/cust_main.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index cefc7648f..608c5e3cb 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw( @ISA $conf $Debug $import );
 use Safe;
 use Carp;
-use Time::Local;
+use Time::Local qw(timelocal_nocheck);
 use Date::Format;
 #use Date::Manip;
 use Business::CreditCard;
@@ -994,6 +994,7 @@ sub bill {
                ": $setup_prog";
       };
       $setup_prog = $1;
+      $setup_prog = '0' if $setup_prog =~ /^\s*$/;
 
         #my $cpt = new Safe;
         ##$cpt->permit(); #what is necessary?
@@ -1023,6 +1024,7 @@ sub bill {
                ": $recur_prog";
       };
       $recur_prog = $1;
+      $recur_prog = '0' if $recur_prog =~ /^\s*$/;
 
       # shared with $recur_prog
       $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
@@ -1052,7 +1054,7 @@ sub bill {
       $mon += $part_pkg->freq;
       until ( $mon < 12 ) { $mon -= 12; $year++; }
       $cust_pkg->setfield('bill',
-        timelocal($sec,$min,$hour,$mday,$mon,$year));
+        timelocal_nocheck($sec,$min,$hour,$mday,$mon,$year));
       $cust_pkg_mod_flag = 1; 
     }
 
-- 
cgit v1.2.1


From aa8f46a06edce17b919486a62d9e208c1954355a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 10 May 2003 05:41:20 +0000
Subject: fix bug in last_bill method which prevented last_bill dates from
 being set

---
 FS/FS/cust_pkg.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 4eea2c087..bd3d1f503 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -477,8 +477,8 @@ Useful for billing metered services.
 
 sub last_bill {
   my $self = shift;
-  if ( $self->dbdef_table->column('manual_flag') ) {
-    return $self->setfield('last_bill', $_[1]) if @_;
+  if ( $self->dbdef_table->column('last_bill') ) {
+    return $self->setfield('last_bill', $_[0]) if @_;
     return $self->getfield('last_bill') if $self->getfield('last_bill');
   }    
   my $cust_bill_pkg = qsearchs('cust_bill_pkg', { 'pkgnum' => $self->pkgnum,
-- 
cgit v1.2.1


From 75500e2f75a32b3735999eaf5edde3e871911226 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 10 May 2003 06:45:45 +0000
Subject: first pass at new package list UI

---
 httemplate/view/cust_main.cgi | 137 ++++++++++++++++++++++++++++++++++++------
 httemplate/view/cust_pkg.cgi  |   2 +-
 2 files changed, 119 insertions(+), 20 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index d392f8a39..e820143aa 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -19,7 +19,6 @@ print <<END;
 <STYLE TYPE="text/css">
 .package TH { font-size: medium }
 .package TR { font-size: smaller }
-.package .datehdr TH { font-size: smaller }
 .package .pkgnum { font-size: medium }
 .package .provision { font-size: larger; color: red; font-weight: bold }
 </STYLE>
@@ -377,17 +376,9 @@ if ( @$packages ) {
 %>
 <TABLE CLASS="package" BORDER=1 CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">
 <TR>
-  <TH COLSPAN=2 ROWSPAN=2>Package</TH>
-  <TH COLSPAN=6>Dates</TH>
-  <TH COLSPAN=2 ROWSPAN=2>Services</TH>
-</TR>
-<TR CLASS="datehdr">
-  <TH>Setup</TH>
-  <TH>Last bill</TH>
-  <TH>Next bill</TH>
-  <TH>Susp.</TH>
-  <TH>Expire</TH>
-  <TH>Cancel</TH>
+  <TH COLSPAN=2>Package</TH>
+  <TH>Status</TH>
+  <TH COLSPAN=2>Services</TH>
 </TR>
 <%
 foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
@@ -410,15 +401,119 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
     <%=$pkg->{pkg}%> - <%=$pkg->{comment}%> (&nbsp;<%=pkg_details_link($pkg)%>&nbsp;)<BR>
 <% unless ($pkg->{cancel}) { %>
     (&nbsp;<%=pkg_change_link($pkg)%>&nbsp;)
-    (&nbsp;<%=($pkg->{susp}) ? pkg_unsuspend_link($pkg) : pkg_suspend_link($pkg)%>&nbsp;|&nbsp;<%=pkg_cancel_link($pkg)%>&nbsp;)
     (&nbsp;<%=pkg_dates_link($pkg)%>&nbsp;|&nbsp;<%=pkg_customize_link($pkg)%>&nbsp;)
 <% } %>
   </TD>
 <%
-  foreach (qw(setup last_bill next_bill susp expire cancel)) {
-    print qq!  <TD ROWSPAN=$rowspan>! . pkg_datestr($pkg,$_) . qq!</TD>\n!;
+  #foreach (qw(setup last_bill next_bill susp expire cancel)) {
+  #  print qq!  <TD ROWSPAN=$rowspan>! . pkg_datestr($pkg,$_) . qq!</TD>\n!;
+  #}
+  print "<TD ROWSPAN=$rowspan>". &itable('');
+
+  #move
+  my %freq = (
+    1 => 'monthly',
+    2 => 'bi-monthly',
+    3 => 'quarterly',
+    6 => 'semi-annually',
+    12 => 'annually',
+    24 => 'bi-annually',
+    36 => 'tri-annually',
+  );
+
+  sub freq {
+    my $freq = shift;
+    exists $freq{$freq} ? $freq{$freq} : "every&nbsp;$freq&nbsp;months";
   }
 
+  #eomove
+
+  if ( $pkg->{cancel} ) { #status: cancelled
+
+    print '<TR><TD><FONT COLOR="#ff0000">Cancelled&nbsp;</FONT></TD><TD>'.
+          pkg_datestr($pkg,'cancel'). '</TD></TR>';
+    unless ( $pkg->{setup} ) {
+      print '<TR><TD COLSPAN=2>Never billed</TD></TR>';
+    } else {
+      print "<TR><TD>Setup&nbsp;</TD><TD>".
+            pkg_datestr($pkg, 'setup'). '</TD></TR>';
+      print "<TR><TD>Last&nbsp;bill&nbsp;</TD><TD>".
+            pkg_datestr($pkg, 'last_bill'). '</TD></TR>'
+        if $pkg->{'last_bill'};
+      print "<TR><TD>Suspended&nbsp;</TD><TD>".
+            pkg_datestr($pkg, 'susp'). '</TD></TR>'
+        if $pkg->{'susp'};
+    }
+
+  } else {
+
+    if ( $pkg->{susp} ) { #status: suspended
+      print '<TR><TD><FONT COLOR="#FF9900">Suspended&nbsp;</FONT></TD><TD>'.
+            pkg_datestr($pkg,'susp'). '</TD></TR>';
+      unless ( $pkg->{setup} ) {
+        print '<TR><TD COLSPAN=2>Never billed</TD></TR>';
+      } else {
+        print "<TR><TD>Setup&nbsp;</TD><TD>". 
+              pkg_datestr($pkg, 'setup'). '</TD></TR>';
+      }
+      print "<TR><TD>Last&nbsp;bill&nbsp;</TD><TD>".
+            pkg_datestr($pkg, 'last_bill'). '</TD></TR>'
+        if $pkg->{'last_bill'};
+      # next bill ??
+      print "<TR><TD>Expires&nbsp;</TD><TD>".
+            pkg_datestr($pkg, 'expire'). '</TD></TR>'
+        if $pkg->{'expire'};
+      print '<TR><TD COLSPAN=2>(&nbsp;'. pkg_unsuspend_link($pkg).
+            '&nbsp;|&nbsp;'. pkg_cancel_link($pkg). '&nbsp;)</TD></TR>';
+
+    } else { #status: active
+
+      unless ( $pkg->{setup} ) { #not setup
+
+        print '<TR><TD COLSPAN=2>Not&nbsp;yet&nbsp;billed&nbsp;(';
+        unless ( $pkg->{freq} ) {
+          print 'one-time&nbsp;charge)</TD></TR>';
+          print '<TR><TD COLSPAN=2>(&nbsp;'. pkg_cancel_link($pkg).
+                '&nbsp;)</TD</TR>';
+        } else {
+          print 'billed&nbsp;'. freq($pkg->{freq}). ')</TD></TR>';
+        }
+
+      } else { #setup
+
+        unless ( $pkg->{freq} ) {
+          print "<TR><TD COLSPAN=2>One-time&nbsp;charge</TD></TR>".
+                '<TR><TD>Billed&nbsp;</TD><TD>'.
+                pkg_datestr($pkg,'setup'). '</TD></TR>';
+        } else {
+          print '<TR><TD COLSPAN=2><FONT COLOR="#00CC00">Active</FONT>,&nbsp;'.
+                'billed&nbsp;'. freq($pkg->{freq}). '</TD></TR>'.
+                '<TR><TD>Setup&nbsp;</TD><TD>'.
+                pkg_datestr($pkg, 'setup'). '</TD></TR>';
+        }
+
+      }
+
+      print "<TR><TD>Last&nbsp;bill&nbsp;</TD><TD>".
+            pkg_datestr($pkg, 'last_bill'). '</TD></TR>'
+        if $pkg->{'last_bill'};
+      print "<TR><TD>Next&nbsp;bill&nbsp;</TD><TD>".
+            pkg_datestr($pkg, 'next_bill'). '</TD></TR>'
+        if $pkg->{'next_bill'};
+      print "<TR><TD>Expires&nbsp;</TD><TD>".
+            pkg_datestr($pkg, 'expire'). '</TD></TR>'
+        if $pkg->{'expire'};
+      if ( $pkg->{freq} ) {
+        print '<TR><TD COLSPAN=2>(&nbsp;'. pkg_suspend_link($pkg).
+              '&nbsp;|&nbsp;'. pkg_cancel_link($pkg). '&nbsp;)</TD></TR>';
+      }
+
+    }
+
+  }
+
+  print "</TABLE></TD>\n";
+
   if ($rowspan == 0) { print qq!</TR>\n!; next; }
 
   my $cnt = 0;
@@ -687,6 +782,7 @@ foreach my $cust_pkg (($conf->exists('hidecancelledpackages') ? ($cust_main->nca
   $pkg{pkg} = $part_pkg->pkg;
   $pkg{pkgpart} = $part_pkg->pkgpart;
   $pkg{comment} = $part_pkg->getfield('comment');
+  $pkg{freq} = $part_pkg->freq;
   $pkg{setup} = $cust_pkg->getfield('setup');
   $pkg{last_bill} = $cust_pkg->getfield('last_bill');
   $pkg{next_bill} = $cust_pkg->getfield('bill');
@@ -776,10 +872,13 @@ sub pkgsort_pkgnum_cancel {
 }
 
 sub pkg_datestr {
-  my ($pkg,$field) = (shift,shift) or return '';
-  return $pkg->{$field} ? time2str('%D<BR><FONT SIZE=-3>%l:%M:%S%P&nbsp;%z</FONT>',
-                                   $pkg->{$field})
-                        : '&nbsp';
+  my($pkg, $field) = @_ or return '';
+  return '&nbsp;' unless $pkg->{$field};
+  my $format = $conf->exists('pkg_showtimes')
+               ? '<B>%D</B>&nbsp;<FONT SIZE=-3>%l:%M:%S%P&nbsp;%z</FONT>'
+               : '<B>%b&nbsp;%o,&nbsp;%Y</B>';
+  ( my $strip = time2str($format, $pkg->{$field}) ) =~ s/ (\d)/$1/g;
+  $strip;
 }
 
 sub pkg_details_link {
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index c3880114c..5f0e6bffc 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -71,7 +71,7 @@ print &ntable("#cccccc"), '<TR><TD>', &ntable("#cccccc",2),
       ( $setup ? time2str("%D",$setup) : "(Not setup)" ), '</TD></TR>';
 
 print '<TR><TD ALIGN="right">Last bill date</TD><TD BGCOLOR="#ffffff">',
-      ( $cust_pkg->last_bill ? time2str("%D",$cust_pkg->last_bill) : "&nbsp;" ),
+      ( $cust_pkg->get('last_bill') ? time2str("%D",$cust_pkg->get('last_bill')) : "&nbsp;" ),
       '</TD></TR>'
   if $cust_pkg->dbdef_table->column('last_bill');
 
-- 
cgit v1.2.1


From 24426a8b0d8e42dd5d00115cd84bd5d786fc58c3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 11 May 2003 22:25:08 +0000
Subject: handler.pl updates from Richard Siddall <richard.siddall@elirion.net>

---
 htetc/handler.pl      | 2 +-
 htetc/handler.pl-1.0x | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htetc/handler.pl b/htetc/handler.pl
index 9f2a483c2..481d5a2d9 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -38,7 +38,7 @@ use strict;
 my $ah = new HTML::Mason::ApacheHandler (
   #interp => $interp,
   #auto_send_headers => 0,
-  comp_root=>'/var/www/masonside',
+  comp_root=>'/var/www/freeside',
   data_dir=>'/usr/local/etc/freeside/masondata',
   #out_mode=>'stream',
 );
diff --git a/htetc/handler.pl-1.0x b/htetc/handler.pl-1.0x
index 768ebffec..8840b0816 100644
--- a/htetc/handler.pl-1.0x
+++ b/htetc/handler.pl-1.0x
@@ -30,8 +30,8 @@ use strict;
 #
 my $parser = new HTML::Mason::Parser;
 my $interp = new HTML::Mason::Interp (parser=>$parser,
-                                      comp_root=>'/var/www/masondocs',
-                                      data_dir=>'/home/ivan/freeside_current/masondata',
+                                      comp_root=>'/var/www/freeside',
+                                      data_dir=>'/usr/local/etc/freeside/masondata',
                                       out_mode=>'stream',
                                      );
 my $ah = new HTML::Mason::ApacheHandler ( interp => $interp,
-- 
cgit v1.2.1


From 42a4396bcfe9d7b9748ff5fac7f1fffa32a25d47 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 11 May 2003 22:34:05 +0000
Subject: red here is too confusing

---
 CREDITS                       | 3 +++
 httemplate/view/cust_main.cgi | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CREDITS b/CREDITS
index ec8134969..0b4e2d9c9 100644
--- a/CREDITS
+++ b/CREDITS
@@ -110,5 +110,8 @@ other fixes.
 Charles A Beasley <cbeasley@noment.net> contributed quota editing for the
 Infostreet export.
 
+Richard Siddall <richard.siddall@elirion.net> sent in Mason fixes and other
+things I'm probably forgetting.
+
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index e820143aa..af2babcba 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -20,7 +20,7 @@ print <<END;
 .package TH { font-size: medium }
 .package TR { font-size: smaller }
 .package .pkgnum { font-size: medium }
-.package .provision { font-size: larger; color: red; font-weight: bold }
+.package .provision { font-size: larger; font-weight: bold }
 </STYLE>
 END
 
-- 
cgit v1.2.1


From bace32bf9341c78d1a068b302dbba031c79c128d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 11 May 2003 22:53:49 +0000
Subject: patch from Richard Siddall for strict vars

---
 httemplate/search/cust_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 3cc520fa8..538edf3f1 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -93,7 +93,7 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
                       AND cust_svc.svcpart = pkg_svc.svcpart
                       AND cust_pkg.pkgpart = pkg_svc.pkgpart
                       GROUP BY cust_svc.pkgnum,cust_svc.svcpart";
-      $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
+      my $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
          
       $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
   
-- 
cgit v1.2.1


From 38480ba7cb708bbe1bf78482d570425c121f2386 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 11 May 2003 22:55:07 +0000
Subject: mail forward search not yet implemented

---
 httemplate/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index d13649b07..e5bd11806 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -114,7 +114,7 @@
       Auditing pre-Freeside services with no customer record
       <UL>
         <LI>unlinked accounts (<A HREF="search/svc_acct.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?UN_username">by username</A>) (<A HREF="search/svc_acct.cgi?UN_uid">by uid</A>)
-        <LI>unlinked mail forwards (<A HREF="search/svc_forward.cgi?UN_svcnum">by service number</A>) (by ?))
+<!--        <LI>unlinked mail forwards (<A HREF="search/svc_forward.cgi?UN_svcnum">by service number</A>) (by ?)) -->
         <LI>unlinked domains (<A HREF="search/svc_domain.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?UN_domain">by domain</A>)
       </UL>
       Packages
-- 
cgit v1.2.1


From 4454c0bae42714d3dc215572a15a0ad0960b20fe Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 May 2003 07:33:47 +0000
Subject: fix service links

---
 httemplate/view/cust_main.cgi | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index af2babcba..3934a3dcb 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -430,8 +430,8 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
 
   if ( $pkg->{cancel} ) { #status: cancelled
 
-    print '<TR><TD><FONT COLOR="#ff0000">Cancelled&nbsp;</FONT></TD><TD>'.
-          pkg_datestr($pkg,'cancel'). '</TD></TR>';
+    print '<TR><TD><FONT COLOR="#ff0000"><B>Cancelled</B>&nbsp;</FONT></TD>'.
+          '<TD>'. pkg_datestr($pkg,'cancel'). '</TD></TR>';
     unless ( $pkg->{setup} ) {
       print '<TR><TD COLSPAN=2>Never billed</TD></TR>';
     } else {
@@ -448,8 +448,8 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
   } else {
 
     if ( $pkg->{susp} ) { #status: suspended
-      print '<TR><TD><FONT COLOR="#FF9900">Suspended&nbsp;</FONT></TD><TD>'.
-            pkg_datestr($pkg,'susp'). '</TD></TR>';
+      print '<TR><TD><FONT COLOR="#FF9900"><B>Suspended</B>&nbsp;</FONT></TD>'.
+            '<TD>'. pkg_datestr($pkg,'susp'). '</TD></TR>';
       unless ( $pkg->{setup} ) {
         print '<TR><TD COLSPAN=2>Never billed</TD></TR>';
       } else {
@@ -486,8 +486,8 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
                 '<TR><TD>Billed&nbsp;</TD><TD>'.
                 pkg_datestr($pkg,'setup'). '</TD></TR>';
         } else {
-          print '<TR><TD COLSPAN=2><FONT COLOR="#00CC00">Active</FONT>,&nbsp;'.
-                'billed&nbsp;'. freq($pkg->{freq}). '</TD></TR>'.
+          print '<TR><TD COLSPAN=2><FONT COLOR="#00CC00"><B>Active</B></FONT>'.
+                ',&nbsp;billed&nbsp;'. freq($pkg->{freq}). '</TD></TR>'.
                 '<TR><TD>Setup&nbsp;</TD><TD>'.
                 pkg_datestr($pkg, 'setup'). '</TD></TR>';
         }
@@ -835,14 +835,14 @@ return \@packages;
 sub svc_link {
 
  my ($svcpart, $svc) = (shift,shift) or return '';
- return qq!<A HREF="$p1/view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svcpart->{svc}</A>!;
+ return qq!<A HREF="${p}view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svcpart->{svc}</A>!;
 
 }
 
 sub svc_label_link {
 
  my ($svcpart, $svc) = (shift,shift) or return '';
- return qq!<A HREF="$p1/view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svc->{label}</A>!;
+ return qq!<A HREF="${p}view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svc->{label}</A>!;
 
 }
 
-- 
cgit v1.2.1


From 6a961cb36a8f9606a168331fd5c3625c3bbec9c2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 May 2003 07:34:15 +0000
Subject: setbuf call doesn't appear to be working...

---
 fs_selfservice/FS-SelfService/freeside-selfservice-clientd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
index 0c25c3407..f13dd42d7 100644
--- a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
+++ b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
@@ -14,7 +14,7 @@ use IO::Handle qw(_IONBF);
 use IO::Select;
 use IO::File;
 
-STDOUT->setbuf('');
+#STDOUT->setbuf('');
 
 use vars qw( $Debug );
 $Debug = 3; #2 will turn on child logging, 3 will log packet contents,
-- 
cgit v1.2.1


From 9033414f18177eb733d1a227d2be1c15d244f766 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 13 May 2003 03:22:35 +0000
Subject: - self-service updates: cleanup and beginnings of "make a payment" -
 fix pod masking FS::svc_acct::cust_svc

---
 FS/FS/svc_acct.pm                                   |  2 ++
 fs_selfservice/FS-SelfService/cgi/login.html        | 15 ++++++++++++---
 fs_selfservice/FS-SelfService/cgi/myaccount.html    | 13 ++++++++-----
 fs_selfservice/FS-SelfService/cgi/selfservice.cgi   |  8 ++++++--
 fs_selfservice/FS-SelfService/cgi/view_invoice.html |  4 ++--
 5 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index e0c4662b2..8f2861bfd 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -922,6 +922,8 @@ sub svc_domain {
 
 Returns the FS::cust_svc record for this account (see L<FS::cust_svc>).
 
+=cut
+
 sub cust_svc {
   my $self = shift;
   qsearchs( 'cust_svc', { 'svcnum' => $self->svcnum } );
diff --git a/fs_selfservice/FS-SelfService/cgi/login.html b/fs_selfservice/FS-SelfService/cgi/login.html
index dfbd0137a..112cc34ea 100644
--- a/fs_selfservice/FS-SelfService/cgi/login.html
+++ b/fs_selfservice/FS-SelfService/cgi/login.html
@@ -6,16 +6,25 @@
 <TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=2 CELLPADDING=0>
 <TR>
   <TH ALIGN="right">Username </TH>
-  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
+  <TD>
+    <!-- <INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"> -->
+    <INPUT TYPE="text" NAME="username" VALUE="awctwincities-l">
+  </TD>
 </TR>
 <TR>
   <TH ALIGN="right">Domain </TH>
-  <TD><INPUT TYPE="text" NAME="domain" VALUE="<%= $domain %>"></TD>
+  <TD>
+    <!-- <INPUT TYPE="text" NAME="domain" VALUE="<%= $domain %>"> -->
+    <INPUT TYPE="text" NAME="domain" VALUE="pobox.com">
+  </TD>
 </TR>
 <!--<INPUT TYPE="hidden" NAME="domain" VALUE="myisp.com">-->
 <TR>
   <TH ALIGN="right">Password </TH>
-  <TD><INPUT TYPE="password" NAME="password"></TD>
+  <TD>
+    <!-- <INPUT TYPE="password" NAME="password"> -->
+    <INPUT TYPE="password" NAME="password" VALUE="6lrnsfCc">
+  </TD>
 </TR>
 </TABLE>
 <BR><BR><INPUT TYPE="submit" VALUE="Login">
diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount.html b/fs_selfservice/FS-SelfService/cgi/myaccount.html
index f8a916eea..d8bfe0cb1 100644
--- a/fs_selfservice/FS-SelfService/cgi/myaccount.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount.html
@@ -3,20 +3,23 @@
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
 <TABLE BORDER=0 CELLPADDING=4><TR><TD VALIGN="top" HEIGHT=384 BGCOLOR="#dddddd">
 <A HREF="<%= $url %>myaccount">MyAccount</A><BR>
-<A HREF="<%= $url %>other">SomethingElse</A><BR>
+<!-- <A HREF="<%= $url %>other">SomethingElse</A><BR> -->
 </TD><TD VALIGN="top">
 
 Hello <%= $name %>!<BR><BR>
-Your customer number is <%= $custnum %><BR><BR>
 Your contact information<BR><%= $small_custview %>
-Your outstanding balance is $<%= $balance %><BR><BR>
+<BR>
+<%= if ( $balance ) {
+  $OUT .= qq! <B><A HREF="${url}make_payment">Make a $balance payment</A></B>!;
+} %>
+<BR><BR>
 <!--<TABLE BORDER=1 CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">
 <TR><TH>Invoice</TH><TH>Date</TH><TH>Owed</TH></TR>-->
 <%=
   if ( @open_invoices ) {
     $OUT .= '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 BGCOLOR="#eeeeee">'.
             '<TR><TH BGCOLOR="#ff3333" COLSPAN=5>Open Invoices</TH><TD>';
-    my $link = qq!<A HREF="<%= $selfurl %>?session=<%= $session_id %>;action=myaccount!;
+    my $link = qq!<A HREF="<%= $url %>myaccount!;
     my $col1 = "ffffff";
     my $col2 = "dddddd";
     my $col = $col1;
@@ -40,7 +43,7 @@ Your outstanding balance is $<%= $balance %><BR><BR>
 
 </TD></TR></TABLE>
 <HR>
-<FONT SIZE="-2">small text</FONT>
+<FONT SIZE="-2">powered by <a href="http://www.sisd.com/freeside">freeside</a></FONT>
 </BODY></HTML>
 
 
diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
index eae373931..9b8bdc100 100644
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -53,7 +53,7 @@ if ( $cgi->param('session') eq 'login' ) {
 
 $session_id = $cgi->param('session');
 
-$cgi->param('action') =~ /^(myaccount|view_invoice)$/
+$cgi->param('action') =~ /^(myaccount|view_invoice|make_payment)$/
   or die "unknown action ". $cgi->param('action');
 my $action = $1;
 
@@ -88,6 +88,10 @@ sub view_invoice {
 
 }
 
+sub make_payment {
+
+}
+
 #--
 
 sub do_template {
@@ -95,7 +99,7 @@ sub do_template {
   my $fill_in = shift;
 
   $cgi->delete_all();
-  $fill_in->{'self_url'} = $cgi->self_url;
+  $fill_in->{'selfurl'} = $cgi->self_url;
 
   my $template = new Text::Template( TYPE    => 'FILE',
                                      SOURCE  => "$template_dir/$name.html",
diff --git a/fs_selfservice/FS-SelfService/cgi/view_invoice.html b/fs_selfservice/FS-SelfService/cgi/view_invoice.html
index 33388de99..d2b012b5d 100644
--- a/fs_selfservice/FS-SelfService/cgi/view_invoice.html
+++ b/fs_selfservice/FS-SelfService/cgi/view_invoice.html
@@ -3,7 +3,7 @@
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
 <TABLE BORDER=0 CELLPADDING=4><TR><TD VALIGN="top" HEIGHT=384 BGCOLOR="#dddddd">
 <A HREF="<%= $url %>myaccount">MyAccount</A><BR>
-<A HREF="<%= $url %>other">SomethingElse</A><BR>
+<!-- <A HREF="<%= $url %>other">SomethingElse</A><BR> -->
 </TD><TD VALIGN="top">
 
 <A HREF="<%= $url %>myaccount"><-- back to MyAccount</A><BR><BR>
@@ -14,7 +14,7 @@
 
 </TD></TR></TABLE>
 <HR>
-<FONT SIZE="-2">small text</FONT>
+<FONT SIZE="-2">powered by <a href="http://www.sisd.com/freeside">freeside</a></FONT>
 </BODY></HTML>
 
 
-- 
cgit v1.2.1


From 6e2a0edcc8659e18af767a2d5305b450092b3542 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 13 May 2003 05:47:25 +0000
Subject: missing pod =cut at end

---
 FS/FS/addr_block.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/FS/FS/addr_block.pm b/FS/FS/addr_block.pm
index af4e5fb79..c5ddca7d0 100755
--- a/FS/FS/addr_block.pm
+++ b/FS/FS/addr_block.pm
@@ -324,5 +324,7 @@ To be implemented.
 Minimum block size should be a config option.  It's hardcoded at /30 right
 now because that's the smallest block that makes any sense at all.
 
+=cut
+
 1;
 
-- 
cgit v1.2.1


From d1fe599b5646d693c99908b0288a76744103b5a2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 13 May 2003 06:01:53 +0000
Subject: - document missing fields in cust_bill_event

---
 FS/FS/cust_bill_event.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/FS/FS/cust_bill_event.pm b/FS/FS/cust_bill_event.pm
index 44e4d4797..c97734780 100644
--- a/FS/FS/cust_bill_event.pm
+++ b/FS/FS/cust_bill_event.pm
@@ -44,6 +44,10 @@ currently supported:
 =item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
 L<Time::Local> and L<Date::Parse> for conversion functions.
 
+=item status - event status: B<done> or B<failed>
+
+=item statustext - additional status detail (i.e. error message)
+
 =back
 
 =head1 METHODS
-- 
cgit v1.2.1


From ac15b7153b154f5bb951f0ce62731f8216ff9fc4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 May 2003 16:51:43 +0000
Subject: display recurring custom line items on invoices as well as one-shot
 ones

---
 FS/FS/cust_bill.pm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 76c0752ab..a0634d918 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -983,13 +983,20 @@ sub print_text {
 
       push @buf, map { [ "  $_", '' ] } $cust_bill_pkg->details;
 
-    } else { #pkgnum tax
+    } else { #pkgnum tax or one-shot line item
       my $itemdesc = defined $cust_bill_pkg->dbdef_table->column('itemdesc')
                      ? ( $cust_bill_pkg->itemdesc || 'Tax' )
                      : 'Tax';
-      push @buf, [ $itemdesc,
-                   $money_char. sprintf("%10.2f", $cust_bill_pkg->setup) ] 
-        if $cust_bill_pkg->setup != 0;
+      if ( $cust_bill_pkg->setup != 0 ) {
+        push @buf, [ $itemdesc,
+                     $money_char. sprintf("%10.2f", $cust_bill_pkg->setup) ];
+      }
+      if ( $cust_bill_pkg->recur != 0 ) {
+        push @buf, [ "$itemdesc (". time2str("%x", $cust_bill_pkg->sdate). " - "
+                                  . time2str("%x", $cust_bill_pkg->edate). ")",
+                     $money_char. sprintf("%10.2f", $cust_bill_pkg->recur)
+                   ];
+      }
     }
   }
 
-- 
cgit v1.2.1


From d1d57ae4fa0f2a30b36a70c656aa2672744f75a3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 18 May 2003 06:20:21 +0000
Subject: self-service: make payment UI done

---
 FS/FS/ClientAPI/MyAccount.pm                      | 37 +++++++++++++++++++++++
 fs_selfservice/FS-SelfService/SelfService.pm      |  1 +
 fs_selfservice/FS-SelfService/cgi/login.html      |  4 +--
 fs_selfservice/FS-SelfService/cgi/myaccount.html  |  7 ++---
 fs_selfservice/FS-SelfService/cgi/selfservice.cgi |  5 +--
 5 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 9983b5d26..80c7330e8 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -19,6 +19,7 @@ FS::ClientAPI->register_handlers(
   'MyAccount/customer_info' => \&customer_info,
   'MyAccount/invoice'       => \&invoice,
   'MyAccount/cancel'        => \&cancel,
+  'MyAccount/payment_info'  => \&payment_info,
 );
 
 #store in db?
@@ -112,6 +113,42 @@ sub customer_info {
 
 }
 
+sub payment_info {
+  my $p = shift;
+  my $session = $cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  my %return;
+
+  my $custnum = $session->{'custnum'};
+
+  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+    or return { 'error' => "unknown custnum $custnum" };
+
+  $return{balance} = $cust_main->balance;
+
+  $return{payname} = $cust_main->payname
+                     || $cust_main->first. ' '. $cust_main->get('last');
+
+  $return{$_} = $cust_main->get($_) for qw(address1 address2 city state zip);
+
+  if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) {
+    #$return{card_type} = 
+    $return{payinfo} = $cust_main->payinfo;
+    #exp date (month, year)
+
+    #CARD vd DCRD remembering
+  }
+
+  #list all states & counties
+
+  return { 'error' => '',
+           %return,
+         };
+
+};
+
+
 sub invoice {
   my $p = shift;
   my $session = $cache->get($p->{'session_id'})
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 4d68d614a..c561dabdb 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -23,6 +23,7 @@ $socket =  "/usr/local/freeside/selfservice_socket";
   'customer_info' => 'MyAccount/customer_info',
   'invoice'       => 'MyAccount/invoice',
   'cancel'        => 'MyAccount/cancel',
+  'payment_info'  => 'MyAccount/payment_info',
 );
 @EXPORT_OK = keys %autoload;
 
diff --git a/fs_selfservice/FS-SelfService/cgi/login.html b/fs_selfservice/FS-SelfService/cgi/login.html
index 112cc34ea..ca6251eb1 100644
--- a/fs_selfservice/FS-SelfService/cgi/login.html
+++ b/fs_selfservice/FS-SelfService/cgi/login.html
@@ -8,7 +8,7 @@
   <TH ALIGN="right">Username </TH>
   <TD>
     <!-- <INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"> -->
-    <INPUT TYPE="text" NAME="username" VALUE="awctwincities-l">
+    <INPUT TYPE="text" NAME="username" VALUE="hslink">
   </TD>
 </TR>
 <TR>
@@ -23,7 +23,7 @@
   <TH ALIGN="right">Password </TH>
   <TD>
     <!-- <INPUT TYPE="password" NAME="password"> -->
-    <INPUT TYPE="password" NAME="password" VALUE="6lrnsfCc">
+    <INPUT TYPE="password" NAME="password" VALUE="UwjM5zdb">
   </TD>
 </TR>
 </TABLE>
diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount.html b/fs_selfservice/FS-SelfService/cgi/myaccount.html
index d8bfe0cb1..f1a63870a 100644
--- a/fs_selfservice/FS-SelfService/cgi/myaccount.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount.html
@@ -9,12 +9,9 @@
 Hello <%= $name %>!<BR><BR>
 Your contact information<BR><%= $small_custview %>
 <BR>
-<%= if ( $balance ) {
-  $OUT .= qq! <B><A HREF="${url}make_payment">Make a $balance payment</A></B>!;
+<%= if ( $balance > 0 ) {
+  $OUT .= qq! <B><A HREF="${url}make_payment">Make a payment</A></B><BR><BR>!;
 } %>
-<BR><BR>
-<!--<TABLE BORDER=1 CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">
-<TR><TH>Invoice</TH><TH>Date</TH><TH>Owed</TH></TR>-->
 <%=
   if ( @open_invoices ) {
     $OUT .= '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 BGCOLOR="#eeeeee">'.
diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
index 9b8bdc100..7b392bcf4 100644
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -6,7 +6,7 @@ use subs qw(do_template);
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use Text::Template;
-use FS::SelfService qw(login customer_info invoice);
+use FS::SelfService qw(login customer_info invoice payment_info);
 
 $template_dir = '.';
 
@@ -68,6 +68,7 @@ if ( $result->{error} eq "Can't resume session" ) { #ick
 #warn $result->{'open_invoices'};
 #warn scalar(@{$result->{'open_invoices'}});
 
+warn "processing template $action\n";
 do_template($action, {
   'session_id' => $session_id,
   %{$result}
@@ -89,7 +90,7 @@ sub view_invoice {
 }
 
 sub make_payment {
-
+  payment_info( 'session_id' => $session_id );
 }
 
 #--
-- 
cgit v1.2.1


From 416dc3b6df09133c4130445008919408f04586c3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 18 May 2003 08:08:12 +0000
Subject: more self-service make payment UI work

---
 FS/FS/ClientAPI/MyAccount.pm | 36 ++++++++++++++++++++++++++++++------
 fs_selfservice/DEPLOY        |  6 ++----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 80c7330e8..c722c9d5f 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -4,14 +4,16 @@ use strict;
 use vars qw($cache);
 use Digest::MD5 qw(md5_hex);
 use Date::Format;
+use Business::CreditCard;
 use Cache::SharedMemoryCache; #store in db?
 use FS::CGI qw(small_custview); #doh
 use FS::Conf;
-use FS::Record qw(qsearchs);
+use FS::Record qw(qsearch qsearchs);
 use FS::svc_acct;
 use FS::svc_domain;
 use FS::cust_main;
 use FS::cust_bill;
+use FS::cust_main_county;
 
 use FS::ClientAPI; #hmm
 FS::ClientAPI->register_handlers(
@@ -132,15 +134,38 @@ sub payment_info {
 
   $return{$_} = $cust_main->get($_) for qw(address1 address2 city state zip);
 
+  $return{payby} = $cust_main->payby;
+
   if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) {
-    #$return{card_type} = 
+    $return{card_type} = cardtype($cust_main->payinfo);
     $return{payinfo} = $cust_main->payinfo;
-    #exp date (month, year)
 
-    #CARD vd DCRD remembering
+    if ( $cust_main->paydate  =~ /^(\d{4})-(\d{2})-\d{2}$/ ) { #Pg date format
+      @return{'month', 'year'} = ( $2, $1 );
+    } elsif ( $cust_main->paydate =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+      @return{'month', 'year'} = ( $1, $3 );
+    }
+
   }
 
-  #list all states & counties
+  #list all counties/states/countries
+  $return{'cust_main_county'} = 
+      [ map { $_->hashref } qsearch('cust_main_county', {}) ],
+
+  #shortcut for one-country folks
+  my $conf = new FS::Conf;
+  my %states = map { $_->state => 1 }
+                 qsearch('cust_main_county', {
+                   'country' => $conf->config('defaultcountry') || 'US'
+                 } );
+  $return{'states'} = [ sort { $a cmp $b } keys %states ];
+
+  $return{card_types} = {
+    'VISA' => 'VISA card',
+    'MasterCard' => 'MasterCard',
+    'Discover' => 'Discover card',
+    'American Express' => 'American Express card',
+  };
 
   return { 'error' => '',
            %return,
@@ -148,7 +173,6 @@ sub payment_info {
 
 };
 
-
 sub invoice {
   my $p = shift;
   my $session = $cache->get($p->{'session_id'})
diff --git a/fs_selfservice/DEPLOY b/fs_selfservice/DEPLOY
index 7ab3b2a7a..4aef4cfa4 100755
--- a/fs_selfservice/DEPLOY
+++ b/fs_selfservice/DEPLOY
@@ -1,14 +1,12 @@
 #!/bin/sh
 
+kill `cat /var/run/freeside-selfservice-server.fs_selfservice.pid`
+
 ( cd ..; make deploy; cd fs_selfservice )
 
 cd FS-SelfService
 perl Makefile.PL && make && make install
 
-cd ..
-kill `cat /var/run/freeside-selfservice-server.ivan.pid`; sleep 3
-./freeside-selfservice-server ivan localhost
-
 cp /home/ivan/freeside/fs_selfservice/FS-SelfService/cgi/* /var/www/MyAccount
 chown freeside /var/www/MyAccount/selfservice.cgi
 chmod 755 /var/www/MyAccount/selfservice.cgi
-- 
cgit v1.2.1


From 2c88b03550a72438bbd75ec7461d2c26fc797efc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 18 May 2003 08:09:41 +0000
Subject: forgot this file

---
 .../FS-SelfService/cgi/make_payment.html           | 118 +++++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 fs_selfservice/FS-SelfService/cgi/make_payment.html

diff --git a/fs_selfservice/FS-SelfService/cgi/make_payment.html b/fs_selfservice/FS-SelfService/cgi/make_payment.html
new file mode 100644
index 000000000..d469bddb6
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/make_payment.html
@@ -0,0 +1,118 @@
+<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
+<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
+<%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<TABLE BORDER=0 CELLPADDING=4><TR><TD VALIGN="top" HEIGHT=384 BGCOLOR="#dddddd">
+<A HREF="<%= $url %>myaccount">MyAccount</A><BR>
+<!-- <A HREF="<%= $url %>other">SomethingElse</A><BR> -->
+</TD><TD VALIGN="top">
+<FONT SIZE=4>Make a payment</FONT><BR><BR>
+<FORM METHOD="POST" ACTION="<%=$selfurl%>">
+<INPUT TYPE="hidden" NAME="session" VALUE="<%=$session_id%>">
+<INPUT TYPE="hidden" NAME="action" VALUE="process_payment">
+<TABLE BGCOLOR="#cccccc">
+<TR>
+  <TD ALIGN="right">Amount&nbsp;Due</TD>
+  <TD>
+    <TABLE><TR><TD BGCOLOR="#ffffff">
+      $<%=sprintf("%.2f",$balance)%>
+    </TD></TR></TABLE>
+  </TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Payment&nbsp;amount</TD>
+  <TD>
+    <TABLE><TR><TD BGCOLOR="#ffffff">
+      $<INPUT TYPE="text" NAME="amount" SIZE=8 VALUE="<%=sprintf("%.2f",$balance)%>">
+    </TD></TR></TABLE>
+  </TD>
+</TR><TR>
+  <TD ALIGN="right">Card&nbsp;type</TD>
+  <TD>
+    <SELECT NAME="card_type"><OPTION></OPTION>
+      <%= foreach ( keys %$card_types ) {
+            $selected = $card_type eq $card_types->{$_} ? ' SELECTED' : '';
+            $OUT .= qq(<OPTION$selected VALUE="). $card_types->{$_}. qq(">$_\n);
+      } %>
+    </SELECT>
+  </TD>
+</TD><TR>
+  <TD ALIGN="right">Card&nbsp;number</TD>
+  <TD>
+    <TABLE>
+      <TR>
+        <TD>
+          <INPUT TYPE="text" NAME="payinfo" SIZE=20 MAXLENGTH=19 VALUE="<%=$payinfo%>"> </TD>
+        <TD>Exp.</TD>
+        <TD>
+          <SELECT NAME="month">
+            <%= for ( ( map "0$_", 1 .. 9 ), 11, 12 ) {
+                  $OUT .= '<OPTION'. ($_ eq $month ? ' SELECTED' : ''). ">$_\n";
+            } %>
+          </SELECT>
+        </TD>
+        <TD> / </TD>
+        <TD>
+          <SELECT NAME="year">
+            <%= for ( 2003 .. 2012 ) {
+                  $OUT .= '<OPTION'. ($_ eq $year ? ' SELECTED' : ''). ">$_\n";
+            } %>
+          </SELECT>
+        </TD>
+      </TR>
+    </TABLE>
+  </TD>
+</TR><TR>
+  <TD ALIGN="right">Exact&nbsp;name&nbsp;on&nbsp;card</TD>
+  <TD><INPUT TYPE="text" SIZE=32 MAXLENGTH=80 NAME="payname" SVALUE="<%=$payname%>"></TD>
+</TR><TR>
+  <TD ALIGN="right">Card&nbsp;billing&nbsp;address</TD>
+  <TD>
+    <INPUT TYPE="text" SIZE=40 MAXLENGTH=80 NAME="address1" VALUE="<%=$address1%>">
+  </TD>
+</TR><TR>
+  <TD ALIGN="right">Address&nbsp;line&nbsp;2</TD>
+  <TD>
+    <INPUT TYPE="text" SIZE=40 MAXLENGTH=80 NAME="address2" VALUE="<%=$address2%>">
+  </TD>
+</TR><TR>
+  <TD ALIGN="right">City</TD>
+  <TD>
+    <TABLE>
+      <TR>
+        <TD>
+          <INPUT TYPE="text" NAME="city" SIZE="12" MAXLENGTH=80 VALUE="<%=$city%>">
+        </TD>
+        <TD>State</TD>
+        <TD>
+          <SELECT NAME="state">
+            <%= for ( @$states ) {
+              $OUT .= '<OPTION'. ($_ eq $state ? ' SELECTED' : '' ). ">$_\n";
+            } %>
+          </SELECT>
+        </TD>
+        <TD>Zip</TD>
+        <TD>
+          <INPUT TYPE="text" NAME="zip" SIZE=11 MAXLENGTH=10 VALUE="<%=$zip%>">
+        </TD>
+      </TR>
+    </TABLE>
+  </TD>
+</TR><TR>
+  <TD COLSPAN=2>
+    <INPUT TYPE="checkbox" CHECKED NAME="save">
+    Remember this information
+  </TD>
+</TR><TR>
+  <TD COLSPAN=2>
+    <INPUT TYPE="checkbox"<%= $payby eq 'CARD' ? ' CHECKED' : '' %> NAME="CARD">
+    Charge future payments to this card automatically
+  </TD>
+</TR>
+</TABLE>
+<INPUT TYPE="submit" VALUE="Process payment">
+</FORM>
+</TD></TR></TABLE>
+<HR>
+<FONT SIZE="-2">powered by <a href="http://www.sisd.com/freeside">freeside</a></FONT>
+</BODY></HTML>
+
-- 
cgit v1.2.1


From 667a729f660ad4f871acd5eb3173303396543eeb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 18 May 2003 11:44:37 +0000
Subject: interface for making payments all done

---
 FS/FS/ClientAPI/MyAccount.pm                        |  8 +++++---
 fs_selfservice/FS-SelfService/cgi/make_payment.html | 14 ++++++++------
 fs_selfservice/FS-SelfService/cgi/myaccount.html    |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index c722c9d5f..c750ada46 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -107,7 +107,6 @@ sub customer_info {
 
   }
 
-
   return { 'error'          => '',
            'custnum'        => $custnum,
            %return,
@@ -130,14 +129,14 @@ sub payment_info {
   $return{balance} = $cust_main->balance;
 
   $return{payname} = $cust_main->payname
-                     || $cust_main->first. ' '. $cust_main->get('last');
+                     || ( $cust_main->first. ' '. $cust_main->get('last') );
 
   $return{$_} = $cust_main->get($_) for qw(address1 address2 city state zip);
 
   $return{payby} = $cust_main->payby;
 
   if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) {
-    $return{card_type} = cardtype($cust_main->payinfo);
+    warn $return{card_type} = cardtype($cust_main->payinfo);
     $return{payinfo} = $cust_main->payinfo;
 
     if ( $cust_main->paydate  =~ /^(\d{4})-(\d{2})-\d{2}$/ ) { #Pg date format
@@ -167,6 +166,9 @@ sub payment_info {
     'American Express' => 'American Express card',
   };
 
+  my $_date = time;
+  $return{paybatch} = 'webui-MyAccount-$_date-$$-". rand() * 2**32
+
   return { 'error' => '',
            %return,
          };
diff --git a/fs_selfservice/FS-SelfService/cgi/make_payment.html b/fs_selfservice/FS-SelfService/cgi/make_payment.html
index d469bddb6..ce1db6865 100644
--- a/fs_selfservice/FS-SelfService/cgi/make_payment.html
+++ b/fs_selfservice/FS-SelfService/cgi/make_payment.html
@@ -6,7 +6,7 @@
 <!-- <A HREF="<%= $url %>other">SomethingElse</A><BR> -->
 </TD><TD VALIGN="top">
 <FONT SIZE=4>Make a payment</FONT><BR><BR>
-<FORM METHOD="POST" ACTION="<%=$selfurl%>">
+<FORM NAME="OneTrueForm" METHOD="POST" ACTION="<%=$selfurl%>" onSubmit="document.OneTrueForm.process.disabled=true">
 <INPUT TYPE="hidden" NAME="session" VALUE="<%=$session_id%>">
 <INPUT TYPE="hidden" NAME="action" VALUE="process_payment">
 <TABLE BGCOLOR="#cccccc">
@@ -29,8 +29,8 @@
   <TD ALIGN="right">Card&nbsp;type</TD>
   <TD>
     <SELECT NAME="card_type"><OPTION></OPTION>
-      <%= foreach ( keys %$card_types ) {
-            $selected = $card_type eq $card_types->{$_} ? ' SELECTED' : '';
+      <%= foreach ( keys %card_types ) {
+            $selected = $card_type eq $card_types{$_} ? ' SELECTED' : '';
             $OUT .= qq(<OPTION$selected VALUE="). $card_types->{$_}. qq(">$_\n);
       } %>
     </SELECT>
@@ -63,7 +63,7 @@
   </TD>
 </TR><TR>
   <TD ALIGN="right">Exact&nbsp;name&nbsp;on&nbsp;card</TD>
-  <TD><INPUT TYPE="text" SIZE=32 MAXLENGTH=80 NAME="payname" SVALUE="<%=$payname%>"></TD>
+  <TD><INPUT TYPE="text" SIZE=32 MAXLENGTH=80 NAME="payname" VALUE="<%=$payname%>"></TD>
 </TR><TR>
   <TD ALIGN="right">Card&nbsp;billing&nbsp;address</TD>
   <TD>
@@ -85,7 +85,7 @@
         <TD>State</TD>
         <TD>
           <SELECT NAME="state">
-            <%= for ( @$states ) {
+            <%= for ( @states ) {
               $OUT .= '<OPTION'. ($_ eq $state ? ' SELECTED' : '' ). ">$_\n";
             } %>
           </SELECT>
@@ -109,7 +109,9 @@
   </TD>
 </TR>
 </TABLE>
-<INPUT TYPE="submit" VALUE="Process payment">
+<BR>
+<INPUT TYPE="hidden" NAME="paybatch" VALUE="$paybatch">
+<INPUT TYPE="submit" NAME="process" VALUE="Process payment"> <!-- onClick="this.disabled=true"> -->
 </FORM>
 </TD></TR></TABLE>
 <HR>
diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount.html b/fs_selfservice/FS-SelfService/cgi/myaccount.html
index f1a63870a..f48fdedea 100644
--- a/fs_selfservice/FS-SelfService/cgi/myaccount.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount.html
@@ -7,7 +7,7 @@
 </TD><TD VALIGN="top">
 
 Hello <%= $name %>!<BR><BR>
-Your contact information<BR><%= $small_custview %>
+<%= $small_custview %>
 <BR>
 <%= if ( $balance > 0 ) {
   $OUT .= qq! <B><A HREF="${url}make_payment">Make a payment</A></B><BR><BR>!;
-- 
cgit v1.2.1


From f0afbc011e7b909a2e6ac54039c975710e76f341 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 19 May 2003 00:15:20 +0000
Subject: processing payments...

---
 .../FS-SelfService/cgi/make_payment.html           |  4 +-
 fs_selfservice/FS-SelfService/cgi/selfservice.cgi  | 73 +++++++++++++++++++++-
 2 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/fs_selfservice/FS-SelfService/cgi/make_payment.html b/fs_selfservice/FS-SelfService/cgi/make_payment.html
index ce1db6865..6adc0bde0 100644
--- a/fs_selfservice/FS-SelfService/cgi/make_payment.html
+++ b/fs_selfservice/FS-SelfService/cgi/make_payment.html
@@ -99,12 +99,12 @@
   </TD>
 </TR><TR>
   <TD COLSPAN=2>
-    <INPUT TYPE="checkbox" CHECKED NAME="save">
+    <INPUT TYPE="checkbox" CHECKED NAME="save" VALUE="1">
     Remember this information
   </TD>
 </TR><TR>
   <TD COLSPAN=2>
-    <INPUT TYPE="checkbox"<%= $payby eq 'CARD' ? ' CHECKED' : '' %> NAME="CARD">
+    <INPUT TYPE="checkbox"<%= $payby eq 'CARD' ? ' CHECKED' : '' %> NAME="auto" VALUE="1">
     Charge future payments to this card automatically
   </TD>
 </TR>
diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
index 7b392bcf4..2ce2c8b6c 100644
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -53,7 +53,8 @@ if ( $cgi->param('session') eq 'login' ) {
 
 $session_id = $cgi->param('session');
 
-$cgi->param('action') =~ /^(myaccount|view_invoice|make_payment)$/
+$cgi->param('action') =~
+    /^(myaccount|view_invoice|make_payment|process_payment)$/
   or die "unknown action ". $cgi->param('action');
 my $action = $1;
 
@@ -93,6 +94,76 @@ sub make_payment {
   payment_info( 'session_id' => $session_id );
 }
 
+sub process_payment {
+
+  $cgi->param('amount') =~ /^\s*(\d+(\.\d{2})?)\s*$/
+    or die "illegal amount"; #!!!
+  my $amount = $1;
+
+  my $payinfo = $cgi->param('payinfo');
+  $payinfo =~ s/\D//g;
+  $payinfo =~ /^(\d{13,16})$/
+    #or $error ||= $init_data->{msgcat}{invalid_card}; #. $self->payinfo;
+    or die "illegal card"; #!!!
+  $payinfo = $1;
+  validate($payinfo)
+    #or $error ||= $init_data->{msgcat}{invalid_card}; #. $self->payinfo;
+    or die "invalid card"; #!!!
+  cardtype($payinfo) eq $cgi->param('card_type')
+    #or $error ||= $init_data->{msgcat}{not_a}. $cgi->param('CARD_type');
+    or die "not a ". $cgi->param('card_type');
+
+  $cgi->param('month') =~ /^(\d{2})$/ or die "illegal month";
+  my $month = $1;
+  $cgi->param('year') =~ /^(\d{4})$/ or die "illegal year";
+  my $year = $1;
+
+  $cgi->param('payname') =~ /^(.{0,80})$/ or die "illegal payname";
+  my $payname = $1;
+
+  $cgi->param('address1') =~ /^(.{0,80})$/ or die "illegal address1";
+  my $address1 = $1;
+
+  $cgi->param('address2') =~ /^(.{0,80})$/ or die "illegal address2";
+  my $address2 = $1;
+
+  $cgi->param('city') =~ /^(.{0,80})$/ or die "illegal city";
+  my $city = $1;
+
+  $cgi->param('state') =~ /^(.{2})$/ or die "illegal state";
+  my $state = $1;
+
+  $cgi->param('zip') =~ /^(.{0,10})$/ or die "illegal zip";
+  my $zip = $1;
+
+  my $save = 0;
+  $save = 1 if $cgi->param('save');
+
+  my $auto = 0;
+  $auto = 1 if $cgi->param('auto');
+
+  $cgi->param('paybatch') =~ /^([\w\-\.]+)$/ or die "illegal paybatch";
+  my $patbatch = $1;
+
+  process_payment(
+    'session_id' => $session_id,
+    'amount'     => $amount,
+    'payinfo'    => $payinfo,
+    'month'      => $month,
+    'year'       => $year,
+    'payname'    => $payname,
+    'address1'   => $address1,
+    'address2'   => $address2,
+    'city'       => $city,
+    'state'      => $state,
+    'zip'        => $zip,
+    'save'       => $save,
+    'auto'       => $auto,
+    'paybatch'   => $paybatch,
+  );
+
+}
+
 #--
 
 sub do_template {
-- 
cgit v1.2.1


From fd9138f66cf7f3ab9557e0beebb4e2657a59e34c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 19 May 2003 12:00:45 +0000
Subject: maintenance:   - add FS::Misc with send_email subroutine, remove all
 duplicate code from     various modules   - move the realtime_bop from
 cust_bill to cust_main & change usage slightly.     invnum is no longer
 required.  FS::cust_bill::realtime_bop remains as a     wrapper.
 self-service:   - fix some syntax errors, make payment UI (step one) really
 should be     working now

---
 FS/FS/ClientAPI/MyAccount.pm |  16 ++-
 FS/FS/Misc.pm                |  95 ++++++++++++++
 FS/FS/cust_bill.pm           | 298 +++----------------------------------------
 FS/FS/cust_main.pm           | 216 +++++++++++++++++++++++++++++++
 FS/FS/cust_pay.pm            |  50 +++-----
 FS/FS/cust_pkg.pm            |  49 ++-----
 FS/FS/svc_acct.pm            |  32 ++---
 FS/FS/svc_domain.pm          |   6 +-
 FS/MANIFEST                  |   2 +
 FS/t/Misc.t                  |   5 +
 10 files changed, 394 insertions(+), 375 deletions(-)
 create mode 100644 FS/FS/Misc.pm
 create mode 100644 FS/t/Misc.t

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index c750ada46..a64cfb5d7 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -167,7 +167,7 @@ sub payment_info {
   };
 
   my $_date = time;
-  $return{paybatch} = 'webui-MyAccount-$_date-$$-". rand() * 2**32
+  $return{paybatch} = "webui-MyAccount-$_date-$$-". rand() * 2**32;
 
   return { 'error' => '',
            %return,
@@ -175,6 +175,20 @@ sub payment_info {
 
 };
 
+sub make_payment{
+  my $p = shift;
+
+  my $session = $cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  my %return;
+
+  my $custnum = $session->{'custnum'};
+
+
+
+}
+
 sub invoice {
   my $p = shift;
   my $session = $cache->get($p->{'session_id'})
diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm
new file mode 100644
index 000000000..56dc72e36
--- /dev/null
+++ b/FS/FS/Misc.pm
@@ -0,0 +1,95 @@
+package FS::Misc;
+
+use strict;
+use vars qw ( @ISA @EXPORT_OK );
+use Exporter;
+
+@ISA = qw( Exporter );
+@EXPORT_OK = qw( send_email );
+
+=head1 NAME
+
+FS::Misc - Miscellaneous subroutines
+
+=head1 SYNOPSIS
+
+  use FS::Misc qw(send_email);
+
+  send_email();
+
+=head1 DESCRIPTION
+
+Miscellaneous subroutines.  This module contains miscellaneous subroutines
+called from multiple other modules.  These are not OO or necessarily related,
+but are collected here to elimiate code duplication.
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item send_email OPTION => VALUE ...
+
+Options:
+
+I<from> - (required)
+
+I<to> - (required) comma-separated scalar or arrayref of recipients
+
+I<subject> - (required)
+
+I<content-type> - (optional) MIME type
+
+I<body> - (required) arrayref of body text lines
+
+=cut
+
+use vars qw( $conf );
+use Date::Format;
+use Mail::Header;
+use Mail::Internet 1.44;
+use FS::UID;
+
+FS::UID->install_callback( sub {
+  $conf = new FS::Conf;
+} );
+
+sub send_email {
+  my(%options) = shift;
+
+  $ENV{MAILADDRESS} = $options{'from'};
+  my $to = ref($options{to}) ? join(', ', @{ $options{to} } ) : $options{to};
+  my @header = (
+    'From: '.     $options{'from'},
+    'To: '.       $to,
+    'Sender: '.   $options{'from'},
+    'Reply-To: '. $options{'from'},
+    'Date: '.     time2str("%a, %d %b %Y %X %z", time),
+    'Subject: '.  $options{'subject'},
+  );
+  push @header, 'Content-Type: '. $options{'content-type'}
+    if exists($options{'content-type'});
+  my $header = new Mail::Header ( \@header );
+
+  my $message = new Mail::Internet (
+    'Header' => $header,
+    'Body'   => $options{'body'},
+  );
+
+  my $smtpmachine = $conf->config('smtpmachine');
+  $!=0;
+  $message->smtpsend( 'Host' => $smtpmachine )
+    or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
+      or return "can't send email to $to via server $smtpmachine with SMTP: $!";
+}
+
+=head1 BUGS
+
+This package exists.
+
+=head1 SEE ALSO
+
+L<FS::UID>, L<FS::CGI>, L<FS::Record>, the base documentation.
+
+=cut
+
+1;
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index a0634d918..a22f44b24 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2,18 +2,12 @@ package FS::cust_bill;
 
 use strict;
 use vars qw( @ISA $conf $money_char );
-use vars qw( $lpr $invoice_from $smtpmachine );
-use vars qw( $xaction $E_NoErr );
-use vars qw( $bop_processor $bop_login $bop_password $bop_action @bop_options );
-use vars qw( $ach_processor $ach_login $ach_password $ach_action @ach_options );
 use vars qw( $invoice_lines @buf ); #yuck
-use vars qw( $quiet );
 use Date::Format;
-use Mail::Internet 1.44;
-use Mail::Header;
 use Text::Template;
 use FS::UID qw( datasrc );
 use FS::Record qw( qsearch qsearchs );
+use FS::Misc qw( send_email );
 use FS::cust_main;
 use FS::cust_bill_pkg;
 use FS::cust_credit;
@@ -26,46 +20,10 @@ use FS::cust_bill_event;
 @ISA = qw( FS::Record );
 
 #ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::cust_bill'} = sub { 
-
+FS::UID->install_callback( sub { 
   $conf = new FS::Conf;
-
   $money_char = $conf->config('money_char') || '$';  
-
-  $lpr = $conf->config('lpr');
-  $invoice_from = $conf->config('invoice_from');
-  $smtpmachine = $conf->config('smtpmachine');
-
-  ( $bop_processor,$bop_login, $bop_password, $bop_action ) = ( '', '', '', '');
-  @bop_options = ();
-  ( $ach_processor,$ach_login, $ach_password, $ach_action ) = ( '', '', '', '');
-  @ach_options = ();
-
-  if ( $conf->exists('business-onlinepayment') ) {
-    ( $bop_processor,
-      $bop_login,
-      $bop_password,
-      $bop_action,
-      @bop_options
-    ) = $conf->config('business-onlinepayment');
-    $bop_action ||= 'normal authorization';
-    ( $ach_processor, $ach_login, $ach_password, $ach_action, @ach_options ) =
-      ( $bop_processor, $bop_login, $bop_password, $bop_action, @bop_options );
-    eval "use Business::OnlinePayment";  
-  }
-
-  if ( $conf->exists('business-onlinepayment-ach') ) {
-    ( $ach_processor,
-      $ach_login,
-      $ach_password,
-      $ach_action,
-      @ach_options
-    ) = $conf->config('business-onlinepayment-ach');
-    $ach_action ||= 'normal authorization';
-    eval "use Business::OnlinePayment";  
-  }
-
-};
+} );
 
 =head1 NAME
 
@@ -373,33 +331,20 @@ sub send {
   if ( grep { $_ ne 'POST' } @invoicing_list or !@invoicing_list  ) { #email
 
     #better to notify this person than silence
-    @invoicing_list = ($invoice_from) unless @invoicing_list;
-
-    #false laziness w/FS::cust_pay::delete & fs_signup_server && ::realtime_card
-    #$ENV{SMTPHOSTS} = $smtpmachine;
-    $ENV{MAILADDRESS} = $invoice_from;
-    my $header = new Mail::Header ( [
-      "From: $invoice_from",
-      "To: ". join(', ', grep { $_ ne 'POST' } @invoicing_list ),
-      "Sender: $invoice_from",
-      "Reply-To: $invoice_from",
-      "Date: ". time2str("%a, %d %b %Y %X %z", time),
-      "Subject: Invoice",
-    ] );
-    my $message = new Mail::Internet (
-      'Header' => $header,
-      'Body' => [ @print_text ], #( date)
+    @invoicing_list = ($conf->config('invoice_from')) unless @invoicing_list;
+
+    my $error = send_email(
+      'from'    => $conf->config('invoice_from'),
+      'to'      => [ grep { $_ ne 'POST' } @invoicing_list ],
+      'subject' => 'Invoice',
+      'body'    => \@print_text,
     );
-    $!=0;
-    $message->smtpsend( Host => $smtpmachine )
-      or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-        or return "(customer # ". $self->custnum. ") can't send invoice email".
-                  " to ". join(', ', grep { $_ ne 'POST' } @invoicing_list ).
-                  " via server $smtpmachine with SMTP: $!";
+    return "can't send invoice: $error" if $error;
 
   }
 
   if ( grep { $_ eq 'POST' } @invoicing_list ) { #postal
+    my $lpr = $conf->config('lpr');
     open(LPR, "|$lpr")
       or return "Can't open pipe to $lpr: $!";
     print LPR @print_text;
@@ -610,15 +555,7 @@ for supported processors.
 
 sub realtime_card {
   my $self = shift;
-  $self->realtime_bop(
-    'CC',
-    $bop_processor,
-    $bop_login,
-    $bop_password,
-    $bop_action,
-    \@bop_options,
-    @_
-  );
+  $self->realtime_bop( 'CC', @_ );
 }
 
 =item realtime_ach
@@ -632,15 +569,7 @@ for supported processors.
 
 sub realtime_ach {
   my $self = shift;
-  $self->realtime_bop(
-    'ECHECK',
-    $ach_processor,
-    $ach_login,
-    $ach_password,
-    $ach_action,
-    \@ach_options,
-    @_
-  );
+  $self->realtime_bop( 'ECHECK', @_ );
 }
 
 =item realtime_lec
@@ -654,53 +583,15 @@ for supported processors.
 
 sub realtime_lec {
   my $self = shift;
-  $self->realtime_bop(
-    'LEC',
-    $bop_processor,
-    $bop_login,
-    $bop_password,
-    $bop_action,
-    \@bop_options,
-    @_
-  );
+  $self->realtime_bop( 'LEC', @_ );
 }
 
 sub realtime_bop {
-  my( $self, $method, $processor, $login, $password, $action, $options ) = @_;
-
-  #trim an extraneous blank line
-  pop @$options if scalar(@$options) % 2 && $options->[-1] =~ /^\s*$/;
+  my( $self, $method ) = @_;
 
   my $cust_main = $self->cust_main;
   my $amount = $self->owed;
 
-  my $address = $cust_main->address1;
-  $address .= ", ". $cust_main->address2 if $cust_main->address2;
-
-  my($payname, $payfirst, $paylast);
-  if ( $cust_main->payname && $method ne 'ECHECK' ) {
-    $payname = $cust_main->payname;
-    $payname =~ /^\s*([\w \,\.\-\']*)?\s+([\w\,\.\-\']+)\s*$/
-      or do {
-              #$dbh->rollback if $oldAutoCommit;
-              return "Illegal payname $payname";
-            };
-    ($payfirst, $paylast) = ($1, $2);
-  } else {
-    $payfirst = $cust_main->getfield('first');
-    $paylast = $cust_main->getfield('last');
-    $payname =  "$payfirst $paylast";
-  }
-
-  my @invoicing_list = grep { $_ ne 'POST' } $cust_main->invoicing_list;
-  if ( $conf->exists('emailinvoiceauto')
-       || ( $conf->exists('emailinvoiceonly') && ! @invoicing_list ) ) {
-    push @invoicing_list, $cust_main->all_emails;
-  }
-  my $email = $invoicing_list[0];
-
-  my( $action1, $action2 ) = split(/\s*\,\s*/, $action );
-
   my $description = 'Internet Services';
   if ( $conf->exists('business-onlinepayment-description') ) {
     my $dtempl = $conf->config('business-onlinepayment-description');
@@ -714,163 +605,12 @@ sub realtime_bop {
         grep { $_->pkgnum } $self->cust_bill_pkg
     );
     $description = eval qq("$dtempl");
-
   }
 
-  my %content;
-  if ( $method eq 'CC' ) { 
-    $content{card_number} = $cust_main->payinfo;
-    $cust_main->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
-    $content{expiration} = "$2/$1";
-  } elsif ( $method eq 'ECHECK' ) {
-    my($account_number,$routing_code) = $cust_main->payinfo;
-    ( $content{account_number}, $content{routing_code} ) =
-      split('@', $cust_main->payinfo);
-    $content{bank_name} = $cust_main->payname;
-  } elsif ( $method eq 'LEC' ) {
-    $content{phone} = $cust_main->payinfo;
-  }
-  
-  my $transaction =
-    new Business::OnlinePayment( $processor, @$options );
-  $transaction->content(
-    'type'           => $method,
-    'login'          => $login,
-    'password'       => $password,
-    'action'         => $action1,
-    'description'    => $description,
-    'amount'         => $amount,
-    'invoice_number' => $self->invnum,
-    'customer_id'    => $self->custnum,
-    'last_name'      => $paylast,
-    'first_name'     => $payfirst,
-    'name'           => $payname,
-    'address'        => $address,
-    'city'           => $cust_main->city,
-    'state'          => $cust_main->state,
-    'zip'            => $cust_main->zip,
-    'country'        => $cust_main->country,
-    'referer'        => 'http://cleanwhisker.420.am/',
-    'email'          => $email,
-    'phone'          => $cust_main->daytime || $cust_main->night,
-    %content, #after
+  $cust_main->realtime_bop($method, $amount,
+    'description' => $description,
+    'invnum'      => $self->invnum,
   );
-  $transaction->submit();
-
-  if ( $transaction->is_success() && $action2 ) {
-    my $auth = $transaction->authorization;
-    my $ordernum = $transaction->can('order_number')
-                   ? $transaction->order_number
-                   : '';
-
-    #warn "********* $auth ***********\n";
-    #warn "********* $ordernum ***********\n";
-    my $capture =
-      new Business::OnlinePayment( $processor, @$options );
-
-    my %capture = (
-      %content,
-      type           => $method,
-      action         => $action2,
-      login          => $login,
-      password       => $password,
-      order_number   => $ordernum,
-      amount         => $amount,
-      authorization  => $auth,
-      description    => $description,
-    );
-
-    foreach my $field (qw( authorization_source_code returned_ACI                                          transaction_identifier validation_code           
-                           transaction_sequence_num local_transaction_date    
-                           local_transaction_time AVS_result_code          )) {
-      $capture{$field} = $transaction->$field() if $transaction->can($field);
-    }
-
-    $capture->content( %capture );
-
-    $capture->submit();
-
-    unless ( $capture->is_success ) {
-      my $e = "Authorization sucessful but capture failed, invnum #".
-              $self->invnum. ': '.  $capture->result_code.
-              ": ". $capture->error_message;
-      warn $e;
-      return $e;
-    }
-
-  }
-
-  if ( $transaction->is_success() ) {
-
-    my %method2payby = (
-      'CC'     => 'CARD',
-      'ECHECK' => 'CHEK',
-      'LEC'    => 'LECB',
-    );
-
-    my $cust_pay = new FS::cust_pay ( {
-       'invnum'   => $self->invnum,
-       'paid'     => $amount,
-       '_date'     => '',
-       'payby'    => $method2payby{$method},
-       'payinfo'  => $cust_main->payinfo,
-       'paybatch' => "$processor:". $transaction->authorization,
-    } );
-    my $error = $cust_pay->insert;
-    if ( $error ) {
-      # gah, even with transactions.
-      my $e = 'WARNING: Card/ACH debited but database not updated - '.
-              'error applying payment, invnum #' . $self->invnum.
-              " ($processor): $error";
-      warn $e;
-      return $e;
-    } else {
-      return '';
-    }
-  #} elsif ( $options{'report_badcard'} ) {
-  } else {
-
-    my $perror = "$processor error, invnum #". $self->invnum. ': '.
-                 $transaction->result_code. ": ". $transaction->error_message;
-
-    if ( !$quiet && $conf->exists('emaildecline')
-         && grep { $_ ne 'POST' } $cust_main->invoicing_list
-    ) {
-      my @templ = $conf->config('declinetemplate');
-      my $template = new Text::Template (
-        TYPE   => 'ARRAY',
-        SOURCE => [ map "$_\n", @templ ],
-      ) or return "($perror) can't create template: $Text::Template::ERROR";
-      $template->compile()
-        or return "($perror) can't compile template: $Text::Template::ERROR";
-
-      my $templ_hash = { error => $transaction->error_message };
-
-      #false laziness w/FS::cust_pay::delete & fs_signup_server && ::send
-      $ENV{MAILADDRESS} = $invoice_from;
-      my $header = new Mail::Header ( [
-        "From: $invoice_from",
-        "To: ". join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list ),
-        "Sender: $invoice_from",
-        "Reply-To: $invoice_from",
-        "Date: ". time2str("%a, %d %b %Y %X %z", time),
-        "Subject: Your payment could not be processed",
-      ] );
-      my $message = new Mail::Internet (
-        'Header' => $header,
-        'Body' => [ $template->fill_in(HASH => $templ_hash) ],
-      );
-      $!=0;
-      $message->smtpsend( Host => $smtpmachine )
-        or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-          or return "($perror) (customer # ". $self->custnum.
-            ") can't send card decline email to ".
-            join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list ).
-            " via server $smtpmachine with SMTP: $!";
-    }
-  
-    return $perror;
-  }
 
 }
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 608c5e3cb..b162622a4 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -10,6 +10,7 @@ use Date::Format;
 use Business::CreditCard;
 use FS::UID qw( getotaker dbh );
 use FS::Record qw( qsearchs qsearch dbdef );
+use FS::Misc qw( send_email );
 use FS::cust_pkg;
 use FS::cust_bill;
 use FS::cust_bill_pkg;
@@ -1408,6 +1409,221 @@ sub collect {
 
 }
 
+=item realtime_bop METHOD AMOUNT [ OPTION => VALUE ... ]
+
+
+Runs a realtime credit card, ACH (electronic check) or phone bill transaction
+via a Business::OnlinePayment realtime gateway.  See
+L<http://420.am/business-onlinepayment> for supported gateways.
+
+Available methods are: I<CC>, I<ECHECK> and I<LEC>
+
+Available options are: I<description>, I<invnum>, I<quiet>
+
+I<description> is a free-text field passed to the gateway.  It defaults to
+"Internet services".
+
+If an I<invnum> is specified, this payment (if sucessful) is applied to the
+specified invoice.  If you don't specify an I<invnum> you might want to
+call the B<apply_payments> method.
+
+I<quiet> can be set true to surpress email decline notices.
+
+(moved from cust_bill) (probably should get realtime_{card,ach,lec} here too)
+
+=cut
+
+sub realtime_bop {
+  my( $self, $method, $amount, %options ) = @_;
+  $options{'description'} ||= 'Internet services';
+
+  #pre-requisites
+  die "Real-time processing not enabled\n"
+    unless $conf->exists('business-onlinepayment');
+  eval "use Business::OnlinePayment";  
+  die $@ if $@;
+
+  #load up config
+  my $bop_config = 'business-onlinepayment';
+  $bop_config .= '-ach'
+    if $method eq 'ECHECK' && $conf->exists($bop_config. '-ach');
+  my ( $processor, $login, $password, $action, @bop_options ) =
+    $conf->config($bop_config);
+  $action ||= 'normal authorization';
+  pop @bop_options if scalar(@bop_options) % 2 && $bop_options[-1] =~ /^\s*$/;
+
+  #massage data
+
+  my $address = $self->address1;
+  $address .= ", ". $self->address2 if $self->address2;
+
+  my($payname, $payfirst, $paylast);
+  if ( $self->payname && $method ne 'ECHECK' ) {
+    $payname = $self->payname;
+    $payname =~ /^\s*([\w \,\.\-\']*)?\s+([\w\,\.\-\']+)\s*$/
+      or return "Illegal payname $payname";
+    ($payfirst, $paylast) = ($1, $2);
+  } else {
+    $payfirst = $self->getfield('first');
+    $paylast = $self->getfield('last');
+    $payname =  "$payfirst $paylast";
+  }
+
+  my @invoicing_list = grep { $_ ne 'POST' } $self->invoicing_list;
+  if ( $conf->exists('emailinvoiceauto')
+       || ( $conf->exists('emailinvoiceonly') && ! @invoicing_list ) ) {
+    push @invoicing_list, $self->all_emails;
+  }
+  my $email = $invoicing_list[0];
+
+  my %content;
+  if ( $method eq 'CC' ) { 
+    $content{card_number} = $self->payinfo;
+    $self->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
+    $content{expiration} = "$2/$1";
+  } elsif ( $method eq 'ECHECK' ) {
+    my($account_number,$routing_code) = $self->payinfo;
+    ( $content{account_number}, $content{routing_code} ) =
+      split('@', $self->payinfo);
+    $content{bank_name} = $self->payname;
+  } elsif ( $method eq 'LEC' ) {
+    $content{phone} = $self->payinfo;
+  }
+
+  #transaction(s)
+
+  my( $action1, $action2 ) = split(/\s*\,\s*/, $action );
+
+  my $transaction =
+    new Business::OnlinePayment( $processor, @bop_options );
+  $transaction->content(
+    'type'           => $method,
+    'login'          => $login,
+    'password'       => $password,
+    'action'         => $action1,
+    'description'    => $options{'description'},
+    'amount'         => $amount,
+    'invoice_number' => $options{'invnum'},
+    'customer_id'    => $self->custnum,
+    'last_name'      => $paylast,
+    'first_name'     => $payfirst,
+    'name'           => $payname,
+    'address'        => $address,
+    'city'           => $self->city,
+    'state'          => $self->state,
+    'zip'            => $self->zip,
+    'country'        => $self->country,
+    'referer'        => 'http://cleanwhisker.420.am/',
+    'email'          => $email,
+    'phone'          => $self->daytime || $self->night,
+    %content, #after
+  );
+  $transaction->submit();
+
+  if ( $transaction->is_success() && $action2 ) {
+    my $auth = $transaction->authorization;
+    my $ordernum = $transaction->can('order_number')
+                   ? $transaction->order_number
+                   : '';
+
+    my $capture =
+      new Business::OnlinePayment( $processor, @bop_options );
+
+    my %capture = (
+      %content,
+      type           => $method,
+      action         => $action2,
+      login          => $login,
+      password       => $password,
+      order_number   => $ordernum,
+      amount         => $amount,
+      authorization  => $auth,
+      description    => $options{'description'},
+    );
+
+    foreach my $field (qw( authorization_source_code returned_ACI                                          transaction_identifier validation_code           
+                           transaction_sequence_num local_transaction_date    
+                           local_transaction_time AVS_result_code          )) {
+      $capture{$field} = $transaction->$field() if $transaction->can($field);
+    }
+
+    $capture->content( %capture );
+
+    $capture->submit();
+
+    unless ( $capture->is_success ) {
+      my $e = "Authorization sucessful but capture failed, custnum #".
+              $self->custnum. ': '.  $capture->result_code.
+              ": ". $capture->error_message;
+      warn $e;
+      return $e;
+    }
+
+  }
+
+  #result handling
+  if ( $transaction->is_success() ) {
+
+    my %method2payby = (
+      'CC'     => 'CARD',
+      'ECHECK' => 'CHEK',
+      'LEC'    => 'LECB',
+    );
+
+    my $cust_pay = new FS::cust_pay ( {
+       'invnum'   => $self->invnum, #!!!!!!!!
+       'paid'     => $amount,
+       '_date'     => '',
+       'payby'    => $method2payby{$method},
+       'payinfo'  => $self->payinfo,
+       'paybatch' => "$processor:". $transaction->authorization,
+    } );
+    my $error = $cust_pay->insert;
+    if ( $error ) {
+      # gah, even with transactions.
+      my $e = 'WARNING: Card/ACH debited but database not updated - '.
+              'error applying payment, invnum #' . $self->invnum.
+              " ($processor): $error";
+      warn $e;
+      return $e;
+    } else {
+      return '';
+    }
+
+  } else {
+
+    my $perror = "$processor error: ". $transaction->error_message;
+
+    if ( !$options{'quiet'} && $conf->exists('emaildecline')
+         && grep { $_ ne 'POST' } $self->invoicing_list
+    ) {
+      my @templ = $conf->config('declinetemplate');
+      my $template = new Text::Template (
+        TYPE   => 'ARRAY',
+        SOURCE => [ map "$_\n", @templ ],
+      ) or return "($perror) can't create template: $Text::Template::ERROR";
+      $template->compile()
+        or return "($perror) can't compile template: $Text::Template::ERROR";
+
+      my $templ_hash = { error => $transaction->error_message };
+
+      my $error = send_email(
+        'from'    => $conf->config('invoice_from'),
+        'to'      => [ grep { $_ ne 'POST' } $self->invoicing_list ],
+        'subject' => 'Your payment could not be processed',
+        'body'    => [ $template->fill_in(HASH => $templ_hash) ],
+      );
+
+      $perror .= " (also received error sending decline notification: $error)"
+        if $error;
+
+    }
+  
+    return $perror;
+  }
+
+}
+
 =item total_owed
 
 Returns the total owed for this customer on all invoices
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 79cf82755..55f2fc4a3 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -1,13 +1,12 @@
 package FS::cust_pay;
 
 use strict;
-use vars qw( @ISA $conf $unsuspendauto $smtpmachine $invoice_from );
+use vars qw( @ISA $conf $unsuspendauto );
 use Date::Format;
-use Mail::Header;
-use Mail::Internet 1.44;
 use Business::CreditCard;
 use FS::UID qw( dbh );
 use FS::Record qw( dbh qsearch qsearchs dbh );
+use FS::Misc qw(send_email);
 use FS::cust_bill;
 use FS::cust_bill_pay;
 use FS::cust_main;
@@ -15,14 +14,10 @@ use FS::cust_main;
 @ISA = qw( FS::Record );
 
 #ask FS::UID to run this stuff for us later
-$FS::UID::callback{'FS::cust_pay'} = sub { 
-
+FS::UID->install_callback( sub { 
   $conf = new FS::Conf;
   $unsuspendauto = $conf->exists('unsuspendauto');
-  $smtpmachine = $conf->config('smtpmachine');
-  $invoice_from = $conf->config('invoice_from');
-
-};
+} );
 
 =head1 NAME
 
@@ -265,19 +260,12 @@ sub delete {
   if ( $conf->config('deletepayments') ne '' ) {
 
     my $cust_main = qsearchs('cust_main',{ 'custnum' => $self->custnum });
-    #false laziness w/FS::cust_bill::send & fs_signup_server
-    $ENV{MAILADDRESS} = $invoice_from; #??? well as good as any
-    my $header = new Mail::Header ( [
-      "From: $invoice_from",
-      "To: ". $conf->config('deletepayments'),
-      "Sender: $invoice_from",
-      "Reply-To: $invoice_from",
-      "Date: ". time2str("%a, %d %b %Y %X %z", time),
-      "Subject: FREESIDE NOTIFICATION: Payment deleted",
-    ] );
-    my $message = new Mail::Internet (
-      'Header' => $header,
-      'Body' => [ 
+
+    my $error = send_email(
+      'from'    => $conf->config('invoice_from'), #??? well as good as any
+      'to'      => $conf->config('deletepayments'),
+      'subject' => 'FREESIDE NOTIFICATION: Payment deleted',
+      'body'    => [
         "This is an automatic message from your Freeside installation\n",
         "informing you that the following payment has been deleted:\n",
         "\n",
@@ -291,16 +279,12 @@ sub delete {
         'paybatch: '. $self->paybatch. "\n",
       ],
     );
-    $!=0;
-    $message->smtpsend( Host => $smtpmachine )
-      or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-        or do {
-          $dbh->rollback if $oldAutoCommit;
-          return "(customer # ". $self->custnum.
-                 ") can't send payment deletion email to ".
-                 $conf->config('deletepayments').
-                 " via server $smtpmachine with SMTP: $!";
-        };
+
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "can't send payment deletion notification: $error";
+    }
+
   }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
@@ -406,7 +390,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.23 2002-11-19 09:51:58 ivan Exp $
+$Id: cust_pay.pm,v 1.24 2003-05-19 12:00:44 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index bd3d1f503..9ab269503 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -5,6 +5,7 @@ use vars qw(@ISA $disable_agentcheck);
 use vars qw( $quiet );
 use FS::UID qw( getotaker dbh );
 use FS::Record qw( qsearch qsearchs );
+use FS::Misc qw( send_email );
 use FS::cust_svc;
 use FS::part_pkg;
 use FS::cust_main;
@@ -20,12 +21,8 @@ use FS::svc_domain;
 use FS::svc_www;
 use FS::svc_forward;
 
-# need all this for sending cancel emails in sub cancel
-
+# for sending cancel emails in sub cancel
 use FS::Conf;
-use Date::Format;
-use Mail::Internet 1.44;
-use Mail::Header;
 
 @ISA = qw( FS::Record );
 
@@ -304,38 +301,16 @@ sub cancel {
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   my $conf = new FS::Conf;
-
-  if ( !$quiet && $conf->exists('emailcancel')
-       && grep { $_ ne 'POST' } $self->cust_main->invoicing_list) {
-  
-      my @invoicing_list = $self->cust_main->invoicing_list;
-  
-      my $invoice_from = $conf->config('invoice_from');
-      my @print_text = map "$_\n", $conf->config('cancelmessage');
-      my $subject = $conf->config('cancelsubject');
-      my $smtpmachine = $conf->config('smtpmachine');
-      
-      if ( grep { $_ ne 'POST' } @invoicing_list ) { #email invoice
-	  #false laziness w/FS::cust_pay::delete & fs_signup_server && ::realtime_card
-	  #$ENV{SMTPHOSTS} = $smtpmachine;
-	  $ENV{MAILADDRESS} = $invoice_from;
-	  my $header = new Mail::Header ( [
-              "From: $invoice_from",
-	      "To: ". join(', ', grep { $_ ne 'POST' } @invoicing_list ),
-              "Sender: $invoice_from",
-              "Reply-To: $invoice_from",
-              "Date: ". time2str("%a, %d %b %Y %X %z", time),
-              "Subject: $subject",           
-                                     ] );
-	  my $message = new Mail::Internet (
-              'Header' => $header,
-              'Body' => [ @print_text ],      
-                                      );
-	  $!=0;
-	  $message->smtpsend( Host => $smtpmachine )
-	      or $message->smtpsend( Host => $smtpmachine, Debug => 1 );
-	  #should this return an error?
-	  }
+  my @invoicing_list = grep { $_ ne 'POST' } $self->cust_main->invoicing_list;
+  if ( !$quiet && $conf->exists('emailcancel') && @invoicing_list ) {
+    my $conf = new FS::Conf;
+    my $error = send_email(
+      'from'    => $conf->config('invoice_from'),
+      'to'      => \@invoicing_list,
+      'subject' => $conf->config('cancelsubject'),
+      'body'    => [ map "$_\n", $conf->config('cancelmessage') ],
+    );
+    #should this do something on errors?
   }
 
   ''; #no errors
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 8f2861bfd..497e59c94 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1024,36 +1024,28 @@ sub radius_groups {
 
 =item send_email
 
+This is the FS::svc_acct job-queue-able version.  It still uses
+FS::Misc::send_email under-the-hood.
+
 =cut
 
 sub send_email {
   my %opt = @_;
 
-  use Date::Format;
-  use Mail::Internet 1.44;
-  use Mail::Header;
+  eval "use FS::Misc qw(send_email)";
+  die $@ if $@;
 
   $opt{mimetype} ||= 'text/plain';
   $opt{mimetype} .= '; charset="iso-8859-1"' unless $opt{mimetype} =~ /charset/;
 
-  $ENV{MAILADDRESS} = $opt{from};
-  my $header = new Mail::Header ( [
-    "From: $opt{from}",
-    "To: $opt{to}",
-    "Sender: $opt{from}",
-    "Reply-To: $opt{from}",
-    "Date: ". time2str("%a, %d %b %Y %X %z", time),
-    "Subject: $opt{subject}",
-    "Content-Type: $opt{mimetype}",
-  ] );
-  my $message = new Mail::Internet (
-    'Header' => $header,
-    'Body' => [ map "$_\n", split("\n", $opt{body}) ],
+  my $error = send_email(
+    'from'         => $opt{from},
+    'to'           => $opt{to},
+    'subject'      => $opt{subject},
+    'content-type' => $opt{mimetype},
+    'body'         => [ map "$_\n", split("\n", $opt{body}) ],
   );
-  $!=0;
-  $message->smtpsend( Host => $smtpmachine )
-    or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-      or die "can't send email to $opt{to} via $smtpmachine with SMTP: $!";
+  die $error if $error;
 }
 
 =item check_and_rebuild_fuzzyfiles
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 81edc337e..2e8866a56 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -1,13 +1,11 @@
 package FS::svc_domain;
 
 use strict;
-use vars qw( @ISA $whois_hack $conf $smtpmachine
+use vars qw( @ISA $whois_hack $conf
   @defaultrecords $soadefaultttl $soaemail $soaexpire $soamachine
   $soarefresh $soaretry
 );
 use Carp;
-use Mail::Internet 1.44;
-use Mail::Header;
 use Date::Format;
 use Net::Whois 1.0;
 use FS::Record qw(fields qsearch qsearchs dbh);
@@ -26,8 +24,6 @@ use FS::queue;
 $FS::UID::callback{'FS::domain'} = sub { 
   $conf = new FS::Conf;
 
-  $smtpmachine = $conf->config('smtpmachine');
-
   @defaultrecords = $conf->config('defaultrecords');
   $soadefaultttl = $conf->config('soadefaultttl');
   $soaemail      = $conf->config('soaemail');
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 6397cc411..272b5b731 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -36,6 +36,7 @@ FS/ClientAPI/passwd.pm
 FS/ClientAPI/MyAccount.pm
 FS/Conf.pm
 FS/ConfItem.pm
+FS/Misc.pm
 FS/Record.pm
 FS/SearchCache.pm
 FS/UI/Base.pm
@@ -125,6 +126,7 @@ t/InitHandler.t
 t/ClientAPI.t
 t/Conf.t
 t/ConfItem.t
+t/Misc.t
 t/Record.t
 t/UID.t
 t/Msgcat.t
diff --git a/FS/t/Misc.t b/FS/t/Misc.t
new file mode 100644
index 000000000..cc7751ab6
--- /dev/null
+++ b/FS/t/Misc.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::Misc;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From a1295d0682aa81a408abe06fcaa7c14440f6a2e2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 19 May 2003 13:38:41 +0000
Subject: first crack at payment processing with self-service (step two of the
 process)

---
 FS/FS/ClientAPI/MyAccount.pm                       | 23 ++++++++++++++++++++++
 FS/FS/cust_main.pm                                 | 13 ++++++++++--
 .../FS-SelfService/cgi/make_payment.html           |  4 ++--
 .../FS-SelfService/cgi/process_payment.html        | 18 +++++++++++++++++
 fs_selfservice/FS-SelfService/cgi/selfservice.cgi  |  4 +++-
 5 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 fs_selfservice/FS-SelfService/cgi/process_payment.html

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index a64cfb5d7..2ce55a8e7 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -185,7 +185,30 @@ sub make_payment{
 
   my $custnum = $session->{'custnum'};
 
+  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+    or return { 'error' => "unknown custnum $custnum" };
+
+  if ( $p->{'save'} ) {
+    my $new = new FS::cust_main { $cust_main->hash };
+    $new->set( $_ => $p->{$_} )
+      foreach qw( payname address1 address2 city state zip payinfo );
+    $new->set( 'paydate' => $p->{'month'}. '-'. $p->{'year'} );
+    $new->set( 'payby' => $p->{'auto'} ? 'CARD' : 'DCRD' );
+    my $error = $new->replace($cust_main);
+    return { 'error' => $error } if $error;
+    $cust_main = $new;
+  }
+
+  my $error = $cust_main->realtime_bop( 'CC', $p->{'amount'}, quiet=>1,
+    'paydate' => $p->{'month'}. '-'. $p->{'year'},
+    map { $_ => $p->{$_} }
+      qw( payname address1 address2 city state zip payinfo )
+  );
+  return { 'error' => $error } if $error;
+
+  $cust_main->apply_payments;
 
+  return { 'error' => '' };
 
 }
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b162622a4..09c56474c 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1411,7 +1411,6 @@ sub collect {
 
 =item realtime_bop METHOD AMOUNT [ OPTION => VALUE ... ]
 
-
 Runs a realtime credit card, ACH (electronic check) or phone bill transaction
 via a Business::OnlinePayment realtime gateway.  See
 L<http://420.am/business-onlinepayment> for supported gateways.
@@ -1420,6 +1419,10 @@ Available methods are: I<CC>, I<ECHECK> and I<LEC>
 
 Available options are: I<description>, I<invnum>, I<quiet>
 
+The additional options I<payname>, I<address1>, I<address2>, I<city>, I<state>,
+I<zip>, I<payinfo> and I<paydate> are also available.  Any of these options,
+if set, will override the value from the customer record.
+
 I<description> is a free-text field passed to the gateway.  It defaults to
 "Internet services".
 
@@ -1443,6 +1446,11 @@ sub realtime_bop {
   eval "use Business::OnlinePayment";  
   die $@ if $@;
 
+  #overrides
+  $self->set( $_ => $options{$_} )
+    foreach grep { exists($options{$_}) }
+            qw( payname address1 address2 city state zip payinfo paydate );
+
   #load up config
   my $bop_config = 'business-onlinepayment';
   $bop_config .= '-ach'
@@ -1571,7 +1579,8 @@ sub realtime_bop {
     );
 
     my $cust_pay = new FS::cust_pay ( {
-       'invnum'   => $self->invnum, #!!!!!!!!
+       'custnum'  => $self->custnum,
+       'invnum'   => $options{'invnum'},
        'paid'     => $amount,
        '_date'     => '',
        'payby'    => $method2payby{$method},
diff --git a/fs_selfservice/FS-SelfService/cgi/make_payment.html b/fs_selfservice/FS-SelfService/cgi/make_payment.html
index 6adc0bde0..fdb411b11 100644
--- a/fs_selfservice/FS-SelfService/cgi/make_payment.html
+++ b/fs_selfservice/FS-SelfService/cgi/make_payment.html
@@ -31,7 +31,7 @@
     <SELECT NAME="card_type"><OPTION></OPTION>
       <%= foreach ( keys %card_types ) {
             $selected = $card_type eq $card_types{$_} ? ' SELECTED' : '';
-            $OUT .= qq(<OPTION$selected VALUE="). $card_types->{$_}. qq(">$_\n);
+            $OUT .= qq(<OPTION$selected VALUE="). $card_types{$_}. qq(">$_\n);
       } %>
     </SELECT>
   </TD>
@@ -104,7 +104,7 @@
   </TD>
 </TR><TR>
   <TD COLSPAN=2>
-    <INPUT TYPE="checkbox"<%= $payby eq 'CARD' ? ' CHECKED' : '' %> NAME="auto" VALUE="1">
+    <INPUT TYPE="checkbox"<%= $payby eq 'CARD' ? ' CHECKED' : '' %> NAME="auto" VALUE="1" onClick="if (this.checked) { document.OneTrueForm.save.checked=true; }">
     Charge future payments to this card automatically
   </TD>
 </TR>
diff --git a/fs_selfservice/FS-SelfService/cgi/process_payment.html b/fs_selfservice/FS-SelfService/cgi/process_payment.html
new file mode 100644
index 000000000..e4946dc8f
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/process_payment.html
@@ -0,0 +1,18 @@
+<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
+<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
+<%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<TABLE BORDER=0 CELLPADDING=4><TR><TD VALIGN="top" HEIGHT=384 BGCOLOR="#dddddd">
+<A HREF="<%= $url %>myaccount">MyAccount</A><BR>
+<!-- <A HREF="<%= $url %>other">SomethingElse</A><BR> -->
+</TD><TD VALIGN="top">
+<FONT SIZE=4>Payment results</FONT><BR><BR>
+<%= if ( $error ) {
+  $OUT .= qq!<FONT SIZE="+1" COLOR="#ff0000">Error processing your payment: $error</FONT!;
+} else {
+  $OUT .= 'Your payment was processed sucessfully.  Thank you.';
+} %>
+</TD></TR></TABLE>
+<HR>
+<FONT SIZE="-2">powered by <a href="http://www.sisd.com/freeside">freeside</a></FONT>
+</BODY></HTML>
+
diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
index 2ce2c8b6c..d43df4041 100644
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -96,6 +96,8 @@ sub make_payment {
 
 sub process_payment {
 
+  use Business::CreditCard;
+
   $cgi->param('amount') =~ /^\s*(\d+(\.\d{2})?)\s*$/
     or die "illegal amount"; #!!!
   my $amount = $1;
@@ -143,7 +145,7 @@ sub process_payment {
   $auto = 1 if $cgi->param('auto');
 
   $cgi->param('paybatch') =~ /^([\w\-\.]+)$/ or die "illegal paybatch";
-  my $patbatch = $1;
+  my $paybatch = $1;
 
   process_payment(
     'session_id' => $session_id,
-- 
cgit v1.2.1


From e2a51e422dbd070a4571f229f8e5c6929950d137 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 19 May 2003 13:54:55 +0000
Subject: fix up some bugs in processing payments via self-service... appears
 to be working so far

---
 FS/FS/ClientAPI/MyAccount.pm                        | 13 +++++++------
 fs_selfservice/FS-SelfService/SelfService.pm        | 17 +++++++++--------
 fs_selfservice/FS-SelfService/cgi/make_payment.html |  4 ++--
 fs_selfservice/FS-SelfService/cgi/selfservice.cgi   |  7 ++++---
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 2ce55a8e7..6e9bf23a9 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -17,11 +17,12 @@ use FS::cust_main_county;
 
 use FS::ClientAPI; #hmm
 FS::ClientAPI->register_handlers(
-  'MyAccount/login'         => \&login,
-  'MyAccount/customer_info' => \&customer_info,
-  'MyAccount/invoice'       => \&invoice,
-  'MyAccount/cancel'        => \&cancel,
-  'MyAccount/payment_info'  => \&payment_info,
+  'MyAccount/login'            => \&login,
+  'MyAccount/customer_info'    => \&customer_info,
+  'MyAccount/invoice'          => \&invoice,
+  'MyAccount/cancel'           => \&cancel,
+  'MyAccount/payment_info'     => \&payment_info,
+  'MyAccount/process_payment'  => \&process_payment,
 );
 
 #store in db?
@@ -175,7 +176,7 @@ sub payment_info {
 
 };
 
-sub make_payment{
+sub process_payment {
   my $p = shift;
 
   my $session = $cache->get($p->{'session_id'})
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index c561dabdb..5849b28d1 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -16,14 +16,15 @@ $VERSION = '0.03';
 $socket =  "/usr/local/freeside/selfservice_socket";
 
 %autoload = (
-  'passwd'        => 'passwd/passwd',
-  'chfn'          => 'passwd/passwd',
-  'chsh'          => 'passwd/passwd',
-  'login'         => 'MyAccount/login',
-  'customer_info' => 'MyAccount/customer_info',
-  'invoice'       => 'MyAccount/invoice',
-  'cancel'        => 'MyAccount/cancel',
-  'payment_info'  => 'MyAccount/payment_info',
+  'passwd'          => 'passwd/passwd',
+  'chfn'            => 'passwd/passwd',
+  'chsh'            => 'passwd/passwd',
+  'login'           => 'MyAccount/login',
+  'customer_info'   => 'MyAccount/customer_info',
+  'invoice'         => 'MyAccount/invoice',
+  'cancel'          => 'MyAccount/cancel',
+  'payment_info'    => 'MyAccount/payment_info',
+  'process_payment' => 'MyAccount/process_payment',
 );
 @EXPORT_OK = keys %autoload;
 
diff --git a/fs_selfservice/FS-SelfService/cgi/make_payment.html b/fs_selfservice/FS-SelfService/cgi/make_payment.html
index fdb411b11..1d860f08a 100644
--- a/fs_selfservice/FS-SelfService/cgi/make_payment.html
+++ b/fs_selfservice/FS-SelfService/cgi/make_payment.html
@@ -8,7 +8,7 @@
 <FONT SIZE=4>Make a payment</FONT><BR><BR>
 <FORM NAME="OneTrueForm" METHOD="POST" ACTION="<%=$selfurl%>" onSubmit="document.OneTrueForm.process.disabled=true">
 <INPUT TYPE="hidden" NAME="session" VALUE="<%=$session_id%>">
-<INPUT TYPE="hidden" NAME="action" VALUE="process_payment">
+<INPUT TYPE="hidden" NAME="action" VALUE="do_payment">
 <TABLE BGCOLOR="#cccccc">
 <TR>
   <TD ALIGN="right">Amount&nbsp;Due</TD>
@@ -110,7 +110,7 @@
 </TR>
 </TABLE>
 <BR>
-<INPUT TYPE="hidden" NAME="paybatch" VALUE="$paybatch">
+<INPUT TYPE="hidden" NAME="paybatch" VALUE="<%=$paybatch%>">
 <INPUT TYPE="submit" NAME="process" VALUE="Process payment"> <!-- onClick="this.disabled=true"> -->
 </FORM>
 </TD></TR></TABLE>
diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
index d43df4041..456d2dde2 100644
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -6,7 +6,8 @@ use subs qw(do_template);
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use Text::Template;
-use FS::SelfService qw(login customer_info invoice payment_info);
+use FS::SelfService qw( login customer_info invoice payment_info
+                        process_payment );
 
 $template_dir = '.';
 
@@ -54,7 +55,7 @@ if ( $cgi->param('session') eq 'login' ) {
 $session_id = $cgi->param('session');
 
 $cgi->param('action') =~
-    /^(myaccount|view_invoice|make_payment|process_payment)$/
+    /^(myaccount|view_invoice|make_payment|do_payment)$/
   or die "unknown action ". $cgi->param('action');
 my $action = $1;
 
@@ -94,7 +95,7 @@ sub make_payment {
   payment_info( 'session_id' => $session_id );
 }
 
-sub process_payment {
+sub do_payment {
 
   use Business::CreditCard;
 
-- 
cgit v1.2.1


From e354694764fb1442b6bc74a63189f094c51f1a89 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 20 May 2003 05:43:47 +0000
Subject: working self-service self-payments!

---
 FS/FS/ClientAPI/MyAccount.pm                         |  4 ++--
 FS/FS/cust_main.pm                                   | 20 +++++++++++++++-----
 fs_selfservice/FS-SelfService/cgi/make_payment.html  |  2 +-
 .../FS-SelfService/cgi/payment_results.html          | 18 ++++++++++++++++++
 .../FS-SelfService/cgi/process_payment.html          | 18 ------------------
 fs_selfservice/FS-SelfService/cgi/selfservice.cgi    |  4 ++--
 6 files changed, 38 insertions(+), 28 deletions(-)
 create mode 100644 fs_selfservice/FS-SelfService/cgi/payment_results.html
 delete mode 100644 fs_selfservice/FS-SelfService/cgi/process_payment.html

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 6e9bf23a9..e12e93b12 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -193,7 +193,7 @@ sub process_payment {
     my $new = new FS::cust_main { $cust_main->hash };
     $new->set( $_ => $p->{$_} )
       foreach qw( payname address1 address2 city state zip payinfo );
-    $new->set( 'paydate' => $p->{'month'}. '-'. $p->{'year'} );
+    $new->set( 'paydate' => $p->{'year'}. '-'. $p->{'month'}. '-01' );
     $new->set( 'payby' => $p->{'auto'} ? 'CARD' : 'DCRD' );
     my $error = $new->replace($cust_main);
     return { 'error' => $error } if $error;
@@ -201,7 +201,7 @@ sub process_payment {
   }
 
   my $error = $cust_main->realtime_bop( 'CC', $p->{'amount'}, quiet=>1,
-    'paydate' => $p->{'month'}. '-'. $p->{'year'},
+    'paydate' => $p->{'year'}. '-'. $p->{'month'}. '-01',
     map { $_ => $p->{$_} }
       qw( payname address1 address2 city state zip payinfo )
   );
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 09c56474c..7e2ff388e 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -33,7 +33,7 @@ use FS::Msgcat qw(gettext);
 
 @ISA = qw( FS::Record );
 
-$Debug = 0;
+$Debug = 1;
 #$Debug = 1;
 
 $import = 0;
@@ -761,10 +761,15 @@ sub check {
       unless $self->payby =~ /^(BILL|PREPAY|CHEK|LECB)$/;
     $self->paydate('');
   } else {
-    $self->paydate =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/
-      or return "Illegal expiration date: ". $self->paydate;
-    my $y = length($2) == 4 ? $2 : "20$2";
-    $self->paydate("$y-$1-01");
+    my( $m, $y );
+    if ( $self->paydate =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/ ) {
+      ( $m, $y ) = ( $1, length($2) == 4 ? $2 : "20$2" );
+    } elsif ( $self->paydate =~ /^(20)?(\d{2})[\/\-](\d{2})[\/\-]\d+$/ ) {
+      ( $m, $y ) = ( $3, "20$2" );
+    } else {
+      return "Illegal expiration date: ". $self->paydate;
+    }
+    $self->paydate("$y-$m-01");
     my($nowm,$nowy)=(localtime(time))[4,5]; $nowm++; $nowy+=1900;
     return gettext('expired_card')
       if !$import && ( $y<$nowy || ( $y==$nowy && $1<$nowm ) );
@@ -1438,6 +1443,11 @@ I<quiet> can be set true to surpress email decline notices.
 
 sub realtime_bop {
   my( $self, $method, $amount, %options ) = @_;
+  if ( $Debug ) {
+    warn "$self $method $amount\n";
+    warn "  $_ => $options{$_}\n" foreach keys %options;
+  }
+
   $options{'description'} ||= 'Internet services';
 
   #pre-requisites
diff --git a/fs_selfservice/FS-SelfService/cgi/make_payment.html b/fs_selfservice/FS-SelfService/cgi/make_payment.html
index 1d860f08a..a1cda6d49 100644
--- a/fs_selfservice/FS-SelfService/cgi/make_payment.html
+++ b/fs_selfservice/FS-SelfService/cgi/make_payment.html
@@ -8,7 +8,7 @@
 <FONT SIZE=4>Make a payment</FONT><BR><BR>
 <FORM NAME="OneTrueForm" METHOD="POST" ACTION="<%=$selfurl%>" onSubmit="document.OneTrueForm.process.disabled=true">
 <INPUT TYPE="hidden" NAME="session" VALUE="<%=$session_id%>">
-<INPUT TYPE="hidden" NAME="action" VALUE="do_payment">
+<INPUT TYPE="hidden" NAME="action" VALUE="payment_results">
 <TABLE BGCOLOR="#cccccc">
 <TR>
   <TD ALIGN="right">Amount&nbsp;Due</TD>
diff --git a/fs_selfservice/FS-SelfService/cgi/payment_results.html b/fs_selfservice/FS-SelfService/cgi/payment_results.html
new file mode 100644
index 000000000..92c8cf51b
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/payment_results.html
@@ -0,0 +1,18 @@
+<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
+<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
+<%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<TABLE BORDER=0 CELLPADDING=4><TR><TD VALIGN="top" HEIGHT=384 BGCOLOR="#dddddd">
+<A HREF="<%= $url %>myaccount">MyAccount</A><BR>
+<!-- <A HREF="<%= $url %>other">SomethingElse</A><BR> -->
+</TD><TD VALIGN="top">
+<FONT SIZE=4>Payment results</FONT><BR><BR>
+<%= if ( $error ) {
+  $OUT .= qq!<FONT SIZE="+1" COLOR="#ff0000">Error processing your payment: $error</FONT>!;
+} else {
+  $OUT .= 'Your payment was processed sucessfully.  Thank you.';
+} %>
+</TD></TR></TABLE>
+<HR>
+<FONT SIZE="-2">powered by <a href="http://www.sisd.com/freeside">freeside</a></FONT>
+</BODY></HTML>
+
diff --git a/fs_selfservice/FS-SelfService/cgi/process_payment.html b/fs_selfservice/FS-SelfService/cgi/process_payment.html
deleted file mode 100644
index e4946dc8f..000000000
--- a/fs_selfservice/FS-SelfService/cgi/process_payment.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
-<%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<TABLE BORDER=0 CELLPADDING=4><TR><TD VALIGN="top" HEIGHT=384 BGCOLOR="#dddddd">
-<A HREF="<%= $url %>myaccount">MyAccount</A><BR>
-<!-- <A HREF="<%= $url %>other">SomethingElse</A><BR> -->
-</TD><TD VALIGN="top">
-<FONT SIZE=4>Payment results</FONT><BR><BR>
-<%= if ( $error ) {
-  $OUT .= qq!<FONT SIZE="+1" COLOR="#ff0000">Error processing your payment: $error</FONT!;
-} else {
-  $OUT .= 'Your payment was processed sucessfully.  Thank you.';
-} %>
-</TD></TR></TABLE>
-<HR>
-<FONT SIZE="-2">powered by <a href="http://www.sisd.com/freeside">freeside</a></FONT>
-</BODY></HTML>
-
diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
index 456d2dde2..6d6716ddc 100644
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -55,7 +55,7 @@ if ( $cgi->param('session') eq 'login' ) {
 $session_id = $cgi->param('session');
 
 $cgi->param('action') =~
-    /^(myaccount|view_invoice|make_payment|do_payment)$/
+    /^(myaccount|view_invoice|make_payment|payment_results)$/
   or die "unknown action ". $cgi->param('action');
 my $action = $1;
 
@@ -95,7 +95,7 @@ sub make_payment {
   payment_info( 'session_id' => $session_id );
 }
 
-sub do_payment {
+sub payment_results {
 
   use Business::CreditCard;
 
-- 
cgit v1.2.1


From e58e375c39f08c28239ecc173cc3fbf3f5ca5b92 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 May 2003 08:45:33 +0000
Subject: doc

---
 httemplate/docs/ssh.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/httemplate/docs/ssh.html b/httemplate/docs/ssh.html
index 9716f1e86..d2c501e35 100755
--- a/httemplate/docs/ssh.html
+++ b/httemplate/docs/ssh.html
@@ -9,6 +9,7 @@
       <li>Append the newly-created <code>identity.pub</code> file to <code>~root/.ssh/authorized_keys</code> (or the appopriate <code>~username/.ssh/authorized_keys</code>) on the remote machine(s).
       <li>Some new SSH v2 implementation accept v2 style keys only.  Use the <code>-t</code> option to <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>, and append the created <code>id_dsa.pub</code> or <code>id_rsa.pub</code> to <code>~root/.ssh/authorized_keys2</code> (or the appopriate <code>~username/.ssh/authorized_keys</code>) on the remote machine(s).
       <li>You may need to set <code>PermitRootLogin without-password</code> (meaning with keys only) in your <code>sshd_config</code> file on the remote machine(s).
+      <li>You may want to set <code>ForwardX11 = no</code> in <code>~root/.ssh/config</code> to prevent spurious errors if your distribution turns on X11 forwarding by default.
     </ul>
 
 </body>
-- 
cgit v1.2.1


From 0ef12cb47ee609b04f54fb52e448c73ed3869ec1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 May 2003 09:22:53 +0000
Subject: sqlradius exports include "op" field

---
 FS/FS/part_export/sqlradius.pm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index ccf9a7687..60450ee63 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -187,11 +187,15 @@ sub sqlradius_insert { #subroutine, not method
     } else {
 
       my $i_sth = $dbh->prepare(
-        "INSERT INTO rad$table ( UserName, Attribute, Value ) ".
-          "VALUES ( ?, ?, ? )"
+        "INSERT INTO rad$table ( UserName, Attribute, op, Value ) ".
+          "VALUES ( ?, ?, ?, ? )"
       ) or die $dbh->errstr;
-      $i_sth->execute( $username, $attribute, $attributes{$attribute} )
-        or die $i_sth->errstr;
+      $i_sth->execute(
+        $username,
+        $attribute,
+        ( $attribute =~ /Password/i ? '==' : ':=' ),
+        $attributes{$attribute},
+      ) or die $i_sth->errstr;
 
     }
 
-- 
cgit v1.2.1


From 10435c0296ed4239e451503c60aa3412e58ef517 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 May 2003 09:40:54 +0000
Subject: force inclusion of httemplate/docs/man hierarchy

---
 httemplate/docs/man/FS/part_export/.cvs_is_on_crack | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 httemplate/docs/man/FS/part_export/.cvs_is_on_crack

diff --git a/httemplate/docs/man/FS/part_export/.cvs_is_on_crack b/httemplate/docs/man/FS/part_export/.cvs_is_on_crack
new file mode 100644
index 000000000..e69de29bb
-- 
cgit v1.2.1


From 745aca307ef43c0c9bd5d8ee78464f624acb7b3f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 2 Jun 2003 12:22:44 +0000
Subject: add last_bill field to manpage

---
 FS/FS/cust_pkg.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 9ab269503..9f20603bd 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -100,6 +100,8 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item bill - date (next bill date)
 
+=item last_bill - last bill date
+
 =item susp - date
 
 =item expire - date
-- 
cgit v1.2.1


From 4896baa43b4891f43810f618cec51156aabbf7ec Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 2 Jun 2003 14:51:30 +0000
Subject: UI nit

---
 httemplate/view/cust_main.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 3934a3dcb..3a0605635 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -20,7 +20,7 @@ print <<END;
 .package TH { font-size: medium }
 .package TR { font-size: smaller }
 .package .pkgnum { font-size: medium }
-.package .provision { font-size: larger; font-weight: bold }
+.package .provision { font-weight: bold }
 </STYLE>
 END
 
@@ -430,7 +430,7 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
 
   if ( $pkg->{cancel} ) { #status: cancelled
 
-    print '<TR><TD><FONT COLOR="#ff0000"><B>Cancelled</B>&nbsp;</FONT></TD>'.
+    print '<TR><TD><FONT COLOR="#ff0000"><B>Cancelled&nbsp;</B></FONT></TD>'.
           '<TD>'. pkg_datestr($pkg,'cancel'). '</TD></TR>';
     unless ( $pkg->{setup} ) {
       print '<TR><TD COLSPAN=2>Never billed</TD></TR>';
@@ -848,9 +848,12 @@ sub svc_label_link {
 
 sub svc_provision_link {
   my ($pkg, $svcpart) = (shift,shift) or return '';
+  ( my $svc_nbsp = $svcpart->{svc} ) =~ s/\s+/&nbsp;/g;
   return qq!<A CLASS="provision" HREF="${p1}/edit/$svcpart->{svcdb}.cgi?! .
          qq!pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}">! .
-         qq!Provision $svcpart->{svc} (! . ($svcpart->{quantity} - $svcpart->{count}) . qq!)</A>!;
+         "Provision&nbsp;$svc_nbsp&nbsp;(".
+         ($svcpart->{quantity} - $svcpart->{count}).
+         ')</A>';
 }
 
 sub svc_unprovision_link {
-- 
cgit v1.2.1


From b5e03a09e99ede045b0e3be87085c628d422e3ea Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 3 Jun 2003 05:49:16 +0000
Subject: router.svcnum nullability fix

---
 FS/bin/freeside-setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 518a2ad42..a1fab5fa0 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -1031,7 +1031,7 @@ sub tables_hash_hack {
       'columns' => [
         'routernum', 'serial', '', '',
         'routername', 'varchar', '', $char_d,
-        'svcnum', 'int', '0', '',
+        'svcnum', 'int', 'NULL', '',
       ],
       'primary_key' => 'routernum',
       'unique'      => [],
-- 
cgit v1.2.1


From a60b96753d5c615914fa766b2b0fe8bd2f86c337 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 3 Jun 2003 06:09:52 +0000
Subject: use serial for primary keys in new tables too

---
 FS/bin/freeside-setup | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index a1fab5fa0..d2a98dd0c 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -1031,7 +1031,7 @@ sub tables_hash_hack {
       'columns' => [
         'routernum', 'serial', '', '',
         'routername', 'varchar', '', $char_d,
-        'svcnum', 'int', 'NULL', '',
+        'svcnum', 'int', '0', '',
       ],
       'primary_key' => 'routernum',
       'unique'      => [],
@@ -1074,7 +1074,7 @@ sub tables_hash_hack {
 
     'addr_block' => {
       'columns' => [
-        'blocknum', 'int', '', '',
+        'blocknum', 'serial', '', '',
 	'routernum', 'int', '', '',
         'ip_gateway', 'varchar', '', 15,
         'ip_netmask', 'int', '', '',
@@ -1086,7 +1086,7 @@ sub tables_hash_hack {
 
     'part_sb_field' => {
       'columns' => [
-        'sbfieldpart', 'int', '', '',
+        'sbfieldpart', 'serial', '', '',
 	'svcpart', 'int', '', '',
 	'name', 'varchar', '', $char_d,
 	'length', 'int', '', '',
-- 
cgit v1.2.1


From dcf30bca55c04f22b752deab57a70ee710f2fd32 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 3 Jun 2003 06:10:07 +0000
Subject: slightly better upgrade docs

---
 httemplate/docs/upgrade10.html | 107 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 106 insertions(+), 1 deletion(-)

diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 6c4fe0c37..ce1eed416 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -1,5 +1,5 @@
 <pre>
-this is very incomplete
+this is incomplete
 
 install NetAddr::IP and Chart
 
@@ -12,6 +12,111 @@ CREATE TABLE cust_bill_pkg_detail (
 );
 CREATE INDEX cust_bill_pkg_detail1 ON cust_bill_pkg_detail ( pkgnum, invnum );
 
+CREATE TABLE router (
+  routernum serial,
+  routername varchar(80),
+  svcnum int,
+  PRIMARY KEY (routernum)
+);
+
+CREATE TABLE part_svc_router (
+  svcpart int NOT NULL,
+  routernum int NOT NULL
+);
+
+CREATE TABLE part_router_field (
+  routerfieldpart serial,
+  name varchar(80),
+  length int NOT NULL,
+  check_block text,
+  list_source text,
+  PRIMARY KEY (routerfieldpart)
+);
+
+CREATE TABLE router_field (
+  routerfieldpart int NOT NULL,
+  routernum int NOT NULL,
+  value varchar(128)
+);
+CREATE UNIQUE INDEX router_field1 ON router_field ( routerfieldpart, routernum );
+
+CREATE TABLE addr_block (
+  blocknum serial,
+  routernum int NOT NULL,
+  ip_gateway varchar(15) NOT NULL,
+  ip_netmask int NOT NULL,
+  PRIMARY KEY (blocknum)
+);
+CREATE UNIQUE INDEX addr_block1 ON addr_block ( blocknum, routernum );
+
+CREATE TABLE part_sb_field (
+  sbfieldpart serial,
+  svcpart int NOT NULL,
+  name varchar(80) NOT NULL,
+  length int NOT NULL,
+  check_block text NULL,
+  list_source text NULL,
+  PRIMARY key (sbfieldpart)
+);
+CREATE UNIQUE INDEX part_sb_field1 ON part_sb_field ( sbfieldpart, svcpart );
+
+CREATE TABLE sb_field (
+  sbfieldpart int NOT NULL,
+  svcnum int NOT NULL,
+  value varchar(128)
+)
+CREATE UNIQUE INDEX sb_field1 ON sb_field ( sbfieldpart, svcnum );
+
+CREATE TABLE svc_broadband (
+  svcnum int NOT NULL,
+  blocknum int NOT NULL,
+  speed_up int NOT NULL,
+  speed_down int NOT NULL,
+  ip_addr varchar(15),
+  PRIMARY KEY (svcnum)
+
+DELETE INDEX cust_bill_pkg1;
+
+ALTER TABLE cust_bill_pkg ADD itemdesc varchar(80) NULL;
+ALTER TABLE h_cust_bill_pkg ADD itemdesc varchar(80) NULL;
+ALTER TABLE cust_main_county ADD taxname varchar(80) NULL;
+ALTER TABLE h_cust_main_county ADD taxname varchar(80) NULL;
+ALTER TABLE cust_pkg ADD last_bill int NULL;
+ALTER TABLE h_cust_pkg ADD last_bill int NULL;
+
+DROP TABLE svc_acct_sm
+DROP TABLE h_svc_acct_sm
+
+dump database, edit:
+- cust_main: increase otaker from 8 to 32
+- cust_main: change ss from char(11) to varchar(11)
+- cust_credit: increase otaker from 8 to 32
+- cust_pkg: increase otaker from 8 to 32
+- cust_refund: increase otaker from 8 to 32
+- domain_record: increase reczone from 80 to 255
+- domain_record: change rectype from char to varchar
+- domain_record: increase recdata from 80 to 255
+then reload
+
 create all of the new broadband tables
 
+optionally:
+
+  CREATE INDEX cust_main6 ON cust_main ( daytime );
+  CREATE INDEX cust_main7 ON cust_main ( night );
+  CREATE INDEX cust_main8 ON cust_main ( fax );
+  CREATE INDEX cust_main9 ON cust_main ( ship_daytime );
+  CREATE INDEX cust_main10 ON cust_main ( ship_night );
+  CREATE INDEX cust_main11 ON cust_main ( ship_fax );
+
+  serial columns
+
+mandatory again:
+
+dbdef-create username
+create-history-tables username cust_bill_pkg_detail router part_svc_router part_router_field router_field addr_block part_sb_field sb_field svc_broadband
+dbdef-create username
+
+
+
 </pre>
-- 
cgit v1.2.1


From a618738fb37939ef95ac70e8b90fe298450c215b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 3 Jun 2003 07:54:57 +0000
Subject: upgrade docs

---
 httemplate/docs/upgrade10.html | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index ce1eed416..1035510db 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -1,7 +1,9 @@
 <pre>
 this is incomplete
 
-install NetAddr::IP and Chart
+install DBIx::DBSchema 0.21
+
+install NetAddr::IP and Chart::Base
 
 CREATE TABLE cust_bill_pkg_detail (
   detailnum serial,
@@ -64,7 +66,7 @@ CREATE TABLE sb_field (
   sbfieldpart int NOT NULL,
   svcnum int NOT NULL,
   value varchar(128)
-)
+);
 CREATE UNIQUE INDEX sb_field1 ON sb_field ( sbfieldpart, svcnum );
 
 CREATE TABLE svc_broadband (
@@ -74,6 +76,7 @@ CREATE TABLE svc_broadband (
   speed_down int NOT NULL,
   ip_addr varchar(15),
   PRIMARY KEY (svcnum)
+);
 
 DELETE INDEX cust_bill_pkg1;
 
@@ -84,9 +87,6 @@ ALTER TABLE h_cust_main_county ADD taxname varchar(80) NULL;
 ALTER TABLE cust_pkg ADD last_bill int NULL;
 ALTER TABLE h_cust_pkg ADD last_bill int NULL;
 
-DROP TABLE svc_acct_sm
-DROP TABLE h_svc_acct_sm
-
 dump database, edit:
 - cust_main: increase otaker from 8 to 32
 - cust_main: change ss from char(11) to varchar(11)
@@ -98,8 +98,6 @@ dump database, edit:
 - domain_record: increase recdata from 80 to 255
 then reload
 
-create all of the new broadband tables
-
 optionally:
 
   CREATE INDEX cust_main6 ON cust_main ( daytime );
-- 
cgit v1.2.1


From 306bbf9006e7867ec50342d6f931ab25eee01b2d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 3 Jun 2003 09:34:09 +0000
Subject: removing (very) deprecated import

---
 bin/svc_acct_sm.import | 262 -------------------------------------------------
 1 file changed, 262 deletions(-)
 delete mode 100755 bin/svc_acct_sm.import

diff --git a/bin/svc_acct_sm.import b/bin/svc_acct_sm.import
deleted file mode 100755
index b668405f5..000000000
--- a/bin/svc_acct_sm.import
+++ /dev/null
@@ -1,262 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# $Id: svc_acct_sm.import,v 1.10 2001-08-21 02:43:18 ivan Exp $
-
-use strict;
-use vars qw(%d_part_svc %m_part_svc);
-use Term::Query qw(query);
-use Net::SCP qw(iscp);
-use FS::UID qw(adminsuidsetup datasrc);
-use FS::Record qw(qsearch qsearchs);
-use FS::svc_acct_sm;
-use FS::svc_domain;
-use FS::svc_acct;
-use FS::part_svc;
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
-
-my(%mta) = (
-  1 => "qmail",
-  2 => "sendmail",
-);
-
-###
-
-%d_part_svc =
-  map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_domain'});
-%m_part_svc =
-  map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_acct_sm'});
-
-die "No services with svcdb svc_domain!\n" unless %d_part_svc;
-die "No services with svcdb svc_svc_acct_sm!\n" unless %m_part_svc;
-
-print "\n\n", 
-      ( join "\n", map "$_: ".$d_part_svc{$_}->svc, sort keys %d_part_svc ),
-      "\n\n";
-$^W=0; #Term::Query isn't -w-safe
-my $domain_svcpart = 
-  query "Enter part number for domains: ", 'irk', [ keys %d_part_svc ];
-$^W=1;
-
-print "\n\n", 
-      ( join "\n", map "$_: ".$m_part_svc{$_}->svc, sort keys %m_part_svc ),
-      "\n\n";
-$^W=0; #Term::Query isn't -w-safe
-my $mailalias_svcpart = 
-  query "Enter part number for mail aliases: ", 'irk', [ keys %m_part_svc ];
-$^W=1;
-
-print "\n\n", <<END;
-Select your MTA from the following list.
-END
-print join "\n", map "$_: $mta{$_}", sort keys %mta;
-print "\n\n";
-$^W=0; #Term::Query isn't -w-safe
-my $mta = query ":", 'irk', [ keys %mta ];
-$^W=1;
-
-if ( $mta{$mta} eq "qmail" ) {
-
-  print "\n\n", <<END;
-Enter the location and name of your qmail control directory, for example
-"mail.isp.com:/var/qmail/control"
-END
-  my($control)=&getvalue(":");
-  iscp("root\@$control/rcpthosts","$spooldir/rcpthosts.import");
-#  iscp("root\@$control/recipientmap","$spooldir/recipientmap.import");
-  iscp("root\@$control/virtualdomains","$spooldir/virtualdomains.import");
-
-#  print "\n\n", <<END;
-#Enter the name of the machine with your user .qmail files, for example
-#"mail.isp.com"
-#END
-#  print ":";
-#  my($shellmachine)=&getvalue;
-
-} elsif ( $mta{$mta} eq "sendmail" ) {
-
-  print "\n\n", <<END;
-Enter the location and name of your sendmail virtual user table, for example
-"mail.isp.com:/etc/virtusertable"
-END
-  my($virtusertable)=&getvalue(":");
-  iscp("root\@$virtusertable","$spooldir/virtusertable.import");
-
-  print "\n\n", <<END;
-Enter the location and name of your sendmail.cw file, for example
-"mail.isp.com:/etc/sendmail.cw"
-END
-  my($sendmail_cw)=&getvalue(":");
-  iscp("root\@$sendmail_cw","$spooldir/sendmail.cw.import");
-
-} else {
-  die "Unknown MTA!\n";
-}
-
-sub getvalue {
-  my $prompt = shift;
-  $^W=0; #Term::Query isn't -w-safe
-  my $data = query $prompt, '';
-  $^W=1;
-  $data;
-}
-
-print "\n\n";
-
-###
-
-$FS::svc_domain::whois_hack=1;
-$FS::svc_acct_sm::nossh_hack=1;
-
-if ( $mta{$mta} eq "qmail" ) {
-  open(RCPTHOSTS,"<$spooldir/rcpthosts.import")
-    or die "Can't open $spooldir/rcpthosts.import: $!";
-} elsif ( $mta{$mta} eq "sendmail" ) {
-  open(RCPTHOSTS,"<$spooldir/sendmail.cw.import")
-    or die "Can't open $spooldir/sendmail.cw.import: $!";
-} else {
-  die "Unknown MTA!\n";
-}
-
-my(%svcnum);
-
-while (<RCPTHOSTS>) {
-  next if /^(#|$)/;
-  next if $mta{$mta} eq 'sendmail' && /^\s*$/; #blank lines
-  /^\.?([\w\-\.]+)$/
-    #or do { warn "Strange rcpthosts/sendmail.cw line: $_"; next; };
-    or die "Strange rcpthosts/sendmail.cw line: $_";
-  my $domain = $1;
-  my($svc_domain);
-  unless ( $svc_domain = qsearchs('svc_domain', {'domain'=>$domain} ) ) {
-    $svc_domain = new FS::svc_domain ({
-      'domain'  => $domain,
-      'svcpart' => $domain_svcpart,
-      'action'  => 'N',
-    });
-    my $error = $svc_domain->insert;
-    #warn $error if $error;
-    die $error if $error;
-  }
-  $svcnum{$domain}=$svc_domain->svcnum;
-}
-close RCPTHOSTS; 
-
-#these two loops have enough similar parts they should probably be merged
-if ( $mta{$mta} eq "qmail" ) {
-
-  open(VD_FIX,">$spooldir/virtualdomains.FIX");
-  print VD_FIX "#!/usr/bin/perl\n";
-
-  open(VIRTUALDOMAINS,"<$spooldir/virtualdomains.import")
-    or die "Can't open $spooldir/virtualdomains.import: $!";
-  while (<VIRTUALDOMAINS>) {
-    next if /^#/;
-    /^\.?([\w\-\.]+):(\w+)(\-([\w\-\.]+))?$/
-      #or do { warn "Strange virtualdomains line: $_"; next; };
-      or die "Strange virtualdomains line: $_";
-    my($domain,$username,$dash_ext,$extension)=($1,$2,$3,$4);
-    $dash_ext ||= '';
-    $extension ||= '';
-    my($svc_acct)=qsearchs('svc_acct',{'username'=>$username});
-    unless ( $svc_acct ) {
-      #warn "Unknown user $username in virtualdomains; skipping\n";
-      #die "Unknown user $username in virtualdomains; skipping\n";
-      next;
-    }
-    if ( $domain ne $extension ) {
-      #warn "virtualdomains line $domain:$username$dash_ext changed to $domain:$username-$domain\n";
-      my($dir)=$svc_acct->dir;
-      my($qdomain)=$domain;
-      $qdomain =~ s/\./:/g; #see manpage for 'dot-qmail': EXTENSION ADDRESSES
-      #example to move .qmail files for virtual domains to their new location 
-      #dry run
-      #issh("root\@$shellmachine",'perl -e \'foreach $a (<'. $dir. '/.qmail'. $dash_ext. '-*>) { $old=$a; $a =~ s/\\.qmail'. $dash_ext. '\\-/\\.qmail\\-'. $qdomain. '\\-/; print " $old -> $a\n"; }\'');
-      #the real thing
-      #issh("root\@$shellmachine",'perl -e \'foreach $a (<'. $dir. '/.qmail'. $dash_ext. '-*>) { $old=$a; $a =~ s/\\.qmail'. $dash_ext. '\\-/\\.qmail\\-'. $qdomain. '\\-/; rename $old, $a; }\'');
-      print VD_FIX <<END;
-foreach \$file (<$dir/.qmail$dash_ext-*>) {
-  \$old = \$file;
-  \$file =~ s/\.qmail$dash_ext\-/\.qmail\-$qdomain\-/;
-  rename \$old, \$file;
-}
-END
-    }
-
-    unless ( exists $svcnum{$domain} ) {
-      my($svc_domain) = new FS::svc_domain ({
-        'domain'  => $domain,
-        'svcpart' => $domain_svcpart,
-        'action'  => 'N',
-      });
-      my $error = $svc_domain->insert;
-      #warn $error if $error;
-      die $error if $error;
-      $svcnum{$domain}=$svc_domain->svcnum;
-    }
-
-    my($svc_acct_sm)=new FS::svc_acct_sm ({
-      'domsvc'  => $svcnum{$domain},
-      'domuid'  => $svc_acct->uid,
-      'domuser' => '*',
-      'svcpart' => $mailalias_svcpart,
-    });
-    my($error)='';
-    $error=$svc_acct_sm->insert;
-    #warn $error if $error;
-    die $error, ", domain $domain" if $error;
-  }
-  close VIRTUALDOMAINS;
-  close VD_FIX;
-
-} elsif ( $mta{$mta} eq "sendmail" ) {
-
-  open(VIRTUSERTABLE,"<$spooldir/virtusertable.import")
-    or die "Can't open $spooldir/virtusertable.import: $!";
-  while (<VIRTUSERTABLE>) {
-    next if /^#/; #comments?
-    next if /^\s*$/; #blank lines
-    /^([\w\-\.]+)?\@([\w\-\.]+)\t+([\w\-\.]+)$/
-      #or do { warn "Strange virtusertable line: $_"; next; };
-      or die "Strange virtusertable line: $_";
-    my($domuser,$domain,$username)=($1,$2,$3);
-    my($svc_acct)=qsearchs('svc_acct',{'username'=>$username});
-    unless ( $svc_acct ) {
-      #warn "Unknown user $username in virtusertable";
-      die "Unknown user $username in virtusertable";
-      next;
-    }
-    my($svc_acct_sm)=new FS::svc_acct_sm ({
-      'domsvc'  => $svcnum{$domain},
-      'domuid'  => $svc_acct->uid,
-      'domuser' => $domuser || '*',
-      'svcpart' => $mailalias_svcpart,
-    });
-    my($error)='';
-    $error=$svc_acct_sm->insert;
-    #warn $error if $error;
-    die $error if $error;
-  }
-  close VIRTUSERTABLE;
-
-} else {
-  die "Unknown MTA!\n";
-}
-
-#open(RECIPIENTMAP,"<$spooldir/recipientmap.import");
-#close RECIPIENTMAP;
-
-print "\n\n", <<END if $mta{$mta} eq "qmail";
-Don\'t forget to run $spooldir/virtualdomains.FIX before using
-$spooldir/virtualdomains !
-END
-
-#
-
-sub usage {
-  die "Usage:\n\n  svc_acct_sm.import user\n";
-}
-
-- 
cgit v1.2.1


From 80fd40b3a6cfa53d7dee30dfaa61d89c2075a7c7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 3 Jun 2003 12:40:59 +0000
Subject: 1.5.0pre2 (too late, hehe)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 433563e36..eb762e157 100644
--- a/Makefile
+++ b/Makefile
@@ -58,8 +58,8 @@ SELFSERVICE_MACHINE = localhost
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.5.0pre1
-TAG=freeside_1_5_0pre1
+VERSION=1.5.0pre2
+TAG=freeside_1_5_0pre2
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
-- 
cgit v1.2.1


From 978b435880e71f6a4765525ea9797b7dc65bd625 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 3 Jun 2003 12:41:50 +0000
Subject: minor update to cp export - eliminate redundant "host" parameter

---
 FS/FS/part_export.pm    | 1 -
 FS/FS/part_export/cp.pm | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 9a1b9d864..06fab6ad1 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -692,7 +692,6 @@ tie my %cyrus_options, 'Tie::IxHash',
 ;
 
 tie my %cp_options, 'Tie::IxHash',
-  'host'      => { label=>'Hostname' },
   'port'      => { label=>'Port number' },
   'username'  => { label=>'Username' },
   'password'  => { label=>'Password' },
diff --git a/FS/FS/part_export/cp.pm b/FS/FS/part_export/cp.pm
index d998c1d95..c37dc3b98 100644
--- a/FS/FS/part_export/cp.pm
+++ b/FS/FS/part_export/cp.pm
@@ -42,7 +42,7 @@ sub cp_queue {
     'job'    => 'FS::part_export::cp::cp_command',
   };
   $queue->insert(
-    $self->option('host'),
+    $self->machine,
     $self->option('port'),
     $self->option('username'),
     $self->option('password'),
-- 
cgit v1.2.1


From 43b604bc300b40f8fad5191b805952dd543251f7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 3 Jun 2003 13:53:28 +0000
Subject: fix provision links

---
 httemplate/view/cust_main.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 3a0605635..4fe60fe79 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -849,7 +849,7 @@ sub svc_label_link {
 sub svc_provision_link {
   my ($pkg, $svcpart) = (shift,shift) or return '';
   ( my $svc_nbsp = $svcpart->{svc} ) =~ s/\s+/&nbsp;/g;
-  return qq!<A CLASS="provision" HREF="${p1}/edit/$svcpart->{svcdb}.cgi?! .
+  return qq!<A CLASS="provision" HREF="${p}edit/$svcpart->{svcdb}.cgi?! .
          qq!pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}">! .
          "Provision&nbsp;$svc_nbsp&nbsp;(".
          ($svcpart->{quantity} - $svcpart->{count}).
-- 
cgit v1.2.1


From 4bf86e5f7f44e77159564804d09e0938a8edc905 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Jun 2003 12:44:57 +0000
Subject: fix last bill label

---
 httemplate/search/cust_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 538edf3f1..12179eaca 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -196,7 +196,7 @@ if ( scalar(@cust_pkg) == 1 ) {
         <TH><FONT SIZE=-1>Setup</FONT></TH>
 END
 
-  print '<TH><FONT SIZE=-1>Next<BR>bill</FONT></TH>'
+  print '<TH><FONT SIZE=-1>Last<BR>bill</FONT></TH>'
     if defined dbdef->table('cust_pkg')->column('last_bill');
 
   print <<END;
-- 
cgit v1.2.1


From f6aa1cedd7da9198a9ccf7e1acfb786612993ced Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Jun 2003 16:14:38 +0000
Subject: allow empty slipip's

---
 FS/FS/svc_acct.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 497e59c94..282ef5aab 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -783,12 +783,14 @@ sub check {
   $recref->{quota} = $1;
 
   unless ( $part_svc->part_svc_column('slipip')->columnflag eq 'F' ) {
-    unless ( $recref->{slipip} eq '0e0' ) {
+    if ( $recref->{slipip} eq '' ) {
+      $recref->{slipip} = '';
+    } elsif ( $recref->{slipip} eq '0e0' ) {
+      $recref->{slipip} = '0e0';
+    } else {
       $recref->{slipip} =~ /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/
         or return "Illegal slipip: ". $self->slipip;
       $recref->{slipip} = $1;
-    } else {
-      $recref->{slipip} = '0e0';
     }
 
   }
-- 
cgit v1.2.1


From 9bb4c3a8b4cc5313049ad043d2798e37ee210ae6 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Thu, 5 Jun 2003 00:22:48 +0000
Subject: order/cancel packages rewritten

---
 FS/FS/cust_pkg.pm | 231 +++++++++++++++++++++++-------------------------------
 1 file changed, 96 insertions(+), 135 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 9f20603bd..a423c5518 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -605,6 +605,61 @@ sub attribute_since_sqlradacct {
 
 }
 
+=item transfer DEST_PKGNUM
+
+Transfers as many services as possible from this package to another package.
+The destination package must already exist.  Services are moved only if 
+the destination allows services with the correct I<svcnum> (not svcdb).  
+Any services that can't be moved remain in the original package.
+
+Returns an error, if there is one; otherwise, returns the number of services 
+that couldn't be moved.
+
+=cut
+
+sub transfer {
+  my ($self, $dest_pkgnum) = @_;
+
+  my $remaining = 0;
+  my $dest;
+  my %target;
+  my $pkg_svc;
+
+  if (ref ($dest_pkgnum) eq 'FS::cust_pkg') {
+    $dest = $dest_pkgnum;
+    $dest_pkgnum = $dest->pkgnum;
+  } else {
+    $dest = qsearchs('cust_pkg', { pkgnum => $dest_pkgnum });
+  }
+
+  return ('Package does not exist: '.$dest_pkgnum) unless $dest;
+
+  foreach $pkg_svc (qsearch('pkg_svc', { pkgpart => $dest->pkgpart })) {
+    $target{$pkg_svc->svcpart} = $pkg_svc->quantity;
+  }
+
+  my $cust_svc;
+
+  foreach $cust_svc ($dest->cust_svc) {
+    $target{$cust_svc->svcpart}--;
+  }
+
+  foreach $cust_svc ($self->cust_svc) {
+    if($target{$cust_svc->svcpart} > 0) {
+      $target{$cust_svc->svcpart}--;
+      my $new = new FS::cust_svc {
+          svcnum  => $cust_svc->svcnum,
+          svcpart => $cust_svc->svcpart,
+          pkgnum  => $dest_pkgnum };
+      my $error = $new->replace($cust_svc);
+      return $error if $error;
+    } else {
+      $remaining++
+    }
+  }
+  return $remaining;
+}
+
 =back
 
 =head1 SUBROUTINES
@@ -631,156 +686,62 @@ newly-created cust_pkg objects.
 =cut
 
 sub order {
-  my($custnum, $pkgparts, $remove_pkgnums, $return_cust_pkg) = @_;
-  $remove_pkgnums = [] unless defined($remove_pkgnums);
 
+  # Rewritten to make use of the transfer() method, and in general 
+  # to not suck so badly.
+
+  my ($custnum, $pkgparts, $remove_pkgnum, $return_cust_pkg) = @_;
+
+  # Transactionize this whole mess
   my $oldAutoCommit = $FS::UID::AutoCommit;
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  # generate %part_pkg
-  # $part_pkg{$pkgpart} is true iff $custnum may purchase $pkgpart
-  #
-  my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
-  my($agent)=qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
-  my %part_pkg = %{ $agent->pkgpart_hashref };
-
-  my(%svcnum);
-  # generate %svcnum
-  # for those packages being removed:
-  #@{ $svcnum{$svcpart} } goes from a svcpart to a list of FS::cust_svc objects
-  my($pkgnum);
-  foreach $pkgnum ( @{$remove_pkgnums} ) {
-    foreach my $cust_svc (qsearch('cust_svc',{'pkgnum'=>$pkgnum})) {
-      push @{ $svcnum{$cust_svc->getfield('svcpart')} }, $cust_svc;
-    }
-  }
-  
-  my @cust_svc;
-  #generate @cust_svc
-  # for those packages the customer is purchasing:
-  # @{$pkgparts} is a list of said packages, by pkgpart
-  # @cust_svc is a corresponding list of lists of FS::Record objects
-  foreach my $pkgpart ( @{$pkgparts} ) {
-    unless ( $part_pkg{$pkgpart} ) {
+  my $error;
+  my $cust_main = qsearchs('cust_main', { custnum => $custnum });
+  return "Customer not found: $custnum" unless $cust_main;
+
+  # Create the new packages.
+  my $cust_pkg;
+  foreach (@$pkgparts) {
+    $cust_pkg = new FS::cust_pkg { custnum => $custnum,
+                                   pkgpart => $_ };
+    $error = $cust_pkg->insert;
+    if ($error) {
       $dbh->rollback if $oldAutoCommit;
-      return "Customer not permitted to purchase pkgpart $pkgpart!";
+      return $error;
     }
-    push @cust_svc, [
-      map {
-        ( $svcnum{$_} && @{ $svcnum{$_} } ) ? shift @{ $svcnum{$_} } : ();
-      } map { $_->svcpart }
-          qsearch('pkg_svc', { pkgpart  => $pkgpart,
-                               quantity => { op=>'>', value=>'0', } } )
-    ];
+    push @$return_cust_pkg, $cust_pkg;
   }
-
-  #special-case until this can be handled better
-  # move services to new svcparts - even if the svcparts don't match (svcdb
-  # needs to...)
-  # looks like they're moved in no particular order, ewwwwwwww
-  # and looks like just one of each svcpart can be moved... o well
-
-  #start with still-leftover services
-  #foreach my $svcpart ( grep { scalar(@{ $svcnum{$_} }) } keys %svcnum ) {
-  foreach my $svcpart ( keys %svcnum ) {
-    next unless @{ $svcnum{$svcpart} };
-
-    my $svcdb = $svcnum{$svcpart}->[0]->part_svc->svcdb;
-
-    #find an empty place to put one
-    my $i = 0;
-    foreach my $pkgpart ( @{$pkgparts} ) {
-      my @pkg_svc =
-        qsearch('pkg_svc', { pkgpart  => $pkgpart,
-                             quantity => { op=>'>', value=>'0', } } );
-      #my @pkg_svc =
-      #  grep { $_->quantity > 0 } qsearch('pkg_svc', { pkgpart=>$pkgpart } );
-      if ( ! @{$cust_svc[$i]} #find an empty place to put them with 
-           && grep { $svcdb eq $_->part_svc->svcdb } #with appropriate svcdb
-                @pkg_svc
-      ) {
-        my $new_svcpart =
-          ( grep { $svcdb eq $_->part_svc->svcdb } @pkg_svc )[0]->svcpart; 
-        my $cust_svc = shift @{$svcnum{$svcpart}};
-        $cust_svc->svcpart($new_svcpart);
-        #warn "changing from $svcpart to $new_svcpart!!!\n";
-        $cust_svc[$i] = [ $cust_svc ];
+  # $return_cust_pkg now contains refs to all of the newly 
+  # created packages.
+
+  # Transfer services and cancel old packages.
+  foreach my $old_pkgnum (@$remove_pkgnum) {
+    my $old_pkg = qsearchs ('cust_pkg', { pkgnum => $old_pkgnum });
+    foreach my $new_pkg (@$return_cust_pkg) {
+      $error = $old_pkg->transfer($new_pkg);
+      if ($error and $error == 0) {
+        # $old_pkg->transfer failed.
+	$dbh->rollback if $oldAutoCommit;
+	return $error;
       }
-      $i++;
     }
-
-  }
-  
-  #check for leftover services
-  foreach (keys %svcnum) {
-    next unless @{ $svcnum{$_} };
-    $dbh->rollback if $oldAutoCommit;
-    return "Leftover services, svcpart $_: svcnum ".
-           join(', ', map { $_->svcnum } @{ $svcnum{$_} } );
-  }
-
-  #no leftover services, let's make changes.
- 
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE'; 
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE'; 
-  local $SIG{PIPE} = 'IGNORE'; 
-
-  #first cancel old packages
-  foreach my $pkgnum ( @{$remove_pkgnums} ) {
-    my($old) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-    unless ( $old ) {
+    if ($error > 0) {
+      # Transfers were successful, but we went through all of the 
+      # new packages and still had services left on the old package.
+      # We can't cancel the package under the circumstances, so abort.
       $dbh->rollback if $oldAutoCommit;
-      return "Package $pkgnum not found to remove!";
+      return "Unable to transfer all services from package ".$old_pkg->pkgnum;
     }
-    my(%hash) = $old->hash;
-    $hash{'cancel'}=time;   
-    my($new) = new FS::cust_pkg ( \%hash );
-    my($error)=$new->replace($old);
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "Couldn't update package $pkgnum: $error";
+    $error = $old_pkg->cancel;
+    if ($error) {
+      $dbh->rollback;
+      return $error;
     }
   }
-
-  #now add new packages, changing cust_svc records if necessary
-  my $pkgpart;
-  while ($pkgpart=shift @{$pkgparts} ) {
- 
-    my $new = new FS::cust_pkg {
-                                 'custnum' => $custnum,
-                                 'pkgpart' => $pkgpart,
-                               };
-    my $error = $new->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "Couldn't insert new cust_pkg record: $error";
-    }
-    push @{$return_cust_pkg}, $new if $return_cust_pkg;
-    my $pkgnum = $new->pkgnum;
- 
-    foreach my $cust_svc ( @{ shift @cust_svc } ) {
-      my(%hash) = $cust_svc->hash;
-      $hash{'pkgnum'}=$pkgnum;
-      my $new = new FS::cust_svc ( \%hash );
-
-      #avoid Record diffing missing changed svcpart field from above.
-      my $old = qsearchs('cust_svc', { 'svcnum' => $cust_svc->svcnum } );
-
-      my $error = $new->replace($old);
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "Couldn't link old service to new package: $error";
-      }
-    }
-  }  
-
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  ''; #no errors
+  '';
 }
 
 =back
-- 
cgit v1.2.1


From d2a32e633b46e7e248c593c5de6fc598de2b32cb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 6 Jun 2003 04:42:04 +0000
Subject: database profiling bs i should just switch to mason

---
 htetc/global.asa | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htetc/global.asa b/htetc/global.asa
index 5fd89957f..555364223 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -126,7 +126,9 @@ sub Script_OnFlush {
   }
 }
 
-if ( defined(@DBIx::Profile::ISA) && DBIx::Profile::db->can('sprintProfile') ) {
+#if ( defined(@DBIx::Profile::ISA) && DBIx::Profile::db->can('sprintProfile') ) {
+#if ( defined(@DBIx::Profile::ISA) && UNIVERSAL::can('DBIx::Profile::db', 'sprintProfile') ) {
+if ( defined(@DBIx::Profile::ISA) ) {
 
   #warn "enabling profiling redirects";
   *CGI::redirect = sub {
-- 
cgit v1.2.1


From fc970220d488dfbcf2f7a4b1c7ae6b7618af1ecc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 6 Jun 2003 10:49:59 +0000
Subject: add suspend/unsuspend capability to CP export

---
 FS/FS/part_export/cp.pm | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/FS/FS/part_export/cp.pm b/FS/FS/part_export/cp.pm
index c37dc3b98..ee5f54285 100644
--- a/FS/FS/part_export/cp.pm
+++ b/FS/FS/part_export/cp.pm
@@ -10,10 +10,10 @@ sub rebless { shift; }
 sub _export_insert {
   my( $self, $svc_acct ) = (shift, shift);
   $self->cp_queue( $svc_acct->svcnum, 'create_mailbox',
-    Mailbox   => $svc_acct->username,
-    Password  => $svc_acct->_password,
-    Workgroup => $self->option('workgroup'),
-    Domain    => $svc_acct->domain,
+    'Mailbox'   => $svc_acct->username,
+    'Password'  => $svc_acct->_password,
+    'Workgroup' => $self->option('workgroup'),
+    'Domain'    => $svc_acct->domain,
   );
 }
 
@@ -30,8 +30,30 @@ sub _export_replace {
 sub _export_delete {
   my( $self, $svc_acct ) = (shift, shift);
   $self->cp_queue( $svc_acct->svcnum, 'delete_mailbox',
-    Mailbox   => $svc_acct->username,
-    Domain    => $svc_acct->domain,
+    'Mailbox'   => $svc_acct->username,
+    'Domain'    => $svc_acct->domain,
+  );
+}
+
+sub _export_suspend {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->cp_queue( $svc_acct->svcnum, 'set_mailbox_status',
+    'Mailbox'       => $svc_acct->username,
+    'Domain'        => $svc_acct->domain,
+    'OTHER'         => 'T',
+    'OTHER_SUSPEND' => 'T',
+  );
+}
+
+sub _export_unsuspend {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->cp_queue( $svc_acct->svcnum, 'set_mailbox_status',
+    'Mailbox'       => $svc_acct->username,
+    'Domain'        => $svc_acct->domain,
+    'PAYMENT'       => 'F',
+    'OTHER'         => 'F',
+    'OTHER_SUSPEND' => 'F',
+    'OTHER_BOUNCE'  => 'F',
   );
 }
 
-- 
cgit v1.2.1


From d5da3d1db2e73288cb15b8dbd6e3c34d54eb0faa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 7 Jun 2003 01:42:52 +0000
Subject: require Time::Local 1.04 on perls before 5.6

---
 FS/FS/cust_main.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 7e2ff388e..923de00c4 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -4,6 +4,7 @@ use strict;
 use vars qw( @ISA $conf $Debug $import );
 use Safe;
 use Carp;
+BEGIN { eval "use Time::Local 1.05;" if $] < 5.006; };
 use Time::Local qw(timelocal_nocheck);
 use Date::Format;
 #use Date::Manip;
-- 
cgit v1.2.1


From 82b6a3add627d151f749bc26d170e6bb4b80d526 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 7 Jun 2003 01:47:23 +0000
Subject: give a better error message regarding Time::Local on old perls. 
 really.

---
 FS/FS/cust_main.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 923de00c4..0176c7723 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -4,8 +4,10 @@ use strict;
 use vars qw( @ISA $conf $Debug $import );
 use Safe;
 use Carp;
-BEGIN { eval "use Time::Local 1.05;" if $] < 5.006; };
-use Time::Local qw(timelocal_nocheck);
+BEGIN {
+  eval "use Time::Local 1.05;" if $] < 5.006;
+  eval "use Time::Local qw(timelocal_nocheck);";
+}
 use Date::Format;
 #use Date::Manip;
 use Business::CreditCard;
-- 
cgit v1.2.1


From 9533cf0292866372f32a80e61ea590f20005bf74 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 7 Jun 2003 01:57:33 +0000
Subject: really, really give a better error message when used under 5.005 now.
  really.

---
 FS/FS/cust_main.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 0176c7723..079583a9a 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -5,7 +5,9 @@ use vars qw( @ISA $conf $Debug $import );
 use Safe;
 use Carp;
 BEGIN {
-  eval "use Time::Local 1.05;" if $] < 5.006;
+  eval "use Time::Local;";
+  die "Time::Local version 1.05 with Perl versions before 5.6"
+    if $] < 5.006 && !defined($Time::Local::VERSION);
   eval "use Time::Local qw(timelocal_nocheck);";
 }
 use Date::Format;
-- 
cgit v1.2.1


From 6c0c9e76ef87a5600496debb2c0a53332b5ac5f5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 7 Jun 2003 01:58:45 +0000
Subject: and fix the error message

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 079583a9a..533c630f2 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -6,7 +6,7 @@ use Safe;
 use Carp;
 BEGIN {
   eval "use Time::Local;";
-  die "Time::Local version 1.05 with Perl versions before 5.6"
+  die "Time::Local version 1.05 required with Perl versions before 5.6"
     if $] < 5.006 && !defined($Time::Local::VERSION);
   eval "use Time::Local qw(timelocal_nocheck);";
 }
-- 
cgit v1.2.1


From 9bdd5507fab070864ecc3ebacd1f8c7f8a0b9b3c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Jun 2003 00:59:21 +0000
Subject: documentation update from "Jesse D. Guardiani" <jesse@wingnet.net>,
 thanks

---
 httemplate/docs/install.html | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 533decb7b..54614ccb3 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -144,9 +144,14 @@ PerlSetVar Debug 2
     </ul></td>
     <td><ul>
       <li>Run <tt>make masondocs</tt>
-      <li>Copy <tt>masondocs/</tt> to your web server's document space.
-      <li>Copy <tt>htetc/handler.pl</tt> to an appropriate directory (use htetc/handler.pl-1.0x for Mason versions before 1.10).
-      <li>Edit <tt>handler.pl</tt> and set an appropriate <tt>data_dir</tt>, such as <tt>/usr/local/etc/freeside/masondata</tt>
+      <li>Copy <tt>masondocs/</tt> to your web server's document space. (For example: <tt>/usr/local/apache/htdocs/freeside-mason</tt>)
+      <li>Copy <tt>htetc/handler.pl</tt> to <tt>/usr/local/etc/freeside</tt> (use htetc/handler.pl-1.0x for Mason versions before 1.10).
+      <li>Edit <tt>handler.pl</tt> and:
+      <ul>
+        <li> set an appropriate <tt>comp_root</tt>, such as <tt>/usr/local/apache/htdocs/freeside-mason</tt>
+        <li> set an appropriate <tt>data_dir</tt>, such as <tt>/usr/local/etc/freeside/masondata</tt>
+      </ul>
+
       <li>Configure Apache to use the <tt>handler.pl</tt> file and to execute .cgi files using HTML::Mason.  For example:
 <font size="-1"><pre>
 PerlModule HTML::Mason
-- 
cgit v1.2.1


From 19270ddc47dead26e94d01a78dd4a5e8313ffdac Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Jun 2003 11:11:21 +0000
Subject: add "$ignore_quantity" bypass

---
 FS/FS/cust_svc.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 8ac806519..c0cb6f4e9 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -1,7 +1,7 @@
 package FS::cust_svc;
 
 use strict;
-use vars qw( @ISA );
+use vars qw( @ISA $ignore_quantity );
 use Carp qw( cluck );
 use FS::Record qw( qsearch qsearchs dbh );
 use FS::cust_pkg;
@@ -17,6 +17,8 @@ use FS::part_export;
 
 @ISA = qw( FS::Record );
 
+$ignore_quantity = 0;
+
 sub _cache {
   my $self = shift;
   my ( $hashref, $cache ) = @_;
@@ -229,7 +231,7 @@ sub check {
     });
     return "Already ". scalar(@cust_svc). " ". $part_svc->svc.
            " services for pkgnum ". $self->pkgnum
-      if scalar(@cust_svc) >= $quantity;
+      if scalar(@cust_svc) >= $quantity && (!$ignore_quantity || !$quantity);
   }
 
   ''; #no error
-- 
cgit v1.2.1


From f012a5c9f502bc480414686b44c41df0b27c8b2f Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 11 Jun 2003 19:13:43 +0000
Subject: We're passing a list here, not one argument.

---
 FS/FS/Misc.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm
index 56dc72e36..1f951595a 100644
--- a/FS/FS/Misc.pm
+++ b/FS/FS/Misc.pm
@@ -54,7 +54,7 @@ FS::UID->install_callback( sub {
 } );
 
 sub send_email {
-  my(%options) = shift;
+  my(%options) = @_;
 
   $ENV{MAILADDRESS} = $options{'from'};
   my $to = ref($options{to}) ? join(', ', @{ $options{to} } ) : $options{to};
-- 
cgit v1.2.1


From 0bdae1eced79650fd64c66cdf2107a8f2d0b9067 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 11 Jun 2003 20:27:18 +0000
Subject: In scalar context, smtpsend returns the number of addresses that the
 message was successfully delivered to.  I'm assuming 'Debug' causes Net::SMTP
 to warn the debug output, not return it.

---
 FS/FS/Misc.pm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm
index 1f951595a..efad2dfd6 100644
--- a/FS/FS/Misc.pm
+++ b/FS/FS/Misc.pm
@@ -77,9 +77,16 @@ sub send_email {
 
   my $smtpmachine = $conf->config('smtpmachine');
   $!=0;
-  $message->smtpsend( 'Host' => $smtpmachine )
-    or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-      or return "can't send email to $to via server $smtpmachine with SMTP: $!";
+
+  my $rv = $message->smtpsend( 'Host' => $smtpmachine )
+    or $message->smtpsend( Host => $smtpmachine, Debug => 1 );
+
+  if ($rv) { #smtpsend returns a list of addresses, not true/false
+    return '';
+  } else {
+    return "can't send email to $to via server $smtpmachine with SMTP: $!";
+  }  
+
 }
 
 =head1 BUGS
-- 
cgit v1.2.1


From 1e40dbcd2cc56ab3a0c548dab5a75b5ff1360b69 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Jun 2003 12:43:27 +0000
Subject: sqlradius doc update; don't need to allow null OP columns

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 06fab6ad1..4e3326442 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -890,7 +890,7 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
       'desc' => 'Real-time export to SQL-backed RADIUS (ICRADIUS, FreeRADIUS)',
       'options' => \%sqlradius_options,
       'nodomain' => 'Y',
-      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.23/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.  If using <a href="http://www.freeradius.org/">FreeRADIUS</a> 0.5 or above, make sure your <b>op</b> fields are set to allow NULL values.',
+      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.23/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.',
     },
 
     'sqlmail' => {
-- 
cgit v1.2.1


From faea8c040128dcace598fb224cf9f7e9a2e256c9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Jun 2003 12:57:44 +0000
Subject: _default_ default now sets GECOS like the OS-defaults

---
 FS/FS/part_export.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 4e3326442..9330a925d 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -548,7 +548,7 @@ tie my %shellcommands_options, 'Tie::IxHash',
   #'machine' => { label=>'Remote machine' },
   'user' => { label=>'Remote username', default=>'root' },
   'useradd' => { label=>'Insert command',
-                 default=>'useradd -d $dir -m -s $shell -u $uid -p $crypt_password $username'
+                 default=>'useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username'
                 #default=>'cp -pr /etc/skel $dir; chown -R $uid.$gid $dir'
                },
   'useradd_stdin' => { label=>'Insert command STDIN',
@@ -564,7 +564,7 @@ tie my %shellcommands_options, 'Tie::IxHash',
                        default=>'',
                      },
   'usermod' => { label=>'Modify command',
-                 default=>'usermod -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username',
+                 default=>'usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username',
                 #default=>'[ -d $old_dir ] && mv $old_dir $new_dir || ( '.
                  #  'chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; '.
                  #  'find . -depth -print | cpio -pdm $new_dir; '.
-- 
cgit v1.2.1


From b77d5769face5c38dd34c37e98a8fce47c4e15de Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Jun 2003 13:32:15 +0000
Subject: adding fix-sequences

---
 bin/fix-sequences | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100755 bin/fix-sequences

diff --git a/bin/fix-sequences b/bin/fix-sequences
new file mode 100755
index 000000000..f193e21d4
--- /dev/null
+++ b/bin/fix-sequences
@@ -0,0 +1,55 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use DBI;
+use DBIx::DBSchema 0.21;
+use DBIx::DBSchema::Table;
+use DBIx::DBSchema::Column;
+use DBIx::DBSchema::ColGroup::Unique;
+use DBIx::DBSchema::ColGroup::Index;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(dbdef);
+
+my $user = shift or die &usage;
+my $dbh = adminsuidsetup $user;
+
+my $schema = dbdef();
+
+#false laziness w/fs-setup
+my @tables = scalar(@ARGV)
+               ? @ARGV
+               : grep { ! /^h_/ } $schema->tables;
+foreach my $table ( @tables ) {
+  my $tableobj = $schema->table($table)
+    or die "unknown table $table (did you run dbdef-create?)\n";
+
+  my $primary_key = $tableobj->primary_key;
+  next unless $primary_key;
+
+  my $col = $tableobj->column($primary_key);
+
+  next unless uc($col->type) eq 'SERIAL'
+              || ( driver_name eq 'Pg'
+                     && defined($col->default)
+                     && $col->default =~ /^nextval\(/i
+                 )
+              || ( driver_name eq 'mysql'
+                     && defined($col->local)
+                     && $col->local =~ /AUTO_INCREMENT/i
+                 );
+
+  warn "fixing sequence for $table\n";
+
+  $dbh->do( "SELECT setval( '${table}_${primary_key}_seq',
+                            ( SELECT max($primary_key) FROM $table ) );" )
+    or die $dbh->errstr;
+
+}
+
+$dbh->commit or die $dbh->errstr;
+$dbh->disconnect or die $dbh->errstr;
+
+sub usage {
+  die "Usage:\n  create-history-tables user [ table table ... ] \n";
+}
+
-- 
cgit v1.2.1


From 232897b9389df4dca4773873e6e5d638ac5e8c4b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Jun 2003 13:35:42 +0000
Subject: moo

---
 bin/fix-sequences | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/fix-sequences b/bin/fix-sequences
index f193e21d4..be240226f 100755
--- a/bin/fix-sequences
+++ b/bin/fix-sequences
@@ -7,7 +7,7 @@ use DBIx::DBSchema::Table;
 use DBIx::DBSchema::Column;
 use DBIx::DBSchema::ColGroup::Unique;
 use DBIx::DBSchema::ColGroup::Index;
-use FS::UID qw(adminsuidsetup);
+use FS::UID qw(adminsuidsetup driver_name);
 use FS::Record qw(dbdef);
 
 my $user = shift or die &usage;
@@ -50,6 +50,6 @@ $dbh->commit or die $dbh->errstr;
 $dbh->disconnect or die $dbh->errstr;
 
 sub usage {
-  die "Usage:\n  create-history-tables user [ table table ... ] \n";
+  die "Usage:\n  fix-sequences user [ table table ... ] \n";
 }
 
-- 
cgit v1.2.1


From 1957a30d2616acadba23324b764eb03ba008b590 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Jun 2003 13:43:13 +0000
Subject: update for long table names; use sequence name directly instead of
 guessing

---
 bin/fix-sequences | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bin/fix-sequences b/bin/fix-sequences
index be240226f..55639d962 100755
--- a/bin/fix-sequences
+++ b/bin/fix-sequences
@@ -28,6 +28,7 @@ foreach my $table ( @tables ) {
 
   my $col = $tableobj->column($primary_key);
 
+
   next unless uc($col->type) eq 'SERIAL'
               || ( driver_name eq 'Pg'
                      && defined($col->default)
@@ -38,9 +39,17 @@ foreach my $table ( @tables ) {
                      && $col->local =~ /AUTO_INCREMENT/i
                  );
 
+  my $seq = "${table}_${primary_key}_seq";
+  if ( driver_name eq 'Pg'
+       && defined($col->default) 
+       && $col->default =~ /^nextval\('"(\w+_seq)"'::text\)$/
+     ) {
+    $seq = $1;
+  }
+
   warn "fixing sequence for $table\n";
 
-  $dbh->do( "SELECT setval( '${table}_${primary_key}_seq',
+  $dbh->do( "SELECT setval( '$seq',
                             ( SELECT max($primary_key) FROM $table ) );" )
     or die $dbh->errstr;
 
-- 
cgit v1.2.1


From cbf32a25fcfc38632d1262ad8261e679e1c9b7c5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Jun 2003 13:47:51 +0000
Subject: debugging

---
 bin/fix-sequences | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/bin/fix-sequences b/bin/fix-sequences
index 55639d962..d5349ee74 100755
--- a/bin/fix-sequences
+++ b/bin/fix-sequences
@@ -42,16 +42,19 @@ foreach my $table ( @tables ) {
   my $seq = "${table}_${primary_key}_seq";
   if ( driver_name eq 'Pg'
        && defined($col->default) 
-       && $col->default =~ /^nextval\('"(\w+_seq)"'::text\)$/
+       && $col->default =~ /^nextval\('"(public\.)?(\w+_seq)"'::text\)$/
      ) {
-    $seq = $1;
+    $seq = $2;
   }
 
   warn "fixing sequence for $table\n";
 
-  $dbh->do( "SELECT setval( '$seq',
-                            ( SELECT max($primary_key) FROM $table ) );" )
-    or die $dbh->errstr;
+
+  my $sql = "SELECT setval( '$seq',
+                            ( SELECT max($primary_key) FROM $table ) );" );
+
+  warn $col->default. " $seq\n$sql\n";
+  $dbh->do( $sql ) or die $dbh->errstr;
 
 }
 
-- 
cgit v1.2.1


From 6dca9c84fb27d3c01d94b993c56ea66f25d94fb2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Jun 2003 13:49:02 +0000
Subject: arg

---
 bin/fix-sequences | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/fix-sequences b/bin/fix-sequences
index d5349ee74..70b6df601 100755
--- a/bin/fix-sequences
+++ b/bin/fix-sequences
@@ -51,7 +51,7 @@ foreach my $table ( @tables ) {
 
 
   my $sql = "SELECT setval( '$seq',
-                            ( SELECT max($primary_key) FROM $table ) );" );
+                            ( SELECT max($primary_key) FROM $table ) );";
 
   warn $col->default. " $seq\n$sql\n";
   $dbh->do( $sql ) or die $dbh->errstr;
-- 
cgit v1.2.1


From 982fa001e4f9fdc6c544b43d7c21143facc8823d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Jun 2003 13:50:17 +0000
Subject: "doc"

---
 bin/fix-sequences | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/fix-sequences b/bin/fix-sequences
index 70b6df601..1ef7bd654 100755
--- a/bin/fix-sequences
+++ b/bin/fix-sequences
@@ -1,5 +1,7 @@
 #!/usr/bin/perl -Tw
 
+# run dbdef-create first!
+
 use strict;
 use DBI;
 use DBIx::DBSchema 0.21;
-- 
cgit v1.2.1


From d7fa80b06b82168ed78e888835197e09b29491dd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Jun 2003 13:50:59 +0000
Subject: remove overly-verbose debugging for now

---
 bin/fix-sequences | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/fix-sequences b/bin/fix-sequences
index 1ef7bd654..2ff89d3e5 100755
--- a/bin/fix-sequences
+++ b/bin/fix-sequences
@@ -55,7 +55,7 @@ foreach my $table ( @tables ) {
   my $sql = "SELECT setval( '$seq',
                             ( SELECT max($primary_key) FROM $table ) );";
 
-  warn $col->default. " $seq\n$sql\n";
+  #warn $col->default. " $seq\n$sql\n";
   $dbh->do( $sql ) or die $dbh->errstr;
 
 }
-- 
cgit v1.2.1


From f0e07588b2eef04bf5a8cbf0b77c6bde27e02321 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Jun 2003 13:57:08 +0000
Subject: better error handling for re-imports

---
 bin/passwd.import | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/passwd.import b/bin/passwd.import
index fbf27370f..304499e34 100755
--- a/bin/passwd.import
+++ b/bin/passwd.import
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -Tw
-# $Id: passwd.import,v 1.5 2002-06-21 09:57:05 ivan Exp $
+# $Id: passwd.import,v 1.6 2003-06-12 13:57:08 ivan Exp $
 
 use strict;
 use vars qw(%part_svc);
@@ -104,7 +104,13 @@ while (<PASSWD>) {
   });
   my($error);
   $error=$svc_acct->insert;
-  die $error if $error;
+  if ( $error ) {
+    if ( $error =~ /duplicate/i ) {
+      warn "$username: $error";
+    } else {
+      die "$username: $error";
+    }
+  }
 
 }
 
-- 
cgit v1.2.1


From 1b7aca1fcbc4731099cd27d81e47200395abd316 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Jun 2003 14:06:06 +0000
Subject: tyop

---
 bin/passwd.import | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/passwd.import b/bin/passwd.import
index 304499e34..a56be3aaa 100755
--- a/bin/passwd.import
+++ b/bin/passwd.import
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -Tw
-# $Id: passwd.import,v 1.6 2003-06-12 13:57:08 ivan Exp $
+# $Id: passwd.import,v 1.7 2003-06-12 14:06:06 ivan Exp $
 
 use strict;
 use vars qw(%part_svc);
@@ -14,7 +14,7 @@ use FS::part_svc;
 my $user = shift or die &usage;
 adminsuidsetup $user;
 
-push @FS::svc_acct::shells, qw(/bin/sync /sbin/shuddown /bin/halt); #others?
+push @FS::svc_acct::shells, qw(/bin/sync /sbin/shutdown /bin/halt); #others?
 
 my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
 
-- 
cgit v1.2.1


From ce6df8eaa7ba3ba864cc58b2a51ab6b603e68dc1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Jun 2003 14:08:00 +0000
Subject: /bin/halt and /sbin/halt

---
 bin/passwd.import | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/passwd.import b/bin/passwd.import
index a56be3aaa..093f8bafd 100755
--- a/bin/passwd.import
+++ b/bin/passwd.import
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -Tw
-# $Id: passwd.import,v 1.7 2003-06-12 14:06:06 ivan Exp $
+# $Id: passwd.import,v 1.8 2003-06-12 14:08:00 ivan Exp $
 
 use strict;
 use vars qw(%part_svc);
@@ -14,7 +14,7 @@ use FS::part_svc;
 my $user = shift or die &usage;
 adminsuidsetup $user;
 
-push @FS::svc_acct::shells, qw(/bin/sync /sbin/shutdown /bin/halt); #others?
+push @FS::svc_acct::shells, qw(/bin/sync /sbin/shutdown /bin/halt /sbin/halt); #others?
 
 my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
 
-- 
cgit v1.2.1


From 2c2f1122f76c0aec0861bf3d9c7fb9dff109c346 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Jun 2003 08:11:24 +0000
Subject: add vpopmail presets to shellcommands_withdomain export

---
 FS/FS/part_export.pm               | 10 ++++++++--
 FS/FS/part_export/shellcommands.pm | 11 +++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 9330a925d..300e88821 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -576,6 +576,9 @@ tie my %shellcommands_options, 'Tie::IxHash',
                        type =>'textarea',
                        default=>'',
                      },
+  'usermod_pwonly' => { label=>'Disallow username changes',
+                        type =>'checkbox',
+                      },
   'suspend' => { label=>'Suspension command',
                  default=>'',
                },
@@ -613,6 +616,9 @@ tie my %shellcommands_withdomain_options, 'Tie::IxHash',
                        type =>'textarea',
                        #default=>"$_password\n$_password\n",
                      },
+  'usermod_pwonly' => { label=>'Disallow username changes',
+                        type =>'checkbox',
+                      },
   'suspend' => { label=>'Suspension command',
                  default=>'',
                },
@@ -875,9 +881,9 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
     },
 
     'shellcommands_withdomain' => {
-      'desc' => 'Real-time export via remote SSH.',
+      'desc' => 'Real-time export via remote SSH (vpopmail, etc.).',
       'options' => \%shellcommands_withdomain_options,
-      'notes' => 'Run remote commands via SSH.  username@domain (rather than just usernames) are considered unique (also see shellcommands).  You probably want this if the commands you are running will accept a domain as a parameter, and will allow the same username with different domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations): <UL><LI><code>$username</code><LI><code>$domain</code><LI><code>$_password</code><LI><code>$quoted_password</code> - unencrypted password quoted for the shell<LI><code>$crypt_password</code> - encrypted password<LI><code>$uid</code><LI><code>$gid</code><LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)<LI><code>$dir</code> - home directory<LI><code>$shell</code><LI><code>$quota</code><LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.</UL>',
+      'notes' => 'Run remote commands via SSH.  username@domain (rather than just usernames) are considered unique (also see shellcommands).  You probably want this if the commands you are running will accept a domain as a parameter, and will allow the same username with different domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="vpopmail" onClick=\'this.form.useradd.value = "vadduser $username@$domain"; this.form.useradd_stdin.value = "$_password\n$_password\n"; this.form.userdel.value = "vdeluser $username@$domain"; this.form.userdel_stdin.value=""; this.form.usermod.value = "vpasswd $new_username@$new_domain"; this.form.usermod_stdin.value = "$new__password\n$new__password\n"; this.form.usermod_pwonly.checked = true;\'></UL>The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations): <UL><LI><code>$username</code><LI><code>$domain</code><LI><code>$_password</code><LI><code>$quoted_password</code> - unencrypted password quoted for the shell<LI><code>$crypt_password</code> - encrypted password<LI><code>$uid</code><LI><code>$gid</code><LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)<LI><code>$dir</code> - home directory<LI><code>$shell</code><LI><code>$quota</code><LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.</UL>',
     },
 
     'ldap' => {
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index f592a838a..b1f9b0d68 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -81,6 +81,17 @@ sub _export_replace {
   $new_crypt_password = ''; #surpress "used only once" warnings
   $new_crypt_password = crypt( $new->_password,
                                $saltset[int(rand(64))].$saltset[int(rand(64))]);
+  if ( $self->option('usermod_pwonly') ) {
+    my $error = '';
+    if ( $old_username ne $new_username ) {
+      $error ||= "can't change username";
+    }
+    if ( $old_domain ne $new_domain ) {
+      $error ||= "can't change domain";
+    }
+    return $error. ' ('. $self->exporttype. ' to '. $self->machine. ')'
+      if $error;
+  }
   $self->shellcommands_queue( $new->svcnum,
     user         => $self->option('user')||'root',
     host         => $self->machine,
-- 
cgit v1.2.1


From d8d7c720d27047d4cde950e741f80fc2e77eb7a6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Jun 2003 08:23:21 +0000
Subject: full path to vpopmail commands

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 300e88821..ad77ec8c2 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -883,7 +883,7 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
     'shellcommands_withdomain' => {
       'desc' => 'Real-time export via remote SSH (vpopmail, etc.).',
       'options' => \%shellcommands_withdomain_options,
-      'notes' => 'Run remote commands via SSH.  username@domain (rather than just usernames) are considered unique (also see shellcommands).  You probably want this if the commands you are running will accept a domain as a parameter, and will allow the same username with different domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="vpopmail" onClick=\'this.form.useradd.value = "vadduser $username@$domain"; this.form.useradd_stdin.value = "$_password\n$_password\n"; this.form.userdel.value = "vdeluser $username@$domain"; this.form.userdel_stdin.value=""; this.form.usermod.value = "vpasswd $new_username@$new_domain"; this.form.usermod_stdin.value = "$new__password\n$new__password\n"; this.form.usermod_pwonly.checked = true;\'></UL>The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations): <UL><LI><code>$username</code><LI><code>$domain</code><LI><code>$_password</code><LI><code>$quoted_password</code> - unencrypted password quoted for the shell<LI><code>$crypt_password</code> - encrypted password<LI><code>$uid</code><LI><code>$gid</code><LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)<LI><code>$dir</code> - home directory<LI><code>$shell</code><LI><code>$quota</code><LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.</UL>',
+      'notes' => 'Run remote commands via SSH.  username@domain (rather than just usernames) are considered unique (also see shellcommands).  You probably want this if the commands you are running will accept a domain as a parameter, and will allow the same username with different domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="vpopmail" onClick=\'this.form.useradd.value = "/home/vpopmail/bin/vadduser $username@$domain"; this.form.useradd_stdin.value = "$_password\n$_password\n"; this.form.userdel.value = "/home/vpopmail/bin/vdeluser $username@$domain"; this.form.userdel_stdin.value=""; this.form.usermod.value = "/home/vpopmail/bin/vpasswd $new_username@$new_domain"; this.form.usermod_stdin.value = "$new__password\n$new__password\n"; this.form.usermod_pwonly.checked = true;\'></UL>The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations): <UL><LI><code>$username</code><LI><code>$domain</code><LI><code>$_password</code><LI><code>$quoted_password</code> - unencrypted password quoted for the shell<LI><code>$crypt_password</code> - encrypted password<LI><code>$uid</code><LI><code>$gid</code><LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)<LI><code>$dir</code> - home directory<LI><code>$shell</code><LI><code>$quota</code><LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.</UL>',
     },
 
     'ldap' => {
-- 
cgit v1.2.1


From 4a02b0fa8b35533d8d938941cbb5ca89903132c0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Jun 2003 08:38:58 +0000
Subject: pass vpopmail passwords on command-line (unfortunately)

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index ad77ec8c2..5cdce1608 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -883,7 +883,7 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
     'shellcommands_withdomain' => {
       'desc' => 'Real-time export via remote SSH (vpopmail, etc.).',
       'options' => \%shellcommands_withdomain_options,
-      'notes' => 'Run remote commands via SSH.  username@domain (rather than just usernames) are considered unique (also see shellcommands).  You probably want this if the commands you are running will accept a domain as a parameter, and will allow the same username with different domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="vpopmail" onClick=\'this.form.useradd.value = "/home/vpopmail/bin/vadduser $username@$domain"; this.form.useradd_stdin.value = "$_password\n$_password\n"; this.form.userdel.value = "/home/vpopmail/bin/vdeluser $username@$domain"; this.form.userdel_stdin.value=""; this.form.usermod.value = "/home/vpopmail/bin/vpasswd $new_username@$new_domain"; this.form.usermod_stdin.value = "$new__password\n$new__password\n"; this.form.usermod_pwonly.checked = true;\'></UL>The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations): <UL><LI><code>$username</code><LI><code>$domain</code><LI><code>$_password</code><LI><code>$quoted_password</code> - unencrypted password quoted for the shell<LI><code>$crypt_password</code> - encrypted password<LI><code>$uid</code><LI><code>$gid</code><LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)<LI><code>$dir</code> - home directory<LI><code>$shell</code><LI><code>$quota</code><LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.</UL>',
+      'notes' => 'Run remote commands via SSH.  username@domain (rather than just usernames) are considered unique (also see shellcommands).  You probably want this if the commands you are running will accept a domain as a parameter, and will allow the same username with different domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="vpopmail" onClick=\'this.form.useradd.value = "/home/vpopmail/bin/vadduser $username\@$domain $quoted_password"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "/home/vpopmail/bin/vdeluser $username@$domain"; this.form.userdel_stdin.value=""; this.form.usermod.value = "/home/vpopmail/bin/vpasswd $new_username\@$new_domain $new_quoted_password"; this.form.usermod_stdin.value = ""; this.form.usermod_pwonly.checked = true;\'></UL>The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations): <UL><LI><code>$username</code><LI><code>$domain</code><LI><code>$_password</code><LI><code>$quoted_password</code> - unencrypted password quoted for the shell<LI><code>$crypt_password</code> - encrypted password<LI><code>$uid</code><LI><code>$gid</code><LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)<LI><code>$dir</code> - home directory<LI><code>$shell</code><LI><code>$quota</code><LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.</UL>',
     },
 
     'ldap' => {
-- 
cgit v1.2.1


From 499b8660e2aa5632fc14e8fcfa6631800ade1e35 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Jun 2003 08:44:52 +0000
Subject: correct stickiness for checkbox options on export edit

---
 httemplate/edit/part_export.cgi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 4defbc86f..0590549f5 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -72,7 +72,9 @@ my $widget = new HTML::Widgets::SelectLayers(
       } elsif ( $type eq 'text' ) {
         $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
       } elsif ( $type eq 'checkbox' ) {
-        $html .= qq!<INPUT TYPE="checkbox" NAME="$option" VALUE="1">!;
+        $html .= qq!<INPUT TYPE="checkbox" NAME="$option" VALUE="1"!
+        $html .= ' CHECKED' if $value;
+        $html .= '>';
       } else {
         $html .= "unknown type $type";
       }
-- 
cgit v1.2.1


From 0ea5e6fa4782600ab33813555a38fd0880d6145c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Jun 2003 08:46:19 +0000
Subject: missing semi

---
 httemplate/edit/part_export.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 0590549f5..24d646b8b 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -72,7 +72,7 @@ my $widget = new HTML::Widgets::SelectLayers(
       } elsif ( $type eq 'text' ) {
         $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
       } elsif ( $type eq 'checkbox' ) {
-        $html .= qq!<INPUT TYPE="checkbox" NAME="$option" VALUE="1"!
+        $html .= qq!<INPUT TYPE="checkbox" NAME="$option" VALUE="1"!;
         $html .= ' CHECKED' if $value;
         $html .= '>';
       } else {
-- 
cgit v1.2.1


From 927ed7458ff7536ec321e8d214ed8adfbd12193f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Jun 2003 09:12:29 +0000
Subject: proper command escape for vpopmail export

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 5cdce1608..f1a0b1a2e 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -883,7 +883,7 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
     'shellcommands_withdomain' => {
       'desc' => 'Real-time export via remote SSH (vpopmail, etc.).',
       'options' => \%shellcommands_withdomain_options,
-      'notes' => 'Run remote commands via SSH.  username@domain (rather than just usernames) are considered unique (also see shellcommands).  You probably want this if the commands you are running will accept a domain as a parameter, and will allow the same username with different domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="vpopmail" onClick=\'this.form.useradd.value = "/home/vpopmail/bin/vadduser $username\@$domain $quoted_password"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "/home/vpopmail/bin/vdeluser $username@$domain"; this.form.userdel_stdin.value=""; this.form.usermod.value = "/home/vpopmail/bin/vpasswd $new_username\@$new_domain $new_quoted_password"; this.form.usermod_stdin.value = ""; this.form.usermod_pwonly.checked = true;\'></UL>The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations): <UL><LI><code>$username</code><LI><code>$domain</code><LI><code>$_password</code><LI><code>$quoted_password</code> - unencrypted password quoted for the shell<LI><code>$crypt_password</code> - encrypted password<LI><code>$uid</code><LI><code>$gid</code><LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)<LI><code>$dir</code> - home directory<LI><code>$shell</code><LI><code>$quota</code><LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.</UL>',
+      'notes' => 'Run remote commands via SSH.  username@domain (rather than just usernames) are considered unique (also see shellcommands).  You probably want this if the commands you are running will accept a domain as a parameter, and will allow the same username with different domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="vpopmail" onClick=\'this.form.useradd.value = "/home/vpopmail/bin/vadduser $username\\\@$domain $quoted_password"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "/home/vpopmail/bin/vdeluser $username\\\@$domain"; this.form.userdel_stdin.value=""; this.form.usermod.value = "/home/vpopmail/bin/vpasswd $new_username\\\@$new_domain $new_quoted_password"; this.form.usermod_stdin.value = ""; this.form.usermod_pwonly.checked = true;\'></UL>The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations): <UL><LI><code>$username</code><LI><code>$domain</code><LI><code>$_password</code><LI><code>$quoted_password</code> - unencrypted password quoted for the shell<LI><code>$crypt_password</code> - encrypted password<LI><code>$uid</code><LI><code>$gid</code><LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)<LI><code>$dir</code> - home directory<LI><code>$shell</code><LI><code>$quota</code><LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.</UL>',
     },
 
     'ldap' => {
-- 
cgit v1.2.1


From 92b6d3bef27fdcfb22cb67f2c62173cfda246684 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Jun 2003 15:19:02 +0000
Subject: $new_quoted_password vs. $quoted_new__password

---
 FS/FS/part_export/shellcommands.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index b1f9b0d68..edc944009 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -75,7 +75,8 @@ sub _export_replace {
     ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   }
   $new_finger = shell_quote $new_finger;
-  $quoted_new__password = shell_quote $new__password;
+  $quoted_new__password = shell_quote $new__password; #old, wrong?
+  $new_quoted_password = shell_quote $new__password; #new, better?
   $old_domain = $old->domain;
   $new_domain = $new->domain;
   $new_crypt_password = ''; #surpress "used only once" warnings
-- 
cgit v1.2.1


From be0c6c490ff51286e521e838ceafb1cf7ec2aa5a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 14 Jun 2003 01:01:12 +0000
Subject: \n\n between virtualhost entries

---
 bin/apache.export | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/apache.export b/bin/apache.export
index 908313606..f0a6beefc 100755
--- a/bin/apache.export
+++ b/bin/apache.export
@@ -39,7 +39,7 @@ foreach my $export ( @exports ) {
     use vars qw($zone $username);
     $zone = $svc_www->domain_record->zone;
     $username = $svc_www->svc_acct->username;
-    print HTTPD_CONF eval(qq("$template"));
+    print HTTPD_CONF eval(qq("$template")). "\n\n";
   }
 
   my $user = $export->option('user');
-- 
cgit v1.2.1


From 9e6413e476a3516a08710efa5ff4d5949c1aa88c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 14 Jun 2003 02:02:55 +0000
Subject: add index on cust_bill._date

---
 FS/bin/freeside-setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index d2a98dd0c..734744efe 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -373,7 +373,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'invnum',
       'unique' => [],
-      'index' => [ ['custnum'] ],
+      'index' => [ ['custnum'], ['_date'] ],
     },
 
     'cust_bill_event' => {
-- 
cgit v1.2.1


From d01e41ec4ca900fb0b782c6d97f549a505f3a719 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 14 Jun 2003 02:04:12 +0000
Subject: cust_bill2 index

---
 httemplate/docs/upgrade9.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/httemplate/docs/upgrade9.html b/httemplate/docs/upgrade9.html
index c6afe2b0f..24d1cce42 100644
--- a/httemplate/docs/upgrade9.html
+++ b/httemplate/docs/upgrade9.html
@@ -15,10 +15,11 @@
 INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 18, 'daytime', 'en_US', 'Day Phone' );
 INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 19, 'night', 'en_US', 'Night Phone' );
 </pre>
-  <li>Optionally, apply the following changes to your database (performance improvement for large numbers of services or packages):
+  <li>Optionally, apply the following changes to your database (performance improvements):
 <pre>
 CREATE INDEX part_pkg1 ON part_pkg ( disabled );
 CREATE INDEX part_svc1 ON part_svc ( disabled );
+CREATE INDEX cust_bill2 ON cust_bill ( _date );
 </pre>
   <li>If you want to use ACH (electronic checks), you will need to make changes to your database.  The easiest way to make these changes is to dump your database (with pg_dump), change the payinfo field in the cust_pay, cust_refund, h_cust_pay and h_cust_refund tables from varchar(16) to varchar(80), reload the database from the dump, and run dbdef-create
   <li>Restart Apache and freeside-queued.
-- 
cgit v1.2.1


From eef1e8261ea49fe7c531598cbfca064ad3447a5e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 22 Jun 2003 09:04:55 +0000
Subject: skip history tables that exist already; easier to re-run now

---
 bin/create-history-tables | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/create-history-tables b/bin/create-history-tables
index 33eb0e5a3..8d419d287 100755
--- a/bin/create-history-tables
+++ b/bin/create-history-tables
@@ -20,6 +20,7 @@ my @tables = scalar(@ARGV)
                ? @ARGV
                : grep { ! /^h_/ } $schema->tables;
 foreach my $table ( @tables ) {
+  next if grep { /^h_$table/ } $schema->tables;
   warn "creating history table for $table\n";
   my $tableobj = $schema->table($table)
     or die "unknown table $table (did you run dbdef-create?)\n";
-- 
cgit v1.2.1


From 8f4fddbaa123a4baee6fb1df4d2abf857f22a04c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 22 Jun 2003 09:11:11 +0000
Subject: skip pg_ tables also (ewww, showing up in reverse-engineered schema)

---
 bin/create-history-tables | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/create-history-tables b/bin/create-history-tables
index 8d419d287..39248bf3f 100755
--- a/bin/create-history-tables
+++ b/bin/create-history-tables
@@ -18,7 +18,7 @@ my $schema = dbdef();
 #false laziness w/fs-setup
 my @tables = scalar(@ARGV)
                ? @ARGV
-               : grep { ! /^h_/ } $schema->tables;
+               : grep { ! /^(h|pg)_/ } $schema->tables;
 foreach my $table ( @tables ) {
   next if grep { /^h_$table/ } $schema->tables;
   warn "creating history table for $table\n";
-- 
cgit v1.2.1


From 3464d4c767130711e724fbd96e391e03fa3a1796 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 22 Jun 2003 14:21:57 +0000
Subject: fix the credit card retry on change or manual "retry_card" to ONCE
 per invoice

---
 FS/FS/cust_main.pm       | 166 ++++++++++++++++++++++++++++++-----------------
 httemplate/misc/bill.cgi |   3 +-
 2 files changed, 108 insertions(+), 61 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 533c630f2..b45540095 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -306,24 +306,12 @@ sub insert {
     }
   }
 
-  #false laziness with sub replace
-  my $queue = new FS::queue { 'job' => 'FS::cust_main::append_fuzzyfiles' };
-  $error = $queue->insert($self->getfield('last'), $self->company);
+  $error = $self->queue_fuzzyfiles_update;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
-    return "queueing job (transaction rolled back): $error";
+    return "updating fuzzy search cache: $error";
   }
 
-  if ( defined $self->dbdef_table->column('ship_last') && $self->ship_last ) {
-    $queue = new FS::queue { 'job' => 'FS::cust_main::append_fuzzyfiles' };
-    $error = $queue->insert($self->getfield('last'), $self->company);
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "queueing job (transaction rolled back): $error";
-    }
-  }
-  #eslaf
-
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 
@@ -525,34 +513,47 @@ sub replace {
 
   if ( $self->payby =~ /^(CARD|CHEK|LECB)$/ &&
        grep { $self->get($_) ne $old->get($_) } qw(payinfo paydate payname) ) {
-    # card/check info has changed, want to retry realtime_card invoice events
-    #false laziness w/collect
-    foreach my $cust_bill_event (
-      grep {
-             #$_->part_bill_event->plan eq 'realtime-card'
-             $_->part_bill_event->eventcode =~
-                 /^\$cust_bill\->realtime_(card|ach|lec)\(\);$/
-               && $_->status eq 'done'
-               && $_->statustext
-           }
-        map { $_->cust_bill_event }
-          grep { $_->cust_bill_event }
-            $self->open_cust_bill
-
-    ) {
-      my $error = $cust_bill_event->retry;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "error scheduling invoice events for retry: $error";
-      }
+    # card/check/lec info has changed, want to retry realtime_ invoice events
+    my $error = $self->retry_realtime;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
     }
-    #eslaf
+  }
 
+  $error = $self->queue_fuzzyfiles_update;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "updating fuzzy search cache: $error";
   }
 
-  #false laziness with sub insert
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+
+}
+
+=item queue_fuzzyfiles_update
+
+Used by insert & replace to update the fuzzy search cache
+
+=cut
+
+sub queue_fuzzyfiles_update {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
   my $queue = new FS::queue { 'job' => 'FS::cust_main::append_fuzzyfiles' };
-  $error = $queue->insert($self->getfield('last'), $self->company);
+  my $error = $queue->insert($self->getfield('last'), $self->company);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return "queueing job (transaction rolled back): $error";
@@ -560,13 +561,12 @@ sub replace {
 
   if ( defined $self->dbdef_table->column('ship_last') && $self->ship_last ) {
     $queue = new FS::queue { 'job' => 'FS::cust_main::append_fuzzyfiles' };
-    $error = $queue->insert($self->getfield('last'), $self->company);
+    $error = $queue->insert($self->getfield('ship_last'), $self->ship_company);
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return "queueing job (transaction rolled back): $error";
     }
   }
-  #eslaf
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
@@ -1276,7 +1276,10 @@ invoice_time - Use this time when deciding when to print invoices and
 late notices on those invoices.  The default is now.  It is specified as a UNIX timestamp; see L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse>
 for conversion functions.
 
-retry_card - Retry cards even when not scheduled by invoice events.
+retry - Retry card/echeck/LEC transactions even when not scheduled by invoice
+events.
+
+retry_card - Deprecated alias for 'retry'
 
 batch_card - This option is deprecated.  See the invoice events web interface
 to control whether cards are batched or run against a realtime gateway.
@@ -1310,26 +1313,16 @@ sub collect {
     return '';
   }
 
-  if ( exists($options{'retry_card'}) && $options{'retry_card'} ) {
-    #false laziness w/replace
-    foreach my $cust_bill_event (
-      grep {
-             #$_->part_bill_event->plan eq 'realtime-card'
-             $_->part_bill_event->eventcode eq '$cust_bill->realtime_card();'
-               && $_->status eq 'done'
-               && $_->statustext
-           }
-        map { $_->cust_bill_event }
-          grep { $_->cust_bill_event }
-            $self->open_cust_bill
-    ) {
-      my $error = $cust_bill_event->retry;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "error scheduling invoice events for retry: $error";
-      }
+  if ( exists($options{'retry_card'}) ) {
+    carp 'retry_card option passed to collect is deprecated; use retry';
+    $options{'retry'} ||= $options{'retry_card'};
+  }
+  if ( exists($options{'retry'}) && $options{'retry'} ) {
+    my $error = $self->retry_realtime;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
     }
-    #eslaf
   }
 
   foreach my $cust_bill ( $self->cust_bill ) {
@@ -1419,6 +1412,60 @@ sub collect {
 
 }
 
+=item retry_realtime
+
+Schedules realtime credit card / electronic check / LEC billing events for
+for retry.  Useful if card information has changed or manual retry is desired.
+The 'collect' method must be called to actually retry the transaction.
+
+Implementation details: For each of this customer's open invoices, changes
+the status of the first "done" (with statustext error) realtime processing
+event to "failed".
+
+=cut
+
+sub retry_realtime {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  foreach my $cust_bill (
+    grep { $_->cust_bill_event }
+      $self->open_cust_bill
+  ) {
+    my @cust_bill_event =
+      sort { $a->part_bill_event->seconds <=> $b->part_bill_event->seconds }
+        grep {
+               #$_->part_bill_event->plan eq 'realtime-card'
+               $_->part_bill_event->eventcode =~
+                   /\$cust_bill\->realtime_(card|ach|lec)$/
+                 && $_->status eq 'done'
+                 && $_->statustext
+             }
+          $_->cust_bill_event;
+    next unless @cust_bill_event;
+    my $error = $cust_bill_event[0]->retry;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "error scheduling invoice event for retry: $error";
+    }
+
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+
+}
+
 =item realtime_bop METHOD AMOUNT [ OPTION => VALUE ... ]
 
 Runs a realtime credit card, ACH (electronic check) or phone bill transaction
@@ -2506,4 +2553,3 @@ L<FS::cust_main_invoice>, L<FS::UID>, schema.html from the base documentation.
 
 1;
 
-
diff --git a/httemplate/misc/bill.cgi b/httemplate/misc/bill.cgi
index f048e5559..44d85b880 100755
--- a/httemplate/misc/bill.cgi
+++ b/httemplate/misc/bill.cgi
@@ -21,7 +21,8 @@ unless ( $error ) {
                                #'batch_card'=> 'yes',
                                #'batch_card'=> 'no',
                                #'report_badcard'=> 'yes',
-                               'retry_card' => 'yes',
+                               #'retry_card' => 'yes',
+                               'retry' => 'yes',
                               );
 }
 #&eidiot($error) if $error;
-- 
cgit v1.2.1


From 4383c98b73d549da1773934614ea791802753323 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 24 Jun 2003 14:12:31 +0000
Subject: explicitly use the necessary modules

---
 FS/FS/part_export/forward_shellcommands.pm | 2 ++
 FS/FS/part_export/sqlmail.pm               | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_export/forward_shellcommands.pm b/FS/FS/part_export/forward_shellcommands.pm
index 43d558a69..a53628a19 100644
--- a/FS/FS/part_export/forward_shellcommands.pm
+++ b/FS/FS/part_export/forward_shellcommands.pm
@@ -2,7 +2,9 @@ package FS::part_export::forward_shellcommands;
 
 use strict;
 use vars qw(@ISA);
+use FS::Record qw(qsearchs);
 use FS::part_export;
+use FS::svc_acct;
 
 @ISA = qw(FS::part_export);
 
diff --git a/FS/FS/part_export/sqlmail.pm b/FS/FS/part_export/sqlmail.pm
index 64f72df07..8ccad3c7e 100644
--- a/FS/FS/part_export/sqlmail.pm
+++ b/FS/FS/part_export/sqlmail.pm
@@ -1,9 +1,10 @@
 package FS::part_export::sqlmail;
 
 use vars qw(@ISA);
+use Digest::MD5 qw(md5_hex);
 use FS::Record qw(qsearchs);
 use FS::part_export;
-use Digest::MD5 qw(md5_hex);
+use FS::svc_domain;
 
 @ISA = qw(FS::part_export);
 
-- 
cgit v1.2.1


From 268594d99867ba0db820884ac47b652deb02e265 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 24 Jun 2003 15:34:45 +0000
Subject: display full POP numbers in signup server - patch from "Stephen
 Bechard" <steve@destek.net>

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index e384aaf8e..de142a1c4 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.36 2003-04-21 20:53:57 ivan Exp $
+# $Id: signup.cgi,v 1.37 2003-06-24 15:34:45 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -382,7 +382,7 @@ sub popselector {
 
   return '<INPUT TYPE="hidden" NAME="popnum" VALUE="">' unless @$pops;
   return $pops->[0]{city}. ', '. $pops->[0]{state}.
-         ' ('. $pops->[0]{ac}. ')/'. $pops->[0]{exch}.
+         ' ('. $pops->[0]{ac}. ')/'. $pops->[0]{exch}. '-'. $pops->[0]{loc}.
          '<INPUT TYPE="hidden" NAME="popnum" VALUE="'. $pops->[0]{popnum}. '">'
     if scalar(@$pops) == 1;
 
@@ -435,7 +435,7 @@ END
       foreach my $pop ( @{$pop{$state}->{$popac}}) {
         my $o_popnum = $pop->{popnum};
         my $poptext =  $pop->{city}. ', '. $pop->{state}.
-                       ' ('. $pop->{ac}. ')/'. $pop->{exch};
+                       ' ('. $pop->{ac}. ')/'. $pop->{exch}. '-'. $pop->{loc};
 
         $text .= "opt(what.form.popnum, \"$o_popnum\", \"$poptext\");\n";
         if ($popnum == $o_popnum) {
@@ -467,7 +467,7 @@ END
     $text .= qq!<OPTION VALUE="!. $pop->{popnum}. '"'.
              ( ( $popnum && $pop->{popnum} == $popnum ) ? ' SELECTED' : '' ). ">".
              $pop->{city}. ', '. $pop->{state}.
-               ' ('. $pop->{ac}. ')/'. $pop->{exch};
+               ' ('. $pop->{ac}. ')/'. $pop->{exch}. '-'. $pop->{loc};
   }
 
   $text .= qq!</SELECT></TD></TR></TABLE>!;
-- 
cgit v1.2.1


From c550b6ea1846f933dd130fc690777ad89f55012d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Jun 2003 00:57:16 +0000
Subject: forward_shellcommands update: might work now

---
 FS/FS/part_export/forward_shellcommands.pm | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/FS/FS/part_export/forward_shellcommands.pm b/FS/FS/part_export/forward_shellcommands.pm
index a53628a19..f6fcb6062 100644
--- a/FS/FS/part_export/forward_shellcommands.pm
+++ b/FS/FS/part_export/forward_shellcommands.pm
@@ -2,9 +2,7 @@ package FS::part_export::forward_shellcommands;
 
 use strict;
 use vars qw(@ISA);
-use FS::Record qw(qsearchs);
 use FS::part_export;
-use FS::svc_acct;
 
 @ISA = qw(FS::part_export);
 
@@ -31,13 +29,13 @@ sub _export_command {
     ${$_} = $svc_forward->getfield($_) foreach $svc_forward->fields;
   }
 
-  my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->srcsvc } );
+  my $svc_acct = $svc_forward->srcsvc_acct;
   $username = $svc_acct->username;
   $domain = $svc_acct->domain;
-  if ($self->dstsvc) {
-    $destination = $self->dstsvc_acct->email;
+  if ($svc_forward->dstsvc_acct) {
+    $destination = $svc_forward->dstsvc_acct->email;
   } else {
-    $destination = $self->dst;
+    $destination = $svc_forward->dst;
   }
 
   #done setting variables for the command
@@ -61,22 +59,22 @@ sub _export_replace {
     ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   }
 
-  my $old_svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->srcsvc } );
+  my $old_svc_acct = $old->srcsvc_acct;
   $old_username = $old_svc_acct->username;
   $old_domain = $old_svc_acct->domain;
-  if ($self->dstsvc) {
-    $old_destination = $self->dstsvc_acct->email;
+  if ($old->dstsvc_acct) {
+    $old_destination = $old->dstsvc_acct->email;
   } else {
-    $old_destination = $self->dst;
+    $old_destination = $old->dst;
   }
 
-  my $new_svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->srcsvc } );
+  my $new_svc_acct = $new->srcsvc_acct;
   $new_username = $new_svc_acct->username;
   $new_domain = $new_svc_acct->domain;
-  if ($self->dstsvc) {
-    $new_destination = $self->dstsvc_acct->email;
+  if ($new->dstsvc) {
+    $new_destination = $new->dstsvc_acct->email;
   } else {
-    $new_destination = $self->dst;
+    $new_destination = $new->dst;
   }
 
   #done setting variables for the command
-- 
cgit v1.2.1


From 6ea99c2561e6c87310194097e88ddf1cf089c868 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Jun 2003 08:40:20 +0000
Subject: svc_acct doc update cp export - disable old-style suspending

---
 FS/FS/part_export/cp.pm | 20 +++++++++++---------
 FS/FS/svc_acct.pm       |  4 ++++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/FS/FS/part_export/cp.pm b/FS/FS/part_export/cp.pm
index ee5f54285..c4750dd5d 100644
--- a/FS/FS/part_export/cp.pm
+++ b/FS/FS/part_export/cp.pm
@@ -91,20 +91,22 @@ sub cp_command { #subroutine, not method
       );
     }
 
-    my $other = 'F';
+    #my $other = 'F';
     if ( $new_password =~ /^\*SUSPENDED\* (.*)$/ ) {
       $new_password = $1;
-      $other = 'T';
+    #  $other = 'T';
     }
-    cp_command($host, $port, $username, $password, 'set_mailbox_status',
-      Domain       => $domain,
-      Mailbox      => $new_username,
-      Other        => $other,
-      Other_Bounce => $other,
-    );
+    #cp_command($host, $port, $username, $password, $login_domain,
+    #  'set_mailbox_status',
+    #  Domain       => $domain,
+    #  Mailbox      => $new_username,
+    #  Other        => $other,
+    #  Other_Bounce => $other,
+    #);
 
     if ( $old_password ne $new_password ) {
-      cp_command($host, $port, $username, $password, 'change_mailbox',
+      cp_command($host, $port, $username, $password, $login_domain,
+        'change_mailbox',
         Domain    => $domain,
         Mailbox   => $new_username,
         Password  => $new_password,
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 282ef5aab..1fed9520f 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -603,6 +603,8 @@ error, returns the error, otherwise returns false.
 
 Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
 
+Calls any export-specific suspend hooks.
+
 =cut
 
 sub suspend {
@@ -627,6 +629,8 @@ an error, returns the error, otherwise returns false.
 
 Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
 
+Calls any export-specific unsuspend hooks.
+
 =cut
 
 sub unsuspend {
-- 
cgit v1.2.1


From df4dc0977e94c79650236619593a9fc88d2037aa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Jun 2003 10:22:22 +0000
Subject: Pg 7.3 incompatibility with empty dates in Failed Invoice Event
 search,   patch from rlucas@tercent.net

---
 httemplate/search/cust_bill_event.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/cust_bill_event.cgi b/httemplate/search/cust_bill_event.cgi
index 9cb36d28e..b76f66b76 100644
--- a/httemplate/search/cust_bill_event.cgi
+++ b/httemplate/search/cust_bill_event.cgi
@@ -4,7 +4,7 @@
 #false laziness with view/cust_bill.cgi
 
 $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
-my $beginning = str2time($1);
+my $beginning = str2time($1) || 0;
 
 $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
 my $ending = str2time($1) + 86400;
-- 
cgit v1.2.1


From 5aed678a590be255eccc42b944975c4a846b1807 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 27 Jun 2003 14:19:59 +0000
Subject: add radius-ip configuration parameter for Framed-IP-Address vs.
 Framed-Address

---
 FS/FS/Conf.pm     | 8 ++++++++
 FS/FS/svc_acct.pm | 5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 84b3c26ed..706ebe720 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1031,6 +1031,14 @@ httemplate/docs/config.html
     'select_enum' => [ 'Password', 'User-Password' ],
   },
 
+  {
+    'key'         => 'radius-ip',
+    'section'     => '',
+    'description' => 'RADIUS attribute for IP addresses.',
+    'type'        => 'select',
+    'select_enum' => [ 'Framed-IP-Address', 'Framed-Address' ],
+  },
+
   {
     'key'         => 'svc_acct-alldomains',
     'section'     => '',
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 1fed9520f..5b8107fc8 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -9,7 +9,7 @@ use vars qw( @ISA $DEBUG $me $conf
              $username_uppercase
              $welcome_template $welcome_from $welcome_subject $welcome_mimetype
              $smtpmachine
-             $radius_password
+             $radius_password $radius_ip
              $dirhash
              @saltset @pw_set );
 use Carp;
@@ -68,6 +68,7 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
   }
   $smtpmachine = $conf->config('smtpmachine');
   $radius_password = $conf->config('radius-password') || 'Password';
+  $radius_ip = $conf->config('radius-ip') || 'Framed-IP-Address';
 };
 
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
@@ -866,7 +867,7 @@ sub radius_reply {
       ( $FS::raddb::attrib{lc($attrib)}, $self->getfield($column) );
     } grep { /^radius_/ && $self->getfield($_) } fields( $self->table );
   if ( $self->slipip && $self->slipip ne '0e0' ) {
-    $reply{'Framed-IP-Address'} = $self->slipip;
+    $reply{$radius_ip} = $self->slipip;
   }
   %reply;
 }
-- 
cgit v1.2.1


From 44c2f829e36a7751e0c97a4dd33dff8e3f192a30 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jun 2003 07:44:46 +0000
Subject: increase maximum domain length to 67

---
 FS/FS/svc_domain.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 2e8866a56..32b94563d 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -324,7 +324,7 @@ sub check {
   }
 
   #if ( $recref->{domain} =~ /^([\w\-\.]{1,22})\.(com|net|org|edu)$/ ) {
-  if ( $recref->{domain} =~ /^([\w\-]{1,22})\.(com|net|org|edu)$/ ) {
+  if ( $recref->{domain} =~ /^([\w\-]{1,63})\.(com|net|org|edu)$/ ) {
     $recref->{domain} = "$1.$2";
   # hmmmmmmmm.
   } elsif ( $whois_hack && $recref->{domain} =~ /^([\w\-\.]+)$/ ) {
-- 
cgit v1.2.1


From 70997699eb64ce36ca408214cfe4dbc502d7ca58 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jun 2003 12:22:24 +0000
Subject: adding sqlradius_withdomain export including realms, closes: bug#514

---
 FS/FS/part_export.pm                      | 15 ++++++++++++++-
 FS/FS/part_export/sqlradius.pm            | 23 ++++++++++++++---------
 FS/FS/part_export/sqlradius_withdomain.pm | 12 ++++++++++++
 FS/bin/freeside-sqlradius-reset           |  4 +++-
 FS/t/part_export-sqlradius_withdomain.t   |  5 +++++
 5 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 FS/FS/part_export/sqlradius_withdomain.pm
 create mode 100644 FS/t/part_export-sqlradius_withdomain.t

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index f1a0b1a2e..0941da1fb 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -691,6 +691,12 @@ tie my %sqlradius_options, 'Tie::IxHash',
   'password' => { label=>'Database password' },
 ;
 
+tie my %sqlradius_withdomain_options, 'Tie::IxHash',
+  'datasrc'  => { label=>'DBI data source ' },
+  'username' => { label=>'Database username' },
+  'password' => { label=>'Database password' },
+;
+
 tie my %cyrus_options, 'Tie::IxHash',
   'server' => { label=>'IMAP server' },
   'username' => { label=>'Admin username' },
@@ -896,7 +902,14 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
       'desc' => 'Real-time export to SQL-backed RADIUS (ICRADIUS, FreeRADIUS)',
       'options' => \%sqlradius_options,
       'nodomain' => 'Y',
-      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.23/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.',
+      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  This export does not export RADIUS realms (see also sqlradius_withdomain).  AAn existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.',
+    },
+
+    'sqlradius_withdomain' => {
+      'desc' => 'Real-time export to SQL-backed RADIUS (ICRADIUS, FreeRADIUS) with realms',
+      'options' => \%sqlradius_withdomain_options,
+      'nodomain' => '',
+      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  This export exports domains to RADIUS realms (see also sqlradius).  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.',
     },
 
     'sqlmail' => {
diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index 60450ee63..8a8f9beba 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -8,6 +8,11 @@ use FS::part_export;
 
 sub rebless { shift; }
 
+sub export_username {
+  my($self, $svc_acct) = (shift, shift);
+  $svc_acct->username;
+}
+
 sub _export_insert {
   my($self, $svc_acct) = (shift, shift);
 
@@ -16,14 +21,14 @@ sub _export_insert {
     my %attrib = $svc_acct->$method();
     next unless keys %attrib;
     my $err_or_queue = $self->sqlradius_queue( $svc_acct->svcnum, 'insert',
-      $table, $svc_acct->username, %attrib );
+      $table, $self->export_username($svc_acct), %attrib );
     return $err_or_queue unless ref($err_or_queue);
   }
   my @groups = $svc_acct->radius_groups;
   if ( @groups ) {
     my $err_or_queue = $self->sqlradius_queue(
       $svc_acct->svcnum, 'usergroup_insert',
-      $svc_acct->username, @groups );
+      $self->export_username($svc_acct), @groups );
     return $err_or_queue unless ref($err_or_queue);
   }
   '';
@@ -44,9 +49,9 @@ sub _export_replace {
   my $dbh = dbh;
 
   my $jobnum = '';
-  if ( $old->username ne $new->username ) {
+  if ( $self->export_username($old) ne $self->export_username($new) ) {
     my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'rename',
-      $new->username, $old->username );
+      $self->export_username($new), $self->export_username($old) );
     unless ( ref($err_or_queue) ) {
       $dbh->rollback if $oldAutoCommit;
       return $err_or_queue;
@@ -63,7 +68,7 @@ sub _export_replace {
               } keys %new
     ) {
       my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'insert',
-        $table, $new->username, %new );
+        $table, $self->export_username($new), %new );
       unless ( ref($err_or_queue) ) {
         $dbh->rollback if $oldAutoCommit;
         return $err_or_queue;
@@ -80,7 +85,7 @@ sub _export_replace {
     my @del = grep { !exists $new{$_} } keys %old;
     if ( @del ) {
       my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'attrib_delete',
-        $table, $new->username, @del );
+        $table, $self->export_username($new), @del );
       unless ( ref($err_or_queue) ) {
         $dbh->rollback if $oldAutoCommit;
         return $err_or_queue;
@@ -109,7 +114,7 @@ sub _export_replace {
 
   if ( @delgroups ) {
     my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'usergroup_delete',
-      $new->username, @delgroups );
+      $self->export_username($new), @delgroups );
     unless ( ref($err_or_queue) ) {
       $dbh->rollback if $oldAutoCommit;
       return $err_or_queue;
@@ -125,7 +130,7 @@ sub _export_replace {
 
   if ( @newgroups ) {
     my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'usergroup_insert',
-      $new->username, @newgroups );
+      $self->export_username($new), @newgroups );
     unless ( ref($err_or_queue) ) {
       $dbh->rollback if $oldAutoCommit;
       return $err_or_queue;
@@ -147,7 +152,7 @@ sub _export_replace {
 sub _export_delete {
   my( $self, $svc_acct ) = (shift, shift);
   my $err_or_queue = $self->sqlradius_queue( $svc_acct->svcnum, 'delete',
-    $svc_acct->username );
+    $self->export_username($svc_acct) );
   ref($err_or_queue) ? '' : $err_or_queue;
 }
 
diff --git a/FS/FS/part_export/sqlradius_withdomain.pm b/FS/FS/part_export/sqlradius_withdomain.pm
new file mode 100644
index 000000000..1c8f38c9d
--- /dev/null
+++ b/FS/FS/part_export/sqlradius_withdomain.pm
@@ -0,0 +1,12 @@
+package FS::part_export::sqlradius_withdomain;
+
+use vars qw(@ISA);
+use FS::part_export::sqlradius;
+
+@ISA = qw(FS::part_export::sqlradius);
+
+sub export_username {
+  my($self, $svc_acct) = (shift, shift);
+  $svc_acct->email;
+}
+
diff --git a/FS/bin/freeside-sqlradius-reset b/FS/bin/freeside-sqlradius-reset
index 9d3a6a700..74f90a582 100755
--- a/FS/bin/freeside-sqlradius-reset
+++ b/FS/bin/freeside-sqlradius-reset
@@ -12,7 +12,9 @@ adminsuidsetup $user;
 
 #my $machine = shift or die &usage;
 
-my @exports = qsearch('part_export', { 'exporttype' => 'sqlradius' } );
+my @exports =  qsearch('part_export', { exporttype=>'sqlradius' } );
+push @exports, qsearch('part_export', { exporttype=>'sqlradius_withdomain' } );
+
 
 foreach my $export ( @exports ) {
   my $icradius_dbh = DBI->connect(
diff --git a/FS/t/part_export-sqlradius_withdomain.t b/FS/t/part_export-sqlradius_withdomain.t
new file mode 100644
index 000000000..504bf679f
--- /dev/null
+++ b/FS/t/part_export-sqlradius_withdomain.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::sqlradius_withdomain;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From 68d5b555f4f51ade6d3a2627e9c3e3b22a21a5a3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jun 2003 13:18:39 +0000
Subject: removing deprecated freeside-overdue

---
 FS/MANIFEST             |  30 ++++----
 FS/bin/freeside-overdue | 196 ------------------------------------------------
 2 files changed, 16 insertions(+), 210 deletions(-)
 delete mode 100755 FS/bin/freeside-overdue

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 272b5b731..846f37310 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -3,31 +3,31 @@ MANIFEST
 MANIFEST.SKIP
 Makefile.PL
 README
-bin/freeside-bill
-bin/freeside-daily
-bin/freeside-email
-bin/freeside-queued
 bin/freeside-addoutsource
 bin/freeside-addoutsourceuser
+bin/freeside-adduser
+bin/freeside-apply-credits
+bin/freeside-bill
+bin/freeside-cc-receipts-report
+bin/freeside-count-active-customers
+bin/freeside-credit-report
+bin/freeside-daily
 bin/freeside-deloutsource
 bin/freeside-deloutsourceuser
-bin/freeside-apply-credits
-bin/freeside-adduser
 bin/freeside-deluser
-bin/freeside-setup
-bin/freeside-setinvoice
-bin/freeside-overdue
+bin/freeside-email
+bin/freeside-expiration-alerter
+bin/freeside-queued
 bin/freeside-radgroup
 bin/freeside-receivables-report
+bin/freeside-reexport
 bin/freeside-selfservice-server
+bin/freeside-setinvoice
+bin/freeside-setup
 bin/freeside-sqlradius-radacctd
 bin/freeside-sqlradius-reset
 bin/freeside-sqlradius-seconds
 bin/freeside-tax-report
-bin/freeside-cc-receipts-report
-bin/freeside-credit-report
-bin/freeside-expiration-alerter
-bin/freeside-reexport
 FS.pm
 FS/CGI.pm
 FS/InitHandler.pm
@@ -130,6 +130,7 @@ t/Misc.t
 t/Record.t
 t/UID.t
 t/Msgcat.t
+t/SearchCache.t
 t/cust_bill.t
 t/cust_bill_event.t
 t/cust_bill_pay.t
@@ -146,6 +147,7 @@ t/cust_pay_batch.t
 t/cust_pkg.t
 t/cust_refund.t
 t/cust_svc.t
+t/cust_tax_exempt.t
 t/domain_record.t
 t/nas.t
 t/part_bill_event.t
@@ -190,6 +192,6 @@ t/svc_www.t
 t/type_pkgs.t
 t/queue.t
 t/queue_arg.t
+t/queue_depend.t
 t/msgcat.t
 t/raddb.t
-t/cust_tax_exempt.t
diff --git a/FS/bin/freeside-overdue b/FS/bin/freeside-overdue
deleted file mode 100755
index 116245f9c..000000000
--- a/FS/bin/freeside-overdue
+++ /dev/null
@@ -1,196 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use vars qw( $days_to_pay $cust_main $cust_pkg 
-             $cust_svc $svc_acct );
-use Getopt::Std;
-use FS::cust_main;
-use FS::cust_pkg;
-use FS::cust_svc;
-use FS::svc_acct;
-use FS::Record qw(qsearch qsearchs);
-use FS::UID qw(adminsuidsetup);
-
-&untaint_argv;
-my %opt;
-getopts('ed:qpl:scbyoi', \%opt);
-my $user = shift or die &usage;
-
-adminsuidsetup $user;
-
-my $now = time; #eventually take a time option like freeside-bill
-my ($sec,$min,$hour,$mday,$mon,$year) =
-  (localtime($now) )[0,1,2,3,4,5];
-$mon++;
-$year += 1900;
-
-foreach $cust_main ( qsearch('cust_main',{} ) ) {
-
-  my ( $eyear, $emon, $eday ) = ( 2037, 12, 31 );
-  if ( $cust_main->paydate =~ /^(\d{4})\-(\d{1,2})\-(\d{1,2})$/
-       && $cust_main->payby eq 'BILL') {
-    ( $eyear, $emon, $eday ) = ( $1, $2, $3 );
-  }
-
-  if ( ( $opt{d}
-           && $cust_main->balance_date(time - $opt{d} * 86400) > 0
-           && qsearchs( 'cust_pkg', { 'custnum' => $cust_main->custnum,
-                                      'susp' => "" } ) )
-       || ( $opt{e}
-            && $cust_main->payby eq 'BILL'
-            && ( $eyear < $year
-                 || ( $eyear == $year && $emon < $mon ) ) )
-  ) { 
-
-    unless ( $opt{q} ) {
-      print $cust_main->custnum, "\t",
-            $cust_main->last, "\t", $cust_main->first, "\t",
-            $cust_main->balance_date(time-$opt{d} * 86400);
-    }
-
-    if ( $opt{p} && ! grep { $_ eq 'POST' } $cust_main->invoicing_list ) {
-      print "\n\tAdding postal invoicing" unless $opt{q};
-      my @invoicing_list = $cust_main->invoicing_list;
-      push @invoicing_list, 'POST';
-      $cust_main->invoicing_list(\@invoicing_list);
-    }
-
-    if ( $opt{l} ) {
-      print "\n\tCharging late fee of \$$opt{l}" unless $opt{q};
-      my $error = $cust_main->charge($opt{l}, 'Late fee');
-      # comment or plandata with info so we don't redo the same late fee every
-      # day
-    }
-
-    foreach $cust_pkg ( qsearch( 'cust_pkg', 
-                                 { 'custnum' => $cust_main->custnum } ) ) {
-
-      if ($opt{s}) {
-        print "\n\tSuspending pkgnum " . $cust_pkg->pkgnum unless $opt{q};
-        $cust_pkg->suspend;
-      }
-
-      if ($opt{c}) {
-        print "\n\tCancelling pkgnum " . $cust_pkg->pkgnum unless $opt{q};
-        $cust_pkg->cancel;
-      }
-      
-    }
-
-    if ( $opt{b} ) {
-      print "\n\tBilling" unless $opt{q};
-      my $error = $cust_main->bill('time'=>$now);
-      warn "Error billing,  customer #" . $cust_main->custnum . 
-        ":" . $error if $error;
-    }
-
-    if ( $opt{y} ) {
-      print "\n\tApplying outstanding payments and credits" unless $opt{q};
-      $cust_main->apply_payments;
-      $cust_main->apply_credits;
-    }
-
-    if ( $opt{o} ) {
-      print "\n\tCollecting" unless $opt{q};
-      my $error = $cust_main->collect(
-        'invoice_time' => $now,
-        'batch_card'   => $opt{i} ? 'no' : 'yes',
-        'force_print'  => 'yes',
-      );
-      warn "Error collecting from customer #" . $cust_main->custnum.  ":$error"
-        if $error;
-    }
-
-    print "\n" unless $opt{q};
-
-  }
-
-}
-
-sub untaint_argv {
-  foreach $_ ( $[ .. $#ARGV ) { 
-    $ARGV[$_] =~ /^([\w\-\/\.]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
-    $ARGV[$_]=$1;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n    freeside-overdue [ -e ] [ -d days ] [ -q ] [ -p ] [ -l amount ] [ -s ] [ -c ] [ -b ] [ -y ] [ -o [ -i ] ] user\n";
-}
-
-
-=head1 NAME
-
-freeside-overdue - Perform actions on overdue and/or expired accounts.
-
-=head1 SYNOPSIS
-
-  freeside-overdue [ -e ] [ -d days ] [ -q ] [ -p ] [ -l amount ] [ -s ] [ -c ] [ -b ] [ -y ] [ -o [ -i ] ] user
-
-=head1 DESCRIPTION
-
-This script is deprecated in 1.4.0.  You should use freeside-daily and invoice
-events instead.
-
-Performs actions on overdue and/or expired accounts.
-
-Selection options (at least one selection option is required):
-
-  -d:  Customers with a balance due on invoices older than the supplied number
-       of days.  Requires an integer argument.
-
-  -e:  Customers with a billing expiration date in the past.
-
-Action options: 
-
-  -q:  Be quiet (by default, selected accounts are printed).
-
-  -p:  Add postal invoicing to the relevant customers.
-
-  -l:  Add a charge of the given amount to the relevant customers.
-
-  -s:  Suspend accounts.
-
-  -c:  Cancel accounts.
-
-  -b:  Bill customers (create invoices)
-
-  -y:  Apply unapplied payments and credits
-
-  -o:  Collect from customers (charge cards, print invoices)
-
-    -i:  real-time billing (as opposed to batch billing).  only relevant
-         for credit cards.
-
-  user: From the mapsecrets file - see config.html from the base documentation
-
-=head1 CRONTAB
-
-Example crontab entries:
-
-# suspend expired accounts
-20 4 * * * freeside-overdue -e -s user
-
-# quietly add postal invoicing to customers over 30 days past due
-20 4 * * * freeside-overdue -d 30 -p -q user
-
-# suspend accounts and charge a $10.23 fee for customers over 60 days past due
-20 4 * * * freeside-overdue -d 60 -s -l 10.23 user
-
-# cancel accounts over 90 days past due
-20 4 * * * freeside-overdue -d 90 -c user
-
-=head1 ORIGINAL AUTHORS
-
-Original disable-overdue version by mw/kwh: Mark W.? and Kristian Hoffmann ?
-
-Ivan seems to be turning it into the "do-everything" CLI.
-
-=head1 BUGS
-
-Hell now that this is the do-everything CLI it should have --longoptions
-
-=cut
-
-1;
-
-- 
cgit v1.2.1


From f78217427dce10b328e4140c6e6c796aa212c599 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jun 2003 18:56:05 +0000
Subject: pass additional fields to ACH processors (Authorize.Net should work
 now)

---
 FS/FS/cust_main.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b45540095..ea6f032f4 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1556,6 +1556,10 @@ sub realtime_bop {
     ( $content{account_number}, $content{routing_code} ) =
       split('@', $self->payinfo);
     $content{bank_name} = $self->payname;
+    $content{account_type} = 'CHECKING';
+    $content{account_name} = $payname;
+    $content{customer_org} = $self->company ? 'B' : 'I';
+    $content{customer_ssn} = $self->ss;
   } elsif ( $method eq 'LEC' ) {
     $content{phone} = $self->payinfo;
   }
-- 
cgit v1.2.1


From 40c5ef8814185ba19b68edc8aab96afc75b95e06 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jun 2003 19:16:50 +0000
Subject: bugfix for manual re-charging changes (Bug#423)

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index ea6f032f4..165e6962b 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1451,7 +1451,7 @@ sub retry_realtime {
                  && $_->status eq 'done'
                  && $_->statustext
              }
-          $_->cust_bill_event;
+          $cust_bill->cust_bill_event;
     next unless @cust_bill_event;
     my $error = $cust_bill_event[0]->retry;
     if ( $error ) {
-- 
cgit v1.2.1


From e0bbe0e15d90b4fe8abf45b0cb3e4eee3c9810e2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 1 Jul 2003 00:27:41 +0000
Subject: typo

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 0941da1fb..ff519969d 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -902,7 +902,7 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
       'desc' => 'Real-time export to SQL-backed RADIUS (ICRADIUS, FreeRADIUS)',
       'options' => \%sqlradius_options,
       'nodomain' => 'Y',
-      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  This export does not export RADIUS realms (see also sqlradius_withdomain).  AAn existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.',
+      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  This export does not export RADIUS realms (see also sqlradius_withdomain).  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.',
     },
 
     'sqlradius_withdomain' => {
-- 
cgit v1.2.1


From b0b6550717b6507a7cb27ea5a8c5cd5719d7d9c6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 1 Jul 2003 09:00:45 +0000
Subject: larger textareas in export options

---
 httemplate/edit/part_export.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 24d646b8b..cc60f1aeb 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -67,7 +67,7 @@ my $widget = new HTML::Widgets::SelectLayers(
         }
         $html .= '</SELECT>';
       } elsif ( $type eq 'textarea' ) {
-        $html .= qq!<TEXTAREA NAME="$option" COLS=80 WRAP="virtual">!.
+        $html .= qq!<TEXTAREA NAME="$option" COLS=80 ROWS=8 WRAP="virtual">!.
                  qq!$value</TEXTAREA>!;
       } elsif ( $type eq 'text' ) {
         $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
-- 
cgit v1.2.1


From 4f4ba96481821fb7e9c25e7258737d4a0de7c26b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 2 Jul 2003 12:34:25 +0000
Subject: change license to GPL only

---
 Artistic | 125 ---------------------------------------------------------------
 README   |  16 +++-----
 2 files changed, 5 insertions(+), 136 deletions(-)
 delete mode 100644 Artistic

diff --git a/Artistic b/Artistic
deleted file mode 100644
index 4ffc78e97..000000000
--- a/Artistic
+++ /dev/null
@@ -1,125 +0,0 @@
-                      The "Artistic License"
-
-                             Preamble
-
-The intent of this document is to state the conditions under which a
-Package may be copied, such that the Copyright Holder maintains some
-semblance of artistic control over the development of the Package,
-while giving the users of the package the right to use and distribute
-the Package in a more-or-less customary fashion, plus the right to make
-reasonable modifications.
-
-It also grants you the rights to reuse parts of a Package in your own
-programs without transferring this License to those programs, provided
-that you meet some reasonable requirements.
-
-Definitions:
-
-        "Package" refers to the collection of files distributed by the
-        Copyright Holder, and derivatives of that collection of files
-        created through textual modification.
-
-        "Standard Version" refers to such a Package if it has not been
-        modified, or has been modified in accordance with the wishes
-        of the Copyright Holder as specified below.
-
-        "Copyright Holder" is whoever is named in the copyright or
-        copyrights for the package.
-
-        "You" is you, if you're thinking about copying or distributing
-        this Package.
-
-        "Reasonable copying fee" is whatever you can justify on the
-        basis of media cost, duplication charges, time of people involved,
-        and so on.  (You will not be required to justify it to the
-        Copyright Holder, but only to the computing community at large
-        as a market that must bear the fee.)
-
-        "Freely Available" means that no fee is charged for the item
-        itself, though there may be fees involved in handling the item.
-        It also means that recipients of the item may redistribute it
-        under the same conditions they received it.
-
-1. You may make and give away verbatim copies of the source form of the
-Standard Version of this Package without restriction, provided that you
-duplicate all of the original copyright notices and associated disclaimers.
-
-2. You may apply bug fixes, portability fixes and other modifications
-derived from the Public Domain or from the Copyright Holder.  A Package
-modified in such a way shall still be considered the Standard Version.
-
-3. You may otherwise modify your copy of this Package in any way, provided
-that you insert a prominent notice in each changed file stating how and
-when you changed that file, and provided that you do at least ONE of the
-following:
-
-    a) place your modifications in the Public Domain or otherwise make them
-    Freely Available, such as by posting said modifications to Usenet or
-    an equivalent medium, or placing the modifications on a major archive
-    site such as uunet.uu.net, or by allowing the Copyright Holder to include
-    your modifications in the Standard Version of the Package.
-
-    b) use the modified Package only within your corporation or organization.
-
-    c) rename any non-standard executables so the names do not conflict
-    with standard executables, which must also be provided, and provide
-    a separate manual page for each non-standard executable that clearly
-    documents how it differs from the Standard Version.
-
-    d) make other distribution arrangements with the Copyright Holder.
-
-4. You may distribute the programs of this Package in object code or
-executable form, provided that you do at least ONE of the following:
-
-    a) distribute a Standard Version of the executables and library files,
-    together with instructions (in the manual page or equivalent) on where
-    to get the Standard Version.
-
-    b) accompany the distribution with the machine-readable source of
-    the Package with your modifications.
-
-    c) give non-standard executables non-standard names, and clearly
-    document the differences in manual pages (or equivalent), together
-    with instructions on where to get the Standard Version.
-
-    d) make other distribution arrangements with the Copyright Holder.
-
-5. You may charge a reasonable copying fee for any distribution of this
-Package.  You may charge any fee you choose for support of this
-Package.  You may not charge a fee for this Package itself.  However,
-you may distribute this Package in aggregate with other (possibly
-commercial) programs as part of a larger (possibly commercial) software
-distribution provided that you do not advertise this Package as a
-product of your own.
-
-6. The scripts and library files supplied as input to or produced as
-output from the programs of this Package do not automatically fall
-under the copyright of this Package, but belong to whomever generated
-them, and may be sold commercially, and may be aggregated with this
-Package.  If such scripts or library files are aggregated with this
-Package via the so-called "undump" or "unexec" methods of producing a
-binary executable image, then distribution of such an image shall
-neither be construed as a distribution of this Package nor shall it
-fall under the restrictions of Paragraphs 3 and 4, provided that you do
-not represent such an executable image as a Standard Version of this
-Package.
-
-7. You may reuse parts of this Package in your own programs, provided that
-you explicitly state where you got them from, in the source code (and, left
-to your courtesy, in the documentation), duplicating all the associated
-copyright notices and disclaimers. Besides your changes, if any, must be
-clearly marked as such. Parts reused that way will no longer fall under this
-license if, and only if, the name of your program(s) have no immediate
-connection with the name of the Package itself or its associated programs.
-You may then apply whatever restrictions you wish on the reused parts or
-choose to place them in the Public Domain--this will apply only within the
-context of your package.
-
-8. The name of the Copyright Holder may not be used to endorse or promote
-products derived from this software without specific prior written permission.
-
-9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-                                The End
diff --git a/README b/README
index 44692e6f9..1030b3857 100644
--- a/README
+++ b/README
@@ -1,32 +1,26 @@
 Freeside
 
-Copyright (C) 2000,2001,2002 Ivan Kohler
+Copyright (C) 2000,2001,2002,2003 Ivan Kohler
 Copyright (C) 1999 Silicon Interactive Software Design
 All rights reserved
 
     This program is free software; you can redistribute it and/or modify
-    it under the terms of either:
+    it under the terms of:
 
         a) the GNU General Public License as published by the Free
         Software Foundation; either version 2, or (at your option) any
-        later version, or
-
-        b) the "Artistic License"
+        later version
 
     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 either the
-    GNU General Public License or the Artistic License for more details.
+    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, in the file `GPL'; if not,
     write to the Free Software Foundation, Inc., 59 Temple Place - Suite
     330, Boston, MA 02111-1307, USA.
 
-    You should have received a copy of the Artistic License along with
-    this program, in the file `Artistic'; if not, download it from
-    http://www.perl.com/CPAN/doc/misc/license/Artistic
-
 Freeside is a billing and administration package for Internet Service 
 Providers.
 
-- 
cgit v1.2.1


From 035d0767d78b76853a8804a67325de10165df220 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 2 Jul 2003 12:56:04 +0000
Subject: relaxed "first package" restrictions; will find any appropriate
 service with quantity 1

---
 FS/FS/part_pkg.pm          | 12 +++++++-----
 fs_signup/fs_signup_server |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 60b0e01f9..6571c529b 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -267,12 +267,14 @@ SVCDB is specified and does not match the svcdb of the service definition,
 
 sub svcpart {
   my $self = shift;
-  my $svcdb = shift;
-  my @pkg_svc = $self->pkg_svc;
-  return '' if scalar(@pkg_svc) != 1
-               || $pkg_svc[0]->quantity != 1
-               || ( $svcdb && $pkg_svc[0]->part_svc->svcdb ne $svcdb );
+  my $svcdb = scalar(@_) ? shift : '';
+  my @pkg_svc = grep {
+    $_->quantity == 1
+    && ( $svcdb eq $_->part_svc->svcdb || !$svcdb )
+  } $self->pkg_svc;
+  return '' if scalar(@pkg_svc) != 1;
   $pkg_svc[0]->svcpart;
+
 }
 
 =item payby
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 36af40a57..d6eb4a8d5 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -162,7 +162,7 @@ while (1) {
     my $part_pkg =
       qsearchs( 'part_pkg', { 'pkgpart' => $pkgpart } )
         or $error ||= "WARNING: unknown pkgpart: $pkgpart";
-    my $svcpart = $part_pkg->svcpart unless $error;
+    my $svcpart = $part_pkg->svcpart('svc_acct') unless $error;
 
     my $cust_pkg = new FS::cust_pkg ( {
       #later#'custnum' => $custnum,
-- 
cgit v1.2.1


From 1116af6d9150abdf8e0438f45c78b357ab8820a6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 2 Jul 2003 12:58:55 +0000
Subject: tyop

---
 FS/FS/part_pkg.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 6571c529b..6525864c4 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -274,7 +274,6 @@ sub svcpart {
   } $self->pkg_svc;
   return '' if scalar(@pkg_svc) != 1;
   $pkg_svc[0]->svcpart;
-
 }
 
 =item payby
-- 
cgit v1.2.1


From d3eefd3591dbd54a1626cca247c7a34b57d89f96 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 3 Jul 2003 23:00:07 +0000
Subject: working DBIx::Profile again

---
 htetc/global.asa | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htetc/global.asa b/htetc/global.asa
index 555364223..d87f1eac6 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -110,8 +110,12 @@ sub Script_OnFlush {
   my $ref = $Response->{BinaryRef};
   #$$ref = $cgi->header( @FS::CGI::header ) . $$ref;
   #$$ref = $cgi->header() . $$ref;
-  if ( dbh->can('sprintProfile') ) {
-    if ( lc($Response->{ContentType}) eq 'text/html' ) {
+  #warn "Script_OnFlush called with dbh ". dbh. "\n";
+  #if ( dbh->can('sprintProfile') ) {
+  if ( UNIVERSAL::can(dbh,'sprintProfile') ) {
+    #warn "dbh can sprintProfile\n";
+    if ( lc($Response->{ContentType}) eq 'text/html' ) { #con
+      #warn "contenttype is sprintProfile\n";
       $$ref =~ s/<\/BODY>[\s\n]*<\/HTML>[\s\n]*$//i
         or warn "can't remove";
   
-- 
cgit v1.2.1


From af213c494294f73750b6b5b07ca828782ff3a9e4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Jul 2003 00:51:29 +0000
Subject: optimize javascript to handle large numbers of POPs

---
 FS/FS/svc_acct_pop.pm                    | 5 ++---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 8 +++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/FS/FS/svc_acct_pop.pm b/FS/FS/svc_acct_pop.pm
index 3c9ea0130..404816b47 100644
--- a/FS/FS/svc_acct_pop.pm
+++ b/FS/FS/svc_acct_pop.pm
@@ -142,8 +142,7 @@ sub popselector {
     
     function popstate_changed(what) {
       state = what.options[what.selectedIndex].text;
-      for (var i = what.form.popnum.length;i > 0;i--)
-                what.form.popnum.options[i] = null;
+      what.form.popnum.options.length = 0
       what.form.popnum.options[0] = new Option("", "", false, true);
 END
 
@@ -182,7 +181,7 @@ END
 
 =head1 VERSION
 
-$Id: svc_acct_pop.pm,v 1.7 2002-04-10 13:42:48 ivan Exp $
+$Id: svc_acct_pop.pm,v 1.8 2003-07-04 00:51:29 ivan Exp $
 
 =head1 BUGS
 
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index de142a1c4..09bdd43fa 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.37 2003-06-24 15:34:45 ivan Exp $
+# $Id: signup.cgi,v 1.38 2003-07-04 00:51:29 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages $pops $init_data $error
@@ -401,8 +401,7 @@ sub popselector {
 
     function acstate_changed(what) {
       state = what.options[what.selectedIndex].text;
-      for (var i = what.form.popac.length;i > 0;i--)
-                what.form.popac.options[i] = null;
+      what.form.popac.options.length = 0
       what.form.popac.options[0] = new Option("Area code", "-1", false, true);
 END
 
@@ -422,8 +421,7 @@ END
   $text .= <<END;
   function popac_changed(what) {
     ac = what.options[what.selectedIndex].text;
-    for (var i = what.form.popnum.length;i > 0;i--)
-        what.form.popnum.options[i] = null;
+    what.form.popnum.options.length = 0;
     what.form.popnum.options[0] = new Option("City", "-1", false, true);
 
 END
-- 
cgit v1.2.1


From f2098c54512150c098f28f59ffe4a62464ef630e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Jul 2003 01:37:46 +0000
Subject: don't populate the whole initial list if there are tons of POPs

---
 FS/FS/svc_acct_pop.pm                    | 10 ++++++--
 fs_signup/FS-SignupClient/cgi/signup.cgi | 41 +++++++++++++++++++-------------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/FS/FS/svc_acct_pop.pm b/FS/FS/svc_acct_pop.pm
index 404816b47..196ab7ebb 100644
--- a/FS/FS/svc_acct_pop.pm
+++ b/FS/FS/svc_acct_pop.pm
@@ -166,7 +166,13 @@ END
   $text .= '</SELECT>'; #callback? return 3 html pieces?  #'</TD><TD>';
 
   $text .= qq!<SELECT NAME="popnum" SIZE=1><OPTION> !;
-  foreach my $pop ( @svc_acct_pop ) {
+  my @initial_select;
+  if ( scalar(@svc_acct_pop) > 100 ) {
+    @initial_select = qsearchs( 'svc_acct_pop', { 'popnum' => $popnum } );
+  } else {
+    @initial_select = @svc_acct_pop;
+  }
+  foreach my $pop ( @initial_select ) {
     $text .= qq!<OPTION VALUE="!. $pop->popnum. '"'.
              ( ( $popnum && $pop->popnum == $popnum ) ? ' SELECTED' : '' ). ">".
              $pop->text;
@@ -181,7 +187,7 @@ END
 
 =head1 VERSION
 
-$Id: svc_acct_pop.pm,v 1.8 2003-07-04 00:51:29 ivan Exp $
+$Id: svc_acct_pop.pm,v 1.9 2003-07-04 01:37:46 ivan Exp $
 
 =head1 BUGS
 
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 09bdd43fa..b40068520 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,9 +1,11 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.38 2003-07-04 00:51:29 ivan Exp $
+# $Id: signup.cgi,v 1.39 2003-07-04 01:37:46 ivan Exp $
 
 use strict;
-use vars qw( @payby $cgi $locales $packages $pops $init_data $error
+use vars qw( @payby $cgi $locales $packages
+             $pops %pop %popnum2pop
+             $init_data $error
              $last $first $ss $company $address1 $address2 $city $state $county
              $country $zip $daytime $night $fax $invoicing_list $payby $payinfo
              $paydate $payname $referral_custnum
@@ -137,6 +139,12 @@ if ( -e $decline_html ) {
 ( $locales, $packages, $pops, $init_data ) = signup_info();
 @payby = @{$init_data->{'payby'}} if @{$init_data->{'payby'}};
 $packages = $init_data->{agentnum2part_pkg}{$agentnum} if $agentnum;
+%pop = ();
+%popnum2pop = ();
+foreach (@$pops) {
+  push @{ $pop{ $_->{state} }->{ $_->{ac} } }, $_;
+  $popnum2pop{$_->{popnum}} = $_;
+}
 
 $cgi = new CGI;
 
@@ -328,7 +336,7 @@ sub print_okay {
     or die "fatal: invalid email_name got past FS::SignupClient::new_customer";
   $email_name = $1; #global for template
 
-  my $pop = pop_info($cgi->param('popnum'));
+  my $pop = $popnum2pop{$cgi->param('popnum')};
     #or die "fatal: invalid popnum got past FS::SignupClient::new_customer";
   if ( $pop ) {
     ( $ac, $exch, $loc ) = ( $pop->{'ac'}, $pop->{'exch'}, $pop->{'loc'} );
@@ -366,15 +374,6 @@ sub print_okay {
   }
 }
 
-sub pop_info {
-  my $popnum = shift;
-  my $pop;
-  foreach $pop ( @{$pops} ) {
-    if ( $pop->{'popnum'} == $popnum ) { return $pop; }
-  }
-  '';
-}
-
 #horrible false laziness with FS/FS/svc_acct_pop.pm::popselector
 sub popselector {
 
@@ -386,10 +385,12 @@ sub popselector {
          '<INPUT TYPE="hidden" NAME="popnum" VALUE="'. $pops->[0]{popnum}. '">'
     if scalar(@$pops) == 1;
 
-  my %pop = ();
-  foreach (@$pops) {
-    push @{ $pop{ $_->{state} }->{ $_->{ac} } }, $_;
-  }
+  #my %pop = ();
+  #my %popnum2pop = ();
+  #foreach (@$pops) {
+  #  push @{ $pop{ $_->{state} }->{ $_->{ac} } }, $_;
+  #  $popnum2pop{$_->{popnum}} = $_;
+  #}
 
   my $text = <<END;
     <SCRIPT>
@@ -460,8 +461,14 @@ END
 
   $text .= qq!<TR><TD><SELECT NAME="popnum" SIZE=1 STYLE="width: 20em"><OPTION>City!;
 
+
   #comment this block to disable initial list polulation
-  foreach my $pop ( sort { $a->{state} cmp $b->{state} } @$pops ) {
+  if ( scalar( @$pops ) > 100 ) {
+    @initial_select = ( $popnum2pop{$popnum} );
+  } else {
+    @initial_select = $@pops;
+  }
+  foreach my $pop ( sort { $a->{state} cmp $b->{state} } @initial_select ) {
     $text .= qq!<OPTION VALUE="!. $pop->{popnum}. '"'.
              ( ( $popnum && $pop->{popnum} == $popnum ) ? ' SELECTED' : '' ). ">".
              $pop->{city}. ', '. $pop->{state}.
-- 
cgit v1.2.1


From 349bf226f727807000f517f5a48a806bf660290f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Jul 2003 01:48:24 +0000
Subject: typo

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index b40068520..ebdcaf0b9 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.39 2003-07-04 01:37:46 ivan Exp $
+# $Id: signup.cgi,v 1.40 2003-07-04 01:48:24 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages
@@ -463,10 +463,11 @@ END
 
 
   #comment this block to disable initial list polulation
+  my @initial_select;
   if ( scalar( @$pops ) > 100 ) {
     @initial_select = ( $popnum2pop{$popnum} );
   } else {
-    @initial_select = $@pops;
+    @initial_select = @$pops;
   }
   foreach my $pop ( sort { $a->{state} cmp $b->{state} } @initial_select ) {
     $text .= qq!<OPTION VALUE="!. $pop->{popnum}. '"'.
-- 
cgit v1.2.1


From 2dea5fa76be5ba6b2a23fe84371aa921ae188100 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Jul 2003 01:54:17 +0000
Subject: don't add extra blank pop

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index ebdcaf0b9..3c3fb6442 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.40 2003-07-04 01:48:24 ivan Exp $
+# $Id: signup.cgi,v 1.41 2003-07-04 01:54:17 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages
@@ -463,9 +463,9 @@ END
 
 
   #comment this block to disable initial list polulation
-  my @initial_select;
+  my @initial_select = ();
   if ( scalar( @$pops ) > 100 ) {
-    @initial_select = ( $popnum2pop{$popnum} );
+    push @initial_select, $popnum2pop{$popnum} if $popnum2pop{$popnum};
   } else {
     @initial_select = @$pops;
   }
-- 
cgit v1.2.1


From e75548b5d5328a9475e7c6e90ebec8a3fe344f46 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Jul 2003 03:12:21 +0000
Subject: add "initial_popstate" option to signup server

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 3c3fb6442..28b739eec 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.41 2003-07-04 01:54:17 ivan Exp $
+# $Id: signup.cgi,v 1.42 2003-07-04 03:12:21 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages
@@ -8,7 +8,7 @@ use vars qw( @payby $cgi $locales $packages
              $init_data $error
              $last $first $ss $company $address1 $address2 $city $state $county
              $country $zip $daytime $night $fax $invoicing_list $payby $payinfo
-             $paydate $payname $referral_custnum
+             $paydate $payname $referral_custnum $init_popstate
              $pkgpart $username $password $password2 $sec_phrase $popnum
              $agentnum
              $ieak_file $ieak_template $cck_file $cck_template
@@ -213,6 +213,7 @@ if ( defined $cgi->param('magic') ) {
     $password         = $cgi->param('_password');
     $popnum           = $cgi->param('popnum');
     #$agentnum, #         = $cgi->param('agentnum'),
+    $init_popstate    = $cgi->param('init_popstate');
 
     if ( $cgi->param('_password') ne $cgi->param('_password2') ) {
       $error = $init_data->{msgcat}{passwords_dont_match}; #msgcat
@@ -303,12 +304,14 @@ if ( defined $cgi->param('magic') ) {
   $sec_phrase = '';
   $popnum = '';
   $referral_custnum = $cgi->param('ref') || '';
+  $init_popstate = $cgi->param('init_popstate') || '';
   print_form;
 }
 
 sub print_form {
 
   $cgi->delete('ref');
+  $cgi->delete('init_popstate');
   $self_url = $cgi->self_url;
 
   $error = "Error: $error" if $error;
@@ -399,15 +402,22 @@ sub popselector {
       var length = what.length;
       what.options[length] = optionName;
     }
+END
 
-    function acstate_changed(what) {
-      state = what.options[what.selectedIndex].text;
-      what.form.popac.options.length = 0
-      what.form.popac.options[0] = new Option("Area code", "-1", false, true);
+  if ( $init_popstate ) {
+    $text .='<INPUT TYPE="hidden" NAME="init_popstate" VALUE="$init_popstate">';
+  } else {
+    $text .= <<END;
+      function acstate_changed(what) {
+        state = what.options[what.selectedIndex].text;
+        what.form.popac.options.length = 0
+        what.form.popac.options[0] = new Option("Area code", "-1", false, true);
 END
+  } 
 
-  foreach my $state ( sort { $a cmp $b } keys %pop ) {
-    $text .= "\nif ( state == \"$state\" ) {\n";
+  my @states = $init_popstate ? ( $init_popstate ) : keys %pop;
+  foreach my $state ( sort { $a cmp $b } @states ) {
+    $text .= "\nif ( state == \"$state\" ) {\n" unless $init_popstate;
 
     foreach my $ac ( sort { $a cmp $b } keys %{ $pop{$state} }) {
       $text .= "opt(what.form.popac, \"$ac\", \"$ac\");\n";
@@ -415,7 +425,7 @@ END
         $text .= "what.form.popac.options[what.form.popac.length-1].selected = true;\n";
       }
     }
-    $text .= "}\n";
+    $text .= "}\n" unless $init_popstate;
   }
   $text .= "popac_changed(what.form.popac)}\n";
 
@@ -427,7 +437,7 @@ END
 
 END
 
-  foreach my $state ( keys %pop ) {
+  foreach my $state ( @states ) {
     foreach my $popac ( keys %{ $pop{$state} } ) {
       $text .= "\nif ( ac == \"$popac\" ) {\n";
 
@@ -452,7 +462,7 @@ END
     qq!<TABLE CELLPADDING="0"><TR><TD><SELECT NAME="acstate"! .
     qq!SIZE=1 onChange="acstate_changed(this)"><OPTION VALUE=-1>State!;
   $text .= "<OPTION" . ($_ eq $cgi->param('acstate') ? " SELECTED" : "") .
-           ">$_" foreach sort { $a cmp $b } keys %pop;
+           ">$_" foreach sort { $a cmp $b } @states;
   $text .= '</SELECT>'; #callback? return 3 html pieces?  #'</TD>';
 
   $text .=
-- 
cgit v1.2.1


From 1d98e81e8fabbe245a50a16b080c72ad51aca598 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Jul 2003 03:21:42 +0000
Subject: properly pass init_popstate to error pages

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 28b739eec..57b93d4f0 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.42 2003-07-04 03:12:21 ivan Exp $
+# $Id: signup.cgi,v 1.43 2003-07-04 03:21:42 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages
@@ -405,7 +405,8 @@ sub popselector {
 END
 
   if ( $init_popstate ) {
-    $text .='<INPUT TYPE="hidden" NAME="init_popstate" VALUE="$init_popstate">';
+    $text .= '<INPUT TYPE="hidden" NAME="init_popstate" VALUE="'.
+             $init_popstate. '">';
   } else {
     $text .= <<END;
       function acstate_changed(what) {
-- 
cgit v1.2.1


From 6e922098cca33e5533e59028b640156214ba936f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Jul 2003 03:27:35 +0000
Subject: removing ancient cybercash example

---
 etc/example-direct-cardin | 67 -----------------------------------------------
 1 file changed, 67 deletions(-)
 delete mode 100755 etc/example-direct-cardin

diff --git a/etc/example-direct-cardin b/etc/example-direct-cardin
deleted file mode 100755
index 1a4097221..000000000
--- a/etc/example-direct-cardin
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/local/bin/perl
-
-###
-# THIS IS FROM CYBERCASH (is there a newer version?)
-###
-
-$paymentserverhost = 'localhost';
-$paymentserverport = 8000;
-$paymentserversecret = 'two-turntables';
-use CCLib qw(sendmserver);
-
-# first lets fake up some data 
-# use time of day and pid to give me my pretend
-# order number
-# you obviously need to get real data from somewhere...
-
-$oid = "test$$"; #fake order number.
-$amount = 'usd 42.42';
-$ramount = 'usd 24.24';
-$pan = '4111111111111111';
-$name = 'John Q. Doe';
-$addr = '17 Richard Rd.';
-$city = 'Ivyland';
-$state = 'PA';
-$zip = '18974';
-$country = 'USA';
-$exp = '7/97';
-
-
-%result = &sendmserver('mauthcapture', 
-                       'Order-ID', $oid,
-		       'Amount', $amount,
-		       'Card-Number', $pan,
-		       'Card-Name', $name,
-		       'Card-Address', $addr,
-		       'Card-City', $city,
-		       'Card-State', $state,
-		       'Card-Zip', $zip,
-		       'Card-Country', $country,
-		       'Card-Exp', $exp);
-
-#
-# just dump results to stdout.
-# you should process them...
-# to allow results to affect operation of your fulfillment...
-#
-foreach (keys(%result)) {
-   print " $_ ==> $result{$_}\n";
-}
-
-print "\n";
-
-exit;
-
-$trans=$result{'MTransactionNumber'};
-$code=$result{'MRetrievalCode'};
-
-%result = &sendmserver('return',
-                        'Order-ID', $oid,
-			'Return-Amount',$ramount,
-			'Amount',$amount,
-			);
-
-foreach (keys(%result)) {
-   print " $_ ==> $result{$_}\n";
-}
-
-- 
cgit v1.2.1


From 0fd96aa47e2d0abe220fa703f3b44620b246d581 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Jul 2003 03:31:26 +0000
Subject: adding states

---
 etc/abbr_state.txt | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 etc/abbr_state.txt

diff --git a/etc/abbr_state.txt b/etc/abbr_state.txt
new file mode 100644
index 000000000..7e4f57f78
--- /dev/null
+++ b/etc/abbr_state.txt
@@ -0,0 +1,72 @@
+State/Possession		Abbreviation
+
+ALABAMA                         AL
+ALASKA                          AK
+AMERICAN SAMOA                  AS
+ARIZONA                         AZ
+ARKANSAS                        AR
+CALIFORNIA                      CA
+COLORADO                        CO
+CONNECTICUT                     CT
+DELAWARE                        DE
+DISTRICT OF COLUMBIA            DC
+FEDERATED STATES OF MICRONESIA  FM
+FLORIDA                         FL
+GEORGIA                         GA
+GUAM                            GU
+HAWAII                          HI
+IDAHO                           ID
+ILLINOIS                        IL
+INDIANA                         IN
+IOWA                            IA
+KANSAS                          KS
+KENTUCKY                        KY
+LOUISIANA                       LA
+MAINE                           ME
+MARSHALL ISLANDS                MH
+MARYLAND                        MD
+MASSACHUSETTS                   MA
+MICHIGAN                        MI
+MINNESOTA                       MN
+MISSISSIPPI                     MS
+MISSOURI                        MO
+MONTANA                         MT
+NEBRASKA                        NE
+NEVADA                          NV
+NEW HAMPSHIRE                   NH
+NEW JERSEY                      NJ
+NEW MEXICO                      NM
+NEW YORK                        NY
+NORTH CAROLINA                  NC
+NORTH DAKOTA                    ND
+NORTHERN MARIANA ISLANDS        MP
+OHIO                            OH
+OKLAHOMA                        OK
+OREGON                          OR
+PALAU                           PW
+PENNSYLVANIA                    PA
+PUERTO RICO                     PR
+RHODE ISLAND                    RI
+SOUTH CAROLINA                  SC
+SOUTH DAKOTA                    SD
+TENNESSEE                       TN
+TEXAS                           TX
+UTAH                            UT
+VERMONT                         VT
+VIRGIN ISLANDS                  VI
+VIRGINIA                        VA
+WASHINGTON                      WA
+WEST VIRGINIA                   WV
+WISCONSIN                       WI
+WYOMING                         WY
+
+
+Military "State"		Abbreviation
+
+Armed Forces Africa		AE
+Armed Forces Americas		AA
+(except Canada)
+Armed Forces Canada		AE
+Armed Forces Europe		AE
+Armed Forces Middle East	AE
+Armed Forces Pacific		AP
-- 
cgit v1.2.1


From aa053ef3fc28343d0951c61519c4f1846bf61b1f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Jul 2003 03:34:33 +0000
Subject: removing obsolete file

---
 etc/acp_logfile-parse | 197 --------------------------------------------------
 1 file changed, 197 deletions(-)
 delete mode 100755 etc/acp_logfile-parse

diff --git a/etc/acp_logfile-parse b/etc/acp_logfile-parse
deleted file mode 100755
index 5e258991b..000000000
--- a/etc/acp_logfile-parse
+++ /dev/null
@@ -1,197 +0,0 @@
-#!/usr/bin/perl
-
-###
-# WHO WROTE THIS???
-###
-
-#require "perldb.pl";
-
-#    Compute SLIP/PPP log times
-#     Arguments    -a   Process entire file with totals
-#                  -t   Process only totals
-#                  -f   File to be processed if not current
-#                  -d   processing start date (default is entire file)
-#                  -l   to return all totals for dayuse
-#                  -w   name of tmp work file for dayuse
-#                  user names
-
-require "time.pl";
-
-$space='        ';
-
-unless (@ARGV[0]) {
-       print "Missing Arguments\n";
-       print    "-a - entire file\n";
-       print    "-t - totals only\n";
-       print    "-f - file name to be processed\n";
-       print    "-d - processing start date (yymmdd)\n";
-       print    "-l - return totals for dayuse\n";
-       print    "-w - tmp work file for dayuse\n";
-       exit;
-}     # end if test for missing arguments
-
-$infile = "/usr/annex/acp_logfile";
-$tmpfile = "/tmp/ppp";
-$n = $#ARGV;
-$start_yymmdd = "";
-for ($i = 0; $i <= $n; $i++) {
-    if ($ARGV[$i] eq "-a") {
-             $allflag = "true";
-        }
-       elsif ($ARGV[$i] eq "-t") {
-                      $totalflag = "true";
-             }
-       elsif ($ARGV[$i] eq "-f") {
-        $i++;
-          $infile = $ARGV[$i];
-             }
-        elsif ($ARGV[$i] eq "-d") {
-          $i++;
-          $start_yymmdd = $ARGV[$i];
-          }   #end start yymmdd
-        elsif ($ARGV[$i] eq "-l") {
-           $logflag = "true";
-           $totalflag = "true";
-         }  #  end log 
-       elsif ($ARGV[$i] eq "-w") {
-        $i++;
-          $tmpfile = $ARGV[$i];
-             } #  end tmp file 
-        else    {
-            ($arg_user,$arg_yymmdd) = split (/:/, $ARGV[$i]);
-                 $ip_user_date {$arg_user} = $ARGV[$i];
-             $userflag = "true";
-                }   # end else
- } # end for 1 = 1 to n
-
-open (IN,$infile)
-        || die "Can't open acp_logfile";
-
-NEXTUSER: while (<IN>) {        
-        chop;
-        ($add,$ether,$port,$date,$time,$type,$action,$user) = split(/:/);
-
-        if ($logflag) {
-          $start_yymmdd = '';
-          if ($ip_user_date{$user}) {
-             ($ip_user, $start_yymmdd) = 
-                      split (/:/, $ip_user_date{$user});
-           }  # end get date
-        }   #  end log flag
-        if ($start_yymmdd) {
-           if ($date < $start_yymmdd) {
-               next NEXTUSER;
-           }  #end date compare
-        }  #end if date
-        if ($userflag){
-          if (!$ip_user_date{$user}) {
-               next NEXTUSER;
-          }  #  end user test
-        }  #   end by user or all
-        if (($totalflag) ||
-           ($allflag) ||
-           ($ip_user_date{$user})) {
-         if (($type eq 'ppp') || ($type eq 'slip'))  {
-
-            if ($action eq 'login') {
-                        $login{$user} = "$time:$date";
-
-                }
-                  elsif ($action eq 'logout') {
-                     if (!$login{$user}) {
-                          $login{$user} = "010101:$date";
-                      } #end pad user if carry over
-                        ($stime,$sdate) = split(':',$login{$user});
-                        $start = &annex2sec($stime);
-                        $end = &annex2sec($time);
-                        
-                        #If we went through midnight, add a day;
-                        if ($end < $start) {$end += 86400;}
-                        $timeon = $end - $start;
-
-                        $elapsed{$user} += $timeon;
-                        
-                      if (!$totalflag) {
-                        print (&fmt_user($user),
-                              '  ', &fmt_date($sdate), '  In: ', 
-                                &fmt_time($stime),'  Out: ',
-                                &fmt_time($time),
-                       '  Elapsed: ', &fmt_sec($timeon), "\n");
-                      }  # end total test
-                }  #end elsif action
-        }  #  type = ppp of slip
-    }  #  check arguments
-} 
-close IN;
-
-if ($logflag) {
-    open (TMPPPP, ">$tmpfile")
-               || die "Can't open ppp tmp file";
-    foreach $user ( sort((keys(%elapsed))) ) {
-        $log_time = &fmt_sec($elapsed{$user});
-        $tmp = join (':',
-                    $user, 
-                    $log_time);
-        print (TMPPPP "$tmp\n");
-    }
-    close (TMPPPP);
-}
-    else {
-        print "\n\nTotal Time On For Period:\n";
-        print     "-------------------------\n";
-
-        foreach $user ( sort((keys(%elapsed))) ) {
-           print (&fmt_user($user), "  ",&fmt_sec($elapsed{$user}), "\n");
-        }
-    }
-exit(0);
-
-#-------------------------------------------------------
-#--------------- Subroutines Start Here ----------------
-#-------------------------------------------------------
-
-sub annex2sec {
-        local($time) = @_;
-        return( &time2sec( &break_annex($time) ) );
-}
-
-sub fmt_date {
-        local($date) = @_;
-
-        return( substr($date,2,2).'/'.substr($date,4,2).'/'.substr($date,0,2) );
-}
-
-sub fmt_time {
-        local($time) = @_;
-        local($s,$m,$h) = &break_annex($time);
-        return ("$h:$m:$s");
-}
-
-
-sub break_annex {
-        local($time) = @_;
-        local($h,$m,$s);
-
-        $h=substr($time,0,2);
-        $m=substr($time,2,2);
-        $s=substr($time,4,2);
-
-        return ($s,$m,$h);
-}       
-
-sub fmt_sec {
-        local(@t) = &sec2time(@_);
-        @t[2] += (@t[3]*24);
-
-        foreach $a (@t) {
-                if ($a < 10) {$a = "0$a";}
-        }
-
-        return ("@t[2]:@t[1]:@t[0]");
-}
-
-sub fmt_user {
-        local($user) = @_;
-        return( $user.substr($space,0,8 - length($user) ).'  ' );
-}
-
-- 
cgit v1.2.1


From 243a197e349180c5ce181ba0771d316b423597eb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Jul 2003 03:47:35 +0000
Subject: adding

---
 fs_signup/FS-SignupClient/cgi/stateselect.html | 80 ++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 fs_signup/FS-SignupClient/cgi/stateselect.html

diff --git a/fs_signup/FS-SignupClient/cgi/stateselect.html b/fs_signup/FS-SignupClient/cgi/stateselect.html
new file mode 100644
index 000000000..39823be83
--- /dev/null
+++ b/fs_signup/FS-SignupClient/cgi/stateselect.html
@@ -0,0 +1,80 @@
+<HTML><HEAD><TITLE>ISP Signup</TITLE></HEAD>
+<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>ISP Signup - state selection</FONT><BR><BR>
+<SCRIPT>
+function gotoURL(object) {
+    window.location.href = object.options[object.selectedIndex].value;
+}
+</SCRIPT>
+<FORM>
+Select your state: 
+<SELECT NAME="init_popstate" onChange="gotoURL(this.form.init_popstate)">
+<OPTION VALUE="stateselect.html"></OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=AL">ALABAMA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=AK">ALASKA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=AS">AMERICAN SAMOA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=AZ">ARIZONA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=AR">ARKANSAS</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=CA">CALIFORNIA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=CO">COLORADO</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=CT">CONNECTICUT</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=DE">DELAWARE</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=DC">DISTRICT OF COLUMBIA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=FM">FEDERATED STATES OF MICRONESIA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=FL">FLORIDA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=GA">GEORGIA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=GU">GUAM</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=HI">HAWAII</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=ID">IDAHO</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=IL">ILLINOIS</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=IN">INDIANA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=IA">IOWA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=KS">KANSAS</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=KY">KENTUCKY</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=LA">LOUISIANA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=ME">MAINE</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=MH">MARSHALL ISLANDS</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=MD">MARYLAND</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=MA">MASSACHUSETTS</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=MI">MICHIGAN</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=MN">MINNESOTA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=MS">MISSISSIPPI</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=MO">MISSOURI</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=MT">MONTANA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=NE">NEBRASKA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=NV">NEVADA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=NH">NEW HAMPSHIRE</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=NJ">NEW JERSEY</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=NM">NEW MEXICO</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=NY">NEW YORK</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=NC">NORTH CAROLINA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=ND">NORTH DAKOTA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=MP">NORTHERN MARIANA ISLANDS</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=OH">OHIO</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=OK">OKLAHOMA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=OR">OREGON</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=PW">PALAU</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=PA">PENNSYLVANIA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=PR">PUERTO RICO</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=RI">RHODE ISLAND</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=SC">SOUTH CAROLINA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=SD">SOUTH DAKOTA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=TN">TENNESSEE</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=TX">TEXAS</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=UT">UTAH</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=VT">VERMONT</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=VI">VIRGIN ISLANDS</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=VA">VIRGINIA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=WA">WASHINGTON</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=WV">WEST VIRGINIA</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=WI">WISCONSIN</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=WY">WYOMING</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=AE">Armed Forces Africa</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=AA">Armed Forces Americas</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=AE">Armed Forces Canada</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=AE">Armed Forces Europe</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=AE">Armed Forces Middle East</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=AP">Armed Forces Pacific</OPTION>
+</SELECT>
+</FORM>
+</BODY>
+</HTML>
-- 
cgit v1.2.1


From a73084513b067a4d85d272970c43fba5d485b920 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 6 Jul 2003 18:58:57 +0000
Subject: don't bother displaying comments that are only whitespace/newlines

---
 httemplate/view/cust_main.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 4fe60fe79..c36c9e265 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -290,7 +290,7 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
 print '</TD></TR></TABLE>';
 
 if ( defined $cust_main->dbdef_table->column('comments')
-     && $cust_main->comments )
+     && $cust_main->comments =~ /[^\s\n\r]/ )
 {
   print "<BR>Comments". &ntable("#cccccc"). "<TR><TD>".
         &ntable("#cccccc",2).
-- 
cgit v1.2.1


From a1f82a6afd45e0fd208b1e69c6647195eab48bb6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Jul 2003 14:39:36 +0000
Subject: increase max domain length to 63

---
 httemplate/edit/svc_domain.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index d20e1f336..ca0e3398f 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -87,7 +87,7 @@ print ' CHECKED' if $kludge_action eq 'M';
 print qq!>Transfer!;
 
 print <<END;
-<P>Domain <INPUT TYPE="text" NAME="domain" VALUE="$domain" SIZE=28 MAXLENGTH=26>
+<P>Domain <INPUT TYPE="text" NAME="domain" VALUE="$domain" SIZE=28 MAXLENGTH=63>
 <BR>Purpose/Description: <INPUT TYPE="text" NAME="purpose" VALUE="$purpose" SIZE=64>
 <P><INPUT TYPE="submit" VALUE="Submit">
     </FORM>
-- 
cgit v1.2.1


From 3b0d96e466a6dbe2a27e45890b08e0fd79e8fdab Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 11 Jul 2003 07:30:57 +0000
Subject: provide stack backtrace when we wind up in FS::Record::AUTOLOAD by
 accident

---
 FS/FS/Record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 9a724feac..c756e9825 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -426,11 +426,11 @@ sub AUTOLOAD {
   $field =~ s/.*://;
   if ( defined($value) ) {
     confess "errant AUTOLOAD $field for $self (arg $value)"
-      unless $self->can('setfield');
+      unless $ref($self) && $self->can('setfield');
     $self->setfield($field,$value);
   } else {
     confess "errant AUTOLOAD $field for $self (no args)"
-      unless $self->can('getfield');
+      unless ref($self) && $self->can('getfield');
     $self->getfield($field);
   }    
 }
-- 
cgit v1.2.1


From c9ab1234bd0ab76260c7a967b0c0d3d55a03c735 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 11 Jul 2003 07:54:22 +0000
Subject: typo

---
 FS/FS/Record.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index c756e9825..02fd4e390 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -426,7 +426,7 @@ sub AUTOLOAD {
   $field =~ s/.*://;
   if ( defined($value) ) {
     confess "errant AUTOLOAD $field for $self (arg $value)"
-      unless $ref($self) && $self->can('setfield');
+      unless ref($self) && $self->can('setfield');
     $self->setfield($field,$value);
   } else {
     confess "errant AUTOLOAD $field for $self (no args)"
-- 
cgit v1.2.1


From 3d7644882ebf59fcac7230a408d06e7c4e1bb34b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 11 Jul 2003 15:23:33 +0000
Subject: payments report for inventivemedia / hpnx

---
 httemplate/index.html                  |  6 ++-
 httemplate/search/cust_pay.cgi         | 71 ++++++++++++++++++++++++++++------
 httemplate/search/cust_pkg.cgi         |  2 +
 httemplate/search/report_cust_pay.html | 24 ++++++++++++
 4 files changed, 89 insertions(+), 14 deletions(-)
 create mode 100644 httemplate/search/report_cust_pay.html

diff --git a/httemplate/index.html b/httemplate/index.html
index e5bd11806..7354b1c00 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -67,7 +67,8 @@
               <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
               <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
             </UL>
-      Financial reports
+      <A HREF="search/report_cust_pay.html">Payments</A>
+      <BR><BR>Financial reports
             <UL>
               <LI> <A HREF="search/report_receivables.cgi">current receivables</A>
               <LI> <A HREF="search/report_tax.html">tax reports</A>
@@ -134,7 +135,8 @@
         <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
         <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
       </UL>
-    Financial reports
+    <A HREF="search/report_cust_pay.html">Payments</A>
+    <BR><BR>Financial reports
             <UL>
               <LI> <A HREF="search/report_receivables.cgi">current receivables</A>
               <LI> <A HREF="search/report_tax.html">tax reports</A>
diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi
index b5bdf8296..d601617f9 100755
--- a/httemplate/search/cust_pay.cgi
+++ b/httemplate/search/cust_pay.cgi
@@ -1,12 +1,46 @@
 <%
 
-$cgi->param('payinfo') =~ /^\s*(\d+)\s*$/ or die "illegal payinfo";
-my $payinfo = $1;
-$cgi->param('payby') =~ /^(\w+)$/ or die "illegal payby";
-my $payby = $1;
-my @cust_pay = qsearch('cust_pay', { 'payinfo' => $payinfo,
+my $sortby;
+my @cust_pay;
+if ( $cgi->param('magic') && $cgi->param('magic') eq '_date' ) {
+
+  my %search;
+  if ( $cgi->param('payby') ) {
+    $cgi->param('payby') =~ /^(CARD|CHEK|BILL)$/
+      or die "illegal payby ". $cgi->param('payby');
+    $search{'payby'} = $1;
+  }
+
+  #false laziness with cust_pkg.cgi
+  my $range = '';
+  if ( $cgi->param('beginning')
+       && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
+    my $beginning = str2time($1);
+    $range = " WHERE _date >= $beginning ";
+  }
+  if ( $cgi->param('ending')
+            && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
+    my $ending = str2time($1) + 86400;
+    $range .= ( $range ? ' AND ' : ' WHERE ' ). " _date <= $ending ";
+  }
+
+  @cust_pay = qsearch('cust_pay', \%search, '', " $range" );
+
+  $sortby = \*date_sort;
+
+} else {
+
+  $cgi->param('payinfo') =~ /^\s*(\d+)\s*$/ or die "illegal payinfo";
+  my $payinfo = $1;
+
+  $cgi->param('payby') =~ /^(\w+)$/ or die "illegal payby";
+  my $payby = $1;
+
+  @cust_pay = qsearch('cust_pay', { 'payinfo' => $payinfo,
                                      'payby'   => $payby    } );
-my $sortby = \*date_sort;
+  $sortby = \*date_sort;
+
+}
 
 if (0) {
 #if ( scalar(@cust_pay) == 1 ) {
@@ -16,7 +50,7 @@ if (0) {
 %>
 <!-- mason kludge -->
 <%
-  idiot("Check # not found.");
+  idiot("Payment not found.");
   #exit;
 } else {
   my $total = scalar(@cust_pay);
@@ -24,9 +58,9 @@ if (0) {
 %>
 <!-- mason kludge -->
 <%
-  print header("Check # Search Results", menubar(
+  print header("Payment Search Results", menubar(
           'Main Menu', popurl(2)
-        )), "$total matching check$s found<BR>", &table(), <<END;
+        )), "$total matching payment$s found<BR>", &table(), <<END;
       <TR>
         <TH></TH>
         <TH>Amount</TH>
@@ -40,23 +74,36 @@ END
   foreach my $cust_pay (
     sort $sortby grep(!$saw{$_->paynum}++, @cust_pay)
   ) {
-    my($paynum, $custnum, $payinfo, $amount, $date ) = (
+    my($paynum, $custnum, $payby, $payinfo, $amount, $date ) = (
       $cust_pay->paynum,
       $cust_pay->custnum,
+      $cust_pay->payby,
       $cust_pay->payinfo,
       sprintf("%.2f", $cust_pay->paid),
       $cust_pay->_date,
     );
-    my $pdate = time2str("%b %d %Y", $date);
+    my $pdate = time2str("%b&nbsp;%d&nbsp;%Y", $date);
 
     my $rowspan = 1;
 
     my $view = popurl(2). "view/cust_main.cgi?". $custnum. 
                "#". $payby. $payinfo;
 
+    my $payment_info;
+    if ( $payby eq 'CARD' ) {
+      $payment_info = 'Card&nbsp;#'. 'x'x(length($payinfo)-4).
+                      substr($payinfo,(length($payinfo)-4));
+    } elsif ( $payby eq 'CHEK' ) {
+      $payment_info = "E-check&nbsp;acct#$payinfo";
+    } elsif ( $payby eq 'BILL' ) {
+      $payment_info = "Check&nbsp;#$payinfo";
+    } else {
+      $payment_info = "$payby&nbsp;$payinfo";
+    }
+
     print <<END;
       <TR>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$payinfo</FONT></A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$payment_info</FONT></A></TD>
         <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view"><FONT SIZE=-1>\$$amount</FONT></A></TD>
         <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$pdate</FONT></A></TD>
 END
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 12179eaca..603b5654c 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -19,6 +19,8 @@ my @cust_pkg;
 
 if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
   $sortby=\*bill_sort;
+
+  #false laziness with cust_pay.cgi
   my $range = '';
   if ( $cgi->param('beginning')
        && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
diff --git a/httemplate/search/report_cust_pay.html b/httemplate/search/report_cust_pay.html
new file mode 100644
index 000000000..93053e1ee
--- /dev/null
+++ b/httemplate/search/report_cust_pay.html
@@ -0,0 +1,24 @@
+<HTML>
+  <HEAD>
+    <TITLE>Payment report criteria</TITLE>
+  </HEAD>
+  <BODY>
+    <CENTER>
+      <H1>Payment report criteria</H1>
+    </CENTER>
+    <HR>
+    <FORM ACTION="cust_pay.cgi" METHOD="post">
+    <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
+      Return <SELECT NAME="payby">
+        <OPTION VALUE="">all</OPTION>
+        <OPTION VALUE="CARD">credit card</OPTION>
+        <OPTION VALUE="CHEK">electronic check (ACH)</OPTION>
+        <OPTION VALUE="BILL">check/cash</OPTION>
+      </SELECT> payments for period<BR>
+      from <INPUT TYPE="text" NAME="beginning"> <i>m/d/y</i>
+      to <INPUT TYPE="text" NAME="ending"> <i>m/d/y</i>
+      <P><INPUT TYPE="submit" VALUE="Get Report">
+    </FORM>
+  <HR>
+  </BODY>
+</HTML>
-- 
cgit v1.2.1


From 0fd73142247563fb21f7f6eef6c0de7ab00d3fc7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 11 Jul 2003 15:37:20 +0000
Subject: fix timelocal AUTOLOAD problem introduced by Time::Local fix in rc3
 (closes: Bug#550)

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 165e6962b..4302c504a 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -8,7 +8,7 @@ BEGIN {
   eval "use Time::Local;";
   die "Time::Local version 1.05 required with Perl versions before 5.6"
     if $] < 5.006 && !defined($Time::Local::VERSION);
-  eval "use Time::Local qw(timelocal_nocheck);";
+  eval "use Time::Local qw(timelocal timelocal_nocheck);";
 }
 use Date::Format;
 #use Date::Manip;
-- 
cgit v1.2.1


From 7c319f1608fd3459c992eda7743696fc745fccf1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Jul 2003 11:09:33 +0000
Subject: - better description of payment search - some clarification of
 services/packages vs. service/package   definitions in
 browse/part_{svc,pkg}.cgi - package definition report by # of active customer
 packages (with links   to customer package listing)

---
 httemplate/browse/part_pkg.cgi | 60 +++++++++++++++++++++++++++++++++++-------
 httemplate/browse/part_svc.cgi |  4 +--
 httemplate/index.html          |  7 ++---
 httemplate/search/cust_pkg.cgi | 14 +++++++++-
 4 files changed, 70 insertions(+), 15 deletions(-)

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 58422c67d..7b9436cee 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -11,15 +11,35 @@ if ( $cgi->param('showdisabled') ) {
 my @part_pkg = qsearch('part_pkg', \%search );
 my $total = scalar(@part_pkg);
 
+my $sortby;
+my %num_active_cust_pkg;
+if ( $cgi->param('active') ) {
+  my $active_sth = dbh->prepare(
+    'SELECT COUNT(*) FROM cust_pkg WHERE pkgpart = ?'.
+    ' AND ( cancel IS NULL OR cancel = 0 )'.
+    ' AND ( susp IS NULL OR susp = 0 )'
+  ) or die dbh->errstr;
+  foreach my $part_pkg ( @part_pkg ) {
+    $active_sth->execute($part_pkg->pkgpart) or die $active_sth->errstr;
+    $num_active_cust_pkg{$part_pkg->pkgpart} =
+      $active_sth->fetchrow_arrayref->[0];
+  }
+  $sortby = \*active_cust_pkg_sort;
+} else {
+  $sortby = \*pkgpart_sort;
+}
+
 %>
 <%= header("Package Definition Listing",menubar( 'Main Menu' => $p )) %>
-One or more services are grouped together into a package and given pricing
-information. Customers purchase packages rather than purchase services
-directly.<BR><BR>
-<A HREF="<%= $p %>edit/part_pkg.cgi"><I>Add a new package definition</I></A>
-<BR><BR>
+<% unless ( $cgi->param('active') ) { %>
+  One or more service definitions are grouped together into a package 
+  definition and given pricing information.  Customers purchase packages
+  rather than purchase services directly.<BR><BR>
+  <A HREF="<%= $p %>edit/part_pkg.cgi"><I>Add a new package definition</I></A>
+  <BR><BR>
+<% } %>
 
-<%= $total %> packages
+<%= $total %> package definitions
 <%
 if ( $cgi->param('showdisabled') ) {
   $cgi->param('showdisabled', 0);
@@ -34,6 +54,10 @@ print &table(), <<END;
       <TR>
         <TH COLSPAN=$colspan>Package</TH>
         <TH>Comment</TH>
+END
+print '        <TH><FONT SIZE=-1>Customer<BR>packages</FONT></TH>'
+  if $cgi->param('active');
+print <<END;
         <TH><FONT SIZE=-1>Freq.</FONT></TH>
         <TH><FONT SIZE=-1>Plan</FONT></TH>
         <TH><FONT SIZE=-1>Data</FONT></TH>
@@ -42,9 +66,7 @@ print &table(), <<END;
       </TR>
 END
 
-foreach my $part_pkg ( sort { 
-  $a->getfield('pkgpart') <=> $b->getfield('pkgpart')
-} @part_pkg ) {
+foreach my $part_pkg ( sort $sortby @part_pkg ) {
   my($hashref)=$part_pkg->hashref;
   my(@pkg_svc)=grep $_->getfield('quantity'),
     qsearch('pkg_svc',{'pkgpart'=> $hashref->{pkgpart} });
@@ -73,6 +95,16 @@ END
   print <<END;
         <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">$hashref->{pkg}</A></TD>
         <TD ROWSPAN=$rowspan>$hashref->{comment}</TD>
+END
+  if ( $cgi->param('active') ) {
+    print "        <TD ROWSPAN=$rowspan>";
+    print '<FONT COLOR="#00CC00"><B>'.
+          $num_active_cust_pkg{$hashref->{'pkgpart'}}.
+          qq!</B></FONT>&nbsp;<A HREF="${p}search/cust_pkg.cgi?magic=active;pkgpart=$hashref->{pkgpart}">active</A>!;
+    # suspended/cancelled
+    print '</TD>';
+  }
+  print <<END;
         <TD ROWSPAN=$rowspan>$hashref->{freq}</TD>
         <TD ROWSPAN=$rowspan>$hashref->{plan}</TD>
         <TD ROWSPAN=$rowspan>$plandata</TD>
@@ -99,4 +131,14 @@ print <<END;
   </BODY>
 </HTML>
 END
+
+
+sub pkgpart_sort {
+  $a->pkgpart <=> $b->pkgpart;
+}
+
+sub active_cust_pkg_sort {
+  $num_active_cust_pkg{$b->pkgpart} <=> $num_active_cust_pkg{$a->pkgpart};
+}
+
 %>
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index ee7a2622a..7c83924a2 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -23,7 +23,7 @@ function part_export_areyousure(href) {
 }
 </SCRIPT>
 
-    Services are items you offer to your customers.<BR><BR>
+    Service definitions are the templates for items you offer to your customers.<BR><BR>
 
 <FORM METHOD="POST" ACTION="<%= $p %>edit/part_svc.cgi">
 <A HREF="<%= $p %>edit/part_svc.cgi"><I>Add a new service definition</I></A><% if ( @part_svc ) { %>&nbsp;or&nbsp;<SELECT NAME="clone"><OPTION></OPTION>
@@ -34,7 +34,7 @@ function part_export_areyousure(href) {
 <% } %>
 </FORM><BR>
 
-<%= $total %> services
+<%= $total %> service definitions
 <%= $cgi->param('showdisabled')
       ? do { $cgi->param('showdisabled', 0);
              '( <a href="'. $cgi->self_url. '">hide disabled services</a> )'; }
diff --git a/httemplate/index.html b/httemplate/index.html
index 7354b1c00..779a42eea 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -67,7 +67,7 @@
               <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
               <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
             </UL>
-      <A HREF="search/report_cust_pay.html">Payments</A>
+      <A HREF="search/report_cust_pay.html">Payment Report (by type and/or date range)</A>
       <BR><BR>Financial reports
             <UL>
               <LI> <A HREF="search/report_receivables.cgi">current receivables</A>
@@ -125,7 +125,8 @@
         <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
         <LI><A HREF="search/cust_pkg.html">packages (by next bill date range)</A>
       </UL>
-      Invoices
+      <A HREF="browse/part_pkg.cgi?active=1">Package definitions (by number of active packages)</A>
+      <BR><BR>Invoices
       <UL>
         <LI><a href="search/cust_bill_event.html">Invoice event errors (failed credit cards)</a>
         <LI>open invoices (<A HREF="search/cust_bill.cgi?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN_custnum">by customer number</A>)
@@ -135,7 +136,7 @@
         <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
         <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
       </UL>
-    <A HREF="search/report_cust_pay.html">Payments</A>
+    <A HREF="search/report_cust_pay.html">Payment Report (by type and/or date range)</A>
     <BR><BR>Financial reports
             <UL>
               <LI> <A HREF="search/report_receivables.cgi">current receivables</A>
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 603b5654c..8b2fd0ca0 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -46,7 +46,19 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
 } else {
 
   my $qual = '';
-  if ( $query eq 'pkgnum' ) {
+  if ( $cgi->param('magic') && $cgi->param('magic') eq 'active' ) {
+
+    $qual = 'WHERE ( susp IS NULL OR susp = 0 )'.
+            ' AND ( cancel IS NULL OR cancel = 0)';
+
+    $sortby = \*pkgnum_sort;
+
+    if ( $cgi->param('pkgpart') =~ /^(\d+)$/ ) {
+      $qual .= " AND pkgpart = $1";
+    }
+
+  } elsif ( $query eq 'pkgnum' ) {
+
     $sortby=\*pkgnum_sort;
 
   } elsif ( $query eq 'SUSP_pkgnum' ) {
-- 
cgit v1.2.1


From a4f114ffbb4684cf1215c92c2015df9fd75677da Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Jul 2003 11:14:32 +0000
Subject: remove Gratuitous capitalization

---
 httemplate/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index 779a42eea..017ffcd88 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -67,7 +67,7 @@
               <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
               <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
             </UL>
-      <A HREF="search/report_cust_pay.html">Payment Report (by type and/or date range)</A>
+      <A HREF="search/report_cust_pay.html">Payment report (by type and/or date range)</A>
       <BR><BR>Financial reports
             <UL>
               <LI> <A HREF="search/report_receivables.cgi">current receivables</A>
-- 
cgit v1.2.1


From c39eb764e9dc1355b5d085b1fd1660e8cd999841 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 14 Jul 2003 06:21:29 +0000
Subject: fix bug when both a payment type and date range are specified

---
 httemplate/search/cust_pay.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi
index d601617f9..7a983703f 100755
--- a/httemplate/search/cust_pay.cgi
+++ b/httemplate/search/cust_pay.cgi
@@ -23,8 +23,9 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq '_date' ) {
     my $ending = str2time($1) + 86400;
     $range .= ( $range ? ' AND ' : ' WHERE ' ). " _date <= $ending ";
   }
+  $range =~ s/^\s*WHERE/ AND/ if scalar(keys %search) ;
 
-  @cust_pay = qsearch('cust_pay', \%search, '', " $range" );
+  @cust_pay = qsearch('cust_pay', \%search, '', $range );
 
   $sortby = \*date_sort;
 
-- 
cgit v1.2.1


From a2ef3ae885f2bccc0828836678c7e5901241d88d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 15 Jul 2003 11:23:21 +0000
Subject: 1.5.0pre3

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index eb762e157..6256ccc3e 100644
--- a/Makefile
+++ b/Makefile
@@ -58,8 +58,8 @@ SELFSERVICE_MACHINE = localhost
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.5.0pre2
-TAG=freeside_1_5_0pre2
+VERSION=1.5.0pre3
+TAG=freeside_1_5_0pre3
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
-- 
cgit v1.2.1


From 945721f48f74d5cfffef7c7cf3a3d6bc2521f5dd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 15 Jul 2003 13:16:32 +0000
Subject: import of rt 3.0.4

---
 rt/Changelog                                       | 1286 ++++
 rt/HOWTO/README                                    |   14 +
 rt/HOWTO/change.txt                                |   67 +
 rt/HOWTO/release.txt                               |  124 +
 rt/HOWTO/version-control.txt                       |   41 +
 rt/Makefile                                        |  517 +-
 rt/Makefile.in                                     |  485 ++
 rt/README                                          |  402 +-
 rt/aclocal.m4                                      |  158 +
 rt/autom4te.cache/output.0                         | 2747 +++++++++
 rt/autom4te.cache/requests                         |   94 +
 rt/autom4te.cache/traces.0                         |  156 +
 rt/bin/mason_handler.fcgi                          |  255 +-
 rt/bin/mason_handler.fcgi.in                       |   54 +
 rt/bin/mason_handler.scgi                          |  218 +-
 rt/bin/mason_handler.scgi.in                       |   41 +
 rt/bin/mason_handler.svc                           |  234 +
 rt/bin/mason_handler.svc.in                        |  234 +
 rt/bin/rt-commit-handler                           |  846 +++
 rt/bin/rt-commit-handler.in                        |  846 +++
 rt/bin/rt-crontool                                 |  210 +
 rt/bin/rt-crontool.in                              |  210 +
 rt/bin/rt-mailgate                                 |  842 ++-
 rt/bin/rt-mailgate.in                              |  587 ++
 rt/bin/webmux.pl                                   |  248 +-
 rt/bin/webmux.pl.in                                |  125 +
 rt/config                                          |  256 +
 rt/config.layout                                   |   83 +
 rt/config.log                                      |  117 +
 rt/config.pld                                      |   19 +
 rt/config.status                                   |  711 +++
 rt/configure                                       | 2747 +++++++++
 rt/configure.ac                                    |  209 +
 rt/docs/design_docs/acls                           |  228 +-
 rt/docs/design_docs/approval_notices               |    8 +
 rt/docs/design_docs/approval_template              |   25 +
 rt/docs/design_docs/cf_search                      |   72 +
 rt/docs/design_docs/cli_spec                       |  361 +-
 rt/docs/design_docs/delegation                     |  115 +
 rt/docs/design_docs/evil_plans                     |    9 +-
 rt/docs/design_docs/groups_notes                   |   88 +
 .../recursive_group_membership_algorithm           |  109 +
 rt/docs/design_docs/rql_parser_machine.graphviz    |   32 +
 rt/docs/design_docs/string-extraction-guide.txt    |  100 +
 rt/docs/design_docs/ticket_templates               |   16 +
 rt/etc/RT_Config.pm                                |  349 ++
 rt/etc/RT_Config.pm.in                             |  349 ++
 rt/etc/RT_SiteConfig.pm                            |    1 +
 rt/etc/acl.Oracle                                  |   19 +-
 rt/etc/acl.Pg                                      |   96 +-
 rt/etc/acl.mysql                                   |   12 +-
 rt/etc/constraints.mysql                           |   52 +
 rt/etc/initialdata                                 |  569 ++
 rt/etc/schema.Pg                                   |  747 ++-
 rt/etc/schema.SQLite                               |  384 ++
 rt/etc/schema.mysql                                |  429 +-
 rt/etc/upgrade/2.1.71                              |  211 +
 rt/html/Admin/Elements/AddCustomFieldValue         |   44 +
 rt/html/Admin/Elements/CreateUserCalled            |   26 +
 rt/html/Admin/Elements/EditCustomField             |  127 +
 rt/html/Admin/Elements/EditCustomFieldValues       |   42 +
 rt/html/Admin/Elements/EditCustomFields            |  214 +
 rt/html/Admin/Elements/EditQueueWatchers           |   55 +
 rt/html/Admin/Elements/EditScrip                   |  149 +
 rt/html/Admin/Elements/EditScrips                  |   97 +
 rt/html/Admin/Elements/EditTemplates               |  104 +
 rt/html/Admin/Elements/EditUserComments            |   32 +
 rt/html/Admin/Elements/GroupTabs                   |   76 +
 rt/html/Admin/Elements/Header                      |   28 +
 rt/html/Admin/Elements/ListGlobalCustomFields      |   37 +
 rt/html/Admin/Elements/ListGlobalScrips            |   37 +
 rt/html/Admin/Elements/ModifyQueue                 |   78 +
 rt/html/Admin/Elements/ModifyTemplate              |   60 +
 rt/html/Admin/Elements/ModifyUser                  |   99 +
 rt/html/Admin/Elements/QueueRightsForUser          |   40 +
 rt/html/Admin/Elements/QueueTabs                   |   93 +
 rt/html/Admin/Elements/SelectCustomFieldType       |   36 +
 rt/html/Admin/Elements/SelectGroups                |   37 +
 rt/html/Admin/Elements/SelectModifyGroup           |   33 +
 rt/html/Admin/Elements/SelectModifyQueue           |   33 +
 rt/html/Admin/Elements/SelectModifyUser            |   49 +
 rt/html/Admin/Elements/SelectNewGroupMembers       |   61 +
 rt/html/Admin/Elements/SelectRights                |   90 +
 rt/html/Admin/Elements/SelectScrip                 |   48 +
 rt/html/Admin/Elements/SelectScripAction           |   48 +
 rt/html/Admin/Elements/SelectScripCondition        |   48 +
 rt/html/Admin/Elements/SelectSingleOrMultiple      |   43 +
 rt/html/Admin/Elements/SelectTemplate              |   61 +
 rt/html/Admin/Elements/SelectUsers                 |   40 +
 rt/html/Admin/Elements/SystemTabs                  |   70 +
 rt/html/Admin/Elements/Tabs                        |   63 +
 rt/html/Admin/Elements/UserTabs                    |   74 +
 rt/html/Admin/Global/CustomField.html              |   61 +
 rt/html/Admin/Global/CustomFields.html             |   47 +
 rt/html/Admin/Global/GroupRights.html              |   99 +
 rt/html/Admin/Global/Scrip.html                    |   56 +
 rt/html/Admin/Global/Scrips.html                   |   53 +
 rt/html/Admin/Global/Template.html                 |  101 +
 rt/html/Admin/Global/Templates.html                |   53 +
 rt/html/Admin/Global/UserRights.html               |   77 +
 rt/html/Admin/Global/index.html                    |   64 +
 rt/html/Admin/Groups/GroupRights.html              |   95 +
 rt/html/Admin/Groups/Members.html                  |  134 +
 rt/html/Admin/Groups/Modify.html                   |  134 +
 rt/html/Admin/Groups/UserRights.html               |   92 +
 rt/html/Admin/Groups/index.html                    |   43 +
 rt/html/Admin/Queues/CustomField.html              |   60 +
 rt/html/Admin/Queues/CustomFields.html             |   48 +
 rt/html/Admin/Queues/GroupRights.html              |  110 +
 rt/html/Admin/Queues/Modify.html                   |  163 +
 rt/html/Admin/Queues/People.html                   |  186 +
 rt/html/Admin/Queues/Scrip.html                    |   67 +
 rt/html/Admin/Queues/Scrips.html                   |   63 +
 rt/html/Admin/Queues/Template.html                 |  101 +
 rt/html/Admin/Queues/Templates.html                |   57 +
 rt/html/Admin/Queues/UserRights.html               |   90 +
 rt/html/Admin/Queues/index.html                    |   61 +
 rt/html/Admin/Users/Modify.html                    |  347 ++
 rt/html/Admin/Users/Prefs.html                     |  122 +
 rt/html/Admin/Users/index.html                     |   81 +
 rt/html/Admin/index.html                           |   40 +
 rt/html/Approvals/Display.html                     |   50 +
 rt/html/Approvals/Elements/Approve                 |   56 +
 rt/html/Approvals/Elements/PendingMyApproval       |   87 +
 rt/html/Approvals/Elements/ShowDependency          |   85 +
 rt/html/Approvals/Elements/Tabs                    |   34 +
 rt/html/Approvals/index.html                       |   66 +
 rt/html/Elements/BevelBoxRaisedEnd                 |   26 +
 rt/html/Elements/BevelBoxRaisedStart               |   26 +
 rt/html/Elements/Callback                          |   65 +
 rt/html/Elements/Checkbox                          |   39 +
 rt/html/Elements/CreateTicket                      |   26 +
 rt/html/Elements/Error                             |   62 +
 rt/html/Elements/Footer                            |   60 +
 rt/html/Elements/GotoTicket                        |   24 +
 rt/html/Elements/Header                            |   82 +
 rt/html/Elements/ListActions                       |   43 +
 rt/html/Elements/Login                             |  101 +
 rt/html/Elements/Menu                              |   84 +
 rt/html/Elements/MessageBox                        |   47 +
 rt/html/Elements/MyRequests                        |   78 +
 rt/html/Elements/MyTickets                         |   81 +
 rt/html/Elements/PageLayout                        |   99 +
 rt/html/Elements/Quicksearch                       |   61 +
 rt/html/Elements/Refresh                           |   45 +
 rt/html/Elements/Section                           |   34 +
 rt/html/Elements/SelectAttachmentField             |   31 +
 rt/html/Elements/SelectBoolean                     |   46 +
 rt/html/Elements/SelectCustomFieldOperator         |   40 +
 rt/html/Elements/SelectCustomFieldValue            |   41 +
 rt/html/Elements/SelectDate                        |   48 +
 rt/html/Elements/SelectDateRelation                |   36 +
 rt/html/Elements/SelectDateType                    |   36 +
 rt/html/Elements/SelectEqualityOperator            |   40 +
 rt/html/Elements/SelectGroups                      |   29 +
 rt/html/Elements/SelectLinkType                    |   37 +
 rt/html/Elements/SelectMatch                       |   53 +
 rt/html/Elements/SelectNewTicketQueue              |   56 +
 rt/html/Elements/SelectOwner                       |   59 +
 rt/html/Elements/SelectQueue                       |   59 +
 rt/html/Elements/SelectResultsPerPage              |   43 +
 rt/html/Elements/SelectSortOrder                   |   41 +
 rt/html/Elements/SelectStatus                      |   37 +
 rt/html/Elements/SelectTicketSortBy                |   38 +
 rt/html/Elements/SelectTicketTypes                 |   34 +
 rt/html/Elements/SelectUsers                       |   31 +
 rt/html/Elements/SelectWatcherType                 |   44 +
 rt/html/Elements/SetupSessionCookie                |   77 +
 rt/html/Elements/ShadedBox                         |   33 +
 rt/html/Elements/ShadedInputRow                    |   35 +
 rt/html/Elements/ShadedRow                         |   31 +
 rt/html/Elements/SimpleSearch                      |   27 +
 rt/html/Elements/Submit                            |   62 +
 rt/html/Elements/Tabs                              |   82 +
 rt/html/Elements/TitleBoxEnd                       |   31 +
 rt/html/Elements/TitleBoxStart                     |   60 +
 rt/html/Elements/ViewUser                          |   51 +
 rt/html/NoAuth/Logout.html                         |   46 +
 rt/html/NoAuth/Reminder.html                       |   26 +
 rt/html/NoAuth/images/back_home.gif                |  Bin 0 -> 330 bytes
 rt/html/NoAuth/images/bplogo.gif                   |  Bin 0 -> 825 bytes
 rt/html/NoAuth/images/favicon.png                  |  Bin 0 -> 335 bytes
 rt/html/NoAuth/images/head_requestracker.gif       |  Bin 0 -> 1233 bytes
 rt/html/NoAuth/images/rt.jpg                       |  Bin 0 -> 917 bytes
 rt/html/NoAuth/images/space.gif                    |  Bin 0 -> 43 bytes
 rt/html/NoAuth/images/spacer.gif                   |  Bin 0 -> 43 bytes
 rt/html/NoAuth/images/squares_blue.gif             |  Bin 0 -> 219 bytes
 rt/html/NoAuth/webrt.css                           |  338 ++
 rt/html/REST/1.0/NoAuth/mail-gateway               |   49 +
 rt/html/Search/Bulk.html                           |  217 +
 rt/html/Search/Elements/PickRestriction            |  141 +
 rt/html/Search/Elements/TicketHeader               |   40 +
 rt/html/Search/Elements/TicketHeaderCell           |   55 +
 rt/html/Search/Elements/TicketRow                  |   55 +
 rt/html/Search/Listing.html                        |  112 +
 rt/html/SelfService/Attachment/dhandler            |   27 +
 rt/html/SelfService/Closed.html                    |   27 +
 rt/html/SelfService/Create.html                    |   80 +
 rt/html/SelfService/Display.html                   |  141 +
 rt/html/SelfService/Elements/GotoTicket            |   24 +
 rt/html/SelfService/Elements/Header                |   25 +
 rt/html/SelfService/Elements/MyRequests            |   62 +
 rt/html/SelfService/Elements/Tabs                  |   64 +
 rt/html/SelfService/Error.html                     |   46 +
 rt/html/SelfService/Prefs.html                     |   68 +
 rt/html/SelfService/Update.html                    |   61 +
 rt/html/SelfService/index.html                     |   26 +
 rt/html/Ticket/Attachment/dhandler                 |   68 +
 rt/html/Ticket/Create.html                         |  257 +
 rt/html/Ticket/Display.html                        |  116 +
 rt/html/Ticket/Elements/AddWatchers                |   97 +
 rt/html/Ticket/Elements/BulkLinks                  |   53 +
 rt/html/Ticket/Elements/EditBasics                 |   79 +
 rt/html/Ticket/Elements/EditCustomField            |   70 +
 rt/html/Ticket/Elements/EditCustomFields           |   74 +
 rt/html/Ticket/Elements/EditDates                  |   53 +
 rt/html/Ticket/Elements/EditLinks                  |  150 +
 rt/html/Ticket/Elements/EditPeople                 |   68 +
 rt/html/Ticket/Elements/EditWatchers               |   52 +
 rt/html/Ticket/Elements/ShowAttachments            |   76 +
 rt/html/Ticket/Elements/ShowBasics                 |   54 +
 rt/html/Ticket/Elements/ShowCustomFields           |   46 +
 rt/html/Ticket/Elements/ShowDates                  |   56 +
 rt/html/Ticket/Elements/ShowDependencies           |   41 +
 rt/html/Ticket/Elements/ShowHistory                |   86 +
 rt/html/Ticket/Elements/ShowLink                   |   40 +
 rt/html/Ticket/Elements/ShowLinks                  |   87 +
 rt/html/Ticket/Elements/ShowMemberOf               |   35 +
 rt/html/Ticket/Elements/ShowMembers                |   45 +
 rt/html/Ticket/Elements/ShowMessageHeaders         |   32 +
 rt/html/Ticket/Elements/ShowMessageStanza          |   51 +
 rt/html/Ticket/Elements/ShowPeople                 |   45 +
 rt/html/Ticket/Elements/ShowReferences             |   50 +
 rt/html/Ticket/Elements/ShowRequestor              |   59 +
 rt/html/Ticket/Elements/ShowSummary                |   82 +
 rt/html/Ticket/Elements/ShowTransaction            |  169 +
 rt/html/Ticket/Elements/Tabs                       |  170 +
 rt/html/Ticket/History.html                        |   52 +
 rt/html/Ticket/Modify.html                         |   63 +
 rt/html/Ticket/ModifyAll.html                      |  158 +
 rt/html/Ticket/ModifyDates.html                    |   52 +
 rt/html/Ticket/ModifyLinks.html                    |   54 +
 rt/html/Ticket/ModifyPeople.html                   |   67 +
 rt/html/Ticket/Update.html                         |  205 +
 rt/html/User/Delegation.html                       |   83 +
 rt/html/User/Elements/DelegateRights               |   85 +
 rt/html/User/Elements/GroupTabs                    |   60 +
 rt/html/User/Elements/Tabs                         |   56 +
 rt/html/User/Groups/Members.html                   |  136 +
 rt/html/User/Groups/Modify.html                    |  133 +
 rt/html/User/Groups/index.html                     |   43 +
 rt/html/User/Prefs.html                            |  218 +
 rt/html/autohandler                                |  178 +
 rt/html/index.html                                 |   84 +
 rt/html/l                                          |   26 +
 rt/install-sh                                      |  251 +
 rt/lib/RT.pm                                       |  191 +-
 rt/lib/RT.pm.in                                    |  304 +
 rt/lib/RT/ACE.pm                                   |  806 +--
 rt/lib/RT/ACE_Overlay.pm                           |  907 +++
 rt/lib/RT/ACL.pm                                   |  329 +-
 rt/lib/RT/ACL_Overlay.pm                           |  295 +
 rt/lib/RT/Action/AutoOpen.pm                       |   86 +
 rt/lib/RT/Action/Autoreply.pm                      |   40 +-
 rt/lib/RT/Action/CreateTickets.pm                  |  564 ++
 rt/lib/RT/Action/EscalatePriority.pm               |  142 +
 rt/lib/RT/Action/Generic.pm                        |   56 +-
 rt/lib/RT/Action/Notify.pm                         |   83 +-
 rt/lib/RT/Action/NotifyAsComment.pm                |   34 +-
 rt/lib/RT/Action/ResolveMembers.pm                 |   35 +-
 rt/lib/RT/Action/SendEmail.pm                      |  699 ++-
 rt/lib/RT/Action/SetPriority.pm                    |   61 +
 rt/lib/RT/Action/UserDefined.pm                    |   71 +
 rt/lib/RT/Attachment.pm                            |  601 +-
 rt/lib/RT/Attachment_Overlay.pm                    |  571 ++
 rt/lib/RT/Attachments.pm                           |  136 +-
 rt/lib/RT/Attachments_Overlay.pm                   |  116 +
 rt/lib/RT/Base.pm                                  |   97 +
 rt/lib/RT/CachedGroupMember.pm                     |  258 +
 rt/lib/RT/CachedGroupMember_Overlay.pm             |  323 +
 rt/lib/RT/CachedGroupMembers.pm                    |  115 +
 rt/lib/RT/CachedGroupMembers_Overlay.pm            |  148 +
 rt/lib/RT/Condition/AnyTransaction.pm              |   34 +-
 rt/lib/RT/Condition/BeforeDue.pm                   |   64 +
 rt/lib/RT/Condition/Generic.pm                     |   55 +-
 rt/lib/RT/Condition/Overdue.pm                     |   68 +
 rt/lib/RT/Condition/OwnerChange.pm                 |  102 +
 rt/lib/RT/Condition/PriorityExceeds.pm             |   57 +
 rt/lib/RT/Condition/QueueChange.pm                 |   57 +
 rt/lib/RT/Condition/StatusChange.pm                |   35 +-
 rt/lib/RT/Condition/UserDefined.pm                 |   57 +
 rt/lib/RT/CurrentUser.pm                           |  166 +-
 rt/lib/RT/CustomField.pm                           |  340 ++
 rt/lib/RT/CustomFieldValue.pm                      |  294 +
 rt/lib/RT/CustomFieldValues.pm                     |  121 +
 rt/lib/RT/CustomFieldValues_Overlay.pm             |   47 +
 rt/lib/RT/CustomField_Overlay.pm                   |  560 ++
 rt/lib/RT/CustomFields.pm                          |  121 +
 rt/lib/RT/CustomFields_Overlay.pm                  |  135 +
 rt/lib/RT/Date.pm                                  |  335 +-
 rt/lib/RT/EmailParser.pm                           |  784 +++
 rt/lib/RT/Group.pm                                 |  430 +-
 rt/lib/RT/GroupMember.pm                           |  231 +-
 rt/lib/RT/GroupMember_Overlay.pm                   |  351 ++
 rt/lib/RT/GroupMembers.pm                          |  124 +-
 rt/lib/RT/GroupMembers_Overlay.pm                  |  126 +
 rt/lib/RT/Group_Overlay.pm                         | 1260 ++++
 rt/lib/RT/Groups.pm                                |  135 +-
 rt/lib/RT/Groups_Overlay.pm                        |  298 +
 rt/lib/RT/Handle.pm                                |   62 +-
 rt/lib/RT/I18N.pm                                  |  430 ++
 rt/lib/RT/I18N/cs.pm                               |   68 +
 rt/lib/RT/I18N/cs.po                               | 4496 ++++++++++++++
 rt/lib/RT/I18N/de.po                               | 4500 ++++++++++++++
 rt/lib/RT/I18N/en.po                               |   88 +
 rt/lib/RT/I18N/es.po                               | 4749 +++++++++++++++
 rt/lib/RT/I18N/fi.po                               | 4750 +++++++++++++++
 rt/lib/RT/I18N/fr.po                               | 4959 +++++++++++++++
 rt/lib/RT/I18N/he.po                               | 4871 +++++++++++++++
 rt/lib/RT/I18N/i_default.pm                        |   86 +
 rt/lib/RT/I18N/ja.po                               | 4822 +++++++++++++++
 rt/lib/RT/I18N/nl.po                               | 4819 +++++++++++++++
 rt/lib/RT/I18N/no.po                               | 4879 +++++++++++++++
 rt/lib/RT/I18N/pt_br.po                            | 4829 +++++++++++++++
 rt/lib/RT/I18N/ru.po                               | 4826 +++++++++++++++
 rt/lib/RT/I18N/zh_cn.po                            | 6384 +++++++++++++++++++
 rt/lib/RT/I18N/zh_tw.po                            | 6416 ++++++++++++++++++++
 rt/lib/RT/Interface/CLI.pm                         |  112 +-
 rt/lib/RT/Interface/Email.pm                       |  683 ++-
 rt/lib/RT/Interface/Email/Auth/MailFrom.pm         |  131 +
 rt/lib/RT/Interface/Email/Filter/SpamAssassin.pm   |   63 +
 rt/lib/RT/Interface/Web.pm                         | 1124 ++--
 rt/lib/RT/Link.pm                                  |  487 +-
 rt/lib/RT/Link_Overlay.pm                          |  360 ++
 rt/lib/RT/Links.pm                                 |  153 +-
 rt/lib/RT/Links_Overlay.pm                         |  125 +
 rt/lib/RT/Principal.pm                             |  212 +
 rt/lib/RT/Principal_Overlay.pm                     |  557 ++
 rt/lib/RT/Principals.pm                            |  115 +
 rt/lib/RT/Principals_Overlay.pm                    |   52 +
 rt/lib/RT/Queue.pm                                 |  961 +--
 rt/lib/RT/Queue_Overlay.pm                         | 1012 +++
 rt/lib/RT/Queues.pm                                |  162 +-
 rt/lib/RT/Queues_Overlay.pm                        |  130 +
 rt/lib/RT/Record.pm                                |  400 +-
 rt/lib/RT/Scrip.pm                                 |  654 +-
 rt/lib/RT/ScripAction.pm                           |  385 +-
 rt/lib/RT/ScripAction_Overlay.pm                   |  217 +
 rt/lib/RT/ScripActions.pm                          |  137 +-
 rt/lib/RT/ScripActions_Overlay.pm                  |   87 +
 rt/lib/RT/ScripCondition.pm                        |  366 +-
 rt/lib/RT/ScripCondition_Overlay.pm                |  210 +
 rt/lib/RT/ScripConditions.pm                       |  142 +-
 rt/lib/RT/ScripConditions_Overlay.pm               |   87 +
 rt/lib/RT/Scrip_Overlay.pm                         |  507 ++
 rt/lib/RT/Scrips.pm                                |  162 +-
 rt/lib/RT/Scrips_Overlay.pm                        |  133 +
 rt/lib/RT/Search/ActiveTicketsInQueue.pm           |   78 +
 rt/lib/RT/Search/Generic.pm                        |  128 +
 rt/lib/RT/SearchBuilder.pm                         |  200 +
 rt/lib/RT/System.pm                                |  165 +
 rt/lib/RT/Template.pm                              |  512 +-
 rt/lib/RT/Template_Overlay.pm                      |  411 ++
 rt/lib/RT/Templates.pm                             |  143 +-
 rt/lib/RT/Templates_Overlay.pm                     |  141 +
 rt/lib/RT/Ticket.pm                                | 3026 ++-------
 rt/lib/RT/TicketCustomFieldValue.pm                |  286 +
 rt/lib/RT/TicketCustomFieldValue_Overlay.pm        |   52 +
 rt/lib/RT/TicketCustomFieldValues.pm               |  115 +
 rt/lib/RT/TicketCustomFieldValues_Overlay.pm       |   86 +
 rt/lib/RT/Ticket_Overlay.pm                        | 4040 ++++++++++++
 rt/lib/RT/Tickets.pm                               | 1806 +-----
 rt/lib/RT/Tickets_Overlay.pm                       | 2055 +++++++
 rt/lib/RT/Tickets_Overlay_SQL.pm                   |  382 ++
 rt/lib/RT/Transaction.pm                           |  895 +--
 rt/lib/RT/Transaction_Overlay.pm                   |  817 +++
 rt/lib/RT/Transactions.pm                          |  129 +-
 rt/lib/RT/Transactions_Overlay.pm                  |   86 +
 rt/lib/RT/URI.pm                                   |  244 +
 rt/lib/RT/URI/base.pm                              |  129 +
 rt/lib/RT/URI/fsck_com_rt.pm                       |  247 +
 rt/lib/RT/User.pm                                  | 1696 ++----
 rt/lib/RT/User_Overlay.pm                          | 1589 +++++
 rt/lib/RT/Users.pm                                 |  298 +-
 rt/lib/RT/Users_Overlay.pm                         |  290 +
 rt/lib/t/00smoke.t                                 |   14 +
 rt/lib/t/00smoke.t.in                              |   14 +
 rt/lib/t/01harness.t                               |   12 +
 rt/lib/t/01harness.t.in                            |   12 +
 rt/lib/t/02regression.t                            |   44 +
 rt/lib/t/02regression.t.in                         |   44 +
 rt/lib/t/03web.pl                                  |   62 +
 rt/lib/t/03web.pl.in                               |   62 +
 rt/lib/t/04_send_email.pl                          |  389 ++
 rt/lib/t/04_send_email.pl.in                       |  389 ++
 rt/lib/t/data/8859-15-message-series/dir           |  356 ++
 rt/lib/t/data/8859-15-message-series/msg1          |   36 +
 rt/lib/t/data/8859-15-message-series/msg2          |   36 +
 rt/lib/t/data/8859-15-message-series/msg3          |   35 +
 rt/lib/t/data/8859-15-message-series/msg4          |   35 +
 rt/lib/t/data/8859-15-message-series/msg5          |   35 +
 rt/lib/t/data/8859-15-message-series/msg6          |   35 +
 rt/lib/t/data/8859-15-message-series/msg7          |   36 +
 rt/lib/t/data/multipart-alternative-with-umlaut    |   62 +
 rt/lib/t/data/nested-mime-sample                   |  396 ++
 rt/lib/t/data/nested-rfc-822                       |  253 +
 rt/lib/t/data/new-ticket-from-iso-8859-1           |   31 +
 rt/lib/t/data/new-ticket-from-iso-8859-1-full      |   38 +
 rt/lib/t/data/russian-subject-no-content-type      |   42 +
 rt/lib/t/data/text-html-in-russian                 |   87 +
 rt/lib/t/data/text-html-with-umlaut                |   35 +
 rt/lib/t/regression/00placeholder                  |    1 +
 rt/lib/t/regression/mime_tests                     |   19 +
 rt/m4/rt_enable_layout.m4                          |   36 +
 rt/m4/rt_expand_var.m4                             |   18 +
 rt/m4/rt_layout.m4                                 |   74 +
 rt/m4/rt_subst_expanded_arg.m4                     |   14 +
 rt/sbin/extract-message-catalog                    |  246 +
 rt/sbin/extract_pod_tests                          |  129 +
 rt/sbin/factory                                    |  427 ++
 rt/sbin/license_tag                                |  196 +
 rt/sbin/regression_harness                         |   33 +
 rt/sbin/rt-setup-database                          |  585 ++
 rt/sbin/rt-setup-database.in                       |  585 ++
 rt/sbin/rt-test-dependencies                       |  246 +
 rt/sbin/rt-test-dependencies.in                    |  246 +
 426 files changed, 134245 insertions(+), 14126 deletions(-)
 create mode 100644 rt/Changelog
 create mode 100644 rt/HOWTO/README
 create mode 100644 rt/HOWTO/change.txt
 create mode 100644 rt/HOWTO/release.txt
 create mode 100644 rt/HOWTO/version-control.txt
 create mode 100644 rt/Makefile.in
 create mode 100644 rt/aclocal.m4
 create mode 100644 rt/autom4te.cache/output.0
 create mode 100644 rt/autom4te.cache/requests
 create mode 100644 rt/autom4te.cache/traces.0
 create mode 100644 rt/bin/mason_handler.fcgi.in
 create mode 100644 rt/bin/mason_handler.scgi.in
 create mode 100644 rt/bin/mason_handler.svc
 create mode 100644 rt/bin/mason_handler.svc.in
 create mode 100644 rt/bin/rt-commit-handler
 create mode 100644 rt/bin/rt-commit-handler.in
 create mode 100644 rt/bin/rt-crontool
 create mode 100644 rt/bin/rt-crontool.in
 create mode 100644 rt/bin/rt-mailgate.in
 create mode 100644 rt/bin/webmux.pl.in
 create mode 100644 rt/config
 create mode 100644 rt/config.layout
 create mode 100644 rt/config.log
 create mode 100644 rt/config.pld
 create mode 100755 rt/config.status
 create mode 100755 rt/configure
 create mode 100644 rt/configure.ac
 create mode 100644 rt/docs/design_docs/approval_notices
 create mode 100644 rt/docs/design_docs/approval_template
 create mode 100644 rt/docs/design_docs/cf_search
 create mode 100644 rt/docs/design_docs/delegation
 create mode 100644 rt/docs/design_docs/groups_notes
 create mode 100644 rt/docs/design_docs/recursive_group_membership_algorithm
 create mode 100644 rt/docs/design_docs/rql_parser_machine.graphviz
 create mode 100644 rt/docs/design_docs/string-extraction-guide.txt
 create mode 100644 rt/docs/design_docs/ticket_templates
 create mode 100644 rt/etc/RT_Config.pm
 create mode 100644 rt/etc/RT_Config.pm.in
 create mode 100644 rt/etc/RT_SiteConfig.pm
 create mode 100644 rt/etc/constraints.mysql
 create mode 100644 rt/etc/initialdata
 create mode 100644 rt/etc/schema.SQLite
 create mode 100644 rt/etc/upgrade/2.1.71
 create mode 100644 rt/html/Admin/Elements/AddCustomFieldValue
 create mode 100644 rt/html/Admin/Elements/CreateUserCalled
 create mode 100644 rt/html/Admin/Elements/EditCustomField
 create mode 100644 rt/html/Admin/Elements/EditCustomFieldValues
 create mode 100644 rt/html/Admin/Elements/EditCustomFields
 create mode 100644 rt/html/Admin/Elements/EditQueueWatchers
 create mode 100644 rt/html/Admin/Elements/EditScrip
 create mode 100644 rt/html/Admin/Elements/EditScrips
 create mode 100644 rt/html/Admin/Elements/EditTemplates
 create mode 100644 rt/html/Admin/Elements/EditUserComments
 create mode 100644 rt/html/Admin/Elements/GroupTabs
 create mode 100644 rt/html/Admin/Elements/Header
 create mode 100644 rt/html/Admin/Elements/ListGlobalCustomFields
 create mode 100644 rt/html/Admin/Elements/ListGlobalScrips
 create mode 100644 rt/html/Admin/Elements/ModifyQueue
 create mode 100644 rt/html/Admin/Elements/ModifyTemplate
 create mode 100644 rt/html/Admin/Elements/ModifyUser
 create mode 100644 rt/html/Admin/Elements/QueueRightsForUser
 create mode 100644 rt/html/Admin/Elements/QueueTabs
 create mode 100644 rt/html/Admin/Elements/SelectCustomFieldType
 create mode 100644 rt/html/Admin/Elements/SelectGroups
 create mode 100644 rt/html/Admin/Elements/SelectModifyGroup
 create mode 100644 rt/html/Admin/Elements/SelectModifyQueue
 create mode 100644 rt/html/Admin/Elements/SelectModifyUser
 create mode 100644 rt/html/Admin/Elements/SelectNewGroupMembers
 create mode 100644 rt/html/Admin/Elements/SelectRights
 create mode 100644 rt/html/Admin/Elements/SelectScrip
 create mode 100644 rt/html/Admin/Elements/SelectScripAction
 create mode 100644 rt/html/Admin/Elements/SelectScripCondition
 create mode 100644 rt/html/Admin/Elements/SelectSingleOrMultiple
 create mode 100644 rt/html/Admin/Elements/SelectTemplate
 create mode 100644 rt/html/Admin/Elements/SelectUsers
 create mode 100644 rt/html/Admin/Elements/SystemTabs
 create mode 100644 rt/html/Admin/Elements/Tabs
 create mode 100644 rt/html/Admin/Elements/UserTabs
 create mode 100644 rt/html/Admin/Global/CustomField.html
 create mode 100644 rt/html/Admin/Global/CustomFields.html
 create mode 100644 rt/html/Admin/Global/GroupRights.html
 create mode 100644 rt/html/Admin/Global/Scrip.html
 create mode 100644 rt/html/Admin/Global/Scrips.html
 create mode 100644 rt/html/Admin/Global/Template.html
 create mode 100644 rt/html/Admin/Global/Templates.html
 create mode 100644 rt/html/Admin/Global/UserRights.html
 create mode 100644 rt/html/Admin/Global/index.html
 create mode 100644 rt/html/Admin/Groups/GroupRights.html
 create mode 100644 rt/html/Admin/Groups/Members.html
 create mode 100644 rt/html/Admin/Groups/Modify.html
 create mode 100644 rt/html/Admin/Groups/UserRights.html
 create mode 100644 rt/html/Admin/Groups/index.html
 create mode 100644 rt/html/Admin/Queues/CustomField.html
 create mode 100644 rt/html/Admin/Queues/CustomFields.html
 create mode 100644 rt/html/Admin/Queues/GroupRights.html
 create mode 100644 rt/html/Admin/Queues/Modify.html
 create mode 100644 rt/html/Admin/Queues/People.html
 create mode 100644 rt/html/Admin/Queues/Scrip.html
 create mode 100644 rt/html/Admin/Queues/Scrips.html
 create mode 100644 rt/html/Admin/Queues/Template.html
 create mode 100644 rt/html/Admin/Queues/Templates.html
 create mode 100644 rt/html/Admin/Queues/UserRights.html
 create mode 100644 rt/html/Admin/Queues/index.html
 create mode 100644 rt/html/Admin/Users/Modify.html
 create mode 100644 rt/html/Admin/Users/Prefs.html
 create mode 100644 rt/html/Admin/Users/index.html
 create mode 100644 rt/html/Admin/index.html
 create mode 100644 rt/html/Approvals/Display.html
 create mode 100644 rt/html/Approvals/Elements/Approve
 create mode 100644 rt/html/Approvals/Elements/PendingMyApproval
 create mode 100644 rt/html/Approvals/Elements/ShowDependency
 create mode 100644 rt/html/Approvals/Elements/Tabs
 create mode 100644 rt/html/Approvals/index.html
 create mode 100644 rt/html/Elements/BevelBoxRaisedEnd
 create mode 100644 rt/html/Elements/BevelBoxRaisedStart
 create mode 100644 rt/html/Elements/Callback
 create mode 100644 rt/html/Elements/Checkbox
 create mode 100644 rt/html/Elements/CreateTicket
 create mode 100644 rt/html/Elements/Error
 create mode 100644 rt/html/Elements/Footer
 create mode 100644 rt/html/Elements/GotoTicket
 create mode 100644 rt/html/Elements/Header
 create mode 100644 rt/html/Elements/ListActions
 create mode 100644 rt/html/Elements/Login
 create mode 100644 rt/html/Elements/Menu
 create mode 100644 rt/html/Elements/MessageBox
 create mode 100644 rt/html/Elements/MyRequests
 create mode 100644 rt/html/Elements/MyTickets
 create mode 100644 rt/html/Elements/PageLayout
 create mode 100644 rt/html/Elements/Quicksearch
 create mode 100644 rt/html/Elements/Refresh
 create mode 100644 rt/html/Elements/Section
 create mode 100644 rt/html/Elements/SelectAttachmentField
 create mode 100644 rt/html/Elements/SelectBoolean
 create mode 100644 rt/html/Elements/SelectCustomFieldOperator
 create mode 100644 rt/html/Elements/SelectCustomFieldValue
 create mode 100644 rt/html/Elements/SelectDate
 create mode 100644 rt/html/Elements/SelectDateRelation
 create mode 100644 rt/html/Elements/SelectDateType
 create mode 100644 rt/html/Elements/SelectEqualityOperator
 create mode 100644 rt/html/Elements/SelectGroups
 create mode 100644 rt/html/Elements/SelectLinkType
 create mode 100644 rt/html/Elements/SelectMatch
 create mode 100644 rt/html/Elements/SelectNewTicketQueue
 create mode 100644 rt/html/Elements/SelectOwner
 create mode 100644 rt/html/Elements/SelectQueue
 create mode 100644 rt/html/Elements/SelectResultsPerPage
 create mode 100644 rt/html/Elements/SelectSortOrder
 create mode 100644 rt/html/Elements/SelectStatus
 create mode 100644 rt/html/Elements/SelectTicketSortBy
 create mode 100644 rt/html/Elements/SelectTicketTypes
 create mode 100644 rt/html/Elements/SelectUsers
 create mode 100644 rt/html/Elements/SelectWatcherType
 create mode 100644 rt/html/Elements/SetupSessionCookie
 create mode 100644 rt/html/Elements/ShadedBox
 create mode 100644 rt/html/Elements/ShadedInputRow
 create mode 100644 rt/html/Elements/ShadedRow
 create mode 100644 rt/html/Elements/SimpleSearch
 create mode 100644 rt/html/Elements/Submit
 create mode 100644 rt/html/Elements/Tabs
 create mode 100644 rt/html/Elements/TitleBoxEnd
 create mode 100644 rt/html/Elements/TitleBoxStart
 create mode 100644 rt/html/Elements/ViewUser
 create mode 100644 rt/html/NoAuth/Logout.html
 create mode 100644 rt/html/NoAuth/Reminder.html
 create mode 100644 rt/html/NoAuth/images/back_home.gif
 create mode 100644 rt/html/NoAuth/images/bplogo.gif
 create mode 100644 rt/html/NoAuth/images/favicon.png
 create mode 100644 rt/html/NoAuth/images/head_requestracker.gif
 create mode 100644 rt/html/NoAuth/images/rt.jpg
 create mode 100644 rt/html/NoAuth/images/space.gif
 create mode 100644 rt/html/NoAuth/images/spacer.gif
 create mode 100644 rt/html/NoAuth/images/squares_blue.gif
 create mode 100644 rt/html/NoAuth/webrt.css
 create mode 100644 rt/html/REST/1.0/NoAuth/mail-gateway
 create mode 100644 rt/html/Search/Bulk.html
 create mode 100644 rt/html/Search/Elements/PickRestriction
 create mode 100644 rt/html/Search/Elements/TicketHeader
 create mode 100644 rt/html/Search/Elements/TicketHeaderCell
 create mode 100644 rt/html/Search/Elements/TicketRow
 create mode 100644 rt/html/Search/Listing.html
 create mode 100644 rt/html/SelfService/Attachment/dhandler
 create mode 100644 rt/html/SelfService/Closed.html
 create mode 100644 rt/html/SelfService/Create.html
 create mode 100644 rt/html/SelfService/Display.html
 create mode 100644 rt/html/SelfService/Elements/GotoTicket
 create mode 100644 rt/html/SelfService/Elements/Header
 create mode 100644 rt/html/SelfService/Elements/MyRequests
 create mode 100644 rt/html/SelfService/Elements/Tabs
 create mode 100644 rt/html/SelfService/Error.html
 create mode 100644 rt/html/SelfService/Prefs.html
 create mode 100644 rt/html/SelfService/Update.html
 create mode 100644 rt/html/SelfService/index.html
 create mode 100644 rt/html/Ticket/Attachment/dhandler
 create mode 100644 rt/html/Ticket/Create.html
 create mode 100644 rt/html/Ticket/Display.html
 create mode 100644 rt/html/Ticket/Elements/AddWatchers
 create mode 100644 rt/html/Ticket/Elements/BulkLinks
 create mode 100644 rt/html/Ticket/Elements/EditBasics
 create mode 100644 rt/html/Ticket/Elements/EditCustomField
 create mode 100644 rt/html/Ticket/Elements/EditCustomFields
 create mode 100644 rt/html/Ticket/Elements/EditDates
 create mode 100644 rt/html/Ticket/Elements/EditLinks
 create mode 100644 rt/html/Ticket/Elements/EditPeople
 create mode 100644 rt/html/Ticket/Elements/EditWatchers
 create mode 100644 rt/html/Ticket/Elements/ShowAttachments
 create mode 100644 rt/html/Ticket/Elements/ShowBasics
 create mode 100644 rt/html/Ticket/Elements/ShowCustomFields
 create mode 100644 rt/html/Ticket/Elements/ShowDates
 create mode 100644 rt/html/Ticket/Elements/ShowDependencies
 create mode 100644 rt/html/Ticket/Elements/ShowHistory
 create mode 100644 rt/html/Ticket/Elements/ShowLink
 create mode 100644 rt/html/Ticket/Elements/ShowLinks
 create mode 100644 rt/html/Ticket/Elements/ShowMemberOf
 create mode 100644 rt/html/Ticket/Elements/ShowMembers
 create mode 100644 rt/html/Ticket/Elements/ShowMessageHeaders
 create mode 100644 rt/html/Ticket/Elements/ShowMessageStanza
 create mode 100644 rt/html/Ticket/Elements/ShowPeople
 create mode 100644 rt/html/Ticket/Elements/ShowReferences
 create mode 100644 rt/html/Ticket/Elements/ShowRequestor
 create mode 100644 rt/html/Ticket/Elements/ShowSummary
 create mode 100644 rt/html/Ticket/Elements/ShowTransaction
 create mode 100644 rt/html/Ticket/Elements/Tabs
 create mode 100644 rt/html/Ticket/History.html
 create mode 100644 rt/html/Ticket/Modify.html
 create mode 100644 rt/html/Ticket/ModifyAll.html
 create mode 100644 rt/html/Ticket/ModifyDates.html
 create mode 100644 rt/html/Ticket/ModifyLinks.html
 create mode 100644 rt/html/Ticket/ModifyPeople.html
 create mode 100644 rt/html/Ticket/Update.html
 create mode 100644 rt/html/User/Delegation.html
 create mode 100644 rt/html/User/Elements/DelegateRights
 create mode 100644 rt/html/User/Elements/GroupTabs
 create mode 100644 rt/html/User/Elements/Tabs
 create mode 100644 rt/html/User/Groups/Members.html
 create mode 100644 rt/html/User/Groups/Modify.html
 create mode 100644 rt/html/User/Groups/index.html
 create mode 100644 rt/html/User/Prefs.html
 create mode 100644 rt/html/autohandler
 create mode 100644 rt/html/index.html
 create mode 100644 rt/html/l
 create mode 100644 rt/install-sh
 create mode 100644 rt/lib/RT.pm.in
 create mode 100644 rt/lib/RT/ACE_Overlay.pm
 create mode 100644 rt/lib/RT/ACL_Overlay.pm
 create mode 100644 rt/lib/RT/Action/AutoOpen.pm
 create mode 100644 rt/lib/RT/Action/CreateTickets.pm
 create mode 100644 rt/lib/RT/Action/EscalatePriority.pm
 create mode 100644 rt/lib/RT/Action/SetPriority.pm
 create mode 100644 rt/lib/RT/Action/UserDefined.pm
 create mode 100644 rt/lib/RT/Attachment_Overlay.pm
 create mode 100644 rt/lib/RT/Attachments_Overlay.pm
 create mode 100644 rt/lib/RT/Base.pm
 create mode 100644 rt/lib/RT/CachedGroupMember.pm
 create mode 100644 rt/lib/RT/CachedGroupMember_Overlay.pm
 create mode 100644 rt/lib/RT/CachedGroupMembers.pm
 create mode 100644 rt/lib/RT/CachedGroupMembers_Overlay.pm
 create mode 100644 rt/lib/RT/Condition/BeforeDue.pm
 create mode 100644 rt/lib/RT/Condition/Overdue.pm
 create mode 100644 rt/lib/RT/Condition/OwnerChange.pm
 create mode 100644 rt/lib/RT/Condition/PriorityExceeds.pm
 create mode 100644 rt/lib/RT/Condition/QueueChange.pm
 create mode 100644 rt/lib/RT/Condition/UserDefined.pm
 create mode 100644 rt/lib/RT/CustomField.pm
 create mode 100644 rt/lib/RT/CustomFieldValue.pm
 create mode 100644 rt/lib/RT/CustomFieldValues.pm
 create mode 100644 rt/lib/RT/CustomFieldValues_Overlay.pm
 create mode 100644 rt/lib/RT/CustomField_Overlay.pm
 create mode 100644 rt/lib/RT/CustomFields.pm
 create mode 100644 rt/lib/RT/CustomFields_Overlay.pm
 create mode 100644 rt/lib/RT/EmailParser.pm
 create mode 100644 rt/lib/RT/GroupMember_Overlay.pm
 create mode 100644 rt/lib/RT/GroupMembers_Overlay.pm
 create mode 100644 rt/lib/RT/Group_Overlay.pm
 create mode 100644 rt/lib/RT/Groups_Overlay.pm
 create mode 100644 rt/lib/RT/I18N.pm
 create mode 100644 rt/lib/RT/I18N/cs.pm
 create mode 100644 rt/lib/RT/I18N/cs.po
 create mode 100644 rt/lib/RT/I18N/de.po
 create mode 100644 rt/lib/RT/I18N/en.po
 create mode 100644 rt/lib/RT/I18N/es.po
 create mode 100644 rt/lib/RT/I18N/fi.po
 create mode 100644 rt/lib/RT/I18N/fr.po
 create mode 100644 rt/lib/RT/I18N/he.po
 create mode 100644 rt/lib/RT/I18N/i_default.pm
 create mode 100644 rt/lib/RT/I18N/ja.po
 create mode 100644 rt/lib/RT/I18N/nl.po
 create mode 100644 rt/lib/RT/I18N/no.po
 create mode 100644 rt/lib/RT/I18N/pt_br.po
 create mode 100644 rt/lib/RT/I18N/ru.po
 create mode 100644 rt/lib/RT/I18N/zh_cn.po
 create mode 100644 rt/lib/RT/I18N/zh_tw.po
 create mode 100644 rt/lib/RT/Interface/Email/Auth/MailFrom.pm
 create mode 100644 rt/lib/RT/Interface/Email/Filter/SpamAssassin.pm
 create mode 100644 rt/lib/RT/Link_Overlay.pm
 create mode 100644 rt/lib/RT/Links_Overlay.pm
 create mode 100644 rt/lib/RT/Principal.pm
 create mode 100644 rt/lib/RT/Principal_Overlay.pm
 create mode 100644 rt/lib/RT/Principals.pm
 create mode 100644 rt/lib/RT/Principals_Overlay.pm
 create mode 100644 rt/lib/RT/Queue_Overlay.pm
 create mode 100644 rt/lib/RT/Queues_Overlay.pm
 create mode 100644 rt/lib/RT/ScripAction_Overlay.pm
 create mode 100644 rt/lib/RT/ScripActions_Overlay.pm
 create mode 100644 rt/lib/RT/ScripCondition_Overlay.pm
 create mode 100644 rt/lib/RT/ScripConditions_Overlay.pm
 create mode 100644 rt/lib/RT/Scrip_Overlay.pm
 create mode 100644 rt/lib/RT/Scrips_Overlay.pm
 create mode 100644 rt/lib/RT/Search/ActiveTicketsInQueue.pm
 create mode 100644 rt/lib/RT/Search/Generic.pm
 create mode 100644 rt/lib/RT/SearchBuilder.pm
 create mode 100644 rt/lib/RT/System.pm
 create mode 100644 rt/lib/RT/Template_Overlay.pm
 create mode 100644 rt/lib/RT/Templates_Overlay.pm
 create mode 100644 rt/lib/RT/TicketCustomFieldValue.pm
 create mode 100644 rt/lib/RT/TicketCustomFieldValue_Overlay.pm
 create mode 100644 rt/lib/RT/TicketCustomFieldValues.pm
 create mode 100644 rt/lib/RT/TicketCustomFieldValues_Overlay.pm
 create mode 100644 rt/lib/RT/Ticket_Overlay.pm
 create mode 100644 rt/lib/RT/Tickets_Overlay.pm
 create mode 100644 rt/lib/RT/Tickets_Overlay_SQL.pm
 create mode 100644 rt/lib/RT/Transaction_Overlay.pm
 create mode 100644 rt/lib/RT/Transactions_Overlay.pm
 create mode 100644 rt/lib/RT/URI.pm
 create mode 100644 rt/lib/RT/URI/base.pm
 create mode 100644 rt/lib/RT/URI/fsck_com_rt.pm
 create mode 100644 rt/lib/RT/User_Overlay.pm
 create mode 100644 rt/lib/RT/Users_Overlay.pm
 create mode 100644 rt/lib/t/00smoke.t
 create mode 100644 rt/lib/t/00smoke.t.in
 create mode 100644 rt/lib/t/01harness.t
 create mode 100644 rt/lib/t/01harness.t.in
 create mode 100644 rt/lib/t/02regression.t
 create mode 100644 rt/lib/t/02regression.t.in
 create mode 100644 rt/lib/t/03web.pl
 create mode 100644 rt/lib/t/03web.pl.in
 create mode 100644 rt/lib/t/04_send_email.pl
 create mode 100644 rt/lib/t/04_send_email.pl.in
 create mode 100644 rt/lib/t/data/8859-15-message-series/dir
 create mode 100644 rt/lib/t/data/8859-15-message-series/msg1
 create mode 100644 rt/lib/t/data/8859-15-message-series/msg2
 create mode 100644 rt/lib/t/data/8859-15-message-series/msg3
 create mode 100644 rt/lib/t/data/8859-15-message-series/msg4
 create mode 100644 rt/lib/t/data/8859-15-message-series/msg5
 create mode 100644 rt/lib/t/data/8859-15-message-series/msg6
 create mode 100644 rt/lib/t/data/8859-15-message-series/msg7
 create mode 100644 rt/lib/t/data/multipart-alternative-with-umlaut
 create mode 100644 rt/lib/t/data/nested-mime-sample
 create mode 100644 rt/lib/t/data/nested-rfc-822
 create mode 100644 rt/lib/t/data/new-ticket-from-iso-8859-1
 create mode 100644 rt/lib/t/data/new-ticket-from-iso-8859-1-full
 create mode 100644 rt/lib/t/data/russian-subject-no-content-type
 create mode 100644 rt/lib/t/data/text-html-in-russian
 create mode 100644 rt/lib/t/data/text-html-with-umlaut
 create mode 100644 rt/lib/t/regression/00placeholder
 create mode 100644 rt/lib/t/regression/mime_tests
 create mode 100644 rt/m4/rt_enable_layout.m4
 create mode 100644 rt/m4/rt_expand_var.m4
 create mode 100644 rt/m4/rt_layout.m4
 create mode 100644 rt/m4/rt_subst_expanded_arg.m4
 create mode 100644 rt/sbin/extract-message-catalog
 create mode 100644 rt/sbin/extract_pod_tests
 create mode 100644 rt/sbin/factory
 create mode 100644 rt/sbin/license_tag
 create mode 100644 rt/sbin/regression_harness
 create mode 100644 rt/sbin/rt-setup-database
 create mode 100644 rt/sbin/rt-setup-database.in
 create mode 100644 rt/sbin/rt-test-dependencies
 create mode 100644 rt/sbin/rt-test-dependencies.in

diff --git a/rt/Changelog b/rt/Changelog
new file mode 100644
index 000000000..d8d73fd6d
--- /dev/null
+++ b/rt/Changelog
@@ -0,0 +1,1286 @@
+
+
+
+Project "rt.3", Branch 0						  Page 1
+Change Log						Sat Jul 12 04:24:41 2003
+
+rt.3.D000, C0, jesse, Thu Mar 13 20:43:23 2003, RT: Request Tracker, branch 3.0.
+    RT: Request Tracker, branch 3.0.
+
+    Change Delta  Brief Description
+      10      1	  Bumping the version to rt.3.0.0rc0
+      11      2	  Minor CSS update. rollback fix; new database indices;
+		  copyright update
+      15      3	  removing the old REST API
+      16      4	  Performance work on 'WhoHaveRight'; bumping to 3.0.0rc2
+      12      5	  fixing indices for postgres
+      17      6	  fixing fastcgi's ability to load webmux.pl on some platforms
+      18      7	  More performance work; backing out 'enhancements' that killed
+		  system performance
+      19      8	  Caving in to the masses and making 'notify sender'
+		  configurable
+      20      9	  finishing the notify stuff
+      22     10	  Bumping to RC3; fixing the display of 'This user's n highest
+		  priority tix'
+      23     11	  New french translation
+      25     12	  Brazilian Portuguese translation
+      26     13	  Postgres fixes
+      27     14	  Postgres schema tweak
+      28     15	  Further postgres tweaks and fixes
+      29     16	  RT should now be less overzealous about opening and then
+		  marking a ticket 'new' again
+      30     17	  Bumping to 3.0.0rc4
+      31     18	  Minor fixes - Bumped to 3.0.0;
+		  2266 - postgres scrip creation bug
+		  2267 - Tickets not reopened after being stalled
+		  2265 - Fixed css nits from blaise
+		  Unreported - Fixed quick-search bug
+      32     19	  Added better error checking for failed ticket creation
+      33     20	  A tiny bit of extra data passing for some callbacks
+      35     21	  New czech translation
+      37     22	  Updated dependencies
+      36     23	  Updated Spanish translation
+      38     24	  Updates for RT RPC interface from AMS
+      39     25	  Many users should be able to have a blank address; neew test
+		  suite to ensure this
+      50     26	  Integrating rafael's failing test suite and proposed fix from
+		  autrijus
+      51     27	  Changing address used in example to not send mail to author
+      52     28	  More I18N testing  for rafael
+      53     29	  Added preliminary left to right hebrew translation
+      55     30	  #2365 Removing outdated Mason setup parameter
+      56     31	  Testing fixes for mail authentication/authorization
+      57     32	  Testing and fixing binary attachment corruption
+      58     33	  Better binary attachment handling fix from autrijus
+      59     34	  Bumping to RT 3.0.1pre2
+      60     35	  SMTP and I18N fixes from autrijus tang. Updated chinese
+		  translations
+      61     36	  New speedycgi support from vivek khera
+      62     37	  Bumping to version 3.0.1
+      63     38	  Fixing a showmessagestanza bug found in RTIR
+      65     39	  Fixing an untainting bug in 3.0.1
+      66     40	  Quicksearch bug fix from Stan
+      67     41	  updating autrijus' autohandler patch. seems to break lots of
+		  stuff
+      68     42	  Bumping to 3.0.2pre1
+      69     43	  make ids clicky
+      70     44	  fixing utf8 tainting issue in autohandler; bumped to 3.0.2pre2
+      71     45	  Another go at fixing the ARRAY()  issue; bumping to 3.0.2pre3
+      72     46	  bulk links
+      73     47	  I18N patches from autrijus; bouncing to 3.0.2pre4
+      75     48	  bumped version to 3.0.2pre5; attachments performance fixes;
+		  utf-8 mailgateway fixes; more extension hooks; template
+		  updates for approvals
+      76     49	  [#2437] CanonicalizeEmailAddress fixes; [# 2449] html fixes
+		  for right editing; [# 2457] email addresses weren't always
+		  being canonicalized
+      77     50	  Fixing bogus anchor tags
+      78     51	  More performance work on WhoHaveRight; removing an extra join
+      79     52	  Cleaning up RT tag processing
+      80     53	  Importing utf8 fixes, _Vendor overlay support from ourinternet
+      81     54	  Bumping the version to 3.0.2pre6
+      82     55	  Bumping the version to RT 3.0.2
+      83     56	  merge from ourinternet; one CreateTickets fix and some utf8
+		  updates
+      85     57	  Robert's updated search stuff
+      86     58	  Fix for #2602 - make test fails on _Config.pm
+      87     59	  Including norwegian bokmal translation
+      14     60	  #2539: Re: [rt-users] unexpected usage: change sort order with
+		  column headers in search window
+      88     61	  Fix to honor '$LogDir' for LogToFile
+      89     62	  #2603: /opt/rt3/share/doc should not be a file.
+      90     63	  Merging utf8 fixes from autrijus tang
+      91     64	  Fixing an upgrade bug from 3.0.2->3.0.3
+      92     65	  MIME::Words encoding fixes for mail sending
+      93     66	  Additional work on the SQLite port
+      95     67	  Merge from ourinternet: UTF8 fixes; more configurable apache
+		  sessions;
+      96     68	  ACL HasRight system replaced with an algorithm that does more
+		  looking ahead
+      97     69	  A fix to Tickets_Overlay.pm to make the 'Count' methods
+		  actually do a count, not a full SELECT
+      98     70	  Further UTF8-fixed from autrijus
+      99     71	  Bumping the version to 3.0.3pre1
+     100     72	  update layout fix
+     101     73	  #2662 Fixing an overly restrictive ACL check on group creation
+     102     74	  #2657 Web UI Scrip creation bug
+     103     75	  #2652 - de.po updates
+     105     76	  #2658 Cosmetic issue with Scrip menu listing
+     106     77	  fix for FastCGI and SpeedyCGI setgidness with weird
+		  environments
+     107     78	  Continued performance improvements for caching
+     108     79	  Log path enhancment to deal more gracefully with absolutely
+		  specified logfile paths
+     109     80	  CF defaults; fix Starts set
+     110     81	  ACL cache made postgres safe
+     111     82	  Fixing an acl bug in Principal_Overlay introduced after 3.0.2
+		  and a possible 'Deep' transaction issue. now requires
+		  DBIx::SearchBuilder 0.83_05 or newer
+     112     83	  #2678 Fixing crit messages in RT::User
+     113     84	  Bumping DBIx::SearchBuilder requirement to 0.84
+     115     85	  The "rt" program, branch 3.0.
+     117     86	  pass title to Header
+     116     87	  Better testing for internationalization of outoging messages;
+		  slight refactoring to SendEmail to be more testable; added
+		  missing deps to EmailParser
+     118     88	  Bump to 3.0.3pre2; fix a misspelled right in Queue.pm (#2686)
+     119     89	  #2721 - 'id' attribute had mixed casing. this bothers certain
+		  databases (Sybase)
+     120     90	  Header & Logout take URL
+     121     91	  Fixes for: Bogus message headers containing high-bit
+		  characters; database handle reconnections; postgres test suite
+		  failures
+     123     92	  support group & queue acl setting from rt-setup-database
+     125     93	  add TakeTicket, StealTicket rights
+     122     94	  Bumping version to 3.0.3pre3, bumping searchbuilder dependency
+     126     95	  Really bumping the version to 3.0.3pre3
+     129     96	  Various fixes from a pull-up of the ourinternet branch
+     128     97	  #2605 - SpamAssassin Filter returns the wrong codes on
+		  success/failure
+     127     98	  Fixes the cascading style sheet to properly reference message
+		  bodies
+     130     99	  Attempting to be smarter about guessing encodings for outgoing
+		  mail
+     131    100	  Fixing search navigation links (they were made to disappear)
+     132    101	  #2776 - 'new' ACL cache had bad behaviour. rolled back to
+		  older cache and added tests
+     133    102	  On postgres, RT didn't previously cope well with multipart
+		  messages including non-plain parts containing non-ascii
+     135    103	  Efficiency tweaks for WhoHaveRight
+     136    104	  Bumping version to RT 3.0.3pre4
+     137    105	  #2813 Duplicate tickets created at the same time could cause a
+		  user creation race condition
+     138    106	  Importing minor bugfixes from ourinternet
+     139    107	  #2816 new callback to ShowLinks
+     150    108	  #2799: Display URIs instead of HREFs in ticket display
+     151    109	  #2797 Clean up automatich chmodding on installation
+     152    110	  ShowRequestor takes path
+     153    111	  SystemInternal group ACLs in setup
+     155    112	  Better encoding and error checking for message headers
+     156    113	  better handle notification messages containing only text/html
+		  content.
+     157    114	  Bumping to 3.0.3pre5
+     158    115	  More I18N fixes from ourinternet
+     159    116	  Bumping version to RC-1
+     160    117	  Another shot at the header encoding fix
+     161    118	  Mitya's failing processing of html email
+     162    119	  Bumping to 3.0.3rc2
+     163    120	  Anonymizing addresses in mitya's submitted testcases
+     165    121	  Better handling of malformed email messages
+     166    122	  Bumping version to 3.0rc3
+     167    123	  #2850 - With some configurations, users could not create new
+		  tickets with 'new' requestors - Bumped to 3.0 RC 4
+     168    124	  Scrip data updates weren't propagating to parent Ticket
+		  objects; Bumping to 3.0.3
+     169    125	  CustomField rights checking was overly restrictive for users
+		  without queue-specific rights
+     170    126	  I18N mail testing was was being cavalier with the state of
+		  acls after its testing.  (clone of 3.0.C167)
+     171    127	  Ticket Update.html fix to not doubly load content
+     172    128	  Fixing postgres sortorder bug unmased by searchbuilder fix
+     176    129	  Applying POD patches from ourinternet (clone of 3.0.C173)
+     177    130	  UTF8, Custom Field and text message rendering fixes from
+		  ourinternet
+     178    131	  #2843 Date relations were too strict in RT::Tickets searches
+     179    132	  #2847: allow URI Resolver to render itself
+     173    133	  ShowMessageHeaders; make headers clicky
+     180    134	  use RTIR callbacks
+     175    135	  Updating rt-setup-database to take acl and schema file names
+		  on the commandline
+     181    136	  Refactored Users::WhoHaveRight from Chris Audley at Blackrock
+     182    137	  Download link in ShowTransaction
+     185    138	  Fix for speedycgi disappearing database connections
+     183    139	  #2873: Fix for insufficently agressive loop culling
+     186    140	  Fix for nested email message parsing
+     187    141	  Split the HasRight ACL query into two parts. It's now two
+		  small and light SQL queries, instead of one big one that
+		  overwhelmed databases
+     188    142	  Stylistic cleanups for HasRight optimizations
+     189    143	  Relationship transactions are recorded and displayed more
+		  robustly
+     190    144	  Bumping the version to 3.0.4pre1
+     191    145	  Updated french translation from Blaise Thauvin
+      13    146	  Bumping to 3.0.4RC1
+     192    147	  Attachment display bug fix from autrijus tang
+     193    148	  Bumping the version to 3.0.4RC2
+     198    149	  ShowAttachments had a relative path which hurt extensions
+     199    150	  README updates to indicate deprecated dependencies
+     200    151	  Debugging framework cleanup
+     201    152	  Bumping version to 3.0.4
+
+  rt.3.0.D152, C201, jesse, Sat Jul 12 02:41:34 2003, Bumping version to 3.0.4
+      From: Jesse Vincent <jesse@localhost>
+      Date: Fri Jul 11 23:35:03 2003
+
+      none
+
+  rt.3.0.D151, C200, jesse, Sat Jul 12 01:34:41 2003, Debugging framework
+  cleanup
+      From: Jesse Vincent <jesse@localhost>
+      Date: Fri Jul 11 22:31:37 2003
+
+      none
+
+  rt.3.0.D150, C199, jesse, Sat Jul 12 01:17:57 2003, README updates to indicate
+  deprecated dependencies
+      From: Jesse Vincent <jesse@localhost>
+      Date: Fri Jul 11 22:14:37 2003
+
+      none
+
+  rt.3.0.D149, C198, leira, Sat Jul 12 01:17:08 2003, ShowAttachments had a
+  relative path which hurt extensions
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Wed Jul  9 23:33:21 2003
+      Warning: the original change was in the 'being_developed' state
+
+      none
+
+  rt.3.0.D148, C193, jesse, Sat Jul  5 17:34:46 2003, Bumping the version to
+  3.0.4RC2
+      From: Jesse Vincent <jesse@Jesse-Vincents-Computer.local.>
+      Date: Sat Jul  5 17:22:07 2003
+
+      none
+
+  rt.3.0.D147, C192, jesse, Sat Jul  5 17:11:25 2003, Attachment display bug fix
+  from autrijus tang
+      From: Jesse Vincent <jesse@Jesse-Vincents-Computer.local.>
+      Date: Sat Jul  5 17:09:07 2003
+
+      none
+
+  rt.3.0.D146, C13, jesse, Fri Jul  4 14:54:43 2003, Bumping to 3.0.4RC1
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri Jul  4 14:52:56 2003
+
+      none
+
+  rt.3.0.D145, C191, jesse, Fri Jul  4 14:50:26 2003, Updated french translation
+  from Blaise Thauvin
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri Jul  4 14:48:56 2003
+
+      none
+
+  rt.3.0.D144, C190, jesse, Thu Jul  3 01:48:45 2003, Bumping the version to
+  3.0.4pre1
+      From: Jesse Vincent <jesse@Jesse-Vincents-Computer.local.>
+      Date: Thu Jul  3 01:47:25 2003
+
+      none
+
+  rt.3.0.D143, C189, jesse, Thu Jul  3 01:44:51 2003, Relationship transactions
+  are recorded and displayed more robustly
+      From: Jesse Vincent <jesse@Jesse-Vincents-Computer.local.>
+      Date: Thu Jul  3 01:44:08 2003
+
+      none
+
+  rt.3.0.D142, C188, jesse, Wed Jul  2 21:01:44 2003, Stylistic cleanups for
+  HasRight optimizations
+      From: Jesse Vincent <jesse@Jesse-Vincents-Computer.local.>
+      Date: Wed Jul  2 20:58:51 2003
+
+      none
+
+  rt.3.0.D141, C187, jesse, Wed Jul  2 02:48:21 2003, Split the HasRight ACL
+  query into two parts. It's now two small and light SQL queries, instead of one
+  big one that overwhelmed databases
+      From: Jesse Vincent <jesse@Jesse-Vincents-Computer.local.>
+      Date: Wed Jul  2 02:45:49 2003
+
+      none
+
+  rt.3.0.D140, C186, jesse, Wed Jul  2 02:19:47 2003, Fix for nested email
+  message parsing
+      From: Jesse Vincent <jesse@Jesse-Vincents-Computer.local.>
+      Date: Wed Jul  2 02:17:38 2003
+
+      none
+
+  rt.3.0.D139, C183, jesse, Tue Jul  1 23:18:28 2003, #2873: Fix for
+  insufficently agressive loop culling
+      From: Jesse Vincent <jesse@eris>
+      Date: Mon Jun 30 21:12:50 2003
+
+      none
+
+  rt.3.0.D138, C185, jesse, Tue Jul  1 19:08:47 2003, Fix for speedycgi
+  disappearing database connections
+      From: Jesse Vincent <jesse@Jesse-Vincents-Computer.local.>
+      Date: Tue Jul  1 19:05:19 2003
+
+      none
+
+  rt.3.0.D137, C182, leira, Tue Jul  1 16:10:33 2003, Download link in
+  ShowTransaction
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Mon Jun 30 18:04:52 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D136, C181, jesse, Mon Jun 30 15:25:46 2003, Refactored
+  Users::WhoHaveRight from Chris Audley at Blackrock
+      From: Jesse Vincent <jesse@eris>
+      Date: Mon Jun 30 15:23:18 2003
+
+      none
+
+  rt.3.0.D135, C175, jesse, Mon Jun 30 15:24:56 2003, Updating rt-setup-database
+  to take acl and schema file names on the commandline
+      From: Jesse Vincent <jesse@eris>
+      Date: Mon Jun 30 13:41:12 2003
+
+      none
+
+  rt.3.0.D134, C180, leira, Mon Jun 30 02:19:05 2003, use RTIR callbacks
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Mon Jun 30 02:11:25 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D133, C173, leira, Mon Jun 30 02:17:05 2003, ShowMessageHeaders; make
+  headers clicky
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Sun Jun 29 23:31:39 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D132, C179, jesse, Sun Jun 29 03:06:36 2003, #2847: allow URI Resolver
+  to render itself
+      From: Jesse Vincent <jesse@eris>
+      Date: Sun Jun 29 03:04:30 2003
+
+      none
+
+  rt.3.0.D131, C178, jesse, Sun Jun 29 02:59:13 2003, #2843 Date relations were
+  too strict in RT::Tickets searches
+      From: Jesse Vincent <jesse@eris>
+      Date: Sun Jun 29 02:57:53 2003
+
+      none
+
+  rt.3.0.D130, C177, jesse, Sat Jun 28 18:17:28 2003, UTF8, Custom Field and
+  text message rendering fixes from ourinternet
+      From: Jesse Vincent <jesse@eris>
+      Date: Sat Jun 28 18:15:09 2003
+
+      none
+
+  rt.3.0.D129, C176, jesse, Sat Jun 28 17:23:01 2003, Applying POD patches from
+  ourinternet (clone of 3.0.C173)
+      From: Jesse Vincent <jesse@eris>
+      Date: Sat Jun 28 17:15:38 2003
+
+      none
+
+  rt.3.0.D128, C172, jesse, Sat Jun 28 17:17:53 2003, Fixing postgres sortorder
+  bug unmased by searchbuilder fix
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri Jun 27 01:12:13 2003
+
+      none
+
+  rt.3.0.D127, C171, jesse, Tue Jun 24 16:42:07 2003, Ticket Update.html fix to
+  not doubly load content
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Jun 24 16:28:49 2003
+
+      none
+
+  rt.3.0.D126, C170, jesse, Tue Jun 24 16:23:49 2003, I18N mail testing was was
+  being cavalier with the state of acls after its testing.  (clone of 3.0.C167)
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Jun 24 16:22:16 2003
+
+      none
+
+  rt.3.0.D125, C169, jesse, Tue Jun 24 16:23:37 2003, CustomField rights
+  checking was overly restrictive for users without queue-specific rights
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Jun 24 16:18:05 2003
+
+      none
+
+  rt.3.0.D124, C168, jesse, Sat Jun 21 13:01:18 2003, Scrip data updates weren't
+  propagating to parent Ticket objects; Bumping to 3.0.3
+      From: Jesse Vincent <jesse@eris>
+      Date: Sat Jun 21 12:55:04 2003
+
+      none
+
+  rt.3.0.D123, C167, jesse, Thu Jun 19 22:23:01 2003, #2850 - With some
+  configurations, users could not create new tickets with 'new' requestors -
+  Bumped to 3.0 RC 4
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Jun 19 22:22:20 2003
+
+      none
+
+  rt.3.0.D122, C166, jesse, Thu Jun 19 14:25:03 2003, Bumping version to 3.0rc3
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Jun 19 14:18:19 2003
+
+      none
+
+  rt.3.0.D121, C165, jesse, Thu Jun 19 12:25:20 2003, Better handling of
+  malformed email messages
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Jun 19 12:21:56 2003
+
+      none
+
+  rt.3.0.D120, C163, jesse, Thu Jun 19 03:17:20 2003, Anonymizing addresses in
+  mitya's submitted testcases
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Jun 19 03:16:47 2003
+
+      none
+
+  rt.3.0.D119, C162, jesse, Thu Jun 19 03:03:16 2003, Bumping to 3.0.3rc2
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Jun 19 03:01:10 2003
+
+      none
+
+  rt.3.0.D118, C161, jesse, Thu Jun 19 02:58:24 2003, Mitya's failing processing
+  of html email
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Jun 19 02:56:48 2003
+
+      none
+
+  rt.3.0.D117, C160, jesse, Wed Jun 18 17:58:34 2003, Another shot at the header
+  encoding fix
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Jun 18 17:58:01 2003
+
+      none
+
+  rt.3.0.D116, C159, jesse, Wed Jun 18 01:27:03 2003, Bumping version to RC-1
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Jun 18 01:25:13 2003
+
+      none
+
+  rt.3.0.D115, C158, jesse, Wed Jun 18 01:01:22 2003, More I18N fixes from
+  ourinternet
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Jun 18 01:00:11 2003
+
+      none
+
+  rt.3.0.D114, C157, jesse, Tue Jun 17 22:24:03 2003, Bumping to 3.0.3pre5
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Jun 17 22:20:51 2003
+
+      none
+
+  rt.3.0.D113, C156, jesse, Tue Jun 17 22:14:35 2003, better handle notification
+  messages containing only text/html content.
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Jun 17 21:55:06 2003
+
+      none
+
+  rt.3.0.D112, C155, jesse, Tue Jun 17 21:55:16 2003, Better encoding and error
+  checking for message headers
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Jun 17 21:26:27 2003
+      Warning: the original change was in the 'being_developed' state
+
+      none
+
+  rt.3.0.D111, C153, leira, Tue Jun 17 17:47:18 2003, SystemInternal group ACLs
+  in setup
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Tue Jun 17 18:19:58 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D110, C152, leira, Tue Jun 17 16:46:34 2003, ShowRequestor takes path
+      From: Linda L. Julien <leira@oak.starsong.org>
+      Date: Tue Jun 17 12:53:35 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D109, C151, jesse, Mon Jun 16 23:48:53 2003, #2797 Clean up automatich
+  chmodding on installation
+      From: Jesse Vincent <jesse@eris>
+      Date: Mon Jun 16 23:48:19 2003
+
+      none
+
+  rt.3.0.D108, C150, jesse, Mon Jun 16 23:36:29 2003, #2799: Display URIs
+  instead of HREFs in ticket display
+      From: Jesse Vincent <jesse@eris>
+      Date: Mon Jun 16 23:35:00 2003
+
+      none
+
+  rt.3.0.D107, C139, jesse, Mon Jun 16 23:16:45 2003, #2816 new callback to
+  ShowLinks
+      From: Jesse Vincent <jesse@eris>
+      Date: Mon Jun 16 23:14:05 2003
+
+      none
+
+  rt.3.0.D106, C138, jesse, Mon Jun 16 23:16:29 2003, Importing minor bugfixes
+  from ourinternet
+      From: Jesse Vincent <jesse@eris>
+      Date: Mon Jun 16 23:06:00 2003
+
+      none
+
+  rt.3.0.D105, C137, jesse, Mon Jun 16 19:41:13 2003, #2813 Duplicate tickets
+  created at the same time could cause a user creation race condition
+      From: Jesse Vincent <jesse@eris>
+      Date: Mon Jun 16 19:39:57 2003
+
+      none
+
+  rt.3.0.D104, C136, jesse, Fri Jun 13 18:27:11 2003, Bumping version to RT
+  3.0.3pre4
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri Jun 13 18:25:57 2003
+
+      none
+
+  rt.3.0.D103, C135, jesse, Fri Jun 13 18:22:33 2003, Efficiency tweaks for
+  WhoHaveRight
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri Jun 13 18:19:02 2003
+
+      none
+
+  rt.3.0.D102, C133, jesse, Fri Jun 13 18:18:32 2003, On postgres, RT didn't
+  previously cope well with multipart messages including non-plain parts
+  containing non-ascii
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri Jun 13 18:17:37 2003
+
+      none
+
+  rt.3.0.D101, C132, jesse, Fri Jun 13 01:41:24 2003, #2776 - 'new' ACL cache
+  had bad behaviour. rolled back to older cache and added tests
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri Jun 13 01:40:26 2003
+
+      none
+
+  rt.3.0.D100, C131, jesse, Thu Jun 12 13:22:10 2003, Fixing search navigation
+  links (they were made to disappear)
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Jun 12 13:19:37 2003
+
+      none
+
+  rt.3.0.D099, C130, jesse, Wed Jun 11 16:44:16 2003, Attempting to be smarter
+  about guessing encodings for outgoing mail
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Jun 11 16:42:50 2003
+      Warning: the original change was in the 'being_developed' state
+
+      none
+
+  rt.3.0.D098, C127, jesse, Wed Jun 11 16:39:39 2003, Fixes the cascading style
+  sheet to properly reference message bodies
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Jun 11 15:43:39 2003
+      Warning: the original change was in the 'being_developed' state
+
+  rt.3.0.D097, C128, jesse, Wed Jun 11 16:37:38 2003, #2605 - SpamAssassin
+  Filter returns the wrong codes on success/failure
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Jun 11 15:53:58 2003
+
+      none
+
+  rt.3.0.D096, C129, jesse, Wed Jun 11 16:36:53 2003, Various fixes from a pull-
+  up of the ourinternet branch
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Jun 11 16:17:44 2003
+
+      none
+
+  rt.3.0.D095, C126, jesse, Tue Jun 10 16:17:50 2003, Really bumping the version
+  to 3.0.3pre3
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Jun 10 16:17:08 2003
+
+      none
+
+  rt.3.0.D094, C122, jesse, Tue Jun 10 15:58:32 2003, Bumping version to
+  3.0.3pre3, bumping searchbuilder dependency
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Jun 10 15:56:41 2003
+
+      none
+
+  rt.3.0.D093, C125, jesse, Tue Jun 10 15:54:52 2003, add TakeTicket,
+  StealTicket rights
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Jun 10 15:41:43 2003
+      Warning: the original change was in the 'being_developed' state
+
+      From: Jesse <jesse@fsck.com>
+      Date: Tue Jun 10 11:01:04 2003
+      Warning: the original change was in the 'being_reviewed' state
+
+      From: Linda L. Julien <leira@oak.starsong.org>
+      Date: Tue Jun 10 11:58:03 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D092, C123, leira, Tue Jun 10 15:54:10 2003, support group & queue acl
+  setting from rt-setup-database
+      From: Linda L. Julien <leira@oak.starsong.org>
+      Date: Tue Jun 10 14:13:46 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D091, C121, jesse, Sun Jun  8 00:41:47 2003, Fixes for: Bogus message
+  headers containing high-bit characters; database handle reconnections;
+  postgres test suite failures
+      From: Jesse Vincent <jesse@eris>
+      Date: Sun Jun  8 00:32:40 2003
+
+      none
+
+  rt.3.0.D090, C120, leira, Sun Jun  8 00:34:40 2003, Header & Logout take URL
+      From: Linda L. Julien <leira@oak.starsong.org>
+      Date: Fri Jun  6 19:06:41 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D089, C119, jesse, Fri Jun  6 17:33:37 2003, #2721 - 'id' attribute had
+  mixed casing. this bothers certain databases (Sybase)
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri Jun  6 17:32:16 2003
+
+      none
+
+  rt.3.0.D088, C118, jesse, Wed Jun  4 17:21:24 2003, Bump to 3.0.3pre2; fix a
+  misspelled right in Queue.pm (#2686)
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Jun  4 17:19:39 2003
+      Warning: the original change was in the 'being_developed' state
+
+      The "rt" program, branch 3.0.
+
+  rt.3.0.D087, C116, jesse, Wed Jun  4 17:17:08 2003, Better testing for
+  internationalization of outoging messages; slight refactoring to SendEmail to
+  be more testable; added missing deps to EmailParser
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Jun  4 16:53:07 2003
+
+      none
+
+  rt.3.0.D086, C117, leira, Wed Jun  4 00:23:20 2003, pass title to Header
+      From: Linda L. Julien <leira@oak.starsong.org>
+      Date: Tue Jun  3 18:09:39 2003
+      Warning: the original change was in the 'being_developed' state
+
+      none
+
+  rt.3.0.D085, C115, jesse, Tue Jun  3 00:45:12 2003, The "rt" program, branch
+  3.0.
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Jun  3 00:43:15 2003
+      Warning: the original change was in the 'being_developed' state
+
+      The "rt" program, branch 3.0.
+
+  rt.3.0.D084, C113, jesse, Tue Jun  3 00:20:07 2003, Bumping
+  DBIx::SearchBuilder requirement to 0.84
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Jun  3 00:19:50 2003
+
+      none
+
+  rt.3.0.D083, C112, jesse, Tue Jun  3 00:18:43 2003, #2678 Fixing crit messages
+  in RT::User
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Jun  3 00:18:12 2003
+
+      none
+
+  rt.3.0.D082, C111, jesse, Tue Jun  3 00:04:45 2003, Fixing an acl bug in
+  Principal_Overlay introduced after 3.0.2 and a possible 'Deep' transaction
+  issue. now requires DBIx::SearchBuilder 0.83_05 or newer
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Jun  3 00:02:23 2003
+
+      none
+
+  rt.3.0.D081, C110, jesse, Mon Jun  2 22:40:34 2003, ACL cache made postgres
+  safe
+      From: Jesse Vincent <jesse@eris>
+      Date: Mon Jun  2 22:39:03 2003
+
+      none
+
+  rt.3.0.D080, C109, leira, Mon Jun  2 17:10:05 2003, CF defaults; fix Starts
+  set
+      From: Linda L. Julien <leira@oak.starsong.org>
+      Date: Mon Jun  2 17:32:11 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D079, C108, jesse, Sat May 31 00:28:37 2003, Log path enhancment to
+  deal more gracefully with absolutely specified logfile paths
+      From: Jesse Vincent <jesse@eris>
+      Date: Sat May 31 00:27:38 2003
+
+      none
+
+  rt.3.0.D078, C107, jesse, Sat May 31 00:20:53 2003, Continued performance
+  improvements for caching
+      From: Jesse Vincent <jesse@eris>
+      Date: Sat May 31 00:19:32 2003
+
+      none
+
+  rt.3.0.D077, C106, jesse, Sat May 31 00:20:32 2003, fix for FastCGI and
+  SpeedyCGI setgidness with weird environments
+      From: Jesse Vincent <jesse@eris>
+      Date: Sat May 31 00:19:15 2003
+
+      none
+
+  rt.3.0.D076, C105, jesse, Fri May 30 16:21:14 2003, #2658 Cosmetic issue with
+  Scrip menu listing
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri May 30 16:14:02 2003
+
+      none
+
+  rt.3.0.D075, C103, jesse, Fri May 30 16:20:57 2003, #2652 - de.po updates
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri May 30 15:57:44 2003
+
+      none
+
+  rt.3.0.D074, C102, jesse, Fri May 30 16:18:57 2003, #2657 Web UI Scrip
+  creation bug
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri May 30 15:50:16 2003
+
+      none
+
+  rt.3.0.D073, C101, jesse, Fri May 30 16:17:43 2003, #2662 Fixing an overly
+  restrictive ACL check on group creation
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri May 30 15:46:22 2003
+
+      none
+
+  rt.3.0.D072, C100, leira, Fri May 30 16:17:05 2003, update layout fix
+      From: Linda L. Julien <leira@oak.starsong.org>
+      Date: Thu May 29 14:30:01 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D071, C99, jesse, Wed May 28 17:54:48 2003, Bumping the version to
+  3.0.3pre1
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed May 28 17:52:51 2003
+
+      none
+
+  rt.3.0.D070, C98, jesse, Wed May 28 17:54:40 2003, Further UTF8-fixed from
+  autrijus
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed May 28 17:49:32 2003
+
+      none
+
+  rt.3.0.D069, C97, jesse, Wed May 28 17:07:10 2003, A fix to Tickets_Overlay.pm
+  to make the 'Count' methods actually do a count, not a full SELECT
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed May 28 17:04:50 2003
+
+      none
+
+  rt.3.0.D068, C96, jesse, Wed May 28 17:06:43 2003, ACL HasRight system
+  replaced with an algorithm that does more looking ahead
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed May 28 16:36:10 2003
+
+      none
+
+  rt.3.0.D067, C95, jesse, Tue May 27 13:22:19 2003, Merge from ourinternet:
+  UTF8 fixes; more configurable apache sessions;
+      From: Jesse Vincent <jesse@Jesse-Vincents-Computer.local.>
+      Date: Tue May 27 13:07:41 2003
+
+      none
+
+  rt.3.0.D066, C93, jesse, Sat May 24 18:05:36 2003, Additional work on the
+  SQLite port
+      From: Jesse Vincent <jesse@eris>
+      Date: Sat May 24 18:04:50 2003
+
+      none
+
+  rt.3.0.D065, C92, jesse, Fri May 23 16:45:23 2003, MIME::Words encoding fixes
+  for mail sending
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri May 23 16:44:28 2003
+
+      none
+
+  rt.3.0.D064, C91, jesse, Fri May 23 16:12:26 2003, Fixing an upgrade bug from
+  3.0.2->3.0.3
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri May 23 15:57:50 2003
+
+      none
+
+  rt.3.0.D063, C90, jesse, Fri May 23 15:27:47 2003, Merging utf8 fixes from
+  autrijus tang
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri May 23 15:25:23 2003
+
+      none
+
+  rt.3.0.D062, C89, jesse, Wed May 21 00:58:34 2003, #2603: /opt/rt3/share/doc
+  should not be a file.
+      From: Jesse Vincent <jesse@Jesse-Vincents-Computer.local.>
+      Date: Wed May 21 00:29:55 2003
+
+      none
+
+  rt.3.0.D061, C88, jesse, Wed May 21 00:57:45 2003, Fix to honor '$LogDir' for
+  LogToFile
+      From: Jesse Vincent <jesse@Jesse-Vincents-Computer.local.>
+      Date: Wed May 21 00:17:18 2003
+
+      none
+
+  rt.3.0.D060, C14, jesse, Wed May 21 00:56:31 2003, #2539: Re: [rt-users]
+  unexpected usage: change sort order with column headers in search window
+      From: Jesse Vincent <jesse@Jesse-Vincents-Computer.local.>
+      Date: Tue May 20 23:19:46 2003
+
+      none
+
+  rt.3.0.D059, C87, jesse, Wed May 21 00:55:08 2003, Including norwegian bokmal
+  translation
+      From: Jesse Vincent <jesse@Jesse-Vincents-Computer.local.>
+      Date: Tue May 20 23:05:17 2003
+
+      none
+
+  rt.3.0.D058, C86, jesse, Wed May 21 00:54:06 2003, Fix for #2602 - make test
+  fails on _Config.pm
+      From: Jesse Vincent <jesse@Jesse-Vincents-Computer.local.>
+      Date: Tue May 20 22:32:52 2003
+
+      none
+
+  rt.3.0.D057, C85, leira, Tue May 20 12:15:11 2003, Robert's updated search
+  stuff
+      From: Linda L. Julien <leira@oak.starsong.org>
+      Date: Mon May 19 18:19:14 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D056, C83, jesse, Sat May 17 17:34:32 2003, merge from ourinternet; one
+  CreateTickets fix and some utf8 updates
+      From: Jesse Vincent <jesse@eris>
+      Date: Sat May 17 17:31:43 2003
+
+      none
+
+  rt.3.0.D055, C82, jesse, Mon May 12 20:30:45 2003, Bumping the version to RT
+  3.0.2
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue May 13 02:29:44 2003
+
+      none
+
+  rt.3.0.D054, C81, jesse, Wed May  7 09:18:28 2003, Bumping the version to
+  3.0.2pre6
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed May  7 15:16:55 2003
+      Warning: the original change was in the 'being_developed' state
+
+      none
+
+  rt.3.0.D053, C80, jesse, Wed May  7 09:02:24 2003, Importing utf8 fixes, _
+  Vendor overlay support from ourinternet
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed May  7 14:52:58 2003
+
+      none
+
+  rt.3.0.D052, C79, jesse, Wed May  7 07:05:14 2003, Cleaning up RT tag
+  processing
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed May  7 13:04:17 2003
+
+      none
+
+  rt.3.0.D051, C78, jesse, Wed May  7 07:03:27 2003, More performance work on
+  WhoHaveRight; removing an extra join
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed May  7 13:00:43 2003
+
+      none
+
+  rt.3.0.D050, C77, jesse, Fri May  2 11:23:23 2003, Fixing bogus anchor tags
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri May  2 17:19:54 2003
+
+      none
+
+  rt.3.0.D049, C76, jesse, Fri May  2 10:26:30 2003, [#2437]
+  CanonicalizeEmailAddress fixes; [# 2449] html fixes for right editing; [#
+  2457] email addresses weren't always being canonicalized
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri May  2 16:24:40 2003
+
+      none
+
+  rt.3.0.D048, C75, jesse, Fri May  2 08:35:38 2003, bumped version to
+  3.0.2pre5; attachments performance fixes; utf-8 mailgateway fixes; more
+  extension hooks; template updates for approvals
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri May  2 14:32:57 2003
+
+      none
+
+  rt.3.0.D047, C73, jesse, Sun Apr 27 19:06:46 2003, I18N patches from autrijus;
+  bouncing to 3.0.2pre4
+      From: Jesse Vincent <jesse@eris>
+      Date: Mon Apr 28 01:02:18 2003
+
+      none
+
+  rt.3.0.D046, C72, leira, Sun Apr 27 19:06:04 2003, bulk links
+      From: Linda L. Julien <leira@oak.starsong.org>
+      Date: Thu Apr 24 01:23:01 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D045, C71, jesse, Sat Apr 19 03:42:39 2003, Another go at fixing the
+  ARRAY()  issue; bumping to 3.0.2pre3
+      From: Jesse Vincent <jesse@eris>
+      Date: Sat Apr 19 08:39:19 2003
+
+      none
+
+  rt.3.0.D044, C70, jesse, Fri Apr 18 16:37:00 2003, fixing utf8 tainting issue
+  in autohandler; bumped to 3.0.2pre2
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri Apr 18 21:32:04 2003
+
+      none
+
+  rt.3.0.D043, C69, leira, Thu Apr 17 18:51:41 2003, make ids clicky
+      From: Linda L. Julien <leira@oak.starsong.org>
+      Date: Thu Apr 17 18:31:40 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D042, C68, jesse, Thu Apr 17 18:39:54 2003, Bumping to 3.0.2pre1
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Apr 17 23:37:59 2003
+
+      none
+
+  rt.3.0.D041, C67, jesse, Thu Apr 17 18:33:15 2003, updating autrijus'
+  autohandler patch. seems to break lots of stuff
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Apr 17 23:21:02 2003
+
+      none
+
+  rt.3.0.D040, C66, jesse, Thu Apr 17 18:32:24 2003, Quicksearch bug fix from
+  Stan
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Apr 17 23:16:58 2003
+
+      none
+
+  rt.3.0.D039, C65, jesse, Thu Apr 17 18:29:31 2003, Fixing an untainting bug in
+  3.0.1
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Apr 17 23:15:01 2003
+      Warning: the original change was in the 'being_developed' state
+
+      none
+
+  rt.3.0.D038, C63, jesse, Thu Apr 17 04:46:42 2003, Fixing a showmessagestanza
+  bug found in RTIR
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Apr 17 09:45:48 2003
+
+      none
+
+  rt.3.0.D037, C62, jesse, Tue Apr 15 11:53:58 2003, Bumping to version 3.0.1
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Apr 15 11:52:00 2003
+
+      none
+
+  rt.3.0.D036, C61, jesse, Mon Apr 14 18:18:03 2003, New speedycgi support from
+  vivek khera
+      From: Jesse Vincent <jesse@eris>
+      Date: Mon Apr 14 14:49:49 2003
+
+      none
+
+  rt.3.0.D035, C60, jesse, Sun Apr 13 21:43:32 2003, SMTP and I18N fixes from
+  autrijus tang. Updated chinese translations
+      From: Jesse Vincent <jesse@eris>
+      Date: Sun Apr 13 21:32:55 2003
+
+      none
+
+  rt.3.0.D034, C59, jesse, Fri Apr 11 21:58:36 2003, Bumping to RT 3.0.1pre2
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri Apr 11 21:58:06 2003
+
+      none
+
+  rt.3.0.D033, C58, jesse, Fri Apr 11 21:56:11 2003, Better binary attachment
+  handling fix from autrijus
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri Apr 11 21:52:12 2003
+
+      none
+
+  rt.3.0.D032, C57, jesse, Fri Apr 11 21:35:17 2003, Testing and fixing binary
+  attachment corruption
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri Apr 11 21:34:28 2003
+
+      none
+
+  rt.3.0.D031, C56, jesse, Fri Apr 11 21:34:56 2003, Testing fixes for mail
+  authentication/authorization
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Apr 10 00:08:29 2003
+
+      none
+
+  rt.3.0.D030, C55, jesse, Wed Apr  9 13:55:18 2003, #2365 Removing outdated
+  Mason setup parameter
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Apr  9 13:54:43 2003
+
+      none
+
+  rt.3.0.D029, C53, jesse, Wed Apr  9 13:22:35 2003, Added preliminary left to
+  right hebrew translation
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Apr  9 13:18:16 2003
+
+      none
+
+  rt.3.0.D028, C52, jesse, Fri Apr  4 02:10:01 2003, More I18N testing	for
+  rafael
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri Apr  4 02:08:49 2003
+
+      none
+
+  rt.3.0.D027, C51, jesse, Thu Apr  3 19:33:34 2003, Changing address used in
+  example to not send mail to author
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Apr  3 19:29:02 2003
+      Warning: the original change was in the 'being_integrated' state
+
+      none
+
+  rt.3.0.D026, C50, jesse, Thu Apr  3 19:16:37 2003, Integrating rafael's
+  failing test suite and proposed fix from autrijus
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Apr  3 19:15:03 2003
+
+      none
+
+  rt.3.0.D025, C39, jesse, Thu Apr  3 19:16:15 2003, Many users should be able
+  to have a blank address; neew test suite to ensure this
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Apr  3 13:27:36 2003
+
+      none
+
+  rt.3.0.D024, C38, jesse, Thu Apr  3 13:30:37 2003, Updates for RT RPC
+  interface from AMS
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Apr  2 15:32:15 2003
+
+      none
+
+  rt.3.0.D023, C36, jesse, Wed Apr  2 14:14:07 2003, Updated Spanish translation
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Apr  1 14:02:36 2003
+
+      none
+
+  rt.3.0.D022, C37, jesse, Wed Apr  2 14:13:55 2003, Updated dependencies
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Apr  2 14:09:41 2003
+
+      none
+
+  rt.3.0.D021, C35, jesse, Tue Apr  1 13:00:22 2003, New czech translation
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Apr  1 12:58:57 2003
+
+      none
+
+  rt.3.0.D020, C33, jesse, Fri Mar 28 14:48:20 2003, A tiny bit of extra data
+  passing for some callbacks
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri Mar 28 14:43:28 2003
+
+      none
+
+  rt.3.0.D019, C32, jesse, Fri Mar 28 14:35:10 2003, Added better error checking
+  for failed ticket creation
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri Mar 28 14:32:52 2003
+
+      none
+
+  rt.3.0.D018, C31, jesse, Sun Mar 23 17:21:45 2003, Minor fixes - Bumped to
+  3.0.0;
+  2266 - postgres scrip creation bug
+  2267 - Tickets not reopened after being stalled
+  2265 - Fixed css nits from blaise
+  Unreported - Fixed quick-search bug
+      From: Jesse Vincent <jesse@eris>
+      Date: Sun Mar 23 17:17:55 2003
+
+      none
+
+  rt.3.0.D017, C30, jesse, Thu Mar 20 21:38:30 2003, Bumping to 3.0.0rc4
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Mar 20 21:28:01 2003
+
+      none
+
+  rt.3.0.D016, C29, jesse, Thu Mar 20 21:18:27 2003, RT should now be less
+  overzealous about opening and then marking a ticket 'new' again
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Mar 20 21:14:47 2003
+
+      none
+
+  rt.3.0.D015, C28, jesse, Thu Mar 20 15:21:49 2003, Further postgres tweaks and
+  fixes
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Mar 20 15:20:21 2003
+
+      none
+
+  rt.3.0.D014, C27, jesse, Thu Mar 20 01:48:42 2003, Postgres schema tweak
+      From: Jesse Vincent <jesse@eris>
+      Date: Thu Mar 20 01:47:20 2003
+
+      none
+
+  rt.3.0.D013, C26, jesse, Wed Mar 19 21:26:47 2003, Postgres fixes
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Mar 19 21:26:24 2003
+
+      none
+
+  rt.3.0.D012, C25, jesse, Wed Mar 19 16:27:29 2003, Brazilian Portuguese
+  translation
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Mar 19 16:25:48 2003
+
+      none
+
+  rt.3.0.D011, C23, jesse, Wed Mar 19 13:03:15 2003, New french translation
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Mar 19 13:02:47 2003
+
+      none
+
+  rt.3.0.D010, C22, jesse, Wed Mar 19 01:01:24 2003, Bumping to RC3; fixing the
+  display of 'This user's n highest priority tix'
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Mar 19 01:00:33 2003
+
+      none
+
+  rt.3.0.D009, C20, jesse, Wed Mar 19 00:46:17 2003, finishing the notify stuff
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Mar 19 00:45:09 2003
+
+      none
+
+  rt.3.0.D008, C19, jesse, Wed Mar 19 00:40:45 2003, Caving in to the masses and
+  making 'notify sender' configurable
+      From: Jesse Vincent <jesse@eris>
+      Date: Wed Mar 19 00:38:50 2003
+
+      none
+
+  rt.3.0.D007, C18, jesse, Tue Mar 18 16:29:45 2003, More performance work;
+  backing out 'enhancements' that killed system performance
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Mar 18 16:26:07 2003
+
+      none
+
+  rt.3.0.D006, C17, jesse, Tue Mar 18 11:29:28 2003, fixing fastcgi's ability to
+  load webmux.pl on some platforms
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Mar 18 11:28:11 2003
+
+      none
+
+  rt.3.0.D005, C12, jesse, Tue Mar 18 00:58:52 2003, fixing indices for postgres
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Mar 18 00:53:06 2003
+
+      none
+
+  rt.3.0.D004, C16, jesse, Tue Mar 18 00:41:26 2003, Performance work on
+  'WhoHaveRight'; bumping to 3.0.0rc2
+      From: Jesse Vincent <jesse@eris>
+      Date: Tue Mar 18 00:37:30 2003
+
+      none
+
+  rt.3.0.D003, C15, jesse, Fri Mar 14 17:07:28 2003, removing the old REST API
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri Mar 14 16:50:38 2003
+
+      none
+
+  rt.3.0.D002, C11, jesse, Fri Mar 14 16:42:46 2003, Minor CSS update. rollback
+  fix; new database indices; copyright update
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri Mar 14 16:35:01 2003
+
+      none
+
+  rt.3.0.D001, C10, jesse, Fri Mar 14 01:26:22 2003, Bumping the version to
+  rt.3.0.0rc0
+      From: Jesse Vincent <jesse@eris>
+      Date: Fri Mar 14 01:25:51 2003
+
+      none
diff --git a/rt/HOWTO/README b/rt/HOWTO/README
new file mode 100644
index 000000000..942096b0a
--- /dev/null
+++ b/rt/HOWTO/README
@@ -0,0 +1,14 @@
+Here you'll find plain text documentation of how to handle various
+project procedures.  Files contained herein:
+
+change.txt
+        How changes are integrated, including generating and
+        distributing aedist change sets, and updating the CVS repository.
+
+release.txt
+	Steps to go through when releasing a new version of RT.
+
+
+These procedures are based on documentation from the scons project
+as http://www.scons.org/
+
diff --git a/rt/HOWTO/change.txt b/rt/HOWTO/change.txt
new file mode 100644
index 000000000..de316450c
--- /dev/null
+++ b/rt/HOWTO/change.txt
@@ -0,0 +1,67 @@
+Handling a change set:
+
+    --	Start the change:
+
+		aedist -r	[if it's a remote submission]
+                
+                -or-
+
+    		aedb {cnum}	[if it's initiated locally]
+
+    --	Normal development cycle:
+
+                aecd -c {cnum}                   
+                aecp .          # Copy the baseline to your working dir
+                # work on your change
+                aenf {new file names}
+
+                aecpu -unch   # Remove unchanged files, for faster diffs
+    		aeb # Currently does nothing
+		aet # Currently does nothing
+		aed # Diff your change
+		aede # End the change
+
+    --	As the reviewer:
+ 
+		aerpass {cnum}
+
+    --	As the integrator:
+
+		aeib {cnum}
+		aeb
+		aet
+		aed
+                cd ~ # Get out of the current working directory
+		aeipass
+
+
+
+
+    --	Update the aedist baseline on the web site:
+
+		aedist -s -bl -p rt.2.1 > rt.2.1.ae
+		scp rt.2.1.ae jesse@fsck.com:/home/ftp/pub/rt/devel/rt.2.1.ae
+		rm rt.2.1.ae
+
+	[This will eventually be automated.]
+
+    --	Distribute the change to CVS:
+
+        WARNING. DOES NOT YET WORK
+
+		export CVS_RSH=ssh
+    		ae2cvs -n -aegis -p rt.2.1 -c {cnum} -u ~/SCons/scons
+    		ae2cvs -X -aegis -p rt.2.1 -c {cnum} -u ~/SCons/scons
+
+        If you need the "ae2cvs" Perl script, you can find a copy
+        checked in to the bin/subdirectory.
+
+	[This may eventually be automated.]
+
+
+
+	-- Grabbing the latest dev sources over ssh 
+
+	ssh fsck.com "aedist -s -p rt.2.1 -naa -bl -entire-source" | aedist -r
+
+
diff --git a/rt/HOWTO/release.txt b/rt/HOWTO/release.txt
new file mode 100644
index 000000000..285041c5b
--- /dev/null
+++ b/rt/HOWTO/release.txt
@@ -0,0 +1,124 @@
+Things to do to release a new version of rt:
+
+	Build and test candidate packages
+
+	Read through the README and src/README.txt files for any updates
+
+	Prepare ChangeLog
+
+		date -R the latest release
+
+		should be current if this has been updated as each
+		change went in.
+
+                [ Should be automated ]
+
+
+        TODO: nothing below this line is accurate for RT
+
+	END THE BRANCH
+
+		ae_p rt.2
+		aede {5}
+		aerpass {5}
+		aeib {5}
+		aeb
+		aet
+		aet -reg
+		aed
+		aeipass
+
+	START THE NEW BRANCH
+
+		aenbr -p rt.2 {6}
+		aenc -p rt.2.{6}
+
+                        Call it something like, "Initialize the new
+                        branch."  Cause = internal_enhancement.  Exempt
+                        it from all tests (*_exempt = true).
+
+		ae_p rt.2.{6}
+
+		aedb 100
+
+		aecd
+
+		# Change the hard-coded package version numbers
+		# in the following files.
+		aecp rttruct debian/changelog rpm/rt.spec
+
+		vi rttruct debian/changelog rpm/rt.spec
+
+		# Optionally, do the same in the following:
+		[optional] aecp HOWTO/change.txt
+		[optional] aecp HOWTO/release.txt
+		[optional] aecp debian/rt.postinst
+
+		[optional] vi HOWTO/change.txt
+		[optional] vi HOWTO/release.txt
+		[optional] vi debian/rt.postinst
+
+		aeb
+
+		aet -reg
+
+		aed
+
+		aede
+
+		etc.
+
+
+	Read through the FAQ for any updates
+
+	Test downloading from the web site download page
+
+
+	In the Bugs Tracker, add a Group for the new release (0.05)
+
+	Announce to the following mailing lists (template below):
+
+		rt-announce@lists.fsck.com
+
+
+	Notify www.cmtoday.com/contribute.html
+
+                [This guy wants an announcement no more frequently than
+                once a month, so save it for a future release if it's
+                been too soon since the previous one.]
+
+	Notify freshmeat.net
+
+                [Wait until the morning so the announcement hits the
+                main freshmeat.net page while people in the U.S. are
+                awake and working]
+
+
+
+
+=======================
+
+Template release announcement:
+
+
+
+Version 2.1.XXX of rt has been released and is available for download
+from the rt web site:
+
+        http://bestpractical.com/rt/
+
+
+
+WHAT'S NEW IN THIS RELEASE?
+
+Version 2.1.XXX of rt contains the following important changes:
+
+  - XXX
+
+For a complete list of changes in version 2.1.XXX, see the CHANGES.txt
+file in the release itself.
+
+
+WHAT IS RT? 
+
+        FILL THIS IN
diff --git a/rt/HOWTO/version-control.txt b/rt/HOWTO/version-control.txt
new file mode 100644
index 000000000..06babfdf1
--- /dev/null
+++ b/rt/HOWTO/version-control.txt
@@ -0,0 +1,41 @@
+Using Aegis for RT development
+
+   1. The main line of RT development will be under the control
+      of the Aegis change management system, as administered by
+       Best Practical Solutions, LLC
+
+   2. We will use aedist to generate change sets for each change
+      checked in to the main Aegis repository. These change sets will be
+      either distributed by a mailing list or made available via the web,
+      or both.
+
+   3. Remote developers using Aegis will send aedist output for
+      their changes to rt-patches@bestpractical.com for review and
+      integration.
+
+   4. The aedist output should be sent to rt-patches@bestpractical.com
+      after the change has completed its local aede, but before aerpass.
+
+   5. If the change is rejected, the developer can aedeu to reopen
+      the change and fix whatever problems caused the review to not pass.
+
+   6. A baseline snapshot (aedist -bl) of the main Aegis repository
+      will be generated at least daily and made available via http
+      to provide a central location for synchronizing remote Aegis
+      repositories.
+
+   7. Changes to the main Aegis repository will also be propagated
+      automatically to the tracking CVS repository.
+
+Using CVS for RT development
+
+   1. CVS is accessed via anonymous cvs with the following CVSROOT:
+
+      :pserver:anoncvs@cvs.fsck.com:/raid/cvsroot/rt-2-1
+
+   2. Remote developers using CVS will send patches (cvs -diff
+      output) to rt-patches@bestpractical.com  for integration into the
+      main Aegis repository. This allows anonymous CVS access to be used
+      for RT development by developers who are unable to use Aegis.
+
+
diff --git a/rt/Makefile b/rt/Makefile
index fe01b71c1..644722109 100644
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -1,18 +1,49 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/Makefile,v 1.1 2002-08-12 06:17:06 ivan Exp $
-# RT is Copyright 1996-2002 Jesse Vincent <jesse@bestpractical.com>
-# It is distributed under the terms of the GNU General Public License, version 2
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2002 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org
+# 
+# This work 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.
+# 
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+
+#
+# DO NOT HAND-EDIT the file named 'Makefile'. This file is autogenerated.
+# Have a look at "configure" and "Makefile.in" instead
+#
+
 
 PERL			= 	/usr/bin/perl
 
-RT_VERSION_MAJOR	=	2
-RT_VERSION_MINOR	=	0
-RT_VERSION_PATCH	=	14
+CONFIG_FILE_PATH	=	/opt/rt3/etc
+CONFIG_FILE		= 	$(CONFIG_FILE_PATH)/RT_Config.pm
+SITE_CONFIG_FILE		= 	$(CONFIG_FILE_PATH)/RT_SiteConfig.pm
 
 
+RT_VERSION_MAJOR	=	3
+RT_VERSION_MINOR	=	0
+RT_VERSION_PATCH	=	4
+
 RT_VERSION =	$(RT_VERSION_MAJOR).$(RT_VERSION_MINOR).$(RT_VERSION_PATCH)
 TAG 	   =	rt-$(RT_VERSION_MAJOR)-$(RT_VERSION_MINOR)-$(RT_VERSION_PATCH)
 
-BRANCH			=	HEAD
 
 # This is the group that all of the installed files will be chgrp'ed to.
 RTGROUP			=	rt
@@ -27,7 +58,8 @@ LIBS_OWNER 		=	root
 # Group that should own all of RT's libraries, generally root.
 LIBS_GROUP		=	bin
 
-
+WEB_USER		=	www
+WEB_GROUP		=	www
 
 # {{{ Files and directories 
 
@@ -37,33 +69,22 @@ LIBS_GROUP		=	bin
 DESTDIR			=	
 
 
-# RT_PATH is the name of the directory you want make to install RT in
-# RT must be installed in its own directory (don't set this to /usr/local)
-
-RT_PATH			=	/opt/rt2
-
-# The rest of these paths are all configurable, but you probably don't want to 
-# put them elsewhere
-
-RT_LIB_PATH		=	$(RT_PATH)/lib
-RT_ETC_PATH		=	$(RT_PATH)/etc
-RT_CONFIG_PATH		=	$(RT_ETC_PATH)
-RT_BIN_PATH		=	$(RT_PATH)/bin
-RT_MAN_PATH		=	$(RT_PATH)/man
-MASON_HTML_PATH		=	$(RT_PATH)/WebRT/html
-
-
-# RT allows sites to overlay the default web ui with 
-# local customizations Those files can be placed in MASON_LOCAL_HTML_PATH
-
-MASON_LOCAL_HTML_PATH	=	$(RT_PATH)/local/WebRT/html
-
-# RT needs to be able to write to MASON_DATA_PATH and MASON_SESSION_PATH
-# RT will create and chown these directories. Don't just set them to /tmp
-MASON_DATA_PATH		=       $(RT_PATH)/WebRT/data
-MASON_SESSION_PATH	=       $(RT_PATH)/WebRT/sessiondata
-
-RT_LOG_PATH             =       /tmp
+RT_PATH			=	/opt/rt3
+RT_ETC_PATH		=	/opt/rt3/etc
+RT_BIN_PATH		=	/opt/rt3/bin
+RT_SBIN_PATH		=	/opt/rt3/sbin
+RT_LIB_PATH		=	/opt/rt3/lib
+RT_MAN_PATH		=	/opt/rt3/man
+RT_VAR_PATH		=	/opt/rt3/var
+RT_DOC_PATH		=	/opt/rt3/share/doc
+RT_LOCAL_PATH		=	/opt/rt3/local
+LOCAL_ETC_PATH		=	/opt/rt3/local/etc
+LOCAL_LEXICON_PATH	=	/opt/rt3/local/po
+MASON_HTML_PATH		=	/opt/rt3/share/html
+MASON_LOCAL_HTML_PATH	=	/opt/rt3/local/html
+MASON_DATA_PATH		=	/opt/rt3/var/mason_data
+MASON_SESSION_PATH	=	/opt/rt3/var/session_data
+RT_LOG_PATH	    =       /opt/rt3/var/log
 
 # RT_READABLE_DIR_MODE is the mode of directories that are generally meant
 # to be accessable
@@ -71,25 +92,33 @@ RT_READABLE_DIR_MODE	=	0755
 
 
 
-# The location of your rt configuration file
-RT_CONFIG		=	$(RT_CONFIG_PATH)/config.pm
+
+# {{{ all these define the places that RT's binaries should get installed
 
 # RT_MODPERL_HANDLER is the mason handler script for mod_perl
 RT_MODPERL_HANDLER	=	$(RT_BIN_PATH)/webmux.pl
-
 # RT_FASTCGI_HANDLER is the mason handler script for FastCGI
-# THIS HANDLER IS NOT CURRENTLY SUPPORTED
 RT_FASTCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.fcgi
+# RT_WIN32_FASTCGI_HANDLER is the mason handler script for FastCGI
+RT_WIN32_FASTCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.svc
+# RT's admin CLI
+RT_CLI_ADMIN_BIN	=	$(RT_BIN_PATH)/rtadmin
+# RT's mail gateway
+RT_MAILGATE_BIN		=	$(RT_BIN_PATH)/rt-mailgate
+# RT's cron tool
+RT_CRON_BIN		=	$(RT_BIN_PATH)/rt-crontool
 
-# RT_SPEEDYCGI_HANDLER is the mason handler script for SpeedyCGI
-# THIS HANDLER IS NOT CURRENTLY SUPPORTED
-RT_SPEEDYCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.scgi
+# }}}
 
-# The following are the names of the various binaries which make up RT 
+SETGID_BINARIES	 	= 	$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
+				$(DESTDIR)/$(RT_WIN32_FASTCGI_HANDLER)
+
+BINARIES		=	$(DESTDIR)/$(RT_MODPERL_HANDLER) \
+				$(DESTDIR)/$(RT_MAILGATE_BIN) \
+				$(DESTDIR)/$(RT_CRON_BIN) \
+				$(SETGID_BINARIES)
+SYSTEM_BINARIES		=	$(DESTDIR)/$(RT_SBIN_PATH)/
 
-RT_CLI_BIN		=	$(RT_BIN_PATH)/rt
-RT_CLI_ADMIN_BIN	=	$(RT_BIN_PATH)/rtadmin
-RT_MAILGATE_BIN		=	$(RT_BIN_PATH)/rt-mailgate
 
 # }}}
 
@@ -99,34 +128,19 @@ RT_MAILGATE_BIN		=	$(RT_BIN_PATH)/rt-mailgate
 # DB_TYPE defines what sort of database RT trys to talk to
 # "mysql" is known to work.
 # "Pg" is known to work
-# "Oracle" is in the early stages of working.
 
 DB_TYPE			=	mysql
 
-# DB_HOME is where the Database's commandline tools live.  $DB_HOME/bin
-# should contain the binaries themselves, e.g. if "which mysql" gives
-# "/usr/local/mysql/bin/mysql", $DB_HOME should be "/usr/local/mysql"
-
-DB_HOME			= /usr
-
 # Set DBA to the name of a unix account with the proper permissions and 
-# environment to run your commandline SQL tools
+# environment to run your commandline SQL sbin
 
 # Set DB_DBA to the name of a DB user with permission to create new databases 
-# Set DB_DBA_PASSWORD to that user's password (if you don't, you'll be prompted
-# later)
 
 # For mysql, you probably want 'root'
 # For Pg, you probably want 'postgres' 
 # For oracle, you want 'system'
 
 DB_DBA			=	root
-DB_DBA_PASSWORD		=	
- 
-#
-# Set this to the Fully Qualified Domain Name of your database server.
-# If the database is local, rather than on a remote host, using "localhost" 
-# will greatly enhance performance.
 
 DB_HOST			=	localhost
 
@@ -136,6 +150,9 @@ DB_HOST			=	localhost
 
 DB_PORT			=	
 
+
+
+
 #
 # Set this to the canonical name of the interface RT will be talking to the 
 # database on.  If you said that the RT_DB_HOST above was "localhost," this 
@@ -149,81 +166,72 @@ DB_RT_HOST		=	localhost
 # set this to the name you want to give to the RT database in 
 # your database server. For Oracle, this should be the name of your sid
 
-DB_DATABASE		=	rt2
-
-# Set this to the name of the rt database user
-
+DB_DATABASE		=	rt3
 DB_RT_USER		=	rt_user
-
-# Set this to the password used by the rt database user
-# *** Change This Before Installation***
-
 DB_RT_PASS		=	rt_pass
 
 # }}}
 
-# {{{ Web configuration 
-
-# The user your webserver runs as. needed so that webrt can cache mason
-# objectcode
 
-WEB_USER		=	www
-WEB_GROUP		=	rt
-
-# }}}
-
-
-####################################################################
-# No user servicable parts below this line.  Frob at your own risk #
 ####################################################################
 
+all: default
+
 default:
 	@echo "Please read RT's readme before installing. Not doing so could"
 	@echo "be dangerous."
 
-install: dirs initialize.$(DB_TYPE) upgrade insert instruct
+
 
 instruct:
 	@echo "Congratulations. RT has been installed. "
-	@echo "You must now configure it by editing $(RT_CONFIG)."
-	@echo "From here on in, you should refer to the users guide."
+	@echo ""
+	@echo ""
+	@echo "You must now configure RT by editing $(SITE_CONFIG_FILE)."
+	@echo ""
+	@echo "(You will definitely need to set RT's database password before continuing."
+	@echo " Not doing so could be very dangerous)"
+	@echo ""
+	@echo "After that, you need to initialize RT's database by running" 
+	@echo " 'make initialize-database'"
 
+#	@echo " or by executing "       
+#	@echo " '$(RT_SBIN_PATH)/rt-setup-database --action init \ "
+#	@echo "     --dba $(DB_DBA) --prompt-for-dba-password'"
 
-insert: insert-install
-	$(PERL) -I$(DESTDIR)/$(RT_ETC_PATH) -I$(DESTDIR)/$(RT_LIB_PATH) $(DESTDIR)/$(RT_ETC_PATH)/insertdata
 
-upgrade: dirs config-replace upgrade-noclobber  upgrade-instruct
 
 upgrade-instruct: 
 	@echo "Congratulations. RT has been upgraded. You should now check-over"
-	@echo "$(RT_CONFIG) for any necessary site customization. Additionally,"
+	@echo "$(CONFIG_FILE) for any necessary site customization. Additionally,"
 	@echo "you should update RT's system database objects by running "
-	@echo "	   $(RT_ETC_PATH)/insertdata <version>"
-	@echo "where <version> is the version of RT you're upgrading from."
+	@echo "   ls etc/upgrade"
+	@echo "For each file in that directory whose name is greater than"
+	@echo "your previously installed RT version, run:"
+	@echo "	   $(RT_SBIN_PATH)/rt-setup-database --action insert --datafile etc/upgrade/<version>"
 
-upgrade-noclobber: insert-install libs-install html-install bin-install nondestruct
 
-nondestruct: fixperms
+upgrade: dirs upgrade-noclobber upgrade-instruct
 
-testdeps:
-	$(PERL) ./tools/testdeps -warn $(DB_TYPE)
+upgrade-noclobber: config-install libs-install html-install bin-install local-install doc-install fixperms
 
-fixdeps:
-	$(PERL) ./tools/testdeps -fix $(DB_TYPE)
 
+# {{{ dependencies
+testdeps:
+	$(PERL) ./sbin/rt-test-dependencies --with-$(DB_TYPE)
 
+fixdeps:
+	$(PERL) ./sbin/rt-test-dependencies --install --with-$(DB_TYPE)
 
-all:
-	@echo "Read the readme."
+#}}}
 
+# {{{ fixperms
 fixperms:
 	# Make the libraries readable
-	chmod -R $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_PATH)
+	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_PATH)
 	chown -R $(LIBS_OWNER) $(DESTDIR)/$(RT_LIB_PATH)
 	chgrp -R $(LIBS_GROUP) $(DESTDIR)/$(RT_LIB_PATH)
-
-	chown -R $(BIN_OWNER) $(DESTDIR)/$(RT_BIN_PATH)
-	chgrp -R $(RTGROUP) $(DESTDIR)/$(RT_BIN_PATH)
+	chmod -R  u+rwX,go-w,go+rX 	$(DESTDIR)/$(RT_LIB_PATH)
 
 
 	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_BIN_PATH)
@@ -237,36 +245,19 @@ fixperms:
 	chown -R $(BIN_OWNER) $(DESTDIR)/$(RT_ETC_PATH)
 	chgrp -R $(RTGROUP) $(DESTDIR)/$(RT_ETC_PATH)
 
-	chmod 0550 $(DESTDIR)/$(RT_CONFIG)
+	chmod 0550 $(DESTDIR)/$(CONFIG_FILE)
+	chmod 0550 $(DESTDIR)/$(SITE_CONFIG_FILE)
 
 	# Make the interfaces executable and setgid rt
-	chown $(BIN_OWNER) $(DESTDIR)/$(RT_MAILGATE_BIN) \
-			$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
-			$(DESTDIR)/$(RT_SPEEDYCGI_HANDLER) \
-			$(DESTDIR)/$(RT_CLI_BIN) \
-			$(DESTDIR)/$(RT_CLI_ADMIN_BIN)
-
-	chgrp $(RTGROUP) $(DESTDIR)/$(RT_MAILGATE_BIN) \
-			$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
-			$(DESTDIR)/$(RT_SPEEDYCGI_HANDLER) \
-			$(DESTDIR)/$(RT_CLI_BIN) \
-			$(DESTDIR)/$(RT_CLI_ADMIN_BIN)
-
-	chmod 0755  	$(DESTDIR)/$(RT_MAILGATE_BIN) \
-			$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
-			$(DESTDIR)/$(RT_SPEEDYCGI_HANDLER) \
-			$(DESTDIR)/$(RT_CLI_BIN) \
-			$(DESTDIR)/$(RT_CLI_ADMIN_BIN)
-
-	chmod g+s 	$(DESTDIR)/$(RT_MAILGATE_BIN) \
-			$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
-			$(DESTDIR)/$(RT_SPEEDYCGI_HANDLER) \
-			$(DESTDIR)/$(RT_CLI_BIN) \
-			$(DESTDIR)/$(RT_CLI_ADMIN_BIN)
+	chown $(BIN_OWNER) $(BINARIES)
+	chgrp $(RTGROUP) $(BINARIES)
+	chmod 0755  $(BINARIES)
+	chmod g+s $(SETGID_BINARIES)
 
 	# Make the web ui readable by all. 
 	chmod -R  u+rwX,go-w,go+rX 	$(DESTDIR)/$(MASON_HTML_PATH) \
-					$(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
+					$(DESTDIR)/$(MASON_LOCAL_HTML_PATH) \
+					$(DESTDIR)/$(LOCAL_LEXICON_PATH)
 	chown -R $(LIBS_OWNER) 	$(DESTDIR)/$(MASON_HTML_PATH) \
 				$(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
 	chgrp -R $(LIBS_GROUP) 	$(DESTDIR)/$(MASON_HTML_PATH) \
@@ -279,140 +270,216 @@ fixperms:
 				$(DESTDIR)/$(MASON_SESSION_PATH)
 	chgrp -R $(WEB_GROUP) 	$(DESTDIR)/$(MASON_DATA_PATH) \
 				$(DESTDIR)/$(MASON_SESSION_PATH)
+# }}}
+
+fixperms-nosetgid: fixperms
+	@echo "You should never be running RT this way. it's unsafe"
+	chmod 0555 $(SETGID_BINARIES)
+	chmod 0555 $(DESTDIR)/$(CONFIG_FILE)
+	chmod 0555 $(DESTDIR)/$(SITE_CONFIG_FILE)
+
+# {{{ dirs
 dirs:
-	mkdir -p $(DESTDIR)/$(RT_BIN_PATH)
+	mkdir -p $(DESTDIR)/$(RT_LOG_PATH)
 	mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)
+	mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)/cache
+	mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)/etc
+	mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)/obj
 	mkdir -p $(DESTDIR)/$(MASON_SESSION_PATH)
-	mkdir -p $(DESTDIR)/$(RT_ETC_PATH)
-	mkdir -p $(DESTDIR)/$(RT_LIB_PATH)
 	mkdir -p $(DESTDIR)/$(MASON_HTML_PATH)
 	mkdir -p $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
+	mkdir -p $(DESTDIR)/$(LOCAL_ETC_PATH)
+	mkdir -p $(DESTDIR)/$(LOCAL_LEXICON_PATH)
+# }}}
 
-libs-install: 
-	[ -d $(DESTDIR)/$(RT_LIB_PATH) ] || mkdir $(DESTDIR)/$(RT_LIB_PATH)
-	chown -R $(LIBS_OWNER) $(DESTDIR)/$(RT_LIB_PATH)
-	chgrp -R $(LIBS_GROUP) $(DESTDIR)/$(RT_LIB_PATH)
-	chmod -R $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_LIB_PATH)
-	( cd ./lib; \
-	  $(PERL) Makefile.PL INSTALLSITELIB=$(DESTDIR)/$(RT_LIB_PATH) \
-			      INSTALLMAN1DIR=$(DESTDIR)/$(RT_MAN_PATH)/man1 \
-			      INSTALLMAN3DIR=$(DESTDIR)/$(RT_MAN_PATH)/man3 \
-	    && make \
-	    && make test \
-	    && $(PERL) -p -i -e " s'!!RT_VERSION!!'$(RT_VERSION)'g;" blib/lib/RT.pm ;\
-	    make install \
-			   INSTALLSITEMAN1DIR=$(DESTDIR)/$(RT_MAN_PATH)/man1 \
-			   INSTALLSITEMAN3DIR=$(DESTDIR)/$(RT_MAN_PATH)/man3 \
-	)
+install: config-install dirs files-install fixperms instruct
 
-html-install:
-	cp -rp ./webrt/* $(DESTDIR)/$(MASON_HTML_PATH)
+files-install: libs-install etc-install bin-install sbin-install html-install local-install doc-install
+
+config-install:
+	mkdir -p $(DESTDIR)/$(CONFIG_FILE_PATH)	
+	cp etc/RT_Config.pm $(DESTDIR)/$(CONFIG_FILE)
+	[ -f $(DESTDIR)/$(SITE_CONFIG_FILE) ] || cp etc/RT_SiteConfig.pm $(DESTDIR)/$(SITE_CONFIG_FILE) 
+
+	chgrp $(RTGROUP) $(DESTDIR)/$(CONFIG_FILE)
+	chown $(BIN_OWNER) $(DESTDIR)/$(CONFIG_FILE)
 
+	chgrp $(RTGROUP) $(DESTDIR)/$(SITE_CONFIG_FILE)
+	chown $(BIN_OWNER) $(DESTDIR)/$(SITE_CONFIG_FILE)
 
+	@echo "Installed configuration. about to install rt in  $(RT_PATH)"
 
-genschema:
-	$(PERL)	tools/initdb '$(DB_TYPE)' '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_DBA)' '$(DB_DATABASE)' generate
+test: 
+	$(PERL) -Ilib lib/t/00smoke.t
 
+regression-nosetgid-quiet: config-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms-nosetgid apachectl
+	$(PERL) sbin/regression_harness
 
-initialize.Pg: createdb initdb.dba acls 
+regression-nosetgid: config-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms-nosetgid apachectl
+	$(PERL) lib/t/02regression.t
 
-initialize.mysql: createdb acls initdb.rtuser
+regression: config-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods apachectl
+	$(PERL) lib/t/02regression.t
 
-initialize.Oracle: acls initdb.rtuser
+regression-quiet:
+	$(PERL) sbin/regression_harness
 
-acls:
-	cp etc/acl.$(DB_TYPE) '$(DESTDIR)/$(RT_ETC_PATH)/acl.$(DB_TYPE)'
-	$(PERL) -p -i -e " s'!!DB_TYPE!!'"$(DB_TYPE)"'g;\
-				s'!!DB_HOST!!'"$(DB_HOST)"'g;\
-				s'!!DB_RT_PASS!!'"$(DB_RT_PASS)"'g;\
-				s'!!DB_RT_HOST!!'"$(DB_RT_HOST)"'g;\
-				s'!!DB_RT_USER!!'"$(DB_RT_USER)"'g;\
-				s'!!DB_DATABASE!!'"$(DB_DATABASE)"'g;" $(DESTDIR)/$(RT_ETC_PATH)/acl.$(DB_TYPE)
-	bin/initacls.$(DB_TYPE) '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_DBA)' '$(DB_DBA_PASSWORD)' '$(DB_DATABASE)' '$(DESTDIR)/$(RT_ETC_PATH)/acl.$(DB_TYPE)' 
+regression-instruct:
+	@echo "About to wipe your database for a regression test. ABORT NOW with Control-C"
 
 
+# {{{ database-installation
+
+regression-reset-db:
+	$(PERL)	$(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action drop --dba $(DB_DBA) --dba-password ''
+	$(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action init --dba $(DB_DBA) --dba-password ''
+
+initialize-database: 
+	$(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action init --dba $(DB_DBA) --prompt-for-dba-password
 
 dropdb: 
-	$(PERL)	tools/initdb '$(DB_TYPE)' '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_DBA)' '$(DB_DATABASE)' drop
+	$(PERL)	$(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action drop --dba $(DB_DBA) --prompt-for-dba-password
+
+insert-approval-data: 
+	$(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/insert_approval_scrips
+# }}}
+
+# {{{ libs-install
+libs-install: 
+	[ -d $(DESTDIR)/$(RT_LIB_PATH) ] || mkdir $(DESTDIR)/$(RT_LIB_PATH)
+	-cp -rp lib/* $(DESTDIR)/$(RT_LIB_PATH)
+# }}}
+
+# {{{ html-install
+html-install:
+	[ -d $(DESTDIR)/$(MASON_HTML_PATH) ] || mkdir $(DESTDIR)/$(MASON_HTML_PATH)
+	-cp -rp ./html/* $(DESTDIR)/$(MASON_HTML_PATH)
+# }}}
+
+# {{{ doc-install
+doc-install:
+	# RT 3.0.0 - RT 3.0.2 would accidentally create a file instead of a dir
+	-[ -f $(DESTDIR)/$(RT_DOC_PATH) ] && rm $(DESTDIR)/$(RT_DOC_PATH) 
+	[ -d $(DESTDIR)/$(RT_DOC_PATH) ] || mkdir $(DESTDIR)/$(RT_DOC_PATH)
+	-cp -rp ./README $(DESTDIR)/$(RT_DOC_PATH)
+# }}}
 
+# {{{ etc-install
 
-createdb: 
-	$(PERL)	tools/initdb '$(DB_TYPE)' '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_DBA)' '$(DB_DATABASE)' create
-initdb.dba:
-	$(PERL)	tools/initdb '$(DB_TYPE)' '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_DBA)' '$(DB_DATABASE)' insert
+etc-install:
+	mkdir -p $(DESTDIR)/$(RT_ETC_PATH)
+	-cp -rp \
+		etc/acl.* \
+		etc/initialdata \
+		etc/schema.* \
+		$(DESTDIR)/$(RT_ETC_PATH)
+# }}}
 
-initdb.rtuser:
-	$(PERL)	tools/initdb '$(DB_TYPE)' '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_RT_USER)' '$(DB_DATABASE)' insert
+# {{{ sbin-install
 
+sbin-install:
+	mkdir -p $(DESTDIR)/$(RT_SBIN_PATH)
+	chmod +x sbin/rt-setup-database \
+		sbin/rt-test-dependencies
+	-cp -rp \
+		sbin/rt-setup-database \
+		sbin/rt-test-dependencies \
+		$(DESTDIR)/$(RT_SBIN_PATH)
 
+# }}}
 
-insert-install:
-	cp -rp ./tools/insertdata \
-		 $(DESTDIR)/$(RT_ETC_PATH)
-	$(PERL) -p -i -e " s'!!RT_ETC_PATH!!'$(RT_ETC_PATH)'g;\
-		           s'!!RT_LIB_PATH!!'$(RT_LIB_PATH)'g;"\
-		$(DESTDIR)/$(RT_ETC_PATH)/insertdata
+# {{{ bin-install
 
 bin-install:
-	cp -p ./bin/webmux.pl $(DESTDIR)/$(RT_MODPERL_HANDLER)
-	cp -p ./bin/rt-mailgate $(DESTDIR)/$(RT_MAILGATE_BIN)
-	cp -p ./bin/rtadmin $(DESTDIR)/$(RT_CLI_ADMIN_BIN)
-	cp -p ./bin/rt $(DESTDIR)/$(RT_CLI_BIN)
-	cp -p ./bin/mason_handler.fcgi $(DESTDIR)/$(RT_FASTCGI_HANDLER)
-	cp -p ./bin/mason_handler.scgi $(DESTDIR)/$(RT_SPEEDYCGI_HANDLER)
-
-	$(PERL) -p -i -e "s'!!RT_PATH!!'"$(RT_PATH)"'g;\
-				s'!!PERL!!'"$(PERL)"'g;\
-			      	s'!!RT_VERSION!!'"$(RT_VERSION)"'g;\
-				s'!!RT_ETC_PATH!!'"$(RT_CONFIG_PATH)"'g;\
-				s'!!RT_LIB_PATH!!'"$(RT_LIB_PATH)"'g;"\
-		$(DESTDIR)/$(RT_MODPERL_HANDLER) \
-		$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
-		$(DESTDIR)/$(RT_SPEEDYCGI_HANDLER) \
-		$(DESTDIR)/$(RT_CLI_BIN) \
-		$(DESTDIR)/$(RT_CLI_ADMIN_BIN) \
-		$(DESTDIR)/$(RT_MAILGATE_BIN)
-
-
-config-replace:
-	-[ -f $(DESTDIR)/$(RT_CONFIG) ] && \
-		mv $(DESTDIR)/$(RT_CONFIG) $(DESTDIR)/$(RT_CONFIG).old && \
-	 	chmod 000 $(DESTDIR)/$(RT_CONFIG).old
-	cp -rp ./etc/config.pm $(DESTDIR)/$(RT_CONFIG)
-	$(PERL) -p -i -e "\
-	s'!!DB_TYPE!!'"$(DB_TYPE)"'g;\
-	s'!!DB_HOST!!'"$(DB_HOST)"'g;\
-	s'!!DB_PORT!!'"$(DB_PORT)"'g;\
-	s'!!DB_RT_PASS!!'"$(DB_RT_PASS)"'g;\
-	s'!!DB_RT_USER!!'"$(DB_RT_USER)"'g;\
-	s'!!DB_DATABASE!!'"$(DB_DATABASE)"'g;\
-	s'!!MASON_HTML_PATH!!'"$(MASON_HTML_PATH)"'g;\
-	s'!!MASON_LOCAL_HTML_PATH!!'"$(MASON_LOCAL_HTML_PATH)"'g;\
-	s'!!MASON_SESSION_PATH!!'"$(MASON_SESSION_PATH)"'g;\
-	s'!!MASON_DATA_PATH!!'"$(MASON_DATA_PATH)"'g;\
-	s'!!RT_LOG_PATH!!'"$(RT_LOG_PATH)"'g;\
-	s'!!RT_VERSION!!'"$(RT_VERSION)"'g;\
-	" $(DESTDIR)/$(RT_CONFIG)
+	mkdir -p $(DESTDIR)/$(RT_BIN_PATH)
+	chmod +x bin/rt-mailgate \
+		bin/rt-crontool
+	-cp -rp \
+		bin/rt-mailgate \
+		bin/mason_handler.fcgi \
+		bin/mason_handler.svc \
+		bin/webmux.pl \
+		bin/rt-crontool \
+		$(DESTDIR)/$(RT_BIN_PATH)
+# }}}
+
+# {{{ local-install
+local-install:
+	-cp -rp ./local/html/* $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
+	-cp -rp ./local/po/* $(DESTDIR)/$(LOCAL_LEXICON_PATH)
+	-cp -rp ./local/etc/* $(DESTDIR)/$(LOCAL_ETC_PATH)
+# }}}
+
+# {{{ Best Practical Build targets -- no user servicable parts inside
+
+
+POD2TEST_EXE = sbin/extract_pod_tests
+
+testify-pods:
+	[ -d lib/t/autogen ] || mkdir lib/t/autogen
+	find lib -name \*pm |grep -v \*.in |xargs -n 1 $(PERL) $(POD2TEST_EXE)
+	find bin -type f |grep -v \~ | grep -v "\.in" | xargs -n 1 $(PERL) $(POD2TEST_EXE)
+
 
 
+regenerate-catalogs:
+	$(PERL) sbin/extract-message-catalog
+
+license-tag:
+	$(PERL) sbin/license_tag
+
+factory: initialize-database
+	cd lib; $(PERL) ../sbin/factory  $(DB_DATABASE) RT
+
 commit:
-	cvs commit
+	aegis -build ; aegis -diff ; aegis -test; aegis -develop_end
+
+integrate:
+	aegis -integrate_begin;	aegis -build; aegis -diff; aegis -test ; aegis -integrate_pass
+
+predist: commit tag-and-tar
+
+tag-and-release-baseline:
+	aegis -cp -ind Makefile -output /tmp/Makefile.tagandrelease; \
+	$(MAKE) -f /tmp/Makefile.tagandrelease tag-and-release-never-by-hand
 
-predist: commit
-	cvs tag -r $(BRANCH) -F $(TAG)
+
+# Running this target in a working directory is 
+# WRONG WRONG WRONG.
+# it will tag the current baseline with the version of RT defined 
+# in the currently-being-worked-on makefile. which is wrong.
+#  you want tag-and-release-baseline
+
+tag-and-release-never-by-hand:
+	aegis --delta-name $(TAG)
 	rm -rf /tmp/$(TAG)
-	cvs co -d /tmp/$(TAG) -r $(TAG) rt
-	cd /tmp/$(TAG); chmod 600 Makefile; /usr/local/bin/cvs2cl.pl \
-		--no-wrap --separate-header \
-		--window 120
+	mkdir /tmp/$(TAG)
+	cd /tmp/$(TAG); \
+		aegis -cp -ind -delta $(TAG) . ;\
+		make reconfigure;\
+		chmod 600 Makefile;\
+		aegis --report --project rt.$(RT_VERSION_MAJOR) \
+		      --page_width 80 \
+		      --page_length 9999 \
+		      --change $(RT_VERSION_MINOR) --output Changelog Change_Log
+
 	cd /tmp; tar czvf /home/ftp/pub/rt/devel/$(TAG).tar.gz $(TAG)/
 	chmod 644 /home/ftp/pub/rt/devel/$(TAG).tar.gz
 
-dist: commit predist
-	rm -rf /home/ftp/pub/rt/devel/rt.tar.gz
-	ln -s ./$(TAG).tar.gz /home/ftp/pub/rt/devel/rt.tar.gz
 
+reconfigure:
+	aclocal -I m4
+	autoconf
+	chmod 755 ./configure
+	./configure
 
 rpm:
 	(cd ..; tar czvf /usr/src/redhat/SOURCES/rt.tar.gz rt)
 	rpm -ba etc/rt.spec
+
+
+apachectl:
+	apachectl stop
+	sleep 3
+	apachectl start
+# }}}
diff --git a/rt/Makefile.in b/rt/Makefile.in
new file mode 100644
index 000000000..245ec5ed3
--- /dev/null
+++ b/rt/Makefile.in
@@ -0,0 +1,485 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2002 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org
+# 
+# This work 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.
+# 
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+
+#
+# DO NOT HAND-EDIT the file named 'Makefile'. This file is autogenerated.
+# Have a look at "configure" and "Makefile.in" instead
+#
+
+
+PERL			= 	@PERL@
+
+CONFIG_FILE_PATH	=	@CONFIG_FILE_PATH@
+CONFIG_FILE		= 	$(CONFIG_FILE_PATH)/RT_Config.pm
+SITE_CONFIG_FILE		= 	$(CONFIG_FILE_PATH)/RT_SiteConfig.pm
+
+
+RT_VERSION_MAJOR	=	@RT_VERSION_MAJOR@
+RT_VERSION_MINOR	=	@RT_VERSION_MINOR@
+RT_VERSION_PATCH	=	@RT_VERSION_PATCH@
+
+RT_VERSION =	$(RT_VERSION_MAJOR).$(RT_VERSION_MINOR).$(RT_VERSION_PATCH)
+TAG 	   =	rt-$(RT_VERSION_MAJOR)-$(RT_VERSION_MINOR)-$(RT_VERSION_PATCH)
+
+
+# This is the group that all of the installed files will be chgrp'ed to.
+RTGROUP			=	@RTGROUP@
+
+
+# User which should own rt binaries.
+BIN_OWNER		=	@BIN_OWNER@
+
+# User that should own all of RT's libraries, generally root.
+LIBS_OWNER 		=	@LIBS_OWNER@
+
+# Group that should own all of RT's libraries, generally root.
+LIBS_GROUP		=	@LIBS_GROUP@
+
+WEB_USER		=	@WEB_USER@
+WEB_GROUP		=	@WEB_GROUP@
+
+# {{{ Files and directories 
+
+# DESTDIR allows you to specify that RT be installed somewhere other than
+# where it will eventually reside
+
+DESTDIR			=	
+
+
+RT_PATH			=	@RT_PATH@
+RT_ETC_PATH		=	@RT_ETC_PATH@
+RT_BIN_PATH		=	@RT_BIN_PATH@
+RT_SBIN_PATH		=	@RT_SBIN_PATH@
+RT_LIB_PATH		=	@RT_LIB_PATH@
+RT_MAN_PATH		=	@RT_MAN_PATH@
+RT_VAR_PATH		=	@RT_VAR_PATH@
+RT_DOC_PATH		=	@RT_DOC_PATH@
+RT_LOCAL_PATH		=	@RT_LOCAL_PATH@
+LOCAL_ETC_PATH		=	@LOCAL_ETC_PATH@
+LOCAL_LEXICON_PATH	=	@LOCAL_LEXICON_PATH@
+MASON_HTML_PATH		=	@MASON_HTML_PATH@
+MASON_LOCAL_HTML_PATH	=	@MASON_LOCAL_HTML_PATH@
+MASON_DATA_PATH		=	@MASON_DATA_PATH@
+MASON_SESSION_PATH	=	@MASON_SESSION_PATH@
+RT_LOG_PATH	    =       @RT_LOG_PATH@
+
+# RT_READABLE_DIR_MODE is the mode of directories that are generally meant
+# to be accessable
+RT_READABLE_DIR_MODE	=	0755
+
+
+
+
+# {{{ all these define the places that RT's binaries should get installed
+
+# RT_MODPERL_HANDLER is the mason handler script for mod_perl
+RT_MODPERL_HANDLER	=	$(RT_BIN_PATH)/webmux.pl
+# RT_FASTCGI_HANDLER is the mason handler script for FastCGI
+RT_FASTCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.fcgi
+# RT_WIN32_FASTCGI_HANDLER is the mason handler script for FastCGI
+RT_WIN32_FASTCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.svc
+# RT's admin CLI
+RT_CLI_ADMIN_BIN	=	$(RT_BIN_PATH)/rtadmin
+# RT's mail gateway
+RT_MAILGATE_BIN		=	$(RT_BIN_PATH)/rt-mailgate
+# RT's cron tool
+RT_CRON_BIN		=	$(RT_BIN_PATH)/rt-crontool
+
+# }}}
+
+SETGID_BINARIES	 	= 	$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
+				$(DESTDIR)/$(RT_WIN32_FASTCGI_HANDLER)
+
+BINARIES		=	$(DESTDIR)/$(RT_MODPERL_HANDLER) \
+				$(DESTDIR)/$(RT_MAILGATE_BIN) \
+				$(DESTDIR)/$(RT_CRON_BIN) \
+				$(SETGID_BINARIES)
+SYSTEM_BINARIES		=	$(DESTDIR)/$(RT_SBIN_PATH)/
+
+
+# }}}
+
+# {{{ Database setup
+
+#
+# DB_TYPE defines what sort of database RT trys to talk to
+# "mysql" is known to work.
+# "Pg" is known to work
+
+DB_TYPE			=	@DB_TYPE@
+
+# Set DBA to the name of a unix account with the proper permissions and 
+# environment to run your commandline SQL sbin
+
+# Set DB_DBA to the name of a DB user with permission to create new databases 
+
+# For mysql, you probably want 'root'
+# For Pg, you probably want 'postgres' 
+# For oracle, you want 'system'
+
+DB_DBA			=	@DB_DBA@
+
+DB_HOST			=	@DB_HOST@
+
+# If you're not running your database server on its default port, 
+# specifiy the port the database server is running on below.
+# It's generally safe to leave this blank 
+
+DB_PORT			=	@DB_PORT@
+
+
+
+
+#
+# Set this to the canonical name of the interface RT will be talking to the 
+# database on.  If you said that the RT_DB_HOST above was "localhost," this 
+# should be too. This value will be used to grant rt access to the database.
+# If you want to access the RT database from multiple hosts, you'll need
+# to grant those database rights by hand.
+#
+
+DB_RT_HOST		=	@DB_RT_HOST@
+
+# set this to the name you want to give to the RT database in 
+# your database server. For Oracle, this should be the name of your sid
+
+DB_DATABASE		=	@DB_DATABASE@
+DB_RT_USER		=	@DB_RT_USER@
+DB_RT_PASS		=	@DB_RT_PASS@
+
+# }}}
+
+
+####################################################################
+
+all: default
+
+default:
+	@echo "Please read RT's readme before installing. Not doing so could"
+	@echo "be dangerous."
+
+
+
+instruct:
+	@echo "Congratulations. RT has been installed. "
+	@echo ""
+	@echo ""
+	@echo "You must now configure RT by editing $(SITE_CONFIG_FILE)."
+	@echo ""
+	@echo "(You will definitely need to set RT's database password before continuing."
+	@echo " Not doing so could be very dangerous)"
+	@echo ""
+	@echo "After that, you need to initialize RT's database by running" 
+	@echo " 'make initialize-database'"
+
+#	@echo " or by executing "       
+#	@echo " '$(RT_SBIN_PATH)/rt-setup-database --action init \ "
+#	@echo "     --dba $(DB_DBA) --prompt-for-dba-password'"
+
+
+
+upgrade-instruct: 
+	@echo "Congratulations. RT has been upgraded. You should now check-over"
+	@echo "$(CONFIG_FILE) for any necessary site customization. Additionally,"
+	@echo "you should update RT's system database objects by running "
+	@echo "   ls etc/upgrade"
+	@echo "For each file in that directory whose name is greater than"
+	@echo "your previously installed RT version, run:"
+	@echo "	   $(RT_SBIN_PATH)/rt-setup-database --action insert --datafile etc/upgrade/<version>"
+
+
+upgrade: dirs upgrade-noclobber upgrade-instruct
+
+upgrade-noclobber: config-install libs-install html-install bin-install local-install doc-install fixperms
+
+
+# {{{ dependencies
+testdeps:
+	$(PERL) ./sbin/rt-test-dependencies --with-$(DB_TYPE)
+
+fixdeps:
+	$(PERL) ./sbin/rt-test-dependencies --install --with-$(DB_TYPE)
+
+#}}}
+
+# {{{ fixperms
+fixperms:
+	# Make the libraries readable
+	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_PATH)
+	chown -R $(LIBS_OWNER) $(DESTDIR)/$(RT_LIB_PATH)
+	chgrp -R $(LIBS_GROUP) $(DESTDIR)/$(RT_LIB_PATH)
+	chmod -R  u+rwX,go-w,go+rX 	$(DESTDIR)/$(RT_LIB_PATH)
+
+
+	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_BIN_PATH)
+	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_BIN_PATH)	
+
+	chmod 0755 $(DESTDIR)/$(RT_ETC_PATH)
+	chmod 0500 $(DESTDIR)/$(RT_ETC_PATH)/*
+
+	#TODO: the config file should probably be able to have its
+	# owner set seperately from the binaries.
+	chown -R $(BIN_OWNER) $(DESTDIR)/$(RT_ETC_PATH)
+	chgrp -R $(RTGROUP) $(DESTDIR)/$(RT_ETC_PATH)
+
+	chmod 0550 $(DESTDIR)/$(CONFIG_FILE)
+	chmod 0550 $(DESTDIR)/$(SITE_CONFIG_FILE)
+
+	# Make the interfaces executable and setgid rt
+	chown $(BIN_OWNER) $(BINARIES)
+	chgrp $(RTGROUP) $(BINARIES)
+	chmod 0755  $(BINARIES)
+	chmod g+s $(SETGID_BINARIES)
+
+	# Make the web ui readable by all. 
+	chmod -R  u+rwX,go-w,go+rX 	$(DESTDIR)/$(MASON_HTML_PATH) \
+					$(DESTDIR)/$(MASON_LOCAL_HTML_PATH) \
+					$(DESTDIR)/$(LOCAL_LEXICON_PATH)
+	chown -R $(LIBS_OWNER) 	$(DESTDIR)/$(MASON_HTML_PATH) \
+				$(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
+	chgrp -R $(LIBS_GROUP) 	$(DESTDIR)/$(MASON_HTML_PATH) \
+				$(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
+
+	# Make the web ui's data dir writable
+	chmod 0770  	$(DESTDIR)/$(MASON_DATA_PATH) \
+			$(DESTDIR)/$(MASON_SESSION_PATH)
+	chown -R $(WEB_USER) 	$(DESTDIR)/$(MASON_DATA_PATH) \
+				$(DESTDIR)/$(MASON_SESSION_PATH)
+	chgrp -R $(WEB_GROUP) 	$(DESTDIR)/$(MASON_DATA_PATH) \
+				$(DESTDIR)/$(MASON_SESSION_PATH)
+# }}}
+
+fixperms-nosetgid: fixperms
+	@echo "You should never be running RT this way. it's unsafe"
+	chmod 0555 $(SETGID_BINARIES)
+	chmod 0555 $(DESTDIR)/$(CONFIG_FILE)
+	chmod 0555 $(DESTDIR)/$(SITE_CONFIG_FILE)
+
+# {{{ dirs
+dirs:
+	mkdir -p $(DESTDIR)/$(RT_LOG_PATH)
+	mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)
+	mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)/cache
+	mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)/etc
+	mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)/obj
+	mkdir -p $(DESTDIR)/$(MASON_SESSION_PATH)
+	mkdir -p $(DESTDIR)/$(MASON_HTML_PATH)
+	mkdir -p $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
+	mkdir -p $(DESTDIR)/$(LOCAL_ETC_PATH)
+	mkdir -p $(DESTDIR)/$(LOCAL_LEXICON_PATH)
+# }}}
+
+install: config-install dirs files-install fixperms instruct
+
+files-install: libs-install etc-install bin-install sbin-install html-install local-install doc-install
+
+config-install:
+	mkdir -p $(DESTDIR)/$(CONFIG_FILE_PATH)	
+	cp etc/RT_Config.pm $(DESTDIR)/$(CONFIG_FILE)
+	[ -f $(DESTDIR)/$(SITE_CONFIG_FILE) ] || cp etc/RT_SiteConfig.pm $(DESTDIR)/$(SITE_CONFIG_FILE) 
+
+	chgrp $(RTGROUP) $(DESTDIR)/$(CONFIG_FILE)
+	chown $(BIN_OWNER) $(DESTDIR)/$(CONFIG_FILE)
+
+	chgrp $(RTGROUP) $(DESTDIR)/$(SITE_CONFIG_FILE)
+	chown $(BIN_OWNER) $(DESTDIR)/$(SITE_CONFIG_FILE)
+
+	@echo "Installed configuration. about to install rt in  $(RT_PATH)"
+
+test: 
+	$(PERL) -Ilib lib/t/00smoke.t
+
+regression-nosetgid-quiet: config-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms-nosetgid apachectl
+	$(PERL) sbin/regression_harness
+
+regression-nosetgid: config-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms-nosetgid apachectl
+	$(PERL) lib/t/02regression.t
+
+regression: config-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods apachectl
+	$(PERL) lib/t/02regression.t
+
+regression-quiet:
+	$(PERL) sbin/regression_harness
+
+regression-instruct:
+	@echo "About to wipe your database for a regression test. ABORT NOW with Control-C"
+
+
+# {{{ database-installation
+
+regression-reset-db:
+	$(PERL)	$(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action drop --dba $(DB_DBA) --dba-password ''
+	$(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action init --dba $(DB_DBA) --dba-password ''
+
+initialize-database: 
+	$(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action init --dba $(DB_DBA) --prompt-for-dba-password
+
+dropdb: 
+	$(PERL)	$(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action drop --dba $(DB_DBA) --prompt-for-dba-password
+
+insert-approval-data: 
+	$(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/insert_approval_scrips
+# }}}
+
+# {{{ libs-install
+libs-install: 
+	[ -d $(DESTDIR)/$(RT_LIB_PATH) ] || mkdir $(DESTDIR)/$(RT_LIB_PATH)
+	-cp -rp lib/* $(DESTDIR)/$(RT_LIB_PATH)
+# }}}
+
+# {{{ html-install
+html-install:
+	[ -d $(DESTDIR)/$(MASON_HTML_PATH) ] || mkdir $(DESTDIR)/$(MASON_HTML_PATH)
+	-cp -rp ./html/* $(DESTDIR)/$(MASON_HTML_PATH)
+# }}}
+
+# {{{ doc-install
+doc-install:
+	# RT 3.0.0 - RT 3.0.2 would accidentally create a file instead of a dir
+	-[ -f $(DESTDIR)/$(RT_DOC_PATH) ] && rm $(DESTDIR)/$(RT_DOC_PATH) 
+	[ -d $(DESTDIR)/$(RT_DOC_PATH) ] || mkdir $(DESTDIR)/$(RT_DOC_PATH)
+	-cp -rp ./README $(DESTDIR)/$(RT_DOC_PATH)
+# }}}
+
+# {{{ etc-install
+
+etc-install:
+	mkdir -p $(DESTDIR)/$(RT_ETC_PATH)
+	-cp -rp \
+		etc/acl.* \
+		etc/initialdata \
+		etc/schema.* \
+		$(DESTDIR)/$(RT_ETC_PATH)
+# }}}
+
+# {{{ sbin-install
+
+sbin-install:
+	mkdir -p $(DESTDIR)/$(RT_SBIN_PATH)
+	chmod +x sbin/rt-setup-database \
+		sbin/rt-test-dependencies
+	-cp -rp \
+		sbin/rt-setup-database \
+		sbin/rt-test-dependencies \
+		$(DESTDIR)/$(RT_SBIN_PATH)
+
+# }}}
+
+# {{{ bin-install
+
+bin-install:
+	mkdir -p $(DESTDIR)/$(RT_BIN_PATH)
+	chmod +x bin/rt-mailgate \
+		bin/rt-crontool
+	-cp -rp \
+		bin/rt-mailgate \
+		bin/mason_handler.fcgi \
+		bin/mason_handler.svc \
+		bin/webmux.pl \
+		bin/rt-crontool \
+		$(DESTDIR)/$(RT_BIN_PATH)
+# }}}
+
+# {{{ local-install
+local-install:
+	-cp -rp ./local/html/* $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
+	-cp -rp ./local/po/* $(DESTDIR)/$(LOCAL_LEXICON_PATH)
+	-cp -rp ./local/etc/* $(DESTDIR)/$(LOCAL_ETC_PATH)
+# }}}
+
+# {{{ Best Practical Build targets -- no user servicable parts inside
+
+
+POD2TEST_EXE = sbin/extract_pod_tests
+
+testify-pods:
+	[ -d lib/t/autogen ] || mkdir lib/t/autogen
+	find lib -name \*pm |grep -v \*.in |xargs -n 1 $(PERL) $(POD2TEST_EXE)
+	find bin -type f |grep -v \~ | grep -v "\.in" | xargs -n 1 $(PERL) $(POD2TEST_EXE)
+
+
+
+regenerate-catalogs:
+	$(PERL) sbin/extract-message-catalog
+
+license-tag:
+	$(PERL) sbin/license_tag
+
+factory: initialize-database
+	cd lib; $(PERL) ../sbin/factory  $(DB_DATABASE) RT
+
+commit:
+	aegis -build ; aegis -diff ; aegis -test; aegis -develop_end
+
+integrate:
+	aegis -integrate_begin;	aegis -build; aegis -diff; aegis -test ; aegis -integrate_pass
+
+predist: commit tag-and-tar
+
+tag-and-release-baseline:
+	aegis -cp -ind Makefile -output /tmp/Makefile.tagandrelease; \
+	$(MAKE) -f /tmp/Makefile.tagandrelease tag-and-release-never-by-hand
+
+
+# Running this target in a working directory is 
+# WRONG WRONG WRONG.
+# it will tag the current baseline with the version of RT defined 
+# in the currently-being-worked-on makefile. which is wrong.
+#  you want tag-and-release-baseline
+
+tag-and-release-never-by-hand:
+	aegis --delta-name $(TAG)
+	rm -rf /tmp/$(TAG)
+	mkdir /tmp/$(TAG)
+	cd /tmp/$(TAG); \
+		aegis -cp -ind -delta $(TAG) . ;\
+		make reconfigure;\
+		chmod 600 Makefile;\
+		aegis --report --project rt.$(RT_VERSION_MAJOR) \
+		      --page_width 80 \
+		      --page_length 9999 \
+		      --change $(RT_VERSION_MINOR) --output Changelog Change_Log
+
+	cd /tmp; tar czvf /home/ftp/pub/rt/devel/$(TAG).tar.gz $(TAG)/
+	chmod 644 /home/ftp/pub/rt/devel/$(TAG).tar.gz
+
+
+reconfigure:
+	aclocal -I m4
+	autoconf
+	chmod 755 ./configure
+	./configure
+
+rpm:
+	(cd ..; tar czvf /usr/src/redhat/SOURCES/rt.tar.gz rt)
+	rpm -ba etc/rt.spec
+
+
+apachectl:
+	apachectl stop
+	sleep 3
+	apachectl start
+# }}}
diff --git a/rt/README b/rt/README
index d16100c5f..7c5e4d47a 100755
--- a/rt/README
+++ b/rt/README
@@ -1,139 +1,167 @@
-$Header: /home/cvs/cvsroot/freeside/rt/README,v 1.1 2002-08-12 06:17:06 ivan Exp $
-RT is (c) 1996-2002 by Jesse Vincent <jesse@bestpractical.com>
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+RT is an enterprise-grade issue tracking system. It allows
+organizations to keep track of their to-do lists, who is working
+on which tasks, what's already been done, and when tasks were
+completed. It is available under the terms of version 2 of the GNU
+General Public License (GPL), so it doesn't cost anything to set
+up and use.
 
-RT is licensed to you under the terms of version 2 of the GNU General 
-Public License. 
 
-If you don't have a copy of the GPL, you've been living in a cave,
-but one should be included in this distribution.
-
-
-INSTALLATION INSTRUCTIONS
--------------------------
-
-These instructions are a summary of those at http://www.fsck.com/rtfm/
-The docs on the web at www.fsck.com/rtfm/ are likely to be more up to
-date and complete than this document. You should consult them before 
-proceeding.
+        Jesse Vincent
+        Best Practical Solutions, LLC
+        March 2003
 
 REQUIRED PACKAGES:
 ------------------
 
-o   Perl5.005_03 or later with support for setgid perl scripts
-        RT's command line and mail gateway tools run setgid to the 'rt' group
-	to protect RT's database password.  You may need to install a special 
-	"suidperl" package or reconfigure your perl setup to support
-	 "setuid scripts".
+o   Perl 5.8.0 or later (http://www.perl.com).
+
+ 	(If you intend to use the FastCGI or SpeedyCGI support, you 
+	 need to make sure that perl has been built with support for 
+	 setgid perl scripts.)`
+
+    Perl 5.6.1 is currently deprecated and will be officially desupported
+    in a future release
 
 o   A DB backend; MySQL is recommended ( http://www.mysql.com ) 
-        Currently supported:    Mysql 3.23.38 or newer. 
-				 (Some older releases had crippling SQL bugs)
-				Postgres 7.1 or newer.
+        Currently supported:  Mysql 4.0.13 or later. 
+                              Postgres 7.2 or later.
+
+                              Mysql 3.23.46 or newer with support for InnoDB 
+			      is currently deprecated and will be officially
+			      desupported in a future release.
+
+o   Apache version 1.3.x or 2.x (http://httpd.apache.org) 
+    with mod_perl -- (http://perl.apache.org ) 
+    or a webserver with FastCGI support (www.fastcgi.com)
+
+        mod_perl 2.0 isn't quite ready for prime_time just yet;
+        Best Practical Solutions strongly recommends that sites use 
+        Apache 1.3 or FastCGI.
+
+        Compiling mod_perl on Apache 1.3.x as a DSO has been known 
+         to have massive stability problems and is not recommended.
+
+        mod_perl 1.x must be build with EVERYTHING=1
+
+        RT's FastCGI handler runs setgid to the 'rt' group to
+        protect RT's database password.  You may need to install
+        a special  "suidperl" package or reconfigure your perl
+        setup to support "setuid scripts" if you intend to use RT
+        with FastCGI.
+
+        Debian GNU/* 3.0+: the package which installs suidperl is
+         called perl-suid, and should work without any tweaking.
+
+        FreeBSD 4.2+: the package is called sperl, and should
+         install a suidperl that just works 
+
+        Conectiva Linux 6.0+: suidperl is installed by default when 
+         perl is installed, but the program /bin/suidperl is not setuid. 
+         You must use chmod to make it setuid.
 
-o   Apache + mod_perl -- ( http://perl.apache.org) 
-    or A webserver with FastCGI support (www.fastcgi.com)
 
-	If you compile mod_perl as a DSO, you're on your own. It's known
-	to have massive stability problems. 
-        mod_perl must be build with EVERYTHING=1
 
 o    Various and sundry perl modules
-        RT takes care of the installation of most of these automatically
-        during the "make testdeps" and "make fixdeps" stages below
+	A tool included with RT takes care of the installation of
+	most of these automatically during the install process.
+
+	The tool supplied with RT uses Perl's CPAN system
+	(http://www.cpan.org) to install modules. Some operating
+	systems package all or some of the modules required and
+	you may be better off installing the modules that way.
 
 
 GENERAL INSTALLATION
 --------------------
 
+This is a rough guide to installing RT. For more detail, you'll want 
+to read 'Chapter 2: Installing' in RT's manual, available at
+http://www.bestpractical.com/rt 
+
 1   Unpack this distribution SOMWHERE OTHER THAN where you want to install RT
 
         Granted, you've already got it open. To do this cleanly:
 
-        	tar xzvf rt.tar.gz -C /tmp
+                tar xzvf rt.tar.gz -C /tmp
 
-2   Check over /tmp/rt/Makefile
+2   Run the "configure" script. 
 
-	There are many variables you NEED to customize for your site.
-	Even if you are just upgrading, you must set ALL variables.
+        ./configure --help to see the list of options
+        ./configure (with the flags you want)
 
-3   Satisfy RT's myriad dependencies.  There's a perl script in rt/tools
-    called testdeps that uses CPAN to automate all of this.
+3   Satisfy RT's myriad dependencies. 
 
 3.1   Check for compliance:
-	make testdeps
+        
+   perl sbin/rt-test-dependencies \ 
+                --with-<databasename> --with-<web-environment>
+
+        databasename is one of: mysql, postgres
+        web-environment is one of: fastcgi, modperl1, modperl2
 
-3.2   If there are unsatisfied dependencies, install them by hand or run
-	make fixdeps
-	
-       (You may need to install Apache::Session and Apache::DBI by hand.
+3.2   If there are unsatisfied dependencies, install them by hand or run:
 
-	You might need to install Msql-Mysql-Modules by hand.
-	perl -MCPAN -e'install DBD::mysql::Install' should do it for you.
-       )
+        perl sbin/rt-test-dependencies \
+                --with-<databasename> --with-<web-environment> --install
+        
 
 3.3   Check to make sure everything was installed properly:
-	make testdeps
+
+        perl sbin/rt-test-dependencies \
+                --with-<databasename> --with-<web-environment>
 
 4   Create a group called 'rt'
 
 5a  FOR A NEW INSTALLATION: 
         
         As root, type:
-		 make install	(replace "make" with the local name for 
-				 Make, if you need to)
+                 make install        (replace "make" with the local name for 
+                                 Make, if you need to)
 
-	If the make fails, type:
-		make dropdb 
-	and start over from step 5a
+                       
+                 make initialize-database 
 
-5b  FOR UPGRADING: (Within the RT 2.0.x series)
 
-	Make a backup of /path/to/rt/etc/config.pm
- 
-        As root, type: 
-		make upgrade     (replace "make" with the local name for 
-				  Make, if you need to)
+        If the make fails, type:
+                make dropdb 
+        and start over from step 5a
 
-	This will build new binaries, config files and libraries without
-	overwriting your RT database. 
+5b  FOR UPGRADING: (Within the RT 3.0.x series)
 
-        WARNING: This WILL clobber your existing configuration file!
-        
-        The install process will then instruct you to update your RT system 
-        database objects by running rt/etc/insertdata <version> where 
-        <version> is the version of RT you're upgrading from.
+        As root, type: 
+                make upgrade     (replace "make" with the local name for 
+                                  Make, if you need to)
 
+        This will build new binaries, config files and libraries without
+        overwriting your RT database. 
         
-	
-5c  FOR UPGRADING (From 1.0.x):
-
-	Follow the instructions for installing RT 2.0.
+        It may then instruct you to update your RT system database objects 
 
-	Once you have installed RT 2.0, download import-1.0-to-2.0
-	from http://www.fsck.com/pub/rt/contrib/2.0/rt-addons
-
-	Edit the configuration defaults in import-1.0-to-2.0
-
-	If you don't set $DEFAULTQUEUE to the name of one of your
-	RT 1.0 queues, THE IMPORT WILL FAIL.
-
-	perl ./import-1.0-to-2.0
-
-	The import tool will do its thing. If you're using postgres, you'll
-	need to execute the following SQL statement within your RT2 database:
-
-	select setval('tickets_id_seq', (select max(id) from tickets));
-	
-	It imports:
-		Queues, Areas, Users, Acls, Mailing Rules, Queue Members,
-		Tickets and Transactions.
-
-	It DOES NOT IMPORT:
-		Attachments removed by stripmime or Templates.
-	
-6   Edit etc/config.pm in your RT installation directory.  In many
-    cases sensible defaults have been included. In others, you MUST
-    supply a value.
+6   Edit etc/RT_SiteConfig.pm in your RT installation directory, by specifying
+    any values you need to change from the defaults in etc/RT_Config.pm
 
 7   Configure the email and web gateways, as described below. 
 
@@ -142,97 +170,81 @@ GENERAL INSTALLATION
     NOTE: root's password for the web interface is "password" 
     (without the quotes.)  Not changing this is a SECURITY risk
     
-9   Configure RT per the instructions at http://www.fsck.com/rtfm/
+9   Configure RT per the instructions in RT's manual.
 
-    Until you do this, RT will not be able to send or recieve email,
+    Until you do this, RT will not be able to send or receive email,
     nor will it be more than marginally functional.  This is not an
     optional step.
 
 
-SETTING UP THE MAIL GATEWAY 
----------------------------
+THE WEB INTERFACE
+-----------------
 
-An alias for the initial queue will need to be made in either your
-global mail aliases file (if you are using NIS) or locally on your
-machine.
- 
-Add the following lines to /etc/aliases (or your local equivalent) :
-
-rt:         "|/path/to/rt2/bin/rt-mailgate --queue general --action correspond"
-rt-comment: "|/path/to/rt2/bin/rt-mailgate --queue general --action comment"
-                                                   |                |
-                                   <queue-name>----/                |
-                                                                    |
-                      <correspond or comment depending on whether   |
-                      the mail should be resent to the requestor>---/
-
-
-
-THE WEB UI
-----------
-
-RT's web ui is based around HTML::Mason, which works well with the mod_perl
-perl interpreter within Apache httpd as well as with a webserver which
-supports FastCGI. (Instructions for configuring RT for use with FastCGI
-are available at http://www.fsck.com/rtfm/ )
+RT's web interface is based around HTML::Mason, which works best with the mod_perl
+perl interpreter within Apache httpd.  Alternatively, support for the FastCGI
+(and plain CGI) interface is also provided as 'bin/mason_handler.fcgi'.
 
 Apache 
-        RT Uses HTML::Mason.  You'll need to add a few lines to your
-        httpd.conf telling it to use rt's web ui.  If you have mod-perl
-	(you should, the perl scripts will go quite a bit faster around with
-	it), you can do something like this:
-
+        You'll need to add a few lines to your httpd.conf telling it about RT:
 
 <VirtualHost your.ip.address>
-DocumentRoot /path/to/rt2/WebRT/html
-ServerName your.rt.server.hostname
-PerlModule Apache::DBI
-PerlFreshRestart On
-PerlRequire /path/to/rt2/bin/webmux.pl
-<Location />
- SetHandler perl-script
- PerlHandler RT::Mason
-</Location>
+    ServerName your.rt.server.hostname
+    DocumentRoot /opt/rt3/share/html
+    AddDefaultCharset UTF-8
+
+    # this line applies to Apache2+mod_perl2 only
+    PerlModule Apache2 Apache::compat
+
+    PerlModule Apache::DBI
+    PerlRequire /opt/rt3/bin/webmux.pl
+
+    # this section applies to Apache 1 only
+    <Location />
+        SetHandler perl-script
+        PerlHandler RT::Mason
+    </Location>
+
+    # this section applies to Apache2+mod_perl2 only
+    <FilesMatch "\.html$">
+        SetHandler perl-script
+        PerlHandler RT::Mason
+    </FilesMatch>
+    <LocationMatch "/Attachment/">
+        SetHandler perl-script
+        PerlHandler RT::Mason
+    </LocationMatch>
+    <LocationMatch "/REST/">
+        SetHandler perl-script
+        PerlHandler RT::Mason
+    </LocationMatch>
 </VirtualHost>
 
-Additionally, you should set up a cron job to remove stale session data.
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- WARNING: Don't install this cron job or run this find command if your
- MASON_SESSION_PATH (known in config.pm as $MasonSessionDir) 
- points to a directory that could  EVER contain any file that's not 
- a Apache::Session datafile.
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-# Every hour, nuke session files and lockfiles that haven't been 
-# touched in 10 hours
-
-0 * * * * find /path/to/rt2/WebRT/sessiondata -type f -amin +600 -exec rm {} \;
 
 
-THE CLI
--------
-        Binaries for the CLI are located in rt/bin
-        You've got:
+SETTING UP THE MAIL GATEWAY 
+---------------------------
 
-                "rt" (manipulate or display requests) 
-                "rtadmin" (modify queues, users and acls)
+An alias for the initial queue will need to be made in either your
+global mail aliases file (if you are using NIS) or locally on your
+machine.
+ 
+Add the following lines to /etc/aliases (or your local equivalent) :
 
-        Both of these programs take --help as an option.
+rt:         "|/opt/rt3/bin/rt-mailgate --queue general --action correspond --url http://localhost/"
+rt-comment: "|/opt/rt3/bin/rt-mailgate --queue general --action comment --url http://localhost/"
+                                            |                |             |
+                            <queue-name>----/                |             |
+                                                             |             |
+               <correspond or comment depending on whether   |             |
+               the mail should be resent to the requestor>---/             |
+                                                                           |
+                                            <URL for RT's web interface>---/
 
 
 BUGS
 ----
 
-Known issues with releases of RT2 are listed at 
-<URL:http://fsck.com/rt2/NoAuth/Errata.html>.  This includes every bug known
-to exist in each release of RT.  (When prompted, login as guest/guest)
-
-To find out more about currently open bugs, check out the live 
-Buglist at  <URL:http://fsck.com/rt2/NoAuth/Buglist.html>.
-(When prompted, login as guest/guest)
-
-To report a bug, send an email to rt-2.0-bugs@fsck.com.
+To report a bug, send email to rt-3.0-bugs@fsck.com.
 
 GETTING HELP
 ------------
@@ -249,8 +261,8 @@ information about commercial support options, please send email to
 RT-USERS MAILINGLIST
 --------------------
 
-To keep up to date on the latest RT tips, techniques and extections,
-you probably want to join the rt-users mailinglist.  Send a message to:
+To keep up to date on the latest RT tips, techniques and extensions,
+you probably want to join the rt-users mailing list.  Send a message to:
 
          rt-users-request@lists.fsck.com 
 
@@ -258,79 +270,31 @@ With the body of the message consisting of only the word:
 
         subscribe
 
-If you're interested in hacking on rt, you'll want to subscribe to
+If you're interested in hacking on RT, you'll want to subscribe to
 rt-devel@lists.fsck.com.  Subscribe to it with instructions similar to
 those above.
 
 Address questions about the stable release to the rt-users list, and
 questions about the development version to the rt-devel list.  If you feel
-your questions are best not asked publically, send them personally to
+your questions are best not asked publicly, send them personally to
 <jesse@bestpractical.com>.
 
-If you want to be informed of every commit to the CVS repository,
-subscribe to rt-commit@fsck.com using similar instructions to those above.
-
 
 RT WEBSITE
 ----------
 
 For current information about RT, check out the RT website at 
-http://www.bestpractical.com/rt  You'll find screenshots, a pointer
-to the current version of rt, contributed patches and lots of other great
-stuff.
+        http://www.bestpractical.com/  
+
+You'll find screenshots, a pointer to the current version of RT, contributed 
+patches, and lots of other great stuff.
 
 
 TROUBLESHOOTING
 ---------------
 
-All errors will be appended to a logfile, which lives in /tmp/rt.log.* unless 
-you've reconfigured it.  Check etc/config.pm for details.
-
 If the solution to the problem you're running into isn't obvious and you've 
-checked the FAQ, feel free to send mail to rt-users@fsck.com (for release 
+checked the FAQ, feel free to send mail to rt-users@fsck.com (for released 
 versions of RT) or rt-devel@fsck.com (for development versions).
 
-GIVING SOMETHING BACK
----------------------
-
-RT is free software. You are not obligated to pay for it.  You should be 
-aware, however, that bestpractical.com's sole source of revenue is commercial
-work related to RT. If you are able, either a contract to extend RT in some 
-way that would be useful to your organization, a financial contribution, or 
-even something off the author's amazon wishlist 
-	( http://www.amazon.com/exec/obidos/wishlist/2GMHUDAFBT2XR/ )
-would be much appreciated. 
-
 Thanks!
-
-
-CREDITS
--------
-
-A lot of people are responsible for making RT a better program.  Many
-thanks to Lauren Burka, who originally tasked me with writing this beast.
-She forced me to use a database backend.  I've thanked her for it every
-day since.  Rich West rewrote this readme and did some UI hacking.  Adam
-Hirsch, Kit Kraysha, Robin Garner, Jens Glaser, John Adams, Trey Belew, 
-Sean Dague, Nathan Mehl, Kee Hinckley, Rich West, Dale Bewley, Serge Zhuk,
-John Lengeling, Elmar Knipp, Gerald Abshez, Dave Hull, Dave Schenet,
-Dave Walton, Jan Okrouhly, Tobias Brox, Lamont Lucas, Charlie Brady,
-Robin Shostack, Eric Mumpower, Jerrod Wiesman, Adam Hammer, Ivan Kohler, Alex
-Pilosov, Mary Alderdice, Deborah Kaplan, Jens von Bülow, Tristan Horn,
-Lee Ann Goldstein, Karel P Kerezman, Feargal Reilly, Christian Steger,
-Christian Kurz, JD Falk, Arthur de Jong, Ben Carter, Mark Vevers
-and many others
-have all contributed bug reports, code or ideas that have helped RT along.  
-
-Arepa, Inc, Utopia Inc, Wesleyan University and The Leftbank Operation 
-have paid me to maintain RT and release it to the public.  Without their 
-support RT would not exist.  
-
-If I've left you out, please drop me a line ....it wasn't intentional. 
- 
-
-        Enjoy
-
-        Jesse Vincent
-	<jesse@bestpractical.com>
-        Best Practical Solutions, LLC
diff --git a/rt/aclocal.m4 b/rt/aclocal.m4
new file mode 100644
index 000000000..475b3890d
--- /dev/null
+++ b/rt/aclocal.m4
@@ -0,0 +1,158 @@
+dnl aclocal.m4 generated automatically by aclocal 1.4-p4
+
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+dnl
+dnl @synopsis RT_ENABLE_LAYOUT()
+dnl
+dnl Enable a specific directory layout for the installation to use.
+dnl This configures a command-line parameter that can be specified
+dnl at ./configure invocation.
+dnl
+dnl The use of this feature in this way is a little hackish, but
+dnl better than a heap of options for every directory.
+dnl
+dnl This code is heavily borrowed *cough* from the Apache 2 code.
+dnl
+
+AC_DEFUN([RT_ENABLE_LAYOUT],[
+AC_ARG_ENABLE(layout,
+	      AC_HELP_STRING([--enable-layout=LAYOUT],
+	      		     [Use a specific directory layout (Default: RT3)]),
+	      LAYOUT=$enableval)
+
+if test "x$LAYOUT" = "x"; then
+	LAYOUT="RT3"
+fi
+RT_LAYOUT($srcdir/config.layout, $LAYOUT)
+AC_MSG_CHECKING(for chosen layout)
+if test "x$rt_layout_name" = "xno"; then
+	if test "x$LAYOUT" = "xno"; then
+		AC_MSG_RESULT(none)
+	else
+		AC_MSG_RESULT($LAYOUT)
+	fi
+	AC_MSG_ERROR([a valid layout must be specified (or the default used)])
+else
+	AC_SUBST(rt_layout_name)
+	AC_MSG_RESULT($rt_layout_name)
+fi
+])
+
+dnl
+dnl @synopsis RT_LAYOUT(configlayout, layoutname)
+dnl
+dnl This macro reads an Apache-style layout file (specified as the
+dnl configlayout parameter), and searches for a specific layout
+dnl (named using the layoutname parameter).
+dnl
+dnl The entries for a given layout are then inserted into the
+dnl environment such that they become available as substitution
+dnl variables. In addition, the rt_layout_name variable is set
+dnl (but not exported) if the layout is valid.
+dnl
+dnl This code is heavily borrowed *cough* from the Apache 2 codebase.
+dnl
+
+AC_DEFUN([RT_LAYOUT],[
+	if test ! -f $srcdir/config.layout; then
+		AC_MSG_WARN([Layout file $srcdir/config.layout not found])
+		rt_layout_name=no
+	else
+		pldconf=./config.pld
+		$PERL  -0777 -p -e "\$layout = '$2';"  -e '
+		s/.*<Layout\s+$layout>//gims; 
+		s/\<\/Layout\>.*//s; 
+		s/^#.*$//m;
+		s/^\s+//gim;
+		s/\s+$/\n/gim;
+		s/\+$/\/rt3/gim;
+		# m4 will not let us just use $1, we need @S|@1
+		s/^\s*((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
+		s/^\s*(.*?)\s*:\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim;
+		 ' < $1 > $pldconf
+
+		if test -s $pldconf; then
+			rt_layout_name=$2
+			. $pldconf
+			changequote({,})
+			for var in prefix exec_prefix bindir sbindir \
+				 sysconfdir mandir libdir datadir htmldir \
+				 localstatedir logfiledir masonstatedir \
+				 sessionstatedir customdir custometcdir customhtmldir \
+				 customlexdir customlibdir manualdir; do
+				eval "val=\"\$$var\""
+				val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
+				val=`echo $val | 
+					sed -e 's:[\$]\([a-z_]*\):${\1}:g'`
+				eval "$var='$val'"
+			done
+			changequote([,])
+		else
+			rt_layout_name=no
+		fi
+		#rm $pldconf
+	fi
+	RT_SUBST_EXPANDED_ARG(prefix)
+	RT_SUBST_EXPANDED_ARG(exec_prefix)
+	RT_SUBST_EXPANDED_ARG(bindir)
+	RT_SUBST_EXPANDED_ARG(sbindir)
+	RT_SUBST_EXPANDED_ARG(sysconfdir)
+	RT_SUBST_EXPANDED_ARG(mandir)
+	RT_SUBST_EXPANDED_ARG(libdir)
+	RT_SUBST_EXPANDED_ARG(datadir)
+	RT_SUBST_EXPANDED_ARG(htmldir)
+	RT_SUBST_EXPANDED_ARG(manualdir)
+	RT_SUBST_EXPANDED_ARG(localstatedir)
+	RT_SUBST_EXPANDED_ARG(logfiledir)
+	RT_SUBST_EXPANDED_ARG(masonstatedir)
+	RT_SUBST_EXPANDED_ARG(sessionstatedir)
+	RT_SUBST_EXPANDED_ARG(customdir)
+	RT_SUBST_EXPANDED_ARG(custometcdir)
+	RT_SUBST_EXPANDED_ARG(customhtmldir)
+	RT_SUBST_EXPANDED_ARG(customlexdir)
+	RT_SUBST_EXPANDED_ARG(customlibdir)
+])dnl
+
+dnl
+dnl @synopsis	RT_SUBST_EXPANDED_ARG(var)
+dnl
+dnl Export (via AC_SUBST) a given variable, along with an expanded
+dnl version of the variable (same name, but with exp_ prefix).
+dnl
+dnl This code is heavily borrowed *cough* from the Apache 2 source.
+dnl
+
+AC_DEFUN([RT_SUBST_EXPANDED_ARG],[
+	RT_EXPAND_VAR(exp_$1, [$]$1)
+	AC_SUBST($1)
+	AC_SUBST(exp_$1)
+])
+
+dnl
+dnl @synopsis	RT_EXPAND_VAR(baz, $fraz)
+dnl
+dnl Iteratively expands the second parameter, until successive iterations
+dnl yield no change. The result is then assigned to the first parameter.
+dnl
+dnl This code is heavily borrowed from the Apache 2 codebase.
+dnl
+
+AC_DEFUN([RT_EXPAND_VAR],[
+	ap_last=''
+	ap_cur='$2'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	$1="${ap_cur}"
+])
+
diff --git a/rt/autom4te.cache/output.0 b/rt/autom4te.cache/output.0
new file mode 100644
index 000000000..51a8aaf63
--- /dev/null
+++ b/rt/autom4te.cache/output.0
@@ -0,0 +1,2747 @@
+@%:@! /bin/sh
+@%:@ From configure.ac Revision: 1.1 .
+@%:@ Guess values for system-dependent variables and create Makefiles.
+@%:@ Generated by GNU Autoconf 2.53 for RT 3.0.4.
+@%:@
+@%:@ Report bugs to <rt-3.0-bugs@fsck.com>.
+@%:@ 
+@%:@ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+@%:@ Free Software Foundation, Inc.
+@%:@ This configure script is free software; the Free Software Foundation
+@%:@ gives unlimited permission to copy, distribute and modify it.
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# NLS nuisances.
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
+    { $as_unset LANG || test "${LANG+set}" != set; } ||
+      { LANG=C; export LANG; }
+(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
+    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
+      { LC_ALL=C; export LC_ALL; }
+(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
+    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
+      { LC_TIME=C; export LC_TIME; }
+(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
+    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
+      { LC_CTYPE=C; export LC_CTYPE; }
+(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
+    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
+      { LANGUAGE=C; export LANGUAGE; }
+(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
+    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
+      { LC_COLLATE=C; export LC_COLLATE; }
+(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
+    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
+      { LC_NUMERIC=C; export LC_NUMERIC; }
+(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
+    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
+      { LC_MESSAGES=C; export LC_MESSAGES; }
+
+
+# Name of the executable.
+as_me=`(basename "$0") 2>/dev/null ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conftest.sh
+  echo  "exit 0"   >>conftest.sh
+  chmod +x conftest.sh
+  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conftest.sh
+fi
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+
+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
+	 /*)
+	   if ("$as_dir/$as_base" -c '
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
+    ' >$as_me.lineno &&
+  chmod +x $as_me.lineno ||
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
+
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+exec 6>&1
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
+# Identity of this package.
+PACKAGE_NAME='RT'
+PACKAGE_TARNAME='rt'
+PACKAGE_VERSION='3.0.4'
+PACKAGE_STRING='RT 3.0.4'
+PACKAGE_BUGREPORT='rt-3.0-bugs@fsck.com'
+
+ac_unique_file="lib/RT.pm.in"
+ac_default_prefix=/opt/rt3
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
+
+ac_prev=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval "$ac_prev=\$ac_option"
+    ac_prev=
+    continue
+  fi
+
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_option in
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+  | --da=*)
+    datadir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    eval "enable_$ac_feature=no" ;;
+
+  -enable-* | --enable-*)
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "enable_$ac_feature='$ac_optarg'" ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst \
+  | --locals | --local | --loca | --loc | --lo)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "with_$ac_package='$ac_optarg'" ;;
+
+  -without-* | --without-*)
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package | sed 's/-/_/g'`
+    eval "with_$ac_package=no" ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
+fi
+
+# Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
+do
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+              localstatedir libdir includedir oldincludedir infodir mandir
+do
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then its parent.
+  ac_confdir=`(dirname "$0") 2>/dev/null ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$0" : 'X\(//\)[^/]' \| \
+         X"$0" : 'X\(//\)$' \| \
+         X"$0" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$0" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r $srcdir/$ac_unique_file; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r $srcdir/$ac_unique_file; then
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+   { (exit 1); exit 1; }; }
+  else
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
+  fi
+fi
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_PERL_set=${PERL+set}
+ac_env_PERL_value=$PERL
+ac_cv_env_PERL_set=${PERL+set}
+ac_cv_env_PERL_value=$PERL
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures RT 3.0.4 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+_ACEOF
+
+  cat <<_ACEOF
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
+_ACEOF
+
+  cat <<\_ACEOF
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of RT 3.0.4:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-layout=LAYOUT  Use a specific directory layout (Default: RT3)
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-speedycgi=/path/to/speedy 
+                          path to your speedycgi binary, if it exists
+  --with-rt-group=GROUP   group to own all files (default: rt)
+  --with-bin-owner=OWNER  user that will own rt binaries (default root)
+  --with-libs-owner=OWNER user that will own RT libraries (default root)
+  --with-libs-group=GROUP group that will own rt binaries (default bin)
+  --with-db-type=TYPE     sort of database RT will use (default: mysql) (mysql
+                          and Pg are valid)
+  --with-db-host=HOSTNAME FQDN of database server (default: localhost)
+  --with-db-port=PORT     port on which the database listens on
+  --with-db-rt-host=HOSTNAME 
+                          FQDN of RT server which talks to the database server
+                          (default: localhost)
+  --with-db-dba=DBA       name of database administrator (default: root)
+  --with-db-database=DBNAME 
+                          name of the database to use (default: rt3)
+  --with-db-rt-user=DBUSER 
+                          name of database user (default: rt_user)
+  --with-db-rt-pass=PASSWORD 
+                          password for database user (default: rt_pass)
+  --with-web-user=USER    user the web server runs as (default: www)
+  --with-web-group=GROUP  group the web server runs as (default: www)
+
+Some influential environment variables:
+  PERL        Perl interpreter command
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <rt-3.0-bugs@fsck.com>.
+_ACEOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d $ac_dir || continue
+    ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+    cd $ac_dir
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_srcdir/configure; then
+      echo
+      $SHELL $ac_srcdir/configure  --help=recursive
+    elif test -f $ac_srcdir/configure.ac ||
+           test -f $ac_srcdir/configure.in; then
+      echo
+      $ac_configure --help
+    else
+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi
+    cd $ac_popdir
+  done
+fi
+
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+  cat <<\_ACEOF
+RT configure 3.0.4
+generated by GNU Autoconf 2.53
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit 0
+fi
+exec 5>config.log
+cat >&5 <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by RT $as_me 3.0.4, which was
+generated by GNU Autoconf 2.53.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+{
+cat <<_ASUNAME
+@%:@@%:@ --------- @%:@@%:@
+@%:@@%:@ Platform. @%:@@%:@
+@%:@@%:@ --------- @%:@@%:@
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  echo "PATH: $as_dir"
+done
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+@%:@@%:@ ----------- @%:@@%:@
+@%:@@%:@ Core tests. @%:@@%:@
+@%:@@%:@ ----------- @%:@@%:@
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell meta-characters.
+ac_configure_args=
+ac_sep=
+for ac_arg
+do
+  case $ac_arg in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n ) continue ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    continue ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  case " $ac_configure_args " in
+    *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+    *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+       ac_sep=" " ;;
+  esac
+  # Get rid of the leading space.
+done
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Be sure not to use single quotes in there, as some shells,
+# such as our DU 5.0 friend, will then `close' the trap.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+    cat <<\_ASBOX
+@%:@@%:@ ---------------- @%:@@%:@
+@%:@@%:@ Cache variables. @%:@@%:@
+@%:@@%:@ ---------------- @%:@@%:@
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+{
+  (set) 2>&1 |
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      sed -n \
+        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
+    *)
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+}
+    echo
+    if test -s confdefs.h; then
+      cat <<\_ASBOX
+@%:@@%:@ ----------- @%:@@%:@
+@%:@@%:@ confdefs.h. @%:@@%:@
+@%:@@%:@ ----------- @%:@@%:@
+_ASBOX
+      echo
+      sed "/^$/d" confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      echo "$as_me: caught signal $ac_signal"
+    echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core core.* *.core &&
+  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+     ' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+@%:@define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  fi
+fi
+for ac_site_file in $CONFIG_SITE; do
+  if test -r "$ac_site_file"; then
+    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . $cache_file;;
+      *)                      . ./$cache_file;;
+    esac
+  fi
+else
+  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in `(set) 2>&1 |
+               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+  eval ac_new_val="\$ac_env_${ac_var}_value"
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+        ac_cache_corrupted=:
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+rt_version_major=3
+
+rt_version_minor=0
+
+rt_version_patch=4
+
+test "x$rt_version_major" = 'x' && rt_version_major=0
+test "x$rt_version_minor" = 'x' && rt_version_minor=0
+test "x$rt_version_patch" = 'x' && rt_version_patch=0
+
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f $ac_dir/shtool; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+  ./ | .// | /cC/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+          if test $ac_prog = install &&
+            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+            # AIX install.  It has an incompatible calling convention.
+            :
+          elif test $ac_prog = install &&
+            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+            # program-specific install script used by HP pwplus--don't use.
+            :
+          else
+            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+            break 3
+          fi
+        fi
+      done
+    done
+    ;;
+esac
+done
+
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL=$ac_install_sh
+  fi
+fi
+echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PERL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PERL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="not found"
+  ;;
+esac
+fi
+PERL=$ac_cv_path_PERL
+
+if test -n "$PERL"; then
+  echo "$as_me:$LINENO: result: $PERL" >&5
+echo "${ECHO_T}$PERL" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if test "$PERL" = 'not found'; then
+	{ { echo "$as_me:$LINENO: error: cannot use $PACKAGE_NAME without perl" >&5
+echo "$as_me: error: cannot use $PACKAGE_NAME without perl" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+# Check whether --with-speedycgi or --without-speedycgi was given.
+if test "${with_speedycgi+set}" = set; then
+  withval="$with_speedycgi"
+  SPEEDY_BIN=$withval
+else
+  SPEEDY_BIN=/usr/local/bin/speedy
+fi;  
+
+
+
+
+
+# Check whether --enable-layout or --disable-layout was given.
+if test "${enable_layout+set}" = set; then
+  enableval="$enable_layout"
+  LAYOUT=$enableval
+fi; 
+
+if test "x$LAYOUT" = "x"; then
+	LAYOUT="RT3"
+fi
+
+	if test ! -f $srcdir/config.layout; then
+		{ echo "$as_me:$LINENO: WARNING: Layout file $srcdir/config.layout not found" >&5
+echo "$as_me: WARNING: Layout file $srcdir/config.layout not found" >&2;}
+		rt_layout_name=no
+	else
+		pldconf=./config.pld
+		$PERL  -0777 -p -e "\$layout = '$LAYOUT';"  -e '
+		s/.*<Layout\s+$layout>//gims; 
+		s/\<\/Layout\>.*//s; 
+		s/^#.*$//m;
+		s/^\s+//gim;
+		s/\s+$/\n/gim;
+		s/\+$/\/rt3/gim;
+		# m4 will not let us just use $srcdir/config.layout, we need @S|@1
+		s/^\s*((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
+		s/^\s*(.*?)\s*:\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim;
+		 ' < $srcdir/config.layout > $pldconf
+
+		if test -s $pldconf; then
+			rt_layout_name=$LAYOUT
+			. $pldconf
+			
+			for var in prefix exec_prefix bindir sbindir \
+				 sysconfdir mandir libdir datadir htmldir \
+				 localstatedir logfiledir masonstatedir \
+				 sessionstatedir customdir custometcdir customhtmldir \
+				 customlexdir customlibdir manualdir; do
+				eval "val=\"\$$var\""
+				val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
+				val=`echo $val | 
+					sed -e 's:[\$]\([a-z_]*\):$\1:g'`
+				eval "$var='$val'"
+			done
+			
+		else
+			rt_layout_name=no
+		fi
+		#rm $pldconf
+	fi
+	
+	
+	ap_last=''
+	ap_cur='$prefix'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_prefix="${ap_cur}"
+
+	
+	
+
+	
+	
+	ap_last=''
+	ap_cur='$exec_prefix'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_exec_prefix="${ap_cur}"
+
+	
+	
+
+	
+	
+	ap_last=''
+	ap_cur='$bindir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_bindir="${ap_cur}"
+
+	
+	
+
+	
+	
+	ap_last=''
+	ap_cur='$sbindir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_sbindir="${ap_cur}"
+
+	
+	
+
+	
+	
+	ap_last=''
+	ap_cur='$sysconfdir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_sysconfdir="${ap_cur}"
+
+	
+	
+
+	
+	
+	ap_last=''
+	ap_cur='$mandir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_mandir="${ap_cur}"
+
+	
+	
+
+	
+	
+	ap_last=''
+	ap_cur='$libdir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_libdir="${ap_cur}"
+
+	
+	
+
+	
+	
+	ap_last=''
+	ap_cur='$datadir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_datadir="${ap_cur}"
+
+	
+	
+
+	
+	
+	ap_last=''
+	ap_cur='$htmldir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_htmldir="${ap_cur}"
+
+	
+	
+
+	
+	
+	ap_last=''
+	ap_cur='$manualdir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_manualdir="${ap_cur}"
+
+	
+	
+
+	
+	
+	ap_last=''
+	ap_cur='$localstatedir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_localstatedir="${ap_cur}"
+
+	
+	
+
+	
+	
+	ap_last=''
+	ap_cur='$logfiledir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_logfiledir="${ap_cur}"
+
+	
+	
+
+	
+	
+	ap_last=''
+	ap_cur='$masonstatedir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_masonstatedir="${ap_cur}"
+
+	
+	
+
+	
+	
+	ap_last=''
+	ap_cur='$sessionstatedir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_sessionstatedir="${ap_cur}"
+
+	
+	
+
+	
+	
+	ap_last=''
+	ap_cur='$customdir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_customdir="${ap_cur}"
+
+	
+	
+
+	
+	
+	ap_last=''
+	ap_cur='$custometcdir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_custometcdir="${ap_cur}"
+
+	
+	
+
+	
+	
+	ap_last=''
+	ap_cur='$customhtmldir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_customhtmldir="${ap_cur}"
+
+	
+	
+
+	
+	
+	ap_last=''
+	ap_cur='$customlexdir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_customlexdir="${ap_cur}"
+
+	
+	
+
+	
+	
+	ap_last=''
+	ap_cur='$customlibdir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_customlibdir="${ap_cur}"
+
+	
+	
+
+
+echo "$as_me:$LINENO: checking for chosen layout" >&5
+echo $ECHO_N "checking for chosen layout... $ECHO_C" >&6
+if test "x$rt_layout_name" = "xno"; then
+	if test "x$LAYOUT" = "xno"; then
+		echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6
+	else
+		echo "$as_me:$LINENO: result: $LAYOUT" >&5
+echo "${ECHO_T}$LAYOUT" >&6
+	fi
+	{ { echo "$as_me:$LINENO: error: a valid layout must be specified (or the default used)" >&5
+echo "$as_me: error: a valid layout must be specified (or the default used)" >&2;}
+   { (exit 1); exit 1; }; }
+else
+	
+	echo "$as_me:$LINENO: result: $rt_layout_name" >&5
+echo "${ECHO_T}$rt_layout_name" >&6
+fi
+
+
+
+# Check whether --with-rt-group or --without-rt-group was given.
+if test "${with_rt_group+set}" = set; then
+  withval="$with_rt_group"
+  RTGROUP=$withval
+else
+  RTGROUP=rt
+fi; 
+
+
+
+# Check whether --with-bin-owner or --without-bin-owner was given.
+if test "${with_bin_owner+set}" = set; then
+  withval="$with_bin_owner"
+  BIN_OWNER=$withval
+else
+  BIN_OWNER=root
+fi; 
+
+
+
+# Check whether --with-libs-owner or --without-libs-owner was given.
+if test "${with_libs_owner+set}" = set; then
+  withval="$with_libs_owner"
+  LIBS_OWNER=$withval
+else
+  LIBS_OWNER=root
+fi; 
+
+
+
+# Check whether --with-libs-group or --without-libs-group was given.
+if test "${with_libs_group+set}" = set; then
+  withval="$with_libs_group"
+  LIBS_GROUP=$withval
+else
+  LIBS_GROUP=bin
+fi; 
+
+
+
+# Check whether --with-db-type or --without-db-type was given.
+if test "${with_db_type+set}" = set; then
+  withval="$with_db_type"
+  DB_TYPE=$withval
+else
+  DB_TYPE=mysql
+fi; 
+if test "$DB_TYPE" != 'mysql' -a "$DB_TYPE" != 'Pg' -a "$DB_TYPE" != 'SQLite'; then
+	{ { echo "$as_me:$LINENO: error: Only Pg and mysql are valid db types" >&5
+echo "$as_me: error: Only Pg and mysql are valid db types" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+
+# Check whether --with-db-host or --without-db-host was given.
+if test "${with_db_host+set}" = set; then
+  withval="$with_db_host"
+  DB_HOST=$withval
+else
+  DB_HOST=localhost
+fi; 
+
+
+
+# Check whether --with-db-port or --without-db-port was given.
+if test "${with_db_port+set}" = set; then
+  withval="$with_db_port"
+  DB_PORT=$withval
+else
+  DB_PORT=
+fi; 
+
+
+
+# Check whether --with-db-rt-host or --without-db-rt-host was given.
+if test "${with_db_rt_host+set}" = set; then
+  withval="$with_db_rt_host"
+  DB_RT_HOST=$withval
+else
+  DB_RT_HOST=localhost
+fi; 
+
+
+
+# Check whether --with-db-dba or --without-db-dba was given.
+if test "${with_db_dba+set}" = set; then
+  withval="$with_db_dba"
+  DB_DBA=$withval
+else
+  DB_DBA=root
+fi; 
+
+
+
+# Check whether --with-db-database or --without-db-database was given.
+if test "${with_db_database+set}" = set; then
+  withval="$with_db_database"
+  DB_DATABASE=$withval
+else
+  DB_DATABASE=rt3
+fi; 
+
+
+
+# Check whether --with-db-rt-user or --without-db-rt-user was given.
+if test "${with_db_rt_user+set}" = set; then
+  withval="$with_db_rt_user"
+  DB_RT_USER=$withval
+else
+  DB_RT_USER=rt_user
+fi; 
+
+
+
+# Check whether --with-db-rt-pass or --without-db-rt-pass was given.
+if test "${with_db_rt_pass+set}" = set; then
+  withval="$with_db_rt_pass"
+  DB_RT_PASS=$withval
+else
+  DB_RT_PASS=rt_pass
+fi; 
+
+
+
+# Check whether --with-web-user or --without-web-user was given.
+if test "${with_web_user+set}" = set; then
+  withval="$with_web_user"
+  WEB_USER=$withval
+else
+  WEB_USER=www
+fi; 
+
+
+
+# Check whether --with-web-group or --without-web-group was given.
+if test "${with_web_group+set}" = set; then
+  withval="$with_web_group"
+  WEB_GROUP=$withval
+else
+  WEB_GROUP=www
+fi; 
+
+
+
+RT_VERSION_MAJOR=${rt_version_major}
+
+RT_VERSION_MINOR=${rt_version_minor}
+
+RT_VERSION_PATCH=${rt_version_patch}
+
+
+RT_PATH=${exp_prefix}
+
+RT_DOC_PATH=${exp_manualdir}
+
+RT_LOCAL_PATH=${exp_customdir}
+
+RT_LIB_PATH=${exp_libdir}
+
+RT_ETC_PATH=${exp_sysconfdir}
+
+CONFIG_FILE_PATH=${exp_sysconfdir}
+
+RT_BIN_PATH=${exp_bindir}
+
+RT_SBIN_PATH=${exp_sbindir}
+
+RT_VAR_PATH=${exp_localstatedir}
+
+RT_MAN_PATH=${exp_mandir}
+
+MASON_DATA_PATH=${exp_masonstatedir}
+
+MASON_SESSION_PATH=${exp_sessionstatedir}
+
+MASON_HTML_PATH=${exp_htmldir}
+
+LOCAL_ETC_PATH=${exp_custometcdir}
+
+MASON_LOCAL_HTML_PATH=${exp_customhtmldir}
+
+LOCAL_LEXICON_PATH=${exp_customlexdir}
+
+LOCAL_LIB_PATH=${exp_customlibdir}
+
+DESTDIR=${exp_prefix}
+
+RT_LOG_PATH=${exp_logfiledir}
+
+
+
+ac_config_files="$ac_config_files sbin/rt-setup-database sbin/rt-test-dependencies Makefile etc/RT_Config.pm lib/RT.pm lib/t/00smoke.t lib/t/01harness.t lib/t/02regression.t lib/t/03web.pl lib/t/04_send_email.pl bin/mason_handler.fcgi bin/mason_handler.scgi bin/mason_handler.svc bin/rt-commit-handler bin/rt-crontool bin/rt-mailgate bin/webmux.pl"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+        "s/'/'\\\\''/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if cmp -s $cache_file confcache; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[ 	]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[ 	]*$//;
+}'
+fi
+
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then we branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+cat >confdef2opt.sed <<\_ACEOF
+t clear
+: clear
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+d
+: quote
+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
+_ACEOF
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output.  A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
+
+
+
+: ${CONFIG_STATUS=./config.status}
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# NLS nuisances.
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
+    { $as_unset LANG || test "${LANG+set}" != set; } ||
+      { LANG=C; export LANG; }
+(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
+    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
+      { LC_ALL=C; export LC_ALL; }
+(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
+    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
+      { LC_TIME=C; export LC_TIME; }
+(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
+    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
+      { LC_CTYPE=C; export LC_CTYPE; }
+(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
+    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
+      { LANGUAGE=C; export LANGUAGE; }
+(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
+    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
+      { LC_COLLATE=C; export LC_COLLATE; }
+(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
+    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
+      { LC_NUMERIC=C; export LC_NUMERIC; }
+(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
+    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
+      { LC_MESSAGES=C; export LC_MESSAGES; }
+
+
+# Name of the executable.
+as_me=`(basename "$0") 2>/dev/null ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conftest.sh
+  echo  "exit 0"   >>conftest.sh
+  chmod +x conftest.sh
+  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conftest.sh
+fi
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+
+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
+	 /*)
+	   if ("$as_dir/$as_base" -c '
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
+    ' >$as_me.lineno &&
+  chmod +x $as_me.lineno ||
+    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
+
+exec 6>&1
+
+# Open the log real soon, to keep \$[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.  Logging --version etc. is OK.
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
+@%:@@%:@ Running $as_me. @%:@@%:@
+_ASBOX
+} >&5
+cat >&5 <<_CSEOF
+
+This file was extended by RT $as_me 3.0.4, which was
+generated by GNU Autoconf 2.53.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+_CSEOF
+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+echo >&5
+_ACEOF
+
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number, then exit
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+  --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Report bugs to <bug-autoconf@gnu.org>."
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
+ac_cs_version="\\
+RT config.status 3.0.4
+configured by $0, generated by GNU Autoconf 2.53,
+  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+srcdir=$srcdir
+INSTALL="$INSTALL"
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=*)
+    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    shift
+    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
+    shift
+    ;;
+  -*);;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_need_defaults=false;;
+  esac
+
+  case $1 in
+  # Handling of the options.
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
+    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
+  --he | --h)
+    # Conflict between --help and --header
+    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    shift
+    CONFIG_FILES="$CONFIG_FILES $1"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $1"
+    ac_need_defaults=false;;
+
+  # This is an error.
+  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1" ;;
+
+  esac
+  shift
+done
+
+_ACEOF
+
+
+
+
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+for ac_config_target in $ac_config_targets
+do
+  case "$ac_config_target" in
+  # Handling of arguments.
+  "sbin/rt-setup-database" ) CONFIG_FILES="$CONFIG_FILES sbin/rt-setup-database" ;;
+  "sbin/rt-test-dependencies" ) CONFIG_FILES="$CONFIG_FILES sbin/rt-test-dependencies" ;;
+  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "etc/RT_Config.pm" ) CONFIG_FILES="$CONFIG_FILES etc/RT_Config.pm" ;;
+  "lib/RT.pm" ) CONFIG_FILES="$CONFIG_FILES lib/RT.pm" ;;
+  "lib/t/00smoke.t" ) CONFIG_FILES="$CONFIG_FILES lib/t/00smoke.t" ;;
+  "lib/t/01harness.t" ) CONFIG_FILES="$CONFIG_FILES lib/t/01harness.t" ;;
+  "lib/t/02regression.t" ) CONFIG_FILES="$CONFIG_FILES lib/t/02regression.t" ;;
+  "lib/t/03web.pl" ) CONFIG_FILES="$CONFIG_FILES lib/t/03web.pl" ;;
+  "lib/t/04_send_email.pl" ) CONFIG_FILES="$CONFIG_FILES lib/t/04_send_email.pl" ;;
+  "bin/mason_handler.fcgi" ) CONFIG_FILES="$CONFIG_FILES bin/mason_handler.fcgi" ;;
+  "bin/mason_handler.scgi" ) CONFIG_FILES="$CONFIG_FILES bin/mason_handler.scgi" ;;
+  "bin/mason_handler.svc" ) CONFIG_FILES="$CONFIG_FILES bin/mason_handler.svc" ;;
+  "bin/rt-commit-handler" ) CONFIG_FILES="$CONFIG_FILES bin/rt-commit-handler" ;;
+  "bin/rt-crontool" ) CONFIG_FILES="$CONFIG_FILES bin/rt-crontool" ;;
+  "bin/rt-mailgate" ) CONFIG_FILES="$CONFIG_FILES bin/rt-mailgate" ;;
+  "bin/webmux.pl" ) CONFIG_FILES="$CONFIG_FILES bin/webmux.pl" ;;
+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+fi
+
+# Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+
+# Create a (secure) tmp directory for tmp files.
+: ${TMPDIR=/tmp}
+{
+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=$TMPDIR/cs$$-$RANDOM
+  (umask 077 && mkdir $tmp)
+} ||
+{
+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+   { (exit 1); exit 1; }
+}
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
+
+#
+# CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@build_alias@,$build_alias,;t t
+s,@host_alias@,$host_alias,;t t
+s,@target_alias@,$target_alias,;t t
+s,@DEFS@,$DEFS,;t t
+s,@ECHO_C@,$ECHO_C,;t t
+s,@ECHO_N@,$ECHO_N,;t t
+s,@ECHO_T@,$ECHO_T,;t t
+s,@LIBS@,$LIBS,;t t
+s,@rt_version_major@,$rt_version_major,;t t
+s,@rt_version_minor@,$rt_version_minor,;t t
+s,@rt_version_patch@,$rt_version_patch,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@PERL@,$PERL,;t t
+s,@SPEEDY_BIN@,$SPEEDY_BIN,;t t
+s,@exp_prefix@,$exp_prefix,;t t
+s,@exp_exec_prefix@,$exp_exec_prefix,;t t
+s,@exp_bindir@,$exp_bindir,;t t
+s,@exp_sbindir@,$exp_sbindir,;t t
+s,@exp_sysconfdir@,$exp_sysconfdir,;t t
+s,@exp_mandir@,$exp_mandir,;t t
+s,@exp_libdir@,$exp_libdir,;t t
+s,@exp_datadir@,$exp_datadir,;t t
+s,@htmldir@,$htmldir,;t t
+s,@exp_htmldir@,$exp_htmldir,;t t
+s,@manualdir@,$manualdir,;t t
+s,@exp_manualdir@,$exp_manualdir,;t t
+s,@exp_localstatedir@,$exp_localstatedir,;t t
+s,@logfiledir@,$logfiledir,;t t
+s,@exp_logfiledir@,$exp_logfiledir,;t t
+s,@masonstatedir@,$masonstatedir,;t t
+s,@exp_masonstatedir@,$exp_masonstatedir,;t t
+s,@sessionstatedir@,$sessionstatedir,;t t
+s,@exp_sessionstatedir@,$exp_sessionstatedir,;t t
+s,@customdir@,$customdir,;t t
+s,@exp_customdir@,$exp_customdir,;t t
+s,@custometcdir@,$custometcdir,;t t
+s,@exp_custometcdir@,$exp_custometcdir,;t t
+s,@customhtmldir@,$customhtmldir,;t t
+s,@exp_customhtmldir@,$exp_customhtmldir,;t t
+s,@customlexdir@,$customlexdir,;t t
+s,@exp_customlexdir@,$exp_customlexdir,;t t
+s,@customlibdir@,$customlibdir,;t t
+s,@exp_customlibdir@,$exp_customlibdir,;t t
+s,@rt_layout_name@,$rt_layout_name,;t t
+s,@RTGROUP@,$RTGROUP,;t t
+s,@BIN_OWNER@,$BIN_OWNER,;t t
+s,@LIBS_OWNER@,$LIBS_OWNER,;t t
+s,@LIBS_GROUP@,$LIBS_GROUP,;t t
+s,@DB_TYPE@,$DB_TYPE,;t t
+s,@DB_HOST@,$DB_HOST,;t t
+s,@DB_PORT@,$DB_PORT,;t t
+s,@DB_RT_HOST@,$DB_RT_HOST,;t t
+s,@DB_DBA@,$DB_DBA,;t t
+s,@DB_DATABASE@,$DB_DATABASE,;t t
+s,@DB_RT_USER@,$DB_RT_USER,;t t
+s,@DB_RT_PASS@,$DB_RT_PASS,;t t
+s,@WEB_USER@,$WEB_USER,;t t
+s,@WEB_GROUP@,$WEB_GROUP,;t t
+s,@RT_VERSION_MAJOR@,$RT_VERSION_MAJOR,;t t
+s,@RT_VERSION_MINOR@,$RT_VERSION_MINOR,;t t
+s,@RT_VERSION_PATCH@,$RT_VERSION_PATCH,;t t
+s,@RT_PATH@,$RT_PATH,;t t
+s,@RT_DOC_PATH@,$RT_DOC_PATH,;t t
+s,@RT_LOCAL_PATH@,$RT_LOCAL_PATH,;t t
+s,@RT_LIB_PATH@,$RT_LIB_PATH,;t t
+s,@RT_ETC_PATH@,$RT_ETC_PATH,;t t
+s,@CONFIG_FILE_PATH@,$CONFIG_FILE_PATH,;t t
+s,@RT_BIN_PATH@,$RT_BIN_PATH,;t t
+s,@RT_SBIN_PATH@,$RT_SBIN_PATH,;t t
+s,@RT_VAR_PATH@,$RT_VAR_PATH,;t t
+s,@RT_MAN_PATH@,$RT_MAN_PATH,;t t
+s,@MASON_DATA_PATH@,$MASON_DATA_PATH,;t t
+s,@MASON_SESSION_PATH@,$MASON_SESSION_PATH,;t t
+s,@MASON_HTML_PATH@,$MASON_HTML_PATH,;t t
+s,@LOCAL_ETC_PATH@,$LOCAL_ETC_PATH,;t t
+s,@MASON_LOCAL_HTML_PATH@,$MASON_LOCAL_HTML_PATH,;t t
+s,@LOCAL_LEXICON_PATH@,$LOCAL_LEXICON_PATH,;t t
+s,@LOCAL_LIB_PATH@,$LOCAL_LIB_PATH,;t t
+s,@DESTDIR@,$DESTDIR,;t t
+s,@RT_LOG_PATH@,$RT_LOG_PATH,;t t
+CEOF
+
+_ACEOF
+
+  cat >>$CONFIG_STATUS <<\_ACEOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    fi
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
+  fi
+fi # test -n "$CONFIG_FILES"
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+        cat >$tmp/stdin
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
+  esac
+
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  { case "$ac_dir" in
+  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+  *)                      as_incr_dir=.;;
+esac
+as_dummy="$ac_dir"
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+  case $as_mkdir_dir in
+    # Skip DOS drivespec
+    ?:) as_incr_dir=$as_mkdir_dir ;;
+    *)
+      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+      test -d "$as_incr_dir" ||
+        mkdir "$as_incr_dir" ||
+	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }
+    ;;
+  esac
+done; }
+
+  ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+  esac
+
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated by config.status.  */
+  if test x"$ac_file" = x-; then
+    configure_input=
+  else
+    configure_input="$ac_file.  "
+  fi
+  configure_input=$configure_input"Generated from `echo $ac_file_in |
+                                     sed 's,.*/,,'` by configure."
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         fi;;
+      esac
+    done` || { (exit 1); exit 1; }
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+  sed "$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@abs_srcdir@,$ac_abs_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+s,@builddir@,$ac_builddir,;t t
+s,@abs_builddir@,$ac_abs_builddir,;t t
+s,@top_builddir@,$ac_top_builddir,;t t
+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
+
+done
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+{ (exit 0); exit 0; }
+_ACEOF
+chmod +x $CONFIG_STATUS
+ac_clean_files=$ac_clean_files_save
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi
+
diff --git a/rt/autom4te.cache/requests b/rt/autom4te.cache/requests
new file mode 100644
index 000000000..fad7b54f5
--- /dev/null
+++ b/rt/autom4te.cache/requests
@@ -0,0 +1,94 @@
+# This file was created by autom4te.
+# It contains the lists of macros which have been traced.
+# It can be safely removed.
+
+@request = (
+             bless( [
+                      '0',
+                      1,
+                      [
+                        '/usr/share/autoconf'
+                      ],
+                      [
+                        '--reload-state=/usr/share/autoconf/autoconf/autoconf.m4f',
+                        'aclocal.m4',
+                        'configure.ac'
+                      ],
+                      {
+                        'AC_HEADER_STAT' => 1,
+                        'AC_FUNC_STRFTIME' => 1,
+                        'AC_PROG_RANLIB' => 1,
+                        'AC_FUNC_WAIT3' => 1,
+                        'AC_FUNC_SETPGRP' => 1,
+                        'AC_HEADER_TIME' => 1,
+                        'AC_FUNC_SETVBUF_REVERSED' => 1,
+                        'AC_HEADER_SYS_WAIT' => 1,
+                        'AC_TYPE_UID_T' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AC_CHECK_LIB' => 1,
+                        'AC_PROG_LN_S' => 1,
+                        'AC_FUNC_MEMCMP' => 1,
+                        'AC_FUNC_FORK' => 1,
+                        'AC_FUNC_GETGROUPS' => 1,
+                        'AC_HEADER_MAJOR' => 1,
+                        'AC_FUNC_STRTOD' => 1,
+                        'AC_HEADER_DIRENT' => 1,
+                        'AC_FUNC_UTIME_NULL' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        'AC_FUNC_ALLOCA' => 1,
+                        'AC_C_CONST' => 1,
+                        'include' => 1,
+                        'AC_FUNC_OBSTACK' => 1,
+                        'AC_FUNC_LSTAT' => 1,
+                        'AC_STRUCT_TIMEZONE' => 1,
+                        'AC_FUNC_GETPGRP' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'AC_CHECK_HEADERS' => 1,
+                        'AC_TYPE_MODE_T' => 1,
+                        'AC_CHECK_TYPES' => 1,
+                        'AC_PROG_YACC' => 1,
+                        'AC_TYPE_PID_T' => 1,
+                        'AC_FUNC_STRERROR_R' => 1,
+                        'AC_STRUCT_ST_BLOCKS' => 1,
+                        'AC_PROG_GCC_TRADITIONAL' => 1,
+                        'AC_TYPE_SIGNAL' => 1,
+                        'AC_FUNC_FNMATCH' => 1,
+                        'AC_PROG_CPP' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'AC_FUNC_STAT' => 1,
+                        'AC_PROG_INSTALL' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'AC_FUNC_STRCOLL' => 1,
+                        'AC_LIBSOURCE' => 1,
+                        'AC_C_INLINE' => 1,
+                        'AC_FUNC_CHOWN' => 1,
+                        'AC_PROG_LEX' => 1,
+                        'AH_OUTPUT' => 1,
+                        'AC_HEADER_STDC' => 1,
+                        'AC_FUNC_GETLOADAVG' => 1,
+                        'AC_CHECK_FUNCS' => 1,
+                        'AC_TYPE_SIZE_T' => 1,
+                        'AC_DECL_SYS_SIGLIST' => 1,
+                        'AC_FUNC_MKTIME' => 1,
+                        'AC_PROG_MAKE_SET' => 1,
+                        'AC_PROG_CXX' => 1,
+                        'm4_pattern_allow' => 1,
+                        'm4_include' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AC_PROG_AWK' => 1,
+                        'AC_FUNC_VPRINTF' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'AC_PATH_X' => 1,
+                        'AC_TYPE_OFF_T' => 1,
+                        'AC_FUNC_MALLOC' => 1,
+                        'AC_FUNC_ERROR_AT_LINE' => 1,
+                        'AC_FUNC_FSEEKO' => 1,
+                        'AC_FUNC_MMAP' => 1,
+                        'AC_STRUCT_TM' => 1,
+                        'AC_SUBST' => 1,
+                        'AC_PROG_CC' => 1,
+                        'AC_PROG_LIBTOOL' => 1
+                      }
+                    ], 'Request' )
+           );
+
diff --git a/rt/autom4te.cache/traces.0 b/rt/autom4te.cache/traces.0
new file mode 100644
index 000000000..962f400e7
--- /dev/null
+++ b/rt/autom4te.cache/traces.0
@@ -0,0 +1,156 @@
+m4trace:configure.ac:9: -1- m4_pattern_forbid([^_?A[CHUM]_])
+m4trace:configure.ac:9: -1- m4_pattern_forbid([_AC_])
+m4trace:configure.ac:9: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs. LIBOBJS'])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^AS_FLAGS$])
+m4trace:configure.ac:9: -1- m4_pattern_forbid([^_?m4_])
+m4trace:configure.ac:9: -1- m4_pattern_forbid([^dnl$])
+m4trace:configure.ac:9: -1- m4_pattern_forbid([^_?AS_])
+m4trace:configure.ac:9: -1- AC_SUBST([SHELL], [${CONFIG_SHELL-/bin/sh}])
+m4trace:configure.ac:9: -1- AC_SUBST([PATH_SEPARATOR])
+m4trace:configure.ac:9: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])
+m4trace:configure.ac:9: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])
+m4trace:configure.ac:9: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])
+m4trace:configure.ac:9: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])
+m4trace:configure.ac:9: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
+m4trace:configure.ac:9: -1- AC_SUBST([exec_prefix], [NONE])
+m4trace:configure.ac:9: -1- AC_SUBST([prefix], [NONE])
+m4trace:configure.ac:9: -1- AC_SUBST([program_transform_name], [s,x,x,])
+m4trace:configure.ac:9: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
+m4trace:configure.ac:9: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
+m4trace:configure.ac:9: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
+m4trace:configure.ac:9: -1- AC_SUBST([datadir], ['${prefix}/share'])
+m4trace:configure.ac:9: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
+m4trace:configure.ac:9: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
+m4trace:configure.ac:9: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
+m4trace:configure.ac:9: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
+m4trace:configure.ac:9: -1- AC_SUBST([includedir], ['${prefix}/include'])
+m4trace:configure.ac:9: -1- AC_SUBST([oldincludedir], ['/usr/include'])
+m4trace:configure.ac:9: -1- AC_SUBST([infodir], ['${prefix}/info'])
+m4trace:configure.ac:9: -1- AC_SUBST([mandir], ['${prefix}/man'])
+m4trace:configure.ac:9: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
+m4trace:configure.ac:9: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
+#undef PACKAGE_NAME])
+m4trace:configure.ac:9: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
+m4trace:configure.ac:9: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME])
+m4trace:configure.ac:9: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
+m4trace:configure.ac:9: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
+#undef PACKAGE_VERSION])
+m4trace:configure.ac:9: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
+m4trace:configure.ac:9: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING])
+m4trace:configure.ac:9: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
+m4trace:configure.ac:9: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT])
+m4trace:configure.ac:9: -1- AC_SUBST([build_alias])
+m4trace:configure.ac:9: -1- AC_SUBST([host_alias])
+m4trace:configure.ac:9: -1- AC_SUBST([target_alias])
+m4trace:configure.ac:9: -1- AC_SUBST([DEFS])
+m4trace:configure.ac:9: -1- AC_SUBST([ECHO_C])
+m4trace:configure.ac:9: -1- AC_SUBST([ECHO_N])
+m4trace:configure.ac:9: -1- AC_SUBST([ECHO_T])
+m4trace:configure.ac:9: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:14: -1- AC_SUBST([rt_version_major], [3])
+m4trace:configure.ac:16: -1- AC_SUBST([rt_version_minor], [0])
+m4trace:configure.ac:18: -1- AC_SUBST([rt_version_patch], [4])
+m4trace:configure.ac:24: -1- AC_PROG_INSTALL
+m4trace:configure.ac:24: -1- AC_SUBST([INSTALL_PROGRAM])
+m4trace:configure.ac:24: -1- AC_SUBST([INSTALL_SCRIPT])
+m4trace:configure.ac:24: -1- AC_SUBST([INSTALL_DATA])
+m4trace:configure.ac:25: -1- AC_SUBST([PERL])
+m4trace:configure.ac:26: -1- AC_SUBST([PERL], [$ac_cv_path_PERL])
+m4trace:configure.ac:36: -1- AC_SUBST([SPEEDY_BIN])
+m4trace:configure.ac:41: -1- AC_SUBST([prefix])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_prefix])
+m4trace:configure.ac:41: -1- AC_SUBST([exec_prefix])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_exec_prefix])
+m4trace:configure.ac:41: -1- AC_SUBST([bindir])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_bindir])
+m4trace:configure.ac:41: -1- AC_SUBST([sbindir])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_sbindir])
+m4trace:configure.ac:41: -1- AC_SUBST([sysconfdir])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_sysconfdir])
+m4trace:configure.ac:41: -1- AC_SUBST([mandir])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_mandir])
+m4trace:configure.ac:41: -1- AC_SUBST([libdir])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_libdir])
+m4trace:configure.ac:41: -1- AC_SUBST([datadir])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_datadir])
+m4trace:configure.ac:41: -1- AC_SUBST([htmldir])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_htmldir])
+m4trace:configure.ac:41: -1- AC_SUBST([manualdir])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_manualdir])
+m4trace:configure.ac:41: -1- AC_SUBST([localstatedir])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_localstatedir])
+m4trace:configure.ac:41: -1- AC_SUBST([logfiledir])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_logfiledir])
+m4trace:configure.ac:41: -1- AC_SUBST([masonstatedir])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_masonstatedir])
+m4trace:configure.ac:41: -1- AC_SUBST([sessionstatedir])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_sessionstatedir])
+m4trace:configure.ac:41: -1- AC_SUBST([customdir])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_customdir])
+m4trace:configure.ac:41: -1- AC_SUBST([custometcdir])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_custometcdir])
+m4trace:configure.ac:41: -1- AC_SUBST([customhtmldir])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_customhtmldir])
+m4trace:configure.ac:41: -1- AC_SUBST([customlexdir])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_customlexdir])
+m4trace:configure.ac:41: -1- AC_SUBST([customlibdir])
+m4trace:configure.ac:41: -1- AC_SUBST([exp_customlibdir])
+m4trace:configure.ac:41: -1- AC_SUBST([rt_layout_name])
+m4trace:configure.ac:49: -1- AC_SUBST([RTGROUP])
+m4trace:configure.ac:57: -1- AC_SUBST([BIN_OWNER])
+m4trace:configure.ac:65: -1- AC_SUBST([LIBS_OWNER])
+m4trace:configure.ac:73: -1- AC_SUBST([LIBS_GROUP])
+m4trace:configure.ac:84: -1- AC_SUBST([DB_TYPE])
+m4trace:configure.ac:92: -1- AC_SUBST([DB_HOST])
+m4trace:configure.ac:100: -1- AC_SUBST([DB_PORT])
+m4trace:configure.ac:108: -1- AC_SUBST([DB_RT_HOST])
+m4trace:configure.ac:116: -1- AC_SUBST([DB_DBA])
+m4trace:configure.ac:124: -1- AC_SUBST([DB_DATABASE])
+m4trace:configure.ac:132: -1- AC_SUBST([DB_RT_USER])
+m4trace:configure.ac:140: -1- AC_SUBST([DB_RT_PASS])
+m4trace:configure.ac:148: -1- AC_SUBST([WEB_USER])
+m4trace:configure.ac:156: -1- AC_SUBST([WEB_GROUP])
+m4trace:configure.ac:163: -1- AC_SUBST([RT_VERSION_MAJOR], [${rt_version_major}])
+m4trace:configure.ac:164: -1- AC_SUBST([RT_VERSION_MINOR], [${rt_version_minor}])
+m4trace:configure.ac:165: -1- AC_SUBST([RT_VERSION_PATCH], [${rt_version_patch}])
+m4trace:configure.ac:168: -1- AC_SUBST([RT_PATH], [${exp_prefix}])
+m4trace:configure.ac:169: -1- AC_SUBST([RT_DOC_PATH], [${exp_manualdir}])
+m4trace:configure.ac:170: -1- AC_SUBST([RT_LOCAL_PATH], [${exp_customdir}])
+m4trace:configure.ac:171: -1- AC_SUBST([RT_LIB_PATH], [${exp_libdir}])
+m4trace:configure.ac:172: -1- AC_SUBST([RT_ETC_PATH], [${exp_sysconfdir}])
+m4trace:configure.ac:173: -1- AC_SUBST([CONFIG_FILE_PATH], [${exp_sysconfdir}])
+m4trace:configure.ac:174: -1- AC_SUBST([RT_BIN_PATH], [${exp_bindir}])
+m4trace:configure.ac:175: -1- AC_SUBST([RT_SBIN_PATH], [${exp_sbindir}])
+m4trace:configure.ac:176: -1- AC_SUBST([RT_VAR_PATH], [${exp_localstatedir}])
+m4trace:configure.ac:177: -1- AC_SUBST([RT_MAN_PATH], [${exp_mandir}])
+m4trace:configure.ac:178: -1- AC_SUBST([MASON_DATA_PATH], [${exp_masonstatedir}])
+m4trace:configure.ac:179: -1- AC_SUBST([MASON_SESSION_PATH], [${exp_sessionstatedir}])
+m4trace:configure.ac:180: -1- AC_SUBST([MASON_HTML_PATH], [${exp_htmldir}])
+m4trace:configure.ac:181: -1- AC_SUBST([LOCAL_ETC_PATH], [${exp_custometcdir}])
+m4trace:configure.ac:182: -1- AC_SUBST([MASON_LOCAL_HTML_PATH], [${exp_customhtmldir}])
+m4trace:configure.ac:183: -1- AC_SUBST([LOCAL_LEXICON_PATH], [${exp_customlexdir}])
+m4trace:configure.ac:184: -1- AC_SUBST([LOCAL_LIB_PATH], [${exp_customlibdir}])
+m4trace:configure.ac:185: -1- AC_SUBST([DESTDIR], [${exp_prefix}])
+m4trace:configure.ac:186: -1- AC_SUBST([RT_LOG_PATH], [${exp_logfiledir}])
+m4trace:configure.ac:208: -1- AC_CONFIG_FILES([
+		 sbin/rt-setup-database
+                 sbin/rt-test-dependencies
+                 Makefile
+		 etc/RT_Config.pm
+		 lib/RT.pm
+                 lib/t/00smoke.t
+                 lib/t/01harness.t
+                 lib/t/02regression.t
+                 lib/t/03web.pl
+                 lib/t/04_send_email.pl
+ 		 bin/mason_handler.fcgi
+ 		 bin/mason_handler.scgi
+ 		 bin/mason_handler.svc
+ 		 bin/rt-commit-handler
+ 		 bin/rt-crontool
+ 		 bin/rt-mailgate
+ 		 bin/webmux.pl
+                ])
diff --git a/rt/bin/mason_handler.fcgi b/rt/bin/mason_handler.fcgi
index e8a4e128f..431eccbd3 100755
--- a/rt/bin/mason_handler.fcgi
+++ b/rt/bin/mason_handler.fcgi
@@ -1,221 +1,54 @@
-#!!!PERL!!
-# $Header: /home/cvs/cvsroot/freeside/rt/bin/mason_handler.fcgi,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# RT is (c) 1996-2001 Jesse Vincent (jesse@fsck.com);
+#!/usr/bin/perl
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 
 use strict;
-$ENV{'PATH'} = '/bin:/usr/bin';    # or whatever you need
-$ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
-$ENV{'SHELL'} = '/bin/sh' if defined $ENV{'SHELL'};
-$ENV{'ENV'} = '' if defined $ENV{'ENV'};
-$ENV{'IFS'} = ''          if defined $ENV{'IFS'};
+use File::Basename;
+require ('/opt/rt3/bin/webmux.pl');
 
+my $h = &RT::Interface::Web::NewCGIHandler();
 
-# We really don't want apache to try to eat all vm
-# see http://perl.apache.org/guide/control.html#Preventing_mod_perl_Processes_Fr
-
-
-package RT::Mason;
-#use CGI qw(-private_tempfiles);   # pull in CGI with the private tempfiles
-				  #option predefined
-use HTML::Mason;  # brings in subpackages: Parser, Interp, etc.
-
-use vars qw($VERSION %session $Nobody $SystemUser $cgi);
-
-# List of modules that you want to use from components (see Admin
-# manual for details)
-
-#Clean up our umask...so that the session files aren't world readable, writable or executable
-umask(0077);
-
-
-  
-$VERSION="!!RT_VERSION!!";
-
-use lib "!!RT_LIB_PATH!!";
-use lib "!!RT_ETC_PATH!!";
-
-#This drags in  RT's config.pm
-use config;
-use Carp;
-
-{  
-    package HTML::Mason::Commands;
-    use vars qw(%session $ContentType);
-    
-    use RT; 
-    use RT::Ticket;
-    use RT::Tickets;
-    use RT::Transaction;
-    use RT::Transactions;
-    use RT::User;
-    use RT::Users;
-    use RT::CurrentUser;
-    use RT::Template;
-    use RT::Templates;
-    use RT::Queue;
-    use RT::Queues;
-    use RT::ScripAction;
-    use RT::ScripActions;
-    use RT::ScripCondition;
-    use RT::ScripConditions;
-    use RT::Scrip;
-    use RT::Scrips;
-    use RT::Group;
-    use RT::Groups;
-    use RT::Keyword;
-    use RT::Keywords;
-    use RT::ObjectKeyword;
-    use RT::ObjectKeywords;
-    use RT::KeywordSelect;
-    use RT::KeywordSelects;
-    use RT::GroupMember;
-    use RT::GroupMembers;
-    use RT::Watcher;
-    use RT::Watchers;
-    use RT::Handle;
-    use RT::Interface::Web;    
-    use MIME::Entity;
-    use CGI::Cookie;
-    use Date::Parse;
-    use HTML::Entities;
-    use Text::Wrapper;
- 
-    #TODO: make this use DBI
-    use Apache::Session::File;
-    use CGI::Fast;
-
-    # set the page's content type.
-    # In this case, just save it to a variable that we can pull later;
-    sub SetContentType {
-	$ContentType = shift;
-    }
-    sub CGIObject {
-	return $RT::Mason::cgi;
-    }
-}
-
-
-my ($output, $parser, $interp);
-if ($HTML::Mason::VERSION < 1.0902) {
-        require HTML::Mason::ApacheHandler;
-
-         $parser = &RT::Interface::Web::NewParser(allow_globals => [%session]);
-
-         $interp = &RT::Interface::Web::NewInterp(parser=>$parser,
-                                             allow_recursive_autohandlers => 1,
-					    out_method => \$output);
-}
-else {
-         $interp = &RT::Interface::Web::NewInterp(
-                                                  allow_globals => [%session],
-                                                  default_escape_flags => 'h',
-
-					    out_method => \$output);
-}
-# Die if WebSessionDir doesn't exist or we can't write to it
-
-stat ($RT::MasonSessionDir);
-die "Can't read and write $RT::MasonSessionDir"
-  unless (( -d _ ) and ( -r _ ) and ( -w _ ));
-
+# Enter CGI::Fast mode, which should also work as a vanilla CGI script.
+require CGI::Fast;
 
 RT::Init();
 
 # Response loop
-while ($RT::Mason::cgi = new CGI::Fast) {
-    
-    $HTML::Mason::Commands::ContentType = 'text/html';
-        
-    # This routine comes from ApacheHandler.pm:
-    my (%args, $cookie);
-    foreach my $key ( $cgi->param ) {
-	foreach my $value ( $cgi->param($key) ) {
-	    if (exists($args{$key})) {
-		if (ref($args{$key})) {
-		    $args{$key} = [@{$args{$key}}, $value];
-		} else {
-		    $args{$key} = [$args{$key}, $value];
-		}
-	    } else {
-		$args{$key} = $value;
-	    }
-
-	}
-	
-    }
-    
-
-    my $comp = $ENV{'PATH_INFO'};
-    
-    if ($comp =~ /^(.*)$/) {  # untaint the path info. apache should
-			      # never hand us a bogus path. 
-			      # We should be more careful here.
-	$comp = $1;
-    }    
-    
-    if ($comp =~ /\/$/) {
-	$comp .= "index.html";
-    }	
-    
-    #This is all largely cut and pasted from mason's session_handler.pl
-    
-    # {{{ Cookies
-    my %cookies = fetch CGI::Cookie();
-    
-    eval {
-	my $session_id = undef;
-
-	#Get the session id and untaint it
-	if ($cookies{'AF_SID'} && $cookies{'AF_SID'}->value() =~ /^(.*)$/) {
-		$session_id = $1;
-	}
- 
-	tie %HTML::Mason::Commands::session, 'Apache::Session::File',
-	  	$session_id, 
-	    { Directory => $RT::MasonSessionDir,
-	      LockDirectory => $RT::MasonSessionDir,
-	    }	;
-    };
-    
-    if ( $@ ) {
-	# If the session is invalid, create a new session.
-	if ( $@ =~ m#^Object does not exist in the data store# ) {
-	     tie %HTML::Mason::Commands::session, 'Apache::Session::File', undef,
-	     { Directory => $RT::MasonSessionDir,
-	       LockDirectory => $RT::MasonSessionDir,
-	     };
-	     undef $cookies{'AF_SID'};
-	}
-	  else {
-	      die "$@ \nProbably means that RT Couldn't write to session directory '$RT::MasonSessionDir'. Check that this directory's permissions are correct.";
-	  }
+while ( my $cgi = CGI::Fast->new ) {
+    # the whole point of fastcgi requires the env to get reset here..
+    # So we must squash it again
+    $ENV{'PATH'}   = '/bin:/usr/bin';
+    $ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
+    $ENV{'SHELL'}  = '/bin/sh' if defined $ENV{'SHELL'};
+    $ENV{'ENV'}    = '' if defined $ENV{'ENV'};
+    $ENV{'IFS'}    = '' if defined $ENV{'IFS'};
+
+    unless ($h->interp->comp_exists($cgi->path_info)) {
+	$cgi->path_info($cgi->path_info . "/index.html");
     }
-    
-    if ( !$cookies{'AF_SID'} ) {
-	$cookie = new CGI::Cookie
-	  (-name=>'AF_SID', 
-	   -value=>$HTML::Mason::Commands::session{_session_id}, 
-	   -path => '/',);
-	
-    } else {
-	$cookie = undef;
-    }
-    
-    # }}}
-    
-    $output = '';
-    eval {
-	    my $status = $interp->exec($comp, %args);
-    };
- 
-    if ($@) {
-	$output = "<PRE>$@</PRE>";
-    }
- 
-    print "Content-Type: $HTML::Mason::Commands::ContentType\r\n";
-    print "Set-Cookie: $cookie\r\n" if ($cookie);
-    print "\r\n";
-    print $output;
-    untie %HTML::Mason::Commands::session;
-    
+    $h->handle_cgi_object($cgi);
+    # _should_ always be tied
 }
+
+1;
diff --git a/rt/bin/mason_handler.fcgi.in b/rt/bin/mason_handler.fcgi.in
new file mode 100644
index 000000000..e932bfc29
--- /dev/null
+++ b/rt/bin/mason_handler.fcgi.in
@@ -0,0 +1,54 @@
+#!@PERL@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+use strict;
+use File::Basename;
+require ('@RT_BIN_PATH@/webmux.pl');
+
+my $h = &RT::Interface::Web::NewCGIHandler();
+
+# Enter CGI::Fast mode, which should also work as a vanilla CGI script.
+require CGI::Fast;
+
+RT::Init();
+
+# Response loop
+while ( my $cgi = CGI::Fast->new ) {
+    # the whole point of fastcgi requires the env to get reset here..
+    # So we must squash it again
+    $ENV{'PATH'}   = '/bin:/usr/bin';
+    $ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
+    $ENV{'SHELL'}  = '/bin/sh' if defined $ENV{'SHELL'};
+    $ENV{'ENV'}    = '' if defined $ENV{'ENV'};
+    $ENV{'IFS'}    = '' if defined $ENV{'IFS'};
+
+    unless ($h->interp->comp_exists($cgi->path_info)) {
+	$cgi->path_info($cgi->path_info . "/index.html");
+    }
+    $h->handle_cgi_object($cgi);
+    # _should_ always be tied
+}
+
+1;
diff --git a/rt/bin/mason_handler.scgi b/rt/bin/mason_handler.scgi
index b9846c898..8e1135c2f 100755
--- a/rt/bin/mason_handler.scgi
+++ b/rt/bin/mason_handler.scgi
@@ -1,193 +1,41 @@
-#!!!PERL!! -w
-
-#!/usr/bin/speedy -- -t600 -M8
-# $Header: /home/cvs/cvsroot/freeside/rt/bin/mason_handler.scgi,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# RT is (c) 1996-2001 Jesse Vincent (jesse@fsck.com);
-#
-# Contains code derived from mason.cgi
-# mason.cgi is Copyright December 2000 Joshua Kronengold (mneme@io.com, 
-# mneme@cyberspace.org).  All Rights Reserved.
+#!/usr/local/bin/speedy
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 
 use strict;
-# {{{ Clean out the environment a little bit
-$ENV{'PATH'} = '/bin:/usr/bin';    # or whatever you need
-$ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
-$ENV{'SHELL'} = '/bin/sh' if defined $ENV{'SHELL'};
-$ENV{'ENV'} = '' if defined $ENV{'ENV'};
-$ENV{'IFS'} = ''          if defined $ENV{'IFS'};
-# }}}
-
-package RT::Mason;
-use HTML::Mason;  # brings in subpackages: Parser, Interp, etc.
-use vars qw($VERSION %session $Nobody $SystemUser);
-
-# List of modules that you want to use from components (see Admin
-# manual for details)
-
-$VERSION="!!RT_VERSION!!";
-
-use lib "!!RT_LIB_PATH!!";
-use lib "!!RT_ETC_PATH!!";
-
-
-#This drags in  RT's config.pm
-use config;
-use Carp;
-
-use HTML::Mason::FakeApache;
-use CGI;
-
-# {{{ Set up CGI environment and grab CGI params:
+require ('/opt/rt3/bin/webmux.pl');
 
-my $r=new HTML::Mason::FakeApache;
+my $h = &RT::Interface::Web::NewCGIHandler();
 
-$|=1; # set output to non-buffered.
+require CGI;
 
-my %cgi;
-CGI::ReadParse(\%cgi); # %cgi is now a tied hash containing our params.
+RT::Init();
 
-my $q=$cgi{CGI}; # $q now contains the object tied to %cgi.
-# }}}
-
-# {{{ require what we need
-{  
-    package HTML::Mason::Commands;
-
-    use vars qw(%session);
-
-    use RT::Ticket;
-    use RT::Tickets;
-    use RT::Transaction;
-    use RT::Transactions;
-    use RT::User;
-    use RT::Users;
-    use RT::CurrentUser;
-    use RT::Template;
-    use RT::Templates;
-    use RT::Queue;
-    use RT::Queues;
-    use RT::ScripAction;
-    use RT::ScripActions;
-    use RT::ScripCondition;
-    use RT::ScripConditions;
-    use RT::Scrip;
-    use RT::Scrips;
-    use RT::Group;
-    use RT::Groups;
-    use RT::Keyword;
-    use RT::Keywords;
-    use RT::ObjectKeyword;
-    use RT::ObjectKeywords;
-    use RT::KeywordSelect;
-    use RT::KeywordSelects;
-    use RT::GroupMember;
-    use RT::GroupMembers;
-    use RT::Watcher;
-    use RT::Watchers;
-    use RT::Handle;
-    use RT::Interface::Web;    
-    use MIME::Entity;
-    use CGI::Cookie;
-    use Date::Parse;
-    use HTML::Entities;
-
-    
-    use Apache::Session::File;
-
-    
+my $cgi = CGI->new;
+unless ($h->interp->comp_exists($cgi->path_info)) {
+    $cgi->path_info($cgi->path_info . "/index.html");
 }
-# }}}
-
-# {{{ RT Database setup
-    $RT::Handle = new RT::Handle;
-    
-    $RT::Handle->Connect;
-   
-    use RT::CurrentUser;
-    
-    #RT's system user is a genuine database user. its id lives here
-    $RT::SystemUser = new RT::CurrentUser();
-    $RT::SystemUser->LoadByName('RT_System');
-
-    #RT's "nobody user" is a genuine database user. its ID lives here.
-    $RT::Nobody = new RT::CurrentUser();
-    $RT::Nobody->LoadByName('Nobody'); 
-     
-
-# }}}
-
-
-
-
-# {{{ Deal with cookies
-
-my %cookies = fetch CGI::Cookie();
-eval { 
-    tie %HTML::Mason::Commands::session, 'Apache::Session::File',
-      ( $cookies{'AF_SID'} ? $cookies{'AF_SID'}->value() : undef );
-};
-
-if ( $@ ) {
-    # If the session is invalid, create a new session.
-    if ( $@ =~ m#^Object does not exist in the data store# ) {
-	 tie %HTML::Mason::Commands::session, 'Apache::Session::File', undef;
-	 undef $cookies{'AF_SID'};
-    }
-}
-
-if ( !$cookies{'AF_SID'} ) {
-    my $cookie = new CGI::Cookie(
- 	 -name=>'AF_SID', 
-	 -value=>$HTML::Mason::Commands::session{_session_id}, 
-	  -path => '/');
-    print 'Set-Cookie: '. $cookie."\r\n";
-}
-
-# }}}
-
-my $path=$ENV{PATH_INFO} || "/"; $path=~s/\'/\\\'/g;
-
-my $type=`/usr/bin/file '$RT::MasonComponentRoot/$path'`;
-
-# {{{ if it's a text file, handle it with mason.
-if($type=~/text|directory/) { 
-	my ($out, %mason_params);
-        my $parser = RT::Interface::Web::NewParser(allow_globals=>[qw($r)]);
-	$mason_params{parser}=$parser;
-	$r->content_type('text/html');
-	# (get cookies line) ...
-	$r->access_hash('headers_in','Cookie',$ENV{HTTP_COOKIE});
-	$r->{'args@'}=[];
-	$mason_params{out_method}=\$out;
-
-	my $interp = RT::Interface::Web::NewInterp(%mason_params);
-
-	$interp->set_global(r=>$r);
-	$interp->exec($path,%cgi);
-	$r->send_http_header();
-        print $out;
-} 
-# }}} 
-
-# {{{ if it's not a text file, just stream it out.
-
-else { # file is binary, damn it
-	my $mime_type;
-	if ( $mime_type=
-	     eval{ use MIME::Types;
-		   my($type,$encoding)=MIME::Types::by_suffix($path);
-		   $type; }) {
-	    print $q->header($mime_type);	
-	    $path=~s/[\|\>\<\&]//g;
-	    open F,"$RT::MasonComponentRoot/$path" or 
-	      die "couldn't open $path -- $!";
-	    print while <F>; 
-	    close F;
-	} else {
-	    die "couldn't resolve type of non-text file (!@; $type) -- install Mime::Types\n";
-	}
-    }
-
-# }}}
+$h->handle_cgi_object($cgi);
 
-untie %HTML::Mason::Commands::session;
+1;
diff --git a/rt/bin/mason_handler.scgi.in b/rt/bin/mason_handler.scgi.in
new file mode 100644
index 000000000..37d8380c2
--- /dev/null
+++ b/rt/bin/mason_handler.scgi.in
@@ -0,0 +1,41 @@
+#!@SPEEDY_BIN@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+use strict;
+require ('@RT_BIN_PATH@/webmux.pl');
+
+my $h = &RT::Interface::Web::NewCGIHandler();
+
+require CGI;
+
+RT::Init();
+
+my $cgi = CGI->new;
+unless ($h->interp->comp_exists($cgi->path_info)) {
+    $cgi->path_info($cgi->path_info . "/index.html");
+}
+$h->handle_cgi_object($cgi);
+
+1;
diff --git a/rt/bin/mason_handler.svc b/rt/bin/mason_handler.svc
new file mode 100644
index 000000000..e6d83784c
--- /dev/null
+++ b/rt/bin/mason_handler.svc
@@ -0,0 +1,234 @@
+#!/usr/bin/perl
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+=head1 NAME
+
+mason_handler.svc - Win32 IIS Service handler for RT
+
+=head1 SYNOPSIS
+
+    perl mason_handler.svc --install	# install as service
+    perl mason_handler.svc --deinstall	# deinstall this service
+    perl mason_handler.svc --help	# show this help
+    perl mason_handler.svc 		# launch handler from command line
+
+=head1 DESCRIPTION
+
+This script manages a stand-alone FastCGI server, and populates the necessary
+registry settings to run it with Microsoft IIS Server 4.0 or above.
+
+Before running it, you need to install the B<FCGI> module from CPAN, as well as
+B<Win32::Daemon> from L<http://www.roth.net/perl/Daemon/> if you want to install
+itself as a service.
+
+This script will automatically create a virtual directory under the IIS root;
+its name is taken from C<$WebPath> in the F<RT_Config.pm> file.  Additionally,
+please install the ISAPI binary from L<http://www.caraveo.com/fastcgi/> and set
+up an ISAPI Script Map that maps F<.html> files to F<isapi_fcgi.dll>.
+
+Once the service is launched (either via C<net start RTFastCGI> or by running
+C<perl mason_handler.svc>), a FCGI server will start and bind to port C<8284>
+(mnemonics: the ASCII value of C<R> and C<T>); the ISAPI handler's C<BindPath>
+registry setting will also be automatically populated.
+
+=cut
+
+use strict;
+use File::Basename;
+require (dirname(__FILE__) . '/webmux.pl');
+
+use Cwd;
+use File::Spec;
+
+use Win32;
+use Win32::Process;
+use Win32::Service;
+use Win32::TieRegistry;
+
+my $ProcessObj;
+
+BEGIN {
+    my $runsvc = sub {
+	Win32::Process::Create(
+	    $ProcessObj, $^X, "$^X $0 --run", 0, NORMAL_PRIORITY_CLASS, "."
+	) or do {
+	    die Win32::FormatMessage( Win32::GetLastError() );
+	};
+
+	chdir File::Basename::dirname($0);
+	my $path = Cwd::cwd();
+	$path =~ s|/|\\|g;
+	$path =~ s|bin$|share\\html|;
+
+	$Win32::TieRegistry::Registry->{
+	    'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\\'.
+	    'W3SVC\Parameters\Virtual Roots\\'
+	}->{$RT::WebPath || '/'} = "$path,,205";
+	    
+	$Win32::TieRegistry::Registry->{
+	    'HKEY_LOCAL_MACHINE\Software\FASTCGI\.html\\'
+	}->{'BindPath'} = $ENV{'FCGI_SOCKET_PATH'};
+
+	Win32::Service::StartService(Win32::NodeName, 'W3SVC');
+    };
+    
+    if ($ARGV[0] eq '--deinstall') {
+	chdir File::Basename::dirname($0);
+	my $path = Cwd::cwd();
+	$path =~ s|/|\\|g;
+
+	require Win32::Daemon;
+	Win32::Daemon::DeleteService('RTFastCGI');
+	warn "Service 'RTFastCGI' successfully deleted.\n";
+	exit;
+    }
+    elsif ($ARGV[0] eq '--install') {
+	chdir File::Basename::dirname($0);
+	my $path = Cwd::cwd();
+	$path =~ s|/|\\|g;
+
+	require Win32::Daemon;
+	Win32::Daemon::DeleteService('RTFastCGI');
+	
+	my $rv = Win32::Daemon::CreateService( {
+	    machine =>  '',
+	    name    =>  'RTFastCGI',
+	    display =>  'RT FastCGI Handler',
+	    path    =>  $^X,
+	    user    =>  '',
+	    pwd     =>  $path,
+	    description => 'Enables port 8284 as the RT FastCGI handler.',
+	    parameters  => File::Spec->catfile(
+		    $path, File::Basename::basename($0)
+	    ) . ' --service',
+	} );
+    
+	if ($rv) {
+	    warn "Service 'RTFastCGI' successfully created.\n";
+	}
+	else {
+	    warn "Failed to add service: " . Win32::FormatMessage(
+		Win32::Daemon::GetLastError()
+	    ) . "\n";
+	}
+	exit;
+    }
+    elsif ($ARGV[0] eq '--service') {
+	require Win32::Daemon;
+
+	my $PrevState = Win32::Daemon::SERVICE_START_PENDING();
+	Win32::Daemon::StartService() or die $^E;
+
+	while ( 1 ) {
+	    my $State = Win32::Daemon::State();
+	    last if $State == Win32::Daemon::SERVICE_STOPPED();
+	    
+	    if ( $State == Win32::Daemon::SERVICE_START_PENDING() ) {
+		$runsvc->();
+		Win32::Daemon::State( Win32::Daemon::SERVICE_RUNNING() );
+		$PrevState = Win32::Daemon::SERVICE_RUNNING();
+	    }
+	    elsif ( $State == Win32::Daemon::SERVICE_CONTINUE_PENDING() ) {
+		$ProcessObj->Resume;
+		Win32::Daemon::State( Win32::Daemon::SERVICE_RUNNING() );
+		$PrevState = Win32::Daemon::SERVICE_RUNNING();
+	    }
+	    elsif ( $State == Win32::Daemon::SERVICE_STOP_PENDING() ) {
+	    $ProcessObj->Kill(0);
+		Win32::Daemon::State( Win32::Daemon::SERVICE_STOPPED() );
+		$PrevState = Win32::Daemon::SERVICE_STOPPED();
+	    }
+	    elsif ( $State == Win32::Daemon::SERVICE_RUNNING() ) {
+		my $Message = Win32::Daemon::QueryLastMessage(1);
+		if ( $Message == Win32::Daemon::SERVICE_CONTROL_INTERROGATE() ) {
+		    Win32::Daemon::State( $PrevState );
+		}
+		elsif ( $Message == Win32::Daemon::SERVICE_CONTROL_SHUTDOWN() ) {
+		    Win32::Daemon::State( Win32::Daemon::SERVICE_STOP_PENDING(), 15000 );
+		}
+		elsif ( $Message != Win32::Daemon::SERVICE_CONTROL_NONE() ) {
+		    Win32::Daemon::State( $PrevState );
+		}
+	    }
+	    
+	    Win32::Sleep( 1000 );
+	}
+		
+	Win32::Daemon::StopService();
+	exit;
+    }
+    elsif ($ARGV[0] eq '--help') {
+	system("perldoc $0");
+	exit;
+    }
+    elsif ($ARGV[0] ne '--run') {
+	$SIG{__DIE__} = sub { $ProcessObj->Kill(0) if $ProcessObj };
+	$runsvc->();
+	warn "RT FastCGI Handler launched. Press [Enter] to terminate...\n";
+	<STDIN>;
+	exit;
+    }
+}
+
+###############################################################################
+
+warn "Begin listening on $ENV{'FCGI_SOCKET_PATH'}\n";
+
+require CGI::Fast;
+my $h = &RT::Interface::Web::NewCGIHandler();
+
+RT::Init();
+
+# Response loop
+while( my $cgi = CGI::Fast->new ) {
+    my $comp = $ENV{'PATH_INFO'};
+
+    $comp = $1 if ($comp =~ /^(.*)$/);
+    $comp =~ s|^$RT::WebPath\b||i;
+    $comp .= "index.html" if ($comp =~ /\/$/);
+    $comp =~ s/.pl$/.html/g;
+    
+    warn "Serving $comp\n";
+
+    $h->handle_cgi($comp);
+    # _should_ always be tied
+}
+
+1;
+
+=head1 AUTHORS
+
+Autrijus Tang E<lt>autrijus@autrijus.orgE<gt>
+
+=head1 COPYRIGHT
+
+Copyright 2002 by Autrijus Tang E<lt>autrijus@autrijus.orgE<gt>.
+
+This program is free software; you can redistribute it and/or 
+modify it under the same terms as Perl itself.
+
+See L<http://www.perl.com/perl/misc/Artistic.html>
+
+=cut
diff --git a/rt/bin/mason_handler.svc.in b/rt/bin/mason_handler.svc.in
new file mode 100644
index 000000000..cc12c0ef0
--- /dev/null
+++ b/rt/bin/mason_handler.svc.in
@@ -0,0 +1,234 @@
+#!@PERL@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+=head1 NAME
+
+mason_handler.svc - Win32 IIS Service handler for RT
+
+=head1 SYNOPSIS
+
+    perl mason_handler.svc --install	# install as service
+    perl mason_handler.svc --deinstall	# deinstall this service
+    perl mason_handler.svc --help	# show this help
+    perl mason_handler.svc 		# launch handler from command line
+
+=head1 DESCRIPTION
+
+This script manages a stand-alone FastCGI server, and populates the necessary
+registry settings to run it with Microsoft IIS Server 4.0 or above.
+
+Before running it, you need to install the B<FCGI> module from CPAN, as well as
+B<Win32::Daemon> from L<http://www.roth.net/perl/Daemon/> if you want to install
+itself as a service.
+
+This script will automatically create a virtual directory under the IIS root;
+its name is taken from C<$WebPath> in the F<RT_Config.pm> file.  Additionally,
+please install the ISAPI binary from L<http://www.caraveo.com/fastcgi/> and set
+up an ISAPI Script Map that maps F<.html> files to F<isapi_fcgi.dll>.
+
+Once the service is launched (either via C<net start RTFastCGI> or by running
+C<perl mason_handler.svc>), a FCGI server will start and bind to port C<8284>
+(mnemonics: the ASCII value of C<R> and C<T>); the ISAPI handler's C<BindPath>
+registry setting will also be automatically populated.
+
+=cut
+
+use strict;
+use File::Basename;
+require (dirname(__FILE__) . '/webmux.pl');
+
+use Cwd;
+use File::Spec;
+
+use Win32;
+use Win32::Process;
+use Win32::Service;
+use Win32::TieRegistry;
+
+my $ProcessObj;
+
+BEGIN {
+    my $runsvc = sub {
+	Win32::Process::Create(
+	    $ProcessObj, $^X, "$^X $0 --run", 0, NORMAL_PRIORITY_CLASS, "."
+	) or do {
+	    die Win32::FormatMessage( Win32::GetLastError() );
+	};
+
+	chdir File::Basename::dirname($0);
+	my $path = Cwd::cwd();
+	$path =~ s|/|\\|g;
+	$path =~ s|bin$|share\\html|;
+
+	$Win32::TieRegistry::Registry->{
+	    'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\\'.
+	    'W3SVC\Parameters\Virtual Roots\\'
+	}->{$RT::WebPath || '/'} = "$path,,205";
+	    
+	$Win32::TieRegistry::Registry->{
+	    'HKEY_LOCAL_MACHINE\Software\FASTCGI\.html\\'
+	}->{'BindPath'} = $ENV{'FCGI_SOCKET_PATH'};
+
+	Win32::Service::StartService(Win32::NodeName, 'W3SVC');
+    };
+    
+    if ($ARGV[0] eq '--deinstall') {
+	chdir File::Basename::dirname($0);
+	my $path = Cwd::cwd();
+	$path =~ s|/|\\|g;
+
+	require Win32::Daemon;
+	Win32::Daemon::DeleteService('RTFastCGI');
+	warn "Service 'RTFastCGI' successfully deleted.\n";
+	exit;
+    }
+    elsif ($ARGV[0] eq '--install') {
+	chdir File::Basename::dirname($0);
+	my $path = Cwd::cwd();
+	$path =~ s|/|\\|g;
+
+	require Win32::Daemon;
+	Win32::Daemon::DeleteService('RTFastCGI');
+	
+	my $rv = Win32::Daemon::CreateService( {
+	    machine =>  '',
+	    name    =>  'RTFastCGI',
+	    display =>  'RT FastCGI Handler',
+	    path    =>  $^X,
+	    user    =>  '',
+	    pwd     =>  $path,
+	    description => 'Enables port 8284 as the RT FastCGI handler.',
+	    parameters  => File::Spec->catfile(
+		    $path, File::Basename::basename($0)
+	    ) . ' --service',
+	} );
+    
+	if ($rv) {
+	    warn "Service 'RTFastCGI' successfully created.\n";
+	}
+	else {
+	    warn "Failed to add service: " . Win32::FormatMessage(
+		Win32::Daemon::GetLastError()
+	    ) . "\n";
+	}
+	exit;
+    }
+    elsif ($ARGV[0] eq '--service') {
+	require Win32::Daemon;
+
+	my $PrevState = Win32::Daemon::SERVICE_START_PENDING();
+	Win32::Daemon::StartService() or die $^E;
+
+	while ( 1 ) {
+	    my $State = Win32::Daemon::State();
+	    last if $State == Win32::Daemon::SERVICE_STOPPED();
+	    
+	    if ( $State == Win32::Daemon::SERVICE_START_PENDING() ) {
+		$runsvc->();
+		Win32::Daemon::State( Win32::Daemon::SERVICE_RUNNING() );
+		$PrevState = Win32::Daemon::SERVICE_RUNNING();
+	    }
+	    elsif ( $State == Win32::Daemon::SERVICE_CONTINUE_PENDING() ) {
+		$ProcessObj->Resume;
+		Win32::Daemon::State( Win32::Daemon::SERVICE_RUNNING() );
+		$PrevState = Win32::Daemon::SERVICE_RUNNING();
+	    }
+	    elsif ( $State == Win32::Daemon::SERVICE_STOP_PENDING() ) {
+	    $ProcessObj->Kill(0);
+		Win32::Daemon::State( Win32::Daemon::SERVICE_STOPPED() );
+		$PrevState = Win32::Daemon::SERVICE_STOPPED();
+	    }
+	    elsif ( $State == Win32::Daemon::SERVICE_RUNNING() ) {
+		my $Message = Win32::Daemon::QueryLastMessage(1);
+		if ( $Message == Win32::Daemon::SERVICE_CONTROL_INTERROGATE() ) {
+		    Win32::Daemon::State( $PrevState );
+		}
+		elsif ( $Message == Win32::Daemon::SERVICE_CONTROL_SHUTDOWN() ) {
+		    Win32::Daemon::State( Win32::Daemon::SERVICE_STOP_PENDING(), 15000 );
+		}
+		elsif ( $Message != Win32::Daemon::SERVICE_CONTROL_NONE() ) {
+		    Win32::Daemon::State( $PrevState );
+		}
+	    }
+	    
+	    Win32::Sleep( 1000 );
+	}
+		
+	Win32::Daemon::StopService();
+	exit;
+    }
+    elsif ($ARGV[0] eq '--help') {
+	system("perldoc $0");
+	exit;
+    }
+    elsif ($ARGV[0] ne '--run') {
+	$SIG{__DIE__} = sub { $ProcessObj->Kill(0) if $ProcessObj };
+	$runsvc->();
+	warn "RT FastCGI Handler launched. Press [Enter] to terminate...\n";
+	<STDIN>;
+	exit;
+    }
+}
+
+###############################################################################
+
+warn "Begin listening on $ENV{'FCGI_SOCKET_PATH'}\n";
+
+require CGI::Fast;
+my $h = &RT::Interface::Web::NewCGIHandler();
+
+RT::Init();
+
+# Response loop
+while( my $cgi = CGI::Fast->new ) {
+    my $comp = $ENV{'PATH_INFO'};
+
+    $comp = $1 if ($comp =~ /^(.*)$/);
+    $comp =~ s|^$RT::WebPath\b||i;
+    $comp .= "index.html" if ($comp =~ /\/$/);
+    $comp =~ s/.pl$/.html/g;
+    
+    warn "Serving $comp\n";
+
+    $h->handle_cgi($comp);
+    # _should_ always be tied
+}
+
+1;
+
+=head1 AUTHORS
+
+Autrijus Tang E<lt>autrijus@autrijus.orgE<gt>
+
+=head1 COPYRIGHT
+
+Copyright 2002 by Autrijus Tang E<lt>autrijus@autrijus.orgE<gt>.
+
+This program is free software; you can redistribute it and/or 
+modify it under the same terms as Perl itself.
+
+See L<http://www.perl.com/perl/misc/Artistic.html>
+
+=cut
diff --git a/rt/bin/rt-commit-handler b/rt/bin/rt-commit-handler
new file mode 100644
index 000000000..29e443ebd
--- /dev/null
+++ b/rt/bin/rt-commit-handler
@@ -0,0 +1,846 @@
+#!/usr/bin/perl -w
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+# {{{ Docs
+# -*-Perl-*-
+#
+#ident	"@(#)ccvs/contrib:$Name:  $:$Id: rt-commit-handler,v 1.1 2003-07-15 13:16:15 ivan Exp $"
+#
+# Perl filter to handle the log messages from the checkin of files in multiple
+# directories.  This script will group the lists of files by log message, and
+# send one piece of mail per unique message, no matter how many files are
+# committed.
+
+=head1 NAME rt-commit-handler
+
+=head1 USAGE
+
+
+
+=head2 Regular use
+
+Stick the following in in CVSROOT/commitinfo
+
+ ALL     /opt/rt3/bin/rt-commit-handler --record-last-dir
+
+Stick the following  in CVSROOT/loginfo
+
+ ALL     /opt/rt3/bin/rt-commit-handler --cvs-root /pathtocvs/root --rt %{Vvts}
+
+=head2 Invocation (advanced use)
+
+rt-commit-handler --cvs-root /path/to/cvs/root [-d] [-D] [-r] [-M module] \
+                [[-m mailto] ...] [[-R replyto] ...] [-f logfile] 
+
+
+  	-d		- turn on debugging
+  	-m mailto	- send mail to "mailto" (multiple)
+  	-R replyto	- set the "Reply-To:" to "replyto" (multiple)
+  	-M modulename	- set module name to "modulename"
+  	-f logfile	- write commit messages to logfile too
+  	-D		- generate diff commands
+        --rt              - invoke RT commit handler
+        --cvs-root       - specify your CVS root 
+
+        --record-last-dir -  Record the last directory with changes in
+                             pre-commit (commitinfo) mode
+
+
+=cut
+
+# }}}
+
+use strict;
+use Carp;
+use Getopt::Long;
+use Text::Wrap;
+use Digest::MD5;
+use MIME::Entity;
+
+use lib ("/opt/rt3/lib", "/opt/rt3/local/lib");
+
+use RT::Interface::CLI qw(CleanEnv GetCurrentUser GetMessageContent loc);
+
+use vars
+  qw(@MAILER $TMPDIR $FILE_PREFIX $LASTDIR_FILE $HASH_FILE $VERSION_FILE             $MESSAGE_FILE $MAIL_FILE $DEBUG $MAILTO $REPLYTO $id $MODULE_NAME
+  $LOGIN $COMMITLOG $CVS_ROOT $RT_HANDLER);
+
+#Clean out all the nasties from the environment
+CleanEnv();
+
+#Load etc/config.pm and drop privs
+RT::LoadConfig();
+
+#Drop setgid permissions
+RT::DropSetGIDPermissions();
+
+# {{{ Variable setup
+$TMPDIR      = '/tmp';
+$FILE_PREFIX = $TMPDIR . '/#cvs.';
+
+# The root of your CVS install. we should get this from some smarter place.
+# It needs a trailing /
+
+$LASTDIR_FILE = $FILE_PREFIX . "lastdir";
+$HASH_FILE    = $FILE_PREFIX . "hash";
+$VERSION_FILE = $FILE_PREFIX . "version";
+$MESSAGE_FILE = $FILE_PREFIX . "message";
+$MAIL_FILE    = $FILE_PREFIX . "mail";
+
+$DEBUG      = 0;
+$RT_HANDLER = 1;
+
+$MAILTO = '';
+
+my @files = ();
+my (@log_lines);
+my $do_diff = 0;
+my $id      = getpgrp();    # note, you *must* use a shell which does setpgrp()
+$LOGIN = getpwuid($<);
+
+# }}}
+
+die "User could not be found" unless ($LOGIN);
+
+# {{{ parse command line arguments (file list is seen as one arg)
+#
+while ( my $arg = shift @ARGV ) {
+
+    if ( $arg eq '-d' ) {
+        $DEBUG = 1;
+        warn "Debug turned on...\n";
+    }
+    elsif ( $arg =~ /^--record-last-dir$/i ) {
+        record_last_dir( $id, $ARGV[0] );
+        exit(0);
+    }
+    elsif ( $arg eq '-m' ) {
+        $MAILTO .= ", " if $MAILTO;
+        $MAILTO .= shift @ARGV;
+    }
+    elsif ( $arg eq '--rt' ) {
+        $RT_HANDLER = 1;
+    }
+    elsif ( $arg eq '-R' ) {
+        $REPLYTO .= ", " if $REPLYTO;
+        $REPLYTO .= shift @ARGV;
+    }
+    elsif ( $arg eq '-M' ) {
+        die ("too many '-M' args\n") if $MODULE_NAME;
+        $MODULE_NAME = shift @ARGV;
+    }
+    elsif ( $arg eq '--cvs-root' ) {
+        $CVS_ROOT = shift @ARGV;
+        $CVS_ROOT .= "/" unless ( $CVS_ROOT =~ /\/$/ );
+    }
+    elsif ( $arg eq '-f' ) {
+        die ("too many '-f' args\n") if $COMMITLOG;
+        $COMMITLOG = shift @ARGV;
+
+        # This is a disgusting hack to untaint $COMMITLOG if we're running from
+        # setgid cvs.
+        $COMMITLOG = untaint($COMMITLOG);
+    }
+    elsif ( $arg eq '-D' ) {
+        $do_diff = 1;
+    }
+    else {
+        @files = split ( ' ', $arg );
+        last;
+    }
+}
+
+# }}}
+
+$REPLYTO = $LOGIN unless ($REPLYTO);
+
+# for now, the first "file" is the repository directory being committed,
+# relative to the $CVSROOT location
+#
+my $dir = shift @files;
+
+# XXX there are some ugly assumptions in here about module names and
+# XXX directories relative to the $CVSROOT location -- really should
+# XXX read $CVSROOT/CVSROOT/modules, but that's not so easy to do, since
+# XXX we have to parse it backwards.
+#
+# XXX For now we set the `module' name to the top-level directory name.
+#
+unless ($MODULE_NAME) {
+    ($MODULE_NAME) = split ( '/', $dir, 2 );
+}
+
+if ($DEBUG) {
+    warn "module - ", $MODULE_NAME, "\n";
+    warn "dir    - ", $dir,         "\n";
+    warn "files  - ", join ( " ", @files ), "\n";
+    warn "id     - ", $id, "\n";
+}
+
+# {{{ Check for a new directory or an import command.
+
+#
+#    files[0] - "-"
+#    files[1] - "New"
+#    files[2] - "directory"
+#
+#    files[0] - "-"
+#    files[1] - "Imported"
+#    files[2] - "sources"
+#
+if ( $files[0] eq "-" ) {
+
+    #we just don't care about  New Directory notes
+    unless ( $files[1] eq "New" && $files[2] eq "directory" ) {
+
+        my @text = ();
+
+        push @text, build_header();
+        push @text, "";
+
+        while ( my $line = <STDIN> ) {
+            chop $line;    # Drop the newline
+            push @text, $line;
+        }
+
+        append_logfile( $COMMITLOG, @text ) if ($COMMITLOG);
+
+        mail_notification( $id, @text );
+    }
+
+    exit 0;
+}
+
+# }}}
+
+# {{{ Collect just the log message from stdin.
+#
+
+while ( my $line = <STDIN> ) {
+    chop $line;    # strip the newline
+    last if ( $line =~ /^Log Message:$/ );
+}
+while ( my $line = <STDIN> ) {
+    chop $line;    # strip the newline
+    $line =~ s/\s+$//;    # strip trailing white space
+    push @log_lines, $line;
+}
+
+my $md5 = Digest::MD5->new();
+foreach my $line (@log_lines) {
+    $md5->add( $line . "\n" );
+}
+my $hash = $md5->hexdigest();
+
+warn "hash = $hash\n" if ($DEBUG);
+
+if ( !-e "$MESSAGE_FILE.$id.$hash" ) {
+    append_logfile( "$HASH_FILE.$id",      $hash );
+    write_file( "$MESSAGE_FILE.$id.$hash", @log_lines );
+}
+
+# }}}
+
+# Spit out the information gathered in this pass.
+
+append_logfile( "$VERSION_FILE.$id.$hash", $dir . '/', @files );
+
+# {{{ Check whether this is the last directory.  If not, quit.
+
+warn "Checking current dir against last dir $LASTDIR_FILE.$id\n" if ($DEBUG);
+
+my @last_dir = read_file("$LASTDIR_FILE.$id");
+
+unless ($CVS_ROOT) {
+    die "No cvs root specified with --cvs-root. Can't continue.";
+}
+
+if ( $last_dir[0] ne $CVS_ROOT . $dir ) {
+    warn "Current directory $CVS_ROOT$dir is not last directory $last_dir[0].\n"
+      if ($DEBUG);
+    exit 0;
+}
+
+# }}}
+
+# {{{ End Of Commits!
+#
+
+# This is it.  The commits are all finished.  Lump everything together
+# into a single message, fire a copy off to the mailing list, and drop
+# it on the end of the Changes file.
+#
+
+#
+# Produce the final compilation of the log messages
+#
+
+my @hashes = read_file("$HASH_FILE.$id");
+my (@text);
+
+push @text, build_header();
+push @text, "";
+
+my ( @added_files, @modified_files, @removed_files );
+
+foreach my $hash (@hashes) {
+
+    # In case we're running setgid, make sure the hash file hasn't been hacked.
+    $hash =~ m/([a-z0-9]*)/ || die "*** Hacking attempt detected\n";
+    $hash = $1;
+
+    my @files     = read_file("$VERSION_FILE.$id.$hash");
+    my @log_lines = read_file("$MESSAGE_FILE.$id.$hash");
+
+    my $working_on_dir;    # gets set as we iterate through the files.
+    foreach my $file (@files) {
+
+        #If we've entered a new directory, make a note of that and remove the trailing /
+
+        if ( $file =~ s'\/$'' ) {
+            $working_on_dir = $file;
+            next;
+        }
+
+        my @file_entry = ( split ( ',', $file, 4 ), $working_on_dir );
+
+        # file_entry looks like ths:
+
+        # 0        1          2      3        4
+        # Old rev : new rev : tag:   file    :directory	
+        my $entry = {};
+        $entry->{'old'}  = $file_entry[0];
+        $entry->{'new'}  = $file_entry[1];
+        $entry->{'tag'}  = $file_entry[2];
+        $entry->{'file'} = $file_entry[3];
+        $entry->{'dir'}  = $file_entry[4];
+
+        if ( $file_entry[0] eq 'NONE' ) {
+            $entry->{'old'} = '0';
+            push @added_files, $entry;
+        }
+        elsif ( $file_entry[1] eq 'NONE' ) {
+            $entry->{'new'} = '0';
+            push @removed_files, $entry;
+        }
+        else {
+            push @modified_files, $entry;
+        }
+    }
+}
+
+# }}}
+
+# {{{ start building up the body
+
+# Strip leading and trailing blank lines from the log message.  Also
+# compress multiple blank lines in the body of the message down to a
+# single blank line.
+#
+
+my $blank = 1;
+@log_lines = map {
+    my $wasblank = $blank;
+    $blank = $_ eq '';
+    $blank && $wasblank ? () : $_;
+} @log_lines;
+
+pop @log_lines if $blank;
+
+@modified_files = order_and_summarize_diffs(@modified_files);
+@added_files    = order_and_summarize_diffs(@added_files);
+@removed_files  = order_and_summarize_diffs(@removed_files);
+
+push @text, "Modified Files:", format_lists(@modified_files)
+  if (@modified_files);
+
+push @text, "Added Files:", format_lists(@added_files) if (@added_files);
+
+push @text, "Removed Files:", format_lists(@removed_files) if (@removed_files);
+
+push @text, "", "Log Message", @log_lines if (@log_lines);
+
+push @text, "";
+
+if ($RT_HANDLER) {
+    rt_handler(
+        @log_lines,                             "\n",
+        loc("To generate a diff of this commit:\n"), "\n",
+        format_diffs( @modified_files, @added_files, @removed_files )
+    );
+}
+
+if ($COMMITLOG) {
+    append_logfile( $COMMITLOG, @text );
+}
+
+if ($do_diff) {
+    push @text, "";
+    push @text, loc("To generate a diff of this commit:");
+    push @text, format_diffs( @modified_files, @added_files, @removed_files );
+    push @text, "";
+}
+
+# }}}
+
+# {{{ Mail out the notification.
+
+mail_notification( $id, @text );
+
+# }}} 
+
+# {{{ clean up
+
+unless ($DEBUG) {
+    $hash = untaint($hash);
+    $id   = untaint($id);
+    unlink "$VERSION_FILE.$id.$hash";
+    unlink "$MESSAGE_FILE.$id.$hash";
+    unlink "$MAIL_FILE.$id";
+    unlink "$LASTDIR_FILE.$id";
+    unlink "$HASH_FILE.$id";
+}
+
+# }}}
+
+exit 0;
+
+# {{{ Subroutines
+#
+
+# {{{ append_logfile
+sub append_logfile {
+    my $filename = shift;
+    my (@lines) = @_;
+
+    $filename = untaint($filename);
+
+    open( FILE, ">>$filename" )
+      || die ("Cannot open file $filename for append.\n");
+    foreach my $line (@lines) {
+        print FILE $line . "\n";
+    }
+    close(FILE);
+}
+
+# }}}
+
+# {{{ write_file
+sub write_file {
+    my $filename = shift;
+    my (@lines) = @_;
+
+    $filename = untaint($filename);
+
+    open( FILE, ">$filename" )
+      || die ("Cannot open file $filename for write.\n");
+    foreach my $line (@lines) {
+        print FILE $line . "\n";
+    }
+    close(FILE);
+}
+
+# }}}
+
+# {{{ read_file
+sub read_file {
+    my $filename = shift;
+    my (@lines);
+
+    open( FILE, "<$filename" )
+      || die ("Cannot open file $filename for read.\n");
+    while ( my $line = <FILE> ) {
+        chop $line;
+        push @lines, $line;
+    }
+    close(FILE);
+
+    return (@lines);
+}
+
+# }}}
+
+# {{{ sub format_lists
+
+sub format_lists {
+    my @items = (@_);
+
+    my $files = "";
+    map {
+        $_->{'files'} && ( $files .= ' ' . join ( ' ', @{ $_->{'files'} } ) );
+    } @items;
+
+    my @lines = wrap( "\t", "\t\t", $files );
+    return (@lines);
+
+}
+
+# }}}
+
+# {{{ sub format_diffs
+
+sub format_diffs {
+    my @items = (@_);
+
+    my @lines;
+    foreach my $item (@items) {
+        next unless ( $item->{'files'} );
+        push ( @lines,
+            "cvs diff -r"
+              . $item->{'old'} . " -r"
+              . $item->{'new'} . " "
+              . join ( " ", @{ $item->{'files'} } ) . "\n" );
+
+    }
+
+    @lines = fill( "\t", "\t\t", @lines );
+
+    return (@lines);
+}
+
+# }}}
+
+# {{{ sub order_and_summarize_diffs {
+
+# takes an array of file items
+# returns a sorted array of fileset items, which are like file items, except they can have an array of files, rather than 
+# a singleton file.
+
+sub order_and_summarize_diffs {
+
+    my @files = (@_);
+
+    # Sort by tag, dir, file.
+    @files = sort {
+        $a->{'tag'} cmp $b->{'tag'}
+          || $a->{'dir'} cmp $b->{'dir'}
+          || $a->{'file'} cmp $b->{'file'};
+    } @files;
+
+    # Combine adjacent rows that are the same modulo the file name.
+
+    my @items = (undef);
+
+    foreach my $file (@files) {
+        if ( $#items == -1    #if it's empty
+            || ( !defined $items[-1]->{'old'}
+                || $items[-1]->{'old'} ne $file->{'old'} )
+            || ( !defined $items[-1]->{'new'}
+                || $items[-1]->{'new'} ne $file->{'new'} )
+            || ( !defined $items[-1]->{'tag'}
+                || $items[-1]->{'tag'} ne $file->{'tag'} ) )
+        {
+
+            push ( @items, $file );
+        }
+        push ( @{ $items[-1]->{'files'} },
+            $file->{'dir'} . "/" . $file->{'file'} );
+    }
+
+    return (@items);
+}
+
+# }}}
+
+# {{{ build_header
+
+sub build_header {
+    my $now    = gmtime;
+    my $header =
+      sprintf( "Module Name:\t%s\nCommitted By:\t%s\nDate:\t\t%s %s %s",
+        $MODULE_NAME, $LOGIN, substr( $now, 0, 19 ), "UTC",
+        substr( $now, 20, 4 ) );
+    return ($header);
+}
+
+# }}}
+
+# {{{ mail_notification
+sub mail_notification {
+    my $id = shift;
+    my (@text) = @_;
+    write_file( "$MAIL_FILE.$id", "From: " . $LOGIN,
+        "Subject: CVS commit: " . $MODULE_NAME, "To: " . $MAILTO,
+        "Reply-To: " . $REPLYTO,                "", "", @text );
+
+    my $entity = MIME::Entity->build(
+        From       => $LOGIN,
+        To         => $MAILTO,
+        Subject    => "CVS commit: " . $MODULE_NAME,
+        'Reply-To' => $REPLYTO,
+        Data       => join ( "\n", @text )
+    );
+    if ( $RT::MailCommand eq 'sendmailpipe' ) {
+        open( MAIL, "|$RT::SendmailPath $RT::SendmailArguments" )
+          || die "Couldn't send mail: " . $@ . "\n";
+        print MAIL $entity->as_string;
+        close(MAIL);
+    }
+    else {
+        $entity->send( $RT::MailCommand, $RT::MailParams );
+    }
+
+}
+
+# }}}
+
+# {{{ sub record_last_dir
+
+sub record_last_dir {
+    my $id  = shift;
+    my $dir = shift;
+
+    # make a note of this directory. later, we'll use this to 
+    # figure out if we've gone through the whole commit,
+    # for something that is a bad mockery of attomic commits.
+
+    warn "about to write $dir to $LASTDIR_FILE.$id" if ($DEBUG);
+
+    write_file( "$LASTDIR_FILE.$id", $dir );
+}
+
+# }}}
+
+# {{{ Get the RT stuff set up
+
+# {{{ sub rt_handler 
+
+sub rt_handler {
+    my (@LogMessage) = (@_);
+
+    #Connect to the database and get RT::SystemUser and RT::Nobody loaded
+    RT::Init;
+
+    require RT::Ticket;
+
+    #Get the current user all loaded
+    my $CurrentUser = GetCurrentUser();
+
+    if ( !$CurrentUser->Id ) {
+        print
+loc("No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\n");
+        return;
+    }
+
+    my (@commands) = find_commands( \@LogMessage );
+
+    my ( @tickets, @errors );
+
+    # Get the list of tickets we're working with out of commands
+    grep { $_ =~ /^RT-Ticket:\s*(.*?)$/i && push ( @tickets, $1 ) } @commands;
+
+    my $message = new MIME::Entity;
+    $message->build(
+        From    => $CurrentUser->EmailAddress,
+        Subject => 'CVS Commit',
+        Data    => \@LogMessage
+    );
+
+    # {{{ comment or correspond, as needed
+
+    foreach my $ticket (@tickets) {
+        my $TicketObj = RT::Ticket->new($CurrentUser);
+        $TicketObj->Load($ticket);
+        my ( $id, $msg );
+        unless ( $TicketObj->Id ) {
+            push ( @errors,
+"Couldn't load ticket #$ticket. Not adding commit log to ticket history.\n"
+            );
+        }
+
+        if ( $LogMessage[0] =~ /^(comment|private)$/ ) {
+            ( $id, $msg ) = $TicketObj->Comment( MIMEObj => $message );
+
+        }
+        else {
+            ( $id, $msg ) = $TicketObj->Correspond( MIMEObj => $message );
+        }
+
+        push ( @errors, ">> Log message",
+            "Ticket #" . $TicketObj->Id . ": " . $msg );
+
+    }
+
+    # }}}
+
+    my ($reply) = ActOnPseudoHeaders( $CurrentUser, @commands );
+    print "$reply\n" if ($reply);
+    print join ( "\n", @errors );
+    print "\n";
+
+}
+
+# }}}
+
+# {{{ sub find_commands
+
+sub find_commands {
+    my $lines = shift;
+    my (@pseudoheaders);
+
+    while ( my $line = shift @{$lines} ) {
+        next if $line =~ /^\s*?$/;
+        if ( $line =~ /^RT-/i ) {
+
+            push ( @pseudoheaders, $line );
+        }
+
+        #If we find a line that's not a command, get out.
+        else {
+            unshift ( @{$lines}, $line );
+            last;
+        }
+    }
+
+    return (@pseudoheaders);
+
+}
+
+# }}}
+
+# {{{ sub ActOnPseudoHeaders
+
+=item ActOnPseudoHeaders $PseudoHeaders
+
+Takes a string of pseudo-headers, iterates through them and does what they tell it to.
+
+=cut
+
+sub ActOnPseudoHeaders {
+    my $CurrentUser = shift;
+    my (@actions) = (@_);
+
+    my $ResultsMessage = '';
+    my $Ticket         = RT::Ticket->new($CurrentUser);
+
+    foreach my $action (@actions) {
+        my ($val);
+        my $msg = '';
+
+        $ResultsMessage .= ">>> $action\n";
+
+        if ( $action =~ /^RT-(.*?):\s*(.*)$/i ) {
+            my $command = $1;
+            my $args    = $2;
+
+            if ( $command =~ /^ticket$/i ) {
+
+                $val = $Ticket->Load($args);
+                unless ($val) {
+                    $ResultsMessage .=
+                      loc("ERROR: Couldn't load ticket '[_1]': [_2].\n", $1, $msg);
+                      . loc("Aborting to avoid unintended ticket modifications.\n")
+                      . loc("The following commands were not proccessed:\n\n")
+                      . join ( "\n", @actions );
+                    return ($ResultsMessage);
+                }
+                $ResultsMessage .= loc("Ticket [_1] loaded\n", $Ticket->Id);
+            }
+            else {
+                unless ( $Ticket->Id ) {
+                    $ResultsMessage .= loc("No Ticket specified. Aborting ticket ")
+                      . loc("modifications\n\n")
+                      . loc("The following commands were not proccessed:\n\n")
+                      . join ( "\n", @actions );
+                    return ($ResultsMessage);
+                }
+
+                # Deal with the basics
+                if ( $command =~ /^(Subject|Owner|Status|Queue)$/i ) {
+                    my $method = 'Set' . ucfirst( lc($1) );
+                    ( $val, $msg ) = $Ticket->$method($args);
+                }
+
+                # Deal with the dates
+                elsif ( $command =~ /^(due|starts|started|resolved)$/i ) {
+                    my $method = 'Set' . ucfirst( lc($1) );
+                    my $date   = new RT::Date($CurrentUser);
+                    $date->Set( Format => 'unknown', Value => $args );
+                    ( $val, $msg ) = $Ticket->$method( $date->ISO );
+                }
+
+                # Deal with the watchers
+                elsif ( $command =~ /^(requestor|requestors|cc|admincc)$/i ) {
+                    my $operator = "+";
+                    my ($type);
+                    if ( $args =~ /^(\+|\-)(.*)$/ ) {
+                        $operator = $1;
+                        $args     = $2;
+                    }
+                    $type = 'Requestor' if ( $command =~ /^requestor/i );
+                    $type = 'Cc'        if ( $command =~ /^cc/i );
+                    $type = 'AdminCc'   if ( $command =~ /^admincc/i );
+
+                       my $user = RT::User->new($CurrentUser);
+                    $user->Load($args);
+
+                    if ($operator eq '+') {
+                        ($val, $msg) = $Ticket->AddWatcher( Type => $type,
+                                                            PrincipalId => $user->PrincipalId);
+                    } elsif ($operator eq '-') {
+                        ($val, $msg) = $Ticket->DeleteWatcher( Type => $type,
+                                                               PrincipalId => $user->PrincipalId);
+                    }
+
+            }
+            $ResultsMessage .= $msg . "\n";
+        }
+
+    }
+    return ($ResultsMessage);
+
+}
+
+# }}}
+
+# {{{ sub untaint 
+sub untaint {
+    my $val = shift;
+
+    if ( $val =~ /^([-\#\/\w.]+)$/ ) {
+        $val = $1;    # $data now untainted
+    }
+    else {
+        die loc("Bad data in [_1]", $val);    # log this somewhere
+    }
+    return ($val);
+}
+
+# }}}
+
+=head1 AUTHOR
+
+
+
+  rt-commit-handler is a rewritten version of the NetBSD commit handler,
+  which was placed in the public domain by Charles Hannum. It bore the following
+  authors statement:
+
+ Contributed by David Hampton <hampton@cisco.com>
+ Hacked greatly by Greg A. Woods <woods@planix.com>
+ Rewritten by Charles M. Hannum <mycroft@netbsd.org>
+
+=cut
+
diff --git a/rt/bin/rt-commit-handler.in b/rt/bin/rt-commit-handler.in
new file mode 100644
index 000000000..02b01abff
--- /dev/null
+++ b/rt/bin/rt-commit-handler.in
@@ -0,0 +1,846 @@
+#!@PERL@ -w
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+# {{{ Docs
+# -*-Perl-*-
+#
+#ident	"@(#)ccvs/contrib:$Name:  $:$Id: rt-commit-handler.in,v 1.1 2003-07-15 13:16:15 ivan Exp $"
+#
+# Perl filter to handle the log messages from the checkin of files in multiple
+# directories.  This script will group the lists of files by log message, and
+# send one piece of mail per unique message, no matter how many files are
+# committed.
+
+=head1 NAME rt-commit-handler
+
+=head1 USAGE
+
+
+
+=head2 Regular use
+
+Stick the following in in CVSROOT/commitinfo
+
+ ALL     @RT_BIN_PATH@/rt-commit-handler --record-last-dir
+
+Stick the following  in CVSROOT/loginfo
+
+ ALL     @RT_BIN_PATH@/rt-commit-handler --cvs-root /pathtocvs/root --rt %{Vvts}
+
+=head2 Invocation (advanced use)
+
+rt-commit-handler --cvs-root /path/to/cvs/root [-d] [-D] [-r] [-M module] \
+                [[-m mailto] ...] [[-R replyto] ...] [-f logfile] 
+
+
+  	-d		- turn on debugging
+  	-m mailto	- send mail to "mailto" (multiple)
+  	-R replyto	- set the "Reply-To:" to "replyto" (multiple)
+  	-M modulename	- set module name to "modulename"
+  	-f logfile	- write commit messages to logfile too
+  	-D		- generate diff commands
+        --rt              - invoke RT commit handler
+        --cvs-root       - specify your CVS root 
+
+        --record-last-dir -  Record the last directory with changes in
+                             pre-commit (commitinfo) mode
+
+
+=cut
+
+# }}}
+
+use strict;
+use Carp;
+use Getopt::Long;
+use Text::Wrap;
+use Digest::MD5;
+use MIME::Entity;
+
+use lib ("@RT_LIB_PATH@", "@LOCAL_LIB_PATH@");
+
+use RT::Interface::CLI qw(CleanEnv GetCurrentUser GetMessageContent loc);
+
+use vars
+  qw(@MAILER $TMPDIR $FILE_PREFIX $LASTDIR_FILE $HASH_FILE $VERSION_FILE             $MESSAGE_FILE $MAIL_FILE $DEBUG $MAILTO $REPLYTO $id $MODULE_NAME
+  $LOGIN $COMMITLOG $CVS_ROOT $RT_HANDLER);
+
+#Clean out all the nasties from the environment
+CleanEnv();
+
+#Load etc/config.pm and drop privs
+RT::LoadConfig();
+
+#Drop setgid permissions
+RT::DropSetGIDPermissions();
+
+# {{{ Variable setup
+$TMPDIR      = '/tmp';
+$FILE_PREFIX = $TMPDIR . '/#cvs.';
+
+# The root of your CVS install. we should get this from some smarter place.
+# It needs a trailing /
+
+$LASTDIR_FILE = $FILE_PREFIX . "lastdir";
+$HASH_FILE    = $FILE_PREFIX . "hash";
+$VERSION_FILE = $FILE_PREFIX . "version";
+$MESSAGE_FILE = $FILE_PREFIX . "message";
+$MAIL_FILE    = $FILE_PREFIX . "mail";
+
+$DEBUG      = 0;
+$RT_HANDLER = 1;
+
+$MAILTO = '';
+
+my @files = ();
+my (@log_lines);
+my $do_diff = 0;
+my $id      = getpgrp();    # note, you *must* use a shell which does setpgrp()
+$LOGIN = getpwuid($<);
+
+# }}}
+
+die "User could not be found" unless ($LOGIN);
+
+# {{{ parse command line arguments (file list is seen as one arg)
+#
+while ( my $arg = shift @ARGV ) {
+
+    if ( $arg eq '-d' ) {
+        $DEBUG = 1;
+        warn "Debug turned on...\n";
+    }
+    elsif ( $arg =~ /^--record-last-dir$/i ) {
+        record_last_dir( $id, $ARGV[0] );
+        exit(0);
+    }
+    elsif ( $arg eq '-m' ) {
+        $MAILTO .= ", " if $MAILTO;
+        $MAILTO .= shift @ARGV;
+    }
+    elsif ( $arg eq '--rt' ) {
+        $RT_HANDLER = 1;
+    }
+    elsif ( $arg eq '-R' ) {
+        $REPLYTO .= ", " if $REPLYTO;
+        $REPLYTO .= shift @ARGV;
+    }
+    elsif ( $arg eq '-M' ) {
+        die ("too many '-M' args\n") if $MODULE_NAME;
+        $MODULE_NAME = shift @ARGV;
+    }
+    elsif ( $arg eq '--cvs-root' ) {
+        $CVS_ROOT = shift @ARGV;
+        $CVS_ROOT .= "/" unless ( $CVS_ROOT =~ /\/$/ );
+    }
+    elsif ( $arg eq '-f' ) {
+        die ("too many '-f' args\n") if $COMMITLOG;
+        $COMMITLOG = shift @ARGV;
+
+        # This is a disgusting hack to untaint $COMMITLOG if we're running from
+        # setgid cvs.
+        $COMMITLOG = untaint($COMMITLOG);
+    }
+    elsif ( $arg eq '-D' ) {
+        $do_diff = 1;
+    }
+    else {
+        @files = split ( ' ', $arg );
+        last;
+    }
+}
+
+# }}}
+
+$REPLYTO = $LOGIN unless ($REPLYTO);
+
+# for now, the first "file" is the repository directory being committed,
+# relative to the $CVSROOT location
+#
+my $dir = shift @files;
+
+# XXX there are some ugly assumptions in here about module names and
+# XXX directories relative to the $CVSROOT location -- really should
+# XXX read $CVSROOT/CVSROOT/modules, but that's not so easy to do, since
+# XXX we have to parse it backwards.
+#
+# XXX For now we set the `module' name to the top-level directory name.
+#
+unless ($MODULE_NAME) {
+    ($MODULE_NAME) = split ( '/', $dir, 2 );
+}
+
+if ($DEBUG) {
+    warn "module - ", $MODULE_NAME, "\n";
+    warn "dir    - ", $dir,         "\n";
+    warn "files  - ", join ( " ", @files ), "\n";
+    warn "id     - ", $id, "\n";
+}
+
+# {{{ Check for a new directory or an import command.
+
+#
+#    files[0] - "-"
+#    files[1] - "New"
+#    files[2] - "directory"
+#
+#    files[0] - "-"
+#    files[1] - "Imported"
+#    files[2] - "sources"
+#
+if ( $files[0] eq "-" ) {
+
+    #we just don't care about  New Directory notes
+    unless ( $files[1] eq "New" && $files[2] eq "directory" ) {
+
+        my @text = ();
+
+        push @text, build_header();
+        push @text, "";
+
+        while ( my $line = <STDIN> ) {
+            chop $line;    # Drop the newline
+            push @text, $line;
+        }
+
+        append_logfile( $COMMITLOG, @text ) if ($COMMITLOG);
+
+        mail_notification( $id, @text );
+    }
+
+    exit 0;
+}
+
+# }}}
+
+# {{{ Collect just the log message from stdin.
+#
+
+while ( my $line = <STDIN> ) {
+    chop $line;    # strip the newline
+    last if ( $line =~ /^Log Message:$/ );
+}
+while ( my $line = <STDIN> ) {
+    chop $line;    # strip the newline
+    $line =~ s/\s+$//;    # strip trailing white space
+    push @log_lines, $line;
+}
+
+my $md5 = Digest::MD5->new();
+foreach my $line (@log_lines) {
+    $md5->add( $line . "\n" );
+}
+my $hash = $md5->hexdigest();
+
+warn "hash = $hash\n" if ($DEBUG);
+
+if ( !-e "$MESSAGE_FILE.$id.$hash" ) {
+    append_logfile( "$HASH_FILE.$id",      $hash );
+    write_file( "$MESSAGE_FILE.$id.$hash", @log_lines );
+}
+
+# }}}
+
+# Spit out the information gathered in this pass.
+
+append_logfile( "$VERSION_FILE.$id.$hash", $dir . '/', @files );
+
+# {{{ Check whether this is the last directory.  If not, quit.
+
+warn "Checking current dir against last dir $LASTDIR_FILE.$id\n" if ($DEBUG);
+
+my @last_dir = read_file("$LASTDIR_FILE.$id");
+
+unless ($CVS_ROOT) {
+    die "No cvs root specified with --cvs-root. Can't continue.";
+}
+
+if ( $last_dir[0] ne $CVS_ROOT . $dir ) {
+    warn "Current directory $CVS_ROOT$dir is not last directory $last_dir[0].\n"
+      if ($DEBUG);
+    exit 0;
+}
+
+# }}}
+
+# {{{ End Of Commits!
+#
+
+# This is it.  The commits are all finished.  Lump everything together
+# into a single message, fire a copy off to the mailing list, and drop
+# it on the end of the Changes file.
+#
+
+#
+# Produce the final compilation of the log messages
+#
+
+my @hashes = read_file("$HASH_FILE.$id");
+my (@text);
+
+push @text, build_header();
+push @text, "";
+
+my ( @added_files, @modified_files, @removed_files );
+
+foreach my $hash (@hashes) {
+
+    # In case we're running setgid, make sure the hash file hasn't been hacked.
+    $hash =~ m/([a-z0-9]*)/ || die "*** Hacking attempt detected\n";
+    $hash = $1;
+
+    my @files     = read_file("$VERSION_FILE.$id.$hash");
+    my @log_lines = read_file("$MESSAGE_FILE.$id.$hash");
+
+    my $working_on_dir;    # gets set as we iterate through the files.
+    foreach my $file (@files) {
+
+        #If we've entered a new directory, make a note of that and remove the trailing /
+
+        if ( $file =~ s'\/$'' ) {
+            $working_on_dir = $file;
+            next;
+        }
+
+        my @file_entry = ( split ( ',', $file, 4 ), $working_on_dir );
+
+        # file_entry looks like ths:
+
+        # 0        1          2      3        4
+        # Old rev : new rev : tag:   file    :directory	
+        my $entry = {};
+        $entry->{'old'}  = $file_entry[0];
+        $entry->{'new'}  = $file_entry[1];
+        $entry->{'tag'}  = $file_entry[2];
+        $entry->{'file'} = $file_entry[3];
+        $entry->{'dir'}  = $file_entry[4];
+
+        if ( $file_entry[0] eq 'NONE' ) {
+            $entry->{'old'} = '0';
+            push @added_files, $entry;
+        }
+        elsif ( $file_entry[1] eq 'NONE' ) {
+            $entry->{'new'} = '0';
+            push @removed_files, $entry;
+        }
+        else {
+            push @modified_files, $entry;
+        }
+    }
+}
+
+# }}}
+
+# {{{ start building up the body
+
+# Strip leading and trailing blank lines from the log message.  Also
+# compress multiple blank lines in the body of the message down to a
+# single blank line.
+#
+
+my $blank = 1;
+@log_lines = map {
+    my $wasblank = $blank;
+    $blank = $_ eq '';
+    $blank && $wasblank ? () : $_;
+} @log_lines;
+
+pop @log_lines if $blank;
+
+@modified_files = order_and_summarize_diffs(@modified_files);
+@added_files    = order_and_summarize_diffs(@added_files);
+@removed_files  = order_and_summarize_diffs(@removed_files);
+
+push @text, "Modified Files:", format_lists(@modified_files)
+  if (@modified_files);
+
+push @text, "Added Files:", format_lists(@added_files) if (@added_files);
+
+push @text, "Removed Files:", format_lists(@removed_files) if (@removed_files);
+
+push @text, "", "Log Message", @log_lines if (@log_lines);
+
+push @text, "";
+
+if ($RT_HANDLER) {
+    rt_handler(
+        @log_lines,                             "\n",
+        loc("To generate a diff of this commit:\n"), "\n",
+        format_diffs( @modified_files, @added_files, @removed_files )
+    );
+}
+
+if ($COMMITLOG) {
+    append_logfile( $COMMITLOG, @text );
+}
+
+if ($do_diff) {
+    push @text, "";
+    push @text, loc("To generate a diff of this commit:");
+    push @text, format_diffs( @modified_files, @added_files, @removed_files );
+    push @text, "";
+}
+
+# }}}
+
+# {{{ Mail out the notification.
+
+mail_notification( $id, @text );
+
+# }}} 
+
+# {{{ clean up
+
+unless ($DEBUG) {
+    $hash = untaint($hash);
+    $id   = untaint($id);
+    unlink "$VERSION_FILE.$id.$hash";
+    unlink "$MESSAGE_FILE.$id.$hash";
+    unlink "$MAIL_FILE.$id";
+    unlink "$LASTDIR_FILE.$id";
+    unlink "$HASH_FILE.$id";
+}
+
+# }}}
+
+exit 0;
+
+# {{{ Subroutines
+#
+
+# {{{ append_logfile
+sub append_logfile {
+    my $filename = shift;
+    my (@lines) = @_;
+
+    $filename = untaint($filename);
+
+    open( FILE, ">>$filename" )
+      || die ("Cannot open file $filename for append.\n");
+    foreach my $line (@lines) {
+        print FILE $line . "\n";
+    }
+    close(FILE);
+}
+
+# }}}
+
+# {{{ write_file
+sub write_file {
+    my $filename = shift;
+    my (@lines) = @_;
+
+    $filename = untaint($filename);
+
+    open( FILE, ">$filename" )
+      || die ("Cannot open file $filename for write.\n");
+    foreach my $line (@lines) {
+        print FILE $line . "\n";
+    }
+    close(FILE);
+}
+
+# }}}
+
+# {{{ read_file
+sub read_file {
+    my $filename = shift;
+    my (@lines);
+
+    open( FILE, "<$filename" )
+      || die ("Cannot open file $filename for read.\n");
+    while ( my $line = <FILE> ) {
+        chop $line;
+        push @lines, $line;
+    }
+    close(FILE);
+
+    return (@lines);
+}
+
+# }}}
+
+# {{{ sub format_lists
+
+sub format_lists {
+    my @items = (@_);
+
+    my $files = "";
+    map {
+        $_->{'files'} && ( $files .= ' ' . join ( ' ', @{ $_->{'files'} } ) );
+    } @items;
+
+    my @lines = wrap( "\t", "\t\t", $files );
+    return (@lines);
+
+}
+
+# }}}
+
+# {{{ sub format_diffs
+
+sub format_diffs {
+    my @items = (@_);
+
+    my @lines;
+    foreach my $item (@items) {
+        next unless ( $item->{'files'} );
+        push ( @lines,
+            "cvs diff -r"
+              . $item->{'old'} . " -r"
+              . $item->{'new'} . " "
+              . join ( " ", @{ $item->{'files'} } ) . "\n" );
+
+    }
+
+    @lines = fill( "\t", "\t\t", @lines );
+
+    return (@lines);
+}
+
+# }}}
+
+# {{{ sub order_and_summarize_diffs {
+
+# takes an array of file items
+# returns a sorted array of fileset items, which are like file items, except they can have an array of files, rather than 
+# a singleton file.
+
+sub order_and_summarize_diffs {
+
+    my @files = (@_);
+
+    # Sort by tag, dir, file.
+    @files = sort {
+        $a->{'tag'} cmp $b->{'tag'}
+          || $a->{'dir'} cmp $b->{'dir'}
+          || $a->{'file'} cmp $b->{'file'};
+    } @files;
+
+    # Combine adjacent rows that are the same modulo the file name.
+
+    my @items = (undef);
+
+    foreach my $file (@files) {
+        if ( $#items == -1    #if it's empty
+            || ( !defined $items[-1]->{'old'}
+                || $items[-1]->{'old'} ne $file->{'old'} )
+            || ( !defined $items[-1]->{'new'}
+                || $items[-1]->{'new'} ne $file->{'new'} )
+            || ( !defined $items[-1]->{'tag'}
+                || $items[-1]->{'tag'} ne $file->{'tag'} ) )
+        {
+
+            push ( @items, $file );
+        }
+        push ( @{ $items[-1]->{'files'} },
+            $file->{'dir'} . "/" . $file->{'file'} );
+    }
+
+    return (@items);
+}
+
+# }}}
+
+# {{{ build_header
+
+sub build_header {
+    my $now    = gmtime;
+    my $header =
+      sprintf( "Module Name:\t%s\nCommitted By:\t%s\nDate:\t\t%s %s %s",
+        $MODULE_NAME, $LOGIN, substr( $now, 0, 19 ), "UTC",
+        substr( $now, 20, 4 ) );
+    return ($header);
+}
+
+# }}}
+
+# {{{ mail_notification
+sub mail_notification {
+    my $id = shift;
+    my (@text) = @_;
+    write_file( "$MAIL_FILE.$id", "From: " . $LOGIN,
+        "Subject: CVS commit: " . $MODULE_NAME, "To: " . $MAILTO,
+        "Reply-To: " . $REPLYTO,                "", "", @text );
+
+    my $entity = MIME::Entity->build(
+        From       => $LOGIN,
+        To         => $MAILTO,
+        Subject    => "CVS commit: " . $MODULE_NAME,
+        'Reply-To' => $REPLYTO,
+        Data       => join ( "\n", @text )
+    );
+    if ( $RT::MailCommand eq 'sendmailpipe' ) {
+        open( MAIL, "|$RT::SendmailPath $RT::SendmailArguments" )
+          || die "Couldn't send mail: " . $@ . "\n";
+        print MAIL $entity->as_string;
+        close(MAIL);
+    }
+    else {
+        $entity->send( $RT::MailCommand, $RT::MailParams );
+    }
+
+}
+
+# }}}
+
+# {{{ sub record_last_dir
+
+sub record_last_dir {
+    my $id  = shift;
+    my $dir = shift;
+
+    # make a note of this directory. later, we'll use this to 
+    # figure out if we've gone through the whole commit,
+    # for something that is a bad mockery of attomic commits.
+
+    warn "about to write $dir to $LASTDIR_FILE.$id" if ($DEBUG);
+
+    write_file( "$LASTDIR_FILE.$id", $dir );
+}
+
+# }}}
+
+# {{{ Get the RT stuff set up
+
+# {{{ sub rt_handler 
+
+sub rt_handler {
+    my (@LogMessage) = (@_);
+
+    #Connect to the database and get RT::SystemUser and RT::Nobody loaded
+    RT::Init;
+
+    require RT::Ticket;
+
+    #Get the current user all loaded
+    my $CurrentUser = GetCurrentUser();
+
+    if ( !$CurrentUser->Id ) {
+        print
+loc("No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\n");
+        return;
+    }
+
+    my (@commands) = find_commands( \@LogMessage );
+
+    my ( @tickets, @errors );
+
+    # Get the list of tickets we're working with out of commands
+    grep { $_ =~ /^RT-Ticket:\s*(.*?)$/i && push ( @tickets, $1 ) } @commands;
+
+    my $message = new MIME::Entity;
+    $message->build(
+        From    => $CurrentUser->EmailAddress,
+        Subject => 'CVS Commit',
+        Data    => \@LogMessage
+    );
+
+    # {{{ comment or correspond, as needed
+
+    foreach my $ticket (@tickets) {
+        my $TicketObj = RT::Ticket->new($CurrentUser);
+        $TicketObj->Load($ticket);
+        my ( $id, $msg );
+        unless ( $TicketObj->Id ) {
+            push ( @errors,
+"Couldn't load ticket #$ticket. Not adding commit log to ticket history.\n"
+            );
+        }
+
+        if ( $LogMessage[0] =~ /^(comment|private)$/ ) {
+            ( $id, $msg ) = $TicketObj->Comment( MIMEObj => $message );
+
+        }
+        else {
+            ( $id, $msg ) = $TicketObj->Correspond( MIMEObj => $message );
+        }
+
+        push ( @errors, ">> Log message",
+            "Ticket #" . $TicketObj->Id . ": " . $msg );
+
+    }
+
+    # }}}
+
+    my ($reply) = ActOnPseudoHeaders( $CurrentUser, @commands );
+    print "$reply\n" if ($reply);
+    print join ( "\n", @errors );
+    print "\n";
+
+}
+
+# }}}
+
+# {{{ sub find_commands
+
+sub find_commands {
+    my $lines = shift;
+    my (@pseudoheaders);
+
+    while ( my $line = shift @{$lines} ) {
+        next if $line =~ /^\s*?$/;
+        if ( $line =~ /^RT-/i ) {
+
+            push ( @pseudoheaders, $line );
+        }
+
+        #If we find a line that's not a command, get out.
+        else {
+            unshift ( @{$lines}, $line );
+            last;
+        }
+    }
+
+    return (@pseudoheaders);
+
+}
+
+# }}}
+
+# {{{ sub ActOnPseudoHeaders
+
+=item ActOnPseudoHeaders $PseudoHeaders
+
+Takes a string of pseudo-headers, iterates through them and does what they tell it to.
+
+=cut
+
+sub ActOnPseudoHeaders {
+    my $CurrentUser = shift;
+    my (@actions) = (@_);
+
+    my $ResultsMessage = '';
+    my $Ticket         = RT::Ticket->new($CurrentUser);
+
+    foreach my $action (@actions) {
+        my ($val);
+        my $msg = '';
+
+        $ResultsMessage .= ">>> $action\n";
+
+        if ( $action =~ /^RT-(.*?):\s*(.*)$/i ) {
+            my $command = $1;
+            my $args    = $2;
+
+            if ( $command =~ /^ticket$/i ) {
+
+                $val = $Ticket->Load($args);
+                unless ($val) {
+                    $ResultsMessage .=
+                      loc("ERROR: Couldn't load ticket '[_1]': [_2].\n", $1, $msg);
+                      . loc("Aborting to avoid unintended ticket modifications.\n")
+                      . loc("The following commands were not proccessed:\n\n")
+                      . join ( "\n", @actions );
+                    return ($ResultsMessage);
+                }
+                $ResultsMessage .= loc("Ticket [_1] loaded\n", $Ticket->Id);
+            }
+            else {
+                unless ( $Ticket->Id ) {
+                    $ResultsMessage .= loc("No Ticket specified. Aborting ticket ")
+                      . loc("modifications\n\n")
+                      . loc("The following commands were not proccessed:\n\n")
+                      . join ( "\n", @actions );
+                    return ($ResultsMessage);
+                }
+
+                # Deal with the basics
+                if ( $command =~ /^(Subject|Owner|Status|Queue)$/i ) {
+                    my $method = 'Set' . ucfirst( lc($1) );
+                    ( $val, $msg ) = $Ticket->$method($args);
+                }
+
+                # Deal with the dates
+                elsif ( $command =~ /^(due|starts|started|resolved)$/i ) {
+                    my $method = 'Set' . ucfirst( lc($1) );
+                    my $date   = new RT::Date($CurrentUser);
+                    $date->Set( Format => 'unknown', Value => $args );
+                    ( $val, $msg ) = $Ticket->$method( $date->ISO );
+                }
+
+                # Deal with the watchers
+                elsif ( $command =~ /^(requestor|requestors|cc|admincc)$/i ) {
+                    my $operator = "+";
+                    my ($type);
+                    if ( $args =~ /^(\+|\-)(.*)$/ ) {
+                        $operator = $1;
+                        $args     = $2;
+                    }
+                    $type = 'Requestor' if ( $command =~ /^requestor/i );
+                    $type = 'Cc'        if ( $command =~ /^cc/i );
+                    $type = 'AdminCc'   if ( $command =~ /^admincc/i );
+
+                       my $user = RT::User->new($CurrentUser);
+                    $user->Load($args);
+
+                    if ($operator eq '+') {
+                        ($val, $msg) = $Ticket->AddWatcher( Type => $type,
+                                                            PrincipalId => $user->PrincipalId);
+                    } elsif ($operator eq '-') {
+                        ($val, $msg) = $Ticket->DeleteWatcher( Type => $type,
+                                                               PrincipalId => $user->PrincipalId);
+                    }
+
+            }
+            $ResultsMessage .= $msg . "\n";
+        }
+
+    }
+    return ($ResultsMessage);
+
+}
+
+# }}}
+
+# {{{ sub untaint 
+sub untaint {
+    my $val = shift;
+
+    if ( $val =~ /^([-\#\/\w.]+)$/ ) {
+        $val = $1;    # $data now untainted
+    }
+    else {
+        die loc("Bad data in [_1]", $val);    # log this somewhere
+    }
+    return ($val);
+}
+
+# }}}
+
+=head1 AUTHOR
+
+
+
+  rt-commit-handler is a rewritten version of the NetBSD commit handler,
+  which was placed in the public domain by Charles Hannum. It bore the following
+  authors statement:
+
+ Contributed by David Hampton <hampton@cisco.com>
+ Hacked greatly by Greg A. Woods <woods@planix.com>
+ Rewritten by Charles M. Hannum <mycroft@netbsd.org>
+
+=cut
+
diff --git a/rt/bin/rt-crontool b/rt/bin/rt-crontool
new file mode 100644
index 000000000..ede874a0c
--- /dev/null
+++ b/rt/bin/rt-crontool
@@ -0,0 +1,210 @@
+#!/usr/bin/perl
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+use strict;
+use Carp;
+
+use lib ("/opt/rt3/lib", "/opt/rt3/local/lib");
+
+package RT;
+
+use Getopt::Long;
+
+use RT::Interface::CLI qw(CleanEnv GetCurrentUser GetMessageContent loc);
+use RT::Tickets;
+use RT::Template;
+
+#Clean out all the nasties from the environment
+CleanEnv();
+
+# Load the config file
+RT::LoadConfig();
+
+#Connect to the database and get RT::SystemUser and RT::Nobody loaded
+RT::Init();
+
+#Drop setgid permissions
+RT::DropSetGIDPermissions();
+
+#Get the current user all loaded
+my $CurrentUser = GetCurrentUser();
+
+unless ( $CurrentUser->Id ) {
+    print loc("No RT user found. Please consult your RT administrator.\n");
+    exit(1);
+}
+
+my ( $search, $condition, $action, $search_arg, $condition_arg, $action_arg,
+     $template_id, $help, $verbose );
+GetOptions( "search=s"        => \$search,
+            "search-arg=s"    => \$search_arg,
+            "condition=s"     => \$condition,
+            "condition-arg=s" => \$condition_arg,
+            "action-arg=s"    => \$action_arg,
+            "action=s"        => \$action,
+	    "template-id=s"   => \$template_id,
+            "help"            => \$help,
+            "verbose|v"       => \$verbose );
+
+help() if $help;
+
+# We _must_ have a search object
+load_module($search);
+load_module($action)    if ($action);
+load_module($condition) if ($condition);
+
+# load template if specified
+my $template_obj;
+if ($template_id) {
+    $template_obj = RT::Template->new($RT::Nobody);
+    $template_obj->LoadById($template_id);
+}
+
+#At the appointed time:
+
+#find a bunch of tickets
+my $tickets = RT::Tickets->new($CurrentUser);
+my $search  = $search->new( TicketsObj => $tickets, Argument => $search_arg );
+
+$search->Prepare();
+
+# TicketsFound is an RT::Tickets object
+my $tickets = $search->TicketsObj;
+
+#for each ticket we've found
+while ( my $ticket = $tickets->Next() ) {
+    print "\n" . $ticket->Id() . ": " if ($verbose);
+
+    # perform some more advanced check
+    if ($condition) {
+        my $condition_obj = $condition->new( TicketObj => $ticket,
+                                             Argument  => $condition_arg );
+
+        # if the condition doesn't apply, get out of here
+
+        next unless ( $condition_obj->IsApplicable );
+        print loc("Condition matches...") if ($verbose);
+    }
+
+    #prepare our action
+    my $action_obj = $action->new( TicketObj => $ticket,
+				   TemplateObj => $template_obj,
+                                   Argument  => $action_arg );
+
+    #if our preparation, move onto the next ticket
+    next unless ( $action_obj->Prepare );
+    print loc("Action prepared...") if ($verbose);
+
+    #commit our action.
+    next unless ( $action_obj->Commit );
+    print loc("Action committed.") if ($verbose);
+}
+
+# {{{ load_module 
+
+=head2 load_module
+
+Loads a perl module, dying nicely if it can't find it.
+
+=cut
+
+sub load_module {
+    my $modname = shift;
+    eval "require $modname";
+    if ($@) {
+        die loc( "Failed to load module [_1]. ([_2])", $modname, $@ );
+    }
+
+}
+
+# }}}
+
+# {{{ loc 
+
+=head2 loc LIST
+
+Localize this string, with the current user's currentuser object
+
+=cut
+
+sub loc {
+    $CurrentUser->loc(@_);
+}
+
+# }}}
+
+sub help {
+
+    print loc( "[_1] is a tool to act on tickets from an external scheduling tool, such as cron.", $0 )
+      . "\n";
+    print loc("It takes several arguments:") . "\n\n";
+
+    print "	"
+      . loc( "[_1] - Specify the search module you want to use", "--search" )
+      . "\n";
+    print "	"
+      . loc( "[_1] - An argument to pass to [_2]", "--search-argument", "--search" )
+      . "\n";
+
+    print "	"
+      . loc( "[_1] - Specify the condition module you want to use", "--condition" )
+      . "\n";
+    print "	"
+      . loc( "[_1] - An argument to pass to [_2]", "--condition-argument", "--condition" )
+      . "\n";
+    print "	"
+      . loc( "[_1] - Specify the action module you want to use", "--action" )
+      . "\n";
+    print "	"
+      . loc( "[_1] - An argument to pass to [_2]", "--action-argument", "--action" )
+      . "\n";
+    print "	"
+      . loc( "[_1] - Output status updates to STDOUT", "--verbose" ) . "\n";
+    print "\n";
+    print "\n";
+    print loc("Security:")."\n";
+    print loc("This tool allows the user to run arbitrary perl modules from within RT.")." ". 
+        loc("If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT.")." ".
+        loc("It is incredibly important that nonprivileged users not be allowed to run this tool."). " " . 
+        loc("It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool.")."\n";
+    print "\n";
+    print loc("Example:");
+    print "\n";
+    print " "
+      . loc( "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
+      )
+      . "\n\n";
+
+    print " sbin/cron_shim \\\n";
+    print
+      "  --search RT::Search::ActiveTicketsInQueue  --search-arg general \\\n";
+    print
+      "  --condition RT::Condition::UntouchedInHours --condition-arg 4 \\\n";
+    print "  --action RT::Action::SetPriority --action-arg 99 \\\n";
+    print "  --verbose\n";
+
+
+    exit(0);
+}
diff --git a/rt/bin/rt-crontool.in b/rt/bin/rt-crontool.in
new file mode 100644
index 000000000..73b80aa90
--- /dev/null
+++ b/rt/bin/rt-crontool.in
@@ -0,0 +1,210 @@
+#!@PERL@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+use strict;
+use Carp;
+
+use lib ("@RT_LIB_PATH@", "@LOCAL_LIB_PATH@");
+
+package RT;
+
+use Getopt::Long;
+
+use RT::Interface::CLI qw(CleanEnv GetCurrentUser GetMessageContent loc);
+use RT::Tickets;
+use RT::Template;
+
+#Clean out all the nasties from the environment
+CleanEnv();
+
+# Load the config file
+RT::LoadConfig();
+
+#Connect to the database and get RT::SystemUser and RT::Nobody loaded
+RT::Init();
+
+#Drop setgid permissions
+RT::DropSetGIDPermissions();
+
+#Get the current user all loaded
+my $CurrentUser = GetCurrentUser();
+
+unless ( $CurrentUser->Id ) {
+    print loc("No RT user found. Please consult your RT administrator.\n");
+    exit(1);
+}
+
+my ( $search, $condition, $action, $search_arg, $condition_arg, $action_arg,
+     $template_id, $help, $verbose );
+GetOptions( "search=s"        => \$search,
+            "search-arg=s"    => \$search_arg,
+            "condition=s"     => \$condition,
+            "condition-arg=s" => \$condition_arg,
+            "action-arg=s"    => \$action_arg,
+            "action=s"        => \$action,
+	    "template-id=s"   => \$template_id,
+            "help"            => \$help,
+            "verbose|v"       => \$verbose );
+
+help() if $help;
+
+# We _must_ have a search object
+load_module($search);
+load_module($action)    if ($action);
+load_module($condition) if ($condition);
+
+# load template if specified
+my $template_obj;
+if ($template_id) {
+    $template_obj = RT::Template->new($RT::Nobody);
+    $template_obj->LoadById($template_id);
+}
+
+#At the appointed time:
+
+#find a bunch of tickets
+my $tickets = RT::Tickets->new($CurrentUser);
+my $search  = $search->new( TicketsObj => $tickets, Argument => $search_arg );
+
+$search->Prepare();
+
+# TicketsFound is an RT::Tickets object
+my $tickets = $search->TicketsObj;
+
+#for each ticket we've found
+while ( my $ticket = $tickets->Next() ) {
+    print "\n" . $ticket->Id() . ": " if ($verbose);
+
+    # perform some more advanced check
+    if ($condition) {
+        my $condition_obj = $condition->new( TicketObj => $ticket,
+                                             Argument  => $condition_arg );
+
+        # if the condition doesn't apply, get out of here
+
+        next unless ( $condition_obj->IsApplicable );
+        print loc("Condition matches...") if ($verbose);
+    }
+
+    #prepare our action
+    my $action_obj = $action->new( TicketObj => $ticket,
+				   TemplateObj => $template_obj,
+                                   Argument  => $action_arg );
+
+    #if our preparation, move onto the next ticket
+    next unless ( $action_obj->Prepare );
+    print loc("Action prepared...") if ($verbose);
+
+    #commit our action.
+    next unless ( $action_obj->Commit );
+    print loc("Action committed.") if ($verbose);
+}
+
+# {{{ load_module 
+
+=head2 load_module
+
+Loads a perl module, dying nicely if it can't find it.
+
+=cut
+
+sub load_module {
+    my $modname = shift;
+    eval "require $modname";
+    if ($@) {
+        die loc( "Failed to load module [_1]. ([_2])", $modname, $@ );
+    }
+
+}
+
+# }}}
+
+# {{{ loc 
+
+=head2 loc LIST
+
+Localize this string, with the current user's currentuser object
+
+=cut
+
+sub loc {
+    $CurrentUser->loc(@_);
+}
+
+# }}}
+
+sub help {
+
+    print loc( "[_1] is a tool to act on tickets from an external scheduling tool, such as cron.", $0 )
+      . "\n";
+    print loc("It takes several arguments:") . "\n\n";
+
+    print "	"
+      . loc( "[_1] - Specify the search module you want to use", "--search" )
+      . "\n";
+    print "	"
+      . loc( "[_1] - An argument to pass to [_2]", "--search-argument", "--search" )
+      . "\n";
+
+    print "	"
+      . loc( "[_1] - Specify the condition module you want to use", "--condition" )
+      . "\n";
+    print "	"
+      . loc( "[_1] - An argument to pass to [_2]", "--condition-argument", "--condition" )
+      . "\n";
+    print "	"
+      . loc( "[_1] - Specify the action module you want to use", "--action" )
+      . "\n";
+    print "	"
+      . loc( "[_1] - An argument to pass to [_2]", "--action-argument", "--action" )
+      . "\n";
+    print "	"
+      . loc( "[_1] - Output status updates to STDOUT", "--verbose" ) . "\n";
+    print "\n";
+    print "\n";
+    print loc("Security:")."\n";
+    print loc("This tool allows the user to run arbitrary perl modules from within RT.")." ". 
+        loc("If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT.")." ".
+        loc("It is incredibly important that nonprivileged users not be allowed to run this tool."). " " . 
+        loc("It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool.")."\n";
+    print "\n";
+    print loc("Example:");
+    print "\n";
+    print " "
+      . loc( "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
+      )
+      . "\n\n";
+
+    print " sbin/cron_shim \\\n";
+    print
+      "  --search RT::Search::ActiveTicketsInQueue  --search-arg general \\\n";
+    print
+      "  --condition RT::Condition::UntouchedInHours --condition-arg 4 \\\n";
+    print "  --action RT::Action::SetPriority --action-arg 99 \\\n";
+    print "  --verbose\n";
+
+
+    exit(0);
+}
diff --git a/rt/bin/rt-mailgate b/rt/bin/rt-mailgate
index e6f0d95c5..b30443638 100755
--- a/rt/bin/rt-mailgate
+++ b/rt/bin/rt-mailgate
@@ -1,367 +1,587 @@
-#!!!PERL!! -w
+#!/usr/bin/perl -w
+# BEGIN LICENSE BLOCK
+#
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+#
+# (Except where explictly superceded by other copyright notices)
+#
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+#
+# This work 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.
+#
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+#
+#
+# END LICENSE BLOCK
+
+=head1 NAME
+
+rt-mailgate - Mail interface to RT3.
+
+=begin testing
+
+use RT::I18N;
+
+
+# {{{ Test new ticket creation by root who is privileged and superuser
+
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: root\@localhost
+To: rt\@example.com
+Subject: This is a test of new ticket creation
+
+Blah!
+Foob!
+EOF
+close (MAIL);
+
+use RT::Tickets;
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok (UNIVERSAL::isa($tick,'RT::Ticket'));
+ok ($tick->Id, "found ticket ".$tick->Id);
+ok ($tick->Subject eq 'This is a test of new ticket creation', "Created the ticket");
 
-# $Header: /home/cvs/cvsroot/freeside/rt/bin/rt-mailgate,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-2001 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
+# }}}
 
 
-package RT;
-use strict;
-use vars qw($VERSION $Handle $Nobody $SystemUser);
-
-$VERSION="!!RT_VERSION!!";
-
-
-use lib "!!RT_LIB_PATH!!";
-use lib "!!RT_ETC_PATH!!";
-
-use RT::Interface::Email  qw(CleanEnv LoadConfig DBConnect
-			     GetCurrentUser
-			     GetMessageContent
-			     CheckForLoops 
-			     CheckForSuspiciousSender
-			     CheckForAutoGenerated 
-			     ParseMIMEEntityFromSTDIN
-			     ParseTicketId 
-			     MailError 
-			     ParseCcAddressesFromHead
-			     ParseSenderAddressFromHead 
-			     ParseErrorsToAddressFromHead
-			    );
-
-#Clean out all the nasties from the environment
-CleanEnv();
-
-#Load etc/config.pm and drop privs
-LoadConfig();
-
-#Connect to the database and get RT::SystemUser and RT::Nobody loaded
-DBConnect();
-
-#Drop setgid permissions
-RT::DropSetGIDPermissions();
-
-use RT::Ticket;
-use RT::Queue;
-use MIME::Parser;
-use File::Temp;
-use Mail::Address;
-
-
-#Set some sensible defaults 
-my $Queue = 1;
-my $time = time;
-my $Action = "correspond";  
-
-my ($Verbose, $ReturnTid, $Debug);
-my ($From, $TicketId, $Subject,$SquelchReplies);
-
-# using --owner-from-extension, this will let you set ticket owner on create
-my $AssignTicketTo = undef;
-my ($status, $msg);
-
-# {{{ parse commandline 
-
-while (my $flag = shift @ARGV) {
-    if (($flag eq '-v') or ($flag eq '--verbose')) {
-	$Verbose = 1;
-    }
-    if (($flag eq '-t') or ($flag eq '--ticketid')) {
-	$ReturnTid = 1;
-    }
-    
-    if (($flag eq '-d') or ($flag eq '--debug')) {
-	$RT::Logger->debug("Debug mode enabled\n");
-	$Debug = 1;
-      }
-    
-    if (($flag eq '-q') or ($flag eq '--queue')) {
-	$Queue = shift @ARGV;
-    } 
-    if ($flag eq '--ticket-id-from-extension') {
-       $TicketId = $ENV{'EXTENSION'};
-    }
-    if ($flag eq '--queue-from-extension') {
-       $Queue = $ENV{'EXTENSION'};
-    }
-    if ($flag eq '--owner-from-extension') {
-        $AssignTicketTo = $ENV{'EXTENSION'};
-    }
-
-    if (($flag eq '-a') or ($flag eq '--action')) {
-	  $Action = shift @ARGV;
-    } 
-    
-    
-}
+# {{{This is a test of new ticket creation as an unknown user
+
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist\@example.com
+To: rt\@example.com
+Subject: This is a test of new ticket creation as an unknown user
+
+Blah!
+Foob!
+EOF
+close (MAIL);
+
+$tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+$tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+ok ($tick->Subject ne 'This is a test of new ticket creation as an unknown user', "failed to create the new ticket from an unprivileged account");
+my $u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist@example.com');
+ok( $u->Id == 0, " user does not exist and was not created by failed ticket submission");
+
 
 # }}}
 
-# get the current mime entity from stdin
-my ($entity, $head) = ParseMIMEEntityFromSTDIN();
+# {{{ now everybody can create tickets.  can a random unkown user create tickets?
 
-#Get someone to send runtime errors to;
-my $ErrorsTo = ParseErrorsToAddressFromHead($head);
+my $g = RT::Group->new($RT::SystemUser);
+$g->LoadSystemInternalGroup('Everyone');
+ok( $g->Id, "Found 'everybody'");
 
-#Get us a current user object.
-my $CurrentUser = GetCurrentUser($head, $entity, $ErrorsTo);
+my ($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CreateTicket');
+ok ($val, "Granted everybody the right to create tickets - $msg");
 
-# We've already performed a warning and sent the mail off to somewhere safe ($RTOwner).
-#  this is _exceedingly_ unlikely but we don't want to keep going if we don't have a current user
+sleep(60); # gotta sleep so the remote process' ACL cache times out
 
-unless ($CurrentUser->Id) {
-	exit(1);
-}
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist\@example.com
+To: rt\@example.com
+Subject: This is a test of new ticket creation as an unknown user
 
-my $MessageId = $head->get('Message-Id') || 
-  "<no-message-id-".time.rand(2000)."\@.$RT::Organization>";
+Blah!
+Foob!
+EOF
+close (MAIL);
 
-#Pull apart the subject line
-$Subject = $head->get('Subject') || "[no subject]";
-chomp $Subject;
 
-# Get the ticket ID unless it's already set
-$TicketId = ParseTicketId($Subject) unless ($TicketId);
+$tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+$tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+ok ($tick->Subject eq 'This is a test of new ticket creation as an unknown user', "failed to create the new ticket from an unprivileged account");
+my $u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist@example.com');
+ok( $u->Id != 0, " user does not exist and was created by ticket submission");
 
-#Set up a queue object
-my $QueueObj = RT::Queue->new($CurrentUser);
-$QueueObj->Load($Queue);
-unless ($QueueObj->id ) {
+# }}}
 
-  MailError(To => $RT::OwnerEmail,
-                  Subject => "RT Bounce: $Subject",
-                  Explanation => "RT couldn't find the queue: $Queue",
-                  MIMEObj => $entity);
 
-}
+# {{{  can another random reply to a ticket without being granted privs? answer should be no.
 
-# {{{ Lets check for mail loops of various sorts.
 
-my $IsAutoGenerated = CheckForAutoGenerated($head);
+#($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CreateTicket');
+#ok ($val, "Granted everybody the right to create tickets - $msg");
+#sleep(60); # gotta sleep so the remote process' ACL cache times out
 
-my $IsSuspiciousSender = CheckForSuspiciousSender($head);
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist-2\@example.com
+To: rt\@example.com
+Subject: [example.com #@{[$tick->Id]}] This is a test of a reply as an unknown user
 
-my $IsALoop = CheckForLoops($head);
+Blah!
+Foob!
+EOF
+close (MAIL);
 
+$u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist-2@example.com');
+ok( $u->Id == 0, " user does not exist and was not created by ticket correspondence submission");
+# }}}
+# {{{  can another random reply to a ticket after being granted privs? answer should be yes
 
-#If the message is autogenerated, we need to know, so we can not 
-# send mail to the sender
-if ($IsSuspiciousSender || $IsAutoGenerated || $IsALoop) {
-    $SquelchReplies = 1;
 
-    $ErrorsTo = $RT::OwnerEmail;
-    
-    #TODO: Is what we want to do here really 
-    #  "Make the requestor cease to get mail from RT"?
-    # This might wreak havoc with vacation-mailing users.
-    # Maybe have a "disabled for bouncing" state that gets
-    # turned off when we get a legit incoming message
+($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'ReplyToTicket');
+ok ($val, "Granted everybody the right to reply to  tickets - $msg");
+sleep(60); # gotta sleep so the remote process' ACL cache times out
 
-}
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist-2\@example.com
+To: rt\@example.com
+Subject: [example.com #@{[$tick->Id]}] This is a test of a reply as an unknown user
 
+Blah!
+Foob!
+EOF
+close (MAIL);
 
-# {{{ Warn someone  if it's a loop
-
-# Warn someone if it's a loop, before we drop it on the ground
-if ($IsALoop) {
-    $RT::Logger->crit("RT Received mail ($MessageId) from itself.");
-    
-    #Should we mail it to RTOwner?
-    if ($RT::LoopsToRTOwner) {
-	MailError(To => $RT::OwnerEmail,
-		  Subject => "RT Bounce: $Subject",
-		  Explanation => "RT thinks this message may be a bounce",
-		  MIMEObj => $entity);
-	
-	#Do we actually want to store it?
-	exit unless ($RT::StoreLoops);
-    }
-}
+
+$u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist-2@example.com');
+ok( $u->Id != 0, " user exists and was created by ticket correspondence submission");
 
 # }}}
 
+# {{{  can another random comment on a ticket without being granted privs? answer should be no.
 
-   #Don't let the user stuff the RT-Squelch-Replies-To header.
-    if ($head->get('RT-Squelch-Replies-To')) {
-        $head->add('RT-Relocated-Squelch-Replies-To',
-                   $head->get('RT-Squelch-Replies-To'));
-        $head->delete('RT-Squelch-Replies-To')
-    }
 
+#($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CreateTicket');
+#ok ($val, "Granted everybody the right to create tickets - $msg");
+#sleep(60); # gotta sleep so the remote process' ACL cache times out
 
-if ($SquelchReplies) {
-    ## TODO: This is a hack.  It should be some other way to
-    ## indicate that the transaction should be "silent".
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action comment"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist-3\@example.com
+To: rt\@example.com
+Subject: [example.com #@{[$tick->Id]}] This is a test of a comment as an unknown user
 
-    my ($Sender, $junk) = ParseSenderAddressFromHead($head);
-    $head->add('RT-Squelch-Replies-To', $Sender);
-}
+Blah!
+Foob!
+EOF
+close (MAIL);
+
+$u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist-3@example.com');
+ok( $u->Id == 0, " user does not exist and was not created by ticket comment submission");
 
 # }}}
+# {{{  can another random reply to a ticket after being granted privs? answer should be yes
 
 
-# {{{ If we require that the sender be found in an external DB and they're not
-# forward this message to RTOwner
+($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CommentOnTicket');
+ok ($val, "Granted everybody the right to reply to  tickets - $msg");
+sleep(60); # gotta sleep so the remote process' ACL cache times out
 
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action comment"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist-3\@example.com
+To: rt\@example.com
+Subject: [example.com #@{[$tick->Id]}] This is a test of a comment as an unknown user
 
+Blah!
+Foob!
+EOF
+close (MAIL);
 
-if ($RT::LookupSenderInExternalDatabase && 
-    $RT::SenderMustExistInExternalDatabase )  {
 
-    MailError(To => $RT::OwnerEmail,
-	      Subject => "RT Bounce: $Subject",
-	      Explanation => "RT couldn't find requestor via its external database lookup",
-	      MIMEObj => $entity);
-    
-}
+$u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist-3@example.com');
+ok( $u->Id != 0, " user exists and was created by ticket comment submission");
 
 # }}}
 
-# {{{ elsif we don't have a ticket Id, we're creating a new ticket
-
-
-
-elsif (!defined($TicketId)) {
-    
-    # {{{ Create a new ticket
-    if ($Action =~ /correspond/) {
-	
-	#    open a new ticket 
-	my @Requestors = ($CurrentUser->id);
-	
-	my @Cc;
-	if ($RT::ParseNewMessageForTicketCcs) {
-		@Cc = ParseCcAddressesFromHead(Head => $head, 
-					CurrentUser => $CurrentUser,
-					QueueObj => $QueueObj );
-	}
-
-	my $Ticket = new RT::Ticket($CurrentUser);
-	my ($id, $Transaction, $ErrStr) = 
-	  $Ticket->Create ( Queue => $Queue,
-			    Subject => $Subject,
-                            Owner => $AssignTicketTo,
-			    Requestor => \@Requestors,
-			    Cc => \@Cc,
-			    MIMEObj => $entity
-			  );
-	if ($id == 0 ) {
-	    MailError( To => $ErrorsTo,
- 		       Subject => "Ticket creation failed",
-		       Explanation => $ErrStr,
-		       MIMEObj => $entity
-		     );
-	    $RT::Logger->error("Create failed: $id / $Transaction / $ErrStr ");
-	}	
-    }
-
-    # }}}
-    
-    else {
-	#TODO Return an error message
-	MailError( To => $ErrorsTo,
-		   Subject => "No ticket id specified",
-		   Explanation => "$Action aliases require a TicketId to work on",
-		   MIMEObj => $entity
-		 );
-	
-	$RT::Logger->crit("$Action aliases require a TicketId to work on ".
-			  "(from ".$CurrentUser->UserObj->EmailAddress.") ".
-			  $MessageId);
-    }
-}
+# {{{ Testing preservation of binary attachments
+
+# Get a binary blob (Best Practical logo) 
+
+# Create a mime entity with an attachment
+
+use MIME::Entity;
+my $entity = MIME::Entity->build( From => 'root@localhost',
+                                 To => 'rt@localhost',
+                                Subject => 'binary attachment test',
+                                Data => ['This is a test of a binary attachment']);
+
+# currently in lib/t/autogen
+$entity->attach(Path => '../../../html/NoAuth/images/spacer.gif', 
+                Type => 'image/gif',
+                Encoding => 'base64');
+
+# Create a ticket with a binary attachment
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+
+$entity->print(\*MAIL);
+
+close (MAIL);
+
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
+ $tick = $tickets->First();
+ok (UNIVERSAL::isa($tick,'RT::Ticket'));
+ok ($tick->Id, "found ticket ".$tick->Id);
+ok ($tick->Subject eq 'binary attachment test', "Created the ticket - ".$tick->Id);
+
+my $file = `cat ../../../html/NoAuth/images/spacer.gif`;
+ok ($file, "Read in the logo image");
+
+
+        use Digest::MD5;
+warn "for the raw file the content is ".Digest::MD5::md5_base64($file);
+
+
+
+# Verify that the binary attachment is valid in the database
+my $attachments = RT::Attachments->new($RT::SystemUser);
+$attachments->Limit(FIELD => 'ContentType', VALUE => 'image/gif');
+ok ($attachments->Count == 1, 'Found only one gif in the database');
+my $attachment = $attachments->First;
+my $acontent = $attachment->Content;
+
+        warn "coming from the  database, the content is ".Digest::MD5::md5_base64($acontent);
+
+is( $acontent, $file, 'The attachment isn\'t screwed up in the database.');
+# Log in as root
+use Getopt::Long;
+use LWP::UserAgent;
+
+
+# Grab the binary attachment via the web ui
+my $ua      = LWP::UserAgent->new();
+
+my $full_url = "http://localhost/Ticket/Attachment/".$attachment->TransactionId."/".$attachment->id."/spacer.gif?&user=root&pass=password";
+my $r = $ua->get( $full_url);
+
+
+# Verify that the downloaded attachment is the same as what we uploaded.
+is($file, $r->content, 'The attachment isn\'t screwed up in download');
+
+
 
 # }}}
 
-# {{{ If we've got a ticket ID, update the ticket
-
-else {
-    
-    #   If the action is comment, add a comment.
-    if ($Action =~ /comment/i){
-	
-	my $Ticket = new RT::Ticket($CurrentUser);
-	$Ticket->Load($TicketId);
-	unless ($Ticket->Id) {
-	    MailError( To => $ErrorsTo,
-		       Subject => "Comment not recorded",
-		       Explanation => "Could not find a ticket with id $TicketId",
-		       MIMEObj => $entity
-		     );
-	    #Return an error message saying that Ticket "#foo" wasn't found.
-	}
-	
-	($status, $msg) = $Ticket->Comment(MIMEObj=>$entity);
-	unless ($status) {
-	    #Warn the sender that we couldn't actually submit the comment.
-	    MailError( To => $ErrorsTo,
-		       Subject => "Comment not recorded",
-		       Explanation => $msg,
-		       MIMEObj => $entity
-		     );
-	}	
-    }
-
-    # If the message is correspondence, add it to the ticket
-    elsif ($Action =~ /correspond/i) {
-	my $Ticket = RT::Ticket->new($CurrentUser);
-	$Ticket->Load($TicketId);
-	
-	#TODO: Check for error conditions
-	($status, $msg) = $Ticket->Correspond(MIMEObj => $entity);
-	unless ($status) {
-
-	    #Return mail to the sender with an error
-	    MailError( To => $ErrorsTo,
-		       Subject => "Correspondence not recorded",
-		       Explanation => $msg,
-		       MIMEObj => $entity
-		     );
-	}
-    }
-
-    else {
-	#Return mail to the sender with an error
-	    MailError( To => $ErrorsTo,
-		       Subject => "RT Configuration error",
-		       Explanation => "'$Action' not a recognized action.".
-		                      " Your RT administrator has misconfigured ".
-		                      "the mail aliases which invoke RT" ,
-		       MIMEObj => $entity
-		     );
-
-	$RT::Logger->crit("$Action type unknown for $MessageId");
-	
-    }
-    
-}
+# {{{ Simple I18N testing
+
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+                                                                         
+print MAIL <<EOF;
+From: root\@localhost
+To: rtemail\@example.com
+Subject: This is a test of I18N ticket creation
+Content-Type: text/plain; charset="utf-8"
+
+2 accented lines
+\303\242\303\252\303\256\303\264\303\273
+\303\241\303\251\303\255\303\263\303\272
+bye
+EOF
+close (MAIL);
+
+my $unitickets = RT::Tickets->new($RT::SystemUser);
+$unitickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$unitickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
+my $unitick = $unitickets->First();
+ok (UNIVERSAL::isa($unitick,'RT::Ticket'));
+ok ($unitick->Id, "found ticket ".$unitick->Id);
+ok ($unitick->Subject eq 'This is a test of I18N ticket creation', "Created the ticket - ". $unitick->Subject);
+
+
+
+my $unistring = "\303\241\303\251\303\255\303\263\303\272";
+Encode::_utf8_on($unistring);
+is ($unitick->Transactions->First->Content, $unitick->Transactions->First->Attachments->First->Content, "Content is ". $unitick->Transactions->First->Attachments->First->Content);
+ok($unitick->Transactions->First->Attachments->First->Content =~ /$unistring/i, $unitick->Id." appears to be unicode ". $unitick->Transactions->First->Attachments->First->Id);
+# supposedly I18N fails on the second message sent in.
+
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+                                                                         
+print MAIL <<EOF;
+From: root\@localhost
+To: rtemail\@example.com
+Subject: This is a test of I18N ticket creation
+Content-Type: text/plain; charset="utf-8"
+
+2 accented lines
+\303\242\303\252\303\256\303\264\303\273
+\303\241\303\251\303\255\303\263\303\272
+bye
+EOF
+close (MAIL);
+
+my $tickets2 = RT::Tickets->new($RT::SystemUser);
+$tickets2->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets2->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
+my $tick2 = $tickets2->First();
+ok (UNIVERSAL::isa($tick2,'RT::Ticket'));
+ok ($tick2->Id, "found ticket ".$tick2->Id);
+ok ($tick2->Subject eq 'This is a test of I18N ticket creation', "Created the ticket");
+
+
+
+my $unistring = "\303\241\303\251\303\255\303\263\303\272";
+Encode::_utf8_on($unistring);
+
+ok ($tick2->Transactions->First->Content =~ $unistring, "It appears to be unicode - ".$tick2->Transactions->First->Content);
 
 # }}}
 
-$RT::Handle->Disconnect();
 
+($val,$msg) = $g->PrincipalObj->RevokeRight(Right => 'CreateTicket');
+ok ($val, $msg);
+
+
+
+=end testing
+
+=cut
+
+
+use strict;
+use Getopt::Long;
+use LWP::UserAgent;
+
+use constant EX_TEMPFAIL => 75;
+
+my %opts;
+GetOptions( \%opts, "queue=s", "action=s", "url=s", "jar=s", "help", "debug", "extension=s" );
+
+if ( $opts{help} ) {
+    require Pod::Usage;
+    import Pod::Usage;
+    pod2usage("RT Mail Gateway\n");
+    exit 1;    # Don't want to succeed if this is really an email!
+}
+
+for (qw(url)) {
+    die "$0 invoked improperly\n\nNo $_ provided to mail gateway!\n" unless $opts{$_};
+}
+
+undef $/;
+my $message = <>;
+my $ua      = LWP::UserAgent->new();
+$ua->cookie_jar( { file => $opts{jar} } );
+
+my %args = (
+    queue   => $opts{queue},
+    action  => $opts{action},
+    message => $message,
+    SessionType => 'REST',    # Surpress login box
+);
+
+
+if ($opts{'extension'}) {
+        $args{$opts{'extension'}} = $ENV{'EXTENSION'};
+}
+
+# Set up cookie here.
+
+my $full_url = $opts{'url'}. "/REST/1.0/NoAuth/mail-gateway";
+warn "Connecting to $full_url" if $opts{'debug'};
+
+
+
+my $r = $ua->post( $full_url, {%args} );
+check_failure($r);
+
+my $content = $r->content;
+warn $content if ($opts{debug});
+
+if ( $content !~ /^(ok|not ok)/ ) {
+
+    # It's not the server's fault if the mail is bogus. We just want to know that
+    # *something* came out of the server.
+    die <<EOF
+RT server error.
+
+The RT server which handled your email did not behave as expected. It
+said:
+
+$content
+EOF
+
+}
+
+sub check_failure {
+    my $r = shift;
+    return if $r->is_success();
+
+    # This ordinarily oughtn't to be able to happen, suggests a bug in RT.
+    # So only load these heavy modules when they're needed.
+    require HTML::TreeBuilder;
+    require HTML::FormatText;
+
+    my $error = $r->error_as_HTML;
+    my $tree  = HTML::TreeBuilder->new->parse($error);
+    $tree->eof;
+
+    # It'll be a cold day in hell before RT sends out bounces in HTML
+    my $formatter = HTML::FormatText->new( leftmargin  => 0,
+                                           rightmargin => 50 );
+    warn $formatter->format($tree);
+    warn "This is $0 exiting because of an undefined server error" if ($opts{debug});
+    exit EX_TEMPFAIL;
+}
+
+
+=head1 SYNOPSIS
+
+    rt-mailgate --help : this text
+
+Usual invocation (from MTA):
+
+    rt-mailgate --action (correspond|comment) --queue queuename
+                --url http://your.rt.server/
+                [ --extension (queue|action|ticket)
+
+See C<man rt-mailgate> for more.
+
+=head1 OPTIONS
+
+=over 3
+
+=item C<--action>
+
+Specifies whether this is a correspondence or comment address.
+
+=item C<--queue>
+
+Reflects which queue this address handles.
+
+=item C<--url>
+
+The location of the web server for your RT instance.
+
+
+=item C<--extension> OPTIONAL
+
+Some MTAs will route mail sent to user-foo@host or user+foo@host to user@host
+and present "foo" in the environment variable $EXTENSION. By specifying
+the value "queue" for this parameter, the queue this message should be
+submitted to will be set to the value of $EXTENSION. By specifying
+"ticket", $EXTENSION will be interpreted as the id of the ticket this message
+is related to.  "action" will allow the user to specify either "comment" or
+"correspond" in the address extension.
+
+
+=head1 DESCRIPTION
+
+The RT mail gateway is the primary mechanism for communicating with RT
+via email. This program simply directs the email to the RT web server,
+which handles filing correspondence and sending out any required mail.
+It is designed to be run as part of the mail delivery process, either
+called directly by the MTA or C<procmail>, or in a F<.forward> or
+equivalent.
+
+=head1 SETUP
+
+Much of the set up of the mail gateway depends on your MTA and mail
+routing configuration. However, you will need first of all to create an
+RT user for the mail gateway and assign it a password; this helps to
+ensure that mail coming into the web server did originate from the
+gateway.
+
+Next, you need to route mail to C<rt-mailgate> for the queues you're
+monitoring. For instance, if you're using F</etc/aliases> and you have a
+"bugs" queue, you will want something like this:
+
+    bugs:         "|/opt/rt3/bin/rt-mailgate --queue bugs --action correspond
+              --url http://rt.mycorp.com/"
+
+    bugs-comment: "|/opt/rt3/bin/rt-mailgate --queue bugs --action comment
+              --url http://rt.mycorp.com/"
+
+Note that you don't have to run your RT server on your mail server, as
+the mail gateway will happily relay to a different machine.
+
+=head1 CUSTOMIZATION
+
+By default, the mail gateway will accept mail from anyone. However,
+there are situations in which you will want to authenticate users
+before allowing them to communicate with the system. You can do this
+via a plug-in mechanism in the RT configuration.
+
+You can set the array C<@RT::MailPlugins> to be a list of plugins. The
+default plugin, if this is not given, is C<Auth::MailFrom> - that is,
+authentication of the person is done based on the C<From> header of the
+email. If you have additional filters or authentication mechanisms, you
+can list them here and they will be called in order:
+
+    @RT::MailPlugins = (
+        "Filter::SpamAssassin",
+        "Auth::LDAP",
+        # ...
+    );
+
+See the documentation for any additional plugins you have.
+
+You may also put Perl subroutines into the C<@RT::MailPlugins> array, if
+they behave as described below.
+
+=head1 WRITING PLUGINS
+
+What's actually going on in the above is that C<@RT::MailPlugins> is a
+list of Perl modules; RT prepends C<RT::Interface::Email::> to the name,
+to form a package name, and then C<use>'s this module. The module is
+expected to provide a C<GetCurrentUser> subroutine, which takes a hash of
+several parameters:
+
+=over 4
+
+=item Message
+
+A C<MIME::Entity> object representing the email
+=item CurrentUser
+
+An C<RT::CurrentUser> object
+
+=item AuthStat
+
+The authentication level returned from the previous plugin.
+
+=item Ticket [OPTIONAL]
+
+The ticket under discussion
+
+=item Queue [OPTIONAL]
+
+If we don't already have a ticket id, we need to know which queue we're talking about
+
+=item Action
 
-# Everything below this line is a helper sub. most of them will eventually
-# move to Interface::Email
+The action being performed. At the moment, it's one of "comment" or "correspond"
 
-#When we call die, trap it and log->crit with the value of the die.
-$SIG{__DIE__}  = sub {
-    unless ($^S || !defined $^S ) {
-        $RT::Logger->crit("$_[0]");
-	MailError( To => $ErrorsTo,  
-		   Bcc => $RT::OwnerEmail,
-		   Subject => "RT Critical error. Message not recorded!",
-		   Explanation => "$_[0]",
-		   MIMEObj => $entity
-		 );
-	exit(-1);
-    }
-    else {
-        #Get out of here if we're in an eval
-        die $_[0];
-    }
-};
+=back 4
 
+It returns two values, the new C<RT::CurrentUser> object, and the new
+authentication level. The authentication level can be zero, not allowed
+to communicate with RT at all, (a "permission denied" error is mailed to
+the correspondent) or one, which is the normal mode of operation.
+Additionally, if C<-1> is returned, then the processing of the plug-ins
+stops immediately and the message is ignored.
 
+=cut
 
-1;
diff --git a/rt/bin/rt-mailgate.in b/rt/bin/rt-mailgate.in
new file mode 100644
index 000000000..304fcbcd6
--- /dev/null
+++ b/rt/bin/rt-mailgate.in
@@ -0,0 +1,587 @@
+#!@PERL@ -w
+# BEGIN LICENSE BLOCK
+#
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+#
+# (Except where explictly superceded by other copyright notices)
+#
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+#
+# This work 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.
+#
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+#
+#
+# END LICENSE BLOCK
+
+=head1 NAME
+
+rt-mailgate - Mail interface to RT3.
+
+=begin testing
+
+use RT::I18N;
+
+
+# {{{ Test new ticket creation by root who is privileged and superuser
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: root\@localhost
+To: rt\@example.com
+Subject: This is a test of new ticket creation
+
+Blah!
+Foob!
+EOF
+close (MAIL);
+
+use RT::Tickets;
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok (UNIVERSAL::isa($tick,'RT::Ticket'));
+ok ($tick->Id, "found ticket ".$tick->Id);
+ok ($tick->Subject eq 'This is a test of new ticket creation', "Created the ticket");
+
+# }}}
+
+
+# {{{This is a test of new ticket creation as an unknown user
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist\@example.com
+To: rt\@example.com
+Subject: This is a test of new ticket creation as an unknown user
+
+Blah!
+Foob!
+EOF
+close (MAIL);
+
+$tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+$tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+ok ($tick->Subject ne 'This is a test of new ticket creation as an unknown user', "failed to create the new ticket from an unprivileged account");
+my $u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist@example.com');
+ok( $u->Id == 0, " user does not exist and was not created by failed ticket submission");
+
+
+# }}}
+
+# {{{ now everybody can create tickets.  can a random unkown user create tickets?
+
+my $g = RT::Group->new($RT::SystemUser);
+$g->LoadSystemInternalGroup('Everyone');
+ok( $g->Id, "Found 'everybody'");
+
+my ($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CreateTicket');
+ok ($val, "Granted everybody the right to create tickets - $msg");
+
+sleep(60); # gotta sleep so the remote process' ACL cache times out
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist\@example.com
+To: rt\@example.com
+Subject: This is a test of new ticket creation as an unknown user
+
+Blah!
+Foob!
+EOF
+close (MAIL);
+
+
+$tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+$tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+ok ($tick->Subject eq 'This is a test of new ticket creation as an unknown user', "failed to create the new ticket from an unprivileged account");
+my $u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist@example.com');
+ok( $u->Id != 0, " user does not exist and was created by ticket submission");
+
+# }}}
+
+
+# {{{  can another random reply to a ticket without being granted privs? answer should be no.
+
+
+#($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CreateTicket');
+#ok ($val, "Granted everybody the right to create tickets - $msg");
+#sleep(60); # gotta sleep so the remote process' ACL cache times out
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist-2\@example.com
+To: rt\@example.com
+Subject: [example.com #@{[$tick->Id]}] This is a test of a reply as an unknown user
+
+Blah!
+Foob!
+EOF
+close (MAIL);
+
+$u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist-2@example.com');
+ok( $u->Id == 0, " user does not exist and was not created by ticket correspondence submission");
+# }}}
+# {{{  can another random reply to a ticket after being granted privs? answer should be yes
+
+
+($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'ReplyToTicket');
+ok ($val, "Granted everybody the right to reply to  tickets - $msg");
+sleep(60); # gotta sleep so the remote process' ACL cache times out
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist-2\@example.com
+To: rt\@example.com
+Subject: [example.com #@{[$tick->Id]}] This is a test of a reply as an unknown user
+
+Blah!
+Foob!
+EOF
+close (MAIL);
+
+
+$u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist-2@example.com');
+ok( $u->Id != 0, " user exists and was created by ticket correspondence submission");
+
+# }}}
+
+# {{{  can another random comment on a ticket without being granted privs? answer should be no.
+
+
+#($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CreateTicket');
+#ok ($val, "Granted everybody the right to create tickets - $msg");
+#sleep(60); # gotta sleep so the remote process' ACL cache times out
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action comment"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist-3\@example.com
+To: rt\@example.com
+Subject: [example.com #@{[$tick->Id]}] This is a test of a comment as an unknown user
+
+Blah!
+Foob!
+EOF
+close (MAIL);
+
+$u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist-3@example.com');
+ok( $u->Id == 0, " user does not exist and was not created by ticket comment submission");
+
+# }}}
+# {{{  can another random reply to a ticket after being granted privs? answer should be yes
+
+
+($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CommentOnTicket');
+ok ($val, "Granted everybody the right to reply to  tickets - $msg");
+sleep(60); # gotta sleep so the remote process' ACL cache times out
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action comment"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist-3\@example.com
+To: rt\@example.com
+Subject: [example.com #@{[$tick->Id]}] This is a test of a comment as an unknown user
+
+Blah!
+Foob!
+EOF
+close (MAIL);
+
+
+$u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist-3@example.com');
+ok( $u->Id != 0, " user exists and was created by ticket comment submission");
+
+# }}}
+
+# {{{ Testing preservation of binary attachments
+
+# Get a binary blob (Best Practical logo) 
+
+# Create a mime entity with an attachment
+
+use MIME::Entity;
+my $entity = MIME::Entity->build( From => 'root@localhost',
+                                 To => 'rt@localhost',
+                                Subject => 'binary attachment test',
+                                Data => ['This is a test of a binary attachment']);
+
+# currently in lib/t/autogen
+$entity->attach(Path => '../../../html/NoAuth/images/spacer.gif', 
+                Type => 'image/gif',
+                Encoding => 'base64');
+
+# Create a ticket with a binary attachment
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+
+$entity->print(\*MAIL);
+
+close (MAIL);
+
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
+ $tick = $tickets->First();
+ok (UNIVERSAL::isa($tick,'RT::Ticket'));
+ok ($tick->Id, "found ticket ".$tick->Id);
+ok ($tick->Subject eq 'binary attachment test', "Created the ticket - ".$tick->Id);
+
+my $file = `cat ../../../html/NoAuth/images/spacer.gif`;
+ok ($file, "Read in the logo image");
+
+
+        use Digest::MD5;
+warn "for the raw file the content is ".Digest::MD5::md5_base64($file);
+
+
+
+# Verify that the binary attachment is valid in the database
+my $attachments = RT::Attachments->new($RT::SystemUser);
+$attachments->Limit(FIELD => 'ContentType', VALUE => 'image/gif');
+ok ($attachments->Count == 1, 'Found only one gif in the database');
+my $attachment = $attachments->First;
+my $acontent = $attachment->Content;
+
+        warn "coming from the  database, the content is ".Digest::MD5::md5_base64($acontent);
+
+is( $acontent, $file, 'The attachment isn\'t screwed up in the database.');
+# Log in as root
+use Getopt::Long;
+use LWP::UserAgent;
+
+
+# Grab the binary attachment via the web ui
+my $ua      = LWP::UserAgent->new();
+
+my $full_url = "http://localhost/Ticket/Attachment/".$attachment->TransactionId."/".$attachment->id."/spacer.gif?&user=root&pass=password";
+my $r = $ua->get( $full_url);
+
+
+# Verify that the downloaded attachment is the same as what we uploaded.
+is($file, $r->content, 'The attachment isn\'t screwed up in download');
+
+
+
+# }}}
+
+# {{{ Simple I18N testing
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+                                                                         
+print MAIL <<EOF;
+From: root\@localhost
+To: rtemail\@example.com
+Subject: This is a test of I18N ticket creation
+Content-Type: text/plain; charset="utf-8"
+
+2 accented lines
+\303\242\303\252\303\256\303\264\303\273
+\303\241\303\251\303\255\303\263\303\272
+bye
+EOF
+close (MAIL);
+
+my $unitickets = RT::Tickets->new($RT::SystemUser);
+$unitickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$unitickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
+my $unitick = $unitickets->First();
+ok (UNIVERSAL::isa($unitick,'RT::Ticket'));
+ok ($unitick->Id, "found ticket ".$unitick->Id);
+ok ($unitick->Subject eq 'This is a test of I18N ticket creation', "Created the ticket - ". $unitick->Subject);
+
+
+
+my $unistring = "\303\241\303\251\303\255\303\263\303\272";
+Encode::_utf8_on($unistring);
+is ($unitick->Transactions->First->Content, $unitick->Transactions->First->Attachments->First->Content, "Content is ". $unitick->Transactions->First->Attachments->First->Content);
+ok($unitick->Transactions->First->Attachments->First->Content =~ /$unistring/i, $unitick->Id." appears to be unicode ". $unitick->Transactions->First->Attachments->First->Id);
+# supposedly I18N fails on the second message sent in.
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+                                                                         
+print MAIL <<EOF;
+From: root\@localhost
+To: rtemail\@example.com
+Subject: This is a test of I18N ticket creation
+Content-Type: text/plain; charset="utf-8"
+
+2 accented lines
+\303\242\303\252\303\256\303\264\303\273
+\303\241\303\251\303\255\303\263\303\272
+bye
+EOF
+close (MAIL);
+
+my $tickets2 = RT::Tickets->new($RT::SystemUser);
+$tickets2->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets2->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
+my $tick2 = $tickets2->First();
+ok (UNIVERSAL::isa($tick2,'RT::Ticket'));
+ok ($tick2->Id, "found ticket ".$tick2->Id);
+ok ($tick2->Subject eq 'This is a test of I18N ticket creation', "Created the ticket");
+
+
+
+my $unistring = "\303\241\303\251\303\255\303\263\303\272";
+Encode::_utf8_on($unistring);
+
+ok ($tick2->Transactions->First->Content =~ $unistring, "It appears to be unicode - ".$tick2->Transactions->First->Content);
+
+# }}}
+
+
+($val,$msg) = $g->PrincipalObj->RevokeRight(Right => 'CreateTicket');
+ok ($val, $msg);
+
+
+
+=end testing
+
+=cut
+
+
+use strict;
+use Getopt::Long;
+use LWP::UserAgent;
+
+use constant EX_TEMPFAIL => 75;
+
+my %opts;
+GetOptions( \%opts, "queue=s", "action=s", "url=s", "jar=s", "help", "debug", "extension=s" );
+
+if ( $opts{help} ) {
+    require Pod::Usage;
+    import Pod::Usage;
+    pod2usage("RT Mail Gateway\n");
+    exit 1;    # Don't want to succeed if this is really an email!
+}
+
+for (qw(url)) {
+    die "$0 invoked improperly\n\nNo $_ provided to mail gateway!\n" unless $opts{$_};
+}
+
+undef $/;
+my $message = <>;
+my $ua      = LWP::UserAgent->new();
+$ua->cookie_jar( { file => $opts{jar} } );
+
+my %args = (
+    queue   => $opts{queue},
+    action  => $opts{action},
+    message => $message,
+    SessionType => 'REST',    # Surpress login box
+);
+
+
+if ($opts{'extension'}) {
+        $args{$opts{'extension'}} = $ENV{'EXTENSION'};
+}
+
+# Set up cookie here.
+
+my $full_url = $opts{'url'}. "/REST/1.0/NoAuth/mail-gateway";
+warn "Connecting to $full_url" if $opts{'debug'};
+
+
+
+my $r = $ua->post( $full_url, {%args} );
+check_failure($r);
+
+my $content = $r->content;
+warn $content if ($opts{debug});
+
+if ( $content !~ /^(ok|not ok)/ ) {
+
+    # It's not the server's fault if the mail is bogus. We just want to know that
+    # *something* came out of the server.
+    die <<EOF
+RT server error.
+
+The RT server which handled your email did not behave as expected. It
+said:
+
+$content
+EOF
+
+}
+
+sub check_failure {
+    my $r = shift;
+    return if $r->is_success();
+
+    # This ordinarily oughtn't to be able to happen, suggests a bug in RT.
+    # So only load these heavy modules when they're needed.
+    require HTML::TreeBuilder;
+    require HTML::FormatText;
+
+    my $error = $r->error_as_HTML;
+    my $tree  = HTML::TreeBuilder->new->parse($error);
+    $tree->eof;
+
+    # It'll be a cold day in hell before RT sends out bounces in HTML
+    my $formatter = HTML::FormatText->new( leftmargin  => 0,
+                                           rightmargin => 50 );
+    warn $formatter->format($tree);
+    warn "This is $0 exiting because of an undefined server error" if ($opts{debug});
+    exit EX_TEMPFAIL;
+}
+
+
+=head1 SYNOPSIS
+
+    rt-mailgate --help : this text
+
+Usual invocation (from MTA):
+
+    rt-mailgate --action (correspond|comment) --queue queuename
+                --url http://your.rt.server/
+                [ --extension (queue|action|ticket)
+
+See C<man rt-mailgate> for more.
+
+=head1 OPTIONS
+
+=over 3
+
+=item C<--action>
+
+Specifies whether this is a correspondence or comment address.
+
+=item C<--queue>
+
+Reflects which queue this address handles.
+
+=item C<--url>
+
+The location of the web server for your RT instance.
+
+
+=item C<--extension> OPTIONAL
+
+Some MTAs will route mail sent to user-foo@host or user+foo@host to user@host
+and present "foo" in the environment variable $EXTENSION. By specifying
+the value "queue" for this parameter, the queue this message should be
+submitted to will be set to the value of $EXTENSION. By specifying
+"ticket", $EXTENSION will be interpreted as the id of the ticket this message
+is related to.  "action" will allow the user to specify either "comment" or
+"correspond" in the address extension.
+
+
+=head1 DESCRIPTION
+
+The RT mail gateway is the primary mechanism for communicating with RT
+via email. This program simply directs the email to the RT web server,
+which handles filing correspondence and sending out any required mail.
+It is designed to be run as part of the mail delivery process, either
+called directly by the MTA or C<procmail>, or in a F<.forward> or
+equivalent.
+
+=head1 SETUP
+
+Much of the set up of the mail gateway depends on your MTA and mail
+routing configuration. However, you will need first of all to create an
+RT user for the mail gateway and assign it a password; this helps to
+ensure that mail coming into the web server did originate from the
+gateway.
+
+Next, you need to route mail to C<rt-mailgate> for the queues you're
+monitoring. For instance, if you're using F</etc/aliases> and you have a
+"bugs" queue, you will want something like this:
+
+    bugs:         "|/opt/rt3/bin/rt-mailgate --queue bugs --action correspond
+              --url http://rt.mycorp.com/"
+
+    bugs-comment: "|/opt/rt3/bin/rt-mailgate --queue bugs --action comment
+              --url http://rt.mycorp.com/"
+
+Note that you don't have to run your RT server on your mail server, as
+the mail gateway will happily relay to a different machine.
+
+=head1 CUSTOMIZATION
+
+By default, the mail gateway will accept mail from anyone. However,
+there are situations in which you will want to authenticate users
+before allowing them to communicate with the system. You can do this
+via a plug-in mechanism in the RT configuration.
+
+You can set the array C<@RT::MailPlugins> to be a list of plugins. The
+default plugin, if this is not given, is C<Auth::MailFrom> - that is,
+authentication of the person is done based on the C<From> header of the
+email. If you have additional filters or authentication mechanisms, you
+can list them here and they will be called in order:
+
+    @RT::MailPlugins = (
+        "Filter::SpamAssassin",
+        "Auth::LDAP",
+        # ...
+    );
+
+See the documentation for any additional plugins you have.
+
+You may also put Perl subroutines into the C<@RT::MailPlugins> array, if
+they behave as described below.
+
+=head1 WRITING PLUGINS
+
+What's actually going on in the above is that C<@RT::MailPlugins> is a
+list of Perl modules; RT prepends C<RT::Interface::Email::> to the name,
+to form a package name, and then C<use>'s this module. The module is
+expected to provide a C<GetCurrentUser> subroutine, which takes a hash of
+several parameters:
+
+=over 4
+
+=item Message
+
+A C<MIME::Entity> object representing the email
+=item CurrentUser
+
+An C<RT::CurrentUser> object
+
+=item AuthStat
+
+The authentication level returned from the previous plugin.
+
+=item Ticket [OPTIONAL]
+
+The ticket under discussion
+
+=item Queue [OPTIONAL]
+
+If we don't already have a ticket id, we need to know which queue we're talking about
+
+=item Action
+
+The action being performed. At the moment, it's one of "comment" or "correspond"
+
+=back 4
+
+It returns two values, the new C<RT::CurrentUser> object, and the new
+authentication level. The authentication level can be zero, not allowed
+to communicate with RT at all, (a "permission denied" error is mailed to
+the correspondent) or one, which is the normal mode of operation.
+Additionally, if C<-1> is returned, then the processing of the plug-ins
+stops immediately and the message is ignored.
+
+=cut
+
diff --git a/rt/bin/webmux.pl b/rt/bin/webmux.pl
index 6e1ae06de..21cb83f5e 100755
--- a/rt/bin/webmux.pl
+++ b/rt/bin/webmux.pl
@@ -1,177 +1,125 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/bin/Attic/webmux.pl,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# RT is (c) 1996-2000 Jesse Vincent (jesse@fsck.com);
+#!/usr/bin/perl
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 
 use strict;
-$ENV{'PATH'} = '/bin:/usr/bin';    # or whatever you need
-$ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
-$ENV{'SHELL'} = '/bin/sh' if defined $ENV{'SHELL'};
-$ENV{'ENV'} = '' if defined $ENV{'ENV'};
-$ENV{'IFS'} = ''          if defined $ENV{'IFS'};
 
+BEGIN {
+    $ENV{'PATH'}   = '/bin:/usr/bin';                      # or whatever you need
+    $ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
+    $ENV{'SHELL'}  = '/bin/sh' if defined $ENV{'SHELL'};
+    $ENV{'ENV'}    = '' if defined $ENV{'ENV'};
+    $ENV{'IFS'}    = '' if defined $ENV{'IFS'};
+}
 
-# We really don't want apache to try to eat all vm
-# see http://perl.apache.org/guide/control.html#Preventing_mod_perl_Processes_Fr
-
+use lib ("/opt/rt3/local/lib", "/opt/rt3/lib");
+use RT;
 
 package RT::Mason;
 
-use CGI qw(-private_tempfiles); #bring this in before mason, to make sure we
-				#set private_tempfiles
-use HTML::Mason::ApacheHandler (args_method => 'CGI');
-use HTML::Mason;  # brings in subpackages: Parser, Interp, etc.
-
-use vars qw($VERSION %session $Nobody $SystemUser $r $m);
+use CGI qw(-private_tempfiles);    #bring this in before mason, to make sure we
+                                   #set private_tempfiles
 
-# List of modules that you want to use from components (see Admin
-# manual for details)
-
-#Clean up our umask...so that the session files aren't world readable, writable or executable
-umask(0077);
+BEGIN {
+    if ($CGI::MOD_PERL) {
+	require HTML::Mason::ApacheHandler;
+    }
+    else {
+	require HTML::Mason::CGIHandler;
+    }
+}
 
+use HTML::Mason;                   # brings in subpackages: Parser, Interp, etc.
 
-	  
-$VERSION="!!RT_VERSION!!";
+use vars qw($Nobody $SystemUser $r);
 
-use lib "!!RT_LIB_PATH!!";
-use lib "!!RT_ETC_PATH!!";
+#This drags in RT's config.pm
+RT::LoadConfig();
 
-#This drags in  RT's config.pm
-use config;
 use Carp;
 
-{  
-	    package HTML::Mason::Commands;
-	    use vars qw(%session $m);
-	  
-	    use RT; 
-	    use RT::Ticket;
-	    use RT::Tickets;
-	    use RT::Transaction;
-	    use RT::Transactions;
-	    use RT::User;
-	    use RT::Users;
-	    use RT::CurrentUser;
-	    use RT::Template;
-	    use RT::Templates;
-	    use RT::Queue;
-	    use RT::Queues;
-	    use RT::ScripAction;
-	    use RT::ScripActions;
-	    use RT::ScripCondition;
-	    use RT::ScripConditions;
-	    use RT::Scrip;
-	    use RT::Scrips;
-	    use RT::Group;
-	    use RT::Groups;
-	    use RT::Keyword;
-	    use RT::Keywords;
-	    use RT::ObjectKeyword;
-	    use RT::ObjectKeywords;
-	    use RT::KeywordSelect;
-	    use RT::KeywordSelects;
-	    use RT::GroupMember;
-	    use RT::GroupMembers;
-	    use RT::Watcher;
-	    use RT::Watchers;
-	    use RT::Handle;
-	    use RT::Interface::Web;    
-	    use MIME::Entity;
-	    use Text::Wrapper;
-	    use Apache::Cookie;
-	    use Date::Parse;
-	    use HTML::Entities;
-	    
-	    #TODO: make this use DBI
-	    use Apache::Session::File;
-
-	    # Set this page's content type to whatever we are called with
-	    sub SetContentType {
-		my $type = shift;
-		$RT::Mason::r->content_type($type);
-	    }
-
-	    sub CGIObject {
-		$m->cgi_object();
-	    }
-
-	}
-my ($parser, $interp, $ah);
-if ($HTML::Mason::VERSION < 1.0902) {
- $parser = &RT::Interface::Web::NewParser(allow_globals => [%session]);
-
- $interp = &RT::Interface::Web::NewInterp(parser=>$parser,
-                                          allow_recursive_autohandlers => 1,
-                                                              );
-
- $ah = &RT::Interface::Web::NewApacheHandler($interp);
-} else {
- $ah = &RT::Interface::Web::NewMason11ApacheHandler();
+{
+    package HTML::Mason::Commands;
+    use vars qw(%session);
+
+    use RT::Tickets;
+    use RT::Transactions;
+    use RT::Users;
+    use RT::CurrentUser;
+    use RT::Templates;
+    use RT::Queues;
+    use RT::ScripActions;
+    use RT::ScripConditions;
+    use RT::Scrips;
+    use RT::Groups;
+    use RT::GroupMembers;
+    use RT::CustomFields;
+    use RT::CustomFieldValues;
+    use RT::TicketCustomFieldValues;
+
+    use RT::Interface::Web;
+    use MIME::Entity;
+    use Text::Wrapper;
+    use CGI::Cookie;
+    use Time::ParseDate;
+    use HTML::Entities;
 }
-# Activate the following if running httpd as root (the normal case).
-# Resets ownership of all files created by Mason at startup.
-#
-chown (Apache->server->uid, Apache->server->gid, 
-		[$RT::MasonSessionDir]);
-
-
-chown (Apache->server->uid, Apache->server->gid, 
-		$ah->interp->files_written);
 
-# Die if WebSessionDir doesn't exist or we can't write to it
 
-stat ($RT::MasonSessionDir);
-die "Can't read and write $RT::MasonSessionDir"
-  unless (( -d _ ) and ( -r _ ) and ( -w _ ));
+# Activate the following if running httpd as root (the normal case).
+# Resets ownership of all files created by Mason at startup.
+# Note that mysql uses DB for sessions, so there's no need to do this.
+unless ($RT::DatabaseType =~ /(mysql|Pg)/) {
+    # Clean up our umask to protect session files
+    umask(0077);
+
+if ( $CGI::MOD_PERL)  {
+    chown( Apache->server->uid, Apache->server->gid, [$RT::MasonSessionDir] )
+	if Apache->server->can('uid');
+        }
+    # Die if WebSessionDir doesn't exist or we can't write to it
+    stat($RT::MasonSessionDir);
+    die "Can't read and write $RT::MasonSessionDir"
+	unless ( ( -d _ ) and ( -r _ ) and ( -w _ ) );
+}
 
+my $ah = &RT::Interface::Web::NewApacheHandler() if $CGI::MOD_PERL;
 
 sub handler {
     ($r) = @_;
-    
+
     RT::Init();
- 
+
     # We don't need to handle non-text items
-    return -1 if defined($r->content_type) && $r->content_type !~ m|^text/|io;
-    
-    #This is all largely cut and pasted from mason's session_handler.pl
-    
-    my %cookies = Apache::Cookie::parse($r->header_in('Cookie'));
-    
-    eval { 
-	tie %HTML::Mason::Commands::session, 'Apache::Session::File',
-	  ( $cookies{'AF_SID'} ? $cookies{'AF_SID'}->value() : undef ), 
-	    { Directory => $RT::MasonSessionDir,
-	      LockDirectory => $RT::MasonSessionDir,
-	    }	;
-    };
-    
-    if ( $@ ) {
-	# If the session is invalid, create a new session.
-	if ( $@ =~ m#^Object does not exist in the data store# ) {
-	     tie %HTML::Mason::Commands::session, 'Apache::Session::File', undef,
-	     { Directory => $RT::MasonSessionDir,
-	       LockDirectory => $RT::MasonSessionDir,
-	     };
-	     undef $cookies{'AF_SID'};
-	}
-	  else {
-	     die "RT Couldn't write to session directory '$RT::MasonSessionDir'. Check that this directory's permissions are correct.";
-	  }
-    }
-    
-    if ( !$cookies{'AF_SID'} ) {
-	my $cookie = new Apache::Cookie
-	  ($r,
-	   -name=>'AF_SID', 
-	   -value=>$HTML::Mason::Commands::session{_session_id}, 
-	   -path => '/',);
-	$cookie->bake;
+    return -1 if defined( $r->content_type ) && $r->content_type !~ m|^text/|io;
 
-    }
+    my %session;
     my $status = $ah->handle_request($r);
-    untie %HTML::Mason::Commands::session;
-    
+    undef (%session);
+
+    $RT::Logger->crit("Transaction not committed. Usually indicates a software fault. Data loss may have occurred") if $RT::Handle->TransactionDepth;
     return $status;
-    
-  }
-1;
+}
 
+1;
diff --git a/rt/bin/webmux.pl.in b/rt/bin/webmux.pl.in
new file mode 100644
index 000000000..12aad85b3
--- /dev/null
+++ b/rt/bin/webmux.pl.in
@@ -0,0 +1,125 @@
+#!@PERL@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+use strict;
+
+BEGIN {
+    $ENV{'PATH'}   = '/bin:/usr/bin';                      # or whatever you need
+    $ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
+    $ENV{'SHELL'}  = '/bin/sh' if defined $ENV{'SHELL'};
+    $ENV{'ENV'}    = '' if defined $ENV{'ENV'};
+    $ENV{'IFS'}    = '' if defined $ENV{'IFS'};
+}
+
+use lib ("@LOCAL_LIB_PATH@", "@RT_LIB_PATH@");
+use RT;
+
+package RT::Mason;
+
+use CGI qw(-private_tempfiles);    #bring this in before mason, to make sure we
+                                   #set private_tempfiles
+
+BEGIN {
+    if ($CGI::MOD_PERL) {
+	require HTML::Mason::ApacheHandler;
+    }
+    else {
+	require HTML::Mason::CGIHandler;
+    }
+}
+
+use HTML::Mason;                   # brings in subpackages: Parser, Interp, etc.
+
+use vars qw($Nobody $SystemUser $r);
+
+#This drags in RT's config.pm
+RT::LoadConfig();
+
+use Carp;
+
+{
+    package HTML::Mason::Commands;
+    use vars qw(%session);
+
+    use RT::Tickets;
+    use RT::Transactions;
+    use RT::Users;
+    use RT::CurrentUser;
+    use RT::Templates;
+    use RT::Queues;
+    use RT::ScripActions;
+    use RT::ScripConditions;
+    use RT::Scrips;
+    use RT::Groups;
+    use RT::GroupMembers;
+    use RT::CustomFields;
+    use RT::CustomFieldValues;
+    use RT::TicketCustomFieldValues;
+
+    use RT::Interface::Web;
+    use MIME::Entity;
+    use Text::Wrapper;
+    use CGI::Cookie;
+    use Time::ParseDate;
+    use HTML::Entities;
+}
+
+
+# Activate the following if running httpd as root (the normal case).
+# Resets ownership of all files created by Mason at startup.
+# Note that mysql uses DB for sessions, so there's no need to do this.
+unless ($RT::DatabaseType =~ /(mysql|Pg)/) {
+    # Clean up our umask to protect session files
+    umask(0077);
+
+if ( $CGI::MOD_PERL)  {
+    chown( Apache->server->uid, Apache->server->gid, [$RT::MasonSessionDir] )
+	if Apache->server->can('uid');
+        }
+    # Die if WebSessionDir doesn't exist or we can't write to it
+    stat($RT::MasonSessionDir);
+    die "Can't read and write $RT::MasonSessionDir"
+	unless ( ( -d _ ) and ( -r _ ) and ( -w _ ) );
+}
+
+my $ah = &RT::Interface::Web::NewApacheHandler() if $CGI::MOD_PERL;
+
+sub handler {
+    ($r) = @_;
+
+    RT::Init();
+
+    # We don't need to handle non-text items
+    return -1 if defined( $r->content_type ) && $r->content_type !~ m|^text/|io;
+
+    my %session;
+    my $status = $ah->handle_request($r);
+    undef (%session);
+
+    $RT::Logger->crit("Transaction not committed. Usually indicates a software fault. Data loss may have occurred") if $RT::Handle->TransactionDepth;
+    return $status;
+}
+
+1;
diff --git a/rt/config b/rt/config
new file mode 100644
index 000000000..b9418a66d
--- /dev/null
+++ b/rt/config
@@ -0,0 +1,256 @@
+/*
+ * This is the project ``config'' file.  It controls many aspects of
+ * how Aegis interacts with your project.
+ *
+ * There are several sections of this file, each dealing with a different
+ * aspect of the interaction between Aegis and the tools used to manage
+ * yout project.
+ */
+
+/*
+ * -------------------------------------------------------------------------
+ *
+ * The build tool is delegated.
+ */
+
+/*
+ * The build_command field of the config file is used to invoke the relevant
+ * build command.  The following command tells cook where to find the recipes.
+ * The ${s Howto.cook} expands to a path into the baseline during development
+ * if the file is not in the change.  Look in aesub(5) for more information
+ * about command substitutions.
+ */
+build_command =
+	"";
+        
+/*        cook -book ${s Howto.cook} search_path=$search_path \
+project=$p change=$c version=$v -star -no-log -action -notouch";
+
+/* 
+ * The recipes in the User Guide will all remove their targets before
+ * constructing them, which qualifies them to use the following entry in the
+ * config file.  The targets MUST be removed first if this field is true,
+ * otherwise the baseline would cease to be self-consistent.
+ *
+ * Fortunately, Cook has a nifty ``set unlink;'' statement which is
+ * placed at the top of the cookbook.
+ */ 
+link_integration_directory = true;
+
+
+/*
+ * -------------------------------------------------------------------------
+ *
+ * The history tool is delegated.
+ *
+ * The fhist program was written by David I. Bell and is admirably
+ * suited to providing a history mechanism with out the "cruft" that
+ * SCCS and RCS impose.  The fhist program also comes with two other
+ * utilities, fcomp and fmerge, which use the same minimal difference
+ * algorithm.
+ *
+ * Please note that the [# edit #] feature needs to be avoided, or the
+ * -Fored_Update (-fu) flag needs to be used in addition to the
+ * -Conditional_Update (-cu) flag, otherwise updates will complain that
+ * ``Input file "XXX" contains edit A instead of B for module "YYY"''
+ *
+ * The history_create_command and the history_put_command are
+ * intentionally identical.  This minimizes problems when using
+ * branches.
+ *
+ * The ${quote ...} construct is used to quote filesnames whicg contain
+ * shell special characters.  A minimum of quoting is performed, so if
+ * the filenames do not contail shell special characters, no quotes will
+ * be used.
+ */
+
+/*
+ * This command is used to create a new project history.  The command is
+ * always executed as the project owner.  Note he the source is left in
+ * the baseline.  The following substitutions are available:
+ *
+ * ${Input}
+ *	absolute path of the source file
+ * ${History}
+ *	absolute path of the history file
+ *
+ * The history_create_command and the history_put_command are
+ * intentionally identical.  This minimizes problems when using
+ * branches.
+ */
+history_create_command =
+	"fhist ${quote ${basename $input}} -cr -cu -i ${quote $input} \
+-p ${quote ${dirname $history}} -r";
+
+/*
+ * This command is used to get a specific edit back from history.  The
+ * command may be executed by developers.  The following substitutions
+ * are available:
+ *
+ * ${History}
+ *	absolute path of the history file
+ * ${Edit}
+ *	edit number, as given by history_query_command
+ * ${Output}
+ *	absolute path of the destination file
+ *
+ * Note that the destination filename will never look anything like the
+ * history source filename, so the -p is essential.
+ */
+history_get_command =
+	"fhist ${quote ${basename $history}} -e ${quote $e} \
+-o ${quote $output} -p ${quote ${dirname $history}}";
+
+/*
+ * This command is used to add a new "top-most" entry to the history
+ * file.  This command is always executed as the project owner.  Note
+ * that the source file is left in the baseline.  The following
+ * substitutions are available:
+ *
+ * ${Input}
+ *	absolute path of source file
+ * ${History}
+ *	absolute path of history file
+ *
+ * The history_create_command and the history_put_command are
+ * intentionally identical.  This minimizes problems when using
+ * branches.
+ */
+history_put_command =
+	"fhist ${quote ${basename $input}} -cr -cu -i ${quote $input} \
+-p ${quote ${dirname $history}} -r";
+
+/*
+ * This command is used to query what the history mechanism calls the
+ * "top-most" edit of a history file.  The result may be any arbitrary
+ * string, it need not be anything like a number, just so long as it
+ * uniquely identifies the edit for use by the history_get_command at a
+ * later date.  The edit number is to be printed on the standard output.
+ * This command may be executed by developers.  The following
+ * substitutions are available:
+ *
+ * ${History}
+ *	absolute path of the history file
+ */
+history_query_command =
+	"fhist ${quote ${basename $history}} -l 0 \
+-p ${quote ${dirname $history}} -q";
+
+/*
+ * -------------------------------------------------------------------------
+ *
+ * The difference and merge tools are delegated.
+ */
+
+/*
+ * Compare two files using fcomp.  The -w option produces an output of
+ * the entire file, with insertions an deletions marked by "change bars"
+ * in the left margin.  This is superior to context difference, as it
+ * shows the entire file as context.  The -s option could be added to
+ * compare runs of white space as equal.
+ *
+ * This command is used by aed(1) to produce a difference listing when
+ * file in the development directory was originally copied from the
+ * current version in the baseline.
+ *
+ * All of the command substitutions described in aesub(5) are available.
+ * In addition, the following substitutions are also available:
+ *
+ * ${ORiginal}
+ *	The absolute path name of a file containing the version
+ *	originally copied.  Usually in the baseline.
+ * ${Input}
+ *	The absolute path name of the edited version of the file.
+ *	Usually in the development directory.
+ * ${Output}
+ *	The absolute path name of the file in which to write the
+ *	difference listing.  Usually in the development directory.
+ *
+ * An exit status of 0 means successful, even of the files differ (and
+ * they usually do).  An exit status which is non-zero means something
+ * is wrong.
+ *
+ * The non-zero exit status may be used to overload this command with
+ * extra tests, such as line length limits.  The difference files must
+ * be produced in addition to these extra tests.
+ */
+diff_command =
+	"fcomp -w ${quote $original} ${quote $input} -o ${quote $output}";
+
+/*
+ * Compare three files using fmerge.  Conflicts are marked in the
+ * output.
+ *
+ * This command is used by aed(1) to produce a difference listing when a
+ * file in the development directory is out of date compared to the
+ * current version in the baseline.
+ *
+ * All of the command substitutions described in aesub(5) are available.
+ * In addition, the following substitutions are also available:
+ *
+ * ${ORiginal}
+ *	The absolute path name of a file containing the common ancestor
+ *	version of ${MostRecent} and {$Input}.  Usually the version
+ *	originally copied into the change.  Usually in a temporary file.
+ * ${Most_Recent}
+ *	The absolute path name of a file containing the most recent
+ *	version.  Usually in the baseline.
+ * ${Input}
+ *	The absolute path name of the edited version of the file.
+ *	Usually in the development directory.
+ * ${Output}
+ *	The absolute path name of the file in which to write the
+ *	difference listing.  Usually in the development directory.
+ *
+ * An exit status of 0 means successful, even of the files differ (and
+ * they usually do).  An exit status which is non-zero means something
+ * is wrong.
+ */
+merge_command =
+	"fmerge ${quote $original} ${quote $MostRecent} ${quote $input} \
+-o ${quote $output} -c /dev/null";
+
+/*
+ * -------------------------------------------------------------------------
+ *
+ * The new file templates are very handy.  They allow all sorts of things
+ * to be se automatically.  You need to edit them to add your own name,
+ * and copyright conditions.
+ */
+
+file_template =
+[
+	{
+		pattern = [ "*" ];
+                body = "${read_file ${source etc/template/generic abs}}";
+
+	}
+];
+
+/* -------------------------------------------------------------------------
+ *
+ * The integrate_begin_exceptions are files which are not hard linked
+ * from the baseline to the integration directory.  In this case, this
+ * is done to ensure the version stmp is updated appropriately.
+ */
+
+integrate_begin_exceptions = [ ];
+
+
+
+
+/* -------------------------------------------------------------------------
+ *
+ * The trojan_horse_suspect field is a list of filename patterns which
+ * indicate files which *could* host a Trojan horse attack.  It makes
+ * aedist --receive more cautions.  It is NOT a silver bullet: just
+ * about ANY file can host a Trojan, one way or the other.
+ */
+
+trojan_horse_suspect = [ ];
+
+build_covers_all_architectures = true;
+
+test_command = "make test";
+
+build_time_adjust=dont_adjust;
diff --git a/rt/config.layout b/rt/config.layout
new file mode 100644
index 000000000..81917f18c
--- /dev/null
+++ b/rt/config.layout
@@ -0,0 +1,83 @@
+##
+##  config.layout -- Pre-defined Installation Path Layouts
+##
+##  Hints:
+##  - layouts can be loaded with configure's --enable-layout=ID option
+##  - when no --enable-layout option is given, the default layout is `RT'
+##  - a trailing plus character (`+') on paths is replaced with a
+##    `/<target>' suffix where <target> is currently hardcoded to 'rt3'.
+##    (This may become a configurable parameter at some point.)
+##
+##  The following variables must _all_ be set:
+##	prefix exec_prefix bindir sbindir sysconfdir mandir libdir
+##	datadir htmldir localstatedir logfiledir masonstatedir
+##	sessionstatedir customdir customhtmldir customlexdir
+##  (This can be seen in m4/rt_layout.m4.)
+##
+
+#   Default RT3 path layout.
+<Layout RT3>
+  prefix:		/opt/rt3
+  exec_prefix:		${prefix}
+  bindir:		${exec_prefix}/bin
+  sbindir:		${exec_prefix}/sbin
+  sysconfdir:		${prefix}/etc
+  mandir:		${prefix}/man
+  libdir:		${prefix}/lib
+  datadir:		${prefix}/share
+  htmldir:		${datadir}/html
+  manualdir:		${datadir}/doc
+  localstatedir:	${prefix}/var
+  logfiledir:		${localstatedir}/log
+  masonstatedir:	${localstatedir}/mason_data
+  sessionstatedir:	${localstatedir}/session_data
+  customdir:		${prefix}/local
+  custometcdir:		${customdir}/etc
+  customhtmldir:	${customdir}/html
+  customlexdir:		${customdir}/po
+  customlibdir:		${customdir}/lib
+</Layout>
+
+<Layout FreeBSD>
+  prefix:		/usr/local
+  exec_prefix:		${prefix}
+  bindir:		${exec_prefix}/bin
+  sbindir:		${exec_prefix}/sbin
+  sysconfdir:		${prefix}/etc+
+  mandir:		${prefix}/man
+  libdir:		${prefix}/lib+
+  datadir:		${prefix}/share+
+  htmldir:		${datadir}/html
+  manualdir:		${prefix}/share/doc+
+  logfiledir:		/var/log
+  localstatedir:	/var/run+
+  masonstatedir:	${localstatedir}/mason_data
+  sessionstatedir:	${localstatedir}/session_data
+  customdir:		${prefix}/share+
+  custometcdir:		${customdir}/local/etc
+  customhtmldir:	${customdir}/local/html
+  customlexdir:		${customdir}/local/po
+  customlibdir:		${customdir}/local/lib
+</Layout>
+
+<Layout Win32>
+  prefix:		C:/Program Files/Request Tracker
+  exec_prefix:		${prefix}
+  bindir:		${exec_prefix}/bin
+  sbindir:		${exec_prefix}/sbin
+  sysconfdir:		${prefix}/etc
+  mandir:		${prefix}/man
+  libdir:		${prefix}/lib
+  datadir:		${prefix}
+  htmldir:		${datadir}/html
+  manualdir:		${datadir}/doc
+  localstatedir:	${prefix}/var
+  logfiledir:		${localstatedir}/log
+  masonstatedir:	${localstatedir}/mason_data
+  sessionstatedir:	${localstatedir}/session_data
+  customdir:		${prefix}/local
+  custometcdir:		${customdir}/etc
+  customhtmldir:	${customdir}/html
+  customlexdir:		${customdir}/po
+  customlibdir:		${customdir}/lib
+</Layout>
diff --git a/rt/config.log b/rt/config.log
new file mode 100644
index 000000000..f8549485d
--- /dev/null
+++ b/rt/config.log
@@ -0,0 +1,117 @@
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by RT configure 3.0.4, which was
+generated by GNU Autoconf 2.53.  Invocation command line was
+
+  $ ./configure 
+
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = pallas
+uname -m = i686
+uname -r = 2.4.18-686
+uname -s = Linux
+uname -v = #1 Sun Apr 14 11:32:47 EST 2002
+
+/usr/bin/uname -p = unknown
+/bin/uname -X     = unknown
+
+/bin/arch              = i686
+/usr/bin/arch -k       = unknown
+/usr/convex/getsysinfo = unknown
+hostinfo               = unknown
+/bin/machine           = unknown
+/usr/bin/oslevel       = unknown
+/bin/universe          = unknown
+
+PATH: /usr/X11R6/bin/
+PATH: /opt/rt/bin
+PATH: /usr/athena/bin
+PATH: /usr/local/bin
+PATH: /bin
+PATH: /usr/bin
+PATH: /usr/sbin
+PATH: /usr/bin
+PATH: /usr/games
+PATH: $HOME/bin
+PATH: /opt/kerberos/bin
+PATH: /opt/StarOffice-4.0/bin
+PATH: /opt/mysql/bin/
+PATH: .
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+configure:1217: checking for a BSD-compatible install
+configure:1271: result: /usr/bin/install -c
+configure:1285: checking for perl
+configure:1303: found /usr/bin/perl
+configure:1316: result: /usr/bin/perl
+configure:1638: checking for chosen layout
+configure:1653: result: RT3
+configure:1964: creating ./config.status
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by RT config.status 3.0.4, which was
+generated by GNU Autoconf 2.53.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ./config.status 
+
+on pallas
+
+config.status:637: creating sbin/rt-setup-database
+config.status:637: creating sbin/rt-test-dependencies
+config.status:637: creating Makefile
+config.status:637: creating etc/RT_Config.pm
+config.status:637: creating lib/RT.pm
+config.status:637: creating lib/t/00smoke.t
+config.status:637: creating lib/t/01harness.t
+config.status:637: creating lib/t/02regression.t
+config.status:637: creating lib/t/03web.pl
+config.status:637: creating lib/t/04_send_email.pl
+config.status:637: creating bin/mason_handler.fcgi
+config.status:637: creating bin/mason_handler.scgi
+config.status:637: creating bin/mason_handler.svc
+config.status:637: creating bin/rt-commit-handler
+config.status:637: creating bin/rt-crontool
+config.status:637: creating bin/rt-mailgate
+config.status:637: creating bin/webmux.pl
+
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+
+ac_cv_env_PERL_set=
+ac_cv_env_PERL_value=
+ac_cv_env_build_alias_set=
+ac_cv_env_build_alias_value=
+ac_cv_env_host_alias_set=
+ac_cv_env_host_alias_value=
+ac_cv_env_target_alias_set=
+ac_cv_env_target_alias_value=
+ac_cv_path_PERL=/usr/bin/perl
+ac_cv_path_install='/usr/bin/install -c'
+
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+
+#define PACKAGE_NAME "RT"
+#define PACKAGE_TARNAME "rt"
+#define PACKAGE_VERSION "3.0.4"
+#define PACKAGE_STRING "RT 3.0.4"
+#define PACKAGE_BUGREPORT "rt-3.0-bugs@fsck.com"
+
+configure: exit 0
diff --git a/rt/config.pld b/rt/config.pld
new file mode 100644
index 000000000..c71c7bbdd
--- /dev/null
+++ b/rt/config.pld
@@ -0,0 +1,19 @@
+(test "x$prefix" = "xNONE" || test "x$prefix" = "x") && prefix=/opt/rt3
+(test "x$exec_prefix" = "xNONE" || test "x$exec_prefix" = "x") && exec_prefix=${prefix}
+bindir=${exec_prefix}/bin
+sbindir=${exec_prefix}/sbin
+sysconfdir=${prefix}/etc
+mandir=${prefix}/man
+libdir=${prefix}/lib
+datadir=${prefix}/share
+(test "x$htmldir" = "xNONE" || test "x$htmldir" = "x") && htmldir=${datadir}/html
+(test "x$manualdir" = "xNONE" || test "x$manualdir" = "x") && manualdir=${datadir}/doc
+localstatedir=${prefix}/var
+(test "x$logfiledir" = "xNONE" || test "x$logfiledir" = "x") && logfiledir=${localstatedir}/log
+(test "x$masonstatedir" = "xNONE" || test "x$masonstatedir" = "x") && masonstatedir=${localstatedir}/mason_data
+(test "x$sessionstatedir" = "xNONE" || test "x$sessionstatedir" = "x") && sessionstatedir=${localstatedir}/session_data
+(test "x$customdir" = "xNONE" || test "x$customdir" = "x") && customdir=${prefix}/local
+(test "x$custometcdir" = "xNONE" || test "x$custometcdir" = "x") && custometcdir=${customdir}/etc
+(test "x$customhtmldir" = "xNONE" || test "x$customhtmldir" = "x") && customhtmldir=${customdir}/html
+(test "x$customlexdir" = "xNONE" || test "x$customlexdir" = "x") && customlexdir=${customdir}/po
+(test "x$customlibdir" = "xNONE" || test "x$customlibdir" = "x") && customlibdir=${customdir}/lib
diff --git a/rt/config.status b/rt/config.status
new file mode 100755
index 000000000..e7d835894
--- /dev/null
+++ b/rt/config.status
@@ -0,0 +1,711 @@
+#! /bin/sh
+# Generated by configure.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# NLS nuisances.
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
+    { $as_unset LANG || test "${LANG+set}" != set; } ||
+      { LANG=C; export LANG; }
+(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
+    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
+      { LC_ALL=C; export LC_ALL; }
+(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
+    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
+      { LC_TIME=C; export LC_TIME; }
+(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
+    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
+      { LC_CTYPE=C; export LC_CTYPE; }
+(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
+    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
+      { LANGUAGE=C; export LANGUAGE; }
+(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
+    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
+      { LC_COLLATE=C; export LC_COLLATE; }
+(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
+    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
+      { LC_NUMERIC=C; export LC_NUMERIC; }
+(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
+    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
+      { LC_MESSAGES=C; export LC_MESSAGES; }
+
+
+# Name of the executable.
+as_me=`(basename "$0") 2>/dev/null ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conftest.sh
+  echo  "exit 0"   >>conftest.sh
+  chmod +x conftest.sh
+  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conftest.sh
+fi
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+
+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
+	 /*)
+	   if ("$as_dir/$as_base" -c '
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
+    ' >$as_me.lineno &&
+  chmod +x $as_me.lineno ||
+    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
+
+exec 6>&1
+
+# Open the log real soon, to keep \$[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.  Logging --version etc. is OK.
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+} >&5
+cat >&5 <<_CSEOF
+
+This file was extended by RT $as_me 3.0.4, which was
+generated by GNU Autoconf 2.53.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+_CSEOF
+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+echo >&5
+config_files=" sbin/rt-setup-database sbin/rt-test-dependencies Makefile etc/RT_Config.pm lib/RT.pm lib/t/00smoke.t lib/t/01harness.t lib/t/02regression.t lib/t/03web.pl lib/t/04_send_email.pl bin/mason_handler.fcgi bin/mason_handler.scgi bin/mason_handler.svc bin/rt-commit-handler bin/rt-crontool bin/rt-mailgate bin/webmux.pl"
+
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number, then exit
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+  --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Report bugs to <bug-autoconf@gnu.org>."
+ac_cs_version="\
+RT config.status 3.0.4
+configured by ./configure, generated by GNU Autoconf 2.53,
+  with options \"\"
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+srcdir=.
+INSTALL="/usr/bin/install -c"
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=*)
+    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    shift
+    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
+    shift
+    ;;
+  -*);;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_need_defaults=false;;
+  esac
+
+  case $1 in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    echo "running /bin/sh ./configure "  " --no-create --no-recursion"
+    exec /bin/sh ./configure  --no-create --no-recursion ;;
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
+  --he | --h)
+    # Conflict between --help and --header
+    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    shift
+    CONFIG_FILES="$CONFIG_FILES $1"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $1"
+    ac_need_defaults=false;;
+
+  # This is an error.
+  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1" ;;
+
+  esac
+  shift
+done
+
+for ac_config_target in $ac_config_targets
+do
+  case "$ac_config_target" in
+  # Handling of arguments.
+  "sbin/rt-setup-database" ) CONFIG_FILES="$CONFIG_FILES sbin/rt-setup-database" ;;
+  "sbin/rt-test-dependencies" ) CONFIG_FILES="$CONFIG_FILES sbin/rt-test-dependencies" ;;
+  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "etc/RT_Config.pm" ) CONFIG_FILES="$CONFIG_FILES etc/RT_Config.pm" ;;
+  "lib/RT.pm" ) CONFIG_FILES="$CONFIG_FILES lib/RT.pm" ;;
+  "lib/t/00smoke.t" ) CONFIG_FILES="$CONFIG_FILES lib/t/00smoke.t" ;;
+  "lib/t/01harness.t" ) CONFIG_FILES="$CONFIG_FILES lib/t/01harness.t" ;;
+  "lib/t/02regression.t" ) CONFIG_FILES="$CONFIG_FILES lib/t/02regression.t" ;;
+  "lib/t/03web.pl" ) CONFIG_FILES="$CONFIG_FILES lib/t/03web.pl" ;;
+  "lib/t/04_send_email.pl" ) CONFIG_FILES="$CONFIG_FILES lib/t/04_send_email.pl" ;;
+  "bin/mason_handler.fcgi" ) CONFIG_FILES="$CONFIG_FILES bin/mason_handler.fcgi" ;;
+  "bin/mason_handler.scgi" ) CONFIG_FILES="$CONFIG_FILES bin/mason_handler.scgi" ;;
+  "bin/mason_handler.svc" ) CONFIG_FILES="$CONFIG_FILES bin/mason_handler.svc" ;;
+  "bin/rt-commit-handler" ) CONFIG_FILES="$CONFIG_FILES bin/rt-commit-handler" ;;
+  "bin/rt-crontool" ) CONFIG_FILES="$CONFIG_FILES bin/rt-crontool" ;;
+  "bin/rt-mailgate" ) CONFIG_FILES="$CONFIG_FILES bin/rt-mailgate" ;;
+  "bin/webmux.pl" ) CONFIG_FILES="$CONFIG_FILES bin/webmux.pl" ;;
+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+fi
+
+# Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+
+# Create a (secure) tmp directory for tmp files.
+: ${TMPDIR=/tmp}
+{
+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=$TMPDIR/cs$$-$RANDOM
+  (umask 077 && mkdir $tmp)
+} ||
+{
+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+   { (exit 1); exit 1; }
+}
+
+
+#
+# CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t$/@;t t/; /@;t t$/s/[\\&,]/\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t$/,;t t/' >$tmp/subs.sed <<\CEOF
+s,@SHELL@,/bin/sh,;t t
+s,@PATH_SEPARATOR@,:,;t t
+s,@PACKAGE_NAME@,RT,;t t
+s,@PACKAGE_TARNAME@,rt,;t t
+s,@PACKAGE_VERSION@,3.0.4,;t t
+s,@PACKAGE_STRING@,RT 3.0.4,;t t
+s,@PACKAGE_BUGREPORT@,rt-3.0-bugs@fsck.com,;t t
+s,@exec_prefix@,/opt/rt3,;t t
+s,@prefix@,/opt/rt3,;t t
+s,@program_transform_name@,s,x,x,,;t t
+s,@bindir@,/opt/rt3/bin,;t t
+s,@sbindir@,/opt/rt3/sbin,;t t
+s,@libexecdir@,${exec_prefix}/libexec,;t t
+s,@datadir@,/opt/rt3/share,;t t
+s,@sysconfdir@,/opt/rt3/etc,;t t
+s,@sharedstatedir@,${prefix}/com,;t t
+s,@localstatedir@,/opt/rt3/var,;t t
+s,@libdir@,/opt/rt3/lib,;t t
+s,@includedir@,${prefix}/include,;t t
+s,@oldincludedir@,/usr/include,;t t
+s,@infodir@,${prefix}/info,;t t
+s,@mandir@,/opt/rt3/man,;t t
+s,@build_alias@,,;t t
+s,@host_alias@,,;t t
+s,@target_alias@,,;t t
+s,@DEFS@,-DPACKAGE_NAME=\"RT\" -DPACKAGE_TARNAME=\"rt\" -DPACKAGE_VERSION=\"3.0.4\" -DPACKAGE_STRING=\"RT\ 3.0.4\" -DPACKAGE_BUGREPORT=\"rt-3.0-bugs@fsck.com\" ,;t t
+s,@ECHO_C@,,;t t
+s,@ECHO_N@,-n,;t t
+s,@ECHO_T@,,;t t
+s,@LIBS@,,;t t
+s,@rt_version_major@,3,;t t
+s,@rt_version_minor@,0,;t t
+s,@rt_version_patch@,4,;t t
+s,@INSTALL_PROGRAM@,${INSTALL},;t t
+s,@INSTALL_SCRIPT@,${INSTALL},;t t
+s,@INSTALL_DATA@,${INSTALL} -m 644,;t t
+s,@PERL@,/usr/bin/perl,;t t
+s,@SPEEDY_BIN@,/usr/local/bin/speedy,;t t
+s,@exp_prefix@,/opt/rt3,;t t
+s,@exp_exec_prefix@,/opt/rt3,;t t
+s,@exp_bindir@,/opt/rt3/bin,;t t
+s,@exp_sbindir@,/opt/rt3/sbin,;t t
+s,@exp_sysconfdir@,/opt/rt3/etc,;t t
+s,@exp_mandir@,/opt/rt3/man,;t t
+s,@exp_libdir@,/opt/rt3/lib,;t t
+s,@exp_datadir@,/opt/rt3/share,;t t
+s,@htmldir@,/opt/rt3/share/html,;t t
+s,@exp_htmldir@,/opt/rt3/share/html,;t t
+s,@manualdir@,/opt/rt3/share/doc,;t t
+s,@exp_manualdir@,/opt/rt3/share/doc,;t t
+s,@exp_localstatedir@,/opt/rt3/var,;t t
+s,@logfiledir@,/opt/rt3/var/log,;t t
+s,@exp_logfiledir@,/opt/rt3/var/log,;t t
+s,@masonstatedir@,/opt/rt3/var/mason_data,;t t
+s,@exp_masonstatedir@,/opt/rt3/var/mason_data,;t t
+s,@sessionstatedir@,/opt/rt3/var/session_data,;t t
+s,@exp_sessionstatedir@,/opt/rt3/var/session_data,;t t
+s,@customdir@,/opt/rt3/local,;t t
+s,@exp_customdir@,/opt/rt3/local,;t t
+s,@custometcdir@,/opt/rt3/local/etc,;t t
+s,@exp_custometcdir@,/opt/rt3/local/etc,;t t
+s,@customhtmldir@,/opt/rt3/local/html,;t t
+s,@exp_customhtmldir@,/opt/rt3/local/html,;t t
+s,@customlexdir@,/opt/rt3/local/po,;t t
+s,@exp_customlexdir@,/opt/rt3/local/po,;t t
+s,@customlibdir@,/opt/rt3/local/lib,;t t
+s,@exp_customlibdir@,/opt/rt3/local/lib,;t t
+s,@rt_layout_name@,RT3,;t t
+s,@RTGROUP@,rt,;t t
+s,@BIN_OWNER@,root,;t t
+s,@LIBS_OWNER@,root,;t t
+s,@LIBS_GROUP@,bin,;t t
+s,@DB_TYPE@,mysql,;t t
+s,@DB_HOST@,localhost,;t t
+s,@DB_PORT@,,;t t
+s,@DB_RT_HOST@,localhost,;t t
+s,@DB_DBA@,root,;t t
+s,@DB_DATABASE@,rt3,;t t
+s,@DB_RT_USER@,rt_user,;t t
+s,@DB_RT_PASS@,rt_pass,;t t
+s,@WEB_USER@,www,;t t
+s,@WEB_GROUP@,www,;t t
+s,@RT_VERSION_MAJOR@,3,;t t
+s,@RT_VERSION_MINOR@,0,;t t
+s,@RT_VERSION_PATCH@,4,;t t
+s,@RT_PATH@,/opt/rt3,;t t
+s,@RT_DOC_PATH@,/opt/rt3/share/doc,;t t
+s,@RT_LOCAL_PATH@,/opt/rt3/local,;t t
+s,@RT_LIB_PATH@,/opt/rt3/lib,;t t
+s,@RT_ETC_PATH@,/opt/rt3/etc,;t t
+s,@CONFIG_FILE_PATH@,/opt/rt3/etc,;t t
+s,@RT_BIN_PATH@,/opt/rt3/bin,;t t
+s,@RT_SBIN_PATH@,/opt/rt3/sbin,;t t
+s,@RT_VAR_PATH@,/opt/rt3/var,;t t
+s,@RT_MAN_PATH@,/opt/rt3/man,;t t
+s,@MASON_DATA_PATH@,/opt/rt3/var/mason_data,;t t
+s,@MASON_SESSION_PATH@,/opt/rt3/var/session_data,;t t
+s,@MASON_HTML_PATH@,/opt/rt3/share/html,;t t
+s,@LOCAL_ETC_PATH@,/opt/rt3/local/etc,;t t
+s,@MASON_LOCAL_HTML_PATH@,/opt/rt3/local/html,;t t
+s,@LOCAL_LEXICON_PATH@,/opt/rt3/local/po,;t t
+s,@LOCAL_LIB_PATH@,/opt/rt3/local/lib,;t t
+s,@DESTDIR@,/opt/rt3,;t t
+s,@RT_LOG_PATH@,/opt/rt3/var/log,;t t
+CEOF
+
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    fi
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
+  fi
+fi # test -n "$CONFIG_FILES"
+
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+        cat >$tmp/stdin
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
+  esac
+
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  { case "$ac_dir" in
+  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+  *)                      as_incr_dir=.;;
+esac
+as_dummy="$ac_dir"
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+  case $as_mkdir_dir in
+    # Skip DOS drivespec
+    ?:) as_incr_dir=$as_mkdir_dir ;;
+    *)
+      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+      test -d "$as_incr_dir" ||
+        mkdir "$as_incr_dir" ||
+	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }
+    ;;
+  esac
+done; }
+
+  ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+  esac
+
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated by config.status.  */
+  if test x"$ac_file" = x-; then
+    configure_input=
+  else
+    configure_input="$ac_file.  "
+  fi
+  configure_input=$configure_input"Generated from `echo $ac_file_in |
+                                     sed 's,.*/,,'` by configure."
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         fi;;
+      esac
+    done` || { (exit 1); exit 1; }
+  sed "/^[ 	]*VPATH[ 	]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[ 	]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[ 	]*$//;
+}
+
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@abs_srcdir@,$ac_abs_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+s,@builddir@,$ac_builddir,;t t
+s,@abs_builddir@,$ac_abs_builddir,;t t
+s,@top_builddir@,$ac_top_builddir,;t t
+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
+
+done
+
+{ (exit 0); exit 0; }
diff --git a/rt/configure b/rt/configure
new file mode 100755
index 000000000..c89d759fd
--- /dev/null
+++ b/rt/configure
@@ -0,0 +1,2747 @@
+#! /bin/sh
+# From configure.ac Revision: 1.1 .
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.53 for RT 3.0.4.
+#
+# Report bugs to <rt-3.0-bugs@fsck.com>.
+#
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# NLS nuisances.
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
+    { $as_unset LANG || test "${LANG+set}" != set; } ||
+      { LANG=C; export LANG; }
+(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
+    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
+      { LC_ALL=C; export LC_ALL; }
+(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
+    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
+      { LC_TIME=C; export LC_TIME; }
+(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
+    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
+      { LC_CTYPE=C; export LC_CTYPE; }
+(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
+    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
+      { LANGUAGE=C; export LANGUAGE; }
+(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
+    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
+      { LC_COLLATE=C; export LC_COLLATE; }
+(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
+    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
+      { LC_NUMERIC=C; export LC_NUMERIC; }
+(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
+    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
+      { LC_MESSAGES=C; export LC_MESSAGES; }
+
+
+# Name of the executable.
+as_me=`(basename "$0") 2>/dev/null ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conftest.sh
+  echo  "exit 0"   >>conftest.sh
+  chmod +x conftest.sh
+  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conftest.sh
+fi
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+
+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
+	 /*)
+	   if ("$as_dir/$as_base" -c '
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
+    ' >$as_me.lineno &&
+  chmod +x $as_me.lineno ||
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
+
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+exec 6>&1
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
+# Identity of this package.
+PACKAGE_NAME='RT'
+PACKAGE_TARNAME='rt'
+PACKAGE_VERSION='3.0.4'
+PACKAGE_STRING='RT 3.0.4'
+PACKAGE_BUGREPORT='rt-3.0-bugs@fsck.com'
+
+ac_unique_file="lib/RT.pm.in"
+ac_default_prefix=/opt/rt3
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
+
+ac_prev=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval "$ac_prev=\$ac_option"
+    ac_prev=
+    continue
+  fi
+
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_option in
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+  | --da=*)
+    datadir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    eval "enable_$ac_feature=no" ;;
+
+  -enable-* | --enable-*)
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "enable_$ac_feature='$ac_optarg'" ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst \
+  | --locals | --local | --loca | --loc | --lo)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "with_$ac_package='$ac_optarg'" ;;
+
+  -without-* | --without-*)
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package | sed 's/-/_/g'`
+    eval "with_$ac_package=no" ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
+fi
+
+# Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
+do
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+              localstatedir libdir includedir oldincludedir infodir mandir
+do
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then its parent.
+  ac_confdir=`(dirname "$0") 2>/dev/null ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$0" : 'X\(//\)[^/]' \| \
+         X"$0" : 'X\(//\)$' \| \
+         X"$0" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$0" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r $srcdir/$ac_unique_file; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r $srcdir/$ac_unique_file; then
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+   { (exit 1); exit 1; }; }
+  else
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
+  fi
+fi
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_PERL_set=${PERL+set}
+ac_env_PERL_value=$PERL
+ac_cv_env_PERL_set=${PERL+set}
+ac_cv_env_PERL_value=$PERL
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures RT 3.0.4 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+_ACEOF
+
+  cat <<_ACEOF
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
+_ACEOF
+
+  cat <<\_ACEOF
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of RT 3.0.4:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-layout=LAYOUT  Use a specific directory layout (Default: RT3)
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-speedycgi=/path/to/speedy
+                          path to your speedycgi binary, if it exists
+  --with-rt-group=GROUP   group to own all files (default: rt)
+  --with-bin-owner=OWNER  user that will own rt binaries (default root)
+  --with-libs-owner=OWNER user that will own RT libraries (default root)
+  --with-libs-group=GROUP group that will own rt binaries (default bin)
+  --with-db-type=TYPE     sort of database RT will use (default: mysql) (mysql
+                          and Pg are valid)
+  --with-db-host=HOSTNAME FQDN of database server (default: localhost)
+  --with-db-port=PORT     port on which the database listens on
+  --with-db-rt-host=HOSTNAME
+                          FQDN of RT server which talks to the database server
+                          (default: localhost)
+  --with-db-dba=DBA       name of database administrator (default: root)
+  --with-db-database=DBNAME
+                          name of the database to use (default: rt3)
+  --with-db-rt-user=DBUSER
+                          name of database user (default: rt_user)
+  --with-db-rt-pass=PASSWORD
+                          password for database user (default: rt_pass)
+  --with-web-user=USER    user the web server runs as (default: www)
+  --with-web-group=GROUP  group the web server runs as (default: www)
+
+Some influential environment variables:
+  PERL        Perl interpreter command
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <rt-3.0-bugs@fsck.com>.
+_ACEOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d $ac_dir || continue
+    ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+    cd $ac_dir
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_srcdir/configure; then
+      echo
+      $SHELL $ac_srcdir/configure  --help=recursive
+    elif test -f $ac_srcdir/configure.ac ||
+           test -f $ac_srcdir/configure.in; then
+      echo
+      $ac_configure --help
+    else
+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi
+    cd $ac_popdir
+  done
+fi
+
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+  cat <<\_ACEOF
+RT configure 3.0.4
+generated by GNU Autoconf 2.53
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit 0
+fi
+exec 5>config.log
+cat >&5 <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by RT $as_me 3.0.4, which was
+generated by GNU Autoconf 2.53.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  echo "PATH: $as_dir"
+done
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell meta-characters.
+ac_configure_args=
+ac_sep=
+for ac_arg
+do
+  case $ac_arg in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n ) continue ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    continue ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  case " $ac_configure_args " in
+    *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+    *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+       ac_sep=" " ;;
+  esac
+  # Get rid of the leading space.
+done
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Be sure not to use single quotes in there, as some shells,
+# such as our DU 5.0 friend, will then `close' the trap.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+    cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+{
+  (set) 2>&1 |
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      sed -n \
+        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
+    *)
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+}
+    echo
+    if test -s confdefs.h; then
+      cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+      echo
+      sed "/^$/d" confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      echo "$as_me: caught signal $ac_signal"
+    echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core core.* *.core &&
+  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+     ' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  fi
+fi
+for ac_site_file in $CONFIG_SITE; do
+  if test -r "$ac_site_file"; then
+    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . $cache_file;;
+      *)                      . ./$cache_file;;
+    esac
+  fi
+else
+  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in `(set) 2>&1 |
+               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+  eval ac_new_val="\$ac_env_${ac_var}_value"
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+        ac_cache_corrupted=:
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+rt_version_major=3
+
+rt_version_minor=0
+
+rt_version_patch=4
+
+test "x$rt_version_major" = 'x' && rt_version_major=0
+test "x$rt_version_minor" = 'x' && rt_version_minor=0
+test "x$rt_version_patch" = 'x' && rt_version_patch=0
+
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f $ac_dir/shtool; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+  ./ | .// | /cC/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+          if test $ac_prog = install &&
+            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+            # AIX install.  It has an incompatible calling convention.
+            :
+          elif test $ac_prog = install &&
+            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+            # program-specific install script used by HP pwplus--don't use.
+            :
+          else
+            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+            break 3
+          fi
+        fi
+      done
+    done
+    ;;
+esac
+done
+
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL=$ac_install_sh
+  fi
+fi
+echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PERL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PERL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="not found"
+  ;;
+esac
+fi
+PERL=$ac_cv_path_PERL
+
+if test -n "$PERL"; then
+  echo "$as_me:$LINENO: result: $PERL" >&5
+echo "${ECHO_T}$PERL" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if test "$PERL" = 'not found'; then
+	{ { echo "$as_me:$LINENO: error: cannot use $PACKAGE_NAME without perl" >&5
+echo "$as_me: error: cannot use $PACKAGE_NAME without perl" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+# Check whether --with-speedycgi or --without-speedycgi was given.
+if test "${with_speedycgi+set}" = set; then
+  withval="$with_speedycgi"
+  SPEEDY_BIN=$withval
+else
+  SPEEDY_BIN=/usr/local/bin/speedy
+fi;
+
+
+
+
+
+# Check whether --enable-layout or --disable-layout was given.
+if test "${enable_layout+set}" = set; then
+  enableval="$enable_layout"
+  LAYOUT=$enableval
+fi;
+
+if test "x$LAYOUT" = "x"; then
+	LAYOUT="RT3"
+fi
+
+	if test ! -f $srcdir/config.layout; then
+		{ echo "$as_me:$LINENO: WARNING: Layout file $srcdir/config.layout not found" >&5
+echo "$as_me: WARNING: Layout file $srcdir/config.layout not found" >&2;}
+		rt_layout_name=no
+	else
+		pldconf=./config.pld
+		$PERL  -0777 -p -e "\$layout = '$LAYOUT';"  -e '
+		s/.*<Layout\s+$layout>//gims;
+		s/\<\/Layout\>.*//s;
+		s/^#.*$//m;
+		s/^\s+//gim;
+		s/\s+$/\n/gim;
+		s/\+$/\/rt3/gim;
+		# m4 will not let us just use $srcdir/config.layout, we need $1
+		s/^\s*((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/$1=$2/gim;
+		s/^\s*(.*?)\s*:\s*(.*)$/\(test "x\$$1" = "xNONE" || test "x\$$1" = "x") && $1=$2/gim;
+		 ' < $srcdir/config.layout > $pldconf
+
+		if test -s $pldconf; then
+			rt_layout_name=$LAYOUT
+			. $pldconf
+
+			for var in prefix exec_prefix bindir sbindir \
+				 sysconfdir mandir libdir datadir htmldir \
+				 localstatedir logfiledir masonstatedir \
+				 sessionstatedir customdir custometcdir customhtmldir \
+				 customlexdir customlibdir manualdir; do
+				eval "val=\"\$$var\""
+				val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
+				val=`echo $val |
+					sed -e 's:[\$]\([a-z_]*\):$\1:g'`
+				eval "$var='$val'"
+			done
+
+		else
+			rt_layout_name=no
+		fi
+		#rm $pldconf
+	fi
+
+
+	ap_last=''
+	ap_cur='$prefix'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_prefix="${ap_cur}"
+
+
+
+
+
+
+	ap_last=''
+	ap_cur='$exec_prefix'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_exec_prefix="${ap_cur}"
+
+
+
+
+
+
+	ap_last=''
+	ap_cur='$bindir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_bindir="${ap_cur}"
+
+
+
+
+
+
+	ap_last=''
+	ap_cur='$sbindir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_sbindir="${ap_cur}"
+
+
+
+
+
+
+	ap_last=''
+	ap_cur='$sysconfdir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_sysconfdir="${ap_cur}"
+
+
+
+
+
+
+	ap_last=''
+	ap_cur='$mandir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_mandir="${ap_cur}"
+
+
+
+
+
+
+	ap_last=''
+	ap_cur='$libdir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_libdir="${ap_cur}"
+
+
+
+
+
+
+	ap_last=''
+	ap_cur='$datadir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_datadir="${ap_cur}"
+
+
+
+
+
+
+	ap_last=''
+	ap_cur='$htmldir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_htmldir="${ap_cur}"
+
+
+
+
+
+
+	ap_last=''
+	ap_cur='$manualdir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_manualdir="${ap_cur}"
+
+
+
+
+
+
+	ap_last=''
+	ap_cur='$localstatedir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_localstatedir="${ap_cur}"
+
+
+
+
+
+
+	ap_last=''
+	ap_cur='$logfiledir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_logfiledir="${ap_cur}"
+
+
+
+
+
+
+	ap_last=''
+	ap_cur='$masonstatedir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_masonstatedir="${ap_cur}"
+
+
+
+
+
+
+	ap_last=''
+	ap_cur='$sessionstatedir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_sessionstatedir="${ap_cur}"
+
+
+
+
+
+
+	ap_last=''
+	ap_cur='$customdir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_customdir="${ap_cur}"
+
+
+
+
+
+
+	ap_last=''
+	ap_cur='$custometcdir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_custometcdir="${ap_cur}"
+
+
+
+
+
+
+	ap_last=''
+	ap_cur='$customhtmldir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_customhtmldir="${ap_cur}"
+
+
+
+
+
+
+	ap_last=''
+	ap_cur='$customlexdir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_customlexdir="${ap_cur}"
+
+
+
+
+
+
+	ap_last=''
+	ap_cur='$customlibdir'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	exp_customlibdir="${ap_cur}"
+
+
+
+
+
+echo "$as_me:$LINENO: checking for chosen layout" >&5
+echo $ECHO_N "checking for chosen layout... $ECHO_C" >&6
+if test "x$rt_layout_name" = "xno"; then
+	if test "x$LAYOUT" = "xno"; then
+		echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6
+	else
+		echo "$as_me:$LINENO: result: $LAYOUT" >&5
+echo "${ECHO_T}$LAYOUT" >&6
+	fi
+	{ { echo "$as_me:$LINENO: error: a valid layout must be specified (or the default used)" >&5
+echo "$as_me: error: a valid layout must be specified (or the default used)" >&2;}
+   { (exit 1); exit 1; }; }
+else
+
+	echo "$as_me:$LINENO: result: $rt_layout_name" >&5
+echo "${ECHO_T}$rt_layout_name" >&6
+fi
+
+
+
+# Check whether --with-rt-group or --without-rt-group was given.
+if test "${with_rt_group+set}" = set; then
+  withval="$with_rt_group"
+  RTGROUP=$withval
+else
+  RTGROUP=rt
+fi;
+
+
+
+# Check whether --with-bin-owner or --without-bin-owner was given.
+if test "${with_bin_owner+set}" = set; then
+  withval="$with_bin_owner"
+  BIN_OWNER=$withval
+else
+  BIN_OWNER=root
+fi;
+
+
+
+# Check whether --with-libs-owner or --without-libs-owner was given.
+if test "${with_libs_owner+set}" = set; then
+  withval="$with_libs_owner"
+  LIBS_OWNER=$withval
+else
+  LIBS_OWNER=root
+fi;
+
+
+
+# Check whether --with-libs-group or --without-libs-group was given.
+if test "${with_libs_group+set}" = set; then
+  withval="$with_libs_group"
+  LIBS_GROUP=$withval
+else
+  LIBS_GROUP=bin
+fi;
+
+
+
+# Check whether --with-db-type or --without-db-type was given.
+if test "${with_db_type+set}" = set; then
+  withval="$with_db_type"
+  DB_TYPE=$withval
+else
+  DB_TYPE=mysql
+fi;
+if test "$DB_TYPE" != 'mysql' -a "$DB_TYPE" != 'Pg' -a "$DB_TYPE" != 'SQLite'; then
+	{ { echo "$as_me:$LINENO: error: Only Pg and mysql are valid db types" >&5
+echo "$as_me: error: Only Pg and mysql are valid db types" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+
+# Check whether --with-db-host or --without-db-host was given.
+if test "${with_db_host+set}" = set; then
+  withval="$with_db_host"
+  DB_HOST=$withval
+else
+  DB_HOST=localhost
+fi;
+
+
+
+# Check whether --with-db-port or --without-db-port was given.
+if test "${with_db_port+set}" = set; then
+  withval="$with_db_port"
+  DB_PORT=$withval
+else
+  DB_PORT=
+fi;
+
+
+
+# Check whether --with-db-rt-host or --without-db-rt-host was given.
+if test "${with_db_rt_host+set}" = set; then
+  withval="$with_db_rt_host"
+  DB_RT_HOST=$withval
+else
+  DB_RT_HOST=localhost
+fi;
+
+
+
+# Check whether --with-db-dba or --without-db-dba was given.
+if test "${with_db_dba+set}" = set; then
+  withval="$with_db_dba"
+  DB_DBA=$withval
+else
+  DB_DBA=root
+fi;
+
+
+
+# Check whether --with-db-database or --without-db-database was given.
+if test "${with_db_database+set}" = set; then
+  withval="$with_db_database"
+  DB_DATABASE=$withval
+else
+  DB_DATABASE=rt3
+fi;
+
+
+
+# Check whether --with-db-rt-user or --without-db-rt-user was given.
+if test "${with_db_rt_user+set}" = set; then
+  withval="$with_db_rt_user"
+  DB_RT_USER=$withval
+else
+  DB_RT_USER=rt_user
+fi;
+
+
+
+# Check whether --with-db-rt-pass or --without-db-rt-pass was given.
+if test "${with_db_rt_pass+set}" = set; then
+  withval="$with_db_rt_pass"
+  DB_RT_PASS=$withval
+else
+  DB_RT_PASS=rt_pass
+fi;
+
+
+
+# Check whether --with-web-user or --without-web-user was given.
+if test "${with_web_user+set}" = set; then
+  withval="$with_web_user"
+  WEB_USER=$withval
+else
+  WEB_USER=www
+fi;
+
+
+
+# Check whether --with-web-group or --without-web-group was given.
+if test "${with_web_group+set}" = set; then
+  withval="$with_web_group"
+  WEB_GROUP=$withval
+else
+  WEB_GROUP=www
+fi;
+
+
+
+RT_VERSION_MAJOR=${rt_version_major}
+
+RT_VERSION_MINOR=${rt_version_minor}
+
+RT_VERSION_PATCH=${rt_version_patch}
+
+
+RT_PATH=${exp_prefix}
+
+RT_DOC_PATH=${exp_manualdir}
+
+RT_LOCAL_PATH=${exp_customdir}
+
+RT_LIB_PATH=${exp_libdir}
+
+RT_ETC_PATH=${exp_sysconfdir}
+
+CONFIG_FILE_PATH=${exp_sysconfdir}
+
+RT_BIN_PATH=${exp_bindir}
+
+RT_SBIN_PATH=${exp_sbindir}
+
+RT_VAR_PATH=${exp_localstatedir}
+
+RT_MAN_PATH=${exp_mandir}
+
+MASON_DATA_PATH=${exp_masonstatedir}
+
+MASON_SESSION_PATH=${exp_sessionstatedir}
+
+MASON_HTML_PATH=${exp_htmldir}
+
+LOCAL_ETC_PATH=${exp_custometcdir}
+
+MASON_LOCAL_HTML_PATH=${exp_customhtmldir}
+
+LOCAL_LEXICON_PATH=${exp_customlexdir}
+
+LOCAL_LIB_PATH=${exp_customlibdir}
+
+DESTDIR=${exp_prefix}
+
+RT_LOG_PATH=${exp_logfiledir}
+
+
+
+ac_config_files="$ac_config_files sbin/rt-setup-database sbin/rt-test-dependencies Makefile etc/RT_Config.pm lib/RT.pm lib/t/00smoke.t lib/t/01harness.t lib/t/02regression.t lib/t/03web.pl lib/t/04_send_email.pl bin/mason_handler.fcgi bin/mason_handler.scgi bin/mason_handler.svc bin/rt-commit-handler bin/rt-crontool bin/rt-mailgate bin/webmux.pl"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+        "s/'/'\\\\''/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if cmp -s $cache_file confcache; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[ 	]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[ 	]*$//;
+}'
+fi
+
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then we branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+cat >confdef2opt.sed <<\_ACEOF
+t clear
+: clear
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+d
+: quote
+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
+_ACEOF
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output.  A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
+
+
+
+: ${CONFIG_STATUS=./config.status}
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# NLS nuisances.
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
+    { $as_unset LANG || test "${LANG+set}" != set; } ||
+      { LANG=C; export LANG; }
+(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
+    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
+      { LC_ALL=C; export LC_ALL; }
+(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
+    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
+      { LC_TIME=C; export LC_TIME; }
+(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
+    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
+      { LC_CTYPE=C; export LC_CTYPE; }
+(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
+    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
+      { LANGUAGE=C; export LANGUAGE; }
+(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
+    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
+      { LC_COLLATE=C; export LC_COLLATE; }
+(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
+    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
+      { LC_NUMERIC=C; export LC_NUMERIC; }
+(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
+    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
+      { LC_MESSAGES=C; export LC_MESSAGES; }
+
+
+# Name of the executable.
+as_me=`(basename "$0") 2>/dev/null ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conftest.sh
+  echo  "exit 0"   >>conftest.sh
+  chmod +x conftest.sh
+  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conftest.sh
+fi
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+
+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
+	 /*)
+	   if ("$as_dir/$as_base" -c '
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
+    ' >$as_me.lineno &&
+  chmod +x $as_me.lineno ||
+    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
+
+exec 6>&1
+
+# Open the log real soon, to keep \$[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.  Logging --version etc. is OK.
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+} >&5
+cat >&5 <<_CSEOF
+
+This file was extended by RT $as_me 3.0.4, which was
+generated by GNU Autoconf 2.53.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+_CSEOF
+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+echo >&5
+_ACEOF
+
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number, then exit
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+  --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Report bugs to <bug-autoconf@gnu.org>."
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
+ac_cs_version="\\
+RT config.status 3.0.4
+configured by $0, generated by GNU Autoconf 2.53,
+  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+srcdir=$srcdir
+INSTALL="$INSTALL"
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=*)
+    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    shift
+    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
+    shift
+    ;;
+  -*);;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_need_defaults=false;;
+  esac
+
+  case $1 in
+  # Handling of the options.
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
+    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
+  --he | --h)
+    # Conflict between --help and --header
+    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    shift
+    CONFIG_FILES="$CONFIG_FILES $1"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $1"
+    ac_need_defaults=false;;
+
+  # This is an error.
+  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1" ;;
+
+  esac
+  shift
+done
+
+_ACEOF
+
+
+
+
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+for ac_config_target in $ac_config_targets
+do
+  case "$ac_config_target" in
+  # Handling of arguments.
+  "sbin/rt-setup-database" ) CONFIG_FILES="$CONFIG_FILES sbin/rt-setup-database" ;;
+  "sbin/rt-test-dependencies" ) CONFIG_FILES="$CONFIG_FILES sbin/rt-test-dependencies" ;;
+  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "etc/RT_Config.pm" ) CONFIG_FILES="$CONFIG_FILES etc/RT_Config.pm" ;;
+  "lib/RT.pm" ) CONFIG_FILES="$CONFIG_FILES lib/RT.pm" ;;
+  "lib/t/00smoke.t" ) CONFIG_FILES="$CONFIG_FILES lib/t/00smoke.t" ;;
+  "lib/t/01harness.t" ) CONFIG_FILES="$CONFIG_FILES lib/t/01harness.t" ;;
+  "lib/t/02regression.t" ) CONFIG_FILES="$CONFIG_FILES lib/t/02regression.t" ;;
+  "lib/t/03web.pl" ) CONFIG_FILES="$CONFIG_FILES lib/t/03web.pl" ;;
+  "lib/t/04_send_email.pl" ) CONFIG_FILES="$CONFIG_FILES lib/t/04_send_email.pl" ;;
+  "bin/mason_handler.fcgi" ) CONFIG_FILES="$CONFIG_FILES bin/mason_handler.fcgi" ;;
+  "bin/mason_handler.scgi" ) CONFIG_FILES="$CONFIG_FILES bin/mason_handler.scgi" ;;
+  "bin/mason_handler.svc" ) CONFIG_FILES="$CONFIG_FILES bin/mason_handler.svc" ;;
+  "bin/rt-commit-handler" ) CONFIG_FILES="$CONFIG_FILES bin/rt-commit-handler" ;;
+  "bin/rt-crontool" ) CONFIG_FILES="$CONFIG_FILES bin/rt-crontool" ;;
+  "bin/rt-mailgate" ) CONFIG_FILES="$CONFIG_FILES bin/rt-mailgate" ;;
+  "bin/webmux.pl" ) CONFIG_FILES="$CONFIG_FILES bin/webmux.pl" ;;
+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+fi
+
+# Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+
+# Create a (secure) tmp directory for tmp files.
+: ${TMPDIR=/tmp}
+{
+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=$TMPDIR/cs$$-$RANDOM
+  (umask 077 && mkdir $tmp)
+} ||
+{
+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+   { (exit 1); exit 1; }
+}
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
+
+#
+# CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@build_alias@,$build_alias,;t t
+s,@host_alias@,$host_alias,;t t
+s,@target_alias@,$target_alias,;t t
+s,@DEFS@,$DEFS,;t t
+s,@ECHO_C@,$ECHO_C,;t t
+s,@ECHO_N@,$ECHO_N,;t t
+s,@ECHO_T@,$ECHO_T,;t t
+s,@LIBS@,$LIBS,;t t
+s,@rt_version_major@,$rt_version_major,;t t
+s,@rt_version_minor@,$rt_version_minor,;t t
+s,@rt_version_patch@,$rt_version_patch,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@PERL@,$PERL,;t t
+s,@SPEEDY_BIN@,$SPEEDY_BIN,;t t
+s,@exp_prefix@,$exp_prefix,;t t
+s,@exp_exec_prefix@,$exp_exec_prefix,;t t
+s,@exp_bindir@,$exp_bindir,;t t
+s,@exp_sbindir@,$exp_sbindir,;t t
+s,@exp_sysconfdir@,$exp_sysconfdir,;t t
+s,@exp_mandir@,$exp_mandir,;t t
+s,@exp_libdir@,$exp_libdir,;t t
+s,@exp_datadir@,$exp_datadir,;t t
+s,@htmldir@,$htmldir,;t t
+s,@exp_htmldir@,$exp_htmldir,;t t
+s,@manualdir@,$manualdir,;t t
+s,@exp_manualdir@,$exp_manualdir,;t t
+s,@exp_localstatedir@,$exp_localstatedir,;t t
+s,@logfiledir@,$logfiledir,;t t
+s,@exp_logfiledir@,$exp_logfiledir,;t t
+s,@masonstatedir@,$masonstatedir,;t t
+s,@exp_masonstatedir@,$exp_masonstatedir,;t t
+s,@sessionstatedir@,$sessionstatedir,;t t
+s,@exp_sessionstatedir@,$exp_sessionstatedir,;t t
+s,@customdir@,$customdir,;t t
+s,@exp_customdir@,$exp_customdir,;t t
+s,@custometcdir@,$custometcdir,;t t
+s,@exp_custometcdir@,$exp_custometcdir,;t t
+s,@customhtmldir@,$customhtmldir,;t t
+s,@exp_customhtmldir@,$exp_customhtmldir,;t t
+s,@customlexdir@,$customlexdir,;t t
+s,@exp_customlexdir@,$exp_customlexdir,;t t
+s,@customlibdir@,$customlibdir,;t t
+s,@exp_customlibdir@,$exp_customlibdir,;t t
+s,@rt_layout_name@,$rt_layout_name,;t t
+s,@RTGROUP@,$RTGROUP,;t t
+s,@BIN_OWNER@,$BIN_OWNER,;t t
+s,@LIBS_OWNER@,$LIBS_OWNER,;t t
+s,@LIBS_GROUP@,$LIBS_GROUP,;t t
+s,@DB_TYPE@,$DB_TYPE,;t t
+s,@DB_HOST@,$DB_HOST,;t t
+s,@DB_PORT@,$DB_PORT,;t t
+s,@DB_RT_HOST@,$DB_RT_HOST,;t t
+s,@DB_DBA@,$DB_DBA,;t t
+s,@DB_DATABASE@,$DB_DATABASE,;t t
+s,@DB_RT_USER@,$DB_RT_USER,;t t
+s,@DB_RT_PASS@,$DB_RT_PASS,;t t
+s,@WEB_USER@,$WEB_USER,;t t
+s,@WEB_GROUP@,$WEB_GROUP,;t t
+s,@RT_VERSION_MAJOR@,$RT_VERSION_MAJOR,;t t
+s,@RT_VERSION_MINOR@,$RT_VERSION_MINOR,;t t
+s,@RT_VERSION_PATCH@,$RT_VERSION_PATCH,;t t
+s,@RT_PATH@,$RT_PATH,;t t
+s,@RT_DOC_PATH@,$RT_DOC_PATH,;t t
+s,@RT_LOCAL_PATH@,$RT_LOCAL_PATH,;t t
+s,@RT_LIB_PATH@,$RT_LIB_PATH,;t t
+s,@RT_ETC_PATH@,$RT_ETC_PATH,;t t
+s,@CONFIG_FILE_PATH@,$CONFIG_FILE_PATH,;t t
+s,@RT_BIN_PATH@,$RT_BIN_PATH,;t t
+s,@RT_SBIN_PATH@,$RT_SBIN_PATH,;t t
+s,@RT_VAR_PATH@,$RT_VAR_PATH,;t t
+s,@RT_MAN_PATH@,$RT_MAN_PATH,;t t
+s,@MASON_DATA_PATH@,$MASON_DATA_PATH,;t t
+s,@MASON_SESSION_PATH@,$MASON_SESSION_PATH,;t t
+s,@MASON_HTML_PATH@,$MASON_HTML_PATH,;t t
+s,@LOCAL_ETC_PATH@,$LOCAL_ETC_PATH,;t t
+s,@MASON_LOCAL_HTML_PATH@,$MASON_LOCAL_HTML_PATH,;t t
+s,@LOCAL_LEXICON_PATH@,$LOCAL_LEXICON_PATH,;t t
+s,@LOCAL_LIB_PATH@,$LOCAL_LIB_PATH,;t t
+s,@DESTDIR@,$DESTDIR,;t t
+s,@RT_LOG_PATH@,$RT_LOG_PATH,;t t
+CEOF
+
+_ACEOF
+
+  cat >>$CONFIG_STATUS <<\_ACEOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    fi
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
+  fi
+fi # test -n "$CONFIG_FILES"
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+        cat >$tmp/stdin
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
+  esac
+
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  { case "$ac_dir" in
+  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+  *)                      as_incr_dir=.;;
+esac
+as_dummy="$ac_dir"
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+  case $as_mkdir_dir in
+    # Skip DOS drivespec
+    ?:) as_incr_dir=$as_mkdir_dir ;;
+    *)
+      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+      test -d "$as_incr_dir" ||
+        mkdir "$as_incr_dir" ||
+	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }
+    ;;
+  esac
+done; }
+
+  ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+  esac
+
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated by config.status.  */
+  if test x"$ac_file" = x-; then
+    configure_input=
+  else
+    configure_input="$ac_file.  "
+  fi
+  configure_input=$configure_input"Generated from `echo $ac_file_in |
+                                     sed 's,.*/,,'` by configure."
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         fi;;
+      esac
+    done` || { (exit 1); exit 1; }
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+  sed "$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@abs_srcdir@,$ac_abs_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+s,@builddir@,$ac_builddir,;t t
+s,@abs_builddir@,$ac_abs_builddir,;t t
+s,@top_builddir@,$ac_top_builddir,;t t
+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
+
+done
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+{ (exit 0); exit 0; }
+_ACEOF
+chmod +x $CONFIG_STATUS
+ac_clean_files=$ac_clean_files_save
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi
+
diff --git a/rt/configure.ac b/rt/configure.ac
new file mode 100644
index 000000000..cd82c4460
--- /dev/null
+++ b/rt/configure.ac
@@ -0,0 +1,209 @@
+dnl
+dnl Process this file with autoconf to produce a configure script
+dnl
+dnl Embed in generated ./configure script the following CVS info:
+AC_REVISION($Revision: 1.1 $)dnl
+
+dnl Setup autoconf
+AC_PREREQ(2.53)
+AC_INIT(RT, [3.0.4], [rt-3.0-bugs@fsck.com])
+AC_CONFIG_SRCDIR([lib/RT.pm.in])
+
+dnl Extract RT version number components
+AC_SUBST([rt_version_major],
+	m4_bregexp(AC_PACKAGE_VERSION,[^\(\w+\)\.\(\w+\)\(\.\(\w+\)\)?],[\1]))
+AC_SUBST([rt_version_minor],
+	m4_bregexp(AC_PACKAGE_VERSION,[^\(\w+\)\.\(\w+\)\(\.\(\w+\)\)?],[\2]))
+AC_SUBST([rt_version_patch],
+	m4_bregexp(AC_PACKAGE_VERSION,[^\(\w+\)\.\(\w+\)\(\.\(\w+\)\)?],[\4]))
+test "x$rt_version_major" = 'x' && rt_version_major=0
+test "x$rt_version_minor" = 'x' && rt_version_minor=0
+test "x$rt_version_patch" = 'x' && rt_version_patch=0
+
+dnl Check for programs
+AC_PROG_INSTALL
+AC_ARG_VAR([PERL],[Perl interpreter command])
+AC_PATH_PROG([PERL], [perl], [not found])
+if test "$PERL" = 'not found'; then
+	AC_MSG_ERROR([cannot use $PACKAGE_NAME without perl])
+fi
+dnl SPEED_BIN
+AC_ARG_WITH(speedycgi,
+	    AC_HELP_STRING([--with-speedycgi=/path/to/speedy],
+	    		   [path to your speedycgi binary, if it exists]),
+            SPEEDY_BIN=$withval,
+            SPEEDY_BIN=/usr/local/bin/speedy) 
+AC_SUBST(SPEEDY_BIN)
+
+
+dnl Defaults paths for installation
+AC_PREFIX_DEFAULT([/opt/rt3])
+RT_ENABLE_LAYOUT
+
+dnl RTGROUP
+AC_ARG_WITH(rt-group,
+	    AC_HELP_STRING([--with-rt-group=GROUP],
+	    		   [group to own all files (default: rt)]),
+            RTGROUP=$withval,
+            RTGROUP=rt)
+AC_SUBST(RTGROUP)
+
+dnl BIN_OWNER
+AC_ARG_WITH(bin-owner,
+	    AC_HELP_STRING([--with-bin-owner=OWNER],
+	    		   [user that will own rt binaries (default root)]),
+            BIN_OWNER=$withval,
+            BIN_OWNER=root)
+AC_SUBST(BIN_OWNER)
+
+dnl LIBS_OWNER
+AC_ARG_WITH(libs-owner,
+	    AC_HELP_STRING([--with-libs-owner=OWNER],
+	    		   [user that will own RT libraries (default root)]),
+            LIBS_OWNER=$withval,
+            LIBS_OWNER=root)
+AC_SUBST(LIBS_OWNER)
+
+dnl LIBS_GROUP
+AC_ARG_WITH(libs-group,
+	    AC_HELP_STRING([--with-libs-group=GROUP],
+	    		   [group that will own rt binaries (default bin)]),
+            LIBS_GROUP=$withval,
+            LIBS_GROUP=bin)
+AC_SUBST(LIBS_GROUP)
+
+dnl DB_TYPE
+AC_ARG_WITH(db-type,
+	    AC_HELP_STRING([--with-db-type=TYPE],
+	    		   [sort of database RT will use (default: mysql) (mysql and Pg are valid)]), 
+            DB_TYPE=$withval,
+            DB_TYPE=mysql)
+if test "$DB_TYPE" != 'mysql' -a "$DB_TYPE" != 'Pg' -a "$DB_TYPE" != 'SQLite'; then
+	AC_MSG_ERROR([Only Pg and mysql are valid db types])
+fi
+AC_SUBST(DB_TYPE)
+
+dnl DB_HOST
+AC_ARG_WITH(db-host,
+	    AC_HELP_STRING([--with-db-host=HOSTNAME],
+	    		   [FQDN of database server (default: localhost)]),
+            DB_HOST=$withval,
+            DB_HOST=localhost)
+AC_SUBST(DB_HOST)
+
+dnl DB_PORT
+AC_ARG_WITH(db-port,
+	    AC_HELP_STRING([--with-db-port=PORT],
+	    		   [port on which the database listens on]),
+            DB_PORT=$withval,
+            DB_PORT=)
+AC_SUBST(DB_PORT)
+
+dnl DB_RT_HOST
+AC_ARG_WITH(db-rt-host,
+	    AC_HELP_STRING([--with-db-rt-host=HOSTNAME],
+	    		   [FQDN of RT server which talks to the database server (default: localhost)]),
+            DB_RT_HOST=$withval,
+            DB_RT_HOST=localhost)
+AC_SUBST(DB_RT_HOST)
+
+dnl DB_DATABASE_ADMIN
+AC_ARG_WITH(db-dba,
+	    AC_HELP_STRING([--with-db-dba=DBA],
+	    		   [name of database administrator (default: root)]),
+            DB_DBA=$withval,
+            DB_DBA=root)
+AC_SUBST(DB_DBA)
+
+dnl DB_DATABASE
+AC_ARG_WITH(db-database,
+	    AC_HELP_STRING([--with-db-database=DBNAME],
+	    		   [name of the database to use (default: rt3)]),
+            DB_DATABASE=$withval,
+            DB_DATABASE=rt3)
+AC_SUBST(DB_DATABASE)
+
+dnl DB_RT_USER
+AC_ARG_WITH(db-rt-user,
+	    AC_HELP_STRING([--with-db-rt-user=DBUSER],
+	    		   [name of database user (default: rt_user)]),
+            DB_RT_USER=$withval,
+            DB_RT_USER=rt_user)
+AC_SUBST(DB_RT_USER)
+
+dnl DB_RT_PASS
+AC_ARG_WITH(db-rt-pass,
+	    AC_HELP_STRING([--with-db-rt-pass=PASSWORD],
+	    		   [password for database user (default: rt_pass)]),
+            DB_RT_PASS=$withval,
+            DB_RT_PASS=rt_pass)
+AC_SUBST(DB_RT_PASS)
+
+dnl WEB_USER
+AC_ARG_WITH(web-user,
+	    AC_HELP_STRING([--with-web-user=USER],
+	    		   [user the web server runs as (default: www)]),
+            WEB_USER=$withval,
+            WEB_USER=www)
+AC_SUBST(WEB_USER)
+
+dnl WEB_GROUP
+AC_ARG_WITH(web-group,
+            AC_HELP_STRING([--with-web-group=GROUP],
+		           [group the web server runs as (default: www)]),
+            WEB_GROUP=$withval,
+            WEB_GROUP=www)
+AC_SUBST(WEB_GROUP)
+
+dnl This section maps the variable names this script 'natively' generates
+dnl to their existing names. They should be removed from here as the .in
+dnl files are changed to use the new names.
+
+dnl version numbers
+AC_SUBST(RT_VERSION_MAJOR,		${rt_version_major})
+AC_SUBST(RT_VERSION_MINOR,		${rt_version_minor})
+AC_SUBST(RT_VERSION_PATCH,		${rt_version_patch})
+
+dnl layout paths
+AC_SUBST([RT_PATH],			${exp_prefix})
+AC_SUBST([RT_DOC_PATH],			${exp_manualdir})
+AC_SUBST([RT_LOCAL_PATH],		${exp_customdir})
+AC_SUBST([RT_LIB_PATH],			${exp_libdir})
+AC_SUBST([RT_ETC_PATH],			${exp_sysconfdir})
+AC_SUBST([CONFIG_FILE_PATH],		${exp_sysconfdir})
+AC_SUBST([RT_BIN_PATH],			${exp_bindir})
+AC_SUBST([RT_SBIN_PATH],		${exp_sbindir})
+AC_SUBST([RT_VAR_PATH],			${exp_localstatedir})
+AC_SUBST([RT_MAN_PATH],			${exp_mandir})
+AC_SUBST([MASON_DATA_PATH],		${exp_masonstatedir})
+AC_SUBST([MASON_SESSION_PATH],		${exp_sessionstatedir})
+AC_SUBST([MASON_HTML_PATH],		${exp_htmldir})
+AC_SUBST([LOCAL_ETC_PATH],		${exp_custometcdir})
+AC_SUBST([MASON_LOCAL_HTML_PATH],	${exp_customhtmldir})
+AC_SUBST([LOCAL_LEXICON_PATH],		${exp_customlexdir})
+AC_SUBST([LOCAL_LIB_PATH],		${exp_customlibdir})
+AC_SUBST([DESTDIR],			${exp_prefix})
+AC_SUBST([RT_LOG_PATH],			${exp_logfiledir})
+
+dnl Configure the output files, and generate them.
+
+AC_CONFIG_FILES([
+		 sbin/rt-setup-database
+                 sbin/rt-test-dependencies
+                 Makefile
+		 etc/RT_Config.pm
+		 lib/RT.pm
+                 lib/t/00smoke.t
+                 lib/t/01harness.t
+                 lib/t/02regression.t
+                 lib/t/03web.pl
+                 lib/t/04_send_email.pl
+ 		 bin/mason_handler.fcgi
+ 		 bin/mason_handler.scgi
+ 		 bin/mason_handler.svc
+ 		 bin/rt-commit-handler
+ 		 bin/rt-crontool
+ 		 bin/rt-mailgate
+ 		 bin/webmux.pl]
+                )
+AC_OUTPUT
diff --git a/rt/docs/design_docs/acls b/rt/docs/design_docs/acls
index 3b9d8567c..bb093adcb 100644
--- a/rt/docs/design_docs/acls
+++ b/rt/docs/design_docs/acls
@@ -1,206 +1,50 @@
-$Header: /home/cvs/cvsroot/freeside/rt/docs/design_docs/acls,v 1.1 2002-08-12 06:17:07 ivan Exp $
 
 
+Does principal baz have right foo for object bar
 
-# {{{ Requirements 
+What rights does user baz have for object bar
 
-Here's the rough scheme I was thinking of for RT2 acls. Thoughts? I think
-it's a lot more flexible than RT 1.0, but not so crazily complex that
-it will be impossible to implement.  One of the "interesting" features
-is the ability to grant acls based on watcher status. This now lives
-in design-docs/acls
+# {{{ Which principals have right foo for object bar
 
-        jesse
 
-Who can rights be granted to:
+if ($args{'ObjectType'} eq 'Ticket') {
+     $or_check_ticket_roles = " OR ( Groups.Domain = 'TicketRole' AND Groups.Instance = '".$args{'ObjectId'}."') ";
+     # If we're looking at ticket rights, we also want to look at the associated queue rights.
+     # this is a little bit hacky, but basically, now that we've done the ticket roles magic, we load the queue object
+     # and ask all the rest of our questions about the queue.
+     my $tick = RT::Ticket->new($RT::SystemUser);
+     $tick->Load($args{'ObjectId'});
+     $args{'ObjectType'} = 'Queue';
+     $args{'ObjectId'} = $tick->QueueObj->Id();
 
-	users whose id is <foo>
-	users who are watchers of type <requestor/cc/admincc> for <queue/ticket> <id>
-	users who are watchers of type <requestor/cc/admincc> for <this ticket / this queue>
-
-
-what scope do these rights apply to
-	queue <id>
-	system
-	
-
-What rights can be granted
-	Display Ticket
-	Manipulate Ticket
-		Only users with manipulate ticket level access will see comments
-	Maniplulate Ticket Status
-	Create Ticket	
-
-	Admin Queue Watchers 
-	Admin Ticket Watchers
-	Admin user accounts
-	Admin scrips
-	Admin scripscopes
-	Admin Queue ACLS
-	Admin System ACLs
-
-# }}}
-
-
-# {{{ Prinicpals  These are the entities in your Access Control Element
-#
-
-Principal: What user does this right apply to
-
-	Made up of: 
-		PrincipalScope, PrincipalType and PrincipalId
-
-	
-	User:	
-		Scope: 	User	
-		Type: 	null
-		Id:	A userid or 0
-
-	Owner:
-		Scope:  Owner
-		Type: 	null
-		Id:	none
-
-
-	Watchers:
-
-		Scope: Ticket
-		Type:	Requestors; Cc; AdminCc
-		Id:	A ticket id or 0 for "this ticket"
-
-		Scope: Queue
-		Type:	Cc; AdminCc
-		Id:	A queue id or 0 for "this queue"
-
-
-# }}}
-
-# {{{ Object: What object does this right apply to
-
-	Object is composed of an ObjectType and an ObjectId
-
-	Type:	System 	
-	Id:	NULL
-
-	Type:	Queue
-	Id:	Integer ref to queue id or 0 for all queues
-	
-# }}}
-
-# {{{ Right: (What does this entry give the principal the right to do)
-
-
-
-	For the Object System:
-		System::SetACL
-		System::AdminScrips
-
-		User::Display
-		User::Create
-		User::Destroy
-		User::Modify
-		User::SetPassword
-
-
-
-	For the Object "Queue":
-		Queue::Admin
-		Queue::SetACL
-		Queue::Create
-		Queue::Display
-		Queue::Destroy
-		Queue::ModifyWatchers
-		Ticket::Create
-		Ticket::Destory
-		Ticket::Display
-		Ticket::Update
-		Ticket::UpdateRequestors
-		Ticket::UpdateCc
-		Ticket::UpdateAdminCc
-		Ticket::NotifyWatchers
-
-		
-		DEFERRED
-
-		Ticket::SetStatus:	(Values)
-					Open
-					Resolved
-					Stalled
-					<null> means any
-
-
-# }}}
-
-
-# {{{ Implementation:
-
-# {{{ SQL Schema 
-CREATE TABLE ACL (
-	id int not null primary_key autoincrement,
-	PrinicpalId INT(11),
-	PrincipalType VARCHAR(16),
-	PrincipalScope VARCHAR(16),
-	ObjectType VARCHAR(16),
-	ObjectId  INT,
-	Right VARCHAR(16)
-);
-
-# }}}
-
-# {{{ perl implementation of rights searches
-
-sub Principals {
-if (defined $Ticket) {
-	return "($UserPrincipal) OR ($OwnerPrincipal) OR ($WatchersPrincipal)";
-	}
-else {
-	return 	 "($UserPrincipal) OR ($WatchersPrincipal)";
-	}  
 }
-	
-$Principals = " ($UserPrincipal) OR ($OwnerPrincipal) OR ($WatchersPrincipal)";
-
-$UserPrincipal = " ( ACE.PrincipalScope = 'User') AND 
-		   ( ACE.PrincipalId = $User OR ACE.PrincipalId = 0)";
-
-$OwnerPrincipal = " ( ACE.PrinciaplScope = 'Owner') AND 
-		      ( Tickets.Owner = "$User ) AND	
-		      ( Tickets.Id = $Ticket)";
-
-$WatchersPrincipal = " ( ACE.PrincipalScope = Watchers.Scope ) AND 
-		      ( ACE.PrincipalType = Watchers.Type ) AND 
-		      ( ACL.PrincipalId = Watchers.Value ) AND 
-		      ( Watchers.Owner = $User )";
-
-$QueueObject = "( ACE.ObjectType = 'Queue' and (ACE.ObjectId = $Queue OR ACE.ObjectId = 0)";
-
-$SystemObject = "( ACE.ObjectType = 'System' )";
-
-
-# This select statement would figure out if A user has $Right at the queue level
-
-SELECT ACE.id from ACE, Watchers, Tickets WHERE ( 
-	     $QueueObject
-	     AND ( ACE.Right = $Right) 
-	     AND ($Principals))
+if ($args{'ObjectType'} eq 'Queue') {
+     $or_check_roles = " OR ( ( (Groups.Domain = 'QueueRole' AND Groups.Instance = '".$args{'ObjectId'}."') $or_check_ticket_roles ) 
+                            AND Groups.Type = ACL.PrincipalType AND Groups.Id = Principals.ObjectId AND Principals.PrincipalType = 'Group') ";
+}
 
-# This select statement would figure outif a user has $Right for the "System"
+if (defined $args{'ObjectType'} ) {
+     $or_look_at_object_rights = " OR (ACL.ObjectType = '".$args{'ObjectType'}."'  AND ACL.ObjectId = '".$args{'ObjectId'}."') ";
 
-SELECT ACE.id from ACE, Watchers, Tickets WHERE ( 
-	     ($SystemObject) AND ( ACE.Right = $Right ) AND ($Principals))
+}
 
-# }}}
+my $query = "SELECT Users.*  from ACL, Groups, Users, Principals, Principals UserPrinc, CachedGroupMembers  WHERE  
+        Users.id = UserPrinc.ObjectId AND UserPrinc.PrincipalType = 'User' AND
+        Principals.Id = CachedGroupMembers.GroupId AND 
+        CachedGroupMembers.MemberId = UserPrinc.ObjectId AND 
+        UserPrinc.PrincipalType = 'User'  AND
+        (ACL.RightName = 'SuperUser' OR  ACL.RightName = '$right') AND
+        (ACL.ObjectType = 'System' $or_look_at_object_rights) AND 
+        (
+                (ACL.PrincipalId = Principals.Id AND 
+                 Principals.ObjectId = Groups.Id AND 
+                 ACL.PrincipalType = 'Group' AND 
+                 (Groups.Domain = 'SystemInternal' OR Groups.Domain = 'UserDefined' OR Groups.Domain = 'ACLEquivalence')
+                ) 
+           $or_check_roles
+        )";
 
 # }}}
 
-# {{{ Examples
-#
-
-# }}}	
-
-
-
-Unaddressed issues:
-
-	There needs to be a more refined method for grouping users, such that members of the customer service department
-can't change sysadmins' passwords.
+What objects does principal baz have right foo for
+;
diff --git a/rt/docs/design_docs/approval_notices b/rt/docs/design_docs/approval_notices
new file mode 100644
index 000000000..5e7611924
--- /dev/null
+++ b/rt/docs/design_docs/approval_notices
@@ -0,0 +1,8 @@
+Notification on "your request approved by"
+Notification on "your request approved by all approvers"
+Notification on "your request denied by"
+Reject ticket on rejection of any approval
+
+"Ticket N is pending your approval"
+
+
diff --git a/rt/docs/design_docs/approval_template b/rt/docs/design_docs/approval_template
new file mode 100644
index 000000000..16a988c5d
--- /dev/null
+++ b/rt/docs/design_docs/approval_template
@@ -0,0 +1,25 @@
+===Create-Ticket: approval
+ {  my $name = "HR";
+     my $groups = RT::Groups->new($RT::SystemUser);
+   $groups->LimitToUserDefinedGroups();
+   $groups->Limit(FIELD => 'Name', OPERATOR => '=', VALUE => "$name");
+   $groups->WithMember($TransactionObj->CreatorObj->Id);
+
+   my $groupid = $groups->First->Id;
+
+   my $adminccs = RT::Users->new($RT::SystemUser);
+   $adminccs->WhoHaveRight(Right => 'AdminGroup', IncludeSystemRights => undef, IncludeSuperusers => 0, IncludeSubgroupMembers => 0, Object => $groups->First);
+
+    my @admins;
+    while (my $admin = $adminccs->Next) {
+        push (@admins, $admin->Name); 
+    }
+ }
+ Queue: Approvals
+ Type: Approval
+ AdminCcs: {join (", ",@admins) }
+ Depended-On-By: {$tickets{'TOP'}->Id}
+ Refers-To: {$tickets{'TOP'}->Id}
+ Due: {time + 86400}
+ Content-Type: text/plain
+ Content: Your approval is requested for the ticket {%$tickets{'TOP'}->Id}: {$tickets{'TOP'}->Subject}
diff --git a/rt/docs/design_docs/cf_search b/rt/docs/design_docs/cf_search
new file mode 100644
index 000000000..456a9febb
--- /dev/null
+++ b/rt/docs/design_docs/cf_search
@@ -0,0 +1,72 @@
+find all tickets where:
+
+
+        CF Foo 
+                Has values (talk or read) AND
+                Has values (bar and baz) AND 
+                doesn't have values (bing or bong) 
+
+
+LimitCustomFieldValues {
+        my %args = ( CustomField => undef, 
+                     ClauseId => 'CustomFields',
+                     OPERATOR => undef,
+                     ENTRYAGGREGATOR => undef,
+                     VALUES => undef,
+                     @_) ;
+
+        unless ( $self->{'TicketAliases'}{$args{'ClauseId'}}{'CustomField'} ) {
+        $self->{'TicketAliases'}{$args{'ClauseId'}}{'CustomField'} = $self->NewAlias('CustomFields');
+        $self->Join(TABLE1 =>$self->{'TicketAliases'}{$args{'ClauseId'}}{'CustomField' },  
+                    FIELD1 => 'QueueId',
+                    TABLE2 => 'main', FIELD2 => 'QueueId');
+
+        if ($args{'OPERATOR'} =~ /!=|IS/i) {
+        }
+        else {
+        }
+
+}
+        # {{{ if it's a keyword
+        elsif ( $TYPES{ $restriction->{'FIELD'} } eq 'CUSTOMFIELD' ) {
+
+            my $null_columns_ok;
+            my $TicketCFs = $self->Join( TYPE   => 'left',
+                                                ALIAS1 => 'main',
+                                                FIELD1 => 'id',
+                                                TABLE2 => 'TicketCustomFieldValues',
+                                                FIELD2 => 'Ticket' );
+
+            foreach my $value ( @{ $restriction->{'VALUES'} } ) {
+                $self->SUPER::Limit( ALIAS      => $TicketCFs,
+                                     FIELD      => 'Content',
+                                     OPERATOR   => $restriction->{'OPERATOR'},
+                                     VALUE      => $value,
+                                     QUOTEVALUE => $restriction->{'QUOTEVALUE'},
+                                     ENTRYAGGREGATOR => 'AND', );
+            }
+            if (    ( $restriction->{'OPERATOR'} =~ /^IS$/i ) or ( $restriction->{'OPERATOR'} eq '!=' ) ) {
+                $null_columns_ok = 1;
+            }
+
+            #If we're trying to find tickets where the keyword isn't somethng, also check ones where it _IS_ null
+            if ( $restriction->{'OPERATOR'} eq '!=' ) {
+                $self->SUPER::Limit( ALIAS           => $TicketCFs,
+                                     FIELD           => 'Content',
+                                     OPERATOR        => 'IS',
+                                     VALUE           => 'NULL',
+                                     QUOTEVALUE      => 0,
+                                     ENTRYAGGREGATOR => 'OR', );
+            }
+
+            $self->SUPER::Limit( LEFTJOIN => $TicketCFs,
+                                 FIELD    => 'CustomField',
+                                 VALUE    => $restriction->{'CUSTOMFIELD'},
+                                 ENTRYAGGREGATOR => 'OR' );
+
+        }
+
+        # }}}
+
+    }
+
diff --git a/rt/docs/design_docs/cli_spec b/rt/docs/design_docs/cli_spec
index 48a7f34e1..ae5f29f76 100644
--- a/rt/docs/design_docs/cli_spec
+++ b/rt/docs/design_docs/cli_spec
@@ -1,354 +1,31 @@
 
-Find tickets to operate on:
-        --id=<tickets>          Find only tickets in the range <tickets>
-                synonyms:
-                --limit-id, --tickets, --limit-tickets
-        --limit-queue=<queue>
-        --limit-status=<status>
-        --limit-owner=<owner>
-        --limit-priority=<priority>
-        --limit-requestor=<email>
-        --limit-subject=<string>      (Subject contains)
-        --limit-body=<string>         (body contains)
-        --limit-created=(before/after) <date>
-        --limit-due=(before/after) <date>
-        --limit-starts=(before/after) <date>
-        --limit-started=(before/after) <date>
+Things the cli must do
+	create ticket
+	comment
+	reply
+	update ticket metadata
+	search for tickets
+	update a bunch of tickets.
+	list tickets
+        login/logout
 
-        --limit-first=<int>           Start on the <int>th row returned by the
-                                database  
-        --limit-rows=<int>      Find only <int> rows
 
-Display:
-        --show                  shows a ticket history
-        --history               ditto
+should support multiple rt servers
 
-        --summary               default option. shows a ticket summary
-                --format        Optional format string. If not specified,
-                                uses the value of ENV{'RT_LISTING_FORMAT'}
-                                or an internal default
-        
+create/edit/update should use EDITOR or take from a file or stdin
 
-Basic ticket editing:
+should be able to update ticket sttributes from a commandline without invoking an editor or needing to use stdin.
 
-	--status=(open|stall|resolve|kill)
-	--subject=<string>
-        --owner=<owner>
-	--queue=<queue>
-	--time-left=<minutes>
+login/logout should store RT session cookies rather than constantly transmitting the username/password combo.
 
-Watcher-related editing:
+rtserver and rt username should come from env variables. but should be able to be overridden by commandline options. 
 
-	--add-requestor=<email>
-	--del-requestor=<email>
-	--add-cc=<email>
-	--del-cc=<email>
-	--add-admincc=<email>
-	--del-admincc=<email>
+rt password should be able to be specified on the commandline (say from a script) or, failing that be prompted for within the application (as rt's sbin/initdb script does) ...or maybe able to be read from a stash file on disk.
 
-Priority related editing:
+must be able to dowaload attachments from cli.
+ 
+ it might also be cool to be able to generate session-length urls for attavhments so you can use a browser. but that's not necessary.
 
-	--priority=<int>
-	--final-priority=<int>
 
-Date related editing:
-
-	--due=date
-	--starts=date
-	--started=date
-	--contacted=date
-
-
-
-Ticket updates:
-
-	--comment 
-	--reply | --respond 
-
-
-Links
-
-	--add-link 
-		--type=<DependsOn|MemberOf|RelatedTo>
-		needs one of:
-		   --target=<ticketid> 
-		   --base=<ticketid>
-
-	--del-link <link-id>
-
-
-
-Condiments:
-	any update can take:
-
-		--time-taken <minutes>
-
-	Ticket updates can take:
-
-		--source 	-- specify a source file to read the content from
-		--edit		= give me an editor to edit the message
-		--no-edit	= don't give me an editor to edit the message.
-
-
-
-
------ Forwarded message from deborah kaplan <deborah@curl.com> -----
-
-Date: Fri, 14 Apr 2000 11:43:18 -0400 (EDT)
-From: deborah kaplan <deborah@curl.com>
-To: Jesse <jesse@fsck.com>
-Subject: Re: [rt-devel] RT Projects list
-
-Finally, here is the functional spec for the command line
-interface.  This is for the user interface only; if you think
-this is right, I will add the administrative interface as well.
-Should I post to rt-devel, add to the ticket, or just modify
-based on your kibbitzing?  When you are happy with it I'll start
-the code.
-
--deborah
-
-
-RT command line interface functional specification
-Author: Deborah Kaplan (Deborah@suberic.net)
-Version:0.1
-
-Requirements: 
-
-RT needs a CLI for various reasons.  If a user is restricted to a
-dumb terminal, she needs to be able to access the RT database and
-manipulate it fully.  The full functionality of both the RT
-database and the RT administrative interface should be available
-from this CLI.
-
-There are two possible types of CLI which I will discuss here.
-The first is a curses-style interface, which allows the user to
-move about a series of menus and choices, usually using arrow
-keys.  As RT supplies a Web interface, there is no need for this
-curses-style interface to be written as part of RT.  Instead, the
-RT developers should pick one tty-based Web browser (e.g. lynx,
-w3m) and make sure that all of the RT pages are easily readable
-with that tty based browser.  Installation of that browser should
-be recommended in the RT installation documentation as a
-supported method of accessing RT from a tty.
-
-The second possible type of CLI is more minimal: a series of
-commands which can be run at a UNIX command prompt which provide
-full functionality to the RT database and administrative
-interface.  There are two major benefits to this second type of
-CLI.  First of all, in order to use this CLI, you need no extra
-tools (Web browsers, etc.).  All that is required is a UNIX
-command line prompt and an installation of RT.  Secondly, a user
-of RT who has a very specific command to run and who knows the
-appropriate CLI commands can accomplish her task much more
-quickly with a single command then she could navigating through a
-menu based interface.
-
-In the specification, I will describe the second type of CLI.
-
-Caveats:
-
-This specification draws heavily on the structure of formatting
-command line options for cvs.  RT faces a smaller version of the
-same kinds of problems cvs faces: we want to create a very rich
-command set without sacrificing ease-of-use. 
-
-I am not wedded to any specific command names if they seem
-impractical; I merely am proposing the command names that seem
-reasonable to me at this moment.
-
-Finally, I am finding the functioning of the web UI from RT 1.
-If the functionality differs greatly in RT 2, I will need to
-modify this specification.
-
-Specification:
-
-There are two commands: "rt", which is the primary interface to
-the database, and "rtadmin", which is the administrative
-interface to the database.
-
-The format of an rt command is as follows:
-
- rt <command> 
-    <command> is one of:
-
-    - help
-      print an overview of the commands which can be run
-
-    - print <queue> <options> 
-      with no options, dump to the screen a list of all open
-      requests in <queue> -- the equivalent of "Display Queue" in
-      the existing Web interface.
-
-      <queue> is the name of an RT queue
-      <option> is either:
-
-        -f <filename> |  --filename <filename>
-	   where <filename> is the name of a file (defaulting to
-	   ~/.rtrc) in which the options described below can be
-	   placed in the format "^ <long option name> <option value>
-	   $".
-
-        Or a series of the following options:
-
-        -o <owner name> |  --owner <owner name>: restrict tickets
-	viewed to those owned by <owner name>.
-	   This option can be used multiple times in one call of
-	   the rt command in order to produce a list which
-	   contains tickets owned by multiple owners.  Giving the
-	   empty string ("") as an option to this switch will
-	   restrict tickets viewed to those which have no owner.
-	   If this switch is given with no argument, the option
-	   defaults to the user name of the currently running
-	   process.
-
-        -r <requestor name> | --requestor <requestor name>:
-	restrict tickets viewed to those requested by <requestor
-	name>.
-	   This option can be used multiple times in one call of
-	   the rt command in order to produce a list which
-	   contains tickets requested by multiple requesters.  If
-	   this switch is given with no arguments, it produces an
-	   error.
-
-        -s <status> | --status <status>: restrict tickets viewed
-	to those with the status named in <status>.
-	   This option can be used multiple times in one call of
-	   the rt command in order to produce a list which
-	   contains tickets with multiple statuses (statii?
-	   Dragon NaturallySpeaking recognizes "statuses" as a
-	   word).  This option defaults to status "open".
-
-        -j <subject> | --subject <subject>: restrict tickets
-	viewed to those which contain <subject> as a substring in
-	the subject field of the ticket.
-	   This command can be used multiple times in one call of
-	   the rt command in order to produce a list which
-	   contains tickets with various subject substrings.  If
-	   the option is called with no argument, the result is
-	   an error.
-
-        -h | --help: print a usage message.
-
-        -n | --number: print out a specific ticket.
-	   This command can be used multiple times to produce a
-	   list which contains multiple tickets.  If the option
-	   is called with no argument, the result is an error.
-
-    This completes all of the print options which are available
-    in the Web interface, except the sort options.  I maintain
-    that this command is already excessively complex, and that
-    adding functionality which can be replicated easily by
-    standard UNIX tools is unnecessary added complexity.  I
-    recommend that the man pages and documentation for this
-    option contain an example of a command line run (e.g. of rt |
-    awk) which replicates the sorting functionality provided by
-    the Web interface.
-
-    - edit <ticket> <options>
-      with no options, or with no <ticket>, produces the same
-      output as the --help option.
-      Otherwise, edits the ticket with number <ticket> as
-      indicated in the options given.  All options listed below
-      except for --help and --number can be used in conjunction
-      with one another to change many features of the same ticket
-      all at once.
-
-        -h | --help: print usage message
-
-        -s <status> | --status <status>: change the status to the
-	status listed in <status>.
-	   No <status> listed, or 1 listed it does not come from
-	   a list of approve statuses, produces an error.
-
-        -o <owner name> |  --owner <owner name>: set to the owner
-	of the ticket the owner named.
-	   Follows whatever convention is finally decided on for
-	   the requirement to steal a ticket that is owned by
-	   somebody else.  No <owner named> listed has the user
-	   who is running the rt program take the ticket.  If
-	   that user is not a valid owner, or the 1 listed does
-	   not come from a list of approve names, produces an
-	   error.
-
-        -r <requestor name> | --requestor <requestor name>: sets
-	the requestor to <requestor name>.
-	   Follows any conventions that the Web UI follows to
-	   make sure that this is a legal name.  If not legal, or
-	   left blank, produces an error.
-
-        -j <subject> | --subject <subject>:  sets the subject of
-	the ticket to <subject>.
-	   If the option is called with no argument, the result
-	   is an error.
-
-        -n <number one> <number 2> | --number <number one>
-	<number 2>: merges ticket number <number one> into ticket
-	<number 2>.
-	   If both arguments are not provided, the result is an
-	   error.
-
-        -q <queue> | --queue <queue>: set the queue to that
-	named.
-	   If <queue> is not listed, or the 1 listed does not
-	   come from a list of approve queues, produces an
-	   error.
-
-        -a <area> | --area <area>: set the area of the ticket to
-	that named.
-	   If <area> is not listed, or the 1 listed does not come
-	   from a list of approve areas, produces an error.
-
-        -c <time stamp> | --contact <time stamp>: sets the last
-	user contact field, and produces an error if the format
-	is invalid.
-	   If the argument is left blank, sets the last user
-	   contact field to now.
-
-        -p <priority> | --priority <priority>: sets the current
-	priority to the 1 listed.
-	   Produces an error if the argument is left blank.
-
-        -f <priority> | --final <priority>: sets the final
-	priority to the 1 listed.
-	   Produces an error if the arguments left blank.
-
-        -d <date due> | --datedue <date due>: sets the due date
-	to the 1 listed.
-	   Produces an error if the argument is left blank, or if
-	   the format is invalid.
-
-    - comment <options>
-      with no options, this command reads from standard input
-      until it sees EOF and appends that to the ticket as a
-      comment.
-
-        -h | --help: print usage message
-
-        -c | --comment: append as a comment.  This is the default behavior.
-
-        -r | --reply: append as a reply.
-
-        -f <filename> | --file <filename>: can be used with
-	either the comment or reply options.  Instead of reading
-	from standard input, read the text of the comment or
-	reply from the file <filename>.
-
-    - report <options>
-      this command is a place holder for reporting functionality
-      which does not yet exist.  It will probably have the
-      default behavior to select reports at the command line or
-      choose default reports from a .rtrc file.  In a future
-      version, it can output graphs in some graphical format.
-
-
-
------ End forwarded message -----
-
--- 
-jesse reed vincent -- root@eruditorum.org -- jesse@fsck.com 
-70EBAC90: 2A07 FC22 7DB4 42C1 9D71 0108 41A3 3FB3 70EB AC90
-
-"If IBM _wanted_ to make clones, we could make them cheaper and faster than
-anyone else!"  - An IBM Rep. visiting Vassar College's Comp Sci Department.
+I'm envisioning this as similar to the subversion cli, actually. 
 
diff --git a/rt/docs/design_docs/delegation b/rt/docs/design_docs/delegation
new file mode 100644
index 000000000..0e5705907
--- /dev/null
+++ b/rt/docs/design_docs/delegation
@@ -0,0 +1,115 @@
+Group ACLs
+        
+        the rights:
+
+
+        CreatePersonalGroup
+        CreateGroup
+
+        AdminGroup
+                * Update group metadata and access control list
+        AdminGroupMembers
+                * Add ad delete members of this group
+        ModifyOwnMembership
+                * Join and quit this group
+
+
+        the primitives:
+       
+In user.pm
+
+=item HasRight  { Right => 'somerightname', ObjectType => 'Group', ObjectId => 'GroupId'
+
+        Returns true if this user has the right 'somerightname' for
+the group with id 'Id'
+
+=cut
+
+
+=item RightsForObject { ObjectType => 'Group', ObjectId =>'GroupId' }
+
+in users.pm
+
+=item WhoHaveRight { Right =>'somerightname', ObjectType => 'Group', ObjectId => 'GroupId' }
+
+
+        Finds all users who have the right 'somerightname' for the group
+in question.
+
+        If a user has "AdminGroupMembers" globally and we ask about 
+        group 23, that user should be found.
+
+=cut
+
+Users must be able to delegate individual rights 
+
+        * Is it that users can delegate any and all rights but it's
+        only rights they _have_ which actually grant rights.
+
+rights must not be redelegated
+
+users must be able to create groups to which rights can be delegated.
+
+Only users who have the "delegate rights" right can delegate rights.
+
+
+When a user's right to do something is revoked, the delegation must 
+be revoked
+
+        * For any delegated ACL check, the delegator's right must be 
+          checked immediately after the delegatee's right.
+          If a user has had a right delegated by multiple parties, 
+          this may mean that we need to actually loop through and check
+          a bunch of possible delegations. Or can we craft a "has delegated 
+          right" ACL check.
+          
+
+
+
+
+
+
+ACL 1 Group Q has the right to Frob ObjectI.
+ACL 2 User A has the right "DelegateRights"
+
+Group Q has the member Group S
+Group S has the member Group R
+Group S has the member Group T
+Group R has the member user A
+Group T has the member user A
+
+User A delegates to  Group P the right to Frob  ObjectI
+
+        New ACL rule:
+
+        ACL 3: Group P has the right to Frob ObjectI 
+                     as delegated from ACL1 by User A
+
+
+In the case where ACL1 is revoked:
+
+        find all acls which are delegated from ACL1.
+                Delete them
+
+In the case where User A is removed from group R
+
+        Get the list of all groups that A was in by way of group R before the removal
+        Get the list of all groups that A is in _after_ the removal.
+
+        Find all the ACEs granted to each group that A is no longer in.
+        For each ACE in that list, find all the rights that A has delegated.
+                Whack them.        
+
+In the case where Group S is removed from group Q
+
+
+        Get a list of all groups that S was in by way of Q before the removal
+        Call this list O.
+
+        For each user X who's a member of S (directly or indirectly):
+        Get a list of  all groups that X is in after removal.
+        For each group in O that X is no longer a member of:
+                Find all ACEs granted to O
+                For each ACE, look up all the delegations that X has made.
+                        For each delegation 
+                                WHACK IT
diff --git a/rt/docs/design_docs/evil_plans b/rt/docs/design_docs/evil_plans
index 34b9f81a2..5b5cc58c1 100644
--- a/rt/docs/design_docs/evil_plans
+++ b/rt/docs/design_docs/evil_plans
@@ -3,8 +3,7 @@ Current planned 2.2 feature list. subject to change.
 
 Core
 
-Should	Make "Owner" a watcher type, rather than a special ticket attribute,
-	under the hood.  This wins for ACL and code consistency reasons.
+
 
 Web UI
 
@@ -67,8 +66,6 @@ nice	Scrips could apply to a list of queues, rather than just one queue or
 
 Custom fields
 
-Must	"KeywordSelects" become "Custom Fields"
-Should	String and multi-string custom fields.
 Nice	Date custom fields
 Nice	Some way to order and group custom fields.
 Nice	Default values
@@ -79,8 +76,6 @@ Nice	Make custom fields apply to an enumerated list of queues,
 
 Web infrastructure
 
-Must	Full fastcgi support.
-
 
 Installation 
 
@@ -116,7 +111,7 @@ Nice	Export full ticket metadata and history as XML
 Note: 	I currently favor the REST philosophy that GET and POST to specific,
 	defined URLs provides everything one needs to build comprehensive
 	web services without the massive added complexity of a SOAP or XML-RPC
-	framework.
+	framework. Sadly, the world doesn't agree with me
 
 
 ACLs:
diff --git a/rt/docs/design_docs/groups_notes b/rt/docs/design_docs/groups_notes
new file mode 100644
index 000000000..234fd37fe
--- /dev/null
+++ b/rt/docs/design_docs/groups_notes
@@ -0,0 +1,88 @@
+CREATE TABLE Prinicpals (
+        id int auto_increment 
+        PrincipalType VARCHAR(16) not_null,
+        PrincipalId int # foreign key to Users or Groups, depending
+)
+
+CREATE TABLE Groups (
+        id int auto_increment,
+        Domain varchar(255), 
+        Instance varchar(16),
+        Name varchar(255),
+        Description varchar(255),
+);
+CREATE TABLE ACL (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  Principal integer NULL  , #Foreign key to principals
+  RightName varchar(25) NULL  ,
+  RightDomain varchar(25) NULL  ,
+  RightInstance integer NULL  ,
+  PRIMARY KEY (id)
+);      
+
+CREATE TABLE GroupMembers (
+        id int auto_increment,
+        Group int, # foreign key to Principals
+        Member int # foreign key to Principals
+)
+
+create table GroupMembersCache (
+        id int auto_increment,
+        Group int, # foreign key to Principals
+        Member int, # foreign key to Principals
+        Via int, #foreign key to g_m_u
+)
+
+insert into principals values ('bubbles);
+insert into principals values ('fubar');
+insert into principals values ('sheeri');
+insert into principals values ('sgw');
+
+insert into principals values ('staff');
+insert into principals values ('sysadmin');
+insert into principals values ('senior admin');
+
+
+insert into group_members values(1, 'staff', 'bubbles');
+insert into group_members values(2, 'sysadmin', 'sheeri');
+insert into group_members values(3,'senior admin', 'sgw');
+insert into group_members values(4,'senior admin', 'fubar');
+insert into group_members values(5, 'sysadmin', 'senior admin')
+        
+Groups
+
+
+      
+Domain          Queues
+Instance        <queueid#>
+Name            AdminCc, Cc
+
+/Queues/1/AdminCc
+/Queues/3/Cc
+
+Domain          Tickets
+Instance        <#n>
+Name            Owner, Requestor, Cc, AdminCc
+
+/Tickets/1/Owner
+/Tickets/1/Requestor
+/Tickets/1/Cc
+       Has members: /Queues/whatever queue the ticket has/Cc 
+/Tickets/1/AdminCc
+       Has members: /Queues/whatever queue the ticket has/AdminCc 
+
+
+Domain          Users
+Instance        <userid>
+
+/Users/1/MyDelegates
+/Users/1/MyOtherDelegates
+
+
+Domain          System
+Name            Admins, AdminManagers
+
+/System/Administrators
+/System/Blah
+
+
diff --git a/rt/docs/design_docs/recursive_group_membership_algorithm b/rt/docs/design_docs/recursive_group_membership_algorithm
new file mode 100644
index 000000000..250b9ad0d
--- /dev/null
+++ b/rt/docs/design_docs/recursive_group_membership_algorithm
@@ -0,0 +1,109 @@
+Group A has members 1, 2, 3
+
+	Cached members  1 is a member of A via ""
+			2 is a member of A via ""
+			3 is a member of A via ""
+
+
+Group B has members A, 4, 5
+
+	Cached members: 4 is a member of B via ""  $1
+			5 is a member of B via ""  $2
+			A is a member of B via ""  $3
+				1 is a member of B via "$3" $4
+				2 is a member of B via "$3" $5
+				3 is a member of B via "$3" $6
+
+Group C has members A, B, 6
+			6 is a member of C via "" $7
+			A is a member of C via "" $8
+				1 is a member of C via $8 $9
+				2 is a member of C via $8 $10
+				3 is a member of C via $8 $11
+			B is a member of C via "" $12
+				4 is a member of C via $12 $13
+				5 is a member of C via $12 $14
+				A is a member of C via $12 $15
+					1 is a member of C via $15 $16
+					2 is a member of C via $15 $17
+					3 is a member of C via $15 $18
+
+
+
+Group D has members A, C
+
+			A is a member of D via "" $19
+				1 is a member of D via $19 $20
+				2 is a member of D via $19 $21
+				3 is a member of D via $19 $22
+			C is a member of D via "" $23
+				6 is a member of D via $23 $24
+				A is a member of D via $23 $25
+					1 is a member of D via $25 $26
+					2 is a member of D via $25 $27
+					3 is a member of D via $25 $28
+				B is a member of D via $23 $29
+					4 is a member of D via $29 $30
+					5 is a member of D via $29 $31
+					A is a member of D via $29 $32
+						1 is a member of D via $32 $33
+						2 is a member of D via $32 $34
+						3 is a member of D via $32 $35
+
+			
+
+Adding a new user, 7,  to group A.
+
+
+	Add the user to group A in the groups table.
+
+	Find all entries for group A in the cache table.
+
+	For each entry in that list:
+		Add "7 is a member of $entry->top  via $entry->id"
+
+Deleting a user, 7, from group A:
+
+	Remove the user from group A in the groups table.
+	find all entries in the cache table where the principal id is user 7 and
+	the parent id is A. (requires a self join)
+		nuke them
+
+	Alternatively:
+	 find all entries for A in the cache table.
+		For each one, find the child whose id is 7. 
+			Nuke it
+
+
+Adding a group, B to group D.
+
+	Add group B as a member of D in the groups table.
+	In the cache table:
+		$id = Add group B as a member of D via ""
+                
+                For each member of group B (4, 5, A):
+
+                       $sid= 4 is a member of D via $id
+                       $sid=  5 is a member of D via $id
+                       $sid=  A is a member of D via $id
+
+                        if the member is a group itself, recurse down:
+                                
+                                1 is a member of D via $sid
+                                2 is a member of D via $sid
+                                3 is a member of D via $sid
+                               
+                Find all places where D is a member of $foo.
+                        Repeat the above procedure, substituting $foo for D
+                        and making $id D's id.
+
+Removing B as a member of D:
+
+        Remove B as a member of D in the groups table.
+        Find all references to D in the pseudogroups table.
+                Find all children of D which are B:
+                        Recurse down with the following algorithm:
+                        If it's a user, delete it.
+                        If it's a group,  recurse through each member, 
+                                deleting its children and then deleting the
+                                group itself.
diff --git a/rt/docs/design_docs/rql_parser_machine.graphviz b/rt/docs/design_docs/rql_parser_machine.graphviz
new file mode 100644
index 000000000..36463ecc9
--- /dev/null
+++ b/rt/docs/design_docs/rql_parser_machine.graphviz
@@ -0,0 +1,32 @@
+
+/* GraphViz graph representing the state diagram of the RQL parser.
+*/
+
+digraph G {
+
+    PAREN -> PAREN;
+    PAREN -> KEYWORD;
+    PAREN -> AGGREG;
+
+    AGGREG -> KEYWORD;
+    AGGREG -> PAREN;
+
+    KEYWORD -> OP;
+
+    OP -> VALUE;
+
+    VALUE -> PAREN;
+    VALUE -> AGGREG;
+
+/*
+    Blue lines represent added complexity of q[IN (x,y,z)] support.
+    The only place that the "blue tree" can be entered is at IN, and
+    exited at PAREN.
+*/
+    KEYWORD -> IN [color=blue];
+    IN -> PAREN [color=blue];
+    PAREN -> VALUE [color=blue];
+    VALUE -> COMMA [color=blue];
+    COMMA -> VALUE [color=blue]; 
+    VALUE -> PAREN [color=blue];
+}
diff --git a/rt/docs/design_docs/string-extraction-guide.txt b/rt/docs/design_docs/string-extraction-guide.txt
new file mode 100644
index 000000000..bd60a43fa
--- /dev/null
+++ b/rt/docs/design_docs/string-extraction-guide.txt
@@ -0,0 +1,100 @@
+# $File: //depot/RT/rt-devel/docs/design_docs/string-extraction-guide.txt $ $Author: ivan $
+# $Revision: 1.1 $ $Change: 1431 $ $DateTime: 2002/10/15 17:24:45 $
+
+Run 'p4 edit lib/RT/I18N/zh_tw.pm' and 'perl l10n.pl' to add new
+extractions to the zh_tw.pm.
+
+Edit lib/RT/I18N/zh_tw.pm for chinese counterparts.
+
+Attached is a copy of the freshly rewritten string extraction style guide.
+Please point out anything that's unclear or underspecified.   I
+localized a number of the core modules in RT 2.1.3 (Starting with 
+Queue_Overlay.pm). I only touched a couple of the web templates in the 
+Elements/ directory of the web ui.
+
+RT String extraction styleguide:
+
+Web templates:
+
+Templates should use the /l filtering component to call the localisation
+framework
+
+The string 		Foo!
+
+Should become		<&|/l&>Foo!</&>
+
+All newlines should be removed from localized strings, to make it easy to 
+grep the codebase for strings to be localized
+
+The string 		Foo
+			Bar
+			Baz
+			
+Should become		<&|/l&>Foo Bar Baz</&>
+
+
+Variable subsititutions should be moved to Locale::MakeText format
+
+The string		Hello, <%$name %>
+
+should become		<&|/l, $name &>Hello, [_1]</&>	
+
+
+Multiple variables work just like single variables
+ 
+The string		You found <%$num%> tickets in queue <%$queue%>
+
+should become		<&|/l, $num, $queue &>You found [_1] tickets in queue [_2]</&>
+
+When subcomponents are called in the middle of a phrase, they need to be escaped
+too:
+
+The string		 <input type="submit" value="New ticket in">&nbsp<& /Elements/SelectNewTicketQueue&>
+
+should become		<&|/l, $m->scomp('/Elements/SelectNewTicketQueue')&><input type="submit" value="New ticket in">&nbsp;[_1]</&>
+
+
+
+There are places inside the web ui where strings are defined, which need to be
+localised. it is important to note here that each localized string is split out
+onto its own line, but never split across two lines and two localized strings
+are never included on the same line. It is also important to note
+that this will genereate code which will not work in RT 2.1.3. I need
+to add a bit of framework to make it work in 2.1.4
+
+
+The string	<& /Elements/TitleBoxStart, width=> "40%", titleright => "RT $RT::VERSION for   $RT::rtname", title => 'Login' &>
+
+should become 	<& /Elements/TitleBoxStart, 
+			width=> "40%",
+			titleright => loc("RT [_1] for [_2]",$RT::VERSION, $RT::rtname),
+			title => loc('Login'),
+	      	&>
+	
+
+			
+
+
+
+Within RT's core code, every module has a localization handle available through the 'loc' method:
+
+The code 	return ( $id, "Queue created" );
+
+should become 	return ( $id, $self->loc("Queue created") );	
+
+When returning or localizing a single string, the "extra" set of parenthesis () should be omitted.
+
+The code  	return ("Subject changed to ". $self->Data );
+
+should become	 return $self->loc( "Subject changed to [_1]", $self->Data );
+
+
+It is important not to localize  the names of rights or statuses within RT's core, as there is logic that depends on them as string identifiers.  The proper place to localize these values is when they're presented for display in the web or commandline interfaces.
+
+
+
+
+
+-- 
+http://www.bestpractical.com/products/rt  -- Trouble Ticketing. Free.
+
diff --git a/rt/docs/design_docs/ticket_templates b/rt/docs/design_docs/ticket_templates
new file mode 100644
index 000000000..7850edf73
--- /dev/null
+++ b/rt/docs/design_docs/ticket_templates
@@ -0,0 +1,16 @@
+===Create-Ticket: foo
+ Subject: APPROVE <%TOP-Subject%>
+ Status: status
+ Queue: <%TOP-Queue%>
+ Owner: <%TOP-Owner%>
+ Depends-on: <%TOP-Id%>
+ Child-of: <%TOP-Id%>
+ Refers-to: <%TOP-Id%>
+ Content-Type: text/plain
+ Content: This is content
+blah
+blah
+blah
+===Create-Ticket: bar
+Subject:  <%foo-Subject%>
+
diff --git a/rt/etc/RT_Config.pm b/rt/etc/RT_Config.pm
new file mode 100644
index 000000000..2b3f4f9fe
--- /dev/null
+++ b/rt/etc/RT_Config.pm
@@ -0,0 +1,349 @@
+#
+# WARNING: NEVER EDIT RT_Config.pm. Instead, copy any sections you want to change to RT_SiteConfig.pm
+# and edit them there.
+#
+
+package RT;
+
+=head1 NAME
+
+RT::Config
+
+=for testing
+
+use RT::Config;
+
+=cut
+
+# {{{ Base Configuration
+
+# $rtname the string that RT will look for in mail messages to
+# figure out what ticket a new piece of mail belongs to
+
+# Your domain name is recommended, so as not to pollute the namespace.
+# once you start using a given tag, you should probably never change it.
+# (otherwise, mail for existing tickets won't get put in the right place
+
+Set($rtname , "example.com");
+
+# You should set this to your organization's DNS domain. For example,
+# fsck.com or asylum.arkham.ma.us. It's used by the linking interface to
+# guarantee that ticket URIs are unique and easy to construct.
+
+Set($Organization , "example.com");
+
+# $user_passwd_min defines the minimum length for user passwords. Setting
+# it to 0 disables this check
+Set($MinimumPasswordLength , "5");
+
+# $Timezone is used to convert times entered by users into GMT and back again
+# It should be set to a timezone recognized by your local unix box.
+Set($Timezone , 'US/Eastern');
+
+# }}}
+
+# }}}
+
+# {{{ Database Configuration
+
+# Database driver beeing used. Case matters
+# Valid types are "mysql" and "Pg"
+
+Set($DatabaseType , 'mysql');
+
+# The domain name of your database server
+# If you're running mysql and it's on localhost,
+# leave it blank for enhanced performance
+Set($DatabaseHost   , 'localhost');
+Set($DatabaseRTHost , 'localhost');
+
+# The port that your database server is running on.  Ignored unless it's
+# a positive integer. It's usually safe to leave this blank
+Set($DatabasePort , '');
+
+#The name of the database user (inside the database)
+Set($DatabaseUser , 'rt_user');
+
+# Password the DatabaseUser should use to access the database
+Set($DatabasePassword , 'rt_pass');
+
+# The name of the RT's database on your database server
+Set($DatabaseName , 'rt3');
+
+# If you're using Postgres and have compiled in SSL support,
+# set DatabaseRequireSSL to 1 to turn on SSL communication
+Set($DatabaseRequireSSL , undef);
+
+# }}}
+
+# {{{ Incoming mail gateway configuration
+
+# OwnerEmail is the address of a human who manages RT. RT will send
+# errors generated by the mail gateway to this address.  This address
+# should _not_ be an address that's managed by your RT instance.
+
+Set($OwnerEmail , 'root');
+
+# If $LoopsToRTOwner is defined, RT will send mail that it believes
+# might be a loop to $RT::OwnerEmail
+
+Set($LoopsToRTOwner , 1);
+
+# If $StoreLoopss is defined, RT will record messages that it believes
+# to be part of mail loops.
+# As it does this, it will try to be careful not to send mail to the
+# sender of these messages
+
+Set($StoreLoops , undef);
+
+# $MaxAttachmentSize sets the maximum size (in bytes) of attachments stored
+# in the database.
+
+# For mysql and oracle, we set this size at 10 megabytes.
+# If you're running a postgres version earlier than 7.1, you will need
+# to drop this to 8192. (8k)
+
+Set($MaxAttachmentSize , 10000000);
+
+# $TruncateLongAttachments: if this is set to a non-undef value,
+# RT will truncate attachments longer than MaxAttachmentLength.
+
+Set($TruncateLongAttachments , undef);
+
+# $DropLongAttachments: if this is set to a non-undef value,
+# RT will silently drop attachments longer than MaxAttachmentLength.
+
+Set($DropLongAttachments , undef);
+
+# If $ParseNewMessageForTicketCcs is true, RT will attempt to divine
+# Ticket 'Cc' watchers from the To and Cc lines of incoming messages
+# Be forewarned that if you have _any_ addresses which forward mail to
+# RT automatically and you enable this option without modifying
+# "RTAddressRegexp" below, you will get yourself into a heap of trouble.
+
+Set($ParseNewMessageForTicketCcs , undef);
+
+# RTAddressRegexp is used to make sure RT doesn't add itself as a ticket CC if
+# the setting above is enabled.
+
+Set($RTAddressRegexp , '^rt\@example.com$');
+
+# RT provides functionality which allows the system to rewrite
+# incoming email addresses.  In its simplest form,
+# you can substitute the value in CanonicalizeEmailAddressReplace
+# for the value in CanonicalizeEmailAddressMatch
+# (These values are passed to the CanonicalizeEmailAddress subroutine in RT/User.pm)
+# By default, that routine performs a s/$Match/$Replace/gi on any address passed to it
+
+Set($CanonicalizeEmailAddressMatch   , 'subdomain.example.com$');
+Set($CanonicalizeEmailAddressReplace , 'example.com');
+
+# If $SenderMustExistInExternalDatabase is true, RT will refuse to
+# create non-privileged accounts for unknown users if you are using
+# the "LookupSenderInExternalDatabase" option.
+# Instead, an error message will be mailed and RT will forward the
+# message to $RTOwner.
+#
+# If you are not using $LookupSenderInExternalDatabase, this option
+# has no effect.
+#
+# If you define an AutoRejectRequest template, RT will use this
+# template for the rejection message.
+
+Set($SenderMustExistInExternalDatabase , undef);
+
+# }}}
+
+# {{{ Outgoing mail configuration
+
+# RT is designed such that any mail which already has a ticket-id associated
+# with it will get to the right place automatically.
+
+# $CorrespondAddress and $CommentAddress are the default addresses
+# that will be listed in From: and Reply-To: headers of correspondence
+# and comment mail tracked by RT, unless overridden by a queue-specific
+# address.
+
+Set($CorrespondAddress , 'RT::CorrespondAddress.not.set');
+
+Set($CommentAddress , 'RT::CommentAddress.not.set');
+
+#Sendmail Configuration
+
+# $MailCommand defines which method RT will use to try to send mail
+# We know that 'sendmailpipe' works fairly well.
+# If 'sendmailpipe' doesn't work well for you, try 'sendmail'
+#
+# Note that you should remove the '-t' from $SendmailArguments
+# if you use 'sendmail rather than 'sendmailpipe'
+
+Set($MailCommand , 'sendmailpipe');
+
+# $SendmailArguments defines what flags to pass to $Sendmail
+# assuming you picked 'sendmail' or 'sendmailpipe' as the $MailCommand above.
+# If you picked 'sendmailpipe', you MUST add a -t flag to $SendmailArguments
+
+# These options are good for most sendmail wrappers and workalikes
+Set($SendmailArguments , "-oi -t");
+
+# These arguments are good for sendmail brand sendmail 8 and newer
+#Set($SendmailArguments,"-oi -t -ODeliveryMode=b -OErrorMode=m");
+
+# If you selected 'sendmailpipe' above, you MUST specify the path
+# to your sendmail binary in $SendmailPath.
+# !! If you did not # select 'sendmailpipe' above, this has no effect!!
+Set($SendmailPath , "/usr/sbin/sendmail");
+
+# By default, RT sets the outgoing mail's "From:" header to
+# "SenderName via RT".  Setting this option to 0 disables it.
+
+Set($UseFriendlyFromLine , 1);
+
+# sprintf() format of the friendly 'From:' header; its arguments
+# are SenderName and SenderEmailAddress.
+Set($FriendlyFromLineFormat , "\"%s via RT\" <%s>");
+
+# RT can optionally set a "Friendly" 'To:' header when sending messages to
+# Ccs or AdminCcs (rather than having a blank 'To:' header.
+
+# This feature DOES NOT WORK WITH SENDMAIL[tm] BRAND SENDMAIL
+# If you are using sendmail, rather than postfix, qmail, exim or some other MTA,
+# you _must_ disable this option.
+
+Set($UseFriendlyToLine , 0);
+
+# sprintf() format of the friendly 'From:' header; its arguments
+# are WatcherType and TicketId.
+Set($FriendlyToLineFormat, "\"%s of $RT::rtname Ticket #%s\":;");
+
+# By default RT doesn't notify the person who performs an update, as they
+# already know what they've done. If you'd like to change this behaviour,
+# Set $NotifyActor to 1
+
+Set($NotifyActor, 0);
+
+
+# }}}
+
+# {{{ Logging
+
+# Logging.  The default is to log anything except debugging
+# information to syslog.  Check the Log::Dispatch POD for
+# information about how to get things by syslog, mail or anything
+# else, get debugging info in the log, etc.
+
+#  It might generally make
+# sense to send error and higher by email to some administrator.
+# If you do this, be careful that this email isn't sent to this RT instance.
+
+# the minimum level error that will be logged to the specific device.
+# levels from lowest to highest:
+#  debug info notice warning error critical alert emergency
+
+#  Mail loops will generate a critical log message.
+Set($LogToSyslog    , 'debug');
+Set($LogToScreen    , 'error');
+Set($LogToFile      , undef);
+Set($LogDir, '/opt/rt3/var/log');
+Set($LogToFileNamed , "rt.log");    #log to rt.log
+
+# }}}
+
+# {{{ Web interface configuration
+
+# Define the directory name to be used for images in rt web
+# documents.
+
+# If you're putting the web ui somewhere other than at the root of
+# your server
+# $WebPath requires a leading / but no trailing /
+
+Set($WebPath , "");
+
+# This is the Scheme, server and port for constructing urls to webrt
+# $WebBaseURL doesn't need a trailing /
+
+Set($WebBaseURL , "http://RT::WebBaseURL.not.configured:80");
+
+Set($WebURL , $WebBaseURL . $WebPath . "/");
+
+# $WebImagesURL points to the base URL where RT can find its images.
+# If you're running the FastCGI version of the RT web interface,
+# you should make RT's WebRT/html/NoAuth/images directory available on
+# a static web server and supply that URL as $WebImagesURL.
+
+Set($WebImagesURL , $WebURL . "NoAuth/images/");
+
+# $RTLogoURL points to the URL of the RT logo displayed in the web UI
+
+Set($LogoURL , $WebImagesURL . "rt.jpg");
+
+# if TrustHTMLAttachments is not defined, we will display them
+# as text. This prevents malicious HTML and javascript from being
+# sent in a request (although there is probably more to it than that)
+Set($TrustHTMLAttachments , undef);
+
+# If $WebExternalAuth is defined, RT will defer to the environment's
+# REMOTE_USER variable.
+
+Set($WebExternalAuth , undef);
+
+# If $WebFallbackToInternalAuth is undefined, the user is allowed a chance
+# of fallback to the login screen, even if REMOTE_USER failed.
+
+Set($WebFallbackToInternalAuth , undef);
+
+# $WebExternalGecos means to match 'gecos' field as the user identity);
+# useful with mod_auth_pwcheck and IIS Integrated Windows logon.
+
+Set($WebExternalGecos , undef);
+
+# $WebExternalAuto will create users under the same name as REMOTE_USER
+# upon login, if it's missing in the Users table.
+
+Set($WebExternalAuto , undef);
+
+# $WebSessionClass is the class you wish to use for managing Sessions.
+# It defaults to use your SQL database, but if you are using MySQL 3.x and
+# plans to use non-ascii Queue names, uncomment and add this line to
+# RT_SiteConfig.pm will prevent session corruption.
+
+# Set($WebSessionClass , 'Apache::Session::File');
+
+# }}}
+
+# {{{ RT UTF-8 Settings
+
+# An array that contains languages supported by RT's internationalization
+# interface.  Defaults to all *.po lexicons; set it to qw(en ja) will make
+# RT bilingual instead of multilingual, but will save same memory.
+
+@LexiconLanguages = qw(*) unless (@LexiconLanguages);
+
+# An array that contains default encodings used to guess which charset
+# an attachment uses if not specified.  Must be recognized by
+# Encode::Guess.
+
+@EmailInputEncodings = qw(utf-8 iso-8859-1 us-ascii) unless (@EmailInputEncodings);
+
+# The charset for localized email.  Must be recognized by Encode.
+
+Set($EmailOutputEncoding , 'utf-8');
+
+# }}}
+
+# {{{ RT Date Handling Options (for Time::ParseDate)
+
+# Set this to 1 if your local date convention looks like "dd/mm/yy"
+# instead of "mm/dd/yy".
+
+Set($DateDayBeforeMonth , 1);
+
+# Should "Tuesday" default to meaning "Next Tuesday" or "Last Tuesday"?
+# Set to 0 for "Next" or 1 for "Last".
+
+Set($AmbiguousDayInPast , 1);
+
+# }}}
+
+1;
diff --git a/rt/etc/RT_Config.pm.in b/rt/etc/RT_Config.pm.in
new file mode 100644
index 000000000..5f97eb0a0
--- /dev/null
+++ b/rt/etc/RT_Config.pm.in
@@ -0,0 +1,349 @@
+#
+# WARNING: NEVER EDIT RT_Config.pm. Instead, copy any sections you want to change to RT_SiteConfig.pm
+# and edit them there.
+#
+
+package RT;
+
+=head1 NAME
+
+RT::Config
+
+=for testing
+
+use RT::Config;
+
+=cut
+
+# {{{ Base Configuration
+
+# $rtname the string that RT will look for in mail messages to
+# figure out what ticket a new piece of mail belongs to
+
+# Your domain name is recommended, so as not to pollute the namespace.
+# once you start using a given tag, you should probably never change it.
+# (otherwise, mail for existing tickets won't get put in the right place
+
+Set($rtname , "example.com");
+
+# You should set this to your organization's DNS domain. For example,
+# fsck.com or asylum.arkham.ma.us. It's used by the linking interface to
+# guarantee that ticket URIs are unique and easy to construct.
+
+Set($Organization , "example.com");
+
+# $user_passwd_min defines the minimum length for user passwords. Setting
+# it to 0 disables this check
+Set($MinimumPasswordLength , "5");
+
+# $Timezone is used to convert times entered by users into GMT and back again
+# It should be set to a timezone recognized by your local unix box.
+Set($Timezone , 'US/Eastern');
+
+# }}}
+
+# }}}
+
+# {{{ Database Configuration
+
+# Database driver beeing used. Case matters
+# Valid types are "mysql" and "Pg"
+
+Set($DatabaseType , '@DB_TYPE@');
+
+# The domain name of your database server
+# If you're running mysql and it's on localhost,
+# leave it blank for enhanced performance
+Set($DatabaseHost   , '@DB_HOST@');
+Set($DatabaseRTHost , '@DB_RT_HOST@');
+
+# The port that your database server is running on.  Ignored unless it's
+# a positive integer. It's usually safe to leave this blank
+Set($DatabasePort , '@DB_PORT@');
+
+#The name of the database user (inside the database)
+Set($DatabaseUser , '@DB_RT_USER@');
+
+# Password the DatabaseUser should use to access the database
+Set($DatabasePassword , '@DB_RT_PASS@');
+
+# The name of the RT's database on your database server
+Set($DatabaseName , '@DB_DATABASE@');
+
+# If you're using Postgres and have compiled in SSL support,
+# set DatabaseRequireSSL to 1 to turn on SSL communication
+Set($DatabaseRequireSSL , undef);
+
+# }}}
+
+# {{{ Incoming mail gateway configuration
+
+# OwnerEmail is the address of a human who manages RT. RT will send
+# errors generated by the mail gateway to this address.  This address
+# should _not_ be an address that's managed by your RT instance.
+
+Set($OwnerEmail , 'root');
+
+# If $LoopsToRTOwner is defined, RT will send mail that it believes
+# might be a loop to $RT::OwnerEmail
+
+Set($LoopsToRTOwner , 1);
+
+# If $StoreLoopss is defined, RT will record messages that it believes
+# to be part of mail loops.
+# As it does this, it will try to be careful not to send mail to the
+# sender of these messages
+
+Set($StoreLoops , undef);
+
+# $MaxAttachmentSize sets the maximum size (in bytes) of attachments stored
+# in the database.
+
+# For mysql and oracle, we set this size at 10 megabytes.
+# If you're running a postgres version earlier than 7.1, you will need
+# to drop this to 8192. (8k)
+
+Set($MaxAttachmentSize , 10000000);
+
+# $TruncateLongAttachments: if this is set to a non-undef value,
+# RT will truncate attachments longer than MaxAttachmentLength.
+
+Set($TruncateLongAttachments , undef);
+
+# $DropLongAttachments: if this is set to a non-undef value,
+# RT will silently drop attachments longer than MaxAttachmentLength.
+
+Set($DropLongAttachments , undef);
+
+# If $ParseNewMessageForTicketCcs is true, RT will attempt to divine
+# Ticket 'Cc' watchers from the To and Cc lines of incoming messages
+# Be forewarned that if you have _any_ addresses which forward mail to
+# RT automatically and you enable this option without modifying
+# "RTAddressRegexp" below, you will get yourself into a heap of trouble.
+
+Set($ParseNewMessageForTicketCcs , undef);
+
+# RTAddressRegexp is used to make sure RT doesn't add itself as a ticket CC if
+# the setting above is enabled.
+
+Set($RTAddressRegexp , '^rt\@example.com$');
+
+# RT provides functionality which allows the system to rewrite
+# incoming email addresses.  In its simplest form,
+# you can substitute the value in CanonicalizeEmailAddressReplace
+# for the value in CanonicalizeEmailAddressMatch
+# (These values are passed to the CanonicalizeEmailAddress subroutine in RT/User.pm)
+# By default, that routine performs a s/$Match/$Replace/gi on any address passed to it
+
+Set($CanonicalizeEmailAddressMatch   , 'subdomain.example.com$');
+Set($CanonicalizeEmailAddressReplace , 'example.com');
+
+# If $SenderMustExistInExternalDatabase is true, RT will refuse to
+# create non-privileged accounts for unknown users if you are using
+# the "LookupSenderInExternalDatabase" option.
+# Instead, an error message will be mailed and RT will forward the
+# message to $RTOwner.
+#
+# If you are not using $LookupSenderInExternalDatabase, this option
+# has no effect.
+#
+# If you define an AutoRejectRequest template, RT will use this
+# template for the rejection message.
+
+Set($SenderMustExistInExternalDatabase , undef);
+
+# }}}
+
+# {{{ Outgoing mail configuration
+
+# RT is designed such that any mail which already has a ticket-id associated
+# with it will get to the right place automatically.
+
+# $CorrespondAddress and $CommentAddress are the default addresses
+# that will be listed in From: and Reply-To: headers of correspondence
+# and comment mail tracked by RT, unless overridden by a queue-specific
+# address.
+
+Set($CorrespondAddress , 'RT::CorrespondAddress.not.set');
+
+Set($CommentAddress , 'RT::CommentAddress.not.set');
+
+#Sendmail Configuration
+
+# $MailCommand defines which method RT will use to try to send mail
+# We know that 'sendmailpipe' works fairly well.
+# If 'sendmailpipe' doesn't work well for you, try 'sendmail'
+#
+# Note that you should remove the '-t' from $SendmailArguments
+# if you use 'sendmail rather than 'sendmailpipe'
+
+Set($MailCommand , 'sendmailpipe');
+
+# $SendmailArguments defines what flags to pass to $Sendmail
+# assuming you picked 'sendmail' or 'sendmailpipe' as the $MailCommand above.
+# If you picked 'sendmailpipe', you MUST add a -t flag to $SendmailArguments
+
+# These options are good for most sendmail wrappers and workalikes
+Set($SendmailArguments , "-oi -t");
+
+# These arguments are good for sendmail brand sendmail 8 and newer
+#Set($SendmailArguments,"-oi -t -ODeliveryMode=b -OErrorMode=m");
+
+# If you selected 'sendmailpipe' above, you MUST specify the path
+# to your sendmail binary in $SendmailPath.
+# !! If you did not # select 'sendmailpipe' above, this has no effect!!
+Set($SendmailPath , "/usr/sbin/sendmail");
+
+# By default, RT sets the outgoing mail's "From:" header to
+# "SenderName via RT".  Setting this option to 0 disables it.
+
+Set($UseFriendlyFromLine , 1);
+
+# sprintf() format of the friendly 'From:' header; its arguments
+# are SenderName and SenderEmailAddress.
+Set($FriendlyFromLineFormat , "\"%s via RT\" <%s>");
+
+# RT can optionally set a "Friendly" 'To:' header when sending messages to
+# Ccs or AdminCcs (rather than having a blank 'To:' header.
+
+# This feature DOES NOT WORK WITH SENDMAIL[tm] BRAND SENDMAIL
+# If you are using sendmail, rather than postfix, qmail, exim or some other MTA,
+# you _must_ disable this option.
+
+Set($UseFriendlyToLine , 0);
+
+# sprintf() format of the friendly 'From:' header; its arguments
+# are WatcherType and TicketId.
+Set($FriendlyToLineFormat, "\"%s of $RT::rtname Ticket #%s\":;");
+
+# By default RT doesn't notify the person who performs an update, as they
+# already know what they've done. If you'd like to change this behaviour,
+# Set $NotifyActor to 1
+
+Set($NotifyActor, 0);
+
+
+# }}}
+
+# {{{ Logging
+
+# Logging.  The default is to log anything except debugging
+# information to syslog.  Check the Log::Dispatch POD for
+# information about how to get things by syslog, mail or anything
+# else, get debugging info in the log, etc.
+
+#  It might generally make
+# sense to send error and higher by email to some administrator.
+# If you do this, be careful that this email isn't sent to this RT instance.
+
+# the minimum level error that will be logged to the specific device.
+# levels from lowest to highest:
+#  debug info notice warning error critical alert emergency
+
+#  Mail loops will generate a critical log message.
+Set($LogToSyslog    , 'debug');
+Set($LogToScreen    , 'error');
+Set($LogToFile      , undef);
+Set($LogDir, '@RT_LOG_PATH@');
+Set($LogToFileNamed , "rt.log");    #log to rt.log
+
+# }}}
+
+# {{{ Web interface configuration
+
+# Define the directory name to be used for images in rt web
+# documents.
+
+# If you're putting the web ui somewhere other than at the root of
+# your server
+# $WebPath requires a leading / but no trailing /
+
+Set($WebPath , "");
+
+# This is the Scheme, server and port for constructing urls to webrt
+# $WebBaseURL doesn't need a trailing /
+
+Set($WebBaseURL , "http://RT::WebBaseURL.not.configured:80");
+
+Set($WebURL , $WebBaseURL . $WebPath . "/");
+
+# $WebImagesURL points to the base URL where RT can find its images.
+# If you're running the FastCGI version of the RT web interface,
+# you should make RT's WebRT/html/NoAuth/images directory available on
+# a static web server and supply that URL as $WebImagesURL.
+
+Set($WebImagesURL , $WebURL . "NoAuth/images/");
+
+# $RTLogoURL points to the URL of the RT logo displayed in the web UI
+
+Set($LogoURL , $WebImagesURL . "rt.jpg");
+
+# if TrustHTMLAttachments is not defined, we will display them
+# as text. This prevents malicious HTML and javascript from being
+# sent in a request (although there is probably more to it than that)
+Set($TrustHTMLAttachments , undef);
+
+# If $WebExternalAuth is defined, RT will defer to the environment's
+# REMOTE_USER variable.
+
+Set($WebExternalAuth , undef);
+
+# If $WebFallbackToInternalAuth is undefined, the user is allowed a chance
+# of fallback to the login screen, even if REMOTE_USER failed.
+
+Set($WebFallbackToInternalAuth , undef);
+
+# $WebExternalGecos means to match 'gecos' field as the user identity);
+# useful with mod_auth_pwcheck and IIS Integrated Windows logon.
+
+Set($WebExternalGecos , undef);
+
+# $WebExternalAuto will create users under the same name as REMOTE_USER
+# upon login, if it's missing in the Users table.
+
+Set($WebExternalAuto , undef);
+
+# $WebSessionClass is the class you wish to use for managing Sessions.
+# It defaults to use your SQL database, but if you are using MySQL 3.x and
+# plans to use non-ascii Queue names, uncomment and add this line to
+# RT_SiteConfig.pm will prevent session corruption.
+
+# Set($WebSessionClass , 'Apache::Session::File');
+
+# }}}
+
+# {{{ RT UTF-8 Settings
+
+# An array that contains languages supported by RT's internationalization
+# interface.  Defaults to all *.po lexicons; set it to qw(en ja) will make
+# RT bilingual instead of multilingual, but will save same memory.
+
+@LexiconLanguages = qw(*) unless (@LexiconLanguages);
+
+# An array that contains default encodings used to guess which charset
+# an attachment uses if not specified.  Must be recognized by
+# Encode::Guess.
+
+@EmailInputEncodings = qw(utf-8 iso-8859-1 us-ascii) unless (@EmailInputEncodings);
+
+# The charset for localized email.  Must be recognized by Encode.
+
+Set($EmailOutputEncoding , 'utf-8');
+
+# }}}
+
+# {{{ RT Date Handling Options (for Time::ParseDate)
+
+# Set this to 1 if your local date convention looks like "dd/mm/yy"
+# instead of "mm/dd/yy".
+
+Set($DateDayBeforeMonth , 1);
+
+# Should "Tuesday" default to meaning "Next Tuesday" or "Last Tuesday"?
+# Set to 0 for "Next" or 1 for "Last".
+
+Set($AmbiguousDayInPast , 1);
+
+# }}}
+
+1;
diff --git a/rt/etc/RT_SiteConfig.pm b/rt/etc/RT_SiteConfig.pm
new file mode 100644
index 000000000..0afc6045c
--- /dev/null
+++ b/rt/etc/RT_SiteConfig.pm
@@ -0,0 +1 @@
+1;
diff --git a/rt/etc/acl.Oracle b/rt/etc/acl.Oracle
index 59d35a028..c8667c031 100644
--- a/rt/etc/acl.Oracle
+++ b/rt/etc/acl.Oracle
@@ -1,9 +1,10 @@
-CREATE USER !!DB_RT_USER!! identified by !!DB_RT_PASS!!
-temporary tablespace TEMP
-default tablespace USERS
-quota unlimited on USERS;
-
-grant connect, resource to !!DB_RT_USER!!;
-
-exit;
-
+sub acl {
+return (
+"CREATE USER ${RT::DatabaseUser} identified by ${RT::DatabasePassword}".
+"temporary tablespace TEMP" .
+"default tablespace USERS" .
+"quota unlimited on USERS;" ,
+"grant connect, resource to ${RT::DatabaseUser};",
+"exit;");
+}
+1;
diff --git a/rt/etc/acl.Pg b/rt/etc/acl.Pg
index 13ac41dcf..16ea71b2d 100755
--- a/rt/etc/acl.Pg
+++ b/rt/etc/acl.Pg
@@ -1,39 +1,63 @@
-drop user !!DB_RT_USER!!;
-create user !!DB_RT_USER!! with password '!!DB_RT_PASS!!' NOCREATEDB NOCREATEUSER;
+sub acl {
+    my $dbh = shift;
 
-grant select, insert, update, delete on Groups to !!DB_RT_USER!!;
-grant select, insert, update, delete on Groups_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on ACL to !!DB_RT_USER!!;
-grant select, insert, update, delete on ACL_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Watchers to !!DB_RT_USER!!;
-grant select, insert, update, delete on Watchers_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Links to !!DB_RT_USER!!;
-grant select, insert, update, delete on Links_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Users to !!DB_RT_USER!!;
-grant select, insert, update, delete on Users_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Tickets to !!DB_RT_USER!!;
-grant select, insert, update, delete on Tickets_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on GroupMembers to !!DB_RT_USER!!;
-grant select, insert, update, delete on GroupMembers_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Queues to !!DB_RT_USER!!;
-grant select, insert, update, delete on Queues_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Transactions to !!DB_RT_USER!!;
-grant select, insert, update, delete on Transactions_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on ScripActions to !!DB_RT_USER!!;
-grant select, insert, update, delete on ScripActions_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on ScripConditions to !!DB_RT_USER!!;
-grant select, insert, update, delete on ScripConditions_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Scrips to !!DB_RT_USER!!;
-grant select, insert, update, delete on Scrips_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Attachments to !!DB_RT_USER!!;
-grant select, insert, update, delete on Attachments_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Templates to !!DB_RT_USER!!;
-grant select, insert, update, delete on Templates_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Keywords to !!DB_RT_USER!!;
-grant select, insert, update, delete on Keywords_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on ObjectKeywords to !!DB_RT_USER!!;
-grant select, insert, update, delete on ObjectKeywords_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on KeywordSelects to !!DB_RT_USER!!;
-grant select, insert, update, delete on KeywordSelects_id_seq to !!DB_RT_USER!!;
+    my @acls;
 
+    my @tables = qw (
 
+      attachments_id_seq
+      Attachments
+      queues_id_seq
+      Queues
+      links_id_seq
+      Links
+      principals_id_seq
+      Principals
+      groups_id_seq
+      Groups
+      scripconditions_id_seq
+      ScripConditions
+      transactions_id_seq
+      Transactions
+      scrips_id_seq
+      Scrips
+      acl_id_seq
+      ACL
+      groupmembers_id_seq
+      GroupMembers
+      cachedgroupmembers_id_seq
+      CachedGroupMembers
+      users_id_seq
+      Users
+      tickets_id_seq
+      Tickets
+      scripactions_id_seq
+      ScripActions
+      templates_id_seq
+      Templates
+      ticketcustomfieldvalues_id_s
+      TicketCustomFieldValues
+      customfields_id_seq
+      CustomFields
+      customfieldvalues_id_seq
+      CustomFieldValues
+      sessions
+    );
+
+    # if there's already an rt_user, drop it.
+    my @row =
+      $dbh->selectrow_array( "select usename from pg_user where usename = '" . $RT::DatabaseUser."'" );
+    if ( $row[0] ) {
+        push @acls, "drop user ${RT::DatabaseUser};",;
+    }
+
+    push @acls, "create user ${RT::DatabaseUser} with password '${RT::DatabasePassword}' NOCREATEDB NOCREATEUSER;";
+    foreach my $table (@tables) {
+        push @acls,
+          "GRANT SELECT, INSERT, UPDATE, DELETE ON $table to "
+          . $RT::DatabaseUser . ";";
+
+    }
+    return (@acls);
+}
+1;
diff --git a/rt/etc/acl.mysql b/rt/etc/acl.mysql
index 7feb376f5..0ecaa3b15 100755
--- a/rt/etc/acl.mysql
+++ b/rt/etc/acl.mysql
@@ -1,4 +1,8 @@
-
-DELETE FROM user WHERE user like '!!DB_RT_USER!!';
-DELETE FROM db where db LIKE '!!DB_DATABASE!!';
-GRANT SELECT,INSERT,CREATE,INDEX,UPDATE,DELETE ON !!DB_DATABASE!!.* TO !!DB_RT_USER!!@!!DB_RT_HOST!! IDENTIFIED BY '!!DB_RT_PASS!!';
+sub acl {
+return  (
+"USE mysql;",
+"DELETE FROM user WHERE user = '${RT::DatabaseUser}';",
+"DELETE FROM db where db = '${RT::DatabaseName}';",
+"GRANT SELECT,INSERT,CREATE,INDEX,UPDATE,DELETE ON ${RT::DatabaseName}.* TO ${RT::DatabaseUser}\@${RT::DatabaseRTHost} IDENTIFIED BY '${RT::DatabasePassword}';");
+}
+1;
diff --git a/rt/etc/constraints.mysql b/rt/etc/constraints.mysql
new file mode 100644
index 000000000..33a037673
--- /dev/null
+++ b/rt/etc/constraints.mysql
@@ -0,0 +1,52 @@
+#ALTER TABLE Users ADD FOREIGN KEY (Creator) REFERENCES Users(id);
+#ALTER TABLE Users ADD FOREIGN KEY (LastUpdatedBy) REFERENCES Users(id);
+  ALTER TABLE Links ADD FOREIGN KEY (LocalBase) REFERENCES Tickets(id) ;
+  ALTER TABLE Links ADD FOREIGN KEY (LocalTarget) REFERENCES Tickets(id);
+        ObjectId integer, #  FOREIGN KEY to Users or Groups, depending
+  ALTER TABLE Tickets ADD FOREIGN KEY (Queue) REFERENCES Queues(id);
+  ALTER TABLE Tickets ADD FOREIGN KEY (EffectiveId) REFERENCES Tickets(id);
+  ALTER TABLE Tickets ADD FOREIGN KEY (Owner) REFERENCES Principals(id);
+  ALTER TABLE Tickets ADD FOREIGN KEY (Creator) REFERENCES Users(id);
+  ALTER TABLE Tickets ADD FOREIGN KEY (LastUpdatedBy) REFERENCES Users(id);
+  ALTER TABLE Transactions ADD FOREIGN KEY (Creator) REFERENCES Users(id);
+  ALTER TABLE Transactions ADD FOREIGN KEY (Ticket) REFERENCES Tickets(id);
+  ALTER TABLE Transactions ADD FOREIGN KEY (EffectiveTicket) REFERENCES Tickets(id);
+  ALTER TABLE Attachments ADD FOREIGN KEY (TransactionId) REFERENCES Transactions(id);
+  ALTER TABLE Attachments ADD FOREIGN KEY (Parent) REFERENCES Attachments(id);
+  ALTER TABLE Scrips ADD FOREIGN KEY (ScripCondition) REFERENCES ScripConditions(id);
+  ALTER TABLE Scrips ADD FOREIGN KEY (ScripAction) REFERENCES ScripActions(id);
+  ALTER TABLE Scrips ADD FOREIGN KEY (Template) REFERENCES Templates(id);
+  ALTER TABLE Scrips ADD FOREIGN KEY (Queue) REFERENCES Queues(id);
+  ALTER TABLE Scrips ADD FOREIGN KEY (Creator) REFERENCES Users(id);
+  ALTER TABLE Scrips ADD FOREIGN KEY (LastUpdatedBy) REFERENCES Users(id);
+  PrincipalId integer NOT NULL  , #ALTER TABLE ADD FOREIGN KEY to principals
+  DelegatedBy integer NOT NULL default 0, #ALTER TABLE ADD FOREIGN KEY to principals with a userid
+  DelegatedFrom integer NOT NULL default 0, #ALTER TABLE ADD FOREIGN KEY to ACL
+  ALTER TABLE ACL ADD FOREIGN KEY (PrincipalId) REFERENCES Principals(id);
+  ALTER TABLE ACL ADD FOREIGN KEY (DelegatedBy) REFERENCES Principals(id);
+  ALTER TABLE ACL ADD FOREIGN KEY (DelegatedFrom) REFERENCES ACL(id);
+  ALTER TABLE GroupMembers ADD FOREIGN KEY (GroupId) REFERENCES Principals(id);
+  ALTER TABLE GroupMembers ADD FOREIGN KEY (MemberId) REFERENCES Principals(id);
+        GroupId int, # ALTER TABLE ADD FOREIGN KEY to Principals
+        MemberId int, # ALTER TABLE ADD FOREIGN KEY to Principals
+        Via int, #ALTER TABLE ADD FOREIGN KEY to CachedGroupMembers. (may point to $self->id)
+        ImmediateParentId int, #ALTER TABLE ADD FOREIGN KEY to prinicpals.         
+  ALTER TABLE CachedGroupMembers ADD FOREIGN KEY (ImmediateParentId) REFERENCES Principals(id);
+  ALTER TABLE CachedGroupMembers ADD FOREIGN KEY (GroupId) REFERENCES Principals(id);
+  ALTER TABLE CachedGroupMembers ADD FOREIGN KEY (MemberId) REFERENCES Principals(id);
+  ALTER TABLE CachedGroupMembers ADD FOREIGN KEY (Via) REFERENCES CachedGroupMembers(id);
+  ALTER TABLE ScripActions ADD FOREIGN KEY (Creator) REFERENCES Users(id);
+  ALTER TABLE ScripActions ADD FOREIGN KEY (LastUpdatedBy) REFERENCES Users(id);
+  ALTER TABLE Templates ADD FOREIGN KEY (Queue) REFERENCES Queues(id);
+  ALTER TABLE Templates ADD FOREIGN KEY (Creator) REFERENCES Users(id);
+  ALTER TABLE Templates ADD FOREIGN KEY (LastUpdatedBy) REFERENCES Users(id);
+  ALTER TABLE CustomFields ADD FOREIGN KEY (Queue) REFERENCES Queues(id);
+  ALTER TABLE CustomFields ADD FOREIGN KEY (Creator) REFERENCES Users(id);
+  ALTER TABLE CustomFields ADD FOREIGN KEY (LastUpdatedBy) REFERENCES Users(id);
+  ALTER TABLE TicketCustomFieldValues ADD FOREIGN KEY (Ticket) REFERENCES Ticketss(id);
+  ALTER TABLE TicketCustomFieldValues ADD FOREIGN KEY (CustomField) REFERENCES CustomFields(id);
+  ALTER TABLE TicketCustomFieldValues ADD FOREIGN KEY (Creator) REFERENCES Users(id);
+  ALTER TABLE TicketCustomFieldValues ADD FOREIGN KEY (LastUpdatedBy) REFERENCES Users(id);
+  ALTER TABLE CustomFieldValues ADD FOREIGN KEY (CustomField) REFERENCES CustomFields(id);
+  ALTER TABLE CustomFieldValues ADD FOREIGN KEY (Creator) REFERENCES Users(id);
+  ALTER TABLE CustomFieldValues ADD FOREIGN KEY (LastUpdatedBy) REFERENCES Users(id);
diff --git a/rt/etc/initialdata b/rt/etc/initialdata
new file mode 100644
index 000000000..62b35ace2
--- /dev/null
+++ b/rt/etc/initialdata
@@ -0,0 +1,569 @@
+# Initial data for a fresh RT3 Installation.
+
+@Users = (
+    {  Name     => 'Nobody',
+       RealName => 'Nobody in particular',
+       Comments => 'Do not delete or modify this user. It is integral '
+         . 'to RT\'s internal data structures',
+       Privileged => '0', },
+
+    {  Name         => 'root',
+       Gecos        => 'root',
+       RealName     => 'Enoch Root',
+       Password     => 'password',
+       EmailAddress => "root\@localhost",
+       Comments     => 'SuperUser',
+       Privileged   => '1', } );
+
+@Groups = (
+    { Name        => '',
+      Type        => 'Everyone',                        # loc
+      Domain      => 'SystemInternal',
+      Instance    => '',
+      Description => 'Pseudogroup for internal use',    # loc
+    },
+    { Type        => 'Privileged',                      # loc
+      Domain      => 'SystemInternal',
+      Instance    => '',
+      Name        => '',
+      Description => 'Pseudogroup for internal use',    # loc
+    },
+    { Name        => '',
+      Type        => 'Unprivileged',                    # loc
+      Domain      => 'SystemInternal',
+      Instance    => '',
+      Description => 'Pseudogroup for internal use',    # loc
+    },
+    { Name        => '',
+      Type        => 'Owner',                               # loc
+      Domain      => 'RT::System-Role',
+      Instance    => '',
+      Description => 'SystemRolegroup for internal use',    # loc
+    },
+    { Name        => '',
+      Type        => 'Requestor',                           # loc
+      Domain      => 'RT::System-Role',
+      Instance    => '',
+      Description => 'SystemRolegroup for internal use',    # loc
+    },
+    { Name        => '',
+      Type        => 'Cc',                                  # loc
+      Domain      => 'RT::System-Role',
+      Instance    => '',
+      Description => 'SystemRolegroup for internal use',    # loc
+    },
+    { Name        => '',
+      Type        => 'AdminCc',                             # loc
+      Domain      => 'RT::System-Role',
+      Instance    => '',
+      Description => 'Pseudogroup for internal use',        # loc
+    }, );
+
+@Queues = ({ Name              => 'General',
+             Description       => 'The default queue',
+             CorrespondAddress => "",
+             CommentAddress    => "", },
+           { Name        => '___Approvals',
+             Description => 'A system-internal queue for the approvals system',
+             Disabled    => 2, } );
+
+@ScripActions = (
+
+    {  Name        => 'Autoreply To Requestors',    # loc
+       Description =>
+'Always sends a message to the requestors independent of message sender' ,                                            # loc
+       ExecModule => 'Autoreply',
+       Argument   => 'Requestor' },
+    { Name        => 'Notify Requestors',                    # loc
+      Description => 'Sends a message to the requestors',    # loc
+      ExecModule  => 'Notify',
+      Argument    => 'Requestor' },
+    { Name        => 'Notify Owner as Comment',              # loc
+      Description => 'Sends mail to the owner',              # loc
+      ExecModule  => 'NotifyAsComment',
+      Argument    => 'Owner' },
+    { Name        => 'Notify Owner',                         # loc
+      Description => 'Sends mail to the owner',              # loc
+      ExecModule  => 'Notify',
+      Argument    => 'Owner' },
+    { Name        => 'Notify AdminCcs as Comment',                        # loc
+      Description => 'Sends mail to the administrative Ccs as a comment', # loc
+      ExecModule  => 'NotifyAsComment',
+      Argument    => 'AdminCc' },
+    { Name        => 'Notify AdminCcs',                                   # loc
+      Description => 'Sends mail to the administrative Ccs',              # loc
+      ExecModule  => 'Notify',
+      Argument    => 'AdminCc' },
+
+    { Name        => 'Notify Requestors and Ccs as Comment',              # loc
+      Description => 'Send mail to requestors and Ccs as a comment',      # loc
+      ExecModule  => 'NotifyAsComment',
+      Argument    => 'Requestor,Cc' },
+
+    { Name        => 'Notify Requestors and Ccs',                         # loc
+      Description => 'Send mail to requestors and Ccs',                   # loc
+      ExecModule  => 'Notify',
+      Argument    => 'Requestor,Cc' },
+
+    { Name        => 'Notify Requestors, Ccs and AdminCcs as Comment',    # loc
+      Description => 'Send mail to all watchers as a "comment"',          # loc
+      ExecModule  => 'NotifyAsComment',
+      Argument    => 'All' },
+    { Name        => 'Notify Requestors, Ccs and AdminCcs',               # loc
+      Description => 'Send mail to all watchers',                         # loc
+      ExecModule  => 'Notify',
+      Argument    => 'All' },
+    { Name        => 'Notify Other Recipients as Comment',                # loc
+      Description => 'Sends mail to explicitly listed Ccs and Bccs',      # loc
+      ExecModule  => 'NotifyAsComment',
+      Argument    => 'OtherRecipients' },
+    { Name        => 'Notify Other Recipients',                           # loc
+      Description => 'Sends mail to explicitly listed Ccs and Bccs',      # loc
+      ExecModule  => 'Notify',
+      Argument    => 'OtherRecipients' },
+    { Name        => 'User Defined',                                      # loc
+      Description => 'Perform a user-defined action',                     # loc
+      ExecModule  => 'UserDefined', },
+    {  Name        => 'Create Tickets',                                    # loc
+       Description =>
+         'Create new tickets based on this scrip\'s template',             # loc
+       ExecModule => 'CreateTickets', },
+    { Name        => 'Open Tickets',
+      Description => 'Open tickets on correspondence',                    # loc
+      ExecModule  => 'AutoOpen' },
+);
+
+@ScripConditions = (
+    { Name                 => 'On Create',                                # loc
+      Description          => 'When a ticket is created',                 # loc
+      ApplicableTransTypes => 'Create',
+      ExecModule           => 'AnyTransaction', },
+
+    { Name                 => 'On Transaction',                           # loc
+      Description          => 'When anything happens',                    # loc
+      ApplicableTransTypes => 'Any',
+      ExecModule           => 'AnyTransaction', },
+    {
+
+      Name                 => 'On Correspond',                             # loc
+      Description          => 'Whenever correspondence comes in',          # loc
+      ApplicableTransTypes => 'Correspond',
+      ExecModule           => 'AnyTransaction', },
+
+    {
+
+      Name                 => 'On Comment',                                # loc
+      Description          => 'Whenever comments come in',                 # loc
+      ApplicableTransTypes => 'Comment',
+      ExecModule           => 'AnyTransaction' },
+    {
+
+      Name                 => 'On Status Change',                          # loc
+      Description          => 'Whenever a ticket\'s status changes',       # loc
+      ApplicableTransTypes => 'Status',
+      ExecModule           => 'AnyTransaction',
+
+    },
+    {
+
+      Name                 => 'On Owner Change',                           # loc
+      Description          => 'Whenever a ticket\'s owner changes',        # loc
+      ApplicableTransTypes => 'Any',
+      ExecModule           => 'OwnerChange',
+
+    },
+    {
+
+      Name                 => 'On Queue Change',                           # loc
+      Description          => 'Whenever a ticket\'s queue changes',        # loc
+      ApplicableTransTypes => 'Set',
+      ExecModule           => 'QueueChange',
+
+    },
+    {  Name                 => 'On Resolve',                               # loc
+       Description          => 'Whenever a ticket is resolved',            # loc
+       ApplicableTransTypes => 'Status',
+       ExecModule           => 'StatusChange',
+       Argument             => 'resolved'
+
+    },
+
+    {  Name                 => 'User Defined',                             # loc
+       Description          => 'Whenever a user-defined condition occurs', # loc
+       ApplicableTransTypes => 'Any',
+       ExecModule           => 'UserDefined'
+
+    },
+
+);
+
+@Templates = (
+    { Queue       => '0',
+      Name        => 'Blank',                                             # loc
+      Description => 'A blank template',                                  # loc
+      Content     => '', },
+    {  Queue       => '0',
+       Name        => 'Autoreply',                                         # loc
+       Description => 'Default Autoresponse template',                     # loc
+       Content     => 'Subject: AutoReply: {$Ticket->Subject}
+
+
+Greetings,
+
+This message has been automatically generated in response to the
+creation of a trouble ticket regarding:
+	"{$Ticket->Subject()}", 
+a summary of which appears below.
+
+There is no need to reply to this message right now.  Your ticket has been
+assigned an ID of [{$rtname} #{$Ticket->id()}].
+
+Please include the string:
+
+         [{$rtname} #{$Ticket->id}]
+
+in the subject line of all future correspondence about this issue. To do so, 
+you may reply to this message.
+
+                        Thank you,
+                        {$Ticket->QueueObj->CorrespondAddress()}
+
+-------------------------------------------------------------------------
+{$Transaction->Content()}
+'
+    },
+
+    {  Queue       => '0',
+       Name        => 'Transaction',                     # loc
+       Description => 'Default transaction template',    # loc
+       Content     => 'RT-Attach-Message: yes
+
+
+{$Transaction->CreatedAsString}: Request {$Ticket->id} was acted upon.
+Transaction: {$Transaction->Description}
+       Queue: {$Ticket->QueueObj->Name}
+     Subject: {$Transaction->Subject || $Ticket->Subject || "(No subject given)"}
+       Owner: {$Ticket->OwnerObj->Name}
+  Requestors: {$Ticket->RequestorAddresses}
+      Status: {$Ticket->Status}
+ Ticket <URL: {$RT::WebURL}Ticket/Display.html?id={$Ticket->id} >
+
+
+{$Transaction->Content()}
+'
+    },
+
+    {
+
+      Queue       => '0',
+      Name        => 'Admin Correspondence',                     # loc
+      Description => 'Default admin correspondence template',    # loc
+      Content     => 'RT-Attach-Message: yes
+
+
+<URL: {$RT::WebURL}Ticket/Display.html?id={$Ticket->id} >
+
+{$Transaction->Content()}
+'
+    },
+
+    {  Queue       => '0',
+       Name        => 'Correspondence',                          # loc
+       Description => 'Default correspondence template',         # loc
+       Content     => 'RT-Attach-Message: yes
+
+{$Transaction->Content()}
+'
+    },
+
+    {  Queue       => '0',
+       Name        => 'Admin Comment',                           # loc
+       Description => 'Default admin comment template',          # loc
+       Content     =>
+'Subject: [Comment] {my $s=($Transaction->Subject||$Ticket->Subject); $s =~ s/\\[Comment\\]//g; $comment =~ s/^Re//i; $s;}
+
+
+{$RT::WebURL}Ticket/Display.html?id={$Ticket->id}
+This is a comment.  It is not sent to the Requestor(s):
+
+{$Transaction->Content()}
+'
+    },
+
+    {  Queue       => '0',
+       Name        => 'Status Change',                                     # loc
+       Description => 'Ticket status changed',                             # loc
+       Content     => 'Subject: Status Changed to: {$Transaction->NewValue}
+
+
+{$RT::WebURL}Ticket/Display.html?id={$Ticket->id}
+
+{$Transaction->Content()}
+'
+    },
+
+    {
+
+      Queue       => '0',
+      Name        => 'Resolved',                 # loc
+      Description => 'Ticket Resolved',          # loc
+      Content     => 'Subject: Ticket Resolved
+
+According to our records, your request has been resolved. If you have any
+further questions or concerns, please respond to this message.
+'
+    },
+    {  Queue       => '___Approvals',
+       Name        => "New Pending Approval",    # loc
+       Description =>
+         "Notify Owners and AdminCcs of new items pending their approval", # loc
+       Content => 'Subject: New Pending Approval: {$Ticket->Subject}
+
+Greetings,
+
+There is a new item pending your approval: "{$Ticket->Subject()}", 
+a summary of which appears below.
+
+Please visit {$RT::WebURL}Approvals/Display.html?id={$Ticket->id}
+to approve or reject this ticket, or {$RT::WebURL}Approvals/ to
+batch-process all your pending approvals.
+
+-------------------------------------------------------------------------
+{$Transaction->Content()}
+'
+    },
+    {  Queue       => '___Approvals',
+       Name        => "Approval Passed",    # loc
+       Description =>
+         "Notify Owner of their ticket has been approved by some approver", # loc
+       Content => 'Subject: Ticket Rejected: {$Ticket->Subject}
+
+Greetings,
+
+Your ticket has been approved by { eval { $Approval->OwnerObj->Name } }.
+Other approvals may be pending.
+'
+    },
+    {  Queue       => '___Approvals',
+       Name        => "All Approvals Passed",    # loc
+       Description =>
+         "Notify Owner of their ticket has been approved by all approvers", # loc
+       Content => 'Subject: Ticket Rejected: {$Ticket->Subject}
+
+Greetings,
+
+Your ticket has been approved.  Its Owner may now start to act on it.
+'
+    },
+    {  Queue       => '___Approvals',
+       Name        => "Approval Rejected",    # loc
+       Description =>
+         "Notify Owner of their rejected ticket", # loc
+       Content => 'Subject: Ticket Rejected: {$Ticket->Subject}
+
+Greetings,
+
+Your ticket has been rejected by { eval { $Approval->OwnerObj->Name } }.
+'
+    },
+);
+# }}}
+
+@Scrips = (
+    {  ScripCondition => 'On Correspond',
+       ScripAction    => 'Open Tickets',
+       Template       => 'Blank' },
+    {  ScripCondition => 'On Create',
+       ScripAction    => 'AutoReply To Requestors',
+       Template       => 'AutoReply' },
+    {  ScripCondition => 'On Create',
+       ScripAction    => 'Notify AdminCcs',
+       Template       => 'Transaction' },
+    {  ScripCondition => 'On Correspond',
+       ScripAction    => 'Notify AdminCcs',
+       Template       => 'Admin Correspondence' },
+    {  ScripCondition => 'On Correspond',
+       ScripAction    => 'Notify Requestors And Ccs',
+       Template       => 'Correspondence' },
+    {  ScripCondition => 'On Correspond',
+       ScripAction    => 'Notify Other Recipients',
+       Template       => 'Correspondence' },
+    {  ScripCondition => 'On Comment',
+       ScripAction    => 'Notify AdminCcs As Comment',
+       Template       => 'Admin Comment' },
+    {  ScripCondition => 'On Comment',
+       ScripAction    => 'Notify Other Recipients As Comment',
+       Template       => 'Correspondence' },
+    {  ScripCondition => 'On Resolve',
+       ScripAction    => 'Notify Requestors',
+       Template       => 'Resolved' },
+    {  Description => "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval",    # loc
+       Queue          => '___Approvals',
+       ScripCondition => 'User Defined',
+       CustomIsApplicableCode => q[
+	    $self->TicketObj->Type eq 'approval'	and
+	    $self->TransactionObj->Field eq 'Status'	and
+	    $self->TransactionObj->NewValue eq 'open'   and
+	    eval { $T::Approving = ($self->TicketObj->AllDependedOnBy( Type => 'ticket' ))[0] }
+       ],
+       ScripAction    => 'Notify Owner',
+       Template       => 'New Pending Approval' },
+    {  Description => "If an approval is rejected, reject the original and delete pending approvals",    # loc
+       Queue            => '___Approvals',
+       ScripCondition   => 'On Status Change',
+       ScripAction      => 'User Defined',
+       CustomPrepareCode => q[
+# ------------------------------------------------------------------- #
+return(0) unless ( lc($self->TransactionObj->NewValue) eq "rejected" or
+	           lc($self->TransactionObj->NewValue) eq "deleted" );
+
+my $rejected = 0;
+my $links = $self->TicketObj->DependedOnBy;
+foreach my $link (@{ $links->ItemsArrayRef }) {
+    my $obj = $link->BaseObj;
+    if ($obj->QueueObj->IsActiveStatus($obj->Status)) {
+	if ($obj->Type eq 'ticket') {
+	    $obj->Comment(
+		Content	=> $self->loc("Your request was rejected."),
+	    );
+	    $obj->SetStatus(
+		Status	=> 'rejected',
+		Force	=> 1,
+	    );
+
+	    $T::Approval = $self->TicketObj; # so we can access it inside templates
+	    $self->{TicketObj} = $obj;  # we want the original id in the token line
+	    $rejected = 1;
+	}
+	else {
+	    $obj->SetStatus(
+		Status	=> 'deleted',
+		Force	=> 1,
+	    );
+	}
+    }
+}
+
+$links = $self->TicketObj->DependsOn;
+foreach my $link (@{ $links->ItemsArrayRef }) {
+    my $obj = $link->TargetObj;
+    if ($obj->QueueObj->IsActiveStatus($obj->Status)) {
+	$obj->SetStatus(
+	    Status	=> 'deleted',
+	    Force	=> 1,
+	);
+    }
+}
+
+# Now magically turn myself into a Requestor Notify object...
+require RT::Action::Notify; bless($self, 'RT::Action::Notify');
+$self->{Argument} = 'Requestor'; $self->Prepare;
+
+return $rejected;
+# ------------------------------------------------------------------- #
+	],
+       CustomCommitCode => '"never needed"',
+       Template          => 'Approval Rejected', },
+    {  Description => "When a ticket has been approved by any approver, add correspondence to the original ticket", # loc
+       Queue             => '___Approvals',
+       ScripCondition    => 'On Resolve',
+       ScripAction       => 'User Defined',
+       CustomPrepareCode => q[
+# ------------------------------------------------------------------- #
+return(0) unless ($self->TicketObj->Type eq 'approval');
+
+my $note;
+my $t = $self->TicketObj->Transactions;
+while (my $o = $t->Next) {
+    $note .= $o->Content . "\n" if $o->ContentObj
+	    and $o->Content !~ /Default Approval/;
+}
+
+foreach my $obj ($self->TicketObj->AllDependedOnBy( Type => 'ticket' )) {
+    $obj->Comment(
+	Content => $self->loc( "Your request has been approved by [_1]. Other approvals may still be pending.", # loc
+	    $self->TransactionObj->CreatorObj->Name,
+	) . "\n" . $self->loc( "Approver's notes: [_1]", # loc
+	    $note
+	),
+    );
+    $T::Approval = $self->TicketObj; # so we can access it inside templates
+    $self->{TicketObj} = $obj;  # we want the original id in the token line
+}
+
+# Now magically turn myself into a Requestor Notify object...
+require RT::Action::Notify; bless($self, 'RT::Action::Notify');
+$self->{Argument} = 'Requestor'; $self->Prepare;
+
+return 1;
+# ------------------------------------------------------------------- #
+	],
+       CustomCommitCode => '"never needed"',
+       Template => 'Approval Passed' },
+    {  Description => "When a ticket has been approved by all approvers, add correspondence to the original ticket", # loc
+       Queue             => '___Approvals',
+       ScripCondition    => 'On Resolve',
+       ScripAction       => 'User Defined',
+       CustomPrepareCode  => q[
+# ------------------------------------------------------------------- #
+# Find all the tickets that depend on this (that this is approving)
+
+my $Ticket = $self->TicketObj;
+my @TOP    = $Ticket->AllDependedOnBy( Type => 'ticket' );
+my $links  = $Ticket->DependedOnBy;
+my $passed = 0;
+
+while (my $link = $links->Next) {
+    my $obj = $link->BaseObj;
+    next if ($obj->HasUnresolvedDependencies( Type => 'approval' ));
+
+    if ($obj->Type eq 'ticket') {
+	$obj->Comment(
+	    Content	=> $self->loc("Your request has been approved."),
+	);
+	$T::Approval  = $Ticket;    # so we can access it inside templates
+	$self->{TicketObj} = $obj;  # we want the original id in the token line
+	$passed = 1;
+    }
+    elsif ($obj->Type eq 'approval') {
+	$obj->SetStatus( Status => 'open', Force => 1 );
+    }
+    elsif ($RT::UseCodeTickets and $obj->Type eq 'code') {
+	my $code = $obj->Transactions->First->Content;
+	my $rv;
+
+	foreach my $TOP (@TOP) {
+	    local $@;
+	    $rv++ if eval $code;
+	    $RT::Logger->error("Cannot eval code: $@") if $@;
+	}
+
+	if ($rv or !@TOP) {
+	    $obj->SetStatus( Status	=> 'resolved', Force	=> 1,);
+	}
+	else {
+	    $obj->SetStatus( Status	=> 'rejected', Force	=> 1,);
+	}
+    }
+}
+
+# Now magically turn myself into a Requestor Notify object...
+require RT::Action::Notify; bless($self, 'RT::Action::Notify');
+$self->{Argument} = 'Requestor'; $self->Prepare;
+
+return $passed;
+# ------------------------------------------------------------------- #
+	],
+       CustomCommitCode => '"never needed"',
+       Template => 'All Approvals Passed', },
+
+);
+
+@ACL = (
+    { UserId => 'Nobody',      # - principalId
+      Right  => 'OwnTicket', },
+
+    { UserId => 'root',        # - principalid
+      Right  => 'SuperUser', },
+
+);
diff --git a/rt/etc/schema.Pg b/rt/etc/schema.Pg
index 21d981b4a..ba0d6fc6c 100755
--- a/rt/etc/schema.Pg
+++ b/rt/etc/schema.Pg
@@ -1,267 +1,578 @@
-CREATE TABLE KeywordSelects (
-  id serial NOT NULL  ,
-  Name varchar(255)   ,
-  Keyword integer   ,
-  Single integer   ,
-  Depth integer NOT NULL DEFAULT 0 ,
-  ObjectType varchar(32) NOT NULL  ,
-  ObjectField varchar(32)   ,
-  ObjectValue varchar(255)   ,
-  Disabled int2 NOT NULL DEFAULT 0 ,
-  PRIMARY KEY (id)
-);
-CREATE INDEX KeywordSelects1 ON KeywordSelects (Keyword);
-CREATE INDEX KeywordSelects2 ON KeywordSelects (ObjectType, ObjectField, ObjectValue);
+------------------------------------------------------------------
+-- My2Pg 1.23 translated dump
+--
+------------------------------------------------------------------
+
+BEGIN;
+
+
+
+
+--
+-- Sequences for table ATTACHMENTS
+--
+
+CREATE SEQUENCE attachments_id_seq;
+
+-- {{{ Attachments
+
 CREATE TABLE Attachments (
-  id serial NOT NULL  ,
+  id INTEGER DEFAULT nextval('attachments_id_seq'),
   TransactionId integer NOT NULL  ,
-  Parent integer   ,
-  MessageId varchar(160)   ,
-  Subject varchar(255)   ,
-  Filename varchar(255)   ,
-  ContentType varchar(80)   ,
-  ContentEncoding varchar(80)   ,
-  Content TEXT   ,
-  Headers TEXT   ,
-  Creator integer   ,
-  Created timestamp   ,
+  Parent integer NOT NULL DEFAULT 0  ,
+  MessageId varchar(160) NULL  ,
+  Subject varchar(255) NULL  ,
+  Filename varchar(255) NULL  ,
+  ContentType varchar(80) NULL  ,
+  ContentEncoding varchar(80) NULL  ,
+  Content text NULL  ,
+  Headers text NULL  ,
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
   PRIMARY KEY (id)
+
 );
-CREATE INDEX Attachments1 ON Attachments (Parent);
-CREATE INDEX Attachments2 ON Attachments (TransactionId);
-CREATE INDEX Attachments3 ON Attachments (Parent, TransactionId);
+
+CREATE INDEX Attachments1 ON Attachments (Parent) ;
+CREATE INDEX Attachments2 ON Attachments (TransactionId) ;
+CREATE INDEX Attachments3 ON Attachments (Parent, TransactionId) ;
+-- }}}
+
+-- {{{ Queues
+
+
+--
+-- Sequences for table QUEUES
+--
+
+CREATE SEQUENCE queues_id_seq;
+
 CREATE TABLE Queues (
-  id serial NOT NULL  ,
-  Name varchar(120) NOT NULL  ,
-  Description varchar(120)   ,
-  CorrespondAddress varchar(120)   ,
-  CommentAddress varchar(120)   ,
-  InitialPriority integer   ,
-  FinalPriority integer   ,
-  DefaultDueIn integer   ,
-  Creator integer   ,
-  Created timestamp   ,
-  LastUpdatedBy integer   ,
-  LastUpdated timestamp   ,
+  id INTEGER DEFAULT nextval('queues_id_seq'),
+  Name varchar(200) NOT NULL  ,
+  Description varchar(255) NULL  ,
+  CorrespondAddress varchar(120) NULL  ,
+  CommentAddress varchar(120) NULL  ,
+  InitialPriority integer NOT NULL DEFAULT 0  ,
+  FinalPriority integer NOT NULL DEFAULT 0  ,
+  DefaultDueIn integer NOT NULL DEFAULT 0  ,
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
   Disabled int2 NOT NULL DEFAULT 0 ,
   PRIMARY KEY (id)
+
 );
-CREATE UNIQUE INDEX Queues1 ON Queues (Name);
+CREATE UNIQUE INDEX Queues1 ON Queues (Name) ;
+
+-- }}}
+
+-- {{{ Links
+
+
+
+--
+-- Sequences for table LINKS
+--
+
+CREATE SEQUENCE links_id_seq;
+
 CREATE TABLE Links (
-  id serial NOT NULL  ,
-  Base varchar(240)   ,
-  Target varchar(240)   ,
+  id INTEGER DEFAULT nextval('links_id_seq'),
+  Base varchar(240) NULL  ,
+  Target varchar(240) NULL  ,
   Type varchar(20) NOT NULL  ,
-  LocalTarget integer   ,
-  LocalBase integer   ,
-  LastUpdatedBy integer   ,
-  LastUpdated timestamp   ,
-  Creator integer   ,
-  Created timestamp   ,
+  LocalTarget integer NOT NULL DEFAULT 0  ,
+  LocalBase integer NOT NULL DEFAULT 0  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
   PRIMARY KEY (id)
+
 );
-CREATE UNIQUE INDEX Links1 ON Links (Base, Target, Type);
-CREATE TABLE Groups (
-  id serial NOT NULL  ,
-  Name varchar(16)   ,
-  Description varchar(64)   ,
-  Pseudo integer NOT NULL DEFAULT 0 ,
-  PRIMARY KEY (id)
+CREATE UNIQUE INDEX Links1 ON Links (Base, Target, Type) ;
+
+-- }}}
+
+-- {{{ Principals
+
+
+
+--
+-- Sequences for table PRINCIPALS
+--
+
+CREATE SEQUENCE principals_id_seq;
+
+CREATE TABLE Principals (
+        id INTEGER DEFAULT nextval('principals_id_seq') not null,
+        PrincipalType VARCHAR(16) not null,
+        ObjectId integer, 
+        Disabled int2 NOT NULL DEFAULT 0 ,
+        PRIMARY KEY (id)
+
 );
-CREATE UNIQUE INDEX Groups1 ON Groups (Name);
-CREATE TABLE Watchers (
-  id serial NOT NULL  ,
-  Type varchar(16)   ,
-  Scope varchar(16)   ,
-  Value integer   ,
-  Email varchar(255)   ,
-  Quiet integer   ,
-  Owner integer   ,
-  Creator integer   ,
-  Created timestamp   ,
-  LastUpdatedBy integer   ,
-  LastUpdated timestamp   ,
+
+CREATE INDEX Principals2 ON Principals (ObjectId);
+
+
+-- }}}
+
+-- {{{ Groups
+
+
+
+--
+-- Sequences for table GROUPS
+--
+
+CREATE SEQUENCE groups_id_seq;
+
+CREATE TABLE Groups (
+  id INTEGER DEFAULT nextval('groups_id_seq'),
+  Name varchar(200) NULL  ,
+  Description varchar(255) NULL  ,
+  Domain varchar(64),
+  Type varchar(64),
+  Instance varchar(64),
   PRIMARY KEY (id)
+
 );
-CREATE INDEX Watchers1 ON Watchers (Scope, Value, Type, Owner);
+CREATE UNIQUE INDEX Groups1 ON Groups (Domain,Instance,Type,id, Name);
+CREATE INDEX Groups2 On Groups  (Type, Instance, Domain);
+
+
+-- }}}
+
+-- {{{ ScripConditions
+
+
+
+--
+-- Sequences for table SCRIPCONDITIONS
+--
+
+CREATE SEQUENCE scripconditions_id_seq;
+
 CREATE TABLE ScripConditions (
-  id serial NOT NULL  ,
-  Name varchar(255)   ,
-  Description varchar(255)   ,
-  ExecModule varchar(60)   ,
-  Argument varchar(255)   ,
-  ApplicableTransTypes varchar(60)   ,
-  Creator integer   ,
-  Created timestamp   ,
-  LastUpdatedBy integer   ,
-  LastUpdated timestamp   ,
+  id INTEGER DEFAULT nextval('scripconditions_id_seq'),
+  Name varchar(200) NULL  ,
+  Description varchar(255) NULL  ,
+  ExecModule varchar(60) NULL  ,
+  Argument varchar(255) NULL  ,
+  ApplicableTransTypes varchar(60) NULL  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
   PRIMARY KEY (id)
+
 );
+
+-- }}}
+
+-- {{{ Transactions
+
+
+--
+-- Sequences for table TRANSACTIONS
+--
+
+CREATE SEQUENCE transactions_id_seq;
+
 CREATE TABLE Transactions (
-  id serial NOT NULL  ,
-  EffectiveTicket integer   ,
-  Ticket integer   ,
-  TimeTaken integer   ,
-  Type varchar(20)   ,
-  Field varchar(40)   ,
-  OldValue varchar(255)   ,
-  NewValue varchar(255)   ,
-  Data varchar(100)   ,
-  Creator integer   ,
-  Created timestamp   ,
+  id INTEGER DEFAULT nextval('transactions_id_seq'),
+  EffectiveTicket integer NOT NULL DEFAULT 0  ,
+  Ticket integer NOT NULL DEFAULT 0  ,
+  TimeTaken integer NOT NULL DEFAULT 0  ,
+  Type varchar(20) NULL  ,
+  Field varchar(40) NULL  ,
+  OldValue varchar(255) NULL  ,
+  NewValue varchar(255) NULL  ,
+  Data varchar(100) NULL  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
   PRIMARY KEY (id)
+
 );
 CREATE INDEX Transactions1 ON Transactions (Ticket);
 CREATE INDEX Transactions2 ON Transactions (EffectiveTicket);
+
+-- }}}
+
+-- {{{ Scrips 
+
+
+
+--
+-- Sequences for table SCRIPS
+--
+
+CREATE SEQUENCE scrips_id_seq;
+
 CREATE TABLE Scrips (
-  id serial NOT NULL  ,
-  ScripCondition integer   ,
-  ScripAction integer   ,
-  Stage varchar(32)   ,
-  Queue integer   ,
-  Template integer   ,
-  Creator integer   ,
-  Created timestamp   ,
-  LastUpdatedBy integer   ,
-  LastUpdated timestamp   ,
+  id INTEGER DEFAULT nextval('scrips_id_seq'),
+  Description varchar(255),
+  ScripCondition integer NOT NULL DEFAULT 0  ,
+  ScripAction integer NOT NULL DEFAULT 0  ,
+  ConditionRules text NULL  ,
+  ActionRules text NULL  ,
+  CustomIsApplicableCode text NULL  ,
+  CustomPrepareCode text NULL  ,
+  CustomCommitCode text NULL  ,
+  Stage varchar(32) NULL  ,
+  Queue integer NOT NULL DEFAULT 0  ,
+  Template integer NOT NULL DEFAULT 0  ,
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
   PRIMARY KEY (id)
+
 );
+
+-- }}}
+
+-- {{{ ACL
+
+
+--
+-- Sequences for table ACL
+--
+
+CREATE SEQUENCE acl_id_seq;
+
 CREATE TABLE ACL (
-  id serial NOT NULL  ,
-  PrincipalId integer   ,
-  PrincipalType varchar(25)   ,
-  RightName varchar(25)   ,
-  RightScope varchar(25)   ,
-  RightAppliesTo integer   ,
+  id INTEGER DEFAULT nextval('acl_id_seq'),
+  PrincipalType varchar(25) NOT NULL, 
+
+  PrincipalId integer NOT NULL  , 
+  RightName varchar(25) NOT NULL  ,
+  ObjectType varchar(25) NOT NULL  ,
+  ObjectId integer NOT NULL DEFAULT 0,
+  DelegatedBy integer NOT NULL DEFAULT 0, 
+  DelegatedFrom integer NOT NULL DEFAULT 0, 
   PRIMARY KEY (id)
+
 );
-CREATE INDEX ACL1 ON ACL (RightScope, PrincipalId);
-CREATE INDEX ACL2 ON ACL (RightScope, RightAppliesTo, RightName, PrincipalType, PrincipalId);
+
+CREATE INDEX  ACL1 on ACL(RightName, ObjectType, ObjectId,PrincipalType,PrincipalId);
+
+
+-- }}}
+
+-- {{{ GroupMembers 
+
+
+
+--
+-- Sequences for table GROUPMEMBERS
+--
+
+CREATE SEQUENCE groupmembers_id_seq;
+
 CREATE TABLE GroupMembers (
-  id serial NOT NULL  ,
-  GroupId integer   ,
-  UserId integer   ,
-  PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX GroupMembers1 ON GroupMembers (GroupId, UserId);
-CREATE TABLE ObjectKeywords (
-  id serial NOT NULL  ,
-  Keyword integer NOT NULL  ,
-  KeywordSelect integer NOT NULL  ,
-  ObjectType varchar(32) NOT NULL  ,
-  ObjectId integer NOT NULL  ,
+  id INTEGER DEFAULT nextval('groupmembers_id_seq'),
+  GroupId integer NOT NULL DEFAULT 0,
+  MemberId integer NOT NULL DEFAULT 0,  
   PRIMARY KEY (id)
+
 );
-CREATE UNIQUE INDEX ObjectKeywords1 ON ObjectKeywords (ObjectId, ObjectType, KeywordSelect, Keyword);
-CREATE INDEX ObjectKeywords2 ON ObjectKeywords (ObjectId, ObjectType);
-CREATE INDEX ObjectKeywords3 ON ObjectKeywords (Keyword);
-CREATE TABLE Keywords (
-  id serial NOT NULL  ,
-  Name varchar(255) NOT NULL  ,
-  Description varchar(255)   ,
-  Parent integer   ,
-  Disabled int2 NOT NULL DEFAULT 0 ,
-  PRIMARY KEY (id)
+
+-- }}}
+
+-- {{{ GroupMembersCache
+
+
+
+--
+-- Sequences for table CACHEDGROUPMEMBERS
+--
+
+CREATE SEQUENCE cachedgroupmembers_id_seq;
+
+CREATE TABLE CachedGroupMembers (
+        id int DEFAULT nextval('cachedgroupmembers_id_seq'),
+        GroupId int, 
+        MemberId int, 
+        Via int, 
+        ImmediateParentId int, 
+        Disabled int2 NOT NULL DEFAULT 0 , 
+        PRIMARY KEY (id)
+
 );
-CREATE UNIQUE INDEX Keywords1 ON Keywords (Name, Parent);
-CREATE INDEX Keywords2 ON Keywords (Name);
-CREATE INDEX Keywords3 ON Keywords (Parent);
+
+CREATE INDEX CachedGroupMembers2 on CachedGroupMembers (MemberId);
+CREATE INDEX CachedGroupMembers3 on CachedGroupMembers (GroupId);
+CREATE INDEX DisGrouMem  on CachedGroupMembers (GroupId,MemberId,Disabled); 
+
+-- }}}
+
+-- {{{ Users
+
+
+
+--
+-- Sequences for table USERS
+--
+
+CREATE SEQUENCE users_id_seq;
+
 CREATE TABLE Users (
-  id serial NOT NULL  ,
-  Name varchar(120) NOT NULL  ,
-  Password varchar(40)   ,
-  Comments TEXT   ,
-  Signature TEXT   ,
-  EmailAddress varchar(120)   ,
-  FreeformContactInfo TEXT   ,
-  Organization varchar(200)   ,
-  Privileged integer   ,
-  RealName varchar(120)   ,
-  Nickname varchar(16)   ,
-  Lang varchar(16)   ,
-  EmailEncoding varchar(16)   ,
-  WebEncoding varchar(16)   ,
-  ExternalContactInfoId varchar(100)   ,
-  ContactInfoSystem varchar(30)   ,
-  ExternalAuthId varchar(100)   ,
-  AuthSystem varchar(30)   ,
-  Gecos varchar(16)   ,
-  HomePhone varchar(30)   ,
-  WorkPhone varchar(30)   ,
-  MobilePhone varchar(30)   ,
-  PagerPhone varchar(30)   ,
-  Address1 varchar(200)   ,
-  Address2 varchar(200)   ,
-  City varchar(100)   ,
-  State varchar(100)   ,
-  Zip varchar(16)   ,
-  Country varchar(50)   ,
-  Creator integer   ,
-  Created timestamp   ,
-  LastUpdatedBy integer   ,
-  LastUpdated timestamp   ,
-  Disabled int2 NOT NULL DEFAULT 0 ,
+  id INTEGER DEFAULT nextval('users_id_seq'),
+  Name varchar(200) NOT NULL  ,
+  Password varchar(40) NULL  ,
+  Comments text NULL  ,
+  Signature text NULL  ,
+  EmailAddress varchar(120) NULL  ,
+  FreeformContactInfo text NULL  ,
+  Organization varchar(200) NULL  ,
+  RealName varchar(120) NULL  ,
+  NickName varchar(16) NULL  ,
+  Lang varchar(16) NULL  ,
+  EmailEncoding varchar(16) NULL  ,
+  WebEncoding varchar(16) NULL  ,
+  ExternalContactInfoId varchar(100) NULL  ,
+  ContactInfoSystem varchar(30) NULL  ,
+  ExternalAuthId varchar(100) NULL  ,
+  AuthSystem varchar(30) NULL  ,
+  Gecos varchar(16) NULL  ,
+  HomePhone varchar(30) NULL  ,
+  WorkPhone varchar(30) NULL  ,
+  MobilePhone varchar(30) NULL  ,
+  PagerPhone varchar(30) NULL  ,
+  Address1 varchar(200) NULL  ,
+  Address2 varchar(200) NULL  ,
+  City varchar(100) NULL  ,
+  State varchar(100) NULL  ,
+  Zip varchar(16) NULL  ,
+  Country varchar(50) NULL  ,
+  Timezone varchar(50) NULL  ,
+  PGPKey text NULL,
+
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
   PRIMARY KEY (id)
+
 );
-CREATE UNIQUE INDEX Users1 ON Users (Name);
+
+
+CREATE UNIQUE INDEX Users1 ON Users (Name) ;
+CREATE INDEX Users2 ON Users (Name);
 CREATE INDEX Users3 ON Users (id, EmailAddress);
 CREATE INDEX Users4 ON Users (EmailAddress);
+
+
+-- }}}
+
+-- {{{ Tickets
+
+
+
+--
+-- Sequences for table TICKETS
+--
+
+CREATE SEQUENCE tickets_id_seq;
+
 CREATE TABLE Tickets (
-  id serial NOT NULL  ,
-  EffectiveId integer   ,
-  Queue integer   ,
-  Type varchar(16)   ,
-  IssueStatement integer   ,
-  Resolution integer   ,
-  Owner integer   ,
-  Subject varchar(200)  DEFAULT '[no subject]' ,
-  InitialPriority integer   ,
-  FinalPriority integer   ,
-  Priority integer   ,
-  Status varchar(10)   ,
-  TimeWorked integer   ,
-  TimeLeft integer   ,
-  Told timestamp   ,
-  Starts timestamp   ,
-  Started timestamp   ,
-  Due timestamp   ,
-  Resolved timestamp   ,
-  LastUpdatedBy integer   ,
-  LastUpdated timestamp   ,
-  Creator integer   ,
-  Created timestamp   ,
+  id INTEGER DEFAULT nextval('tickets_id_seq'),
+  EffectiveId integer NOT NULL DEFAULT 0  ,
+  Queue integer NOT NULL DEFAULT 0  ,
+  Type varchar(16) NULL  ,
+  IssueStatement integer NOT NULL DEFAULT 0  ,
+  Resolution integer NOT NULL DEFAULT 0  ,
+  Owner integer NOT NULL DEFAULT 0  ,
+  Subject varchar(200) NULL DEFAULT '[no subject]' ,
+  InitialPriority integer NOT NULL DEFAULT 0  ,
+  FinalPriority integer NOT NULL DEFAULT 0  ,
+  Priority integer NOT NULL DEFAULT 0  ,
+  TimeEstimated integer NOT NULL DEFAULT 0  ,
+  TimeWorked integer NOT NULL DEFAULT 0  ,
+  Status varchar(10) NULL  ,
+  TimeLeft integer NOT NULL DEFAULT 0  ,
+  Told TIMESTAMP NULL  ,
+  Starts TIMESTAMP NULL  ,
+  Started TIMESTAMP NULL  ,
+  Due TIMESTAMP NULL  ,
+  Resolved TIMESTAMP NULL  ,
+
+
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
   Disabled int2 NOT NULL DEFAULT 0 ,
   PRIMARY KEY (id)
+
 );
-CREATE INDEX Tickets1 ON Tickets (Queue, Status);
-CREATE INDEX Tickets2 ON Tickets (Owner);
-CREATE INDEX Tickets3 ON Tickets (EffectiveId);
-CREATE INDEX Tickets4 ON Tickets (id, Status);
-CREATE INDEX Tickets5 ON Tickets (id, EffectiveId);
+
+CREATE INDEX Tickets1 ON Tickets (Queue, Status) ;
+CREATE INDEX Tickets2 ON Tickets (Owner) ;
+CREATE INDEX Tickets3 ON Tickets (EffectiveId) ;
+CREATE INDEX Tickets4 ON Tickets (id, Status) ;
+CREATE INDEX Tickets5 ON Tickets (id, EffectiveId) ;
+
+-- }}}
+
+-- {{{ ScripActions
+
+
+
+--
+-- Sequences for table SCRIPACTIONS
+--
+
+CREATE SEQUENCE scripactions_id_seq;
+
 CREATE TABLE ScripActions (
-  id serial NOT NULL  ,
-  Name varchar(255)   ,
-  Description varchar(255)   ,
-  ExecModule varchar(60)   ,
-  Argument varchar(255)   ,
-  Creator integer   ,
-  Created timestamp   ,
-  LastUpdatedBy integer   ,
-  LastUpdated timestamp   ,
+  id INTEGER DEFAULT nextval('scripactions_id_seq'),
+  Name varchar(200) NULL  ,
+  Description varchar(255) NULL  ,
+  ExecModule varchar(60) NULL  ,
+  Argument varchar(255) NULL  ,
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
   PRIMARY KEY (id)
+
 );
+
+-- }}}
+
+-- {{{ Templates
+
+
+
+--
+-- Sequences for table TEMPLATES
+--
+
+CREATE SEQUENCE templates_id_seq;
+
 CREATE TABLE Templates (
-  id serial NOT NULL  ,
+  id INTEGER DEFAULT nextval('templates_id_seq'),
+  Queue integer NOT NULL DEFAULT 0 ,
+  Name varchar(200) NOT NULL  ,
+  Description varchar(255) NULL  ,
+  Type varchar(16) NULL  ,
+  Language varchar(16) NULL  ,
+  TranslationOf integer NOT NULL DEFAULT 0  ,
+  Content text NULL  ,
+  LastUpdated TIMESTAMP NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
+  PRIMARY KEY (id)
+
+);
+
+-- }}}
+
+-- {{{ TicketCustomFieldValues 
+
+
+
+--
+-- Sequences for table TICKETCUSTOMFIELDVALUES
+--
+
+CREATE SEQUENCE ticketcustomfieldvalues_id_s;
+
+CREATE TABLE TicketCustomFieldValues (
+  id INTEGER DEFAULT nextval('ticketcustomfieldvalues_id_s'),
+  Ticket int NOT NULL  ,
+  CustomField int NOT NULL  ,
+  Content varchar(255) NULL  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
+  PRIMARY KEY (id)
+
+);
+
+-- }}}
+
+-- {{{ CustomFields
+
+
+
+--
+-- Sequences for table CUSTOMFIELDS
+--
+
+CREATE SEQUENCE customfields_id_seq;
+
+CREATE TABLE CustomFields (
+  id INTEGER DEFAULT nextval('customfields_id_seq'),
+  Name varchar(200) NULL  ,
+  Type varchar(200) NULL  ,
   Queue integer NOT NULL DEFAULT 0 ,
-  Name varchar(40) NOT NULL  ,
-  Description varchar(120)   ,
-  Type varchar(16)   ,
-  Language varchar(16)   ,
-  TranslationOf integer   ,
-  Content TEXT   ,
-  LastUpdated timestamp   ,
-  LastUpdatedBy integer   ,
-  Creator integer   ,
-  Created timestamp   ,
+  Description varchar(255) NULL  ,
+  SortOrder integer NOT NULL DEFAULT 0  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
+  Disabled int2 NOT NULL DEFAULT 0 ,
   PRIMARY KEY (id)
+
+);
+
+-- }}}
+
+-- {{{ CustomFieldValues 
+
+
+
+--
+-- Sequences for table CUSTOMFIELDVALUES
+--
+
+CREATE SEQUENCE customfieldvalues_id_seq;
+
+CREATE TABLE CustomFieldValues (
+  id INTEGER DEFAULT nextval('customfieldvalues_id_seq'),
+  CustomField int NOT NULL  ,
+  Name varchar(200) NULL  ,
+  Description varchar(255) NULL  ,
+  SortOrder integer NOT NULL DEFAULT 0  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
+  PRIMARY KEY (id)
+
+);
+
+-- }}}
+
+-- {{{ Sessions
+
+-- sessions is used by Apache::Session to keep sessions in the database.
+-- We should have a reaper script somewhere.
+
+CREATE TABLE sessions (
+    id char(32) NOT NULL,
+    a_session bytea,
+    LastUpdated TIMESTAMP not null default current_timestamp,
+    PRIMARY KEY (id)
+
 );
+
+-- }}}
+
+
+
+COMMIT;
diff --git a/rt/etc/schema.SQLite b/rt/etc/schema.SQLite
new file mode 100644
index 000000000..f24bdbdc1
--- /dev/null
+++ b/rt/etc/schema.SQLite
@@ -0,0 +1,384 @@
+--- {{{ Attachments
+
+CREATE TABLE Attachments (
+  id INTEGER PRIMARY KEY  ,
+  TransactionId INTEGER  ,
+  Parent integer NULL  ,
+  MessageId varchar(160) NULL  ,
+  Subject varchar(255) NULL  ,
+  Filename varchar(255) NULL  ,
+  ContentType varchar(80) NULL  ,
+  ContentEncoding varchar(80) NULL  ,
+  Content LONGTEXT NULL  ,
+  Headers LONGTEXT NULL  ,
+  Creator integer NULL  ,
+  Created DATETIME NULL 
+  
+) ;
+
+CREATE INDEX Attachments1 ON Attachments (Parent) ;
+CREATE INDEX Attachments2 ON Attachments (TransactionId) ;
+CREATE INDEX Attachments3 ON Attachments (Parent, TransactionId) ;
+--- }}}
+
+--- {{{ Queues
+CREATE TABLE Queues (
+  id INTEGER PRIMARY KEY  ,
+  Name varchar(200) NOT NULL  ,
+  Description varchar(255) NULL  ,
+  CorrespondAddress varchar(120) NULL  ,
+  CommentAddress varchar(120) NULL  ,
+  InitialPriority integer NULL  ,
+  FinalPriority integer NULL  ,
+  DefaultDueIn integer NULL  ,
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL  ,
+  Disabled int2 NOT NULL DEFAULT 0 
+ 
+) ;
+CREATE UNIQUE INDEX Queues1 ON Queues (Name) ;
+
+--- }}}
+
+--- {{{ Links
+
+CREATE TABLE Links (
+  id INTEGER PRIMARY KEY  ,
+  Base varchar(240) NULL  ,
+  Target varchar(240) NULL  ,
+  Type varchar(20) NOT NULL  ,
+  LocalTarget integer NULL  ,
+  LocalBase integer NULL  ,
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL  ,
+  Creator integer NULL  ,
+  Created DATETIME NULL  
+  
+) ;
+CREATE UNIQUE INDEX Links1 ON Links (Base, Target, Type) ;
+
+--- }}}
+
+--- {{{ Principals
+
+CREATE TABLE Principals (
+        id INTEGER PRIMARY KEY,
+        PrincipalType VARCHAR(16) not null,
+        ObjectId integer,
+        Disabled int2 NOT NULL DEFAULT 0 
+        
+) ;
+
+--- }}}
+
+--- {{{ Groups
+
+CREATE TABLE Groups (
+  id INTEGER ,
+  Name varchar(200) NULL  ,
+  Description varchar(255) NULL  ,
+  Domain varchar(64),
+  Type varchar(64),
+  Instance varchar(64)
+  
+) ;
+
+CREATE UNIQUE INDEX Groups1 ON Groups (Name,Domain,Type,Instance) ;
+
+--- }}}
+
+--- {{{ ScripConditions
+
+CREATE TABLE ScripConditions (
+  id INTEGER PRIMARY KEY  ,
+  Name varchar(200) NULL  ,
+  Description varchar(255) NULL  ,
+  ExecModule varchar(60) NULL  ,
+  Argument varchar(255) NULL  ,
+  ApplicableTransTypes varchar(60) NULL  ,
+
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL  
+  
+) ;
+
+--- }}}
+
+--- {{{ Transactions
+CREATE TABLE Transactions (
+  id INTEGER PRIMARY KEY  ,
+  EffectiveTicket integer NULL  ,
+  Ticket integer NULL  ,
+  TimeTaken integer NULL  ,
+  Type varchar(20) NULL  ,
+  Field varchar(40) NULL  ,
+  OldValue varchar(255) NULL  ,
+  NewValue varchar(255) NULL  ,
+  Data varchar(100) NULL  ,
+
+  Creator integer NULL  ,
+  Created DATETIME NULL  
+  
+) ;
+CREATE INDEX Transactions1 ON Transactions (Ticket);
+CREATE INDEX Transactions2 ON Transactions (EffectiveTicket);
+
+--- }}}
+
+--- {{{ Scrips 
+
+CREATE TABLE Scrips (
+  id INTEGER PRIMARY KEY  ,
+  Description varchar(255),
+  ScripCondition integer NULL  ,
+  ScripAction integer NULL  ,
+  ConditionRules text NULL  ,
+  ActionRules text NULL  ,
+  CustomIsApplicableCode text NULL  ,
+  CustomPrepareCode text NULL  ,
+  CustomCommitCode text NULL  ,
+  Stage varchar(32) NULL  ,
+  Queue integer NULL  ,
+  Template integer NULL  ,
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL  
+  
+) ;
+
+--- }}}
+
+--- {{{ ACL
+CREATE TABLE ACL (
+  id INTEGER PRIMARY KEY  ,
+  PrincipalType varchar(25) NOT NULL,
+
+  PrincipalId INTEGER,
+  RightName varchar(25) NOT NULL  ,
+  ObjectType varchar(25) NOT NULL  ,
+  ObjectId INTEGER default 0,
+  DelegatedBy integer NOT NULL default 0, 
+  DelegatedFrom integer NOT NULL default 0
+  
+) ;
+
+
+--- }}}
+
+--- {{{ GroupMembers 
+
+CREATE TABLE GroupMembers (
+  id INTEGER PRIMARY KEY  ,
+  GroupId integer NULL,
+  MemberId integer NULL
+  
+) ;
+
+--- }}}
+
+--- {{{ CachedGroupMembers
+
+create table CachedGroupMembers (
+        id integer primary key ,
+        GroupId int, 
+        MemberId int, 
+        Via int, 
+        ImmediateParentId int,
+        Disabled int2 NOT NULL DEFAULT 0  # if this cached group member is a member of this group by way of a disabled
+                                           # group or this group is disabled, this will be set to 1
+                                           # this allows us to not find members of disabled subgroups when listing off
+                                           # group members recursively.
+                                           # Also, this allows us to have the ACL system elide members of disabled groups
+
+        
+) ;
+
+--- }}}
+
+--- {{{ Users
+
+CREATE TABLE Users (
+  id INTEGER ,
+  Name varchar(200) NOT NULL  ,
+  Password varchar(40) NULL  ,
+  Comments blob NULL  ,
+  Signature blob NULL  ,
+  EmailAddress varchar(120) NULL  ,
+  FreeformContactInfo blob NULL  ,
+  Organization varchar(200) NULL  ,
+  RealName varchar(120) NULL  ,
+  NickName varchar(16) NULL  ,
+  Lang varchar(16) NULL  ,
+  EmailEncoding varchar(16) NULL  ,
+  WebEncoding varchar(16) NULL  ,
+  ExternalContactInfoId varchar(100) NULL  ,
+  ContactInfoSystem varchar(30) NULL  ,
+  ExternalAuthId varchar(100) NULL  ,
+  AuthSystem varchar(30) NULL  ,
+  Gecos varchar(16) NULL  ,
+  HomePhone varchar(30) NULL  ,
+  WorkPhone varchar(30) NULL  ,
+  MobilePhone varchar(30) NULL  ,
+  PagerPhone varchar(30) NULL  ,
+  Address1 varchar(200) NULL  ,
+  Address2 varchar(200) NULL  ,
+  City varchar(100) NULL  ,
+  State varchar(100) NULL  ,
+  Zip varchar(16) NULL  ,
+  Country varchar(50) NULL  ,
+  Timezone char(50) NULL  ,
+  PGPKey text NULL,
+
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL  
+  
+) ;
+
+
+CREATE UNIQUE INDEX Users1 ON Users (Name) ;
+CREATE INDEX Users2 ON Users (Name);
+CREATE INDEX Users3 ON Users (id, EmailAddress);
+CREATE INDEX Users4 ON Users (EmailAddress);
+
+
+--- }}}
+
+--- {{{ Tickets
+
+CREATE TABLE Tickets (
+  id INTEGER PRIMARY KEY  ,
+  EffectiveId integer NULL  ,
+  Queue integer NULL  ,
+  Type varchar(16) NULL  ,
+  IssueStatement integer NULL  ,
+  Resolution integer NULL  ,
+  Owner integer NULL  ,
+  Subject varchar(200) NULL DEFAULT '[no subject]' ,
+  InitialPriority integer NULL  ,
+  FinalPriority integer NULL  ,
+  Priority integer NULL  ,
+  TimeEstimated integer NULL  ,
+  TimeWorked integer NULL  ,
+  Status varchar(10) NULL  ,
+  TimeLeft integer NULL  ,
+  Told DATETIME NULL  ,
+  Starts DATETIME NULL  ,
+  Started DATETIME NULL  ,
+  Due DATETIME NULL  ,
+  Resolved DATETIME NULL  ,
+
+
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL  ,
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  Disabled int2 NOT NULL DEFAULT 0
+  
+) ;
+
+CREATE INDEX Tickets1 ON Tickets (Queue, Status) ;
+CREATE INDEX Tickets2 ON Tickets (Owner) ;
+CREATE INDEX Tickets3 ON Tickets (EffectiveId) ;
+CREATE INDEX Tickets4 ON Tickets (id, Status) ;
+CREATE INDEX Tickets5 ON Tickets (id, EffectiveId) ;
+
+--- }}}
+
+--- {{{ ScripActions
+
+CREATE TABLE ScripActions (
+  id INTEGER PRIMARY KEY  ,
+  Name varchar(200) NULL  ,
+  Description varchar(255) NULL  ,
+  ExecModule varchar(60) NULL  ,
+  Argument varchar(255) NULL  ,
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL  
+  
+) ;
+
+--- }}}
+
+--- {{{ Templates
+
+CREATE TABLE Templates (
+  id INTEGER PRIMARY KEY  ,
+  Queue integer NOT NULL DEFAULT 0 ,
+  Name varchar(200) NOT NULL  ,
+  Description varchar(255) NULL  ,
+  Type varchar(16) NULL  ,
+  Language varchar(16) NULL  ,
+  TranslationOf integer NULL  ,
+  Content blob NULL  ,
+  LastUpdated DATETIME NULL  ,
+  LastUpdatedBy integer NULL  ,
+  Creator integer NULL  ,
+  Created DATETIME NULL  
+  
+) ;
+
+--- }}}
+
+--- {{{ TicketCustomFieldValues 
+
+CREATE TABLE TicketCustomFieldValues (
+  id INTEGER PRIMARY KEY  ,
+  Ticket int NOT NULL  ,
+  CustomField int NOT NULL  ,
+  Content varchar(255) NULL  ,
+
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL  
+  
+) ;
+
+--- }}}
+
+--- {{{ CustomFields
+
+CREATE TABLE CustomFields (
+  id INTEGER PRIMARY KEY  ,
+  Name varchar(200) NULL  ,
+  Type varchar(200) NULL  ,
+  Queue int NULL ,
+  Description varchar(255) NULL  ,
+  SortOrder integer NULL  ,
+
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL ,
+  Disabled int2 NOT NULL DEFAULT 0 
+  
+) ;
+
+--- }}}
+
+--- {{{ CustomFieldValues 
+
+CREATE TABLE CustomFieldValues (
+  id INTEGER PRIMARY KEY  ,
+  CustomField int NOT NULL  ,
+  Name varchar(200) NULL  ,
+  Description varchar(255) NULL  ,
+  SortOrder integer NULL  ,
+
+  Creator integer NULL  ,
+  Created DATETIME NULL  ,
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL 
+  
+) ;
+
+--- }}}
diff --git a/rt/etc/schema.mysql b/rt/etc/schema.mysql
index 7e715c201..46f8ec562 100755
--- a/rt/etc/schema.mysql
+++ b/rt/etc/schema.mysql
@@ -1,21 +1,9 @@
-CREATE TABLE KeywordSelects (
-  id INTEGER NOT NULL  AUTO_INCREMENT,
-  Name varchar(255) NULL  ,
-  Keyword integer NULL  ,
-  Single integer NULL  ,
-  Depth integer NOT NULL DEFAULT 0 ,
-  ObjectType varchar(32) NOT NULL  ,
-  ObjectField varchar(32) NULL  ,
-  ObjectValue varchar(255) NULL  ,
-  Disabled int2 NOT NULL DEFAULT 0 ,
-  PRIMARY KEY (id)
-);
-CREATE INDEX KeywordSelects1 ON KeywordSelects (Keyword);
-CREATE INDEX KeywordSelects2 ON KeywordSelects (ObjectType, ObjectField, ObjectValue);
+# {{{ Attachments
+
 CREATE TABLE Attachments (
   id INTEGER NOT NULL  AUTO_INCREMENT,
   TransactionId integer NOT NULL  ,
-  Parent integer NULL  ,
+  Parent integer NOT NULL DEFAULT 0  ,
   MessageId varchar(160) NULL  ,
   Subject varchar(255) NULL  ,
   Filename varchar(255) NULL  ,
@@ -23,161 +11,222 @@ CREATE TABLE Attachments (
   ContentEncoding varchar(80) NULL  ,
   Content LONGTEXT NULL  ,
   Headers LONGTEXT NULL  ,
-  Creator integer NULL  ,
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
   PRIMARY KEY (id)
-);
-CREATE INDEX Attachments1 ON Attachments (Parent);
-CREATE INDEX Attachments2 ON Attachments (TransactionId);
-CREATE INDEX Attachments3 ON Attachments (Parent, TransactionId);
+) TYPE=InnoDB;
+
+CREATE INDEX Attachments1 ON Attachments (Parent) ;
+CREATE INDEX Attachments2 ON Attachments (TransactionId) ;
+CREATE INDEX Attachments3 ON Attachments (Parent, TransactionId) ;
+# }}}
+
+# {{{ Queues
 CREATE TABLE Queues (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  Name varchar(120) NOT NULL  ,
-  Description varchar(120) NULL  ,
+  Name varchar(200) NOT NULL  ,
+  Description varchar(255) NULL  ,
   CorrespondAddress varchar(120) NULL  ,
   CommentAddress varchar(120) NULL  ,
-  InitialPriority integer NULL  ,
-  FinalPriority integer NULL  ,
-  DefaultDueIn integer NULL  ,
-  Creator integer NULL  ,
+  InitialPriority integer NOT NULL DEFAULT 0  ,
+  FinalPriority integer NOT NULL DEFAULT 0  ,
+  DefaultDueIn integer NOT NULL DEFAULT 0  ,
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
-  LastUpdatedBy integer NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated DATETIME NULL  ,
   Disabled int2 NOT NULL DEFAULT 0 ,
   PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX Queues1 ON Queues (Name);
+) TYPE=InnoDB;
+CREATE UNIQUE INDEX Queues1 ON Queues (Name) ;
+CREATE INDEX Queues2 ON Queues (Disabled) ;
+
+# }}}
+
+# {{{ Links
+
 CREATE TABLE Links (
   id INTEGER NOT NULL  AUTO_INCREMENT,
   Base varchar(240) NULL  ,
   Target varchar(240) NULL  ,
   Type varchar(20) NOT NULL  ,
-  LocalTarget integer NULL  ,
-  LocalBase integer NULL  ,
-  LastUpdatedBy integer NULL  ,
+  LocalTarget integer NOT NULL DEFAULT 0  ,
+  LocalBase integer NOT NULL DEFAULT 0  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated DATETIME NULL  ,
-  Creator integer NULL  ,
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
   PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX Links1 ON Links (Base, Target, Type);
+) TYPE=InnoDB;
+
+CREATE UNIQUE INDEX Links1 ON Links (Base, Target, Type) ;
+CREATE INDEX Links2 ON Links (Base,  Type) ;
+CREATE INDEX Links3 ON Links (Target,  Type) ;
+
+# }}}
+
+# {{{ Principals
+
+CREATE TABLE Principals (
+        id INTEGER  AUTO_INCREMENT not null,
+        PrincipalType VARCHAR(16) not null,
+        ObjectId integer, # foreign key to Users or Groups, depending
+        Disabled int2 NOT NULL DEFAULT 0 ,
+        PRIMARY KEY (id)
+) TYPE=InnoDB;
+
+CREATE INDEX Principals2 ON Principals (ObjectId);
+
+# }}}
+
+# {{{ Groups
+
 CREATE TABLE Groups (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  Name varchar(16) NULL  ,
-  Description varchar(64) NULL  ,
-  Pseudo integer NOT NULL DEFAULT 0 ,
-  PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX Groups1 ON Groups (Name);
-CREATE TABLE Watchers (
-  id INTEGER NOT NULL  AUTO_INCREMENT,
-  Type varchar(16) NULL  ,
-  Scope varchar(16) NULL  ,
-  Value integer NULL  ,
-  Email varchar(255) NULL  ,
-  Quiet integer NULL  ,
-  Owner integer NULL  ,
-  Creator integer NULL  ,
-  Created DATETIME NULL  ,
-  LastUpdatedBy integer NULL  ,
-  LastUpdated DATETIME NULL  ,
+  Name varchar(200) NULL  ,
+  Description varchar(255) NULL  ,
+  Domain varchar(64),
+  Type varchar(64),
+  Instance varchar(64),
   PRIMARY KEY (id)
-);
-CREATE INDEX Watchers1 ON Watchers (Scope, Value, Type, Owner);
+) TYPE=InnoDB;
+
+CREATE INDEX Groups1 ON Groups (Domain,Instance,Type,id);
+CREATE INDEX Groups2 On Groups  (Type, Instance, Domain);   
+
+# }}}
+
+# {{{ ScripConditions
+
 CREATE TABLE ScripConditions (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  Name varchar(255) NULL  ,
+  Name varchar(200) NULL  ,
   Description varchar(255) NULL  ,
   ExecModule varchar(60) NULL  ,
   Argument varchar(255) NULL  ,
   ApplicableTransTypes varchar(60) NULL  ,
-  Creator integer NULL  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
-  LastUpdatedBy integer NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated DATETIME NULL  ,
   PRIMARY KEY (id)
-);
+) TYPE=InnoDB;
+
+# }}}
+
+# {{{ Transactions
 CREATE TABLE Transactions (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  EffectiveTicket integer NULL  ,
-  Ticket integer NULL  ,
-  TimeTaken integer NULL  ,
+  EffectiveTicket integer NOT NULL DEFAULT 0  ,
+  Ticket integer NOT NULL DEFAULT 0  ,
+  TimeTaken integer NOT NULL DEFAULT 0  ,
   Type varchar(20) NULL  ,
   Field varchar(40) NULL  ,
   OldValue varchar(255) NULL  ,
   NewValue varchar(255) NULL  ,
   Data varchar(100) NULL  ,
-  Creator integer NULL  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
   PRIMARY KEY (id)
-);
+) TYPE=InnoDB;
 CREATE INDEX Transactions1 ON Transactions (Ticket);
 CREATE INDEX Transactions2 ON Transactions (EffectiveTicket);
+
+# }}}
+
+# {{{ Scrips 
+
 CREATE TABLE Scrips (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  ScripCondition integer NULL  ,
-  ScripAction integer NULL  ,
+  Description varchar(255),
+  ScripCondition integer NOT NULL DEFAULT 0  ,
+  ScripAction integer NOT NULL DEFAULT 0  ,
+  ConditionRules text NULL  ,
+  ActionRules text NULL  ,
+  CustomIsApplicableCode text NULL  ,
+  CustomPrepareCode text NULL  ,
+  CustomCommitCode text NULL  ,
   Stage varchar(32) NULL  ,
-  Queue integer NULL  ,
-  Template integer NULL  ,
-  Creator integer NULL  ,
+  Queue integer NOT NULL DEFAULT 0  ,
+  Template integer NOT NULL DEFAULT 0  ,
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
-  LastUpdatedBy integer NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated DATETIME NULL  ,
   PRIMARY KEY (id)
-);
+) TYPE=InnoDB;
+
+# }}}
+
+# {{{ ACL
 CREATE TABLE ACL (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  PrincipalId integer NULL  ,
-  PrincipalType varchar(25) NULL  ,
-  RightName varchar(25) NULL  ,
-  RightScope varchar(25) NULL  ,
-  RightAppliesTo integer NULL  ,
+  PrincipalType varchar(25) NOT NULL, #"User" "Group", "Owner", "Cc" "AdminCc", "Requestor", "Requestor" 
+
+  PrincipalId integer NOT NULL  , #Foreign key to principals
+  RightName varchar(25) NOT NULL  ,
+  ObjectType varchar(25) NOT NULL  ,
+  ObjectId integer NOT NULL default 0,
+  DelegatedBy integer NOT NULL default 0, #foreign key to principals with a userid
+  DelegatedFrom integer NOT NULL default 0, #foreign key to ACL
   PRIMARY KEY (id)
-);
-CREATE INDEX ACL1 ON ACL (RightScope, PrincipalId);
-CREATE INDEX ACL2 ON ACL (RightScope, RightAppliesTo, RightName, PrincipalType, PrincipalId);
+) TYPE=InnoDB;
+
+CREATE INDEX  ACL1 on ACL(RightName, ObjectType, ObjectId,PrincipalType,PrincipalId);
+
+# }}}
+
+# {{{ GroupMembers 
+
 CREATE TABLE GroupMembers (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  GroupId integer NULL  ,
-  UserId integer NULL  ,
-  PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX GroupMembers1 ON GroupMembers (GroupId, UserId);
-CREATE TABLE ObjectKeywords (
-  id INTEGER NOT NULL  AUTO_INCREMENT,
-  Keyword integer NOT NULL  ,
-  KeywordSelect integer NOT NULL  ,
-  ObjectType varchar(32) NOT NULL  ,
-  ObjectId integer NOT NULL  ,
-  PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX ObjectKeywords1 ON ObjectKeywords (ObjectId, ObjectType, KeywordSelect, Keyword);
-CREATE INDEX ObjectKeywords2 ON ObjectKeywords (ObjectId, ObjectType);
-CREATE INDEX ObjectKeywords3 ON ObjectKeywords (Keyword);
-CREATE TABLE Keywords (
-  id INTEGER NOT NULL  AUTO_INCREMENT,
-  Name varchar(255) NOT NULL  ,
-  Description varchar(255) NULL  ,
-  Parent integer NULL  ,
-  Disabled int2 NOT NULL DEFAULT 0 ,
+  GroupId integer NOT NULL DEFAULT 0,
+  MemberId integer NOT NULL DEFAULT 0,  #Foreign key to Principals
   PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX Keywords1 ON Keywords (Name, Parent);
-CREATE INDEX Keywords2 ON Keywords (Name);
-CREATE INDEX Keywords3 ON Keywords (Parent);
+) TYPE=InnoDB;
+CREATE UNIQUE INDEX GroupMembers1 on GroupMembers (GroupId, MemberId);
+
+
+# }}}
+
+# {{{ GroupMembersCache
+
+create table CachedGroupMembers (
+        id int auto_increment,
+        GroupId int, # foreign key to Principals
+        MemberId int, # foreign key to Principals
+        Via int, #foreign key to CachedGroupMembers. (may point to $self->id)
+        ImmediateParentId int, #foreign key to prinicpals.         
+                               # this points to the group that the member is
+                               # a member of, for ease of deletes.
+        Disabled int2 NOT NULL DEFAULT 0 , # if this cached group member is a member of this group by way of a disabled
+                                           # group or this group is disabled, this will be set to 1
+                                           # this allows us to not find members of disabled subgroups when listing off
+                                           # group members recursively.
+                                           # Also, this allows us to have the ACL system elide members of disabled groups
+        PRIMARY KEY (id)
+) TYPE=InnoDB;
+
+CREATE INDEX DisGrouMem  on CachedGroupMembers (GroupId,MemberId,Disabled);
+CREATE INDEX GrouMem  on CachedGroupMembers (GroupId,MemberId);
+
+# }}}
+
+# {{{ Users
+
 CREATE TABLE Users (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  Name varchar(120) NOT NULL  ,
+  Name varchar(200) NOT NULL  ,
   Password varchar(40) NULL  ,
   Comments blob NULL  ,
   Signature blob NULL  ,
   EmailAddress varchar(120) NULL  ,
   FreeformContactInfo blob NULL  ,
   Organization varchar(200) NULL  ,
-  Privileged integer NULL  ,
   RealName varchar(120) NULL  ,
-  Nickname varchar(16) NULL  ,
+  NickName varchar(16) NULL  ,
   Lang varchar(16) NULL  ,
   EmailEncoding varchar(16) NULL  ,
   WebEncoding varchar(16) NULL  ,
@@ -196,72 +245,172 @@ CREATE TABLE Users (
   State varchar(100) NULL  ,
   Zip varchar(16) NULL  ,
   Country varchar(50) NULL  ,
-  Creator integer NULL  ,
+  Timezone varchar(50) NULL  ,
+  PGPKey text NULL,
+
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
-  LastUpdatedBy integer NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated DATETIME NULL  ,
-  Disabled int2 NOT NULL DEFAULT 0 ,
   PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX Users1 ON Users (Name);
+) TYPE=InnoDB;
+
+
+CREATE UNIQUE INDEX Users1 ON Users (Name) ;
+CREATE INDEX Users2 ON Users (Name);
 CREATE INDEX Users3 ON Users (id, EmailAddress);
 CREATE INDEX Users4 ON Users (EmailAddress);
+
+
+# }}}
+
+# {{{ Tickets
+
 CREATE TABLE Tickets (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  EffectiveId integer NULL  ,
-  Queue integer NULL  ,
+  EffectiveId integer NOT NULL DEFAULT 0  ,
+  Queue integer NOT NULL DEFAULT 0  ,
   Type varchar(16) NULL  ,
-  IssueStatement integer NULL  ,
-  Resolution integer NULL  ,
-  Owner integer NULL  ,
+  IssueStatement integer NOT NULL DEFAULT 0  ,
+  Resolution integer NOT NULL DEFAULT 0  ,
+  Owner integer NOT NULL DEFAULT 0  ,
   Subject varchar(200) NULL DEFAULT '[no subject]' ,
-  InitialPriority integer NULL  ,
-  FinalPriority integer NULL  ,
-  Priority integer NULL  ,
+  InitialPriority integer NOT NULL DEFAULT 0  ,
+  FinalPriority integer NOT NULL DEFAULT 0  ,
+  Priority integer NOT NULL DEFAULT 0  ,
+  TimeEstimated integer NOT NULL DEFAULT 0  ,
+  TimeWorked integer NOT NULL DEFAULT 0  ,
   Status varchar(10) NULL  ,
-  TimeWorked integer NULL  ,
-  TimeLeft integer NULL  ,
+  TimeLeft integer NOT NULL DEFAULT 0  ,
   Told DATETIME NULL  ,
   Starts DATETIME NULL  ,
   Started DATETIME NULL  ,
   Due DATETIME NULL  ,
   Resolved DATETIME NULL  ,
-  LastUpdatedBy integer NULL  ,
+
+
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated DATETIME NULL  ,
-  Creator integer NULL  ,
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
   Disabled int2 NOT NULL DEFAULT 0 ,
   PRIMARY KEY (id)
-);
-CREATE INDEX Tickets1 ON Tickets (Queue, Status);
-CREATE INDEX Tickets2 ON Tickets (Owner);
-CREATE INDEX Tickets3 ON Tickets (EffectiveId);
-CREATE INDEX Tickets4 ON Tickets (id, Status);
-CREATE INDEX Tickets5 ON Tickets (id, EffectiveId);
+) TYPE=InnoDB;
+
+CREATE INDEX Tickets1 ON Tickets (Queue, Status) ;
+CREATE INDEX Tickets2 ON Tickets (Owner) ;
+CREATE INDEX Tickets3 ON Tickets (EffectiveId) ;
+CREATE INDEX Tickets4 ON Tickets (id, Status) ;
+CREATE INDEX Tickets5 ON Tickets (id, EffectiveId) ;
+CREATE INDEX Tickets6 ON Tickets (EffectiveId, Type) ;
+
+# }}}
+
+# {{{ ScripActions
+
 CREATE TABLE ScripActions (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  Name varchar(255) NULL  ,
+  Name varchar(200) NULL  ,
   Description varchar(255) NULL  ,
   ExecModule varchar(60) NULL  ,
   Argument varchar(255) NULL  ,
-  Creator integer NULL  ,
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
-  LastUpdatedBy integer NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated DATETIME NULL  ,
   PRIMARY KEY (id)
-);
+) TYPE=InnoDB;
+
+# }}}
+
+# {{{ Templates
+
 CREATE TABLE Templates (
   id INTEGER NOT NULL  AUTO_INCREMENT,
   Queue integer NOT NULL DEFAULT 0 ,
-  Name varchar(40) NOT NULL  ,
-  Description varchar(120) NULL  ,
+  Name varchar(200) NOT NULL  ,
+  Description varchar(255) NULL  ,
   Type varchar(16) NULL  ,
   Language varchar(16) NULL  ,
-  TranslationOf integer NULL  ,
+  TranslationOf integer NOT NULL DEFAULT 0  ,
   Content blob NULL  ,
   LastUpdated DATETIME NULL  ,
-  LastUpdatedBy integer NULL  ,
-  Creator integer NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created DATETIME NULL  ,
+  PRIMARY KEY (id)
+) TYPE=InnoDB;
+
+# }}}
+
+# {{{ TicketCustomFieldValues 
+
+CREATE TABLE TicketCustomFieldValues (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  Ticket int NOT NULL  ,
+  CustomField int NOT NULL  ,
+  Content varchar(255) NULL  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated DATETIME NULL  ,
+  PRIMARY KEY (id)
+) TYPE=InnoDB;
+
+# }}}
+
+# {{{ CustomFields
+
+CREATE TABLE CustomFields (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  Name varchar(200) NULL  ,
+  Type varchar(200) NULL  ,
+  Queue integer NOT NULL DEFAULT 0 ,
+  Description varchar(255) NULL  ,
+  SortOrder integer NOT NULL DEFAULT 0  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created DATETIME NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated DATETIME NULL  ,
+  Disabled int2 NOT NULL DEFAULT 0 ,
+  PRIMARY KEY (id)
+) TYPE=InnoDB;
+
+CREATE INDEX CustomFields1 on CustomFields (Disabled, Queue);
+
+
+# }}}
+
+# {{{ CustomFieldValues 
+
+CREATE TABLE CustomFieldValues (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  CustomField int NOT NULL  ,
+  Name varchar(200) NULL  ,
+  Description varchar(255) NULL  ,
+  SortOrder integer NOT NULL DEFAULT 0  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created DATETIME NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated DATETIME NULL  ,
   PRIMARY KEY (id)
+) TYPE=InnoDB;
+
+# }}}
+
+# {{{ Sessions
+
+# sessions is used by Apache::Session to keep sessions in the database.
+# We should have a reaper script somewhere.
+
+CREATE TABLE sessions (
+    id char(32) NOT NULL,
+    a_session LONGTEXT,
+    LastUpdated TIMESTAMP,
+    PRIMARY KEY (id)
 );
+
+# }}}
diff --git a/rt/etc/upgrade/2.1.71 b/rt/etc/upgrade/2.1.71
new file mode 100644
index 000000000..cb89a3ac3
--- /dev/null
+++ b/rt/etc/upgrade/2.1.71
@@ -0,0 +1,211 @@
+@Queues = ( {
+        Name        => '___Approvals',
+    Description => 'A system-internal queue for the approvals system',
+        Disabled    => 2,
+        }
+);
+
+
+
+
+
+# {{{ Templates
+@Templates = (
+    {
+        Queue       => '___Approvals',
+        Name        => "New Pending Approval", # loc
+        Description => "Notify Owners and AdminCcs of new items pending their approval", # loc
+	Content     => 'Subject: New Pending Approval: {$Ticket->Subject}
+
+Greetings,
+
+There is a new item pending your approval: "{$Ticket->Subject()}", 
+a summary of which appears below.
+
+Please visit {$RT::WebURL}Approvals/Display.html?id={$Ticket->id}
+to approve or reject this ticket, or {$RT::WebURL}Approvals/ to
+batch-process all your pending approvals.
+
+-------------------------------------------------------------------------
+{$Transaction->Content()}
+'
+    },
+);
+
+# }}}
+
+1;
+
+@ScripActions = (
+     { Name => 'Open Tickets',
+       Description => 'Open tickets on correspondence',
+        ExecModule => 'AutoOpen' },
+
+);
+
+ @Scrips = (
+        { ScripCondition => 'On Correspond',
+          ScripAction => 'Open Tickets',
+          Template => 'Blank',
+          Queue => '0'
+        }, 
+    {  ScripCondition => 'On Create',
+       ScripAction    => 'AutoReply To Requestors',
+       Template       => 'AutoReply' },
+    {  ScripCondition => 'On Create',
+       ScripAction    => 'Notify AdminCcs',
+       Template       => 'Transaction' },
+    {  ScripCondition => 'On Correspond',
+       ScripAction    => 'Notify AdminCcs',
+       Template       => 'Admin Correspondence' },
+    {  ScripCondition => 'On Correspond',
+       ScripAction    => 'Notify Requestors And Ccs',
+       Template       => 'Correspondence' },
+    {  ScripCondition => 'On Correspond',
+       ScripAction    => 'Notify Other Recipients',
+       Template       => 'Correspondence' },
+    {  ScripCondition => 'On Comment',
+       ScripAction    => 'Notify AdminCcs As Comment',
+       Template       => 'Admin Comment' },
+    {  ScripCondition => 'On Comment',
+       ScripAction    => 'Notify Other Recipients As Comment',
+       Template       => 'Correspondence' },
+    {  ScripCondition => 'On Resolve',
+       ScripAction    => 'Notify Requestors',
+       Template       => 'Resolved' },
+
+
+    {
+        Description    => "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval", # loc
+        Queue          => '___Approvals',
+        ScripCondition => 'On Create',
+        ScripAction    => 'Notify AdminCcs',
+        Template       => 'New Pending Approval'
+    },
+    {
+        Description	       => "If an approval is rejected, reject the original and delete pending approvals",	# loc
+        Queue                  => '___Approvals',
+        ScripCondition         => 'On Status Change',
+        ScripAction            => 'User Defined',
+        CustomCommitCode       => q[
+# ------------------------------------------------------------------- #
+return(1) unless ( lc($self->TransactionObj->NewValue) eq "rejected" or
+	           lc($self->TransactionObj->NewValue) eq "deleted" );
+
+my $links = $self->TicketObj->DependedOnBy;
+foreach my $link (@{ $links->ItemsArrayRef }) {
+    my $obj = $link->BaseObj;
+    if ($obj->QueueObj->IsActiveStatus($obj->Status)) {
+	if ($obj->Type eq 'ticket') {
+	    $obj->Correspond(
+		Content	=> $self->loc("Your request was rejected."),
+	    );
+	    $obj->SetStatus(
+		Status	=> 'rejected',
+		Force	=> 1,
+	    );
+	}
+	else {
+	    $obj->SetStatus(
+		Status	=> 'deleted',
+		Force	=> 1,
+	    );
+	}
+    }
+}
+
+$links = $self->TicketObj->DependsOn;
+foreach my $link (@{ $links->ItemsArrayRef }) {
+    my $obj = $link->TargetObj;
+    if ($obj->QueueObj->IsActiveStatus($obj->Status)) {
+	$obj->SetStatus(
+	    Status	=> 'deleted',
+	    Force	=> 1,
+	);
+    }
+}
+
+return 1;
+# ------------------------------------------------------------------- #
+	],
+        CustomPrepareCode => '1',
+        Template          => 'Admin Comment',
+    },
+    {
+        Description	  => "When a ticket has been approved by any approver, add correspondence to the original ticket", # loc
+        Queue             => '___Approvals',
+        ScripCondition    => 'On Resolve',
+        ScripAction       => 'User Defined',
+        CustomPrepareCode => 'return(1);',
+        CustomCommitCode  => q[
+# ------------------------------------------------------------------- #
+return(1) unless ($self->TicketObj->Type eq 'approval');
+
+foreach my $obj ($self->TicketObj->AllDependedOnBy( Type => 'ticket' )) {
+    $obj->Correspond(
+	Content => $self->loc( "Your request has been approved by [_1]. Other approvals may still be pending.", # loc
+	    $self->TransactionObj->CreatorObj->Name,
+	) . "\n" . $self->loc( "Approver's notes: [_1]", # loc
+	    $self->TicketObj->Transactions->Last->Content,
+	),
+	_reopen	=> 0,
+    );
+}
+
+return 1;
+# ------------------------------------------------------------------- #
+	],
+	Template => 'Admin Comment'
+    },
+    {
+        Description	  => "When a ticket has been approved by all approvers, add correspondence to the original ticket", # loc
+        Queue             => '___Approvals',
+        ScripCondition    => 'On Resolve',
+        ScripAction       => 'User Defined',
+        CustomPrepareCode => 'return(1);',
+        CustomCommitCode  => q[
+# ------------------------------------------------------------------- #
+# Find all the tickets that depend on this (that this is approving)
+
+my $Ticket = $self->TicketObj;
+my @TOP    = $Ticket->AllDependedOnBy( Type => 'ticket' );
+my $links  = $Ticket->DependedOnBy;
+
+while (my $link = $links->Next) {
+    my $obj = $link->BaseObj;
+    next if ($obj->HasUnresolvedDependencies( Type => 'approval' ));
+
+    if ($obj->Type eq 'ticket') {
+	$obj->Correspond(
+	    Content	=> $self->loc("Your request has been approved."),
+	    _reopen	=> 0,
+	);
+    }
+    elsif ($obj->Type eq 'code') {
+	my $code = $obj->Transactions->First->Content;
+	my $rv;
+
+	foreach my $TOP (@TOP) {
+	    local $@;
+	    $rv++ if eval $code;
+	    $RT::Logger->error("Cannot eval code: $@") if $@;
+	}
+
+	if ($rv or !@TOP) {
+	    $obj->SetStatus( Status	=> 'resolved', Force	=> 1,);
+	}
+	else {
+	    $obj->SetStatus( Status	=> 'rejected', Force	=> 1,);
+	}
+    }
+}
+
+return 1;
+# ------------------------------------------------------------------- #
+	],
+        Template    => 'Admin Comment',
+    },
+);
+
+# }}}
+
diff --git a/rt/html/Admin/Elements/AddCustomFieldValue b/rt/html/Admin/Elements/AddCustomFieldValue
new file mode 100644
index 000000000..8850734f2
--- /dev/null
+++ b/rt/html/Admin/Elements/AddCustomFieldValue
@@ -0,0 +1,44 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<b><&|/l&>Add Value</&></b></b></b></b>
+<TABLE BORDER="0">
+<TR><TD><small>
+<&|/l&>Sort</&>:<br>
+<input name="CustomField-<% $CustomField->Id %>-AddValue-SortOrder" size="5">
+</TD>
+<TD><small>
+<&|/l&>Name</&>:<br>
+<input size=20 name="CustomField-<% $CustomField->Id %>-AddValue-Name">
+</TD>
+<TD><small>
+<&|/l&>Description</&>:<br>
+<input size="60" name="CustomField-<% $CustomField->Id %>-AddValue-Description">
+</TD></TR>
+</TABLE>
+
+<%init>
+</%init>
+<%args>
+$CustomField => undef
+</%args>
diff --git a/rt/html/Admin/Elements/CreateUserCalled b/rt/html/Admin/Elements/CreateUserCalled
new file mode 100644
index 000000000..8ceccca73
--- /dev/null
+++ b/rt/html/Admin/Elements/CreateUserCalled
@@ -0,0 +1,26 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<FORM METHOD=get ACTION="<% $RT::WebPath %>/Admin/Users/Create.html">
+<&|/l&>New user called</&> <INPUT NAME="Name" size=10><input type=submit value="<&|/l&>Create</&>">
+</form>
diff --git a/rt/html/Admin/Elements/EditCustomField b/rt/html/Admin/Elements/EditCustomField
new file mode 100644
index 000000000..a09600ba7
--- /dev/null
+++ b/rt/html/Admin/Elements/EditCustomField
@@ -0,0 +1,127 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/ListActions, actions => \@results &>
+
+
+<FORM METHOD=GET ACTION="CustomField.html">
+<INPUT TYPE=HIDDEN NAME="CustomField" VALUE="<%$id %>">
+<INPUT TYPE=HIDDEN name="Queue" value="<%$Queue%>">
+
+<TABLE WIDTH="100%" BORDER="0">
+<TR><TD ALIGN="RIGHT">
+<&|/l&>Name</&>:
+</TD><TD>
+<input name="Name" VALUE="<%$CustomFieldObj->Name%>" SIZE=20>
+</TD></TR>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>Description</&>:
+</TD><TD>
+<input name="Description" VALUE="<%$CustomFieldObj->Description%>" SIZE=80>
+</TD></TR>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>Type</&>:
+</TD><TD>
+<& /Admin/Elements/SelectCustomFieldType, Name => "Type", Default => $CustomFieldObj->Type &>
+</TD></TR>
+<TR><TD>
+</TD><TD>
+<INPUT TYPE=HIDDEN NAME="SetEnabled" VALUE="1">
+<INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>> <&|/l&>Enabled (Unchecking this box disables this custom field)</&>
+</TD></TR>
+</TABLE>
+
+<P>
+% if ($CustomFieldObj->Id and $CustomFieldObj->Type =~ /Select/) {
+<h2><&|/l&>Values</&></h2>
+<font size=-1>
+<& /Admin/Elements/EditCustomFieldValues, CustomField => $CustomFieldObj &>
+<& /Admin/Elements/AddCustomFieldValue, CustomField => $CustomFieldObj &>
+</font>
+% }
+<&/Elements/Submit&>
+</FORM>
+
+
+
+<%INIT>
+
+my $CustomFieldObj = RT::CustomField->new($session{'CurrentUser'});
+my $EnabledChecked = "CHECKED";
+my (@results);
+
+if (! $CustomField ) { 
+  $title = loc("Create a CustomField");
+  $id = 'new';
+} else {
+
+    if ($CustomField eq 'new') {
+      my ($val, $msg) =  $CustomFieldObj->Create(Queue => $Queue, 
+                                                 Name => $Name, 
+                                                 Type => $Type,
+                                                 Description => $Description,
+						 );
+      Abort(loc("Could not create CustomField", $msg)) unless ($val);
+     push @results, $msg;
+     $CustomFieldObj->SetSortOrder($CustomFieldObj->id);
+     $title = loc('Created CustomField [_1]', $CustomFieldObj->Name()); 
+    } else {
+       $CustomFieldObj->Load($CustomField) || Abort(loc('No CustomField'));
+      $title = loc('Editing CustomField [_1]', $CustomFieldObj->Name()); 
+
+      my @aresults = ProcessCustomFieldUpdates ( 
+                        CustomFieldObj => $CustomFieldObj,
+                        ARGSRef => \%ARGS );
+     push @results, @aresults;
+    }
+
+
+$id = $CustomFieldObj->id;
+
+  #we're asking about enabled on the web page but really care about disabled.
+  my $Disabled = ($Enabled ? 0 : 1);
+
+  if  ( ($SetEnabled) and ( $Disabled != $CustomFieldObj->Disabled) ) { 
+      my  ($code, $msg) = $CustomFieldObj->SetDisabled($Disabled);
+      push @results, loc('Enabled status [_1]', loc_fuzzy($msg));
+  }
+  
+  if ($CustomFieldObj->Disabled()) {
+      $EnabledChecked ="";
+  }
+
+}
+
+
+</%INIT>
+<%ARGS>
+$id => undef
+$title => undef
+$Queue => undef
+$CustomField => undef
+$Type => undef
+$Description => undef
+$Name => undef
+$SetEnabled => undef
+$Enabled => undef
+</%ARGS>
diff --git a/rt/html/Admin/Elements/EditCustomFieldValues b/rt/html/Admin/Elements/EditCustomFieldValues
new file mode 100644
index 000000000..64564adfb
--- /dev/null
+++ b/rt/html/Admin/Elements/EditCustomFieldValues
@@ -0,0 +1,42 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<i><&|/l&>(Check box to delete)</&></i>
+<ul>
+% while (my $v = $values->Next) {
+<li>
+<font size=-1 color="#336699"><%$v->SortOrder%>:</font>
+<input type="checkbox" name="CustomField-<%$CustomField->Id%>-DeleteValue" value="<%$v->id%>">
+<%$v->Name%>
+% if ($v->Description) {
+<i>(<%$v->Description%>)</i>
+% }
+</li>
+% }
+</ul>
+<%init>
+my $values = $CustomField->Values();
+</%init>
+<%args>
+$CustomField => undef
+</%args>
diff --git a/rt/html/Admin/Elements/EditCustomFields b/rt/html/Admin/Elements/EditCustomFields
new file mode 100644
index 000000000..a86b051d0
--- /dev/null
+++ b/rt/html/Admin/Elements/EditCustomFields
@@ -0,0 +1,214 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/ListActions, actions => \@actions &>
+
+<TABLE>
+<TR>
+<TD VALIGN=TOP>
+<%$caption%>:<BR>
+</TD></TR></TABLE>
+% if ($CustomFields->Count == 0 ) {
+<P><i><&|/l&>(No custom fields)</&></i></P>
+% } else {
+<TABLE>
+
+<TR>
+<TD ROWSPAN="<% $CustomFields->Count %>">
+<UL>
+% while (my $CustomFieldObj = $CustomFields->Next) { 
+<LI><A HREF="CustomField.html?Queue=<%$id%>&CustomField=<%$CustomFieldObj->id()%>"><b><%$CustomFieldObj->Name%></b></a> (<% $CustomFieldObj->FriendlyType %>)<br>
+<%$CustomFieldObj->Description%>
+</LI>
+% }
+</UL>
+</TD>
+
+% my $count;
+% while (my $CustomFieldObj = $CustomFields->Next) { 
+%  # show 'move up' unless it's the first item
+%  if ($count++) {
+<TR><TD>
+<a href="CustomFields.html?id=<%$id%>&CustomField=<%$CustomFieldObj->id%>&Move=-1"><&|/l&>Move up</&></a>
+%  } else {
+<TD ALIGN=RIGHT>
+%  }
+
+%  # show 'move down' unless it's the last item
+%  if (!$CustomFields->IsLast) {
+%  $m->print(' | ') if $count > 1;
+<a href="CustomFields.html?id=<%$id%>&CustomField=<%$CustomFieldObj->id%>&Move=1"><&|/l&>Move down</&></a>
+%  }
+</TD></TR>
+% }
+
+</TD>
+</TR>
+</TABLE>
+% }
+<FORM METHOD=GET ACTION="CustomFields.html">
+% if ($id) {
+<INPUT TYPE="Hidden" NAME="id" VALUE="<%$id%>">
+% }
+<input type="checkbox" name="FindDisabledCustomFields"> <&|/l&>Include disabled custom fields in listing.</&>
+<input type=submit value="<&|/l&>Go!</&>">
+</FORM>
+
+
+<%INIT>
+my $CustomFields = RT::CustomFields->new($session{'CurrentUser'});
+my $QueueObj = RT::Queue->new($session{'CurrentUser'});
+my $caption;
+
+if ($id)  {
+        $QueueObj->Load($id);                        
+}
+
+if ($QueueObj->id) {
+	$CustomFields->LimitToQueue($id);
+}                                            
+else {                                       
+        $CustomFields->LimitToGlobal();
+}                                           
+
+if ($FindDisabledCustomFields) {
+    $caption = loc("All Custom Fields");
+    $CustomFields->{'find_disabled_rows'} = 1;
+} else {
+    $caption = loc("Enabled Custom Fields");
+}
+
+# {{{ deal with moving sortorder of custom fields
+if ($CustomField and $Move) {
+    my $SourceObj = RT::CustomField->new($session{'CurrentUser'});
+    $SourceObj->Load($CustomField) || Abort(loc('No CustomField'));
+
+    my $TargetObj;
+    my $target_order = $SourceObj->SortOrder + $Move;
+    while (my $CustomFieldObj = $CustomFields->Next) { 
+	my $this_order = $CustomFieldObj->SortOrder;
+
+	# if we have an exact match, finish the loop now
+	($TargetObj = $CustomFieldObj, last) if $this_order == $target_order;
+
+	# otherwise, we need to apropos toward the general direction
+	# ... first, check the sign is correct
+	next unless ($this_order - $SourceObj->SortOrder) * $Move > 0;
+
+	# ... next, see if we already have a candidate
+	if ($TargetObj) {
+	    # ... if yes, compare the delta and choose the smaller one
+	    my $orig_delta = abs($TargetObj->SortOrder - $target_order);
+	    my $this_delta = abs($this_order - $target_order);
+	    next if $orig_delta < $this_delta;
+	}
+
+	$TargetObj = $CustomFieldObj;
+    }
+
+    if ($TargetObj) {
+	# swap their sort order
+	my ($s, $t) = ($SourceObj->SortOrder, $TargetObj->SortOrder);
+	$TargetObj->SetSortOrder($s);
+	$SourceObj->SetSortOrder($t);
+	# because order changed, we must redo search for subsequent uses
+	$CustomFields->RedoSearch;
+    }
+
+    $CustomFields->GotoFirstItem;
+}
+# }}}
+
+# {{{ now process the 'copy queue' action
+my @actions;
+if ($Source and $Source ne $id) {
+    my $SourceQueue = RT::Queue->new($session{'CurrentUser'});
+    $SourceQueue->Load($Source) || Abort(loc("Couldn't load queue"));
+    my $SourceCustomFields = RT::CustomFields->new($session{'CurrentUser'});
+    $SourceCustomFields->LimitToQueue($SourceQueue->id);
+
+    # delete old fields
+    foreach my $CustomFieldObj ( @{$CustomFields->ItemsArrayRef} ) { 
+	$CustomFieldObj->Delete;
+    }
+
+    # add new fields
+    while (my $SourceCustomFieldObj = $SourceCustomFields->Next) {
+	my $CustomFieldObj = RT::CustomField->new($session{'CurrentUser'});
+	my ($val, $msg) =  $CustomFieldObj->Create(
+	    id => $SourceCustomFieldObj->id,
+	    Queue => $id,
+	    Name => $SourceCustomFieldObj->Name,
+	    Type => $SourceCustomFieldObj->Type,
+	    Description => $SourceCustomFieldObj->Description,
+	);
+	Abort(loc("Could not create CustomField") . ": $msg") unless ($val);
+	push @actions, $msg;
+
+	$CustomFieldObj->SetSortOrder($SourceCustomFieldObj->SortOrder);
+
+	# add new values
+	my $values = $SourceCustomFieldObj->Values();
+	while (my $v = $values->Next) {
+	    my ( $addval, $addmsg ) = $CustomFieldObj->AddValue(
+		Name => $v->Name,
+		Description => $v->Description,
+		SortOrder => $v->SortOrder
+	    );
+	}
+    }
+
+    # because content changed, we must redo search for subsequent uses
+    $CustomFields->RedoSearch;
+    $CustomFields->GotoFirstItem;
+}
+# }}}
+
+# {{{ deal with deleting existing custom fields
+foreach my $key (keys %ARGS) {
+  # {{{ if we're trying to delete the custom field
+  if ($key =~ /^DeleteCustomField-(\d+)/) {
+    my $id = $1;
+    my $CustomFieldObj = RT::CustomField->new($session{'CurrentUser'});
+    $CustomFieldObj->Load($id);
+    my ($retval, $msg) = $CustomFieldObj->Delete;
+    if ($retval) {
+      push @actions, loc("Custom field deleted");
+    }
+    else {
+      push @actions, $msg;
+    }
+  }
+  # }}}
+}
+# }}}
+
+</%INIT>
+<%ARGS>
+$id => 0
+$title => undef
+$Move => undef
+$Source => undef
+$CustomField => undef
+$FindDisabledCustomFields => undef
+</%ARGS>
diff --git a/rt/html/Admin/Elements/EditQueueWatchers b/rt/html/Admin/Elements/EditQueueWatchers
new file mode 100644
index 000000000..db39bfb67
--- /dev/null
+++ b/rt/html/Admin/Elements/EditQueueWatchers
@@ -0,0 +1,55 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%if ($Members->Count == 0 ) {
+<ul>
+<li><i><&|/l&>none</&></i>
+% } else {
+<i><&|/l&>(Check box to delete)</&></i><br><BR>
+<ul>
+% while (my $watcher=$Members->Next) {
+<li>
+<INPUT  TYPE=CHECKBOX 
+        NAME="Queue-<%$QueueObj->Id%>-DelWatcher-Type-<%$Watchers->Type%>-Principal-<%$watcher->MemberId%>" 
+        UNCHECKED>
+% if ($watcher->MemberObj->IsUser) { 
+<a href="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$watcher->MemberObj->ObjectId%>">
+% } else {
+<a href="<%$RT::WebPath%>/Admin/Groups/Modify.html?id=<%$watcher->MemberObj->ObjectId%>">
+% }
+<%$watcher->MemberObj->Object->Name%></a>
+% }
+% }
+</ul>
+
+<%INIT>
+my $Members = $Watchers->MembersObj;
+</%INIT>
+
+<%ARGS>
+$QueueObj => undef
+$Watchers => undef
+</%ARGS>
+
+
+
diff --git a/rt/html/Admin/Elements/EditScrip b/rt/html/Admin/Elements/EditScrip
new file mode 100644
index 000000000..5393ebfde
--- /dev/null
+++ b/rt/html/Admin/Elements/EditScrip
@@ -0,0 +1,149 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/ListActions, actions => \@actions &>
+
+  
+<FORM METHOD=POST ACTION="Scrip.html">
+<input type="hidden" name="id" value="<%$id%>">
+<input type="hidden" name="Queue" value="<%$Queue%>">
+<TABLE>
+<TR>
+<TD ALIGN=RIGHT>
+<&|/l&>Description</&>:
+</TD>
+<TD>
+<input Name="Scrip-<%$id%>-Description" value="<%$scrip->Description%>">
+</TR>
+<TR>
+<TD ALIGN=RIGHT>
+<&|/l&>Condition</&>:
+</TD>
+<TD>
+<& /Admin/Elements/SelectScripCondition, Name => "Scrip-$id-ScripCondition", Default => $scrip->ConditionObj->Id &><BR>
+</TD>
+</TR>
+<TR>
+<TD ALIGN=RIGHT>
+<&|/l&>Custom condition</&>:
+</TD>
+<TD>
+<TEXTAREA COLS=80 ROWS=5 NAME="Scrip-<%$id%>-CustomIsApplicableCode"><%$scrip->CustomIsApplicableCode%></TEXTAREA>
+</TD>
+</TR>
+<TR>
+<TD ALIGN=RIGHT>
+<&|/l&>Action</&>:
+</TD>
+<TD>
+<& /Admin/Elements/SelectScripAction, Name => "Scrip-$id-ScripAction", Default => $scrip->ActionObj->Id &>
+</TD>
+</TR>
+<TR>
+<TD ALIGN=RIGHT>
+<&|/l&>Custom action preparation code</&>:
+</TD>
+<TD>
+<TEXTAREA COLS=80 ROWS=5 NAME="Scrip-<%$id%>-CustomPrepareCode"><%$scrip->CustomPrepareCode%></TEXTAREA>
+</TD>
+</TR>
+<TR>
+<TD ALIGN=RIGHT>
+<&|/l&>Custom action cleanup code</&>:
+</TD>
+<TD>
+<TEXTAREA COLS=80 ROWS=5 NAME="Scrip-<%$id%>-CustomCommitCode"><%$scrip->CustomCommitCode%></TEXTAREA>
+</TD>
+</TR>
+<TR>
+<TD ALIGN=RIGHT>
+<&|/l&>Template</&>: 
+</TD>
+<TD>
+<& /Admin/Elements/SelectTemplate, Name => "Scrip-$id-Template", Default => $scrip->TemplateObj->Id, Queue => $Queue &>
+</TD>
+</TR>
+
+<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+</FORM>
+<%init>
+my (@actions);
+
+
+my $scrip = new RT::Scrip($session{'CurrentUser'});
+
+if ( $id eq 'new' ) {
+
+    my ( $retval, $msg ) = $scrip->Create(
+            Queue                  => $Queue,
+            ScripAction            => $ARGS{"Scrip-new-ScripAction"},
+            ScripCondition         => $ARGS{"Scrip-new-ScripCondition"},
+            Template               => $ARGS{"Scrip-new-Template"},
+            Description            => $ARGS{"Scrip-new-Description"},
+            CustomPrepareCode      => $ARGS{"Scrip-new-CustomPrepareCode"},
+            CustomCommitCode       => $ARGS{"Scrip-new-CustomCommitCode"},
+            CustomIsApplicableCode => $ARGS{"Scrip-new-CustomIsApplicableCode"},
+    );
+    if ( defined $retval ) {
+        push @actions, $msg;
+    }
+    else {
+        Abort( $msg);
+    }
+}
+elsif ($id) {
+    my ($val,$msg) =$scrip->Load($id);
+    if  ($val) {
+        $id = $scrip->id;
+    } else {
+       Abort ($msg);
+    }
+    my @attribs = qw (
+      Queue
+      ScripAction
+      ScripCondition
+      Template
+      Description
+      CustomPrepareCode
+      CustomCommitCode
+      CustomIsApplicableCode
+    );
+    my @results = UpdateRecordObject( AttributesRef => \@attribs,
+                                      AttributePrefix => 'Scrip-'.$scrip->Id,
+                                      Object        => $scrip,
+                                      ARGSRef       => \%ARGS );
+    push (@actions, @results);
+}
+
+elsif ($ARGS{'create'}) {
+    $id = 'new';
+}
+
+# }}}
+</%init>
+
+<%ARGS>
+$id => undef
+$title => undef
+$Queue => 0
+</%ARGS>
diff --git a/rt/html/Admin/Elements/EditScrips b/rt/html/Admin/Elements/EditScrips
new file mode 100644
index 000000000..24515d8c1
--- /dev/null
+++ b/rt/html/Admin/Elements/EditScrips
@@ -0,0 +1,97 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/ListActions, actions => \@actions &>
+
+<form action="Scrips.html" method="post">
+<input type="hidden" name="id" value="<%$id%>">
+
+<P><&|/l&>Current Scrips</&>:</P>
+% if ($Scrips->Count == 0 ) {
+<P><i><&|/l&>(No scrips)</&></i></P>
+% } else {
+<TABLE>
+<P><i><&|/l&>(Check box to delete)</&></i></P>
+
+%   while (my $scrip = $Scrips->Next ) {
+<TR>
+<TD>
+<input type="checkbox" name="DeleteScrip-<%$scrip->Id%>">
+</TD>
+<TD>
+<a href="Scrip.html?id=<%$scrip->Id%>&Queue=<%$id%>"><% $scrip->Description || "<i>(".loc('no value').")</i>" |n %></a><br>
+<small><&|/l, loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name) &>[_1] [_2] with template [_3]</&></small>
+</TD>
+</TR>
+%   }
+
+</TABLE>
+
+% }
+<& /Elements/Submit &>
+</form>
+<%init>
+my (@actions);
+
+my $Scrips = RT::Scrips->new($session{'CurrentUser'});
+
+
+my $QueueObj = RT::Queue->new($session{'CurrentUser'});
+if ($id)  {
+        $QueueObj->Load($id);                        
+}
+
+if ($QueueObj->id) {                         
+	$Scrips->LimitToQueue($id);
+}                                            
+else {                                       
+        $Scrips->LimitToGlobal();
+}                                           
+
+
+
+
+# {{{ deal with modifying and deleting existing scrips
+foreach my $key (keys %ARGS) {
+  # {{{ if we're trying to delete the scrip
+  if ($key =~ /^DeleteScrip-(\d+)/) {
+    my $id = $1;
+    my $scrip = new RT::Scrip($session{'CurrentUser'});
+    $scrip->Load($id);
+    my ($retval, $msg) = $scrip->Delete;
+    if ($retval) {
+      push @actions, loc("Scrip deleted");
+    }
+    else {
+      push @actions, $msg;
+    }
+  }
+  # }}}
+}
+# }}}
+</%init>
+
+<%ARGS>
+$id => undef
+$title => undef
+</%ARGS>
diff --git a/rt/html/Admin/Elements/EditTemplates b/rt/html/Admin/Elements/EditTemplates
new file mode 100644
index 000000000..12677ca78
--- /dev/null
+++ b/rt/html/Admin/Elements/EditTemplates
@@ -0,0 +1,104 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/ListActions, actions => \@actions &>
+
+<FORM METHOD=GET ACTION="Templates.html">
+<INPUT TYPE="Hidden" NAME="id" VALUE="<%$id%>">
+
+% if ($Templates->Count == 0 ) {
+<P><i><&|/l&>(No templates)</&></i></P>
+% } else {
+<TABLE>
+<TR>
+<TH>
+<i><&|/l&>(Check box to delete)</&></i>
+</TH>
+<TH>
+</TH>
+</TR>
+% my $count;
+% while (my $TemplateObj = $Templates->Next) { 
+<TR>
+<TD>
+<input type="checkbox" name="DeleteTemplate-<%$TemplateObj->Id%>">
+</TD>
+<TD>
+<A HREF="Template.html?Queue=<%$id%>&Template=<%$TemplateObj->id()%>">
+<B><% loc($TemplateObj->Name) %></B></A>
+<br><% loc($TemplateObj->Description) %>
+</TD>
+</TR>
+
+% }
+</TABLE>
+% }
+
+<& /Elements/Submit &>
+</FORM>
+
+<%INIT>
+my $Templates = RT::Templates->new($session{'CurrentUser'});
+my $QueueObj = RT::Queue->new($session{'CurrentUser'});
+my @actions;
+
+if ($id)  {
+        $QueueObj->Load($id);                        
+}
+
+if ($QueueObj->id) {
+	$Templates->LimitToQueue($id);
+}                                            
+else {                                       
+        $Templates->LimitToGlobal();
+}                                           
+
+# Now let callbacks add their extra limits
+$m->comp('/Elements/Callback', Templates => $Templates, %ARGS);
+
+# {{{ deal with deleting existing templates
+foreach my $key (keys %ARGS) {
+  # {{{ if we're trying to delete the template
+  if ($key =~ /^DeleteTemplate-(\d+)/) {
+    my $id = $1;
+    my $TemplateObj = RT::Template->new($session{'CurrentUser'});
+    $TemplateObj->Load($id);
+    my ($retval, $msg) = $TemplateObj->Delete;
+    if ($retval) {
+      push @actions, loc("Template deleted");
+    }
+    else {
+      push @actions, $msg;
+    }
+  }
+  # }}}
+}
+# }}}
+</%INIT>
+<%ARGS>
+$id => 0
+$title => undef
+$Move => undef
+$Source => undef
+$Template => undef
+</%ARGS>
diff --git a/rt/html/Admin/Elements/EditUserComments b/rt/html/Admin/Elements/EditUserComments
new file mode 100644
index 000000000..f791876be
--- /dev/null
+++ b/rt/html/Admin/Elements/EditUserComments
@@ -0,0 +1,32 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => "Comments about $name" &>
+<&|/l&>These comments aren't generally visible to the user</&>:<br>
+<input type="hidden" name="id" value="<%$id%>">
+<TEXTAREA COLS=60 ROWS=15 WRAP=SOFT NAME="Comments"><% $UserObj->Comments %></TEXTAREA>
+</FORM>
+
+<%ARGS>
+$UserObj => undef
+</%ARGS>
diff --git a/rt/html/Admin/Elements/GroupTabs b/rt/html/Admin/Elements/GroupTabs
new file mode 100644
index 000000000..87377820c
--- /dev/null
+++ b/rt/html/Admin/Elements/GroupTabs
@@ -0,0 +1,76 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Tabs, 
+    subtabs => $tabs, 
+    current_tab => 'Admin/Groups/', 
+    current_subtab => $current_tab, 
+    Title => $Title &>
+<%INIT>
+my $tabs;
+
+if ( $GroupObj and $GroupObj->id ) {
+$tabs->{"this"} = { class => "currentnav",                                                           
+                    path  => "Admin/Groups/Modify.html?id=" . $GroupObj->id,
+                    title => $GroupObj->Name,
+                    current_subtab => $current_subtab,
+        subtabs => {
+        C => { title => loc('Basics'),
+               path  => "Admin/Groups/Modify.html?id=" . $GroupObj->id },
+
+        D => { title => loc('Members'),
+               path  => "Admin/Groups/Members.html?id=" . $GroupObj->id },
+
+        F => { title => loc('Group Rights'),
+               path  => "Admin/Groups/GroupRights.html?id=" . $GroupObj->id, },
+        G => { title => loc('User Rights'),
+               path  => "Admin/Groups/UserRights.html?id=" . $GroupObj->id, },
+    }
+}
+}
+$tabs->{"A"} = { title => loc('Select group'),
+                 path  => "Admin/Groups/", };
+$tabs->{"B"} = { title     => loc('New group'),
+                 path      => "Admin/Groups/Modify.html?Create=1",
+                 separator => 1, };
+
+# Now let callbacks add their extra tabs
+$m->comp( '/Elements/Callback', tabs => $tabs, %ARGS );
+foreach my $tab ( sort keys %{$tabs->{'this'}->{'subtabs'}} ) {  
+    if ( $tabs->{'this'}->{'subtabs'}->{$tab}->{'path'} eq $current_tab ) {
+        $tabs->{'this'}->{'subtabs'}->{$tab}->{"subtabs"}        = $subtabs; 
+        $tabs->{'this'}->{'subtabs'}->{$tab}->{"current_subtab"} = $current_subtab; 
+    }                                                                           
+}   
+        $tabs->{'this'}->{"current_subtab"} = $current_tab; 
+        $current_tab = "Admin/Groups/Modify.html?id=".$GroupObj->id if $GroupObj;
+
+</%INIT>
+<%ARGS>
+$GroupObj => undef
+$subtabs => undef
+$current_subtab => undef
+$current_tab => undef
+$Title => undef
+</%ARGS>
+
diff --git a/rt/html/Admin/Elements/Header b/rt/html/Admin/Elements/Header
new file mode 100644
index 000000000..92a7c54ca
--- /dev/null
+++ b/rt/html/Admin/Elements/Header
@@ -0,0 +1,28 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => $Title &>
+
+<%ARGS>
+$Title => undef
+</%ARGS>
diff --git a/rt/html/Admin/Elements/ListGlobalCustomFields b/rt/html/Admin/Elements/ListGlobalCustomFields
new file mode 100644
index 000000000..032f680ee
--- /dev/null
+++ b/rt/html/Admin/Elements/ListGlobalCustomFields
@@ -0,0 +1,37 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%   my $count = 0;
+%   while (my $CustomFieldObj = $CustomFields->Next) { 
+%   $count++;
+<font size="-1"><%$CustomFieldObj->id%>/<% loc($CustomFieldObj->Type) %>/<%$CustomFieldObj->Name%>: <%$CustomFieldObj->Description%></font>
+<BR>
+%   }
+%   if (!$count) {
+<font size="-1"><&|/l&>(No custom fields)</&></font>
+%   }
+
+<%init>
+my $CustomFields = new RT::CustomFields ($session{'CurrentUser'});
+$CustomFields->LimitToGlobal();
+</%INIT>
diff --git a/rt/html/Admin/Elements/ListGlobalScrips b/rt/html/Admin/Elements/ListGlobalScrips
new file mode 100644
index 000000000..8dba3b6c4
--- /dev/null
+++ b/rt/html/Admin/Elements/ListGlobalScrips
@@ -0,0 +1,37 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%   my $count = 0;
+%   while (my $scrip = $Scrips->Next ) {
+%   $count++;
+<font size="-1"><&|/l, loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name) &>[_1] [_2] with template [_3]</&></font>
+<BR>
+%   }
+%   if (!$count) {
+<font size="-1"><&|/l&>(No scrips)</&></font>
+%   }
+
+<%init>
+my $Scrips = new RT::Scrips ($session{'CurrentUser'});
+$Scrips->LimitToGlobal();
+</%INIT>
diff --git a/rt/html/Admin/Elements/ModifyQueue b/rt/html/Admin/Elements/ModifyQueue
new file mode 100644
index 000000000..e5761df35
--- /dev/null
+++ b/rt/html/Admin/Elements/ModifyQueue
@@ -0,0 +1,78 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/TitleBoxStart, title => loc('Editing Configuration for queue [_1]', $QueueObj->Id) &>
+
+<FORM ACTION="<%$RT::WebPath%>/Admin/Queues/Modify.html" METHOD=POST>
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$QueueObj->Id%>">
+<TABLE>
+<TR><TD ALIGN=RIGHT>
+<&|/l&>Queue Name</&>:
+</TD>
+<TD><INPUT name="Name" value="<%$QueueObj->Name%>"></TD>
+</TR><TR>
+<TD ALIGN=RIGHT>
+<&|/l&>Description</&>:</TD><TD COLSPAN=3><INPUT name="Description" value="<%$QueueObj->Description%>" size=60></TD></TR>
+<TR>
+<TD ALIGN=RIGHT>
+<&|/l&>Correspondence Address</&>:
+</TD><TD>
+<INPUT name="CorrespondAddress" value="<%$QueueObj->CorrespondAddress%>">
+</TD>
+<TD ALIGN=RIGHT>
+
+<&|/l&>Comment Address</&>: </TD><TD>
+<INPUT NAME="CommentAddress" value="<%$QueueObj->CommentAddress%>">
+</TD>
+</TR><TR>
+
+<TD ALIGN=RIGHT>
+<&|/l&>Priority starts at</&>:
+</TD><TD><INPUT NAME="InitialPriority" value="<%$QueueObj->InitialPriority %>">
+</TD>
+<TD ALIGN=RIGHT>
+<&|/l&>Over time, priority moves toward</&>:
+</TD><TD><INPUT NAME="FinalPriority" value="<%$QueueObj->FinalPriority %>">
+</TD>
+</TR>
+<TR>
+<TD ALIGN=RIGHT>
+<&|/l&>Requests should be due in</&>:
+</TD><TD>
+<INPUT NAME="DefaultDueIn" VALUE="<%$QueueObj->DefaultDueIn%>"> <&|/l&>days</&>.
+</TD>
+</TR>
+</TABLE>
+<& /Elements/Submit &>
+</form>
+<& /Elements/TitleBoxEnd &>
+
+<%INIT>
+
+</%INIT>
+
+<%ARGS>
+
+
+$QueueObj => undef
+</%ARGS>
diff --git a/rt/html/Admin/Elements/ModifyTemplate b/rt/html/Admin/Elements/ModifyTemplate
new file mode 100644
index 000000000..5f75bac5f
--- /dev/null
+++ b/rt/html/Admin/Elements/ModifyTemplate
@@ -0,0 +1,60 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<TABLE>
+<TR>
+<TD ALIGN=RIGHT>
+<&|/l&>Name</&>:
+</TD>
+<TD>
+<input name="Name" VALUE="<%$Name%>" SIZE=20><BR>
+</TD>
+</TR>
+<TR>
+<TD ALIGN=RIGHT>
+<&|/l&>Description</&>: 
+</TD>
+<TD>
+<input name="Description" VALUE="<%$Description%>" SIZE=80><BR>
+</TD>
+</TR>
+<TR>
+<TD ALIGN=RIGHT VALIGN=TOP>
+<&|/l&>Content</&>:<BR>
+</TD>
+<TD>
+<TEXTAREA NAME=Content ROWS=25 COLS=80 WRAP=SOFT>
+<%$Content%></TEXTAREA>
+</TD>
+</TR>
+</TABLE>
+
+<%INIT>
+
+</%INIT>
+
+<%ARGS>
+$Name => undef
+$Description => undef
+$Content => undef
+</%ARGS>
diff --git a/rt/html/Admin/Elements/ModifyUser b/rt/html/Admin/Elements/ModifyUser
new file mode 100644
index 000000000..876e8a71b
--- /dev/null
+++ b/rt/html/Admin/Elements/ModifyUser
@@ -0,0 +1,99 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/TitleBoxStart, title => loc('Editing Configuration for user [_1]', $UserObj->Name) &>
+
+<FORM ACTION="<%$RT::WebPath%>/Admin/Users/Modify.html" METHOD=POST>
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$UserObj->Id%>">
+
+<&|/l&>Name</&>: <input name="Name" value="<%$UserObj->Name%>">
+<BR>
+<&|/l&>New Password</&>: <input type=password name="Pass1"><BR>
+<&|/l&>Retype Password</&>: <input type=password name="Pass2"><BR>
+
+<&|/l&>Comments</&>: <TEXTAREA name="Comments" COLS=80 ROWS=5 WRAP=VIRTUAL>
+<%$UserObj->Comments%></TEXTAREA>
+
+<BR>
+<&|/l&>Signature</&>: <TEXTAREA COLS=80 ROWS=5 name="Signature" WRAP=HARD>
+<%$UserObj->Signature%></TEXTAREA>
+<BR>
+<&|/l&>EmailAddress</&>: <input name="EmailAddress" value="<%$UserObj->EmailAddress%>">
+<BR>
+<&|/l&>FreeformContactInfo</&>: <input name="FreeformContactInfo" value="<%$UserObj->FreeformContactInfo%>">
+<BR>
+<&|/l&>Organization</&>: <input name="Organization" value="<%$UserObj->Organization%>">
+<BR>
+<&|/l&>RealName</&>: <input name="RealName" value="<%$UserObj->RealName%>">
+<BR>
+<&|/l&>NickName</&>: <input name="NickName" value="<%$UserObj->NickName%>">
+<BR>
+<&|/l&>Lang</&>: <input name="Lang" value="<%$UserObj->Lang%>">
+<BR>
+<&|/l&>EmailEncoding</&>: <input name="EmailEncoding" value="<%$UserObj->EmailEncoding%>">
+<BR>
+<&|/l&>WebEncoding</&>: <input name="WebEncoding" value="<%$UserObj->WebEncoding%>">
+<BR>
+<&|/l&>ExternalContactInfoId</&>: <input name="ExternalContactInfoId" value="<%$UserObj->ExternalContactInfoId%>">
+<BR>
+<&|/l&>ContactInfoSystem</&>: <input name="ContactInfoSystem" value="<%$UserObj->ContactInfoSystem%>">
+<BR>
+<&|/l&>UnixUsername</&>: <input name="Gecos" value="<%$UserObj->Gecos%>">
+<BR>
+<&|/l&>ExternalAuthId</&>: <input name="ExternalAuthId" value="<%$UserObj->ExternalAuthId%>">
+<BR>
+<&|/l&>AuthSystem</&>: <input name="AuthSystem" value="<%$UserObj->AuthSystem%>">
+<BR>
+<&|/l&>HomePhone</&>: <input name="HomePhone" value="<%$UserObj->HomePhone%>">
+<BR>
+<&|/l&>WorkPhone</&>: <input name="WorkPhone" value="<%$UserObj->WorkPhone%>">
+<BR>
+<&|/l&>MobilePhone</&>: <input name="MobilePhone" value="<%$UserObj->MobilePhone%>">
+<BR>
+<&|/l&>PagerPhone</&>: <input name="PagerPhone" value="<%$UserObj->PagerPhone%>">
+<BR>
+<&|/l&>Address1</&>: <input name="Address1" value="<%$UserObj->Address1%>">
+<BR>
+<&|/l&>Address2</&>: <input name="Address2" value="<%$UserObj->Address2%>">
+<BR>
+<&|/l&>City</&>: <input name="City" value="<%$UserObj->City%>">
+<BR>
+<&|/l&>State</&>: <input name="State" value="<%$UserObj->State%>">
+<BR>
+<&|/l&>Zip</&>: <input name="Zip" value="<%$UserObj->Zip%>">
+<BR>
+<&|/l&>Country</&>: <input name="Country" value="<%$UserObj->Country%>">
+<BR>
+<& /Elements/Submit &>
+</form>
+<& /Elements/TitleBoxEnd &>
+
+<%INIT>
+
+</%INIT>
+
+<%ARGS>
+
+
+$UserObj => undef
+</%ARGS>
diff --git a/rt/html/Admin/Elements/QueueRightsForUser b/rt/html/Admin/Elements/QueueRightsForUser
new file mode 100644
index 000000000..05bb51196
--- /dev/null
+++ b/rt/html/Admin/Elements/QueueRightsForUser
@@ -0,0 +1,40 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<UL>
+%while(my $ACE = $ACL->Next) {
+
+<LI><checkbox name="delete_ace_<%$ACE->id%>"> <% loc($ACE->RightName) %> (<%$ACE->UserObj->RealName%>)
+
+%}
+</UL>
+
+<%INIT>
+my $ACL = new RT::ACL($session{'CurrentUser'});
+$ACL->LimitToQueue($QueueObj->id);
+$ACL->LimitPrincipalToUser($PrincipalId);
+</%INIT>
+<%ARGS>
+$PrincipalId => undef
+$QueueObj => undef
+</%ARGS>
diff --git a/rt/html/Admin/Elements/QueueTabs b/rt/html/Admin/Elements/QueueTabs
new file mode 100644
index 000000000..3b4805afc
--- /dev/null
+++ b/rt/html/Admin/Elements/QueueTabs
@@ -0,0 +1,93 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Tabs, 
+    subtabs => $tabs, 
+    current_tab => 'Admin/Queues/', 
+    current_subtab => $current_tab, 
+    Title => $Title &>
+
+<%INIT>
+my $tabs;
+if ($id) {
+  $tabs->{'this'}  = {
+                title => $QueueObj->Name,
+  		     	path => "Admin/Queues/Modify.html?id=".$id,
+                    current_subtab => $current_tab,     
+                subtabs => {
+		 C => { title => loc('Basics'),
+  		     	path => "Admin/Queues/Modify.html?id=".$id,
+			   },
+		 D => { title => loc('Watchers'),
+		 	path => "Admin/Queues/People.html?id=".$id,
+		      },
+
+		 E => { title => loc('Scrips'),
+			     path => "Admin/Queues/Scrips.html?id=".$id,
+			   },
+		 F => { title => loc('Templates'),
+				path => "Admin/Queues/Templates.html?id=".$id,
+			      },
+
+                 G => { title => loc('Custom Fields'),
+                        path => 'Admin/Queues/CustomFields.html?id='.$id,
+                        },
+
+		 H => { title => loc('Group Rights'),
+			  path => "Admin/Queues/GroupRights.html?id=".$id,
+			},	
+		 I => { title => loc('User Rights'),
+			  path => "Admin/Queues/UserRights.html?id=".$id,
+			}
+        }
+        };
+}
+if ($session{'CurrentUser'}->HasRight( Object => $RT::System, Right => 'AdminQueue')) {
+  $tabs->{"A"} = { title => loc('Select queue'),
+  		     	path => "Admin/Queues/",
+			   };
+  $tabs->{"B"} = { title => loc('New queue'),
+  		     	path => "Admin/Queues/Modify.html?Create=1",
+			separator => 1,
+			   };
+}
+
+  # Now let callbacks add their extra tabs
+  $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
+foreach my $tab ( sort keys %{$tabs->{'this'}->{'subtabs'}} ) {  
+    if ( $tabs->{'this'}->{'subtabs'}->{$tab}->{'path'} eq $current_tab ) {
+        $tabs->{'this'}->{'subtabs'}->{$tab}->{"subtabs"}        = $subtabs; 
+        $tabs->{'this'}->{'subtabs'}->{$tab}->{"current_subtab"} = $current_subtab; 
+    }                                                                           
+}   
+  		     	$current_tab = "Admin/Queues/Modify.html?id=".$id if $id;
+</%INIT>
+  
+<%ARGS>
+$QueueObj => undef
+$id => undef
+$subtabs => undef
+$current_subtab => undef
+$current_tab => undef
+$Title => undef
+</%ARGS>
diff --git a/rt/html/Admin/Elements/SelectCustomFieldType b/rt/html/Admin/Elements/SelectCustomFieldType
new file mode 100644
index 000000000..b5f4c079a
--- /dev/null
+++ b/rt/html/Admin/Elements/SelectCustomFieldType
@@ -0,0 +1,36 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME ="<%$Name%>">
+%for my $option ($cf->Types) {
+<OPTION VALUE="<%$option%>" <%$option eq $Default && "SELECTED"%>><% $cf->FriendlyType($option) %></OPTION>
+%}
+</SELECT>
+<%INIT>
+my $cf = RT::CustomField->new($session{'CurrentUser'});
+
+</%INIT>
+<%ARGS>
+$Default=>undef
+$Name => 'Type'
+</%ARGS>
diff --git a/rt/html/Admin/Elements/SelectGroups b/rt/html/Admin/Elements/SelectGroups
new file mode 100644
index 000000000..5df49ad04
--- /dev/null
+++ b/rt/html/Admin/Elements/SelectGroups
@@ -0,0 +1,37 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT MULTIPLE NAME="<%$Name%>"  SIZE=10>
+%while (my $group = $groups->Next) {
+<OPTION VALUE="<%$group->id%>"><%$group->Name%>
+%}
+</SELECT>
+
+<%INIT>
+my $groups = new RT::Groups($session{'CurrentUser'});
+$groups->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => 'System');
+
+</%INIT>
+<%ARGS>
+$Name => 'groups'
+</%ARGS>
diff --git a/rt/html/Admin/Elements/SelectModifyGroup b/rt/html/Admin/Elements/SelectModifyGroup
new file mode 100644
index 000000000..47978d3bf
--- /dev/null
+++ b/rt/html/Admin/Elements/SelectModifyGroup
@@ -0,0 +1,33 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%while ( $Group = $Groups->Next) {
+<A HREF="Modify.html?id=<%$Group->id%>"><%$Group->id%>: <%$Group->Name%></a><BR>
+%}
+<%INIT>
+my ($Group);
+my $Groups = new RT::Groups($session{'CurrentUser'});
+$Groups->UnLimit;
+</%INIT>
+<%ARGS>
+</%ARGS>
diff --git a/rt/html/Admin/Elements/SelectModifyQueue b/rt/html/Admin/Elements/SelectModifyQueue
new file mode 100644
index 000000000..c5152ac95
--- /dev/null
+++ b/rt/html/Admin/Elements/SelectModifyQueue
@@ -0,0 +1,33 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%while ( $queue = $queues->Next) {
+<A HREF="Modify.html?id=<%$queue->id%>"><%$queue->id%>: <%$queue->Name%></a><BR>
+%}
+<%INIT>
+my ($queue);
+my $queues = new RT::Queues($session{'CurrentUser'});
+$queues->UnLimit;
+</%INIT>
+<%ARGS>
+</%ARGS>
diff --git a/rt/html/Admin/Elements/SelectModifyUser b/rt/html/Admin/Elements/SelectModifyUser
new file mode 100644
index 000000000..9e7789b4c
--- /dev/null
+++ b/rt/html/Admin/Elements/SelectModifyUser
@@ -0,0 +1,49 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%while ( $user = $users->Next) {
+<A HREF="Modify.html?id=<%$user->id%>"><%$user->id%>: <%$user->Name%></a><BR>
+%}
+<%INIT>
+my ($user);
+my $users = new RT::Users($session{'CurrentUser'});
+$users->Limit(FIELD => 'id',
+              VALUE => $RT::SystemUser->id,
+              OPERATOR => '!=' );
+
+if (defined $IdLike) {
+$users->Limit(FIELD => 'Name',
+              VALUE => $IdLike,
+              OPERATOR => 'LIKE' );
+}
+if (defined $EmailLike) {
+$users->Limit(FIELD => 'EmailAddress',
+              VALUE => $EmailLike,
+              OPERATOR => 'LIKE');
+
+}
+</%INIT>
+<%ARGS>
+$IdLike => undef
+$EmailLike => undef
+</%ARGS>
diff --git a/rt/html/Admin/Elements/SelectNewGroupMembers b/rt/html/Admin/Elements/SelectNewGroupMembers
new file mode 100644
index 000000000..e5c28e909
--- /dev/null
+++ b/rt/html/Admin/Elements/SelectNewGroupMembers
@@ -0,0 +1,61 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+% if ($Show ne 'Groups') {
+<b><&|/l&>Users</&></b>
+<SELECT MULTIPLE NAME="<%$Name%>Users"  SIZE=10>
+%while (my $user = $users->Next) {
+<OPTION VALUE="User-<%$user->id%>"><%$user->Name%></OPTION>
+%}
+</SELECT>
+<br>
+% }
+% if ($Show ne 'Users') {
+<b><&|/l&>Groups</&></b>
+<SELECT MULTIPLE NAME="<%$Name%>Groups"  SIZE=10>
+%while (my $group = $groups->Next) {
+<OPTION VALUE="Group-<%$group->id%>"><%$group->Name%></OPTION>
+%}
+</SELECT>
+% }
+
+<%INIT>
+my $users = new RT::Users($session{'CurrentUser'});
+
+$users->Limit(FIELD => 'id', VALUE => $RT::SystemUser->id, OPERATOR => '!=' );
+$users->Limit(FIELD => 'id', VALUE => $RT::Nobody->id, OPERATOR => '!=' );
+$users->LimitToPrivileged();
+
+my $groups = new RT::Groups($session{'CurrentUser'});
+
+# self-recursive group membership considered harmful!
+$groups->Limit(FIELD => 'id', VALUE => $Group->id, OPERATOR => '!=' );
+$groups->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => 'UserDefined');
+
+
+</%INIT>
+<%ARGS>
+$Name => 'Users'
+$Show => 'All'
+$Group
+</%ARGS>
diff --git a/rt/html/Admin/Elements/SelectRights b/rt/html/Admin/Elements/SelectRights
new file mode 100644
index 000000000..37a06dc4d
--- /dev/null
+++ b/rt/html/Admin/Elements/SelectRights
@@ -0,0 +1,90 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<INPUT TYPE=HIDDEN NAME="CheckACL"  VALUE="<%$ACLDesc%>">
+     <TABLE BORDER=0>
+<TR>
+<TD valign=top width="180"> 
+<h3><&|/l&>Current rights</&></h3>
+% if ($ACLObj->Count() > 0) {
+<i>(<&|/l&>Check box to revoke right</&>)</i> <BR>
+% } else {
+<i><&|/l&>No rights granted.</&></i> <BR>    
+% }
+% while (my $right = $ACLObj->Next()) {
+% if ($right->RightName) {
+<input type=checkbox value="<%$right->Id%>" name="RevokeRight-<%$ACLDesc%>-<%$right->RightName%>"> <% loc($right->RightName) %><br>
+% }
+%  }
+</TD>
+<TD valign=top>
+<h3><&|/l&>New rights</&></h3> 
+<SELECT SIZE=5  MULTIPLE  NAME="GrantRight-<%$ACLDesc%>">
+% foreach $right (sort keys %Rights) {
+      <OPTION VALUE="<%$right%>"  
+	><% loc($right) %></OPTION>
+% }
+<OPTION VALUE="" SELECTED><&|/l&>(no value)</&></OPTION>
+</SELECT>
+</TD>
+</TR>
+</TABLE>
+<%INIT>
+    my ($right, $ACLDesc, $AppliesTo, %Rights);
+
+    # if the principal id points to a user, we really want to point
+    # to their ACL equivalence group. The machinations we're going through
+    # lead me to start to suspect that we really want users and groups
+    # to just be the same table. or _maybe_ that we want an object db.
+    my $princ = RT::Principal->new($RT::SystemUser);
+    $princ->Load($PrincipalId);
+    if ($princ->PrincipalType eq 'User') {
+    my $group = RT::Group->new($RT::SystemUser);
+        $group->LoadACLEquivalenceGroup($princ);
+        $PrincipalId = $group->PrincipalId;
+    }
+
+
+    my $ACLObj = new RT::ACL($session{'CurrentUser'});
+    my $ACE = new RT::ACE($session{'CurrentUser'});
+
+
+    $ACLObj->LimitToObject( $Object);
+    $ACLObj->LimitToPrincipal( Id => $PrincipalId);
+
+    if (ref($Object) && UNIVERSAL::can($Object, 'AvailableRights')) { 
+        %Rights = %{$Object->AvailableRights};
+    } 
+
+        else {
+                %Rights = { loc('System Error') => loc("No rights found")};
+        }
+        
+    $ACLDesc = "$PrincipalId-".ref($Object)."-".$Object->Id;
+</%INIT>
+    
+<%ARGS>
+$PrincipalType => undef
+$PrincipalId => undef
+$Object =>undef
+</%ARGS>
diff --git a/rt/html/Admin/Elements/SelectScrip b/rt/html/Admin/Elements/SelectScrip
new file mode 100644
index 000000000..18e4098a0
--- /dev/null
+++ b/rt/html/Admin/Elements/SelectScrip
@@ -0,0 +1,48 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME=<%$Name%>>
+<OPTION VALUE="" 
+<% $Default eq undef && 'SELECTED' %>
+>-</OPTION>
+%while  (my $Scrip = $Scrips->Next) {
+<OPTION VALUE=<% $Scrip->Id %>
+<% $Scrip->Id == $Default && 'SELECTED' %>
+><% loc($Scrip->Name) %>
+</OPTION>
+%}
+</SELECT>
+
+<%INIT>
+my $Scrips = RT::Scrips->new($session{'CurrentUser'});
+$Scrips->UnLimit;
+
+
+
+</%INIT>
+<%ARGS>
+
+$Default => undef
+$Name => 'Scrip'
+
+</%ARGS>
diff --git a/rt/html/Admin/Elements/SelectScripAction b/rt/html/Admin/Elements/SelectScripAction
new file mode 100644
index 000000000..0d7f8ccfa
--- /dev/null
+++ b/rt/html/Admin/Elements/SelectScripAction
@@ -0,0 +1,48 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME=<%$Name%>>
+<OPTION VALUE="" 
+<% $Default eq undef && 'SELECTED' %>
+>-</OPTION>
+%while  (my $ScripAction = $ScripActions->Next) {
+<OPTION VALUE=<%$ScripAction->Id%>
+<% $ScripAction->Id == $Default && 'SELECTED' %>
+><% loc($ScripAction->Name) %>
+</OPTION>
+%}
+</SELECT>
+
+<%INIT>
+my $ScripActions = RT::ScripActions->new($session{'CurrentUser'});
+$ScripActions->UnLimit;
+
+
+
+</%INIT>
+<%ARGS>
+
+$Default => undef
+$Name => 'ScripAction'
+
+</%ARGS>
diff --git a/rt/html/Admin/Elements/SelectScripCondition b/rt/html/Admin/Elements/SelectScripCondition
new file mode 100644
index 000000000..aeb366a44
--- /dev/null
+++ b/rt/html/Admin/Elements/SelectScripCondition
@@ -0,0 +1,48 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME=<%$Name%>>
+<OPTION VALUE="" 
+<% $Default eq undef && 'SELECTED' %>
+>-</OPTION>
+%while  (my $ScripCondition = $ScripConditions->Next) {
+<OPTION VALUE=<%$ScripCondition->Id%>
+<% $ScripCondition->Id == $Default && 'SELECTED' %>
+><% loc($ScripCondition->Name) %>
+</OPTION>
+%}
+</SELECT>
+
+<%INIT>
+my $ScripConditions = RT::ScripConditions->new($session{'CurrentUser'});
+$ScripConditions->UnLimit;
+
+
+
+</%INIT>
+<%ARGS>
+
+$Default => undef
+$Name => 'ScripCondition'
+
+</%ARGS>
diff --git a/rt/html/Admin/Elements/SelectSingleOrMultiple b/rt/html/Admin/Elements/SelectSingleOrMultiple
new file mode 100644
index 000000000..98e9ee78c
--- /dev/null
+++ b/rt/html/Admin/Elements/SelectSingleOrMultiple
@@ -0,0 +1,43 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+  <select name="<%$Name%>">
+    <option value="1" <%$SingleDefault%>><&|/l&>Single</&></option>
+    <option value="0" <%$MultipleDefault%>><&|/l&>Multiple</&></option>
+  </select>	
+
+
+<%INIT>
+my ($SingleDefault, $MultipleDefault);
+if ($Default == 1) {
+    $SingleDefault = "SELECTED";
+}
+elsif ($Default == 0 ) {
+    $MultipleDefault = "SELECTED";
+}
+
+</%INIT>
+<%ARGS>
+$Name => 'Single'
+$Default => 1
+</%ARGS>
diff --git a/rt/html/Admin/Elements/SelectTemplate b/rt/html/Admin/Elements/SelectTemplate
new file mode 100644
index 000000000..70ff4d1cc
--- /dev/null
+++ b/rt/html/Admin/Elements/SelectTemplate
@@ -0,0 +1,61 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME=<%$Name%>>
+<OPTION VALUE="" 
+<% $Default eq 'none' && 'SELECTED' %>
+>-</OPTION>
+%while  (my $Template = $PrimaryTemplates->Next) {
+<OPTION VALUE=<%$Template->Id%>
+<% ($Template->Id == $Default) && 'SELECTED' %>
+><% loc($Template->Name) %>
+</OPTION>
+%}
+%while  (my $Template = $OtherTemplates->Next) {
+<OPTION VALUE=<%$Template->Id%>
+<% ($Template->Id == $Default)  && 'SELECTED'%>
+><&|/l, loc($Template->Name) &>Global template: [_1]</&>
+</OPTION>
+%}
+</SELECT>
+
+<%INIT>
+
+
+my $PrimaryTemplates = RT::Templates->new($session{'CurrentUser'});
+if ($Queue != 0) {
+$PrimaryTemplates->LimitToQueue($Queue);
+}
+
+my $OtherTemplates = RT::Templates->new($session{'CurrentUser'});
+$OtherTemplates->LimitToGlobal($DefaultQueue);
+
+</%INIT>
+<%ARGS>
+
+$Queue => undef
+$Default => 'none'
+$DefaultQueue => undef
+$Name => 'Template'
+
+</%ARGS>
diff --git a/rt/html/Admin/Elements/SelectUsers b/rt/html/Admin/Elements/SelectUsers
new file mode 100644
index 000000000..d4c8a85ad
--- /dev/null
+++ b/rt/html/Admin/Elements/SelectUsers
@@ -0,0 +1,40 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT MULTIPLE NAME="<%$Name%>"  SIZE=10>
+%while (my $user = $users->Next) {
+<OPTION VALUE="<%$user->id%>"><%$user->Name%>
+%}
+</SELECT>
+
+<%INIT>
+my $users = new RT::Users($session{'CurrentUser'});
+
+$users->Limit(FIELD => 'id', VALUE => $RT::SystemUser->id, OPERATOR => '!=' );
+$users->Limit(FIELD => 'id', VALUE => $RT::Nobody->id, OPERATOR => '!=' );
+$users->LimitToPrivileged();
+
+</%INIT>
+<%ARGS>
+$Name => 'Users'
+</%ARGS>
diff --git a/rt/html/Admin/Elements/SystemTabs b/rt/html/Admin/Elements/SystemTabs
new file mode 100644
index 000000000..f38febdd7
--- /dev/null
+++ b/rt/html/Admin/Elements/SystemTabs
@@ -0,0 +1,70 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Tabs, subtabs => $tabs, 
+    current_tab => 'Admin/Global/', 
+    current_subtab => $current_tab, 
+    Title => $Title &>
+
+<%INIT>
+  my $tabs = {
+                
+               A => { title => loc('Scrips'),
+                           path => 'Admin/Global/Scrips.html',
+                         },
+               B => { title => loc('Templates'),
+                        path => 'Admin/Global/Templates.html',
+                      },
+              
+                F => { title => loc('Custom Fields'),
+                        path => 'Admin/Global/CustomFields.html',
+                        },
+
+                G => { title => loc('Group Rights'),
+                                path => 'Admin/Global/GroupRights.html',
+                      },
+                H => { title => loc('User Rights'),
+                                path => 'Admin/Global/UserRights.html',
+                      }
+
+};
+
+  # Now let callbacks add their extra tabs
+  $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
+
+  foreach my $tab (sort keys %{$tabs}) {
+    if ($tabs->{$tab}->{'path'} eq $current_tab) {
+      $tabs->{$tab}->{"subtabs"} = $subtabs;
+      $tabs->{$tab}->{"current_subtab"} = $current_subtab;
+    }
+  }
+</%INIT>
+
+  
+<%ARGS>
+$id => undef
+$current_tab => undef
+$subtabs => undef
+$current_subtab => undef
+$Title => undef
+</%ARGS>
diff --git a/rt/html/Admin/Elements/Tabs b/rt/html/Admin/Elements/Tabs
new file mode 100644
index 000000000..8fa2708fb
--- /dev/null
+++ b/rt/html/Admin/Elements/Tabs
@@ -0,0 +1,63 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Tabs, 
+    tabs => $tabs, 
+    current_toptab => 'Admin/', 
+    current_tab => $current_tab, 
+    Title => $Title &>
+
+<%INIT>
+  my $tabs = { A => { title => loc('Users'),
+			  path => 'Admin/Users/',
+			},
+	       B => { title => loc('Groups'),
+			   path => 'Admin/Groups/',
+			 },
+	       C => { title => loc('Queues'),
+			   path => 'Admin/Queues/',
+			 },
+	       D => { 'title' => loc('Global'),
+			   path => 'Admin/Global/',
+			 },
+	     };
+
+  # Now let callbacks add their extra tabs
+  $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
+
+  foreach my $tab (sort keys %{$tabs}) {
+    if ($tabs->{$tab}->{'path'} eq $current_tab) {
+      $tabs->{$tab}->{"subtabs"} = $subtabs;
+      $tabs->{$tab}->{"current_subtab"} = $current_subtab;
+    }
+  }
+
+</%INIT>
+
+
+<%ARGS>
+$subtabs => undef
+$current_tab => undef
+$current_subtab => undef
+$Title => undef
+</%ARGS>
diff --git a/rt/html/Admin/Elements/UserTabs b/rt/html/Admin/Elements/UserTabs
new file mode 100644
index 000000000..764fdfcb5
--- /dev/null
+++ b/rt/html/Admin/Elements/UserTabs
@@ -0,0 +1,74 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Tabs, 
+    subtabs => $tabs,
+    current_tab => 'Admin/Users/', 
+    current_subtab => $current_subtab, 
+    Title => $Title &>
+<%INIT>
+my $tabs;
+my $subtabs;
+if ($id) {
+$tabs->{'this'} = { title => eval { $UserObj->Name },
+
+			   path => "Admin/Users/Modify.html?id=".$id,
+subtabs => {
+	       Queues => { title => loc('Basics'),
+			   path => "Admin/Users/Modify.html?id=".$id
+			 },
+#	       Scrips => { title => loc('Rights'),
+#			   path => "Admin/Users/Rights.html?id=".$id
+#			 }
+	       
+	      }
+}
+}
+if ($session{'CurrentUser'}->HasRight( Object => $RT::System, Right => 'AdminUsers')) {
+  $tabs->{"A"} = { title => loc('Select user'),
+  		     	path => "Admin/Users/",
+			   };
+  $tabs->{"B"} = { title => loc('New user'),
+  		     	path => "Admin/Users/Modify.html?Create=1",
+			separator => 1,
+			   };
+}
+
+  # Now let callbacks add their extra tabs
+  $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
+                                                                                
+foreach my $tab ( sort keys %{$tabs} ) {                                        
+    if ( $tabs->{$tab}->{'path'} eq $current_subtab ) {                         
+        $tabs->{$tab}->{"current_subtab"} = $current_subtab;                    
+    }                                                                           
+}                                                                               
+</%INIT>
+  
+  
+<%ARGS>
+$UserObj => undef
+$id => undef
+$current_tab => undef
+$current_subtab => undef
+$Title => undef
+</%ARGS>
diff --git a/rt/html/Admin/Global/CustomField.html b/rt/html/Admin/Global/CustomField.html
new file mode 100644
index 000000000..0974af538
--- /dev/null
+++ b/rt/html/Admin/Global/CustomField.html
@@ -0,0 +1,61 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => $title &>
+<& /Admin/Elements/SystemTabs, 
+    current_tab => 'Admin/Global/CustomFields.html',
+    current_subtab => $current_subtab, 
+    subtabs => $subtabs, 
+    Title => $title &>
+
+<& /Admin/Elements/EditCustomField, title => $title,  %ARGS &>
+
+<%INIT>
+my ($title, $current_subtab);
+
+my $subtabs = {
+		 A => { title => loc('Select custom field'),
+  		     	path => "Admin/Global/CustomFields.html"
+			   },
+		 B => { title => loc('New custom field'),
+  		     	path => "Admin/Global/CustomField.html?create=1&Queue=0",
+			separator => 1,
+			   }
+	      };
+if ( $ARGS{'create'} ) {
+    $current_subtab = "Admin/Global/CustomField.html?create=1&Queue=0";
+    $title          = loc('Create a CustomField which applies to all queues');
+}
+else {
+    $current_subtab =
+      "Admin/Global/CustomField.html?CustomField=" . $CustomField . "&Queue=0";
+    $title = loc('Modify a CustomField which applies to all queues');
+    $subtabs->{"C"} = {
+        title => loc( 'Custom Field #[_1]', $CustomField ),
+        path => "Admin/Global/CustomField.html?CustomField=" . $CustomField . "&Queue=0"
+    };
+}
+</%INIT>
+<%ARGS>
+$CustomField => undef
+</%ARGS>
diff --git a/rt/html/Admin/Global/CustomFields.html b/rt/html/Admin/Global/CustomFields.html
new file mode 100644
index 000000000..f6bbddfed
--- /dev/null
+++ b/rt/html/Admin/Global/CustomFields.html
@@ -0,0 +1,47 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => $title &>
+<& /Admin/Elements/SystemTabs, 
+    current_tab => 'Admin/Global/CustomFields.html',
+    current_subtab => 'Admin/Global/CustomFields.html', 
+    subtabs => $subtabs, 
+    Title => $title &>
+
+<& /Admin/Elements/EditCustomFields, title => $title, %ARGS &>
+
+<%INIT>
+my $subtabs = {
+		 A => { title => loc('Select custom field'),
+  		     	path => "Admin/Global/CustomFields.html"
+			   },
+		 B => { title => loc('New custom field'),
+  		     	path => "Admin/Global/CustomField.html?create=1&Queue=0",
+			separator => 1,
+			   }
+	      };
+my $title = loc("Modify Custom Fields which apply to all queues");
+</%INIT>
+<%ARGS>
+$id => undef
+</%ARGS>
diff --git a/rt/html/Admin/Global/GroupRights.html b/rt/html/Admin/Global/GroupRights.html
new file mode 100644
index 000000000..150e83f43
--- /dev/null
+++ b/rt/html/Admin/Global/GroupRights.html
@@ -0,0 +1,99 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => loc('Modify global group rights') &>
+<& /Admin/Elements/SystemTabs, 
+    current_tab => 'Admin/Global/GroupRights.html', 
+    Title => loc('Modify global group rights') &>  
+<& /Elements/ListActions, actions => \@results &>
+
+  <FORM METHOD=POST ACTION="GroupRights.html">
+      
+<& /Elements/TitleBoxStart, title => loc('Modify global group rights.')&>
+      
+<h1><&|/l&>System groups</&></h1>
+<TABLE>
+% $Groups = RT::Groups->new($session{'CurrentUser'});
+% $Groups->LimitToSystemInternalGroups();
+%	while (my $Group = $Groups->Next()) {
+  <TR ALIGN=RIGHT> 
+	<TD VALIGN=TOP>
+	    <% loc($Group->Type) %>
+		  </TD>
+	  <TD>
+	    <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId,
+        Object  =>$RT::System &>
+	  </TD>
+	</TR>
+% }
+</TABLE>
+<h1><&|/l&>Roles</&></h1>
+<TABLE>
+% $Groups = RT::Groups->new($session{'CurrentUser'});
+% $Groups->LimitToRolesForSystem();
+%	while (my $Group = $Groups->Next()) {
+  <TR ALIGN=RIGHT> 
+	<TD VALIGN=TOP>
+	    <% loc($Group->Type) %>
+		  </TD>
+	  <TD>
+	    <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId,
+        Object  => $RT::System &>
+	  </TD>
+	</TR>
+% }
+</TABLE>
+<h1><&|/l&>User defined groups</&></h1>
+<TABLE>
+% $Groups = RT::Groups->new($session{'CurrentUser'});
+% $Groups->LimitToUserDefinedGroups();    
+%	while (my $Group = $Groups->Next()) {
+  <TR ALIGN=RIGHT> 
+	<TD VALIGN=TOP>
+	    <% $Group->Name %>
+		  </TD>
+	  <TD>
+	    <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId,
+        Object  => $RT::System &>
+	  </TD>
+	</TR>
+% }
+</TABLE>
+            
+      <& /Elements/TitleBoxEnd &>
+      <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+      
+  </FORM>
+  
+<%INIT>
+ 
+  #Update the acls.
+  my @results =  ProcessACLChanges(\%ARGS);
+
+
+my $Groups;
+    
+</%INIT>
+
+<%ARGS>
+</%ARGS>
diff --git a/rt/html/Admin/Global/Scrip.html b/rt/html/Admin/Global/Scrip.html
new file mode 100644
index 000000000..8b9cf6db6
--- /dev/null
+++ b/rt/html/Admin/Global/Scrip.html
@@ -0,0 +1,56 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => $title  &>
+<& /Admin/Elements/SystemTabs, 
+    current_tab => 'Admin/Global/Scrips.html', 
+    current_subtab => $current_subtab, 
+    subtabs => $subtabs, 
+    Title => $title &>
+
+<& /Admin/Elements/EditScrip, title => $title,  %ARGS &>
+
+<%init>
+my ($title, $current_subtab);
+my $subtabs = {
+		 A => { title => loc('Select scrip'),
+  		     	path => "Admin/Global/Scrips.html",
+			   },
+		 B => { title => loc('New scrip'),
+  		     	path => "Admin/Global/Scrip.html?create=1&Queue=0",
+			separator => 1,
+			   }
+	      };
+
+if ($ARGS{'id'}) {
+    $current_subtab = "Admin/Global/Scrip.html?id=".$ARGS{'id'}."&Queue=0";
+    $title = loc("Modify a scrip which applies to all queues");
+    $subtabs->{"C"} = { title => loc('Scrip #[_1]', $ARGS{'id'}),
+  		     	path => "Admin/Global/Scrip.html?id=".$ARGS{'id'}."&Queue=0"
+			   }
+}
+else {
+    $current_subtab = "Admin/Global/Scrip.html?create=1&Queue=0";
+    $title = loc("Add a scrip which will apply to all queues");
+}
+</%init>
diff --git a/rt/html/Admin/Global/Scrips.html b/rt/html/Admin/Global/Scrips.html
new file mode 100644
index 000000000..763198015
--- /dev/null
+++ b/rt/html/Admin/Global/Scrips.html
@@ -0,0 +1,53 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => $title  &>
+<& /Admin/Elements/SystemTabs, 
+    current_tab => 'Admin/Global/Scrips.html', 
+    current_subtab => 'Admin/Global/Scrips.html', 
+    subtabs => $subtabs, 
+    Title => $title &>
+<& /Admin/Elements/EditScrips, title => $title, id => $id, %ARGS &>
+</form>
+<%init>
+
+my $subtabs = {
+		 A => { title => loc('Select scrip'),
+  		     	path => "Admin/Global/Scrips.html",
+			   },
+		 B => { title => loc('New scrip'),
+  		     	path => "Admin/Global/Scrip.html?create=1&Queue=0",
+			separator => 1,
+			   }
+	      };
+my $title = loc("Modify scrips which apply to all queues");
+
+my (@actions);
+
+</%init>
+
+
+
+<%ARGS>
+$id => 0
+</%ARGS>
diff --git a/rt/html/Admin/Global/Template.html b/rt/html/Admin/Global/Template.html
new file mode 100644
index 000000000..71f77e9dd
--- /dev/null
+++ b/rt/html/Admin/Global/Template.html
@@ -0,0 +1,101 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => loc("Modify template [_1]", $TemplateObj->id)  &>
+<& /Admin/Elements/SystemTabs, 
+    current_tab => 'Admin/Global/Templates.html', 
+    current_subtab => $current_subtab, 
+    subtabs => $subtabs, 
+    Title => loc("Modify template [_1]", $TemplateObj->id) &>
+<& /Elements/ListActions, actions => \@results &>
+
+
+<FORM METHOD=POST ACTION="Template.html">
+%if ($Create ) {
+<INPUT TYPE=HIDDEN NAME="Template" VALUE="new">
+% } else {
+<INPUT TYPE=HIDDEN NAME="Template" VALUE="<%$TemplateObj->Id%>">
+% }
+
+%# hang onto the queue id
+<INPUT TYPE=HIDDEN name="Queue" value="<%$Queue%>">
+
+<& /Admin/Elements/ModifyTemplate, Name => $TemplateObj->Name, Description => $TemplateObj->Description, Content => $TemplateObj->Content &>
+
+<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+</FORM>
+
+
+
+<%INIT>
+
+my $TemplateObj = new RT::Template($session{'CurrentUser'});
+my  ($title, @results, $current_subtab);
+
+my $subtabs = {
+		 A => { title => loc('Select template'),
+  		     	path => "Admin/Global/Templates.html"
+			   },
+		 B => { title => loc('New template'),
+  		     	path => "Admin/Global/Template.html?Create=1&Queue=0",
+			separator => 1,
+			   }
+	      };
+
+
+if ($Create) {
+  $current_subtab = "Admin/Global/Template.html?Create=1&Queue=0";
+  $title = loc("Create a template");
+}
+
+else {
+  if ($Template eq 'new') {
+      my ($val, $msg) =  $TemplateObj->Create(Queue => $Queue, Name => $Name);
+      Abort(loc("Could not create template: [_1]", $msg)) unless ($val);
+     push @results, $msg;
+    }
+    else {
+       $TemplateObj->Load($Template) || Abort(loc('No Template'));
+    }
+      $title = loc('Modify template [_1]', loc($TemplateObj->Name())); 
+  
+    
+}
+if ($TemplateObj->Id()) {
+  my @attribs = qw( Description Content Queue Name);
+  my @aresults = UpdateRecordObject( AttributesRef => \@attribs, 
+				     Object => $TemplateObj, 
+				     ARGSRef => \%ARGS);
+  $current_subtab = "Admin/Global/Template.html?Queue=0&Template=".$TemplateObj->Id();
+  $subtabs->{"C"} = { title => loc('Template #[_1]', $TemplateObj->Id()),
+  		     	path => "Admin/Global/Template.html?Queue=0&Template=".$TemplateObj->Id(),
+			};
+  push @results, @aresults;
+}
+</%INIT>
+<%ARGS>
+$Queue => undef
+$Template => undef
+$Create => undef
+$Name => undef
+</%ARGS>
diff --git a/rt/html/Admin/Global/Templates.html b/rt/html/Admin/Global/Templates.html
new file mode 100644
index 000000000..77aab0730
--- /dev/null
+++ b/rt/html/Admin/Global/Templates.html
@@ -0,0 +1,53 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => $title &>
+<& /Admin/Elements/SystemTabs, 
+    current_tab => 'Admin/Global/Templates.html', 
+    current_subtab => 'Admin/Global/Templates.html', 
+    subtabs => $subtabs, 
+    Title => $title &>
+<& /Admin/Elements/EditTemplates, title => $title, %ARGS &>
+</form>
+<%init>
+
+my $subtabs = {
+		 A => { title => loc('Select template'),
+  		     	path => "Admin/Global/Templates.html"
+			   },
+		 B => { title => loc('New template'),
+  		     	path => "Admin/Global/Template.html?Create=1&Queue=0",
+			separator => 1,
+			   }
+	      };
+my $title = loc("Modify templates which apply to all queues");
+
+my (@actions);
+
+</%init>
+
+
+
+<%ARGS>
+$id => undef
+</%ARGS>
diff --git a/rt/html/Admin/Global/UserRights.html b/rt/html/Admin/Global/UserRights.html
new file mode 100644
index 000000000..aee82d1f4
--- /dev/null
+++ b/rt/html/Admin/Global/UserRights.html
@@ -0,0 +1,77 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => loc('Modify global user rights') &>
+<& /Admin/Elements/SystemTabs, 
+    current_tab => 'Admin/Global/UserRights.html',
+    Title => loc('Modify global user rights') &>  
+<& /Elements/ListActions, actions => \@results &>
+
+  <FORM METHOD=POST ACTION="UserRights.html">
+      
+<& /Elements/TitleBoxStart, title => loc('Modify global user rights.') &>
+      
+<TABLE>
+        
+%	while (my $Member = $Users->Next()) {
+% my $UserObj = $Member->MemberObj->Object();
+% my $group = RT::Group->new($session{'CurrentUser'});
+% $group->LoadACLEquivalenceGroup($Member->MemberObj);
+  <TR ALIGN=RIGHT> 
+	<TD VALIGN=TOP>
+	    <% $UserObj->Name %>
+		  </TD>
+	  <TD>
+	    <& /Admin/Elements/SelectRights, PrincipalId => $group->PrincipalId,
+        Object => $RT::System  &>
+	  </TD>
+	</TR>
+% }
+</TABLE>
+            
+      <& /Elements/TitleBoxEnd &>
+      <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+      
+  </FORM>
+  
+<%INIT>
+ 
+  #Update the acls.
+  my @results =  ProcessACLChanges(\%ARGS);
+
+# {{{ Deal with setting up the display of current rights.
+
+
+# Find out which users we want to display ACL selects for
+my $Privileged = RT::Group->new($session{'CurrentUser'});
+$Privileged->LoadSystemInternalGroup('Privileged');
+my $Users = $Privileged->MembersObj();
+
+    
+  
+# }}}
+    
+</%INIT>
+
+<%ARGS>
+</%ARGS>
diff --git a/rt/html/Admin/Global/index.html b/rt/html/Admin/Global/index.html
new file mode 100644
index 000000000..1749f4ffb
--- /dev/null
+++ b/rt/html/Admin/Global/index.html
@@ -0,0 +1,64 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Callback, tabs => $tabs, %ARGS &>
+<& /Admin/Elements/Header, Title => loc('Admin/Global configuration') &>
+<& /Admin/Elements/SystemTabs, 
+    Title => loc('Admin/Global configuration') &>
+
+<ul>
+% foreach my $key (sort keys %$tabs) {
+<li><font size="+2"><a href="<% $tabs->{$key}{path} %>"><% $tabs->{$key}{title} %></a></font><br>
+<% $tabs->{$key}{text} %>
+</li>
+% }
+</ul>
+
+<%INIT>
+  my $tabs = {
+                
+               A => { title => loc('Scrips'),
+                           text => loc('Modify scrips which apply to all queues'),
+                           path => 'Scrips.html',
+                         },
+               B => { title => loc('Templates'),
+                        text => loc('Edit system templates'),
+                        path => 'Templates.html',
+                      },
+              
+                F => { title => loc('Custom Fields'),
+                        text => loc('Modify Custom Fields which apply to all queues'),
+                        path => 'CustomFields.html',
+                        },
+
+                G => { title => loc('Group Rights'),
+                                text => loc('Modify global group rights'),
+                                path => 'GroupRights.html',
+                      },
+                H => { title => loc('User Rights'),
+                                text => loc('Modify global user rights'),
+                                path => 'UserRights.html',
+                      }
+
+};
+</%INIT>
diff --git a/rt/html/Admin/Groups/GroupRights.html b/rt/html/Admin/Groups/GroupRights.html
new file mode 100644
index 000000000..6220259d3
--- /dev/null
+++ b/rt/html/Admin/Groups/GroupRights.html
@@ -0,0 +1,95 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => loc('Modify group rights for group [_1]', $GroupObj->Name) &>
+<& /Admin/Elements/GroupTabs, 
+    GroupObj => $GroupObj, 
+    current_tab => 'Admin/Groups/GroupRights.html?id='.$id, 
+    Title => loc('Modify group rights for group [_1]', $GroupObj->Name) &>
+<& /Elements/ListActions, actions => \@results &>
+
+  <FORM METHOD=POST ACTION="GroupRights.html">
+    <INPUT TYPE=HIDDEN NAME=id VALUE="<% $GroupObj->id %>">
+      
+<& /Elements/TitleBoxStart, title => loc('Modify group rights for group [_1]', $GroupObj->Name) &>
+      
+<h1><&|/l&>System groups</&></h1>
+<TABLE>
+% $Groups = RT::Groups->new($session{'CurrentUser'});
+% $Groups->LimitToSystemInternalGroups();
+%	while (my $Group = $Groups->Next()) {
+  <TR ALIGN=RIGHT> 
+	<TD VALIGN=TOP>
+	    <% loc($Group->Type) %>
+		  </TD>
+	  <TD>
+	    <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId,
+        PrincipalType => 'Group',
+        Object => $GroupObj  &>
+	  </TD>
+	</TR>
+% }
+</TABLE>
+<h1><&|/l&>User defined groups</&></h1>
+<TABLE>
+% $Groups = RT::Groups->new($session{'CurrentUser'});
+% $Groups->LimitToUserDefinedGroups();    
+%	while (my $Group = $Groups->Next()) {
+  <TR ALIGN=RIGHT> 
+	<TD VALIGN=TOP>
+	    <% $Group->Name %>
+		  </TD>
+	  <TD>
+	    <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId,
+        PrincipalType => 'Group',
+        Object => $GroupObj  &>
+	  </TD>
+	</TR>
+% }
+</TABLE>
+            
+      <& /Elements/TitleBoxEnd &>
+      <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+      
+  </FORM>
+  
+<%INIT>
+ 
+  #Update the acls.
+  my @results =  ProcessACLChanges(\%ARGS);
+
+
+if (!defined $id) {
+    Abort(loc("No Group defined"));
+}
+
+my $GroupObj = RT::Group->new($session{'CurrentUser'});
+$GroupObj->Load($id) || Abort(loc("Couldn't load group [_1]",$id));
+
+my $Groups;
+    
+</%INIT>
+
+<%ARGS>
+$id => undef
+</%ARGS>
diff --git a/rt/html/Admin/Groups/Members.html b/rt/html/Admin/Groups/Members.html
new file mode 100644
index 000000000..6e669666f
--- /dev/null
+++ b/rt/html/Admin/Groups/Members.html
@@ -0,0 +1,134 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => "RT/Admin/Edit the group ". $Group->Name &>
+<& /Admin/Elements/GroupTabs, GroupObj => $Group, 
+    current_tab => 'Admin/Groups/Members.html?id='.$id, 
+    Title => "RT/Admin/Edit the group ". $Group->Name &>
+<& /Elements/ListActions, actions => \@results &>
+
+
+<& /Elements/TitleBoxStart, title => loc('Editing membership for group [_1]', $Group->Name) &>
+
+<FORM ACTION="<%$RT::WebPath%>/Admin/Groups/Members.html" METHOD=POST>
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Group->Id%>">
+<TABLE WIDTH="100%">
+<TR>
+<TD>
+<h3><&|/l&>Current members</&></h3>
+</TD>
+<TD>
+<h3><&|/l&>Add members</&></h3>
+</TD>
+</TR>
+
+<TR>
+<TD VALIGN=TOP>
+
+% if ($Group->MembersObj->Count == 0 ) {
+<i><&|/l&>(No members)</&></i>
+% } else {
+<i><&|/l&>(Check box to delete)</&></i>
+<br>
+<br>
+<&|/l&>Users</&>
+% my $UserMembers = $Group->MembersObj;
+% $UserMembers->LimitToUsers();
+<UL>
+% while (my $member = $UserMembers->Next()) {
+<LI><INPUT TYPE=CHECKBOX Name="DeleteMember-<%$member->MemberId%>">
+<%$member->MemberObj->Object->Name%> (<%$member->MemberObj->Object->RealName%>)
+% }
+</ul>
+<&|/l&>Groups</&>
+<ul>
+% my $GroupMembers = $Group->MembersObj;
+% $GroupMembers->LimitToGroups();
+% while (my $member = $GroupMembers->Next()) {
+<LI><INPUT TYPE=CHECKBOX Name="DeleteMember-<%$member->MemberId%>">
+<%$member->MemberObj->Object->Name%>
+% }
+% }
+</UL>
+</TD>
+<TD VALIGN=TOP>
+<& /Admin/Elements/SelectNewGroupMembers, Name => "AddMembers", Group => $Group &>
+</TD>
+</TR>
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+</form>
+
+
+<%INIT>
+
+my $Group = new RT::Group($session{'CurrentUser'});
+$Group->Load($id) || Abort(loc('Could not load group'));
+
+my (@results);
+
+my $key;
+foreach $key (keys %ARGS) {
+
+if ($key =~ /^DeleteMember-(\d+)$/) {
+    my $id = $1; 
+    my ($val,$msg) = $Group->DeleteMember($id);
+    push (@results, $msg);
+}
+}
+
+# Make sure AddMembers is always an array
+my @AddMembers = (
+    ((ref $AddMembersUsers eq 'ARRAY') ? @{$AddMembersUsers} : ($AddMembersUsers)),
+    ((ref $AddMembersGroups eq 'ARRAY') ? @{$AddMembersGroups} : ($AddMembersGroups)),
+);
+
+foreach my $member (@AddMembers) {
+    next unless ($member);
+
+    my $principal;
+
+    if ($member =~ /^Group-(\d+)$/) {
+        $principal = RT::Group->new($session{'CurrentUser'});
+        $principal->Load($1);
+    } elsif ($member =~ /^User-(\d+)$/) {
+        $principal = RT::User->new($session{'CurrentUser'});
+        $principal->Load($1);
+    } else {
+        next;
+    }
+
+
+    my ($val, $msg) = $Group->AddMember($principal->PrincipalId);
+    push (@results, $msg);
+}
+
+
+</%INIT>
+
+<%ARGS>
+$AddMembersUsers  => undef
+$AddMembersGroups => undef
+$id => undef
+</%ARGS>
diff --git a/rt/html/Admin/Groups/Modify.html b/rt/html/Admin/Groups/Modify.html
new file mode 100644
index 000000000..c5e91588e
--- /dev/null
+++ b/rt/html/Admin/Groups/Modify.html
@@ -0,0 +1,134 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => $title  &>
+
+<& /Admin/Elements/GroupTabs, 
+    GroupObj => $Group, 
+    current_tab => $current_tab, 
+    Title => $title &>
+<& /Elements/ListActions, actions => \@results &>
+
+
+
+<FORM ACTION="<%$RT::WebPath%>/Admin/Groups/Modify.html" METHOD=POST>
+
+%unless ($Group->Id) {
+<INPUT TYPE=HIDDEN NAME=id VALUE="new">
+% } else {
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Group->Id%>">
+% }
+<TABLE>
+<TR><TD ALIGN=RIGHT>
+<&|/l&>Name</&>:
+</TD>
+<TD><INPUT name="Name" value="<%$Group->Name%>"></TD>
+</TR><TR>
+<TD ALIGN=RIGHT>
+<&|/l&>Description</&>:</TD><TD COLSPAN=3><INPUT name="Description" value="<%$Group->Description%>" size=60></TD>
+</TR><TR>
+<TD COLSPAN=2>
+<INPUT TYPE=HIDDEN NAME="SetEnabled" VALUE="1">
+<INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>> <&|/l&>Enabled (Unchecking this box disables this group)</&><BR>
+</TR>
+</TABLE>
+<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+</form>
+<%INIT>
+
+my $current_tab;
+my  ($title, @results, $Disabled, $EnabledChecked);
+
+my $Group = RT::Group->new($session{'CurrentUser'});
+
+if ($Create) {
+    $current_tab = 'Admin/Groups/Modify.html?Create=1';
+    $title = loc("Create a new group");
+} 
+
+else {
+    $current_tab = 'Admin/Groups/Modify.html?id='.$id;
+    if ($id eq 'new' ) {
+	
+	my ($create_id, $create_msg) = $Group->CreateUserDefinedGroup(Name =>
+    "$Name");
+        unless ($create_id) {
+            Abort (loc("Group could not be created: [_1]", $create_msg));
+     }
+	$id = $Group->Id;
+    }
+    else {
+	$Group->Load($id) || Abort('Could not load group');
+    }
+
+
+    if ($id) {
+	$title = loc("Modify the group [_1]", $Group->Name);
+
+    }	
+
+    # If the create failed
+    else {
+	$title = loc("Create a new group");
+	$Create = 1;
+    }    
+    
+}
+
+if ($id) {
+    
+    my @fields = qw(Description Name );
+    my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
+					    Object => $Group,
+					    ARGSRef => \%ARGS );
+    push (@results,@fieldresults);
+}
+
+#we're asking about enabled on the web page but really care about disabled.
+if ($Enabled == 1) {
+    $Disabled = 0;
+}	
+else {
+    $Disabled = 1;
+}
+if  ( ($SetEnabled) and ( $Disabled != $Group->Disabled) ) { 
+    my  ($code, $msg) = $Group->SetDisabled($Disabled);
+    push @results, loc('Enabled status [_1]', loc_fuzzy($msg));
+}
+
+unless ($Group->Disabled()) {
+    $EnabledChecked ="CHECKED";
+}
+
+
+</%INIT>
+
+
+<%ARGS>
+$Create => undef
+$Name => undef
+$Description => undef
+$SetEnabled => undef
+$Enabled => undef
+$id => undef
+</%ARGS>
diff --git a/rt/html/Admin/Groups/UserRights.html b/rt/html/Admin/Groups/UserRights.html
new file mode 100644
index 000000000..0a87ef860
--- /dev/null
+++ b/rt/html/Admin/Groups/UserRights.html
@@ -0,0 +1,92 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => loc('Modify user rights for group [_1]', $GroupObj->Name) &>
+<& /Admin/Elements/GroupTabs, 
+    GroupObj => $GroupObj, 
+    current_tab => 'Admin/Groups/UserRights.html?id='.$id, 
+    Title => loc('Modify user rights for group [_1]', $GroupObj->Name) &>  
+<& /Elements/ListActions, actions => \@results &>
+
+  <FORM METHOD=POST ACTION="UserRights.html">
+    <INPUT TYPE=HIDDEN NAME=id VALUE="<% $GroupObj->id %>">
+      
+<& /Elements/TitleBoxStart, title => loc('Modify user rights for group [_1]', $GroupObj->Name) &>
+      
+<TABLE>
+        
+%	while (my $Member = $Users->Next()) {
+% my $UserObj = $Member->MemberObj->Object();
+  <TR ALIGN=RIGHT> 
+	<TD VALIGN=TOP>
+	    <% $UserObj->Name %>
+		  </TD>
+	  <TD>
+	    <& /Admin/Elements/SelectRights, PrincipalId => $Member->MemberObj->Id,
+        PrincipalType => 'User', 
+        Object => $GroupObj  &>
+	  </TD>
+	</TR>
+% }
+      </TABLE>
+            
+      <& /Elements/TitleBoxEnd &>
+      <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+      
+  </FORM>
+  
+<%INIT>
+ 
+  #Update the acls.
+  my @results =  ProcessACLChanges(\%ARGS);
+
+# {{{ Deal with setting up the display of current rights.
+
+
+#Define vars used in html above
+
+
+if (!defined $id) {
+    Abort(loc("No Group defined"));
+}
+
+my $GroupObj = RT::Group->new($session{'CurrentUser'});
+$GroupObj->Load($id) || Abort(loc("Couldn't load group [_1]",$id));
+
+# Find out which users we want to display ACL selects for
+my $Privileged = RT::Group->new($session{'CurrentUser'});
+$Privileged->LoadSystemInternalGroup('Privileged');
+my $Users = $Privileged->MembersObj();
+
+    
+  
+# }}}
+    
+</%INIT>
+
+<%ARGS>
+$id => undef
+$UserString => undef
+$UserOp => undef
+$UserField => undef
+</%ARGS>
diff --git a/rt/html/Admin/Groups/index.html b/rt/html/Admin/Groups/index.html
new file mode 100644
index 000000000..57c86c90e
--- /dev/null
+++ b/rt/html/Admin/Groups/index.html
@@ -0,0 +1,43 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => $title &>
+<& /Admin/Elements/GroupTabs, current_tab => 'Admin/Groups/',
+    current_subtab => 'Admin/Groups/', 
+    Title => $title &>
+
+
+<UL>
+%while ( my $Group = $Groups->Next) {
+<LI><A HREF="Modify.html?id=<%$Group->id%>"><%$Group->Name || loc('(empty)')%></a><BR>
+%}
+</UL>
+
+<%INIT>
+my $Groups = RT::Groups->new($session{'CurrentUser'});
+$Groups->LimitToUserDefinedGroups();
+my $title = loc('Select a group');
+
+</%INIT>
+<%ARGS>
+</%ARGS>
diff --git a/rt/html/Admin/Queues/CustomField.html b/rt/html/Admin/Queues/CustomField.html
new file mode 100644
index 000000000..2515c3e94
--- /dev/null
+++ b/rt/html/Admin/Queues/CustomField.html
@@ -0,0 +1,60 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => $title &>
+<& /Admin/Elements/QueueTabs, id => $QueueObj->Id, 
+    QueueObj => $QueueObj,                                                      
+    current_tab => 'Admin/Queues/CustomFields.html?id='.$QueueObj->id, 
+    current_subtab => $current_subtab, 
+    subtabs => $subtabs, 
+    Title => $title &>
+
+<& /Admin/Elements/EditCustomField, title => $title,  %ARGS &>
+
+<%INIT>
+my $QueueObj = new RT::Queue($session{'CurrentUser'});
+$QueueObj->Load($Queue);
+
+my ($title, $current_subtab);
+
+unless($QueueObj->id) {
+    Abort(loc("Queue [_1] not found", $Queue));
+}
+if ($CustomField) {
+    $title = loc('Modify a CustomField for queue [_1]', $QueueObj->Name()); 
+}else {
+    $current_subtab = "Admin/Queues/CustomField.html?create=1&Queue=".$QueueObj->id;
+    $title = loc('Create a CustomField for queue [_1]', $QueueObj->Name()); 
+}
+
+my $subtabs = {
+		 A => { title => loc('New custom field'),
+  		     	path => "Admin/Queues/CustomField.html?create=1&Queue=".$QueueObj->id
+			   }
+	      };
+
+</%INIT>
+<%ARGS>
+$CustomField => undef
+$Queue => undef
+</%ARGS>
diff --git a/rt/html/Admin/Queues/CustomFields.html b/rt/html/Admin/Queues/CustomFields.html
new file mode 100644
index 000000000..78c6c2790
--- /dev/null
+++ b/rt/html/Admin/Queues/CustomFields.html
@@ -0,0 +1,48 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => $title &>
+<& /Admin/Elements/QueueTabs, id => $Queue->id, 
+    current_tab => 'Admin/Queues/CustomFields.html?id='.$id, 
+    QueueObj => $Queue,                                                      
+    subtabs => $subtabs,
+    Title => $title
+    &>
+
+<& /Admin/Elements/EditCustomFields, title => $title, %ARGS &>
+<%INIT>
+my $Queue = new RT::Queue($session{'CurrentUser'});
+$Queue->Load($id);
+my $CustomFields = RT::CustomFields->new($RT::SystemUser);
+$CustomFields->LimitToQueue($Queue->Id);
+my $subtabs = {
+	 A => { title => loc('New custom field'),
+	     	path => "Admin/Queues/CustomField.html?create=1&Queue=".$id,
+			   }
+	      };
+
+my $title=  loc('Edit Custom Fields for [_1]', $Queue->Name);
+</%INIT>
+<%ARGS>
+$id => undef
+</%ARGS>
diff --git a/rt/html/Admin/Queues/GroupRights.html b/rt/html/Admin/Queues/GroupRights.html
new file mode 100644
index 000000000..a1ac709e1
--- /dev/null
+++ b/rt/html/Admin/Queues/GroupRights.html
@@ -0,0 +1,110 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => loc('Modify group rights for queue [_1]', $QueueObj->Name) &>
+<& /Admin/Elements/QueueTabs, id => $id, 
+    QueueObj => $QueueObj,                                                      
+    current_tab => $current_tab, 
+    Title => loc('Modify group rights for queue [_1]', $QueueObj->Name) &>
+<& /Elements/ListActions, actions => \@results &>
+
+  <FORM METHOD=POST ACTION="GroupRights.html">
+    <INPUT TYPE=HIDDEN NAME=id VALUE="<% $QueueObj->id %>">
+      
+      
+<h1><&|/l&>System groups</&></h1>
+<TABLE>
+<& /Elements/Callback, QueueObj => $QueueObj, results => \@results, %ARGS &>
+% $Groups = RT::Groups->new($session{'CurrentUser'});
+% $Groups->LimitToSystemInternalGroups();
+%	while (my $Group = $Groups->Next()) {
+  <TR ALIGN=RIGHT> 
+	<TD VALIGN=TOP>
+	    <% loc($Group->Type) %>
+		  </TD>
+	  <TD>
+	    <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId,
+        Object => $QueueObj  &>
+	  </TD>
+	</TR>
+% }
+</TABLE>
+<h1><&|/l&>Roles</&></h1>
+<TABLE>
+% $Groups = RT::Groups->new($session{'CurrentUser'});
+% $Groups->LimitToRolesForQueue($QueueObj->Id);
+%	while (my $Group = $Groups->Next()) {
+  <TR ALIGN=RIGHT> 
+	<TD VALIGN=TOP>
+	    <% loc($Group->Type) %>
+		  </TD>
+	  <TD>
+	    <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId,
+        Object => $QueueObj  &>
+	  </TD>
+	</TR>
+% }
+</TABLE>
+<h1><&|/l&>User defined groups</&></h1>
+<TABLE>
+% $Groups = RT::Groups->new($session{'CurrentUser'});
+% $Groups->LimitToUserDefinedGroups();    
+%	while (my $Group = $Groups->Next()) {
+  <TR ALIGN=RIGHT> 
+	<TD VALIGN=TOP>
+	    <% $Group->Name %>
+		  </TD>
+	  <TD>
+	    <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId,
+        Object => $QueueObj  &>
+	  </TD>
+	</TR>
+% }
+</TABLE>
+            
+      <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+      
+  </FORM>
+  
+<%INIT>
+ 
+  #Update the acls.
+  my @results =  ProcessACLChanges(\%ARGS);
+
+
+if (!defined $id) {
+    Abort(loc("No Queue defined"));
+}
+
+my $QueueObj = RT::Queue->new($session{'CurrentUser'});
+$QueueObj->Load($id) || Abort(loc("Couldn't load queue [_1]",$id));
+
+my $Groups;
+my $current_tab;
+$current_tab = 'Admin/Queues/GroupRights.html?id='.$QueueObj->id;
+    
+</%INIT>
+
+<%ARGS>
+$id => undef
+</%ARGS>
diff --git a/rt/html/Admin/Queues/Modify.html b/rt/html/Admin/Queues/Modify.html
new file mode 100644
index 000000000..46608eba6
--- /dev/null
+++ b/rt/html/Admin/Queues/Modify.html
@@ -0,0 +1,163 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => loc('Admin/Queue/Basics') &>
+<& /Admin/Elements/QueueTabs, id => $QueueObj->id, 
+    QueueObj => $QueueObj,
+    current_tab => $current_tab, 
+    Title => loc('Admin/Queue/Basics') &>
+<& /Elements/ListActions, actions => \@results &>
+
+
+
+<FORM ACTION="<%$RT::WebPath%>/Admin/Queues/Modify.html" METHOD=POST>
+%if ($Create ) { 
+<INPUT TYPE=HIDDEN NAME=id VALUE="new">
+% } else {
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$QueueObj->Id%>">
+% }
+
+<TABLE>
+<TR><TD ALIGN=RIGHT>
+<&|/l&>Queue Name</&>: 
+</TD>
+<TD><INPUT name="Name" value="<% ($Create) ? "" : $QueueObj->Name %>"></TD>
+</TR><TR>
+<TD ALIGN=RIGHT>
+<&|/l&>Description</&>:</TD><TD COLSPAN=3><INPUT name="Description" value="<% ($Create) ? "" : $QueueObj->Description %>" size=60></TD></TR>
+<TR>
+<TD ALIGN=RIGHT>
+<&|/l&>Correspondence Address</&>:
+</TD><TD>
+<INPUT name="CorrespondAddress" value="<% ($Create) ? "" : $QueueObj->CorrespondAddress %>">
+<BR><font size="-1"><i><&|/l , $RT::CorrespondAddress&>(If left blank, will default to [_1]</&></i></font>
+</TD>
+<TD ALIGN=RIGHT>
+
+<&|/l&>Comment Address</&>: </TD><TD>
+<INPUT NAME="CommentAddress" value="<% ($Create) ? "" : $QueueObj->CommentAddress %>">
+<BR><font size="-1"><i><&|/l , $RT::CommentAddress&>(If left blank, will default to [_1]</&></i></font>
+</TD>
+</TR><TR>
+
+<TD ALIGN=RIGHT>
+<&|/l&>Priority starts at</&>: 
+</TD><TD><INPUT NAME="InitialPriority" value="<% ($Create) ? "" : $QueueObj->InitialPriority %>">
+</TD>
+<TD ALIGN=RIGHT>
+<&|/l&>Over time, priority moves toward</&>:
+</TD><TD><INPUT NAME="FinalPriority" value="<% ($Create) ? "" : $QueueObj->FinalPriority %>">
+</TD>
+</TR>
+<TR>
+<TD ALIGN=RIGHT>
+<&|/l&>Requests should be due in</&>:
+</TD><TD>
+<INPUT NAME="DefaultDueIn" VALUE="<% ($Create) ? "" : $QueueObj->DefaultDueIn%>"> <&|/l&>days</&>.
+</TD>
+</TR>
+<TR>
+<TD>
+</TD>
+<TD COLSPAN=4><INPUT TYPE=HIDDEN NAME="SetEnabled" VALUE="1">
+<INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>> <&|/l&>Enabled (Unchecking this box disables this queue)</&><BR>
+<& /Elements/Callback, QueueObj => $QueueObj, results => \@results, %ARGS &>
+</TD>
+</TR>
+
+</TABLE>
+<& /Elements/Submit &>
+</form>
+
+
+
+<%INIT>
+my $current_tab;
+my $QueueObj = new RT::Queue($session{'CurrentUser'});
+$QueueObj->Load($id);
+my  ($title, @results, $Disabled, $EnabledChecked);
+$EnabledChecked = "CHECKED";
+
+if ($Create) {
+    $current_tab = 'Admin/Queues/Modify.html?Create=1';
+    $title = loc("Create a queue");
+} else {
+    if ($id eq 'new') {
+       my ($val, $msg) =  $QueueObj->Create(Name => $Name);
+       delete $session{'create_in_queues'};
+       if ($val == 0 ) {
+           Abort("$msg");
+	}
+	else {
+		push @results, $msg;
+	}    
+     }
+     else {
+        $QueueObj->Load($id) || $QueueObj->Load($Name) || Abort("Couldn't load queue '$Name'");
+    }
+        $title = loc('Editing Configuration for queue [_1]', $QueueObj->Name);
+    
+    $current_tab = 'Admin/Queues/Modify.html?id='.$QueueObj->id;
+}
+if ($QueueObj->Id()) {
+    delete $session{'create_in_queues'};
+my @attribs= qw(Description CorrespondAddress CommentAddress Name 
+                InitialPriority FinalPriority DefaultDueIn);
+
+  @results = UpdateRecordObject( AttributesRef => \@attribs, 
+				    Object => $QueueObj, 
+				    ARGSRef => \%ARGS);
+
+  #we're asking about enabled on the web page but really care about disabled.
+  if ($Enabled == 1) {
+      $Disabled = 0;
+  }	
+  else {
+      $Disabled = 1;
+  }
+  if  ( ($SetEnabled) and ( $Disabled != $QueueObj->Disabled) ) { 
+      my  ($code, $msg) = $QueueObj->SetDisabled($Disabled);
+      push @results, loc('Enabled status [_1]', loc_fuzzy($msg));
+  }
+  
+  if ($QueueObj->Disabled()) {
+      $EnabledChecked ="";
+  }
+}
+</%INIT>
+
+
+<%ARGS>
+$id => undef
+$result => undef
+$Name => undef
+$Create => undef
+$Description => undef
+$CorrespondAddress => undef
+$CommentAddress => undef
+$InitialPriority => undef
+$FinalPriority => undef
+$DefaultDueIn => undef
+$SetEnabled => undef
+$Enabled => undef
+</%ARGS>
diff --git a/rt/html/Admin/Queues/People.html b/rt/html/Admin/Queues/People.html
new file mode 100644
index 000000000..e0a7345c0
--- /dev/null
+++ b/rt/html/Admin/Queues/People.html
@@ -0,0 +1,186 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => loc('Modify people related to queue [_1]', $QueueObj->Name) &>
+<& /Admin/Elements/QueueTabs, id => $id, 
+    QueueObj => $QueueObj,                                                      
+    current_tab => $current_tab, 
+    Title => loc('Modify people related to queue [_1]', $QueueObj->Name) &>
+
+<& /Elements/ListActions, actions => \@results &>
+
+ 
+<FORM METHOD=POST ACTION="People.html">
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$QueueObj->Id%>">
+
+<TABLE WIDTH=100%>
+<TR>
+<TD VALIGN=TOP >
+
+<h3><&|/l&>Current watchers</&></h3>
+
+
+<&|/l&>Cc</&>:
+
+<& /Admin/Elements/EditQueueWatchers, QueueObj => $QueueObj, Watchers => $QueueObj->Cc &>
+
+<&|/l&>Administrative Cc</&>:
+
+<& /Admin/Elements/EditQueueWatchers, QueueObj => $QueueObj, Watchers => $QueueObj->AdminCc &>
+
+
+</TD>
+<TD VALIGN=TOP>
+<h3><&|/l&>New watchers</&></h3>
+
+<&|/l&>Find people whose</&><BR>
+<& /Elements/SelectUsers &>
+<input type=submit name="OnlySearchForPeople" value="<&|/l&>Go!</&>">
+<BR>
+<&|/l&>Find group whose</&><BR>
+<& /Elements/SelectGroups &>
+<input type=submit name="OnlySearchForGroup" value="<&|/l&>Go!</&>">
+
+<p>
+<&|/l&>Add new watchers</&>:<br>
+<p>
+<b><&|/l&>Users</&></b>
+% if ($user_msg) {
+<br>
+<i><%$user_msg%></i>
+% } elsif ($Users) {
+<ul>
+% while (my $u = $Users->Next ) {
+<li><&/Elements/SelectWatcherType, Scope=>'queue', Name =>
+"Queue-AddWatcher-Principal-".$u->PrincipalId &> <%$u->Name%>
+(<%$u->RealName%>)
+% }
+</ul>
+% }
+
+<p>
+<b><&|/l&>Groups</&></b>
+
+% if ($group_msg) {
+<br>
+<i><%$group_msg%></i>
+% } elsif ($Groups) {
+<ul>
+% while (my $g = $Groups->Next ) {
+<li><&/Elements/SelectWatcherType, Scope=>'queue', Name =>
+"Queue-AddWatcher-Principal-".$g->PrincipalId &> <%$g->Name%>
+(<%$g->Description%>)
+% }
+</ul>
+% }
+
+</TD>
+</TR>
+</TABLE>
+
+
+
+
+<& /Elements/Submit, Label => loc('Save Changes'), Caption => loc("If you've updated anything above, be sure to"), Reset => 1 &>
+</form>
+
+<%INIT>
+
+my $current_tab;
+my ($field, @results, $User, $Users, $Groups, $watcher, $user_msg, $group_msg);
+
+# {{{ Load the queue
+#If we get handed two ids, mason will make them an array. bleck.
+# We want teh first one. Just because there's no other sensible way
+# to deal
+
+
+
+my $QueueObj = new RT::Queue($session{'CurrentUser'});
+$QueueObj->Load($id) || Abort(loc("Couldn't load queue", $id));
+# }}}
+
+# {{{ Delete deletable watchers
+
+foreach my $key (keys %ARGS) {
+        my $id = $QueueObj->Id;
+
+    if (($key =~ /^Queue-$id-DelWatcher-Type-(.*?)-Principal-(\d*)$/)) {;
+	    my ($code, $msg) = $QueueObj->DeleteWatcher(Type => $1,
+                                                    PrincipalId => $2);
+	    push @results, $msg;
+    }
+}
+# }}}
+
+# {{{ Add new watchers
+foreach my  $key (keys %ARGS) {
+    #They're in this order because otherwise $1 gets clobbered :/
+    if ( ($ARGS{$key} =~ /^(AdminCc|Cc)$/) and
+	 ($key =~ /^Queue-AddWatcher-Principal-(\d*)$/) ) {
+	$RT::Logger->debug("Adding a watcher $1 to ".$ARGS{$key}."\n");
+	my ($code, $msg) = $QueueObj->AddWatcher(Type => $ARGS{$key},
+				                             PrincipalId => $1);
+	push @results, $msg;
+    }
+}
+
+# }}}
+
+ 
+
+if (!length $ARGS{'UserString'}) {
+$user_msg = loc("No principals selected.");
+ }
+else {
+    $Users = new RT::Users($session{'CurrentUser'});
+    $Users->Limit(FIELD => $ARGS{'UserField'},
+                 VALUE => $ARGS{'UserString'},
+                 OPERATOR => $ARGS{'UserOp'});
+     }
+
+if (!length $ARGS{'GroupString'}) {
+$group_msg = loc("No principals selected.");
+ }
+else {
+$Groups = new RT::Groups($session{'CurrentUser'});
+$Groups->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => 'UserDefined');
+$Groups->Limit(FIELD => $ARGS{'GroupField'},
+		VALUE => $ARGS{'GroupString'},
+		OPERATOR => $ARGS{'GroupOp'});
+     }
+
+$current_tab = 'Admin/Queues/People.html?id='.$QueueObj->id;
+</%INIT>
+
+<%ARGS>
+$UserField => 'Name'
+$UserOp => '='
+$UserString => undef
+$GroupField => 'Name'
+$GroupOp => '='
+$GroupString => undef
+$Type => undef
+$id => undef
+</%ARGS>
+
diff --git a/rt/html/Admin/Queues/Scrip.html b/rt/html/Admin/Queues/Scrip.html
new file mode 100644
index 000000000..edbfcd66b
--- /dev/null
+++ b/rt/html/Admin/Queues/Scrip.html
@@ -0,0 +1,67 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => $title &>
+<& /Admin/Elements/QueueTabs, id => $QueueObj->Id, 
+    QueueObj => $QueueObj,                                                      
+    current_tab => 'Admin/Queues/Scrips.html?id='.$QueueObj->id, 
+    current_subtab => $current_subtab, 
+    subtabs => $subtabs, 
+    Title => $title &>
+
+<& /Admin/Elements/EditScrip, title => $title,  %ARGS &>
+<%init>
+my $QueueObj = new RT::Queue($session{'CurrentUser'});
+$QueueObj->Load($Queue);
+
+my ($title, $current_subtab);
+my $subtabs = {                                                                               
+     A => { title => loc('Select scrip'),                                                     
+            path => "Admin/Queues/Scrips.html?id=".$QueueObj->id,
+               },                                                                             
+     B => { title => loc('New scrip'),                                                        
+            path => "Admin/Queues/Scrip.html?create=1&Queue=".$QueueObj->id,
+            separator => 1,                                                                   
+               }, 
+          };   
+
+unless($QueueObj->id) {
+    Abort(loc("Queue [_1] not found",$id));
+}
+if ($id) {
+    $current_subtab = "Admin/Queues/Scrip.html?id=".$id."&Queue=".$QueueObj->id;
+    $title = loc("Modify a scrip for queue [_1]", $QueueObj->Name);
+    $subtabs->{"C"} = { title => loc("Scrip #[_1]",$QueueObj->id),
+			path => "Admin/Queues/Scrip.html?id=$id&Queue=".$QueueObj->id };
+} else {
+    $current_subtab = "Admin/Queues/Scrip.html?create=1&Queue=".$QueueObj->id;
+    $title = loc("Create a scrip for queue [_1]", $QueueObj->Name);
+}
+                                                                                             
+
+</%init>
+
+<%ARGS>
+$id => undef  
+$Queue => undef
+</%ARGS>
diff --git a/rt/html/Admin/Queues/Scrips.html b/rt/html/Admin/Queues/Scrips.html
new file mode 100644
index 000000000..60b28314f
--- /dev/null
+++ b/rt/html/Admin/Queues/Scrips.html
@@ -0,0 +1,63 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => $title &>
+<& /Admin/Elements/QueueTabs, id => $QueueObj->id, 
+    QueueObj => $QueueObj,                                                      
+    current_tab => 'Admin/Queues/Scrips.html?id='.$id, 
+    current_subtab => 'Admin/Queues/Scrips.html?id='.$id, 
+    subtabs => $subtabs, 
+    Title => $title &>
+
+% if (!$QueueObj->Disabled) { # Global scrips does not apply to disabled queues
+<h2><&|/l&>Scrips which apply to all queues</&></h2>
+<& /Admin/Elements/ListGlobalScrips &>
+<BR> 
+% }
+<& /Admin/Elements/EditScrips, title => $title, %ARGS &>
+<%init>
+my $QueueObj = new RT::Queue($session{'CurrentUser'});
+$QueueObj->Load($id);
+
+my $title;
+
+if ($QueueObj->id) {
+    $title = loc("Modify scrips for queue [_1]", $QueueObj->Name);
+} else {
+    Abort(loc("Queue [_1] not found",$id));
+}
+
+my $subtabs = {
+	 A => { title => loc('Select scrip'),
+	     	path => "Admin/Queues/Scrips.html?id=".$id,
+			   },
+	 B => { title => loc('New scrip'),
+	     	path => "Admin/Queues/Scrip.html?create=1&Queue=".$id,
+            separator => 1,
+			   }
+	      };
+</%init>
+
+<%ARGS>
+$id => undef         #some identifier that a Queue could 
+</%ARGS>
diff --git a/rt/html/Admin/Queues/Template.html b/rt/html/Admin/Queues/Template.html
new file mode 100644
index 000000000..994de6108
--- /dev/null
+++ b/rt/html/Admin/Queues/Template.html
@@ -0,0 +1,101 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => $title &>
+<& /Admin/Elements/QueueTabs, id => $Queue, 
+    QueueObj => $TemplateObj->QueueObj,
+     current_tab => 'Admin/Queues/Templates.html?id='.$Queue,
+     current_subtab => $current_subtab, 
+     subtabs => $subtabs, 
+     Title => $title &>
+<& /Elements/ListActions, actions => \@results &>
+
+<FORM METHOD=POST ACTION="Template.html">
+%if ($Create ) {
+<INPUT TYPE=HIDDEN NAME="Template" VALUE="new">
+% } else {
+<INPUT TYPE=HIDDEN NAME="Template" VALUE="<%$TemplateObj->Id%>">
+% }
+
+%# hang onto the queue id
+<INPUT TYPE=HIDDEN name="Queue" value="<%$Queue%>">
+<& /Admin/Elements/ModifyTemplate, Name => $TemplateObj->Name, Description =>
+$TemplateObj->Description, Content => $TemplateObj->Content &> 
+<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+</FORM>
+
+
+<%INIT>
+
+my $TemplateObj = new RT::Template($session{'CurrentUser'});
+my  ($title, @results, $current_subtab);
+
+my $subtabs = {
+		 A => { title => loc('Select template'),
+  		     	path => "Admin/Queues/Templates.html?id=$Queue"
+			   },
+		 B => { title => loc('New template'),
+  		     	path => "Admin/Queues/Template.html?Create=1&Queue=$Queue",
+			separator => 1,
+			   }
+	      };
+
+if ($Create) {
+  $title = loc("Create a template");
+  $current_subtab = "Admin/Queues/Template.html?create=1&Queue=".$Queue;
+}
+
+else {
+  if ($Template eq 'new') {
+      my ($val, $msg) =  $TemplateObj->Create(Queue => $Queue, Name => $Name);
+      Abort(loc("Could not create template: [_1]", $msg)) unless ($val);
+     push @results, $msg;
+    }
+    else {
+       $TemplateObj->Load($Template) || Abort(loc('No Template'));
+    }
+     $title = loc('Modify template [_1]', loc($TemplateObj->Name())); 
+  
+    
+}
+if ($TemplateObj->Id()) {
+  $Queue = $TemplateObj->Queue;
+
+  my @attribs = qw( Description Content Queue Name);
+  my @aresults = UpdateRecordObject( AttributesRef => \@attribs, 
+				     Object => $TemplateObj, 
+				     ARGSRef => \%ARGS);
+  $current_subtab = "Admin/Queues/Template.html?Queue=$Queue&Template=".$TemplateObj->Id();
+  $subtabs->{"C"} = { title => loc('Template #[_1]', $TemplateObj->Id()),
+  		     	path => "Admin/Queues/Template.html?Queue=$Queue&Template=".$TemplateObj->Id(),
+			};
+  push @results, @aresults;
+}
+
+</%INIT>
+<%ARGS>
+$Queue => undef
+$Template => undef
+$Create => undef
+$Name => undef
+</%ARGS>
diff --git a/rt/html/Admin/Queues/Templates.html b/rt/html/Admin/Queues/Templates.html
new file mode 100644
index 000000000..98bdf24c0
--- /dev/null
+++ b/rt/html/Admin/Queues/Templates.html
@@ -0,0 +1,57 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => $title &>
+<& /Admin/Elements/QueueTabs, id => $QueueObj->id, 
+    current_tab => 'Admin/Queues/Templates.html?id='.$id, 
+    current_subtab => 'Admin/Queues/Templates.html?id='.$id, 
+        QueueObj => $QueueObj,
+    subtabs => $subtabs, 
+    Title => $title &>
+
+<& /Admin/Elements/EditTemplates, title => $title, %ARGS &>
+
+<%INIT>
+my $QueueObj = new RT::Queue($session{'CurrentUser'});
+$QueueObj->Load($id);
+
+my ($title, $current_subtab);
+
+if ($QueueObj->id) {
+    $title = loc("Edit Templates for queue [_1]", $QueueObj->Name);
+} else {
+    Abort(loc("Queue [_1] not found",$id));
+}
+my $subtabs = {
+	 A => { title => loc('Select template'),
+	     	path => "Admin/Queues/Templates.html?id=".$id,
+		   },
+	 B => { title => loc('New template'),
+	     	path => "Admin/Queues/Template.html?Create=1&Queue=".$id,
+		   }
+	      };
+
+</%INIT>
+<%ARGS>
+$id => undef         #some identifier that a Queue could 
+</%ARGS>
diff --git a/rt/html/Admin/Queues/UserRights.html b/rt/html/Admin/Queues/UserRights.html
new file mode 100644
index 000000000..aeb55c70b
--- /dev/null
+++ b/rt/html/Admin/Queues/UserRights.html
@@ -0,0 +1,90 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => loc('Modify user rights for queue [_1]', $QueueObj->Name) &>
+<& /Admin/Elements/QueueTabs, id => $id,
+    QueueObj => $QueueObj,                                                      
+    current_tab => $current_tab, 
+    Title => loc('Modify user rights for queue [_1]', $QueueObj->Name) &>
+<& /Elements/ListActions, actions => \@results &>
+
+  <FORM METHOD=POST ACTION="UserRights.html">
+    <INPUT TYPE=HIDDEN NAME=id VALUE="<% $QueueObj->id %>">
+      
+      
+<TABLE>
+<& /Elements/Callback, QueueObj => $QueueObj, results => \@results, %ARGS &>
+%	while (my $Member = $Users->Next()) {
+% my $UserObj = $Member->MemberObj->Object();
+% my $group = RT::Group->new($session{'CurrentUser'});
+% $group->LoadACLEquivalenceGroup($Member->MemberObj);
+  <TR ALIGN=RIGHT> 
+	<TD VALIGN=TOP>
+	    <% $UserObj->Name %>
+		  </TD>
+	  <TD>
+	    <& /Admin/Elements/SelectRights, PrincipalId=> $group->PrincipalId,
+        Object => $QueueObj  &>
+	  </TD>
+	</TR>
+% }
+      </TABLE>
+            
+      <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+      
+  </FORM>
+  
+<%INIT>
+ 
+  #Update the acls.
+  my @results =  ProcessACLChanges(\%ARGS);
+
+# {{{ Deal with setting up the display of current rights.
+
+
+
+if (!defined $id) {
+    Abort(loc("No Queue defined"));
+}
+
+my $QueueObj = RT::Queue->new($session{'CurrentUser'});
+$QueueObj->Load($id) || Abort(loc("Couldn't load queue [_1]",$id));
+
+# Find out which users we want to display ACL selects for
+my $Privileged = RT::Group->new($session{'CurrentUser'});
+$Privileged->LoadSystemInternalGroup('Privileged');
+my $Users = $Privileged->MembersObj();
+
+    
+  
+# }}}
+my $current_tab;
+$current_tab = 'Admin/Queues/UserRights.html?id='.$QueueObj->id;
+</%INIT>
+
+<%ARGS>
+$id => undef
+$UserString => undef
+$UserOp => undef
+$UserField => undef
+</%ARGS>
diff --git a/rt/html/Admin/Queues/index.html b/rt/html/Admin/Queues/index.html
new file mode 100644
index 000000000..f733c25d8
--- /dev/null
+++ b/rt/html/Admin/Queues/index.html
@@ -0,0 +1,61 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => loc("Admin queues") &>
+<& /Admin/Elements/QueueTabs, current_tab => 'Admin/Queues/', 
+    current_subtab => 'Admin/Queues/', 
+    Title => loc("Admin queues") &>
+
+
+
+<%$caption%>:<BR>
+<UL>
+%if ($queues->Count == 0) {
+<LI> <i><&|/l&>No queues matching search criteria found.</&></i>
+% }
+%while ( $queue = $queues->Next) {
+<LI><A HREF="Modify.html?id=<%$queue->id%>"><%$queue->Name%></a></LI>
+%}
+</UL>
+<BR>
+<FORM METHOD=POST ACTION="<% $RT::WebPath %>/Admin/Queues/">
+<input type="checkbox" name="FindDisabledQueues"> <&|/l&>Include disabled queues in listing.</&>
+<div align=right><input type=submit value="<&|/l&>Go!</&>"></div> 
+</FORM>
+
+<%INIT>
+my ($queue, $caption);
+my $queues = new RT::Queues($session{'CurrentUser'});
+$queues->UnLimit();
+
+if ($FindDisabledQueues) {
+        $caption = loc("All Queues");
+        $queues->{'find_disabled_rows'} = 1;
+} else {
+    $caption = loc("Enabled Queues");
+}
+
+</%INIT>
+<%ARGS>
+$FindDisabledQueues => 0
+</%ARGS>
diff --git a/rt/html/Admin/Users/Modify.html b/rt/html/Admin/Users/Modify.html
new file mode 100644
index 000000000..370c2e82d
--- /dev/null
+++ b/rt/html/Admin/Users/Modify.html
@@ -0,0 +1,347 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => $title  &>
+<& /Admin/Elements/UserTabs, 
+    id => $id, 
+    UserObj => $UserObj,
+    current_subtab => $current_tab, 
+    Title => $title &>
+
+<& /Elements/ListActions, actions => \@results &>
+
+<FORM ACTION="<%$RT::WebPath%>/Admin/Users/Modify.html" METHOD=POST>
+%if ($Create) {
+<INPUT TYPE=HIDDEN NAME=id VALUE="new">
+% } else {
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$UserObj->Id%>">
+% }
+<TABLE WIDTH=100% BORDER=0>
+<TR>
+
+<TD VALIGN=TOP ROWSPAN=2>
+<& /Elements/TitleBoxStart, title => loc('Identity') &>
+
+<TABLE>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>Username</&>:
+</TD><TD>
+<input name="Name" value="<%$UserObj->Name%>"> <b><&|/l&>(required)</&></b>
+</TD></TR>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>Email</&>:
+</TD><TD>
+<input name="EmailAddress" value="<%$UserObj->EmailAddress%>">
+</TD></TR>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>Real Name</&>: 
+</TD><TD>
+<input name="RealName" value="<%$UserObj->RealName%>">
+</TD></TR>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>Nickname</&>: 
+</TD><TD>
+<input name="NickName" value="<%$UserObj->NickName%>">
+</TD></TR>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>Unix login</&>: 
+</TD><TD>
+<input name="Gecos" value="<%$UserObj->Gecos%>">
+</TD></TR>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>Extra info</&>: 
+</TD><TD>
+<textarea name="FreeformContactInfo" cols=20 rows=5><%$UserObj->FreeformContactInfo%></TEXTAREA>
+</TD></TR>
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+<br>
+<& /Elements/TitleBoxStart, title => loc('Access control') &>
+<INPUT TYPE=HIDDEN NAME="SetEnabled" VALUE="1">
+<INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>>
+<&|/l&>Let this user access RT</&><BR>
+
+
+<INPUT TYPE=HIDDEN NAME="SetPrivileged" VALUE="1">
+<INPUT TYPE=CHECKBOX NAME="Privileged" VALUE="1" <%$PrivilegedChecked%>> <&|/l&>Let this user be granted rights</&><BR>
+		    
+% unless ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth) {
+<TABLE>
+<TR>
+<TD ALIGN=RIGHT>
+<&|/l&>New Password</&>:
+</TD>
+<TD ALIGN=LEFT>
+<input type=password name="Pass1">
+</TD>
+</TR>
+<TR><TD ALIGN=RIGHT>
+<&|/l&>Retype Password</&>:
+</TD>
+<TD>
+<input type=password name="Pass2">
+</TD>
+</TR>
+</TABLE>
+% }
+<& /Elements/TitleBoxEnd &>
+</TD>
+</TR>
+<TR>
+
+<TD VALIGN=TOP>
+<& /Elements/TitleBoxStart, title => loc('Location') &>
+<TABLE>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>Organization</&>: 
+</TD><TD>
+<input name="Organization" value="<%$UserObj->Organization%>">
+</TD></TR>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>Address1</&>: 
+</TD><TD>
+<input name="Address1" value="<%$UserObj->Address1%>">
+</TD></TR>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>Address2</&>: 
+</TD><TD>
+<input name="Address2" value="<%$UserObj->Address2%>">
+</TD></TR>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>City</&>: 
+</TD><TD>
+<input name="City" value="<%$UserObj->City%>" size=14>
+
+</TD></TR>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>State</&>: 
+</TD><TD>
+<input name="State" value="<%$UserObj->State%>" size=3>
+
+</TD></TR>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>Zip</&>: 
+</TD><TD>
+<input name="Zip" value="<%$UserObj->Zip%>" size=9>
+</TD></TR>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>Country</&>: 
+</TD><TD>
+<input name="Country" value="<%$UserObj->Country%>">
+</TD></TR>
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+<br>
+<& /Elements/TitleBoxStart, title => loc('Phone numbers') &>
+<TABLE>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>Residence</&>: 
+</TD><TD>
+<input name="HomePhone" value="<%$UserObj->HomePhone%>" size=13><br>
+</TD></TR>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>Work</&>: 
+</TD><TD>
+<input name="WorkPhone" value="<%$UserObj->WorkPhone%>" size=13><br>
+</TD></TR>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>Mobile</&>: 
+</TD><TD>
+<input name="MobilePhone" value="<%$UserObj->MobilePhone%>" size=13><br>
+</TD></TR>
+<TR><TD ALIGN="RIGHT">
+<&|/l&>Pager</&>: 
+</TD><TD>
+<input name="PagerPhone" value="<%$UserObj->PagerPhone%>" size=13><br>
+<& /Elements/TitleBoxEnd &>
+</TD>
+
+<TR>
+</TR>
+</TABLE>
+<TR>
+<TD colspan="2">
+<& /Elements/TitleBoxStart, title => loc('Comments about this user') &>
+<TEXTAREA name="Comments" COLS=80 ROWS=5 WRAP=VIRTUAL><%$UserObj->Comments%>
+</TEXTAREA>
+<& /Elements/TitleBoxEnd &>
+%if ($UserObj->Privileged) {
+<BR>
+<& /Elements/TitleBoxStart, title => loc('Signature') &>
+<TEXTAREA COLS=80 ROWS=5 name="Signature" WRAP=HARD>
+<%$UserObj->Signature%></TEXTAREA>
+<& /Elements/TitleBoxEnd &>
+% }
+
+</TD>
+</TR>
+</TABLE>
+
+<& /Elements/Submit &>
+</form>
+
+<%INIT>
+
+my $current_tab;
+my $UserObj = new RT::User($session{'CurrentUser'});
+my ($title, $PrivilegedChecked, $EnabledChecked, $Disabled, $result, @results);
+
+my ($val, $msg);
+
+if ($Create) {
+    $current_tab = 'Admin/Users/Modify.html?Create=1';
+    $title = loc("Create a new user");
+} 
+else {
+
+    $current_tab = 'Admin/Users/Modify.html?id='.$id;
+    if ($id eq 'new') {
+	($val, $msg) = $UserObj->Create( Name => $Name,
+					 EmailAddress => $ARGS{'EmailAddress'}
+				       );
+	if ($val) {
+		push @results, $msg;
+	} else {
+		push @results, loc('User could not be created: [_1]', $msg);
+	}	
+	
+    }
+    else {
+	$UserObj->Load($id) || $UserObj->Load($Name) || Abort("Couldn't load user '$Name'");
+	$val = $UserObj->Id();
+    }
+
+    if ($val) {
+	$title = loc("Modify the user [_1]", $UserObj->Name);
+    }	
+
+    # If the create failed
+    else {
+	$title = loc("Create a new user");
+	$Create = 1;
+    }    
+
+    
+
+}
+
+
+
+
+# If we have a user to modify, lets try. 
+if ($UserObj->Id) {
+    
+    my @fields = qw(Name Comments Signature EmailAddress FreeformContactInfo 
+		    Organization RealName NickName Lang EmailEncoding WebEncoding 
+		    ExternalContactInfoId ContactInfoSystem Gecos ExternalAuthId 
+		    AuthSystem HomePhone WorkPhone MobilePhone PagerPhone Address1
+		Address2 City State Zip Country 
+		   );
+    
+    my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
+					    Object => $UserObj,
+					    ARGSRef => \%ARGS );
+    push (@results,@fieldresults);
+
+
+# {{{ Deal with special fields: Privileged, Enabled and Password
+if  ( ($SetPrivileged) and ( $Privileged != $UserObj->Privileged) ) {
+my  ($code, $msg) = $UserObj->SetPrivileged($Privileged);
+     push @results, loc('Privileged status: [_1]', loc_fuzzy($msg));
+}
+
+#we're asking about enabled on the web page but really care about disabled.
+if ($Enabled == 1) {
+    $Disabled = 0;
+}	
+else {
+    $Disabled = 1;
+}
+if  ( ($SetEnabled) and ( $Disabled != $UserObj->Disabled) ) { 
+    my  ($code, $msg) = $UserObj->SetDisabled($Disabled);
+    push @results, loc('Enabled status [_1]', loc_fuzzy($msg));
+}
+
+
+#TODO: make this report errors properly
+if ((defined $Pass1) and ($Pass1 ne '') and ($Pass1 eq $Pass2) and (!$UserObj->IsPassword($Pass1))) {
+    my ($code, $msg);
+    ($code, $msg) = $UserObj->SetPassword($Pass1);
+    push @results, loc('Password: [_1]', loc_fuzzy($msg));
+} elsif ( $Pass1 && ($Pass1 ne $Pass2)) {
+    push @results, loc("Passwords do not match.");
+}
+
+# }}}
+}
+
+
+# {{{ Do some setup for the ui
+unless ($UserObj->Disabled()) {
+    $EnabledChecked ="CHECKED";
+}
+
+if ($UserObj->Privileged()) {  
+    $PrivilegedChecked = "CHECKED";
+}
+
+# }}}
+</%INIT>
+
+
+<%ARGS>
+$id => undef
+$Name  => undef
+$Comments  => undef
+$Signature  => undef
+$EmailAddress  => undef
+$FreeformContactInfo => undef
+$Organization  => undef
+$RealName  => undef
+$NickName  => undef
+$Privileged => undef
+$SetPrivileged => undef
+$Enabled => undef
+$SetEnabled => undef
+$Lang  => undef
+$EmailEncoding  => undef
+$WebEncoding => undef
+$ExternalContactInfoId  => undef
+$ContactInfoSystem  => undef
+$Gecos => undef
+$ExternalAuthId  => undef
+$AuthSystem  => undef
+$HomePhone => undef
+$WorkPhone  => undef
+$MobilePhone  => undef
+$PagerPhone  => undef
+$Address1 => undef
+$Address2  => undef
+$City  => undef
+$State  => undef
+$Zip  => undef
+$Country => undef
+$Pass1 => undef
+$Pass2=> undef
+$Create=> undef
+</%ARGS>
diff --git a/rt/html/Admin/Users/Prefs.html b/rt/html/Admin/Users/Prefs.html
new file mode 100644
index 000000000..0bba9fadd
--- /dev/null
+++ b/rt/html/Admin/Users/Prefs.html
@@ -0,0 +1,122 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => loc("User view") &>
+
+<& /Elements/ViewUser, User=>$u &>
+
+<h2 class="title"><%loc("User view")%></h2>
+
+%if ($session{CurrentUser} && ($session{CurrentUser}->Id == $id)) {
+	<& /Elements/TitleBoxStart, title => loc('Signature')  &>
+<form method=post>
+<input type="hidden" name="id" value=<%$id%>>
+<TEXTAREA COLS=72 ROWS=4 WRAP=HARD NAME="Signature"><% $u->Signature %></TEXTAREA><br><br>
+<input type="submit" value="<&|/l&>Update signature</&>">
+</form>
+	  <& /Elements/TitleBoxEnd &>
+	  <form method=post>
+	  <&|/l&>Open tickets (from listing) in another window</&>: <input type="checkbox" name="NewWindowOption" <%exists $session{NewWindowOption} && "CHECKED"%>><br>
+	  <&|/l&>Open tickets (from listing) in a new window</&>: <input type="checkbox" name="AlwaysNewWindowOption" <%exists $session{AlwaysNewWindowOption} && "CHECKED"%>><br>
+	  <input type="submit" name="NewWindowSetting" value="<&|/l&>New window setting</&>">
+	  </form>
+%}
+
+	<& /Elements/TitleBoxStart, title => loc('Email')  &>
+<form method=post>
+<input type="hidden" name="id" value="<%$id%>">
+<input name="Email" value="<% $u->EmailAddress %>"><input type="submit" value="<&|/l&>Update email</&>">
+</form>
+	  <& /Elements/TitleBoxEnd &>
+	<& /Elements/TitleBoxStart, title => loc('Real Name')  &>
+<form method=post>
+<input type="hidden" name="id" value="<%$id%>">
+<input name="RealName" value="<% $u->RealName %>"><input type="submit" value="<&|/l&>Update name</&>">
+</form>
+	  <& /Elements/TitleBoxEnd &>
+
+	<& /Elements/TitleBoxStart, title => loc('User ID')  &>
+<form method=post>
+<input type="hidden" name="id" value="<%$id%>">
+<input name="Name" value="<% $u->Name %>"><input type="submit" value="<&|/l&>Update ID</&>">
+</form>
+	  <& /Elements/TitleBoxEnd &>
+
+%# TODO: alternative email addresses + merging users
+
+<%ARGS>
+$id => $session{CurrentUser} ? $session{CurrentUser}->Id : 0
+$Signature => undef
+$Email => undef
+$RealName => undef
+$Name => undef
+</%ARGS>
+
+<%INIT>
+require RT::User;
+my $u=RT::User->new($session{CurrentUser});
+$u->Load($id) || die loc("Couldn't load that user ([_1])", $id);
+if ($Signature) {
+my ($val, $msg)=$u->SetSignature($Signature);
+$RT::Logger->log(level=>($val ? 'info' : 'error'), message=>$msg);
+}
+
+if ($Email) {
+my ($val, $msg)=$u->SetEmailAddress($Email);
+$RT::Logger->log(level=>($val ? 'info' : 'error'), message=>$msg);
+}
+
+if ($RealName) {
+my ($val, $msg)=$u->SetRealName($RealName);
+$RT::Logger->log(level=>($val ? 'info' : 'error'), message=>$msg);
+}
+
+if ($Name) {
+my ($val, $msg)=$u->SetName($Name);
+$RT::Logger->log(level=>($val ? 'info' : 'error'), message=>$msg);
+}
+
+if ($ARGS{NewWindowSetting}) {
+if ($ARGS{NewWindowOption}) {
+$session{NewWindowOption}=1;
+} else {
+delete $session{NewWindowOption};
+}
+if ($ARGS{AlwaysNewWindowOption}) {
+$session{NewWindowOption}=1;
+$session{AlwaysNewWindowOption}=1;
+} else {
+delete $session{AlwaysNewWindowOption};
+}
+}
+
+</%INIT>
+
+
+
+
+
+
+
+
+
diff --git a/rt/html/Admin/Users/index.html b/rt/html/Admin/Users/index.html
new file mode 100644
index 000000000..a95d4117d
--- /dev/null
+++ b/rt/html/Admin/Users/index.html
@@ -0,0 +1,81 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => loc('Select a user') &>
+<& /Admin/Elements/UserTabs, current_tab => 'Admin/Users/', 
+    current_subtab => 'Admin/Users/',
+    Title => loc('Select a user') &>
+
+
+
+
+<%$caption%>:<BR>
+<UL>
+%if ($users->Count == 0) {
+<LI> <i><&|/l&>No users matching search criteria found.</&></i>
+% }
+%while ( $user = $users->Next) {
+<LI><A HREF="Modify.html?id=<%$user->id%>"><%$user->Name || loc('(no name listed)')%></a></LI>
+%}
+
+</UL>
+<br><br>
+<FORM METHOD=POST ACTION="<% $RT::WebPath %>/Admin/Users/">
+
+<&|/l&>Find people whose</&> <& /Elements/SelectUsers &><BR>
+<input type="checkbox" name="FindDisabledUsers"> <&|/l&>Include disabled users in search.</&>
+<BR>
+<div align=right><input type=submit value="<&|/l&>Go!</&>"></div> 
+</FORM>
+
+<%INIT>
+my ($user, $caption);
+my $users = new RT::Users($session{'CurrentUser'});
+
+if ($FindDisabledUsers) {
+	$users->{'find_disabled_rows'} = 1;
+}
+
+unless (defined $UserString) {
+    $users->LimitToPrivileged();
+    $caption = loc("Privileged users");
+}
+else {
+    $caption = loc("Users matching search criteria");
+
+  if ($UserString) {
+	$users->Limit( FIELD => $UserField,
+		        OPERATOR => $UserOp,
+		       VALUE => $UserString); 
+
+}
+}
+</%INIT>
+<%ARGS>
+$UserString => undef
+$UserOp => '='
+$UserField => 'Name'
+$IdLike => undef
+$EmailLike => undef
+$FindDisabledUsers => 0
+</%ARGS>
diff --git a/rt/html/Admin/index.html b/rt/html/Admin/index.html
new file mode 100644
index 000000000..522ade876
--- /dev/null
+++ b/rt/html/Admin/index.html
@@ -0,0 +1,40 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Admin/Elements/Header, Title => loc('RT Administration') &>
+<& /Admin/Elements/Tabs, Title => loc('RT Administration') &>
+
+<ul>
+<li><font size="+2"><a href="Users/"><&|/l&>Users</&></a></font><br>
+<&|/l&>Manage users and passwords</&>
+</li>
+<li><font size="+2"><a href="Groups/"><&|/l&>Groups</&></a></font><br>
+<&|/l&>Manage groups and group membership</&>
+</li>
+<li><font size="+2"><a href="Queues/"><&|/l&>Queues</&></a></font><br>
+<&|/l&>Manage queues and queue-specific properties</&>
+</li>
+<li><font size="+2"><a href="Global/"><&|/l&>Global</&></a></font><br>
+<&|/l&>Manage properties and configuration which apply to all queues</&>
+</li>
+</ul>
diff --git a/rt/html/Approvals/Display.html b/rt/html/Approvals/Display.html
new file mode 100644
index 000000000..921c1e38f
--- /dev/null
+++ b/rt/html/Approvals/Display.html
@@ -0,0 +1,50 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title =>  $title &>
+
+<& Elements/Tabs, 
+    current_tab => "Approvals/Display.html", 
+    Title =>  $title &>
+<form method=post action="<%$RT::WebPath%>/Approvals/">
+
+<& /Elements/TitleBoxStart, title => $title &>
+<& /Ticket/Elements/ShowHistory , Ticket => $Ticket, Collapsed => 0, ShowTitle => 0, ShowHeaders => 0, ShowDisplayModes => 0, ShowTitleBarCommands => 0 &>
+<hr>
+<table width=100%>
+<& Elements/Approve, ticket => $Ticket, ShowApproving => 0 &>
+</table>
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit&>
+</form>
+<& Elements/ShowDependency, Ticket => $Ticket &>
+
+<%init>
+my $Ticket = LoadTicket($id);
+
+my $title = loc("Approval #[_1]: [_2]", $Ticket->Id, $Ticket->Subject);
+
+</%init>
+<%ARGS>
+$id => undef
+</%ARGS>
diff --git a/rt/html/Approvals/Elements/Approve b/rt/html/Approvals/Elements/Approve
new file mode 100644
index 000000000..6a7cfa37f
--- /dev/null
+++ b/rt/html/Approvals/Elements/Approve
@@ -0,0 +1,56 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<tr bgcolor="#b9b9ff">
+<td colspan=2><font size="3">
+<a href="<%$RT::WebPath%>/Approvals/Display.html?id=<%$ticket->Id%>"><% loc("#[_1]: [_2]", $ticket->Id, $ticket->Subject) %></a> (<%loc($ticket->Status)%>)</font></td>
+</tr>
+% if ($ShowApproving) {
+%     foreach my $approving ( $ticket->AllDependedOnBy( Type => 'ticket' ) ) {
+<tr bgcolor="#e9e9e9">
+<td colspan=2>
+<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<% $approving->Id %>"><&|/l, $approving->Id, $approving->Subject &>Originating ticket: #[_1]</&></a>
+</td>
+</tr>
+<tr><td colspan=2>
+<& /Ticket/Elements/ShowCustomFields, Ticket => $approving &>
+<& /Ticket/Elements/ShowHistory, Ticket => $approving, Collapsed => 0, ShowTitle => 0, ShowHeaders => 0, ShowDisplayModes => 0, ShowTitleBarCommands => 0 &>
+</td></tr>
+%     }
+% }
+<tr <%$class && "class=\"$class\""%>>
+<td valign=top>
+<input type="radio" name="Approval-<%$ticket->Id%>-Action" value="approve"><&|/l&>Approve</&><br>
+<input type="radio" name="Approval-<%$ticket->Id%>-Action" value="deny"><&|/l&>Deny</&><br>
+<input type="radio" name="Approval-<%$ticket->Id%>-Action" value="none" checked><&|/l&>No action</&>
+</td>
+<td>
+<&|/l&>Notes</&><br>
+<textarea name="Approval-<%$ticket->Id%>-Notes" rows=2 cols=70></textarea>
+</td>
+</tr>
+<%ARGS>
+$ShowApproving => 1
+$ticket => undef
+$class => undef
+</%ARGS>
diff --git a/rt/html/Approvals/Elements/PendingMyApproval b/rt/html/Approvals/Elements/PendingMyApproval
new file mode 100644
index 000000000..b5cf00788
--- /dev/null
+++ b/rt/html/Approvals/Elements/PendingMyApproval
@@ -0,0 +1,87 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<table width="100%">
+% my ($i, $class);
+% my %done;
+% foreach ($tickets, $group_tickets) {
+%   while (my $ticket = $_->Next() ) {
+%     next if !$ARGS{'ShowDependent'} and $ticket->HasUnresolvedDependencies( Type => 'approval' );
+%     next if $done{$ticket->Id}++; # don't show duplicate tickets
+%     $i++; 
+%     $class = ($i%2) ?  "oddline" : "evenline";
+<& Approve, ticket => $ticket, class => $class &>
+%   }
+% }
+</table>
+
+<& /Elements/TitleBoxStart, title => loc("Search for approvals") &>
+<input type=checkbox value="1" name="ShowPending"
+        <%((!$ARGS{'ShowRejected'} && !$ARGS{'ShowResolved'}) ||
+         $ARGS{'ShowPending'})
+        && "checked"%>> <&|/l&>Show pending requests</&><br>
+<input type=checkbox value="1" name="ShowResolved" <%$ARGS{'ShowResolved'} && "checked"%>> <&|/l&>Show approved requests</&><br>
+<input type=checkbox value="1" name="ShowRejected" <%$ARGS{'ShowRejected'} && "checked"%>> <&|/l&>Show denied requests</&><br>
+<input type=checkbox value="1" name="ShowDependent" <%$ARGS{'ShowDependent'} && "checked"%>> <&|/l&>Show requests awaiting other approvals</&><br>
+
+<&|/l,"<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>"&>Only show approvals for requests created before [_1]</&><br>
+
+<&|/l, "<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>"&>Only show approvals for requests created after [_1]</&>
+<& /Elements/TitleBoxEnd &>
+
+<%init>
+my $tickets = RT::Tickets->new( $session{'CurrentUser'} );
+$tickets->LimitOwner( VALUE => $session{'CurrentUser'}->Id );
+
+# also consider AdminCcs as potential approvers.
+my $group_tickets = RT::Tickets->new( $session{'CurrentUser'} );
+
+my $created_before = RT::Date->new( $session{'CurrentUser'} );
+my $created_after = RT::Date->new( $session{'CurrentUser'} );
+
+foreach ($tickets, $group_tickets) {
+    $_->Limit( FIELD      => 'Type', VALUE => 'approval' );
+
+    if ( $ARGS{'ShowResolved'} ) {
+	$_->LimitStatus( VALUE => 'resolved' );
+    }
+    if ( $ARGS{'ShowRejected'} ) {
+	$_->LimitStatus( VALUE => 'rejected' );
+    }
+    if ( $ARGS{'ShowPending'} || ( !$ARGS{'ShowRejected'} && !$ARGS{'Resolved'} ) ) {
+	$_->LimitStatus( VALUE => 'open' );
+	$_->LimitStatus( VALUE => 'new' );
+	$_->LimitStatus( VALUE => 'stalled' );
+    }
+
+    if ( $ARGS{'CreatedBefore'} ) {
+	$created_before->Set( Format => 'unknown', Value => $ARGS{'CreatedBefore'} );
+	$_->LimitCreated( OPERATOR => "<=", VALUE => $created_before->ISO );
+    }
+    if ( $ARGS{'CreatedAfter'} ) {
+	$created_after->Set( Format => 'unknown', Value => $ARGS{'CreatedAfter'} );
+	$_->LimitCreated( OPERATOR => ">=", VALUE => $created_after->ISO );
+    }
+}
+
+</%init>
diff --git a/rt/html/Approvals/Elements/ShowDependency b/rt/html/Approvals/Elements/ShowDependency
new file mode 100644
index 000000000..417cad142
--- /dev/null
+++ b/rt/html/Approvals/Elements/ShowDependency
@@ -0,0 +1,85 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+% my $approving = $Ticket->DependedOnBy();
+% if ($approving->Count) {
+<h3><&|/l&>Tickets which depend on this approval:</&></h3>
+
+<table width=100%>
+<TR>
+<TD WIDTH="25" bgcolor="#999999">&nbsp;</TD><TD>
+<%PERL>
+my %show;
+while (my $link = $approving->Next()) {
+    next unless ($link->BaseURI->IsLocal());
+    my $text = '<a name="' . $link->BaseObj->Id . '">';
+    my $head = '';
+    my $type = $link->BaseObj->Type;
+    my $dep  = $m->scomp('ShowDependency', Ticket => $link->BaseObj, _seen => $_seen);
+
+    if ($type eq 'approval') {
+	$head .= $m->scomp('/Elements/TitleBoxStart', title => loc("Approval #[_1]: [_2]", $link->BaseObj->Id, $link->BaseObj->Subject));
+	$text .= $head;
+	$text .= $m->scomp('/Ticket/Elements/ShowCustomFields', Ticket => $link->BaseObj);
+    } elsif ($type eq 'ticket') {
+	$head .= $m->scomp('/Elements/TitleBoxStart', title => loc("Ticket #[_1]: [_2]", $link->BaseObj->Id, $link->BaseObj->Subject));
+	$text .= $head;
+	$text .= $m->scomp('/Ticket/Elements/ShowSummary', Ticket => $link->BaseObj);
+    } else {
+	$head .= $m->scomp('/Elements/TitleBoxStart', title => loc("#[_1]: [_2]", $link->BaseObj->Id, $link->BaseObj->Subject));
+	$text .= $head;
+    }
+
+    $text .= $m->scomp('/Ticket/Elements/ShowHistory' , Ticket => $link->BaseObj, Collapsed => ($type ne 'ticket'), ShowTitle => 0, ShowHeaders => 0, ShowDisplayModes => 0, ShowTitleBarCommands => 0);
+
+    $head .= $m->scomp('/Elements/TitleBoxEnd');
+    $text .= $m->scomp('/Elements/TitleBoxEnd');
+    $text .= $dep;
+    $text .= '</a>';
+    $show{$link->BaseObj->Id} = {
+	text => $text,
+	head => $head,
+    };
+}
+
+my $refer;
+foreach my $id (sort keys %show) {
+    if ($_seen->{$id}++) {
+	$refer .= "<a href='#txn-$id'>" . $show{$id}{head} . "</a>";
+	next;
+    }
+
+    $m->print($show{$id}{text});
+}
+$m->print($refer);
+
+</%PERL>
+</TD>
+</TR>
+</TABLE>
+
+% }
+<%ARGS>
+$Ticket
+$_seen => {}
+</%ARGS>
diff --git a/rt/html/Approvals/Elements/Tabs b/rt/html/Approvals/Elements/Tabs
new file mode 100644
index 000000000..648ff7573
--- /dev/null
+++ b/rt/html/Approvals/Elements/Tabs
@@ -0,0 +1,34 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Tabs,
+    tabs => $tabs, 
+    current_toptab => 'Approvals/', 
+    current_tab => $current_tab, 
+    Title => $Title &>
+
+<%ARGS>
+$tabs => undef
+$current_tab => undef
+$Title => undef
+</%ARGS>
diff --git a/rt/html/Approvals/index.html b/rt/html/Approvals/index.html
new file mode 100644
index 000000000..b4156f344
--- /dev/null
+++ b/rt/html/Approvals/index.html
@@ -0,0 +1,66 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => loc("My approvals") &>
+<& /Approvals/Elements/Tabs, Title => loc("My approvals") &>
+
+<& /Elements/ListActions, actions => \@actions &>
+<form method="post">
+<& Elements/PendingMyApproval, %ARGS &>
+<& /Elements/Submit &>
+</form>
+<%init>
+
+my (@actions);
+foreach my $arg ( keys %ARGS ) {
+
+    next unless ( $arg =~ /Approval-(\d+)-Action/ );
+
+    my ( $notesval, $notesmsg );
+
+    my $ticket = LoadTicket($1);
+
+    if ( $ARGS{ "Approval-" . $ticket->Id . "-Notes" } ) {
+        my $notes = MIME::Entity->build(
+	    Data => [ $ARGS{ "Approval-" . $ticket->Id . "-Notes" } ]
+	);
+	RT::I18N::SetMIMEEntityToUTF8($notes); # convert text parts into utf-8
+
+        my ( $notesval, $notesmsg ) = $ticket->Correspond( MIMEObj => $notes );
+        if ($notesval) {
+                push ( @actions, loc("Approval #[_1]: Notes recorded",$ticket->Id ));
+        } else {
+                push ( @actions, loc("Approval #[_1]: Notes not recorded due to a system error",$ticket->Id ));
+        }
+    }
+
+    my ($val, $msg);
+    if ( $ARGS{$arg} eq 'deny' ) {
+         ( $val, $msg ) = $ticket->SetStatus('rejected');
+    }
+    elsif ( $ARGS{$arg} eq 'approve' ) {
+         ( $val, $msg ) = $ticket->SetStatus('resolved');
+    }
+    push ( @actions, loc("Approval #[_1]: [_2]",$ticket->id, $msg )) if ($msg);
+}
+</%init>
diff --git a/rt/html/Elements/BevelBoxRaisedEnd b/rt/html/Elements/BevelBoxRaisedEnd
new file mode 100644
index 000000000..ebf45df0f
--- /dev/null
+++ b/rt/html/Elements/BevelBoxRaisedEnd
@@ -0,0 +1,26 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+  </TD>
+</TR>
+</table>
diff --git a/rt/html/Elements/BevelBoxRaisedStart b/rt/html/Elements/BevelBoxRaisedStart
new file mode 100644
index 000000000..c4e6c55bc
--- /dev/null
+++ b/rt/html/Elements/BevelBoxRaisedStart
@@ -0,0 +1,26 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<table cellspacing=0 cellpadding=0 width=100% height=100%>
+      <TR>
+        <TD width=100% height=100%> 
diff --git a/rt/html/Elements/Callback b/rt/html/Elements/Callback
new file mode 100644
index 000000000..93ac4c01b
--- /dev/null
+++ b/rt/html/Elements/Callback
@@ -0,0 +1,65 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<%once>
+my (%cache, $check);
+</%once>
+<%init>
+# checks for inode change time for each callback directory
+my $new_check = join(
+    $;, map { $_->[1] => (stat("$_->[1]/Callbacks"))[10] } $m->interp->resolver->comp_root_array
+) or return;
+
+$Page = $m->callers(1)->path unless ($Page);
+
+my $callbacks;
+if ($new_check eq $check) {
+    $callbacks = $cache{$Page,$_CallbackName};
+}
+else {
+    $check = $new_check;
+}
+
+if (!$callbacks) {
+    my $path = "/Callbacks/*$Page/$_CallbackName";
+    $callbacks = [ $m->interp->resolver->glob_path($path) ];
+    @$callbacks = grep !/^\.|~$/, @$callbacks; #skip backup files
+
+    #skip files without a package
+    my $invalid_base = "/Callbacks/$Page/$_CallbackName";
+    @$callbacks = grep !/^$invalid_base$/, @$callbacks;
+
+
+
+    $cache{$Page,$_CallbackName} = $callbacks;
+}
+
+foreach my $comp (@$callbacks) {
+        $m->comp($comp, %ARGS) if $m->comp_exists($comp);
+}
+return(1);
+</%init>
+<%args>
+$_CallbackName => 'Default'
+$Page => undef
+</%args>
diff --git a/rt/html/Elements/Checkbox b/rt/html/Elements/Checkbox
new file mode 100644
index 000000000..ae3d765c2
--- /dev/null
+++ b/rt/html/Elements/Checkbox
@@ -0,0 +1,39 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<INPUT TYPE="Checkbox" NAME ="<%$Name%>" <%$IsChecked%>>
+
+<%ARGS>
+$Name => undef
+$Default => undef
+$True => undef
+$False => undef
+$IsChecked => undef
+</%ARGS>
+
+<%INIT>
+$IsChecked = 
+  ($Default && $Default =~ /checked/i)
+    ? " CHECKED " : "";
+1;
+</%INIT>
diff --git a/rt/html/Elements/CreateTicket b/rt/html/Elements/CreateTicket
new file mode 100644
index 000000000..7e1025d0a
--- /dev/null
+++ b/rt/html/Elements/CreateTicket
@@ -0,0 +1,26 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<FORM ACTION="<% $RT::WebPath%>/Ticket/Create.html">
+<&|/l, $m->scomp('/Elements/SelectNewTicketQueue')&><input type="submit" value="New ticket in">&nbsp;[_1]</&>
+</FORM>
diff --git a/rt/html/Elements/Error b/rt/html/Elements/Error
new file mode 100644
index 000000000..dc44f125e
--- /dev/null
+++ b/rt/html/Elements/Error
@@ -0,0 +1,62 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Callback, %ARGS, error => $error &>
+<& /Elements/Header, Code => $Code, Why => $Why &>
+<& /Elements/Tabs &>
+<& /Elements/TitleBoxStart, class=> "error",  title => $Title &>
+<%$Why%>
+<br>
+<font size=-1>
+<%$Details%>
+</font>
+<& /Elements/TitleBoxEnd &>
+</body>
+</HTML>
+
+
+<%args>
+$Code => undef
+$Details => undef
+$Title => loc("RT Error")
+$Why => loc("the calling component did not specify why")
+</%args>
+
+<%INIT>
+my $error = "WebRT: $Why ($Details)";
+
+# TODO: Log::Dispatch isn't UTF-8 safe. Autrijus needs to talk to dave rolsky about getting this fixed
+if ($] >= 5.007001) {
+    require Encode;
+    Encode::_utf8_off($error);
+}
+
+$RT::Logger->error($error);
+
+if ( $session{'SessionType'} eq 'REST' ) {
+    $r->content_type('text/plain');
+    $m->out( "Error: " . $Why . "\n" );
+    $m->out( $Details . "\n" );
+    $m->abort();
+}
+</%INIT>
diff --git a/rt/html/Elements/Footer b/rt/html/Elements/Footer
new file mode 100644
index 000000000..5c833f886
--- /dev/null
+++ b/rt/html/Elements/Footer
@@ -0,0 +1,60 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+% if ($Menu) {
+</td>
+</tr>
+<tr>
+<td>
+% }
+<& /Elements/Callback, %ARGS &>
+<div class="bpscredits">
+&#187;&#124;&#171; <&|/l, $RT::VERSION &>RT [_1] from <a href="http://bestpractical.com">Best Practical Solutions, LLC</a>.</&>
+</div>
+% if ($Debug) {
+<HR>
+<b><&|/l&>Time to display</&>: <%Time::HiRes::tv_interval( $m->{'rt_base_time'} )%></b>
+% }
+% if ($Debug >= 2 ) {
+% require Data::Dumper;
+% my $d = Data::Dumper->new([\%ARGS], [qw(%ARGS)]);
+<pre>
+<%$d->Dump() %>
+</pre>
+% }
+% if ($Menu) {
+</TD>
+</TR>
+</TABLE>
+</TD>
+</TR>
+</TABLE>
+% }
+</BODY>
+</HTML>
+% $m->abort();
+
+<%ARGS>
+$Debug => 0
+$Menu => 1
+</%ARGS>
diff --git a/rt/html/Elements/GotoTicket b/rt/html/Elements/GotoTicket
new file mode 100644
index 000000000..bb0c04dd1
--- /dev/null
+++ b/rt/html/Elements/GotoTicket
@@ -0,0 +1,24 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<FORM ACTION="<%$RT::WebPath%>/Ticket/Display.html"><input type=submit value="<&|/l&>Goto ticket</&>">&nbsp;<input size=5 name=id accesskey="0"></FORM>
diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header
new file mode 100644
index 000000000..0fd91a2e2
--- /dev/null
+++ b/rt/html/Elements/Header
@@ -0,0 +1,82 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+<HEAD>
+<TITLE><%$Title%></TITLE>
+% if ($Refresh > 0) {
+<META HTTP-EQUIV="REFRESH" CONTENT="<%$Refresh%>">
+% }
+
+<link rel="shortcut icon" href="<%$RT::WebImagesURL%>/favicon.png" type="image/png">
+<link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/webrt.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR="<%$BgColor%>"
+% if ($Focus) {
+ONLOAD="
+    var tmp = (document.getElementsByName('<% $Focus %>'));
+    if (tmp.length > 0) tmp[tmp.length-1].focus();
+"
+% }
+>
+<table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
+  <tr> 
+    <td colspan=2><a href="http://bestpractical.com"><img src="<%$RT::WebImagesURL%>/bplogo.gif" alt="" width="230" height="50"></a></td>
+    <td>&nbsp;</td>
+    <td>&nbsp;</td>
+    <td width="50%" align="right">
+% if ($session{'CurrentUser'} && $session{'CurrentUser'}->Id && $LoggedIn) {
+<SPAN STYLE="display: none"><A HREF="#skipnav"><&|/l&>Skip Menu</&></A> |</SPAN>
+<A  HREF="<%$RT::WebPath%><% $Prefs %>" ><&|/l&>Preferences</&></A>
+<& /Elements/Callback, %ARGS &>
+% unless ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth) {
+| <A  HREF="<%$RT::WebPath%>/NoAuth/Logout.html<%$URL && "?URL=".$URL%>"><&|/l&>Logout</&></a>
+% }
+<BR>
+<&|/l, "<b>".$session{'CurrentUser'}->Name."</b>" &>Logged in as [_1]</&>
+% } else {
+<&|/l&>Not logged in.</&>
+% }
+</font>
+    </td>
+  </tr>
+</table>
+<%INIT>
+
+$r->header_out('Pragma' => 'no-cache');
+$r->header_out('Cache-control' => 'no-cache');
+</%INIT>
+
+<%ARGS>
+$Prefs => '/User/Prefs.html'
+$Focus => 'focus'
+$Title => undef
+$Code => undef
+$Refresh => 0
+$Why => undef
+$BgColor => '#ffffff'
+$ShowBar => 1
+$LoggedIn => 1
+$URL => undef
+</%ARGS>
diff --git a/rt/html/Elements/ListActions b/rt/html/Elements/ListActions
new file mode 100644
index 000000000..ffa09e283
--- /dev/null
+++ b/rt/html/Elements/ListActions
@@ -0,0 +1,43 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+% if ($actions[0] ) {
+<& /Elements/TitleBoxStart, title => loc('Results') &>
+<UL>
+% foreach my $action (@actions) {
+% next unless ($action);
+% my $skip = 0;
+% $m->comp('/Elements/Callback', _CallbackName => 'ModifyRow', row => \$action, skip => \$skip, %ARGS);
+% next if $skip;
+<LI><%$action%></LI>
+% }
+</UL>
+<& /Elements/TitleBoxEnd &>
+<BR>
+% }
+<%init>
+@actions = grep (/./,@actions);
+</%init>
+<%ARGS>
+@actions => undef
+</%ARGS>
diff --git a/rt/html/Elements/Login b/rt/html/Elements/Login
new file mode 100644
index 000000000..42c49c4af
--- /dev/null
+++ b/rt/html/Elements/Login
@@ -0,0 +1,101 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<%INIT>
+if ($m->request_comp->path =~ '^/REST/\d+\.\d+/') {
+    $r->content_type("text/plain");
+    $m->error_format("text");
+    $m->out("RT/$RT::VERSION 401 Credentials required\n");
+    $m->out("\n$Error\n") if $Error;
+    $m->abort;
+}
+</%INIT>
+
+<& /Elements/Callback, %ARGS, _CallbackName => 'Header' &>
+<& /Elements/Header, Title => loc('Login'), Focus => 'user' &>
+
+<DIV ALIGN=CENTER>
+% if ($Error) {
+<& /Elements/TitleBoxStart, title => loc('Error') &>
+<% $Error %>
+<& /Elements/TitleBoxEnd &>
+% }
+<BR>
+<& /Elements/TitleBoxStart, width=> "40%", titleright => loc("RT [_1]", $RT::VERSION), title => loc('Login') ,
+contentbg=>"#cccccc" &>
+
+% unless ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth) {
+<FORM METHOD=POST ACTION="<% (UNIVERSAL::can($r, 'uri') && ($r->uri) =~ m!.*/(.*)!) %>" >
+<TABLE BORDER=0 WIDTH=100%>
+<TR ALIGN=RIGHT>
+<TD ALIGN=RIGHT><&|/l&>Username</&>:</TD><TD ALIGN=LEFT><input name=user value="<%$user%>"></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Password</&>:</TD><TD ALIGN=LEFT><input type=password name=pass></TD></TR>
+<TR><TD colspan=2 align=right>
+<input type=submit Value="<&|/l&>Login</&>">
+</TD></TR>
+</TABLE>
+
+%# Give callbacks a chance to add more control elements
+<& /Elements/Callback, %ARGS &>
+
+<&/Elements/TitleBoxEnd&>
+% # From mason 1.0.1 forward, this doesn't work. in fact, it breaks things.
+% # But on Mason 1.15 it's fixed again, so we still use it.
+% # The code below iterates through everything in the passed in arguments
+% # Preserving all the old parameters
+% # This would be easier, except mason is 'smart' and calls multiple values
+% # arrays rather than multiple hash keys
+% my $key; my $val;
+% foreach $key (keys %ARGS) {
+%  if (($key ne 'user') and ($key ne 'pass')) {
+% 	if (ref($ARGS{$key}) =~ /ARRAY/) {
+% 		foreach $val (@{$ARGS{$key}}) {
+<input type=hidden name="<%$key %>" value="<% $val %>">
+% 		}
+% 	}
+%	else {
+<input type="hidden" name="<% $key %>" value="<% $ARGS{$key} %>">
+% 	}
+%  }
+% }
+</FORM>
+% }
+</DIV>
+
+<BR>
+<!-- TODO: not yet implemented
+If you've forgotten your username or password, RT can <A
+href="/NoAuth/Reminder.html">send you a reminder</a>.
+-->
+<BR>
+<BR>
+<BR>
+<HR>
+<&|/l, '2003'&>RT is &copy; Copyright 1996-[_1] Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href="http://www.gnu.org/copyleft/gpl.html">Version 2 of the GNU General Public License.</a></&>
+
+<%ARGS>
+$user => ""
+$pass => undef
+$goto => undef
+$Error => undef
+</%ARGS>
diff --git a/rt/html/Elements/Menu b/rt/html/Elements/Menu
new file mode 100644
index 000000000..963be13bf
--- /dev/null
+++ b/rt/html/Elements/Menu
@@ -0,0 +1,84 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%# font size depends on level
+% if ($level ge 3) {
+%   $size = $basesize-(6);
+% } elsif ($level gt 0) {
+%   $size = $basesize-($level * 2);
+%   $padding = 2;
+% }
+%  else {
+%   $size = $basesize;
+%   $padding = 5;
+% }
+<ul class="topnav" >
+% my $sep=0;
+% my $accesskey="1";
+% foreach $tab (sort keys %{$toptabs}) {
+% my $current = $current_toptab || "";
+% my $path = $toptabs->{$tab}->{'path'} || "";
+% $path =~ s#/index.html$##gi;
+% $current =~ s#/index.html$##gi;
+% if ( $path eq $current) {
+%     $class="currenttopnav"
+% } else {
+%     $class="topnav"
+% } 
+% my $style="";
+% if ($sep) {
+% $style="border-top: solid #999 1px; padding-top: .1em; margin-top: .5em;";
+% } elsif ($level == 0 ) {
+% $style="border-bottom: solid white 1px; padding-top: .25em; padding-bottom: .5em;" ;
+% }
+% if ($toptabs->{$tab}->{'separator'}) {
+% $sep=1;
+% } else {
+% $sep=0;
+% }
+<li style="<%$style%>"><A HREF="<%$RT::WebPath%>/<%$toptabs->{$tab}->{'path'}|n%>" style="font-size: <%$size%>;" class="<%$class%>" 
+<%($class eq 'currenttopnav') ? "name='focus'" : ""|n %> 
+<% !$level && "accesskey='".$accesskey++."'" |n%>><% $toptabs->{$tab}->{'title'}%></A>
+%# Second-level items
+%# if ($current_toptab eq $toptabs->{$tab}->{'path'}) {
+%# commented out by jesse on 4 jan 2003 so that tickets/search and ticket/# can
+%# both have menu items
+% if ($toptabs->{$tab}->{'subtabs'}) {
+        <& /Elements/Menu, level => $level+1, 
+                current_toptab => $toptabs->{$tab}->{'current_subtab'},
+                toptabs => $toptabs->{$tab}->{'subtabs'} &></li>
+% }
+%# }
+% }
+</ul>
+
+<%INIT>
+my ($tab, $subtab, $class, $size, $padding);
+my $basesize=16;
+</%INIT>
+
+<%ARGS>
+$current_toptab => ""
+$toptabs => undef
+$level => 0
+</%ARGS>
diff --git a/rt/html/Elements/MessageBox b/rt/html/Elements/MessageBox
new file mode 100644
index 000000000..64fdf38b7
--- /dev/null
+++ b/rt/html/Elements/MessageBox
@@ -0,0 +1,47 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<TEXTAREA COLS=<%$Width%> ROWS=15 WRAP=HARD NAME="<%$Name%>"><& /Elements/Callback, %ARGS &><% $Default %><%$message%><%$signature%></TEXTAREA>
+<%INIT>
+
+my ($message);
+
+if ($QuoteTransaction) {
+    my $transaction=RT::Transaction->new($session{'CurrentUser'});
+    $transaction->Load($QuoteTransaction);
+    $message=$transaction->Content(Quote => 1);
+}
+
+my $signature = '';
+if ($session{'CurrentUser'}->UserObj->Signature) {
+	$signature = "-- \n".$session{'CurrentUser'}->UserObj->Signature;
+}
+
+</%INIT>
+<%ARGS>
+$QuoteTransaction => undef
+$Name => 'Content'
+$Default => ''
+$Width => 72
+</%ARGS>
+
diff --git a/rt/html/Elements/MyRequests b/rt/html/Elements/MyRequests
new file mode 100644
index 000000000..05ae62445
--- /dev/null
+++ b/rt/html/Elements/MyRequests
@@ -0,0 +1,78 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/TitleBoxStart, title => loc("[_1] highest priority tickets I requested...", $rows), bodyclass=> '' &>
+<TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>
+<TR>
+<TH align=right><&|/l&>#</&></TH>
+<TH align=left><&|/l&>Subject</&></TH>
+<TH align=left><&|/l&>Queue</&></TH>
+<TH align=left><&|/l&>Status</&></TH>
+<TH align=left><&|/l&>Owner</&></TH>
+</TR>
+% my $i;
+% while (my $Ticket = $MyTickets->Next) {
+% $i++;
+<TR class="<% $i%2 ? 'oddline' : 'evenline'%>" >
+<TD ALIGN=RIGHT>
+<%$Ticket->Id%>
+</TD>
+<TD>
+<A HREF="<% $RT::WebPath %>/Ticket/Display.html?id=<%$Ticket->Id%>">
+<%$Ticket->Subject || loc('(no subject)')%>
+</A>
+</TD>
+<TD>
+<%$Ticket->QueueObj->Name%>
+</TD>
+<TD>
+% if ($Ticket->HasUnresolvedDependencies ) {
+%     if ($Ticket->HasUnresolvedDependencies( Type => 'approval'  )) { 
+<em><&|/l&>(pending approval)</&></em>
+%     } else {
+<em><&|/l&>(pending other tickets)</&></em>
+%     }
+% } else {
+<%loc($Ticket->Status)%>
+% }
+</TD>
+<TD>
+<%$Ticket->OwnerObj->Name%>
+</TD>
+</TR>
+% }
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+
+
+<%INIT>
+my $rows = 10;
+my $MyTickets;
+$MyTickets = new RT::Tickets ($session{'CurrentUser'});
+$MyTickets->LimitWatcher(TYPE => 'Requestor', VALUE => $session{'CurrentUser'}->EmailAddress);
+$MyTickets->LimitStatus(VALUE => "open");
+$MyTickets->LimitStatus(VALUE => "new");
+$MyTickets->RowsPerPage($rows);
+$MyTickets->OrderBy(FIELD => 'Priority', ORDER => 'DESC');
+
+</%INIT>
diff --git a/rt/html/Elements/MyTickets b/rt/html/Elements/MyTickets
new file mode 100644
index 000000000..6e2ddc6c3
--- /dev/null
+++ b/rt/html/Elements/MyTickets
@@ -0,0 +1,81 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/TitleBoxStart, title => loc("[_1] highest priority tickets I own...", $rows), bodyclass=> '' &>
+<TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>
+<TR>
+<TH ALIGN=RIGHT><&|/l&>#</&></TH>
+<TH ALIGN=LEFT><&|/l&>Subject</&></TH>
+<TH ALIGN=LEFT><&|/l&>Queue</&></TH>
+<TH ALIGN=LEFT><&|/l&>Status</&></TH>
+<TH ALIGN=LEFT>&nbsp;</TH>
+</TR>
+  <TR>    
+% my $i;
+% while (my $Ticket = $MyTickets->Next) {
+%     next if $Ticket->HasUnresolvedDependencies( Type => 'approval' );
+%     last if $i++ >= $rows;
+<TR class="<% $i%2 ? 'oddline' : 'evenline'%>" >                                
+<TD ALIGN=RIGHT>
+<%$Ticket->Id%>
+</TD>
+<TD>
+<A HREF="<% $RT::WebPath %>/Ticket/Display.html?id=<%$Ticket->Id%>">
+<%$Ticket->Subject || loc('(no subject)')%>
+</A>
+</TD>
+<TD>
+<%$Ticket->QueueObj->Name%>
+</TD>
+<TD>
+% if ($Ticket->HasUnresolvedDependencies ) {
+%     if ($Ticket->HasUnresolvedDependencies( Type => 'approval' ) or
+%         $Ticket->HasUnresolvedDependencies( Type => 'code' )) {
+<em><&|/l&>(pending approval)</&></em>
+%     } else {
+<em><&|/l&>(pending other tickets)</&></em>
+%     }
+% } else {
+<%loc($Ticket->Status)%>
+% }
+</TD>
+<TD ALIGN=RIGHT>
+[<A HREF="<% $RT::WebPath %>/Ticket/Update.html?id=<%$Ticket->Id%>"><&|/l&>Update</&></A>]
+</TD>
+</TR>
+% }
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+
+
+<%INIT>
+my $rows = 10;
+my $MyTickets;
+$MyTickets = new RT::Tickets ($session{'CurrentUser'});
+$MyTickets->LimitOwner(VALUE => $session{'CurrentUser'}->Id);
+$MyTickets->LimitStatus(VALUE => "open");
+$MyTickets->LimitStatus(VALUE => "new");
+$MyTickets->RowsPerPage($rows);
+$MyTickets->OrderBy(FIELD => 'Priority', ORDER => 'DESC');
+
+</%INIT>
diff --git a/rt/html/Elements/PageLayout b/rt/html/Elements/PageLayout
new file mode 100644
index 000000000..685317581
--- /dev/null
+++ b/rt/html/Elements/PageLayout
@@ -0,0 +1,99 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<table class="darkblue" border=0 cellspacing=0 cellpadding=0 width="100%">
+  <th class="titlebox" align="left"><span class="rtname"><%$AppName%></span>
+  </th>
+      <span class="topactions">
+% foreach my $action (sort keys %{$topactions}) {
+        <td class="darkblueright">
+        <%$topactions->{"$action"}->{'html'} |n %>
+        </td>
+% }
+      </span>
+</table>
+<table border=0 cellspacing=0 cellpadding=0 width="100%" height="100%">
+%# Vertical menu
+<TR height="100%">
+<TD valign="top" width="140" class="blue">
+          <& /Elements/Menu, toptabs => $toptabs, current_toptab => $current_toptab &>
+</TD>
+<td valign="top">
+<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+  <td class="blue" valign="top">
+    <span class="title"><%$title%></span>
+</td>
+</tr>
+<tr>
+<td class="blueright" valign="top">
+    <span class="nav"> 
+% if ($actions) {
+% my @actions;
+% foreach my $action (sort keys %{$actions}) {
+% if ($actions->{"$action"}->{'html'}) {
+% push @actions, $actions->{"$action"}->{'html'}; 
+% } else {
+% push @actions,  "<A class='nav' HREF=\"".$RT::WebPath."/".$actions->{$action}->{'path'}."\">".$actions->{$action}->{'title'}."</A>";
+% }
+%  }
+<% join(" | ", @actions) | n %>
+% if ($subactions) {
+% my @actions;
+% foreach my $action (sort keys %{$subactions}) {
+% push @actions, $subactions->{"$action"}->{'html'}; 
+%  }
+<% join(" | ", @actions) | n %>
+% }
+% }
+    </span>
+  </td>
+</tr>
+<TR valign="top">
+<TD valign="top" width="100%" height="100%" class="mainbody" >
+
+<%INIT>
+
+  foreach my $tab (sort keys %{$toptabs}) {
+    if ($toptabs->{$tab}->{'path'} eq $current_toptab) {
+      $toptabs->{$tab}->{"subtabs"} = $tabs;
+      $toptabs->{$tab}->{"current_subtab"} = $current_tab;
+    }
+  }
+
+if (! defined($AppName)) {
+  $AppName = loc("RT for [_1]", $RT::rtname);
+}
+
+</%INIT>
+<%ARGS>
+$current_toptab => undef
+$current_tab => undef
+$toptabs => undef
+$topactions => undef
+$tabs => undef
+$actions => undef
+$subactions => undef
+$title => $m->callers(-1)->path
+$AppName => undef
+</%ARGS>
diff --git a/rt/html/Elements/Quicksearch b/rt/html/Elements/Quicksearch
new file mode 100644
index 000000000..b1a67ab29
--- /dev/null
+++ b/rt/html/Elements/Quicksearch
@@ -0,0 +1,61 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/TitleBoxStart, title => loc("Quick search"), bodyclass => "" &>
+
+<TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>                       
+<tr>                                                                          
+       <th align=left><&|/l&>Queue</&></th>                                         
+       <th align=right><font size=-1><&|/l&>New</&></font></th>
+       <th align=right><font size=-1><&|/l&>Open</&></font></th>          
+</tr>
+
+<%PERL>
+my $i;
+while (my $queue = $Queues->Next) {
+     $Tickets->ClearRestrictions;                                           
+     $Tickets->LimitStatus(VALUE => "open");                                
+     $Tickets->LimitQueue(VALUE => $queue->Name, OPERATOR => '=');            
+     my $open = $Tickets->Count();
+
+     $Tickets->ClearRestrictions;                                           
+     $Tickets->LimitStatus(VALUE => "new");
+     $Tickets->LimitQueue(VALUE => $queue->Name, OPERATOR => '=');            
+     my $new = $Tickets->Count();
+
+</%PERL>
+% $i++;                                                                         
+<TR class="<% $i%2 ? 'oddline' : 'evenline'%>" >                                
+<td><A HREF="<% $RT::WebPath%>/Search/Listing.html?ValueOfStatus=open&ValueOfStatus=new&StatusOp=%3D&QueueOp=%3D&ValueOfQueue=<%$queue->Id%>&RowsPerPage=50&NewSearch=1" TITLE="<% $queue->Description %>"><%$queue->Name%></a></TD>
+<td align="right"><A HREF="<% $RT::WebPath%>/Search/Listing.html?ValueOfStatus=new&StatusOp=%3D&QueueOp=%3D&ValueOfQueue=<%$queue->Id%>&RowsPerPage=50&NewSearch=1"><%$new%></a></TD>
+<td align="right"><A HREF="<% $RT::WebPath%>/Search/Listing.html?ValueOfStatus=open&StatusOp=%3D&QueueOp=%3D&ValueOfQueue=<%$queue->Id%>&RowsPerPage=50&NewSearch=1"><%$open%></a></TD>
+</TR>
+% }
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+
+<%INIT>
+my $Queues = RT::Queues->new($session{'CurrentUser'}); 
+$Queues->UnLimit();
+my $Tickets = RT::Tickets->new($session{'CurrentUser'});
+</%INIT>
diff --git a/rt/html/Elements/Refresh b/rt/html/Elements/Refresh
new file mode 100644
index 000000000..2b5376fee
--- /dev/null
+++ b/rt/html/Elements/Refresh
@@ -0,0 +1,45 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME="<%$Name%>">
+<OPTION VALUE="-1"
+%unless ($Default) {
+ SELECTED
+%}
+><&|/l&>Don't refresh this page.</&></OPTION>
+%foreach my $value (@refreshevery) {
+<OPTION VALUE="<%$value%>"
+% if ($value == $Default) {
+SELECTED 
+% }
+><&|/l, $value/60 &>Refresh this page every [_1] minutes.</&></OPTION>
+%}
+</SELECT>
+
+<%INIT>
+my @refreshevery = qw(120 300 600 1200 3600 7200);
+</%INIT>
+<%ARGS>
+$Name => undef
+$Default => 0
+</%ARGS>
diff --git a/rt/html/Elements/Section b/rt/html/Elements/Section
new file mode 100644
index 000000000..691235846
--- /dev/null
+++ b/rt/html/Elements/Section
@@ -0,0 +1,34 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<TABLE WIDTH=100%>
+<TR>
+<TD>
+<font size=+4><%$title%></font>
+</TD>
+</TR>
+</TABLE>
+
+<%ARGS>
+$title => undef
+</%ARGS>
diff --git a/rt/html/Elements/SelectAttachmentField b/rt/html/Elements/SelectAttachmentField
new file mode 100644
index 000000000..47bc53211
--- /dev/null
+++ b/rt/html/Elements/SelectAttachmentField
@@ -0,0 +1,31 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME="<%$Name%>">
+<OPTION VALUE="Content"><&|/l&>content</&></OPTION>
+<OPTION VALUE="ContentType"><&|/l&>content-type</&></OPTION>
+<OPTION VALUE="Filename"><&|/l&>filename</&></OPTION>
+</SELECT>
+<%ARGS>
+$Name => 'AttachmentField'
+</%ARGS>
diff --git a/rt/html/Elements/SelectBoolean b/rt/html/Elements/SelectBoolean
new file mode 100644
index 000000000..8cf60dc33
--- /dev/null
+++ b/rt/html/Elements/SelectBoolean
@@ -0,0 +1,46 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME ="<%$Name%>">
+<OPTION VALUE="<%$TrueVal%>" <%$TrueDefault%>><%$True%></OPTION>
+<OPTION VALUE="<%$FalseVal%>" <%$FalseDefault%>><%$False%></OPTION>
+</SELECT>
+
+<%ARGS>
+$Name => undef
+$True => loc("is")
+$Default => 'true'
+$TrueVal => 1
+$FalseVal => 0
+$False => loc("isn't")
+</%ARGS>
+
+<%INIT>
+my ($TrueDefault, $FalseDefault);
+if ($Default && $Default !~ /true/i) {
+	$FalseDefault = "SELECTED";
+}
+else {
+	$TrueDefault = "SELECTED";
+}
+</%INIT>
diff --git a/rt/html/Elements/SelectCustomFieldOperator b/rt/html/Elements/SelectCustomFieldOperator
new file mode 100644
index 000000000..e886cbe37
--- /dev/null
+++ b/rt/html/Elements/SelectCustomFieldOperator
@@ -0,0 +1,40 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME ="<%$Name%>">
+% while (my $option = shift @Options) {
+% my $value = shift @Values;
+<OPTION VALUE="<%$value%>"
+% if ($Default eq $value) {
+SELECTED
+% }
+><%$option%></OPTION>
+% }
+</SELECT>
+
+<%ARGS>
+$Name => undef
+@Options => ( loc('contains'), loc("doesn't contain"), loc('is'), loc("isn't"), loc('less than'), loc('greater than'))
+@Values => ('LIKE', 'NOT LIKE', '=', '!=', '<', '>')
+$Default => undef
+</%ARGS>
diff --git a/rt/html/Elements/SelectCustomFieldValue b/rt/html/Elements/SelectCustomFieldValue
new file mode 100644
index 000000000..60f65bcf2
--- /dev/null
+++ b/rt/html/Elements/SelectCustomFieldValue
@@ -0,0 +1,41 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Callback, %ARGS &>
+% if ($CustomField->Type =~ /Select/i) {
+% my $values = $CustomField->Values;
+<select name="<%$Name%>">
+<option value="" SELECTED>-</option>
+<option value="null"><&|/l&>(no value)</&></option>
+% while (my $value = $values->Next) {
+<option value="<%$value->Name%>"><%$value->Name%></option>
+% }
+</select>
+% }
+% else {
+<input name="<%$Name%>" size="20">
+% }
+<%args>
+$Name => undef
+$CustomField =>undef
+</%args>
diff --git a/rt/html/Elements/SelectDate b/rt/html/Elements/SelectDate
new file mode 100644
index 000000000..5f169fc0a
--- /dev/null
+++ b/rt/html/Elements/SelectDate
@@ -0,0 +1,48 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<INPUT NAME="<%$Name%>" VALUE="<%$Default%>" size=16> 
+
+<%init>
+unless ((defined $Default) or 
+	($current <= 0)) {
+	my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
+                                            localtime($current);
+        $Default = sprintf("%04d-%02d-%02d %02d:%02d",                         
+                           $year+1900,$mon+1,$mday,                            
+                           $hour,$min);   
+}
+
+unless ($Name) {
+	$Name = $menu_prefix. "_Date";
+}
+</%init>
+
+<%args>
+
+$ShowTime => undef
+$menu_prefix=>''
+$current=>time
+$Default => undef
+$Name => undef
+</%args>
diff --git a/rt/html/Elements/SelectDateRelation b/rt/html/Elements/SelectDateRelation
new file mode 100644
index 000000000..ee26efeaa
--- /dev/null
+++ b/rt/html/Elements/SelectDateRelation
@@ -0,0 +1,36 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME ="<%$Name%>">
+<OPTION VALUE="&lt;"><%$Before%></OPTION>
+<OPTION VALUE="="><%$On%></OPTION>
+<OPTION VALUE="&gt;"><%$After%></OPTION>
+</SELECT>
+
+<%ARGS>
+$Name => undef
+$Default => undef
+$Before => loc('Before')
+$On => 	loc('On')
+$After => loc('After')
+</%ARGS>
diff --git a/rt/html/Elements/SelectDateType b/rt/html/Elements/SelectDateType
new file mode 100644
index 000000000..afb9a70e9
--- /dev/null
+++ b/rt/html/Elements/SelectDateType
@@ -0,0 +1,36 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME="<%$Name%>">
+<OPTION VALUE="Created"><&|/l&>Created</&></OPTION>
+<OPTION VALUE="Started"><&|/l&>Started</&></OPTION>
+<OPTION VALUE="Resolved"><&|/l&>Resolved</&></OPTION>
+<OPTION VALUE="Told"><&|/l&>Last Contacted</&></OPTION>
+<OPTION VALUE="LastUpdated"><&|/l&>Last Updated</&></OPTION>
+<OPTION VALUE="Starts"><&|/l&>Starts</&></OPTION>
+<OPTION VALUE="Due"><&|/l&>Due</&></OPTION>
+<OPTION VALUE="Updated"><&|/l&>Updated</&></OPTION>
+</SELECT>
+<%ARGS>
+$Name => 'DateType'
+</%ARGS>
diff --git a/rt/html/Elements/SelectEqualityOperator b/rt/html/Elements/SelectEqualityOperator
new file mode 100644
index 000000000..99c60d554
--- /dev/null
+++ b/rt/html/Elements/SelectEqualityOperator
@@ -0,0 +1,40 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME ="<%$Name%>">
+% while (my $option = shift @Options) {
+% my $value = shift @Values;
+<OPTION VALUE="<%$value%>"
+% if ($Default eq $value) {
+SELECTED
+% }
+><%$option%></OPTION>
+% }
+</SELECT>
+
+<%ARGS>
+$Name => undef
+@Options => (loc('less than'), loc('equal to'), loc('greater than'), loc('not equal to'))
+@Values => qw(< = > !=)
+$Default => undef
+</%ARGS>
diff --git a/rt/html/Elements/SelectGroups b/rt/html/Elements/SelectGroups
new file mode 100644
index 000000000..8f33c1eb3
--- /dev/null
+++ b/rt/html/Elements/SelectGroups
@@ -0,0 +1,29 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<select name="GroupField">
+<option value="Name"><&|/l&>Name</&>
+<option value="Description"><&|/l&>Description</&>
+</select>
+<& /Elements/SelectMatch, Name=> 'GroupOp' &>
+<input size=8 name="GroupString">
diff --git a/rt/html/Elements/SelectLinkType b/rt/html/Elements/SelectLinkType
new file mode 100644
index 000000000..9ebefda14
--- /dev/null
+++ b/rt/html/Elements/SelectLinkType
@@ -0,0 +1,37 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME ="<%$Name%>">
+<OPTION VALUE="MemberOf"><&|/l&>Member of</&></OPTION>
+<OPTION VALUE="DependsOn"><&|/l&>Depends on</&></OPTION>
+<OPTION VALUE="RefersTo"><&|/l&>Refers to</&></OPTION>
+</SELECT>
+
+<%ARGS>
+$Name => "LinkType"
+$Default => undef
+</%ARGS>
+
+<%INIT>
+# TODO handle Default
+</%INIT>
diff --git a/rt/html/Elements/SelectMatch b/rt/html/Elements/SelectMatch
new file mode 100644
index 000000000..d58a9633a
--- /dev/null
+++ b/rt/html/Elements/SelectMatch
@@ -0,0 +1,53 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME ="<%$Name%>">
+<OPTION VALUE="LIKE" <%$LikeDefault%>><%$Like%></OPTION>
+<OPTION VALUE="NOT LIKE" <%$NotLikeDefault%>><%$NotLike%></OPTION>
+<OPTION VALUE="=" <%$TrueDefault%>><%$True%></OPTION>
+<OPTION VALUE="!=" <%$FalseDefault%>><%$False%></OPTION>
+</SELECT>
+
+<%ARGS>
+$Name => undef
+$Like => loc('contains')
+$NotLike => loc("doesn't contain")
+$True => loc('is')
+$False => loc("isn't")
+$Default => undef
+</%ARGS>
+<%INIT>
+my ($TrueDefault, $FalseDefault, $LikeDefault, $NotLikeDefault);
+if ($Default && $Default !~ /true/i) {
+	$FalseDefault = "SELECTED";
+}
+elsif ($Default && $Default !~ /false/i) {
+	$TrueDefault = "SELECTED";
+} 
+elsif ($Default && $Default !~ /notlike/i) {
+	$NotLikeDefault = "SELECTED";
+}
+else {
+	$LikeDefault = "SELECTED";
+}
+</%INIT>
diff --git a/rt/html/Elements/SelectNewTicketQueue b/rt/html/Elements/SelectNewTicketQueue
new file mode 100644
index 000000000..a629b7bca
--- /dev/null
+++ b/rt/html/Elements/SelectNewTicketQueue
@@ -0,0 +1,56 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<LABEL ACCESSKEY="9">
+<SELECT NAME ="<%$Name%>">
+% foreach my $queue (@{$session{'create_in_queues'}}) {
+<OPTION VALUE="<%$queue->{'id'}%>" <%($Default && ($queue->{'id'} == $Default)) && 'SELECTED'%>><%$queue->{'Name'}%>
+%   if (($Verbose) and ($queue->{'Description'}) ){
+(<%$queue->{'Description'}%>)
+%  }
+</OPTION>
+% }
+</SELECT>
+</LABEL>
+
+<%INIT>
+unless ($session{'create_in_queues'}) { 
+
+@{$session{'create_in_queues'}} = ();
+my $q=new RT::Queues($session{'CurrentUser'});
+$q->UnLimit;
+while (my $queue=$q->Next) {
+        if ($queue->CurrentUserHasRight('CreateTicket')) {
+                my $ds = { Name => $queue->Name, Description => $queue->Description, id => $queue->id };
+                push (@{$session{'create_in_queues'}}, $ds);
+        }        
+}
+}
+</%INIT>
+
+
+<%ARGS>
+$Name => 'Queue'
+$Verbose => undef
+$Default => undef
+</%ARGS>
diff --git a/rt/html/Elements/SelectOwner b/rt/html/Elements/SelectOwner
new file mode 100644
index 000000000..04b078d20
--- /dev/null
+++ b/rt/html/Elements/SelectOwner
@@ -0,0 +1,59 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME="<%$Name%>">
+<OPTION VALUE="">-</OPTION>
+<OPTION <% ($RT::Nobody->Id() == $Default) && "SELECTED" %> VALUE="<%$RT::Nobody->Id%>"><%$RT::Nobody->Name%></OPTION>
+%while ( my $User = $Users->Next())  {
+<OPTION VALUE="<%$User->Id()%>" <% ($User->Id() == $Default) && "SELECTED" %>><%$User->Name()%></OPTION>
+%}
+</SELECT>
+
+<%INIT>
+my $Users = RT::Users->new($session{CurrentUser});
+my $object;
+
+
+if ($TicketObj) {
+        $object = $TicketObj;
+}
+elsif ($QueueObj) {
+        $object = $QueueObj;
+}
+if ($object) {
+        $Users->WhoHaveRight(Right => 'OwnTicket',
+                     Object => $object,
+                     IncludeSystemRights => 1,
+                     IncludeSuperusers => 1);
+} else {
+        $Users->LimitToPrivileged;
+}
+</%INIT>
+
+<%ARGS>
+$QueueObj => undef
+$Name => undef
+$Default => undef
+$User => undef
+$TicketObj => undef
+</%ARGS>
diff --git a/rt/html/Elements/SelectQueue b/rt/html/Elements/SelectQueue
new file mode 100644
index 000000000..c45b9b532
--- /dev/null
+++ b/rt/html/Elements/SelectQueue
@@ -0,0 +1,59 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+% if ($Lite) {
+<INPUT NAME="<%$Name%>" size=25 DEFAULT="<%$d->Name%>">
+% } else {
+<SELECT NAME ="<%$Name%>">
+% if ($ShowNullOption) {
+<OPTION VALUE="">-</OPTION>
+% }
+% while (my $queue=$q->Next) {
+% if ($ShowAllQueues || $queue->CurrentUserHasRight('CreateTicket')) {
+<OPTION VALUE="<%$queue->Id%>" <%($Default && ($queue->Id == $Default)) && 'SELECTED'%>><%$queue->Name%>
+%   if (($Verbose) and ($queue->Description) ){
+(<%$queue->Description%>)
+%  }
+</OPTION>
+% }
+% }
+</SELECT>
+% }
+<%ARGS>
+$ShowNullOption => 1
+$ShowAllQueues => 1
+$Name => undef
+$Verbose => undef
+$Default => 0
+$Lite => 0
+</%ARGS>
+
+<%INIT>
+
+my $q=new RT::Queues($session{'CurrentUser'});
+$q->UnLimit;
+
+my $d = new RT::Queue($session{'CurrentUser'});
+$d->Load($Default);
+
+</%INIT>
diff --git a/rt/html/Elements/SelectResultsPerPage b/rt/html/Elements/SelectResultsPerPage
new file mode 100644
index 000000000..1bde71306
--- /dev/null
+++ b/rt/html/Elements/SelectResultsPerPage
@@ -0,0 +1,43 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%# TODO: Better default handling
+
+<SELECT NAME ="<%$Name%>">
+% foreach my $value (@values) {
+<OPTION VALUE="<%$value%>" <% $value == $Default && 'SELECTED' %>>
+<% shift @labels %>
+</OPTION>
+% }
+</SELECT>
+
+<%INIT>
+my @values = qw(0 10 25 50 100);
+my @labels = (loc('Unlimited'), qw(10 25 50 100));
+</%INIT>
+<%ARGS>
+
+$Name => undef
+$Default => 50
+
+</%ARGS>
diff --git a/rt/html/Elements/SelectSortOrder b/rt/html/Elements/SelectSortOrder
new file mode 100644
index 000000000..0ad999a7a
--- /dev/null
+++ b/rt/html/Elements/SelectSortOrder
@@ -0,0 +1,41 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME="<%$Name%>">
+%foreach my $order (@orders) {
+<OPTION VALUE="<%$order%>" <%$order eq $Default && 'SELECTED' %>>
+<% shift @order_names %>
+</OPTION>
+% }
+</SELECT>
+
+<%INIT>
+my @orders = qw (ASC DESC);
+my @order_names = (loc('Ascending'), loc('Descending'));
+
+</%INIT>
+
+<%ARGS>
+$Name => 'SortOrder'
+$Default => 'ASC'
+</%ARGS>
diff --git a/rt/html/Elements/SelectStatus b/rt/html/Elements/SelectStatus
new file mode 100644
index 000000000..2c1ffad39
--- /dev/null
+++ b/rt/html/Elements/SelectStatus
@@ -0,0 +1,37 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME ="<%$Name%>">
+<OPTION VALUE="">-</OPTION>
+%foreach my $status (@status) {
+<OPTION VALUE="<%$status%>" <%($Default eq $status) && 'SELECTED'%>><%loc($status)%></OPTION>
+% }
+</SELECT>
+<%ONCE>
+my $queue = new RT::Queue($session{'CurrentUser'});
+my @status = $queue->StatusArray();
+</%ONCE>
+<%ARGS>
+$Name => undef
+$Default => undef
+</%ARGS>
diff --git a/rt/html/Elements/SelectTicketSortBy b/rt/html/Elements/SelectTicketSortBy
new file mode 100644
index 000000000..1d0b3942a
--- /dev/null
+++ b/rt/html/Elements/SelectTicketSortBy
@@ -0,0 +1,38 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME="<%$Name%>">
+% foreach my $field (@sortfields) {
+<OPTION VALUE="<%$field%>" <% $field eq $Default && 'SELECTED'%>><% loc($field) %></OPTION>
+% }
+</SELECT>
+
+<%INIT>
+my $tickets = new RT::Tickets($session{'CurrentUser'});
+my @sortfields = $tickets->SortFields();
+
+</%INIT>
+<%ARGS>
+$Name => 'SortTicketsBy'
+$Default => 'id'
+</%ARGS>
diff --git a/rt/html/Elements/SelectTicketTypes b/rt/html/Elements/SelectTicketTypes
new file mode 100644
index 000000000..80aecac67
--- /dev/null
+++ b/rt/html/Elements/SelectTicketTypes
@@ -0,0 +1,34 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME="<%$Name%>">
+%foreach (@Types) {
+<OPTION VALUE="<% $_ %>" <% ($_ eq $Default) && "SELECTED" %>><&|/l&><% $_ %></&>
+%}
+</SELECT>
+
+<%ARGS>
+$Name => 'TickType'
+$Default => undef
+@Types => qw(Approval Ticket)
+</%ARGS>
diff --git a/rt/html/Elements/SelectUsers b/rt/html/Elements/SelectUsers
new file mode 100644
index 000000000..7ed3835b6
--- /dev/null
+++ b/rt/html/Elements/SelectUsers
@@ -0,0 +1,31 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<select name="UserField">
+<option value="Name"><&|/l&>User Id</&>
+<option value="EmailAddress"><&|/l&>Email</&>
+<option value="RealName"><&|/l&>Name</&>
+<option value="Organization"><&|/l&>Organization</&>
+</select>
+<& /Elements/SelectMatch, Name=> 'UserOp' &>
+<input size=8 name="UserString">
diff --git a/rt/html/Elements/SelectWatcherType b/rt/html/Elements/SelectWatcherType
new file mode 100644
index 000000000..26de8f7b9
--- /dev/null
+++ b/rt/html/Elements/SelectWatcherType
@@ -0,0 +1,44 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME ="<%$Name%>">
+<OPTION VALUE="">-</OPTION>
+%for my $option (@types) {
+<OPTION VALUE="<%$option%>" <%$option eq $Default && "SELECTED"%>><%loc($option)%></OPTION>
+%}
+</SELECT>
+
+<%INIT>
+my @types;
+if ($Scope =~ 'queue') {
+   @types = qw(Cc AdminCc);
+}
+else { 
+   @types = qw(Requestor Cc AdminCc);
+}
+</%INIT>
+<%ARGS>
+$Default=>undef
+$Scope => 'ticket'
+$Name => 'WatcherType'
+</%ARGS>
diff --git a/rt/html/Elements/SetupSessionCookie b/rt/html/Elements/SetupSessionCookie
new file mode 100644
index 000000000..4d728ce70
--- /dev/null
+++ b/rt/html/Elements/SetupSessionCookie
@@ -0,0 +1,77 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<%init>
+my %cookies = CGI::Cookie->fetch();
+my %backends = (
+    mysql	=> 'Apache::Session::MySQL',
+    Pg		=> 'Apache::Session::Postgres',
+    Oracle	=> 'Apache::Session::Oracle',
+) unless $RT::WebSessionClass;
+my $session_class = $RT::WebSessionClass || $backends{$RT::DatabaseType} || 'Apache::Session::File';
+my $pm = "$session_class.pm"; $pm =~ s|::|/|g; require $pm;
+
+    eval {
+        tie %session, $session_class,
+          $SessionCookie || ( $cookies{'RT_SID'} ? $cookies{'RT_SID'}->value() : undef ),
+          $backends{$RT::DatabaseType} ? {
+            Handle     => $RT::Handle->dbh,
+            LockHandle => $RT::Handle->dbh,
+          } : {
+            Directory     => $RT::MasonSessionDir,
+            LockDirectory => $RT::MasonSessionDir,
+          };
+    };
+    if ($@) {
+
+        # If the session is invalid, create a new session.
+        if ( $@ =~ /Object does not/i ) {
+            tie %session, $session_class, undef,
+	      $backends{$RT::DatabaseType} ? {
+                Handle     => $RT::Handle->dbh,
+                LockHandle => $RT::Handle->dbh,
+              } : {
+                Directory     => $RT::MasonSessionDir,
+                LockDirectory => $RT::MasonSessionDir,
+              };
+            undef $cookies{'RT_SID'};
+        }
+        else {
+            die "RT Couldn't write to session directory '$RT::MasonSessionDir': $@. Check that this dir ectory's permissions are correct.";
+        }
+    }
+
+    if ( !$cookies{'RT_SID'} ) {
+        my $cookie = new CGI::Cookie(
+            -name  => 'RT_SID',
+            -value => $session{_session_id},
+            -path  => '/',
+        );
+        $r->header_out('Set-Cookie', $cookie->as_string);
+
+    } 
+    return();
+</%init>
+<%args>
+$SessionCookie => ''
+</%args>
diff --git a/rt/html/Elements/ShadedBox b/rt/html/Elements/ShadedBox
new file mode 100644
index 000000000..36b9cae7c
--- /dev/null
+++ b/rt/html/Elements/ShadedBox
@@ -0,0 +1,33 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<table>
+  <tr>
+    <td class="label"><%$title |n %>:</td>
+    <td class="value"><%$content |n %></td>
+  </tr>
+</table>
+<%ARGS>
+$title => undef
+$content => "&nbsp;"
+</%ARGS>
diff --git a/rt/html/Elements/ShadedInputRow b/rt/html/Elements/ShadedInputRow
new file mode 100644
index 000000000..e9fb69e5f
--- /dev/null
+++ b/rt/html/Elements/ShadedInputRow
@@ -0,0 +1,35 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<tr>
+  <td class="label"><%$title |n %>:</td>
+  <td class="value">
+    <input name=<%$name%> value="<%$content|h%>" SIZE=<%$size%>>
+  </td>
+</tr>
+<%ARGS>
+$title => undef
+$content => "&nbsp;"
+$name => undef
+$size => undef
+</%ARGS>
diff --git a/rt/html/Elements/ShadedRow b/rt/html/Elements/ShadedRow
new file mode 100644
index 000000000..8947fcd82
--- /dev/null
+++ b/rt/html/Elements/ShadedRow
@@ -0,0 +1,31 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<tr>
+  <td class="label"><%$title |n %>:</td>
+  <td class="value"><%$content |n %></td>
+</tr>
+<%ARGS>
+$title => undef
+$content => "&nbsp;"
+</%ARGS>
diff --git a/rt/html/Elements/SimpleSearch b/rt/html/Elements/SimpleSearch
new file mode 100644
index 000000000..69541f801
--- /dev/null
+++ b/rt/html/Elements/SimpleSearch
@@ -0,0 +1,27 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<form action="<% $RT::WebPath %>/index.html">
+<input size="12" name="q" accesskey="0">
+<input type="submit" value="<&|/l&>Search</&>">&nbsp;
+</form>
diff --git a/rt/html/Elements/Submit b/rt/html/Elements/Submit
new file mode 100644
index 000000000..2c35ca0f4
--- /dev/null
+++ b/rt/html/Elements/Submit
@@ -0,0 +1,62 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<TABLE WIDTH=100% BGCOLOR="<%$color%>" CELLSPACING=0 BORDER=0 CELLPADDING=0 >
+<TR>
+% if ($Reset) {
+<TD>
+<FONT COLOR=#ffd800 >
+<INPUT TYPE=RESET VALUE="<%$ResetLabel%>">
+</FONT>
+</TD>
+%}
+<TD>
+&nbsp;
+</TD>
+<TD ALIGN=RIGHT VALIGN=CENTER><FONT COLOR=#ffd800>
+% if ($AlternateLabel) {
+<B><%$AlternateCaption%>
+<INPUT TYPE=SUBMIT
+%if ($Name) {
+NAME="<%$Name%>"
+%}
+VALUE='<%$AlternateLabel%>'></B>
+% }
+<B><%$Caption%> <INPUT TYPE=SUBMIT
+%if ($Name) {
+NAME="<%$Name%>"
+% }
+ VALUE='<%$Label%>'></B></FONT>
+</TD>
+</TR>
+</TABLE>
+<%ARGS>
+$color => "#336699"
+$Caption => undef
+$AlternateCaption => undef
+$AlternateLabel => undef
+$Label => loc('Submit')
+$Name => undef
+$Reset => undef
+$ResetLabel => loc('Reset')
+</%ARGS>
diff --git a/rt/html/Elements/Tabs b/rt/html/Elements/Tabs
new file mode 100644
index 000000000..4db3849c6
--- /dev/null
+++ b/rt/html/Elements/Tabs
@@ -0,0 +1,82 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/PageLayout,
+    current_toptab => $current_toptab,
+    current_tab => $current_tab,
+    toptabs => $toptabs,
+    topactions => $topactions,
+    tabs => $tabs,
+    actions => $actions,
+    subactions => $subactions,
+    title => $Title
+&>
+<a name="skipnav" id="skipnav" accesskey="8"></a>
+<%INIT>
+my $action;
+my $basetopactions = {
+	A => { html => $m->scomp('/Elements/CreateTicket')	
+		},
+	B => { html => $m->scomp('/Elements/SimpleSearch') 
+		}
+	};
+my $basetabs = {     A => { title => loc('Homepage'),
+                           path => '',
+                         },
+                    B => { title => loc('Tickets'),
+                        path => 'Search/Listing.html'
+                      },
+                    E => { title => loc('Configuration'),
+                           path => 'Admin/'
+                         },
+                    K => { title => loc('Preferences'),
+                        path => 'User/Prefs.html'
+                      },
+                    P => { title => loc('Approval'),
+                           path => 'Approvals/'
+                         },
+                 };
+
+if (!defined $toptabs) {
+   $toptabs = $basetabs;
+}
+if (!defined $topactions) {
+   $topactions = $basetopactions;
+}
+                    
+  # Now let callbacks add their extra tabs
+  $m->comp('/Elements/Callback', 
+    topactions => $topactions, 
+    toptabs => $toptabs, %ARGS);
+
+</%INIT>
+<%ARGS>
+$current_toptab => undef
+$current_tab => undef
+$toptabs => undef
+$topactions => undef
+$tabs => undef
+$actions => undef
+$subactions => undef
+$Title => undef
+</%ARGS>
diff --git a/rt/html/Elements/TitleBoxEnd b/rt/html/Elements/TitleBoxEnd
new file mode 100644
index 000000000..37f374466
--- /dev/null
+++ b/rt/html/Elements/TitleBoxEnd
@@ -0,0 +1,31 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+    </TD>
+  </TR>
+</TABLE>
+<%ARGS>
+$title => undef
+$content => undef
+</%ARGS>
+
diff --git a/rt/html/Elements/TitleBoxStart b/rt/html/Elements/TitleBoxStart
new file mode 100644
index 000000000..02c76a75e
--- /dev/null
+++ b/rt/html/Elements/TitleBoxStart
@@ -0,0 +1,60 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<TABLE CLASS="<%$class|n%>" 
+        BGCOLOR="<%$color%>" 
+        CELLSPACING=0
+        BORDER=0
+        WIDTH="<%$width%>"
+        CELLPADDING="0">
+
+  <TR>
+    <TH 
+        <%$color && "style=\"color: $color;\""|n%>
+        <%$class ? "class=\"$class\"" : "class=\"titlebox\""|n%>>
+      <span class="titleboxtitle">
+        <b>
+         <% $title_href && "<A CLASS=\"$title_class\" HREF=\"$title_href\">"|n%><%$title |n %><%  $title_href && "</A>" |n%></b>
+      </span>
+    </TH>
+    <TH  
+         <%$color && "style=\"color: $color;\""|n%>
+         <%$class ? "class=\"$class\"": "class=\"titleboxright\""|n%>>
+      <span class="titleboxright"><%$titleright ? $titleright : '&nbsp;' |n %></span>
+    </TH>
+  </TR>
+  <tr>
+    <td bgcolor="<%$contentbg%>" colspan="2" class="<%defined($bodyclass) ? $bodyclass :  $class|n%>">
+<%ARGS>
+$width => "100%"
+$class =>  undef
+$bodyclass => undef
+$title_href => undef
+$title => undef
+$title_class => undef
+
+$titleright_href => undef
+$titleright => undef
+$contentbg => "#dddddd"
+$color => "#336699"
+</%ARGS>
diff --git a/rt/html/Elements/ViewUser b/rt/html/Elements/ViewUser
new file mode 100644
index 000000000..657272496
--- /dev/null
+++ b/rt/html/Elements/ViewUser
@@ -0,0 +1,51 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/TitleBoxStart, 
+	title => "<a class='inverse' href=\"$RT::WebPath/Search/Listing.html?LimitRequestorById=1&IdOfRequestor=".$User->id."\">".loc("Tickets from [_1]", $name)."</a>",
+	titleright=> "<a class='inverse' href=\"$RT::WebPath/EditUserComments.html?id=".$User->id."\">".loc("Comments about [_1]", $name)."</a>" &>
+<TABLE WIDTH="100%">
+<tr>
+<td halign=left valign=top>
+%while (my $w=$tickets->Next) {
+<%$w->Id%>: <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$w->id%>"><%$w->Subject%></a> (<%$w->Status%>)<BR>
+%}
+</td>
+<td align=right valign=top>
+	<% ($User->Comments || loc("No comment entered about this user")) %>
+</tr>
+</table>
+<& /Elements/TitleBoxEnd &>
+
+<%ARGS>
+$User=>undef
+</%ARGS>
+
+<%INIT>
+my $name=$User->RealName || $User->EmailAddress;	
+
+my $tickets = new RT::Tickets($session{'CurrentUser'});
+$tickets->LimitWatcher(TYPE => 'Requestor', VALUE => $User->EmailAddress);
+
+
+</%INIT>
diff --git a/rt/html/NoAuth/Logout.html b/rt/html/NoAuth/Logout.html
new file mode 100644
index 000000000..a4bb99772
--- /dev/null
+++ b/rt/html/NoAuth/Logout.html
@@ -0,0 +1,46 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<HTML>
+<HEAD>
+<TITLE>RT: Logout</TITLE>
+ <META HTTP-EQUIV="Refresh" CONTENT="0;URL=<%$URL%>">
+</HEAD>
+<BODY>
+<p><&|/l&>You have been logged out of RT.</&>
+
+<br>
+<br>
+<A HREF="<%$URL%>"><&|/l&>You're welcome to login again</&></a>
+
+
+<%PERL>
+if (defined %session) {
+	tied(%session)->delete;
+}
+$m->abort();
+</%PERL>
+
+<%ARGS>
+$URL => $RT::WebPath."/"
+</%ARGS>
diff --git a/rt/html/NoAuth/Reminder.html b/rt/html/NoAuth/Reminder.html
new file mode 100644
index 000000000..35da66e61
--- /dev/null
+++ b/rt/html/NoAuth/Reminder.html
@@ -0,0 +1,26 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, title => loc('Password Reminder') &>
+
+<&|/l&>Not yet implemented.</&>
diff --git a/rt/html/NoAuth/images/back_home.gif b/rt/html/NoAuth/images/back_home.gif
new file mode 100644
index 000000000..40b19c153
Binary files /dev/null and b/rt/html/NoAuth/images/back_home.gif differ
diff --git a/rt/html/NoAuth/images/bplogo.gif b/rt/html/NoAuth/images/bplogo.gif
new file mode 100644
index 000000000..e2cf49c42
Binary files /dev/null and b/rt/html/NoAuth/images/bplogo.gif differ
diff --git a/rt/html/NoAuth/images/favicon.png b/rt/html/NoAuth/images/favicon.png
new file mode 100644
index 000000000..ed1ee37ff
Binary files /dev/null and b/rt/html/NoAuth/images/favicon.png differ
diff --git a/rt/html/NoAuth/images/head_requestracker.gif b/rt/html/NoAuth/images/head_requestracker.gif
new file mode 100644
index 000000000..73315e918
Binary files /dev/null and b/rt/html/NoAuth/images/head_requestracker.gif differ
diff --git a/rt/html/NoAuth/images/rt.jpg b/rt/html/NoAuth/images/rt.jpg
new file mode 100644
index 000000000..a137a932b
Binary files /dev/null and b/rt/html/NoAuth/images/rt.jpg differ
diff --git a/rt/html/NoAuth/images/space.gif b/rt/html/NoAuth/images/space.gif
new file mode 100644
index 000000000..1d11fa9ad
Binary files /dev/null and b/rt/html/NoAuth/images/space.gif differ
diff --git a/rt/html/NoAuth/images/spacer.gif b/rt/html/NoAuth/images/spacer.gif
new file mode 100644
index 000000000..5bfd67a2d
Binary files /dev/null and b/rt/html/NoAuth/images/spacer.gif differ
diff --git a/rt/html/NoAuth/images/squares_blue.gif b/rt/html/NoAuth/images/squares_blue.gif
new file mode 100644
index 000000000..a28da5ce1
Binary files /dev/null and b/rt/html/NoAuth/images/squares_blue.gif differ
diff --git a/rt/html/NoAuth/webrt.css b/rt/html/NoAuth/webrt.css
new file mode 100644
index 000000000..62c6d66ba
--- /dev/null
+++ b/rt/html/NoAuth/webrt.css
@@ -0,0 +1,338 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+SPAN.nav {  font-family: Verdana, Arial, Helvetica, sans-serif;
+	 font-size: 12px;
+	 color: #FFFFFF;
+	 text-decoration: none;
+	 white-space: nowrap}
+.nav2 {	 font-size: 10px;
+	 white-space: nowrap}
+.nav {  font-family: Verdana, Arial, Helvetica, sans-serif;
+	 font-size: 13px;
+	 font-weight: normal;
+	 color: #FFFFFF;
+	 text-decoration: none;
+	 white-space: nowrap}
+.currentnav {  font-family: Verdana, Arial, Helvetica, sans-serif;
+	 font-size: 13px;
+         font-weight: bold;
+	 color: #FFFF66;
+	 text-decoration: none;
+	 white-space: nowrap}
+.topnav {  font-family: Verdana, Arial, Helvetica, sans-serif;
+	 font-size: 16px;
+	 font-weight: normal;
+	 color: #FFFFFF;
+	 text-decoration: none;
+	 white-space: nowrap}
+.currenttopnav {  font-family: Verdana, Arial, Helvetica, sans-serif;
+	 font-size: 16px;
+         font-weight: bold;
+	 color: #FFFF66;
+	 text-decoration: none;
+	 white-space: nowrap}
+.topactions {  font-family: Verdana, Arial, Helvetica, sans-serif;
+	 font-size: 10px;
+	 color: #FFFFFF;
+	 text-decoration: none;
+	 white-space: nowrap}
+.subnav {  font-family: Verdana, Arial, Helvetica, sans-serif;
+	 font-size: 11px;
+	 font-weight: normal;
+	 color: #FFFFFF;
+	 text-decoration: none;
+	 white-space: nowrap}
+.currentsubnav {  font-family: Verdana, Arial, Helvetica, sans-serif;
+	 font-size: 11px;
+         font-weight: bold;
+	 color: #FFFF66;
+	 text-decoration: none;
+	 white-space: nowrap}
+.error {  background-color: #ff0000;
+	 background-position: left top;
+	 vertical-align: top;
+	 text-align: left;
+         }
+.oldblue {  background-color: #0066CC;
+	 background-position: left top;
+	 vertical-align: top;
+	 text-align: left;
+         }
+.blue {  background-color: #4682B4;
+	 background-position: left top;
+	 vertical-align: top;
+	 text-align: left;
+         }
+.blueright {  background-color: #4682B4;
+	 background-position: left top;
+	 vertical-align: top;
+	 text-align: right;
+         }
+.olddarkblue {  background-color: #003399;
+	 background-position: left top;
+	 vertical-align: top;
+	 text-align: left;
+         }
+.darkblue {  background-color: #000080;
+	 background-position: left top;
+	 vertical-align: top;
+	 text-align: left;
+         }
+.darkblueright {  background-color: #000080;
+	 background-position: left top;
+	 vertical-align: top;
+	 text-align: right;
+         }
+
+td {  font-family: Verdana, Arial, Helvetica, sans-serif;
+	 font-size: 11px;
+	 background-position: left top;
+         }
+.black { background-color: #000000;
+	 background-position: left top;
+         }
+span.rtname {  font-family: Verdana, Arial, Helvetica, sans-serif;
+	 font-size: 18px;
+	 font-weight: normal;
+	 color: #ffffff}
+span.title {  font-family: Verdana, Arial, Helvetica, sans-serif;
+	 font-size: 20px;
+	 font-weight: bold;
+	 color: #ffffff}
+.header {  font-family: Verdana, Arial, Helvetica, sans-serif;
+	 font-size: 12px;
+	 font-weight: bold;
+	 color: #0066CC}
+.subheader { font-family: Verdana, Arial, Helvetica, sans-serif;
+	 font-size: 11px;
+	 font-weight: bold;
+	 color: #0066CC }
+.value {       font-weight: bold; }
+.entry {       font-weight: normal; }
+.label {       font-weight: normal;
+	       text-align: right; }
+.labeltop {       font-weight: normal;
+	       text-align: right;
+	       vertical-align: top }
+.productnav {  font-family: Verdana, Arial, Helvetica, sans-serif;
+	 font-size: 11px;
+	 color: #000000;
+	 text-align: center;
+	 vertical-align: middle;
+	 text-decoration: none}
+.rtblue { background-color: #3399FF;
+         margin-top: 0.2em;
+	 background-position: left top;
+	 vertical-align: top }
+
+
+.currenttab { margin: 0.2em; background: #336699; }
+.othertab { margin: 0.2em; background: #efefef; }
+.oddline { background-color : #ccccee; }
+
+UL.topnav LI :focus { text-decoration: underline; }
+
+TD.mainbody {
+        padding-top: 0.5em;
+        padding-left: 0em;
+        padding-right: 1em;
+        margin-left: 1em;
+        margin-right: 1em;
+}
+
+th.ticketheader { font-size: 80%;
+     font-weight: bold;
+     color: #336699;
+     background: #cccccc; 
+}
+
+th.titlebox {
+        text-align: left;
+        padding-left: 0.5em;
+        padding-right: 0.5em;
+        margin-left: 0.5em;
+        margin-right: 0.5em;
+        border-top: solid black 1px;
+        border-bottom: solid black 1px;
+}    
+th.titleboxright {
+        text-align: right;
+        padding-left: 0.5em;
+        padding-right: 0.5em;
+        margin-left: 0.5em;
+        margin-right: 0.5em;
+        border-top: solid black 1px;
+        border-bottom: solid black 1px;
+}    
+
+TD.titlebox {
+        padding-left: 1em;
+        padding-right: 1em;
+        padding-top: 1em;
+        padding-bottom: 1em;
+}
+
+SPAN.message {
+	font-size: 100%;
+        font-family: Verdana, Arial, Helvetica, sans-serif;
+}
+
+
+BODY {
+  color: #000;
+  background: #FFFFFF;
+  font-family: "Helvetica", sans-serif;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-left: 0px;
+  margin-right: 0px;
+  border-top: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-right: 0px;
+}
+
+
+TR.oddline { 
+    background-color : #ffffff;
+}
+
+TR.evenline { 
+    background-color : #ccccee;
+}
+
+H1, H2, H3 { 
+  margin-top: 0.2em;
+  color: #336699;
+  font-family: "Helvetica", sans-serif;
+
+  clear: both;
+}
+
+
+DIV.endmatter { margin-left: -7% }
+.bpscredits {margin-top: 1em;
+             text-align: right; 
+             color: #666666;
+             }
+
+
+A { font-weight: bold; color: #000000;
+            }
+
+.currenttab { color: #ffffff;}
+.othertab { color: #336699; }
+
+.inverse { color: #ffffff; }
+
+
+
+A:link IMG, A:visited IMG { border-style: none }
+a:focus {text-decoration: underline }
+A IMG { color: white } /* The only way to hide the border in NS 4.x */
+
+a:link {  text-decoration: none}
+a:visited {  text-decoration: none}  
+a:hover {  text-decoration: underline}
+/* a:focus { background-color: #ccccee } */
+
+.hide {
+  display: none;
+  color: white;
+}
+
+SPAN.date { font-size: 0.8em }
+
+span.title { font-size: 1.6em;
+	     vertical-align: middle;
+             color: #ffffff;}
+span.productname { font-size: 2em;
+             color: #0066cc;}
+SPAN.titleboxtitle {
+        font-size: 1.1em;
+        color: #ffffff;
+	 vertical-align: middle;
+	 text-align: left;
+        }
+
+SPAN.titleboxright {
+        font-size: 0.8em;
+        color: #ffffff;
+	 vertical-align: middle;
+	 text-align: right;
+        }
+
+SPAN.attribution {
+  font-weight: bold;
+}
+
+SPAN.label { font-size: 0.8em; 
+}
+
+BLOCKQUOTE {
+  font-style: italic;
+  /* color: #990; */
+}
+
+ADDRESS { 
+  text-align: right;
+  font-weight: bold;
+  font-style: italic 
+}
+
+BLOCKQUOTE P {			/* Try to avoid space above the attribution */
+  margin-bottom: 0;
+}
+BLOCKQUOTE ADDRESS {
+  margin: 0;
+}
+
+
+.emphasized {
+  font-weight: bold
+}
+
+
+P.map-also { font-style: italic; margin-left: 15%; text-align: right }
+
+.oddline { 
+        background-color : #ccccee;
+}
+
+ul.topnav {
+	list-style: none;
+	margin-left: 0;
+ 	margin-right: 0.25em;		
+	padding-left: 0.25em;
+	padding-bottom: 0;	
+	padding-top:0;
+	margin-top: 0;
+	margin-bottom:0;
+}
+
+
+<%init>
+$r->content_type('text/css');
+$r->header_out('Expires' ,'+30m');
+</%init>
diff --git a/rt/html/REST/1.0/NoAuth/mail-gateway b/rt/html/REST/1.0/NoAuth/mail-gateway
new file mode 100644
index 000000000..8db80d5ff
--- /dev/null
+++ b/rt/html/REST/1.0/NoAuth/mail-gateway
@@ -0,0 +1,49 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<%ARGS>
+$message
+$queue => 1
+$action => "correspond"
+$ticket => undef
+</%ARGS>
+<%init>
+use RT::Interface::Email; 
+my ( $status, $error, $Ticket ) = RT::Interface::Email::Gateway( %ARGS);
+</%init>
+<%flags>
+inherit => undef # inhibit UTF8 conversion done in /autohandler
+</%flags>
+%    if ($status) {
+ok
+%        if ( $Ticket->Id ) {
+Ticket: <% $Ticket->Id %>
+Queue: <% $Ticket->QueueObj->Name %>
+Owner: <% $Ticket->OwnerObj->Name %>
+Status: <% $Ticket->Status %>
+Subject: <% $Ticket->Subject %>
+Requestor: <% $Ticket->Requestors->MemberEmailAddressesAsString %>
+%        }
+% }   else { 
+not ok - <%$error%> 
+% }
diff --git a/rt/html/Search/Bulk.html b/rt/html/Search/Bulk.html
new file mode 100644
index 000000000..df43cfa50
--- /dev/null
+++ b/rt/html/Search/Bulk.html
@@ -0,0 +1,217 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => loc("Bulk ticket update") &>
+<& /Elements/Tabs, Title => loc("Bulk ticket update") &>
+
+<& /Elements/ListActions, actions => \@results &>
+
+<FORM METHOD=POST>
+<TABLE WIDTH=100% border=0 cellpadding=3 CELLSPACING=0>
+<TR>
+<TH><&|/l&>Update</&></TH>
+%foreach my $col (@cols) {
+% my $colalias = $col;
+% $colalias =~ s/(Obj\-\>|)(Name|AsString)//;
+
+<TH><% loc($colalias) %>&nbsp;</TH>
+%}
+</TR>
+
+<%PERL>
+
+my $i;
+
+
+      
+$session{'tickets'}->RedoSearch();
+while (my $Ticket = $session{'tickets'}->Next) {
+ $i++;
+ if ($i % 2) {
+     $bgcolor = "#dddddd";
+ }
+ else {
+     $bgcolor = "#ffffff";
+ }
+      </%PERL>
+<TR bgcolor="<%$bgcolor%>">
+<TD><input type=checkbox name="UpdateTicket<%$Ticket->Id%>" CHECKED></TD>
+%# The ticket view is controlled by config.pm, WebOptions
+%foreach my $col (@cols) {
+<TD>
+% if ($col eq 'id') {
+<A HREF="<% $RT::WebPath%>/Ticket/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id()%></A>
+% }
+%else {
+<% eval "\$Ticket->$col()" %>&nbsp;
+%}
+</TD>
+%}
+</TR>
+%}
+
+
+
+</TABLE>
+
+<HR>
+
+
+<& /Elements/TitleBoxStart, title => loc('Update selected tickets') &>
+<TABLE>
+<TR>
+<TD VALIGN=TOP>
+<table>
+<tr><td class=label> <&|/l&>Make Owner</&>: </td>
+<td class=value> <& /Elements/SelectOwner, Name => "Owner" &> (<input type=checkbox name="ForceOwnerChange"> <&|/l&>Force change</&>) </td></tr>
+<tr><td class=label> <&|/l&>Add Requestor</&>: </td>
+<td class=value> <INPUT Name="AddRequestor" SIZE=20> </td></tr>
+<tr><td class=label> <&|/l&>Remove Requestor</&>: </td>
+<td class=value> <INPUT Name="DeleteRequestor" SIZE=20> </td></tr>
+<tr><td class=label> <&|/l&>Add Cc</&>: </td>
+<td class=value> <INPUT Name="AddCc" SIZE=20> </td></tr>
+<tr><td class=label> <&|/l&>Remove Cc</&>: </td>
+<td class=value> <INPUT Name="DeleteCc" SIZE=20> </td></tr>
+<tr><td class=label> <&|/l&>Add AdminCc</&>: </td>
+<td class=value> <INPUT Name="AddAdminCc" SIZE=20> </td></tr>
+<tr><td class=label> <&|/l&>Remove AdminCc</&>: </td>
+<td class=value> <INPUT Name="DeleteAdminCc" SIZE=20> </td></tr>
+</table>
+</TD>
+<TD VALIGN=TOP>
+<table>
+<tr><td class=label> <&|/l&>Make subject</&>: </td>
+<td class=value> <INPUT Name="Subject" SIZE=20> </td></tr>
+<tr><td class=label> <&|/l&>Make priority</&>: </td>
+<td class=value> <INPUT Name="Priority" SIZE=4> </td></tr>
+<tr><td class=label> <&|/l&>Make queue</&>: </td>
+<td class=value> <& /Elements/SelectQueue, Name => "Queue" &> </td></tr>
+<tr><td class=label> <&|/l&>Make Status</&>: </td>
+<td class=value> <& /Elements/SelectStatus, Name => "Status" &> </td></tr>
+<tr><td class=label> <&|/l&>Make date Starts</&>: </td>
+<td class=value> <& /Elements/SelectDate, Name => "Starts_Date", ShowTime => 0, Default => '' &> </td></tr>
+<tr><td class=label> <&|/l&>Make date Started</&>: </td>
+<td class=value> <& /Elements/SelectDate, Name => "Started_Date", ShowTime => 0, Default => '' &> </td></tr>
+<tr><td class=label> <&|/l&>Make date Told</&>: </td>
+<td class=value> <& /Elements/SelectDate, Name => "Told_Date", ShowTime => 0, Default => '' &> </td></tr>
+<tr><td class=label> <&|/l&>Make date Due</&>: </td>
+<td class=value> <& /Elements/SelectDate, Name => "Due_Date", ShowTime => 0, Default => '' &> </td></tr>
+<tr><td class=label> <&|/l&>Make date Resolved</&>: </td>
+<td class=value> <& /Elements/SelectDate, Name => "Resolved_Date", ShowTime => 0, Default => '' &> </td></tr>
+</table>
+
+</TD>
+</TR>
+</table>
+<& /Elements/TitleBoxEnd&>
+<& /Elements/TitleBoxStart, title => loc('Add comments or replies to selected tickets') &>
+<table>
+<tr><td align=right><&|/l&>Update Type</&>:</td>
+<td><select name="UpdateType">
+  <option value="private" ><&|/l&>Comments (not sent to requestors)</&></option>
+<option value="response" ><&|/l&>Response to requestors</&></option>
+</select> 
+</td></tr>
+<tr><td align=right><&|/l&>Subject</&>:</td><td> <input name="UpdateSubject" size=60 value=""></td></tr>
+ <tr><td align=right><&|/l&>Attach</&>:</td><td><input name="UpdateAttachment" type="file"></td></tr>
+ <tr><td class=labeltop><&|/l&>Message</&>:</td><td>
+ <& /Elements/MessageBox, Name=>"UpdateContent"&>
+ </td></tr>
+ </table>
+<& /Elements/TitleBoxEnd &>
+
+<& /Elements/TitleBoxStart, title => loc('Edit Relationships'), color => "#336633"&>
+<i><&|/l&>Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces.</&></i><br>
+<& /Ticket/Elements/BulkLinks &>
+<& /Elements/TitleBoxEnd &>
+
+<& /Elements/Submit &>
+
+
+</FORM>
+<%INIT>
+
+# Iterate through the ARGS hash and remove anything with a null value.
+map ($ARGS{$_} =~ /^$/ && (delete $ARGS{$_}), keys %ARGS);
+
+my ($bgcolor, @results);
+my @cols = qw(id Status Priority Subject QueueObj->Name OwnerObj->Name RequestorAddresses DueAsString );
+
+Abort(loc("No search to operate on.")) unless ($session{'tickets'});
+
+
+my $do_comment_reply=0;
+# Prepare for ticket updates
+$ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
+chomp ($ARGS{'UpdateContent'}) ;
+
+if ($ARGS{'UpdateContent'} &&
+    $ARGS{'UpdateContent'} ne '' &&
+    $ARGS{'UpdateContent'} ne  "-- \n" .
+    $session{'CurrentUser'}->UserObj->Signature) {
+            $do_comment_reply=1;
+}
+
+#Iterate through each ticket we've been handed
+my @linkresults;
+
+while (my $Ticket = $session{'tickets'}->Next) {
+    $RT::Logger->debug( "Checking Ticket ".$Ticket->Id ."\n");
+    next unless ($ARGS{"UpdateTicket".$Ticket->Id});
+    $RT::Logger->debug ("Matched\n");
+    #Update the basics.
+    my @basicresults = ProcessTicketBasics(TicketObj => $Ticket, ARGSRef => \%ARGS);
+    my @dateresults = ProcessTicketDates(TicketObj => $Ticket, ARGSRef => \%ARGS);
+    #Update the watchers
+    my @watchresults = ProcessTicketWatchers(TicketObj => $Ticket, ARGSRef => \%ARGS);    
+
+    #Update the links
+    $ARGS{'id'} = $Ticket;
+    $ARGS{$Ticket->Id.'-MergeInto'} = $ARGS{'Ticket-MergeInto'};
+    $ARGS{$Ticket->Id.'-DependsOn'} = $ARGS{'Ticket-DependsOn'};
+    $ARGS{'DependsOn-'.$Ticket->Id} = $ARGS{'DependsOn-Ticket'};
+    $ARGS{$Ticket->Id.'-MemberOf'} = $ARGS{'Ticket-MemberOf'};
+    $ARGS{'MemberOf-'.$Ticket->Id} = $ARGS{'MemberOf-Ticket'};
+    $ARGS{$Ticket->Id.'-RefersTo'} = $ARGS{'Ticket-RefersTo'};
+    $ARGS{'RefersTo-'.$Ticket->Id} = $ARGS{'RefersTo-Ticket'};
+    @linkresults = ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);
+    delete $ARGS{'id'};
+    delete $ARGS{$Ticket->Id.'-MergeInto'};
+    delete $ARGS{$Ticket->Id.'-DependsOn'};
+    delete $ARGS{'DependsOn-'.$Ticket->Id};
+    delete $ARGS{$Ticket->Id.'-MemberOf'};
+    delete $ARGS{'MemberOf-'.$Ticket->Id};
+    delete $ARGS{$Ticket->Id.'-RefersTo'};
+    delete $ARGS{'RefersTo-'.$Ticket->Id};
+    
+    my @updateresults; 
+    if ($do_comment_reply) {
+    ProcessUpdateMessage(TicketObj => $Ticket, ARGSRef => \%ARGS, Actions => \@updateresults); 
+   } 
+   my @tempresults = (@watchresults, @basicresults, @dateresults, @updateresults, @linkresults);
+    @tempresults = map { loc("Ticket [_1]: [_2]",$Ticket->Id,$_) } @tempresults;
+
+    @results = (@results, @tempresults);
+}
+
+</%INIT>
diff --git a/rt/html/Search/Elements/PickRestriction b/rt/html/Search/Elements/PickRestriction
new file mode 100644
index 000000000..a6911df5a
--- /dev/null
+++ b/rt/html/Search/Elements/PickRestriction
@@ -0,0 +1,141 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<FORM ACTION="Listing.html" METHOD="GET">
+<INPUT TYPE=HIDDEN NAME="Bookmark" VALUE="<% $session{'tickets'}->FreezeLimits()|u %>">
+<& /Elements/TitleBoxStart, title => loc('Refine search')&>
+<INPUT TYPE=HIDDEN NAME="CompileRestriction" VALUE=1>
+
+<ul>
+<li><&|/l&>Owner is</&>  <& /Elements/SelectBoolean, Name => "OwnerOp", 
+					  TrueVal=> '=', 
+					  FalseVal => '!=' 
+&> 
+<& /Elements/SelectOwner, Name => "ValueOfOwner" &>
+
+<li>
+<&|/l&>Requestor email address</&> 
+<& /Elements/SelectMatch, Name => "RequestorOp" &>
+<INPUT Name="ValueOfRequestor" SIZE=20>
+
+<li>
+<&|/l&>Subject</&> <& /Elements/SelectMatch, Name => "SubjectOp" &> 
+<INPUT Name="ValueOfSubject" SIZE=20>
+
+<li><&|/l&>Queue</&>  <& /Elements/SelectBoolean,  Name => "QueueOp" , 
+					True => loc("is"), 
+					False => loc("isn't"), 
+					TrueVal=> '=', 
+					FalseVal => '!=' &>
+<& /Elements/SelectQueue, Name => loc("ValueOfQueue") &>
+
+
+<li><&|/l&>Priority</&> <& /Elements/SelectEqualityOperator, Name => "PriorityOp" &>
+
+<INPUT Name="ValueOfPriority" SIZE=5>
+
+<li>
+<& /Elements/SelectDateType, Name => 'DateType' &>
+<& /Elements/SelectDateRelation, Name=>"DateOp" &>
+<& /Elements/SelectDate, Name => "ValueOfDate", ShowTime => 0, Default => '' &>
+
+<li><&|/l&>Ticket attachment</&> 
+
+<& /Elements/SelectAttachmentField, Name => 'AttachmentField' &>
+<& /Elements/SelectBoolean, Name => "AttachmentFieldOp", 
+			    True => loc("matches"), 
+			    False => loc("does not match"), 
+			    TrueVal => 'LIKE', 
+			    FalseVal => 'NOT LIKE' 
+&> 
+<Input Name="ValueOfAttachmentField" Size=20>
+
+<li><&|/l&>Status</&> 
+<& /Elements/SelectBoolean, Name => "StatusOp", 
+			    True => loc("is"), 
+  			    False => loc("isn't"), 
+			    TrueVal=> '=', 
+			    FalseVal => '!=' 
+&>  
+<& /Elements/SelectStatus, Name => "ValueOfStatus" &>
+
+
+% while ( my $CustomField = $CustomFields->Next ) {
+
+<li><% $CustomField->Name %> 
+        <& /Elements/SelectCustomFieldOperator, Name => "CustomFieldOp". $CustomField->id, 
+                                    True => loc("is"), 
+                                    False => loc("isn't"), 
+                                    TrueVal=> '=', FalseVal => '!=' &>
+
+<& /Elements/SelectCustomFieldValue, Name => "CustomField".$CustomField->id,
+                            CustomField => $CustomField,
+                            &>
+% }
+
+</UL>
+
+<& /Elements/TitleBoxEnd &>
+
+<& /Elements/TitleBoxStart, title => loc('Ordering and sorting')&>
+
+<UL>
+
+<li><&|/l&>Results per page</&> <& /Elements/SelectResultsPerPage, Name => "RowsPerPage", 
+							Default => $session{'tickets_rows_per_page'} || '50'
+&>
+
+<li><&|/l&>Sort results by</&> <& /Elements/SelectTicketSortBy, Name => "TicketsSortBy", 
+						     Default => $session{'tickets_sort_by'} 
+&> 
+<& /Elements/SelectSortOrder, Name => 'TicketsSortOrder', Default => $session{'tickets_sort_order'} &>
+
+<li><input type="checkbox" name="HideResults" <%$ARGS{'HideResults'} && 'CHECKED'%>> <&|/l&>Don't show search results</&>
+<li><& /Elements/Refresh, Name => 'RefreshSearchInterval' , Default => $session{'tickets_refresh_interval'} &>
+
+</UL>
+
+
+</DIV>
+
+
+
+<& /Elements/TitleBoxEnd &>
+
+<& /Elements/Submit, Label => loc('Search'), Name => 'Action'&>
+
+</FORM>
+
+
+ <%INIT>
+my $CustomFields = RT::CustomFields->new( $session{'CurrentUser'});
+ foreach ( $session{'tickets'}->RestrictionValues('Queue') ) {
+        # Gotta load up the $queue object, since queues get stored by name now.
+        my $queue = RT::Queue->new($session{'CurrentUser'});
+        $queue->Load($_);
+        $CustomFields->LimitToQueue($queue->Id);
+ }
+
+ $CustomFields->LimitToGlobal();
+
+</%INIT>
diff --git a/rt/html/Search/Elements/TicketHeader b/rt/html/Search/Elements/TicketHeader
new file mode 100644
index 000000000..ed2f60e4e
--- /dev/null
+++ b/rt/html/Search/Elements/TicketHeader
@@ -0,0 +1,40 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<TR>
+<& TicketHeaderCell , Attribute => 'id', Header => '#'&>
+<& TicketHeaderCell , Attribute => 'Subject'&>
+<& TicketHeaderCell , Attribute => 'Status'&>
+<& TicketHeaderCell , Attribute => 'Queue'&>
+<& TicketHeaderCell , Attribute => 'Owner'&>
+<& TicketHeaderCell , Attribute => 'Priority'&>
+</TR>
+<TR>
+<TH class="ticketheader">&nbsp;</TH>
+<& TicketHeaderCell , Attribute => 'Requestor(s)'&>
+<& TicketHeaderCell , Attribute => 'Created'&>
+<& TicketHeaderCell , Attribute => 'Told', Header => 'Last Contact'&>
+<& TicketHeaderCell , Attribute => 'LastUpdated', Header => 'Last Updated'&>
+<& TicketHeaderCell , Attribute => 'TimeLeft', Header => 'Left'&>
+</TR>
+%# loc('Last Notified');
diff --git a/rt/html/Search/Elements/TicketHeaderCell b/rt/html/Search/Elements/TicketHeaderCell
new file mode 100644
index 000000000..5def9ea37
--- /dev/null
+++ b/rt/html/Search/Elements/TicketHeaderCell
@@ -0,0 +1,55 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<%INIT> 
+my ($order,$curorder);
+ $Attribute =~ s/Obj->(Name|AsString|AgeAsString)//g;
+  if ($session{'tickets_sort_order'} =~ /^asc$/i) {
+   $order = 'DESC';
+   $curorder = 'ASC';
+ } else {
+   $order = 'ASC';
+   $curorder = 'DESC';
+ }
+$Header = $Attribute unless ($Header);
+
+</%INIT>
+<th class="ticketheader">
+% if (grep (/^$Attribute$/i, $session{'tickets'}->SortFields)) {
+<A 
+% if ($Attribute eq $session{'tickets_sort_by'}) {
+class="currenttab"
+HREF="<% $RT::WebPath%>/Search/Listing.html?Bookmark=<%$session{'tickets'}->FreezeLimits()|u%>&TicketsSortBy=<%$Attribute%>&TicketsSortOrder=<%$order%>&RowsPerPage=<%$session{'tickets_rows_per_page'}%>">
+% } else {
+HREF="<% $RT::WebPath%>/Search/Listing.html?Bookmark=<%$session{'tickets'}->FreezeLimits()|u%>&TicketsSortBy=<%$Attribute%>&TicketsSortOrder=<%$curorder%>&RowsPerPage=<%$session{'tickets_rows_per_page'}%>">
+% }
+<% loc($Header) %>
+</A>
+% } else {
+<% loc($Header) %>
+% }
+</th>
+<%ARGS>
+$Header => undef
+$Attribute => undef 
+</%ARGS>
diff --git a/rt/html/Search/Elements/TicketRow b/rt/html/Search/Elements/TicketRow
new file mode 100644
index 000000000..5d1ad209a
--- /dev/null
+++ b/rt/html/Search/Elements/TicketRow
@@ -0,0 +1,55 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SPAN class="search">
+<TR
+% if ($i%2) {
+CLASS="oddline"
+% } else {
+CLASS="evenline"
+% }
+>
+<TD ROWSPAN="2"><B><A HREF="<%$RT::WebPath%>/Ticket/Display.html?id=<%$Ticket->Id%>"><%$Ticket->id%></a></B></TD>
+<TD><B><A HREF="<%$RT::WebPath%>/Ticket/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Subject%></a></B></TD>
+<TD><%loc($Ticket->Status)%></TD>
+<TD><%$Ticket->QueueObj->Name%></TD>
+<TD><%$Ticket->Owner == $RT::Nobody->Id ? loc('Nobody') : $Ticket->OwnerObj->Name%></TD>
+<TD><%$Ticket->Priority%></TD>
+</TR>
+<TR
+% if ($i%2) {
+CLASS="oddline"
+% } else {
+CLASS="evenline"
+% }
+><TD><small><%$Ticket->Requestors->MemberEmailAddressesAsString%></small></TD>
+<TD><SMALL><%$Ticket->CreatedObj->AgeAsString || '-'%></SMALL></TD>
+<TD><SMALL><%$Ticket->ToldObj->AgeAsString || '-'%></SMALL></TD>
+<TD><SMALL><%$Ticket->LastUpdatedObj->AgeAsString || '-'%></SMALL></TD>
+<TD><SMALL><%$Ticket->TimeLeft%></SMALL></TD>
+</TR>
+</SPAN>
+<%ARGS>
+$Ticket => undef
+$i => undef
+</%ARGS>
diff --git a/rt/html/Search/Listing.html b/rt/html/Search/Listing.html
new file mode 100644
index 000000000..508534549
--- /dev/null
+++ b/rt/html/Search/Listing.html
@@ -0,0 +1,112 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => $title, Refresh => $session{'tickets_refresh_interval'} &>
+<& /Ticket/Elements/Tabs, 
+    current_tab => 'Search/Listing.html', 
+    Title => $title &>
+
+%if ($ticketcount && !  $ARGS{'HideResults'}) {
+<TABLE WIDTH=100% border=0 cellpadding=2 CELLSPACING=0>
+<& Elements/TicketHeader, %ARGS &>
+% my $i;
+%while (my $Ticket = $session{'tickets'}->Next) {
+% $i++;
+<& Elements/TicketRow, Ticket => $Ticket, i=> $i, %ARGS &>
+%}
+</TABLE>
+<div align=center>
+<font size=2>
+<a href="Listing.html?GotoPage=1"><&|/l&>First page</&></a>
+&nbsp;&nbsp;
+%  if ( $session{'tickets'}->FirstRow >= $session{'tickets_rows_per_page'}-1 ) {
+<a href="Listing.html?GotoPage=Prev">&lt;<&|/l&>Previous page</&></a>
+&nbsp;&nbsp;
+%  }                                                                           
+%  if ( $session{'tickets'}->FirstRow + $session{'tickets_rows_per_page'} < $ticketcount ) {                                                               
+<a href="Listing.html?GotoPage=Next"><&|/l&>Next page</&>&gt;</a>
+%  }
+%#&nbsp;&nbsp;<form method=get action="Listing.html"><&|/l&>Goto page</&> <input name=GotoPage size=2></form>
+</font>
+</div>
+<!--<div align=right>-->
+<table width="100%" border=0 cellpadding=3 CELLSPACING=1>
+<tr>
+<td align=left>
+(<&|/l, ($session{'tickets'}->FirstRow+1), ($session{'tickets'}->FirstRow() + $session{'tickets'}->RowsPerPage()  ) &>[_1] - [_2] shown</&>)
+</td>
+<td align=right>
+
+<a href="Bulk.html"><&|/l&>Update all these tickets at once</&></a>
+<!--</div>-->
+</td>
+</tr>
+</table>
+
+% }
+<TABLE WIDTH="100%">
+<TR>
+<TD VALIGN="TOP">
+<& /Elements/TitleBoxStart, title => loc('Current search criteria')&>
+
+%my %restrictions=$session{'tickets'}->DescribeRestrictions();
+%foreach my $row (keys %restrictions){
+<%$restrictions{"$row"}%> <A HREF="<% $RT::WebPath %>/Search/Listing.html?DeleteRestriction=<%$row%>">[<&|/l&>delete</&>]</a><br>
+%}
+<BR>
+<BR>
+<A HREF="<% $RT::WebPath%>/Search/Listing.html?Bookmark=<%$session{'tickets'}->FreezeLimits()|u%>&TicketsSortBy=<%$session{'tickets_sort_by'}%>&TicketsSortOrder=<%$session{'tickets_sort_order'}%>&RowsPerPage=<%$session{'tickets_rows_per_page'}%>"><&|/l&>Bookmarkable URL for this search</&></a>
+<& /Elements/TitleBoxEnd&>
+</TD>
+<TD>
+
+<& Elements/PickRestriction, %ARGS &>
+
+</TD>
+</TR>
+</TABLE>
+
+<%INIT>
+
+my ($title, $ticketcount);
+$session{'i'}++;
+if ($session{'tickets'}) {
+    if ($ARGS{'DeleteRestriction'}) {
+	    $session{'tickets'}->DeleteRestriction($ARGS{'DeleteRestriction'});
+    }
+    if ( ($ARGS{'ClearRestrictions'}) || ($ARGS{'NewSearch'}) ) {
+	    $session{'tickets'}->ClearRestrictions;
+	}	
+}
+   ProcessSearchQuery(ARGS=>\%ARGS);
+   $session{'tickets'}->RedoSearch();
+   if ( $session{'tickets'}->DescribeRestrictions()) {
+       $ticketcount = $session{tickets}->CountAll();
+        $title = loc('Found [quant,_1,ticket]', $ticketcount);
+    } else {
+        $title = loc("Find tickets");
+   }
+</%INIT>
+<%CLEANUP>
+$session{'tickets'}->PrepForSerialization();
+</%CLEANUP>
diff --git a/rt/html/SelfService/Attachment/dhandler b/rt/html/SelfService/Attachment/dhandler
new file mode 100644
index 000000000..4bebbe565
--- /dev/null
+++ b/rt/html/SelfService/Attachment/dhandler
@@ -0,0 +1,27 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<%init>
+$m->comp('/Ticket/Attachment/dhandler', %ARGS);
+$m->abort;
+</%init>
diff --git a/rt/html/SelfService/Closed.html b/rt/html/SelfService/Closed.html
new file mode 100644
index 000000000..b9b2ac672
--- /dev/null
+++ b/rt/html/SelfService/Closed.html
@@ -0,0 +1,27 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /SelfService/Elements/Header, Title => loc('Closed Tickets') &>
+
+<& /SelfService/Elements/MyRequests, status => ['rejected', 'resolved'], friendly_status =>
+loc('closed') &>
diff --git a/rt/html/SelfService/Create.html b/rt/html/SelfService/Create.html
new file mode 100644
index 000000000..7bbc88a65
--- /dev/null
+++ b/rt/html/SelfService/Create.html
@@ -0,0 +1,80 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& Elements/Header, Title => loc("Create a ticket") &>
+
+<FORM ACTION="Display.html" METHOD="POST" ENCTYPE="multipart/form-data">
+<INPUT TYPE=HIDDEN Name="id" VALUE="new">
+
+<TABLE>
+<TR>
+<TD>
+<&|/l&>Queue</&>:
+</TD>
+<TD>
+<& /Elements/SelectNewTicketQueue, Verbose => 'True' &>
+</TD>
+</TR>
+<TR>
+<TD>
+<&|/l&>Requestors</&>:
+</TD>
+<TD>
+<INPUT Name="Requestors" Value="<%$session{CurrentUser}->EmailAddress%>" SIZE=20>
+</TD>
+</TR>
+<TR>
+<TD>
+<&|/l&>Cc</&>:
+</TD>
+<TD>
+ <INPUT NAME="Cc" SIZE=20>
+</TD>
+</TR>
+<TR>
+<TD>
+<&|/l&>Subject</&>:
+</TD>
+<TD>
+<INPUT Name="Subject" SIZE=60 MAXSIZE=100 value="">
+</TD>
+</TR>
+<TR>
+<TD>
+<&|/l&>Attach file</&>:
+</TD>
+<TD>
+<INPUT Name="Attach" type=file>
+</TD>
+</TR>
+<TR>
+<TD COLSPAN=2>
+<&|/l&>Describe the issue below</&>:<br>
+<& /Elements/MessageBox &>
+</TD>
+</TR>
+</TABLE>
+<& /Elements/Submit, Label => loc("Create ticket")&>
+
+
+</FORM>
diff --git a/rt/html/SelfService/Display.html b/rt/html/SelfService/Display.html
new file mode 100644
index 000000000..fc3fcb289
--- /dev/null
+++ b/rt/html/SelfService/Display.html
@@ -0,0 +1,141 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /SelfService/Elements/Header, Title => loc('#[_1]: [_2]', $Ticket->id, $Ticket->Subject) &>
+
+<& /Elements/ListActions, actions => \@results &>
+
+  <TABLE WIDTH="100%" class="ticketsummary" >
+      <TR>
+        <TD VALIGN=TOP WIDTH="50%">
+          <& /Elements/TitleBoxStart, title => loc('The Basics'), 
+                title_class=> 'inverse',  
+                color => "#993333" &>
+                <& /Ticket/Elements/ShowBasics, Ticket => $Ticket &>
+          <& /Elements/TitleBoxEnd &>
+</TD>
+        <TD VALIGN=TOP WIDTH="50%">
+          <& /Elements/TitleBoxStart, title => loc("Dates"),
+                title_class=> 'inverse',
+                 color => "#663366" &>
+          <& /Ticket/Elements/ShowDates, Ticket => $Ticket &>
+          <& /Elements/TitleBoxEnd &>
+</TD>
+</TR>
+</TABLE>
+
+
+
+<& /Ticket/Elements/ShowHistory, Ticket => $Ticket&>
+
+
+
+<%INIT>
+
+my ( $field, @results );
+
+# {{{ Load the ticket
+#If we get handed two ids, mason will make them an array. bleck.
+# We want teh first one. Just because there's no other sensible way
+# to deal
+my @id = ( ref $id eq 'ARRAY' ) ? @{$id} : ($id);
+
+my $Ticket = new RT::Ticket( $session{'CurrentUser'} );
+if ( $id[0] eq 'new' ) {
+
+    # {{{ Create a new ticket
+
+    my $Queue = new RT::Queue( $session{'CurrentUser'} );
+    unless ( $Queue->Load( $ARGS{'Queue'} ) ) {
+        $m->comp( 'Error.html', Why => loc('Queue not found') );
+        $m->abort;
+    }
+
+    unless ( $Queue->CurrentUserHasRight('CreateTicket') ) {
+        $m->comp( 'Error.html',
+             Why =>
+               loc('You have no permission to create tickets in that queue.') );
+        $m->abort;
+    }
+
+    my @Requestors = split ( /\s*,\s*/, $ARGS{'Requestors'} );
+    my @Cc         = split ( /\s*,\s*/, $ARGS{'Cc'} );
+
+    my $MIMEObj = MakeMIMEEntity( Subject             => $ARGS{'Subject'},
+                                  From                => $ARGS{'From'},
+                                  Cc                  => $ARGS{'Cc'},
+                                  Body                => $ARGS{'Content'},
+                                  AttachmentFieldName => 'Attach' );
+
+    #TODO in Create_Details.html: priorities and due-date
+    my ( $id, $Trans, $ErrMsg ) = $Ticket->Create( Queue     => $ARGS{Queue},
+                                                   Requestor => \@Requestors,
+                                                   Cc        => \@Cc,
+                                                   Subject   => $ARGS{Subject},
+                                                   MIMEObj   => $MIMEObj );
+    unless ( $id && $Trans ) {
+        $m->comp( 'Error.html', Why => $ErrMsg );
+        $m->abort();
+    }
+
+    push ( @results, $ErrMsg );
+
+    # }}}
+}
+else {
+    unless ( $Ticket->Load( $id[0] ) ) {
+        $m->comp( 'Error.html',
+                  Why => loc( "Couldn't load ticket '[_1]'", $id ) );
+        $m->abort();
+    }
+}
+
+# }}}
+
+unless ( $Ticket->CurrentUserHasRight('ShowTicket') ) {
+    $m->comp( 'Error.html',
+              Why => loc("No permission to display that ticket") );
+    $m->abort();
+}
+
+my ( $code, $msg );
+
+#Update the status
+if (     ( defined $ARGS{'Status'} )
+     and ( $ARGS{'Status'} ne $Ticket->Status ) ) {
+    ( $code, $msg ) = $Ticket->SetStatus( $ARGS{'Status'} );
+    push @results, "$msg";
+}
+
+ProcessUpdateMessage( ARGSRef   => \%ARGS,
+                      Actions   => \@results,
+                      TicketObj => $Ticket );
+
+my $Transactions = $Ticket->Transactions;
+
+</%INIT>
+
+
+<%ARGS>
+$id => undef
+</%ARGS>
diff --git a/rt/html/SelfService/Elements/GotoTicket b/rt/html/SelfService/Elements/GotoTicket
new file mode 100644
index 000000000..71da8c115
--- /dev/null
+++ b/rt/html/SelfService/Elements/GotoTicket
@@ -0,0 +1,24 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<FORM ACTION="<%$RT::WebPath%>/SelfService/Display.html"><input type=submit value="<&|/l&>Goto ticket</&>">&nbsp;<input size=4 name=id></FORM>
diff --git a/rt/html/SelfService/Elements/Header b/rt/html/SelfService/Elements/Header
new file mode 100644
index 000000000..6ad137999
--- /dev/null
+++ b/rt/html/SelfService/Elements/Header
@@ -0,0 +1,25 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, %ARGS, Prefs => '/SelfService/Prefs.html' &>
+<& /SelfService/Elements/Tabs, %ARGS &>
diff --git a/rt/html/SelfService/Elements/MyRequests b/rt/html/SelfService/Elements/MyRequests
new file mode 100644
index 000000000..95ede0811
--- /dev/null
+++ b/rt/html/SelfService/Elements/MyRequests
@@ -0,0 +1,62 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/TitleBoxStart, title =>  $title &>
+<TABLE BORDER=0 cellspacing=1 cellpadding=1 BGCOLOR="#eeeeee" WIDTH=100%>
+<TR>
+<TH><&|/l&>Subject</&></TH>
+<TH><&|/l&>Status</&></TH>
+<TH><&|/l&>Owner</&></TH>
+</TR>
+<TR>
+% while (my $Ticket = $MyTickets->Next) {
+<TR>
+<TD>
+<a href="<%$RT::WebPath%>/SelfService/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id%>: <%$Ticket->Subject%></a>
+</TD>
+<TD>
+<%$Ticket->Status%>
+</TD><TD>
+<%$Ticket->OwnerObj->Name%>
+</TR>
+% }
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+
+
+<%INIT>
+$title ||= loc("My [_1] tickets", $friendly_status);
+my $MyTickets;
+$MyTickets = new RT::Tickets ($session{'CurrentUser'});
+$MyTickets->LimitWatcher(TYPE => 'Requestor', VALUE => $session{'CurrentUser'}->EmailAddress);
+
+foreach my $status (@status) {
+
+        $MyTickets->LimitStatus(VALUE => $status);
+}
+</%INIT>
+<%ARGS>
+$title => undef
+$friendly_status => loc('open')
+@status => ('open', 'new', 'stalled')
+</%ARGS>
diff --git a/rt/html/SelfService/Elements/Tabs b/rt/html/SelfService/Elements/Tabs
new file mode 100644
index 000000000..efab86676
--- /dev/null
+++ b/rt/html/SelfService/Elements/Tabs
@@ -0,0 +1,64 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/PageLayout,
+    current_toptab => $current_toptab,
+    current_tab => $current_tab,
+    toptabs => $tabs,
+    topactions => $actions,
+    title => $Title
+&>
+<a name="skipnav" id="skipnav" accesskey="8"></a>
+<%INIT>
+
+if ($Title) {
+$Title = loc ("RT Self Service") . " / " . $Title;
+} else {
+$Title = loc ("RT Self Service");
+
+}
+my ($tab);
+my $tabs = { A  => { title => loc('Open tickets'),
+                        path => 'SelfService/',
+                      },
+             B => { title => loc('Closed tickets'),
+                         path => 'SelfService/Closed.html',
+                       },
+             C => { title => loc('New ticket'),
+                    path => 'SelfService/Create.html'
+                    },
+             Z => { title => loc('Preferences'),
+                    path => 'SelfService/Prefs.html'
+                    }
+           };
+my $actions = {
+	B => { html => $m->scomp('GotoTicket') 
+		}
+	};
+</%INIT>
+<%ARGS>
+$Title => undef
+$current_toptab => undef
+$current_tab => undef
+</%ARGS>
+
diff --git a/rt/html/SelfService/Error.html b/rt/html/SelfService/Error.html
new file mode 100644
index 000000000..ac93aceff
--- /dev/null
+++ b/rt/html/SelfService/Error.html
@@ -0,0 +1,46 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /SelfService/Elements/Header, Title => loc('Error') &>
+<h2 class="title"><%loc('Error')%></h2>
+<& /Elements/TitleBoxStart, title => $Title &>
+<%$Why%>
+<br>
+<font size=-1>
+<%$Details%>
+</font>
+<& /Elements/TitleBoxEnd &>
+</body>
+</HTML>
+
+
+<%args>
+$Code => undef
+$Details => undef
+$Title => loc("RT Error")
+$Why => loc("the calling component did not specify why")
+</%args>
+
+<%INIT>
+$RT::Logger->error("WebRT: $Why ($Details)");
+</%INIT>
diff --git a/rt/html/SelfService/Prefs.html b/rt/html/SelfService/Prefs.html
new file mode 100644
index 000000000..3bbb9b913
--- /dev/null
+++ b/rt/html/SelfService/Prefs.html
@@ -0,0 +1,68 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /SelfService/Elements/Header, Title => loc('Preferences') &>
+
+<& /Elements/ListActions, actions => \@results &>
+<form method=post>
+
+% unless ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth) {
+<& /Elements/TitleBoxStart, title => loc('Change password')  &>
+<&|/l&>New password</&>: <input type=password name="NewPass1" size=16>
+<&|/l&>Confirm</&>: <input type=password name="NewPass2" size=16>
+<& /Elements/TitleBoxEnd &>
+<BR>
+% }
+<& /Elements/Submit &>
+	  </form>
+
+
+<%INIT>
+my @results;
+
+if ($NewPass1) {
+    if ($NewPass1 ne $NewPass2) {
+	push (@results, "Passwords did not match.");
+    }	
+    else {
+	my ($val, $msg)=$session{'CurrentUser'}->UserObj->SetPassword($NewPass1);
+	push (@results, "Password: ".$msg);
+    }	
+}
+if ($Signature) {
+    $Signature =~ s/(\r\n|\r)/\n/g;
+    if ($Signature ne $session{'CurrentUser'}->UserObj->Signature) {
+	my ($val, $msg)=$session{'CurrentUser'}->UserObj->SetSignature($Signature);
+	push (@results, "Signature: ".$msg);
+    }
+}
+#A hack to make sure that session gets rewritten.
+
+$session{'i'}++;
+</%INIT>
+
+<%ARGS>
+$Signature => undef
+$NewPass1 => undef
+$NewPass2 => undef
+</%ARGS>
diff --git a/rt/html/SelfService/Update.html b/rt/html/SelfService/Update.html
new file mode 100644
index 000000000..9ff31775f
--- /dev/null
+++ b/rt/html/SelfService/Update.html
@@ -0,0 +1,61 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /SelfService/Elements/Header, Title =>loc('Update ticket #[_1]', $Ticket->id) &>
+
+
+<FORM ACTION="Display.html" METHOD=POST ENCTYPE="multipart/form-data">
+<input type=hidden name="UpdateType" value="response">
+
+<&|/l&>Status</&>: <& /Elements/SelectStatus, Name=>"Status", Default => $DefaultStatus &><br>
+<&|/l&>Subject</&>: <input name="UpdateSubject" size=60 value="Re: <% $Ticket->Subject %>"> <br>
+<&|/l&>Attach</&>: <input name="UpdateAttachment" type=file><br>
+<& /Elements/MessageBox, Name=>"UpdateContent", QuoteTransaction=>$ARGS{QuoteTransaction} &>
+		<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>"><br>
+
+
+<& /Elements/Submit &>
+  </FORM>
+
+
+
+<%INIT>
+
+my $Ticket = LoadTicket($id);
+
+my $title = loc("Update ticket #[_1]", $Ticket->id);
+
+$DefaultStatus = $Ticket->Status() unless ($DefaultStatus);
+
+
+Abort(loc("No permission to view update ticket")) 
+	unless ( $Ticket->CurrentUserHasRight('ReplyToTicket') or
+                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
+
+</%INIT>
+
+<%ARGS>
+$id => undef
+$Action => undef
+$DefaultStatus => undef
+</%ARGS>
diff --git a/rt/html/SelfService/index.html b/rt/html/SelfService/index.html
new file mode 100644
index 000000000..71dc1156e
--- /dev/null
+++ b/rt/html/SelfService/index.html
@@ -0,0 +1,26 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /SelfService/Elements/Header, Title => undef &>
+
+<& /SelfService/Elements/MyRequests &>
diff --git a/rt/html/Ticket/Attachment/dhandler b/rt/html/Ticket/Attachment/dhandler
new file mode 100644
index 000000000..e0f00f57a
--- /dev/null
+++ b/rt/html/Ticket/Attachment/dhandler
@@ -0,0 +1,68 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<%perl>
+     my ($ticket, $trans,$attach, $filename);
+     my $arg = $m->dhandler_arg;                # get rest of path
+     if ($arg =~ '^(\d+)/(\d+)') {
+        $trans = $1;
+        $attach = $2;
+     }
+    else {
+        Abort("Corrupted attachment URL.");
+        }
+     my $AttachmentObj = new RT::Attachment($session{'CurrentUser'});
+     $AttachmentObj->Load($attach) || Abort("Attachment '$attach' could not be loaded");
+
+
+     unless ($AttachmentObj->id) {
+        Abort("Bad attachment id. Couldn't find attachment '$attach'\n");
+    }
+     unless ($AttachmentObj->TransactionId() == $trans ) {
+        Abort("Bad transaction number for attachment. $trans should be".$AttachmentObj->TransactionId() ."\n");
+
+     }
+
+     my $content_type = $AttachmentObj->ContentType || 'text/plain';
+        
+     unless ($RT::TrustHTMLAttachments) {
+         $content_type = 'text/plain' if ($content_type =~ /^text\/html/i);
+     }
+
+     if (my $enc = $AttachmentObj->OriginalEncoding) {
+	# normalize Encode.pm convention with IANA ones
+        $enc = 'big5'  if $enc eq 'big5-eten';
+        $enc = 'utf-8' if $enc eq 'utf8';
+	$content_type .= ";charset=$enc";
+     }
+
+     # unless ($RT::TrustMIMEAttachments) {
+     #     $content_type = 'application/octet-stream';
+     # }
+
+     $r->content_type( $content_type );
+     $m->clear_buffer();
+     $m->out($AttachmentObj->OriginalContent);
+     $m->abort; 
+</%perl>
+
diff --git a/rt/html/Ticket/Create.html b/rt/html/Ticket/Create.html
new file mode 100644
index 000000000..5b8c908a1
--- /dev/null
+++ b/rt/html/Ticket/Create.html
@@ -0,0 +1,257 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => loc("Create a new ticket") &>
+<& /Elements/Tabs, 
+    current_toptab => "Ticket/Create.html", 
+    Title => loc("Create a new ticket") &>
+<FORM ACTION="<%$RT::WebPath%>/Ticket/Create.html" METHOD="POST" ENCTYPE="multipart/form-data">
+<INPUT TYPE=HIDDEN Name="id" VALUE="new">
+<A NAME="top">
+	
+	
+[<a class="currenttab"><&|/l&>Show basics</&></a>] [<A HREF="#detail"><&|/l&>Show details</&></a>]
+<BR>
+<& /Elements/TitleBoxStart, contentbg => "#cccccc", title => loc("Create a new ticket") &>
+<TABLE border=0 cellpadding=0 cellspacing=0>
+<TR><TD><&|/l&>Queue</&></TD>
+<TD><% $QueueObj->Name %>
+<INPUT TYPE=HIDDEN NAME=Queue Value="<%$QueueObj->Name%>">
+</TD>
+<TD><&|/l&>Status</&>:
+</TD>
+<TD>
+<& /Elements/SelectStatus, Name => "Status", Default => $ARGS{Status}||'new' &>
+</TD>
+<TD>
+<&|/l&>Owner</&>:
+</TD>
+<TD>
+<& /Elements/SelectOwner, Name => "Owner", QueueObj => $QueueObj, Default => $ARGS{Owner}||undef &>
+</TD>
+</TR>
+<TR>
+<TD>
+<&|/l&>Requestors</&>:
+</TD>
+<TD COLSPAN=5>
+<INPUT Name="Requestors" Value="<% ($ARGS{Requestors}) || $session{CurrentUser}->EmailAddress %>" SIZE=40>
+</TD>
+</TR>
+<TR>
+<TD>
+<&|/l&>Cc</&>:
+</TD>
+<TD COLSPAN=5>
+<INPUT NAME="Cc" SIZE=40<% $ARGS{Cc} && " VALUE=\"$ARGS{Cc}\""%>><BR>
+<i><font size=-2>
+<&|/l&>(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)</&></font></i>
+</TD>
+</TR>
+<TR>
+<TD>
+<&|/l&>Admin Cc</&>:
+</TD>
+<TD COLSPAN=5>
+<INPUT NAME="AdminCc" SIZE=40<% $ARGS{AdminCc} && " VALUE=\"$ARGS{AdminCc}\""%>><BR>
+<i><font size=-2>
+<&|/l&>(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)</&></font></i>
+</TD>
+</TR>
+<TR>
+<TD>
+<&|/l&>Subject</&>:
+</TD>
+<TD COLSPAN=5>
+<INPUT Name="Subject" SIZE=60 MAXSIZE=100 value="<%$ARGS{Subject} || ''%>">
+</TD>
+</TR>
+<TR>
+<TD COLSPAN=6>
+<& /Ticket/Elements/EditCustomFields, QueueObj => $QueueObj &>
+</TD>
+</TR>
+<TR>
+% if (exists $session{'Attachments'}) {
+<TD>
+<&|/l&>Attached file</&>:
+</TD>
+<TD COLSPAN=5>
+<&|/l&>Check box to delete</&><BR>
+% foreach my $attach_name (keys %{$session{'Attachments'}}) {
+<input type="checkbox" name="DeleteAttach-<%$attach_name%>"><%$attach_name%><BR>
+% } # end of foreach
+</TD>
+</TR>
+<TR>
+% } # end of if
+<TD>
+<&|/l&>Attach file</&>:
+</TD>
+<TD COLSPAN=5>
+<INPUT TYPE=FILE NAME="Attach">
+<INPUT TYPE=SUBMIT NAME="AddMoreAttach" VALUE="<&|/l&>Add More Files</&>">
+</TD>
+</TR>
+<TR>
+<TD COLSPAN=6>
+<&|/l&>Describe the issue below</&>:<br>
+% if (exists $ARGS{Content}) {
+<& /Elements/MessageBox, Default => $ARGS{Content} &>
+% } else {
+<& /Elements/MessageBox, QuoteTransaction => $QuoteTransaction &>
+%}
+
+<BR>
+</TD>
+</TR>
+<TR>
+<TD ALIGN=RIGHT COLSPAN=2>
+</TD>
+</TR>
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit, Label => loc("Create")&>
+
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+
+<A NAME="detail">
+	[<A HREF="#top"><&|/l&>Show basics</&></a>] [<a class="currenttab"><&|/l&>Show details</&></a>]
+<BR>
+<TABLE WIDTH="100%" BORDER=0>
+<TR>
+<TD WIDTH="50%" VALIGN=TOP>
+
+	  <& /Elements/TitleBoxStart, title => loc('The Basics'), 
+		title_class=> 'inverse',  
+		color => "#993333" &>
+<TABLE BORDER=0>
+<TR><TD ALIGN=RIGHT><&|/l&>Priority</&>:</TD><TD><input size=3 name="InitialPriority" value="<% $ARGS{InitialPriority} ? $ARGS{InitialPriority} : $QueueObj->InitialPriority %>"></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Final Priority</&>:</TD><TD><input size=3 name="FinalPriority" value="<% $ARGS{FinalPriority} ? $ARGS{FinalPriority} : $QueueObj->FinalPriority %>"></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Time Worked</&>:</TD><TD><input size=3 name="TimeWorked"<% $ARGS{TimeWorked} && " VALUE=\"$ARGS{TimeWorked}\""  %>></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Time Left</&>:</TD><TD><input size=3 name="TimeLeft"<% $ARGS{TimeLeft} && " VALUE=\"$ARGS{TimeLeft}\"" %>></TD></TR>
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+<br>
+<& /Elements/TitleBoxStart, title => loc("Dates"),
+		title_class=> 'inverse',  
+		 color => "#663366" &>
+
+<TABLE BORDER=0>
+<TR><TD ALIGN=RIGHT><&|/l&>Starts</&>:</TD><TD><input size=10 name="Starts"<% $ARGS{Starts} && " VALUE=\"$ARGS{Starts}\"" %>></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Due</&>:</TD><TD><input size=10 name="Due"<% $ARGS{Due} && " VALUE=\"$ARGS{Due}\"" %>></TD></TR>
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+<BR>
+</TD>
+
+<TD VALIGN="TOP">
+<& /Elements/TitleBoxStart, title => loc('Relationships'), 
+	title_class=> 'inverse',  
+	titleright => '', color=> "#336633" &>
+
+<i><&|/l&>(Enter ticket ids or URLs, seperated with spaces)</&></i>
+<TABLE BORDER=0>
+<TR><TD ALIGN=RIGHT><&|/l&>Depends on</&></TD><TD><input size=10 name="new-DependsOn"<% $ARGS{'new-DependsOn'} && " VALUE=\"$ARGS{'new-DependsOn'}\""%>></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Depended on by</&></TD><TD><input size=10 name="DependsOn-new"<% $ARGS{'DependsOn-new'} && " VALUE=\"$ARGS{'DependsOn-new'}\"" %>></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Parents</&></TD><TD><input size=10 name="new-MemberOf"<% $ARGS{'new-MemberOf'} && " VALUE=\"$ARGS{'new-MemberOf'}\"" %>></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Children</&></TD><TD><input size=10 name="MemberOf-new" <% $ARGS{'MemberOf-new'} && " VALUE=\"$ARGS{'MemberOf-new'}\"" %>></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Refers to</&></TD><TD><input size=10 name="new-RefersTo"<% $ARGS{'new-RefersTo'} && " VALUE=\"$ARGS{'new-MemberOf'}\"" %>></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Referred to by</&></TD><TD><input size=10 name="RefersTo-new"<% $ARGS{'RefersTo-new'} && " VALUE=\"$ARGS{'RefersTo-new'}\"" %>></TD></TR>
+
+
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+<BR>
+
+</TD>
+</TR>
+</TABLE>
+<& /Elements/Submit, Label => loc("Create") &>
+</FORM>
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
+
+<%INIT>
+my $QueueObj = new RT::Queue($session{'CurrentUser'});
+$QueueObj->Load($Queue) || Abort(loc("Queue could not be loaded."));
+my $CFs = $QueueObj->CustomFields();
+
+# {{{ deal with deleting uploaded attachments
+foreach my $key (keys %ARGS) {
+    if ($key =~ m/^DeleteAttach-(.+)$/) {
+	delete $session{'Attachments'}{$1};
+    }
+    $session{'Attachments'} = { %{$session{'Attachments'} || {}} };
+}
+
+# {{{ store the uploaded attachment in session
+if ($ARGS{'Attach'}) {			# attachment?
+    $session{'Attachments'} = {} unless defined $session{'Attachments'};
+
+    my $subject = "$ARGS{'Attach'}";
+
+    # since CGI.pm deutf8izes the magic field, we need to add it back.
+    Encode::_utf8_on($subject);
+    # strip leading directories
+    $subject =~ s#^.*[\\/]##;
+
+    my $attachment = MakeMIMEEntity(
+        Subject             => $subject,
+        Body                => "",
+        AttachmentFieldName => 'Attach'
+    );
+
+    $session{'Attachments'} = { %{$session{'Attachments'} || {}},
+				$ARGS{'Attach'} => $attachment };
+}
+# }}}
+
+# delete temporary storage entry to make WebUI clean
+unless (keys %{$session{'Attachments'}} and $ARGS{'id'} eq 'new') {
+    delete $session{'Attachments'};
+}
+
+
+# }}}
+
+if ((!exists $ARGS{'AddMoreAttach'}) && ($ARGS{'id'} eq 'new')) { # new ticket?
+    $m->comp('Display.html', %ARGS);
+    $m->abort();
+}
+</%INIT>
+
+<%ARGS>
+$DependsOn => undef
+$DependedOnBy => undef
+$MemberOf => undef
+$QuoteTransaction => undef
+$Queue => undef
+</%ARGS>
diff --git a/rt/html/Ticket/Display.html b/rt/html/Ticket/Display.html
new file mode 100644
index 000000000..cf32dce9d
--- /dev/null
+++ b/rt/html/Ticket/Display.html
@@ -0,0 +1,116 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, 
+    Title => loc("#[_1]: [_2]", $Ticket->Id, $Ticket->Subject) &>
+<& /Ticket/Elements/Tabs, 
+    Ticket => $Ticket, 
+    current_tab => 'Ticket/Display.html?id='.$Ticket->id,
+    Title => loc("#[_1]: [_2]", $Ticket->Id, $Ticket->Subject) &>
+
+<& /Elements/ListActions, actions => \@Actions &>
+
+<& /Ticket/Elements/ShowSummary,  Ticket => $Ticket &>
+
+
+<BR>
+<& /Ticket/Elements/ShowHistory , 
+      Ticket => $Ticket, 
+      Collapsed => $ARGS{'Collapsed'}, 
+      ShowHeaders => $ARGS{'ShowHeaders'} &> 
+
+  
+<%ARGS>
+$id => undef
+$Create => undef
+$ShowHeaders => undef
+$Collapsed => undef
+</%ARGS>
+
+<%INIT>
+  my ($linkid, $message, $tid, $Ticket, @Actions);  
+
+$Ticket = new RT::Ticket($session{'CurrentUser'});
+
+unless ($id) {
+    Abort('No ticket specified');
+}
+
+if ($ARGS{'id'} eq 'new') {
+    # {{{ Create a new ticket
+    
+    my $Queue = new RT::Queue($session{'CurrentUser'});	
+    unless ($Queue->Load($ARGS{'Queue'})) {
+	Abort('Queue not found');
+    }
+    
+    unless ($Queue->CurrentUserHasRight('CreateTicket')) {
+	Abort('You have no permission to create tickets in that queue.');
+    }
+    ($Ticket, @Actions) =
+       CreateTicket(Attachments => $session{'Attachments'}, %ARGS);
+    delete $session{'Attachments'};
+    unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
+      Abort("No permission to view newly created ticket #".$Ticket->id.".");
+    }
+    # }}}
+}
+
+else { 
+    $Ticket = LoadTicket($ARGS{'id'});
+    unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
+	Abort("No permission to view ticket");
+    }
+
+
+if (defined $ARGS{'Action'}) {
+  if ($ARGS{'Action'} =~ /^(Steal|Kill|Take|SetTold)$/) {
+    my $action = $1;
+    my ($res, $msg)=$Ticket->$action();
+    push(@Actions, $msg);
+  }
+}
+
+    if ( $ARGS{'UpdateContent'} ) {
+        $ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
+        if (    $ARGS{'UpdateContent'} ne ''
+             && $ARGS{'UpdateContent'} ne "-- \n"
+             . $session{'CurrentUser'}->UserObj->Signature ) {
+            $ARGS{UpdateAttachments} = $session{'Attachments'};
+            ProcessUpdateMessage( ARGSRef   => \%ARGS,
+                                  Actions   => \@Actions,
+                                  TicketObj => $Ticket );
+            delete $session{'Attachments'};
+        }
+    }
+#Process status updates
+my @BasicActions = ProcessTicketBasics(ARGSRef => \%ARGS, TicketObj=>$Ticket);
+my @results = ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);                            
+
+push (@Actions, @BasicActions, @results);
+}
+</%INIT>
+
+
+
+
diff --git a/rt/html/Ticket/Elements/AddWatchers b/rt/html/Ticket/Elements/AddWatchers
new file mode 100644
index 000000000..e9f651593
--- /dev/null
+++ b/rt/html/Ticket/Elements/AddWatchers
@@ -0,0 +1,97 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<BR>
+<%$msg%><br>
+
+<&|/l&>Add new watchers</&>:<br>
+
+<table>
+% if ($Users and $Users->Count) {
+<tr><td>
+<&|/l&>Type</&>
+</td><td>
+<&|/l&>Username</&>
+</td></tr>
+% while (my $u = $Users->Next ) {
+<tr><td><&/Elements/SelectWatcherType, Name => "Ticket-AddWatcher-Principal-".$u->PrincipalId &></td><td><%$u->Name%> (<%$u->RealName%>)</td></tr>
+% }
+% }
+
+% if ($Groups and $Groups->Count) {
+<tr><td>
+<&|/l&>Type</&>
+</td><td>
+<&|/l&>Group</&>
+</td></tr>
+% while (my $g = $Groups->Next ) {
+<tr><td><&/Elements/SelectWatcherType, Name => "Ticket-AddWatcher-Principal-".$g->PrincipalId, Scope => 'queue' &></td><td><%$g->Name%> (<%$g->Description%>)</td></tr>
+% }
+% }
+
+<tr><td>
+<&|/l&>Type</&>
+</td><td>
+<&|/l&>Email</&>
+</td></tr>
+<tr><td>
+<&/Elements/SelectWatcherType, Name => "WatcherTypeEmail1" &>
+</td><td>
+<input name="WatcherAddressEmail1" size=15>
+</td></tr>
+<tr><td>
+<&/Elements/SelectWatcherType, Name => "WatcherTypeEmail2" &> 
+</td><td>
+<input name="WatcherAddressEmail2" size=15>
+</td></tr>
+<tr><td>
+<&/Elements/SelectWatcherType, Name => "WatcherTypeEmail3" &>
+</td><td>
+<input name="WatcherAddressEmail3" size=15>
+</td></tr>
+</table>
+
+<%INIT>
+my ($msg, $Users, $Groups);
+
+if ($UserString) {
+    $Users = RT::Users->new($session{'CurrentUser'});
+    $Users->Limit(FIELD => $UserField, VALUE => $UserString, OPERATOR => $UserOp);
+     }
+
+if ($GroupString) {
+    $Groups = RT::Groups->new($session{'CurrentUser'});
+    $Groups->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => 'UserDefined');
+    $Groups->Limit(FIELD => $GroupField, VALUE => $GroupString, OPERATOR => $GroupOp);
+     }
+
+</%INIT>
+
+<%ARGS>
+$UserField => 'Name'
+$UserOp => '='
+$UserString => undef
+$GroupField => 'Name'
+$GroupOp => '='
+$GroupString => undef
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/BulkLinks b/rt/html/Ticket/Elements/BulkLinks
new file mode 100644
index 000000000..e6b9cd54f
--- /dev/null
+++ b/rt/html/Ticket/Elements/BulkLinks
@@ -0,0 +1,53 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<TABLE>
+  <TR>
+    <TD class="label"><&|/l&>Merge into</&>:</TD>
+    <TD class="entry"><input name="Ticket-MergeInto"> <i><&|/l&>(only one ticket)</&></i></TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Depends on</&>:</TD>
+    <TD class="entry"><input name="Ticket-DependsOn"></TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Depended on by</&>:</TD>
+    <TD class="entry"><input name="DependsOn-Ticket"></TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Parents</&>:</TD>
+    <TD class="entry"><input name="Ticket-MemberOf"></TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Children</&>:</TD>
+    <TD class="entry"> <input name="MemberOf-Ticket"></TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Refers to</&>:</TD>
+    <TD class="entry"><input name="Ticket-RefersTo"></TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Referred to by</&>:</TD>
+    <TD class="entry"> <input name="RefersTo-Ticket"></TD>
+  </TR>
+</TABLE>
diff --git a/rt/html/Ticket/Elements/EditBasics b/rt/html/Ticket/Elements/EditBasics
new file mode 100644
index 000000000..5d66b1fc1
--- /dev/null
+++ b/rt/html/Ticket/Elements/EditBasics
@@ -0,0 +1,79 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<TABLE>
+  <TR><td>
+    <table>
+      <td class="label"><&|/l&>Subject</&>:</td>
+      <td class="value">
+        <input name=Subject value="<%$TicketObj->Subject|h%>" SIZE=50>
+      </td>
+    </table>
+  </td></TR>
+  <TR><td>
+    <table>
+      <TD>
+        <& /Elements/ShadedBox, 
+            title => loc('Status'),
+            content => $SelectStatus &>
+      </TD>
+      <TD>
+        <& /Elements/ShadedBox,
+	    title => loc('Time Worked'),
+	    content => "<input name=TimeWorked value=\"".$TicketObj->TimeWorked."\" SIZE=5>" &>
+      </TD>
+      <TD>
+        <& /Elements/ShadedBox,
+	    title => loc('Time Left'),
+	    content => "<input name=TimeLeft value=\"".$TicketObj->TimeLeft."\" SIZE=5>" 
+&>
+      </TD>
+      <TD>
+        <& /Elements/ShadedBox,
+	    title => loc('Priority'),
+	    content => "<input name=Priority value=\"".$TicketObj->Priority."\" SIZE=3>" &>
+      </TD>
+      <TD>
+        <& /Elements/ShadedBox,
+	    title => loc('Final Priority'),
+	    content => "<input name=FinalPriority value=\"".$TicketObj->FinalPriority."\" SIZE=3>" &>
+      </TD>
+      <TD>
+        <& /Elements/ShadedBox,
+            title => loc('Queue'),
+            content => "$SelectQueue" &>
+      </TD>
+    </table>
+  </td></TR>
+</TABLE>
+
+<%INIT>
+#It's hard to do this inline, so we'll preload the html of the selectstatus in here.
+my $SelectStatus = $m->scomp("/Elements/SelectStatus", Name => 'Status', Default=> $TicketObj->Status);
+my $SelectQueue = $m->scomp("/Elements/SelectQueue", Name => 'Queue', Default =>$TicketObj->QueueObj->Id);
+
+</%INIT>
+<%ARGS>
+
+$TicketObj => undef
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/EditCustomField b/rt/html/Ticket/Elements/EditCustomField
new file mode 100644
index 000000000..1fc7d4388
--- /dev/null
+++ b/rt/html/Ticket/Elements/EditCustomField
@@ -0,0 +1,70 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+% my $Values;
+% if ($TicketObj) {
+%          $Values  = $TicketObj->CustomFieldValues($CustomField->id);
+% }
+% if ($CustomField->Type eq 'FreeformSingle') {
+      <input name="<%$NamePrefix%><%$CustomField->Id%>-Value"
+        size="<%$Cols%>"
+% if ($TicketObj) {
+          value="<%$Values->Count ? $Values->First->Content : ''%>"
+% }
+>
+% } elsif ($CustomField->Type eq 'FreeformMultiple') {
+% my $content;
+% if ($TicketObj) {
+%          while (my $value = $Values->Next ) {
+%                 $content .= $value->Content;
+%           }
+%  }
+<input type="hidden" name="<%$NamePrefix%><%$CustomField->Id%>-Values-Magic" value="1">
+<textarea cols=<%$Cols%> rows=<%$Rows%> name="<%$NamePrefix%><%$CustomField->Id%>-Values"><%$content%></textarea>
+% } elsif ($CustomField->Type =~ /^Select/) {
+      <input type="hidden" name="<%$NamePrefix%><%$CustomField->Id%>-Values-Magic" value="1">
+      <select name="<%$NamePrefix%><%$CustomField->Id%>-Values"
+        size="<%$Rows%>"
+        <%$CustomField->Type eq 'SelectMultiple' && 'MULTIPLE'%>>
+% my $CustomFieldValues = $CustomField->Values();
+% my $selected;
+% while (my $value = $CustomFieldValues->Next) {
+        <option value="<%$value->Name%>" 
+% if ($TicketObj) {
+            <% $Values->HasEntry($value->Name) && ($selected = 1) && 'SELECTED' %>
+% } elsif ($Default) {
+            <% ($Default eq $value->Name) && ($selected = 1) && 'SELECTED' %>
+% }
+            ><% $value->Name%></option>
+% }
+        <option value="" <% !$selected && 'SELECTED' %>><&|/l&>(no value)</&></option>
+      </select>
+% }
+<%ARGS>
+$TicketObj => undef
+$CustomField => undef
+$NamePrefix => undef
+$Rows => 5
+$Cols=> 15
+$Default => undef
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/EditCustomFields b/rt/html/Ticket/Elements/EditCustomFields
new file mode 100644
index 000000000..6b2738965
--- /dev/null
+++ b/rt/html/Ticket/Elements/EditCustomFields
@@ -0,0 +1,74 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<table>
+<tr>
+<td valign="top" width="50%">
+<table>
+
+% my @entry_fields;
+% my $i;
+% my $cfcount = $CustomFields->Count;
+%  $cfcount++ if ($cfcount % 2) ; # if we have an odd number of 
+% #custom fields, fudge it so we know where to put in the table break
+% while (my $CustomField = $CustomFields->Next()) {
+% if ($cfcount == 2 * $i) {
+</table>
+</td>
+<td valign="top" width="50%">
+<table>
+% }
+% $i++;
+  <tr>
+    <td class="labeltop">
+      <b><%$CustomField->Name%></b><br>
+      <i><%$CustomField->FriendlyType%></i>
+    </td>
+    <td class="entry"><& EditCustomField, TicketObj => $TicketObj, CustomField => $CustomField, NamePrefix => $NamePrefix &></td>
+  </tr>
+% }
+</table>
+</td>
+</tr>
+</table>
+
+<%INIT>
+my $CustomFields;
+my $NamePrefix;
+
+if ($TicketObj) {
+ $CustomFields = $TicketObj->QueueObj->CustomFields();
+  $NamePrefix = "Ticket-".$TicketObj->Id."-CustomField-";
+
+} else {
+ $CustomFields = $QueueObj->CustomFields();
+  $NamePrefix = "CustomField-";
+}
+
+
+
+</%INIT>
+<%ARGS>
+$TicketObj => undef
+$QueueObj => undef
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/EditDates b/rt/html/Ticket/Elements/EditDates
new file mode 100644
index 000000000..1f3bf1b49
--- /dev/null
+++ b/rt/html/Ticket/Elements/EditDates
@@ -0,0 +1,53 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<TABLE>
+  <TR>
+    <TD class="label"><&|/l&>Starts</&>:</TD>
+    <TD class="entry"><& /Elements/SelectDate, menu_prefix => 'Starts', current => 0 &> 
+        (<% $TicketObj->StartsObj->AsString %>)</TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Started</&>:</TD>
+    <TD class="entry"><& /Elements/SelectDate, menu_prefix => 'Started', current => 0 &> (<%$TicketObj->StartedObj->AsString %>)</TD>
+  </TR>
+
+  <TR>
+    <TD class="label">
+      <&|/l&>Last Contact</&>:
+    </TD>
+    <TD class="entry">
+      <& /Elements/SelectDate, menu_prefix => 'Told', current => 0 &> (<% $TicketObj->ToldObj->AsString %>)
+    </TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Due</&>:</TD>
+    <TD class="entry">
+      <& /Elements/SelectDate, menu_prefix => 'Due', current => 0 &> (<% $TicketObj->DueObj->AsString %>)
+    </TD>
+  </TR>
+</TABLE>
+<%ARGS>
+$TicketObj => undef
+</%ARGS>
+
diff --git a/rt/html/Ticket/Elements/EditLinks b/rt/html/Ticket/Elements/EditLinks
new file mode 100644
index 000000000..7a522dda6
--- /dev/null
+++ b/rt/html/Ticket/Elements/EditLinks
@@ -0,0 +1,150 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<TABLE width=100%>
+  <TR>
+    <TD VALIGN=TOP WIDTH=50%>
+      <h3><&|/l&>Current Relationships</&></h3>
+
+<table>
+  <tr>
+    <td></td>
+    <td><i><&|/l&>(Check box to delete)</&></i></td>
+  </tr>
+  <tr>
+    <td class="labeltop"><&|/l&>Depends on</&>:</td>
+    <td class="value">
+% while (my $link = $Ticket->DependsOn->Next) {
+% my $member = $link->TargetObj;
+      <INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
+      <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
+      [<%$member->Status%>]<br>
+% }
+    </td>
+  </tr>
+  <tr>
+    <td class="labeltop"><&|/l&>Depended on by</&>:</td>
+    <td class="value">
+% while (my $link = $Ticket->DependedOnBy->Next) {
+% my $member = $link->BaseObj;
+      <INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-">
+      <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> 
+      [<%$member->Status%>]<br>
+% }
+    </td>
+  </tr>
+  <tr>
+    <td class="labeltop"><&|/l&>Parents</&>:</td>
+    <td class="value">
+% while (my $link = $Ticket->MemberOf->Next) {
+% my $member = $link->TargetObj;
+      <INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
+      <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
+      [<%$member->Status%>]<br>
+% }
+    </td>
+  </tr>
+  <tr>
+    <td class="labeltop"><&|/l&>Children</&>:</td>
+    <td class="value">
+% while (my $link = $Ticket->Members->Next) {
+      <INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-">
+% my $member = $link->BaseObj;
+      <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> 
+      [<%$member->Status%>]<br>
+% }
+    </td>
+  </tr>
+  <tr>
+    <td class="labeltop"><&|/l&>Refers to</&>:</td>
+    <td class="value">
+% while (my $link = $Ticket->RefersTo->Next) {
+      <INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
+% if ($link->TargetURI->IsLocal) {
+% my $member = $link->TargetObj;
+      <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
+% } else {
+      <A HREF="<%$link->TargetURI->Resolver->HREF%>"><%$link->TargetURI->Resolver->AsString%></A><br>
+% }
+%}
+    </td>
+  </tr>
+  <tr>
+    <td class="labeltop"><&|/l&>Referred to by</&>:</td>
+    <td class="value">
+% while (my $link = $Ticket->ReferredToBy->Next) {
+      <INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-">
+% if ($link->BaseURI->IsLocal) {
+% my $member = $link->BaseObj;
+      <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
+% } else {
+      <A HREF="<%$link->BaseURI->Resolver->HREF%>"><%$link->BaseURI->Resolver->AsString%></A><br>
+%}
+% }
+    </td>
+  </tr>
+</table>
+			    
+</TD>
+<TD VALIGN=TOP>
+<h3><&|/l&>New Relationships</&></h3>
+<i><&|/l&>Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces.</&></i><br>
+<TABLE>
+  <TR>
+    <TD class="label"><&|/l&>Merge into</&>:</TD>
+    <TD class="entry"><input name="<%$Ticket->Id%>-MergeInto"> <i><&|/l&>(only one ticket)</&></i></TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Depends on</&>:</TD>
+    <TD class="entry"><input name="<%$Ticket->Id%>-DependsOn"></TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Depended on by</&>:</TD>
+    <TD class="entry"><input name="DependsOn-<%$Ticket->Id%>"></TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Parents</&>:</TD>
+    <TD class="entry"><input name="<%$Ticket->Id%>-MemberOf"></TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Children</&>:</TD>
+    <TD class="entry"> <input name="MemberOf-<%$Ticket->Id%>"></TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Refers to</&>:</TD>
+    <TD class="entry"><input name="<%$Ticket->Id%>-RefersTo"></TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Referred to by</&>:</TD>
+    <TD class="entry"> <input name="RefersTo-<%$Ticket->Id%>"></TD>
+  </TR>
+</TABLE>
+</TD>
+</TR>
+</TABLE>
+
+
+      
+<%ARGS>
+$Ticket => undef
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/EditPeople b/rt/html/Ticket/Elements/EditPeople
new file mode 100644
index 000000000..1ab8f4ace
--- /dev/null
+++ b/rt/html/Ticket/Elements/EditPeople
@@ -0,0 +1,68 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<TABLE>
+<TR>
+<TD VALIGN=TOP>
+
+<h3><&|/l&>New watchers</&></h3>
+<&|/l&>Find people whose</&><BR>
+<& /Elements/SelectUsers &>
+<input type=submit name="OnlySearchForPeople" value="<&|/l&>Go!</&>">
+<BR>
+<&|/l&>Find group whose</&><BR>
+<& /Elements/SelectGroups &>
+<input type=submit name="OnlySearchForGroup" value="<&|/l&>Go!</&>">
+
+<& AddWatchers, Ticket => $Ticket, UserString => $UserString,
+        UserOp => $UserOp, UserField => $UserField,
+	GroupString => $GroupString, GroupOp => $GroupOp,
+	GroupField => $GroupField &> 
+</TD><TD VALIGN=TOP>
+<h3><&|/l&>Owner</&></h3>
+<&|/l&>Owner</&>: <& /Elements/SelectOwner, Name => 'Owner', QueueObj => $Ticket->QueueObj, TicketObj => $Ticket, Default => $Ticket->OwnerObj->Id &>
+<h3><&|/l&>Current watchers</&></h3>
+<&|/l&>(Check box to delete)</&><br>
+
+<&|/l&>Requestors</&>:
+<& EditWatchers, TicketObj => $Ticket, Watchers => $Ticket->Requestors &>
+
+<&|/l&>Cc</&>:
+<& EditWatchers, TicketObj => $Ticket, Watchers => $Ticket->Cc &>
+
+<&|/l&>Administrative Cc</&>:
+<& EditWatchers, TicketObj => $Ticket, Watchers => $Ticket->AdminCc &>
+
+</TD>
+</TR>
+</TABLE>
+
+<%ARGS>
+$UserField => undef
+$UserOp => undef
+$UserString => undef
+$GroupField => undef
+$GroupOp => undef
+$GroupString => undef
+$Ticket => undef
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/EditWatchers b/rt/html/Ticket/Elements/EditWatchers
new file mode 100644
index 000000000..145071cec
--- /dev/null
+++ b/rt/html/Ticket/Elements/EditWatchers
@@ -0,0 +1,52 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<ul>
+%# Print out a placeholder if there are none.
+%if ($Members->Count == 0 ) {
+<li><i><&|/l&>none</&></i>
+% }
+
+
+%while (my $watcher=$Members->Next) {
+<li>
+<INPUT TYPE=CHECKBOX NAME="Ticket-DelWatcher-Type-<%$Watchers->Type%>-Principal-<%$watcher->MemberId%>" UNCHECKED>
+%if ($watcher->MemberObj->IsUser) { 
+<a href="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$watcher->MemberObj->Object->id%>">
+<%$watcher->MemberObj->Object->Name%></a>
+%} else {
+<a href="<%$RT::WebPath%>/Admin/Groups/Modify.html?id=<%$watcher->MemberObj->Object->id%>">
+<%$watcher->MemberObj->Object->Name%></a>
+%}
+% }
+</ul>
+<%INIT>
+my $Members = $Watchers->MembersObj;
+</%INIT>
+<%ARGS>
+$TicketObj => undef
+$Watchers => undef
+</%ARGS>
+
+
+
diff --git a/rt/html/Ticket/Elements/ShowAttachments b/rt/html/Ticket/Elements/ShowAttachments
new file mode 100644
index 000000000..22b60d11b
--- /dev/null
+++ b/rt/html/Ticket/Elements/ShowAttachments
@@ -0,0 +1,76 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+% if (keys %documents) {
+<& /Elements/TitleBoxStart, title => loc('Attachments'), 
+        title_class=> 'inverse',  
+        color => "#336699" &>
+
+% foreach my $key (keys %documents) {
+% my $fontsize='size="-1"';
+
+<%$key%><br>
+<ul>
+% foreach my $rev (@{$documents{$key}}) {
+
+<%PERL>
+my $size = $rev->ContentLength;
+
+if ($size) {
+    if ($size > 1024) {
+        $size = int($size/102.4)/10 . "k";
+    }
+    else {
+        $size = $size ."b";
+    }
+
+</%PERL>
+
+<li><font <%$fontsize%>>
+        <A HREF="<%$RT::WebPath%>/Ticket/Attachment/<%$rev->TransactionObj->Id%>/<%$rev->Id%>/<%$rev->Filename%>"><%$rev->CreatedAsString%> (<% $size %>)</a></font></li>
+% }
+% $fontsize='size="-2"';
+% }
+</ul>
+
+% }
+<& /Elements/TitleBoxEnd &>
+<BR>
+% }
+
+<%INIT>
+my %documents;
+my $transactions = $Ticket->Transactions();
+while (my $trans = $transactions->Next()) {
+        my $attachments = $trans->Attachments();
+        while (my $attach = $attachments->Next()) {
+              next unless ($attach->Filename());
+              # most recent at the top
+              unshift (@{$documents{$attach->Filename}}, $attach);
+        }
+}
+</%INIT>
+<%ARGS>
+$Ticket => undef
+</%ARGS>
+
diff --git a/rt/html/Ticket/Elements/ShowBasics b/rt/html/Ticket/Elements/ShowBasics
new file mode 100644
index 000000000..ad23e8c8c
--- /dev/null
+++ b/rt/html/Ticket/Elements/ShowBasics
@@ -0,0 +1,54 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<table>
+  <tr>
+    <td class="label"><&|/l&>Id</&>:</td>
+    <td class="value"><%$Ticket->Id %></td>
+  </tr>
+  <tr>
+    <td class="label"><&|/l&>Status</&>:</td>
+    <td class="value"><&|/l&><% $Ticket->Status%></&></td>
+  </tr>
+  <tr>
+    <td class="label"><&|/l&>Worked</&>:</td>
+    <td class="value"><&|/l, $TimeWorked &>[_1] min</&></td>
+  </tr>
+  <tr>
+    <td class="label"><&|/l&>Priority</&>:</td>
+    <td class="value"><%$Ticket->Priority%>/<%$Ticket->FinalPriority %></td>
+  </tr>
+  <tr>
+    <td class="label"><&|/l&>Queue</&>:</td>
+    <td class="value"><%$Ticket->QueueObj->Name%></td>
+  </tr>
+</table>
+<%INIT>
+my $TimeWorked = $Ticket->TimeWorked;
+if ($Ticket->TimeLeft > 0 ) {
+  $TimeWorked = $Ticket->TimeWorked."/".$Ticket->TimeLeft;
+}
+</%INIT>
+<%ARGS>
+$Ticket => undef
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/ShowCustomFields b/rt/html/Ticket/Elements/ShowCustomFields
new file mode 100644
index 000000000..50d28f0d1
--- /dev/null
+++ b/rt/html/Ticket/Elements/ShowCustomFields
@@ -0,0 +1,46 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<table>
+% my @entry_fields;
+% while (my $CustomField = $CustomFields->Next()) {
+% my $Values = $Ticket->CustomFieldValues($CustomField->Id);
+  <tr>
+    <td class="label"><%$CustomField->Name%>:</td>
+    <td class="value">
+% while (my $Value = $Values->Next()) {
+<%$Value->Content%><br>        
+% }
+% unless ($Values->Count()) {
+<i><&|/l&>(no value)</&></i>
+% }
+    </td>
+  </tr>
+% }
+</table>
+<%INIT>
+my $CustomFields = $Ticket->QueueObj->CustomFields();
+</%INIT>
+<%ARGS>
+$Ticket => undef
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/ShowDates b/rt/html/Ticket/Elements/ShowDates
new file mode 100644
index 000000000..da7f75bb6
--- /dev/null
+++ b/rt/html/Ticket/Elements/ShowDates
@@ -0,0 +1,56 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<TABLE>
+  <TR>
+    <TD class="label"><&|/l&>Created</&>:</TD>
+    <TD class="value"><% $Ticket->CreatedObj->AsString %></TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Starts</&>:</TD>
+    <TD class="value"><% $Ticket->StartsObj->AsString %></TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Started</&>:</TD>
+    <TD class="value"><% $Ticket->StartedObj->AsString %></TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Last Contact</&>:</TD>
+    <TD class="value"><% $Ticket->ToldObj->AsString %></TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Due</&>:</TD>
+    <TD class="value"><% $Ticket->DueObj->AsString  %></TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Closed</&>:</TD>
+    <TD class="value"><% $Ticket->ResolvedObj->AsString  %></TD>
+  </TR>
+  <TR>
+    <TD class="label"><&|/l&>Updated</&>:</TD>
+    <TD class="value"><A HREF="#lasttrans"><% $Ticket->LastUpdated ? (loc("[_1] by [_2]", $Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)) : loc("Never") | h %></a></TD>
+  </TR>
+</TABLE>
+<%ARGS>
+$Ticket => undef
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/ShowDependencies b/rt/html/Ticket/Elements/ShowDependencies
new file mode 100644
index 000000000..b7f396871
--- /dev/null
+++ b/rt/html/Ticket/Elements/ShowDependencies
@@ -0,0 +1,41 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<&|/l&>Depends on</&>:<BR>
+% while (my $Link = $Ticket->DependsOn->Next) {
+% my $member = $Link->TargetObj;
+<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
+[<%$member->Status%>]
+ <br>
+% }
+<&|/l&>Depended on by</&>:<BR>
+% while (my $Link = $Ticket->DependedOnBy->Next) {
+% my $member = $Link->TargetObj;
+<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> 
+[<%$member->Status%>]
+ <br>
+% }
+
+<%ARGS>
+$Ticket => undef
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/ShowHistory b/rt/html/Ticket/Elements/ShowHistory
new file mode 100644
index 000000000..2958f8706
--- /dev/null
+++ b/rt/html/Ticket/Elements/ShowHistory
@@ -0,0 +1,86 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<%perl>
+ if ($ShowDisplayModes or $ShowTitle) {
+my $title;
+my $titleright;
+if ($ShowTitle) {
+    $title = loc('History');
+}
+else {
+    $title = '&nbsp;';
+}
+$titleright = loc('Display mode') . ":";
+if ($ShowHeaders &&  $ShowHeaders == $Ticket->Id ) {
+    $titleright .= "[<A HREF=\"" . $URIFile . "?id="
+      . $Ticket->id . "\">"
+      . loc("Brief headers")
+      . "</a>] <b>["
+      . loc("Full headers") . "]</b>";
+}
+else {
+    $titleright .= "<b>["
+      . loc("Brief headers")
+      . "]</b> [<A HREF=\""
+      . $URIFile
+      . "?ShowHeaders="
+      . $Ticket->Id . "&id="
+      . $Ticket->id . "\">"
+      . loc("Full headers") . "</a>]";
+}
+</%perl>
+<& /Elements/TitleBoxStart, title => $title, titleright => $titleright, bodyclass=> ''&>
+% }
+
+<TABLE WIDTH=100% CELLSPACING=0 CELLPADDING=2 BORDER=0>
+% while (my $Transaction = $Transactions->Next) {
+% my $skip = 0;
+% $m->comp('/Elements/Callback', _CallbackName => 'SkipTransaction', Transaction => $Transaction, skip => \$skip, %ARGS);
+% next if $skip;
+% $i++;
+%	if ($Transactions->IsLast) {
+	<a name="lasttrans"></a>
+% 	}
+	    <& ShowTransaction, Ticket => $Ticket, Transaction => $Transaction, ShowHeaders => $ShowHeaders, Collapsed => $Collapsed, RowNum => $i, ShowTitleBarCommands => $ShowTitleBarCommands  &>
+% }
+</TABLE>
+% if ($ShowDisplayModes or $ShowTitle) {
+<& /Elements/TitleBoxEnd &>
+% }
+<%INIT>
+
+my $Transactions = $Ticket->Transactions;
+my $i;
+
+
+</%INIT>
+<%ARGS>
+$URIFile => 'Display.html'
+$Ticket => undef
+$ShowHeaders => undef
+$Collapsed => undef
+$ShowTitle => 1
+$ShowDisplayModes => 1
+$ShowTitleBarCommands => 1
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/ShowLink b/rt/html/Ticket/Elements/ShowLink
new file mode 100644
index 000000000..493fd95a5
--- /dev/null
+++ b/rt/html/Ticket/Elements/ShowLink
@@ -0,0 +1,40 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<A href="<%$URI->Resolver->HREF%>">
+% if ($URI->IsLocal) {
+% my $member = $URI->Object;
+% if (UNIVERSAL::isa($member, "RT::Ticket")) {
+<%$member->Id%>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<% loc($member->Status) %>]
+% } elsif ( UNIVERSAL::can($member, 'Name')) {
+<%$URI->Resolver->AsString%>: <%$member->Name%>
+% } else {
+<%$URI->Resolver->AsString%>
+% }
+% } else {
+<%$URI->Resolver->AsString%>
+% }
+</a>
+<%ARGS>
+$URI => undef
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/ShowLinks b/rt/html/Ticket/Elements/ShowLinks
new file mode 100644
index 000000000..f88a6008d
--- /dev/null
+++ b/rt/html/Ticket/Elements/ShowLinks
@@ -0,0 +1,87 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<table>
+  <tr>
+    <td class="labeltop"><&|/l&>Depends on</&>:</td>
+    <td class="value">
+<ul>
+% while (my $Link = $Ticket->DependsOn->Next) {
+<li><& ShowLink, URI => $Link->TargetURI &>
+% }
+</ul>
+    </td>
+  </tr>
+  <tr>
+    <td class="labeltop"><&|/l&>Depended on by</&>:</td>
+    <td class="value">
+<ul>
+% while (my $Link = $Ticket->DependedOnBy->Next) {
+<li><& ShowLink, URI => $Link->BaseURI &>
+% }
+</ul>
+    </td>
+  </tr>
+  <tr>
+    <td class="labeltop"><&|/l&>Parents</&>:</td>
+    <td class="value">
+<ul>
+% while (my $Link = $Ticket->MemberOf->Next) {
+<li><& ShowLink, URI => $Link->TargetURI &>
+% }
+</ul>
+    </td>
+  </tr>
+  <tr>
+    <td class="labeltop"><&|/l&>Children</&>:</td>
+    <td class="value"><& /Ticket/Elements/ShowMembers, Ticket => $Ticket &></td>
+  </tr>
+  <tr>
+    <td class="labeltop"><&|/l&>Refers to</&>:</td>
+    <td class="value">
+<ul>
+% while (my $Link = $Ticket->RefersTo->Next) {
+<li><& ShowLink, URI => $Link->TargetURI &>
+% }
+</ul>
+    </td>
+  </tr>
+  <tr>
+    <td class="labeltop"><&|/l&>Referred to by</&>:</td>
+    <td class="value">
+    <ul>
+% while (my $Link = $Ticket->ReferredToBy->Next) {
+<li><& ShowLink, URI => $Link->BaseURI &>
+% }
+</ul>
+    </td>
+  </tr>
+
+% # Allow people to add more rows to the table                                                                                                                           
+%  $m->comp('/Elements/Callback', %ARGS );
+
+</table>
+
+<%ARGS>
+$Ticket => undef
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/ShowMemberOf b/rt/html/Ticket/Elements/ShowMemberOf
new file mode 100644
index 000000000..79e0a3ba2
--- /dev/null
+++ b/rt/html/Ticket/Elements/ShowMemberOf
@@ -0,0 +1,35 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<UL>
+% my $memberof = $Ticket->MemberOf;
+% while (my $member_of = $memberof->Next) {
+<LI><a href="/Ticket/Display.html?id=<%$member_of->Id%>"><%$member_of->Id%></a>: <%$member_of->Subject%> [<%$member_of->Status%>]
+% }
+</UL>
+
+<%INIT>
+</%INIT>
+<%ARGS>
+$Ticket => undef
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/ShowMembers b/rt/html/Ticket/Elements/ShowMembers
new file mode 100644
index 000000000..e1016626a
--- /dev/null
+++ b/rt/html/Ticket/Elements/ShowMembers
@@ -0,0 +1,45 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+% if ($members->Count) {
+<UL>
+% while (my $link = $members->Next) {
+% my $member= $link->BaseObj;
+<LI><a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: <%$member->Subject%> [<%loc($member->Status)%>]<br>
+% if ($depth < 8) {
+<&/Ticket/Elements/ShowMembers, Ticket => $member, depth => ($depth+1) &> 
+% }
+% }
+</UL>
+% }
+
+<%INIT>
+
+my $members = $Ticket->Members;
+
+</%INIT>
+
+<%ARGS>
+$Ticket => undef
+$depth => 1
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/ShowMessageHeaders b/rt/html/Ticket/Elements/ShowMessageHeaders
new file mode 100644
index 000000000..11d873c3e
--- /dev/null
+++ b/rt/html/Ticket/Elements/ShowMessageHeaders
@@ -0,0 +1,32 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<%$content |n%>
+<%INIT>
+my $content = $Headers;
+RT::Interface::Web::EscapeUTF8(\$content);
+$m->comp('/Elements/Callback', content => \$content, %ARGS);
+</%INIT>
+<%ARGS>
+$Headers => undef
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/ShowMessageStanza b/rt/html/Ticket/Elements/ShowMessageStanza
new file mode 100644
index 000000000..b0998068f
--- /dev/null
+++ b/rt/html/Ticket/Elements/ShowMessageStanza
@@ -0,0 +1,51 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<%perl>
+foreach my $stanza (@$Message) {
+    if ( ref $stanza eq "ARRAY" ) {
+        $m->comp( 'ShowMessageStanza',
+                  Depth   => $Depth + 1,
+                  Transaction => $Transaction,
+                  Message => $stanza );
+    }
+    elsif ( ref $stanza eq "HASH" ) {
+        my $content = $stanza->{raw};
+        RT::Interface::Web::EscapeUTF8(\$content);
+        $m->comp('/Elements/Callback', content => \$content, %ARGS);
+                $content =~ s/\n/<br>/gi;
+
+</%perl>
+<font color="<%$colors[$Depth]%>"><%$content |n%><br></font>
+%       }
+% }
+<%INIT>
+use URI::URL;
+my $server = 'fsck.com';
+my @colors = ('#000000', '#660000', '#006600', '#000066', '#cc0000', '#00cc00', '#0000cc', '#ff0000', '#00ff00', '#0000ff');
+</%INIT>
+<%ARGS>
+$Message => undef
+$Depth => 0
+$Transaction => undef
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/ShowPeople b/rt/html/Ticket/Elements/ShowPeople
new file mode 100644
index 000000000..0b8026949
--- /dev/null
+++ b/rt/html/Ticket/Elements/ShowPeople
@@ -0,0 +1,45 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<table>
+  <tr>
+    <td class="label"><&|/l&>Owner</&>:</td>
+    <td class="value"><%$Ticket->OwnerObj->Name%></td>
+  </tr>
+  <tr>
+    <td class="label"><&|/l&>Requestors</&>:</td>
+    <td class="value"><%$Ticket->RequestorAddresses%></td>
+  </tr>
+  <tr>
+    <td class="label"><&|/l&>Cc</&>:</td>
+    <td class="value"><%$Ticket->CcAddresses%></td>
+  </tr>
+  <tr>
+    <td class="label"><&|/l&>AdminCc</&>:</td>
+    <td class="value"><%$Ticket->AdminCcAddresses%></td>
+  </tr>
+</table>
+<%ARGS>
+$Ticket => undef
+</%ARGS>
+
diff --git a/rt/html/Ticket/Elements/ShowReferences b/rt/html/Ticket/Elements/ShowReferences
new file mode 100644
index 000000000..831923b2b
--- /dev/null
+++ b/rt/html/Ticket/Elements/ShowReferences
@@ -0,0 +1,50 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<UL>
+% while (my $Link = $Ticket->RefersTo->Next) {
+<LI>
+% if ($Link->TargetURI->IsLocal) {
+% my $member = $Link->TargetObj;
+
+<a href="/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
+% } else {
+<A HREF="<%$Link->TargetURI->HREF%>"><%$Link->Target%></A>
+% }
+%}
+
+
+
+% while (my $Link = $Ticket->ReferredToBy->Next) {
+<LI>
+% if ($Link->BaseURI->IsLocal) {
+% my $member = $Link->BaseObj;
+<a href="/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
+% } else {
+<A HREF="<%$Link->BaseURI->HREF%>"><%$Link->Base%></A>
+%}
+% }
+</UL>
+<%ARGS>
+$Ticket => undef
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/ShowRequestor b/rt/html/Ticket/Elements/ShowRequestor
new file mode 100644
index 000000000..cc91f590f
--- /dev/null
+++ b/rt/html/Ticket/Elements/ShowRequestor
@@ -0,0 +1,59 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<%PERL>
+my $rows = 10;
+my $people = $Ticket->Requestors->MembersObj;
+while (my $member=$people->Next) {
+my $requestor = $member->MemberObj->Object;
+my $name=$requestor->RealName || $requestor->EmailAddress;	
+my $tickets = RT::Tickets->new($session{'CurrentUser'});
+$tickets->LimitWatcher(TYPE => 'Requestor', VALUE => $requestor->EmailAddress );
+$tickets->LimitStatus( VALUE => 'open');
+$tickets->LimitStatus( VALUE => 'new');
+$tickets->RowsPerPage($rows);
+$tickets->OrderBy(FIELD => 'Priority',
+		  ORDER => 'DESC');
+</%PERL>
+
+% unless ($requestor->Privileged) {
+<& /Elements/TitleBoxStart, 
+	title => "<a class='inverse' href=\"$RT::WebPath/Admin/Users/Modify.html?id=".$requestor->id."\">".loc("More about [_1]", $name)."</a>" &>
+
+<&|/l&>Comments about this user</&>:<BR>
+<B><% ($requestor->Comments || loc("No comment entered about this user")) %></B><BR>
+
+<&|/l, $rows &>This user's [_1] highest priority tickets</&>:<BR>
+<UL>
+%while (my $w=$tickets->Next) {
+<LI><a href="<%$RT::WebPath%><%$DisplayPath%>?id=<%$w->id%>"><%$w->Id%>: <%$w->Subject%></a> (<%$w->Status%>)
+%}
+</UL>
+<& /Elements/TitleBoxEnd &>
+
+% }
+%}
+<%ARGS>
+$Ticket=>undef
+$DisplayPath => "/Ticket/Display.html"
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/ShowSummary b/rt/html/Ticket/Elements/ShowSummary
new file mode 100644
index 000000000..6ae875832
--- /dev/null
+++ b/rt/html/Ticket/Elements/ShowSummary
@@ -0,0 +1,82 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+      <TABLE WIDTH="100%" class="ticketsummary" >
+      <TR>
+	<TD VALIGN=TOP WIDTH="50%">
+	  <& /Elements/TitleBoxStart, title => loc('The Basics'), 
+		title_href =>"$RT::WebPath/Ticket/Modify.html?id=".$Ticket->Id, 
+		title_class=> 'inverse',  
+		color => "#993333" &>
+	        <& /Ticket/Elements/ShowBasics, Ticket => $Ticket &>
+	  <& /Elements/TitleBoxEnd &>
+          <br>
+% if ($Ticket->QueueObj->CustomFields()->First) {
+	  <& /Elements/TitleBoxStart, title => loc('Custom Fields'), 
+		title_href =>"$RT::WebPath/Ticket/Modify.html?id=".$Ticket->Id, 
+		title_class=> 'inverse',  
+		color => "#993333" &>
+	        <& /Ticket/Elements/ShowCustomFields, Ticket => $Ticket &>
+	  <& /Elements/TitleBoxEnd &>
+
+<br>
+% }
+	  <& /Elements/TitleBoxStart, title => loc('People'), 
+		title_href =>"$RT::WebPath/Ticket/ModifyPeople.html?id=".$Ticket->Id, 
+		title_class=> 'inverse',  
+		color => "#333399" &>
+	  <& /Ticket/Elements/ShowPeople, Ticket => $Ticket &>
+	  <& /Elements/TitleBoxEnd &>
+	<BR>
+	</TD>
+	<TD VALIGN=TOP WIDTH="50%">
+
+	  <& /Elements/TitleBoxStart, title => loc("Dates"),
+		title_href =>"$RT::WebPath/Ticket/ModifyDates.html?id=".$Ticket->Id, 
+		title_class=> 'inverse',  
+		 color => "#663366" &>
+	  <& /Ticket/Elements/ShowDates, Ticket => $Ticket &>
+	  <& /Elements/TitleBoxEnd &>
+	<BR>  
+	  <& /Elements/TitleBoxStart, title => loc('Relationships'), 
+		title_href => "$RT::WebPath/Ticket/ModifyLinks.html?id=".$Ticket->Id, 
+		title_class=> 'inverse',  
+		titleright => '', color=> "#336633" &>
+	        <& /Ticket/Elements/ShowLinks, Ticket => $Ticket &>
+	<& /Elements/TitleBoxEnd &>
+        <BR>
+	  <& /Ticket/Elements/ShowAttachments, Ticket => $Ticket &>
+
+	  <& /Ticket/Elements/ShowRequestor, Ticket => $Ticket &>
+
+
+	</TD>
+      </TR>
+    </TABLE>
+<%ARGS>
+$Ticket => undef
+</%ARGS>
+
+
+
+
diff --git a/rt/html/Ticket/Elements/ShowTransaction b/rt/html/Ticket/Elements/ShowTransaction
new file mode 100644
index 000000000..f2f89d35c
--- /dev/null
+++ b/rt/html/Ticket/Elements/ShowTransaction
@@ -0,0 +1,169 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<TR class="<% $RowNum%2 ? 'oddline' : 'evenline'%>" >
+<TD bgcolor="<%$bgcolor%>"><A NAME="txn-<%$Transaction->Id%>" href="#txn-<%$Transaction->Id%>">#</A>&nbsp;</TD>
+<TD>&nbsp&nbsp;</TD>
+<TD><font size=-2><% $transdate|n %></font>&nbsp;</TD>
+% my $desc = $Transaction->BriefDescription;
+% $m->comp('/Elements/Callback', _CallbackName => 'ModifyDisplay', text => \$desc, Transaction => $Transaction, %ARGS);
+<TD ALIGN="LEFT"><b><%$Transaction->CreatorObj->Name%> - <%$TicketString%> <%$desc%>
+
+</b></TD>
+<TD><%$TimeTaken%>&nbsp;</TD>
+<TD ALIGN="RIGHT"><font size=-1><%$titlebar_commands|n%></font></TD>
+</TR>
+<%PERL>
+
+unless ($Collapsed) {
+ $attachments->GotoFirstItem;
+ while (my $message=$attachments->Next) {
+     #we don't want to show any empty transactions, unless they have kids
+     next unless ($message->ContentLength || $message->Children->Count);
+
+  my ($headers, $quoted);
+      if ($ShowHeaders && ($ShowHeaders == $Ticket->Id)) {
+	  $headers = $message->Headers;
+      } else {
+	  $headers = $message->NiceHeaders;
+      }
+      chomp $headers;
+      if ($headers) {
+	   # localize the common headers (like 'Subject:'), too.
+	   eval {$headers =~ s/^([^:]+)(?=:)/loc($1)/em; } # we eval here to catch errors when 5.6 panics
+      }
+     # 13456 is a random # of about the biggest size we want to see inline text
+     my $MAX_INLINE_BODY = 13456;
+     if ($message->ContentType =~ m{^(text/plain|message|text$)}i && 
+				    $message->ContentLength < $MAX_INLINE_BODY ) {
+         require Text::Quoted;
+	 $quoted = Text::Quoted::extract($message->Content); 
+     }
+        
+</%PERL>
+<TR class="<% $RowNum%2 ? 'oddline' : 'evenline'%>" >                                
+      <TD BGCOLOR="<%$bgcolor%>">&nbsp;&nbsp;</TD>
+      <TD>&nbsp;&nbsp;</TD>
+      <TD COLSPAN=3 VALIGN=TOP>
+<span class="message">
+	<PRE>
+<& ShowMessageHeaders, Headers => $headers, Transaction => $Transaction &>
+</PRE>
+<& ShowMessageStanza, Depth => 0, Message => $quoted, Transaction => $Transaction &>
+</span>
+      </TD>
+      <TD VALIGN=TOP ALIGN=RIGHT>
+	
+% if ($message->Parent == 0  ) {
+<BR>
+% }
+<%PERL>
+my $size = $message->ContentLength;
+
+if ($size) {
+    if ($size > 1024) {
+	$size = loc("[_1]k", int($size/102.4)/10);
+    }
+    else {
+	$size = loc("[_1]b", $size);
+    }
+</%PERL>
+<font size=-1><A HREF="<%$RT::WebPath%>/Ticket/Attachment/<%$Transaction->Id%>/<%$message->Id%>/<%$message->Filename%>"><&|/l&>Download</&> <% $message->Filename|| loc('(untitled)') %></a> <% $size %></font>
+% }
+</TD>
+</TR>
+% }
+% }
+
+
+
+<%ARGS>
+$Ticket => undef
+$Transaction => undef
+$ShowHeaders => 0
+$Collapsed => undef
+$ShowTitleBarCommands => 1
+$RowNum => 1
+</%ARGS>
+
+<%INIT>
+
+
+my ($TimeTaken, $TicketString, $bgcolor);
+
+my $transdate = $Transaction->CreatedAsString();
+$transdate =~ s/\s/&nbsp;/g;
+
+if ($Transaction->Type =~ /^(Create|Correspond|Comment$)/) {
+	if ($Transaction->IsInbound) {
+		$bgcolor="#336699";
+	}
+	else {
+		$bgcolor="#339999";
+	}
+} elsif (($Transaction->Field =~ /^Owner$/) or 
+	 ($Transaction->Type =~ /^(AddWatcher|DelWatcher)$/)) {
+	$bgcolor="#333399";
+
+} elsif ($Transaction->Type =~ /^(AddLink|DeleteLink)$/) {
+	$bgcolor="#336633";
+} elsif ($Transaction->Type =~ /^(Status|Set|Told)$/) {
+	if ($Transaction->Field =~ /^(Told|Starts|Started|Due)$/) {
+		$bgcolor="#663366";	
+	}
+	else {
+		$bgcolor="#993333";
+	}
+}
+else {
+	$bgcolor="#cccccc";
+}
+
+if ($Ticket->Id != $Transaction->Ticket) {
+	$TicketString = "Ticket ".$Transaction->Ticket .": ";
+}
+
+if ($Transaction->TimeTaken > 0) {
+	$TimeTaken = $Transaction->TimeTaken." min"
+}
+my $attachments = $Transaction->Attachments;
+
+my $titlebar_commands='&nbsp;';
+
+# If the transaction has anything attached to it at all
+if ($Transaction->Attachments->First && $ShowTitleBarCommands) {
+	if ($Transaction->TicketObj->CurrentUserHasRight('ReplyToTicket')) {
+		$titlebar_commands .= 
+	  	  "[<a href=\"Update.html?id=".
+		  $Transaction->Ticket . "&QuoteTransaction=".$Transaction->Id.
+		  "&Action=Respond\">". loc('Reply') ."</a>]&nbsp;";
+	}
+	if ($Transaction->TicketObj->CurrentUserHasRight('CommentOnTicket')) {
+	     $titlebar_commands .= 
+	     "[<a href=\"Update.html?id=".$Transaction->Ticket. 
+	     "&QuoteTransaction=".$Transaction->Id.
+	     "&Action=Comment\">". loc('Comment') ."</a>]";
+	}
+}
+
+</%INIT>
diff --git a/rt/html/Ticket/Elements/Tabs b/rt/html/Ticket/Elements/Tabs
new file mode 100644
index 000000000..81c92e8c2
--- /dev/null
+++ b/rt/html/Ticket/Elements/Tabs
@@ -0,0 +1,170 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Callback, Ticket => $Ticket, actions=> $actions, tabs => $tabs, %ARGS &>
+<& /Elements/Tabs, 
+    tabs => $tabs, 
+    actions => $actions, 
+    current_tab => $current_tab, 
+    current_toptab => $current_toptab,
+    Title => $Title &> 
+<%INIT>
+
+my $tabs = {};
+my $current_toptab = "Search/Listing.html",
+    my $searchtabs = { new => { title => loc('New Search'),
+                                path => 'Search/Listing.html?ClearRestrictions=1'}
+                        
+
+} ;
+my $actions;
+
+if ( $Ticket) {
+	
+my $id   = $Ticket->id();
+
+if ( defined $session{'tickets'} ) {
+
+
+my $item_map = $session{'tickets'}->ItemMap;
+
+            # Don't $current_toptab = display prev links if we're on the first ticket
+
+        if ($item_map->{$Ticket->Id}->{prev}) {
+                $searchtabs->{'_a'} = {
+                            class => "nav",
+                            path => "Ticket/Display.html?id=" . $item_map->{first},
+                            title => '<< ' . loc('First') };
+                $searchtabs->{"_b"} = { class => "nav",
+                            path => "Ticket/Display.html?id=" . $item_map->{$Ticket->Id}->{prev},
+                                  title => '< ' . loc('Prev') };
+       } 
+
+
+        # Don't display next links if we're on the last ticket
+        if ($item_map->{$Ticket->Id}->{next}) {
+            $searchtabs->{'d'} = { class => "nav",
+                            path => "Ticket/Display.html?id=" . $item_map->{$Ticket->Id}->{next},
+                             title => loc('Next') . ' >' };
+            $searchtabs->{'e'} = {
+                           class => "nav",
+                           path => "Ticket/Display.html?id=" . $item_map->{last},
+                           title => loc('Last') . ' >>' };
+        }
+}
+
+
+
+$tabs->{"this"} = { class => "currentnav",
+                    path  => "Ticket/Display.html?id=" . $Ticket->id,
+                    title => "#" . $id,
+                    current_subtab => $current_subtab };
+
+my $ticket_page_tabs = {
+    _A => { title => loc('Display'),
+            path  => "Ticket/Display.html?id=" . $id, },
+
+    _Ab => { title => loc('History'),
+             path  => "Ticket/History.html?id=" . $id, },
+    _B => { title => loc('Basics'),
+            path  => "Ticket/Modify.html?id=" . $id, },
+
+    _C => { title => loc('Dates'),
+            path  => "Ticket/ModifyDates.html?id=" . $id, },
+    _D =>
+      { title => loc('People'), path => "Ticket/ModifyPeople.html?id=" . $id, },
+    _E => { title => loc('Links'),
+            path  => "Ticket/ModifyLinks.html?id=" . $id, },
+    _F => { title => loc('Jumbo'),
+            path  => "Ticket/ModifyAll.html?id=" . $id,
+            seperator => 1
+ },
+
+};
+
+foreach my $tab ( sort keys %{$ticket_page_tabs} ) {
+    if ( $ticket_page_tabs->{$tab}->{'path'} eq $current_tab ) {
+        $ticket_page_tabs->{$tab}->{"subtabs"}        = $subtabs;
+        $tabs->{'this'}->{"current_subtab"}        = 
+        $ticket_page_tabs->{$tab}->{"path"};
+    }
+}
+$tabs->{'this'}->{"subtabs"} = $ticket_page_tabs;
+$current_tab = "Ticket/Display.html?id=" . $id;
+
+
+
+
+
+if (    $Ticket->CurrentUserHasRight('ModifyTicket')
+     or $Ticket->CurrentUserHasRight('ReplyToTicket') ) {
+    $actions->{'A'} = { title => loc('Reply'),
+                        path  => "Ticket/Update.html?Action=Respond&id=" . $id,
+    };
+}
+
+if ( $Ticket->CurrentUserHasRight('ModifyTicket') ) {
+    if ( $Ticket->Status ne 'resolved' ) {
+        $actions->{'B'} = {
+
+            path => "Ticket/Update.html?Action=Comment&DefaultStatus=resolved&id=" . $id,
+            title => loc('Resolve') };
+    }
+    if ( $Ticket->Status ne 'open' ) {
+        $actions->{'C'} = { path => "Ticket/Display.html?Status=open&id=" . $id,
+                            title => loc('Open it') };
+    }
+}
+
+if ( $Ticket->CurrentUserHasRight('OwnTicket') ) {
+    if ( $Ticket->OwnerObj->id == $RT::Nobody->id ) {
+        $actions->{'D'} = { path => "Ticket/Display.html?Action=Take&id=" . $id,
+                            title => loc('Take') };
+    }
+    elsif ( $Ticket->OwnerObj->id != $session{CurrentUser}->id ) {
+        $actions->{'E'} = {path => "Ticket/Display.html?Action=Steal&id=" . $id,
+                           title => loc('Steal') };
+    }
+}
+
+if (    $Ticket->CurrentUserHasRight('ModifyTicket')
+     or $Ticket->CurrentUserHasRight('CommentOnTicket') ) {
+    $actions->{'F'} = { title => loc('Comment'),
+                        path  => "Ticket/Update.html?Action=Comment&id=" . $id,
+    };
+}
+}
+$tabs->{"g"} = { path      => 'Search/Listing.html',
+                 title     => loc('Search'),
+                 separator => 1,
+                 subtabs   => $searchtabs };
+</%INIT>
+
+  
+<%ARGS>
+$Ticket => undef
+$subtabs => undef
+$current_tab => undef
+$current_subtab => undef
+$Title => undef
+</%ARGS>
diff --git a/rt/html/Ticket/History.html b/rt/html/Ticket/History.html
new file mode 100644
index 000000000..cb02f1c75
--- /dev/null
+++ b/rt/html/Ticket/History.html
@@ -0,0 +1,52 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => loc("Ticket History # [_1] [_2]", $Ticket->Id, $Ticket->Subject) &>
+<& /Ticket/Elements/Tabs, 
+    Ticket => $Ticket, current_tab => 'Ticket/History.html?id='.$Ticket->id, 
+    Title => loc("Ticket History # [_1] [_2]", $Ticket->Id, $Ticket->Subject) &>
+
+<BR>
+      
+<& /Ticket/Elements/ShowHistory , Ticket => $Ticket, ShowHeaders => $ARGS{'ShowHeaders'}, URIFile => 'History.html' &> 
+
+
+<%ARGS>
+$id => undef
+</%ARGS>
+
+<%INIT>
+
+  
+
+my $Ticket = LoadTicket ($id);
+
+unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
+	Abort("No permission to view ticket");
+}
+
+</%INIT>
+
+
+
+
diff --git a/rt/html/Ticket/Modify.html b/rt/html/Ticket/Modify.html
new file mode 100644
index 000000000..c97fd0994
--- /dev/null
+++ b/rt/html/Ticket/Modify.html
@@ -0,0 +1,63 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => loc('Modify ticket #[_1]', $TicketObj->Id) &>
+<& /Ticket/Elements/Tabs, 
+    Ticket => $TicketObj, current_subtab => "Ticket/Modify.html?id=".$TicketObj->Id, 
+    Title => loc('Modify ticket #[_1]', $TicketObj->Id) &>
+
+<& /Elements/ListActions, actions => \@results &>
+<FORM METHOD=POST ACTION="Modify.html">
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$TicketObj->Id%>">
+
+<& /Elements/TitleBoxStart, title => loc('Modify ticket #[_1]',$TicketObj->Id),   color=> "#993333", width => "100%" &>
+<& Elements/EditBasics, TicketObj => $TicketObj &>
+<& Elements/EditCustomFields, TicketObj => $TicketObj &>
+<& /Elements/TitleBoxEnd &>
+
+<& /Elements/Submit, Label => loc('Save Changes'), Caption => loc("If you've updated anything above, be sure to"), color => "#993333" &>
+</form>
+<%INIT>
+  
+my $TicketObj = LoadTicket($id);
+my $CustomFields = $TicketObj->QueueObj->CustomFields();
+
+# Now let callbacks have a chance at editing %ARGS
+$m->comp('/Elements/Callback', TicketObj => $TicketObj, CustomFields => $CustomFields, %ARGS);
+
+my @results = ProcessTicketBasics(TicketObj => $TicketObj, ARGSRef => \%ARGS);
+my @cf_results = ProcessTicketCustomFieldUpdates(ARGSRef => \%ARGS);
+push (@results, @cf_results);
+
+# TODO: display the results, even if we can't display the ticket
+
+unless ($TicketObj->CurrentUserHasRight('ShowTicket')) {
+    Abort("No permission to view ticket");
+} 
+
+</%INIT>
+
+
+<%ARGS>
+$id => undef
+</%ARGS>
diff --git a/rt/html/Ticket/ModifyAll.html b/rt/html/Ticket/ModifyAll.html
new file mode 100644
index 000000000..a50689398
--- /dev/null
+++ b/rt/html/Ticket/ModifyAll.html
@@ -0,0 +1,158 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => loc("Ticket #[_1] Jumbo update: [_2]", $Ticket->Id, $Ticket->Subject) &>
+<& /Ticket/Elements/Tabs, 
+    Ticket => $Ticket, 
+    current_tab => "Ticket/ModifyAll.html?id=".$Ticket->Id, 
+    Title => loc("Ticket #[_1] Jumbo update: [_2]", $Ticket->Id, $Ticket->Subject) &>
+
+<& /Elements/ListActions, actions => \@results &>
+
+<FORM METHOD=POST ACTION="ModifyAll.html" ENCTYPE="multipart/form-data">
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>">
+
+
+<& /Elements/TitleBoxStart, title => loc('Modify ticket # [_1]', $Ticket->Id),   color=> "#993333", width => "100%" &>
+<& Elements/EditBasics, TicketObj => $Ticket &>
+<& Elements/EditCustomFields, TicketObj => $Ticket &>
+<& /Elements/TitleBoxEnd &>
+
+<BR>
+
+<& /Elements/TitleBoxStart, title => loc('Dates'),  width => "100%", color => "#663366"  &>
+<& Elements/EditDates, TicketObj => $Ticket &>
+<& /Elements/TitleBoxEnd &>
+
+<BR>
+
+
+<& /Elements/TitleBoxStart, title => loc('People'),width => "100%", color=> "#333399" &>
+<& Elements/EditPeople, Ticket => $Ticket, UserField => $UserField, UserString => $UserString, UserOp => $UserOp &>
+<& /Elements/TitleBoxEnd &>
+
+<BR>
+
+<& /Elements/TitleBoxStart, title => loc('Relationships'), color => "#336633"&>
+<& Elements/EditLinks, Ticket => $Ticket &>
+<& /Elements/TitleBoxEnd &>
+
+<BR>
+
+<& /Elements/TitleBoxStart, title => loc('Update ticket') &>
+<table>
+  <tr>
+    <td class="label"><&|/l&>Update Type</&>:</td>
+    <td class="entry">
+      <select name="UpdateType">
+% if ($CanComment) {
+        <option value="private" ><&|/l&>Comments (Not sent to requestors)</&></option>
+% }
+% if ($CanRespond) {
+        <option value="response"><&|/l&>Response to requestors</&></option>
+% }
+      </select> 
+    </td>
+  </tr>
+  <tr>
+    <td class="label"><&|/l&>Subject</&>:</td>
+    <td class="entry"><input name="UpdateSubject" size=60 value=""></td>
+  </tr>
+  <tr>
+    <td class="label"><&|/l&>Attach</&>:</td>
+    <td class="entry"><input name="UpdateAttachment" type=file></td>
+  </tr>
+  <tr>
+    <td class="labeltop"><&|/l&>Content</&>:</td>
+    <td class="entry"><& /Elements/MessageBox, Name=>"UpdateContent", QuoteTransaction=>$ARGS{QuoteTransaction} &></td>
+  </tr>
+</table>
+<& /Elements/TitleBoxEnd &>
+  
+
+<& /Elements/Submit, Label => loc('Save Changes'), Caption => loc("If you've updated anything above, be sure to"), color => "#333399" &>
+</form>
+
+<%INIT>
+
+
+
+my $Ticket = LoadTicket($id);
+
+my $CanRespond = 0;
+my $CanComment = 0;
+
+
+$CanRespond = 1 if ( $Ticket->CurrentUserHasRight('ReplyToTicket') or
+                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
+
+$CanComment = 1 if ( $Ticket->CurrentUserHasRight('CommentOnTicket') or
+                     $Ticket->CurrentUserHasRight('ModifyTicket') );
+
+
+my (@wresults, @results,  @dresults, @lresults, @cf_results);
+
+unless ($OnlySearchForPeople) {
+    @wresults = ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS);
+    @results = ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS);
+ @cf_results = ProcessTicketCustomFieldUpdates(ARGSRef => \%ARGS);
+    @dresults = ProcessTicketDates( TicketObj => $Ticket, ARGSRef => \%ARGS);
+    @lresults = ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);
+
+    $ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
+
+    if ($ARGS{'UpdateContent'} && 
+	$ARGS{'UpdateContent'} ne '' && 
+	$ARGS{'UpdateContent'} ne  "-- \n" . 
+				$session{'CurrentUser'}->UserObj->Signature
+       ) {
+   	 ProcessUpdateMessage(TicketObj => $Ticket, 
+			      ARGSRef=>\%ARGS, 
+                              Actions=>\@results);
+	}
+}
+push @results, @wresults;
+push @results, @dresults;
+push @results, @lresults;
+push @results, @cf_results;
+
+# If they've gone and moved the ticket to somewhere they can't see, etc...
+# TODO: display the results, even if we can't display the ticket.
+
+unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
+   Abort("No permission to view ticket");
+}
+
+
+</%INIT>
+
+
+
+<%ARGS>
+$OnlySearchForPeople => undef
+$UserField => undef
+$UserOp => undef
+$UserString => undef
+$id => undef
+</%ARGS>
+
diff --git a/rt/html/Ticket/ModifyDates.html b/rt/html/Ticket/ModifyDates.html
new file mode 100644
index 000000000..3ccae4431
--- /dev/null
+++ b/rt/html/Ticket/ModifyDates.html
@@ -0,0 +1,52 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => loc('Modify dates for #[_1]', $TicketObj->Id) &>
+<& /Ticket/Elements/Tabs, 
+    Ticket => $TicketObj, 
+    current_tab => "Ticket/ModifyDates.html?id=".$TicketObj->Id, 
+    Title => loc('Modify dates for #[_1]', $TicketObj->Id) &> 
+
+<& /Elements/ListActions, actions => \@results &>
+
+<FORM METHOD=POST ACTION="ModifyDates.html">
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$TicketObj->Id%>">
+<& /Elements/TitleBoxStart, title => loc('Modify dates for ticket # [_1]', $TicketObj->Id),  width => "100%", color => "#663366"  &>
+
+<& Elements/EditDates, TicketObj => $TicketObj &>
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit, color => "#663366" &>
+</form>
+
+
+<%INIT>
+
+my $TicketObj = LoadTicket($id);
+my @results = ProcessTicketDates( TicketObj => $TicketObj, ARGSRef => \%ARGS);
+
+</%INIT>
+
+
+<%ARGS>
+$id => undef
+</%ARGS>
diff --git a/rt/html/Ticket/ModifyLinks.html b/rt/html/Ticket/ModifyLinks.html
new file mode 100644
index 000000000..1d050088b
--- /dev/null
+++ b/rt/html/Ticket/ModifyLinks.html
@@ -0,0 +1,54 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => loc("Link ticket #[_1]", $Ticket->Id) &>
+<& /Ticket/Elements/Tabs, 
+    Ticket => $Ticket, 
+    current_tab => "Ticket/ModifyLinks.html?id=".$Ticket->Id, 
+    Title => loc("Link ticket #[_1]", $Ticket->Id) &>
+
+<& /Elements/ListActions, actions => \@results &>
+
+<form action="ModifyLinks.html" method="post">
+<input type="hidden" name="id" value="<%$Ticket->id%>">
+
+<& /Elements/TitleBoxStart, title => loc('Edit Relationships'), color => "#336633"&>
+<& Elements/EditLinks, Ticket => $Ticket &>
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit, color => "#336633", Caption=> loc('Save Changes') &>
+</form>
+
+
+
+
+<%INIT>
+  
+my $Ticket = LoadTicket($id);
+my @results = ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);
+    
+</%INIT>
+      
+      
+<%ARGS>
+$id => undef
+</%ARGS>
diff --git a/rt/html/Ticket/ModifyPeople.html b/rt/html/Ticket/ModifyPeople.html
new file mode 100644
index 000000000..2e41664d9
--- /dev/null
+++ b/rt/html/Ticket/ModifyPeople.html
@@ -0,0 +1,67 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => loc('Modify people related to ticket #[_1]', $Ticket->id) &>
+<& /Ticket/Elements/Tabs, 
+    Ticket => $Ticket, 
+    current_tab => "Ticket/ModifyPeople.html?id=".$Ticket->Id, 
+    Title => loc('Modify people related to ticket #[_1]', $Ticket->id) &>
+
+<& /Elements/ListActions, actions => \@results &>
+
+<FORM METHOD=POST ACTION="ModifyPeople.html">
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>">
+<& /Elements/TitleBoxStart, title => loc('Modify people related to ticket #[_1]', $Ticket->Id),   width => "100%", color=> "#333399" &>
+<& Elements/EditPeople, Ticket => $Ticket, UserField => $UserField, UserString => $UserString, UserOp => $UserOp, GroupString => $GroupString, GroupOp => $GroupOp, GroupField => $GroupField &> 
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit, Label => loc('Save Changes'), Caption => loc("If you've updated anything above, be sure to"), color => "#333399" &>
+</form>
+
+<%INIT>
+
+my (@results, @wresults);
+
+my $Ticket = LoadTicket($id);
+
+# if we're trying to search for watchers and nothing else
+unless ($OnlySearchForPeople) {
+    @results = ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS);
+    @wresults = ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS);
+}
+
+push @results, @wresults;
+</%INIT>
+
+
+
+<%ARGS>
+$OnlySearchForPeople => undef
+$UserField => undef
+$UserOp => undef
+$UserString => undef
+$GroupField => undef
+$GroupOp => undef
+$GroupString => undef
+$id => undef
+</%ARGS>
+
diff --git a/rt/html/Ticket/Update.html b/rt/html/Ticket/Update.html
new file mode 100644
index 000000000..e19aacf6a
--- /dev/null
+++ b/rt/html/Ticket/Update.html
@@ -0,0 +1,205 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => $title &>
+<& /Ticket/Elements/Tabs, 
+    Ticket => $Ticket , 
+    Title=> $title &>
+
+<FORM ACTION="Update.html" NAME="TicketUpdate" 
+	METHOD=POST enctype="multipart/form-data">
+<input type="hidden" name="QuoteTransaction" value="<% $ARGS{QuoteTransaction} %>">
+<input type="hidden" name="DefaultStatus" value="<% $DefaultStatus %>">
+<input type="hidden" name="Action" value="<% $ARGS{Action} %>">
+<font size=-1>
+
+<TABLE>
+<TR><TD>
+<a href="ModifyPeople.html?id=<%$Ticket->Id%>"><&|/l&>Ticket watchers</&></A></TD><TD align=right>
+<&|/l&>Requestor</&>:
+</TD><TD>
+<b><% $Ticket->RequestorAddresses %></b>
+</TD></TR>
+<TR><TD>&nbsp;</TD><TD align=right>
+<&|/l&>Cc</&>:
+</TD><TD>
+<b><% $Ticket->CcAddresses %></b>
+</TD></TR>
+<TR><TD>&nbsp;</TD><TD align=right>
+<&|/l&>AdminCc</&>:
+</TD><TD>
+<b><% $Ticket->AdminCcAddresses %></b>
+</TD></TR>
+</TR>
+</TABLE>
+<hr>
+
+<TABLE BORDER=0>
+
+<tr><td align=right><&|/l&>Status</&>:</td>
+<td>
+<& /Elements/SelectStatus, Name=>"Status", Default => $DefaultStatus &>
+<&|/l&>Owner</&>:  
+<& /Elements/SelectOwner, Name=>"Owner", Default => ($ARGS{'Owner'} || $Ticket->OwnerObj->Id()), QueueObj => $Ticket->QueueObj, TicketObj => $Ticket &>
+<&|/l&>Worked</&>: <input size=4 name="UpdateTimeWorked" value="<% $ARGS{UpdateTimeWorked}%>"> <&|/l&>minutes</&></td></tr>
+<tr><td align=right><&|/l&>Update Type</&>:</td>
+<td><select name="UpdateType">
+% if ($CanComment) {
+  <option value="private" <%$CommentDefault%>><&|/l&>Comments (Not sent to requestors)</&></option>
+% }
+% if ($CanRespond) {
+   <option value="response" <%$ResponseDefault%>><&|/l&>Response to requestors</&></option>
+% }
+</select> 
+</td></tr>
+<tr><td align=right><&|/l&>Subject</&>:</td><td> <input name="UpdateSubject" size=60 value="<% ($ARGS{UpdateSubject}) ? $ARGS{UpdateSubject} : $Ticket->Subject()%>"></td></tr>
+<tr><td align=right><&|/l&>Cc</&>:</td><td> <input name="UpdateCc" size=60
+value=<% $ARGS{UpdateCc} %>><BR>
+<i><font size=-2>
+<&|/l&>(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)</&></font></i>
+</td></tr>
+<tr><td align=right><&|/l&>Bcc</&>:</td><td> <input name="UpdateBcc" size=60 VALUE="<%$ARGS{UpdateBcc}%>"><BR>
+<i><font size=-2>
+<&|/l&>(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)</&></font></i>
+</td></tr>
+% if (exists $session{'Attachments'}) {
+<TD>
+<&|/l&>Attached file</&>:
+</TD>
+<TD COLSPAN=5>
+<&|/l&>Check box to delete</&><BR>
+% foreach my $attach_name (keys %{$session{'Attachments'}}) {
+<input type="checkbox" name="DeleteAttach-<%$attach_name%>"><%$attach_name%><BR>
+% } # end of foreach
+</TD>
+</TR>
+<TR>
+% } # end of if
+<tr><td align=right><&|/l&>Attach</&>:</td><td><input name="Attach" type="file"><INPUT TYPE=SUBMIT NAME="AddMoreAttach" VALUE="<&|/l&>Add More Files</&>"><input type="hidden" name="UpdateAttach" value="1">
+</td></tr>
+<tr><td align="right" valign="top"><&|/l&>Message</&>:</td><td>
+<& /Elements/Callback, _CallbackName => 'BeforeMessageBox', %ARGS &>
+% if (exists $ARGS{UpdateContent}) {
+% delete $ARGS{'QuoteTransaction'};
+<& /Elements/MessageBox, Name=>"UpdateContent", Default=>$ARGS{UpdateContent}, %ARGS&>
+% } else {
+<& /Elements/MessageBox, Name=>"UpdateContent", %ARGS &>
+% }
+</td></tr>
+		<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>"><br>
+</table>
+
+
+
+
+<& /Elements/Submit, Name => 'SubmitTicket' &>
+  </FORM>
+
+
+
+<%INIT>
+
+my $CanRespond = 0;
+my $CanComment = 0;
+my $title;
+
+my $Ticket = LoadTicket($id);
+
+unless($DefaultStatus){
+    $DefaultStatus=($ARGS{'Status'} ||$Ticket->Status());
+}
+
+if ($DefaultStatus =~ '^new$'){
+        $DefaultStatus='open';
+}
+
+if ($DefaultStatus eq 'resolved') {
+    $title = loc("Resolve ticket #[_1] ([_2])", $Ticket->id, $Ticket->Subject);
+} else {
+    $title = loc("Update ticket #[_1] ([_2])", $Ticket->id, $Ticket->Subject);
+}
+
+# Things needed in the template - we'll do the processing here, just
+# for the convenience:
+
+my ($CommentDefault, $ResponseDefault);
+if (($Action eq 'Comment') or ($ARGS{'UpdateType'} eq 'private')) {
+   $CommentDefault = "SELECTED"; 
+} else {
+    $ResponseDefault = "SELECTED";
+}
+
+
+$CanRespond = 1 if ( $Ticket->CurrentUserHasRight('ReplyToTicket') or
+                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
+
+$CanComment = 1 if ( $Ticket->CurrentUserHasRight('CommentOnTicket') or
+                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
+
+
+# {{{ deal with deleting uploaded attachments
+foreach my $key (keys %ARGS) {
+    if ($key =~ m/^DeleteAttach-(.+)$/) {
+	delete $session{'Attachments'}{$1};
+    }
+    $session{'Attachments'} = { %{$session{'Attachments'} || {}} };
+}
+
+# {{{ store the uploaded attachment in session
+if ($ARGS{'Attach'}) {			# attachment?
+    $session{'Attachments'} = {} unless defined $session{'Attachments'};
+
+    my $subject = "$ARGS{'Attach'}";
+    # since CGI.pm deutf8izes the magic field, we need to add it back.
+    Encode::_utf8_on($subject);
+    # strip leading directories
+    $subject =~ s#^.*[\\/]##;
+
+    my $attachment = MakeMIMEEntity(
+        Subject             => $subject,
+        Body                => "",
+        AttachmentFieldName => 'Attach'
+    );
+
+    $session{'Attachments'} = { %{$session{'Attachments'} || {}},
+				$ARGS{'Attach'} => $attachment };
+}
+# }}}
+
+# delete temporary storage entry to make WebUI clean
+unless (keys %{$session{'Attachments'}} and $ARGS{'UpdateAttach'}) {
+    delete $session{'Attachments'};
+}
+# }}}
+
+if ( exists $ARGS{SubmitTicket} ) {
+    $m->comp('Display.html', %ARGS);
+    return;
+}
+</%INIT>
+
+<%ARGS>
+$id => undef
+$Action => undef
+$DefaultStatus => undef
+</%ARGS>
diff --git a/rt/html/User/Delegation.html b/rt/html/User/Delegation.html
new file mode 100644
index 000000000..c036f78ec
--- /dev/null
+++ b/rt/html/User/Delegation.html
@@ -0,0 +1,83 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => loc("Delegate rights") &>
+<& /User/Elements/Tabs, 
+    current_tab => 'User/Delegation.html', 
+    Title => loc("Delegate rights") &>
+
+<& /Elements/ListActions, actions => \@results &>
+
+<form method="post">
+<& Elements/DelegateRights, personalgroups => $personalgroups, objects => $objects, ObjectType => 'RT::System' &>
+<& Elements/DelegateRights, personalgroups => $personalgroups, objects => $objects, ObjectType => 'RT::Queue' &>
+<& Elements/DelegateRights, personalgroups => $personalgroups, objects => $objects, ObjectType => 'RT::Group' &>
+
+<& /Elements/Submit &>
+</form>
+<%INIT>
+
+my (@results, $arg);
+foreach $arg (keys %ARGS) {
+    next unless ($arg =~ /^Delegate-Existing-ACE-(\d+)-to-(\d+)-as-(\d+)$/);
+       my $parent = $1;
+       my $principal = $2;
+       my $delegation = $3;
+       unless ($ARGS{"Delegate-ACE-$1-to-$2"}) {
+            my $ace_to_del = RT::ACE->new($session{'CurrentUser'});
+            $ace_to_del->Load($delegation);
+            my ($delval, $delmsg) = $ace_to_del->Delete();
+            push (@results, $delmsg);
+       }
+}
+
+foreach $arg (keys %ARGS) { 
+    next unless ($arg =~ /^Delegate-ACE-(\d+)-to-(\d+)$/);
+    my $parent = $1;
+    my $principal = $2;
+    # if we already delegate it, we just don't care
+    next if (grep /^Delegate-Existing-ACE-$parent-to-$principal-/, keys %ARGS);
+    my $ace = RT::ACE->new($session{'CurrentUser'});
+    $ace->Load($1);
+    unless ($ace->Id) {
+        push (@results, loc('Right not found'));
+        next;
+    }
+    my ($delid, $delmsg) = $ace->Delegate(PrincipalId => $principal);
+    push (@results, $delmsg);
+}
+
+my $personalgroups = RT::Groups->new($session{'CurrentUser'});
+$personalgroups->LimitToPersonalGroupsFor($session{'CurrentUser'}->PrincipalId);
+
+my $objects;
+my $acl = RT::ACL->new ($session{'CurrentUser'});
+$acl->ExcludeDelegatedRights();
+$acl->LimitToPrincipal(Id => $session{'CurrentUser'}->PrincipalId, 
+                       IncludeGroupMembership => 1
+                       );
+
+while(my $right = $acl->Next) {
+       push @{$objects->{$right->ObjectType}{$right->ObjectId}},$right;
+}
+</%INIT>
diff --git a/rt/html/User/Elements/DelegateRights b/rt/html/User/Elements/DelegateRights
new file mode 100644
index 000000000..7ff83280f
--- /dev/null
+++ b/rt/html/User/Elements/DelegateRights
@@ -0,0 +1,85 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<h2><%$sectionheading%></h2>
+<%perl>
+
+foreach my $object (keys %{$objects->{$ObjectType}}) {
+unless ($ObjectType eq 'RT::System') {
+my $object_obj = @{$objects->{$ObjectType}{$object}}[0]->Object;
+
+</%perl>
+<h3><% $object_obj->Name %></h3>
+% }
+<table width="100%" border="0" cellspacing="0" cellpadding="3">
+<tr>
+        <th width=15%><&|/l&>Personal groups:</&></th>
+% while (my $pg = $personalgroups->Next) {
+<th><%$pg->Name%></th>
+% }
+</tr>
+<%perl>
+my $i;
+foreach my $right (@{$objects->{$ObjectType}{$object}}) {
+my $delegations = RT::ACL->new($session{'CurrentUser'});
+$delegations->DelegatedBy( Id => $session{'CurrentUser'}->PrincipalId);
+$delegations->DelegatedFrom ( Id => $right->Id);
+
+my $del_hash = {};
+while ( my $delegation = $delegations->Next) {
+        $del_hash->{$delegation->PrincipalId} = $delegation;
+}
+</%perl>
+% $i++;
+%
+<tr class="<%($i%2) && 'oddline'%>">
+<td>
+<% loc($right->RightName) %><br>
+<div align=right><font size="-2" color="#999999"><&|/l, $right->PrincipalObj->Object->SelfDescription &>as granted to [_1]</&></font></div>
+       </td>
+% while (my $pg = $personalgroups->Next) {
+<td align=center>
+        <input name="Delegate-ACE-<% $right->Id %>-to-<% $pg->PrincipalId%>" type=checkbox <%$ del_hash->{$pg->PrincipalId} && 'CHECKED' %>>
+% if ( $del_hash->{$pg->PrincipalId}) {
+<input type=hidden name="Delegate-Existing-ACE-<% $right->Id %>-to-<% $pg->PrincipalId%>-as-<%$del_hash->{$pg->PrincipalId}->Id%>">
+% }
+</td>
+% }
+<td>&nbsp;</td>
+</tr>
+%}
+</table> 
+% }
+<%init>
+
+my $sectionheading = loc("[_1] rights", loc($ObjectType =~ /^RT::(.*)$/));
+# 'System' # loc
+# 'Group'  # loc
+# 'Queue'  # loc
+
+</%init>
+<%args>
+$ObjectType => undef
+$objects => undef
+$personalgroups => undef
+</%args>
diff --git a/rt/html/User/Elements/GroupTabs b/rt/html/User/Elements/GroupTabs
new file mode 100644
index 000000000..89d7125b9
--- /dev/null
+++ b/rt/html/User/Elements/GroupTabs
@@ -0,0 +1,60 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /User/Elements/Tabs, 
+    subtabs => $tabs, 
+    current_tab => 'User/Groups/', 
+    current_subtab => $current_subtab, 
+    Title => $Title &>
+
+<%INIT>
+my $tabs;
+if ( $GroupObj and $GroupObj->id ) {
+    $tabs->{"this"} = {
+        title   => $GroupObj->Name,
+        path    => "User/Groups/Modify.html?id=" . $GroupObj->id,
+        subtabs => {
+            Basics => { title => loc('Basics'),
+                        path  => "User/Groups/Modify.html?id=" . $GroupObj->id
+            },
+
+            Members => { title => loc('Members'),
+                         path  => "User/Groups/Members.html?id=" . $GroupObj->id
+            },
+
+        } };
+        $tabs->{'this'}->{'current_subtab'} = $current_subtab;
+         $current_subtab = "User/Groups/Modify.html?id=" . $GroupObj->id,
+}
+$tabs->{"A"} = { title => loc('Select group'),
+                 path  => "User/Groups/index.html" };
+$tabs->{"B"} = { title     => loc('New group'),
+                 path      => "User/Groups/Modify.html?Create=1",
+                 separator => 1 };
+
+</%INIT>
+<%ARGS>
+$GroupObj => undef
+$current_subtab => undef
+$Title => undef
+</%ARGS>
diff --git a/rt/html/User/Elements/Tabs b/rt/html/User/Elements/Tabs
new file mode 100644
index 000000000..195cf1c60
--- /dev/null
+++ b/rt/html/User/Elements/Tabs
@@ -0,0 +1,56 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Tabs, 
+    tabs => $tabs, 
+    current_toptab => 'User/Prefs.html', 
+    current_tab => $current_tab, 
+    Title => $Title &>
+
+<%INIT>
+  my $tabs = { a => { title => loc('About me'),
+			  path => 'User/Prefs.html',
+			},
+	       g => { title => loc('Personal Groups'),
+			   path => 'User/Groups/',
+			 },
+	       h => { title => loc('Delegation'),
+			   path => 'User/Delegation.html',
+			 },
+	     };
+
+  foreach my $tab (sort keys %{$tabs}) {
+    if ($tabs->{$tab}->{'path'} eq $current_tab) {
+      $tabs->{$tab}->{"subtabs"} = $subtabs;
+      $tabs->{$tab}->{"current_subtab"} = $current_subtab;
+    }
+  }
+</%INIT>
+
+
+<%ARGS>
+$subtabs => undef
+$current_tab => undef
+$current_subtab => undef
+$Title => undef
+</%ARGS>
diff --git a/rt/html/User/Groups/Members.html b/rt/html/User/Groups/Members.html
new file mode 100644
index 000000000..db83b8c0f
--- /dev/null
+++ b/rt/html/User/Groups/Members.html
@@ -0,0 +1,136 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => $title &>
+<& /User/Elements/GroupTabs, 
+    GroupObj => $Group, 
+    current_subtab => "User/Groups/Members.html?id=".$Group->id, 
+    Title => $title &>
+<& /Elements/ListActions, actions => \@results &>
+
+
+
+<FORM ACTION="<%$RT::WebPath%>/User/Groups/Members.html" METHOD="POST">
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Group->Id%>">
+<TABLE WIDTH="100%">
+<TR>
+<TD>
+<&|/l&>Add members</&>
+</TD>
+<TD>
+<&|/l&>Current members</&>
+</TD>
+</TR>
+
+<TR>
+<TD VALIGN=TOP>
+<& /Admin/Elements/SelectNewGroupMembers, Name => "AddMembers", Group => $Group &>
+</TD>
+<TD VALIGN=TOP>
+
+% if ($Group->MembersObj->Count == 0 ) {
+<i><&|/l&>(No members)</&></i>
+% } else {
+<i><&|/l&>(Check box to delete)</&></i>
+<br>
+<br>
+<&|/l&>Users</&>
+% my $UserMembers = $Group->MembersObj;
+% $UserMembers->LimitToUsers();
+<UL>
+% while (my $member = $UserMembers->Next()) {
+<LI><INPUT TYPE=CHECKBOX Name="DeleteMember-<%$member->MemberId%>">
+<%$member->MemberObj->Object->Name%> (<%$member->MemberObj->Object->RealName%>)
+% }
+</ul>
+<&|/l&>Groups</&>
+<ul>
+% my $GroupMembers = $Group->MembersObj;
+% $GroupMembers->LimitToGroups();
+% while (my $member = $GroupMembers->Next()) {
+<LI><INPUT TYPE=CHECKBOX Name="DeleteMember-<%$member->MemberId%>">
+<%$member->MemberObj->Object->Name%>
+% }
+% }
+</UL>
+</TD>
+</TR>
+</TABLE>
+<& /Elements/Submit &>
+</form>
+
+
+<%INIT>
+
+my $Group = new RT::Group($session{'CurrentUser'});
+$Group->Load($id) ;
+
+unless ($Group->id) {
+    Abort(loc('Could not load group'));
+}
+
+my (@results);
+
+foreach my $key (keys %ARGS) {
+
+if ($key =~ /^DeleteMember-(\d+)$/) {
+    my $mem_id = $1; 
+    my ($val,$msg) = $Group->DeleteMember($mem_id);
+    push (@results, $msg);
+}
+}
+
+# Make sure AddMembers is always an array
+my @AddMembersUsers = (ref $AddMembersUsers eq 'ARRAY') ? @{$AddMembersUsers} : ($AddMembersUsers);
+my @AddMembersGroups = (ref $AddMembersGroups eq 'ARRAY') ? @{$AddMembersGroups} : ($AddMembersGroups);
+
+foreach my $member (@AddMembersUsers, @AddMembersGroups) {
+    next unless ($member);
+
+    my $principal;
+
+    if ($member =~ /^Group-(\d+)$/) {
+        $principal = RT::Group->new($session{'CurrentUser'});
+        $principal->Load($1);
+    } elsif ($member =~ /^User-(\d+)$/) {
+        $principal = RT::User->new($session{'CurrentUser'});
+        $principal->Load($1);
+    } else {
+        next;
+    }
+
+
+    my ($val, $msg) = $Group->AddMember($principal->PrincipalId);
+    push (@results, $msg);
+}
+
+
+my $title = loc('Editing membership for personal group [_1]', $Group->Name);
+
+</%INIT>
+
+<%ARGS>
+$AddMembersUsers => undef
+$AddMembersGroups => undef
+$id => undef
+</%ARGS>
diff --git a/rt/html/User/Groups/Modify.html b/rt/html/User/Groups/Modify.html
new file mode 100644
index 000000000..f731e1a82
--- /dev/null
+++ b/rt/html/User/Groups/Modify.html
@@ -0,0 +1,133 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => $title &>
+
+<& /User/Elements/GroupTabs, 
+    GroupObj => $Group, 
+    current_subtab => $current_tab, 
+    Title => $title &>
+
+<& /Elements/ListActions, actions => \@results &>
+
+
+<FORM ACTION="<%$RT::WebPath%>/User/Groups/Modify.html" METHOD=POST>
+
+%unless ($Group->Id) {
+<INPUT TYPE=HIDDEN NAME=id VALUE="new">
+% } else {
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Group->Id%>">
+% }
+<TABLE>
+<TR><TD ALIGN=RIGHT>
+<&|/l&>Name</&>:
+</TD>
+<TD><INPUT name="Name" value="<%$Group->Name%>"></TD>
+</TR><TR>
+<TD ALIGN=RIGHT>
+<&|/l&>Description</&>:</TD><TD COLSPAN=3><INPUT name="Description" value="<%$Group->Description%>" size=60></TD>
+</TR><TR>
+<TD COLSPAN=2>
+<INPUT TYPE=HIDDEN NAME="SetEnabled" VALUE="1">
+<INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>> <&|/l&>Enabled (Unchecking this box disables this group)</&><BR>
+</TR>
+</TABLE>
+<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+</form>
+<%INIT>
+
+my $current_tab;
+my  ($title, @results, $Disabled, $EnabledChecked);
+
+my $Group = RT::Group->new($session{'CurrentUser'});
+
+if ($Create) {
+    $current_tab = 'User/Groups/Modify.html?Create=1';
+    $title = loc("Create a new personal group");
+} 
+else {
+    if ( $id eq 'new' ) {
+
+        my ( $id, $msg ) = $Group->CreatePersonalGroup(
+                             Name        => "$Name",
+                             PrincipalId => $session{'CurrentUser'}->PrincipalId
+        );
+        unless ($id) {
+            Abort( loc("Could not create group") );
+        }
+        $id = $Group->Id;
+    }
+    else {
+        $Group->Load($id) || Abort( loc('Could not load group') );
+    }
+
+    if ($id) {
+        $title = loc( "Modify the group [_1]", $Group->Name );
+
+    }
+
+    # If the create failed
+    else {
+        $title  = loc("Create a new personal group");
+        $Create = 1;
+    }
+
+    $current_tab = 'User/Groups/Modify.html?id=' . $Group->Id;
+}
+
+if ($id) {
+    
+    my @fields = qw(Description Name );
+    my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
+					    Object => $Group,
+					    ARGSRef => \%ARGS );
+    push (@results,@fieldresults);
+}
+
+#we're asking about enabled on the web page but really care about disabled.
+if ($Enabled == 1) {
+    $Disabled = 0;
+}	
+else {
+    $Disabled = 1;
+}
+if  ( ($SetEnabled) and ( $Disabled != $Group->Disabled) ) { 
+    my  ($code, $msg) = $Group->SetDisabled($Disabled);
+    push @results, loc('Enabled status [_1]', loc_fuzzy($msg));
+}
+
+unless ($Group->Disabled()) {
+    $EnabledChecked ="CHECKED";
+}
+
+</%INIT>
+
+
+<%ARGS>
+$Create => undef
+$Name => undef
+$Description => undef
+$SetEnabled => undef
+$Enabled => undef
+$id => undef
+</%ARGS>
diff --git a/rt/html/User/Groups/index.html b/rt/html/User/Groups/index.html
new file mode 100644
index 000000000..12b43b409
--- /dev/null
+++ b/rt/html/User/Groups/index.html
@@ -0,0 +1,43 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title => $title &>
+<& /User/Elements/GroupTabs, 
+    current_subtab => 'User/Groups/index.html', 
+    Title => $title &>
+
+<&|/l&>Personal groups</&>:<BR>
+<UL>
+%while ( my $Group = $Groups->Next) {
+<LI><A HREF="Modify.html?id=<%$Group->id%>"><%$Group->Name || loc('(empty)')%></a><BR>
+%}
+</UL>
+
+<%INIT>
+my $Groups = RT::Groups->new($session{'CurrentUser'});
+$Groups->LimitToPersonalGroupsFor($session{'CurrentUser'}->PrincipalId());
+my $title = loc('Personal groups');
+
+</%INIT>
+<%ARGS>
+</%ARGS>
diff --git a/rt/html/User/Prefs.html b/rt/html/User/Prefs.html
new file mode 100644
index 000000000..b89fc40ae
--- /dev/null
+++ b/rt/html/User/Prefs.html
@@ -0,0 +1,218 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title=>loc("Preferences") &>
+<& /User/Elements/Tabs, 
+    current_tab => 'User/Prefs.html', 
+    Title=>loc("Preferences") &>
+
+<& /Elements/ListActions, actions => \@results &>
+
+<FORM ACTION="<%$RT::WebPath%>/User/Prefs.html" METHOD=POST>
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$UserObj->Id%>">
+
+<TABLE WIDTH=100% BORDER=0>
+<TR>
+
+<TD VALIGN=TOP ROWSPAN=2>
+<& /Elements/TitleBoxStart, title => loc('Identity') &>
+
+<input type=hidden name="Name" value="<%$UserObj->Name%>">
+<&|/l&>Email</&>: <input name="EmailAddress" value="<%$UserObj->EmailAddress%>">
+<BR>
+<&|/l&>Real Name</&>: <input name="RealName" value="<%$UserObj->RealName%>"> 
+<BR>
+<&|/l&>Nickname</&>: <input name="NickName" value="<%$UserObj->NickName%>">
+<& /Elements/TitleBoxEnd &>
+<br>
+<& /Elements/TitleBoxStart, title => loc('Phone numbers') &>
+<&|/l&>Residence</&>: <input name="HomePhone" value="<%$UserObj->HomePhone%>" size=13>
+<BR>
+<&|/l&>Work</&>: <input name="WorkPhone" value="<%$UserObj->WorkPhone%>" size=13>
+<BR>
+<&|/l&>Mobile</&>: <input name="MobilePhone" value="<%$UserObj->MobilePhone%>" size=13>
+<BR>
+<&|/l&>Pager</&>: <input name="PagerPhone" value="<%$UserObj->PagerPhone%>" size=13>
+<& /Elements/TitleBoxEnd &>
+</TD>
+<TD VALIGN=TOP>
+% unless ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth) {
+<& /Elements/TitleBoxStart, title => loc('Password') &>
+<TABLE>
+<TR>
+<TD ALIGN=RIGHT>
+<&|/l&>New Password</&>:
+</TD>
+<TD ALIGN=LEFT>
+<input type=password name="Pass1">
+</TD>
+</TR>
+<TR><TD ALIGN=RIGHT>
+<&|/l&>Retype Password</&>:
+</TD>
+<TD>
+<input type=password name="Pass2">
+</TD>
+</TR>
+</TABLE>
+% }
+<& /Elements/TitleBoxEnd &>
+</TD>
+<TR>
+
+<TD VALIGN=TOP>
+<& /Elements/TitleBoxStart, title => loc('Location') &>
+<&|/l&>Organization</&>: <input name="Organization" value="<%$UserObj->Organization%>">
+<BR>
+<&|/l&>Address1</&>: <input name="Address1" value="<%$UserObj->Address1%>">
+<BR>
+<&|/l&>Address2</&>: <input name="Address2" value="<%$UserObj->Address2%>">
+<BR>
+<&|/l&>City</&>: <input name="City" value="<%$UserObj->City%>" size=14>
+
+<&|/l&>State</&>: <input name="State" value="<%$UserObj->State%>" size=3>
+
+<&|/l&>Zip</&>: <input name="Zip" value="<%$UserObj->Zip%>" size=9>
+<BR>
+<&|/l&>Country</&>: <input name="Country" value="<%$UserObj->Country%>">
+<BR>
+
+
+<& /Elements/TitleBoxEnd &>
+</TD>
+</TR>
+<TR>
+
+
+
+<TD COLSPAN=2 VALIGN=TOP>
+%if ($UserObj->Privileged) {
+<BR>
+<& /Elements/TitleBoxStart, title => loc('Signature') &>
+<TEXTAREA COLS=80 ROWS=5 name="Signature" WRAP=HARD>
+<%$UserObj->Signature%></TEXTAREA>
+<& /Elements/TitleBoxEnd &>
+% }
+
+</TD>
+
+</TR>
+</TABLE>
+
+
+<& /Elements/Submit &>
+</form>
+
+
+<%INIT>
+
+my $UserObj = new RT::User($session{'CurrentUser'});
+my ($title, $PrivilegedChecked, $EnabledChecked, $Disabled, $result, @results);
+
+my ($val, $msg);
+
+
+	$UserObj->Load($id) || $UserObj->Load($Name) || Abort("Couldn't load user '$Name'");
+	$val = $UserObj->Id();
+    
+
+
+
+
+
+# If we have a user to modify, lets try. 
+if ($UserObj->Id) {
+    
+    my @fields = qw(Name Comments Signature EmailAddress FreeformContactInfo 
+		    Organization RealName NickName Lang EmailEncoding WebEncoding 
+		    ExternalContactInfoId ContactInfoSystem Gecos ExternalAuthId 
+		    AuthSystem HomePhone WorkPhone MobilePhone PagerPhone Address1
+		Address2 City State Zip Country 
+		   );
+    
+    my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
+					    Object => $UserObj,
+					    ARGSRef => \%ARGS );
+    push (@results,@fieldresults);
+
+
+# {{{ Deal with special fields: Privileged, Enabled and Password
+if  ( ($SetPrivileged) and ( $Privileged != $UserObj->Privileged) ) {
+my  ($code, $msg) = $UserObj->SetPrivileged($Privileged);
+     push @results, loc('Privileged status: [_1]', loc_fuzzy($msg));
+}
+
+
+
+#TODO: make this report errors properly
+if ((defined $Pass1) and ($Pass1 ne '') and ($Pass1 eq $Pass2) and (!$UserObj->IsPassword($Pass1))) {
+    my ($code, $msg);
+    ($code, $msg) = $UserObj->SetPassword($Pass1);
+    push @results, loc('Password: [_1]', loc_fuzzy($msg));
+} elsif ( $Pass1 && ($Pass1 ne $Pass2)) {
+    push @results, loc("Passwords do not match. Your password has not been changed");
+}
+
+# }}}
+}
+
+
+</%INIT>
+
+
+<%ARGS>
+$id => $session{'CurrentUser'}->Id
+$Name  => undef
+$Comments  => undef
+$Signature  => undef
+$EmailAddress  => undef
+$FreeformContactInfo => undef
+$Organization  => undef
+$RealName  => undef
+$NickName  => undef
+$Privileged => undef
+$SetPrivileged => undef
+$Enabled => undef
+$SetEnabled => undef
+$Lang  => undef
+$EmailEncoding  => undef
+$WebEncoding => undef
+$ExternalContactInfoId  => undef
+$ContactInfoSystem  => undef
+$Gecos => undef
+$ExternalAuthId  => undef
+$AuthSystem  => undef
+$HomePhone => undef
+$WorkPhone  => undef
+$MobilePhone  => undef
+$PagerPhone  => undef
+$Address1 => undef
+$Address2  => undef
+$City  => undef
+$State  => undef
+$Zip  => undef
+$Country => undef
+$Pass1 => undef
+$Pass2=> undef
+$Create=> undef
+</%ARGS>
diff --git a/rt/html/autohandler b/rt/html/autohandler
new file mode 100644
index 000000000..ce8b7569e
--- /dev/null
+++ b/rt/html/autohandler
@@ -0,0 +1,178 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<%INIT>
+
+# Roll back any dangling transactions from a previous failed connection
+$RT::Handle->ForceRollback() if $RT::Handle->TransactionDepth;
+
+
+local *session;
+%ARGS = map {
+    # if they've passed multiple values, they'll be an array. if they've passed just one, a scalar
+    # whatever they are, mark them as utf8
+    my $type = ref($_);
+    (!$type)
+	? Encode::decode(utf8 => $_, Encode::FB_PERLQQ) :
+    ($type eq 'ARRAY')
+	? [ map { ref($_) ? $_ : Encode::decode(utf8 => $_, Encode::FB_PERLQQ) } @$_ ] :
+    ($type eq 'HASH')
+	? { map { ref($_) ? $_ : Encode::decode(utf8 => $_, Encode::FB_PERLQQ) } %$_ } : $_
+} %ARGS;
+
+if ($ARGS{'Debug'}) {
+        require Time::HiRes;
+        $m->{'rt_base_time'} = [Time::HiRes::gettimeofday()];
+        
+}
+else {
+        $m->{'rt_base_time'} = time;
+}
+$m->comp('/Elements/SetupSessionCookie', %ARGS);
+
+unless ($session{'CurrentUser'} && $session{'CurrentUser'}->Id) {
+    $session{'CurrentUser'} = RT::CurrentUser->new();
+}
+
+# Set the proper encoding for the current language handle
+$r->content_type("text/html; charset=utf-8");
+
+# If it's a noauth file, don't ask for auth.
+if ($m->base_comp->path =~ '^/+NoAuth/' ||
+    $m->base_comp->path =~ '^/+REST/\d+\.\d+/NoAuth/')
+{
+    $m->call_next(%ARGS);
+    $m->abort();
+}
+
+# If RT is configured for external auth, let's get REMOTE_USER
+elsif ($RT::WebExternalAuth and length($ENV{'REMOTE_USER'})) {
+    my $orig_user = $user;
+
+    $user = $ENV{'REMOTE_USER'};
+    $session{'CurrentUser'} = RT::CurrentUser->new();
+    my $load_method = $RT::WebExternalGecos ? 'LoadByGecos' : 'Load';
+    
+    if ($^O eq 'MSWin32' and $RT::WebExternalGecos) {
+    	my $NodeName = Win32::NodeName();
+    	$user =~ s/^\Q$NodeName\E\\//i;
+    }
+
+    $session{'CurrentUser'}->$load_method($user);
+
+    if ($RT::WebExternalAuto and !$session{'CurrentUser'}->Id() ) {
+	# Create users on-the-fly with default attributes
+
+	my $UserObj = RT::User->new(RT::CurrentUser->new('root'));
+
+	my ($val, $msg) = $UserObj->Create(
+	    %{ref($RT::AutoCreate) ? $RT::AutoCreate : {}},
+	    Name	 => $user,
+	    Gecos	 => $user,
+	);
+
+	if ($val) {
+	    $UserObj->SetPrivileged(1);
+
+	    if ($^O !~ /^(?:riscos|MacOS|MSWin32|dos|os2)$/) {
+		# Populate fields with information from Unix /etc/passwd
+
+		my ($comments, $realname) = (getpwnam($user))[5, 6];
+		$UserObj->SetComments($comments) if defined $comments;
+		$UserObj->SetRealName($realname) if defined $realname;
+	    }
+	    elsif ($^O eq 'MSWin32' and eval 'use Net::AdminMisc; 1') {
+		# Populate fields with information from NT domain controller
+	    }
+
+	    $session{'CurrentUser'}->Load($user);
+	}
+	else {
+	    delete $session{'CurrentUser'};
+	    $m->abort() unless $RT::WebFallbackToInternalAuth;
+	    $m->comp('/Elements/Login', %ARGS, Error=> loc('Cannot create user: [_1]', $msg));
+	}
+    }
+
+    unless ( $session{'CurrentUser'}->Id() ) {
+        delete $session{'CurrentUser'};
+        $user = $orig_user;
+
+	if ( $RT::WebExternalOnly ) {	        
+	    $m->comp('/Elements/Login', %ARGS, Error=> loc('You are not an authorized user'));
+	    $m->abort();
+	}
+    }
+}
+
+delete $session{'CurrentUser'}
+    unless $session{'CurrentUser'} and defined $session{'CurrentUser'}->Id;
+
+# Process per-page authentication callbacks
+$m->comp('/Elements/Callback', %ARGS, _CallbackName => 'Auth');
+
+# If the user is logging in, let's authenticate
+if (!$session{'CurrentUser'} && defined ($user) && defined ($pass) ){
+    $session{'CurrentUser'} = RT::CurrentUser->new();
+    $session{'CurrentUser'}->Load($user);
+
+    if (!$session{'CurrentUser'}->id() ||
+        !$session{'CurrentUser'}->IsPassword($pass))
+    {
+        delete $session{'CurrentUser'};
+        $m->comp('/Elements/Login', %ARGS,
+                 Error => loc('Your username or password is incorrect'));
+        $m->abort();
+    }
+}
+  
+# If we've got credentials, let's serve the file up.
+if ( (defined $session{'CurrentUser'}) and 
+     ( $session{'CurrentUser'}->Id) ) {
+    
+    # Process per-page global callbacks
+    $m->comp('/Elements/Callback', %ARGS);
+
+    # If the user isn't privileged, they can only see SelfService
+    if ((! $session{'CurrentUser'}->Privileged) and
+	($m->base_comp->path !~ '^(/+)SelfService/') ) {
+	$m->comp('/SelfService/index.html');
+	$m->abort();
+    }
+    else {
+	$m->call_next(%ARGS);
+    }
+}
+
+# If we have no credentials
+else {
+    $m->comp('/Elements/Login', %ARGS);
+    $m->abort();
+}
+</%INIT>
+<& /Elements/Footer, %ARGS &>
+<%ARGS>
+$user => undef
+$pass => undef
+$menu => undef
+</%ARGS>
diff --git a/rt/html/index.html b/rt/html/index.html
new file mode 100644
index 000000000..39eac8d61
--- /dev/null
+++ b/rt/html/index.html
@@ -0,0 +1,84 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /Elements/Header, Title=>loc("RT at a glance"), Refresh => $session{'home_refresh_interval'} &>
+<& /Elements/Tabs, 
+    current_toptab => '', 
+    Title=>loc("RT at a glance") &>
+<TABLE BORDER=0 WIDTH=100%>
+<TR VALIGN=TOP>
+<TD WIDTH=70%>
+<& /Elements/MyTickets &>
+<BR>
+<& /Elements/MyRequests &>
+</TD>
+<TD>
+<& /Elements/Quicksearch &>
+<BR>
+<form method=get action="index.html">
+<& /Elements/Refresh, Name => 'HomeRefreshInterval', Default => $session {'home_refresh_interval'} &>
+<div align=right><input type=submit value="<&|/l&>Go!</&>"></div>
+</form>
+</TD>
+</TR>
+</TABLE>
+<%init>
+if ( $ARGS{'q'} ) {
+    my $query = $ARGS{'q'};
+
+    if ( $query =~ m/^\s*(\d+)\s*$/ ) {
+        $m->redirect("$RT::WebPath/Ticket/Display.html?id=$1");
+    }
+
+    $session{'tickets'} = RT::Tickets->new( $session{'CurrentUser'} );
+
+    if ( $query =~ m/\@/ ) {
+        $session{'tickets'}->LimitRequestor( VALUE    => $query,
+                                             OPERATOR => '=', );
+        $m->redirect("$RT::WebPath/Search/Listing.html");
+    }
+
+    #
+    # Any search on queue name or subject will be for new/open tickets
+    # only.
+    #
+    $session{'tickets'}->LimitStatus( VALUE    => $_,
+                                      OPERATOR => '=', ) for qw(open new);
+
+    my $queue = RT::Queue->new( $session{'CurrentUser'} );
+    if ( $queue->Load($query) && $queue->Id ) {
+        $session{'tickets'}->LimitQueue( VALUE    => $queue->Id,
+                                         OPERATOR => '=', );
+        $m->redirect("$RT::WebPath/Search/Listing.html");
+    }
+    $session{'tickets'}->LimitSubject( VALUE    =>  $query,
+                                       OPERATOR => 'LIKE' );
+
+    $m->redirect("$RT::WebPath/Search/Listing.html");
+}
+
+if ($ARGS{'HomeRefreshInterval'}) {
+	$session{'home_refresh_interval'} = $ARGS{'HomeRefreshInterval'};
+}
+
+</%init>
diff --git a/rt/html/l b/rt/html/l
new file mode 100644
index 000000000..712e38d71
--- /dev/null
+++ b/rt/html/l
@@ -0,0 +1,26 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+% my $hand = ($session{'CurrentUser'} ||= RT::CurrentUser->new)->LanguageHandle;
+% $m->print($hand->maketext($m->content,@_));
+% return(1);
diff --git a/rt/install-sh b/rt/install-sh
new file mode 100644
index 000000000..11870f1b0
--- /dev/null
+++ b/rt/install-sh
@@ -0,0 +1,251 @@
+#!/bin/sh
+#
+# install - install a program, script, or datafile
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+transformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd="$cpprog"
+	    shift
+	    continue;;
+
+	-d) dir_arg=true
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd="$stripprog"
+	    shift
+	    continue;;
+
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	    shift
+	    continue;;
+
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
+done
+
+if [ x"$src" = x ]
+then
+	echo "install:	no input file specified"
+	exit 1
+else
+	:
+fi
+
+if [ x"$dir_arg" != x ]; then
+	dst=$src
+	src=""
+	
+	if [ -d $dst ]; then
+		instcmd=:
+		chmodcmd=""
+	else
+		instcmd=$mkdirprog
+	fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad 
+# if $src (and thus $dsttmp) contains '*'.
+
+	if [ -f "$src" ] || [ -d "$src" ]
+	then
+		:
+	else
+		echo "install:  $src does not exist"
+		exit 1
+	fi
+	
+	if [ x"$dst" = x ]
+	then
+		echo "install:	no destination specified"
+		exit 1
+	else
+		:
+	fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+	if [ -d $dst ]
+	then
+		dst="$dst"/`basename $src`
+	else
+		:
+	fi
+fi
+
+## this sed command emulates the dirname command
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+#  this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='
+	'
+IFS="${IFS-${defaultIFS}}"
+
+oIFS="${IFS}"
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS="${oIFS}"
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+	pathcomp="${pathcomp}${1}"
+	shift
+
+	if [ ! -d "${pathcomp}" ] ;
+        then
+		$mkdirprog "${pathcomp}"
+	else
+		:
+	fi
+
+	pathcomp="${pathcomp}/"
+done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+	$doit $instcmd $dst &&
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+	if [ x"$transformarg" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		dstfile=`basename $dst $transformbasename | 
+			sed $transformarg`$transformbasename
+	fi
+
+# don't allow the sed command to completely eliminate the filename
+
+	if [ x"$dstfile" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		:
+	fi
+
+# Make a temp file name in the proper directory.
+
+	dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+	$doit $instcmd $src $dsttmp &&
+
+	trap "rm -f ${dsttmp}" 0 &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
+
+# Now rename the file to the real destination.
+
+	$doit $rmcmd -f $dstdir/$dstfile &&
+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+
+fi &&
+
+
+exit 0
diff --git a/rt/lib/RT.pm b/rt/lib/RT.pm
index 1cfc428ee..90c332bc0 100644
--- a/rt/lib/RT.pm
+++ b/rt/lib/RT.pm
@@ -1,11 +1,82 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2002 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org
+# 
+# This work 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.
+# 
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+
 package RT;
-use RT::Handle;
-use RT::CurrentUser;
 use strict;
+use RT::I18N;
+use RT::CurrentUser;
+use RT::System;
+
+use vars qw($VERSION $System $SystemUser $Nobody $Handle $Logger
+        $CORE_CONFIG_FILE
+        $SITE_CONFIG_FILE
+        $VENDOR_CONFIG_FILE
+        $BasePath
+        $EtcPath
+        $VarPath
+        $LocalPath
+        $LocalEtcPath
+        $LocalLexiconPath
+        $LogDir
+        $MasonComponentRoot
+        $MasonLocalComponentRoot
+        $MasonDataDir
+        $MasonSessionDir
+);
+
+$VERSION = '3.0.4';
+$CORE_CONFIG_FILE = "/opt/rt3/etc/RT_Config.pm";
+$SITE_CONFIG_FILE = "/opt/rt3/etc/RT_SiteConfig.pm";
+
+$BasePath = '/opt/rt3';
+
+$EtcPath = '/opt/rt3/etc';
+$VarPath = '/opt/rt3/var';
+$LocalPath = '/opt/rt3/local';
+$LocalEtcPath = '/opt/rt3/local/etc';
+$LocalLexiconPath = '/opt/rt3/local/po';
+
+# $MasonComponentRoot is where your rt instance keeps its mason html files
+
+$MasonComponentRoot = '/opt/rt3/share/html';
+
+# $MasonLocalComponentRoot is where your rt instance keeps its site-local
+# mason html files.
+
+$MasonLocalComponentRoot = '/opt/rt3/local/html';
+
+# $MasonDataDir Where mason keeps its datafiles
+
+$MasonDataDir = '/opt/rt3/var/mason_data';
+
+# RT needs to put session data (for preserving state between connections
+# via the web interface)
+$MasonSessionDir = '/opt/rt3/var/session_data';
 
-use vars qw($VERSION $SystemUser $Nobody $Handle $Logger);
 
-$VERSION = '!!RT_VERSION!!';
 
 =head1 NAME
 
@@ -14,19 +85,45 @@ $VERSION = '!!RT_VERSION!!';
 =head1 SYNOPSIS
 
 	A fully featured request tracker package
-	
 
 =head1 DESCRIPTION
 
 
+=cut
+
+=item LoadConfig
+
+Load RT's config file. First, go after the core config file. 
+After that, try to load the vendor config.
+After that, go after the site config.
+
+=cut
+
+sub LoadConfig {
+     local *Set = sub { $_[0] = $_[1] unless defined $_[0] }; 
+    if ( -f "$SITE_CONFIG_FILE" ) {
+        require $SITE_CONFIG_FILE
+          || die ("Couldn't load RT config file  '$SITE_CONFIG_FILE'\n$@");
+    }
+    require $CORE_CONFIG_FILE
+      || die ("Couldn't load RT config file '$CORE_CONFIG_FILE'\n$@");
+    RT::I18N->Init;
+}
+
+=item Init
+
+    Conenct to the database, set up logging.
+    
 =cut
 
 sub Init {
+    require RT::Handle;
     #Get a database connection
-    $Handle = new RT::Handle($RT::DatabaseType);
+        unless ($Handle && $Handle->dbh->ping) {
+    $Handle = RT::Handle->new();
+        } 
     $Handle->Connect();
     
-    
     #RT's system user is a genuine database user. its id lives here
     $SystemUser = new RT::CurrentUser();
     $SystemUser->LoadByName('RT_System');
@@ -34,7 +131,9 @@ sub Init {
     #RT's "nobody user" is a genuine database user. its ID lives here.
     $Nobody = new RT::CurrentUser();
     $Nobody->LoadByName('Nobody');
-   
+  
+    $System = RT::System->new();
+
    InitLogging(); 
 }
 
@@ -51,30 +150,81 @@ sub InitLogging {
 
     $, = '';
     use Log::Dispatch 1.6;
-    use Log::Dispatch::File;
-    use Log::Dispatch::Screen;
 
-    $Logger=Log::Dispatch->new();
+    unless ($RT::Logger) {
+
+    $RT::Logger=Log::Dispatch->new();
     
     if ($RT::LogToFile) {
-	my $filename = $RT::LogToFileNamed || "$RT::LogDir/rt.log";
 
-	  $Logger->add(Log::Dispatch::File->new
+    unless (-d $RT::LogDir && -w $RT::LogDir) {
+        # localizing here would be hard when we don't have a current user yet
+        # die $self->loc("Log directory [_1] not found or couldn't be written.\n RT can't run.", $RT::LogDir);
+        die ("Log directory $RT::LogDir not found or couldn't be written.\n RT can't run.");
+    }
+
+	my $filename;
+	if ($RT::LogToFileNamed =~ m![/\\]!) {
+	    # looks like an absolute path.
+	    $filename = $RT::LogToFileNamed;
+	}
+	else {
+	    $filename = "$RT::LogDir/$RT::LogToFileNamed";
+	}
+    require Log::Dispatch::File;
+
+
+	  $RT::Logger->add(Log::Dispatch::File->new
 		       ( name=>'rtlog',
 			 min_level=> $RT::LogToFile,
 			 filename=> $filename,
 			 mode=>'append',
-            callbacks => sub {my %p=@_; return "[".gmtime(time)."] [".$p{level}."]: $p{message}\n"}
-
+			 callbacks => sub { my %p = @_;
+                                my ($package, $filename, $line) = caller(5);
+                                return "[".gmtime(time)."] [".$p{level}."]: $p{message} ($filename:$line)\n"}
+             
+             
+             
 		       ));
     }
     if ($RT::LogToScreen) {
-	$Logger->add(Log::Dispatch::Screen->new
+	require Log::Dispatch::Screen;
+	$RT::Logger->add(Log::Dispatch::Screen->new
 		     ( name => 'screen',
 		       min_level => $RT::LogToScreen,
+			 callbacks => sub { my %p = @_;
+                                my ($package, $filename, $line) = caller(5);
+                                return "[".gmtime(time)."] [".$p{level}."]: $p{message} ($filename:$line)\n"
+				},
+             
+		       stderr => 1
+		     ));
+    }
+    if ($RT::LogToSyslog) {
+	require Log::Dispatch::Syslog;
+	$RT::Logger->add(Log::Dispatch::Syslog->new
+		     ( name => 'syslog',
+                       ident => 'RT',
+		       min_level => $RT::LogToSyslog,
+			 callbacks => sub { my %p = @_;
+                                my ($package, $filename, $line) = caller(5);
+
+				# syswrite() cannot take utf8; turn it off here.
+				Encode::_utf8_off($p{message});
+
+				if ($p{level} eq 'debug') {
+
+                                return "$p{message}\n" }
+				else {
+                                return "$p{message} ($filename:$line)\n"}
+				},
+             
 		       stderr => 1
 		     ));
     }
+
+    }
+
 # {{{ Signal handlers
 
 ## This is the default handling of warnings and die'ings in the code
@@ -88,6 +238,7 @@ $SIG{__WARN__} = sub {$RT::Logger->warning($_[0])};
 
 $SIG{__DIE__}  = sub {
     unless ($^S || !defined $^S ) {
+        $RT::Handle->Rollback();
         $RT::Logger->crit("$_[0]");
         exit(-1);
     }
@@ -127,10 +278,6 @@ sub DropSetGIDPermissions {
 }
 
 
-=head1 NAME
-
-RT - Request Tracker
-
 =head1 SYNOPSIS
 
 =head1 BUGS
@@ -140,7 +287,6 @@ RT - Request Tracker
 
 =begin testing
 
-ok (require RT::TestHarness);
 
 ok ($RT::Nobody->Name() eq 'Nobody', "Nobody is nobody");
 ok ($RT::Nobody->Name() ne 'root', "Nobody isn't named root");
@@ -152,4 +298,7 @@ ok ($RT::SystemUser->Name() ne 'noname', "The system user isn't noname");
 
 =cut
 
+eval "require RT_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT_Local.pm});
+
 1;
diff --git a/rt/lib/RT.pm.in b/rt/lib/RT.pm.in
new file mode 100644
index 000000000..065734e2f
--- /dev/null
+++ b/rt/lib/RT.pm.in
@@ -0,0 +1,304 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2002 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org
+# 
+# This work 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.
+# 
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+
+package RT;
+use strict;
+use RT::I18N;
+use RT::CurrentUser;
+use RT::System;
+
+use vars qw($VERSION $System $SystemUser $Nobody $Handle $Logger
+        $CORE_CONFIG_FILE
+        $SITE_CONFIG_FILE
+        $VENDOR_CONFIG_FILE
+        $BasePath
+        $EtcPath
+        $VarPath
+        $LocalPath
+        $LocalEtcPath
+        $LocalLexiconPath
+        $LogDir
+        $MasonComponentRoot
+        $MasonLocalComponentRoot
+        $MasonDataDir
+        $MasonSessionDir
+);
+
+$VERSION = '@RT_VERSION_MAJOR@.@RT_VERSION_MINOR@.@RT_VERSION_PATCH@';
+$CORE_CONFIG_FILE = "@CONFIG_FILE_PATH@/RT_Config.pm";
+$SITE_CONFIG_FILE = "@CONFIG_FILE_PATH@/RT_SiteConfig.pm";
+
+$BasePath = '@RT_PATH@';
+
+$EtcPath = '@RT_ETC_PATH@';
+$VarPath = '@RT_VAR_PATH@';
+$LocalPath = '@RT_LOCAL_PATH@';
+$LocalEtcPath = '@LOCAL_ETC_PATH@';
+$LocalLexiconPath = '@LOCAL_LEXICON_PATH@';
+
+# $MasonComponentRoot is where your rt instance keeps its mason html files
+
+$MasonComponentRoot = '@MASON_HTML_PATH@';
+
+# $MasonLocalComponentRoot is where your rt instance keeps its site-local
+# mason html files.
+
+$MasonLocalComponentRoot = '@MASON_LOCAL_HTML_PATH@';
+
+# $MasonDataDir Where mason keeps its datafiles
+
+$MasonDataDir = '@MASON_DATA_PATH@';
+
+# RT needs to put session data (for preserving state between connections
+# via the web interface)
+$MasonSessionDir = '@MASON_SESSION_PATH@';
+
+
+
+=head1 NAME
+
+	RT - Request Tracker
+
+=head1 SYNOPSIS
+
+	A fully featured request tracker package
+
+=head1 DESCRIPTION
+
+
+=cut
+
+=item LoadConfig
+
+Load RT's config file. First, go after the core config file. 
+After that, try to load the vendor config.
+After that, go after the site config.
+
+=cut
+
+sub LoadConfig {
+     local *Set = sub { $_[0] = $_[1] unless defined $_[0] }; 
+    if ( -f "$SITE_CONFIG_FILE" ) {
+        require $SITE_CONFIG_FILE
+          || die ("Couldn't load RT config file  '$SITE_CONFIG_FILE'\n$@");
+    }
+    require $CORE_CONFIG_FILE
+      || die ("Couldn't load RT config file '$CORE_CONFIG_FILE'\n$@");
+    RT::I18N->Init;
+}
+
+=item Init
+
+    Conenct to the database, set up logging.
+    
+=cut
+
+sub Init {
+    require RT::Handle;
+    #Get a database connection
+        unless ($Handle && $Handle->dbh->ping) {
+    $Handle = RT::Handle->new();
+        } 
+    $Handle->Connect();
+    
+    #RT's system user is a genuine database user. its id lives here
+    $SystemUser = new RT::CurrentUser();
+    $SystemUser->LoadByName('RT_System');
+    
+    #RT's "nobody user" is a genuine database user. its ID lives here.
+    $Nobody = new RT::CurrentUser();
+    $Nobody->LoadByName('Nobody');
+  
+    $System = RT::System->new();
+
+   InitLogging(); 
+}
+
+=head2 InitLogging
+
+Create the RT::Logger object. 
+
+=cut
+sub InitLogging {
+
+    # We have to set the record seperator ($, man perlvar)
+    # or Log::Dispatch starts getting
+    # really pissy, as some other module we use unsets it.
+
+    $, = '';
+    use Log::Dispatch 1.6;
+
+    unless ($RT::Logger) {
+
+    $RT::Logger=Log::Dispatch->new();
+    
+    if ($RT::LogToFile) {
+
+    unless (-d $RT::LogDir && -w $RT::LogDir) {
+        # localizing here would be hard when we don't have a current user yet
+        # die $self->loc("Log directory [_1] not found or couldn't be written.\n RT can't run.", $RT::LogDir);
+        die ("Log directory $RT::LogDir not found or couldn't be written.\n RT can't run.");
+    }
+
+	my $filename;
+	if ($RT::LogToFileNamed =~ m![/\\]!) {
+	    # looks like an absolute path.
+	    $filename = $RT::LogToFileNamed;
+	}
+	else {
+	    $filename = "$RT::LogDir/$RT::LogToFileNamed";
+	}
+    require Log::Dispatch::File;
+
+
+	  $RT::Logger->add(Log::Dispatch::File->new
+		       ( name=>'rtlog',
+			 min_level=> $RT::LogToFile,
+			 filename=> $filename,
+			 mode=>'append',
+			 callbacks => sub { my %p = @_;
+                                my ($package, $filename, $line) = caller(5);
+                                return "[".gmtime(time)."] [".$p{level}."]: $p{message} ($filename:$line)\n"}
+             
+             
+             
+		       ));
+    }
+    if ($RT::LogToScreen) {
+	require Log::Dispatch::Screen;
+	$RT::Logger->add(Log::Dispatch::Screen->new
+		     ( name => 'screen',
+		       min_level => $RT::LogToScreen,
+			 callbacks => sub { my %p = @_;
+                                my ($package, $filename, $line) = caller(5);
+                                return "[".gmtime(time)."] [".$p{level}."]: $p{message} ($filename:$line)\n"
+				},
+             
+		       stderr => 1
+		     ));
+    }
+    if ($RT::LogToSyslog) {
+	require Log::Dispatch::Syslog;
+	$RT::Logger->add(Log::Dispatch::Syslog->new
+		     ( name => 'syslog',
+                       ident => 'RT',
+		       min_level => $RT::LogToSyslog,
+			 callbacks => sub { my %p = @_;
+                                my ($package, $filename, $line) = caller(5);
+
+				# syswrite() cannot take utf8; turn it off here.
+				Encode::_utf8_off($p{message});
+
+				if ($p{level} eq 'debug') {
+
+                                return "$p{message}\n" }
+				else {
+                                return "$p{message} ($filename:$line)\n"}
+				},
+             
+		       stderr => 1
+		     ));
+    }
+
+    }
+
+# {{{ Signal handlers
+
+## This is the default handling of warnings and die'ings in the code
+## (including other used modules - maybe except for errors catched by
+## Mason).  It will log all problems through the standard logging
+## mechanism (see above).
+
+$SIG{__WARN__} = sub {$RT::Logger->warning($_[0])};
+
+#When we call die, trap it and log->crit with the value of the die.
+
+$SIG{__DIE__}  = sub {
+    unless ($^S || !defined $^S ) {
+        $RT::Handle->Rollback();
+        $RT::Logger->crit("$_[0]");
+        exit(-1);
+    }
+    else {
+        #Get out of here if we're in an eval
+        die $_[0];
+    }
+};
+
+# }}}
+
+}
+
+# }}}
+
+
+sub SystemUser {
+    return($SystemUser);
+}	
+
+sub Nobody {
+    return ($Nobody);
+}
+
+
+=head2 DropSetGIDPermissions
+
+Drops setgid permissions.
+
+=cut
+
+sub DropSetGIDPermissions {
+    # Now that we got the config read in, we have the database 
+    # password and don't need to be setgid
+    # make the effective group the real group
+    $) = $(;
+}
+
+
+=head1 SYNOPSIS
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+
+=begin testing
+
+
+ok ($RT::Nobody->Name() eq 'Nobody', "Nobody is nobody");
+ok ($RT::Nobody->Name() ne 'root', "Nobody isn't named root");
+ok ($RT::SystemUser->Name() eq 'RT_System', "The system user is RT_System");
+ok ($RT::SystemUser->Name() ne 'noname', "The system user isn't noname");
+
+
+=end testing
+
+=cut
+
+eval "require RT_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT_Local.pm});
+
+1;
diff --git a/rt/lib/RT/ACE.pm b/rt/lib/RT/ACE.pm
index d4681cf44..1501a125e 100755
--- a/rt/lib/RT/ACE.pm
+++ b/rt/lib/RT/ACE.pm
@@ -1,774 +1,304 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/ACE.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::ACE - RT\'s ACE object
+=head1 NAME
 
-=head1 SYNOPSIS
+RT::ACE
 
-  use RT::ACE;
-  my $ace = new RT::ACE($CurrentUser);
 
+=head1 SYNOPSIS
 
 =head1 DESCRIPTION
 
-
 =head1 METHODS
 
-=begin testing
-
-ok(require RT::TestHarness);
-ok(require RT::ACE);
-
-=end testing
-
 =cut
 
 package RT::ACE;
-use RT::Record;
-@ISA= qw(RT::Record);
-
-use vars qw (%SCOPES
-   	     %QUEUERIGHTS
-	     %SYSTEMRIGHTS
-	     %LOWERCASERIGHTNAMES
-	    ); 
-
-%SCOPES = (
-	   System => 'System-level right',
-	   Queue => 'Queue-level right'
-	  );
-
-# {{{ Descriptions of rights
-
-# Queue rights are the sort of queue rights that can only be granted
-# to real people or groups
-%QUEUERIGHTS = ( 
-		SeeQueue => 'Can this principal see this queue',
-		AdminQueue => 'Create, delete and modify queues', 
-		ShowACL => 'Display Access Control List',
-		ModifyACL => 'Modify Access Control List',
-		ModifyQueueWatchers => 'Modify the queue watchers',
-                AdminKeywordSelects => 'Create, delete and modify keyword selections',
-
-		
-		ModifyTemplate => 'Modify email templates for this queue',
-		ShowTemplate => 'Display email templates for this queue',
-		ModifyScrips => 'Modify Scrips for this queue',
-		ShowScrips => 'Display Scrips for this queue',
-
-		ShowTicket => 'Show ticket summaries',
-		ShowTicketComments => 'Show ticket private commentary',
+use RT::Record; 
 
-		Watch => 'Sign up as a ticket Requestor or ticket or queue Cc',
-		WatchAsAdminCc => 'Sign up as a ticket or queue AdminCc',
-		CreateTicket => 'Create tickets in this queue',
-		ReplyToTicket => 'Reply to tickets',
-		CommentOnTicket => 'Comment on tickets',
-		OwnTicket => 'Own tickets',
-		ModifyTicket => 'Modify tickets',
-		DeleteTicket => 'Delete tickets'
 
-	       );	
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
 
+sub _Init {
+  my $self = shift; 
 
-# System rights are rights granted to the whole system
-%SYSTEMRIGHTS = (
-                SuperUser => 'Do anything and everything',
-		AdminKeywords => 'Creatte, delete and modify keywords',	 
-		AdminGroups => 'Create, delete and modify groups',
-	        AdminUsers => 'Create, Delete and Modify users',
-		ModifySelf => 'Modify one\'s own RT account',
-
-		);
-
-# }}}
-
-# {{{ Descriptions of principals
-
-%TICKET_METAPRINCIPALS = ( Owner => 'The owner of a ticket',
-            			   Requestor => 'The requestor of a ticket',
-		            	   Cc => 'The CC of a ticket',
-			               AdminCc => 'The administrative CC of a ticket',
-			 );
-
-# }}}
-
-# {{{ We need to build a hash of all rights, keyed by lower case names
-
-#since you can't do case insensitive hash lookups
-
-foreach $right (keys %QUEUERIGHTS) {
-    $LOWERCASERIGHTNAMES{lc $right}=$right;
-}
-foreach $right (keys %SYSTEMRIGHTS) {
-    $LOWERCASERIGHTNAMES{lc $right}=$right;
+  $self->Table('ACL');
+  $self->SUPER::_Init(@_);
 }
 
-# }}}
-
-# {{{ sub _Init
-sub _Init  {
-  my $self = shift;
-  $self->{'table'} = "ACL";
-  return($self->SUPER::_Init(@_));
-}
-# }}}
 
-# {{{ sub LoadByValues
 
-=head2 LoadByValues PARAMHASH
 
-Load an ACE by specifying a paramhash with the following fields:
 
-              PrincipalId => undef,
-	      PrincipalType => undef,
-	      RightName => undef,
-	      RightScope => undef,
-	      RightAppliesTo => undef,
+=item Create PARAMHASH
 
-=cut
+Create takes a hash of values and creates a row in the database:
 
-sub LoadByValues {
-  my $self = shift;
-  my %args = (PrincipalId => undef,
-	      PrincipalType => undef,
-	      RightName => undef,
-	      RightScope => undef,
-	      RightAppliesTo => undef,
-	      @_);
-  
-  $self->LoadByCols (PrincipalId => $args{'PrincipalId'},
-		     PrincipalType => $args{'PrincipalType'},
-		     RightName => $args{'RightName'},
-		     RightScope => $args{'RightScope'},
-		     RightAppliesTo => $args{'RightAppliesTo'}
-		    );
-  
-  #If we couldn't load it.
-  unless ($self->Id) {
-      return (0, "ACE not found");
-  }
-  # if we could
-  return ($self->Id, "ACE Loaded");
-  
-}
+  varchar(25) 'PrincipalType'.
+  int(11) 'PrincipalId'.
+  varchar(25) 'RightName'.
+  varchar(25) 'ObjectType'.
+  int(11) 'ObjectId'.
+  int(11) 'DelegatedBy'.
+  int(11) 'DelegatedFrom'.
 
-# }}}
-
-# {{{ sub Create
-
-=head2 Create <PARAMS>
+=cut
 
-PARAMS is a parameter hash with the following elements:
 
-   PrincipalType => "Queue"|"User"
-   PrincipalId => an intentifier you can use to ->Load a user or group
-   RightName => the name of a right. in any case
-   RightScope => "System" | "Queue"
-   RightAppliesTo => a queue id or undef
 
-=cut
 
 sub Create {
     my $self = shift;
-    my %args = ( PrincipalId => undef,
-		 PrincipalType => undef,
-		 RightName => undef,
-		 RightScope => undef,
-		 RightAppliesTo => undef,
-		 @_
-	       );
-    
-    # {{{ Validate the principal
-    my ($princ_obj);
-    if ($args{'PrincipalType'} eq 'User') {
-	$princ_obj = new RT::User($RT::SystemUser);
-	
-    }	
-    elsif ($args{'PrincipalType'} eq 'Group') {
-	require RT::Group;
-	$princ_obj = new RT::Group($RT::SystemUser);
-    }
-    else {
-	return (0, 'Principal type '.$args{'PrincipalType'} . ' is invalid.');
-    }	
-    
-    $princ_obj->Load($args{'PrincipalId'});
-    my $princ_id = $princ_obj->Id();
-    
-    unless ($princ_id) {
-	return (0, 'Principal '.$args{'PrincipalId'}.' not found.');
-    }
-
-    # }}}
-    
-    #TODO allow loading of queues by name.    
-    
-    # {{{ Check the ACL
-    if ($args{'RightScope'} eq 'System') {
-	
-	unless ($self->CurrentUserHasSystemRight('ModifyACL')) {
-	    $RT::Logger->error("Permission Denied.");
-	    return(undef);
-	}
-    }
-    
-    elsif ($args{'RightScope'} eq 'Queue') {
-	unless ($self->CurrentUserHasQueueRight( Queue => $args{'RightAppliesTo'},
-						 Right => 'ModifyACL')) {
-	    return (0, 'Permission Denied.');
-	}
-	
-	
-	
-	
-    }
-    #If it's not a scope we recognise, something scary is happening.
-    else {
-	$RT::Logger->err("RT::ACE->Create got a scope it didn't recognize: ".
-			 $args{'RightScope'}." Bailing. \n");
-	return(0,"System error. Unable to grant rights.");
-    }
-
-    # }}}
-
-    # {{{ Canonicalize and check the right name
-    $args{'RightName'} = $self->CanonicalizeRightName($args{'RightName'});
-    
-    #check if it's a valid RightName
-    if ($args{'RightScope'} eq 'Queue') {
-	unless (exists $QUEUERIGHTS{$args{'RightName'}}) {
-	    return(0, 'Invalid right');
-	}	
-	}	
-    elsif ($args{'RightScope' eq 'System'}) {
-	unless (exists $SYSTEMRIGHTS{$args{'RightName'}}) {
-	    return(0, 'Invalid right');
-	}		    
-    }	
-    # }}}
-    
-    # Make sure the right doesn't already exist.
-    $self->LoadByCols (PrincipalId => $princ_id,
-		       PrincipalType => $args{'PrincipalType'},
-		       RightName => $args{'RightName'},
-		       RightScope => $args {'RightScope'},
-		       RightAppliesTo => $args{'RightAppliesTo'}
-		      );
-    if ($self->Id) {
-	return (0, 'That user already has that right');
-    }	
-
-    my $id = $self->SUPER::Create( PrincipalId => $princ_id,
-				   PrincipalType => $args{'PrincipalType'},
-				   RightName => $args{'RightName'},
-				   RightScope => $args {'RightScope'},
-				   RightAppliesTo => $args{'RightAppliesTo'}
-				 );
-    
-    
-    if ($id > 0 ) {
-	return ($id, 'Right Granted');
-    }
-    else {
-	$RT::Logger->err('System error. right not granted.');
-	return(0, 'System Error. right not granted');
-    }
-}
-
-# }}}
-
+    my %args = ( 
+                PrincipalType => '',
+                PrincipalId => '0',
+                RightName => '',
+                ObjectType => '',
+                ObjectId => '0',
+                DelegatedBy => '0',
+                DelegatedFrom => '0',
+
+		  @_);
+    $self->SUPER::Create(
+                         PrincipalType => $args{'PrincipalType'},
+                         PrincipalId => $args{'PrincipalId'},
+                         RightName => $args{'RightName'},
+                         ObjectType => $args{'ObjectType'},
+                         ObjectId => $args{'ObjectId'},
+                         DelegatedBy => $args{'DelegatedBy'},
+                         DelegatedFrom => $args{'DelegatedFrom'},
+);
 
-# {{{ sub Delete 
-
-=head2 Delete
-
-Delete this object.
-
-=cut
-
-sub Delete {
-    my $self = shift;
-    
-    unless ($self->CurrentUserHasRight('ModifyACL')) {
-	return (0, 'Permission Denied');
-    }	
-    
-    
-    my ($val,$msg) = $self->SUPER::Delete(@_);
-    if ($val) {
-	return ($val, 'ACE Deleted');
-    }	
-    else {
-	return (0, 'ACE could not be deleted');
-    }
 }
 
-# }}}
 
-# {{{ sub _BootstrapRight 
 
-=head2 _BootstrapRight
+=item id
 
-Grant a right with no error checking and no ACL. this is _only_ for 
-installation. If you use this routine without jesse@fsck.com's explicit 
-written approval, he will hunt you down and make you spend eternity
-translating mozilla's code into FORTRAN or intercal.
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
 
-=cut
-
-sub _BootstrapRight {
-    my $self = shift;
-    my %args = @_;
-
-    my $id = $self->SUPER::Create( PrincipalId => $args{'PrincipalId'},
-				   PrincipalType => $args{'PrincipalType'},
-				   RightName => $args{'RightName'},
-				   RightScope => $args {'RightScope'},
-				   RightAppliesTo => $args{'RightAppliesTo'}
-				 );
-    
-    if ($id > 0 ) {
-	return ($id);
-    }
-    else {
-	$RT::Logger->err('System error. right not granted.');
-	return(undef);
-    }
-    
-}
-
-# }}}
-
-# {{{ sub CanonicalizeRightName
-
-=head2 CanonicalizeRightName <RIGHT>
-
-Takes a queue or system right name in any case and returns it in
-the correct case. If it's not found, will return undef.
 
 =cut
 
-sub CanonicalizeRightName {
-    my $self = shift;
-    my $right = shift;
-    $right = lc $right;
-    if (exists $LOWERCASERIGHTNAMES{"$right"}) {
-	return ($LOWERCASERIGHTNAMES{"$right"});
-    }
-    else {
-	return (undef);
-    }
-}
-
-# }}}
 
-# {{{ sub QueueRights
+=item PrincipalType
 
-=head2 QueueRights
+Returns the current value of PrincipalType. 
+(In the database, PrincipalType is stored as varchar(25).)
 
-Returns a hash of all the possible rights at the queue scope
 
-=cut
 
-sub QueueRights {
-        return (%QUEUERIGHTS);
-}
+=item SetPrincipalType VALUE
 
-# }}}
 
-# {{{ sub SystemRights
+Set PrincipalType to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, PrincipalType will be stored as a varchar(25).)
 
-=head2 SystemRights
-
-Returns a hash of all the possible rights at the system scope
 
 =cut
 
-sub SystemRights {
-	return (%SYSTEMRIGHTS);
-}
 
+=item PrincipalId
 
-# }}}
+Returns the current value of PrincipalId. 
+(In the database, PrincipalId is stored as int(11).)
 
-# {{{ sub _Accessible 
 
-sub _Accessible  {
-  my $self = shift;  
-  my %Cols = (
-	      PrincipalId => 'read/write',
-	      PrincipalType => 'read/write',
-	      RightName => 'read/write', 
-	      RightScope => 'read/write',
-	      RightAppliesTo => 'read/write'
-	    );
-  return($self->SUPER::_Accessible(@_, %Cols));
-}
-# }}}
 
-# {{{ sub AppliesToObj
+=item SetPrincipalId VALUE
 
-=head2 AppliesToObj
 
-If the AppliesTo is a queue, returns the queue object. If it's 
-the system object, returns undef. If the user has no rights, returns undef.
+Set PrincipalId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, PrincipalId will be stored as a int(11).)
 
-=cut
-
-sub AppliesToObj {
-    my $self = shift;
-    if ($self->RightScope eq 'Queue') {
-	my $appliesto_obj = new RT::Queue($self->CurrentUser);
-	$appliesto_obj->Load($self->RightAppliesTo);
-	return($appliesto_obj);
-    }
-    elsif ($self->RightScope eq 'System') {
-	return (undef);
-    }	
-    else {
-	$RT::Logger->warning("$self -> AppliesToObj called for an object ".
-			     "of an unknown scope:" . $self->RightScope);
-	return(undef);
-    }
-}	
-
-# }}}
-
-# {{{ sub PrincipalObj
-
-=head2 PrincipalObj
-
-If the AppliesTo is a group, returns the group object.
-If the AppliesTo is a user, returns the user object.
-Otherwise, it logs a warning and returns undef.
 
 =cut
 
-sub PrincipalObj {
-    my $self = shift;
-    my ($princ_obj);
-
-    if ($self->PrincipalType eq 'Group') {
-	use RT::Group;
-	$princ_obj = new RT::Group($self->CurrentUser);
-    }
-    elsif ($self->PrincipalType eq 'User') {
-	$princ_obj = new RT::User($self->CurrentUser);
-    }
-    else {
-	$RT::Logger->warning("$self -> PrincipalObj called for an object ".
-			     "of an unknown principal type:" . 
-			     $self->PrincipalType ."\n");
-	return(undef);
-    }
-    
-    $princ_obj->Load($self->PrincipalId);
-    return($princ_obj);
-
-}	
-
-# }}}
-
-# {{{ ACL related methods
-
-# {{{ sub _Set
-
-sub _Set {
-  my $self = shift;
-  return (0, "ACEs can only be created and deleted.");
-}
-
-# }}}
-
-# {{{ sub _Value
-
-sub _Value {
-    my $self = shift;
-
-    unless ($self->CurrentUserHasRight('ShowACL')) {
-	return (undef);
-    }
 
-    return ($self->__Value(@_));
-}
-
-# }}}
+=item RightName
 
+Returns the current value of RightName. 
+(In the database, RightName is stored as varchar(25).)
 
-# {{{ sub CurrentUserHasQueueRight 
 
-=head2 CurrentUserHasQueueRight ( Queue => QUEUEID, Right => RIGHTNANAME )
 
-Check to see whether the current user has the specified right for the specified queue.
-
-=cut
-
-sub CurrentUserHasQueueRight {
-    my $self = shift;
-    my %args = (Queue => undef,
-		Right => undef,
-		@_
-		);
-    return ($self->HasRight( Right => $args{'Right'},
-			     Principal => $self->CurrentUser->UserObj,
-			     Queue => $args{'Queue'}));
-}
+=item SetRightName VALUE
 
-# }}}
 
-# {{{ sub CurrentUserHasSystemRight 
-=head2 CurrentUserHasSystemRight RIGHTNAME
+Set RightName to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, RightName will be stored as a varchar(25).)
 
-Check to see whether the current user has the specified right for the 'system' scope.
 
 =cut
 
-sub CurrentUserHasSystemRight {
-    my $self = shift;
-    my $right = shift;
-    return ($self->HasRight( Right => $right,
-			     Principal => $self->CurrentUser->UserObj,
-			     System => 1
-			   ));
-}
-
 
-# }}}
+=item ObjectType
 
-# {{{ sub CurrentUserHasRight
+Returns the current value of ObjectType. 
+(In the database, ObjectType is stored as varchar(25).)
 
-=item CurrentUserHasRight RIGHT 
-Takes a rightname as a string.
-
-Helper menthod for HasRight. Presets Principal to CurrentUser then 
-calls HasRight.
-
-=cut
 
-sub CurrentUserHasRight {
-    my $self = shift;
-    my $right = shift;
-    return ($self->HasRight( Principal => $self->CurrentUser->UserObj,
-                             Right => $right,
-			   ));
-}
 
-# }}}
+=item SetObjectType VALUE
 
-# {{{ sub HasRight
 
-=item HasRight
+Set ObjectType to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ObjectType will be stored as a varchar(25).)
 
-Takes a param-hash consisting of "Right" and "Principal"  Principal is 
-an RT::User object or an RT::CurrentUser object. "Right" is a textual
-Right string that applies to KeywordSelects
 
 =cut
 
-sub HasRight {
-    my $self = shift;
-    my %args = ( Right => undef,
-                 Principal => undef,
-		 Queue => undef,
-		 System => undef,
-                 @_ ); 
-
-    #If we're explicitly specifying a queue, as we need to do on create
-    if (defined $args{'Queue'}) {
-	return ($args{'Principal'}->HasQueueRight(Right => $args{'Right'},
-						  Queue => $args{'Queue'}));
-    }
-    #else if we're specifying to check a system right
-    elsif ((defined $args{'System'}) and (defined $args{'Right'})) {
-        return( $args{'Principal'}->HasSystemRight( $args{'Right'} ));
-    }	
-    
-    elsif ($self->__Value('RightScope') eq 'System') {
-	return $args{'Principal'}->HasSystemRight($args{'Right'});
-    }
-    elsif ($self->__Value('RightScope') eq 'Queue') {
-	return $args{'Principal'}->HasQueueRight( Queue => $self->__Value('RightAppliesTo'),
-						  Right => $args{'Right'} );
-    }	
-    else {
-	$RT::Logger->warning("$self: Trying to check an acl for a scope we ".
-			     "don't understand:" . $self->__Value('RightScope') ."\n");
-	return undef;
-    }
-
-
-
-}
-# }}}
-
-# }}}
-
-1;
-
-__DATA__
-
-# {{{ POD
-
-=head1 Out of date docs
 
-=head2 Table Structure
+=item ObjectId
 
-PrincipalType, PrincipalId, Right,Scope,AppliesTo
+Returns the current value of ObjectId. 
+(In the database, ObjectId is stored as int(11).)
 
-=head1 The docs are out of date. so you know.
 
-=head1 Scopes
 
-Scope is the scope of the right granted, not the granularity of the grant.
-For example, Queue and Ticket rights are both granted for a "queue." 
-Rights with a scope of 'System' don't have an AppliesTo. (They're global).
-Rights with a scope of "Queue" are rights that act on a queue.
-Rights with a scope of "System" are rights that act on some other aspect
-of the system.
+=item SetObjectId VALUE
 
 
-=item Queue
-=item System
+Set ObjectId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ObjectId will be stored as a int(11).)
 
 
-=head1 Rights
-
-=head2 Scope: Queue
-
-=head2 Queue rights that apply to a ticket within a queue
-
-Create Ticket in <queue>
-
-        Name: Create
-	Principals: <user> <group>
-Display Ticket Summary in <queue>
-
-	Name: Show
-	Principals: <user> <group> Owner Requestor Cc AdminCc
-
-Display Ticket History  <queue>
-
-	Name: ShowHistory
-	Principals: <user> <group> Owner Requestor Cc AdminCc
-
-Display Ticket Private Comments  <queue>
+=cut
 
-	Name: ShowComments
-	Principals: <user> <group> Owner Requestor Cc AdminCc
 
-Reply to Ticket in <queue>
+=item DelegatedBy
 
-	Name: Reply
-	Principals: <user> <group> Owner Requestor Cc AdminCc
+Returns the current value of DelegatedBy. 
+(In the database, DelegatedBy is stored as int(11).)
 
-Comment on Ticket in <queue>
 
-	Name: Comment
-	Principals: <user> <group> Owner Requestor Cc AdminCc
 
-Modify Ticket in <queue>
+=item SetDelegatedBy VALUE
 
-	Name: Modify
-	Principals: <user> <group> Owner Requestor Cc AdminCc
 
-Delete Tickets in <queue>
+Set DelegatedBy to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, DelegatedBy will be stored as a int(11).)
 
-	Name: Delete
-	Principals: <user> <group> Owner Requestor Cc AdminCc
 
+=cut
 
-=head2 Queue Rights that apply to a whole queue
 
-These rights can only be granted to "real people"
+=item DelegatedFrom
 
-List Tickets in <queue>
+Returns the current value of DelegatedFrom. 
+(In the database, DelegatedFrom is stored as int(11).)
 
-	Name: ListQueue
-	Principals: <user> <group>
 
-Know that <queue> exists
-    
-    Name: See
-    Principals: <user> <group>
 
-Display queue settings
+=item SetDelegatedFrom VALUE
 
-    Name: Explore
-    Principals: <user> <group>
 
-Modify Queue Watchers for <queue>
+Set DelegatedFrom to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, DelegatedFrom will be stored as a int(11).)
 
-	Name: ModifyQueueWatchers
-	Principals: <user> <group>
 
-Modify Queue Attributes for <queue> 
+=cut
 
-	Name: ModifyQueue
-	Principals: <user> <group>
 
-Modify Queue ACL for queue <queue>
 
-	Name: ModifyACL
-	Principals: <user> <group>
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        PrincipalType => 
+		{read => 1, write => 1, type => 'varchar(25)', default => ''},
+        PrincipalId => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        RightName => 
+		{read => 1, write => 1, type => 'varchar(25)', default => ''},
+        ObjectType => 
+		{read => 1, write => 1, type => 'varchar(25)', default => ''},
+        ObjectId => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        DelegatedBy => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        DelegatedFrom => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
 
+ }
+};
 
-=head2 Rights that apply to the System scope
 
-=head2 SystemRights
+        eval "require RT::ACE_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/ACE_Overlay.pm}) {
+            die $@;
+        };
 
-Create Queue
-  
-        Name: CreateQueue
-	Principals: <user> <group>
-Delete Queue
-  
-        Name: DeleteQueue
-  	Principals: <user> <group>
+        eval "require RT::ACE_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/ACE_Vendor.pm}) {
+            die $@;
+        };
 
-Create Users
-  
-        Name: CreateUser
-	Principals: <user> <group>
+        eval "require RT::ACE_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/ACE_Local.pm}) {
+            die $@;
+        };
 
-Delete Users
-  
-        Name: DeleteUser
-  	Principals: <user> <group>
-  
-Modify Users
-  
-        Name: ModifyUser
-	Principals: <user> <group>
 
-Modify Self
-        Name: ModifySelf
-	Principals: <user> <group>
 
-Browse Users
 
-        Name: BrowseUsers (NOT IMPLEMENTED in 2.0)
-	Principals: <user> <group>
+=head1 SEE ALSO
 
-Modify Self
-		    
-	Name: ModifySelf
-	Principals: <user> <group>
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
-Modify System ACL
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-	Name: ModifyACL		  
-	Principals: <user> <group>
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
-=head1 The Principal Side of the ACE
+   no warnings qw(redefine);
 
-=head2 PrincipalTypes,PrincipalIds in our Neighborhood
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
-  User,<userid>
-  Group,<groupip>
-  Everyone,NULL
+RT::ACE_Overlay, RT::ACE_Vendor, RT::ACE_Local
 
 =cut
 
-# }}}
+
+1;
diff --git a/rt/lib/RT/ACE_Overlay.pm b/rt/lib/RT/ACE_Overlay.pm
new file mode 100644
index 000000000..65e5a9c45
--- /dev/null
+++ b/rt/lib/RT/ACE_Overlay.pm
@@ -0,0 +1,907 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 SYNOPSIS
+
+  use RT::ACE;
+  my $ace = new RT::ACE($CurrentUser);
+
+
+=head1 DESCRIPTION
+
+
+
+=head1 METHODS
+
+=begin testing
+
+ok(require RT::ACE);
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+use RT::Principals;
+use RT::Queues;
+use RT::Groups;
+
+use vars qw (
+  %LOWERCASERIGHTNAMES
+  %OBJECT_TYPES
+  %TICKET_METAPRINCIPALS
+);
+
+
+# {{{ Descriptions of rights
+
+=head1 Rights
+
+# Queue rights are the sort of queue rights that can only be granted
+# to real people or groups
+
+
+=begin testing
+
+my $Queue = RT::Queue->new($RT::SystemUser);
+
+is ($Queue->AvailableRights->{'DeleteTicket'} , 'Delete tickets', "Found the delete ticket right");
+is ($RT::System->AvailableRights->{'SuperUser'},  'Do anything and everything', "Found the superuser right");
+
+
+=end testing
+
+=cut
+
+
+
+
+# }}}
+
+# {{{ Descriptions of principals
+
+%TICKET_METAPRINCIPALS = (
+    Owner     => 'The owner of a ticket',                             # loc_pair
+    Requestor => 'The requestor of a ticket',                         # loc_pair
+    Cc        => 'The CC of a ticket',                                # loc_pair
+    AdminCc   => 'The administrative CC of a ticket',                 # loc_pair
+);
+
+# }}}
+
+
+# {{{ sub LoadByValues
+
+=head2 LoadByValues PARAMHASH
+
+Load an ACE by specifying a paramhash with the following fields:
+
+              PrincipalId => undef,
+              PrincipalType => undef,
+	      RightName => undef,
+
+        And either:
+
+	      Object => undef,
+
+            OR
+
+        ObjectType => undef,
+        ObjectId => undef
+
+=cut
+
+sub LoadByValues {
+    my $self = shift;
+    my %args = ( PrincipalId   => undef,
+                 PrincipalType => undef,
+                 RightName     => undef,
+                 Object    => undef,
+                 ObjectId    => undef,
+                 ObjectType    => undef,
+                 @_ );
+
+    my $princ_obj;
+    ( $princ_obj, $args{'PrincipalType'} ) =
+      $self->_CanonicalizePrincipal( $args{'PrincipalId'},
+                                     $args{'PrincipalType'} );
+
+    unless ( $princ_obj->id ) {
+        return ( 0,
+                 $self->loc( 'Principal [_1] not found.', $args{'PrincipalId'} )
+        );
+    }
+
+    my ($object_type, $object_id);
+    
+    if ($args{'Object'} && UNIVERSAL::can($args{'Object'},'id')) {
+        $object_type = ref($args{'Object'});
+        $object_id = $args{'Object'}->id;
+    } elsif ($args{'ObjectId'} || $args{'ObjectType'}) {
+        $object_type = $args{'ObjectType'};
+        $object_id = $args{'ObjectId'};
+    } else {
+            return ( 0, $self->loc("System error. Right not granted.") );
+    }
+
+    $self->LoadByCols( PrincipalId   => $princ_obj->Id,
+                       PrincipalType => $args{'PrincipalType'},
+                       RightName     => $args{'RightName'},
+                       ObjectType    => $object_type,
+                       ObjectId      => $object_id);
+
+    #If we couldn't load it.
+    unless ( $self->Id ) {
+        return ( 0, $self->loc("ACE not found") );
+    }
+
+    # if we could
+    return ( $self->Id, $self->loc("Right Loaded") );
+
+}
+
+# }}}
+
+# {{{ sub Create
+
+=head2 Create <PARAMS>
+
+PARAMS is a parameter hash with the following elements:
+
+   PrincipalId => The id of an RT::Principal object
+   PrincipalType => "User" "Group" or any Role type
+   RightName => the name of a right. in any case
+   DelegatedBy => The Principal->Id of the user delegating the right
+   DelegatedFrom => The id of the ACE which this new ACE is delegated from
+
+
+    Either:
+
+   Object => An object to create rights for. ususally, an RT::Queue or RT::Group
+             This should always be a DBIx::SearchBuilder::Record subclass
+
+        OR
+
+   ObjectType => the type of the object in question (ref ($object))
+   ObjectId => the id of the object in question $object->Id
+
+=cut
+
+sub Create {
+    my $self = shift;
+    my %args = ( PrincipalId   => undef,
+                 PrincipalType => undef,
+                 RightName     => undef,
+                 Object    => $RT::System,
+                 @_ );
+
+    # {{{ Validate the principal
+    my $princ_obj;
+    ( $princ_obj, $args{'PrincipalType'} ) =
+      $self->_CanonicalizePrincipal( $args{'PrincipalId'},
+                                     $args{'PrincipalType'} );
+
+    unless ( $princ_obj->id ) {
+        return ( 0,
+                 $self->loc( 'Principal [_1] not found.', $args{'PrincipalId'} )
+        );
+    }
+
+    # }}}
+
+
+    if ($args{'Object'} && ($args{'ObjectId'} || $args{'ObjectType'})) {
+        use Carp;
+        $RT::Logger->crit(Carp::cluck("ACE::Create called with an ObjectType or an ObjectId"));
+    }
+
+
+    
+    unless ($args{'Object'} && UNIVERSAL::can($args{'Object'},'id')) {
+            return ( 0, $self->loc("System error. Right not granted.") );
+    }
+    # {{{ Check the ACL
+
+    if (ref( $args{'Object'}) eq 'RT::Group' ) {
+        unless ( $self->CurrentUser->HasRight( Object => $args{'Object'},
+                                                  Right => 'AdminGroup' )
+          ) {
+            return ( 0, $self->loc('Permission Denied') );
+        }
+    }
+
+    else {
+        unless ( $self->CurrentUser->HasRight( Object => $args{'Object'}, Right => 'ModifyACL' )) {
+            return ( 0, $self->loc('Permission Denied') );
+        }
+    }
+    # }}}
+
+    # {{{ Canonicalize and check the right name
+    unless ( $args{'RightName'} ) {
+        return ( 0, $self->loc('Invalid right') );
+    }
+
+    $args{'RightName'} = $self->CanonicalizeRightName( $args{'RightName'} );
+
+    #check if it's a valid RightName
+    if ( ref ($args{'Object'} eq 'RT::Queue'  )) {
+        unless ( exists $args{'Object'}->AvailableRights->{ $args{'RightName'} } ) {
+            $RT::Logger->warning("Couldn't validate right name". $args{'RightName'});
+            return ( 0, $self->loc('Invalid right') );
+        }
+    }
+    elsif ( ref ($args{'Object'} eq 'RT::Group'  )) {
+        unless ( exists $args{'Object'}->AvailableRights->{ $args{'RightName'} } ) {
+            $RT::Logger->warning("Couldn't validate group right name". $args{'RightName'});
+            return ( 0, $self->loc('Invalid right') );
+        }
+    }
+    elsif ( ref ($args{'Object'} eq 'RT::System'  )) {
+        my $q = RT::Queue->new($self->CurrentUser);
+        my $g = RT::Group->new($self->CurrentUser);
+
+        unless (( exists $g->AvailableRights->{ $args{'RightName'} } )
+        || ( exists $g->AvailableRights->{ $args{'RightName'} } )
+        || ( exists $RT::System->AvailableRights->{ $args{'RightName'} } ) ) {
+            $RT::Logger->warning("Couldn't validate system right name - ". $args{'RightName'});
+            return ( 0, $self->loc('Invalid right') );
+        }
+    }
+
+    unless ( $args{'RightName'} ) {
+        return ( 0, $self->loc('Invalid right') );
+    }
+    # }}}
+
+    # Make sure the right doesn't already exist.
+    $self->LoadByCols( PrincipalId   => $princ_obj->id,
+                       PrincipalType => $args{'PrincipalType'},
+                       RightName     => $args{'RightName'},
+                       ObjectType    => ref($args{'Object'}),
+                       ObjectId      => $args{'Object'}->id,
+                       DelegatedBy   => 0,
+                       DelegatedFrom => 0 );
+    if ( $self->Id ) {
+        return ( 0, $self->loc('That principal already has that right') );
+    }
+
+    my $id = $self->SUPER::Create( PrincipalId   => $princ_obj->id,
+                                   PrincipalType => $args{'PrincipalType'},
+                                   RightName     => $args{'RightName'},
+                                   ObjectType    => ref( $args{'Object'} ),
+                                   ObjectId      => $args{'Object'}->id,
+                                   DelegatedBy   => 0,
+                                   DelegatedFrom => 0 );
+
+    #Clear the key cache. TODO someday we may want to just clear a little bit of the keycache space. 
+    RT::Principal->_InvalidateACLCache();
+
+    if ( $id > 0 ) {
+        return ( $id, $self->loc('Right Granted') );
+    }
+    else {
+        return ( 0, $self->loc('System error. Right not granted.') );
+    }
+}
+
+# }}}
+
+# {{{ sub Delegate
+
+=head2 Delegate <PARAMS>
+
+This routine delegates the current ACE to a principal specified by the
+B<PrincipalId>  parameter.
+
+Returns an error if the current user doesn't have the right to be delegated
+or doesn't have the right to delegate rights.
+
+Always returns a tuple of (ReturnValue, Message)
+
+=begin testing
+
+use_ok(RT::User);
+my $user_a = RT::User->new($RT::SystemUser);
+$user_a->Create( Name => 'DelegationA', Privileged => 1);
+ok ($user_a->Id, "Created delegation user a");
+
+my $user_b = RT::User->new($RT::SystemUser);
+$user_b->Create( Name => 'DelegationB', Privileged => 1);
+ok ($user_b->Id, "Created delegation user b");
+
+
+use_ok(RT::Queue);
+my $q = RT::Queue->new($RT::SystemUser);
+$q->Create(Name =>'DelegationTest');
+ok ($q->Id, "Created a delegation test queue");
+
+
+#------ First, we test whether a user can delegate a right that's been granted to him personally 
+my ($val, $msg) = $user_a->PrincipalObj->GrantRight(Object => $RT::System, Right => 'AdminOwnPersonalGroups');
+ok($val, $msg);
+
+($val, $msg) = $user_a->PrincipalObj->GrantRight(Object =>$q, Right => 'OwnTicket');
+ok($val, $msg);
+
+ok($user_a->HasRight( Object => $RT::System, Right => 'AdminOwnPersonalGroups')    ,"user a has the right 'AdminOwnPersonalGroups' directly");
+
+my $a_delegates = RT::Group->new($user_a);
+$a_delegates->CreatePersonalGroup(Name => 'Delegates');
+ok( $a_delegates->Id   ,"user a creates a personal group 'Delegates'");
+ok( $a_delegates->AddMember($user_b->PrincipalId)   ,"user a adds user b to personal group 'delegates'");
+
+ok( !$user_b->HasRight(Right => 'OwnTicket', Object => $q)    ,"user b does not have the right to OwnTicket' in queue 'DelegationTest'");
+ok(  $user_a->HasRight(Right => 'OwnTicket', Object => $q)  ,"user a has the right to 'OwnTicket' in queue 'DelegationTest'");
+ok(!$user_a->HasRight( Object => $RT::System, Right => 'DelegateRights')    ,"user a does not have the right 'delegate rights'");
+
+
+my $own_ticket_ace = RT::ACE->new($user_a);
+my $user_a_equiv_group = RT::Group->new($user_a);
+$user_a_equiv_group->LoadACLEquivalenceGroup($user_a->PrincipalObj);
+ok ($user_a_equiv_group->Id, "Loaded the user A acl equivalence group");
+my $user_b_equiv_group = RT::Group->new($user_b);
+$user_b_equiv_group->LoadACLEquivalenceGroup($user_b->PrincipalObj);
+ok ($user_b_equiv_group->Id, "Loaded the user B acl equivalence group");
+$own_ticket_ace->LoadByValues( PrincipalType => 'Group', PrincipalId => $user_a_equiv_group->PrincipalId, Object=>$q, RightName => 'OwnTicket');
+
+ok ($own_ticket_ace->Id, "Found the ACE we want to test with for now");
+
+
+($val, $msg) = $own_ticket_ace->Delegate(PrincipalId => $a_delegates->PrincipalId)  ;
+ok( !$val ,"user a tries and fails to delegate the right 'ownticket' in queue 'DelegationTest' to personal group 'delegates' - $msg");
+
+
+($val, $msg) = $user_a->PrincipalObj->GrantRight( Right => 'DelegateRights');
+ok($val, "user a is granted the right to 'delegate rights' - $msg");
+
+ok($user_a->HasRight( Object => $RT::System, Right => 'DelegateRights')    ,"user a has the right 'AdminOwnPersonalGroups' directly");
+
+($val, $msg) = $own_ticket_ace->Delegate(PrincipalId => $a_delegates->PrincipalId) ;
+
+ok( $val    ,"user a tries and succeeds to delegate the right 'ownticket' in queue 'DelegationTest' to personal group 'delegates' - $msg");
+ok(  $user_b->HasRight(Right => 'OwnTicket', Object => $q)  ,"user b has the right to own tickets in queue 'DelegationTest'");
+my $delegated_ace = RT::ACE->new($user_a);
+$delegated_ace->LoadByValues ( Object => $q, RightName => 'OwnTicket', PrincipalType => 'Group',
+PrincipalId => $a_delegates->PrincipalId, DelegatedBy => $user_a->PrincipalId, DelegatedFrom => $own_ticket_ace->Id);
+ok ($delegated_ace->Id, "Found the delegated ACE");
+
+ok(    $a_delegates->DeleteMember($user_b->PrincipalId)  ,"user a removes b from pg 'delegates'");
+ok(  !$user_b->HasRight(Right => 'OwnTicket', Object => $q)  ,"user b does not have the right to own tickets in queue 'DelegationTest'");
+ok(  $a_delegates->AddMember($user_b->PrincipalId)    ,"user a adds user b to personal group 'delegates'");
+ok(   $user_b->HasRight(Right => 'OwnTicket', Object=> $q) ,"user b has the right to own tickets in queue 'DelegationTest'");
+ok(   $delegated_ace->Delete ,"user a revokes pg 'delegates' right to 'OwnTickets' in queue 'DelegationTest'");
+ok( ! $user_b->HasRight(Right => 'OwnTicket', Object => $q)   ,"user b does not have the right to own tickets in queue 'DelegationTest'");
+
+($val, $msg) = $own_ticket_ace->Delegate(PrincipalId => $a_delegates->PrincipalId)  ;
+ok(  $val  ,"user a delegates pg 'delegates' right to 'OwnTickets' in queue 'DelegationTest' - $msg");
+
+ok( $user_a->HasRight(Right => 'OwnTicket', Object => $q)    ,"user a does not have the right to own tickets in queue 'DelegationTest'");
+
+($val, $msg) = $user_a->PrincipalObj->RevokeRight(Object=>$q, Right => 'OwnTicket');
+ok($val, "Revoked user a's right to own tickets in queue 'DelegationTest". $msg);
+
+ok( !$user_a->HasRight(Right => 'OwnTicket', Object => $q)    ,"user a does not have the right to own tickets in queue 'DelegationTest'");
+
+ ok( !$user_b->HasRight(Right => 'OwnTicket', Object => $q)   ,"user b does not have the right to own tickets in queue 'DelegationTest'");
+
+($val, $msg) = $user_a->PrincipalObj->GrantRight(Object=>$q, Right => 'OwnTicket');
+ok($val, $msg);
+
+ ok( $user_a->HasRight(Right => 'OwnTicket', Object => $q)   ,"user a has the right to own tickets in queue 'DelegationTest'");
+
+ ok(  !$user_b->HasRight(Right => 'OwnTicket', Object => $q)  ,"user b does not have the right to own tickets in queue 'DelegationTest'");
+
+# {{{ get back to a known clean state 
+($val, $msg) = $user_a->PrincipalObj->RevokeRight( Object => $q, Right => 'OwnTicket');
+ok($val, "Revoked user a's right to own tickets in queue 'DelegationTest -". $msg);
+ok( !$user_a->HasRight(Right => 'OwnTicket', Object => $q)    ,"make sure that user a can't own tickets in queue 'DelegationTest'");
+# }}}
+
+
+# {{{ Set up some groups and membership
+my $del1 = RT::Group->new($RT::SystemUser);
+($val, $msg) = $del1->CreateUserDefinedGroup(Name => 'Del1');
+ok( $val   ,"create a group del1 - $msg");
+
+my $del2 = RT::Group->new($RT::SystemUser);
+($val, $msg) = $del2->CreateUserDefinedGroup(Name => 'Del2');
+ok( $val   ,"create a group del2 - $msg");
+($val, $msg) = $del1->AddMember($del2->PrincipalId);
+ok( $val,"make del2 a member of del1 - $msg");
+
+my $del2a = RT::Group->new($RT::SystemUser);
+($val, $msg) = $del2a->CreateUserDefinedGroup(Name => 'Del2a');
+ok( $val   ,"create a group del2a - $msg");
+($val, $msg) = $del2->AddMember($del2a->PrincipalId);  
+ok($val    ,"make del2a a member of del2 - $msg");
+
+my $del2b = RT::Group->new($RT::SystemUser);
+($val, $msg) = $del2b->CreateUserDefinedGroup(Name => 'Del2b');
+ok( $val   ,"create a group del2b - $msg");
+($val, $msg) = $del2->AddMember($del2b->PrincipalId);  
+ok($val    ,"make del2b a member of del2 - $msg");
+
+($val, $msg) = $del2->AddMember($user_a->PrincipalId) ;
+ok($val,"make 'user a' a member of del2 - $msg");
+
+($val, $msg) = $del2b->AddMember($user_a->PrincipalId) ;
+ok($val,"make 'user a' a member of del2b - $msg");
+
+# }}}
+
+# {{{ Grant a right to a group and make sure that a submember can delegate the right and that it does not get yanked
+# when a user is removed as a submember, when they're a sumember through another path 
+($val, $msg) = $del1->PrincipalObj->GrantRight( Object=> $q, Right => 'OwnTicket');
+ok( $val   ,"grant del1  the right to 'OwnTicket' in queue 'DelegationTest' - $msg");
+
+ok(  $user_a->HasRight(Right => 'OwnTicket', Object => $q)  ,"make sure that user a can own tickets in queue 'DelegationTest'");
+
+my $group_ace= RT::ACE->new($user_a);
+$group_ace->LoadByValues( PrincipalType => 'Group', PrincipalId => $del1->PrincipalId, Object => $q, RightName => 'OwnTicket');
+
+ok ($group_ace->Id, "Found the ACE we want to test with for now");
+
+($val, $msg) = $group_ace->Delegate(PrincipalId => $a_delegates->PrincipalId);
+
+ok( $val   ,"user a tries and succeeds to delegate the right 'ownticket' in queue 'DelegationTest' to personal group 'delegates' - $msg");
+ok(  $user_b->HasRight(Right => 'OwnTicket', Object => $q)  ,"user b has the right to own tickets in queue 'DelegationTest'");
+
+
+($val, $msg) = $del2b->DeleteMember($user_a->PrincipalId);
+ok( $val   ,"remove user a from group del2b - $msg");
+ok(  $user_a->HasRight(Right => 'OwnTicket', Object => $q)  ,"user a has the right to own tickets in queue 'DelegationTest'");
+ok( $user_b->HasRight(Right => 'OwnTicket', Object => $q)    ,"user b has the right to own tickets in queue 'DelegationTest'");
+
+# }}}
+
+# {{{ When a  user is removed froom a group by the only path they're in there by, make sure the delegations go away
+($val, $msg) = $del2->DeleteMember($user_a->PrincipalId);
+ok( $val   ,"remove user a from group del2 - $msg");
+ok(  !$user_a->HasRight(Right => 'OwnTicket', Object => $q)  ,"user a does not have the right to own tickets in queue 'DelegationTest' ");
+ok(  !$user_b->HasRight(Right => 'OwnTicket', Object => $q)  ,"user b does not have the right to own tickets in queue 'DelegationTest' ");
+# }}}
+
+($val, $msg) = $del2->AddMember($user_a->PrincipalId);
+ok( $val   ,"make user a a member of group del2 - $msg");
+
+($val, $msg) = $del2->PrincipalObj->GrantRight(Object=>$q, Right => 'OwnTicket');
+ok($val, "grant the right 'own tickets' in queue 'DelegationTest' to group del2 - $msg");
+
+my $del2_right = RT::ACE->new($user_a);
+$del2_right->LoadByValues( PrincipalId => $del2->PrincipalId, PrincipalType => 'Group', Object => $q, RightName => 'OwnTicket');
+ok ($del2_right->Id, "Found the right");
+
+($val, $msg) = $del2_right->Delegate(PrincipalId => $a_delegates->PrincipalId);
+ok( $val   ,"user a tries and succeeds to delegate the right 'ownticket' in queue 'DelegationTest' gotten via del2 to personal group 'delegates' - $msg");
+
+# They have it via del1 and del2
+ok( $user_a->HasRight(Right => 'OwnTicket', Object => $q)   ,"user b has the right to own tickets in queue 'DelegationTest'");
+
+
+($val, $msg) = $del2->PrincipalObj->RevokeRight(Object=>$q, Right => 'OwnTicket');
+ok($val, "revoke the right 'own tickets' in queue 'DelegationTest' to group del2 - $msg");
+ok(  $user_a->HasRight(Right => 'OwnTicket', Object => $q)  ,"user a does has the right to own tickets in queue 'DelegationTest' via del1");
+ok(  !$user_b->HasRight(Right => 'OwnTicket', Object => $q)   ,"user b does not have the right to own tickets in queue 'DelegationTest'");
+
+($val, $msg) = $del2->PrincipalObj->GrantRight(Object=>$q, Right => 'OwnTicket');
+ok($val, "grant the right 'own tickets' in queue 'DelegationTest' to group del2 - $msg");
+
+
+$group_ace= RT::ACE->new($user_a);
+$group_ace->LoadByValues( PrincipalType => 'Group', PrincipalId => $del1->PrincipalId, Object=>$q, RightName => 'OwnTicket');
+
+ok ($group_ace->Id, "Found the ACE we want to test with for now");
+
+($val, $msg) = $group_ace->Delegate(PrincipalId => $a_delegates->PrincipalId);
+
+ok( $val   ,"user a tries and succeeds to delegate the right 'ownticket' in queue 'DelegationTest' to personal group 'delegates' - $msg");
+
+ok( $user_b->HasRight(Right => 'OwnTicket', Object => $q)    ,"user b has the right to own tickets in queue 'DelegationTest'");
+
+($val, $msg) = $del2->DeleteMember($user_a->PrincipalId);
+ok( $val   ,"remove user a from group del2 - $msg");
+
+ok(  !$user_a->HasRight(Right => 'OwnTicket', Object => $q)  ,"user a does not have the right to own tickets in queue 'DelegationTest'");
+
+ok(  !$user_b->HasRight(Right => 'OwnTicket', Object => $q)   ,"user b does not have the right to own tickets in queue 'DelegationTest'");
+
+
+
+=end testing
+
+=cut
+
+sub Delegate {
+    my $self = shift;
+    my %args = ( PrincipalId => undef,
+                 @_ );
+
+    unless ( $self->Id ) {
+        return ( 0, $self->loc("Right not loaded.") );
+    }
+    my $princ_obj;
+    ( $princ_obj, $args{'PrincipalType'} ) =
+      $self->_CanonicalizePrincipal( $args{'PrincipalId'},
+                                     $args{'PrincipalType'} );
+
+    unless ( $princ_obj->id ) {
+        return ( 0,
+                 $self->loc( 'Principal [_1] not found.', $args{'PrincipalId'} )
+        );
+    }
+
+    # }}}
+
+    # {{{ Check the ACL
+
+    # First, we check to se if the user is delegating rights and
+    # they have the permission to
+    unless ( $self->CurrentUser->HasRight(Right => 'DelegateRights', Object => $self->Object) ) {
+        return ( 0, $self->loc("Permission Denied") );
+    }
+
+    unless ( $self->PrincipalObj->IsGroup ) {
+        return ( 0, $self->loc("System Error") );
+    }
+    unless ( $self->PrincipalObj->Object->HasMemberRecursively(
+                                                $self->CurrentUser->PrincipalObj
+             )
+      ) {
+        return ( 0, $self->loc("Permission Denied") );
+    }
+
+    # }}}
+
+    my $concurrency_check = RT::ACE->new($RT::SystemUser);
+    $concurrency_check->Load( $self->Id );
+    unless ( $concurrency_check->Id ) {
+        $RT::Logger->crit(
+                   "Trying to delegate a right which had already been deleted");
+        return ( 0, $self->loc('Permission Denied') );
+    }
+
+    my $delegated_ace = RT::ACE->new( $self->CurrentUser );
+
+    # Make sure the right doesn't already exist.
+    $delegated_ace->LoadByCols( PrincipalId   => $princ_obj->Id,
+                                PrincipalType => 'Group',
+                                RightName     => $self->__Value('RightName'),
+                                ObjectType    => $self->__Value('ObjectType'),
+                                ObjectId      => $self->__Value('ObjectId'),
+                                DelegatedBy => $self->CurrentUser->PrincipalId,
+                                DelegatedFrom => $self->id );
+    if ( $delegated_ace->Id ) {
+        return ( 0, $self->loc('That principal already has that right') );
+    }
+    my $id = $delegated_ace->SUPER::Create(
+        PrincipalId   => $princ_obj->Id,
+        PrincipalType => 'Group',          # do we want to hardcode this?
+        RightName     => $self->__Value('RightName'),
+        ObjectType    => $self->__Value('ObjectType'),
+        ObjectId      => $self->__Value('ObjectId'),
+        DelegatedBy   => $self->CurrentUser->PrincipalId,
+        DelegatedFrom => $self->id );
+
+    #Clear the key cache. TODO someday we may want to just clear a little bit of the keycache space. 
+    # TODO what about the groups key cache?
+    RT::Principal->_InvalidateACLCache();
+
+    if ( $id > 0 ) {
+        return ( $id, $self->loc('Right Delegated') );
+    }
+    else {
+        return ( 0, $self->loc('System error. Right not delegated.') );
+    }
+}
+
+# }}}
+
+# {{{ sub Delete 
+
+=head2 Delete { InsideTransaction => undef}
+
+Delete this object. This method should ONLY ever be called from RT::User or RT::Group (or from itself)
+If this is being called from within a transaction, specify a true value for the parameter InsideTransaction.
+Really, DBIx::SearchBuilder should use and/or fake subtransactions
+
+This routine will also recurse and delete any delegations of this right
+
+=cut
+
+sub Delete {
+    my $self = shift;
+
+    unless ( $self->Id ) {
+        return ( 0, $self->loc('Right not loaded.') );
+    }
+
+    # A user can delete an ACE if the current user has the right to modify it and it's not a delegated ACE
+    # or if it's a delegated ACE and it was delegated by the current user
+    unless (
+         (    $self->CurrentUser->HasRight(Right => 'ModifyACL', Object => $self->Object)
+           && $self->__Value('DelegatedBy') == 0 )
+         || ( $self->__Value('DelegatedBy') == $self->CurrentUser->PrincipalId )
+      ) {
+        return ( 0, $self->loc('Permission Denied') );
+    }
+    $self->_Delete(@_);
+}
+
+# Helper for Delete with no ACL check
+sub _Delete {
+    my $self = shift;
+    my %args = ( InsideTransaction => undef,
+                 @_ );
+
+    my $InsideTransaction = $args{'InsideTransaction'};
+
+    $RT::Handle->BeginTransaction() unless $InsideTransaction;
+
+    my $delegated_from_this = RT::ACL->new($RT::SystemUser);
+    $delegated_from_this->Limit( FIELD    => 'DelegatedFrom',
+                                 OPERATOR => '=',
+                                 VALUE    => $self->Id );
+
+    my $delete_succeeded = 1;
+    my $submsg;
+    while ( my $delegated_ace = $delegated_from_this->Next ) {
+        ( $delete_succeeded, $submsg ) =
+          $delegated_ace->_Delete( InsideTransaction => 1 );
+        last if ($delete_succeeded);
+    }
+
+    unless ($delete_succeeded) {
+        $RT::Handle->Rollback() unless $InsideTransaction;
+        return ( 0, $self->loc('Right could not be revoked') );
+    }
+
+    my ( $val, $msg ) = $self->SUPER::Delete(@_);
+
+    #Clear the key cache. TODO someday we may want to just clear a little bit of the keycache space. 
+    # TODO what about the groups key cache?
+    RT::Principal->_InvalidateACLCache();
+
+    if ($val) {
+        $RT::Handle->Commit() unless $InsideTransaction;
+        return ( $val, $self->loc('Right revoked') );
+    }
+    else {
+        $RT::Handle->Rollback() unless $InsideTransaction;
+        return ( 0, $self->loc('Right could not be revoked') );
+    }
+}
+
+# }}}
+
+# {{{ sub _BootstrapCreate 
+
+=head2 _BootstrapCreate
+
+Grant a right with no error checking and no ACL. this is _only_ for 
+installation. If you use this routine without the author's explicit 
+written approval, he will hunt you down and make you spend eternity
+translating mozilla's code into FORTRAN or intercal.
+
+If you think you need this routine, you've mistaken. 
+
+=cut
+
+sub _BootstrapCreate {
+    my $self = shift;
+    my %args = (@_);
+
+    # When bootstrapping, make sure we get the _right_ users
+    if ( $args{'UserId'} ) {
+        my $user = RT::User->new( $self->CurrentUser );
+        $user->Load( $args{'UserId'} );
+        delete $args{'UserId'};
+        $args{'PrincipalId'}   = $user->PrincipalId;
+        $args{'PrincipalType'} = 'User';
+    }
+
+    my $id = $self->SUPER::Create(%args);
+
+    if ( $id > 0 ) {
+        return ($id);
+    }
+    else {
+        $RT::Logger->err('System error. right not granted.');
+        return (undef);
+    }
+
+}
+
+# }}}
+
+# {{{ sub CanonicalizeRightName
+
+=head2 CanonicalizeRightName <RIGHT>
+
+Takes a queue or system right name in any case and returns it in
+the correct case. If it's not found, will return undef.
+
+=cut
+
+sub CanonicalizeRightName {
+    my $self  = shift;
+    my $right = shift;
+    $right = lc $right;
+    if ( exists $LOWERCASERIGHTNAMES{"$right"} ) {
+        return ( $LOWERCASERIGHTNAMES{"$right"} );
+    }
+    else {
+        return (undef);
+    }
+}
+
+# }}}
+
+
+# {{{ sub Object
+
+=head2 Object
+
+If the object this ACE applies to is a queue, returns the queue object. 
+If the object this ACE applies to is a group, returns the group object. 
+If it's the system object, returns undef. 
+
+If the user has no rights, returns undef.
+
+=cut
+
+
+
+
+sub Object {
+    my $self = shift;
+
+    my $appliesto_obj;
+
+    if ($self->__Value('ObjectType') && $OBJECT_TYPES{$self->__Value('ObjectType')} ) {
+        $appliesto_obj =  $self->__Value('ObjectType')->new($self->CurrentUser);
+        unless (ref( $appliesto_obj) eq $self->__Value('ObjectType')) {
+            return undef;
+        }
+        $appliesto_obj->Load( $self->__Value('ObjectId') );
+        return ($appliesto_obj);
+     }
+    else {
+        $RT::Logger->warning( "$self -> Object called for an object "
+                              . "of an unknown type:"
+                              . $self->ObjectType );
+        return (undef);
+    }
+}
+
+# }}}
+
+# {{{ sub PrincipalObj
+
+=head2 PrincipalObj
+
+Returns the RT::Principal object for this ACE. 
+
+=cut
+
+sub PrincipalObj {
+    my $self = shift;
+
+    my $princ_obj = RT::Principal->new( $self->CurrentUser );
+    $princ_obj->Load( $self->__Value('PrincipalId') );
+
+    unless ( $princ_obj->Id ) {
+        $RT::Logger->err(
+                   "ACE " . $self->Id . " couldn't load its principal object" );
+    }
+    return ($princ_obj);
+
+}
+
+# }}}
+
+# {{{ ACL related methods
+
+# {{{ sub _Set
+
+sub _Set {
+    my $self = shift;
+    return ( 0, $self->loc("ACEs can only be created and deleted.") );
+}
+
+# }}}
+
+# {{{ sub _Value
+
+sub _Value {
+    my $self = shift;
+
+    if ( $self->__Value('DelegatedBy') eq $self->CurrentUser->PrincipalId ) {
+        return ( $self->__Value(@_) );
+    }
+    elsif ( $self->PrincipalObj->IsGroup
+            && $self->PrincipalObj->Object->HasMemberRecursively(
+                                                $self->CurrentUser->PrincipalObj
+            )
+      ) {
+        return ( $self->__Value(@_) );
+    }
+    elsif ( $self->CurrentUser->HasRight(Right => 'ShowACL', Object => $self->Object) ) {
+        return ( $self->__Value(@_) );
+    }
+    else {
+        return undef;
+    }
+}
+
+# }}}
+
+
+# }}}
+
+# {{{ _CanonicalizePrincipal 
+
+=head2 _CanonicalizePrincipal (PrincipalId, PrincipalType)
+
+Takes a principal id and a principal type.
+
+If the principal is a user, resolves it to the proper acl equivalence group.
+Returns a tuple of  (RT::Principal, PrincipalType)  for the principal we really want to work with
+
+=cut
+
+sub _CanonicalizePrincipal {
+    my $self       = shift;
+    my $princ_id   = shift;
+    my $princ_type = shift;
+
+    my $princ_obj = RT::Principal->new($RT::SystemUser);
+    $princ_obj->Load($princ_id);
+
+    unless ( $princ_obj->Id ) {
+        use Carp;
+        $RT::Logger->crit(Carp::cluck);
+        $RT::Logger->crit("Can't load a principal for id $princ_id");
+        return ( $princ_obj, undef );
+    }
+
+    # Rights never get granted to users. they get granted to their 
+    # ACL equivalence groups
+    if ( $princ_type eq 'User' ) {
+        my $equiv_group = RT::Group->new( $self->CurrentUser );
+        $equiv_group->LoadACLEquivalenceGroup($princ_obj);
+        unless ( $equiv_group->Id ) {
+            $RT::Logger->crit(
+                 "No ACL equiv group for princ " . $self->__Value('ObjectId') );
+            return ( 0, $self->loc('System error. Right not granted.') );
+        }
+        $princ_obj  = $equiv_group->PrincipalObj();
+        $princ_type = 'Group';
+
+    }
+    return ( $princ_obj, $princ_type );
+}
+
+# }}}
+1;
diff --git a/rt/lib/RT/ACL.pm b/rt/lib/RT/ACL.pm
index 444a4c2af..81f59c6d0 100755
--- a/rt/lib/RT/ACL.pm
+++ b/rt/lib/RT/ACL.pm
@@ -1,308 +1,115 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/ACL.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Distributed under the terms of the GNU GPL
-# Copyright (c) 2000 Jesse Vincent <jesse@fsck.com>
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::ACL - collection of RT ACE objects
+=head1 NAME
 
+  RT::ACL -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::ACL;
-my $ACL = new RT::ACL($CurrentUser);
+  use RT::ACL
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
-=begin testing
-
-ok(require RT::TestHarness);
-ok(require RT::ACL);
-
-=end testing
-
 =cut
 
 package RT::ACL;
-use RT::EasySearch;
-use RT::ACE;
-@ISA= qw(RT::EasySearch);
-
-# {{{ sub _Init 
-sub _Init  {
-  my $self = shift;
-  $self->{'table'} = "ACL";
-  $self->{'primary_key'} = "id";
-  return ( $self->SUPER::_Init(@_));
-  
-}
-# }}}
-
-# {{{ sub NewItem 
-sub NewItem  {
-  my $self = shift;
-  return(RT::ACE->new($self->CurrentUser));
-}
-# }}}
-
-=head2 Next
-
-Hand out the next ACE that was found
-
-=cut
-
-# {{{ sub Next 
-sub Next {
-    my $self = shift;
-    
-    my $ACE = $self->SUPER::Next();
-    if ((defined($ACE)) and (ref($ACE))) {
-	
-	if ( $ACE->CurrentUserHasRight('ShowACL') or
-	     $ACE->CurrentUserHasRight('ModifyACL')
-	   ) {
-	    return($ACE);
-	}
-	
-	#If the user doesn't have the right to show this ACE
-	else {	
-	    return($self->Next());
-	}
-    }
-    #if there never was any ACE
-    else {
-	return(undef);
-    }	
-    
-}
 
-# }}}
-
-
-=head1 Limit the ACL to a specific scope
-
-There are two real scopes right now:
-
-=item Queue is for rights that apply to a single queue
-
-=item System is for rights that apply to the System (rights that aren't queue related)
-
-
-=head2 LimitToQueue
-
-Takes a single queueid as its argument.
+use RT::SearchBuilder;
+use RT::ACE;
 
-Limit the ACL to just a given queue when supplied with an integer queue id.
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-=cut
 
-sub LimitToQueue {
+sub _Init {
     my $self = shift;
-    my $queue = shift;
-    
-    
-    
-    $self->Limit( FIELD =>'RightScope',
-		  ENTRYAGGREGATOR => 'OR',
-		  VALUE => 'Queue');
-    $self->Limit( FIELD =>'RightScope',
-		  ENTRYAGGREGATOR => 'OR',
-		VALUE => 'Ticket');
-    
-    $self->Limit(ENTRYAGGREGATOR => 'OR',
-		 FIELD => 'RightAppliesTo',
-		 VALUE => $queue );
-  
-}
-
-
-=head2 LimitToSystem()
-
-Limit the ACL to system rights
-
-=cut 
-
-sub LimitToSystem {
-  my $self = shift;
-  
-  $self->Limit( FIELD =>'RightScope',
-		VALUE => 'System');
-}
-
-
-=head2 LimitRightTo
-
-Takes a single RightName as its only argument.
-Limits the search to the right $right.
-$right is a right listed in perldoc RT::ACE
-
-=cut
-
-sub LimitRightTo {
-  my $self = shift;
-  my $right = shift;
-  
-  $self->Limit(ENTRYAGGREGATOR => 'OR',
-	       FIELD => 'RightName',
-	       VALUE => $right );
-  
-}
-
-=head1 Limit to a specifc set of principals
-
-=head2 LimitPrincipalToUser
-
-Takes a single userid as its only argument.
-Limit the ACL to a just a specific user.
-
-=cut
-
-sub LimitPrincipalToUser {
-  my $self = shift;
-  my $user = shift;
-  
-  $self->Limit(ENTRYAGGREGATOR => 'OR',
-	       FIELD => 'PrincipalType',
-	       VALUE => 'User' );
-  
-  $self->Limit(ENTRYAGGREGATOR => 'OR',
-	       FIELD => 'PrincipalId',
-	       VALUE => $user );
-  
-}
-
+    $self->{'table'} = 'ACL';
+    $self->{'primary_key'} = 'id';
 
-=head2 LimitPrincipalToGroup
-
-Takes a single group as its only argument.
-Limit the ACL to just a specific group.
-
-=cut
-  
-sub LimitPrincipalToGroup {
-  my $self = shift;
-  my $group = shift;
-  
-  $self->Limit(ENTRYAGGREGATOR => 'OR',
-	       FIELD => 'PrincipalType',
-	       VALUE => 'Group' );
-
-  $self->Limit(ENTRYAGGREGATOR => 'OR',
-	       FIELD => 'PrincipalId',
-	       VALUE => $group );
 
+    return ( $self->SUPER::_Init(@_) );
 }
 
-=head2 LimitPrincipalToType($type)
 
-Takes a single argument, $type.
-Limit the ACL to just a specific principal type
+=item NewItem
 
-$type is one of:
-  TicketOwner
-  TicketRequestor
-  TicketCc
-  TicketAdminCc
-  Everyone
-  User
-  Group
+Returns an empty new RT::ACE item
 
 =cut
 
-sub LimitPrincipalToType {
-  my $self=shift;
-  my $type=shift;  
-  $self->Limit(ENTRYAGGREGATOR => 'OR',
-		FIELD => 'PrincipalType',
-		VALUE => $type );
+sub NewItem {
+    my $self = shift;
+    return(RT::ACE->new($self->CurrentUser));
 }
 
+        eval "require RT::ACL_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/ACL_Overlay.pm}) {
+            die $@;
+        };
 
-=head2 LimitPrincipalToId 
+        eval "require RT::ACL_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/ACL_Vendor.pm}) {
+            die $@;
+        };
 
-Takes a single argument, the numeric Id of the principal to limit this ACL to. Repeated calls to this 
-function will broaden the scope of the search to include all principals listed.
-
-=cut
-
-sub LimitPrincipalToId {
-    my $self = shift;
-    my $id = shift;
-
-    if ($id =~ /^\d+$/) {
-	$self->Limit(ENTRYAGGREGATOR => 'OR',
-		     FIELD => 'PrincipalId',
-		     VALUE => $id );
-    }
-    else {
-	$RT::Logger->warn($self."->LimitPrincipalToId called with '$id' as an id");
-	return undef;
-    }
-}
+        eval "require RT::ACL_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/ACL_Local.pm}) {
+            die $@;
+        };
 
 
-#wrap around _DoSearch  so that we can build the hash of returned
-#values 
-sub _DoSearch {
-    my $self = shift;
-   # $RT::Logger->debug("Now in ".$self."->_DoSearch");
-    my $return = $self->SUPER::_DoSearch(@_);
-  #  $RT::Logger->debug("In $self ->_DoSearch. return from SUPER::_DoSearch was $return\n");
-    $self->_BuildHash();
-    return ($return);
-}
 
 
-#Build a hash of this ACL's entries.
-sub _BuildHash {
-    my $self = shift;
+=head1 SEE ALSO
 
-    while (my $entry = $self->Next) {
-       my $hashkey = $entry->RightScope . "-" .
-                             $entry->RightAppliesTo . "-" . 
-                             $entry->RightName . "-" .
-                             $entry->PrincipalId . "-" .
-                             $entry->PrincipalType;
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
-        $self->{'as_hash'}->{"$hashkey"} =1;
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-    }
-}
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
+   no warnings qw(redefine);
 
-# {{{ HasEntry
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
-=head2 HasEntry
+RT::ACL_Overlay, RT::ACL_Vendor, RT::ACL_Local
 
 =cut
 
-sub HasEntry {
-
-    my $self = shift;
-    my %args = ( RightScope => undef,
-                 RightAppliesTo => undef,
-                 RightName => undef,
-                 PrincipalId => undef,
-                 PrincipalType => undef,
-                 @_ );
-
-    #if we haven't done the search yet, do it now.
-    $self->_DoSearch();
-
-    if ($self->{'as_hash'}->{ $args{'RightScope'} . "-" .
-			      $args{'RightAppliesTo'} . "-" . 
-			      $args{'RightName'} . "-" .
-			      $args{'PrincipalId'} . "-" .
-			      $args{'PrincipalType'}
-                            } == 1) {
-	return(1);
-    }
-    else {
-	return(undef);
-    }
-}
 
-# }}}
 1;
diff --git a/rt/lib/RT/ACL_Overlay.pm b/rt/lib/RT/ACL_Overlay.pm
new file mode 100644
index 000000000..977577697
--- /dev/null
+++ b/rt/lib/RT/ACL_Overlay.pm
@@ -0,0 +1,295 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::ACL - collection of RT ACE objects
+
+=head1 SYNOPSIS
+
+  use RT::ACL;
+my $ACL = new RT::ACL($CurrentUser);
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing
+
+ok(require RT::ACL);
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+
+=head2 Next
+
+Hand out the next ACE that was found
+
+=cut
+
+
+# {{{ LimitToObject 
+
+=head2 LimitToObject $object
+
+Limit the ACL to rights for the object $object. It needs to be an RT::Record class.
+
+=cut
+
+sub LimitToObject {
+    my $self = shift;
+    my $obj = shift;
+    unless (defined($obj) && ref($obj) && UNIVERSAL::can($obj, 'id')) {
+    return undef;
+    }
+    $self->Limit(FIELD => 'ObjectType', OPERATOR=> '=', VALUE => ref($obj), ENTRYAGGREGATOR => 'OR');
+    $self->Limit(FIELD => 'ObjectId', OPERATOR=> '=', VALUE => $obj->id, ENTRYAGGREGATOR => 'OR', QUOTEVALUE => 0);
+
+}
+
+# }}}
+
+# {{{ LimitToPrincipal 
+
+=head2 LimitToPrincipal { Type => undef, Id => undef, IncludeGroupMembership => undef }
+
+Limit the ACL to the principal with PrincipalId Id and PrincipalType Type
+
+Id is not optional.
+Type is.
+
+if IncludeGroupMembership => 1 is specified, ACEs which apply to the principal due to group membership will be included in the resultset.
+
+
+=cut
+
+sub LimitToPrincipal {
+    my $self = shift;
+    my %args = ( Type                               => undef,
+                 Id                                 => undef,
+                 IncludeGroupMembership => undef,
+                 @_ );
+    if ( $args{'IncludeGroupMembership'} ) {
+        my $cgm = $self->NewAlias('CachedGroupMembers');
+        $self->Join( ALIAS1 => 'main',
+                     FIELD1 => 'PrincipalId',
+                     ALIAS2 => $cgm,
+                     FIELD2 => 'GroupId' );
+        $self->Limit( ALIAS           => $cgm,
+                      FIELD           => 'MemberId',
+                      OPERATOR        => '=',
+                      VALUE           => $args{'Id'},
+                      ENTRYAGGREGATOR => 'OR' );
+    }
+    else {
+        if ( defined $args{'Type'} ) {
+            $self->Limit( FIELD           => 'PrincipalType',
+                          OPERATOR        => '=',
+                          VALUE           => $args{'Type'},
+                          ENTRYAGGREGATOR => 'OR' );
+        }
+    # if the principal id points to a user, we really want to point
+    # to their ACL equivalence group. The machinations we're going through
+    # lead me to start to suspect that we really want users and groups
+    # to just be the same table. or _maybe_ that we want an object db.
+    my $princ = RT::Principal->new($RT::SystemUser);
+    $princ->Load($args{'PrincipalId'});
+    if ($princ->PrincipalType eq 'User') {
+    my $group = RT::Group->new($RT::SystemUser);
+        $group->LoadACLEquivalenceGroup($princ);
+        $args{'PrincipalId'} = $group->PrincipalId;
+    }
+        $self->Limit( FIELD           => 'PrincipalId',
+                      OPERATOR        => '=',
+                      VALUE           => $args{'Id'},
+                      ENTRYAGGREGATOR => 'OR' );
+    }
+}
+
+# }}}
+
+
+
+# {{{ ExcludeDelegatedRights
+
+=head2 ExcludeDelegatedRights 
+
+Don't list rights which have been delegated.
+
+=cut
+
+sub ExcludeDelegatedRights {
+    my $self = shift;
+    $self->DelegatedBy(Id => 0);
+    $self->DelegatedFrom(Id => 0);
+}
+# }}}
+
+# {{{ DelegatedBy 
+
+=head2 DelegatedBy { Id => undef }
+
+Limit the ACL to rights delegated by the principal whose Principal Id is
+B<Id>
+
+Id is not optional.
+
+=cut
+
+sub DelegatedBy {
+    my $self = shift;
+    my %args = (
+        Id => undef,
+        @_
+    );
+    $self->Limit(
+        FIELD           => 'DelegatedBy',
+        OPERATOR        => '=',
+        VALUE           => $args{'Id'},
+        ENTRYAGGREGATOR => 'OR'
+    );
+
+}
+
+# }}}
+
+# {{{ DelegatedFrom 
+
+=head2 DelegatedFrom { Id => undef }
+
+Limit the ACL to rights delegate from the ACE which has the Id specified 
+by the Id parameter.
+
+Id is not optional.
+
+=cut
+
+sub DelegatedFrom {
+    my $self = shift;
+    my %args = (
+                 Id => undef,
+                 @_);
+    $self->Limit(FIELD => 'DelegatedFrom', OPERATOR=> '=', VALUE => $args{'Id'}, ENTRYAGGREGATOR => 'OR');
+
+}
+
+# }}}
+
+
+# {{{ sub Next 
+sub Next {
+    my $self = shift;
+
+    my $ACE = $self->SUPER::Next();
+    if ( ( defined($ACE) ) and ( ref($ACE) ) ) {
+
+        if ( $self->CurrentUser->HasRight( Right  => 'ShowACL',
+                                           Object => $ACE->Object )
+             or $self->CurrentUser->HasRight( Right  => 'ModifyACL',
+                                              Object => $ACE->Object )
+          ) {
+            return ($ACE);
+        }
+
+        #If the user doesn't have the right to show this ACE
+        else {
+            return ( $self->Next() );
+        }
+    }
+
+    #if there never was any ACE
+    else {
+        return (undef);
+    }
+
+}
+
+# }}}
+
+
+
+#wrap around _DoSearch  so that we can build the hash of returned
+#values 
+sub _DoSearch {
+    my $self = shift;
+   # $RT::Logger->debug("Now in ".$self."->_DoSearch");
+    my $return = $self->SUPER::_DoSearch(@_);
+  #  $RT::Logger->debug("In $self ->_DoSearch. return from SUPER::_DoSearch was $return\n");
+    $self->_BuildHash();
+    return ($return);
+}
+
+
+#Build a hash of this ACL's entries.
+sub _BuildHash {
+    my $self = shift;
+
+    while (my $entry = $self->Next) {
+       my $hashkey = $entry->ObjectType . "-" .  $entry->ObjectId . "-" .  $entry->RightName . "-" .  $entry->PrincipalId . "-" .  $entry->PrincipalType;
+
+        $self->{'as_hash'}->{"$hashkey"} =1;
+
+    }
+}
+
+
+# {{{ HasEntry
+
+=head2 HasEntry
+
+=cut
+
+sub HasEntry {
+
+    my $self = shift;
+    my %args = ( RightScope => undef,
+                 RightAppliesTo => undef,
+                 RightName => undef,
+                 PrincipalId => undef,
+                 PrincipalType => undef,
+                 @_ );
+
+    #if we haven't done the search yet, do it now.
+    $self->_DoSearch();
+
+    if ($self->{'as_hash'}->{ $args{'RightScope'} . "-" .
+			      $args{'RightAppliesTo'} . "-" . 
+			      $args{'RightName'} . "-" .
+			      $args{'PrincipalId'} . "-" .
+			      $args{'PrincipalType'}
+                            } == 1) {
+	return(1);
+    }
+    else {
+	return(undef);
+    }
+}
+
+# }}}
+1;
diff --git a/rt/lib/RT/Action/AutoOpen.pm b/rt/lib/RT/Action/AutoOpen.pm
new file mode 100644
index 000000000..ea6da1952
--- /dev/null
+++ b/rt/lib/RT/Action/AutoOpen.pm
@@ -0,0 +1,86 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# This Action will open the BASE if a dependent is resolved.
+
+package RT::Action::AutoOpen;
+require RT::Action::Generic;
+
+use strict;
+use vars qw/@ISA/;
+@ISA=qw(RT::Action::Generic);
+
+#Do what we need to do and send it out.
+
+#What does this type of Action does
+
+# {{{ sub Describe 
+sub Describe  {
+  my $self = shift;
+  return (ref $self );
+}
+# }}}
+
+
+# {{{ sub Prepare 
+sub Prepare {
+    my $self = shift;
+
+    # if the ticket is already open or the ticket is new and the message is more mail from the
+    # requestor, don't reopen it.
+
+    if ( ( $self->TicketObj->Status eq 'open' )
+         || ( ( $self->TicketObj->Status eq 'new' )
+              && $self->TransactionObj->IsInbound )
+      ) {
+
+        return undef;
+    }
+    else {
+        return (1);
+    }
+}
+# }}}
+
+sub Commit {
+    my $self = shift;
+      my $oldstatus = $self->TicketObj->Status();
+        $self->TicketObj->__Set( Field => 'Status', Value => 'open' );
+        $self->TicketObj->_NewTransaction(
+                         Type     => 'Set',
+                         Field    => 'Status',
+                         OldValue => $oldstatus,
+                         NewValue => 'open',
+                         Data => 'Ticket auto-opened on incoming correspondence'
+        );
+
+
+    return(1);
+}
+
+eval "require RT::Action::AutoOpen_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/AutoOpen_Vendor.pm});
+eval "require RT::Action::AutoOpen_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/AutoOpen_Local.pm});
+
+1;
diff --git a/rt/lib/RT/Action/Autoreply.pm b/rt/lib/RT/Action/Autoreply.pm
index 624888e94..81f7bddfa 100755
--- a/rt/lib/RT/Action/Autoreply.pm
+++ b/rt/lib/RT/Action/Autoreply.pm
@@ -1,7 +1,31 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/Autoreply.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 package RT::Action::Autoreply;
 require RT::Action::SendEmail;
+
+use strict;
+use vars qw/@ISA/;
 @ISA = qw(RT::Action::SendEmail);
 
 
@@ -17,7 +41,7 @@ Sets the recipients of this message to this ticket's Requestor.
 sub SetRecipients {
     my $self=shift;
 
-    push(@{$self->{'To'}}, @{$self->TicketObj->Requestors->Emails});
+    push(@{$self->{'To'}}, $self->TicketObj->Requestors->MemberEmailAddresses);
     
     return(1);
 }
@@ -39,6 +63,7 @@ sub SetReturnAddress {
 		 @_
 	       );
     
+    my $replyto;
     if ($args{'is_comment'}) { 
 	$replyto = $self->TicketObj->QueueObj->CommentAddress || 
 		     $RT::CommentAddress;
@@ -49,7 +74,9 @@ sub SetReturnAddress {
     }
     
     unless ($self->TemplateObj->MIMEObj->head->get('From')) {
-	my $friendly_name=$self->TicketObj->QueueObj->Name;
+	my $friendly_name = $self->TicketObj->QueueObj->Description ||
+		$self->TicketObj->QueueObj->Name;
+	$friendly_name =~ s/"/\\"/g;
 	$self->SetHeader('From', "\"$friendly_name\" <$replyto>");
     }
     
@@ -61,4 +88,9 @@ sub SetReturnAddress {
   
 # }}}
 
+eval "require RT::Action::Autoreply_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/Autoreply_Vendor.pm});
+eval "require RT::Action::Autoreply_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/Autoreply_Local.pm});
+
 1;
diff --git a/rt/lib/RT/Action/CreateTickets.pm b/rt/lib/RT/Action/CreateTickets.pm
new file mode 100644
index 000000000..0ab206771
--- /dev/null
+++ b/rt/lib/RT/Action/CreateTickets.pm
@@ -0,0 +1,564 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+package RT::Action::CreateTickets;
+require RT::Action::Generic;
+
+use strict;
+use vars qw/@ISA/;
+@ISA = qw(RT::Action::Generic);
+
+use MIME::Entity;
+
+=head1 NAME
+
+ RT::Action::CreateTickets
+
+Create one or more tickets according to an externally supplied template.
+
+
+=head1 SYNOPSIS
+
+ ===Create-Ticket: codereview
+ Subject: Code review for {$Tickets{'TOP'}->Subject}
+ Depended-On-By: {$Tickets{'TOP'}->Id}
+ Content: Someone has created a ticket. you should review and approve it,
+ so they can finish their work
+ ENDOFCONTENT
+
+=head1 DESCRIPTION
+
+
+Using the "CreateTickets" ScripAction and mandatory dependencies, RT now has 
+the ability to model complex workflow. When a ticket is created in a queue
+that has a "CreateTickets" scripaction, that ScripAction parses its "Template"
+
+
+
+=head2 FORMAT
+
+CreateTickets uses the template as a template for an ordered set of tickets 
+to create. The basic format is as follows:
+
+
+ ===Create-Ticket: identifier
+ Param: Value
+ Param2: Value
+ Param3: Value
+ Content: Blah
+ blah
+ blah
+ ENDOFCONTENT
+ ===Create-Ticket: id2
+ Param: Value
+ Content: Blah
+ ENDOFCONTENT
+
+
+Each ===Create-Ticket: section is evaluated as its own 
+Text::Template object, which means that you can embed snippets
+of perl inside the Text::Template using {} delimiters, but that 
+such sections absolutely can not span a ===Create-Ticket boundary.
+
+After each ticket is created, it's stuffed into a hash called %Tickets
+so as to be available during the creation of other tickets during the same 
+ScripAction.  The hash is prepopulated with the ticket which triggered the 
+ScripAction as $Tickets{'TOP'}; you can also access that ticket using the
+shorthand $TOP.
+
+A simple example:
+
+ ===Create-Ticket: codereview
+ Subject: Code review for {$Tickets{'TOP'}->Subject}
+ Depended-On-By: {$Tickets{'TOP'}->Id}
+ Content: Someone has created a ticket. you should review and approve it,
+ so they can finish their work
+ ENDOFCONTENT
+
+
+
+A convoluted example
+
+ ===Create-Ticket: approval
+ { # Find out who the administrators of the group called "HR" 
+   # of which the creator of this ticket is a member
+    my $name = "HR";
+   
+    my $groups = RT::Groups->new($RT::SystemUser);
+    $groups->LimitToUserDefinedGroups();
+    $groups->Limit(FIELD => "Name", OPERATOR => "=", VALUE => "$name");
+    $groups->WithMember($TransactionObj->CreatorObj->Id);
+ 
+    my $groupid = $groups->First->Id;
+ 
+    my $adminccs = RT::Users->new($RT::SystemUser);
+    $adminccs->WhoHaveRight(
+	Right => "AdminGroup",
+	Object =>$groups->First,
+	IncludeSystemRights => undef,
+	IncludeSuperusers => 0,
+	IncludeSubgroupMembers => 0,
+    );
+ 
+     my @admins;
+     while (my $admin = $adminccs->Next) {
+         push (@admins, $admin->EmailAddress); 
+     }
+ }
+ Queue: Approvals
+ Type: Approval
+ AdminCc: {join ("\nAdminCc: ",@admins) }
+ Depended-On-By: {$Tickets{"TOP"}->Id}
+ Refers-To: {$Tickets{"TOP"}->Id}
+ Subject: Approval for ticket: {$Tickets{"TOP"}->Id} - {$Tickets{"TOP"}->Subject}
+ Due: {time + 86400}
+ Content-Type: text/plain
+ Content: Your approval is requested for the ticket {$Tickets{"TOP"}->Id}: {$Tickets{"TOP"}->Subject}
+ Blah
+ Blah
+ ENDOFCONTENT
+ ===Create-Ticket: two
+ Subject: Manager approval
+ Depended-On-By: {$Tickets{"TOP"}->Id}
+ Refers-On: {$Tickets{"approval"}->Id}
+ Queue: Approvals
+ Content-Type: text/plain
+ Content: 
+ Your approval is requred for this ticket, too.
+ ENDOFCONTENT
+ 
+=head2 Acceptable fields
+
+A complete list of acceptable fields for this beastie:
+
+
+    *  Queue           => Name or id# of a queue
+       Subject         => A text string
+     ! Status          => A valid status. defaults to 'new'
+       Due             => Dates can be specified in seconds since the epoch
+                          to be handled literally or in a semi-free textual
+                          format which RT will attempt to parse.
+                        
+                          
+                          
+       Starts          => 
+       Started         => 
+       Resolved        => 
+       Owner           => Username or id of an RT user who can and should own 
+                          this ticket
+   +   Requestor       => Email address
+   +   Cc              => Email address 
+   +   AdminCc         => Email address 
+       TimeWorked      => 
+       TimeEstimated   => 
+       TimeLeft        => 
+       InitialPriority => 
+       FinalPriority   => 
+       Type            => 
+    +! DependsOn       => 
+    +! DependedOnBy    =>
+    +! RefersTo        =>
+    +! ReferredToBy    => 
+    +! Members         =>
+    +! MemberOf        => 
+       Content         => content. Can extend to multiple lines. Everything
+                          within a template after a Content: header is treated
+                          as content until we hit a line containing only 
+                          ENDOFCONTENT
+       ContentType     => the content-type of the Content field
+       CustomField-<id#> => custom field value
+
+Fields marked with an * are required.
+
+Fields marked with a + man have multiple values, simply
+by repeating the fieldname on a new line with an additional value.
+
+Fields marked with a ! are postponed to be processed after all
+tickets in the same actions are created.  Except for 'Status', those
+field can also take a ticket name within the same action (i.e.
+the identifiers after ==Create-Ticket), instead of raw Ticket ID
+numbers.
+
+When parsed, field names are converted to lowercase and have -s stripped.
+Refers-To, RefersTo, refersto, refers-to and r-e-f-er-s-tO will all 
+be treated as the same thing.
+
+
+=begin testing
+
+ok (require RT::Action::CreateTickets);
+use_ok(RT::Scrip);
+use_ok(RT::Template);
+use_ok(RT::ScripAction);
+use_ok(RT::ScripCondition);
+use_ok(RT::Ticket);
+
+my $approvalsq = RT::Queue->new($RT::SystemUser);
+$approvalsq->Create(Name => 'Approvals');
+ok ($approvalsq->Id, "Created Approvals test queue");
+
+
+my $approvals = 
+'===Create-Ticket: approval
+{  my $name = "HR";
+     my $groups = RT::Groups->new($RT::SystemUser);
+   $groups->LimitToUserDefinedGroups();
+   $groups->Limit(FIELD => "Name", OPERATOR => "=", VALUE => "$name");
+   $groups->WithMember($Transaction->CreatorObj->Id);
+
+   my $groupid = $groups->First->Id;
+
+   my $adminccs = RT::Users->new($RT::SystemUser);
+   $adminccs->WhoHaveRight(Right => "AdminGroup", IncludeSystemRights => undef, IncludeSuperusers => 0, IncludeSubgroupMembers => 0, Object => $groups->First);
+
+    my @admins;
+    while (my $admin = $adminccs->Next) {
+        push (@admins, $admin->EmailAddress); 
+    }
+}
+Queue: Approvals
+Type: Approval
+AdminCc: {join ("\nAdminCc: ",@admins) }
+Depended-On-By: {$Tickets{"TOP"}->Id}
+Refers-To: {$Tickets{"TOP"}->Id}
+Subject: Approval for ticket: {$Tickets{"TOP"}->Id} - {$Tickets{"TOP"}->Subject}
+Due: {time + 86400}
+Content-Type: text/plain
+Content: Your approval is requested for the ticket {$Tickets{"TOP"}->Id}: {$Tickets{"TOP"}->Subject}
+Blah
+Blah
+ENDOFCONTENT
+===Create-Ticket: two
+Subject: Manager approval.
+Depends-On: {$Tickets{"approval"}->Id}
+Queue: Approvals
+Content-Type: text/plain
+Content: 
+Your minion approved this ticket. you ok with that?
+ENDOFCONTENT
+';
+
+ok ($approvals =~ /Content/, "Read in the approvals template");
+
+my $apptemp = RT::Template->new($RT::SystemUser);
+$apptemp->Create( Content => $approvals, Name => "Approvals", Queue => "0");
+
+ok ($apptemp->Id);
+
+my $q = RT::Queue->new($RT::SystemUser);
+$q->Create(Name => 'WorkflowTest');
+ok ($q->Id, "Created workflow test queue");
+
+my $scrip = RT::Scrip->new($RT::SystemUser);
+my ($sval, $smsg) =$scrip->Create( ScripCondition => 'On Transaction',
+                ScripAction => 'Create Tickets',
+                Template => 'Approvals',
+                Queue => $q->Id);
+ok ($sval, $smsg);
+ok ($scrip->Id, "Created the scrip");
+ok ($scrip->TemplateObj->Id, "Created the scrip template");
+ok ($scrip->ConditionObj->Id, "Created the scrip condition");
+ok ($scrip->ActionObj->Id, "Created the scrip action");
+
+my $t = RT::Ticket->new($RT::SystemUser);
+$t->Create(Subject => "Sample workflow test",
+           Owner => "root",
+           Queue => $q->Id);
+
+
+=end testing
+
+
+=head1 AUTHOR
+
+Jesse Vincent <jesse@bestpractical.com> 
+
+=head1 SEE ALSO
+
+perl(1).
+
+=cut
+
+my %LINKTYPEMAP = (
+    MemberOf => { Type => 'MemberOf',
+                  Mode => 'Target', },
+    Members => { Type => 'MemberOf',
+                 Mode => 'Base', },
+    HasMember => { Type => 'MemberOf',
+                   Mode => 'Base', },
+    RefersTo => { Type => 'RefersTo',
+                  Mode => 'Target', },
+    ReferredToBy => { Type => 'RefersTo',
+                      Mode => 'Base', },
+    DependsOn => { Type => 'DependsOn',
+                   Mode => 'Target', },
+    DependedOnBy => { Type => 'DependsOn',
+                      Mode => 'Base', },
+
+);
+
+# {{{ Scrip methods (Commit, Prepare)
+
+# {{{ sub Commit 
+#Do what we need to do and send it out.
+sub Commit {
+    my $self = shift;
+    my (@links, @postponed);
+
+    # XXX: cargo cult programming that works. i'll be back.
+    use bytes;
+
+    # Create all the tickets we care about
+    return(1) unless $self->TicketObj->Type eq 'ticket';
+
+    %T::Tickets = ();
+
+    foreach my $template_id ( @{ $self->{'template_order'} } ) {
+	$T::Tickets{'TOP'} = $T::TOP = $self->TicketObj;
+	$RT::Logger->debug("Workflow: processing $template_id of $T::TOP");
+
+	$T::ID = $template_id;
+	@T::AllID = @{ $self->{'template_order'} };
+
+        my $template = Text::Template->new(
+	      TYPE   => 'STRING',
+	      SOURCE => $self->{'templates'}->{$template_id}
+        );
+
+	$RT::Logger->debug("Workflow: evaluating\n$self->{templates}{$template_id}");
+
+	my $err;
+        my $filled_in = $template->fill_in( PACKAGE => 'T', BROKEN => sub {
+	    $err = { @_ }->{error};
+	} );
+
+	$RT::Logger->debug("Workflow: yielding\n$filled_in");
+
+	if ($err) {
+	    $RT::Logger->error("Ticket creation failed for ".$self->TicketObj->Id." ".$err);
+	    while (my ($k, $v) = each %T::X) {
+		$RT::Logger->debug("Eliminating $template_id from ${k}'s parents.");
+		delete $v->{$template_id};
+	    }
+	    next;
+	}
+
+        my %args;
+        my @lines = ( split ( /\n/, $filled_in ) );
+        while ( defined(my $line = shift @lines) ) {
+            if ( $line =~ /^(.*?):(?:\s+(.*))?$/ ) {
+                my $value = $2;
+                my $tag = lc ($1);
+                $tag =~ s/-//g;
+
+		if (ref($args{$tag})) { #If it's an array, we want to push the value
+		    push @{$args{$tag}}, $value;
+		}
+		elsif (defined ($args{$tag})) { #if we're about to get a second value, make it an array
+		    $args{$tag} = [$args{$tag}, $value];
+		}
+		else { #if there's nothing there, just set the value
+		    $args{ $tag } = $value;
+		}
+
+                if ( $tag eq 'content' ) { #just build up the content
+                        # convert it to an array
+                        $args{$tag} = defined($value) ? [ $value."\n" ] : [];
+                      while ( defined(my $l = shift @lines) ) {
+                        last if ($l =~  /^ENDOFCONTENT\s*$/) ;
+                        push @{$args{'content'}}, $l."\n";
+                        }
+                }
+            }
+	}
+
+	foreach my $date qw(due starts started resolved) {
+	    my $dateobj = RT::Date->new($RT::SystemUser);
+	    next unless $args{$date};
+	    if ($args{$date} =~ /^\d+$/) {
+		$dateobj->Set(Format => 'unix', Value => $args{$date});
+	    } else {
+		$dateobj->Set(Format => 'unknown', Value => $args{$date});
+	    }
+	    $args{$date} = $dateobj->ISO;
+	}
+	my $mimeobj = MIME::Entity->new();
+	$mimeobj->build(Type => $args{'contenttype'},
+			Data => $args{'content'});
+	# Now we have a %args to work with. 
+	# Make sure we have at least the minimum set of 
+	# reasonable data and do our thang
+	$T::Tickets{$template_id} ||= RT::Ticket->new($RT::SystemUser);
+
+	# Deferred processing	
+	push @links, (
+	    $T::Tickets{$template_id}, {
+		DependsOn		=> $args{'dependson'},
+		DependedOnBy	=> $args{'dependedonby'},
+		RefersTo		=> $args{'refersto'},
+		ReferredToBy	=> $args{'referredtoby'},
+		Members		=> $args{'members'},
+		MemberOf		=> $args{'memberof'},
+	    }
+	);
+
+	push @postponed, (
+	    # Status is postponed so we don't violate dependencies
+	    $T::Tickets{$template_id}, {
+		Status		=> $args{'status'},
+	    }
+	);
+
+	$args{'requestor'} ||= $self->TicketObj->Requestors->MemberEmailAddresses;
+
+	my %ticketargs = ( Queue => $args{'queue'},
+		      Subject=> $args{'subject'},
+		    Status => 'new',
+		    Due => $args{'due'},
+		    Starts => $args{'starts'},
+		    Started => $args{'started'},
+		    Resolved => $args{'resolved'},
+		    Owner => $args{'owner'},
+		    Requestor => $args{'requestor'},
+		    Cc => $args{'cc'},
+		    AdminCc=> $args{'admincc'},
+		    TimeWorked =>$args{'timeworked'},
+		    TimeEstimated =>$args{'timeestimated'},
+		    TimeLeft =>$args{'timeleft'},
+		    InitialPriority => $args{'initialpriority'},
+		    FinalPriority => $args{'finalpriority'},
+		    Type => $args{'type'}, 
+		    MIMEObj => $mimeobj);
+
+
+	foreach my $key (keys(%args)) {
+	    $key =~ /^customfield-(\d+)$/ or next;
+	    $ticketargs{ "CustomField-" . $1 } = $args{$key};
+	}
+
+	my ($id, $transid, $msg) = $T::Tickets{$template_id}->Create(%ticketargs);
+	if (!$id) {
+	    $RT::Logger->error(
+		"Couldn't create related ticket $template_id for ".
+		$self->TicketObj->Id." ".$msg
+	    );
+	    next;
+	}
+
+	$RT::Logger->debug("Assigned $template_id with $id");
+	$T::Tickets{$template_id}->SetOriginObj($self->TicketObj)
+	    if $T::Tickets{$template_id}->can('SetOriginObj');
+    }
+
+    # postprocessing: add links
+
+    while (my $ticket = shift(@links)) {
+	$RT::Logger->debug("Handling links for " . $ticket->Id);
+	my %args = %{shift(@links)};
+
+	foreach my $type ( keys %LINKTYPEMAP ) {
+	    next unless (defined $args{$type});
+	    foreach my $link (
+		ref( $args{$type} ) ? @{ $args{$type} } : ( $args{$type} ) )
+	    {
+		if (!exists $T::Tickets{$link}) {
+		    $RT::Logger->debug("Skipping $type link for $link (non-existent)");
+		    next;
+		}
+		$RT::Logger->debug("Building $type link for $link: " . $T::Tickets{$link}->Id);
+		$link = $T::Tickets{$link}->Id;
+
+		my ( $wval, $wmsg ) = $ticket->AddLink(
+		    Type                          => $LINKTYPEMAP{$type}->{'Type'},
+		    $LINKTYPEMAP{$type}->{'Mode'} => $link,
+		    Silent                        => 1
+		);
+
+		$RT::Logger->warning("AddLink thru $link failed: $wmsg") unless $wval;
+		# push @non_fatal_errors, $wmsg unless ($wval);
+	    }
+
+	}
+    }
+
+    # postponed actions -- Status only, currently
+    while (my $ticket = shift(@postponed)) {
+	$RT::Logger->debug("Handling postponed actions for $ticket");
+	my %args = %{shift(@postponed)};
+
+	$ticket->SetStatus($args{Status}) if defined $args{Status};
+    }
+
+    return(1);
+}
+# }}}
+
+# {{{ sub Prepare 
+
+sub Prepare  {
+  my $self = shift;
+  
+  unless ($self->TemplateObj) {
+    $RT::Logger->warning("No template object handed to $self\n");
+  }
+  
+  unless ($self->TransactionObj) {
+    $RT::Logger->warning("No transaction object handed to $self\n");
+    
+  }
+  
+  unless ($self->TicketObj) {
+    $RT::Logger->warning("No ticket object handed to $self\n");
+      
+  }
+ 
+
+    
+
+my $template_id;
+foreach my $line (split(/\n/,$self->TemplateObj->Content)) {
+        if ($line =~ /^===Create-Ticket: (.*)$/) {
+                $template_id = $1;
+                push @{$self->{'template_order'}},$template_id;
+        } else {
+                $self->{'templates'}->{$template_id} .= $line."\n";
+        }       
+        
+        
+}
+  
+  return 1;
+  
+}
+
+# }}}
+
+# }}}
+
+eval "require RT::Action::CreateTickets_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/CreateTickets_Vendor.pm});
+eval "require RT::Action::CreateTickets_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/CreateTickets_Local.pm});
+
+1;
+
diff --git a/rt/lib/RT/Action/EscalatePriority.pm b/rt/lib/RT/Action/EscalatePriority.pm
new file mode 100644
index 000000000..7ed63ae01
--- /dev/null
+++ b/rt/lib/RT/Action/EscalatePriority.pm
@@ -0,0 +1,142 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::Action::EscalatePriority
+
+=head1 DESCRIPTION
+
+EscalatePriority is a ScripAction which is NOT intended to be called per 
+transaction. It's intended to be called by an RT escalation daemon.
+(The daemon is called escalator).
+
+EsclatePriority uses the following formula to change a ticket's priority:
+
+    Priority = Priority +  (( FinalPriority - Priority ) / ( DueDate-Today))
+
+Unless the duedate is past, in which case priority gets bumped straight
+to final priority.
+
+In this way, priority is either increased or decreased toward the final priority
+as the ticket heads toward its due date.
+
+
+=cut
+
+
+package RT::Action::EscalatePriority;
+require RT::Action::Generic;
+
+use strict;
+use vars qw/@ISA/;
+@ISA=qw(RT::Action::Generic);
+
+#Do what we need to do and send it out.
+
+#What does this type of Action does
+
+# {{{ sub Describe 
+sub Describe  {
+  my $self = shift;
+  return (ref $self . " will move a ticket's priority toward its final priority.");
+}
+# }}}
+	
+
+# {{{ sub Prepare 
+sub Prepare  {
+    my $self = shift;
+    
+    if ($self->TicketObj->Priority() == $self->TicketObj->FinalPriority()) {
+	# no update necessary.
+	return 0;
+    }
+   
+    #compute the number of days until the ticket is due
+    my $due = $self->TicketObj->DueObj();
+    
+
+    # If we don't have a due date, adjust the priority by one
+    # until we hit the final priority
+    if ($due->Unix() < 1) {
+	if ( $self->TicketObj->Priority > $self->TicketObj->FinalPriority ){
+	    $self->{'prio'} = ($self->TicketObj->Priority - 1);
+	    return 1;
+	}
+	elsif ( $self->TicketObj->Priority < $self->TicketObj->FinalPriority ){
+	    $self->{'prio'} = ($self->TicketObj->Priority + 1);
+	    return 1;
+	}
+	# otherwise the priority is at the final priority. we don't need to
+	# Continue
+	else {
+	    return 0;
+	}
+    }
+
+    # we've got a due date. now there are other things we should do
+    else { 
+	my $diff_in_seconds = $due->Diff(time());    
+	my $diff_in_days = int( $diff_in_seconds / 86400);    
+	
+	#if we haven't hit the due date yet
+	if ($diff_in_days > 0 ) {	
+	    
+	    # compute the difference between the current priority and the
+	    # final priority
+	    
+	    my $prio_delta = 
+	      $self->TicketObj->FinalPriority() - $self->TicketObj->Priority;
+	    
+	    my $inc_priority_by = int( $prio_delta / $diff_in_days );
+	    
+	    #set the ticket's priority to that amount
+	    $self->{'prio'} = $self->TicketObj->Priority + $inc_priority_by;
+	    
+	}
+	#if $days is less than 1, set priority to final_priority
+	else {	
+	    $self->{'prio'} = $self->TicketObj->FinalPriority();
+	}
+
+    }
+    return 1;
+}
+# }}}
+
+sub Commit {
+    my $self = shift;
+   my ($val, $msg) = $self->TicketObj->SetPriority($self->{'prio'});
+
+   unless ($val) {
+	$RT::Logger->debug($self . " $msg\n"); 
+   }
+}
+
+eval "require RT::Action::EscalatePriority_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/EscalatePriority_Vendor.pm});
+eval "require RT::Action::EscalatePriority_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/EscalatePriority_Local.pm});
+
+1;
diff --git a/rt/lib/RT/Action/Generic.pm b/rt/lib/RT/Action/Generic.pm
index ecfd4ab1a..007d299c7 100755
--- a/rt/lib/RT/Action/Generic.pm
+++ b/rt/lib/RT/Action/Generic.pm
@@ -1,7 +1,26 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/Generic.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-2000 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 =head1 NAME
 
   RT::Action::Generic - a generic baseclass for RT Actions
@@ -16,7 +35,6 @@
 
 =begin testing
 
-ok (require RT::TestHarness);
 ok (require RT::Action::Generic);
 
 =end testing
@@ -25,6 +43,8 @@ ok (require RT::Action::Generic);
 
 package RT::Action::Generic;
 
+use strict;
+
 # {{{ sub new 
 sub new  {
   my $proto = shift;
@@ -36,6 +56,13 @@ sub new  {
 }
 # }}}
 
+# {{{ sub new 
+sub loc {
+    my $self = shift;
+    return $self->{'ScripObj'}->loc(@_);
+}
+# }}}
+
 # {{{ sub _Init 
 sub _Init  {
   my $self = shift;
@@ -87,6 +114,13 @@ sub TemplateObj  {
 }
 # }}}
 
+# {{{ sub ScripObj
+sub ScripObj  {
+  my $self = shift;
+  return($self->{'ScripObj'});
+}
+# }}}
+
 # {{{ sub Type
 sub Type  {
   my $self = shift;
@@ -102,7 +136,7 @@ sub Type  {
 # {{{ sub Commit 
 sub Commit  {
   my $self = shift;
-  return(0,"Commit Stubbed");
+  return(0, $self->loc("Commit Stubbed"));
 }
 # }}}
 
@@ -112,7 +146,7 @@ sub Commit  {
 # {{{ sub Describe 
 sub Describe  {
   my $self = shift;
-  return ("No description for " . ref $self);
+  return $self->loc("No description for [_1]", ref $self);
 }
 # }}}
 
@@ -122,7 +156,7 @@ sub Describe  {
 # {{{ sub Prepare 
 sub Prepare  {
   my $self = shift;
-  return (0,"Prepare Stubbed");
+  return (0, $self->loc("Prepare Stubbed"));
 }
 # }}}
 
@@ -152,4 +186,10 @@ sub DESTROY {
 }
 
 # }}}
+
+eval "require RT::Action::Generic_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/Generic_Vendor.pm});
+eval "require RT::Action::Generic_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/Generic_Local.pm});
+
 1;
diff --git a/rt/lib/RT/Action/Notify.pm b/rt/lib/RT/Action/Notify.pm
index 6dca4fd41..1e4e4c073 100755
--- a/rt/lib/RT/Action/Notify.pm
+++ b/rt/lib/RT/Action/Notify.pm
@@ -1,7 +1,31 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/Notify.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 package RT::Action::Notify;
 require RT::Action::SendEmail;
+
+use strict;
+use vars qw/@ISA/;
 @ISA = qw(RT::Action::SendEmail);
 
 # {{{ sub SetRecipients
@@ -9,14 +33,14 @@ require RT::Action::SendEmail;
 =head2 SetRecipients
 
 Sets the recipients of this meesage to Owner, Requestor, AdminCc, Cc or All. 
-Explicitly B<does not> notify the creator of the transaction.
+Explicitly B<does not> notify the creator of the transaction by default
 
 =cut
 
 sub SetRecipients {
     my $self = shift;
 
-    $arg = $self->Argument;
+    my $arg = $self->Argument;
 
     $arg =~ s/\bAll\b/Owner,Requestor,AdminCc,Cc/;
 
@@ -24,14 +48,14 @@ sub SetRecipients {
 
 
     if ($arg =~ /\bOtherRecipients\b/) {
-        if ($self->TransactionObj->Message->First) {
-            push (@Cc, $self->TransactionObj->Message->First->GetHeader('RT-Send-Cc'));
-            push (@Bcc, $self->TransactionObj->Message->First->GetHeader('RT-Send-Bcc'));
+        if ($self->TransactionObj->Attachments->First) {
+            push (@Cc, $self->TransactionObj->Attachments->First->GetHeader('RT-Send-Cc'));
+            push (@Bcc, $self->TransactionObj->Attachments->First->GetHeader('RT-Send-Bcc'));
         }
     }
 
     if ( $arg =~ /\bRequestor\b/ ) {
-        push ( @To, @{ $self->TicketObj->Requestors->Emails } );
+        push ( @To, $self->TicketObj->Requestors->MemberEmailAddresses  );
     }
 
     
@@ -40,12 +64,12 @@ sub SetRecipients {
 
         #If we have a To, make the Ccs, Ccs, otherwise, promote them to To
         if (@To) {
-            push ( @Cc, @{ $self->TicketObj->Cc->Emails } );
-            push ( @Cc, @{ $self->TicketObj->QueueObj->Cc->Emails } );
+            push ( @Cc, $self->TicketObj->Cc->MemberEmailAddresses );
+            push ( @Cc, $self->TicketObj->QueueObj->Cc->MemberEmailAddresses  );
         }
         else {
-            push ( @Cc, @{ $self->TicketObj->Cc->Emails } );
-            push ( @To, @{ $self->TicketObj->QueueObj->Cc->Emails } );
+            push ( @Cc, $self->TicketObj->Cc->MemberEmailAddresses  );
+            push ( @To, $self->TicketObj->QueueObj->Cc->MemberEmailAddresses  );
         }
     }
 
@@ -65,15 +89,16 @@ sub SetRecipients {
     }
 
     if ( $arg =~ /\bAdminCc\b/ ) {
-        push ( @Bcc, @{ $self->TicketObj->AdminCc->Emails } );
-        push ( @Bcc, @{ $self->TicketObj->QueueObj->AdminCc->Emails } );
+        push ( @Bcc, $self->TicketObj->AdminCc->MemberEmailAddresses  );
+        push ( @Bcc, $self->TicketObj->QueueObj->AdminCc->MemberEmailAddresses  );
     }
 
     if ($RT::UseFriendlyToLine) {
         unless (@To) {
-            push ( @PseudoTo,
-                "\"$arg of $RT::rtname Ticket #"
-                  . $self->TicketObj->id . "\":;" );
+            push (
+		@PseudoTo,
+		sprintf($RT::FriendlyToLineFormat, $arg, $self->TicketObj->id),
+	    );
         }
     }
 
@@ -81,14 +106,17 @@ sub SetRecipients {
 
     #Strip the sender out of the To, Cc and AdminCc and set the 
     # recipients fields used to build the message by the superclass.
-
-    $RT::Logger->debug("$self: To is ".join(",",@To));
-    $RT::Logger->debug("$self: Cc is ".join(",",@Cc));
-    $RT::Logger->debug("$self: Bcc is ".join(",",@Bcc));
-
-    @{ $self->{'To'} }  = grep ( !/^$creator$/, @To );
-    @{ $self->{'Cc'} }  = grep ( !/^$creator$/, @Cc );
-    @{ $self->{'Bcc'} } = grep ( !/^$creator$/, @Bcc );
+    # unless a flag is set 
+    if ($RT::NotifyActor) {
+        @{ $self->{'To'} }  = @To;
+        @{ $self->{'Cc'} }  = @Cc;
+        @{ $self->{'Bcc'} } = @Bcc;
+    }
+    else {
+        @{ $self->{'To'} }  = grep ( !/^$creator$/, @To );
+        @{ $self->{'Cc'} }  = grep ( !/^$creator$/, @Cc );
+        @{ $self->{'Bcc'} } = grep ( !/^$creator$/, @Bcc );
+    }
     @{ $self->{'PseudoTo'} } = @PseudoTo;
     return (1);
 
@@ -96,4 +124,9 @@ sub SetRecipients {
 
 # }}}
 
+eval "require RT::Action::Notify_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/Notify_Vendor.pm});
+eval "require RT::Action::Notify_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/Notify_Local.pm});
+
 1;
diff --git a/rt/lib/RT/Action/NotifyAsComment.pm b/rt/lib/RT/Action/NotifyAsComment.pm
index c72bfff13..210e4ab15 100755
--- a/rt/lib/RT/Action/NotifyAsComment.pm
+++ b/rt/lib/RT/Action/NotifyAsComment.pm
@@ -1,7 +1,31 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/NotifyAsComment.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 package RT::Action::NotifyAsComment;
 require RT::Action::Notify;
+
+use strict;
+use vars qw/@ISA/;
 @ISA = qw(RT::Action::Notify);
 
 
@@ -21,5 +45,11 @@ sub SetReturnAddress {
 	
 	return($self->SUPER::SetReturnAddress(is_comment => 1));
 }
+
+eval "require RT::Action::NotifyAsComment_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/NotifyAsComment_Vendor.pm});
+eval "require RT::Action::NotifyAsComment_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/NotifyAsComment_Local.pm});
+
 1;
 
diff --git a/rt/lib/RT/Action/ResolveMembers.pm b/rt/lib/RT/Action/ResolveMembers.pm
index 00547ebe8..02ff3a58c 100644
--- a/rt/lib/RT/Action/ResolveMembers.pm
+++ b/rt/lib/RT/Action/ResolveMembers.pm
@@ -1,8 +1,34 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 # This Action will resolve all members of a resolved group ticket
 
 package RT::Action::ResolveMembers;
 require RT::Action::Generic;
 require RT::Links;
+
+use strict;
+use vars qw/@ISA/;
 @ISA=qw(RT::Action::Generic);
 
 #Do what we need to do and send it out.
@@ -12,7 +38,7 @@ require RT::Links;
 # {{{ sub Describe 
 sub Describe  {
   my $self = shift;
-  return (ref $self . " will resolve all members of a resolved group ticket.");
+  return $self->loc("[_1] will resolve all members of a resolved group ticket.", ref $self);
 }
 # }}}
 
@@ -33,7 +59,7 @@ sub Commit {
 
     while (my $Link=$Links->Next()) {
 	# Todo: Try to deal with remote URIs as well
-	next unless $Link->BaseIsLocal;
+	next unless $Link->BaseURI->IsLocal;
 	my $base=RT::Ticket->new($self->TicketObj->CurrentUser);
 	# Todo: Only work if Base is a plain ticket num:
 	$base->Load($Link->Base);
@@ -53,5 +79,10 @@ sub IsApplicable  {
 }
 # }}}
 
+eval "require RT::Action::ResolveMembers_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/ResolveMembers_Vendor.pm});
+eval "require RT::Action::ResolveMembers_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/ResolveMembers_Local.pm});
+
 1;
 
diff --git a/rt/lib/RT/Action/SendEmail.pm b/rt/lib/RT/Action/SendEmail.pm
index e3abb1154..dac8fc8e7 100755
--- a/rt/lib/RT/Action/SendEmail.pm
+++ b/rt/lib/RT/Action/SendEmail.pm
@@ -1,20 +1,44 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/SendEmail.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Copyright 1996-2002  Jesse Vincent <jesse@bestpractical.com> 
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 # Portions Copyright 2000 Tobias Brox <tobix@cpan.org>
-# Released under the terms of version 2 of the GNU Public License
 
 package RT::Action::SendEmail;
 require RT::Action::Generic;
 
+use strict;
+use vars qw/@ISA/;
 @ISA = qw(RT::Action::Generic);
 
+use MIME::Words qw(encode_mimeword);
 
-=head1 NAME
+use RT::EmailParser;
 
-  RT::Action::SendEmail - An Action which users can use to send mail 
-  or can subclassed for more specialized mail sending behavior. 
-  RT::Action::AutoReply is a good example subclass.
+=head1 NAME
 
+RT::Action::SendEmail - An Action which users can use to send mail 
+or can subclassed for more specialized mail sending behavior. 
+RT::Action::AutoReply is a good example subclass.
 
 =head1 SYNOPSIS
 
@@ -36,7 +60,6 @@ the comments for the SetRecipients sub).
 
 =begin testing
 
-ok (require RT::TestHarness);
 ok (require RT::Action::SendEmail);
 
 =end testing
@@ -54,158 +77,266 @@ perl(1).
 
 # {{{ Scrip methods (_Init, Commit, Prepare, IsApplicable)
 
-# {{{ sub _Init 
+# {{{ sub _Init
 # We use _Init from RT::Action
 # }}}
 
-# {{{ sub Commit 
+# {{{ sub Commit
 #Do what we need to do and send it out.
-sub Commit  {
+sub Commit {
     my $self = shift;
+
+    my $MIMEObj = $self->TemplateObj->MIMEObj;
+    my $msgid = $MIMEObj->head->get('Message-Id');
+    chomp $msgid;
+    $RT::Logger->info($msgid." #".$self->TicketObj->id."/".$self->TransactionObj->id." - Scrip ". $self->ScripObj->id ." ".$self->ScripObj->Description);
     #send the email
-    
+
+        # Weed out any RT addresses. We really don't want to talk to ourselves!
+        @{$self->{'To'}} = RT::EmailParser::CullRTAddresses("", @{$self->{'To'}});
+        @{$self->{'Cc'}} = RT::EmailParser::CullRTAddresses("", @{$self->{'Cc'}});
+        @{$self->{'Bcc'}} = RT::EmailParser::CullRTAddresses("", @{$self->{'Bcc'}});
     # If there are no recipients, don't try to send the message.
     # If the transaction has content and has the header RT-Squelch-Replies-To
-    
-    if (defined $self->TransactionObj->Message->First()) { 
-	my $headers = $self->TransactionObj->Message->First->Headers();
-	
-	if ($headers =~ /^RT-Squelch-Replies-To: (.*?)$/si) {
-	    my @blacklist = split(/,/,$1);
-	    
-	    # Cycle through the people we're sending to and pull out anyone on the
-	    # system blacklist
-	    
-	    foreach my $person_to_yank (@blacklist) {
-		$person_to_yank =~ s/\s//g;
-		@{$self->{'To'}} = grep (!/^$person_to_yank$/, @{$self->{'To'}});
-		@{$self->{'Cc'}} = grep (!/^$person_to_yank$/, @{$self->{'Cc'}});
-		@{$self->{'Bcc'}} = grep (!/^$person_to_yank$/, @{$self->{'Bcc'}});
-	    }
-	}
+
+    if ( defined $self->TransactionObj->Attachments->First() ) {
+
+        my $squelch = $self->TransactionObj->Attachments->First->GetHeader( 'RT-Squelch-Replies-To');
+
+        if ($squelch) {
+            my @blacklist = split ( /,/, $squelch );
+
+            # Cycle through the people we're sending to and pull out anyone on the
+            # system blacklist
+
+            foreach my $person_to_yank (@blacklist) {
+                $person_to_yank =~ s/\s//g;
+                @{ $self->{'To'} } =
+                  grep ( !/^$person_to_yank$/, @{ $self->{'To'} } );
+                @{ $self->{'Cc'} } =
+                  grep ( !/^$person_to_yank$/, @{ $self->{'Cc'} } );
+                @{ $self->{'Bcc'} } =
+                  grep ( !/^$person_to_yank$/, @{ $self->{'Bcc'} } );
+            }
+        }
     }
-    
-    # Go add all the Tos, Ccs and Bccs that we need to to the message to 
+
+    # Go add all the Tos, Ccs and Bccs that we need to to the message to
     # make it happy, but only if we actually have values in those arrays.
-    
-    $self->SetHeader('To', join(',', @{$self->{'To'}})) 
-      if (@{$self->{'To'}});
-    $self->SetHeader('Cc', join(',' , @{$self->{'Cc'}})) 
-      if (@{$self->{'Cc'}});
-	$self->SetHeader('Bcc', join(',', @{$self->{'Bcc'}})) 
-	  if (@{$self->{'Bcc'}});;
-    
-    my $MIMEObj = $self->TemplateObj->MIMEObj;
-    
 
-    $MIMEObj->make_singlepart;
-    
-    
+    $self->SetHeader( 'To', join ( ',', @{ $self->{'To'} } ) )
+      if ( $self->{'To'} && @{ $self->{'To'} } );
+    $self->SetHeader( 'Cc', join ( ',', @{ $self->{'Cc'} } ) )
+      if ( $self->{'Cc'} && @{ $self->{'Cc'} } );
+    $self->SetHeader( 'Bcc', join ( ',', @{ $self->{'Bcc'} } ) )
+      if ( $self->{'Cc'} && @{ $self->{'Bcc'} } );
+
+
+    $self->SetHeader('MIME-Version', '1.0');
+
+    # try to convert message body from utf-8 to $RT::EmailOutputEncoding
+    $self->SetHeader( 'Content-Type', 'text/plain; charset="utf-8"' );
+
+    RT::I18N::SetMIMEEntityToEncoding( $MIMEObj, $RT::EmailOutputEncoding, 'mime_words_ok' );
+    $self->SetHeader( 'Content-Type', 'text/plain; charset="' . $RT::EmailOutputEncoding . '"' );
+
+
+    # Build up a MIME::Entity that looks like the original message.
+
+    my $do_attach = $self->TemplateObj->MIMEObj->head->get('RT-Attach-Message');
+
+    if ($do_attach) {
+        $self->TemplateObj->MIMEObj->head->delete('RT-Attach-Message');
+
+        my $attachments = RT::Attachments->new($RT::SystemUser);
+        $attachments->Limit( FIELD => 'TransactionId',
+                             VALUE => $self->TransactionObj->Id );
+        $attachments->OrderBy('id');
+
+        my $transaction_content_obj = $self->TransactionObj->ContentObj;
+
+        # attach any of this transaction's attachments
+        while ( my $attach = $attachments->Next ) {
+
+            # Don't attach anything blank
+            next unless ( $attach->ContentLength );
+
+            # We want to make sure that we don't include the attachment that's being sued as the "Content" of this message"
+            next
+              if (    $transaction_content_obj
+                   && $transaction_content_obj->Id == $attach->Id 
+                   && $transaction_content_obj->ContentType =~ qr{text/plain}i
+                );
+            $MIMEObj->make_multipart('mixed');
+            $MIMEObj->attach( Type => $attach->ContentType,
+                              Charset => $attach->OriginalEncoding,
+                              Data => $attach->OriginalContent,
+                              Filename => $self->MIMEEncodeString( $attach->Filename, $RT::EmailOutputEncoding ),
+                              Encoding    => '-SUGGEST');
+        }
+
+    }
+
+
+    my $retval = $self->SendMessage($MIMEObj);
+
+
+    return ($retval);
+}
+
+# }}}
+
+# {{{ sub Prepare
+
+sub Prepare {
+    my $self = shift;
+
+    # This actually populates the MIME::Entity fields in the Template Object
+
+    unless ( $self->TemplateObj ) {
+        $RT::Logger->warning("No template object handed to $self\n");
+    }
+
+    unless ( $self->TransactionObj ) {
+        $RT::Logger->warning("No transaction object handed to $self\n");
+
+    }
+
+    unless ( $self->TicketObj ) {
+        $RT::Logger->warning("No ticket object handed to $self\n");
+
+    }
+
+    my ( $result, $message ) = $self->TemplateObj->Parse(
+                                         Argument       => $self->Argument,
+                                         TicketObj      => $self->TicketObj,
+                                         TransactionObj => $self->TransactionObj
+    );
+    if ($result) {
+
+        # Header
+        $self->SetSubject();
+        $self->SetSubjectToken();
+        $self->SetRecipients();
+        $self->SetReturnAddress();
+        $self->SetRTSpecialHeaders();
+        if ($RT::EmailOutputEncoding) {
+
+            # l10n related header
+            $self->SetHeaderAsEncoding( 'Subject', $RT::EmailOutputEncoding );
+        }
+    }
+
+    return $result;
+
+}
+
+# }}}
+
+# }}}
+
+# {{{ SendMessage
+=head2 SendMessage MIMEObj
+
+sends the message using RT's preferred API.
+TODO: Break this out to a seperate module
+
+=cut
+
+sub SendMessage {
+    my $self = shift;
+    my $MIMEObj = shift;
+
+    my $msgid = $MIMEObj->head->get('Message-Id');
+
+
     #If we don't have any recipients to send to, don't send a message;
-    unless ($MIMEObj->head->get('To') ||
-	    $MIMEObj->head->get('Cc') || 
-	    $MIMEObj->head->get('Bcc') ) {
-	$RT::Logger->debug("$self: No recipients found. Not sending.\n");
-	return(1);
+    unless (    $MIMEObj->head->get('To')
+             || $MIMEObj->head->get('Cc')
+             || $MIMEObj->head->get('Bcc') ) {
+        $RT::Logger->info($msgid.  " No recipients found. Not sending.\n");
+        return (1);
     }
 
     # PseudoTo	(fake to headers) shouldn't get matched for message recipients.
     # If we don't have any 'To' header, drop in the pseudo-to header.
 
-    $self->SetHeader('To', join(',', @{$self->{'PseudoTo'}}))
-      if ( (@{$self->{'PseudoTo'}}) and (! $MIMEObj->head->get('To')));
-    
-    if ($RT::MailCommand eq 'sendmailpipe') {
-	open (MAIL, "|$RT::SendmailPath $RT::SendmailArguments") || return(0);
-	print MAIL $MIMEObj->as_string;
-	close(MAIL);
+    $self->SetHeader( 'To', join ( ',', @{ $self->{'PseudoTo'} } ) )
+      if ( $self->{'PseudoTo'} && ( @{ $self->{'PseudoTo'} } )
+           and ( !$MIMEObj->head->get('To') ) );
+    if ( $RT::MailCommand eq 'sendmailpipe' ) {
+        eval {
+            open( MAIL, "|$RT::SendmailPath $RT::SendmailArguments" );
+            print MAIL $MIMEObj->as_string;
+            close(MAIL);
+          };
+          if ($@) {
+            $RT::Logger->crit($msgid.  "Could not send mail. -".$@ );
+        }
     }
     else {
-	unless ($MIMEObj->send($RT::MailCommand, $RT::MailParams)) {
-	    $RT::Logger->crit("$self: Could not send mail for ".
-			      $self->TransactionObj . "\n");
-	    return(0);
+	my @mailer_args = ($RT::MailCommand);
+	local $ENV{MAILADDRESS};
+
+        if ( $RT::MailCommand eq 'sendmail' ) {
+	    push @mailer_args, $RT::SendmailArguments;
+        }
+        elsif ( $RT::MailCommand eq 'smtp' ) {
+	    $ENV{MAILADDRESS} = $RT::SMTPFrom || $MIMEObj->head->get('From');
+	    push @mailer_args, (Server => $RT::SMTPServer);
+	    push @mailer_args, (Debug => $RT::SMTPDebug);
+        }
+	else {
+	    push @mailer_args, $RT::MailParams;
 	}
+
+        unless ( $MIMEObj->send( @mailer_args ) ) {
+            $RT::Logger->crit($msgid.  "Could not send mail." );
+            return (0);
+        }
     }
-    
-    return (1);
-    
-}
-# }}}
 
-# {{{ sub Prepare 
 
-sub Prepare  {
-  my $self = shift;
-  
-  # This actually populates the MIME::Entity fields in the Template Object
-  
-  unless ($self->TemplateObj) {
-    $RT::Logger->warning("No template object handed to $self\n");
-  }
-  
-  unless ($self->TransactionObj) {
-    $RT::Logger->warning("No transaction object handed to $self\n");
-    
-  }
-  
-  unless ($self->TicketObj) {
-    $RT::Logger->warning("No ticket object handed to $self\n");
-      
-  }
-  
-  
-  $self->TemplateObj->Parse(Argument => $self->Argument,
-			    TicketObj => $self->TicketObj, 
-			    TransactionObj => $self->TransactionObj);
-  
-  # Header
-  
-  $self->SetSubject();
-  
-  $self->SetSubjectToken();
-  
-  $self->SetRecipients();  
-  
-  $self->SetReturnAddress();
+     my $success = ($msgid. " sent To: ".$MIMEObj->head->get('To') . " Cc: ".$MIMEObj->head->get('Cc') . " Bcc: ".$MIMEObj->head->get('Bcc'));
+    $success =~ s/\n//gi;
+    $RT::Logger->info($success);
 
-  $self->SetRTSpecialHeaders();
-  
-  return 1;
-  
+    return (1);
 }
 
 # }}}
 
-# }}}
-
 # {{{ Deal with message headers (Set* subs, designed for  easy overriding)
 
 # {{{ sub SetRTSpecialHeaders
 
-# This routine adds all the random headers that RT wants in a mail message
-# that don't matter much to anybody else.
+=head2 SetRTSpecialHeaders 
+
+This routine adds all the random headers that RT wants in a mail message
+that don't matter much to anybody else.
+
+=cut
 
 sub SetRTSpecialHeaders {
     my $self = shift;
-    
+
     $self->SetReferences();
 
     $self->SetMessageID();
-    
+
     $self->SetPrecedence();
 
-    $self->SetHeader('X-RT-Loop-Prevention', $RT::rtname); 
-    $self->SetHeader('RT-Ticket', $RT::rtname. " #".$self->TicketObj->id());
-    $self->SetHeader
-      ('Managed-by',"RT $RT::VERSION (http://bestpractical.com/rt/)");
-    
-    $self->SetHeader('RT-Originator', $self->TransactionObj->CreatorObj->EmailAddress);
-    return();
-    
-}
+    $self->SetHeader( 'X-RT-Loop-Prevention', $RT::rtname );
+    $self->SetHeader( 'RT-Ticket',
+                      $RT::rtname . " #" . $self->TicketObj->id() );
+    $self->SetHeader( 'Managed-by',
+                      "RT $RT::VERSION (http://www.bestpractical.com/rt/)" );
 
+    $self->SetHeader( 'RT-Originator',
+                      $self->TransactionObj->CreatorObj->EmailAddress );
+    return ();
 
+}
 
 # {{{ sub SetReferences
 
@@ -218,105 +349,126 @@ sub SetRTSpecialHeaders {
 =cut
 
 sub SetReferences {
-  my $self = shift;
-  
-  # TODO: this one is broken.  What is this email really a reply to?
-  # If it's a reply to an incoming message, we'll need to use the
-  # actual message-id from the appropriate Attachment object.  For
-  # incoming mails, we would like to preserve the In-Reply-To and/or
-  # References.
+    my $self = shift;
 
-  $self->SetHeader
-    ('In-Reply-To', "<rt-".$self->TicketObj->id().
-     "\@".$RT::rtname.">");
+    # TODO: this one is broken.  What is this email really a reply to?
+    # If it's a reply to an incoming message, we'll need to use the
+    # actual message-id from the appropriate Attachment object.  For
+    # incoming mails, we would like to preserve the In-Reply-To and/or
+    # References.
 
+    $self->SetHeader( 'In-Reply-To',
+                   "<rt-" . $self->TicketObj->id() . "\@" . $RT::rtname . ">" );
 
-  # TODO We should always add References headers for all message-ids
-  # of previous messages related to this ticket.
+    # TODO We should always add References headers for all message-ids
+    # of previous messages related to this ticket.
 }
 
 # }}}
 
 # {{{ sub SetMessageID
 
-# Without this one, threading won't work very nice in email agents.
-# Anyway, I'm not really sure it's that healthy if we need to send
-# several separate/different emails about the same transaction.
+=head2 SetMessageID 
 
-sub SetMessageID {
-  my $self = shift;
+Without this one, threading won't work very nice in email agents.
+Anyway, I'm not really sure it's that healthy if we need to send
+several separate/different emails about the same transaction.
 
-  # TODO this one might be sort of broken.  If we have several scrips +++
-  # sending several emails to several different persons, we need to
-  # pull out different message-ids.  I'd suggest message ids like
-  # "rt-ticket#-transaction#-scrip#-receipient#"
+=cut
+
+sub SetMessageID {
+    my $self = shift;
 
-  $self->SetHeader
-    ('Message-ID', "<rt-".$self->TicketObj->id().
-     "-".
-     $self->TransactionObj->id()."." .rand(20) . "\@".$RT::Organization.">")
+    # TODO this one might be sort of broken.  If we have several scrips +++
+    # sending several emails to several different persons, we need to
+    # pull out different message-ids.  I'd suggest message ids like
+    # "rt-ticket#-transaction#-scrip#-receipient#"
+
+    $self->SetHeader( 'Message-ID',
+                      "<rt-"
+                        . $RT::VERSION ."-"
+                        . $self->TicketObj->id() . "-"
+                        . $self->TransactionObj->id() . "."
+                        . rand(20) . "\@"
+                        . $RT::Organization . ">" )
       unless $self->TemplateObj->MIMEObj->head->get('Message-ID');
 }
 
-
 # }}}
 
 # }}}
 
-# {{{ sub SetReturnAddress 
+# {{{ sub SetReturnAddress
+
+=head2 SetReturnAddress is_comment => BOOLEAN
+
+Calculate and set From and Reply-To headers based on the is_comment flag.
+
+=cut
 
 sub SetReturnAddress {
 
-  my $self = shift;
-  my %args = ( is_comment => 0,
-	       @_ );
-
-  # From and Reply-To
-  # $args{is_comment} should be set if the comment address is to be used.
-  my $replyto;
-
-  if ($args{'is_comment'}) { 
-      $replyto = $self->TicketObj->QueueObj->CommentAddress || 
-		  $RT::CommentAddress;
-  }
-  else {
-      $replyto = $self->TicketObj->QueueObj->CorrespondAddress ||
-		  $RT::CorrespondAddress;
-  }
-    
-  unless ($self->TemplateObj->MIMEObj->head->get('From')) {
-      my $friendly_name=$self->TransactionObj->CreatorObj->RealName;
-
-      if ($friendly_name =~ /^\S+\@\S+$/) { # A "bare" mail address
-          $friendly_name =~ s/"/\\"/g;
-          $friendly_name = qq|"$friendly_name"|;
-      }
-
-
-      # TODO: this "via RT" should really be site-configurable.
-      $self->SetHeader('From', "\"$friendly_name via RT\" <$replyto>");
-  }
-  
-  unless ($self->TemplateObj->MIMEObj->head->get('Reply-To')) {
-      $self->SetHeader('Reply-To', "$replyto");
-  }
-  
+    my $self = shift;
+    my %args = ( is_comment => 0,
+                 @_ );
+
+    # From and Reply-To
+    # $args{is_comment} should be set if the comment address is to be used.
+    my $replyto;
+
+    if ( $args{'is_comment'} ) {
+        $replyto = $self->TicketObj->QueueObj->CommentAddress
+          || $RT::CommentAddress;
+    }
+    else {
+        $replyto = $self->TicketObj->QueueObj->CorrespondAddress
+          || $RT::CorrespondAddress;
+    }
+
+    unless ( $self->TemplateObj->MIMEObj->head->get('From') ) {
+	if ($RT::UseFriendlyFromLine) {
+	    my $friendly_name = $self->TransactionObj->CreatorObj->RealName;
+	    if ( $friendly_name =~ /^"(.*)"$/ ) {    # a quoted string
+		$friendly_name = $1;
+	    }
+
+	    $friendly_name =~ s/"/\\"/g;
+	    $self->SetHeader( 'From',
+		        sprintf($RT::FriendlyFromLineFormat, 
+                $self->MIMEEncodeString( $friendly_name, $RT::EmailOutputEncoding ), $replyto),
+	    );
+	}
+	else {
+	    $self->SetHeader( 'From', $replyto );
+	}
+    }
+
+    unless ( $self->TemplateObj->MIMEObj->head->get('Reply-To') ) {
+        $self->SetHeader( 'Reply-To', "$replyto" );
+    }
+
 }
 
 # }}}
 
 # {{{ sub SetHeader
 
+=head2 SetHeader FIELD, VALUE
+
+Set the FIELD of the current MIME object into VALUE.
+
+=cut
+
 sub SetHeader {
-  my $self = shift;
-  my $field = shift;
-  my $val = shift;
-
-  chomp $val;                                                                  
-  chomp $field;                                                                
-  $self->TemplateObj->MIMEObj->head->fold_length($field,10000);     
-  $self->TemplateObj->MIMEObj->head->add($field, $val);
-  return $self->TemplateObj->MIMEObj->head->get($field);
+    my $self  = shift;
+    my $field = shift;
+    my $val   = shift;
+
+    chomp $val;
+    chomp $field;
+    $self->TemplateObj->MIMEObj->head->fold_length( $field, 10000 );
+    $self->TemplateObj->MIMEObj->head->replace( $field,     $val );
+    return $self->TemplateObj->MIMEObj->head->get($field);
 }
 
 # }}}
@@ -331,21 +483,29 @@ Dummy method to be overriden by subclasses which want to set the recipients.
 
 sub SetRecipients {
     my $self = shift;
-    return();
+    return ();
 }
 
 # }}}
 
 # {{{ sub SetTo
 
+=head2 SetTo
+
+Takes a string that is the addresses you want to send mail to
+
+=cut
+
 sub SetTo {
-    my $self=shift;
+    my $self      = shift;
     my $addresses = shift;
-    return $self->SetHeader('To',$addresses);
+    return $self->SetHeader( 'To', $addresses );
 }
+
 # }}}
 
 # {{{ sub SetCc
+
 =head2 SetCc
 
 Takes a string that is the addresses you want to Cc
@@ -353,11 +513,12 @@ Takes a string that is the addresses you want to Cc
 =cut
 
 sub SetCc {
-    my $self=shift;
+    my $self      = shift;
     my $addresses = shift;
 
-    return $self->SetHeader('Cc', $addresses);
+    return $self->SetHeader( 'Cc', $addresses );
 }
+
 # }}}
 
 # {{{ sub SetBcc
@@ -367,23 +528,24 @@ sub SetCc {
 Takes a string that is the addresses you want to Bcc
 
 =cut
+
 sub SetBcc {
-    my $self=shift;
+    my $self      = shift;
     my $addresses = shift;
 
-    return $self->SetHeader('Bcc', $addresses);
+    return $self->SetHeader( 'Bcc', $addresses );
 }
 
 # }}}
 
-# {{{ sub SetPrecedence 
+# {{{ sub SetPrecedence
 
 sub SetPrecedence {
-  my $self = shift;
+    my $self = shift;
 
-  unless ($self->TemplateObj->MIMEObj->head->get("Precedence")) { 
-    $self->SetHeader('Precedence', "bulk");
-   }
+    unless ( $self->TemplateObj->MIMEObj->head->get("Precedence") ) {
+        $self->SetHeader( 'Precedence', "bulk" );
+    }
 }
 
 # }}}
@@ -399,70 +561,125 @@ the transaction's subject.
 =cut 
 
 sub SetSubject {
-  my $self = shift;
-  unless ($self->TemplateObj->MIMEObj->head->get('Subject')) {
-    my $message=$self->TransactionObj->Message;
-    my $ticket=$self->TicketObj->Id;
-    
+    my $self = shift;
     my $subject;
-    
-    if ($self->{'Subject'}) {
-      $subject = $self->{'Subject'};
-    }
-    elsif (($message->First()) &&
-	   ($message->First->Headers)) {
-      $header = $message->First->Headers();
-      $header =~ s/\n\s+/ /g; 
-      if ( $header =~ /^Subject: (.*?)$/m ) {
-	$subject = $1;
-      }
-      else {
-	$subject = $self->TicketObj->Subject();
-      }
-      
-    }
-    else {
-      $subject = $self->TicketObj->Subject();
-    }
-    
-    $subject =~ s/(\r\n|\n|\s)/ /gi;
 
-    chomp $subject;
-    $self->SetHeader('Subject',$subject);
-    
+    unless ( $self->TemplateObj->MIMEObj->head->get('Subject') ) {
+        my $message = $self->TransactionObj->Attachments;
+        my $ticket  = $self->TicketObj->Id;
+
+        if ( $self->{'Subject'} ) {
+            $subject = $self->{'Subject'};
+        }
+        elsif (    ( $message->First() )
+                && ( $message->First->Headers ) ) {
+            my $header = $message->First->Headers();
+            $header =~ s/\n\s+/ /g;
+            if ( $header =~ /^Subject: (.*?)$/m ) {
+                $subject = $1;
+            }
+            else {
+                $subject = $self->TicketObj->Subject();
+            }
+
+        }
+        else {
+            $subject = $self->TicketObj->Subject();
+        }
+
+        $subject =~ s/(\r\n|\n|\s)/ /gi;
+
+        chomp $subject;
+        $self->SetHeader( 'Subject', $subject );
+
     }
-  return($subject);
+    return ($subject);
 }
+
 # }}}
 
 # {{{ sub SetSubjectToken
 
 =head2 SetSubjectToken
 
- This routine fixes the RT tag in the subject. It's unlikely that you want to overwrite this.
+This routine fixes the RT tag in the subject. It's unlikely that you want to overwrite this.
 
 =cut
 
 sub SetSubjectToken {
-  my $self=shift;
-  my $tag = "[$RT::rtname #".$self->TicketObj->id."]";
-  my $sub = $self->TemplateObj->MIMEObj->head->get('Subject');
-  unless ($sub =~ /\Q$tag\E/) {
-    $sub =~ s/(\r\n|\n|\s)/ /gi;
-    chomp $sub;
-    $self->TemplateObj->MIMEObj->head->replace('Subject', "$tag $sub");
-  }
+    my $self = shift;
+    my $tag  = "[$RT::rtname #" . $self->TicketObj->id . "]";
+    my $sub  = $self->TemplateObj->MIMEObj->head->get('Subject');
+    unless ( $sub =~ /\Q$tag\E/ ) {
+        $sub =~ s/(\r\n|\n|\s)/ /gi;
+        chomp $sub;
+        $self->TemplateObj->MIMEObj->head->replace( 'Subject', "$tag $sub" );
+    }
 }
 
 # }}}
 
 # }}}
 
-__END__
+# {{{
+
+=head2 SetHeaderAsEncoding($field_name, $charset_encoding)
+
+This routine converts the field into specified charset encoding.
+
+=cut
+
+sub SetHeaderAsEncoding {
+    my $self = shift;
+    my ( $field, $enc ) = ( shift, shift );
+
+    if ($field eq 'From' and $RT::SMTPFrom) {
+        $self->TemplateObj->MIMEObj->head->replace( $field, $RT::SMTPFrom );
+	return;
+    }
+
+    my $value = $self->TemplateObj->MIMEObj->head->get($field);
+
+    # don't bother if it's us-ascii
+
+    # See RT::I18N, 'NOTES:  Why Encode::_utf8_off before Encode::from_to'
+
+    $value =  $self->MIMEEncodeString($value, $enc);
+
+    $self->TemplateObj->MIMEObj->head->replace( $field, $value );
+
+
+} 
+# }}}
+
+# {{{ MIMENcodeString
+
+=head2 MIMEEncodeString STRING ENCODING
+
+Takes a string and a possible encoding and returns the string wrapped in MIME goo.
+
+=cut
+
+sub MIMEEncodeString {
+    my  $self = shift;
+    my $value = shift;
+    my $enc = shift;
 
-# {{{ POD
+    chomp $value;
+    return ($value) unless $value =~ /[^\x20-\x7e]/;
+
+    $value =~ s/\s*$//;
+    Encode::_utf8_off($value);
+    my $res = Encode::from_to( $value, "utf-8", $enc );
+    $value = encode_mimeword( $value,  'B', $enc );
+}
 
 # }}}
 
+eval "require RT::Action::SendEmail_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/SendEmail_Vendor.pm});
+eval "require RT::Action::SendEmail_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/SendEmail_Local.pm});
+
 1;
 
diff --git a/rt/lib/RT/Action/SetPriority.pm b/rt/lib/RT/Action/SetPriority.pm
new file mode 100644
index 000000000..515eeb58c
--- /dev/null
+++ b/rt/lib/RT/Action/SetPriority.pm
@@ -0,0 +1,61 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+package RT::Action::SetPriority;
+require RT::Action::Generic;
+
+use strict;
+use vars qw/@ISA/;
+@ISA=qw(RT::Action::Generic);
+
+#Do what we need to do and send it out.
+
+#What does this type of Action does
+
+# {{{ sub Describe 
+sub Describe  {
+  my $self = shift;
+  return (ref $self . " will set a ticket's priority to the argument provided.");
+}
+# }}}
+
+
+# {{{ sub Prepare 
+sub Prepare  {
+    # nothing to prepare
+    return 1;
+}
+# }}}
+
+sub Commit {
+    my $self = shift;
+    $self->TicketObj->SetPriority($self->Argument);
+
+}
+
+eval "require RT::Action::SetPriority_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/SetPriority_Vendor.pm});
+eval "require RT::Action::SetPriority_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/SetPriority_Local.pm});
+
+1;
diff --git a/rt/lib/RT/Action/UserDefined.pm b/rt/lib/RT/Action/UserDefined.pm
new file mode 100644
index 000000000..e2e3d72ce
--- /dev/null
+++ b/rt/lib/RT/Action/UserDefined.pm
@@ -0,0 +1,71 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+ 
+
+package RT::Action::UserDefined;
+use RT::Action::Generic;
+
+use strict;
+use vars qw/@ISA/;
+@ISA = qw(RT::Action::Generic);
+
+=head2 Prepare
+
+This happens on every transaction. it's always applicable
+
+=cut
+
+sub Prepare {
+    my $self = shift;
+    my $retval = eval $self->ScripObj->CustomPrepareCode;
+    if ($@) {
+        $RT::Logger->error("Scrip ".$self->ScripObj->Id. " Prepare failed: ".$@);
+        return (undef);
+    }
+    return ($retval);
+}
+
+=head2 Commit
+
+This happens on every transaction. it's always applicable
+
+=cut
+
+sub Commit {
+    my $self = shift;
+    my $retval = eval $self->ScripObj->CustomCommitCode;
+    if ($@) {
+        $RT::Logger->error("Scrip ".$self->ScripObj->Id. " Commit failed: ".$@);
+        return (undef);
+    }
+    return ($retval);
+}
+
+eval "require RT::Action::UserDefined_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/UserDefined_Vendor.pm});
+eval "require RT::Action::UserDefined_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/UserDefined_Local.pm});
+
+1;
+
diff --git a/rt/lib/RT/Attachment.pm b/rt/lib/RT/Attachment.pm
index 916ac355e..2ed520162 100755
--- a/rt/lib/RT/Attachment.pm
+++ b/rt/lib/RT/Attachment.pm
@@ -1,423 +1,372 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attachment.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Copyright 2000 Jesse Vincent <jesse@fsck.com>
-# Released under the terms of the GNU Public License
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::Attachment -- an RT attachment object
+RT::Attachment
+
 
 =head1 SYNOPSIS
 
-  use RT::Attachment;
+=head1 DESCRIPTION
 
+=head1 METHODS
 
-=head1 DESCRIPTION
+=cut
 
-This module should never be instantiated directly by client code. it's an internal 
-module which should only be instantiated through exported APIs in Ticket, Queue and other 
-similar objects.
+package RT::Attachment;
+use RT::Record; 
+
+
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
+
+sub _Init {
+  my $self = shift; 
+
+  $self->Table('Attachments');
+  $self->SUPER::_Init(@_);
+}
 
 
-=head1 METHODS
 
 
-=begin testing
 
-ok (require RT::TestHarness);
-ok (require RT::Attachment);
+=item Create PARAMHASH
 
-=end testing
+Create takes a hash of values and creates a row in the database:
+
+  int(11) 'TransactionId'.
+  int(11) 'Parent'.
+  varchar(160) 'MessageId'.
+  varchar(255) 'Subject'.
+  varchar(255) 'Filename'.
+  varchar(80) 'ContentType'.
+  varchar(80) 'ContentEncoding'.
+  longtext 'Content'.
+  longtext 'Headers'.
 
 =cut
 
-package RT::Attachment;
-use RT::Record;
-use MIME::Base64;
-use vars qw|@ISA|;
-@ISA= qw(RT::Record);
-
-# {{{ sub _Init
-sub _Init  {
-    my $self = shift; 
-    $self->{'table'} = "Attachments";
-    return($self->SUPER::_Init(@_));
-}
-# }}}
 
-# {{{ sub _ClassAccessible 
-sub _ClassAccessible {
-    {
-    TransactionId   => { 'read'=>1, 'public'=>1, },
-    MessageId       => { 'read'=>1, },
-    Parent          => { 'read'=>1, },
-    ContentType     => { 'read'=>1, },
-    Subject         => { 'read'=>1, },
-    Content         => { 'read'=>1, },
-    ContentEncoding => { 'read'=>1, },
-    Headers         => { 'read'=>1, },
-    Filename        => { 'read'=>1, },
-    Creator         => { 'read'=>1, 'auto'=>1, },
-    Created         => { 'read'=>1, 'auto'=>1, },
-  };
+
+
+sub Create {
+    my $self = shift;
+    my %args = ( 
+                TransactionId => '0',
+                Parent => '0',
+                MessageId => '',
+                Subject => '',
+                Filename => '',
+                ContentType => '',
+                ContentEncoding => '',
+                Content => '',
+                Headers => '',
+
+		  @_);
+    $self->SUPER::Create(
+                         TransactionId => $args{'TransactionId'},
+                         Parent => $args{'Parent'},
+                         MessageId => $args{'MessageId'},
+                         Subject => $args{'Subject'},
+                         Filename => $args{'Filename'},
+                         ContentType => $args{'ContentType'},
+                         ContentEncoding => $args{'ContentEncoding'},
+                         Content => $args{'Content'},
+                         Headers => $args{'Headers'},
+);
+
 }
-# }}}
 
-# {{{ sub TransactionObj 
 
-=head2 TransactionObj
 
-Returns the transaction object asscoiated with this attachment.
+=item id
+
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
+
 
 =cut
 
-sub TransactionObj {
-    require RT::Transaction;
-    my $self=shift;
-    unless (exists $self->{_TransactionObj}) {
-	$self->{_TransactionObj}=RT::Transaction->new($self->CurrentUser);
-	$self->{_TransactionObj}->Load($self->TransactionId);
-    }
-    return $self->{_TransactionObj};
-}
 
-# }}}
+=item TransactionId
+
+Returns the current value of TransactionId. 
+(In the database, TransactionId is stored as int(11).)
 
-# {{{ sub Create 
 
-=head2 Create
 
-Create a new attachment. Takes a paramhash:
-    
-    'Attachment' Should be a single MIME body with optional subparts
-    'Parent' is an optional Parent RT::Attachment object
-    'TransactionId' is the mandatory id of the Transaction this attachment is associated with.;
+=item SetTransactionId VALUE
+
+
+Set TransactionId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, TransactionId will be stored as a int(11).)
+
 
 =cut
 
-sub Create  {
-    my $self = shift;
-    my ($id);
-    my %args = ( id => 0,
-		 TransactionId => 0,
-		 Parent => 0,
-		 Attachment => undef,
-		 @_
-	       );
-    
-    
-    #For ease of reference
-    my $Attachment = $args{'Attachment'};
-    
-    #if we didn't specify a ticket, we need to bail
-    if ( $args{'TransactionId'} == 0) {
-	$RT::Logger->crit("RT::Attachment->Create couldn't, as you didn't specify a transaction\n");
-	return (0);
-	
-    }
-    
-    #If we possibly can, collapse it to a singlepart
-    $Attachment->make_singlepart;
-    
-    #Get the subject
-    my $Subject = $Attachment->head->get('subject',0);
-    defined($Subject) or $Subject = '';
-    chomp($Subject);
-  
-    #Get the filename
-    my $Filename = $Attachment->head->recommended_filename;
-    
-    if ($Attachment->parts) {
-	$id = $self->SUPER::Create(TransactionId => $args{'TransactionId'},
-				   Parent => 0,
-				   ContentType  => $Attachment->mime_type,
-				   Headers => $Attachment->head->as_string,
-				   Subject => $Subject,
-				   
-				  );
- 	foreach my $part ($Attachment->parts) {	
-	    my $SubAttachment = new RT::Attachment($self->CurrentUser);
-	    $SubAttachment->Create(TransactionId => $args{'TransactionId'},
-				   Parent => $id,
-				   Attachment => $part,
-				   ContentType  => $Attachment->mime_type,
-				   Headers => $Attachment->head->as_string(),
-				   
-				  );
-	}
-	return ($id);
-    }
-  
-  
-    #If it's not multipart
-    else {
-	
-	my $ContentEncoding = 'none'; 
-	
-	my $Body = $Attachment->bodyhandle->as_string;
-	
-	#get the max attachment length from RT
-	my $MaxSize = $RT::MaxAttachmentSize;
-	
-	#if the current attachment contains nulls and the 
-	#database doesn't support embedded nulls
-	
-	if ( (! $RT::Handle->BinarySafeBLOBs) &&
-	     ( $Body =~ /\x00/ ) ) {
-	    # set a flag telling us to mimencode the attachment
-	    $ContentEncoding = 'base64';
-	    
-	    #cut the max attchment size by 25% (for mime-encoding overhead.
-	    $RT::Logger->debug("Max size is $MaxSize\n");
-	    $MaxSize = $MaxSize * 3/4;	
-	}
-	
-	#if the attachment is larger than the maximum size
-	if (($MaxSize) and ($MaxSize < length($Body))) {
-	    # if we're supposed to truncate large attachments
-	    if ($RT::TruncateLongAttachments) {
-		# truncate the attachment to that length.
-		$Body = substr ($Body, 0, $MaxSize);
-
-	    }
-	    
-	    # elsif we're supposed to drop large attachments on the floor,
-	    elsif ($RT::DropLongAttachments) {
-		# drop the attachment on the floor
-		$RT::Logger->info("$self: Dropped an attachment of size ". length($Body).
-				  "\n". "It started: ". substr($Body, 0, 60) . "\n");
-		return(undef);
-	    }
-	}
-	# if we need to mimencode the attachment
-	if ($ContentEncoding eq 'base64') {
-	    # base64 encode the attachment
-	    $Body = MIME::Base64::encode_base64($Body);
-	    
-	}
-	
-	my $id = $self->SUPER::Create(TransactionId => $args{'TransactionId'},
-				      ContentType  => $Attachment->mime_type,
-				      ContentEncoding => $ContentEncoding,
-				      Parent => $args{'Parent'},
-				      Content => $Body,
-				      Headers => $Attachment->head->as_string,
-				      Subject => $Subject,
-				      Filename => $Filename,
-				     );
-	return ($id);
-    }
-}
 
-# }}}
+=item Parent
+
+Returns the current value of Parent. 
+(In the database, Parent is stored as int(11).)
+
 
 
-# {{{ sub Content
+=item SetParent VALUE
 
-=head2 Content
 
-Returns the attachment's content. if it's base64 encoded, decode it 
-before returning it.
+Set Parent to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Parent will be stored as a int(11).)
+
 
 =cut
 
-sub Content {
-  my $self = shift;
-  if ( $self->ContentEncoding eq 'none' || ! $self->ContentEncoding ) {
-      return $self->_Value('Content');
-  } elsif ( $self->ContentEncoding eq 'base64' ) {
-      return MIME::Base64::decode_base64($self->_Value('Content'));
-  } else {
-      return( "Unknown ContentEncoding ". $self->ContentEncoding);
-  }
-}
 
+=item MessageId
+
+Returns the current value of MessageId. 
+(In the database, MessageId is stored as varchar(160).)
 
-# }}}
 
-# {{{ sub Children
 
-=head2 Children
+=item SetMessageId VALUE
+
+
+Set MessageId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, MessageId will be stored as a varchar(160).)
 
-  Returns an RT::Attachments object which is preloaded with all Attachments objects with this Attachment\'s Id as their 'Parent'
 
 =cut
 
-sub Children {
-    my $self = shift;
-    
-    my $kids = new RT::Attachments($self->CurrentUser);
-    $kids->ChildrenOf($self->Id);
-    return($kids);
-}
 
-# }}}
+=item Subject
 
-# {{{ UTILITIES
+Returns the current value of Subject. 
+(In the database, Subject is stored as varchar(255).)
 
-# {{{ sub Quote 
 
 
+=item SetSubject VALUE
 
-sub Quote {
-    my $self=shift;
-    my %args=(Reply=>undef, # Prefilled reply (i.e. from the KB/FAQ system)
-	      @_);
 
-    my ($quoted_content, $body, $headers);
-    my $max=0;
+Set Subject to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Subject will be stored as a varchar(255).)
 
-    # TODO: Handle Multipart/Mixed (eventually fix the link in the
-    # ShowHistory web template?)
-    if ($self->ContentType =~ m{^(text/plain|message)}i) {
-	$body=$self->Content;
 
-	# Do we need any preformatting (wrapping, that is) of the message?
+=cut
 
-	# Remove quoted signature.
-	$body =~ s/\n-- \n(.*)$//s;
 
-	# What's the longest line like?
-	foreach (split (/\n/,$body)) {
-	    $max=length if ( length > $max);
-	}
+=item Filename
 
-	if ($max>76) {
-	    require Text::Wrapper;
-	    my $wrapper=new Text::Wrapper
-		(
-		 columns => 70, 
-		 body_start => ($max > 70*3 ? '   ' : ''),
-		 par_start => ''
-		 );
-	    $body=$wrapper->wrap($body);
-	}
+Returns the current value of Filename. 
+(In the database, Filename is stored as varchar(255).)
 
-	$body =~ s/^/> /gm;
 
-	$body = '[' . $self->TransactionObj->CreatorObj->Name() . ' - ' . $self->TransactionObj->CreatedAsString()
-	            . "]:\n\n"
-   	        . $body . "\n\n";
 
-    } else {
-	$body = "[Non-text message not quoted]\n\n";
-    }
-    
-    $max=60 if $max<60;
-    $max=70 if $max>78;
-    $max+=2;
+=item SetFilename VALUE
+
+
+Set Filename to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Filename will be stored as a varchar(255).)
+
+
+=cut
+
+
+=item ContentType
+
+Returns the current value of ContentType. 
+(In the database, ContentType is stored as varchar(80).)
+
 
-    return (\$body, $max);
-}
-# }}}
 
-# {{{ sub NiceHeaders - pulls out only the most relevant headers
+=item SetContentType VALUE
 
-=head2 NiceHeaders
 
-Returns the To, From, Cc, Date and Subject headers.
+Set ContentType to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ContentType will be stored as a varchar(80).)
 
-It is a known issue that this breaks if any of these headers are not
-properly unfolded.
 
 =cut
 
-sub NiceHeaders {
-    my $self=shift;
-    my $hdrs="";
-    for (split(/\n/,$self->Headers)) {
-	    $hdrs.="$_\n" if /^(To|From|RT-Send-Cc|Cc|Date|Subject): /i
-    }
-    return $hdrs;
-}
-# }}}
 
-# {{{ sub Headers
+=item ContentEncoding
+
+Returns the current value of ContentEncoding. 
+(In the database, ContentEncoding is stored as varchar(80).)
+
+
 
-=head2 Headers
+=item SetContentEncoding VALUE
+
+
+Set ContentEncoding to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ContentEncoding will be stored as a varchar(80).)
 
-Returns this object's headers as a string.  This method specifically
-removes the RT-Send-Bcc: header, so as to never reveal to whom RT sent a Bcc.
-We need to record the RT-Send-Cc and RT-Send-Bcc values so that we can actually send
-out mail. (The mailing rules are seperated from the ticket update code by
-an abstraction barrier that makes it impossible to pass this data directly
 
 =cut
 
-sub Headers {
-    my $self = shift;
-    my $hdrs="";
-    for (split(/\n/,$self->SUPER::Headers)) {
-	    $hdrs.="$_\n" unless /^(RT-Send-Bcc): /i
-    }
-    return $hdrs;
-}
+
+=item Content
+
+Returns the current value of Content. 
+(In the database, Content is stored as longtext.)
 
 
-# }}}
 
-# {{{ sub GetHeader
+=item SetContent VALUE
 
-=head2 GetHeader ( 'Tag')
 
-Returns the value of the header Tag as a string. This bypasses the weeding out
-done in Headers() above.
+Set Content to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Content will be stored as a longtext.)
+
 
 =cut
 
-sub GetHeader {
-    my $self = shift;
-    my $tag = shift;
-    foreach my $line (split(/\n/,$self->SUPER::Headers)) {
-        $RT::Logger->debug( "Does $line match $tag\n");
-        if ($line =~ /^$tag:\s+(.*)$/i) { #if we find the header, return its value
-            return ($1);
-        }
-    }
-    
-    # we found no header. return an empty string
-    return undef;
-}
-# }}}
 
-# {{{ sub _Value 
+=item Headers
 
-=head2 _Value
+Returns the current value of Headers. 
+(In the database, Headers is stored as longtext.)
+
+
+
+=item SetHeaders VALUE
+
+
+Set Headers to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Headers will be stored as a longtext.)
 
-Takes the name of a table column.
-Returns its value as a string, if the user passes an ACL check
 
 =cut
 
-sub _Value  {
 
-    my $self = shift;
-    my $field = shift;
-    
-    
-    #if the field is public, return it.
-    if ($self->_Accessible($field, 'public')) {
-	#$RT::Logger->debug("Skipping ACL check for $field\n");
-	return($self->__Value($field));
-	
-    }
-    
-    #If it's a comment, we need to be extra special careful
-    elsif ( (($self->TransactionObj->CurrentUserHasRight('ShowTicketComments')) and
-	     ($self->TransactionObj->Type eq 'Comment') )  or
-	    ($self->TransactionObj->CurrentUserHasRight('ShowTicket'))) {
-	
-	return($self->__Value($field));
-    }
-    #if they ain't got rights to see, don't let em
-    else {
-	    return(undef);
-	}
-    	
-    
-}
+=item Creator
+
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
+
+
+=cut
+
+
+=item Created
 
-# }}}
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
+
+
+=cut
+
+
+
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        TransactionId => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Parent => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        MessageId => 
+		{read => 1, write => 1, type => 'varchar(160)', default => ''},
+        Subject => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        Filename => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        ContentType => 
+		{read => 1, write => 1, type => 'varchar(80)', default => ''},
+        ContentEncoding => 
+		{read => 1, write => 1, type => 'varchar(80)', default => ''},
+        Content => 
+		{read => 1, write => 1, type => 'longtext', default => ''},
+        Headers => 
+		{read => 1, write => 1, type => 'longtext', default => ''},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+
+ }
+};
+
+
+        eval "require RT::Attachment_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Attachment_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Attachment_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Attachment_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Attachment_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Attachment_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Attachment_Overlay, RT::Attachment_Vendor, RT::Attachment_Local
+
+=cut
 
-# }}}
 
 1;
diff --git a/rt/lib/RT/Attachment_Overlay.pm b/rt/lib/RT/Attachment_Overlay.pm
new file mode 100644
index 000000000..d31aa75ad
--- /dev/null
+++ b/rt/lib/RT/Attachment_Overlay.pm
@@ -0,0 +1,571 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 SYNOPSIS
+
+  use RT::Attachment;
+
+
+=head1 DESCRIPTION
+
+This module should never be instantiated directly by client code. it's an internal 
+module which should only be instantiated through exported APIs in Ticket, Queue and other 
+similar objects.
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::Attachment);
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+use MIME::Base64;
+use MIME::QuotedPrint;
+
+# {{{ sub _ClassAccessible 
+sub _ClassAccessible {
+    {
+    TransactionId   => { 'read'=>1, 'public'=>1, },
+    MessageId       => { 'read'=>1, },
+    Parent          => { 'read'=>1, },
+    ContentType     => { 'read'=>1, },
+    Subject         => { 'read'=>1, },
+    Content         => { 'read'=>1, },
+    ContentEncoding => { 'read'=>1, },
+    Headers         => { 'read'=>1, },
+    Filename        => { 'read'=>1, },
+    Creator         => { 'read'=>1, 'auto'=>1, },
+    Created         => { 'read'=>1, 'auto'=>1, },
+  };
+}
+# }}}
+
+# {{{ sub TransactionObj 
+
+=head2 TransactionObj
+
+Returns the transaction object asscoiated with this attachment.
+
+=cut
+
+sub TransactionObj {
+    require RT::Transaction;
+    my $self=shift;
+    unless (exists $self->{_TransactionObj}) {
+	$self->{_TransactionObj}=RT::Transaction->new($self->CurrentUser);
+	$self->{_TransactionObj}->Load($self->TransactionId);
+    }
+    return $self->{_TransactionObj};
+}
+
+# }}}
+
+# {{{ sub Create 
+
+=head2 Create
+
+Create a new attachment. Takes a paramhash:
+    
+    'Attachment' Should be a single MIME body with optional subparts
+    'Parent' is an optional Parent RT::Attachment object
+    'TransactionId' is the mandatory id of the Transaction this attachment is associated with.;
+
+=cut
+
+sub Create {
+    my $self = shift;
+    my ($id);
+    my %args = ( id            => 0,
+                 TransactionId => 0,
+                 Parent        => 0,
+                 Attachment    => undef,
+                 @_ );
+
+    #For ease of reference
+    my $Attachment = $args{'Attachment'};
+
+    #if we didn't specify a ticket, we need to bail
+    if ( $args{'TransactionId'} == 0 ) {
+        $RT::Logger->crit( "RT::Attachment->Create couldn't, as you didn't specify a transaction\n" );
+        return (0);
+
+    }
+
+    #If we possibly can, collapse it to a singlepart
+    $Attachment->make_singlepart;
+
+    #Get the subject
+    my $Subject = $Attachment->head->get( 'subject', 0 );
+    defined($Subject) or $Subject = '';
+    chomp($Subject);
+
+    #Get the filename
+    my $Filename = $Attachment->head->recommended_filename || eval {
+	${ $Attachment->head->{mail_hdr_hash}{'Content-Disposition'}[0] }
+	    =~ /^.*\bfilename="(.*)"$/ ? $1 : ''
+    };
+
+    if ( $Attachment->parts ) {
+        $id = $self->SUPER::Create(
+            TransactionId => $args{'TransactionId'},
+            Parent        => 0,
+            ContentType   => $Attachment->mime_type,
+            Headers => $Attachment->head->as_string,
+            Subject => $Subject);
+
+        foreach my $part ( $Attachment->parts ) {
+            my $SubAttachment = new RT::Attachment( $self->CurrentUser );
+            $SubAttachment->Create(
+                TransactionId => $args{'TransactionId'},
+                Parent        => $id,
+                Attachment    => $part,
+                ContentType   => $Attachment->mime_type,
+                Headers       => $Attachment->head->as_string(),
+
+            );
+        }
+        return ($id);
+    }
+
+    #If it's not multipart
+    else {
+
+        my $ContentEncoding = 'none';
+
+        my $Body = $Attachment->bodyhandle->as_string;
+
+        #get the max attachment length from RT
+        my $MaxSize = $RT::MaxAttachmentSize;
+
+        #if the current attachment contains nulls and the 
+        #database doesn't support embedded nulls
+
+        if ( $RT::AlwaysUseBase64 or
+	     ( !$RT::Handle->BinarySafeBLOBs ) && ( $Body =~ /\x00/ ) ) {
+
+            # set a flag telling us to mimencode the attachment
+            $ContentEncoding = 'base64';
+
+            #cut the max attchment size by 25% (for mime-encoding overhead.
+            $RT::Logger->debug("Max size is $MaxSize\n");
+            $MaxSize = $MaxSize * 3 / 4;
+        # Some databases (postgres) can't handle non-utf8 data 
+        } elsif (    !$RT::Handle->BinarySafeBLOBs
+                  && $Attachment->mime_type !~ /text\/plain/gi
+                  && !Encode::is_utf8( $Body, 1 ) ) {
+              $ContentEncoding = 'quoted-printable';
+        }
+
+        #if the attachment is larger than the maximum size
+        if ( ($MaxSize) and ( $MaxSize < length($Body) ) ) {
+
+            # if we're supposed to truncate large attachments
+            if ($RT::TruncateLongAttachments) {
+
+                # truncate the attachment to that length.
+                $Body = substr( $Body, 0, $MaxSize );
+
+            }
+
+            # elsif we're supposed to drop large attachments on the floor,
+            elsif ($RT::DropLongAttachments) {
+
+                # drop the attachment on the floor
+                $RT::Logger->info( "$self: Dropped an attachment of size " . length($Body) . "\n" . "It started: " . substr( $Body, 0, 60 ) . "\n" );
+                return (undef);
+            }
+        }
+
+        # if we need to mimencode the attachment
+        if ( $ContentEncoding eq 'base64' ) {
+
+            # base64 encode the attachment
+            Encode::_utf8_off($Body);
+            $Body = MIME::Base64::encode_base64($Body);
+
+        } elsif ($ContentEncoding eq 'quoted-printable') {
+       	    Encode::_utf8_off($Body);
+            $Body = MIME::QuotedPrint::encode($Body);
+        }
+
+
+        my $id = $self->SUPER::Create( TransactionId => $args{'TransactionId'},
+                                       ContentType   => $Attachment->mime_type,
+                                       ContentEncoding => $ContentEncoding,
+                                       Parent          => $args{'Parent'},
+                                       Headers       =>  $Attachment->head->as_string, 
+                                       Subject       =>  $Subject,
+                                       Content         => $Body,
+                                       Filename => $Filename, );
+        return ($id);
+    }
+}
+
+# }}}
+
+
+=head2 Import
+
+Create an attachment exactly as specified in the named parameters.
+
+=cut
+
+
+sub Import {
+    my $self = shift;
+    return($self->SUPER::Create(@_));
+}
+
+# {{{ sub Content
+
+=head2 Content
+
+Returns the attachment's content. if it's base64 encoded, decode it 
+before returning it.
+
+=cut
+
+sub Content {
+  my $self = shift;
+  my $decode_utf8 = (($self->ContentType eq 'text/plain') ? 1 : 0);
+
+  if ( $self->ContentEncoding eq 'none' || ! $self->ContentEncoding ) {
+      return $self->_Value(
+	  'Content',
+	  decode_utf8 => $decode_utf8,
+      );
+  } elsif ( $self->ContentEncoding eq 'base64' ) {
+      return ( $decode_utf8
+        ? Encode::decode_utf8(MIME::Base64::decode_base64($self->_Value('Content')))
+        : MIME::Base64::decode_base64($self->_Value('Content'))
+      );
+  } elsif ( $self->ContentEncoding eq 'quoted-printable' ) {
+      return ( $decode_utf8
+        ? Encode::decode_utf8(MIME::QuotedPrint::decode($self->_Value('Content')))
+        : MIME::QuotedPrint::decode($self->_Value('Content'))
+      );
+  } else {
+      return( $self->loc("Unknown ContentEncoding [_1]", $self->ContentEncoding));
+  }
+}
+
+
+# }}}
+
+
+# {{{ sub OriginalContent
+
+=head2 OriginalContent
+
+Returns the attachment's content as octets before RT's mangling.
+Currently, this just means restoring text/plain content back to its
+original encoding.
+
+=cut
+
+sub OriginalContent {
+  my $self = shift;
+
+  return $self->Content unless $self->ContentType eq 'text/plain';
+  my $enc = $self->OriginalEncoding;
+
+  my $content;
+  if ( $self->ContentEncoding eq 'none' || ! $self->ContentEncoding ) {
+      $content = $self->_Value('Content', decode_utf8 => 0);
+  } elsif ( $self->ContentEncoding eq 'base64' ) {
+      $content = MIME::Base64::decode_base64($self->_Value('Content', decode_utf8 => 0));
+  } elsif ( $self->ContentEncoding eq 'quoted-printable' ) {
+      return MIME::QuotedPrint::decode($self->_Value('Content', decode_utf8 => 0));
+  } else {
+      return( $self->loc("Unknown ContentEncoding [_1]", $self->ContentEncoding));
+  }
+
+  # Encode::_utf8_on($content);
+  if (!$enc or $enc eq 'utf8' or $enc eq 'utf-8') {
+    # If we somehow fail to do the decode, at least push out the raw bits
+    eval {return( Encode::decode_utf8($content))} || return ($content);
+  }
+  Encode::from_to($content, 'utf8' => $enc);
+  return $content;
+}
+
+# }}}
+
+
+# {{{ sub OriginalEncoding
+
+=head2 OriginalEncoding
+
+Returns the attachment's original encoding.
+
+=cut
+
+sub OriginalEncoding {
+  my $self = shift;
+  return $self->GetHeader('X-RT-Original-Encoding');
+}
+
+# }}}
+
+# {{{ sub Children
+
+=head2 Children
+
+  Returns an RT::Attachments object which is preloaded with all Attachments objects with this Attachment\'s Id as their 'Parent'
+
+=cut
+
+sub Children {
+    my $self = shift;
+    
+    my $kids = new RT::Attachments($self->CurrentUser);
+    $kids->ChildrenOf($self->Id);
+    return($kids);
+}
+
+# }}}
+
+# {{{ UTILITIES
+
+# {{{ sub Quote 
+
+
+
+sub Quote {
+    my $self=shift;
+    my %args=(Reply=>undef, # Prefilled reply (i.e. from the KB/FAQ system)
+	      @_);
+
+    my ($quoted_content, $body, $headers);
+    my $max=0;
+
+    # TODO: Handle Multipart/Mixed (eventually fix the link in the
+    # ShowHistory web template?)
+    if ($self->ContentType =~ m{^(text/plain|message)}i) {
+	$body=$self->Content;
+
+	# Do we need any preformatting (wrapping, that is) of the message?
+
+	# Remove quoted signature.
+	$body =~ s/\n-- \n(.*)$//s;
+
+	# What's the longest line like?
+	foreach (split (/\n/,$body)) {
+	    $max=length if ( length > $max);
+	}
+
+	if ($max>76) {
+	    require Text::Wrapper;
+	    my $wrapper=new Text::Wrapper
+		(
+		 columns => 70, 
+		 body_start => ($max > 70*3 ? '   ' : ''),
+		 par_start => ''
+		 );
+	    $body=$wrapper->wrap($body);
+	}
+
+	$body =~ s/^/> /gm;
+
+	$body = '[' . $self->TransactionObj->CreatorObj->Name() . ' - ' . $self->TransactionObj->CreatedAsString()
+	            . "]:\n\n"
+   	        . $body . "\n\n";
+
+    } else {
+	$body = "[Non-text message not quoted]\n\n";
+    }
+    
+    $max=60 if $max<60;
+    $max=70 if $max>78;
+    $max+=2;
+
+    return (\$body, $max);
+}
+# }}}
+
+# {{{ sub NiceHeaders - pulls out only the most relevant headers
+
+=head2 NiceHeaders
+
+Returns the To, From, Cc, Date and Subject headers.
+
+It is a known issue that this breaks if any of these headers are not
+properly unfolded.
+
+=cut
+
+sub NiceHeaders {
+    my $self=shift;
+    my $hdrs="";
+    for (split(/\n/,$self->Headers)) {
+	    $hdrs.="$_\n" if /^(To|From|RT-Send-Cc|Cc|Date|Subject): /i
+    }
+    return $hdrs;
+}
+# }}}
+
+# {{{ sub Headers
+
+=head2 Headers
+
+Returns this object's headers as a string.  This method specifically
+removes the RT-Send-Bcc: header, so as to never reveal to whom RT sent a Bcc.
+We need to record the RT-Send-Cc and RT-Send-Bcc values so that we can actually send
+out mail. (The mailing rules are seperated from the ticket update code by
+an abstraction barrier that makes it impossible to pass this data directly
+
+=cut
+
+sub Headers {
+    my $self = shift;
+    my $hdrs="";
+    for (split(/\n/,$self->SUPER::Headers)) {
+	    $hdrs.="$_\n" unless /^(RT-Send-Bcc): /i
+    }
+    return $hdrs;
+}
+
+
+# }}}
+
+# {{{ sub GetHeader
+
+=head2 GetHeader ( 'Tag')
+
+Returns the value of the header Tag as a string. This bypasses the weeding out
+done in Headers() above.
+
+=cut
+
+sub GetHeader {
+    my $self = shift;
+    my $tag = shift;
+    foreach my $line (split(/\n/,$self->SUPER::Headers)) {
+        if ($line =~ /^\Q$tag\E:\s+(.*)$/i) { #if we find the header, return its value
+            return ($1);
+        }
+    }
+    
+    # we found no header. return an empty string
+    return undef;
+}
+# }}}
+
+# {{{ sub SetHeader
+
+=head2 SetHeader ( 'Tag', 'Value' )
+
+Replace or add a Header to the attachment's headers.
+
+=cut
+
+sub SetHeader {
+    my $self = shift;
+    my $tag = shift;
+    my $newheader = '';
+
+    foreach my $line (split(/\n/,$self->SUPER::Headers)) {
+        if (defined $tag and $line =~ /^\Q$tag\E:\s+(.*)$/i) {
+	    $newheader .= "$tag: $_[0]\n";
+	    undef $tag;
+        }
+	else {
+	    $newheader .= "$line\n";
+	}
+    }
+
+    $newheader .= "$tag: $_[0]\n" if defined $tag;
+    $self->__Set( Field => 'Headers', Value => $newheader);
+}
+# }}}
+
+# {{{ sub _Value 
+
+=head2 _Value
+
+Takes the name of a table column.
+Returns its value as a string, if the user passes an ACL check
+
+=cut
+
+sub _Value  {
+
+    my $self = shift;
+    my $field = shift;
+    
+    
+    #if the field is public, return it.
+    if ($self->_Accessible($field, 'public')) {
+	#$RT::Logger->debug("Skipping ACL check for $field\n");
+	return($self->__Value($field, @_));
+	
+    }
+    
+    #If it's a comment, we need to be extra special careful
+    elsif ( (($self->TransactionObj->CurrentUserHasRight('ShowTicketComments')) and
+	     ($self->TransactionObj->Type eq 'Comment') )  or
+	    ($self->TransactionObj->CurrentUserHasRight('ShowTicket'))) {
+		return($self->__Value($field, @_));
+    }
+    #if they ain't got rights to see, don't let em
+    else {
+	    return(undef);
+	}
+    	
+    
+}
+
+# }}}
+
+sub ContentLength {
+    my $self = shift;
+
+    unless ( (($self->TransactionObj->CurrentUserHasRight('ShowTicketComments')) and
+	     ($self->TransactionObj->Type eq 'Comment') )  or
+	    ($self->TransactionObj->CurrentUserHasRight('ShowTicket'))) {
+	return undef;
+    }
+
+    if (my $len = $self->GetHeader('Content-Length')) {
+	return $len;
+    }
+
+    {
+	use bytes;
+	my $len = length($self->Content);
+	$self->SetHeader('Content-Length' => $len);
+	return $len;
+    }
+}
+
+# }}}
+
+1;
diff --git a/rt/lib/RT/Attachments.pm b/rt/lib/RT/Attachments.pm
index 73cd350a4..177cdd094 100755
--- a/rt/lib/RT/Attachments.pm
+++ b/rt/lib/RT/Attachments.pm
@@ -1,99 +1,115 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attachments.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::Attachments - a collection of RT::Attachment objects
+=head1 NAME
 
+  RT::Attachments -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::Attachments;
+  use RT::Attachments
 
 =head1 DESCRIPTION
 
-This module should never be called directly by client code. it's an internal module which
-should only be accessed through exported APIs in Ticket, Queue and other similar objects.
-
 
 =head1 METHODS
 
+=cut
 
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Attachments);
+package RT::Attachments;
 
-=end testing
+use RT::SearchBuilder;
+use RT::Attachment;
 
-=cut
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-package RT::Attachments;
 
-use RT::EasySearch;
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'Attachments';
+    $self->{'primary_key'} = 'id';
 
-@ISA= qw(RT::EasySearch);
 
-# {{{ sub _Init  
-sub _Init   {
-  my $self = shift;
- 
-  $self->{'table'} = "Attachments";
-  $self->{'primary_key'} = "id";
-  return ( $self->SUPER::_Init(@_));
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
 
-# {{{ sub ContentType
+=item NewItem
 
-=head2 ContentType (VALUE => 'text/plain', ENTRYAGGREGATOR => 'OR', OPERATOR => '=' ) 
-
-Limit result set to attachments of ContentType 'TYPE'...
+Returns an empty new RT::Attachment item
 
 =cut
 
+sub NewItem {
+    my $self = shift;
+    return(RT::Attachment->new($self->CurrentUser));
+}
 
-sub ContentType  {
-  my $self = shift;
-  my %args = ( VALUE => 'text/plain',
-	       OPERATOR => '=',
-	       ENTRYAGGREGATOR => 'OR',
-	       @_);
+        eval "require RT::Attachments_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Attachments_Overlay.pm}) {
+            die $@;
+        };
 
-  $self->Limit ( FIELD => 'ContentType',
-		 VALUE => $args{'VALUE'},
-		 OPERATOR => $args{'OPERATOR'},
-		 ENTRYAGGREGATOR => $args{'ENTRYAGGREGATOR'});
-}
-# }}}
+        eval "require RT::Attachments_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Attachments_Vendor.pm}) {
+            die $@;
+        };
 
-# {{{ sub ChildrenOf 
+        eval "require RT::Attachments_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Attachments_Local.pm}) {
+            die $@;
+        };
 
-=head2 ChildrenOf ID
 
-Limit result set to children of Attachment ID
 
-=cut
 
+=head1 SEE ALSO
 
-sub ChildrenOf  {
-  my $self = shift;
-  my $attachment = shift;
-  $self->Limit ( FIELD => 'Parent',
-		 VALUE => $attachment);
-}
-# }}}
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
-# {{{ sub NewItem 
-sub NewItem  {
-  my $self = shift;
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-  use RT::Attachment;
-  my $item = new RT::Attachment($self->CurrentUser);
-  return($item);
-}
-# }}}
-  1;
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
 
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
+RT::Attachments_Overlay, RT::Attachments_Vendor, RT::Attachments_Local
+
+=cut
 
 
+1;
diff --git a/rt/lib/RT/Attachments_Overlay.pm b/rt/lib/RT/Attachments_Overlay.pm
new file mode 100644
index 000000000..ce94c9dfa
--- /dev/null
+++ b/rt/lib/RT/Attachments_Overlay.pm
@@ -0,0 +1,116 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::Attachments - a collection of RT::Attachment objects
+
+=head1 SYNOPSIS
+
+  use RT::Attachments;
+
+=head1 DESCRIPTION
+
+This module should never be called directly by client code. it's an internal module which
+should only be accessed through exported APIs in Ticket, Queue and other similar objects.
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::Attachments);
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+# {{{ sub _Init  
+sub _Init   {
+  my $self = shift;
+ 
+  $self->{'table'} = "Attachments";
+  $self->{'primary_key'} = "id";
+  return ( $self->SUPER::_Init(@_));
+}
+# }}}
+
+
+# {{{ sub ContentType
+
+=head2 ContentType (VALUE => 'text/plain', ENTRYAGGREGATOR => 'OR', OPERATOR => '=' ) 
+
+Limit result set to attachments of ContentType 'TYPE'...
+
+=cut
+
+
+sub ContentType  {
+  my $self = shift;
+  my %args = ( VALUE => 'text/plain',
+	       OPERATOR => '=',
+	       ENTRYAGGREGATOR => 'OR',
+	       @_);
+
+  $self->Limit ( FIELD => 'ContentType',
+		 VALUE => $args{'VALUE'},
+		 OPERATOR => $args{'OPERATOR'},
+		 ENTRYAGGREGATOR => $args{'ENTRYAGGREGATOR'});
+}
+# }}}
+
+# {{{ sub ChildrenOf 
+
+=head2 ChildrenOf ID
+
+Limit result set to children of Attachment ID
+
+=cut
+
+
+sub ChildrenOf  {
+  my $self = shift;
+  my $attachment = shift;
+  $self->Limit ( FIELD => 'Parent',
+		 VALUE => $attachment);
+}
+# }}}
+
+# {{{ sub NewItem 
+sub NewItem  {
+  my $self = shift;
+
+  use RT::Attachment;
+  my $item = new RT::Attachment($self->CurrentUser);
+  return($item);
+}
+# }}}
+  1;
+
+
+
+
diff --git a/rt/lib/RT/Base.pm b/rt/lib/RT/Base.pm
new file mode 100644
index 000000000..3b2dcfd3d
--- /dev/null
+++ b/rt/lib/RT/Base.pm
@@ -0,0 +1,97 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+package RT::Base;
+use Carp;
+
+use strict;
+use vars qw(@EXPORT);
+
+@EXPORT=qw(loc CurrentUser);
+
+=head1 FUNCTIONS
+
+
+
+# {{{ sub CurrentUser 
+
+=head2 CurrentUser
+
+If called with an argument, sets the current user to that user object.
+This will affect ACL decisions, etc.  
+Returns the current user
+
+=cut
+
+sub CurrentUser {
+    my $self = shift;
+
+    if (@_) {
+        $self->{'user'} = shift;
+    }
+
+    unless ( $self->{'user'} ) {
+        $RT::Logger->err(
+                  "$self was created without a CurrentUser\n" . Carp::cluck() );
+        return (0);
+        die;
+    }
+    return ( $self->{'user'} );
+}
+
+# }}}
+
+
+
+=item loc LOC_STRING
+
+l is a method which takes a loc string
+to this object's CurrentUser->LanguageHandle for localization. 
+
+you call it like this:
+
+    $self->loc("I have [quant,_1,concrete mixer].", 6);
+
+In english, this would return:
+    I have 6 concrete mixers.
+
+
+=cut
+
+sub loc {
+    my $self = shift;
+    unless ($self->CurrentUser) {
+        use Carp;
+        Carp::confess("No currentuser");
+        return ("Critical error:$self has no CurrentUser", $self);
+    }
+    return($self->CurrentUser->loc(@_));
+}
+
+eval "require RT::Base_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Base_Vendor.pm});
+eval "require RT::Base_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Base_Local.pm});
+
+
+1;
diff --git a/rt/lib/RT/CachedGroupMember.pm b/rt/lib/RT/CachedGroupMember.pm
new file mode 100644
index 000000000..fc3e1bf00
--- /dev/null
+++ b/rt/lib/RT/CachedGroupMember.pm
@@ -0,0 +1,258 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
+
+=head1 NAME
+
+RT::CachedGroupMember
+
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=cut
+
+package RT::CachedGroupMember;
+use RT::Record; 
+
+
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
+
+sub _Init {
+  my $self = shift; 
+
+  $self->Table('CachedGroupMembers');
+  $self->SUPER::_Init(@_);
+}
+
+
+
+
+
+=item Create PARAMHASH
+
+Create takes a hash of values and creates a row in the database:
+
+  int(11) 'GroupId'.
+  int(11) 'MemberId'.
+  int(11) 'Via'.
+  int(11) 'ImmediateParentId'.
+  smallint(6) 'Disabled'.
+
+=cut
+
+
+
+
+sub Create {
+    my $self = shift;
+    my %args = ( 
+                GroupId => '',
+                MemberId => '',
+                Via => '',
+                ImmediateParentId => '',
+                Disabled => '0',
+
+		  @_);
+    $self->SUPER::Create(
+                         GroupId => $args{'GroupId'},
+                         MemberId => $args{'MemberId'},
+                         Via => $args{'Via'},
+                         ImmediateParentId => $args{'ImmediateParentId'},
+                         Disabled => $args{'Disabled'},
+);
+
+}
+
+
+
+=item id
+
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
+
+
+=cut
+
+
+=item GroupId
+
+Returns the current value of GroupId. 
+(In the database, GroupId is stored as int(11).)
+
+
+
+=item SetGroupId VALUE
+
+
+Set GroupId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, GroupId will be stored as a int(11).)
+
+
+=cut
+
+
+=item MemberId
+
+Returns the current value of MemberId. 
+(In the database, MemberId is stored as int(11).)
+
+
+
+=item SetMemberId VALUE
+
+
+Set MemberId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, MemberId will be stored as a int(11).)
+
+
+=cut
+
+
+=item Via
+
+Returns the current value of Via. 
+(In the database, Via is stored as int(11).)
+
+
+
+=item SetVia VALUE
+
+
+Set Via to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Via will be stored as a int(11).)
+
+
+=cut
+
+
+=item ImmediateParentId
+
+Returns the current value of ImmediateParentId. 
+(In the database, ImmediateParentId is stored as int(11).)
+
+
+
+=item SetImmediateParentId VALUE
+
+
+Set ImmediateParentId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ImmediateParentId will be stored as a int(11).)
+
+
+=cut
+
+
+=item Disabled
+
+Returns the current value of Disabled. 
+(In the database, Disabled is stored as smallint(6).)
+
+
+
+=item SetDisabled VALUE
+
+
+Set Disabled to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Disabled will be stored as a smallint(6).)
+
+
+=cut
+
+
+
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        GroupId => 
+		{read => 1, write => 1, type => 'int(11)', default => ''},
+        MemberId => 
+		{read => 1, write => 1, type => 'int(11)', default => ''},
+        Via => 
+		{read => 1, write => 1, type => 'int(11)', default => ''},
+        ImmediateParentId => 
+		{read => 1, write => 1, type => 'int(11)', default => ''},
+        Disabled => 
+		{read => 1, write => 1, type => 'smallint(6)', default => '0'},
+
+ }
+};
+
+
+        eval "require RT::CachedGroupMember_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/CachedGroupMember_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::CachedGroupMember_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/CachedGroupMember_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::CachedGroupMember_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/CachedGroupMember_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::CachedGroupMember_Overlay, RT::CachedGroupMember_Vendor, RT::CachedGroupMember_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/CachedGroupMember_Overlay.pm b/rt/lib/RT/CachedGroupMember_Overlay.pm
new file mode 100644
index 000000000..f2dc86f0d
--- /dev/null
+++ b/rt/lib/RT/CachedGroupMember_Overlay.pm
@@ -0,0 +1,323 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+use strict;
+no warnings qw(redefine);
+
+# {{{ Create
+
+=item Create PARAMHASH
+
+Create takes a hash of values and creates a row in the database:
+
+  'Group' is the "top level" group we're building the cache for. This is an 
+  RT::Principal object
+
+  'Member' is the RT::Principal  of the user or group we're adding
+  to the cache.
+
+  'ImmediateParent' is the RT::Principal of the group that this principal
+  belongs to to get here
+
+  int(11) 'Via' is an internal reference to CachedGroupMembers->Id of
+  the "parent" record of this cached group member. It should be empty if this
+  member is a "direct" member of this group. (In that case, it will be set to this 
+  cached group member's id after creation)
+
+  This routine should _only_ be called by GroupMember->Create
+
+=cut
+
+sub Create {
+    my $self = shift;
+    my %args = ( Group           => '',
+                 Member          => '',
+                 ImmediateParent => '',
+                 Via             => '0',
+                 Disabled        => '0',
+                 @_ );
+
+    unless (    $args{'Member'}
+             && UNIVERSAL::isa( $args{'Member'}, 'RT::Principal' )
+             && $args{'Member'}->Id ) {
+        $RT::Logger->debug("$self->Create: bogus Member argument");
+    }
+
+    unless (    $args{'Group'}
+             && UNIVERSAL::isa( $args{'Group'}, 'RT::Principal' )
+             && $args{'Group'}->Id ) {
+        $RT::Logger->debug("$self->Create: bogus Group argument");
+    }
+
+    unless (    $args{'ImmediateParent'}
+             && UNIVERSAL::isa( $args{'ImmediateParent'}, 'RT::Principal' )
+             && $args{'ImmediateParent'}->Id ) {
+        $RT::Logger->debug("$self->Create: bogus ImmediateParent argument");
+    }
+
+    # If the parent group for this group member is disabled, it's disabled too, along with all its children
+    if ( $args{'ImmediateParent'}->Disabled ) {
+        $args{'Disabled'} = $args{'ImmediateParent'}->Disabled;
+    }
+
+    my $id = $self->SUPER::Create(
+                              GroupId           => $args{'Group'}->Id,
+                              MemberId          => $args{'Member'}->Id,
+                              ImmediateParentId => $args{'ImmediateParent'}->Id,
+                              Disabled          => $args{'Disabled'},
+                              Via               => $args{'Via'}, );
+
+    unless ($id) {
+        $RT::Logger->warn( "Couldn't create "
+                           . $args{'Member'}
+                           . " as a cached member of "
+                           . $args{'Group'}->Id . " via "
+                           . $args{'Via'} );
+        return (undef);  #this will percolate up and bail out of the transaction
+    }
+    if ( $self->__Value('Via') == 0 ) {
+        my ( $vid, $vmsg ) = $self->__Set( Field => 'Via', Value => $id );
+        unless ($vid) {
+            $RT::Logger->warn( "Due to a via error, couldn't create "
+                               . $args{'Member'}
+                               . " as a cached member of "
+                               . $args{'Group'}->Id . " via "
+                               . $args{'Via'} );
+            return (undef)
+              ;          #this will percolate up and bail out of the transaction
+        }
+    }
+
+    if ( $args{'Member'}->IsGroup() ) {
+        my $GroupMembers = $args{'Member'}->Object->MembersObj();
+        while ( my $member = $GroupMembers->Next() ) {
+            my $cached_member =
+              RT::CachedGroupMember->new( $self->CurrentUser );
+            my $c_id = $cached_member->Create(
+                                             Group  => $args{'Group'},
+                                             Member => $member->MemberObj,
+                                             ImmediateParent => $args{'Member'},
+                                             Disabled => $args{'Disabled'},
+                                             Via      => $id );
+            unless ($c_id) {
+                return (undef);    #percolate the error upwards.
+                     # the caller will log an error and abort the transaction
+            }
+
+        }
+    }
+
+    return ($id);
+
+}
+
+# }}}
+
+# {{{ Delete
+
+=head2 Delete
+
+Deletes the current CachedGroupMember from the group it's in and cascades 
+the delete to all submembers. This routine could be completely excised if
+mysql supported foreign keys with cascading deletes.
+
+=cut 
+
+sub Delete {
+    my $self = shift;
+
+    
+    my $member = $self->MemberObj();
+    if ( $member->IsGroup ) {
+        my $deletable = RT::CachedGroupMembers->new( $self->CurrentUser );
+
+        $deletable->Limit( FIELD    => 'id',
+                           OPERATOR => '!=',
+                           VALUE    => $self->id );
+        $deletable->Limit( FIELD    => 'Via',
+                           OPERATOR => '=',
+                           VALUE    => $self->id );
+
+        while ( my $kid = $deletable->Next ) {
+            my $kid_err = $kid->Delete();
+            unless ($kid_err) {
+                $RT::Logger->error(
+                              "Couldn't delete CachedGroupMember " . $kid->Id );
+                return (undef);
+            }
+        }
+    }
+    my $err = $self->SUPER::Delete();
+    unless ($err) {
+        $RT::Logger->error( "Couldn't delete CachedGroupMember " . $self->Id );
+        return (undef);
+    }
+
+    # Unless $self->GroupObj still has the member recursively $self->MemberObj
+    # (Since we deleted the database row above, $self no longer counts)
+    unless ( $self->GroupObj->Object->HasMemberRecursively( $self->MemberObj ) ) {
+
+
+        #   Find all ACEs granted to $self->GroupId
+        my $acl = RT::ACL->new($RT::SystemUser);
+        $acl->LimitToPrincipal( Id => $self->GroupId );
+
+
+        while ( my $this_ace = $acl->Next() ) {
+            #       Find all ACEs which $self-MemberObj has delegated from $this_ace
+            my $delegations = RT::ACL->new($RT::SystemUser);
+            $delegations->DelegatedFrom( Id => $this_ace->Id );
+            $delegations->DelegatedBy( Id => $self->MemberId );
+
+            # For each delegation 
+            while ( my $delegation = $delegations->Next ) {
+                # WHACK IT
+                my $del_ret = $delegation->_Delete(InsideTransaction => 1);
+                unless ($del_ret) {
+                    $RT::Logger->crit("Couldn't delete an ACL delegation that we know exists ". $delegation->Id);
+                    return(undef);
+                }
+            }
+        }
+    }
+    return ($err);
+}
+
+# }}}
+
+# {{{ SetDisabled
+
+=head2 SetDisabled
+
+SetDisableds the current CachedGroupMember from the group it's in and cascades 
+the SetDisabled to all submembers. This routine could be completely excised if
+mysql supported foreign keys with cascading SetDisableds.
+
+=cut 
+
+sub SetDisabled {
+    my $self = shift;
+    my $val = shift;
+    
+    my $err = $self->SUPER::SetDisabled($val);
+    unless ($err) {
+        $RT::Logger->error( "Couldn't SetDisabled CachedGroupMember " . $self->Id );
+        return (undef);
+    }
+    
+    my $member = $self->MemberObj();
+    if ( $member->IsGroup ) {
+        my $deletable = RT::CachedGroupMembers->new( $self->CurrentUser );
+
+        $deletable->Limit( FIELD    => 'Via', OPERATOR => '=', VALUE    => $self->id );
+        $deletable->Limit( FIELD    => 'id', OPERATOR => '!=', VALUE    => $self->id );
+
+        while ( my $kid = $deletable->Next ) {
+            my $kid_err = $kid->SetDisabled($val );
+            unless ($kid_err) {
+                $RT::Logger->error( "Couldn't SetDisabled CachedGroupMember " . $kid->Id );
+                return (undef);
+            }
+        }
+    }
+
+    # Unless $self->GroupObj still has the member recursively $self->MemberObj
+    # (Since we SetDisabledd the database row above, $self no longer counts)
+    unless ( $self->GroupObj->Object->HasMemberRecursively( $self->MemberObj ) ) {
+        #   Find all ACEs granted to $self->GroupId
+        my $acl = RT::ACL->new($RT::SystemUser);
+        $acl->LimitToPrincipal( Id => $self->GroupId );
+
+        while ( my $this_ace = $acl->Next() ) {
+            #       Find all ACEs which $self-MemberObj has delegated from $this_ace
+            my $delegations = RT::ACL->new($RT::SystemUser);
+            $delegations->DelegatedFrom( Id => $this_ace->Id );
+            $delegations->DelegatedBy( Id => $self->MemberId );
+
+            # For each delegation,  blow away the delegation
+            while ( my $delegation = $delegations->Next ) {
+                # WHACK IT
+                my $del_ret = $delegation->_Delete(InsideTransaction => 1);
+                unless ($del_ret) {
+                    $RT::Logger->crit("Couldn't delete an ACL delegation that we know exists ". $delegation->Id);
+                    return(undef);
+                }
+            }
+        }
+    }
+    return ($err);
+}
+
+# }}}
+
+# {{{ GroupObj
+
+=head2 GroupObj  
+
+Returns the RT::Principal object for this group Group
+
+=cut
+
+sub GroupObj {
+    my $self      = shift;
+    my $principal = RT::Principal->new( $self->CurrentUser );
+    $principal->Load( $self->GroupId );
+    return ($principal);
+}
+
+# }}}
+
+# {{{ ImmediateParentObj
+
+=head2 ImmediateParentObj  
+
+Returns the RT::Principal object for this group ImmediateParent
+
+=cut
+
+sub ImmediateParentObj {
+    my $self      = shift;
+    my $principal = RT::Principal->new( $self->CurrentUser );
+    $principal->Load( $self->ImmediateParentId );
+    return ($principal);
+}
+
+# }}}
+
+# {{{ MemberObj
+
+=head2 MemberObj  
+
+Returns the RT::Principal object for this group member
+
+=cut
+
+sub MemberObj {
+    my $self      = shift;
+    my $principal = RT::Principal->new( $self->CurrentUser );
+    $principal->Load( $self->MemberId );
+    return ($principal);
+}
+
+# }}}
+1;
diff --git a/rt/lib/RT/CachedGroupMembers.pm b/rt/lib/RT/CachedGroupMembers.pm
new file mode 100644
index 000000000..b520f7b9c
--- /dev/null
+++ b/rt/lib/RT/CachedGroupMembers.pm
@@ -0,0 +1,115 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
+
+=head1 NAME
+
+  RT::CachedGroupMembers -- Class Description
+ 
+=head1 SYNOPSIS
+
+  use RT::CachedGroupMembers
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=cut
+
+package RT::CachedGroupMembers;
+
+use RT::SearchBuilder;
+use RT::CachedGroupMember;
+
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
+
+
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'CachedGroupMembers';
+    $self->{'primary_key'} = 'id';
+
+
+    return ( $self->SUPER::_Init(@_) );
+}
+
+
+=item NewItem
+
+Returns an empty new RT::CachedGroupMember item
+
+=cut
+
+sub NewItem {
+    my $self = shift;
+    return(RT::CachedGroupMember->new($self->CurrentUser));
+}
+
+        eval "require RT::CachedGroupMembers_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/CachedGroupMembers_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::CachedGroupMembers_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/CachedGroupMembers_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::CachedGroupMembers_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/CachedGroupMembers_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::CachedGroupMembers_Overlay, RT::CachedGroupMembers_Vendor, RT::CachedGroupMembers_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/CachedGroupMembers_Overlay.pm b/rt/lib/RT/CachedGroupMembers_Overlay.pm
new file mode 100644
index 000000000..fd0fd9055
--- /dev/null
+++ b/rt/lib/RT/CachedGroupMembers_Overlay.pm
@@ -0,0 +1,148 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::CachedGroupMembers - a collection of RT::GroupMember objects
+
+=head1 SYNOPSIS
+
+  use RT::CachedGroupMembers;
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::CachedGroupMembers);
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+# {{{ LimitToUsers
+
+=head2 LimitToUsers
+
+Limits this search object to users who are members of this group
+This is really useful when you want to haave your UI seperate out
+groups from users for display purposes
+
+=cut
+
+sub LimitToUsers {
+    my $self = shift;
+
+    my $principals = $self->NewAlias('Principals');
+    $self->Join( ALIAS1 => 'main', FIELD1 => 'MemberId',
+                 ALIAS2 => $principals, FIELD2 =>'id');
+
+    $self->Limit(       ALIAS => $principals,
+                         FIELD => 'PrincipalType',
+                         VALUE => 'User',
+                         ENTRYAGGREGATOR => 'OR',
+                         );
+}
+
+# }}}
+
+
+# {{{ LimitToGroups
+
+=head2 LimitToGroups
+
+Limits this search object to Groups who are members of this group
+This is really useful when you want to haave your UI seperate out
+groups from users for display purposes
+
+=cut
+
+sub LimitToGroups {
+    my $self = shift;
+
+    my $principals = $self->NewAlias('Principals');
+    $self->Join( ALIAS1 => 'main', FIELD1 => 'MemberId',
+                 ALIAS2 => $principals, FIELD2 =>'id');
+
+    $self->Limit(       ALIAS => $principals,
+                         FIELD => 'PrincipalType',
+                         VALUE => 'Group',
+                         ENTRYAGGREGATOR => 'OR',
+                         );
+}
+
+# }}}
+
+# {{{ sub LimitToMembersOfGroup
+
+=head2 LimitToMembersOfGroup PRINCIPAL_ID
+
+Takes a Principal Id as its only argument. 
+Limits the current search principals which are _directly_ members
+of the group which has PRINCIPAL_ID as its principal id.
+
+=cut
+
+sub LimitToMembersOfGroup {
+    my $self = shift;
+    my $group = shift;
+
+    return ($self->Limit( 
+                         VALUE => $group,
+                         FIELD => 'GroupId',
+                         ENTRYAGGREGATOR => 'OR',
+                         ));
+
+}
+# }}}
+
+# {{{ sub LimitToGroupsWithMember
+
+=head2 LimitToGroupsWithMember PRINCIPAL_ID
+
+Takes a Principal Id as its only argument. 
+Limits the current search to groups which contain PRINCIPAL_ID as a member  or submember.
+This function gets used by GroupMember->Create to populate subgroups
+
+=cut
+
+sub LimitToGroupsWithMember {
+    my $self = shift;
+    my $member = shift;
+
+    return ($self->Limit( 
+                         VALUE => $member,
+                         FIELD => 'MemberId',
+                         ENTRYAGGREGATOR => 'OR',
+			            QUOTEVALUE => 0
+                         ));
+
+}
+# }}}
+1;
diff --git a/rt/lib/RT/Condition/AnyTransaction.pm b/rt/lib/RT/Condition/AnyTransaction.pm
index 83e5de6ce..4519fcf5a 100644
--- a/rt/lib/RT/Condition/AnyTransaction.pm
+++ b/rt/lib/RT/Condition/AnyTransaction.pm
@@ -1,10 +1,33 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Condition/AnyTransaction.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Copyright 1996-2001 Jesse Vincent <jesse@fsck.com> 
-# Released under the terms of the GNU General Public License
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+ 
 
 package RT::Condition::AnyTransaction;
 require RT::Condition::Generic;
 
+use strict;
+use vars qw/@ISA/;
 @ISA = qw(RT::Condition::Generic);
 
 
@@ -19,5 +42,10 @@ sub IsApplicable {
     return(1);
 }
 
+eval "require RT::Condition::AnyTransaction_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/AnyTransaction_Vendor.pm});
+eval "require RT::Condition::AnyTransaction_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/AnyTransaction_Local.pm});
+
 1;
 
diff --git a/rt/lib/RT/Condition/BeforeDue.pm b/rt/lib/RT/Condition/BeforeDue.pm
new file mode 100644
index 000000000..7911fd80a
--- /dev/null
+++ b/rt/lib/RT/Condition/BeforeDue.pm
@@ -0,0 +1,64 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+package RT::Condition::BeforeDue;
+require RT::Condition::Generic;
+
+use RT::Date;
+
+use strict;
+use vars qw/@ISA/;
+@ISA = qw(RT::Condition::Generic);
+
+
+sub IsApplicable {
+    my $self = shift;
+
+    # Parse date string.  Format is "1d2h3m4s" for 1 day and 2 hours
+    # and 3 minutes and 4 seconds.
+    my %e;
+    foreach (qw(d h m s)) {
+	my @vals = $self->Argument =~ m/(\d+)$_/;
+	$e{$_} = pop @vals || 0;
+    }
+    my $elapse = $e{'d'} * 24*60*60 + $e{'h'} * 60*60 + $e{'m'} * 60 + $e{'s'};
+
+    my $cur = new RT::Date( $RT::SystemUser );
+    $cur->SetToNow();
+    my $due = $self->TicketObj->DueObj;
+    return (undef) if $due->Unix <= 0;
+
+    my $diff = $due->Diff($cur);
+    if ( $diff >= 0 and $diff <= $elapse ) {
+        return(1);
+    } else {
+        return(undef);
+    }
+}
+
+eval "require RT::Condition::BeforeDue_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/BeforeDue_Vendor.pm});
+eval "require RT::Condition::BeforeDue_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/BeforeDue_Local.pm});
+
+1;
diff --git a/rt/lib/RT/Condition/Generic.pm b/rt/lib/RT/Condition/Generic.pm
index 393f4b786..bd269315e 100755
--- a/rt/lib/RT/Condition/Generic.pm
+++ b/rt/lib/RT/Condition/Generic.pm
@@ -1,7 +1,26 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Condition/Generic.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-2000 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 =head1 NAME
 
   RT::Condition::Generic - ;
@@ -29,7 +48,6 @@
 
 =begin testing
 
-ok (require RT::TestHarness);
 ok (require RT::Condition::Generic);
 
 =end testing
@@ -39,6 +57,11 @@ ok (require RT::Condition::Generic);
 
 package RT::Condition::Generic;
 
+use RT::Base;
+use strict;
+use vars qw/@ISA/;
+@ISA = qw(RT::Base);
+
 # {{{ sub new 
 sub new  {
   my $proto = shift;
@@ -61,7 +84,6 @@ sub _Init  {
 	       ApplicableTransTypes => undef,
 	       @_ );
   
-  
   $self->{'Argument'} = $args{'Argument'};
   $self->{'ScripObj'} = $args{'ScripObj'};
   $self->{'TicketObj'} = $args{'TicketObj'};
@@ -100,6 +122,19 @@ sub TicketObj  {
 }
 # }}}
 
+# {{{ sub ScripObj
+
+=head2 ScripObj
+
+Return the Scrip object we're talking about
+
+=cut
+
+sub ScripObj  {
+  my $self = shift;
+  return($self->{'ScripObj'});
+}
+# }}}
 # {{{ sub TransactionObj
 
 =head2 TransactionObj
@@ -137,7 +172,7 @@ sub ApplicableTransTypes  {
 # {{{ sub Describe 
 sub Describe  {
   my $self = shift;
-  return ("No description for " . ref $self);
+  return ($self->loc("No description for [_1]", ref $self));
 }
 # }}}
 
@@ -167,4 +202,10 @@ sub DESTROY {
 }
 
 # }}}
+
+eval "require RT::Condition::Generic_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/Generic_Vendor.pm});
+eval "require RT::Condition::Generic_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/Generic_Local.pm});
+
 1;
diff --git a/rt/lib/RT/Condition/Overdue.pm b/rt/lib/RT/Condition/Overdue.pm
new file mode 100644
index 000000000..3a4efe77f
--- /dev/null
+++ b/rt/lib/RT/Condition/Overdue.pm
@@ -0,0 +1,68 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+ 
+
+
+=head1 NAME
+
+RT::Condition::Overdue
+
+=head1 DESCRIPTION
+
+Returns true if the ticket we're operating on is overdue
+
+=cut
+
+package RT::Condition::Overdue;
+require RT::Condition::Generic;
+
+use strict;
+use vars qw/@ISA/;
+@ISA = qw(RT::Condition::Generic);
+
+
+=head2 IsApplicable
+
+If the due date is before "now" return true
+
+=cut
+
+sub IsApplicable {
+    my $self = shift;
+    if ($self->TicketObj->DueObj->Unix > 0 and
+	$self->TicketObj->DueObj->Unix < time())  {
+	return(1);
+    } 
+    else {
+	return(undef);
+    }
+}
+
+eval "require RT::Condition::Overdue_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/Overdue_Vendor.pm});
+eval "require RT::Condition::Overdue_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/Overdue_Local.pm});
+
+1;
+
diff --git a/rt/lib/RT/Condition/OwnerChange.pm b/rt/lib/RT/Condition/OwnerChange.pm
new file mode 100644
index 000000000..e17f589e4
--- /dev/null
+++ b/rt/lib/RT/Condition/OwnerChange.pm
@@ -0,0 +1,102 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+ 
+
+
+package RT::Condition::OwnerChange;
+require RT::Condition::Generic;
+
+use strict;
+use vars qw/@ISA/;
+@ISA = qw(RT::Condition::Generic);
+
+
+=head2 IsApplicable
+
+If we're changing the owner return true, otherwise return false
+
+=begin testing
+
+my $q = RT::Queue->new($RT::SystemUser);
+$q->Create(Name =>'ownerChangeTest');
+
+ok($q->Id, "Created a scriptest queue");
+
+my $s1 = RT::Scrip->new($RT::SystemUser);
+my ($val, $msg) =$s1->Create( Queue => $q->Id,
+             ScripAction => 'User Defined',
+             ScripCondition => 'On Owner Change',
+             CustomIsApplicableCode => '',
+             CustomPrepareCode => 'return 1',
+             CustomCommitCode => '
+                   $RT::Logger->crit("Before, prio is ".$self->TicketObj->Priority);
+                    $self->TicketObj->SetPriority($self->TicketObj->Priority+1);
+                   $RT::Logger->crit("After, prio is ".$self->TicketObj->Priority);
+                return(1);
+            ',
+             Template => 'Blank'
+    );
+ok($val,$msg);
+
+my $ticket = RT::Ticket->new($RT::SystemUser);
+my ($tv,$ttv,$tm) = $ticket->Create(Queue => $q->Id,
+                                    Subject => "hair on fire",
+                                    InitialPriority => '20'
+                                    );
+ok($tv, $tm);
+ok($ticket->SetOwner('root'));
+is ($ticket->Priority , '21', "Ticket priority is set right");
+ok($ticket->Steal);
+is ($ticket->Priority , '22', "Ticket priority is set right");
+ok($ticket->Untake);
+is ($ticket->Priority , '23', "Ticket priority is set right");
+ok($ticket->Take);
+is ($ticket->Priority , '24', "Ticket priority is set right");
+
+
+
+
+
+=end testing
+
+
+=cut
+
+sub IsApplicable {
+    my $self = shift;
+    if ($self->TransactionObj->Field eq 'Owner') {
+	return(1);
+    } 
+    else {
+	return(undef);
+    }
+}
+
+eval "require RT::Condition::OwnerChange_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/OwnerChange_Vendor.pm});
+eval "require RT::Condition::OwnerChange_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/OwnerChange_Local.pm});
+
+1;
+
diff --git a/rt/lib/RT/Condition/PriorityExceeds.pm b/rt/lib/RT/Condition/PriorityExceeds.pm
new file mode 100644
index 000000000..7737ca5a9
--- /dev/null
+++ b/rt/lib/RT/Condition/PriorityExceeds.pm
@@ -0,0 +1,57 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+ 
+
+
+package RT::Condition::PriorityExceeds;
+require RT::Condition::Generic;
+
+use strict;
+use vars qw/@ISA/;
+@ISA = qw(RT::Condition::Generic);
+
+
+=head2 IsApplicable
+
+If the priority exceeds the argument value
+
+=cut
+
+sub IsApplicable {
+    my $self = shift;
+    if ($self->TicketObj->Priority > $self->Argument)  {
+	return(1);
+    } 
+    else {
+	return(undef);
+    }
+}
+
+eval "require RT::Condition::PriorityExceeds_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/PriorityExceeds_Vendor.pm});
+eval "require RT::Condition::PriorityExceeds_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/PriorityExceeds_Local.pm});
+
+1;
+
diff --git a/rt/lib/RT/Condition/QueueChange.pm b/rt/lib/RT/Condition/QueueChange.pm
new file mode 100644
index 000000000..f3e646a00
--- /dev/null
+++ b/rt/lib/RT/Condition/QueueChange.pm
@@ -0,0 +1,57 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+ 
+
+
+package RT::Condition::QueueChange;
+require RT::Condition::Generic;
+
+use strict;
+use vars qw/@ISA/;
+@ISA = qw(RT::Condition::Generic);
+
+
+=head2 IsApplicable
+
+If the queue has changed.
+
+=cut
+
+sub IsApplicable {
+    my $self = shift;
+    if ($self->TransactionObj->Field eq 'Queue') {
+	    return(1);
+    } 
+    else {
+	    return(undef);
+    }
+}
+
+eval "require RT::Condition::QueueChange_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/QueueChange_Vendor.pm});
+eval "require RT::Condition::QueueChange_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/QueueChange_Local.pm});
+
+1;
+
diff --git a/rt/lib/RT/Condition/StatusChange.pm b/rt/lib/RT/Condition/StatusChange.pm
index 56419b2c7..8afabcda0 100644
--- a/rt/lib/RT/Condition/StatusChange.pm
+++ b/rt/lib/RT/Condition/StatusChange.pm
@@ -1,10 +1,34 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Condition/StatusChange.pm,v 1.1 2002-08-12 06:17:08 ivan Exp $
-# Copyright 1996-2001 Jesse Vincent <jesse@fsck.com> 
-# Released under the terms of the GNU General Public License
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+ 
+
 
 package RT::Condition::StatusChange;
 require RT::Condition::Generic;
 
+use strict;
+use vars qw/@ISA/;
 @ISA = qw(RT::Condition::Generic);
 
 
@@ -26,5 +50,10 @@ sub IsApplicable {
     }
 }
 
+eval "require RT::Condition::StatusChange_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/StatusChange_Vendor.pm});
+eval "require RT::Condition::StatusChange_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/StatusChange_Local.pm});
+
 1;
 
diff --git a/rt/lib/RT/Condition/UserDefined.pm b/rt/lib/RT/Condition/UserDefined.pm
new file mode 100644
index 000000000..eb829f0d1
--- /dev/null
+++ b/rt/lib/RT/Condition/UserDefined.pm
@@ -0,0 +1,57 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+ 
+
+package RT::Condition::UserDefined;
+
+use RT::Condition::Generic;
+
+use strict;
+use vars qw/@ISA/;
+@ISA = qw(RT::Condition::Generic);
+
+
+=head2 IsApplicable
+
+This happens on every transaction. it's always applicable
+
+=cut
+
+sub IsApplicable {
+    my $self = shift;
+    my $retval = eval $self->ScripObj->CustomIsApplicableCode;
+    if ($@) {
+        $RT::Logger->error("Scrip ".$self->ScripObj->Id. " IsApplicable failed: ".$@);
+        return (undef);
+    }
+    return ($retval);
+}
+
+eval "require RT::Condition::UserDefined_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/UserDefined_Vendor.pm});
+eval "require RT::Condition::UserDefined_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/UserDefined_Local.pm});
+
+1;
+
diff --git a/rt/lib/RT/CurrentUser.pm b/rt/lib/RT/CurrentUser.pm
index 6997ddbac..4ca2f9891 100755
--- a/rt/lib/RT/CurrentUser.pm
+++ b/rt/lib/RT/CurrentUser.pm
@@ -1,7 +1,26 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/CurrentUser.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-1999 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 =head1 NAME
 
   RT::CurrentUser - an RT object representing the current user
@@ -19,7 +38,6 @@
 
 =begin testing
 
-ok (require RT::TestHarness);
 ok (require RT::CurrentUser);
 
 =end testing
@@ -28,9 +46,13 @@ ok (require RT::CurrentUser);
 
 
 package RT::CurrentUser;
+
 use RT::Record;
-@ISA= qw(RT::Record);
+use RT::I18N;
 
+use strict;
+use vars qw/@ISA/;
+@ISA= qw(RT::Record);
 
 # {{{ sub _Init 
 
@@ -48,7 +70,7 @@ sub _Init  {
     $self->Load($Name);
   }
   
-  $self->_MyCurrentUser($self);
+  $self->CurrentUser($self);
 
 }
 # }}}
@@ -56,7 +78,8 @@ sub _Init  {
 # {{{ sub Create
 
 sub Create {
-    return (0, 'Permission Denied');
+    my $self = shift;
+    return (0, $self->loc('Permission Denied'));
 }
 
 # }}}
@@ -64,7 +87,8 @@ sub Create {
 # {{{ sub Delete
 
 sub Delete {
-    return (0, 'Permission Denied');
+    my $self = shift;
+    return (0, $self->loc('Permission Denied'));
 }
 
 # }}}
@@ -84,7 +108,7 @@ sub UserObj {
 	use RT::User;
 	$self->{'UserObj'} = RT::User->new($self);
 	unless ($self->{'UserObj'}->Load($self->Id)) {
-	    $RT::Logger->err("Couldn't load ".$self->Id. "from the users database.\n");
+	    $RT::Logger->err($self->loc("Couldn't load [_1] from the users database.\n", $self->Id));
 	}
 	
     }
@@ -92,6 +116,42 @@ sub UserObj {
 }
 # }}}
 
+# {{{ sub PrincipalObj 
+
+=head2 PrincipalObj
+
+    Returns this user's principal object.  this is just a helper routine for
+    $self->UserObj->PrincipalObj
+
+=cut
+
+sub PrincipalObj {
+    my $self = shift;
+    return($self->UserObj->PrincipalObj);
+}
+
+
+# }}}
+
+
+# {{{ sub PrincipalId 
+
+=head2 PrincipalId
+
+    Returns this user's principal Id.  this is just a helper routine for
+    $self->UserObj->PrincipalId
+
+=cut
+
+sub PrincipalId {
+    my $self = shift;
+    return($self->UserObj->PrincipalId);
+}
+
+
+# }}}
+
+
 # {{{ sub _Accessible 
 sub _Accessible  {
   my $self = shift;
@@ -120,6 +180,8 @@ Takes the email address of the user to load.
 sub LoadByEmail  {
     my $self = shift;
     my $identifier = shift;
+
+    $identifier = RT::User::CanonicalizeEmailAddress(undef, $identifier);
         
     $self->LoadByCol("EmailAddress",$identifier);
     
@@ -225,46 +287,88 @@ sub Privileged {
 
 # }}}
 
-# {{{ Convenient ACL methods
 
-=head2 HasQueueRight
+# {{{ sub HasRight
 
-calls $self->UserObj->HasQueueRight with the arguments passed in
+=head2 HasRight
+
+calls $self->UserObj->HasRight with the arguments passed in
 
 =cut
 
-sub HasQueueRight {
-	my $self = shift;
-	return ($self->UserObj->HasQueueRight(@_));
+sub HasRight {
+  my $self = shift;
+  return ($self->UserObj->HasRight(@_));
 }
 
-=head2 HasSystemRight
+# }}}
 
-calls $self->UserObj->HasSystemRight with the arguments passed in
+# {{{ Localization
 
-=cut
+=head2 LanguageHandle
 
+Returns this current user's langauge handle. Should take a language
+specification. but currently doesn't
 
-sub HasSystemRight {
-	my $self = shift;
-	return ($self->UserObj->HasSystemRight(@_));
-}
-# }}}
+=begin testing
 
-# {{{ sub HasRight
+ok (my $cu = RT::CurrentUser->new('root'));
+ok (my $lh = $cu->LanguageHandle);
+ok ($lh != undef);
+ok ($lh->isa('Locale::Maketext'));
+ok ($cu->loc('TEST_STRING') eq "Concrete Mixer", "Localized TEST_STRING into English");
+ok ($lh = $cu->LanguageHandle('fr'));
+ok ($cu->loc('Before') eq "Avant", "Localized TEST_STRING into Frenc");
 
-=head2 HasSystemRight
+=end testing
 
-calls $self->UserObj->HasRight with the arguments passed in
+=cut 
 
-=cut
+sub LanguageHandle {
+    my $self = shift;
+    if  ((!defined $self->{'LangHandle'}) || 
+         (!UNIVERSAL::can($self->{'LangHandle'}, 'maketext')) || 
+         (@_))  {
+        $self->{'LangHandle'} = RT::I18N->get_handle(@_);
+    }
+    # Fall back to english.
+    unless ($self->{'LangHandle'}) {
+        die "We couldn't get a dictionary. Nye mogu naidti slovar. No puedo encontrar dictionario.";
+    }
+    return ($self->{'LangHandle'});
+}
 
-sub HasRight {
-  my $self = shift;
-  return ($self->UserObj->HasRight(@_));
+sub loc {
+    my $self = shift;
+    return '' if $_[0] eq '';
+
+    my $handle = $self->LanguageHandle;
+
+    if (@_ == 1) {
+	# pre-scan the lexicon hashes to return _AUTO keys verbatim,
+	# to keep locstrings containing '[' and '~' from tripping over Maketext
+	return $_[0] unless grep { exists $_->{$_[0]} } @{ $handle->_lex_refs };
+    }
+
+    return $handle->maketext(@_);
 }
 
+sub loc_fuzzy {
+    my $self = shift;
+    return '' if $_[0] eq '';
+
+    # XXX: work around perl's deficiency when matching utf8 data
+    return $_[0] if Encode::is_utf8($_[0]);
+    my $result = $self->LanguageHandle->maketext_fuzzy(@_);
+
+    return($result);
+}
 # }}}
 
+eval "require RT::CurrentUser_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/CurrentUser_Vendor.pm});
+eval "require RT::CurrentUser_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/CurrentUser_Local.pm});
+
 1;
  
diff --git a/rt/lib/RT/CustomField.pm b/rt/lib/RT/CustomField.pm
new file mode 100644
index 000000000..cd40a3a92
--- /dev/null
+++ b/rt/lib/RT/CustomField.pm
@@ -0,0 +1,340 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
+
+=head1 NAME
+
+RT::CustomField
+
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=cut
+
+package RT::CustomField;
+use RT::Record; 
+use RT::Queue;
+
+
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
+
+sub _Init {
+  my $self = shift; 
+
+  $self->Table('CustomFields');
+  $self->SUPER::_Init(@_);
+}
+
+
+
+
+
+=item Create PARAMHASH
+
+Create takes a hash of values and creates a row in the database:
+
+  varchar(200) 'Name'.
+  varchar(200) 'Type'.
+  int(11) 'Queue'.
+  varchar(255) 'Description'.
+  int(11) 'SortOrder'.
+  smallint(6) 'Disabled'.
+
+=cut
+
+
+
+
+sub Create {
+    my $self = shift;
+    my %args = ( 
+                Name => '',
+                Type => '',
+                Queue => '0',
+                Description => '',
+                SortOrder => '0',
+                Disabled => '0',
+
+		  @_);
+    $self->SUPER::Create(
+                         Name => $args{'Name'},
+                         Type => $args{'Type'},
+                         Queue => $args{'Queue'},
+                         Description => $args{'Description'},
+                         SortOrder => $args{'SortOrder'},
+                         Disabled => $args{'Disabled'},
+);
+
+}
+
+
+
+=item id
+
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
+
+
+=cut
+
+
+=item Name
+
+Returns the current value of Name. 
+(In the database, Name is stored as varchar(200).)
+
+
+
+=item SetName VALUE
+
+
+Set Name to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Name will be stored as a varchar(200).)
+
+
+=cut
+
+
+=item Type
+
+Returns the current value of Type. 
+(In the database, Type is stored as varchar(200).)
+
+
+
+=item SetType VALUE
+
+
+Set Type to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Type will be stored as a varchar(200).)
+
+
+=cut
+
+
+=item Queue
+
+Returns the current value of Queue. 
+(In the database, Queue is stored as int(11).)
+
+
+
+=item SetQueue VALUE
+
+
+Set Queue to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Queue will be stored as a int(11).)
+
+
+=cut
+
+
+=item QueueObj
+
+Returns the Queue Object which has the id returned by Queue
+
+
+=cut
+
+sub QueueObj {
+	my $self = shift;
+	my $Queue =  RT::Queue->new($self->CurrentUser);
+	$Queue->Load($self->__Value('Queue'));
+	return($Queue);
+}
+
+=item Description
+
+Returns the current value of Description. 
+(In the database, Description is stored as varchar(255).)
+
+
+
+=item SetDescription VALUE
+
+
+Set Description to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Description will be stored as a varchar(255).)
+
+
+=cut
+
+
+=item SortOrder
+
+Returns the current value of SortOrder. 
+(In the database, SortOrder is stored as int(11).)
+
+
+
+=item SetSortOrder VALUE
+
+
+Set SortOrder to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, SortOrder will be stored as a int(11).)
+
+
+=cut
+
+
+=item Creator
+
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
+
+
+=cut
+
+
+=item Created
+
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
+
+
+=cut
+
+
+=item LastUpdatedBy
+
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
+
+
+=cut
+
+
+=item LastUpdated
+
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
+
+
+=cut
+
+
+=item Disabled
+
+Returns the current value of Disabled. 
+(In the database, Disabled is stored as smallint(6).)
+
+
+
+=item SetDisabled VALUE
+
+
+Set Disabled to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Disabled will be stored as a smallint(6).)
+
+
+=cut
+
+
+
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        Name => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Type => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Queue => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Description => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        SortOrder => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        Disabled => 
+		{read => 1, write => 1, type => 'smallint(6)', default => '0'},
+
+ }
+};
+
+
+        eval "require RT::CustomField_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/CustomField_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::CustomField_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/CustomField_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::CustomField_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/CustomField_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::CustomField_Overlay, RT::CustomField_Vendor, RT::CustomField_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/CustomFieldValue.pm b/rt/lib/RT/CustomFieldValue.pm
new file mode 100644
index 000000000..f434b44fb
--- /dev/null
+++ b/rt/lib/RT/CustomFieldValue.pm
@@ -0,0 +1,294 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
+
+=head1 NAME
+
+RT::CustomFieldValue
+
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=cut
+
+package RT::CustomFieldValue;
+use RT::Record; 
+use RT::CustomField;
+
+
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
+
+sub _Init {
+  my $self = shift; 
+
+  $self->Table('CustomFieldValues');
+  $self->SUPER::_Init(@_);
+}
+
+
+
+
+
+=item Create PARAMHASH
+
+Create takes a hash of values and creates a row in the database:
+
+  int(11) 'CustomField'.
+  varchar(200) 'Name'.
+  varchar(255) 'Description'.
+  int(11) 'SortOrder'.
+
+=cut
+
+
+
+
+sub Create {
+    my $self = shift;
+    my %args = ( 
+                CustomField => '0',
+                Name => '',
+                Description => '',
+                SortOrder => '0',
+
+		  @_);
+    $self->SUPER::Create(
+                         CustomField => $args{'CustomField'},
+                         Name => $args{'Name'},
+                         Description => $args{'Description'},
+                         SortOrder => $args{'SortOrder'},
+);
+
+}
+
+
+
+=item id
+
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
+
+
+=cut
+
+
+=item CustomField
+
+Returns the current value of CustomField. 
+(In the database, CustomField is stored as int(11).)
+
+
+
+=item SetCustomField VALUE
+
+
+Set CustomField to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, CustomField will be stored as a int(11).)
+
+
+=cut
+
+
+=item CustomFieldObj
+
+Returns the CustomField Object which has the id returned by CustomField
+
+
+=cut
+
+sub CustomFieldObj {
+	my $self = shift;
+	my $CustomField =  RT::CustomField->new($self->CurrentUser);
+	$CustomField->Load($self->__Value('CustomField'));
+	return($CustomField);
+}
+
+=item Name
+
+Returns the current value of Name. 
+(In the database, Name is stored as varchar(200).)
+
+
+
+=item SetName VALUE
+
+
+Set Name to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Name will be stored as a varchar(200).)
+
+
+=cut
+
+
+=item Description
+
+Returns the current value of Description. 
+(In the database, Description is stored as varchar(255).)
+
+
+
+=item SetDescription VALUE
+
+
+Set Description to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Description will be stored as a varchar(255).)
+
+
+=cut
+
+
+=item SortOrder
+
+Returns the current value of SortOrder. 
+(In the database, SortOrder is stored as int(11).)
+
+
+
+=item SetSortOrder VALUE
+
+
+Set SortOrder to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, SortOrder will be stored as a int(11).)
+
+
+=cut
+
+
+=item Creator
+
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
+
+
+=cut
+
+
+=item Created
+
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
+
+
+=cut
+
+
+=item LastUpdatedBy
+
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
+
+
+=cut
+
+
+=item LastUpdated
+
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
+
+
+=cut
+
+
+
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        CustomField => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Name => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Description => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        SortOrder => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+
+ }
+};
+
+
+        eval "require RT::CustomFieldValue_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/CustomFieldValue_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::CustomFieldValue_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/CustomFieldValue_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::CustomFieldValue_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/CustomFieldValue_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::CustomFieldValue_Overlay, RT::CustomFieldValue_Vendor, RT::CustomFieldValue_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/CustomFieldValues.pm b/rt/lib/RT/CustomFieldValues.pm
new file mode 100644
index 000000000..0e792b1a2
--- /dev/null
+++ b/rt/lib/RT/CustomFieldValues.pm
@@ -0,0 +1,121 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
+
+=head1 NAME
+
+  RT::CustomFieldValues -- Class Description
+ 
+=head1 SYNOPSIS
+
+  use RT::CustomFieldValues
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=cut
+
+package RT::CustomFieldValues;
+
+use RT::SearchBuilder;
+use RT::CustomFieldValue;
+
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
+
+
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'CustomFieldValues';
+    $self->{'primary_key'} = 'id';
+
+
+
+  # By default, order by name
+  $self->OrderBy( ALIAS => 'main',
+                  FIELD => 'SortOrder',
+                  ORDER => 'ASC');
+
+    return ( $self->SUPER::_Init(@_) );
+}
+
+
+=item NewItem
+
+Returns an empty new RT::CustomFieldValue item
+
+=cut
+
+sub NewItem {
+    my $self = shift;
+    return(RT::CustomFieldValue->new($self->CurrentUser));
+}
+
+        eval "require RT::CustomFieldValues_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/CustomFieldValues_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::CustomFieldValues_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/CustomFieldValues_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::CustomFieldValues_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/CustomFieldValues_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::CustomFieldValues_Overlay, RT::CustomFieldValues_Vendor, RT::CustomFieldValues_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/CustomFieldValues_Overlay.pm b/rt/lib/RT/CustomFieldValues_Overlay.pm
new file mode 100644
index 000000000..0384db96c
--- /dev/null
+++ b/rt/lib/RT/CustomFieldValues_Overlay.pm
@@ -0,0 +1,47 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+use strict;
+no warnings qw(redefine);
+
+# {{{ sub LimitToCustomField
+
+=head2 LimitToCustomField FIELD
+
+Limits the returned set to values for the custom field with Id FIELD
+
+=cut
+  
+sub LimitToCustomField {
+    my $self = shift;
+    my $cf = shift;
+    return ($self->Limit( FIELD => 'CustomField',
+			  VALUE => $cf,
+			  OPERATOR => '='));
+
+}
+
+# }}}
+
+1;
+
diff --git a/rt/lib/RT/CustomField_Overlay.pm b/rt/lib/RT/CustomField_Overlay.pm
new file mode 100644
index 000000000..89ef88987
--- /dev/null
+++ b/rt/lib/RT/CustomField_Overlay.pm
@@ -0,0 +1,560 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+use strict;
+no warnings qw(redefine);
+
+use vars qw(@TYPES %TYPES);
+
+use RT::CustomFieldValues;
+use RT::TicketCustomFieldValues;
+
+# Enumerate all valid types for this custom field
+@TYPES = (
+    'SelectSingle',	# loc
+    'SelectMultiple',	# loc
+    'FreeformSingle',	# loc
+    'FreeformMultiple', # loc
+);
+
+# Populate a hash of types of easier validation
+for (@TYPES) { $TYPES{$_} = 1};
+
+
+
+
+=head1 NAME
+
+  RT::CustomField_Overlay 
+
+=head1 DESCRIPTION
+
+=head1 'CORE' METHODS
+
+=cut
+
+
+
+=head2 Create PARAMHASH
+
+Create takes a hash of values and creates a row in the database:
+
+  varchar(200) 'Name'.
+  varchar(200) 'Type'.
+  int(11) 'Queue'.
+  varchar(255) 'Description'.
+  int(11) 'SortOrder'.
+  smallint(6) 'Disabled'.
+
+=cut
+
+
+
+
+sub Create {
+    my $self = shift;
+    my %args = ( 
+                Name => '',
+                Type => '',
+                Queue => '0',
+                Description => '',
+                SortOrder => '0',
+                Disabled => '0',
+
+		  @_);
+
+    
+
+    if (  ! $args{'Queue'} ) {
+        unless ( $self->CurrentUser->HasRight( Object => $RT::System, Right => 'AdminCustomFields') ) {
+            return ( 0, $self->loc('Permission Denied') );
+        }
+    }
+    else {
+        my $queue = RT::Queue->new($self->CurrentUser);
+        $queue->Load($args{'Queue'});
+        unless ($queue->Id) {
+            return (0, $self->loc("Queue not found"));
+        }
+        unless ( $queue->CurrentUserHasRight('AdminCustomFields') ) {
+            return ( 0, $self->loc('Permission Denied') );
+        }
+    }
+    $self->SUPER::Create(
+                         Name => $args{'Name'},
+                         Type => $args{'Type'},
+                         Queue => $args{'Queue'},
+                         Description => $args{'Description'},
+                         SortOrder => $args{'SortOrder'},
+                         Disabled => $args{'Disabled'},
+);
+
+}
+
+
+# {{{ sub LoadByNameAndQueue
+
+=head2  LoadByNameAndQueue (Queue => QUEUEID, Name => NAME)
+
+Loads the Custom field named NAME for Queue QUEUE. If QUEUE is 0,
+loads a global custom field
+
+=cut
+
+# Compatibility for API change after 3.0 beta 1
+*LoadNameAndQueue = \&LoadByNameAndQueue;
+
+sub LoadByNameAndQueue {
+    my $self = shift;
+    my %args = (
+        Queue => undef,
+        Name  => undef,
+        @_,
+    );
+
+    return ( $self->LoadByCols( Name => $args{'Name'}, Queue => $args{'Queue'} ) );
+
+}
+
+# }}}
+
+# {{{ Dealing with custom field values 
+
+=begin testing
+use_ok(RT::CustomField);
+ok(my $cf = RT::CustomField->new($RT::SystemUser));
+ok(my ($id, $msg)=  $cf->Create( Name => 'TestingCF',
+                                 Queue => '0',
+                                 SortOrder => '1',
+                                 Description => 'A Testing custom field',
+                                 Type=> 'SelectSingle'), 'Created a global CustomField');
+ok($id != 0, 'Global custom field correctly created');
+ok ($cf->SingleValue);
+ok($cf->Type eq 'SelectSingle');
+
+ok($cf->SetType('SelectMultiple'));
+ok($cf->Type eq 'SelectMultiple');
+ok(!$cf->SingleValue );
+ok(my ($bogus_val, $bogus_msg) = $cf->SetType('BogusType') , "Trying to set a custom field's type to a bogus type");
+ok($bogus_val == 0, "Unable to set a custom field's type to a bogus type");
+
+ok(my $bad_cf = RT::CustomField->new($RT::SystemUser));
+ok(my ($bad_id, $bad_msg)=  $cf->Create( Name => 'TestingCF-bad',
+                                 Queue => '0',
+                                 SortOrder => '1',
+                                 Description => 'A Testing custom field with a bogus Type',
+                                 Type=> 'SelectSingleton'), 'Created a global CustomField with a bogus type');
+ok($bad_id == 0, 'Global custom field correctly decided to not create a cf with a bogus type ');
+
+=end testing
+
+=cut
+
+# {{{ AddValue
+
+=head2 AddValue HASH
+
+Create a new value for this CustomField.  Takes a paramhash containing the elements Name, Description and SortOrder
+
+=begin testing
+
+ok(my $cf = RT::CustomField->new($RT::SystemUser));
+$cf->Load(1);
+ok($cf->Id == 1);
+ok(my ($val,$msg)  = $cf->AddValue(Name => 'foo' , Description => 'TestCFValue', SortOrder => '6'));
+ok($val != 0);
+ok (my ($delval, $delmsg) = $cf->DeleteValue($val));
+ok ($delval != 0);
+
+=end testing
+
+=cut
+
+sub AddValue {
+	my $self = shift;
+	my %args = ( Name => undef,
+		     Description => undef,
+		     SortOrder => undef,
+		     @_ );
+
+    unless ($self->CurrentUserHasRight('AdminCustomFields')) {
+        return (0, $self->loc('Permission Denied'));
+    }
+
+    unless ($args{'Name'}) {
+        return(0, $self->loc("Can't add a custom field value without a name"));
+    }
+	my $newval = RT::CustomFieldValue->new($self->CurrentUser);
+	return($newval->Create(
+		     CustomField => $self->Id,
+             Name =>$args{'Name'},
+             Description => ($args{'Description'} || ''),
+             SortOrder => ($args{'SortOrder'} || '0')
+        ));    
+}
+
+
+# }}}
+
+# {{{ DeleteValue
+
+=head2 DeleteValue ID
+
+Deletes a value from this custom field by id. 
+
+Does not remove this value for any article which has had it selected	
+
+=cut
+
+sub DeleteValue {
+	my $self = shift;
+    my $id = shift;
+    unless ($self->CurrentUserHasRight('AdminCustomFields')) {
+        return (0, $self->loc('Permission Denied'));
+    }
+
+	my $val_to_del = RT::CustomFieldValue->new($self->CurrentUser);
+	$val_to_del->Load($id);
+	unless ($val_to_del->Id) {
+		return (0, $self->loc("Couldn't find that value"));
+	}
+	unless ($val_to_del->CustomField == $self->Id) {
+		return (0, $self->loc("That is not a value for this custom field"));
+	}
+
+	my $retval = $val_to_del->Delete();
+    if ($retval) {
+        return ($retval, $self->loc("Custom field value deleted"));
+    } else {
+        return(0, $self->loc("Custom field value could not be deleted"));
+    }
+}
+
+# }}}
+
+# {{{ Values
+
+=head2 Values FIELD
+
+Return a CustomFieldeValues object of all acceptable values for this Custom Field.
+
+
+=cut
+
+sub Values {
+    my $self = shift;
+
+    my $cf_values = RT::CustomFieldValues->new($self->CurrentUser);
+    if ( $self->__Value('Queue') == 0 || $self->CurrentUserHasRight( 'SeeQueue') ) {
+        $cf_values->LimitToCustomField($self->Id);
+    }
+    return ($cf_values);
+}
+
+# }}}
+
+# }}}
+
+# {{{ Ticket related routines
+
+# {{{ ValuesForTicket
+
+=head2 ValuesForTicket TICKET
+
+Returns a RT::TicketCustomFieldValues object of this Field's values for TICKET.
+TICKET is a ticket id.
+
+
+=cut
+
+sub ValuesForTicket {
+	my $self = shift;
+    my $ticket_id = shift;
+
+	my $values = new RT::TicketCustomFieldValues($self->CurrentUser);
+	$values->LimitToCustomField($self->Id);
+    $values->LimitToTicket($ticket_id);
+
+	return ($values);
+}
+
+# }}}
+
+# {{{ AddValueForTicket
+
+=head2 AddValueForTicket HASH
+
+Adds a custom field value for a ticket. Takes a param hash of Ticket and Content
+
+=cut
+
+sub AddValueForTicket {
+	my $self = shift;
+	my %args = ( Ticket => undef,
+                 Content => undef,
+		     @_ );
+
+	my $newval = RT::TicketCustomFieldValue->new($self->CurrentUser);
+	my $val = $newval->Create(Ticket => $args{'Ticket'},
+                            Content => $args{'Content'},
+                            CustomField => $self->Id);
+
+    return($val);
+
+}
+
+
+# }}}
+
+# {{{ DeleteValueForTicket
+
+=head2 DeleteValueForTicket HASH
+
+Adds a custom field value for a ticket. Takes a param hash of Ticket and Content
+
+=cut
+
+sub DeleteValueForTicket {
+	my $self = shift;
+	my %args = ( Ticket => undef,
+                 Content => undef,
+		     @_ );
+
+	my $oldval = RT::TicketCustomFieldValue->new($self->CurrentUser);
+    $oldval->LoadByTicketContentAndCustomField (Ticket => $args{'Ticket'}, 
+                                                Content =>  $args{'Content'}, 
+                                                CustomField => $self->Id );
+    # check ot make sure we found it
+    unless ($oldval->Id) {
+        return(0, $self->loc("Custom field value [_1] could not be found for custom field [_2]", $args{'Content'}, $self->Name));
+    }
+    # delete it
+
+    my $ret = $oldval->Delete();
+    unless ($ret) {
+        return(0, $self->loc("Custom field value could not be found"));
+    }
+    return(1, $self->loc("Custom field value deleted"));
+}
+
+
+# }}}
+# }}}
+
+
+=head2 ValidateQueue Queue
+
+Make sure that the queue specified is a valid queue name
+
+=cut
+
+sub ValidateQueue {
+    my $self = shift;
+    my $id = shift;
+
+    if ($id eq '0') { # 0 means "Global" null would _not_ be ok.
+        return (1); 
+    }
+
+    my $q = RT::Queue->new($RT::SystemUser);
+    $q->Load($id);
+    unless ($q->id) {
+        return undef;
+    }
+    return (1);
+
+
+}
+
+
+# {{{ Types
+
+=head2 Types 
+
+Retuns an array of the types of CustomField that are supported
+
+=cut
+
+sub Types {
+	return (@TYPES);
+}
+
+# }}}
+
+
+=head2 FriendlyType [TYPE]
+
+Returns a localized human-readable version of the custom field type.
+If a custom field type is specified as the parameter, the friendly type for that type will be returned
+
+=cut
+
+sub FriendlyType {
+    my $self = shift;
+
+    my $type = shift || $self->Type;
+
+    if ( $type eq 'SelectSingle' ) {
+        return ( $self->loc('Select one value') );
+    }
+    elsif ( $type eq 'SelectMultiple' ) {
+        return ( $self->loc('Select multiple values') );
+    }
+    elsif ( $type eq 'FreeformSingle' ) {
+        return ( $self->loc('Enter one value') );
+    }
+    elsif ( $type eq 'FreeformMultiple' ) {
+        return ( $self->loc('Enter multiple values') );
+    }
+    else {
+        return ( $self->loc( $self->Type ) );
+    }
+}
+
+
+=head2 ValidateType TYPE
+
+Takes a single string. returns true if that string is a value
+type of custom field
+
+=begin testing
+
+ok(my $cf = RT::CustomField->new($RT::SystemUser));
+ok($cf->ValidateType('SelectSingle'));
+ok($cf->ValidateType('SelectMultiple'));
+ok(!$cf->ValidateType('SelectFooMultiple'));
+
+=end testing
+
+=cut
+
+sub ValidateType {
+    my $self = shift;
+    my $type = shift;
+
+    if( $TYPES{$type}) {
+        return(1);
+    }
+    else {
+        return undef;
+    }
+}
+
+# {{{ SingleValue
+
+=head2 SingleValue
+
+Returns true if this CustomField only accepts a single value. 
+Returns false if it accepts multiple values
+
+=cut
+
+sub SingleValue {
+    my $self = shift;
+    if ($self->Type =~  /Single$/) {
+        return 1;
+    } 
+    else {
+        return undef;
+    }
+}
+
+# }}}
+
+# {{{ sub CurrentUserHasRight
+
+=head2 CurrentUserHasRight RIGHT
+
+Helper function to call the custom field's queue's CurrentUserHasRight with the passed in args.
+
+=cut
+
+sub CurrentUserHasRight {
+    my $self = shift;
+    my $right = shift;
+    # if there's no queue, we want to know about a global right
+    if ( ( !defined $self->__Value('Queue') ) || ( $self->__Value('Queue') == 0 ) ) {
+         return $self->CurrentUser->HasRight( Object => $RT::System, Right => $right); 
+    } else {
+        return ( $self->QueueObj->CurrentUserHasRight($right) );
+    }
+}
+
+# }}}
+
+# {{{ sub _Set
+
+sub _Set {
+    my $self = shift;
+
+    unless ( $self->CurrentUserHasRight('AdminCustomFields') ) {
+        return ( 0, $self->loc('Permission Denied') );
+    }
+    return ( $self->SUPER::_Set(@_) );
+
+}
+
+# }}}
+
+# {{{ sub _Value 
+
+=head2 _Value
+
+Takes the name of a table column.
+Returns its value as a string, if the user passes an ACL check
+
+=cut
+
+sub _Value {
+
+    my $self  = shift;
+    my $field = shift;
+
+    # We need to expose the queue so that we can do things like ACL checks
+    if ( $field eq 'Queue') {
+          return ( $self->SUPER::_Value($field) );
+     }
+
+
+    #Anybody can see global custom fields, otherwise we need to do the rights check
+        unless ( $self->__Value('Queue') == 0 || $self->CurrentUserHasRight( 'SeeQueue') ) {
+            return (undef);
+        }
+    return ( $self->__Value($field) );
+
+}
+
+# }}}
+# {{{ sub SetDisabled
+
+=head2 SetDisabled
+
+Takes a boolean.
+1 will cause this custom field to no longer be avaialble for tickets.
+0 will re-enable this queue
+
+=cut
+
+# }}}
+
+1;
diff --git a/rt/lib/RT/CustomFields.pm b/rt/lib/RT/CustomFields.pm
new file mode 100644
index 000000000..3e47765e6
--- /dev/null
+++ b/rt/lib/RT/CustomFields.pm
@@ -0,0 +1,121 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
+
+=head1 NAME
+
+  RT::CustomFields -- Class Description
+ 
+=head1 SYNOPSIS
+
+  use RT::CustomFields
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=cut
+
+package RT::CustomFields;
+
+use RT::SearchBuilder;
+use RT::CustomField;
+
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
+
+
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'CustomFields';
+    $self->{'primary_key'} = 'id';
+
+
+
+  # By default, order by name
+  $self->OrderBy( ALIAS => 'main',
+                  FIELD => 'SortOrder',
+                  ORDER => 'ASC');
+
+    return ( $self->SUPER::_Init(@_) );
+}
+
+
+=item NewItem
+
+Returns an empty new RT::CustomField item
+
+=cut
+
+sub NewItem {
+    my $self = shift;
+    return(RT::CustomField->new($self->CurrentUser));
+}
+
+        eval "require RT::CustomFields_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/CustomFields_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::CustomFields_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/CustomFields_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::CustomFields_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/CustomFields_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::CustomFields_Overlay, RT::CustomFields_Vendor, RT::CustomFields_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/CustomFields_Overlay.pm b/rt/lib/RT/CustomFields_Overlay.pm
new file mode 100644
index 000000000..97c7cb8df
--- /dev/null
+++ b/rt/lib/RT/CustomFields_Overlay.pm
@@ -0,0 +1,135 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::CustomFields - a collection of RT CustomField objects
+
+=head1 SYNOPSIS
+
+  use RT::CustomFields;
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::CustomFields);
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+
+# {{{ sub LimitToGlobalOrQueue 
+
+=item LimitToGlobalOrQueue QUEUEID
+
+Limits the set of custom fields found to global custom fields or those tied to the queue with ID QUEUEID 
+
+=cut
+
+sub LimitToGlobalOrQueue {
+    my $self = shift;
+    my $queue = shift;
+    $self->LimitToQueue($queue);
+    $self->LimitToGlobal();
+}
+
+# }}}
+
+# {{{ sub LimitToQueue 
+
+=head2 LimitToQueue QUEUEID
+
+Takes a queue id (numerical) as its only argument. Makes sure that 
+Scopes it pulls out apply to this queue (or another that you've selected with
+another call to this method
+
+=cut
+
+sub LimitToQueue  {
+   my $self = shift;
+  my $queue = shift;
+ 
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Queue',
+		VALUE => "$queue")
+      if defined $queue;
+  
+}
+# }}}
+
+# {{{ sub LimitToGlobal
+
+=head2 LimitToGlobal
+
+Makes sure that 
+Scopes it pulls out apply to all queues (or another that you've selected with
+another call to this method or LimitToQueue
+
+=cut
+
+
+sub LimitToGlobal  {
+   my $self = shift;
+ 
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Queue',
+		VALUE => 0);
+  
+}
+# }}}
+
+
+# {{{ sub _DoSearch 
+
+=head2 _DoSearch
+
+  A subclass of DBIx::SearchBuilder::_DoSearch that makes sure that _Disabled ro
+ws never get seen unless
+we're explicitly trying to see them.
+
+=cut
+
+sub _DoSearch {
+    my $self = shift;
+    
+    #unless we really want to find disabled rows, make sure we\'re only finding enabled ones.
+    unless($self->{'find_disabled_rows'}) {
+        $self->LimitToEnabled();
+    }
+    
+    return($self->SUPER::_DoSearch(@_));
+    
+}
+
+# }}}
+  
+1;
+
diff --git a/rt/lib/RT/Date.pm b/rt/lib/RT/Date.pm
index d56997174..355370ada 100644
--- a/rt/lib/RT/Date.pm
+++ b/rt/lib/RT/Date.pm
@@ -1,7 +1,26 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Date.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-2000 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 =head1 NAME
 
   RT::Date - a simple Object Oriented date.
@@ -28,7 +47,15 @@ ok (require RT::Date);
 
 
 package RT::Date;
+
 use Time::Local;
+
+use RT::Base;
+
+use strict;
+use vars qw/@ISA/;
+@ISA = qw/RT::Base/;
+
 use vars qw($MINUTE $HOUR $DAY $WEEK $MONTH $YEAR);
 
 $MINUTE = 60;
@@ -45,6 +72,7 @@ sub new  {
   my $class = ref($proto) || $proto;
   my $self  = {};
   bless ($self, $class);
+  $self->CurrentUser(@_);
   $self->Unix(0);
   return $self;
 }
@@ -61,91 +89,114 @@ if $args->{'Format'} is 'unix', takes the number of seconds since the epoch
 
 If $args->{'Format'} is ISO, tries to parse an ISO date.
 
-If $args->{'Format'} is 'unknown', require Date::Parse and make it figure things
-out. This is a heavyweight operation that should never be called from within 
-RT's core. But it's really useful for something like the textbox date entry
-where we let the user do whatever they want.
+If $args->{'Format'} is 'unknown', require Time::ParseDate and make it figure
+things out. This is a heavyweight operation that should never be called from
+within RT's core. But it's really useful for something like the textbox date
+entry where we let the user do whatever they want.
 
 If $args->{'Value'}  is 0, assumes you mean never.
 
+=begin testing
+
+use_ok(RT::Date);
+my $date = RT::Date->new($RT::SystemUser);
+$date->Set(Format => 'unix', Value => '0');
+ok ($date->ISO eq '1970-01-01 00:00:00', "Set a date to midnight 1/1/1970 GMT");
+
+=end testing
 
 =cut
 
 sub Set {
     my $self = shift;
     my %args = ( Format => 'unix',
-		 Value => time,
-		 @_);
-    if (($args{'Value'} =~ /^\d*$/) and ($args{'Value'} == 0)) {
-	$self->Unix(-1);
-	return($self->Unix());
+                 Value  => time,
+                 @_ );
+    if ( !$args{'Value'}
+         || ( ( $args{'Value'} =~ /^\d*$/ ) and ( $args{'Value'} == 0 ) ) ) {
+        $self->Unix(-1);
+        return ( $self->Unix() );
     }
 
-    if ($args{'Format'} =~ /^unix$/i) {
-	$self->Unix($args{'Value'});
+    if ( $args{'Format'} =~ /^unix$/i ) {
+        $self->Unix( $args{'Value'} );
     }
-    
-    elsif ($args{'Format'} =~ /^(sql|datemanip|iso)$/i) {
-	
-	if (($args{'Value'} =~ /^(\d{4}?)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) ||
-	    ($args{'Value'} =~ /^(\d{4}?)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)$/) ||
-	    ($args{'Value'} =~ /^(\d{4}?)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)\+00$/) ||
-	    ($args{'Value'} =~ /^(\d{4}?)(\d\d)(\d\d)(\d\d):(\d\d):(\d\d)$/)) {
-	    
-        my $year = $1;
-	    my $mon = $2;
-	    my $mday = $3;
-	    my $hours = $4;
-	    my $min = $5;
-	    my $sec = $6;
-	    
-	    #timegm expects month as 0->11
-	    $mon--;
-	    
-	    #now that we've parsed it, deal with the case where everything
-	    #was 0
-            if ($mon == -1) {
-	            $self->Unix(-1);
-	        } else {
-
-		    #Dateamnip strings aren't in GMT.
-		    if ($args{'Format'} =~ /^datemanip$/i) {
-			$self->Unix(timelocal($sec,$min,$hours,$mday,$mon,$year));
-		    }
-		    #ISO and SQL dates are in GMT
-		    else {
-			$self->Unix(timegm($sec,$min,$hours,$mday,$mon,$year));
-		    }
-		    
-		    $self->Unix(-1) unless $self->Unix;
-		}
-   }  
-	else {
-	    use Carp;
-	    Carp::cluck;
-	    $RT::Logger->debug( "Couldn't parse date $args{'Value'} as a $args{'Format'}");
-	    
-	}
+
+    elsif ( $args{'Format'} =~ /^(sql|datemanip|iso)$/i ) {
+	$args{'Value'} =~ s!/!-!g;
+
+        if (( $args{'Value'} =~ /^(\d{4}?)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/ )
+            || ( $args{'Value'} =~
+                 /^(\d{4}?)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)$/ )
+            || ( $args{'Value'} =~
+                 /^(\d{4}?)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)\+00$/ )
+            || ($args{'Value'} =~ /^(\d{4}?)(\d\d)(\d\d)(\d\d):(\d\d):(\d\d)$/ )
+          ) {
+
+            my $year  = $1;
+            my $mon   = $2;
+            my $mday  = $3;
+            my $hours = $4;
+            my $min   = $5;
+            my $sec   = $6;
+
+            #timegm expects month as 0->11
+            $mon--;
+
+            #now that we've parsed it, deal with the case where everything
+            #was 0
+            if ( $mon == -1 ) {
+                $self->Unix(-1);
+            }
+            else {
+
+                #Dateamnip strings aren't in GMT.
+                if ( $args{'Format'} =~ /^datemanip$/i ) {
+                    $self->Unix(
+                          timelocal( $sec, $min, $hours, $mday, $mon, $year ) );
+                }
+
+                #ISO and SQL dates are in GMT
+                else {
+                    $self->Unix(
+                             timegm( $sec, $min, $hours, $mday, $mon, $year ) );
+                }
+
+                $self->Unix(-1) unless $self->Unix;
+            }
+        }
+        else {
+            use Carp;
+            Carp::cluck;
+            $RT::Logger->debug(
+                     "Couldn't parse date $args{'Value'} as a $args{'Format'}");
+
+        }
+    }
+    elsif ( $args{'Format'} =~ /^unknown$/i ) {
+        require Time::ParseDate;
+
+        #Convert it to an ISO format string
+
+	my $date = Time::ParseDate::parsedate($args{'Value'},
+			UK => $RT::DateDayBeforeMonth,
+			PREFER_PAST => $RT::AmbiguousDayInPast,
+			PREFER_FUTURE => !($RT::AmbiguousDayInPast));
+
+        #This date has now been set to a date in the _local_ timezone.
+        #since ISO dates are known to be in GMT (for RT's purposes);
+
+        $RT::Logger->debug( "RT::Date used date::parse to make "
+                            . $args{'Value'}
+                            . " $date\n" );
+
+        return ( $self->Set( Format => 'unix', Value => "$date" ) );
     }
-    elsif ($args{'Format'} =~ /^unknown$/i) {
-        require Date::Parse;
-        #Convert it to an ISO format string 
-        
-	my $date = Date::Parse::str2time($args{'Value'});
-        
-	#This date has now been set to a date in the _local_ timezone.
-	#since ISO dates are known to be in GMT (for RT's purposes);
-	
-	$RT::Logger->debug("RT::Date used date::parse to make ".$args{'Value'} . " $date\n");
-        
-	
-	return ($self->Set( Format => 'unix', Value => "$date"));
-    }                                                    
     else {
-	die "Unknown Date format: ".$args{'Format'}."\n";
+        die "Unknown Date format: " . $args{'Format'} . "\n";
     }
-    
-    return($self->Unix());
+
+    return ( $self->Unix() );
 }
 
 # }}}
@@ -232,47 +283,59 @@ sub DiffAsString {
 
 # {{{ sub DurationAsString
 
+
 =head2 DurationAsString
 
 Takes a number of seconds. returns a string describing that duration
 
 =cut
 
-sub DurationAsString{
+sub DurationAsString {
 
-    my $self=shift;
+    my $self     = shift;
     my $duration = shift;
-    
-    my ($negative, $s);
-    
-    $negative = 'ago' if ($duration < 0);
+
+    my ( $negative, $s );
+
+    $negative = 1 if ( $duration < 0 );
 
     $duration = abs($duration);
 
-    if($duration < $MINUTE) {
-	$s=$duration;
-	$string="sec";
-    } elsif($duration < (2 * $HOUR)) {
-	$s = int($duration/$MINUTE);
-	$string="min";
-    } elsif($duration < (2 * $DAY)) {
-	$s = int($duration/$HOUR);
-	$string="hours";
-    } elsif($duration < (2 * $WEEK)) {
-	$s = int($duration/$DAY);
-	$string="days";
-    } elsif($duration < (2 * $MONTH)) {
-	$s = int($duration/$WEEK);
-	$string="weeks";
-    } elsif($duration < $YEAR) {
-	$s = int($duration/$MONTH);
-	$string="months";
-    } else {
-	$s = int($duration/$YEAR);
-	$string="years";
+    my $time_unit;
+    if ( $duration < $MINUTE ) {
+        $s         = $duration;
+        $time_unit = $self->loc("sec");
+    }
+    elsif ( $duration < ( 2 * $HOUR ) ) {
+        $s         = int( $duration / $MINUTE );
+        $time_unit = $self->loc("min");
+    }
+    elsif ( $duration < ( 2 * $DAY ) ) {
+        $s         = int( $duration / $HOUR );
+        $time_unit = $self->loc("hours");
+    }
+    elsif ( $duration < ( 2 * $WEEK ) ) {
+        $s         = int( $duration / $DAY );
+        $time_unit = $self->loc("days");
+    }
+    elsif ( $duration < ( 2 * $MONTH ) ) {
+        $s         = int( $duration / $WEEK );
+        $time_unit = $self->loc("weeks");
+    }
+    elsif ( $duration < $YEAR ) {
+        $s         = int( $duration / $MONTH );
+        $time_unit = $self->loc("months");
+    }
+    else {
+        $s         = int( $duration / $YEAR );
+        $time_unit = $self->loc("years");
+    }
+    if (0) { # For now, never display the "AGO" # $negative) {
+        return $self->loc( "[_1] [_2] ago", $s, $time_unit );
+    }
+    else {
+        return $self->loc( "[_1] [_2]", $s, $time_unit );
     }
-    
-    return ("$s $string $negative");
 }
 
 # }}}
@@ -303,12 +366,64 @@ Returns the object\'s time as a string with the current timezone.
 
 sub AsString {
     my $self = shift;
-    return ("Not set") if ($self->Unix <= 0);
+    return ($self->loc("Not set")) if ($self->Unix <= 0);
+
+    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($self->Unix);
 
-    return (scalar(localtime($self->Unix)));
+    return $self->loc("[_1] [_2] [_3] [_4]:[_5]:[_6] [_7]", $self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900));
 }
 # }}}
 
+# {{{ GetWeekday
+=head2 GetWeekday DAY
+
+Takes an integer day of week and returns a localized string for that day of week
+
+=cut
+
+sub GetWeekday {
+    my $self = shift;
+    my $dow = shift;
+    
+    return $self->loc('Mon.') if ($dow == 1);
+    return $self->loc('Tue.') if ($dow == 2);
+    return $self->loc('Wed.') if ($dow == 3);
+    return $self->loc('Thu.') if ($dow == 4);
+    return $self->loc('Fri.') if ($dow == 5);
+    return $self->loc('Sat.') if ($dow == 6);
+    return $self->loc('Sun.') if ($dow == 0);
+}
+
+# }}}
+
+# {{{ GetMonth
+=head2 GetMonth DAY
+
+Takes an integer month and returns a localized string for that month 
+
+=cut
+
+sub GetMonth {
+    my $self = shift;
+   my $mon = shift;
+
+    # We do this rather than an array so that we don't call localize 12x what we need to
+    return $self->loc('Jan.') if ($mon == 0);
+    return $self->loc('Feb.') if ($mon == 1);
+    return $self->loc('Mar.') if ($mon == 2);
+    return $self->loc('Apr.') if ($mon == 3);
+    return $self->loc('May.') if ($mon == 4);
+    return $self->loc('Jun.') if ($mon == 5);
+    return $self->loc('Jul.') if ($mon == 6);
+    return $self->loc('Aug.') if ($mon == 7);
+    return $self->loc('Sep.') if ($mon == 8);
+    return $self->loc('Oct.') if ($mon == 9);
+    return $self->loc('Nov.') if ($mon == 10);
+    return $self->loc('Dec.') if ($mon == 11);
+}
+
+# }}}
+
 # {{{ sub AddSeconds
 
 =head2 sub AddSeconds
@@ -425,12 +540,18 @@ pull from a 'Timezone' attribute of the CurrentUser
 
 sub LocalTimezone {
     my $self = shift;
-    
+
+    return $self->CurrentUser->Timezone
+	if $self->CurrentUser and $self->CurrentUser->can('Timezone');
+
     return ($RT::Timezone);
 }
 
 # }}}
 
-
+eval "require RT::Date_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Date_Vendor.pm});
+eval "require RT::Date_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Date_Local.pm});
 
 1;
diff --git a/rt/lib/RT/EmailParser.pm b/rt/lib/RT/EmailParser.pm
new file mode 100644
index 000000000..49f3d5518
--- /dev/null
+++ b/rt/lib/RT/EmailParser.pm
@@ -0,0 +1,784 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+package RT::EmailParser;
+
+
+use base qw/RT::Base/;
+
+use strict;
+use Mail::Address;
+use MIME::Entity;
+use MIME::Head;
+use MIME::Parser;
+use File::Temp qw/tempdir/;
+
+=head1 NAME
+
+  RT::Interface::CLI - helper functions for creating a commandline RT interface
+
+=head1 SYNOPSIS
+
+
+=head1 DESCRIPTION
+
+
+=begin testing
+
+ok(require RT::EmailParser);
+
+=end testing
+
+
+=head1 METHODS
+
+=head2 new
+
+
+=cut
+
+sub new  {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self  = {};
+  bless ($self, $class);
+  return $self;
+}
+
+
+
+# {{{ sub debug
+
+sub debug {
+    my $val = shift;
+    my ($debug);
+    if ($val) {
+        $RT::Logger->debug( $val . "\n" );
+        if ($debug) {
+            print STDERR "$val\n";
+        }
+    }
+    if ($debug) {
+        return (1);
+    }
+}
+
+# }}}
+
+# {{{ sub CheckForLoops 
+
+sub CheckForLoops {
+    my $self = shift;
+
+    my $head = $self->Head;
+
+    #If this instance of RT sent it our, we don't want to take it in
+    my $RTLoop = $head->get("X-RT-Loop-Prevention") || "";
+    chomp($RTLoop);    #remove that newline
+    if ( $RTLoop =~ /^$RT::rtname/ ) {
+        return (1);
+    }
+
+    # TODO: We might not trap the case where RT instance A sends a mail
+    # to RT instance B which sends a mail to ...
+    return (undef);
+}
+
+# }}}
+
+# {{{ sub CheckForSuspiciousSender
+
+sub CheckForSuspiciousSender {
+    my $self = shift;
+
+    #if it's from a postmaster or mailer daemon, it's likely a bounce.
+
+    #TODO: better algorithms needed here - there is no standards for
+    #bounces, so it's very difficult to separate them from anything
+    #else.  At the other hand, the Return-To address is only ment to be
+    #used as an error channel, we might want to put up a separate
+    #Return-To address which is treated differently.
+
+    #TODO: search through the whole email and find the right Ticket ID.
+
+    my ( $From, $junk ) = $self->ParseSenderAddressFromHead();
+
+    if ( ( $From =~ /^mailer-daemon/i ) or ( $From =~ /^postmaster/i ) ) {
+        return (1);
+
+    }
+
+    return (undef);
+
+}
+
+# }}}
+
+# {{{ sub CheckForAutoGenerated
+sub CheckForAutoGenerated {
+    my $self = shift;
+    my $head = $self->Head;
+
+    my $Precedence = $head->get("Precedence") || "";
+    if ( $Precedence =~ /^(bulk|junk)/i ) {
+        return (1);
+    }
+    else {
+        return (undef);
+    }
+}
+
+# }}}
+
+# {{{ sub ParseMIMEEntityFromSTDIN
+
+sub ParseMIMEEntityFromSTDIN {
+    my $self = shift;
+    return $self->ParseMIMEEntityFromFileHandle(\*STDIN);
+}
+
+# }}}
+
+
+sub ParseMIMEEntityFromScalar {
+    my $self = shift;
+    my $message = shift;
+
+    # Create a new parser object:
+
+    my $parser = MIME::Parser->new();
+    $self->_SetupMIMEParser($parser);
+
+
+    # TODO: XXX 3.0 we really need to wrap this in an eval { }
+    unless ( $self->{'entity'} = $parser->parse_data($message) ) {
+        # Try again, this time without extracting nested messages
+        $parser->extract_nested_messages(0);
+        unless ( $self->{'entity'} = $parser->parse_data($message) ) {
+            $RT::Logger->crit("couldn't parse MIME stream");
+            return ( undef);
+        }
+    }
+    $self->_PostProcessNewEntity();
+    return (1);
+}
+
+# {{{ ParseMIMEEntityFromFilehandle *FH
+
+=head2 ParseMIMEEntityFromFilehandle *FH
+
+Parses a mime entity from a filehandle passed in as an argument
+
+=cut
+
+sub ParseMIMEEntityFromFileHandle {
+    my $self = shift;
+    my $filehandle = shift;
+
+    # Create a new parser object:
+
+    my $parser = MIME::Parser->new();
+    $self->_SetupMIMEParser($parser);
+
+
+    # TODO: XXX 3.0 we really need to wrap this in an eval { }
+
+    unless ( $self->{'entity'} = $parser->parse($filehandle) ) {
+
+        # Try again, this time without extracting nested messages
+        $parser->extract_nested_messages(0);
+        unless ( $self->{'entity'} = $parser->parse($filehandle) ) {
+            $RT::Logger->crit("couldn't parse MIME stream");
+            return ( undef);
+        }
+    }
+    $self->_PostProcessNewEntity();
+    return (1);
+}
+
+# }}}
+
+# {{{ _PostProcessNewEntity 
+
+=head2 _PostProcessNewEntity
+
+cleans up and postprocesses a newly parsed MIME Entity
+
+=cut
+
+sub _PostProcessNewEntity {
+    my $self = shift;
+
+    #Now we've got a parsed mime object. 
+
+    # try to convert text parts into utf-8 charset
+    RT::I18N::SetMIMEEntityToEncoding($self->{'entity'}, 'utf-8');
+
+
+    # Unfold headers that are have embedded newlines
+    $self->Head->unfold;
+
+
+}
+
+# }}}
+
+# {{{ sub ParseTicketId 
+
+sub ParseTicketId {
+    my $self = shift;
+
+    my $Subject = shift;
+
+    if ( $Subject =~ s/\[$RT::rtname \#(\d+)\s*\]//i ) {
+        my $id = $1;
+        $RT::Logger->debug("Found a ticket ID. It's $id");
+        return ($id);
+    }
+    else {
+        return (undef);
+    }
+}
+
+# }}}
+
+# {{{ sub MailError 
+
+=head2 MailError { }
+
+
+# TODO this doesn't belong here.
+# TODO doc this
+
+
+=cut
+
+
+sub MailError {
+    my $self = shift;
+
+    my %args = (
+        To          => $RT::OwnerEmail,
+        Bcc         => undef,
+        From        => $RT::CorrespondAddress,
+        Subject     => 'There has been an error',
+        Explanation => 'Unexplained error',
+        MIMEObj     => undef,
+        LogLevel    => 'crit',
+        @_
+    );
+
+    $RT::Logger->log(
+        level   => $args{'LogLevel'},
+        message => $args{'Explanation'}
+    );
+    my $entity = MIME::Entity->build(
+        Type                   => "multipart/mixed",
+        From                   => $args{'From'},
+        Bcc                    => $args{'Bcc'},
+        To                     => $args{'To'},
+        Subject                => $args{'Subject'},
+        'X-RT-Loop-Prevention' => $RT::rtname,
+    );
+
+    $entity->attach( Data => $args{'Explanation'} . "\n" );
+
+    my $mimeobj = $args{'MIMEObj'};
+    $mimeobj->sync_headers();
+    $entity->add_part($mimeobj);
+
+    if ( $RT::MailCommand eq 'sendmailpipe' ) {
+        open( MAIL, "|$RT::SendmailPath $RT::SendmailArguments" ) || return (0);
+        print MAIL $entity->as_string;
+        close(MAIL);
+    }
+    else {
+        $entity->send( $RT::MailCommand, $RT::MailParams );
+    }
+}
+
+# }}}
+
+
+
+# {{{ sub GetCurrentUser 
+
+sub GetCurrentUser {
+    my $self     = shift;
+    my $ErrorsTo = shift;
+
+    my %UserInfo = ();
+
+    #Suck the address of the sender out of the header
+    my ( $Address, $Name ) = $self->ParseSenderAddressFromHead();
+
+    my $tempuser = RT::User->new($RT::SystemUser);
+
+    #This will apply local address canonicalization rules
+    $Address = $tempuser->CanonicalizeEmailAddress($Address);
+
+    #If desired, synchronize with an external database
+    my $UserFoundInExternalDatabase = 0;
+
+    # Username is the 'Name' attribute of the user that RT uses for things
+    # like authentication
+    my $Username = undef;
+    ( $UserFoundInExternalDatabase, %UserInfo ) =
+      $self->LookupExternalUserInfo( $Address, $Name );
+
+    $Address  = $UserInfo{'EmailAddress'};
+    $Username = $UserInfo{'Name'};
+
+    #Get us a currentuser object to work with. 
+    my $CurrentUser = RT::CurrentUser->new();
+
+    # First try looking up by a username, if we got one from the external
+    # db lookup. Next, try looking up by email address. Failing that,
+    # try looking up by users who have this user's email address as their
+    # username.
+
+    if ($Username) {
+        $CurrentUser->LoadByName($Username);
+    }
+
+    unless ( $CurrentUser->Id ) {
+        $CurrentUser->LoadByEmail($Address);
+    }
+
+    #If we can't get it by email address, try by name.  
+    unless ( $CurrentUser->Id ) {
+        $CurrentUser->LoadByName($Address);
+    }
+
+    unless ( $CurrentUser->Id ) {
+
+        #If we couldn't load a user, determine whether to create a user
+
+        # {{{ If we require an incoming address to be found in the external
+        # user database, reject the incoming message appropriately
+        if ( $RT::SenderMustExistInExternalDatabase
+             && !$UserFoundInExternalDatabase ) {
+
+            my $Message =
+              "Sender's email address was not found in the user database.";
+
+            # {{{  This code useful only if you've defined an AutoRejectRequest template
+
+            require RT::Template;
+            my $template = new RT::Template($RT::Nobody);
+            $template->Load('AutoRejectRequest');
+            $Message = $template->Content || $Message;
+
+            # }}}
+
+            MailError(
+                 To      => $ErrorsTo,
+                 Subject => "Ticket Creation failed: user could not be created",
+                 Explanation => $Message,
+                 MIMEObj     => $self->Entity,
+                 LogLevel    => 'notice' );
+
+            return ($CurrentUser);
+
+        }
+
+        # }}}
+
+        else {
+            my $NewUser = RT::User->new($RT::SystemUser);
+
+            my ( $Val, $Message ) = $NewUser->Create(
+                                  Name => ( $Username || $Address ),
+                                  EmailAddress => $Address,
+                                  RealName     => "$Name",
+                                  Password     => undef,
+                                  Privileged   => 0,
+                                  Comments => 'Autocreated on ticket submission'
+            );
+
+            unless ($Val) {
+
+                # Deal with the race condition of two account creations at once
+                #
+                if ($Username) {
+                    $NewUser->LoadByName($Username);
+                }
+
+                unless ( $NewUser->Id ) {
+                    $NewUser->LoadByEmail($Address);
+                }
+
+                unless ( $NewUser->Id ) {
+                    MailError(To          => $ErrorsTo,
+                              Subject     => "User could not be created",
+                              Explanation =>
+                                "User creation failed in mailgateway: $Message",
+                              MIMEObj  => $self->Entity,
+                              LogLevel => 'crit' );
+                }
+            }
+        }
+
+        #Load the new user object
+        $CurrentUser->LoadByEmail($Address);
+
+        unless ( $CurrentUser->id ) {
+            $RT::Logger->warning(
+                               "Couldn't load user '$Address'." . "giving up" );
+            MailError(
+                   To          => $ErrorsTo,
+                   Subject     => "User could not be loaded",
+                   Explanation =>
+                     "User  '$Address' could not be loaded in the mail gateway",
+                   MIMEObj  => $self->Entity,
+                   LogLevel => 'crit' );
+
+        }
+    }
+
+    return ($CurrentUser);
+
+}
+
+# }}}
+
+
+# {{{ ParseCcAddressesFromHead 
+
+=head2 ParseCcAddressesFromHead HASHREF
+
+Takes a hashref object containing QueueObj, Head and CurrentUser objects.
+Returns a list of all email addresses in the To and Cc 
+headers b<except> the current Queue\'s email addresses, the CurrentUser\'s 
+email address  and anything that the $RTAddressRegexp matches.
+
+=cut
+
+sub ParseCcAddressesFromHead {
+
+    my $self = shift;
+
+    my %args = (
+        QueueObj    => undef,
+        CurrentUser => undef,
+        @_
+    );
+
+    my (@Addresses);
+
+    my @ToObjs = Mail::Address->parse( $self->Head->get('To') );
+    my @CcObjs = Mail::Address->parse( $self->Head->get('Cc') );
+
+    foreach my $AddrObj ( @ToObjs, @CcObjs ) {
+        my $Address = $AddrObj->address;
+        my $user = RT::User->new($RT::SystemUser);
+        $Address = $user->CanonicalizeEmailAddress($Address);
+        next if ( $args{'CurrentUser'}->EmailAddress   =~ /^$Address$/i );
+        next if ( $args{'QueueObj'}->CorrespondAddress =~ /^$Address$/i );
+        next if ( $args{'QueueObj'}->CommentAddress    =~ /^$Address$/i );
+        next if ( IsRTAddress($Address) );
+
+        push ( @Addresses, $Address );
+    }
+    return (@Addresses);
+}
+
+# }}}
+
+# {{{ ParseSenderAdddressFromHead
+
+=head2 ParseSenderAddressFromHead
+
+Takes a MIME::Header object. Returns a tuple: (user@host, friendly name) 
+of the From (evaluated in order of Reply-To:, From:, Sender)
+
+=cut
+
+sub ParseSenderAddressFromHead {
+    my $self = shift;
+
+    #Figure out who's sending this message.
+    my $From = $self->Head->get('Reply-To')
+      || $self->Head->get('From')
+      || $self->Head->get('Sender');
+    return ( $self->ParseAddressFromHeader($From) );
+}
+
+# }}}
+
+# {{{ ParseErrorsToAdddressFromHead
+
+=head2 ParseErrorsToAddressFromHead
+
+Takes a MIME::Header object. Return a single value : user@host
+of the From (evaluated in order of Errors-To:,Reply-To:, From:, Sender)
+
+=cut
+
+sub ParseErrorsToAddressFromHead {
+    my $self = shift;
+
+    #Figure out who's sending this message.
+
+    foreach my $header ( 'Errors-To', 'Reply-To', 'From', 'Sender' ) {
+
+        # If there's a header of that name
+        my $headerobj = $self->Head->get($header);
+        if ($headerobj) {
+            my ( $addr, $name ) = $self->ParseAddressFromHeader($headerobj);
+
+            # If it's got actual useful content...
+            return ($addr) if ($addr);
+        }
+    }
+}
+
+# }}}
+
+# {{{ ParseAddressFromHeader
+
+=head2 ParseAddressFromHeader ADDRESS
+
+Takes an address from $self->Head->get('Line') and returns a tuple: user@host, friendly name
+
+=cut
+
+sub ParseAddressFromHeader {
+    my $self = shift;
+    my $Addr = shift;
+
+    my @Addresses = Mail::Address->parse($Addr);
+
+    my $AddrObj = $Addresses[0];
+
+    unless ( ref($AddrObj) ) {
+        return ( undef, undef );
+    }
+
+    my $Name = ( $AddrObj->phrase || $AddrObj->comment || $AddrObj->address );
+
+    #Lets take the from and load a user object.
+    my $Address = $AddrObj->address;
+
+    return ( $Address, $Name );
+}
+
+# }}}
+
+# {{{ IsRTAddress
+
+=item IsRTaddress ADDRESS
+
+Takes a single parameter, an email address. 
+Returns true if that address matches the $RTAddressRegexp.  
+Returns false, otherwise.
+
+=begin testing
+
+is(RT::EmailParser::IsRTAddress("","rt\@example.com"),1, "Regexp matched rt address" );
+is(RT::EmailParser::IsRTAddress("","frt\@example.com"),undef, "Regexp didn't match non-rt address" );
+
+=end testing
+
+=cut
+
+sub IsRTAddress {
+    my $self = shift;
+    my $address = shift;
+
+    # Example: the following rule would tell RT not to Cc 
+    #   "tickets@noc.example.com"
+    if ( defined($RT::RTAddressRegexp) &&
+                       $address =~ /$RT::RTAddressRegexp/ ) {
+        return(1);
+    } else {
+        return (undef);
+    }
+}
+
+# }}}
+
+
+# {{{ CullRTAddresses
+
+=item CullRTAddresses ARRAY
+
+Takes a single argument, an array of email addresses.
+Returns the same array with any IsRTAddress()es weeded out.
+
+=begin testing
+
+@before = ("rt\@example.com", "frt\@example.com");
+@after = ("frt\@example.com");
+ok(eq_array(RT::EmailParser::CullRTAddresses("",@before),@after), "CullRTAddresses only culls RT addresses");
+
+=end testing
+
+=cut
+
+sub CullRTAddresses {
+    my $self = shift;
+    my @addresses= (@_);
+    my @addrlist;
+
+    foreach my $addr( @addresses ) {
+      push (@addrlist, $addr)    unless IsRTAddress("", $addr);
+    }
+    return (@addrlist);
+}
+
+# }}}
+
+
+# {{{ LookupExternalUserInfo
+
+
+# LookupExternalUserInfo is a site-definable method for synchronizing
+# incoming users with an external data source. 
+#
+# This routine takes a tuple of EmailAddress and FriendlyName
+#   EmailAddress is the user's email address, ususally taken from
+#       an email message's From: header.
+#   FriendlyName is a freeform string, ususally taken from the "comment" 
+#       portion of an email message's From: header.
+#
+# If you define an AutoRejectRequest template, RT will use this   
+# template for the rejection message.
+
+
+=item LookupExternalUserInfo
+
+ LookupExternalUserInfo is a site-definable method for synchronizing
+ incoming users with an external data source. 
+
+ This routine takes a tuple of EmailAddress and FriendlyName
+    EmailAddress is the user's email address, ususally taken from
+        an email message's From: header.
+    FriendlyName is a freeform string, ususally taken from the "comment" 
+        portion of an email message's From: header.
+
+ It returns (FoundInExternalDatabase, ParamHash);
+
+   FoundInExternalDatabase must  be set to 1 before return if the user was
+   found in the external database.
+
+   ParamHash is a Perl parameter hash which can contain at least the following
+   fields. These fields are used to populate RT's users database when the user 
+   is created
+
+    EmailAddress is the email address that RT should use for this user.  
+    Name is the 'Name' attribute RT should use for this user. 
+         'Name' is used for things like access control and user lookups.
+    RealName is what RT should display as the user's name when displaying 
+         'friendly' names
+
+=cut
+
+sub LookupExternalUserInfo {
+  my $self = shift;
+  my $EmailAddress = shift;
+  my $RealName = shift;
+
+  my $FoundInExternalDatabase = 1;
+  my %params;
+
+  #Name is the RT username you want to use for this user.
+  $params{'Name'} = $EmailAddress;
+  $params{'EmailAddress'} = $EmailAddress;
+  $params{'RealName'} = $RealName;
+
+  # See RT's contributed code for examples.
+  # http://www.fsck.com/pub/rt/contrib/
+  return ($FoundInExternalDatabase, %params);
+}
+
+# }}}
+
+# {{{ Accessor methods for parsed email messages
+
+=head2 Head
+
+Return the parsed head from this message
+
+=cut
+
+sub Head {
+    my $self = shift;
+    return $self->Entity->head;
+}
+
+=head2 Entity 
+
+Return the parsed Entity from this message
+
+=cut
+
+sub Entity {
+    my $self = shift;
+    return $self->{'entity'};
+}
+
+# }}}
+# {{{ _SetupMIMEParser 
+
+=head2 _SetupMIMEParser $parser
+
+A private instance method which sets up a mime parser to do its job
+
+=cut
+
+
+    ## TODO: Does it make sense storing to disk at all?  After all, we
+    ## need to put each msg as an in-core scalar before saving it to
+    ## the database, don't we?
+
+    ## At the same time, we should make sure that we nuke attachments 
+    ## Over max size and return them
+
+sub _SetupMIMEParser {
+    my $self = shift;
+    my $parser = shift;
+    my $AttachmentDir = File::Temp::tempdir( TMPDIR => 1, CLEANUP => 1 );
+
+    # Set up output directory for files:
+    $parser->output_dir("$AttachmentDir");
+
+    #If someone includes a message, don't extract it
+    $parser->extract_nested_messages(1);
+
+    # Set up the prefix for files with auto-generated names:
+    $parser->output_prefix("part");
+
+    # If content length is <= 50000 bytes, store each msg as in-core scalar;
+    # Else, write to a disk file (the default action):
+
+    $parser->output_to_core(50000);
+}
+# }}}
+
+eval "require RT::EmailParser_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/EmailParser_Vendor.pm});
+eval "require RT::EmailParser_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/EmailParser_Local.pm});
+
+1;
diff --git a/rt/lib/RT/Group.pm b/rt/lib/RT/Group.pm
index 005601f5e..4dcef3f07 100755
--- a/rt/lib/RT/Group.pm
+++ b/rt/lib/RT/Group.pm
@@ -1,364 +1,258 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Group.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Copyright 2000 Jesse Vincent <jesse@fsck.com>
-# Released under the terms of the GNU Public License
-#
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
 #
 
+use strict;
+
+
 =head1 NAME
 
-  RT::Group - RT\'s group object
+RT::Group
 
-=head1 SYNOPSIS
 
-  use RT::Group;
-my $group = new RT::Group($CurrentUser);
+=head1 SYNOPSIS
 
 =head1 DESCRIPTION
 
-An RT group object.
+=head1 METHODS
 
-=head1 AUTHOR
+=cut
 
-Jesse Vincent, jesse@fsck.com
+package RT::Group;
+use RT::Record; 
 
-=head1 SEE ALSO
 
-RT
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
 
-=head1 METHODS
+sub _Init {
+  my $self = shift; 
 
+  $self->Table('Groups');
+  $self->SUPER::_Init(@_);
+}
 
-=begin testing
 
-ok (require RT::TestHarness);
-ok (require RT::Group);
 
-=end testing
 
-=cut
 
+=item Create PARAMHASH
 
-package RT::Group;
-use RT::Record;
-use RT::GroupMember;
-use RT::ACE;
+Create takes a hash of values and creates a row in the database:
 
-use vars qw|@ISA|;
-@ISA= qw(RT::Record);
+  varchar(200) 'Name'.
+  varchar(255) 'Description'.
+  varchar(64) 'Domain'.
+  varchar(64) 'Type'.
+  varchar(64) 'Instance'.
+
+=cut
 
 
-# {{{ sub _Init
-sub _Init  {
-  my $self = shift; 
-  $self->{'table'} = "Groups";
-  return ($self->SUPER::_Init(@_));
-}
-# }}}
 
-# {{{ sub _Accessible 
-sub _Accessible  {
+
+sub Create {
     my $self = shift;
-    my %Cols = (
-		Name => 'read/write',
-		Description => 'read/write',
-		Pseudo => 'read'
-	       );
-    return $self->SUPER::_Accessible(@_, %Cols);
+    my %args = ( 
+                Name => '',
+                Description => '',
+                Domain => '',
+                Type => '',
+                Instance => '',
+
+		  @_);
+    $self->SUPER::Create(
+                         Name => $args{'Name'},
+                         Description => $args{'Description'},
+                         Domain => $args{'Domain'},
+                         Type => $args{'Type'},
+                         Instance => $args{'Instance'},
+);
+
 }
-# }}}
 
-# {{{ sub Load 
 
-=head2 Load
 
-Load a group object from the database. Takes a single argument.
-If the argument is numerical, load by the column 'id'. Otherwise, load by
-the "Name" column which is the group's textual name
+=item id
 
-=cut
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
 
-sub Load  {
-    my $self = shift;
-    my $identifier = shift || return undef;
-    
-    #if it's an int, load by id. otherwise, load by name.
-    if ($identifier !~ /\D/) {
-	$self->SUPER::LoadById($identifier);
-    }
-    else {
-	$self->LoadByCol("Name",$identifier);
-    }
-}
 
-# }}}
+=cut
 
-# {{{ sub Create
 
-=head2 Create
+=item Name
 
-Takes a paramhash with three named arguments: Name, Description and Pseudo.
-Pseudo is used internally by RT for certain special ACL decisions.
+Returns the current value of Name. 
+(In the database, Name is stored as varchar(200).)
 
-=cut
 
-sub Create {
-    my $self = shift;
-    my %args = ( Name => undef,
-		 Description => undef,
-		 Pseudo => 0,
-		 @_);
-    
-    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
-	$RT::Logger->warning($self->CurrentUser->Name ." Tried to create a group without permission.");
-	return(0, 'Permission Denied');
-    }
-    
-    my $retval = $self->SUPER::Create(Name => $args{'Name'},
-				      Description => $args{'Description'},
-				      Pseudo => $args{'Pseudo'});
-    
-    return ($retval);
-}
 
-# }}}
+=item SetName VALUE
 
-# {{{ sub Delete
 
-=head2 Delete
+Set Name to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Name will be stored as a varchar(200).)
 
-Delete this object
 
 =cut
 
-sub Delete {
-    my $self = shift;
-    
-    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
-	return (0, 'Permission Denied');
-    }
-    
-    return($self->SUPER::Delete(@_));    
-}
 
-# }}}
+=item Description
 
-# {{{ MembersObj
+Returns the current value of Description. 
+(In the database, Description is stored as varchar(255).)
 
-=head2 MembersObj
 
-Returns an RT::GroupMembers object of this group's members.
+
+=item SetDescription VALUE
+
+
+Set Description to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Description will be stored as a varchar(255).)
+
 
 =cut
 
-sub MembersObj {
-    my $self = shift;
-    unless (defined $self->{'members_obj'}) {
-	use RT::GroupMembers;
-        $self->{'members_obj'} = new RT::GroupMembers($self->CurrentUser);
-	
-	#If we don't have rights, don't include any results
-	$self->{'members_obj'}->LimitToGroup($self->id);
-	
-    }
-    return ($self->{'members_obj'});
-    
-}
 
-# }}}
+=item Domain
+
+Returns the current value of Domain. 
+(In the database, Domain is stored as varchar(64).)
+
 
-# {{{ AddMember
 
-=head2 AddMember
+=item SetDomain VALUE
+
+
+Set Domain to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Domain will be stored as a varchar(64).)
 
-AddMember adds a user to this group.  It takes a user id.
-Returns a two value array. the first value is true on successful 
-addition or 0 on failure.  The second value is a textual status msg.
 
 =cut
 
-sub AddMember {
-    my $self = shift;
-    my $new_member = shift;
-
-    my $new_member_obj = new RT::User($self->CurrentUser);
-    $new_member_obj->Load($new_member);
-    
-    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
-        #User has no permission to be doing this
-        return(0, "Permission Denied");
-    }
-
-    unless ($new_member_obj->Id) {
-	$RT::Logger->debug("Couldn't find user $new_member");
-	return(0, "Couldn't find user");
-    }	
-
-    if ($self->HasMember($new_member_obj->Id)) {
-        #User is already a member of this group. no need to add it
-        return(0, "Group already has member");
-    }
-    
-    my $member_object = new RT::GroupMember($self->CurrentUser);
-    $member_object->Create( UserId => $new_member_obj->Id, 
-			    GroupId => $self->id );
-    return(1, "Member added");
-}
 
-# }}}
+=item Type
+
+Returns the current value of Type. 
+(In the database, Type is stored as varchar(64).)
+
+
+
+=item SetType VALUE
 
-# {{{ HasMember
 
-=head2 HasMember
+Set Type to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Type will be stored as a varchar(64).)
 
-Takes a user Id and returns a GroupMember Id if that user is a member of 
-this group.
-Returns undef if the user isn't a member of the group or if the current
-user doesn't have permission to find out. Arguably, it should differentiate
-between ACL failure and non membership.
 
 =cut
 
-sub HasMember {
-    my $self = shift;
-    my $user_id = shift;
 
-    #Try to cons up a member object using "LoadByCols"
+=item Instance
 
-    my $member_obj = new RT::GroupMember($self->CurrentUser);
-    $member_obj->LoadByCols( UserId => $user_id, GroupId => $self->id);
+Returns the current value of Instance. 
+(In the database, Instance is stored as varchar(64).)
 
-    #If we have a member object
-    if (defined $member_obj->id) {
-        return ($member_obj->id);
-    }
 
-    #If Load returns no objects, we have an undef id. 
-    else {
-        return(undef);
-    } 
-}
 
-# }}}
+=item SetInstance VALUE
 
-# {{{ DeleteMember
 
-=head2 DeleteMember
+Set Instance to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Instance will be stored as a varchar(64).)
 
-Takes the user id of a member.
-If the current user has apropriate rights,
-removes that GroupMember from this group.
-Returns a two value array. the first value is true on successful 
-addition or 0 on failure.  The second value is a textual status msg.
 
 =cut
 
-sub DeleteMember {
-    my $self = shift;
-    my $member = shift;
-
-    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
-        #User has no permission to be doing this
-        return(0,"Permission Denied");
-    }
-
-    my $member_user_obj = new RT::User($self->CurrentUser);
-    $member_user_obj->Load($member);
-    
-    unless ($member_user_obj->Id) {
-	$RT::Logger->debug("Couldn't find user $member");
-	return(0, "User not found");
-    }	
-
-    my $member_obj = new RT::GroupMember($self->CurrentUser);
-    unless ($member_obj->LoadByCols ( UserId => $member_user_obj->Id,
-				      GroupId => $self->Id )) {
-	return(0, "Couldn\'t load member");  #couldn\'t load member object
-    }
-    
-    #If we couldn't load it, return undef.
-    unless ($member_obj->Id()) {
-	return (0, "Group has no such member");
-    }	
-    
-    #Now that we've checked ACLs and sanity, delete the groupmember
-    my $val = $member_obj->Delete();
-    if ($val) {
-	return ($val, "Member deleted");
-    }
-    else {
-	return (0, "Member not deleted");
-    }
-}
 
-# }}}
 
-# {{{ ACL Related routines
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        Name => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Description => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        Domain => 
+		{read => 1, write => 1, type => 'varchar(64)', default => ''},
+        Type => 
+		{read => 1, write => 1, type => 'varchar(64)', default => ''},
+        Instance => 
+		{read => 1, write => 1, type => 'varchar(64)', default => ''},
 
-# {{{ GrantQueueRight
+ }
+};
 
-=head2 GrantQueueRight
 
-Grant a queue right to this group.  Takes a paramhash of which the elements
-RightAppliesTo and RightName are important.
+        eval "require RT::Group_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Group_Overlay.pm}) {
+            die $@;
+        };
 
-=cut
+        eval "require RT::Group_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Group_Vendor.pm}) {
+            die $@;
+        };
 
-sub GrantQueueRight {
-    
-    my $self = shift;
-    my %args = ( RightScope => 'Queue',
-		 RightName => undef,
-		 RightAppliesTo => undef,
-		 PrincipalType => 'Group',
-		 PrincipalId => $self->Id,
-		 @_);
-   
-    #ACLs get checked in ACE.pm
-    
-    my $ace = new RT::ACE($self->CurrentUser);
-    
-    return ($ace->Create(%args));
-}
+        eval "require RT::Group_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Group_Local.pm}) {
+            die $@;
+        };
 
-# }}}
 
-# {{{ GrantSystemRight
 
-=head2 GrantSystemRight
 
-Grant a system right to this group. 
-The only element that's important to set is RightName.
+=head1 SEE ALSO
 
-=cut
-sub GrantSystemRight {
-    
-    my $self = shift;
-    my %args = ( RightScope => 'System',
-		 RightName => undef,
-		 RightAppliesTo => 0,
-		 PrincipalType => 'Group',
-		 PrincipalId => $self->Id,
-		 @_);
-    
-    # ACLS get checked in ACE.pm
-    
-    my $ace = new RT::ACE($self->CurrentUser);
-    return ($ace->Create(%args));
-}
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-# }}}
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
+   no warnings qw(redefine);
 
-# {{{ sub _Set
-sub _Set {
-    my $self = shift;
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
-    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
-	return (0, 'Permission Denied');
-    }	
+RT::Group_Overlay, RT::Group_Vendor, RT::Group_Local
 
-    return ($self->SUPER::_Set(@_));
+=cut
 
-}
-# }}}
+
+1;
diff --git a/rt/lib/RT/GroupMember.pm b/rt/lib/RT/GroupMember.pm
index 69de50b42..8de1a73fe 100755
--- a/rt/lib/RT/GroupMember.pm
+++ b/rt/lib/RT/GroupMember.pm
@@ -1,136 +1,189 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/GroupMember.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Copyright 2000 Jesse Vincent <jesse@fsck.com>
-# Released under the terms of the GNU Public License
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::GroupMember - a member of an RT Group
+RT::GroupMember
 
-=head1 SYNOPSIS
 
-RT::GroupMember should never be called directly. It should generally
-only be accessed through the helper functions in RT::Group;
+=head1 SYNOPSIS
 
 =head1 DESCRIPTION
 
+=head1 METHODS
 
+=cut
 
+package RT::GroupMember;
+use RT::Record; 
 
-=head1 METHODS
 
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
 
-=begin testing
+sub _Init {
+  my $self = shift; 
 
-ok (require RT::TestHarness);
-ok (require RT::GroupMember);
+  $self->Table('GroupMembers');
+  $self->SUPER::_Init(@_);
+}
 
-=end testing
 
 
-=cut
 
-package RT::GroupMember;
-use RT::Record;
-use vars qw|@ISA|;
-@ISA= qw(RT::Record);
 
-# {{{ sub _Init
-sub _Init {
-  my $self = shift; 
-  $self->{'table'} = "GroupMembers";
-  return($self->SUPER::_Init(@_));
-}
-# }}}
+=item Create PARAMHASH
 
-# {{{ sub _Accessible 
-sub _Accessible  {
-    my $self = shift;
-    my %Cols = (
-		GroupId => 'read',
-		UserId => 'read'
-		);
+Create takes a hash of values and creates a row in the database:
+
+  int(11) 'GroupId'.
+  int(11) 'MemberId'.
+
+=cut
 
-    return $self->SUPER::_Accessible(@_, %Cols);
-}
-# }}}
 
-# {{{ sub Create
 
-# a helper method for Add
 
 sub Create {
     my $self = shift;
-    my %args = ( GroupId => undef,
-		 UserId => undef,
-		 @_
-	       );
-    
-    unless( $self->CurrentUser->HasSystemRight('AdminGroups')) {
-	return (0, 'Permission Denied');
-    }
-
-    return ($self->SUPER::Create(GroupId => $args{'GroupId'},
-				 UserId => $args{'UserId'}))
+    my %args = ( 
+                GroupId => '0',
+                MemberId => '0',
+
+		  @_);
+    $self->SUPER::Create(
+                         GroupId => $args{'GroupId'},
+                         MemberId => $args{'MemberId'},
+);
+
 }
-# }}}
 
-# {{{ sub Add
 
-=head2 Add
 
-Takes a paramhash of UserId and GroupId.  makes that user a memeber
-of that group
+=item id
+
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
+
 
 =cut
 
-sub Add {
-    my $self = shift;
-    return ($self->Create(@_));
-}
-# }}}
 
-# {{{ sub Delete
+=item GroupId
+
+Returns the current value of GroupId. 
+(In the database, GroupId is stored as int(11).)
+
+
+
+=item SetGroupId VALUE
+
 
-=head2 Delete
+Set GroupId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, GroupId will be stored as a int(11).)
 
-Takes no arguments. deletes the currently loaded member from the 
-group in question.
 
 =cut
 
-sub Delete {
-    my $self = shift;
-    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
-	return (0, 'Permission Denied');
-    }
-    return($self->SUPER::Delete(@_));
-}
 
-# }}}
+=item MemberId
+
+Returns the current value of MemberId. 
+(In the database, MemberId is stored as int(11).)
+
 
-# {{{ sub UserObj
 
-=head2 UserObj
+=item SetMemberId VALUE
+
+
+Set MemberId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, MemberId will be stored as a int(11).)
 
-Returns an RT::User object for the user specified by $self->UserId
 
 =cut
 
-sub UserObj {
-    my $self = shift;
-    unless (defined ($self->{'user_obj'})) {
-        $self->{'user_obj'} = new RT::User($self->CurrentUser);
-        $self->{'user_obj'}->Load($self->UserId);
-    }
-    return($self->{'user_obj'});
-}
 
-# {{{ sub _Set
-sub _Set {
-    my $self = shift;
-    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
-	return (0, 'Permission Denied');
-    }
-    return($self->SUPER::_Set(@_));
-}
-# }}}
+
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        GroupId => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        MemberId => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+
+ }
+};
+
+
+        eval "require RT::GroupMember_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/GroupMember_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::GroupMember_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/GroupMember_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::GroupMember_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/GroupMember_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::GroupMember_Overlay, RT::GroupMember_Vendor, RT::GroupMember_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/GroupMember_Overlay.pm b/rt/lib/RT/GroupMember_Overlay.pm
new file mode 100644
index 000000000..20949f017
--- /dev/null
+++ b/rt/lib/RT/GroupMember_Overlay.pm
@@ -0,0 +1,351 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::GroupMember - a member of an RT Group
+
+=head1 SYNOPSIS
+
+RT::GroupMember should never be called directly. It should ONLY
+only be accessed through the helper functions in RT::Group;
+
+If you're operating on an RT::GroupMember object yourself, you B<ARE>
+doing something wrong.
+
+=head1 DESCRIPTION
+
+
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::GroupMember);
+
+=end testing
+
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+use RT::CachedGroupMembers;
+
+# {{{ sub Create
+
+=head2 Create { Group => undef, Member => undef }
+
+Add a Principal to the group Group.
+if the Principal is a group, automatically inserts all
+members of the principal into the cached members table recursively down.
+
+Both Group and Member are expected to be RT::Principal objects
+
+=cut
+
+sub Create {
+    my $self = shift;
+    my %args = (
+        Group  => undef,
+        Member => undef,
+        InsideTransaction => undef,
+        @_
+    );
+
+    unless ($args{'Group'} &&
+            UNIVERSAL::isa($args{'Group'}, 'RT::Principal') &&
+            $args{'Group'}->Id ) {
+
+        $RT::Logger->warning("GroupMember::Create called with a bogus Group arg");
+        return (undef);
+    }
+
+    unless($args{'Group'}->IsGroup) {
+        $RT::Logger->warning("Someone tried to add a member to a user instead of a group");
+        return (undef);
+    }
+
+    unless ($args{'Member'} && 
+            UNIVERSAL::isa($args{'Member'}, 'RT::Principal') &&
+            $args{'Member'}->Id) {
+        $RT::Logger->warning("GroupMember::Create called with a bogus Principal arg");
+        return (undef);
+    }
+
+
+    #Clear the key cache. TODO someday we may want to just clear a little bit of the keycache space. 
+    # TODO what about the groups key cache?
+    RT::Principal->_InvalidateACLCache();
+
+    $RT::Handle->BeginTransaction() unless ($args{'InsideTransaction'});
+
+    # We really need to make sure we don't add any members to this group
+    # that contain the group itself. that would, um, suck. 
+    # (and recurse infinitely)  Later, we can add code to check this in the 
+    # cache and bail so we can support cycling directed graphs
+
+    if ($args{'Member'}->IsGroup) {
+        my $member_object = $args{'Member'}->Object;
+        if ($member_object->HasMemberRecursively($args{'Group'})) {
+            $RT::Logger->debug("Adding that group would create a loop");
+            return(undef);
+        }
+        elsif ( $args{'Member'}->Id == $args{'Group'}->Id) {
+            $RT::Logger->debug("Can't add a group to itself");
+            return(undef);
+        }
+    }
+
+
+    my $id = $self->SUPER::Create(
+        GroupId  => $args{'Group'}->Id,
+        MemberId => $args{'Member'}->Id
+    );
+
+    unless ($id) {
+        $RT::Handle->Rollback() unless ($args{'InsideTransaction'});
+        return (undef);
+    }
+
+    my $cached_member = RT::CachedGroupMember->new( $self->CurrentUser );
+    my $cached_id     = $cached_member->Create(
+        Member          => $args{'Member'},
+        Group           => $args{'Group'},
+        ImmediateParent => $args{'Group'},
+        Via             => '0'
+    );
+
+
+    #When adding a member to a group, we need to go back
+    #and popuplate the CachedGroupMembers of all the groups that group is part of .
+
+    my $cgm = RT::CachedGroupMembers->new( $self->CurrentUser );
+
+    # find things which have the current group as a member. 
+    # $group is an RT::Principal for the group.
+    $cgm->LimitToGroupsWithMember( $args{'Group'}->Id );
+
+    while ( my $parent_member = $cgm->Next ) {
+        my $parent_id = $parent_member->MemberId;
+        my $via       = $parent_member->Id;
+        my $group_id  = $parent_member->GroupId;
+
+          my $other_cached_member =
+          RT::CachedGroupMember->new( $self->CurrentUser );
+        my $other_cached_id = $other_cached_member->Create(
+            Member          => $args{'Member'},
+                      Group => $parent_member->GroupObj,
+            ImmediateParent => $parent_member->MemberObj,
+            Via             => $parent_member->Id
+        );
+        unless ($other_cached_id) {
+            $RT::Logger->err( "Couldn't add " . $args{'Member'}
+                  . " as a submember of a supergroup" );
+            $RT::Handle->Rollback() unless ($args{'InsideTransaction'});
+            return (undef);
+        }
+    } 
+
+    unless ($cached_id) {
+        $RT::Handle->Rollback() unless ($args{'InsideTransaction'});
+        return (undef);
+    }
+
+    $RT::Handle->Commit() unless ($args{'InsideTransaction'});
+
+    return ($id);
+}
+
+# }}}
+
+# {{{ sub _StashUser
+
+=head2 _StashUser PRINCIPAL
+
+Create { Group => undef, Member => undef }
+
+Creates an entry in the groupmembers table, which lists a user
+as a member of himself. This makes ACL checks a whole bunch easier.
+This happens once on user create and never ever gets yanked out.
+
+PRINCIPAL is expected to be an RT::Principal object for a user
+
+This routine expects to be called inside a transaction by RT::User->Create
+
+=cut
+
+sub _StashUser {
+    my $self = shift;
+    my %args = (
+        Group  => undef,
+        Member => undef,
+        @_
+    );
+
+    #Clear the key cache. TODO someday we may want to just clear a little bit of the keycache space. 
+    # TODO what about the groups key cache?
+    RT::Principal->_InvalidateACLCache();
+
+
+    # We really need to make sure we don't add any members to this group
+    # that contain the group itself. that would, um, suck. 
+    # (and recurse infinitely)  Later, we can add code to check this in the 
+    # cache and bail so we can support cycling directed graphs
+
+    my $id = $self->SUPER::Create(
+        GroupId  => $args{'Group'}->Id,
+        MemberId => $args{'Member'}->Id,
+    );
+
+    unless ($id) {
+        return (undef);
+    }
+
+    my $cached_member = RT::CachedGroupMember->new( $self->CurrentUser );
+    my $cached_id     = $cached_member->Create(
+        Member          => $args{'Member'},
+        Group           => $args{'Group'},
+        ImmediateParent => $args{'Group'},
+        Via             => '0'
+    );
+
+    unless ($cached_id) {
+        return (undef);
+    }
+
+    return ($id);
+}
+
+# }}}
+
+# {{{ sub Delete
+
+=head2 Delete
+
+Takes no arguments. deletes the currently loaded member from the 
+group in question.
+
+Expects to be called _outside_ a transaction
+
+=cut
+
+sub Delete {
+    my $self = shift;
+
+
+    $RT::Handle->BeginTransaction();
+
+    # Find all occurrences of this member as a member of this group
+    # in the cache and nuke them, recursively.
+
+    # The following code will delete all Cached Group members
+    # where this member's group is _not_ the primary group 
+    # (Ie if we're deleting C as a member of B, and B happens to be 
+    # a member of A, will delete C as a member of A without touching
+    # C as a member of B
+
+    my $cached_submembers = RT::CachedGroupMembers->new( $self->CurrentUser );
+
+    $cached_submembers->Limit(
+        FIELD    => 'MemberId',
+        OPERATOR => '=',
+        VALUE    => $self->MemberObj->Id
+    );
+
+    $cached_submembers->Limit(
+        FIELD    => 'ImmediateParentId',
+        OPERATOR => '=',
+        VALUE    => $self->GroupObj->Id
+    );
+
+    #Clear the key cache. TODO someday we may want to just clear a little bit of the keycache space. 
+    # TODO what about the groups key cache?
+    RT::Principal->_InvalidateACLCache();
+
+
+
+
+    while ( my $item_to_del = $cached_submembers->Next() ) {
+        my $del_err = $item_to_del->Delete();
+        unless ($del_err) {
+            $RT::Handle->Rollback();
+            $RT::Logger->warning("Couldn't delete cached group submember ".$item_to_del->Id);
+            return (undef);
+        }
+    }
+
+    my $err = $self->SUPER::Delete();
+    unless ($err) {
+            $RT::Logger->warning("Couldn't delete cached group submember ".$self->Id);
+        $RT::Handle->Rollback();
+        return (undef);
+    }
+    $RT::Handle->Commit();
+    return ($err);
+
+}
+
+# }}}
+
+# {{{ sub MemberObj
+
+=head2 MemberObj
+
+Returns an RT::Principal object for the Principal specified by $self->PrincipalId
+
+=cut
+
+sub MemberObj {
+    my $self = shift;
+    unless ( defined( $self->{'Member_obj'} ) ) {
+        $self->{'Member_obj'} = RT::Principal->new( $self->CurrentUser );
+        $self->{'Member_obj'}->Load( $self->MemberId );
+    }
+    return ( $self->{'Member_obj'} );
+}
+
+# }}}
+
+# {{{ sub GroupObj
+
+=head2 GroupObj
+
+Returns an RT::Principal object for the Group specified in $self->GroupId
+
+=cut
+
+sub GroupObj {
+    my $self = shift;
+    unless ( defined( $self->{'Group_obj'} ) ) {
+        $self->{'Group_obj'} = RT::Principal->new( $self->CurrentUser );
+        $self->{'Group_obj'}->Load( $self->GroupId );
+    }
+    return ( $self->{'Group_obj'} );
+}
+
+# }}}
+
+1;
diff --git a/rt/lib/RT/GroupMembers.pm b/rt/lib/RT/GroupMembers.pm
index a90a2a899..31cb9536f 100755
--- a/rt/lib/RT/GroupMembers.pm
+++ b/rt/lib/RT/GroupMembers.pm
@@ -1,73 +1,115 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/GroupMembers.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::GroupMembers - a collection of RT::GroupMember objects
+=head1 NAME
 
+  RT::GroupMembers -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::GroupMembers;
+  use RT::GroupMembers
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::GroupMembers);
-
-=end testing
-
 =cut
 
 package RT::GroupMembers;
-use RT::EasySearch;
+
+use RT::SearchBuilder;
 use RT::GroupMember;
 
-@ISA= qw(RT::EasySearch);
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
 
-# {{{ sub _Init  
-sub _Init   {
-  my $self = shift;
- 
-  $self->{'table'} = "GroupMembers";
-  $self->{'primary_key'} = "id";
-  return ( $self->SUPER::_Init(@_) );
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'GroupMembers';
+    $self->{'primary_key'} = 'id';
+
+
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
-# {{{ sub LimitToGroup
 
-=head2 LimitToGroup
+=item NewItem
 
-Takes a group id as its only argument.  Limits the current search to that
-group object
+Returns an empty new RT::GroupMember item
 
 =cut
 
-sub LimitToGroup {
+sub NewItem {
     my $self = shift;
-    my $group = shift;
+    return(RT::GroupMember->new($self->CurrentUser));
+}
 
-    return ($self->Limit( 
-                         VALUE => "$group",
-                         FIELD => 'GroupId',
-                         ENTRYAGGREGATOR => 'OR',
-                         ));
+        eval "require RT::GroupMembers_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/GroupMembers_Overlay.pm}) {
+            die $@;
+        };
 
-}
-# }}}
+        eval "require RT::GroupMembers_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/GroupMembers_Vendor.pm}) {
+            die $@;
+        };
 
-# {{{ sub NewItem 
+        eval "require RT::GroupMembers_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/GroupMembers_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::GroupMembers_Overlay, RT::GroupMembers_Vendor, RT::GroupMembers_Local
+
+=cut
 
-sub NewItem  {
-    my $self = shift;
-    return(RT::GroupMember->new($self->CurrentUser))
-}
 
-# }}}
 1;
diff --git a/rt/lib/RT/GroupMembers_Overlay.pm b/rt/lib/RT/GroupMembers_Overlay.pm
new file mode 100644
index 000000000..1259fd61a
--- /dev/null
+++ b/rt/lib/RT/GroupMembers_Overlay.pm
@@ -0,0 +1,126 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::GroupMembers - a collection of RT::GroupMember objects
+
+=head1 SYNOPSIS
+
+  use RT::GroupMembers;
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::GroupMembers);
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+# {{{ LimitToUsers
+
+=head2 LimitToUsers
+
+Limits this search object to users who are members of this group.
+This is really useful when you want to haave your UI seperate out
+groups from users for display purposes
+
+=cut
+
+sub LimitToUsers {
+    my $self = shift;
+
+    my $principals = $self->NewAlias('Principals');
+    $self->Join( ALIAS1 => 'main', FIELD1 => 'MemberId',
+                 ALIAS2 => $principals, FIELD2 =>'id');
+
+    $self->Limit(       ALIAS => $principals,
+                         FIELD => 'PrincipalType',
+                         VALUE => 'User',
+                         ENTRYAGGREGATOR => 'OR',
+                         );
+}
+
+# }}}
+
+
+# {{{ LimitToGroups
+
+=head2 LimitToGroups
+
+Limits this search object to Groups who are members of this group.
+This is really useful when you want to haave your UI seperate out
+groups from users for display purposes
+
+=cut
+
+sub LimitToGroups {
+    my $self = shift;
+
+    my $principals = $self->NewAlias('Principals');
+    $self->Join( ALIAS1 => 'main', FIELD1 => 'MemberId',
+                 ALIAS2 => $principals, FIELD2 =>'id');
+
+    $self->Limit(       ALIAS => $principals,
+                         FIELD => 'PrincipalType',
+                         VALUE => 'Group',
+                         ENTRYAGGREGATOR => 'OR',
+                         );
+}
+
+# }}}
+
+# {{{ sub LimitToMembersOfGroup
+
+=head2 LimitToMembersOfGroup PRINCIPAL_ID
+
+Takes a Principal Id as its only argument. 
+Limits the current search principals which are _directly_ members
+of the group which has PRINCIPAL_ID as its principal id.
+
+=cut
+
+sub LimitToMembersOfGroup {
+    my $self = shift;
+    my $group = shift;
+
+    return ($self->Limit( 
+                         VALUE => $group,
+                         FIELD => 'GroupId',
+                         ENTRYAGGREGATOR => 'OR',
+			             QUOTEVALUE => 0
+                         ));
+
+}
+# }}}
+
+1;
diff --git a/rt/lib/RT/Group_Overlay.pm b/rt/lib/RT/Group_Overlay.pm
new file mode 100644
index 000000000..92150255f
--- /dev/null
+++ b/rt/lib/RT/Group_Overlay.pm
@@ -0,0 +1,1260 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Released under the terms of version 2 of the GNU Public License
+
+=head1 NAME
+
+  RT::Group - RT\'s group object
+
+=head1 SYNOPSIS
+
+  use RT::Group;
+my $group = new RT::Group($CurrentUser);
+
+=head1 DESCRIPTION
+
+An RT group object.
+
+=head1 AUTHOR
+
+Jesse Vincent, jesse@bestpractical.com
+
+=head1 SEE ALSO
+
+RT
+
+=head1 METHODS
+
+
+=begin testing
+
+# {{{ Tests
+ok (require RT::Group);
+
+ok (my $group = RT::Group->new($RT::SystemUser), "instantiated a group object");
+ok (my ($id, $msg) = $group->CreateUserDefinedGroup( Name => 'TestGroup', Description => 'A test group',
+                    ), 'Created a new group');
+ok ($id != 0, "Group id is $id");
+ok ($group->Name eq 'TestGroup', "The group's name is 'TestGroup'");
+my $ng = RT::Group->new($RT::SystemUser);
+
+ok($ng->LoadUserDefinedGroup('TestGroup'), "Loaded testgroup");
+ok(($ng->id == $group->id), "Loaded the right group");
+
+
+ok (($id,$msg) = $ng->AddMember('1'), "Added a member to the group");
+ok($id, $msg);
+ok (($id,$msg) = $ng->AddMember('2' ), "Added a member to the group");
+ok($id, $msg);
+ok (($id,$msg) = $ng->AddMember('3' ), "Added a member to the group");
+ok($id, $msg);
+
+# Group 1 now has members 1, 2 ,3
+
+my $group_2 = RT::Group->new($RT::SystemUser);
+ok (my ($id_2, $msg_2) = $group_2->CreateUserDefinedGroup( Name => 'TestGroup2', Description => 'A second test group'), , 'Created a new group');
+ok ($id_2 != 0, "Created group 2 ok- $msg_2 ");
+ok (($id,$msg) = $group_2->AddMember($ng->PrincipalId), "Made TestGroup a member of testgroup2");
+ok($id, $msg);
+ok (($id,$msg) = $group_2->AddMember('1' ), "Added  member RT_System to the group TestGroup2");
+ok($id, $msg);
+
+# Group 2 how has 1, g1->{1, 2,3}
+
+my $group_3 = RT::Group->new($RT::SystemUser);
+ok (($id_3, $msg) = $group_3->CreateUserDefinedGroup( Name => 'TestGroup3', Description => 'A second test group'), 'Created a new group');
+ok ($id_3 != 0, "Created group 3 ok - $msg");
+ok (($id,$msg) =$group_3->AddMember($group_2->PrincipalId), "Made TestGroup a member of testgroup2");
+ok($id, $msg);
+
+# g3 now has g2->{1, g1->{1,2,3}}
+
+my $principal_1 = RT::Principal->new($RT::SystemUser);
+$principal_1->Load('1');
+
+my $principal_2 = RT::Principal->new($RT::SystemUser);
+$principal_2->Load('2');
+
+ok (($id,$msg) = $group_3->AddMember('1' ), "Added  member RT_System to the group TestGroup2");
+ok($id, $msg);
+
+# g3 now has 1, g2->{1, g1->{1,2,3}}
+
+ok($group_3->HasMember($principal_2) == undef, "group 3 doesn't have member 2");
+ok($group_3->HasMemberRecursively($principal_2), "group 3 has member 2 recursively");
+ok($ng->HasMember($principal_2) , "group ".$ng->Id." has member 2");
+my ($delid , $delmsg) =$ng->DeleteMember($principal_2->Id);
+ok ($delid !=0, "Sucessfully deleted it-".$delid."-".$delmsg);
+
+#Gotta reload the group objects, since we've been messing with various internals.
+# we shouldn't need to do this.
+#$ng->LoadUserDefinedGroup('TestGroup');
+#$group_2->LoadUserDefinedGroup('TestGroup2');
+#$group_3->LoadUserDefinedGroup('TestGroup');
+
+# G1 now has 1, 3
+# Group 2 how has 1, g1->{1, 3}
+# g3 now has  1, g2->{1, g1->{1, 3}}
+
+ok(!$ng->HasMember($principal_2)  , "group ".$ng->Id." no longer has member 2");
+ok($group_3->HasMemberRecursively($principal_2) == undef, "group 3 doesn't have member 2");
+ok($group_2->HasMemberRecursively($principal_2) == undef, "group 2 doesn't have member 2");
+ok($ng->HasMember($principal_2) == undef, "group 1 doesn't have member 2");;
+ok($group_3->HasMemberRecursively($principal_2) == undef, "group 3 has member 2 recursively");
+
+# }}}
+
+=end testing
+
+
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+use RT::Users;
+use RT::GroupMembers;
+use RT::Principals;
+use RT::ACL;
+
+use vars qw/$RIGHTS/;
+
+$RIGHTS = {
+    AdminGroup           => 'Modify group metadata or delete group',  # loc_pair
+    AdminGroupMembership =>
+      'Modify membership roster for this group',                      # loc_pair
+    ModifyOwnMembership => 'Join or leave this group'                 # loc_pair
+};
+
+# Tell RT::ACE that this sort of object can get acls granted
+$RT::ACE::OBJECT_TYPES{'RT::Group'} = 1;
+
+
+#
+
+# TODO: This should be refactored out into an RT::ACLedObject or something
+# stuff the rights into a hash of rights that can exist.
+
+foreach my $right ( keys %{$RIGHTS} ) {
+    $RT::ACE::LOWERCASERIGHTNAMES{ lc $right } = $right;
+}
+
+
+=head2 AvailableRights
+
+Returns a hash of available rights for this object. The keys are the right names and the values are a description of what the rights do
+
+=cut
+
+sub AvailableRights {
+    my $self = shift;
+    return($RIGHTS);
+}
+
+
+# {{{ sub SelfDescription
+
+=head2 SelfDescription
+
+Returns a user-readable description of what this group is for and what it's named.
+
+=cut
+
+sub SelfDescription {
+	my $self = shift;
+	if ($self->Domain eq 'ACLEquivalence') {
+		my $user = RT::Principal->new($self->CurrentUser);
+		$user->Load($self->Instance);
+		return $self->loc("user [_1]",$user->Object->Name);
+	}
+	elsif ($self->Domain eq 'UserDefined') {
+		return $self->loc("group '[_1]'",$self->Name);
+	}
+	elsif ($self->Domain eq 'Personal') {
+		my $user = RT::User->new($self->CurrentUser);
+		$user->Load($self->Instance);
+		return $self->loc("personal group '[_1]' for user '[_2]'",$self->Name, $user->Name);
+	}
+	elsif ($self->Domain eq 'RT::System-Role') {
+		return $self->loc("system [_1]",$self->Type);
+	}
+	elsif ($self->Domain eq 'RT::Queue-Role') {
+		my $queue = RT::Queue->new($self->CurrentUser);
+		$queue->Load($self->Instance);
+		return $self->loc("queue [_1] [_2]",$queue->Name, $self->Type);
+	}
+	elsif ($self->Domain eq 'RT::Ticket-Role') {
+		return $self->loc("ticket #[_1] [_2]",$self->Instance, $self->Type);
+	}
+	elsif ($self->Domain eq 'SystemInternal') {
+		return $self->loc("system group '[_1]'",$self->Type);
+	}
+	else {
+		return $self->loc("undescribed group [_1]",$self->Id);
+	}
+}
+
+# }}}
+
+# {{{ sub Load 
+
+=head2 Load ID
+
+Load a group object from the database. Takes a single argument.
+If the argument is numerical, load by the column 'id'. Otherwise, 
+complain and return.
+
+=cut
+
+sub Load {
+    my $self       = shift;
+    my $identifier = shift || return undef;
+
+    #if it's an int, load by id. otherwise, load by name.
+    if ( $identifier !~ /\D/ ) {
+        $self->SUPER::LoadById($identifier);
+    }
+    else {
+        $RT::Logger->crit("Group -> Load called with a bogus argument");
+        return undef;
+    }
+}
+
+# }}}
+
+# {{{ sub LoadUserDefinedGroup 
+
+=head2 LoadUserDefinedGroup NAME
+
+Loads a system group from the database. The only argument is
+the group's name.
+
+
+=cut
+
+sub LoadUserDefinedGroup {
+    my $self       = shift;
+    my $identifier = shift;
+
+        $self->LoadByCols( "Domain" => 'UserDefined',
+                           "Name" => $identifier );
+}
+
+# }}}
+
+# {{{ sub LoadACLEquivalenceGroup 
+
+=head2 LoadACLEquivalenceGroup  PRINCIPAL
+
+Loads a user's acl equivalence group. Takes a principal object.
+ACL equivalnce groups are used to simplify the acl system. Each user
+has one group that only he is a member of. Rights granted to the user
+are actually granted to that group. This greatly simplifies ACL checks.
+While this results in a somewhat more complex setup when creating users
+and granting ACLs, it _greatly_ simplifies acl checks.
+
+
+
+=cut
+
+sub LoadACLEquivalenceGroup {
+    my $self       = shift;
+    my $princ = shift;
+
+        $self->LoadByCols( "Domain" => 'ACLEquivalence',
+                            "Type" => 'UserEquiv',
+                           "Instance" => $princ->Id);
+}
+
+# }}}
+
+# {{{ sub LoadPersonalGroup 
+
+=head2 LoadPersonalGroup {Name => NAME, User => USERID}
+
+Loads a personal group from the database. 
+
+=cut
+
+sub LoadPersonalGroup {
+    my $self       = shift;
+    my %args =  (   Name => undef,
+                    User => undef,
+                    @_);
+
+        $self->LoadByCols( "Domain" => 'Personal',
+                           "Instance" => $args{'User'},
+                           "Type" => '',
+                           "Name" => $args{'Name'} );
+}
+
+# }}}
+
+# {{{ sub LoadSystemInternalGroup 
+
+=head2 LoadSystemInternalGroup NAME
+
+Loads a Pseudo group from the database. The only argument is
+the group's name.
+
+
+=cut
+
+sub LoadSystemInternalGroup {
+    my $self       = shift;
+    my $identifier = shift;
+
+        $self->LoadByCols( "Domain" => 'SystemInternal',
+                           "Instance" => '',
+                           "Name" => '',
+                           "Type" => $identifier );
+}
+
+# }}}
+
+# {{{ sub LoadTicketRoleGroup 
+
+=head2 LoadTicketRoleGroup  { Ticket => TICKET_ID, Type => TYPE }
+
+Loads a ticket group from the database. 
+
+Takes a param hash with 2 parameters:
+
+    Ticket is the TicketId we're curious about
+    Type is the type of Group we're trying to load: 
+        Requestor, Cc, AdminCc, Owner
+
+=cut
+
+sub LoadTicketRoleGroup {
+    my $self       = shift;
+    my %args = (Ticket => undef,
+                Type => undef,
+                @_);
+        $self->LoadByCols( Domain => 'RT::Ticket-Role',
+                           Instance =>$args{'Ticket'}, 
+                           Type => $args{'Type'}
+                           );
+}
+
+# }}}
+
+# {{{ sub LoadQueueRoleGroup 
+
+=head2 LoadQueueRoleGroup  { Queue => Queue_ID, Type => TYPE }
+
+Loads a Queue group from the database. 
+
+Takes a param hash with 2 parameters:
+
+    Queue is the QueueId we're curious about
+    Type is the type of Group we're trying to load: 
+        Requestor, Cc, AdminCc, Owner
+
+=cut
+
+sub LoadQueueRoleGroup {
+    my $self       = shift;
+    my %args = (Queue => undef,
+                Type => undef,
+                @_);
+        $self->LoadByCols( Domain => 'RT::Queue-Role',
+                           Instance =>$args{'Queue'}, 
+                           Type => $args{'Type'}
+                           );
+}
+
+# }}}
+
+# {{{ sub LoadSystemRoleGroup 
+
+=head2 LoadSystemRoleGroup  Type
+
+Loads a System group from the database. 
+
+Takes a single param: Type
+
+    Type is the type of Group we're trying to load: 
+        Requestor, Cc, AdminCc, Owner
+
+=cut
+
+sub LoadSystemRoleGroup {
+    my $self       = shift;
+    my $type = shift;
+        $self->LoadByCols( Domain => 'RT::System-Role',
+                           Type => $type
+                           );
+}
+
+# }}}
+
+# {{{ sub Create
+=head2 Create
+
+You need to specify what sort of group you're creating by calling one of the other
+Create_____ routines.
+
+=cut
+
+sub Create {
+    my $self = shift;
+    $RT::Logger->crit("Someone called RT::Group->Create. this method does not exist. someone's being evil");
+    return(0,$self->loc('Permission Denied'));
+}
+
+# }}}
+
+# {{{ sub _Create
+
+=head2 _Create
+
+Takes a paramhash with named arguments: Name, Description.
+
+Returns a tuple of (Id, Message).  If id is 0, the create failed
+
+=cut
+
+sub _Create {
+    my $self = shift;
+    my %args = (
+        Name        => undef,
+        Description => undef,
+        Domain      => undef,
+        Type        => undef,
+        Instance    => undef,
+        InsideTransaction => undef,
+        @_
+    );
+
+    $RT::Handle->BeginTransaction() unless ($args{'InsideTransaction'});
+    # Groups deal with principal ids, rather than user ids.
+    # When creating this group, set up a principal Id for it.
+    my $principal    = RT::Principal->new( $self->CurrentUser );
+    my $principal_id = $principal->Create(
+        PrincipalType => 'Group',
+        ObjectId      => '0'
+    );
+    $principal->__Set(Field => 'ObjectId', Value => $principal_id);
+
+
+    $self->SUPER::Create(
+        id          => $principal_id,
+        Name        => $args{'Name'},
+        Description => $args{'Description'},
+        Type        => $args{'Type'},
+        Domain      => $args{'Domain'},
+        Instance    => $args{'Instance'}
+    );
+    my $id = $self->Id;
+    unless ($id) {
+        return ( 0, $self->loc('Could not create group') );
+    }
+
+    # If we couldn't create a principal Id, get the fuck out.
+    unless ($principal_id) {
+        $RT::Handle->Rollback() unless ($args{'InsideTransaction'});
+        $self->crit( "Couldn't create a Principal on new user create. Strange things are afoot at the circle K" );
+        return ( 0, $self->loc('Could not create group') );
+    }
+
+    # Now we make the group a member of itself as a cached group member
+    # this needs to exist so that group ACL checks don't fall over.
+    # you're checking CachedGroupMembers to see if the principal in question
+    # is a member of the principal the rights have been granted too
+
+    # in the ordinary case, this would fail badly because it would recurse and add all the members of this group as 
+    # cached members. thankfully, we're creating the group now...so it has no members.
+    my $cgm = RT::CachedGroupMember->new($self->CurrentUser);
+    $cgm->Create(Group =>$self->PrincipalObj, Member => $self->PrincipalObj, ImmediateParent => $self->PrincipalObj);
+
+
+
+    $RT::Handle->Commit() unless ($args{'InsideTransaction'});
+    return ( $id, $self->loc("Group created") );
+}
+
+# }}}
+
+# {{{ CreateUserDefinedGroup
+
+=head2 CreateUserDefinedGroup { Name => "name", Description => "Description"}
+
+A helper subroutine which creates a system group 
+
+Returns a tuple of (Id, Message).  If id is 0, the create failed
+
+=cut
+
+sub CreateUserDefinedGroup {
+    my $self = shift;
+
+    unless ( $self->CurrentUserHasRight('AdminGroup') ) {
+        $RT::Logger->warning( $self->CurrentUser->Name
+              . " Tried to create a group without permission." );
+        return ( 0, $self->loc('Permission Denied') );
+    }
+
+    return($self->_Create( Domain => 'UserDefined', Type => '', Instance => '', @_));
+}
+
+# }}}
+
+# {{{ _CreateACLEquivalenceGroup
+
+=head2 _CreateACLEquivalenceGroup { Principal }
+
+A helper subroutine which creates a group containing only 
+an individual user. This gets used by the ACL system to check rights.
+Yes, it denormalizes the data, but that's ok, as we totally win on performance.
+
+Returns a tuple of (Id, Message).  If id is 0, the create failed
+
+=cut
+
+sub _CreateACLEquivalenceGroup { 
+    my $self = shift;
+    my $princ = shift;
+ 
+      my $id = $self->_Create( Domain => 'ACLEquivalence', 
+                           Type => 'UserEquiv',
+                           Name => 'User '. $princ->Object->Id,
+                           Description => 'ACL equiv. for user '.$princ->Object->Id,
+                           Instance => $princ->Id,
+                           InsideTransaction => 1);
+      unless ($id) {
+        $RT::Logger->crit("Couldn't create ACL equivalence group");
+        return undef;
+      }
+    
+       # We use stashuser so we don't get transactions inside transactions
+       # and so we bypass all sorts of cruft we don't need
+       my $aclstash = RT::GroupMember->new($self->CurrentUser);
+       my ($stash_id, $add_msg) = $aclstash->_StashUser(Group => $self->PrincipalObj,
+                                             Member => $princ);
+
+      unless ($stash_id) {
+        $RT::Logger->crit("Couldn't add the user to his own acl equivalence group:".$add_msg);
+        # We call super delete so we don't get acl checked.
+        $self->SUPER::Delete();
+        return(undef);
+      }
+    return ($id);
+}
+
+# }}}
+
+# {{{ CreatePersonalGroup
+
+=head2 CreatePersonalGroup { PrincipalId => PRINCIPAL_ID, Name => "name", Description => "Description"}
+
+A helper subroutine which creates a personal group. Generally,
+personal groups are used for ACL delegation and adding to ticket roles
+PrincipalId defaults to the current user's principal id.
+
+Returns a tuple of (Id, Message).  If id is 0, the create failed
+
+=cut
+
+sub CreatePersonalGroup {
+    my $self = shift;
+    my %args = (
+        Name        => undef,
+        Description => undef,
+        PrincipalId => $self->CurrentUser->PrincipalId,
+        @_
+    );
+
+    if ( $self->CurrentUser->PrincipalId == $args{'PrincipalId'} ) {
+
+        unless ( $self->CurrentUserHasRight('AdminOwnPersonalGroups') ) {
+            $RT::Logger->warning( $self->CurrentUser->Name
+                  . " Tried to create a group without permission." );
+            return ( 0, $self->loc('Permission Denied') );
+        }
+
+    }
+    else {
+        unless ( $self->CurrentUserHasRight('AdminAllPersonalGroups') ) {
+            $RT::Logger->warning( $self->CurrentUser->Name
+                  . " Tried to create a group without permission." );
+            return ( 0, $self->loc('Permission Denied') );
+        }
+
+    }
+
+    return (
+        $self->_Create(
+            Domain      => 'Personal',
+            Type        => '',
+            Instance    => $args{'PrincipalId'},
+            Name        => $args{'Name'},
+            Description => $args{'Description'}
+        )
+    );
+}
+
+# }}}
+
+# {{{ CreateRoleGroup 
+
+=head2 CreateRoleGroup { Domain => DOMAIN, Type =>  TYPE, Instance => ID }
+
+A helper subroutine which creates a  ticket group. (What RT 2.0 called Ticket watchers)
+Type is one of ( "Requestor" || "Cc" || "AdminCc" || "Owner") 
+Domain is one of (RT::Ticket-Role || RT::Queue-Role || RT::System-Role)
+Instance is the id of the ticket or queue in question
+
+This routine expects to be called from {Ticket||Queue}->CreateTicketGroups _inside of a transaction_
+
+Returns a tuple of (Id, Message).  If id is 0, the create failed
+
+=cut
+
+sub CreateRoleGroup {
+    my $self = shift;
+    my %args = ( Instance => undef,
+                 Type     => undef,
+                 Domain   => undef,
+                 @_ );
+    unless ( $args{'Type'} =~ /^(?:Cc|AdminCc|Requestor|Owner)$/ ) {
+        return ( 0, $self->loc("Invalid Group Type") );
+    }
+
+
+    return ( $self->_Create( Domain            => $args{'Domain'},
+                             Instance          => $args{'Instance'},
+                             Type              => $args{'Type'},
+                             InsideTransaction => 1 ) );
+}
+
+# }}}
+
+# {{{ sub Delete
+
+=head2 Delete
+
+Delete this object
+
+=cut
+
+sub Delete {
+    my $self = shift;
+
+    unless ( $self->CurrentUserHasRight('AdminGroup') ) {
+        return ( 0, 'Permission Denied' );
+    }
+
+    $RT::Logger->crit("Deleting groups violates referential integrity until we go through and fix this");
+    # TODO XXX 
+   
+    # Remove the principal object
+    # Remove this group from anything it's a member of.
+    # Remove all cached members of this group
+    # Remove any rights granted to this group
+    # remove any rights delegated by way of this group
+
+    return ( $self->SUPER::Delete(@_) );
+}
+
+# }}}
+
+=head2 SetDisabled BOOL
+
+If passed a positive value, this group will be disabled. No rights it commutes or grants will be honored.
+It will not appear in most group listings.
+
+This routine finds all the cached group members that are members of this group  (recursively) and disables them.
+=cut 
+
+ # }}}
+
+ sub SetDisabled {
+     my $self = shift;
+     my $val = shift;
+    if ($self->Domain eq 'Personal') {
+   		if ($self->CurrentUser->PrincipalId == $self->Instance) {
+    		unless ( $self->CurrentUserHasRight('AdminOwnPersonalGroups')) {
+        		return ( 0, $self->loc('Permission Denied') );
+    		}
+    	} else {
+        	unless ( $self->CurrentUserHasRight('AdminAllPersonalGroups') ) {
+   	    		 return ( 0, $self->loc('Permission Denied') );
+    		}
+    	}
+	}
+	else {
+        unless ( $self->CurrentUserHasRight('AdminGroup') ) {
+                 return (0, $self->loc('Permission Denied'));
+    }
+    }
+    $RT::Handle->BeginTransaction();
+    $self->PrincipalObj->SetDisabled($val);
+
+
+
+
+    # Find all occurrences of this member as a member of this group
+    # in the cache and nuke them, recursively.
+
+    # The following code will delete all Cached Group members
+    # where this member's group is _not_ the primary group 
+    # (Ie if we're deleting C as a member of B, and B happens to be 
+    # a member of A, will delete C as a member of A without touching
+    # C as a member of B
+
+    my $cached_submembers = RT::CachedGroupMembers->new( $self->CurrentUser );
+
+    $cached_submembers->Limit( FIELD    => 'ImmediateParentId', OPERATOR => '=', VALUE    => $self->Id);
+
+    #Clear the key cache. TODO someday we may want to just clear a little bit of the keycache space. 
+    # TODO what about the groups key cache?
+    RT::Principal->_InvalidateACLCache();
+
+
+
+    while ( my $item = $cached_submembers->Next() ) {
+        my $del_err = $item->SetDisabled($val);
+        unless ($del_err) {
+            $RT::Handle->Rollback();
+            $RT::Logger->warning("Couldn't disable cached group submember ".$item->Id);
+            return (undef);
+        }
+    }
+
+    $RT::Handle->Commit();
+    return (1, $self->loc("Succeeded"));
+
+}
+
+# }}}
+
+
+
+sub Disabled {
+    my $self = shift;
+    $self->PrincipalObj->Disabled(@_);
+}
+
+
+# {{{ DeepMembersObj
+
+=head2 DeepMembersObj
+
+Returns an RT::CachedGroupMembers object of this group's members.
+
+=cut
+
+sub DeepMembersObj {
+    my $self = shift;
+    my $members_obj = RT::CachedGroupMembers->new( $self->CurrentUser );
+
+    #If we don't have rights, don't include any results
+    # TODO XXX  WHY IS THERE NO ACL CHECK HERE?
+    $members_obj->LimitToMembersOfGroup( $self->PrincipalId );
+
+    return ( $members_obj );
+
+}
+
+# }}}
+
+# {{{ UserMembersObj
+
+=head2 UserMembersObj
+
+Returns an RT::Users object of this group's members, including
+all members of subgroups
+
+=cut
+
+sub UserMembersObj {
+    my $self = shift;
+
+    my $users = RT::Users->new($self->CurrentUser);
+
+    #If we don't have rights, don't include any results
+    # TODO XXX  WHY IS THERE NO ACL CHECK HERE?
+
+    my $principals = $users->NewAlias('Principals');
+
+    $users->Join(ALIAS1 => 'main', FIELD1 => 'id',
+                 ALIAS2 => $principals, FIELD2 => 'ObjectId');
+    $users->Limit(ALIAS =>$principals,
+                  FIELD => 'PrincipalType', OPERATOR => '=', VALUE => 'User');
+
+    my $cached_members = $users->NewAlias('CachedGroupMembers');
+    $users->Join(ALIAS1 => $cached_members, FIELD1 => 'MemberId',
+                 ALIAS2 => $principals, FIELD2 => 'id');
+    $users->Limit(ALIAS => $cached_members, 
+                  FIELD => 'GroupId',
+                  OPERATOR => '=',
+                  VALUE => $self->PrincipalId);
+
+
+    return ( $users);
+
+}
+
+# }}}
+
+# {{{ MembersObj
+
+=head2 MembersObj
+
+Returns an RT::CachedGroupMembers object of this group's members.
+
+=cut
+
+sub MembersObj {
+    my $self = shift;
+    my $members_obj = RT::GroupMembers->new( $self->CurrentUser );
+
+    #If we don't have rights, don't include any results
+    # TODO XXX  WHY IS THERE NO ACL CHECK HERE?
+    $members_obj->LimitToMembersOfGroup( $self->PrincipalId );
+
+    return ( $members_obj );
+
+}
+
+# }}}
+
+# {{{ MemberEmailAddresses
+
+=head2 MemberEmailAddresses
+
+Returns an array of the email addresses of all of this group's members
+
+
+=cut
+
+sub MemberEmailAddresses {
+    my $self = shift;
+
+    my %addresses;
+    my $members = $self->UserMembersObj();
+    while (my $member = $members->Next) {
+        $addresses{$member->EmailAddress} = 1;
+    }
+    return(sort keys %addresses);
+}
+
+# }}}
+
+# {{{ MemberEmailAddressesAsString
+
+=head2 MemberEmailAddressesAsString
+
+Returns a comma delimited string of the email addresses of all users 
+who are members of this group.
+
+=cut
+
+
+sub MemberEmailAddressesAsString {
+    my $self = shift;
+    return (join(', ', $self->MemberEmailAddresses));
+}
+
+# }}}
+
+# {{{ AddMember
+
+=head2 AddMember PRINCIPAL_ID
+
+AddMember adds a principal to this group.  It takes a single principal id.
+Returns a two value array. the first value is true on successful 
+addition or 0 on failure.  The second value is a textual status msg.
+
+=cut
+
+sub AddMember {
+    my $self       = shift;
+    my $new_member = shift;
+
+
+
+    if ($self->Domain eq 'Personal') {
+   		if ($self->CurrentUser->PrincipalId == $self->Instance) {
+    		unless ( $self->CurrentUserHasRight('AdminOwnPersonalGroups')) {
+        		return ( 0, $self->loc('Permission Denied') );
+    		}
+    	} else {
+        	unless ( $self->CurrentUserHasRight('AdminAllPersonalGroups') ) {
+   	    		 return ( 0, $self->loc('Permission Denied') );
+    		}
+    	}
+	}
+	
+	else {	
+    # We should only allow membership changes if the user has the right 
+    # to modify group membership or the user is the principal in question
+    # and the user has the right to modify his own membership
+    unless ( ($new_member == $self->CurrentUser->PrincipalId &&
+	      $self->CurrentUserHasRight('ModifyOwnMembership') ) ||
+	      $self->CurrentUserHasRight('AdminGroupMembership') ) {
+        #User has no permission to be doing this
+        return ( 0, $self->loc("Permission Denied") );
+    }
+
+  	} 
+    $self->_AddMember(PrincipalId => $new_member);
+}
+
+# A helper subroutine for AddMember that bypasses the ACL checks
+# this should _ONLY_ ever be called from Ticket/Queue AddWatcher
+# when we want to deal with groups according to queue rights
+# In the dim future, this will all get factored out and life
+# will get better	
+
+# takes a paramhash of { PrincipalId => undef, InsideTransaction }
+
+sub _AddMember {
+    my $self = shift;
+    my %args = ( PrincipalId => undef,
+                 InsideTransaction => undef,
+                 @_);
+    my $new_member = $args{'PrincipalId'};
+
+    unless ($self->Id) {
+        $RT::Logger->crit("Attempting to add a member to a group which wasn't loaded. 'oops'");
+        return(0, $self->loc("Group not found"));
+    }
+
+    unless ($new_member =~ /^\d+$/) {
+        $RT::Logger->crit("_AddMember called with a parameter that's not an integer.");
+    }
+
+
+    my $new_member_obj = RT::Principal->new( $self->CurrentUser );
+    $new_member_obj->Load($new_member);
+
+
+    unless ( $new_member_obj->Id ) {
+        $RT::Logger->debug("Couldn't find that principal");
+        return ( 0, $self->loc("Couldn't find that principal") );
+    }
+
+    if ( $self->HasMember( $new_member_obj ) ) {
+
+        #User is already a member of this group. no need to add it
+        return ( 0, $self->loc("Group already has member") );
+    }
+    if ( $new_member_obj->IsGroup &&
+         $new_member_obj->Object->HasMemberRecursively($self->PrincipalObj) ) {
+
+        #This group can't be made to be a member of itself
+        return ( 0, $self->loc("Groups can't be members of their members"));
+    }
+
+
+    my $member_object = RT::GroupMember->new( $self->CurrentUser );
+    my $id = $member_object->Create(
+        Member => $new_member_obj,
+        Group => $self->PrincipalObj,
+        InsideTransaction => $args{'InsideTransaction'}
+    );
+    if ($id) {
+        return ( 1, $self->loc("Member added") );
+    }
+    else {
+        return(0, $self->loc("Couldn't add member to group"));
+    }
+}
+# }}}
+
+# {{{ HasMember
+
+=head2 HasMember RT::Principal
+
+Takes an RT::Principal object returns a GroupMember Id if that user is a 
+member of this group.
+Returns undef if the user isn't a member of the group or if the current
+user doesn't have permission to find out. Arguably, it should differentiate
+between ACL failure and non membership.
+
+=cut
+
+sub HasMember {
+    my $self    = shift;
+    my $principal = shift;
+
+
+    unless (UNIVERSAL::isa($principal,'RT::Principal')) {
+        $RT::Logger->crit("Group::HasMember was called with an argument that".
+                          "isn't an RT::Principal. It's $principal");
+        return(undef);
+    }
+
+    my $member_obj = RT::GroupMember->new( $self->CurrentUser );
+    $member_obj->LoadByCols( MemberId => $principal->id, 
+                             GroupId => $self->PrincipalId );
+
+    #If we have a member object
+    if ( defined $member_obj->id ) {
+        return ( $member_obj->id );
+    }
+
+    #If Load returns no objects, we have an undef id. 
+    else {
+        #$RT::Logger->debug($self." does not contain principal ".$principal->id);
+        return (undef);
+    }
+}
+
+# }}}
+
+# {{{ HasMemberRecursively
+
+=head2 HasMemberRecursively RT::Principal
+
+Takes an RT::Principal object and returns true if that user is a member of 
+this group.
+Returns undef if the user isn't a member of the group or if the current
+user doesn't have permission to find out. Arguably, it should differentiate
+between ACL failure and non membership.
+
+=cut
+
+sub HasMemberRecursively {
+    my $self    = shift;
+    my $principal = shift;
+
+    unless (UNIVERSAL::isa($principal,'RT::Principal')) {
+        $RT::Logger->crit("Group::HasMemberRecursively was called with an argument that".
+                          "isn't an RT::Principal. It's $principal");
+        return(undef);
+    }
+    my $member_obj = RT::CachedGroupMember->new( $self->CurrentUser );
+    $member_obj->LoadByCols( MemberId => $principal->Id,
+                             GroupId => $self->PrincipalId ,
+                             Disabled => 0
+                             );
+
+    #If we have a member object
+    if ( defined $member_obj->id ) {
+        return ( 1);
+    }
+
+    #If Load returns no objects, we have an undef id. 
+    else {
+        return (undef);
+    }
+}
+
+# }}}
+
+# {{{ DeleteMember
+
+=head2 DeleteMember PRINCIPAL_ID
+
+Takes the principal id of a current user or group.
+If the current user has apropriate rights,
+removes that GroupMember from this group.
+Returns a two value array. the first value is true on successful 
+addition or 0 on failure.  The second value is a textual status msg.
+
+=cut
+
+sub DeleteMember {
+    my $self   = shift;
+    my $member_id = shift;
+
+
+    # We should only allow membership changes if the user has the right 
+    # to modify group membership or the user is the principal in question
+    # and the user has the right to modify his own membership
+
+    if ($self->Domain eq 'Personal') {
+   		if ($self->CurrentUser->PrincipalId == $self->Instance) {
+    		unless ( $self->CurrentUserHasRight('AdminOwnPersonalGroups')) {
+        		return ( 0, $self->loc('Permission Denied') );
+    		}
+    	} else {
+        	unless ( $self->CurrentUserHasRight('AdminAllPersonalGroups') ) {
+   	    		 return ( 0, $self->loc('Permission Denied') );
+    		}
+    	}
+	}
+	else {
+    unless ( (($member_id == $self->CurrentUser->PrincipalId) &&
+	      $self->CurrentUserHasRight('ModifyOwnMembership') ) ||
+	      $self->CurrentUserHasRight('AdminGroupMembership') ) {
+        #User has no permission to be doing this
+        return ( 0, $self->loc("Permission Denied") );
+    }
+	}
+    $self->_DeleteMember($member_id);
+}
+
+# A helper subroutine for DeleteMember that bypasses the ACL checks
+# this should _ONLY_ ever be called from Ticket/Queue  DeleteWatcher
+# when we want to deal with groups according to queue rights
+# In the dim future, this will all get factored out and life
+# will get better	
+
+sub _DeleteMember {
+    my $self = shift;
+    my $member_id = shift;
+
+    my $member_obj =  RT::GroupMember->new( $self->CurrentUser );
+    
+    $member_obj->LoadByCols( MemberId  => $member_id,
+                             GroupId => $self->PrincipalId);
+
+
+    #If we couldn't load it, return undef.
+    unless ( $member_obj->Id() ) {
+        $RT::Logger->debug("Group has no member with that id");
+        return ( 0,$self->loc( "Group has no such member" ));
+    }
+
+    #Now that we've checked ACLs and sanity, delete the groupmember
+    my $val = $member_obj->Delete();
+
+    if ($val) {
+        return ( $val, $self->loc("Member deleted") );
+    }
+    else {
+        $RT::Logger->debug("Failed to delete group ".$self->Id." member ". $member_id);
+        return ( 0, $self->loc("Member not deleted" ));
+    }
+}
+
+# }}}
+
+# {{{ ACL Related routines
+
+# {{{ sub _Set
+sub _Set {
+    my $self = shift;
+
+	if ($self->Domain eq 'Personal') {
+   		if ($self->CurrentUser->PrincipalId == $self->Instance) {
+    		unless ( $self->CurrentUserHasRight('AdminOwnPersonalGroups')) {
+        		return ( 0, $self->loc('Permission Denied') );
+    		}
+    	} else {
+        	unless ( $self->CurrentUserHasRight('AdminAllPersonalGroups') ) {
+   	    		 return ( 0, $self->loc('Permission Denied') );
+    		}
+    	}
+	}
+	else {
+    	unless ( $self->CurrentUserHasRight('AdminGroup') ) {
+        	return ( 0, $self->loc('Permission Denied') );
+    	}
+	}
+    return ( $self->SUPER::_Set(@_) );
+}
+
+# }}}
+
+
+
+
+=item CurrentUserHasRight RIGHTNAME
+
+Returns true if the current user has the specified right for this group.
+
+
+    TODO: we don't deal with membership visibility yet
+
+=cut
+
+
+sub CurrentUserHasRight {
+    my $self = shift;
+    my $right = shift;
+
+
+
+    if ($self->Id && 
+		$self->CurrentUser->HasRight( Object => $self,
+										   Right => $right )) {
+        return(1);
+   }
+    elsif ( $self->CurrentUser->HasRight(Object => $RT::System, Right =>  $right )) {
+		return (1);
+    } else {
+        return(undef);
+    }
+
+}
+
+# }}}
+
+
+
+
+# {{{ Principal related routines
+
+=head2 PrincipalObj
+
+Returns the principal object for this user. returns an empty RT::Principal
+if there's no principal object matching this user. 
+The response is cached. PrincipalObj should never ever change.
+
+=begin testing
+
+ok(my $u = RT::Group->new($RT::SystemUser));
+ok($u->Load(4), "Loaded the first user");
+ok($u->PrincipalObj->ObjectId == 4, "user 4 is the fourth principal");
+ok($u->PrincipalObj->PrincipalType eq 'Group' , "Principal 4 is a group");
+
+=end testing
+
+=cut
+
+
+sub PrincipalObj {
+    my $self = shift;
+    unless ($self->{'PrincipalObj'} &&
+            ($self->{'PrincipalObj'}->ObjectId == $self->Id) &&
+            ($self->{'PrincipalObj'}->PrincipalType eq 'Group')) {
+
+            $self->{'PrincipalObj'} = RT::Principal->new($self->CurrentUser);
+            $self->{'PrincipalObj'}->LoadByCols('ObjectId' => $self->Id,
+                                                'PrincipalType' => 'Group') ;
+            }
+    return($self->{'PrincipalObj'});
+}
+
+
+=head2 PrincipalId  
+
+Returns this user's PrincipalId
+
+=cut
+
+sub PrincipalId {
+    my $self = shift;
+    return $self->Id;
+}
+
+# }}}
+1;
+
diff --git a/rt/lib/RT/Groups.pm b/rt/lib/RT/Groups.pm
index f44f1fdb3..29f12a5a0 100755
--- a/rt/lib/RT/Groups.pm
+++ b/rt/lib/RT/Groups.pm
@@ -1,100 +1,115 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Groups.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::Groups - a collection of RT::Group objects
+=head1 NAME
 
+  RT::Groups -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::Groups;
-  my $groups = $RT::Groups->new($CurrentUser);
-  $groups->LimitToReal();
-  while (my $group = $groups->Next()) {
-     print $group->Id ." is a group id\n";
-  }
+  use RT::Groups
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Groups);
-
-=end testing
-
 =cut
 
 package RT::Groups;
-use RT::EasySearch;
-use RT::Groups;
 
-@ISA= qw(RT::EasySearch);
+use RT::SearchBuilder;
+use RT::Group;
 
-# {{{ sub _Init
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-sub _Init { 
-  my $self = shift;
-  $self->{'table'} = "Groups";
-  $self->{'primary_key'} = "id";
 
-  $self->OrderBy( ALIAS => 'main',
-		  FIELD => 'Name',
-		  ORDER => 'ASC');
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'Groups';
+    $self->{'primary_key'} = 'id';
 
 
-  return ( $self->SUPER::_Init(@_));
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
-# {{{ LimitToReal
 
-=head2 LimitToReal
+=item NewItem
 
-Make this groups object return only "real" groups, which can be
-granted rights and have members assigned to them
+Returns an empty new RT::Group item
 
 =cut
 
-sub LimitToReal {
+sub NewItem {
     my $self = shift;
+    return(RT::Group->new($self->CurrentUser));
+}
 
-    return ($self->Limit( FIELD => 'Pseudo',
-			  VALUE => '0',
-			  OPERATOR => '='));
+        eval "require RT::Groups_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Groups_Overlay.pm}) {
+            die $@;
+        };
 
-}
-# }}}
+        eval "require RT::Groups_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Groups_Vendor.pm}) {
+            die $@;
+        };
 
-# {{{ sub LimitToPseudo
+        eval "require RT::Groups_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Groups_Local.pm}) {
+            die $@;
+        };
 
-=head2 LimitToPseudo
 
-Make this groups object return only "pseudo" groups, which can be
-granted rights but whose membership lists are determined dynamically.
 
-=cut
-  
-  sub LimitToPseudo {
-    my $self = shift;
 
-    return ($self->Limit( FIELD => 'Pseudo',
-			  VALUE => '1',
-			  OPERATOR => '='));
+=head1 SEE ALSO
 
-}
-# }}}
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
-# {{{ sub NewItem 
-sub NewItem  {
-  my $self = shift;
-  return (RT::Group->new($self->CurrentUser));
-}
-# }}}
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
-1;
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
+RT::Groups_Overlay, RT::Groups_Vendor, RT::Groups_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/Groups_Overlay.pm b/rt/lib/RT/Groups_Overlay.pm
new file mode 100644
index 000000000..3d2c660fe
--- /dev/null
+++ b/rt/lib/RT/Groups_Overlay.pm
@@ -0,0 +1,298 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::Groups - a collection of RT::Group objects
+
+=head1 SYNOPSIS
+
+  use RT::Groups;
+  my $groups = $RT::Groups->new($CurrentUser);
+  $groups->LimitToReal();
+  while (my $group = $groups->Next()) {
+     print $group->Id ." is a group id\n";
+  }
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::Groups);
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+
+# {{{ sub _Init
+
+sub _Init { 
+  my $self = shift;
+  $self->{'table'} = "Groups";
+  $self->{'primary_key'} = "id";
+
+  $self->OrderBy( ALIAS => 'main',
+		  FIELD => 'Name',
+		  ORDER => 'ASC');
+
+
+  return ( $self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ LimiToSystemInternalGroups
+
+=head2 LimitToSystemInternalGroups
+
+Return only SystemInternal Groups, such as "privileged" "unprivileged" and "everyone" 
+
+=cut
+
+
+sub LimitToSystemInternalGroups {
+    my $self = shift;
+    $self->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => 'SystemInternal');
+    $self->Limit(FIELD => 'Instance', OPERATOR => '=', VALUE => '');
+}
+
+
+# }}}
+
+# {{{ LimiToUserDefinedGroups
+
+=head2 LimitToUserDefined Groups
+
+Return only UserDefined Groups
+
+=cut
+
+
+sub LimitToUserDefinedGroups {
+    my $self = shift;
+    $self->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => 'UserDefined');
+    $self->Limit(FIELD => 'Instance', OPERATOR => '=', VALUE => '');
+}
+
+
+# }}}
+
+# {{{ LimiToPersonalGroups
+
+=head2 LimitToPersonalGroupsFor PRINCIPAL_ID
+
+Return only Personal Groups for the user whose principal id 
+is PRINCIPAL_ID
+
+=cut
+
+
+sub LimitToPersonalGroupsFor {
+    my $self = shift;
+    my $princ = shift;
+
+    $self->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => 'Personal');
+    $self->Limit(   FIELD => 'Instance',   
+                    OPERATOR => '=', 
+                    VALUE => $princ,
+                    ENTRY_AGGREGATOR => 'OR');
+}
+
+
+# }}}
+
+# {{{ LimitToRolesForQueue
+
+=item LimitToRolesForQueue QUEUE_ID
+
+Limits the set of groups found to role groups for queue QUEUE_ID
+
+=cut
+
+sub LimitToRolesForQueue {
+    my $self = shift;
+    my $queue = shift;
+    $self->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => 'RT::Queue-Role');
+    $self->Limit(FIELD => 'Instance', OPERATOR => '=', VALUE => $queue);
+}
+
+# }}}
+
+# {{{ LimitToRolesForTicket
+
+=item LimitToRolesForTicket Ticket_ID
+
+Limits the set of groups found to role groups for Ticket Ticket_ID
+
+=cut
+
+sub LimitToRolesForTicket {
+    my $self = shift;
+    my $Ticket = shift;
+    $self->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => 'RT::Ticket-Role');
+    $self->Limit(FIELD => 'Instance', OPERATOR => '=', VALUE => '$Ticket');
+}
+
+# }}}
+
+# {{{ LimitToRolesForSystem
+
+=item LimitToRolesForSystem System_ID
+
+Limits the set of groups found to role groups for System System_ID
+
+=cut
+
+sub LimitToRolesForSystem {
+    my $self = shift;
+    $self->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => 'RT::System-Role');
+}
+
+# }}}
+
+=head2 WithMember {PrincipalId => PRINCIPAL_ID, Recursively => undef}
+
+Limits the set of groups returned to groups which have
+Principal PRINCIPAL_ID as a member
+   
+=begin testing
+
+my $u = RT::User->new($RT::SystemUser);
+$u->Create(Name => 'Membertests');
+my $g = RT::Group->new($RT::SystemUser);
+my ($id, $msg) = $g->CreateUserDefinedGroup(Name => 'Membertests');
+ok ($id,$msg);
+
+my ($aid, $amsg) =$g->AddMember($u->id);
+ok ($aid, $amsg);
+ok($g->HasMember($u->PrincipalObj),"G has member u");
+
+my $groups = RT::Groups->new($RT::SystemUser);
+$groups->LimitToUserDefinedGroups();
+$groups->WithMember(PrincipalId => $u->id);
+ok ($groups->Count == 1,"found the 1 group - " . $groups->Count);
+ok ($groups->First->Id == $g->Id, "it's the right one");
+
+
+
+
+=end testing
+
+
+=cut
+
+sub WithMember {
+    my $self = shift;
+    my %args = ( PrincipalId => undef,
+                 Recursively => undef,
+                 @_);
+    my $members;
+
+    if ($args{'Recursively'}) {
+        $members = $self->NewAlias('CachedGroupMembers');
+    } else {
+        $members = $self->NewAlias('GroupMembers');
+    }
+    $self->Join(ALIAS1 => 'main', FIELD1 => 'id',
+                ALIAS2 => $members, FIELD2 => 'GroupId');
+
+    $self->Limit(ALIAS => $members, FIELD => 'MemberId', OPERATOR => '=', VALUE => $args{'PrincipalId'});
+}
+
+
+sub WithRight {
+    my $self = shift;
+    my %args = ( Right                  => undef,
+                 Object =>              => undef,
+                 IncludeSystemRights    => undef,
+                 IncludeSuperusers      => undef,
+                 @_ );
+
+    my $groupprinc = $self->NewAlias('Principals');
+    my $acl        = $self->NewAlias('ACL');
+
+    # {{{ Find only rows where the right granted is the one we're looking up or _possibly_ superuser 
+    $self->Limit( ALIAS           => $acl,
+                  FIELD           => 'RightName',
+                  OPERATOR        => '=',
+                  VALUE           => $args{Right},
+                  ENTRYAGGREGATOR => 'OR' );
+
+    if ( $args{'IncludeSuperusers'} ) {
+        $self->Limit( ALIAS           => $acl,
+                      FIELD           => 'RightName',
+                      OPERATOR        => '=',
+                      VALUE           => 'SuperUser',
+                      ENTRYAGGREGATOR => 'OR' );
+    }
+    # }}}
+
+    my ($or_check_ticket_roles, $or_check_roles, $or_look_at_object);
+
+    if ( defined $args{'Object'} ) {
+        if ( ref($args{'Object'}) eq 'RT::Ticket' ) {
+            $or_check_ticket_roles =
+                " OR ( main.Domain = 'RT::Ticket-Role' AND main.Instance = " . $args{'Object'}->Id . ") ";
+
+            # If we're looking at ticket rights, we also want to look at the associated queue rights.
+            # this is a little bit hacky, but basically, now that we've done the ticket roles magic,
+            # we load the queue object and ask all the rest of our questions about the queue.
+            $args{'Object'}   = $args{'Object'}->QueueObj;
+        }
+        # TODO XXX This really wants some refactoring
+        if ( ref($args{'Object'}) eq 'RT::Queue' ) {
+            $or_check_roles =
+                " OR ( ( (main.Domain = 'RT::Queue-Role' AND main.Instance = " .
+                $args{'Object'}->Id . ") $or_check_ticket_roles ) " .
+                " AND main.Type = $acl.PrincipalType AND main.id = $groupprinc.id) ";
+        }
+
+        $or_look_at_object =
+            " OR ($acl.ObjectType = '" . ref($args{'Object'}) . "'" .
+            " AND $acl.ObjectId = " . $args{'Object'}->Id . ") ";
+    }
+
+    $self->_AddSubClause( "WhichObject", "($acl.ObjectType = 'RT::System' $or_look_at_object)" );
+
+    $self->_AddSubClause( "WhichGroup",
+        qq{
+          ( (    $acl.PrincipalId = $groupprinc.id
+             AND $acl.PrincipalType = 'Group'
+             AND (   main.Domain = 'SystemInternal'
+                  OR main.Domain = 'UserDefined'
+                  OR main.Domain = 'ACLEquivalence')
+             AND main.id = $groupprinc.id)
+           $or_check_roles)
+        }
+    );
+}
+
+1;
+
diff --git a/rt/lib/RT/Handle.pm b/rt/lib/RT/Handle.pm
index 6b74f361b..5cdb65e5b 100644
--- a/rt/lib/RT/Handle.pm
+++ b/rt/lib/RT/Handle.pm
@@ -1,5 +1,26 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Handle.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 =head1 NAME
 
   RT::Handle - RT's database handle
@@ -22,14 +43,16 @@ ok(require RT::Handle);
 
 package RT::Handle;
 
-eval "use DBIx::SearchBuilder::Handle::$RT::DatabaseType;
+use strict;
+use vars qw/@ISA/;
 
+eval "use DBIx::SearchBuilder::Handle::$RT::DatabaseType;
 \@ISA= qw(DBIx::SearchBuilder::Handle::$RT::DatabaseType);";
-
 #TODO check for errors here.
 
 =head2 Connect
 
+Connects to RT's database handle.
 Takes nothing. Calls SUPER::Connect with the needed args
 
 =cut
@@ -38,16 +61,41 @@ sub Connect {
 my $self=shift;
 
 # Unless the database port is a positive integer, we really don't want to pass it.
-$RT::DatabasePort = undef unless (defined $RT::DatabasePort && $RT::DatabasePort =~ /^(\d+)$/);
 
-$self->SUPER::Connect(Host => $RT::DatabaseHost, 
-			 Database => $RT::DatabaseName, 
+$self->SUPER::Connect(
 			 User => $RT::DatabaseUser,
 			 Password => $RT::DatabasePassword,
+			);
+   
+}
+
+=item BuildDSN
+
+Build the DSN for the RT database. doesn't take any parameters, draws all that
+from the config file.
+
+=cut
+
+
+sub BuildDSN {
+    my $self = shift;
+$RT::DatabasePort = undef unless (defined $RT::DatabasePort && $RT::DatabasePort =~ /^(\d+)$/);
+$RT::DatabaseHost = undef unless (defined $RT::DatabaseHost && $RT::DatabaseHost ne '');
+
+    $self->SUPER::BuildDSN(Host => $RT::DatabaseHost, 
+			 Database => $RT::DatabaseName, 
 			 Port => $RT::DatabasePort,
 			 Driver => $RT::DatabaseType,
 			 RequireSSL => $RT::DatabaseRequireSSL,
+             DisconnectHandleOnDestroy => 1
 			);
    
+
 }
+
+eval "require RT::Handle_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Handle_Vendor.pm});
+eval "require RT::Handle_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Handle_Local.pm});
+
 1;
diff --git a/rt/lib/RT/I18N.pm b/rt/lib/RT/I18N.pm
new file mode 100644
index 000000000..c013c219e
--- /dev/null
+++ b/rt/lib/RT/I18N.pm
@@ -0,0 +1,430 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+RT::I18N - a base class for localization of RT
+
+=cut
+
+package RT::I18N;
+
+use strict;
+use Locale::Maketext 1.04;
+use Locale::Maketext::Lexicon 0.25;
+use base ('Locale::Maketext::Fuzzy');
+use vars qw( %Lexicon );
+
+#If we're running on 5.6, we desperately need Encode::compat. But if we're on 5.8, we don't really need it.
+BEGIN { if ($] < 5.007001) {
+require Encode::compat;
+} }
+use Encode;
+
+use MIME::Entity;
+use MIME::Head;
+
+# I decree that this project's first language is English.
+
+%Lexicon = (
+   'TEST_STRING' => 'Concrete Mixer',
+
+    '__Content-Type' => 'text/plain; charset=utf-8',
+
+  '_AUTO' => 1,
+  # That means that lookup failures can't happen -- if we get as far
+  #  as looking for something in this lexicon, and we don't find it,
+  #  then automagically set $Lexicon{$key} = $key, before possibly
+  #  compiling it.
+  
+  # The exception is keys that start with "_" -- they aren't auto-makeable.
+
+);
+# End of lexicon.
+
+=head2 Init
+
+Initializes the lexicons used for localization.
+
+=begin testing
+
+use_ok (RT::I18N);
+ok(RT::I18N->Init);
+
+=end testing
+
+=cut
+
+sub Init {
+    # Load language-specific functions
+    foreach my $language ( glob(substr(__FILE__, 0, -3) . "/*.pm")) {
+        if ($language =~ /^([-\w.\/\\~:]+)$/) {
+            require $1;
+        }
+        else {
+	    warn("$language is tainted. not loading");
+        } 
+    }
+
+    my @lang = @RT::LexiconLanguages;
+    @lang = ('*') unless @lang;
+
+    # Acquire all .po files and iterate them into lexicons
+    Locale::Maketext::Lexicon->import({
+	_decode	=> 1, map {
+	    $_	=> [
+		Gettext => (substr(__FILE__, 0, -3) . "/$_.po"),
+		Gettext => "$RT::LocalLexiconPath/*/$_.po",
+	    ],
+	} @lang
+    });
+
+    return 1;
+}
+
+=head2 encoding
+
+Returns the encoding of the current lexicon, as yanked out of __ContentType's "charset" field.
+If it can't find anything, it returns 'ISO-8859-1'
+
+=begin testing
+
+ok(my $chinese = RT::I18N->get_handle('zh_tw'));
+ok(UNIVERSAL::can($chinese, 'maketext'));
+ok($chinese->maketext('__Content-Type') =~ /utf-8/i, "Found the utf-8 charset for traditional chinese in the string ".$chinese->maketext('__Content-Type'));
+ok($chinese->encoding eq 'utf-8', "The encoding is 'utf-8' -".$chinese->encoding);
+
+ok(my $en = RT::I18N->get_handle('en'));
+ok(UNIVERSAL::can($en, 'maketext'));
+ok($en->encoding eq 'utf-8', "The encoding ".$en->encoding." is 'utf-8'");
+
+=end testing
+
+
+=cut
+
+
+sub encoding { 'utf-8' }
+
+# {{{ SetMIMEEntityToUTF8
+
+=head2 SetMIMEEntityToUTF8 $entity
+
+An utility method which will try to convert entity body into utf8.
+It's now a wrap-up of SetMIMEEntityToEncoding($entity, 'utf-8').
+
+=cut
+
+sub SetMIMEEntityToUTF8 {
+    RT::I18N::SetMIMEEntityToEncoding(shift, 'utf-8');
+}
+
+# }}}
+
+# {{{ SetMIMEEntityToEncoding
+
+=head2 SetMIMEEntityToEncoding $entity, $encoding
+
+An utility method which will try to convert entity body into specified
+charset encoding (encoded as octets, *not* unicode-strings).  It will
+iterate all the entities in $entity, and try to convert each one into
+specified charset if whose Content-Type is 'text/plain'.
+
+This method doesn't return anything meaningful.
+
+=cut
+
+sub SetMIMEEntityToEncoding {
+    my ( $entity, $enc, $preserve_words ) = ( shift, shift, shift );
+
+    #if ( $entity->is_multipart ) {
+    #$RT::Logger->crit("This entity is a multipart " . $entity->head->as_string);
+	SetMIMEEntityToEncoding( $_, $enc, $preserve_words ) foreach $entity->parts;
+    #}
+
+    my $charset = _FindOrGuessCharset($entity) or return;
+    # one and only normalization
+    $charset = 'utf-8' if $charset eq 'utf8';
+    $enc     = 'utf-8' if $enc     eq 'utf8';
+
+    SetMIMEHeadToEncoding($entity->head, $charset => $enc, $preserve_words);
+
+    my $head = $entity->head;
+
+    # convert at least MIME word encoded attachment filename
+    foreach my $attr (qw(content-type.name content-disposition.filename)) {
+	if ( my $name = $head->mime_attr($attr) and !$preserve_words ) {
+	    $head->mime_attr( $attr => DecodeMIMEWordsToUTF8($name) );
+	}
+    }
+
+    # If this is a textual entity, we'd need to preserve its original encoding
+    $head->add( "X-RT-Original-Encoding" => $charset )
+	if $head->mime_attr('content-type.charset') or $head->mime_type =~ /^text/;
+
+
+    return unless ( $head->mime_type =~ qr{^(text/plain|message/rfc822)$}i  );
+    
+
+    my $body = $entity->bodyhandle;
+
+    if ( $enc ne $charset && $body) {
+	my @lines = $body->as_lines or return;
+
+	# {{{ Convert the body
+	eval {
+	    $RT::Logger->debug("Converting '$charset' to '$enc' for ". $head->mime_type . " - ". $head->get('subject'));
+
+	    # NOTE:: see the comments at the end of the sub.
+	    Encode::_utf8_off( $lines[$_] ) foreach ( 0 .. $#lines );
+	    Encode::from_to( $lines[$_], $charset => $enc ) for ( 0 .. $#lines );
+	};
+
+	if ($@) {
+	    $RT::Logger->error( "Encoding error: " . $@ . " defaulting to ISO-8859-1 -> UTF-8" );
+	    eval {
+		Encode::from_to( $lines[$_], 'iso-8859-1' => $enc ) foreach ( 0 .. $#lines );
+	    };
+	    if ($@) {
+		$RT::Logger->crit( "Totally failed to convert to utf-8: " . $@ . " I give up" );
+	    }
+	}
+	# }}}
+
+        my $new_body = MIME::Body::InCore->new( \@lines );
+
+        # set up the new entity
+        $head->mime_attr( "content-type" => 'text/plain' )
+          unless ( $head->mime_attr("content-type") );
+        $head->mime_attr( "content-type.charset" => $enc );
+        $entity->bodyhandle($new_body);
+    }
+}
+
+# NOTES:  Why Encode::_utf8_off before Encode::from_to
+#
+# All the strings in RT are utf-8 now.  Quotes from Encode POD:
+#
+# [$length =] from_to($octets, FROM_ENC, TO_ENC [, CHECK])
+# ... The data in $octets must be encoded as octets and not as
+# characters in Perl's internal format. ...
+#
+# Not turning off the UTF-8 flag in the string will prevent the string
+# from conversion.
+
+# }}}
+
+# {{{ DecodeMIMEWordsToUTF8
+
+=head2 DecodeMIMEWordsToUTF8 $raw
+
+An utility method which mimics MIME::Words::decode_mimewords, but only
+limited functionality.  This function returns an utf-8 string.
+
+It returns the decoded string, or the original string if it's not
+encoded.  Since the subroutine converts specified string into utf-8
+charset, it should not alter a subject written in English.
+
+Why not use MIME::Words directly?  Because it fails in RT when I
+tried.  Maybe it's ok now.
+
+=cut
+
+sub DecodeMIMEWordsToUTF8 {
+    my $str = shift;
+    DecodeMIMEWordsToEncoding($str, 'utf-8');
+}
+
+sub DecodeMIMEWordsToEncoding {
+    my $str = shift;
+    my $enc = shift;
+
+   
+    @_ = $str =~ m/([^=]*)=\?([^?]+)\?([QqBb])\?([^?]+)\?=([^=]*)/g;
+
+    return ($str) unless (@_);
+
+    $str = "";
+    while (@_) {
+	my ($prefix, $charset, $encoding, $enc_str, $trailing) =
+	    (shift, shift, shift, shift, shift);
+
+        $trailing =~ s/\s?\t?$//;               # Observed from Outlook Express
+
+	if ($encoding eq 'Q' or $encoding eq 'q') {
+	    use MIME::QuotedPrint;
+	    $enc_str =~ tr/_/ /;		# Observed from Outlook Express
+	    $enc_str = decode_qp($enc_str);
+	} elsif ($encoding eq 'B' or $encoding eq 'b') {
+	    use MIME::Base64;
+	    $enc_str = decode_base64($enc_str);
+	} else {
+	    $RT::Logger->warning("RT::I18N::DecodeMIMEWordsToCharset got a " .
+			      "strange encoding: $encoding.");
+	}
+
+	# now we have got a decoded subject, try to convert into the encoding
+	unless ($charset eq $enc) {
+	    eval { Encode::from_to($enc_str, $charset,  $enc) };
+	    if ($@) {
+		$charset = _GuessCharset( $enc_str );
+		Encode::from_to($enc_str, $charset, $enc);
+	    }
+	}
+
+	$str .= $prefix . $enc_str . $trailing;
+    }
+
+    return ($str)
+}
+
+# }}}
+
+# {{{ _FindOrGuessCharset
+
+=head2 _FindOrGuessCharset MIME::Entity
+
+When handed a MIME::Entity will first attempt to read what charset the message is encoded in. Failing that, 
+will use Encode::Guess to try to figure it out
+
+=cut
+
+sub _FindOrGuessCharset {
+    my $entity = shift;
+    my $head = $entity->head;
+
+    if ($head->mime_attr("content-type.charset")) {
+	return $head->mime_attr("content-type.charset");
+    }
+
+    if ( $head->mime_type =~ m{^text/}) {
+	my $body = $entity->bodyhandle or return;
+	return _GuessCharset( $head->as_string . $body->as_string );
+    }
+    else {
+	# potentially binary data -- don't guess the body
+	return _GuessCharset( $head->as_string );
+    }
+}
+
+# }}}
+
+
+# {{{ _GuessCharset
+
+=head2 _GuessCharset STRING
+
+use Encode::Guess to try to figure it out the string's encoding.
+
+=cut
+
+sub _GuessCharset {
+    my $fallback = 'iso-8859-1';
+    my $charset;
+
+    if ( @RT::EmailInputEncodings and eval { require Encode::Guess; 1 } ) {
+	Encode::Guess->set_suspects(@RT::EmailInputEncodings);
+	my $decoder = Encode::Guess->guess( $_[0] );
+
+	if ( ref $decoder ) {
+	    $charset = $decoder->name;
+	    $RT::Logger->debug("Guessed encoding: $charset");
+	    return $charset;
+	}
+	elsif ($decoder =~ /(\S+ or .+)/) {
+	    my %matched = map { $_ => 1 } split(/ or /, $1);
+	    return 'utf-8' if $matched{'utf8'}; # one and only normalization
+
+	    foreach my $suspect (@RT::EmailInputEncodings) {
+		next unless $matched{$suspect};
+		$RT::Logger->debug("Encode::Guess ambiguous ($decoder); using $suspect");
+		$charset = $suspect;
+		last;
+	    }
+	}
+	else {
+	    $RT::Logger->warning("Encode::Guess failed: $decoder; fallback to $fallback");
+	}
+    }
+    else {
+	$RT::Logger->warning("Cannot Encode::Guess; fallback to $fallback");
+    }
+
+    return($charset || $fallback);
+}
+
+# }}}
+
+# {{{ SetMIMEHeadToEncoding
+
+=head2 SetMIMEHeadToEncoding HEAD OLD_CHARSET NEW_CHARSET
+
+Converts a MIME Head from one encoding to another. This totally violates the RFC.
+We should never need this. But, Surprise!, MUAs are badly broken and do this kind of stuff
+all the time
+
+
+=cut
+
+sub SetMIMEHeadToEncoding {
+    my ( $head, $charset, $enc, $preserve_words ) = ( shift, shift, shift, shift );
+
+    $charset = 'utf-8' if $charset eq 'utf8';
+    $enc     = 'utf-8' if $enc     eq 'utf8';
+
+    return if $charset eq $enc and $preserve_words;
+
+    foreach my $tag ( $head->tags ) {
+        my @values = $head->get_all($tag);
+        $head->delete($tag);
+        foreach my $value (@values) {
+            if ( $charset ne $enc ) {
+
+                eval {
+                    Encode::_utf8_off($value);
+                    Encode::from_to( $value, $charset => $enc );
+                };
+                if ($@) {
+                    $RT::Logger->error( "Encoding error: " . $@
+                                       . " defaulting to ISO-8859-1 -> UTF-8" );
+                    eval { Encode::from_to( $value, 'iso-8859-1' => $enc ) };
+                    if ($@) {
+                        $RT::Logger->crit( "Totally failed to convert to utf-8: " . $@ . " I give up" );
+                    }
+                }
+            }
+            $value = DecodeMIMEWordsToEncoding( $value, $enc ) unless $preserve_words;
+            $head->add( $tag, $value );
+        }
+    }
+
+}
+# }}}
+
+eval "require RT::I18N_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/I18N_Vendor.pm});
+eval "require RT::I18N_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/I18N_Local.pm});
+
+1;  # End of module.
+
diff --git a/rt/lib/RT/I18N/cs.pm b/rt/lib/RT/I18N/cs.pm
new file mode 100644
index 000000000..36e2bc6af
--- /dev/null
+++ b/rt/lib/RT/I18N/cs.pm
@@ -0,0 +1,68 @@
+package RT::I18N::cs;
+
+# # CZECH TRANSLATORS COMMENTS see Locale::Maketext::TPJ13
+# Obecne parametry musi byt docela slozite (v pripade Slavistickych jazyku)
+# typu pocet, slovo, pad a rod 
+#
+#pad 1., rod muzsky:
+#0 krecku
+#1 krecek
+#2..4 krecci
+#5.. krecku (nehodi se zde resit pravidlo mod 1,2,3,4 krom mod 11,12,13,14)
+#
+#0 kabatu
+#1 kabat
+#2..4 kabaty
+#5 kabatu
+#
+# => Vyplati se udelat quant s parametry typu pocet, slovo1, slovo2..4, slovo5 a slovo0
+#
+
+sub quant {
+  my($handle, $num, @forms) = @_;
+
+  return $num if @forms == 0; # what should this mean?
+  return $forms[3] if @forms > 3 and $num == 0; # special zeroth case
+
+  # Normal case:
+  # Note that the formatting of $num is preserved.
+  #return( $handle->numf($num) . ' ' . $handle->numerate($num, @forms) );
+  return( $handle->numerate($num, @forms) );
+   # Most human languages put the number phrase before the qualified phrase.
+}
+
+
+sub numerate {
+ # return this lexical item in a form appropriate to this number
+  my($handle, $num, @forms) = @_;
+  my $s = ($num == 1);
+
+  return '' unless @forms;
+  return
+   $s ? $forms[0] :
+   ( $num > 1 && $num < 5 ) ? $forms[1] :
+   $forms[2];
+}
+
+#--------------------------------------------------------------------------
+
+sub numf {
+  my($handle, $num) = @_[0,1];
+  if($num < 10_000_000_000 and $num > -10_000_000_000 and $num == int($num)) {
+    $num += 0;  # Just use normal integer stringification.
+         # Specifically, don't let %G turn ten million into 1E+007
+  } else {
+    $num = CORE::sprintf("%G", $num);
+     # "CORE::" is there to avoid confusion with the above sub sprintf.
+  }
+  while( $num =~ s/^([-+]?\d+)(\d{3})/$1,$2/s ) {1}  # right from perlfaq5
+   # The initial \d+ gobbles as many digits as it can, and then we
+   #  backtrack so it un-eats the rightmost three, and then we
+   #  insert the comma there.
+
+  $num =~ tr<.,><,.> if ref($handle) and $handle->{'numf_comma'};
+   # This is just a lame hack instead of using Number::Format
+  return $num;
+}
+
+1;
diff --git a/rt/lib/RT/I18N/cs.po b/rt/lib/RT/I18N/cs.po
new file mode 100644
index 000000000..75f349595
--- /dev/null
+++ b/rt/lib/RT/I18N/cs.po
@@ -0,0 +1,4496 @@
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: RT 3.0.0\n"
+"POT-Creation-Date: 2002-05-02 11:36+0800\n"
+"PO-Revision-Date: 2003-03-24 03:00+0800\n"
+"Last-Translator: Jan Okrouhly <okrouhly@civ.zcu.cz>\n"
+"Language-Team: rt-devel <rt-devel@lists.fsck.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: html/Elements/MyRequests:28 html/Elements/MyTickets:28
+msgid "#"
+msgstr "#"
+
+#: html/Admin/Queues/Scrip.html:55
+#. ($QueueObj->id)
+msgid "#%1"
+msgstr "#%1"
+
+#: html/Approvals/Elements/ShowDependency:50 html/Ticket/Display.html:26 html/Ticket/Display.html:30
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "#%1: %2"
+msgstr "#%1: %2"
+
+#: lib/RT/Date.pm:337
+#. ($s, $time_unit)
+msgid "%1 %2"
+msgstr "%1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:771
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr "%1 %2 %3"
+
+#: lib/RT/Date.pm:373
+#. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
+msgid "%1 %2 %3 %4:%5:%6 %7"
+msgstr "%1 %3.%2.%7 %4:%5:%6"
+
+#: lib/RT/Ticket_Overlay.pm:3438 lib/RT/Transaction_Overlay.pm:559 lib/RT/Transaction_Overlay.pm:601
+#. ($cf->Name, $new_value->Content)
+#. ($field, $self->NewValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 added"
+msgstr "%1 %2 přidáno"
+
+#: lib/RT/Date.pm:334
+#. ($s, $time_unit)
+msgid "%1 %2 ago"
+msgstr "- %1 %2"
+
+#: lib/RT/Ticket_Overlay.pm:3444 lib/RT/Transaction_Overlay.pm:566
+#. ($cf->Name, $old_value, $new_value->Content)
+#. ($field, $self->OldValue, $self->NewValue)
+msgid "%1 %2 changed to %3"
+msgstr "%1 %2 změněno na %3"
+
+#: lib/RT/Ticket_Overlay.pm:3441 lib/RT/Transaction_Overlay.pm:562 lib/RT/Transaction_Overlay.pm:607
+#. ($cf->Name, $old_value)
+#. ($field, $self->OldValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 deleted"
+msgstr "%1 %2 smazáno"
+
+#: html/Admin/Elements/EditScrips:44 html/Admin/Elements/ListGlobalScrips:28
+#. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
+msgid "%1 %2 with template %3"
+msgstr "%1 %2 se vzorem %3"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 this ticket\\n"
+msgstr "%1 (%2) %3 tento požadavek\\n"
+
+#: html/Search/Listing.html:57
+#. (($session{'tickets'}->FirstRow+1), ($session{'tickets'}->FirstRow() + $session{'tickets'}->RowsPerPage()  ))
+msgid "%1 - %2 shown"
+msgstr "%1. až %2. zobrazený"
+
+#: bin/rt-crontool:169 bin/rt-crontool:176 bin/rt-crontool:182
+#. ("--search-argument", "--search")
+#. ("--condition-argument", "--condition")
+#. ("--action-argument", "--action")
+msgid "%1 - An argument to pass to %2"
+msgstr "%1 - argument k předání %2"
+
+#: bin/rt-crontool:185
+#. ("--verbose")
+msgid "%1 - Output status updates to STDOUT"
+msgstr "%1 - Výstupní stav jde do STDOUT"
+
+#: bin/rt-crontool:179
+#. ("--action")
+msgid "%1 - Specify the action module you want to use"
+msgstr "%1 - Jaký ak�ní modul chcete použít"
+
+#: bin/rt-crontool:173
+#. ("--condition")
+msgid "%1 - Specify the condition module you want to use"
+msgstr "%1 - Jaký podmínkový modul chcete použít"
+
+#: bin/rt-crontool:166
+#. ("--search")
+msgid "%1 - Specify the search module you want to use"
+msgstr "%1 - Jaký vyhledávací modul chcete použít"
+
+#: lib/RT/ScripAction_Overlay.pm:122
+#. ($self->Id)
+msgid "%1 ScripAction loaded"
+msgstr "ScripAction %1 nahrána"
+
+#: lib/RT/Ticket_Overlay.pm:3471
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 added as a value for %2"
+msgstr "%1 přidáno jako hodnota pro %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on"
+msgstr "%1 aliasy vyžadují k �innosti TicketId"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on (from %2) %3"
+msgstr "%1 aliasy vyžadují k �innosti TicketId (odesílatel %2) %3"
+
+#: lib/RT/Link_Overlay.pm:117 lib/RT/Link_Overlay.pm:124
+#. ($args{'Base'})
+#. ($args{'Target'})
+msgid "%1 appears to be a local object, but can't be found in the database"
+msgstr "%1 vypadá jako lokální objekt, ale není v databázi"
+
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:483
+#. ($self->BriefDescription , $self->CreatorObj->Name)
+#. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
+msgid "%1 by %2"
+msgstr "%1 uživatelem %2"
+
+#: lib/RT/Transaction_Overlay.pm:537 lib/RT/Transaction_Overlay.pm:626 lib/RT/Transaction_Overlay.pm:635 lib/RT/Transaction_Overlay.pm:638
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
+#. ($self->Field , $q1->Name , $q2->Name)
+#. ($self->Field, $t2->AsString, $t1->AsString)
+#. ($self->Field, $self->OldValue, $self->NewValue)
+msgid "%1 changed from %2 to %3"
+msgstr "%1 změněno z %2 na %3"
+
+#: lib/RT/Interface/Web.pm:857
+msgid "%1 could not be set to %2."
+msgstr "%1 nemůže být nastaveno na %2."
+
+#: NOT FOUND IN SOURCE
+msgid "%1 couldn't init a transaction (%2)\\n"
+msgstr "%1 nemůže za�ít transakci (%2)\\n"
+
+#: lib/RT/Ticket_Overlay.pm:2813
+#. ($self)
+msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
+msgstr "%1 nemůže nastavit stav na vyřešen. RT databáze může být nekonzistentní."
+
+#: html/Elements/MyTickets:25
+#. ($rows)
+msgid "%1 highest priority tickets I own..."
+msgstr "%1 nejdůležitějších požadavků, které vlastním..."
+
+#: html/Elements/MyRequests:25
+#. ($rows)
+msgid "%1 highest priority tickets I requested..."
+msgstr "%1 nejdůležitějších požadavků, které žádám..."
+
+#: bin/rt-crontool:161
+#. ($0)
+msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
+msgstr "%1 je nástroj zpracující požadavky z vnějšího plánovacího nástroje jako je cron"
+
+#: lib/RT/Queue_Overlay.pm:743
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this queue."
+msgstr "%1 již není %2 této fronty."
+
+#: lib/RT/Ticket_Overlay.pm:1570
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this ticket."
+msgstr "%1 již není %2 tohoto požadavku."
+
+#: lib/RT/Ticket_Overlay.pm:3527
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 is no longer a value for custom field %2"
+msgstr "%1 již není hodnotou uživatelské položky %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 isn't a valid Queue id."
+msgstr "%1 není platným identifikátorem fronty."
+
+#: html/Ticket/Elements/ShowBasics:36
+#. ($TimeWorked)
+msgid "%1 min"
+msgstr "%1 %quant(%1,minuta,minuty,minut,minut)"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 not shown"
+msgstr "%1 nezobrazeno"
+
+#: html/User/Elements/DelegateRights:76
+#. (loc($ObjectType =~ /^RT::(.*)$/))
+msgid "%1 rights"
+msgstr "práva %1"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 succeeded\\n"
+msgstr "%1 provedeno\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for $MessageId"
+msgstr "typ %1 neznámý pro $MessageId"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for %2"
+msgstr "typ %1 neznámý pro %2"
+
+#: lib/RT/Action/ResolveMembers.pm:42
+#. (ref $self)
+msgid "%1 will resolve all members of a resolved group ticket."
+msgstr "%1 vyřeší všechny �leny skupiny vyřešeného požadavku."
+
+#: NOT FOUND IN SOURCE
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr "%1 odloží [místní] B�ZI, je-li závislá [�i �lenem] na spjatém požadavku."
+
+#: lib/RT/Transaction_Overlay.pm:435
+#. ($self)
+msgid "%1: no attachment specified"
+msgstr "%1: neudána příloha"
+
+#: html/Ticket/Elements/ShowTransaction:102
+#. ($size)
+msgid "%1b"
+msgstr "%1 B"
+
+#: html/Ticket/Elements/ShowTransaction:99
+#. (int($size/102.4)/10)
+msgid "%1k"
+msgstr "%1 kB"
+
+#: lib/RT/Ticket_Overlay.pm:1140
+#. ($args{'Status'})
+msgid "'%1' is an invalid value for status"
+msgstr "%1 je neplatnou hodnotou pro stav"
+
+#: NOT FOUND IN SOURCE
+msgid "'%1' not a recognized action. "
+msgstr "%1 je neznámá akce."
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete scrip)"
+msgstr "(Zatrhněte pro smazání scripu)"
+
+#: html/Admin/Elements/EditQueueWatchers:29 html/Admin/Elements/EditScrips:35 html/Admin/Elements/EditTemplates:36 html/Admin/Groups/Members.html:52 html/Ticket/Elements/EditLinks:33 html/Ticket/Elements/EditPeople:46 html/User/Groups/Members.html:55
+msgid "(Check box to delete)"
+msgstr "(Zatrhněte pro smazání)"
+
+#: html/Ticket/Create.html:178
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr "(Zadejte identifikátory �i URL požadavku, oddělené mezerami)"
+
+#: html/Admin/Queues/Modify.html:54 html/Admin/Queues/Modify.html:60
+#. ($RT::CorrespondAddress)
+#. ($RT::CommentAddress)
+msgid "(If left blank, will default to %1"
+msgstr "(Pro prázdné pole se použije %1)"
+
+#: html/Admin/Elements/EditCustomFields:33 html/Admin/Elements/ListGlobalCustomFields:32
+msgid "(No custom fields)"
+msgstr "(Žádné uživatelské položky)"
+
+#: html/Admin/Groups/Members.html:50 html/User/Groups/Members.html:53
+msgid "(No members)"
+msgstr "(Žádní �lenové)"
+
+#: html/Admin/Elements/EditScrips:32 html/Admin/Elements/ListGlobalScrips:32
+msgid "(No scrips)"
+msgstr "Žádné scripy"
+
+#: html/Admin/Elements/EditTemplates:31
+msgid "(No templates)"
+msgstr "(Žádné vzory)"
+
+#: html/Ticket/Update.html:85
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(Zašle skrytou kopii této aktualizace mezerami oddělenému seznamu e-mail adres. <b>Neovlivňuje</b> příjemce budoucích aktualizací.)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(Zašle skrytou kopii této aktualizace mezerami oddělenému seznamu e-mail adres. <b>Neovlivňuje</b> příjemce budoucích aktualizací.)"
+
+#: html/Ticket/Create.html:79
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(Zašle kopii této aktualizace mezerami oddělenému seznamu e-mail adres. Tito lidé <b>budou</b> dostávat budoucí aktualizace.)"
+
+#: html/Ticket/Update.html:81
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(Zašle kopii této aktualizace mezerami oddělenému seznamu e-mail adres. <b>Nemění</b> příjemce budoucích aktualizací"
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(Zašle kopii této aktualizace mezerami oddělenému seznamu e-mail adres. <b>Neovlivňuje</b> příjemce budoucích aktualizací.)"
+
+#: html/Ticket/Create.html:69
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(Zašle kopii této aktualizace mezerami oddělenému seznamu e-mail adres. Tito lidé <b>budou</b> dostávat budoucí aktualizace.)"
+
+#: html/Admin/Groups/index.html:33 html/User/Groups/index.html:33
+msgid "(empty)"
+msgstr "(prázdná)"
+
+#: html/Admin/Users/index.html:39
+msgid "(no name listed)"
+msgstr "žádné jméno nebylo vypsáno"
+
+#: html/Elements/MyRequests:43 html/Elements/MyTickets:45
+msgid "(no subject)"
+msgstr "(bez předmětu)"
+
+#: html/Admin/Elements/SelectRights:48 html/Elements/SelectCustomFieldValue:30 html/Ticket/Elements/EditCustomField:59 html/Ticket/Elements/ShowCustomFields:36 lib/RT/Transaction_Overlay.pm:536
+msgid "(no value)"
+msgstr "(bez hodnoty)"
+
+#: html/Ticket/Elements/EditLinks:116
+msgid "(only one ticket)"
+msgstr "(jen jeden požadavek)"
+
+#: html/Elements/MyRequests:52 html/Elements/MyTickets:55
+msgid "(pending approval)"
+msgstr "(o�ekávájící schválení)"
+
+#: html/Elements/MyRequests:54 html/Elements/MyTickets:57
+msgid "(pending other tickets)"
+msgstr "(jiné o�ekávající požadavky)"
+
+#: html/Admin/Users/Modify.html:50
+msgid "(required)"
+msgstr "(povinné)"
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "(untitled)"
+msgstr "(nepojmenováno)"
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr "25 mnou vlastněných nejdůležitějších požadavků..."
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr "25 mnou žádaných nejdůležitějších požadavků..."
+
+#: html/Ticket/Elements/ShowBasics:32
+msgid "<% $Ticket->Status%>"
+msgstr "<% $Ticket->Status%>"
+
+#: html/Elements/SelectTicketTypes:27
+msgid "<% $_ %>"
+msgstr "<% $_ %>"
+
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:26
+#. ($m->scomp('/Elements/SelectNewTicketQueue'))
+msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
+msgstr "<input type=\"submit\" value=\"Nový požadavek v\">&nbsp;%1"
+
+#: etc/initialdata:203
+msgid "A blank template"
+msgstr "Prázdný vzor"
+
+#: lib/RT/ACE_Overlay.pm:157 lib/RT/Principal_Overlay.pm:181
+msgid "ACE not found"
+msgstr "ACE nenalezeno"
+
+#: lib/RT/ACE_Overlay.pm:831
+msgid "ACEs can only be created and deleted."
+msgstr "ACE mohou být jen vytvářeny nebo rušeny."
+
+#: bin/rt-commit-handler:755
+msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgstr "Přerušeno k zamezení nežádoucích změn požadavku.\\n"
+
+#: html/User/Elements/Tabs:32
+msgid "About me"
+msgstr "O mnÄ›"
+
+#: html/Admin/Users/Modify.html:80
+msgid "Access control"
+msgstr "Řízení přístupu"
+
+#: html/Admin/Elements/EditScrip:57
+msgid "Action"
+msgstr "Akce"
+
+#: lib/RT/Scrip_Overlay.pm:147
+#. ($args{'ScripAction'})
+msgid "Action %1 not found"
+msgstr "Akce %1 nenalezena"
+
+#: bin/rt-crontool:123
+msgid "Action committed."
+msgstr "Akce provedena."
+
+#: bin/rt-crontool:119
+msgid "Action prepared..."
+msgstr "Akce připravena..."
+
+#: html/Search/Bulk.html:92
+msgid "Add AdminCc"
+msgstr "Přidat AdminCc"
+
+#: html/Search/Bulk.html:90
+msgid "Add Cc"
+msgstr "Přidat Cc"
+
+#: html/Ticket/Create.html:114 html/Ticket/Update.html:100
+msgid "Add More Files"
+msgstr "Přidat další soubory"
+
+#: html/Search/Bulk.html:88
+msgid "Add Requestor"
+msgstr "Přidat Žadatele"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a new a global scrip"
+msgstr "Přidat nový globální scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a scrip to this queue"
+msgstr "Přidat scrip k této frontě"
+
+#: html/Admin/Global/Scrip.html:55
+msgid "Add a scrip which will apply to all queues"
+msgstr "Přidat scrip do všech front"
+
+#: html/Search/Bulk.html:118
+msgid "Add comments or replies to selected tickets"
+msgstr "Přidat komentáře �i odpovědi k vybraným požadavkům"
+
+#: html/Admin/Groups/Members.html:42 html/User/Groups/Members.html:39
+msgid "Add members"
+msgstr "Přidat �leny"
+
+#: html/Admin/Queues/People.html:66 html/Ticket/Elements/AddWatchers:28
+msgid "Add new watchers"
+msgstr "Přidat nové pozorovatele"
+
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
+msgstr "PřidatDalšíStav"
+
+#: lib/RT/Queue_Overlay.pm:643
+#. ($args{'Type'})
+msgid "Added principal as a %1 for this queue"
+msgstr "Uživatel přidán do této fronty jako %1"
+
+#: lib/RT/Ticket_Overlay.pm:1454
+#. ($self->loc($args{'Type'}))
+msgid "Added principal as a %1 for this ticket"
+msgstr "Uživatel přidán k tomuto požadavku jako %1"
+
+#: html/Admin/Elements/ModifyUser:76 html/Admin/Users/Modify.html:122 html/User/Prefs.html:88
+msgid "Address1"
+msgstr "Adresa1"
+
+#: html/Admin/Elements/ModifyUser:78 html/Admin/Users/Modify.html:127 html/User/Prefs.html:90
+msgid "Address2"
+msgstr "Adresa2"
+
+#: html/Ticket/Create.html:74
+msgid "Admin Cc"
+msgstr "Admin Cc"
+
+#: etc/initialdata:274
+msgid "Admin Comment"
+msgstr "Administrativní komentář"
+
+#: etc/initialdata:256
+msgid "Admin Correspondence"
+msgstr "Administrativní korespondence"
+
+#: html/Admin/Queues/index.html:25 html/Admin/Queues/index.html:28
+msgid "Admin queues"
+msgstr "Správa/Front"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin users"
+msgstr "Správa/Uživatelů"
+
+#: html/Admin/Global/index.html:26 html/Admin/Global/index.html:28
+msgid "Admin/Global configuration"
+msgstr "Správa/Globální konfigurace"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Groups"
+msgstr "Správa/Skupin"
+
+#: html/Admin/Queues/Modify.html:25 html/Admin/Queues/Modify.html:29
+msgid "Admin/Queue/Basics"
+msgstr "Správa/Front/Základních údajů"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr "Spravovat všechny osobní skupiny"
+
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:39 html/Ticket/Update.html:50 lib/RT/ACE_Overlay.pm:89
+msgid "AdminCc"
+msgstr "AdminCc"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr "AdminComment"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr "AdminCorrespondence"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "AdminCustomFields"
+msgstr "Spravovat uživatelem definované položky"
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "AdminGroup"
+msgstr "Spravovat skupinu"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "AdminGroupMembership"
+msgstr "Spravovat �lenství ve skupinách"
+
+#: lib/RT/System.pm:59
+msgid "AdminOwnPersonalGroups"
+msgstr "Spravovat vlastní osobní skupiny"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "AdminQueue"
+msgstr "Spravovat frontu"
+
+#: lib/RT/System.pm:60
+msgid "AdminUsers"
+msgstr "Spravovat uživatele"
+
+#: html/Admin/Queues/People.html:48 html/Ticket/Elements/EditPeople:54
+msgid "Administrative Cc"
+msgstr "Administrativní Cc"
+
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search"
+msgstr "Pokro�ilé Vyhledávání"
+
+#: html/Elements/SelectDateRelation:36
+msgid "After"
+msgstr "Po"
+
+#: NOT FOUND IN SOURCE
+msgid "Age"
+msgstr "Stáří"
+
+#: html/Admin/Elements/EditCustomFields:96
+msgid "All Custom Fields"
+msgstr "Všechny uživatelské položky"
+
+#: html/Admin/Queues/index.html:53
+msgid "All Queues"
+msgstr "VÅ¡echny Fronty"
+
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
+msgstr "Vždy posílá zprávu žadatelům nezávisle na odesílateli"
+
+#: html/Elements/Tabs:58
+msgid "Approval"
+msgstr "Schvalování"
+
+#: html/Approvals/Display.html:46 html/Approvals/Elements/Approve:27 html/Approvals/Elements/ShowDependency:42 html/Approvals/index.html:65
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($ticket->id, $msg)
+#. ($ticket->Id, $ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Approval #%1: %2"
+msgstr "Schválení #%1: $2"
+
+#: html/Approvals/index.html:54
+#. ($ticket->Id)
+msgid "Approval #%1: Notes not recorded due to a system error"
+msgstr "Schválení #$1: Poznámky neuloženy kvůli systémové chybě"
+
+#: html/Approvals/index.html:52
+#. ($ticket->Id)
+msgid "Approval #%1: Notes recorded"
+msgstr "Schválení #%1: Poznámky uloženy"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Details"
+msgstr "Detaily schválení"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval diagram"
+msgstr "Schvalovací diagram"
+
+#: html/Approvals/Elements/Approve:45
+msgid "Approve"
+msgstr "Schválit"
+
+#: etc/initialdata:431 etc/upgrade/2.1.71:148
+msgid "Approver's notes: %1"
+msgstr "Poznámky schvalovatele: %1"
+
+#: lib/RT/Date.pm:414
+msgid "Apr."
+msgstr "dub"
+
+#: html/Elements/SelectSortOrder:35
+msgid "Ascending"
+msgstr "VzestupnÄ›"
+
+#: html/Search/Bulk.html:127 html/SelfService/Update.html:36 html/Ticket/ModifyAll.html:83 html/Ticket/Update.html:100
+msgid "Attach"
+msgstr "Přiložit"
+
+#: html/SelfService/Create.html:67 html/Ticket/Create.html:110
+msgid "Attach file"
+msgstr "Připojit soubor"
+
+#: html/Ticket/Create.html:98 html/Ticket/Update.html:89
+msgid "Attached file"
+msgstr "Připojený soubor"
+
+#: html/SelfService/Attachment/dhandler:36
+msgid "Attachment '%1' could not be loaded"
+msgstr "Příloha '%1' nemůže být nahrána"
+
+#: lib/RT/Transaction_Overlay.pm:443
+msgid "Attachment created"
+msgstr "Příloha vytvořena"
+
+#: lib/RT/Tickets_Overlay.pm:1189
+msgid "Attachment filename"
+msgstr "Jméno souboru přílohy"
+
+#: html/Ticket/Elements/ShowAttachments:26
+msgid "Attachments"
+msgstr "Přílohy"
+
+#: lib/RT/Date.pm:418
+msgid "Aug."
+msgstr "srp"
+
+#: html/Admin/Elements/ModifyUser:66
+msgid "AuthSystem"
+msgstr "AuthSystem"
+
+#: etc/initialdata:206
+msgid "Autoreply"
+msgstr "Automatická odpově�"
+
+#: etc/initialdata:72
+msgid "Autoreply To Requestors"
+msgstr "Automaticky odpověz žadatelům"
+
+#: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr "Automatická odpově� žadatelům"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad PGP Signature: %1\\n"
+msgstr "Chybná PGP signatura: %1\\n"
+
+#: html/SelfService/Attachment/dhandler:40
+msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
+msgstr "Chybný identifikátor přílohy. Nelze nalézt přílohu'%1'\\n"
+
+#: bin/rt-commit-handler:827
+#. ($val)
+msgid "Bad data in %1"
+msgstr "Chybná data v %1"
+
+#: html/SelfService/Attachment/dhandler:43
+#. ($trans, $AttachmentObj->TransactionId())
+msgid "Bad transaction number for attachment. %1 should be %2\\n"
+msgstr "Chybné �íslo transakce u přílohy. %1 má být %2\\n"
+
+#: html/Admin/Elements/GroupTabs:39 html/Admin/Elements/QueueTabs:39 html/Admin/Elements/UserTabs:38 html/Ticket/Elements/Tabs:90 html/User/Elements/GroupTabs:38
+msgid "Basics"
+msgstr "Základní údaje"
+
+#: html/Ticket/Update.html:83
+msgid "Bcc"
+msgstr "Bcc"
+
+#: html/Admin/Elements/EditScrip:88 html/Admin/Global/GroupRights.html:85 html/Admin/Global/Template.html:46 html/Admin/Global/UserRights.html:54 html/Admin/Groups/GroupRights.html:73 html/Admin/Groups/Members.html:81 html/Admin/Groups/Modify.html:56 html/Admin/Groups/UserRights.html:55 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:45 html/Admin/Queues/UserRights.html:54 html/User/Groups/Modify.html:56
+msgid "Be sure to save your changes"
+msgstr "Neopomeňte uložit vaše změny"
+
+#: html/Elements/SelectDateRelation:34 lib/RT/CurrentUser.pm:322
+msgid "Before"
+msgstr "Před"
+
+#: NOT FOUND IN SOURCE
+msgid "Begin Approval"
+msgstr "Za�átek schvalování"
+
+#: etc/initialdata:202
+msgid "Blank"
+msgstr "Prázdný"
+
+#: html/Search/Listing.html:79
+msgid "Bookmarkable URL for this search"
+msgstr "Uložitelné URL pro toto hledání"
+
+#: html/Ticket/Elements/ShowHistory:39 html/Ticket/Elements/ShowHistory:45
+msgid "Brief headers"
+msgstr "Zkrácené hlavi�ky"
+
+#: html/Search/Bulk.html:25 html/Search/Bulk.html:26
+msgid "Bulk ticket update"
+msgstr "Hromadná úprava požadavků"
+
+#: lib/RT/User_Overlay.pm:1331
+msgid "Can not modify system users"
+msgstr "Nelze měnit systémové uživatele"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "Can this principal see this queue"
+msgstr "Může tento uživatel vidět tuto frontu"
+
+#: lib/RT/CustomField_Overlay.pm:144
+msgid "Can't add a custom field value without a name"
+msgstr "Uživatelské položce nelze přidat hodnotu beze jména"
+
+#: lib/RT/Link_Overlay.pm:132
+msgid "Can't link a ticket to itself"
+msgstr "Požadavek nelze svázat se sebou samým"
+
+#: lib/RT/Ticket_Overlay.pm:2787
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr "Nelze slou�it do slou�eného požadavku. To by se vám nemělo nikdy stát."
+
+#: lib/RT/Ticket_Overlay.pm:2605 lib/RT/Ticket_Overlay.pm:2674
+msgid "Can't specifiy both base and target"
+msgstr "Nelze zadat zároveň zdroj i cíl"
+
+#: html/autohandler:112
+#. ($msg)
+msgid "Cannot create user: %1"
+msgstr "Nelze vytvořit uživatele: %1"
+
+#: etc/initialdata:50 html/Admin/Queues/People.html:44 html/SelfService/Create.html:51 html/SelfService/Display.html:50 html/Ticket/Create.html:64 html/Ticket/Elements/EditPeople:51 html/Ticket/Elements/ShowPeople:35 html/Ticket/Update.html:45 html/Ticket/Update.html:78 lib/RT/ACE_Overlay.pm:88
+msgid "Cc"
+msgstr "Cc"
+
+#: html/SelfService/Prefs.html:31
+msgid "Change password"
+msgstr "Změna hesla"
+
+#: html/Ticket/Create.html:101 html/Ticket/Update.html:92
+msgid "Check box to delete"
+msgstr "Zašrtnutím odstraníte"
+
+#: html/Admin/Elements/SelectRights:31
+msgid "Check box to revoke right"
+msgstr "Zatrhněte k odebrání práva"
+
+#: html/Ticket/Create.html:183 html/Ticket/Elements/EditLinks:131 html/Ticket/Elements/EditLinks:69 html/Ticket/Elements/ShowLinks:51
+msgid "Children"
+msgstr "Potomci"
+
+#: html/Admin/Elements/ModifyUser:80 html/Admin/Users/Modify.html:132 html/User/Prefs.html:92
+msgid "City"
+msgstr "Město"
+
+#: html/Ticket/Elements/ShowDates:47
+msgid "Closed"
+msgstr "Vyřešeno"
+
+#: html/SelfService/Elements/Tabs:60
+msgid "Closed requests"
+msgstr "Uzavřené požadavky"
+
+#: NOT FOUND IN SOURCE
+msgid "Command not understood!\\n"
+msgstr "Neznámý příkaz!\\n"
+
+#: html/Ticket/Elements/ShowTransaction:179 html/Ticket/Elements/Tabs:153
+msgid "Comment"
+msgstr "Komentovat"
+
+#: html/Admin/Elements/ModifyQueue:45 html/Admin/Queues/Modify.html:58
+msgid "Comment Address"
+msgstr "Adresa pro komentáře"
+
+#: NOT FOUND IN SOURCE
+msgid "Comment not recorded"
+msgstr "Komentář nezaznamenán"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "Comment on tickets"
+msgstr "Komentovat požadavky"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "CommentOnTicket"
+msgstr "Komentovat požadavky"
+
+#: html/Admin/Elements/ModifyUser:35
+msgid "Comments"
+msgstr "Poznámky"
+
+#: html/Ticket/ModifyAll.html:70 html/Ticket/Update.html:70
+msgid "Comments (Not sent to requestors)"
+msgstr "Komentář (Neposílá se žadatelům)"
+
+#: html/Search/Bulk.html:122
+msgid "Comments (not sent to requestors)"
+msgstr "Komentář (nepošle se žadatelům)"
+
+#: html/Elements/ViewUser:27
+#. ($name)
+msgid "Comments about %1"
+msgstr "Poznámky o %1"
+
+#: html/Admin/Users/Modify.html:185 html/Ticket/Elements/ShowRequestor:44
+msgid "Comments about this user"
+msgstr "Poznámky o tomto uživateli"
+
+#: lib/RT/Transaction_Overlay.pm:545
+msgid "Comments added"
+msgstr "Komentáře přidány"
+
+#: lib/RT/Action/Generic.pm:140
+msgid "Commit Stubbed"
+msgstr "Commit v zárodku"
+
+#: NOT FOUND IN SOURCE
+msgid "Compile Restrictions"
+msgstr "Omezení překladu"
+
+#: html/Admin/Elements/EditScrip:41
+msgid "Condition"
+msgstr "Podmínka"
+
+#: bin/rt-crontool:109
+msgid "Condition matches..."
+msgstr "Podmínky splněny..."
+
+#: lib/RT/Scrip_Overlay.pm:160
+msgid "Condition not found"
+msgstr "Podmínka nenalezena"
+
+#: html/Elements/Tabs:52
+msgid "Configuration"
+msgstr "Správa"
+
+#: html/SelfService/Prefs.html:33
+msgid "Confirm"
+msgstr "Potvrzení"
+
+#: html/Admin/Elements/ModifyUser:60
+msgid "ContactInfoSystem"
+msgstr "Kontaktní informa�ní systém"
+
+#: NOT FOUND IN SOURCE
+msgid "Contacted date '%1' could not be parsed"
+msgstr "Datum kontaktu '%1' nemůže být rozpoznáno"
+
+#: html/Admin/Elements/ModifyTemplate:44 html/Ticket/ModifyAll.html:87
+msgid "Content"
+msgstr "Obsah"
+
+#: etc/initialdata:266
+msgid "Correspondence"
+msgstr "Korespondence"
+
+#: html/Admin/Elements/ModifyQueue:39 html/Admin/Queues/Modify.html:51
+msgid "Correspondence Address"
+msgstr "Adresa pro korespondenci"
+
+#: lib/RT/Transaction_Overlay.pm:541
+msgid "Correspondence added"
+msgstr "Korespondence zaznamenána"
+
+#: NOT FOUND IN SOURCE
+msgid "Correspondence not recorded"
+msgstr "Korespondence nebyla zaznamenána"
+
+#: lib/RT/Ticket_Overlay.pm:3458
+msgid "Could not add new custom field value for ticket. "
+msgstr "Nelze přidat novou hodnotu uživatelské položky požadavku. "
+
+#: lib/RT/Ticket_Overlay.pm:2963 lib/RT/Ticket_Overlay.pm:2971 lib/RT/Ticket_Overlay.pm:2987
+msgid "Could not change owner. "
+msgstr "Nelze změnit vlastníka. "
+
+#: html/Admin/Elements/EditCustomField:68 html/Admin/Elements/EditCustomFields:166
+#. ($msg)
+msgid "Could not create CustomField"
+msgstr "Nelze vytvořit Uživatelskou položku"
+
+#: html/User/Groups/Modify.html:77 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
+msgid "Could not create group"
+msgstr "Nelze vytvořit skupinu"
+
+#: html/Admin/Global/Template.html:75 html/Admin/Queues/Template.html:72
+#. ($msg)
+msgid "Could not create template: %1"
+msgstr "Nelze vytvořit vzor: %1"
+
+#: lib/RT/Ticket_Overlay.pm:1073 lib/RT/Ticket_Overlay.pm:333
+msgid "Could not create ticket. Queue not set"
+msgstr "Nelze vytvořit požadavek. Nenastavena fronta"
+
+#: lib/RT/User_Overlay.pm:208 lib/RT/User_Overlay.pm:220 lib/RT/User_Overlay.pm:238 lib/RT/User_Overlay.pm:414
+msgid "Could not create user"
+msgstr "Nelze vytvořit uživatele"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find a ticket with id %1"
+msgstr "Nelze nalézt požadavek s identifikátorem %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find group %1."
+msgstr "Nelze nalézt skupinu %1."
+
+#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1422
+msgid "Could not find or create that user"
+msgstr "Tohoto uživatele nelze nalézt nebo vytvořit"
+
+#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1501
+msgid "Could not find that principal"
+msgstr "Nelze naléze tohoto uživatele"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find user %1."
+msgstr "Nelze nalézt uživatele %1."
+
+#: html/Admin/Groups/Members.html:88 html/User/Groups/Members.html:90 html/User/Groups/Modify.html:82
+msgid "Could not load group"
+msgstr "Nelze na�íst skupinu"
+
+#: lib/RT/Queue_Overlay.pm:641
+#. ($args{'Type'})
+msgid "Could not make that principal a %1 for this queue"
+msgstr "Tento uživatel nemůže být %1 této fronty"
+
+#: lib/RT/Ticket_Overlay.pm:1443
+#. ($self->loc($args{'Type'}))
+msgid "Could not make that principal a %1 for this ticket"
+msgstr "Tento uživatel nemůže být %1 tohoto požadavku"
+
+#: lib/RT/Queue_Overlay.pm:740
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this queue"
+msgstr "Tento uživatel nemůže být odstraněn jako %1 této fronty"
+
+#: lib/RT/Ticket_Overlay.pm:1559
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this ticket"
+msgstr "Tento uživatel nemůže být odstraněn jako %1 tohoto požadavku"
+
+#: lib/RT/Group_Overlay.pm:985
+msgid "Couldn't add member to group"
+msgstr "Do skupiny nelze přidat �lena"
+
+#: lib/RT/Ticket_Overlay.pm:3468 lib/RT/Ticket_Overlay.pm:3524
+#. ($Msg)
+msgid "Couldn't create a transaction: %1"
+msgstr "Nelze vytvořit transakci: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't figure out what to do from gpg's reply\\n"
+msgstr "Nelze zjistit co dělat s gpg odpovědí\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find group\\n"
+msgstr "Skupinu nelze nalézt\\n"
+
+#: lib/RT/Interface/Web.pm:866
+msgid "Couldn't find row"
+msgstr "Nemohu nalézt sloupec"
+
+#: lib/RT/Group_Overlay.pm:959
+msgid "Couldn't find that principal"
+msgstr "Tohoto uživatele nelze nalézt"
+
+#: lib/RT/CustomField_Overlay.pm:175
+msgid "Couldn't find that value"
+msgstr "Tuto hodnotu nelze nalézt"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find user\\n"
+msgstr "Uživatele nelze nalézt\\n"
+
+#: lib/RT/CurrentUser.pm:112
+#. ($self->Id)
+msgid "Couldn't load %1 from the users database.\\n"
+msgstr "Z uživatelské databáze nelze na�íst %1.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load RT config file '%1' %2"
+msgstr "Konfigura�ní soubor RT '%1'nelze na�íst %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load Scrips."
+msgstr "Scripy nelze na�íst."
+
+#: html/Admin/Groups/GroupRights.html:88 html/Admin/Groups/UserRights.html:75
+#. ($id)
+msgid "Couldn't load group %1"
+msgstr "Skupinu %1 nelze na�íst"
+
+#: lib/RT/Link_Overlay.pm:175 lib/RT/Link_Overlay.pm:184 lib/RT/Link_Overlay.pm:211
+msgid "Couldn't load link"
+msgstr "Vazbu nelze na�íst"
+
+#: html/Admin/Elements/EditCustomFields:147 html/Admin/Queues/People.html:121
+#. ($id)
+msgid "Couldn't load queue"
+msgstr "Frontu nelze na�íst"
+
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:72
+#. ($id)
+msgid "Couldn't load queue %1"
+msgstr "Frontu %1 nelze na�íst"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load scrip"
+msgstr "Scrip nelze na�íst"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load template"
+msgstr "Vzor nelze na�íst"
+
+#: html/Admin/Users/Prefs.html:79
+#. ($id)
+msgid "Couldn't load that user (%1)"
+msgstr "Uživatele (%1) nelze na�íst"
+
+#: html/SelfService/Display.html:166
+#. ($id)
+msgid "Couldn't load ticket '%1'"
+msgstr "Požadavek '%1' nelze na�íst"
+
+#: html/Admin/Elements/ModifyUser:86 html/Admin/Users/Modify.html:149 html/User/Prefs.html:98
+msgid "Country"
+msgstr "ZemÄ›"
+
+#: html/Admin/Elements/CreateUserCalled:26 html/Ticket/Create.html:135 html/Ticket/Create.html:195
+msgid "Create"
+msgstr "Vytvořit"
+
+#: etc/initialdata:128
+msgid "Create Tickets"
+msgstr "Vytvořit požadavky"
+
+#: html/Admin/Elements/EditCustomField:58
+msgid "Create a CustomField"
+msgstr "Vytvořit uživatelskou položku"
+
+#: html/Admin/Queues/CustomField.html:48
+#. ($QueueObj->Name())
+msgid "Create a CustomField for queue %1"
+msgstr "Vytvoření uživatelské položky pro frontu %1"
+
+#: html/Admin/Global/CustomField.html:48
+msgid "Create a CustomField which applies to all queues"
+msgstr "Vytvoření uživatelské položky pro všechny front"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new Custom Field"
+msgstr "Vytvořit novou uživatelskou položku"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global scrip"
+msgstr "Vytvořit nový globální scrip"
+
+#: html/Admin/Groups/Modify.html:67 html/Admin/Groups/Modify.html:93
+msgid "Create a new group"
+msgstr "Vytvořit novou skupinu"
+
+#: html/User/Groups/Modify.html:67 html/User/Groups/Modify.html:92
+msgid "Create a new personal group"
+msgstr "Vytvořit novou vlastní skupinu"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new queue"
+msgstr "Vytvořit novou frontu"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new scrip"
+msgstr "Vytvořit nový scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new template"
+msgstr "Vytvořit nový vzor"
+
+#: html/SelfService/Create.html:30 html/Ticket/Create.html:25 html/Ticket/Create.html:28 html/Ticket/Create.html:36
+msgid "Create a new ticket"
+msgstr "Vytvoření nového požadavku"
+
+#: html/Admin/Users/Modify.html:214 html/Admin/Users/Modify.html:241
+msgid "Create a new user"
+msgstr "Vytvořit nového uživatele"
+
+#: html/Admin/Queues/Modify.html:103
+msgid "Create a queue"
+msgstr "Vytvořit frontu"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a queue called"
+msgstr "Vytvořit frontu nazvanou"
+
+#: html/SelfService/Create.html:25 html/SelfService/Create.html:27
+msgid "Create a request"
+msgstr "Vytvořit požadavek"
+
+#: html/Admin/Queues/Scrip.html:59
+#. ($QueueObj->Name)
+msgid "Create a scrip for queue %1"
+msgstr "Vytvořit scrips pro frontu %1"
+
+#: html/Admin/Global/Template.html:69 html/Admin/Queues/Template.html:65
+msgid "Create a template"
+msgstr "Vytvořit vzor"
+
+#: etc/initialdata:130
+msgid "Create new tickets based on this scrip's template"
+msgstr "Vytvářet požadavky podle toho vzoru scripu"
+
+#: html/SelfService/Create.html:81
+msgid "Create ticket"
+msgstr "Vytvořit požadavek"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "Create tickets in this queue"
+msgstr "Vytvářet požadavky v této frontě"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "Create, delete and modify custom fields"
+msgstr "Vytvářet, mazat a měnit uživatelen definované položky"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "Create, delete and modify queues"
+msgstr "Vytvářet, mazat a měnit fronty"
+
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
+msgstr "Vytvářet, mazat a měnit �leny uživatelských osobních skupin"
+
+#: lib/RT/System.pm:59
+msgid "Create, delete and modify the members of personal groups"
+msgstr "Vytvářet, mazat a měnit �leny osobních skupin"
+
+#: lib/RT/System.pm:60
+msgid "Create, delete and modify users"
+msgstr "Vytvářen, mazat a měnit uživatele"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "CreateTicket"
+msgstr "Vytvořit požadavek"
+
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1167
+msgid "Created"
+msgstr "Vytvořeno"
+
+#: html/Admin/Elements/EditCustomField:71
+#. ($CustomFieldObj->Name())
+msgid "Created CustomField %1"
+msgstr "Uživatelská položka %1 vytvořena"
+
+#: NOT FOUND IN SOURCE
+msgid "Created template %1"
+msgstr "Vzor %1 vytvořen"
+
+#: html/Ticket/Elements/EditLinks:28
+msgid "Current Relationships"
+msgstr "Aktuální relace"
+
+#: html/Admin/Elements/EditScrips:30
+msgid "Current Scrips"
+msgstr "Aktuální scripy"
+
+#: html/Admin/Groups/Members.html:39 html/User/Groups/Members.html:42
+msgid "Current members"
+msgstr "Aktuální �lenové"
+
+#: html/Admin/Elements/SelectRights:29
+msgid "Current rights"
+msgstr "Aktuální práva"
+
+#: html/Search/Listing.html:71
+msgid "Current search criteria"
+msgstr "Aktuální vyhledávací podmínky"
+
+#: html/Admin/Queues/People.html:41 html/Ticket/Elements/EditPeople:45
+msgid "Current watchers"
+msgstr "Aktuální pozorovatelé"
+
+#: html/Admin/Global/CustomField.html:55
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr "Uživatelská položka #%1"
+
+#: html/Admin/Elements/QueueTabs:53 html/Admin/Elements/SystemTabs:40 html/Admin/Global/index.html:50 html/Ticket/Elements/ShowSummary:35
+msgid "Custom Fields"
+msgstr "Uživatelské položky"
+
+#: html/Admin/Elements/EditScrip:73
+msgid "Custom action cleanup code"
+msgstr "Čistící kód uživatelské akce"
+
+#: html/Admin/Elements/EditScrip:65
+msgid "Custom action preparation code"
+msgstr "Přípravný kód uživatelské akce"
+
+#: html/Admin/Elements/EditScrip:49
+msgid "Custom condition"
+msgstr "Uživatelská podmínka"
+
+#: lib/RT/Tickets_Overlay.pm:1618
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
+msgid "Custom field %1 %2 %3"
+msgstr "Užitavelská položka %1 %2 %3"
+
+#: lib/RT/Tickets_Overlay.pm:1613
+#. ($CF->Name)
+msgid "Custom field %1 has a value."
+msgstr "Uživatelská položka %1 má hodnotu."
+
+#: lib/RT/Tickets_Overlay.pm:1610
+#. ($CF->Name)
+msgid "Custom field %1 has no value."
+msgstr "Uživatelská položka %1 nemá hodnotu."
+
+#: lib/RT/Ticket_Overlay.pm:3360
+#. ($args{'Field'})
+msgid "Custom field %1 not found"
+msgstr "Uživatelská položka %1 nenalezena"
+
+#: html/Admin/Elements/EditCustomFields:197
+msgid "Custom field deleted"
+msgstr "Uživatelská položka smazána"
+
+#: lib/RT/Ticket_Overlay.pm:3510
+msgid "Custom field not found"
+msgstr "Uživatelská položka nenalezena"
+
+#: lib/RT/CustomField_Overlay.pm:283
+#. ($args{'Content'}, $self->Name)
+msgid "Custom field value %1 could not be found for custom field %2"
+msgstr "Hodnota %1 nemůže být nalezena v uživatelské položce %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Custom field value changed from %1 to %2"
+msgstr "Hodnota uživatelské položky změněna z %1 na %2"
+
+#: lib/RT/CustomField_Overlay.pm:185
+msgid "Custom field value could not be deleted"
+msgstr "Hodnota uživatelské položky nemůže být smazána"
+
+#: lib/RT/CustomField_Overlay.pm:289
+msgid "Custom field value could not be found"
+msgstr "Hodnota uživatelské položky nemůže být nalezena"
+
+#: lib/RT/CustomField_Overlay.pm:183 lib/RT/CustomField_Overlay.pm:291
+msgid "Custom field value deleted"
+msgstr "Hodnota uživatelské položky smazána"
+
+#: lib/RT/Transaction_Overlay.pm:550
+msgid "CustomField"
+msgstr "Uživatelská položka"
+
+#: html/Ticket/Create.html:161 html/Ticket/Elements/ShowSummary:53 html/Ticket/Elements/Tabs:93 html/Ticket/ModifyAll.html:44
+msgid "Dates"
+msgstr "Datumy"
+
+#: lib/RT/Date.pm:422
+msgid "Dec."
+msgstr "pro"
+
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr "Implicitní vzor automatické odpovědi"
+
+#: etc/initialdata:207
+msgid "Default Autoresponse template"
+msgstr "Implicitní vzor automatické odpovědi"
+
+#: etc/initialdata:275
+msgid "Default admin comment template"
+msgstr "Implicitní vzor administrativního komentáře"
+
+#: etc/initialdata:257
+msgid "Default admin correspondence template"
+msgstr "Implicitní vzor administrativní korespondence"
+
+#: etc/initialdata:267
+msgid "Default correspondence template"
+msgstr "Implicitní koresponden�ní vzor"
+
+#: etc/initialdata:238
+msgid "Default transaction template"
+msgstr "Implicitní transak�ní vzor"
+
+#: lib/RT/Transaction_Overlay.pm:645
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr "Defaulní: %1/%2 změněno z %3 na %4"
+
+#: html/User/Delegation.html:25 html/User/Delegation.html:28
+msgid "Delegate rights"
+msgstr "Delegovat práva"
+
+#: lib/RT/System.pm:63
+msgid "Delegate specific rights which have been granted to you."
+msgstr "Delegovat specifická práva, která vám byla poskytnuta."
+
+#: lib/RT/System.pm:63
+msgid "DelegateRights"
+msgstr "Delegovat práva"
+
+#: html/User/Elements/Tabs:38
+msgid "Delegation"
+msgstr "Pověření"
+
+#: NOT FOUND IN SOURCE
+msgid "Delete"
+msgstr "Smazat"
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "Delete tickets"
+msgstr "Mazat požadavky"
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "DeleteTicket"
+msgstr "Smazat požadavek"
+
+#: lib/RT/Transaction_Overlay.pm:187
+msgid "Deleting this object could break referential integrity"
+msgstr "Smazání tohoto objektu mohlo porušit referen�ní integritu"
+
+#: lib/RT/Queue_Overlay.pm:292
+msgid "Deleting this object would break referential integrity"
+msgstr "Smazání tohoto objektu by mohlo porušit referen�ní integritu"
+
+#: lib/RT/User_Overlay.pm:430
+msgid "Deleting this object would violate referential integrity"
+msgstr "Smazání tohoto objektu by mohlo narušit referen�ní integritu"
+
+#: html/Approvals/Elements/Approve:46
+msgid "Deny"
+msgstr "Zamítnout"
+
+#: html/Ticket/Create.html:181 html/Ticket/Elements/EditLinks:123 html/Ticket/Elements/EditLinks:47 html/Ticket/Elements/ShowDependencies:32 html/Ticket/Elements/ShowLinks:35
+msgid "Depended on by"
+msgstr "Je rekvizitou pro"
+
+#: NOT FOUND IN SOURCE
+msgid "Dependencies: \\n"
+msgstr "Závistlosti: \\n"
+
+#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:180 html/Ticket/Elements/EditLinks:119 html/Ticket/Elements/EditLinks:36 html/Ticket/Elements/ShowDependencies:25 html/Ticket/Elements/ShowLinks:27
+msgid "Depends on"
+msgstr "Závisející na"
+
+#: html/Elements/SelectSortOrder:35
+msgid "Descending"
+msgstr "SestupnÄ›"
+
+#: html/SelfService/Create.html:75 html/Ticket/Create.html:119
+msgid "Describe the issue below"
+msgstr "Popište případ níže"
+
+#: html/Admin/Elements/AddCustomFieldValue:27 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyQueue:36 html/Admin/Elements/ModifyTemplate:36 html/Admin/Groups/Modify.html:49 html/Admin/Queues/Modify.html:48 html/Elements/SelectGroups:27 html/User/Groups/Modify.html:49
+msgid "Description"
+msgstr "Popis"
+
+#: html/SelfService/Elements/MyRequests:44
+msgid "Details"
+msgstr "Podrobnosti"
+
+#: html/Ticket/Elements/Tabs:85
+msgid "Display"
+msgstr "Zobrazit"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "Display Access Control List"
+msgstr "Zobrazit přístupová práva"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "Display Scrip templates for this queue"
+msgstr "Zobrazovat scrips vzory pro tuto frontu"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "Display Scrips for this queue"
+msgstr "Zobrazovat scripy pro tuto frontu"
+
+#: html/Ticket/Elements/ShowHistory:35
+msgid "Display mode"
+msgstr "Režim zobrazení"
+
+#: html/SelfService/Display.html:25 html/SelfService/Display.html:29
+#. ($Ticket->id)
+msgid "Display ticket #%1"
+msgstr "Zobraz požadavek #%1"
+
+#: lib/RT/System.pm:54
+msgid "Do anything and everything"
+msgstr "Dělat cokoli a všechno"
+
+#: html/Elements/Refresh:30
+msgid "Don't refresh this page."
+msgstr "Neob�erstvovat tuto stránku."
+
+#: html/Search/Elements/PickRestriction:114
+msgid "Don't show search results"
+msgstr "Nezobrazit výsledky hledání"
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "Download"
+msgstr "Stáhnout"
+
+#: html/Elements/SelectDateType:32 html/Ticket/Create.html:167 html/Ticket/Elements/EditDates:45 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1171
+msgid "Due"
+msgstr "Termín dokon�ení"
+
+#: NOT FOUND IN SOURCE
+msgid "Due date '%1' could not be parsed"
+msgstr "Datum termínu dokon�ení '%1' nemůže být rozpoznán"
+
+#: bin/rt-commit-handler:754
+#. ($1, $msg)
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
+msgstr "CHYBA: Nelze na�íst požadavek '%1': %2.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit"
+msgstr "Upravit"
+
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr "Upravit uživatelské položky pro %1"
+
+#: html/Ticket/ModifyLinks.html:36
+msgid "Edit Relationships"
+msgstr "Upravit relace"
+
+#: html/Admin/Queues/Templates.html:41
+#. ($QueueObj->Name)
+msgid "Edit Templates for queue %1"
+msgstr "Upravit vzory pro frontu %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr "Upravit scprips"
+
+#: html/Admin/Global/index.html:46
+msgid "Edit system templates"
+msgstr "Úprava systémových vzorů"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit templates for %1"
+msgstr "Upravit vzory pro %1"
+
+#: html/Admin/Elements/ModifyQueue:25 html/Admin/Queues/Modify.html:117
+#. ($QueueObj->Name)
+#. ($QueueObj->Id)
+msgid "Editing Configuration for queue %1"
+msgstr "Úprava konfigurace pro frontu %1"
+
+#: html/Admin/Elements/ModifyUser:25
+#. ($UserObj->Name)
+msgid "Editing Configuration for user %1"
+msgstr "Úprava konfigurace pro uživatele %1"
+
+#: html/Admin/Elements/EditCustomField:74
+#. ($CustomFieldObj->Name())
+msgid "Editing CustomField %1"
+msgstr "Úprava uživatelské položky %1"
+
+#: html/Admin/Groups/Members.html:32
+#. ($Group->Name)
+msgid "Editing membership for group %1"
+msgstr "Úprava �lenství ve skupině %1"
+
+#: html/User/Groups/Members.html:129
+#. ($Group->Name)
+msgid "Editing membership for personal group %1"
+msgstr "Úprava �lenství ve vlastní skupině %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Editing template %1"
+msgstr "Úprava vzoru %1"
+
+#: lib/RT/Ticket_Overlay.pm:2615 lib/RT/Ticket_Overlay.pm:2683
+msgid "Either base or target must be specified"
+msgstr "Zdroj �i cíl musí být zadány"
+
+#: html/Admin/Users/Modify.html:53 html/Admin/Users/Prefs.html:46 html/Elements/SelectUsers:27 html/Ticket/Elements/AddWatchers:56 html/User/Prefs.html:42
+msgid "Email"
+msgstr "Email"
+
+#: lib/RT/User_Overlay.pm:188
+msgid "Email address in use"
+msgstr "Email adresa je použita"
+
+#: html/Admin/Elements/ModifyUser:42
+msgid "EmailAddress"
+msgstr "Email adresa"
+
+#: html/Admin/Elements/ModifyUser:54
+msgid "EmailEncoding"
+msgstr "Kódování emailu"
+
+#: html/Admin/Elements/EditCustomField:36
+msgid "Enabled (Unchecking this box disables this custom field)"
+msgstr "Povolena (zrušením zatrhnutí zablokujete tuto uživatelskou položky)"
+
+#: html/Admin/Groups/Modify.html:53 html/User/Groups/Modify.html:53
+msgid "Enabled (Unchecking this box disables this group)"
+msgstr "Povolena (zrušením zatrhnutí zablokujete tuto skupinu)"
+
+#: html/Admin/Queues/Modify.html:84
+msgid "Enabled (Unchecking this box disables this queue)"
+msgstr "Povoleno (zrušení zatrhnutí zablokuje tuto frontu)"
+
+#: html/Admin/Elements/EditCustomFields:99
+msgid "Enabled Custom Fields"
+msgstr "Povolené uživatelské položky"
+
+#: html/Admin/Queues/index.html:56
+msgid "Enabled Queues"
+msgstr "Povolené fronty"
+
+#: html/Admin/Elements/EditCustomField:90 html/Admin/Groups/Modify.html:117 html/Admin/Queues/Modify.html:138 html/Admin/Users/Modify.html:283 html/User/Groups/Modify.html:117
+#. (loc_fuzzy($msg))
+msgid "Enabled status %1"
+msgstr "Povolen stav %1"
+
+#: lib/RT/CustomField_Overlay.pm:361
+msgid "Enter multiple values"
+msgstr "Vyplnit více hodnot"
+
+#: lib/RT/CustomField_Overlay.pm:358
+msgid "Enter one value"
+msgstr "Vyplnit jednu hodnotu"
+
+#: html/Ticket/Elements/EditLinks:112
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "Zadejte požadavky �i URI se nimiž požadavky svázat. Oddělte více položek mezerami."
+
+#: html/Elements/Login:29 html/SelfService/Error.html:25 html/SelfService/Error.html:26
+msgid "Error"
+msgstr "Chyba"
+
+#: lib/RT/Queue_Overlay.pm:555
+msgid "Error in parameters to Queue->AddWatcher"
+msgstr "Chyba v parametrech do Queue->AddWatcher"
+
+#: lib/RT/Queue_Overlay.pm:713
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr "Chyba v parametrech do Queue->DelWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1356
+msgid "Error in parameters to Ticket->AddWatcher"
+msgstr "Chyba v parametrech do Ticket->AddWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1532
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr "Chyba v parametrech do Ticket->DelWatcher"
+
+#: etc/initialdata:20
+msgid "Everyone"
+msgstr "Kdokoli"
+
+#: bin/rt-crontool:194
+msgid "Example:"
+msgstr "Příklad:"
+
+#: html/Admin/Elements/ModifyUser:64
+msgid "ExternalAuthId"
+msgstr "Identifikátor externí autentizace"
+
+#: html/Admin/Elements/ModifyUser:58
+msgid "ExternalContactInfoId"
+msgstr "Identifikátor externího kontaktu"
+
+#: html/Admin/Users/Modify.html:73
+msgid "Extra info"
+msgstr "Doplňkové údaje"
+
+#: lib/RT/User_Overlay.pm:302
+msgid "Failed to find 'Privileged' users pseudogroup."
+msgstr "Nepovedlo se nalézt uživatele 'Privilegované' pseudoskupiny."
+
+#: lib/RT/User_Overlay.pm:309
+msgid "Failed to find 'Unprivileged' users pseudogroup"
+msgstr "Nepovedlo se nalézt uživatele 'Neprivilegované' pseudoskupiny"
+
+#: bin/rt-crontool:138
+#. ($modname, $@)
+msgid "Failed to load module %1. (%2)"
+msgstr "Nepovedlo se nahrát modul %1. (%2)"
+
+#: lib/RT/Date.pm:412
+msgid "Feb."
+msgstr "úno"
+
+#: NOT FOUND IN SOURCE
+msgid "Fin"
+msgstr "Kon"
+
+#: html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:59 lib/RT/Tickets_Overlay.pm:1091
+msgid "Final Priority"
+msgstr "Koncová priorita"
+
+#: lib/RT/Ticket_Overlay.pm:1162
+msgid "FinalPriority"
+msgstr "Koncová priorita"
+
+#: html/Admin/Queues/People.html:61 html/Ticket/Elements/EditPeople:34
+msgid "Find group whose"
+msgstr "Najít skupiny které"
+
+#: html/Elements/Quicksearch:25
+msgid "Find new/open tickets"
+msgstr "Najít nové/otevřené požadavky"
+
+#: html/Admin/Queues/People.html:57 html/Admin/Users/index.html:46 html/Ticket/Elements/EditPeople:30
+msgid "Find people whose"
+msgstr "Najít ty, jejichž"
+
+#: html/Search/Listing.html:108
+msgid "Find tickets"
+msgstr "Nalézt požadavky"
+
+#: NOT FOUND IN SOURCE
+msgid "Finish Approval"
+msgstr "Závere�né schválení"
+
+#: html/Ticket/Elements/Tabs:58
+msgid "First"
+msgstr "První"
+
+#: html/Search/Listing.html:41
+msgid "First page"
+msgstr "První stránka"
+
+#: docs/design_docs/string-extraction-guide.txt:33
+msgid "Foo Bar Baz"
+msgstr "Foo Bar Baz"
+
+#: docs/design_docs/string-extraction-guide.txt:24
+msgid "Foo!"
+msgstr "Foo!"
+
+#: html/Search/Bulk.html:87
+msgid "Force change"
+msgstr "Vynutit změnu"
+
+#: html/Search/Listing.html:106
+#. ($ticketcount)
+msgid "Found %quant(%1,ticket)"
+msgstr "Nalezen%quant(%1,,y,o) %numf(%1) %quant(%1,požadavek,požadavky,požadavků)"
+
+#: lib/RT/Interface/Web.pm:868
+msgid "Found Object"
+msgstr "Nalezen objekt"
+
+#: html/Admin/Elements/ModifyUser:44
+msgid "FreeformContactInfo"
+msgstr "Kontaktní údaje ve volné podobě"
+
+#: lib/RT/CustomField_Overlay.pm:38
+msgid "FreeformMultiple"
+msgstr "Volná forma vícenásobně"
+
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformSingle"
+msgstr "Volná formu jedinkrát"
+
+#: lib/RT/Date.pm:392
+msgid "Fri."
+msgstr "pá"
+
+#: html/Ticket/Elements/ShowHistory:41 html/Ticket/Elements/ShowHistory:51
+msgid "Full headers"
+msgstr "Celé hlavi�ky"
+
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr "Aktuální uživatel se získává z PGP podpisu\\n"
+
+#: lib/RT/Transaction_Overlay.pm:595
+#. ($New->Name)
+msgid "Given to %1"
+msgstr "Dán %1"
+
+#: html/Admin/Elements/Tabs:41 html/Admin/index.html:38
+msgid "Global"
+msgstr "Globální"
+
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
+msgstr "Globální Scrips"
+
+#: html/Admin/Elements/SelectTemplate:38
+#. (loc($Template->Name))
+msgid "Global template: %1"
+msgstr "Globální vzor: %1"
+
+#: html/Admin/Elements/EditCustomFields:75 html/Admin/Queues/People.html:59 html/Admin/Queues/People.html:63 html/Admin/Queues/index.html:44 html/Admin/Users/index.html:49 html/Ticket/Elements/EditPeople:32 html/Ticket/Elements/EditPeople:36 html/index.html:41
+msgid "Go!"
+msgstr "Spusť!"
+
+#: NOT FOUND IN SOURCE
+msgid "Good pgp sig from %1\\n"
+msgstr "Správný PGP podpis od %1\\n"
+
+#: html/Search/Listing.html:50
+msgid "Goto page"
+msgstr "Přejít na stránku"
+
+#: html/Elements/GotoTicket:25 html/SelfService/Elements/GotoTicket:25
+msgid "Goto ticket"
+msgstr "Přejít na požadavek"
+
+#: html/Ticket/Elements/AddWatchers:46 html/User/Elements/DelegateRights:78
+msgid "Group"
+msgstr "Skupina"
+
+#: NOT FOUND IN SOURCE
+msgid "Group %1 %2: %3"
+msgstr "Skupina %1 %2: %3"
+
+#: html/Admin/Elements/GroupTabs:45 html/Admin/Elements/QueueTabs:57 html/Admin/Elements/SystemTabs:44 html/Admin/Global/index.html:55
+msgid "Group Rights"
+msgstr "Práva skupiny"
+
+#: lib/RT/Group_Overlay.pm:965
+msgid "Group already has member"
+msgstr "Skupina již má �lena"
+
+#: html/Admin/Groups/Modify.html:77
+#. ($create_msg)
+msgid "Group could not be created: %1"
+msgstr "Skupina nemůže být založena: %1"
+
+#: lib/RT/Group_Overlay.pm:497
+msgid "Group created"
+msgstr "Skupina vytvořena"
+
+#: lib/RT/Group_Overlay.pm:1133
+msgid "Group has no such member"
+msgstr "Skupina nemá takového �lena"
+
+#: lib/RT/Group_Overlay.pm:945 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1429 lib/RT/Ticket_Overlay.pm:1507
+msgid "Group not found"
+msgstr "Skupina nenalezena"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not found.\\n"
+msgstr "Skupina nenalezena.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not specified.\\n"
+msgstr "Skupina neudána.\\n"
+
+#: html/Admin/Elements/SelectNewGroupMembers:35 html/Admin/Elements/Tabs:35 html/Admin/Groups/Members.html:64 html/Admin/Queues/People.html:83 html/Admin/index.html:32 html/User/Groups/Members.html:67
+msgid "Groups"
+msgstr "Skupiny"
+
+#: lib/RT/Group_Overlay.pm:971
+msgid "Groups can't be members of their members"
+msgstr "Skupiny nemohou být svými �leny"
+
+#: lib/RT/Interface/CLI.pm:73 lib/RT/Interface/CLI.pm:73
+msgid "Hello!"
+msgstr "Ahoj!"
+
+#: docs/design_docs/string-extraction-guide.txt:40
+#. ($name)
+msgid "Hello, %1"
+msgstr "Ahoj, %1"
+
+#: html/Ticket/Elements/ShowHistory:30 html/Ticket/Elements/Tabs:88
+msgid "History"
+msgstr "Historie"
+
+#: html/Admin/Elements/ModifyUser:68
+msgid "HomePhone"
+msgstr "Telefon domů"
+
+#: html/Elements/Tabs:46
+msgid "Homepage"
+msgstr "Domovská stránka"
+
+#: lib/RT/Base.pm:74
+#. (6)
+msgid "I have %quant(%1,concrete mixer)."
+msgstr "Mám %quant(%1,mícha�ka,mícha�ky,mícha�ek)"
+
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
+msgstr "I have [quant,_1,concrete mixer]."
+
+#msgstr "Mám [quant,_1,Mícha�ku na beton,Mícha�ky na beton,Mícha�ek na beton]."
+#: html/Ticket/Elements/ShowBasics:27 lib/RT/Tickets_Overlay.pm:1018
+msgid "Id"
+msgstr "Identifikátor"
+
+#: html/Admin/Users/Modify.html:44 html/User/Prefs.html:39
+msgid "Identity"
+msgstr "Identita"
+
+#: etc/upgrade/2.1.71:86
+msgid "If an approval is rejected, reject the original and delete pending approvals"
+msgstr "Odmítni původce a zruš stávající schválení, bylo-li zamítnuto schválení"
+
+#: bin/rt-crontool:190
+msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
+msgstr "Byl-li tento nástroj setgid, místní uživatel jej mohl použit k získaní administrativního přístupu k RT"
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
+msgid "If you've updated anything above, be sure to"
+msgstr "Pokud jste změnili cokoli nahoře, nezapomeňte"
+
+#: lib/RT/Interface/Web.pm:860
+msgid "Illegal value for %1"
+msgstr "Neplatná hodnota pro %1"
+
+#: lib/RT/Interface/Web.pm:863
+msgid "Immutable field"
+msgstr "Neměnitelná položka"
+
+#: html/Admin/Elements/EditCustomFields:74
+msgid "Include disabled custom fields in listing."
+msgstr "Zahrnout do výpisu blokované uživatelské položky"
+
+#: html/Admin/Queues/index.html:43
+msgid "Include disabled queues in listing."
+msgstr "Zahrnout blokované fronty do výpisu."
+
+#: html/Admin/Users/index.html:47
+msgid "Include disabled users in search."
+msgstr "Zahrnout blokované uživatele do vyhledávání."
+
+#: lib/RT/Tickets_Overlay.pm:1067
+msgid "Initial Priority"
+msgstr "Po�áte�ní priorita"
+
+#: lib/RT/Ticket_Overlay.pm:1161 lib/RT/Ticket_Overlay.pm:1163
+msgid "InitialPriority"
+msgstr "Po�áte�ní priorita"
+
+#: lib/RT/ScripAction_Overlay.pm:105
+msgid "Input error"
+msgstr "Chyba na vstupu"
+
+#: lib/RT/Ticket_Overlay.pm:3729
+msgid "Internal Error"
+msgstr "Vnitřní chyba"
+
+#: lib/RT/Record.pm:143
+#. ($id->{error_message})
+msgid "Internal Error: %1"
+msgstr "Vnitřní chyba: %1"
+
+#: lib/RT/Group_Overlay.pm:644
+msgid "Invalid Group Type"
+msgstr "Neplatný typ skupiny"
+
+#: lib/RT/Principal_Overlay.pm:128
+msgid "Invalid Right"
+msgstr "Neplatné právo"
+
+#: lib/RT/Interface/Web.pm:865
+msgid "Invalid data"
+msgstr "Neplatná data"
+
+#: lib/RT/Ticket_Overlay.pm:438
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr "Neplatný vlastník. Použije se 'nobody'."
+
+#: lib/RT/Scrip_Overlay.pm:134 lib/RT/Template_Overlay.pm:251
+msgid "Invalid queue"
+msgstr "Neplatná fronta"
+
+#: lib/RT/ACE_Overlay.pm:244 lib/RT/ACE_Overlay.pm:253 lib/RT/ACE_Overlay.pm:259 lib/RT/ACE_Overlay.pm:270 lib/RT/ACE_Overlay.pm:275
+msgid "Invalid right"
+msgstr "Neplatné právo"
+
+#: lib/RT/Record.pm:118
+#. ($key)
+msgid "Invalid value for %1"
+msgstr "Neplatná hodnota pro %1"
+
+#: lib/RT/Ticket_Overlay.pm:3367
+msgid "Invalid value for custom field"
+msgstr "Neplatná hodnota pro uživatelskou položku"
+
+#: lib/RT/Ticket_Overlay.pm:345
+msgid "Invalid value for status"
+msgstr "Neplatná hodnota pro stav"
+
+#: bin/rt-crontool:191
+msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
+msgstr "Je velmi důležité, aby neprivilegovaní uživatelé nemohli spustit tento nástroj."
+
+#: bin/rt-crontool:192
+msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
+msgstr "Pro spuštění tohoto nástroje se doporu�uje založení neprivilegovaného UNIX uživatele se správným skupinovým �lenstvím a přístupem do RT."
+
+#: bin/rt-crontool:163
+msgid "It takes several arguments:"
+msgstr "Používá několik parametrů:"
+
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
+msgstr "Věci o�ekávající mé schválení"
+
+#: lib/RT/Date.pm:411
+msgid "Jan."
+msgstr "led"
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "Join or leave this group"
+msgstr "Přidat se �i odebrat z této skupiny"
+
+#: lib/RT/Date.pm:417
+msgid "Jul."
+msgstr "�ec"
+
+#: html/Ticket/Elements/Tabs:99
+msgid "Jumbo"
+msgstr "Maxi"
+
+#: lib/RT/Date.pm:416
+msgid "Jun."
+msgstr "�en"
+
+#: NOT FOUND IN SOURCE
+msgid "Keyword"
+msgstr "Klí�ové slovo"
+
+#: html/Admin/Elements/ModifyUser:52
+msgid "Lang"
+msgstr "Jazyk"
+
+#: html/Ticket/Elements/Tabs:73
+msgid "Last"
+msgstr "Poslední"
+
+#: html/Ticket/Elements/EditDates:38 html/Ticket/Elements/ShowDates:39
+msgid "Last Contact"
+msgstr "Poslední kontakt"
+
+#: html/Elements/SelectDateType:29
+msgid "Last Contacted"
+msgstr "Naposled kontaktován"
+
+#: html/Search/Elements/TicketHeader:41
+msgid "Last Notified"
+msgstr "Naposled upozorněn"
+
+#: html/Elements/SelectDateType:30
+msgid "Last Updated"
+msgstr "Naposled aktualizován"
+
+#: NOT FOUND IN SOURCE
+msgid "Left"
+msgstr "Zbývá"
+
+#: html/Admin/Users/Modify.html:83
+msgid "Let this user access RT"
+msgstr "Umožnit tomuto uživateli přístup k RT"
+
+#: html/Admin/Users/Modify.html:87
+msgid "Let this user be granted rights"
+msgstr "Umožnit dávat tomuto uživateli práva"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting owner to %1 %2"
+msgstr "Vlastník omezen na %1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting queue to %1 %2"
+msgstr "Fronta omezena na %1 %2"
+
+#: lib/RT/Ticket_Overlay.pm:2697
+msgid "Link already exists"
+msgstr "Vazba již existuje"
+
+#: lib/RT/Ticket_Overlay.pm:2709
+msgid "Link could not be created"
+msgstr "Vazba nemůže být vytvořena"
+
+#: lib/RT/Ticket_Overlay.pm:2717 lib/RT/Ticket_Overlay.pm:2727
+#. ($TransString)
+msgid "Link created (%1)"
+msgstr "Vazba vytvořena (%1)"
+
+#: lib/RT/Ticket_Overlay.pm:2638
+#. ($TransString)
+msgid "Link deleted (%1)"
+msgstr "Vazba zrušena (%1)"
+
+#: lib/RT/Ticket_Overlay.pm:2644
+msgid "Link not found"
+msgstr "Vazba nenalezena"
+
+#: html/Ticket/ModifyLinks.html:25 html/Ticket/ModifyLinks.html:29
+#. ($Ticket->Id)
+msgid "Link ticket #%1"
+msgstr "Svázat požadavek #%1"
+
+#: html/Ticket/Elements/Tabs:97
+msgid "Links"
+msgstr "Vazby"
+
+#: html/Admin/Users/Modify.html:114 html/User/Prefs.html:85
+msgid "Location"
+msgstr "Umístění"
+
+#: lib/RT.pm:158
+#. ($RT::LogDir)
+msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
+msgstr "Záznamový adresář %1 nenalezen nebo doň nemůže být zapisováno.\\ RT nemůže běžet."
+
+#: html/Elements/Header:57
+#. ("<b>".$session{'CurrentUser'}->Name."</b>")
+msgid "Logged in as %1"
+msgstr "Přihlášen jako %1"
+
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:25 html/Elements/Login:34 html/Elements/Login:45
+msgid "Login"
+msgstr "Přihlásit"
+
+#: html/Elements/Header:54
+msgid "Logout"
+msgstr "Odhlásit"
+
+#: html/Search/Bulk.html:86
+msgid "Make Owner"
+msgstr "Nastavit vlastníka"
+
+#: html/Search/Bulk.html:102
+msgid "Make Status"
+msgstr "Nastavit stav"
+
+#: html/Search/Bulk.html:109
+msgid "Make date Due"
+msgstr "Nastavit datum termínu dokon�ení"
+
+#: html/Search/Bulk.html:110
+msgid "Make date Resolved"
+msgstr "Nastavit datum vyřešení"
+
+#: html/Search/Bulk.html:107
+msgid "Make date Started"
+msgstr "Nastavit datum, kdy za�al"
+
+#: html/Search/Bulk.html:106
+msgid "Make date Starts"
+msgstr "Nastavit datum, kdy za�ne"
+
+#: html/Search/Bulk.html:108
+msgid "Make date Told"
+msgstr "Nastavit datum posledního kontaktu"
+
+#: html/Search/Bulk.html:99
+msgid "Make priority"
+msgstr "Nastavit prioritu"
+
+#: html/Search/Bulk.html:100
+msgid "Make queue"
+msgstr "Nastavit frontu"
+
+#: html/Search/Bulk.html:98
+msgid "Make subject"
+msgstr "Nastavit předmět"
+
+#: html/Admin/index.html:33
+msgid "Manage groups and group membership"
+msgstr "Správa skupin a �lenství v nich"
+
+#: html/Admin/index.html:39
+msgid "Manage properties and configuration which apply to all queues"
+msgstr "Správa vlastností a konfigurací platných ve všech frontách"
+
+#: html/Admin/index.html:36
+msgid "Manage queues and queue-specific properties"
+msgstr "Správa front a jim příslušných vlastností"
+
+#: html/Admin/index.html:30
+msgid "Manage users and passwords"
+msgstr "Správa uživatelů a hesel"
+
+#: lib/RT/Date.pm:413
+msgid "Mar."
+msgstr "bře"
+
+#: lib/RT/Date.pm:415
+msgid "May."
+msgstr "kvÄ›"
+
+#: lib/RT/Group_Overlay.pm:982
+msgid "Member added"
+msgstr "Člen přidán"
+
+#: lib/RT/Group_Overlay.pm:1140
+msgid "Member deleted"
+msgstr "Člen odebrán"
+
+#: lib/RT/Group_Overlay.pm:1144
+msgid "Member not deleted"
+msgstr "Člen neodebrán"
+
+#: html/Elements/SelectLinkType:26
+msgid "Member of"
+msgstr "ÄŒlen"
+
+#: html/Admin/Elements/GroupTabs:42 html/User/Elements/GroupTabs:42
+msgid "Members"
+msgstr "Členové"
+
+#: lib/RT/Ticket_Overlay.pm:2843
+msgid "Merge Successful"
+msgstr "Slou�ení úspěšné"
+
+#: lib/RT/Ticket_Overlay.pm:2804
+msgid "Merge failed. Couldn't set EffectiveId"
+msgstr "Slou�ení se nepodařilo. Nelze nastavit EffectiveId"
+
+#: html/Ticket/Elements/EditLinks:115
+msgid "Merge into"
+msgstr "Slou�it do"
+
+#: html/Ticket/Update.html:102
+msgid "Message"
+msgstr "Zpráva"
+
+#: lib/RT/Interface/Web.pm:867
+msgid "Missing a primary key?: %1"
+msgstr "Chybí primární klí�?: %1"
+
+#: html/Admin/Users/Modify.html:169 html/User/Prefs.html:54
+msgid "Mobile"
+msgstr "Mobilní telefon"
+
+#: html/Admin/Elements/ModifyUser:72
+msgid "MobilePhone"
+msgstr "Mobilní telefon"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "Modify Access Control List"
+msgstr "Upravovat seznam přístupových práv"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Field %1"
+msgstr "Upravit uživatelskou položku %1"
+
+#: html/Admin/Global/CustomFields.html:44 html/Admin/Global/index.html:51
+msgid "Modify Custom Fields which apply to all queues"
+msgstr "Úprava uživatelských položek pro všechny fronty"
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "Modify Scrip templates for this queue"
+msgstr "Upravovat vzory scripů této fronty"
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "Modify Scrips for this queue"
+msgstr "Upravovat scripů této fronty"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Template %1"
+msgstr "Upravovat vzor %1"
+
+#: html/Admin/Queues/CustomField.html:45
+#. ($QueueObj->Name())
+msgid "Modify a CustomField for queue %1"
+msgstr "Upravovat uživatelskou položku pro frontu %1"
+
+#: html/Admin/Global/CustomField.html:53
+msgid "Modify a CustomField which applies to all queues"
+msgstr "Upravovat uživatelskou položku pro všechny fronty"
+
+#: html/Admin/Queues/Scrip.html:54
+#. ($QueueObj->Name)
+msgid "Modify a scrip for queue %1"
+msgstr "Upravovat scrip pro frontu %1"
+
+#: html/Admin/Global/Scrip.html:48
+msgid "Modify a scrip which applies to all queues"
+msgstr "Upravovat scrip platný ve všech frontách"
+
+#: html/Ticket/ModifyDates.html:25 html/Ticket/ModifyDates.html:29
+#. ($TicketObj->Id)
+msgid "Modify dates for #%1"
+msgstr "Upravit datumy pro #%1"
+
+#: html/Ticket/ModifyDates.html:35
+#. ($TicketObj->Id)
+msgid "Modify dates for ticket # %1"
+msgstr "Úprav datumů pro požadavek # %1"
+
+#: html/Admin/Global/GroupRights.html:25 html/Admin/Global/GroupRights.html:28 html/Admin/Global/index.html:56
+msgid "Modify global group rights"
+msgstr "Úprava globálních skupinových práv"
+
+#: html/Admin/Global/GroupRights.html:33
+msgid "Modify global group rights."
+msgstr "Úprava globálních skupinových práv."
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global scrips"
+msgstr "Úprava globálních scrips"
+
+#: html/Admin/Global/UserRights.html:25 html/Admin/Global/UserRights.html:28 html/Admin/Global/index.html:60
+msgid "Modify global user rights"
+msgstr "Úprava globálních uživatelských práv"
+
+#: html/Admin/Global/UserRights.html:33
+msgid "Modify global user rights."
+msgstr "Úprava globálních uživatelských práv."
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "Modify group metadata or delete group"
+msgstr "Upravovat metadata skupiny nebo smazat skupinu"
+
+#: html/Admin/Groups/GroupRights.html:25 html/Admin/Groups/GroupRights.html:29 html/Admin/Groups/GroupRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify group rights for group %1"
+msgstr "Úprava skupinových práv pro %1"
+
+#: html/Admin/Queues/GroupRights.html:25 html/Admin/Queues/GroupRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify group rights for queue %1"
+msgstr "Úprava skupinových práv pro frontu %1"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "Modify membership roster for this group"
+msgstr "Upravovat seznam �lenů pro tuto skupinu"
+
+#: lib/RT/System.pm:61
+msgid "Modify one's own RT account"
+msgstr "Upravovat vlastní RT ú�et"
+
+#: html/Admin/Queues/People.html:25 html/Admin/Queues/People.html:29
+#. ($QueueObj->Name)
+msgid "Modify people related to queue %1"
+msgstr "Úprava uživatelů fronty %1"
+
+#: html/Ticket/ModifyPeople.html:25 html/Ticket/ModifyPeople.html:29 html/Ticket/ModifyPeople.html:35
+#. ($Ticket->id)
+#. ($Ticket->Id)
+msgid "Modify people related to ticket #%1"
+msgstr "Úprava uživatelů souvisejících s požadavkem #%1"
+
+#: html/Admin/Queues/Scrips.html:44
+#. ($QueueObj->Name)
+msgid "Modify scrips for queue %1"
+msgstr "Úprava scrips pro frontu %1"
+
+#: html/Admin/Global/Scrips.html:44 html/Admin/Global/index.html:42
+msgid "Modify scrips which apply to all queues"
+msgstr "Upravovat scripy platné ve všech frontách"
+
+#: html/Admin/Global/Template.html:25 html/Admin/Global/Template.html:30 html/Admin/Global/Template.html:81 html/Admin/Queues/Template.html:78
+#. (loc($TemplateObj->Name()))
+#. ($TemplateObj->id)
+msgid "Modify template %1"
+msgstr "Úprava vzoru %1"
+
+#: html/Admin/Global/Templates.html:44
+msgid "Modify templates which apply to all queues"
+msgstr "Upravit vzory pro všechny fronty"
+
+#: html/Admin/Groups/Modify.html:87 html/User/Groups/Modify.html:86
+#. ($Group->Name)
+msgid "Modify the group %1"
+msgstr "Úprava skupiny %1"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "Modify the queue watchers"
+msgstr "Upravovat pozorovatele fronty"
+
+#: html/Admin/Users/Modify.html:236
+#. ($UserObj->Name)
+msgid "Modify the user %1"
+msgstr "Úprava uživatele %1"
+
+#: html/Ticket/ModifyAll.html:37
+#. ($Ticket->Id)
+msgid "Modify ticket # %1"
+msgstr "Úprava požadavku # %1"
+
+#: html/Ticket/Modify.html:25 html/Ticket/Modify.html:28 html/Ticket/Modify.html:34
+#. ($TicketObj->Id)
+msgid "Modify ticket #%1"
+msgstr "Úprava požadavku #%1"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "Modify tickets"
+msgstr "Upravovat požadavky"
+
+#: html/Admin/Groups/UserRights.html:25 html/Admin/Groups/UserRights.html:29 html/Admin/Groups/UserRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify user rights for group %1"
+msgstr "Úprava uživatelských práv pro skupinu %1"
+
+#: html/Admin/Queues/UserRights.html:25 html/Admin/Queues/UserRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify user rights for queue %1"
+msgstr "Úprava skupinových práv pro frontu %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify watchers for queue '%1'"
+msgstr "Úprava pozorovatelů fronty '%1'"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ModifyACL"
+msgstr "Upravovat seznam přístupových práv"
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "ModifyOwnMembership"
+msgstr "Upravovat �lenství ve skupině"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "ModifyQueueWatchers"
+msgstr "Upravovat pozorovale fronty"
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "ModifyScrips"
+msgstr "Upravovat scripy"
+
+#: lib/RT/System.pm:61
+msgid "ModifySelf"
+msgstr "Upravovat sebe"
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "ModifyTemplate"
+msgstr "Upravovat vzor"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "ModifyTicket"
+msgstr "Upravovat požadavek"
+
+#: lib/RT/Date.pm:388
+msgid "Mon."
+msgstr "po"
+
+#: html/Ticket/Elements/ShowRequestor:42
+#. ($name)
+msgid "More about %1"
+msgstr "Více o %1"
+
+#: html/Admin/Elements/EditCustomFields:61
+msgid "Move down"
+msgstr "Dát níže"
+
+#: html/Admin/Elements/EditCustomFields:53
+msgid "Move up"
+msgstr "Dát výše"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:27
+msgid "Multiple"
+msgstr "Vícenásobná"
+
+#: lib/RT/User_Overlay.pm:179
+msgid "Must specify 'Name' attribute"
+msgstr "Nutno zadat atribut 'Jméno'"
+
+#: NOT FOUND IN SOURCE
+msgid "My Approvals"
+msgstr "Mnou schválené"
+
+#: html/Approvals/index.html:25 html/Approvals/index.html:26
+msgid "My approvals"
+msgstr "Mnou schválené"
+
+#: html/Admin/Elements/AddCustomFieldValue:26 html/Admin/Elements/EditCustomField:32 html/Admin/Elements/ModifyTemplate:28 html/Admin/Elements/ModifyUser:30 html/Admin/Groups/Modify.html:44 html/Elements/SelectGroups:26 html/Elements/SelectUsers:28 html/User/Groups/Modify.html:44
+msgid "Name"
+msgstr "Jméno"
+
+#: lib/RT/User_Overlay.pm:186
+msgid "Name in use"
+msgstr "Jméno je použito"
+
+#: NOT FOUND IN SOURCE
+msgid "Need approval from system administrator"
+msgstr "Je třeba schválení systémového správce"
+
+#: html/Ticket/Elements/ShowDates:52
+msgid "Never"
+msgstr "Nikdy"
+
+#: html/Elements/Quicksearch:30
+msgid "New"
+msgstr "Nové"
+
+#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:93 html/User/Prefs.html:65
+msgid "New Password"
+msgstr "Nové heslo"
+
+#: etc/initialdata:311 etc/upgrade/2.1.71:16
+msgid "New Pending Approval"
+msgstr "Nová probíhající schválení"
+
+#: html/Ticket/Elements/EditLinks:111
+msgid "New Relationships"
+msgstr "Nové relace"
+
+#: html/Ticket/Elements/Tabs:36
+msgid "New Search"
+msgstr "Nové vyhledávání"
+
+#: html/Admin/Global/CustomField.html:41 html/Admin/Global/CustomFields.html:39 html/Admin/Queues/CustomField.html:52 html/Admin/Queues/CustomFields.html:40
+msgid "New custom field"
+msgstr "Vytvořit uživatelskou položku"
+
+#: html/Admin/Elements/GroupTabs:54 html/User/Elements/GroupTabs:52
+msgid "New group"
+msgstr "Založit skupinu"
+
+#: html/SelfService/Prefs.html:32
+msgid "New password"
+msgstr "Nové heslo"
+
+#: lib/RT/User_Overlay.pm:639
+msgid "New password notification sent"
+msgstr "Oznámení nového hesla zasláno"
+
+#: html/Admin/Elements/QueueTabs:70
+msgid "New queue"
+msgstr "Vytvoření fronty"
+
+#: html/SelfService/Elements/Tabs:63
+msgid "New request"
+msgstr "Nový požadavek"
+
+#: html/Admin/Elements/SelectRights:42
+msgid "New rights"
+msgstr "Nová práva"
+
+#: html/Admin/Global/Scrip.html:40 html/Admin/Global/Scrips.html:39 html/Admin/Queues/Scrip.html:43 html/Admin/Queues/Scrips.html:53
+msgid "New scrip"
+msgstr "Vytovření scripu"
+
+#: NOT FOUND IN SOURCE
+msgid "New search"
+msgstr "Nové vyhledání"
+
+#: html/Admin/Global/Template.html:60 html/Admin/Global/Templates.html:39 html/Admin/Queues/Template.html:58 html/Admin/Queues/Templates.html:46
+msgid "New template"
+msgstr "Vytvořit vzor"
+
+#: lib/RT/Ticket_Overlay.pm:2771
+msgid "New ticket doesn't exist"
+msgstr "Nový požadavek neexistuje"
+
+#: html/Admin/Elements/UserTabs:52
+msgid "New user"
+msgstr "Vytvořit uživatele"
+
+#: html/Admin/Elements/CreateUserCalled:26
+msgid "New user called"
+msgstr "Nový uživatel jména"
+
+#: html/Admin/Queues/People.html:55 html/Ticket/Elements/EditPeople:29
+msgid "New watchers"
+msgstr "Nový pozorovatel"
+
+#: html/Admin/Users/Prefs.html:42
+msgid "New window setting"
+msgstr "Nové nastavení okna"
+
+#: html/Ticket/Elements/Tabs:69
+msgid "Next"
+msgstr "Další"
+
+#: html/Search/Listing.html:48
+msgid "Next page"
+msgstr "Další stránka"
+
+#: html/Admin/Elements/ModifyUser:50
+msgid "NickName"
+msgstr "Přezdívka"
+
+#: html/Admin/Users/Modify.html:63 html/User/Prefs.html:46
+msgid "Nickname"
+msgstr "Přezdívka"
+
+#: html/Admin/Elements/EditCustomField:73 html/Admin/Elements/EditCustomFields:105
+msgid "No CustomField"
+msgstr "Žádná uživatelská položka"
+
+#: html/Admin/Groups/GroupRights.html:84 html/Admin/Groups/UserRights.html:71
+msgid "No Group defined"
+msgstr "Nedefinována žádná skupina"
+
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:68
+msgid "No Queue defined"
+msgstr "Nedefinována žádná fronta"
+
+#: bin/rt-crontool:56
+msgid "No RT user found. Please consult your RT administrator.\\n"
+msgstr "Žádný uživatel RT nenalezen. Prosím pora�te se se správcem RT.\\n"
+
+#: html/Admin/Global/Template.html:79 html/Admin/Queues/Template.html:76
+msgid "No Template"
+msgstr "Žádný vzor"
+
+#: bin/rt-commit-handler:764
+msgid "No Ticket specified. Aborting ticket "
+msgstr "Neudán požadavek. Přerušuje se požadavek "
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgstr "Neudán požadavek. Přerušují se úpravy požadavku\\n\\n"
+
+#: html/Approvals/Elements/Approve:47
+msgid "No action"
+msgstr "bez akce"
+
+#: lib/RT/Interface/Web.pm:862
+msgid "No column specified"
+msgstr "Neudán sloupec"
+
+#: NOT FOUND IN SOURCE
+msgid "No command found\\n"
+msgstr "Příkaz nenalezen\\n"
+
+#: html/Elements/ViewUser:36 html/Ticket/Elements/ShowRequestor:45
+msgid "No comment entered about this user"
+msgstr "Poznámky k tomuto uživateli neudány"
+
+#: lib/RT/Ticket_Overlay.pm:2189 lib/RT/Ticket_Overlay.pm:2257
+msgid "No correspondence attached"
+msgstr "Žádná připojená korespondence"
+
+#: lib/RT/Action/Generic.pm:150 lib/RT/Condition/Generic.pm:176 lib/RT/Search/ActiveTicketsInQueue.pm:56 lib/RT/Search/Generic.pm:113
+#. (ref $self)
+msgid "No description for %1"
+msgstr "Pro %1 není popis"
+
+#: lib/RT/Users_Overlay.pm:151
+msgid "No group specified"
+msgstr "Neudána skupina"
+
+#: lib/RT/User_Overlay.pm:857
+msgid "No password set"
+msgstr "Heslo nenastaveno"
+
+#: lib/RT/Queue_Overlay.pm:259
+msgid "No permission to create queues"
+msgstr "Nedostatek práv k vytváření front"
+
+#: lib/RT/Ticket_Overlay.pm:341
+#. ($QueueObj->Name)
+msgid "No permission to create tickets in the queue '%1'"
+msgstr "Nedostatek práv k vytváření požadavků ve frontě '%1'"
+
+#: lib/RT/User_Overlay.pm:151
+msgid "No permission to create users"
+msgstr "Nedostatek práv k vytváření uživatelů"
+
+#: html/SelfService/Display.html:174
+msgid "No permission to display that ticket"
+msgstr "Nedostatek práv k zobrazení tohoto požadavku"
+
+#: html/SelfService/Update.html:55
+msgid "No permission to view update ticket"
+msgstr "Nedostatek práv k zobrazení aktualizace požadavku"
+
+#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1488
+msgid "No principal specified"
+msgstr "Nezadán uživatel"
+
+#: html/Admin/Queues/People.html:154 html/Admin/Queues/People.html:164
+msgid "No principals selected."
+msgstr "Nevybráni uživatelé."
+
+#: html/Admin/Queues/index.html:35
+msgid "No queues matching search criteria found."
+msgstr "Nenalezeny žádné fronty odpovídající vyhledávací podmínce."
+
+#: html/Admin/Elements/SelectRights:81
+msgid "No rights found"
+msgstr "Práva nenalezena"
+
+#: html/Admin/Elements/SelectRights:33
+msgid "No rights granted."
+msgstr "Nepřidělena žádná práva."
+
+#: html/Search/Bulk.html:149
+msgid "No search to operate on."
+msgstr "Bez vyhledání nelze pracovat."
+
+#: NOT FOUND IN SOURCE
+msgid "No ticket id specified"
+msgstr "Neudán identifikátor požadavku"
+
+#: lib/RT/Transaction_Overlay.pm:480 lib/RT/Transaction_Overlay.pm:518
+msgid "No transaction type specified"
+msgstr "Neudán typ transakce"
+
+#: html/Admin/Users/index.html:36
+msgid "No users matching search criteria found."
+msgstr "Nenalezeni uživatelé odpovídající vyhledávací podmínce"
+
+#: bin/rt-commit-handler:644
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr "Nenalezen platný uživatel RT. Ovlada� RT CVS uvolněn. Prosím pora�te se se svým správcem RT.\\n"
+
+#: lib/RT/Interface/Web.pm:859
+msgid "No value sent to _Set!\\n"
+msgstr "Žádná z hodnot nanastavena na _Set!\\n"
+
+#: html/Search/Elements/TicketRow:37
+msgid "Nobody"
+msgstr "Nikdo"
+
+#: lib/RT/Interface/Web.pm:864
+msgid "Nonexistant field?"
+msgstr "Neexistující položka"
+
+#: html/Elements/Login:99
+msgid "Not logged in"
+msgstr "Nepřihlášen"
+
+#: html/Elements/Header:59 html/SelfService/Elements/Header:58
+msgid "Not logged in."
+msgstr "Nepřihlášen."
+
+#: lib/RT/Date.pm:369
+msgid "Not set"
+msgstr "Nenastaven"
+
+#: html/NoAuth/Reminder.html:27
+msgid "Not yet implemented."
+msgstr "Zatím neimplementováno."
+
+#: html/Admin/Groups/Rights.html:25
+msgid "Not yet implemented...."
+msgstr "Zatím neimplementováno..."
+
+#: html/Approvals/Elements/Approve:50
+msgid "Notes"
+msgstr "Poznámky"
+
+#: lib/RT/User_Overlay.pm:642
+msgid "Notification could not be sent"
+msgstr "Upozornění nemůže být zasláno"
+
+#: etc/initialdata:94
+msgid "Notify AdminCcs"
+msgstr "Zaslat všem AdminCc"
+
+#: etc/initialdata:90
+msgid "Notify AdminCcs as Comment"
+msgstr "Zaslat všem AdminCc jako komentář"
+
+#: etc/initialdata:121
+msgid "Notify Other Recipients"
+msgstr "Zaslat ostatním příjemcům"
+
+#: etc/initialdata:117
+msgid "Notify Other Recipients as Comment"
+msgstr "Zaslat ostatním příjemcům jako komentář"
+
+#: etc/initialdata:86
+msgid "Notify Owner"
+msgstr "Zaslat vlastníkovi"
+
+#: etc/initialdata:82
+msgid "Notify Owner as Comment"
+msgstr "Zaslat vlastníkovi jako komentář"
+
+#: etc/initialdata:313 etc/upgrade/2.1.71:17
+msgid "Notify Owners and AdminCcs of new items pending their approval"
+msgstr "Zaslat vlastníkům a všem AdminCc nové případy o�ekávající jejich schválení"
+
+#: etc/initialdata:78
+msgid "Notify Requestors"
+msgstr "Zaslat žadatelům"
+
+#: etc/initialdata:104
+msgid "Notify Requestors and Ccs"
+msgstr "Zaslat žadatelům a všem Cc"
+
+#: etc/initialdata:99
+msgid "Notify Requestors and Ccs as Comment"
+msgstr "Zaslat žadatelům a všem Cc jako komentář"
+
+#: etc/initialdata:113
+msgid "Notify Requestors, Ccs and AdminCcs"
+msgstr "Zaslat žadatelům, všem Cc a všem AdminCc"
+
+#: etc/initialdata:109
+msgid "Notify Requestors, Ccs and AdminCcs as Comment"
+msgstr "Zaslat žadatelům, v�em Cc a v�em AdminCc jako komentář"
+
+#: lib/RT/Date.pm:421
+msgid "Nov."
+msgstr "lis"
+
+#: lib/RT/Record.pm:157
+msgid "Object could not be created"
+msgstr "Objekt nemůže být vytvořen"
+
+#: lib/RT/Record.pm:176
+msgid "Object created"
+msgstr "Objekt vytvořen"
+
+#: lib/RT/Date.pm:420
+msgid "Oct."
+msgstr "říj"
+
+#: html/Elements/SelectDateRelation:35
+msgid "On"
+msgstr "Dne"
+
+#: etc/initialdata:155
+msgid "On Comment"
+msgstr "Při komentáři"
+
+#: etc/initialdata:148
+msgid "On Correspond"
+msgstr "Při korespondenci"
+
+#: etc/initialdata:137
+msgid "On Create"
+msgstr "Při založení"
+
+#: etc/initialdata:169
+msgid "On Owner Change"
+msgstr "Při změně vlastníka"
+
+#: etc/initialdata:177
+msgid "On Queue Change"
+msgstr "Při změně fronty"
+
+#: etc/initialdata:183
+msgid "On Resolve"
+msgstr "Při vyřešení"
+
+#: etc/initialdata:161
+msgid "On Status Change"
+msgstr "Při změně stavu"
+
+#: etc/initialdata:142
+msgid "On Transaction"
+msgstr "Při transakci"
+
+#: html/Approvals/Elements/PendingMyApproval:50
+#. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
+msgid "Only show approvals for requests created after %1"
+msgstr "Zobrazit jen schvalování pro požadavky založené po %1"
+
+#: html/Approvals/Elements/PendingMyApproval:48
+#. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
+msgid "Only show approvals for requests created before %1"
+msgstr "Zobrazit jen schvalování pro požadavky založení před %quant(%1)"
+
+#: html/Elements/Quicksearch:31
+msgid "Open"
+msgstr "Otevřené"
+
+#: html/Ticket/Elements/Tabs:136
+msgid "Open it"
+msgstr "Otevřít"
+
+#: html/SelfService/Elements/Tabs:57
+msgid "Open requests"
+msgstr "Otevřené požadavky"
+
+#: html/Admin/Users/Prefs.html:41
+msgid "Open tickets (from listing) in a new window"
+msgstr "Otevřít požadavky (ze seznamu) v novém okně"
+
+#: html/Admin/Users/Prefs.html:40
+msgid "Open tickets (from listing) in another window"
+msgstr "Otevřít požadavky (ze seznamu) v jiném okně"
+
+#: etc/initialdata:133
+msgid "Open tickets on correspondence"
+msgstr "Otevřít požadavky při korespondenci"
+
+#: html/Search/Elements/PickRestriction:101
+msgid "Ordering and sorting"
+msgstr "Řazení a třídění"
+
+#: html/Admin/Elements/ModifyUser:46 html/Admin/Users/Modify.html:117 html/Elements/SelectUsers:29 html/User/Prefs.html:86
+msgid "Organization"
+msgstr "Organizace"
+
+#: html/Approvals/Elements/Approve:34
+#. ($approving->Id, $approving->Subject)
+msgid "Originating ticket: #%1"
+msgstr "Původní požadavek: #%1"
+
+#: html/Admin/Elements/ModifyQueue:55 html/Admin/Queues/Modify.html:69
+msgid "Over time, priority moves toward"
+msgstr "Časem se priorita posouvá k"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "Own tickets"
+msgstr "Vlastnit požadavky"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "OwnTicket"
+msgstr "Vlastnit požadavek"
+
+#: etc/initialdata:38 html/Elements/MyRequests:32 html/SelfService/Elements/MyRequests:30 html/Ticket/Create.html:48 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/EditPeople:44 html/Ticket/Elements/ShowPeople:27 html/Ticket/Update.html:63 lib/RT/ACE_Overlay.pm:86 lib/RT/Tickets_Overlay.pm:1244
+msgid "Owner"
+msgstr "Vlastník"
+
+#: lib/RT/Ticket_Overlay.pm:3004
+#. ($OldOwnerObj->Name,  $NewOwnerObj->Name)
+msgid "Owner changed from %1 to %2"
+msgstr "Vlastník změněn z %1 na %2"
+
+#: lib/RT/Transaction_Overlay.pm:584
+#. ($Old->Name , $New->Name)
+msgid "Owner forcibly changed from %1 to %2"
+msgstr "Vlastník nuceně změněn z %1 na %2"
+
+#: html/Search/Elements/PickRestriction:31
+msgid "Owner is"
+msgstr "Vlastník"
+
+#: html/Admin/Users/Modify.html:174 html/User/Prefs.html:56
+msgid "Pager"
+msgstr "Pager"
+
+#: html/Admin/Elements/ModifyUser:74
+msgid "PagerPhone"
+msgstr "Číslo pageru"
+
+#: html/Ticket/Create.html:182 html/Ticket/Elements/EditLinks:127 html/Ticket/Elements/EditLinks:58 html/Ticket/Elements/ShowLinks:43
+msgid "Parents"
+msgstr "Rodi�e"
+
+#: html/Elements/Login:43 html/User/Prefs.html:61
+msgid "Password"
+msgstr "Heslo"
+
+#: html/NoAuth/Reminder.html:25
+msgid "Password Reminder"
+msgstr "Připomína� hesel"
+
+#: lib/RT/User_Overlay.pm:168 lib/RT/User_Overlay.pm:860
+msgid "Password too short"
+msgstr "Heslo příliš krátké"
+
+#: html/Admin/Users/Modify.html:291 html/User/Prefs.html:172
+#. (loc_fuzzy($msg))
+msgid "Password: %1"
+msgstr "Heslo: %1"
+
+#: html/Ticket/Elements/ShowSummary:43 html/Ticket/Elements/Tabs:96 html/Ticket/ModifyAll.html:51
+msgid "People"
+msgstr "Uživatelé"
+
+#: etc/initialdata:126
+msgid "Perform a user-defined action"
+msgstr "Provedení uživatelem definované akce"
+
+#: lib/RT/ACE_Overlay.pm:231 lib/RT/ACE_Overlay.pm:237 lib/RT/ACE_Overlay.pm:563 lib/RT/ACE_Overlay.pm:573 lib/RT/ACE_Overlay.pm:583 lib/RT/ACE_Overlay.pm:648 lib/RT/CurrentUser.pm:83 lib/RT/CurrentUser.pm:92 lib/RT/CustomField_Overlay.pm:445 lib/RT/CustomField_Overlay.pm:451 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1099 lib/RT/Group_Overlay.pm:1108 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1163 lib/RT/Group_Overlay.pm:1169 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:904 lib/RT/Group_Overlay.pm:908 lib/RT/Group_Overlay.pm:921 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:931 lib/RT/Scrip_Overlay.pm:126 lib/RT/Scrip_Overlay.pm:137 lib/RT/Scrip_Overlay.pm:197 lib/RT/Scrip_Overlay.pm:430 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:88 lib/RT/Template_Overlay.pm:94 lib/RT/Ticket_Overlay.pm:1341 lib/RT/Ticket_Overlay.pm:1351 lib/RT/Ticket_Overlay.pm:1365 lib/RT/Ticket_Overlay.pm:1518 lib/RT/Ticket_Overlay.pm:1527 lib/RT/Ticket_Overlay.pm:1540 lib/RT/Ticket_Overlay.pm:1875 lib/RT/Ticket_Overlay.pm:2013 lib/RT/Ticket_Overlay.pm:2177 lib/RT/Ticket_Overlay.pm:2244 lib/RT/Ticket_Overlay.pm:2596 lib/RT/Ticket_Overlay.pm:2668 lib/RT/Ticket_Overlay.pm:2762 lib/RT/Ticket_Overlay.pm:2777 lib/RT/Ticket_Overlay.pm:2910 lib/RT/Ticket_Overlay.pm:3139 lib/RT/Ticket_Overlay.pm:3337 lib/RT/Ticket_Overlay.pm:3499 lib/RT/Ticket_Overlay.pm:3551 lib/RT/Ticket_Overlay.pm:3716 lib/RT/Transaction_Overlay.pm:468 lib/RT/Transaction_Overlay.pm:475 lib/RT/Transaction_Overlay.pm:504 lib/RT/Transaction_Overlay.pm:511 lib/RT/User_Overlay.pm:1334 lib/RT/User_Overlay.pm:562 lib/RT/User_Overlay.pm:597 lib/RT/User_Overlay.pm:853 lib/RT/User_Overlay.pm:941
+msgid "Permission Denied"
+msgstr "Přístup nepovolen"
+
+#: html/User/Elements/Tabs:35
+msgid "Personal Groups"
+msgstr "Osobní skupiny"
+
+#: html/User/Groups/index.html:30 html/User/Groups/index.html:40
+msgid "Personal groups"
+msgstr "Vlastní skupiny"
+
+#: html/User/Elements/DelegateRights:37
+msgid "Personal groups:"
+msgstr "Vlastní skupiny:"
+
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:49
+msgid "Phone numbers"
+msgstr "Čísla telefonů"
+
+#: html/Admin/Users/Rights.html:25
+msgid "Placeholder"
+msgstr "Zábor místa"
+
+#: html/Elements/Header:52 html/Elements/Tabs:55 html/SelfService/Prefs.html:25 html/User/Prefs.html:25 html/User/Prefs.html:28
+msgid "Preferences"
+msgstr "Nastavení"
+
+#: NOT FOUND IN SOURCE
+msgid "Prefs"
+msgstr "Nastavení"
+
+#: lib/RT/Action/Generic.pm:160
+msgid "Prepare Stubbed"
+msgstr "Prepare v zárodku"
+
+#: html/Ticket/Elements/Tabs:61
+msgid "Prev"
+msgstr "Předchozí"
+
+#: html/Search/Listing.html:44
+msgid "Previous page"
+msgstr "Předchozí stránka"
+
+#: NOT FOUND IN SOURCE
+msgid "Pri"
+msgstr "Pri"
+
+#: lib/RT/ACE_Overlay.pm:133 lib/RT/ACE_Overlay.pm:208 lib/RT/ACE_Overlay.pm:552
+#. ($args{'PrincipalId'})
+msgid "Principal %1 not found."
+msgstr "Uživatel %1 nenalezen."
+
+#: html/Search/Elements/PickRestriction:54 html/SelfService/Display.html:76 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:54 html/Ticket/Elements/ShowBasics:39 lib/RT/Tickets_Overlay.pm:1042
+msgid "Priority"
+msgstr "Priorita"
+
+#: html/Admin/Elements/ModifyQueue:51 html/Admin/Queues/Modify.html:65
+msgid "Priority starts at"
+msgstr "Priorita za�íná na"
+
+#: etc/initialdata:25
+msgid "Privileged"
+msgstr "Privilegovaný"
+
+#: html/Admin/Users/Modify.html:271 html/User/Prefs.html:163
+#. (loc_fuzzy($msg))
+msgid "Privileged status: %1"
+msgstr "Privilegovaný stav: %1"
+
+#: html/Admin/Users/index.html:62
+msgid "Privileged users"
+msgstr "Privilegovaní uživatelé"
+
+#: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
+msgid "Pseudogroup for internal use"
+msgstr "Pseudo skupina pro vnitřní použití"
+
+#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Elements/Quicksearch:29 html/Search/Elements/PickRestriction:46 html/SelfService/Create.html:35 html/SelfService/Display.html:68 html/Ticket/Create.html:38 html/Ticket/Elements/EditBasics:64 html/Ticket/Elements/ShowBasics:43 html/User/Elements/DelegateRights:80 lib/RT/Tickets_Overlay.pm:883
+msgid "Queue"
+msgstr "Fronta"
+
+#: html/Admin/Queues/CustomField.html:42 html/Admin/Queues/Scrip.html:50 html/Admin/Queues/Scrips.html:46 html/Admin/Queues/Templates.html:43
+#. ($Queue)
+#. ($id)
+msgid "Queue %1 not found"
+msgstr "Fronta %1 nenalezena"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue '%1' not found\\n"
+msgstr "Fronta '%1' nenalezena\\n"
+
+#: html/Admin/Elements/ModifyQueue:31 html/Admin/Queues/Modify.html:43
+msgid "Queue Name"
+msgstr "Název fronty"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Scrips"
+msgstr "Scripy fronty"
+
+#: lib/RT/Queue_Overlay.pm:263
+msgid "Queue already exists"
+msgstr "Fronta již existuje"
+
+#: lib/RT/Queue_Overlay.pm:272 lib/RT/Queue_Overlay.pm:278
+msgid "Queue could not be created"
+msgstr "Fronta nemůže být vytvořena"
+
+#: html/Ticket/Create.html:209
+msgid "Queue could not be loaded."
+msgstr "Fronta nemůže být na�tena."
+
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:282
+msgid "Queue created"
+msgstr "Fronta vytvořena"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue is not specified."
+msgstr "Není zadána fronta."
+
+#: html/SelfService/Display.html:129
+msgid "Queue not found"
+msgstr "Fronta nenalezena"
+
+#: html/Admin/Elements/Tabs:38 html/Admin/index.html:35
+msgid "Queues"
+msgstr "Fronty"
+
+#: html/Elements/Login:34
+#. ($RT::VERSION)
+msgid "RT %1"
+msgstr "RT %1"
+
+#: docs/design_docs/string-extraction-guide.txt:70
+#. ($RT::VERSION, $RT::rtname)
+msgid "RT %1 for %2"
+msgstr "RT %1 pro %2"
+
+#: html/Elements/Footer:32
+#. ($RT::VERSION)
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr "RT %1 od <a href=\"http://bestpractical.com\">Best Practival Solutions, LLC</a>."
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: html/Admin/index.html:25 html/Admin/index.html:26
+msgid "RT Administration"
+msgstr "Správa RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Authentication error."
+msgstr "Autentiza�ní chyba RT."
+
+#: NOT FOUND IN SOURCE
+msgid "RT Bounce: %1"
+msgstr "RT Bounce: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Configuration error"
+msgstr "Konfigura�ní chyba RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Critical error. Message not recorded!"
+msgstr "Kritická chyba RT. Zpráva nezaznamenána!"
+
+#: html/Elements/Error:41 html/SelfService/Error.html:41
+msgid "RT Error"
+msgstr "Chyba RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Received mail (%1) from itself."
+msgstr "RT přijal poštu (%1) od sebe samého."
+
+#: html/SelfService/Closed.html:25
+msgid "RT Self Service / Closed Tickets"
+msgstr "RT Samoobsluha / Uzavřené požadavky"
+
+#: html/index.html:25 html/index.html:28
+msgid "RT at a glance"
+msgstr "RT v celé své záři"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't authenticate you"
+msgstr "RT vás nemůže autentizovat"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find requestor via its external database lookup"
+msgstr "RT nemůže nalézt žadatele přes hledání v externí databázi"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find the queue: %1"
+msgstr "RT nemůže nalézt frontu: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't validate this PGP signature. \\n"
+msgstr "RT nemůže ověřit tento PGP podpis. \\n"
+
+#: html/Elements/PageLayout:26
+#. ($RT::rtname)
+msgid "RT for %1"
+msgstr "RT pro %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr "RT pro %1: %2"
+
+#: NOT FOUND IN SOURCE
+msgid "RT has proccessed your commands"
+msgstr "RT zpracoval vaše příkazy"
+
+#: html/Elements/Login:83
+#. ('2003')
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT je &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;. Šířeno pod <a href=\"http://www.gnu.org/copyleft/gpl.html\">verzí 2 GNU General Public License.</a>"
+
+#: NOT FOUND IN SOURCE
+msgid "RT thinks this message may be a bounce"
+msgstr "RT bere tuto zprávu jako bounce"
+
+#: NOT FOUND IN SOURCE
+msgid "RT will process this message as if it were unsigned.\\n"
+msgstr "RT zpracuje tuto zprávu tak, jako by byla nepodepsaná.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+msgstr "Emailový příkazový režim RT vyžaduje PGP autentizaci. Nepodepsal jste vaši zprávu nebo váš podpis nemůže být ověřen."
+
+#: html/Admin/Users/Modify.html:58 html/Admin/Users/Prefs.html:52 html/User/Prefs.html:44
+msgid "Real Name"
+msgstr "Skute�né jméno"
+
+#: html/Admin/Elements/ModifyUser:48
+msgid "RealName"
+msgstr "Skute�né jméno"
+
+#: html/Ticket/Create.html:185 html/Ticket/Elements/EditLinks:139 html/Ticket/Elements/EditLinks:94 html/Ticket/Elements/ShowLinks:63
+msgid "Referred to by"
+msgstr "Je odkazem z"
+
+#: html/Elements/SelectLinkType:28 html/Ticket/Create.html:184 html/Ticket/Elements/EditLinks:135 html/Ticket/Elements/EditLinks:80 html/Ticket/Elements/ShowLinks:55
+msgid "Refers to"
+msgstr "Odkazuje na"
+
+#: NOT FOUND IN SOURCE
+msgid "Refine"
+msgstr "Zjemnit"
+
+#: html/Search/Elements/PickRestriction:27
+msgid "Refine search"
+msgstr "Zjemnit vyhledání"
+
+#: html/Elements/Refresh:36
+#. ($value/60)
+msgid "Refresh this page every %1 minutes."
+msgstr "Obnovit tuto stránku %quant(%1,každou,každé,každých) %numf(%1) %quant(%1,minutu,minuty,minut)."
+
+#??? quant
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:60 html/Ticket/ModifyAll.html:57
+msgid "Relationships"
+msgstr "Vztahy"
+
+#: html/Search/Bulk.html:93
+msgid "Remove AdminCc"
+msgstr "Odstranit AdminCc"
+
+#: html/Search/Bulk.html:91
+msgid "Remove Cc"
+msgstr "Odstranit Cc"
+
+#: html/Search/Bulk.html:89
+msgid "Remove Requestor"
+msgstr "Odstranit žadatele"
+
+#: html/Ticket/Elements/ShowTransaction:173 html/Ticket/Elements/Tabs:122
+msgid "Reply"
+msgstr "Odpovědět"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "Reply to tickets"
+msgstr "Odpovědět na požadavky"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "ReplyToTicket"
+msgstr "Odpovídat na požadavky"
+
+#: etc/initialdata:44 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:87
+msgid "Requestor"
+msgstr "Žadatel"
+
+#: html/Search/Elements/PickRestriction:38
+msgid "Requestor email address"
+msgstr "Emailová adresa žadatele"
+
+#: NOT FOUND IN SOURCE
+msgid "Requestor(s)"
+msgstr "Žadatel(é)"
+
+#: html/SelfService/Create.html:43 html/SelfService/Display.html:42 html/Ticket/Create.html:56 html/Ticket/Elements/EditPeople:48 html/Ticket/Elements/ShowPeople:31
+msgid "Requestors"
+msgstr "Žadatelé"
+
+#: html/Admin/Elements/ModifyQueue:61 html/Admin/Queues/Modify.html:75
+msgid "Requests should be due in"
+msgstr "Požadavky mají být vyřešeny do"
+
+#: html/Elements/Submit:62
+msgid "Reset"
+msgstr "Vynulovat"
+
+#: html/Admin/Users/Modify.html:159 html/User/Prefs.html:50
+msgid "Residence"
+msgstr "Bydliště"
+
+#: html/Ticket/Elements/Tabs:132
+msgid "Resolve"
+msgstr "Vyřešit"
+
+#: html/Ticket/Update.html:133
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Resolve ticket #%1 (%2)"
+msgstr "Vyřešení požadavku #%1 (%2)"
+
+#: etc/initialdata:302 html/Elements/SelectDateType:28 lib/RT/Ticket_Overlay.pm:1170
+msgid "Resolved"
+msgstr "Vyřešen"
+
+#: html/Search/Bulk.html:123 html/Ticket/ModifyAll.html:73 html/Ticket/Update.html:73
+msgid "Response to requestors"
+msgstr "Odpově� žadatelům"
+
+#: html/Elements/ListActions:26
+msgid "Results"
+msgstr "Výsledky"
+
+#: html/Search/Elements/PickRestriction:105
+msgid "Results per page"
+msgstr "Výsledků na stránku"
+
+#: html/Admin/Elements/ModifyUser:33 html/Admin/Users/Modify.html:100 html/User/Prefs.html:72
+msgid "Retype Password"
+msgstr "Zopakujte heslo"
+
+#: NOT FOUND IN SOURCE
+msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+msgstr "Nenalezeno právo %1 pro %2 %3 v mezích %4 (%5)"
+
+#: lib/RT/ACE_Overlay.pm:613
+msgid "Right Delegated"
+msgstr "Právo delegováno"
+
+#: lib/RT/ACE_Overlay.pm:303
+msgid "Right Granted"
+msgstr "Práva přidána"
+
+#: lib/RT/ACE_Overlay.pm:161
+msgid "Right Loaded"
+msgstr "Právo na�teno"
+
+#: lib/RT/ACE_Overlay.pm:678 lib/RT/ACE_Overlay.pm:693
+msgid "Right could not be revoked"
+msgstr "Právo nemůže být odebráno"
+
+#: html/User/Delegation.html:64
+msgid "Right not found"
+msgstr "Právo nenalezeno"
+
+#: lib/RT/ACE_Overlay.pm:543 lib/RT/ACE_Overlay.pm:638
+msgid "Right not loaded."
+msgstr "Právo nena�teno."
+
+#: lib/RT/ACE_Overlay.pm:689
+msgid "Right revoked"
+msgstr "Právo odebráno"
+
+#: html/Admin/Elements/UserTabs:41
+msgid "Rights"
+msgstr "Práva"
+
+#: lib/RT/Interface/Web.pm:758
+#. ($object_type)
+msgid "Rights could not be granted for %1"
+msgstr "Práva pro %1 nemohou být přidělena"
+
+#: lib/RT/Interface/Web.pm:791
+#. ($object_type)
+msgid "Rights could not be revoked for %1"
+msgstr "Práva nemohou být %1 odebrána"
+
+#: html/Admin/Global/GroupRights.html:51 html/Admin/Queues/GroupRights.html:52
+msgid "Roles"
+msgstr "Pravidla"
+
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr "Kořenový schvalovatel"
+
+#: lib/RT/Date.pm:393
+msgid "Sat."
+msgstr "so"
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
+msgid "Save Changes"
+msgstr "Uložit změny"
+
+#: html/Ticket/ModifyLinks.html:39
+msgid "Save changes"
+msgstr "Nezapomeňte uložit změny - "
+
+#: html/Admin/Global/Scrip.html:49
+#. ($ARGS{'id'})
+msgid "Scrip #%1"
+msgstr "Scrip #%1"
+
+#: lib/RT/Scrip_Overlay.pm:176
+msgid "Scrip Created"
+msgstr "Scrip vytvořen"
+
+#: html/Admin/Elements/EditScrips:84
+msgid "Scrip deleted"
+msgstr "Scrip smazán"
+
+#: html/Admin/Elements/QueueTabs:46 html/Admin/Elements/SystemTabs:33 html/Admin/Global/index.html:41
+msgid "Scrips"
+msgstr "Scripy"
+
+#: NOT FOUND IN SOURCE
+msgid "Scrips for %1\\n"
+msgstr "Scripy fro %1\\n"
+
+#: html/Admin/Queues/Scrips.html:33
+msgid "Scrips which apply to all queues"
+msgstr "Scripy platné ve všech frontách"
+
+#: html/Elements/SimpleSearch:27 html/Search/Elements/PickRestriction:126 html/Ticket/Elements/Tabs:159
+msgid "Search"
+msgstr "Vyhledávání"
+
+#: NOT FOUND IN SOURCE
+msgid "Search Criteria"
+msgstr "Podmínky vyhledávání"
+
+#: html/Approvals/Elements/PendingMyApproval:39
+msgid "Search for approvals"
+msgstr "Vyhledávání schvalování"
+
+#: bin/rt-crontool:188
+msgid "Security:"
+msgstr "Zabezpe�ní:"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "SeeQueue"
+msgstr "Vidět frontu"
+
+#: html/Admin/Groups/index.html:40
+msgid "Select a group"
+msgstr "Výběr skupiny"
+
+#: NOT FOUND IN SOURCE
+msgid "Select a queue"
+msgstr "Výběr fronty"
+
+#: html/Admin/Users/index.html:25 html/Admin/Users/index.html:28
+msgid "Select a user"
+msgstr "Výběr uživatele"
+
+#: html/Admin/Global/CustomField.html:38 html/Admin/Global/CustomFields.html:36
+msgid "Select custom field"
+msgstr "Vybrat uživatelskou položku"
+
+#: html/Admin/Elements/GroupTabs:52 html/User/Elements/GroupTabs:50
+msgid "Select group"
+msgstr "Vybrat skupinu"
+
+#: lib/RT/CustomField_Overlay.pm:355
+msgid "Select multiple values"
+msgstr "Vybrat více hodnot"
+
+#: lib/RT/CustomField_Overlay.pm:352
+msgid "Select one value"
+msgstr "Vybrat jednu hodnotu"
+
+#: html/Admin/Elements/QueueTabs:67
+msgid "Select queue"
+msgstr "Výběr fronty"
+
+#: html/Admin/Global/Scrip.html:37 html/Admin/Global/Scrips.html:36 html/Admin/Queues/Scrip.html:40 html/Admin/Queues/Scrips.html:50
+msgid "Select scrip"
+msgstr "Výběr scripu"
+
+#: html/Admin/Global/Template.html:57 html/Admin/Global/Templates.html:36 html/Admin/Queues/Template.html:55
+msgid "Select template"
+msgstr "Vybrat vzor"
+
+#: html/Admin/Elements/UserTabs:49
+msgid "Select user"
+msgstr "Výběr uživatele"
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "SelectMultiple"
+msgstr "Výběr vícenásobný"
+
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectSingle"
+msgstr "Výbět jedine�ný"
+
+#: html/SelfService/index.html:25
+msgid "Self Service"
+msgstr "Samoobsluha"
+
+#: etc/initialdata:114
+msgid "Send mail to all watchers"
+msgstr "Zaslat e-mail všem pozorovatelům"
+
+#: etc/initialdata:110
+msgid "Send mail to all watchers as a \"comment\""
+msgstr "Zaslat e-mail všem pozorovatelům jako \"komentář\""
+
+#: etc/initialdata:105
+msgid "Send mail to requestors and Ccs"
+msgstr "Zaslat e-mail žadatelům a všem Cc"
+
+#: etc/initialdata:100
+msgid "Send mail to requestors and Ccs as a comment"
+msgstr "Zaslat e-mail žadatelům a všem Ccs jako komentář"
+
+#: etc/initialdata:79
+msgid "Sends a message to the requestors"
+msgstr "Posílá zprávu všem žadatelům"
+
+#: etc/initialdata:118 etc/initialdata:122
+msgid "Sends mail to explicitly listed Ccs and Bccs"
+msgstr "Posílá e-mail všem přesně vyjmenovaným Cc a Bcc"
+
+#: etc/initialdata:95
+msgid "Sends mail to the administrative Ccs"
+msgstr "Posílá e-mail všem administrativním Cc"
+
+#: etc/initialdata:91
+msgid "Sends mail to the administrative Ccs as a comment"
+msgstr "Posílá e-mail všem administrativním Cc jako komentář"
+
+#: etc/initialdata:83 etc/initialdata:87
+msgid "Sends mail to the owner"
+msgstr "Posílá e-mail vlastníkovi"
+
+#: lib/RT/Date.pm:419
+msgid "Sep."
+msgstr "zář"
+
+#: NOT FOUND IN SOURCE
+msgid "Show Results"
+msgstr "Zobrazit výsledky"
+
+#: html/Approvals/Elements/PendingMyApproval:44
+msgid "Show approved requests"
+msgstr "Zobrazit schválené požadavky"
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show basics"
+msgstr "Zobrazit základní údaje"
+
+#: html/Approvals/Elements/PendingMyApproval:45
+msgid "Show denied requests"
+msgstr "Zobrazit odepřené požadavky"
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show details"
+msgstr "Zobrazit podrobnosti"
+
+#: html/Approvals/Elements/PendingMyApproval:43
+msgid "Show pending requests"
+msgstr "Zobrazit trvající požadavky"
+
+#: html/Approvals/Elements/PendingMyApproval:46
+msgid "Show requests awaiting other approvals"
+msgstr "Zobrazit požadavky �ekající na jejich schválení"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "Show ticket private commentary"
+msgstr "Zobrazovat privátní komentáře požadavku"
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "Show ticket summaries"
+msgstr "Zobrazovat výsledky požadavku"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "ShowACL"
+msgstr "Zobrazovat seznam přístupových práv"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "ShowScrips"
+msgstr "Zobrazit scripy"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "ShowTemplate"
+msgstr "Zobrazit vzor"
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "ShowTicket"
+msgstr "Zobrazit požadavek"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "ShowTicketComments"
+msgstr "Zobrazit komentáře požadavku"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Sign up as a ticket Requestor or ticket or queue Cc"
+msgstr "Být žadatelem �i Cc požadavku �i fronty"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "Sign up as a ticket or queue AdminCc"
+msgstr "Být AdminCc požadavku nebo fronty"
+
+#: html/Admin/Elements/ModifyUser:39 html/Admin/Users/Modify.html:191 html/Admin/Users/Prefs.html:32 html/SelfService/Prefs.html:37 html/User/Prefs.html:112
+msgid "Signature"
+msgstr "Podpis"
+
+#: html/SelfService/Elements/Header:52
+#. ($session{'CurrentUser'}->Name)
+msgid "Signed in as %1"
+msgstr "Příhlášen jako %1"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:26
+msgid "Single"
+msgstr "Jednoduchá"
+
+#: html/Elements/Header:51
+msgid "Skip Menu"
+msgstr "Přesko�it menu"
+
+#: html/Admin/Elements/EditCustomFieldValues:31
+msgid "Sort key"
+msgstr "Třídící klí�"
+
+#: html/Search/Elements/PickRestriction:109
+msgid "Sort results by"
+msgstr "Třídit výsledky dle"
+
+#: html/Admin/Elements/AddCustomFieldValue:25
+msgid "SortOrder"
+msgstr "Třídící pořadí"
+
+#: NOT FOUND IN SOURCE
+msgid "Stalled"
+msgstr "Odložené"
+
+#: NOT FOUND IN SOURCE
+msgid "Start page"
+msgstr "Úvodní stránka"
+
+#: html/Elements/SelectDateType:27 html/Ticket/Elements/EditDates:32 html/Ticket/Elements/ShowDates:35
+msgid "Started"
+msgstr "Zapo�ato"
+
+#: NOT FOUND IN SOURCE
+msgid "Started date '%1' could not be parsed"
+msgstr "Datum zapo�etí '%1' nemůže být rozpoznáno"
+
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:27 html/Ticket/Elements/ShowDates:31
+msgid "Starts"
+msgstr "Za�íná"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts By"
+msgstr "Za�íná"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts date '%1' could not be parsed"
+msgstr "Datum za�ínání '%1' nemůže být rozpoznáno"
+
+#: html/Admin/Elements/ModifyUser:82 html/Admin/Users/Modify.html:138 html/User/Prefs.html:94
+msgid "State"
+msgstr "Stát"
+
+#: html/Elements/MyRequests:31 html/Elements/MyTickets:31 html/Search/Elements/PickRestriction:74 html/SelfService/Display.html:59 html/SelfService/Elements/MyRequests:29 html/SelfService/Update.html:31 html/Ticket/Create.html:42 html/Ticket/Elements/EditBasics:38 html/Ticket/Elements/ShowBasics:31 html/Ticket/Update.html:60 lib/RT/Ticket_Overlay.pm:1164 lib/RT/Tickets_Overlay.pm:908
+msgid "Status"
+msgstr "Stav"
+
+#: etc/initialdata:288
+msgid "Status Change"
+msgstr "Změna Stavu"
+
+#: lib/RT/Transaction_Overlay.pm:530
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
+msgid "Status changed from %1 to %2"
+msgstr "Stav změněn z %1 na %2"
+
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr "Změna stavu"
+
+#: html/Ticket/Elements/Tabs:147
+msgid "Steal"
+msgstr "Vzít"
+
+#: lib/RT/Transaction_Overlay.pm:589
+#. ($Old->Name)
+msgid "Stolen from %1 "
+msgstr "Vzato %1 "
+
+#: html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Search/Bulk.html:126 html/Search/Elements/PickRestriction:43 html/SelfService/Create.html:59 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:35 html/Ticket/Create.html:84 html/Ticket/Elements/EditBasics:28 html/Ticket/ModifyAll.html:79 html/Ticket/Update.html:77 lib/RT/Ticket_Overlay.pm:1160 lib/RT/Tickets_Overlay.pm:987
+msgid "Subject"
+msgstr "Předmět"
+
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/Transaction_Overlay.pm:611
+#. ($self->Data)
+msgid "Subject changed to %1"
+msgstr "Předmět změněn na %1"
+
+#: html/Elements/Submit:59
+msgid "Submit"
+msgstr "Odeslat"
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr "Potvrdit model zpracování"
+
+#: lib/RT/Group_Overlay.pm:749
+msgid "Succeeded"
+msgstr "Úspěšné"
+
+#: lib/RT/Date.pm:394
+msgid "Sun."
+msgstr "ne"
+
+#: lib/RT/System.pm:54
+msgid "SuperUser"
+msgstr "Super uživatel"
+
+#: html/User/Elements/DelegateRights:77
+msgid "System"
+msgstr "Systém"
+
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:567 lib/RT/Interface/Web.pm:757 lib/RT/Interface/Web.pm:790
+msgid "System Error"
+msgstr "Systémová chyba"
+
+#: lib/RT/ACE_Overlay.pm:616
+msgid "System error. Right not delegated."
+msgstr "Systémová chyba. Právo nedelegováno."
+
+#: lib/RT/ACE_Overlay.pm:146 lib/RT/ACE_Overlay.pm:223 lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:898
+msgid "System error. Right not granted."
+msgstr "Systémová chyba. Právo nepřiděleno."
+
+#: html/Admin/Global/GroupRights.html:35 html/Admin/Groups/GroupRights.html:37 html/Admin/Queues/GroupRights.html:36
+msgid "System groups"
+msgstr "Systémové skupiny"
+
+#: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
+msgid "SystemRolegroup for internal use"
+msgstr "Skupina systémovýh pravidel pro vnitřní použití"
+
+#: lib/RT/CurrentUser.pm:320
+msgid "TEST_STRING"
+msgstr "Mícha�ka na beton"
+
+#: html/Ticket/Elements/Tabs:143
+msgid "Take"
+msgstr "Vzít"
+
+#: lib/RT/Transaction_Overlay.pm:575
+msgid "Taken"
+msgstr "Vzatý"
+
+#: html/Admin/Elements/EditScrip:81
+msgid "Template"
+msgstr "Vzor"
+
+#: html/Admin/Global/Template.html:91 html/Admin/Queues/Template.html:90
+#. ($TemplateObj->Id())
+msgid "Template #%1"
+msgstr "Vzor #%!"
+
+#: html/Admin/Elements/EditTemplates:89
+msgid "Template deleted"
+msgstr "Vzor smazán"
+
+#: lib/RT/Scrip_Overlay.pm:153
+msgid "Template not found"
+msgstr "Vzor nenalezen"
+
+#: NOT FOUND IN SOURCE
+msgid "Template not found\\n"
+msgstr "Vzor nenalezen\\n"
+
+#: lib/RT/Template_Overlay.pm:347
+msgid "Template parsed"
+msgstr "Vzor rozpoznán"
+
+#: html/Admin/Elements/QueueTabs:49 html/Admin/Elements/SystemTabs:36 html/Admin/Global/index.html:45
+msgid "Templates"
+msgstr "Vzory"
+
+#: NOT FOUND IN SOURCE
+msgid "Templates for %1\\n"
+msgstr "Vzory pro %1\\n"
+
+#: lib/RT/Interface/Web.pm:858
+msgid "That is already the current value"
+msgstr "Toto je již aktuální hodnota"
+
+#: lib/RT/CustomField_Overlay.pm:178
+msgid "That is not a value for this custom field"
+msgstr "Toto není hodnota pro tuto uživatelskou položku"
+
+#: lib/RT/Ticket_Overlay.pm:1886
+msgid "That is the same value"
+msgstr "Toto je shodná hodnota"
+
+#: lib/RT/Queue_Overlay.pm:633
+#. ($args{'Type'})
+msgid "That principal is already a %1 for this queue"
+msgstr "Tento uživatel je již v této frontě %1"
+
+#: lib/RT/Ticket_Overlay.pm:1434
+#. ($self->loc($args{'Type'}))
+msgid "That principal is already a %1 for this ticket"
+msgstr "Tento uživatel je již u tohoto požadavku %1"
+
+#: lib/RT/Queue_Overlay.pm:732
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this queue"
+msgstr "Tento uživatel není v této frontě %1"
+
+#: lib/RT/Ticket_Overlay.pm:1551
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this ticket"
+msgstr "Tento uživatel není u tohoto požadavku %1"
+
+#: lib/RT/Ticket_Overlay.pm:1882
+msgid "That queue does not exist"
+msgstr "Tata fronta neexistuje"
+
+#: lib/RT/Ticket_Overlay.pm:3143
+msgid "That ticket has unresolved dependencies"
+msgstr "Tento požadavek má nevyřešené závislosti"
+
+#: lib/RT/ACE_Overlay.pm:288 lib/RT/ACE_Overlay.pm:597
+msgid "That user already has that right"
+msgstr "Tento uživatel již má toto právo"
+
+#: lib/RT/Ticket_Overlay.pm:2952
+msgid "That user already owns that ticket"
+msgstr "Tento uživatel již tento požadavek vlastní"
+
+#: lib/RT/Ticket_Overlay.pm:2918
+msgid "That user does not exist"
+msgstr "Tento uživatel neexistuje"
+
+#: lib/RT/User_Overlay.pm:315
+msgid "That user is already privileged"
+msgstr "Tento uživatel je již privilegován"
+
+#: lib/RT/User_Overlay.pm:332
+msgid "That user is already unprivileged"
+msgstr "Tento uživatel je již neprivilegován"
+
+#: lib/RT/User_Overlay.pm:327
+msgid "That user is now privileged"
+msgstr "Uživatel je nyní privilegován"
+
+#: lib/RT/User_Overlay.pm:344
+msgid "That user is now unprivileged"
+msgstr "Uživatel je nyní neprivilegován"
+
+#: lib/RT/Ticket_Overlay.pm:2944
+msgid "That user may not own tickets in that queue"
+msgstr "V této frontě nemůže tento uživatel vlastnit požadavky"
+
+#: lib/RT/Link_Overlay.pm:206
+msgid "That's not a numerical id"
+msgstr "Toto není �íselný identifikátor"
+
+#: html/Ticket/Create.html:150 html/Ticket/Elements/ShowSummary:28
+msgid "The Basics"
+msgstr "Základní údaje"
+
+#: lib/RT/ACE_Overlay.pm:88
+msgid "The CC of a ticket"
+msgstr "Cc požadavku"
+
+#: lib/RT/ACE_Overlay.pm:89
+msgid "The administrative CC of a ticket"
+msgstr "Administrativní Cc požadavku"
+
+#: lib/RT/Ticket_Overlay.pm:2213
+msgid "The comment has been recorded"
+msgstr "Komentář byl zaznamenán"
+
+#: bin/rt-crontool:198
+msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
+msgstr "Následující příkaz najde všechny aktivní požadavky ve frontě 'general' a nastaví jejich priority na 99, pokud nebyly tknuty poslední 4 hodiny:"
+
+#: bin/rt-commit-handler:756 bin/rt-commit-handler:766
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr "Následující příkazy nebyly zpracovány\\n\\n"
+
+#: lib/RT/Interface/Web.pm:861
+msgid "The new value has been set."
+msgstr "Nová hodnota nastavena."
+
+#: lib/RT/ACE_Overlay.pm:86
+msgid "The owner of a ticket"
+msgstr "Vlastník požadavku"
+
+#: lib/RT/ACE_Overlay.pm:87
+msgid "The requestor of a ticket"
+msgstr "Žadatel požadavku"
+
+#: html/Admin/Elements/EditUserComments:26
+msgid "These comments aren't generally visible to the user"
+msgstr "Tyto komentáře nejsou běžně viditelné uživateli"
+
+#: NOT FOUND IN SOURCE
+msgid "This ticket %1 %2 (%3)\\n"
+msgstr "Tento požadavek %1 %2 (%3)\\n"
+
+#: bin/rt-crontool:189
+msgid "This tool allows the user to run arbitrary perl modules from within RT."
+msgstr "Tento nástroj umožňuje uživateli spustit libovolné perl moduly z RT."
+
+#: lib/RT/Transaction_Overlay.pm:253
+msgid "This transaction appears to have no content"
+msgstr "Tato transakce vypadá, že nemá obsah"
+
+#: html/Ticket/Elements/ShowRequestor:47
+#. ($rows)
+msgid "This user's %1 highest priority tickets"
+msgstr "nejdůležitější%quant(%1, požadavek,požadavky,ch požadavků) tohoto uživatele"
+
+#: NOT FOUND IN SOURCE
+msgid "This user's 25 highest priority tickets"
+msgstr "25 nejdůležitějších požadavků tohoto uživatele"
+
+#: lib/RT/Date.pm:391
+msgid "Thu."
+msgstr "�t"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1  %2"
+msgstr "Požadavek # %1 %2"
+
+#: html/Ticket/ModifyAll.html:25 html/Ticket/ModifyAll.html:29
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket #%1 Jumbo update: %2"
+msgstr "Maxi aktualizace požadavku #%1: %2"
+
+#: html/Approvals/Elements/ShowDependency:46
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Ticket #%1: %2"
+msgstr "Požadavek #%1: %2"
+
+#: lib/RT/Ticket_Overlay.pm:608
+#. ($self->Id, $QueueObj->Name)
+msgid "Ticket %1 created in queue '%2'"
+msgstr "Požadavek %1 vytvořen ve frontě '%2'"
+
+#: bin/rt-commit-handler:760
+#. ($Ticket->Id)
+msgid "Ticket %1 loaded\\n"
+msgstr "Požadavek %1 na�ten\\n"
+
+#: html/Search/Bulk.html:181
+#. ($Ticket->Id,$_)
+msgid "Ticket %1: %2"
+msgstr "Požadavek %1: %2"
+
+#: html/Ticket/History.html:25 html/Ticket/History.html:28
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket History # %1 %2"
+msgstr "Historie požadavku # %1 %2"
+
+#: html/SelfService/Display.html:34
+msgid "Ticket Id"
+msgstr "Identifikátor požadavku"
+
+#: etc/initialdata:303
+msgid "Ticket Resolved"
+msgstr "Požadavek vyřešen"
+
+#: html/Search/Elements/PickRestriction:63
+msgid "Ticket attachment"
+msgstr "Příloha požadavku"
+
+#: lib/RT/Tickets_Overlay.pm:1166
+msgid "Ticket content"
+msgstr "Obsah požadavku"
+
+#: lib/RT/Tickets_Overlay.pm:1212
+msgid "Ticket content type"
+msgstr "Typ obsahu požadavku"
+
+#: lib/RT/Ticket_Overlay.pm:495 lib/RT/Ticket_Overlay.pm:597
+msgid "Ticket could not be created due to an internal error"
+msgstr "Požadaven nemůže být vytvořen pro vnitřní chybu"
+
+#: lib/RT/Transaction_Overlay.pm:522
+msgid "Ticket created"
+msgstr "Požadavek vytvořen"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket creation failed"
+msgstr "Nezdařilo se vytvoření požadavku"
+
+#: lib/RT/Transaction_Overlay.pm:527
+msgid "Ticket deleted"
+msgstr "Požadavek smazán"
+
+#: html/REST/1.0/modify:29 html/REST/1.0/update:34
+msgid "Ticket id not found"
+msgstr "Id požadavku nenalezeno"
+
+#: html/REST/1.0/modify:36 html/REST/1.0/update:41
+msgid "Ticket not found"
+msgstr "Požadavek nenalezen"
+
+#: etc/initialdata:289
+msgid "Ticket status changed"
+msgstr "Stav požadavku změněn"
+
+#: html/Ticket/Update.html:39
+msgid "Ticket watchers"
+msgstr "Pozorovatelé požadavku"
+
+#: html/Elements/Tabs:49
+msgid "Tickets"
+msgstr "Požadavky"
+
+#: lib/RT/Tickets_Overlay.pm:1383
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr "Požadavky %1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:1348
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr "Požadavky %1 dle %2"
+
+#: html/Elements/ViewUser:26
+#. ($name)
+msgid "Tickets from %1"
+msgstr "Požadavky z %1"
+
+#: html/Approvals/Elements/ShowDependency:27
+msgid "Tickets which depend on this approval:"
+msgstr "Požadavky, které záleží na tomto schválení:"
+
+#: html/Ticket/Create.html:157 html/Ticket/Elements/EditBasics:48
+msgid "Time Left"
+msgstr "Zbývající �as"
+
+#: html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:43
+msgid "Time Worked"
+msgstr "Čas práce"
+
+#: lib/RT/Tickets_Overlay.pm:1139
+msgid "Time left"
+msgstr "Zbývající �as"
+
+#: html/Elements/Footer:36
+msgid "Time to display"
+msgstr "Čas k zobrazení"
+
+#: lib/RT/Tickets_Overlay.pm:1115
+msgid "Time worked"
+msgstr "Čas práce"
+
+#: lib/RT/Ticket_Overlay.pm:1165
+msgid "TimeWorked"
+msgstr "Čas práce"
+
+#: bin/rt-commit-handler:402
+msgid "To generate a diff of this commit:"
+msgstr "Vytvořit diff tohoto commitu:"
+
+#: bin/rt-commit-handler:391
+msgid "To generate a diff of this commit:\\n"
+msgstr "Vytvořit diff tohoto commitu:\\n"
+
+#: lib/RT/Ticket_Overlay.pm:1168
+msgid "Told"
+msgstr "Poslední kontakt"
+
+#: etc/initialdata:237
+msgid "Transaction"
+msgstr "Transakce"
+
+#: lib/RT/Transaction_Overlay.pm:642
+#. ($self->Data)
+msgid "Transaction %1 purged"
+msgstr "Transakce %1 vymazána"
+
+#: lib/RT/Transaction_Overlay.pm:177
+msgid "Transaction Created"
+msgstr "Transakce vytvořena"
+
+#: lib/RT/Transaction_Overlay.pm:89
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr "Bez udání id požadavku nelze volat Transaction->Create"
+
+#: lib/RT/Transaction_Overlay.pm:701
+msgid "Transactions are immutable"
+msgstr "Transakce jsou neměnné"
+
+#: NOT FOUND IN SOURCE
+msgid "Trying to delete a right: %1"
+msgstr "Pokus o smazání práva: %1"
+
+#: lib/RT/Date.pm:389
+msgid "Tue."
+msgstr "út"
+
+#: html/Admin/Elements/EditCustomField:34 html/Ticket/Elements/AddWatchers:33 html/Ticket/Elements/AddWatchers:44 html/Ticket/Elements/AddWatchers:54 lib/RT/Ticket_Overlay.pm:1166 lib/RT/Tickets_Overlay.pm:959
+msgid "Type"
+msgstr "typ"
+
+#: lib/RT/ScripCondition_Overlay.pm:104
+msgid "Unimplemented"
+msgstr "Neimplementováno"
+
+#: html/Admin/Users/Modify.html:68
+msgid "Unix login"
+msgstr "Unixový login"
+
+#: html/Admin/Elements/ModifyUser:62
+msgid "UnixUsername"
+msgstr "Unixové uživatelské jméno"
+
+#: lib/RT/Attachment_Overlay.pm:265
+#. ($self->ContentEncoding)
+msgid "Unknown ContentEncoding %1"
+msgstr "Neznámé kódování obsahu %1"
+
+#: html/Elements/SelectResultsPerPage:37
+msgid "Unlimited"
+msgstr "NeomezenÄ›"
+
+#: etc/initialdata:32
+msgid "Unprivileged"
+msgstr "Neprivilegovaný"
+
+#: lib/RT/Transaction_Overlay.pm:571
+msgid "Untaken"
+msgstr "Vrácen"
+
+#: html/Elements/MyTickets:64 html/Search/Bulk.html:33
+msgid "Update"
+msgstr "Aktualizace"
+
+#: html/Admin/Users/Prefs.html:62
+msgid "Update ID"
+msgstr "Identifikátor aktualizace"
+
+#: html/Search/Bulk.html:120 html/Ticket/ModifyAll.html:66 html/Ticket/Update.html:67
+msgid "Update Type"
+msgstr "Typ aktualizace"
+
+#: html/Search/Listing.html:61
+msgid "Update all these tickets at once"
+msgstr "Aktualizovat spole�ně všechny tyty požadavky"
+
+#: html/Admin/Users/Prefs.html:49
+msgid "Update email"
+msgstr "Aktualizovat email"
+
+#: html/Admin/Users/Prefs.html:55
+msgid "Update name"
+msgstr "Aktualizovat jméno"
+
+#: lib/RT/Interface/Web.pm:375
+msgid "Update not recorded."
+msgstr "Aktualizace nezaznamenána"
+
+#: html/Search/Bulk.html:81
+msgid "Update selected tickets"
+msgstr "Aktualizovat vybrané požadavky"
+
+#: html/Admin/Users/Prefs.html:36
+msgid "Update signature"
+msgstr "Aktualizace podpisu"
+
+#: html/Ticket/ModifyAll.html:63
+msgid "Update ticket"
+msgstr "Aktualizace požadavku"
+
+#: html/SelfService/Update.html:25 html/SelfService/Update.html:27
+#. ($Ticket->id)
+msgid "Update ticket # %1"
+msgstr "Aktualizace požadavku # %1"
+
+#: html/SelfService/Update.html:50
+#. ($Ticket->id)
+msgid "Update ticket #%1"
+msgstr "Aktualizace požadavku #%1"
+
+#: html/Ticket/Update.html:135
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Update ticket #%1 (%2)"
+msgstr "Aktualizace požadavku #%1 (%2)"
+
+#: lib/RT/Interface/Web.pm:373
+msgid "Update type was neither correspondence nor comment."
+msgstr "Typ aktualizace nebyl ani korespondence ani komentář."
+
+#: html/Elements/SelectDateType:33 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1169
+msgid "Updated"
+msgstr "Aktualizováno"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 %2: %3\\n"
+msgstr "Uživatel %1 %2: %3\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 Password: %2\\n"
+msgstr "Heslo uživatele %1: %2\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found"
+msgstr "Uživatel '%1' nenalezen"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found\\n"
+msgstr "Uživatel '%1' nenalezen\\n"
+
+#: etc/initialdata:125 etc/initialdata:191
+msgid "User Defined"
+msgstr "Uživatelem definované"
+
+#: html/Admin/Users/Prefs.html:59
+msgid "User ID"
+msgstr "Identifikátor uživatele"
+
+#: html/Elements/SelectUsers:26
+msgid "User Id"
+msgstr "Identifikátor uživatele"
+
+#: html/Admin/Elements/GroupTabs:47 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/SystemTabs:47 html/Admin/Global/index.html:59
+msgid "User Rights"
+msgstr "Práva uživatele"
+
+#: html/Admin/Users/Modify.html:226
+#. ($msg)
+msgid "User could not be created: %1"
+msgstr "Uživatel nemůže být vytvořen: %1"
+
+#: lib/RT/User_Overlay.pm:262
+msgid "User created"
+msgstr "Uživatel vytvořen"
+
+#: html/Admin/Global/GroupRights.html:67 html/Admin/Groups/GroupRights.html:54 html/Admin/Queues/GroupRights.html:68
+msgid "User defined groups"
+msgstr "Uživatelem definované skupiny"
+
+#: NOT FOUND IN SOURCE
+msgid "User notified"
+msgstr "Uživatel upozorněn"
+
+#: html/Admin/Users/Prefs.html:25 html/Admin/Users/Prefs.html:29
+msgid "User view"
+msgstr "Uživatelský pohled"
+
+#: html/Admin/Users/Modify.html:48 html/Elements/Login:42 html/Ticket/Elements/AddWatchers:35
+msgid "Username"
+msgstr "Uživatelské jméno"
+
+#: html/Admin/Elements/SelectNewGroupMembers:26 html/Admin/Elements/Tabs:32 html/Admin/Groups/Members.html:55 html/Admin/Queues/People.html:68 html/Admin/index.html:29 html/User/Groups/Members.html:58
+msgid "Users"
+msgstr "Uživatelé"
+
+#: html/Admin/Users/index.html:65
+msgid "Users matching search criteria"
+msgstr "Uživatelé odpovídající podmínce vyhledání"
+
+#: html/Search/Elements/PickRestriction:51
+msgid "ValueOfQueue"
+msgstr "Hodnota fronty"
+
+#: html/Admin/Elements/EditCustomField:40
+msgid "Values"
+msgstr "Hodnoty"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Watch"
+msgstr "Být pozorovatelem"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "WatchAsAdminCc"
+msgstr "Být AdminCc pozorovatelem"
+
+#: html/Admin/Elements/QueueTabs:42
+msgid "Watchers"
+msgstr "Pozorovatelé"
+
+#: html/Admin/Elements/ModifyUser:56
+msgid "WebEncoding"
+msgstr "Kódování WWW"
+
+#: lib/RT/Date.pm:390
+msgid "Wed."
+msgstr "st"
+
+#: etc/upgrade/2.1.71:161
+msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
+msgstr "Přidat korespondenci k původnímu požadavku, pokud byl požadavek schválen všemi"
+
+#: etc/upgrade/2.1.71:135
+msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
+msgstr "Přidat korespondenci k původnímu požadavku, pokud byl požadavek kýmkoli schválen"
+
+#: etc/initialdata:138
+msgid "When a ticket is created"
+msgstr "Když je požadavek vytvořen"
+
+#: etc/upgrade/2.1.71:79
+msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
+msgstr "Upozornit vlastníka a všechny AdminCc, jejichž schválení se o�ekává, při vytvoření schvalovaného požadavku"
+
+#: etc/initialdata:143
+msgid "When anything happens"
+msgstr "Stane-li se cokoli"
+
+#: etc/initialdata:184
+msgid "Whenever a ticket is resolved"
+msgstr "Je-li vyřešen požadavek"
+
+#: etc/initialdata:170
+msgid "Whenever a ticket's owner changes"
+msgstr "Změní-li se vlastník požadavku"
+
+#: etc/initialdata:178
+msgid "Whenever a ticket's queue changes"
+msgstr "Změní-li se fronta požadavku"
+
+#: etc/initialdata:162
+msgid "Whenever a ticket's status changes"
+msgstr "Změní-li se stav požadavku"
+
+#: etc/initialdata:192
+msgid "Whenever a user-defined condition occurs"
+msgstr "Splní-li se uživatelská podmínka"
+
+#: etc/initialdata:156
+msgid "Whenever comments come in"
+msgstr "Přijde-li komentář"
+
+#: etc/initialdata:149
+msgid "Whenever correspondence comes in"
+msgstr "Přijde-li korespondence"
+
+#: html/Admin/Users/Modify.html:164 html/User/Prefs.html:52
+msgid "Work"
+msgstr "Zaměstnání"
+
+#: html/Admin/Elements/ModifyUser:70
+msgid "WorkPhone"
+msgstr "Telefon do zaměstnání"
+
+#: html/SelfService/Display.html:86 html/Ticket/Elements/ShowBasics:35 html/Ticket/Update.html:65
+msgid "Worked"
+msgstr "Odpracováno"
+
+#: lib/RT/Ticket_Overlay.pm:3056
+msgid "You already own this ticket"
+msgstr "Požadavek již vlastníte"
+
+#: html/autohandler:121
+msgid "You are not an authorized user"
+msgstr "Nejste autorizovaný uživatel"
+
+#: lib/RT/Ticket_Overlay.pm:2930
+msgid "You can only reassign tickets that you own or that are unowned"
+msgstr "Můžete přidělit pouze požadavky, které jsou vaše nebo nejsou vlastněny"
+
+#: NOT FOUND IN SOURCE
+msgid "You don't have permission to view that ticket.\\n"
+msgstr "Nemáte právo k zobrazení tohoto požadavku.\\n"
+
+#: docs/design_docs/string-extraction-guide.txt:47
+#. ($num, $queue)
+msgid "You found %1 tickets in queue %2"
+msgstr "Nalezl jste %1 požadavků ve frontě %2"
+
+#??? quant
+#: html/NoAuth/Logout.html:31 html/REST/1.0/logout:25
+msgid "You have been logged out of RT."
+msgstr "Byl jste odhlášen od RT."
+
+#: html/SelfService/Display.html:134
+msgid "You have no permission to create tickets in that queue."
+msgstr "V této frontě nemáte práva vytvářet požadavky."
+
+#: lib/RT/Ticket_Overlay.pm:1895
+msgid "You may not create requests in that queue."
+msgstr "V této frontě nemůžete vytvářet požadavky."
+
+#: html/NoAuth/Logout.html:36
+msgid "You're welcome to login again"
+msgstr "Jste vítáni k dalšímu přihlášení"
+
+#: html/SelfService/Elements/MyRequests:25
+#. ($friendly_status)
+msgid "Your %1 requests"
+msgstr "Vašich %1 požadavků"
+
+#: NOT FOUND IN SOURCE
+msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
+msgstr "Váš správce RT chybně nastavil poštovní aliasy, které volají RT"
+
+#: etc/initialdata:429 etc/upgrade/2.1.71:146
+msgid "Your request has been approved by %1. Other approvals may still be pending."
+msgstr "Váš požadavek byl schválen uživatelem %1. Další schválení mohou být ještě o�ekávána."
+
+#: etc/initialdata:463 etc/upgrade/2.1.71:180
+msgid "Your request has been approved."
+msgstr "Váš požadavek byl schválen."
+
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr "Váš požadavek byl odmítnut"
+
+#: etc/initialdata:384 etc/upgrade/2.1.71:101
+msgid "Your request was rejected."
+msgstr "Váš požadavek byl odmítnut."
+
+#: html/autohandler:136 html/autohandler:142
+msgid "Your username or password is incorrect"
+msgstr "Vaše uživatelské jméno �i heslo je nesprávné"
+
+#: html/Admin/Elements/ModifyUser:84 html/Admin/Users/Modify.html:144 html/User/Prefs.html:96
+msgid "Zip"
+msgstr "PSČ"
+
+#: html/User/Elements/DelegateRights:59
+#. ($right->PrincipalObj->Object->SelfDescription)
+msgid "as granted to %1"
+msgstr "jak je dovoleno %1"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:34
+msgid "contains"
+msgstr "obsahuje"
+
+#: html/Elements/SelectAttachmentField:26
+msgid "content"
+msgstr "obsah"
+
+#: html/Elements/SelectAttachmentField:27
+msgid "content-type"
+msgstr "typ obsahu"
+
+#: lib/RT/Ticket_Overlay.pm:2282
+msgid "correspondence (probably) not sent"
+msgstr "korespondence (zřejmě) neposlána"
+
+#: lib/RT/Ticket_Overlay.pm:2292
+msgid "correspondence sent"
+msgstr "korespondence poslána"
+
+#: html/Admin/Elements/ModifyQueue:63 html/Admin/Queues/Modify.html:77 lib/RT/Date.pm:319
+msgid "days"
+msgstr "dnů"
+
+#: html/Search/Listing.html:75
+msgid "delete"
+msgstr "smazat"
+
+#: lib/RT/Queue_Overlay.pm:63
+msgid "deleted"
+msgstr "smazán"
+
+#: html/Search/Elements/PickRestriction:68
+msgid "does not match"
+msgstr "neodpovídá"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:35
+msgid "doesn't contain"
+msgstr "neobsahuje"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "equal to"
+msgstr "je rovno"
+
+#: html/Elements/SelectAttachmentField:28
+msgid "filename"
+msgstr "název souboru"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "greater than"
+msgstr "větší než"
+
+#: lib/RT/Group_Overlay.pm:194
+#. ($self->Name)
+msgid "group '%1'"
+msgstr "skupina '%1'"
+
+#: lib/RT/Date.pm:315
+msgid "hours"
+msgstr "hodin"
+
+#: NOT FOUND IN SOURCE
+msgid "id"
+msgstr "Identifikátor"
+
+#: html/Elements/SelectBoolean:32 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88
+msgid "is"
+msgstr "je"
+
+#: html/Elements/SelectBoolean:36 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:37 html/Search/Elements/PickRestriction:48 html/Search/Elements/PickRestriction:77 html/Search/Elements/PickRestriction:89
+msgid "isn't"
+msgstr "není"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "less than"
+msgstr "menší než"
+
+#: html/Search/Elements/PickRestriction:67
+msgid "matches"
+msgstr "odpovídá"
+
+#: lib/RT/Date.pm:311
+msgid "min"
+msgstr "min"
+
+#: html/Ticket/Update.html:66
+msgid "minutes"
+msgstr "minut"
+
+#: bin/rt-commit-handler:765
+msgid "modifications\\n\\n"
+msgstr "úpravy\\n\\n"
+
+#: lib/RT/Date.pm:327
+msgid "months"
+msgstr "měsíců"
+
+#: lib/RT/Queue_Overlay.pm:58
+msgid "new"
+msgstr "nový"
+
+#: html/Admin/Elements/EditScrips:43
+msgid "no value"
+msgstr "znehodnotit"
+
+#: html/Ticket/Elements/EditWatchers:28
+msgid "none"
+msgstr "žádný"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "not equal to"
+msgstr "není rovno"
+
+#: lib/RT/Queue_Overlay.pm:59
+msgid "open"
+msgstr "otevřený"
+
+#: lib/RT/Group_Overlay.pm:199
+#. ($self->Name, $user->Name)
+msgid "personal group '%1' for user '%2'"
+msgstr "vlastní skupina '%1' pro uživatele '%2'"
+
+#: lib/RT/Group_Overlay.pm:207
+#. ($queue->Name, $self->Type)
+msgid "queue %1 %2"
+msgstr "fronta %1 %2"
+
+#: lib/RT/Queue_Overlay.pm:62
+msgid "rejected"
+msgstr "zamítnutý"
+
+#: lib/RT/Queue_Overlay.pm:61
+msgid "resolved"
+msgstr "vyřešený"
+
+#: lib/RT/Date.pm:307
+msgid "sec"
+msgstr "sek"
+
+#: lib/RT/Queue_Overlay.pm:60
+msgid "stalled"
+msgstr "odložený"
+
+#: lib/RT/Group_Overlay.pm:202
+#. ($self->Type)
+msgid "system %1"
+msgstr "systém %1"
+
+#: lib/RT/Group_Overlay.pm:213
+#. ($self->Type)
+msgid "system group '%1'"
+msgstr "systémová skupina '%1'"
+
+#: html/Elements/Error:42 html/SelfService/Error.html:42
+msgid "the calling component did not specify why"
+msgstr "volající komponenta neudala důvod"
+
+#: lib/RT/Group_Overlay.pm:210
+#. ($self->Instance, $self->Type)
+msgid "ticket #%1 %2"
+msgstr "požadavek #%1 %2"
+
+#: lib/RT/Group_Overlay.pm:216
+#. ($self->Id)
+msgid "undescribed group %1"
+msgstr "nepopsaná skupina %1"
+
+#: NOT FOUND IN SOURCE
+msgid "undescripbed group %1"
+msgstr "nepopsaná skupina %1"
+
+#: lib/RT/Group_Overlay.pm:191
+#. ($user->Object->Name)
+msgid "user %1"
+msgstr "uživatel %1"
+
+#: lib/RT/Date.pm:323
+msgid "weeks"
+msgstr "týdnů"
+
+#: NOT FOUND IN SOURCE
+msgid "with template %1"
+msgstr "se vzorem %1"
+
+#: lib/RT/Date.pm:331
+msgid "years"
+msgstr "roků"
+
diff --git a/rt/lib/RT/I18N/de.po b/rt/lib/RT/I18N/de.po
new file mode 100644
index 000000000..3595aad47
--- /dev/null
+++ b/rt/lib/RT/I18N/de.po
@@ -0,0 +1,4500 @@
+# German localization catalog for Request Tracker (RT)
+# FIRST AUTHOR: Florian Bischof <flo@fxb.de>, May 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: RT 2.1.54\n"
+"POT-Creation-Date: 2002-06-22 06:06+0200\n"
+"PO-Revision-Date: 2003-02-20 04:47+0200\n"
+"Last-Translator: Florian Bischof <flo@fxb.de>\n"
+"Language-Team: RT German <rt@fxb.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: html/Elements/MyRequests:28 html/Elements/MyTickets:28
+msgid "#"
+msgstr "#"
+
+#: html/Admin/Queues/Scrip.html:55
+#. ($QueueObj->id)
+msgid "#%1"
+msgstr ""
+
+#: html/Approvals/Elements/ShowDependency:50 html/Ticket/Display.html:26 html/Ticket/Display.html:30
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "#%1: %2"
+msgstr "#%1: %2"
+
+#: lib/RT/Date.pm:337
+#. ($s, $time_unit)
+msgid "%1 %2"
+msgstr "%1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:771
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr "%1 %2 %3"
+
+#: lib/RT/Date.pm:373
+#. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
+msgid "%1 %2 %3 %4:%5:%6 %7"
+msgstr "%1 %3. %2 %7, %4:%5:%6"
+
+#: lib/RT/Ticket_Overlay.pm:3438 lib/RT/Transaction_Overlay.pm:559 lib/RT/Transaction_Overlay.pm:601
+#. ($cf->Name, $new_value->Content)
+#. ($field, $self->NewValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 added"
+msgstr "%1 %2 hinzugefügt"
+
+#: lib/RT/Date.pm:334
+#. ($s, $time_unit)
+msgid "%1 %2 ago"
+msgstr "vor %1 %2"
+
+#: lib/RT/Ticket_Overlay.pm:3444 lib/RT/Transaction_Overlay.pm:566
+#. ($cf->Name, $old_value, $new_value->Content)
+#. ($field, $self->OldValue, $self->NewValue)
+msgid "%1 %2 changed to %3"
+msgstr "%1 %2 geändert in %3"
+
+#: lib/RT/Ticket_Overlay.pm:3441 lib/RT/Transaction_Overlay.pm:562 lib/RT/Transaction_Overlay.pm:607
+#. ($cf->Name, $old_value)
+#. ($field, $self->OldValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 deleted"
+msgstr "%1 %2 gelöscht"
+
+#: html/Admin/Elements/EditScrips:44 html/Admin/Elements/ListGlobalScrips:28
+#. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
+msgid "%1 %2 with template %3"
+msgstr "%1 %2 mit der Vorlage %3"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 this ticket\\n"
+msgstr "%1 (%2) %3 dieses Ticket\\n"
+
+#: html/Search/Listing.html:57
+#. (($session{'tickets'}->FirstRow+1), ($session{'tickets'}->FirstRow() + $session{'tickets'}->RowsPerPage()  ))
+msgid "%1 - %2 shown"
+msgstr "%1 - %2 angezeigt"
+
+#: bin/rt-crontool:169 bin/rt-crontool:176 bin/rt-crontool:182
+#. ("--search-argument", "--search")
+#. ("--condition-argument", "--condition")
+#. ("--action-argument", "--action")
+msgid "%1 - An argument to pass to %2"
+msgstr "%1 - ein Argument zur Ãœbergabe an %2"
+
+#: bin/rt-crontool:185
+#. ("--verbose")
+msgid "%1 - Output status updates to STDOUT"
+msgstr ""
+
+#msgstr "%1 - Schreibe Statusupdates nach STDOUT"
+#: bin/rt-crontool:179
+#. ("--action")
+msgid "%1 - Specify the action module you want to use"
+msgstr "%1 - Gebe an, welches Action-Modul benutzt werden soll"
+
+#: bin/rt-crontool:173
+#. ("--condition")
+msgid "%1 - Specify the condition module you want to use"
+msgstr "%1 - Gebe an, welches Condition-Modul benutzt werden soll"
+
+#: bin/rt-crontool:166
+#. ("--search")
+msgid "%1 - Specify the search module you want to use"
+msgstr "%1 - Gebe an, welches Search-Modul benutzt werden soll"
+
+#: lib/RT/ScripAction_Overlay.pm:122
+#. ($self->Id)
+msgid "%1 ScripAction loaded"
+msgstr "ScripAction %1 geladen"
+
+#: lib/RT/Ticket_Overlay.pm:3471
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 added as a value for %2"
+msgstr "%1 als Wert für %2 hinzugefügt"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on (from %2) %3"
+msgstr ""
+
+#: lib/RT/Link_Overlay.pm:117 lib/RT/Link_Overlay.pm:124
+#. ($args{'Base'})
+#. ($args{'Target'})
+msgid "%1 appears to be a local object, but can't be found in the database"
+msgstr "%1 konnte nicht in der Datenbank gefunden werden obwohl es ein lokales Objekt zu sein scheint"
+
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:483
+#. ($self->BriefDescription , $self->CreatorObj->Name)
+#. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
+msgid "%1 by %2"
+msgstr "am %1 von %2"
+
+#: lib/RT/Transaction_Overlay.pm:537 lib/RT/Transaction_Overlay.pm:626 lib/RT/Transaction_Overlay.pm:635 lib/RT/Transaction_Overlay.pm:638
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
+#. ($self->Field , $q1->Name , $q2->Name)
+#. ($self->Field, $t2->AsString, $t1->AsString)
+#. ($self->Field, $self->OldValue, $self->NewValue)
+msgid "%1 changed from %2 to %3"
+msgstr "%1 von %2 in %3 geändert"
+
+#: lib/RT/Interface/Web.pm:857
+msgid "%1 could not be set to %2."
+msgstr "%1 konnte nicht auf %2 gesetzt werden."
+
+#: NOT FOUND IN SOURCE
+msgid "%1 couldn't init a transaction (%2)\\n"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2813
+#. ($self)
+msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
+msgstr "%1 konnte den Status nicht auf erledigt setzen. Die RT-Datenbank könnte inkonsistent sein."
+
+#: html/Elements/MyTickets:25
+#. ($rows)
+msgid "%1 highest priority tickets I own..."
+msgstr "%1 mir zugewiesene Anfragen mit höchster Priorität..."
+
+#: html/Elements/MyRequests:25
+#. ($rows)
+msgid "%1 highest priority tickets I requested..."
+msgstr "Die %1 von mir ausgelösten Anfragen mit höchster Priorität"
+
+#: bin/rt-crontool:161
+#. ($0)
+msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
+msgstr "%1 ist ein Werkzeug um Anfragen über externe Terminierungstools wie \"cron\" zu verarbeiten"
+
+#: lib/RT/Queue_Overlay.pm:743
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this queue."
+msgstr "%1 ist kein %2 dieses Stapels mehr."
+
+#: lib/RT/Ticket_Overlay.pm:1570
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this ticket."
+msgstr "%1 ist nicht mehr  %2 dieser Anfrage."
+
+#: lib/RT/Ticket_Overlay.pm:3527
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 is no longer a value for custom field %2"
+msgstr "%1 ist kein Wert des benutzerdefinierten Feldes %2 mehr"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 isn't a valid Queue id."
+msgstr "%1 ist keine gültige Stapel-Id."
+
+#: html/Ticket/Elements/ShowBasics:36
+#. ($TimeWorked)
+msgid "%1 min"
+msgstr "%1 Min"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 not shown"
+msgstr ""
+
+#: html/User/Elements/DelegateRights:76
+#. (loc($ObjectType =~ /^RT::(.*)$/))
+msgid "%1 rights"
+msgstr "%1 Rechte"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 succeeded\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for $MessageId"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for %2"
+msgstr ""
+
+#: lib/RT/Action/ResolveMembers.pm:42
+#. (ref $self)
+msgid "%1 will resolve all members of a resolved group ticket."
+msgstr "%1 wird alle Mitglieder eines erledigten Gruppentickets erledigen."
+
+#: NOT FOUND IN SOURCE
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:435
+#. ($self)
+msgid "%1: no attachment specified"
+msgstr "%1: kein Anhang angegeben"
+
+#: html/Ticket/Elements/ShowTransaction:102
+#. ($size)
+msgid "%1b"
+msgstr "%1b"
+
+#: html/Ticket/Elements/ShowTransaction:99
+#. (int($size/102.4)/10)
+msgid "%1k"
+msgstr "%1k"
+
+#: lib/RT/Ticket_Overlay.pm:1140
+#. ($args{'Status'})
+msgid "'%1' is an invalid value for status"
+msgstr "'%1' ist ein ungültiger Wert für Status"
+
+#: NOT FOUND IN SOURCE
+msgid "'%1' not a recognized action. "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete scrip)"
+msgstr "(Markieren um Scrip zu löschen)"
+
+#: html/Admin/Elements/EditQueueWatchers:29 html/Admin/Elements/EditScrips:35 html/Admin/Elements/EditTemplates:36 html/Admin/Groups/Members.html:52 html/Ticket/Elements/EditLinks:33 html/Ticket/Elements/EditPeople:46 html/User/Groups/Members.html:55
+msgid "(Check box to delete)"
+msgstr "(Markieren um zu löschen)"
+
+#: html/Ticket/Create.html:178
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr "(Gib Anfragenummern oder URLs getrennt durch Leerzeichen ein)"
+
+#: html/Admin/Queues/Modify.html:54 html/Admin/Queues/Modify.html:60
+#. ($RT::CorrespondAddress)
+#. ($RT::CommentAddress)
+msgid "(If left blank, will default to %1"
+msgstr "(Bei Freilassen %1"
+
+#: html/Admin/Elements/EditCustomFields:33 html/Admin/Elements/ListGlobalCustomFields:32
+msgid "(No custom fields)"
+msgstr "(Keine benutzerdefinierten Felder)"
+
+#: html/Admin/Groups/Members.html:50 html/User/Groups/Members.html:53
+msgid "(No members)"
+msgstr "(Keine Mitglieder)"
+
+#: html/Admin/Elements/EditScrips:32 html/Admin/Elements/ListGlobalScrips:32
+msgid "(No scrips)"
+msgstr "(Keine Scrips)"
+
+#: html/Admin/Elements/EditTemplates:31
+msgid "(No templates)"
+msgstr "(Keine Vorlagen)"
+
+#: html/Ticket/Update.html:85
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(Schickt eine Blindkopie dieser Aktualisierung an eine durch Komma getrennte Liste von E-Mail-Adressen. Ändert <b>nicht</b> wer künftig Aktualisierungen geschickt bekommt.)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr ""
+
+#: html/Ticket/Create.html:79
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(Schickt eine Kopie dieser Aktualisierung an eine durch Komma getrennte Liste von administrativen E-Mail-Adressen. Diese <b>werden</b> künftig Aktualisierungen erhalten.)"
+
+#: html/Ticket/Update.html:81
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(Schickt eine Kopie dieser Aktualisierung an eine durch Komma getrennte Liste von E-Mail-Adressen. Ändert <b>nicht</b> wer künftig Aktualisierungen geschickt bekommt.)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr ""
+
+#: html/Ticket/Create.html:69
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(Schickt eine Kopie dieser Aktualisierung an eine durch Komma getrennte Liste von E-Mail-Adressen. Diese <b>werden</b> künftig Aktualisierungen erhalten.)"
+
+#: html/Admin/Groups/index.html:33 html/User/Groups/index.html:33
+msgid "(empty)"
+msgstr "(leer)"
+
+#: html/Admin/Users/index.html:39
+msgid "(no name listed)"
+msgstr ""
+
+#: html/Elements/MyRequests:43 html/Elements/MyTickets:45
+msgid "(no subject)"
+msgstr "(kein Betreff)"
+
+#: html/Admin/Elements/SelectRights:48 html/Elements/SelectCustomFieldValue:30 html/Ticket/Elements/EditCustomField:59 html/Ticket/Elements/ShowCustomFields:36 lib/RT/Transaction_Overlay.pm:536
+msgid "(no value)"
+msgstr "(keine Angabe)"
+
+#: html/Ticket/Elements/EditLinks:116
+msgid "(only one ticket)"
+msgstr "(nur eine Anfrage)"
+
+#: html/Elements/MyRequests:52 html/Elements/MyTickets:55
+msgid "(pending approval)"
+msgstr "(wartet auf Freigabe)"
+
+#: html/Elements/MyRequests:54 html/Elements/MyTickets:57
+msgid "(pending other tickets)"
+msgstr "(wartet auf andere Anfragen)"
+
+#: html/Admin/Users/Modify.html:50
+msgid "(required)"
+msgstr "(notwendig)"
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "(untitled)"
+msgstr "(unbenannt)"
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:32
+msgid "<% $Ticket->Status%>"
+msgstr ""
+
+#: html/Elements/SelectTicketTypes:27
+msgid "<% $_ %>"
+msgstr ""
+
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:26
+#. ($m->scomp('/Elements/SelectNewTicketQueue'))
+msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
+msgstr "<input type=\"submit\" value=\"Neue Anfrage in\">&nbsp;%1"
+
+#: etc/initialdata:203
+msgid "A blank template"
+msgstr "Eine leere Vorlage"
+
+#: lib/RT/ACE_Overlay.pm:157 lib/RT/Principal_Overlay.pm:181
+msgid "ACE not found"
+msgstr "ACE nicht gefunden"
+
+#: lib/RT/ACE_Overlay.pm:831
+msgid "ACEs can only be created and deleted."
+msgstr "ACEs können nur erstellt und gelöscht werden."
+
+#: bin/rt-commit-handler:755
+msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgstr "Breche ab um ungewünschte Veränderungen an der Anfrage zu verhindern.\\n"
+
+#: html/User/Elements/Tabs:32
+msgid "About me"
+msgstr "Ãœber mich"
+
+#: html/Admin/Users/Modify.html:80
+msgid "Access control"
+msgstr "Zugriffskontrolle"
+
+#: html/Admin/Elements/EditScrip:57
+msgid "Action"
+msgstr "Aktion"
+
+#: lib/RT/Scrip_Overlay.pm:147
+#. ($args{'ScripAction'})
+msgid "Action %1 not found"
+msgstr "Aktion %1 nicht gefunden"
+
+#: bin/rt-crontool:123
+msgid "Action committed."
+msgstr "Aktion durchgeführt."
+
+#: bin/rt-crontool:119
+msgid "Action prepared..."
+msgstr "Aktion vorbereitet..."
+
+#: html/Search/Bulk.html:92
+msgid "Add AdminCc"
+msgstr "AdminCC hinzufügen"
+
+#: html/Search/Bulk.html:90
+msgid "Add Cc"
+msgstr "CC hinzufügen"
+
+#: html/Ticket/Create.html:114 html/Ticket/Update.html:100
+msgid "Add More Files"
+msgstr "Mehr Dateien anhängen"
+msgstr "Weitere Dateien anhängen"
+
+#: html/Search/Bulk.html:88
+msgid "Add Requestor"
+msgstr "Klient hinzufügen"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a new a global scrip"
+msgstr "Erstelle ein neues globales Scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a scrip to this queue"
+msgstr "Erstelle ein Scrip für diesen Stapel"
+
+#: html/Admin/Global/Scrip.html:55
+msgid "Add a scrip which will apply to all queues"
+msgstr "Scrip erstellen, das auf alle Stapel angewendet wird"
+
+#: html/Search/Bulk.html:118
+msgid "Add comments or replies to selected tickets"
+msgstr "Füge den ausgewählten Anfragen Kommentare oder Antworten hinzu"
+
+#: html/Admin/Groups/Members.html:42 html/User/Groups/Members.html:39
+msgid "Add members"
+msgstr "Mitglieder hinzufügen"
+
+#: html/Admin/Queues/People.html:66 html/Ticket/Elements/AddWatchers:28
+msgid "Add new watchers"
+msgstr "Neue Beobachter hinzufügen"
+
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:643
+#. ($args{'Type'})
+msgid "Added principal as a %1 for this queue"
+msgstr "Habe einen Hauptverantwortlichen als %1 für diesen Stapel hinzugefügt"
+
+#: lib/RT/Ticket_Overlay.pm:1454
+#. ($self->loc($args{'Type'}))
+msgid "Added principal as a %1 for this ticket"
+msgstr "Habe einen Hauptverantwortlichen als %1 für diese Anfrage hinzugefügt"
+
+#: html/Admin/Elements/ModifyUser:76 html/Admin/Users/Modify.html:122 html/User/Prefs.html:88
+msgid "Address1"
+msgstr "Adresse 1"
+
+#: html/Admin/Elements/ModifyUser:78 html/Admin/Users/Modify.html:127 html/User/Prefs.html:90
+msgid "Address2"
+msgstr "Adresse 2"
+
+#: html/Ticket/Create.html:74
+msgid "Admin Cc"
+msgstr "Admin CC"
+
+#: etc/initialdata:274
+msgid "Admin Comment"
+msgstr "Admin Kommentar"
+
+#: etc/initialdata:256
+msgid "Admin Correspondence"
+msgstr "Admin Korrespondenz"
+
+#: html/Admin/Queues/index.html:25 html/Admin/Queues/index.html:28
+msgid "Admin queues"
+msgstr "Admin Stapel"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin users"
+msgstr ""
+
+#: html/Admin/Global/index.html:26 html/Admin/Global/index.html:28
+msgid "Admin/Global configuration"
+msgstr "Admin/Globale Einstellungen"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Groups"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:25 html/Admin/Queues/Modify.html:29
+msgid "Admin/Queue/Basics"
+msgstr "Admin/Stapel/Basics"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr ""
+
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:39 html/Ticket/Update.html:50 lib/RT/ACE_Overlay.pm:89
+msgid "AdminCc"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "AdminCustomFields"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "AdminGroup"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "AdminGroupMembership"
+msgstr ""
+
+#: lib/RT/System.pm:59
+msgid "AdminOwnPersonalGroups"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "AdminQueue"
+msgstr ""
+
+#: lib/RT/System.pm:60
+msgid "AdminUsers"
+msgstr ""
+
+#: html/Admin/Queues/People.html:48 html/Ticket/Elements/EditPeople:54
+msgid "Administrative Cc"
+msgstr "Administrative CC"
+
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search"
+msgstr "Erweiterte Suche"
+
+#: html/Elements/SelectDateRelation:36
+msgid "After"
+msgstr "Nach dem"
+
+#: NOT FOUND IN SOURCE
+msgid "Age"
+msgstr "Alter"
+
+#: html/Admin/Elements/EditCustomFields:96
+msgid "All Custom Fields"
+msgstr "Alle benutzerdefinierten Felder"
+
+#: html/Admin/Queues/index.html:53
+msgid "All Queues"
+msgstr "Alle Stapel"
+
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
+msgstr ""
+
+#: html/Elements/Tabs:58
+msgid "Approval"
+msgstr "Freigabe"
+
+#: html/Approvals/Display.html:46 html/Approvals/Elements/Approve:27 html/Approvals/Elements/ShowDependency:42 html/Approvals/index.html:65
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($ticket->id, $msg)
+#. ($ticket->Id, $ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Approval #%1: %2"
+msgstr "Freigabe #%1: %2"
+
+#: html/Approvals/index.html:54
+#. ($ticket->Id)
+msgid "Approval #%1: Notes not recorded due to a system error"
+msgstr "Freigabe #%1: Notiz wurde aufgrund eines Systemfehlers nicht vermerkt"
+
+#: html/Approvals/index.html:52
+#. ($ticket->Id)
+msgid "Approval #%1: Notes recorded"
+msgstr "Freigabe #%1: Notiz vermerkt"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Details"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Approval diagram"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:45
+msgid "Approve"
+msgstr "Freigeben"
+
+#: etc/initialdata:431 etc/upgrade/2.1.71:148
+msgid "Approver's notes: %1"
+msgstr "Notizen des Freigebenden: %1"
+
+#: lib/RT/Date.pm:414
+msgid "Apr."
+msgstr "Apr"
+
+#: html/Elements/SelectSortOrder:35
+msgid "Ascending"
+msgstr "aufsteigend"
+
+#: html/Search/Bulk.html:127 html/SelfService/Update.html:36 html/Ticket/ModifyAll.html:83 html/Ticket/Update.html:100
+msgid "Attach"
+msgstr "Anhängen"
+
+#: html/SelfService/Create.html:67 html/Ticket/Create.html:110
+msgid "Attach file"
+msgstr "Datei anhängen"
+
+#: html/Ticket/Create.html:98 html/Ticket/Update.html:89
+msgid "Attached file"
+msgstr "Dateianhang"
+
+#: html/SelfService/Attachment/dhandler:36
+msgid "Attachment '%1' could not be loaded"
+msgstr "Anhang '%1' konnte nicht geladen werden"
+
+#: lib/RT/Transaction_Overlay.pm:443
+msgid "Attachment created"
+msgstr "Anhang erstellt"
+
+#: lib/RT/Tickets_Overlay.pm:1189
+msgid "Attachment filename"
+msgstr "Dateiname des Anhangs"
+
+#: html/Ticket/Elements/ShowAttachments:26
+msgid "Attachments"
+msgstr "Anhänge"
+
+#: lib/RT/Date.pm:418
+msgid "Aug."
+msgstr "Aug"
+
+#: html/Admin/Elements/ModifyUser:66
+msgid "AuthSystem"
+msgstr "AuthSystem"
+
+#: etc/initialdata:206
+msgid "Autoreply"
+msgstr "Autoreply"
+
+#: etc/initialdata:72
+msgid "Autoreply To Requestors"
+msgstr "Autoreply an Klienten"
+
+#: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Bad PGP Signature: %1\\n"
+msgstr "Fehlerhafte PGP-Signatur: %1\\n"
+
+#: html/SelfService/Attachment/dhandler:40
+msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
+msgstr "Fehlerhafte Anhangs-Id. Konnte Anhang '%1' nicht finden\\n"
+
+#: bin/rt-commit-handler:827
+#. ($val)
+msgid "Bad data in %1"
+msgstr "Fehlerhafte Daten in %1"
+
+#: html/SelfService/Attachment/dhandler:43
+#. ($trans, $AttachmentObj->TransactionId())
+msgid "Bad transaction number for attachment. %1 should be %2\\n"
+msgstr "Fehlerhafte Transaktionsnummer für den Anhang. %1 solle %2 sein\\n"
+
+#: html/Admin/Elements/GroupTabs:39 html/Admin/Elements/QueueTabs:39 html/Admin/Elements/UserTabs:38 html/Ticket/Elements/Tabs:90 html/User/Elements/GroupTabs:38
+msgid "Basics"
+msgstr "Grundlagen"
+
+#: html/Ticket/Update.html:83
+msgid "Bcc"
+msgstr "BCC"
+
+#: html/Admin/Elements/EditScrip:88 html/Admin/Global/GroupRights.html:85 html/Admin/Global/Template.html:46 html/Admin/Global/UserRights.html:54 html/Admin/Groups/GroupRights.html:73 html/Admin/Groups/Members.html:81 html/Admin/Groups/Modify.html:56 html/Admin/Groups/UserRights.html:55 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:45 html/Admin/Queues/UserRights.html:54 html/User/Groups/Modify.html:56
+msgid "Be sure to save your changes"
+msgstr "Denke daran, Deine Änderungen zu speichern"
+
+### wieder - Duzen???
+#: html/Elements/SelectDateRelation:34 lib/RT/CurrentUser.pm:322
+msgid "Before"
+msgstr "vor dem"
+
+#: NOT FOUND IN SOURCE
+msgid "Begin Approval"
+msgstr ""
+
+#: etc/initialdata:202
+msgid "Blank"
+msgstr "Leer"
+
+#: html/Search/Listing.html:79
+msgid "Bookmarkable URL for this search"
+msgstr "Speicherbare URL für diese Suche"
+
+#: html/Ticket/Elements/ShowHistory:39 html/Ticket/Elements/ShowHistory:45
+msgid "Brief headers"
+msgstr "Kurze Kopfzeilen"
+
+#: html/Search/Bulk.html:25 html/Search/Bulk.html:26
+msgid "Bulk ticket update"
+msgstr "Massen Ticketupdate"
+
+#: lib/RT/User_Overlay.pm:1331
+msgid "Can not modify system users"
+msgstr "Kann Systembenutzer nicht ändern"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "Can this principal see this queue"
+msgstr "Kann dieser Hauptverantwortliche diesen Stapel sehen"
+
+#: lib/RT/CustomField_Overlay.pm:144
+msgid "Can't add a custom field value without a name"
+msgstr "Kann kein benutzerdefiniertes Feld ohne Namen hinzufügen"
+
+#: lib/RT/Link_Overlay.pm:132
+msgid "Can't link a ticket to itself"
+msgstr "Kann kein Ticket auf sich selbst verweisen lassen!"
+
+#: lib/RT/Ticket_Overlay.pm:2787
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr "Konnte das Ticket nicht in ein vereinigtes Ticket vereinigen. Diesen Fehler solltest du niemals sehen"
+
+#: lib/RT/Ticket_Overlay.pm:2605 lib/RT/Ticket_Overlay.pm:2674
+msgid "Can't specifiy both base and target"
+msgstr "Du kannst nicht Basis und Ziel gleichzeitig angeben"
+
+#: html/autohandler:112
+#. ($msg)
+msgid "Cannot create user: %1"
+msgstr "Kann Benutzer nicht anlegen: %1"
+
+#: etc/initialdata:50 html/Admin/Queues/People.html:44 html/SelfService/Create.html:51 html/SelfService/Display.html:50 html/Ticket/Create.html:64 html/Ticket/Elements/EditPeople:51 html/Ticket/Elements/ShowPeople:35 html/Ticket/Update.html:45 html/Ticket/Update.html:78 lib/RT/ACE_Overlay.pm:88
+msgid "Cc"
+msgstr "CC"
+
+#: html/SelfService/Prefs.html:31
+msgid "Change password"
+msgstr "Passwort ändern"
+
+#: html/Ticket/Create.html:101 html/Ticket/Update.html:92
+msgid "Check box to delete"
+msgstr "Zum Löschen ankreuzen"
+
+#: html/Admin/Elements/SelectRights:31
+msgid "Check box to revoke right"
+msgstr "Zum Entziehen einer Berechtigung ankreuzen"
+
+#: html/Ticket/Create.html:183 html/Ticket/Elements/EditLinks:131 html/Ticket/Elements/EditLinks:69 html/Ticket/Elements/ShowLinks:51
+msgid "Children"
+msgstr "Kinder"
+
+#: html/Admin/Elements/ModifyUser:80 html/Admin/Users/Modify.html:132 html/User/Prefs.html:92
+msgid "City"
+msgstr "Stadt"
+
+#: html/Ticket/Elements/ShowDates:47
+msgid "Closed"
+msgstr "Geschlossen"
+
+#: html/SelfService/Elements/Tabs:60
+msgid "Closed requests"
+msgstr "Geschossene Tickets"
+
+#: NOT FOUND IN SOURCE
+msgid "Command not understood!\\n"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransaction:179 html/Ticket/Elements/Tabs:153
+msgid "Comment"
+msgstr "Kommentar"
+
+#: html/Admin/Elements/ModifyQueue:45 html/Admin/Queues/Modify.html:58
+msgid "Comment Address"
+msgstr "Kommentaradresse"
+
+#: NOT FOUND IN SOURCE
+msgid "Comment not recorded"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "Comment on tickets"
+msgstr "Kommentiere Tickets"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "CommentOnTicket"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:35
+msgid "Comments"
+msgstr "Kommantare"
+
+#: html/Ticket/ModifyAll.html:70 html/Ticket/Update.html:70
+msgid "Comments (Not sent to requestors)"
+msgstr "Kommentar (wird nicht an Klienten geschickt)"
+
+#: html/Search/Bulk.html:122
+msgid "Comments (not sent to requestors)"
+msgstr "Kommentar (wird nicht an Klienten geschickt)"
+
+#: html/Elements/ViewUser:27
+#. ($name)
+msgid "Comments about %1"
+msgstr "Kommentar über %1"
+
+#: html/Admin/Users/Modify.html:185 html/Ticket/Elements/ShowRequestor:44
+msgid "Comments about this user"
+msgstr "Kommentar zu diesen Benutzer"
+
+#: lib/RT/Transaction_Overlay.pm:545
+msgid "Comments added"
+msgstr "Kommentar hinzugefügt"
+
+#: lib/RT/Action/Generic.pm:140
+msgid "Commit Stubbed"
+msgstr "Ãœbergabe abgehakt"
+
+#: NOT FOUND IN SOURCE
+msgid "Compile Restrictions"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:41
+msgid "Condition"
+msgstr "Bedingung"
+
+#: bin/rt-crontool:109
+msgid "Condition matches..."
+msgstr "Condition trifft zu..."
+
+#: lib/RT/Scrip_Overlay.pm:160
+msgid "Condition not found"
+msgstr "Bedingung nicht gefunden"
+
+#: html/Elements/Tabs:52
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#: html/SelfService/Prefs.html:33
+msgid "Confirm"
+msgstr "Bestätigen"
+
+#: html/Admin/Elements/ModifyUser:60
+msgid "ContactInfoSystem"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Contacted date '%1' could not be parsed"
+msgstr ""
+
+#: html/Admin/Elements/ModifyTemplate:44 html/Ticket/ModifyAll.html:87
+msgid "Content"
+msgstr "Inhalt"
+
+#: etc/initialdata:266
+msgid "Correspondence"
+msgstr "Korrespondenz"
+
+#: html/Admin/Elements/ModifyQueue:39 html/Admin/Queues/Modify.html:51
+msgid "Correspondence Address"
+msgstr "Korrespondenzadresse"
+
+#: lib/RT/Transaction_Overlay.pm:541
+msgid "Correspondence added"
+msgstr "Korrespondenz hinzugefügt"
+
+#: NOT FOUND IN SOURCE
+msgid "Correspondence not recorded"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3458
+msgid "Could not add new custom field value for ticket. "
+msgstr "Konnte dem Ticket kein neues benutzerdefiniertes Feld hinzufügen. "
+
+#: lib/RT/Ticket_Overlay.pm:2963 lib/RT/Ticket_Overlay.pm:2971 lib/RT/Ticket_Overlay.pm:2987
+msgid "Could not change owner. "
+msgstr "Konnte den Inhaber nicht ändern. "
+
+#: html/Admin/Elements/EditCustomField:68 html/Admin/Elements/EditCustomFields:166
+#. ($msg)
+msgid "Could not create CustomField"
+msgstr "Konnte benutzerdefiniertes Feld nicht anlegen"
+
+#: html/User/Groups/Modify.html:77 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
+msgid "Could not create group"
+msgstr "Konnte Gruppe nicht anlegen"
+
+#: html/Admin/Global/Template.html:75 html/Admin/Queues/Template.html:72
+#. ($msg)
+msgid "Could not create template: %1"
+msgstr "Konnte Vorlage nicht anlegen: %1"
+
+#: lib/RT/Ticket_Overlay.pm:1073 lib/RT/Ticket_Overlay.pm:333
+msgid "Could not create ticket. Queue not set"
+msgstr "Konnte Ticket nicht anlegen. Stapel nicht bestimmt"
+
+#: lib/RT/User_Overlay.pm:208 lib/RT/User_Overlay.pm:220 lib/RT/User_Overlay.pm:238 lib/RT/User_Overlay.pm:414
+msgid "Could not create user"
+msgstr "Konnte Benutzer nicht anlegen"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find a ticket with id %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find group %1."
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1422
+msgid "Could not find or create that user"
+msgstr "Konnte diesen Benutzer nicht finden oder anlegen"
+
+#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1501
+msgid "Could not find that principal"
+msgstr "Konnte diesen Hauptverantwortlichen nicht finden"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find user %1."
+msgstr ""
+
+#: html/Admin/Groups/Members.html:88 html/User/Groups/Members.html:90 html/User/Groups/Modify.html:82
+msgid "Could not load group"
+msgstr "Konnte die Gruppe nicht laden"
+
+#: lib/RT/Queue_Overlay.pm:641
+#. ($args{'Type'})
+msgid "Could not make that principal a %1 for this queue"
+msgstr "Konnte den Hauptverantwortlichen nicht zu einen %1 dieses Stapels machen"
+
+#: lib/RT/Ticket_Overlay.pm:1443
+#. ($self->loc($args{'Type'}))
+msgid "Could not make that principal a %1 for this ticket"
+msgstr "Konnte diesen Hauptverantwortlichen nicht zu einem %1 dieses Tickets machen"
+
+#: lib/RT/Queue_Overlay.pm:740
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this queue"
+msgstr "Konnte diesen Hauptverantwortlichen nicht als %1 dieses Stapels entfernen"
+
+#: lib/RT/Ticket_Overlay.pm:1559
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this ticket"
+msgstr "Konnte diesen Hauptverantwortlichen nicht als %1 dieses Tickets entfernen"
+
+#: lib/RT/Group_Overlay.pm:985
+msgid "Couldn't add member to group"
+msgstr "Konnte Mitglied nicht der Gruppe hinzufügen"
+
+#: lib/RT/Ticket_Overlay.pm:3468 lib/RT/Ticket_Overlay.pm:3524
+#. ($Msg)
+msgid "Couldn't create a transaction: %1"
+msgstr "Konnte die Transaktion nicht anlegen: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't figure out what to do from gpg's reply\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find group\\n"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:866
+msgid "Couldn't find row"
+msgstr "Konne Zeile nicht finden"
+
+#: lib/RT/Group_Overlay.pm:959
+msgid "Couldn't find that principal"
+msgstr "Konnte diesen Hauptverantwortlichen nicht finden"
+
+#: lib/RT/CustomField_Overlay.pm:175
+msgid "Couldn't find that value"
+msgstr "Konnte diesen Wert nicht finden"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find user\\n"
+msgstr ""
+
+#: lib/RT/CurrentUser.pm:112
+#. ($self->Id)
+msgid "Couldn't load %1 from the users database.\\n"
+msgstr "Konnte %1 nicht aus der Benutzerdatenbank laden.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load RT config file '%1' %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load Scrips."
+msgstr ""
+
+#: html/Admin/Groups/GroupRights.html:88 html/Admin/Groups/UserRights.html:75
+#. ($id)
+msgid "Couldn't load group %1"
+msgstr "Konnte Gruppe %1 nicht laden"
+
+#: lib/RT/Link_Overlay.pm:175 lib/RT/Link_Overlay.pm:184 lib/RT/Link_Overlay.pm:211
+msgid "Couldn't load link"
+msgstr "Konnte den Verweis nicht laden"
+
+#: html/Admin/Elements/EditCustomFields:147 html/Admin/Queues/People.html:121
+#. ($id)
+msgid "Couldn't load queue"
+msgstr "Konnte den Stapel nicht laden"
+
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:72
+#. ($id)
+msgid "Couldn't load queue %1"
+msgstr "Konnte den Stapel %1 nicht laden"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load template"
+msgstr ""
+
+#: html/Admin/Users/Prefs.html:79
+#. ($id)
+msgid "Couldn't load that user (%1)"
+msgstr "Konnte diesen Benutzer nicht laden (%1)"
+
+#: html/SelfService/Display.html:166
+#. ($id)
+msgid "Couldn't load ticket '%1'"
+msgstr "Konnte das Ticket '%1' nicht laden"
+
+#: html/Admin/Elements/ModifyUser:86 html/Admin/Users/Modify.html:149 html/User/Prefs.html:98
+msgid "Country"
+msgstr "Land"
+
+#: html/Admin/Elements/CreateUserCalled:26 html/Ticket/Create.html:135 html/Ticket/Create.html:195
+msgid "Create"
+msgstr "Erstellen"
+
+#: etc/initialdata:128
+msgid "Create Tickets"
+msgstr "Erstelle Tickets"
+
+#: html/Admin/Elements/EditCustomField:58
+msgid "Create a CustomField"
+msgstr "Erstelle ein benutzerdefiniertes Feld"
+
+#: html/Admin/Queues/CustomField.html:48
+#. ($QueueObj->Name())
+msgid "Create a CustomField for queue %1"
+msgstr "Erstelle ein benutzerdef. Feld für Stapel %1"
+
+#: html/Admin/Global/CustomField.html:48
+msgid "Create a CustomField which applies to all queues"
+msgstr "Erstelle ein benutzerdef. Feld für alle Stapel"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new Custom Field"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global scrip"
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:67 html/Admin/Groups/Modify.html:93
+msgid "Create a new group"
+msgstr "Erstelle eine neue Gruppe"
+
+#: html/User/Groups/Modify.html:67 html/User/Groups/Modify.html:92
+msgid "Create a new personal group"
+msgstr "Erstelle eine neue persönliche Gruppe"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new template"
+msgstr ""
+
+#: html/SelfService/Create.html:30 html/Ticket/Create.html:25 html/Ticket/Create.html:28 html/Ticket/Create.html:36
+msgid "Create a new ticket"
+msgstr "Erstelle ein neues Ticket"
+
+#: html/Admin/Users/Modify.html:214 html/Admin/Users/Modify.html:241
+msgid "Create a new user"
+msgstr "Erstelle einen neuen Benutzer"
+
+#: html/Admin/Queues/Modify.html:103
+msgid "Create a queue"
+msgstr "Erstelle einen Stapel"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a queue called"
+msgstr ""
+
+#: html/SelfService/Create.html:25 html/SelfService/Create.html:27
+msgid "Create a request"
+msgstr "Erstelle ein Ticket"
+
+#: html/Admin/Queues/Scrip.html:59
+#. ($QueueObj->Name)
+msgid "Create a scrip for queue %1"
+msgstr "Erstelle ein Scrip für den Stapel %1"
+
+#: html/Admin/Global/Template.html:69 html/Admin/Queues/Template.html:65
+msgid "Create a template"
+msgstr "Erstelle eine Vorlage"
+
+#: etc/initialdata:130
+msgid "Create new tickets based on this scrip's template"
+msgstr "Erstelle neue Tickets basierend auf der Vorlage dieses Scrips"
+
+#: html/SelfService/Create.html:81
+msgid "Create ticket"
+msgstr "Ticket erstellen"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "Create tickets in this queue"
+msgstr "Erstelle Tickets in diesem Stapel"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "Create, delete and modify custom fields"
+msgstr "Erstellen, löschen und modifizieren von benutzerdef. Felder"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "Create, delete and modify queues"
+msgstr "Erstelle, lösche und modifiziere Stapel"
+
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
+msgstr ""
+
+#: lib/RT/System.pm:59
+msgid "Create, delete and modify the members of personal groups"
+msgstr "Erstellen, löschen und modifizieren von Mitgliedern persönlicher Gruppen"
+
+#: lib/RT/System.pm:60
+msgid "Create, delete and modify users"
+msgstr "Erstellen, löschen und modifizieren von Benutzern"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "CreateTicket"
+msgstr ""
+
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1167
+msgid "Created"
+msgstr "Angelegt"
+
+#: html/Admin/Elements/EditCustomField:71
+#. ($CustomFieldObj->Name())
+msgid "Created CustomField %1"
+msgstr "Erstelle ein benutzerdefiniertes Feld %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Created template %1"
+msgstr ""
+
+#: html/Ticket/Elements/EditLinks:28
+msgid "Current Relationships"
+msgstr "Momentane Beziehungen"
+
+#: html/Admin/Elements/EditScrips:30
+msgid "Current Scrips"
+msgstr "Aktuelle Scrips"
+
+#: html/Admin/Groups/Members.html:39 html/User/Groups/Members.html:42
+msgid "Current members"
+msgstr "Aktuelle Mitglieder"
+
+#: html/Admin/Elements/SelectRights:29
+msgid "Current rights"
+msgstr "Aktuelle Rechte"
+
+#: html/Search/Listing.html:71
+msgid "Current search criteria"
+msgstr "Aktuelle Suchkriterien"
+
+#: html/Admin/Queues/People.html:41 html/Ticket/Elements/EditPeople:45
+msgid "Current watchers"
+msgstr "Aktuelle Beobachter"
+
+#: html/Admin/Global/CustomField.html:55
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr "Benutzerdef. Feld #%1"
+
+#: html/Admin/Elements/QueueTabs:53 html/Admin/Elements/SystemTabs:40 html/Admin/Global/index.html:50 html/Ticket/Elements/ShowSummary:35
+msgid "Custom Fields"
+msgstr "Benutzerdef. Felder"
+
+#: html/Admin/Elements/EditScrip:73
+msgid "Custom action cleanup code"
+msgstr "Benutzerdefinierter Action-Cleanup-Code"
+
+#: html/Admin/Elements/EditScrip:65
+msgid "Custom action preparation code"
+msgstr "Benutzerdefinierter Aktions-Vorbereitungs-Code"
+
+#: html/Admin/Elements/EditScrip:49
+msgid "Custom condition"
+msgstr "Benutzerdefinierte Bedingung"
+
+#: lib/RT/Tickets_Overlay.pm:1618
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
+msgid "Custom field %1 %2 %3"
+msgstr "Benutzerdefiniertes Feld %1 %2 %3"
+
+#: lib/RT/Tickets_Overlay.pm:1613
+#. ($CF->Name)
+msgid "Custom field %1 has a value."
+msgstr "Benutzerdefiniertes Feld %1 hat einen Wert."
+
+#: lib/RT/Tickets_Overlay.pm:1610
+#. ($CF->Name)
+msgid "Custom field %1 has no value."
+msgstr "Benutzerdefiniertes Feld %1 hat keinen Wert."
+
+#: lib/RT/Ticket_Overlay.pm:3360
+#. ($args{'Field'})
+msgid "Custom field %1 not found"
+msgstr "Benutzerdefiniertes Feld %1 nicht gefunden"
+
+#: html/Admin/Elements/EditCustomFields:197
+msgid "Custom field deleted"
+msgstr "Benutzerdefiniertes Feld wurde gelöscht"
+
+#: lib/RT/Ticket_Overlay.pm:3510
+msgid "Custom field not found"
+msgstr "Benutzerdefiniertes Feld nicht gefunden"
+
+#: lib/RT/CustomField_Overlay.pm:283
+#. ($args{'Content'}, $self->Name)
+msgid "Custom field value %1 could not be found for custom field %2"
+msgstr "Wert %1 des benutzerdefinierten Feldes %2 konnte nicht gefunden werden"
+
+#: NOT FOUND IN SOURCE
+msgid "Custom field value changed from %1 to %2"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:185
+msgid "Custom field value could not be deleted"
+msgstr "Wert des benutzerdefinierten Felds konnte nicht gelöscht werden"
+
+#: lib/RT/CustomField_Overlay.pm:289
+msgid "Custom field value could not be found"
+msgstr "Wert des benutzerdefinierten Feldes konnte nicht gefunden werden"
+
+#: lib/RT/CustomField_Overlay.pm:183 lib/RT/CustomField_Overlay.pm:291
+msgid "Custom field value deleted"
+msgstr "Wert des benutzerdefinierten Feldes gelöscht"
+
+#: lib/RT/Transaction_Overlay.pm:550
+msgid "CustomField"
+msgstr ""
+
+#: html/Ticket/Create.html:161 html/Ticket/Elements/ShowSummary:53 html/Ticket/Elements/Tabs:93 html/Ticket/ModifyAll.html:44
+msgid "Dates"
+msgstr "Datumsangaben"
+
+#: lib/RT/Date.pm:422
+msgid "Dec."
+msgstr "Dez"
+
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr ""
+
+#: etc/initialdata:207
+msgid "Default Autoresponse template"
+msgstr "Standard Autoresponse-Vorlage"
+
+#: etc/initialdata:275
+msgid "Default admin comment template"
+msgstr "Standard Admin-Kommentar-Vorlage"
+
+#: etc/initialdata:257
+msgid "Default admin correspondence template"
+msgstr "Standard Admin-Korrespondenz-Vorlage"
+
+#: etc/initialdata:267
+msgid "Default correspondence template"
+msgstr "Standard Korrespondenz-Vorlage"
+
+#: etc/initialdata:238
+msgid "Default transaction template"
+msgstr "Standard Transaktions-Vorlage"
+
+#: lib/RT/Transaction_Overlay.pm:645
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr "Standard: %1/%2 von \"%3\" in \"%4\" geändert."
+
+#: html/User/Delegation.html:25 html/User/Delegation.html:28
+msgid "Delegate rights"
+msgstr "Rechte weitergeben"
+
+#: lib/RT/System.pm:63
+msgid "Delegate specific rights which have been granted to you."
+msgstr "Dir gewährte Rechte weitergeben"
+
+#: lib/RT/System.pm:63
+msgid "DelegateRights"
+msgstr ""
+
+#: html/User/Elements/Tabs:38
+msgid "Delegation"
+msgstr "Rechteweitergabe"
+
+#: NOT FOUND IN SOURCE
+msgid "Delete"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "Delete tickets"
+msgstr "Lösche Tickets"
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "DeleteTicket"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:187
+msgid "Deleting this object could break referential integrity"
+msgstr "Löschen dieses Objektes kann die referenzielle Integrität gefährden"
+
+#: lib/RT/Queue_Overlay.pm:292
+msgid "Deleting this object would break referential integrity"
+msgstr "Löschen dieses Objektes würde die referenzielle Integrität gefährden"
+
+#: lib/RT/User_Overlay.pm:430
+msgid "Deleting this object would violate referential integrity"
+msgstr "Löschen dieses Objektes würde die referenzielle Integrität verletzen"
+
+#: html/Approvals/Elements/Approve:46
+msgid "Deny"
+msgstr "Ablehnen"
+
+#: html/Ticket/Create.html:181 html/Ticket/Elements/EditLinks:123 html/Ticket/Elements/EditLinks:47 html/Ticket/Elements/ShowDependencies:32 html/Ticket/Elements/ShowLinks:35
+msgid "Depended on by"
+msgstr "Abhängig gemacht von"
+
+#: NOT FOUND IN SOURCE
+msgid "Dependencies: \\n"
+msgstr ""
+
+#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:180 html/Ticket/Elements/EditLinks:119 html/Ticket/Elements/EditLinks:36 html/Ticket/Elements/ShowDependencies:25 html/Ticket/Elements/ShowLinks:27
+msgid "Depends on"
+msgstr "Abhängig von"
+
+#: html/Elements/SelectSortOrder:35
+msgid "Descending"
+msgstr "absteigend"
+
+#: html/SelfService/Create.html:75 html/Ticket/Create.html:119
+msgid "Describe the issue below"
+msgstr "Beschreibe hier das Problem"
+
+#: html/Admin/Elements/AddCustomFieldValue:27 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyQueue:36 html/Admin/Elements/ModifyTemplate:36 html/Admin/Groups/Modify.html:49 html/Admin/Queues/Modify.html:48 html/Elements/SelectGroups:27 html/User/Groups/Modify.html:49
+msgid "Description"
+msgstr "Beschreibung"
+
+#: html/SelfService/Elements/MyRequests:44
+msgid "Details"
+msgstr "Details"
+
+#: html/Ticket/Elements/Tabs:85
+msgid "Display"
+msgstr "Anzeigen"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "Display Access Control List"
+msgstr "Zeige Zugriffskontrollliste an"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "Display Scrip templates for this queue"
+msgstr "Zeige Scrip-Vorlagen für diesen Stapel"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "Display Scrips for this queue"
+msgstr "Zeige Scrips für diesen Stapel"
+
+#: html/Ticket/Elements/ShowHistory:35
+msgid "Display mode"
+msgstr "Anzeigemodus"
+
+#: html/SelfService/Display.html:25 html/SelfService/Display.html:29
+#. ($Ticket->id)
+msgid "Display ticket #%1"
+msgstr "Zeige Ticket #%1 an"
+
+#: lib/RT/System.pm:54
+msgid "Do anything and everything"
+msgstr "Mache irgend etwas und alles"
+
+#: html/Elements/Refresh:30
+msgid "Don't refresh this page."
+msgstr "Seite nicht aktualisieren."
+
+#: html/Search/Elements/PickRestriction:114
+msgid "Don't show search results"
+msgstr "Suchergebnisse nicht anzeigen"
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "Download"
+msgstr "Download"
+
+#: html/Elements/SelectDateType:32 html/Ticket/Create.html:167 html/Ticket/Elements/EditDates:45 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1171
+msgid "Due"
+msgstr "Fällig"
+
+#: NOT FOUND IN SOURCE
+msgid "Due date '%1' could not be parsed"
+msgstr ""
+
+#: bin/rt-commit-handler:754
+#. ($1, $msg)
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
+msgstr "FEHLER: Konnte Ticket '%1' nicht laden: %2.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit"
+msgstr ""
+
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr "Bearbeite benutzerdefinierte Felder für %1"
+
+#: html/Ticket/ModifyLinks.html:36
+msgid "Edit Relationships"
+msgstr "Bearbeite Beziehungen"
+
+#: html/Admin/Queues/Templates.html:41
+#. ($QueueObj->Name)
+msgid "Edit Templates for queue %1"
+msgstr "Bearbeite Vorlagen für Stapel %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr ""
+
+#: html/Admin/Global/index.html:46
+msgid "Edit system templates"
+msgstr "Bearbeite Systemvorlagen"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit templates for %1"
+msgstr ""
+
+#: html/Admin/Elements/ModifyQueue:25 html/Admin/Queues/Modify.html:117
+#. ($QueueObj->Name)
+#. ($QueueObj->Id)
+msgid "Editing Configuration for queue %1"
+msgstr "Bearbeite Konfiguration für den Stapel %1"
+
+#: html/Admin/Elements/ModifyUser:25
+#. ($UserObj->Name)
+msgid "Editing Configuration for user %1"
+msgstr "Bearbeite Konfiguration für Benutzer %1"
+
+#: html/Admin/Elements/EditCustomField:74
+#. ($CustomFieldObj->Name())
+msgid "Editing CustomField %1"
+msgstr "Bearbeite benutzerdefiniertes Feld %1"
+
+#: html/Admin/Groups/Members.html:32
+#. ($Group->Name)
+msgid "Editing membership for group %1"
+msgstr "Bearbeite Mitgliedschaft für die Gruppe %1"
+
+#: html/User/Groups/Members.html:129
+#. ($Group->Name)
+msgid "Editing membership for personal group %1"
+msgstr "Bearbeite Mitgliedschaft der persönlichen Gruppe %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Editing template %1"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2615 lib/RT/Ticket_Overlay.pm:2683
+msgid "Either base or target must be specified"
+msgstr "Es muß entweder eine Basis oder ein Ziel angegeben werden"
+
+#: html/Admin/Users/Modify.html:53 html/Admin/Users/Prefs.html:46 html/Elements/SelectUsers:27 html/Ticket/Elements/AddWatchers:56 html/User/Prefs.html:42
+msgid "Email"
+msgstr "E-Mail"
+
+#: lib/RT/User_Overlay.pm:188
+msgid "Email address in use"
+msgstr "E-Mail-Adresse bereits in Gebrauch"
+
+#: html/Admin/Elements/ModifyUser:42
+msgid "EmailAddress"
+msgstr "E-Mail-Adresse"
+
+### muss das überhaupt übersetzt werden???
+#: html/Admin/Elements/ModifyUser:54
+msgid "EmailEncoding"
+msgstr "E-Mail-Kodierung"
+
+### muss das überhaupt übersetzt werden???
+#: html/Admin/Elements/EditCustomField:36
+msgid "Enabled (Unchecking this box disables this custom field)"
+msgstr "Aktiviert (Abwählen deaktiviert dieses benutzerdef. Feld)"
+
+#: html/Admin/Groups/Modify.html:53 html/User/Groups/Modify.html:53
+msgid "Enabled (Unchecking this box disables this group)"
+msgstr "Aktiviert (Abwählen deaktiviert diese Gruppe)"
+
+#: html/Admin/Queues/Modify.html:84
+msgid "Enabled (Unchecking this box disables this queue)"
+msgstr "Aktiviert (Abwählen deaktiviert diesen Stapel)"
+
+#: html/Admin/Elements/EditCustomFields:99
+msgid "Enabled Custom Fields"
+msgstr "Aktivierte benutzerdefinierte Felder"
+
+#: html/Admin/Queues/index.html:56
+msgid "Enabled Queues"
+msgstr "Aktivierte Stapel"
+
+#: html/Admin/Elements/EditCustomField:90 html/Admin/Groups/Modify.html:117 html/Admin/Queues/Modify.html:138 html/Admin/Users/Modify.html:283 html/User/Groups/Modify.html:117
+#. (loc_fuzzy($msg))
+msgid "Enabled status %1"
+msgstr "Status %1 aktiviert"
+
+#: lib/RT/CustomField_Overlay.pm:361
+msgid "Enter multiple values"
+msgstr "Mehrere Werte eingeben"
+
+#: lib/RT/CustomField_Overlay.pm:358
+msgid "Enter one value"
+msgstr "Einen Wert eingeben"
+
+#: html/Ticket/Elements/EditLinks:112
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "Ticketnummern oder URIs getrennt durch Leerzeichen eingeben."
+
+#: html/Elements/Login:29 html/SelfService/Error.html:25 html/SelfService/Error.html:26
+msgid "Error"
+msgstr "Fehler"
+
+#: lib/RT/Queue_Overlay.pm:555
+msgid "Error in parameters to Queue->AddWatcher"
+msgstr "Fehler in den Parameter für Queue-AddWatcher"
+
+#: lib/RT/Queue_Overlay.pm:713
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr "Fehler in den Paramter für Queue->DelWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1356
+msgid "Error in parameters to Ticket->AddWatcher"
+msgstr "Fehler in den Parameter für Ticket->AddWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1532
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr "Fehler in den Parameter für Ticket->DelWatcher"
+
+#: etc/initialdata:20
+msgid "Everyone"
+msgstr "Everyone"
+
+#: bin/rt-crontool:194
+msgid "Example:"
+msgstr "Beispiel:"
+
+#: html/Admin/Elements/ModifyUser:64
+msgid "ExternalAuthId"
+msgstr "ExternalAuthId"
+
+#: html/Admin/Elements/ModifyUser:58
+msgid "ExternalContactInfoId"
+msgstr "ExternalContactInfoId"
+
+#: html/Admin/Users/Modify.html:73
+msgid "Extra info"
+msgstr "Zusatzinformationen"
+
+#: lib/RT/User_Overlay.pm:302
+msgid "Failed to find 'Privileged' users pseudogroup."
+msgstr "Konnte die Pseudogruppe 'Privileged' nicht finden."
+
+#: lib/RT/User_Overlay.pm:309
+msgid "Failed to find 'Unprivileged' users pseudogroup"
+msgstr "Failed to find 'Unprivileged' users pseudogroup"
+
+#: bin/rt-crontool:138
+#. ($modname, $@)
+msgid "Failed to load module %1. (%2)"
+msgstr "Konnte Modul %1 nicht laden. (%2)"
+
+#: lib/RT/Date.pm:412
+msgid "Feb."
+msgstr "Feb"
+
+#: NOT FOUND IN SOURCE
+msgid "Fin"
+msgstr ""
+
+#: html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:59 lib/RT/Tickets_Overlay.pm:1091
+msgid "Final Priority"
+msgstr "Endpriorität"
+
+#: lib/RT/Ticket_Overlay.pm:1162
+msgid "FinalPriority"
+msgstr ""
+
+#: html/Admin/Queues/People.html:61 html/Ticket/Elements/EditPeople:34
+msgid "Find group whose"
+msgstr "Finde Gruppe wessen"
+
+#: html/Elements/Quicksearch:25
+msgid "Find new/open tickets"
+msgstr "Finde neue/offene Tickets"
+
+#: html/Admin/Queues/People.html:57 html/Admin/Users/index.html:46 html/Ticket/Elements/EditPeople:30
+msgid "Find people whose"
+msgstr "Finde Leute deren"
+
+#: html/Search/Listing.html:108
+msgid "Find tickets"
+msgstr "Anfragen suchen"
+
+#: NOT FOUND IN SOURCE
+msgid "Finish Approval"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:58
+msgid "First"
+msgstr "Erste"
+
+#: html/Search/Listing.html:41
+msgid "First page"
+msgstr "Erste Seite"
+
+#: docs/design_docs/string-extraction-guide.txt:33
+msgid "Foo Bar Baz"
+msgstr "Foo Bar Baz"
+
+#: docs/design_docs/string-extraction-guide.txt:24
+msgid "Foo!"
+msgstr "Foo!"
+
+#: html/Search/Bulk.html:87
+msgid "Force change"
+msgstr "erzwinge Änderung"
+
+#: html/Search/Listing.html:106
+#. ($ticketcount)
+msgid "Found %quant(%1,ticket)"
+msgstr "%quant(%1,ticket) gefunden"
+
+#: lib/RT/Interface/Web.pm:868
+msgid "Found Object"
+msgstr "Objekt gefunden"
+
+#: html/Admin/Elements/ModifyUser:44
+msgid "FreeformContactInfo"
+msgstr "FreeformContactInfo"
+
+#: lib/RT/CustomField_Overlay.pm:38
+msgid "FreeformMultiple"
+msgstr "FreieMehrfachauswahl"
+
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformSingle"
+msgstr "FreieEinzelauswahl"
+
+#: lib/RT/Date.pm:392
+msgid "Fri."
+msgstr "Fr"
+
+#: html/Ticket/Elements/ShowHistory:41 html/Ticket/Elements/ShowHistory:51
+msgid "Full headers"
+msgstr "Alle Kopfzeilen"
+
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:595
+#. ($New->Name)
+msgid "Given to %1"
+msgstr "An %1 gegeben"
+
+#: html/Admin/Elements/Tabs:41 html/Admin/index.html:38
+msgid "Global"
+msgstr "Global"
+
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
+msgstr ""
+
+#: html/Admin/Elements/SelectTemplate:38
+#. (loc($Template->Name))
+msgid "Global template: %1"
+msgstr "Globale Vorlage: %1"
+
+#: html/Admin/Elements/EditCustomFields:75 html/Admin/Queues/People.html:59 html/Admin/Queues/People.html:63 html/Admin/Queues/index.html:44 html/Admin/Users/index.html:49 html/Ticket/Elements/EditPeople:32 html/Ticket/Elements/EditPeople:36 html/index.html:41
+msgid "Go!"
+msgstr "Los!"
+
+#: NOT FOUND IN SOURCE
+msgid "Good pgp sig from %1\\n"
+msgstr ""
+
+#: html/Search/Listing.html:50
+msgid "Goto page"
+msgstr "Gehe zu Seite"
+
+#: html/Elements/GotoTicket:25 html/SelfService/Elements/GotoTicket:25
+msgid "Goto ticket"
+msgstr "Zeig' Ticket"
+
+#: html/Ticket/Elements/AddWatchers:46 html/User/Elements/DelegateRights:78
+msgid "Group"
+msgstr "Gruppe"
+
+#: NOT FOUND IN SOURCE
+msgid "Group %1 %2: %3"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:45 html/Admin/Elements/QueueTabs:57 html/Admin/Elements/SystemTabs:44 html/Admin/Global/index.html:55
+msgid "Group Rights"
+msgstr "Gruppenrechte"
+
+#: lib/RT/Group_Overlay.pm:965
+msgid "Group already has member"
+msgstr "Gruppe hat bereits Mitglieder"
+
+#: html/Admin/Groups/Modify.html:77
+#. ($create_msg)
+msgid "Group could not be created: %1"
+msgstr "Gruppe konnte nicht erstellt werden: %1"
+
+#: lib/RT/Group_Overlay.pm:497
+msgid "Group created"
+msgstr "Gruppe angelegt"
+
+#: lib/RT/Group_Overlay.pm:1133
+msgid "Group has no such member"
+msgstr "Gruppe hat kein solches Mitglied"
+
+#: lib/RT/Group_Overlay.pm:945 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1429 lib/RT/Ticket_Overlay.pm:1507
+msgid "Group not found"
+msgstr "Gruppe nicht gefunden"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not found.\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Group not specified.\\n"
+msgstr ""
+
+#: html/Admin/Elements/SelectNewGroupMembers:35 html/Admin/Elements/Tabs:35 html/Admin/Groups/Members.html:64 html/Admin/Queues/People.html:83 html/Admin/index.html:32 html/User/Groups/Members.html:67
+msgid "Groups"
+msgstr "Gruppen"
+
+#: lib/RT/Group_Overlay.pm:971
+msgid "Groups can't be members of their members"
+msgstr "Gruppen können nicht Mitglied eines ihrer Mitglieder sein"
+
+#: lib/RT/Interface/CLI.pm:73 lib/RT/Interface/CLI.pm:73
+msgid "Hello!"
+msgstr "Hallo!"
+
+#: docs/design_docs/string-extraction-guide.txt:40
+#. ($name)
+msgid "Hello, %1"
+msgstr "Hallo %1"
+
+#: html/Ticket/Elements/ShowHistory:30 html/Ticket/Elements/Tabs:88
+msgid "History"
+msgstr "Historie"
+
+#: html/Admin/Elements/ModifyUser:68
+msgid "HomePhone"
+msgstr "TelefonZuhause"
+
+#: html/Elements/Tabs:46
+msgid "Homepage"
+msgstr "Start"
+
+#: lib/RT/Base.pm:74
+#. (6)
+msgid "I have %quant(%1,concrete mixer)."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:27 lib/RT/Tickets_Overlay.pm:1018
+msgid "Id"
+msgstr "Nr."
+
+#: html/Admin/Users/Modify.html:44 html/User/Prefs.html:39
+msgid "Identity"
+msgstr "Identität"
+
+#: etc/upgrade/2.1.71:86
+msgid "If an approval is rejected, reject the original and delete pending approvals"
+msgstr "Wenn eine Freigabe abgewiesen wird, weise das Original ab und lösche wartende Freigaben"
+
+#: bin/rt-crontool:190
+msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
+msgstr "Wenn dieses Werkzeug 'setgid' wäre könnte ein feindlicher lokaler Benutzer dadurch administrativen Zugriff auf RT erlangen."
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
+msgid "If you've updated anything above, be sure to"
+msgstr "Wenn du irgend etwas aktualisiert hast, denke daran hier zu klicken"
+
+#: lib/RT/Interface/Web.pm:860
+msgid "Illegal value for %1"
+msgstr "Unerlaubter Wert für %1"
+
+#: lib/RT/Interface/Web.pm:863
+msgid "Immutable field"
+msgstr "Unveränderbares Feld"
+
+#: html/Admin/Elements/EditCustomFields:74
+msgid "Include disabled custom fields in listing."
+msgstr "Zeige auch deaktivierte benutzerdefinierte Felder an."
+
+#: html/Admin/Queues/index.html:43
+msgid "Include disabled queues in listing."
+msgstr "Zeige auch deaktivierte Stapel an."
+
+#: html/Admin/Users/index.html:47
+msgid "Include disabled users in search."
+msgstr "Zeige deaktivierte Benutzer auch in der Suche an."
+
+#: lib/RT/Tickets_Overlay.pm:1067
+msgid "Initial Priority"
+msgstr "Anfängliche Priorität"
+
+#: lib/RT/Ticket_Overlay.pm:1161 lib/RT/Ticket_Overlay.pm:1163
+msgid "InitialPriority"
+msgstr ""
+
+#: lib/RT/ScripAction_Overlay.pm:105
+msgid "Input error"
+msgstr "Eingabefehler"
+
+#: lib/RT/Ticket_Overlay.pm:3729
+msgid "Internal Error"
+msgstr "Interner Fehler"
+
+#: lib/RT/Record.pm:143
+#. ($id->{error_message})
+msgid "Internal Error: %1"
+msgstr "Internet Fehler: %1"
+
+#: lib/RT/Group_Overlay.pm:644
+msgid "Invalid Group Type"
+msgstr "Ungültige Gruppenart"
+
+#: lib/RT/Principal_Overlay.pm:128
+msgid "Invalid Right"
+msgstr "Ungültiges Recht"
+
+#: lib/RT/Interface/Web.pm:865
+msgid "Invalid data"
+msgstr "Ungültige Daten"
+
+#: lib/RT/Ticket_Overlay.pm:438
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr "Ungültiger Inhaber. Zurücksetzung auf 'nobody'."
+
+#: lib/RT/Scrip_Overlay.pm:134 lib/RT/Template_Overlay.pm:251
+msgid "Invalid queue"
+msgstr "Ungültiger Stapel"
+
+#: lib/RT/ACE_Overlay.pm:244 lib/RT/ACE_Overlay.pm:253 lib/RT/ACE_Overlay.pm:259 lib/RT/ACE_Overlay.pm:270 lib/RT/ACE_Overlay.pm:275
+msgid "Invalid right"
+msgstr "Ungültiges Recht"
+
+#: lib/RT/Record.pm:118
+#. ($key)
+msgid "Invalid value for %1"
+msgstr "Ungültiger Wert für %1"
+
+#: lib/RT/Ticket_Overlay.pm:3367
+msgid "Invalid value for custom field"
+msgstr "Ungültiger Wert für das benutzerdefinierte Feld"
+
+#: lib/RT/Ticket_Overlay.pm:345
+msgid "Invalid value for status"
+msgstr "Ungültiger Statuswert"
+
+#: bin/rt-crontool:191
+msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
+msgstr "Es ist sehr wichtig dass nichtprivilegierte Benutzer dieses Werkzeug nicht aufrufen können."
+
+#: bin/rt-crontool:192
+msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
+msgstr "Es wird empfohlen einen nichtprivilegierten Unix-User mit korrekter Gruppenzugehörigkeit zum Zugriff auf RT anzulegen um dieses Werkzeug aufzurufen."
+
+#: bin/rt-crontool:163
+msgid "It takes several arguments:"
+msgstr "Es verarbeitet verschiedene Parameter:"
+
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
+msgstr ""
+
+#: lib/RT/Date.pm:411
+msgid "Jan."
+msgstr "Jan"
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "Join or leave this group"
+msgstr "Betrete oder verlasse diese Gruppe"
+
+#: lib/RT/Date.pm:417
+msgid "Jul."
+msgstr "Jul"
+
+#: html/Ticket/Elements/Tabs:99
+msgid "Jumbo"
+msgstr "Alles"
+
+#: lib/RT/Date.pm:416
+msgid "Jun."
+msgstr "Jun"
+
+#: NOT FOUND IN SOURCE
+msgid "Keyword"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:52
+msgid "Lang"
+msgstr "Sprache"
+
+#: html/Ticket/Elements/Tabs:73
+msgid "Last"
+msgstr "letzter Kontakt"
+
+#: html/Ticket/Elements/EditDates:38 html/Ticket/Elements/ShowDates:39
+msgid "Last Contact"
+msgstr "Letzter Kontakt"
+
+#: html/Elements/SelectDateType:29
+msgid "Last Contacted"
+msgstr "Zuletzt Kontaktiert"
+
+#: html/Search/Elements/TicketHeader:41
+msgid "Last Notified"
+msgstr "Letzte Änderung"
+
+#: html/Elements/SelectDateType:30
+msgid "Last Updated"
+msgstr "Zuletzt Aktualisiert"
+
+#: NOT FOUND IN SOURCE
+msgid "Left"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:83
+msgid "Let this user access RT"
+msgstr "Diesen Benutzer RT-Zugriff gewähren"
+
+#: html/Admin/Users/Modify.html:87
+msgid "Let this user be granted rights"
+msgstr "Diesen Benutzer mehr Rechte gewähren"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting owner to %1 %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting queue to %1 %2"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2697
+msgid "Link already exists"
+msgstr "Beziehung existiert bereits"
+
+#: lib/RT/Ticket_Overlay.pm:2709
+msgid "Link could not be created"
+msgstr "Beziehung konnte nicht erstellt werden"
+
+#: lib/RT/Ticket_Overlay.pm:2717 lib/RT/Ticket_Overlay.pm:2727
+#. ($TransString)
+msgid "Link created (%1)"
+msgstr "Beziehung erstellt (%1)"
+
+#: lib/RT/Ticket_Overlay.pm:2638
+#. ($TransString)
+msgid "Link deleted (%1)"
+msgstr "Beziehung gelöscht (%1)"
+
+#: lib/RT/Ticket_Overlay.pm:2644
+msgid "Link not found"
+msgstr "Beziehung nicht gefunden"
+
+#: html/Ticket/ModifyLinks.html:25 html/Ticket/ModifyLinks.html:29
+#. ($Ticket->Id)
+msgid "Link ticket #%1"
+msgstr "Verweise auf Ticket #%1"
+
+#: html/Ticket/Elements/Tabs:97
+msgid "Links"
+msgstr "Beziehungen"
+
+#: html/Admin/Users/Modify.html:114 html/User/Prefs.html:85
+msgid "Location"
+msgstr "Adresse"
+
+#: lib/RT.pm:158
+#. ($RT::LogDir)
+msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
+msgstr "Log-Verzeichnis %1 nicht gefunden oder kein Schreibzugriff.\\n RT kann nicht starten."
+
+#: html/Elements/Header:57
+#. ("<b>".$session{'CurrentUser'}->Name."</b>")
+msgid "Logged in as %1"
+msgstr "Angemeldet als %1"
+
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:25 html/Elements/Login:34 html/Elements/Login:45
+msgid "Login"
+msgstr "Anmelden"
+
+#: html/Elements/Header:54
+msgid "Logout"
+msgstr "Abmelden"
+
+#: html/Search/Bulk.html:86
+msgid "Make Owner"
+msgstr "Mach Inhaber"
+
+#: html/Search/Bulk.html:102
+msgid "Make Status"
+msgstr "Mach Status"
+
+#: html/Search/Bulk.html:109
+msgid "Make date Due"
+msgstr "Mach Fälligkeitsdatum"
+
+#: html/Search/Bulk.html:110
+msgid "Make date Resolved"
+msgstr "Mach Erledigungsdatum"
+
+#: html/Search/Bulk.html:107
+msgid "Make date Started"
+msgstr "Mach Datum gestartet"
+
+#: html/Search/Bulk.html:106
+msgid "Make date Starts"
+msgstr "Mach Startdatum"
+
+#: html/Search/Bulk.html:108
+msgid "Make date Told"
+msgstr "Mach Eingangsdatum"
+
+#: html/Search/Bulk.html:99
+msgid "Make priority"
+msgstr "Mach Priorität"
+
+#: html/Search/Bulk.html:100
+msgid "Make queue"
+msgstr "Mach Stapel"
+
+#: html/Search/Bulk.html:98
+msgid "Make subject"
+msgstr "Betreff setzen"
+
+#: html/Admin/index.html:33
+msgid "Manage groups and group membership"
+msgstr "Gruppen und Gruppenmitglieder verwalten"
+
+#: html/Admin/index.html:39
+msgid "Manage properties and configuration which apply to all queues"
+msgstr "Eigenschaften und Einstellungen für alle Stapel verwalten"
+
+#: html/Admin/index.html:36
+msgid "Manage queues and queue-specific properties"
+msgstr "Stapel und stapelspezifische Einstellungen verwalten"
+
+#: html/Admin/index.html:30
+msgid "Manage users and passwords"
+msgstr "Benutzer und Passworte verwalten"
+
+#: lib/RT/Date.pm:413
+msgid "Mar."
+msgstr "Mär"
+
+#: lib/RT/Date.pm:415
+msgid "May."
+msgstr "Mai."
+
+#: lib/RT/Group_Overlay.pm:982
+msgid "Member added"
+msgstr "Mitglied hinzugefügt"
+
+#: lib/RT/Group_Overlay.pm:1140
+msgid "Member deleted"
+msgstr "Mitglied gelöscht"
+
+#: lib/RT/Group_Overlay.pm:1144
+msgid "Member not deleted"
+msgstr "Mitglied nicht gelöscht"
+
+#: html/Elements/SelectLinkType:26
+msgid "Member of"
+msgstr "Mitglied von"
+
+#: html/Admin/Elements/GroupTabs:42 html/User/Elements/GroupTabs:42
+msgid "Members"
+msgstr "Mitglieder"
+
+#: lib/RT/Ticket_Overlay.pm:2843
+msgid "Merge Successful"
+msgstr "Zusammenführung erfolgreich"
+
+#: lib/RT/Ticket_Overlay.pm:2804
+msgid "Merge failed. Couldn't set EffectiveId"
+msgstr "Zusammenführung fehlgeschlagen. Konnte EffectiveId nicht setztn"
+
+#: html/Ticket/Elements/EditLinks:115
+msgid "Merge into"
+msgstr "Zusammenführen in"
+
+#: html/Ticket/Update.html:102
+msgid "Message"
+msgstr "Nachricht"
+
+#: lib/RT/Interface/Web.pm:867
+msgid "Missing a primary key?: %1"
+msgstr "%1: Fehlt ein Primärschlüssel?"
+
+#: html/Admin/Users/Modify.html:169 html/User/Prefs.html:54
+msgid "Mobile"
+msgstr "Mobil"
+
+#: html/Admin/Elements/ModifyUser:72
+msgid "MobilePhone"
+msgstr "Mobiltelefon"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "Modify Access Control List"
+msgstr "Ändere Zugriffskontrollliste"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Field %1"
+msgstr ""
+
+#: html/Admin/Global/CustomFields.html:44 html/Admin/Global/index.html:51
+msgid "Modify Custom Fields which apply to all queues"
+msgstr "Ändere benutzdefinierte Felder für diesen Stapel"
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "Modify Scrip templates for this queue"
+msgstr "Ändere Scrip-Vorlagen für diesen Stapel"
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "Modify Scrips for this queue"
+msgstr "Ändere Scrips für diesen Stapel"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Template %1"
+msgstr ""
+
+#: html/Admin/Queues/CustomField.html:45
+#. ($QueueObj->Name())
+msgid "Modify a CustomField for queue %1"
+msgstr "Ändere ein benutzerdefiniertes Feld für Stapel %1"
+
+#: html/Admin/Global/CustomField.html:53
+msgid "Modify a CustomField which applies to all queues"
+msgstr "Ändere ein globales benutzerdefiniertes Feld"
+
+#: html/Admin/Queues/Scrip.html:54
+#. ($QueueObj->Name)
+msgid "Modify a scrip for queue %1"
+msgstr "Ändere ein Scrip für den Stapel %1"
+
+#: html/Admin/Global/Scrip.html:48
+msgid "Modify a scrip which applies to all queues"
+msgstr "Ändere ein globales benutzerdefiniertes Feld"
+
+#: html/Ticket/ModifyDates.html:25 html/Ticket/ModifyDates.html:29
+#. ($TicketObj->Id)
+msgid "Modify dates for #%1"
+msgstr "Ändere Datumsangaben für #%1"
+
+#: html/Ticket/ModifyDates.html:35
+#. ($TicketObj->Id)
+msgid "Modify dates for ticket # %1"
+msgstr "Ändere Datumsangaben für Ticket #%1"
+
+#: html/Admin/Global/GroupRights.html:25 html/Admin/Global/GroupRights.html:28 html/Admin/Global/index.html:56
+msgid "Modify global group rights"
+msgstr "Ändere globale Gruppenrechte"
+
+#: html/Admin/Global/GroupRights.html:33
+msgid "Modify global group rights."
+msgstr "Ändere globale Gruppenrechte."
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global scrips"
+msgstr ""
+
+#: html/Admin/Global/UserRights.html:25 html/Admin/Global/UserRights.html:28 html/Admin/Global/index.html:60
+msgid "Modify global user rights"
+msgstr "Ändere globale Benutzerrechte"
+
+#: html/Admin/Global/UserRights.html:33
+msgid "Modify global user rights."
+msgstr "Ändere globale Benutzerrechte."
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "Modify group metadata or delete group"
+msgstr "Ändere Gruppen-Metadaten oder lösche die Gruppe"
+
+#: html/Admin/Groups/GroupRights.html:25 html/Admin/Groups/GroupRights.html:29 html/Admin/Groups/GroupRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify group rights for group %1"
+msgstr "Ändere die Gruppenrechte der Gruppe %1"
+
+#: html/Admin/Queues/GroupRights.html:25 html/Admin/Queues/GroupRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify group rights for queue %1"
+msgstr "Ändere Gruppenrechte für Stapel %1"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "Modify membership roster for this group"
+msgstr "Ändere Mitgliedsverzeichnis dieser Gruppe"
+
+#: lib/RT/System.pm:61
+msgid "Modify one's own RT account"
+msgstr "Ändere jemandens eigenen RT-Zugang"
+
+#: html/Admin/Queues/People.html:25 html/Admin/Queues/People.html:29
+#. ($QueueObj->Name)
+msgid "Modify people related to queue %1"
+msgstr "Ändere Leute bezogen auf Stapel %1"
+
+#: html/Ticket/ModifyPeople.html:25 html/Ticket/ModifyPeople.html:29 html/Ticket/ModifyPeople.html:35
+#. ($Ticket->id)
+#. ($Ticket->Id)
+msgid "Modify people related to ticket #%1"
+msgstr "Ändere Personen des Tickets #%1"
+
+#: html/Admin/Queues/Scrips.html:44
+#. ($QueueObj->Name)
+msgid "Modify scrips for queue %1"
+msgstr "Ändere Scrips für den Stapel %1"
+
+#: html/Admin/Global/Scrips.html:44 html/Admin/Global/index.html:42
+msgid "Modify scrips which apply to all queues"
+msgstr "Ändere auf alle Stapel angewandte Scrips"
+
+#: html/Admin/Global/Template.html:25 html/Admin/Global/Template.html:30 html/Admin/Global/Template.html:81 html/Admin/Queues/Template.html:78
+#. (loc($TemplateObj->Name()))
+#. ($TemplateObj->id)
+msgid "Modify template %1"
+msgstr "Ändere Vorlage %1"
+
+#: html/Admin/Global/Templates.html:44
+msgid "Modify templates which apply to all queues"
+msgstr "Ändere globale Templates"
+
+#: html/Admin/Groups/Modify.html:87 html/User/Groups/Modify.html:86
+#. ($Group->Name)
+msgid "Modify the group %1"
+msgstr "Ändere Gruppe %1"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "Modify the queue watchers"
+msgstr "Ändere die Stapelbeobachter"
+
+#: html/Admin/Users/Modify.html:236
+#. ($UserObj->Name)
+msgid "Modify the user %1"
+msgstr "Ändere Benutzer %1"
+
+#: html/Ticket/ModifyAll.html:37
+#. ($Ticket->Id)
+msgid "Modify ticket # %1"
+msgstr "Ändere Ticket #%1"
+
+#: html/Ticket/Modify.html:25 html/Ticket/Modify.html:28 html/Ticket/Modify.html:34
+#. ($TicketObj->Id)
+msgid "Modify ticket #%1"
+msgstr "Ändere Ticket #%1"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "Modify tickets"
+msgstr "Ändere Tickets"
+
+#: html/Admin/Groups/UserRights.html:25 html/Admin/Groups/UserRights.html:29 html/Admin/Groups/UserRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify user rights for group %1"
+msgstr "Ändere Benutzerrechte für die Gruppe %1"
+
+#: html/Admin/Queues/UserRights.html:25 html/Admin/Queues/UserRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify user rights for queue %1"
+msgstr "Ändere Benutzerrechte für Stapel %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify watchers for queue '%1'"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ModifyACL"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "ModifyOwnMembership"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "ModifyQueueWatchers"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "ModifyScrips"
+msgstr ""
+
+#: lib/RT/System.pm:61
+msgid "ModifySelf"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "ModifyTemplate"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "ModifyTicket"
+msgstr ""
+
+#: lib/RT/Date.pm:388
+msgid "Mon."
+msgstr "Mo"
+
+#: html/Ticket/Elements/ShowRequestor:42
+#. ($name)
+msgid "More about %1"
+msgstr "Mehr über %1"
+
+#: html/Admin/Elements/EditCustomFields:61
+msgid "Move down"
+msgstr "Runter verschieben"
+
+#: html/Admin/Elements/EditCustomFields:53
+msgid "Move up"
+msgstr "Hoch verschieben"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:27
+msgid "Multiple"
+msgstr "Mehrere"
+
+#: lib/RT/User_Overlay.pm:179
+msgid "Must specify 'Name' attribute"
+msgstr "Du musst eine Angabe bei 'Name' machen"
+
+#: NOT FOUND IN SOURCE
+msgid "My Approvals"
+msgstr ""
+
+#: html/Approvals/index.html:25 html/Approvals/index.html:26
+msgid "My approvals"
+msgstr "Meine Freigaben"
+
+#: html/Admin/Elements/AddCustomFieldValue:26 html/Admin/Elements/EditCustomField:32 html/Admin/Elements/ModifyTemplate:28 html/Admin/Elements/ModifyUser:30 html/Admin/Groups/Modify.html:44 html/Elements/SelectGroups:26 html/Elements/SelectUsers:28 html/User/Groups/Modify.html:44
+msgid "Name"
+msgstr "Name"
+
+#: lib/RT/User_Overlay.pm:186
+msgid "Name in use"
+msgstr "Benutzername ist bereits in Gebrauch"
+
+#: NOT FOUND IN SOURCE
+msgid "Need approval from system administrator"
+msgstr ""
+
+#: html/Ticket/Elements/ShowDates:52
+msgid "Never"
+msgstr "Niemals"
+
+#: html/Elements/Quicksearch:30
+msgid "New"
+msgstr "Neu"
+
+#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:93 html/User/Prefs.html:65
+msgid "New Password"
+msgstr "Neues Passwort"
+
+#: etc/initialdata:311 etc/upgrade/2.1.71:16
+msgid "New Pending Approval"
+msgstr "Neue wartende Freigaben"
+
+#: html/Ticket/Elements/EditLinks:111
+msgid "New Relationships"
+msgstr "Neue Beziehungen"
+
+#: html/Ticket/Elements/Tabs:36
+msgid "New Search"
+msgstr "Neue Suche"
+
+#: html/Admin/Global/CustomField.html:41 html/Admin/Global/CustomFields.html:39 html/Admin/Queues/CustomField.html:52 html/Admin/Queues/CustomFields.html:40
+msgid "New custom field"
+msgstr "Neues benutzerdef. Feld"
+
+#: html/Admin/Elements/GroupTabs:54 html/User/Elements/GroupTabs:52
+msgid "New group"
+msgstr "Neue Gruppe"
+
+#: html/SelfService/Prefs.html:32
+msgid "New password"
+msgstr "Neues Passwort"
+
+#: lib/RT/User_Overlay.pm:639
+msgid "New password notification sent"
+msgstr "Neue Passworterinnerung wurde verschickt"
+
+#: html/Admin/Elements/QueueTabs:70
+msgid "New queue"
+msgstr "Neuer Stapel"
+
+#: html/SelfService/Elements/Tabs:63
+msgid "New request"
+msgstr "Neues Ticket"
+
+#: html/Admin/Elements/SelectRights:42
+msgid "New rights"
+msgstr "Neue Rechte"
+
+#: html/Admin/Global/Scrip.html:40 html/Admin/Global/Scrips.html:39 html/Admin/Queues/Scrip.html:43 html/Admin/Queues/Scrips.html:53
+msgid "New scrip"
+msgstr "Neues Scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "New search"
+msgstr ""
+
+#: html/Admin/Global/Template.html:60 html/Admin/Global/Templates.html:39 html/Admin/Queues/Template.html:58 html/Admin/Queues/Templates.html:46
+msgid "New template"
+msgstr "Neue Vorlage"
+
+#: lib/RT/Ticket_Overlay.pm:2771
+msgid "New ticket doesn't exist"
+msgstr "Neues Ticket existiert nicht"
+
+#: html/Admin/Elements/UserTabs:52
+msgid "New user"
+msgstr "Neuer Benutzer"
+
+#: html/Admin/Elements/CreateUserCalled:26
+msgid "New user called"
+msgstr "Neues Benutzer aufgerufen"
+
+#: html/Admin/Queues/People.html:55 html/Ticket/Elements/EditPeople:29
+msgid "New watchers"
+msgstr "Neue Beobachter"
+
+#: html/Admin/Users/Prefs.html:42
+msgid "New window setting"
+msgstr "Speichere Fenstereinstellungen"
+
+#: html/Ticket/Elements/Tabs:69
+msgid "Next"
+msgstr "Nächste"
+
+#: html/Search/Listing.html:48
+msgid "Next page"
+msgstr "Nächste Seite"
+
+#: html/Admin/Elements/ModifyUser:50
+msgid "NickName"
+msgstr "Spitzname"
+
+#: html/Admin/Users/Modify.html:63 html/User/Prefs.html:46
+msgid "Nickname"
+msgstr "Spitzname"
+
+#: html/Admin/Elements/EditCustomField:73 html/Admin/Elements/EditCustomFields:105
+msgid "No CustomField"
+msgstr "Kein benutzerdefiniertes Feld"
+
+#: html/Admin/Groups/GroupRights.html:84 html/Admin/Groups/UserRights.html:71
+msgid "No Group defined"
+msgstr "Keine Gruppe definiert"
+
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:68
+msgid "No Queue defined"
+msgstr "Kein Stapel vorhanden"
+
+#: bin/rt-crontool:56
+msgid "No RT user found. Please consult your RT administrator.\\n"
+msgstr "Kein RT-Benutzer gefunden. Bitte kontaktiere Deinen RT-Administrator.\\n"
+
+#: html/Admin/Global/Template.html:79 html/Admin/Queues/Template.html:76
+msgid "No Template"
+msgstr "Keine Vorlage"
+
+#: bin/rt-commit-handler:764
+msgid "No Ticket specified. Aborting ticket "
+msgstr "Kein Ticket angegeben. Bereche Ticket ab "
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:47
+msgid "No action"
+msgstr "Keine Aktion"
+
+#: lib/RT/Interface/Web.pm:862
+msgid "No column specified"
+msgstr "Keine Spalte angegeben"
+
+#: NOT FOUND IN SOURCE
+msgid "No command found\\n"
+msgstr ""
+
+#: html/Elements/ViewUser:36 html/Ticket/Elements/ShowRequestor:45
+msgid "No comment entered about this user"
+msgstr "Kein Kommentar über diesen Benutzer angegeben"
+
+#: lib/RT/Ticket_Overlay.pm:2189 lib/RT/Ticket_Overlay.pm:2257
+msgid "No correspondence attached"
+msgstr "Keine Korrespondenz aufgezeichnet"
+
+#: lib/RT/Action/Generic.pm:150 lib/RT/Condition/Generic.pm:176 lib/RT/Search/ActiveTicketsInQueue.pm:56 lib/RT/Search/Generic.pm:113
+#. (ref $self)
+msgid "No description for %1"
+msgstr "Keine Beschreibung für %1 vorhanden"
+
+#: lib/RT/Users_Overlay.pm:151
+msgid "No group specified"
+msgstr "Keine Gruppe angegeben"
+
+#: lib/RT/User_Overlay.pm:857
+msgid "No password set"
+msgstr "Kein Passwort gesetzt"
+
+#: lib/RT/Queue_Overlay.pm:259
+msgid "No permission to create queues"
+msgstr "Kein Recht Stapel anzulegen"
+
+#: lib/RT/Ticket_Overlay.pm:341
+#. ($QueueObj->Name)
+msgid "No permission to create tickets in the queue '%1'"
+msgstr "Kein Recht um Tickets im Stapel '%1' anzulegen"
+
+#: lib/RT/User_Overlay.pm:151
+msgid "No permission to create users"
+msgstr "Kein Recht Benutzer anzulegen"
+
+#: html/SelfService/Display.html:174
+msgid "No permission to display that ticket"
+msgstr "Kein Recht dieses Ticket anzuzeigen"
+
+#: html/SelfService/Update.html:55
+msgid "No permission to view update ticket"
+msgstr "Kein Recht dieses Ticket zu aktualisieren"
+
+#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1488
+msgid "No principal specified"
+msgstr "Kein Hauptverantwortlicher angegeben"
+
+#: html/Admin/Queues/People.html:154 html/Admin/Queues/People.html:164
+msgid "No principals selected."
+msgstr "Keine Hauptverantwortliche ausgewählt."
+
+#: html/Admin/Queues/index.html:35
+msgid "No queues matching search criteria found."
+msgstr "Keine den Suchkriterien entsprechenden Stapel gefunden"
+
+#: html/Admin/Elements/SelectRights:81
+msgid "No rights found"
+msgstr "Keine Rechte gefunden"
+
+#: html/Admin/Elements/SelectRights:33
+msgid "No rights granted."
+msgstr "Keine Rechte gewährt."
+
+#: html/Search/Bulk.html:149
+msgid "No search to operate on."
+msgstr "Keine Suchliste zum bearbeiten."
+
+#: NOT FOUND IN SOURCE
+msgid "No ticket id specified"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:480 lib/RT/Transaction_Overlay.pm:518
+msgid "No transaction type specified"
+msgstr "Kein Transaktionstyp angegeben"
+
+#: html/Admin/Users/index.html:36
+msgid "No users matching search criteria found."
+msgstr "Keine auf die Suchkriterien passende Benutzer gefunden"
+
+#: bin/rt-commit-handler:644
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr "Kein gültiger RT-Benutzer gefunden. RT CVS-Handler weggefallen. Bitte kontaktiere Deinen RT-Administrator.\\n"
+
+#: lib/RT/Interface/Web.pm:859
+msgid "No value sent to _Set!\\n"
+msgstr "Kein Wert an _Set geschickt!\\n"
+
+#: html/Search/Elements/TicketRow:37
+msgid "Nobody"
+msgstr "Niemand"
+
+#: lib/RT/Interface/Web.pm:864
+msgid "Nonexistant field?"
+msgstr "Nichtexistierendes Feld?"
+
+#: html/Elements/Login:99
+msgid "Not logged in"
+msgstr "Nicht angemeldet"
+
+#: html/Elements/Header:59 html/SelfService/Elements/Header:58
+msgid "Not logged in."
+msgstr "Nicht angemeldet."
+
+#: lib/RT/Date.pm:369
+msgid "Not set"
+msgstr "Nicht angegeben"
+
+#: html/NoAuth/Reminder.html:27
+msgid "Not yet implemented."
+msgstr "Noch nicht implementiert."
+
+#: html/Admin/Groups/Rights.html:25
+msgid "Not yet implemented...."
+msgstr "Noch nicht implementiert..."
+
+#: html/Approvals/Elements/Approve:50
+msgid "Notes"
+msgstr "Bemerkungen"
+
+#: lib/RT/User_Overlay.pm:642
+msgid "Notification could not be sent"
+msgstr "Benachrichtigung konnte nicht verschickt werden"
+
+#: etc/initialdata:94
+msgid "Notify AdminCcs"
+msgstr "Benachrichtige AdminCCs"
+
+#: etc/initialdata:90
+msgid "Notify AdminCcs as Comment"
+msgstr "Benachrichtige AdminCCs als Kommentar"
+
+#: etc/initialdata:121
+msgid "Notify Other Recipients"
+msgstr "Benachrichtige andere Empfänger"
+
+#: etc/initialdata:117
+msgid "Notify Other Recipients as Comment"
+msgstr "Benachrichtige andere Empfänger als Kommentar"
+
+#: etc/initialdata:86
+msgid "Notify Owner"
+msgstr "Benachrichte Inhaber"
+
+#: etc/initialdata:82
+msgid "Notify Owner as Comment"
+msgstr "Benachrichtige Inhaber als Kommentar"
+
+#: etc/initialdata:313 etc/upgrade/2.1.71:17
+msgid "Notify Owners and AdminCcs of new items pending their approval"
+msgstr "Benachrichtige Inhaber und AdminCCs neuer auf Freigabe wartende Anfragen"
+
+#: etc/initialdata:78
+msgid "Notify Requestors"
+msgstr "Benachrichtige die Klienten"
+
+#: etc/initialdata:104
+msgid "Notify Requestors and Ccs"
+msgstr "Benachrichtige die Klienten und CCs"
+
+#: etc/initialdata:99
+msgid "Notify Requestors and Ccs as Comment"
+msgstr "Benachrichtige die Klienten und CCs als Kommentar"
+
+#: etc/initialdata:113
+msgid "Notify Requestors, Ccs and AdminCcs"
+msgstr "Benachrichtige die Klienten, CCs und AdminCCs"
+
+#: etc/initialdata:109
+msgid "Notify Requestors, Ccs and AdminCcs as Comment"
+msgstr "Benachrichtige die Klienten, CCs und AdminCCs als Kommentar"
+
+#: lib/RT/Date.pm:421
+msgid "Nov."
+msgstr "Nov"
+
+#: lib/RT/Record.pm:157
+msgid "Object could not be created"
+msgstr "Objekt konnte nicht erstellt werden"
+
+#: lib/RT/Record.pm:176
+msgid "Object created"
+msgstr "Objekt erstellt"
+
+#: lib/RT/Date.pm:420
+msgid "Oct."
+msgstr "Okt"
+
+#: html/Elements/SelectDateRelation:35
+msgid "On"
+msgstr "am"
+
+#: etc/initialdata:155
+msgid "On Comment"
+msgstr "Bei Kommentar"
+
+#: etc/initialdata:148
+msgid "On Correspond"
+msgstr "Bei Korrespondenz"
+
+#: etc/initialdata:137
+msgid "On Create"
+msgstr "Bei Erstellen"
+
+#: etc/initialdata:169
+msgid "On Owner Change"
+msgstr "Bei Eigentümerwechsel"
+
+#: etc/initialdata:177
+msgid "On Queue Change"
+msgstr "Bei Stapelwechsel"
+
+#: etc/initialdata:183
+msgid "On Resolve"
+msgstr "Beim Erledigen"
+
+#: etc/initialdata:161
+msgid "On Status Change"
+msgstr "Bei Statuswechsel"
+
+#: etc/initialdata:142
+msgid "On Transaction"
+msgstr "Bei einer Transaktion"
+
+#: html/Approvals/Elements/PendingMyApproval:50
+#. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
+msgid "Only show approvals for requests created after %1"
+msgstr "Zeige nur Freigaben für nach dem %1 erstelle Anfragen"
+
+#: html/Approvals/Elements/PendingMyApproval:48
+#. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
+msgid "Only show approvals for requests created before %1"
+msgstr "Zeige nur Freigaben für vor dem %1 erstellte Anfragen"
+
+#: html/Elements/Quicksearch:31
+msgid "Open"
+msgstr "Offen"
+
+#: html/Ticket/Elements/Tabs:136
+msgid "Open it"
+msgstr "Öffnen"
+
+#: html/SelfService/Elements/Tabs:57
+msgid "Open requests"
+msgstr "Offene Anfragen"
+
+#: html/Admin/Users/Prefs.html:41
+msgid "Open tickets (from listing) in a new window"
+msgstr "Öffne Anfragen (aus der Liste) in neuem Fenster"
+
+#: html/Admin/Users/Prefs.html:40
+msgid "Open tickets (from listing) in another window"
+msgstr "Öffne Anfragen (aus der Liste) in ein anderes Fenster"
+
+#: etc/initialdata:133
+msgid "Open tickets on correspondence"
+msgstr "Öffne Anfragen bei Korrespondenz"
+
+#: html/Search/Elements/PickRestriction:101
+msgid "Ordering and sorting"
+msgstr "Sortierung und Reihenfolge"
+
+#: html/Admin/Elements/ModifyUser:46 html/Admin/Users/Modify.html:117 html/Elements/SelectUsers:29 html/User/Prefs.html:86
+msgid "Organization"
+msgstr "Organisation"
+
+#: html/Approvals/Elements/Approve:34
+#. ($approving->Id, $approving->Subject)
+msgid "Originating ticket: #%1"
+msgstr "Ursprüngliche Anfrage: #%1"
+
+#: html/Admin/Elements/ModifyQueue:55 html/Admin/Queues/Modify.html:69
+msgid "Over time, priority moves toward"
+msgstr "Mit der Zeit steigt die Priorität auf"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "Own tickets"
+msgstr "Eigene Anfrage"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "OwnTicket"
+msgstr ""
+
+#: etc/initialdata:38 html/Elements/MyRequests:32 html/SelfService/Elements/MyRequests:30 html/Ticket/Create.html:48 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/EditPeople:44 html/Ticket/Elements/ShowPeople:27 html/Ticket/Update.html:63 lib/RT/ACE_Overlay.pm:86 lib/RT/Tickets_Overlay.pm:1244
+msgid "Owner"
+msgstr "Inhaber"
+
+#: lib/RT/Ticket_Overlay.pm:3004
+#. ($OldOwnerObj->Name,  $NewOwnerObj->Name)
+msgid "Owner changed from %1 to %2"
+msgstr "Inhaberwechsel von %1 zu %2"
+
+#: lib/RT/Transaction_Overlay.pm:584
+#. ($Old->Name , $New->Name)
+msgid "Owner forcibly changed from %1 to %2"
+msgstr "Inhaber mit Gewalt von %1 in %2 geändert"
+
+#: html/Search/Elements/PickRestriction:31
+msgid "Owner is"
+msgstr "Inhaber ist"
+
+#: html/Admin/Users/Modify.html:174 html/User/Prefs.html:56
+msgid "Pager"
+msgstr "Pager"
+
+#: html/Admin/Elements/ModifyUser:74
+msgid "PagerPhone"
+msgstr "PagerTelefon"
+
+#: html/Ticket/Create.html:182 html/Ticket/Elements/EditLinks:127 html/Ticket/Elements/EditLinks:58 html/Ticket/Elements/ShowLinks:43
+msgid "Parents"
+msgstr "Eltern"
+
+#: html/Elements/Login:43 html/User/Prefs.html:61
+msgid "Password"
+msgstr "Passwort"
+
+#: html/NoAuth/Reminder.html:25
+msgid "Password Reminder"
+msgstr "Passworterinnerung"
+
+#: lib/RT/User_Overlay.pm:168 lib/RT/User_Overlay.pm:860
+msgid "Password too short"
+msgstr "Passwort ist zu kurz"
+
+#: html/Admin/Users/Modify.html:291 html/User/Prefs.html:172
+#. (loc_fuzzy($msg))
+msgid "Password: %1"
+msgstr "Passwort: %1"
+
+#: html/Ticket/Elements/ShowSummary:43 html/Ticket/Elements/Tabs:96 html/Ticket/ModifyAll.html:51
+msgid "People"
+msgstr "Personen"
+
+#: etc/initialdata:126
+msgid "Perform a user-defined action"
+msgstr "Führe eine benutzerdefinierte Aktion aus"
+
+#: lib/RT/ACE_Overlay.pm:231 lib/RT/ACE_Overlay.pm:237 lib/RT/ACE_Overlay.pm:563 lib/RT/ACE_Overlay.pm:573 lib/RT/ACE_Overlay.pm:583 lib/RT/ACE_Overlay.pm:648 lib/RT/CurrentUser.pm:83 lib/RT/CurrentUser.pm:92 lib/RT/CustomField_Overlay.pm:445 lib/RT/CustomField_Overlay.pm:451 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1099 lib/RT/Group_Overlay.pm:1108 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1163 lib/RT/Group_Overlay.pm:1169 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:904 lib/RT/Group_Overlay.pm:908 lib/RT/Group_Overlay.pm:921 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:931 lib/RT/Scrip_Overlay.pm:126 lib/RT/Scrip_Overlay.pm:137 lib/RT/Scrip_Overlay.pm:197 lib/RT/Scrip_Overlay.pm:430 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:88 lib/RT/Template_Overlay.pm:94 lib/RT/Ticket_Overlay.pm:1341 lib/RT/Ticket_Overlay.pm:1351 lib/RT/Ticket_Overlay.pm:1365 lib/RT/Ticket_Overlay.pm:1518 lib/RT/Ticket_Overlay.pm:1527 lib/RT/Ticket_Overlay.pm:1540 lib/RT/Ticket_Overlay.pm:1875 lib/RT/Ticket_Overlay.pm:2013 lib/RT/Ticket_Overlay.pm:2177 lib/RT/Ticket_Overlay.pm:2244 lib/RT/Ticket_Overlay.pm:2596 lib/RT/Ticket_Overlay.pm:2668 lib/RT/Ticket_Overlay.pm:2762 lib/RT/Ticket_Overlay.pm:2777 lib/RT/Ticket_Overlay.pm:2910 lib/RT/Ticket_Overlay.pm:3139 lib/RT/Ticket_Overlay.pm:3337 lib/RT/Ticket_Overlay.pm:3499 lib/RT/Ticket_Overlay.pm:3551 lib/RT/Ticket_Overlay.pm:3716 lib/RT/Transaction_Overlay.pm:468 lib/RT/Transaction_Overlay.pm:475 lib/RT/Transaction_Overlay.pm:504 lib/RT/Transaction_Overlay.pm:511 lib/RT/User_Overlay.pm:1334 lib/RT/User_Overlay.pm:562 lib/RT/User_Overlay.pm:597 lib/RT/User_Overlay.pm:853 lib/RT/User_Overlay.pm:941
+msgid "Permission Denied"
+msgstr "Zugriff verweigert"
+
+#: html/User/Elements/Tabs:35
+msgid "Personal Groups"
+msgstr "Persönliche Gruppen"
+
+#: html/User/Groups/index.html:30 html/User/Groups/index.html:40
+msgid "Personal groups"
+msgstr "Persönliche Gruppen"
+
+#: html/User/Elements/DelegateRights:37
+msgid "Personal groups:"
+msgstr "Persönliche Gruppen:"
+
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:49
+msgid "Phone numbers"
+msgstr "Telefonnummern"
+
+#: html/Admin/Users/Rights.html:25
+msgid "Placeholder"
+msgstr "Platzhalter"
+
+#: html/Elements/Header:52 html/Elements/Tabs:55 html/SelfService/Prefs.html:25 html/User/Prefs.html:25 html/User/Prefs.html:28
+msgid "Preferences"
+msgstr "Voreinstellungen"
+
+#: NOT FOUND IN SOURCE
+msgid "Prefs"
+msgstr ""
+
+#: lib/RT/Action/Generic.pm:160
+msgid "Prepare Stubbed"
+msgstr "Vorbereitung abgehakt"
+
+#: html/Ticket/Elements/Tabs:61
+msgid "Prev"
+msgstr "Vorherige"
+
+#: html/Search/Listing.html:44
+msgid "Previous page"
+msgstr "Vorherige Seite"
+
+#: NOT FOUND IN SOURCE
+msgid "Pri"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:133 lib/RT/ACE_Overlay.pm:208 lib/RT/ACE_Overlay.pm:552
+#. ($args{'PrincipalId'})
+msgid "Principal %1 not found."
+msgstr "Hauptverantwortlichen %1 nicht gefunden."
+
+#: html/Search/Elements/PickRestriction:54 html/SelfService/Display.html:76 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:54 html/Ticket/Elements/ShowBasics:39 lib/RT/Tickets_Overlay.pm:1042
+msgid "Priority"
+msgstr "Priorität"
+
+#: html/Admin/Elements/ModifyQueue:51 html/Admin/Queues/Modify.html:65
+msgid "Priority starts at"
+msgstr "Priorität beginnt bei"
+
+#: etc/initialdata:25
+msgid "Privileged"
+msgstr "Privilegiert"
+
+#: html/Admin/Users/Modify.html:271 html/User/Prefs.html:163
+#. (loc_fuzzy($msg))
+msgid "Privileged status: %1"
+msgstr "Privilegierungsstatus: %1"
+
+#: html/Admin/Users/index.html:62
+msgid "Privileged users"
+msgstr "Privilegierte Benutzer"
+
+#: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
+msgid "Pseudogroup for internal use"
+msgstr "Pseudogruppe für internen Gebrauch"
+
+#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Elements/Quicksearch:29 html/Search/Elements/PickRestriction:46 html/SelfService/Create.html:35 html/SelfService/Display.html:68 html/Ticket/Create.html:38 html/Ticket/Elements/EditBasics:64 html/Ticket/Elements/ShowBasics:43 html/User/Elements/DelegateRights:80 lib/RT/Tickets_Overlay.pm:883
+msgid "Queue"
+msgstr "Stapel"
+
+#: html/Admin/Queues/CustomField.html:42 html/Admin/Queues/Scrip.html:50 html/Admin/Queues/Scrips.html:46 html/Admin/Queues/Templates.html:43
+#. ($Queue)
+#. ($id)
+msgid "Queue %1 not found"
+msgstr "Stapel %2 nicht gefunden"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue '%1' not found\\n"
+msgstr ""
+
+#: html/Admin/Elements/ModifyQueue:31 html/Admin/Queues/Modify.html:43
+msgid "Queue Name"
+msgstr "Name des Stapels"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Scrips"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:263
+msgid "Queue already exists"
+msgstr "Stapel existiert bereits"
+
+#: lib/RT/Queue_Overlay.pm:272 lib/RT/Queue_Overlay.pm:278
+msgid "Queue could not be created"
+msgstr "Stapel konne nicht angelegt werden"
+
+#: html/Ticket/Create.html:209
+msgid "Queue could not be loaded."
+msgstr "Stapel konnte nicht geladen werden"
+
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:282
+msgid "Queue created"
+msgstr "Stapel angelegt"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue is not specified."
+msgstr ""
+
+#: html/SelfService/Display.html:129
+msgid "Queue not found"
+msgstr "Stapel nicht gefunden"
+
+#: html/Admin/Elements/Tabs:38 html/Admin/index.html:35
+msgid "Queues"
+msgstr "Stapel"
+
+#: html/Elements/Login:34
+#. ($RT::VERSION)
+msgid "RT %1"
+msgstr "RT %1"
+
+#: docs/design_docs/string-extraction-guide.txt:70
+#. ($RT::VERSION, $RT::rtname)
+msgid "RT %1 for %2"
+msgstr "RT %1 für %2"
+
+#: html/Elements/Footer:32
+#. ($RT::VERSION)
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr "RT %1 von <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr ""
+
+#: html/Admin/index.html:25 html/Admin/index.html:26
+msgid "RT Administration"
+msgstr "RT Administration"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Authentication error."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Bounce: %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Configuration error"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Critical error. Message not recorded!"
+msgstr ""
+
+#: html/Elements/Error:41 html/SelfService/Error.html:41
+msgid "RT Error"
+msgstr "RT Fehler"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Received mail (%1) from itself."
+msgstr ""
+
+#: html/SelfService/Closed.html:25
+msgid "RT Self Service / Closed Tickets"
+msgstr "RT Selbstbedienung / Geschlossene Anfragen"
+
+#: html/index.html:25 html/index.html:28
+msgid "RT at a glance"
+msgstr "RT auf einen Blick"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't authenticate you"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find requestor via its external database lookup"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find the queue: %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't validate this PGP signature. \\n"
+msgstr ""
+
+#: html/Elements/PageLayout:26
+#. ($RT::rtname)
+msgid "RT for %1"
+msgstr "RT für %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT has proccessed your commands"
+msgstr "RT hat Deine Befehle verarbeitet"
+
+#: html/Elements/Login:83
+#. ('2003')
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  Vertrieben unter der <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+
+#: NOT FOUND IN SOURCE
+msgid "RT thinks this message may be a bounce"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT will process this message as if it were unsigned.\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+msgstr ""
+
+#: html/Admin/Users/Modify.html:58 html/Admin/Users/Prefs.html:52 html/User/Prefs.html:44
+msgid "Real Name"
+msgstr "Realer Name"
+
+#: html/Admin/Elements/ModifyUser:48
+msgid "RealName"
+msgstr "RealerName"
+
+#: html/Ticket/Create.html:185 html/Ticket/Elements/EditLinks:139 html/Ticket/Elements/EditLinks:94 html/Ticket/Elements/ShowLinks:63
+msgid "Referred to by"
+msgstr "Bezogen von"
+
+#: html/Elements/SelectLinkType:28 html/Ticket/Create.html:184 html/Ticket/Elements/EditLinks:135 html/Ticket/Elements/EditLinks:80 html/Ticket/Elements/ShowLinks:55
+msgid "Refers to"
+msgstr "Bezieht sich auf"
+
+#: NOT FOUND IN SOURCE
+msgid "Refine"
+msgstr ""
+
+#: html/Search/Elements/PickRestriction:27
+msgid "Refine search"
+msgstr "Suche Verfeinen"
+
+#: html/Elements/Refresh:36
+#. ($value/60)
+msgid "Refresh this page every %1 minutes."
+msgstr "Seite alle %1 Minuten aktualisieren."
+
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:60 html/Ticket/ModifyAll.html:57
+msgid "Relationships"
+msgstr "Beziehungen"
+
+#: html/Search/Bulk.html:93
+msgid "Remove AdminCc"
+msgstr "Entferne AdminCC"
+
+#: html/Search/Bulk.html:91
+msgid "Remove Cc"
+msgstr "Entferne CC"
+
+#: html/Search/Bulk.html:89
+msgid "Remove Requestor"
+msgstr "Entferne Klient"
+
+#: html/Ticket/Elements/ShowTransaction:173 html/Ticket/Elements/Tabs:122
+msgid "Reply"
+msgstr "Antworten"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "Reply to tickets"
+msgstr "Antworte auf Anfragen"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "ReplyToTicket"
+msgstr ""
+
+#: etc/initialdata:44 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:87
+msgid "Requestor"
+msgstr "Klient"
+
+#: html/Search/Elements/PickRestriction:38
+msgid "Requestor email address"
+msgstr "email-Adresse des Klienten"
+
+#: NOT FOUND IN SOURCE
+msgid "Requestor(s)"
+msgstr ""
+
+#: html/SelfService/Create.html:43 html/SelfService/Display.html:42 html/Ticket/Create.html:56 html/Ticket/Elements/EditPeople:48 html/Ticket/Elements/ShowPeople:31
+msgid "Requestors"
+msgstr "Klienten"
+
+#: html/Admin/Elements/ModifyQueue:61 html/Admin/Queues/Modify.html:75
+msgid "Requests should be due in"
+msgstr "Anfragen sollten erlegt werden in"
+
+#: html/Elements/Submit:62
+msgid "Reset"
+msgstr "Zurücksetzen"
+
+#: html/Admin/Users/Modify.html:159 html/User/Prefs.html:50
+msgid "Residence"
+msgstr "Zuhause"
+
+#: html/Ticket/Elements/Tabs:132
+msgid "Resolve"
+msgstr "Erledigen"
+
+#: html/Ticket/Update.html:133
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Resolve ticket #%1 (%2)"
+msgstr "Erledige Anfrage Nr. %1 (%2)"
+
+#: etc/initialdata:302 html/Elements/SelectDateType:28 lib/RT/Ticket_Overlay.pm:1170
+msgid "Resolved"
+msgstr "Erledigt"
+
+#: html/Search/Bulk.html:123 html/Ticket/ModifyAll.html:73 html/Ticket/Update.html:73
+msgid "Response to requestors"
+msgstr "Antwort an alle Klienten"
+
+#: html/Elements/ListActions:26
+msgid "Results"
+msgstr "Ergebnisse"
+
+#: html/Search/Elements/PickRestriction:105
+msgid "Results per page"
+msgstr "Ergebnisse pro Seite"
+
+#: html/Admin/Elements/ModifyUser:33 html/Admin/Users/Modify.html:100 html/User/Prefs.html:72
+msgid "Retype Password"
+msgstr "Passwort wiederholen"
+
+#: NOT FOUND IN SOURCE
+msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:613
+msgid "Right Delegated"
+msgstr "Recht delegiert"
+
+#: lib/RT/ACE_Overlay.pm:303
+msgid "Right Granted"
+msgstr "Recht erteilt"
+
+#: lib/RT/ACE_Overlay.pm:161
+msgid "Right Loaded"
+msgstr "Recht geladen"
+
+#: lib/RT/ACE_Overlay.pm:678 lib/RT/ACE_Overlay.pm:693
+msgid "Right could not be revoked"
+msgstr "Recht konnte nicht zurückgezogen werden"
+
+#: html/User/Delegation.html:64
+msgid "Right not found"
+msgstr "Recht nicht gefunden"
+
+#: lib/RT/ACE_Overlay.pm:543 lib/RT/ACE_Overlay.pm:638
+msgid "Right not loaded."
+msgstr "Recht nicht gefunden."
+
+#: lib/RT/ACE_Overlay.pm:689
+msgid "Right revoked"
+msgstr "Recht zurückgezogen"
+
+#: html/Admin/Elements/UserTabs:41
+msgid "Rights"
+msgstr "Rechte"
+
+#: lib/RT/Interface/Web.pm:758
+#. ($object_type)
+msgid "Rights could not be granted for %1"
+msgstr "Rechte konnten für %1 nicht gewährt werden"
+
+#: lib/RT/Interface/Web.pm:791
+#. ($object_type)
+msgid "Rights could not be revoked for %1"
+msgstr "Rechte konnten nicht für %1 entzogen werden"
+
+#: html/Admin/Global/GroupRights.html:51 html/Admin/Queues/GroupRights.html:52
+msgid "Roles"
+msgstr "Rollen"
+
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr ""
+
+#: lib/RT/Date.pm:393
+msgid "Sat."
+msgstr "Sa"
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
+msgid "Save Changes"
+msgstr "Änderungen Sichern"
+
+#: html/Ticket/ModifyLinks.html:39
+msgid "Save changes"
+msgstr "Änderungen Sichern"
+
+#: html/Admin/Global/Scrip.html:49
+#. ($ARGS{'id'})
+msgid "Scrip #%1"
+msgstr ""
+
+#: lib/RT/Scrip_Overlay.pm:176
+msgid "Scrip Created"
+msgstr "Scrip angelegt"
+
+#: html/Admin/Elements/EditScrips:84
+msgid "Scrip deleted"
+msgstr "Scrip gelöscht"
+
+#: html/Admin/Elements/QueueTabs:46 html/Admin/Elements/SystemTabs:33 html/Admin/Global/index.html:41
+msgid "Scrips"
+msgstr "Scrips"
+
+#: NOT FOUND IN SOURCE
+msgid "Scrips for %1\\n"
+msgstr "Scrips für %1\\n"
+
+#: html/Admin/Queues/Scrips.html:33
+msgid "Scrips which apply to all queues"
+msgstr "Auf alle Stapel angewande Scrips"
+
+#: html/Elements/SimpleSearch:27 html/Search/Elements/PickRestriction:126 html/Ticket/Elements/Tabs:159
+msgid "Search"
+msgstr "Suchen"
+
+#: NOT FOUND IN SOURCE
+msgid "Search Criteria"
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:39
+msgid "Search for approvals"
+msgstr "Suche nach Freigaben"
+
+#: bin/rt-crontool:188
+msgid "Security:"
+msgstr "Sicherheit:"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "SeeQueue"
+msgstr ""
+
+#: html/Admin/Groups/index.html:40
+msgid "Select a group"
+msgstr "Wähle eine Gruppe aus"
+
+#: NOT FOUND IN SOURCE
+msgid "Select a queue"
+msgstr ""
+
+#: html/Admin/Users/index.html:25 html/Admin/Users/index.html:28
+msgid "Select a user"
+msgstr "Wähle einen Benutzer aus"
+
+#: html/Admin/Global/CustomField.html:38 html/Admin/Global/CustomFields.html:36
+msgid "Select custom field"
+msgstr "Wähle ein benutzerdef. Feld"
+
+#: html/Admin/Elements/GroupTabs:52 html/User/Elements/GroupTabs:50
+msgid "Select group"
+msgstr "Wähle eine Gruppe"
+
+#: lib/RT/CustomField_Overlay.pm:355
+msgid "Select multiple values"
+msgstr "Wähle mehrere Werte"
+
+#: lib/RT/CustomField_Overlay.pm:352
+msgid "Select one value"
+msgstr "Wähle einen Wert"
+
+#: html/Admin/Elements/QueueTabs:67
+msgid "Select queue"
+msgstr "Wähle einen Stapel"
+
+#: html/Admin/Global/Scrip.html:37 html/Admin/Global/Scrips.html:36 html/Admin/Queues/Scrip.html:40 html/Admin/Queues/Scrips.html:50
+msgid "Select scrip"
+msgstr "Wähle ein Scrip"
+
+#: html/Admin/Global/Template.html:57 html/Admin/Global/Templates.html:36 html/Admin/Queues/Template.html:55
+msgid "Select template"
+msgstr "Wähle ein Template"
+
+#: html/Admin/Elements/UserTabs:49
+msgid "Select user"
+msgstr "Wähle einen Benutzer"
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "SelectMultiple"
+msgstr "Mehrfachauswahlfeld"
+
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectSingle"
+msgstr "Einzelauswahlfeld"
+
+#: html/SelfService/index.html:25
+msgid "Self Service"
+msgstr "Selbstbedienung"
+
+#: etc/initialdata:114
+msgid "Send mail to all watchers"
+msgstr "Schicke eine Mail an alle Beobachter"
+
+#: etc/initialdata:110
+msgid "Send mail to all watchers as a \"comment\""
+msgstr "Schicke eine Mail an alle Beobachter als \"Kommentar\""
+
+#: etc/initialdata:105
+msgid "Send mail to requestors and Ccs"
+msgstr "Schicke eine Mail an die Klienten und CCs"
+
+#: etc/initialdata:100
+msgid "Send mail to requestors and Ccs as a comment"
+msgstr "Schicke eine Mail an die Klienten und CCs als Kommentar"
+
+#: etc/initialdata:79
+msgid "Sends a message to the requestors"
+msgstr "Schicke eine Mail an die Klienten"
+
+#: etc/initialdata:118 etc/initialdata:122
+msgid "Sends mail to explicitly listed Ccs and Bccs"
+msgstr "Schicke eine Mail an die direkt angegebenen CCs und BCCs"
+
+#: etc/initialdata:95
+msgid "Sends mail to the administrative Ccs"
+msgstr "Schicke eine Mail an die administrativen CCs"
+
+#: etc/initialdata:91
+msgid "Sends mail to the administrative Ccs as a comment"
+msgstr "Schicke eine Mail an die administrativen CCs als Kommentar"
+
+#: etc/initialdata:83 etc/initialdata:87
+msgid "Sends mail to the owner"
+msgstr "Schicke eine Mail an den Inhaber"
+
+#: lib/RT/Date.pm:419
+msgid "Sep."
+msgstr "Sep"
+
+#: NOT FOUND IN SOURCE
+msgid "Show Results"
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:44
+msgid "Show approved requests"
+msgstr "Zeige freigegebene Anfragen"
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show basics"
+msgstr "Zeige Grundlagen"
+
+#: html/Approvals/Elements/PendingMyApproval:45
+msgid "Show denied requests"
+msgstr "Zeige abgelehnte Anfragen"
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show details"
+msgstr "Zeige Details"
+
+#: html/Approvals/Elements/PendingMyApproval:43
+msgid "Show pending requests"
+msgstr "Zeige schwebende Anfragen"
+
+#: html/Approvals/Elements/PendingMyApproval:46
+msgid "Show requests awaiting other approvals"
+msgstr "Zeige auf andere Freigaben wartende Anfragen"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "Show ticket private commentary"
+msgstr "Zeige private Kommentare des Anfragen"
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "Show ticket summaries"
+msgstr "Zeige Kurzfassungen der Anfragen"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "ShowACL"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "ShowScrips"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "ShowTemplate"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "ShowTicket"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "ShowTicketComments"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Sign up as a ticket Requestor or ticket or queue Cc"
+msgstr "Als Klient einer Anfrage oder Anfrage- bzw. Stapel-CC eintragen"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "Sign up as a ticket or queue AdminCc"
+msgstr "Als Anfrage- oder Stapel-AdminCC eintragen"
+
+#: html/Admin/Elements/ModifyUser:39 html/Admin/Users/Modify.html:191 html/Admin/Users/Prefs.html:32 html/SelfService/Prefs.html:37 html/User/Prefs.html:112
+msgid "Signature"
+msgstr "E-Mail-Signatur"
+
+#: html/SelfService/Elements/Header:52
+#. ($session{'CurrentUser'}->Name)
+msgid "Signed in as %1"
+msgstr "Angemeldet als %1"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:26
+msgid "Single"
+msgstr "Einzel"
+
+#: html/Elements/Header:51
+msgid "Skip Menu"
+msgstr "Überspringe Menü"
+
+#: html/Admin/Elements/EditCustomFieldValues:31
+msgid "Sort key"
+msgstr "Sortierschlüssel"
+
+#: html/Search/Elements/PickRestriction:109
+msgid "Sort results by"
+msgstr "Sortiere Ergebnisse nach"
+
+#: html/Admin/Elements/AddCustomFieldValue:25
+msgid "SortOrder"
+msgstr "Sortierreihenfolge"
+
+#: NOT FOUND IN SOURCE
+msgid "Stalled"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Start page"
+msgstr ""
+
+#: html/Elements/SelectDateType:27 html/Ticket/Elements/EditDates:32 html/Ticket/Elements/ShowDates:35
+msgid "Started"
+msgstr "Begonnen"
+
+#: NOT FOUND IN SOURCE
+msgid "Started date '%1' could not be parsed"
+msgstr ""
+
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:27 html/Ticket/Elements/ShowDates:31
+msgid "Starts"
+msgstr "Beginnt"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts By"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Starts date '%1' could not be parsed"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:82 html/Admin/Users/Modify.html:138 html/User/Prefs.html:94
+msgid "State"
+msgstr "Staat"
+
+#: html/Elements/MyRequests:31 html/Elements/MyTickets:31 html/Search/Elements/PickRestriction:74 html/SelfService/Display.html:59 html/SelfService/Elements/MyRequests:29 html/SelfService/Update.html:31 html/Ticket/Create.html:42 html/Ticket/Elements/EditBasics:38 html/Ticket/Elements/ShowBasics:31 html/Ticket/Update.html:60 lib/RT/Ticket_Overlay.pm:1164 lib/RT/Tickets_Overlay.pm:908
+msgid "Status"
+msgstr "Status"
+
+#: etc/initialdata:288
+msgid "Status Change"
+msgstr "Ändere Status"
+
+#: lib/RT/Transaction_Overlay.pm:530
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
+msgid "Status changed from %1 to %2"
+msgstr "Status von %1 auf %2 geändert"
+
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:147
+msgid "Steal"
+msgstr "Stehlen"
+
+#: lib/RT/Transaction_Overlay.pm:589
+#. ($Old->Name)
+msgid "Stolen from %1 "
+msgstr "Gestohlen von %1 "
+
+#: html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Search/Bulk.html:126 html/Search/Elements/PickRestriction:43 html/SelfService/Create.html:59 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:35 html/Ticket/Create.html:84 html/Ticket/Elements/EditBasics:28 html/Ticket/ModifyAll.html:79 html/Ticket/Update.html:77 lib/RT/Ticket_Overlay.pm:1160 lib/RT/Tickets_Overlay.pm:987
+msgid "Subject"
+msgstr "Betreff"
+
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/Transaction_Overlay.pm:611
+#. ($self->Data)
+msgid "Subject changed to %1"
+msgstr "Betreff wurde auf %1 geändert"
+
+#: html/Elements/Submit:59
+msgid "Submit"
+msgstr "Ãœbermitteln"
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:749
+msgid "Succeeded"
+msgstr "Geglückt"
+
+#: lib/RT/Date.pm:394
+msgid "Sun."
+msgstr "So"
+
+#: lib/RT/System.pm:54
+msgid "SuperUser"
+msgstr ""
+
+#: html/User/Elements/DelegateRights:77
+msgid "System"
+msgstr "System"
+
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:567 lib/RT/Interface/Web.pm:757 lib/RT/Interface/Web.pm:790
+msgid "System Error"
+msgstr "Systemfehler"
+
+#: lib/RT/ACE_Overlay.pm:616
+msgid "System error. Right not delegated."
+msgstr "Systemfehler. Recht nicht delegiert."
+
+#: lib/RT/ACE_Overlay.pm:146 lib/RT/ACE_Overlay.pm:223 lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:898
+msgid "System error. Right not granted."
+msgstr "Systemfehler. Recht nicht gewährt."
+
+#: html/Admin/Global/GroupRights.html:35 html/Admin/Groups/GroupRights.html:37 html/Admin/Queues/GroupRights.html:36
+msgid "System groups"
+msgstr "Systemgruppen"
+
+#: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
+msgid "SystemRolegroup for internal use"
+msgstr "SystemRolegroup für internen Gebrauch"
+
+#: lib/RT/CurrentUser.pm:320
+msgid "TEST_STRING"
+msgstr "TEST_STRING"
+
+#: html/Ticket/Elements/Tabs:143
+msgid "Take"
+msgstr "Ãœbernehmen"
+
+#: lib/RT/Transaction_Overlay.pm:575
+msgid "Taken"
+msgstr "Ãœbernommen"
+
+#: html/Admin/Elements/EditScrip:81
+msgid "Template"
+msgstr "Vorlage"
+
+#: html/Admin/Global/Template.html:91 html/Admin/Queues/Template.html:90
+#. ($TemplateObj->Id())
+msgid "Template #%1"
+msgstr "Vorlage #%1"
+
+#: html/Admin/Elements/EditTemplates:89
+msgid "Template deleted"
+msgstr "Vorlage gelöscht"
+
+#: lib/RT/Scrip_Overlay.pm:153
+msgid "Template not found"
+msgstr "Vorlage nicht gefunden"
+
+#: NOT FOUND IN SOURCE
+msgid "Template not found\\n"
+msgstr ""
+
+#: lib/RT/Template_Overlay.pm:347
+msgid "Template parsed"
+msgstr "Vorlagen eingelesen"
+
+#: html/Admin/Elements/QueueTabs:49 html/Admin/Elements/SystemTabs:36 html/Admin/Global/index.html:45
+msgid "Templates"
+msgstr "Vorlagen"
+
+#: NOT FOUND IN SOURCE
+msgid "Templates for %1\\n"
+msgstr "Vorlagen für %1\\n"
+
+#: lib/RT/Interface/Web.pm:858
+msgid "That is already the current value"
+msgstr "Das ist bereits der aktuelle Wert"
+
+#: lib/RT/CustomField_Overlay.pm:178
+msgid "That is not a value for this custom field"
+msgstr "Dies ist kein gültiger Wert für dieses benutzerdefinierte Feld"
+
+#: lib/RT/Ticket_Overlay.pm:1886
+msgid "That is the same value"
+msgstr "Das ist der gleiche Wert"
+
+#: lib/RT/Queue_Overlay.pm:633
+#. ($args{'Type'})
+msgid "That principal is already a %1 for this queue"
+msgstr "Dieser Hauptverantwortliche ist bereits ein %1 dieses Stapels"
+
+#: lib/RT/Ticket_Overlay.pm:1434
+#. ($self->loc($args{'Type'}))
+msgid "That principal is already a %1 for this ticket"
+msgstr "Dieser Hauptverantwortliche ist bereits ein %1 dieser Anfrage"
+
+#: lib/RT/Queue_Overlay.pm:732
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this queue"
+msgstr "Dieser Hauptverantwortliche ist nicht ein %1 dieses Stapels"
+
+#: lib/RT/Ticket_Overlay.pm:1551
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this ticket"
+msgstr "Dieser Hauptverantwortliche ist nicht ein %1 dieser Anfrage"
+
+#: lib/RT/Ticket_Overlay.pm:1882
+msgid "That queue does not exist"
+msgstr "Dieser Stapel existiert nicht"
+
+#: lib/RT/Ticket_Overlay.pm:3143
+msgid "That ticket has unresolved dependencies"
+msgstr "Diese Anfrage hat ungelöste Abhängigkeiten"
+
+#: lib/RT/ACE_Overlay.pm:288 lib/RT/ACE_Overlay.pm:597
+msgid "That user already has that right"
+msgstr "Dieser Benutzer hat dieses Recht bereits" 
+
+#: lib/RT/Ticket_Overlay.pm:2952
+msgid "That user already owns that ticket"
+msgstr "Diesem Benutzer gehört diese Anfrage bereits"
+
+#: lib/RT/Ticket_Overlay.pm:2918
+msgid "That user does not exist"
+msgstr "Dieser Benutzer existiert nicht"
+
+#: lib/RT/User_Overlay.pm:315
+msgid "That user is already privileged"
+msgstr "Dieser Benutzer ist bereits privilegiert"
+
+#: lib/RT/User_Overlay.pm:332
+msgid "That user is already unprivileged"
+msgstr "Dieser Benutzer ist bereits ungeprivilegiert"
+
+#: lib/RT/User_Overlay.pm:327
+msgid "That user is now privileged"
+msgstr "Dieser Benutzer ist jetzt privilegiert"
+
+#: lib/RT/User_Overlay.pm:344
+msgid "That user is now unprivileged"
+msgstr "Dieser Benutzer ist jetzt unprivelegiert"
+
+#: lib/RT/Ticket_Overlay.pm:2944
+msgid "That user may not own tickets in that queue"
+msgstr "Diesem Benutzer dürfen keine Anfragen aus diesen Stapel gehören"
+
+#: lib/RT/Link_Overlay.pm:206
+msgid "That's not a numerical id"
+msgstr "Dies ist keine numerische Id"
+
+#: html/Ticket/Create.html:150 html/Ticket/Elements/ShowSummary:28
+msgid "The Basics"
+msgstr "Grundlagen"
+
+#: lib/RT/ACE_Overlay.pm:88
+msgid "The CC of a ticket"
+msgstr "Der CC einer Anfrage"
+
+#: lib/RT/ACE_Overlay.pm:89
+msgid "The administrative CC of a ticket"
+msgstr "Der administrative CC einer Anfrage"
+
+#: lib/RT/Ticket_Overlay.pm:2213
+msgid "The comment has been recorded"
+msgstr "Der Kommentar wurde aufgezeichnet"
+
+#: bin/rt-crontool:198
+msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
+msgstr "Das folgende Kommando wird alle aktiven Anfragen des Stapels 'general' finden und ihre Priorität auf 99 setzen, wenn sie innerhalb der letzten 4 Stunden nicht angefasst wurden:"
+
+#: bin/rt-commit-handler:756 bin/rt-commit-handler:766
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr "Die folgenden Kommandos wurden nicht verarbeitet:\\n\\n"
+
+#: lib/RT/Interface/Web.pm:861
+msgid "The new value has been set."
+msgstr "Der neue Wert wurde gesetzt."
+
+#: lib/RT/ACE_Overlay.pm:86
+msgid "The owner of a ticket"
+msgstr "Der Inhaber einer Anfrage"
+
+#: lib/RT/ACE_Overlay.pm:87
+msgid "The requestor of a ticket"
+msgstr "Der Klient einer Anfrage"
+
+#: html/Admin/Elements/EditUserComments:26
+msgid "These comments aren't generally visible to the user"
+msgstr "Diese Kommentare sind generell nicht für den Benutzer sichtbar"
+
+#: NOT FOUND IN SOURCE
+msgid "This ticket %1 %2 (%3)\\n"
+msgstr ""
+
+#: bin/rt-crontool:189
+msgid "This tool allows the user to run arbitrary perl modules from within RT."
+msgstr "Dieses Werkzeug erlaubt es Benutzern beliebige Perl-Module von RT aus aufzurufen."
+
+#: lib/RT/Transaction_Overlay.pm:253
+msgid "This transaction appears to have no content"
+msgstr "Diese Transaktion scheint keinen Inhalt zu haben"
+
+#: html/Ticket/Elements/ShowRequestor:47
+#. ($rows)
+msgid "This user's %1 highest priority tickets"
+msgstr "Die %1 höchstpriorisiertesten Anfragen dieses Benutzers"
+
+#: NOT FOUND IN SOURCE
+msgid "This user's 25 highest priority tickets"
+msgstr ""
+
+#: lib/RT/Date.pm:391
+msgid "Thu."
+msgstr "Do"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1  %2"
+msgstr ""
+
+#: html/Ticket/ModifyAll.html:25 html/Ticket/ModifyAll.html:29
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket #%1 Jumbo update: %2"
+msgstr "Anfrage Nr. %1 Alles aktualisieren: %2"
+
+#: html/Approvals/Elements/ShowDependency:46
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Ticket #%1: %2"
+msgstr "Anfrage Nr. %1: %2"
+
+#: lib/RT/Ticket_Overlay.pm:608
+#. ($self->Id, $QueueObj->Name)
+msgid "Ticket %1 created in queue '%2'"
+msgstr "Anfrage %1 wurde in Anfrage '%2' angelegt"
+
+#: bin/rt-commit-handler:760
+#. ($Ticket->Id)
+msgid "Ticket %1 loaded\\n"
+msgstr "Anfrage %1 geladen\\n"
+
+#: html/Search/Bulk.html:181
+#. ($Ticket->Id,$_)
+msgid "Ticket %1: %2"
+msgstr "Anfrage %1: %2"
+
+#: html/Ticket/History.html:25 html/Ticket/History.html:28
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket History # %1 %2"
+msgstr "Verlauf von Anfrage Nr. %1 %2"
+
+#: html/SelfService/Display.html:34
+msgid "Ticket Id"
+msgstr "Anfrage Nr." 
+
+#: etc/initialdata:303
+msgid "Ticket Resolved"
+msgstr "Anfrage erledigt"
+
+#: html/Search/Elements/PickRestriction:63
+msgid "Ticket attachment"
+msgstr "Anhang der Anfrage"
+
+#: lib/RT/Tickets_Overlay.pm:1166
+msgid "Ticket content"
+msgstr "Inhalt der Anfrage"
+
+#: lib/RT/Tickets_Overlay.pm:1212
+msgid "Ticket content type"
+msgstr "Art des Inhalts der Anfrage"
+
+#: lib/RT/Ticket_Overlay.pm:495 lib/RT/Ticket_Overlay.pm:597
+msgid "Ticket could not be created due to an internal error"
+msgstr "Anfrage konnte aufgrund eines internen Fehlers nicht angelegt werden"
+
+#: lib/RT/Transaction_Overlay.pm:522
+msgid "Ticket created"
+msgstr "Anfrage angelegt"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket creation failed"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:527
+msgid "Ticket deleted"
+msgstr "Anfrage gelöscht"
+
+#: html/REST/1.0/modify:29 html/REST/1.0/update:34
+msgid "Ticket id not found"
+msgstr "Anfragenummer nicht gefunden"
+
+#: html/REST/1.0/modify:36 html/REST/1.0/update:41
+msgid "Ticket not found"
+msgstr "Anfrage nicht gefunden"
+
+#: etc/initialdata:289
+msgid "Ticket status changed"
+msgstr "Status der Anfrage geändert"
+
+#: html/Ticket/Update.html:39
+msgid "Ticket watchers"
+msgstr "Beobachter der Anfrage"
+
+#: html/Elements/Tabs:49
+msgid "Tickets"
+msgstr "Anfragen"
+
+#: lib/RT/Tickets_Overlay.pm:1383
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr "Anfragen %1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:1348
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr "Anfragen %2 von %2"
+
+#: html/Elements/ViewUser:26
+#. ($name)
+msgid "Tickets from %1"
+msgstr "Anfragen von %1"
+
+#: html/Approvals/Elements/ShowDependency:27
+msgid "Tickets which depend on this approval:"
+msgstr "Anfragen, die von dieser Freigabe abhängen:"
+
+#: html/Ticket/Create.html:157 html/Ticket/Elements/EditBasics:48
+msgid "Time Left"
+msgstr "Ãœbrige Zeit"
+
+#: html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:43
+msgid "Time Worked"
+msgstr "Arbeitszeit"
+
+#: lib/RT/Tickets_Overlay.pm:1139
+msgid "Time left"
+msgstr "Ãœbrige Zeit"
+
+#: html/Elements/Footer:36
+msgid "Time to display"
+msgstr "Benötigte Zeit"
+
+#: lib/RT/Tickets_Overlay.pm:1115
+msgid "Time worked"
+msgstr "Arbeitszeit"
+
+#: lib/RT/Ticket_Overlay.pm:1165
+msgid "TimeWorked"
+msgstr "Gearbeitete Zeit"
+
+#: bin/rt-commit-handler:402
+msgid "To generate a diff of this commit:"
+msgstr "Um ein 'diff' dieser Ãœbergabe zu erstellen:"
+
+#: bin/rt-commit-handler:391
+msgid "To generate a diff of this commit:\\n"
+msgstr "Um ein 'diff' dieser Ãœbergabe zu erstellen:\\n"
+
+#: lib/RT/Ticket_Overlay.pm:1168
+msgid "Told"
+msgstr "Eingegangen"
+
+#: etc/initialdata:237
+msgid "Transaction"
+msgstr "Transaktion"
+
+#: lib/RT/Transaction_Overlay.pm:642
+#. ($self->Data)
+msgid "Transaction %1 purged"
+msgstr "Transaktion %1 durchgeprügelt"
+
+#: lib/RT/Transaction_Overlay.pm:177
+msgid "Transaction Created"
+msgstr "Transaktion erstellt"
+
+#: lib/RT/Transaction_Overlay.pm:89
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr "Transaction->Create konnte nicht ausgeführt werden da keine Ticketnummer angegeben wurde"
+
+#: lib/RT/Transaction_Overlay.pm:701
+msgid "Transactions are immutable"
+msgstr "Transaktionen sind unveränderbar"
+
+#: NOT FOUND IN SOURCE
+msgid "Trying to delete a right: %1"
+msgstr ""
+
+#: lib/RT/Date.pm:389
+msgid "Tue."
+msgstr "Di"
+
+#: html/Admin/Elements/EditCustomField:34 html/Ticket/Elements/AddWatchers:33 html/Ticket/Elements/AddWatchers:44 html/Ticket/Elements/AddWatchers:54 lib/RT/Ticket_Overlay.pm:1166 lib/RT/Tickets_Overlay.pm:959
+msgid "Type"
+msgstr "Typ"
+
+#: lib/RT/ScripCondition_Overlay.pm:104
+msgid "Unimplemented"
+msgstr "Nicht implementiert"
+
+#: html/Admin/Users/Modify.html:68
+msgid "Unix login"
+msgstr "Unix Login"
+
+#: html/Admin/Elements/ModifyUser:62
+msgid "UnixUsername"
+msgstr "UnixBenutzername"
+
+#: lib/RT/Attachment_Overlay.pm:265
+#. ($self->ContentEncoding)
+msgid "Unknown ContentEncoding %1"
+msgstr "Unbekannte Inhalts-Kodierung %1"
+
+#: html/Elements/SelectResultsPerPage:37
+msgid "Unlimited"
+msgstr "unbegrenzt"
+
+#: etc/initialdata:32
+msgid "Unprivileged"
+msgstr "Unprivilegiert"
+
+#: lib/RT/Transaction_Overlay.pm:571
+msgid "Untaken"
+msgstr "Zurückgegeben"
+
+#: html/Elements/MyTickets:64 html/Search/Bulk.html:33
+msgid "Update"
+msgstr "Aktualisieren"
+
+#: html/Admin/Users/Prefs.html:62
+msgid "Update ID"
+msgstr "Aktualisierungs-ID"
+
+#: html/Search/Bulk.html:120 html/Ticket/ModifyAll.html:66 html/Ticket/Update.html:67
+msgid "Update Type"
+msgstr "Aktualisierungtyp"
+
+#: html/Search/Listing.html:61
+msgid "Update all these tickets at once"
+msgstr "Aktualisiere alle diese Anfragen auf einmal"
+
+#: html/Admin/Users/Prefs.html:49
+msgid "Update email"
+msgstr "Aktualisiere E-Mail"
+
+#: html/Admin/Users/Prefs.html:55
+msgid "Update name"
+msgstr "Aktualisiere Name"
+
+#: lib/RT/Interface/Web.pm:375
+msgid "Update not recorded."
+msgstr "Aktualisierung nicht aufgezeichnet."
+
+#: html/Search/Bulk.html:81
+msgid "Update selected tickets"
+msgstr "Aktualisiere ausgewählte Anfragen"
+
+#: html/Admin/Users/Prefs.html:36
+msgid "Update signature"
+msgstr "Aktualisiere Unterschrift"
+
+#: html/Ticket/ModifyAll.html:63
+msgid "Update ticket"
+msgstr "Aktualisiere Anfrage"
+
+#: html/SelfService/Update.html:25 html/SelfService/Update.html:27
+#. ($Ticket->id)
+msgid "Update ticket # %1"
+msgstr "Aktualisiere Anfrage Nr. %1"
+
+#: html/SelfService/Update.html:50
+#. ($Ticket->id)
+msgid "Update ticket #%1"
+msgstr "Aktualisiere Anfrage Nr. %1"
+
+#: html/Ticket/Update.html:135
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Update ticket #%1 (%2)"
+msgstr "Aktualisiere Anfrage Nr. %1 (%2)"
+
+#: lib/RT/Interface/Web.pm:373
+msgid "Update type was neither correspondence nor comment."
+msgstr "Aktualisierungstyp war weder Korrespondenz noch Kommentar."
+
+#: html/Elements/SelectDateType:33 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1169
+msgid "Updated"
+msgstr "Aktualisiert"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 %2: %3\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 Password: %2\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found\\n"
+msgstr ""
+
+#: etc/initialdata:125 etc/initialdata:191
+msgid "User Defined"
+msgstr "Benutzerdefiniert"
+
+#: html/Admin/Users/Prefs.html:59
+msgid "User ID"
+msgstr "Benutzer-ID"
+
+#: html/Elements/SelectUsers:26
+msgid "User Id"
+msgstr "Benutzername"
+
+#: html/Admin/Elements/GroupTabs:47 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/SystemTabs:47 html/Admin/Global/index.html:59
+msgid "User Rights"
+msgstr "Benutzerrechte"
+
+#: html/Admin/Users/Modify.html:226
+#. ($msg)
+msgid "User could not be created: %1"
+msgstr "Benutzer konnte nicht angelegt werden: %1"
+
+#: lib/RT/User_Overlay.pm:262
+msgid "User created"
+msgstr "Benutzer angelegt"
+
+#: html/Admin/Global/GroupRights.html:67 html/Admin/Groups/GroupRights.html:54 html/Admin/Queues/GroupRights.html:68
+msgid "User defined groups"
+msgstr "Benutzerdefinierte Gruppe"
+
+#: NOT FOUND IN SOURCE
+msgid "User notified"
+msgstr ""
+
+#: html/Admin/Users/Prefs.html:25 html/Admin/Users/Prefs.html:29
+msgid "User view"
+msgstr "Benutzeransicht"
+
+#: html/Admin/Users/Modify.html:48 html/Elements/Login:42 html/Ticket/Elements/AddWatchers:35
+msgid "Username"
+msgstr "Benutzername"
+
+#: html/Admin/Elements/SelectNewGroupMembers:26 html/Admin/Elements/Tabs:32 html/Admin/Groups/Members.html:55 html/Admin/Queues/People.html:68 html/Admin/index.html:29 html/User/Groups/Members.html:58
+msgid "Users"
+msgstr "Benutzer"
+
+#: html/Admin/Users/index.html:65
+msgid "Users matching search criteria"
+msgstr "Auf diese Kriterien zutreffenede Benutzer"
+
+#: html/Search/Elements/PickRestriction:51
+msgid "ValueOfQueue"
+msgstr "ValueOfQueue"
+
+#: html/Admin/Elements/EditCustomField:40
+msgid "Values"
+msgstr "Werte"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Watch"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "WatchAsAdminCc"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:42
+msgid "Watchers"
+msgstr "Beobachter"
+
+#: html/Admin/Elements/ModifyUser:56
+msgid "WebEncoding"
+msgstr "Webkodierung"
+
+#: lib/RT/Date.pm:390
+msgid "Wed."
+msgstr "Mi"
+
+#: etc/upgrade/2.1.71:161
+msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
+msgstr "Füge Korrespondenz zum Originalticket, wenn eine Anfrage von allen Freigebenden freigegeben wurde"
+
+#: etc/upgrade/2.1.71:135
+msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
+msgstr "Füge Korrespondenz zum Originalticket wenn eine Anfrage  von einem Freigebenden freigegeben wurde"
+
+#: etc/initialdata:138
+msgid "When a ticket is created"
+msgstr "Wenn eine Afrage erstellt wird"
+
+#: etc/upgrade/2.1.71:79
+msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
+msgstr "Benachrichtige Inhaber und AdminCCs der auf Freigabe wartende Anfrage wenn ein Freigabeticket erstellt wurde"
+
+#: etc/initialdata:143
+msgid "When anything happens"
+msgstr "Wenn irgendetwas passiert"
+
+#: etc/initialdata:184
+msgid "Whenever a ticket is resolved"
+msgstr "Immer wenn eine Anfrage  erledigt wird"
+
+#: etc/initialdata:170
+msgid "Whenever a ticket's owner changes"
+msgstr "Immer wenn der Eigentümer einer Anfrage wechselt"
+
+#: etc/initialdata:178
+msgid "Whenever a ticket's queue changes"
+msgstr "Immer wenn eine Anfrage den Stapel wechselt"
+
+#: etc/initialdata:162
+msgid "Whenever a ticket's status changes"
+msgstr "Immer wenn sich der Status einer Anfrage ändert"
+
+#: etc/initialdata:192
+msgid "Whenever a user-defined condition occurs"
+msgstr "Immer wenn eine benutzerdefinierte Bedingung auftritt"
+
+#: etc/initialdata:156
+msgid "Whenever comments come in"
+msgstr "Immer wenn ein neuer Kommentar eingeht"
+
+#: etc/initialdata:149
+msgid "Whenever correspondence comes in"
+msgstr "Immer wenn neue Korrespondenz eingeht"
+
+#: html/Admin/Users/Modify.html:164 html/User/Prefs.html:52
+msgid "Work"
+msgstr "Arbeit"
+
+#: html/Admin/Elements/ModifyUser:70
+msgid "WorkPhone"
+msgstr "Arbeitstelefon"
+
+#: html/SelfService/Display.html:86 html/Ticket/Elements/ShowBasics:35 html/Ticket/Update.html:65
+msgid "Worked"
+msgstr "Arbeitszeit"
+
+#: lib/RT/Ticket_Overlay.pm:3056
+msgid "You already own this ticket"
+msgstr "Du besitzt diese Anfrage bereits"
+
+#: html/autohandler:121
+msgid "You are not an authorized user"
+msgstr "Du bist kein authorisierter Benutzer"
+
+#: lib/RT/Ticket_Overlay.pm:2930
+msgid "You can only reassign tickets that you own or that are unowned"
+msgstr "Du kannst nur Anfragen ohne Inhaber zuweisen"
+
+#: NOT FOUND IN SOURCE
+msgid "You don't have permission to view that ticket.\\n"
+msgstr ""
+
+#: docs/design_docs/string-extraction-guide.txt:47
+#. ($num, $queue)
+msgid "You found %1 tickets in queue %2"
+msgstr "Du hast %1 Anfragen in Stapel %2 gefunden"
+
+#: html/NoAuth/Logout.html:31 html/REST/1.0/logout:25
+msgid "You have been logged out of RT."
+msgstr "Du wurdest von RT abgemeldet."
+
+#: html/SelfService/Display.html:134
+msgid "You have no permission to create tickets in that queue."
+msgstr "Du hast kein Recht, Anfragen in diesen Stapel anzulegen."
+
+#: lib/RT/Ticket_Overlay.pm:1895
+msgid "You may not create requests in that queue."
+msgstr "Du darfst in diesem Stapel keine Anfragen erstellen"
+
+#: html/NoAuth/Logout.html:36
+msgid "You're welcome to login again"
+msgstr "Du kannst dich gerne wieder anmelden"
+
+#: html/SelfService/Elements/MyRequests:25
+#. ($friendly_status)
+msgid "Your %1 requests"
+msgstr "Meine %1 Anfragen"
+
+#: NOT FOUND IN SOURCE
+msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
+msgstr ""
+
+#: etc/initialdata:429 etc/upgrade/2.1.71:146
+msgid "Your request has been approved by %1. Other approvals may still be pending."
+msgstr "Deine Anfrage wurde von %1 freigegeben. Andere Freigaben können noch ausstehen."
+
+#: etc/initialdata:463 etc/upgrade/2.1.71:180
+msgid "Your request has been approved."
+msgstr "Deine Anfrage wurde freigegeben."
+
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr ""
+
+#: etc/initialdata:384 etc/upgrade/2.1.71:101
+msgid "Your request was rejected."
+msgstr "Deine Anfrage wurde abgewiesen"
+
+#: html/autohandler:136 html/autohandler:142
+msgid "Your username or password is incorrect"
+msgstr "Dein Benutzername oder Passwort ist falsch"
+
+#: html/Admin/Elements/ModifyUser:84 html/Admin/Users/Modify.html:144 html/User/Prefs.html:96
+msgid "Zip"
+msgstr "PLZ"
+
+#: html/User/Elements/DelegateRights:59
+#. ($right->PrincipalObj->Object->SelfDescription)
+msgid "as granted to %1"
+msgstr "wie an %1 gewährt"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:34
+msgid "contains"
+msgstr "enthält"
+
+#: html/Elements/SelectAttachmentField:26
+msgid "content"
+msgstr "Inhalt"
+
+#: html/Elements/SelectAttachmentField:27
+msgid "content-type"
+msgstr "content-type"
+
+#: lib/RT/Ticket_Overlay.pm:2282
+msgid "correspondence (probably) not sent"
+msgstr "Korrepsondenz (möglicherweise) nicht verschickt"
+
+#: lib/RT/Ticket_Overlay.pm:2292
+msgid "correspondence sent"
+msgstr "Korrespondenz verschickt"
+
+#: html/Admin/Elements/ModifyQueue:63 html/Admin/Queues/Modify.html:77 lib/RT/Date.pm:319
+msgid "days"
+msgstr "Tage"
+
+#: html/Search/Listing.html:75
+msgid "delete"
+msgstr "löschen"
+
+#: lib/RT/Queue_Overlay.pm:63
+msgid "deleted"
+msgstr "gelöscht"
+
+#: html/Search/Elements/PickRestriction:68
+msgid "does not match"
+msgstr "entspricht nicht"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:35
+msgid "doesn't contain"
+msgstr "enthält nicht"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "equal to"
+msgstr "entspricht"
+
+#: html/Elements/SelectAttachmentField:28
+msgid "filename"
+msgstr "Dateiname"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "greater than"
+msgstr "größer als"
+
+#: lib/RT/Group_Overlay.pm:194
+#. ($self->Name)
+msgid "group '%1'"
+msgstr "Gruppe '%1'"
+
+#: lib/RT/Date.pm:315
+msgid "hours"
+msgstr "Stunden"
+
+#: NOT FOUND IN SOURCE
+msgid "id"
+msgstr ""
+
+#: html/Elements/SelectBoolean:32 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88
+msgid "is"
+msgstr "ist"
+
+#: html/Elements/SelectBoolean:36 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:37 html/Search/Elements/PickRestriction:48 html/Search/Elements/PickRestriction:77 html/Search/Elements/PickRestriction:89
+msgid "isn't"
+msgstr "ist nicht"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "less than"
+msgstr "kleiner als"
+
+#: html/Search/Elements/PickRestriction:67
+msgid "matches"
+msgstr "entspricht"
+
+#: lib/RT/Date.pm:311
+msgid "min"
+msgstr "Min"
+
+#: html/Ticket/Update.html:66
+msgid "minutes"
+msgstr "Minuten"
+
+#: bin/rt-commit-handler:765
+msgid "modifications\\n\\n"
+msgstr "Änderungen\\n\\n"
+
+#: lib/RT/Date.pm:327
+msgid "months"
+msgstr "Monate"
+
+#: lib/RT/Queue_Overlay.pm:58
+msgid "new"
+msgstr "neu"
+
+#: html/Admin/Elements/EditScrips:43
+msgid "no value"
+msgstr "kein Wert"
+
+#: html/Ticket/Elements/EditWatchers:28
+msgid "none"
+msgstr "keine"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "not equal to"
+msgstr "entspricht nicht"
+
+#: lib/RT/Queue_Overlay.pm:59
+msgid "open"
+msgstr "offen"
+
+#: lib/RT/Group_Overlay.pm:199
+#. ($self->Name, $user->Name)
+msgid "personal group '%1' for user '%2'"
+msgstr "persönliche Gruppe '%1' für Benutzer '%2'"
+
+#: lib/RT/Group_Overlay.pm:207
+#. ($queue->Name, $self->Type)
+msgid "queue %1 %2"
+msgstr "Stapel %1 %2"
+
+#: lib/RT/Queue_Overlay.pm:62
+msgid "rejected"
+msgstr "abgewiesen"
+
+#: lib/RT/Queue_Overlay.pm:61
+msgid "resolved"
+msgstr "erledigt"
+
+#: lib/RT/Date.pm:307
+msgid "sec"
+msgstr "Sek"
+
+#: lib/RT/Queue_Overlay.pm:60
+msgid "stalled"
+msgstr "zurückgestellt"
+
+#: lib/RT/Group_Overlay.pm:202
+#. ($self->Type)
+msgid "system %1"
+msgstr "System %1"
+
+#: lib/RT/Group_Overlay.pm:213
+#. ($self->Type)
+msgid "system group '%1'"
+msgstr "Systemgruppe '%1'"
+
+#: html/Elements/Error:42 html/SelfService/Error.html:42
+msgid "the calling component did not specify why"
+msgstr "die aufrufende Komponente gab nicht an warum"
+
+#: lib/RT/Group_Overlay.pm:210
+#. ($self->Instance, $self->Type)
+msgid "ticket #%1 %2"
+msgstr "Ticket #%1 %2"
+
+#: lib/RT/Group_Overlay.pm:216
+#. ($self->Id)
+msgid "undescribed group %1"
+msgstr "unbeschriebene Gruppe %1"
+
+#: NOT FOUND IN SOURCE
+msgid "undescripbed group %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:191
+#. ($user->Object->Name)
+msgid "user %1"
+msgstr "Benutzer %1"
+
+#: lib/RT/Date.pm:323
+msgid "weeks"
+msgstr "Wochen"
+
+#: NOT FOUND IN SOURCE
+msgid "with template %1"
+msgstr ""
+
+#: lib/RT/Date.pm:331
+msgid "years"
+msgstr "Jahre"
+
diff --git a/rt/lib/RT/I18N/en.po b/rt/lib/RT/I18N/en.po
new file mode 100644
index 000000000..ffdc5cce6
--- /dev/null
+++ b/rt/lib/RT/I18N/en.po
@@ -0,0 +1,88 @@
+#: lib/RT/Date.pm:414
+msgid "Apr."
+msgstr "Apr"
+
+#: lib/RT/Date.pm:418
+msgid "Aug."
+msgstr "Aug"
+
+#: lib/RT/Date.pm:422
+msgid "Dec."
+msgstr "Dec"
+
+#: lib/RT/Date.pm:412
+msgid "Feb."
+msgstr "Feb"
+
+#: lib/RT/Date.pm:392
+msgid "Fri."
+msgstr "Fri"
+
+#: html/Elements/Tabs:46
+msgid "Homepage"
+msgstr "Home"
+
+#: lib/RT/Date.pm:411
+msgid "Jan."
+msgstr "Jan"
+
+#: lib/RT/Date.pm:417
+msgid "Jul."
+msgstr "Jul"
+
+#: lib/RT/Date.pm:416
+msgid "Jun."
+msgstr "Jun"
+
+#: lib/RT/Date.pm:413
+msgid "Mar."
+msgstr "Mar"
+
+#: lib/RT/Date.pm:415
+msgid "May."
+msgstr "May"
+
+#: lib/RT/Date.pm:388
+msgid "Mon."
+msgstr "Mon"
+
+#: lib/RT/Date.pm:421
+msgid "Nov."
+msgstr "Nov"
+
+#: lib/RT/Date.pm:420
+msgid "Oct."
+msgstr "Oct"
+
+#: html/Ticket/Elements/Tabs:136
+msgid "Open it"
+msgstr "Open"
+
+#: html/Admin/Users/Modify.html:159 html/User/Prefs.html:50
+msgid "Residence"
+msgstr "Home"
+
+#: lib/RT/Date.pm:393
+msgid "Sat."
+msgstr "Sat"
+
+#: lib/RT/Date.pm:419
+msgid "Sep."
+msgstr "Sep"
+
+#: lib/RT/Date.pm:394
+msgid "Sun."
+msgstr "Sun"
+
+#: lib/RT/Date.pm:391
+msgid "Thu."
+msgstr "Thu"
+
+#: lib/RT/Date.pm:389
+msgid "Tue."
+msgstr "Tue"
+
+#: lib/RT/Date.pm:390
+msgid "Wed."
+msgstr "Wed"
+
diff --git a/rt/lib/RT/I18N/es.po b/rt/lib/RT/I18N/es.po
new file mode 100644
index 000000000..05006b12b
--- /dev/null
+++ b/rt/lib/RT/I18N/es.po
@@ -0,0 +1,4749 @@
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: RT 2.1.x\n"
+"POT-Creation-Date: 2002-05-02 11:36+0800\n"
+"PO-Revision-Date: 2003-03-23 12:38\n"
+"Last-Translator: Tomàs Núñez Lirola <tomasnl@dsl.upc.es>\n"
+"Language-Team: rt-devel <rt-devel@lists.fsck.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: html/Elements/MyRequests:28 html/Elements/MyTickets:28
+msgid "#"
+msgstr "#"
+
+#: html/Admin/Queues/Scrip.html:55
+#. ($QueueObj->id)
+msgid "#%1"
+msgstr "#%1"
+
+#: html/Approvals/Elements/ShowDependency:50 html/Ticket/Display.html:26 html/Ticket/Display.html:30
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "#%1: %2"
+msgstr "#%1: %2"
+
+#: lib/RT/Date.pm:337
+#. ($s, $time_unit)
+msgid "%1 %2"
+msgstr "%1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:771
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr "%1 %2 %3"
+
+#: lib/RT/Date.pm:373
+#. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
+msgid "%1 %2 %3 %4:%5:%6 %7"
+msgstr "%1 %2 %3 %4:%5:%6 %7"
+
+#: lib/RT/Ticket_Overlay.pm:3438 lib/RT/Transaction_Overlay.pm:559 lib/RT/Transaction_Overlay.pm:601
+#. ($cf->Name, $new_value->Content)
+#. ($field, $self->NewValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 added"
+msgstr "Añadido %1 %2"
+
+#: lib/RT/Date.pm:334
+#. ($s, $time_unit)
+msgid "%1 %2 ago"
+msgstr "Hace %1 %2"
+
+#: lib/RT/Ticket_Overlay.pm:3444 lib/RT/Transaction_Overlay.pm:566
+#. ($cf->Name, $old_value, $new_value->Content)
+#. ($field, $self->OldValue, $self->NewValue)
+msgid "%1 %2 changed to %3"
+msgstr "%1 %2 ha cambiado a %3"
+
+#: lib/RT/Ticket_Overlay.pm:3441 lib/RT/Transaction_Overlay.pm:562 lib/RT/Transaction_Overlay.pm:607
+#. ($cf->Name, $old_value)
+#. ($field, $self->OldValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 deleted"
+msgstr "%1 %2 borrado"
+
+#: html/Admin/Elements/EditScrips:44 html/Admin/Elements/ListGlobalScrips:28
+#. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
+msgid "%1 %2 with template %3"
+msgstr "%1 %2 con la plantilla %3"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 this ticket\\n"
+msgstr "%1 (%2) %3 este caso\\n"
+
+#: html/Search/Listing.html:57
+#. (($session{'tickets'}->FirstRow+1), ($session{'tickets'}->FirstRow() + $session{'tickets'}->RowsPerPage()  ))
+msgid "%1 - %2 shown"
+msgstr "%1 - %2 mostrados"
+
+#: bin/rt-crontool:169 bin/rt-crontool:176 bin/rt-crontool:182
+#. ("--search-argument", "--search")
+#. ("--condition-argument", "--condition")
+#. ("--action-argument", "--action")
+msgid "%1 - An argument to pass to %2"
+msgstr "%1 - Un parametro para pasar a %2"
+
+#: bin/rt-crontool:185
+#. ("--verbose")
+msgid "%1 - Output status updates to STDOUT"
+msgstr "%1 - El estado de la salida actualiza STDOUT"
+
+#: bin/rt-crontool:179
+#. ("--action")
+msgid "%1 - Specify the action module you want to use"
+msgstr "%1 - Especifica el modulo de accion que quieres usar"
+
+#: bin/rt-crontool:173
+#. ("--condition")
+msgid "%1 - Specify the condition module you want to use"
+msgstr "%1 - Especifica el modulo de condicion que quieres usar"
+
+#: bin/rt-crontool:166
+#. ("--search")
+msgid "%1 - Specify the search module you want to use"
+msgstr "%1 - Especifica el modulo de busqueda que quieres usar"
+
+#: lib/RT/ScripAction_Overlay.pm:122
+#. ($self->Id)
+msgid "%1 ScripAction loaded"
+msgstr "%1 ScripAction cargado"
+
+#: lib/RT/Ticket_Overlay.pm:3471
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 added as a value for %2"
+msgstr "$1 añadido como un valor de %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on"
+msgstr "%1 alias requieren un TicketId en el que trabajar"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on "
+msgstr "%1 alias requieren un TicketId en el que trabajar "
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on (from %2) %3"
+msgstr "%1 alias requieren un TicketId en el que trabajar (de %2) %3"
+
+#: lib/RT/Link_Overlay.pm:117 lib/RT/Link_Overlay.pm:124
+#. ($args{'Base'})
+#. ($args{'Target'})
+msgid "%1 appears to be a local object, but can't be found in the database"
+msgstr "%1 parece ser un objeto local, pero no se encuentra en la base de datos"
+
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:483
+#. ($self->BriefDescription , $self->CreatorObj->Name)
+#. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
+msgid "%1 by %2"
+msgstr "%1 por %2"
+
+#: lib/RT/Transaction_Overlay.pm:537 lib/RT/Transaction_Overlay.pm:626 lib/RT/Transaction_Overlay.pm:635 lib/RT/Transaction_Overlay.pm:638
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
+#. ($self->Field , $q1->Name , $q2->Name)
+#. ($self->Field, $t2->AsString, $t1->AsString)
+#. ($self->Field, $self->OldValue, $self->NewValue)
+msgid "%1 changed from %2 to %3"
+msgstr "%1 ha cambiado de %2 a %3"
+
+#: lib/RT/Interface/Web.pm:857
+msgid "%1 could not be set to %2."
+msgstr "%1 no se ha podido fijar a %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 couldn't init a transaction (%2)\\n"
+msgstr "%1 no pudo iniciar una transacción (%2)\\n"
+
+#: lib/RT/Ticket_Overlay.pm:2813
+#. ($self)
+msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
+msgstr "%1 no pudo fijar el estado a resuelto. La base de datos de RT podría ser inconsistente."
+
+#: html/Elements/MyTickets:25
+#. ($rows)
+msgid "%1 highest priority tickets I own..."
+msgstr "Los %1 tickets de mayor prioridad que poseo... "
+
+#: html/Elements/MyRequests:25
+#. ($rows)
+msgid "%1 highest priority tickets I requested..."
+msgstr "Los %1 tickets de mayor prioridad que he pedido"
+
+#: bin/rt-crontool:161
+#. ($0)
+msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
+msgstr "$1 es una herramienta para actuar sobre los tickets con una herramienta de planificacion externa, como crom"
+
+#: lib/RT/Queue_Overlay.pm:743
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this queue."
+msgstr "%1 ha dejado de ser un %2 para esta cola."
+
+#: lib/RT/Ticket_Overlay.pm:1570
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this ticket."
+msgstr "%1 ha dejado de ser un %2 para este ticket."
+
+#: lib/RT/Ticket_Overlay.pm:3527
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 is no longer a value for custom field %2"
+msgstr "%1 ha dejado de ser un valor para campo personalizable %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 isn't a valid Queue id."
+msgstr "%1 no es un identificador de Cola válido."
+
+#: html/Ticket/Elements/ShowBasics:36
+#. ($TimeWorked)
+msgid "%1 min"
+msgstr "%1 min"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 not shown"
+msgstr "%1 no mostrado"
+
+#: html/User/Elements/DelegateRights:76
+#. (loc($ObjectType =~ /^RT::(.*)$/))
+msgid "%1 rights"
+msgstr "%1 privilegios"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 succeeded\\n"
+msgstr "%1 exitoso\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for $MessageId"
+msgstr "%1 tipo desconocido para $MessageId"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for %2"
+msgstr "%1 tipo desconocido para %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 was created without a CurrentUser\\n"
+msgstr "%1 se creó sin CurrentUser\\n"
+
+#: lib/RT/Action/ResolveMembers.pm:42
+#. (ref $self)
+msgid "%1 will resolve all members of a resolved group ticket."
+msgstr "%1 resolverá todos los miembros de un grupo de tickets resueltos."
+
+#: NOT FOUND IN SOURCE
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr "%1 pondrá como pendiente una BASE [local] si es dependiente [o miembro] de una solicitud ligada."
+
+#: lib/RT/Transaction_Overlay.pm:435
+#. ($self)
+msgid "%1: no attachment specified"
+msgstr "%1: ningún archivo adjunto especificado"
+
+#: html/Ticket/Elements/ShowTransaction:102
+#. ($size)
+msgid "%1b"
+msgstr "%1b"
+
+#: html/Ticket/Elements/ShowTransaction:99
+#. (int($size/102.4)/10)
+msgid "%1k"
+msgstr "%1k"
+
+#: lib/RT/Ticket_Overlay.pm:1140
+#. ($args{'Status'})
+msgid "'%1' is an invalid value for status"
+msgstr "'%1' es un valor inválido para el estado"
+
+#: NOT FOUND IN SOURCE
+msgid "'%1' not a recognized action. "
+msgstr "'%1' no es una acción reconocida. "
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete group member)"
+msgstr "(Marque la caja para borrar al miembro del grupo)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete scrip)"
+msgstr "(Marque la caja para borrar el scrip)"
+
+#: html/Admin/Elements/EditQueueWatchers:29 html/Admin/Elements/EditScrips:35 html/Admin/Elements/EditTemplates:36 html/Admin/Groups/Members.html:52 html/Ticket/Elements/EditLinks:33 html/Ticket/Elements/EditPeople:46 html/User/Groups/Members.html:55
+msgid "(Check box to delete)"
+msgstr "(Marque la caja para borrar)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check boxes to delete)"
+msgstr "(Marque las cajas para borrar)"
+
+#: html/Ticket/Create.html:178
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr "(Introduzca los identificadores de ticket o URLs, separados por espacios)"
+
+#: html/Admin/Queues/Modify.html:54 html/Admin/Queues/Modify.html:60
+#. ($RT::CorrespondAddress)
+#. ($RT::CommentAddress)
+msgid "(If left blank, will default to %1"
+msgstr "(Si se deja vacio, pasara por defecto a %1"
+
+#: NOT FOUND IN SOURCE
+msgid "(No Value)"
+msgstr "(Sin Valor)"
+
+#: html/Admin/Elements/EditCustomFields:33 html/Admin/Elements/ListGlobalCustomFields:32
+msgid "(No custom fields)"
+msgstr "(No hay campos custom)"
+
+#: html/Admin/Groups/Members.html:50 html/User/Groups/Members.html:53
+msgid "(No members)"
+msgstr "(Sin miembros)"
+
+#: html/Admin/Elements/EditScrips:32 html/Admin/Elements/ListGlobalScrips:32
+msgid "(No scrips)"
+msgstr "(Sin scrips)"
+
+#: html/Admin/Elements/EditTemplates:31
+msgid "(No templates)"
+msgstr "(Sin plantillas)"
+
+#: html/Ticket/Update.html:85
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(Envia una copia oculta de esta actualizacion a una lista delimitada por comas de direcciones de email. <b>NO</b> cambia quien recibirá futuras actualizaciones)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(Envía una copia oculta de esta actualización a una lista de direcciones de correo delimitada por comas. <b>No</b> cambia a quien recibirá futuras actualizaciones.)"
+
+#: html/Ticket/Create.html:79
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(Envia una copia oculta de esta actualización a una lista delimitada por comas de direcciones de email administrativas. Estas personas <b>recibirán</b> las futuras actualizaciones.)"
+
+#: html/Ticket/Update.html:81
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(Envia una copia oculta de esta actualización a una lista delimitada por comas de direcciones de email.<b>NO</b> cambia quien recibirá futuras actualizaciones."
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(Manda una copia de esta actualización a una lista de direcciones de correo delimitada por comas. <b>No</b> cambia a quien recibirá futuras actualizaciones.)"
+
+#: html/Ticket/Create.html:69
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(Envia una copia de esta actualización a una lista de direcciones de correo delimitada por comas. Estas personas <b>recibirán</b> actualizaciones futuras."
+
+#: html/Admin/Groups/index.html:33 html/User/Groups/index.html:33
+msgid "(empty)"
+msgstr "(vacío)"
+
+#: html/Admin/Users/index.html:39
+msgid "(no name listed)"
+msgstr "(no hay nombres listados)"
+
+#: html/Elements/MyRequests:43 html/Elements/MyTickets:45
+msgid "(no subject)"
+msgstr "(sin asunto)"
+
+#: html/Admin/Elements/SelectRights:48 html/Elements/SelectCustomFieldValue:30 html/Ticket/Elements/EditCustomField:59 html/Ticket/Elements/ShowCustomFields:36 lib/RT/Transaction_Overlay.pm:536
+msgid "(no value)"
+msgstr "(sin valor)"
+
+#: html/Ticket/Elements/EditLinks:116
+msgid "(only one ticket)"
+msgstr "(solo un ticket)"
+
+#: html/Elements/MyRequests:52 html/Elements/MyTickets:55
+msgid "(pending approval)"
+msgstr "(pendiente de aprobacion)"
+
+#: html/Elements/MyRequests:54 html/Elements/MyTickets:57
+msgid "(pending other tickets)"
+msgstr "(pendiente de otros tickets)"
+
+#: html/Admin/Users/Modify.html:50
+msgid "(required)"
+msgstr "(requerido)"
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "(untitled)"
+msgstr "(sin titulo)"
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr "Los 25 tickets de mayor prioridad que poseo..."
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr "Los 25 tickets de mayor prioridad que he solicitado..."
+
+#: html/Ticket/Elements/ShowBasics:32
+msgid "<% $Ticket->Status%>"
+msgstr "<% $Ticket->Status%>"
+
+#: html/Elements/SelectTicketTypes:27
+msgid "<% $_ %>"
+msgstr "<% $_ %>"
+
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:26
+#. ($m->scomp('/Elements/SelectNewTicketQueue'))
+msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
+msgstr "<input type=\"submit\" value=\"Nuevo ticket en\">&nbsp;%1"
+
+#: etc/initialdata:203
+msgid "A blank template"
+msgstr "Una plantilla en blanco"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Deleted"
+msgstr "ACE Borrado"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Loaded"
+msgstr "ACE Cargado"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be deleted"
+msgstr "ACE no se pudo borrar"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be found"
+msgstr "ACE no se encontró"
+
+#: lib/RT/ACE_Overlay.pm:157 lib/RT/Principal_Overlay.pm:181
+msgid "ACE not found"
+msgstr "ACE no encontrado"
+
+#: lib/RT/ACE_Overlay.pm:831
+msgid "ACEs can only be created and deleted."
+msgstr "ACEs solo pueden ser creadas o borradas."
+
+#: bin/rt-commit-handler:755
+msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgstr "Abortando para prevenir modificaciones no intencionadas al ticket\\n"
+
+#: html/User/Elements/Tabs:32
+msgid "About me"
+msgstr "Sobre mi"
+
+#: html/Admin/Users/Modify.html:80
+msgid "Access control"
+msgstr "Control de acceso"
+
+#: html/Admin/Elements/EditScrip:57
+msgid "Action"
+msgstr "Acción"
+
+#: lib/RT/Scrip_Overlay.pm:147
+#. ($args{'ScripAction'})
+msgid "Action %1 not found"
+msgstr "Acción %1 no encontrada"
+
+#: bin/rt-crontool:123
+msgid "Action committed."
+msgstr "Action committed."
+
+#: bin/rt-crontool:119
+msgid "Action prepared..."
+msgstr "Acción preparada..."
+
+#: html/Search/Bulk.html:92
+msgid "Add AdminCc"
+msgstr "Añadir AdminCc"
+
+#: html/Search/Bulk.html:90
+msgid "Add Cc"
+msgstr "Añadir Cc"
+
+#: html/Ticket/Create.html:114 html/Ticket/Update.html:100
+msgid "Add More Files"
+msgstr "Añadir más archivos"
+
+#: html/Search/Bulk.html:88
+msgid "Add Requestor"
+msgstr "Añadir solicitante"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr "Añadir una seleccion de palabra clave a esta cola"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a new a global scrip"
+msgstr "Añadir un nuevo scrip global"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a scrip to this queue"
+msgstr "Añadir un scrip a esta cola"
+
+#: html/Admin/Global/Scrip.html:55
+msgid "Add a scrip which will apply to all queues"
+msgstr "Añadir un scrip que se aplicará a todas las colas"
+
+#: html/Search/Bulk.html:118
+msgid "Add comments or replies to selected tickets"
+msgstr "Añadir comentarios o respuestas a los tickets seleccionados"
+
+#: html/Admin/Groups/Members.html:42 html/User/Groups/Members.html:39
+msgid "Add members"
+msgstr "Añadir miembro"
+
+#: html/Admin/Queues/People.html:66 html/Ticket/Elements/AddWatchers:28
+msgid "Add new watchers"
+msgstr "Añadir nuevos observadores"
+
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
+msgstr "AddNextState"
+
+#: lib/RT/Queue_Overlay.pm:643
+#. ($args{'Type'})
+msgid "Added principal as a %1 for this queue"
+msgstr "Principal ha sido añadido como %1 para esta cola"
+
+#: lib/RT/Ticket_Overlay.pm:1454
+#. ($self->loc($args{'Type'}))
+msgid "Added principal as a %1 for this ticket"
+msgstr "Principal ha sido añadido como %1 para este ticket"
+
+#: html/Admin/Elements/ModifyUser:76 html/Admin/Users/Modify.html:122 html/User/Prefs.html:88
+msgid "Address1"
+msgstr "Dirección 1"
+
+#: html/Admin/Elements/ModifyUser:78 html/Admin/Users/Modify.html:127 html/User/Prefs.html:90
+msgid "Address2"
+msgstr "Dirección 2"
+
+#: html/Ticket/Create.html:74
+msgid "Admin Cc"
+msgstr "Admin Cc"
+
+#: etc/initialdata:274
+msgid "Admin Comment"
+msgstr "Admin Comment"
+
+#: etc/initialdata:256
+msgid "Admin Correspondence"
+msgstr "Admin Correspondence"
+
+#: html/Admin/Queues/index.html:25 html/Admin/Queues/index.html:28
+msgid "Admin queues"
+msgstr "Administración de colas"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin users"
+msgstr "Administración de usuarios"
+
+#: html/Admin/Global/index.html:26 html/Admin/Global/index.html:28
+msgid "Admin/Global configuration"
+msgstr "Adminsitración de la configuración global"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Groups"
+msgstr "Administración de Grupos"
+
+#: html/Admin/Queues/Modify.html:25 html/Admin/Queues/Modify.html:29
+msgid "Admin/Queue/Basics"
+msgstr "Administración de una cola"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr "AdminAllPersonalGroups"
+
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:39 html/Ticket/Update.html:50 lib/RT/ACE_Overlay.pm:89
+msgid "AdminCc"
+msgstr "AdminCc"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr "AdminComment"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr "AdminCorrespondence"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "AdminCustomFields"
+msgstr "AdminCustomFields"
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "AdminGroup"
+msgstr "AdminGroup"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "AdminGroupMembership"
+msgstr "AdminGroupMembership"
+
+#: lib/RT/System.pm:59
+msgid "AdminOwnPersonalGroups"
+msgstr "AdminOwnPersonalGroups"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "AdminQueue"
+msgstr "AdminQueue"
+
+#: lib/RT/System.pm:60
+msgid "AdminUsers"
+msgstr "AdminUsers"
+
+#: html/Admin/Queues/People.html:48 html/Ticket/Elements/EditPeople:54
+msgid "Administrative Cc"
+msgstr "Cc Administrativa"
+
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search"
+msgstr "Búsqueda avanzada"
+
+#: html/Elements/SelectDateRelation:36
+msgid "After"
+msgstr "Después"
+
+#: NOT FOUND IN SOURCE
+msgid "Age"
+msgstr "Edad"
+
+#: html/Admin/Elements/EditCustomFields:96
+msgid "All Custom Fields"
+msgstr "Todos los campos custom"
+
+#: html/Admin/Queues/index.html:53
+msgid "All Queues"
+msgstr "Todas las colas"
+
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
+msgstr "Siempre envia un mensaje a los solicitantes independientemente del remitente del mensaje"
+
+#: html/Elements/Tabs:58
+msgid "Approval"
+msgstr "Aprobacion"
+
+#: html/Approvals/Display.html:46 html/Approvals/Elements/Approve:27 html/Approvals/Elements/ShowDependency:42 html/Approvals/index.html:65
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($ticket->id, $msg)
+#. ($ticket->Id, $ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Approval #%1: %2"
+msgstr "Aprobacion #%1: %2"
+
+#: html/Approvals/index.html:54
+#. ($ticket->Id)
+msgid "Approval #%1: Notes not recorded due to a system error"
+msgstr "Aprobación #%1: No se han guardado las notas debido a un error del sistema"
+
+#: html/Approvals/index.html:52
+#. ($ticket->Id)
+msgid "Approval #%1: Notes recorded"
+msgstr "Aprobacion #%1: Notas guardadas"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Details"
+msgstr "Detalles de la aprobación"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval diagram"
+msgstr "Diagrama de la aprobación"
+
+#: html/Approvals/Elements/Approve:45
+msgid "Approve"
+msgstr "Aprobar"
+
+#: etc/initialdata:431 etc/upgrade/2.1.71:148
+msgid "Approver's notes: %1"
+msgstr "Notas del aprobador: %1"
+
+#: lib/RT/Date.pm:414
+msgid "Apr."
+msgstr "Abr."
+
+#: NOT FOUND IN SOURCE
+msgid "April"
+msgstr "Abril"
+
+#: html/Elements/SelectSortOrder:35
+msgid "Ascending"
+msgstr "Ascendente"
+
+#: html/Search/Bulk.html:127 html/SelfService/Update.html:36 html/Ticket/ModifyAll.html:83 html/Ticket/Update.html:100
+msgid "Attach"
+msgstr "Adjunto"
+
+#: html/SelfService/Create.html:67 html/Ticket/Create.html:110
+msgid "Attach file"
+msgstr "Adjuntar archivo"
+
+#: html/Ticket/Create.html:98 html/Ticket/Update.html:89
+msgid "Attached file"
+msgstr "Archivo adjunto"
+
+#: html/SelfService/Attachment/dhandler:36
+msgid "Attachment '%1' could not be loaded"
+msgstr "Archivo adjunto '%1' no pudo ser cargado"
+
+#: lib/RT/Transaction_Overlay.pm:443
+msgid "Attachment created"
+msgstr "Archivo adjunto creado"
+
+#: lib/RT/Tickets_Overlay.pm:1189
+msgid "Attachment filename"
+msgstr "Nombre del archivo adjunto"
+
+#: html/Ticket/Elements/ShowAttachments:26
+msgid "Attachments"
+msgstr "Archivos adjuntos"
+
+#: lib/RT/Date.pm:418
+msgid "Aug."
+msgstr "Ago."
+
+#: NOT FOUND IN SOURCE
+msgid "August"
+msgstr "Agosto"
+
+#: html/Admin/Elements/ModifyUser:66
+msgid "AuthSystem"
+msgstr "Sistema de autenticación"
+
+#: etc/initialdata:206
+msgid "Autoreply"
+msgstr "Autorespuesta"
+
+#: etc/initialdata:72
+msgid "Autoreply To Requestors"
+msgstr "Autorespuesta a los solicitantes"
+
+#: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr "AutoreplyToRequestors"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad PGP Signature: %1\\n"
+msgstr "Firma PGP incorrecta: %1\\n"
+
+#: html/SelfService/Attachment/dhandler:40
+msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
+msgstr "Identificador de archivo adjunto erróneo. No se puede encontrar el archivo '%1'\\n"
+
+#: bin/rt-commit-handler:827
+#. ($val)
+msgid "Bad data in %1"
+msgstr "Datos incorrectos en %1"
+
+#: html/SelfService/Attachment/dhandler:43
+#. ($trans, $AttachmentObj->TransactionId())
+msgid "Bad transaction number for attachment. %1 should be %2\\n"
+msgstr "Número de transacción incorrecta para el archivo adjunto. %1 debe ser %2\\n"
+
+#: html/Admin/Elements/GroupTabs:39 html/Admin/Elements/QueueTabs:39 html/Admin/Elements/UserTabs:38 html/Ticket/Elements/Tabs:90 html/User/Elements/GroupTabs:38
+msgid "Basics"
+msgstr "Basicos"
+
+#: html/Ticket/Update.html:83
+msgid "Bcc"
+msgstr "Bcc"
+
+#: html/Admin/Elements/EditScrip:88 html/Admin/Global/GroupRights.html:85 html/Admin/Global/Template.html:46 html/Admin/Global/UserRights.html:54 html/Admin/Groups/GroupRights.html:73 html/Admin/Groups/Members.html:81 html/Admin/Groups/Modify.html:56 html/Admin/Groups/UserRights.html:55 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:45 html/Admin/Queues/UserRights.html:54 html/User/Groups/Modify.html:56
+msgid "Be sure to save your changes"
+msgstr "Asegúrese de salvar sus cambios"
+
+#: html/Elements/SelectDateRelation:34 lib/RT/CurrentUser.pm:322
+msgid "Before"
+msgstr "Antes"
+
+#: NOT FOUND IN SOURCE
+msgid "Begin Approval"
+msgstr "Begin Approval"
+
+#: etc/initialdata:202
+msgid "Blank"
+msgstr "Vacio"
+
+#: html/Search/Listing.html:79
+msgid "Bookmarkable URL for this search"
+msgstr "URL para guardar esta búsqueda en sus marcadores"
+
+#: html/Ticket/Elements/ShowHistory:39 html/Ticket/Elements/ShowHistory:45
+msgid "Brief headers"
+msgstr "Encabezados breves"
+
+#: html/Search/Bulk.html:25 html/Search/Bulk.html:26
+msgid "Bulk ticket update"
+msgstr "Actualización de varios tickets a la vez"
+
+#: lib/RT/User_Overlay.pm:1331
+msgid "Can not modify system users"
+msgstr "No se pueden modificar los usuarios del sistema"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "Can this principal see this queue"
+msgstr "Can this principal see this queue"
+
+#: lib/RT/CustomField_Overlay.pm:144
+msgid "Can't add a custom field value without a name"
+msgstr "No se puede agregar un campo personalizable si no tiene un nombre"
+
+#: lib/RT/Link_Overlay.pm:132
+msgid "Can't link a ticket to itself"
+msgstr "No se puede ligar un ticket a sí mismo"
+
+#: lib/RT/Ticket_Overlay.pm:2787
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr "No se puede fusionar dentro de un caso ya fusionado. Nunca deberia recibir este error"
+
+#: lib/RT/Ticket_Overlay.pm:2605 lib/RT/Ticket_Overlay.pm:2674
+msgid "Can't specifiy both base and target"
+msgstr "No se puede especificar origen y destino al mismo tiempo"
+
+#: html/autohandler:112
+#. ($msg)
+msgid "Cannot create user: %1"
+msgstr "No se puede crear el usuario: %1"
+
+#: etc/initialdata:50 html/Admin/Queues/People.html:44 html/SelfService/Create.html:51 html/SelfService/Display.html:50 html/Ticket/Create.html:64 html/Ticket/Elements/EditPeople:51 html/Ticket/Elements/ShowPeople:35 html/Ticket/Update.html:45 html/Ticket/Update.html:78 lib/RT/ACE_Overlay.pm:88
+msgid "Cc"
+msgstr "Cc"
+
+#: html/SelfService/Prefs.html:31
+msgid "Change password"
+msgstr "Cambiar contraseña"
+
+#: html/Ticket/Create.html:101 html/Ticket/Update.html:92
+msgid "Check box to delete"
+msgstr "Check box to delete"
+
+#: html/Admin/Elements/SelectRights:31
+msgid "Check box to revoke right"
+msgstr "Seleccione la caja para quitar el permiso"
+
+#: html/Ticket/Create.html:183 html/Ticket/Elements/EditLinks:131 html/Ticket/Elements/EditLinks:69 html/Ticket/Elements/ShowLinks:51
+msgid "Children"
+msgstr "Hijo"
+
+#: html/Admin/Elements/ModifyUser:80 html/Admin/Users/Modify.html:132 html/User/Prefs.html:92
+msgid "City"
+msgstr "Ciudad"
+
+#: html/Ticket/Elements/ShowDates:47
+msgid "Closed"
+msgstr "Cerrado"
+
+#: html/SelfService/Elements/Tabs:60
+msgid "Closed requests"
+msgstr "Solicitudes cerradas"
+
+#: NOT FOUND IN SOURCE
+msgid "Command not understood!\\n"
+msgstr "No se entendió el comando!\\n"
+
+#: html/Ticket/Elements/ShowTransaction:179 html/Ticket/Elements/Tabs:153
+msgid "Comment"
+msgstr "Comentario"
+
+#: html/Admin/Elements/ModifyQueue:45 html/Admin/Queues/Modify.html:58
+msgid "Comment Address"
+msgstr "Dirección de comentario"
+
+#: NOT FOUND IN SOURCE
+msgid "Comment not recorded"
+msgstr "Comentario no grabado"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "Comment on tickets"
+msgstr "Comentario sobre los tickets"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "CommentOnTicket"
+msgstr "CommentOnTicket"
+
+#: html/Admin/Elements/ModifyUser:35
+msgid "Comments"
+msgstr "Comentarios"
+
+#: html/Ticket/ModifyAll.html:70 html/Ticket/Update.html:70
+msgid "Comments (Not sent to requestors)"
+msgstr "Comentarios (no se envían a los solicitantes)"
+
+#: html/Search/Bulk.html:122
+msgid "Comments (not sent to requestors)"
+msgstr "Comentarios (no se envían a los solicitantes)"
+
+#: html/Elements/ViewUser:27
+#. ($name)
+msgid "Comments about %1"
+msgstr "Comentarios acerca de %1"
+
+#: html/Admin/Users/Modify.html:185 html/Ticket/Elements/ShowRequestor:44
+msgid "Comments about this user"
+msgstr "Comentarios acerca de este usuario"
+
+#: lib/RT/Transaction_Overlay.pm:545
+msgid "Comments added"
+msgstr "Comentarios añadidos"
+
+#: lib/RT/Action/Generic.pm:140
+msgid "Commit Stubbed"
+msgstr "Acción realizada"
+
+#: NOT FOUND IN SOURCE
+msgid "Compile Restrictions"
+msgstr "Compilar restricciones"
+
+#: html/Admin/Elements/EditScrip:41
+msgid "Condition"
+msgstr "Condición"
+
+#: bin/rt-crontool:109
+msgid "Condition matches..."
+msgstr "La condicion coincide..."
+
+#: lib/RT/Scrip_Overlay.pm:160
+msgid "Condition not found"
+msgstr "Condición no encontrada"
+
+#: html/Elements/Tabs:52
+msgid "Configuration"
+msgstr "Configuración"
+
+#: html/SelfService/Prefs.html:33
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: html/Admin/Elements/ModifyUser:60
+msgid "ContactInfoSystem"
+msgstr "Información de contacto"
+
+#: NOT FOUND IN SOURCE
+msgid "Contacted date '%1' could not be parsed"
+msgstr "Fecha de contacto '%1' no pudo ser leida"
+
+#: html/Admin/Elements/ModifyTemplate:44 html/Ticket/ModifyAll.html:87
+msgid "Content"
+msgstr "Contenido"
+
+#: NOT FOUND IN SOURCE
+msgid "Coould not create group"
+msgstr "No se pudo crear grupo"
+
+#: etc/initialdata:266
+msgid "Correspondence"
+msgstr "Correspondencia"
+
+#: html/Admin/Elements/ModifyQueue:39 html/Admin/Queues/Modify.html:51
+msgid "Correspondence Address"
+msgstr "Dirección de corresponencia"
+
+#: lib/RT/Transaction_Overlay.pm:541
+msgid "Correspondence added"
+msgstr "Correspondencia agregada"
+
+#: NOT FOUND IN SOURCE
+msgid "Correspondence not recorded"
+msgstr "Correspondencia no guardada"
+
+#: lib/RT/Ticket_Overlay.pm:3458
+msgid "Could not add new custom field value for ticket. "
+msgstr "No se pudo añadir un nuevo valor de campo personalizable para el ticket. "
+
+#: NOT FOUND IN SOURCE
+msgid "Could not add new custom field value for ticket. %1 "
+msgstr "No se pudo añadir un nuevo valor de campo personalizable para el ticket. %1 "
+
+#: lib/RT/Ticket_Overlay.pm:2963 lib/RT/Ticket_Overlay.pm:2971 lib/RT/Ticket_Overlay.pm:2987
+msgid "Could not change owner. "
+msgstr "No se pudo cambiar el propietario. "
+
+#: html/Admin/Elements/EditCustomField:68 html/Admin/Elements/EditCustomFields:166
+#. ($msg)
+msgid "Could not create CustomField"
+msgstr "No se puede crear un CampoPersonalizable"
+
+#: html/User/Groups/Modify.html:77 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
+msgid "Could not create group"
+msgstr "No se pudo crear el grupo"
+
+#: html/Admin/Global/Template.html:75 html/Admin/Queues/Template.html:72
+#. ($msg)
+msgid "Could not create template: %1"
+msgstr "No se pudo crear la plantilla: %1"
+
+#: lib/RT/Ticket_Overlay.pm:1073 lib/RT/Ticket_Overlay.pm:333
+msgid "Could not create ticket. Queue not set"
+msgstr "No se pudo crear el ticket. Cola no seleccionada"
+
+#: lib/RT/User_Overlay.pm:208 lib/RT/User_Overlay.pm:220 lib/RT/User_Overlay.pm:238 lib/RT/User_Overlay.pm:414
+msgid "Could not create user"
+msgstr "No se pudo crear el usuario"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not create watcher for requestor"
+msgstr "No se pudo crear un observador para el solicitante"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find a ticket with id %1"
+msgstr "No se pudo encontrar un ticket con identificador $1"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find group %1."
+msgstr "No se pudo encontrar el grupo %1."
+
+#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1422
+msgid "Could not find or create that user"
+msgstr "No se pudo encontrar o crear el usuario"
+
+#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1501
+msgid "Could not find that principal"
+msgstr "No se pudo encontrar ese principal"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find user %1."
+msgstr "No se pudo encontrar el usuario %1."
+
+#: html/Admin/Groups/Members.html:88 html/User/Groups/Members.html:90 html/User/Groups/Modify.html:82
+msgid "Could not load group"
+msgstr "No se puede cargar el grupo"
+
+#: lib/RT/Queue_Overlay.pm:641
+#. ($args{'Type'})
+msgid "Could not make that principal a %1 for this queue"
+msgstr "No se pudo hacer ese principal un %1 para esta cola"
+
+#: lib/RT/Ticket_Overlay.pm:1443
+#. ($self->loc($args{'Type'}))
+msgid "Could not make that principal a %1 for this ticket"
+msgstr "No se pudo hacer ese principal un %1 para este ticket"
+
+#: lib/RT/Queue_Overlay.pm:740
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this queue"
+msgstr "No se pudo quitar ese principal como un %1 para esta cola"
+
+#: lib/RT/Ticket_Overlay.pm:1559
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this ticket"
+msgstr "No se pudo quitar ese principal como un %1 para este ticket"
+
+#: lib/RT/Group_Overlay.pm:985
+msgid "Couldn't add member to group"
+msgstr "No se pudo agregar el miembro al grupo"
+
+#: lib/RT/Ticket_Overlay.pm:3468 lib/RT/Ticket_Overlay.pm:3524
+#. ($Msg)
+msgid "Couldn't create a transaction: %1"
+msgstr "No se pudo crear la transacción: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't figure out what to do from gpg's reply\\n"
+msgstr "No se pudo averiguar que hacer a partir de la firma gpg de la respuesta"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find group\\n"
+msgstr "No se pudo encontrar el grupo\\n"
+
+#: lib/RT/Interface/Web.pm:866
+msgid "Couldn't find row"
+msgstr "No se pudo encontrar la fila"
+
+#: lib/RT/Group_Overlay.pm:959
+msgid "Couldn't find that principal"
+msgstr "No pudo enconcontrar ese principal"
+
+#: lib/RT/CustomField_Overlay.pm:175
+msgid "Couldn't find that value"
+msgstr "No se pudo encontrar ese valor"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find that watcher"
+msgstr "No se pudo encontrar ese observador"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find user\\n"
+msgstr "No se pudo encontrar el usuario\\n"
+
+#: lib/RT/CurrentUser.pm:112
+#. ($self->Id)
+msgid "Couldn't load %1 from the users database.\\n"
+msgstr "No se pudo cargar %1 desde la base de datos de usuarios.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load KeywordSelects."
+msgstr "No se pudo cargar KeywordSelects"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load RT config file '%1' %2"
+msgstr "No se pudo cargar el archivo de configuración de RT '%1' %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load Scrips."
+msgstr "No se pudieron cargar los Scrips."
+
+#: html/Admin/Groups/GroupRights.html:88 html/Admin/Groups/UserRights.html:75
+#. ($id)
+msgid "Couldn't load group %1"
+msgstr "No se pudo cargar el grupo %1"
+
+#: lib/RT/Link_Overlay.pm:175 lib/RT/Link_Overlay.pm:184 lib/RT/Link_Overlay.pm:211
+msgid "Couldn't load link"
+msgstr "No se puedo cargar el enlace"
+
+#: html/Admin/Elements/EditCustomFields:147 html/Admin/Queues/People.html:121
+#. ($id)
+msgid "Couldn't load queue"
+msgstr "No se pudo cargar la cola"
+
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:72
+#. ($id)
+msgid "Couldn't load queue %1"
+msgstr "No se pudo cargar la cola %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load scrip"
+msgstr "No se pudo cargar el scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load template"
+msgstr "No se pudo cargar la plantilla"
+
+#: html/Admin/Users/Prefs.html:79
+#. ($id)
+msgid "Couldn't load that user (%1)"
+msgstr "No se pudo cargar ese usuario (%1)"
+
+#: html/SelfService/Display.html:166
+#. ($id)
+msgid "Couldn't load ticket '%1'"
+msgstr "No se pudo cargar el ticket '%1'"
+
+#: html/Admin/Elements/ModifyUser:86 html/Admin/Users/Modify.html:149 html/User/Prefs.html:98
+msgid "Country"
+msgstr "País"
+
+#: html/Admin/Elements/CreateUserCalled:26 html/Ticket/Create.html:135 html/Ticket/Create.html:195
+msgid "Create"
+msgstr "Crear"
+
+#: etc/initialdata:128
+msgid "Create Tickets"
+msgstr "Crear Tickets"
+
+#: html/Admin/Elements/EditCustomField:58
+msgid "Create a CustomField"
+msgstr "Crear CampoPersonalizable"
+
+#: html/Admin/Queues/CustomField.html:48
+#. ($QueueObj->Name())
+msgid "Create a CustomField for queue %1"
+msgstr "Crear un campo personalizables para la cola %1"
+
+#: html/Admin/Global/CustomField.html:48
+msgid "Create a CustomField which applies to all queues"
+msgstr "Crear un campo personalizable que se aplique a todas las colas"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new Custom Field"
+msgstr "Crear un nuevo campo personalizable"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global scrip"
+msgstr "Crear un nuevo scrip global"
+
+#: html/Admin/Groups/Modify.html:67 html/Admin/Groups/Modify.html:93
+msgid "Create a new group"
+msgstr "Creat un nuevo grupo"
+
+#: html/User/Groups/Modify.html:67 html/User/Groups/Modify.html:92
+msgid "Create a new personal group"
+msgstr "Crear un nuevo grupo personal"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new queue"
+msgstr "Crear una nueva cola"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new scrip"
+msgstr "Crear un nuevo scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new template"
+msgstr "Crear una nueva plantilla"
+
+#: html/SelfService/Create.html:30 html/Ticket/Create.html:25 html/Ticket/Create.html:28 html/Ticket/Create.html:36
+msgid "Create a new ticket"
+msgstr "Crear un nuevo ticket"
+
+#: html/Admin/Users/Modify.html:214 html/Admin/Users/Modify.html:241
+msgid "Create a new user"
+msgstr "Crear un nuevo usuario"
+
+#: html/Admin/Queues/Modify.html:103
+msgid "Create a queue"
+msgstr "Crear una cola"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a queue called"
+msgstr "Crear una cola llamada "
+
+#: html/SelfService/Create.html:25 html/SelfService/Create.html:27
+msgid "Create a request"
+msgstr "Crear una solicitud"
+
+#: html/Admin/Queues/Scrip.html:59
+#. ($QueueObj->Name)
+msgid "Create a scrip for queue %1"
+msgstr "Crear un scrip para la cola %1"
+
+#: html/Admin/Global/Template.html:69 html/Admin/Queues/Template.html:65
+msgid "Create a template"
+msgstr "Crear una plantilla"
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1 / %2 / %3 "
+msgstr "Creación fallida: %1 / %2 / %3 "
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1/%2/%3"
+msgstr "Creación fallida: %1 / %2 / %3 "
+
+#: etc/initialdata:130
+msgid "Create new tickets based on this scrip's template"
+msgstr "Crear nuevos tickets basados en esta plantilla de scrip"
+
+#: html/SelfService/Create.html:81
+msgid "Create ticket"
+msgstr "Crear ticket"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "Create tickets in this queue"
+msgstr "Crear tickets en esta cola"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "Create, delete and modify custom fields"
+msgstr "Crear, borrar y modifical campos personalizables"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "Create, delete and modify queues"
+msgstr "Crear, borrar y modificar colas"
+
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
+msgstr "Crear, borrar y modificar los miembros de cualquier grupo personal de usuario"
+
+#: lib/RT/System.pm:59
+msgid "Create, delete and modify the members of personal groups"
+msgstr "Crear, borrar y modificar los miembros de los grupos personales"
+
+#: lib/RT/System.pm:60
+msgid "Create, delete and modify users"
+msgstr "Crear, borrar y modificar usuarios"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "CreateTicket"
+msgstr "CreateTicket"
+
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1167
+msgid "Created"
+msgstr "Creado"
+
+#: html/Admin/Elements/EditCustomField:71
+#. ($CustomFieldObj->Name())
+msgid "Created CustomField %1"
+msgstr "CampoPersonalizable %1 creado"
+
+#: NOT FOUND IN SOURCE
+msgid "Created template %1"
+msgstr "Plantilla %1 creada"
+
+#: html/Ticket/Elements/EditLinks:28
+msgid "Current Relationships"
+msgstr "Relaciones actuales"
+
+#: html/Admin/Elements/EditScrips:30
+msgid "Current Scrips"
+msgstr "Scrips actuales"
+
+#: html/Admin/Groups/Members.html:39 html/User/Groups/Members.html:42
+msgid "Current members"
+msgstr "Miembros actuales"
+
+#: html/Admin/Elements/SelectRights:29
+msgid "Current rights"
+msgstr "Permisos actuales"
+
+#: html/Search/Listing.html:71
+msgid "Current search criteria"
+msgstr "Criterio de busqueda actual"
+
+#: html/Admin/Queues/People.html:41 html/Ticket/Elements/EditPeople:45
+msgid "Current watchers"
+msgstr "Observadores actuales"
+
+#: html/Admin/Global/CustomField.html:55
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr "Campo personalizable #%1"
+
+#: html/Admin/Elements/QueueTabs:53 html/Admin/Elements/SystemTabs:40 html/Admin/Global/index.html:50 html/Ticket/Elements/ShowSummary:35
+msgid "Custom Fields"
+msgstr "Campos personalizables"
+
+#: html/Admin/Elements/EditScrip:73
+msgid "Custom action cleanup code"
+msgstr "Codigo de limpieza de accion personalizable"
+
+#: html/Admin/Elements/EditScrip:65
+msgid "Custom action preparation code"
+msgstr "Codigo de preparacion de accion personalizable"
+
+#: html/Admin/Elements/EditScrip:49
+msgid "Custom condition"
+msgstr "Condicion personalizable"
+
+#: lib/RT/Tickets_Overlay.pm:1618
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
+msgid "Custom field %1 %2 %3"
+msgstr "Campo personalizado %1 %2 %3"
+
+#: lib/RT/Tickets_Overlay.pm:1613
+#. ($CF->Name)
+msgid "Custom field %1 has a value."
+msgstr "Campo personalizado %1 tiene un valor."
+
+#: lib/RT/Tickets_Overlay.pm:1610
+#. ($CF->Name)
+msgid "Custom field %1 has no value."
+msgstr "Campo personalizado %1 no tiene un valor."
+
+#: lib/RT/Ticket_Overlay.pm:3360
+#. ($args{'Field'})
+msgid "Custom field %1 not found"
+msgstr "Campo personalizado %1 no encontrado"
+
+#: html/Admin/Elements/EditCustomFields:197
+msgid "Custom field deleted"
+msgstr "Campo personalizable borrado"
+
+#: lib/RT/Ticket_Overlay.pm:3510
+msgid "Custom field not found"
+msgstr "Campo personalizado no encontrado"
+
+#: lib/RT/CustomField_Overlay.pm:283
+#. ($args{'Content'}, $self->Name)
+msgid "Custom field value %1 could not be found for custom field %2"
+msgstr "El valor del campo %1 no pudo ser encontrado para el campo %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Custom field value changed from %1 to %2"
+msgstr "Valor del campo cambiado de %1 a %2"
+
+#: lib/RT/CustomField_Overlay.pm:185
+msgid "Custom field value could not be deleted"
+msgstr "El valor del campo no pudo ser borrado"
+
+#: lib/RT/CustomField_Overlay.pm:289
+msgid "Custom field value could not be found"
+msgstr "El valor del campo no pudo se encontrado"
+
+#: lib/RT/CustomField_Overlay.pm:183 lib/RT/CustomField_Overlay.pm:291
+msgid "Custom field value deleted"
+msgstr "Valor del campo borrado"
+
+#: lib/RT/Transaction_Overlay.pm:550
+msgid "CustomField"
+msgstr "CustomField"
+
+#: NOT FOUND IN SOURCE
+msgid "Data error"
+msgstr "Error de datos"
+
+#: html/Ticket/Create.html:161 html/Ticket/Elements/ShowSummary:53 html/Ticket/Elements/Tabs:93 html/Ticket/ModifyAll.html:44
+msgid "Dates"
+msgstr "Fechas"
+
+#: lib/RT/Date.pm:422
+msgid "Dec."
+msgstr "Dic."
+
+#: NOT FOUND IN SOURCE
+msgid "December"
+msgstr "Diciembre"
+
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr "Plantilla de autorespuesta por defecto"
+
+#: etc/initialdata:207
+msgid "Default Autoresponse template"
+msgstr "Plantilla de autorespuesta por defect"
+
+#: etc/initialdata:275
+msgid "Default admin comment template"
+msgstr "Plantilla de comentario de admin por defecto"
+
+#: etc/initialdata:257
+msgid "Default admin correspondence template"
+msgstr "Plantilla de correspondencia de admin por defecto"
+
+#: etc/initialdata:267
+msgid "Default correspondence template"
+msgstr "Plantilla de correspondencia por defecto"
+
+#: etc/initialdata:238
+msgid "Default transaction template"
+msgstr "Plantilla de trasacciones por defecto"
+
+#: lib/RT/Transaction_Overlay.pm:645
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr "Por defecto: %1/%2 ha cambiado de %3 a %4"
+
+#: html/User/Delegation.html:25 html/User/Delegation.html:28
+msgid "Delegate rights"
+msgstr "Delegar derechos"
+
+#: lib/RT/System.pm:63
+msgid "Delegate specific rights which have been granted to you."
+msgstr "Delegar derechos especificos que te han sido concedidos"
+
+#: lib/RT/System.pm:63
+msgid "DelegateRights"
+msgstr "DelegateRights"
+
+#: html/User/Elements/Tabs:38
+msgid "Delegation"
+msgstr "Delegar"
+
+#: NOT FOUND IN SOURCE
+msgid "Delete"
+msgstr "Borrar"
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "Delete tickets"
+msgstr "Borrar tickets"
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "DeleteTicket"
+msgstr "DeleteTicket"
+
+#: lib/RT/Transaction_Overlay.pm:187
+msgid "Deleting this object could break referential integrity"
+msgstr "Al borrar este objeto, se puede romper la integridad referencial"
+
+#: lib/RT/Queue_Overlay.pm:292
+msgid "Deleting this object would break referential integrity"
+msgstr "Al borrar este objeto, se romperá la integridad referencial"
+
+#: lib/RT/User_Overlay.pm:430
+msgid "Deleting this object would violate referential integrity"
+msgstr "Al borrar este objeto, se violará la integridad referencial"
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity."
+msgstr "Al borrar este objeto, se violará la integridad referencial."
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity. That's bad."
+msgstr "Al borrar este objeto, se violará la integridad referencial. Eso es malo."
+
+#: html/Approvals/Elements/Approve:46
+msgid "Deny"
+msgstr "Denegar"
+
+#: html/Ticket/Create.html:181 html/Ticket/Elements/EditLinks:123 html/Ticket/Elements/EditLinks:47 html/Ticket/Elements/ShowDependencies:32 html/Ticket/Elements/ShowLinks:35
+msgid "Depended on by"
+msgstr "Dependen de este ticket"
+
+#: NOT FOUND IN SOURCE
+msgid "Dependencies: \\n"
+msgstr "Dependencias: \\n"
+
+#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:180 html/Ticket/Elements/EditLinks:119 html/Ticket/Elements/EditLinks:36 html/Ticket/Elements/ShowDependencies:25 html/Ticket/Elements/ShowLinks:27
+msgid "Depends on"
+msgstr "Depende de"
+
+#: NOT FOUND IN SOURCE
+msgid "DependsOn"
+msgstr "DependsOn"
+
+#: html/Elements/SelectSortOrder:35
+msgid "Descending"
+msgstr "Descendiente"
+
+#: html/SelfService/Create.html:75 html/Ticket/Create.html:119
+msgid "Describe the issue below"
+msgstr "Describa el problema debajo"
+
+#: html/Admin/Elements/AddCustomFieldValue:27 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyQueue:36 html/Admin/Elements/ModifyTemplate:36 html/Admin/Groups/Modify.html:49 html/Admin/Queues/Modify.html:48 html/Elements/SelectGroups:27 html/User/Groups/Modify.html:49
+msgid "Description"
+msgstr "Descripción"
+
+#: html/SelfService/Elements/MyRequests:44
+msgid "Details"
+msgstr "Detalles"
+
+#: html/Ticket/Elements/Tabs:85
+msgid "Display"
+msgstr "Despliegue"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "Display Access Control List"
+msgstr "Mostrar Lista de Control de Acceso"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "Display Scrip templates for this queue"
+msgstr "Mostrar plantillas de scrip para esta cola"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "Display Scrips for this queue"
+msgstr "Mostrar scrips para esta cola"
+
+#: html/Ticket/Elements/ShowHistory:35
+msgid "Display mode"
+msgstr "Modo de despliegue"
+
+#: html/SelfService/Display.html:25 html/SelfService/Display.html:29
+#. ($Ticket->id)
+msgid "Display ticket #%1"
+msgstr "Despliega ticket #%1"
+
+#: lib/RT/System.pm:54
+msgid "Do anything and everything"
+msgstr "Hacer cualquier cosa y todo"
+
+#: html/Elements/Refresh:30
+msgid "Don't refresh this page."
+msgstr "No recargar esta página"
+
+#: html/Search/Elements/PickRestriction:114
+msgid "Don't show search results"
+msgstr "No mostrar los resultados de la busqueda"
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "Download"
+msgstr "Descargar"
+
+#: html/Elements/SelectDateType:32 html/Ticket/Create.html:167 html/Ticket/Elements/EditDates:45 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1171
+msgid "Due"
+msgstr "Retraso"
+
+#: NOT FOUND IN SOURCE
+msgid "Due date '%1' could not be parsed"
+msgstr "La fecha de retraso '%1' no pudo ser leida"
+
+#: bin/rt-commit-handler:754
+#. ($1, $msg)
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
+msgstr "ERROR: No se pudo cargar el ticket '%1': %2.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit"
+msgstr "Editar"
+
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr "Editar campos personalizados para %1"
+
+#: html/Ticket/ModifyLinks.html:36
+msgid "Edit Relationships"
+msgstr "Editar relaciones"
+
+#: html/Admin/Queues/Templates.html:41
+#. ($QueueObj->Name)
+msgid "Edit Templates for queue %1"
+msgstr "Editar plantillas para la cola %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit keywords"
+msgstr "Editar palabras clave"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr "Editar acciones"
+
+#: html/Admin/Global/index.html:46
+msgid "Edit system templates"
+msgstr "Editar plantillas del sistema"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit templates for %1"
+msgstr "Editar plantillas para %1"
+
+#: html/Admin/Elements/ModifyQueue:25 html/Admin/Queues/Modify.html:117
+#. ($QueueObj->Name)
+#. ($QueueObj->Id)
+msgid "Editing Configuration for queue %1"
+msgstr "Editando configuración para la cola %1"
+
+#: html/Admin/Elements/ModifyUser:25
+#. ($UserObj->Name)
+msgid "Editing Configuration for user %1"
+msgstr "Editando configuración para el usuario %1"
+
+#: html/Admin/Elements/EditCustomField:74
+#. ($CustomFieldObj->Name())
+msgid "Editing CustomField %1"
+msgstr "Editando campo %1"
+
+#: html/Admin/Groups/Members.html:32
+#. ($Group->Name)
+msgid "Editing membership for group %1"
+msgstr "Editando los miembros del grupo %1"
+
+#: html/User/Groups/Members.html:129
+#. ($Group->Name)
+msgid "Editing membership for personal group %1"
+msgstr "Editando los miembros para el grupo personal %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Editing template %1"
+msgstr "Editando plantilla %1"
+
+#: lib/RT/Ticket_Overlay.pm:2615 lib/RT/Ticket_Overlay.pm:2683
+msgid "Either base or target must be specified"
+msgstr "La base o el destinatario deben ser especificados"
+
+#: html/Admin/Users/Modify.html:53 html/Admin/Users/Prefs.html:46 html/Elements/SelectUsers:27 html/Ticket/Elements/AddWatchers:56 html/User/Prefs.html:42
+msgid "Email"
+msgstr "Correo"
+
+#: lib/RT/User_Overlay.pm:188
+msgid "Email address in use"
+msgstr "La dirección de correo ya está en uso"
+
+#: html/Admin/Elements/ModifyUser:42
+msgid "EmailAddress"
+msgstr "Correo Electrónico"
+
+#: html/Admin/Elements/ModifyUser:54
+msgid "EmailEncoding"
+msgstr "Codificación para el correo"
+
+#: html/Admin/Elements/EditCustomField:36
+msgid "Enabled (Unchecking this box disables this custom field)"
+msgstr "Habilitado (Desmarcar esta caja deshabilita este campo personalizable)"
+
+#: html/Admin/Groups/Modify.html:53 html/User/Groups/Modify.html:53
+msgid "Enabled (Unchecking this box disables this group)"
+msgstr "Habilitado (Desmarcar esta caja deshabilita este campo personalizable)"
+
+#: html/Admin/Queues/Modify.html:84
+msgid "Enabled (Unchecking this box disables this queue)"
+msgstr "Habilitado (Desmarcar esta caja, deshabilita esta cola)"
+
+#: html/Admin/Elements/EditCustomFields:99
+msgid "Enabled Custom Fields"
+msgstr "Campos Personalizables Habilitados"
+
+#: html/Admin/Queues/index.html:56
+msgid "Enabled Queues"
+msgstr "Colas habilitadas"
+	
+#: html/Admin/Elements/EditCustomField:90 html/Admin/Groups/Modify.html:117 html/Admin/Queues/Modify.html:138 html/Admin/Users/Modify.html:283 html/User/Groups/Modify.html:117
+#. (loc_fuzzy($msg))
+msgid "Enabled status %1"
+msgstr "Estado %1 habilitado"
+
+#: lib/RT/CustomField_Overlay.pm:361
+msgid "Enter multiple values"
+msgstr "Introducir multiples valores"
+
+#: lib/RT/CustomField_Overlay.pm:358
+msgid "Enter one value"
+msgstr "Introducir un valor"
+
+#: html/Ticket/Elements/EditLinks:112
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "Ingrese los números de ticket o las URL que llevan hacia el ticket. Separe multiples entradas con espacios"
+
+#: html/Elements/Login:29 html/SelfService/Error.html:25 html/SelfService/Error.html:26
+msgid "Error"
+msgstr "Error"
+
+#: NOT FOUND IN SOURCE
+msgid "Error adding watcher"
+msgstr "Error añadiendo observador"
+
+#: lib/RT/Queue_Overlay.pm:555
+msgid "Error in parameters to Queue->AddWatcher"
+msgstr "Error en los parámetros para Queue->AddWatcher"
+
+#: lib/RT/Queue_Overlay.pm:713
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr "Error en los parámetros para Queue->DelWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1356
+msgid "Error in parameters to Ticket->AddWatcher"
+msgstr "Error en los parámetros para Queue->AddWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1532
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr "Error en los parámetros para Queue->DelWatcher"
+
+#: etc/initialdata:20
+msgid "Everyone"
+msgstr "Todos"
+
+#: bin/rt-crontool:194
+msgid "Example:"
+msgstr "Ejemplo"
+
+#: html/Admin/Elements/ModifyUser:64
+msgid "ExternalAuthId"
+msgstr "ExternalAuthId"
+
+#: html/Admin/Elements/ModifyUser:58
+msgid "ExternalContactInfoId"
+msgstr "ExternalContactInfoId"
+
+#: html/Admin/Users/Modify.html:73
+msgid "Extra info"
+msgstr "Información extra"
+
+#: lib/RT/User_Overlay.pm:302
+msgid "Failed to find 'Privileged' users pseudogroup."
+msgstr "Problema para encontrar el pseudogrupo de usuarios 'Privileged'"
+
+#: lib/RT/User_Overlay.pm:309
+msgid "Failed to find 'Unprivileged' users pseudogroup"
+msgstr "Problema para encontrar el pseudogrupo de usuarios 'Unprivileged'"
+
+#: bin/rt-crontool:138
+#. ($modname, $@)
+msgid "Failed to load module %1. (%2)"
+msgstr "Error al cargar el modulo %1. (%2)"
+
+#: lib/RT/Date.pm:412
+msgid "Feb."
+msgstr "Feb."
+
+#: NOT FOUND IN SOURCE
+msgid "February"
+msgstr "Febrero"
+
+#: NOT FOUND IN SOURCE
+msgid "Fin"
+msgstr "Fin"
+
+#: html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:59 lib/RT/Tickets_Overlay.pm:1091
+msgid "Final Priority"
+msgstr "Prioridad Final"
+
+#: lib/RT/Ticket_Overlay.pm:1162
+msgid "FinalPriority"
+msgstr "FinalPriority"
+
+#: html/Admin/Queues/People.html:61 html/Ticket/Elements/EditPeople:34
+msgid "Find group whose"
+msgstr "Encontrar grupo que"
+
+#: html/Elements/Quicksearch:25
+msgid "Find new/open tickets"
+msgstr "Encontrar tickets nuevos/abiertos"
+
+#: html/Admin/Queues/People.html:57 html/Admin/Users/index.html:46 html/Ticket/Elements/EditPeople:30
+msgid "Find people whose"
+msgstr "Encontrar gente que"
+
+#: html/Search/Listing.html:108
+msgid "Find tickets"
+msgstr "Encontrar tickets"
+
+#: NOT FOUND IN SOURCE
+msgid "Finish Approval"
+msgstr "Aprobacion final"
+
+#: html/Ticket/Elements/Tabs:58
+msgid "First"
+msgstr "Primero"
+
+#: html/Search/Listing.html:41
+msgid "First page"
+msgstr "Primera página"
+
+#: docs/design_docs/string-extraction-guide.txt:33
+msgid "Foo Bar Baz"
+msgstr "Foo Bar Baz"
+
+#: docs/design_docs/string-extraction-guide.txt:24
+msgid "Foo!"
+msgstr "Foo!"
+
+#: html/Search/Bulk.html:87
+msgid "Force change"
+msgstr "Forzar cambio"
+
+#: html/Search/Listing.html:106
+#. ($ticketcount)
+msgid "Found %quant(%1,ticket)"
+msgstr "Encontrado %quant(%1,ticket)"
+
+#: lib/RT/Interface/Web.pm:868
+msgid "Found Object"
+msgstr "Objeto encontrado"
+
+#: html/Admin/Elements/ModifyUser:44
+msgid "FreeformContactInfo"
+msgstr "FreeformContactInfo"
+
+#: lib/RT/CustomField_Overlay.pm:38
+msgid "FreeformMultiple"
+msgstr "FreeformMultiple"
+
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformSingle"
+msgstr "FreeformSingle"
+
+#: lib/RT/Date.pm:392
+msgid "Fri."
+msgstr "Vie."
+
+#: html/Ticket/Elements/ShowHistory:41 html/Ticket/Elements/ShowHistory:51
+msgid "Full headers"
+msgstr "Encabezados completos"
+
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr "Obteniendo el usuario de la firma pgp"
+
+#: lib/RT/Transaction_Overlay.pm:595
+#. ($New->Name)
+msgid "Given to %1"
+msgstr "Given to %1"
+
+#: html/Admin/Elements/Tabs:41 html/Admin/index.html:38
+msgid "Global"
+msgstr "Global"
+
+#: NOT FOUND IN SOURCE
+msgid "Global Keyword Selections"
+msgstr "Seleccion de palabras clave globales"
+
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
+msgstr "Acciones Globales"
+
+#: html/Admin/Elements/SelectTemplate:38
+#. (loc($Template->Name))
+msgid "Global template: %1"
+msgstr "Plantilla global"
+
+#: html/Admin/Elements/EditCustomFields:75 html/Admin/Queues/People.html:59 html/Admin/Queues/People.html:63 html/Admin/Queues/index.html:44 html/Admin/Users/index.html:49 html/Ticket/Elements/EditPeople:32 html/Ticket/Elements/EditPeople:36 html/index.html:41
+msgid "Go!"
+msgstr " Ir "
+
+#: NOT FOUND IN SOURCE
+msgid "Good pgp sig from %1\\n"
+msgstr "Firma pgp correcta de %1\\n"
+
+#: html/Search/Listing.html:50
+msgid "Goto page"
+msgstr "Ir a página"
+
+#: html/Elements/GotoTicket:25 html/SelfService/Elements/GotoTicket:25
+msgid "Goto ticket"
+msgstr "Ir a ticket"
+
+#: html/Ticket/Elements/AddWatchers:46 html/User/Elements/DelegateRights:78
+msgid "Group"
+msgstr "Grupo"
+
+#: NOT FOUND IN SOURCE
+msgid "Group %1 %2: %3"
+msgstr "Grupo %1 %2: %3"
+
+#: html/Admin/Elements/GroupTabs:45 html/Admin/Elements/QueueTabs:57 html/Admin/Elements/SystemTabs:44 html/Admin/Global/index.html:55
+msgid "Group Rights"
+msgstr "Derechos del grupo"
+
+#: lib/RT/Group_Overlay.pm:965
+msgid "Group already has member"
+msgstr "El grupo ya tiene miembros"
+
+#: NOT FOUND IN SOURCE
+msgid "Group could not be created."
+msgstr "El grupo no se pudo crear"
+
+#: html/Admin/Groups/Modify.html:77
+#. ($create_msg)
+msgid "Group could not be created: %1"
+msgstr "El grupo no se pudo crear: %1"
+
+#: lib/RT/Group_Overlay.pm:497
+msgid "Group created"
+msgstr "Grupo creado"
+
+#: lib/RT/Group_Overlay.pm:1133
+msgid "Group has no such member"
+msgstr "El grupo no tiene este miembro"
+
+#: lib/RT/Group_Overlay.pm:945 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1429 lib/RT/Ticket_Overlay.pm:1507
+msgid "Group not found"
+msgstr "Grupo no encontrado"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not found.\\n"
+msgstr "Grupo no entontrado\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not specified.\\n"
+msgstr "Grupo no especificado\\n"
+
+#: html/Admin/Elements/SelectNewGroupMembers:35 html/Admin/Elements/Tabs:35 html/Admin/Groups/Members.html:64 html/Admin/Queues/People.html:83 html/Admin/index.html:32 html/User/Groups/Members.html:67
+msgid "Groups"
+msgstr "Grupos"
+
+#: lib/RT/Group_Overlay.pm:971
+msgid "Groups can't be members of their members"
+msgstr "Los grupos no pueden ser miembros de sus propios miembros"
+
+#: lib/RT/Interface/CLI.pm:73 lib/RT/Interface/CLI.pm:73
+msgid "Hello!"
+msgstr "Hola!"
+
+#: docs/design_docs/string-extraction-guide.txt:40
+#. ($name)
+msgid "Hello, %1"
+msgstr "Hola, %1"
+
+#: html/Ticket/Elements/ShowHistory:30 html/Ticket/Elements/Tabs:88
+msgid "History"
+msgstr "Historial"
+
+#: html/Admin/Elements/ModifyUser:68
+msgid "HomePhone"
+msgstr "Tel Casa"
+
+#: html/Elements/Tabs:46
+msgid "Homepage"
+msgstr "Inicio"
+
+#: lib/RT/Base.pm:74
+#. (6)
+msgid "I have %quant(%1,concrete mixer)."
+msgstr "Tengo %quant(%1,concrete mixer)."
+
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
+msgstr "Tengo [quant,_1,concrete mixer]."
+
+#: html/Ticket/Elements/ShowBasics:27 lib/RT/Tickets_Overlay.pm:1018
+msgid "Id"
+msgstr "Id"
+
+#: html/Admin/Users/Modify.html:44 html/User/Prefs.html:39
+msgid "Identity"
+msgstr "Identidad"
+
+#: etc/upgrade/2.1.71:86
+msgid "If an approval is rejected, reject the original and delete pending approvals"
+msgstr "Si una aprobacion es rechazada, rechazar la original y borrar las aprobaciones pendientes"
+
+#: bin/rt-crontool:190
+msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
+msgstr "Si esta herramienta estaba setgid, un usuario hostil local podria usar esta herramienta para conseguir acceso administrativo a RT."
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
+msgid "If you've updated anything above, be sure to"
+msgstr "Si ha actualizado algo más arriba, no olvide"
+
+#: lib/RT/Interface/Web.pm:860
+msgid "Illegal value for %1"
+msgstr "Valor ilegal para %1"
+
+#: lib/RT/Interface/Web.pm:863
+msgid "Immutable field"
+msgstr "Campo inmutable"
+
+#: html/Admin/Elements/EditCustomFields:74
+msgid "Include disabled custom fields in listing."
+msgstr "Incluir campos personalizables deshabilitados en el listado."
+
+#: html/Admin/Queues/index.html:43
+msgid "Include disabled queues in listing."
+msgstr "Incluir colas deshabilitadas en el listado"
+
+#: html/Admin/Users/index.html:47
+msgid "Include disabled users in search."
+msgstr "Incluir usuarios deshabilitados en la búsqueda"
+
+#: lib/RT/Tickets_Overlay.pm:1067
+msgid "Initial Priority"
+msgstr "Prioridad inicial"
+
+#: lib/RT/Ticket_Overlay.pm:1161 lib/RT/Ticket_Overlay.pm:1163
+msgid "InitialPriority"
+msgstr "InitialPriority"
+
+#: lib/RT/ScripAction_Overlay.pm:105
+msgid "Input error"
+msgstr "Error de entrada"
+
+#: NOT FOUND IN SOURCE
+msgid "Interest noted"
+msgstr "Interest noted"
+
+#: lib/RT/Ticket_Overlay.pm:3729
+msgid "Internal Error"
+msgstr "Error interno"
+
+#: lib/RT/Record.pm:143
+#. ($id->{error_message})
+msgid "Internal Error: %1"
+msgstr "Error interno: %1"
+
+#: lib/RT/Group_Overlay.pm:644
+msgid "Invalid Group Type"
+msgstr "Tipo de grupo inválido"
+
+#: lib/RT/Principal_Overlay.pm:128
+msgid "Invalid Right"
+msgstr "Derechos inválidos"
+
+#: NOT FOUND IN SOURCE
+msgid "Invalid Type"
+msgstr "Tipo inválido"
+
+#: lib/RT/Interface/Web.pm:865
+msgid "Invalid data"
+msgstr "Datos no válidos"
+
+#: lib/RT/Ticket_Overlay.pm:438
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr "Propietario inválido. Estableciéndolo a 'nobody'."
+
+#: lib/RT/Scrip_Overlay.pm:134 lib/RT/Template_Overlay.pm:251
+msgid "Invalid queue"
+msgstr "�rea inválida"
+
+#: lib/RT/ACE_Overlay.pm:244 lib/RT/ACE_Overlay.pm:253 lib/RT/ACE_Overlay.pm:259 lib/RT/ACE_Overlay.pm:270 lib/RT/ACE_Overlay.pm:275
+msgid "Invalid right"
+msgstr "Permiso inválido"
+
+#: lib/RT/Record.pm:118
+#. ($key)
+msgid "Invalid value for %1"
+msgstr "Valor inválido para %1"
+
+#: lib/RT/Ticket_Overlay.pm:3367
+msgid "Invalid value for custom field"
+msgstr "Valor inválido para el campo personalizable"
+
+#: lib/RT/Ticket_Overlay.pm:345
+msgid "Invalid value for status"
+msgstr "Valor inválido para el estado"
+
+#: bin/rt-crontool:191
+msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
+msgstr "Es increiblemente importante que los usuarios sin privilegios no puedan ejecutar esta herramienta"
+
+#: bin/rt-crontool:192
+msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
+msgstr "Es recomendable crear un usuario unix sin privilegios que pertenezca al grupo correcto y que tenga aceso a ejecutar esta herramienta"
+
+#: bin/rt-crontool:163
+msgid "It takes several arguments:"
+msgstr "Tiene varios parametros:"
+
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
+msgstr "Items pendientes de mi aprobación"
+
+#: lib/RT/Date.pm:411
+msgid "Jan."
+msgstr "Ene."
+
+#: NOT FOUND IN SOURCE
+msgid "January"
+msgstr "Enero"
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "Join or leave this group"
+msgstr "Unirse o abandonar este grupo"
+
+#: lib/RT/Date.pm:417
+msgid "Jul."
+msgstr "Jul."
+
+#: NOT FOUND IN SOURCE
+msgid "July"
+msgstr "Julio"
+
+#: html/Ticket/Elements/Tabs:99
+msgid "Jumbo"
+msgstr "Todo"
+
+#: lib/RT/Date.pm:416
+msgid "Jun."
+msgstr "Jun."
+
+#: NOT FOUND IN SOURCE
+msgid "June"
+msgstr "Junio"
+
+#: NOT FOUND IN SOURCE
+msgid "Keyword"
+msgstr "Palabras clave"
+
+#: html/Admin/Elements/ModifyUser:52
+msgid "Lang"
+msgstr "Leng"
+
+#: html/Ticket/Elements/Tabs:73
+msgid "Last"
+msgstr "Último"
+
+#: html/Ticket/Elements/EditDates:38 html/Ticket/Elements/ShowDates:39
+msgid "Last Contact"
+msgstr "Último contacto"
+
+#: html/Elements/SelectDateType:29
+msgid "Last Contacted"
+msgstr "Último contactado"
+
+#: html/Search/Elements/TicketHeader:41
+msgid "Last Notified"
+msgstr "Se le notifico por ultima vez"
+
+#: html/Elements/SelectDateType:30
+msgid "Last Updated"
+msgstr "Actualizado por ultima vez"
+
+#: NOT FOUND IN SOURCE
+msgid "LastUpdated"
+msgstr "LastUpdated"
+
+#: NOT FOUND IN SOURCE
+msgid "Left"
+msgstr "Izquierda"
+
+#: html/Admin/Users/Modify.html:83
+msgid "Let this user access RT"
+msgstr "Permitir a este usuario acceder al RT"
+
+#: html/Admin/Users/Modify.html:87
+msgid "Let this user be granted rights"
+msgstr "Permitir que este usuario tenga privilegios adicionales"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting owner to %1 %2"
+msgstr "Limitando propietario a %1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting queue to %1 %2"
+msgstr "Limitando cola a %1 %2"
+
+#: lib/RT/Ticket_Overlay.pm:2697
+msgid "Link already exists"
+msgstr "El vínculo ya existe"
+
+#: lib/RT/Ticket_Overlay.pm:2709
+msgid "Link could not be created"
+msgstr "El vínculo no pudo ser creado"
+
+#: lib/RT/Ticket_Overlay.pm:2717 lib/RT/Ticket_Overlay.pm:2727
+#. ($TransString)
+msgid "Link created (%1)"
+msgstr "Vínculo creado (%2)"
+
+#: lib/RT/Ticket_Overlay.pm:2638
+#. ($TransString)
+msgid "Link deleted (%1)"
+msgstr "Vínculo borrado (%1)"
+
+#: lib/RT/Ticket_Overlay.pm:2644
+msgid "Link not found"
+msgstr "Vínculo no encontrado"
+
+#: html/Ticket/ModifyLinks.html:25 html/Ticket/ModifyLinks.html:29
+#. ($Ticket->Id)
+msgid "Link ticket #%1"
+msgstr "Vincular caso #%1"
+
+#: NOT FOUND IN SOURCE
+msgid "Link ticket %1"
+msgstr "Enlazar ticket %1"
+
+#: html/Ticket/Elements/Tabs:97
+msgid "Links"
+msgstr "Enlaces"
+
+#: html/Admin/Users/Modify.html:114 html/User/Prefs.html:85
+msgid "Location"
+msgstr "Direccion"
+
+#: lib/RT.pm:158
+#. ($RT::LogDir)
+msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
+msgstr "El directorio del log %1 no pudo ser encontrado o no se pudo escribir en él.\\n RT no puede ejecutarse."
+
+#: html/Elements/Header:57
+#. ("<b>".$session{'CurrentUser'}->Name."</b>")
+msgid "Logged in as %1"
+msgstr "Autenticado como %1"
+
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:25 html/Elements/Login:34 html/Elements/Login:45
+msgid "Login"
+msgstr "Entrar"
+
+#: html/Elements/Header:54
+msgid "Logout"
+msgstr "Salir"
+
+#: html/Search/Bulk.html:86
+msgid "Make Owner"
+msgstr "Hacer propietario a"
+
+#: html/Search/Bulk.html:102
+msgid "Make Status"
+msgstr "Establecer estatus"
+
+#: html/Search/Bulk.html:109
+msgid "Make date Due"
+msgstr "Establecer fecha de plazo"
+
+#: html/Search/Bulk.html:110
+msgid "Make date Resolved"
+msgstr "Establecer fecha de resolución"
+
+#: html/Search/Bulk.html:107
+msgid "Make date Started"
+msgstr "Establecer fecha de inicio"
+
+#: html/Search/Bulk.html:106
+msgid "Make date Starts"
+msgstr "Establecer fecha de inicio"
+
+#: html/Search/Bulk.html:108
+msgid "Make date Told"
+msgstr "Establecer fecha de último cambio"
+
+#: html/Search/Bulk.html:99
+msgid "Make priority"
+msgstr "Establecer prioridad"
+
+#: html/Search/Bulk.html:100
+msgid "Make queue"
+msgstr "Establecer cola"
+
+#: html/Search/Bulk.html:98
+msgid "Make subject"
+msgstr "Establecer título"
+
+#: html/Admin/index.html:33
+msgid "Manage groups and group membership"
+msgstr "Administrar grupos y miembros"
+
+#: html/Admin/index.html:39
+msgid "Manage properties and configuration which apply to all queues"
+msgstr "Administrar propiedades y configuracion que se aplique a todas las colas"
+
+#: html/Admin/index.html:36
+msgid "Manage queues and queue-specific properties"
+msgstr "Administrar colas y propiedades especificas"
+
+#: html/Admin/index.html:30
+msgid "Manage users and passwords"
+msgstr "Administrar usuarios y contraseñas"
+
+#: lib/RT/Date.pm:413
+msgid "Mar."
+msgstr "Mar."
+
+#: NOT FOUND IN SOURCE
+msgid "March"
+msgstr "Marzo"
+
+#: NOT FOUND IN SOURCE
+msgid "May"
+msgstr "Mayo"
+
+#: lib/RT/Date.pm:415
+msgid "May."
+msgstr "May."
+
+#: lib/RT/Group_Overlay.pm:982
+msgid "Member added"
+msgstr "Miembro añadido"
+
+#: lib/RT/Group_Overlay.pm:1140
+msgid "Member deleted"
+msgstr "Miembro borrado"
+
+#: lib/RT/Group_Overlay.pm:1144
+msgid "Member not deleted"
+msgstr "Miembro no borrado"
+
+#: html/Elements/SelectLinkType:26
+msgid "Member of"
+msgstr "Miembro de"
+
+#: NOT FOUND IN SOURCE
+msgid "MemberOf"
+msgstr "MemberOf"
+
+#: html/Admin/Elements/GroupTabs:42 html/User/Elements/GroupTabs:42
+msgid "Members"
+msgstr "Miembros"
+
+#: lib/RT/Ticket_Overlay.pm:2843
+msgid "Merge Successful"
+msgstr "Fusión exitosa"
+
+#: lib/RT/Ticket_Overlay.pm:2804
+msgid "Merge failed. Couldn't set EffectiveId"
+msgstr "Fusión fallida. No se pudo establecer el EffectiveId"
+
+#: html/Ticket/Elements/EditLinks:115
+msgid "Merge into"
+msgstr "Fusionar dentro de"
+
+#: html/Ticket/Update.html:102
+msgid "Message"
+msgstr "Mensaje"
+
+#: lib/RT/Interface/Web.pm:867
+msgid "Missing a primary key?: %1"
+msgstr "Falta una clave primaria?: %1"
+
+#: html/Admin/Users/Modify.html:169 html/User/Prefs.html:54
+msgid "Mobile"
+msgstr "Movil"
+
+#: html/Admin/Elements/ModifyUser:72
+msgid "MobilePhone"
+msgstr "Telefono Movil"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "Modify Access Control List"
+msgstr "Modificar lista de control de acceso"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Field %1"
+msgstr "Modificar el campo personalizable %1"
+
+#: html/Admin/Global/CustomFields.html:44 html/Admin/Global/index.html:51
+msgid "Modify Custom Fields which apply to all queues"
+msgstr "Modificar los campos personalizables que se apliquen a todas las colas"
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "Modify Scrip templates for this queue"
+msgstr "Modificar plantillas Sript para esta cola"
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "Modify Scrips for this queue"
+msgstr "Modificar Scrips para esta cola"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify System ACLS"
+msgstr "Modificar ACLs de sistema"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Template %1"
+msgstr "Modificar plantilla %1"
+
+#: html/Admin/Queues/CustomField.html:45
+#. ($QueueObj->Name())
+msgid "Modify a CustomField for queue %1"
+msgstr "Modificar un campo personalizable para la cola %1"
+
+#: html/Admin/Global/CustomField.html:53
+msgid "Modify a CustomField which applies to all queues"
+msgstr "Modificar un campo personalizable que se aplique a todas las colas"
+
+#: html/Admin/Queues/Scrip.html:54
+#. ($QueueObj->Name)
+msgid "Modify a scrip for queue %1"
+msgstr "Modificar un scrip para la cola %1"
+
+#: html/Admin/Global/Scrip.html:48
+msgid "Modify a scrip which applies to all queues"
+msgstr "Modificar un scrip que se aplique a todas las colas"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify dates for # %1"
+msgstr "Modificar fechas para # %1"
+
+#: html/Ticket/ModifyDates.html:25 html/Ticket/ModifyDates.html:29
+#. ($TicketObj->Id)
+msgid "Modify dates for #%1"
+msgstr "Modificar fechas para #%1"
+
+#: html/Ticket/ModifyDates.html:35
+#. ($TicketObj->Id)
+msgid "Modify dates for ticket # %1"
+msgstr "Modificar fechas para ticket # %1"
+
+#: html/Admin/Global/GroupRights.html:25 html/Admin/Global/GroupRights.html:28 html/Admin/Global/index.html:56
+msgid "Modify global group rights"
+msgstr "Modificar privilegios globales de grupo"
+
+#: html/Admin/Global/GroupRights.html:33
+msgid "Modify global group rights."
+msgstr "Modificar privilegios globales de grupo."
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for groups"
+msgstr "Modificar privilegios globales para grupos"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for users"
+msgstr "Modificar privilegios globales para usuarios"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global scrips"
+msgstr "Modificar acciones globales"
+
+#: html/Admin/Global/UserRights.html:25 html/Admin/Global/UserRights.html:28 html/Admin/Global/index.html:60
+msgid "Modify global user rights"
+msgstr "Modificar derechos globales de usuario"
+
+#: html/Admin/Global/UserRights.html:33
+msgid "Modify global user rights."
+msgstr "Modificar privilegios globales de usuario"
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "Modify group metadata or delete group"
+msgstr "Modificar metadatos del grupo o borrar grupo"
+
+#: html/Admin/Groups/GroupRights.html:25 html/Admin/Groups/GroupRights.html:29 html/Admin/Groups/GroupRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify group rights for group %1"
+msgstr "Modificar privilegios de grupo para %1"
+
+#: html/Admin/Queues/GroupRights.html:25 html/Admin/Queues/GroupRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify group rights for queue %1"
+msgstr "Modificar privilegios de grupo para la cola %1"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "Modify membership roster for this group"
+msgstr "Modificar miembros de este grupo"
+
+#: lib/RT/System.pm:61
+msgid "Modify one's own RT account"
+msgstr "Modificar la propia cuenta RT"
+
+#: html/Admin/Queues/People.html:25 html/Admin/Queues/People.html:29
+#. ($QueueObj->Name)
+msgid "Modify people related to queue %1"
+msgstr "Modificar personas relacionadas al cola %1"
+
+#: html/Ticket/ModifyPeople.html:25 html/Ticket/ModifyPeople.html:29 html/Ticket/ModifyPeople.html:35
+#. ($Ticket->id)
+#. ($Ticket->Id)
+msgid "Modify people related to ticket #%1"
+msgstr "Modificar personas relacionadas al ticket #%1"
+
+#: html/Admin/Queues/Scrips.html:44
+#. ($QueueObj->Name)
+msgid "Modify scrips for queue %1"
+msgstr "Modificar acciones para la cola %1"
+
+#: html/Admin/Global/Scrips.html:44 html/Admin/Global/index.html:42
+msgid "Modify scrips which apply to all queues"
+msgstr "Modificar scrips que se aplican a todas las colas"
+
+#: html/Admin/Global/Template.html:25 html/Admin/Global/Template.html:30 html/Admin/Global/Template.html:81 html/Admin/Queues/Template.html:78
+#. (loc($TemplateObj->Name()))
+#. ($TemplateObj->id)
+msgid "Modify template %1"
+msgstr "Modificar plantilla %1"
+
+#: html/Admin/Global/Templates.html:44
+msgid "Modify templates which apply to all queues"
+msgstr "Modificar plantillas que se aplican a todas las colas"
+
+#: html/Admin/Groups/Modify.html:87 html/User/Groups/Modify.html:86
+#. ($Group->Name)
+msgid "Modify the group %1"
+msgstr "Modificar el grupo %1"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "Modify the queue watchers"
+msgstr "Modificar los observadores de la cola"
+
+#: html/Admin/Users/Modify.html:236
+#. ($UserObj->Name)
+msgid "Modify the user %1"
+msgstr "Modificar el usuario %1"
+
+#: html/Ticket/ModifyAll.html:37
+#. ($Ticket->Id)
+msgid "Modify ticket # %1"
+msgstr "Modificar el ticket # %1"
+
+#: html/Ticket/Modify.html:25 html/Ticket/Modify.html:28 html/Ticket/Modify.html:34
+#. ($TicketObj->Id)
+msgid "Modify ticket #%1"
+msgstr "Modificar el ticket #%1"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "Modify tickets"
+msgstr "Modificar tickets"
+
+#: html/Admin/Groups/UserRights.html:25 html/Admin/Groups/UserRights.html:29 html/Admin/Groups/UserRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify user rights for group %1"
+msgstr "Modificar privilegios de usuario para el grupo %1"
+
+#: html/Admin/Queues/UserRights.html:25 html/Admin/Queues/UserRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify user rights for queue %1"
+msgstr "Modificar derechos de usuario para la cola %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify watchers for queue '%1'"
+msgstr "Modificar observadores para la cola '%1'"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ModifyACL"
+msgstr "ModifyACL"
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "ModifyOwnMembership"
+msgstr "ModifyOwnMembership"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "ModifyQueueWatchers"
+msgstr "ModifyQueueWatchers"
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "ModifyScrips"
+msgstr "ModifyScrips"
+
+#: lib/RT/System.pm:61
+msgid "ModifySelf"
+msgstr "ModifySelf"
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "ModifyTemplate"
+msgstr "ModifyTemplate"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "ModifyTicket"
+msgstr "ModifyTicket"
+
+#: lib/RT/Date.pm:388
+msgid "Mon."
+msgstr "Lun."
+
+#: html/Ticket/Elements/ShowRequestor:42
+#. ($name)
+msgid "More about %1"
+msgstr "Más acerca de %1"
+
+#: html/Admin/Elements/EditCustomFields:61
+msgid "Move down"
+msgstr "Mover hacia abajo"
+
+#: html/Admin/Elements/EditCustomFields:53
+msgid "Move up"
+msgstr "Move hacia arriba"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:27
+msgid "Multiple"
+msgstr "Múltiple"
+
+#: lib/RT/User_Overlay.pm:179
+msgid "Must specify 'Name' attribute"
+msgstr "Se debe especificar un nombre"
+
+#: NOT FOUND IN SOURCE
+msgid "My Approvals"
+msgstr "Mis aprobaciones"
+
+#: html/Approvals/index.html:25 html/Approvals/index.html:26
+msgid "My approvals"
+msgstr "Mis aprobaciones"
+
+#: html/Admin/Elements/AddCustomFieldValue:26 html/Admin/Elements/EditCustomField:32 html/Admin/Elements/ModifyTemplate:28 html/Admin/Elements/ModifyUser:30 html/Admin/Groups/Modify.html:44 html/Elements/SelectGroups:26 html/Elements/SelectUsers:28 html/User/Groups/Modify.html:44
+msgid "Name"
+msgstr "Nombre"
+
+#: lib/RT/User_Overlay.pm:186
+msgid "Name in use"
+msgstr "Nombre en uso"
+
+#: NOT FOUND IN SOURCE
+msgid "Need approval from system administrator"
+msgstr "Se necesita aprobacion del administrador del sistema"
+
+#: html/Ticket/Elements/ShowDates:52
+msgid "Never"
+msgstr "Nunca"
+
+#: html/Elements/Quicksearch:30
+msgid "New"
+msgstr "Nuevo"
+
+#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:93 html/User/Prefs.html:65
+msgid "New Password"
+msgstr "Nueva contraseñaa"
+
+#: etc/initialdata:311 etc/upgrade/2.1.71:16
+msgid "New Pending Approval"
+msgstr "Nueva pendiente de aprobación"
+
+#: html/Ticket/Elements/EditLinks:111
+msgid "New Relationships"
+msgstr "Nuevas relaciones"
+
+#: html/Ticket/Elements/Tabs:36
+msgid "New Search"
+msgstr "Nueva búsqueda"
+
+#: html/Admin/Global/CustomField.html:41 html/Admin/Global/CustomFields.html:39 html/Admin/Queues/CustomField.html:52 html/Admin/Queues/CustomFields.html:40
+msgid "New custom field"
+msgstr "Nuevo campo personalizable"
+
+#: html/Admin/Elements/GroupTabs:54 html/User/Elements/GroupTabs:52
+msgid "New group"
+msgstr "Nuevo grupo"
+
+#: html/SelfService/Prefs.html:32
+msgid "New password"
+msgstr "Nueva contraseñaa"
+
+#: lib/RT/User_Overlay.pm:639
+msgid "New password notification sent"
+msgstr "Notificación de nueva contraseña enviada"
+
+#: html/Admin/Elements/QueueTabs:70
+msgid "New queue"
+msgstr "Nueva cola"
+
+#: html/SelfService/Elements/Tabs:63
+msgid "New request"
+msgstr "Nueva solicitud"
+
+#: html/Admin/Elements/SelectRights:42
+msgid "New rights"
+msgstr "Nuevos privilegios"
+
+#: html/Admin/Global/Scrip.html:40 html/Admin/Global/Scrips.html:39 html/Admin/Queues/Scrip.html:43 html/Admin/Queues/Scrips.html:53
+msgid "New scrip"
+msgstr "Nuevo scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "New search"
+msgstr "Nueva búsqueda"
+
+#: html/Admin/Global/Template.html:60 html/Admin/Global/Templates.html:39 html/Admin/Queues/Template.html:58 html/Admin/Queues/Templates.html:46
+msgid "New template"
+msgstr "Nueva plantilla"
+
+#: lib/RT/Ticket_Overlay.pm:2771
+msgid "New ticket doesn't exist"
+msgstr "El ticket nuevo no existe"
+
+#: html/Admin/Elements/UserTabs:52
+msgid "New user"
+msgstr "Nuevo usuario"
+
+#: html/Admin/Elements/CreateUserCalled:26
+msgid "New user called"
+msgstr "Nuevo usuario llamado"
+
+#: html/Admin/Queues/People.html:55 html/Ticket/Elements/EditPeople:29
+msgid "New watchers"
+msgstr "Nuevo observador"
+
+#: html/Admin/Users/Prefs.html:42
+msgid "New window setting"
+msgstr "Establecer nueva ventana "
+
+#: html/Ticket/Elements/Tabs:69
+msgid "Next"
+msgstr "Siguiente"
+
+#: html/Search/Listing.html:48
+msgid "Next page"
+msgstr "Siguiente página"
+
+#: html/Admin/Elements/ModifyUser:50
+msgid "NickName"
+msgstr "Alias"
+
+#: html/Admin/Users/Modify.html:63 html/User/Prefs.html:46
+msgid "Nickname"
+msgstr "Alias"
+
+#: html/Admin/Elements/EditCustomField:73 html/Admin/Elements/EditCustomFields:105
+msgid "No CustomField"
+msgstr "No hay campo personalizable"
+
+#: html/Admin/Groups/GroupRights.html:84 html/Admin/Groups/UserRights.html:71
+msgid "No Group defined"
+msgstr "No hay grupo definido"
+
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:68
+msgid "No Queue defined"
+msgstr "No hay cola definida"
+
+#: bin/rt-crontool:56
+msgid "No RT user found. Please consult your RT administrator.\\n"
+msgstr "No se encontró el usuario. Por favor consulte al administrador.\\n"
+
+#: html/Admin/Global/Template.html:79 html/Admin/Queues/Template.html:76
+msgid "No Template"
+msgstr "No hay plantilla"
+
+#: bin/rt-commit-handler:764
+msgid "No Ticket specified. Aborting ticket "
+msgstr "No se especificó el ticket. Abortada la transacción"
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgstr "No se especificó ticket. Abortando las modificaciones al ticket\\n\\n"
+
+#: html/Approvals/Elements/Approve:47
+msgid "No action"
+msgstr "No action"
+
+#: lib/RT/Interface/Web.pm:862
+msgid "No column specified"
+msgstr "No se ha especificado ninguna columna"
+
+#: NOT FOUND IN SOURCE
+msgid "No command found\\n"
+msgstr "Comando no encontrado\\n"
+
+#: html/Elements/ViewUser:36 html/Ticket/Elements/ShowRequestor:45
+msgid "No comment entered about this user"
+msgstr "No hay comentarios sobre este usuario"
+
+#: lib/RT/Ticket_Overlay.pm:2189 lib/RT/Ticket_Overlay.pm:2257
+msgid "No correspondence attached"
+msgstr "No hay ningún archivo adjunto"
+
+#: lib/RT/Action/Generic.pm:150 lib/RT/Condition/Generic.pm:176 lib/RT/Search/ActiveTicketsInQueue.pm:56 lib/RT/Search/Generic.pm:113
+#. (ref $self)
+msgid "No description for %1"
+msgstr "No hay descripción para %1"
+
+#: lib/RT/Users_Overlay.pm:151
+msgid "No group specified"
+msgstr "No hay grupo especificado"
+
+#: lib/RT/User_Overlay.pm:857
+msgid "No password set"
+msgstr "No hay contraseña definida"
+
+#: lib/RT/Queue_Overlay.pm:259
+msgid "No permission to create queues"
+msgstr "No tiene privilegios para crear colas"
+
+#: lib/RT/Ticket_Overlay.pm:341
+#. ($QueueObj->Name)
+msgid "No permission to create tickets in the queue '%1'"
+msgstr "No tiene privilegios para crear tickets en la cola '%1'"
+
+#: lib/RT/User_Overlay.pm:151
+msgid "No permission to create users"
+msgstr "No tiene privilegios para crear usuarios"
+
+#: html/SelfService/Display.html:174
+msgid "No permission to display that ticket"
+msgstr "No tiene privilegios para mostrar el ticket"
+
+#: html/SelfService/Update.html:55
+msgid "No permission to view update ticket"
+msgstr "Sin permiso para ver la actualización del ticket"
+
+#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1488
+msgid "No principal specified"
+msgstr "No hay un principal especificado"
+
+#: html/Admin/Queues/People.html:154 html/Admin/Queues/People.html:164
+msgid "No principals selected."
+msgstr "No hay principales seleccionados"
+
+#: html/Admin/Queues/index.html:35
+msgid "No queues matching search criteria found."
+msgstr "No hay colas que concuerden con los criterios de búsqueda"
+
+#: html/Admin/Elements/SelectRights:81
+msgid "No rights found"
+msgstr "No se encontraron derechos"
+
+#: html/Admin/Elements/SelectRights:33
+msgid "No rights granted."
+msgstr "Sin privilegios concedidos"
+
+#: html/Search/Bulk.html:149
+msgid "No search to operate on."
+msgstr "No hay búsqueda sobre la que operar"
+
+#: NOT FOUND IN SOURCE
+msgid "No ticket id specified"
+msgstr "No se especificó el identificador del ticket"
+
+#: lib/RT/Transaction_Overlay.pm:480 lib/RT/Transaction_Overlay.pm:518
+msgid "No transaction type specified"
+msgstr "No se especificó el tipo de transacción"
+
+#: NOT FOUND IN SOURCE
+msgid "No user or email address specified"
+msgstr "No se especificó email o usuario"
+
+#: html/Admin/Users/index.html:36
+msgid "No users matching search criteria found."
+msgstr "No se encontraron usuarios que concuerden con los criterios de búsqueda"
+
+#: bin/rt-commit-handler:644
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr "Usuario no encontrado. El manejador cvs está deshabilitado. Por favor consulte a su administrador.\\n"
+
+#: lib/RT/Interface/Web.pm:859
+msgid "No value sent to _Set!\\n"
+msgstr "No se envió ningun valor a _Set!\\n"
+
+#: html/Search/Elements/TicketRow:37
+msgid "Nobody"
+msgstr "Nadie"
+
+#: lib/RT/Interface/Web.pm:864
+msgid "Nonexistant field?"
+msgstr "Campo no existente?"
+
+#: html/Elements/Login:99
+msgid "Not logged in"
+msgstr "No autenticado"
+
+#: html/Elements/Header:59 html/SelfService/Elements/Header:58
+msgid "Not logged in."
+msgstr "No autenticado."
+
+#: lib/RT/Date.pm:369
+msgid "Not set"
+msgstr "No establecido"
+
+#: html/NoAuth/Reminder.html:27
+msgid "Not yet implemented."
+msgstr "No se ha implementado."
+
+#: html/Admin/Groups/Rights.html:25
+msgid "Not yet implemented...."
+msgstr "No está implementado..."
+
+#: html/Approvals/Elements/Approve:50
+msgid "Notes"
+msgstr "Notas"
+
+#: lib/RT/User_Overlay.pm:642
+msgid "Notification could not be sent"
+msgstr "La notificación no se pudo enviar"
+
+#: etc/initialdata:94
+msgid "Notify AdminCcs"
+msgstr "Notificar AdminCcs"
+
+#: etc/initialdata:90
+msgid "Notify AdminCcs as Comment"
+msgstr "Notificar AdminCcs como comentario"
+
+#: etc/initialdata:121
+msgid "Notify Other Recipients"
+msgstr "Notificar otros destinatarios"
+
+#: etc/initialdata:117
+msgid "Notify Other Recipients as Comment"
+msgstr "Notificar otros destinatarios como comentario"
+
+#: etc/initialdata:86
+msgid "Notify Owner"
+msgstr "Notificar al propietario"
+
+#: etc/initialdata:82
+msgid "Notify Owner as Comment"
+msgstr "Notificar al propietario como comentario"
+
+#: etc/initialdata:313 etc/upgrade/2.1.71:17
+msgid "Notify Owners and AdminCcs of new items pending their approval"
+msgstr "Notificar propietarios y AdminCcs de nuevos items pendientes de aprobación"
+
+#: etc/initialdata:78
+msgid "Notify Requestors"
+msgstr "Notificar solicitantes"
+
+#: etc/initialdata:104
+msgid "Notify Requestors and Ccs"
+msgstr "Notificar solicitantes y Ccs"
+
+#: etc/initialdata:99
+msgid "Notify Requestors and Ccs as Comment"
+msgstr "Notificar solicitantes y Ccs como comentario"
+
+#: etc/initialdata:113
+msgid "Notify Requestors, Ccs and AdminCcs"
+msgstr "Notificar solicitantes, Ccs y AdminCcs"
+
+#: etc/initialdata:109
+msgid "Notify Requestors, Ccs and AdminCcs as Comment"
+msgstr "Notificar solicitantes, Ccs y AdminCcs como comentario"
+
+#: lib/RT/Date.pm:421
+msgid "Nov."
+msgstr "Nov."
+
+#: NOT FOUND IN SOURCE
+msgid "November"
+msgstr "Noviembre"
+
+#: lib/RT/Record.pm:157
+msgid "Object could not be created"
+msgstr "No se pudo crear el objeto"
+
+#: lib/RT/Record.pm:176
+msgid "Object created"
+msgstr "Objeto creado"
+
+#: lib/RT/Date.pm:420
+msgid "Oct."
+msgstr "Oct."
+
+#: NOT FOUND IN SOURCE
+msgid "October"
+msgstr "Octubre"
+
+#: html/Elements/SelectDateRelation:35
+msgid "On"
+msgstr "en "
+
+#: etc/initialdata:155
+msgid "On Comment"
+msgstr "Al comentar"
+
+#: etc/initialdata:148
+msgid "On Correspond"
+msgstr "On Correspond"
+
+#: etc/initialdata:137
+msgid "On Create"
+msgstr "Al crear"
+
+#: etc/initialdata:169
+msgid "On Owner Change"
+msgstr "Al cambiar de propietario"
+
+#: etc/initialdata:177
+msgid "On Queue Change"
+msgstr "Al cambiar de cola"
+
+#: etc/initialdata:183
+msgid "On Resolve"
+msgstr "Al resolver"
+
+#: etc/initialdata:161
+msgid "On Status Change"
+msgstr "Al cambiar de status"
+
+#: etc/initialdata:142
+msgid "On Transaction"
+msgstr "Al hacer transaccion"
+
+#: html/Approvals/Elements/PendingMyApproval:50
+#. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
+msgid "Only show approvals for requests created after %1"
+msgstr "Solo muestra aprobaciones para solicitudes creadas despues de %1"
+
+#: html/Approvals/Elements/PendingMyApproval:48
+#. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
+msgid "Only show approvals for requests created before %1"
+msgstr "Solo muestra aprobaciones para solicitudes creadas antes de %1"
+
+#: html/Elements/Quicksearch:31
+msgid "Open"
+msgstr "Abierto"
+
+#: html/Ticket/Elements/Tabs:136
+msgid "Open it"
+msgstr "Abrirlo"
+
+#: html/SelfService/Elements/Tabs:57
+msgid "Open requests"
+msgstr "Solicitudes abiertas"
+
+#: html/Admin/Users/Prefs.html:41
+msgid "Open tickets (from listing) in a new window"
+msgstr "Tickets abiertos (del listado) en una nueva ventana"
+
+#: html/Admin/Users/Prefs.html:40
+msgid "Open tickets (from listing) in another window"
+msgstr "Tickets abiertos (del listado) en otra ventana"
+
+#: etc/initialdata:133
+msgid "Open tickets on correspondence"
+msgstr "Open tickets on correspondence"
+
+#: html/Search/Elements/PickRestriction:101
+msgid "Ordering and sorting"
+msgstr "Ordenación y clasificación"
+
+#: html/Admin/Elements/ModifyUser:46 html/Admin/Users/Modify.html:117 html/Elements/SelectUsers:29 html/User/Prefs.html:86
+msgid "Organization"
+msgstr "Organización"
+
+#: html/Approvals/Elements/Approve:34
+#. ($approving->Id, $approving->Subject)
+msgid "Originating ticket: #%1"
+msgstr "Ticket originario: #%1"
+
+#: html/Admin/Elements/ModifyQueue:55 html/Admin/Queues/Modify.html:69
+msgid "Over time, priority moves toward"
+msgstr "Pasada la fecha de gracia, la prioridad se mueve a"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "Own tickets"
+msgstr "Tickets poseidos"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "OwnTicket"
+msgstr "OwnTicket"
+
+#: etc/initialdata:38 html/Elements/MyRequests:32 html/SelfService/Elements/MyRequests:30 html/Ticket/Create.html:48 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/EditPeople:44 html/Ticket/Elements/ShowPeople:27 html/Ticket/Update.html:63 lib/RT/ACE_Overlay.pm:86 lib/RT/Tickets_Overlay.pm:1244
+msgid "Owner"
+msgstr "Propietario"
+
+#: lib/RT/Ticket_Overlay.pm:3004
+#. ($OldOwnerObj->Name,  $NewOwnerObj->Name)
+msgid "Owner changed from %1 to %2"
+msgstr "Propietario cambiado de %1 a %2"
+
+#: lib/RT/Transaction_Overlay.pm:584
+#. ($Old->Name , $New->Name)
+msgid "Owner forcibly changed from %1 to %2"
+msgstr "Propietario cambiado forzosamente de %1 a %2"
+
+#: html/Search/Elements/PickRestriction:31
+msgid "Owner is"
+msgstr "El propietario es"
+
+#: html/Admin/Users/Modify.html:174 html/User/Prefs.html:56
+msgid "Pager"
+msgstr "Buscapersonas"
+
+#: html/Admin/Elements/ModifyUser:74
+msgid "PagerPhone"
+msgstr "Buscapersonas Tel."
+
+#: html/Ticket/Create.html:182 html/Ticket/Elements/EditLinks:127 html/Ticket/Elements/EditLinks:58 html/Ticket/Elements/ShowLinks:43
+msgid "Parents"
+msgstr "Padres"
+
+#: html/Elements/Login:43 html/User/Prefs.html:61
+msgid "Password"
+msgstr "Contraseñaa"
+
+#: html/NoAuth/Reminder.html:25
+msgid "Password Reminder"
+msgstr "Recordatorio de contraseña"
+
+#: lib/RT/User_Overlay.pm:168 lib/RT/User_Overlay.pm:860
+msgid "Password too short"
+msgstr "Contraseña demasiado corta"
+
+#: html/Admin/Users/Modify.html:291 html/User/Prefs.html:172
+#. (loc_fuzzy($msg))
+msgid "Password: %1"
+msgstr "Contraseña: %1"
+
+#: html/Ticket/Elements/ShowSummary:43 html/Ticket/Elements/Tabs:96 html/Ticket/ModifyAll.html:51
+msgid "People"
+msgstr "Personas"
+
+#: etc/initialdata:126
+msgid "Perform a user-defined action"
+msgstr "Realizar una acion definida por el usuario"
+
+#: lib/RT/ACE_Overlay.pm:231 lib/RT/ACE_Overlay.pm:237 lib/RT/ACE_Overlay.pm:563 lib/RT/ACE_Overlay.pm:573 lib/RT/ACE_Overlay.pm:583 lib/RT/ACE_Overlay.pm:648 lib/RT/CurrentUser.pm:83 lib/RT/CurrentUser.pm:92 lib/RT/CustomField_Overlay.pm:445 lib/RT/CustomField_Overlay.pm:451 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1099 lib/RT/Group_Overlay.pm:1108 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1163 lib/RT/Group_Overlay.pm:1169 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:904 lib/RT/Group_Overlay.pm:908 lib/RT/Group_Overlay.pm:921 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:931 lib/RT/Scrip_Overlay.pm:126 lib/RT/Scrip_Overlay.pm:137 lib/RT/Scrip_Overlay.pm:197 lib/RT/Scrip_Overlay.pm:430 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:88 lib/RT/Template_Overlay.pm:94 lib/RT/Ticket_Overlay.pm:1341 lib/RT/Ticket_Overlay.pm:1351 lib/RT/Ticket_Overlay.pm:1365 lib/RT/Ticket_Overlay.pm:1518 lib/RT/Ticket_Overlay.pm:1527 lib/RT/Ticket_Overlay.pm:1540 lib/RT/Ticket_Overlay.pm:1875 lib/RT/Ticket_Overlay.pm:2013 lib/RT/Ticket_Overlay.pm:2177 lib/RT/Ticket_Overlay.pm:2244 lib/RT/Ticket_Overlay.pm:2596 lib/RT/Ticket_Overlay.pm:2668 lib/RT/Ticket_Overlay.pm:2762 lib/RT/Ticket_Overlay.pm:2777 lib/RT/Ticket_Overlay.pm:2910 lib/RT/Ticket_Overlay.pm:3139 lib/RT/Ticket_Overlay.pm:3337 lib/RT/Ticket_Overlay.pm:3499 lib/RT/Ticket_Overlay.pm:3551 lib/RT/Ticket_Overlay.pm:3716 lib/RT/Transaction_Overlay.pm:468 lib/RT/Transaction_Overlay.pm:475 lib/RT/Transaction_Overlay.pm:504 lib/RT/Transaction_Overlay.pm:511 lib/RT/User_Overlay.pm:1334 lib/RT/User_Overlay.pm:562 lib/RT/User_Overlay.pm:597 lib/RT/User_Overlay.pm:853 lib/RT/User_Overlay.pm:941
+msgid "Permission Denied"
+msgstr "Permiso denegado"
+
+#: html/User/Elements/Tabs:35
+msgid "Personal Groups"
+msgstr "Grupos personales"
+
+#: html/User/Groups/index.html:30 html/User/Groups/index.html:40
+msgid "Personal groups"
+msgstr "Grupos personales"
+
+#: html/User/Elements/DelegateRights:37
+msgid "Personal groups:"
+msgstr "Grupos personales:"
+
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:49
+msgid "Phone numbers"
+msgstr "Números de teléfono"
+
+#: html/Admin/Users/Rights.html:25
+msgid "Placeholder"
+msgstr "Placeholder"
+
+#: html/Elements/Header:52 html/Elements/Tabs:55 html/SelfService/Prefs.html:25 html/User/Prefs.html:25 html/User/Prefs.html:28
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: NOT FOUND IN SOURCE
+msgid "Prefs"
+msgstr "Prefs"
+
+#: lib/RT/Action/Generic.pm:160
+msgid "Prepare Stubbed"
+msgstr "Preparación cortada"
+
+#: html/Ticket/Elements/Tabs:61
+msgid "Prev"
+msgstr "Prev"
+
+#: html/Search/Listing.html:44
+msgid "Previous page"
+msgstr "Página anterior"
+
+#: NOT FOUND IN SOURCE
+msgid "Pri"
+msgstr "Pri"
+
+#: lib/RT/ACE_Overlay.pm:133 lib/RT/ACE_Overlay.pm:208 lib/RT/ACE_Overlay.pm:552
+#. ($args{'PrincipalId'})
+msgid "Principal %1 not found."
+msgstr "No se encontró el principal %1"
+
+#: html/Search/Elements/PickRestriction:54 html/SelfService/Display.html:76 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:54 html/Ticket/Elements/ShowBasics:39 lib/RT/Tickets_Overlay.pm:1042
+msgid "Priority"
+msgstr "Prioridad"
+
+#: html/Admin/Elements/ModifyQueue:51 html/Admin/Queues/Modify.html:65
+msgid "Priority starts at"
+msgstr "La prioridad empieza en"
+
+#: etc/initialdata:25
+msgid "Privileged"
+msgstr "Privilegiado"
+
+#: html/Admin/Users/Modify.html:271 html/User/Prefs.html:163
+#. (loc_fuzzy($msg))
+msgid "Privileged status: %1"
+msgstr "Estado privilegiado: %1"
+
+#: html/Admin/Users/index.html:62
+msgid "Privileged users"
+msgstr "Usuarios privilegiados:"
+
+#: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
+msgid "Pseudogroup for internal use"
+msgstr "Pseudogrupo para uso interno"
+
+#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Elements/Quicksearch:29 html/Search/Elements/PickRestriction:46 html/SelfService/Create.html:35 html/SelfService/Display.html:68 html/Ticket/Create.html:38 html/Ticket/Elements/EditBasics:64 html/Ticket/Elements/ShowBasics:43 html/User/Elements/DelegateRights:80 lib/RT/Tickets_Overlay.pm:883
+msgid "Queue"
+msgstr "Cola"
+
+#: html/Admin/Queues/CustomField.html:42 html/Admin/Queues/Scrip.html:50 html/Admin/Queues/Scrips.html:46 html/Admin/Queues/Templates.html:43
+#. ($Queue)
+#. ($id)
+msgid "Queue %1 not found"
+msgstr "Cola %1 no encontrada"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue '%1' not found\\n"
+msgstr "Cola '%1' no encontrada\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Keyword Selections"
+msgstr "Selecciones de palabras clave de la cola"
+
+#: html/Admin/Elements/ModifyQueue:31 html/Admin/Queues/Modify.html:43
+msgid "Queue Name"
+msgstr "Nombre de la cola"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Scrips"
+msgstr "Acciones de la cola"
+
+#: lib/RT/Queue_Overlay.pm:263
+msgid "Queue already exists"
+msgstr "La cola ya existe"
+
+#: lib/RT/Queue_Overlay.pm:272 lib/RT/Queue_Overlay.pm:278
+msgid "Queue could not be created"
+msgstr "La cola no se pudo crear"
+
+#: html/Ticket/Create.html:209
+msgid "Queue could not be loaded."
+msgstr "La cola no se pudo cargar"
+
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:282
+msgid "Queue created"
+msgstr "Cola creada"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue is not specified."
+msgstr "No se especifico ninguna cola"
+
+#: html/SelfService/Display.html:129
+msgid "Queue not found"
+msgstr "Cola no encontrada"
+
+#: html/Admin/Elements/Tabs:38 html/Admin/index.html:35
+msgid "Queues"
+msgstr "Colas"
+
+#: html/Elements/Login:34
+#. ($RT::VERSION)
+msgid "RT %1"
+msgstr "RT %1"
+
+#: docs/design_docs/string-extraction-guide.txt:70
+#. ($RT::VERSION, $RT::rtname)
+msgid "RT %1 for %2"
+msgstr "RT %1 para %2"
+
+#: html/Elements/Footer:32
+#. ($RT::VERSION)
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr "RT %1 de <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1. Derechos reservados 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: html/Admin/index.html:25 html/Admin/index.html:26
+msgid "RT Administration"
+msgstr "Administración del RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Authentication error."
+msgstr "Error de autenticación en RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Bounce: %1"
+msgstr "Rechazo del RT: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Configuration error"
+msgstr "Error de configuración del RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Critical error. Message not recorded!"
+msgstr "Error crítico en RT. El mensaje no fue grabado!"
+
+#: html/Elements/Error:41 html/SelfService/Error.html:41
+msgid "RT Error"
+msgstr "Error del RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Received mail (%1) from itself."
+msgstr "RT recibió correo (%1) de sí mismo."
+
+#: NOT FOUND IN SOURCE
+msgid "RT Recieved mail (%1) from itself."
+msgstr "RT recibió correo (%1) de sí mismo."
+
+#: html/SelfService/Closed.html:25
+msgid "RT Self Service / Closed Tickets"
+msgstr "RT AutoServicio / Tickets cerrados"
+
+#: html/index.html:25 html/index.html:28
+msgid "RT at a glance"
+msgstr "RT en un vistazo"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't authenticate you"
+msgstr "RT no te pudo autenticar."
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find requestor via its external database lookup"
+msgstr "RT no pudo encontrar el solicitante a través de una busqueda a la base de datos externa"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find the queue: %1"
+msgstr "RT no pudo encontrar la cola: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't validate this PGP signature. \\n"
+msgstr "RT no pudo validar esta firma PGP. \\n"
+
+#: html/Elements/PageLayout:26
+#. ($RT::rtname)
+msgid "RT for %1"
+msgstr "RT para %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr "RT para %1: %2"
+
+#: NOT FOUND IN SOURCE
+msgid "RT has proccessed your commands"
+msgstr "RT ha procesado tus comandos"
+
+#: html/Elements/Login:83
+#. ('2003')
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT es &copy; Copyright 1996-%1 de Jesse Vincent &lt;jesse@bestpractical.com&gt;.  Es distrbuido bajo <a href=\"http://www.gnu.org/copyleft/gpl.html\">la version 2 de la licencia GNU GPL (General Public License)</a>."
+
+#: NOT FOUND IN SOURCE
+msgid "RT thinks this message may be a bounce"
+msgstr "RT cree que este mensaje puede ser un mensaje rebotado"
+
+#: NOT FOUND IN SOURCE
+msgid "RT will process this message as if it were unsigned.\\n"
+msgstr "RT procesará este mensaje como si fuera uno no firmado\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+msgstr "El modo de comandos por correo de RT requiere autenticación PGP. Ya sea que no haya firmado su mensaje, o que su firma no pueda ser verificada."
+
+#: html/Admin/Users/Modify.html:58 html/Admin/Users/Prefs.html:52 html/User/Prefs.html:44
+msgid "Real Name"
+msgstr "Nombre real"
+
+#: html/Admin/Elements/ModifyUser:48
+msgid "RealName"
+msgstr "Nombre real"
+
+#: html/Ticket/Create.html:185 html/Ticket/Elements/EditLinks:139 html/Ticket/Elements/EditLinks:94 html/Ticket/Elements/ShowLinks:63
+msgid "Referred to by"
+msgstr "Referenciado por"
+
+#: html/Elements/SelectLinkType:28 html/Ticket/Create.html:184 html/Ticket/Elements/EditLinks:135 html/Ticket/Elements/EditLinks:80 html/Ticket/Elements/ShowLinks:55
+msgid "Refers to"
+msgstr "Hace referencia a"
+
+#: NOT FOUND IN SOURCE
+msgid "RefersTo"
+msgstr "RefersTo"
+
+#: NOT FOUND IN SOURCE
+msgid "Refine"
+msgstr "Refinar"
+
+#: html/Search/Elements/PickRestriction:27
+msgid "Refine search"
+msgstr "Refinar la búsqueda"
+
+#: html/Elements/Refresh:36
+#. ($value/60)
+msgid "Refresh this page every %1 minutes."
+msgstr "Refrescar esta página cada %1 minutos"
+
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:60 html/Ticket/ModifyAll.html:57
+msgid "Relationships"
+msgstr "Relaciones"
+
+#: html/Search/Bulk.html:93
+msgid "Remove AdminCc"
+msgstr "Quitar AdminCc"
+
+#: html/Search/Bulk.html:91
+msgid "Remove Cc"
+msgstr "Quitar Cc"
+
+#: html/Search/Bulk.html:89
+msgid "Remove Requestor"
+msgstr "Quitar solicitante"
+
+#: html/Ticket/Elements/ShowTransaction:173 html/Ticket/Elements/Tabs:122
+msgid "Reply"
+msgstr "Responder"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "Reply to tickets"
+msgstr "Responder a los tickets"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "ReplyToTicket"
+msgstr "ReplyToTicket"
+
+#: etc/initialdata:44 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:87
+msgid "Requestor"
+msgstr "Solicitante"
+
+#: html/Search/Elements/PickRestriction:38
+msgid "Requestor email address"
+msgstr "Dirección de correo del solicitante"
+
+#: NOT FOUND IN SOURCE
+msgid "Requestor(s)"
+msgstr "Solicitante(s)"
+
+#: NOT FOUND IN SOURCE
+msgid "RequestorAddresses"
+msgstr "RequestorAddresses"
+
+#: html/SelfService/Create.html:43 html/SelfService/Display.html:42 html/Ticket/Create.html:56 html/Ticket/Elements/EditPeople:48 html/Ticket/Elements/ShowPeople:31
+msgid "Requestors"
+msgstr "Solicitantes"
+
+#: html/Admin/Elements/ModifyQueue:61 html/Admin/Queues/Modify.html:75
+msgid "Requests should be due in"
+msgstr "Las solicitudes entran en vencimiento en"
+
+#: html/Elements/Submit:62
+msgid "Reset"
+msgstr "Borrar"
+
+#: html/Admin/Users/Modify.html:159 html/User/Prefs.html:50
+msgid "Residence"
+msgstr "Residencia"
+
+#: html/Ticket/Elements/Tabs:132
+msgid "Resolve"
+msgstr "Resolver"
+
+#: html/Ticket/Update.html:133
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Resolve ticket #%1 (%2)"
+msgstr "Resolver ticket #%1 (%2)"
+
+#: etc/initialdata:302 html/Elements/SelectDateType:28 lib/RT/Ticket_Overlay.pm:1170
+msgid "Resolved"
+msgstr "Resuelto"
+
+#: html/Search/Bulk.html:123 html/Ticket/ModifyAll.html:73 html/Ticket/Update.html:73
+msgid "Response to requestors"
+msgstr "Responder a los solicitantes"
+
+#: html/Elements/ListActions:26
+msgid "Results"
+msgstr "Resultados"
+
+#: html/Search/Elements/PickRestriction:105
+msgid "Results per page"
+msgstr "Resultados por página"
+
+#: html/Admin/Elements/ModifyUser:33 html/Admin/Users/Modify.html:100 html/User/Prefs.html:72
+msgid "Retype Password"
+msgstr "Confirmar contraseña"
+
+#: NOT FOUND IN SOURCE
+msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+msgstr "Privilegio %1 no encontrado para %2 %3 referente a %4 (%5)\\n"
+
+#: lib/RT/ACE_Overlay.pm:613
+msgid "Right Delegated"
+msgstr "Privilegio delegado"
+
+#: lib/RT/ACE_Overlay.pm:303
+msgid "Right Granted"
+msgstr "Privilegio otorgado"
+
+#: lib/RT/ACE_Overlay.pm:161
+msgid "Right Loaded"
+msgstr "Privilegio cargado"
+
+#: lib/RT/ACE_Overlay.pm:678 lib/RT/ACE_Overlay.pm:693
+msgid "Right could not be revoked"
+msgstr "Privilegio no pudo ser revocado"
+
+#: html/User/Delegation.html:64
+msgid "Right not found"
+msgstr "Privilegio no encontrado"
+
+#: lib/RT/ACE_Overlay.pm:543 lib/RT/ACE_Overlay.pm:638
+msgid "Right not loaded."
+msgstr "Privilegio no cargado"
+
+#: lib/RT/ACE_Overlay.pm:689
+msgid "Right revoked"
+msgstr "Privilegio revocado"
+
+#: html/Admin/Elements/UserTabs:41
+msgid "Rights"
+msgstr "Privilegios"
+
+#: lib/RT/Interface/Web.pm:758
+#. ($object_type)
+msgid "Rights could not be granted for %1"
+msgstr "No se pudieron conceder los privilegios a %1"
+
+#: lib/RT/Interface/Web.pm:791
+#. ($object_type)
+msgid "Rights could not be revoked for %1"
+msgstr "No se pudieron revocar los privilegios de %1"
+
+#: html/Admin/Global/GroupRights.html:51 html/Admin/Queues/GroupRights.html:52
+msgid "Roles"
+msgstr "Roles"
+
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr "RootApproval"
+
+#: lib/RT/Date.pm:393
+msgid "Sat."
+msgstr "Sab."
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
+msgid "Save Changes"
+msgstr "Guardar Cambios"
+
+#: html/Ticket/ModifyLinks.html:39
+msgid "Save changes"
+msgstr "Guardar cambios"
+
+#: html/Admin/Global/Scrip.html:49
+#. ($ARGS{'id'})
+msgid "Scrip #%1"
+msgstr "Scrip #%1"
+
+#: lib/RT/Scrip_Overlay.pm:176
+msgid "Scrip Created"
+msgstr "Acción creada"
+
+#: html/Admin/Elements/EditScrips:84
+msgid "Scrip deleted"
+msgstr "Acción borrada"
+
+#: html/Admin/Elements/QueueTabs:46 html/Admin/Elements/SystemTabs:33 html/Admin/Global/index.html:41
+msgid "Scrips"
+msgstr "Acciones"
+
+#: NOT FOUND IN SOURCE
+msgid "Scrips for %1\\n"
+msgstr "Acciones para %1\\n"
+
+#: html/Admin/Queues/Scrips.html:33
+msgid "Scrips which apply to all queues"
+msgstr "Acciones que se aplican a todas las colas"
+
+#: html/Elements/SimpleSearch:27 html/Search/Elements/PickRestriction:126 html/Ticket/Elements/Tabs:159
+msgid "Search"
+msgstr "Búsqueda"
+
+#: NOT FOUND IN SOURCE
+msgid "Search Criteria"
+msgstr "Criterios de búsqueda"
+
+#: html/Approvals/Elements/PendingMyApproval:39
+msgid "Search for approvals"
+msgstr "Buscar aprobaciones"
+
+#: bin/rt-crontool:188
+msgid "Security:"
+msgstr "Seguridad:"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "SeeQueue"
+msgstr "Ver cola"
+
+#: html/Admin/Groups/index.html:40
+msgid "Select a group"
+msgstr "Seleccione un grupo"
+
+#: NOT FOUND IN SOURCE
+msgid "Select a queue"
+msgstr "Seleccione una cola"
+
+#: html/Admin/Users/index.html:25 html/Admin/Users/index.html:28
+msgid "Select a user"
+msgstr "Seleccione un usuario"
+
+#: html/Admin/Global/CustomField.html:38 html/Admin/Global/CustomFields.html:36
+msgid "Select custom field"
+msgstr "Seleccionar un campo personalizable"
+
+#: html/Admin/Elements/GroupTabs:52 html/User/Elements/GroupTabs:50
+msgid "Select group"
+msgstr "Seleccionar grupo"
+
+#: lib/RT/CustomField_Overlay.pm:355
+msgid "Select multiple values"
+msgstr "Seleccionar valores múltiples"
+
+#: lib/RT/CustomField_Overlay.pm:352
+msgid "Select one value"
+msgstr "Seleccionar un valor"
+
+#: html/Admin/Elements/QueueTabs:67
+msgid "Select queue"
+msgstr "Seleccionar cola"
+
+#: html/Admin/Global/Scrip.html:37 html/Admin/Global/Scrips.html:36 html/Admin/Queues/Scrip.html:40 html/Admin/Queues/Scrips.html:50
+msgid "Select scrip"
+msgstr "Seleccionar accion"
+
+#: html/Admin/Global/Template.html:57 html/Admin/Global/Templates.html:36 html/Admin/Queues/Template.html:55
+msgid "Select template"
+msgstr "Selecionar plantilla"
+
+#: html/Admin/Elements/UserTabs:49
+msgid "Select user"
+msgstr "Seleccionar usuario"
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "SelectMultiple"
+msgstr "SelectMultiple"
+
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectSingle"
+msgstr "SelectSingle"
+
+#: html/SelfService/index.html:25
+msgid "Self Service"
+msgstr "Autoservicio"
+
+#: etc/initialdata:114
+msgid "Send mail to all watchers"
+msgstr "Enviar mail a todos los observadores"
+
+#: etc/initialdata:110
+msgid "Send mail to all watchers as a \"comment\""
+msgstr "Enviar mail a todos los observadores como comentario"
+
+#: etc/initialdata:105
+msgid "Send mail to requestors and Ccs"
+msgstr "Enviar mail a los solicitantes y Ccs"
+
+#: etc/initialdata:100
+msgid "Send mail to requestors and Ccs as a comment"
+msgstr "Enviar mail a los solicitantes y Ccs como comentario"
+
+#: etc/initialdata:79
+msgid "Sends a message to the requestors"
+msgstr "Envia un mesaje a los solicitantes"
+
+#: etc/initialdata:118 etc/initialdata:122
+msgid "Sends mail to explicitly listed Ccs and Bccs"
+msgstr "Enviar mail a los Ccs y Bccs listados explicitamente"
+
+#: etc/initialdata:95
+msgid "Sends mail to the administrative Ccs"
+msgstr "Envia mail a los Ccs administrativos"
+
+#: etc/initialdata:91
+msgid "Sends mail to the administrative Ccs as a comment"
+msgstr "Envia mail a los Ccs administrativos como comentario"
+
+#: etc/initialdata:83 etc/initialdata:87
+msgid "Sends mail to the owner"
+msgstr "Enviar mail al propietario"
+
+#: lib/RT/Date.pm:419
+msgid "Sep."
+msgstr "Sep."
+
+#: NOT FOUND IN SOURCE
+msgid "September"
+msgstr "Septiembre"
+
+#: NOT FOUND IN SOURCE
+msgid "Show Results"
+msgstr "Mostrar resultados"
+
+#: html/Approvals/Elements/PendingMyApproval:44
+msgid "Show approved requests"
+msgstr "Mostrar peticiones aprobadas"
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show basics"
+msgstr "Mostrar lo básico"
+
+#: html/Approvals/Elements/PendingMyApproval:45
+msgid "Show denied requests"
+msgstr "Mostrar solicitudes denegadas"
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show details"
+msgstr "Mostrar detalles"
+
+#: html/Approvals/Elements/PendingMyApproval:43
+msgid "Show pending requests"
+msgstr "Mostrar solicitudes pendientes"
+
+#: html/Approvals/Elements/PendingMyApproval:46
+msgid "Show requests awaiting other approvals"
+msgstr "Mostrar solicitudes esperando otras aprobaciones"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "Show ticket private commentary"
+msgstr "Mostrar ticket en un comentario privado"
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "Show ticket summaries"
+msgstr "Mostrar resumen del ticket"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "ShowACL"
+msgstr "ShowACL"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "ShowScrips"
+msgstr "ShowScrips"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "ShowTemplate"
+msgstr "ShowTemplate"
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "ShowTicket"
+msgstr "ShowTicket"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "ShowTicketComments"
+msgstr "ShowTicketComments"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Sign up as a ticket Requestor or ticket or queue Cc"
+msgstr "Validarse como solicitante de ticket o ticket o cola Cc"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "Sign up as a ticket or queue AdminCc"
+msgstr "Validarse como ticket o cola AdminCc"
+
+#: html/Admin/Elements/ModifyUser:39 html/Admin/Users/Modify.html:191 html/Admin/Users/Prefs.html:32 html/SelfService/Prefs.html:37 html/User/Prefs.html:112
+msgid "Signature"
+msgstr "Firma"
+
+#: html/SelfService/Elements/Header:52
+#. ($session{'CurrentUser'}->Name)
+msgid "Signed in as %1"
+msgstr "Validado como %1"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:26
+msgid "Single"
+msgstr "Sencillo"
+
+#: html/Elements/Header:51
+msgid "Skip Menu"
+msgstr "Saltar Menu"
+
+#: html/Admin/Elements/EditCustomFieldValues:31
+msgid "Sort key"
+msgstr "Clave de ordenación"
+
+#: html/Search/Elements/PickRestriction:109
+msgid "Sort results by"
+msgstr "Ordenar resultados por"
+
+#: html/Admin/Elements/AddCustomFieldValue:25
+msgid "SortOrder"
+msgstr "Ordenamiento"
+
+#: NOT FOUND IN SOURCE
+msgid "Stalled"
+msgstr "Pendiente"
+
+#: NOT FOUND IN SOURCE
+msgid "Start page"
+msgstr "Página de inicio"
+
+#: html/Elements/SelectDateType:27 html/Ticket/Elements/EditDates:32 html/Ticket/Elements/ShowDates:35
+msgid "Started"
+msgstr "Empezado"
+
+#: NOT FOUND IN SOURCE
+msgid "Started date '%1' could not be parsed"
+msgstr "La fecha de inicio '%1' no se pudo leer"
+
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:27 html/Ticket/Elements/ShowDates:31
+msgid "Starts"
+msgstr "Empieza"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts By"
+msgstr "Empezado por"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts date '%1' could not be parsed"
+msgstr "La fecha de inicio '%1' no se pudo ser leer"
+
+#: html/Admin/Elements/ModifyUser:82 html/Admin/Users/Modify.html:138 html/User/Prefs.html:94
+msgid "State"
+msgstr "Estado"
+
+#: html/Elements/MyRequests:31 html/Elements/MyTickets:31 html/Search/Elements/PickRestriction:74 html/SelfService/Display.html:59 html/SelfService/Elements/MyRequests:29 html/SelfService/Update.html:31 html/Ticket/Create.html:42 html/Ticket/Elements/EditBasics:38 html/Ticket/Elements/ShowBasics:31 html/Ticket/Update.html:60 lib/RT/Ticket_Overlay.pm:1164 lib/RT/Tickets_Overlay.pm:908
+msgid "Status"
+msgstr "Estado"
+
+#: etc/initialdata:288
+msgid "Status Change"
+msgstr "Cambio de status"
+
+#: lib/RT/Transaction_Overlay.pm:530
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
+msgid "Status changed from %1 to %2"
+msgstr "Estado cambiado de %1 a %2"
+
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr "StatusChange"
+
+#: html/Ticket/Elements/Tabs:147
+msgid "Steal"
+msgstr "Robar"
+
+#: lib/RT/Transaction_Overlay.pm:589
+#. ($Old->Name)
+msgid "Stolen from %1 "
+msgstr "Robado de %1"
+
+#: html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Search/Bulk.html:126 html/Search/Elements/PickRestriction:43 html/SelfService/Create.html:59 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:35 html/Ticket/Create.html:84 html/Ticket/Elements/EditBasics:28 html/Ticket/ModifyAll.html:79 html/Ticket/Update.html:77 lib/RT/Ticket_Overlay.pm:1160 lib/RT/Tickets_Overlay.pm:987
+msgid "Subject"
+msgstr "Asunto"
+
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/Transaction_Overlay.pm:611
+#. ($self->Data)
+msgid "Subject changed to %1"
+msgstr "Asunto cambiado a %1"
+
+#: html/Elements/Submit:59
+msgid "Submit"
+msgstr "Enviar"
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr "Submit Workflow"
+
+#: lib/RT/Group_Overlay.pm:749
+msgid "Succeeded"
+msgstr "Completado"
+
+#: lib/RT/Date.pm:394
+msgid "Sun."
+msgstr "Dom."
+
+#: lib/RT/System.pm:54
+msgid "SuperUser"
+msgstr "Superusuario"
+
+#: html/User/Elements/DelegateRights:77
+msgid "System"
+msgstr "Sistema"
+
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:567 lib/RT/Interface/Web.pm:757 lib/RT/Interface/Web.pm:790
+msgid "System Error"
+msgstr "Error del sistema"
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. Right not granted."
+msgstr "Error de sistema. Derecho no concedido"
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. right not granted"
+msgstr "Error de sistema. Derecho no concedido"
+
+#: lib/RT/ACE_Overlay.pm:616
+msgid "System error. Right not delegated."
+msgstr "Error del sistema. Privilegio no delegado."
+
+#: lib/RT/ACE_Overlay.pm:146 lib/RT/ACE_Overlay.pm:223 lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:898
+msgid "System error. Right not granted."
+msgstr "Error del sistema. Privilegio no otorgado"
+
+#: NOT FOUND IN SOURCE
+msgid "System error. Unable to grant rights."
+msgstr "Error de sistema. Incapaz de conceder permisos"
+
+#: html/Admin/Global/GroupRights.html:35 html/Admin/Groups/GroupRights.html:37 html/Admin/Queues/GroupRights.html:36
+msgid "System groups"
+msgstr "Grupos del sistema"
+
+#: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
+msgid "SystemRolegroup for internal use"
+msgstr "SystemRolegroup for internal use"
+
+#: lib/RT/CurrentUser.pm:320
+msgid "TEST_STRING"
+msgstr "TEST_STRING"
+
+#: html/Ticket/Elements/Tabs:143
+msgid "Take"
+msgstr "Coger"
+
+#: lib/RT/Transaction_Overlay.pm:575
+msgid "Taken"
+msgstr "Cogido"
+
+#: html/Admin/Elements/EditScrip:81
+msgid "Template"
+msgstr "Plantilla"
+
+#: html/Admin/Global/Template.html:91 html/Admin/Queues/Template.html:90
+#. ($TemplateObj->Id())
+msgid "Template #%1"
+msgstr "Plantilla #%1"
+
+#: html/Admin/Elements/EditTemplates:89
+msgid "Template deleted"
+msgstr "Plantilla borrada"
+
+#: lib/RT/Scrip_Overlay.pm:153
+msgid "Template not found"
+msgstr "Plantilla no encontrada"
+
+#: NOT FOUND IN SOURCE
+msgid "Template not found\\n"
+msgstr "Plantilla no encontrada\\n"
+
+#: lib/RT/Template_Overlay.pm:347
+msgid "Template parsed"
+msgstr "Plantilla procesada"
+
+#: html/Admin/Elements/QueueTabs:49 html/Admin/Elements/SystemTabs:36 html/Admin/Global/index.html:45
+msgid "Templates"
+msgstr "Plantillas"
+
+#: NOT FOUND IN SOURCE
+msgid "Templates for %1\\n"
+msgstr "Plantillas de %1\\n"
+
+#: lib/RT/Interface/Web.pm:858
+msgid "That is already the current value"
+msgstr "Ese es el valor actual"
+
+#: lib/RT/CustomField_Overlay.pm:178
+msgid "That is not a value for this custom field"
+msgstr "Ese no es un valor para este campo personalizable"
+
+#: lib/RT/Ticket_Overlay.pm:1886
+msgid "That is the same value"
+msgstr "Este es el mismo valor"
+
+#: lib/RT/Queue_Overlay.pm:633
+#. ($args{'Type'})
+msgid "That principal is already a %1 for this queue"
+msgstr "Ese principal ya es un %1 para esta cola"
+
+#: lib/RT/Ticket_Overlay.pm:1434
+#. ($self->loc($args{'Type'}))
+msgid "That principal is already a %1 for this ticket"
+msgstr "Ese principal ya es un %1 para este ticket"
+
+#: lib/RT/Queue_Overlay.pm:732
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this queue"
+msgstr "Ese principal no es un %1 para esta cola"
+
+#: lib/RT/Ticket_Overlay.pm:1551
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this ticket"
+msgstr "Ese principal no es un %1 para este ticket"
+
+#: lib/RT/Ticket_Overlay.pm:1882
+msgid "That queue does not exist"
+msgstr "Esa cola no existe"
+
+#: lib/RT/Ticket_Overlay.pm:3143
+msgid "That ticket has unresolved dependencies"
+msgstr "Ese ticket tiene dependencias sin resolver"
+
+#: lib/RT/ACE_Overlay.pm:288 lib/RT/ACE_Overlay.pm:597
+msgid "That user already has that right"
+msgstr "Ese usuario ya tiene ese privilegio"
+
+#: lib/RT/Ticket_Overlay.pm:2952
+msgid "That user already owns that ticket"
+msgstr "Ese usuario ya posee ese ticket"
+
+#: lib/RT/Ticket_Overlay.pm:2918
+msgid "That user does not exist"
+msgstr "Ese usuario no existe"
+
+#: lib/RT/User_Overlay.pm:315
+msgid "That user is already privileged"
+msgstr "Ese usuario ya tiene privilegios"
+
+#: lib/RT/User_Overlay.pm:332
+msgid "That user is already unprivileged"
+msgstr "Ese usuario ya está sin privilegios"
+
+#: lib/RT/User_Overlay.pm:327
+msgid "That user is now privileged"
+msgstr "Ese usuario ahora tiene privilegios"
+
+#: lib/RT/User_Overlay.pm:344
+msgid "That user is now unprivileged"
+msgstr "Ese usuario ya no tiene privilegios"
+
+#: NOT FOUND IN SOURCE
+msgid "That user is now unprivilegedileged"
+msgstr "Este usuario ya no tiene privilegios"
+
+#: lib/RT/Ticket_Overlay.pm:2944
+msgid "That user may not own tickets in that queue"
+msgstr "Ese usuario puede no poseer tickets en esa cola"
+
+#: lib/RT/Link_Overlay.pm:206
+msgid "That's not a numerical id"
+msgstr "Ese no es un identificador numérico"
+
+#: html/Ticket/Create.html:150 html/Ticket/Elements/ShowSummary:28
+msgid "The Basics"
+msgstr "Lo básico"
+
+#: lib/RT/ACE_Overlay.pm:88
+msgid "The CC of a ticket"
+msgstr "El CC de un ticket"
+
+#: lib/RT/ACE_Overlay.pm:89
+msgid "The administrative CC of a ticket"
+msgstr "El CC administrativo de un ticket"
+
+#: lib/RT/Ticket_Overlay.pm:2213
+msgid "The comment has been recorded"
+msgstr "El comentario ha sido grabado"
+
+#: bin/rt-crontool:198
+msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
+msgstr "El siguiente comando encontrará todos los tickets activos en la cola 'general' y pondra su prioridad a 99 si no han sido tocados en 4 horas:"
+
+#: bin/rt-commit-handler:756 bin/rt-commit-handler:766
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr "Los siguientes comandos no han sido procesados:\\n\\n"
+
+#: lib/RT/Interface/Web.pm:861
+msgid "The new value has been set."
+msgstr "Ha sido establecido el nuevo valor"
+
+#: lib/RT/ACE_Overlay.pm:86
+msgid "The owner of a ticket"
+msgstr "El propietario de un ticket"
+
+#: lib/RT/ACE_Overlay.pm:87
+msgid "The requestor of a ticket"
+msgstr "El solicitante de un ticket"
+
+#: html/Admin/Elements/EditUserComments:26
+msgid "These comments aren't generally visible to the user"
+msgstr "Estos comentarios generalmente no están visibles para el usuario"
+
+#: NOT FOUND IN SOURCE
+msgid "This ticket %1 %2 (%3)\\n"
+msgstr "Este ticket %1 %2 (%3)"
+
+#: bin/rt-crontool:189
+msgid "This tool allows the user to run arbitrary perl modules from within RT."
+msgstr "Esta herramiento permite al usuario ejectutar modulos perl arbitrarios desde dentro de RT"
+
+#: lib/RT/Transaction_Overlay.pm:253
+msgid "This transaction appears to have no content"
+msgstr "Parece que esta transacción no tiene contenido"
+
+#: html/Ticket/Elements/ShowRequestor:47
+#. ($rows)
+msgid "This user's %1 highest priority tickets"
+msgstr "Los %1 tickets de mayor prioridad de este usuario"
+
+#: NOT FOUND IN SOURCE
+msgid "This user's 25 highest priority tickets"
+msgstr "Los 25 casos de mayor prioridad de este usuario"
+
+#: lib/RT/Date.pm:391
+msgid "Thu."
+msgstr "Jue."
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1  %2"
+msgstr "Ticket # %1  %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1 Jumbo update: %2"
+msgstr "Actualizacion Jumbo para el ticket # %1: %2"
+
+#: html/Ticket/ModifyAll.html:25 html/Ticket/ModifyAll.html:29
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket #%1 Jumbo update: %2"
+msgstr "Actualización Jumbo para el ticket #%1: %2"
+
+#: html/Approvals/Elements/ShowDependency:46
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Ticket #%1: %2"
+msgstr "Ticket #%1: %2"
+
+#: lib/RT/Ticket_Overlay.pm:608
+#. ($self->Id, $QueueObj->Name)
+msgid "Ticket %1 created in queue '%2'"
+msgstr "Ticket %1 creado en la cola '%2'"
+
+#: bin/rt-commit-handler:760
+#. ($Ticket->Id)
+msgid "Ticket %1 loaded\\n"
+msgstr "Ticket %1 cargado\\n"
+
+#: html/Search/Bulk.html:181
+#. ($Ticket->Id,$_)
+msgid "Ticket %1: %2"
+msgstr "Ticket %1: %2"
+
+#: html/Ticket/History.html:25 html/Ticket/History.html:28
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket History # %1 %2"
+msgstr "Historial del ticket # %1 %2"
+
+#: html/SelfService/Display.html:34
+msgid "Ticket Id"
+msgstr "Id del ticket:"
+
+#: etc/initialdata:303
+msgid "Ticket Resolved"
+msgstr "Ticket resuelto"
+
+#: html/Search/Elements/PickRestriction:63
+msgid "Ticket attachment"
+msgstr "Archivos adjuntos del ticket"
+
+#: lib/RT/Tickets_Overlay.pm:1166
+msgid "Ticket content"
+msgstr "Contenido del ticket"
+
+#: lib/RT/Tickets_Overlay.pm:1212
+msgid "Ticket content type"
+msgstr "Tipo de contenido del ticket"
+
+#: lib/RT/Ticket_Overlay.pm:495 lib/RT/Ticket_Overlay.pm:597
+msgid "Ticket could not be created due to an internal error"
+msgstr "No se pudo crear el ticket debido a un error interno"
+
+#: lib/RT/Transaction_Overlay.pm:522
+msgid "Ticket created"
+msgstr "Ticket creado"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket creation failed"
+msgstr "Creación del ticket fallida"
+
+#: lib/RT/Transaction_Overlay.pm:527
+msgid "Ticket deleted"
+msgstr "Ticket borrado"
+
+#: html/REST/1.0/modify:29 html/REST/1.0/update:34
+msgid "Ticket id not found"
+msgstr "Id de ticket no encontrada"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket killed"
+msgstr "Ticket matado"
+
+#: html/REST/1.0/modify:36 html/REST/1.0/update:41
+msgid "Ticket not found"
+msgstr "Ticket no encontrado"
+
+#: etc/initialdata:289
+msgid "Ticket status changed"
+msgstr "Estado del ticket cambiado"
+
+#: html/Ticket/Update.html:39
+msgid "Ticket watchers"
+msgstr "Observadores del ticket"
+
+#: html/Elements/Tabs:49
+msgid "Tickets"
+msgstr "Tickets"
+
+#: lib/RT/Tickets_Overlay.pm:1383
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr "Tickets %1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:1348
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr "Tickets %1 por %2"
+
+#: html/Elements/ViewUser:26
+#. ($name)
+msgid "Tickets from %1"
+msgstr "Tickets de %1"
+
+#: html/Approvals/Elements/ShowDependency:27
+msgid "Tickets which depend on this approval:"
+msgstr "Tickets que dependen de esta aprobación:"
+
+#: html/Ticket/Create.html:157 html/Ticket/Elements/EditBasics:48
+msgid "Time Left"
+msgstr "Tiempo Restante"
+
+#: html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:43
+msgid "Time Worked"
+msgstr "Tiempo Trabajado"
+
+#: lib/RT/Tickets_Overlay.pm:1139
+msgid "Time left"
+msgstr "Tiempo restante"
+
+#: html/Elements/Footer:36
+msgid "Time to display"
+msgstr "Tiempo para mostrar"
+
+#: lib/RT/Tickets_Overlay.pm:1115
+msgid "Time worked"
+msgstr "Tiempo trabajado"
+
+#: NOT FOUND IN SOURCE
+msgid "TimeLeft"
+msgstr "TimeLeft"
+
+#: lib/RT/Ticket_Overlay.pm:1165
+msgid "TimeWorked"
+msgstr "TimeWorked"
+
+#: bin/rt-commit-handler:402
+msgid "To generate a diff of this commit:"
+msgstr "Para generar una comparación de este cometido:"
+
+#: bin/rt-commit-handler:391
+msgid "To generate a diff of this commit:\\n"
+msgstr "Para generar una comparación de este cometido:\\n"
+
+#: lib/RT/Ticket_Overlay.pm:1168
+msgid "Told"
+msgstr "Última actualización"
+
+#: etc/initialdata:237
+msgid "Transaction"
+msgstr "Transacción"
+
+#: lib/RT/Transaction_Overlay.pm:642
+#. ($self->Data)
+msgid "Transaction %1 purged"
+msgstr "Transacción %1 limpiada"
+
+#: lib/RT/Transaction_Overlay.pm:177
+msgid "Transaction Created"
+msgstr "Transacción creada"
+
+#: lib/RT/Transaction_Overlay.pm:89
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr "Transaction->Create no pudo, ya no no especificó un ID de ticket"
+
+#: lib/RT/Transaction_Overlay.pm:701
+msgid "Transactions are immutable"
+msgstr "Las transacciones son inmutables"
+
+#: NOT FOUND IN SOURCE
+msgid "Trying to delete a right: %1"
+msgstr "Intentando borrar el privilegio: %1"
+
+#: lib/RT/Date.pm:389
+msgid "Tue."
+msgstr "Mar."
+
+#: html/Admin/Elements/EditCustomField:34 html/Ticket/Elements/AddWatchers:33 html/Ticket/Elements/AddWatchers:44 html/Ticket/Elements/AddWatchers:54 lib/RT/Ticket_Overlay.pm:1166 lib/RT/Tickets_Overlay.pm:959
+msgid "Type"
+msgstr "Tipo"
+
+#: lib/RT/ScripCondition_Overlay.pm:104
+msgid "Unimplemented"
+msgstr "No implementado"
+
+#: html/Admin/Users/Modify.html:68
+msgid "Unix login"
+msgstr "Usuario en Unix"
+
+#: html/Admin/Elements/ModifyUser:62
+msgid "UnixUsername"
+msgstr "Usuario en Unix"
+
+#: lib/RT/Attachment_Overlay.pm:265
+#. ($self->ContentEncoding)
+msgid "Unknown ContentEncoding %1"
+msgstr "Codificación de contenido desconocida: %1"
+
+#: html/Elements/SelectResultsPerPage:37
+msgid "Unlimited"
+msgstr "Ilimitado"
+
+#: etc/initialdata:32
+msgid "Unprivileged"
+msgstr "No privilegiado"
+
+#: lib/RT/Transaction_Overlay.pm:571
+msgid "Untaken"
+msgstr "No cogido"
+
+#: html/Elements/MyTickets:64 html/Search/Bulk.html:33
+msgid "Update"
+msgstr "Actualizar"
+
+#: html/Admin/Users/Prefs.html:62
+msgid "Update ID"
+msgstr "Id de actualización"
+
+#: html/Search/Bulk.html:120 html/Ticket/ModifyAll.html:66 html/Ticket/Update.html:67
+msgid "Update Type"
+msgstr "Tipo de actualización"
+
+#: html/Search/Listing.html:61
+msgid "Update all these tickets at once"
+msgstr "Actualizar todos estos casos al mismo tiempo"
+
+#: html/Admin/Users/Prefs.html:49
+msgid "Update email"
+msgstr "Actualizar correo"
+
+#: html/Admin/Users/Prefs.html:55
+msgid "Update name"
+msgstr "Actualizar nombre"
+
+#: lib/RT/Interface/Web.pm:375
+msgid "Update not recorded."
+msgstr "Actualización no grabada."
+
+#: html/Search/Bulk.html:81
+msgid "Update selected tickets"
+msgstr "Actualizar tickets seleccionados"
+
+#: html/Admin/Users/Prefs.html:36
+msgid "Update signature"
+msgstr "Actualizar firma"
+
+#: html/Ticket/ModifyAll.html:63
+msgid "Update ticket"
+msgstr "Actualizar ticket"
+
+#: html/SelfService/Update.html:25 html/SelfService/Update.html:27
+#. ($Ticket->id)
+msgid "Update ticket # %1"
+msgstr "Actualización de ticket # %1"
+
+#: html/SelfService/Update.html:50
+#. ($Ticket->id)
+msgid "Update ticket #%1"
+msgstr "Actualizar ticket #%1"
+
+#: html/Ticket/Update.html:135
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Update ticket #%1 (%2)"
+msgstr "Actualizar ticket #%1 (%2)"
+
+#: lib/RT/Interface/Web.pm:373
+msgid "Update type was neither correspondence nor comment."
+msgstr "El tipo de actualización no fue ni respuesta ni comentario"
+
+#: html/Elements/SelectDateType:33 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1169
+msgid "Updated"
+msgstr "Actualizado"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 %2: %3\\n"
+msgstr "Usuario %1 %2: %3\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 Password: %2\\n"
+msgstr "Usuario %1 Contraseña: %2\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found"
+msgstr "Usuario '%1' no encontrado"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found\\n"
+msgstr "Usuario '%1' no encontrado\\n"
+
+#: etc/initialdata:125 etc/initialdata:191
+msgid "User Defined"
+msgstr "Definido por el usuario"
+
+#: html/Admin/Users/Prefs.html:59
+msgid "User ID"
+msgstr "ID de usuario"
+
+#: html/Elements/SelectUsers:26
+msgid "User Id"
+msgstr "Id de usuario"
+
+#: html/Admin/Elements/GroupTabs:47 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/SystemTabs:47 html/Admin/Global/index.html:59
+msgid "User Rights"
+msgstr "Privilegios de usuario"
+
+#: html/Admin/Users/Modify.html:226
+#. ($msg)
+msgid "User could not be created: %1"
+msgstr "El usuario no pudo ser creado: %1"
+
+#: lib/RT/User_Overlay.pm:262
+msgid "User created"
+msgstr "Usuario creado"
+
+#: html/Admin/Global/GroupRights.html:67 html/Admin/Groups/GroupRights.html:54 html/Admin/Queues/GroupRights.html:68
+msgid "User defined groups"
+msgstr "Grupos definidos por el usuario"
+
+#: NOT FOUND IN SOURCE
+msgid "User notified"
+msgstr "Usuario notificado"
+
+#: html/Admin/Users/Prefs.html:25 html/Admin/Users/Prefs.html:29
+msgid "User view"
+msgstr "Vista de usuario"
+
+#: html/Admin/Users/Modify.html:48 html/Elements/Login:42 html/Ticket/Elements/AddWatchers:35
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#: html/Admin/Elements/SelectNewGroupMembers:26 html/Admin/Elements/Tabs:32 html/Admin/Groups/Members.html:55 html/Admin/Queues/People.html:68 html/Admin/index.html:29 html/User/Groups/Members.html:58
+msgid "Users"
+msgstr "Usuarios"
+
+#: html/Admin/Users/index.html:65
+msgid "Users matching search criteria"
+msgstr "Usuarios que concuerdan con los criterios de búsqueda"
+
+#: html/Search/Elements/PickRestriction:51
+msgid "ValueOfQueue"
+msgstr "Valor de la cola"
+
+#: html/Admin/Elements/EditCustomField:40
+msgid "Values"
+msgstr "Valores"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Watch"
+msgstr "Observar"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "WatchAsAdminCc"
+msgstr "WatchAsAdminCc"
+
+#: NOT FOUND IN SOURCE
+msgid "Watcher loaded"
+msgstr "Observador cargado"
+
+#: html/Admin/Elements/QueueTabs:42
+msgid "Watchers"
+msgstr "Observadores"
+
+#: html/Admin/Elements/ModifyUser:56
+msgid "WebEncoding"
+msgstr "Codificación de Web"
+
+#: lib/RT/Date.pm:390
+msgid "Wed."
+msgstr "Mie."
+
+#: etc/upgrade/2.1.71:161
+msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
+msgstr "Cuando un ticket ha sido aprobado por todos los aprobadores, añadir correspondencia al ticket original"
+
+#: etc/upgrade/2.1.71:135
+msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
+msgstr "Cuando un ticket ha sido aprobado por cualquier aprobador, añadir correspondencia al ticket original"
+
+#: etc/initialdata:138
+msgid "When a ticket is created"
+msgstr "Cuando un ticket se crea"
+
+#: etc/upgrade/2.1.71:79
+msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
+msgstr "Cuando una aprobacion de ticket se crea, notifica al propietario y AdminCC del item que espera su aprobación"
+
+#: etc/initialdata:143
+msgid "When anything happens"
+msgstr "Cuando pasa cualquier cosa"
+
+#: etc/initialdata:184
+msgid "Whenever a ticket is resolved"
+msgstr "Siempre que un ticket este sin resolver"
+
+#: etc/initialdata:170
+msgid "Whenever a ticket's owner changes"
+msgstr "Siempre que el propietario de un ticket cambie"
+
+#: etc/initialdata:178
+msgid "Whenever a ticket's queue changes"
+msgstr "Siempre que la cola de un ticket cambie"
+
+#: etc/initialdata:162
+msgid "Whenever a ticket's status changes"
+msgstr "Siempre que el estado de un ticket cambie"
+
+#: etc/initialdata:192
+msgid "Whenever a user-defined condition occurs"
+msgstr "Siempre que ocurra una condicion definida por el usuario"
+
+#: etc/initialdata:156
+msgid "Whenever comments come in"
+msgstr "Siempre que venga algun comentario"
+
+#: etc/initialdata:149
+msgid "Whenever correspondence comes in"
+msgstr "Siempre que venga correspondencia"
+
+#: html/Admin/Users/Modify.html:164 html/User/Prefs.html:52
+msgid "Work"
+msgstr "Trabajo"
+
+#: html/Admin/Elements/ModifyUser:70
+msgid "WorkPhone"
+msgstr "Tel Trabajo"
+
+#: html/SelfService/Display.html:86 html/Ticket/Elements/ShowBasics:35 html/Ticket/Update.html:65
+msgid "Worked"
+msgstr "Trabajado"
+
+#: lib/RT/Ticket_Overlay.pm:3056
+msgid "You already own this ticket"
+msgstr "Usted ya es propietario de este caso"
+
+#: html/autohandler:121
+msgid "You are not an authorized user"
+msgstr "Usted no es un usuario autorizado"
+
+#: lib/RT/Ticket_Overlay.pm:2930
+msgid "You can only reassign tickets that you own or that are unowned"
+msgstr "Usted solo puede reasignar casos que posee o que no posee nadie³"
+
+#: NOT FOUND IN SOURCE
+msgid "You don't have permission to view that ticket.\\n"
+msgstr "No tiene permiso para ver ese ticket.\\n"
+
+#: docs/design_docs/string-extraction-guide.txt:47
+#. ($num, $queue)
+msgid "You found %1 tickets in queue %2"
+msgstr "Usted encontró %1 casos en la cola %2"
+
+#: html/NoAuth/Logout.html:31 html/REST/1.0/logout:25
+msgid "You have been logged out of RT."
+msgstr "Se ha desconectado del sistema RT"
+
+#: html/SelfService/Display.html:134
+msgid "You have no permission to create tickets in that queue."
+msgstr "No tiene permiso para crear tickets en esa cola."
+
+#: lib/RT/Ticket_Overlay.pm:1895
+msgid "You may not create requests in that queue."
+msgstr "No puede crear solicitudes en esa cola."
+
+#: html/NoAuth/Logout.html:36
+msgid "You're welcome to login again"
+msgstr "Es bienvenido a regresar en cualquier momento."
+
+#: html/SelfService/Elements/MyRequests:25
+#. ($friendly_status)
+msgid "Your %1 requests"
+msgstr "Sus solicitudes %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
+msgstr "Su administrador del RT ha desconfigurado el alias de correo que invoca el RT"
+
+#: etc/initialdata:429 etc/upgrade/2.1.71:146
+msgid "Your request has been approved by %1. Other approvals may still be pending."
+msgstr "Su petición ha sido aprobada por %1. Otras aprobaciones pueden estar pendientes todavia"
+
+#: etc/initialdata:463 etc/upgrade/2.1.71:180
+msgid "Your request has been approved."
+msgstr "Su peticion ha sido aprobada."
+
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr "Su petición ha sido rechazada"
+
+#: etc/initialdata:384 etc/upgrade/2.1.71:101
+msgid "Your request was rejected."
+msgstr "Su petición ha sido rechazada"
+
+#: html/autohandler:136 html/autohandler:142
+msgid "Your username or password is incorrect"
+msgstr "Nombre o contraseña de usuario incorrectos"
+
+#: html/Admin/Elements/ModifyUser:84 html/Admin/Users/Modify.html:144 html/User/Prefs.html:96
+msgid "Zip"
+msgstr "Zip"
+
+#: NOT FOUND IN SOURCE
+msgid "[no subject]"
+msgstr "[sin asunto]"
+
+#: html/User/Elements/DelegateRights:59
+#. ($right->PrincipalObj->Object->SelfDescription)
+msgid "as granted to %1"
+msgstr "como priviligiado para %1"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:34
+msgid "contains"
+msgstr "contiene"
+
+#: html/Elements/SelectAttachmentField:26
+msgid "content"
+msgstr "contenido"
+
+#: html/Elements/SelectAttachmentField:27
+msgid "content-type"
+msgstr "content-type"
+
+#: lib/RT/Ticket_Overlay.pm:2282
+msgid "correspondence (probably) not sent"
+msgstr "Respuesta (probablemente) no enviada"
+
+#: lib/RT/Ticket_Overlay.pm:2292
+msgid "correspondence sent"
+msgstr "Correspondencia enviada"
+
+#: html/Admin/Elements/ModifyQueue:63 html/Admin/Queues/Modify.html:77 lib/RT/Date.pm:319
+msgid "days"
+msgstr "días"
+
+#: NOT FOUND IN SOURCE
+msgid "dead"
+msgstr "muerto"
+
+#: html/Search/Listing.html:75
+msgid "delete"
+msgstr "borrar"
+
+#: lib/RT/Queue_Overlay.pm:63
+msgid "deleted"
+msgstr "borrado"
+
+#: html/Search/Elements/PickRestriction:68
+msgid "does not match"
+msgstr "no coincide"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:35
+msgid "doesn't contain"
+msgstr "no contiene"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "equal to"
+msgstr "igual a"
+
+#: NOT FOUND IN SOURCE
+msgid "false"
+msgstr "falso"
+
+#: html/Elements/SelectAttachmentField:28
+msgid "filename"
+msgstr "nombre de archivo"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "greater than"
+msgstr "mayor que"
+
+#: lib/RT/Group_Overlay.pm:194
+#. ($self->Name)
+msgid "group '%1'"
+msgstr "grupo '%1'"
+
+#: lib/RT/Date.pm:315
+msgid "hours"
+msgstr "horas"
+
+#: NOT FOUND IN SOURCE
+msgid "id"
+msgstr "id"
+
+#: html/Elements/SelectBoolean:32 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88
+msgid "is"
+msgstr "es"
+
+#: html/Elements/SelectBoolean:36 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:37 html/Search/Elements/PickRestriction:48 html/Search/Elements/PickRestriction:77 html/Search/Elements/PickRestriction:89
+msgid "isn't"
+msgstr "no es"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "less than"
+msgstr "menor que"
+
+#: html/Search/Elements/PickRestriction:67
+msgid "matches"
+msgstr "contiene"
+
+#: lib/RT/Date.pm:311
+msgid "min"
+msgstr "min"
+
+#: html/Ticket/Update.html:66
+msgid "minutes"
+msgstr "minutos"
+
+#: bin/rt-commit-handler:765
+msgid "modifications\\n\\n"
+msgstr "modificaciones\\n\\n"
+
+#: lib/RT/Date.pm:327
+msgid "months"
+msgstr "meses"
+
+#: lib/RT/Queue_Overlay.pm:58
+msgid "new"
+msgstr "nuevo"
+
+#: html/Admin/Elements/EditScrips:43
+msgid "no value"
+msgstr "sin valor"
+
+#: html/Ticket/Elements/EditWatchers:28
+msgid "none"
+msgstr "ninguno"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "not equal to"
+msgstr "no igual a"
+
+#: NOT FOUND IN SOURCE
+msgid "notlike"
+msgstr "notlike"
+
+#: lib/RT/Queue_Overlay.pm:59
+msgid "open"
+msgstr "abierto"
+
+#: lib/RT/Group_Overlay.pm:199
+#. ($self->Name, $user->Name)
+msgid "personal group '%1' for user '%2'"
+msgstr "grupo personal '%1' para usuario '%2'"
+
+#: lib/RT/Group_Overlay.pm:207
+#. ($queue->Name, $self->Type)
+msgid "queue %1 %2"
+msgstr "Cola %1 %2"
+
+#: lib/RT/Queue_Overlay.pm:62
+msgid "rejected"
+msgstr "rechazado"
+
+#: lib/RT/Queue_Overlay.pm:61
+msgid "resolved"
+msgstr "resuelto"
+
+#: lib/RT/Date.pm:307
+msgid "sec"
+msgstr "sec"
+
+#: lib/RT/Queue_Overlay.pm:60
+msgid "stalled"
+msgstr "pendiente"
+
+#: lib/RT/Group_Overlay.pm:202
+#. ($self->Type)
+msgid "system %1"
+msgstr "sistema %1"
+
+#: lib/RT/Group_Overlay.pm:213
+#. ($self->Type)
+msgid "system group '%1'"
+msgstr "grupo del sistema '%1'"
+
+#: html/Elements/Error:42 html/SelfService/Error.html:42
+msgid "the calling component did not specify why"
+msgstr "el componente que llama no especifica por qué"
+
+#: lib/RT/Group_Overlay.pm:210
+#. ($self->Instance, $self->Type)
+msgid "ticket #%1 %2"
+msgstr "ticket #%1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "true"
+msgstr "verdadero"
+
+#: lib/RT/Group_Overlay.pm:216
+#. ($self->Id)
+msgid "undescribed group %1"
+msgstr "grupo sin descripción %1"
+
+#: NOT FOUND IN SOURCE
+msgid "undescripbed group %1"
+msgstr "grupo sin descripción %1"
+
+#: lib/RT/Group_Overlay.pm:191
+#. ($user->Object->Name)
+msgid "user %1"
+msgstr "usuario %1"
+
+#: lib/RT/Date.pm:323
+msgid "weeks"
+msgstr "semanas"
+
+#: NOT FOUND IN SOURCE
+msgid "with template %1"
+msgstr "con plantilla %1"
+
+#: lib/RT/Date.pm:331
+msgid "years"
+msgstr "años"
+
diff --git a/rt/lib/RT/I18N/fi.po b/rt/lib/RT/I18N/fi.po
new file mode 100644
index 000000000..ee1ad71f9
--- /dev/null
+++ b/rt/lib/RT/I18N/fi.po
@@ -0,0 +1,4750 @@
+# Finnish localization catalog for Request Tracker (RT)
+# First Author: Janne Pirkkanen <jp@oppipoika.net>, Jul 2002
+msgid ""
+msgstr ""
+"Project-Id-Version: RT 2.1.x\n"
+"POT-Creation-Date: 2002-07-08 17:41+0200\n"
+"PO-Revision-Date: 2002-07-09 18:09+0200\n"
+"Last-Translator: Janne Pirkkanen <jp@oppipoika.net>\n"
+"Language-Team: Finnish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: html/Elements/MyRequests:28 html/Elements/MyTickets:28
+msgid "#"
+msgstr ""
+
+#: html/Admin/Queues/Scrip.html:55
+#. ($QueueObj->id)
+msgid "#%1"
+msgstr ""
+
+#: html/Approvals/Elements/ShowDependency:50 html/Ticket/Display.html:26 html/Ticket/Display.html:30
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "#%1: %2"
+msgstr ""
+
+#: lib/RT/Date.pm:337
+#. ($s, $time_unit)
+msgid "%1 %2"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:771
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr ""
+
+#: lib/RT/Date.pm:373
+#. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
+msgid "%1 %2 %3 %4:%5:%6 %7"
+msgstr "%1 %3.%2 %7 %4:%5:%6"
+
+#: lib/RT/Ticket_Overlay.pm:3438 lib/RT/Transaction_Overlay.pm:559 lib/RT/Transaction_Overlay.pm:601
+#. ($cf->Name, $new_value->Content)
+#. ($field, $self->NewValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 added"
+msgstr ""
+
+#: lib/RT/Date.pm:334
+#. ($s, $time_unit)
+msgid "%1 %2 ago"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3444 lib/RT/Transaction_Overlay.pm:566
+#. ($cf->Name, $old_value, $new_value->Content)
+#. ($field, $self->OldValue, $self->NewValue)
+msgid "%1 %2 changed to %3"
+msgstr "%1: %2 muutettu arvoon %3"
+
+#: lib/RT/Ticket_Overlay.pm:3441 lib/RT/Transaction_Overlay.pm:562 lib/RT/Transaction_Overlay.pm:607
+#. ($cf->Name, $old_value)
+#. ($field, $self->OldValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 deleted"
+msgstr ""
+
+#: html/Admin/Elements/EditScrips:44 html/Admin/Elements/ListGlobalScrips:28
+#. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
+msgid "%1 %2 with template %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 this ticket\\n"
+msgstr "%1 (%2) %3 tässä työpyynnössä\\n"
+
+#: html/Search/Listing.html:57
+#. (($session{'tickets'}->FirstRow+1), ($session{'tickets'}->FirstRow() + $session{'tickets'}->RowsPerPage()  ))
+msgid "%1 - %2 shown"
+msgstr ""
+
+#: bin/rt-crontool:169 bin/rt-crontool:176 bin/rt-crontool:182
+#. ("--search-argument", "--search")
+#. ("--condition-argument", "--condition")
+#. ("--action-argument", "--action")
+msgid "%1 - An argument to pass to %2"
+msgstr ""
+
+#: bin/rt-crontool:185
+#. ("--verbose")
+msgid "%1 - Output status updates to STDOUT"
+msgstr ""
+
+#: bin/rt-crontool:179
+#. ("--action")
+msgid "%1 - Specify the action module you want to use"
+msgstr ""
+
+#: bin/rt-crontool:173
+#. ("--condition")
+msgid "%1 - Specify the condition module you want to use"
+msgstr ""
+
+#: bin/rt-crontool:166
+#. ("--search")
+msgid "%1 - Specify the search module you want to use"
+msgstr ""
+
+#: lib/RT/ScripAction_Overlay.pm:122
+#. ($self->Id)
+msgid "%1 ScripAction loaded"
+msgstr "ScriptAction %1 ladattu"
+
+#: lib/RT/Ticket_Overlay.pm:3471
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 added as a value for %2"
+msgstr "%1 lisätty arvoksi %2lle"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on"
+msgstr "%1 aliakset vaativat työpyynnön id:n"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on "
+msgstr "%1 aliakset vaativat työpyynnön id:n "
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on (from %2) %3"
+msgstr "%1 aliakset vaativat työpyynnön id:n (osoite %2) %3"
+
+#: lib/RT/Link_Overlay.pm:117 lib/RT/Link_Overlay.pm:124
+#. ($args{'Base'})
+#. ($args{'Target'})
+msgid "%1 appears to be a local object, but can't be found in the database"
+msgstr ""
+
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:483
+#. ($self->BriefDescription , $self->CreatorObj->Name)
+#. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
+msgid "%1 by %2"
+msgstr "%1 - %2"
+
+#: lib/RT/Transaction_Overlay.pm:537 lib/RT/Transaction_Overlay.pm:626 lib/RT/Transaction_Overlay.pm:635 lib/RT/Transaction_Overlay.pm:638
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
+#. ($self->Field , $q1->Name , $q2->Name)
+#. ($self->Field, $t2->AsString, $t1->AsString)
+#. ($self->Field, $self->OldValue, $self->NewValue)
+msgid "%1 changed from %2 to %3"
+msgstr "%1 muutettu arvosta %2 arvoon %3"
+
+#: lib/RT/Interface/Web.pm:857
+msgid "%1 could not be set to %2."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 couldn't init a transaction (%2)\\n"
+msgstr "%1 ei voinut suorittaa toimintoa (%2)\\n"
+
+#: lib/RT/Ticket_Overlay.pm:2813
+#. ($self)
+msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
+msgstr "%1 ei voinut asettaa tilan arvoa päätetyksi. RT:n tietokanta saattaa olla vioittunut."
+
+#: html/Elements/MyTickets:25
+#. ($rows)
+msgid "%1 highest priority tickets I own..."
+msgstr ""
+
+#: html/Elements/MyRequests:25
+#. ($rows)
+msgid "%1 highest priority tickets I requested..."
+msgstr ""
+
+#: bin/rt-crontool:161
+#. ($0)
+msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:743
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this queue."
+msgstr "%1 ei ole enää %2 tälle työjonolle"
+
+#: lib/RT/Ticket_Overlay.pm:1570
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this ticket."
+msgstr "%1 ei ole enää %2 tälle työpyynnölle"
+
+#: lib/RT/Ticket_Overlay.pm:3527
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 is no longer a value for custom field %2"
+msgstr "%1 ei ole enää kentän %2 arvo"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 isn't a valid Queue id."
+msgstr "%1 ei ole kelvollinen työjonon id"
+
+#: html/Ticket/Elements/ShowBasics:36
+#. ($TimeWorked)
+msgid "%1 min"
+msgstr "%1 min"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 not shown"
+msgstr "%1 ei näy"
+
+#: html/User/Elements/DelegateRights:76
+#. (loc($ObjectType =~ /^RT::(.*)$/))
+msgid "%1 rights"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 succeeded\\n"
+msgstr "%1 onnistui\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for $MessageId"
+msgstr "%1 tyyppi tuntematon viestille $MessageId"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for %2"
+msgstr "%1 tyyppi tuntematon viestille %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 was created without a CurrentUser\\n"
+msgstr ""
+
+#: lib/RT/Action/ResolveMembers.pm:42
+#. (ref $self)
+msgid "%1 will resolve all members of a resolved group ticket."
+msgstr "%1 päättää kaikki päätetyt työpyynnöt -ryhmän työpyynnöt."
+
+#: NOT FOUND IN SOURCE
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr "%1 jäädyttää [paikallisen] BASE jos se riippuu linkitetystä työpyynnöstä [tai on sen jäsen]."
+
+#: lib/RT/Transaction_Overlay.pm:435
+#. ($self)
+msgid "%1: no attachment specified"
+msgstr "%1: liitetiedostoa ei ole määritelty"
+
+#: html/Ticket/Elements/ShowTransaction:102
+#. ($size)
+msgid "%1b"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransaction:99
+#. (int($size/102.4)/10)
+msgid "%1k"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1140
+#. ($args{'Status'})
+msgid "'%1' is an invalid value for status"
+msgstr "'%1' ei kelpaa tilan arvoksi"
+
+#: NOT FOUND IN SOURCE
+msgid "'%1' not a recognized action. "
+msgstr "'%1' ei ole tunnettu tapahtuma."
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete group member)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete scrip)"
+msgstr "(Rastita laatikko poistaaksesi skriptin)"
+
+#: html/Admin/Elements/EditQueueWatchers:29 html/Admin/Elements/EditScrips:35 html/Admin/Elements/EditTemplates:36 html/Admin/Groups/Members.html:52 html/Ticket/Elements/EditLinks:33 html/Ticket/Elements/EditPeople:46 html/User/Groups/Members.html:55
+msgid "(Check box to delete)"
+msgstr "(Rastita laatikko poistaaksesi)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check boxes to delete)"
+msgstr ""
+
+#: html/Ticket/Create.html:178
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr "(Syötä työpyynnön numerot tai www-osoitteet, välilyönneillä erotettuina)"
+
+#: html/Admin/Queues/Modify.html:54 html/Admin/Queues/Modify.html:60
+#. ($RT::CorrespondAddress)
+#. ($RT::CommentAddress)
+msgid "(If left blank, will default to %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(No Value)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:33 html/Admin/Elements/ListGlobalCustomFields:32
+msgid "(No custom fields)"
+msgstr ""
+
+#: html/Admin/Groups/Members.html:50 html/User/Groups/Members.html:53
+msgid "(No members)"
+msgstr "(Ei jäseniä)"
+
+#: html/Admin/Elements/EditScrips:32 html/Admin/Elements/ListGlobalScrips:32
+msgid "(No scrips)"
+msgstr "(Ei skriptejä)"
+
+#: html/Admin/Elements/EditTemplates:31
+msgid "(No templates)"
+msgstr ""
+
+#: html/Ticket/Update.html:85
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(Lähettää piilokopion tästä päivityksestä pilkulla erotettuihin sähköpostiosoitteisiin. <b>Ei muuta</b> jatkossa tehtävien lähetysten kohteita.)"
+
+#: html/Ticket/Create.html:79
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
+msgstr ""
+
+#: html/Ticket/Update.html:81
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(Lähettää kopion tästä päivityksestä pilkulla erotettuihin sähköpostiosoitteisiin. <b>Ei muuta</b> jatkossa tehtävien lähetysten kohteita.)"
+
+#: html/Ticket/Create.html:69
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
+msgstr ""
+
+#: html/Admin/Groups/index.html:33 html/User/Groups/index.html:33
+msgid "(empty)"
+msgstr "(tyhjä)"
+
+#: html/Admin/Users/index.html:39
+msgid "(no name listed)"
+msgstr ""
+
+#: html/Elements/MyRequests:43 html/Elements/MyTickets:45
+msgid "(no subject)"
+msgstr "(ei otsikkoa)"
+
+#: html/Admin/Elements/SelectRights:48 html/Elements/SelectCustomFieldValue:30 html/Ticket/Elements/EditCustomField:59 html/Ticket/Elements/ShowCustomFields:36 lib/RT/Transaction_Overlay.pm:536
+msgid "(no value)"
+msgstr "(ei arvoa)"
+
+#: html/Ticket/Elements/EditLinks:116
+msgid "(only one ticket)"
+msgstr "(vain yksi työpyyntö)"
+
+#: html/Elements/MyRequests:52 html/Elements/MyTickets:55
+msgid "(pending approval)"
+msgstr ""
+
+#: html/Elements/MyRequests:54 html/Elements/MyTickets:57
+msgid "(pending other tickets)"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:50
+msgid "(required)"
+msgstr "(pakollinen)"
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "(untitled)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr "25 omistamaani korkeimpien prioriteettien työpyyntöä..."
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr "25 tilaamaani korkeimman prioriteetin työpyyntöä..."
+
+#: html/Ticket/Elements/ShowBasics:32
+msgid "<% $Ticket->Status%>"
+msgstr ""
+
+#: html/Elements/SelectTicketTypes:27
+msgid "<% $_ %>"
+msgstr ""
+
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:26
+#. ($m->scomp('/Elements/SelectNewTicketQueue'))
+msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
+msgstr "<input type=\"submit\" value=\"Uusi työpyyntö\">&nbsp;%1"
+
+#: etc/initialdata:203
+msgid "A blank template"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Loaded"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be found"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:157 lib/RT/Principal_Overlay.pm:181
+msgid "ACE not found"
+msgstr "ACE ei löytynyt"
+
+#: lib/RT/ACE_Overlay.pm:831
+msgid "ACEs can only be created and deleted."
+msgstr "ACE:ja voi vain luoda ja poistaa."
+
+#: bin/rt-commit-handler:755
+msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgstr "Poistuminen ei-tarkoitettujen työpyyntömuutosten välttämiseksi.\\n"
+
+#: html/User/Elements/Tabs:32
+msgid "About me"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:80
+msgid "Access control"
+msgstr "Pääsynvalvonta"
+
+#: html/Admin/Elements/EditScrip:57
+msgid "Action"
+msgstr "Tapahtuma"
+
+#: lib/RT/Scrip_Overlay.pm:147
+#. ($args{'ScripAction'})
+msgid "Action %1 not found"
+msgstr "Tapahtumaa %1 ei löydetty"
+
+#: bin/rt-crontool:123
+msgid "Action committed."
+msgstr ""
+
+#: bin/rt-crontool:119
+msgid "Action prepared..."
+msgstr ""
+
+#: html/Search/Bulk.html:92
+msgid "Add AdminCc"
+msgstr "Lisää kopio ylläpidolle"
+
+#: html/Search/Bulk.html:90
+msgid "Add Cc"
+msgstr "Lisää kopio"
+
+#: html/Ticket/Create.html:114 html/Ticket/Update.html:100
+msgid "Add More Files"
+msgstr ""
+
+#: html/Search/Bulk.html:88
+msgid "Add Requestor"
+msgstr "Lisää tilaaja"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a new a global scrip"
+msgstr "Lisää uusi globaali lappu"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a scrip to this queue"
+msgstr "Lisää lappu tälle työjonolle"
+
+#: html/Admin/Global/Scrip.html:55
+msgid "Add a scrip which will apply to all queues"
+msgstr "Lisää kaikille työjonoille yhteinen lappu"
+
+#: html/Search/Bulk.html:118
+msgid "Add comments or replies to selected tickets"
+msgstr "Lisää kommentteja tai vastauksia valituille työpyynnöille"
+
+#: html/Admin/Groups/Members.html:42 html/User/Groups/Members.html:39
+msgid "Add members"
+msgstr "Lisää jäsenä"
+
+#: html/Admin/Queues/People.html:66 html/Ticket/Elements/AddWatchers:28
+msgid "Add new watchers"
+msgstr "Lisää uusia tarkkailijoita"
+
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:643
+#. ($args{'Type'})
+msgid "Added principal as a %1 for this queue"
+msgstr "Lisätty toimeksiantaja %1:ksi tähän työjonoon"
+
+#: lib/RT/Ticket_Overlay.pm:1454
+#. ($self->loc($args{'Type'}))
+msgid "Added principal as a %1 for this ticket"
+msgstr "Lisätty toimeksiantaja %1:ksi tälle työpyynnölle"
+
+#: html/Admin/Elements/ModifyUser:76 html/Admin/Users/Modify.html:122 html/User/Prefs.html:88
+msgid "Address1"
+msgstr "Osoite1"
+
+#: html/Admin/Elements/ModifyUser:78 html/Admin/Users/Modify.html:127 html/User/Prefs.html:90
+msgid "Address2"
+msgstr "Osoite2"
+
+#: html/Ticket/Create.html:74
+msgid "Admin Cc"
+msgstr "Kopio ylläpidolle"
+
+#: etc/initialdata:274
+msgid "Admin Comment"
+msgstr ""
+
+#: etc/initialdata:256
+msgid "Admin Correspondence"
+msgstr ""
+
+#: html/Admin/Queues/index.html:25 html/Admin/Queues/index.html:28
+msgid "Admin queues"
+msgstr "Työjonojen ylläpito"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin users"
+msgstr "Käyttäjien ylläpito"
+
+#: html/Admin/Global/index.html:26 html/Admin/Global/index.html:28
+msgid "Admin/Global configuration"
+msgstr "Ylläpito/Globaalit asetukset"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Groups"
+msgstr "Ylläpito/Ryhmät"
+
+#: html/Admin/Queues/Modify.html:25 html/Admin/Queues/Modify.html:29
+msgid "Admin/Queue/Basics"
+msgstr "Ylläpito/Työjono/Perustiedot"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr ""
+
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:39 html/Ticket/Update.html:50 lib/RT/ACE_Overlay.pm:89
+msgid "AdminCc"
+msgstr "Kopio ylläpidolle"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "AdminCustomFields"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "AdminGroup"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "AdminGroupMembership"
+msgstr ""
+
+#: lib/RT/System.pm:59
+msgid "AdminOwnPersonalGroups"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "AdminQueue"
+msgstr ""
+
+#: lib/RT/System.pm:60
+msgid "AdminUsers"
+msgstr ""
+
+#: html/Admin/Queues/People.html:48 html/Ticket/Elements/EditPeople:54
+msgid "Administrative Cc"
+msgstr "Kopio ylläpidolle"
+
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search"
+msgstr "Tarkennettu haku"
+
+#: html/Elements/SelectDateRelation:36
+msgid "After"
+msgstr "Jälkeen"
+
+#: NOT FOUND IN SOURCE
+msgid "Age"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:96
+msgid "All Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:53
+msgid "All Queues"
+msgstr "Kaikki työjonot"
+
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
+msgstr ""
+
+#: html/Elements/Tabs:58
+msgid "Approval"
+msgstr ""
+
+#: html/Approvals/Display.html:46 html/Approvals/Elements/Approve:27 html/Approvals/Elements/ShowDependency:42 html/Approvals/index.html:65
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($ticket->id, $msg)
+#. ($ticket->Id, $ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Approval #%1: %2"
+msgstr ""
+
+#: html/Approvals/index.html:54
+#. ($ticket->Id)
+msgid "Approval #%1: Notes not recorded due to a system error"
+msgstr ""
+
+#: html/Approvals/index.html:52
+#. ($ticket->Id)
+msgid "Approval #%1: Notes recorded"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Details"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Approval diagram"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:45
+msgid "Approve"
+msgstr ""
+
+#: etc/initialdata:431 etc/upgrade/2.1.71:148
+msgid "Approver's notes: %1"
+msgstr ""
+
+#: lib/RT/Date.pm:414
+msgid "Apr."
+msgstr "Huhti"
+
+#: NOT FOUND IN SOURCE
+msgid "April"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:35
+msgid "Ascending"
+msgstr "Nouseva"
+
+#: html/Search/Bulk.html:127 html/SelfService/Update.html:36 html/Ticket/ModifyAll.html:83 html/Ticket/Update.html:100
+msgid "Attach"
+msgstr "Liitä"
+
+#: html/SelfService/Create.html:67 html/Ticket/Create.html:110
+msgid "Attach file"
+msgstr "Liitä tiedosto"
+
+#: html/Ticket/Create.html:98 html/Ticket/Update.html:89
+msgid "Attached file"
+msgstr ""
+
+#: html/SelfService/Attachment/dhandler:36
+msgid "Attachment '%1' could not be loaded"
+msgstr "Liitteen '%1' lataaminen ei onnistunut"
+
+#: lib/RT/Transaction_Overlay.pm:443
+msgid "Attachment created"
+msgstr "Liitetiedosto luotu"
+
+#: lib/RT/Tickets_Overlay.pm:1189
+msgid "Attachment filename"
+msgstr "Liitetiedoston nimi"
+
+#: html/Ticket/Elements/ShowAttachments:26
+msgid "Attachments"
+msgstr "Liitetiedostot"
+
+#: lib/RT/Date.pm:418
+msgid "Aug."
+msgstr "Elo"
+
+#: NOT FOUND IN SOURCE
+msgid "August"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:66
+msgid "AuthSystem"
+msgstr ""
+
+#: etc/initialdata:206
+msgid "Autoreply"
+msgstr ""
+
+#: etc/initialdata:72
+msgid "Autoreply To Requestors"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Bad PGP Signature: %1\\n"
+msgstr "Virheellinen PGP allekirjoitus: %1\\n"
+
+#: html/SelfService/Attachment/dhandler:40
+msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
+msgstr "Virheellinen liitteen numero. Liitetiedostoa '%1' ei löytynyt\\n"
+
+#: bin/rt-commit-handler:827
+#. ($val)
+msgid "Bad data in %1"
+msgstr "Virheellistä dataa kentässä %1"
+
+#: html/SelfService/Attachment/dhandler:43
+#. ($trans, $AttachmentObj->TransactionId())
+msgid "Bad transaction number for attachment. %1 should be %2\\n"
+msgstr "Virheellinen toiminnon numero liitetiedostolle. %1 pitäisi olla %2\\n"
+
+#: html/Admin/Elements/GroupTabs:39 html/Admin/Elements/QueueTabs:39 html/Admin/Elements/UserTabs:38 html/Ticket/Elements/Tabs:90 html/User/Elements/GroupTabs:38
+msgid "Basics"
+msgstr "Perustiedot"
+
+#: html/Ticket/Update.html:83
+msgid "Bcc"
+msgstr "Piilokopio"
+
+#: html/Admin/Elements/EditScrip:88 html/Admin/Global/GroupRights.html:85 html/Admin/Global/Template.html:46 html/Admin/Global/UserRights.html:54 html/Admin/Groups/GroupRights.html:73 html/Admin/Groups/Members.html:81 html/Admin/Groups/Modify.html:56 html/Admin/Groups/UserRights.html:55 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:45 html/Admin/Queues/UserRights.html:54 html/User/Groups/Modify.html:56
+msgid "Be sure to save your changes"
+msgstr "Muista tallentaa muutokset"
+
+#: html/Elements/SelectDateRelation:34 lib/RT/CurrentUser.pm:322
+msgid "Before"
+msgstr "Ennen"
+
+#: NOT FOUND IN SOURCE
+msgid "Begin Approval"
+msgstr ""
+
+#: etc/initialdata:202
+msgid "Blank"
+msgstr ""
+
+#: html/Search/Listing.html:79
+msgid "Bookmarkable URL for this search"
+msgstr "Osoite tähän kyselyyn (selaimen kirjanmerkkeihin)"
+
+#: html/Ticket/Elements/ShowHistory:39 html/Ticket/Elements/ShowHistory:45
+msgid "Brief headers"
+msgstr "Lyhyet otsikot"
+
+#: html/Search/Bulk.html:25 html/Search/Bulk.html:26
+msgid "Bulk ticket update"
+msgstr "Työpyyntöjen ryhmäpäivitys"
+
+#: lib/RT/User_Overlay.pm:1331
+msgid "Can not modify system users"
+msgstr "Systeemikäyttäjien muokkaus ei ole sallittua"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "Can this principal see this queue"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:144
+msgid "Can't add a custom field value without a name"
+msgstr "Kentän lisääminen ilman nimeä ei onnistu"
+
+#: lib/RT/Link_Overlay.pm:132
+msgid "Can't link a ticket to itself"
+msgstr "Työpyyntöä ei voi linkittää itseensä"
+
+#: lib/RT/Ticket_Overlay.pm:2787
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr "Et voi yhdistää jo yhdistettyyn työpyyntöön. Sinun ei pitäisi saada tätä virhettä koskaan."
+
+#: lib/RT/Ticket_Overlay.pm:2605 lib/RT/Ticket_Overlay.pm:2674
+msgid "Can't specifiy both base and target"
+msgstr "Sekä basen ja kohteen määritteleminen samalla ei ole mahdollista"
+
+#: html/autohandler:112
+#. ($msg)
+msgid "Cannot create user: %1"
+msgstr "Käyttäjää ei voitu luoda: %1"
+
+#: etc/initialdata:50 html/Admin/Queues/People.html:44 html/SelfService/Create.html:51 html/SelfService/Display.html:50 html/Ticket/Create.html:64 html/Ticket/Elements/EditPeople:51 html/Ticket/Elements/ShowPeople:35 html/Ticket/Update.html:45 html/Ticket/Update.html:78 lib/RT/ACE_Overlay.pm:88
+msgid "Cc"
+msgstr "Kopio"
+
+#: html/SelfService/Prefs.html:31
+msgid "Change password"
+msgstr "Muuta salasana"
+
+#: html/Ticket/Create.html:101 html/Ticket/Update.html:92
+msgid "Check box to delete"
+msgstr ""
+
+#: html/Admin/Elements/SelectRights:31
+msgid "Check box to revoke right"
+msgstr "Valitse laatikko poistaaksesi oikeuden"
+
+#: html/Ticket/Create.html:183 html/Ticket/Elements/EditLinks:131 html/Ticket/Elements/EditLinks:69 html/Ticket/Elements/ShowLinks:51
+msgid "Children"
+msgstr "Lapsi"
+
+#: html/Admin/Elements/ModifyUser:80 html/Admin/Users/Modify.html:132 html/User/Prefs.html:92
+msgid "City"
+msgstr "Kaupunki"
+
+#: html/Ticket/Elements/ShowDates:47
+msgid "Closed"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:60
+msgid "Closed requests"
+msgstr "Suljetut työpyynnöt"
+
+#: NOT FOUND IN SOURCE
+msgid "Command not understood!\\n"
+msgstr "Komentoa ei ymmärretty!\\n"
+
+#: html/Ticket/Elements/ShowTransaction:179 html/Ticket/Elements/Tabs:153
+msgid "Comment"
+msgstr "Kommentoi"
+
+#: html/Admin/Elements/ModifyQueue:45 html/Admin/Queues/Modify.html:58
+msgid "Comment Address"
+msgstr "Kommenttien osoite"
+
+#: NOT FOUND IN SOURCE
+msgid "Comment not recorded"
+msgstr "Kommenttia ei tallennettu"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "Comment on tickets"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "CommentOnTicket"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:35
+msgid "Comments"
+msgstr "Kommentit"
+
+#: html/Ticket/ModifyAll.html:70 html/Ticket/Update.html:70
+msgid "Comments (Not sent to requestors)"
+msgstr "Kommentit (Ei lähetetä tilaajille)"
+
+#: html/Search/Bulk.html:122
+msgid "Comments (not sent to requestors)"
+msgstr "Kommentit (Ei lähetetä tilaajille)"
+
+#: html/Elements/ViewUser:27
+#. ($name)
+msgid "Comments about %1"
+msgstr "Kommentit kohteesta %1"
+
+#: html/Admin/Users/Modify.html:185 html/Ticket/Elements/ShowRequestor:44
+msgid "Comments about this user"
+msgstr "Kommentit tästä käyttäjästä"
+
+#: lib/RT/Transaction_Overlay.pm:545
+msgid "Comments added"
+msgstr "Kommentit lisätty"
+
+#: lib/RT/Action/Generic.pm:140
+msgid "Commit Stubbed"
+msgstr "Suorita tumppi"
+
+#: NOT FOUND IN SOURCE
+msgid "Compile Restrictions"
+msgstr "Kokoa rajoitukset"
+
+#: html/Admin/Elements/EditScrip:41
+msgid "Condition"
+msgstr "Ehto"
+
+#: bin/rt-crontool:109
+msgid "Condition matches..."
+msgstr ""
+
+#: lib/RT/Scrip_Overlay.pm:160
+msgid "Condition not found"
+msgstr "Ehtoa ei löydetty"
+
+#: html/Elements/Tabs:52
+msgid "Configuration"
+msgstr "Ylläpito"
+
+#: html/SelfService/Prefs.html:33
+msgid "Confirm"
+msgstr "Varmista"
+
+#: html/Admin/Elements/ModifyUser:60
+msgid "ContactInfoSystem"
+msgstr "Kontaktitietojärjestelmä"
+
+#: NOT FOUND IN SOURCE
+msgid "Contacted date '%1' could not be parsed"
+msgstr "Järjestelmä ei ymmärrä päivää '%1'"
+
+#: html/Admin/Elements/ModifyTemplate:44 html/Ticket/ModifyAll.html:87
+msgid "Content"
+msgstr "Sisältö"
+
+#: NOT FOUND IN SOURCE
+msgid "Coould not create group"
+msgstr ""
+
+#: etc/initialdata:266
+msgid "Correspondence"
+msgstr ""
+
+#: html/Admin/Elements/ModifyQueue:39 html/Admin/Queues/Modify.html:51
+msgid "Correspondence Address"
+msgstr "Kirjeenvaihdon osoite"
+
+#: lib/RT/Transaction_Overlay.pm:541
+msgid "Correspondence added"
+msgstr "Kirjeenvaihto lisätty"
+
+#: NOT FOUND IN SOURCE
+msgid "Correspondence not recorded"
+msgstr "Vastausta ei tallennettu"
+
+#: lib/RT/Ticket_Overlay.pm:3458
+msgid "Could not add new custom field value for ticket. "
+msgstr "Uuden tiedon lisääminen kenttään ei onnistunut"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not add new custom field value for ticket. %1 "
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2963 lib/RT/Ticket_Overlay.pm:2971 lib/RT/Ticket_Overlay.pm:2987
+msgid "Could not change owner. "
+msgstr "Omistajaa ei voitu vaihtaa."
+
+#: html/Admin/Elements/EditCustomField:68 html/Admin/Elements/EditCustomFields:166
+#. ($msg)
+msgid "Could not create CustomField"
+msgstr "Uuden kentän lisääminen ei onnistunut"
+
+#: html/User/Groups/Modify.html:77 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
+msgid "Could not create group"
+msgstr "Ryhmän luominen ei onnistunut"
+
+#: html/Admin/Global/Template.html:75 html/Admin/Queues/Template.html:72
+#. ($msg)
+msgid "Could not create template: %1"
+msgstr "Ei onnistuttu luomaan pohjaa: "
+
+#: lib/RT/Ticket_Overlay.pm:1073 lib/RT/Ticket_Overlay.pm:333
+msgid "Could not create ticket. Queue not set"
+msgstr "Työpyynön luominen ei onnistunut. Työjonoa ei ole asetettu"
+
+#: lib/RT/User_Overlay.pm:208 lib/RT/User_Overlay.pm:220 lib/RT/User_Overlay.pm:238 lib/RT/User_Overlay.pm:414
+msgid "Could not create user"
+msgstr "Käyttäjän luominen ei onnistunut"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not create watcher for requestor"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find a ticket with id %1"
+msgstr "Työpyyntöä numero '%1' ei löytynyt."
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find group %1."
+msgstr "Ryhmää '%1' ei löytynyt."
+
+#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1422
+msgid "Could not find or create that user"
+msgstr "Käyttäjää ei löydetty eikä pystytty luomaan"
+
+#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1501
+msgid "Could not find that principal"
+msgstr "Tätä toimeksiantajaa ei löytynyt"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find user %1."
+msgstr "Käyttäjää '%1' ei löytynyt."
+
+#: html/Admin/Groups/Members.html:88 html/User/Groups/Members.html:90 html/User/Groups/Modify.html:82
+msgid "Could not load group"
+msgstr "Ryhmän lataaminen ei onnistunut"
+
+#: lib/RT/Queue_Overlay.pm:641
+#. ($args{'Type'})
+msgid "Could not make that principal a %1 for this queue"
+msgstr "Ei voinut tehdä toimeksiantajaa %1:ksi tälle työjonolle"
+
+#: lib/RT/Ticket_Overlay.pm:1443
+#. ($self->loc($args{'Type'}))
+msgid "Could not make that principal a %1 for this ticket"
+msgstr "Ei voinut tehdä toimeksiantajaa tälle työpyynnölle: %1"
+
+#: lib/RT/Queue_Overlay.pm:740
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this queue"
+msgstr "Ei voinut poistaa toimeksiantajaa tältä työjonolta: %1"
+
+#: lib/RT/Ticket_Overlay.pm:1559
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this ticket"
+msgstr "Ei voinut poistaa toimeksiantajaa tältä työpyynnöltä: %1"
+
+#: lib/RT/Group_Overlay.pm:985
+msgid "Couldn't add member to group"
+msgstr "Jäsenen lisääminen ryhmään ei onnistunut"
+
+#: lib/RT/Ticket_Overlay.pm:3468 lib/RT/Ticket_Overlay.pm:3524
+#. ($Msg)
+msgid "Couldn't create a transaction: %1"
+msgstr "Toiminnon luominen ei onnistunut: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't figure out what to do from gpg's reply\\n"
+msgstr "Järjestelmä ei ymmärtänyt mitä tehdä pgp:n vastauksella\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find group\\n"
+msgstr "Ryhmää ei löytynyt\\n"
+
+#: lib/RT/Interface/Web.pm:866
+msgid "Couldn't find row"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:959
+msgid "Couldn't find that principal"
+msgstr "Tätä toimeksiantajaa ei löytynyt"
+
+#: lib/RT/CustomField_Overlay.pm:175
+msgid "Couldn't find that value"
+msgstr "Tätä arvoa ei löytynyt"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find that watcher"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find user\\n"
+msgstr "Käyttäjää ei löytynyt\\n"
+
+#: lib/RT/CurrentUser.pm:112
+#. ($self->Id)
+msgid "Couldn't load %1 from the users database.\\n"
+msgstr "Ei onnistuttu lataamaan käytäjää %1 tietokannasta.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load KeywordSelects."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load RT config file '%1' %2"
+msgstr "RT asetustiedoston lataaminen ei onnistunut:'%1' %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load Scrips."
+msgstr "Lappujen lataaminen ei onnistunut."
+
+#: html/Admin/Groups/GroupRights.html:88 html/Admin/Groups/UserRights.html:75
+#. ($id)
+msgid "Couldn't load group %1"
+msgstr "Ryhmän %1 lataaminen ei onnistunut"
+
+#: lib/RT/Link_Overlay.pm:175 lib/RT/Link_Overlay.pm:184 lib/RT/Link_Overlay.pm:211
+msgid "Couldn't load link"
+msgstr "Linkin lataaminen ei onnistunut"
+
+#: html/Admin/Elements/EditCustomFields:147 html/Admin/Queues/People.html:121
+#. ($id)
+msgid "Couldn't load queue"
+msgstr "Työjonon lataaminen ei onnistunut"
+
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:72
+#. ($id)
+msgid "Couldn't load queue %1"
+msgstr "Työjonon %1 lataaminen ei onnistunut"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load scrip"
+msgstr "Lapun lataaminen ei onnistunut"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load template"
+msgstr "Pohjan lataaminen ei onnistunut"
+
+#: html/Admin/Users/Prefs.html:79
+#. ($id)
+msgid "Couldn't load that user (%1)"
+msgstr "Tämän käyttäjän lataaminen ei onnistunut (%1)"
+
+#: html/SelfService/Display.html:166
+#. ($id)
+msgid "Couldn't load ticket '%1'"
+msgstr "Työpyynnön '%1' lataaminen ei onnistunut"
+
+#: html/Admin/Elements/ModifyUser:86 html/Admin/Users/Modify.html:149 html/User/Prefs.html:98
+msgid "Country"
+msgstr "Maa"
+
+#: html/Admin/Elements/CreateUserCalled:26 html/Ticket/Create.html:135 html/Ticket/Create.html:195
+msgid "Create"
+msgstr "Luo"
+
+#: etc/initialdata:128
+msgid "Create Tickets"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:58
+msgid "Create a CustomField"
+msgstr "Luo kenttä"
+
+#: html/Admin/Queues/CustomField.html:48
+#. ($QueueObj->Name())
+msgid "Create a CustomField for queue %1"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:48
+msgid "Create a CustomField which applies to all queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new Custom Field"
+msgstr "Luo uusi kenttä"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global scrip"
+msgstr "Luo uusi globaali lappu"
+
+#: html/Admin/Groups/Modify.html:67 html/Admin/Groups/Modify.html:93
+msgid "Create a new group"
+msgstr "Luo uusi ryhmä"
+
+#: html/User/Groups/Modify.html:67 html/User/Groups/Modify.html:92
+msgid "Create a new personal group"
+msgstr "Luo uusi personaali ryhmä"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new queue"
+msgstr "Luo uusi työjono"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new template"
+msgstr "Luo uusi pohja"
+
+#: html/SelfService/Create.html:30 html/Ticket/Create.html:25 html/Ticket/Create.html:28 html/Ticket/Create.html:36
+msgid "Create a new ticket"
+msgstr "Luo uusi työpyyntö"
+
+#: html/Admin/Users/Modify.html:214 html/Admin/Users/Modify.html:241
+msgid "Create a new user"
+msgstr "Luo uusi käyttäjä"
+
+#: html/Admin/Queues/Modify.html:103
+msgid "Create a queue"
+msgstr "Luo uusi työjono"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a queue called"
+msgstr "Luo työjono nimeltään"
+
+#: html/SelfService/Create.html:25 html/SelfService/Create.html:27
+msgid "Create a request"
+msgstr "Luo työpyyntö"
+
+#: html/Admin/Queues/Scrip.html:59
+#. ($QueueObj->Name)
+msgid "Create a scrip for queue %1"
+msgstr ""
+
+#: html/Admin/Global/Template.html:69 html/Admin/Queues/Template.html:65
+msgid "Create a template"
+msgstr "Luo pohja"
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1 / %2 / %3 "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1/%2/%3"
+msgstr ""
+
+#: etc/initialdata:130
+msgid "Create new tickets based on this scrip's template"
+msgstr ""
+
+#: html/SelfService/Create.html:81
+msgid "Create ticket"
+msgstr "Luo työpyyntö"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "Create tickets in this queue"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "Create, delete and modify custom fields"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "Create, delete and modify queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
+msgstr ""
+
+#: lib/RT/System.pm:59
+msgid "Create, delete and modify the members of personal groups"
+msgstr ""
+
+#: lib/RT/System.pm:60
+msgid "Create, delete and modify users"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "CreateTicket"
+msgstr ""
+
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1167
+msgid "Created"
+msgstr "Luotu"
+
+#: html/Admin/Elements/EditCustomField:71
+#. ($CustomFieldObj->Name())
+msgid "Created CustomField %1"
+msgstr "Luotu kenttä %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Created template %1"
+msgstr "Luotu pohja %1"
+
+#: html/Ticket/Elements/EditLinks:28
+msgid "Current Relationships"
+msgstr "Tämänhetkiset suhteet"
+
+#: html/Admin/Elements/EditScrips:30
+msgid "Current Scrips"
+msgstr ""
+
+#: html/Admin/Groups/Members.html:39 html/User/Groups/Members.html:42
+msgid "Current members"
+msgstr "Tämänhetkiset jäsenet"
+
+#: html/Admin/Elements/SelectRights:29
+msgid "Current rights"
+msgstr "Tämänhetkiset oikeudet"
+
+#: html/Search/Listing.html:71
+msgid "Current search criteria"
+msgstr ""
+
+#: html/Admin/Queues/People.html:41 html/Ticket/Elements/EditPeople:45
+msgid "Current watchers"
+msgstr "Tämänhetkiset tarkkailijat"
+
+#: html/Admin/Global/CustomField.html:55
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:53 html/Admin/Elements/SystemTabs:40 html/Admin/Global/index.html:50 html/Ticket/Elements/ShowSummary:35
+msgid "Custom Fields"
+msgstr "Kentät"
+
+#: html/Admin/Elements/EditScrip:73
+msgid "Custom action cleanup code"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:65
+msgid "Custom action preparation code"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:49
+msgid "Custom condition"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1618
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
+msgid "Custom field %1 %2 %3"
+msgstr "Kenttä %1 %2 %3"
+
+#: lib/RT/Tickets_Overlay.pm:1613
+#. ($CF->Name)
+msgid "Custom field %1 has a value."
+msgstr "Kentällä %1 on arvo"
+
+#: lib/RT/Tickets_Overlay.pm:1610
+#. ($CF->Name)
+msgid "Custom field %1 has no value."
+msgstr "Kentällä %1 ei ole arvoa"
+
+#: lib/RT/Ticket_Overlay.pm:3360
+#. ($args{'Field'})
+msgid "Custom field %1 not found"
+msgstr "Kenttää %1 ei löytynyt"
+
+#: html/Admin/Elements/EditCustomFields:197
+msgid "Custom field deleted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3510
+msgid "Custom field not found"
+msgstr "Kenttää ei löytynyt"
+
+#: lib/RT/CustomField_Overlay.pm:283
+#. ($args{'Content'}, $self->Name)
+msgid "Custom field value %1 could not be found for custom field %2"
+msgstr "Kenttän arvoa %1 ei löytynyt kentälle %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Custom field value changed from %1 to %2"
+msgstr "Kenttän arvo muutettu arvosta %1 arvoon"
+
+#: lib/RT/CustomField_Overlay.pm:185
+msgid "Custom field value could not be deleted"
+msgstr "Kenttän arvoa ei pystytty poistamaan"
+
+#: lib/RT/CustomField_Overlay.pm:289
+msgid "Custom field value could not be found"
+msgstr "Kenttän arvoa ei löydetty"
+
+#: lib/RT/CustomField_Overlay.pm:183 lib/RT/CustomField_Overlay.pm:291
+msgid "Custom field value deleted"
+msgstr "Kenttän arvo poistettu"
+
+#: lib/RT/Transaction_Overlay.pm:550
+msgid "CustomField"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Data error"
+msgstr ""
+
+#: html/Ticket/Create.html:161 html/Ticket/Elements/ShowSummary:53 html/Ticket/Elements/Tabs:93 html/Ticket/ModifyAll.html:44
+msgid "Dates"
+msgstr "Päivät"
+
+#: lib/RT/Date.pm:422
+msgid "Dec."
+msgstr "Joulu"
+
+#: NOT FOUND IN SOURCE
+msgid "December"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr ""
+
+#: etc/initialdata:207
+msgid "Default Autoresponse template"
+msgstr ""
+
+#: etc/initialdata:275
+msgid "Default admin comment template"
+msgstr ""
+
+#: etc/initialdata:257
+msgid "Default admin correspondence template"
+msgstr ""
+
+#: etc/initialdata:267
+msgid "Default correspondence template"
+msgstr ""
+
+#: etc/initialdata:238
+msgid "Default transaction template"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:645
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr ""
+
+#: html/User/Delegation.html:25 html/User/Delegation.html:28
+msgid "Delegate rights"
+msgstr "Delegoi oikeuksia"
+
+#: lib/RT/System.pm:63
+msgid "Delegate specific rights which have been granted to you."
+msgstr ""
+
+#: lib/RT/System.pm:63
+msgid "DelegateRights"
+msgstr ""
+
+#: html/User/Elements/Tabs:38
+msgid "Delegation"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Delete"
+msgstr "Poista"
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "Delete tickets"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "DeleteTicket"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:187
+msgid "Deleting this object could break referential integrity"
+msgstr "Tämän objektin poistaminen saattaa rikkoa tietokannan viitteet"
+
+#: lib/RT/Queue_Overlay.pm:292
+msgid "Deleting this object would break referential integrity"
+msgstr "Tämän objektin poistaminen rikkoo tietokannan viitteet"
+
+#: lib/RT/User_Overlay.pm:430
+msgid "Deleting this object would violate referential integrity"
+msgstr "Tämän objektin poistaminen rikkoo tietokannan viitteet"
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity. That's bad."
+msgstr ""
+
+#: html/Approvals/Elements/Approve:46
+msgid "Deny"
+msgstr ""
+
+#: html/Ticket/Create.html:181 html/Ticket/Elements/EditLinks:123 html/Ticket/Elements/EditLinks:47 html/Ticket/Elements/ShowDependencies:32 html/Ticket/Elements/ShowLinks:35
+msgid "Depended on by"
+msgstr "Tästä pyynnöstä riippuu"
+
+#: NOT FOUND IN SOURCE
+msgid "Dependencies: \\n"
+msgstr "Riippuvuudet: \\n"
+
+#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:180 html/Ticket/Elements/EditLinks:119 html/Ticket/Elements/EditLinks:36 html/Ticket/Elements/ShowDependencies:25 html/Ticket/Elements/ShowLinks:27
+msgid "Depends on"
+msgstr "Riippuu pyynnöstä"
+
+#: NOT FOUND IN SOURCE
+msgid "DependsOn"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:35
+msgid "Descending"
+msgstr "Laskeva"
+
+#: html/SelfService/Create.html:75 html/Ticket/Create.html:119
+msgid "Describe the issue below"
+msgstr "Työtilauksen kuvaus"
+
+#: html/Admin/Elements/AddCustomFieldValue:27 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyQueue:36 html/Admin/Elements/ModifyTemplate:36 html/Admin/Groups/Modify.html:49 html/Admin/Queues/Modify.html:48 html/Elements/SelectGroups:27 html/User/Groups/Modify.html:49
+msgid "Description"
+msgstr "Kuvaus"
+
+#: html/SelfService/Elements/MyRequests:44
+msgid "Details"
+msgstr "Yksityiskohdat"
+
+#: html/Ticket/Elements/Tabs:85
+msgid "Display"
+msgstr "Näytä"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "Display Access Control List"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "Display Scrip templates for this queue"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "Display Scrips for this queue"
+msgstr ""
+
+#: html/Ticket/Elements/ShowHistory:35
+msgid "Display mode"
+msgstr "Näkymä"
+
+#: html/SelfService/Display.html:25 html/SelfService/Display.html:29
+#. ($Ticket->id)
+msgid "Display ticket #%1"
+msgstr "Näytä työpyyntö #%1"
+
+#: lib/RT/System.pm:54
+msgid "Do anything and everything"
+msgstr ""
+
+#: html/Elements/Refresh:30
+msgid "Don't refresh this page."
+msgstr "Älä päivitä tätä sivua"
+
+#: html/Search/Elements/PickRestriction:114
+msgid "Don't show search results"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "Download"
+msgstr "Lataa"
+
+#: html/Elements/SelectDateType:32 html/Ticket/Create.html:167 html/Ticket/Elements/EditDates:45 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1171
+msgid "Due"
+msgstr "Mennessä"
+
+#: NOT FOUND IN SOURCE
+msgid "Due date '%1' could not be parsed"
+msgstr "Mennessä -päivää '%1' ei onnistuttu kääntämään järjestelmälle."
+
+#: bin/rt-commit-handler:754
+#. ($1, $msg)
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
+msgstr "VIRHE: Työpyynnön '%1' lataaminen ei onnistunut: %2.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit"
+msgstr "Muokkaa"
+
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr "Muokkaa kenttiä: työjono %1"
+
+#: html/Ticket/ModifyLinks.html:36
+msgid "Edit Relationships"
+msgstr "Muokkaa suhteita"
+
+#: html/Admin/Queues/Templates.html:41
+#. ($QueueObj->Name)
+msgid "Edit Templates for queue %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit keywords"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr "Muokkaa lappuja"
+
+#: html/Admin/Global/index.html:46
+msgid "Edit system templates"
+msgstr "Muokkaa systeemipohjia"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit templates for %1"
+msgstr "Muokkaa pohjia: työjono %1"
+
+#: html/Admin/Elements/ModifyQueue:25 html/Admin/Queues/Modify.html:117
+#. ($QueueObj->Name)
+#. ($QueueObj->Id)
+msgid "Editing Configuration for queue %1"
+msgstr "Asetusten muokkaus: työjono %1"
+
+#: html/Admin/Elements/ModifyUser:25
+#. ($UserObj->Name)
+msgid "Editing Configuration for user %1"
+msgstr "Asetusten muokkaus: käyttäjä %1"
+
+#: html/Admin/Elements/EditCustomField:74
+#. ($CustomFieldObj->Name())
+msgid "Editing CustomField %1"
+msgstr "Kentän %1 muokkaus"
+
+#: html/Admin/Groups/Members.html:32
+#. ($Group->Name)
+msgid "Editing membership for group %1"
+msgstr "Ryhmän %1 jäsenten muokkaus"
+
+#: html/User/Groups/Members.html:129
+#. ($Group->Name)
+msgid "Editing membership for personal group %1"
+msgstr "Henkilökohtaisen ryhmän %1 jäsenten muokkaus"
+
+#: NOT FOUND IN SOURCE
+msgid "Editing template %1"
+msgstr "Pohjan %1 muokkaus"
+
+#: lib/RT/Ticket_Overlay.pm:2615 lib/RT/Ticket_Overlay.pm:2683
+msgid "Either base or target must be specified"
+msgstr "Joko juuri tai kohde täytyy olla määritelty"
+
+#: html/Admin/Users/Modify.html:53 html/Admin/Users/Prefs.html:46 html/Elements/SelectUsers:27 html/Ticket/Elements/AddWatchers:56 html/User/Prefs.html:42
+msgid "Email"
+msgstr "Sähköposti"
+
+#: lib/RT/User_Overlay.pm:188
+msgid "Email address in use"
+msgstr "Sähköpostiosoite on jo käytössä"
+
+#: html/Admin/Elements/ModifyUser:42
+msgid "EmailAddress"
+msgstr "Sähköpostiosoite"
+
+#: html/Admin/Elements/ModifyUser:54
+msgid "EmailEncoding"
+msgstr "Sähköpostin koodaus"
+
+#: html/Admin/Elements/EditCustomField:36
+msgid "Enabled (Unchecking this box disables this custom field)"
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:53 html/User/Groups/Modify.html:53
+msgid "Enabled (Unchecking this box disables this group)"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:84
+msgid "Enabled (Unchecking this box disables this queue)"
+msgstr "Aktiivinen (Rastin poistaminen asettaa työjonon ei-aktiiviseksi)"
+
+#: html/Admin/Elements/EditCustomFields:99
+msgid "Enabled Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:56
+msgid "Enabled Queues"
+msgstr "Aktiiviset työjonot"
+
+#: html/Admin/Elements/EditCustomField:90 html/Admin/Groups/Modify.html:117 html/Admin/Queues/Modify.html:138 html/Admin/Users/Modify.html:283 html/User/Groups/Modify.html:117
+#. (loc_fuzzy($msg))
+msgid "Enabled status %1"
+msgstr "Aktivoitu tila %1"
+
+#: lib/RT/CustomField_Overlay.pm:361
+msgid "Enter multiple values"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:358
+msgid "Enter one value"
+msgstr ""
+
+#: html/Ticket/Elements/EditLinks:112
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "Lisää työpyyntöjen numerot tai www-linkit. Käytä välilyöntiä erottimena syöttäessäsi useampaa numeroa tai linkkiä."
+
+#: html/Elements/Login:29 html/SelfService/Error.html:25 html/SelfService/Error.html:26
+msgid "Error"
+msgstr "Virhe"
+
+#: NOT FOUND IN SOURCE
+msgid "Error adding watcher"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:555
+msgid "Error in parameters to Queue->AddWatcher"
+msgstr "Virhe parametreissa: Queue->AddWatcher"
+
+#: lib/RT/Queue_Overlay.pm:713
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr "Virhe parametreissa: Queue->DelWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1356
+msgid "Error in parameters to Ticket->AddWatcher"
+msgstr "Virhe parametreissa: Ticket->AddWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1532
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr "Virhe parametreissa: Ticket->DelWatcher"
+
+#: etc/initialdata:20
+msgid "Everyone"
+msgstr ""
+
+#: bin/rt-crontool:194
+msgid "Example:"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:64
+msgid "ExternalAuthId"
+msgstr "Ulkoinen autentikointitunnus"
+
+#: html/Admin/Elements/ModifyUser:58
+msgid "ExternalContactInfoId"
+msgstr "Ulkoinen yhteystietotunnus"
+
+#: html/Admin/Users/Modify.html:73
+msgid "Extra info"
+msgstr "Lisatieto"
+
+#: lib/RT/User_Overlay.pm:302
+msgid "Failed to find 'Privileged' users pseudogroup."
+msgstr "'Etuoikeutettu' -pseudoryhmää ei löytynyt"
+
+#: lib/RT/User_Overlay.pm:309
+msgid "Failed to find 'Unprivileged' users pseudogroup"
+msgstr "Ei-etuoikeutettu' -pseudoryhmää ei löytynyt"
+
+#: bin/rt-crontool:138
+#. ($modname, $@)
+msgid "Failed to load module %1. (%2)"
+msgstr ""
+
+#: lib/RT/Date.pm:412
+msgid "Feb."
+msgstr "Helmi"
+
+#: NOT FOUND IN SOURCE
+msgid "February"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Fin"
+msgstr "Fin"
+
+#: html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:59 lib/RT/Tickets_Overlay.pm:1091
+msgid "Final Priority"
+msgstr "Loppuprioriteetti"
+
+#: lib/RT/Ticket_Overlay.pm:1162
+msgid "FinalPriority"
+msgstr ""
+
+#: html/Admin/Queues/People.html:61 html/Ticket/Elements/EditPeople:34
+msgid "Find group whose"
+msgstr ""
+
+#: html/Elements/Quicksearch:25
+msgid "Find new/open tickets"
+msgstr "Etsi uudet/avoimet työpyynnöt"
+
+#: html/Admin/Queues/People.html:57 html/Admin/Users/index.html:46 html/Ticket/Elements/EditPeople:30
+msgid "Find people whose"
+msgstr "Etsi käyttäjät joiden"
+
+#: html/Search/Listing.html:108
+msgid "Find tickets"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Finish Approval"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:58
+msgid "First"
+msgstr "Ensimmäinen"
+
+#: html/Search/Listing.html:41
+msgid "First page"
+msgstr "Viimeinen sivu"
+
+#: docs/design_docs/string-extraction-guide.txt:33
+msgid "Foo Bar Baz"
+msgstr ""
+
+#: docs/design_docs/string-extraction-guide.txt:24
+msgid "Foo!"
+msgstr ""
+
+#: html/Search/Bulk.html:87
+msgid "Force change"
+msgstr "Pakota muutos"
+
+#: html/Search/Listing.html:106
+#. ($ticketcount)
+msgid "Found %quant(%1,ticket)"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:868
+msgid "Found Object"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:44
+msgid "FreeformContactInfo"
+msgstr "Vapaamuotoiset yhteystiedot"
+
+#: lib/RT/CustomField_Overlay.pm:38
+msgid "FreeformMultiple"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformSingle"
+msgstr ""
+
+#: lib/RT/Date.pm:392
+msgid "Fri."
+msgstr "Pe"
+
+#: html/Ticket/Elements/ShowHistory:41 html/Ticket/Elements/ShowHistory:51
+msgid "Full headers"
+msgstr "Kokonaiset otsikot"
+
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:595
+#. ($New->Name)
+msgid "Given to %1"
+msgstr ""
+
+#: html/Admin/Elements/Tabs:41 html/Admin/index.html:38
+msgid "Global"
+msgstr "Globaali"
+
+#: NOT FOUND IN SOURCE
+msgid "Global Keyword Selections"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
+msgstr "Globaalit laput"
+
+#: html/Admin/Elements/SelectTemplate:38
+#. (loc($Template->Name))
+msgid "Global template: %1"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:75 html/Admin/Queues/People.html:59 html/Admin/Queues/People.html:63 html/Admin/Queues/index.html:44 html/Admin/Users/index.html:49 html/Ticket/Elements/EditPeople:32 html/Ticket/Elements/EditPeople:36 html/index.html:41
+msgid "Go!"
+msgstr "Ok!"
+
+#: NOT FOUND IN SOURCE
+msgid "Good pgp sig from %1\\n"
+msgstr "Hyvä PGP allekirjoitus käyttäjältä %1\\n"
+
+#: html/Search/Listing.html:50
+msgid "Goto page"
+msgstr "Siirry sivulle"
+
+#: html/Elements/GotoTicket:25 html/SelfService/Elements/GotoTicket:25
+msgid "Goto ticket"
+msgstr "Siirry työpyyntöön"
+
+#: html/Ticket/Elements/AddWatchers:46 html/User/Elements/DelegateRights:78
+msgid "Group"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Group %1 %2: %3"
+msgstr "Ryhmä %1 %2: %3"
+
+#: html/Admin/Elements/GroupTabs:45 html/Admin/Elements/QueueTabs:57 html/Admin/Elements/SystemTabs:44 html/Admin/Global/index.html:55
+msgid "Group Rights"
+msgstr "Ryhmän oikeudet"
+
+#: lib/RT/Group_Overlay.pm:965
+msgid "Group already has member"
+msgstr "Ryhmässä on jo jäsen"
+
+#: NOT FOUND IN SOURCE
+msgid "Group could not be created."
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:77
+#. ($create_msg)
+msgid "Group could not be created: %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:497
+msgid "Group created"
+msgstr "Ryhmä luotu"
+
+#: lib/RT/Group_Overlay.pm:1133
+msgid "Group has no such member"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:945 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1429 lib/RT/Ticket_Overlay.pm:1507
+msgid "Group not found"
+msgstr "Ryhmää ei löydetty"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not found.\\n"
+msgstr "Ryhmää ei löydetty.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not specified.\\n"
+msgstr "Ryhmää ei määritelty.\\n"
+
+#: html/Admin/Elements/SelectNewGroupMembers:35 html/Admin/Elements/Tabs:35 html/Admin/Groups/Members.html:64 html/Admin/Queues/People.html:83 html/Admin/index.html:32 html/User/Groups/Members.html:67
+msgid "Groups"
+msgstr "Ryhmät"
+
+#: lib/RT/Group_Overlay.pm:971
+msgid "Groups can't be members of their members"
+msgstr "Ryhmät eivät voi olla jäsentensä jäseniä"
+
+#: lib/RT/Interface/CLI.pm:73 lib/RT/Interface/CLI.pm:73
+msgid "Hello!"
+msgstr "Hei!"
+
+#: docs/design_docs/string-extraction-guide.txt:40
+#. ($name)
+msgid "Hello, %1"
+msgstr "Hei, %1"
+
+#: html/Ticket/Elements/ShowHistory:30 html/Ticket/Elements/Tabs:88
+msgid "History"
+msgstr "Historia"
+
+#: html/Admin/Elements/ModifyUser:68
+msgid "HomePhone"
+msgstr "Kotipuhelin"
+
+#: html/Elements/Tabs:46
+msgid "Homepage"
+msgstr "Kotisivu"
+
+#: lib/RT/Base.pm:74
+#. (6)
+msgid "I have %quant(%1,concrete mixer)."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:27 lib/RT/Tickets_Overlay.pm:1018
+msgid "Id"
+msgstr "Numero"
+
+#: html/Admin/Users/Modify.html:44 html/User/Prefs.html:39
+msgid "Identity"
+msgstr "Identiteetti"
+
+#: etc/upgrade/2.1.71:86
+msgid "If an approval is rejected, reject the original and delete pending approvals"
+msgstr ""
+
+#: bin/rt-crontool:190
+msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
+msgstr ""
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
+msgid "If you've updated anything above, be sure to"
+msgstr "Jos olet muuttanut tietoja, muista tallentaa"
+
+#: lib/RT/Interface/Web.pm:860
+msgid "Illegal value for %1"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:863
+msgid "Immutable field"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:74
+msgid "Include disabled custom fields in listing."
+msgstr ""
+
+#: html/Admin/Queues/index.html:43
+msgid "Include disabled queues in listing."
+msgstr "Sisällytä listaukseen myös ei-aktiiviset työjonot."
+
+#: html/Admin/Users/index.html:47
+msgid "Include disabled users in search."
+msgstr "Sisällytä listaukseen myös ei-aktiiviset käyttäjät."
+
+#: lib/RT/Tickets_Overlay.pm:1067
+msgid "Initial Priority"
+msgstr "Alkuprioriteetti"
+
+#: lib/RT/Ticket_Overlay.pm:1161 lib/RT/Ticket_Overlay.pm:1163
+msgid "InitialPriority"
+msgstr ""
+
+#: lib/RT/ScripAction_Overlay.pm:105
+msgid "Input error"
+msgstr "Virhe syötteessä"
+
+#: NOT FOUND IN SOURCE
+msgid "Interest noted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3729
+msgid "Internal Error"
+msgstr ""
+
+#: lib/RT/Record.pm:143
+#. ($id->{error_message})
+msgid "Internal Error: %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:644
+msgid "Invalid Group Type"
+msgstr "Ryhmän tyyppi ei kelpaa"
+
+#: lib/RT/Principal_Overlay.pm:128
+msgid "Invalid Right"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Invalid Type"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:865
+msgid "Invalid data"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:438
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr "Omistaja ei kelpaa. Asetetaan oletusasetusten mukaan 'eikukaan'"
+
+#: lib/RT/Scrip_Overlay.pm:134 lib/RT/Template_Overlay.pm:251
+msgid "Invalid queue"
+msgstr "Kelpaamaton työjono"
+
+#: lib/RT/ACE_Overlay.pm:244 lib/RT/ACE_Overlay.pm:253 lib/RT/ACE_Overlay.pm:259 lib/RT/ACE_Overlay.pm:270 lib/RT/ACE_Overlay.pm:275
+msgid "Invalid right"
+msgstr "Kelpaamaton oikeus"
+
+#: lib/RT/Record.pm:118
+#. ($key)
+msgid "Invalid value for %1"
+msgstr "Kelpaamaton arvo kohteelle %1"
+
+#: lib/RT/Ticket_Overlay.pm:3367
+msgid "Invalid value for custom field"
+msgstr "Kelpaamaton arvo kentälle"
+
+#: lib/RT/Ticket_Overlay.pm:345
+msgid "Invalid value for status"
+msgstr "Kelpaamaton arvo tilalle"
+
+#: bin/rt-crontool:191
+msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
+msgstr ""
+
+#: bin/rt-crontool:192
+msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
+msgstr ""
+
+#: bin/rt-crontool:163
+msgid "It takes several arguments:"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
+msgstr ""
+
+#: lib/RT/Date.pm:411
+msgid "Jan."
+msgstr "Tammi"
+
+#: NOT FOUND IN SOURCE
+msgid "January"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "Join or leave this group"
+msgstr ""
+
+#: lib/RT/Date.pm:417
+msgid "Jul."
+msgstr "Heinä"
+
+#: NOT FOUND IN SOURCE
+msgid "July"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:99
+msgid "Jumbo"
+msgstr "Jumbo"
+
+#: lib/RT/Date.pm:416
+msgid "Jun."
+msgstr "Kesä"
+
+#: NOT FOUND IN SOURCE
+msgid "June"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Keyword"
+msgstr "Avainsana"
+
+#: html/Admin/Elements/ModifyUser:52
+msgid "Lang"
+msgstr "Keili"
+
+#: html/Ticket/Elements/Tabs:73
+msgid "Last"
+msgstr "Viimeinen"
+
+#: html/Ticket/Elements/EditDates:38 html/Ticket/Elements/ShowDates:39
+msgid "Last Contact"
+msgstr "Viimeinen yhteydenotto"
+
+#: html/Elements/SelectDateType:29
+msgid "Last Contacted"
+msgstr "Viimeksi otettu yhteyttä"
+
+#: html/Search/Elements/TicketHeader:41
+msgid "Last Notified"
+msgstr ""
+
+#: html/Elements/SelectDateType:30
+msgid "Last Updated"
+msgstr "Viimeksi päivitetty"
+
+#: NOT FOUND IN SOURCE
+msgid "LastUpdated"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Left"
+msgstr "Vasen"
+
+#: html/Admin/Users/Modify.html:83
+msgid "Let this user access RT"
+msgstr "Päästä tämä käyttäjä sisään RT:een"
+
+#: html/Admin/Users/Modify.html:87
+msgid "Let this user be granted rights"
+msgstr "Tälle käyttäjälle voidaan antaa oikeuksia"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting owner to %1 %2"
+msgstr "Rajoitetaan omistajaa %1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting queue to %1 %2"
+msgstr "Rajoitetaan työjonoa %1 %2"
+
+#: lib/RT/Ticket_Overlay.pm:2697
+msgid "Link already exists"
+msgstr "Linkki on jo olemassa"
+
+#: lib/RT/Ticket_Overlay.pm:2709
+msgid "Link could not be created"
+msgstr "Linkkiä ei voitu luoda"
+
+#: lib/RT/Ticket_Overlay.pm:2717 lib/RT/Ticket_Overlay.pm:2727
+#. ($TransString)
+msgid "Link created (%1)"
+msgstr "Linkki luotu (%1)"
+
+#: lib/RT/Ticket_Overlay.pm:2638
+#. ($TransString)
+msgid "Link deleted (%1)"
+msgstr "Linkki poistettu (%1)"
+
+#: lib/RT/Ticket_Overlay.pm:2644
+msgid "Link not found"
+msgstr "Linkkiä ei löydetty"
+
+#: html/Ticket/ModifyLinks.html:25 html/Ticket/ModifyLinks.html:29
+#. ($Ticket->Id)
+msgid "Link ticket #%1"
+msgstr "Linkitä työpyyntö #%1"
+
+#: NOT FOUND IN SOURCE
+msgid "Link ticket %1"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:97
+msgid "Links"
+msgstr "Linkit"
+
+#: html/Admin/Users/Modify.html:114 html/User/Prefs.html:85
+msgid "Location"
+msgstr "Sijainti"
+
+#: lib/RT.pm:158
+#. ($RT::LogDir)
+msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
+msgstr "Lokihakemistoa %1 ei löytynyt tai kirkoittaminen ei onnistunut.\\n RT ei voi toimia."
+
+#: html/Elements/Header:57
+#. ("<b>".$session{'CurrentUser'}->Name."</b>")
+msgid "Logged in as %1"
+msgstr "Kirjautunut sisään tunnuksella %1"
+
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:25 html/Elements/Login:34 html/Elements/Login:45
+msgid "Login"
+msgstr "Kirjaudu sisään"
+
+#: html/Elements/Header:54
+msgid "Logout"
+msgstr "Kirjaudu ulos"
+
+#: html/Search/Bulk.html:86
+msgid "Make Owner"
+msgstr "Aseta omistaja"
+
+#: html/Search/Bulk.html:102
+msgid "Make Status"
+msgstr "Aseta tila"
+
+#: html/Search/Bulk.html:109
+msgid "Make date Due"
+msgstr "Aseta mennessä -aika"
+
+#: html/Search/Bulk.html:110
+msgid "Make date Resolved"
+msgstr "Aseta päätetty -aika"
+
+#: html/Search/Bulk.html:107
+msgid "Make date Started"
+msgstr "Aseta aloitettu -aika"
+
+#: html/Search/Bulk.html:106
+msgid "Make date Starts"
+msgstr "Aseta alkaa -aika"
+
+#: html/Search/Bulk.html:108
+msgid "Make date Told"
+msgstr "Aseta oltu yhteydessä -aika"
+
+#: html/Search/Bulk.html:99
+msgid "Make priority"
+msgstr "Aseta prioriteetti"
+
+#: html/Search/Bulk.html:100
+msgid "Make queue"
+msgstr "Aseta työjono"
+
+#: html/Search/Bulk.html:98
+msgid "Make subject"
+msgstr "Aseta otsikko"
+
+#: html/Admin/index.html:33
+msgid "Manage groups and group membership"
+msgstr ""
+
+#: html/Admin/index.html:39
+msgid "Manage properties and configuration which apply to all queues"
+msgstr ""
+
+#: html/Admin/index.html:36
+msgid "Manage queues and queue-specific properties"
+msgstr ""
+
+#: html/Admin/index.html:30
+msgid "Manage users and passwords"
+msgstr ""
+
+#: lib/RT/Date.pm:413
+msgid "Mar."
+msgstr "Maasis"
+
+#: NOT FOUND IN SOURCE
+msgid "March"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "May"
+msgstr ""
+
+#: lib/RT/Date.pm:415
+msgid "May."
+msgstr "Touko"
+
+#: lib/RT/Group_Overlay.pm:982
+msgid "Member added"
+msgstr "Jäsen lisätty"
+
+#: lib/RT/Group_Overlay.pm:1140
+msgid "Member deleted"
+msgstr "Jäsen poistettu"
+
+#: lib/RT/Group_Overlay.pm:1144
+msgid "Member not deleted"
+msgstr "Jäsentä ei poistettu"
+
+#: html/Elements/SelectLinkType:26
+msgid "Member of"
+msgstr "Jäsen:"
+
+#: NOT FOUND IN SOURCE
+msgid "MemberOf"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:42 html/User/Elements/GroupTabs:42
+msgid "Members"
+msgstr "Jäsenet"
+
+#: lib/RT/Ticket_Overlay.pm:2843
+msgid "Merge Successful"
+msgstr "Yhdistäminen onnistui"
+
+#: lib/RT/Ticket_Overlay.pm:2804
+msgid "Merge failed. Couldn't set EffectiveId"
+msgstr "Yhdistäminen epäonnistui. EffectiveId:n arvoa ei pystytty asettamaan"
+
+#: html/Ticket/Elements/EditLinks:115
+msgid "Merge into"
+msgstr "Yhdistä"
+
+#: html/Ticket/Update.html:102
+msgid "Message"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:867
+msgid "Missing a primary key?: %1"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:169 html/User/Prefs.html:54
+msgid "Mobile"
+msgstr "Käsipuhelin"
+
+#: html/Admin/Elements/ModifyUser:72
+msgid "MobilePhone"
+msgstr "Käsipuhelin"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "Modify Access Control List"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Field %1"
+msgstr "Muokkaa kenttää %1"
+
+#: html/Admin/Global/CustomFields.html:44 html/Admin/Global/index.html:51
+msgid "Modify Custom Fields which apply to all queues"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "Modify Scrip templates for this queue"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "Modify Scrips for this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify System ACLS"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Template %1"
+msgstr ""
+
+#: html/Admin/Queues/CustomField.html:45
+#. ($QueueObj->Name())
+msgid "Modify a CustomField for queue %1"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:53
+msgid "Modify a CustomField which applies to all queues"
+msgstr ""
+
+#: html/Admin/Queues/Scrip.html:54
+#. ($QueueObj->Name)
+msgid "Modify a scrip for queue %1"
+msgstr ""
+
+#: html/Admin/Global/Scrip.html:48
+msgid "Modify a scrip which applies to all queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify dates for # %1"
+msgstr ""
+
+#: html/Ticket/ModifyDates.html:25 html/Ticket/ModifyDates.html:29
+#. ($TicketObj->Id)
+msgid "Modify dates for #%1"
+msgstr "Muokkaa työpyynnön #%1 päiviä"
+
+#: html/Ticket/ModifyDates.html:35
+#. ($TicketObj->Id)
+msgid "Modify dates for ticket # %1"
+msgstr "Muokkaa työpyynnön #%1 päiviä"
+
+#: html/Admin/Global/GroupRights.html:25 html/Admin/Global/GroupRights.html:28 html/Admin/Global/index.html:56
+msgid "Modify global group rights"
+msgstr "Muokkaa ryhmien globaaleja oikeuksia"
+
+#: html/Admin/Global/GroupRights.html:33
+msgid "Modify global group rights."
+msgstr "Muokkaa ryhmien globaaleja oikeuksia."
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for groups"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for users"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global scrips"
+msgstr "Muokkaa globaaleja lappuja"
+
+#: html/Admin/Global/UserRights.html:25 html/Admin/Global/UserRights.html:28 html/Admin/Global/index.html:60
+msgid "Modify global user rights"
+msgstr ""
+
+#: html/Admin/Global/UserRights.html:33
+msgid "Modify global user rights."
+msgstr "Muokkaa käyttäjien globaaleja oikeuksia."
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "Modify group metadata or delete group"
+msgstr ""
+
+#: html/Admin/Groups/GroupRights.html:25 html/Admin/Groups/GroupRights.html:29 html/Admin/Groups/GroupRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify group rights for group %1"
+msgstr "Muokkaa ryhmän %1 oikeuksia."
+
+#: html/Admin/Queues/GroupRights.html:25 html/Admin/Queues/GroupRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify group rights for queue %1"
+msgstr "Muokkaa ryhmän oikeuksia työjonossa %1"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "Modify membership roster for this group"
+msgstr ""
+
+#: lib/RT/System.pm:61
+msgid "Modify one's own RT account"
+msgstr ""
+
+#: html/Admin/Queues/People.html:25 html/Admin/Queues/People.html:29
+#. ($QueueObj->Name)
+msgid "Modify people related to queue %1"
+msgstr "Muokkaa työjonoon %1 liittyviä käyttäjiä"
+
+#: html/Ticket/ModifyPeople.html:25 html/Ticket/ModifyPeople.html:29 html/Ticket/ModifyPeople.html:35
+#. ($Ticket->id)
+#. ($Ticket->Id)
+msgid "Modify people related to ticket #%1"
+msgstr "Muokkaa työpyyntöön %1 liittyviä käyttäjiä"
+
+#: html/Admin/Queues/Scrips.html:44
+#. ($QueueObj->Name)
+msgid "Modify scrips for queue %1"
+msgstr "Muokkaa työjonoon %1 liittyviä lappuja"
+
+#: html/Admin/Global/Scrips.html:44 html/Admin/Global/index.html:42
+msgid "Modify scrips which apply to all queues"
+msgstr ""
+
+#: html/Admin/Global/Template.html:25 html/Admin/Global/Template.html:30 html/Admin/Global/Template.html:81 html/Admin/Queues/Template.html:78
+#. (loc($TemplateObj->Name()))
+#. ($TemplateObj->id)
+msgid "Modify template %1"
+msgstr "Muokkaa pohjaa %1"
+
+#: html/Admin/Global/Templates.html:44
+msgid "Modify templates which apply to all queues"
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:87 html/User/Groups/Modify.html:86
+#. ($Group->Name)
+msgid "Modify the group %1"
+msgstr "Muokkaa työjonoa %1"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "Modify the queue watchers"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:236
+#. ($UserObj->Name)
+msgid "Modify the user %1"
+msgstr "Muokkaa käyttäjää %1"
+
+#: html/Ticket/ModifyAll.html:37
+#. ($Ticket->Id)
+msgid "Modify ticket # %1"
+msgstr "Muokkaa työpyyntöä #%1"
+
+#: html/Ticket/Modify.html:25 html/Ticket/Modify.html:28 html/Ticket/Modify.html:34
+#. ($TicketObj->Id)
+msgid "Modify ticket #%1"
+msgstr "Muokkaa työpyyntöä #%1"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "Modify tickets"
+msgstr ""
+
+#: html/Admin/Groups/UserRights.html:25 html/Admin/Groups/UserRights.html:29 html/Admin/Groups/UserRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify user rights for group %1"
+msgstr "Muokkaa ryhmän %1 käyttäjien oikeuksia"
+
+#: html/Admin/Queues/UserRights.html:25 html/Admin/Queues/UserRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify user rights for queue %1"
+msgstr "Muokkaa työjonoon %1 liittyviä käyttäjien oikeuksia"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify watchers for queue '%1'"
+msgstr "Muokkaa työpyynnön %1 katselijoita"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ModifyACL"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "ModifyOwnMembership"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "ModifyQueueWatchers"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "ModifyScrips"
+msgstr ""
+
+#: lib/RT/System.pm:61
+msgid "ModifySelf"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "ModifyTemplate"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "ModifyTicket"
+msgstr ""
+
+#: lib/RT/Date.pm:388
+msgid "Mon."
+msgstr "Ma"
+
+#: html/Ticket/Elements/ShowRequestor:42
+#. ($name)
+msgid "More about %1"
+msgstr "Lisätietoa: %1"
+
+#: html/Admin/Elements/EditCustomFields:61
+msgid "Move down"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:53
+msgid "Move up"
+msgstr ""
+
+#: html/Admin/Elements/SelectSingleOrMultiple:27
+msgid "Multiple"
+msgstr "Monta"
+
+#: lib/RT/User_Overlay.pm:179
+msgid "Must specify 'Name' attribute"
+msgstr "'Nimi' täytyy määritellä"
+
+#: NOT FOUND IN SOURCE
+msgid "My Approvals"
+msgstr ""
+
+#: html/Approvals/index.html:25 html/Approvals/index.html:26
+msgid "My approvals"
+msgstr ""
+
+#: html/Admin/Elements/AddCustomFieldValue:26 html/Admin/Elements/EditCustomField:32 html/Admin/Elements/ModifyTemplate:28 html/Admin/Elements/ModifyUser:30 html/Admin/Groups/Modify.html:44 html/Elements/SelectGroups:26 html/Elements/SelectUsers:28 html/User/Groups/Modify.html:44
+msgid "Name"
+msgstr "Nimi"
+
+#: lib/RT/User_Overlay.pm:186
+msgid "Name in use"
+msgstr "Nimi on käytössä"
+
+#: NOT FOUND IN SOURCE
+msgid "Need approval from system administrator"
+msgstr ""
+
+#: html/Ticket/Elements/ShowDates:52
+msgid "Never"
+msgstr ""
+
+#: html/Elements/Quicksearch:30
+msgid "New"
+msgstr "Uusi"
+
+#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:93 html/User/Prefs.html:65
+msgid "New Password"
+msgstr "Uusi salasana"
+
+#: etc/initialdata:311 etc/upgrade/2.1.71:16
+msgid "New Pending Approval"
+msgstr ""
+
+#: html/Ticket/Elements/EditLinks:111
+msgid "New Relationships"
+msgstr "Uusi linkki"
+
+#: html/Ticket/Elements/Tabs:36
+msgid "New Search"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:41 html/Admin/Global/CustomFields.html:39 html/Admin/Queues/CustomField.html:52 html/Admin/Queues/CustomFields.html:40
+msgid "New custom field"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:54 html/User/Elements/GroupTabs:52
+msgid "New group"
+msgstr ""
+
+#: html/SelfService/Prefs.html:32
+msgid "New password"
+msgstr "Uusi salasana"
+
+#: lib/RT/User_Overlay.pm:639
+msgid "New password notification sent"
+msgstr "Uusi salasana"
+
+#: html/Admin/Elements/QueueTabs:70
+msgid "New queue"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:63
+msgid "New request"
+msgstr "Uusi työpyyntö"
+
+#: html/Admin/Elements/SelectRights:42
+msgid "New rights"
+msgstr "Uudet oikeudet"
+
+#: html/Admin/Global/Scrip.html:40 html/Admin/Global/Scrips.html:39 html/Admin/Queues/Scrip.html:43 html/Admin/Queues/Scrips.html:53
+msgid "New scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "New search"
+msgstr "Uusi haku"
+
+#: html/Admin/Global/Template.html:60 html/Admin/Global/Templates.html:39 html/Admin/Queues/Template.html:58 html/Admin/Queues/Templates.html:46
+msgid "New template"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2771
+msgid "New ticket doesn't exist"
+msgstr "Uutta työpyyntöä ei löydy"
+
+#: html/Admin/Elements/UserTabs:52
+msgid "New user"
+msgstr ""
+
+#: html/Admin/Elements/CreateUserCalled:26
+msgid "New user called"
+msgstr "Uusi käyttäjä pyydetty"
+
+#: html/Admin/Queues/People.html:55 html/Ticket/Elements/EditPeople:29
+msgid "New watchers"
+msgstr "Uusi tarkkailija"
+
+#: html/Admin/Users/Prefs.html:42
+msgid "New window setting"
+msgstr "Uusi ikkunan asetus"
+
+#: html/Ticket/Elements/Tabs:69
+msgid "Next"
+msgstr "Seuraava"
+
+#: html/Search/Listing.html:48
+msgid "Next page"
+msgstr "Seuraava sivu"
+
+#: html/Admin/Elements/ModifyUser:50
+msgid "NickName"
+msgstr "Lempinimi"
+
+#: html/Admin/Users/Modify.html:63 html/User/Prefs.html:46
+msgid "Nickname"
+msgstr "Lempinimi"
+
+#: html/Admin/Elements/EditCustomField:73 html/Admin/Elements/EditCustomFields:105
+msgid "No CustomField"
+msgstr "Ei kenttiä"
+
+#: html/Admin/Groups/GroupRights.html:84 html/Admin/Groups/UserRights.html:71
+msgid "No Group defined"
+msgstr "Ryhmää ei ole määritelty"
+
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:68
+msgid "No Queue defined"
+msgstr "Työjonoa ei ole määritelty"
+
+#: bin/rt-crontool:56
+msgid "No RT user found. Please consult your RT administrator.\\n"
+msgstr "Käyttäjää ei löydy. Ole hyvä ja ota yhteyttä RT:n ylläpitäjään.\\n"
+
+#: html/Admin/Global/Template.html:79 html/Admin/Queues/Template.html:76
+msgid "No Template"
+msgstr "Ei pohjaa"
+
+#: bin/rt-commit-handler:764
+msgid "No Ticket specified. Aborting ticket "
+msgstr "Työpyyntöä ei määritelty. Poistutaan työpyynnöstä"
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgstr "Työpyyntöä ei määritelty. Poistutaan työpyynnön muokkauksesta\\n\\n"
+
+#: html/Approvals/Elements/Approve:47
+msgid "No action"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:862
+msgid "No column specified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "No command found\\n"
+msgstr "Komentoa ei löytynyt\\n"
+
+#: html/Elements/ViewUser:36 html/Ticket/Elements/ShowRequestor:45
+msgid "No comment entered about this user"
+msgstr "Tälle käyttäjälle ei ole annettu kommentteja"
+
+#: lib/RT/Ticket_Overlay.pm:2189 lib/RT/Ticket_Overlay.pm:2257
+msgid "No correspondence attached"
+msgstr "Ei kirjeenvaihtoa liitettynä"
+
+#: lib/RT/Action/Generic.pm:150 lib/RT/Condition/Generic.pm:176 lib/RT/Search/ActiveTicketsInQueue.pm:56 lib/RT/Search/Generic.pm:113
+#. (ref $self)
+msgid "No description for %1"
+msgstr "Ei kuvausta kohteelle %1"
+
+#: lib/RT/Users_Overlay.pm:151
+msgid "No group specified"
+msgstr "Ryhmää ei ole määritelty"
+
+#: lib/RT/User_Overlay.pm:857
+msgid "No password set"
+msgstr "Salasanaa ei ole asetettu"
+
+#: lib/RT/Queue_Overlay.pm:259
+msgid "No permission to create queues"
+msgstr "Ei oikeutta luoda kyselyitä"
+
+#: lib/RT/Ticket_Overlay.pm:341
+#. ($QueueObj->Name)
+msgid "No permission to create tickets in the queue '%1'"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:151
+msgid "No permission to create users"
+msgstr "Ei oikeutta luoda käyttäjiä"
+
+#: html/SelfService/Display.html:174
+msgid "No permission to display that ticket"
+msgstr "Ei oikeutta tarkastella tätä työpyyntöä"
+
+#: html/SelfService/Update.html:55
+msgid "No permission to view update ticket"
+msgstr "Ei oikeutta päivittää tätä työpyyntöä"
+
+#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1488
+msgid "No principal specified"
+msgstr "Toimeksiantajaa ei ole määritelty"
+
+#: html/Admin/Queues/People.html:154 html/Admin/Queues/People.html:164
+msgid "No principals selected."
+msgstr "Johtajia ei ole valittu."
+
+#: html/Admin/Queues/index.html:35
+msgid "No queues matching search criteria found."
+msgstr "Yhtään hakukriteerit täyttävää työpyyntöä ei löytynyt."
+
+#: html/Admin/Elements/SelectRights:81
+msgid "No rights found"
+msgstr ""
+
+#: html/Admin/Elements/SelectRights:33
+msgid "No rights granted."
+msgstr "Ei oikeuksia"
+
+#: html/Search/Bulk.html:149
+msgid "No search to operate on."
+msgstr "Ei hakua jonka kanssa työskennellä"
+
+#: NOT FOUND IN SOURCE
+msgid "No ticket id specified"
+msgstr "Työpyynnön numeroa ei ole määritelty"
+
+#: lib/RT/Transaction_Overlay.pm:480 lib/RT/Transaction_Overlay.pm:518
+msgid "No transaction type specified"
+msgstr "Toiminnon tyyppiä ei ole määritelty"
+
+#: NOT FOUND IN SOURCE
+msgid "No user or email address specified"
+msgstr ""
+
+#: html/Admin/Users/index.html:36
+msgid "No users matching search criteria found."
+msgstr "Yhtään hakukriteerit täyttävää käyttäjää ei löytynyt."
+
+#: bin/rt-commit-handler:644
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr "Ei kelpaa RT käyttäjäksi. RT cvs käsittelijä irrottautuu. Ole hyvä ja ota yhteyttä RT:n ylläpitäjään.\\n"
+
+#: lib/RT/Interface/Web.pm:859
+msgid "No value sent to _Set!\\n"
+msgstr ""
+
+#: html/Search/Elements/TicketRow:37
+msgid "Nobody"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:864
+msgid "Nonexistant field?"
+msgstr ""
+
+#: html/Elements/Login:99
+msgid "Not logged in"
+msgstr ""
+
+#: html/Elements/Header:59 html/SelfService/Elements/Header:58
+msgid "Not logged in."
+msgstr "Et ole kirjautunut järjestelmään"
+
+#: lib/RT/Date.pm:369
+msgid "Not set"
+msgstr "Ei asetettu"
+
+#: html/NoAuth/Reminder.html:27
+msgid "Not yet implemented."
+msgstr "Ei vielä implementoitu."
+
+#: html/Admin/Groups/Rights.html:25
+msgid "Not yet implemented...."
+msgstr "Ei vielä implementoitu..."
+
+#: html/Approvals/Elements/Approve:50
+msgid "Notes"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:642
+msgid "Notification could not be sent"
+msgstr "Ilmoitusta ei pystytty lähettämään"
+
+#: etc/initialdata:94
+msgid "Notify AdminCcs"
+msgstr ""
+
+#: etc/initialdata:90
+msgid "Notify AdminCcs as Comment"
+msgstr ""
+
+#: etc/initialdata:121
+msgid "Notify Other Recipients"
+msgstr ""
+
+#: etc/initialdata:117
+msgid "Notify Other Recipients as Comment"
+msgstr ""
+
+#: etc/initialdata:86
+msgid "Notify Owner"
+msgstr ""
+
+#: etc/initialdata:82
+msgid "Notify Owner as Comment"
+msgstr ""
+
+#: etc/initialdata:313 etc/upgrade/2.1.71:17
+msgid "Notify Owners and AdminCcs of new items pending their approval"
+msgstr ""
+
+#: etc/initialdata:78
+msgid "Notify Requestors"
+msgstr ""
+
+#: etc/initialdata:104
+msgid "Notify Requestors and Ccs"
+msgstr ""
+
+#: etc/initialdata:99
+msgid "Notify Requestors and Ccs as Comment"
+msgstr ""
+
+#: etc/initialdata:113
+msgid "Notify Requestors, Ccs and AdminCcs"
+msgstr ""
+
+#: etc/initialdata:109
+msgid "Notify Requestors, Ccs and AdminCcs as Comment"
+msgstr ""
+
+#: lib/RT/Date.pm:421
+msgid "Nov."
+msgstr "Marras"
+
+#: NOT FOUND IN SOURCE
+msgid "November"
+msgstr ""
+
+#: lib/RT/Record.pm:157
+msgid "Object could not be created"
+msgstr ""
+
+#: lib/RT/Record.pm:176
+msgid "Object created"
+msgstr ""
+
+#: lib/RT/Date.pm:420
+msgid "Oct."
+msgstr "Loka"
+
+#: NOT FOUND IN SOURCE
+msgid "October"
+msgstr ""
+
+#: html/Elements/SelectDateRelation:35
+msgid "On"
+msgstr "-"
+
+#: etc/initialdata:155
+msgid "On Comment"
+msgstr ""
+
+#: etc/initialdata:148
+msgid "On Correspond"
+msgstr ""
+
+#: etc/initialdata:137
+msgid "On Create"
+msgstr ""
+
+#: etc/initialdata:169
+msgid "On Owner Change"
+msgstr ""
+
+#: etc/initialdata:177
+msgid "On Queue Change"
+msgstr ""
+
+#: etc/initialdata:183
+msgid "On Resolve"
+msgstr ""
+
+#: etc/initialdata:161
+msgid "On Status Change"
+msgstr ""
+
+#: etc/initialdata:142
+msgid "On Transaction"
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:50
+#. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
+msgid "Only show approvals for requests created after %1"
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:48
+#. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
+msgid "Only show approvals for requests created before %1"
+msgstr ""
+
+#: html/Elements/Quicksearch:31
+msgid "Open"
+msgstr "Avoin"
+
+#: html/Ticket/Elements/Tabs:136
+msgid "Open it"
+msgstr "Avaa"
+
+#: html/SelfService/Elements/Tabs:57
+msgid "Open requests"
+msgstr "Avoimet työpyynnöt"
+
+#: html/Admin/Users/Prefs.html:41
+msgid "Open tickets (from listing) in a new window"
+msgstr "Avoimet työpyynnöt (listasta) uudessa ikkunassa"
+
+#: html/Admin/Users/Prefs.html:40
+msgid "Open tickets (from listing) in another window"
+msgstr "Avoimet työpyynnöt (listasta) toisessa ikkunassa"
+
+#: etc/initialdata:133
+msgid "Open tickets on correspondence"
+msgstr ""
+
+#: html/Search/Elements/PickRestriction:101
+msgid "Ordering and sorting"
+msgstr "Järjestäminen"
+
+#: html/Admin/Elements/ModifyUser:46 html/Admin/Users/Modify.html:117 html/Elements/SelectUsers:29 html/User/Prefs.html:86
+msgid "Organization"
+msgstr "Organisaatio"
+
+#: html/Approvals/Elements/Approve:34
+#. ($approving->Id, $approving->Subject)
+msgid "Originating ticket: #%1"
+msgstr ""
+
+#: html/Admin/Elements/ModifyQueue:55 html/Admin/Queues/Modify.html:69
+msgid "Over time, priority moves toward"
+msgstr "Ajan kuluessa prioriteetti muuttuu kohti"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "Own tickets"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "OwnTicket"
+msgstr ""
+
+#: etc/initialdata:38 html/Elements/MyRequests:32 html/SelfService/Elements/MyRequests:30 html/Ticket/Create.html:48 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/EditPeople:44 html/Ticket/Elements/ShowPeople:27 html/Ticket/Update.html:63 lib/RT/ACE_Overlay.pm:86 lib/RT/Tickets_Overlay.pm:1244
+msgid "Owner"
+msgstr "Omistaja"
+
+#: lib/RT/Ticket_Overlay.pm:3004
+#. ($OldOwnerObj->Name,  $NewOwnerObj->Name)
+msgid "Owner changed from %1 to %2"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:584
+#. ($Old->Name , $New->Name)
+msgid "Owner forcibly changed from %1 to %2"
+msgstr "Omistaja pakottamalla muutettu arvosta %1 arvoon %2"
+
+#: html/Search/Elements/PickRestriction:31
+msgid "Owner is"
+msgstr "Omistaja on"
+
+#: html/Admin/Users/Modify.html:174 html/User/Prefs.html:56
+msgid "Pager"
+msgstr "Hakulaite"
+
+#: html/Admin/Elements/ModifyUser:74
+msgid "PagerPhone"
+msgstr "Hakulaite puhelin"
+
+#: html/Ticket/Create.html:182 html/Ticket/Elements/EditLinks:127 html/Ticket/Elements/EditLinks:58 html/Ticket/Elements/ShowLinks:43
+msgid "Parents"
+msgstr "Isät"
+
+#: html/Elements/Login:43 html/User/Prefs.html:61
+msgid "Password"
+msgstr "Salasana"
+
+#: html/NoAuth/Reminder.html:25
+msgid "Password Reminder"
+msgstr "Salasanan muistuttaja"
+
+#: lib/RT/User_Overlay.pm:168 lib/RT/User_Overlay.pm:860
+msgid "Password too short"
+msgstr "Salasana liian lyhyt"
+
+#: html/Admin/Users/Modify.html:291 html/User/Prefs.html:172
+#. (loc_fuzzy($msg))
+msgid "Password: %1"
+msgstr "Salasana: %1"
+
+#: html/Ticket/Elements/ShowSummary:43 html/Ticket/Elements/Tabs:96 html/Ticket/ModifyAll.html:51
+msgid "People"
+msgstr "Käyttäjät"
+
+#: etc/initialdata:126
+msgid "Perform a user-defined action"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:231 lib/RT/ACE_Overlay.pm:237 lib/RT/ACE_Overlay.pm:563 lib/RT/ACE_Overlay.pm:573 lib/RT/ACE_Overlay.pm:583 lib/RT/ACE_Overlay.pm:648 lib/RT/CurrentUser.pm:83 lib/RT/CurrentUser.pm:92 lib/RT/CustomField_Overlay.pm:445 lib/RT/CustomField_Overlay.pm:451 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1099 lib/RT/Group_Overlay.pm:1108 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1163 lib/RT/Group_Overlay.pm:1169 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:904 lib/RT/Group_Overlay.pm:908 lib/RT/Group_Overlay.pm:921 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:931 lib/RT/Scrip_Overlay.pm:126 lib/RT/Scrip_Overlay.pm:137 lib/RT/Scrip_Overlay.pm:197 lib/RT/Scrip_Overlay.pm:430 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:88 lib/RT/Template_Overlay.pm:94 lib/RT/Ticket_Overlay.pm:1341 lib/RT/Ticket_Overlay.pm:1351 lib/RT/Ticket_Overlay.pm:1365 lib/RT/Ticket_Overlay.pm:1518 lib/RT/Ticket_Overlay.pm:1527 lib/RT/Ticket_Overlay.pm:1540 lib/RT/Ticket_Overlay.pm:1875 lib/RT/Ticket_Overlay.pm:2013 lib/RT/Ticket_Overlay.pm:2177 lib/RT/Ticket_Overlay.pm:2244 lib/RT/Ticket_Overlay.pm:2596 lib/RT/Ticket_Overlay.pm:2668 lib/RT/Ticket_Overlay.pm:2762 lib/RT/Ticket_Overlay.pm:2777 lib/RT/Ticket_Overlay.pm:2910 lib/RT/Ticket_Overlay.pm:3139 lib/RT/Ticket_Overlay.pm:3337 lib/RT/Ticket_Overlay.pm:3499 lib/RT/Ticket_Overlay.pm:3551 lib/RT/Ticket_Overlay.pm:3716 lib/RT/Transaction_Overlay.pm:468 lib/RT/Transaction_Overlay.pm:475 lib/RT/Transaction_Overlay.pm:504 lib/RT/Transaction_Overlay.pm:511 lib/RT/User_Overlay.pm:1334 lib/RT/User_Overlay.pm:562 lib/RT/User_Overlay.pm:597 lib/RT/User_Overlay.pm:853 lib/RT/User_Overlay.pm:941
+msgid "Permission Denied"
+msgstr "Pääsy kielletty"
+
+#: html/User/Elements/Tabs:35
+msgid "Personal Groups"
+msgstr ""
+
+#: html/User/Groups/index.html:30 html/User/Groups/index.html:40
+msgid "Personal groups"
+msgstr "Omat ryhmät"
+
+#: html/User/Elements/DelegateRights:37
+msgid "Personal groups:"
+msgstr "Omat ryhmät:"
+
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:49
+msgid "Phone numbers"
+msgstr "Puhelinnumerot"
+
+#: html/Admin/Users/Rights.html:25
+msgid "Placeholder"
+msgstr "Paikanpitäjä"
+
+#: html/Elements/Header:52 html/Elements/Tabs:55 html/SelfService/Prefs.html:25 html/User/Prefs.html:25 html/User/Prefs.html:28
+msgid "Preferences"
+msgstr "Asetukset"
+
+#: NOT FOUND IN SOURCE
+msgid "Prefs"
+msgstr "Asetukset"
+
+#: lib/RT/Action/Generic.pm:160
+msgid "Prepare Stubbed"
+msgstr "Valmistele tumppi"
+
+#: html/Ticket/Elements/Tabs:61
+msgid "Prev"
+msgstr "Edellinen"
+
+#: html/Search/Listing.html:44
+msgid "Previous page"
+msgstr "Edellinen sivu"
+
+#: NOT FOUND IN SOURCE
+msgid "Pri"
+msgstr "Pri"
+
+#: lib/RT/ACE_Overlay.pm:133 lib/RT/ACE_Overlay.pm:208 lib/RT/ACE_Overlay.pm:552
+#. ($args{'PrincipalId'})
+msgid "Principal %1 not found."
+msgstr ""
+
+#: html/Search/Elements/PickRestriction:54 html/SelfService/Display.html:76 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:54 html/Ticket/Elements/ShowBasics:39 lib/RT/Tickets_Overlay.pm:1042
+msgid "Priority"
+msgstr "Prioriteetti"
+
+#: html/Admin/Elements/ModifyQueue:51 html/Admin/Queues/Modify.html:65
+msgid "Priority starts at"
+msgstr "Prioriteetti alkaa arvosta"
+
+#: etc/initialdata:25
+msgid "Privileged"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:271 html/User/Prefs.html:163
+#. (loc_fuzzy($msg))
+msgid "Privileged status: %1"
+msgstr "Etuoikeutuksen tila: &1"
+
+#: html/Admin/Users/index.html:62
+msgid "Privileged users"
+msgstr "Etuoikeutetut käyttäjät"
+
+#: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
+msgid "Pseudogroup for internal use"
+msgstr ""
+
+#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Elements/Quicksearch:29 html/Search/Elements/PickRestriction:46 html/SelfService/Create.html:35 html/SelfService/Display.html:68 html/Ticket/Create.html:38 html/Ticket/Elements/EditBasics:64 html/Ticket/Elements/ShowBasics:43 html/User/Elements/DelegateRights:80 lib/RT/Tickets_Overlay.pm:883
+msgid "Queue"
+msgstr "Työjono"
+
+#: html/Admin/Queues/CustomField.html:42 html/Admin/Queues/Scrip.html:50 html/Admin/Queues/Scrips.html:46 html/Admin/Queues/Templates.html:43
+#. ($Queue)
+#. ($id)
+msgid "Queue %1 not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Queue '%1' not found\\n"
+msgstr "Työjonoa '%1' ei löytynyt"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Keyword Selections"
+msgstr ""
+
+#: html/Admin/Elements/ModifyQueue:31 html/Admin/Queues/Modify.html:43
+msgid "Queue Name"
+msgstr "Työjonon nimi"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Scrips"
+msgstr "Työjonon laput"
+
+#: lib/RT/Queue_Overlay.pm:263
+msgid "Queue already exists"
+msgstr "Työjono on jo olemassa"
+
+#: lib/RT/Queue_Overlay.pm:272 lib/RT/Queue_Overlay.pm:278
+msgid "Queue could not be created"
+msgstr "Työjonoa ei voitu luoda"
+
+#: html/Ticket/Create.html:209
+msgid "Queue could not be loaded."
+msgstr "Työjonoa ei voitu ladata."
+
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:282
+msgid "Queue created"
+msgstr "Työjono luotu"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue is not specified."
+msgstr ""
+
+#: html/SelfService/Display.html:129
+msgid "Queue not found"
+msgstr "Työjonoa ei löytynyt"
+
+#: html/Admin/Elements/Tabs:38 html/Admin/index.html:35
+msgid "Queues"
+msgstr "Työjonot"
+
+#: html/Elements/Login:34
+#. ($RT::VERSION)
+msgid "RT %1"
+msgstr ""
+
+#: docs/design_docs/string-extraction-guide.txt:70
+#. ($RT::VERSION, $RT::rtname)
+msgid "RT %1 for %2"
+msgstr "RT %1 - %2"
+
+#: html/Elements/Footer:32
+#. ($RT::VERSION)
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr "RT %1, tekijä <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: html/Admin/index.html:25 html/Admin/index.html:26
+msgid "RT Administration"
+msgstr "RT Ylläpito"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Authentication error."
+msgstr "RT Virhe tunnistamisessa"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Bounce: %1"
+msgstr "RT palautus: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Configuration error"
+msgstr "RT Konfiguraatiovirhe"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Critical error. Message not recorded!"
+msgstr "RT Kriittinen virhe. Viestiä ei tallennettu!"
+
+#: html/Elements/Error:41 html/SelfService/Error.html:41
+msgid "RT Error"
+msgstr "RT Virhe"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Received mail (%1) from itself."
+msgstr "RT Sai sähköpostin (%1) itseltään."
+
+#: NOT FOUND IN SOURCE
+msgid "RT Recieved mail (%1) from itself."
+msgstr ""
+
+#: html/SelfService/Closed.html:25
+msgid "RT Self Service / Closed Tickets"
+msgstr "RT Itsepalvelu / Suljetut työpyynnöt"
+
+#: html/index.html:25 html/index.html:28
+msgid "RT at a glance"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't authenticate you"
+msgstr "RT Ei pystynyt tunnistamaan sinua"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find requestor via its external database lookup"
+msgstr "RT ei löytänyt tilaajaa ulkopuolisesta tietokannasta"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find the queue: %1"
+msgstr "RT ei löytänyt työjonoa: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't validate this PGP signature. \\n"
+msgstr "RT ei pystynyt tarkistamaan tätä PGP allekirjoitusta.\\n"
+
+#: html/Elements/PageLayout:26
+#. ($RT::rtname)
+msgid "RT for %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT has proccessed your commands"
+msgstr "RT on prosessoinut antamasi komennot"
+
+#: html/Elements/Login:83
+#. ('2003')
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT on tekijänoikeuslain alainen, &copy; 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;. Se on jakelussa seuraavalla lisenssillä: <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+
+#: NOT FOUND IN SOURCE
+msgid "RT thinks this message may be a bounce"
+msgstr "RT luulee että tämä viesti on palautus"
+
+#: NOT FOUND IN SOURCE
+msgid "RT will process this message as if it were unsigned.\\n"
+msgstr "RT prosessoi tämän viestin kuten se olisi allekirjoittamaton."
+
+#: NOT FOUND IN SOURCE
+msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+msgstr "RT:n sähköpostiohjaus moodi vaatii PGP tunnistamista. Et allekirjoittanut (PGP) viestiä tai allekirjoitustasi ei pystytty varmistamaan."
+
+#: html/Admin/Users/Modify.html:58 html/Admin/Users/Prefs.html:52 html/User/Prefs.html:44
+msgid "Real Name"
+msgstr "Oikea nimi"
+
+#: html/Admin/Elements/ModifyUser:48
+msgid "RealName"
+msgstr "Oikea nimi"
+
+#: html/Ticket/Create.html:185 html/Ticket/Elements/EditLinks:139 html/Ticket/Elements/EditLinks:94 html/Ticket/Elements/ShowLinks:63
+msgid "Referred to by"
+msgstr "Viitattu jostakin"
+
+#: html/Elements/SelectLinkType:28 html/Ticket/Create.html:184 html/Ticket/Elements/EditLinks:135 html/Ticket/Elements/EditLinks:80 html/Ticket/Elements/ShowLinks:55
+msgid "Refers to"
+msgstr "Viittaus johonkin"
+
+#: NOT FOUND IN SOURCE
+msgid "RefersTo"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Refine"
+msgstr "Päivitä"
+
+#: html/Search/Elements/PickRestriction:27
+msgid "Refine search"
+msgstr "Päivitä haku"
+
+#: html/Elements/Refresh:36
+#. ($value/60)
+msgid "Refresh this page every %1 minutes."
+msgstr "Päivitä tämä sivu %1 minuutin välein"
+
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:60 html/Ticket/ModifyAll.html:57
+msgid "Relationships"
+msgstr "Linkit"
+
+#: html/Search/Bulk.html:93
+msgid "Remove AdminCc"
+msgstr "Poista kopio ylläpidolle"
+
+#: html/Search/Bulk.html:91
+msgid "Remove Cc"
+msgstr "Poista kopio"
+
+#: html/Search/Bulk.html:89
+msgid "Remove Requestor"
+msgstr "Poista tilaaja"
+
+#: html/Ticket/Elements/ShowTransaction:173 html/Ticket/Elements/Tabs:122
+msgid "Reply"
+msgstr "Vastaa"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "Reply to tickets"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "ReplyToTicket"
+msgstr ""
+
+#: etc/initialdata:44 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:87
+msgid "Requestor"
+msgstr "Tilaaja"
+
+#: html/Search/Elements/PickRestriction:38
+msgid "Requestor email address"
+msgstr "Tilaajan sähköpostiosoite"
+
+#: NOT FOUND IN SOURCE
+msgid "Requestor(s)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RequestorAddresses"
+msgstr ""
+
+#: html/SelfService/Create.html:43 html/SelfService/Display.html:42 html/Ticket/Create.html:56 html/Ticket/Elements/EditPeople:48 html/Ticket/Elements/ShowPeople:31
+msgid "Requestors"
+msgstr "Tilaajat"
+
+#: html/Admin/Elements/ModifyQueue:61 html/Admin/Queues/Modify.html:75
+msgid "Requests should be due in"
+msgstr "Työpyyntö tulisi suorittaa mennessä"
+
+#: html/Elements/Submit:62
+msgid "Reset"
+msgstr "Palauta"
+
+#: html/Admin/Users/Modify.html:159 html/User/Prefs.html:50
+msgid "Residence"
+msgstr "Asuinpaikka"
+
+#: html/Ticket/Elements/Tabs:132
+msgid "Resolve"
+msgstr "Päätä"
+
+#: html/Ticket/Update.html:133
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Resolve ticket #%1 (%2)"
+msgstr ""
+
+#: etc/initialdata:302 html/Elements/SelectDateType:28 lib/RT/Ticket_Overlay.pm:1170
+msgid "Resolved"
+msgstr "Päätetty"
+
+#: html/Search/Bulk.html:123 html/Ticket/ModifyAll.html:73 html/Ticket/Update.html:73
+msgid "Response to requestors"
+msgstr "Vastaus tilaajille"
+
+#: html/Elements/ListActions:26
+msgid "Results"
+msgstr "Tulokset"
+
+#: html/Search/Elements/PickRestriction:105
+msgid "Results per page"
+msgstr "Tulosta sivulle"
+
+#: html/Admin/Elements/ModifyUser:33 html/Admin/Users/Modify.html:100 html/User/Prefs.html:72
+msgid "Retype Password"
+msgstr "Varmista salasana"
+
+#: NOT FOUND IN SOURCE
+msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+msgstr "Oikeutta %1 ei löydetty %2  %3 laajuudessa %4 (%5)\\n"
+
+#: lib/RT/ACE_Overlay.pm:613
+msgid "Right Delegated"
+msgstr "Oikeus delegoitu"
+
+#: lib/RT/ACE_Overlay.pm:303
+msgid "Right Granted"
+msgstr "Oikeus delegoitu"
+
+#: lib/RT/ACE_Overlay.pm:161
+msgid "Right Loaded"
+msgstr "Oikeus ladattu"
+
+#: lib/RT/ACE_Overlay.pm:678 lib/RT/ACE_Overlay.pm:693
+msgid "Right could not be revoked"
+msgstr "Oikeutta ei voitu peruuttaa"
+
+#: html/User/Delegation.html:64
+msgid "Right not found"
+msgstr "Oikeutta ei löydetty"
+
+#: lib/RT/ACE_Overlay.pm:543 lib/RT/ACE_Overlay.pm:638
+msgid "Right not loaded."
+msgstr "Oikeutta ei ladattu"
+
+#: lib/RT/ACE_Overlay.pm:689
+msgid "Right revoked"
+msgstr "Oikeus peruutettu"
+
+#: html/Admin/Elements/UserTabs:41
+msgid "Rights"
+msgstr "Oikeudet"
+
+#: lib/RT/Interface/Web.pm:758
+#. ($object_type)
+msgid "Rights could not be granted for %1"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:791
+#. ($object_type)
+msgid "Rights could not be revoked for %1"
+msgstr ""
+
+#: html/Admin/Global/GroupRights.html:51 html/Admin/Queues/GroupRights.html:52
+msgid "Roles"
+msgstr "Roolit"
+
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr ""
+
+#: lib/RT/Date.pm:393
+msgid "Sat."
+msgstr "La"
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
+msgid "Save Changes"
+msgstr "Tallenna muutokset"
+
+#: html/Ticket/ModifyLinks.html:39
+msgid "Save changes"
+msgstr "Tallenna muutokset"
+
+#: html/Admin/Global/Scrip.html:49
+#. ($ARGS{'id'})
+msgid "Scrip #%1"
+msgstr ""
+
+#: lib/RT/Scrip_Overlay.pm:176
+msgid "Scrip Created"
+msgstr "Lappu luotu"
+
+#: html/Admin/Elements/EditScrips:84
+msgid "Scrip deleted"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:46 html/Admin/Elements/SystemTabs:33 html/Admin/Global/index.html:41
+msgid "Scrips"
+msgstr "Laput"
+
+#: NOT FOUND IN SOURCE
+msgid "Scrips for %1\\n"
+msgstr "Laput työjonolle %1\\n"
+
+#: html/Admin/Queues/Scrips.html:33
+msgid "Scrips which apply to all queues"
+msgstr ""
+
+#: html/Elements/SimpleSearch:27 html/Search/Elements/PickRestriction:126 html/Ticket/Elements/Tabs:159
+msgid "Search"
+msgstr "Hae"
+
+#: NOT FOUND IN SOURCE
+msgid "Search Criteria"
+msgstr "Hakukriteerit"
+
+#: html/Approvals/Elements/PendingMyApproval:39
+msgid "Search for approvals"
+msgstr ""
+
+#: bin/rt-crontool:188
+msgid "Security:"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "SeeQueue"
+msgstr ""
+
+#: html/Admin/Groups/index.html:40
+msgid "Select a group"
+msgstr "Valitse ryhmä"
+
+#: NOT FOUND IN SOURCE
+msgid "Select a queue"
+msgstr "Valitse työjono"
+
+#: html/Admin/Users/index.html:25 html/Admin/Users/index.html:28
+msgid "Select a user"
+msgstr "Valitse käyttäjä"
+
+#: html/Admin/Global/CustomField.html:38 html/Admin/Global/CustomFields.html:36
+msgid "Select custom field"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:52 html/User/Elements/GroupTabs:50
+msgid "Select group"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:355
+msgid "Select multiple values"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:352
+msgid "Select one value"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:67
+msgid "Select queue"
+msgstr ""
+
+#: html/Admin/Global/Scrip.html:37 html/Admin/Global/Scrips.html:36 html/Admin/Queues/Scrip.html:40 html/Admin/Queues/Scrips.html:50
+msgid "Select scrip"
+msgstr ""
+
+#: html/Admin/Global/Template.html:57 html/Admin/Global/Templates.html:36 html/Admin/Queues/Template.html:55
+msgid "Select template"
+msgstr ""
+
+#: html/Admin/Elements/UserTabs:49
+msgid "Select user"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "SelectMultiple"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectSingle"
+msgstr ""
+
+#: html/SelfService/index.html:25
+msgid "Self Service"
+msgstr "Itsepalvelu"
+
+#: etc/initialdata:114
+msgid "Send mail to all watchers"
+msgstr ""
+
+#: etc/initialdata:110
+msgid "Send mail to all watchers as a \"comment\""
+msgstr ""
+
+#: etc/initialdata:105
+msgid "Send mail to requestors and Ccs"
+msgstr ""
+
+#: etc/initialdata:100
+msgid "Send mail to requestors and Ccs as a comment"
+msgstr ""
+
+#: etc/initialdata:79
+msgid "Sends a message to the requestors"
+msgstr ""
+
+#: etc/initialdata:118 etc/initialdata:122
+msgid "Sends mail to explicitly listed Ccs and Bccs"
+msgstr ""
+
+#: etc/initialdata:95
+msgid "Sends mail to the administrative Ccs"
+msgstr ""
+
+#: etc/initialdata:91
+msgid "Sends mail to the administrative Ccs as a comment"
+msgstr ""
+
+#: etc/initialdata:83 etc/initialdata:87
+msgid "Sends mail to the owner"
+msgstr ""
+
+#: lib/RT/Date.pm:419
+msgid "Sep."
+msgstr "Syys"
+
+#: NOT FOUND IN SOURCE
+msgid "September"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Show Results"
+msgstr "Näytä tulokset"
+
+#: html/Approvals/Elements/PendingMyApproval:44
+msgid "Show approved requests"
+msgstr ""
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show basics"
+msgstr "Näytä perustiedot"
+
+#: html/Approvals/Elements/PendingMyApproval:45
+msgid "Show denied requests"
+msgstr ""
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show details"
+msgstr "Näytä yksityiskohdat"
+
+#: html/Approvals/Elements/PendingMyApproval:43
+msgid "Show pending requests"
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:46
+msgid "Show requests awaiting other approvals"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "Show ticket private commentary"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "Show ticket summaries"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "ShowACL"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "ShowScrips"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "ShowTemplate"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "ShowTicket"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "ShowTicketComments"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Sign up as a ticket Requestor or ticket or queue Cc"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "Sign up as a ticket or queue AdminCc"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:39 html/Admin/Users/Modify.html:191 html/Admin/Users/Prefs.html:32 html/SelfService/Prefs.html:37 html/User/Prefs.html:112
+msgid "Signature"
+msgstr "Allekirjoitus"
+
+#: html/SelfService/Elements/Header:52
+#. ($session{'CurrentUser'}->Name)
+msgid "Signed in as %1"
+msgstr ""
+
+#: html/Admin/Elements/SelectSingleOrMultiple:26
+msgid "Single"
+msgstr "Yksittäinen"
+
+#: html/Elements/Header:51
+msgid "Skip Menu"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFieldValues:31
+msgid "Sort key"
+msgstr "Järjestys"
+
+#: html/Search/Elements/PickRestriction:109
+msgid "Sort results by"
+msgstr "Järjestä tulokset"
+
+#: html/Admin/Elements/AddCustomFieldValue:25
+msgid "SortOrder"
+msgstr "Lajittelujärjestyt"
+
+#: NOT FOUND IN SOURCE
+msgid "Stalled"
+msgstr "Jäädytetty"
+
+#: NOT FOUND IN SOURCE
+msgid "Start page"
+msgstr "Etusivu"
+
+#: html/Elements/SelectDateType:27 html/Ticket/Elements/EditDates:32 html/Ticket/Elements/ShowDates:35
+msgid "Started"
+msgstr "Aloitettu"
+
+#: NOT FOUND IN SOURCE
+msgid "Started date '%1' could not be parsed"
+msgstr "Aloitettu -aikaa '%1' ei pystytty tulkitsemaan"
+
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:27 html/Ticket/Elements/ShowDates:31
+msgid "Starts"
+msgstr "Alkaa"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts By"
+msgstr "Alkaa mennessä"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts date '%1' could not be parsed"
+msgstr "Alkaa -aikaa '%1' ei pystytty tulkitsemaan"
+
+#: html/Admin/Elements/ModifyUser:82 html/Admin/Users/Modify.html:138 html/User/Prefs.html:94
+msgid "State"
+msgstr "Tila"
+
+#: html/Elements/MyRequests:31 html/Elements/MyTickets:31 html/Search/Elements/PickRestriction:74 html/SelfService/Display.html:59 html/SelfService/Elements/MyRequests:29 html/SelfService/Update.html:31 html/Ticket/Create.html:42 html/Ticket/Elements/EditBasics:38 html/Ticket/Elements/ShowBasics:31 html/Ticket/Update.html:60 lib/RT/Ticket_Overlay.pm:1164 lib/RT/Tickets_Overlay.pm:908
+msgid "Status"
+msgstr "Tila"
+
+#: etc/initialdata:288
+msgid "Status Change"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:530
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
+msgid "Status changed from %1 to %2"
+msgstr "Tila muutettu arvosta %1 arvoon %2"
+
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:147
+msgid "Steal"
+msgstr "Kaappaa"
+
+#: lib/RT/Transaction_Overlay.pm:589
+#. ($Old->Name)
+msgid "Stolen from %1 "
+msgstr "Kaapattu käyttäjältä %1"
+
+#: html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Search/Bulk.html:126 html/Search/Elements/PickRestriction:43 html/SelfService/Create.html:59 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:35 html/Ticket/Create.html:84 html/Ticket/Elements/EditBasics:28 html/Ticket/ModifyAll.html:79 html/Ticket/Update.html:77 lib/RT/Ticket_Overlay.pm:1160 lib/RT/Tickets_Overlay.pm:987
+msgid "Subject"
+msgstr "Otsikko"
+
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/Transaction_Overlay.pm:611
+#. ($self->Data)
+msgid "Subject changed to %1"
+msgstr ""
+
+#: html/Elements/Submit:59
+msgid "Submit"
+msgstr "Lähetä"
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:749
+msgid "Succeeded"
+msgstr ""
+
+#: lib/RT/Date.pm:394
+msgid "Sun."
+msgstr "Su"
+
+#: lib/RT/System.pm:54
+msgid "SuperUser"
+msgstr ""
+
+#: html/User/Elements/DelegateRights:77
+msgid "System"
+msgstr ""
+
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:567 lib/RT/Interface/Web.pm:757 lib/RT/Interface/Web.pm:790
+msgid "System Error"
+msgstr "Systeemivirhe"
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. Right not granted."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. right not granted"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:616
+msgid "System error. Right not delegated."
+msgstr "Systeemivirhe. Oikeutta ei delegoitu."
+
+#: lib/RT/ACE_Overlay.pm:146 lib/RT/ACE_Overlay.pm:223 lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:898
+msgid "System error. Right not granted."
+msgstr "Systeemivirhe. Oikeutta ei luovutettu."
+
+#: NOT FOUND IN SOURCE
+msgid "System error. Unable to grant rights."
+msgstr ""
+
+#: html/Admin/Global/GroupRights.html:35 html/Admin/Groups/GroupRights.html:37 html/Admin/Queues/GroupRights.html:36
+msgid "System groups"
+msgstr "Systeemiryhmät"
+
+#: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
+msgid "SystemRolegroup for internal use"
+msgstr ""
+
+#: lib/RT/CurrentUser.pm:320
+msgid "TEST_STRING"
+msgstr "TESTI_STRINGI"
+
+#: html/Ticket/Elements/Tabs:143
+msgid "Take"
+msgstr "Ota itselle"
+
+#: lib/RT/Transaction_Overlay.pm:575
+msgid "Taken"
+msgstr "Otettu"
+
+#: html/Admin/Elements/EditScrip:81
+msgid "Template"
+msgstr "Pohja"
+
+#: html/Admin/Global/Template.html:91 html/Admin/Queues/Template.html:90
+#. ($TemplateObj->Id())
+msgid "Template #%1"
+msgstr ""
+
+#: html/Admin/Elements/EditTemplates:89
+msgid "Template deleted"
+msgstr ""
+
+#: lib/RT/Scrip_Overlay.pm:153
+msgid "Template not found"
+msgstr "Pohjaa ei löydetty"
+
+#: NOT FOUND IN SOURCE
+msgid "Template not found\\n"
+msgstr "Pohjaa ei löydetty\\n"
+
+#: lib/RT/Template_Overlay.pm:347
+msgid "Template parsed"
+msgstr "Pohja tulkittu"
+
+#: html/Admin/Elements/QueueTabs:49 html/Admin/Elements/SystemTabs:36 html/Admin/Global/index.html:45
+msgid "Templates"
+msgstr "Pohjat"
+
+#: NOT FOUND IN SOURCE
+msgid "Templates for %1\\n"
+msgstr "Pohjat työjonolle %1\\n"
+
+#: lib/RT/Interface/Web.pm:858
+msgid "That is already the current value"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:178
+msgid "That is not a value for this custom field"
+msgstr "Ei ole arvo tälle kentälle"
+
+#: lib/RT/Ticket_Overlay.pm:1886
+msgid "That is the same value"
+msgstr "Tämä on sama arvo"
+
+#: lib/RT/Queue_Overlay.pm:633
+#. ($args{'Type'})
+msgid "That principal is already a %1 for this queue"
+msgstr "Tämä toimeksiantaja on jo %1 tälle työjonolle"
+
+#: lib/RT/Ticket_Overlay.pm:1434
+#. ($self->loc($args{'Type'}))
+msgid "That principal is already a %1 for this ticket"
+msgstr "Tämä toimeksiantaja on jo %1 tälle työpyynnölle"
+
+#: lib/RT/Queue_Overlay.pm:732
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this queue"
+msgstr "Tämä toimeksiantaja ei ole %1 tälle työjonolle"
+
+#: lib/RT/Ticket_Overlay.pm:1551
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this ticket"
+msgstr "Tämä toimeksiantaja ei ole %1 tälle työpyynnölle"
+
+#: lib/RT/Ticket_Overlay.pm:1882
+msgid "That queue does not exist"
+msgstr "Tätä työjonoa ei ole olemassa"
+
+#: lib/RT/Ticket_Overlay.pm:3143
+msgid "That ticket has unresolved dependencies"
+msgstr "Tämä työpyyntö sisältää ei-päätettyjä riippuvuuksia"
+
+#: lib/RT/ACE_Overlay.pm:288 lib/RT/ACE_Overlay.pm:597
+msgid "That user already has that right"
+msgstr "Käyttäjällä on jo tuo oikeus"
+
+#: lib/RT/Ticket_Overlay.pm:2952
+msgid "That user already owns that ticket"
+msgstr "Käyttäjä omistaa jo tämän työpyynnön"
+
+#: lib/RT/Ticket_Overlay.pm:2918
+msgid "That user does not exist"
+msgstr "Käyttäjää ei ole olemassa"
+
+#: lib/RT/User_Overlay.pm:315
+msgid "That user is already privileged"
+msgstr "Tämä käyttäjä on jo etuoikeutettu"
+
+#: lib/RT/User_Overlay.pm:332
+msgid "That user is already unprivileged"
+msgstr "Tämä käyttäjä on jo ei-etuoikeutettu"
+
+#: lib/RT/User_Overlay.pm:327
+msgid "That user is now privileged"
+msgstr "Tämä käyttäjä on nyt etuoikeutettu"
+
+#: lib/RT/User_Overlay.pm:344
+msgid "That user is now unprivileged"
+msgstr "Tämä käyttäjä on nyt ei-etuoikeutettu"
+
+#: NOT FOUND IN SOURCE
+msgid "That user is now unprivilegedileged"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2944
+msgid "That user may not own tickets in that queue"
+msgstr "Käyttäjä ei voi omistaa työpyyntöjä tuossa työjonossa"
+
+#: lib/RT/Link_Overlay.pm:206
+msgid "That's not a numerical id"
+msgstr "Ei ole numero"
+
+#: html/Ticket/Create.html:150 html/Ticket/Elements/ShowSummary:28
+msgid "The Basics"
+msgstr "Perustiedot"
+
+#: lib/RT/ACE_Overlay.pm:88
+msgid "The CC of a ticket"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:89
+msgid "The administrative CC of a ticket"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2213
+msgid "The comment has been recorded"
+msgstr "Kommentti on tallennettu"
+
+#: bin/rt-crontool:198
+msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
+msgstr ""
+
+#: bin/rt-commit-handler:756 bin/rt-commit-handler:766
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr "Seuraavia komentoja ei suoritettu:\\n\\n"
+
+#: lib/RT/Interface/Web.pm:861
+msgid "The new value has been set."
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:86
+msgid "The owner of a ticket"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:87
+msgid "The requestor of a ticket"
+msgstr ""
+
+#: html/Admin/Elements/EditUserComments:26
+msgid "These comments aren't generally visible to the user"
+msgstr "Nämä kommentit eivät ole yleisesti näkyvillä käyttäjälle"
+
+#: NOT FOUND IN SOURCE
+msgid "This ticket %1 %2 (%3)\\n"
+msgstr "Tämä työpyyntö %1 %2 (%3)\\n"
+
+#: bin/rt-crontool:189
+msgid "This tool allows the user to run arbitrary perl modules from within RT."
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:253
+msgid "This transaction appears to have no content"
+msgstr "Tämä toiminto ei näytä sisältävän mitään"
+
+#: html/Ticket/Elements/ShowRequestor:47
+#. ($rows)
+msgid "This user's %1 highest priority tickets"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "This user's 25 highest priority tickets"
+msgstr "Tämän käyttäjän 25 korkeimman prioriteetin työpyyntöä"
+
+#: lib/RT/Date.pm:391
+msgid "Thu."
+msgstr "To"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1  %2"
+msgstr "Työpyyntö # %1  %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1 Jumbo update: %2"
+msgstr ""
+
+#: html/Ticket/ModifyAll.html:25 html/Ticket/ModifyAll.html:29
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket #%1 Jumbo update: %2"
+msgstr "Työpyyntö #%1 Jumbo päivitys: %2"
+
+#: html/Approvals/Elements/ShowDependency:46
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Ticket #%1: %2"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:608
+#. ($self->Id, $QueueObj->Name)
+msgid "Ticket %1 created in queue '%2'"
+msgstr "Työpyyntö %1 luotu työjonoon '%2'"
+
+#: bin/rt-commit-handler:760
+#. ($Ticket->Id)
+msgid "Ticket %1 loaded\\n"
+msgstr "Työpyyntö %1 ladattu\\n"
+
+#: html/Search/Bulk.html:181
+#. ($Ticket->Id,$_)
+msgid "Ticket %1: %2"
+msgstr "Työpyyntö %1: %2"
+
+#: html/Ticket/History.html:25 html/Ticket/History.html:28
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket History # %1 %2"
+msgstr "Työpyynnön historia # %1 %2"
+
+#: html/SelfService/Display.html:34
+msgid "Ticket Id"
+msgstr "Työpyynnön numero"
+
+#: etc/initialdata:303
+msgid "Ticket Resolved"
+msgstr ""
+
+#: html/Search/Elements/PickRestriction:63
+msgid "Ticket attachment"
+msgstr "Työpyynnön liite"
+
+#: lib/RT/Tickets_Overlay.pm:1166
+msgid "Ticket content"
+msgstr "Työpyynnön sisältö"
+
+#: lib/RT/Tickets_Overlay.pm:1212
+msgid "Ticket content type"
+msgstr "Työpyynnön sisällön tyyppi"
+
+#: lib/RT/Ticket_Overlay.pm:495 lib/RT/Ticket_Overlay.pm:597
+msgid "Ticket could not be created due to an internal error"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:522
+msgid "Ticket created"
+msgstr "Työpyyntö luotu"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket creation failed"
+msgstr "Työpyynnön luonti epäonnistui"
+
+#: lib/RT/Transaction_Overlay.pm:527
+msgid "Ticket deleted"
+msgstr "Työpyyntö poistettu"
+
+#: html/REST/1.0/modify:29 html/REST/1.0/update:34
+msgid "Ticket id not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket killed"
+msgstr ""
+
+#: html/REST/1.0/modify:36 html/REST/1.0/update:41
+msgid "Ticket not found"
+msgstr ""
+
+#: etc/initialdata:289
+msgid "Ticket status changed"
+msgstr ""
+
+#: html/Ticket/Update.html:39
+msgid "Ticket watchers"
+msgstr "Työpyynnön tarkkailijat"
+
+#: html/Elements/Tabs:49
+msgid "Tickets"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1383
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1348
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr ""
+
+#: html/Elements/ViewUser:26
+#. ($name)
+msgid "Tickets from %1"
+msgstr "Työpyynnöt %1"
+
+#: html/Approvals/Elements/ShowDependency:27
+msgid "Tickets which depend on this approval:"
+msgstr ""
+
+#: html/Ticket/Create.html:157 html/Ticket/Elements/EditBasics:48
+msgid "Time Left"
+msgstr "Aikaa jäljellä"
+
+#: html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:43
+msgid "Time Worked"
+msgstr "Aikaa käytetty"
+
+#: lib/RT/Tickets_Overlay.pm:1139
+msgid "Time left"
+msgstr "Aikaa jäljellä"
+
+#: html/Elements/Footer:36
+msgid "Time to display"
+msgstr "Aika"
+
+#: lib/RT/Tickets_Overlay.pm:1115
+msgid "Time worked"
+msgstr "Aikaa käytetty"
+
+#: NOT FOUND IN SOURCE
+msgid "TimeLeft"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1165
+msgid "TimeWorked"
+msgstr ""
+
+#: bin/rt-commit-handler:402
+msgid "To generate a diff of this commit:"
+msgstr "Luodaksesi diffin tästä käskystä:"
+
+#: bin/rt-commit-handler:391
+msgid "To generate a diff of this commit:\\n"
+msgstr "To generate a diff of this commit:\\n"
+
+#: lib/RT/Ticket_Overlay.pm:1168
+msgid "Told"
+msgstr "Oltu yhteydessä"
+
+#: etc/initialdata:237
+msgid "Transaction"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:642
+#. ($self->Data)
+msgid "Transaction %1 purged"
+msgstr "Toiminto %1 puhdistettu"
+
+#: lib/RT/Transaction_Overlay.pm:177
+msgid "Transaction Created"
+msgstr "Toiminto luotu"
+
+#: lib/RT/Transaction_Overlay.pm:89
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:701
+msgid "Transactions are immutable"
+msgstr "Toiminnot ovat muuttumattomia"
+
+#: NOT FOUND IN SOURCE
+msgid "Trying to delete a right: %1"
+msgstr "Yritetään poistaa oikeus: %1"
+
+#: lib/RT/Date.pm:389
+msgid "Tue."
+msgstr "Ti"
+
+#: html/Admin/Elements/EditCustomField:34 html/Ticket/Elements/AddWatchers:33 html/Ticket/Elements/AddWatchers:44 html/Ticket/Elements/AddWatchers:54 lib/RT/Ticket_Overlay.pm:1166 lib/RT/Tickets_Overlay.pm:959
+msgid "Type"
+msgstr "Tyyppi"
+
+#: lib/RT/ScripCondition_Overlay.pm:104
+msgid "Unimplemented"
+msgstr "Toteuttamaton"
+
+#: html/Admin/Users/Modify.html:68
+msgid "Unix login"
+msgstr "Unix login"
+
+#: html/Admin/Elements/ModifyUser:62
+msgid "UnixUsername"
+msgstr "Käyttäjän Unix-tunnus"
+
+#: lib/RT/Attachment_Overlay.pm:265
+#. ($self->ContentEncoding)
+msgid "Unknown ContentEncoding %1"
+msgstr "Tuntematon sisällön enkoodaus %1"
+
+#: html/Elements/SelectResultsPerPage:37
+msgid "Unlimited"
+msgstr "Rajoittamaton"
+
+#: etc/initialdata:32
+msgid "Unprivileged"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:571
+msgid "Untaken"
+msgstr "Ottamaton"
+
+#: html/Elements/MyTickets:64 html/Search/Bulk.html:33
+msgid "Update"
+msgstr "Päivitä"
+
+#: html/Admin/Users/Prefs.html:62
+msgid "Update ID"
+msgstr "Päivitä numero"
+
+#: html/Search/Bulk.html:120 html/Ticket/ModifyAll.html:66 html/Ticket/Update.html:67
+msgid "Update Type"
+msgstr "Päivitä tyyppi"
+
+#: html/Search/Listing.html:61
+msgid "Update all these tickets at once"
+msgstr "Päivitä kaikki nämä työpyynnöt kerralla"
+
+#: html/Admin/Users/Prefs.html:49
+msgid "Update email"
+msgstr "Päivitä sähköposti"
+
+#: html/Admin/Users/Prefs.html:55
+msgid "Update name"
+msgstr "Päivitä nimi"
+
+#: lib/RT/Interface/Web.pm:375
+msgid "Update not recorded."
+msgstr "Päivitystä ei tallennettu"
+
+#: html/Search/Bulk.html:81
+msgid "Update selected tickets"
+msgstr "Päivitä valitut työpyynnöt"
+
+#: html/Admin/Users/Prefs.html:36
+msgid "Update signature"
+msgstr "Päivitä allekirjoitus"
+
+#: html/Ticket/ModifyAll.html:63
+msgid "Update ticket"
+msgstr "Päivitä työpyyntö"
+
+#: html/SelfService/Update.html:25 html/SelfService/Update.html:27
+#. ($Ticket->id)
+msgid "Update ticket # %1"
+msgstr "Päivitä työpyyntö # %1"
+
+#: html/SelfService/Update.html:50
+#. ($Ticket->id)
+msgid "Update ticket #%1"
+msgstr "Päivitä työpyyntö #%1"
+
+#: html/Ticket/Update.html:135
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Update ticket #%1 (%2)"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:373
+msgid "Update type was neither correspondence nor comment."
+msgstr "Päivityksen tyyppi ei ollut kirjeenvaihto eikä kommentti."
+
+#: html/Elements/SelectDateType:33 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1169
+msgid "Updated"
+msgstr "Päivitetty"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 %2: %3\\n"
+msgstr "Käyttäjä %1 %2: %3\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 Password: %2\\n"
+msgstr "Käyttäjä %1 Salasana: %2\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found"
+msgstr "Käyttäjää '%1' ei löydetty"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found\\n"
+msgstr "Käyttäjää '%1' ei löydetty\\n"
+
+#: etc/initialdata:125 etc/initialdata:191
+msgid "User Defined"
+msgstr ""
+
+#: html/Admin/Users/Prefs.html:59
+msgid "User ID"
+msgstr "Käyttäjän tunnus"
+
+#: html/Elements/SelectUsers:26
+msgid "User Id"
+msgstr "Käyttäjän tunnus"
+
+#: html/Admin/Elements/GroupTabs:47 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/SystemTabs:47 html/Admin/Global/index.html:59
+msgid "User Rights"
+msgstr "Käyttäjän oikeudet"
+
+#: html/Admin/Users/Modify.html:226
+#. ($msg)
+msgid "User could not be created: %1"
+msgstr "Käyttäjää ei voitu luoda: %1"
+
+#: lib/RT/User_Overlay.pm:262
+msgid "User created"
+msgstr "Käyttäjä luotu"
+
+#: html/Admin/Global/GroupRights.html:67 html/Admin/Groups/GroupRights.html:54 html/Admin/Queues/GroupRights.html:68
+msgid "User defined groups"
+msgstr "Käyttäjän luomat ryhmät"
+
+#: NOT FOUND IN SOURCE
+msgid "User notified"
+msgstr "Käyttäjää informoitu"
+
+#: html/Admin/Users/Prefs.html:25 html/Admin/Users/Prefs.html:29
+msgid "User view"
+msgstr "Käyttäjän näkymä"
+
+#: html/Admin/Users/Modify.html:48 html/Elements/Login:42 html/Ticket/Elements/AddWatchers:35
+msgid "Username"
+msgstr "Käyttäjätunnus"
+
+#: html/Admin/Elements/SelectNewGroupMembers:26 html/Admin/Elements/Tabs:32 html/Admin/Groups/Members.html:55 html/Admin/Queues/People.html:68 html/Admin/index.html:29 html/User/Groups/Members.html:58
+msgid "Users"
+msgstr "Käyttäjät"
+
+#: html/Admin/Users/index.html:65
+msgid "Users matching search criteria"
+msgstr "Hakua vastaavat käyttäjät"
+
+#: html/Search/Elements/PickRestriction:51
+msgid "ValueOfQueue"
+msgstr "Työpyynnon arvo"
+
+#: html/Admin/Elements/EditCustomField:40
+msgid "Values"
+msgstr "Arvot"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Watch"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "WatchAsAdminCc"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Watcher loaded"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:42
+msgid "Watchers"
+msgstr "Tarkkailijat"
+
+#: html/Admin/Elements/ModifyUser:56
+msgid "WebEncoding"
+msgstr "Web Enkoodaus"
+
+#: lib/RT/Date.pm:390
+msgid "Wed."
+msgstr "Ke"
+
+#: etc/upgrade/2.1.71:161
+msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
+msgstr ""
+
+#: etc/upgrade/2.1.71:135
+msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
+msgstr ""
+
+#: etc/initialdata:138
+msgid "When a ticket is created"
+msgstr ""
+
+#: etc/upgrade/2.1.71:79
+msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
+msgstr ""
+
+#: etc/initialdata:143
+msgid "When anything happens"
+msgstr ""
+
+#: etc/initialdata:184
+msgid "Whenever a ticket is resolved"
+msgstr ""
+
+#: etc/initialdata:170
+msgid "Whenever a ticket's owner changes"
+msgstr ""
+
+#: etc/initialdata:178
+msgid "Whenever a ticket's queue changes"
+msgstr ""
+
+#: etc/initialdata:162
+msgid "Whenever a ticket's status changes"
+msgstr ""
+
+#: etc/initialdata:192
+msgid "Whenever a user-defined condition occurs"
+msgstr ""
+
+#: etc/initialdata:156
+msgid "Whenever comments come in"
+msgstr ""
+
+#: etc/initialdata:149
+msgid "Whenever correspondence comes in"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:164 html/User/Prefs.html:52
+msgid "Work"
+msgstr "Työ"
+
+#: html/Admin/Elements/ModifyUser:70
+msgid "WorkPhone"
+msgstr "Työpuhelin"
+
+#: html/SelfService/Display.html:86 html/Ticket/Elements/ShowBasics:35 html/Ticket/Update.html:65
+msgid "Worked"
+msgstr "Tehty"
+
+#: lib/RT/Ticket_Overlay.pm:3056
+msgid "You already own this ticket"
+msgstr "Omistat jo tämän työpyynnön"
+
+#: html/autohandler:121
+msgid "You are not an authorized user"
+msgstr "Et ole autorisoitu käyttäjä"
+
+#: lib/RT/Ticket_Overlay.pm:2930
+msgid "You can only reassign tickets that you own or that are unowned"
+msgstr "Voit palauttaa vain työpyyntöjä jotka omistat itse tai jotka ovat ilman omistajaa"
+
+#: NOT FOUND IN SOURCE
+msgid "You don't have permission to view that ticket.\\n"
+msgstr "Sinulla ei ole oikeutta tarkastella tätä työpyyntöä.\\n"
+
+#: docs/design_docs/string-extraction-guide.txt:47
+#. ($num, $queue)
+msgid "You found %1 tickets in queue %2"
+msgstr "Löysit %1 työpyyntöä työjonosta %2"
+
+#: html/NoAuth/Logout.html:31 html/REST/1.0/logout:25
+msgid "You have been logged out of RT."
+msgstr "Olet kirjautunut ulos RT:stä"
+
+#: html/SelfService/Display.html:134
+msgid "You have no permission to create tickets in that queue."
+msgstr "Sinulla ei ole oikeutta luoda työpyyntöjä tähän työjonoon."
+
+#: lib/RT/Ticket_Overlay.pm:1895
+msgid "You may not create requests in that queue."
+msgstr "Et ehkä voi luoda työpyyntöjä tuohon työjonoon."
+
+#: html/NoAuth/Logout.html:36
+msgid "You're welcome to login again"
+msgstr "Tervetuloa kirjautumaan järjestelmään uudelleen"
+
+#: html/SelfService/Elements/MyRequests:25
+#. ($friendly_status)
+msgid "Your %1 requests"
+msgstr "Sinun %1 työpyyntöäsi"
+
+#: NOT FOUND IN SOURCE
+msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
+msgstr "RT:n ylläpitäjä on konfiguroinut RT:n käynnisävät sähköpostialiakset väärin."
+
+#: etc/initialdata:429 etc/upgrade/2.1.71:146
+msgid "Your request has been approved by %1. Other approvals may still be pending."
+msgstr ""
+
+#: etc/initialdata:463 etc/upgrade/2.1.71:180
+msgid "Your request has been approved."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr ""
+
+#: etc/initialdata:384 etc/upgrade/2.1.71:101
+msgid "Your request was rejected."
+msgstr ""
+
+#: html/autohandler:136 html/autohandler:142
+msgid "Your username or password is incorrect"
+msgstr "Käyttäjätunnuksesi tai salasanasi on väärä"
+
+#: html/Admin/Elements/ModifyUser:84 html/Admin/Users/Modify.html:144 html/User/Prefs.html:96
+msgid "Zip"
+msgstr "Postinumero"
+
+#: NOT FOUND IN SOURCE
+msgid "[no subject]"
+msgstr ""
+
+#: html/User/Elements/DelegateRights:59
+#. ($right->PrincipalObj->Object->SelfDescription)
+msgid "as granted to %1"
+msgstr "sallittu käyttäjälle %1"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:34
+msgid "contains"
+msgstr "sisältää"
+
+#: html/Elements/SelectAttachmentField:26
+msgid "content"
+msgstr ""
+
+#: html/Elements/SelectAttachmentField:27
+msgid "content-type"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2282
+msgid "correspondence (probably) not sent"
+msgstr "kirjeenvaihtoa (luultavasti) ei ole asetettu"
+
+#: lib/RT/Ticket_Overlay.pm:2292
+msgid "correspondence sent"
+msgstr "kirjeenvaihto lähetetty"
+
+#: html/Admin/Elements/ModifyQueue:63 html/Admin/Queues/Modify.html:77 lib/RT/Date.pm:319
+msgid "days"
+msgstr "päivää"
+
+#: NOT FOUND IN SOURCE
+msgid "dead"
+msgstr ""
+
+#: html/Search/Listing.html:75
+msgid "delete"
+msgstr "poista"
+
+#: lib/RT/Queue_Overlay.pm:63
+msgid "deleted"
+msgstr "poistettu"
+
+#: html/Search/Elements/PickRestriction:68
+msgid "does not match"
+msgstr "ei täsmää"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:35
+msgid "doesn't contain"
+msgstr "ei sisällä"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "equal to"
+msgstr "on yhtäsuuri"
+
+#: NOT FOUND IN SOURCE
+msgid "false"
+msgstr ""
+
+#: html/Elements/SelectAttachmentField:28
+msgid "filename"
+msgstr ""
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "greater than"
+msgstr "suurempi kuin"
+
+#: lib/RT/Group_Overlay.pm:194
+#. ($self->Name)
+msgid "group '%1'"
+msgstr "ryhmä %1"
+
+#: lib/RT/Date.pm:315
+msgid "hours"
+msgstr "tunnit"
+
+#: NOT FOUND IN SOURCE
+msgid "id"
+msgstr "numero"
+
+#: html/Elements/SelectBoolean:32 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88
+msgid "is"
+msgstr "on"
+
+#: html/Elements/SelectBoolean:36 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:37 html/Search/Elements/PickRestriction:48 html/Search/Elements/PickRestriction:77 html/Search/Elements/PickRestriction:89
+msgid "isn't"
+msgstr "ei ole"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "less than"
+msgstr "vähemmän kuin"
+
+#: html/Search/Elements/PickRestriction:67
+msgid "matches"
+msgstr "sisältää"
+
+#: lib/RT/Date.pm:311
+msgid "min"
+msgstr "min"
+
+#: html/Ticket/Update.html:66
+msgid "minutes"
+msgstr "minuuttia"
+
+#: bin/rt-commit-handler:765
+msgid "modifications\\n\\n"
+msgstr "muokkaukset\\n\\n"
+
+#: lib/RT/Date.pm:327
+msgid "months"
+msgstr "kuukausia"
+
+#: lib/RT/Queue_Overlay.pm:58
+msgid "new"
+msgstr "uusi"
+
+#: html/Admin/Elements/EditScrips:43
+msgid "no value"
+msgstr ""
+
+#: html/Ticket/Elements/EditWatchers:28
+msgid "none"
+msgstr "ei mitään"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "not equal to"
+msgstr "eri suuri kuin"
+
+#: NOT FOUND IN SOURCE
+msgid "notlike"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:59
+msgid "open"
+msgstr "avoin"
+
+#: lib/RT/Group_Overlay.pm:199
+#. ($self->Name, $user->Name)
+msgid "personal group '%1' for user '%2'"
+msgstr "oma ryhmä '%1' käyttäjälle '%2'"
+
+#: lib/RT/Group_Overlay.pm:207
+#. ($queue->Name, $self->Type)
+msgid "queue %1 %2"
+msgstr "työjono %1 %2"
+
+#: lib/RT/Queue_Overlay.pm:62
+msgid "rejected"
+msgstr "hylätty"
+
+#: lib/RT/Queue_Overlay.pm:61
+msgid "resolved"
+msgstr "päätetty"
+
+#: lib/RT/Date.pm:307
+msgid "sec"
+msgstr "sec"
+
+#: lib/RT/Queue_Overlay.pm:60
+msgid "stalled"
+msgstr "jäädytetty"
+
+#: lib/RT/Group_Overlay.pm:202
+#. ($self->Type)
+msgid "system %1"
+msgstr "systeemi %1"
+
+#: lib/RT/Group_Overlay.pm:213
+#. ($self->Type)
+msgid "system group '%1'"
+msgstr "systeemiryhmä '%1'"
+
+#: html/Elements/Error:42 html/SelfService/Error.html:42
+msgid "the calling component did not specify why"
+msgstr "kutsuva komponentti ei eritellyt syytä"
+
+#: lib/RT/Group_Overlay.pm:210
+#. ($self->Instance, $self->Type)
+msgid "ticket #%1 %2"
+msgstr "työpyyntö #%1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "true"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:216
+#. ($self->Id)
+msgid "undescribed group %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "undescripbed group %1"
+msgstr "kuvalematon ryhmä %1"
+
+#: lib/RT/Group_Overlay.pm:191
+#. ($user->Object->Name)
+msgid "user %1"
+msgstr "käyttäjä %1"
+
+#: lib/RT/Date.pm:323
+msgid "weeks"
+msgstr "viikkoa"
+
+#: NOT FOUND IN SOURCE
+msgid "with template %1"
+msgstr "pohjalla %1"
+
+#: lib/RT/Date.pm:331
+msgid "years"
+msgstr "vuosia"
+
diff --git a/rt/lib/RT/I18N/fr.po b/rt/lib/RT/I18N/fr.po
new file mode 100644
index 000000000..4ef68fb3a
--- /dev/null
+++ b/rt/lib/RT/I18N/fr.po
@@ -0,0 +1,4959 @@
+# Copyright (c) 2002 Jesse Vincent <jesse@bestpractical.com>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: RT 3.0.4pre1\n"
+"POT-Creation-Date: 2002-05-02 11:36+0800\n"
+"PO-Revision-Date: 2003-07-03 02:00+0800\n"
+"Last-Translator: Blaise Thauvin <blaise@fdn.fr>\n"
+"Language-Team: rt-devel <rt-devel@lists.fsck.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: html/Elements/MyRequests:27 html/Elements/MyTickets:27
+msgid "#"
+msgstr "n°"
+
+#: NOT FOUND IN SOURCE
+msgid "#%1"
+msgstr "n°%1"
+
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($Ticket->id, $Ticket->Subject)
+#. ($ticket->Id, $ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "#%1: %2"
+msgstr "n°%1: %2"
+
+#: lib/RT/Date.pm:337
+#. ($s, $time_unit)
+msgid "%1 %2"
+msgstr "%1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:771
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr "%1 %2 %3"
+
+#: lib/RT/Date.pm:373
+#. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
+msgid "%1 %2 %3 %4:%5:%6 %7"
+msgstr "%1 %2 %3 %4:%5:%6 %7"
+
+#: lib/RT/Ticket_Overlay.pm:3569 lib/RT/Transaction_Overlay.pm:557 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $new_value->Content)
+#. ($field, $self->NewValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 added"
+msgstr "%1 %2 ajouté"
+
+#: lib/RT/Date.pm:334
+#. ($s, $time_unit)
+msgid "%1 %2 ago"
+msgstr "il y a %1 %2"
+
+#: lib/RT/Ticket_Overlay.pm:3575 lib/RT/Transaction_Overlay.pm:564
+#. ($cf->Name, $old_value, $new_value->Content)
+#. ($field, $self->OldValue, $self->NewValue)
+msgid "%1 %2 changed to %3"
+msgstr "%1 %2 changé en %3"
+
+#: lib/RT/Ticket_Overlay.pm:3572 lib/RT/Transaction_Overlay.pm:560 lib/RT/Transaction_Overlay.pm:605
+#. ($cf->Name, $old_value)
+#. ($field, $self->OldValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 deleted"
+msgstr "%1 %2 supprimé"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 of group %3"
+msgstr "%1 %2 du groupe %3"
+
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27
+#. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
+msgid "%1 %2 with template %3"
+msgstr "%1 %2 avec modèle %3"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 this ticket\\n"
+msgstr "%1 (%2) %3 ce ticket\\n"
+
+#: html/Search/Listing.html:56
+#. (($session{'tickets'}->FirstRow+1), ($session{'tickets'}->FirstRow() + $session{'tickets'}->RowsPerPage()  ))
+msgid "%1 - %2 shown"
+msgstr "Tickets %1 à %2"
+
+#: bin/rt-crontool:168 bin/rt-crontool:175 bin/rt-crontool:181
+#. ("--search-argument", "--search")
+#. ("--condition-argument", "--condition")
+#. ("--action-argument", "--action")
+msgid "%1 - An argument to pass to %2"
+msgstr "%1 - Un paramètre à passer à %2"
+
+#: bin/rt-crontool:184
+#. ("--verbose")
+msgid "%1 - Output status updates to STDOUT"
+msgstr "%1 - Ecrit les mises à jour de statuts sur STDOUT"
+
+#: bin/rt-crontool:178
+#. ("--action")
+msgid "%1 - Specify the action module you want to use"
+msgstr "%1 - Précisez l'action que vous voulez utiliser"
+
+#: bin/rt-crontool:172
+#. ("--condition")
+msgid "%1 - Specify the condition module you want to use"
+msgstr "%1 - Précisez la condition que vous voulez utiliser"
+
+#: bin/rt-crontool:165
+#. ("--search")
+msgid "%1 - Specify the search module you want to use"
+msgstr "%1 - Précisez la recherche que vous voulez utiliser"
+
+#: lib/RT/ScripAction_Overlay.pm:121
+#. ($self->Id)
+msgid "%1 ScripAction loaded"
+msgstr "%1 ScripAction chargée"
+
+#: lib/RT/Ticket_Overlay.pm:3602
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 added as a value for %2"
+msgstr "%1 ajouté(e) comme valeur de %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on"
+msgstr "les alias %1 nécessitent un TicketId sur lequel travailler"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on "
+msgstr "les alias %1 nécessitent un TicketId sur lequel travailler "
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on (from %2) %3"
+msgstr "les alias %1 nécessitent un TicketId pour fonctionner avec (depuis %2) %3"
+
+#: lib/RT/Link_Overlay.pm:116 lib/RT/Link_Overlay.pm:123
+#. ($args{'Base'})
+#. ($args{'Target'})
+msgid "%1 appears to be a local object, but can't be found in the database"
+msgstr "%1 semble être un objet local, mais est introuvable dans la base de données"
+
+#: html/Ticket/Elements/ShowDates:51 lib/RT/Transaction_Overlay.pm:481
+#. ($self->BriefDescription , $self->CreatorObj->Name)
+#. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
+msgid "%1 by %2"
+msgstr "%1 par %2"
+
+#: lib/RT/Transaction_Overlay.pm:535 lib/RT/Transaction_Overlay.pm:675 lib/RT/Transaction_Overlay.pm:684 lib/RT/Transaction_Overlay.pm:687
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
+#. ($self->Field , $q1->Name , $q2->Name)
+#. ($self->Field, $t2->AsString, $t1->AsString)
+#. ($self->Field, $self->OldValue, $self->NewValue)
+msgid "%1 changed from %2 to %3"
+msgstr "%1 changé(e) de %2 à %3"
+
+#: lib/RT/Interface/Web.pm:893
+msgid "%1 could not be set to %2."
+msgstr "%1 n'a pas pu être positionné à %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 couldn't init a transaction (%2)\\n"
+msgstr "%1 n'a pas pu initialiser une transaction (%2)\\n"
+
+#: lib/RT/Ticket_Overlay.pm:2867
+#. ($self)
+msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
+msgstr "%1 ne peut pas mettre le statut à résolu. La base de données RT est peut être incohérente."
+
+#: html/Elements/MyTickets:24
+#. ($rows)
+msgid "%1 highest priority tickets I own..."
+msgstr "Mes %1 tickets à traiter en priorité..."
+
+#: html/Elements/MyRequests:24
+#. ($rows)
+msgid "%1 highest priority tickets I requested..."
+msgstr "Mes %1 demandes les plus prioritaires..."
+
+#: bin/rt-crontool:160
+#. ($0)
+msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
+msgstr "%1 est un outil agissant sur les tickets depuis un planificateur externe tel que cron"
+
+#: lib/RT/Queue_Overlay.pm:743
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this queue."
+msgstr "%1 n'est plus un %2 pour cette queue."
+
+#: lib/RT/Ticket_Overlay.pm:1587
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this ticket."
+msgstr "%1 n'est plus un %2 pour ce ticket."
+
+#: lib/RT/Ticket_Overlay.pm:3658
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 is no longer a value for custom field %2"
+msgstr "%1 n'est plus une valeur pour le champ personnalisé %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 isn't a valid Queue id."
+msgstr "%1 n'est pas un identifiant de queue valide"
+
+#: html/Ticket/Elements/ShowBasics:35
+#. ($TimeWorked)
+msgid "%1 min"
+msgstr "%1 min"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 not shown"
+msgstr "%1 non montré"
+
+#: html/User/Elements/DelegateRights:75
+#. (loc($ObjectType =~ /^RT::(.*)$/))
+msgid "%1 rights"
+msgstr "Droits de %1"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 succeeded\\n"
+msgstr "%1 réussi\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for $MessageId"
+msgstr "Type %1 inconnu pour $MessageId"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for %2"
+msgstr "type %1 inconnu pour %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 was created without a CurrentUser\\n"
+msgstr "%1 a été créé sans utilisateur courant\\n"
+
+#: lib/RT/Action/ResolveMembers.pm:41
+#. (ref $self)
+msgid "%1 will resolve all members of a resolved group ticket."
+msgstr "%1 résoudra tous les membres d'un ticket groupé résolu."
+
+#: NOT FOUND IN SOURCE
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr "%1 va bloquer une base [locale] s'il dépend ou est membre d'une demande liée."
+
+#: lib/RT/Transaction_Overlay.pm:433
+#. ($self)
+msgid "%1: no attachment specified"
+msgstr "%1: pas d'attachement spécifié"
+
+#: html/Ticket/Elements/ShowTransaction:88
+#. ($size)
+msgid "%1b"
+msgstr "%1b"
+
+#: html/Ticket/Elements/ShowTransaction:85
+#. (int($size/102.4)/10)
+msgid "%1k"
+msgstr "%1k"
+
+#: lib/RT/Ticket_Overlay.pm:1176
+#. ($args{'Status'})
+msgid "'%1' is an invalid value for status"
+msgstr "'%1' est un statut invalide"
+
+#: NOT FOUND IN SOURCE
+msgid "'%1' not a recognized action. "
+msgstr "'%1' n'est pas une action connue. "
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete group member)"
+msgstr "(Cocher la case pour supprimer un membre du groupe)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete scrip)"
+msgstr "(Cocher la case pour supprimer un scrip)"
+
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Ticket/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
+msgid "(Check box to delete)"
+msgstr "(Cocher la case pour supprimer)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check boxes to delete)"
+msgstr "(Cocher la case pour supprimer)"
+
+#: html/Ticket/Create.html:177
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr "(Entrer les numéros de tickets ou les URLs, séparés par des espaces)"
+
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
+#. ($RT::CorrespondAddress)
+#. ($RT::CommentAddress)
+msgid "(If left blank, will default to %1"
+msgstr "Si laissé à blanc, valeur par défaut : %1"
+
+#: NOT FOUND IN SOURCE
+msgid "(No Value)"
+msgstr "(Non renseigné)"
+
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
+msgid "(No custom fields)"
+msgstr "Pas de champ personnalisé"
+
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
+msgid "(No members)"
+msgstr "(Aucun membre)"
+
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
+msgid "(No scrips)"
+msgstr "(Aucun Scrip)"
+
+#: html/Admin/Elements/EditTemplates:30
+msgid "(No templates)"
+msgstr "Aucun modèle"
+
+#: html/Ticket/Update.html:83
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(Envoie une copie cachée de cette mise à jour à une liste d'adresses email séparées par des virgules. Ceci <b>ne changera pas</b> les destinataires des mises à jour suivantes.)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(Envoie une copie cachée de cette mise à jour à une liste d'adresses email séparées par des virgules. Ceci <b>ne changera pas</b> les destinataires des mises à jour suivantes.)"
+
+#: html/Ticket/Create.html:78
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(Envoie une copie de cette mise à jour à une liste d'adresses email séparées par des virgules. Ces personnes <b>recevront</b> les mises à jour suivantes.)"
+
+#: html/Ticket/Update.html:79
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(Envoie une copie de cette mise à jour à une liste d'adresses email séparées par des virgules. Ceci <b>ne changera pas</b> les destinataires des mises à jour suivantes.)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "Envoie une copie de cette mise à jour à une liste d'adresses email séparées par des virgules. Ceci <b>ne changera pas</b> les destinataires des mises à jour suivantes.)"
+
+#: html/Ticket/Create.html:68
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(Envoie une copie de cette mise à jour à une liste d'adresses email séparées par des virgules. Ces personnes <b>recevront</b> les mises à jour suivantes.)"
+
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
+msgid "(empty)"
+msgstr "(vide)"
+
+#: html/Admin/Users/index.html:38
+msgid "(no name listed)"
+msgstr "(aucun nom)"
+
+#: html/Elements/MyRequests:42 html/Elements/MyTickets:44
+msgid "(no subject)"
+msgstr "(pas de sujet)"
+
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:60 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:534
+msgid "(no value)"
+msgstr "(non renseigné)"
+
+#: html/Ticket/Elements/BulkLinks:27 html/Ticket/Elements/EditLinks:115
+msgid "(only one ticket)"
+msgstr "(un seul ticket)"
+
+#: html/Elements/MyRequests:51 html/Elements/MyTickets:54
+msgid "(pending approval)"
+msgstr "(en attente d'approbation)"
+
+#: html/Elements/MyRequests:53 html/Elements/MyTickets:56
+msgid "(pending other tickets)"
+msgstr "(en attente d'autres tickets)"
+
+#: NOT FOUND IN SOURCE
+msgid "(requestor's group)"
+msgstr "(groupe du demandeur)"
+
+#: html/Admin/Users/Modify.html:49
+msgid "(required)"
+msgstr "(exigé)"
+
+#: html/Ticket/Elements/ShowTransaction:91
+msgid "(untitled)"
+msgstr "(sans titre)"
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr "Mes 25 tickets à traiter en priorité..."
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr "Mes 25 demandes les plus prioritaires..."
+
+#: html/Ticket/Elements/ShowBasics:31
+msgid "<% $Ticket->Status%>"
+msgstr "<% $Ticket->Statut%>"
+
+#: html/Elements/SelectTicketTypes:26
+msgid "<% $_ %>"
+msgstr ""
+
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25
+#. ($m->scomp('/Elements/SelectNewTicketQueue'))
+msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
+msgstr "<input type=\"submit\" value=\"Créer un ticket dans\">&nbsp;%1"
+
+#: etc/initialdata:203
+msgid "A blank template"
+msgstr "Un modèle vide"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Deleted"
+msgstr "ACE Supprimé"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Loaded"
+msgstr "ACE Chargé"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be deleted"
+msgstr "l'ACE n'a pu être supprimé"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be found"
+msgstr "l'ACE n'a pu être trouvé"
+
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
+msgid "ACE not found"
+msgstr "ACE non trouvé"
+
+#: lib/RT/ACE_Overlay.pm:830
+msgid "ACEs can only be created and deleted."
+msgstr "Les ACE peuvent seulement être créés et effacés."
+
+#: bin/rt-commit-handler:754
+msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgstr "Interruption pour éviter des modifications de ticket involontaires"
+
+#: html/User/Elements/Tabs:31
+msgid "About me"
+msgstr "A propos"
+
+#: html/Admin/Users/Modify.html:79
+msgid "Access control"
+msgstr "contrôle d'accès"
+
+#: html/Admin/Elements/EditScrip:56
+msgid "Action"
+msgstr "Action"
+
+#: lib/RT/Scrip_Overlay.pm:146
+#. ($args{'ScripAction'})
+msgid "Action %1 not found"
+msgstr "Action %1 non trouvée"
+
+#: bin/rt-crontool:122
+msgid "Action committed."
+msgstr "Action validée"
+
+#: bin/rt-crontool:118
+msgid "Action prepared..."
+msgstr "Action préparée..."
+
+#: html/Search/Bulk.html:95
+msgid "Add AdminCc"
+msgstr "Ajouter AdminCC"
+
+#: html/Search/Bulk.html:91
+msgid "Add Cc"
+msgstr "Ajouter CC"
+
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:98
+msgid "Add More Files"
+msgstr "Ajouter d'autres fichiers"
+
+#: NOT FOUND IN SOURCE
+msgid "Add Next State"
+msgstr "Ajouter étape suivant"
+
+#: html/Search/Bulk.html:87
+msgid "Add Requestor"
+msgstr "Ajouter Demandeur"
+
+#: html/Admin/Elements/AddCustomFieldValue:24
+msgid "Add Value"
+msgstr "Ajouter une valeur"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr "Ajouter une sélection de mots clé à cette queue"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a new a global scrip"
+msgstr "Ajouter un nouveau scrip global"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a scrip to this queue"
+msgstr "Ajouter un scrip à cette queue"
+
+#: html/Admin/Global/Scrip.html:54
+msgid "Add a scrip which will apply to all queues"
+msgstr "Ajouter un scrip qui s'ajoute à toutes les queues"
+
+#: html/Search/Bulk.html:127
+msgid "Add comments or replies to selected tickets"
+msgstr "Ajouter des commentaires ou des réponses aux tickets sélectionnés"
+
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
+msgid "Add members"
+msgstr "Ajouter des membres"
+
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
+msgid "Add new watchers"
+msgstr "Ajouter de nouveaux observateurs"
+
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
+msgstr "AjouterEtatSuivant"
+
+#: lib/RT/Queue_Overlay.pm:643
+#. ($args{'Type'})
+msgid "Added principal as a %1 for this queue"
+msgstr "Ajout groupe/utilisateur comme %1 pour cette queue"
+
+#: lib/RT/Ticket_Overlay.pm:1471
+#. ($self->loc($args{'Type'}))
+msgid "Added principal as a %1 for this ticket"
+msgstr "Ajout groupe/utilisateur comme %1 pour ce ticket"
+
+#: html/Admin/Elements/ModifyUser:75 html/Admin/Users/Modify.html:121 html/User/Prefs.html:87
+msgid "Address1"
+msgstr "Adresse1"
+
+#: html/Admin/Elements/ModifyUser:77 html/Admin/Users/Modify.html:126 html/User/Prefs.html:89
+msgid "Address2"
+msgstr "Adresse2"
+
+#: html/Ticket/Create.html:73
+msgid "Admin Cc"
+msgstr "Admin Cc"
+
+#: etc/initialdata:280
+msgid "Admin Comment"
+msgstr "Commentaire Admin"
+
+#: etc/initialdata:259
+msgid "Admin Correspondence"
+msgstr "Correspondance Admin "
+
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
+msgid "Admin queues"
+msgstr "Administrateurs de queue"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin users"
+msgstr "Gérer les Utilisateurs"
+
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
+msgid "Admin/Global configuration"
+msgstr "configuration Gestion/Globale"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Groups"
+msgstr "Gestion/Groupes"
+
+#: html/Admin/Queues/Modify.html:24 html/Admin/Queues/Modify.html:28
+msgid "Admin/Queue/Basics"
+msgstr "Gestion/Queues/Essentiel"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr "GérerTousGroupesPersonnels"
+
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 html/Ticket/Update.html:49 lib/RT/ACE_Overlay.pm:88
+msgid "AdminCc"
+msgstr "AdminCc"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr "CommentaireAdministrateur"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr "CorrespondanceAdministrateur"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "AdminCustomFields"
+msgstr "GérerChampsPersonnalisés"
+
+#: lib/RT/Group_Overlay.pm:145
+msgid "AdminGroup"
+msgstr "GérerGroupes"
+
+#: lib/RT/Group_Overlay.pm:147
+msgid "AdminGroupMembership"
+msgstr "GérerAppartenanceGroupes"
+
+#: lib/RT/System.pm:58
+msgid "AdminOwnPersonalGroups"
+msgstr "GérerGroupesPersonnelsPropres"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "AdminQueue"
+msgstr "GérerQueues"
+
+#: lib/RT/System.pm:59
+msgid "AdminUsers"
+msgstr "GérerUtilisateurs"
+
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
+msgid "Administrative Cc"
+msgstr "Cc Administratif"
+
+#: NOT FOUND IN SOURCE
+msgid "Admins"
+msgstr "Administrateurs"
+
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search"
+msgstr "Recherche avancée"
+
+#: html/Elements/SelectDateRelation:35
+msgid "After"
+msgstr "Après"
+
+#: NOT FOUND IN SOURCE
+msgid "Age"
+msgstr "Age"
+
+#: NOT FOUND IN SOURCE
+msgid "Alias"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Alias for"
+msgstr "Alias pour"
+
+#: etc/initialdata:348
+msgid "All Approvals Passed"
+msgstr "Toutes les approbations obtenues"
+
+#: html/Admin/Elements/EditCustomFields:95
+msgid "All Custom Fields"
+msgstr "Tous les champs personnalisés"
+
+#: html/Admin/Queues/index.html:52
+msgid "All Queues"
+msgstr "Toutes les queues"
+
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
+msgstr "Envoie toujours un message au demandeur indépendamment de l'expéditeur"
+
+#: html/Elements/Tabs:55
+msgid "Approval"
+msgstr "Approbation"
+
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($ticket->id, $msg)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Approval #%1: %2"
+msgstr "Approbation n°%1: %2"
+
+#: html/Approvals/index.html:53
+#. ($ticket->Id)
+msgid "Approval #%1: Notes not recorded due to a system error"
+msgstr "Approbation n°%1: Notes non enregistrées en raison d'une erreur système"
+
+#: html/Approvals/index.html:51
+#. ($ticket->Id)
+msgid "Approval #%1: Notes recorded"
+msgstr "Approbation n°%1: Notes non enregistrées"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Details"
+msgstr "Détails de l'approbation"
+
+#: etc/initialdata:336
+msgid "Approval Passed"
+msgstr "Approbations obtenues"
+
+#: etc/initialdata:359
+msgid "Approval Rejected"
+msgstr "Approbations refusées"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval diagram"
+msgstr "Diagramme d'approbation"
+
+#: html/Approvals/Elements/Approve:43
+msgid "Approve"
+msgstr "Approuver"
+
+#: etc/initialdata:486 etc/upgrade/2.1.71:148
+msgid "Approver's notes: %1"
+msgstr "Notes de l'approbateur: %1"
+
+#: lib/RT/Date.pm:414
+msgid "Apr."
+msgstr "Avr."
+
+#: NOT FOUND IN SOURCE
+msgid "April"
+msgstr "Avril"
+
+#: html/Elements/SelectSortOrder:34
+msgid "Ascending"
+msgstr "Croissant"
+
+#: html/Search/Bulk.html:136 html/SelfService/Update.html:32 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:98
+msgid "Attach"
+msgstr "Attaché"
+
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
+msgid "Attach file"
+msgstr "Attacher un ficher"
+
+#: html/Ticket/Create.html:97 html/Ticket/Update.html:87
+msgid "Attached file"
+msgstr "Fichier attaché"
+
+#: NOT FOUND IN SOURCE
+msgid "Attachment '%1' could not be loaded"
+msgstr "Attachement '%1' ne peut pas être chargé"
+
+#: lib/RT/Transaction_Overlay.pm:441
+msgid "Attachment created"
+msgstr "Attachement créé"
+
+#: lib/RT/Tickets_Overlay.pm:1189
+msgid "Attachment filename"
+msgstr "Nom de fichier de l'attachement"
+
+#: html/Ticket/Elements/ShowAttachments:25
+msgid "Attachments"
+msgstr "Attachements"
+
+#: lib/RT/Date.pm:418
+msgid "Aug."
+msgstr "Aoû."
+
+#: NOT FOUND IN SOURCE
+msgid "August"
+msgstr "Août"
+
+#: html/Admin/Elements/ModifyUser:65
+msgid "AuthSystem"
+msgstr "AuthSystem"
+
+#: etc/initialdata:206
+msgid "Autoreply"
+msgstr "RéponseAuto"
+
+#: etc/initialdata:72
+msgid "Autoreply To Requestors"
+msgstr "Réponse automatique aux demandeurs"
+
+#: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr "RéponseAutomtiqueAuxDemandeurs"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad PGP Signature: %1\\n"
+msgstr "Signature PGP invalide: %1\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
+msgstr "Id d'attachement erroné. Impossible de trouver l'attachement '%1'\\n"
+
+#: bin/rt-commit-handler:826
+#. ($val)
+msgid "Bad data in %1"
+msgstr "Données incorrectes dans %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad transaction number for attachment. %1 should be %2\\n"
+msgstr "Numéro de transaction incorrect pour l'attachement. %1 doit être %2\\n"
+
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Ticket/Elements/Tabs:89 html/User/Elements/GroupTabs:37
+msgid "Basics"
+msgstr "Essentiel"
+
+#: html/Ticket/Update.html:81
+msgid "Bcc"
+msgstr "Bcc"
+
+#: html/Admin/Elements/EditScrip:87 html/Admin/Global/GroupRights.html:84 html/Admin/Global/Template.html:45 html/Admin/Global/UserRights.html:53 html/Admin/Groups/GroupRights.html:72 html/Admin/Groups/Members.html:80 html/Admin/Groups/Modify.html:55 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:44 html/Admin/Queues/UserRights.html:53 html/User/Groups/Modify.html:55
+msgid "Be sure to save your changes"
+msgstr "Assurez-vous de sauvegarder vos modifications"
+
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:321
+msgid "Before"
+msgstr "Avant"
+
+#: NOT FOUND IN SOURCE
+msgid "Begin Approval"
+msgstr "Débuter l'approbation"
+
+#: etc/initialdata:202
+msgid "Blank"
+msgstr "Vide"
+
+#: html/Search/Listing.html:78
+msgid "Bookmarkable URL for this search"
+msgstr "URL prédéfinie pour cette recherche"
+
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
+msgid "Brief headers"
+msgstr "En-têtes courts"
+
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
+msgid "Bulk ticket update"
+msgstr "modification de tickets en masse"
+
+#: lib/RT/User_Overlay.pm:1524
+msgid "Can not modify system users"
+msgstr "Les utilisateurs système ne peuvent être modifiés"
+
+#: lib/RT/Queue_Overlay.pm:66
+msgid "Can this principal see this queue"
+msgstr "Le groupe/utilisateur peut-il voir cette queue"
+
+#: lib/RT/CustomField_Overlay.pm:205
+msgid "Can't add a custom field value without a name"
+msgstr "Impossible d'ajouter une valeur de champ personnalisé sans un nom"
+
+#: lib/RT/Link_Overlay.pm:131
+msgid "Can't link a ticket to itself"
+msgstr "Un ticket ne peut être lié à lui même"
+
+#: lib/RT/Ticket_Overlay.pm:2844
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr "Impossible de fusionner un ticket à un ticket fusionné. Vous ne devriez jamais obtenir cette erreur"
+
+#: lib/RT/Ticket_Overlay.pm:2646 lib/RT/Ticket_Overlay.pm:2725
+msgid "Can't specifiy both base and target"
+msgstr "Impossible de spécifier à la fois la base et la cible"
+
+#: html/autohandler:113
+#. ($msg)
+msgid "Cannot create user: %1"
+msgstr "Impossible de créer l'utilisateur: %1"
+
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:44 html/Ticket/Update.html:76 lib/RT/ACE_Overlay.pm:87
+msgid "Cc"
+msgstr "Cc"
+
+#: html/SelfService/Prefs.html:30
+msgid "Change password"
+msgstr "Changer le mot de passe"
+
+#: html/Ticket/Create.html:100 html/Ticket/Update.html:90
+msgid "Check box to delete"
+msgstr "Cocher la case pour supprimer"
+
+#: html/Admin/Elements/SelectRights:30
+msgid "Check box to revoke right"
+msgstr "Cocher la case pour retirer le droit"
+
+#: html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:42 html/Ticket/Elements/EditLinks:130 html/Ticket/Elements/EditLinks:68 html/Ticket/Elements/ShowLinks:56
+msgid "Children"
+msgstr "Fils"
+
+#: html/Admin/Elements/ModifyUser:79 html/Admin/Users/Modify.html:131 html/User/Prefs.html:91
+msgid "City"
+msgstr "Ville"
+
+#: html/Ticket/Elements/ShowDates:46
+msgid "Closed"
+msgstr "Fermé"
+
+#: html/SelfService/Closed.html:24
+msgid "Closed Tickets"
+msgstr "Tickets fermés"
+
+#: NOT FOUND IN SOURCE
+msgid "Closed requests"
+msgstr "Demandes closes"
+
+#: html/SelfService/Elements/Tabs:44
+msgid "Closed tickets"
+msgstr "Tickets fermés"
+
+#: NOT FOUND IN SOURCE
+msgid "Code"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Command not understood!\\n"
+msgstr "Commande incomprise! \\n"
+
+#: html/Ticket/Elements/ShowTransaction:165 html/Ticket/Elements/Tabs:152
+msgid "Comment"
+msgstr "Commenter"
+
+#: html/Admin/Elements/ModifyQueue:44 html/Admin/Queues/Modify.html:57
+msgid "Comment Address"
+msgstr "Adresse de commentaire"
+
+#: NOT FOUND IN SOURCE
+msgid "Comment not recorded"
+msgstr "Commentaire non enregistré"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "Comment on tickets"
+msgstr "Commentaire sur le ticket"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "CommentOnTicket"
+msgstr "CommenterTicket"
+
+#: html/Admin/Elements/ModifyUser:34
+msgid "Comments"
+msgstr "Commentaires"
+
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:68
+msgid "Comments (Not sent to requestors)"
+msgstr "Commentaires (non envoyés aux demandeurs)"
+
+#: html/Search/Bulk.html:131
+msgid "Comments (not sent to requestors)"
+msgstr "Commentaires (non envoyés aux demandeurs)"
+
+#: html/Elements/ViewUser:26
+#. ($name)
+msgid "Comments about %1"
+msgstr "Commentaires sur %1"
+
+#: html/Admin/Users/Modify.html:184 html/Ticket/Elements/ShowRequestor:43
+msgid "Comments about this user"
+msgstr "Commentaires sur cet utilisateur"
+
+#: lib/RT/Transaction_Overlay.pm:543
+msgid "Comments added"
+msgstr "Commentaires ajoutés"
+
+#: lib/RT/Action/Generic.pm:139
+msgid "Commit Stubbed"
+msgstr "tr(Commit Stubbed)"
+
+#: NOT FOUND IN SOURCE
+msgid "Compile Restrictions"
+msgstr "Restrictions de compilation"
+
+#: html/Admin/Elements/EditScrip:40
+msgid "Condition"
+msgstr "Condition"
+
+#: bin/rt-crontool:108
+msgid "Condition matches..."
+msgstr "La condition satisfait..."
+
+#: lib/RT/Scrip_Overlay.pm:159
+msgid "Condition not found"
+msgstr "Condition non trouvée"
+
+#: html/Elements/Tabs:49
+msgid "Configuration"
+msgstr "Configuration"
+
+#: html/SelfService/Prefs.html:32
+msgid "Confirm"
+msgstr "Confirmer"
+
+#: html/Admin/Elements/ModifyUser:59
+msgid "ContactInfoSystem"
+msgstr "ContactInfoSystem"
+
+#: NOT FOUND IN SOURCE
+msgid "Contacted date '%1' could not be parsed"
+msgstr "Date de contact ne peut pas être analysée"
+
+#: html/Admin/Elements/ModifyTemplate:43 html/Ticket/ModifyAll.html:86
+msgid "Content"
+msgstr "Contenu"
+
+#: NOT FOUND IN SOURCE
+msgid "Coould not create group"
+msgstr "Le groupe n'a pas pu être créé"
+
+#: etc/initialdata:271
+msgid "Correspondence"
+msgstr "Courrier"
+
+#: html/Admin/Elements/ModifyQueue:38 html/Admin/Queues/Modify.html:50
+msgid "Correspondence Address"
+msgstr "Adresse de correspondance"
+
+#: lib/RT/Transaction_Overlay.pm:539
+msgid "Correspondence added"
+msgstr "Courrier ajouté"
+
+#: NOT FOUND IN SOURCE
+msgid "Correspondence not recorded"
+msgstr "Courrier non enregistré"
+
+#: lib/RT/Ticket_Overlay.pm:3589
+msgid "Could not add new custom field value for ticket. "
+msgstr "Impossible d'ajouter une nouvelle valeur de champ personnalisé pour ce ticket. "
+
+#: NOT FOUND IN SOURCE
+msgid "Could not add new custom field value for ticket. %1 "
+msgstr "La valeur de champ personnalisé n'a pas pu être ajoutée. %1"
+
+#: lib/RT/Ticket_Overlay.pm:3095 lib/RT/Ticket_Overlay.pm:3103 lib/RT/Ticket_Overlay.pm:3120
+msgid "Could not change owner. "
+msgstr "Impossible de changer l'intervenant. "
+
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:165
+#. ($msg)
+msgid "Could not create CustomField"
+msgstr "Impossible de créer un champ personnalisé CustomField"
+
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:473 lib/RT/Group_Overlay.pm:480
+msgid "Could not create group"
+msgstr "Impossible de créer un groupe"
+
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
+#. ($msg)
+msgid "Could not create template: %1"
+msgstr "Impossible de créer un modèle : %1"
+
+#: lib/RT/Ticket_Overlay.pm:1109 lib/RT/Ticket_Overlay.pm:352
+msgid "Could not create ticket. Queue not set"
+msgstr "Impossible de créer un ticket. Queue non indiquée"
+
+#: lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:483
+msgid "Could not create user"
+msgstr "Impossible de créer un utilisateur"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not create watcher for requestor"
+msgstr "L'observateur n'a pas pu être crée pour le demandeur"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find a ticket with id %1"
+msgstr "Impossible de trouver le ticket numéro %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find group %1."
+msgstr "Impossible de trouver le groupe %1."
+
+#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1439
+msgid "Could not find or create that user"
+msgstr "Impossible de trouver ou créer cet utilisateur"
+
+#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1518
+msgid "Could not find that principal"
+msgstr "Impossible de trouver ce groupe ou utilisateur"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find user %1."
+msgstr "Impossible de trouver l'utilisateur %1."
+
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
+msgid "Could not load group"
+msgstr "Impossible de charger ce groupe"
+
+#: lib/RT/Queue_Overlay.pm:641
+#. ($args{'Type'})
+msgid "Could not make that principal a %1 for this queue"
+msgstr "Impossible de faire de ce groupe/utilisateur un %1 pour cette queue"
+
+#: lib/RT/Ticket_Overlay.pm:1460
+#. ($self->loc($args{'Type'}))
+msgid "Could not make that principal a %1 for this ticket"
+msgstr "Impossible de faire de ce groupe/utilisateur un %1 pour ce ticket"
+
+#: lib/RT/Queue_Overlay.pm:740
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this queue"
+msgstr "Impossible de supprimer ce groupe/utilisateur comme un %1 pour cette queue"
+
+#: lib/RT/Ticket_Overlay.pm:1576
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this ticket"
+msgstr "Impossible de supprimer ce groupe/utilisateur comme un %1 pour ce ticket"
+
+#: lib/RT/Group_Overlay.pm:984
+msgid "Couldn't add member to group"
+msgstr "Impossible d'ajouter un membre à ce groupe"
+
+#: lib/RT/Ticket_Overlay.pm:3599 lib/RT/Ticket_Overlay.pm:3655
+#. ($Msg)
+msgid "Couldn't create a transaction: %1"
+msgstr "Impossible de créer une transaction : %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't figure out what to do from gpg's reply\\n"
+msgstr "Impossible de comprendre ce qu'il faut faire avec cette réponse gpg\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find group\\n"
+msgstr "Groupe introuvable\\n"
+
+#: lib/RT/Interface/Web.pm:902
+msgid "Couldn't find row"
+msgstr "Colonne introuvable"
+
+#: lib/RT/Group_Overlay.pm:958
+msgid "Couldn't find that principal"
+msgstr "groupe/utilisateur introuvable"
+
+#: lib/RT/CustomField_Overlay.pm:239
+msgid "Couldn't find that value"
+msgstr "Valeur introuvable"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find that watcher"
+msgstr "L'observateur n'a pas pu être trouvé"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find user\\n"
+msgstr "Utilisateur introuvable\\n"
+
+#: lib/RT/CurrentUser.pm:111
+#. ($self->Id)
+msgid "Couldn't load %1 from the users database.\\n"
+msgstr "Impossible de charger %1 depuis la base de données des utilisateurs.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load KeywordSelects."
+msgstr "KeywordSelects n'a pas pu être chargé"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load RT config file '%1' %2"
+msgstr "Impossible de charger le fichier de configuration RT '%1' %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load Scrips."
+msgstr "Les scrips n'ont pas pu être chargés"
+
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
+#. ($id)
+msgid "Couldn't load group %1"
+msgstr "Impossible de charger le groupe %1"
+
+#: lib/RT/Link_Overlay.pm:174 lib/RT/Link_Overlay.pm:183 lib/RT/Link_Overlay.pm:210
+msgid "Couldn't load link"
+msgstr "Impossible de charger le lien"
+
+#: html/Admin/Elements/EditCustomFields:146 html/Admin/Queues/People.html:120
+#. ($id)
+msgid "Couldn't load queue"
+msgstr "Impossible de charger la queue"
+
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71
+#. ($id)
+msgid "Couldn't load queue %1"
+msgstr "Impossible de charger la queue %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load scrip"
+msgstr "Impossible de charger le Scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load template"
+msgstr "Impossible de charger le modèle"
+
+#: html/Admin/Users/Prefs.html:78
+#. ($id)
+msgid "Couldn't load that user (%1)"
+msgstr "Impossible de charger cet utilisateur (%1)"
+
+#: html/SelfService/Display.html:108
+#. ($id)
+msgid "Couldn't load ticket '%1'"
+msgstr "Impossible de charger le ticket '%1'"
+
+#: html/Admin/Elements/ModifyUser:85 html/Admin/Users/Modify.html:148 html/User/Prefs.html:97
+msgid "Country"
+msgstr "Pays"
+
+#: html/Admin/Elements/CreateUserCalled:25 html/Ticket/Create.html:134 html/Ticket/Create.html:194
+msgid "Create"
+msgstr "Ajouter"
+
+#: etc/initialdata:127
+msgid "Create Tickets"
+msgstr "Ajouter des tickets"
+
+#: html/Admin/Elements/EditCustomField:74
+msgid "Create a CustomField"
+msgstr "Ajouter un Champ Personnalisé"
+
+#: html/Admin/Queues/CustomField.html:47
+#. ($QueueObj->Name())
+msgid "Create a CustomField for queue %1"
+msgstr "Ajouter un champ personnalisé à la queue %1"
+
+#: html/Admin/Global/CustomField.html:47
+msgid "Create a CustomField which applies to all queues"
+msgstr "Ajouter un champ personnalisé à toutes les queues"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new Custom Field"
+msgstr "Ajouter un nouveaux champ personnalisé"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global scrip"
+msgstr "Ajouter un nouveau scrip global"
+
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
+msgid "Create a new group"
+msgstr "Ajouter un nouveau groupe"
+
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
+msgid "Create a new personal group"
+msgstr "Ajouter un nouveau groupe personnel"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new queue"
+msgstr "Ajouter une nouvelle queue"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new scrip"
+msgstr "Ajouter un nouveau scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new template"
+msgstr "Ajouter un nouveau modèle"
+
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
+msgid "Create a new ticket"
+msgstr "Ajouter un nouveau ticket"
+
+#: html/Admin/Users/Modify.html:213 html/Admin/Users/Modify.html:240
+msgid "Create a new user"
+msgstr "Ajouter un nouvel utilisateur"
+
+#: html/Admin/Queues/Modify.html:103
+msgid "Create a queue"
+msgstr "Ajouter une queue"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a queue called"
+msgstr "Ajouter une nouvelle queue appelée"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a request"
+msgstr "Ajouter une demande"
+
+#: html/Admin/Queues/Scrip.html:58
+#. ($QueueObj->Name)
+msgid "Create a scrip for queue %1"
+msgstr "Ajouter un scrip pour la queue %1"
+
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
+msgid "Create a template"
+msgstr "Ajouter un modèle"
+
+#: html/SelfService/Create.html:24
+msgid "Create a ticket"
+msgstr "Ajouter un ticket"
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1 / %2 / %3 "
+msgstr "Echec à la création de: %1 / %2 / %3"
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1/%2/%3"
+msgstr "Echec à la création de: %1/%2/%3"
+
+#: etc/initialdata:129
+msgid "Create new tickets based on this scrip's template"
+msgstr "Ajouter de nouveaux tickets basés sur le modèle de ce scrip"
+
+#: html/SelfService/Create.html:77
+msgid "Create ticket"
+msgstr "Ajouter un ticket"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "Create tickets in this queue"
+msgstr "Ajouter des tickets dans cette queue"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "Create, delete and modify custom fields"
+msgstr "Ajouter, supprimer et modifier des champs personnalisés"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "Create, delete and modify queues"
+msgstr "Ajouter, supprimer et modifier les queues"
+
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
+msgstr "Ajouter, supprime et modifie les membres des groupe spersonnels de n'importe quel utilisateur"
+
+#: lib/RT/System.pm:58
+msgid "Create, delete and modify the members of personal groups"
+msgstr "Ajouter, supprimer et modifier les membres d'un groupe personnel"
+
+#: lib/RT/System.pm:59
+msgid "Create, delete and modify users"
+msgstr "Ajouter, supprimer et modifier les utilisateurs"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "CreateTicket"
+msgstr "CréerTicket"
+
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:26 lib/RT/Ticket_Overlay.pm:1203
+msgid "Created"
+msgstr "Créé"
+
+#: html/Admin/Elements/EditCustomField:87
+#. ($CustomFieldObj->Name())
+msgid "Created CustomField %1"
+msgstr "Champ Personnalisé %1 ajouté"
+
+#: NOT FOUND IN SOURCE
+msgid "Created template %1"
+msgstr "Modèle %1 créé"
+
+#: html/Ticket/Elements/EditLinks:27
+msgid "Current Relationships"
+msgstr "Relations actuelles"
+
+#: html/Admin/Elements/EditScrips:29
+msgid "Current Scrips"
+msgstr "Scrips actuels"
+
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
+msgid "Current members"
+msgstr "Membres actuels"
+
+#: html/Admin/Elements/SelectRights:28
+msgid "Current rights"
+msgstr "Droits actuels"
+
+#: html/Search/Listing.html:70
+msgid "Current search criteria"
+msgstr "Critères de recherche courants"
+
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
+msgid "Current watchers"
+msgstr "Observateurs actuels"
+
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr "Champ personnalisé n°%1"
+
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Ticket/Elements/ShowSummary:35
+msgid "Custom Fields"
+msgstr "Champs Personnalisés"
+
+#: html/Admin/Elements/EditScrip:72
+msgid "Custom action cleanup code"
+msgstr "Programme de nettoyage d'action personnalisé"
+
+#: html/Admin/Elements/EditScrip:64
+msgid "Custom action preparation code"
+msgstr "Programme de préparation d'action personnalisé "
+
+#: html/Admin/Elements/EditScrip:48
+msgid "Custom condition"
+msgstr "Condition personnalisée"
+
+#: lib/RT/Tickets_Overlay.pm:1618
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
+msgid "Custom field %1 %2 %3"
+msgstr "Champs personnalisés %1 %2 %3"
+
+#: lib/RT/Tickets_Overlay.pm:1613
+#. ($CF->Name)
+msgid "Custom field %1 has a value."
+msgstr "Le champ personnalisé %1 a une valeur"
+
+#: lib/RT/Tickets_Overlay.pm:1610
+#. ($CF->Name)
+msgid "Custom field %1 has no value."
+msgstr "Le champ personnalisé %1 n'a pas de valeur"
+
+#: lib/RT/Ticket_Overlay.pm:3491
+#. ($args{'Field'})
+msgid "Custom field %1 not found"
+msgstr "Le champ personnalisé %1 est introuvable"
+
+#: html/Admin/Elements/EditCustomFields:196
+msgid "Custom field deleted"
+msgstr "Champ personnalisé supprimé"
+
+#: lib/RT/Ticket_Overlay.pm:3641
+msgid "Custom field not found"
+msgstr "Le champ personnalisé est introuvable"
+
+#: lib/RT/CustomField_Overlay.pm:349
+#. ($args{'Content'}, $self->Name)
+msgid "Custom field value %1 could not be found for custom field %2"
+msgstr "La valeur du champ personnalisé %1 ne peut pas être trouvée pour le champ personnalisé %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Custom field value changed from %1 to %2"
+msgstr "Valeur de champ personnalisé modifié de %1 à %2"
+
+#: lib/RT/CustomField_Overlay.pm:249
+msgid "Custom field value could not be deleted"
+msgstr "La valeur du champ personnalisé ne peut pas être effacée"
+
+#: lib/RT/CustomField_Overlay.pm:355
+msgid "Custom field value could not be found"
+msgstr "La valeur du champ personnalisé ne peut par être trouvée"
+
+#: lib/RT/CustomField_Overlay.pm:247 lib/RT/CustomField_Overlay.pm:357
+msgid "Custom field value deleted"
+msgstr "La valeur du champ personnalisé est effacée"
+
+#: lib/RT/Transaction_Overlay.pm:548
+msgid "CustomField"
+msgstr "ChampPersonnalisé"
+
+#: NOT FOUND IN SOURCE
+msgid "Data error"
+msgstr "Erreur de données"
+
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:92 html/Ticket/ModifyAll.html:43
+msgid "Dates"
+msgstr "Dates"
+
+#: lib/RT/Date.pm:422
+msgid "Dec."
+msgstr "Déc."
+
+#: NOT FOUND IN SOURCE
+msgid "December"
+msgstr "Décembre"
+
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr "Modèle de réponse automatique par défaut"
+
+#: etc/initialdata:207
+msgid "Default Autoresponse template"
+msgstr "Modèle de réponse automatique par défaut"
+
+#: etc/initialdata:281
+msgid "Default admin comment template"
+msgstr "Modèle de commentaire administrateur par défaut"
+
+#: etc/initialdata:260
+msgid "Default admin correspondence template"
+msgstr "Modèle de courrier administrateur par défaut"
+
+#: etc/initialdata:272
+msgid "Default correspondence template"
+msgstr "Modèle de courrier par défaut"
+
+#: etc/initialdata:238
+msgid "Default transaction template"
+msgstr "Modèle de transaction par défaut"
+
+#: lib/RT/Transaction_Overlay.pm:694
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr "Par défaut: %1/%2 modifié de %3 à %4"
+
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
+msgid "Delegate rights"
+msgstr "Déléguer les droits"
+
+#: lib/RT/System.pm:62
+msgid "Delegate specific rights which have been granted to you."
+msgstr "Déléguer des droits spécifiques qui vous ont été accordés"
+
+#: lib/RT/System.pm:62
+msgid "DelegateRights"
+msgstr "DéléguerDroits"
+
+#: html/User/Elements/Tabs:37
+msgid "Delegation"
+msgstr "Délégation"
+
+#: NOT FOUND IN SOURCE
+msgid "Delete"
+msgstr "Supprimer"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "Delete tickets"
+msgstr "Supprimer des tickets"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "DeleteTicket"
+msgstr "SupprimerTicket"
+
+#: lib/RT/Transaction_Overlay.pm:187
+msgid "Deleting this object could break referential integrity"
+msgstr "Effacer cet objet pourrait briser l'intégrité référentielle"
+
+#: lib/RT/Queue_Overlay.pm:293
+msgid "Deleting this object would break referential integrity"
+msgstr "Effacer cet objet briserait l'intégrité référentielle"
+
+#: lib/RT/User_Overlay.pm:499
+msgid "Deleting this object would violate referential integrity"
+msgstr "Effacer cet objet violerait l'intégrité référentielle"
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity."
+msgstr "Effacer cet objet violerait l'intégrité référentielle"
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity. That's bad."
+msgstr "Effacer cet objet violerait l'intégrité référentielle, c'est serait facheux!"
+
+#: html/Approvals/Elements/Approve:44
+msgid "Deny"
+msgstr "Refuser"
+
+#: html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/EditLinks:122 html/Ticket/Elements/EditLinks:46 html/Ticket/Elements/ShowDependencies:31 html/Ticket/Elements/ShowLinks:36
+msgid "Depended on by"
+msgstr "En dépend"
+
+#: NOT FOUND IN SOURCE
+msgid "Dependencies: \\n"
+msgstr "Dépendances : \\n"
+
+#: lib/RT/Transaction_Overlay.pm:626
+#. ($value)
+msgid "Dependency by %1 added"
+msgstr "Ajout de la dépendance par %1"
+
+#: lib/RT/Transaction_Overlay.pm:655
+#. ($value)
+msgid "Dependency by %1 deleted"
+msgstr "Suppression de la dépendance par %1"
+
+#: lib/RT/Transaction_Overlay.pm:624
+#. ($value)
+msgid "Dependency on %1 added"
+msgstr "Ajout de la dépendance de %1"
+
+#: lib/RT/Transaction_Overlay.pm:653
+#. ($value)
+msgid "Dependency on %1 deleted"
+msgstr "Suppression de la dépendance de %1"
+
+#: html/Elements/SelectLinkType:26 html/Ticket/Create.html:179 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/EditLinks:118 html/Ticket/Elements/EditLinks:35 html/Ticket/Elements/ShowDependencies:24 html/Ticket/Elements/ShowLinks:26
+msgid "Depends on"
+msgstr "Dépend de"
+
+#: NOT FOUND IN SOURCE
+msgid "DependsOn"
+msgstr "DépendDe"
+
+#: html/Elements/SelectSortOrder:34
+msgid "Descending"
+msgstr "Décroissant"
+
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
+msgid "Describe the issue below"
+msgstr "Décrivez la situation ci-dessous"
+
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:33 html/Admin/Elements/ModifyQueue:35 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Elements/SelectGroups:26 html/User/Groups/Modify.html:48
+msgid "Description"
+msgstr "Description"
+
+#: NOT FOUND IN SOURCE
+msgid "Details"
+msgstr "Détails"
+
+#: html/Ticket/Elements/Tabs:84
+msgid "Display"
+msgstr "Afficher"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "Display Access Control List"
+msgstr "Afficher la liste des droits"
+
+#: lib/RT/Queue_Overlay.pm:74
+msgid "Display Scrip templates for this queue"
+msgstr "Afficher les modèles de Scrips pour cette queue"
+
+#: lib/RT/Queue_Overlay.pm:77
+msgid "Display Scrips for this queue"
+msgstr "Afficher les Scrips pour cette queue"
+
+#: html/Ticket/Elements/ShowHistory:34
+msgid "Display mode"
+msgstr "Mode d'affichage"
+
+#: NOT FOUND IN SOURCE
+msgid "Display ticket #%1"
+msgstr "Afficher le ticket n°%1"
+
+#: lib/RT/System.pm:53
+msgid "Do anything and everything"
+msgstr "Faire tout et n'importe quoi"
+
+#: html/Elements/Refresh:29
+msgid "Don't refresh this page."
+msgstr "Ne pas rafraîchir cette page."
+
+#: html/Search/Elements/PickRestriction:113
+msgid "Don't show search results"
+msgstr "Ne pas afficher le résultat de la recherche"
+
+#: html/Ticket/Elements/ShowTransaction:91
+msgid "Download"
+msgstr "Télécharger"
+
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:42 lib/RT/Ticket_Overlay.pm:1207
+msgid "Due"
+msgstr "Echéance"
+
+#: NOT FOUND IN SOURCE
+msgid "Due date '%1' could not be parsed"
+msgstr "Date d'échéance '%1' n'est pas comprise"
+
+#: bin/rt-commit-handler:753
+#. ($1, $msg)
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
+msgstr "ERREUR: impossible de charger le ticket '%1' : %2.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit"
+msgstr "Modifier"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit Conditions"
+msgstr "Modifier les conditions"
+
+#: html/Admin/Queues/CustomFields.html:44
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr "Editer les champs personnalisés pour %1"
+
+#: html/Search/Bulk.html:143 html/Ticket/ModifyLinks.html:35
+msgid "Edit Relationships"
+msgstr "Modifier les relations"
+
+#: html/Admin/Queues/Templates.html:41
+#. ($QueueObj->Name)
+msgid "Edit Templates for queue %1"
+msgstr "Modifier les modèles pour la queue %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit keywords"
+msgstr "Modifier les mots clé"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr "Modifier les scrips"
+
+#: html/Admin/Global/index.html:45
+msgid "Edit system templates"
+msgstr "Modifier les modèles système"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit templates for %1"
+msgstr "Modifier les modèles pour %1"
+
+#: html/Admin/Elements/ModifyQueue:24 html/Admin/Queues/Modify.html:118
+#. ($QueueObj->Name)
+#. ($QueueObj->Id)
+msgid "Editing Configuration for queue %1"
+msgstr "Modifier la configuration de la queue %1"
+
+#: html/Admin/Elements/ModifyUser:24
+#. ($UserObj->Name)
+msgid "Editing Configuration for user %1"
+msgstr "Modifier la configuration de l'utilisateur %1"
+
+#: html/Admin/Elements/EditCustomField:90
+#. ($CustomFieldObj->Name())
+msgid "Editing CustomField %1"
+msgstr "Modifier le ChampPersonnalisé %1"
+
+#: html/Admin/Groups/Members.html:31
+#. ($Group->Name)
+msgid "Editing membership for group %1"
+msgstr "Modifier les membres du groupe %1"
+
+#: html/User/Groups/Members.html:128
+#. ($Group->Name)
+msgid "Editing membership for personal group %1"
+msgstr "Modifier les membres du groupe personnel %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Editing template %1"
+msgstr "Modifie le modèle %1"
+
+#: lib/RT/Ticket_Overlay.pm:2660 lib/RT/Ticket_Overlay.pm:2738
+msgid "Either base or target must be specified"
+msgstr "La base ou la cible doivent être spécifiées"
+
+#: html/Admin/Users/Modify.html:52 html/Admin/Users/Prefs.html:45 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:41
+msgid "Email"
+msgstr "Email"
+
+#: lib/RT/User_Overlay.pm:247
+msgid "Email address in use"
+msgstr "Adresse email utilisée"
+
+#: html/Admin/Elements/ModifyUser:41
+msgid "EmailAddress"
+msgstr "EmailAddress"
+
+#: html/Admin/Elements/ModifyUser:53
+msgid "EmailEncoding"
+msgstr "EmailEncoding"
+
+#: html/Admin/Elements/EditCustomField:50
+msgid "Enabled (Unchecking this box disables this custom field)"
+msgstr "Activé (Décocher cette case désactive ce champ personnalisé)"
+
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
+msgid "Enabled (Unchecking this box disables this group)"
+msgstr "Activé (Décocher cette case désactive ce groupe)"
+
+#: html/Admin/Queues/Modify.html:83
+msgid "Enabled (Unchecking this box disables this queue)"
+msgstr "Activé (Décocher cette case désactive cette queue)"
+
+#: html/Admin/Elements/EditCustomFields:98
+msgid "Enabled Custom Fields"
+msgstr "Champs personnalisés actifs"
+
+#: html/Admin/Queues/index.html:55
+msgid "Enabled Queues"
+msgstr "Queues actives"
+
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:282 html/User/Groups/Modify.html:116
+#. (loc_fuzzy($msg))
+msgid "Enabled status %1"
+msgstr "Statut actif %1"
+
+#: lib/RT/CustomField_Overlay.pm:427
+msgid "Enter multiple values"
+msgstr "Entrer plusieurs valeurs"
+
+#: lib/RT/CustomField_Overlay.pm:424
+msgid "Enter one value"
+msgstr "Entrer une seule valeur"
+
+#: html/Search/Bulk.html:144 html/Ticket/Elements/EditLinks:111
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "Saisir les tickets ou URIs pour y lier les tickets. Séparer les saisies par des espaces."
+
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
+msgid "Error"
+msgstr "Erreur"
+
+#: NOT FOUND IN SOURCE
+msgid "Error adding watcher"
+msgstr "Erreur à l'ajout de l'observateur"
+
+#: lib/RT/Queue_Overlay.pm:555
+msgid "Error in parameters to Queue->AddWatcher"
+msgstr "Erreur de paramètres pour Queue->AddWatcher"
+
+#: lib/RT/Queue_Overlay.pm:713
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr "Erreur de paramètres pour Queue->DelWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1392
+msgid "Error in parameters to Ticket->AddWatcher"
+msgstr "Erreur de paramètres pour Ticket->AddWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1549
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr "Erreur de paramètres pour Ticket->DelWatcher"
+
+#: etc/initialdata:20
+msgid "Everyone"
+msgstr "Tout le monde"
+
+#: bin/rt-crontool:193
+msgid "Example:"
+msgstr "Exemple:"
+
+#: html/Admin/Elements/ModifyUser:63
+msgid "ExternalAuthId"
+msgstr "ExternalAuthId"
+
+#: html/Admin/Elements/ModifyUser:57
+msgid "ExternalContactInfoId"
+msgstr "ExternalContactInfoId"
+
+#: html/Admin/Users/Modify.html:72
+msgid "Extra info"
+msgstr "Info supplémentaire"
+
+#: lib/RT/User_Overlay.pm:363
+msgid "Failed to find 'Privileged' users pseudogroup."
+msgstr "Recherche du pseudo groupe d'utilisateurs 'Priviligiés' infructueuse"
+
+#: lib/RT/User_Overlay.pm:370
+msgid "Failed to find 'Unprivileged' users pseudogroup"
+msgstr "Recherche du pseudo groupe d'utilisateurs 'non-privilégiés' infructueuse"
+
+#: bin/rt-crontool:137
+#. ($modname, $@)
+msgid "Failed to load module %1. (%2)"
+msgstr "Echec de chargement du module %1. (%2)"
+
+#: lib/RT/Date.pm:412
+msgid "Feb."
+msgstr "Fév."
+
+#: NOT FOUND IN SOURCE
+msgid "February"
+msgstr "Février"
+
+#: NOT FOUND IN SOURCE
+msgid "Fin"
+msgstr "Fin"
+
+#: html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:58 lib/RT/Tickets_Overlay.pm:1091
+msgid "Final Priority"
+msgstr "Priorité finale"
+
+#: lib/RT/Ticket_Overlay.pm:1198
+msgid "FinalPriority"
+msgstr "PrioritéFinale"
+
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
+msgid "Find group whose"
+msgstr "Trouver un groupe dont"
+
+#: NOT FOUND IN SOURCE
+msgid "Find new/open tickets"
+msgstr "Accéder aux tickets en cours"
+
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
+msgid "Find people whose"
+msgstr "Trouver les gens dont"
+
+#: html/Search/Listing.html:107
+msgid "Find tickets"
+msgstr "Rechercher des tickets"
+
+#: NOT FOUND IN SOURCE
+msgid "Finish Approval"
+msgstr "Terminer l'approbation"
+
+#: html/Ticket/Elements/Tabs:57
+msgid "First"
+msgstr "Premier"
+
+#: html/Search/Listing.html:40
+msgid "First page"
+msgstr "Première page"
+
+#: docs/design_docs/string-extraction-guide.txt:33
+msgid "Foo Bar Baz"
+msgstr "Foo Bar Baz"
+
+#: docs/design_docs/string-extraction-guide.txt:24
+msgid "Foo!"
+msgstr "Foo!"
+
+#: html/Search/Bulk.html:86
+msgid "Force change"
+msgstr "Forcer la modification"
+
+#: html/Search/Listing.html:105
+#. ($ticketcount)
+msgid "Found %quant(%1,ticket)"
+msgstr "%quant(%1,ticket) trouvés"
+
+#: lib/RT/Interface/Web.pm:904
+msgid "Found Object"
+msgstr "Objet trouvé"
+
+#: html/Admin/Elements/ModifyUser:43
+msgid "FreeformContactInfo"
+msgstr "SaisieLibreInfoContact"
+
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformMultiple"
+msgstr "SaisieLibreMultiple"
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "FreeformSingle"
+msgstr "SaisieLibreSimple"
+
+#: lib/RT/Date.pm:392
+msgid "Fri."
+msgstr "Ven."
+
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
+msgid "Full headers"
+msgstr "En-têtes complets"
+
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr "Obtention de l'utilisateur courant depuis une signature pgp\\n"
+
+#: lib/RT/Transaction_Overlay.pm:593
+#. ($New->Name)
+msgid "Given to %1"
+msgstr "Donné à %1"
+
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
+msgid "Global"
+msgstr "Global"
+
+#: NOT FOUND IN SOURCE
+msgid "Global Keyword Selections"
+msgstr "Mots clé globaux"
+
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
+msgstr "Scrips globaux"
+
+#: html/Admin/Elements/SelectTemplate:37
+#. (loc($Template->Name))
+msgid "Global template: %1"
+msgstr "Modèle global: %1"
+
+#: html/Admin/Elements/EditCustomFields:74 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:40
+msgid "Go!"
+msgstr "Go!"
+
+#: NOT FOUND IN SOURCE
+msgid "Good pgp sig from %1\\n"
+msgstr "Signature pgp valide pour %1\\n"
+
+#: html/Search/Listing.html:49
+msgid "Goto page"
+msgstr "Aller à la page"
+
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
+msgid "Goto ticket"
+msgstr "Aller au ticket"
+
+#: NOT FOUND IN SOURCE
+msgid "Grand"
+msgstr "Accorder"
+
+#: html/Ticket/Elements/AddWatchers:45 html/User/Elements/DelegateRights:77
+msgid "Group"
+msgstr "Groupe"
+
+#: NOT FOUND IN SOURCE
+msgid "Group %1 %2: %3"
+msgstr "Groupe %1 %2 : %3"
+
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
+msgid "Group Rights"
+msgstr "Droits de groupe"
+
+#: lib/RT/Group_Overlay.pm:964
+msgid "Group already has member"
+msgstr "Le groupe a déjà un membre"
+
+#: NOT FOUND IN SOURCE
+msgid "Group could not be created."
+msgstr "Le groupe n'a pas pu être créé"
+
+#: html/Admin/Groups/Modify.html:76
+#. ($create_msg)
+msgid "Group could not be created: %1"
+msgstr "Le groupe %1 n'a pu être créé"
+
+#: lib/RT/Group_Overlay.pm:496
+msgid "Group created"
+msgstr "Groupe ajouté"
+
+#: lib/RT/Group_Overlay.pm:1132
+msgid "Group has no such member"
+msgstr "Un tel membre n'appartient pas au groupe"
+
+#: lib/RT/Group_Overlay.pm:944 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1446 lib/RT/Ticket_Overlay.pm:1524
+msgid "Group not found"
+msgstr "Groupe introuvable"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not found.\\n"
+msgstr "Groupe introuvable.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not specified.\\n"
+msgstr "Groupe non spécifié.\\n"
+
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/User/Groups/Members.html:66
+msgid "Groups"
+msgstr "Groupes"
+
+#: lib/RT/Group_Overlay.pm:970
+msgid "Groups can't be members of their members"
+msgstr "Les groupes ne peuvent pas être membres de leurs membres"
+
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
+msgid "Hello!"
+msgstr "Bonjour!"
+
+#: docs/design_docs/string-extraction-guide.txt:40
+#. ($name)
+msgid "Hello, %1"
+msgstr "Bonjour, %1"
+
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:87
+msgid "History"
+msgstr "Historique"
+
+#: html/Admin/Elements/ModifyUser:67
+msgid "HomePhone"
+msgstr "Téléphone domicile"
+
+#: html/Elements/Tabs:43
+msgid "Homepage"
+msgstr "Page d'accueil"
+
+#: lib/RT/Base.pm:73
+#. (6)
+msgid "I have %quant(%1,concrete mixer)."
+msgstr "J'ai %quant (%1, toupie à béton)"
+
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
+msgstr "J'ai %quant (%1, toupie à béton)"
+
+#: html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1018
+msgid "Id"
+msgstr "Identifiant"
+
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
+msgid "Identity"
+msgstr "Identité"
+
+#: etc/initialdata:411 etc/upgrade/2.1.71:86
+msgid "If an approval is rejected, reject the original and delete pending approvals"
+msgstr "Si une approbation est refusée, rejette l'original et supprime les approbations en attente"
+
+#: bin/rt-crontool:189
+msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
+msgstr "Si cet outil était setgid, un utilisateur local mal intentionné pourrait l'utiliser pour obtenir un access administrateur à RT"
+
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
+msgid "If you've updated anything above, be sure to"
+msgstr "Si vous avez fait une modification, assurez vous de"
+
+#: lib/RT/Interface/Web.pm:896
+msgid "Illegal value for %1"
+msgstr "Valeur incorrecte pour %1"
+
+#: lib/RT/Interface/Web.pm:899
+msgid "Immutable field"
+msgstr "Champ non modifiable"
+
+#: html/Admin/Elements/EditCustomFields:73
+msgid "Include disabled custom fields in listing."
+msgstr "Inclure les champs personnalisés désactivés dans la liste"
+
+#: html/Admin/Queues/index.html:42
+msgid "Include disabled queues in listing."
+msgstr "Afficher les queues inactives."
+
+#: html/Admin/Users/index.html:46
+msgid "Include disabled users in search."
+msgstr "Inclure les utilisateurs désactivés dans le résultat"
+
+#: lib/RT/Tickets_Overlay.pm:1067
+msgid "Initial Priority"
+msgstr "Priorité initiale"
+
+#: lib/RT/Ticket_Overlay.pm:1197 lib/RT/Ticket_Overlay.pm:1199
+msgid "InitialPriority"
+msgstr "PrioritéInitiale"
+
+#: lib/RT/ScripAction_Overlay.pm:104
+msgid "Input error"
+msgstr "Erreur à l'entrée"
+
+#: NOT FOUND IN SOURCE
+msgid "Interest noted"
+msgstr "Votre intéret est noté"
+
+#: lib/RT/Ticket_Overlay.pm:3866
+msgid "Internal Error"
+msgstr "Erreur interne"
+
+#: lib/RT/Record.pm:142
+#. ($id->{error_message})
+msgid "Internal Error: %1"
+msgstr "Erreur interne: %1"
+
+#: lib/RT/Group_Overlay.pm:643
+msgid "Invalid Group Type"
+msgstr "Type de groupe invalide"
+
+#: lib/RT/Principal_Overlay.pm:127
+msgid "Invalid Right"
+msgstr "Droit invalide"
+
+#: NOT FOUND IN SOURCE
+msgid "Invalid Type"
+msgstr "Type invalide"
+
+#: lib/RT/Interface/Web.pm:901
+msgid "Invalid data"
+msgstr "Données invalides"
+
+#: lib/RT/Ticket_Overlay.pm:457
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr "Intervenant invalide, affectation à 'personne'"
+
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:250
+msgid "Invalid queue"
+msgstr "Queue invalide"
+
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
+msgid "Invalid right"
+msgstr "Droit invalide"
+
+#: lib/RT/Record.pm:117
+#. ($key)
+msgid "Invalid value for %1"
+msgstr "Queue invalide pour %1"
+
+#: lib/RT/Ticket_Overlay.pm:3498
+msgid "Invalid value for custom field"
+msgstr "Valeur incorrecte pour le champ personnalisé"
+
+#: lib/RT/Ticket_Overlay.pm:364
+msgid "Invalid value for status"
+msgstr "Valeur de statut invalide"
+
+#: bin/rt-crontool:190
+msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
+msgstr "Il est extrêmement important que les utilisateurs non authorisés n'aient pas accès à cet outil"
+
+#: bin/rt-crontool:191
+msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
+msgstr "Il est suggéré de créer un utilisateur unix non privilégié appartenant au bon groupe et ayant accès à RT pour utiliser cet outil"
+
+#: bin/rt-crontool:162
+msgid "It takes several arguments:"
+msgstr "Il faut plusieurs paramètres:"
+
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
+msgstr "Eléments attendant mon approbation"
+
+#: lib/RT/Date.pm:411
+msgid "Jan."
+msgstr "Jan."
+
+#: NOT FOUND IN SOURCE
+msgid "January"
+msgstr "Janvier"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "Join or leave this group"
+msgstr "Rejoignez ou quittez ce groupe"
+
+#: lib/RT/Date.pm:417
+msgid "Jul."
+msgstr "Jul."
+
+#: NOT FOUND IN SOURCE
+msgid "July"
+msgstr "Juillet"
+
+#: html/Ticket/Elements/Tabs:98
+msgid "Jumbo"
+msgstr "Tout"
+
+#: lib/RT/Date.pm:416
+msgid "Jun."
+msgstr "Jun."
+
+#: NOT FOUND IN SOURCE
+msgid "June"
+msgstr "Juin"
+
+#: NOT FOUND IN SOURCE
+msgid "Keyword"
+msgstr "Mot Clé"
+
+#: html/Admin/Elements/ModifyUser:51
+msgid "Lang"
+msgstr "Lang"
+
+#: html/Ticket/Elements/Tabs:72
+msgid "Last"
+msgstr "Dernier"
+
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:38
+msgid "Last Contact"
+msgstr "Dernier contact"
+
+#: html/Elements/SelectDateType:28
+msgid "Last Contacted"
+msgstr "Date dernier contact"
+
+#: html/Search/Elements/TicketHeader:40
+msgid "Last Notified"
+msgstr "Dernière notification"
+
+#: html/Elements/SelectDateType:29
+msgid "Last Updated"
+msgstr "Date dernière MAJ"
+
+#: NOT FOUND IN SOURCE
+msgid "LastUpdated"
+msgstr "DernièreMAJ"
+
+#: NOT FOUND IN SOURCE
+msgid "Left"
+msgstr "Restant"
+
+#: html/Admin/Users/Modify.html:82
+msgid "Let this user access RT"
+msgstr "Donner accès à RT à cet utilisateur"
+
+#: html/Admin/Users/Modify.html:86
+msgid "Let this user be granted rights"
+msgstr "Autoriser cet utilisateur à recevoir des droits"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting owner to %1 %2"
+msgstr "Limitation des intervenants à %1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting queue to %1 %2"
+msgstr "Limitation de la queue à %1 %2"
+
+#: lib/RT/Ticket_Overlay.pm:2752
+msgid "Link already exists"
+msgstr "Le lien existe déja"
+
+#: lib/RT/Ticket_Overlay.pm:2764
+msgid "Link could not be created"
+msgstr "Le lien ne peut être ajouté"
+
+#: lib/RT/Ticket_Overlay.pm:2772 lib/RT/Ticket_Overlay.pm:2784
+#. ($TransString)
+msgid "Link created (%1)"
+msgstr "Le lien est ajouté (%1)"
+
+#: lib/RT/Ticket_Overlay.pm:2685
+#. ($TransString)
+msgid "Link deleted (%1)"
+msgstr "Le lien est effacé (%1)"
+
+#: lib/RT/Ticket_Overlay.pm:2691
+msgid "Link not found"
+msgstr "Lien introuvable"
+
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
+#. ($Ticket->Id)
+msgid "Link ticket #%1"
+msgstr "Lier le ticket n°%1"
+
+#: NOT FOUND IN SOURCE
+msgid "Link ticket %1"
+msgstr "Lier au ticket %1"
+
+#: html/Ticket/Elements/Tabs:96
+msgid "Links"
+msgstr "Relations"
+
+#: html/Admin/Users/Modify.html:113 html/User/Prefs.html:84
+msgid "Location"
+msgstr "Localisation"
+
+#: lib/RT.pm:162
+#. ($RT::LogDir)
+msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
+msgstr "Le répertoire de log %1 est introuvable ou en lecture seule. \\n RT ne peut pas démarrer"
+
+#: html/Elements/Header:57
+#. ("<b>".$session{'CurrentUser'}->Name."</b>")
+msgid "Logged in as %1"
+msgstr "Connecté en tant que %1"
+
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54
+msgid "Login"
+msgstr "Connexion"
+
+#: html/Elements/Header:54
+msgid "Logout"
+msgstr "Déconnexion"
+
+#: html/Search/Bulk.html:85
+msgid "Make Owner"
+msgstr "Attribuer"
+
+#: html/Search/Bulk.html:109
+msgid "Make Status"
+msgstr "Appliquer Statut"
+
+#: html/Search/Bulk.html:117
+msgid "Make date Due"
+msgstr "Appliquer date d'échéance"
+
+#: html/Search/Bulk.html:119
+msgid "Make date Resolved"
+msgstr "Appliquer date de résolution"
+
+#: html/Search/Bulk.html:113
+msgid "Make date Started"
+msgstr "Appliquer date de début"
+
+#: html/Search/Bulk.html:111
+msgid "Make date Starts"
+msgstr "Appliquer date d'ouverture"
+
+#: html/Search/Bulk.html:115
+msgid "Make date Told"
+msgstr "Appliquer Age"
+
+#: html/Search/Bulk.html:105
+msgid "Make priority"
+msgstr "Appliquer priorité"
+
+#: html/Search/Bulk.html:107
+msgid "Make queue"
+msgstr "Appliquer queue"
+
+#: html/Search/Bulk.html:103
+msgid "Make subject"
+msgstr "Changer le sujet"
+
+#: html/Admin/index.html:32
+msgid "Manage groups and group membership"
+msgstr "Gérer les groupes et leurs membres"
+
+#: html/Admin/index.html:38
+msgid "Manage properties and configuration which apply to all queues"
+msgstr "Gérer les propriétés et configurations générales des queues"
+
+#: html/Admin/index.html:35
+msgid "Manage queues and queue-specific properties"
+msgstr "Gérer les queues et leurs propriétés individuelles"
+
+#: html/Admin/index.html:29
+msgid "Manage users and passwords"
+msgstr "Gérer les utilisateurs et mots de passe"
+
+#: lib/RT/Date.pm:413
+msgid "Mar."
+msgstr "Mar."
+
+#: NOT FOUND IN SOURCE
+msgid "March"
+msgstr "Mars"
+
+#: NOT FOUND IN SOURCE
+msgid "May"
+msgstr "Mai"
+
+#: lib/RT/Date.pm:415
+msgid "May."
+msgstr "Mai."
+
+#: lib/RT/Transaction_Overlay.pm:635
+#. ($value)
+msgid "Member %1 added"
+msgstr "Membre %1 ajouté"
+
+#: lib/RT/Transaction_Overlay.pm:664
+#. ($value)
+msgid "Member %1 deleted"
+msgstr "Membre %1 supprimé"
+
+#: lib/RT/Group_Overlay.pm:981
+msgid "Member added"
+msgstr "Membre ajouté"
+
+#: lib/RT/Group_Overlay.pm:1139
+msgid "Member deleted"
+msgstr "Membre supprimé"
+
+#: lib/RT/Group_Overlay.pm:1143
+msgid "Member not deleted"
+msgstr "Membre non supprimé"
+
+#: html/Elements/SelectLinkType:25
+msgid "Member of"
+msgstr "Membre de"
+
+#: NOT FOUND IN SOURCE
+msgid "MemberOf"
+msgstr "MembreDe"
+
+#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
+msgid "Members"
+msgstr "Membres"
+
+#: lib/RT/Transaction_Overlay.pm:633
+#. ($value)
+msgid "Membership in %1 added"
+msgstr "Appartenance à %1 ajoutée"
+
+#: lib/RT/Transaction_Overlay.pm:662
+#. ($value)
+msgid "Membership in %1 deleted"
+msgstr "Appartenance à %1 supprimée"
+
+#: lib/RT/Ticket_Overlay.pm:2941
+msgid "Merge Successful"
+msgstr "Fusion réussie"
+
+#: lib/RT/Ticket_Overlay.pm:2861
+msgid "Merge failed. Couldn't set EffectiveId"
+msgstr "Echec de fusion. Ne peut appliquer EffectiveId"
+
+#: html/Ticket/Elements/BulkLinks:26 html/Ticket/Elements/EditLinks:114
+msgid "Merge into"
+msgstr "Fusionner dans"
+
+#: html/Search/Bulk.html:137 html/Ticket/Update.html:100
+msgid "Message"
+msgstr "Message"
+
+#: lib/RT/Interface/Web.pm:903
+msgid "Missing a primary key?: %1"
+msgstr "Clé primaire manquante? : %1"
+
+#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:53
+msgid "Mobile"
+msgstr "Mobile"
+
+#: html/Admin/Elements/ModifyUser:71
+msgid "MobilePhone"
+msgstr "MobilePhone"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "Modify Access Control List"
+msgstr "Modifier la liste de droits"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Field %1"
+msgstr "Modifier champ personnalisé %1"
+
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
+msgid "Modify Custom Fields which apply to all queues"
+msgstr "Modifier les champs personnalisés globaux"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "Modify Scrip templates for this queue"
+msgstr "Modifier les modèles de Scrips pour cette queue"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "Modify Scrips for this queue"
+msgstr "Modifier les Scrips pour cette queue"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify System ACLS"
+msgstr "Modifier ACLs système"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Template %1"
+msgstr "Modifier le modèle %1"
+
+#: html/Admin/Queues/CustomField.html:44
+#. ($QueueObj->Name())
+msgid "Modify a CustomField for queue %1"
+msgstr "Modifier un champ personnalisé pour la queue %1"
+
+#: html/Admin/Global/CustomField.html:52
+msgid "Modify a CustomField which applies to all queues"
+msgstr "Modifier un champ personnalisé global"
+
+#: html/Admin/Queues/Scrip.html:53
+#. ($QueueObj->Name)
+msgid "Modify a scrip for queue %1"
+msgstr "Modifier le scrip pour la queue %1"
+
+#: html/Admin/Global/Scrip.html:47
+msgid "Modify a scrip which applies to all queues"
+msgstr "Modiier le scrip qui s'applique à toutes les queues"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify dates for # %1"
+msgstr "Modifier les dates pur n°%1"
+
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
+#. ($TicketObj->Id)
+msgid "Modify dates for #%1"
+msgstr "Modifier les dates pour n°%1"
+
+#: html/Ticket/ModifyDates.html:34
+#. ($TicketObj->Id)
+msgid "Modify dates for ticket # %1"
+msgstr "Modifier les dates du ticket n°%1"
+
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
+msgid "Modify global group rights"
+msgstr "Modifier les droits de groupe globaux"
+
+#: html/Admin/Global/GroupRights.html:32
+msgid "Modify global group rights."
+msgstr "Modifier les droits de groupe globaux"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for groups"
+msgstr "Modifier les droits globaux des groupes"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for users"
+msgstr "Modifier les droits globaux des utilisateurs"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global scrips"
+msgstr "Modifier les scrips globaux"
+
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
+msgid "Modify global user rights"
+msgstr "Modifier les droits utilisateurs globaux"
+
+#: html/Admin/Global/UserRights.html:32
+msgid "Modify global user rights."
+msgstr "Modifier les droits utilisateurs globaux"
+
+#: lib/RT/Group_Overlay.pm:145
+msgid "Modify group metadata or delete group"
+msgstr "Modifier les métadonnées ou supprimer le groupe"
+
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
+#. ($GroupObj->Name)
+msgid "Modify group rights for group %1"
+msgstr "Modifier les droits du groupe %1"
+
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
+#. ($QueueObj->Name)
+msgid "Modify group rights for queue %1"
+msgstr "Modifier les droits de groupe pour la queue %1"
+
+#: lib/RT/Group_Overlay.pm:147
+msgid "Modify membership roster for this group"
+msgstr "Modifier le membership roster pour ce groupe"
+
+#: lib/RT/System.pm:60
+msgid "Modify one's own RT account"
+msgstr "Modifier son propre profile RT"
+
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
+#. ($QueueObj->Name)
+msgid "Modify people related to queue %1"
+msgstr "Modifier les utilisateurs de la queue %1"
+
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
+#. ($Ticket->id)
+#. ($Ticket->Id)
+msgid "Modify people related to ticket #%1"
+msgstr "Modifier les utilisateurs du ticket n°%1"
+
+#: html/Admin/Queues/Scrips.html:45
+#. ($QueueObj->Name)
+msgid "Modify scrips for queue %1"
+msgstr "Modifier les scrips de la queue %1"
+
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
+msgid "Modify scrips which apply to all queues"
+msgstr "Modifier les scrips s'appliquant à toutes les queues"
+
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
+#. (loc($TemplateObj->Name()))
+#. ($TemplateObj->id)
+msgid "Modify template %1"
+msgstr "Modifier le modèle %1"
+
+#: html/Admin/Global/Templates.html:43
+msgid "Modify templates which apply to all queues"
+msgstr "Modifier les modèles globaux"
+
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
+#. ($Group->Name)
+msgid "Modify the group %1"
+msgstr "Modifier le groupe %1"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "Modify the queue watchers"
+msgstr "Modifier les observateurs de la queue"
+
+#: html/Admin/Users/Modify.html:235
+#. ($UserObj->Name)
+msgid "Modify the user %1"
+msgstr "Modifier l'utilisateur %1"
+
+#: html/Ticket/ModifyAll.html:36
+#. ($Ticket->Id)
+msgid "Modify ticket # %1"
+msgstr "Modifier le ticket # %1"
+
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
+#. ($TicketObj->Id)
+msgid "Modify ticket #%1"
+msgstr "Modifier le ticket n°%1"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "Modify tickets"
+msgstr "Modifier les tickets"
+
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
+#. ($GroupObj->Name)
+msgid "Modify user rights for group %1"
+msgstr "Modifier les droits utilisateurs pour le groupe %1"
+
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
+#. ($QueueObj->Name)
+msgid "Modify user rights for queue %1"
+msgstr "Modifier les droits utilisateurs pour la queue %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify watchers for queue '%1'"
+msgstr "Modifier les observateurs dela queue '%1'"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "ModifyACL"
+msgstr "ModifierACL"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "ModifyOwnMembership"
+msgstr "ModifierPropresAppartenances"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ModifyQueueWatchers"
+msgstr "ModifierObservateurs"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "ModifyScrips"
+msgstr "ModifierScrips"
+
+#: lib/RT/System.pm:60
+msgid "ModifySelf"
+msgstr "ModifierDonnéesPerso"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "ModifyTemplate"
+msgstr "ModifierModèle"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "ModifyTicket"
+msgstr "ModifierTicket"
+
+#: lib/RT/Date.pm:388
+msgid "Mon."
+msgstr "Lun."
+
+#: html/Ticket/Elements/ShowRequestor:41
+#. ($name)
+msgid "More about %1"
+msgstr "Plus d'info sur %1"
+
+#: html/Admin/Elements/EditCustomFields:60
+msgid "Move down"
+msgstr "Aller en bas"
+
+#: html/Admin/Elements/EditCustomFields:52
+msgid "Move up"
+msgstr "Aller en haut"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:26
+msgid "Multiple"
+msgstr "Multiple"
+
+#: lib/RT/User_Overlay.pm:238
+msgid "Must specify 'Name' attribute"
+msgstr "Attribut 'Nom' obligatoire"
+
+#: html/SelfService/Elements/MyRequests:48
+#. ($friendly_status)
+msgid "My %1 tickets"
+msgstr "Mes %1 tickets"
+
+#: NOT FOUND IN SOURCE
+msgid "My Approvals"
+msgstr "Mes approbations"
+
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
+msgid "My approvals"
+msgstr "Mes approbations"
+
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Elements/ModifyUser:29 html/Admin/Groups/Modify.html:43 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43
+msgid "Name"
+msgstr "Nom"
+
+#: lib/RT/User_Overlay.pm:245
+msgid "Name in use"
+msgstr "Nom utilisé"
+
+#: NOT FOUND IN SOURCE
+msgid "Need approval from system administrator"
+msgstr "Approbation de l'administrateur système nécessaire"
+
+#: html/Ticket/Elements/ShowDates:51
+msgid "Never"
+msgstr "Jamais"
+
+#: html/Elements/Quicksearch:29
+msgid "New"
+msgstr "Nouveau"
+
+#: html/Admin/Elements/ModifyUser:31 html/Admin/Users/Modify.html:92 html/User/Prefs.html:64
+msgid "New Password"
+msgstr "Nouveau mot de passe"
+
+#: etc/initialdata:317 etc/upgrade/2.1.71:16
+msgid "New Pending Approval"
+msgstr "Nouvelles approbations en attente"
+
+#: html/Ticket/Elements/EditLinks:110
+msgid "New Relationships"
+msgstr "Nouvelles relations"
+
+#: html/Ticket/Elements/Tabs:35
+msgid "New Search"
+msgstr "Nouvelle recherche"
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:39
+msgid "New custom field"
+msgstr "Nouveau champ personnalisé"
+
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
+msgid "New group"
+msgstr "Nouveau groupe"
+
+#: html/SelfService/Prefs.html:31
+msgid "New password"
+msgstr "Nouveau mot de passe"
+
+#: lib/RT/User_Overlay.pm:764
+msgid "New password notification sent"
+msgstr "Notification de nouveau mot de passe envoyée"
+
+#: html/Admin/Elements/QueueTabs:69
+msgid "New queue"
+msgstr "Nouvelle queue"
+
+#: NOT FOUND IN SOURCE
+msgid "New request"
+msgstr "Nouvelle demande"
+
+#: html/Admin/Elements/SelectRights:41
+msgid "New rights"
+msgstr "Nouveaux droits"
+
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
+msgid "New scrip"
+msgstr "Nouveau scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "New search"
+msgstr "Nouvelle recherche"
+
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
+msgid "New template"
+msgstr "Nouveau modèle"
+
+#: html/SelfService/Elements/Tabs:47
+msgid "New ticket"
+msgstr "Nouveau ticket"
+
+#: lib/RT/Ticket_Overlay.pm:2828
+msgid "New ticket doesn't exist"
+msgstr "Nouveau ticket inconnu"
+
+#: html/Admin/Elements/UserTabs:51
+msgid "New user"
+msgstr "Nouvel utilisateur"
+
+#: html/Admin/Elements/CreateUserCalled:25
+msgid "New user called"
+msgstr "Nouvel utilisateur appelé"
+
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
+msgid "New watchers"
+msgstr "Nouveaux observateurs"
+
+#: html/Admin/Users/Prefs.html:41
+msgid "New window setting"
+msgstr "Nouveaux paramètres d'affichage"
+
+#: html/Ticket/Elements/Tabs:68
+msgid "Next"
+msgstr "Suivant"
+
+#: html/Search/Listing.html:47
+msgid "Next page"
+msgstr "Page suivante"
+
+#: html/Admin/Elements/ModifyUser:49
+msgid "NickName"
+msgstr "Surnom"
+
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:45
+msgid "Nickname"
+msgstr "Surnom"
+
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:104
+msgid "No CustomField"
+msgstr "Pas de CustomField"
+
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
+msgid "No Group defined"
+msgstr "Aucun groupe défini"
+
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
+msgid "No Queue defined"
+msgstr "Aucune queue définie"
+
+#: bin/rt-crontool:55
+msgid "No RT user found. Please consult your RT administrator.\\n"
+msgstr "Aucun utilisateur RT trouvé. Merci de consulter votre administrateur RT"
+
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
+msgid "No Template"
+msgstr "Pas de modèle"
+
+#: bin/rt-commit-handler:763
+msgid "No Ticket specified. Aborting ticket "
+msgstr "Aucun ticket spécifié. Annulation de ticket"
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgstr "Aucun ticket spécifié. Annulation des modifications de tickets\\n\\n"
+
+#: html/Approvals/Elements/Approve:45
+msgid "No action"
+msgstr "Pas d'action"
+
+#: lib/RT/Interface/Web.pm:898
+msgid "No column specified"
+msgstr "Aucune colonne spécifiée"
+
+#: NOT FOUND IN SOURCE
+msgid "No command found\\n"
+msgstr "Commande introuvable\\n"
+
+#: html/Elements/ViewUser:35 html/Ticket/Elements/ShowRequestor:44
+msgid "No comment entered about this user"
+msgstr "Pas de commentaires concernant cet utilisateur"
+
+#: lib/RT/Ticket_Overlay.pm:2220 lib/RT/Ticket_Overlay.pm:2288
+msgid "No correspondence attached"
+msgstr "Pas de texte dans le courrier"
+
+#: lib/RT/Action/Generic.pm:149 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
+#. (ref $self)
+msgid "No description for %1"
+msgstr "Aucune description disponible pour %1"
+
+#: lib/RT/Users_Overlay.pm:150
+msgid "No group specified"
+msgstr "Aucun groupe spécifié"
+
+#: lib/RT/User_Overlay.pm:982
+msgid "No password set"
+msgstr "Pas de mot de passe configuré"
+
+#: lib/RT/Queue_Overlay.pm:260
+msgid "No permission to create queues"
+msgstr "Permission refusée pour la création de queue"
+
+#: lib/RT/Ticket_Overlay.pm:360
+#. ($QueueObj->Name)
+msgid "No permission to create tickets in the queue '%1'"
+msgstr "Vous n'êtes pas autorisé à créer un ticket dans cette queue '%1'"
+
+#: lib/RT/User_Overlay.pm:211
+msgid "No permission to create users"
+msgstr "Permission refusée pour la création d'utilisateurs"
+
+#: html/SelfService/Display.html:117
+msgid "No permission to display that ticket"
+msgstr "Pas de permission pour afficher ce ticket"
+
+#: html/SelfService/Update.html:51
+msgid "No permission to view update ticket"
+msgstr "Pas de permission pour afficher le ticket mis à jour"
+
+#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1505
+msgid "No principal specified"
+msgstr "Aucun groupe/utilisateur spécifié"
+
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
+msgid "No principals selected."
+msgstr "Aucun groupe/utilisateur sélectionné"
+
+#: html/Admin/Queues/index.html:34
+msgid "No queues matching search criteria found."
+msgstr "Pas de queue correspondant aux critères de recherche"
+
+#: html/Admin/Elements/SelectRights:80
+msgid "No rights found"
+msgstr "Aucun droit trouvé"
+
+#: html/Admin/Elements/SelectRights:32
+msgid "No rights granted."
+msgstr "Aucun droit accordé"
+
+#: html/Search/Bulk.html:160
+msgid "No search to operate on."
+msgstr "Pas de critère de recherche."
+
+#: NOT FOUND IN SOURCE
+msgid "No ticket id specified"
+msgstr "Aucun numéro de ticket spécifié."
+
+#: lib/RT/Transaction_Overlay.pm:478 lib/RT/Transaction_Overlay.pm:516
+msgid "No transaction type specified"
+msgstr "Aucun type de transaction spécifié."
+
+#: NOT FOUND IN SOURCE
+msgid "No user or email address specified"
+msgstr "Aucun utilisateur ou adresse email spécifié"
+
+#: html/Admin/Users/index.html:35
+msgid "No users matching search criteria found."
+msgstr "Aucun utilisateur ne correspond aux critères de recherche."
+
+#: bin/rt-commit-handler:643
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr "Aucun utilisateur RT valide trouvé. Gestionnaire de cvs RT inaccessible. Merci de contacter votre administrateur RT.\\n"
+
+#: lib/RT/Interface/Web.pm:895
+msgid "No value sent to _Set!\\n"
+msgstr "Aucune valeur envoyée à _Set!\\n"
+
+#: html/Search/Elements/TicketRow:36
+msgid "Nobody"
+msgstr "Personne"
+
+#: lib/RT/Interface/Web.pm:900
+msgid "Nonexistant field?"
+msgstr "Champ inexistant?"
+
+#: NOT FOUND IN SOURCE
+msgid "Not logged in"
+msgstr "Non loggé"
+
+#: html/Elements/Header:59
+msgid "Not logged in."
+msgstr "Non connecté"
+
+#: lib/RT/Date.pm:369
+msgid "Not set"
+msgstr "Non renseigné"
+
+#: html/NoAuth/Reminder.html:26
+msgid "Not yet implemented."
+msgstr "Fonction pas encore disponible"
+
+#: NOT FOUND IN SOURCE
+msgid "Not yet implemented...."
+msgstr "Fonction pas encore disponible..."
+
+#: html/Approvals/Elements/Approve:48
+msgid "Notes"
+msgstr "Notes"
+
+#: lib/RT/User_Overlay.pm:767
+msgid "Notification could not be sent"
+msgstr "Impossible d'envoyer la notification"
+
+#: etc/initialdata:93
+msgid "Notify AdminCcs"
+msgstr "Avertir les AdminCCs"
+
+#: etc/initialdata:89
+msgid "Notify AdminCcs as Comment"
+msgstr "Avertir les AdminCCs par un commentaire"
+
+#: etc/initialdata:120
+msgid "Notify Other Recipients"
+msgstr "Avertir les autres destinataires"
+
+#: etc/initialdata:116
+msgid "Notify Other Recipients as Comment"
+msgstr "Avertir les autres destinataires par un commentaire"
+
+#: etc/initialdata:85
+msgid "Notify Owner"
+msgstr "Avertir l'intervenant"
+
+#: etc/initialdata:81
+msgid "Notify Owner as Comment"
+msgstr "Avertir l'intervenant par un commentaire"
+
+#: etc/initialdata:361
+msgid "Notify Owner of their rejected ticket"
+msgstr "Avertir l'Intervenant du rejet de son ticket"
+
+#: etc/initialdata:350
+msgid "Notify Owner of their ticket has been approved by all approvers"
+msgstr "Avertir l'Intervenant de l'approbation de son ticket par tous les approbateurs"
+
+#: etc/initialdata:338
+msgid "Notify Owner of their ticket has been approved by some approver"
+msgstr "Avertir l'Intervenant de l'approbation de son ticket par un des approbateurs"
+
+#: etc/initialdata:319 etc/upgrade/2.1.71:17
+msgid "Notify Owners and AdminCcs of new items pending their approval"
+msgstr "Avertir les intervenants et les AdminCCs de nouveaux éléments attendant leur approbation"
+
+#: etc/initialdata:77
+msgid "Notify Requestors"
+msgstr "Avertir les demandeurs"
+
+#: etc/initialdata:103
+msgid "Notify Requestors and Ccs"
+msgstr "Avertir les demandeurs et les Ccs"
+
+#: etc/initialdata:98
+msgid "Notify Requestors and Ccs as Comment"
+msgstr "Avertir les demandeurs et les CC par un commentaire"
+
+#: etc/initialdata:112
+msgid "Notify Requestors, Ccs and AdminCcs"
+msgstr "Avertir les demandeurs, CCs et AdminCCs"
+
+#: etc/initialdata:108
+msgid "Notify Requestors, Ccs and AdminCcs as Comment"
+msgstr "Avertir les demandeurs, CCs et AdminCCs par un commentaire"
+
+#: lib/RT/Date.pm:421
+msgid "Nov."
+msgstr "Nov."
+
+#: NOT FOUND IN SOURCE
+msgid "November"
+msgstr "Novembre"
+
+#: lib/RT/Record.pm:156
+msgid "Object could not be created"
+msgstr "L'objet n'a pas pu être ajouté"
+
+#: lib/RT/Record.pm:175
+msgid "Object created"
+msgstr "Objet ajouté"
+
+#: lib/RT/Date.pm:420
+msgid "Oct."
+msgstr "Oct."
+
+#: NOT FOUND IN SOURCE
+msgid "October"
+msgstr "Octobre"
+
+#: html/Elements/SelectDateRelation:34
+msgid "On"
+msgstr "Le"
+
+#: etc/initialdata:155
+msgid "On Comment"
+msgstr "Lors d'un commentaire"
+
+#: etc/initialdata:148
+msgid "On Correspond"
+msgstr "Lors d'un courrier"
+
+#: etc/initialdata:137
+msgid "On Create"
+msgstr "Lors d'une création"
+
+#: etc/initialdata:169
+msgid "On Owner Change"
+msgstr "Lors d'un changement d'intervenant"
+
+#: etc/initialdata:177
+msgid "On Queue Change"
+msgstr "Lors d'un changement de queue"
+
+#: etc/initialdata:183
+msgid "On Resolve"
+msgstr "Lors de la résolution/clôture"
+
+#: etc/initialdata:161
+msgid "On Status Change"
+msgstr "Lors d'un changement de statut"
+
+#: etc/initialdata:142
+msgid "On Transaction"
+msgstr "Lors d'une transaction"
+
+#: html/Approvals/Elements/PendingMyApproval:49
+#. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
+msgid "Only show approvals for requests created after %1"
+msgstr "Ne montrer que les approbations pour les demandes créées après %1"
+
+#: html/Approvals/Elements/PendingMyApproval:47
+#. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
+msgid "Only show approvals for requests created before %1"
+msgstr "Ne montrer que les approbations pour les demandes créées avant %1"
+
+#: html/Elements/Quicksearch:30
+msgid "Open"
+msgstr "Ouvert"
+
+#: html/Ticket/Elements/Tabs:135
+msgid "Open it"
+msgstr "Ouvrir"
+
+#: NOT FOUND IN SOURCE
+msgid "Open requests"
+msgstr "Ouvrir les demandes"
+
+#: html/SelfService/Elements/Tabs:41
+msgid "Open tickets"
+msgstr "Ouvrir les tickets"
+
+#: html/Admin/Users/Prefs.html:40
+msgid "Open tickets (from listing) in a new window"
+msgstr "Ouvrir les tickets (depuis une liste) dans une nouvelle fenêtre."
+
+#: html/Admin/Users/Prefs.html:39
+msgid "Open tickets (from listing) in another window"
+msgstr "Ouvrir les tickets (depuis une liste) dans une autre fenêtre."
+
+#: etc/initialdata:132
+msgid "Open tickets on correspondence"
+msgstr "Ouvrir les tickets lors d'une correspondance"
+
+#: html/Search/Elements/PickRestriction:100
+msgid "Ordering and sorting"
+msgstr "Ranger et classer"
+
+#: html/Admin/Elements/ModifyUser:45 html/Admin/Users/Modify.html:116 html/Elements/SelectUsers:28 html/User/Prefs.html:85
+msgid "Organization"
+msgstr "Organisation"
+
+#: html/Approvals/Elements/Approve:32
+#. ($approving->Id, $approving->Subject)
+msgid "Originating ticket: #%1"
+msgstr "Ticket source: n°%1"
+
+#: html/Admin/Elements/ModifyQueue:54 html/Admin/Queues/Modify.html:68
+msgid "Over time, priority moves toward"
+msgstr "Temps dépassé, priorité déplacée"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "Own tickets"
+msgstr "Tickets propres"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "OwnTicket"
+msgstr "PrendreTicket"
+
+#: etc/initialdata:38 html/Elements/MyRequests:31 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1244
+msgid "Owner"
+msgstr "Intervenant"
+
+#: NOT FOUND IN SOURCE
+msgid "Owner changed from %1 to %2"
+msgstr "Intervenant changé de %1 en %2"
+
+#: lib/RT/Transaction_Overlay.pm:582
+#. ($Old->Name , $New->Name)
+msgid "Owner forcibly changed from %1 to %2"
+msgstr "Intervenant forcé de %1 à %2"
+
+#: html/Search/Elements/PickRestriction:30
+msgid "Owner is"
+msgstr "L'intervenant est"
+
+#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:55
+msgid "Pager"
+msgstr "Bipeur"
+
+#: html/Admin/Elements/ModifyUser:73
+msgid "PagerPhone"
+msgstr "PagerPhone"
+
+#: NOT FOUND IN SOURCE
+msgid "Parent"
+msgstr ""
+
+#: html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:38 html/Ticket/Elements/EditLinks:126 html/Ticket/Elements/EditLinks:57 html/Ticket/Elements/ShowLinks:46
+msgid "Parents"
+msgstr "Parents"
+
+#: html/Elements/Login:52 html/User/Prefs.html:60
+msgid "Password"
+msgstr "Mot de passe"
+
+#: html/NoAuth/Reminder.html:24
+msgid "Password Reminder"
+msgstr "Pense-bête pour votre mot de passe"
+
+#: lib/RT/User_Overlay.pm:228 lib/RT/User_Overlay.pm:985
+msgid "Password too short"
+msgstr "Mot de passe trop court"
+
+#: html/Admin/Users/Modify.html:290 html/User/Prefs.html:171
+#. (loc_fuzzy($msg))
+msgid "Password: %1"
+msgstr "Mot de passe: %1"
+
+#: html/Admin/Users/Modify.html:292
+msgid "Passwords do not match."
+msgstr "Les mots de passes sont différents"
+
+#: html/User/Prefs.html:173
+msgid "Passwords do not match. Your password has not been changed"
+msgstr "Les mots de passe sont différents. Votre mot de passe n'a pas été modifié"
+
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:95 html/Ticket/ModifyAll.html:50
+msgid "People"
+msgstr "Personnes"
+
+#: etc/initialdata:125
+msgid "Perform a user-defined action"
+msgstr "Réaliser une action définie par l'utilisateur"
+
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/CurrentUser.pm:82 lib/RT/CurrentUser.pm:91 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:201 lib/RT/CustomField_Overlay.pm:233 lib/RT/CustomField_Overlay.pm:511 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1094 lib/RT/Group_Overlay.pm:1098 lib/RT/Group_Overlay.pm:1107 lib/RT/Group_Overlay.pm:1158 lib/RT/Group_Overlay.pm:1162 lib/RT/Group_Overlay.pm:1168 lib/RT/Group_Overlay.pm:425 lib/RT/Group_Overlay.pm:517 lib/RT/Group_Overlay.pm:595 lib/RT/Group_Overlay.pm:603 lib/RT/Group_Overlay.pm:700 lib/RT/Group_Overlay.pm:704 lib/RT/Group_Overlay.pm:710 lib/RT/Group_Overlay.pm:903 lib/RT/Group_Overlay.pm:907 lib/RT/Group_Overlay.pm:920 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:931 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:196 lib/RT/Scrip_Overlay.pm:433 lib/RT/Template_Overlay.pm:283 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1377 lib/RT/Ticket_Overlay.pm:1387 lib/RT/Ticket_Overlay.pm:1401 lib/RT/Ticket_Overlay.pm:1535 lib/RT/Ticket_Overlay.pm:1544 lib/RT/Ticket_Overlay.pm:1557 lib/RT/Ticket_Overlay.pm:1906 lib/RT/Ticket_Overlay.pm:2044 lib/RT/Ticket_Overlay.pm:2208 lib/RT/Ticket_Overlay.pm:2275 lib/RT/Ticket_Overlay.pm:2634 lib/RT/Ticket_Overlay.pm:2715 lib/RT/Ticket_Overlay.pm:2819 lib/RT/Ticket_Overlay.pm:2834 lib/RT/Ticket_Overlay.pm:3033 lib/RT/Ticket_Overlay.pm:3043 lib/RT/Ticket_Overlay.pm:3048 lib/RT/Ticket_Overlay.pm:3270 lib/RT/Ticket_Overlay.pm:3468 lib/RT/Ticket_Overlay.pm:3630 lib/RT/Ticket_Overlay.pm:3682 lib/RT/Ticket_Overlay.pm:3860 lib/RT/Transaction_Overlay.pm:466 lib/RT/Transaction_Overlay.pm:473 lib/RT/Transaction_Overlay.pm:502 lib/RT/Transaction_Overlay.pm:509 lib/RT/User_Overlay.pm:1079 lib/RT/User_Overlay.pm:1527 lib/RT/User_Overlay.pm:687 lib/RT/User_Overlay.pm:722 lib/RT/User_Overlay.pm:978
+msgid "Permission Denied"
+msgstr "Accès refusé"
+
+#: html/User/Elements/Tabs:34
+msgid "Personal Groups"
+msgstr "Groupes personnels"
+
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
+msgid "Personal groups"
+msgstr "Groupes personnels"
+
+#: html/User/Elements/DelegateRights:36
+msgid "Personal groups:"
+msgstr "Groupes personnels:"
+
+#: html/Admin/Users/Modify.html:155 html/User/Prefs.html:48
+msgid "Phone numbers"
+msgstr "Numéros de téléphone"
+
+#: NOT FOUND IN SOURCE
+msgid "Placeholder"
+msgstr "Paramètre fictif"
+
+#: html/Elements/Header:51 html/Elements/Tabs:52 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
+msgid "Preferences"
+msgstr "Préférences"
+
+#: NOT FOUND IN SOURCE
+msgid "Prefs"
+msgstr "Préférences"
+
+#: lib/RT/Action/Generic.pm:159
+msgid "Prepare Stubbed"
+msgstr "Préparation interrompue"
+
+#: html/Ticket/Elements/Tabs:60
+msgid "Prev"
+msgstr "Précédent"
+
+#: html/Search/Listing.html:43
+msgid "Previous page"
+msgstr "Page précédente"
+
+#: NOT FOUND IN SOURCE
+msgid "Pri"
+msgstr "Pri."
+
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
+#. ($args{'PrincipalId'})
+msgid "Principal %1 not found."
+msgstr "Principal %1 non trouvé"
+
+#: html/Search/Elements/PickRestriction:53 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:38 lib/RT/Tickets_Overlay.pm:1042
+msgid "Priority"
+msgstr "Priorité"
+
+#: html/Admin/Elements/ModifyQueue:50 html/Admin/Queues/Modify.html:64
+msgid "Priority starts at"
+msgstr "La priorité débute à "
+
+#: etc/initialdata:25
+msgid "Privileged"
+msgstr "Privilégié"
+
+#: html/Admin/Users/Modify.html:270 html/User/Prefs.html:162
+#. (loc_fuzzy($msg))
+msgid "Privileged status: %1"
+msgstr "Statuts privilégiés : %1"
+
+#: html/Admin/Users/index.html:61
+msgid "Privileged users"
+msgstr "Utilisateurs privilégiés"
+
+#: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
+msgid "Pseudogroup for internal use"
+msgstr "Pseudo groupe pour usage interne"
+
+#: html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Elements/Quicksearch:28 html/Search/Elements/PickRestriction:45 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:63 html/Ticket/Elements/ShowBasics:42 html/User/Elements/DelegateRights:79 lib/RT/Tickets_Overlay.pm:883
+msgid "Queue"
+msgstr "Queue"
+
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
+#. ($Queue)
+#. ($id)
+msgid "Queue %1 not found"
+msgstr "Queue %1 non trouvée"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue '%1' not found\\n"
+msgstr "Queue '%1' inconnue\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Keyword Selections"
+msgstr "Sélection des mots clé de queue"
+
+#: html/Admin/Elements/ModifyQueue:30 html/Admin/Queues/Modify.html:42
+msgid "Queue Name"
+msgstr "Nom de la queue"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Scrips"
+msgstr "Scrips de queue"
+
+#: lib/RT/Queue_Overlay.pm:264
+msgid "Queue already exists"
+msgstr "Queue déjà créée"
+
+#: lib/RT/Queue_Overlay.pm:273 lib/RT/Queue_Overlay.pm:279
+msgid "Queue could not be created"
+msgstr "Impossible de créer la queue"
+
+#: html/Ticket/Create.html:204
+msgid "Queue could not be loaded."
+msgstr "Queue ne pouvant être chargée"
+
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:283
+msgid "Queue created"
+msgstr "Queue créée"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue is not specified."
+msgstr "Queue non spécifié"
+
+#: html/SelfService/Display.html:70 lib/RT/CustomField_Overlay.pm:97
+msgid "Queue not found"
+msgstr "Queue inconnue"
+
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
+msgid "Queues"
+msgstr "Queues"
+
+#: html/Elements/Quicksearch:24
+msgid "Quick search"
+msgstr "Recherche rapide"
+
+#: html/Elements/Login:44
+#. ($RT::VERSION)
+msgid "RT %1"
+msgstr "RT %1"
+
+#: docs/design_docs/string-extraction-guide.txt:70
+#. ($RT::VERSION, $RT::rtname)
+msgid "RT %1 for %2"
+msgstr "RT %1 pour %2"
+
+#: html/Elements/Footer:32
+#. ($RT::VERSION)
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: html/Admin/index.html:24 html/Admin/index.html:25
+msgid "RT Administration"
+msgstr "Administration RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Authentication error."
+msgstr "Erreur d'authentification RT."
+
+#: NOT FOUND IN SOURCE
+msgid "RT Bounce: %1"
+msgstr "Avis de rejet RT: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Configuration error"
+msgstr "Erreur de configuration RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Critical error. Message not recorded!"
+msgstr "Erreur critique RT. Courrier non enregistré !"
+
+#: html/Elements/Error:41 html/SelfService/Error.html:40
+msgid "RT Error"
+msgstr "Erreur RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Received mail (%1) from itself."
+msgstr "RT a reçu un e-mail (%1) de lui-même."
+
+#: NOT FOUND IN SOURCE
+msgid "RT Recieved mail (%1) from itself."
+msgstr "RT a reçu du courrier (%1) de lui même"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Self Service / Closed Tickets"
+msgstr "RT Self Service / Tickets résolus"
+
+#: html/index.html:24 html/index.html:27
+msgid "RT at a glance"
+msgstr "RT en un coup d'oeil"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't authenticate you"
+msgstr "RT n'a pas réussi à vous identifier"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find requestor via its external database lookup"
+msgstr "RT n'a pas pu trouver de demandeur par sa recherche dans une base externe"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find the queue: %1"
+msgstr "RT n'a pas trouvé la queue"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't validate this PGP signature. \\n"
+msgstr "RT n'a pas réussi à valider cette signature PGP. \\n"
+
+#: html/Elements/PageLayout:85
+#. ($RT::rtname)
+msgid "RT for %1"
+msgstr "RT pour %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr "RT pour %1: %2"
+
+#: NOT FOUND IN SOURCE
+msgid "RT has proccessed your commands"
+msgstr "RT a exécuté vos commandes"
+
+#: html/Elements/Login:94
+#. ('2003')
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT est &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;. Distribué sous <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 de la licence générale GNU.</a>"
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT est &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;. Distribué sous <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 de la licence générale GNU.</a>"
+
+#: NOT FOUND IN SOURCE
+msgid "RT thinks this message may be a bounce"
+msgstr "RT pense que ce courrier peut être un avis de non-distribution"
+
+#: NOT FOUND IN SOURCE
+msgid "RT will process this message as if it were unsigned.\\n"
+msgstr "RT va traiter ce courrier comme s'il n'était pas signé.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+msgstr "L'interface d'utilisation de RT par email utilise une authentification PGP. Soit vous n'avez pas signé votre courrier, soit la signature est n'a pas pu être vérifiée"
+
+#: html/Admin/Users/Modify.html:57 html/Admin/Users/Prefs.html:51 html/User/Prefs.html:43
+msgid "Real Name"
+msgstr "Nom"
+
+#: html/Admin/Elements/ModifyUser:47
+msgid "RealName"
+msgstr "RealName"
+
+#: lib/RT/Transaction_Overlay.pm:631
+#. ($value)
+msgid "Reference by %1 added"
+msgstr "Ajout d'une référence par %1"
+
+#: lib/RT/Transaction_Overlay.pm:660
+#. ($value)
+msgid "Reference by %1 deleted"
+msgstr "Suppression de la référence par %1"
+
+#: lib/RT/Transaction_Overlay.pm:629
+#. ($value)
+msgid "Reference to %1 added"
+msgstr "Ajout d'une reference à %1"
+
+#: lib/RT/Transaction_Overlay.pm:658
+#. ($value)
+msgid "Reference to %1 deleted"
+msgstr "Suppression d'une reference à %1"
+
+#: html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:50 html/Ticket/Elements/EditLinks:138 html/Ticket/Elements/EditLinks:93 html/Ticket/Elements/ShowLinks:70
+msgid "Referred to by"
+msgstr "Mentionné par"
+
+#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:46 html/Ticket/Elements/EditLinks:134 html/Ticket/Elements/EditLinks:79 html/Ticket/Elements/ShowLinks:60
+msgid "Refers to"
+msgstr "Se rapporte à"
+
+#: NOT FOUND IN SOURCE
+msgid "RefersTo"
+msgstr "SeRapporteA"
+
+#: NOT FOUND IN SOURCE
+msgid "Refine"
+msgstr "Affiner"
+
+#: html/Search/Elements/PickRestriction:26
+msgid "Refine search"
+msgstr "Affiner la recherche"
+
+#: html/Elements/Refresh:35
+#. ($value/60)
+msgid "Refresh this page every %1 minutes."
+msgstr "Rafraîchir cette page toutes les %1 minutes."
+
+#: html/Ticket/Create.html:173 html/Ticket/Elements/ShowSummary:61 html/Ticket/ModifyAll.html:56
+msgid "Relationships"
+msgstr "Relations"
+
+#: html/Search/Bulk.html:97
+msgid "Remove AdminCc"
+msgstr "Enlever AdminCc "
+
+#: html/Search/Bulk.html:93
+msgid "Remove Cc"
+msgstr "Enlever Cc"
+
+#: html/Search/Bulk.html:89
+msgid "Remove Requestor"
+msgstr "Enlever Demandeur"
+
+#: html/Ticket/Elements/ShowTransaction:159 html/Ticket/Elements/Tabs:121
+msgid "Reply"
+msgstr "Répondre"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "Reply to tickets"
+msgstr "Répondre aux tickets"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "ReplyToTicket"
+msgstr "RépondreTicket"
+
+#: etc/initialdata:44 html/Ticket/Update.html:39 lib/RT/ACE_Overlay.pm:86
+msgid "Requestor"
+msgstr "Demandeur"
+
+#: html/Search/Elements/PickRestriction:37
+msgid "Requestor email address"
+msgstr "Adresse email du demandeur"
+
+#: NOT FOUND IN SOURCE
+msgid "Requestor(s)"
+msgstr "Demandeur(s)"
+
+#: NOT FOUND IN SOURCE
+msgid "RequestorAddresses"
+msgstr "AdresseDuDemandeur"
+
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
+msgid "Requestors"
+msgstr "Demandeurs"
+
+#: html/Admin/Elements/ModifyQueue:60 html/Admin/Queues/Modify.html:74
+msgid "Requests should be due in"
+msgstr "Le demande doit être résolue dans"
+
+#: html/Elements/Submit:61
+msgid "Reset"
+msgstr "Remise à zéro"
+
+#: html/Admin/Users/Modify.html:158 html/User/Prefs.html:49
+msgid "Residence"
+msgstr "Domicile"
+
+#: html/Ticket/Elements/Tabs:131
+msgid "Resolve"
+msgstr "Résoudre"
+
+#: html/Ticket/Update.html:137
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Resolve ticket #%1 (%2)"
+msgstr "Résoudre ticket n°%1 (%2)"
+
+#: etc/initialdata:308 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1206
+msgid "Resolved"
+msgstr "Résolu"
+
+#: html/Search/Bulk.html:132 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:71
+msgid "Response to requestors"
+msgstr "Réponse aux demandeurs"
+
+#: html/Elements/ListActions:25
+msgid "Results"
+msgstr "Résultats"
+
+#: html/Search/Elements/PickRestriction:104
+msgid "Results per page"
+msgstr "Nb tickets par page"
+
+#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:99 html/User/Prefs.html:71
+msgid "Retype Password"
+msgstr "Saisissez à nouveau votre mot de passe"
+
+#: NOT FOUND IN SOURCE
+msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+msgstr "Le droit %1 introuvable pour %2 %3 dans le périmètre %4 (%5)\\n"
+
+#: lib/RT/ACE_Overlay.pm:612
+msgid "Right Delegated"
+msgstr "Droit délégué"
+
+#: lib/RT/ACE_Overlay.pm:302
+msgid "Right Granted"
+msgstr "Droit accordé"
+
+#: lib/RT/ACE_Overlay.pm:160
+msgid "Right Loaded"
+msgstr "Droit activé"
+
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
+msgid "Right could not be revoked"
+msgstr "Droit irrévocable"
+
+#: html/User/Delegation.html:63
+msgid "Right not found"
+msgstr "Droit inconnu"
+
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
+msgid "Right not loaded."
+msgstr "Droit non activé"
+
+#: lib/RT/ACE_Overlay.pm:688
+msgid "Right revoked"
+msgstr "Droit révoqué"
+
+#: html/Admin/Elements/UserTabs:40
+msgid "Rights"
+msgstr "Droits"
+
+#: lib/RT/Interface/Web.pm:794
+#. ($object_type)
+msgid "Rights could not be granted for %1"
+msgstr "Les droits n'on pas pu être attribués à %1"
+
+#: lib/RT/Interface/Web.pm:827
+#. ($object_type)
+msgid "Rights could not be revoked for %1"
+msgstr "Les droits n'ont pas pu être révoqués pour %1"
+
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
+msgid "Roles"
+msgstr "Rôles"
+
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr "ApprobationDeRoot"
+
+#: lib/RT/Date.pm:393
+msgid "Sat."
+msgstr "Sam."
+
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
+msgid "Save Changes"
+msgstr "Enregistrer les modifications"
+
+#: NOT FOUND IN SOURCE
+msgid "Save changes"
+msgstr "Enregistrer les modifications"
+
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
+#. ($QueueObj->id)
+#. ($ARGS{'id'})
+msgid "Scrip #%1"
+msgstr "Scrip n°%1"
+
+#: lib/RT/Scrip_Overlay.pm:175
+msgid "Scrip Created"
+msgstr "Scrip ajouté"
+
+#: html/Admin/Elements/EditScrips:83
+msgid "Scrip deleted"
+msgstr "Scrip supprimé"
+
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
+msgid "Scrips"
+msgstr "Scrips"
+
+#: NOT FOUND IN SOURCE
+msgid "Scrips for %1\\n"
+msgstr "Scrips pour %1\\n"
+
+#: html/Admin/Queues/Scrips.html:33
+msgid "Scrips which apply to all queues"
+msgstr "Scrips s'appliquant à toutes les queues"
+
+#: html/Elements/SimpleSearch:26 html/Search/Elements/PickRestriction:125 html/Ticket/Elements/Tabs:158
+msgid "Search"
+msgstr "Rechercher"
+
+#: NOT FOUND IN SOURCE
+msgid "Search Criteria"
+msgstr "Critère de recherche"
+
+#: html/Approvals/Elements/PendingMyApproval:38
+msgid "Search for approvals"
+msgstr "Chercher des approbations"
+
+#: bin/rt-crontool:187
+msgid "Security:"
+msgstr "Sécurité:"
+
+#: lib/RT/Queue_Overlay.pm:66
+msgid "SeeQueue"
+msgstr "VoirQueue"
+
+#: html/Admin/Groups/index.html:39
+msgid "Select a group"
+msgstr "Sélectionner un groupe"
+
+#: NOT FOUND IN SOURCE
+msgid "Select a queue"
+msgstr "Choisir une queue"
+
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
+msgid "Select a user"
+msgstr "Sélectionner un utilisateur"
+
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
+msgid "Select custom field"
+msgstr "Selectionner le champ personnalisé"
+
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
+msgid "Select group"
+msgstr "Sélectionner le groupe"
+
+#: lib/RT/CustomField_Overlay.pm:421
+msgid "Select multiple values"
+msgstr "Choisir plusieurs valeurs"
+
+#: lib/RT/CustomField_Overlay.pm:418
+msgid "Select one value"
+msgstr "Choisir une valeur"
+
+#: html/Admin/Elements/QueueTabs:66
+msgid "Select queue"
+msgstr "Selectionner la queue"
+
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
+msgid "Select scrip"
+msgstr "Selectionner le scrip"
+
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
+msgid "Select template"
+msgstr "Selectionner le modèle"
+
+#: html/Admin/Elements/UserTabs:48
+msgid "Select user"
+msgstr "Selectionner l'utilisateur"
+
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectMultiple"
+msgstr "ChoixMultiples"
+
+#: lib/RT/CustomField_Overlay.pm:34
+msgid "SelectSingle"
+msgstr "ChoixSimple"
+
+#: NOT FOUND IN SOURCE
+msgid "Self Service"
+msgstr "Self Service"
+
+#: etc/initialdata:113
+msgid "Send mail to all watchers"
+msgstr "Envoyer un courrier à tous les observateurs"
+
+#: etc/initialdata:109
+msgid "Send mail to all watchers as a \"comment\""
+msgstr "Envoyer un courrier à tous les observateurs en tant que \"commentaire\""
+
+#: etc/initialdata:104
+msgid "Send mail to requestors and Ccs"
+msgstr "Envoyer un courrier aux demandeurs et aux CCs"
+
+#: etc/initialdata:99
+msgid "Send mail to requestors and Ccs as a comment"
+msgstr "Envoyer un courrier aux demandeurs et aux CCs en tant que commentaire"
+
+#: etc/initialdata:78
+msgid "Sends a message to the requestors"
+msgstr "Envoyer un courrier aux demandeurs"
+
+#: etc/initialdata:117 etc/initialdata:121
+msgid "Sends mail to explicitly listed Ccs and Bccs"
+msgstr "Envoyer un courrier aux CCs et Bccs explicitement indiqués"
+
+#: etc/initialdata:94
+msgid "Sends mail to the administrative Ccs"
+msgstr "Envoyer un mail aux AdminCCs"
+
+#: etc/initialdata:90
+msgid "Sends mail to the administrative Ccs as a comment"
+msgstr "Envoyer un mail aux AdminCCs en tant que commentaire"
+
+#: etc/initialdata:82 etc/initialdata:86
+msgid "Sends mail to the owner"
+msgstr "Envoyer un courrier à l'intervenant"
+
+#: lib/RT/Date.pm:419
+msgid "Sep."
+msgstr "Sep."
+
+#: NOT FOUND IN SOURCE
+msgid "September"
+msgstr "Septembre"
+
+#: NOT FOUND IN SOURCE
+msgid "Show Results"
+msgstr "Afficher les résultats"
+
+#: html/Approvals/Elements/PendingMyApproval:43
+msgid "Show approved requests"
+msgstr "Afficher les requêtes approuvées"
+
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
+msgid "Show basics"
+msgstr "Affichage court"
+
+#: html/Approvals/Elements/PendingMyApproval:44
+msgid "Show denied requests"
+msgstr "Afficher les requêtes refusées"
+
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
+msgid "Show details"
+msgstr "Affichage long"
+
+#: html/Approvals/Elements/PendingMyApproval:42
+msgid "Show pending requests"
+msgstr "Afficher les requêtes en attente"
+
+#: html/Approvals/Elements/PendingMyApproval:45
+msgid "Show requests awaiting other approvals"
+msgstr "Afficher les requêtes attendant d'autres approbations"
+
+#: lib/RT/Queue_Overlay.pm:80
+msgid "Show ticket private commentary"
+msgstr "Afficher les commentaires privés du ticket"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "Show ticket summaries"
+msgstr "Afficher les résumés de tickets"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "ShowACL"
+msgstr "AfficherACL"
+
+#: lib/RT/Queue_Overlay.pm:77
+msgid "ShowScrips"
+msgstr "AfficherScrips"
+
+#: lib/RT/Queue_Overlay.pm:74
+msgid "ShowTemplate"
+msgstr "AfficherModèle"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "ShowTicket"
+msgstr "AfficherTicket"
+
+#: lib/RT/Queue_Overlay.pm:80
+msgid "ShowTicketComments"
+msgstr "AfficherCommentairesTickets"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "Sign up as a ticket Requestor or ticket or queue Cc"
+msgstr "S'identifier en tant que demandeur ou CC de queue ou de ticket"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Sign up as a ticket or queue AdminCc"
+msgstr "S'identifier en tant qu'AdminCC de ticket ou de queue"
+
+#: html/Admin/Elements/ModifyUser:38 html/Admin/Users/Modify.html:190 html/Admin/Users/Prefs.html:31 html/User/Prefs.html:111
+msgid "Signature"
+msgstr "Signature"
+
+#: NOT FOUND IN SOURCE
+msgid "Signed in as %1"
+msgstr "Connecté en tant que %1"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:25
+msgid "Single"
+msgstr "Unique"
+
+#: html/Elements/Header:50
+msgid "Skip Menu"
+msgstr "Passer le menu"
+
+#: html/Admin/Elements/AddCustomFieldValue:27
+msgid "Sort"
+msgstr "Trier"
+
+#: NOT FOUND IN SOURCE
+msgid "Sort key"
+msgstr "Ordre de tri"
+
+#: html/Search/Elements/PickRestriction:108
+msgid "Sort results by"
+msgstr "Trier les résultats par"
+
+#: NOT FOUND IN SOURCE
+msgid "SortOrder"
+msgstr "SortOrder"
+
+#: NOT FOUND IN SOURCE
+msgid "Stalled"
+msgstr "Bloqué"
+
+#: NOT FOUND IN SOURCE
+msgid "Start page"
+msgstr "Page de début"
+
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:34
+msgid "Started"
+msgstr "Ouvert le"
+
+#: NOT FOUND IN SOURCE
+msgid "Started date '%1' could not be parsed"
+msgstr "La date de démarrage '%1' n'a pas pu être analysée"
+
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:30
+msgid "Starts"
+msgstr "Débute"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts By"
+msgstr "Débute le"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts date '%1' could not be parsed"
+msgstr "La date de début '%1' n'a pas pu être analysée"
+
+#: html/Admin/Elements/ModifyUser:81 html/Admin/Users/Modify.html:137 html/User/Prefs.html:93
+msgid "State"
+msgstr "Etat"
+
+#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Search/Elements/PickRestriction:73 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:37 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1200 lib/RT/Tickets_Overlay.pm:908
+msgid "Status"
+msgstr "Statut"
+
+#: etc/initialdata:294
+msgid "Status Change"
+msgstr "Changement de statut"
+
+#: lib/RT/Transaction_Overlay.pm:528
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
+msgid "Status changed from %1 to %2"
+msgstr "Statut modifié de %1 à %2 "
+
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr "ChangementDeStatut"
+
+#: html/Ticket/Elements/Tabs:146
+msgid "Steal"
+msgstr "Voler"
+
+#: lib/RT/Queue_Overlay.pm:91
+msgid "Steal tickets"
+msgstr "Voler les tickets "
+
+#: lib/RT/Queue_Overlay.pm:91
+msgid "StealTicket"
+msgstr "VolerTicket"
+
+#: lib/RT/Transaction_Overlay.pm:587
+#. ($Old->Name)
+msgid "Stolen from %1 "
+msgstr "Volé à %1"
+
+#: html/Elements/MyRequests:28 html/Elements/MyTickets:28 html/Search/Bulk.html:135 html/Search/Elements/PickRestriction:42 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:27 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:75 lib/RT/Ticket_Overlay.pm:1196 lib/RT/Tickets_Overlay.pm:987
+msgid "Subject"
+msgstr "Sujet"
+
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/Transaction_Overlay.pm:609
+#. ($self->Data)
+msgid "Subject changed to %1"
+msgstr "Sujet modifié en %1"
+
+#: html/Elements/Submit:58
+msgid "Submit"
+msgstr "Valider"
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr "Soumettre flux de travail"
+
+#: lib/RT/Group_Overlay.pm:748
+msgid "Succeeded"
+msgstr "Réussi"
+
+#: lib/RT/Date.pm:394
+msgid "Sun."
+msgstr "Dim."
+
+#: lib/RT/System.pm:53
+msgid "SuperUser"
+msgstr "SuperUtilisateur"
+
+#: html/User/Elements/DelegateRights:76
+msgid "System"
+msgstr "Système"
+
+#: html/Admin/Elements/SelectRights:80 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:793 lib/RT/Interface/Web.pm:826
+msgid "System Error"
+msgstr "Erreur système"
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. Right not granted."
+msgstr "Erreur Système. Droit non délégué."
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. right not granted"
+msgstr "Erreur Système. Droit non délégué"
+
+#: lib/RT/ACE_Overlay.pm:615
+msgid "System error. Right not delegated."
+msgstr "Erreur système. Droit non délégué."
+
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
+msgid "System error. Right not granted."
+msgstr "Erreur système. Droit non accordé"
+
+#: NOT FOUND IN SOURCE
+msgid "System error. Unable to grant rights."
+msgstr "Erreur Système. Imposible de déléguer les droits"
+
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
+msgid "System groups"
+msgstr "Groupes système"
+
+#: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
+msgid "SystemRolegroup for internal use"
+msgstr "SystemRolegroup à usage interne"
+
+#: lib/RT/CurrentUser.pm:319
+msgid "TEST_STRING"
+msgstr "Chaîne_de_test"
+
+#: html/Ticket/Elements/Tabs:142
+msgid "Take"
+msgstr "Prendre"
+
+#: lib/RT/Queue_Overlay.pm:89
+msgid "Take tickets"
+msgstr "Prendre les tickets"
+
+#: lib/RT/Queue_Overlay.pm:89
+msgid "TakeTicket"
+msgstr "PrendreTicket"
+
+#: lib/RT/Transaction_Overlay.pm:573
+msgid "Taken"
+msgstr "Pris"
+
+#: html/Admin/Elements/EditScrip:80
+msgid "Template"
+msgstr "Modèle"
+
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
+#. ($TemplateObj->Id())
+msgid "Template #%1"
+msgstr "Modèle n°%1"
+
+#: html/Admin/Elements/EditTemplates:88
+msgid "Template deleted"
+msgstr "Modèle supprimé"
+
+#: lib/RT/Scrip_Overlay.pm:152
+msgid "Template not found"
+msgstr "Modèle inconnu"
+
+#: NOT FOUND IN SOURCE
+msgid "Template not found\\n"
+msgstr "Modèle inconnu\\n"
+
+#: lib/RT/Template_Overlay.pm:352
+msgid "Template parsed"
+msgstr "Modèle analysé"
+
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
+msgid "Templates"
+msgstr "Modèles"
+
+#: NOT FOUND IN SOURCE
+msgid "Templates for %1\\n"
+msgstr "Modèles pour %1\\n "
+
+#: lib/RT/Interface/Web.pm:894
+msgid "That is already the current value"
+msgstr "Ceci est déjà la valeur actuelle"
+
+#: lib/RT/CustomField_Overlay.pm:242
+msgid "That is not a value for this custom field"
+msgstr "Valeur incorrecte pour ce champ personnalisé."
+
+#: lib/RT/Ticket_Overlay.pm:1917
+msgid "That is the same value"
+msgstr "Valeur identique"
+
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
+msgid "That principal already has that right"
+msgstr "Ce groupe/utilisateur dispose déjà de ce droit"
+
+#: lib/RT/Queue_Overlay.pm:633
+#. ($args{'Type'})
+msgid "That principal is already a %1 for this queue"
+msgstr "Ce groupe/utilisateur est déjà un %1 pour cette queue"
+
+#: lib/RT/Ticket_Overlay.pm:1451
+#. ($self->loc($args{'Type'}))
+msgid "That principal is already a %1 for this ticket"
+msgstr "Ce groupe/utilisateur est déjà un %1 pour ce ticket"
+
+#: lib/RT/Queue_Overlay.pm:732
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this queue"
+msgstr "Ce groupe/utilisateur n'est pas un %1 pour cette queue"
+
+#: lib/RT/Ticket_Overlay.pm:1568
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this ticket"
+msgstr "Ce groupe/utilisateur n'est pas un %1 pour ce ticket"
+
+#: lib/RT/Ticket_Overlay.pm:1913
+msgid "That queue does not exist"
+msgstr "Queue inconnue"
+
+#: lib/RT/Ticket_Overlay.pm:3274
+msgid "That ticket has unresolved dependencies"
+msgstr "Ticket ayant des tickets fils ou dépendants non résolus"
+
+#: NOT FOUND IN SOURCE
+msgid "That user already has that right"
+msgstr "Cet utilisateur possède déjà ce droit."
+
+#: lib/RT/Ticket_Overlay.pm:3084
+msgid "That user already owns that ticket"
+msgstr "Cet utilisateur possède déjà ce ticket."
+
+#: lib/RT/Ticket_Overlay.pm:3056
+msgid "That user does not exist"
+msgstr "Utilisateur inconnu"
+
+#: lib/RT/User_Overlay.pm:376
+msgid "That user is already privileged"
+msgstr "Utilisateur possédant déjà un statut privilégié."
+
+#: lib/RT/User_Overlay.pm:397
+msgid "That user is already unprivileged"
+msgstr "Utilisateur déjà sans privilèges."
+
+#: lib/RT/User_Overlay.pm:389
+msgid "That user is now privileged"
+msgstr "Utilisateur bénéficiant à présent du statut privilégié"
+
+#: lib/RT/User_Overlay.pm:410
+msgid "That user is now unprivileged"
+msgstr "Utilisateur à présent sans statut privilégié "
+
+#: NOT FOUND IN SOURCE
+msgid "That user is now unprivilegedileged"
+msgstr "Cet utilisateur a perdu ses droits"
+
+#: lib/RT/Ticket_Overlay.pm:3077
+msgid "That user may not own tickets in that queue"
+msgstr "Cet utilisateur peut ne pas avoir de ticket dans cette queue."
+
+#: lib/RT/Link_Overlay.pm:205
+msgid "That's not a numerical id"
+msgstr "ID non numérique"
+
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
+msgid "The Basics"
+msgstr "Eléments de base"
+
+#: lib/RT/ACE_Overlay.pm:87
+msgid "The CC of a ticket"
+msgstr "Le CC d'un ticket"
+
+#: lib/RT/ACE_Overlay.pm:88
+msgid "The administrative CC of a ticket"
+msgstr "L'AdminCC d'un ticket"
+
+#: lib/RT/Ticket_Overlay.pm:2244
+msgid "The comment has been recorded"
+msgstr "Commentaire enregistré"
+
+#: bin/rt-crontool:197
+msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
+msgstr "Cette commande trouve tous les tickets actifs de la queue 'general' et positionne leur priorité à 99 s'ils n'ont pas été touchés depuis quatre heures:"
+
+#: bin/rt-commit-handler:755 bin/rt-commit-handler:765
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr "Les commandes suivantes n'ont pas été traitées :\\n\\n"
+
+#: lib/RT/Interface/Web.pm:897
+msgid "The new value has been set."
+msgstr "La nouvelle valeur est enregistrée"
+
+#: lib/RT/ACE_Overlay.pm:85
+msgid "The owner of a ticket"
+msgstr "L'intervenant d'un ticket"
+
+#: lib/RT/ACE_Overlay.pm:86
+msgid "The requestor of a ticket"
+msgstr "Le demandeur d'un ticket"
+
+#: html/Admin/Elements/EditUserComments:25
+msgid "These comments aren't generally visible to the user"
+msgstr "Ces commentaires ne sont généralement pas accessibles par l'utilisateur"
+
+#: NOT FOUND IN SOURCE
+msgid "This ticket %1 %2 (%3)\\n"
+msgstr "Ce ticket %1 %2 (%3)\\n "
+
+#: bin/rt-crontool:188
+msgid "This tool allows the user to run arbitrary perl modules from within RT."
+msgstr "Cet outil permet à l'utilisateur de lancer un module perl quelconque depuis RT"
+
+#: lib/RT/Transaction_Overlay.pm:251
+msgid "This transaction appears to have no content"
+msgstr "Cette opération semble ne pas avoir de contenu"
+
+#: html/Ticket/Elements/ShowRequestor:46
+#. ($rows)
+msgid "This user's %1 highest priority tickets"
+msgstr "Les %1 tickets de plus haute priorité de cet utilisateur"
+
+#: NOT FOUND IN SOURCE
+msgid "This user's 25 highest priority tickets"
+msgstr "Les 25 tickets prioritaires de cet utilisateur"
+
+#: lib/RT/Date.pm:391
+msgid "Thu."
+msgstr "Jeu."
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1  %2"
+msgstr "Ticket n°%1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1 Jumbo update: %2"
+msgstr "Ticket n°%1 Jumbo update: %2"
+
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket #%1 Jumbo update: %2"
+msgstr "Ticket n°%1 mise à jour globale: %2"
+
+#: html/Approvals/Elements/ShowDependency:45
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Ticket #%1: %2"
+msgstr "Ticket n°%1: %2"
+
+#: lib/RT/Ticket_Overlay.pm:623 lib/RT/Ticket_Overlay.pm:644
+#. ($self->Id, $QueueObj->Name)
+msgid "Ticket %1 created in queue '%2'"
+msgstr "Ticket %1 créé dans la queue '%2'"
+
+#: bin/rt-commit-handler:759
+#. ($Ticket->Id)
+msgid "Ticket %1 loaded\\n"
+msgstr "Ticket %1 chargé\\n "
+
+#: html/Search/Bulk.html:212
+#. ($Ticket->Id,$_)
+msgid "Ticket %1: %2"
+msgstr "Ticket %1: %2"
+
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket History # %1 %2"
+msgstr "Historique ticket # %1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket Id"
+msgstr "N° ticket"
+
+#: etc/initialdata:309
+msgid "Ticket Resolved"
+msgstr "Ticket résolu/clos"
+
+#: html/Search/Elements/PickRestriction:62
+msgid "Ticket attachment"
+msgstr "Pièce jointe au ticket"
+
+#: lib/RT/Tickets_Overlay.pm:1166
+msgid "Ticket content"
+msgstr "Contenu du ticket."
+
+#: lib/RT/Tickets_Overlay.pm:1212
+msgid "Ticket content type"
+msgstr "Type du contenu du ticket"
+
+#: lib/RT/Ticket_Overlay.pm:514 lib/RT/Ticket_Overlay.pm:523 lib/RT/Ticket_Overlay.pm:533 lib/RT/Ticket_Overlay.pm:633
+msgid "Ticket could not be created due to an internal error"
+msgstr "Une erreur interne a empêché l'ajout du ticket"
+
+#: lib/RT/Transaction_Overlay.pm:520
+msgid "Ticket created"
+msgstr "Ticket ajouté"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket creation failed"
+msgstr "Création de ticket échouée."
+
+#: lib/RT/Transaction_Overlay.pm:525
+msgid "Ticket deleted"
+msgstr "Ticket supprimé."
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket id not found"
+msgstr "Id de ticket non trouvée"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket killed"
+msgstr "Ticket effacé"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket not found"
+msgstr "Ticket non trouvé"
+
+#: etc/initialdata:295
+msgid "Ticket status changed"
+msgstr "Statut de ticket modifié"
+
+#: html/Ticket/Update.html:38
+msgid "Ticket watchers"
+msgstr "Observateurs du ticket"
+
+#: html/Elements/Tabs:46
+msgid "Tickets"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1383
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1348
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr "Tickets %1 par %2"
+
+#: html/Elements/ViewUser:25
+#. ($name)
+msgid "Tickets from %1"
+msgstr "Tickets depuis %2"
+
+#: html/Approvals/Elements/ShowDependency:26
+msgid "Tickets which depend on this approval:"
+msgstr "Tickets dépendant de cette approbation:"
+
+#: html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
+msgid "Time Left"
+msgstr "Temps restant"
+
+#: html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:42
+msgid "Time Worked"
+msgstr "Temps passé"
+
+#: lib/RT/Tickets_Overlay.pm:1139
+msgid "Time left"
+msgstr "Temps restant"
+
+#: html/Elements/Footer:36
+msgid "Time to display"
+msgstr "Temps de calcul"
+
+#: lib/RT/Tickets_Overlay.pm:1115
+msgid "Time worked"
+msgstr "Temps passé"
+
+#: NOT FOUND IN SOURCE
+msgid "TimeLeft"
+msgstr "TempsRestant"
+
+#: lib/RT/Ticket_Overlay.pm:1201
+msgid "TimeWorked"
+msgstr "TempsPassé"
+
+#: bin/rt-commit-handler:401
+msgid "To generate a diff of this commit:"
+msgstr "Pour conserver les modifications de cette transaction"
+
+#: bin/rt-commit-handler:390
+msgid "To generate a diff of this commit:\\n"
+msgstr "Pour conserver les modifications de cette transaction :\\n"
+
+#: lib/RT/Ticket_Overlay.pm:1204
+msgid "Told"
+msgstr "Annoncé"
+
+#: etc/initialdata:237
+msgid "Transaction"
+msgstr "Transaction"
+
+#: lib/RT/Transaction_Overlay.pm:691
+#. ($self->Data)
+msgid "Transaction %1 purged"
+msgstr "La transaction%1 est supprimée"
+
+#: lib/RT/Transaction_Overlay.pm:177
+msgid "Transaction Created"
+msgstr "Transaction ajoutée"
+
+#: lib/RT/Transaction_Overlay.pm:88
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr "Transaction->Create n'a pas fonctionné car vous n'avez pas spécifié d'identifiant de ticket"
+
+#: lib/RT/Transaction_Overlay.pm:750
+msgid "Transactions are immutable"
+msgstr "Les transactions ne peuvent être transférées"
+
+#: NOT FOUND IN SOURCE
+msgid "Trying to delete a right: %1"
+msgstr "Tentative de délégation d'un droit : %1"
+
+#: lib/RT/Date.pm:389
+msgid "Tue."
+msgstr "Mar."
+
+#: html/Admin/Elements/EditCustomField:43 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1202 lib/RT/Tickets_Overlay.pm:959
+msgid "Type"
+msgstr "Type"
+
+#: lib/RT/ScripCondition_Overlay.pm:103
+msgid "Unimplemented"
+msgstr "Fonction non disponible"
+
+#: html/Admin/Users/Modify.html:67
+msgid "Unix login"
+msgstr "Identifiant Unix"
+
+#: html/Admin/Elements/ModifyUser:61
+msgid "UnixUsername"
+msgstr "UnixUsername"
+
+#: lib/RT/Attachment_Overlay.pm:266 lib/RT/Attachment_Overlay.pm:298
+#. ($self->ContentEncoding)
+msgid "Unknown ContentEncoding %1"
+msgstr "Type d'encodage de courrier inconnu: %1"
+
+#: html/Elements/SelectResultsPerPage:36
+msgid "Unlimited"
+msgstr "Illimité"
+
+#: etc/initialdata:32
+msgid "Unprivileged"
+msgstr "Non privilégié"
+
+#: lib/RT/Transaction_Overlay.pm:569
+msgid "Untaken"
+msgstr "Non pris"
+
+#: html/Elements/MyTickets:63 html/Search/Bulk.html:32
+msgid "Update"
+msgstr "Mettre à jour"
+
+#: html/Admin/Users/Prefs.html:61
+msgid "Update ID"
+msgstr "Mettre à jour l'ID"
+
+#: html/Search/Bulk.html:129 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:65
+msgid "Update Type"
+msgstr "Mettre à jour le type"
+
+#: html/Search/Listing.html:60
+msgid "Update all these tickets at once"
+msgstr "Mise à jour des tickets en masse"
+
+#: html/Admin/Users/Prefs.html:48
+msgid "Update email"
+msgstr "Mettre à jour l'email"
+
+#: html/Admin/Users/Prefs.html:54
+msgid "Update name"
+msgstr "Mettre à jour le nom"
+
+#: lib/RT/Interface/Web.pm:409
+msgid "Update not recorded."
+msgstr "Mise à jour non enregistrée"
+
+#: html/Search/Bulk.html:80
+msgid "Update selected tickets"
+msgstr "Mettre à jour les tickets sélectionnés"
+
+#: html/Admin/Users/Prefs.html:35
+msgid "Update signature"
+msgstr "Mettre à jour la signature"
+
+#: html/Ticket/ModifyAll.html:62
+msgid "Update ticket"
+msgstr "Mettre à jour le ticket"
+
+#: NOT FOUND IN SOURCE
+msgid "Update ticket # %1"
+msgstr "Mettre à jour le ticket n°%1"
+
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:46
+#. ($Ticket->id)
+msgid "Update ticket #%1"
+msgstr "Mettre à jour le ticket n°%1"
+
+#: html/Ticket/Update.html:139
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Update ticket #%1 (%2)"
+msgstr "Mettre à jour le ticket n°%1 (%2)"
+
+#: lib/RT/Interface/Web.pm:407
+msgid "Update type was neither correspondence nor comment."
+msgstr "Le type de mise à jour n'était ni un commentaire ni un courrier."
+
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:50 lib/RT/Ticket_Overlay.pm:1205
+msgid "Updated"
+msgstr "Mis(e) à jour"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 %2: %3\\n"
+msgstr "Utilisateur %1 %2: %3\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 Password: %2\\n"
+msgstr "Mot de passe de l'utilisateur %1 : %2\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found"
+msgstr "Utilisateur '%1' non trouvé"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found\\n"
+msgstr "Utilisateur '%1' non trouvé\\n"
+
+#: etc/initialdata:124 etc/initialdata:191
+msgid "User Defined"
+msgstr "Utilisateur défini"
+
+#: html/Admin/Users/Prefs.html:58
+msgid "User ID"
+msgstr "Id utilisateur"
+
+#: html/Elements/SelectUsers:25
+msgid "User Id"
+msgstr "Id utilisateur"
+
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
+msgid "User Rights"
+msgstr "Droits utilisateurs"
+
+#: html/Admin/Users/Modify.html:225
+#. ($msg)
+msgid "User could not be created: %1"
+msgstr "Utilisateur ne peut pas être créé : %1"
+
+#: lib/RT/User_Overlay.pm:321
+msgid "User created"
+msgstr "Utilisateur créé"
+
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
+msgid "User defined groups"
+msgstr "Groupes utilisateur"
+
+#: lib/RT/User_Overlay.pm:575 lib/RT/User_Overlay.pm:592
+msgid "User loaded"
+msgstr "Utilisateur chargé"
+
+#: NOT FOUND IN SOURCE
+msgid "User notified"
+msgstr "Utilisateur informé"
+
+#: html/Admin/Users/Prefs.html:24 html/Admin/Users/Prefs.html:28
+msgid "User view"
+msgstr "Vue utilisateur"
+
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57
+msgid "Users"
+msgstr "Utilisateurs"
+
+#: html/Admin/Users/index.html:64
+msgid "Users matching search criteria"
+msgstr "Utilisateurs correspondants aux critères de recherche"
+
+#: html/Search/Elements/PickRestriction:50
+msgid "ValueOfQueue"
+msgstr "ValueOfQueue"
+
+#: html/Admin/Elements/EditCustomField:56
+msgid "Values"
+msgstr "Valeurs"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "Watch"
+msgstr "Observer"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "WatchAsAdminCc"
+msgstr "ObserverCommeAdminCC"
+
+#: NOT FOUND IN SOURCE
+msgid "Watcher loaded"
+msgstr "Observateur chargé"
+
+#: html/Admin/Elements/QueueTabs:41
+msgid "Watchers"
+msgstr "Observateurs"
+
+#: html/Admin/Elements/ModifyUser:55
+msgid "WebEncoding"
+msgstr "WebEncoding"
+
+#: lib/RT/Date.pm:390
+msgid "Wed."
+msgstr "Mer."
+
+#: etc/initialdata:503 etc/upgrade/2.1.71:161
+msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
+msgstr "Quand un ticket a été approuvé par tous les approbateurs, ajoute le courrier au ticket source"
+
+#: etc/initialdata:467 etc/upgrade/2.1.71:135
+msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
+msgstr "Quand un ticket a été approuvé par au moins un approbateur, ajoute le courrier au ticket source "
+
+#: etc/initialdata:138
+msgid "When a ticket is created"
+msgstr "Quand un ticket est créé"
+
+#: etc/initialdata:400 etc/upgrade/2.1.71:79
+msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
+msgstr "Quand un ticket d'approbation est créé, informer l'intervenant et l'AdminCC de l'élément attendant leur approbation"
+
+#: etc/initialdata:143
+msgid "When anything happens"
+msgstr "Quand quelque chose arrive"
+
+#: etc/initialdata:184
+msgid "Whenever a ticket is resolved"
+msgstr "Lorsqu'un ticket quelconque est résolu/clos"
+
+#: etc/initialdata:170
+msgid "Whenever a ticket's owner changes"
+msgstr "Lorsqu'un ticket quelconque change d'intervenant"
+
+#: etc/initialdata:178
+msgid "Whenever a ticket's queue changes"
+msgstr "Lorsqu'un ticket quelconque change de queue"
+
+#: etc/initialdata:162
+msgid "Whenever a ticket's status changes"
+msgstr "Lorsqu'un ticket quelconque change de statut"
+
+#: etc/initialdata:192
+msgid "Whenever a user-defined condition occurs"
+msgstr "Lorsqu'une condition définie par l'utilisateur est satisfaite"
+
+#: etc/initialdata:156
+msgid "Whenever comments come in"
+msgstr "Lorsque un commentaire arrive"
+
+#: etc/initialdata:149
+msgid "Whenever correspondence comes in"
+msgstr "Lorsque un courrier arrive"
+
+#: html/Admin/Users/Modify.html:163 html/User/Prefs.html:51
+msgid "Work"
+msgstr "Travail"
+
+#: html/Admin/Elements/ModifyUser:69
+msgid "WorkPhone"
+msgstr "Tel. bureau"
+
+#: html/Ticket/Elements/ShowBasics:34 html/Ticket/Update.html:64
+msgid "Worked"
+msgstr "Travaillé"
+
+#: lib/RT/Ticket_Overlay.pm:3187
+msgid "You already own this ticket"
+msgstr "Vous êtes déjà intervenant de ce ticket"
+
+#: html/autohandler:122
+msgid "You are not an authorized user"
+msgstr "Vous n'êtes pas un utilisateur autorisé"
+
+#: lib/RT/Ticket_Overlay.pm:3069
+msgid "You can only reassign tickets that you own or that are unowned"
+msgstr "Vous pouvez seulement réaffecter vos ticket ou ceux qui ne sont pas affectés"
+
+#: NOT FOUND IN SOURCE
+msgid "You don't have permission to view that ticket.\\n"
+msgstr "Vous n'êtes pas autorisé à voir ce ticket.\\n"
+
+#: docs/design_docs/string-extraction-guide.txt:47
+#. ($num, $queue)
+msgid "You found %1 tickets in queue %2"
+msgstr "%1 tickets trouvés dans la queue %2"
+
+#: html/NoAuth/Logout.html:30
+msgid "You have been logged out of RT."
+msgstr "Vous avez été déconnecté de RT."
+
+#: html/SelfService/Display.html:77
+msgid "You have no permission to create tickets in that queue."
+msgstr "Vous n'avez pas l'autorisation de créer des tickets dans cette queue."
+
+#: lib/RT/Ticket_Overlay.pm:1926
+msgid "You may not create requests in that queue."
+msgstr "Vous ne pouvez pas créer de demandes dans cette queue."
+
+#: html/NoAuth/Logout.html:34
+msgid "You're welcome to login again"
+msgstr "Vous êtes invité à vous identifier à nouveau"
+
+#: NOT FOUND IN SOURCE
+msgid "Your %1 requests"
+msgstr "Vos %1 requêtes"
+
+#: NOT FOUND IN SOURCE
+msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
+msgstr "Votre administrateur RT a mal configuré l'alias de mail qui appelle RT"
+
+#: etc/initialdata:484 etc/upgrade/2.1.71:146
+msgid "Your request has been approved by %1. Other approvals may still be pending."
+msgstr "Votre demande a été approuvée par %1. D'autres approbations sont peut être toujours en attente"
+
+#: etc/initialdata:522 etc/upgrade/2.1.71:180
+msgid "Your request has been approved."
+msgstr "Votre demande a été approuvée"
+
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr "Votre demande a été rejetée"
+
+#: etc/initialdata:427 etc/upgrade/2.1.71:101
+msgid "Your request was rejected."
+msgstr "Votre demande a été rejetée."
+
+#: html/autohandler:144
+msgid "Your username or password is incorrect"
+msgstr "Votre nom d'utilisateur ou votre mot de passe est incorrect"
+
+#: html/Admin/Elements/ModifyUser:83 html/Admin/Users/Modify.html:143 html/User/Prefs.html:95
+msgid "Zip"
+msgstr "Code Postal"
+
+#: NOT FOUND IN SOURCE
+msgid "[no subject]"
+msgstr "[Pas de sujet]"
+
+#: html/User/Elements/DelegateRights:58
+#. ($right->PrincipalObj->Object->SelfDescription)
+msgid "as granted to %1"
+msgstr "comme accordé à %1"
+
+#: html/SelfService/Closed.html:27
+msgid "closed"
+msgstr "fermé"
+
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
+msgid "contains"
+msgstr "contient"
+
+#: html/Elements/SelectAttachmentField:25
+msgid "content"
+msgstr "Contenu"
+
+#: html/Elements/SelectAttachmentField:26
+msgid "content-type"
+msgstr "Type de contenu"
+
+#: lib/RT/Ticket_Overlay.pm:2313
+msgid "correspondence (probably) not sent"
+msgstr "courrier (probablement) non envoyé"
+
+#: lib/RT/Ticket_Overlay.pm:2323
+msgid "correspondence sent"
+msgstr "courrier envoyé"
+
+#: html/Admin/Elements/ModifyQueue:62 html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
+msgid "days"
+msgstr "jours"
+
+#: NOT FOUND IN SOURCE
+msgid "dead"
+msgstr "effacé"
+
+#: html/Search/Listing.html:74
+msgid "delete"
+msgstr "effacer"
+
+#: lib/RT/Queue_Overlay.pm:62
+msgid "deleted"
+msgstr "effacé"
+
+#: html/Search/Elements/PickRestriction:67
+msgid "does not match"
+msgstr "ne correspond pas"
+
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
+msgid "doesn't contain"
+msgstr "ne contient pas"
+
+#: html/Elements/SelectEqualityOperator:37
+msgid "equal to"
+msgstr "égal à"
+
+#: NOT FOUND IN SOURCE
+msgid "false"
+msgstr "faux"
+
+#: html/Elements/SelectAttachmentField:27
+msgid "filename"
+msgstr "Nom de fichier"
+
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
+msgid "greater than"
+msgstr "supérieur à"
+
+#: lib/RT/Group_Overlay.pm:193
+#. ($self->Name)
+msgid "group '%1'"
+msgstr "groupe '%1'"
+
+#: lib/RT/Date.pm:315
+msgid "hours"
+msgstr "heures"
+
+#: NOT FOUND IN SOURCE
+msgid "id"
+msgstr "n°"
+
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickRestriction:46 html/Search/Elements/PickRestriction:75 html/Search/Elements/PickRestriction:87
+msgid "is"
+msgstr "est"
+
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88
+msgid "isn't"
+msgstr "n'est pas"
+
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
+msgid "less than"
+msgstr "inférieur à"
+
+#: html/Search/Elements/PickRestriction:66
+msgid "matches"
+msgstr "correspond"
+
+#: lib/RT/Date.pm:311
+msgid "min"
+msgstr "min"
+
+#: html/Ticket/Update.html:64
+msgid "minutes"
+msgstr "minutes"
+
+#: bin/rt-commit-handler:764
+msgid "modifications\\n\\n"
+msgstr "modifications\\n\\n"
+
+#: lib/RT/Date.pm:327
+msgid "months"
+msgstr "mois"
+
+#: lib/RT/Queue_Overlay.pm:57
+msgid "new"
+msgstr "nouveau"
+
+#: html/Admin/Elements/EditScrips:42
+msgid "no value"
+msgstr "Non renseigné"
+
+#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
+msgid "none"
+msgstr "aucun"
+
+#: html/Elements/SelectEqualityOperator:37
+msgid "not equal to"
+msgstr "différent de"
+
+#: NOT FOUND IN SOURCE
+msgid "notlike"
+msgstr "necontientpas"
+
+#: html/SelfService/Elements/MyRequests:60 lib/RT/Queue_Overlay.pm:58
+msgid "open"
+msgstr "ouvert"
+
+#: lib/RT/Group_Overlay.pm:198
+#. ($self->Name, $user->Name)
+msgid "personal group '%1' for user '%2'"
+msgstr "groupe personnel '%1' pour l'utilisateur '%2'"
+
+#: lib/RT/Group_Overlay.pm:206
+#. ($queue->Name, $self->Type)
+msgid "queue %1 %2"
+msgstr "queue %1 %2"
+
+#: lib/RT/Queue_Overlay.pm:61
+msgid "rejected"
+msgstr "rejeté"
+
+#: lib/RT/Queue_Overlay.pm:60
+msgid "resolved"
+msgstr "résolu"
+
+#: lib/RT/Date.pm:307
+msgid "sec"
+msgstr "sec"
+
+#: lib/RT/Queue_Overlay.pm:59
+msgid "stalled"
+msgstr "bloqué"
+
+#: lib/RT/Group_Overlay.pm:201
+#. ($self->Type)
+msgid "system %1"
+msgstr "système %1"
+
+#: lib/RT/Group_Overlay.pm:212
+#. ($self->Type)
+msgid "system group '%1'"
+msgstr "groupe système '%1'"
+
+#: html/Elements/Error:42 html/SelfService/Error.html:41
+msgid "the calling component did not specify why"
+msgstr "le composant appelant n'a pas spécifié pourquoi"
+
+#: lib/RT/URI/fsck_com_rt.pm:234
+#. ($self->Object->Id)
+msgid "ticket #%1"
+msgstr "ticket n°%1"
+
+#: lib/RT/Group_Overlay.pm:209
+#. ($self->Instance, $self->Type)
+msgid "ticket #%1 %2"
+msgstr "ticket n°%1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "true"
+msgstr "vrai"
+
+#: lib/RT/Group_Overlay.pm:215
+#. ($self->Id)
+msgid "undescribed group %1"
+msgstr "Groupe %1 non décrit"
+
+#: NOT FOUND IN SOURCE
+msgid "undescripbed group %1"
+msgstr "Groupe non décrit %1"
+
+#: lib/RT/Group_Overlay.pm:190
+#. ($user->Object->Name)
+msgid "user %1"
+msgstr "utilisateur %1"
+
+#: lib/RT/Date.pm:323
+msgid "weeks"
+msgstr "semaines"
+
+#: NOT FOUND IN SOURCE
+msgid "with template %1"
+msgstr "Avec modèle %1"
+
+#: lib/RT/Date.pm:331
+msgid "years"
+msgstr "années"
+
diff --git a/rt/lib/RT/I18N/he.po b/rt/lib/RT/I18N/he.po
new file mode 100644
index 000000000..d3ef20e25
--- /dev/null
+++ b/rt/lib/RT/I18N/he.po
@@ -0,0 +1,4871 @@
+# Hebrew Translation of the RT interface by Shimi.
+# Comments: shimi@shimi.net
+
+msgid ""
+msgstr ""
+"Language-Team: rt-devel <rt-devel@lists.fsck.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: html/Elements/MyRequests:28 html/Elements/MyTickets:28
+msgid "#"
+msgstr ""
+
+#: html/Admin/Queues/Scrip.html:55
+#. ($QueueObj->id)
+msgid "#%1"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:27 html/Approvals/Elements/ShowDependency:50 html/SelfService/Display.html:25 html/Ticket/Display.html:26 html/Ticket/Display.html:30
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($Ticket->id, $Ticket->Subject)
+#. ($ticket->Id, $ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "#%1: %2"
+msgstr ""
+
+#: lib/RT/Date.pm:337
+#. ($s, $time_unit)
+msgid "%1 %2"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:771
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr ""
+
+#: lib/RT/Date.pm:373
+#. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
+msgid "%1 %2 %3 %4:%5:%6 %7"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3505 lib/RT/Transaction_Overlay.pm:557 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $new_value->Content)
+#. ($field, $self->NewValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 הוסף"
+msgstr ""
+
+#: lib/RT/Date.pm:334
+#. ($s, $time_unit)
+msgid "%1 לפני %2 ימי�"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3511 lib/RT/Transaction_Overlay.pm:564
+#. ($cf->Name, $old_value, $new_value->Content)
+#. ($field, $self->OldValue, $self->NewValue)
+msgid "%1 %2 שונה ל %3"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3508 lib/RT/Transaction_Overlay.pm:560 lib/RT/Transaction_Overlay.pm:605
+#. ($cf->Name, $old_value)
+#. ($field, $self->OldValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 נמחק"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 מקבוצה %3"
+msgstr ""
+
+#: html/Admin/Elements/EditScrips:44 html/Admin/Elements/ListGlobalScrips:28
+#. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
+msgid "%1 %2 ע� תבנית %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 פנייה זו\\n"
+msgstr ""
+
+#: html/Search/Listing.html:57
+#. (($session{'tickets'}->FirstRow+1), ($session{'tickets'}->FirstRow() + $session{'tickets'}->RowsPerPage()  ))
+msgid "%1 - %2 shown"
+msgstr "%1 - %2 מוצגי�"
+
+#: bin/rt-crontool:169 bin/rt-crontool:176 bin/rt-crontool:182
+#. ("--search-argument", "--search")
+#. ("--condition-argument", "--condition")
+#. ("--action-argument", "--action")
+msgid "%1 - �רגומנט להעביר �ל %2"
+msgstr ""
+
+#: bin/rt-crontool:185
+#. ("--verbose")
+msgid "%1 - Output status updates to STDOUT"
+msgstr ""
+
+#: bin/rt-crontool:179
+#. ("--action")
+msgid "%1 - Specify the action module you want to use"
+msgstr ""
+
+#: bin/rt-crontool:173
+#. ("--condition")
+msgid "%1 - Specify the condition module you want to use"
+msgstr ""
+
+#: bin/rt-crontool:166
+#. ("--search")
+msgid "%1 - Specify the search module you want to use"
+msgstr ""
+
+#: lib/RT/ScripAction_Overlay.pm:122
+#. ($self->Id)
+msgid "%1 פעולת-סקריפ נטענה"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3538
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 הוסף כערך עבור %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� (מ %2) %3"
+msgstr ""
+
+#: lib/RT/Link_Overlay.pm:117 lib/RT/Link_Overlay.pm:124
+#. ($args{'Base'})
+#. ($args{'Target'})
+msgid "%1 נר�ה כמו �ובייקט מקומי, �בל הו� �ינו נמצ� במסד הנתוני�"
+msgstr ""
+
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:481
+#. ($self->BriefDescription , $self->CreatorObj->Name)
+#. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
+msgid "%1 על ידי %2"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:535 lib/RT/Transaction_Overlay.pm:624 lib/RT/Transaction_Overlay.pm:633 lib/RT/Transaction_Overlay.pm:636
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
+#. ($self->Field , $q1->Name , $q2->Name)
+#. ($self->Field, $t2->AsString, $t1->AsString)
+#. ($self->Field, $self->OldValue, $self->NewValue)
+msgid "%1 שונה מ %2 ל %3"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:891
+msgid "%1 could not be set to %2."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 couldn't init a transaction (%2)\\n"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2817
+#. ($self)
+msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
+msgstr ""
+
+#: html/Elements/MyTickets:25
+#. ($rows)
+msgid "%1 highest priority tickets I own..."
+msgstr "%1 הפניות ע� העדיפות הגבוהה ביותר בטיפולי..."
+
+#: html/Elements/MyRequests:25
+#. ($rows)
+msgid "%1 highest priority tickets I requested..."
+msgstr "%1 הפניות ע� העדיפות הגבוהה ביותר ש�ני פתחתי..."
+
+#: bin/rt-crontool:161
+#. ($0)
+msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:743
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this queue."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1570
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this ticket."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3594
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 is no longer a value for custom field %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 isn't a valid Queue id."
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:36
+#. ($TimeWorked)
+msgid "%1 min"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 not shown"
+msgstr ""
+
+#: html/User/Elements/DelegateRights:76
+#. (loc($ObjectType =~ /^RT::(.*)$/))
+msgid "%1 rights"
+msgstr "זכויות"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 succeeded\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for $MessageId"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 was created without a CurrentUser\\n"
+msgstr ""
+
+#: lib/RT/Action/ResolveMembers.pm:42
+#. (ref $self)
+msgid "%1 will resolve all members of a resolved group ticket."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:433
+#. ($self)
+msgid "%1: no attachment specified"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransaction:102
+#. ($size)
+msgid "%1b"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransaction:99
+#. (int($size/102.4)/10)
+msgid "%1k"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1140
+#. ($args{'Status'})
+msgid "'%1' is an invalid value for status"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "'%1' not a recognized action. "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete group member)"
+msgstr "(סמן תיבה כדי למחוק חבר בקבוצה)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete scrip)"
+msgstr "(סמן תיבה כדי למחוק סקריפ)"
+
+#: html/Admin/Elements/EditCustomFieldValues:25 html/Admin/Elements/EditQueueWatchers:29 html/Admin/Elements/EditScrips:35 html/Admin/Elements/EditTemplates:36 html/Admin/Groups/Members.html:52 html/Ticket/Elements/EditLinks:33 html/Ticket/Elements/EditPeople:46 html/User/Groups/Members.html:55
+msgid "(Check box to delete)"
+msgstr "(סמן תיבה כדי למחוק)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check boxes to delete)"
+msgstr "(סמן תיבות כדי למחוק)"
+
+#: html/Ticket/Create.html:178
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:54 html/Admin/Queues/Modify.html:60
+#. ($RT::CorrespondAddress)
+#. ($RT::CommentAddress)
+msgid "(If left blank, will default to %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(No Value)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:33 html/Admin/Elements/ListGlobalCustomFields:32
+msgid "(No custom fields)"
+msgstr ""
+
+#: html/Admin/Groups/Members.html:50 html/User/Groups/Members.html:53
+msgid "(No members)"
+msgstr ""
+
+#: html/Admin/Elements/EditScrips:32 html/Admin/Elements/ListGlobalScrips:32
+msgid "(No scrips)"
+msgstr ""
+
+#: html/Admin/Elements/EditTemplates:31
+msgid "(No templates)"
+msgstr ""
+
+#: html/Ticket/Update.html:85
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr ""
+
+#: html/Ticket/Create.html:79
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
+msgstr ""
+
+#: html/Ticket/Update.html:81
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr ""
+
+#: html/Ticket/Create.html:69
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
+msgstr ""
+
+#: html/Admin/Groups/index.html:33 html/User/Groups/index.html:33
+msgid "(empty)"
+msgstr ""
+
+#: html/Admin/Users/index.html:39
+msgid "(no name listed)"
+msgstr ""
+
+#: html/Elements/MyRequests:43 html/Elements/MyTickets:45
+msgid "(no subject)"
+msgstr ""
+
+#: html/Admin/Elements/SelectRights:48 html/Elements/SelectCustomFieldValue:30 html/Ticket/Elements/EditCustomField:59 html/Ticket/Elements/ShowCustomFields:36 lib/RT/Transaction_Overlay.pm:534
+msgid "(no value)"
+msgstr ""
+
+#: html/Ticket/Elements/EditLinks:116
+msgid "(only one ticket)"
+msgstr "(רק פנייה �חת)"
+
+#: html/Elements/MyRequests:52 html/Elements/MyTickets:55
+msgid "(pending approval)"
+msgstr ""
+
+#: html/Elements/MyRequests:54 html/Elements/MyTickets:57
+msgid "(pending other tickets)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(requestor's group)"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:50
+msgid "(required)"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "(untitled)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:32
+msgid "<% $Ticket->Status%>"
+msgstr ""
+
+#: html/Elements/SelectTicketTypes:27
+msgid "<% $_ %>"
+msgstr ""
+
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:26
+#. ($m->scomp('/Elements/SelectNewTicketQueue'))
+msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
+msgstr "<input type=\"submit\" value=\"פנייה חדשה ב\">&nbsp;%1"
+
+#: NOT FOUND IN SOURCE
+msgid "??????"
+msgstr ""
+
+#: etc/initialdata:203
+msgid "A blank template"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Loaded"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be found"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:157 lib/RT/Principal_Overlay.pm:181
+msgid "ACE not found"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:831
+msgid "ACEs can only be created and deleted."
+msgstr ""
+
+#: bin/rt-commit-handler:755
+msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgstr ""
+
+#: html/User/Elements/Tabs:32
+msgid "About me"
+msgstr "מידע �ודותי"
+
+#: html/Admin/Users/Modify.html:80
+msgid "Access control"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:57
+msgid "Action"
+msgstr ""
+
+#: lib/RT/Scrip_Overlay.pm:147
+#. ($args{'ScripAction'})
+msgid "Action %1 not found"
+msgstr ""
+
+#: bin/rt-crontool:123
+msgid "Action committed."
+msgstr ""
+
+#: bin/rt-crontool:119
+msgid "Action prepared..."
+msgstr ""
+
+#: html/Search/Bulk.html:92
+msgid "Add AdminCc"
+msgstr "הוסף העתק ניהולי"
+
+#: html/Search/Bulk.html:90
+msgid "Add Cc"
+msgstr "הוסף העתק"
+
+#: html/Ticket/Create.html:114 html/Ticket/Update.html:100
+msgid "Add More Files"
+msgstr "הוסף עוד קבצי�"
+
+#: NOT FOUND IN SOURCE
+msgid "Add Next State"
+msgstr ""
+
+#: html/Search/Bulk.html:88
+msgid "Add Requestor"
+msgstr "הוסף מבקש"
+
+#: html/Admin/Elements/AddCustomFieldValue:26
+msgid "Add Value"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip to this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip which will apply to all queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a new a global scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a scrip to this queue"
+msgstr ""
+
+#: html/Admin/Global/Scrip.html:55
+msgid "Add a scrip which will apply to all queues"
+msgstr ""
+
+#: html/Search/Bulk.html:118
+msgid "Add comments or replies to selected tickets"
+msgstr "הוסף הערות �ו תגובות לפניות הנבחרות"
+
+#: html/Admin/Groups/Members.html:42 html/User/Groups/Members.html:39
+msgid "Add members"
+msgstr ""
+
+#: html/Admin/Queues/People.html:66 html/Ticket/Elements/AddWatchers:28
+msgid "Add new watchers"
+msgstr "הוסף צופי� חדשי�"
+
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:643
+#. ($args{'Type'})
+msgid "Added principal as a %1 for this queue"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1454
+#. ($self->loc($args{'Type'}))
+msgid "Added principal as a %1 for this ticket"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:76 html/Admin/Users/Modify.html:122 html/User/Prefs.html:88
+msgid "Address1"
+msgstr "כתובת1"
+
+#: html/Admin/Elements/ModifyUser:78 html/Admin/Users/Modify.html:127 html/User/Prefs.html:90
+msgid "Address2"
+msgstr "כתובת2"
+
+#: html/Ticket/Create.html:74
+msgid "Admin Cc"
+msgstr ""
+
+#: etc/initialdata:280
+msgid "Admin Comment"
+msgstr ""
+
+#: etc/initialdata:259
+msgid "Admin Correspondence"
+msgstr ""
+
+#: html/Admin/Queues/index.html:25 html/Admin/Queues/index.html:28
+msgid "Admin queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Admin users"
+msgstr ""
+
+#: html/Admin/Global/index.html:26 html/Admin/Global/index.html:28
+msgid "Admin/Global configuration"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Groups"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:25 html/Admin/Queues/Modify.html:29
+msgid "Admin/Queue/Basics"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr ""
+
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:39 html/Ticket/Update.html:50 lib/RT/ACE_Overlay.pm:89
+msgid "AdminCc"
+msgstr "העתק ניהולי"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "AdminCustomFields"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "AdminGroup"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "AdminGroupMembership"
+msgstr ""
+
+#: lib/RT/System.pm:59
+msgid "AdminOwnPersonalGroups"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "AdminQueue"
+msgstr ""
+
+#: lib/RT/System.pm:60
+msgid "AdminUsers"
+msgstr ""
+
+#: html/Admin/Queues/People.html:48 html/Ticket/Elements/EditPeople:54
+msgid "Administrative Cc"
+msgstr "העתק ניהולי"
+
+#: NOT FOUND IN SOURCE
+msgid "Admins"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search"
+msgstr ""
+
+#: html/Elements/SelectDateRelation:36
+msgid "After"
+msgstr "�חרי"
+
+#: NOT FOUND IN SOURCE
+msgid "Age"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Alias"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Alias for"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:96
+msgid "All Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:53
+msgid "All Queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
+msgstr ""
+
+#: html/Elements/Tabs:56
+msgid "Approval"
+msgstr "�ישור"
+
+#: html/Approvals/Display.html:46 html/Approvals/Elements/ShowDependency:42 html/Approvals/index.html:65
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($ticket->id, $msg)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Approval #%1: %2"
+msgstr ""
+
+#: html/Approvals/index.html:54
+#. ($ticket->Id)
+msgid "Approval #%1: Notes not recorded due to a system error"
+msgstr ""
+
+#: html/Approvals/index.html:52
+#. ($ticket->Id)
+msgid "Approval #%1: Notes recorded"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Details"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Approval diagram"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:44
+msgid "Approve"
+msgstr ""
+
+#: etc/initialdata:437 etc/upgrade/2.1.71:148
+msgid "Approver's notes: %1"
+msgstr ""
+
+#: lib/RT/Date.pm:414
+msgid "Apr."
+msgstr "�פריל"
+
+#: NOT FOUND IN SOURCE
+msgid "April"
+msgstr "�פריל"
+
+#: html/Elements/SelectSortOrder:35
+msgid "Ascending"
+msgstr "עולה"
+
+#: html/Search/Bulk.html:127 html/SelfService/Update.html:33 html/Ticket/ModifyAll.html:83 html/Ticket/Update.html:100
+msgid "Attach"
+msgstr "צרף"
+
+#: html/SelfService/Create.html:65 html/Ticket/Create.html:110
+msgid "Attach file"
+msgstr ""
+
+#: html/Ticket/Create.html:98 html/Ticket/Update.html:89
+msgid "Attached file"
+msgstr "קובץ מצורף"
+
+#: NOT FOUND IN SOURCE
+msgid "Attachment '%1' could not be loaded"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:441
+msgid "Attachment created"
+msgstr "קובץ צורף"
+
+#: lib/RT/Tickets_Overlay.pm:1189
+msgid "Attachment filename"
+msgstr "ש� קובץ מצורף"
+
+#: html/Ticket/Elements/ShowAttachments:26
+msgid "Attachments"
+msgstr "קבצי� מצורפי�"
+
+#: lib/RT/Date.pm:418
+msgid "Aug."
+msgstr "�וגוסט"
+
+#: NOT FOUND IN SOURCE
+msgid "August"
+msgstr "�וגוסט"
+
+#: html/Admin/Elements/ModifyUser:66
+msgid "AuthSystem"
+msgstr ""
+
+#: etc/initialdata:206
+msgid "Autoreply"
+msgstr ""
+
+#: etc/initialdata:72
+msgid "Autoreply To Requestors"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Bad PGP Signature: %1\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
+msgstr ""
+
+#: bin/rt-commit-handler:827
+#. ($val)
+msgid "Bad data in %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Bad transaction number for attachment. %1 should be %2\\n"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:39 html/Admin/Elements/QueueTabs:39 html/Admin/Elements/UserTabs:38 html/Ticket/Elements/Tabs:90 html/User/Elements/GroupTabs:38
+msgid "Basics"
+msgstr "בסיסי"
+
+#: html/Ticket/Update.html:83
+msgid "Bcc"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:88 html/Admin/Global/GroupRights.html:85 html/Admin/Global/Template.html:46 html/Admin/Global/UserRights.html:54 html/Admin/Groups/GroupRights.html:73 html/Admin/Groups/Members.html:81 html/Admin/Groups/Modify.html:56 html/Admin/Groups/UserRights.html:55 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:45 html/Admin/Queues/UserRights.html:54 html/User/Groups/Modify.html:56
+msgid "Be sure to save your changes"
+msgstr "�ל תשכח לשמור �ת השינויי�"
+
+#: html/Elements/SelectDateRelation:34 lib/RT/CurrentUser.pm:320
+msgid "Before"
+msgstr "לפני"
+
+#: NOT FOUND IN SOURCE
+msgid "Begin Approval"
+msgstr ""
+
+#: etc/initialdata:202
+msgid "Blank"
+msgstr ""
+
+#: html/Search/Listing.html:79
+msgid "Bookmarkable URL for this search"
+msgstr "הוסף כתובת זו לספר הכתובות כדי לחזור על �ותו חיפוש"
+
+#: html/Ticket/Elements/ShowHistory:39 html/Ticket/Elements/ShowHistory:45
+msgid "Brief headers"
+msgstr "תקציר כותרי�"
+
+#: html/Search/Bulk.html:25 html/Search/Bulk.html:26
+msgid "Bulk ticket update"
+msgstr "עדכון פניות מרוכז"
+
+#: lib/RT/User_Overlay.pm:1352
+msgid "Can not modify system users"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "Can this principal see this queue"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:206
+msgid "Can't add a custom field value without a name"
+msgstr ""
+
+#: lib/RT/Link_Overlay.pm:132
+msgid "Can't link a ticket to itself"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2794
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2612 lib/RT/Ticket_Overlay.pm:2681
+msgid "Can't specifiy both base and target"
+msgstr ""
+
+#: html/autohandler:99
+#. ($msg)
+msgid "Cannot create user: %1"
+msgstr ""
+
+#: etc/initialdata:50 html/Admin/Queues/People.html:44 html/SelfService/Create.html:49 html/Ticket/Create.html:64 html/Ticket/Elements/EditPeople:51 html/Ticket/Elements/ShowPeople:35 html/Ticket/Update.html:45 html/Ticket/Update.html:78 lib/RT/ACE_Overlay.pm:88
+msgid "Cc"
+msgstr "העתק"
+
+#: html/SelfService/Prefs.html:31
+msgid "Change password"
+msgstr ""
+
+#: html/Ticket/Create.html:101 html/Ticket/Update.html:92
+msgid "Check box to delete"
+msgstr "סמן תיבה כדי למחוק"
+
+#: html/Admin/Elements/SelectRights:31
+msgid "Check box to revoke right"
+msgstr "סמן תיבה כדי לבטל זכות"
+
+#: html/Ticket/Create.html:183 html/Ticket/Elements/EditLinks:131 html/Ticket/Elements/EditLinks:69 html/Ticket/Elements/ShowLinks:57
+msgid "Children"
+msgstr "ילדי�"
+
+#: html/Admin/Elements/ModifyUser:80 html/Admin/Users/Modify.html:132 html/User/Prefs.html:92
+msgid "City"
+msgstr "עיר"
+
+#: html/Ticket/Elements/ShowDates:47
+msgid "Closed"
+msgstr "נסגר"
+
+#: html/SelfService/Closed.html:25
+msgid "Closed Tickets"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Closed requests"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:45
+msgid "Closed tickets"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Code"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Command not understood!\\n"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransaction:179 html/Ticket/Elements/Tabs:153
+msgid "Comment"
+msgstr "הערה"
+
+#: html/Admin/Elements/ModifyQueue:45 html/Admin/Queues/Modify.html:58
+msgid "Comment Address"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Comment not recorded"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "Comment on tickets"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "CommentOnTicket"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:35
+msgid "Comments"
+msgstr ""
+
+#: html/Ticket/ModifyAll.html:70 html/Ticket/Update.html:70
+msgid "Comments (Not sent to requestors)"
+msgstr "הערות (ל� נשלחות �ל המבקשי�)"
+
+#: html/Search/Bulk.html:122
+msgid "Comments (not sent to requestors)"
+msgstr "הערות (ל� נשלחות �ל המבקשי�)"
+
+#: html/Elements/ViewUser:27
+#. ($name)
+msgid "Comments about %1"
+msgstr "הערות לגבי %1"
+
+#: html/Admin/Users/Modify.html:185 html/Ticket/Elements/ShowRequestor:44
+msgid "Comments about this user"
+msgstr "הערות לגבי משתמש זה"
+
+#: lib/RT/Transaction_Overlay.pm:543
+msgid "Comments added"
+msgstr "הערות נוספו"
+
+#: lib/RT/Action/Generic.pm:140
+msgid "Commit Stubbed"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Compile Restrictions"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:41
+msgid "Condition"
+msgstr ""
+
+#: bin/rt-crontool:109
+msgid "Condition matches..."
+msgstr ""
+
+#: lib/RT/Scrip_Overlay.pm:160
+msgid "Condition not found"
+msgstr ""
+
+#: html/Elements/Tabs:50
+msgid "Configuration"
+msgstr "הגדרות"
+
+#: html/SelfService/Prefs.html:33
+msgid "Confirm"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:60
+msgid "ContactInfoSystem"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Contacted date '%1' could not be parsed"
+msgstr ""
+
+#: html/Admin/Elements/ModifyTemplate:44 html/Ticket/ModifyAll.html:87
+msgid "Content"
+msgstr "תוכן"
+
+#: NOT FOUND IN SOURCE
+msgid "Coould not create group"
+msgstr ""
+
+#: etc/initialdata:271
+msgid "Correspondence"
+msgstr ""
+
+#: html/Admin/Elements/ModifyQueue:39 html/Admin/Queues/Modify.html:51
+msgid "Correspondence Address"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:539
+msgid "Correspondence added"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Correspondence not recorded"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3525
+msgid "Could not add new custom field value for ticket. "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Could not add new custom field value for ticket. %1 "
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3031 lib/RT/Ticket_Overlay.pm:3039 lib/RT/Ticket_Overlay.pm:3055
+msgid "Could not change owner. "
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:85 html/Admin/Elements/EditCustomFields:166
+#. ($msg)
+msgid "Could not create CustomField"
+msgstr ""
+
+#: html/User/Groups/Modify.html:77 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
+msgid "Could not create group"
+msgstr ""
+
+#: html/Admin/Global/Template.html:75 html/Admin/Queues/Template.html:72
+#. ($msg)
+msgid "Could not create template: %1"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1073 lib/RT/Ticket_Overlay.pm:334
+msgid "Could not create ticket. Queue not set"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:208 lib/RT/User_Overlay.pm:220 lib/RT/User_Overlay.pm:238 lib/RT/User_Overlay.pm:422
+msgid "Could not create user"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Could not create watcher for requestor"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find a ticket with id %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find group %1."
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1422
+msgid "Could not find or create that user"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1501
+msgid "Could not find that principal"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find user %1."
+msgstr ""
+
+#: html/Admin/Groups/Members.html:88 html/User/Groups/Members.html:90 html/User/Groups/Modify.html:82
+msgid "Could not load group"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:641
+#. ($args{'Type'})
+msgid "Could not make that principal a %1 for this queue"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1443
+#. ($self->loc($args{'Type'}))
+msgid "Could not make that principal a %1 for this ticket"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:740
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this queue"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1559
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this ticket"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:985
+msgid "Couldn't add member to group"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3535 lib/RT/Ticket_Overlay.pm:3591
+#. ($Msg)
+msgid "Couldn't create a transaction: %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't figure out what to do from gpg's reply\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find group\\n"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:900
+msgid "Couldn't find row"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:959
+msgid "Couldn't find that principal"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:240
+msgid "Couldn't find that value"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find that watcher"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find user\\n"
+msgstr ""
+
+#: lib/RT/CurrentUser.pm:112
+#. ($self->Id)
+msgid "Couldn't load %1 from the users database.\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load KeywordSelects."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load RT config file '%1' %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load Scrips."
+msgstr ""
+
+#: html/Admin/Groups/GroupRights.html:88 html/Admin/Groups/UserRights.html:75
+#. ($id)
+msgid "Couldn't load group %1"
+msgstr ""
+
+#: lib/RT/Link_Overlay.pm:175 lib/RT/Link_Overlay.pm:184 lib/RT/Link_Overlay.pm:211
+msgid "Couldn't load link"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:147 html/Admin/Queues/People.html:121
+#. ($id)
+msgid "Couldn't load queue"
+msgstr ""
+
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:72
+#. ($id)
+msgid "Couldn't load queue %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load template"
+msgstr ""
+
+#: html/Admin/Users/Prefs.html:79
+#. ($id)
+msgid "Couldn't load that user (%1)"
+msgstr ""
+
+#: html/SelfService/Display.html:109
+#. ($id)
+msgid "Couldn't load ticket '%1'"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:86 html/Admin/Users/Modify.html:149 html/User/Prefs.html:98
+msgid "Country"
+msgstr "�רץ"
+
+#: html/Admin/Elements/CreateUserCalled:26 html/Ticket/Create.html:135 html/Ticket/Create.html:195
+msgid "Create"
+msgstr "צור"
+
+#: etc/initialdata:128
+msgid "Create Tickets"
+msgstr "צור פניות"
+
+#: html/Admin/Elements/EditCustomField:75
+msgid "Create a CustomField"
+msgstr ""
+
+#: html/Admin/Queues/CustomField.html:48
+#. ($QueueObj->Name())
+msgid "Create a CustomField for queue %1"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:48
+msgid "Create a CustomField which applies to all queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new Custom Field"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global Scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global scrip"
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:67 html/Admin/Groups/Modify.html:93
+msgid "Create a new group"
+msgstr ""
+
+#: html/User/Groups/Modify.html:67 html/User/Groups/Modify.html:92
+msgid "Create a new personal group"
+msgstr "צור קבוצה פרטית חדשה"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new queue"
+msgstr "צור תור חדש"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new scrip"
+msgstr "צור סקריפ חדש"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new template"
+msgstr "צור תבנית חדשה"
+
+#: html/Ticket/Create.html:25 html/Ticket/Create.html:28 html/Ticket/Create.html:36
+msgid "Create a new ticket"
+msgstr "צור פנייה חדשה"
+
+#: html/Admin/Users/Modify.html:214 html/Admin/Users/Modify.html:241
+msgid "Create a new user"
+msgstr "צור משתמש חדש"
+
+#: html/Admin/Queues/Modify.html:103
+msgid "Create a queue"
+msgstr "צור תור חדש"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a queue called"
+msgstr "צור תור שנקר�"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a request"
+msgstr "צור בקשה"
+
+#: html/Admin/Queues/Scrip.html:59
+#. ($QueueObj->Name)
+msgid "Create a scrip for queue %1"
+msgstr ""
+
+#: html/Admin/Global/Template.html:69 html/Admin/Queues/Template.html:65
+msgid "Create a template"
+msgstr ""
+
+#: html/SelfService/Create.html:25
+msgid "Create a ticket"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1 / %2 / %3 "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1/%2/%3"
+msgstr ""
+
+#: etc/initialdata:130
+msgid "Create new tickets based on this scrip's template"
+msgstr ""
+
+#: html/SelfService/Create.html:78
+msgid "Create ticket"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "Create tickets in this queue"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "Create, delete and modify custom fields"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "Create, delete and modify queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
+msgstr ""
+
+#: lib/RT/System.pm:59
+msgid "Create, delete and modify the members of personal groups"
+msgstr ""
+
+#: lib/RT/System.pm:60
+msgid "Create, delete and modify users"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "CreateTicket"
+msgstr ""
+
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1167
+msgid "Created"
+msgstr "נוצר"
+
+#: html/Admin/Elements/EditCustomField:88
+#. ($CustomFieldObj->Name())
+msgid "Created CustomField %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Created template %1"
+msgstr ""
+
+#: html/Ticket/Elements/EditLinks:28
+msgid "Current Relationships"
+msgstr "יחסי� נוכחיי�"
+
+#: html/Admin/Elements/EditScrips:30
+msgid "Current Scrips"
+msgstr ""
+
+#: html/Admin/Groups/Members.html:39 html/User/Groups/Members.html:42
+msgid "Current members"
+msgstr ""
+
+#: html/Admin/Elements/SelectRights:29
+msgid "Current rights"
+msgstr ""
+
+#: html/Search/Listing.html:71
+msgid "Current search criteria"
+msgstr "קריטריוני החיפוש הנוכחיי�"
+
+#: html/Admin/Queues/People.html:41 html/Ticket/Elements/EditPeople:45
+msgid "Current watchers"
+msgstr "צופי� נוכחיי�"
+
+#: html/Admin/Global/CustomField.html:55
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:53 html/Admin/Elements/SystemTabs:40 html/Admin/Global/index.html:50 html/Ticket/Elements/ShowSummary:36
+msgid "Custom Fields"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:73
+msgid "Custom action cleanup code"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:65
+msgid "Custom action preparation code"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:49
+msgid "Custom condition"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1618
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
+msgid "Custom field %1 %2 %3"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1613
+#. ($CF->Name)
+msgid "Custom field %1 has a value."
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1610
+#. ($CF->Name)
+msgid "Custom field %1 has no value."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3427
+#. ($args{'Field'})
+msgid "Custom field %1 not found"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:197
+msgid "Custom field deleted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3577
+msgid "Custom field not found"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:350
+#. ($args{'Content'}, $self->Name)
+msgid "Custom field value %1 could not be found for custom field %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Custom field value changed from %1 to %2"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:250
+msgid "Custom field value could not be deleted"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:356
+msgid "Custom field value could not be found"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:248 lib/RT/CustomField_Overlay.pm:358
+msgid "Custom field value deleted"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:548
+msgid "CustomField"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Data error"
+msgstr ""
+
+#: html/SelfService/Display.html:39 html/Ticket/Create.html:161 html/Ticket/Elements/ShowSummary:55 html/Ticket/Elements/Tabs:93 html/Ticket/ModifyAll.html:44
+msgid "Dates"
+msgstr "ת�ריכי�"
+
+#: lib/RT/Date.pm:422
+msgid "Dec."
+msgstr "דצמבר"
+
+#: NOT FOUND IN SOURCE
+msgid "December"
+msgstr "דצמבר"
+
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr ""
+
+#: etc/initialdata:207
+msgid "Default Autoresponse template"
+msgstr ""
+
+#: etc/initialdata:281
+msgid "Default admin comment template"
+msgstr ""
+
+#: etc/initialdata:260
+msgid "Default admin correspondence template"
+msgstr ""
+
+#: etc/initialdata:272
+msgid "Default correspondence template"
+msgstr ""
+
+#: etc/initialdata:238
+msgid "Default transaction template"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:643
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr ""
+
+#: html/User/Delegation.html:25 html/User/Delegation.html:28
+msgid "Delegate rights"
+msgstr ""
+
+#: lib/RT/System.pm:63
+msgid "Delegate specific rights which have been granted to you."
+msgstr ""
+
+#: lib/RT/System.pm:63
+msgid "DelegateRights"
+msgstr ""
+
+#: html/User/Elements/Tabs:38
+msgid "Delegation"
+msgstr "דלגציות"
+
+#: NOT FOUND IN SOURCE
+msgid "Delete"
+msgstr "מחק"
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "Delete tickets"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "DeleteTicket"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:187
+msgid "Deleting this object could break referential integrity"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:292
+msgid "Deleting this object would break referential integrity"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:438
+msgid "Deleting this object would violate referential integrity"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity. That's bad."
+msgstr ""
+
+#: html/Approvals/Elements/Approve:45
+msgid "Deny"
+msgstr ""
+
+#: html/Ticket/Create.html:181 html/Ticket/Elements/EditLinks:123 html/Ticket/Elements/EditLinks:47 html/Ticket/Elements/ShowDependencies:32 html/Ticket/Elements/ShowLinks:37
+msgid "Depended on by"
+msgstr "תלויי� בו"
+
+#: NOT FOUND IN SOURCE
+msgid "Dependencies: \\n"
+msgstr ""
+
+#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:180 html/Ticket/Elements/EditLinks:119 html/Ticket/Elements/EditLinks:36 html/Ticket/Elements/ShowDependencies:25 html/Ticket/Elements/ShowLinks:27
+msgid "Depends on"
+msgstr "תלוי ב"
+
+#: NOT FOUND IN SOURCE
+msgid "DependsOn"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:35
+msgid "Descending"
+msgstr "יורד"
+
+#: html/SelfService/Create.html:73 html/Ticket/Create.html:119
+msgid "Describe the issue below"
+msgstr ""
+
+#: html/Admin/Elements/AddCustomFieldValue:37 html/Admin/Elements/EditCustomField:39 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyQueue:36 html/Admin/Elements/ModifyTemplate:36 html/Admin/Groups/Modify.html:49 html/Admin/Queues/Modify.html:48 html/Elements/SelectGroups:27 html/User/Groups/Modify.html:49
+msgid "Description"
+msgstr "תי�ור"
+
+#: NOT FOUND IN SOURCE
+msgid "Details"
+msgstr "פרטי�"
+
+#: html/Ticket/Elements/Tabs:85
+msgid "Display"
+msgstr "הצג"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "Display Access Control List"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "Display Scrip templates for this queue"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "Display Scrips for this queue"
+msgstr ""
+
+#: html/Ticket/Elements/ShowHistory:35
+msgid "Display mode"
+msgstr "מצב תצוגה"
+
+#: NOT FOUND IN SOURCE
+msgid "Display ticket #%1"
+msgstr "הצג פנייה #%1"
+
+#: lib/RT/System.pm:54
+msgid "Do anything and everything"
+msgstr ""
+
+#: html/Elements/Refresh:30
+msgid "Don't refresh this page."
+msgstr "�ל תרענן דף זה."
+
+#: html/Search/Elements/PickRestriction:114
+msgid "Don't show search results"
+msgstr "�ל תר�ה �ת תוצ�ות החיפוש"
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "Download"
+msgstr "הורד"
+
+#: html/Elements/SelectDateType:32 html/Ticket/Create.html:167 html/Ticket/Elements/EditDates:45 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1171
+msgid "Due"
+msgstr "ת�ריך יעד"
+
+#: NOT FOUND IN SOURCE
+msgid "Due date '%1' could not be parsed"
+msgstr ""
+
+#: bin/rt-commit-handler:754
+#. ($1, $msg)
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit Conditions"
+msgstr ""
+
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr ""
+
+#: html/Ticket/ModifyLinks.html:36
+msgid "Edit Relationships"
+msgstr ""
+
+#: html/Admin/Queues/Templates.html:42
+#. ($QueueObj->Name)
+msgid "Edit Templates for queue %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit keywords"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr ""
+
+#: html/Admin/Global/index.html:46
+msgid "Edit system templates"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit templates for %1"
+msgstr ""
+
+#: html/Admin/Elements/ModifyQueue:25 html/Admin/Queues/Modify.html:118
+#. ($QueueObj->Name)
+#. ($QueueObj->Id)
+msgid "Editing Configuration for queue %1"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:25
+#. ($UserObj->Name)
+msgid "Editing Configuration for user %1"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:91
+#. ($CustomFieldObj->Name())
+msgid "Editing CustomField %1"
+msgstr ""
+
+#: html/Admin/Groups/Members.html:32
+#. ($Group->Name)
+msgid "Editing membership for group %1"
+msgstr ""
+
+#: html/User/Groups/Members.html:129
+#. ($Group->Name)
+msgid "Editing membership for personal group %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Editing template %1"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2622 lib/RT/Ticket_Overlay.pm:2690
+msgid "Either base or target must be specified"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:53 html/Admin/Users/Prefs.html:46 html/Elements/SelectUsers:27 html/Ticket/Elements/AddWatchers:56 html/User/Prefs.html:42
+msgid "Email"
+msgstr "�י-מייל"
+
+#: lib/RT/User_Overlay.pm:188
+msgid "Email address in use"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:42
+msgid "EmailAddress"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:54
+msgid "EmailEncoding"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:51
+msgid "Enabled (Unchecking this box disables this custom field)"
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:53 html/User/Groups/Modify.html:53
+msgid "Enabled (Unchecking this box disables this group)"
+msgstr "מופעל (מחיקת סימון תיבה זו מבטלת �ת קבוצה זו)"
+
+#: html/Admin/Queues/Modify.html:84
+msgid "Enabled (Unchecking this box disables this queue)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:99
+msgid "Enabled Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:56
+msgid "Enabled Queues"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:107 html/Admin/Groups/Modify.html:117 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:283 html/User/Groups/Modify.html:117
+#. (loc_fuzzy($msg))
+msgid "Enabled status %1"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:428
+msgid "Enter multiple values"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:425
+msgid "Enter one value"
+msgstr ""
+
+#: html/Ticket/Elements/EditLinks:112
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "הכנס פניות �ו כתובות כדי לקשר פניות �ליהן. הפרד ערכי� רבי� ב�מצעות רווחי�."
+
+#: html/Elements/Login:39 html/SelfService/Error.html:25 html/SelfService/Error.html:26
+msgid "Error"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Error adding watcher"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:555
+msgid "Error in parameters to Queue->AddWatcher"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:713
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1356
+msgid "Error in parameters to Ticket->AddWatcher"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1532
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr ""
+
+#: etc/initialdata:20
+msgid "Everyone"
+msgstr ""
+
+#: bin/rt-crontool:194
+msgid "Example:"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:64
+msgid "ExternalAuthId"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:58
+msgid "ExternalContactInfoId"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:73
+msgid "Extra info"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:302
+msgid "Failed to find 'Privileged' users pseudogroup."
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:309
+msgid "Failed to find 'Unprivileged' users pseudogroup"
+msgstr ""
+
+#: bin/rt-crontool:138
+#. ($modname, $@)
+msgid "Failed to load module %1. (%2)"
+msgstr ""
+
+#: lib/RT/Date.pm:412
+msgid "Feb."
+msgstr "פברו�ר"
+
+#: NOT FOUND IN SOURCE
+msgid "February"
+msgstr "פברו�ר"
+
+#: NOT FOUND IN SOURCE
+msgid "Fin"
+msgstr ""
+
+#: html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:59 lib/RT/Tickets_Overlay.pm:1091
+msgid "Final Priority"
+msgstr "עדיפות סופית"
+
+#: lib/RT/Ticket_Overlay.pm:1162
+msgid "FinalPriority"
+msgstr ""
+
+#: html/Admin/Queues/People.html:61 html/Ticket/Elements/EditPeople:34
+msgid "Find group whose"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Find new/open tickets"
+msgstr ""
+
+#: html/Admin/Queues/People.html:57 html/Admin/Users/index.html:46 html/Ticket/Elements/EditPeople:30
+msgid "Find people whose"
+msgstr "מצ� �נשי� ש"
+
+#: html/Search/Listing.html:108
+msgid "Find tickets"
+msgstr "מצ� פניות"
+
+#: NOT FOUND IN SOURCE
+msgid "Finish Approval"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:58
+msgid "First"
+msgstr ""
+
+#: html/Search/Listing.html:41
+msgid "First page"
+msgstr "עמוד ר�שון"
+
+#: docs/design_docs/string-extraction-guide.txt:33
+msgid "Foo Bar Baz"
+msgstr ""
+
+#: docs/design_docs/string-extraction-guide.txt:24
+msgid "Foo!"
+msgstr ""
+
+#: html/Search/Bulk.html:87
+msgid "Force change"
+msgstr "הכרח שינוי"
+
+#: html/Search/Listing.html:106
+#. ($ticketcount)
+msgid "Found %quant(%1,ticket)"
+msgstr "נמצ�ו %1 פניות"
+
+#: lib/RT/Interface/Web.pm:902
+msgid "Found Object"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:44
+msgid "FreeformContactInfo"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:38
+msgid "FreeformMultiple"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformSingle"
+msgstr ""
+
+#: lib/RT/Date.pm:392
+msgid "Fri."
+msgstr "שישי"
+
+#: html/Ticket/Elements/ShowHistory:41 html/Ticket/Elements/ShowHistory:51
+msgid "Full headers"
+msgstr "כותרי� מל�י�"
+
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:593
+#. ($New->Name)
+msgid "Given to %1"
+msgstr ""
+
+#: html/Admin/Elements/Tabs:41 html/Admin/index.html:38
+msgid "Global"
+msgstr "גלוב�לי"
+
+#: NOT FOUND IN SOURCE
+msgid "Global Keyword Selections"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
+msgstr ""
+
+#: html/Admin/Elements/SelectTemplate:38
+#. (loc($Template->Name))
+msgid "Global template: %1"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:75 html/Admin/Queues/People.html:59 html/Admin/Queues/People.html:63 html/Admin/Queues/index.html:44 html/Admin/Users/index.html:49 html/Ticket/Elements/EditPeople:32 html/Ticket/Elements/EditPeople:36 html/index.html:41
+msgid "Go!"
+msgstr "חפש"
+
+#: NOT FOUND IN SOURCE
+msgid "Good pgp sig from %1\\n"
+msgstr ""
+
+#: html/Search/Listing.html:50
+msgid "Goto page"
+msgstr ""
+
+#: html/Elements/GotoTicket:25 html/SelfService/Elements/GotoTicket:25
+msgid "Goto ticket"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Grand"
+msgstr ""
+
+#: html/Ticket/Elements/AddWatchers:46 html/User/Elements/DelegateRights:78
+msgid "Group"
+msgstr "קבוצה"
+
+#: NOT FOUND IN SOURCE
+msgid "Group %1 %2: %3"
+msgstr "קבוצה %1 %2: %3"
+
+#: html/Admin/Elements/GroupTabs:45 html/Admin/Elements/QueueTabs:57 html/Admin/Elements/SystemTabs:44 html/Admin/Global/index.html:55
+msgid "Group Rights"
+msgstr "זכויות קבוצה"
+
+#: lib/RT/Group_Overlay.pm:965
+msgid "Group already has member"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Group could not be created."
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:77
+#. ($create_msg)
+msgid "Group could not be created: %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:497
+msgid "Group created"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:1133
+msgid "Group has no such member"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:945 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1429 lib/RT/Ticket_Overlay.pm:1507
+msgid "Group not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Group not found.\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Group not specified.\\n"
+msgstr ""
+
+#: html/Admin/Elements/SelectNewGroupMembers:35 html/Admin/Elements/Tabs:35 html/Admin/Groups/Members.html:64 html/Admin/Queues/People.html:83 html/Admin/index.html:32 html/User/Groups/Members.html:67
+msgid "Groups"
+msgstr "קבוצות"
+
+#: lib/RT/Group_Overlay.pm:971
+msgid "Groups can't be members of their members"
+msgstr ""
+
+#: lib/RT/Interface/CLI.pm:73 lib/RT/Interface/CLI.pm:73
+msgid "Hello!"
+msgstr ""
+
+#: docs/design_docs/string-extraction-guide.txt:40
+#. ($name)
+msgid "Hello, %1"
+msgstr ""
+
+#: html/Ticket/Elements/ShowHistory:30 html/Ticket/Elements/Tabs:88
+msgid "History"
+msgstr "הסטוריה"
+
+#: html/Admin/Elements/ModifyUser:68
+msgid "HomePhone"
+msgstr ""
+
+#: html/Elements/Tabs:44
+msgid "Homepage"
+msgstr "דף הבית"
+
+#: lib/RT/Base.pm:74
+#. (6)
+msgid "I have %quant(%1,concrete mixer)."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:27 lib/RT/Tickets_Overlay.pm:1018
+msgid "Id"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:44 html/User/Prefs.html:39
+msgid "Identity"
+msgstr "זהות"
+
+#: etc/upgrade/2.1.71:86
+msgid "If an approval is rejected, reject the original and delete pending approvals"
+msgstr ""
+
+#: bin/rt-crontool:190
+msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
+msgstr ""
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
+msgid "If you've updated anything above, be sure to"
+msgstr "�� עדכנת משהו לעיל, �ל תשכח ל"
+
+#: lib/RT/Interface/Web.pm:894
+msgid "Illegal value for %1"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:897
+msgid "Immutable field"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:74
+msgid "Include disabled custom fields in listing."
+msgstr ""
+
+#: html/Admin/Queues/index.html:43
+msgid "Include disabled queues in listing."
+msgstr ""
+
+#: html/Admin/Users/index.html:47
+msgid "Include disabled users in search."
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1067
+msgid "Initial Priority"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1161 lib/RT/Ticket_Overlay.pm:1163
+msgid "InitialPriority"
+msgstr ""
+
+#: lib/RT/ScripAction_Overlay.pm:105
+msgid "Input error"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Interest noted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3796
+msgid "Internal Error"
+msgstr ""
+
+#: lib/RT/Record.pm:143
+#. ($id->{error_message})
+msgid "Internal Error: %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:644
+msgid "Invalid Group Type"
+msgstr ""
+
+#: lib/RT/Principal_Overlay.pm:128
+msgid "Invalid Right"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Invalid Type"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:899
+msgid "Invalid data"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:439
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr ""
+
+#: lib/RT/Scrip_Overlay.pm:134 lib/RT/Template_Overlay.pm:251
+msgid "Invalid queue"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:244 lib/RT/ACE_Overlay.pm:253 lib/RT/ACE_Overlay.pm:259 lib/RT/ACE_Overlay.pm:270 lib/RT/ACE_Overlay.pm:275
+msgid "Invalid right"
+msgstr ""
+
+#: lib/RT/Record.pm:118
+#. ($key)
+msgid "Invalid value for %1"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3434
+msgid "Invalid value for custom field"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:346
+msgid "Invalid value for status"
+msgstr ""
+
+#: bin/rt-crontool:191
+msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
+msgstr ""
+
+#: bin/rt-crontool:192
+msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
+msgstr ""
+
+#: bin/rt-crontool:163
+msgid "It takes several arguments:"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
+msgstr ""
+
+#: lib/RT/Date.pm:411
+msgid "Jan."
+msgstr "ינו�ר"
+
+#: NOT FOUND IN SOURCE
+msgid "January"
+msgstr "ינו�ר"
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "Join or leave this group"
+msgstr ""
+
+#: lib/RT/Date.pm:417
+msgid "Jul."
+msgstr "יולי"
+
+#: NOT FOUND IN SOURCE
+msgid "July"
+msgstr "יולי"
+
+#: html/Ticket/Elements/Tabs:99
+msgid "Jumbo"
+msgstr "ג'מבו"
+
+#: lib/RT/Date.pm:416
+msgid "Jun."
+msgstr "יוני"
+
+#: NOT FOUND IN SOURCE
+msgid "June"
+msgstr "יוני"
+
+#: NOT FOUND IN SOURCE
+msgid "Keyword"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:52
+msgid "Lang"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:73
+msgid "Last"
+msgstr ""
+
+#: html/Ticket/Elements/EditDates:38 html/Ticket/Elements/ShowDates:39
+msgid "Last Contact"
+msgstr "מגע �חרון"
+
+#: html/Elements/SelectDateType:29
+msgid "Last Contacted"
+msgstr "קשר �חרון"
+
+#: html/Search/Elements/TicketHeader:41
+msgid "Last Notified"
+msgstr "נודע ל�חרונה"
+
+#: html/Elements/SelectDateType:30
+msgid "Last Updated"
+msgstr "עדכון �חרון"
+
+#: NOT FOUND IN SOURCE
+msgid "LastUpdated"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Left"
+msgstr "נותרה"
+
+#: html/Admin/Users/Modify.html:83
+msgid "Let this user access RT"
+msgstr "תן למשתמש זה לגשת ל R"
+
+#: html/Admin/Users/Modify.html:87
+msgid "Let this user be granted rights"
+msgstr "תן �פשרות להעניק זכויות למשתמש זה"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting owner to %1 %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting queue to %1 %2"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2704
+msgid "Link already exists"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2716
+msgid "Link could not be created"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2724 lib/RT/Ticket_Overlay.pm:2734
+#. ($TransString)
+msgid "Link created (%1)"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2645
+#. ($TransString)
+msgid "Link deleted (%1)"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2651
+msgid "Link not found"
+msgstr ""
+
+#: html/Ticket/ModifyLinks.html:25 html/Ticket/ModifyLinks.html:29
+#. ($Ticket->Id)
+msgid "Link ticket #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Link ticket %1"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:97
+msgid "Links"
+msgstr "קישורי�"
+
+#: html/Admin/Users/Modify.html:114 html/User/Prefs.html:85
+msgid "Location"
+msgstr "מיקו�"
+
+#: lib/RT.pm:159
+#. ($RT::LogDir)
+msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
+msgstr ""
+
+#: html/Elements/Header:57
+#. ("<b>".$session{'CurrentUser'}->Name."</b>")
+msgid "Logged in as %1"
+msgstr "מחובר כ %1"
+
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54
+msgid "Login"
+msgstr "כניסה"
+
+#: html/Elements/Header:54
+msgid "Logout"
+msgstr "יצי�ה"
+
+#: html/Search/Bulk.html:86
+msgid "Make Owner"
+msgstr "שנה בעלות ל"
+
+#: html/Search/Bulk.html:102
+msgid "Make Status"
+msgstr "שנה סטטוס"
+
+#: html/Search/Bulk.html:109
+msgid "Make date Due"
+msgstr "שנה ת�ריך יעד"
+
+#: html/Search/Bulk.html:110
+msgid "Make date Resolved"
+msgstr "שנה ת�ריך פתרון"
+
+#: html/Search/Bulk.html:107
+msgid "Make date Started"
+msgstr "שנה ת�ריך 'הותחל'"
+
+#: html/Search/Bulk.html:106
+msgid "Make date Starts"
+msgstr "שנה ת�ריך התחלה"
+
+#: html/Search/Bulk.html:108
+msgid "Make date Told"
+msgstr "שנע ת�ריך מגע �חרון"
+
+#: html/Search/Bulk.html:99
+msgid "Make priority"
+msgstr "שנה עדיפות"
+
+#: html/Search/Bulk.html:100
+msgid "Make queue"
+msgstr "שנה תור"
+
+#: html/Search/Bulk.html:98
+msgid "Make subject"
+msgstr "שנה נוש�"
+
+#: html/Admin/index.html:33
+msgid "Manage groups and group membership"
+msgstr "נהל קבוצות וחברות בקבוצות"
+
+#: html/Admin/index.html:39
+msgid "Manage properties and configuration which apply to all queues"
+msgstr "נהל מ�פייני� והגדרות שתקפי� לכל התורות"
+
+#: html/Admin/index.html:36
+msgid "Manage queues and queue-specific properties"
+msgstr "נהל תורות ומ�פייני� ספציפיי� לתורות"
+
+#: html/Admin/index.html:30
+msgid "Manage users and passwords"
+msgstr "נהל משתמשי� וספריות"
+
+#: lib/RT/Date.pm:413
+msgid "Mar."
+msgstr "מרץ"
+
+#: NOT FOUND IN SOURCE
+msgid "March"
+msgstr "מרץ"
+
+#: NOT FOUND IN SOURCE
+msgid "May"
+msgstr "מ�י"
+
+#: lib/RT/Date.pm:415
+msgid "May."
+msgstr "מ�י"
+
+#: lib/RT/Group_Overlay.pm:982
+msgid "Member added"
+msgstr "חבר הוסף"
+
+#: lib/RT/Group_Overlay.pm:1140
+msgid "Member deleted"
+msgstr "חבר נמחק"
+
+#: lib/RT/Group_Overlay.pm:1144
+msgid "Member not deleted"
+msgstr "חבר ל� נמחק"
+
+#: html/Elements/SelectLinkType:26
+msgid "Member of"
+msgstr "חבר ב"
+
+#: NOT FOUND IN SOURCE
+msgid "MemberOf"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:42 html/User/Elements/GroupTabs:42
+msgid "Members"
+msgstr "חברי�"
+
+#: lib/RT/Ticket_Overlay.pm:2891
+msgid "Merge Successful"
+msgstr "מיזוג הצליח"
+
+#: lib/RT/Ticket_Overlay.pm:2811
+msgid "Merge failed. Couldn't set EffectiveId"
+msgstr "מיזוג נכשל. ל� יכולתי להגדיר מזהה �פקטיבי"
+
+#: html/Ticket/Elements/EditLinks:115
+msgid "Merge into"
+msgstr "מזג לתוך"
+
+#: html/Ticket/Update.html:102
+msgid "Message"
+msgstr "הודעה"
+
+#: lib/RT/Interface/Web.pm:901
+msgid "Missing a primary key?: %1"
+msgstr "חסר מפתח ר�שי?: %1"
+
+#: html/Admin/Users/Modify.html:169 html/User/Prefs.html:54
+msgid "Mobile"
+msgstr "נייד"
+
+#: html/Admin/Elements/ModifyUser:72
+msgid "MobilePhone"
+msgstr "טלפון נייד"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "Modify Access Control List"
+msgstr "שנה רשימת בקרת גישה"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Field %1"
+msgstr ""
+
+#: html/Admin/Global/CustomFields.html:44 html/Admin/Global/index.html:51
+msgid "Modify Custom Fields which apply to all queues"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "Modify Scrip templates for this queue"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "Modify Scrips for this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify System ACLS"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Template %1"
+msgstr ""
+
+#: html/Admin/Queues/CustomField.html:45
+#. ($QueueObj->Name())
+msgid "Modify a CustomField for queue %1"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:53
+msgid "Modify a CustomField which applies to all queues"
+msgstr ""
+
+#: html/Admin/Queues/Scrip.html:54
+#. ($QueueObj->Name)
+msgid "Modify a scrip for queue %1"
+msgstr ""
+
+#: html/Admin/Global/Scrip.html:48
+msgid "Modify a scrip which applies to all queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify dates for # %1"
+msgstr ""
+
+#: html/Ticket/ModifyDates.html:25 html/Ticket/ModifyDates.html:29
+#. ($TicketObj->Id)
+msgid "Modify dates for #%1"
+msgstr ""
+
+#: html/Ticket/ModifyDates.html:35
+#. ($TicketObj->Id)
+msgid "Modify dates for ticket # %1"
+msgstr ""
+
+#: html/Admin/Global/GroupRights.html:25 html/Admin/Global/GroupRights.html:28 html/Admin/Global/index.html:56
+msgid "Modify global group rights"
+msgstr ""
+
+#: html/Admin/Global/GroupRights.html:33
+msgid "Modify global group rights."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for groups"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for users"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global scrips"
+msgstr ""
+
+#: html/Admin/Global/UserRights.html:25 html/Admin/Global/UserRights.html:28 html/Admin/Global/index.html:60
+msgid "Modify global user rights"
+msgstr ""
+
+#: html/Admin/Global/UserRights.html:33
+msgid "Modify global user rights."
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "Modify group metadata or delete group"
+msgstr ""
+
+#: html/Admin/Groups/GroupRights.html:25 html/Admin/Groups/GroupRights.html:29 html/Admin/Groups/GroupRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify group rights for group %1"
+msgstr ""
+
+#: html/Admin/Queues/GroupRights.html:25 html/Admin/Queues/GroupRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify group rights for queue %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "Modify membership roster for this group"
+msgstr ""
+
+#: lib/RT/System.pm:61
+msgid "Modify one's own RT account"
+msgstr ""
+
+#: html/Admin/Queues/People.html:25 html/Admin/Queues/People.html:29
+#. ($QueueObj->Name)
+msgid "Modify people related to queue %1"
+msgstr ""
+
+#: html/Ticket/ModifyPeople.html:25 html/Ticket/ModifyPeople.html:29 html/Ticket/ModifyPeople.html:35
+#. ($Ticket->id)
+#. ($Ticket->Id)
+msgid "Modify people related to ticket #%1"
+msgstr ""
+
+#: html/Admin/Queues/Scrips.html:44
+#. ($QueueObj->Name)
+msgid "Modify scrips for queue %1"
+msgstr ""
+
+#: html/Admin/Global/Scrips.html:44 html/Admin/Global/index.html:42
+msgid "Modify scrips which apply to all queues"
+msgstr ""
+
+#: html/Admin/Global/Template.html:25 html/Admin/Global/Template.html:30 html/Admin/Global/Template.html:81 html/Admin/Queues/Template.html:78
+#. (loc($TemplateObj->Name()))
+#. ($TemplateObj->id)
+msgid "Modify template %1"
+msgstr ""
+
+#: html/Admin/Global/Templates.html:44
+msgid "Modify templates which apply to all queues"
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:87 html/User/Groups/Modify.html:86
+#. ($Group->Name)
+msgid "Modify the group %1"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "Modify the queue watchers"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:236
+#. ($UserObj->Name)
+msgid "Modify the user %1"
+msgstr ""
+
+#: html/Ticket/ModifyAll.html:37
+#. ($Ticket->Id)
+msgid "Modify ticket # %1"
+msgstr "שנה פנייה מספר %1"
+
+#: html/Ticket/Modify.html:25 html/Ticket/Modify.html:28 html/Ticket/Modify.html:34
+#. ($TicketObj->Id)
+msgid "Modify ticket #%1"
+msgstr "שינוי פנוייה מספר %1"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "Modify tickets"
+msgstr "שינוי פניות"
+
+#: html/Admin/Groups/UserRights.html:25 html/Admin/Groups/UserRights.html:29 html/Admin/Groups/UserRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify user rights for group %1"
+msgstr ""
+
+#: html/Admin/Queues/UserRights.html:25 html/Admin/Queues/UserRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify user rights for queue %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify watchers for queue '%1'"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ModifyACL"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "ModifyOwnMembership"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "ModifyQueueWatchers"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "ModifyScrips"
+msgstr ""
+
+#: lib/RT/System.pm:61
+msgid "ModifySelf"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "ModifyTemplate"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "ModifyTicket"
+msgstr ""
+
+#: lib/RT/Date.pm:388
+msgid "Mon."
+msgstr "שני"
+
+#: html/Ticket/Elements/ShowRequestor:42
+#. ($name)
+msgid "More about %1"
+msgstr "עוד לגבי %1"
+
+#: html/Admin/Elements/EditCustomFields:61
+msgid "Move down"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:53
+msgid "Move up"
+msgstr ""
+
+#: html/Admin/Elements/SelectSingleOrMultiple:27
+msgid "Multiple"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:179
+msgid "Must specify 'Name' attribute"
+msgstr ""
+
+#: html/SelfService/Elements/MyRequests:49
+#. ($friendly_status)
+msgid "My %1 tickets"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "My Approvals"
+msgstr "ה�ישורי� שלי"
+
+#: html/Approvals/index.html:25 html/Approvals/index.html:26
+msgid "My approvals"
+msgstr "ה�ישורי� שלי"
+
+#: html/Admin/Elements/AddCustomFieldValue:33 html/Admin/Elements/EditCustomField:34 html/Admin/Elements/ModifyTemplate:28 html/Admin/Elements/ModifyUser:30 html/Admin/Groups/Modify.html:44 html/Elements/SelectGroups:26 html/Elements/SelectUsers:28 html/User/Groups/Modify.html:44
+msgid "Name"
+msgstr "ש�"
+
+#: lib/RT/User_Overlay.pm:186
+msgid "Name in use"
+msgstr "ש� בשימוש"
+
+#: NOT FOUND IN SOURCE
+msgid "Need approval from system administrator"
+msgstr ""
+
+#: html/Ticket/Elements/ShowDates:52
+msgid "Never"
+msgstr ""
+
+#: html/Elements/Quicksearch:30
+msgid "New"
+msgstr "חדש"
+
+#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:93 html/User/Prefs.html:65
+msgid "New Password"
+msgstr "סיסמ� חדשה"
+
+#: etc/initialdata:317 etc/upgrade/2.1.71:16
+msgid "New Pending Approval"
+msgstr ""
+
+#: html/Ticket/Elements/EditLinks:111
+msgid "New Relationships"
+msgstr "יחסי� חדשי�"
+
+#: html/Ticket/Elements/Tabs:36
+msgid "New Search"
+msgstr "חיפוש חדש"
+
+#: html/Admin/Global/CustomField.html:41 html/Admin/Global/CustomFields.html:39 html/Admin/Queues/CustomField.html:52 html/Admin/Queues/CustomFields.html:40
+msgid "New custom field"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:54 html/User/Elements/GroupTabs:52
+msgid "New group"
+msgstr "קבוצה חדשה"
+
+#: html/SelfService/Prefs.html:32
+msgid "New password"
+msgstr "סיסמ� חדשה"
+
+#: lib/RT/User_Overlay.pm:647
+msgid "New password notification sent"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:70
+msgid "New queue"
+msgstr "תור חדש"
+
+#: NOT FOUND IN SOURCE
+msgid "New request"
+msgstr "בקשה חדשה"
+
+#: html/Admin/Elements/SelectRights:42
+msgid "New rights"
+msgstr "זכויות חדשות"
+
+#: html/Admin/Global/Scrip.html:40 html/Admin/Global/Scrips.html:39 html/Admin/Queues/Scrip.html:43 html/Admin/Queues/Scrips.html:53
+msgid "New scrip"
+msgstr "סקריפ חדש"
+
+#: NOT FOUND IN SOURCE
+msgid "New search"
+msgstr "חיפוש חדש"
+
+#: html/Admin/Global/Template.html:60 html/Admin/Global/Templates.html:39 html/Admin/Queues/Template.html:58 html/Admin/Queues/Templates.html:50
+msgid "New template"
+msgstr "תבנית חדשה"
+
+#: html/SelfService/Elements/Tabs:48
+msgid "New ticket"
+msgstr "פנייה חדשה"
+
+#: lib/RT/Ticket_Overlay.pm:2778
+msgid "New ticket doesn't exist"
+msgstr "פנייה חדשה ל� קיימת"
+
+#: html/Admin/Elements/UserTabs:52
+msgid "New user"
+msgstr "משתמש חדש"
+
+#: html/Admin/Elements/CreateUserCalled:26
+msgid "New user called"
+msgstr "משתמש חדש שנקר�"
+
+#: html/Admin/Queues/People.html:55 html/Ticket/Elements/EditPeople:29
+msgid "New watchers"
+msgstr "צופי� חדשי�"
+
+#: html/Admin/Users/Prefs.html:42
+msgid "New window setting"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:69
+msgid "Next"
+msgstr "הב�"
+
+#: html/Search/Listing.html:48
+msgid "Next page"
+msgstr "דף הב�"
+
+#: html/Admin/Elements/ModifyUser:50
+msgid "NickName"
+msgstr "כינוי"
+
+#: html/Admin/Users/Modify.html:63 html/User/Prefs.html:46
+msgid "Nickname"
+msgstr "כינוי"
+
+#: html/Admin/Elements/EditCustomField:90 html/Admin/Elements/EditCustomFields:105
+msgid "No CustomField"
+msgstr ""
+
+#: html/Admin/Groups/GroupRights.html:84 html/Admin/Groups/UserRights.html:71
+msgid "No Group defined"
+msgstr ""
+
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:68
+msgid "No Queue defined"
+msgstr ""
+
+#: bin/rt-crontool:56
+msgid "No RT user found. Please consult your RT administrator.\\n"
+msgstr ""
+
+#: html/Admin/Global/Template.html:79 html/Admin/Queues/Template.html:76
+msgid "No Template"
+msgstr ""
+
+#: bin/rt-commit-handler:764
+msgid "No Ticket specified. Aborting ticket "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:46
+msgid "No action"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:896
+msgid "No column specified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "No command found\\n"
+msgstr ""
+
+#: html/Elements/ViewUser:36 html/Ticket/Elements/ShowRequestor:45
+msgid "No comment entered about this user"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2189 lib/RT/Ticket_Overlay.pm:2257
+msgid "No correspondence attached"
+msgstr ""
+
+#: lib/RT/Action/Generic.pm:150 lib/RT/Condition/Generic.pm:176 lib/RT/Search/ActiveTicketsInQueue.pm:56 lib/RT/Search/Generic.pm:113
+#. (ref $self)
+msgid "No description for %1"
+msgstr ""
+
+#: lib/RT/Users_Overlay.pm:145
+msgid "No group specified"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:865
+msgid "No password set"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:259
+msgid "No permission to create queues"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:342
+#. ($QueueObj->Name)
+msgid "No permission to create tickets in the queue '%1'"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:152
+msgid "No permission to create users"
+msgstr ""
+
+#: html/SelfService/Display.html:118
+msgid "No permission to display that ticket"
+msgstr ""
+
+#: html/SelfService/Update.html:52
+msgid "No permission to view update ticket"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1488
+msgid "No principal specified"
+msgstr ""
+
+#: html/Admin/Queues/People.html:154 html/Admin/Queues/People.html:164
+msgid "No principals selected."
+msgstr ""
+
+#: html/Admin/Queues/index.html:35
+msgid "No queues matching search criteria found."
+msgstr ""
+
+#: html/Admin/Elements/SelectRights:81
+msgid "No rights found"
+msgstr ""
+
+#: html/Admin/Elements/SelectRights:33
+msgid "No rights granted."
+msgstr ""
+
+#: html/Search/Bulk.html:149
+msgid "No search to operate on."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "No ticket id specified"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:478 lib/RT/Transaction_Overlay.pm:516
+msgid "No transaction type specified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "No user or email address specified"
+msgstr ""
+
+#: html/Admin/Users/index.html:36
+msgid "No users matching search criteria found."
+msgstr ""
+
+#: bin/rt-commit-handler:644
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:893
+msgid "No value sent to _Set!\\n"
+msgstr ""
+
+#: html/Search/Elements/TicketRow:37
+msgid "Nobody"
+msgstr "�ף �חד"
+
+#: lib/RT/Interface/Web.pm:898
+msgid "Nonexistant field?"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Not logged in"
+msgstr "ל� בתוך המערכת"
+
+#: html/Elements/Header:59
+msgid "Not logged in."
+msgstr "ל� בתוך המערכת."
+
+#: lib/RT/Date.pm:369
+msgid "Not set"
+msgstr "ל� הוזן"
+
+#: html/NoAuth/Reminder.html:27
+msgid "Not yet implemented."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Not yet implemented...."
+msgstr ""
+
+#: html/Approvals/Elements/Approve:49
+msgid "Notes"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:650
+msgid "Notification could not be sent"
+msgstr ""
+
+#: etc/initialdata:94
+msgid "Notify AdminCcs"
+msgstr ""
+
+#: etc/initialdata:90
+msgid "Notify AdminCcs as Comment"
+msgstr ""
+
+#: etc/initialdata:121
+msgid "Notify Other Recipients"
+msgstr ""
+
+#: etc/initialdata:117
+msgid "Notify Other Recipients as Comment"
+msgstr ""
+
+#: etc/initialdata:86
+msgid "Notify Owner"
+msgstr ""
+
+#: etc/initialdata:82
+msgid "Notify Owner as Comment"
+msgstr ""
+
+#: etc/initialdata:319 etc/upgrade/2.1.71:17
+msgid "Notify Owners and AdminCcs of new items pending their approval"
+msgstr ""
+
+#: etc/initialdata:78
+msgid "Notify Requestors"
+msgstr ""
+
+#: etc/initialdata:104
+msgid "Notify Requestors and Ccs"
+msgstr ""
+
+#: etc/initialdata:99
+msgid "Notify Requestors and Ccs as Comment"
+msgstr ""
+
+#: etc/initialdata:113
+msgid "Notify Requestors, Ccs and AdminCcs"
+msgstr ""
+
+#: etc/initialdata:109
+msgid "Notify Requestors, Ccs and AdminCcs as Comment"
+msgstr ""
+
+#: lib/RT/Date.pm:421
+msgid "Nov."
+msgstr "נובמבר"
+
+#: NOT FOUND IN SOURCE
+msgid "November"
+msgstr "נובמבר"
+
+#: lib/RT/Record.pm:157
+msgid "Object could not be created"
+msgstr ""
+
+#: lib/RT/Record.pm:176
+msgid "Object created"
+msgstr ""
+
+#: lib/RT/Date.pm:420
+msgid "Oct."
+msgstr "�וקטובר"
+
+#: NOT FOUND IN SOURCE
+msgid "October"
+msgstr "�וקטובר"
+
+#: html/Elements/SelectDateRelation:35
+msgid "On"
+msgstr "ב"
+
+#: etc/initialdata:155
+msgid "On Comment"
+msgstr ""
+
+#: etc/initialdata:148
+msgid "On Correspond"
+msgstr ""
+
+#: etc/initialdata:137
+msgid "On Create"
+msgstr ""
+
+#: etc/initialdata:169
+msgid "On Owner Change"
+msgstr ""
+
+#: etc/initialdata:177
+msgid "On Queue Change"
+msgstr ""
+
+#: etc/initialdata:183
+msgid "On Resolve"
+msgstr ""
+
+#: etc/initialdata:161
+msgid "On Status Change"
+msgstr ""
+
+#: etc/initialdata:142
+msgid "On Transaction"
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:50
+#. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
+msgid "Only show approvals for requests created after %1"
+msgstr "הצג רק �ישורי� עבור בקשות שנוצרו �חרי %1"
+
+#: html/Approvals/Elements/PendingMyApproval:48
+#. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
+msgid "Only show approvals for requests created before %1"
+msgstr "הצג רק �ישורי� עבור בקשות שנוצרו לפני %1"
+
+#: html/Elements/Quicksearch:31
+msgid "Open"
+msgstr "פתוח"
+
+#: html/Ticket/Elements/Tabs:136
+msgid "Open it"
+msgstr "פתח"
+
+#: NOT FOUND IN SOURCE
+msgid "Open requests"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:42
+msgid "Open tickets"
+msgstr ""
+
+#: html/Admin/Users/Prefs.html:41
+msgid "Open tickets (from listing) in a new window"
+msgstr ""
+
+#: html/Admin/Users/Prefs.html:40
+msgid "Open tickets (from listing) in another window"
+msgstr ""
+
+#: etc/initialdata:133
+msgid "Open tickets on correspondence"
+msgstr ""
+
+#: html/Search/Elements/PickRestriction:101
+msgid "Ordering and sorting"
+msgstr "סידור ומיון"
+
+#: html/Admin/Elements/ModifyUser:46 html/Admin/Users/Modify.html:117 html/Elements/SelectUsers:29 html/User/Prefs.html:86
+msgid "Organization"
+msgstr "�רגון"
+
+#: html/Approvals/Elements/Approve:33
+#. ($approving->Id, $approving->Subject)
+msgid "Originating ticket: #%1"
+msgstr ""
+
+#: html/Admin/Elements/ModifyQueue:55 html/Admin/Queues/Modify.html:69
+msgid "Over time, priority moves toward"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "Own tickets"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "OwnTicket"
+msgstr ""
+
+#: etc/initialdata:38 html/Elements/MyRequests:32 html/SelfService/Elements/MyRequests:30 html/Ticket/Create.html:48 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/EditPeople:44 html/Ticket/Elements/ShowPeople:27 html/Ticket/Update.html:63 lib/RT/ACE_Overlay.pm:86 lib/RT/Tickets_Overlay.pm:1244
+msgid "Owner"
+msgstr "בעלי�"
+
+#: lib/RT/Ticket_Overlay.pm:3071
+#. ($OldOwnerObj->Name,  $NewOwnerObj->Name)
+msgid "Owner changed from %1 to %2"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:582
+#. ($Old->Name , $New->Name)
+msgid "Owner forcibly changed from %1 to %2"
+msgstr ""
+
+#: html/Search/Elements/PickRestriction:31
+msgid "Owner is"
+msgstr "הבעלי�"
+
+#: html/Admin/Users/Modify.html:174 html/User/Prefs.html:56
+msgid "Pager"
+msgstr "ביפר"
+
+#: html/Admin/Elements/ModifyUser:74
+msgid "PagerPhone"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Parent"
+msgstr ""
+
+#: html/Ticket/Create.html:182 html/Ticket/Elements/EditLinks:127 html/Ticket/Elements/EditLinks:58 html/Ticket/Elements/ShowLinks:47
+msgid "Parents"
+msgstr "הורי�"
+
+#: html/Elements/Login:52 html/User/Prefs.html:61
+msgid "Password"
+msgstr "סיסמ�"
+
+#: html/NoAuth/Reminder.html:25
+msgid "Password Reminder"
+msgstr "מזכיר סיסמ�"
+
+#: lib/RT/User_Overlay.pm:169 lib/RT/User_Overlay.pm:868
+msgid "Password too short"
+msgstr "סיסמ� קצרה מדי"
+
+#: html/Admin/Users/Modify.html:291 html/User/Prefs.html:172
+#. (loc_fuzzy($msg))
+msgid "Password: %1"
+msgstr "סיסמ�: %1"
+
+#: html/Admin/Users/Modify.html:293
+msgid "Passwords do not match."
+msgstr "הסיסמ�ות �ינן תו�מות"
+
+#: html/User/Prefs.html:174
+msgid "Passwords do not match. Your password has not been changed"
+msgstr ""
+
+#: html/Ticket/Elements/ShowSummary:45 html/Ticket/Elements/Tabs:96 html/Ticket/ModifyAll.html:51
+msgid "People"
+msgstr "�נשי�"
+
+#: etc/initialdata:126
+msgid "Perform a user-defined action"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:231 lib/RT/ACE_Overlay.pm:237 lib/RT/ACE_Overlay.pm:563 lib/RT/ACE_Overlay.pm:573 lib/RT/ACE_Overlay.pm:583 lib/RT/ACE_Overlay.pm:648 lib/RT/CurrentUser.pm:83 lib/RT/CurrentUser.pm:92 lib/RT/CustomField_Overlay.pm:101 lib/RT/CustomField_Overlay.pm:202 lib/RT/CustomField_Overlay.pm:234 lib/RT/CustomField_Overlay.pm:511 lib/RT/CustomField_Overlay.pm:91 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1099 lib/RT/Group_Overlay.pm:1108 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1163 lib/RT/Group_Overlay.pm:1169 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:904 lib/RT/Group_Overlay.pm:908 lib/RT/Group_Overlay.pm:921 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:931 lib/RT/Scrip_Overlay.pm:126 lib/RT/Scrip_Overlay.pm:137 lib/RT/Scrip_Overlay.pm:197 lib/RT/Scrip_Overlay.pm:430 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:88 lib/RT/Template_Overlay.pm:94 lib/RT/Ticket_Overlay.pm:1341 lib/RT/Ticket_Overlay.pm:1351 lib/RT/Ticket_Overlay.pm:1365 lib/RT/Ticket_Overlay.pm:1518 lib/RT/Ticket_Overlay.pm:1527 lib/RT/Ticket_Overlay.pm:1540 lib/RT/Ticket_Overlay.pm:1875 lib/RT/Ticket_Overlay.pm:2013 lib/RT/Ticket_Overlay.pm:2177 lib/RT/Ticket_Overlay.pm:2244 lib/RT/Ticket_Overlay.pm:2603 lib/RT/Ticket_Overlay.pm:2675 lib/RT/Ticket_Overlay.pm:2769 lib/RT/Ticket_Overlay.pm:2784 lib/RT/Ticket_Overlay.pm:2978 lib/RT/Ticket_Overlay.pm:3206 lib/RT/Ticket_Overlay.pm:3404 lib/RT/Ticket_Overlay.pm:3566 lib/RT/Ticket_Overlay.pm:3618 lib/RT/Ticket_Overlay.pm:3783 lib/RT/Transaction_Overlay.pm:466 lib/RT/Transaction_Overlay.pm:473 lib/RT/Transaction_Overlay.pm:502 lib/RT/Transaction_Overlay.pm:509 lib/RT/User_Overlay.pm:1355 lib/RT/User_Overlay.pm:570 lib/RT/User_Overlay.pm:605 lib/RT/User_Overlay.pm:861 lib/RT/User_Overlay.pm:962
+msgid "Permission Denied"
+msgstr ""
+
+#: html/User/Elements/Tabs:35
+msgid "Personal Groups"
+msgstr "קבוצות �ישיות"
+
+#: html/User/Groups/index.html:30 html/User/Groups/index.html:40
+msgid "Personal groups"
+msgstr "קבוצות �ישיות"
+
+#: html/User/Elements/DelegateRights:37
+msgid "Personal groups:"
+msgstr "קבוצות �ישיות"
+
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:49
+msgid "Phone numbers"
+msgstr "מספרי טלפון"
+
+#: NOT FOUND IN SOURCE
+msgid "Placeholder"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Pref"
+msgstr ""
+
+#: html/Elements/Header:52 html/Elements/Tabs:53 html/SelfService/Elements/Tabs:51 html/SelfService/Prefs.html:25 html/User/Prefs.html:25 html/User/Prefs.html:28
+msgid "Preferences"
+msgstr "מ�פייני�"
+
+#: NOT FOUND IN SOURCE
+msgid "Prefs"
+msgstr ""
+
+#: lib/RT/Action/Generic.pm:160
+msgid "Prepare Stubbed"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:61
+msgid "Prev"
+msgstr "הקוד�"
+
+#: html/Search/Listing.html:44
+msgid "Previous page"
+msgstr "דף קוד�"
+
+#: NOT FOUND IN SOURCE
+msgid "Pri"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:133 lib/RT/ACE_Overlay.pm:208 lib/RT/ACE_Overlay.pm:552
+#. ($args{'PrincipalId'})
+msgid "Principal %1 not found."
+msgstr ""
+
+#: html/Search/Elements/PickRestriction:54 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:54 html/Ticket/Elements/ShowBasics:39 lib/RT/Tickets_Overlay.pm:1042
+msgid "Priority"
+msgstr "עדיפות"
+
+#: html/Admin/Elements/ModifyQueue:51 html/Admin/Queues/Modify.html:65
+msgid "Priority starts at"
+msgstr ""
+
+#: etc/initialdata:25
+msgid "Privileged"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:271 html/User/Prefs.html:163
+#. (loc_fuzzy($msg))
+msgid "Privileged status: %1"
+msgstr ""
+
+#: html/Admin/Users/index.html:62
+msgid "Privileged users"
+msgstr ""
+
+#: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
+msgid "Pseudogroup for internal use"
+msgstr ""
+
+#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Elements/Quicksearch:29 html/Search/Elements/PickRestriction:46 html/SelfService/Create.html:33 html/Ticket/Create.html:38 html/Ticket/Elements/EditBasics:64 html/Ticket/Elements/ShowBasics:43 html/User/Elements/DelegateRights:80 lib/RT/Tickets_Overlay.pm:883
+msgid "Queue"
+msgstr "תור"
+
+#: html/Admin/Queues/CustomField.html:42 html/Admin/Queues/Scrip.html:50 html/Admin/Queues/Scrips.html:46 html/Admin/Queues/Templates.html:44
+#. ($Queue)
+#. ($id)
+msgid "Queue %1 not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Queue '%1' not found\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Keyword Selections"
+msgstr ""
+
+#: html/Admin/Elements/ModifyQueue:31 html/Admin/Queues/Modify.html:43
+msgid "Queue Name"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Scrips"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:263
+msgid "Queue already exists"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:272 lib/RT/Queue_Overlay.pm:278
+msgid "Queue could not be created"
+msgstr ""
+
+#: html/Ticket/Create.html:205
+msgid "Queue could not be loaded."
+msgstr ""
+
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:282
+msgid "Queue created"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Queue is not specified."
+msgstr ""
+
+#: html/SelfService/Display.html:71 lib/RT/CustomField_Overlay.pm:98
+msgid "Queue not found"
+msgstr ""
+
+#: html/Admin/Elements/Tabs:38 html/Admin/index.html:35
+msgid "Queues"
+msgstr "תורי�"
+
+#: html/Elements/Quicksearch:25
+msgid "Quick search"
+msgstr "חיפוש מהיר"
+
+#: html/Elements/Login:44
+#. ($RT::VERSION)
+msgid "RT %1"
+msgstr ""
+
+#: docs/design_docs/string-extraction-guide.txt:70
+#. ($RT::VERSION, $RT::rtname)
+msgid "RT %1 for %2"
+msgstr ""
+
+#: html/Elements/Footer:32
+#. ($RT::VERSION)
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr ""
+
+#: html/Admin/index.html:25 html/Admin/index.html:26
+msgid "RT Administration"
+msgstr "ניהול RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Authentication error."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Bounce: %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Configuration error"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Critical error. Message not recorded!"
+msgstr ""
+
+#: html/Elements/Error:41 html/SelfService/Error.html:41
+msgid "RT Error"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Received mail (%1) from itself."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Recieved mail (%1) from itself."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Self Service / Closed Tickets"
+msgstr ""
+
+#: html/index.html:25 html/index.html:28
+msgid "RT at a glance"
+msgstr "RT ממבט כולל"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't authenticate you"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find requestor via its external database lookup"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find the queue: %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't validate this PGP signature. \\n"
+msgstr ""
+
+#: html/Elements/PageLayout:26
+#. ($RT::rtname)
+msgid "RT for %1"
+msgstr "RT / %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT has proccessed your commands"
+msgstr ""
+
+#: html/Elements/Login:92
+#. ('2003')
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT thinks this message may be a bounce"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT will process this message as if it were unsigned.\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+msgstr ""
+
+#: html/Admin/Users/Modify.html:58 html/Admin/Users/Prefs.html:52 html/User/Prefs.html:44
+msgid "Real Name"
+msgstr "ש� �מיתי"
+
+#: html/Admin/Elements/ModifyUser:48
+msgid "RealName"
+msgstr "ש� �מיתי"
+
+#: html/Ticket/Create.html:185 html/Ticket/Elements/EditLinks:139 html/Ticket/Elements/EditLinks:94 html/Ticket/Elements/ShowLinks:71
+msgid "Referred to by"
+msgstr "מתייחסי� �ליו"
+
+#: html/Elements/SelectLinkType:28 html/Ticket/Create.html:184 html/Ticket/Elements/EditLinks:135 html/Ticket/Elements/EditLinks:80 html/Ticket/Elements/ShowLinks:61
+msgid "Refers to"
+msgstr "מתייחס ל"
+
+#: NOT FOUND IN SOURCE
+msgid "RefersTo"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Refine"
+msgstr ""
+
+#: html/Search/Elements/PickRestriction:27
+msgid "Refine search"
+msgstr "חדד �ת החיפוש"
+
+#: html/Elements/Refresh:36
+#. ($value/60)
+msgid "Refresh this page every %1 minutes."
+msgstr "רענן דף זה כל %1 דקות."
+
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:62 html/Ticket/ModifyAll.html:57
+msgid "Relationships"
+msgstr "יחסי� ע� פניות �חרות"
+
+#: html/Search/Bulk.html:93
+msgid "Remove AdminCc"
+msgstr "הסר העתק ניהולי"
+
+#: html/Search/Bulk.html:91
+msgid "Remove Cc"
+msgstr "הסר העתק"
+
+#: html/Search/Bulk.html:89
+msgid "Remove Requestor"
+msgstr "הסר מבקש"
+
+#: html/Ticket/Elements/ShowTransaction:173 html/Ticket/Elements/Tabs:122
+msgid "Reply"
+msgstr "הגב"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "Reply to tickets"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "ReplyToTicket"
+msgstr "מענה לפנייה"
+
+#: etc/initialdata:44 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:87
+msgid "Requestor"
+msgstr "מבקש"
+
+#: html/Search/Elements/PickRestriction:38
+msgid "Requestor email address"
+msgstr "כתובת ה�י-מייל של המבקש"
+
+#: NOT FOUND IN SOURCE
+msgid "Requestor(s)"
+msgstr "מבקש(י�)"
+
+#: NOT FOUND IN SOURCE
+msgid "RequestorAddresses"
+msgstr "כתובת הפונה"
+
+#: html/SelfService/Create.html:41 html/Ticket/Create.html:56 html/Ticket/Elements/EditPeople:48 html/Ticket/Elements/ShowPeople:31
+msgid "Requestors"
+msgstr "מבקשי�"
+
+#: html/Admin/Elements/ModifyQueue:61 html/Admin/Queues/Modify.html:75
+msgid "Requests should be due in"
+msgstr ""
+
+#: html/Elements/Submit:62
+msgid "Reset"
+msgstr "�פס נתוני�"
+
+#: html/Admin/Users/Modify.html:159 html/User/Prefs.html:50
+msgid "Residence"
+msgstr "בית"
+
+#: html/Ticket/Elements/Tabs:132
+msgid "Resolve"
+msgstr "פתור"
+
+#: html/Ticket/Update.html:133
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Resolve ticket #%1 (%2)"
+msgstr "פתור פנייה #%1 (%2)"
+
+#: etc/initialdata:308 html/Elements/SelectDateType:28 lib/RT/Ticket_Overlay.pm:1170
+msgid "Resolved"
+msgstr "נפתר"
+
+#: html/Search/Bulk.html:123 html/Ticket/ModifyAll.html:73 html/Ticket/Update.html:73
+msgid "Response to requestors"
+msgstr "תגובה למבקשי�"
+
+#: html/Elements/ListActions:26
+msgid "Results"
+msgstr "תוצ�ות"
+
+#: html/Search/Elements/PickRestriction:105
+msgid "Results per page"
+msgstr "תוצ�ות לעמוד"
+
+#: html/Admin/Elements/ModifyUser:33 html/Admin/Users/Modify.html:100 html/User/Prefs.html:72
+msgid "Retype Password"
+msgstr "הקלד שנית:"
+
+#: NOT FOUND IN SOURCE
+msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:613
+msgid "Right Delegated"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:303
+msgid "Right Granted"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:161
+msgid "Right Loaded"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:678 lib/RT/ACE_Overlay.pm:693
+msgid "Right could not be revoked"
+msgstr ""
+
+#: html/User/Delegation.html:64
+msgid "Right not found"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:543 lib/RT/ACE_Overlay.pm:638
+msgid "Right not loaded."
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:689
+msgid "Right revoked"
+msgstr ""
+
+#: html/Admin/Elements/UserTabs:41
+msgid "Rights"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:792
+#. ($object_type)
+msgid "Rights could not be granted for %1"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:825
+#. ($object_type)
+msgid "Rights could not be revoked for %1"
+msgstr ""
+
+#: html/Admin/Global/GroupRights.html:51 html/Admin/Queues/GroupRights.html:52
+msgid "Roles"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr ""
+
+#: lib/RT/Date.pm:393
+msgid "Sat."
+msgstr "שבת"
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyLinks.html:39 html/Ticket/ModifyPeople.html:38
+msgid "Save Changes"
+msgstr "שמור שינויי�"
+
+#: NOT FOUND IN SOURCE
+msgid "Save changes"
+msgstr "שמור שינויי�"
+
+#: html/Admin/Global/Scrip.html:49
+#. ($ARGS{'id'})
+msgid "Scrip #%1"
+msgstr ""
+
+#: lib/RT/Scrip_Overlay.pm:176
+msgid "Scrip Created"
+msgstr ""
+
+#: html/Admin/Elements/EditScrips:84
+msgid "Scrip deleted"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:46 html/Admin/Elements/SystemTabs:33 html/Admin/Global/index.html:41
+msgid "Scrips"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Scrips for %1\\n"
+msgstr ""
+
+#: html/Admin/Queues/Scrips.html:33
+msgid "Scrips which apply to all queues"
+msgstr ""
+
+#: html/Elements/SimpleSearch:27 html/Search/Elements/PickRestriction:126 html/Ticket/Elements/Tabs:159
+msgid "Search"
+msgstr "חיפוש"
+
+#: NOT FOUND IN SOURCE
+msgid "Search Criteria"
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:39
+msgid "Search for approvals"
+msgstr ""
+
+#: bin/rt-crontool:188
+msgid "Security:"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "SeeQueue"
+msgstr ""
+
+#: html/Admin/Groups/index.html:40
+msgid "Select a group"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Select a queue"
+msgstr ""
+
+#: html/Admin/Users/index.html:25 html/Admin/Users/index.html:28
+msgid "Select a user"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:38 html/Admin/Global/CustomFields.html:36
+msgid "Select custom field"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:52 html/User/Elements/GroupTabs:50
+msgid "Select group"
+msgstr "בחר קבוצה"
+
+#: lib/RT/CustomField_Overlay.pm:422
+msgid "Select multiple values"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:419
+msgid "Select one value"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:67
+msgid "Select queue"
+msgstr ""
+
+#: html/Admin/Global/Scrip.html:37 html/Admin/Global/Scrips.html:36 html/Admin/Queues/Scrip.html:40 html/Admin/Queues/Scrips.html:50
+msgid "Select scrip"
+msgstr ""
+
+#: html/Admin/Global/Template.html:57 html/Admin/Global/Templates.html:36 html/Admin/Queues/Template.html:55 html/Admin/Queues/Templates.html:47
+msgid "Select template"
+msgstr ""
+
+#: html/Admin/Elements/UserTabs:49
+msgid "Select user"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "SelectMultiple"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectSingle"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Self Service"
+msgstr ""
+
+#: etc/initialdata:114
+msgid "Send mail to all watchers"
+msgstr ""
+
+#: etc/initialdata:110
+msgid "Send mail to all watchers as a \"comment\""
+msgstr ""
+
+#: etc/initialdata:105
+msgid "Send mail to requestors and Ccs"
+msgstr ""
+
+#: etc/initialdata:100
+msgid "Send mail to requestors and Ccs as a comment"
+msgstr ""
+
+#: etc/initialdata:79
+msgid "Sends a message to the requestors"
+msgstr ""
+
+#: etc/initialdata:118 etc/initialdata:122
+msgid "Sends mail to explicitly listed Ccs and Bccs"
+msgstr ""
+
+#: etc/initialdata:95
+msgid "Sends mail to the administrative Ccs"
+msgstr ""
+
+#: etc/initialdata:91
+msgid "Sends mail to the administrative Ccs as a comment"
+msgstr ""
+
+#: etc/initialdata:83 etc/initialdata:87
+msgid "Sends mail to the owner"
+msgstr ""
+
+#: lib/RT/Date.pm:419
+msgid "Sep."
+msgstr "ספטמבר"
+
+#: NOT FOUND IN SOURCE
+msgid "September"
+msgstr "ספטמבר"
+
+#: NOT FOUND IN SOURCE
+msgid "Show Results"
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:44
+msgid "Show approved requests"
+msgstr "הצג בקשות ש�ושרו"
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show basics"
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:45
+msgid "Show denied requests"
+msgstr "הצג בקשות שנדחו"
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show details"
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:43
+msgid "Show pending requests"
+msgstr "הצג בקשות ממתינות"
+
+#: html/Approvals/Elements/PendingMyApproval:46
+msgid "Show requests awaiting other approvals"
+msgstr "הצג בקשות שממתינות ל�ישורי� �חרי�"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "Show ticket private commentary"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "Show ticket summaries"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "ShowACL"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "ShowScrips"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "ShowTemplate"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "ShowTicket"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "ShowTicketComments"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Sign up as a ticket Requestor or ticket or queue Cc"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "Sign up as a ticket or queue AdminCc"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:39 html/Admin/Users/Modify.html:191 html/Admin/Users/Prefs.html:32 html/User/Prefs.html:112
+msgid "Signature"
+msgstr "חתימה"
+
+#: NOT FOUND IN SOURCE
+msgid "Signed in as %1"
+msgstr ""
+
+#: html/Admin/Elements/SelectSingleOrMultiple:26
+msgid "Single"
+msgstr ""
+
+#: html/Elements/Header:51
+msgid "Skip Menu"
+msgstr ""
+
+#: html/Admin/Elements/AddCustomFieldValue:29
+msgid "Sort"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Sort key"
+msgstr ""
+
+#: html/Search/Elements/PickRestriction:109
+msgid "Sort results by"
+msgstr "סדר תוצ�ות על פי"
+
+#: NOT FOUND IN SOURCE
+msgid "SortOrder"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Stalled"
+msgstr "מושהה"
+
+#: NOT FOUND IN SOURCE
+msgid "Start page"
+msgstr ""
+
+#: html/Elements/SelectDateType:27 html/Ticket/Elements/EditDates:32 html/Ticket/Elements/ShowDates:35
+msgid "Started"
+msgstr "התחיל"
+
+#: NOT FOUND IN SOURCE
+msgid "Started date '%1' could not be parsed"
+msgstr ""
+
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:27 html/Ticket/Elements/ShowDates:31
+msgid "Starts"
+msgstr "מתחיל ב"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts By"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Starts date '%1' could not be parsed"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:82 html/Admin/Users/Modify.html:138 html/User/Prefs.html:94
+msgid "State"
+msgstr "מדינה"
+
+#: html/Elements/MyRequests:31 html/Elements/MyTickets:31 html/Search/Elements/PickRestriction:74 html/SelfService/Elements/MyRequests:29 html/SelfService/Update.html:31 html/Ticket/Create.html:42 html/Ticket/Elements/EditBasics:38 html/Ticket/Elements/ShowBasics:31 html/Ticket/Update.html:60 lib/RT/Ticket_Overlay.pm:1164 lib/RT/Tickets_Overlay.pm:908
+msgid "Status"
+msgstr "מצב"
+
+#: etc/initialdata:294
+msgid "Status Change"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:528
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
+msgid "Status changed from %1 to %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:147
+msgid "Steal"
+msgstr "גנוב"
+
+#: lib/RT/Transaction_Overlay.pm:587
+#. ($Old->Name)
+msgid "Stolen from %1 "
+msgstr "נגנב מ %1"
+
+#: html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Search/Bulk.html:126 html/Search/Elements/PickRestriction:43 html/SelfService/Create.html:57 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:32 html/Ticket/Create.html:84 html/Ticket/Elements/EditBasics:28 html/Ticket/ModifyAll.html:79 html/Ticket/Update.html:77 lib/RT/Ticket_Overlay.pm:1160 lib/RT/Tickets_Overlay.pm:987
+msgid "Subject"
+msgstr "נוש�"
+
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/Transaction_Overlay.pm:609
+#. ($self->Data)
+msgid "Subject changed to %1"
+msgstr "נוש� שונה ל %1"
+
+#: html/Elements/Submit:59
+msgid "Submit"
+msgstr "שלח"
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:749
+msgid "Succeeded"
+msgstr "הצליח"
+
+#: lib/RT/Date.pm:394
+msgid "Sun."
+msgstr "ר�שון"
+
+#: lib/RT/System.pm:54
+msgid "SuperUser"
+msgstr "סופר-משתמש"
+
+#: html/User/Elements/DelegateRights:77
+msgid "System"
+msgstr "מערכת"
+
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:567 lib/RT/Interface/Web.pm:791 lib/RT/Interface/Web.pm:824
+msgid "System Error"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. Right not granted."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. right not granted"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:616
+msgid "System error. Right not delegated."
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:146 lib/RT/ACE_Overlay.pm:223 lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:898
+msgid "System error. Right not granted."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "System error. Unable to grant rights."
+msgstr ""
+
+#: html/Admin/Global/GroupRights.html:35 html/Admin/Groups/GroupRights.html:37 html/Admin/Queues/GroupRights.html:36
+msgid "System groups"
+msgstr ""
+
+#: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
+msgid "SystemRolegroup for internal use"
+msgstr ""
+
+#: lib/RT/CurrentUser.pm:318
+msgid "TEST_STRING"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:143
+msgid "Take"
+msgstr "קח"
+
+#: lib/RT/Transaction_Overlay.pm:573
+msgid "Taken"
+msgstr "נלקחה"
+
+#: html/Admin/Elements/EditScrip:81
+msgid "Template"
+msgstr ""
+
+#: html/Admin/Global/Template.html:91 html/Admin/Queues/Template.html:90
+#. ($TemplateObj->Id())
+msgid "Template #%1"
+msgstr ""
+
+#: html/Admin/Elements/EditTemplates:89
+msgid "Template deleted"
+msgstr ""
+
+#: lib/RT/Scrip_Overlay.pm:153
+msgid "Template not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Template not found\\n"
+msgstr ""
+
+#: lib/RT/Template_Overlay.pm:347
+msgid "Template parsed"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:49 html/Admin/Elements/SystemTabs:36 html/Admin/Global/index.html:45
+msgid "Templates"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Templates for %1\\n"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:892
+msgid "That is already the current value"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:243
+msgid "That is not a value for this custom field"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1886
+msgid "That is the same value"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:288 lib/RT/ACE_Overlay.pm:597
+msgid "That principal already has that right"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:633
+#. ($args{'Type'})
+msgid "That principal is already a %1 for this queue"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1434
+#. ($self->loc($args{'Type'}))
+msgid "That principal is already a %1 for this ticket"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:732
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this queue"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1551
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this ticket"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1882
+msgid "That queue does not exist"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3210
+msgid "That ticket has unresolved dependencies"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "That user already has that right"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3020
+msgid "That user already owns that ticket"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2986
+msgid "That user does not exist"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:315
+msgid "That user is already privileged"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:336
+msgid "That user is already unprivileged"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:328
+msgid "That user is now privileged"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:349
+msgid "That user is now unprivileged"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "That user is now unprivilegedileged"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3012
+msgid "That user may not own tickets in that queue"
+msgstr ""
+
+#: lib/RT/Link_Overlay.pm:206
+msgid "That's not a numerical id"
+msgstr ""
+
+#: html/SelfService/Display.html:32 html/Ticket/Create.html:150 html/Ticket/Elements/ShowSummary:28
+msgid "The Basics"
+msgstr "מידע בסיסי"
+
+#: lib/RT/ACE_Overlay.pm:88
+msgid "The CC of a ticket"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:89
+msgid "The administrative CC of a ticket"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2213
+msgid "The comment has been recorded"
+msgstr ""
+
+#: bin/rt-crontool:198
+msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
+msgstr ""
+
+#: bin/rt-commit-handler:756 bin/rt-commit-handler:766
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:895
+msgid "The new value has been set."
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:86
+msgid "The owner of a ticket"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:87
+msgid "The requestor of a ticket"
+msgstr ""
+
+#: html/Admin/Elements/EditUserComments:26
+msgid "These comments aren't generally visible to the user"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "This ticket %1 %2 (%3)\\n"
+msgstr ""
+
+#: bin/rt-crontool:189
+msgid "This tool allows the user to run arbitrary perl modules from within RT."
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:251
+msgid "This transaction appears to have no content"
+msgstr ""
+
+#: html/Ticket/Elements/ShowRequestor:47
+#. ($rows)
+msgid "This user's %1 highest priority tickets"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "This user's 25 highest priority tickets"
+msgstr ""
+
+#: lib/RT/Date.pm:391
+msgid "Thu."
+msgstr "חמישי"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket"
+msgstr "פנייה"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1  %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1 Jumbo update: %2"
+msgstr "פנייה מספר %1 עדכון ג'מבו: %2"
+
+#: html/Ticket/ModifyAll.html:25 html/Ticket/ModifyAll.html:29
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket #%1 Jumbo update: %2"
+msgstr "פנייה מספר %1 עדכון ג'מבו: %2"
+
+#: html/Approvals/Elements/ShowDependency:46
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Ticket #%1: %2"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:587 lib/RT/Ticket_Overlay.pm:608
+#. ($self->Id, $QueueObj->Name)
+msgid "Ticket %1 created in queue '%2'"
+msgstr ""
+
+#: bin/rt-commit-handler:760
+#. ($Ticket->Id)
+msgid "Ticket %1 loaded\\n"
+msgstr ""
+
+#: html/Search/Bulk.html:181
+#. ($Ticket->Id,$_)
+msgid "Ticket %1: %2"
+msgstr ""
+
+#: html/Ticket/History.html:25 html/Ticket/History.html:28
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket History # %1 %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket Id"
+msgstr ""
+
+#: etc/initialdata:309
+msgid "Ticket Resolved"
+msgstr ""
+
+#: html/Search/Elements/PickRestriction:63
+msgid "Ticket attachment"
+msgstr "מצורף לפנייה"
+
+#: lib/RT/Tickets_Overlay.pm:1166
+msgid "Ticket content"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1212
+msgid "Ticket content type"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:496 lib/RT/Ticket_Overlay.pm:597
+msgid "Ticket could not be created due to an internal error"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:520
+msgid "Ticket created"
+msgstr "פנייה נוצרה"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket creation failed"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:525
+msgid "Ticket deleted"
+msgstr "פנייה נמחקה"
+
+#: html/REST/1.0/modify:29 html/REST/1.0/update:34
+msgid "Ticket id not found"
+msgstr "מזהה פנייה ל� נמצ�"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket killed"
+msgstr "פנייה נמחקה"
+
+#: html/REST/1.0/modify:36 html/REST/1.0/update:41
+msgid "Ticket not found"
+msgstr "פנייה ל� נמצ�ה"
+
+#: etc/initialdata:295
+msgid "Ticket status changed"
+msgstr "סטטוס פנייה שונה"
+
+#: html/Ticket/Update.html:39
+msgid "Ticket watchers"
+msgstr "צופי הפנייה"
+
+#: html/Elements/Tabs:47
+msgid "Tickets"
+msgstr "פניות"
+
+#: lib/RT/Tickets_Overlay.pm:1383
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1348
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr ""
+
+#: html/Elements/ViewUser:26
+#. ($name)
+msgid "Tickets from %1"
+msgstr ""
+
+#: html/Approvals/Elements/ShowDependency:27
+msgid "Tickets which depend on this approval:"
+msgstr ""
+
+#: html/Ticket/Create.html:157 html/Ticket/Elements/EditBasics:48
+msgid "Time Left"
+msgstr "זמן נותר"
+
+#: html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:43
+msgid "Time Worked"
+msgstr "זמן עבודה"
+
+#: lib/RT/Tickets_Overlay.pm:1139
+msgid "Time left"
+msgstr "זמן נותר"
+
+#: html/Elements/Footer:36
+msgid "Time to display"
+msgstr "זמן להציג"
+
+#: lib/RT/Tickets_Overlay.pm:1115
+msgid "Time worked"
+msgstr "זמן עבודה"
+
+#: NOT FOUND IN SOURCE
+msgid "TimeLeft"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1165
+msgid "TimeWorked"
+msgstr ""
+
+#: bin/rt-commit-handler:402
+msgid "To generate a diff of this commit:"
+msgstr ""
+
+#: bin/rt-commit-handler:391
+msgid "To generate a diff of this commit:\\n"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1168
+msgid "Told"
+msgstr ""
+
+#: etc/initialdata:237
+msgid "Transaction"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:640
+#. ($self->Data)
+msgid "Transaction %1 purged"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:177
+msgid "Transaction Created"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:89
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:699
+msgid "Transactions are immutable"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Trying to delete a right: %1"
+msgstr ""
+
+#: lib/RT/Date.pm:389
+msgid "Tue."
+msgstr "שלישי"
+
+#: html/Admin/Elements/EditCustomField:44 html/Ticket/Elements/AddWatchers:33 html/Ticket/Elements/AddWatchers:44 html/Ticket/Elements/AddWatchers:54 lib/RT/Ticket_Overlay.pm:1166 lib/RT/Tickets_Overlay.pm:959
+msgid "Type"
+msgstr "סוג"
+
+#: lib/RT/ScripCondition_Overlay.pm:104
+msgid "Unimplemented"
+msgstr "ל� מייוש�"
+
+#: html/Admin/Users/Modify.html:68
+msgid "Unix login"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:62
+msgid "UnixUsername"
+msgstr ""
+
+#: lib/RT/Attachment_Overlay.pm:265
+#. ($self->ContentEncoding)
+msgid "Unknown ContentEncoding %1"
+msgstr ""
+
+#: html/Elements/SelectResultsPerPage:37
+msgid "Unlimited"
+msgstr "ל� מוגבל"
+
+#: etc/initialdata:32
+msgid "Unprivileged"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:569
+msgid "Untaken"
+msgstr ""
+
+#: html/Elements/MyTickets:64 html/Search/Bulk.html:33
+msgid "Update"
+msgstr "עדכן"
+
+#: html/Admin/Users/Prefs.html:62
+msgid "Update ID"
+msgstr ""
+
+#: html/Search/Bulk.html:120 html/Ticket/ModifyAll.html:66 html/Ticket/Update.html:67
+msgid "Update Type"
+msgstr "סוג עדכון"
+
+#: html/Search/Listing.html:61
+msgid "Update all these tickets at once"
+msgstr "עדכן �ת כל הפניות לעיל בבת �חת"
+
+#: html/Admin/Users/Prefs.html:49
+msgid "Update email"
+msgstr "עדכן �י-מייל"
+
+#: html/Admin/Users/Prefs.html:55
+msgid "Update name"
+msgstr "עדכן ש�"
+
+#: lib/RT/Interface/Web.pm:409
+msgid "Update not recorded."
+msgstr ""
+
+#: html/Search/Bulk.html:81
+msgid "Update selected tickets"
+msgstr "עדכן פניות נבחרות"
+
+#: html/Admin/Users/Prefs.html:36
+msgid "Update signature"
+msgstr "עדכן חתימה"
+
+#: html/Ticket/ModifyAll.html:63
+msgid "Update ticket"
+msgstr "עדכן פנייה"
+
+#: NOT FOUND IN SOURCE
+msgid "Update ticket # %1"
+msgstr ""
+
+#: html/SelfService/Update.html:25 html/SelfService/Update.html:47
+#. ($Ticket->id)
+msgid "Update ticket #%1"
+msgstr ""
+
+#: html/Ticket/Update.html:135
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Update ticket #%1 (%2)"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:407
+msgid "Update type was neither correspondence nor comment."
+msgstr ""
+
+#: html/Elements/SelectDateType:33 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1169
+msgid "Updated"
+msgstr "עודכן"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 %2: %3\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 Password: %2\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found\\n"
+msgstr ""
+
+#: etc/initialdata:125 etc/initialdata:191
+msgid "User Defined"
+msgstr ""
+
+#: html/Admin/Users/Prefs.html:59
+msgid "User ID"
+msgstr "מזהה המשתמש"
+
+#: html/Elements/SelectUsers:26
+msgid "User Id"
+msgstr "מזהה המשתמש"
+
+#: html/Admin/Elements/GroupTabs:47 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/SystemTabs:47 html/Admin/Global/index.html:59
+msgid "User Rights"
+msgstr "זכויות המשתמש"
+
+#: html/Admin/Users/Modify.html:226
+#. ($msg)
+msgid "User could not be created: %1"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:262
+msgid "User created"
+msgstr ""
+
+#: html/Admin/Global/GroupRights.html:67 html/Admin/Groups/GroupRights.html:54 html/Admin/Queues/GroupRights.html:68
+msgid "User defined groups"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User notified"
+msgstr ""
+
+#: html/Admin/Users/Prefs.html:25 html/Admin/Users/Prefs.html:29
+msgid "User view"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:48 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:35
+msgid "Username"
+msgstr "ש� משתמש"
+
+#: html/Admin/Elements/SelectNewGroupMembers:26 html/Admin/Elements/Tabs:32 html/Admin/Groups/Members.html:55 html/Admin/Queues/People.html:68 html/Admin/index.html:29 html/User/Groups/Members.html:58
+msgid "Users"
+msgstr "משתמשי�"
+
+#: html/Admin/Users/index.html:65
+msgid "Users matching search criteria"
+msgstr ""
+
+#: html/Search/Elements/PickRestriction:51
+msgid "ValueOfQueue"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:57
+msgid "Values"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "VrijevormEnkele"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Watch"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "WatchAsAdminCc"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Watcher loaded"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:42
+msgid "Watchers"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:56
+msgid "WebEncoding"
+msgstr ""
+
+#: lib/RT/Date.pm:390
+msgid "Wed."
+msgstr "רביעי"
+
+#: etc/upgrade/2.1.71:161
+msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
+msgstr ""
+
+#: etc/upgrade/2.1.71:135
+msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
+msgstr ""
+
+#: etc/initialdata:138
+msgid "When a ticket is created"
+msgstr ""
+
+#: etc/upgrade/2.1.71:79
+msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
+msgstr ""
+
+#: etc/initialdata:143
+msgid "When anything happens"
+msgstr "בכל פע� שדבר כלשהו� קורה"
+
+#: etc/initialdata:184
+msgid "Whenever a ticket is resolved"
+msgstr "בכל פע� שפנייה נסגרת"
+
+#: etc/initialdata:170
+msgid "Whenever a ticket's owner changes"
+msgstr "בכל פע� שבעלי הפנייה משתנה"
+
+#: etc/initialdata:178
+msgid "Whenever a ticket's queue changes"
+msgstr "בכל מצב שתור הפנייה משתנה"
+
+#: etc/initialdata:162
+msgid "Whenever a ticket's status changes"
+msgstr "בכל פע� שמצב הפנייה משתנה"
+
+#: etc/initialdata:192
+msgid "Whenever a user-defined condition occurs"
+msgstr "בכל פע� שמצב מוגדר על ידי משתמש קורה"
+
+#: etc/initialdata:156
+msgid "Whenever comments come in"
+msgstr "בכל פע� שהערה מגיעה ב"
+
+#: etc/initialdata:149
+msgid "Whenever correspondence comes in"
+msgstr "בכל פע� שתכתובת מגיעה ב"
+
+#: html/Admin/Users/Modify.html:164 html/User/Prefs.html:52
+msgid "Work"
+msgstr "עבודה"
+
+#: html/Admin/Elements/ModifyUser:70
+msgid "WorkPhone"
+msgstr "טלפון בעבודה"
+
+#: html/Ticket/Elements/ShowBasics:35 html/Ticket/Update.html:65
+msgid "Worked"
+msgstr "זמן טיפול"
+
+#: lib/RT/Ticket_Overlay.pm:3123
+msgid "You already own this ticket"
+msgstr "�תה כבר הבעלי� של פנייה זו"
+
+#: html/autohandler:108
+msgid "You are not an authorized user"
+msgstr "�ינך משתמש מורשה"
+
+#: lib/RT/Ticket_Overlay.pm:2998
+msgid "You can only reassign tickets that you own or that are unowned"
+msgstr "�תה יכול להציב פניה רק �� �תה הבעלי� שלה, �ו ש�ין לה בעלי�"
+
+#: NOT FOUND IN SOURCE
+msgid "You don't have permission to view that ticket.\\n"
+msgstr "�ין לך הרש�ה כדי לר�ות �ת פנייה זו.\\n"
+
+#: docs/design_docs/string-extraction-guide.txt:47
+#. ($num, $queue)
+msgid "You found %1 tickets in queue %2"
+msgstr "מצ�ת %1 פניות בתור %2"
+
+#: html/NoAuth/Logout.html:31
+msgid "You have been logged out of RT."
+msgstr "התנתקת מהמערכת."
+
+#: html/SelfService/Display.html:78
+msgid "You have no permission to create tickets in that queue."
+msgstr "�ין לך הרש�ות ליצור פניות בתור זה."
+
+#: lib/RT/Ticket_Overlay.pm:1895
+msgid "You may not create requests in that queue."
+msgstr "�ינך מורשה ליצור פניות בתור זה."
+
+#: html/NoAuth/Logout.html:36
+msgid "You're welcome to login again"
+msgstr "הנך מוזמן להיכנס שנית"
+
+#: NOT FOUND IN SOURCE
+msgid "Your %1 requests"
+msgstr "%1 הבקשות שלך"
+
+#: NOT FOUND IN SOURCE
+msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
+msgstr "מנהל המערכת ל� הגדיר �ת כתובות הדו�ר שמפעילות �ת התוכנה כמו שצריך"
+
+#: etc/initialdata:435 etc/upgrade/2.1.71:146
+msgid "Your request has been approved by %1. Other approvals may still be pending."
+msgstr "בקשתך �ושרה על ידי %1. ייתכן ש�ישורי� נוספי� עדיין ממתיני�."
+
+#: etc/initialdata:469 etc/upgrade/2.1.71:180
+msgid "Your request has been approved."
+msgstr "בקשתך �ושרה."
+
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr "בקשתך נדחתה"
+
+#: etc/initialdata:390 etc/upgrade/2.1.71:101
+msgid "Your request was rejected."
+msgstr "בקשתך נדחתה."
+
+#: html/autohandler:127
+msgid "Your username or password is incorrect"
+msgstr "ש� המשתמש ו/�ו הסיסמ� �ינ� נכוני�"
+
+#: html/Admin/Elements/ModifyUser:84 html/Admin/Users/Modify.html:144 html/User/Prefs.html:96
+msgid "Zip"
+msgstr "מיקוד"
+
+#: NOT FOUND IN SOURCE
+msgid "[no subject]"
+msgstr "[לל� נוש�]"
+
+#: html/User/Elements/DelegateRights:59
+#. ($right->PrincipalObj->Object->SelfDescription)
+msgid "as granted to %1"
+msgstr "שהוענק ל%1"
+
+#: html/SelfService/Closed.html:28
+msgid "closed"
+msgstr "סגור"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:34
+msgid "contains"
+msgstr "מכיל"
+
+#: html/Elements/SelectAttachmentField:26
+msgid "content"
+msgstr "תוכן"
+
+#: html/Elements/SelectAttachmentField:27
+msgid "content-type"
+msgstr "סוג התוכן"
+
+#: lib/RT/Ticket_Overlay.pm:2282
+msgid "correspondence (probably) not sent"
+msgstr "התכתבות (כנר�ה) ל� נשלחה"
+
+#: lib/RT/Ticket_Overlay.pm:2292
+msgid "correspondence sent"
+msgstr "התכתבות נשלחה"
+
+#: html/Admin/Elements/ModifyQueue:63 html/Admin/Queues/Modify.html:77 lib/RT/Date.pm:319
+msgid "days"
+msgstr "ימי�"
+
+#: NOT FOUND IN SOURCE
+msgid "dead"
+msgstr ""
+
+#: html/Search/Listing.html:75
+msgid "delete"
+msgstr "מחק"
+
+#: lib/RT/Queue_Overlay.pm:63
+msgid "deleted"
+msgstr "מחוק"
+
+#: html/Search/Elements/PickRestriction:68
+msgid "does not match"
+msgstr "ל� מכיל"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:35
+msgid "doesn't contain"
+msgstr "ל� מכיל"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "equal to"
+msgstr "שווה ל"
+
+#: NOT FOUND IN SOURCE
+msgid "false"
+msgstr ""
+
+#: html/Elements/SelectAttachmentField:28
+msgid "filename"
+msgstr "ש� קובץ"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "greater than"
+msgstr "גדול מ"
+
+#: lib/RT/Group_Overlay.pm:194
+#. ($self->Name)
+msgid "group '%1'"
+msgstr "קבוצה %1"
+
+#: lib/RT/Date.pm:315
+msgid "hours"
+msgstr "שעות"
+
+#: NOT FOUND IN SOURCE
+msgid "id"
+msgstr "מזהה"
+
+#: html/Elements/SelectBoolean:32 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88
+msgid "is"
+msgstr "הו�"
+
+#: html/Elements/SelectBoolean:36 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:37 html/Search/Elements/PickRestriction:48 html/Search/Elements/PickRestriction:77 html/Search/Elements/PickRestriction:89
+msgid "isn't"
+msgstr "הו� ל�"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "less than"
+msgstr "פחות מ"
+
+#: html/Search/Elements/PickRestriction:67
+msgid "matches"
+msgstr "מכיל"
+
+#: lib/RT/Date.pm:311
+msgid "min"
+msgstr "דקות"
+
+#: html/Ticket/Update.html:66
+msgid "minutes"
+msgstr "דקות"
+
+#: bin/rt-commit-handler:765
+msgid "modifications\\n\\n"
+msgstr ""
+
+#: lib/RT/Date.pm:327
+msgid "months"
+msgstr "חודשי�"
+
+#: lib/RT/Queue_Overlay.pm:58
+msgid "new"
+msgstr "חדש"
+
+#: html/Admin/Elements/EditScrips:43
+msgid "no value"
+msgstr "�ין ערך"
+
+#: html/Ticket/Elements/EditWatchers:28
+msgid "none"
+msgstr "�ין"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "not equal to"
+msgstr "ל� שווה ל"
+
+#: NOT FOUND IN SOURCE
+msgid "notlike"
+msgstr ""
+
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:59
+msgid "open"
+msgstr "פתוח"
+
+#: lib/RT/Group_Overlay.pm:199
+#. ($self->Name, $user->Name)
+msgid "personal group '%1' for user '%2'"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:207
+#. ($queue->Name, $self->Type)
+msgid "queue %1 %2"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:62
+msgid "rejected"
+msgstr "נדחה"
+
+#: lib/RT/Queue_Overlay.pm:61
+msgid "resolved"
+msgstr "פתור"
+
+#: lib/RT/Date.pm:307
+msgid "sec"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:60
+msgid "stalled"
+msgstr "מושהה"
+
+#: lib/RT/Group_Overlay.pm:202
+#. ($self->Type)
+msgid "system %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:213
+#. ($self->Type)
+msgid "system group '%1'"
+msgstr ""
+
+#: html/Elements/Error:42 html/SelfService/Error.html:42
+msgid "the calling component did not specify why"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:210
+#. ($self->Instance, $self->Type)
+msgid "ticket #%1 %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "true"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:216
+#. ($self->Id)
+msgid "undescribed group %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "undescripbed group %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:191
+#. ($user->Object->Name)
+msgid "user %1"
+msgstr ""
+
+#: lib/RT/Date.pm:323
+msgid "weeks"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "with template %1"
+msgstr ""
+
+#: lib/RT/Date.pm:331
+msgid "years"
+msgstr ""
diff --git a/rt/lib/RT/I18N/i_default.pm b/rt/lib/RT/I18N/i_default.pm
new file mode 100644
index 000000000..154702656
--- /dev/null
+++ b/rt/lib/RT/I18N/i_default.pm
@@ -0,0 +1,86 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+package RT::I18N::i_default;
+
+use strict;
+use vars qw/@ISA/;
+@ISA = qw(RT::I18N);
+
+eval "require RT::I18N::i_default_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/I18N/i_default_Vendor.pm});
+eval "require RT::I18N::i_default_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/I18N/i_default_Local.pm});
+
+1;
+
+__END__
+
+This class just zero-derives from the project base class, which
+is English for this project.  i-default is "English at least".  It
+wouldn't be a bad idea to make our i-default messages be English
+plus, say, French -- i-default is meant to /contain/ English, not
+be /just/ English.  If you have all your English messages in
+Whatever::en and all your French messages in Whatever::fr, it
+would be straightforward to define Whatever::i_default's as a subclass
+of Whatever::en, but for every case where a key gets you a string
+(as opposed to a coderef) from %Whatever::en::Lexicon and
+%Whatever::fr::Lexicon, you could make %Whatever::i_default::Lexicon 
+be the concatenation of them both.  So: "file '[_1]' not found.\n" and
+"fichier '[_1]' non trouve\n" could make for an
+%Whatever::i_default::Lexicon entry of
+"file '[_1]' not found\nfichier '[_1]' non trouve.\n".
+
+There may be entries, however, where that is undesirable.
+And in any case, it's not feasable once you have an _AUTO lexicon
+in the mix, as wo do here.
+
+
+
+RFC 2277 says: 
+
+4.5.  Default Language
+
+   When human-readable text must be presented in a context where the
+   sender has no knowledge of the recipient's language preferences (such
+   as login failures or E-mailed warnings, or prior to language
+   negotiation), text SHOULD be presented in Default Language.
+
+   Default Language is assigned the tag "i-default" according to the
+   procedures of RFC 1766. It is not a specific language, but rather
+   identifies the condition where the language preferences of the user
+   cannot be established.
+
+   Messages in Default Language MUST be understandable by an English-
+   speaking person, since English is the language which, worldwide, the
+   greatest number of people will be able to get adequate help in
+   interpreting when working with computers.
+
+   Note that negotiating English is NOT the same as Default Language;
+   Default Language is an emergency measure in otherwise unmanageable
+   situations.
+
+   In many cases, using only English text is reasonable; in some cases,
+   the English text may be augumented by text in other languages.
+
+
diff --git a/rt/lib/RT/I18N/ja.po b/rt/lib/RT/I18N/ja.po
new file mode 100644
index 000000000..c0401f869
--- /dev/null
+++ b/rt/lib/RT/I18N/ja.po
@@ -0,0 +1,4822 @@
+# Japanese translation by Interactive Artists LLC 
+# 0.1 2002 08 15
+msgid ""
+msgstr ""
+"Project-Id-Version: RT 2.1.x\n"
+"POT-Creation-Date: 2002-05-02 11:36+0800\n"
+"PO-Revision-Date: 2002-05-13 02:00+0800\n"
+"Last-Translator: Jesse Vincent <jesse@bestpractical.com>\n"
+"Language-Team: rt-devel <rt-devel@lists.fsck.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: html/Elements/MyRequests:28 html/Elements/MyTickets:28
+msgid "#"
+msgstr "#"
+
+#: html/Admin/Queues/Scrip.html:55
+#. ($QueueObj->id)
+msgid "#%1"
+msgstr ""
+
+#: html/Approvals/Elements/ShowDependency:50 html/Ticket/Display.html:26 html/Ticket/Display.html:30
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "#%1: %2"
+msgstr ""
+
+#: lib/RT/Date.pm:337
+#. ($s, $time_unit)
+msgid "%1 %2"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:771
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr ""
+
+#: lib/RT/Date.pm:373
+#. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
+msgid "%1 %2 %3 %4:%5:%6 %7"
+msgstr "%1 %2 %3 %4:%5:%6 %7"
+
+#: lib/RT/Ticket_Overlay.pm:3438 lib/RT/Transaction_Overlay.pm:559 lib/RT/Transaction_Overlay.pm:601
+#. ($cf->Name, $new_value->Content)
+#. ($field, $self->NewValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 added"
+msgstr ""
+
+#: lib/RT/Date.pm:334
+#. ($s, $time_unit)
+msgid "%1 %2 ago"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3444 lib/RT/Transaction_Overlay.pm:566
+#. ($cf->Name, $old_value, $new_value->Content)
+#. ($field, $self->OldValue, $self->NewValue)
+msgid "%1 %2 changed to %3"
+msgstr "%3�変更�れ�%1 %2 "
+
+#: lib/RT/Ticket_Overlay.pm:3441 lib/RT/Transaction_Overlay.pm:562 lib/RT/Transaction_Overlay.pm:607
+#. ($cf->Name, $old_value)
+#. ($field, $self->OldValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 of group %3"
+msgstr ""
+
+#: html/Admin/Elements/EditScrips:44 html/Admin/Elements/ListGlobalScrips:28
+#. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
+msgid "%1 %2 with template %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 this ticket\\n"
+msgstr "%1 (%2) %3 ���ケット\\n"
+
+#: html/Search/Listing.html:57
+#. (($session{'tickets'}->FirstRow+1), ($session{'tickets'}->FirstRow() + $session{'tickets'}->RowsPerPage()  ))
+msgid "%1 - %2 shown"
+msgstr ""
+
+#: bin/rt-crontool:169 bin/rt-crontool:176 bin/rt-crontool:182
+#. ("--search-argument", "--search")
+#. ("--condition-argument", "--condition")
+#. ("--action-argument", "--action")
+msgid "%1 - An argument to pass to %2"
+msgstr ""
+
+#: bin/rt-crontool:185
+#. ("--verbose")
+msgid "%1 - Output status updates to STDOUT"
+msgstr ""
+
+#: bin/rt-crontool:179
+#. ("--action")
+msgid "%1 - Specify the action module you want to use"
+msgstr ""
+
+#: bin/rt-crontool:173
+#. ("--condition")
+msgid "%1 - Specify the condition module you want to use"
+msgstr ""
+
+#: bin/rt-crontool:166
+#. ("--search")
+msgid "%1 - Specify the search module you want to use"
+msgstr ""
+
+#: lib/RT/ScripAction_Overlay.pm:122
+#. ($self->Id)
+msgid "%1 ScripAction loaded"
+msgstr "%1スクリプトアクションロード����"
+
+#: lib/RT/Ticket_Overlay.pm:3471
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 added as a value for %2"
+msgstr "%2����リュー�%1�追加�れ���"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on"
+msgstr "%1aliasesを動������ケットID�必���"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on "
+msgstr "%1aliasesを動������ケットID�必��� "
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on (from %2) %3"
+msgstr "%1aliasesを動������ケットID�必���(%2�ら) %3"
+
+#: lib/RT/Link_Overlay.pm:117 lib/RT/Link_Overlay.pm:124
+#. ($args{'Base'})
+#. ($args{'Target'})
+msgid "%1 appears to be a local object, but can't be found in the database"
+msgstr ""
+
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:483
+#. ($self->BriefDescription , $self->CreatorObj->Name)
+#. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
+msgid "%1 by %2"
+msgstr "%2�よる%1"
+
+#: lib/RT/Transaction_Overlay.pm:537 lib/RT/Transaction_Overlay.pm:626 lib/RT/Transaction_Overlay.pm:635 lib/RT/Transaction_Overlay.pm:638
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
+#. ($self->Field , $q1->Name , $q2->Name)
+#. ($self->Field, $t2->AsString, $t1->AsString)
+#. ($self->Field, $self->OldValue, $self->NewValue)
+msgid "%1 changed from %2 to %3"
+msgstr "%1�%2�ら%3�変更�れ���"
+
+#: lib/RT/Interface/Web.pm:857
+msgid "%1 could not be set to %2."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 couldn't init a transaction (%2)\\n"
+msgstr "%1�トランザクションを���る�������ん���(%2)\\n"
+
+#: lib/RT/Ticket_Overlay.pm:2813
+#. ($self)
+msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
+msgstr "%1�分解�るステータスを設定����ん���。RT�データベース�一貫性����能性��り��。"
+
+#: html/Elements/MyTickets:25
+#. ($rows)
+msgid "%1 highest priority tickets I own..."
+msgstr ""
+
+#: html/Elements/MyRequests:25
+#. ($rows)
+msgid "%1 highest priority tickets I requested..."
+msgstr ""
+
+#: bin/rt-crontool:161
+#. ($0)
+msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:743
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this queue."
+msgstr "%1���キュー��%2���り��ん"
+
+#: lib/RT/Ticket_Overlay.pm:1570
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this ticket."
+msgstr "%1����ケット��%2���り��ん"
+
+#: lib/RT/Ticket_Overlay.pm:3527
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 is no longer a value for custom field %2"
+msgstr "%1�カスタムフィールド%2��リュー��り��ん"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 isn't a valid Queue id."
+msgstr "%1�有効�キューID���り��ん。"
+
+#: html/Ticket/Elements/ShowBasics:36
+#. ($TimeWorked)
+msgid "%1 min"
+msgstr "%1分"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 not shown"
+msgstr "%1表示�れ��ん"
+
+#: html/User/Elements/DelegateRights:76
+#. (loc($ObjectType =~ /^RT::(.*)$/))
+msgid "%1 rights"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 succeeded\\n"
+msgstr "%1 �功����\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for $MessageId"
+msgstr "%1タイプ�$MessageIdID���明��"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for %2"
+msgstr "%1タイプ�%2���明��"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 was created without a CurrentUser\\n"
+msgstr ""
+
+#: lib/RT/Action/ResolveMembers.pm:42
+#. (ref $self)
+msgid "%1 will resolve all members of a resolved group ticket."
+msgstr "%1�分解�れ�グループ�ケット�����メン�ーを分解���。"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr "%1�も�リンク�れ�リクエスト�従属者（も���メン�ー）��る��[ローカル]ベースを行�詰�ら�る����り��。"
+
+#: lib/RT/Transaction_Overlay.pm:435
+#. ($self)
+msgid "%1: no attachment specified"
+msgstr "%1:アタッ�メント�特定����ん"
+
+#: html/Ticket/Elements/ShowTransaction:102
+#. ($size)
+msgid "%1b"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransaction:99
+#. (int($size/102.4)/10)
+msgid "%1k"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1140
+#. ($args{'Status'})
+msgid "'%1' is an invalid value for status"
+msgstr "%1'�ステータス�無効��リュー��"
+
+#: NOT FOUND IN SOURCE
+msgid "'%1' not a recognized action. "
+msgstr "%1' アクションを�識����ん���。"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete group member)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete scrip)"
+msgstr "（スクリプトを削除�る����ェックボックス）"
+
+#: html/Admin/Elements/EditQueueWatchers:29 html/Admin/Elements/EditScrips:35 html/Admin/Elements/EditTemplates:36 html/Admin/Groups/Members.html:52 html/Ticket/Elements/EditLinks:33 html/Ticket/Elements/EditPeople:46 html/User/Groups/Members.html:55
+msgid "(Check box to delete)"
+msgstr "（削除�����ェックボックス）"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check boxes to delete)"
+msgstr ""
+
+#: html/Ticket/Create.html:178
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr "（�ケットID���URLsを空欄�区切��入力������）"
+
+#: html/Admin/Queues/Modify.html:54 html/Admin/Queues/Modify.html:60
+#. ($RT::CorrespondAddress)
+#. ($RT::CommentAddress)
+msgid "(If left blank, will default to %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(No Value)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:33 html/Admin/Elements/ListGlobalCustomFields:32
+msgid "(No custom fields)"
+msgstr ""
+
+#: html/Admin/Groups/Members.html:50 html/User/Groups/Members.html:53
+msgid "(No members)"
+msgstr "（メン�ー��）"
+
+#: html/Admin/Elements/EditScrips:32 html/Admin/Elements/ListGlobalScrips:32
+msgid "(No scrips)"
+msgstr "（スクリプト��）"
+
+#: html/Admin/Elements/EditTemplates:31
+msgid "(No templates)"
+msgstr ""
+
+#: html/Ticket/Update.html:85
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "（Eメールアドレス���るカンマ�区切られ�リスト��正確�アップデート�ブラインドコピーを�る。今後�アップデートを誰��信�る��<b>変更����ん</b>）"
+
+#: html/Ticket/Create.html:79
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
+msgstr ""
+
+#: html/Ticket/Update.html:81
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "（Eメールアドレス���るカンマ�区切られ�リスト��正確�アップデート�コピーを�る。今後�アップデートを誰��信�る��<b>変更����ん</b>）"
+
+#: html/Ticket/Create.html:69
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
+msgstr ""
+
+#: html/Admin/Groups/index.html:33 html/User/Groups/index.html:33
+msgid "(empty)"
+msgstr "（空）"
+
+#: html/Admin/Users/index.html:39
+msgid "(no name listed)"
+msgstr ""
+
+#: html/Elements/MyRequests:43 html/Elements/MyTickets:45
+msgid "(no subject)"
+msgstr "（サブジェクト��）"
+
+#: html/Admin/Elements/SelectRights:48 html/Elements/SelectCustomFieldValue:30 html/Ticket/Elements/EditCustomField:59 html/Ticket/Elements/ShowCustomFields:36 lib/RT/Transaction_Overlay.pm:536
+msgid "(no value)"
+msgstr "（�リュー��）"
+
+#: html/Ticket/Elements/EditLinks:116
+msgid "(only one ticket)"
+msgstr "（�����ケット��）"
+
+#: html/Elements/MyRequests:52 html/Elements/MyTickets:55
+msgid "(pending approval)"
+msgstr ""
+
+#: html/Elements/MyRequests:54 html/Elements/MyTickets:57
+msgid "(pending other tickets)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(requestor's group)"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:50
+msgid "(required)"
+msgstr "（必���）"
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "(untitled)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr "��所有���る25�最も���優先権"
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr "��リクエスト��25�最も���優先権"
+
+#: html/Ticket/Elements/ShowBasics:32
+msgid "<% $Ticket->Status%>"
+msgstr ""
+
+#: html/Elements/SelectTicketTypes:27
+msgid "<% $_ %>"
+msgstr ""
+
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:26
+#. ($m->scomp('/Elements/SelectNewTicketQueue'))
+msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
+msgstr "<input type=\"submit\" value=\"新���ケット\">&nbsp;%1"
+
+#: etc/initialdata:203
+msgid "A blank template"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Loaded"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be found"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:157 lib/RT/Principal_Overlay.pm:181
+msgid "ACE not found"
+msgstr "エース����り��ん"
+
+#: lib/RT/ACE_Overlay.pm:831
+msgid "ACEs can only be created and deleted."
+msgstr "エース�作��削除����。"
+
+#: bin/rt-commit-handler:755
+msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgstr "�図的����ケット�修正を防����強制終了���。\\n"
+
+#: html/User/Elements/Tabs:32
+msgid "About me"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:80
+msgid "Access control"
+msgstr "アクセスコントロール"
+
+#: html/Admin/Elements/EditScrip:57
+msgid "Action"
+msgstr "アクション"
+
+#: lib/RT/Scrip_Overlay.pm:147
+#. ($args{'ScripAction'})
+msgid "Action %1 not found"
+msgstr "アクション%1�見��り��ん"
+
+#: bin/rt-crontool:123
+msgid "Action committed."
+msgstr ""
+
+#: bin/rt-crontool:119
+msgid "Action prepared..."
+msgstr ""
+
+#: html/Search/Bulk.html:92
+msgid "Add AdminCc"
+msgstr "管�Ccを追加�る"
+
+#: html/Search/Bulk.html:90
+msgid "Add Cc"
+msgstr "Ccを追加�る"
+
+#: html/Ticket/Create.html:114 html/Ticket/Update.html:100
+msgid "Add More Files"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add Next State"
+msgstr ""
+
+#: html/Search/Bulk.html:88
+msgid "Add Requestor"
+msgstr "リクエスト�る人をを追加�る"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip to this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip which will apply to all queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a new a global scrip"
+msgstr "新��グロー�ルスクリプトを追加�る"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a scrip to this queue"
+msgstr "��キュー�スクリプトを追加�る"
+
+#: html/Admin/Global/Scrip.html:55
+msgid "Add a scrip which will apply to all queues"
+msgstr "����キュー��応�るスクリプトを追加�る"
+
+#: html/Search/Bulk.html:118
+msgid "Add comments or replies to selected tickets"
+msgstr "�択�れ��ケット��コメント���返事を追加�る"
+
+#: html/Admin/Groups/Members.html:42 html/User/Groups/Members.html:39
+msgid "Add members"
+msgstr "メン�ーを追加�る"
+
+#: html/Admin/Queues/People.html:66 html/Ticket/Elements/AddWatchers:28
+msgid "Add new watchers"
+msgstr "新��ウォッ�ャーを追加�る"
+
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:643
+#. ($args{'Type'})
+msgid "Added principal as a %1 for this queue"
+msgstr "��キュー�%1�責任者を追加����"
+
+#: lib/RT/Ticket_Overlay.pm:1454
+#. ($self->loc($args{'Type'}))
+msgid "Added principal as a %1 for this ticket"
+msgstr "���ケット�%1�責任者を追加����"
+
+#: html/Admin/Elements/ModifyUser:76 html/Admin/Users/Modify.html:122 html/User/Prefs.html:88
+msgid "Address1"
+msgstr "�所1"
+
+#: html/Admin/Elements/ModifyUser:78 html/Admin/Users/Modify.html:127 html/User/Prefs.html:90
+msgid "Address2"
+msgstr "�所2"
+
+#: html/Ticket/Create.html:74
+msgid "Admin Cc"
+msgstr "管�Cc"
+
+#: etc/initialdata:274
+msgid "Admin Comment"
+msgstr ""
+
+#: etc/initialdata:256
+msgid "Admin Correspondence"
+msgstr ""
+
+#: html/Admin/Queues/index.html:25 html/Admin/Queues/index.html:28
+msgid "Admin queues"
+msgstr "管�キュー"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin users"
+msgstr "管�ユーザー"
+
+#: html/Admin/Global/index.html:26 html/Admin/Global/index.html:28
+msgid "Admin/Global configuration"
+msgstr "管�/グロー�ル設定"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Groups"
+msgstr "管�/グループ"
+
+#: html/Admin/Queues/Modify.html:25 html/Admin/Queues/Modify.html:29
+msgid "Admin/Queue/Basics"
+msgstr "管�/キュー/基本"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr ""
+
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:39 html/Ticket/Update.html:50 lib/RT/ACE_Overlay.pm:89
+msgid "AdminCc"
+msgstr "管�Cc"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "AdminCustomFields"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "AdminGroup"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "AdminGroupMembership"
+msgstr ""
+
+#: lib/RT/System.pm:59
+msgid "AdminOwnPersonalGroups"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "AdminQueue"
+msgstr ""
+
+#: lib/RT/System.pm:60
+msgid "AdminUsers"
+msgstr ""
+
+#: html/Admin/Queues/People.html:48 html/Ticket/Elements/EditPeople:54
+msgid "Administrative Cc"
+msgstr "管�者Cc"
+
+#: NOT FOUND IN SOURCE
+msgid "Admins"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search"
+msgstr "絞込�検索"
+
+#: html/Elements/SelectDateRelation:36
+msgid "After"
+msgstr "後"
+
+#: NOT FOUND IN SOURCE
+msgid "Age"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Alias"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Alias for"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:96
+msgid "All Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:53
+msgid "All Queues"
+msgstr "����キュー"
+
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
+msgstr ""
+
+#: html/Elements/Tabs:58
+msgid "Approval"
+msgstr ""
+
+#: html/Approvals/Display.html:46 html/Approvals/Elements/Approve:27 html/Approvals/Elements/ShowDependency:42 html/Approvals/index.html:65
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($ticket->id, $msg)
+#. ($ticket->Id, $ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Approval #%1: %2"
+msgstr ""
+
+#: html/Approvals/index.html:54
+#. ($ticket->Id)
+msgid "Approval #%1: Notes not recorded due to a system error"
+msgstr ""
+
+#: html/Approvals/index.html:52
+#. ($ticket->Id)
+msgid "Approval #%1: Notes recorded"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Details"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Approval diagram"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:45
+msgid "Approve"
+msgstr ""
+
+#: etc/initialdata:431 etc/upgrade/2.1.71:148
+msgid "Approver's notes: %1"
+msgstr ""
+
+#: lib/RT/Date.pm:414
+msgid "Apr."
+msgstr "四月"
+
+#: NOT FOUND IN SOURCE
+msgid "April"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:35
+msgid "Ascending"
+msgstr "昇順"
+
+#: html/Search/Bulk.html:127 html/SelfService/Update.html:36 html/Ticket/ModifyAll.html:83 html/Ticket/Update.html:100
+msgid "Attach"
+msgstr "添付"
+
+#: html/SelfService/Create.html:67 html/Ticket/Create.html:110
+msgid "Attach file"
+msgstr "添付ファイル"
+
+#: html/Ticket/Create.html:98 html/Ticket/Update.html:89
+msgid "Attached file"
+msgstr ""
+
+#: html/SelfService/Attachment/dhandler:36
+msgid "Attachment '%1' could not be loaded"
+msgstr "添付ファイル%1�見��り��ん"
+
+#: lib/RT/Transaction_Overlay.pm:443
+msgid "Attachment created"
+msgstr "添付ファイル�作��れ���"
+
+#: lib/RT/Tickets_Overlay.pm:1189
+msgid "Attachment filename"
+msgstr "添付ファイル�"
+
+#: html/Ticket/Elements/ShowAttachments:26
+msgid "Attachments"
+msgstr "添付ファイル"
+
+#: lib/RT/Date.pm:418
+msgid "Aug."
+msgstr "八月"
+
+#: NOT FOUND IN SOURCE
+msgid "August"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:66
+msgid "AuthSystem"
+msgstr "自動システム"
+
+#: etc/initialdata:206
+msgid "Autoreply"
+msgstr ""
+
+#: etc/initialdata:72
+msgid "Autoreply To Requestors"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Bad PGP Signature: %1\\n"
+msgstr "悪�PGP署�: %1\\n"
+
+#: html/SelfService/Attachment/dhandler:40
+msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
+msgstr "悪�添付ID��。添付ファイル�見��り��ん'%1'\\n"
+
+#: bin/rt-commit-handler:827
+#. ($val)
+msgid "Bad data in %1"
+msgstr "%1�悪�データ��"
+
+#: html/SelfService/Attachment/dhandler:43
+#. ($trans, $AttachmentObj->TransactionId())
+msgid "Bad transaction number for attachment. %1 should be %2\\n"
+msgstr "添付ファイル����悪�トランザクションナン�ー��。%1�%2\\n�����"
+
+#: html/Admin/Elements/GroupTabs:39 html/Admin/Elements/QueueTabs:39 html/Admin/Elements/UserTabs:38 html/Ticket/Elements/Tabs:90 html/User/Elements/GroupTabs:38
+msgid "Basics"
+msgstr "基本"
+
+#: html/Ticket/Update.html:83
+msgid "Bcc"
+msgstr "Bcc"
+
+#: html/Admin/Elements/EditScrip:88 html/Admin/Global/GroupRights.html:85 html/Admin/Global/Template.html:46 html/Admin/Global/UserRights.html:54 html/Admin/Groups/GroupRights.html:73 html/Admin/Groups/Members.html:81 html/Admin/Groups/Modify.html:56 html/Admin/Groups/UserRights.html:55 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:45 html/Admin/Queues/UserRights.html:54 html/User/Groups/Modify.html:56
+msgid "Be sure to save your changes"
+msgstr "本当�変更を�存��もよ������"
+
+#: html/Elements/SelectDateRelation:34 lib/RT/CurrentUser.pm:322
+msgid "Before"
+msgstr "�"
+
+#: NOT FOUND IN SOURCE
+msgid "Begin Approval"
+msgstr ""
+
+#: etc/initialdata:202
+msgid "Blank"
+msgstr ""
+
+#: html/Search/Listing.html:79
+msgid "Bookmarkable URL for this search"
+msgstr "��検索�ブックマーク���るURL��"
+
+#: html/Ticket/Elements/ShowHistory:39 html/Ticket/Elements/ShowHistory:45
+msgid "Brief headers"
+msgstr "短�ヘッダー"
+
+#: html/Search/Bulk.html:25 html/Search/Bulk.html:26
+msgid "Bulk ticket update"
+msgstr "�ケット�一括アップデート"
+
+#: lib/RT/User_Overlay.pm:1331
+msgid "Can not modify system users"
+msgstr "システムユーザーを修正����ん"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "Can this principal see this queue"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:144
+msgid "Can't add a custom field value without a name"
+msgstr "�����カスタムフィールド�リュー�追加�����ん"
+
+#: lib/RT/Link_Overlay.pm:132
+msgid "Can't link a ticket to itself"
+msgstr "�ケット自体��リンク����ん"
+
+#: lib/RT/Ticket_Overlay.pm:2787
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr "��������ケット��������ん。��エラー�決��出��������"
+
+#: lib/RT/Ticket_Overlay.pm:2605 lib/RT/Ticket_Overlay.pm:2674
+msgid "Can't specifiy both base and target"
+msgstr "ベース�ターゲットを特定����ん"
+
+#: html/autohandler:112
+#. ($msg)
+msgid "Cannot create user: %1"
+msgstr "ユーザー: %1を作�����ん"
+
+#: etc/initialdata:50 html/Admin/Queues/People.html:44 html/SelfService/Create.html:51 html/SelfService/Display.html:50 html/Ticket/Create.html:64 html/Ticket/Elements/EditPeople:51 html/Ticket/Elements/ShowPeople:35 html/Ticket/Update.html:45 html/Ticket/Update.html:78 lib/RT/ACE_Overlay.pm:88
+msgid "Cc"
+msgstr "Cc"
+
+#: html/SelfService/Prefs.html:31
+msgid "Change password"
+msgstr "パスワードを変更�る"
+
+#: html/Ticket/Create.html:101 html/Ticket/Update.html:92
+msgid "Check box to delete"
+msgstr ""
+
+#: html/Admin/Elements/SelectRights:31
+msgid "Check box to revoke right"
+msgstr "権利を無効��る�ェックボックス"
+
+#: html/Ticket/Create.html:183 html/Ticket/Elements/EditLinks:131 html/Ticket/Elements/EditLinks:69 html/Ticket/Elements/ShowLinks:51
+msgid "Children"
+msgstr "�供"
+
+#: html/Admin/Elements/ModifyUser:80 html/Admin/Users/Modify.html:132 html/User/Prefs.html:92
+msgid "City"
+msgstr "町"
+
+#: html/Ticket/Elements/ShowDates:47
+msgid "Closed"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:60
+msgid "Closed requests"
+msgstr "終了��リクエスト��"
+
+#: NOT FOUND IN SOURCE
+msgid "Code"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Command not understood!\\n"
+msgstr "�解�����コマンド!\\n"
+
+#: html/Ticket/Elements/ShowTransaction:179 html/Ticket/Elements/Tabs:153
+msgid "Comment"
+msgstr "コメント"
+
+#: html/Admin/Elements/ModifyQueue:45 html/Admin/Queues/Modify.html:58
+msgid "Comment Address"
+msgstr "コメントアドレス"
+
+#: NOT FOUND IN SOURCE
+msgid "Comment not recorded"
+msgstr "記録�れ����コメント"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "Comment on tickets"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "CommentOnTicket"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:35
+msgid "Comments"
+msgstr "コメント"
+
+#: html/Ticket/ModifyAll.html:70 html/Ticket/Update.html:70
+msgid "Comments (Not sent to requestors)"
+msgstr "コメント（リクエス���人���信�れ��ん）"
+
+#: html/Search/Bulk.html:122
+msgid "Comments (not sent to requestors)"
+msgstr "コメント（リクエス���人���信�れ��ん）"
+
+#: html/Elements/ViewUser:27
+#. ($name)
+msgid "Comments about %1"
+msgstr "%1�����コメント"
+
+#: html/Admin/Users/Modify.html:185 html/Ticket/Elements/ShowRequestor:44
+msgid "Comments about this user"
+msgstr "��ユーザー�����コメント"
+
+#: lib/RT/Transaction_Overlay.pm:545
+msgid "Comments added"
+msgstr "コメント�追加�れ���"
+
+#: lib/RT/Action/Generic.pm:140
+msgid "Commit Stubbed"
+msgstr "コメント�短��れ���"
+
+#: NOT FOUND IN SOURCE
+msgid "Compile Restrictions"
+msgstr "コンパイル�制"
+
+#: html/Admin/Elements/EditScrip:41
+msgid "Condition"
+msgstr "コンディション"
+
+#: bin/rt-crontool:109
+msgid "Condition matches..."
+msgstr ""
+
+#: lib/RT/Scrip_Overlay.pm:160
+msgid "Condition not found"
+msgstr "コンディション�見��り��ん"
+
+#: html/Elements/Tabs:52
+msgid "Configuration"
+msgstr "設定"
+
+#: html/SelfService/Prefs.html:33
+msgid "Confirm"
+msgstr "確�"
+
+#: html/Admin/Elements/ModifyUser:60
+msgid "ContactInfoSystem"
+msgstr "コンタクト情報"
+
+#: NOT FOUND IN SOURCE
+msgid "Contacted date '%1' could not be parsed"
+msgstr "コンタクト�れ�日��'%1'を解�����ん���"
+
+#: html/Admin/Elements/ModifyTemplate:44 html/Ticket/ModifyAll.html:87
+msgid "Content"
+msgstr "情報"
+
+#: NOT FOUND IN SOURCE
+msgid "Coould not create group"
+msgstr ""
+
+#: etc/initialdata:266
+msgid "Correspondence"
+msgstr ""
+
+#: html/Admin/Elements/ModifyQueue:39 html/Admin/Queues/Modify.html:51
+msgid "Correspondence Address"
+msgstr "メールアドレス"
+
+#: lib/RT/Transaction_Overlay.pm:541
+msgid "Correspondence added"
+msgstr "通信�追加�れ���"
+
+#: NOT FOUND IN SOURCE
+msgid "Correspondence not recorded"
+msgstr "記録�れ����通信"
+
+#: lib/RT/Ticket_Overlay.pm:3458
+msgid "Could not add new custom field value for ticket. "
+msgstr "�ケット�新��カスタムフィールド�リューを追加����ん���"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not add new custom field value for ticket. %1 "
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2963 lib/RT/Ticket_Overlay.pm:2971 lib/RT/Ticket_Overlay.pm:2987
+msgid "Could not change owner. "
+msgstr "オーナー変更�����ん���"
+
+#: html/Admin/Elements/EditCustomField:68 html/Admin/Elements/EditCustomFields:166
+#. ($msg)
+msgid "Could not create CustomField"
+msgstr "カスタムフィールド�作������ん���"
+
+#: html/User/Groups/Modify.html:77 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
+msgid "Could not create group"
+msgstr "グループ�作������ん���"
+
+#: html/Admin/Global/Template.html:75 html/Admin/Queues/Template.html:72
+#. ($msg)
+msgid "Could not create template: %1"
+msgstr "テンプレート: %1�作������ん���"
+
+#: lib/RT/Ticket_Overlay.pm:1073 lib/RT/Ticket_Overlay.pm:333
+msgid "Could not create ticket. Queue not set"
+msgstr "�ケット�作������ん���。キュー�セット�れ����ん"
+
+#: lib/RT/User_Overlay.pm:208 lib/RT/User_Overlay.pm:220 lib/RT/User_Overlay.pm:238 lib/RT/User_Overlay.pm:414
+msgid "Could not create user"
+msgstr "ユーザー�作������ん���"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not create watcher for requestor"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find a ticket with id %1"
+msgstr "�ケット���ID%1�見��り��ん���"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find group %1."
+msgstr "グループ %1�見��り��ん���"
+
+#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1422
+msgid "Could not find or create that user"
+msgstr "��ユーザーを作����見��る�������ん���"
+
+#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1501
+msgid "Could not find that principal"
+msgstr "��責任者を見��る�������ん���"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find user %1."
+msgstr "ユーザー%1を見��る�������ん���"
+
+#: html/Admin/Groups/Members.html:88 html/User/Groups/Members.html:90 html/User/Groups/Modify.html:82
+msgid "Could not load group"
+msgstr "グループをロード����ん���"
+
+#: lib/RT/Queue_Overlay.pm:641
+#. ($args{'Type'})
+msgid "Could not make that principal a %1 for this queue"
+msgstr "��キュー���責任者を%1��る�������ん���"
+
+#: lib/RT/Ticket_Overlay.pm:1443
+#. ($self->loc($args{'Type'}))
+msgid "Could not make that principal a %1 for this ticket"
+msgstr "���ケット���責任者を%1��る�������ん���"
+
+#: lib/RT/Queue_Overlay.pm:740
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this queue"
+msgstr "��キュー���責任者を%1���削除�る�������ん���"
+
+#: lib/RT/Ticket_Overlay.pm:1559
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this ticket"
+msgstr "���ケット���責任者を%1���削除�る�������ん���"
+
+#: lib/RT/Group_Overlay.pm:985
+msgid "Couldn't add member to group"
+msgstr "グループ�メン�ー�追加�����ん���"
+
+#: lib/RT/Ticket_Overlay.pm:3468 lib/RT/Ticket_Overlay.pm:3524
+#. ($Msg)
+msgid "Couldn't create a transaction: %1"
+msgstr "トランザクション: %1�作������ん���"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't figure out what to do from gpg's reply\\n"
+msgstr "GPG�返事\\n�ら何を行��らよ�����り��ん���"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find group\\n"
+msgstr "グループ\\n�見��り��ん���"
+
+#: lib/RT/Interface/Web.pm:866
+msgid "Couldn't find row"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:959
+msgid "Couldn't find that principal"
+msgstr "責任者�見��り��ん���"
+
+#: lib/RT/CustomField_Overlay.pm:175
+msgid "Couldn't find that value"
+msgstr "���リュー�見��り��ん���"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find that watcher"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find user\\n"
+msgstr "ユーザー\\n�見��り��ん���"
+
+#: lib/RT/CurrentUser.pm:112
+#. ($self->Id)
+msgid "Couldn't load %1 from the users database.\\n"
+msgstr "ユーザーデータベース\\n�ら%1をロード����ん���"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load KeywordSelects."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load RT config file '%1' %2"
+msgstr "RT設定ファイル'%1' %2をロード����ん���"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load Scrips."
+msgstr "スクリプトをロード����ん���"
+
+#: html/Admin/Groups/GroupRights.html:88 html/Admin/Groups/UserRights.html:75
+#. ($id)
+msgid "Couldn't load group %1"
+msgstr "グループ%1をロード����ん���"
+
+#: lib/RT/Link_Overlay.pm:175 lib/RT/Link_Overlay.pm:184 lib/RT/Link_Overlay.pm:211
+msgid "Couldn't load link"
+msgstr "リンクをロード����ん���"
+
+#: html/Admin/Elements/EditCustomFields:147 html/Admin/Queues/People.html:121
+#. ($id)
+msgid "Couldn't load queue"
+msgstr "キューをロード����ん���"
+
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:72
+#. ($id)
+msgid "Couldn't load queue %1"
+msgstr "キュー%1をロード����ん���"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load scrip"
+msgstr "スクリプトをロード����ん���"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load template"
+msgstr "テンプレートをロード����ん���"
+
+#: html/Admin/Users/Prefs.html:79
+#. ($id)
+msgid "Couldn't load that user (%1)"
+msgstr "��ユーザー（%1）をロード����ん���"
+
+#: html/SelfService/Display.html:166
+#. ($id)
+msgid "Couldn't load ticket '%1'"
+msgstr "�ケット'%1'をロード����ん���"
+
+#: html/Admin/Elements/ModifyUser:86 html/Admin/Users/Modify.html:149 html/User/Prefs.html:98
+msgid "Country"
+msgstr "国"
+
+#: html/Admin/Elements/CreateUserCalled:26 html/Ticket/Create.html:135 html/Ticket/Create.html:195
+msgid "Create"
+msgstr "作�"
+
+#: etc/initialdata:128
+msgid "Create Tickets"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:58
+msgid "Create a CustomField"
+msgstr "カスタムフィールド�作�"
+
+#: html/Admin/Queues/CustomField.html:48
+#. ($QueueObj->Name())
+msgid "Create a CustomField for queue %1"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:48
+msgid "Create a CustomField which applies to all queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new Custom Field"
+msgstr "新��カスタムフィールド�作�"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global Scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global scrip"
+msgstr "新��グロー�ルスクリプト�作�"
+
+#: html/Admin/Groups/Modify.html:67 html/Admin/Groups/Modify.html:93
+msgid "Create a new group"
+msgstr "新��グループ�作�"
+
+#: html/User/Groups/Modify.html:67 html/User/Groups/Modify.html:92
+msgid "Create a new personal group"
+msgstr "新��個人グループ�作�"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new queue"
+msgstr "新��キュー�作�"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new template"
+msgstr "新��テンプレート�作�"
+
+#: html/SelfService/Create.html:30 html/Ticket/Create.html:25 html/Ticket/Create.html:28 html/Ticket/Create.html:36
+msgid "Create a new ticket"
+msgstr "新���ケット�作�"
+
+#: html/Admin/Users/Modify.html:214 html/Admin/Users/Modify.html:241
+msgid "Create a new user"
+msgstr "新��ユーザー�作�"
+
+#: html/Admin/Queues/Modify.html:103
+msgid "Create a queue"
+msgstr "キュー�作�"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a queue called"
+msgstr "呼�出�れ�キュー�作�"
+
+#: html/SelfService/Create.html:25 html/SelfService/Create.html:27
+msgid "Create a request"
+msgstr "リクエスト�作�"
+
+#: html/Admin/Queues/Scrip.html:59
+#. ($QueueObj->Name)
+msgid "Create a scrip for queue %1"
+msgstr ""
+
+#: html/Admin/Global/Template.html:69 html/Admin/Queues/Template.html:65
+msgid "Create a template"
+msgstr "テンプレート�作�"
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1 / %2 / %3 "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1/%2/%3"
+msgstr ""
+
+#: etc/initialdata:130
+msgid "Create new tickets based on this scrip's template"
+msgstr ""
+
+#: html/SelfService/Create.html:81
+msgid "Create ticket"
+msgstr "�ケット�作�"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "Create tickets in this queue"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "Create, delete and modify custom fields"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "Create, delete and modify queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
+msgstr ""
+
+#: lib/RT/System.pm:59
+msgid "Create, delete and modify the members of personal groups"
+msgstr ""
+
+#: lib/RT/System.pm:60
+msgid "Create, delete and modify users"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "CreateTicket"
+msgstr ""
+
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1167
+msgid "Created"
+msgstr "作�����"
+
+#: html/Admin/Elements/EditCustomField:71
+#. ($CustomFieldObj->Name())
+msgid "Created CustomField %1"
+msgstr "カスタムフィールド%1を作�����"
+
+#: NOT FOUND IN SOURCE
+msgid "Created template %1"
+msgstr "テンプレート%1を作�����"
+
+#: html/Ticket/Elements/EditLinks:28
+msgid "Current Relationships"
+msgstr "�在�関係"
+
+#: html/Admin/Elements/EditScrips:30
+msgid "Current Scrips"
+msgstr ""
+
+#: html/Admin/Groups/Members.html:39 html/User/Groups/Members.html:42
+msgid "Current members"
+msgstr "�在�メン�ー"
+
+#: html/Admin/Elements/SelectRights:29
+msgid "Current rights"
+msgstr "�在�権利"
+
+#: html/Search/Listing.html:71
+msgid "Current search criteria"
+msgstr ""
+
+#: html/Admin/Queues/People.html:41 html/Ticket/Elements/EditPeople:45
+msgid "Current watchers"
+msgstr "�在�ウォッ�ャー"
+
+#: html/Admin/Global/CustomField.html:55
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:53 html/Admin/Elements/SystemTabs:40 html/Admin/Global/index.html:50 html/Ticket/Elements/ShowSummary:35
+msgid "Custom Fields"
+msgstr "カスタムフィールド"
+
+#: html/Admin/Elements/EditScrip:73
+msgid "Custom action cleanup code"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:65
+msgid "Custom action preparation code"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:49
+msgid "Custom condition"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1618
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
+msgid "Custom field %1 %2 %3"
+msgstr "カスタムフィールド%1 %2 %3"
+
+#: lib/RT/Tickets_Overlay.pm:1613
+#. ($CF->Name)
+msgid "Custom field %1 has a value."
+msgstr "カスタムフィールド%1��リュー��り��"
+
+#: lib/RT/Tickets_Overlay.pm:1610
+#. ($CF->Name)
+msgid "Custom field %1 has no value."
+msgstr "カスタムフィールド%1��リュー��り��ん"
+
+#: lib/RT/Ticket_Overlay.pm:3360
+#. ($args{'Field'})
+msgid "Custom field %1 not found"
+msgstr "カスタムフィールド%1�見��り��ん"
+
+#: html/Admin/Elements/EditCustomFields:197
+msgid "Custom field deleted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3510
+msgid "Custom field not found"
+msgstr "カスタムフィールド�見��り��ん"
+
+#: lib/RT/CustomField_Overlay.pm:283
+#. ($args{'Content'}, $self->Name)
+msgid "Custom field value %1 could not be found for custom field %2"
+msgstr "カスタムフィールド%2����カスタムフィールド�リュー%1�見��り��ん"
+
+#: NOT FOUND IN SOURCE
+msgid "Custom field value changed from %1 to %2"
+msgstr "カスタムフィールド�%1�ら%2�変更�れ���"
+
+#: lib/RT/CustomField_Overlay.pm:185
+msgid "Custom field value could not be deleted"
+msgstr "カスタムフィールド�リュー�削除�れ��ん"
+
+#: lib/RT/CustomField_Overlay.pm:289
+msgid "Custom field value could not be found"
+msgstr "カスタムフィールド�リュー�見��り��ん"
+
+#: lib/RT/CustomField_Overlay.pm:183 lib/RT/CustomField_Overlay.pm:291
+msgid "Custom field value deleted"
+msgstr "カスタムフィールド�リュー�削除�れ���"
+
+#: lib/RT/Transaction_Overlay.pm:550
+msgid "CustomField"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Data error"
+msgstr ""
+
+#: html/Ticket/Create.html:161 html/Ticket/Elements/ShowSummary:53 html/Ticket/Elements/Tabs:93 html/Ticket/ModifyAll.html:44
+msgid "Dates"
+msgstr "日付"
+
+#: lib/RT/Date.pm:422
+msgid "Dec."
+msgstr "�二月"
+
+#: NOT FOUND IN SOURCE
+msgid "December"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr ""
+
+#: etc/initialdata:207
+msgid "Default Autoresponse template"
+msgstr ""
+
+#: etc/initialdata:275
+msgid "Default admin comment template"
+msgstr ""
+
+#: etc/initialdata:257
+msgid "Default admin correspondence template"
+msgstr ""
+
+#: etc/initialdata:267
+msgid "Default correspondence template"
+msgstr ""
+
+#: etc/initialdata:238
+msgid "Default transaction template"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:645
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr ""
+
+#: html/User/Delegation.html:25 html/User/Delegation.html:28
+msgid "Delegate rights"
+msgstr "代表者�権利"
+
+#: lib/RT/System.pm:63
+msgid "Delegate specific rights which have been granted to you."
+msgstr ""
+
+#: lib/RT/System.pm:63
+msgid "DelegateRights"
+msgstr ""
+
+#: html/User/Elements/Tabs:38
+msgid "Delegation"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Delete"
+msgstr "削除"
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "Delete tickets"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "DeleteTicket"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:187
+msgid "Deleting this object could break referential integrity"
+msgstr "��オブジェクトを削除�る�指示�完全性����れる�能性��り��"
+
+#: lib/RT/Queue_Overlay.pm:292
+msgid "Deleting this object would break referential integrity"
+msgstr "��オブジェクトを削除�る�指示�完全性����れ��"
+
+#: lib/RT/User_Overlay.pm:430
+msgid "Deleting this object would violate referential integrity"
+msgstr "��オブジェクトを削除�る�指示�完全性�妨害�れ��"
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity. That's bad."
+msgstr ""
+
+#: html/Approvals/Elements/Approve:46
+msgid "Deny"
+msgstr ""
+
+#: html/Ticket/Create.html:181 html/Ticket/Elements/EditLinks:123 html/Ticket/Elements/EditLinks:47 html/Ticket/Elements/ShowDependencies:32 html/Ticket/Elements/ShowLinks:35
+msgid "Depended on by"
+msgstr "次�も�次第��る"
+
+#: NOT FOUND IN SOURCE
+msgid "Dependencies: \\n"
+msgstr "従属�ケット: \\n"
+
+#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:180 html/Ticket/Elements/EditLinks:119 html/Ticket/Elements/EditLinks:36 html/Ticket/Elements/ShowDependencies:25 html/Ticket/Elements/ShowLinks:27
+msgid "Depends on"
+msgstr "�よる"
+
+#: NOT FOUND IN SOURCE
+msgid "DependsOn"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:35
+msgid "Descending"
+msgstr "�順�る"
+
+#: html/SelfService/Create.html:75 html/Ticket/Create.html:119
+msgid "Describe the issue below"
+msgstr "下��題点を表�"
+
+#: html/Admin/Elements/AddCustomFieldValue:27 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyQueue:36 html/Admin/Elements/ModifyTemplate:36 html/Admin/Groups/Modify.html:49 html/Admin/Queues/Modify.html:48 html/Elements/SelectGroups:27 html/User/Groups/Modify.html:49
+msgid "Description"
+msgstr "記述"
+
+#: html/SelfService/Elements/MyRequests:44
+msgid "Details"
+msgstr "詳細"
+
+#: html/Ticket/Elements/Tabs:85
+msgid "Display"
+msgstr "表�"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "Display Access Control List"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "Display Scrip templates for this queue"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "Display Scrips for this queue"
+msgstr ""
+
+#: html/Ticket/Elements/ShowHistory:35
+msgid "Display mode"
+msgstr "モードを表�"
+
+#: html/SelfService/Display.html:25 html/SelfService/Display.html:29
+#. ($Ticket->id)
+msgid "Display ticket #%1"
+msgstr "�ケット#%1を表�"
+
+#: lib/RT/System.pm:54
+msgid "Do anything and everything"
+msgstr ""
+
+#: html/Elements/Refresh:30
+msgid "Don't refresh this page."
+msgstr "��ページを更新��������"
+
+#: html/Search/Elements/PickRestriction:114
+msgid "Don't show search results"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "Download"
+msgstr "ダウンロード"
+
+#: html/Elements/SelectDateType:32 html/Ticket/Create.html:167 html/Ticket/Elements/EditDates:45 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1171
+msgid "Due"
+msgstr "期�切れ"
+
+#: NOT FOUND IN SOURCE
+msgid "Due date '%1' could not be parsed"
+msgstr "期��切れる日'%1'�解��れ��ん"
+
+#: bin/rt-commit-handler:754
+#. ($1, $msg)
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
+msgstr "ERROR: ��ケット '%1': %2.\\nをロード����ん���"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit"
+msgstr "編集"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit Conditions"
+msgstr ""
+
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr "%1�カスタムフィールドを編集�る"
+
+#: html/Ticket/ModifyLinks.html:36
+msgid "Edit Relationships"
+msgstr "関係を編集�る"
+
+#: html/Admin/Queues/Templates.html:41
+#. ($QueueObj->Name)
+msgid "Edit Templates for queue %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit keywords"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr "スクリプトを編集�る"
+
+#: html/Admin/Global/index.html:46
+msgid "Edit system templates"
+msgstr "システムテンプレートを編集�る"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit templates for %1"
+msgstr "%1�テンプレートを編集�る"
+
+#: html/Admin/Elements/ModifyQueue:25 html/Admin/Queues/Modify.html:117
+#. ($QueueObj->Name)
+#. ($QueueObj->Id)
+msgid "Editing Configuration for queue %1"
+msgstr "キュー%1�設定を編集�る"
+
+#: html/Admin/Elements/ModifyUser:25
+#. ($UserObj->Name)
+msgid "Editing Configuration for user %1"
+msgstr "ユーザー%1�設定を編集�る"
+
+#: html/Admin/Elements/EditCustomField:74
+#. ($CustomFieldObj->Name())
+msgid "Editing CustomField %1"
+msgstr "カスタムフィールド%1を編集�る"
+
+#: html/Admin/Groups/Members.html:32
+#. ($Group->Name)
+msgid "Editing membership for group %1"
+msgstr "グループ%1�会員を編集�る"
+
+#: html/User/Groups/Members.html:129
+#. ($Group->Name)
+msgid "Editing membership for personal group %1"
+msgstr "個人グループ%1�会員を編集�る"
+
+#: NOT FOUND IN SOURCE
+msgid "Editing template %1"
+msgstr "テンプレート%1を編集�る"
+
+#: lib/RT/Ticket_Overlay.pm:2615 lib/RT/Ticket_Overlay.pm:2683
+msgid "Either base or target must be specified"
+msgstr "ベースも���ターゲットを特定���れ��り��ん"
+
+#: html/Admin/Users/Modify.html:53 html/Admin/Users/Prefs.html:46 html/Elements/SelectUsers:27 html/Ticket/Elements/AddWatchers:56 html/User/Prefs.html:42
+msgid "Email"
+msgstr "Eメール"
+
+#: lib/RT/User_Overlay.pm:188
+msgid "Email address in use"
+msgstr "�使��Eメールアドレス"
+
+#: html/Admin/Elements/ModifyUser:42
+msgid "EmailAddress"
+msgstr "Eメールアドレス"
+
+#: html/Admin/Elements/ModifyUser:54
+msgid "EmailEncoding"
+msgstr "Eメールエンコーディング"
+
+#: html/Admin/Elements/EditCustomField:36
+msgid "Enabled (Unchecking this box disables this custom field)"
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:53 html/User/Groups/Modify.html:53
+msgid "Enabled (Unchecking this box disables this group)"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:84
+msgid "Enabled (Unchecking this box disables this queue)"
+msgstr "有効��り���（も�一度��ボックスを�ェック�る���キュー�有効����り��）"
+
+#: html/Admin/Elements/EditCustomFields:99
+msgid "Enabled Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:56
+msgid "Enabled Queues"
+msgstr "有効�キュー"
+
+#: html/Admin/Elements/EditCustomField:90 html/Admin/Groups/Modify.html:117 html/Admin/Queues/Modify.html:138 html/Admin/Users/Modify.html:283 html/User/Groups/Modify.html:117
+#. (loc_fuzzy($msg))
+msgid "Enabled status %1"
+msgstr "有効�ステータス%1"
+
+#: lib/RT/CustomField_Overlay.pm:361
+msgid "Enter multiple values"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:358
+msgid "Enter one value"
+msgstr ""
+
+#: html/Ticket/Elements/EditLinks:112
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "�ケットをリンク�る�ケット���URLsを入力������。入力�る項目������る場���スペース�区切������。"
+
+#: html/Elements/Login:29 html/SelfService/Error.html:25 html/SelfService/Error.html:26
+msgid "Error"
+msgstr "エラー"
+
+#: NOT FOUND IN SOURCE
+msgid "Error adding watcher"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:555
+msgid "Error in parameters to Queue->AddWatcher"
+msgstr "パラメーター�エラーQueue->AddWatcher"
+
+#: lib/RT/Queue_Overlay.pm:713
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr "パラメーター�エラーQueue->DelWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1356
+msgid "Error in parameters to Ticket->AddWatcher"
+msgstr "パラメーター�エラーTicket->AddWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1532
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr "パラメーター�エラーTicket->DelWatcher"
+
+#: etc/initialdata:20
+msgid "Everyone"
+msgstr ""
+
+#: bin/rt-crontool:194
+msgid "Example:"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:64
+msgid "ExternalAuthId"
+msgstr "外部��証ID"
+
+#: html/Admin/Elements/ModifyUser:58
+msgid "ExternalContactInfoId"
+msgstr "外部�コンタクト情報ID"
+
+#: html/Admin/Users/Modify.html:73
+msgid "Extra info"
+msgstr "��他�情報"
+
+#: lib/RT/User_Overlay.pm:302
+msgid "Failed to find 'Privileged' users pseudogroup."
+msgstr "'特権��る'ユーザー�擬似グループ�検索�失敗����"
+
+#: lib/RT/User_Overlay.pm:309
+msgid "Failed to find 'Unprivileged' users pseudogroup"
+msgstr "'特権���'ユーザー�擬似グループ�検索�失敗����"
+
+#: bin/rt-crontool:138
+#. ($modname, $@)
+msgid "Failed to load module %1. (%2)"
+msgstr ""
+
+#: lib/RT/Date.pm:412
+msgid "Feb."
+msgstr "二月"
+
+#: NOT FOUND IN SOURCE
+msgid "February"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Fin"
+msgstr "終了"
+
+#: html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:59 lib/RT/Tickets_Overlay.pm:1091
+msgid "Final Priority"
+msgstr "最終優先順�"
+
+#: lib/RT/Ticket_Overlay.pm:1162
+msgid "FinalPriority"
+msgstr ""
+
+#: html/Admin/Queues/People.html:61 html/Ticket/Elements/EditPeople:34
+msgid "Find group whose"
+msgstr ""
+
+#: html/Elements/Quicksearch:25
+msgid "Find new/open tickets"
+msgstr "新��/開��ケットを見��る"
+
+#: html/Admin/Queues/People.html:57 html/Admin/Users/index.html:46 html/Ticket/Elements/EditPeople:30
+msgid "Find people whose"
+msgstr "人々を見��る"
+
+#: html/Search/Listing.html:108
+msgid "Find tickets"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Finish Approval"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:58
+msgid "First"
+msgstr "最��"
+
+#: html/Search/Listing.html:41
+msgid "First page"
+msgstr "最��ページ"
+
+#: docs/design_docs/string-extraction-guide.txt:33
+msgid "Foo Bar Baz"
+msgstr "Foo Bar Baz"
+
+#: docs/design_docs/string-extraction-guide.txt:24
+msgid "Foo!"
+msgstr "���"
+
+#: html/Search/Bulk.html:87
+msgid "Force change"
+msgstr "変更を強制���"
+
+#: html/Search/Listing.html:106
+#. ($ticketcount)
+msgid "Found %quant(%1,ticket)"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:868
+msgid "Found Object"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:44
+msgid "FreeformContactInfo"
+msgstr "フリーフォームコンタクト情報"
+
+#: lib/RT/CustomField_Overlay.pm:38
+msgid "FreeformMultiple"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformSingle"
+msgstr ""
+
+#: lib/RT/Date.pm:392
+msgid "Fri."
+msgstr "金曜日"
+
+#: html/Ticket/Elements/ShowHistory:41 html/Ticket/Elements/ShowHistory:51
+msgid "Full headers"
+msgstr "フルヘッダー"
+
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr "pgp sig\\n�ら�在�ユーザーを得る"
+
+#: lib/RT/Transaction_Overlay.pm:595
+#. ($New->Name)
+msgid "Given to %1"
+msgstr ""
+
+#: html/Admin/Elements/Tabs:41 html/Admin/index.html:38
+msgid "Global"
+msgstr "グロー�ル"
+
+#: NOT FOUND IN SOURCE
+msgid "Global Keyword Selections"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
+msgstr "グロー�ルスクリプト"
+
+#: html/Admin/Elements/SelectTemplate:38
+#. (loc($Template->Name))
+msgid "Global template: %1"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:75 html/Admin/Queues/People.html:59 html/Admin/Queues/People.html:63 html/Admin/Queues/index.html:44 html/Admin/Users/index.html:49 html/Ticket/Elements/EditPeople:32 html/Ticket/Elements/EditPeople:36 html/index.html:41
+msgid "Go!"
+msgstr "行��"
+
+#: NOT FOUND IN SOURCE
+msgid "Good pgp sig from %1\\n"
+msgstr "%1\\n�ら�良�pgp　sig"
+
+#: html/Search/Listing.html:50
+msgid "Goto page"
+msgstr "ページ�行�"
+
+#: html/Elements/GotoTicket:25 html/SelfService/Elements/GotoTicket:25
+msgid "Goto ticket"
+msgstr "�ケット�行�"
+
+#: NOT FOUND IN SOURCE
+msgid "Grand"
+msgstr ""
+
+#: html/Ticket/Elements/AddWatchers:46 html/User/Elements/DelegateRights:78
+msgid "Group"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Group %1 %2: %3"
+msgstr "グループ%1 %2: %3"
+
+#: html/Admin/Elements/GroupTabs:45 html/Admin/Elements/QueueTabs:57 html/Admin/Elements/SystemTabs:44 html/Admin/Global/index.html:55
+msgid "Group Rights"
+msgstr "グループ権利"
+
+#: lib/RT/Group_Overlay.pm:965
+msgid "Group already has member"
+msgstr "グループ�����メン�ー����"
+
+#: NOT FOUND IN SOURCE
+msgid "Group could not be created."
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:77
+#. ($create_msg)
+msgid "Group could not be created: %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:497
+msgid "Group created"
+msgstr "グループ�作��れ���"
+
+#: lib/RT/Group_Overlay.pm:1133
+msgid "Group has no such member"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:945 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1429 lib/RT/Ticket_Overlay.pm:1507
+msgid "Group not found"
+msgstr "グループ�見��り��ん"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not found.\\n"
+msgstr "グループ�見��り��ん。\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not specified.\\n"
+msgstr "グループ�特定����ん。\\n"
+
+#: html/Admin/Elements/SelectNewGroupMembers:35 html/Admin/Elements/Tabs:35 html/Admin/Groups/Members.html:64 html/Admin/Queues/People.html:83 html/Admin/index.html:32 html/User/Groups/Members.html:67
+msgid "Groups"
+msgstr "グループ"
+
+#: lib/RT/Group_Overlay.pm:971
+msgid "Groups can't be members of their members"
+msgstr "グループ�彼ら�メン�ー���れ��ん"
+
+#: lib/RT/Interface/CLI.pm:73 lib/RT/Interface/CLI.pm:73
+msgid "Hello!"
+msgstr "�ん����"
+
+#: docs/design_docs/string-extraction-guide.txt:40
+#. ($name)
+msgid "Hello, %1"
+msgstr "�ん����%1"
+
+#: html/Ticket/Elements/ShowHistory:30 html/Ticket/Elements/Tabs:88
+msgid "History"
+msgstr "ヒストリー"
+
+#: html/Admin/Elements/ModifyUser:68
+msgid "HomePhone"
+msgstr "自宅�電話"
+
+#: html/Elements/Tabs:46
+msgid "Homepage"
+msgstr "ホームページ"
+
+#: lib/RT/Base.pm:74
+#. (6)
+msgid "I have %quant(%1,concrete mixer)."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
+msgstr "��[quant,_1,concrete mixer]��り��。"
+
+#: html/Ticket/Elements/ShowBasics:27 lib/RT/Tickets_Overlay.pm:1018
+msgid "Id"
+msgstr "ID"
+
+#: html/Admin/Users/Modify.html:44 html/User/Prefs.html:39
+msgid "Identity"
+msgstr "身分証明書"
+
+#: etc/upgrade/2.1.71:86
+msgid "If an approval is rejected, reject the original and delete pending approvals"
+msgstr ""
+
+#: bin/rt-crontool:190
+msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
+msgstr ""
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
+msgid "If you've updated anything above, be sure to"
+msgstr "上�何�をアップデート���ら�次���を確�������"
+
+#: lib/RT/Interface/Web.pm:860
+msgid "Illegal value for %1"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:863
+msgid "Immutable field"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:74
+msgid "Include disabled custom fields in listing."
+msgstr ""
+
+#: html/Admin/Queues/index.html:43
+msgid "Include disabled queues in listing."
+msgstr "リスト�無効�キューを�む"
+
+#: html/Admin/Users/index.html:47
+msgid "Include disabled users in search."
+msgstr "検索�無効�ユーザーを�む"
+
+#: lib/RT/Tickets_Overlay.pm:1067
+msgid "Initial Priority"
+msgstr "最��優先権"
+
+#: lib/RT/Ticket_Overlay.pm:1161 lib/RT/Ticket_Overlay.pm:1163
+msgid "InitialPriority"
+msgstr ""
+
+#: lib/RT/ScripAction_Overlay.pm:105
+msgid "Input error"
+msgstr "入力エラー"
+
+#: NOT FOUND IN SOURCE
+msgid "Interest noted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3729
+msgid "Internal Error"
+msgstr ""
+
+#: lib/RT/Record.pm:143
+#. ($id->{error_message})
+msgid "Internal Error: %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:644
+msgid "Invalid Group Type"
+msgstr "無効�グループタイプ��"
+
+#: lib/RT/Principal_Overlay.pm:128
+msgid "Invalid Right"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Invalid Type"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:865
+msgid "Invalid data"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:438
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr "無効�オーナー��。 '誰�も��'��期設定���."
+
+#: lib/RT/Scrip_Overlay.pm:134 lib/RT/Template_Overlay.pm:251
+msgid "Invalid queue"
+msgstr "無効�キュー��"
+
+#: lib/RT/ACE_Overlay.pm:244 lib/RT/ACE_Overlay.pm:253 lib/RT/ACE_Overlay.pm:259 lib/RT/ACE_Overlay.pm:270 lib/RT/ACE_Overlay.pm:275
+msgid "Invalid right"
+msgstr "無効�権利��"
+
+#: lib/RT/Record.pm:118
+#. ($key)
+msgid "Invalid value for %1"
+msgstr "%1��無効��リュー��"
+
+#: lib/RT/Ticket_Overlay.pm:3367
+msgid "Invalid value for custom field"
+msgstr "カスタムフィールド��無効��リュー��"
+
+#: lib/RT/Ticket_Overlay.pm:345
+msgid "Invalid value for status"
+msgstr "ステータス��無効��リュー��"
+
+#: bin/rt-crontool:191
+msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
+msgstr ""
+
+#: bin/rt-crontool:192
+msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
+msgstr ""
+
+#: bin/rt-crontool:163
+msgid "It takes several arguments:"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
+msgstr ""
+
+#: lib/RT/Date.pm:411
+msgid "Jan."
+msgstr "一月"
+
+#: NOT FOUND IN SOURCE
+msgid "January"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "Join or leave this group"
+msgstr ""
+
+#: lib/RT/Date.pm:417
+msgid "Jul."
+msgstr "七月"
+
+#: NOT FOUND IN SOURCE
+msgid "July"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:99
+msgid "Jumbo"
+msgstr "大��"
+
+#: lib/RT/Date.pm:416
+msgid "Jun."
+msgstr "六月"
+
+#: NOT FOUND IN SOURCE
+msgid "June"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Keyword"
+msgstr "キーワード"
+
+#: html/Admin/Elements/ModifyUser:52
+msgid "Lang"
+msgstr "長�"
+
+#: html/Ticket/Elements/Tabs:73
+msgid "Last"
+msgstr "最後�"
+
+#: html/Ticket/Elements/EditDates:38 html/Ticket/Elements/ShowDates:39
+msgid "Last Contact"
+msgstr "最後�コンタクト"
+
+#: html/Elements/SelectDateType:29
+msgid "Last Contacted"
+msgstr "最後�コンタクト��"
+
+#: html/Search/Elements/TicketHeader:41
+msgid "Last Notified"
+msgstr ""
+
+#: html/Elements/SelectDateType:30
+msgid "Last Updated"
+msgstr "最後�アップデート��"
+
+#: NOT FOUND IN SOURCE
+msgid "LastUpdated"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Left"
+msgstr "残��"
+
+#: html/Admin/Users/Modify.html:83
+msgid "Let this user access RT"
+msgstr "��ユーザーをRT�アクセス���"
+
+#: html/Admin/Users/Modify.html:87
+msgid "Let this user be granted rights"
+msgstr "��ユーザー�権利を����"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting owner to %1 %2"
+msgstr "オーナーを%1 %2�制����"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting queue to %1 %2"
+msgstr "キューを%1 %2�制����"
+
+#: lib/RT/Ticket_Overlay.pm:2697
+msgid "Link already exists"
+msgstr "リンク����存在�����"
+
+#: lib/RT/Ticket_Overlay.pm:2709
+msgid "Link could not be created"
+msgstr "リンク�作��れ��ん���"
+
+#: lib/RT/Ticket_Overlay.pm:2717 lib/RT/Ticket_Overlay.pm:2727
+#. ($TransString)
+msgid "Link created (%1)"
+msgstr "リンク�作��れ���（%1）"
+
+#: lib/RT/Ticket_Overlay.pm:2638
+#. ($TransString)
+msgid "Link deleted (%1)"
+msgstr "リンク�削除�れ���（%1）"
+
+#: lib/RT/Ticket_Overlay.pm:2644
+msgid "Link not found"
+msgstr "リンク�見��り��ん"
+
+#: html/Ticket/ModifyLinks.html:25 html/Ticket/ModifyLinks.html:29
+#. ($Ticket->Id)
+msgid "Link ticket #%1"
+msgstr "リンク�ケット#%1"
+
+#: NOT FOUND IN SOURCE
+msgid "Link ticket %1"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:97
+msgid "Links"
+msgstr "リンク"
+
+#: html/Admin/Users/Modify.html:114 html/User/Prefs.html:85
+msgid "Location"
+msgstr "場所"
+
+#: lib/RT.pm:158
+#. ($RT::LogDir)
+msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
+msgstr "ログディレクトリー%1�見��ら������書�出���ん。\\n RT�動���ん"
+
+#: html/Elements/Header:57
+#. ("<b>".$session{'CurrentUser'}->Name."</b>")
+msgid "Logged in as %1"
+msgstr "%1���サイン�る"
+
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:25 html/Elements/Login:34 html/Elements/Login:45
+msgid "Login"
+msgstr "ログイン"
+
+#: html/Elements/Header:54
+msgid "Logout"
+msgstr "ログアウト"
+
+#: html/Search/Bulk.html:86
+msgid "Make Owner"
+msgstr "オーナーを決�る"
+
+#: html/Search/Bulk.html:102
+msgid "Make Status"
+msgstr "ステータスを決�る"
+
+#: html/Search/Bulk.html:109
+msgid "Make date Due"
+msgstr "期�期日を決�る"
+
+#: html/Search/Bulk.html:110
+msgid "Make date Resolved"
+msgstr "解�期日を決�る"
+
+#: html/Search/Bulk.html:107
+msgid "Make date Started"
+msgstr "開始��日を決�る"
+
+#: html/Search/Bulk.html:106
+msgid "Make date Starts"
+msgstr "開始日を決�る"
+
+#: html/Search/Bulk.html:108
+msgid "Make date Told"
+msgstr "��れ�日を決�る"
+
+#: html/Search/Bulk.html:99
+msgid "Make priority"
+msgstr "優先順�を決�る"
+
+#: html/Search/Bulk.html:100
+msgid "Make queue"
+msgstr "キューを決�る"
+
+#: html/Search/Bulk.html:98
+msgid "Make subject"
+msgstr "サブジェクトを決�る"
+
+#: html/Admin/index.html:33
+msgid "Manage groups and group membership"
+msgstr ""
+
+#: html/Admin/index.html:39
+msgid "Manage properties and configuration which apply to all queues"
+msgstr ""
+
+#: html/Admin/index.html:36
+msgid "Manage queues and queue-specific properties"
+msgstr ""
+
+#: html/Admin/index.html:30
+msgid "Manage users and passwords"
+msgstr ""
+
+#: lib/RT/Date.pm:413
+msgid "Mar."
+msgstr "三月"
+
+#: NOT FOUND IN SOURCE
+msgid "March"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "May"
+msgstr ""
+
+#: lib/RT/Date.pm:415
+msgid "May."
+msgstr "五月"
+
+#: lib/RT/Group_Overlay.pm:982
+msgid "Member added"
+msgstr "メン�ー�追加�れ���"
+
+#: lib/RT/Group_Overlay.pm:1140
+msgid "Member deleted"
+msgstr "メン�ー�削除�れ���"
+
+#: lib/RT/Group_Overlay.pm:1144
+msgid "Member not deleted"
+msgstr "メン�ー�削除�れ����ん"
+
+#: html/Elements/SelectLinkType:26
+msgid "Member of"
+msgstr "�メン�ー"
+
+#: NOT FOUND IN SOURCE
+msgid "MemberOf"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:42 html/User/Elements/GroupTabs:42
+msgid "Members"
+msgstr "メン�ー"
+
+#: lib/RT/Ticket_Overlay.pm:2843
+msgid "Merge Successful"
+msgstr "����功����"
+
+#: lib/RT/Ticket_Overlay.pm:2804
+msgid "Merge failed. Couldn't set EffectiveId"
+msgstr "���失敗����。有効�ID�設定����ん���"
+
+#: html/Ticket/Elements/EditLinks:115
+msgid "Merge into"
+msgstr "���"
+
+#: html/Ticket/Update.html:102
+msgid "Message"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:867
+msgid "Missing a primary key?: %1"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:169 html/User/Prefs.html:54
+msgid "Mobile"
+msgstr "�帯"
+
+#: html/Admin/Elements/ModifyUser:72
+msgid "MobilePhone"
+msgstr "�帯電話"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "Modify Access Control List"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Field %1"
+msgstr "カスタムフィールド%1を修正�る"
+
+#: html/Admin/Global/CustomFields.html:44 html/Admin/Global/index.html:51
+msgid "Modify Custom Fields which apply to all queues"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "Modify Scrip templates for this queue"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "Modify Scrips for this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify System ACLS"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Template %1"
+msgstr ""
+
+#: html/Admin/Queues/CustomField.html:45
+#. ($QueueObj->Name())
+msgid "Modify a CustomField for queue %1"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:53
+msgid "Modify a CustomField which applies to all queues"
+msgstr ""
+
+#: html/Admin/Queues/Scrip.html:54
+#. ($QueueObj->Name)
+msgid "Modify a scrip for queue %1"
+msgstr ""
+
+#: html/Admin/Global/Scrip.html:48
+msgid "Modify a scrip which applies to all queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify dates for # %1"
+msgstr ""
+
+#: html/Ticket/ModifyDates.html:25 html/Ticket/ModifyDates.html:29
+#. ($TicketObj->Id)
+msgid "Modify dates for #%1"
+msgstr "#%1�期日を修正�る"
+
+#: html/Ticket/ModifyDates.html:35
+#. ($TicketObj->Id)
+msgid "Modify dates for ticket # %1"
+msgstr "�ケット#%1�期日を修正�る"
+
+#: html/Admin/Global/GroupRights.html:25 html/Admin/Global/GroupRights.html:28 html/Admin/Global/index.html:56
+msgid "Modify global group rights"
+msgstr "グロー�ルグループ�権利を修正�る"
+
+#: html/Admin/Global/GroupRights.html:33
+msgid "Modify global group rights."
+msgstr "グロー�ルグループ�権利を修正�る"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for groups"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for users"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global scrips"
+msgstr "グロー�ルスクリプトを修正�る"
+
+#: html/Admin/Global/UserRights.html:25 html/Admin/Global/UserRights.html:28 html/Admin/Global/index.html:60
+msgid "Modify global user rights"
+msgstr ""
+
+#: html/Admin/Global/UserRights.html:33
+msgid "Modify global user rights."
+msgstr "グロー�ルユーザー�権利を修正�る"
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "Modify group metadata or delete group"
+msgstr ""
+
+#: html/Admin/Groups/GroupRights.html:25 html/Admin/Groups/GroupRights.html:29 html/Admin/Groups/GroupRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify group rights for group %1"
+msgstr "%1�グループ権利を修正�る"
+
+#: html/Admin/Queues/GroupRights.html:25 html/Admin/Queues/GroupRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify group rights for queue %1"
+msgstr "キュー%1�グループ権利を修正�る"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "Modify membership roster for this group"
+msgstr ""
+
+#: lib/RT/System.pm:61
+msgid "Modify one's own RT account"
+msgstr ""
+
+#: html/Admin/Queues/People.html:25 html/Admin/Queues/People.html:29
+#. ($QueueObj->Name)
+msgid "Modify people related to queue %1"
+msgstr "キュー%1�関係��る人々を修正�る"
+
+#: html/Ticket/ModifyPeople.html:25 html/Ticket/ModifyPeople.html:29 html/Ticket/ModifyPeople.html:35
+#. ($Ticket->id)
+#. ($Ticket->Id)
+msgid "Modify people related to ticket #%1"
+msgstr "�ケット#%1�関係��る人々を修正�る"
+
+#: html/Admin/Queues/Scrips.html:44
+#. ($QueueObj->Name)
+msgid "Modify scrips for queue %1"
+msgstr "キュー%1�スクリプトを修正�る"
+
+#: html/Admin/Global/Scrips.html:44 html/Admin/Global/index.html:42
+msgid "Modify scrips which apply to all queues"
+msgstr ""
+
+#: html/Admin/Global/Template.html:25 html/Admin/Global/Template.html:30 html/Admin/Global/Template.html:81 html/Admin/Queues/Template.html:78
+#. (loc($TemplateObj->Name()))
+#. ($TemplateObj->id)
+msgid "Modify template %1"
+msgstr "テンプレート%1を修正�る"
+
+#: html/Admin/Global/Templates.html:44
+msgid "Modify templates which apply to all queues"
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:87 html/User/Groups/Modify.html:86
+#. ($Group->Name)
+msgid "Modify the group %1"
+msgstr "グループ%1を修正�る"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "Modify the queue watchers"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:236
+#. ($UserObj->Name)
+msgid "Modify the user %1"
+msgstr "ユーザー%1を修正�る"
+
+#: html/Ticket/ModifyAll.html:37
+#. ($Ticket->Id)
+msgid "Modify ticket # %1"
+msgstr "�ケット#　%1を修正�る"
+
+#: html/Ticket/Modify.html:25 html/Ticket/Modify.html:28 html/Ticket/Modify.html:34
+#. ($TicketObj->Id)
+msgid "Modify ticket #%1"
+msgstr "�ケット#%1を修正�る"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "Modify tickets"
+msgstr ""
+
+#: html/Admin/Groups/UserRights.html:25 html/Admin/Groups/UserRights.html:29 html/Admin/Groups/UserRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify user rights for group %1"
+msgstr "グループ%1�ユーザー権利を修正�る"
+
+#: html/Admin/Queues/UserRights.html:25 html/Admin/Queues/UserRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify user rights for queue %1"
+msgstr "キュー%1�ユーザー権利を修正�る"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify watchers for queue '%1'"
+msgstr "キュー'%1'�ウォッ�ャーを修正�る"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ModifyACL"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "ModifyOwnMembership"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "ModifyQueueWatchers"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "ModifyScrips"
+msgstr ""
+
+#: lib/RT/System.pm:61
+msgid "ModifySelf"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "ModifyTemplate"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "ModifyTicket"
+msgstr ""
+
+#: lib/RT/Date.pm:388
+msgid "Mon."
+msgstr "月曜日"
+
+#: html/Ticket/Elements/ShowRequestor:42
+#. ($name)
+msgid "More about %1"
+msgstr "�ら�%1����"
+
+#: html/Admin/Elements/EditCustomFields:61
+msgid "Move down"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:53
+msgid "Move up"
+msgstr ""
+
+#: html/Admin/Elements/SelectSingleOrMultiple:27
+msgid "Multiple"
+msgstr "多��"
+
+#: lib/RT/User_Overlay.pm:179
+msgid "Must specify 'Name' attribute"
+msgstr "'��'�属性を特定������"
+
+#: NOT FOUND IN SOURCE
+msgid "My Approvals"
+msgstr ""
+
+#: html/Approvals/index.html:25 html/Approvals/index.html:26
+msgid "My approvals"
+msgstr ""
+
+#: html/Admin/Elements/AddCustomFieldValue:26 html/Admin/Elements/EditCustomField:32 html/Admin/Elements/ModifyTemplate:28 html/Admin/Elements/ModifyUser:30 html/Admin/Groups/Modify.html:44 html/Elements/SelectGroups:26 html/Elements/SelectUsers:28 html/User/Groups/Modify.html:44
+msgid "Name"
+msgstr "��"
+
+#: lib/RT/User_Overlay.pm:186
+msgid "Name in use"
+msgstr "�在�使����"
+
+#: NOT FOUND IN SOURCE
+msgid "Need approval from system administrator"
+msgstr ""
+
+#: html/Ticket/Elements/ShowDates:52
+msgid "Never"
+msgstr ""
+
+#: html/Elements/Quicksearch:30
+msgid "New"
+msgstr "新��"
+
+#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:93 html/User/Prefs.html:65
+msgid "New Password"
+msgstr "新��パスワード"
+
+#: etc/initialdata:311 etc/upgrade/2.1.71:16
+msgid "New Pending Approval"
+msgstr ""
+
+#: html/Ticket/Elements/EditLinks:111
+msgid "New Relationships"
+msgstr "新��関係"
+
+#: html/Ticket/Elements/Tabs:36
+msgid "New Search"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:41 html/Admin/Global/CustomFields.html:39 html/Admin/Queues/CustomField.html:52 html/Admin/Queues/CustomFields.html:40
+msgid "New custom field"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:54 html/User/Elements/GroupTabs:52
+msgid "New group"
+msgstr ""
+
+#: html/SelfService/Prefs.html:32
+msgid "New password"
+msgstr "新��パスワード"
+
+#: lib/RT/User_Overlay.pm:639
+msgid "New password notification sent"
+msgstr "新��パスワード情報��られ���"
+
+#: html/Admin/Elements/QueueTabs:70
+msgid "New queue"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:63
+msgid "New request"
+msgstr "新��リクエスト"
+
+#: html/Admin/Elements/SelectRights:42
+msgid "New rights"
+msgstr "新��権利"
+
+#: html/Admin/Global/Scrip.html:40 html/Admin/Global/Scrips.html:39 html/Admin/Queues/Scrip.html:43 html/Admin/Queues/Scrips.html:53
+msgid "New scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "New search"
+msgstr "新��検索"
+
+#: html/Admin/Global/Template.html:60 html/Admin/Global/Templates.html:39 html/Admin/Queues/Template.html:58 html/Admin/Queues/Templates.html:46
+msgid "New template"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2771
+msgid "New ticket doesn't exist"
+msgstr "新���ケット��り��ん"
+
+#: html/Admin/Elements/UserTabs:52
+msgid "New user"
+msgstr ""
+
+#: html/Admin/Elements/CreateUserCalled:26
+msgid "New user called"
+msgstr "新��ユーザー�呼�れ���"
+
+#: html/Admin/Queues/People.html:55 html/Ticket/Elements/EditPeople:29
+msgid "New watchers"
+msgstr "新��ウォッ�ャー"
+
+#: html/Admin/Users/Prefs.html:42
+msgid "New window setting"
+msgstr "新��ウインドウ設定"
+
+#: html/Ticket/Elements/Tabs:69
+msgid "Next"
+msgstr "次�"
+
+#: html/Search/Listing.html:48
+msgid "Next page"
+msgstr "次�ページ"
+
+#: html/Admin/Elements/ModifyUser:50
+msgid "NickName"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:63 html/User/Prefs.html:46
+msgid "Nickname"
+msgstr "ニック�ーム"
+
+#: html/Admin/Elements/EditCustomField:73 html/Admin/Elements/EditCustomFields:105
+msgid "No CustomField"
+msgstr "カスタムフィールド��り��ん"
+
+#: html/Admin/Groups/GroupRights.html:84 html/Admin/Groups/UserRights.html:71
+msgid "No Group defined"
+msgstr "グループ�定義�れ��ん"
+
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:68
+msgid "No Queue defined"
+msgstr "キュー�定義�れ��ん"
+
+#: bin/rt-crontool:56
+msgid "No RT user found. Please consult your RT administrator.\\n"
+msgstr "RTユーザー�見��り��ん。RT管�者�相談������。\\n"
+
+#: html/Admin/Global/Template.html:79 html/Admin/Queues/Template.html:76
+msgid "No Template"
+msgstr "テンプレート��り��ん"
+
+#: bin/rt-commit-handler:764
+msgid "No Ticket specified. Aborting ticket "
+msgstr "�ケット�特定����ん。�ケットを終了���"
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgstr "�ケット�特定����ん。�ケット�修正を終了���\\n\\n"
+
+#: html/Approvals/Elements/Approve:47
+msgid "No action"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:862
+msgid "No column specified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "No command found\\n"
+msgstr "コマンド�見��り��ん\\n"
+
+#: html/Elements/ViewUser:36 html/Ticket/Elements/ShowRequestor:45
+msgid "No comment entered about this user"
+msgstr "��ユーザー�関���コメント�入力�れ����ん"
+
+#: lib/RT/Ticket_Overlay.pm:2189 lib/RT/Ticket_Overlay.pm:2257
+msgid "No correspondence attached"
+msgstr "通信文書�添付��り��ん"
+
+#: lib/RT/Action/Generic.pm:150 lib/RT/Condition/Generic.pm:176 lib/RT/Search/ActiveTicketsInQueue.pm:56 lib/RT/Search/Generic.pm:113
+#. (ref $self)
+msgid "No description for %1"
+msgstr "%1記述��り��ん"
+
+#: lib/RT/Users_Overlay.pm:151
+msgid "No group specified"
+msgstr "グループ�特定����ん"
+
+#: lib/RT/User_Overlay.pm:857
+msgid "No password set"
+msgstr "パスワード�設定�れ��ん"
+
+#: lib/RT/Queue_Overlay.pm:259
+msgid "No permission to create queues"
+msgstr "キューを作��る許���れ����ん"
+
+#: lib/RT/Ticket_Overlay.pm:341
+#. ($QueueObj->Name)
+msgid "No permission to create tickets in the queue '%1'"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:151
+msgid "No permission to create users"
+msgstr "ユーザーを作��る許���れ����ん"
+
+#: html/SelfService/Display.html:174
+msgid "No permission to display that ticket"
+msgstr "���ケットを表示�る許���り��ん"
+
+#: html/SelfService/Update.html:55
+msgid "No permission to view update ticket"
+msgstr "アップデート�ケットを見る許����り��ん"
+
+#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1488
+msgid "No principal specified"
+msgstr "責任者�特定����ん"
+
+#: html/Admin/Queues/People.html:154 html/Admin/Queues/People.html:164
+msgid "No principals selected."
+msgstr "責任者��択�れ����ん"
+
+#: html/Admin/Queues/index.html:35
+msgid "No queues matching search criteria found."
+msgstr "検索基準����キュー�見��り��ん"
+
+#: html/Admin/Elements/SelectRights:81
+msgid "No rights found"
+msgstr ""
+
+#: html/Admin/Elements/SelectRights:33
+msgid "No rights granted."
+msgstr "権利�許��れ����ん"
+
+#: html/Search/Bulk.html:149
+msgid "No search to operate on."
+msgstr "�作����検索�����ん"
+
+#: NOT FOUND IN SOURCE
+msgid "No ticket id specified"
+msgstr "�ケットID�特定����ん"
+
+#: lib/RT/Transaction_Overlay.pm:480 lib/RT/Transaction_Overlay.pm:518
+msgid "No transaction type specified"
+msgstr "トランザクションタイプ�特定����ん"
+
+#: NOT FOUND IN SOURCE
+msgid "No user or email address specified"
+msgstr ""
+
+#: html/Admin/Users/index.html:36
+msgid "No users matching search criteria found."
+msgstr "検索基準����ユーザー�見��り��ん"
+
+#: bin/rt-commit-handler:644
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr "有効�RTユーザー�見��り��ん。RT　cvc�ンドラ�分離�����。RT管�者�相談������。\\n"
+
+#: lib/RT/Interface/Web.pm:859
+msgid "No value sent to _Set!\\n"
+msgstr ""
+
+#: html/Search/Elements/TicketRow:37
+msgid "Nobody"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:864
+msgid "Nonexistant field?"
+msgstr ""
+
+#: html/Elements/Login:99
+msgid "Not logged in"
+msgstr ""
+
+#: html/Elements/Header:59 html/SelfService/Elements/Header:58
+msgid "Not logged in."
+msgstr "ログイン����ん"
+
+#: lib/RT/Date.pm:369
+msgid "Not set"
+msgstr "セット����ん"
+
+#: html/NoAuth/Reminder.html:27
+msgid "Not yet implemented."
+msgstr "��実行����ん"
+
+#: html/Admin/Groups/Rights.html:25
+msgid "Not yet implemented...."
+msgstr "��実行����ん。。。"
+
+#: html/Approvals/Elements/Approve:50
+msgid "Notes"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:642
+msgid "Notification could not be sent"
+msgstr "�知ら�を�る�������ん���"
+
+#: etc/initialdata:94
+msgid "Notify AdminCcs"
+msgstr ""
+
+#: etc/initialdata:90
+msgid "Notify AdminCcs as Comment"
+msgstr ""
+
+#: etc/initialdata:121
+msgid "Notify Other Recipients"
+msgstr ""
+
+#: etc/initialdata:117
+msgid "Notify Other Recipients as Comment"
+msgstr ""
+
+#: etc/initialdata:86
+msgid "Notify Owner"
+msgstr ""
+
+#: etc/initialdata:82
+msgid "Notify Owner as Comment"
+msgstr ""
+
+#: etc/initialdata:313 etc/upgrade/2.1.71:17
+msgid "Notify Owners and AdminCcs of new items pending their approval"
+msgstr ""
+
+#: etc/initialdata:78
+msgid "Notify Requestors"
+msgstr ""
+
+#: etc/initialdata:104
+msgid "Notify Requestors and Ccs"
+msgstr ""
+
+#: etc/initialdata:99
+msgid "Notify Requestors and Ccs as Comment"
+msgstr ""
+
+#: etc/initialdata:113
+msgid "Notify Requestors, Ccs and AdminCcs"
+msgstr ""
+
+#: etc/initialdata:109
+msgid "Notify Requestors, Ccs and AdminCcs as Comment"
+msgstr ""
+
+#: lib/RT/Date.pm:421
+msgid "Nov."
+msgstr "�一月"
+
+#: NOT FOUND IN SOURCE
+msgid "November"
+msgstr ""
+
+#: lib/RT/Record.pm:157
+msgid "Object could not be created"
+msgstr ""
+
+#: lib/RT/Record.pm:176
+msgid "Object created"
+msgstr ""
+
+#: lib/RT/Date.pm:420
+msgid "Oct."
+msgstr "�月"
+
+#: NOT FOUND IN SOURCE
+msgid "October"
+msgstr ""
+
+#: html/Elements/SelectDateRelation:35
+msgid "On"
+msgstr "�"
+
+#: etc/initialdata:155
+msgid "On Comment"
+msgstr ""
+
+#: etc/initialdata:148
+msgid "On Correspond"
+msgstr ""
+
+#: etc/initialdata:137
+msgid "On Create"
+msgstr ""
+
+#: etc/initialdata:169
+msgid "On Owner Change"
+msgstr ""
+
+#: etc/initialdata:177
+msgid "On Queue Change"
+msgstr ""
+
+#: etc/initialdata:183
+msgid "On Resolve"
+msgstr ""
+
+#: etc/initialdata:161
+msgid "On Status Change"
+msgstr ""
+
+#: etc/initialdata:142
+msgid "On Transaction"
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:50
+#. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
+msgid "Only show approvals for requests created after %1"
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:48
+#. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
+msgid "Only show approvals for requests created before %1"
+msgstr ""
+
+#: html/Elements/Quicksearch:31
+msgid "Open"
+msgstr "開�"
+
+#: html/Ticket/Elements/Tabs:136
+msgid "Open it"
+msgstr "�れを開�"
+
+#: html/SelfService/Elements/Tabs:57
+msgid "Open requests"
+msgstr "リクエストを開�"
+
+#: html/Admin/Users/Prefs.html:41
+msgid "Open tickets (from listing) in a new window"
+msgstr "�ケットを（リスト�ら）新��ウインドウ�ら開�"
+
+#: html/Admin/Users/Prefs.html:40
+msgid "Open tickets (from listing) in another window"
+msgstr "�ケットを（リスト�ら）���ウインドウ�ら開�"
+
+#: etc/initialdata:133
+msgid "Open tickets on correspondence"
+msgstr ""
+
+#: html/Search/Elements/PickRestriction:101
+msgid "Ordering and sorting"
+msgstr "整列�並�替�"
+
+#: html/Admin/Elements/ModifyUser:46 html/Admin/Users/Modify.html:117 html/Elements/SelectUsers:29 html/User/Prefs.html:86
+msgid "Organization"
+msgstr "組織"
+
+#: html/Approvals/Elements/Approve:34
+#. ($approving->Id, $approving->Subject)
+msgid "Originating ticket: #%1"
+msgstr ""
+
+#: html/Admin/Elements/ModifyQueue:55 html/Admin/Queues/Modify.html:69
+msgid "Over time, priority moves toward"
+msgstr "時間切れ���優先順����り���"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "Own tickets"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "OwnTicket"
+msgstr ""
+
+#: etc/initialdata:38 html/Elements/MyRequests:32 html/SelfService/Elements/MyRequests:30 html/Ticket/Create.html:48 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/EditPeople:44 html/Ticket/Elements/ShowPeople:27 html/Ticket/Update.html:63 lib/RT/ACE_Overlay.pm:86 lib/RT/Tickets_Overlay.pm:1244
+msgid "Owner"
+msgstr "オーナー"
+
+#: lib/RT/Ticket_Overlay.pm:3004
+#. ($OldOwnerObj->Name,  $NewOwnerObj->Name)
+msgid "Owner changed from %1 to %2"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:584
+#. ($Old->Name , $New->Name)
+msgid "Owner forcibly changed from %1 to %2"
+msgstr "オーナー�強制的�%1�ら%2を変更����"
+
+#: html/Search/Elements/PickRestriction:31
+msgid "Owner is"
+msgstr "オーナー�"
+
+#: html/Admin/Users/Modify.html:174 html/User/Prefs.html:56
+msgid "Pager"
+msgstr "�ケットベル"
+
+#: html/Admin/Elements/ModifyUser:74
+msgid "PagerPhone"
+msgstr "�ケットベル電話"
+
+#: NOT FOUND IN SOURCE
+msgid "Parent"
+msgstr ""
+
+#: html/Ticket/Create.html:182 html/Ticket/Elements/EditLinks:127 html/Ticket/Elements/EditLinks:58 html/Ticket/Elements/ShowLinks:43
+msgid "Parents"
+msgstr "両親"
+
+#: html/Elements/Login:43 html/User/Prefs.html:61
+msgid "Password"
+msgstr "パスワード"
+
+#: html/NoAuth/Reminder.html:25
+msgid "Password Reminder"
+msgstr "パスワード��知ら�"
+
+#: lib/RT/User_Overlay.pm:168 lib/RT/User_Overlay.pm:860
+msgid "Password too short"
+msgstr "パスワード�短����"
+
+#: html/Admin/Users/Modify.html:291 html/User/Prefs.html:172
+#. (loc_fuzzy($msg))
+msgid "Password: %1"
+msgstr "パスワード: %1"
+
+#: html/Ticket/Elements/ShowSummary:43 html/Ticket/Elements/Tabs:96 html/Ticket/ModifyAll.html:51
+msgid "People"
+msgstr "人々"
+
+#: etc/initialdata:126
+msgid "Perform a user-defined action"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:231 lib/RT/ACE_Overlay.pm:237 lib/RT/ACE_Overlay.pm:563 lib/RT/ACE_Overlay.pm:573 lib/RT/ACE_Overlay.pm:583 lib/RT/ACE_Overlay.pm:648 lib/RT/CurrentUser.pm:83 lib/RT/CurrentUser.pm:92 lib/RT/CustomField_Overlay.pm:445 lib/RT/CustomField_Overlay.pm:451 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1099 lib/RT/Group_Overlay.pm:1108 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1163 lib/RT/Group_Overlay.pm:1169 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:904 lib/RT/Group_Overlay.pm:908 lib/RT/Group_Overlay.pm:921 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:931 lib/RT/Scrip_Overlay.pm:126 lib/RT/Scrip_Overlay.pm:137 lib/RT/Scrip_Overlay.pm:197 lib/RT/Scrip_Overlay.pm:430 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:88 lib/RT/Template_Overlay.pm:94 lib/RT/Ticket_Overlay.pm:1341 lib/RT/Ticket_Overlay.pm:1351 lib/RT/Ticket_Overlay.pm:1365 lib/RT/Ticket_Overlay.pm:1518 lib/RT/Ticket_Overlay.pm:1527 lib/RT/Ticket_Overlay.pm:1540 lib/RT/Ticket_Overlay.pm:1875 lib/RT/Ticket_Overlay.pm:2013 lib/RT/Ticket_Overlay.pm:2177 lib/RT/Ticket_Overlay.pm:2244 lib/RT/Ticket_Overlay.pm:2596 lib/RT/Ticket_Overlay.pm:2668 lib/RT/Ticket_Overlay.pm:2762 lib/RT/Ticket_Overlay.pm:2777 lib/RT/Ticket_Overlay.pm:2910 lib/RT/Ticket_Overlay.pm:3139 lib/RT/Ticket_Overlay.pm:3337 lib/RT/Ticket_Overlay.pm:3499 lib/RT/Ticket_Overlay.pm:3551 lib/RT/Ticket_Overlay.pm:3716 lib/RT/Transaction_Overlay.pm:468 lib/RT/Transaction_Overlay.pm:475 lib/RT/Transaction_Overlay.pm:504 lib/RT/Transaction_Overlay.pm:511 lib/RT/User_Overlay.pm:1334 lib/RT/User_Overlay.pm:562 lib/RT/User_Overlay.pm:597 lib/RT/User_Overlay.pm:853 lib/RT/User_Overlay.pm:941
+msgid "Permission Denied"
+msgstr "許��下り��ん���"
+
+#: html/User/Elements/Tabs:35
+msgid "Personal Groups"
+msgstr ""
+
+#: html/User/Groups/index.html:30 html/User/Groups/index.html:40
+msgid "Personal groups"
+msgstr "個人グループ"
+
+#: html/User/Elements/DelegateRights:37
+msgid "Personal groups:"
+msgstr "個人グループ："
+
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:49
+msgid "Phone numbers"
+msgstr "電話番�"
+
+#: html/Admin/Users/Rights.html:25
+msgid "Placeholder"
+msgstr "代替物"
+
+#: NOT FOUND IN SOURCE
+msgid "Pref"
+msgstr "�気�入り"
+
+#: html/Elements/Header:52 html/Elements/Tabs:55 html/SelfService/Prefs.html:25 html/User/Prefs.html:25 html/User/Prefs.html:28
+msgid "Preferences"
+msgstr "�気�入り"
+
+#: NOT FOUND IN SOURCE
+msgid "Prefs"
+msgstr ""
+
+#: lib/RT/Action/Generic.pm:160
+msgid "Prepare Stubbed"
+msgstr "Prepare Stubbed"
+
+#: html/Ticket/Elements/Tabs:61
+msgid "Prev"
+msgstr "��"
+
+#: html/Search/Listing.html:44
+msgid "Previous page"
+msgstr "��ページ"
+
+#: NOT FOUND IN SOURCE
+msgid "Pri"
+msgstr "優先権"
+
+#: lib/RT/ACE_Overlay.pm:133 lib/RT/ACE_Overlay.pm:208 lib/RT/ACE_Overlay.pm:552
+#. ($args{'PrincipalId'})
+msgid "Principal %1 not found."
+msgstr ""
+
+#: html/Search/Elements/PickRestriction:54 html/SelfService/Display.html:76 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:54 html/Ticket/Elements/ShowBasics:39 lib/RT/Tickets_Overlay.pm:1042
+msgid "Priority"
+msgstr "優先権"
+
+#: html/Admin/Elements/ModifyQueue:51 html/Admin/Queues/Modify.html:65
+msgid "Priority starts at"
+msgstr "優先順��次�よ��始�り��"
+
+#: etc/initialdata:25
+msgid "Privileged"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:271 html/User/Prefs.html:163
+#. (loc_fuzzy($msg))
+msgid "Privileged status: %1"
+msgstr "特権ステータス: %1"
+
+#: html/Admin/Users/index.html:62
+msgid "Privileged users"
+msgstr "特権��るユーザー"
+
+#: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
+msgid "Pseudogroup for internal use"
+msgstr ""
+
+#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Elements/Quicksearch:29 html/Search/Elements/PickRestriction:46 html/SelfService/Create.html:35 html/SelfService/Display.html:68 html/Ticket/Create.html:38 html/Ticket/Elements/EditBasics:64 html/Ticket/Elements/ShowBasics:43 html/User/Elements/DelegateRights:80 lib/RT/Tickets_Overlay.pm:883
+msgid "Queue"
+msgstr "キュー"
+
+#: html/Admin/Queues/CustomField.html:42 html/Admin/Queues/Scrip.html:50 html/Admin/Queues/Scrips.html:46 html/Admin/Queues/Templates.html:43
+#. ($Queue)
+#. ($id)
+msgid "Queue %1 not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Queue '%1' not found\\n"
+msgstr "キュー'%1'�見��り��ん���\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Keyword Selections"
+msgstr ""
+
+#: html/Admin/Elements/ModifyQueue:31 html/Admin/Queues/Modify.html:43
+msgid "Queue Name"
+msgstr "キュー���"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Scrips"
+msgstr "キュースクリプト"
+
+#: lib/RT/Queue_Overlay.pm:263
+msgid "Queue already exists"
+msgstr "キュー����存在�����"
+
+#: lib/RT/Queue_Overlay.pm:272 lib/RT/Queue_Overlay.pm:278
+msgid "Queue could not be created"
+msgstr "キュー�作������ん���"
+
+#: html/Ticket/Create.html:209
+msgid "Queue could not be loaded."
+msgstr "キュー�ロード�����ん���"
+
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:282
+msgid "Queue created"
+msgstr "キュー�作��れ���"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue is not specified."
+msgstr ""
+
+#: html/SelfService/Display.html:129
+msgid "Queue not found"
+msgstr "キュー�見��り��ん"
+
+#: html/Admin/Elements/Tabs:38 html/Admin/index.html:35
+msgid "Queues"
+msgstr "キュー"
+
+#: html/Elements/Login:34
+#. ($RT::VERSION)
+msgid "RT %1"
+msgstr ""
+
+#: docs/design_docs/string-extraction-guide.txt:70
+#. ($RT::VERSION, $RT::rtname)
+msgid "RT %1 for %2"
+msgstr "%2�RT %1"
+
+#: html/Elements/Footer:32
+#. ($RT::VERSION)
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr "<a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>�ら�RT%1。"
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr ""
+
+#: html/Admin/index.html:25 html/Admin/index.html:26
+msgid "RT Administration"
+msgstr "RT管�"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Authentication error."
+msgstr "RT�証エラー"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Bounce: %1"
+msgstr "RT�ウンス：%1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Configuration error"
+msgstr "RT設定エラー"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Critical error. Message not recorded!"
+msgstr "RT�大�エラー。メッセージ�記録�れ��ん"
+
+#: html/Elements/Error:41 html/SelfService/Error.html:41
+msgid "RT Error"
+msgstr "RTエラー"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Received mail (%1) from itself."
+msgstr "RT�信メール(%1)自身�ら�メール "
+
+#: NOT FOUND IN SOURCE
+msgid "RT Recieved mail (%1) from itself."
+msgstr ""
+
+#: html/SelfService/Closed.html:25
+msgid "RT Self Service / Closed Tickets"
+msgstr "RTセルフサービス/クローズ�れ��ケット"
+
+#: html/index.html:25 html/index.html:28
+msgid "RT at a glance"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't authenticate you"
+msgstr "RT��������使��方��証�����ん���"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find requestor via its external database lookup"
+msgstr "RT�外部�データベースルックアップを使��リクエスト�る人を見��る�������ん���"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find the queue: %1"
+msgstr "RT�キュー: %1を見��る�������ん���"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't validate this PGP signature. \\n"
+msgstr "RT���PGPサインを有効��る�������ん���。\\n"
+
+#: html/Elements/PageLayout:26
+#. ($RT::rtname)
+msgid "RT for %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT has proccessed your commands"
+msgstr "RT������コマンドを処�����"
+
+#: html/Elements/Login:83
+#. ('2003')
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT�&コピー; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;。�れ�<a href=\"http://www.gnu.org/copyleft/gpl.html\">GNUジェ�ラルパブリックライセンス��ージョン2��信�れ����。</a>"
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT thinks this message may be a bounce"
+msgstr "RT�よる���メッセージ��ウンス�る�能性��り��"
+
+#: NOT FOUND IN SOURCE
+msgid "RT will process this message as if it were unsigned.\\n"
+msgstr "RT���メッセージ��る�サイン�れ����よ��処����。\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+msgstr "RT�Eメールコマンドモード��PGP�証�必���り��。貴方�メッセージ�サイン������も����サイン�有効��り��ん"
+
+#: html/Admin/Users/Modify.html:58 html/Admin/Users/Prefs.html:52 html/User/Prefs.html:44
+msgid "Real Name"
+msgstr "本�"
+
+#: html/Admin/Elements/ModifyUser:48
+msgid "RealName"
+msgstr "本�"
+
+#: html/Ticket/Create.html:185 html/Ticket/Elements/EditLinks:139 html/Ticket/Elements/EditLinks:94 html/Ticket/Elements/ShowLinks:63
+msgid "Referred to by"
+msgstr "次�も��よ���照��"
+
+#: html/Elements/SelectLinkType:28 html/Ticket/Create.html:184 html/Ticket/Elements/EditLinks:135 html/Ticket/Elements/EditLinks:80 html/Ticket/Elements/ShowLinks:55
+msgid "Refers to"
+msgstr "�照�る"
+
+#: NOT FOUND IN SOURCE
+msgid "RefersTo"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Refine"
+msgstr "絞り込む"
+
+#: html/Search/Elements/PickRestriction:27
+msgid "Refine search"
+msgstr "絞込�検索"
+
+#: html/Elements/Refresh:36
+#. ($value/60)
+msgid "Refresh this page every %1 minutes."
+msgstr "��ページを%1分���更新������"
+
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:60 html/Ticket/ModifyAll.html:57
+msgid "Relationships"
+msgstr "関係"
+
+#: html/Search/Bulk.html:93
+msgid "Remove AdminCc"
+msgstr "管�Ccを削除�る"
+
+#: html/Search/Bulk.html:91
+msgid "Remove Cc"
+msgstr "Ccを削除�る"
+
+#: html/Search/Bulk.html:89
+msgid "Remove Requestor"
+msgstr "リクエスト�る人を削除�る"
+
+#: html/Ticket/Elements/ShowTransaction:173 html/Ticket/Elements/Tabs:122
+msgid "Reply"
+msgstr "返信"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "Reply to tickets"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "ReplyToTicket"
+msgstr ""
+
+#: etc/initialdata:44 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:87
+msgid "Requestor"
+msgstr "リクエスト�る人"
+
+#: html/Search/Elements/PickRestriction:38
+msgid "Requestor email address"
+msgstr "リクエスト�る人�Eメールアドレス"
+
+#: NOT FOUND IN SOURCE
+msgid "Requestor(s)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RequestorAddresses"
+msgstr ""
+
+#: html/SelfService/Create.html:43 html/SelfService/Display.html:42 html/Ticket/Create.html:56 html/Ticket/Elements/EditPeople:48 html/Ticket/Elements/ShowPeople:31
+msgid "Requestors"
+msgstr "リクエスト�る人"
+
+#: html/Admin/Elements/ModifyQueue:61 html/Admin/Queues/Modify.html:75
+msgid "Requests should be due in"
+msgstr "リクエスト�次�日���行�れ��れ��り��ん"
+
+#: html/Elements/Submit:62
+msgid "Reset"
+msgstr "リセット"
+
+#: html/Admin/Users/Modify.html:159 html/User/Prefs.html:50
+msgid "Residence"
+msgstr "�所"
+
+#: html/Ticket/Elements/Tabs:132
+msgid "Resolve"
+msgstr "分解�る"
+
+#: html/Ticket/Update.html:133
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Resolve ticket #%1 (%2)"
+msgstr ""
+
+#: etc/initialdata:302 html/Elements/SelectDateType:28 lib/RT/Ticket_Overlay.pm:1170
+msgid "Resolved"
+msgstr "分解��"
+
+#: html/Search/Bulk.html:123 html/Ticket/ModifyAll.html:73 html/Ticket/Update.html:73
+msgid "Response to requestors"
+msgstr "リクエスト�る人�返答�る"
+
+#: html/Elements/ListActions:26
+msgid "Results"
+msgstr "�果"
+
+#: html/Search/Elements/PickRestriction:105
+msgid "Results per page"
+msgstr "ページ����果"
+
+#: html/Admin/Elements/ModifyUser:33 html/Admin/Users/Modify.html:100 html/User/Prefs.html:72
+msgid "Retype Password"
+msgstr "パスワード��入力"
+
+#: NOT FOUND IN SOURCE
+msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+msgstr "%2　%3�権利%1�領域%4　%5\\n�見��り��ん���"
+
+#: lib/RT/ACE_Overlay.pm:613
+msgid "Right Delegated"
+msgstr "権利�委託�れ���"
+
+#: lib/RT/ACE_Overlay.pm:303
+msgid "Right Granted"
+msgstr "権利�許��れ���"
+
+#: lib/RT/ACE_Overlay.pm:161
+msgid "Right Loaded"
+msgstr "権利�ロード�れ���"
+
+#: lib/RT/ACE_Overlay.pm:678 lib/RT/ACE_Overlay.pm:693
+msgid "Right could not be revoked"
+msgstr "権利を無効�����ん���"
+
+#: html/User/Delegation.html:64
+msgid "Right not found"
+msgstr "権利�見��り��ん���"
+
+#: lib/RT/ACE_Overlay.pm:543 lib/RT/ACE_Overlay.pm:638
+msgid "Right not loaded."
+msgstr "権利�ロード����ん���"
+
+#: lib/RT/ACE_Overlay.pm:689
+msgid "Right revoked"
+msgstr "権利�無効��り���"
+
+#: html/Admin/Elements/UserTabs:41
+msgid "Rights"
+msgstr "権利"
+
+#: lib/RT/Interface/Web.pm:758
+#. ($object_type)
+msgid "Rights could not be granted for %1"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:791
+#. ($object_type)
+msgid "Rights could not be revoked for %1"
+msgstr ""
+
+#: html/Admin/Global/GroupRights.html:51 html/Admin/Queues/GroupRights.html:52
+msgid "Roles"
+msgstr "役割"
+
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr ""
+
+#: lib/RT/Date.pm:393
+msgid "Sat."
+msgstr "土曜日"
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
+msgid "Save Changes"
+msgstr "変更を�存�る"
+
+#: html/Ticket/ModifyLinks.html:39
+msgid "Save changes"
+msgstr "変更を�存�る"
+
+#: html/Admin/Global/Scrip.html:49
+#. ($ARGS{'id'})
+msgid "Scrip #%1"
+msgstr ""
+
+#: lib/RT/Scrip_Overlay.pm:176
+msgid "Scrip Created"
+msgstr "スクリプト�作��れ���"
+
+#: html/Admin/Elements/EditScrips:84
+msgid "Scrip deleted"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:46 html/Admin/Elements/SystemTabs:33 html/Admin/Global/index.html:41
+msgid "Scrips"
+msgstr "スクリプト"
+
+#: NOT FOUND IN SOURCE
+msgid "Scrips for %1\\n"
+msgstr "%1\\n�スクリプト"
+
+#: html/Admin/Queues/Scrips.html:33
+msgid "Scrips which apply to all queues"
+msgstr ""
+
+#: html/Elements/SimpleSearch:27 html/Search/Elements/PickRestriction:126 html/Ticket/Elements/Tabs:159
+msgid "Search"
+msgstr "検索"
+
+#: NOT FOUND IN SOURCE
+msgid "Search Criteria"
+msgstr "検索基準"
+
+#: html/Approvals/Elements/PendingMyApproval:39
+msgid "Search for approvals"
+msgstr ""
+
+#: bin/rt-crontool:188
+msgid "Security:"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "SeeQueue"
+msgstr ""
+
+#: html/Admin/Groups/index.html:40
+msgid "Select a group"
+msgstr "グループ��択"
+
+#: NOT FOUND IN SOURCE
+msgid "Select a queue"
+msgstr "キュー��択"
+
+#: html/Admin/Users/index.html:25 html/Admin/Users/index.html:28
+msgid "Select a user"
+msgstr "ユーザー��択"
+
+#: html/Admin/Global/CustomField.html:38 html/Admin/Global/CustomFields.html:36
+msgid "Select custom field"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:52 html/User/Elements/GroupTabs:50
+msgid "Select group"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:355
+msgid "Select multiple values"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:352
+msgid "Select one value"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:67
+msgid "Select queue"
+msgstr ""
+
+#: html/Admin/Global/Scrip.html:37 html/Admin/Global/Scrips.html:36 html/Admin/Queues/Scrip.html:40 html/Admin/Queues/Scrips.html:50
+msgid "Select scrip"
+msgstr ""
+
+#: html/Admin/Global/Template.html:57 html/Admin/Global/Templates.html:36 html/Admin/Queues/Template.html:55
+msgid "Select template"
+msgstr ""
+
+#: html/Admin/Elements/UserTabs:49
+msgid "Select user"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "SelectMultiple"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectSingle"
+msgstr ""
+
+#: html/SelfService/index.html:25
+msgid "Self Service"
+msgstr "セルフサービス"
+
+#: etc/initialdata:114
+msgid "Send mail to all watchers"
+msgstr ""
+
+#: etc/initialdata:110
+msgid "Send mail to all watchers as a \"comment\""
+msgstr ""
+
+#: etc/initialdata:105
+msgid "Send mail to requestors and Ccs"
+msgstr ""
+
+#: etc/initialdata:100
+msgid "Send mail to requestors and Ccs as a comment"
+msgstr ""
+
+#: etc/initialdata:79
+msgid "Sends a message to the requestors"
+msgstr ""
+
+#: etc/initialdata:118 etc/initialdata:122
+msgid "Sends mail to explicitly listed Ccs and Bccs"
+msgstr ""
+
+#: etc/initialdata:95
+msgid "Sends mail to the administrative Ccs"
+msgstr ""
+
+#: etc/initialdata:91
+msgid "Sends mail to the administrative Ccs as a comment"
+msgstr ""
+
+#: etc/initialdata:83 etc/initialdata:87
+msgid "Sends mail to the owner"
+msgstr ""
+
+#: lib/RT/Date.pm:419
+msgid "Sep."
+msgstr "�月"
+
+#: NOT FOUND IN SOURCE
+msgid "September"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Show Results"
+msgstr "�果を見る"
+
+#: html/Approvals/Elements/PendingMyApproval:44
+msgid "Show approved requests"
+msgstr ""
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show basics"
+msgstr "基本を見る"
+
+#: html/Approvals/Elements/PendingMyApproval:45
+msgid "Show denied requests"
+msgstr ""
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show details"
+msgstr "詳細を見る"
+
+#: html/Approvals/Elements/PendingMyApproval:43
+msgid "Show pending requests"
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:46
+msgid "Show requests awaiting other approvals"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "Show ticket private commentary"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "Show ticket summaries"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "ShowACL"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "ShowScrips"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "ShowTemplate"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "ShowTicket"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "ShowTicketComments"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Sign up as a ticket Requestor or ticket or queue Cc"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "Sign up as a ticket or queue AdminCc"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:39 html/Admin/Users/Modify.html:191 html/Admin/Users/Prefs.html:32 html/SelfService/Prefs.html:37 html/User/Prefs.html:112
+msgid "Signature"
+msgstr "サイン"
+
+#: html/SelfService/Elements/Header:52
+#. ($session{'CurrentUser'}->Name)
+msgid "Signed in as %1"
+msgstr ""
+
+#: html/Admin/Elements/SelectSingleOrMultiple:26
+msgid "Single"
+msgstr "����"
+
+#: html/Elements/Header:51
+msgid "Skip Menu"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFieldValues:31
+msgid "Sort key"
+msgstr "並�替��キー"
+
+#: html/Search/Elements/PickRestriction:109
+msgid "Sort results by"
+msgstr "次�項目���並�替�"
+
+#: html/Admin/Elements/AddCustomFieldValue:25
+msgid "SortOrder"
+msgstr "並�順"
+
+#: NOT FOUND IN SOURCE
+msgid "Stalled"
+msgstr "�止�����"
+
+#: NOT FOUND IN SOURCE
+msgid "Start page"
+msgstr "開始ページ"
+
+#: html/Elements/SelectDateType:27 html/Ticket/Elements/EditDates:32 html/Ticket/Elements/ShowDates:35
+msgid "Started"
+msgstr "開始��"
+
+#: NOT FOUND IN SOURCE
+msgid "Started date '%1' could not be parsed"
+msgstr "開始日'%1'�見��り��ん���"
+
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:27 html/Ticket/Elements/ShowDates:31
+msgid "Starts"
+msgstr "開始�る"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts By"
+msgstr "次�日時���開始�る"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts date '%1' could not be parsed"
+msgstr "開始日'%1'を解�����ん���"
+
+#: html/Admin/Elements/ModifyUser:82 html/Admin/Users/Modify.html:138 html/User/Prefs.html:94
+msgid "State"
+msgstr "状態"
+
+#: html/Elements/MyRequests:31 html/Elements/MyTickets:31 html/Search/Elements/PickRestriction:74 html/SelfService/Display.html:59 html/SelfService/Elements/MyRequests:29 html/SelfService/Update.html:31 html/Ticket/Create.html:42 html/Ticket/Elements/EditBasics:38 html/Ticket/Elements/ShowBasics:31 html/Ticket/Update.html:60 lib/RT/Ticket_Overlay.pm:1164 lib/RT/Tickets_Overlay.pm:908
+msgid "Status"
+msgstr "ステータス"
+
+#: etc/initialdata:288
+msgid "Status Change"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:530
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
+msgid "Status changed from %1 to %2"
+msgstr "ステータス�%1�ら%2�変更�れ���"
+
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:147
+msgid "Steal"
+msgstr "盗用�る"
+
+#: lib/RT/Transaction_Overlay.pm:589
+#. ($Old->Name)
+msgid "Stolen from %1 "
+msgstr "%1�ら盗用��"
+
+#: html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Search/Bulk.html:126 html/Search/Elements/PickRestriction:43 html/SelfService/Create.html:59 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:35 html/Ticket/Create.html:84 html/Ticket/Elements/EditBasics:28 html/Ticket/ModifyAll.html:79 html/Ticket/Update.html:77 lib/RT/Ticket_Overlay.pm:1160 lib/RT/Tickets_Overlay.pm:987
+msgid "Subject"
+msgstr "サブジェクト"
+
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/Transaction_Overlay.pm:611
+#. ($self->Data)
+msgid "Subject changed to %1"
+msgstr ""
+
+#: html/Elements/Submit:59
+msgid "Submit"
+msgstr "�出"
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:749
+msgid "Succeeded"
+msgstr ""
+
+#: lib/RT/Date.pm:394
+msgid "Sun."
+msgstr "日曜日"
+
+#: lib/RT/System.pm:54
+msgid "SuperUser"
+msgstr ""
+
+#: html/User/Elements/DelegateRights:77
+msgid "System"
+msgstr ""
+
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:567 lib/RT/Interface/Web.pm:757 lib/RT/Interface/Web.pm:790
+msgid "System Error"
+msgstr "システムエラー"
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. Right not granted."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. right not granted"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:616
+msgid "System error. Right not delegated."
+msgstr "システムエラー。権利�委任�れ����ん"
+
+#: lib/RT/ACE_Overlay.pm:146 lib/RT/ACE_Overlay.pm:223 lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:898
+msgid "System error. Right not granted."
+msgstr "システムエラー。権利����れ����ん"
+
+#: NOT FOUND IN SOURCE
+msgid "System error. Unable to grant rights."
+msgstr ""
+
+#: html/Admin/Global/GroupRights.html:35 html/Admin/Groups/GroupRights.html:37 html/Admin/Queues/GroupRights.html:36
+msgid "System groups"
+msgstr "システムグループ"
+
+#: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
+msgid "SystemRolegroup for internal use"
+msgstr ""
+
+#: lib/RT/CurrentUser.pm:320
+msgid "TEST_STRING"
+msgstr "テスト＿ストリング"
+
+#: html/Ticket/Elements/Tabs:143
+msgid "Take"
+msgstr "�る"
+
+#: lib/RT/Transaction_Overlay.pm:575
+msgid "Taken"
+msgstr "�られ�"
+
+#: html/Admin/Elements/EditScrip:81
+msgid "Template"
+msgstr "テンプレート"
+
+#: html/Admin/Global/Template.html:91 html/Admin/Queues/Template.html:90
+#. ($TemplateObj->Id())
+msgid "Template #%1"
+msgstr ""
+
+#: html/Admin/Elements/EditTemplates:89
+msgid "Template deleted"
+msgstr ""
+
+#: lib/RT/Scrip_Overlay.pm:153
+msgid "Template not found"
+msgstr "テンプレート�見��り��ん"
+
+#: NOT FOUND IN SOURCE
+msgid "Template not found\\n"
+msgstr "テンプレート�見��り��ん\\n"
+
+#: lib/RT/Template_Overlay.pm:347
+msgid "Template parsed"
+msgstr "テンプレート�解��れ���"
+
+#: html/Admin/Elements/QueueTabs:49 html/Admin/Elements/SystemTabs:36 html/Admin/Global/index.html:45
+msgid "Templates"
+msgstr "テンプレート"
+
+#: NOT FOUND IN SOURCE
+msgid "Templates for %1\\n"
+msgstr "%1\\n�テンプレート"
+
+#: lib/RT/Interface/Web.pm:858
+msgid "That is already the current value"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:178
+msgid "That is not a value for this custom field"
+msgstr "�れ���カスタムフィールド��リュー���り��ん"
+
+#: lib/RT/Ticket_Overlay.pm:1886
+msgid "That is the same value"
+msgstr "�れ����リュー��"
+
+#: lib/RT/Queue_Overlay.pm:633
+#. ($args{'Type'})
+msgid "That principal is already a %1 for this queue"
+msgstr "��責任者������キュー�%1��"
+
+#: lib/RT/Ticket_Overlay.pm:1434
+#. ($self->loc($args{'Type'}))
+msgid "That principal is already a %1 for this ticket"
+msgstr "��責任者�������ケット�%1��"
+
+#: lib/RT/Queue_Overlay.pm:732
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this queue"
+msgstr "��責任者���キュー�%1���り��ん"
+
+#: lib/RT/Ticket_Overlay.pm:1551
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this ticket"
+msgstr "��責任者����ケット�%1���り��ん"
+
+#: lib/RT/Ticket_Overlay.pm:1882
+msgid "That queue does not exist"
+msgstr "��キュー��り��ん"
+
+#: lib/RT/Ticket_Overlay.pm:3143
+msgid "That ticket has unresolved dependencies"
+msgstr "���ケット�従属物を���分解����"
+
+#: lib/RT/ACE_Overlay.pm:288 lib/RT/ACE_Overlay.pm:597
+msgid "That user already has that right"
+msgstr "��ユーザー����権利��り��"
+
+#: lib/RT/Ticket_Overlay.pm:2952
+msgid "That user already owns that ticket"
+msgstr "��ユーザー�����ケットを所有�����"
+
+#: lib/RT/Ticket_Overlay.pm:2918
+msgid "That user does not exist"
+msgstr "��ユーザー�存在���ん"
+
+#: lib/RT/User_Overlay.pm:315
+msgid "That user is already privileged"
+msgstr "��ユーザー����特権�与�られ����"
+
+#: lib/RT/User_Overlay.pm:332
+msgid "That user is already unprivileged"
+msgstr "��ユーザー�����特権��り��ん"
+
+#: lib/RT/User_Overlay.pm:327
+msgid "That user is now privileged"
+msgstr "��ユーザー�今特権を与�られ���"
+
+#: lib/RT/User_Overlay.pm:344
+msgid "That user is now unprivileged"
+msgstr "��ユーザー�今特権を失����"
+
+#: NOT FOUND IN SOURCE
+msgid "That user is now unprivilegedileged"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2944
+msgid "That user may not own tickets in that queue"
+msgstr "��ユーザー���キュー���ケットを所有������能性��り��"
+
+#: lib/RT/Link_Overlay.pm:206
+msgid "That's not a numerical id"
+msgstr "�れ�数字�ID���り��ん"
+
+#: html/Ticket/Create.html:150 html/Ticket/Elements/ShowSummary:28
+msgid "The Basics"
+msgstr "基本"
+
+#: lib/RT/ACE_Overlay.pm:88
+msgid "The CC of a ticket"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:89
+msgid "The administrative CC of a ticket"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2213
+msgid "The comment has been recorded"
+msgstr "コメント�記録�れ���"
+
+#: bin/rt-crontool:198
+msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
+msgstr ""
+
+#: bin/rt-commit-handler:756 bin/rt-commit-handler:766
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr "次�コマンド�処��れ��ん���:\\n\\n"
+
+#: lib/RT/Interface/Web.pm:861
+msgid "The new value has been set."
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:86
+msgid "The owner of a ticket"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:87
+msgid "The requestor of a ticket"
+msgstr ""
+
+#: html/Admin/Elements/EditUserComments:26
+msgid "These comments aren't generally visible to the user"
+msgstr "�れら�コメント�実際ユーザー��見る�������ん"
+
+#: NOT FOUND IN SOURCE
+msgid "This ticket %1 %2 (%3)\\n"
+msgstr "���ケット%1 %2 (%3)\\n"
+
+#: bin/rt-crontool:189
+msgid "This tool allows the user to run arbitrary perl modules from within RT."
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:253
+msgid "This transaction appears to have no content"
+msgstr "��トランザクション��コンテンツ��り��ん"
+
+#: html/Ticket/Elements/ShowRequestor:47
+#. ($rows)
+msgid "This user's %1 highest priority tickets"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "This user's 25 highest priority tickets"
+msgstr "��ユーザー�25�も��も高�優先�ケット"
+
+#: lib/RT/Date.pm:391
+msgid "Thu."
+msgstr "木曜日"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1  %2"
+msgstr "�ケット# %1  %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1 Jumbo update: %2"
+msgstr ""
+
+#: html/Ticket/ModifyAll.html:25 html/Ticket/ModifyAll.html:29
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket #%1 Jumbo update: %2"
+msgstr "�ケット　#%1　大��アップデート: %2"
+
+#: html/Approvals/Elements/ShowDependency:46
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Ticket #%1: %2"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:608
+#. ($self->Id, $QueueObj->Name)
+msgid "Ticket %1 created in queue '%2'"
+msgstr "�ケット %1�キュー '%2'�作��れ���"
+
+#: bin/rt-commit-handler:760
+#. ($Ticket->Id)
+msgid "Ticket %1 loaded\\n"
+msgstr "�ケット%1�ロード�れ���\\n"
+
+#: html/Search/Bulk.html:181
+#. ($Ticket->Id,$_)
+msgid "Ticket %1: %2"
+msgstr "�ケット　%1: %2"
+
+#: html/Ticket/History.html:25 html/Ticket/History.html:28
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket History # %1 %2"
+msgstr "�ケットヒストリー　# %1 %2"
+
+#: html/SelfService/Display.html:34
+msgid "Ticket Id"
+msgstr "�ケットID"
+
+#: etc/initialdata:303
+msgid "Ticket Resolved"
+msgstr ""
+
+#: html/Search/Elements/PickRestriction:63
+msgid "Ticket attachment"
+msgstr "�ケット添付"
+
+#: lib/RT/Tickets_Overlay.pm:1166
+msgid "Ticket content"
+msgstr "�ケットコンテンツ"
+
+#: lib/RT/Tickets_Overlay.pm:1212
+msgid "Ticket content type"
+msgstr "�ケットコンテンツタイプ"
+
+#: lib/RT/Ticket_Overlay.pm:495 lib/RT/Ticket_Overlay.pm:597
+msgid "Ticket could not be created due to an internal error"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:522
+msgid "Ticket created"
+msgstr "�ケット�作��れ���"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket creation failed"
+msgstr "�ケット�作��失敗����"
+
+#: lib/RT/Transaction_Overlay.pm:527
+msgid "Ticket deleted"
+msgstr "�ケット�削除�れ���"
+
+#: html/REST/1.0/modify:29 html/REST/1.0/update:34
+msgid "Ticket id not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket killed"
+msgstr ""
+
+#: html/REST/1.0/modify:36 html/REST/1.0/update:41
+msgid "Ticket not found"
+msgstr ""
+
+#: etc/initialdata:289
+msgid "Ticket status changed"
+msgstr ""
+
+#: html/Ticket/Update.html:39
+msgid "Ticket watchers"
+msgstr "�ケットウォッ�ャー"
+
+#: html/Elements/Tabs:49
+msgid "Tickets"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1383
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1348
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr ""
+
+#: html/Elements/ViewUser:26
+#. ($name)
+msgid "Tickets from %1"
+msgstr "%1�ら��ケット"
+
+#: html/Approvals/Elements/ShowDependency:27
+msgid "Tickets which depend on this approval:"
+msgstr ""
+
+#: html/Ticket/Create.html:157 html/Ticket/Elements/EditBasics:48
+msgid "Time Left"
+msgstr "時間�残�����"
+
+#: html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:43
+msgid "Time Worked"
+msgstr "使��時間"
+
+#: lib/RT/Tickets_Overlay.pm:1139
+msgid "Time left"
+msgstr "残���る時間"
+
+#: html/Elements/Footer:36
+msgid "Time to display"
+msgstr "表示�る時間"
+
+#: lib/RT/Tickets_Overlay.pm:1115
+msgid "Time worked"
+msgstr "使��時間"
+
+#: NOT FOUND IN SOURCE
+msgid "TimeLeft"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1165
+msgid "TimeWorked"
+msgstr ""
+
+#: bin/rt-commit-handler:402
+msgid "To generate a diff of this commit:"
+msgstr "��コミット�ディフを��る���:"
+
+#: bin/rt-commit-handler:391
+msgid "To generate a diff of this commit:\\n"
+msgstr "��コミット�ディフを��る���:\\n"
+
+#: lib/RT/Ticket_Overlay.pm:1168
+msgid "Told"
+msgstr "言��"
+
+#: etc/initialdata:237
+msgid "Transaction"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:642
+#. ($self->Data)
+msgid "Transaction %1 purged"
+msgstr "トランザクション%1�消去�れ���"
+
+#: lib/RT/Transaction_Overlay.pm:177
+msgid "Transaction Created"
+msgstr "トランザクション�作��れ���"
+
+#: lib/RT/Transaction_Overlay.pm:89
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:701
+msgid "Transactions are immutable"
+msgstr "トランザクション�変更�れる����り��ん"
+
+#: NOT FOUND IN SOURCE
+msgid "Trying to delete a right: %1"
+msgstr "権利: %1を削除�����"
+
+#: lib/RT/Date.pm:389
+msgid "Tue."
+msgstr "�曜日"
+
+#: html/Admin/Elements/EditCustomField:34 html/Ticket/Elements/AddWatchers:33 html/Ticket/Elements/AddWatchers:44 html/Ticket/Elements/AddWatchers:54 lib/RT/Ticket_Overlay.pm:1166 lib/RT/Tickets_Overlay.pm:959
+msgid "Type"
+msgstr "タイプ"
+
+#: lib/RT/ScripCondition_Overlay.pm:104
+msgid "Unimplemented"
+msgstr "導入�れ����"
+
+#: html/Admin/Users/Modify.html:68
+msgid "Unix login"
+msgstr "Unixログイン"
+
+#: html/Admin/Elements/ModifyUser:62
+msgid "UnixUsername"
+msgstr "Unixユーザー�ーム"
+
+#: lib/RT/Attachment_Overlay.pm:265
+#. ($self->ContentEncoding)
+msgid "Unknown ContentEncoding %1"
+msgstr "�明�コンテンツエンコーディング%1"
+
+#: html/Elements/SelectResultsPerPage:37
+msgid "Unlimited"
+msgstr "制��れ����"
+
+#: etc/initialdata:32
+msgid "Unprivileged"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:571
+msgid "Untaken"
+msgstr "�られ����"
+
+#: html/Elements/MyTickets:64 html/Search/Bulk.html:33
+msgid "Update"
+msgstr "アップデート"
+
+#: html/Admin/Users/Prefs.html:62
+msgid "Update ID"
+msgstr "アップデートID"
+
+#: html/Search/Bulk.html:120 html/Ticket/ModifyAll.html:66 html/Ticket/Update.html:67
+msgid "Update Type"
+msgstr "アップデートタイプ"
+
+#: html/Search/Listing.html:61
+msgid "Update all these tickets at once"
+msgstr "�����ケットを一度�アップデート�る"
+
+#: html/Admin/Users/Prefs.html:49
+msgid "Update email"
+msgstr "アップデートEメール"
+
+#: html/Admin/Users/Prefs.html:55
+msgid "Update name"
+msgstr "アップデート�ーム"
+
+#: lib/RT/Interface/Web.pm:375
+msgid "Update not recorded."
+msgstr "アップデート�記録�れ��ん���"
+
+#: html/Search/Bulk.html:81
+msgid "Update selected tickets"
+msgstr "�択�れ��ケットをアップデート�る"
+
+#: html/Admin/Users/Prefs.html:36
+msgid "Update signature"
+msgstr "サインをアップデート�る"
+
+#: html/Ticket/ModifyAll.html:63
+msgid "Update ticket"
+msgstr "�ケットをアップデート�る"
+
+#: html/SelfService/Update.html:25 html/SelfService/Update.html:27
+#. ($Ticket->id)
+msgid "Update ticket # %1"
+msgstr "アップデート�ケット # %1"
+
+#: html/SelfService/Update.html:50
+#. ($Ticket->id)
+msgid "Update ticket #%1"
+msgstr "アップデート�ケット #%1"
+
+#: html/Ticket/Update.html:135
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Update ticket #%1 (%2)"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:373
+msgid "Update type was neither correspondence nor comment."
+msgstr "アップデートタイプ�通知�もコメント�も�り��ん"
+
+#: html/Elements/SelectDateType:33 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1169
+msgid "Updated"
+msgstr "アップデート����"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 %2: %3\\n"
+msgstr "ユーザー%1 %2: %3\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 Password: %2\\n"
+msgstr "ユーザー%1パスワード: %2\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found"
+msgstr "ユーザー'%1'�見��り��ん"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found\\n"
+msgstr "ユーザー'%1'�見��り��ん\\n"
+
+#: etc/initialdata:125 etc/initialdata:191
+msgid "User Defined"
+msgstr ""
+
+#: html/Admin/Users/Prefs.html:59
+msgid "User ID"
+msgstr "ユーザーID"
+
+#: html/Elements/SelectUsers:26
+msgid "User Id"
+msgstr "ユーザーID"
+
+#: html/Admin/Elements/GroupTabs:47 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/SystemTabs:47 html/Admin/Global/index.html:59
+msgid "User Rights"
+msgstr "ユーザー権利"
+
+#: html/Admin/Users/Modify.html:226
+#. ($msg)
+msgid "User could not be created: %1"
+msgstr "ユーザーを作��る�������ん���: %1"
+
+#: lib/RT/User_Overlay.pm:262
+msgid "User created"
+msgstr "ユーザー�作��れ���"
+
+#: html/Admin/Global/GroupRights.html:67 html/Admin/Groups/GroupRights.html:54 html/Admin/Queues/GroupRights.html:68
+msgid "User defined groups"
+msgstr "ユーザー�グループを決定����"
+
+#: NOT FOUND IN SOURCE
+msgid "User notified"
+msgstr "ユーザー�通告�れ���"
+
+#: html/Admin/Users/Prefs.html:25 html/Admin/Users/Prefs.html:29
+msgid "User view"
+msgstr "ユーザービュー"
+
+#: html/Admin/Users/Modify.html:48 html/Elements/Login:42 html/Ticket/Elements/AddWatchers:35
+msgid "Username"
+msgstr "ユーザー�ーム"
+
+#: html/Admin/Elements/SelectNewGroupMembers:26 html/Admin/Elements/Tabs:32 html/Admin/Groups/Members.html:55 html/Admin/Queues/People.html:68 html/Admin/index.html:29 html/User/Groups/Members.html:58
+msgid "Users"
+msgstr "ユーザー"
+
+#: html/Admin/Users/index.html:65
+msgid "Users matching search criteria"
+msgstr "ユーザー�検索基準�������"
+
+#: html/Search/Elements/PickRestriction:51
+msgid "ValueOfQueue"
+msgstr "キュー��リュー"
+
+#: html/Admin/Elements/EditCustomField:40
+msgid "Values"
+msgstr "�リュー"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Watch"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "WatchAsAdminCc"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Watcher loaded"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:42
+msgid "Watchers"
+msgstr "ウォッ�ャー"
+
+#: html/Admin/Elements/ModifyUser:56
+msgid "WebEncoding"
+msgstr "ウェブエンコーディング"
+
+#: lib/RT/Date.pm:390
+msgid "Wed."
+msgstr "水曜日"
+
+#: etc/upgrade/2.1.71:161
+msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
+msgstr ""
+
+#: etc/upgrade/2.1.71:135
+msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
+msgstr ""
+
+#: etc/initialdata:138
+msgid "When a ticket is created"
+msgstr ""
+
+#: etc/upgrade/2.1.71:79
+msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
+msgstr ""
+
+#: etc/initialdata:143
+msgid "When anything happens"
+msgstr ""
+
+#: etc/initialdata:184
+msgid "Whenever a ticket is resolved"
+msgstr ""
+
+#: etc/initialdata:170
+msgid "Whenever a ticket's owner changes"
+msgstr ""
+
+#: etc/initialdata:178
+msgid "Whenever a ticket's queue changes"
+msgstr ""
+
+#: etc/initialdata:162
+msgid "Whenever a ticket's status changes"
+msgstr ""
+
+#: etc/initialdata:192
+msgid "Whenever a user-defined condition occurs"
+msgstr ""
+
+#: etc/initialdata:156
+msgid "Whenever comments come in"
+msgstr ""
+
+#: etc/initialdata:149
+msgid "Whenever correspondence comes in"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:164 html/User/Prefs.html:52
+msgid "Work"
+msgstr "仕事"
+
+#: html/Admin/Elements/ModifyUser:70
+msgid "WorkPhone"
+msgstr "仕事先�電話"
+
+#: html/SelfService/Display.html:86 html/Ticket/Elements/ShowBasics:35 html/Ticket/Update.html:65
+msgid "Worked"
+msgstr "Worked"
+
+#: lib/RT/Ticket_Overlay.pm:3056
+msgid "You already own this ticket"
+msgstr "����������ケットを所有�����"
+
+#: html/autohandler:121
+msgid "You are not an authorized user"
+msgstr "�����証�れ�ユーザー���り��ん"
+
+#: lib/RT/Ticket_Overlay.pm:2930
+msgid "You can only reassign tickets that you own or that are unowned"
+msgstr "����所有����所有�れ�����ケット��を止�る�������"
+
+#: NOT FOUND IN SOURCE
+msgid "You don't have permission to view that ticket.\\n"
+msgstr "�������ケットを見る許���り��ん。\\n"
+
+#: docs/design_docs/string-extraction-guide.txt:47
+#. ($num, $queue)
+msgid "You found %1 tickets in queue %2"
+msgstr "����%2��ケット%1を見�����"
+
+#: html/NoAuth/Logout.html:31 html/REST/1.0/logout:25
+msgid "You have been logged out of RT."
+msgstr "����RT�らログアウト������"
+
+#: html/SelfService/Display.html:134
+msgid "You have no permission to create tickets in that queue."
+msgstr "������キュー��ケット作��許���り��ん"
+
+#: lib/RT/Ticket_Overlay.pm:1895
+msgid "You may not create requests in that queue."
+msgstr "������キュー�リクエスト�作����る��ょ�"
+
+#: html/NoAuth/Logout.html:36
+msgid "You're welcome to login again"
+msgstr "����ログイン������"
+
+#: html/SelfService/Elements/MyRequests:25
+#. ($friendly_status)
+msgid "Your %1 requests"
+msgstr "����%1�リクエスト"
+
+#: NOT FOUND IN SOURCE
+msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
+msgstr "����RT管�者�RTを呼�出�メールaliasesを設定����ん���"
+
+#: etc/initialdata:429 etc/upgrade/2.1.71:146
+msgid "Your request has been approved by %1. Other approvals may still be pending."
+msgstr ""
+
+#: etc/initialdata:463 etc/upgrade/2.1.71:180
+msgid "Your request has been approved."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr ""
+
+#: etc/initialdata:384 etc/upgrade/2.1.71:101
+msgid "Your request was rejected."
+msgstr ""
+
+#: html/autohandler:136 html/autohandler:142
+msgid "Your username or password is incorrect"
+msgstr "�����ユーザー�ーム�パスワード�間������"
+
+#: html/Admin/Elements/ModifyUser:84 html/Admin/Users/Modify.html:144 html/User/Prefs.html:96
+msgid "Zip"
+msgstr "ジップ"
+
+#: NOT FOUND IN SOURCE
+msgid "[no subject]"
+msgstr ""
+
+#: html/User/Elements/DelegateRights:59
+#. ($right->PrincipalObj->Object->SelfDescription)
+msgid "as granted to %1"
+msgstr "%1��許�"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:34
+msgid "contains"
+msgstr "�む"
+
+#: html/Elements/SelectAttachmentField:26
+msgid "content"
+msgstr ""
+
+#: html/Elements/SelectAttachmentField:27
+msgid "content-type"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2282
+msgid "correspondence (probably) not sent"
+msgstr "通知�（��ら�）�信�れ����ん"
+
+#: lib/RT/Ticket_Overlay.pm:2292
+msgid "correspondence sent"
+msgstr "通知��信�れ���"
+
+#: html/Admin/Elements/ModifyQueue:63 html/Admin/Queues/Modify.html:77 lib/RT/Date.pm:319
+msgid "days"
+msgstr "æ—¥"
+
+#: NOT FOUND IN SOURCE
+msgid "dead"
+msgstr ""
+
+#: html/Search/Listing.html:75
+msgid "delete"
+msgstr "削除"
+
+#: lib/RT/Queue_Overlay.pm:63
+msgid "deleted"
+msgstr "削除�れ�"
+
+#: html/Search/Elements/PickRestriction:68
+msgid "does not match"
+msgstr "����ん"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:35
+msgid "doesn't contain"
+msgstr "����ん"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "equal to"
+msgstr "等��"
+
+#: NOT FOUND IN SOURCE
+msgid "false"
+msgstr ""
+
+#: html/Elements/SelectAttachmentField:28
+msgid "filename"
+msgstr ""
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "greater than"
+msgstr "より大��"
+
+#: lib/RT/Group_Overlay.pm:194
+#. ($self->Name)
+msgid "group '%1'"
+msgstr "グループ'%1'"
+
+#: lib/RT/Date.pm:315
+msgid "hours"
+msgstr "時間"
+
+#: NOT FOUND IN SOURCE
+msgid "id"
+msgstr "ID"
+
+#: html/Elements/SelectBoolean:32 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88
+msgid "is"
+msgstr "��"
+
+#: html/Elements/SelectBoolean:36 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:37 html/Search/Elements/PickRestriction:48 html/Search/Elements/PickRestriction:77 html/Search/Elements/PickRestriction:89
+msgid "isn't"
+msgstr "���"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "less than"
+msgstr "より少��"
+
+#: html/Search/Elements/PickRestriction:67
+msgid "matches"
+msgstr "��"
+
+#: lib/RT/Date.pm:311
+msgid "min"
+msgstr "最低"
+
+#: html/Ticket/Update.html:66
+msgid "minutes"
+msgstr "分"
+
+#: bin/rt-commit-handler:765
+msgid "modifications\\n\\n"
+msgstr "修正\\n\\n"
+
+#: lib/RT/Date.pm:327
+msgid "months"
+msgstr "月"
+
+#: lib/RT/Queue_Overlay.pm:58
+msgid "new"
+msgstr "新��"
+
+#: html/Admin/Elements/EditScrips:43
+msgid "no value"
+msgstr ""
+
+#: html/Ticket/Elements/EditWatchers:28
+msgid "none"
+msgstr "��"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "not equal to"
+msgstr "等����"
+
+#: NOT FOUND IN SOURCE
+msgid "notlike"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:59
+msgid "open"
+msgstr "開�"
+
+#: lib/RT/Group_Overlay.pm:199
+#. ($self->Name, $user->Name)
+msgid "personal group '%1' for user '%2'"
+msgstr "ユーザー　'%2'　�パーソナルグループ　'%1'　"
+
+#: lib/RT/Group_Overlay.pm:207
+#. ($queue->Name, $self->Type)
+msgid "queue %1 %2"
+msgstr "キュー　%1 %2"
+
+#: lib/RT/Queue_Overlay.pm:62
+msgid "rejected"
+msgstr "拒��れ���"
+
+#: lib/RT/Queue_Overlay.pm:61
+msgid "resolved"
+msgstr "分解�れ���"
+
+#: lib/RT/Date.pm:307
+msgid "sec"
+msgstr "秒"
+
+#: lib/RT/Queue_Overlay.pm:60
+msgid "stalled"
+msgstr "止�り���"
+
+#: lib/RT/Group_Overlay.pm:202
+#. ($self->Type)
+msgid "system %1"
+msgstr "システム　%1"
+
+#: lib/RT/Group_Overlay.pm:213
+#. ($self->Type)
+msgid "system group '%1'"
+msgstr "システムグループ　'%1'"
+
+#: html/Elements/Error:42 html/SelfService/Error.html:42
+msgid "the calling component did not specify why"
+msgstr "呼�出���るコン�ー�ント���次�よ�����起�る��特定����ん���"
+
+#: lib/RT/Group_Overlay.pm:210
+#. ($self->Instance, $self->Type)
+msgid "ticket #%1 %2"
+msgstr "�ケット　#%1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "true"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:216
+#. ($self->Id)
+msgid "undescribed group %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "undescripbed group %1"
+msgstr "表示�れ��グループ　%1"
+
+#: lib/RT/Group_Overlay.pm:191
+#. ($user->Object->Name)
+msgid "user %1"
+msgstr "ユーザー　%1"
+
+#: lib/RT/Date.pm:323
+msgid "weeks"
+msgstr "週"
+
+#: NOT FOUND IN SOURCE
+msgid "with template %1"
+msgstr "テンプレート　%1�"
+
+#: lib/RT/Date.pm:331
+msgid "years"
+msgstr "å¹´"
+
+#: NOT FOUND IN SOURCE
+msgid "ニック�ーム"
+msgstr ""
+
diff --git a/rt/lib/RT/I18N/nl.po b/rt/lib/RT/I18N/nl.po
new file mode 100644
index 000000000..0c3549914
--- /dev/null
+++ b/rt/lib/RT/I18N/nl.po
@@ -0,0 +1,4819 @@
+msgid ""
+msgstr ""
+"Language-Team: rt-devel <rt-devel@lists.fsck.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: html/Elements/MyRequests:28 html/Elements/MyTickets:28
+msgid "#"
+msgstr "#"
+
+#: html/Admin/Queues/Scrip.html:55
+#. ($QueueObj->id)
+msgid "#%1"
+msgstr "" 
+#: html/Approvals/Elements/ShowDependency:50 html/Ticket/Display.html:26 html/Ticket/Display.html:30
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "#%1: %2"
+msgstr "#%1: %2"
+
+#: lib/RT/Date.pm:337
+#. ($s, $time_unit)
+msgid "%1 %2"
+msgstr "%1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:771
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr "%1 %2 %3"
+
+#: lib/RT/Date.pm:373
+#. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
+msgid "%1 %2 %3 %4:%5:%6 %7"
+msgstr "%1 %2 %3 %4:%5:%6 %7"
+
+#: lib/RT/Ticket_Overlay.pm:3438 lib/RT/Transaction_Overlay.pm:559 lib/RT/Transaction_Overlay.pm:601
+#. ($cf->Name, $new_value->Content)
+#. ($field, $self->NewValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 added"
+msgstr "%1 %2 toegevoegd"
+
+#: lib/RT/Date.pm:334
+#. ($s, $time_unit)
+msgid "%1 %2 ago"
+msgstr "%1 %2 geleden"
+
+#: lib/RT/Ticket_Overlay.pm:3444 lib/RT/Transaction_Overlay.pm:566
+#. ($cf->Name, $old_value, $new_value->Content)
+#. ($field, $self->OldValue, $self->NewValue)
+msgid "%1 %2 changed to %3"
+msgstr "%1 %2 veranderd naar %3"
+
+#: lib/RT/Ticket_Overlay.pm:3441 lib/RT/Transaction_Overlay.pm:562 lib/RT/Transaction_Overlay.pm:607
+#. ($cf->Name, $old_value)
+#. ($field, $self->OldValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 deleted"
+msgstr "%1 %2 verwijderd"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 of group %3"
+msgstr ""
+
+#: html/Admin/Elements/EditScrips:44 html/Admin/Elements/ListGlobalScrips:28
+#. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
+msgid "%1 %2 with template %3"
+msgstr "%1 %2 met sjabloon %3"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 this ticket\\n"
+msgstr "%1 (%2) %3 dit ticket\\n"
+
+#: html/Search/Listing.html:57
+#. (($session{'tickets'}->FirstRow+1), ($session{'tickets'}->FirstRow() + $session{'tickets'}->RowsPerPage()  ))
+msgid "%1 - %2 shown"
+msgstr ""
+
+#: bin/rt-crontool:169 bin/rt-crontool:176 bin/rt-crontool:182
+#. ("--search-argument", "--search")
+#. ("--condition-argument", "--condition")
+#. ("--action-argument", "--action")
+msgid "%1 - An argument to pass to %2"
+msgstr "%1 - Een argument om door te geven aan %2"
+
+#: bin/rt-crontool:185
+#. ("--verbose")
+msgid "%1 - Output status updates to STDOUT"
+msgstr "%1 - Uitvoer status herzieningen naar STDOUT"
+
+#: bin/rt-crontool:179
+#. ("--action")
+msgid "%1 - Specify the action module you want to use"
+msgstr "%1 - Specificeer de actie module die u wenst te gebruiken"
+
+#: bin/rt-crontool:173
+#. ("--condition")
+msgid "%1 - Specify the condition module you want to use"
+msgstr "%1 - Specificeer de conditie module die u wenst te gebruiken"
+
+#: bin/rt-crontool:166
+#. ("--search")
+msgid "%1 - Specify the search module you want to use"
+msgstr "%1 - Specificeer de zoek module die u wenst te gebruiken"
+
+#: lib/RT/ScripAction_Overlay.pm:122
+#. ($self->Id)
+msgid "%1 ScripAction loaded"
+msgstr "%1 ScripAction geladen"
+
+#: lib/RT/Ticket_Overlay.pm:3471
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 added as a value for %2"
+msgstr "%1 toegevoegd als waarde voor %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on"
+msgstr "%1 aliassen hebben een TicketId nodig om mee te werken"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on "
+msgstr "%1 aliassen hebben een TicketId nodig om mee te werken"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on (from %2) %3"
+msgstr "%1 aliassen hebben een TicketId nodig om mee te werken (van %2) %3"
+
+#: lib/RT/Link_Overlay.pm:117 lib/RT/Link_Overlay.pm:124
+#. ($args{'Base'})
+#. ($args{'Target'})
+msgid "%1 appears to be a local object, but can't be found in the database"
+msgstr ""
+
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:483
+#. ($self->BriefDescription , $self->CreatorObj->Name)
+#. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
+msgid "%1 by %2"
+msgstr "%1 door %2"
+
+#: lib/RT/Transaction_Overlay.pm:537 lib/RT/Transaction_Overlay.pm:626 lib/RT/Transaction_Overlay.pm:635 lib/RT/Transaction_Overlay.pm:638
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
+#. ($self->Field , $q1->Name , $q2->Name)
+#. ($self->Field, $t2->AsString, $t1->AsString)
+#. ($self->Field, $self->OldValue, $self->NewValue)
+msgid "%1 changed from %2 to %3"
+msgstr "%1 veranderd van %2 naar %3"
+
+#: lib/RT/Interface/Web.pm:857
+msgid "%1 could not be set to %2."
+msgstr "%1 kon niet veranderd worden naar %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 couldn't init a transaction (%2)\\n"
+msgstr "%1 kon geen transactie initiëren (%2)"
+
+#: lib/RT/Ticket_Overlay.pm:2813
+#. ($self)
+msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
+msgstr "%1 kon status niet veranderen naar opgelost. RT's Database zou inconsistent kunnen zijn"
+
+#: html/Elements/MyTickets:25
+#. ($rows)
+msgid "%1 highest priority tickets I own..."
+msgstr "De %1 hoogste prioriteit tickets die ik bezit..."
+
+#: html/Elements/MyRequests:25
+#. ($rows)
+msgid "%1 highest priority tickets I requested..."
+msgstr "De %1 hoogste prioriteit tickets waarom ik verzocht heb..."
+
+#: bin/rt-crontool:161
+#. ($0)
+msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
+msgstr "%1 is een gereedschap om te reageren op tickets van een extern rooster programma, zoals cron"
+
+#: lib/RT/Queue_Overlay.pm:743
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this queue."
+msgstr "%1 is niet langer een %2 voor deze rij"
+
+#: lib/RT/Ticket_Overlay.pm:1570
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this ticket."
+msgstr "%1 is niet langer een %2 voor dit ticket"
+
+#: lib/RT/Ticket_Overlay.pm:3527
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 is no longer a value for custom field %2"
+msgstr "%1 is niet langer een waarde voor specifiek veld %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 isn't a valid Queue id."
+msgstr "%1 is niet een geldig Rij id"
+
+#: html/Ticket/Elements/ShowBasics:36
+#. ($TimeWorked)
+msgid "%1 min"
+msgstr "%1 min"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 not shown"
+msgstr "%1 niet afgebeeld"
+
+#: html/User/Elements/DelegateRights:76
+#. (loc($ObjectType =~ /^RT::(.*)$/))
+msgid "%1 rights"
+msgstr "%1 rechten"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 succeeded\\n"
+msgstr "%1 gelukt\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for $MessageId"
+msgstr "%1 type onbekend voor $MessageId"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for %2"
+msgstr "%1 type onbekend voor %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 was created without a CurrentUser\\n"
+msgstr ""
+
+#: lib/RT/Action/ResolveMembers.pm:42
+#. (ref $self)
+msgid "%1 will resolve all members of a resolved group ticket."
+msgstr "%1 zal alle leden van een opgelost groep ticket omzetten."
+
+#: NOT FOUND IN SOURCE
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:435
+#. ($self)
+msgid "%1: no attachment specified"
+msgstr "%1: geen aanhechting gespecificeerd"
+
+#: html/Ticket/Elements/ShowTransaction:102
+#. ($size)
+msgid "%1b"
+msgstr "%1b"
+
+#: html/Ticket/Elements/ShowTransaction:99
+#. (int($size/102.4)/10)
+msgid "%1k"
+msgstr "%1k"
+
+#: lib/RT/Ticket_Overlay.pm:1140
+#. ($args{'Status'})
+msgid "'%1' is an invalid value for status"
+msgstr "'%1 is een ongeldige waarde voor status"
+
+#: NOT FOUND IN SOURCE
+msgid "'%1' not a recognized action. "
+msgstr "'%1' onherkende actie. "
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete group member)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete scrip)"
+msgstr ""
+
+#: html/Admin/Elements/EditQueueWatchers:29 html/Admin/Elements/EditScrips:35 html/Admin/Elements/EditTemplates:36 html/Admin/Groups/Members.html:52 html/Ticket/Elements/EditLinks:33 html/Ticket/Elements/EditPeople:46 html/User/Groups/Members.html:55
+msgid "(Check box to delete)"
+msgstr "(Vink hokje af om te verwijderen)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check boxes to delete)"
+msgstr ""
+
+#: html/Ticket/Create.html:178
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr "(Vul ticket ids of URLs in, gescheiden door spaties)"
+
+#: html/Admin/Queues/Modify.html:54 html/Admin/Queues/Modify.html:60
+#. ($RT::CorrespondAddress)
+#. ($RT::CommentAddress)
+msgid "(If left blank, will default to %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(No Value)"
+msgstr "(Geen Waarde)"
+
+#: html/Admin/Elements/EditCustomFields:33 html/Admin/Elements/ListGlobalCustomFields:32
+msgid "(No custom fields)"
+msgstr ""
+
+#: html/Admin/Groups/Members.html:50 html/User/Groups/Members.html:53
+msgid "(No members)"
+msgstr "(Geen Leden)"
+
+#: html/Admin/Elements/EditScrips:32 html/Admin/Elements/ListGlobalScrips:32
+msgid "(No scrips)"
+msgstr "(Geen scrips)"
+
+#: html/Admin/Elements/EditTemplates:31
+msgid "(No templates)"
+msgstr ""
+
+#: html/Ticket/Update.html:85
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(Stuurt een blinde carbon copy van deze herziening naar een comma gescheiden lijst van email adressen. Wie er toekomstige herzieningen zal ontvangen, zal <b>niet</b> veranderen.)"
+
+#: html/Ticket/Create.html:79
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
+msgstr ""
+
+#: html/Ticket/Update.html:81
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(Stuurt een carbon copy van deze herziening naar een comma gescheiden lijst van email adressen. Wie er toekomstige herzieningen zal ontvangen, zal <b>niet</b> veranderen.)"
+
+#: html/Ticket/Create.html:69
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
+msgstr ""
+
+#: html/Admin/Groups/index.html:33 html/User/Groups/index.html:33
+msgid "(empty)"
+msgstr "(leeg)"
+
+#: html/Admin/Users/index.html:39
+msgid "(no name listed)"
+msgstr ""
+
+#: html/Elements/MyRequests:43 html/Elements/MyTickets:45
+msgid "(no subject)"
+msgstr "(geen onderwerp)"
+
+#: html/Admin/Elements/SelectRights:48 html/Elements/SelectCustomFieldValue:30 html/Ticket/Elements/EditCustomField:59 html/Ticket/Elements/ShowCustomFields:36 lib/RT/Transaction_Overlay.pm:536
+msgid "(no value)"
+msgstr "(geen waarde)"
+
+#: html/Ticket/Elements/EditLinks:116
+msgid "(only one ticket)"
+msgstr "(slechts één ticket)"
+
+#: html/Elements/MyRequests:52 html/Elements/MyTickets:55
+msgid "(pending approval)"
+msgstr "(wacht op goedkeuring)"
+
+#: html/Elements/MyRequests:54 html/Elements/MyTickets:57
+msgid "(pending other tickets)"
+msgstr "(wacht op andere tickets)"
+
+#: NOT FOUND IN SOURCE
+msgid "(requestor's group)"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:50
+msgid "(required)"
+msgstr "(verplicht)"
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "(untitled)"
+msgstr "(zonder titel)"
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:32
+msgid "<% $Ticket->Status%>"
+msgstr "<% $Ticket->Status%>"
+
+#: html/Elements/SelectTicketTypes:27
+msgid "<% $_ %>"
+msgstr "<% $_ %>"
+
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:26
+#. ($m->scomp('/Elements/SelectNewTicketQueue'))
+msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
+msgstr "<input type=\"submit\" value=\"Nieuw ticket in\">&nbsp;%1"
+
+#: NOT FOUND IN SOURCE
+msgid "??????"
+msgstr ""
+
+#: etc/initialdata:203
+msgid "A blank template"
+msgstr "Een leeg sjabloon"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Deleted"
+msgstr "ACE Verwijderd"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Loaded"
+msgstr "ACE Geladen"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be found"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:157 lib/RT/Principal_Overlay.pm:181
+msgid "ACE not found"
+msgstr "ACE niet gevonden"
+
+#: lib/RT/ACE_Overlay.pm:831
+msgid "ACEs can only be created and deleted."
+msgstr "ACEs kunnen allen gecreëerd of verwijderd worden."
+
+#: bin/rt-commit-handler:755
+msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgstr "Afbraak om ongewenste ticket aanpassing te voorkomen.\\n"
+
+#: html/User/Elements/Tabs:32
+msgid "About me"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:80
+msgid "Access control"
+msgstr "Toegangscontrole"
+
+#: html/Admin/Elements/EditScrip:57
+msgid "Action"
+msgstr "Actie"
+
+#: lib/RT/Scrip_Overlay.pm:147
+#. ($args{'ScripAction'})
+msgid "Action %1 not found"
+msgstr "Actie %1 niet gevonden"
+
+#: bin/rt-crontool:123
+msgid "Action committed."
+msgstr "Actie uitgevoerd."
+
+#: bin/rt-crontool:119
+msgid "Action prepared..."
+msgstr "Actie voorbereid..."
+
+#: html/Search/Bulk.html:92
+msgid "Add AdminCc"
+msgstr "Voeg AdminCc toe"
+
+#: html/Search/Bulk.html:90
+msgid "Add Cc"
+msgstr "Voeg Cc toe"
+
+#: html/Ticket/Create.html:114 html/Ticket/Update.html:100
+msgid "Add More Files"
+msgstr "Voeg Meer Bestanden Toe"
+
+#: NOT FOUND IN SOURCE
+msgid "Add Next State"
+msgstr ""
+
+#: html/Search/Bulk.html:88
+msgid "Add Requestor"
+msgstr "Voeg Verzoeker Toe"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip to this queue"
+msgstr "Voeg een Scrip toe aan deze rij"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip which will apply to all queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a new a global scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a scrip to this queue"
+msgstr ""
+
+#: html/Admin/Global/Scrip.html:55
+msgid "Add a scrip which will apply to all queues"
+msgstr "Voeg een scrip toe welke voor alle rijen zal gelden"
+
+#: html/Search/Bulk.html:118
+msgid "Add comments or replies to selected tickets"
+msgstr "Voeg commentaar of reacties toe aan geselecteerde tickets"
+
+#: html/Admin/Groups/Members.html:42 html/User/Groups/Members.html:39
+msgid "Add members"
+msgstr "Voeg leden toe"
+
+#: html/Admin/Queues/People.html:66 html/Ticket/Elements/AddWatchers:28
+msgid "Add new watchers"
+msgstr "Voeg nieuwe toeschouwers toe"
+
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
+msgstr "VoegVolgendeStaatToe"
+
+#: lib/RT/Queue_Overlay.pm:643
+#. ($args{'Type'})
+msgid "Added principal as a %1 for this queue"
+msgstr "Hoofd toegevoegd als %1 voor deze rij"
+
+#: lib/RT/Ticket_Overlay.pm:1454
+#. ($self->loc($args{'Type'}))
+msgid "Added principal as a %1 for this ticket"
+msgstr "Hoofd toegevoegd als %1 voor dit ticket"
+
+#: html/Admin/Elements/ModifyUser:76 html/Admin/Users/Modify.html:122 html/User/Prefs.html:88
+msgid "Address1"
+msgstr "Adres1"
+
+#: html/Admin/Elements/ModifyUser:78 html/Admin/Users/Modify.html:127 html/User/Prefs.html:90
+msgid "Address2"
+msgstr "Adres2"
+
+#: html/Ticket/Create.html:74
+msgid "Admin Cc"
+msgstr "Beheerder Cc"
+
+#: etc/initialdata:274
+msgid "Admin Comment"
+msgstr ""
+
+#: etc/initialdata:256
+msgid "Admin Correspondence"
+msgstr ""
+
+#: html/Admin/Queues/index.html:25 html/Admin/Queues/index.html:28
+msgid "Admin queues"
+msgstr "Beheerder rijen"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin users"
+msgstr "Beheerder gebruikers"
+
+#: html/Admin/Global/index.html:26 html/Admin/Global/index.html:28
+msgid "Admin/Global configuration"
+msgstr "Beheerder/Globale configuratie"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Groups"
+msgstr "Beheerder/Groepen"
+
+#: html/Admin/Queues/Modify.html:25 html/Admin/Queues/Modify.html:29
+msgid "Admin/Queue/Basics"
+msgstr "Beheerder/Rij/Basis"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr ""
+
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:39 html/Ticket/Update.html:50 lib/RT/ACE_Overlay.pm:89
+msgid "AdminCc"
+msgstr "BeheerderCc"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr "BeheerderCommentaar"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr "BeheerderCorrespondentie"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "AdminCustomFields"
+msgstr "BeheerderSpecifiekeVelden"
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "AdminGroup"
+msgstr "BeheerderGroep"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "AdminGroupMembership"
+msgstr "BeheerderGroepLidmaatschap"
+
+#: lib/RT/System.pm:59
+msgid "AdminOwnPersonalGroups"
+msgstr "BeheerderBezitPersoonlijkeGroepen"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "AdminQueue"
+msgstr "BeheerderRij"
+
+#: lib/RT/System.pm:60
+msgid "AdminUsers"
+msgstr "BeheerderGebruikers"
+
+#: html/Admin/Queues/People.html:48 html/Ticket/Elements/EditPeople:54
+msgid "Administrative Cc"
+msgstr "Administratieve Cc"
+
+#: NOT FOUND IN SOURCE
+msgid "Admins"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search"
+msgstr "Uitgebreid Zoeken"
+
+#: html/Elements/SelectDateRelation:36
+msgid "After"
+msgstr "Nadat"
+
+#: NOT FOUND IN SOURCE
+msgid "Age"
+msgstr "Leeftijd"
+
+#: NOT FOUND IN SOURCE
+msgid "Alias"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Alias for"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:96
+msgid "All Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:53
+msgid "All Queues"
+msgstr "Alle Rijen"
+
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
+msgstr "Stuurt altijd een bericht naar de verzoekers ongeacht de verzender van het bericht"
+
+#: html/Elements/Tabs:58
+msgid "Approval"
+msgstr "Goedkeuring"
+
+#: html/Approvals/Display.html:46 html/Approvals/Elements/Approve:27 html/Approvals/Elements/ShowDependency:42 html/Approvals/index.html:65
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($ticket->id, $msg)
+#. ($ticket->Id, $ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Approval #%1: %2"
+msgstr "Goedkeuring #%1: %2"
+
+#: html/Approvals/index.html:54
+#. ($ticket->Id)
+msgid "Approval #%1: Notes not recorded due to a system error"
+msgstr "Goedkeuring #%1: Notities niet bewaard vanwege een systeem fout"
+
+#: html/Approvals/index.html:52
+#. ($ticket->Id)
+msgid "Approval #%1: Notes recorded"
+msgstr "Goedkeuring #%1: Notities bewaard"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Details"
+msgstr "Goedkeuring Details"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval diagram"
+msgstr "Goedkeuring diagram"
+
+#: html/Approvals/Elements/Approve:45
+msgid "Approve"
+msgstr "Goedkeuring"
+
+#: etc/initialdata:431 etc/upgrade/2.1.71:148
+msgid "Approver's notes: %1"
+msgstr "Notities van de goedkeurer: %1"
+
+#: lib/RT/Date.pm:414
+msgid "Apr."
+msgstr "Ggk."
+
+#: NOT FOUND IN SOURCE
+msgid "April"
+msgstr "april"
+
+#: html/Elements/SelectSortOrder:35
+msgid "Ascending"
+msgstr "Oplopend"
+
+#: html/Search/Bulk.html:127 html/SelfService/Update.html:36 html/Ticket/ModifyAll.html:83 html/Ticket/Update.html:100
+msgid "Attach"
+msgstr "Aanhechten"
+
+#: html/SelfService/Create.html:67 html/Ticket/Create.html:110
+msgid "Attach file"
+msgstr "Hecht bestand aan"
+
+#: html/Ticket/Create.html:98 html/Ticket/Update.html:89
+msgid "Attached file"
+msgstr "Aangehecht bestand"
+
+#: html/SelfService/Attachment/dhandler:36
+msgid "Attachment '%1' could not be loaded"
+msgstr "Aanhechting '%1' kon niet geladen worden"
+
+#: lib/RT/Transaction_Overlay.pm:443
+msgid "Attachment created"
+msgstr "Aanhechting gecreëerd"
+
+#: lib/RT/Tickets_Overlay.pm:1189
+msgid "Attachment filename"
+msgstr "Aanhechting bestandsnaam"
+
+#: html/Ticket/Elements/ShowAttachments:26
+msgid "Attachments"
+msgstr "Aanhechtingen"
+
+#: lib/RT/Date.pm:418
+msgid "Aug."
+msgstr "aug."
+
+#: NOT FOUND IN SOURCE
+msgid "August"
+msgstr "augustus"
+
+#: html/Admin/Elements/ModifyUser:66
+msgid "AuthSystem"
+msgstr "AuthenticatieSysteem"
+
+#: etc/initialdata:206
+msgid "Autoreply"
+msgstr "Automatisch-antwoord"
+
+#: etc/initialdata:72
+msgid "Autoreply To Requestors"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr "Automatisch-antwoordAanVerzoekers"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad PGP Signature: %1\\n"
+msgstr "Ongeldige PGP Signatuur: %1\\n"
+
+#: html/SelfService/Attachment/dhandler:40
+msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
+msgstr "Ongeldig aanhechtings id. Kon aanhechting '%1' niet vinden\\n"
+
+#: bin/rt-commit-handler:827
+#. ($val)
+msgid "Bad data in %1"
+msgstr "Ongeldige data in %1"
+
+#: html/SelfService/Attachment/dhandler:43
+#. ($trans, $AttachmentObj->TransactionId())
+msgid "Bad transaction number for attachment. %1 should be %2\\n"
+msgstr "Ongeldig transactienummer voor aanhechting. %1 zou %2 moeten zijn\\n"
+
+#: html/Admin/Elements/GroupTabs:39 html/Admin/Elements/QueueTabs:39 html/Admin/Elements/UserTabs:38 html/Ticket/Elements/Tabs:90 html/User/Elements/GroupTabs:38
+msgid "Basics"
+msgstr "Basis"
+
+#: html/Ticket/Update.html:83
+msgid "Bcc"
+msgstr "Bcc"
+
+#: html/Admin/Elements/EditScrip:88 html/Admin/Global/GroupRights.html:85 html/Admin/Global/Template.html:46 html/Admin/Global/UserRights.html:54 html/Admin/Groups/GroupRights.html:73 html/Admin/Groups/Members.html:81 html/Admin/Groups/Modify.html:56 html/Admin/Groups/UserRights.html:55 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:45 html/Admin/Queues/UserRights.html:54 html/User/Groups/Modify.html:56
+msgid "Be sure to save your changes"
+msgstr "Zorg ervoor dat u uw veranderingen bewaard"
+
+#: html/Elements/SelectDateRelation:34 lib/RT/CurrentUser.pm:322
+msgid "Before"
+msgstr "Voorheen"
+
+#: NOT FOUND IN SOURCE
+msgid "Begin Approval"
+msgstr "Begin Goedkeuring"
+
+#: etc/initialdata:202
+msgid "Blank"
+msgstr "Blanco"
+
+#: html/Search/Listing.html:79
+msgid "Bookmarkable URL for this search"
+msgstr "XXX URL voor deze zoekopdracht"
+
+#: html/Ticket/Elements/ShowHistory:39 html/Ticket/Elements/ShowHistory:45
+msgid "Brief headers"
+msgstr "Korte koppen"
+
+#: html/Search/Bulk.html:25 html/Search/Bulk.html:26
+msgid "Bulk ticket update"
+msgstr "Bulk ticketherziening"
+
+#: lib/RT/User_Overlay.pm:1331
+msgid "Can not modify system users"
+msgstr "Kan systeemgebruikers niet wijzigen"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "Can this principal see this queue"
+msgstr "Kan dit hoofd deze rij zien"
+
+#: lib/RT/CustomFieLd_Overlay.pm:144
+msgid "Can't add a custom field value without a name"
+msgstr "Kan geen specifiek veld toevoegen zonder een naam"
+
+#: lib/RT/Link_Overlay.pm:132
+msgid "Can't link a ticket to itself"
+msgstr "Kan een ticket niet koppelen aan zichzelf"
+
+#: lib/RT/Ticket_Overlay.pm:2787
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr "Kan niet samenvoegen met een reeds samengevoegd ticket. U zou deze boodschap nooit mogen krijgen"
+
+#: lib/RT/Ticket_Overlay.pm:2605 lib/RT/Ticket_Overlay.pm:2674
+msgid "Can't specifiy both base and target"
+msgstr "Kan niet zowel basis als doel specificeren"
+
+#: html/autohandler:112
+#. ($msg)
+msgid "Cannot create user: %1"
+msgstr "Kan gebruiker %1 niet aanmaken"
+
+#: etc/initialdata:50 html/Admin/Queues/People.html:44 html/SelfService/Create.html:51 html/SelfService/Display.html:50 html/Ticket/Create.html:64 html/Ticket/Elements/EditPeople:51 html/Ticket/Elements/ShowPeople:35 html/Ticket/Update.html:45 html/Ticket/Update.html:78 lib/RT/ACE_Overlay.pm:88
+msgid "Cc"
+msgstr "Cc"
+
+#: html/SelfService/Prefs.html:31
+msgid "Change password"
+msgstr "Wijzig wachtwoord"
+
+#: html/Ticket/Create.html:101 html/Ticket/Update.html:92
+msgid "Check box to delete"
+msgstr "Vink hokje af om te verwijderen"
+
+#: html/Admin/Elements/SelectRights:31
+msgid "Check box to revoke right"
+msgstr "Vink hokje af om recht te verwijderen"
+
+#: html/Ticket/Create.html:183 html/Ticket/Elements/EditLinks:131 html/Ticket/Elements/EditLinks:69 html/Ticket/Elements/ShowLinks:51
+msgid "Children"
+msgstr "Kinderen"
+
+#: html/Admin/Elements/ModifyUser:80 html/Admin/Users/Modify.html:132 html/User/Prefs.html:92
+msgid "City"
+msgstr "Stad"
+
+#: html/Ticket/Elements/ShowDates:47
+msgid "Closed"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:60
+msgid "Closed requests"
+msgstr "Gesloten verzoeken"
+
+#: NOT FOUND IN SOURCE
+msgid "Code"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Command not understood!\\n"
+msgstr "Commando niet begrepen!\\n"
+
+#: html/Ticket/Elements/ShowTransaction:179 html/Ticket/Elements/Tabs:153
+msgid "Comment"
+msgstr "Commentaar"
+
+#: html/Admin/Elements/ModifyQueue:45 html/Admin/Queues/Modify.html:58
+msgid "Comment Address"
+msgstr "Commentaar Adres"
+
+#: NOT FOUND IN SOURCE
+msgid "Comment not recorded"
+msgstr "Commentaar niet bewaard"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "Comment on tickets"
+msgstr "Commentaar op tickets"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "CommentOnTicket"
+msgstr "CommentaarOpTicket"
+
+#: html/Admin/Elements/ModifyUser:35
+msgid "Comments"
+msgstr "Commentaar"
+
+#: html/Ticket/ModifyAll.html:70 html/Ticket/Update.html:70
+msgid "Comments (Not sent to requestors)"
+msgstr "Commentaar (Wordt niet verstuurd aan verzoekers)"
+
+#: html/Search/Bulk.html:122
+msgid "Comments (not sent to requestors)"
+msgstr "Commentaar (Wordt niet verstuurd aan verzoekers)"
+
+#: html/Elements/ViewUser:27
+#. ($name)
+msgid "Comments about %1"
+msgstr "Commentaar over %1"
+
+#: html/Admin/Users/Modify.html:185 html/Ticket/Elements/ShowRequestor:44
+msgid "Comments about this user"
+msgstr "Commentaar over deze gebruiker"
+
+#: lib/RT/Transaction_Overlay.pm:545
+msgid "Comments added"
+msgstr "Commentaar toegevoegd"
+
+#: lib/RT/Action/Generic.pm:140
+msgid "Commit Stubbed"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Compile Restrictions"
+msgstr "Compilatie Restricties"
+
+#: html/Admin/Elements/EditScrip:41
+msgid "Condition"
+msgstr "Voorwaarde"
+
+#: bin/rt-crontool:109
+msgid "Condition matches..."
+msgstr "Voorwaarde komt overeen..."
+
+#: lib/RT/Scrip_Overlay.pm:160
+msgid "Condition not found"
+msgstr "Voorwaarde niet gevonden"
+
+#: html/Elements/Tabs:52
+msgid "Configuration"
+msgstr "Configuratie"
+
+#: html/SelfService/Prefs.html:33
+msgid "Confirm"
+msgstr "Bevestig"
+
+#: html/Admin/Elements/ModifyUser:60
+msgid "ContactInfoSystem"
+msgstr "ContactInfoSysteem"
+
+#: NOT FOUND IN SOURCE
+msgid "Contacted date '%1' could not be parsed"
+msgstr "Contact datum '%1' kon niet ontleed worden"
+
+#: html/Admin/Elements/ModifyTemplate:44 html/Ticket/ModifyAll.html:87
+msgid "Content"
+msgstr "Inhoud"
+
+#: NOT FOUND IN SOURCE
+msgid "Coould not create group"
+msgstr ""
+
+#: etc/initialdata:266
+msgid "Correspondence"
+msgstr "Correspondentie"
+
+#: html/Admin/Elements/ModifyQueue:39 html/Admin/Queues/Modify.html:51
+msgid "Correspondence Address"
+msgstr "Correspondentieadres"
+
+#: lib/RT/Transaction_Overlay.pm:541
+msgid "Correspondence added"
+msgstr "Correspondentie toegevoegd"
+
+#: NOT FOUND IN SOURCE
+msgid "Correspondence not recorded"
+msgstr "Correspondentie niet bewaard"
+
+#: lib/RT/Ticket_Overlay.pm:3458
+msgid "Could not add new custom field value for ticket. "
+msgstr "Kon nieuw specifiek veld niet toevoegen voor dit ticket. "
+
+#: NOT FOUND IN SOURCE
+msgid "Could not add new custom field value for ticket. %1 "
+msgstr "Kon nieuw specifiek veld niet toevoegen voor dit ticket. %1"
+
+#: lib/RT/Ticket_Overlay.pm:2963 lib/RT/Ticket_Overlay.pm:2971 lib/RT/Ticket_Overlay.pm:2987
+msgid "Could not change owner. "
+msgstr "Kon eigenaar niet wijzigen. "
+
+#: html/Admin/Elements/EditCustomField:68 html/Admin/Elements/EditCustomFields:166
+#. ($msg)
+msgid "Could not create CustomField"
+msgstr "Kon SpecifiekVeld niet creëren"
+
+#: html/User/Groups/Modify.html:77 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
+msgid "Could not create group"
+msgstr "Kon groep niet creëren"
+
+#: html/Admin/Global/Template.html:75 html/Admin/Queues/Template.html:72
+#. ($msg)
+msgid "Could not create template: %1"
+msgstr "Kon sjabloon niet creëren: %1"
+
+#: lib/RT/Ticket_Overlay.pm:1073 lib/RT/Ticket_Overlay.pm:333
+msgid "Could not create ticket. Queue not set"
+msgstr "Kon ticket niet creëren. Rij niet ingesteld"
+
+#: lib/RT/User_Overlay.pm:208 lib/RT/User_Overlay.pm:220 lib/RT/User_Overlay.pm:238 lib/RT/User_Overlay.pm:414
+msgid "Could not create user"
+msgstr "Kon gebruiker niet creëren"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not create watcher for requestor"
+msgstr "Kon toeschouwer niet creëren voor verzoeker"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find a ticket with id %1"
+msgstr "Kon geen ticket vinden met id %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find group %1."
+msgstr "Kon groep %1 niet vinden. "
+
+#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1422
+msgid "Could not find or create that user"
+msgstr "Kon deze gebruiker niet vinden of creëren"
+
+#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1501
+msgid "Could not find that principal"
+msgstr "Kon dat hoofd niet vinden"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find user %1."
+msgstr "Kon gebruiker %1 niet vinden."
+
+#: html/Admin/Groups/Members.html:88 html/User/Groups/Members.html:90 html/User/Groups/Modify.html:82
+msgid "Could not load group"
+msgstr "Kon groep niet laden"
+
+#: lib/RT/Queue_Overlay.pm:641
+#. ($args{'Type'})
+msgid "Could not make that principal a %1 for this queue"
+msgstr "Kon dat hoofd geen %1 maken voor deze rij"
+
+#: lib/RT/Ticket_Overlay.pm:1443
+#. ($self->loc($args{'Type'}))
+msgid "Could not make that principal a %1 for this ticket"
+msgstr "Kon dat hoofd geen %1 maken voor dit ticket"
+
+#: lib/RT/Queue_Overlay.pm:740
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this queue"
+msgstr "Kon dat hoofd niet verwijderen als %1 voor deze rij"
+
+#: lib/RT/Ticket_Overlay.pm:1559
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this ticket"
+msgstr "Kon dat hoofd niet verwijderen als %1 voor dit ticket"
+
+#: lib/RT/Group_Overlay.pm:985
+msgid "Couldn't add member to group"
+msgstr "Kon lid niet toevoegen aan groep"
+
+#: lib/RT/Ticket_Overlay.pm:3468 lib/RT/Ticket_Overlay.pm:3524
+#. ($Msg)
+msgid "Couldn't create a transaction: %1"
+msgstr "Kon geen transactie creëren: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't figure out what to do from gpg's reply\\n"
+msgstr "Kon niet bepalen welke actie te ondernemen aan de hand van gpg's antwoord\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find group\\n"
+msgstr "Kon groep niet vinden\\n"
+
+#: lib/RT/Interface/Web.pm:866
+msgid "Couldn't find row"
+msgstr "Kon rij niet vinden"
+
+#: lib/RT/Group_Overlay.pm:959
+msgid "Couldn't find that principal"
+msgstr "Kon dat hoofd niet vinden"
+
+#: lib/RT/CustomField_Overlay.pm:175
+msgid "Couldn't find that value"
+msgstr "Kon die waarde niet vinden"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find that watcher"
+msgstr "Kon die toeschouwer niet vinden"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find user\\n"
+msgstr "Kon gebruiker niet vinden\\n"
+
+#: lib/RT/CurrentUser.pm:112
+#. ($self->Id)
+msgid "Couldn't load %1 from the users database.\\n"
+msgstr "Kon %1 niet laden uit de gebruikersdatabase.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load KeywordSelects."
+msgstr "Kon KeywordSelects niet laden."
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load RT config file '%1' %2"
+msgstr "Kon RT configuratie bestand niet laden '%1' %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load Scrips."
+msgstr "Kon Scrips niet laden"
+
+#: html/Admin/Groups/GroupRights.html:88 html/Admin/Groups/UserRights.html:75
+#. ($id)
+msgid "Couldn't load group %1"
+msgstr "Kon groep %1 niet laden"
+
+#: lib/RT/Link_Overlay.pm:175 lib/RT/Link_Overlay.pm:184 lib/RT/Link_Overlay.pm:211
+msgid "Couldn't load link"
+msgstr "Kon link niet laden"
+
+#: html/Admin/Elements/EditCustomFields:147 html/Admin/Queues/People.html:121
+#. ($id)
+msgid "Couldn't load queue"
+msgstr "Kon rij niet laden"
+
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:72
+#. ($id)
+msgid "Couldn't load queue %1"
+msgstr "Kon rij %1 niet laden "
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load scrip"
+msgstr "Kon scrip niet laden"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load template"
+msgstr "Kon sjabloon niet laden"
+
+#: html/Admin/Users/Prefs.html:79
+#. ($id)
+msgid "Couldn't load that user (%1)"
+msgstr "Kon die gebruiker (%1) niet laden"
+
+#: html/SelfService/Display.html:166
+#. ($id)
+msgid "Couldn't load ticket '%1'"
+msgstr "Kon ticket '%1' niet laden"
+
+#: html/Admin/Elements/ModifyUser:86 html/Admin/Users/Modify.html:149 html/User/Prefs.html:98
+msgid "Country"
+msgstr "Land"
+
+#: html/Admin/Elements/CreateUserCalled:26 html/Ticket/Create.html:135 html/Ticket/Create.html:195
+msgid "Create"
+msgstr "Creëer"
+
+#: etc/initialdata:128
+msgid "Create Tickets"
+msgstr "Creëer Tickets"
+
+#: html/Admin/Elements/EditCustomField:58
+msgid "Create a CustomField"
+msgstr "Creëer een SpecifiekVeld"
+
+#: html/Admin/Queues/CustomField.html:48
+#. ($QueueObj->Name())
+msgid "Create a CustomField for queue %1"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:48
+msgid "Create a CustomField which applies to all queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new Custom Field"
+msgstr "Creëer een niuew Specifiek Veld"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global Scrip"
+msgstr "Creëer een nieuw globaal Scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global scrip"
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:67 html/Admin/Groups/Modify.html:93
+msgid "Create a new group"
+msgstr "Creëer een nieuwe groep"
+
+#: html/User/Groups/Modify.html:67 html/User/Groups/Modify.html:92
+msgid "Create a new personal group"
+msgstr "Creëer een nieuwe persoonlijke groep"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new queue"
+msgstr "Creëer een nieuwe rij"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new scrip"
+msgstr "Creëer een nieuw scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new template"
+msgstr "Creëer een nieuw template"
+
+#: html/SelfService/Create.html:30 html/Ticket/Create.html:25 html/Ticket/Create.html:28 html/Ticket/Create.html:36
+msgid "Create a new ticket"
+msgstr "Creëer een nieuw ticket"
+
+#: html/Admin/Users/Modify.html:214 html/Admin/Users/Modify.html:241
+msgid "Create a new user"
+msgstr "Creëer een nieuwe gebruiker"
+
+#: html/Admin/Queues/Modify.html:103
+msgid "Create a queue"
+msgstr "Creëer een rij"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a queue called"
+msgstr "Creëer een rij genaamd"
+
+#: html/SelfService/Create.html:25 html/SelfService/Create.html:27
+msgid "Create a request"
+msgstr "Creëer een verzoek"
+
+#: html/Admin/Queues/Scrip.html:59
+#. ($QueueObj->Name)
+msgid "Create a scrip for queue %1"
+msgstr "Creëer een scrip voor rij %1"
+
+#: html/Admin/Global/Template.html:69 html/Admin/Queues/Template.html:65
+msgid "Create a template"
+msgstr "Creëer een sjabloon"
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1 / %2 / %3 "
+msgstr "Creatie mislukt: %1 / %2 / %3 "
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1/%2/%3"
+msgstr ""
+
+#: etc/initialdata:130
+msgid "Create new tickets based on this scrip's template"
+msgstr "Creëer nieuwe tickets gebaseerd op het sjabloon van dit scrip"
+
+#: html/SelfService/Create.html:81
+msgid "Create ticket"
+msgstr "Creëer ticket"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "Create tickets in this queue"
+msgstr "Creëer tickets in deze rij"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "Create, delete and modify custom fields"
+msgstr "Creëer, verwijder en wijzig specifieke velden"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "Create, delete and modify queues"
+msgstr "Creëer, verwijder en wijzig rijen"
+
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
+msgstr ""
+
+#: lib/RT/System.pm:59
+msgid "Create, delete and modify the members of personal groups"
+msgstr "Creëer, verwijder en wijzig de leden van persoonlijke groepen"
+
+#: lib/RT/System.pm:60
+msgid "Create, delete and modify users"
+msgstr "Creëer, verwijder en wijzig gebruikers"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "CreateTicket"
+msgstr "CreëerTicket"
+
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1167
+msgid "Created"
+msgstr "Gecreëerd"
+
+#: html/Admin/Elements/EditCustomField:71
+#. ($CustomFieldObj->Name())
+msgid "Created CustomField %1"
+msgstr "SpecifiekVeld %1 gecreëerd"
+
+#: NOT FOUND IN SOURCE
+msgid "Created template %1"
+msgstr "Sjabloon %1 Gecreëerd"
+
+#: html/Ticket/Elements/EditLinks:28
+msgid "Current Relationships"
+msgstr "Huidige Relaties"
+
+#: html/Admin/Elements/EditScrips:30
+msgid "Current Scrips"
+msgstr "Huidige Scrips"
+
+#: html/Admin/Groups/Members.html:39 html/User/Groups/Members.html:42
+msgid "Current members"
+msgstr "Huidige leden"
+
+#: html/Admin/Elements/SelectRights:29
+msgid "Current rights"
+msgstr "Huidige rechten"
+
+#: html/Search/Listing.html:71
+msgid "Current search criteria"
+msgstr ""
+
+#: html/Admin/Queues/People.html:41 html/Ticket/Elements/EditPeople:45
+msgid "Current watchers"
+msgstr "Huidige toeschouwers"
+
+#: html/Admin/Global/CustomField.html:55
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:53 html/Admin/Elements/SystemTabs:40 html/Admin/Global/index.html:50 html/Ticket/Elements/ShowSummary:35
+msgid "Custom Fields"
+msgstr "Specifieke Velden"
+
+#: html/Admin/Elements/EditScrip:73
+msgid "Custom action cleanup code"
+msgstr "Specifieke actie opruim code"
+
+#: html/Admin/Elements/EditScrip:65
+msgid "Custom action preparation code"
+msgstr "Specifieke actie voorbereidings code"
+
+#: html/Admin/Elements/EditScrip:49
+msgid "Custom condition"
+msgstr "Specifieke voorwaarde"
+
+#: lib/RT/Tickets_Overlay.pm:1618
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
+msgid "Custom field %1 %2 %3"
+msgstr "Specifiek veld %1 %2 %3"
+
+#: lib/RT/Tickets_Overlay.pm:1613
+#. ($CF->Name)
+msgid "Custom field %1 has a value."
+msgstr "Specifiek veld %1 heeft een waarde."
+
+#: lib/RT/Tickets_Overlay.pm:1610
+#. ($CF->Name)
+msgid "Custom field %1 has no value."
+msgstr "Specifiek veld %1 heeft geen waarde."
+
+#: lib/RT/Ticket_Overlay.pm:3360
+#. ($args{'Field'})
+msgid "Custom field %1 not found"
+msgstr "Specifiek veld %1 niet gevonden"
+
+#: html/Admin/Elements/EditCustomFields:197
+msgid "Custom field deleted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3510
+msgid "Custom field not found"
+msgstr "Specifiek veld niet gevonden"
+
+#: lib/RT/CustomField_Overlay.pm:283
+#. ($args{'Content'}, $self->Name)
+msgid "Custom field value %1 could not be found for custom field %2"
+msgstr "Specifiek veld waarde %1 kon niet gevonden worden voor specifiek veld %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Custom field value changed from %1 to %2"
+msgstr "Specifiek veld waarde veranderd van %1 naar %2"
+
+#: lib/RT/CustomField_Overlay.pm:185
+msgid "Custom field value could not be deleted"
+msgstr "Specifiek veld waarde kon niet verwijderd worden"
+
+#: lib/RT/CustomField_Overlay.pm:289
+msgid "Custom field value could not be found"
+msgstr "Specifiek veld waarde kon niet gevonden worden"
+
+#: lib/RT/CustomField_Overlay.pm:183 lib/RT/CustomField_Overlay.pm:291
+msgid "Custom field value deleted"
+msgstr "Specifiek veld waarde verwijderd"
+
+#: lib/RT/Transaction_Overlay.pm:550
+msgid "CustomField"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Data error"
+msgstr "Data fout"
+
+#: html/Ticket/Create.html:161 html/Ticket/Elements/ShowSummary:53 html/Ticket/Elements/Tabs:93 html/Ticket/ModifyAll.html:44
+msgid "Dates"
+msgstr "Data"
+
+#: lib/RT/Date.pm:422
+msgid "Dec."
+msgstr "dec."
+
+#: NOT FOUND IN SOURCE
+msgid "December"
+msgstr "december"
+
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr "Standaard Auto-antwoord Sjabloon"
+
+#: etc/initialdata:207
+msgid "Default Autoresponse template"
+msgstr ""
+
+#: etc/initialdata:275
+msgid "Default admin comment template"
+msgstr "Standaard admin commentaar sjabloon"
+
+#: etc/initialdata:257
+msgid "Default admin correspondence template"
+msgstr "Standaard admin correspondentie sjabloon"
+
+#: etc/initialdata:267
+msgid "Default correspondence template"
+msgstr "Standaard correspondentie sjabloon"
+
+#: etc/initialdata:238
+msgid "Default transaction template"
+msgstr "Standaard transactie sjabloon"
+
+#: lib/RT/Transaction_Overlay.pm:645
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr "Standaard: %1/%2 verandered van %3 naar %4"
+
+#: html/User/Delegation.html:25 html/User/Delegation.html:28
+msgid "Delegate rights"
+msgstr "Delegeer rechten"
+
+#: lib/RT/System.pm:63
+msgid "Delegate specific rights which have been granted to you."
+msgstr "Delegeer specifieke rechten die aan u verleend zijn."
+
+#: lib/RT/System.pm:63
+msgid "DelegateRights"
+msgstr "DelegeerRechten"
+
+#: html/User/Elements/Tabs:38
+msgid "Delegation"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Delete"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "Delete tickets"
+msgstr "Verwijder tickets"
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "DeleteTicket"
+msgstr "VerwijderTicket"
+
+#: lib/RT/Transaction_Overlay.pm:187
+msgid "Deleting this object could break referential integrity"
+msgstr "Het verwijderen van dit object zou de referentiële integriteit kunnen ondermijnen"
+
+#: lib/RT/Queue_Overlay.pm:292
+msgid "Deleting this object would break referential integrity"
+msgstr "Het verwijderen van dit object zou de referentiële integriteit ondermijnen"
+
+#: lib/RT/User_Overlay.pm:430
+msgid "Deleting this object would violate referential integrity"
+msgstr "Het verwijderen van dit object zou de referentiële integriteit ondermijnen"
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity."
+msgstr "Het verwijderen van dit object zou de referentiële integriteit ondermijnen"
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity. That's bad."
+msgstr ""
+
+#: html/Approvals/Elements/Approve:46
+msgid "Deny"
+msgstr "Wijs af"
+
+#: html/Ticket/Create.html:181 html/Ticket/Elements/EditLinks:123 html/Ticket/Elements/EditLinks:47 html/Ticket/Elements/ShowDependencies:32 html/Ticket/Elements/ShowLinks:35
+msgid "Depended on by"
+msgstr "Afhankelijkheid van"
+
+#: NOT FOUND IN SOURCE
+msgid "Dependencies: \\n"
+msgstr "Afhankelijkheden: \\n"
+
+#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:180 html/Ticket/Elements/EditLinks:119 html/Ticket/Elements/EditLinks:36 html/Ticket/Elements/ShowDependencies:25 html/Ticket/Elements/ShowLinks:27
+msgid "Depends on"
+msgstr "Is afhankelijk van"
+
+#: NOT FOUND IN SOURCE
+msgid "DependsOn"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:35
+msgid "Descending"
+msgstr "Aflopend"
+
+#: html/SelfService/Create.html:75 html/Ticket/Create.html:119
+msgid "Describe the issue below"
+msgstr "Omschrijf onderstaande kwestie"
+
+#: html/Admin/Elements/AddCustomFieldValue:27 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyQueue:36 html/Admin/Elements/ModifyTemplate:36 html/Admin/Groups/Modify.html:49 html/Admin/Queues/Modify.html:48 html/Elements/SelectGroups:27 html/User/Groups/Modify.html:49
+msgid "Description"
+msgstr "Omschrijving"
+
+#: html/SelfService/Elements/MyRequests:44
+msgid "Details"
+msgstr "Details"
+
+#: html/Ticket/Elements/Tabs:85
+msgid "Display"
+msgstr "Toon"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "Display Access Control List"
+msgstr "Toon Toegangs Controle Lijst"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "Display Scrip templates for this queue"
+msgstr "Toon Scrip sjablonen voor deze rij"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "Display Scrips for this queue"
+msgstr "Toon Scrips voor deze rij"
+
+#: html/Ticket/Elements/ShowHistory:35
+msgid "Display mode"
+msgstr "Toon modus"
+
+#: html/SelfService/Display.html:25 html/SelfService/Display.html:29
+#. ($Ticket->id)
+msgid "Display ticket #%1"
+msgstr "Toon ticket #%1"
+
+#: lib/RT/System.pm:54
+msgid "Do anything and everything"
+msgstr "Doe iets en alles"
+
+#: html/Elements/Refresh:30
+msgid "Don't refresh this page."
+msgstr "Ververs deze pagina niet"
+
+#: html/Search/Elements/PickRestriction:114
+msgid "Don't show search results"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "Download"
+msgstr "Download"
+
+#: html/Elements/SelectDateType:32 html/Ticket/Create.html:167 html/Ticket/Elements/EditDates:45 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1171
+msgid "Due"
+msgstr "Verwacht"
+
+#: NOT FOUND IN SOURCE
+msgid "Due date '%1' could not be parsed"
+msgstr "Verwachte datum '%1' kon niet ontleed worden"
+
+#: bin/rt-commit-handler:754
+#. ($1, $msg)
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
+msgstr "FOUT: Kon ticket '%1' niet laden: %2.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit"
+msgstr "Wijzig"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit Conditions"
+msgstr ""
+
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr "Wijzig Specifieke Velden voor %1"
+
+#: html/Ticket/ModifyLinks.html:36
+msgid "Edit Relationships"
+msgstr "Wijzig Relaties"
+
+#: html/Admin/Queues/Templates.html:41
+#. ($QueueObj->Name)
+msgid "Edit Templates for queue %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit keywords"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr ""
+
+#: html/Admin/Global/index.html:46
+msgid "Edit system templates"
+msgstr "Wijzig systeem sjablonen"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit templates for %1"
+msgstr "Wijzig sjablonen voor %1"
+
+#: html/Admin/Elements/ModifyQueue:25 html/Admin/Queues/Modify.html:117
+#. ($QueueObj->Name)
+#. ($QueueObj->Id)
+msgid "Editing Configuration for queue %1"
+msgstr "Bezig met wijzigen van de configuratie voor rij %1"
+
+#: html/Admin/Elements/ModifyUser:25
+#. ($UserObj->Name)
+msgid "Editing Configuration for user %1"
+msgstr "Bezit met het wijzigen van de configuratie voor gebruiker %1"
+
+#: html/Admin/Elements/EditCustomField:74
+#. ($CustomFieldObj->Name())
+msgid "Editing CustomField %1"
+msgstr "Bezit met het wijzigen van SpecifiekVeld %1"
+
+#: html/Admin/Groups/Members.html:32
+#. ($Group->Name)
+msgid "Editing membership for group %1"
+msgstr "Bezit met het wijzigen van lidmaatschap voor groep %1"
+
+#: html/User/Groups/Members.html:129
+#. ($Group->Name)
+msgid "Editing membership for personal group %1"
+msgstr "Bezit met het wijzigen van lidmaatschap voor persoonlijke groep %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Editing template %1"
+msgstr "Bezit met het wijzigen van sjabloon %1"
+
+#: lib/RT/Ticket_Overlay.pm:2615 lib/RT/Ticket_Overlay.pm:2683
+msgid "Either base or target must be specified"
+msgstr "Of basis of doel moeten gespecificeerd zijn"
+
+#: html/Admin/Users/Modify.html:53 html/Admin/Users/Prefs.html:46 html/Elements/SelectUsers:27 html/Ticket/Elements/AddWatchers:56 html/User/Prefs.html:42
+msgid "Email"
+msgstr "E-mail"
+
+#: lib/RT/User_Overlay.pm:188
+msgid "Email address in use"
+msgstr "E-mailadres in gebruik"
+
+#: html/Admin/Elements/ModifyUser:42
+msgid "EmailAddress"
+msgstr "E-mailAdres"
+
+#: html/Admin/Elements/ModifyUser:54
+msgid "EmailEncoding"
+msgstr "E-mailCodering"
+
+#: html/Admin/Elements/EditCustomField:36
+msgid "Enabled (Unchecking this box disables this custom field)"
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:53 html/User/Groups/Modify.html:53
+msgid "Enabled (Unchecking this box disables this group)"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:84
+msgid "Enabled (Unchecking this box disables this queue)"
+msgstr "Actief (Het uitvinken van dit hokje zal deze rij deactiveren)"
+
+#: html/Admin/Elements/EditCustomFields:99
+msgid "Enabled Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:56
+msgid "Enabled Queues"
+msgstr "Actieve Rijen"
+
+#: html/Admin/Elements/EditCustomField:90 html/Admin/Groups/Modify.html:117 html/Admin/Queues/Modify.html:138 html/Admin/Users/Modify.html:283 html/User/Groups/Modify.html:117
+#. (loc_fuzzy($msg))
+msgid "Enabled status %1"
+msgstr "Actieve status %1"
+
+#: lib/RT/CustomField_Overlay.pm:361
+msgid "Enter multiple values"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:358
+msgid "Enter one value"
+msgstr ""
+
+#: html/Ticket/Elements/EditLinks:112
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "Vul tickets of URIs in om deze tickets aan te koppelen. Scheidt meerdere elementen met spaties."
+
+#: html/Elements/Login:29 html/SelfService/Error.html:25 html/SelfService/Error.html:26
+msgid "Error"
+msgstr "Fout"
+
+#: NOT FOUND IN SOURCE
+msgid "Error adding watcher"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:555
+msgid "Error in parameters to Queue->AddWatcher"
+msgstr "Fout in paramaters naar Queue->AddWatcher"
+
+#: lib/RT/Queue_Overlay.pm:713
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr "Fout in paramaters naar Queue->DelWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1356
+msgid "Error in parameters to Ticket->AddWatcher"
+msgstr "Fout in paramaters naar Ticket->AddWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1532
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr "Fout in paramaters naar Ticket->DelWatcher"
+
+#: etc/initialdata:20
+msgid "Everyone"
+msgstr "Iedereen"
+
+#: bin/rt-crontool:194
+msgid "Example:"
+msgstr "Voorbeeld:"
+
+#: html/Admin/Elements/ModifyUser:64
+msgid "ExternalAuthId"
+msgstr "ExternAuteurId"
+
+#: html/Admin/Elements/ModifyUser:58
+msgid "ExternalContactInfoId"
+msgstr "ExternContactInfoId"
+
+#: html/Admin/Users/Modify.html:73
+msgid "Extra info"
+msgstr "Extra informatie"
+
+#: lib/RT/User_Overlay.pm:302
+msgid "Failed to find 'Privileged' users pseudogroup."
+msgstr "Kon de gebruikers pseudogroep 'Privileged' niet vinden."
+
+#: lib/RT/User_Overlay.pm:309
+msgid "Failed to find 'Unprivileged' users pseudogroup"
+msgstr "Kon de gebruikers pseudogroep 'Unprivileged' niet vinden."
+
+#: bin/rt-crontool:138
+#. ($modname, $@)
+msgid "Failed to load module %1. (%2)"
+msgstr "Kon module %1 niet laden. (%2)"
+
+#: lib/RT/Date.pm:412
+msgid "Feb."
+msgstr "feb."
+
+#: NOT FOUND IN SOURCE
+msgid "February"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Fin"
+msgstr ""
+
+#: html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:59 lib/RT/Tickets_Overlay.pm:1091
+msgid "Final Priority"
+msgstr "Uiteindelijke Prioriteit"
+
+#: lib/RT/Ticket_Overlay.pm:1162
+msgid "FinalPriority"
+msgstr "UiteindelijkePrioriteit"
+
+#: html/Admin/Queues/People.html:61 html/Ticket/Elements/EditPeople:34
+msgid "Find group whose"
+msgstr ""
+
+#: html/Elements/Quicksearch:25
+msgid "Find new/open tickets"
+msgstr "Zoek nieuwe/open tickets"
+
+#: html/Admin/Queues/People.html:57 html/Admin/Users/index.html:46 html/Ticket/Elements/EditPeople:30
+msgid "Find people whose"
+msgstr "Zoek mensen wier"
+
+#: html/Search/Listing.html:108
+msgid "Find tickets"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Finish Approval"
+msgstr "Beëindig Goedkeuring"
+
+#: html/Ticket/Elements/Tabs:58
+msgid "First"
+msgstr "Eerste"
+
+#: html/Search/Listing.html:41
+msgid "First page"
+msgstr "Eerste pagina"
+
+#: docs/design_docs/string-extraction-guide.txt:33
+msgid "Foo Bar Baz"
+msgstr "Aap Noot Mies"
+
+#: docs/design_docs/string-extraction-guide.txt:24
+msgid "Foo!"
+msgstr "Aap!"
+
+#: html/Search/Bulk.html:87
+msgid "Force change"
+msgstr ""
+
+#: html/Search/Listing.html:106
+#. ($ticketcount)
+msgid "Found %quant(%1,ticket)"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:868
+msgid "Found Object"
+msgstr "Gevonden Object"
+
+#: html/Admin/Elements/ModifyUser:44
+msgid "FreeformContactInfo"
+msgstr "VrijevormContactInfo"
+
+#: lib/RT/CustomField_Overlay.pm:38
+msgid "FreeformMultiple"
+msgstr "VrijevormMeerdere"
+
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformSingle"
+msgstr ""
+
+#: lib/RT/Date.pm:392
+msgid "Fri."
+msgstr "Vr."
+
+#: html/Ticket/Elements/ShowHistory:41 html/Ticket/Elements/ShowHistory:51
+msgid "Full headers"
+msgstr "Volledige Kop"
+
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr "Bezig met het ophalen van de huidige gebruiker middels een pgp handtekening"
+
+#: lib/RT/Transaction_Overlay.pm:595
+#. ($New->Name)
+msgid "Given to %1"
+msgstr "Aan %1 gegeven"
+
+#: html/Admin/Elements/Tabs:41 html/Admin/index.html:38
+msgid "Global"
+msgstr "Globaal"
+
+#: NOT FOUND IN SOURCE
+msgid "Global Keyword Selections"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
+msgstr ""
+
+#: html/Admin/Elements/SelectTemplate:38
+#. (loc($Template->Name))
+msgid "Global template: %1"
+msgstr "Globaal sjabloon: %1"
+
+#: html/Admin/Elements/EditCustomFields:75 html/Admin/Queues/People.html:59 html/Admin/Queues/People.html:63 html/Admin/Queues/index.html:44 html/Admin/Users/index.html:49 html/Ticket/Elements/EditPeople:32 html/Ticket/Elements/EditPeople:36 html/index.html:41
+msgid "Go!"
+msgstr "Ga!"
+
+#: NOT FOUND IN SOURCE
+msgid "Good pgp sig from %1\\n"
+msgstr "Goede pgp handtekening van %1\\n"
+
+#: html/Search/Listing.html:50
+msgid "Goto page"
+msgstr "Ga naar pagina"
+
+#: html/Elements/GotoTicket:25 html/SelfService/Elements/GotoTicket:25
+msgid "Goto ticket"
+msgstr "Ga naar ticket"
+
+#: NOT FOUND IN SOURCE
+msgid "Grand"
+msgstr ""
+
+#: html/Ticket/Elements/AddWatchers:46 html/User/Elements/DelegateRights:78
+msgid "Group"
+msgstr "Groep"
+
+#: NOT FOUND IN SOURCE
+msgid "Group %1 %2: %3"
+msgstr "Groep %1 %2: %3"
+
+#: html/Admin/Elements/GroupTabs:45 html/Admin/Elements/QueueTabs:57 html/Admin/Elements/SystemTabs:44 html/Admin/Global/index.html:55
+msgid "Group Rights"
+msgstr "Groeps rechten"
+
+#: lib/RT/Group_Overlay.pm:965
+msgid "Group already has member"
+msgstr "Groep heeft al een lid"
+
+#: NOT FOUND IN SOURCE
+msgid "Group could not be created."
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:77
+#. ($create_msg)
+msgid "Group could not be created: %1"
+msgstr "Groep kon niet gecreërd worden: %1"
+
+#: lib/RT/Group_Overlay.pm:497
+msgid "Group created"
+msgstr "Groep gecreërd"
+
+#: lib/RT/Group_Overlay.pm:1133
+msgid "Group has no such member"
+msgstr "Groep heeft geen lid onder die naam"
+
+#: lib/RT/Group_Overlay.pm:945 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1429 lib/RT/Ticket_Overlay.pm:1507
+msgid "Group not found"
+msgstr "Groep niet gevonden"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not found.\\n"
+msgstr "Groep niet gevonden.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not specified.\\n"
+msgstr "Groep niet gespecificeerd.\\n"
+
+#: html/Admin/Elements/SelectNewGroupMembers:35 html/Admin/Elements/Tabs:35 html/Admin/Groups/Members.html:64 html/Admin/Queues/People.html:83 html/Admin/index.html:32 html/User/Groups/Members.html:67
+msgid "Groups"
+msgstr "Groepen"
+
+#: lib/RT/Group_Overlay.pm:971
+msgid "Groups can't be members of their members"
+msgstr "Groepen kunnen geen leden zijn van hun leden"
+
+#: lib/RT/Interface/CLI.pm:73 lib/RT/Interface/CLI.pm:73
+msgid "Hello!"
+msgstr "Hallo!"
+
+#: docs/design_docs/string-extraction-guide.txt:40
+#. ($name)
+msgid "Hello, %1"
+msgstr "Hallo, %1"
+
+#: html/Ticket/Elements/ShowHistory:30 html/Ticket/Elements/Tabs:88
+msgid "History"
+msgstr "Geschiedenis"
+
+#: html/Admin/Elements/ModifyUser:68
+msgid "HomePhone"
+msgstr "ThuisNummer"
+
+#: html/Elements/Tabs:46
+msgid "Homepage"
+msgstr "Homepage"
+
+#: lib/RT/Base.pm:74
+#. (6)
+msgid "I have %quant(%1,concrete mixer)."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:27 lib/RT/Tickets_Overlay.pm:1018
+msgid "Id"
+msgstr "Id"
+
+#: html/Admin/Users/Modify.html:44 html/User/Prefs.html:39
+msgid "Identity"
+msgstr "Identiteit"
+
+#: etc/upgrade/2.1.71:86
+msgid "If an approval is rejected, reject the original and delete pending approvals"
+msgstr "Als een goedkeuring afgewezen is, wijs het origineel af en verwijder hangende goedkeuringen"
+
+#: bin/rt-crontool:190
+msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
+msgstr "Als dit gereedschap setgid zou zijn, zou een kwaadwillende lokale gebruiker dit gereedschap kunnen gebruiken om administratieve toegang te verkrijgen tot RT"
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
+msgid "If you've updated anything above, be sure to"
+msgstr "Als u een van de bovenstaande elemented ververst heeft, zorg dan dat u"
+
+#: lib/RT/Interface/Web.pm:860
+msgid "Illegal value for %1"
+msgstr "Illegale waarde voor %1"
+
+#: lib/RT/Interface/Web.pm:863
+msgid "Immutable field"
+msgstr "Niet-wijzigbaar veld"
+
+#: html/Admin/Elements/EditCustomFields:74
+msgid "Include disabled custom fields in listing."
+msgstr ""
+
+#: html/Admin/Queues/index.html:43
+msgid "Include disabled queues in listing."
+msgstr "Neem inactieve rijen op in de weergave"
+
+#: html/Admin/Users/index.html:47
+msgid "Include disabled users in search."
+msgstr "Neem inactieve gebruiker op in de zoek opdracht"
+
+#: lib/RT/Tickets_Overlay.pm:1067
+msgid "Initial Priority"
+msgstr "Initiële Prioriteit"
+
+#: lib/RT/Ticket_Overlay.pm:1161 lib/RT/Ticket_Overlay.pm:1163
+msgid "InitialPriority"
+msgstr "InitiëlePrioriteit"
+
+#: lib/RT/ScripAction_Overlay.pm:105
+msgid "Input error"
+msgstr "Invoer fout"
+
+#: NOT FOUND IN SOURCE
+msgid "Interest noted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3729
+msgid "Internal Error"
+msgstr "Interne Fout"
+
+#: lib/RT/Record.pm:143
+#. ($id->{error_message})
+msgid "Internal Error: %1"
+msgstr "Interne Fout: %1"
+
+#: lib/RT/Group_Overlay.pm:644
+msgid "Invalid Group Type"
+msgstr "Ongeldig Groep Type"
+
+#: lib/RT/Principal_Overlay.pm:128
+msgid "Invalid Right"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Invalid Type"
+msgstr "Ongeldig Type"
+
+#: lib/RT/Interface/Web.pm:865
+msgid "Invalid data"
+msgstr "Ongeldige data"
+
+#: lib/RT/Ticket_Overlay.pm:438
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr "Ongeldige eigenaar. Val terug op 'nobody'."
+
+#: lib/RT/Scrip_Overlay.pm:134 lib/RT/Template_Overlay.pm:251
+msgid "Invalid queue"
+msgstr "Ongeldige rij"
+
+#: lib/RT/ACE_Overlay.pm:244 lib/RT/ACE_Overlay.pm:253 lib/RT/ACE_Overlay.pm:259 lib/RT/ACE_Overlay.pm:270 lib/RT/ACE_Overlay.pm:275
+msgid "Invalid right"
+msgstr "Ongeldige recht"
+
+#: lib/RT/Record.pm:118
+#. ($key)
+msgid "Invalid value for %1"
+msgstr "Ongeldige waarde voor %1"
+
+#: lib/RT/Ticket_Overlay.pm:3367
+msgid "Invalid value for custom field"
+msgstr "Ongeldige waarde voor specifiek veld"
+
+#: lib/RT/Ticket_Overlay.pm:345
+msgid "Invalid value for status"
+msgstr "Ongeldige waarde voor status"
+
+#: bin/rt-crontool:191
+msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
+msgstr "Het is ontzettend belangrijk dat onbevoorrechtigde gebruikers geen toestemming hebben om dit gereedschap te gebruiken."
+
+#: bin/rt-crontool:192
+msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
+msgstr "We stellen voor dat u een onbevoorrechtigde unix gebruiker aanmaakt met het juiste groep lidmaatschap en RT toegang om dit gereedschap te gebruiken."
+
+#: bin/rt-crontool:163
+msgid "It takes several arguments:"
+msgstr "Het accepteerd meerdere argumenten:"
+
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
+msgstr "Zaken die wachten op mijn goedkeuring"
+
+#: lib/RT/Date.pm:411
+msgid "Jan."
+msgstr "jan."
+
+#: NOT FOUND IN SOURCE
+msgid "January"
+msgstr "januari"
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "Join or leave this group"
+msgstr "Sluit u aan of verlaat deze groep"
+
+#: lib/RT/Date.pm:417
+msgid "Jul."
+msgstr "jul."
+
+#: NOT FOUND IN SOURCE
+msgid "July"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:99
+msgid "Jumbo"
+msgstr "Jumbo"
+
+#: lib/RT/Date.pm:416
+msgid "Jun."
+msgstr "jun."
+
+#: NOT FOUND IN SOURCE
+msgid "June"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Keyword"
+msgstr "Sleutelwoord"
+
+#: html/Admin/Elements/ModifyUser:52
+msgid "Lang"
+msgstr "Taal"
+
+#: html/Ticket/Elements/Tabs:73
+msgid "Last"
+msgstr "Laatste"
+
+#: html/Ticket/Elements/EditDates:38 html/Ticket/Elements/ShowDates:39
+msgid "Last Contact"
+msgstr "Laatste Contact"
+
+#: html/Elements/SelectDateType:29
+msgid "Last Contacted"
+msgstr "Laatst Gecontacteerd"
+
+#: html/Search/Elements/TicketHeader:41
+msgid "Last Notified"
+msgstr ""
+
+#: html/Elements/SelectDateType:30
+msgid "Last Updated"
+msgstr "Laatst Ververst"
+
+#: NOT FOUND IN SOURCE
+msgid "LastUpdated"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Left"
+msgstr "Over"
+
+#: html/Admin/Users/Modify.html:83
+msgid "Let this user access RT"
+msgstr "Geef deze gebruiker toegang tot RT"
+
+#: html/Admin/Users/Modify.html:87
+msgid "Let this user be granted rights"
+msgstr "Geef deze gebruiker rechten"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting owner to %1 %2"
+msgstr "Eigenaar wordt gelimieteerd tot %1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting queue to %1 %2"
+msgstr "Rij wordt gelimiteerd tot %1 %2"
+
+#: lib/RT/Ticket_Overlay.pm:2697
+msgid "Link already exists"
+msgstr "Koppeling bestaat al"
+
+#: lib/RT/Ticket_Overlay.pm:2709
+msgid "Link could not be created"
+msgstr "Koppeling kon niet gecreëerd worden"
+
+#: lib/RT/Ticket_Overlay.pm:2717 lib/RT/Ticket_Overlay.pm:2727
+#. ($TransString)
+msgid "Link created (%1)"
+msgstr "Koppeling gecreëerd (%1)"
+
+#: lib/RT/Ticket_Overlay.pm:2638
+#. ($TransString)
+msgid "Link deleted (%1)"
+msgstr "Koppelink verwijderd (%1)"
+
+#: lib/RT/Ticket_Overlay.pm:2644
+msgid "Link not found"
+msgstr "Koppeling niet gevonden"
+
+#: html/Ticket/ModifyLinks.html:25 html/Ticket/ModifyLinks.html:29
+#. ($Ticket->Id)
+msgid "Link ticket #%1"
+msgstr "Koppel ticket #%1"
+
+#: NOT FOUND IN SOURCE
+msgid "Link ticket %1"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:97
+msgid "Links"
+msgstr "Koppelingen"
+
+#: html/Admin/Users/Modify.html:114 html/User/Prefs.html:85
+msgid "Location"
+msgstr "Locatie"
+
+#: lib/RT.pm:158
+#. ($RT::LogDir)
+msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
+msgstr "Log folder %1 niet gevonden of niet toegankelijk.\\n RT kan niet starten."
+
+#: html/Elements/Header:57
+#. ("<b>".$session{'CurrentUser'}->Name."</b>")
+msgid "Logged in as %1"
+msgstr "Aangemeld als %1"
+
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:25 html/Elements/Login:34 html/Elements/Login:45
+msgid "Login"
+msgstr "Aanmelden"
+
+#: html/Elements/Header:54
+msgid "Logout"
+msgstr "Afmelden"
+
+#: html/Search/Bulk.html:86
+msgid "Make Owner"
+msgstr "Maak Eigenaar"
+
+#: html/Search/Bulk.html:102
+msgid "Make Status"
+msgstr "Maak Status"
+
+#: html/Search/Bulk.html:109
+msgid "Make date Due"
+msgstr "Maak verwachtingsdatum"
+
+#: html/Search/Bulk.html:110
+msgid "Make date Resolved"
+msgstr "Make oplossingsdatum"
+
+#: html/Search/Bulk.html:107
+msgid "Make date Started"
+msgstr "Maak startdatum"
+
+#: html/Search/Bulk.html:106
+msgid "Make date Starts"
+msgstr "Maak datum gestart"
+
+#: html/Search/Bulk.html:108
+msgid "Make date Told"
+msgstr "Maak datum gemeld"
+
+#: html/Search/Bulk.html:99
+msgid "Make priority"
+msgstr "Maak prioriteit"
+
+#: html/Search/Bulk.html:100
+msgid "Make queue"
+msgstr "Maak rij"
+
+#: html/Search/Bulk.html:98
+msgid "Make subject"
+msgstr "Maak onderwerp"
+
+#: html/Admin/index.html:33
+msgid "Manage groups and group membership"
+msgstr "Beheer groepen en groeplidmaatschap"
+
+#: html/Admin/index.html:39
+msgid "Manage properties and configuration which apply to all queues"
+msgstr "Beheer eigenschappen en configuraties welke betrekking hebben op alle rijen"
+
+#: html/Admin/index.html:36
+msgid "Manage queues and queue-specific properties"
+msgstr "Beheer rijen en rij-specifieke eigenschappen"
+
+#: html/Admin/index.html:30
+msgid "Manage users and passwords"
+msgstr "Beheer gebruikers en wachtwoorden"
+
+#: lib/RT/Date.pm:413
+msgid "Mar."
+msgstr "maa."
+
+#: NOT FOUND IN SOURCE
+msgid "March"
+msgstr "maart"
+
+#: NOT FOUND IN SOURCE
+msgid "May"
+msgstr "mei"
+
+#: lib/RT/Date.pm:415
+msgid "May."
+msgstr "mei."
+
+#: lib/RT/Group_Overlay.pm:982
+msgid "Member added"
+msgstr "Lid toegevoegd"
+
+#: lib/RT/Group_Overlay.pm:1140
+msgid "Member deleted"
+msgstr "Lid verwijderd"
+
+#: lib/RT/Group_Overlay.pm:1144
+msgid "Member not deleted"
+msgstr "Lid niet verwijderd"
+
+#: html/Elements/SelectLinkType:26
+msgid "Member of"
+msgstr "Lid van"
+
+#: NOT FOUND IN SOURCE
+msgid "MemberOf"
+msgstr "LidVan"
+
+#: html/Admin/Elements/GroupTabs:42 html/User/Elements/GroupTabs:42
+msgid "Members"
+msgstr "Leden"
+
+#: lib/RT/Ticket_Overlay.pm:2843
+msgid "Merge Successful"
+msgstr "Samenvoeging Succesvol"
+
+#: lib/RT/Ticket_Overlay.pm:2804
+msgid "Merge failed. Couldn't set EffectiveId"
+msgstr "Samenvoeging mislukt. Kon EffectiefId niet instellen"
+
+#: html/Ticket/Elements/EditLinks:115
+msgid "Merge into"
+msgstr "Voeg samen in"
+
+#: html/Ticket/Update.html:102
+msgid "Message"
+msgstr "Bericht"
+
+#: lib/RT/Interface/Web.pm:867
+msgid "Missing a primary key?: %1"
+msgstr "Mist primaire sleutel?: %1"
+
+#: html/Admin/Users/Modify.html:169 html/User/Prefs.html:54
+msgid "Mobile"
+msgstr "Mobiel"
+
+#: html/Admin/Elements/ModifyUser:72
+msgid "MobilePhone"
+msgstr "MobieleTelefoon"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "Modify Access Control List"
+msgstr "Wijzig Toegangs Controle Lijst"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Field %1"
+msgstr "Wijzig Specifiek Veld %1"
+
+#: html/Admin/Global/CustomFields.html:44 html/Admin/Global/index.html:51
+msgid "Modify Custom Fields which apply to all queues"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "Modify Scrip templates for this queue"
+msgstr "Wijzit Scrip sjabloon voor deze rij"
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "Modify Scrips for this queue"
+msgstr "Wijzig Scrips voor deze rij"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify System ACLS"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Template %1"
+msgstr "Wijzig Sjabloon %1"
+
+#: html/Admin/Queues/CustomField.html:45
+#. ($QueueObj->Name())
+msgid "Modify a CustomField for queue %1"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:53
+msgid "Modify a CustomField which applies to all queues"
+msgstr ""
+
+#: html/Admin/Queues/Scrip.html:54
+#. ($QueueObj->Name)
+msgid "Modify a scrip for queue %1"
+msgstr "Wijzig een scrip voor deze rij %1"
+
+#: html/Admin/Global/Scrip.html:48
+msgid "Modify a scrip which applies to all queues"
+msgstr "Wijzig een scrip welke betrekking heeft op alle rijen"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify dates for # %1"
+msgstr "Wijzig data voor # %1"
+
+#: html/Ticket/ModifyDates.html:25 html/Ticket/ModifyDates.html:29
+#. ($TicketObj->Id)
+msgid "Modify dates for #%1"
+msgstr "Wijzig data voor #%1"
+
+#: html/Ticket/ModifyDates.html:35
+#. ($TicketObj->Id)
+msgid "Modify dates for ticket # %1"
+msgstr "Wijzig data voor ticket # %1"
+
+#: html/Admin/Global/GroupRights.html:25 html/Admin/Global/GroupRights.html:28 html/Admin/Global/index.html:56
+msgid "Modify global group rights"
+msgstr "Wijzig globale groepsrechten"
+
+#: html/Admin/Global/GroupRights.html:33
+msgid "Modify global group rights."
+msgstr "Wijzig globale groepsrechten"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for groups"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for users"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global scrips"
+msgstr ""
+
+#: html/Admin/Global/UserRights.html:25 html/Admin/Global/UserRights.html:28 html/Admin/Global/index.html:60
+msgid "Modify global user rights"
+msgstr ""
+
+#: html/Admin/Global/UserRights.html:33
+msgid "Modify global user rights."
+msgstr "Wijzig globale gebruikersrechten"
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "Modify group metadata or delete group"
+msgstr "Wijzig groepsmetadata of verwijder groep"
+
+#: html/Admin/Groups/GroupRights.html:25 html/Admin/Groups/GroupRights.html:29 html/Admin/Groups/GroupRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify group rights for group %1"
+msgstr "Wijzig groepsrechten voor groep %1"
+
+#: html/Admin/Queues/GroupRights.html:25 html/Admin/Queues/GroupRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify group rights for queue %1"
+msgstr "Wijzig groepsrechten voor rij %1"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "Modify membership roster for this group"
+msgstr "Wijzig lidmaatschap rooster voor dze groep"
+
+#: lib/RT/System.pm:61
+msgid "Modify one's own RT account"
+msgstr "Wijzig uw eigen RT "
+
+#: html/Admin/Queues/People.html:25 html/Admin/Queues/People.html:29
+#. ($QueueObj->Name)
+msgid "Modify people related to queue %1"
+msgstr "Wijzig mensen gekoppeld aan rij %1"
+
+#: html/Ticket/ModifyPeople.html:25 html/Ticket/ModifyPeople.html:29 html/Ticket/ModifyPeople.html:35
+#. ($Ticket->id)
+#. ($Ticket->Id)
+msgid "Modify people related to ticket #%1"
+msgstr "Wijzig mensen gekoppeld aan ticket #%1"
+
+#: html/Admin/Queues/Scrips.html:44
+#. ($QueueObj->Name)
+msgid "Modify scrips for queue %1"
+msgstr "Wijzig scrips voor rij %1"
+
+#: html/Admin/Global/Scrips.html:44 html/Admin/Global/index.html:42
+msgid "Modify scrips which apply to all queues"
+msgstr "Wijzig scrips welke betrekking hebben op alle rijen"
+
+#: html/Admin/Global/Template.html:25 html/Admin/Global/Template.html:30 html/Admin/Global/Template.html:81 html/Admin/Queues/Template.html:78
+#. (loc($TemplateObj->Name()))
+#. ($TemplateObj->id)
+msgid "Modify template %1"
+msgstr "Wijzig sjabloon %1"
+
+#: html/Admin/Global/Templates.html:44
+msgid "Modify templates which apply to all queues"
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:87 html/User/Groups/Modify.html:86
+#. ($Group->Name)
+msgid "Modify the group %1"
+msgstr "Wijzig de groep %1"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "Modify the queue watchers"
+msgstr "Wijzig de toeschouwers van de rij"
+
+#: html/Admin/Users/Modify.html:236
+#. ($UserObj->Name)
+msgid "Modify the user %1"
+msgstr "Wijzig de gebruiker %1"
+
+#: html/Ticket/ModifyAll.html:37
+#. ($Ticket->Id)
+msgid "Modify ticket # %1"
+msgstr "Wijzig ticket # %1"
+
+#: html/Ticket/Modify.html:25 html/Ticket/Modify.html:28 html/Ticket/Modify.html:34
+#. ($TicketObj->Id)
+msgid "Modify ticket #%1"
+msgstr "Wijzig ticket #%1"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "Modify tickets"
+msgstr "Wijzig tickets"
+
+#: html/Admin/Groups/UserRights.html:25 html/Admin/Groups/UserRights.html:29 html/Admin/Groups/UserRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify user rights for group %1"
+msgstr "Wijzig gebruikersrechten voor groep %1"
+
+#: html/Admin/Queues/UserRights.html:25 html/Admin/Queues/UserRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify user rights for queue %1"
+msgstr "Wijzig gebruikersrechten voor rij %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify watchers for queue '%1'"
+msgstr "Wijzig toeschouwers voor rij '%1'"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ModifyACL"
+msgstr "WijzigACL"
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "ModifyOwnMembership"
+msgstr "WijzigEigenLidmaatschap"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "ModifyQueueWatchers"
+msgstr "WijzigRijToeschouwers"
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "ModifyScrips"
+msgstr "WijzigScrips"
+
+#: lib/RT/System.pm:61
+msgid "ModifySelf"
+msgstr "WijzigZelf"
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "ModifyTemplate"
+msgstr "WijzigSjabloon"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "ModifyTicket"
+msgstr "WijzigTicket"
+
+#: lib/RT/Date.pm:388
+msgid "Mon."
+msgstr "Ma."
+
+#: html/Ticket/Elements/ShowRequestor:42
+#. ($name)
+msgid "More about %1"
+msgstr "Meer over %1"
+
+#: html/Admin/Elements/EditCustomFields:61
+msgid "Move down"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:53
+msgid "Move up"
+msgstr ""
+
+#: html/Admin/Elements/SelectSingleOrMultiple:27
+msgid "Multiple"
+msgstr "Meerdere"
+
+#: lib/RT/User_Overlay.pm:179
+msgid "Must specify 'Name' attribute"
+msgstr "Specificeren van 'Naam' attribuut verplicht"
+
+#: NOT FOUND IN SOURCE
+msgid "My Approvals"
+msgstr "Mijn Goedkeuringen"
+
+#: html/Approvals/index.html:25 html/Approvals/index.html:26
+msgid "My approvals"
+msgstr ""
+
+#: html/Admin/Elements/AddCustomFieldValue:26 html/Admin/Elements/EditCustomField:32 html/Admin/Elements/ModifyTemplate:28 html/Admin/Elements/ModifyUser:30 html/Admin/Groups/Modify.html:44 html/Elements/SelectGroups:26 html/Elements/SelectUsers:28 html/User/Groups/Modify.html:44
+msgid "Name"
+msgstr "Naam"
+
+#: lib/RT/User_Overlay.pm:186
+msgid "Name in use"
+msgstr "Naam in gebruik"
+
+#: NOT FOUND IN SOURCE
+msgid "Need approval from system administrator"
+msgstr "Goedkeuring benodigd van de systeem beheerder"
+
+#: html/Ticket/Elements/ShowDates:52
+msgid "Never"
+msgstr "Nooit"
+
+#: html/Elements/Quicksearch:30
+msgid "New"
+msgstr "Nieuw"
+
+#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:93 html/User/Prefs.html:65
+msgid "New Password"
+msgstr "Nieuw Wachtwoord"
+
+#: etc/initialdata:311 etc/upgrade/2.1.71:16
+msgid "New Pending Approval"
+msgstr "Nieuwe Hangende Goedkeuring"
+
+#: html/Ticket/Elements/EditLinks:111
+msgid "New Relationships"
+msgstr "Nieuwe Relaties"
+
+#: html/Ticket/Elements/Tabs:36
+msgid "New Search"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:41 html/Admin/Global/CustomFields.html:39 html/Admin/Queues/CustomField.html:52 html/Admin/Queues/CustomFields.html:40
+msgid "New custom field"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:54 html/User/Elements/GroupTabs:52
+msgid "New group"
+msgstr ""
+
+#: html/SelfService/Prefs.html:32
+msgid "New password"
+msgstr "Nieuw wachtwoord"
+
+#: lib/RT/User_Overlay.pm:639
+msgid "New password notification sent"
+msgstr "Bericht voor nieuw wachtwoord verzonden"
+
+#: html/Admin/Elements/QueueTabs:70
+msgid "New queue"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:63
+msgid "New request"
+msgstr "Nieuw verzoek"
+
+#: html/Admin/Elements/SelectRights:42
+msgid "New rights"
+msgstr "Nieuwe rechten"
+
+#: html/Admin/Global/Scrip.html:40 html/Admin/Global/Scrips.html:39 html/Admin/Queues/Scrip.html:43 html/Admin/Queues/Scrips.html:53
+msgid "New scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "New search"
+msgstr "Nieuwe zoekopdracht"
+
+#: html/Admin/Global/Template.html:60 html/Admin/Global/Templates.html:39 html/Admin/Queues/Template.html:58 html/Admin/Queues/Templates.html:46
+msgid "New template"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2771
+msgid "New ticket doesn't exist"
+msgstr "Nieuw ticket bestaat niet"
+
+#: html/Admin/Elements/UserTabs:52
+msgid "New user"
+msgstr ""
+
+#: html/Admin/Elements/CreateUserCalled:26
+msgid "New user called"
+msgstr "Nieuwe gebruiker genaamd"
+
+#: html/Admin/Queues/People.html:55 html/Ticket/Elements/EditPeople:29
+msgid "New watchers"
+msgstr "Nieuwe toeschouwers"
+
+#: html/Admin/Users/Prefs.html:42
+msgid "New window setting"
+msgstr "Nieuwe venster instelling"
+
+#: html/Ticket/Elements/Tabs:69
+msgid "Next"
+msgstr "Volgende"
+
+#: html/Search/Listing.html:48
+msgid "Next page"
+msgstr "Volgende pagina"
+
+#: html/Admin/Elements/ModifyUser:50
+msgid "NickName"
+msgstr "Bijnaam"
+
+#: html/Admin/Users/Modify.html:63 html/User/Prefs.html:46
+msgid "Nickname"
+msgstr "Bijnaam"
+
+#: html/Admin/Elements/EditCustomField:73 html/Admin/Elements/EditCustomFields:105
+msgid "No CustomField"
+msgstr "Geen SpecifiekVeld"
+
+#: html/Admin/Groups/GroupRights.html:84 html/Admin/Groups/UserRights.html:71
+msgid "No Group defined"
+msgstr "Geen Groep gedefinieerd"
+
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:68
+msgid "No Queue defined"
+msgstr "Geen Rij gedefinieerd"
+
+#: bin/rt-crontool:56
+msgid "No RT user found. Please consult your RT administrator.\\n"
+msgstr "Geen RT gebruiker gevonden. Raadpleeg uw RT beheerder.\\n"
+
+#: html/Admin/Global/Template.html:79 html/Admin/Queues/Template.html:76
+msgid "No Template"
+msgstr "Geen Sjabloon"
+
+#: bin/rt-commit-handler:764
+msgid "No Ticket specified. Aborting ticket "
+msgstr "Geen ticket gespecificeerd. Ticket afgebroken "
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgstr "Geen ticket gespecificeerd. Ticket wijzigingen afgebroken\\n\\n"
+
+#: html/Approvals/Elements/Approve:47
+msgid "No action"
+msgstr "Geen actie"
+
+#: lib/RT/Interface/Web.pm:862
+msgid "No column specified"
+msgstr "Geen kolom gespecificeerd"
+
+#: NOT FOUND IN SOURCE
+msgid "No command found\\n"
+msgstr "Geen commando gevonden\\n"
+
+#: html/Elements/ViewUser:36 html/Ticket/Elements/ShowRequestor:45
+msgid "No comment entered about this user"
+msgstr "Geen commentaar ingevuld over deze gebruiker"
+
+#: lib/RT/Ticket_Overlay.pm:2189 lib/RT/Ticket_Overlay.pm:2257
+msgid "No correspondence attached"
+msgstr "Geen correspondentie aangehecht"
+
+#: lib/RT/Action/Generic.pm:150 lib/RT/Condition/Generic.pm:176 lib/RT/Search/ActiveTicketsInQueue.pm:56 lib/RT/Search/Generic.pm:113
+#. (ref $self)
+msgid "No description for %1"
+msgstr "Geen omschrijving voor %1"
+
+#: lib/RT/Users_Overlay.pm:151
+msgid "No group specified"
+msgstr "Geen groep gespecificeerd"
+
+#: lib/RT/User_Overlay.pm:857
+msgid "No password set"
+msgstr "Geen wachtwoord ingesteld"
+
+#: lib/RT/Queue_Overlay.pm:259
+msgid "No permission to create queues"
+msgstr "Geen rechten om rijen te creëren"
+
+#: lib/RT/Ticket_Overlay.pm:341
+#. ($QueueObj->Name)
+msgid "No permission to create tickets in the queue '%1'"
+msgstr "Geen rechten om tickets te creëren in de rij '%1'"
+
+#: lib/RT/User_Overlay.pm:151
+msgid "No permission to create users"
+msgstr "Geen rechten om gebruikers te creëren"
+
+#: html/SelfService/Display.html:174
+msgid "No permission to display that ticket"
+msgstr "Geen rechten om dat ticket te tonen"
+
+#: html/SelfService/Update.html:55
+msgid "No permission to view update ticket"
+msgstr "Geen rechten om verversing ticket te bekijken"
+
+#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1488
+msgid "No principal specified"
+msgstr "Geen hoofd gespecificeerd"
+
+#: html/Admin/Queues/People.html:154 html/Admin/Queues/People.html:164
+msgid "No principals selected."
+msgstr "Geen hoofden geselecteerd"
+
+#: html/Admin/Queues/index.html:35
+msgid "No queues matching search criteria found."
+msgstr "Geen rijen gevonden die aan de zoekcriteria voldoen"
+
+#: html/Admin/Elements/SelectRights:81
+msgid "No rights found"
+msgstr ""
+
+#: html/Admin/Elements/SelectRights:33
+msgid "No rights granted."
+msgstr "Geen rechten toegekend"
+
+#: html/Search/Bulk.html:149
+msgid "No search to operate on."
+msgstr "Geen zoek opdracht om uit te voeren."
+
+#: NOT FOUND IN SOURCE
+msgid "No ticket id specified"
+msgstr "Geen ticket id gespecificeerd"
+
+#: lib/RT/Transaction_Overlay.pm:480 lib/RT/Transaction_Overlay.pm:518
+msgid "No transaction type specified"
+msgstr "Geen transactie type gespecificeerd"
+
+#: NOT FOUND IN SOURCE
+msgid "No user or email address specified"
+msgstr "Geen gebruiker of email-adres gespecificeerd"
+
+#: html/Admin/Users/index.html:36
+msgid "No users matching search criteria found."
+msgstr "Geen gebruikers gevonden die aan de zoekcriteria voldoen"
+
+#: bin/rt-commit-handler:644
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr "Geen geldige RT gebruiker gevonden. RT cvs behandelaar losgemaakt. Neemt u alstublieft contact op met uw RT beheerder.\\n"
+
+#: lib/RT/Interface/Web.pm:859
+msgid "No value sent to _Set!\\n"
+msgstr "Geen waarde gestuurd naar _Set!\\n"
+
+#: html/Search/Elements/TicketRow:37
+msgid "Nobody"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:864
+msgid "Nonexistant field?"
+msgstr "Nietbestaand veld?"
+
+#: html/Elements/Login:99
+msgid "Not logged in"
+msgstr ""
+
+#: html/Elements/Header:59 html/SelfService/Elements/Header:58
+msgid "Not logged in."
+msgstr "Niet aangemeld."
+
+#: lib/RT/Date.pm:369
+msgid "Not set"
+msgstr "Niet gezet"
+
+#: html/NoAuth/Reminder.html:27
+msgid "Not yet implemented."
+msgstr "Nog niet geïmplementeerd."
+
+#: html/Admin/Groups/Rights.html:25
+msgid "Not yet implemented...."
+msgstr "Nog niet geïmplementeerd...."
+
+#: html/Approvals/Elements/Approve:50
+msgid "Notes"
+msgstr "Notities"
+
+#: lib/RT/User_Overlay.pm:642
+msgid "Notification could not be sent"
+msgstr "Bericht kon niet verstuurd worden"
+
+#: etc/initialdata:94
+msgid "Notify AdminCcs"
+msgstr "Bericht AdminCcs"
+
+#: etc/initialdata:90
+msgid "Notify AdminCcs as Comment"
+msgstr "Bericht AdminCcs als Commentaar"
+
+#: etc/initialdata:121
+msgid "Notify Other Recipients"
+msgstr "Bericht Andere Ontvangers"
+
+#: etc/initialdata:117
+msgid "Notify Other Recipients as Comment"
+msgstr "Bericht Andere Ontvangers als Commentaar"
+
+#: etc/initialdata:86
+msgid "Notify Owner"
+msgstr "Bericht Eigenaar"
+
+#: etc/initialdata:82
+msgid "Notify Owner as Comment"
+msgstr "Bericht Eigenaar als Commentaar"
+
+#: etc/initialdata:313 etc/upgrade/2.1.71:17
+msgid "Notify Owners and AdminCcs of new items pending their approval"
+msgstr "Bericht Eigenaars en AdminCcs van nieuwe zaken welke hangende hun goedkeuring zijn"
+
+#: etc/initialdata:78
+msgid "Notify Requestors"
+msgstr "Bericht Aanvragers"
+
+#: etc/initialdata:104
+msgid "Notify Requestors and Ccs"
+msgstr "Bericht Aanvragers en Ccs"
+
+#: etc/initialdata:99
+msgid "Notify Requestors and Ccs as Comment"
+msgstr "Bericht Aanvragers en Ccs als Commentaar"
+
+#: etc/initialdata:113
+msgid "Notify Requestors, Ccs and AdminCcs"
+msgstr "Bericht Aanvragers, Ccs en AdminCcs"
+
+#: etc/initialdata:109
+msgid "Notify Requestors, Ccs and AdminCcs as Comment"
+msgstr "Bericht Aanvragers, Ccs en AdminCcs als Commentaar"
+
+#: lib/RT/Date.pm:421
+msgid "Nov."
+msgstr "nov."
+
+#: NOT FOUND IN SOURCE
+msgid "November"
+msgstr ""
+
+#: lib/RT/Record.pm:157
+msgid "Object could not be created"
+msgstr "Object kon niet gecreëerd worden"
+
+#: lib/RT/Record.pm:176
+msgid "Object created"
+msgstr "Object gecreëerd"
+
+#: lib/RT/Date.pm:420
+msgid "Oct."
+msgstr "oct."
+
+#: NOT FOUND IN SOURCE
+msgid "October"
+msgstr ""
+
+#: html/Elements/SelectDateRelation:35
+msgid "On"
+msgstr "Bij"
+
+#: etc/initialdata:155
+msgid "On Comment"
+msgstr "Bij Commentaar"
+
+#: etc/initialdata:148
+msgid "On Correspond"
+msgstr "Bij Overeenkomst"
+
+#: etc/initialdata:137
+msgid "On Create"
+msgstr "Bij Creatie"
+
+#: etc/initialdata:169
+msgid "On Owner Change"
+msgstr "Bij Eigenaarwijziging"
+
+#: etc/initialdata:177
+msgid "On Queue Change"
+msgstr "Bij Rijwijziging"
+
+#: etc/initialdata:183
+msgid "On Resolve"
+msgstr "Bij Oplossing"
+
+#: etc/initialdata:161
+msgid "On Status Change"
+msgstr "Bij Statuswijziging"
+
+#: etc/initialdata:142
+msgid "On Transaction"
+msgstr "Bij Transactie"
+
+#: html/Approvals/Elements/PendingMyApproval:50
+#. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
+msgid "Only show approvals for requests created after %1"
+msgstr "Toon alleen goedkeuringen voor verzoeken gecreëerd na %1"
+
+#: html/Approvals/Elements/PendingMyApproval:48
+#. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
+msgid "Only show approvals for requests created before %1"
+msgstr "Toon alleen goedkeuringen voor verzoeken gecreëerd voor %1"
+
+#: html/Elements/Quicksearch:31
+msgid "Open"
+msgstr "Open"
+
+#: html/Ticket/Elements/Tabs:136
+msgid "Open it"
+msgstr "Open"
+
+#: html/SelfService/Elements/Tabs:57
+msgid "Open requests"
+msgstr "Open verzoeken"
+
+#: html/Admin/Users/Prefs.html:41
+msgid "Open tickets (from listing) in a new window"
+msgstr "Open tickets (van lijst) in een nieuw venster"
+
+#: html/Admin/Users/Prefs.html:40
+msgid "Open tickets (from listing) in another window"
+msgstr "Open tickets (van lijst) in een ander venster"
+
+#: etc/initialdata:133
+msgid "Open tickets on correspondence"
+msgstr ""
+
+#: html/Search/Elements/PickRestriction:101
+msgid "Ordering and sorting"
+msgstr "Ordening en sortering"
+
+#: html/Admin/Elements/ModifyUser:46 html/Admin/Users/Modify.html:117 html/Elements/SelectUsers:29 html/User/Prefs.html:86
+msgid "Organization"
+msgstr "Organisatie"
+
+#: html/Approvals/Elements/Approve:34
+#. ($approving->Id, $approving->Subject)
+msgid "Originating ticket: #%1"
+msgstr "Voortgekomen uit ticket: #%1"
+
+#: html/Admin/Elements/ModifyQueue:55 html/Admin/Queues/Modify.html:69
+msgid "Over time, priority moves toward"
+msgstr "Naar mate de tijd vordert, verschuift de prioriteit richting"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "Own tickets"
+msgstr "Eigen tickets"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "OwnTicket"
+msgstr "EigenTicket"
+
+#: etc/initialdata:38 html/Elements/MyRequests:32 html/SelfService/Elements/MyRequests:30 html/Ticket/Create.html:48 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/EditPeople:44 html/Ticket/Elements/ShowPeople:27 html/Ticket/Update.html:63 lib/RT/ACE_Overlay.pm:86 lib/RT/Tickets_Overlay.pm:1244
+msgid "Owner"
+msgstr "Eigenaar"
+
+#: lib/RT/Ticket_Overlay.pm:3004
+#. ($OldOwnerObj->Name,  $NewOwnerObj->Name)
+msgid "Owner changed from %1 to %2"
+msgstr "Eigenaar veranderd van %1 naar %2"
+
+#: lib/RT/Transaction_Overlay.pm:584
+#. ($Old->Name , $New->Name)
+msgid "Owner forcibly changed from %1 to %2"
+msgstr "Eigenaar gedwongen veranderd van %1 naar %2"
+
+#: html/Search/Elements/PickRestriction:31
+msgid "Owner is"
+msgstr "Eigenaar is"
+
+#: html/Admin/Users/Modify.html:174 html/User/Prefs.html:56
+msgid "Pager"
+msgstr "Pieper"
+
+#: html/Admin/Elements/ModifyUser:74
+msgid "PagerPhone"
+msgstr "Pieper"
+
+#: NOT FOUND IN SOURCE
+msgid "Parent"
+msgstr ""
+
+#: html/Ticket/Create.html:182 html/Ticket/Elements/EditLinks:127 html/Ticket/Elements/EditLinks:58 html/Ticket/Elements/ShowLinks:43
+msgid "Parents"
+msgstr "Ouders"
+
+#: html/Elements/Login:43 html/User/Prefs.html:61
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: html/NoAuth/Reminder.html:25
+msgid "Password Reminder"
+msgstr "Wachtwoord Herinerring"
+
+#: lib/RT/User_Overlay.pm:168 lib/RT/User_Overlay.pm:860
+msgid "Password too short"
+msgstr "Wachtwoord te kort"
+
+#: html/Admin/Users/Modify.html:291 html/User/Prefs.html:172
+#. (loc_fuzzy($msg))
+msgid "Password: %1"
+msgstr "Wachtwoord: %1"
+
+#: html/Ticket/Elements/ShowSummary:43 html/Ticket/Elements/Tabs:96 html/Ticket/ModifyAll.html:51
+msgid "People"
+msgstr "Mensen"
+
+#: etc/initialdata:126
+msgid "Perform a user-defined action"
+msgstr "Verricht een gebruiker gedefiniëerde actie"
+
+#: lib/RT/ACE_Overlay.pm:231 lib/RT/ACE_Overlay.pm:237 lib/RT/ACE_Overlay.pm:563 lib/RT/ACE_Overlay.pm:573 lib/RT/ACE_Overlay.pm:583 lib/RT/ACE_Overlay.pm:648 lib/RT/CurrentUser.pm:83 lib/RT/CurrentUser.pm:92 lib/RT/CustomField_Overlay.pm:445 lib/RT/CustomField_Overlay.pm:451 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1099 lib/RT/Group_Overlay.pm:1108 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1163 lib/RT/Group_Overlay.pm:1169 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:904 lib/RT/Group_Overlay.pm:908 lib/RT/Group_Overlay.pm:921 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:931 lib/RT/Scrip_Overlay.pm:126 lib/RT/Scrip_Overlay.pm:137 lib/RT/Scrip_Overlay.pm:197 lib/RT/Scrip_Overlay.pm:430 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:88 lib/RT/Template_Overlay.pm:94 lib/RT/Ticket_Overlay.pm:1341 lib/RT/Ticket_Overlay.pm:1351 lib/RT/Ticket_Overlay.pm:1365 lib/RT/Ticket_Overlay.pm:1518 lib/RT/Ticket_Overlay.pm:1527 lib/RT/Ticket_Overlay.pm:1540 lib/RT/Ticket_Overlay.pm:1875 lib/RT/Ticket_Overlay.pm:2013 lib/RT/Ticket_Overlay.pm:2177 lib/RT/Ticket_Overlay.pm:2244 lib/RT/Ticket_Overlay.pm:2596 lib/RT/Ticket_Overlay.pm:2668 lib/RT/Ticket_Overlay.pm:2762 lib/RT/Ticket_Overlay.pm:2777 lib/RT/Ticket_Overlay.pm:2910 lib/RT/Ticket_Overlay.pm:3139 lib/RT/Ticket_Overlay.pm:3337 lib/RT/Ticket_Overlay.pm:3499 lib/RT/Ticket_Overlay.pm:3551 lib/RT/Ticket_Overlay.pm:3716 lib/RT/Transaction_Overlay.pm:468 lib/RT/Transaction_Overlay.pm:475 lib/RT/Transaction_Overlay.pm:504 lib/RT/Transaction_Overlay.pm:511 lib/RT/User_Overlay.pm:1334 lib/RT/User_Overlay.pm:562 lib/RT/User_Overlay.pm:597 lib/RT/User_Overlay.pm:853 lib/RT/User_Overlay.pm:941
+msgid "Permission Denied"
+msgstr "Toestemming Geweigerd"
+
+#: html/User/Elements/Tabs:35
+msgid "Personal Groups"
+msgstr ""
+
+#: html/User/Groups/index.html:30 html/User/Groups/index.html:40
+msgid "Personal groups"
+msgstr "Persoonlijke groepen"
+
+#: html/User/Elements/DelegateRights:37
+msgid "Personal groups:"
+msgstr "Persoonlijke groepen:"
+
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:49
+msgid "Phone numbers"
+msgstr "Telefoonnummers"
+
+#: html/Admin/Users/Rights.html:25
+msgid "Placeholder"
+msgstr "Plaatshouder"
+
+#: NOT FOUND IN SOURCE
+msgid "Pref"
+msgstr ""
+
+#: html/Elements/Header:52 html/Elements/Tabs:55 html/SelfService/Prefs.html:25 html/User/Prefs.html:25 html/User/Prefs.html:28
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+#: NOT FOUND IN SOURCE
+msgid "Prefs"
+msgstr "Voorkeuren"
+
+#: lib/RT/Action/Generic.pm:160
+msgid "Prepare Stubbed"
+msgstr "Bereid Plaatshouder Voor"
+
+#: html/Ticket/Elements/Tabs:61
+msgid "Prev"
+msgstr "Vorige"
+
+#: html/Search/Listing.html:44
+msgid "Previous page"
+msgstr "Vorige pagina"
+
+#: NOT FOUND IN SOURCE
+msgid "Pri"
+msgstr "Pri"
+
+#: lib/RT/ACE_Overlay.pm:133 lib/RT/ACE_Overlay.pm:208 lib/RT/ACE_Overlay.pm:552
+#. ($args{'PrincipalId'})
+msgid "Principal %1 not found."
+msgstr "Hoofd %1 niet gevonden."
+
+#: html/Search/Elements/PickRestriction:54 html/SelfService/Display.html:76 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:54 html/Ticket/Elements/ShowBasics:39 lib/RT/Tickets_Overlay.pm:1042
+msgid "Priority"
+msgstr "Prioriteit"
+
+#: html/Admin/Elements/ModifyQueue:51 html/Admin/Queues/Modify.html:65
+msgid "Priority starts at"
+msgstr "Prioriteit begint bij"
+
+#: etc/initialdata:25
+msgid "Privileged"
+msgstr "Gerechtigd"
+
+#: html/Admin/Users/Modify.html:271 html/User/Prefs.html:163
+#. (loc_fuzzy($msg))
+msgid "Privileged status: %1"
+msgstr "Gerechtigde status: %1"
+
+#: html/Admin/Users/index.html:62
+msgid "Privileged users"
+msgstr "Gerechtigde gebruikers"
+
+#: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
+msgid "Pseudogroup for internal use"
+msgstr "Pseudogroep voor intern gebruik"
+
+#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Elements/Quicksearch:29 html/Search/Elements/PickRestriction:46 html/SelfService/Create.html:35 html/SelfService/Display.html:68 html/Ticket/Create.html:38 html/Ticket/Elements/EditBasics:64 html/Ticket/Elements/ShowBasics:43 html/User/Elements/DelegateRights:80 lib/RT/Tickets_Overlay.pm:883
+msgid "Queue"
+msgstr "Rij"
+
+#: html/Admin/Queues/CustomField.html:42 html/Admin/Queues/Scrip.html:50 html/Admin/Queues/Scrips.html:46 html/Admin/Queues/Templates.html:43
+#. ($Queue)
+#. ($id)
+msgid "Queue %1 not found"
+msgstr "Rij %1 niet gevonden"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue '%1' not found\\n"
+msgstr "Rij '%1' niet gevonden\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Keyword Selections"
+msgstr ""
+
+#: html/Admin/Elements/ModifyQueue:31 html/Admin/Queues/Modify.html:43
+msgid "Queue Name"
+msgstr "Rij Naam"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Scrips"
+msgstr "Rij Scrips"
+
+#: lib/RT/Queue_Overlay.pm:263
+msgid "Queue already exists"
+msgstr "Rij bestaat al"
+
+#: lib/RT/Queue_Overlay.pm:272 lib/RT/Queue_Overlay.pm:278
+msgid "Queue could not be created"
+msgstr "Rij kon niet aangemaakt worden"
+
+#: html/Ticket/Create.html:209
+msgid "Queue could not be loaded."
+msgstr "Rij kon niet geladen worden."
+
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:282
+msgid "Queue created"
+msgstr "Rij aangemaakt"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue is not specified."
+msgstr "Rij is niet gespecificeerd"
+
+#: html/SelfService/Display.html:129
+msgid "Queue not found"
+msgstr "Rij niet gevonden"
+
+#: html/Admin/Elements/Tabs:38 html/Admin/index.html:35
+msgid "Queues"
+msgstr "Rijen"
+
+#: html/Elements/Login:34
+#. ($RT::VERSION)
+msgid "RT %1"
+msgstr "RT %1"
+
+#: docs/design_docs/string-extraction-guide.txt:70
+#. ($RT::VERSION, $RT::rtname)
+msgid "RT %1 for %2"
+msgstr "RT %1 voor %2"
+
+#: html/Elements/Footer:32
+#. ($RT::VERSION)
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr "RT %1 van <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr ""
+
+#: html/Admin/index.html:25 html/Admin/index.html:26
+msgid "RT Administration"
+msgstr "RT Beheer"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Authentication error."
+msgstr "RT Authenticatie fout"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Bounce: %1"
+msgstr "RT Doorgestuurd: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Configuration error"
+msgstr "RT Configuratie fout"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Critical error. Message not recorded!"
+msgstr "RT Kritieke fout: Bericht niet bewaard!"
+
+#: html/Elements/Error:41 html/SelfService/Error.html:41
+msgid "RT Error"
+msgstr "RT Fout"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Received mail (%1) from itself."
+msgstr "RT Ontving mail (%1) van zichzelf."
+
+#: NOT FOUND IN SOURCE
+msgid "RT Recieved mail (%1) from itself."
+msgstr ""
+
+#: html/SelfService/Closed.html:25
+msgid "RT Self Service / Closed Tickets"
+msgstr "RT Zelfbediening / Afgesloten Tickets"
+
+#: html/index.html:25 html/index.html:28
+msgid "RT at a glance"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't authenticate you"
+msgstr "RT kon u niet authenticeren"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find requestor via its external database lookup"
+msgstr "RT kon de verzoeker niet vinden in zijn interne database"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find the queue: %1"
+msgstr "RT kon de rij %1 niet vinden"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't validate this PGP signature. \\n"
+msgstr "RT kon deze PGP signatuur niet valideren. \\n"
+
+#: html/Elements/PageLayout:26
+#. ($RT::rtname)
+msgid "RT for %1"
+msgstr "RT voor %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr "RT voor %1: %2"
+
+#: NOT FOUND IN SOURCE
+msgid "RT has proccessed your commands"
+msgstr "RT heeft uw commando's verwerkt"
+
+#: html/Elements/Login:83
+#. ('2003')
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  Het is gedistribueerd onder <a href=\"http://www.gnu.org/copyleft/gpl.html\">Versie 2 van de GNU General Public License.</a>""
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT thinks this message may be a bounce"
+msgstr "RT denkt dat dit bericht onbestelbaar zou kunnen zijn"
+
+#: NOT FOUND IN SOURCE
+msgid "RT will process this message as if it were unsigned.\\n"
+msgstr "RT zal dit bericht verwerken als of het ongesigneerd is.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+msgstr "RT's email commando modus vereist PGP authenticatie.  Of u heeft uw bericht niet gesigneerd, of uw signatuur kon niet geverifieerd worden."
+
+#: html/Admin/Users/Modify.html:58 html/Admin/Users/Prefs.html:52 html/User/Prefs.html:44
+msgid "Real Name"
+msgstr "Echte Naam"
+
+#: html/Admin/Elements/ModifyUser:48
+msgid "RealName"
+msgstr "EchteNaam"
+
+#: html/Ticket/Create.html:185 html/Ticket/Elements/EditLinks:139 html/Ticket/Elements/EditLinks:94 html/Ticket/Elements/ShowLinks:63
+msgid "Referred to by"
+msgstr "Naar gerefeerd door"
+
+#: html/Elements/SelectLinkType:28 html/Ticket/Create.html:184 html/Ticket/Elements/EditLinks:135 html/Ticket/Elements/EditLinks:80 html/Ticket/Elements/ShowLinks:55
+msgid "Refers to"
+msgstr "Refereert aan"
+
+#: NOT FOUND IN SOURCE
+msgid "RefersTo"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Refine"
+msgstr "Verfijn"
+
+#: html/Search/Elements/PickRestriction:27
+msgid "Refine search"
+msgstr "Verfijn Zoekopdracht"
+
+#: html/Elements/Refresh:36
+#. ($value/60)
+msgid "Refresh this page every %1 minutes."
+msgstr "Ververs deze pagina elke %1 minuten."
+
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:60 html/Ticket/ModifyAll.html:57
+msgid "Relationships"
+msgstr "Relaties"
+
+#: html/Search/Bulk.html:93
+msgid "Remove AdminCc"
+msgstr "Verwijder AdminCc"
+
+#: html/Search/Bulk.html:91
+msgid "Remove Cc"
+msgstr "Verwijder Cc"
+
+#: html/Search/Bulk.html:89
+msgid "Remove Requestor"
+msgstr "Verwijder Verzoeker"
+
+#: html/Ticket/Elements/ShowTransaction:173 html/Ticket/Elements/Tabs:122
+msgid "Reply"
+msgstr "Antwoord"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "Reply to tickets"
+msgstr "Antwoord op tickets"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "ReplyToTicket"
+msgstr "AntwoordOpTicket"
+
+#: etc/initialdata:44 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:87
+msgid "Requestor"
+msgstr "Verzoeker"
+
+#: html/Search/Elements/PickRestriction:38
+msgid "Requestor email address"
+msgstr "Verzoeker email adres"
+
+#: NOT FOUND IN SOURCE
+msgid "Requestor(s)"
+msgstr "Verzoeker(s)"
+
+#: NOT FOUND IN SOURCE
+msgid "RequestorAddresses"
+msgstr ""
+
+#: html/SelfService/Create.html:43 html/SelfService/Display.html:42 html/Ticket/Create.html:56 html/Ticket/Elements/EditPeople:48 html/Ticket/Elements/ShowPeople:31
+msgid "Requestors"
+msgstr "Verzoekers"
+
+#: html/Admin/Elements/ModifyQueue:61 html/Admin/Queues/Modify.html:75
+msgid "Requests should be due in"
+msgstr "Verzoek is terug verwacht"
+
+#: html/Elements/Submit:62
+msgid "Reset"
+msgstr "Herstel"
+
+#: html/Admin/Users/Modify.html:159 html/User/Prefs.html:50
+msgid "Residence"
+msgstr "Woonplaats"
+
+#: html/Ticket/Elements/Tabs:132
+msgid "Resolve"
+msgstr "Los op"
+
+#: html/Ticket/Update.html:133
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Resolve ticket #%1 (%2)"
+msgstr "Los ticket #%1 (%2) op"
+
+#: etc/initialdata:302 html/Elements/SelectDateType:28 lib/RT/Ticket_Overlay.pm:1170
+msgid "Resolved"
+msgstr "Opgelost"
+
+#: html/Search/Bulk.html:123 html/Ticket/ModifyAll.html:73 html/Ticket/Update.html:73
+msgid "Response to requestors"
+msgstr "Antwoord aan verzoekers"
+
+#: html/Elements/ListActions:26
+msgid "Results"
+msgstr "Resultaten"
+
+#: html/Search/Elements/PickRestriction:105
+msgid "Results per page"
+msgstr "Resultaten per pagina"
+
+#: html/Admin/Elements/ModifyUser:33 html/Admin/Users/Modify.html:100 html/User/Prefs.html:72
+msgid "Retype Password"
+msgstr "Type wachtwoord opnieuw"
+
+#: NOT FOUND IN SOURCE
+msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+msgstr "Recht %1 niet gevonden voor %2  %3 in bereik %4 (%5)\\n"
+
+#: lib/RT/ACE_Overlay.pm:613
+msgid "Right Delegated"
+msgstr "Recht Gedelegeerd"
+
+#: lib/RT/ACE_Overlay.pm:303
+msgid "Right Granted"
+msgstr "Recht Toegekend"
+
+#: lib/RT/ACE_Overlay.pm:161
+msgid "Right Loaded"
+msgstr "Recht Geladen"
+
+#: lib/RT/ACE_Overlay.pm:678 lib/RT/ACE_Overlay.pm:693
+msgid "Right could not be revoked"
+msgstr "Recht kon niet afgenomen worden"
+
+#: html/User/Delegation.html:64
+msgid "Right not found"
+msgstr "Recht niet gevonden"
+
+#: lib/RT/ACE_Overlay.pm:543 lib/RT/ACE_Overlay.pm:638
+msgid "Right not loaded."
+msgstr "Recht niet geladen"
+
+#: lib/RT/ACE_Overlay.pm:689
+msgid "Right revoked"
+msgstr ""
+
+#: html/Admin/Elements/UserTabs:41
+msgid "Rights"
+msgstr "Rechten"
+
+#: lib/RT/Interface/Web.pm:758
+#. ($object_type)
+msgid "Rights could not be granted for %1"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:791
+#. ($object_type)
+msgid "Rights could not be revoked for %1"
+msgstr ""
+
+#: html/Admin/Global/GroupRights.html:51 html/Admin/Queues/GroupRights.html:52
+msgid "Roles"
+msgstr "Rollen"
+
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr "RootGoedkeuring"
+
+#: lib/RT/Date.pm:393
+msgid "Sat."
+msgstr "Za."
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
+msgid "Save Changes"
+msgstr "Bewaarwijzigingen"
+
+#: html/Ticket/ModifyLinks.html:39
+msgid "Save changes"
+msgstr "Bewaarwijzigingen"
+
+#: html/Admin/Global/Scrip.html:49
+#. ($ARGS{'id'})
+msgid "Scrip #%1"
+msgstr ""
+
+#: lib/RT/Scrip_Overlay.pm:176
+msgid "Scrip Created"
+msgstr "Scrip aangemaakt"
+
+#: html/Admin/Elements/EditScrips:84
+msgid "Scrip deleted"
+msgstr "Script verwijderd"
+
+#: html/Admin/Elements/QueueTabs:46 html/Admin/Elements/SystemTabs:33 html/Admin/Global/index.html:41
+msgid "Scrips"
+msgstr "Scrips"
+
+#: NOT FOUND IN SOURCE
+msgid "Scrips for %1\\n"
+msgstr "Scrips voor %1\\n"
+
+#: html/Admin/Queues/Scrips.html:33
+msgid "Scrips which apply to all queues"
+msgstr "Scrips welke betrekking hebben op alle rijen"
+
+#: html/Elements/SimpleSearch:27 html/Search/Elements/PickRestriction:126 html/Ticket/Elements/Tabs:159
+msgid "Search"
+msgstr "Zoek"
+
+#: NOT FOUND IN SOURCE
+msgid "Search Criteria"
+msgstr "Zoek Criteria"
+
+#: html/Approvals/Elements/PendingMyApproval:39
+msgid "Search for approvals"
+msgstr ""
+
+#: bin/rt-crontool:188
+msgid "Security:"
+msgstr "Veiligheid"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "SeeQueue"
+msgstr "ZieRij"
+
+#: html/Admin/Groups/index.html:40
+msgid "Select a group"
+msgstr "Selecteer een groep"
+
+#: NOT FOUND IN SOURCE
+msgid "Select a queue"
+msgstr "Selecteer een rij"
+
+#: html/Admin/Users/index.html:25 html/Admin/Users/index.html:28
+msgid "Select a user"
+msgstr "Selecteer een gebruiker"
+
+#: html/Admin/Global/CustomField.html:38 html/Admin/Global/CustomFields.html:36
+msgid "Select custom field"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:52 html/User/Elements/GroupTabs:50
+msgid "Select group"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:355
+msgid "Select multiple values"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:352
+msgid "Select one value"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:67
+msgid "Select queue"
+msgstr ""
+
+#: html/Admin/Global/Scrip.html:37 html/Admin/Global/Scrips.html:36 html/Admin/Queues/Scrip.html:40 html/Admin/Queues/Scrips.html:50
+msgid "Select scrip"
+msgstr ""
+
+#: html/Admin/Global/Template.html:57 html/Admin/Global/Templates.html:36 html/Admin/Queues/Template.html:55
+msgid "Select template"
+msgstr ""
+
+#: html/Admin/Elements/UserTabs:49
+msgid "Select user"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "SelectMultiple"
+msgstr "SelecteerMeerdere"
+
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectSingle"
+msgstr "SelecteerEnkele"
+
+#: html/SelfService/index.html:25
+msgid "Self Service"
+msgstr "Zelfbediening"
+
+#: etc/initialdata:114
+msgid "Send mail to all watchers"
+msgstr "Stuurt mail naar alle toeschouwers"
+
+#: etc/initialdata:110
+msgid "Send mail to all watchers as a \"comment\""
+msgstr "Stuurt mail naar alle toeschouwers als een \"commentaar\""
+
+#: etc/initialdata:105
+msgid "Send mail to requestors and Ccs"
+msgstr "Stuurt mail naar alle verzoekers en Ccs"
+
+#: etc/initialdata:100
+msgid "Send mail to requestors and Ccs as a comment"
+msgstr "Stuurt mail naar alle verzoekers en Ccs als een \"commentaar\""
+
+#: etc/initialdata:79
+msgid "Sends a message to the requestors"
+msgstr "Stuurt een bericht aan de verzoekers"
+
+#: etc/initialdata:118 etc/initialdata:122
+msgid "Sends mail to explicitly listed Ccs and Bccs"
+msgstr "Stuurt mail aan expliciet genoemde Ccs en Bccs"
+
+#: etc/initialdata:95
+msgid "Sends mail to the administrative Ccs"
+msgstr "Stuurt mail aan de administratieve Ccs"
+
+#: etc/initialdata:91
+msgid "Sends mail to the administrative Ccs as a comment"
+msgstr "Stuurt mail aan de administratieve Ccs als een \"commentaar\""
+
+#: etc/initialdata:83 etc/initialdata:87
+msgid "Sends mail to the owner"
+msgstr "Stuurt mail aan de eigenaar"
+
+#: lib/RT/Date.pm:419
+msgid "Sep."
+msgstr "Sep."
+
+#: NOT FOUND IN SOURCE
+msgid "September"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Show Results"
+msgstr "Toon Resultaten"
+
+#: html/Approvals/Elements/PendingMyApproval:44
+msgid "Show approved requests"
+msgstr "Toon goedgekeurde verzoeken"
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show basics"
+msgstr "Toon beginselen"
+
+#: html/Approvals/Elements/PendingMyApproval:45
+msgid "Show denied requests"
+msgstr "Toon afgewezen verzoeken"
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show details"
+msgstr "Toon details"
+
+#: html/Approvals/Elements/PendingMyApproval:43
+msgid "Show pending requests"
+msgstr "Toon hangende verzoeken"
+
+#: html/Approvals/Elements/PendingMyApproval:46
+msgid "Show requests awaiting other approvals"
+msgstr "Toon verzoeken die wachten op andere goedkeuringen"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "Show ticket private commentary"
+msgstr "Toon ticket privé commentaar"
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "Show ticket summaries"
+msgstr "Toon ticket samenvattingen"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "ShowACL"
+msgstr "ToonACL"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "ShowScrips"
+msgstr "ToonScrips"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "ShowTemplate"
+msgstr "ToonSjabloon"
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "ShowTicket"
+msgstr "ToonTicket"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "ShowTicketComments"
+msgstr "ToonTicketCommentaar"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Sign up as a ticket Requestor or ticket or queue Cc"
+msgstr "Schrijf in als een ticket Verzoeker of ticket of rij Cc"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "Sign up as a ticket or queue AdminCc"
+msgstr "Schrijf in als een ticket of rij AdminCc"
+
+#: html/Admin/Elements/ModifyUser:39 html/Admin/Users/Modify.html:191 html/Admin/Users/Prefs.html:32 html/SelfService/Prefs.html:37 html/User/Prefs.html:112
+msgid "Signature"
+msgstr "Signatuur"
+
+#: html/SelfService/Elements/Header:52
+#. ($session{'CurrentUser'}->Name)
+msgid "Signed in as %1"
+msgstr ""
+
+#: html/Admin/Elements/SelectSingleOrMultiple:26
+msgid "Single"
+msgstr "Enkel"
+
+#: html/Elements/Header:51
+msgid "Skip Menu"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFieldValues:31
+msgid "Sort key"
+msgstr "Sorteer sleutel"
+
+#: html/Search/Elements/PickRestriction:109
+msgid "Sort results by"
+msgstr "Sorteer resultaten op"
+
+#: html/Admin/Elements/AddCustomFieldValue:25
+msgid "SortOrder"
+msgstr "SorteerVolgorde"
+
+#: NOT FOUND IN SOURCE
+msgid "Stalled"
+msgstr "Blijft Steken"
+
+#: NOT FOUND IN SOURCE
+msgid "Start page"
+msgstr "Start pagina"
+
+#: html/Elements/SelectDateType:27 html/Ticket/Elements/EditDates:32 html/Ticket/Elements/ShowDates:35
+msgid "Started"
+msgstr "Gestart"
+
+#: NOT FOUND IN SOURCE
+msgid "Started date '%1' could not be parsed"
+msgstr "Startum '%1' kon niet ontleed worden"
+
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:27 html/Ticket/Elements/ShowDates:31
+msgid "Starts"
+msgstr "Begint"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts By"
+msgstr "Begint op"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts date '%1' could not be parsed"
+msgstr "Begindatum '%1' kon niet ontleed worden"
+
+#: html/Admin/Elements/ModifyUser:82 html/Admin/Users/Modify.html:138 html/User/Prefs.html:94
+msgid "State"
+msgstr "Staat"
+
+#: html/Elements/MyRequests:31 html/Elements/MyTickets:31 html/Search/Elements/PickRestriction:74 html/SelfService/Display.html:59 html/SelfService/Elements/MyRequests:29 html/SelfService/Update.html:31 html/Ticket/Create.html:42 html/Ticket/Elements/EditBasics:38 html/Ticket/Elements/ShowBasics:31 html/Ticket/Update.html:60 lib/RT/Ticket_Overlay.pm:1164 lib/RT/Tickets_Overlay.pm:908
+msgid "Status"
+msgstr "Status"
+
+#: etc/initialdata:288
+msgid "Status Change"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:530
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
+msgid "Status changed from %1 to %2"
+msgstr "Status veranderd van %1 naar %2"
+
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr "StatusVerandering"
+
+#: html/Ticket/Elements/Tabs:147
+msgid "Steal"
+msgstr "Steel"
+
+#: lib/RT/Transaction_Overlay.pm:589
+#. ($Old->Name)
+msgid "Stolen from %1 "
+msgstr "Gestolen van %1"
+
+#: html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Search/Bulk.html:126 html/Search/Elements/PickRestriction:43 html/SelfService/Create.html:59 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:35 html/Ticket/Create.html:84 html/Ticket/Elements/EditBasics:28 html/Ticket/ModifyAll.html:79 html/Ticket/Update.html:77 lib/RT/Ticket_Overlay.pm:1160 lib/RT/Tickets_Overlay.pm:987
+msgid "Subject"
+msgstr "Onderwerp"
+
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/Transaction_Overlay.pm:611
+#. ($self->Data)
+msgid "Subject changed to %1"
+msgstr "Onderwerp veranderd naar %1"
+
+#: html/Elements/Submit:59
+msgid "Submit"
+msgstr "Registreer"
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr "Registreer Workflow"
+
+#: lib/RT/Group_Overlay.pm:749
+msgid "Succeeded"
+msgstr "Gelukt"
+
+#: lib/RT/Date.pm:394
+msgid "Sun."
+msgstr "Zo."
+
+#: lib/RT/System.pm:54
+msgid "SuperUser"
+msgstr "SuperGebruiker"
+
+#: html/User/Elements/DelegateRights:77
+msgid "System"
+msgstr "Systeem"
+
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:567 lib/RT/Interface/Web.pm:757 lib/RT/Interface/Web.pm:790
+msgid "System Error"
+msgstr "Systeem Fout"
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. Right not granted."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. right not granted"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:616
+msgid "System error. Right not delegated."
+msgstr "Systeem fout. Recht niet gedelegeerd."
+
+#: lib/RT/ACE_Overlay.pm:146 lib/RT/ACE_Overlay.pm:223 lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:898
+msgid "System error. Right not granted."
+msgstr "Systeem fout. Recht niet toegekend."
+
+#: NOT FOUND IN SOURCE
+msgid "System error. Unable to grant rights."
+msgstr "Systeem fout. Niet mogelijk om rechten toe te kennen"
+
+#: html/Admin/Global/GroupRights.html:35 html/Admin/Groups/GroupRights.html:37 html/Admin/Queues/GroupRights.html:36
+msgid "System groups"
+msgstr "Systeem groepen"
+
+#: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
+msgid "SystemRolegroup for internal use"
+msgstr "SysteemRolgroep voor intern gebruik"
+
+#: lib/RT/CurrentUser.pm:320
+msgid "TEST_STRING"
+msgstr "TEST_STRING"
+
+#: html/Ticket/Elements/Tabs:143
+msgid "Take"
+msgstr "Neem"
+
+#: lib/RT/Transaction_Overlay.pm:575
+msgid "Taken"
+msgstr "Genomen"
+
+#: html/Admin/Elements/EditScrip:81
+msgid "Template"
+msgstr "Sjabloon"
+
+#: html/Admin/Global/Template.html:91 html/Admin/Queues/Template.html:90
+#. ($TemplateObj->Id())
+msgid "Template #%1"
+msgstr ""
+
+#: html/Admin/Elements/EditTemplates:89
+msgid "Template deleted"
+msgstr ""
+
+#: lib/RT/Scrip_Overlay.pm:153
+msgid "Template not found"
+msgstr "Sjabloon niet gevonden"
+
+#: NOT FOUND IN SOURCE
+msgid "Template not found\\n"
+msgstr "Sjabloon niet gevonden\\n"
+
+#: lib/RT/Template_Overlay.pm:347
+msgid "Template parsed"
+msgstr "Sjabloon ontleed"
+
+#: html/Admin/Elements/QueueTabs:49 html/Admin/Elements/SystemTabs:36 html/Admin/Global/index.html:45
+msgid "Templates"
+msgstr "Sjablonen"
+
+#: NOT FOUND IN SOURCE
+msgid "Templates for %1\\n"
+msgstr "Sjablonen voor %1\\n"
+
+#: lib/RT/Interface/Web.pm:858
+msgid "That is already the current value"
+msgstr "Dat is al de huidige waarde"
+
+#: lib/RT/CustomField_Overlay.pm:178
+msgid "That is not a value for this custom field"
+msgstr "Dat is geen waarde voor dit specifieke veld"
+
+#: lib/RT/Ticket_Overlay.pm:1886
+msgid "That is the same value"
+msgstr "Dat is de zelfde waarde"
+
+#: lib/RT/Queue_Overlay.pm:633
+#. ($args{'Type'})
+msgid "That principal is already a %1 for this queue"
+msgstr "Dat hoofd is reeds een %1 voor deze rij"
+
+#: lib/RT/Ticket_Overlay.pm:1434
+#. ($self->loc($args{'Type'}))
+msgid "That principal is already a %1 for this ticket"
+msgstr "Dat hoofd is reeds een %1 voor dit ticket"
+
+#: lib/RT/Queue_Overlay.pm:732
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this queue"
+msgstr "Dat hoofd is geen %1 voor deze rij"
+
+#: lib/RT/Ticket_Overlay.pm:1551
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this ticket"
+msgstr "Dat hoofd is geen %1 voor dit ticket"
+
+#: lib/RT/Ticket_Overlay.pm:1882
+msgid "That queue does not exist"
+msgstr "Die rij bestaat niet"
+
+#: lib/RT/Ticket_Overlay.pm:3143
+msgid "That ticket has unresolved dependencies"
+msgstr "Dat ticket heeft onopgeloste afhankelijkheden"
+
+#: lib/RT/ACE_Overlay.pm:288 lib/RT/ACE_Overlay.pm:597
+msgid "That user already has that right"
+msgstr "Die gebruiker heeft dat recht reeds"
+
+#: lib/RT/Ticket_Overlay.pm:2952
+msgid "That user already owns that ticket"
+msgstr "Die gebruiker is al eigenaar van dat ticket"
+
+#: lib/RT/Ticket_Overlay.pm:2918
+msgid "That user does not exist"
+msgstr "Die gebruiker bestaat niet"
+
+#: lib/RT/User_Overlay.pm:315
+msgid "That user is already privileged"
+msgstr "Die gebruiker is al gerechtigd"
+
+#: lib/RT/User_Overlay.pm:332
+msgid "That user is already unprivileged"
+msgstr "Die gebruiker is reeds ontrechtigd"
+
+#: lib/RT/User_Overlay.pm:327
+msgid "That user is now privileged"
+msgstr "Die gebruiker is nu gerechtigd"
+
+#: lib/RT/User_Overlay.pm:344
+msgid "That user is now unprivileged"
+msgstr "Die gebruiker is nu ontrechtigd"
+
+#: NOT FOUND IN SOURCE
+msgid "That user is now unprivilegedileged"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2944
+msgid "That user may not own tickets in that queue"
+msgstr "Die gebruiker mag geen eigenaar zijn van tickets in die rij"
+
+#: lib/RT/Link_Overlay.pm:206
+msgid "That's not a numerical id"
+msgstr "Dat is niet een numeriek ID"
+
+#: html/Ticket/Create.html:150 html/Ticket/Elements/ShowSummary:28
+msgid "The Basics"
+msgstr "De Beginselen"
+
+#: lib/RT/ACE_Overlay.pm:88
+msgid "The CC of a ticket"
+msgstr "De CC van een ticket"
+
+#: lib/RT/ACE_Overlay.pm:89
+msgid "The administrative CC of a ticket"
+msgstr "De administratieve CC van een ticket"
+
+#: lib/RT/Ticket_Overlay.pm:2213
+msgid "The comment has been recorded"
+msgstr "Het commentaar is bewaard"
+
+#: bin/rt-crontool:198
+msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
+msgstr "Het volgende commando zal alle actieve tickets in de rij 'general' vinden en hun prioriteit op 99 zetten als ze meer dan 4 uur niet aangeraakt zijn:"
+
+#: bin/rt-commit-handler:756 bin/rt-commit-handler:766
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr "De volgende commando's zijn niet verwerkt:\\n\\n"
+
+#: lib/RT/Interface/Web.pm:861
+msgid "The new value has been set."
+msgstr "De waarde is gezet."
+
+#: lib/RT/ACE_Overlay.pm:86
+msgid "The owner of a ticket"
+msgstr "De eigenaar van een ticket"
+
+#: lib/RT/ACE_Overlay.pm:87
+msgid "The requestor of a ticket"
+msgstr "De verzoeker van een ticket"
+
+#: html/Admin/Elements/EditUserComments:26
+msgid "These comments aren't generally visible to the user"
+msgstr "Dit commentaar is gewoonlijk niet zichtbaar voor de gebruiker"
+
+#: NOT FOUND IN SOURCE
+msgid "This ticket %1 %2 (%3)\\n"
+msgstr "Dit ticket %1 %2 (%3)\\n"
+
+#: bin/rt-crontool:189
+msgid "This tool allows the user to run arbitrary perl modules from within RT."
+msgstr "Dit gereedschap stelt de gebruiker in staat arbitraire perl modules te gebruiken vanuit RT"
+
+#: lib/RT/Transaction_Overlay.pm:253
+msgid "This transaction appears to have no content"
+msgstr "Het lijkt erop alsof deze transactie geen inhoud heeft"
+
+#: html/Ticket/Elements/ShowRequestor:47
+#. ($rows)
+msgid "This user's %1 highest priority tickets"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "This user's 25 highest priority tickets"
+msgstr "De 25 hoogste prioriteit tickets van deze gebruiker"
+
+#: lib/RT/Date.pm:391
+msgid "Thu."
+msgstr "Do."
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1  %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1 Jumbo update: %2"
+msgstr ""
+
+#: html/Ticket/ModifyAll.html:25 html/Ticket/ModifyAll.html:29
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket #%1 Jumbo update: %2"
+msgstr "Ticket #%1 Jumbo actualisering: %2"
+
+#: html/Approvals/Elements/ShowDependency:46
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Ticket #%1: %2"
+msgstr "Ticket #%1: %2"
+
+#: lib/RT/Ticket_Overlay.pm:608
+#. ($self->Id, $QueueObj->Name)
+msgid "Ticket %1 created in queue '%2'"
+msgstr "Ticket %1 aangemaakt in rij '%2'"
+
+#: bin/rt-commit-handler:760
+#. ($Ticket->Id)
+msgid "Ticket %1 loaded\\n"
+msgstr "Toclet %1 geladen\\n"
+
+#: html/Search/Bulk.html:181
+#. ($Ticket->Id,$_)
+msgid "Ticket %1: %2"
+msgstr "Ticket %1: %2"
+
+#: html/Ticket/History.html:25 html/Ticket/History.html:28
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket History # %1 %2"
+msgstr "Ticket Historie # %1 %2"
+
+#: html/SelfService/Display.html:34
+msgid "Ticket Id"
+msgstr "Ticket Id"
+
+#: etc/initialdata:303
+msgid "Ticket Resolved"
+msgstr "Ticket Opgelost"
+
+#: html/Search/Elements/PickRestriction:63
+msgid "Ticket attachment"
+msgstr "Ticket aanhechting"
+
+#: lib/RT/Tickets_Overlay.pm:1166
+msgid "Ticket content"
+msgstr "Ticket inhoud"
+
+#: lib/RT/Tickets_Overlay.pm:1212
+msgid "Ticket content type"
+msgstr "Ticket inhoud type"
+
+#: lib/RT/Ticket_Overlay.pm:495 lib/RT/Ticket_Overlay.pm:597
+msgid "Ticket could not be created due to an internal error"
+msgstr "Ticket kong niet aangemaakt worden vanwege een interne fout"
+
+#: lib/RT/Transaction_Overlay.pm:522
+msgid "Ticket created"
+msgstr "Ticket aangemaakt"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket creation failed"
+msgstr "Ticket aanmaken gefaald"
+
+#: lib/RT/Transaction_Overlay.pm:527
+msgid "Ticket deleted"
+msgstr "Ticket verwijderd"
+
+#: html/REST/1.0/modify:29 html/REST/1.0/update:34
+msgid "Ticket id not found"
+msgstr "Ticket id niet gevonden"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket killed"
+msgstr ""
+
+#: html/REST/1.0/modify:36 html/REST/1.0/update:41
+msgid "Ticket not found"
+msgstr "Ticket niet gevonden"
+
+#: etc/initialdata:289
+msgid "Ticket status changed"
+msgstr "Ticket status gewijzigd"
+
+#: html/Ticket/Update.html:39
+msgid "Ticket watchers"
+msgstr "Ticket toeschouwers"
+
+#: html/Elements/Tabs:49
+msgid "Tickets"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1383
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr "Tickets %1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:1348
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr "Tickets %1 door %2"
+
+#: html/Elements/ViewUser:26
+#. ($name)
+msgid "Tickets from %1"
+msgstr "Tickets van %1"
+
+#: html/Approvals/Elements/ShowDependency:27
+msgid "Tickets which depend on this approval:"
+msgstr "Tickets welke afhankelijk zijn van deze goedkeuring"
+
+#: html/Ticket/Create.html:157 html/Ticket/Elements/EditBasics:48
+msgid "Time Left"
+msgstr "Tijd Over"
+
+#: html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:43
+msgid "Time Worked"
+msgstr "Tijd Gewerkt"
+
+#: lib/RT/Tickets_Overlay.pm:1139
+msgid "Time left"
+msgstr "Tijd over"
+
+#: html/Elements/Footer:36
+msgid "Time to display"
+msgstr "Tijd om te tonen"
+
+#: lib/RT/Tickets_Overlay.pm:1115
+msgid "Time worked"
+msgstr "Tijd gewerkt"
+
+#: NOT FOUND IN SOURCE
+msgid "TimeLeft"
+msgstr "TijdOver"
+
+#: lib/RT/Ticket_Overlay.pm:1165
+msgid "TimeWorked"
+msgstr "TijdGewerkt"
+
+#: bin/rt-commit-handler:402
+msgid "To generate a diff of this commit:"
+msgstr "Om een diff van deze uitvoering te genereren:"
+
+#: bin/rt-commit-handler:391
+msgid "To generate a diff of this commit:\\n"
+msgstr "Om een diff van deze uitvoering te genereren:\\n"
+
+#: lib/RT/Ticket_Overlay.pm:1168
+msgid "Told"
+msgstr "Verteld"
+
+#: etc/initialdata:237
+msgid "Transaction"
+msgstr "Transactie"
+
+#: lib/RT/Transaction_Overlay.pm:642
+#. ($self->Data)
+msgid "Transaction %1 purged"
+msgstr "Transactie %1 gezuiverd"
+
+#: lib/RT/Transaction_Overlay.pm:177
+msgid "Transaction Created"
+msgstr "Transactie Gecreëerd"
+
+#: lib/RT/Transaction_Overlay.pm:89
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr "Transactie->Creëer kon niet, aangezien u geen ticket id gespecificeerd heeft"
+
+#: lib/RT/Transaction_Overlay.pm:701
+msgid "Transactions are immutable"
+msgstr "Transacties zijn onwijzigbaar"
+
+#: NOT FOUND IN SOURCE
+msgid "Trying to delete a right: %1"
+msgstr "Tracht een recht te verwijderen: %1"
+
+#: lib/RT/Date.pm:389
+msgid "Tue."
+msgstr "Di."
+
+#: html/Admin/Elements/EditCustomField:34 html/Ticket/Elements/AddWatchers:33 html/Ticket/Elements/AddWatchers:44 html/Ticket/Elements/AddWatchers:54 lib/RT/Ticket_Overlay.pm:1166 lib/RT/Tickets_Overlay.pm:959
+msgid "Type"
+msgstr "Type"
+
+#: lib/RT/ScripCondition_Overlay.pm:104
+msgid "Unimplemented"
+msgstr "Niet geïmplementeerd"
+
+#: html/Admin/Users/Modify.html:68
+msgid "Unix login"
+msgstr "Unix aanmelden"
+
+#: html/Admin/Elements/ModifyUser:62
+msgid "UnixUsername"
+msgstr "UnixGebruikersnaam"
+
+#: lib/RT/Attachment_Overlay.pm:265
+#. ($self->ContentEncoding)
+msgid "Unknown ContentEncoding %1"
+msgstr "Onbekende InhoudCodering %1"
+
+#: html/Elements/SelectResultsPerPage:37
+msgid "Unlimited"
+msgstr "Ongelimiteerd"
+
+#: etc/initialdata:32
+msgid "Unprivileged"
+msgstr "Ongerechtigd"
+
+#: lib/RT/Transaction_Overlay.pm:571
+msgid "Untaken"
+msgstr "Vrij"
+
+#: html/Elements/MyTickets:64 html/Search/Bulk.html:33
+msgid "Update"
+msgstr "Ververs"
+
+#: html/Admin/Users/Prefs.html:62
+msgid "Update ID"
+msgstr "Ververs ID"
+
+#: html/Search/Bulk.html:120 html/Ticket/ModifyAll.html:66 html/Ticket/Update.html:67
+msgid "Update Type"
+msgstr "Ververs Type"
+
+#: html/Search/Listing.html:61
+msgid "Update all these tickets at once"
+msgstr "Ververs al deze tickets in eens"
+
+#: html/Admin/Users/Prefs.html:49
+msgid "Update email"
+msgstr "Ververs email"
+
+#: html/Admin/Users/Prefs.html:55
+msgid "Update name"
+msgstr "Ververs naam"
+
+#: lib/RT/Interface/Web.pm:375
+msgid "Update not recorded."
+msgstr "Verversing niet opgeslagen."
+
+#: html/Search/Bulk.html:81
+msgid "Update selected tickets"
+msgstr "Ververs geselecteerde tickets"
+
+#: html/Admin/Users/Prefs.html:36
+msgid "Update signature"
+msgstr "Ververs signatuur"
+
+#: html/Ticket/ModifyAll.html:63
+msgid "Update ticket"
+msgstr "Ververs ticket"
+
+#: html/SelfService/Update.html:25 html/SelfService/Update.html:27
+#. ($Ticket->id)
+msgid "Update ticket # %1"
+msgstr "Ververs ticket # %1"
+
+#: html/SelfService/Update.html:50
+#. ($Ticket->id)
+msgid "Update ticket #%1"
+msgstr "Ververs ticket #%1"
+
+#: html/Ticket/Update.html:135
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Update ticket #%1 (%2)"
+msgstr "Ververs ticket #%1 (%2)"
+
+#: lib/RT/Interface/Web.pm:373
+msgid "Update type was neither correspondence nor comment."
+msgstr "Verversingstype was noch correspondentie, noch commentaar"
+
+#: html/Elements/SelectDateType:33 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1169
+msgid "Updated"
+msgstr "Ververst"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 %2: %3\\n"
+msgstr "Gebruiker %1 %2: %3\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 Password: %2\\n"
+msgstr "Gebruiker %1 Wachtwoord: %2\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found"
+msgstr "Gebruiker '%1' niet gevonden"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found\\n"
+msgstr "Gebruiker '%1' niet gevonden\\n"
+
+#: etc/initialdata:125 etc/initialdata:191
+msgid "User Defined"
+msgstr "Gebruiker Gedifiniëerd"
+
+#: html/Admin/Users/Prefs.html:59
+msgid "User ID"
+msgstr "GebruikersID"
+
+#: html/Elements/SelectUsers:26
+msgid "User Id"
+msgstr "Gebruiker Id"
+
+#: html/Admin/Elements/GroupTabs:47 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/SystemTabs:47 html/Admin/Global/index.html:59
+msgid "User Rights"
+msgstr "Gebruikersrechten"
+
+#: html/Admin/Users/Modify.html:226
+#. ($msg)
+msgid "User could not be created: %1"
+msgstr "Gebruiker kon niet aangemaakt worden: %1"
+
+#: lib/RT/User_Overlay.pm:262
+msgid "User created"
+msgstr "Gebruiker aangemaakt"
+
+#: html/Admin/Global/GroupRights.html:67 html/Admin/Groups/GroupRights.html:54 html/Admin/Queues/GroupRights.html:68
+msgid "User defined groups"
+msgstr "Door gebruiker gedefiniëerde groepen"
+
+#: NOT FOUND IN SOURCE
+msgid "User notified"
+msgstr "Gebruiker verwittigd"
+
+#: html/Admin/Users/Prefs.html:25 html/Admin/Users/Prefs.html:29
+msgid "User view"
+msgstr "Gebruikers aanzicht"
+
+#: html/Admin/Users/Modify.html:48 html/Elements/Login:42 html/Ticket/Elements/AddWatchers:35
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+#: html/Admin/Elements/SelectNewGroupMembers:26 html/Admin/Elements/Tabs:32 html/Admin/Groups/Members.html:55 html/Admin/Queues/People.html:68 html/Admin/index.html:29 html/User/Groups/Members.html:58
+msgid "Users"
+msgstr "Gebruikers"
+
+#: html/Admin/Users/index.html:65
+msgid "Users matching search criteria"
+msgstr "Gebruikers die voldoen aan de zoek criteria"
+
+#: html/Search/Elements/PickRestriction:51
+msgid "ValueOfQueue"
+msgstr "WaardeVanRij"
+
+#: html/Admin/Elements/EditCustomField:40
+msgid "Values"
+msgstr "Waarden"
+
+#: NOT FOUND IN SOURCE
+msgid "VrijevormEnkele"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Watch"
+msgstr "Schouw toe"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "WatchAsAdminCc"
+msgstr "SchouwToeAlsAdminCc"
+
+#: NOT FOUND IN SOURCE
+msgid "Watcher loaded"
+msgstr "Toeschouwer geladen"
+
+#: html/Admin/Elements/QueueTabs:42
+msgid "Watchers"
+msgstr "Toeschouwers"
+
+#: html/Admin/Elements/ModifyUser:56
+msgid "WebEncoding"
+msgstr "WebCodering"
+
+#: lib/RT/Date.pm:390
+msgid "Wed."
+msgstr "Wo."
+
+#: etc/upgrade/2.1.71:161
+msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
+msgstr "Wanneer een ticket goedgekeurd is door alle goedkeurders, voeg correspondentie toe aan het orginele ticket"
+
+#: etc/upgrade/2.1.71:135
+msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
+msgstr "Wanneer een ticket goedgekeurd is door een goedkeurder, voeg correspondentie toe aan het orginele ticket"
+
+#: etc/initialdata:138
+msgid "When a ticket is created"
+msgstr "Wanneer een ticket is aangemaakt"
+
+#: etc/upgrade/2.1.71:79
+msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
+msgstr "Wanneer een goedkeuringsticket is aangemaakts, verwittig de Eigenaar en de AdminCc van het onderwerp dat op hun goedkeuring wacht"
+
+#: etc/initialdata:143
+msgid "When anything happens"
+msgstr "Wanneer iets gebeurt"
+
+#: etc/initialdata:184
+msgid "Whenever a ticket is resolved"
+msgstr "Wanneer een ticket is opgelost"
+
+#: etc/initialdata:170
+msgid "Whenever a ticket's owner changes"
+msgstr "Wanneer de eigenaar van een ticket verandert"
+
+#: etc/initialdata:178
+msgid "Whenever a ticket's queue changes"
+msgstr "Wanneer de rij van een ticket verandert"
+
+#: etc/initialdata:162
+msgid "Whenever a ticket's status changes"
+msgstr "Wanneer de status van een ticket verandert"
+
+#: etc/initialdata:192
+msgid "Whenever a user-defined condition occurs"
+msgstr "Wanneer een door de gebruiker gedifiniëerde voorwaarde gebeurt"
+
+#: etc/initialdata:156
+msgid "Whenever comments come in"
+msgstr "Wanneer commentaar binnenkomt"
+
+#: etc/initialdata:149
+msgid "Whenever correspondence comes in"
+msgstr "Wanneer correspondentie binnenkomt"
+
+#: html/Admin/Users/Modify.html:164 html/User/Prefs.html:52
+msgid "Work"
+msgstr "Werk"
+
+#: html/Admin/Elements/ModifyUser:70
+msgid "WorkPhone"
+msgstr "WerkTelefoon"
+
+#: html/SelfService/Display.html:86 html/Ticket/Elements/ShowBasics:35 html/Ticket/Update.html:65
+msgid "Worked"
+msgstr "Gewerkt"
+
+#: lib/RT/Ticket_Overlay.pm:3056
+msgid "You already own this ticket"
+msgstr "U bent al eigenaar van dit ticket"
+
+#: html/autohandler:121
+msgid "You are not an authorized user"
+msgstr "U bent geen geauthorizeerde gebruiker"
+
+#: lib/RT/Ticket_Overlay.pm:2930
+msgid "You can only reassign tickets that you own or that are unowned"
+msgstr "U kunt alleen tickets opnieuw toe bedelen die van u zijn, of van niemand"
+
+#: NOT FOUND IN SOURCE
+msgid "You don't have permission to view that ticket.\\n"
+msgstr "U heeft geen toestemming om dat ticket te bekijken"
+
+#: docs/design_docs/string-extraction-guide.txt:47
+#. ($num, $queue)
+msgid "You found %1 tickets in queue %2"
+msgstr "U vond %1 tickets in rij %2"
+
+#: html/NoAuth/Logout.html:31 html/REST/1.0/logout:25
+msgid "You have been logged out of RT."
+msgstr "U bent afgemeld bij RT"
+
+#: html/SelfService/Display.html:134
+msgid "You have no permission to create tickets in that queue."
+msgstr "U heeft geen toestemming om tickets aan te maken in die rij."
+
+#: lib/RT/Ticket_Overlay.pm:1895
+msgid "You may not create requests in that queue."
+msgstr "U mag geen verzoeken aanmaken in die rij"
+
+#: html/NoAuth/Logout.html:36
+msgid "You're welcome to login again"
+msgstr "U mag zich weer aanmelden"
+
+#: html/SelfService/Elements/MyRequests:25
+#. ($friendly_status)
+msgid "Your %1 requests"
+msgstr "Uw %1 verzoeken"
+
+#: NOT FOUND IN SOURCE
+msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
+msgstr "Uw RT beheerder heeft de mail-aliasses welke RT aanroepen verkeerd geconfigureerd"
+
+#: etc/initialdata:429 etc/upgrade/2.1.71:146
+msgid "Your request has been approved by %1. Other approvals may still be pending."
+msgstr "Uw verzoek is goedgekeurd door %1. Er zijn wellicht nog andere hangende goedkeuringen."
+
+#: etc/initialdata:463 etc/upgrade/2.1.71:180
+msgid "Your request has been approved."
+msgstr "Uw verzoek is goedgekeurd."
+
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr ""
+
+#: etc/initialdata:384 etc/upgrade/2.1.71:101
+msgid "Your request was rejected."
+msgstr "Uw verzoek was geweigerd."
+
+#: html/autohandler:136 html/autohandler:142
+msgid "Your username or password is incorrect"
+msgstr "Uw gebruikersnaam of wachtwoord zijn onjuist"
+
+#: html/Admin/Elements/ModifyUser:84 html/Admin/Users/Modify.html:144 html/User/Prefs.html:96
+msgid "Zip"
+msgstr "Postcode"
+
+#: NOT FOUND IN SOURCE
+msgid "[no subject]"
+msgstr ""
+
+#: html/User/Elements/DelegateRights:59
+#. ($right->PrincipalObj->Object->SelfDescription)
+msgid "as granted to %1"
+msgstr "zoals gegeven aan %1"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:34
+msgid "contains"
+msgstr "bevat"
+
+#: html/Elements/SelectAttachmentField:26
+msgid "content"
+msgstr "inhoud"
+
+#: html/Elements/SelectAttachmentField:27
+msgid "content-type"
+msgstr "inhoud-type"
+
+#: lib/RT/Ticket_Overlay.pm:2282
+msgid "correspondence (probably) not sent"
+msgstr "correspondentie (waarschijnlijk) niet verstuurd"
+
+#: lib/RT/Ticket_Overlay.pm:2292
+msgid "correspondence sent"
+msgstr "correspondentie verstuurd"
+
+#: html/Admin/Elements/ModifyQueue:63 html/Admin/Queues/Modify.html:77 lib/RT/Date.pm:319
+msgid "days"
+msgstr "dagen"
+
+#: NOT FOUND IN SOURCE
+msgid "dead"
+msgstr "dood"
+
+#: html/Search/Listing.html:75
+msgid "delete"
+msgstr "verwijder"
+
+#: lib/RT/Queue_Overlay.pm:63
+msgid "deleted"
+msgstr "verwijderd"
+
+#: html/Search/Elements/PickRestriction:68
+msgid "does not match"
+msgstr "voldoet niet aan"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:35
+msgid "doesn't contain"
+msgstr "bevat niet"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "equal to"
+msgstr "gelijk aan"
+
+#: NOT FOUND IN SOURCE
+msgid "false"
+msgstr ""
+
+#: html/Elements/SelectAttachmentField:28
+msgid "filename"
+msgstr "bestandsnaam"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "greater than"
+msgstr "groter dan"
+
+#: lib/RT/Group_Overlay.pm:194
+#. ($self->Name)
+msgid "group '%1'"
+msgstr "groep '%1'"
+
+#: lib/RT/Date.pm:315
+msgid "hours"
+msgstr "uren"
+
+#: NOT FOUND IN SOURCE
+msgid "id"
+msgstr "id"
+
+#: html/Elements/SelectBoolean:32 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88
+msgid "is"
+msgstr "is"
+
+#: html/Elements/SelectBoolean:36 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:37 html/Search/Elements/PickRestriction:48 html/Search/Elements/PickRestriction:77 html/Search/Elements/PickRestriction:89
+msgid "isn't"
+msgstr "is niet"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "less than"
+msgstr "minder dan"
+
+#: html/Search/Elements/PickRestriction:67
+msgid "matches"
+msgstr "voldoet aan"
+
+#: lib/RT/Date.pm:311
+msgid "min"
+msgstr "min"
+
+#: html/Ticket/Update.html:66
+msgid "minutes"
+msgstr "minuten"
+
+#: bin/rt-commit-handler:765
+msgid "modifications\\n\\n"
+msgstr "wijzigingen\\n\\n"
+
+#: lib/RT/Date.pm:327
+msgid "months"
+msgstr "maanden"
+
+#: lib/RT/Queue_Overlay.pm:58
+msgid "new"
+msgstr "nieuw"
+
+#: html/Admin/Elements/EditScrips:43
+msgid "no value"
+msgstr ""
+
+#: html/Ticket/Elements/EditWatchers:28
+msgid "none"
+msgstr "geen"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "not equal to"
+msgstr "niet gelijk aan"
+
+#: NOT FOUND IN SOURCE
+msgid "notlike"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:59
+msgid "open"
+msgstr "open"
+
+#: lib/RT/Group_Overlay.pm:199
+#. ($self->Name, $user->Name)
+msgid "personal group '%1' for user '%2'"
+msgstr "persoonlijke groep '%1' voor gebruiker '%2'"
+
+#: lib/RT/Group_Overlay.pm:207
+#. ($queue->Name, $self->Type)
+msgid "queue %1 %2"
+msgstr "rij %1 %2"
+
+#: lib/RT/Queue_Overlay.pm:62
+msgid "rejected"
+msgstr "geweigerd"
+
+#: lib/RT/Queue_Overlay.pm:61
+msgid "resolved"
+msgstr "opgelost"
+
+#: lib/RT/Date.pm:307
+msgid "sec"
+msgstr "sec"
+
+#: lib/RT/Queue_Overlay.pm:60
+msgid "stalled"
+msgstr "bleef steken"
+
+#: lib/RT/Group_Overlay.pm:202
+#. ($self->Type)
+msgid "system %1"
+msgstr "systeem %1"
+
+#: lib/RT/Group_Overlay.pm:213
+#. ($self->Type)
+msgid "system group '%1'"
+msgstr "systeem groep '%1'"
+
+#: html/Elements/Error:42 html/SelfService/Error.html:42
+msgid "the calling component did not specify why"
+msgstr "het aanroepende component specificeerde niet waarom"
+
+#: lib/RT/Group_Overlay.pm:210
+#. ($self->Instance, $self->Type)
+msgid "ticket #%1 %2"
+msgstr "ticket #%1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "true"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:216
+#. ($self->Id)
+msgid "undescribed group %1"
+msgstr "onbeschreven groep %1"
+
+#: NOT FOUND IN SOURCE
+msgid "undescripbed group %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:191
+#. ($user->Object->Name)
+msgid "user %1"
+msgstr "gebruiker %1"
+
+#: lib/RT/Date.pm:323
+msgid "weeks"
+msgstr "weken"
+
+#: NOT FOUND IN SOURCE
+msgid "with template %1"
+msgstr "met sjabloon %1"
+
+#: lib/RT/Date.pm:331
+msgid "years"
+msgstr "jaren"
+
diff --git a/rt/lib/RT/I18N/no.po b/rt/lib/RT/I18N/no.po
new file mode 100644
index 000000000..5b1ab05cb
--- /dev/null
+++ b/rt/lib/RT/I18N/no.po
@@ -0,0 +1,4879 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: RT 3.0.1\n"
+"POT-Creation-Date: 2003-04-01 06:06+0200\n"
+"PO-Revision-Date: 2003-05-01 04:47+0200\n"
+"Last-Translator: Marcus Ramberg <marcus@thefeed.no>\n"
+"Language-Team: RT Norwegian <rt@thefeed.no>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+
+
+#: html/Elements/MyRequests:28 html/Elements/MyTickets:28
+msgid "#"
+msgstr "#"
+
+#: html/Admin/Queues/Scrip.html:55
+#. ($QueueObj->id)
+msgid "#%1"
+msgstr "#%1"
+
+#: html/Approvals/Elements/Approve:27 html/Approvals/Elements/ShowDependency:50 html/SelfService/Display.html:25 html/Ticket/Display.html:26 html/Ticket/Display.html:30
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($Ticket->id, $Ticket->Subject)
+#. ($ticket->Id, $ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "#%1: %2"
+msgstr "#%1: %2"
+
+#: lib/RT/Date.pm:337
+#. ($s, $time_unit)
+msgid "%1 %2"
+msgstr "%1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:771
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr "%1 %2 %3"
+
+#: lib/RT/Date.pm:373
+#. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
+msgid "%1 %2 %3 %4:%5:%6 %7"
+msgstr "%1 %3. %2 %7 %4:%5:%6"
+
+#: lib/RT/Ticket_Overlay.pm:3505 lib/RT/Transaction_Overlay.pm:557 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $new_value->Content)
+#. ($field, $self->NewValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 added"
+msgstr "%1 %2 lagt til"
+
+#: lib/RT/Date.pm:334
+#. ($s, $time_unit)
+msgid "%1 %2 ago"
+msgstr "%1 %2 siden"
+
+#: lib/RT/Ticket_Overlay.pm:3511 lib/RT/Transaction_Overlay.pm:564
+#. ($cf->Name, $old_value, $new_value->Content)
+#. ($field, $self->OldValue, $self->NewValue)
+msgid "%1 %2 changed to %3"
+msgstr "%1 %2 ble endret til %3"
+
+#: lib/RT/Ticket_Overlay.pm:3508 lib/RT/Transaction_Overlay.pm:560 lib/RT/Transaction_Overlay.pm:605
+#. ($cf->Name, $old_value)
+#. ($field, $self->OldValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 deleted"
+msgstr "%1 %2 slettet"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 of group %3"
+msgstr "%1 %2 av gruppen %3"
+
+#: html/Admin/Elements/EditScrips:44 html/Admin/Elements/ListGlobalScrips:28
+#. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
+msgid "%1 %2 with template %3"
+msgstr "%1 %2 med mal %3"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 this ticket\\n"
+msgstr "%1 (%2) %3 denne biletten\\n""
+
+#: html/Search/Listing.html:57
+#. (($session{'tickets'}->FirstRow+1), ($session{'tickets'}->FirstRow() + $session{'tickets'}->RowsPerPage()  ))
+msgid "%1 - %2 shown"
+msgstr "%1 - %2 vist"
+
+#: bin/rt-crontool:169 bin/rt-crontool:176 bin/rt-crontool:182
+#. ("--search-argument", "--search")
+#. ("--condition-argument", "--condition")
+#. ("--action-argument", "--action")
+msgid "%1 - An argument to pass to %2"
+msgstr "%1 - Et parameter til %2"
+
+#: bin/rt-crontool:185
+#. ("--verbose")
+msgid "%1 - Output status updates to STDOUT"
+msgstr "%1 - Viser statusoppdateringer til STDOUT"
+
+#: bin/rt-crontool:179
+#. ("--action")
+msgid "%1 - Specify the action module you want to use"
+msgstr "%1 - Oppgi kommandomodulen du ønsker  bruke"
+
+#: bin/rt-crontool:173
+#. ("--condition")
+msgid "%1 - Specify the condition module you want to use"
+msgstr "%1 - Oppgiv betingelsesmodulen du ønsker  bruke"
+
+#: bin/rt-crontool:166
+#. ("--search")
+msgid "%1 - Specify the search module you want to use"
+msgstr "%1 - Oppgi søkemodulen du ønsker  bruke"
+
+#: lib/RT/ScripAction_Overlay.pm:122
+#. ($self->Id)
+msgid "%1 ScripAction loaded"
+msgstr "%1 KommandoScript lastet"
+
+#: lib/RT/Ticket_Overlay.pm:3538
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 added as a value for %2"
+msgstr "%1 ble lagt til som verdi for %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on"
+msgstr "%1 alias trenger en ReferanseId å jobbe mot"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on "
+msgstr "%1 alias trenger en saksnummer å jobbe mot "
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on (from %2) %3"
+msgstr "%1 alias trenger et saksnummer å jobbe mot (fra %2) %3"
+
+#: lib/RT/Link_Overlay.pm:117 lib/RT/Link_Overlay.pm:124
+#. ($args{'Base'})
+#. ($args{'Target'})
+msgid "%1 appears to be a local object, but can't be found in the database"
+msgstr "%1 ser ut til å være et lokalt objekt, men kan ikke finnes i databasen"
+
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:481
+#. ($self->BriefDescription , $self->CreatorObj->Name)
+#. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
+msgid "%1 by %2"
+msgstr "%1 av %2"
+
+#: lib/RT/Transaction_Overlay.pm:535 lib/RT/Transaction_Overlay.pm:624 lib/RT/Transaction_Overlay.pm:633 lib/RT/Transaction_Overlay.pm:636
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
+#. ($self->Field , $q1->Name , $q2->Name)
+#. ($self->Field, $t2->AsString, $t1->AsString)
+#. ($self->Field, $self->OldValue, $self->NewValue)
+msgid "%1 changed from %2 to %3"
+msgstr "%1 ble endret fra %2 til %3"
+
+#: lib/RT/Interface/Web.pm:891
+msgid "%1 could not be set to %2."
+msgstr "%1 kunne ikke settes til %2."
+
+#: NOT FOUND IN SOURCE
+msgid "%1 couldn't init a transaction (%2)\\n"
+msgstr "%1 kunne ikke starte en transaksjon (%2)\\n"
+
+#: lib/RT/Ticket_Overlay.pm:2817
+#. ($self)
+msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
+msgstr "%1 kunne ikke sette status til løst. RT-basen kan være inkonsistent."
+
+#: html/Elements/MyTickets:25
+#. ($rows)
+msgid "%1 highest priority tickets I own..."
+msgstr "Mine %1 høyst prioriterte saker..."
+
+#: html/Elements/MyRequests:25
+#. ($rows)
+msgid "%1 highest priority tickets I requested..."
+msgstr "Mine %1 høyst prioriterte forespørsler..."
+
+#: bin/rt-crontool:161
+#. ($0)
+msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
+msgstr "%1 er et verktøy for å behandle saker fra eksterne verktøy, slik som cron."
+
+#: lib/RT/Queue_Overlay.pm:743
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this queue."
+msgstr "%1 er ikke lenger en %2 for denne køen."
+
+#: lib/RT/Ticket_Overlay.pm:1570
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this ticket."
+msgstr "%1 er ikke lenger en %2 for denne saken."
+
+#: lib/RT/Ticket_Overlay.pm:3594
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 is no longer a value for custom field %2"
+msgstr "%1 er ikke lenger en verdi for fleksifeltet %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 isn't a valid Queue id."
+msgstr "%1 er ikke et gyldig saksnummer."
+
+#: html/Ticket/Elements/ShowBasics:36
+#. ($TimeWorked)
+msgid "%1 min"
+msgstr "%1 min"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 not shown"
+msgstr "%1 vises ikke"
+
+#: html/User/Elements/DelegateRights:76
+#. (loc($ObjectType =~ /^RT::(.*)$/))
+msgid "%1 rights"
+msgstr "%1 rettigheter"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 succeeded\\n"
+msgstr "%1 var velykket\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for $MessageId"
+msgstr "%1 er ukjent type for $saksnummer"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for %2"
+msgstr "%1 er ukjent type for %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 was created without a CurrentUser\\n"
+msgstr "%1 ble opprettet uten en aktiv bruker\\n"
+
+#: lib/RT/Action/ResolveMembers.pm:42
+#. (ref $self)
+msgid "%1 will resolve all members of a resolved group ticket."
+msgstr "%1 vil løse alle medlemmer av en løst gruppesak."
+
+#: NOT FOUND IN SOURCE
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr "%1 vil stoppe en [lokal] BASE hvis den er avhengig av/medlem av en tilkoblet sak."
+
+#: lib/RT/Transaction_Overlay.pm:433
+#. ($self)
+msgid "%1: no attachment specified"
+msgstr "%1: ingen vedlegg oppgitt"
+
+#: html/Ticket/Elements/ShowTransaction:102
+#. ($size)
+msgid "%1b"
+msgstr "%1b"
+
+#: html/Ticket/Elements/ShowTransaction:99
+#. (int($size/102.4)/10)
+msgid "%1k"
+msgstr "%1k"
+
+#: lib/RT/Ticket_Overlay.pm:1140
+#. ($args{'Status'})
+msgid "'%1' is an invalid value for status"
+msgstr "'%1' er en ugyldig statusverdi"
+
+#: NOT FOUND IN SOURCE
+msgid "'%1' not a recognized action. "
+msgstr "'%1' er ikke en kjent handling"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete group member)"
+msgstr "(Merk for å slette gruppemedlem)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete scrip)"
+msgstr "(Merk for å slette Scrip)"
+
+#: html/Admin/Elements/EditCustomFieldValues:25 html/Admin/Elements/EditQueueWatchers:29 html/Admin/Elements/EditScrips:35 html/Admin/Elements/EditTemplates:36 html/Admin/Groups/Members.html:52 html/Ticket/Elements/EditLinks:33 html/Ticket/Elements/EditPeople:46 html/User/Groups/Members.html:55
+msgid "(Check box to delete)"
+msgstr "(Merk for å slette)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check boxes to delete)"
+msgstr "(Merk boksene for å slette)"
+
+#: html/Ticket/Create.html:178
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr "(Skriv inn referansenummer eller URler, separert med mellomrom)"
+
+#: html/Admin/Queues/Modify.html:54 html/Admin/Queues/Modify.html:60
+#. ($RT::CorrespondAddress)
+#. ($RT::CommentAddress)
+msgid "(If left blank, will default to %1"
+msgstr "(Standard er %1);H
+
+#: NOT FOUND IN SOURCE
+msgid "(No Value)"
+msgstr "(Ingen Verdi)"
+
+#: html/Admin/Elements/EditCustomFields:33 html/Admin/Elements/ListGlobalCustomFields:32
+msgid "(No custom fields)"
+msgstr "(Ingen fleksifelt)"
+
+#: html/Admin/Groups/Members.html:50 html/User/Groups/Members.html:53
+msgid "(No members)"
+msgstr "(Ingen medlemmer)"
+
+#: html/Admin/Elements/EditScrips:32 html/Admin/Elements/ListGlobalScrips:32
+msgid "(No scrips)"
+msgstr "(Ingen scrips)"
+
+#: html/Admin/Elements/EditTemplates:31
+msgid "(No templates)"
+msgstr "(Ingen maler)"
+
+#: html/Ticket/Update.html:85
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(Sender en kopi av denne oppdateringen til en kommaseparert liste med epostaddresser. Endrer <b>ikke</b> hvem som vil motta fremtidige oppdatreinger.)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(Sender en kopi av denne oppdateringen til en kommaseparert liste med epostaddresser. Endrer <b>ikke</b> hvem som vil motta fremtidige oppdateringer.)"
+
+#: html/Ticket/Create.html:79
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(Sender en kopi av denne oppdateringen til en kommaseparert liste av administrative epostaddresser. Disse vil <b>vil</b> motta fremtidige oppdateringer.)"
+
+#: html/Ticket/Update.html:81
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(Sender en kopi av denne oppdateringen til en komma-separert liste av epostaddresser. Endrer <b>ikke</b> hvem som vil motta fremtidige oppdateringer.)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(Sender en kopi av denne oppdateringen til en kommaseparert liste med epost-addresser. Endrer <b->ikke</b> hvem som vi motta fremtige utfordrer dere nå."
+
+#: html/Ticket/Create.html:69
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(Sender en kopi av dette oppdateringen til en kommaseparert liste med epostaddresser. Disse <b>vill</b> motta fremtidige oppdateringer.)"
+
+#: html/Admin/Groups/index.html:33 html/User/Groups/index.html:33
+msgid "(empty)"
+msgstr "(tom)"
+
+#: html/Admin/Users/index.html:39
+msgid "(no name listed)"
+msgstr "(navn ikke oppgitt)"
+
+#: html/Elements/MyRequests:43 html/Elements/MyTickets:45
+msgid "(no subject)"
+msgstr "(ingen overskrift)"
+
+#: html/Admin/Elements/SelectRights:48 html/Elements/SelectCustomFieldValue:30 html/Ticket/Elements/EditCustomField:59 html/Ticket/Elements/ShowCustomFields:36 lib/RT/Transaction_Overlay.pm:534
+msgid "(no value)"
+msgstr "(ingen verdi)"
+
+#: html/Ticket/Elements/EditLinks:116
+msgid "(only one ticket)"
+msgstr "(bare en sak)"
+
+#: html/Elements/MyRequests:52 html/Elements/MyTickets:55
+msgid "(pending approval)"
+msgstr "(Venter på godkjenning)"
+
+#: html/Elements/MyRequests:54 html/Elements/MyTickets:57
+msgid "(pending other tickets)"
+msgstr "(venter på andre saker)"
+
+#: NOT FOUND IN SOURCE
+msgid "(requestor's group)"
+msgstr "(kundens gruppe)"
+
+#: html/Admin/Users/Modify.html:50
+msgid "(required)"
+msgstr "(nødvendig)"
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "(untitled)"
+msgstr "(ingen tittel)"
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr "Mine 25 høyst prioriterte saker..."
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr "Mine 25 høyst priorterte forespørsler..."
+
+#: html/Ticket/Elements/ShowBasics:32
+msgid "<% $Ticket->Status%>"
+msgstr "<% $Ticket-:Status%>"
+
+#: html/Elements/SelectTicketTypes:27
+msgid "<% $_ %>"
+msgstr "<% $_ %>"
+
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:26
+#. ($m->scomp('/Elements/SelectNewTicketQueue'))
+msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
+msgstr "<input type=\"submit\" value=\"Ny sak i\">&nbsp;%1"
+
+#: NOT FOUND IN SOURCE
+msgid "??????"
+msgstr "??????"
+
+#: etc/initialdata:203
+msgid "A blank template"
+msgstr "En tom mal"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Deleted"
+msgstr "ACE slettet"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Loaded"
+msgstr "ACE lastet"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be deleted"
+msgstr "ACE kunne ikke slettes"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be found"
+msgstr "fant ikke ACE"
+
+#: lib/RT/ACE_Overlay.pm:157 lib/RT/Principal_Overlay.pm:181
+msgid "ACE not found"
+msgstr "ACE ikke funnet"
+
+#: lib/RT/ACE_Overlay.pm:831
+msgid "ACEs can only be created and deleted."
+msgstr "ACEr kan bare opprettes og slettes."
+
+#: bin/rt-commit-handler:755
+msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgstr "Avbryter for  ung uønsket saksendring"
+
+#: html/User/Elements/Tabs:32
+msgid "About me"
+msgstr "Om meg"
+
+#: html/Admin/Users/Modify.html:80
+msgid "Access control"
+msgstr "Aksesskontroll"
+
+#: html/Admin/Elements/EditScrip:57
+msgid "Action"
+msgstr "Handling"
+
+#: lib/RT/Scrip_Overlay.pm:147
+#. ($args{'ScripAction'})
+msgid "Action %1 not found"
+msgstr "Handling %1 finnes ikke"
+
+#: bin/rt-crontool:123
+msgid "Action committed."
+msgstr "Handling skrevet."
+
+#: bin/rt-crontool:119
+msgid "Action prepared..."
+msgstr "Handling forberedt"
+
+#: html/Search/Bulk.html:92
+msgid "Add AdminCc"
+msgstr "Legg til AdminCc"
+
+#: html/Search/Bulk.html:90
+msgid "Add Cc"
+msgstr "Legg til Cc"
+
+#: html/Ticket/Create.html:114 html/Ticket/Update.html:100
+msgid "Add More Files"
+msgstr "Legg til flere filer"
+
+#: NOT FOUND IN SOURCE
+msgid "Add Next State"
+msgstr "Legg til neste status"
+
+#: html/Search/Bulk.html:88
+msgid "Add Requestor"
+msgstr "Legg til kunde"
+
+#: html/Admin/Elements/AddCustomFieldValue:26
+msgid "Add Value"
+msgstr "Legg til verdi"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip to this queue"
+msgstr "Legg til Scrip i denne køen"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip which will apply to all queues"
+msgstr "Legg til et Scrip som gjelder for alle køer"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr "Legg til et nøkkelordvalg p denne køen"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a new a global scrip"
+msgstr "Legg til et globalt Scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a scrip to this queue"
+msgstr "Legg til et Scrip til denne køen"
+
+#: html/Admin/Global/Scrip.html:55
+msgid "Add a scrip which will apply to all queues"
+msgstr "Legg til et Scrip som vil gjelde for alle køer"
+
+#: html/Search/Bulk.html:118
+msgid "Add comments or replies to selected tickets"
+msgstr "Legg til kommentarer eller svar til denne saken"
+
+#: html/Admin/Groups/Members.html:42 html/User/Groups/Members.html:39
+msgid "Add members"
+msgstr "Legg til medlemmer"
+
+#: html/Admin/Queues/People.html:66 html/Ticket/Elements/AddWatchers:28
+msgid "Add new watchers"
+msgstr "Legg til overvåkere"
+
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
+msgstr "AddNextState"
+
+#: lib/RT/Queue_Overlay.pm:643
+#. ($args{'Type'})
+msgid "Added principal as a %1 for this queue"
+msgstr "La til primær som en %1 for denne køen"
+
+#: lib/RT/Ticket_Overlay.pm:1454
+#. ($self->loc($args{'Type'}))
+msgid "Added principal as a %1 for this ticket"
+msgstr "La til primær som en %1 for denne saken"
+
+#: html/Admin/Elements/ModifyUser:76 html/Admin/Users/Modify.html:122 html/User/Prefs.html:88
+msgid "Address1"
+msgstr "Adresse1"
+
+#: html/Admin/Elements/ModifyUser:78 html/Admin/Users/Modify.html:127 html/User/Prefs.html:90
+msgid "Address2"
+msgstr "Adresse2"
+
+#: html/Ticket/Create.html:74
+msgid "Admin Cc"
+msgstr "Admin Cc"
+
+#: etc/initialdata:280
+msgid "Admin Comment"
+msgstr "Admin Kommentar"
+
+#: etc/initialdata:259
+msgid "Admin Correspondence"
+msgstr "Admin-korrespondanse"
+
+#: html/Admin/Queues/index.html:25 html/Admin/Queues/index.html:28
+msgid "Admin queues"
+msgstr "Adminkøer"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin users"
+msgstr "Adminbrukere"
+
+#: html/Admin/Global/index.html:26 html/Admin/Global/index.html:28
+msgid "Admin/Global configuration"
+msgstr "Admin/Global konfigurasjon"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Groups"
+msgstr "Admin/Grupper"
+
+#: html/Admin/Queues/Modify.html:25 html/Admin/Queues/Modify.html:29
+msgid "Admin/Queue/Basics"
+msgstr "Admin/Køer/Grunnleggende"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr "AdminAllePersonalGrupper"
+
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:39 html/Ticket/Update.html:50 lib/RT/ACE_Overlay.pm:89
+msgid "AdminCc"
+msgstr "AdminCc"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr "AdminKommentar"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr "AdminKorrespondanse"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "AdminCustomFields"
+msgstr "AdminFleksifelt"
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "AdminGroup"
+msgstr "AdminGruppe"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "AdminGroupMembership"
+msgstr "AdminGruppeMedlemskap"
+
+#: lib/RT/System.pm:59
+msgid "AdminOwnPersonalGroups"
+msgstr "AdminEgnePersonligeGrupper"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "AdminQueue"
+msgstr "AdminKø"
+
+#: lib/RT/System.pm:60
+msgid "AdminUsers"
+msgstr "AdminBrukere"
+
+#: html/Admin/Queues/People.html:48 html/Ticket/Elements/EditPeople:54
+msgid "Administrative Cc"
+msgstr "Administrativ Cc"
+
+#: NOT FOUND IN SOURCE
+msgid "Admins"
+msgstr "Admin"
+
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search"
+msgstr "Avansert Søk"
+
+#: html/Elements/SelectDateRelation:36
+msgid "After"
+msgstr "Etter"
+
+#: NOT FOUND IN SOURCE
+msgid "Age"
+msgstr "Alder"
+
+#: NOT FOUND IN SOURCE
+msgid "Alias"
+msgstr "Alias"
+
+#: NOT FOUND IN SOURCE
+msgid "Alias for"
+msgstr "Alias for"
+
+#: html/Admin/Elements/EditCustomFields:96
+msgid "All Custom Fields"
+msgstr "Alle Fleksifelt"
+
+#: html/Admin/Queues/index.html:53
+msgid "All Queues"
+msgstr "Alle køer"
+
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
+msgstr "Send alltid en melding til kunden uavhengig av meldingssender"
+
+#: html/Elements/Tabs:56
+msgid "Approval"
+msgstr "Godkjennelse"
+
+#: html/Approvals/Display.html:46 html/Approvals/Elements/ShowDependency:42 html/Approvals/index.html:65
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($ticket->id, $msg)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Approval #%1: %2"
+msgstr "Godkjennelse #%1: %2"
+
+#: html/Approvals/index.html:54
+#. ($ticket->Id)
+msgid "Approval #%1: Notes not recorded due to a system error"
+msgstr "Godkjenning # %1: Notater kunne ikke lagres pga. systemfeil"
+
+#: html/Approvals/index.html:52
+#. ($ticket->Id)
+msgid "Approval #%1: Notes recorded"
+msgstr "Godkjenning #%1: Notater lagret"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Details"
+msgstr "Godkjenning - Detaljer"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval diagram"
+msgstr "Godkjenningsdiagram"
+
+#: html/Approvals/Elements/Approve:44
+msgid "Approve"
+msgstr "Godkjenn"
+
+#: etc/initialdata:437 etc/upgrade/2.1.71:148
+msgid "Approver's notes: %1"
+msgstr "Godkjenners notater: %1"
+
+#: lib/RT/Date.pm:414
+msgid "Apr."
+msgstr "Apr."
+
+#: NOT FOUND IN SOURCE
+msgid "April"
+msgstr "April"
+
+#: html/Elements/SelectSortOrder:35
+msgid "Ascending"
+msgstr "Stigende"
+
+#: html/Search/Bulk.html:127 html/SelfService/Update.html:33 html/Ticket/ModifyAll.html:83 html/Ticket/Update.html:100
+msgid "Attach"
+msgstr "Legg Ved"
+
+#: html/SelfService/Create.html:65 html/Ticket/Create.html:110
+msgid "Attach file"
+msgstr "Legg ved fil"
+
+#: html/Ticket/Create.html:98 html/Ticket/Update.html:89
+msgid "Attached file"
+msgstr "Vedlagt fil"
+
+#: NOT FOUND IN SOURCE
+msgid "Attachment '%1' could not be loaded"
+msgstr "Vedlegg '%1' kunne ikke lastes"
+
+#: lib/RT/Transaction_Overlay.pm:441
+msgid "Attachment created"
+msgstr "Vedlegg opprettet"
+
+#: lib/RT/Tickets_Overlay.pm:1189
+msgid "Attachment filename"
+msgstr "Vedleggsnavn"
+
+#: html/Ticket/Elements/ShowAttachments:26
+msgid "Attachments"
+msgstr "Vedlegg"
+
+#: lib/RT/Date.pm:418
+msgid "Aug."
+msgstr "Aug."
+
+#: NOT FOUND IN SOURCE
+msgid "August"
+msgstr "August"
+
+#: html/Admin/Elements/ModifyUser:66
+msgid "AuthSystem"
+msgstr "AutSystem"
+
+#: etc/initialdata:206
+msgid "Autoreply"
+msgstr "Autosvar"
+
+#: etc/initialdata:72
+msgid "Autoreply To Requestors"
+msgstr "Autosvar Til Kunde"
+
+#: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr "AutosvarTilKunde"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad PGP Signature: %1\\n"
+msgstr "Ugyldig PGP-signatur: %1\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
+msgstr "Ugyldig vedleggsid. Kunne ikke finne vedlegg '%1'\\n"
+
+#: bin/rt-commit-handler:827
+#. ($val)
+msgid "Bad data in %1"
+msgstr "Ugyldig data i %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad transaction number for attachment. %1 should be %2\\n"
+msgstr "Ugyldig transaksjonsnummer for vedlegg. %1 skulle vært %2\\n"
+
+#: html/Admin/Elements/GroupTabs:39 html/Admin/Elements/QueueTabs:39 html/Admin/Elements/UserTabs:38 html/Ticket/Elements/Tabs:90 html/User/Elements/GroupTabs:38
+msgid "Basics"
+msgstr "Detaljer"
+
+#: html/Ticket/Update.html:83
+msgid "Bcc"
+msgstr "Bcc"
+
+#: html/Admin/Elements/EditScrip:88 html/Admin/Global/GroupRights.html:85 html/Admin/Global/Template.html:46 html/Admin/Global/UserRights.html:54 html/Admin/Groups/GroupRights.html:73 html/Admin/Groups/Members.html:81 html/Admin/Groups/Modify.html:56 html/Admin/Groups/UserRights.html:55 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:45 html/Admin/Queues/UserRights.html:54 html/User/Groups/Modify.html:56
+msgid "Be sure to save your changes"
+msgstr "Sørg for  lagre endringene dine"
+
+#: html/Elements/SelectDateRelation:34 lib/RT/CurrentUser.pm:320
+msgid "Before"
+msgstr "Før"
+
+#: NOT FOUND IN SOURCE
+msgid "Begin Approval"
+msgstr "Begynn Godkjenning"
+
+#: etc/initialdata:202
+msgid "Blank"
+msgstr "Blank"
+
+#: html/Search/Listing.html:79
+msgid "Bookmarkable URL for this search"
+msgstr "URL som kan brukes som bokmerke for dette søket"
+
+#: html/Ticket/Elements/ShowHistory:39 html/Ticket/Elements/ShowHistory:45
+msgid "Brief headers"
+msgstr "Begrens headere"
+
+#: html/Search/Bulk.html:25 html/Search/Bulk.html:26
+msgid "Bulk ticket update"
+msgstr "Masseoppdatering av saker"
+
+#: lib/RT/User_Overlay.pm:1352
+msgid "Can not modify system users"
+msgstr "Kan ikke endre systembrukere"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "Can this principal see this queue"
+msgstr "Kan denne primæren se denne køen"
+
+#: lib/RT/CustomField_Overlay.pm:206
+msgid "Can't add a custom field value without a name"
+msgstr "Kan ikke legge til en verdi for et fleksifelt uten navn"
+
+#: lib/RT/Link_Overlay.pm:132
+msgid "Can't link a ticket to itself"
+msgstr "Kan ikke koble en sak til seg selv"
+
+#: lib/RT/Ticket_Overlay.pm:2794
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr "Kan ikke flette inn i en flettet sak. Denne meldingen bør ikke forekomme"
+
+#: lib/RT/Ticket_Overlay.pm:2612 lib/RT/Ticket_Overlay.pm:2681
+msgid "Can't specifiy both base and target"
+msgstr "Kan ikke spesifisere både base og mål."
+
+#: html/autohandler:99
+#. ($msg)
+msgid "Cannot create user: %1"
+msgstr "Kunne ikke oprette bruker: %1"
+
+#: etc/initialdata:50 html/Admin/Queues/People.html:44 html/SelfService/Create.html:49 html/Ticket/Create.html:64 html/Ticket/Elements/EditPeople:51 html/Ticket/Elements/ShowPeople:35 html/Ticket/Update.html:45 html/Ticket/Update.html:78 lib/RT/ACE_Overlay.pm:88
+msgid "Cc"
+msgstr "Cc"
+
+#: html/SelfService/Prefs.html:31
+msgid "Change password"
+msgstr "Endre passord"
+
+#: html/Ticket/Create.html:101 html/Ticket/Update.html:92
+msgid "Check box to delete"
+msgstr "Merk for å slette"
+
+#: html/Admin/Elements/SelectRights:31
+msgid "Check box to revoke right"
+msgstr "Merk for å trekke tilbake rettighet"
+
+#: html/Ticket/Create.html:183 html/Ticket/Elements/EditLinks:131 html/Ticket/Elements/EditLinks:69 html/Ticket/Elements/ShowLinks:57
+msgid "Children"
+msgstr "Barn"
+
+#: html/Admin/Elements/ModifyUser:80 html/Admin/Users/Modify.html:132 html/User/Prefs.html:92
+msgid "City"
+msgstr "By"
+
+#: html/Ticket/Elements/ShowDates:47
+msgid "Closed"
+msgstr "Lukket"
+
+#: html/SelfService/Closed.html:25
+msgid "Closed Tickets"
+msgstr "Lukkede Saker"
+
+#: NOT FOUND IN SOURCE
+msgid "Closed requests"
+msgstr "Lukkede forespørsler"
+
+#: html/SelfService/Elements/Tabs:45
+msgid "Closed tickets"
+msgstr "Lukkede saker"
+
+#: NOT FOUND IN SOURCE
+msgid "Code"
+msgstr "Kode"
+
+#: NOT FOUND IN SOURCE
+msgid "Command not understood!\\n"
+msgstr "Kunne ikke tolke kommando!\\n"
+
+#: html/Ticket/Elements/ShowTransaction:179 html/Ticket/Elements/Tabs:153
+msgid "Comment"
+msgstr "Kommenter"
+
+#: html/Admin/Elements/ModifyQueue:45 html/Admin/Queues/Modify.html:58
+msgid "Comment Address"
+msgstr "Kommentaraddresse"
+
+#: NOT FOUND IN SOURCE
+msgid "Comment not recorded"
+msgstr "Kommentaren ble ikke lagret"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "Comment on tickets"
+msgstr "Kommenter saker"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "CommentOnTicket"
+msgstr "KommenterSak"
+
+#: html/Admin/Elements/ModifyUser:35
+msgid "Comments"
+msgstr "Kommentarer"
+
+#: html/Ticket/ModifyAll.html:70 html/Ticket/Update.html:70
+msgid "Comments (Not sent to requestors)"
+msgstr "Kommentarer (Ikke send til kunder)"
+
+#: html/Search/Bulk.html:122
+msgid "Comments (not sent to requestors)"
+msgstr "Kommentarer (ikke sendt til kunder)"
+
+#: html/Elements/ViewUser:27
+#. ($name)
+msgid "Comments about %1"
+msgstr "Kommentarer til %1"
+
+#: html/Admin/Users/Modify.html:185 html/Ticket/Elements/ShowRequestor:44
+msgid "Comments about this user"
+msgstr "Kommentarer om denne brukeren"
+
+#: lib/RT/Transaction_Overlay.pm:543
+msgid "Comments added"
+msgstr "La til kommentarer "
+
+#: lib/RT/Action/Generic.pm:140
+msgid "Commit Stubbed"
+msgstr "Lagring forkortet"
+
+#: NOT FOUND IN SOURCE
+msgid "Compile Restrictions"
+msgstr "Kompilatorrestriksjoner"
+
+#: html/Admin/Elements/EditScrip:41
+msgid "Condition"
+msgstr "Forutsetning"
+
+#: bin/rt-crontool:109
+msgid "Condition matches..."
+msgstr "Forutsetning gjelder..."
+
+#: lib/RT/Scrip_Overlay.pm:160
+msgid "Condition not found"
+msgstr "Forutsetning ikke funnet"
+
+#: html/Elements/Tabs:50
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+#: html/SelfService/Prefs.html:33
+msgid "Confirm"
+msgstr "Bekreft"
+
+#: html/Admin/Elements/ModifyUser:60
+msgid "ContactInfoSystem"
+msgstr "KontaktInfoSystem"
+
+#: NOT FOUND IN SOURCE
+msgid "Contacted date '%1' could not be parsed"
+msgstr "Kontatdato '%1' kunne ikke tolkes"
+
+#: html/Admin/Elements/ModifyTemplate:44 html/Ticket/ModifyAll.html:87
+msgid "Content"
+msgstr "Innhold"
+
+#: NOT FOUND IN SOURCE
+msgid "Coould not create group"
+msgstr "Kunne ikke opprette gruppen"
+
+#: etc/initialdata:271
+msgid "Correspondence"
+msgstr "Korrespondanse"
+
+#: html/Admin/Elements/ModifyQueue:39 html/Admin/Queues/Modify.html:51
+msgid "Correspondence Address"
+msgstr "Korrespondanseaddresse"
+
+#: lib/RT/Transaction_Overlay.pm:539
+msgid "Correspondence added"
+msgstr "Korrespondanse lagt til"
+
+#: NOT FOUND IN SOURCE
+msgid "Correspondence not recorded"
+msgstr "Korrespondansen ble ikke lagret"
+
+#: lib/RT/Ticket_Overlay.pm:3525
+msgid "Could not add new custom field value for ticket. "
+msgstr "Kunne ikke legge til nye fleksifeltverdier for saken. "
+
+#: NOT FOUND IN SOURCE
+msgid "Could not add new custom field value for ticket. %1 "
+msgstr "Kunne ikke legge til nye fleksifeltverdier for saken. %1 "
+
+#: lib/RT/Ticket_Overlay.pm:3031 lib/RT/Ticket_Overlay.pm:3039 lib/RT/Ticket_Overlay.pm:3055
+msgid "Could not change owner. "
+msgstr "Kunne ikke endre eier. "
+
+#: html/Admin/Elements/EditCustomField:85 html/Admin/Elements/EditCustomFields:166
+#. ($msg)
+msgid "Could not create CustomField"
+msgstr "Kunne ikke opprette fleksifelt"
+
+#: html/User/Groups/Modify.html:77 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
+msgid "Could not create group"
+msgstr "Kunne ikke opprette gruppe"
+
+#: html/Admin/Global/Template.html:75 html/Admin/Queues/Template.html:72
+#. ($msg)
+msgid "Could not create template: %1"
+msgstr "Kunne ikke opprette mal: %1"
+
+#: lib/RT/Ticket_Overlay.pm:1073 lib/RT/Ticket_Overlay.pm:334
+msgid "Could not create ticket. Queue not set"
+msgstr "Kunne ikke opprette sak. Kø ikke satt"
+
+#: lib/RT/User_Overlay.pm:208 lib/RT/User_Overlay.pm:220 lib/RT/User_Overlay.pm:238 lib/RT/User_Overlay.pm:422
+msgid "Could not create user"
+msgstr "Kunne ikke opprette bruker"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not create watcher for requestor"
+msgstr "Kunne ikke opprette overvåker for kunde"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find a ticket with id %1"
+msgstr "Kunne ikke finne en sak med id %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find group %1."
+msgstr "Kunne ikke finne gruppen %1."
+
+#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1422
+msgid "Could not find or create that user"
+msgstr "Kunne ikke finne eller lage den brukeren"
+
+#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1501
+msgid "Could not find that principal"
+msgstr "Kunne ikke finne den primæren"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find user %1."
+msgstr "Kunne ikke finne brukeren %1."
+
+#: html/Admin/Groups/Members.html:88 html/User/Groups/Members.html:90 html/User/Groups/Modify.html:82
+msgid "Could not load group"
+msgstr "Kunne ikke hente gruppen"
+
+#: lib/RT/Queue_Overlay.pm:641
+#. ($args{'Type'})
+msgid "Could not make that principal a %1 for this queue"
+msgstr "Kunne ikke sette den primæren som %1 for denne køen"
+
+#: lib/RT/Ticket_Overlay.pm:1443
+#. ($self->loc($args{'Type'}))
+msgid "Could not make that principal a %1 for this ticket"
+msgstr "Kunne ikke sette den primæren som %1 for denne saken"
+
+#: lib/RT/Queue_Overlay.pm:740
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this queue"
+msgstr "Kunne ikke fjerne den primæren som %1 for denne køen"
+
+#: lib/RT/Ticket_Overlay.pm:1559
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this ticket"
+msgstr "Knne ikke fjære den primæren som %1 for denne saken"
+
+#: lib/RT/Group_Overlay.pm:985
+msgid "Couldn't add member to group"
+msgstr "Kunne ikke legge til medlemmmer i gruppen"
+
+#: lib/RT/Ticket_Overlay.pm:3535 lib/RT/Ticket_Overlay.pm:3591
+#. ($Msg)
+msgid "Couldn't create a transaction: %1"
+msgstr "Kunne ikke opprette en transaksjon: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't figure out what to do from gpg's reply\\n"
+msgstr "Kunne ikke tolke gpgs svar\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find group\\n"
+msgstr "Kunne ikke finne gruppen\\n"
+
+#: lib/RT/Interface/Web.pm:900
+msgid "Couldn't find row"
+msgstr "Kunne ikke finne raden"
+
+#: lib/RT/Group_Overlay.pm:959
+msgid "Couldn't find that principal"
+msgstr "Kunne ikke finne primæren"
+
+#: lib/RT/CustomField_Overlay.pm:240
+msgid "Couldn't find that value"
+msgstr "Kunne ikke finne verdien"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find that watcher"
+msgstr "Kunne ikke finne den overvåkern"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find user\\n"
+msgstr "Kunne ikke finne bruker\\n"
+
+#: lib/RT/CurrentUser.pm:112
+#. ($self->Id)
+msgid "Couldn't load %1 from the users database.\\n"
+msgstr "Kunne ikke laste %1 fra brukerdatabasen.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load KeywordSelects."
+msgstr "Kunne ikke laste NøkkelordValg."
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load RT config file '%1' %2"
+msgstr "Kunne ikke laste RTs konfigurasjonsfil '%1' %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load Scrips."
+msgstr "Kunne ikke laste Scripsene."
+
+#: html/Admin/Groups/GroupRights.html:88 html/Admin/Groups/UserRights.html:75
+#. ($id)
+msgid "Couldn't load group %1"
+msgstr "Kunne ikke laste gruppen %1"
+
+#: lib/RT/Link_Overlay.pm:175 lib/RT/Link_Overlay.pm:184 lib/RT/Link_Overlay.pm:211
+msgid "Couldn't load link"
+msgstr "Kunne ikke laste linken"
+
+#: html/Admin/Elements/EditCustomFields:147 html/Admin/Queues/People.html:121
+#. ($id)
+msgid "Couldn't load queue"
+msgstr "Kunne ikke laste køen"
+
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:72
+#. ($id)
+msgid "Couldn't load queue %1"
+msgstr "Kunne ikke laste køen %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load scrip"
+msgstr "Kunne ikke laste scripet"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load template"
+msgstr "Kunne ikke finne mal"
+
+#: html/Admin/Users/Prefs.html:79
+#. ($id)
+msgid "Couldn't load that user (%1)"
+msgstr "Kunne ikke laste den brukeren (%1)"
+
+#: html/SelfService/Display.html:109
+#. ($id)
+msgid "Couldn't load ticket '%1'"
+msgstr "Kunne ikke laste saken '%1'"
+
+#: html/Admin/Elements/ModifyUser:86 html/Admin/Users/Modify.html:149 html/User/Prefs.html:98
+msgid "Country"
+msgstr "Land"
+
+#: html/Admin/Elements/CreateUserCalled:26 html/Ticket/Create.html:135 html/Ticket/Create.html:195
+msgid "Create"
+msgstr "Opprett"
+
+#: etc/initialdata:128
+msgid "Create Tickets"
+msgstr "Opprett Saker"
+
+#: html/Admin/Elements/EditCustomField:75
+msgid "Create a CustomField"
+msgstr "Oprett et fleksifelt"
+
+#: html/Admin/Queues/CustomField.html:48
+#. ($QueueObj->Name())
+msgid "Create a CustomField for queue %1"
+msgstr "Opprett et fleksifelt for køen %1"
+
+#: html/Admin/Global/CustomField.html:48
+msgid "Create a CustomField which applies to all queues"
+msgstr "Opprett et fleksifelt for alle køer"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new Custom Field"
+msgstr "Opprett et nytt fleksifelt"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global Scrip"
+msgstr "Opprett et globalt Scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global scrip"
+msgstr "Opprett et nytt globalt scrip"
+
+#: html/Admin/Groups/Modify.html:67 html/Admin/Groups/Modify.html:93
+msgid "Create a new group"
+msgstr "Opprett en ny gruppe"
+
+#: html/User/Groups/Modify.html:67 html/User/Groups/Modify.html:92
+msgid "Create a new personal group"
+msgstr "Opprett en ny personlig gruppe"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new queue"
+msgstr "Opprett en ny kø"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new scrip"
+msgstr "Opprett et nytt scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new template"
+msgstr "Opprett en ny mal"
+
+#: html/Ticket/Create.html:25 html/Ticket/Create.html:28 html/Ticket/Create.html:36
+msgid "Create a new ticket"
+msgstr "Opprett en ny sak"
+
+#: html/Admin/Users/Modify.html:214 html/Admin/Users/Modify.html:241
+msgid "Create a new user"
+msgstr "Opprett en ny bruker"
+
+#: html/Admin/Queues/Modify.html:103
+msgid "Create a queue"
+msgstr "Opprett en ny kø"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a queue called"
+msgstr "Opprett en kø kalt"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a request"
+msgstr "Opprett en forespørsel"
+
+#: html/Admin/Queues/Scrip.html:59
+#. ($QueueObj->Name)
+msgid "Create a scrip for queue %1"
+msgstr "Opprett et scrip for køen %1"
+
+#: html/Admin/Global/Template.html:69 html/Admin/Queues/Template.html:65
+msgid "Create a template"
+msgstr "Opprett en mal"
+
+#: html/SelfService/Create.html:25
+msgid "Create a ticket"
+msgstr "Opprett en sak"
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1 / %2 / %3 "
+msgstr "Opprettelse feilet: %1 / %2 / %3"
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1/%2/%3"
+msgstr "Opprettelse feilet: %1/%2/%3"
+
+#: etc/initialdata:130
+msgid "Create new tickets based on this scrip's template"
+msgstr "Opprett nye saker basert på dette scripets mal"
+
+#: html/SelfService/Create.html:78
+msgid "Create ticket"
+msgstr "Opprett sak"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "Create tickets in this queue"
+msgstr "Opprett saker i denne køen"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "Create, delete and modify custom fields"
+msgstr "Opprett, slett og modifiser fleksifelt"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "Create, delete and modify queues"
+msgstr "Opprett, slett og endre køer"
+
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
+msgstr "Opprett, slett og modifiser medlemmene av en brukers personlige grupper"
+
+#: lib/RT/System.pm:59
+msgid "Create, delete and modify the members of personal groups"
+msgstr "Opprett, slett og modifiser medlemmene av personlige grupper"
+
+#: lib/RT/System.pm:60
+msgid "Create, delete and modify users"
+msgstr "Opprett, slett og modifiser brukere"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "CreateTicket"
+msgstr "OpprettSak"
+
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1167
+msgid "Created"
+msgstr "Opprettet"
+
+#: html/Admin/Elements/EditCustomField:88
+#. ($CustomFieldObj->Name())
+msgid "Created CustomField %1"
+msgstr "Opprettet Fleksifelt %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Created template %1"
+msgstr "Opprettet malen %1"
+
+#: html/Ticket/Elements/EditLinks:28
+msgid "Current Relationships"
+msgstr "Eksisterende Forhold"
+
+#: html/Admin/Elements/EditScrips:30
+msgid "Current Scrips"
+msgstr "Eksisterende Scrips"
+
+#: html/Admin/Groups/Members.html:39 html/User/Groups/Members.html:42
+msgid "Current members"
+msgstr "Eksisterende medlemmer"
+
+#: html/Admin/Elements/SelectRights:29
+msgid "Current rights"
+msgstr "Eksisterende rettigheter"
+
+#: html/Search/Listing.html:71
+msgid "Current search criteria"
+msgstr "Eksisterende søkekriterier"
+
+#: html/Admin/Queues/People.html:41 html/Ticket/Elements/EditPeople:45
+msgid "Current watchers"
+msgstr "Eksisterende overvåkere"
+
+#: html/Admin/Global/CustomField.html:55
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr "Fleksifeltet #%1"
+
+#: html/Admin/Elements/QueueTabs:53 html/Admin/Elements/SystemTabs:40 html/Admin/Global/index.html:50 html/Ticket/Elements/ShowSummary:36
+msgid "Custom Fields"
+msgstr "Fleksifelt"
+
+#: html/Admin/Elements/EditScrip:73
+msgid "Custom action cleanup code"
+msgstr "Avsluttningskode"
+
+#: html/Admin/Elements/EditScrip:65
+msgid "Custom action preparation code"
+msgstr "Forberedelseskode"
+
+#: html/Admin/Elements/EditScrip:49
+msgid "Custom condition"
+msgstr "Forutsetning"
+
+#: lib/RT/Tickets_Overlay.pm:1618
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
+msgid "Custom field %1 %2 %3"
+msgstr "Fleksifeltet %1 %2 %3"
+
+#: lib/RT/Tickets_Overlay.pm:1613
+#. ($CF->Name)
+msgid "Custom field %1 has a value."
+msgstr "Fleksifeltet %1 har en verdi."
+
+#: lib/RT/Tickets_Overlay.pm:1610
+#. ($CF->Name)
+msgid "Custom field %1 has no value."
+msgstr "Fleksifeltet %1 har ingen verdi."
+
+#: lib/RT/Ticket_Overlay.pm:3427
+#. ($args{'Field'})
+msgid "Custom field %1 not found"
+msgstr "Fleksifeltet %1 kunne ikke finnes"
+
+#: html/Admin/Elements/EditCustomFields:197
+msgid "Custom field deleted"
+msgstr "Fleksifeltet slettet"
+
+#: lib/RT/Ticket_Overlay.pm:3577
+msgid "Custom field not found"
+msgstr "Fleksifeltet kunne ikke finnes"
+
+#: lib/RT/CustomField_Overlay.pm:350
+#. ($args{'Content'}, $self->Name)
+msgid "Custom field value %1 could not be found for custom field %2"
+msgstr "Verdien %1 for fleksifeltet %2 kunne ikke finnes"
+
+#: NOT FOUND IN SOURCE
+msgid "Custom field value changed from %1 to %2"
+msgstr "Fleksifeltets verdi endret fra %1 til %2"
+
+#: lib/RT/CustomField_Overlay.pm:250
+msgid "Custom field value could not be deleted"
+msgstr "Fleksifeltets verdi kunne ikke slettes"
+
+#: lib/RT/CustomField_Overlay.pm:356
+msgid "Custom field value could not be found"
+msgstr "Fleksifeltets verdi kunne ikke finnes"
+
+#: lib/RT/CustomField_Overlay.pm:248 lib/RT/CustomField_Overlay.pm:358
+msgid "Custom field value deleted"
+msgstr "Fleksifeltverdi slettet"
+
+#: lib/RT/Transaction_Overlay.pm:548
+msgid "CustomField"
+msgstr "FleksiFelt"
+
+#: NOT FOUND IN SOURCE
+msgid "Data error"
+msgstr "Datafeil"
+
+#: html/SelfService/Display.html:39 html/Ticket/Create.html:161 html/Ticket/Elements/ShowSummary:55 html/Ticket/Elements/Tabs:93 html/Ticket/ModifyAll.html:44
+msgid "Dates"
+msgstr "Datoer"
+
+#: lib/RT/Date.pm:422
+msgid "Dec."
+msgstr "Des."
+
+#: NOT FOUND IN SOURCE
+msgid "December"
+msgstr "Desember"
+
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr "Standard Autosvarmal"
+
+#: etc/initialdata:207
+msgid "Default Autoresponse template"
+msgstr "Standard Autosvarmal"
+
+#: etc/initialdata:281
+msgid "Default admin comment template"
+msgstr "Standard Adminkommentarmal"
+
+#: etc/initialdata:260
+msgid "Default admin correspondence template"
+msgstr "Standard Adminkorrespondensemal"
+
+#: etc/initialdata:272
+msgid "Default correspondence template"
+msgstr "Standard korrespondensemal"
+
+#: etc/initialdata:238
+msgid "Default transaction template"
+msgstr "Standard transaksjonsmal"
+
+#: lib/RT/Transaction_Overlay.pm:643
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr "Standard: %1/%2 endret seg fra %3 til %4"
+
+#: html/User/Delegation.html:25 html/User/Delegation.html:28
+msgid "Delegate rights"
+msgstr "Deleger rettigheter"
+
+#: lib/RT/System.pm:63
+msgid "Delegate specific rights which have been granted to you."
+msgstr "Deleger spesifikke rettigheter som har blitt gitt til deg."
+
+#: lib/RT/System.pm:63
+msgid "DelegateRights"
+msgstr "DelegerRettigheter"
+
+#: html/User/Elements/Tabs:38
+msgid "Delegation"
+msgstr "Delegering"
+
+#: NOT FOUND IN SOURCE
+msgid "Delete"
+msgstr "Slett"
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "Delete tickets"
+msgstr "Slett saker"
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "DeleteTicket"
+msgstr "SlettSak"
+
+#: lib/RT/Transaction_Overlay.pm:187
+msgid "Deleting this object could break referential integrity"
+msgstr "Sletting av dette objektet kan føre til inkonsistens"
+
+#: lib/RT/Queue_Overlay.pm:292
+msgid "Deleting this object would break referential integrity"
+msgstr "Sletting av dette objektet vil føre til inkonsistens"
+
+#: lib/RT/User_Overlay.pm:438
+msgid "Deleting this object would violate referential integrity"
+msgstr "Sletting av dette objektet ville føre til inkonsistens"
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity."
+msgstr "Sletting av dette objektet ville føre til inkonsisistens."
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity. That's bad."
+msgstr "Sletting av dette objektet ville føre til inkonsistens. Det er uheldig."
+
+#: html/Approvals/Elements/Approve:45
+msgid "Deny"
+msgstr "Nekt"
+
+#: html/Ticket/Create.html:181 html/Ticket/Elements/EditLinks:123 html/Ticket/Elements/EditLinks:47 html/Ticket/Elements/ShowDependencies:32 html/Ticket/Elements/ShowLinks:37
+msgid "Depended on by"
+msgstr "Avhengighet fra"
+
+#: NOT FOUND IN SOURCE
+msgid "Dependencies: \\n"
+msgstr "Avhengigheter: \\n"
+
+#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:180 html/Ticket/Elements/EditLinks:119 html/Ticket/Elements/EditLinks:36 html/Ticket/Elements/ShowDependencies:25 html/Ticket/Elements/ShowLinks:27
+msgid "Depends on"
+msgstr "Avhengig av"
+
+#: NOT FOUND IN SOURCE
+msgid "DependsOn"
+msgstr "AvhengigAv"
+
+#: html/Elements/SelectSortOrder:35
+msgid "Descending"
+msgstr "Synkende"
+
+#: html/SelfService/Create.html:73 html/Ticket/Create.html:119
+msgid "Describe the issue below"
+msgstr "Beskriv problemet under"
+
+#: html/Admin/Elements/AddCustomFieldValue:37 html/Admin/Elements/EditCustomField:39 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyQueue:36 html/Admin/Elements/ModifyTemplate:36 html/Admin/Groups/Modify.html:49 html/Admin/Queues/Modify.html:48 html/Elements/SelectGroups:27 html/User/Groups/Modify.html:49
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: NOT FOUND IN SOURCE
+msgid "Details"
+msgstr "Detaljer"
+
+#: html/Ticket/Elements/Tabs:85
+msgid "Display"
+msgstr "Vis"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "Display Access Control List"
+msgstr "Vis Rettigheter"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "Display Scrip templates for this queue"
+msgstr "Vis Scrip-maler for denne køen"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "Display Scrips for this queue"
+msgstr "Vis Scrip-maler for denne køen"
+
+#: html/Ticket/Elements/ShowHistory:35
+msgid "Display mode"
+msgstr "Visningsmodus"
+
+#: NOT FOUND IN SOURCE
+msgid "Display ticket #%1"
+msgstr "Vis saken #%1"
+
+#: lib/RT/System.pm:54
+msgid "Do anything and everything"
+msgstr "Gjør hva som helst"
+
+#: html/Elements/Refresh:30
+msgid "Don't refresh this page."
+msgstr "Ikke last denne siden p nytt"
+
+#: html/Search/Elements/PickRestriction:114
+msgid "Don't show search results"
+msgstr "Ikke vis søkeresultat"
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "Download"
+msgstr "Last ned"
+
+#: html/Elements/SelectDateType:32 html/Ticket/Create.html:167 html/Ticket/Elements/EditDates:45 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1171
+msgid "Due"
+msgstr "Innen"
+
+#: NOT FOUND IN SOURCE
+msgid "Due date '%1' could not be parsed"
+msgstr "Innendato '%1' kunne ikke tolkes""
+
+#: bin/rt-commit-handler:754
+#. ($1, $msg)
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
+msgstr "FEIL: Kunne ikke laste sak '%1': %2.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit"
+msgstr "Rediger"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit Conditions"
+msgstr "Rediger Forhold"
+
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr "Rediger fleksifelt for %1"
+
+#: html/Ticket/ModifyLinks.html:36
+msgid "Edit Relationships"
+msgstr "Rediger Forhold"
+
+#: html/Admin/Queues/Templates.html:42
+#. ($QueueObj->Name)
+msgid "Edit Templates for queue %1"
+msgstr "Rediger Maler for køen %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit keywords"
+msgstr "Rediger nøkkelord"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr "Rediger scrips"
+
+#: html/Admin/Global/index.html:46
+msgid "Edit system templates"
+msgstr "Rediger systemmal"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit templates for %1"
+msgstr "Rediger maler for %1"
+
+#: html/Admin/Elements/ModifyQueue:25 html/Admin/Queues/Modify.html:118
+#. ($QueueObj->Name)
+#. ($QueueObj->Id)
+msgid "Editing Configuration for queue %1"
+msgstr "Rediger Konfigurasjon for køen %1"
+
+#: html/Admin/Elements/ModifyUser:25
+#. ($UserObj->Name)
+msgid "Editing Configuration for user %1"
+msgstr "Redigerer Konfigurasjonen av brukern %1"
+
+#: html/Admin/Elements/EditCustomField:91
+#. ($CustomFieldObj->Name())
+msgid "Editing CustomField %1"
+msgstr "Redigerer Fleksifeltet %1"
+
+#: html/Admin/Groups/Members.html:32
+#. ($Group->Name)
+msgid "Editing membership for group %1"
+msgstr "Redigerer medlemsskap for gruppen %1""
+
+#: html/User/Groups/Members.html:129
+#. ($Group->Name)
+msgid "Editing membership for personal group %1"
+msgstr "Redigerer medlemsskap for den personlige gruppen %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Editing template %1"
+msgstr "Redigerer malen %1"
+
+#: lib/RT/Ticket_Overlay.pm:2622 lib/RT/Ticket_Overlay.pm:2690
+msgid "Either base or target must be specified"
+msgstr "Enten base eller mål må oppgis"
+
+#: html/Admin/Users/Modify.html:53 html/Admin/Users/Prefs.html:46 html/Elements/SelectUsers:27 html/Ticket/Elements/AddWatchers:56 html/User/Prefs.html:42
+msgid "Email"
+msgstr "Epost"
+
+#: lib/RT/User_Overlay.pm:188
+msgid "Email address in use"
+msgstr "Epostaddresse i bruk"
+
+#: html/Admin/Elements/ModifyUser:42
+msgid "EmailAddress"
+msgstr "EpostAddresse"
+
+#: html/Admin/Elements/ModifyUser:54
+msgid "EmailEncoding"
+msgstr "EpostFormat"
+
+#: html/Admin/Elements/EditCustomField:51
+msgid "Enabled (Unchecking this box disables this custom field)"
+msgstr "Aktivt (Fjern merkingen for  deaktivere dette fleksifeltet)"
+
+#: html/Admin/Groups/Modify.html:53 html/User/Groups/Modify.html:53
+msgid "Enabled (Unchecking this box disables this group)"
+msgstr "Aktiv (Fjern merkingen for  deaktivere denne gruppen)"
+
+#: html/Admin/Queues/Modify.html:84
+msgid "Enabled (Unchecking this box disables this queue)"
+msgstr "Aktiv (Fjern merkingen for  deaktivere denne køen)"
+
+#: html/Admin/Elements/EditCustomFields:99
+msgid "Enabled Custom Fields"
+msgstr "Aktive Fleksifelt"
+
+#: html/Admin/Queues/index.html:56
+msgid "Enabled Queues"
+msgstr "Aktive Køer"
+
+#: html/Admin/Elements/EditCustomField:107 html/Admin/Groups/Modify.html:117 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:283 html/User/Groups/Modify.html:117
+#. (loc_fuzzy($msg))
+msgid "Enabled status %1"
+msgstr "Aktiv status %1"
+
+#: lib/RT/CustomField_Overlay.pm:428
+msgid "Enter multiple values"
+msgstr "Skriv multiple verdier"
+
+#: lib/RT/CustomField_Overlay.pm:425
+msgid "Enter one value"
+msgstr "Skriv en verdi"
+
+#: html/Ticket/Elements/EditLinks:112
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "Skriv saker og/eller URIer som det skal linkes til. Separer dem med mellomrom"
+
+#: html/Elements/Login:39 html/SelfService/Error.html:25 html/SelfService/Error.html:26
+msgid "Error"
+msgstr "Feil"
+
+#: NOT FOUND IN SOURCE
+msgid "Error adding watcher"
+msgstr "Feilet ved opprettelse av Overvåker"
+
+#: lib/RT/Queue_Overlay.pm:555
+msgid "Error in parameters to Queue->AddWatcher"
+msgstr "Feil i parameterne til Queue->AddWatcher"
+
+#: lib/RT/Queue_Overlay.pm:713
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr "Feil i parameterne til Queue->DelWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1356
+msgid "Error in parameters to Ticket->AddWatcher"
+msgstr "Feil i parameterne til Ticket->AddWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1532
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr "Feil i parameterne til Ticket->DelWatcher"
+
+#: etc/initialdata:20
+msgid "Everyone"
+msgstr "Alle"
+
+#: bin/rt-crontool:194
+msgid "Example:"
+msgstr "Eksempel:"
+
+#: html/Admin/Elements/ModifyUser:64
+msgid "ExternalAuthId"
+msgstr "EksternAutId"
+
+#: html/Admin/Elements/ModifyUser:58
+msgid "ExternalContactInfoId"
+msgstr "EksternKontaktInfoId"
+
+#: html/Admin/Users/Modify.html:73
+msgid "Extra info"
+msgstr "Ekstra info"
+
+#: lib/RT/User_Overlay.pm:302
+msgid "Failed to find 'Privileged' users pseudogroup."
+msgstr "Kunne ikke finne pseudogruppen 'Privilgerte' brukere."
+
+#: lib/RT/User_Overlay.pm:309
+msgid "Failed to find 'Unprivileged' users pseudogroup"
+msgstr "Kunne ikke finne 'pseudogruppen 'Upriviligerte' brukere"
+
+#: bin/rt-crontool:138
+#. ($modname, $@)
+msgid "Failed to load module %1. (%2)"
+msgstr "Kunne ikke laste modulen %1. (%2)"
+
+#: lib/RT/Date.pm:412
+msgid "Feb."
+msgstr "Feb."
+
+#: NOT FOUND IN SOURCE
+msgid "February"
+msgstr "Februar"
+
+#: NOT FOUND IN SOURCE
+msgid "Fin"
+msgstr "End"
+
+#: html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:59 lib/RT/Tickets_Overlay.pm:1091
+msgid "Final Priority"
+msgstr "Endelig Prioritet"
+
+#: lib/RT/Ticket_Overlay.pm:1162
+msgid "FinalPriority"
+msgstr "EndeligPrioritet"
+
+#: html/Admin/Queues/People.html:61 html/Ticket/Elements/EditPeople:34
+msgid "Find group whose"
+msgstr "Finn grupper hvor"
+
+#: NOT FOUND IN SOURCE
+msgid "Find new/open tickets"
+msgstr "Finn nye/Âpne saker"
+
+#: html/Admin/Queues/People.html:57 html/Admin/Users/index.html:46 html/Ticket/Elements/EditPeople:30
+msgid "Find people whose"
+msgstr "Finn folk hvor"
+
+#: html/Search/Listing.html:108
+msgid "Find tickets"
+msgstr "Finn saker"
+
+#: NOT FOUND IN SOURCE
+msgid "Finish Approval"
+msgstr "Fullfør godkjennelse"
+
+#: html/Ticket/Elements/Tabs:58
+msgid "First"
+msgstr "Først"
+
+#: html/Search/Listing.html:41
+msgid "First page"
+msgstr "Første side"
+
+#: docs/design_docs/string-extraction-guide.txt:33
+msgid "Foo Bar Baz"
+msgstr "Foo Bar Baz"
+
+#: docs/design_docs/string-extraction-guide.txt:24
+msgid "Foo!"
+msgstr "Foo!"
+
+#: html/Search/Bulk.html:87
+msgid "Force change"
+msgstr "Tving gjennom endring"
+
+#: html/Search/Listing.html:106
+#. ($ticketcount)
+msgid "Found %quant(%1,ticket)"
+msgstr "Fant %quant(%1,sak)"
+
+#: lib/RT/Interface/Web.pm:902
+msgid "Found Object"
+msgstr "Fant Objektet"
+
+#: html/Admin/Elements/ModifyUser:44
+msgid "FreeformContactInfo"
+msgstr "FriforkKontaktInfo"
+
+#: lib/RT/CustomField_Overlay.pm:38
+msgid "FreeformMultiple"
+msgstr "FriformMultipel"
+
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformSingle"
+msgstr "FriformSingel"
+
+#: lib/RT/Date.pm:392
+msgid "Fri."
+msgstr "Fre."
+
+#: html/Ticket/Elements/ShowHistory:41 html/Ticket/Elements/ShowHistory:51
+msgid "Full headers"
+msgstr "Fulle headere"
+
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr "Henter brukerinfo fra pgp signatur\\n"
+
+#: lib/RT/Transaction_Overlay.pm:593
+#. ($New->Name)
+msgid "Given to %1"
+msgstr "Gitt til %1"
+
+#: html/Admin/Elements/Tabs:41 html/Admin/index.html:38
+msgid "Global"
+msgstr "Global"
+
+#: NOT FOUND IN SOURCE
+msgid "Global Keyword Selections"
+msgstr "Globale Nøkkelordvalg"
+
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
+msgstr "Globale Scrip"
+
+#: html/Admin/Elements/SelectTemplate:38
+#. (loc($Template->Name))
+msgid "Global template: %1"
+msgstr "Globale maler: %1"
+
+#: html/Admin/Elements/EditCustomFields:75 html/Admin/Queues/People.html:59 html/Admin/Queues/People.html:63 html/Admin/Queues/index.html:44 html/Admin/Users/index.html:49 html/Ticket/Elements/EditPeople:32 html/Ticket/Elements/EditPeople:36 html/index.html:41
+msgid "Go!"
+msgstr "Start!"
+
+#: NOT FOUND IN SOURCE
+msgid "Good pgp sig from %1\\n"
+msgstr "Gyldig pgp sig fra %1\\n"
+
+#: html/Search/Listing.html:50
+msgid "Goto page"
+msgstr "GÃ¥ til siden"
+
+#: html/Elements/GotoTicket:25 html/SelfService/Elements/GotoTicket:25
+msgid "Goto ticket"
+msgstr "GÃ¥ til saken"
+
+#: NOT FOUND IN SOURCE
+msgid "Grand"
+msgstr "Stor"
+
+#: html/Ticket/Elements/AddWatchers:46 html/User/Elements/DelegateRights:78
+msgid "Group"
+msgstr "Gruppe"
+
+#: NOT FOUND IN SOURCE
+msgid "Group %1 %2: %3"
+msgstr "Gruppen %1 %2: %3"
+
+#: html/Admin/Elements/GroupTabs:45 html/Admin/Elements/QueueTabs:57 html/Admin/Elements/SystemTabs:44 html/Admin/Global/index.html:55
+msgid "Group Rights"
+msgstr "Grupperettigheter"
+
+#: lib/RT/Group_Overlay.pm:965
+msgid "Group already has member"
+msgstr "Alt medlem av gruppen"
+
+#: NOT FOUND IN SOURCE
+msgid "Group could not be created."
+msgstr "Gruppen kunne ikke lastes."
+
+#: html/Admin/Groups/Modify.html:77
+#. ($create_msg)
+msgid "Group could not be created: %1"
+msgstr "Gruppen kunne ikke opprettes: %1"
+
+#: lib/RT/Group_Overlay.pm:497
+msgid "Group created"
+msgstr "Gruppen opprettet"
+
+#: lib/RT/Group_Overlay.pm:1133
+msgid "Group has no such member"
+msgstr "Gruppen har ikke det medlemmet"
+
+#: lib/RT/Group_Overlay.pm:945 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1429 lib/RT/Ticket_Overlay.pm:1507
+msgid "Group not found"
+msgstr "Fant ikke gruppen"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not found.\\n"
+msgstr "Fant ikke gruppen.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not specified.\\n"
+msgstr "Ikke spesifisert gruppe.\\n"
+
+#: html/Admin/Elements/SelectNewGroupMembers:35 html/Admin/Elements/Tabs:35 html/Admin/Groups/Members.html:64 html/Admin/Queues/People.html:83 html/Admin/index.html:32 html/User/Groups/Members.html:67
+msgid "Groups"
+msgstr "Grupper"
+
+#: lib/RT/Group_Overlay.pm:971
+msgid "Groups can't be members of their members"
+msgstr "Grupper kan ikke være medlemmer av sine medlemmer"
+
+#: lib/RT/Interface/CLI.pm:73 lib/RT/Interface/CLI.pm:73
+msgid "Hello!"
+msgstr "Hallo!"
+
+#: docs/design_docs/string-extraction-guide.txt:40
+#. ($name)
+msgid "Hello, %1"
+msgstr "Hallo, %1"
+
+#: html/Ticket/Elements/ShowHistory:30 html/Ticket/Elements/Tabs:88
+msgid "History"
+msgstr "Historikk"
+
+#: html/Admin/Elements/ModifyUser:68
+msgid "HomePhone"
+msgstr "HjemmeTelefon"
+
+#: html/Elements/Tabs:44
+msgid "Homepage"
+msgstr "Hjemmeside"
+
+#: lib/RT/Base.pm:74
+#. (6)
+msgid "I have %quant(%1,concrete mixer)."
+msgstr "Jeg har %quant(%1, sementblandere)."
+
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
+msgstr "Jeg har [quant,_1,sementblandere]."
+
+#: html/Ticket/Elements/ShowBasics:27 lib/RT/Tickets_Overlay.pm:1018
+msgid "Id"
+msgstr "Id"
+
+#: html/Admin/Users/Modify.html:44 html/User/Prefs.html:39
+msgid "Identity"
+msgstr "Identitet"
+
+#: etc/upgrade/2.1.71:86
+msgid "If an approval is rejected, reject the original and delete pending approvals"
+msgstr "Hvis en godkjenner blir avvist, avvis orginalen, og slett ventende godkjenninger"
+
+#: bin/rt-crontool:190
+msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
+msgstr "Hvis dette verktøyet var setgid kunne en fiendtlig lokal bruker bruke dette verktøyet for å oppnå administrativ tilgang til RT."
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
+msgid "If you've updated anything above, be sure to"
+msgstr "Hvis du har oppdatert noe over, sørg for at"
+
+#: lib/RT/Interface/Web.pm:894
+msgid "Illegal value for %1"
+msgstr "Ugyldig verdig for %1"
+
+#: lib/RT/Interface/Web.pm:897
+msgid "Immutable field"
+msgstr "LÃ¥st felt"
+
+#: html/Admin/Elements/EditCustomFields:74
+msgid "Include disabled custom fields in listing."
+msgstr "Inkluder deaktiverte fleksifelt i listen."
+
+#: html/Admin/Queues/index.html:43
+msgid "Include disabled queues in listing."
+msgstr "Inkluder deaktiverte køer i listen."
+
+#: html/Admin/Users/index.html:47
+msgid "Include disabled users in search."
+msgstr "Inkluder deaktiverte brukere i søket."
+
+#: lib/RT/Tickets_Overlay.pm:1067
+msgid "Initial Priority"
+msgstr "Startprioritet"
+
+#: lib/RT/Ticket_Overlay.pm:1161 lib/RT/Ticket_Overlay.pm:1163
+msgid "InitialPriority"
+msgstr "StartPrioritet"
+
+#: lib/RT/ScripAction_Overlay.pm:105
+msgid "Input error"
+msgstr "Feil i inntasting"
+
+#: NOT FOUND IN SOURCE
+msgid "Interest noted"
+msgstr "Interesse registrert"
+
+#: lib/RT/Ticket_Overlay.pm:3796
+msgid "Internal Error"
+msgstr "Intern Feil"
+
+#: lib/RT/Record.pm:143
+#. ($id->{error_message})
+msgid "Internal Error: %1"
+msgstr "Intern Feil: %1"
+
+#: lib/RT/Group_Overlay.pm:644
+msgid "Invalid Group Type"
+msgstr "Ugyldig gruppetype"
+
+#: lib/RT/Principal_Overlay.pm:128
+msgid "Invalid Right"
+msgstr "Ugyldige rettigheter"
+
+#: NOT FOUND IN SOURCE
+msgid "Invalid Type"
+msgstr "Ugyldig Type"
+
+#: lib/RT/Interface/Web.pm:899
+msgid "Invalid data"
+msgstr "Ugyldig data"
+
+#: lib/RT/Ticket_Overlay.pm:439
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr "Ugydlig eier. Setter til 'nobody'."
+
+#: lib/RT/Scrip_Overlay.pm:134 lib/RT/Template_Overlay.pm:251
+msgid "Invalid queue"
+msgstr "Ugyldig kø"
+
+#: lib/RT/ACE_Overlay.pm:244 lib/RT/ACE_Overlay.pm:253 lib/RT/ACE_Overlay.pm:259 lib/RT/ACE_Overlay.pm:270 lib/RT/ACE_Overlay.pm:275
+msgid "Invalid right"
+msgstr "Ugyldige rettigheter"
+
+#: lib/RT/Record.pm:118
+#. ($key)
+msgid "Invalid value for %1"
+msgstr "Ugyldig verdi for %1"
+
+#: lib/RT/Ticket_Overlay.pm:3434
+msgid "Invalid value for custom field"
+msgstr "Ugyldig verdi for fleksifeltet."
+
+#: lib/RT/Ticket_Overlay.pm:346
+msgid "Invalid value for status"
+msgstr "Ugyldig verdi for status"
+
+#: bin/rt-crontool:191
+msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
+msgstr "Det er ekstremt viktig at ikkepriviligerte brukere ikke har tilgang til dette verktøyet."
+
+#: bin/rt-crontool:192
+msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
+msgstr "Det er anbefalt at du oppretter en upriviligert unixbruker med korrekt gruppemedlemsskap og tilgang til RT for  kjøre dette verktøyet."
+
+#: bin/rt-crontool:163
+msgid "It takes several arguments:"
+msgstr "Det tar flere parametere:"
+
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
+msgstr "Ting som venter p min godkjenning"
+
+#: lib/RT/Date.pm:411
+msgid "Jan."
+msgstr "Jan."
+
+#: NOT FOUND IN SOURCE
+msgid "January"
+msgstr "Januar"
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "Join or leave this group"
+msgstr "Bli med i eller forlat denne gruppen"
+
+#: lib/RT/Date.pm:417
+msgid "Jul."
+msgstr "Jul."
+
+#: NOT FOUND IN SOURCE
+msgid "July"
+msgstr "Juli"
+
+#: html/Ticket/Elements/Tabs:99
+msgid "Jumbo"
+msgstr "Total"
+
+#: lib/RT/Date.pm:416
+msgid "Jun."
+msgstr "Jun."
+
+#: NOT FOUND IN SOURCE
+msgid "June"
+msgstr "Juni"
+
+#: NOT FOUND IN SOURCE
+msgid "Keyword"
+msgstr "Nøkkelord"
+
+#: html/Admin/Elements/ModifyUser:52
+msgid "Lang"
+msgstr "Språk"
+
+#: html/Ticket/Elements/Tabs:73
+msgid "Last"
+msgstr "Siste"
+
+#: html/Ticket/Elements/EditDates:38 html/Ticket/Elements/ShowDates:39
+msgid "Last Contact"
+msgstr "Siste Kontakt"
+
+#: html/Elements/SelectDateType:29
+msgid "Last Contacted"
+msgstr "Sist kontaktet"
+
+#: html/Search/Elements/TicketHeader:41
+msgid "Last Notified"
+msgstr "Sist Informert"
+
+#: html/Elements/SelectDateType:30
+msgid "Last Updated"
+msgstr "Sist Oppdatert"
+
+#: NOT FOUND IN SOURCE
+msgid "LastUpdated"
+msgstr "SistOppdatert"
+
+#: NOT FOUND IN SOURCE
+msgid "Left"
+msgstr "Igjen"
+
+#: html/Admin/Users/Modify.html:83
+msgid "Let this user access RT"
+msgstr "La denne brukeren få tilgang til RT"
+
+#: html/Admin/Users/Modify.html:87
+msgid "Let this user be granted rights"
+msgstr "La denne brukeren få rettigheter"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting owner to %1 %2"
+msgstr "Begrenser eier til %1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting queue to %1 %2"
+msgstr "Begrenser køen til %1 %2"
+
+#: lib/RT/Ticket_Overlay.pm:2704
+msgid "Link already exists"
+msgstr "Lenke finnes alt"
+
+#: lib/RT/Ticket_Overlay.pm:2716
+msgid "Link could not be created"
+msgstr "Lenke kunne ikke opprettes"
+
+#: lib/RT/Ticket_Overlay.pm:2724 lib/RT/Ticket_Overlay.pm:2734
+#. ($TransString)
+msgid "Link created (%1)"
+msgstr "Lenke opprettet (%1)"
+
+#: lib/RT/Ticket_Overlay.pm:2645
+#. ($TransString)
+msgid "Link deleted (%1)"
+msgstr "Lenke slettet (%1)"
+
+#: lib/RT/Ticket_Overlay.pm:2651
+msgid "Link not found"
+msgstr "Lenke ble ikke funnet"
+
+#: html/Ticket/ModifyLinks.html:25 html/Ticket/ModifyLinks.html:29
+#. ($Ticket->Id)
+msgid "Link ticket #%1"
+msgstr "Knytt sak #%1"
+
+#: NOT FOUND IN SOURCE
+msgid "Link ticket %1"
+msgstr "Knytt sak %1"
+
+#: html/Ticket/Elements/Tabs:97
+msgid "Links"
+msgstr "Lenker"
+
+#: html/Admin/Users/Modify.html:114 html/User/Prefs.html:85
+msgid "Location"
+msgstr "Lokasjon"
+
+#: lib/RT.pm:159
+#. ($RT::LogDir)
+msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
+msgstr "Logkatalogen %1 ble ikke funnet eller kunne ikke skrives til.\\nRT kan ikke kjøre."
+
+#: html/Elements/Header:57
+#. ("<b>".$session{'CurrentUser'}->Name."</b>")
+msgid "Logged in as %1"
+msgstr "Logget inn som %1"
+
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54
+msgid "Login"
+msgstr "Innlogging"
+
+#: html/Elements/Header:54
+msgid "Logout"
+msgstr "Logg av"
+
+#: html/Search/Bulk.html:86
+msgid "Make Owner"
+msgstr "Sett Eier"
+
+#: html/Search/Bulk.html:102
+msgid "Make Status"
+msgstr "Sett Status"
+
+#: html/Search/Bulk.html:109
+msgid "Make date Due"
+msgstr "Sett tidsfrist" 
+
+#: html/Search/Bulk.html:110
+msgid "Make date Resolved"
+msgstr "Sett løsningsdato"
+
+#: html/Search/Bulk.html:107
+msgid "Make date Started"
+msgstr "Sett startdato"
+
+#: html/Search/Bulk.html:106
+msgid "Make date Starts"
+msgstr "Sett startdato"
+
+#: html/Search/Bulk.html:108
+msgid "Make date Told"
+msgstr "Sett informert dato"
+
+#: html/Search/Bulk.html:99
+msgid "Make priority"
+msgstr "Sett prioritet"
+
+#: html/Search/Bulk.html:100
+msgid "Make queue"
+msgstr "Sett Kø"
+
+#: html/Search/Bulk.html:98
+msgid "Make subject"
+msgstr "Sett Emne"
+
+#: html/Admin/index.html:33
+msgid "Manage groups and group membership"
+msgstr "Sett grupper og gruppemedlemsskap"
+
+#: html/Admin/index.html:39
+msgid "Manage properties and configuration which apply to all queues"
+msgstr "Rediger egenskaper og konfigurasjon som gjelder for alle køer"
+
+#: html/Admin/index.html:36
+msgid "Manage queues and queue-specific properties"
+msgstr "Rediger køer og kø-spesifike egenskaper"
+
+#: html/Admin/index.html:30
+msgid "Manage users and passwords"
+msgstr "Rediger brukere og passord"
+
+#: lib/RT/Date.pm:413
+msgid "Mar."
+msgstr "Mar."
+
+#: NOT FOUND IN SOURCE
+msgid "March"
+msgstr "Mars"
+
+#: NOT FOUND IN SOURCE
+msgid "May"
+msgstr "Mai"
+
+#: lib/RT/Date.pm:415
+msgid "May."
+msgstr "Mai."
+
+#: lib/RT/Group_Overlay.pm:982
+msgid "Member added"
+msgstr "Medlem lagt til"
+
+#: lib/RT/Group_Overlay.pm:1140
+msgid "Member deleted"
+msgstr "Medlem slettet"
+
+#: lib/RT/Group_Overlay.pm:1144
+msgid "Member not deleted"
+msgstr "Medlem ikke slettet"
+
+#: html/Elements/SelectLinkType:26
+msgid "Member of"
+msgstr "Medlem av"
+
+#: NOT FOUND IN SOURCE
+msgid "MemberOf"
+msgstr "MedlemAv"
+
+#: html/Admin/Elements/GroupTabs:42 html/User/Elements/GroupTabs:42
+msgid "Members"
+msgstr "Medlemmer"
+
+#: lib/RT/Ticket_Overlay.pm:2891
+msgid "Merge Successful"
+msgstr "Fletting vellykket"
+
+#: lib/RT/Ticket_Overlay.pm:2811
+msgid "Merge failed. Couldn't set EffectiveId"
+msgstr "Fletting feilet. Kunne ikke sette EffektivId"
+
+#: html/Ticket/Elements/EditLinks:115
+msgid "Merge into"
+msgstr "Flett inn i"
+
+#: html/Ticket/Update.html:102
+msgid "Message"
+msgstr "Melding"
+
+#: lib/RT/Interface/Web.pm:901
+msgid "Missing a primary key?: %1"
+msgstr "Mangler en primærnøkkel?: %1"
+
+#: html/Admin/Users/Modify.html:169 html/User/Prefs.html:54
+msgid "Mobile"
+msgstr "Mobil"
+
+#: html/Admin/Elements/ModifyUser:72
+msgid "MobilePhone"
+msgstr "MobilTelefon"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "Modify Access Control List"
+msgstr "Endre Tilgangslister"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Field %1"
+msgstr "Endre Fleksifeltet %1"
+
+#: html/Admin/Global/CustomFields.html:44 html/Admin/Global/index.html:51
+msgid "Modify Custom Fields which apply to all queues"
+msgstr "Endre Fleksifelt som gjelder for alle køer"
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "Modify Scrip templates for this queue"
+msgstr "Endre Scripmaler for denne køen"
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "Modify Scrips for this queue"
+msgstr "Endre Scrips for denne køen"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify System ACLS"
+msgstr "Endre SystemACLer"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Template %1"
+msgstr "Endre Malen %1"
+
+#: html/Admin/Queues/CustomField.html:45
+#. ($QueueObj->Name())
+msgid "Modify a CustomField for queue %1"
+msgstr "Endre et fleksifelt for køen %1"
+
+#: html/Admin/Global/CustomField.html:53
+msgid "Modify a CustomField which applies to all queues"
+msgstr "Endre et fleksifelt som gjelder for alle køer"
+
+#: html/Admin/Queues/Scrip.html:54
+#. ($QueueObj->Name)
+msgid "Modify a scrip for queue %1"
+msgstr "Endre et scrip for køen %1"
+
+#: html/Admin/Global/Scrip.html:48
+msgid "Modify a scrip which applies to all queues"
+msgstr "Endre et scrip som gjelder for alle køer"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify dates for # %1"
+msgstr "Endre datoer for # %1"
+
+#: html/Ticket/ModifyDates.html:25 html/Ticket/ModifyDates.html:29
+#. ($TicketObj->Id)
+msgid "Modify dates for #%1"
+msgstr "Endre datoer for #%1"
+
+#: html/Ticket/ModifyDates.html:35
+#. ($TicketObj->Id)
+msgid "Modify dates for ticket # %1"
+msgstr "Endre datoer for sak # %1"
+
+#: html/Admin/Global/GroupRights.html:25 html/Admin/Global/GroupRights.html:28 html/Admin/Global/index.html:56
+msgid "Modify global group rights"
+msgstr "Endre globale grupperettigheter"
+
+#: html/Admin/Global/GroupRights.html:33
+msgid "Modify global group rights."
+msgstr "Endre globale grupperettigheter"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for groups"
+msgstr "Endre globale rettigheter for grupper"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for users"
+msgstr "Endre globale rettigheter for brukere"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global scrips"
+msgstr "Endre globale scrips"
+
+#: html/Admin/Global/UserRights.html:25 html/Admin/Global/UserRights.html:28 html/Admin/Global/index.html:60
+msgid "Modify global user rights"
+msgstr "Endre globale brukerrettigheter"
+
+#: html/Admin/Global/UserRights.html:33
+msgid "Modify global user rights."
+msgstr "Endre globale brukerrettigheter"
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "Modify group metadata or delete group"
+msgstr "Endre gruppens metadata eller slette gruppen"
+
+#: html/Admin/Groups/GroupRights.html:25 html/Admin/Groups/GroupRights.html:29 html/Admin/Groups/GroupRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify group rights for group %1"
+msgstr "Endre grupperettigheter for %1 gruppen"
+
+#: html/Admin/Queues/GroupRights.html:25 html/Admin/Queues/GroupRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify group rights for queue %1"
+msgstr "Endre grupperettigheter %1 køen"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "Modify membership roster for this group"
+msgstr "Endre medlemsliste for denne gruppen"
+
+#: lib/RT/System.pm:61
+msgid "Modify one's own RT account"
+msgstr "Endre sin egen RT konto"
+
+#: html/Admin/Queues/People.html:25 html/Admin/Queues/People.html:29
+#. ($QueueObj->Name)
+msgid "Modify people related to queue %1"
+msgstr "Endre hvem som er relatert til %1 køen"
+
+#: html/Ticket/ModifyPeople.html:25 html/Ticket/ModifyPeople.html:29 html/Ticket/ModifyPeople.html:35
+#. ($Ticket->id)
+#. ($Ticket->Id)
+msgid "Modify people related to ticket #%1"
+msgstr "Endre hvem som er relater til sak #%1"
+
+#: html/Admin/Queues/Scrips.html:44
+#. ($QueueObj->Name)
+msgid "Modify scrips for queue %1"
+msgstr "Endre scrips for %1 køen"
+
+#: html/Admin/Global/Scrips.html:44 html/Admin/Global/index.html:42
+msgid "Modify scrips which apply to all queues"
+msgstr "Endre scrips som gjelder alle køer"
+
+#: html/Admin/Global/Template.html:25 html/Admin/Global/Template.html:30 html/Admin/Global/Template.html:81 html/Admin/Queues/Template.html:78
+#. (loc($TemplateObj->Name()))
+#. ($TemplateObj->id)
+msgid "Modify template %1"
+msgstr "Endre mal %1"
+
+#: html/Admin/Global/Templates.html:44
+msgid "Modify templates which apply to all queues"
+msgstr "Endre maler som gjelder for alle køer"
+
+#: html/Admin/Groups/Modify.html:87 html/User/Groups/Modify.html:86
+#. ($Group->Name)
+msgid "Modify the group %1"
+msgstr "Endre gruppen %1"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "Modify the queue watchers"
+msgstr "Endre overvåkere for køen"
+
+#: html/Admin/Users/Modify.html:236
+#. ($UserObj->Name)
+msgid "Modify the user %1"
+msgstr "Endre brukeren %1"
+
+#: html/Ticket/ModifyAll.html:37
+#. ($Ticket->Id)
+msgid "Modify ticket # %1"
+msgstr "Endre sak # %1"
+
+#: html/Ticket/Modify.html:25 html/Ticket/Modify.html:28 html/Ticket/Modify.html:34
+#. ($TicketObj->Id)
+msgid "Modify ticket #%1"
+msgstr "Endre sak #%1"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "Modify tickets"
+msgstr "Endre saker"
+
+#: html/Admin/Groups/UserRights.html:25 html/Admin/Groups/UserRights.html:29 html/Admin/Groups/UserRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify user rights for group %1"
+msgstr "Endre brukerrettigheter for %1 gruppen"
+
+#: html/Admin/Queues/UserRights.html:25 html/Admin/Queues/UserRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify user rights for queue %1"
+msgstr "Endre brukerrettigheter for %1 køen"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify watchers for queue '%1'"
+msgstr "Endre overvåkere for '%1' køen"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ModifyACL"
+msgstr "EndreACL"
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "ModifyOwnMembership"
+msgstr "EndreEgetMedlemskap"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "ModifyQueueWatchers"
+msgstr "EndreKøOvervåkere"
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "ModifyScrips"
+msgstr "EndreScrips"
+
+#: lib/RT/System.pm:61
+msgid "ModifySelf"
+msgstr "EndreSegSelv"
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "ModifyTemplate"
+msgstr "EndreMal"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "ModifyTicket"
+msgstr "EndreSak"
+
+#: lib/RT/Date.pm:388
+msgid "Mon."
+msgstr "Man."
+
+#: html/Ticket/Elements/ShowRequestor:42
+#. ($name)
+msgid "More about %1"
+msgstr "Mer om %1"
+
+#: html/Admin/Elements/EditCustomFields:61
+msgid "Move down"
+msgstr "Flytt ned"
+
+#: html/Admin/Elements/EditCustomFields:53
+msgid "Move up"
+msgstr "Flytt opp"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:27
+msgid "Multiple"
+msgstr "Flere"
+
+#: lib/RT/User_Overlay.pm:179
+msgid "Must specify 'Name' attribute"
+msgstr "MÃ¥ spesifisere attributten 'Navn'"
+
+#: html/SelfService/Elements/MyRequests:49
+#. ($friendly_status)
+msgid "My %1 tickets"
+msgstr "Mine %1 saker"
+
+#: NOT FOUND IN SOURCE
+msgid "My Approvals"
+msgstr "Mine saker til godkjenning"
+
+#: html/Approvals/index.html:25 html/Approvals/index.html:26
+msgid "My approvals"
+msgstr "Mine saker til godkjenning"
+
+#: html/Admin/Elements/AddCustomFieldValue:33 html/Admin/Elements/EditCustomField:34 html/Admin/Elements/ModifyTemplate:28 html/Admin/Elements/ModifyUser:30 html/Admin/Groups/Modify.html:44 html/Elements/SelectGroups:26 html/Elements/SelectUsers:28 html/User/Groups/Modify.html:44
+msgid "Name"
+msgstr "Navn"
+
+#: lib/RT/User_Overlay.pm:186
+msgid "Name in use"
+msgstr "Navnet er i bruk"
+
+#: NOT FOUND IN SOURCE
+msgid "Need approval from system administrator"
+msgstr "Trenger godkjennelse fra systemadministrator"
+
+#: html/Ticket/Elements/ShowDates:52
+msgid "Never"
+msgstr "Aldri"
+
+#: html/Elements/Quicksearch:30
+msgid "New"
+msgstr "Ny"
+
+#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:93 html/User/Prefs.html:65
+msgid "New Password"
+msgstr "Nytt Passord"
+
+#: etc/initialdata:317 etc/upgrade/2.1.71:16
+msgid "New Pending Approval"
+msgstr "Ny, Venter på Godkjennelse"
+
+#: html/Ticket/Elements/EditLinks:111
+msgid "New Relationships"
+msgstr "Nye forhold"
+
+#: html/Ticket/Elements/Tabs:36
+msgid "New Search"
+msgstr "Nytt Søk"
+
+#: html/Admin/Global/CustomField.html:41 html/Admin/Global/CustomFields.html:39 html/Admin/Queues/CustomField.html:52 html/Admin/Queues/CustomFields.html:40
+msgid "New custom field"
+msgstr "Nytt fleksifelt"
+
+#: html/Admin/Elements/GroupTabs:54 html/User/Elements/GroupTabs:52
+msgid "New group"
+msgstr "Ny gruppe"
+
+#: html/SelfService/Prefs.html:32
+msgid "New password"
+msgstr "Nytt passord"
+
+#: lib/RT/User_Overlay.pm:647
+msgid "New password notification sent"
+msgstr "Melding om nytt passord sendt"
+
+#: html/Admin/Elements/QueueTabs:70
+msgid "New queue"
+msgstr "Ny kø"
+
+#: NOT FOUND IN SOURCE
+msgid "New request"
+msgstr "Ny forespørsel"
+
+#: html/Admin/Elements/SelectRights:42
+msgid "New rights"
+msgstr "Nye rettigheter"
+
+#: html/Admin/Global/Scrip.html:40 html/Admin/Global/Scrips.html:39 html/Admin/Queues/Scrip.html:43 html/Admin/Queues/Scrips.html:53
+msgid "New scrip"
+msgstr "Nytt scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "New search"
+msgstr "Nytt søk"
+
+#: html/Admin/Global/Template.html:60 html/Admin/Global/Templates.html:39 html/Admin/Queues/Template.html:58 html/Admin/Queues/Templates.html:50
+msgid "New template"
+msgstr "Ny mal"
+
+#: html/SelfService/Elements/Tabs:48
+msgid "New ticket"
+msgstr "Ny sak"
+
+#: lib/RT/Ticket_Overlay.pm:2778
+msgid "New ticket doesn't exist"
+msgstr "Ny sak eksistere ikke"
+
+#: html/Admin/Elements/UserTabs:52
+msgid "New user"
+msgstr "Ny bruker"
+
+#: html/Admin/Elements/CreateUserCalled:26
+msgid "New user called"
+msgstr "Ny bruker kalt"
+
+#: html/Admin/Queues/People.html:55 html/Ticket/Elements/EditPeople:29
+msgid "New watchers"
+msgstr "Ny overvåker"
+
+#: html/Admin/Users/Prefs.html:42
+msgid "New window setting"
+msgstr "Instillinger for nytt vindu"
+
+#: html/Ticket/Elements/Tabs:69
+msgid "Next"
+msgstr "Neste"
+
+#: html/Search/Listing.html:48
+msgid "Next page"
+msgstr "Neste side"
+
+#: html/Admin/Elements/ModifyUser:50
+msgid "NickName"
+msgstr "KalleNavn"
+
+#: html/Admin/Users/Modify.html:63 html/User/Prefs.html:46
+msgid "Nickname"
+msgstr "Kallenavn"
+
+#: html/Admin/Elements/EditCustomField:90 html/Admin/Elements/EditCustomFields:105
+msgid "No CustomField"
+msgstr "Ingen FleksiFelt"
+
+#: html/Admin/Groups/GroupRights.html:84 html/Admin/Groups/UserRights.html:71
+msgid "No Group defined"
+msgstr "Ingen grupper definert"
+
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:68
+msgid "No Queue defined"
+msgstr "Ingen kø definert"
+
+#: bin/rt-crontool:56
+msgid "No RT user found. Please consult your RT administrator.\\n"
+msgstr "Ingen RT bruker funnet. Vennligst referer til manualen.\\n"
+
+#: html/Admin/Global/Template.html:79 html/Admin/Queues/Template.html:76
+msgid "No Template"
+msgstr "Ingen Mal"
+
+#: bin/rt-commit-handler:764
+msgid "No Ticket specified. Aborting ticket "
+msgstr "Ingen sak oppgitt. Avbryter sak "
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgstr "Ingen Sak oppgitt. Avbryter saksendring\\n\\n"
+
+#: html/Approvals/Elements/Approve:46
+msgid "No action"
+msgstr "Ingen handling"
+
+#: lib/RT/Interface/Web.pm:896
+msgid "No column specified"
+msgstr "Ingen kolonne spesifisert"
+
+#: NOT FOUND IN SOURCE
+msgid "No command found\\n"
+msgstr "Ingen kommando funnet\\n"
+
+#: html/Elements/ViewUser:36 html/Ticket/Elements/ShowRequestor:45
+msgid "No comment entered about this user"
+msgstr "Ingen kommentar skrevet om denne brukeren"
+
+#: lib/RT/Ticket_Overlay.pm:2189 lib/RT/Ticket_Overlay.pm:2257
+msgid "No correspondence attached"
+msgstr "Ingen korrespondanse vedlagt"
+
+#: lib/RT/Action/Generic.pm:150 lib/RT/Condition/Generic.pm:176 lib/RT/Search/ActiveTicketsInQueue.pm:56 lib/RT/Search/Generic.pm:113
+#. (ref $self)
+msgid "No description for %1"
+msgstr "Ingen beskrivelse for %1"
+
+#: lib/RT/Users_Overlay.pm:145
+msgid "No group specified"
+msgstr "Ingen gruppe spesifisert"
+
+#: lib/RT/User_Overlay.pm:865
+msgid "No password set"
+msgstr "Passordet er ikke satt"
+
+#: lib/RT/Queue_Overlay.pm:259
+msgid "No permission to create queues"
+msgstr "Ingen tilgang til å opprette køer"
+
+#: lib/RT/Ticket_Overlay.pm:342
+#. ($QueueObj->Name)
+msgid "No permission to create tickets in the queue '%1'"
+msgstr "Ikke tilgang til å opprette saker for køen '%1'"
+
+#: lib/RT/User_Overlay.pm:152
+msgid "No permission to create users"
+msgstr "Ikke tilgang til å opprette brukere"
+
+#: html/SelfService/Display.html:118
+msgid "No permission to display that ticket"
+msgstr "Ikke tilgang til å vise den saken"
+
+#: html/SelfService/Update.html:52
+msgid "No permission to view update ticket"
+msgstr "Ingen tilgang til å se oppdatering av saken"
+
+#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1488
+msgid "No principal specified"
+msgstr "Ingen primær spesifisert"
+
+#: html/Admin/Queues/People.html:154 html/Admin/Queues/People.html:164
+msgid "No principals selected."
+msgstr "Ingen primære spesifisert"
+
+#: html/Admin/Queues/index.html:35
+msgid "No queues matching search criteria found."
+msgstr "Det er ingen køer som matcher søkekriteriet"
+
+#: html/Admin/Elements/SelectRights:81
+msgid "No rights found"
+msgstr "Ingen rettigheter funnet"
+
+#: html/Admin/Elements/SelectRights:33
+msgid "No rights granted."
+msgstr "Ingen rettigheter tildelt"
+
+#: html/Search/Bulk.html:149
+msgid "No search to operate on."
+msgstr "Ingen søk  behandle"
+
+#: NOT FOUND IN SOURCE
+msgid "No ticket id specified"
+msgstr "Ingen saksid oppgitt"
+
+#: lib/RT/Transaction_Overlay.pm:478 lib/RT/Transaction_Overlay.pm:516
+msgid "No transaction type specified"
+msgstr "Transaksjonstype ikke spesifisert"
+
+#: NOT FOUND IN SOURCE
+msgid "No user or email address specified"
+msgstr "Ingen bruker eller epostaddresse oppgitt"
+
+#: html/Admin/Users/index.html:36
+msgid "No users matching search criteria found."
+msgstr "Fant ingen brukere som treffer søkekriteriene."
+
+#: bin/rt-commit-handler:644
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr "Fant ingen gyldig RT bruker. RT cvs handler avstengt. Kontakt din RT administrator.\\n"
+
+#: lib/RT/Interface/Web.pm:893
+msgid "No value sent to _Set!\\n"
+msgstr "Ingen verdi sendt til _Set!\\n"
+
+#: html/Search/Elements/TicketRow:37
+msgid "Nobody"
+msgstr "Ingen"
+
+#: lib/RT/Interface/Web.pm:898
+msgid "Nonexistant field?"
+msgstr "Ukjent felt?"
+
+#: NOT FOUND IN SOURCE
+msgid "Not logged in"
+msgstr "Ikke logget inn"
+
+#: html/Elements/Header:59
+msgid "Not logged in."
+msgstr "Ikke logget inn."
+
+#: lib/RT/Date.pm:369
+msgid "Not set"
+msgstr "Ikke satt"
+
+#: html/NoAuth/Reminder.html:27
+msgid "Not yet implemented."
+msgstr "Ikke implementert enda."
+
+#: NOT FOUND IN SOURCE
+msgid "Not yet implemented...."
+msgstr "Ikke implementert enda...."
+
+#: html/Approvals/Elements/Approve:49
+msgid "Notes"
+msgstr "Notater"
+
+#: lib/RT/User_Overlay.pm:650
+msgid "Notification could not be sent"
+msgstr "Melding kunne ikke sendes"
+
+#: etc/initialdata:94
+msgid "Notify AdminCcs"
+msgstr "Raporter til AdminCc"
+
+#: etc/initialdata:90
+msgid "Notify AdminCcs as Comment"
+msgstr "Rapporter til AdminCc som kommentar"
+
+#: etc/initialdata:121
+msgid "Notify Other Recipients"
+msgstr "Rapporter til andre mottakere"
+
+#: etc/initialdata:117
+msgid "Notify Other Recipients as Comment"
+msgstr "Rapporter til andre mottakere som kommentar"
+
+#: etc/initialdata:86
+msgid "Notify Owner"
+msgstr "Rapporter til eier"
+
+#: etc/initialdata:82
+msgid "Notify Owner as Comment"
+msgstr "Rapportert til eier som kommentar"
+
+#: etc/initialdata:319 etc/upgrade/2.1.71:17
+msgid "Notify Owners and AdminCcs of new items pending their approval"
+msgstr "Rapporter til Eiere og AdminCc om nye ting som venter på godkjenning"
+
+#: etc/initialdata:78
+msgid "Notify Requestors"
+msgstr "Rapporter til kunde"
+
+#: etc/initialdata:104
+msgid "Notify Requestors and Ccs"
+msgstr "Rapporter til Kunder og Cc"
+
+#: etc/initialdata:99
+msgid "Notify Requestors and Ccs as Comment"
+msgstr "Rapporter til Kunder og Cc som kommentar"
+
+#: etc/initialdata:113
+msgid "Notify Requestors, Ccs and AdminCcs"
+msgstr "Rapporter til Kunder Cc og AdminCc"
+
+#: etc/initialdata:109
+msgid "Notify Requestors, Ccs and AdminCcs as Comment"
+msgstr "Rapporter til Kunder Cc og AdminCc som Kommentar"
+
+#: lib/RT/Date.pm:421
+msgid "Nov."
+msgstr "Nov."
+
+#: NOT FOUND IN SOURCE
+msgid "November"
+msgstr "November"
+
+#: lib/RT/Record.pm:157
+msgid "Object could not be created"
+msgstr "Objekter kunne ikke opprettes"
+
+#: lib/RT/Record.pm:176
+msgid "Object created"
+msgstr "Objektet ble opprettet"
+
+#: lib/RT/Date.pm:420
+msgid "Oct."
+msgstr "Okt."
+
+#: NOT FOUND IN SOURCE
+msgid "October"
+msgstr "Oktober"
+
+#: html/Elements/SelectDateRelation:35
+msgid "On"
+msgstr "Ved"
+
+#: etc/initialdata:155
+msgid "On Comment"
+msgstr "Ved Kommentar"
+
+#: etc/initialdata:148
+msgid "On Correspond"
+msgstr "Ved Korrespondanse"
+
+#: etc/initialdata:137
+msgid "On Create"
+msgstr "Ved Opprettelse"
+
+#: etc/initialdata:169
+msgid "On Owner Change"
+msgstr "Ved Eierskifte"
+
+#: etc/initialdata:177
+msgid "On Queue Change"
+msgstr "Ved Køendring"
+
+#: etc/initialdata:183
+msgid "On Resolve"
+msgstr "Ved Løsning"
+
+#: etc/initialdata:161
+msgid "On Status Change"
+msgstr "Ved statusendring"
+
+#: etc/initialdata:142
+msgid "On Transaction"
+msgstr "Ved Transaksjon"
+
+#: html/Approvals/Elements/PendingMyApproval:50
+#. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
+msgid "Only show approvals for requests created after %1"
+msgstr "Vis kun godkjennelse for saker opprettet etter %1"
+
+#: html/Approvals/Elements/PendingMyApproval:48
+#. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
+msgid "Only show approvals for requests created before %1"
+msgstr "Bare vis godkjennelse for saker opprettet før %1"
+
+#: html/Elements/Quicksearch:31
+msgid "Open"
+msgstr "Ã…pne"
+
+#: html/Ticket/Elements/Tabs:136
+msgid "Open it"
+msgstr "Ã…pne den"
+
+#: NOT FOUND IN SOURCE
+msgid "Open requests"
+msgstr "Åpne forespørsler"
+
+#: html/SelfService/Elements/Tabs:42
+msgid "Open tickets"
+msgstr "Ã…pne saker"
+
+#: html/Admin/Users/Prefs.html:41
+msgid "Open tickets (from listing) in a new window"
+msgstr "Ã…pne saker (fra utlisting) i et nytt vindu"
+
+#: html/Admin/Users/Prefs.html:40
+msgid "Open tickets (from listing) in another window"
+msgstr "Ã…pne saker (fra utlisting) it et annet vinud"
+
+#: etc/initialdata:133
+msgid "Open tickets on correspondence"
+msgstr "Ã…pne saker ved korrespondanse"
+
+#: html/Search/Elements/PickRestriction:101
+msgid "Ordering and sorting"
+msgstr "Rekkefølge og sortering"
+
+#: html/Admin/Elements/ModifyUser:46 html/Admin/Users/Modify.html:117 html/Elements/SelectUsers:29 html/User/Prefs.html:86
+msgid "Organization"
+msgstr "Organisasjon"
+
+#: html/Approvals/Elements/Approve:33
+#. ($approving->Id, $approving->Subject)
+msgid "Originating ticket: #%1"
+msgstr "Opprinnelig sak: #%1"
+
+#: html/Admin/Elements/ModifyQueue:55 html/Admin/Queues/Modify.html:69
+msgid "Over time, priority moves toward"
+msgstr "Over tid beveger prioriteten seg mot"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "Own tickets"
+msgstr "Eie saker"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "OwnTicket"
+msgstr "EieSak"
+
+#: etc/initialdata:38 html/Elements/MyRequests:32 html/SelfService/Elements/MyRequests:30 html/Ticket/Create.html:48 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/EditPeople:44 html/Ticket/Elements/ShowPeople:27 html/Ticket/Update.html:63 lib/RT/ACE_Overlay.pm:86 lib/RT/Tickets_Overlay.pm:1244
+msgid "Owner"
+msgstr "Eier"
+
+#: lib/RT/Ticket_Overlay.pm:3071
+#. ($OldOwnerObj->Name,  $NewOwnerObj->Name)
+msgid "Owner changed from %1 to %2"
+msgstr "Eier endret fra %1 til %2"
+
+#: lib/RT/Transaction_Overlay.pm:582
+#. ($Old->Name , $New->Name)
+msgid "Owner forcibly changed from %1 to %2"
+msgstr "Eier ble tvunget til å endres fra %1 til %2"
+
+#: html/Search/Elements/PickRestriction:31
+msgid "Owner is"
+msgstr "Eier er"
+
+#: html/Admin/Users/Modify.html:174 html/User/Prefs.html:56
+msgid "Pager"
+msgstr "Personsøker"
+
+#: html/Admin/Elements/ModifyUser:74
+msgid "PagerPhone"
+msgstr "PersonSøker"
+
+#: NOT FOUND IN SOURCE
+msgid "Parent"
+msgstr "Forelder"
+
+#: html/Ticket/Create.html:182 html/Ticket/Elements/EditLinks:127 html/Ticket/Elements/EditLinks:58 html/Ticket/Elements/ShowLinks:47
+msgid "Parents"
+msgstr "Foreldre"
+
+#: html/Elements/Login:52 html/User/Prefs.html:61
+msgid "Password"
+msgstr "Passord"
+
+#: html/NoAuth/Reminder.html:25
+msgid "Password Reminder"
+msgstr "Passordhint"
+
+#: lib/RT/User_Overlay.pm:169 lib/RT/User_Overlay.pm:868
+msgid "Password too short"
+msgstr "For kort passord"
+
+#: html/Admin/Users/Modify.html:291 html/User/Prefs.html:172
+#. (loc_fuzzy($msg))
+msgid "Password: %1"
+msgstr "Passord: %1"
+
+#: html/Admin/Users/Modify.html:293
+msgid "Passwords do not match."
+msgstr "Passordene stemmer ikke overens."
+
+#: html/User/Prefs.html:174
+msgid "Passwords do not match. Your password has not been changed"
+msgstr "Passordene stemmer ikke overrens. Passordet ble ikke endret"
+
+#: html/Ticket/Elements/ShowSummary:45 html/Ticket/Elements/Tabs:96 html/Ticket/ModifyAll.html:51
+msgid "People"
+msgstr "Folk"
+
+#: etc/initialdata:126
+msgid "Perform a user-defined action"
+msgstr "Kjør en brukerdefinert handling"
+
+#: lib/RT/ACE_Overlay.pm:231 lib/RT/ACE_Overlay.pm:237 lib/RT/ACE_Overlay.pm:563 lib/RT/ACE_Overlay.pm:573 lib/RT/ACE_Overlay.pm:583 lib/RT/ACE_Overlay.pm:648 lib/RT/CurrentUser.pm:83 lib/RT/CurrentUser.pm:92 lib/RT/CustomField_Overlay.pm:101 lib/RT/CustomField_Overlay.pm:202 lib/RT/CustomField_Overlay.pm:234 lib/RT/CustomField_Overlay.pm:511 lib/RT/CustomField_Overlay.pm:91 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1099 lib/RT/Group_Overlay.pm:1108 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1163 lib/RT/Group_Overlay.pm:1169 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:904 lib/RT/Group_Overlay.pm:908 lib/RT/Group_Overlay.pm:921 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:931 lib/RT/Scrip_Overlay.pm:126 lib/RT/Scrip_Overlay.pm:137 lib/RT/Scrip_Overlay.pm:197 lib/RT/Scrip_Overlay.pm:430 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:88 lib/RT/Template_Overlay.pm:94 lib/RT/Ticket_Overlay.pm:1341 lib/RT/Ticket_Overlay.pm:1351 lib/RT/Ticket_Overlay.pm:1365 lib/RT/Ticket_Overlay.pm:1518 lib/RT/Ticket_Overlay.pm:1527 lib/RT/Ticket_Overlay.pm:1540 lib/RT/Ticket_Overlay.pm:1875 lib/RT/Ticket_Overlay.pm:2013 lib/RT/Ticket_Overlay.pm:2177 lib/RT/Ticket_Overlay.pm:2244 lib/RT/Ticket_Overlay.pm:2603 lib/RT/Ticket_Overlay.pm:2675 lib/RT/Ticket_Overlay.pm:2769 lib/RT/Ticket_Overlay.pm:2784 lib/RT/Ticket_Overlay.pm:2978 lib/RT/Ticket_Overlay.pm:3206 lib/RT/Ticket_Overlay.pm:3404 lib/RT/Ticket_Overlay.pm:3566 lib/RT/Ticket_Overlay.pm:3618 lib/RT/Ticket_Overlay.pm:3783 lib/RT/Transaction_Overlay.pm:466 lib/RT/Transaction_Overlay.pm:473 lib/RT/Transaction_Overlay.pm:502 lib/RT/Transaction_Overlay.pm:509 lib/RT/User_Overlay.pm:1355 lib/RT/User_Overlay.pm:570 lib/RT/User_Overlay.pm:605 lib/RT/User_Overlay.pm:861 lib/RT/User_Overlay.pm:962
+msgid "Permission Denied"
+msgstr "Ingen Tilgang"
+
+#: html/User/Elements/Tabs:35
+msgid "Personal Groups"
+msgstr "Personlige Grupper"
+
+#: html/User/Groups/index.html:30 html/User/Groups/index.html:40
+msgid "Personal groups"
+msgstr "Personlige grupper"
+
+#: html/User/Elements/DelegateRights:37
+msgid "Personal groups:"
+msgstr "Personlige grupper:"
+
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:49
+msgid "Phone numbers"
+msgstr "Telefonnummer"
+
+#: NOT FOUND IN SOURCE
+msgid "Placeholder"
+msgstr "Stedholder"
+
+#: NOT FOUND IN SOURCE
+msgid "Pref"
+msgstr "Pref"
+
+#: html/Elements/Header:52 html/Elements/Tabs:53 html/SelfService/Elements/Tabs:51 html/SelfService/Prefs.html:25 html/User/Prefs.html:25 html/User/Prefs.html:28
+msgid "Preferences"
+msgstr "Instillinger"
+
+#: NOT FOUND IN SOURCE
+msgid "Prefs"
+msgstr "Pref"
+
+#: lib/RT/Action/Generic.pm:160
+msgid "Prepare Stubbed"
+msgstr "Klargjør Forkortet"
+
+#: html/Ticket/Elements/Tabs:61
+msgid "Prev"
+msgstr "Forrige"
+
+#: html/Search/Listing.html:44
+msgid "Previous page"
+msgstr "Forrige side"
+
+#: NOT FOUND IN SOURCE
+msgid "Pri"
+msgstr "Pri"
+
+#: lib/RT/ACE_Overlay.pm:133 lib/RT/ACE_Overlay.pm:208 lib/RT/ACE_Overlay.pm:552
+#. ($args{'PrincipalId'})
+msgid "Principal %1 not found."
+msgstr "Primær %1 ikke funnet."
+
+#: html/Search/Elements/PickRestriction:54 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:54 html/Ticket/Elements/ShowBasics:39 lib/RT/Tickets_Overlay.pm:1042
+msgid "Priority"
+msgstr "Prioritet"
+
+#: html/Admin/Elements/ModifyQueue:51 html/Admin/Queues/Modify.html:65
+msgid "Priority starts at"
+msgstr "Prioritet starter på"
+
+#: etc/initialdata:25
+msgid "Privileged"
+msgstr "Priviligert"
+
+#: html/Admin/Users/Modify.html:271 html/User/Prefs.html:163
+#. (loc_fuzzy($msg))
+msgid "Privileged status: %1"
+msgstr "Priviligert status: %1"
+
+#: html/Admin/Users/index.html:62
+msgid "Privileged users"
+msgstr "Priviligerte brukere"
+
+#: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
+msgid "Pseudogroup for internal use"
+msgstr "Pseduogruppe for intern bruk"
+
+#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Elements/Quicksearch:29 html/Search/Elements/PickRestriction:46 html/SelfService/Create.html:33 html/Ticket/Create.html:38 html/Ticket/Elements/EditBasics:64 html/Ticket/Elements/ShowBasics:43 html/User/Elements/DelegateRights:80 lib/RT/Tickets_Overlay.pm:883
+msgid "Queue"
+msgstr "Kø"
+
+#: html/Admin/Queues/CustomField.html:42 html/Admin/Queues/Scrip.html:50 html/Admin/Queues/Scrips.html:46 html/Admin/Queues/Templates.html:44
+#. ($Queue)
+#. ($id)
+msgid "Queue %1 not found"
+msgstr "Køen %1 kunne ikke finnes"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue '%1' not found\\n"
+msgstr "Køen '%1' ikke funnet\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Keyword Selections"
+msgstr "Nøkkelordvalg for kø"
+
+#: html/Admin/Elements/ModifyQueue:31 html/Admin/Queues/Modify.html:43
+msgid "Queue Name"
+msgstr "Kønavn"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Scrips"
+msgstr "Køscrip"
+
+#: lib/RT/Queue_Overlay.pm:263
+msgid "Queue already exists"
+msgstr "Køen eksisterer allerede"
+
+#: lib/RT/Queue_Overlay.pm:272 lib/RT/Queue_Overlay.pm:278
+msgid "Queue could not be created"
+msgstr "Køen kunne ikke opprettes"
+
+#: html/Ticket/Create.html:205
+msgid "Queue could not be loaded."
+msgstr "Køen kunne ikke lastes."
+
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:282
+msgid "Queue created"
+msgstr "Køen opprettet"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue is not specified."
+msgstr "Køen er ikke oppgitt."
+
+#: html/SelfService/Display.html:71 lib/RT/CustomField_Overlay.pm:98
+msgid "Queue not found"
+msgstr "Køen ikke funnet"
+
+#: html/Admin/Elements/Tabs:38 html/Admin/index.html:35
+msgid "Queues"
+msgstr "Køer"
+
+#: html/Elements/Quicksearch:25
+msgid "Quick search"
+msgstr "Raskt søk"
+
+#: html/Elements/Login:44
+#. ($RT::VERSION)
+msgid "RT %1"
+msgstr "RT %1"
+
+#: docs/design_docs/string-extraction-guide.txt:70
+#. ($RT::VERSION, $RT::rtname)
+msgid "RT %1 for %2"
+msgstr "RT %1 for %2"
+
+#: html/Elements/Footer:32
+#. ($RT::VERSION)
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr "RT %1 fra <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: html/Admin/index.html:25 html/Admin/index.html:26
+msgid "RT Administration"
+msgstr "RT-administrasjon"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Authentication error."
+msgstr "RT Autentiseringsfeil."
+
+#: NOT FOUND IN SOURCE
+msgid "RT Bounce: %1"
+msgstr "RT Avvisning: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Configuration error"
+msgstr "RT Konfigurasjonsfeil"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Critical error. Message not recorded!"
+msgstr "Kritisk RT feil. Meldingen ble ikke lagret!"
+
+#: html/Elements/Error:41 html/SelfService/Error.html:41
+msgid "RT Error"
+msgstr "RT Feil"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Received mail (%1) from itself."
+msgstr "RT Mottok mail (%1) fra seg selv."
+
+#: NOT FOUND IN SOURCE
+msgid "RT Recieved mail (%1) from itself."
+msgstr "RT Mottok mail (%1) fra seg selv."
+
+#: NOT FOUND IN SOURCE
+msgid "RT Self Service / Closed Tickets"
+msgstr "RT Selvbetjening / Lukkede Saker"
+
+#: html/index.html:25 html/index.html:28
+msgid "RT at a glance"
+msgstr "RT oversikt"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't authenticate you"
+msgstr "RT kunne ikke autentisere deg"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find requestor via its external database lookup"
+msgstr "RT kunne ikke finne kunde via sitt eksterne databaseoppslag"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find the queue: %1"
+msgstr "RT kunne ikke finne køen: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't validate this PGP signature. \\n"
+msgstr "RT kunne ikke validere denne PGP signaturen. \\n" 
+
+#: html/Elements/PageLayout:26
+#. ($RT::rtname)
+msgid "RT for %1"
+msgstr "RT for %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr "RT for %1: %2"
+
+#: NOT FOUND IN SOURCE
+msgid "RT has proccessed your commands"
+msgstr "RT har behandlet dine kommandoer"
+
+#: html/Elements/Login:92
+#. ('2003')
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT er &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;. Den er distribuert under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>""
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT er &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;. Den er distribuert under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>""
+
+#: NOT FOUND IN SOURCE
+msgid "RT thinks this message may be a bounce"
+msgstr "RT tror denne meldingen kan være en returmail"
+
+#: NOT FOUND IN SOURCE
+msgid "RT will process this message as if it were unsigned.\\n"
+msgstr "RT vil behandle denne meldingen som om den var usignert"
+
+#: NOT FOUND IN SOURCE
+msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+msgstr "RT's epost kommandomodus krever PGP autentisering. Meldingen din var enten ikke signert, eller signaturen din kunne ikke bekreftes."
+
+#: html/Admin/Users/Modify.html:58 html/Admin/Users/Prefs.html:52 html/User/Prefs.html:44
+msgid "Real Name"
+msgstr "Ekte Navn"
+
+#: html/Admin/Elements/ModifyUser:48
+msgid "RealName"
+msgstr "EkteNavn"
+
+#: html/Ticket/Create.html:185 html/Ticket/Elements/EditLinks:139 html/Ticket/Elements/EditLinks:94 html/Ticket/Elements/ShowLinks:71
+msgid "Referred to by"
+msgstr "Referert til av"
+
+#: html/Elements/SelectLinkType:28 html/Ticket/Create.html:184 html/Ticket/Elements/EditLinks:135 html/Ticket/Elements/EditLinks:80 html/Ticket/Elements/ShowLinks:61
+msgid "Refers to"
+msgstr "Refererer til"
+
+#: NOT FOUND IN SOURCE
+msgid "RefersTo"
+msgstr "RefererTil"
+
+#: NOT FOUND IN SOURCE
+msgid "Refine"
+msgstr "Redefiner"
+
+#: html/Search/Elements/PickRestriction:27
+msgid "Refine search"
+msgstr "Redefiner søket"
+
+#: html/Elements/Refresh:36
+#. ($value/60)
+msgid "Refresh this page every %1 minutes."
+msgstr "Last siden p nytt hvert %1 minutt."
+
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:62 html/Ticket/ModifyAll.html:57
+msgid "Relationships"
+msgstr "Forhold"
+
+#: html/Search/Bulk.html:93
+msgid "Remove AdminCc"
+msgstr "Fjern AdminCc"
+
+#: html/Search/Bulk.html:91
+msgid "Remove Cc"
+msgstr "Fjern Cc"
+
+#: html/Search/Bulk.html:89
+msgid "Remove Requestor"
+msgstr "Fjern Kunde"
+
+#: html/Ticket/Elements/ShowTransaction:173 html/Ticket/Elements/Tabs:122
+msgid "Reply"
+msgstr "Svar"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "Reply to tickets"
+msgstr "Svar p sak"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "ReplyToTicket"
+msgstr "SvarPÂSak"
+
+#: etc/initialdata:44 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:87
+msgid "Requestor"
+msgstr "Kunde"
+
+#: html/Search/Elements/PickRestriction:38
+msgid "Requestor email address"
+msgstr "Kundens epostaddresse"
+
+#: NOT FOUND IN SOURCE
+msgid "Requestor(s)"
+msgstr "Kunde(r)"
+
+#: NOT FOUND IN SOURCE
+msgid "RequestorAddresses"
+msgstr "KundeAddresser"
+
+#: html/SelfService/Create.html:41 html/Ticket/Create.html:56 html/Ticket/Elements/EditPeople:48 html/Ticket/Elements/ShowPeople:31
+msgid "Requestors"
+msgstr "Kunder"
+
+#: html/Admin/Elements/ModifyQueue:61 html/Admin/Queues/Modify.html:75
+msgid "Requests should be due in"
+msgstr "Forespørsler skal være behandlet innen"
+
+#: html/Elements/Submit:62
+msgid "Reset"
+msgstr "Reset"
+
+#: html/Admin/Users/Modify.html:159 html/User/Prefs.html:50
+msgid "Residence"
+msgstr "Hjemme"
+
+#: html/Ticket/Elements/Tabs:132
+msgid "Resolve"
+msgstr "Løs"
+
+#: html/Ticket/Update.html:133
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Resolve ticket #%1 (%2)"
+msgstr "Løs saknr #%1 (%2)"
+
+#: etc/initialdata:308 html/Elements/SelectDateType:28 lib/RT/Ticket_Overlay.pm:1170
+msgid "Resolved"
+msgstr "Løst"
+
+#: html/Search/Bulk.html:123 html/Ticket/ModifyAll.html:73 html/Ticket/Update.html:73
+msgid "Response to requestors"
+msgstr "Svar til kunder"
+
+#: html/Elements/ListActions:26
+msgid "Results"
+msgstr "Resultater"
+
+#: html/Search/Elements/PickRestriction:105
+msgid "Results per page"
+msgstr "Resultater per side"
+
+#: html/Admin/Elements/ModifyUser:33 html/Admin/Users/Modify.html:100 html/User/Prefs.html:72
+msgid "Retype Password"
+msgstr "Skriv Passord igjen"
+
+#: NOT FOUND IN SOURCE
+msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+msgstr "Rettighet %1 kunne ikke finnes for %2  %3 in scope %4 (%5)\\n"
+
+#: lib/RT/ACE_Overlay.pm:613
+msgid "Right Delegated"
+msgstr "Rettighet Deligert"
+
+#: lib/RT/ACE_Overlay.pm:303
+msgid "Right Granted"
+msgstr "Rettighet Tildelt"
+
+#: lib/RT/ACE_Overlay.pm:161
+msgid "Right Loaded"
+msgstr "Rettighet lastet"
+
+#: lib/RT/ACE_Overlay.pm:678 lib/RT/ACE_Overlay.pm:693
+msgid "Right could not be revoked"
+msgstr "Rettigheten kunne ikke trekkes tilbake"
+
+#: html/User/Delegation.html:64
+msgid "Right not found"
+msgstr "Rettighet ikke funnet"
+
+#: lib/RT/ACE_Overlay.pm:543 lib/RT/ACE_Overlay.pm:638
+msgid "Right not loaded."
+msgstr "Rettighet ikke lastet."
+
+#: lib/RT/ACE_Overlay.pm:689
+msgid "Right revoked"
+msgstr "Rettighet fjernet"
+
+#: html/Admin/Elements/UserTabs:41
+msgid "Rights"
+msgstr "Rettigheter"
+
+#: lib/RT/Interface/Web.pm:792
+#. ($object_type)
+msgid "Rights could not be granted for %1"
+msgstr "Rettigheter kunne ikke tildeles for %1"
+
+#: lib/RT/Interface/Web.pm:825
+#. ($object_type)
+msgid "Rights could not be revoked for %1"
+msgstr "Rettigheter kunne ikke trekkes tilbake for %1"
+
+#: html/Admin/Global/GroupRights.html:51 html/Admin/Queues/GroupRights.html:52
+msgid "Roles"
+msgstr "Roller"
+
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr "RootGodkjenning"
+
+#: lib/RT/Date.pm:393
+msgid "Sat."
+msgstr "Lør."
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyLinks.html:39 html/Ticket/ModifyPeople.html:38
+msgid "Save Changes"
+msgstr "Lagre Endringer"
+
+#: NOT FOUND IN SOURCE
+msgid "Save changes"
+msgstr "Lage endringer"
+
+#: html/Admin/Global/Scrip.html:49
+#. ($ARGS{'id'})
+msgid "Scrip #%1"
+msgstr "Scrip #%1"
+
+#: lib/RT/Scrip_Overlay.pm:176
+msgid "Scrip Created"
+msgstr "Scrip Opprettet"
+
+#: html/Admin/Elements/EditScrips:84
+msgid "Scrip deleted"
+msgstr "Scrip slettet"
+
+#: html/Admin/Elements/QueueTabs:46 html/Admin/Elements/SystemTabs:33 html/Admin/Global/index.html:41
+msgid "Scrips"
+msgstr "Scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "Scrips for %1\\n"
+msgstr "Scrip for %1\\n"
+
+#: html/Admin/Queues/Scrips.html:33
+msgid "Scrips which apply to all queues"
+msgstr "Scrip som gjelder for alle køer"
+
+#: html/Elements/SimpleSearch:27 html/Search/Elements/PickRestriction:126 html/Ticket/Elements/Tabs:159
+msgid "Search"
+msgstr "Søk"
+
+#: NOT FOUND IN SOURCE
+msgid "Search Criteria"
+msgstr "Søkekriteria"
+
+#: html/Approvals/Elements/PendingMyApproval:39
+msgid "Search for approvals"
+msgstr "Søk etter godkjenninger"
+
+#: bin/rt-crontool:188
+msgid "Security:"
+msgstr "Sikkerhet:"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "SeeQueue"
+msgstr "SeKø"
+
+#: html/Admin/Groups/index.html:40
+msgid "Select a group"
+msgstr "Velg en gruppe"
+
+#: NOT FOUND IN SOURCE
+msgid "Select a queue"
+msgstr "Velg en kø"
+
+#: html/Admin/Users/index.html:25 html/Admin/Users/index.html:28
+msgid "Select a user"
+msgstr "Velg en bruker"
+
+#: html/Admin/Global/CustomField.html:38 html/Admin/Global/CustomFields.html:36
+msgid "Select custom field"
+msgstr "Velg fleksifelt"
+
+#: html/Admin/Elements/GroupTabs:52 html/User/Elements/GroupTabs:50
+msgid "Select group"
+msgstr "Velg gruppe"
+
+#: lib/RT/CustomField_Overlay.pm:422
+msgid "Select multiple values"
+msgstr "Velg flere verdier"
+
+#: lib/RT/CustomField_Overlay.pm:419
+msgid "Select one value"
+msgstr "Velg en verdi"
+
+#: html/Admin/Elements/QueueTabs:67
+msgid "Select queue"
+msgstr "Velg kø"
+
+#: html/Admin/Global/Scrip.html:37 html/Admin/Global/Scrips.html:36 html/Admin/Queues/Scrip.html:40 html/Admin/Queues/Scrips.html:50
+msgid "Select scrip"
+msgstr "Velg scrip"
+
+#: html/Admin/Global/Template.html:57 html/Admin/Global/Templates.html:36 html/Admin/Queues/Template.html:55 html/Admin/Queues/Templates.html:47
+msgid "Select template"
+msgstr "Velg mal"
+
+#: html/Admin/Elements/UserTabs:49
+msgid "Select user"
+msgstr "Velg bruker"
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "SelectMultiple"
+msgstr "VelgFlere"
+
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectSingle"
+msgstr "VelgEnkelt"
+
+#: NOT FOUND IN SOURCE
+msgid "Self Service"
+msgstr "Selvbetjening"
+
+#: etc/initialdata:114
+msgid "Send mail to all watchers"
+msgstr "Send epost til alle overvåkere"
+
+#: etc/initialdata:110
+msgid "Send mail to all watchers as a \"comment\""
+msgstr "Send epost til alle overvåkere som \"kommentar\""
+
+#: etc/initialdata:105
+msgid "Send mail to requestors and Ccs"
+msgstr "Send epost til kunder og Cc"
+
+#: etc/initialdata:100
+msgid "Send mail to requestors and Ccs as a comment"
+msgstr "Send epost til kunder og Cc som kommentar"
+
+#: etc/initialdata:79
+msgid "Sends a message to the requestors"
+msgstr "Sender en melding til kundene"
+
+#: etc/initialdata:118 etc/initialdata:122
+msgid "Sends mail to explicitly listed Ccs and Bccs"
+msgstr "Send epost til eksplisit oppgitte Ccer og Bccer"
+
+#: etc/initialdata:95
+msgid "Sends mail to the administrative Ccs"
+msgstr "Send epost til Administrative Ccer"
+
+#: etc/initialdata:91
+msgid "Sends mail to the administrative Ccs as a comment"
+msgstr "Sender epost til de administrative Ccene som kommentar"
+
+#: etc/initialdata:83 etc/initialdata:87
+msgid "Sends mail to the owner"
+msgstr "Sender epost til eieren"
+
+#: lib/RT/Date.pm:419
+msgid "Sep."
+msgstr "Sep."
+
+#: NOT FOUND IN SOURCE
+msgid "September"
+msgstr "September"
+
+#: NOT FOUND IN SOURCE
+msgid "Show Results"
+msgstr "Vis Resultater"
+
+#: html/Approvals/Elements/PendingMyApproval:44
+msgid "Show approved requests"
+msgstr "Vis godkjente forespørsler"
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show basics"
+msgstr "Vis basisinfo"
+
+#: html/Approvals/Elements/PendingMyApproval:45
+msgid "Show denied requests"
+msgstr "Vis avviste forespørsler"
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show details"
+msgstr "Vis detaljer"
+
+#: html/Approvals/Elements/PendingMyApproval:43
+msgid "Show pending requests"
+msgstr "Vis ventende forespørsler"
+
+#: html/Approvals/Elements/PendingMyApproval:46
+msgid "Show requests awaiting other approvals"
+msgstr "Vis forespørsler som venter på andre godkjenninger"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "Show ticket private commentary"
+msgstr "Vis sakens private kommentarer"
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "Show ticket summaries"
+msgstr "Vis sakssammendrag"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "ShowACL"
+msgstr "VisACL"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "ShowScrips"
+msgstr "VisScrip"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "ShowTemplate"
+msgstr "VisMal"
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "ShowTicket"
+msgstr "VisSak"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "ShowTicketComments"
+msgstr "VisSaksKommentarer"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Sign up as a ticket Requestor or ticket or queue Cc"
+msgstr "Meld deg på som saksforespørrer eller sak/kø Cc"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "Sign up as a ticket or queue AdminCc"
+msgstr "Meld deg på som sak/kø AdminCc"
+
+#: html/Admin/Elements/ModifyUser:39 html/Admin/Users/Modify.html:191 html/Admin/Users/Prefs.html:32 html/User/Prefs.html:112
+msgid "Signature"
+msgstr "Signatur"
+
+#: NOT FOUND IN SOURCE
+msgid "Signed in as %1"
+msgstr "Logget inn som %1"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:26
+msgid "Single"
+msgstr "Enkel"
+
+#: html/Elements/Header:51
+msgid "Skip Menu"
+msgstr "Dropp Meny"
+
+#: html/Admin/Elements/AddCustomFieldValue:29
+msgid "Sort"
+msgstr "Sorter"
+
+#: NOT FOUND IN SOURCE
+msgid "Sort key"
+msgstr "Sorter nøkkel"
+
+#: html/Search/Elements/PickRestriction:109
+msgid "Sort results by"
+msgstr "Sorter resultater etter"
+
+#: NOT FOUND IN SOURCE
+msgid "SortOrder"
+msgstr "SorteringsRekkefølge"
+
+#: NOT FOUND IN SOURCE
+msgid "Stalled"
+msgstr "Pauset"
+
+#: NOT FOUND IN SOURCE
+msgid "Start page"
+msgstr "Startside"
+
+#: html/Elements/SelectDateType:27 html/Ticket/Elements/EditDates:32 html/Ticket/Elements/ShowDates:35
+msgid "Started"
+msgstr "Startet"
+
+#: NOT FOUND IN SOURCE
+msgid "Started date '%1' could not be parsed"
+msgstr "Startdato '%1' kunne ikke tolkes"
+
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:27 html/Ticket/Elements/ShowDates:31
+msgid "Starts"
+msgstr "Starter"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts By"
+msgstr "Starter Etter"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts date '%1' could not be parsed"
+msgstr "Startdato '%1' kunne ikke tolkes"
+
+#: html/Admin/Elements/ModifyUser:82 html/Admin/Users/Modify.html:138 html/User/Prefs.html:94
+msgid "State"
+msgstr "Stat"
+
+#: html/Elements/MyRequests:31 html/Elements/MyTickets:31 html/Search/Elements/PickRestriction:74 html/SelfService/Elements/MyRequests:29 html/SelfService/Update.html:31 html/Ticket/Create.html:42 html/Ticket/Elements/EditBasics:38 html/Ticket/Elements/ShowBasics:31 html/Ticket/Update.html:60 lib/RT/Ticket_Overlay.pm:1164 lib/RT/Tickets_Overlay.pm:908
+msgid "Status"
+msgstr "Status"
+
+#: etc/initialdata:294
+msgid "Status Change"
+msgstr "Statusendring"
+
+#: lib/RT/Transaction_Overlay.pm:528
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
+msgid "Status changed from %1 to %2"
+msgstr "Status endret fra %1 til %2"
+
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr "EndreStatus"
+
+#: html/Ticket/Elements/Tabs:147
+msgid "Steal"
+msgstr "Stjel"
+
+#: lib/RT/Transaction_Overlay.pm:587
+#. ($Old->Name)
+msgid "Stolen from %1 "
+msgstr "Stjålet fra %1 "
+
+#: html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Search/Bulk.html:126 html/Search/Elements/PickRestriction:43 html/SelfService/Create.html:57 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:32 html/Ticket/Create.html:84 html/Ticket/Elements/EditBasics:28 html/Ticket/ModifyAll.html:79 html/Ticket/Update.html:77 lib/RT/Ticket_Overlay.pm:1160 lib/RT/Tickets_Overlay.pm:987
+msgid "Subject"
+msgstr "Emne"
+
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/Transaction_Overlay.pm:609
+#. ($self->Data)
+msgid "Subject changed to %1"
+msgstr "Endre emne til %1"
+
+#: html/Elements/Submit:59
+msgid "Submit"
+msgstr "Oppdater"
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr "Send Arbeidsflyt"
+
+#: lib/RT/Group_Overlay.pm:749
+msgid "Succeeded"
+msgstr "Lykkes"
+
+#: lib/RT/Date.pm:394
+msgid "Sun."
+msgstr "Søn."
+
+#: lib/RT/System.pm:54
+msgid "SuperUser"
+msgstr "SuperBruker"
+
+#: html/User/Elements/DelegateRights:77
+msgid "System"
+msgstr "System"
+
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:567 lib/RT/Interface/Web.pm:791 lib/RT/Interface/Web.pm:824
+msgid "System Error"
+msgstr "Systemfeil"
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. Right not granted."
+msgstr "Systemfeil. Rettighet ikke tildelt."
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. right not granted"
+msgstr "Systemfeil. rettigheter ikke tildelt"
+
+#: lib/RT/ACE_Overlay.pm:616
+msgid "System error. Right not delegated."
+msgstr "Systemfeil. Rettighet ikke tildelt."
+
+#: lib/RT/ACE_Overlay.pm:146 lib/RT/ACE_Overlay.pm:223 lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:898
+msgid "System error. Right not granted."
+msgstr "Systemfeil. Rettighet ikke tildelt."
+
+#: NOT FOUND IN SOURCE
+msgid "System error. Unable to grant rights."
+msgstr "Systemfeil. Kunne ikke tildele rettigheter."
+
+#: html/Admin/Global/GroupRights.html:35 html/Admin/Groups/GroupRights.html:37 html/Admin/Queues/GroupRights.html:36
+msgid "System groups"
+msgstr "Systemgrupper"
+
+#: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
+msgid "SystemRolegroup for internal use"
+msgstr "SystemRollegruppe for intern bruk"
+
+#: lib/RT/CurrentUser.pm:318
+msgid "TEST_STRING"
+msgstr "TEST_STRENG"
+
+#: html/Ticket/Elements/Tabs:143
+msgid "Take"
+msgstr "Ta"
+
+#: lib/RT/Transaction_Overlay.pm:573
+msgid "Taken"
+msgstr "Tatt"
+
+#: html/Admin/Elements/EditScrip:81
+msgid "Template"
+msgstr "Mal"
+
+#: html/Admin/Global/Template.html:91 html/Admin/Queues/Template.html:90
+#. ($TemplateObj->Id())
+msgid "Template #%1"
+msgstr "Mal #%1"
+
+#: html/Admin/Elements/EditTemplates:89
+msgid "Template deleted"
+msgstr "Mal slettet"
+
+#: lib/RT/Scrip_Overlay.pm:153
+msgid "Template not found"
+msgstr "Kunne ikke finne mal"
+
+#: NOT FOUND IN SOURCE
+msgid "Template not found\\n"
+msgstr "Kunne ikke finne mal\\n"
+
+#: lib/RT/Template_Overlay.pm:347
+msgid "Template parsed"
+msgstr "Mal tolket"
+
+#: html/Admin/Elements/QueueTabs:49 html/Admin/Elements/SystemTabs:36 html/Admin/Global/index.html:45
+msgid "Templates"
+msgstr "Maler"
+
+#: NOT FOUND IN SOURCE
+msgid "Templates for %1\\n"
+msgstr "Maler for %1\\n"
+
+#: lib/RT/Interface/Web.pm:892
+msgid "That is already the current value"
+msgstr "Verdien er allerede satt"
+
+#: lib/RT/CustomField_Overlay.pm:243
+msgid "That is not a value for this custom field"
+msgstr "Det er ikke en verdi for dette fleksifeltet"
+
+#: lib/RT/Ticket_Overlay.pm:1886
+msgid "That is the same value"
+msgstr "Det er den samme verdien"
+
+#: lib/RT/ACE_Overlay.pm:288 lib/RT/ACE_Overlay.pm:597
+msgid "That principal already has that right"
+msgstr "Den primæren har allerede den rettigheten"
+
+#: lib/RT/Queue_Overlay.pm:633
+#. ($args{'Type'})
+msgid "That principal is already a %1 for this queue"
+msgstr "Den primæren er allerede en %1 for denne køen"
+
+#: lib/RT/Ticket_Overlay.pm:1434
+#. ($self->loc($args{'Type'}))
+msgid "That principal is already a %1 for this ticket"
+msgstr "Den primæren er allerede en %1 for denne køen"
+
+#: lib/RT/Queue_Overlay.pm:732
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this queue"
+msgstr "Den primæren er ikke en %1 for denne køen"
+
+#: lib/RT/Ticket_Overlay.pm:1551
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this ticket"
+msgstr "Den primæren er ikke en %1 for denne saken"
+
+#: lib/RT/Ticket_Overlay.pm:1882
+msgid "That queue does not exist"
+msgstr "Den køen eksisterer ikke"
+
+#: lib/RT/Ticket_Overlay.pm:3210
+msgid "That ticket has unresolved dependencies"
+msgstr "Denne saken har uløste avhengigheter"
+
+#: NOT FOUND IN SOURCE
+msgid "That user already has that right"
+msgstr "Den brukeren har allerede den rettigheten"
+
+#: lib/RT/Ticket_Overlay.pm:3020
+msgid "That user already owns that ticket"
+msgstr "Den brukeren eier allerede den saken"
+
+#: lib/RT/Ticket_Overlay.pm:2986
+msgid "That user does not exist"
+msgstr "Den brukeren finnes ikke"
+
+#: lib/RT/User_Overlay.pm:315
+msgid "That user is already privileged"
+msgstr "Den brukeren er allerede priviligert"
+
+#: lib/RT/User_Overlay.pm:336
+msgid "That user is already unprivileged"
+msgstr "Den brukeren er allerede upriviligert"
+
+#: lib/RT/User_Overlay.pm:328
+msgid "That user is now privileged"
+msgstr "Denne brukeren er nå priviligert"
+
+#: lib/RT/User_Overlay.pm:349
+msgid "That user is now unprivileged"
+msgstr "Dette brukeren er nå upriviligert"
+
+#: NOT FOUND IN SOURCE
+msgid "That user is now unprivilegedileged"
+msgstr "Den brukeren er allerede upriviligert"
+
+#: lib/RT/Ticket_Overlay.pm:3012
+msgid "That user may not own tickets in that queue"
+msgstr "Den brukeren kan ikke eie saker i den køen"
+
+#: lib/RT/Link_Overlay.pm:206
+msgid "That's not a numerical id"
+msgstr "Dette er ikke en numerisk id"
+
+#: html/SelfService/Display.html:32 html/Ticket/Create.html:150 html/Ticket/Elements/ShowSummary:28
+msgid "The Basics"
+msgstr "Detaljer"
+
+#: lib/RT/ACE_Overlay.pm:88
+msgid "The CC of a ticket"
+msgstr "CCen til en sak"
+
+#: lib/RT/ACE_Overlay.pm:89
+msgid "The administrative CC of a ticket"
+msgstr "Administrative CCer for en sak"
+
+#: lib/RT/Ticket_Overlay.pm:2213
+msgid "The comment has been recorded"
+msgstr "Kommentarer er lagret"
+
+#: bin/rt-crontool:198
+msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
+msgstr "De følgende kommandoene vil finne alle aktive saker i køen 'general' og sette deres prioritet til 99 hvis de ikke har blitt rørt de siste 4 timene:"
+
+#: bin/rt-commit-handler:756 bin/rt-commit-handler:766
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr "De følgende kommandoene ble ikke behandlet:\\n\\n"
+
+#: lib/RT/Interface/Web.pm:895
+msgid "The new value has been set."
+msgstr "Den nye verdien har blitt satt."
+
+#: lib/RT/ACE_Overlay.pm:86
+msgid "The owner of a ticket"
+msgstr "Eieren av en sak"
+
+#: lib/RT/ACE_Overlay.pm:87
+msgid "The requestor of a ticket"
+msgstr "Forespørren av en sak"
+
+#: html/Admin/Elements/EditUserComments:26
+msgid "These comments aren't generally visible to the user"
+msgstr "Disse kommentarene er generelt ikke synlig for brukeren"
+
+#: NOT FOUND IN SOURCE
+msgid "This ticket %1 %2 (%3)\\n"
+msgstr "Denne saken %1 %2 (%3)\\n"
+
+#: bin/rt-crontool:189
+msgid "This tool allows the user to run arbitrary perl modules from within RT."
+msgstr "Dette verktøyet tillater brukeren  å kjøre perlmoduler fra inni RT."
+
+#: lib/RT/Transaction_Overlay.pm:251
+msgid "This transaction appears to have no content"
+msgstr "Denne transaksjonen ser ikke ut til å ha noe innhold"
+
+#: html/Ticket/Elements/ShowRequestor:47
+#. ($rows)
+msgid "This user's %1 highest priority tickets"
+msgstr "Denne brukerens %1 høyst prioriterte saker"
+
+#: NOT FOUND IN SOURCE
+msgid "This user's 25 highest priority tickets"
+msgstr "Denne brukerens 23 høys prioriterte saker"
+
+#: lib/RT/Date.pm:391
+msgid "Thu."
+msgstr "Tor."
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket"
+msgstr "Sak"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1  %2"
+msgstr "Sak # %1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1 Jumbo update: %2"
+msgstr "Sak $ %1 Jumbo oppdater: %2"
+
+#: html/Ticket/ModifyAll.html:25 html/Ticket/ModifyAll.html:29
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket #%1 Jumbo update: %2"
+msgstr "Sak #%1 Jumbo oppdatering: %2"
+
+#: html/Approvals/Elements/ShowDependency:46
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Ticket #%1: %2"
+msgstr "Sak #%1: %2"
+
+#: lib/RT/Ticket_Overlay.pm:587 lib/RT/Ticket_Overlay.pm:608
+#. ($self->Id, $QueueObj->Name)
+msgid "Ticket %1 created in queue '%2'"
+msgstr "Sak %1 opprettet i '%2' køen"
+
+#: bin/rt-commit-handler:760
+#. ($Ticket->Id)
+msgid "Ticket %1 loaded\\n"
+msgstr "Sak %1 lastet\\n"
+
+#: html/Search/Bulk.html:181
+#. ($Ticket->Id,$_)
+msgid "Ticket %1: %2"
+msgstr "Sak %1: %2"
+
+#: html/Ticket/History.html:25 html/Ticket/History.html:28
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket History # %1 %2"
+msgstr "Sakshistorikk # %1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket Id"
+msgstr "SaksId"
+
+#: etc/initialdata:309
+msgid "Ticket Resolved"
+msgstr "Løst Sak"
+
+#: html/Search/Elements/PickRestriction:63
+msgid "Ticket attachment"
+msgstr "Saks-vedlegg"
+
+#: lib/RT/Tickets_Overlay.pm:1166
+msgid "Ticket content"
+msgstr "Saks-innhold"
+
+#: lib/RT/Tickets_Overlay.pm:1212
+msgid "Ticket content type"
+msgstr "Sakens innholdstype"
+
+#: lib/RT/Ticket_Overlay.pm:496 lib/RT/Ticket_Overlay.pm:597
+msgid "Ticket could not be created due to an internal error"
+msgstr "Saken kunne ikke opprettes på grunn av en intern feil"
+
+#: lib/RT/Transaction_Overlay.pm:520
+msgid "Ticket created"
+msgstr "Sak opprettet"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket creation failed"
+msgstr "Saksopprettelse feilet"
+
+#: lib/RT/Transaction_Overlay.pm:525
+msgid "Ticket deleted"
+msgstr "Sak slettet"
+
+#: html/REST/1.0/modify:29 html/REST/1.0/update:34
+msgid "Ticket id not found"
+msgstr "Saksid ikke funnet"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket killed"
+msgstr "Sak drept"
+
+#: html/REST/1.0/modify:36 html/REST/1.0/update:41
+msgid "Ticket not found"
+msgstr "Sak ikke funnet"
+
+#: etc/initialdata:295
+msgid "Ticket status changed"
+msgstr "Saksstatus endret"
+
+#: html/Ticket/Update.html:39
+msgid "Ticket watchers"
+msgstr "Saksovervåkere"
+
+#: html/Elements/Tabs:47
+msgid "Tickets"
+msgstr "Saker"
+
+#: lib/RT/Tickets_Overlay.pm:1383
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr "Saker %1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:1348
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr "Saker %1 av %2"
+
+#: html/Elements/ViewUser:26
+#. ($name)
+msgid "Tickets from %1"
+msgstr "Saker fra %1"
+
+#: html/Approvals/Elements/ShowDependency:27
+msgid "Tickets which depend on this approval:"
+msgstr "Saker som er avhengige av denne godkjennelsen:"
+
+#: html/Ticket/Create.html:157 html/Ticket/Elements/EditBasics:48
+msgid "Time Left"
+msgstr "Tid Igjen"
+
+#: html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:43
+msgid "Time Worked"
+msgstr "Arbeidstid"
+
+#: lib/RT/Tickets_Overlay.pm:1139
+msgid "Time left"
+msgstr "Tid igjen"
+
+#: html/Elements/Footer:36
+msgid "Time to display"
+msgstr "Tid å vise"
+
+#: lib/RT/Tickets_Overlay.pm:1115
+msgid "Time worked"
+msgstr "Arbeidstid"
+
+#: NOT FOUND IN SOURCE
+msgid "TimeLeft"
+msgstr "TidIgjen"
+
+#: lib/RT/Ticket_Overlay.pm:1165
+msgid "TimeWorked"
+msgstr "ArbeidsTid"
+
+#: bin/rt-commit-handler:402
+msgid "To generate a diff of this commit:"
+msgstr "For å generere en diff av denne bekreftelsen:"
+
+#: bin/rt-commit-handler:391
+msgid "To generate a diff of this commit:\\n"
+msgstr "For å genere en diff av denne bekreftelsen"
+
+#: lib/RT/Ticket_Overlay.pm:1168
+msgid "Told"
+msgstr "Fortalt"
+
+#: etc/initialdata:237
+msgid "Transaction"
+msgstr "Transaksjon"
+
+#: lib/RT/Transaction_Overlay.pm:640
+#. ($self->Data)
+msgid "Transaction %1 purged"
+msgstr "Transaksjon %1 slettet"
+
+#: lib/RT/Transaction_Overlay.pm:177
+msgid "Transaction Created"
+msgstr "Transaksjon Opprettet"
+
+#: lib/RT/Transaction_Overlay.pm:89
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr "Transaction->Create kunne ikke, siden du ikke spesifiserte en saksid"
+
+#: lib/RT/Transaction_Overlay.pm:699
+msgid "Transactions are immutable"
+msgstr "Transaksjoner er låst"
+
+#: NOT FOUND IN SOURCE
+msgid "Trying to delete a right: %1"
+msgstr "Prøver å slette en rettighet: %1"
+
+#: lib/RT/Date.pm:389
+msgid "Tue."
+msgstr "Tir."
+
+#: html/Admin/Elements/EditCustomField:44 html/Ticket/Elements/AddWatchers:33 html/Ticket/Elements/AddWatchers:44 html/Ticket/Elements/AddWatchers:54 lib/RT/Ticket_Overlay.pm:1166 lib/RT/Tickets_Overlay.pm:959
+msgid "Type"
+msgstr "Type"
+
+#: lib/RT/ScripCondition_Overlay.pm:104
+msgid "Unimplemented"
+msgstr "Uimplementert"
+
+#: html/Admin/Users/Modify.html:68
+msgid "Unix login"
+msgstr "Unix login"
+
+#: html/Admin/Elements/ModifyUser:62
+msgid "UnixUsername"
+msgstr "UnixBrukerNavn"
+
+#: lib/RT/Attachment_Overlay.pm:265
+#. ($self->ContentEncoding)
+msgid "Unknown ContentEncoding %1"
+msgstr "Ukjent InnholdsFormatering %1"
+
+#: html/Elements/SelectResultsPerPage:37
+msgid "Unlimited"
+msgstr "Ubegrenset"
+
+#: etc/initialdata:32
+msgid "Unprivileged"
+msgstr "Upriviligert"
+
+#: lib/RT/Transaction_Overlay.pm:569
+msgid "Untaken"
+msgstr "Ikke tatt"
+
+#: html/Elements/MyTickets:64 html/Search/Bulk.html:33
+msgid "Update"
+msgstr "Oppdater"
+
+#: html/Admin/Users/Prefs.html:62
+msgid "Update ID"
+msgstr "Oppdater ID"
+
+#: html/Search/Bulk.html:120 html/Ticket/ModifyAll.html:66 html/Ticket/Update.html:67
+msgid "Update Type"
+msgstr "Oppdater Type"
+
+#: html/Search/Listing.html:61
+msgid "Update all these tickets at once"
+msgstr "Oppdater alle disse sakene samtidig"
+
+#: html/Admin/Users/Prefs.html:49
+msgid "Update email"
+msgstr "Oppdater epost"
+
+#: html/Admin/Users/Prefs.html:55
+msgid "Update name"
+msgstr "Oppdater navn"
+
+#: lib/RT/Interface/Web.pm:409
+msgid "Update not recorded."
+msgstr "Oppdatering ikke lagret."
+
+#: html/Search/Bulk.html:81
+msgid "Update selected tickets"
+msgstr "Oppdater valgte saker"
+
+#: html/Admin/Users/Prefs.html:36
+msgid "Update signature"
+msgstr "Oppdater signatur"
+
+#: html/Ticket/ModifyAll.html:63
+msgid "Update ticket"
+msgstr "Oppdater sak"
+
+#: NOT FOUND IN SOURCE
+msgid "Update ticket # %1"
+msgstr "Ooppdater sak # %1"
+
+#: html/SelfService/Update.html:25 html/SelfService/Update.html:47
+#. ($Ticket->id)
+msgid "Update ticket #%1"
+msgstr "Oppdater sak #%1"
+
+#: html/Ticket/Update.html:135
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Update ticket #%1 (%2)"
+msgstr "Oppdater sak #%1 (%2)"
+
+#: lib/RT/Interface/Web.pm:407
+msgid "Update type was neither correspondence nor comment."
+msgstr "Oppdateringstype var verken korrespondanse eller kommentar."
+
+#: html/Elements/SelectDateType:33 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1169
+msgid "Updated"
+msgstr "Oppdatert"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 %2: %3\\n"
+msgstr "Bruker %1 %2: %3\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 Password: %2\\n"
+msgstr "Bruker %1 Passord: %2\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found"
+msgstr "Brukeren '%1' ble ikke funnet"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found\\n"
+msgstr "Brukeren '%1' ble ikke funnet"
+
+#: etc/initialdata:125 etc/initialdata:191
+msgid "User Defined"
+msgstr "Bruker Definert"
+
+#: html/Admin/Users/Prefs.html:59
+msgid "User ID"
+msgstr "BrukerID"
+
+#: html/Elements/SelectUsers:26
+msgid "User Id"
+msgstr "BrukerId"
+
+#: html/Admin/Elements/GroupTabs:47 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/SystemTabs:47 html/Admin/Global/index.html:59
+msgid "User Rights"
+msgstr "Brukerrettigheter"
+
+#: html/Admin/Users/Modify.html:226
+#. ($msg)
+msgid "User could not be created: %1"
+msgstr "Bruker kunne ikke opprettes: %1"
+
+#: lib/RT/User_Overlay.pm:262
+msgid "User created"
+msgstr "Bruker opprettet"
+
+#: html/Admin/Global/GroupRights.html:67 html/Admin/Groups/GroupRights.html:54 html/Admin/Queues/GroupRights.html:68
+msgid "User defined groups"
+msgstr "Brukerdefinerte grupper"
+
+#: NOT FOUND IN SOURCE
+msgid "User notified"
+msgstr "Bruker informert"
+
+#: html/Admin/Users/Prefs.html:25 html/Admin/Users/Prefs.html:29
+msgid "User view"
+msgstr "Brukervisning"
+
+#: html/Admin/Users/Modify.html:48 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:35
+msgid "Username"
+msgstr "Brukernavn"
+
+#: html/Admin/Elements/SelectNewGroupMembers:26 html/Admin/Elements/Tabs:32 html/Admin/Groups/Members.html:55 html/Admin/Queues/People.html:68 html/Admin/index.html:29 html/User/Groups/Members.html:58
+msgid "Users"
+msgstr "Brukere"
+
+#: html/Admin/Users/index.html:65
+msgid "Users matching search criteria"
+msgstr "Brukere som treffer søkekriteria"
+
+#: html/Search/Elements/PickRestriction:51
+msgid "ValueOfQueue"
+msgstr "KøVerdi"
+
+#: html/Admin/Elements/EditCustomField:57
+msgid "Values"
+msgstr "Verdier"
+
+#: NOT FOUND IN SOURCE
+msgid "VrijevormEnkele"
+msgstr "VrijevormEnkele"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Watch"
+msgstr "Overvåk"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "WatchAsAdminCc"
+msgstr "OvervåkSomAdminCc"
+
+#: NOT FOUND IN SOURCE
+msgid "Watcher loaded"
+msgstr "Overvåker lastet"
+
+#: html/Admin/Elements/QueueTabs:42
+msgid "Watchers"
+msgstr "Overvåkere"
+
+#: html/Admin/Elements/ModifyUser:56
+msgid "WebEncoding"
+msgstr "WebFormatering"
+
+#: lib/RT/Date.pm:390
+msgid "Wed."
+msgstr "Ons."
+
+#: etc/upgrade/2.1.71:161
+msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
+msgstr "NÃ¥r en sak har blitt godkjent av alle godkjennere, legg til korrespondanse for den opprinnelige saken"
+
+#: etc/upgrade/2.1.71:135
+msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
+msgstr "NÃ¥r en sak har blitt godkjent av en godkjenner, legg til korrespondanse til den orginale saken"
+
+#: etc/initialdata:138
+msgid "When a ticket is created"
+msgstr "NÃ¥r er sak er opprettet"
+
+#: etc/upgrade/2.1.71:79
+msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
+msgstr "Når er godkjennelsessak blir opprettet, gi melding til Eier og AdminCc om saken som venter på deres godkjenning"
+
+#: etc/initialdata:143
+msgid "When anything happens"
+msgstr "NÃ¥r noe skjer"
+
+#: etc/initialdata:184
+msgid "Whenever a ticket is resolved"
+msgstr "Når en sak er løst"
+
+#: etc/initialdata:170
+msgid "Whenever a ticket's owner changes"
+msgstr "Når en sak får ny eier"
+
+#: etc/initialdata:178
+msgid "Whenever a ticket's queue changes"
+msgstr "Når en sak flyttes til en ny kø"
+
+#: etc/initialdata:162
+msgid "Whenever a ticket's status changes"
+msgstr "NÃ¥r en saks status endres"
+
+#: etc/initialdata:192
+msgid "Whenever a user-defined condition occurs"
+msgstr "NÃ¥r brukerdefinerte forhold intreffer"
+
+#: etc/initialdata:156
+msgid "Whenever comments come in"
+msgstr "NÃ¥r kommentarer kommer inn"
+
+#: etc/initialdata:149
+msgid "Whenever correspondence comes in"
+msgstr "NÃ¥r korrespondanse kommer inn"
+
+#: html/Admin/Users/Modify.html:164 html/User/Prefs.html:52
+msgid "Work"
+msgstr "Arbeid"
+
+#: html/Admin/Elements/ModifyUser:70
+msgid "WorkPhone"
+msgstr "ArbeidsTelefon"
+
+#: html/Ticket/Elements/ShowBasics:35 html/Ticket/Update.html:65
+msgid "Worked"
+msgstr "Arbeidet"
+
+#: lib/RT/Ticket_Overlay.pm:3123
+msgid "You already own this ticket"
+msgstr "Du eier allerede denne saken"
+
+#: html/autohandler:108
+msgid "You are not an authorized user"
+msgstr "Du er ikke en autorisert bruker"
+
+#: lib/RT/Ticket_Overlay.pm:2998
+msgid "You can only reassign tickets that you own or that are unowned"
+msgstr "Du kan bare omfordele saker som du eier eller som ikke har en eier"
+
+#: NOT FOUND IN SOURCE
+msgid "You don't have permission to view that ticket.\\n"
+msgstr "Du har ikke tilgang til å se den saken.\\n"
+
+#: docs/design_docs/string-extraction-guide.txt:47
+#. ($num, $queue)
+msgid "You found %1 tickets in queue %2"
+msgstr "Du fant %1 saker i %2 køen"
+
+#: html/NoAuth/Logout.html:31
+msgid "You have been logged out of RT."
+msgstr ""
+
+#: html/SelfService/Display.html:78
+msgid "You have no permission to create tickets in that queue."
+msgstr "Du har ikke tilgang til å opprette saker i den køen."
+
+#: lib/RT/Ticket_Overlay.pm:1895
+msgid "You may not create requests in that queue."
+msgstr "Du kan ikke opprette forespørsler i den køen."
+
+#: html/NoAuth/Logout.html:36
+msgid "You're welcome to login again"
+msgstr "Velkommen tilbake"
+
+#: NOT FOUND IN SOURCE
+msgid "Your %1 requests"
+msgstr "Dine %1 forespørsler"
+
+#: NOT FOUND IN SOURCE
+msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
+msgstr "Din RT administrastor har feilkonfigurert mail aliasene som kaller RT"
+
+#: etc/initialdata:435 etc/upgrade/2.1.71:146
+msgid "Your request has been approved by %1. Other approvals may still be pending."
+msgstr "Din forespørsel har blitt godkjent av %1. Andre godkjennelser avventer kanskje fortsatt"
+
+#: etc/initialdata:469 etc/upgrade/2.1.71:180
+msgid "Your request has been approved."
+msgstr "Din forespørsel ble godkjent."
+
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr "Din forespørsel ble avvist"
+
+#: etc/initialdata:390 etc/upgrade/2.1.71:101
+msgid "Your request was rejected."
+msgstr "Din forespørsel ble avvist"
+
+#: html/autohandler:127
+msgid "Your username or password is incorrect"
+msgstr "Ditt brukernavn/passord er ugyldig"
+
+#: html/Admin/Elements/ModifyUser:84 html/Admin/Users/Modify.html:144 html/User/Prefs.html:96
+msgid "Zip"
+msgstr "Zip"
+
+#: NOT FOUND IN SOURCE
+msgid "[no subject]"
+msgstr "[ikke noe emne]"
+
+#: html/User/Elements/DelegateRights:59
+#. ($right->PrincipalObj->Object->SelfDescription)
+msgid "as granted to %1"
+msgstr "som tildelt til %1"
+
+#: html/SelfService/Closed.html:28
+msgid "closed"
+msgstr "lukket"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:34
+msgid "contains"
+msgstr "inneholder"
+
+#: html/Elements/SelectAttachmentField:26
+msgid "content"
+msgstr "innhold"
+
+#: html/Elements/SelectAttachmentField:27
+msgid "content-type"
+msgstr "innholdstype"
+
+#: lib/RT/Ticket_Overlay.pm:2282
+msgid "correspondence (probably) not sent"
+msgstr "korrespondanse (sansynligvis) ikke sendt"
+
+#: lib/RT/Ticket_Overlay.pm:2292
+msgid "correspondence sent"
+msgstr "korrespondanse sendt"
+
+#: html/Admin/Elements/ModifyQueue:63 html/Admin/Queues/Modify.html:77 lib/RT/Date.pm:319
+msgid "days"
+msgstr "dager"
+
+#: NOT FOUND IN SOURCE
+msgid "dead"
+msgstr "død"
+
+#: html/Search/Listing.html:75
+msgid "delete"
+msgstr "slett"
+
+#: lib/RT/Queue_Overlay.pm:63
+msgid "deleted"
+msgstr "slettet"
+
+#: html/Search/Elements/PickRestriction:68
+msgid "does not match"
+msgstr "treffer ikke"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:35
+msgid "doesn't contain"
+msgstr "inneholder ikke"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "equal to"
+msgstr "lik som"
+
+#: NOT FOUND IN SOURCE
+msgid "false"
+msgstr "usant"
+
+#: html/Elements/SelectAttachmentField:28
+msgid "filename"
+msgstr "filnavn"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "greater than"
+msgstr "større enn"
+
+#: lib/RT/Group_Overlay.pm:194
+#. ($self->Name)
+msgid "group '%1'"
+msgstr "gruppe '%1'"
+
+#: lib/RT/Date.pm:315
+msgid "hours"
+msgstr "timer"
+
+#: NOT FOUND IN SOURCE
+msgid "id"
+msgstr "id"
+
+#: html/Elements/SelectBoolean:32 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88
+msgid "is"
+msgstr "er"
+
+#: html/Elements/SelectBoolean:36 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:37 html/Search/Elements/PickRestriction:48 html/Search/Elements/PickRestriction:77 html/Search/Elements/PickRestriction:89
+msgid "isn't"
+msgstr "er ikke"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "less than"
+msgstr "mindre enn"
+
+#: html/Search/Elements/PickRestriction:67
+msgid "matches"
+msgstr "treffer"
+
+#: lib/RT/Date.pm:311
+msgid "min"
+msgstr "min"
+
+#: html/Ticket/Update.html:66
+msgid "minutes"
+msgstr "minutter"
+
+#: bin/rt-commit-handler:765
+msgid "modifications\\n\\n"
+msgstr "endringer\\n\\n"
+
+#: lib/RT/Date.pm:327
+msgid "months"
+msgstr "måneder"
+
+#: lib/RT/Queue_Overlay.pm:58
+msgid "new"
+msgstr "ny"
+
+#: html/Admin/Elements/EditScrips:43
+msgid "no value"
+msgstr "ingen verdi"
+
+#: html/Ticket/Elements/EditWatchers:28
+msgid "none"
+msgstr "ingen"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "not equal to"
+msgstr "ikke lik som"
+
+#: NOT FOUND IN SOURCE
+msgid "notlike"
+msgstr "ikkelik"
+
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:59
+msgid "open"
+msgstr "Ã¥pen"
+
+#: lib/RT/Group_Overlay.pm:199
+#. ($self->Name, $user->Name)
+msgid "personal group '%1' for user '%2'"
+msgstr "personlig gruppe '%1' for bruker '%2'"
+
+#: lib/RT/Group_Overlay.pm:207
+#. ($queue->Name, $self->Type)
+msgid "queue %1 %2"
+msgstr "kø %1 %2"
+
+#: lib/RT/Queue_Overlay.pm:62
+msgid "rejected"
+msgstr "avvist"
+
+#: lib/RT/Queue_Overlay.pm:61
+msgid "resolved"
+msgstr "løst"
+
+#: lib/RT/Date.pm:307
+msgid "sec"
+msgstr "sek"
+
+#: lib/RT/Queue_Overlay.pm:60
+msgid "stalled"
+msgstr "pauset"
+
+#: lib/RT/Group_Overlay.pm:202
+#. ($self->Type)
+msgid "system %1"
+msgstr "system %1"
+
+#: lib/RT/Group_Overlay.pm:213
+#. ($self->Type)
+msgid "system group '%1'"
+msgstr "systemgruppe '%1'"
+
+#: html/Elements/Error:42 html/SelfService/Error.html:42
+msgid "the calling component did not specify why"
+msgstr "den kallende komponenten oppga ikke hvorfor"
+
+#: lib/RT/Group_Overlay.pm:210
+#. ($self->Instance, $self->Type)
+msgid "ticket #%1 %2"
+msgstr "sak #%1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "true"
+msgstr "sant"
+
+#: lib/RT/Group_Overlay.pm:216
+#. ($self->Id)
+msgid "undescribed group %1"
+msgstr "ubeskrevet gruppe %1"
+
+#: NOT FOUND IN SOURCE
+msgid "undescripbed group %1"
+msgstr "ubeskrevet gruppe %1"
+
+#: lib/RT/Group_Overlay.pm:191
+#. ($user->Object->Name)
+msgid "user %1"
+msgstr "bruker %1"
+
+#: lib/RT/Date.pm:323
+msgid "weeks"
+msgstr "uker"
+
+#: NOT FOUND IN SOURCE
+msgid "with template %1"
+msgstr "med malen %1"
+
+#: lib/RT/Date.pm:331
+msgid "years"
+msgstr "Ã¥r"
+
+#: NOT FOUND IN SOURCE
+msgid "ニックネーム"
+msgstr "????"
+
diff --git a/rt/lib/RT/I18N/pt_br.po b/rt/lib/RT/I18N/pt_br.po
new file mode 100644
index 000000000..6962ecbc8
--- /dev/null
+++ b/rt/lib/RT/I18N/pt_br.po
@@ -0,0 +1,4829 @@
+# $Id: pt_br.po,v 1.1 2003-07-15 13:16:28 ivan Exp $
+msgid ""
+msgstr ""
+"Project-Id-Version: RT 2.1.x\n"
+"POT-Creation-Date: 2002-05-02 11:36+0800\n"
+"PO-Revision-Date: 2002-12-07 23:20-02:00\n"
+"Last-Translator: Gustavo Chaves <gustavo@cpqd.com.br>\n"
+"Language-Team: rt-devel <rt-devel@lists.fsck.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: html/Elements/MyRequests:28 html/Elements/MyTickets:28
+msgid "#"
+msgstr "#"
+
+#: html/Admin/Queues/Scrip.html:55
+#. ($QueueObj->id)
+msgid "#%1"
+msgstr ""
+
+#: html/Approvals/Elements/ShowDependency:50 html/Ticket/Display.html:26 html/Ticket/Display.html:30
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "#%1: %2"
+msgstr "#%1: %2"
+
+#: lib/RT/Date.pm:337
+#. ($s, $time_unit)
+msgid "%1 %2"
+msgstr "%1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:771
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr "%1 %2 %3"
+
+#: lib/RT/Date.pm:373
+#. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
+msgid "%1 %2 %3 %4:%5:%6 %7"
+msgstr "%1 %2 %3 %4:%5:%6 %7"
+
+#: lib/RT/Ticket_Overlay.pm:3438 lib/RT/Transaction_Overlay.pm:559 lib/RT/Transaction_Overlay.pm:601
+#. ($cf->Name, $new_value->Content)
+#. ($field, $self->NewValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 added"
+msgstr "%1 %2 adicionado"
+
+#: lib/RT/Date.pm:334
+#. ($s, $time_unit)
+msgid "%1 %2 ago"
+msgstr "%1 %2 atrás"
+
+#: lib/RT/Ticket_Overlay.pm:3444 lib/RT/Transaction_Overlay.pm:566
+#. ($cf->Name, $old_value, $new_value->Content)
+#. ($field, $self->OldValue, $self->NewValue)
+msgid "%1 %2 changed to %3"
+msgstr "%1 %2 alterado para %3"
+
+#: lib/RT/Ticket_Overlay.pm:3441 lib/RT/Transaction_Overlay.pm:562 lib/RT/Transaction_Overlay.pm:607
+#. ($cf->Name, $old_value)
+#. ($field, $self->OldValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 deleted"
+msgstr "%1 %2 removido"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 of group %3"
+msgstr "%1 %2 do grupo %3"
+
+#: html/Admin/Elements/EditScrips:44 html/Admin/Elements/ListGlobalScrips:28
+#. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
+msgid "%1 %2 with template %3"
+msgstr "%1 %2 com modelo %3"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 this ticket\\n"
+msgstr "%1 (%2) %3 este tíquete\\n"
+
+#: html/Search/Listing.html:57
+#. (($session{'tickets'}->FirstRow+1), ($session{'tickets'}->FirstRow() + $session{'tickets'}->RowsPerPage()  ))
+msgid "%1 - %2 shown"
+msgstr "%1 - %2 apresentados"
+
+#: bin/rt-crontool:169 bin/rt-crontool:176 bin/rt-crontool:182
+#. ("--search-argument", "--search")
+#. ("--condition-argument", "--condition")
+#. ("--action-argument", "--action")
+msgid "%1 - An argument to pass to %2"
+msgstr "%1 - Um argumento para passar para %2"
+
+#: bin/rt-crontool:185
+#. ("--verbose")
+msgid "%1 - Output status updates to STDOUT"
+msgstr "%1 - Mostra atualizações de estado no STDOUT"
+
+#: bin/rt-crontool:179
+#. ("--action")
+msgid "%1 - Specify the action module you want to use"
+msgstr "%1 - Especifica o módulo de ação que você quer usar"
+
+#: bin/rt-crontool:173
+#. ("--condition")
+msgid "%1 - Specify the condition module you want to use"
+msgstr "%1 - Especifica o módulo de condição que você quer usar"
+
+#: bin/rt-crontool:166
+#. ("--search")
+msgid "%1 - Specify the search module you want to use"
+msgstr "%1 - Especifica o módulo de busca que você quer usar"
+
+#: lib/RT/ScripAction_Overlay.pm:122
+#. ($self->Id)
+msgid "%1 ScripAction loaded"
+msgstr "ScripAction %1 carregado"
+
+#: lib/RT/Ticket_Overlay.pm:3471
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 added as a value for %2"
+msgstr "%1 usado como um valor de %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on"
+msgstr "Aliases %1 requerem um TicketId no qual trabalhar"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on "
+msgstr "Aliases %1 requerem um TicketId no qual trabalhar "
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on (from %2) %3"
+msgstr "Aliases %1 requerem um TicketId no qual trabalhar (de %2) %3"
+
+#: lib/RT/Link_Overlay.pm:117 lib/RT/Link_Overlay.pm:124
+#. ($args{'Base'})
+#. ($args{'Target'})
+msgid "%1 appears to be a local object, but can't be found in the database"
+msgstr "%1 parece ser um objeto local, mas não pode ser encontrado no banco de dados"
+
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:483
+#. ($self->BriefDescription , $self->CreatorObj->Name)
+#. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
+msgid "%1 by %2"
+msgstr "%1 por %2"
+
+#: lib/RT/Transaction_Overlay.pm:537 lib/RT/Transaction_Overlay.pm:626 lib/RT/Transaction_Overlay.pm:635 lib/RT/Transaction_Overlay.pm:638
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
+#. ($self->Field , $q1->Name , $q2->Name)
+#. ($self->Field, $t2->AsString, $t1->AsString)
+#. ($self->Field, $self->OldValue, $self->NewValue)
+msgid "%1 changed from %2 to %3"
+msgstr "%1 alterado de %2 para %3"
+
+#: lib/RT/Interface/Web.pm:857
+msgid "%1 could not be set to %2."
+msgstr "%1 não pôde ser alterado para %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 couldn't init a transaction (%2)\\n"
+msgstr "%1 não pôde iniciar uma transação (%2)\\n"
+
+#: lib/RT/Ticket_Overlay.pm:2813
+#. ($self)
+msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
+msgstr "%1 não pôde alterar estado para resolvido.  O banco de dados do RT pode estar inconsistente."
+
+#: html/Elements/MyTickets:25
+#. ($rows)
+msgid "%1 highest priority tickets I own..."
+msgstr "%1 tíquetes de mais alta prioridade que eu possuo..."
+
+#: html/Elements/MyRequests:25
+#. ($rows)
+msgid "%1 highest priority tickets I requested..."
+msgstr "%1 tíquetes de mais alta prioridade que eu requeri..."
+
+#: bin/rt-crontool:161
+#. ($0)
+msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
+msgstr "%1 é uma ferramenta para modificar tíquetes a partir de uma ferramenta de agenda externa, como o cron."
+
+#: lib/RT/Queue_Overlay.pm:743
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this queue."
+msgstr "%1 não é mais um %2 para esta fila."
+
+#: lib/RT/Ticket_Overlay.pm:1570
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this ticket."
+msgstr "%1 não é mais um %2 para este tíquete."
+
+#: lib/RT/Ticket_Overlay.pm:3527
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 is no longer a value for custom field %2"
+msgstr "%1 não é mais um valor para o campo personalizado %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 isn't a valid Queue id."
+msgstr "%1 não é um identificador de fila válido."
+
+#: html/Ticket/Elements/ShowBasics:36
+#. ($TimeWorked)
+msgid "%1 min"
+msgstr "%1 min"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 not shown"
+msgstr "%1 não mostrado"
+
+#: html/User/Elements/DelegateRights:76
+#. (loc($ObjectType =~ /^RT::(.*)$/))
+msgid "%1 rights"
+msgstr "%1 direitos"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 succeeded\\n"
+msgstr "%1 teve sucesso\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for $MessageId"
+msgstr "Tipo %1 desconhecido para $MessageId"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for %2"
+msgstr "Tipo %1 desconhecido para %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 was created without a CurrentUser\\n"
+msgstr "%1 foi criado sem um CurrentUser\\n"
+
+#: lib/RT/Action/ResolveMembers.pm:42
+#. (ref $self)
+msgid "%1 will resolve all members of a resolved group ticket."
+msgstr "%1 resolverá todos os membros de um grupo de tíquetes resolvidos."
+
+#: NOT FOUND IN SOURCE
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr "%1 colocará como pendente uma BASE [local] se for dependente [ou membro] de uma requisição ligada."
+
+#: lib/RT/Transaction_Overlay.pm:435
+#. ($self)
+msgid "%1: no attachment specified"
+msgstr "%1: nenhum arquivo anexo especificado"
+
+#: html/Ticket/Elements/ShowTransaction:102
+#. ($size)
+msgid "%1b"
+msgstr "%1b"
+
+#: html/Ticket/Elements/ShowTransaction:99
+#. (int($size/102.4)/10)
+msgid "%1k"
+msgstr "%1k"
+
+#: lib/RT/Ticket_Overlay.pm:1140
+#. ($args{'Status'})
+msgid "'%1' is an invalid value for status"
+msgstr "'%1' é um valor inválido para o estado"
+
+#: NOT FOUND IN SOURCE
+msgid "'%1' not a recognized action. "
+msgstr "'%1' não é uma ação reconhecida."
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete group member)"
+msgstr "(Assinale para remover o membro do grupo)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete scrip)"
+msgstr "(Assinale para remover o scrip)"
+
+#: html/Admin/Elements/EditQueueWatchers:29 html/Admin/Elements/EditScrips:35 html/Admin/Elements/EditTemplates:36 html/Admin/Groups/Members.html:52 html/Ticket/Elements/EditLinks:33 html/Ticket/Elements/EditPeople:46 html/User/Groups/Members.html:55
+msgid "(Check box to delete)"
+msgstr "(Assinale para remover)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check boxes to delete)"
+msgstr "(Assinale para remover)"
+
+#: html/Ticket/Create.html:178
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr "(Entre com identificadores de tíquetes ou URLs, separados por espaços)"
+
+#: html/Admin/Queues/Modify.html:54 html/Admin/Queues/Modify.html:60
+#. ($RT::CorrespondAddress)
+#. ($RT::CommentAddress)
+msgid "(If left blank, will default to %1"
+msgstr "(Se deixado em branco, será entendido como %1"
+
+#: NOT FOUND IN SOURCE
+msgid "(No Value)"
+msgstr "(Sem Valor)"
+
+#: html/Admin/Elements/EditCustomFields:33 html/Admin/Elements/ListGlobalCustomFields:32
+msgid "(No custom fields)"
+msgstr "(Nenhum campo personalizado)"
+
+#: html/Admin/Groups/Members.html:50 html/User/Groups/Members.html:53
+msgid "(No members)"
+msgstr "(Sem membros)"
+
+#: html/Admin/Elements/EditScrips:32 html/Admin/Elements/ListGlobalScrips:32
+msgid "(No scrips)"
+msgstr "(Sem scrips)"
+
+#: html/Admin/Elements/EditTemplates:31
+msgid "(No templates)"
+msgstr "(Nenhum esquema)"
+
+#: html/Ticket/Update.html:85
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(Envia uma cópia-cega (Bcc) desta atualização para uma lista de endereços de email separados por vírgula.  <b>Não</b> altera quem vai receber atualizações futuras.)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(Envia uma cópia-cega (Bcc) desta atualização para uma lista de endereços eletrônicos separados por vírgulas. <b>Não</b> altera o destinatário de atualizações futuras.)"
+
+#: html/Ticket/Create.html:79
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(Envia uma cópia-cega (Bcc) desta atualização para uma lista de endereços eletrônicos separados por vírgulas. <b>Não</b> altera o destinatário de atualizações futuras.)"
+
+#: html/Ticket/Update.html:81
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(Envia uma cópia-cega (Bcc) desta atualização para uma lista de endereços eletrônicos separados por vírgulas. <b>Não</b> altera o destinatário de atualizações futuras.)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(Envia uma cópia desta atualização para uma lista de endereços eletrônicos separados por vírgulas. <b>Não</b> altera o destinatário de atualizações futuras.)"
+
+#: html/Ticket/Create.html:69
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(Envia uma cópia desta atualização para uma lista de endereços eletrônicos separados por vírgulas. Estas pessoas <b>receberão</b> as atualizações futuras.)"
+
+#: html/Admin/Groups/index.html:33 html/User/Groups/index.html:33
+msgid "(empty)"
+msgstr "(vazio)"
+
+#: html/Admin/Users/index.html:39
+msgid "(no name listed)"
+msgstr "(nenhum nome listado)"
+
+#: html/Elements/MyRequests:43 html/Elements/MyTickets:45
+msgid "(no subject)"
+msgstr "(Sem assunto)"
+
+#: html/Admin/Elements/SelectRights:48 html/Elements/SelectCustomFieldValue:30 html/Ticket/Elements/EditCustomField:59 html/Ticket/Elements/ShowCustomFields:36 lib/RT/Transaction_Overlay.pm:536
+msgid "(no value)"
+msgstr "(sem valor)"
+
+#: html/Ticket/Elements/EditLinks:116
+msgid "(only one ticket)"
+msgstr "(somente um tíquete)"
+
+#: html/Elements/MyRequests:52 html/Elements/MyTickets:55
+msgid "(pending approval)"
+msgstr "(aguardando aprovação)"
+
+#: html/Elements/MyRequests:54 html/Elements/MyTickets:57
+msgid "(pending other tickets)"
+msgstr "(aguardando outros tíquetes)"
+
+#: NOT FOUND IN SOURCE
+msgid "(requestor's group)"
+msgstr "(grupo do requisitante)"
+
+#: html/Admin/Users/Modify.html:50
+msgid "(required)"
+msgstr "(requerido)"
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "(untitled)"
+msgstr "(sem título)"
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr "25 tíquetes mais prioritários que possuo..."
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr "25 tíquetes mais prioritários que requisitei..."
+
+#: html/Ticket/Elements/ShowBasics:32
+msgid "<% $Ticket->Status%>"
+msgstr "<% $Ticket->Status%>"
+
+#: html/Elements/SelectTicketTypes:27
+msgid "<% $_ %>"
+msgstr "<% $_ %>"
+
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:26
+#. ($m->scomp('/Elements/SelectNewTicketQueue'))
+msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
+msgstr "<input type=\"submit\" value=\"Novo tíquete em\">&nbsp;%1"
+
+#: NOT FOUND IN SOURCE
+msgid "??????"
+msgstr ""
+
+#: etc/initialdata:203
+msgid "A blank template"
+msgstr "Um modelo vazio"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Deleted"
+msgstr "ACE Removida"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Loaded"
+msgstr "ACE Carregada"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be deleted"
+msgstr "ACE não pôde ser removida"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be found"
+msgstr "ACE não pode ser encontrada"
+
+#: lib/RT/ACE_Overlay.pm:157 lib/RT/Principal_Overlay.pm:181
+msgid "ACE not found"
+msgstr "ACE não encontrado"
+
+#: lib/RT/ACE_Overlay.pm:831
+msgid "ACEs can only be created and deleted."
+msgstr "ACEs só podem ser criados e removidos."
+
+#: bin/rt-commit-handler:755
+msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgstr "Abortando para evitar modificações indesejadas no tíquete.\\n"
+
+#: html/User/Elements/Tabs:32
+msgid "About me"
+msgstr "Sobre mim"
+
+#: html/Admin/Users/Modify.html:80
+msgid "Access control"
+msgstr "Controle de acesso"
+
+#: html/Admin/Elements/EditScrip:57
+msgid "Action"
+msgstr "Ação"
+
+#: lib/RT/Scrip_Overlay.pm:147
+#. ($args{'ScripAction'})
+msgid "Action %1 not found"
+msgstr "Ação %1 não encontrada"
+
+#: bin/rt-crontool:123
+msgid "Action committed."
+msgstr "Ação confirmada."
+
+#: bin/rt-crontool:119
+msgid "Action prepared..."
+msgstr "Ação preparada..."
+
+#: html/Search/Bulk.html:92
+msgid "Add AdminCc"
+msgstr "Adicionar AdminCc"
+
+#: html/Search/Bulk.html:90
+msgid "Add Cc"
+msgstr "Adicionar Cc"
+
+#: html/Ticket/Create.html:114 html/Ticket/Update.html:100
+msgid "Add More Files"
+msgstr "Adicionar Mais Arquivos"
+
+#: NOT FOUND IN SOURCE
+msgid "Add Next State"
+msgstr "Adicionar Próximo Estado"
+
+#: html/Search/Bulk.html:88
+msgid "Add Requestor"
+msgstr "Adicionar Requisitante"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip to this queue"
+msgstr "Adicionar um Scrip nesta fila"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip which will apply to all queues"
+msgstr "Adicionar um Scrip que será aplicado a todas as filas"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr "Adicionar uma seleção de teclado a esta fila"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a new a global scrip"
+msgstr "Adicionar um novo scrip global"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a scrip to this queue"
+msgstr "Adicionar um scrip a esta fila"
+
+#: html/Admin/Global/Scrip.html:55
+msgid "Add a scrip which will apply to all queues"
+msgstr "Adicionar um scrip que se aplicará a todas as filas"
+
+#: html/Search/Bulk.html:118
+msgid "Add comments or replies to selected tickets"
+msgstr "Adicionar comentários ou respostas aos tíquetes selecionados"
+
+#: html/Admin/Groups/Members.html:42 html/User/Groups/Members.html:39
+msgid "Add members"
+msgstr "Adicionar membros"
+
+#: html/Admin/Queues/People.html:66 html/Ticket/Elements/AddWatchers:28
+msgid "Add new watchers"
+msgstr "Adicionar novos observadores"
+
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
+msgstr "AddNextState"
+
+#: lib/RT/Queue_Overlay.pm:643
+#. ($args{'Type'})
+msgid "Added principal as a %1 for this queue"
+msgstr "Principal adicionado como um %1 para esta fila"
+
+#: lib/RT/Ticket_Overlay.pm:1454
+#. ($self->loc($args{'Type'}))
+msgid "Added principal as a %1 for this ticket"
+msgstr "Principal adicionado como um %1 para este tíquete"
+
+#: html/Admin/Elements/ModifyUser:76 html/Admin/Users/Modify.html:122 html/User/Prefs.html:88
+msgid "Address1"
+msgstr "Endereço 1"
+
+#: html/Admin/Elements/ModifyUser:78 html/Admin/Users/Modify.html:127 html/User/Prefs.html:90
+msgid "Address2"
+msgstr "Endereço 2"
+
+#: html/Ticket/Create.html:74
+msgid "Admin Cc"
+msgstr "Admin Cc"
+
+#: etc/initialdata:274
+msgid "Admin Comment"
+msgstr "Comentário do Administrador"
+
+#: etc/initialdata:256
+msgid "Admin Correspondence"
+msgstr "Correspondência do Administrador"
+
+#: html/Admin/Queues/index.html:25 html/Admin/Queues/index.html:28
+msgid "Admin queues"
+msgstr "Administração de filas"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin users"
+msgstr "Administração de usuários"
+
+#: html/Admin/Global/index.html:26 html/Admin/Global/index.html:28
+msgid "Admin/Global configuration"
+msgstr "Administração da configuração global"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Groups"
+msgstr "Administração de Grupos"
+
+#: html/Admin/Queues/Modify.html:25 html/Admin/Queues/Modify.html:29
+msgid "Admin/Queue/Basics"
+msgstr "Administração de uma fila"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr "AdminAllPersonalGroups"
+
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:39 html/Ticket/Update.html:50 lib/RT/ACE_Overlay.pm:89
+msgid "AdminCc"
+msgstr "AdminCc"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr "AdminComment"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr "AdminCorrespondence"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "AdminCustomFields"
+msgstr "AdminCustomFields"
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "AdminGroup"
+msgstr "AdminGroup"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "AdminGroupMembership"
+msgstr "AdminGroupMembership"
+
+#: lib/RT/System.pm:59
+msgid "AdminOwnPersonalGroups"
+msgstr "AdminOwnPersonalGroups"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "AdminQueue"
+msgstr "AdminQueue"
+
+#: lib/RT/System.pm:60
+msgid "AdminUsers"
+msgstr "AdminUsers"
+
+#: html/Admin/Queues/People.html:48 html/Ticket/Elements/EditPeople:54
+msgid "Administrative Cc"
+msgstr "Cc Administrativo"
+
+#: NOT FOUND IN SOURCE
+msgid "Admins"
+msgstr "Administradores"
+
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search"
+msgstr "Busca avançada"
+
+#: html/Elements/SelectDateRelation:36
+msgid "After"
+msgstr "Depois"
+
+#: NOT FOUND IN SOURCE
+msgid "Age"
+msgstr "Idade"
+
+#: NOT FOUND IN SOURCE
+msgid "Alias"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Alias for"
+msgstr "Alias para"
+
+#: html/Admin/Elements/EditCustomFields:96
+msgid "All Custom Fields"
+msgstr "Todos os Campos Personalizados"
+
+#: html/Admin/Queues/index.html:53
+msgid "All Queues"
+msgstr "Todas as filas"
+
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
+msgstr "Sempre envia uma mensagem para os requisitantes independentemente do remetente"
+
+#: html/Elements/Tabs:58
+msgid "Approval"
+msgstr "Aprovação"
+
+#: html/Approvals/Display.html:46 html/Approvals/Elements/Approve:27 html/Approvals/Elements/ShowDependency:42 html/Approvals/index.html:65
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($ticket->id, $msg)
+#. ($ticket->Id, $ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Approval #%1: %2"
+msgstr "Aprovação #%1: %2"
+
+#: html/Approvals/index.html:54
+#. ($ticket->Id)
+msgid "Approval #%1: Notes not recorded due to a system error"
+msgstr "Aprovação #%1: Notas não registradas devido a um erro de sistema"
+
+#: html/Approvals/index.html:52
+#. ($ticket->Id)
+msgid "Approval #%1: Notes recorded"
+msgstr "Aprovação #%1: Notas registradas"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Details"
+msgstr "Detalhes da Aprovação"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval diagram"
+msgstr "Diagrama da aprovação"
+
+#: html/Approvals/Elements/Approve:45
+msgid "Approve"
+msgstr "Aprove"
+
+#: etc/initialdata:431 etc/upgrade/2.1.71:148
+msgid "Approver's notes: %1"
+msgstr "Notas do aprovador: %1"
+
+#: lib/RT/Date.pm:414
+msgid "Apr."
+msgstr "Abr."
+
+#: NOT FOUND IN SOURCE
+msgid "April"
+msgstr "Abril"
+
+#: html/Elements/SelectSortOrder:35
+msgid "Ascending"
+msgstr "Ascendente"
+
+#: html/Search/Bulk.html:127 html/SelfService/Update.html:36 html/Ticket/ModifyAll.html:83 html/Ticket/Update.html:100
+msgid "Attach"
+msgstr "Anexar"
+
+#: html/SelfService/Create.html:67 html/Ticket/Create.html:110
+msgid "Attach file"
+msgstr "Anexar arquivo"
+
+#: html/Ticket/Create.html:98 html/Ticket/Update.html:89
+msgid "Attached file"
+msgstr "Arquivo anexado"
+
+#: html/SelfService/Attachment/dhandler:36
+msgid "Attachment '%1' could not be loaded"
+msgstr "Arquivo anexo '%1' não pôde ser carregado"
+
+#: lib/RT/Transaction_Overlay.pm:443
+msgid "Attachment created"
+msgstr "Arquivo anexo criado"
+
+#: lib/RT/Tickets_Overlay.pm:1189
+msgid "Attachment filename"
+msgstr "Nome do arquivo anexo"
+
+#: html/Ticket/Elements/ShowAttachments:26
+msgid "Attachments"
+msgstr "Arquivos anexos"
+
+#: lib/RT/Date.pm:418
+msgid "Aug."
+msgstr "Ago."
+
+#: NOT FOUND IN SOURCE
+msgid "August"
+msgstr "Agosto"
+
+#: html/Admin/Elements/ModifyUser:66
+msgid "AuthSystem"
+msgstr "Sistema de autenticação"
+
+#: etc/initialdata:206
+msgid "Autoreply"
+msgstr "Autoreply"
+
+#: etc/initialdata:72
+msgid "Autoreply To Requestors"
+msgstr "Autoreply para Requisitantes"
+
+#: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr "AutoreplyToRequestors"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad PGP Signature: %1\\n"
+msgstr "Assinatura PGP inválida: %1\\n"
+
+#: html/SelfService/Attachment/dhandler:40
+msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
+msgstr "Identificador de arquivo anexo inválido.  Não pude encontrar o arquivo '%1'\\n"
+
+#: bin/rt-commit-handler:827
+#. ($val)
+msgid "Bad data in %1"
+msgstr "Dados inválidos em %1"
+
+#: html/SelfService/Attachment/dhandler:43
+#. ($trans, $AttachmentObj->TransactionId())
+msgid "Bad transaction number for attachment. %1 should be %2\\n"
+msgstr "Número inválido de transação para o arquivo anexo.  %1 deveria ser %2\\n"
+
+#: html/Admin/Elements/GroupTabs:39 html/Admin/Elements/QueueTabs:39 html/Admin/Elements/UserTabs:38 html/Ticket/Elements/Tabs:90 html/User/Elements/GroupTabs:38
+msgid "Basics"
+msgstr "Básicos"
+
+#: html/Ticket/Update.html:83
+msgid "Bcc"
+msgstr "Bcc"
+
+#: html/Admin/Elements/EditScrip:88 html/Admin/Global/GroupRights.html:85 html/Admin/Global/Template.html:46 html/Admin/Global/UserRights.html:54 html/Admin/Groups/GroupRights.html:73 html/Admin/Groups/Members.html:81 html/Admin/Groups/Modify.html:56 html/Admin/Groups/UserRights.html:55 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:45 html/Admin/Queues/UserRights.html:54 html/User/Groups/Modify.html:56
+msgid "Be sure to save your changes"
+msgstr "Não se esqueça de salvar suas alterações"
+
+#: html/Elements/SelectDateRelation:34 lib/RT/CurrentUser.pm:322
+msgid "Before"
+msgstr "Antes"
+
+#: NOT FOUND IN SOURCE
+msgid "Begin Approval"
+msgstr "Incício da Aprovação"
+
+#: etc/initialdata:202
+msgid "Blank"
+msgstr "Vazio"
+
+#: html/Search/Listing.html:79
+msgid "Bookmarkable URL for this search"
+msgstr "URL para guardar esta busca em seus marcadores"
+
+#: html/Ticket/Elements/ShowHistory:39 html/Ticket/Elements/ShowHistory:45
+msgid "Brief headers"
+msgstr "Cabeçalhos resumidos"
+
+#: html/Search/Bulk.html:25 html/Search/Bulk.html:26
+msgid "Bulk ticket update"
+msgstr "Atualização de tíquetes em lote"
+
+#: lib/RT/User_Overlay.pm:1331
+msgid "Can not modify system users"
+msgstr "Não posso modificar os usuários do sistema"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "Can this principal see this queue"
+msgstr "Este principal pode ver esta fila"
+
+#: lib/RT/CustomField_Overlay.pm:144
+msgid "Can't add a custom field value without a name"
+msgstr "Não posso adicionar um valor de campo personalizado sem um nome"
+
+#: lib/RT/Link_Overlay.pm:132
+msgid "Can't link a ticket to itself"
+msgstr "Não posso ligar um tíquete a ele mesmo"
+
+#: lib/RT/Ticket_Overlay.pm:2787
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr "Não posso unir a um tíquete já unido.  Você nunca deve obter este erro"
+
+#: lib/RT/Ticket_Overlay.pm:2605 lib/RT/Ticket_Overlay.pm:2674
+msgid "Can't specifiy both base and target"
+msgstr "Não especifique origem e destino simultaneamente"
+
+#: html/autohandler:112
+#. ($msg)
+msgid "Cannot create user: %1"
+msgstr "Não posso criar o usuário: %1"
+
+#: etc/initialdata:50 html/Admin/Queues/People.html:44 html/SelfService/Create.html:51 html/SelfService/Display.html:50 html/Ticket/Create.html:64 html/Ticket/Elements/EditPeople:51 html/Ticket/Elements/ShowPeople:35 html/Ticket/Update.html:45 html/Ticket/Update.html:78 lib/RT/ACE_Overlay.pm:88
+msgid "Cc"
+msgstr "Cc"
+
+#: html/SelfService/Prefs.html:31
+msgid "Change password"
+msgstr "Mudar a senha"
+
+#: html/Ticket/Create.html:101 html/Ticket/Update.html:92
+msgid "Check box to delete"
+msgstr "Assinale para remover"
+
+#: html/Admin/Elements/SelectRights:31
+msgid "Check box to revoke right"
+msgstr "Assinalar para revogar o direito de acesso"
+
+#: html/Ticket/Create.html:183 html/Ticket/Elements/EditLinks:131 html/Ticket/Elements/EditLinks:69 html/Ticket/Elements/ShowLinks:51
+msgid "Children"
+msgstr "Filhos"
+
+#: html/Admin/Elements/ModifyUser:80 html/Admin/Users/Modify.html:132 html/User/Prefs.html:92
+msgid "City"
+msgstr "Cidade"
+
+#: html/Ticket/Elements/ShowDates:47
+msgid "Closed"
+msgstr "Fechado"
+
+#: html/SelfService/Elements/Tabs:60
+msgid "Closed requests"
+msgstr "Requisições fechadas"
+
+#: NOT FOUND IN SOURCE
+msgid "Code"
+msgstr "Código"
+
+#: NOT FOUND IN SOURCE
+msgid "Command not understood!\\n"
+msgstr "Comando não entendido!\\n"
+
+#: html/Ticket/Elements/ShowTransaction:179 html/Ticket/Elements/Tabs:153
+msgid "Comment"
+msgstr "Comentário"
+
+#: html/Admin/Elements/ModifyQueue:45 html/Admin/Queues/Modify.html:58
+msgid "Comment Address"
+msgstr "Endereço de Comentário"
+
+#: NOT FOUND IN SOURCE
+msgid "Comment not recorded"
+msgstr "Comentário não registrado"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "Comment on tickets"
+msgstr "Comente sobre os tíquetes"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "CommentOnTicket"
+msgstr "CommentOnTicket"
+
+#: html/Admin/Elements/ModifyUser:35
+msgid "Comments"
+msgstr "Comentários"
+
+#: html/Ticket/ModifyAll.html:70 html/Ticket/Update.html:70
+msgid "Comments (Not sent to requestors)"
+msgstr "Comentários (não enviados aos requisitantes)"
+
+#: html/Search/Bulk.html:122
+msgid "Comments (not sent to requestors)"
+msgstr "Comentários (não enviados aos requisitantes)"
+
+#: html/Elements/ViewUser:27
+#. ($name)
+msgid "Comments about %1"
+msgstr "Comentários sobre %1"
+
+#: html/Admin/Users/Modify.html:185 html/Ticket/Elements/ShowRequestor:44
+msgid "Comments about this user"
+msgstr "Comentários sobre este usuário"
+
+#: lib/RT/Transaction_Overlay.pm:545
+msgid "Comments added"
+msgstr "Comentários adicionados"
+
+#: lib/RT/Action/Generic.pm:140
+msgid "Commit Stubbed"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Compile Restrictions"
+msgstr "Compilar restrições"
+
+#: html/Admin/Elements/EditScrip:41
+msgid "Condition"
+msgstr "Condição"
+
+#: bin/rt-crontool:109
+msgid "Condition matches..."
+msgstr "Condição satisfeita..."
+
+#: lib/RT/Scrip_Overlay.pm:160
+msgid "Condition not found"
+msgstr "Condição não encontrada"
+
+#: html/Elements/Tabs:52
+msgid "Configuration"
+msgstr "Configuração"
+
+#: html/SelfService/Prefs.html:33
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: html/Admin/Elements/ModifyUser:60
+msgid "ContactInfoSystem"
+msgstr "Informação de contato"
+
+#: NOT FOUND IN SOURCE
+msgid "Contacted date '%1' could not be parsed"
+msgstr "Data de contato '%1' não pôde ser entendida"
+
+#: html/Admin/Elements/ModifyTemplate:44 html/Ticket/ModifyAll.html:87
+msgid "Content"
+msgstr "Conteúdo"
+
+#: NOT FOUND IN SOURCE
+msgid "Coould not create group"
+msgstr "Não pude criar o grupo"
+
+#: etc/initialdata:266
+msgid "Correspondence"
+msgstr "Correspondência"
+
+#: html/Admin/Elements/ModifyQueue:39 html/Admin/Queues/Modify.html:51
+msgid "Correspondence Address"
+msgstr "Endereço de correspondência"
+
+#: lib/RT/Transaction_Overlay.pm:541
+msgid "Correspondence added"
+msgstr "Correspondência adicionada"
+
+#: NOT FOUND IN SOURCE
+msgid "Correspondence not recorded"
+msgstr "Correspondência não registrada"
+
+#: lib/RT/Ticket_Overlay.pm:3458
+msgid "Could not add new custom field value for ticket. "
+msgstr "Não pude adicionar novo valor de campo personalizado para o tíquete. "
+
+#: NOT FOUND IN SOURCE
+msgid "Could not add new custom field value for ticket. %1 "
+msgstr "Não pude adicionar novo valor de campo personalizado para o tíquete. %1"
+
+#: lib/RT/Ticket_Overlay.pm:2963 lib/RT/Ticket_Overlay.pm:2971 lib/RT/Ticket_Overlay.pm:2987
+msgid "Could not change owner. "
+msgstr "Não pude alterar o proprietário. "
+
+#: html/Admin/Elements/EditCustomField:68 html/Admin/Elements/EditCustomFields:166
+#. ($msg)
+msgid "Could not create CustomField"
+msgstr "Não pude criar CampoPersonalizado"
+
+#: html/User/Groups/Modify.html:77 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
+msgid "Could not create group"
+msgstr "Não pude criar o grupo"
+
+#: html/Admin/Global/Template.html:75 html/Admin/Queues/Template.html:72
+#. ($msg)
+msgid "Could not create template: %1"
+msgstr "Não pude criar o modelo: %1"
+
+#: lib/RT/Ticket_Overlay.pm:1073 lib/RT/Ticket_Overlay.pm:333
+msgid "Could not create ticket. Queue not set"
+msgstr "Não pude criar o tíquete. Fila não selecionada"
+
+#: lib/RT/User_Overlay.pm:208 lib/RT/User_Overlay.pm:220 lib/RT/User_Overlay.pm:238 lib/RT/User_Overlay.pm:414
+msgid "Could not create user"
+msgstr "Não pude criar o usuário"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not create watcher for requestor"
+msgstr "Não pude criar um observador para o requisitante"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find a ticket with id %1"
+msgstr "Não pude encontrar um tíquete com identificador %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find group %1."
+msgstr "Não pude encontrar o grupo %1."
+
+#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1422
+msgid "Could not find or create that user"
+msgstr "Não pude encontrar ou criar o usuário"
+
+#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1501
+msgid "Could not find that principal"
+msgstr "Não pude encontrar este principal"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find user %1."
+msgstr "Não pude encontrar o usuário %1."
+
+#: html/Admin/Groups/Members.html:88 html/User/Groups/Members.html:90 html/User/Groups/Modify.html:82
+msgid "Could not load group"
+msgstr "Não pude carregar o grupo"
+
+#: lib/RT/Queue_Overlay.pm:641
+#. ($args{'Type'})
+msgid "Could not make that principal a %1 for this queue"
+msgstr "Não pude fazer este principal um %1 para esta fila"
+
+#: lib/RT/Ticket_Overlay.pm:1443
+#. ($self->loc($args{'Type'}))
+msgid "Could not make that principal a %1 for this ticket"
+msgstr "Não pude fazer este principal um %1 para este tíquete"
+
+#: lib/RT/Queue_Overlay.pm:740
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this queue"
+msgstr "Não pude remover este principal como um %1 para esta fila"
+
+#: lib/RT/Ticket_Overlay.pm:1559
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this ticket"
+msgstr "Não pude remover este principal como um %1 para este tíquete"
+
+#: lib/RT/Group_Overlay.pm:985
+msgid "Couldn't add member to group"
+msgstr "Não pude adicionar o membro no grupo"
+
+#: lib/RT/Ticket_Overlay.pm:3468 lib/RT/Ticket_Overlay.pm:3524
+#. ($Msg)
+msgid "Couldn't create a transaction: %1"
+msgstr "Não pude criar uma transação: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't figure out what to do from gpg's reply\\n"
+msgstr "Não sei o que fazer com a resposta do gpg\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find group\\n"
+msgstr "Não encontrei o grupo\\n"
+
+#: lib/RT/Interface/Web.pm:866
+msgid "Couldn't find row"
+msgstr "Não pude encontrar o registro"
+
+#: lib/RT/Group_Overlay.pm:959
+msgid "Couldn't find that principal"
+msgstr "Não encontrei este principal"
+
+#: lib/RT/CustomField_Overlay.pm:175
+msgid "Couldn't find that value"
+msgstr "Não encontrei este valor"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find that watcher"
+msgstr "Não pude encontrar este observador"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find user\\n"
+msgstr "Não pude encontrar o usuário\\n"
+
+#: lib/RT/CurrentUser.pm:112
+#. ($self->Id)
+msgid "Couldn't load %1 from the users database.\\n"
+msgstr "Não pude carregar %1 do banco de dados de usuários.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load KeywordSelects."
+msgstr "Não pude carregar os KeywordSelects."
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load RT config file '%1' %2"
+msgstr "Não pude carregar o arquivo de configuração do RT '%1' %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load Scrips."
+msgstr "Não pude carregar os Scrips."
+
+#: html/Admin/Groups/GroupRights.html:88 html/Admin/Groups/UserRights.html:75
+#. ($id)
+msgid "Couldn't load group %1"
+msgstr "Não pude carregar o grupo %1"
+
+#: lib/RT/Link_Overlay.pm:175 lib/RT/Link_Overlay.pm:184 lib/RT/Link_Overlay.pm:211
+msgid "Couldn't load link"
+msgstr "Não pude carregar a ligação"
+
+#: html/Admin/Elements/EditCustomFields:147 html/Admin/Queues/People.html:121
+#. ($id)
+msgid "Couldn't load queue"
+msgstr "Não pude carregar a fila"
+
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:72
+#. ($id)
+msgid "Couldn't load queue %1"
+msgstr "Não pude carregar a fila %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load scrip"
+msgstr "Não pude carregar o scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load template"
+msgstr "Não pude carregar o modelo"
+
+#: html/Admin/Users/Prefs.html:79
+#. ($id)
+msgid "Couldn't load that user (%1)"
+msgstr "Não pude carregar este usuário (%1)"
+
+#: html/SelfService/Display.html:166
+#. ($id)
+msgid "Couldn't load ticket '%1'"
+msgstr "Não pude carregar o tíquete '%1'"
+
+#: html/Admin/Elements/ModifyUser:86 html/Admin/Users/Modify.html:149 html/User/Prefs.html:98
+msgid "Country"
+msgstr "País"
+
+#: html/Admin/Elements/CreateUserCalled:26 html/Ticket/Create.html:135 html/Ticket/Create.html:195
+msgid "Create"
+msgstr "Criar"
+
+#: etc/initialdata:128
+msgid "Create Tickets"
+msgstr "Criar Tíquetes"
+
+#: html/Admin/Elements/EditCustomField:58
+msgid "Create a CustomField"
+msgstr "Criar um CampoPersonalizado"
+
+#: html/Admin/Queues/CustomField.html:48
+#. ($QueueObj->Name())
+msgid "Create a CustomField for queue %1"
+msgstr "Criar um Campo Personalizado para a fila %1"
+
+#: html/Admin/Global/CustomField.html:48
+msgid "Create a CustomField which applies to all queues"
+msgstr "Criar um Campo Personalizado para todas as filas"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new Custom Field"
+msgstr "Criar um novo Campo Personalizado"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global Scrip"
+msgstr "Criar um novo Scrip global"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global scrip"
+msgstr "Criar um novo scrip global"
+
+#: html/Admin/Groups/Modify.html:67 html/Admin/Groups/Modify.html:93
+msgid "Create a new group"
+msgstr "Criar um novo grupo"
+
+#: html/User/Groups/Modify.html:67 html/User/Groups/Modify.html:92
+msgid "Create a new personal group"
+msgstr "Criar um novo grupo pessoal"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new queue"
+msgstr "Criar uma nova fila"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new scrip"
+msgstr "Criar um novo scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new template"
+msgstr "Criar um novo modelo"
+
+#: html/SelfService/Create.html:30 html/Ticket/Create.html:25 html/Ticket/Create.html:28 html/Ticket/Create.html:36
+msgid "Create a new ticket"
+msgstr "Criar um novo tíquete"
+
+#: html/Admin/Users/Modify.html:214 html/Admin/Users/Modify.html:241
+msgid "Create a new user"
+msgstr "Criar um novo usuário"
+
+#: html/Admin/Queues/Modify.html:103
+msgid "Create a queue"
+msgstr "Criar uma fila"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a queue called"
+msgstr "Criar uma fila chamada"
+
+#: html/SelfService/Create.html:25 html/SelfService/Create.html:27
+msgid "Create a request"
+msgstr "Criar uma requisição"
+
+#: html/Admin/Queues/Scrip.html:59
+#. ($QueueObj->Name)
+msgid "Create a scrip for queue %1"
+msgstr "Criar um scrip para a fila %1"
+
+#: html/Admin/Global/Template.html:69 html/Admin/Queues/Template.html:65
+msgid "Create a template"
+msgstr "Criar um modelo"
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1 / %2 / %3 "
+msgstr "Criação falhou: %1 / %2 / %3 "
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1/%2/%3"
+msgstr "Criação falhou: %1/%2/%3"
+
+#: etc/initialdata:130
+msgid "Create new tickets based on this scrip's template"
+msgstr "Criar novos tíquetes baseados no esquema deste scrip"
+
+#: html/SelfService/Create.html:81
+msgid "Create ticket"
+msgstr "Criar um tíquete"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "Create tickets in this queue"
+msgstr "Criar tíquetes nesta fila"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "Create, delete and modify custom fields"
+msgstr "Criar, remover e modificar campos personalizados"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "Create, delete and modify queues"
+msgstr "Criar, remover e modificar filas"
+
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
+msgstr "Criar, remover e modificar os membros dos grupos pessoais de qualquer usuário"
+
+#: lib/RT/System.pm:59
+msgid "Create, delete and modify the members of personal groups"
+msgstr "Criar, remover e modificar os membros de grupos pessoais"
+
+#: lib/RT/System.pm:60
+msgid "Create, delete and modify users"
+msgstr "Criar, remover e modificar usuários"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "CreateTicket"
+msgstr "CreateTicket"
+
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1167
+msgid "Created"
+msgstr "Criado"
+
+#: html/Admin/Elements/EditCustomField:71
+#. ($CustomFieldObj->Name())
+msgid "Created CustomField %1"
+msgstr "CampoPersonalizado %1 criado"
+
+#: NOT FOUND IN SOURCE
+msgid "Created template %1"
+msgstr "Modelo %1 criado"
+
+#: html/Ticket/Elements/EditLinks:28
+msgid "Current Relationships"
+msgstr "Relações atuais"
+
+#: html/Admin/Elements/EditScrips:30
+msgid "Current Scrips"
+msgstr "Scrips correntes"
+
+#: html/Admin/Groups/Members.html:39 html/User/Groups/Members.html:42
+msgid "Current members"
+msgstr "Membros atuais"
+
+#: html/Admin/Elements/SelectRights:29
+msgid "Current rights"
+msgstr "Direitos de acesso atuais"
+
+#: html/Search/Listing.html:71
+msgid "Current search criteria"
+msgstr "Critério de busca atual"
+
+#: html/Admin/Queues/People.html:41 html/Ticket/Elements/EditPeople:45
+msgid "Current watchers"
+msgstr "Observadores atuais"
+
+#: html/Admin/Global/CustomField.html:55
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr "Campo Personalizado #%1"
+
+#: html/Admin/Elements/QueueTabs:53 html/Admin/Elements/SystemTabs:40 html/Admin/Global/index.html:50 html/Ticket/Elements/ShowSummary:35
+msgid "Custom Fields"
+msgstr "Campos Personalizados"
+
+#: html/Admin/Elements/EditScrip:73
+msgid "Custom action cleanup code"
+msgstr "Código de finalização da ação customizada"
+
+#: html/Admin/Elements/EditScrip:65
+msgid "Custom action preparation code"
+msgstr "Código de preparação da ação customizada"
+
+#: html/Admin/Elements/EditScrip:49
+msgid "Custom condition"
+msgstr "Condição customizada"
+
+#: lib/RT/Tickets_Overlay.pm:1618
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
+msgid "Custom field %1 %2 %3"
+msgstr "Campo personalizado %1 %2 %3"
+
+#: lib/RT/Tickets_Overlay.pm:1613
+#. ($CF->Name)
+msgid "Custom field %1 has a value."
+msgstr "O campo personalizado %1 tem um valor."
+
+#: lib/RT/Tickets_Overlay.pm:1610
+#. ($CF->Name)
+msgid "Custom field %1 has no value."
+msgstr "O campo personalizado %1 não tem valor."
+
+#: lib/RT/Ticket_Overlay.pm:3360
+#. ($args{'Field'})
+msgid "Custom field %1 not found"
+msgstr "Campo personalizado %1 não encontrado"
+
+#: html/Admin/Elements/EditCustomFields:197
+msgid "Custom field deleted"
+msgstr "Campo personalizado removido"
+
+#: lib/RT/Ticket_Overlay.pm:3510
+msgid "Custom field not found"
+msgstr "Campo personalizado não encontrado"
+
+#: lib/RT/CustomField_Overlay.pm:283
+#. ($args{'Content'}, $self->Name)
+msgid "Custom field value %1 could not be found for custom field %2"
+msgstr "O valor de campo %1 não pôde ser encontrado para o campo personalizado %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Custom field value changed from %1 to %2"
+msgstr "O valor do campo personalizado foi alterado de %1 para %2"
+
+#: lib/RT/CustomField_Overlay.pm:185
+msgid "Custom field value could not be deleted"
+msgstr "O valor do campo personalizado não pôde ser removido"
+
+#: lib/RT/CustomField_Overlay.pm:289
+msgid "Custom field value could not be found"
+msgstr "O valor de campo personalizado não pôde ser encontrado"
+
+#: lib/RT/CustomField_Overlay.pm:183 lib/RT/CustomField_Overlay.pm:291
+msgid "Custom field value deleted"
+msgstr "Valor do campo personalizado removido"
+
+#: lib/RT/Transaction_Overlay.pm:550
+msgid "CustomField"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Data error"
+msgstr "Erro de dado"
+
+#: html/Ticket/Create.html:161 html/Ticket/Elements/ShowSummary:53 html/Ticket/Elements/Tabs:93 html/Ticket/ModifyAll.html:44
+msgid "Dates"
+msgstr "Datas"
+
+#: lib/RT/Date.pm:422
+msgid "Dec."
+msgstr "Dez."
+
+#: NOT FOUND IN SOURCE
+msgid "December"
+msgstr "Dezembro"
+
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr "Esquema Padrão de Autoresposta"
+
+#: etc/initialdata:207
+msgid "Default Autoresponse template"
+msgstr "Esquema padrão de Autoresposta"
+
+#: etc/initialdata:275
+msgid "Default admin comment template"
+msgstr "Esquema padrão de comentário administrativo"
+
+#: etc/initialdata:257
+msgid "Default admin correspondence template"
+msgstr "Esquema padrão de correspondência administrativa"
+
+#: etc/initialdata:267
+msgid "Default correspondence template"
+msgstr "Esquema padrão de correspondência"
+
+#: etc/initialdata:238
+msgid "Default transaction template"
+msgstr "Esquema padrão de transação"
+
+#: lib/RT/Transaction_Overlay.pm:645
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr "Padrão: %1/%2 mudou de %3 para %4"
+
+#: html/User/Delegation.html:25 html/User/Delegation.html:28
+msgid "Delegate rights"
+msgstr "Delegar direitos de acesso"
+
+#: lib/RT/System.pm:63
+msgid "Delegate specific rights which have been granted to you."
+msgstr "Delegar direitos específicos que foram outorgados a você."
+
+#: lib/RT/System.pm:63
+msgid "DelegateRights"
+msgstr "DelegateRights"
+
+#: html/User/Elements/Tabs:38
+msgid "Delegation"
+msgstr "Delegação"
+
+#: NOT FOUND IN SOURCE
+msgid "Delete"
+msgstr "Remover"
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "Delete tickets"
+msgstr "Remover tíquetes"
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "DeleteTicket"
+msgstr "DeleteTicket"
+
+#: lib/RT/Transaction_Overlay.pm:187
+msgid "Deleting this object could break referential integrity"
+msgstr "Ao remover este objeto você pode quebrar a integridade referencial"
+
+#: lib/RT/Queue_Overlay.pm:292
+msgid "Deleting this object would break referential integrity"
+msgstr "Ao remover este objeto você quebra a integridade referencial"
+
+#: lib/RT/User_Overlay.pm:430
+msgid "Deleting this object would violate referential integrity"
+msgstr "Ao remover este objeto você viola a integridade referencial"
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity."
+msgstr "Remover este objeto violaria a integridade referencial"
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity. That's bad."
+msgstr "Remover este objeto violaria a integridade referencial.  Isto é mau."
+
+#: html/Approvals/Elements/Approve:46
+msgid "Deny"
+msgstr "Negue"
+
+#: html/Ticket/Create.html:181 html/Ticket/Elements/EditLinks:123 html/Ticket/Elements/EditLinks:47 html/Ticket/Elements/ShowDependencies:32 html/Ticket/Elements/ShowLinks:35
+msgid "Depended on by"
+msgstr "Dependem deste tíquete"
+
+#: NOT FOUND IN SOURCE
+msgid "Dependencies: \\n"
+msgstr "Dependências: \\n"
+
+#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:180 html/Ticket/Elements/EditLinks:119 html/Ticket/Elements/EditLinks:36 html/Ticket/Elements/ShowDependencies:25 html/Ticket/Elements/ShowLinks:27
+msgid "Depends on"
+msgstr "Depende de"
+
+#: NOT FOUND IN SOURCE
+msgid "DependsOn"
+msgstr "DependsOn"
+
+#: html/Elements/SelectSortOrder:35
+msgid "Descending"
+msgstr "Descendente"
+
+#: html/SelfService/Create.html:75 html/Ticket/Create.html:119
+msgid "Describe the issue below"
+msgstr "Descreva o problema abaixo"
+
+#: html/Admin/Elements/AddCustomFieldValue:27 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyQueue:36 html/Admin/Elements/ModifyTemplate:36 html/Admin/Groups/Modify.html:49 html/Admin/Queues/Modify.html:48 html/Elements/SelectGroups:27 html/User/Groups/Modify.html:49
+msgid "Description"
+msgstr "Descrição"
+
+#: html/SelfService/Elements/MyRequests:44
+msgid "Details"
+msgstr "Detalhes"
+
+#: html/Ticket/Elements/Tabs:85
+msgid "Display"
+msgstr "Apresentação"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "Display Access Control List"
+msgstr "Mostrar Lista de Controle de Acesso"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "Display Scrip templates for this queue"
+msgstr "Mostras os esquemas de Scrip para esta fila"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "Display Scrips for this queue"
+msgstr "Mostrar os Scrips para esta fila"
+
+#: html/Ticket/Elements/ShowHistory:35
+msgid "Display mode"
+msgstr "Modo de apresentação"
+
+#: html/SelfService/Display.html:25 html/SelfService/Display.html:29
+#. ($Ticket->id)
+msgid "Display ticket #%1"
+msgstr "Apresentar o tíquete #%1"
+
+#: lib/RT/System.pm:54
+msgid "Do anything and everything"
+msgstr "Fazer qualquer coisa"
+
+#: html/Elements/Refresh:30
+msgid "Don't refresh this page."
+msgstr "Não recarregar esta página."
+
+#: html/Search/Elements/PickRestriction:114
+msgid "Don't show search results"
+msgstr "Não mostrar resultados da busca"
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "Download"
+msgstr "Baixar"
+
+#: html/Elements/SelectDateType:32 html/Ticket/Create.html:167 html/Ticket/Elements/EditDates:45 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1171
+msgid "Due"
+msgstr "Vencido"
+
+#: NOT FOUND IN SOURCE
+msgid "Due date '%1' could not be parsed"
+msgstr "A data de vencimento '%1' não pôde ser entendida"
+
+#: bin/rt-commit-handler:754
+#. ($1, $msg)
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
+msgstr "ERRO: Não pude carregar o tíquete '%1': %2.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit"
+msgstr "Editar"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit Conditions"
+msgstr "Editar Condições"
+
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr "Editar Campos Personalizados para %1"
+
+#: html/Ticket/ModifyLinks.html:36
+msgid "Edit Relationships"
+msgstr "Editar Relacionamentos"
+
+#: html/Admin/Queues/Templates.html:41
+#. ($QueueObj->Name)
+msgid "Edit Templates for queue %1"
+msgstr "Editar Esquemas para a fila %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit keywords"
+msgstr "Editar palavras chave"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr "Editar scrips"
+
+#: html/Admin/Global/index.html:46
+msgid "Edit system templates"
+msgstr "Editar os modelos do sistema"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit templates for %1"
+msgstr "Editar os modelos para %1"
+
+#: html/Admin/Elements/ModifyQueue:25 html/Admin/Queues/Modify.html:117
+#. ($QueueObj->Name)
+#. ($QueueObj->Id)
+msgid "Editing Configuration for queue %1"
+msgstr "Editando a configuração para a fila %1"
+
+#: html/Admin/Elements/ModifyUser:25
+#. ($UserObj->Name)
+msgid "Editing Configuration for user %1"
+msgstr "Editando a configuração para o usuário %1"
+
+#: html/Admin/Elements/EditCustomField:74
+#. ($CustomFieldObj->Name())
+msgid "Editing CustomField %1"
+msgstr "Editando o campo %1"
+
+#: html/Admin/Groups/Members.html:32
+#. ($Group->Name)
+msgid "Editing membership for group %1"
+msgstr "Editando os membros do grupo %1"
+
+#: html/User/Groups/Members.html:129
+#. ($Group->Name)
+msgid "Editing membership for personal group %1"
+msgstr "Editando os membros do grupo pessoal %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Editing template %1"
+msgstr "Editando o modelo %1"
+
+#: lib/RT/Ticket_Overlay.pm:2615 lib/RT/Ticket_Overlay.pm:2683
+msgid "Either base or target must be specified"
+msgstr "Você deve especificar a origem ou o destinatário"
+
+#: html/Admin/Users/Modify.html:53 html/Admin/Users/Prefs.html:46 html/Elements/SelectUsers:27 html/Ticket/Elements/AddWatchers:56 html/User/Prefs.html:42
+msgid "Email"
+msgstr "Email"
+
+#: lib/RT/User_Overlay.pm:188
+msgid "Email address in use"
+msgstr "O endereço de email já está em uso"
+
+#: html/Admin/Elements/ModifyUser:42
+msgid "EmailAddress"
+msgstr "Correio Eletrônico"
+
+#: html/Admin/Elements/ModifyUser:54
+msgid "EmailEncoding"
+msgstr "Codificação de Email"
+
+#: html/Admin/Elements/EditCustomField:36
+msgid "Enabled (Unchecking this box disables this custom field)"
+msgstr "Habilitado (Deselecionando este ítem desabilita este campo personalizado)"
+
+#: html/Admin/Groups/Modify.html:53 html/User/Groups/Modify.html:53
+msgid "Enabled (Unchecking this box disables this group)"
+msgstr "Habilitado (Deselecionando este ítem desabilita este grupo)"
+
+#: html/Admin/Queues/Modify.html:84
+msgid "Enabled (Unchecking this box disables this queue)"
+msgstr "Habilitado (desassinalando desabilita esta fila)"
+
+#: html/Admin/Elements/EditCustomFields:99
+msgid "Enabled Custom Fields"
+msgstr "Campos Personalizados Habilitados"
+
+#: html/Admin/Queues/index.html:56
+msgid "Enabled Queues"
+msgstr "Filas Habilitadas"
+
+#: html/Admin/Elements/EditCustomField:90 html/Admin/Groups/Modify.html:117 html/Admin/Queues/Modify.html:138 html/Admin/Users/Modify.html:283 html/User/Groups/Modify.html:117
+#. (loc_fuzzy($msg))
+msgid "Enabled status %1"
+msgstr "Estado %1 habilitado"
+
+#: lib/RT/CustomField_Overlay.pm:361
+msgid "Enter multiple values"
+msgstr "Entre com múltiplos valores"
+
+#: lib/RT/CustomField_Overlay.pm:358
+msgid "Enter one value"
+msgstr "Entre com um valor"
+
+#: html/Ticket/Elements/EditLinks:112
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "Entre com identificadores de tíquete ou URIs que levam ao tíquete.  Separe entradas múltiplas com espaços."
+
+#: html/Elements/Login:29 html/SelfService/Error.html:25 html/SelfService/Error.html:26
+msgid "Error"
+msgstr "Erro"
+
+#: NOT FOUND IN SOURCE
+msgid "Error adding watcher"
+msgstr "Erro ao adicionar um observador"
+
+#: lib/RT/Queue_Overlay.pm:555
+msgid "Error in parameters to Queue->AddWatcher"
+msgstr "Erro nos parâmetros para Queue->AddWatcher"
+
+#: lib/RT/Queue_Overlay.pm:713
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr "Erro nos parâmetros para Queue->DelWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1356
+msgid "Error in parameters to Ticket->AddWatcher"
+msgstr "Erro nos parâmetros para Ticket->AddWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1532
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr "Erro nos parâmetros para Ticket->DelWatcher"
+
+#: etc/initialdata:20
+msgid "Everyone"
+msgstr "Todos"
+
+#: bin/rt-crontool:194
+msgid "Example:"
+msgstr "Exemplo:"
+
+#: html/Admin/Elements/ModifyUser:64
+msgid "ExternalAuthId"
+msgstr "ExternalAuthId"
+
+#: html/Admin/Elements/ModifyUser:58
+msgid "ExternalContactInfoId"
+msgstr "ExternalContactInfoId"
+
+#: html/Admin/Users/Modify.html:73
+msgid "Extra info"
+msgstr "Informação adicional"
+
+#: lib/RT/User_Overlay.pm:302
+msgid "Failed to find 'Privileged' users pseudogroup."
+msgstr "Não pude encontrar o pseudogrupo de usuários 'Privileged'."
+
+#: lib/RT/User_Overlay.pm:309
+msgid "Failed to find 'Unprivileged' users pseudogroup"
+msgstr "Não pude encontrar o pseudogrupo de usuários 'Unprivileged'"
+
+#: bin/rt-crontool:138
+#. ($modname, $@)
+msgid "Failed to load module %1. (%2)"
+msgstr "Falhou ao carregar o módulo %1. (%2)"
+
+#: lib/RT/Date.pm:412
+msgid "Feb."
+msgstr "Fev."
+
+#: NOT FOUND IN SOURCE
+msgid "February"
+msgstr "Fevereiro"
+
+#: NOT FOUND IN SOURCE
+msgid "Fin"
+msgstr "Fin"
+
+#: html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:59 lib/RT/Tickets_Overlay.pm:1091
+msgid "Final Priority"
+msgstr "Prioridade Final"
+
+#: lib/RT/Ticket_Overlay.pm:1162
+msgid "FinalPriority"
+msgstr "FinalPriority"
+
+#: html/Admin/Queues/People.html:61 html/Ticket/Elements/EditPeople:34
+msgid "Find group whose"
+msgstr "Encontrar o grupo cujo"
+
+#: html/Elements/Quicksearch:25
+msgid "Find new/open tickets"
+msgstr "Encontrar tíquetes novos/abertos"
+
+#: html/Admin/Queues/People.html:57 html/Admin/Users/index.html:46 html/Ticket/Elements/EditPeople:30
+msgid "Find people whose"
+msgstr "Encontrar pessoas que"
+
+#: html/Search/Listing.html:108
+msgid "Find tickets"
+msgstr "Encontrar tíquetes"
+
+#: NOT FOUND IN SOURCE
+msgid "Finish Approval"
+msgstr "Terminar Aprovação"
+
+#: html/Ticket/Elements/Tabs:58
+msgid "First"
+msgstr "Primeiro"
+
+#: html/Search/Listing.html:41
+msgid "First page"
+msgstr "Primeira página"
+
+#: docs/design_docs/string-extraction-guide.txt:33
+msgid "Foo Bar Baz"
+msgstr "Foo Bar Baz"
+
+#: docs/design_docs/string-extraction-guide.txt:24
+msgid "Foo!"
+msgstr "Foo!"
+
+#: html/Search/Bulk.html:87
+msgid "Force change"
+msgstr "Force alteração"
+
+#: html/Search/Listing.html:106
+#. ($ticketcount)
+msgid "Found %quant(%1,ticket)"
+msgstr "Encontrado %quant(%1,tíquete)"
+
+#: lib/RT/Interface/Web.pm:868
+msgid "Found Object"
+msgstr "Objeto Encontrado"
+
+#: html/Admin/Elements/ModifyUser:44
+msgid "FreeformContactInfo"
+msgstr "FreeformContactInfo"
+
+#: lib/RT/CustomField_Overlay.pm:38
+msgid "FreeformMultiple"
+msgstr "FreeformMultiple"
+
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformSingle"
+msgstr "FreeformSingle"
+
+#: lib/RT/Date.pm:392
+msgid "Fri."
+msgstr "Sex."
+
+#: html/Ticket/Elements/ShowHistory:41 html/Ticket/Elements/ShowHistory:51
+msgid "Full headers"
+msgstr "Cabeçalhos completos"
+
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr "Obtendo o usuário corrente a partir de uma assinatura pgp\\n"
+
+#: lib/RT/Transaction_Overlay.pm:595
+#. ($New->Name)
+msgid "Given to %1"
+msgstr "Dado a %1"
+
+#: html/Admin/Elements/Tabs:41 html/Admin/index.html:38
+msgid "Global"
+msgstr "Global"
+
+#: NOT FOUND IN SOURCE
+msgid "Global Keyword Selections"
+msgstr "Seleções de Palavras Chave Globais"
+
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
+msgstr "Scrips Globais"
+
+#: html/Admin/Elements/SelectTemplate:38
+#. (loc($Template->Name))
+msgid "Global template: %1"
+msgstr "Esquema global: %1"
+
+#: html/Admin/Elements/EditCustomFields:75 html/Admin/Queues/People.html:59 html/Admin/Queues/People.html:63 html/Admin/Queues/index.html:44 html/Admin/Users/index.html:49 html/Ticket/Elements/EditPeople:32 html/Ticket/Elements/EditPeople:36 html/index.html:41
+msgid "Go!"
+msgstr "Ir!"
+
+#: NOT FOUND IN SOURCE
+msgid "Good pgp sig from %1\\n"
+msgstr "Assinatura pgp válida de %1\\n"
+
+#: html/Search/Listing.html:50
+msgid "Goto page"
+msgstr "Ir para a página"
+
+#: html/Elements/GotoTicket:25 html/SelfService/Elements/GotoTicket:25
+msgid "Goto ticket"
+msgstr "Ir para o tíquete"
+
+#: NOT FOUND IN SOURCE
+msgid "Grand"
+msgstr ""
+
+#: html/Ticket/Elements/AddWatchers:46 html/User/Elements/DelegateRights:78
+msgid "Group"
+msgstr "Grupo"
+
+#: NOT FOUND IN SOURCE
+msgid "Group %1 %2: %3"
+msgstr "Grupo %1 %2: %3"
+
+#: html/Admin/Elements/GroupTabs:45 html/Admin/Elements/QueueTabs:57 html/Admin/Elements/SystemTabs:44 html/Admin/Global/index.html:55
+msgid "Group Rights"
+msgstr "Direitos de Acesso do Grupo"
+
+#: lib/RT/Group_Overlay.pm:965
+msgid "Group already has member"
+msgstr "O grupo já tem um membro"
+
+#: NOT FOUND IN SOURCE
+msgid "Group could not be created."
+msgstr "O grupo não pôde ser criado."
+
+#: html/Admin/Groups/Modify.html:77
+#. ($create_msg)
+msgid "Group could not be created: %1"
+msgstr "O grupo não pôde ser criado: %1"
+
+#: lib/RT/Group_Overlay.pm:497
+msgid "Group created"
+msgstr "Grupo criado"
+
+#: lib/RT/Group_Overlay.pm:1133
+msgid "Group has no such member"
+msgstr "O grupo não contém este membro"
+
+#: lib/RT/Group_Overlay.pm:945 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1429 lib/RT/Ticket_Overlay.pm:1507
+msgid "Group not found"
+msgstr "Grupo não encontrado"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not found.\\n"
+msgstr "Grupo não encontrado.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not specified.\\n"
+msgstr "Grupo não especificado.\\n"
+
+#: html/Admin/Elements/SelectNewGroupMembers:35 html/Admin/Elements/Tabs:35 html/Admin/Groups/Members.html:64 html/Admin/Queues/People.html:83 html/Admin/index.html:32 html/User/Groups/Members.html:67
+msgid "Groups"
+msgstr "Grupos"
+
+#: lib/RT/Group_Overlay.pm:971
+msgid "Groups can't be members of their members"
+msgstr "Grupos não podem ser membros de seus próprios membros"
+
+#: lib/RT/Interface/CLI.pm:73 lib/RT/Interface/CLI.pm:73
+msgid "Hello!"
+msgstr "Olá!"
+
+#: docs/design_docs/string-extraction-guide.txt:40
+#. ($name)
+msgid "Hello, %1"
+msgstr "Olá, %1"
+
+#: html/Ticket/Elements/ShowHistory:30 html/Ticket/Elements/Tabs:88
+msgid "History"
+msgstr "Histórico"
+
+#: html/Admin/Elements/ModifyUser:68
+msgid "HomePhone"
+msgstr "Telefone Residencial"
+
+#: html/Elements/Tabs:46
+msgid "Homepage"
+msgstr "Homepage"
+
+#: lib/RT/Base.pm:74
+#. (6)
+msgid "I have %quant(%1,concrete mixer)."
+msgstr "Eu tenho %quant(%1,concrete mixer)."
+
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
+msgstr "Tenho [quant,_1,concrete mixer]."
+
+#: html/Ticket/Elements/ShowBasics:27 lib/RT/Tickets_Overlay.pm:1018
+msgid "Id"
+msgstr "Identificador"
+
+#: html/Admin/Users/Modify.html:44 html/User/Prefs.html:39
+msgid "Identity"
+msgstr "Identidade"
+
+#: etc/upgrade/2.1.71:86
+msgid "If an approval is rejected, reject the original and delete pending approvals"
+msgstr "Se uma aprovação é rejeitada, rejeite a original e remova as aprovações pendentes"
+
+#: bin/rt-crontool:190
+msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
+msgstr "Se esta ferramenta fosse setgid, um usuário local mal-intencionado poderia usá-la para obter acesso administrativo ao RT."
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
+msgid "If you've updated anything above, be sure to"
+msgstr "Se você alterou qualquer coisa acima, não se esqueça de"
+
+#: lib/RT/Interface/Web.pm:860
+msgid "Illegal value for %1"
+msgstr "Valor ilegal para %1"
+
+#: lib/RT/Interface/Web.pm:863
+msgid "Immutable field"
+msgstr "Campo imutável"
+
+#: html/Admin/Elements/EditCustomFields:74
+msgid "Include disabled custom fields in listing."
+msgstr "Incluir campoas personalizados desabilitados na listagem."
+
+#: html/Admin/Queues/index.html:43
+msgid "Include disabled queues in listing."
+msgstr "Incluir filas desabilitadas na listagem."
+
+#: html/Admin/Users/index.html:47
+msgid "Include disabled users in search."
+msgstr "Incluir usuários desabilitados na busca."
+
+#: lib/RT/Tickets_Overlay.pm:1067
+msgid "Initial Priority"
+msgstr "Prioridade Inicial"
+
+#: lib/RT/Ticket_Overlay.pm:1161 lib/RT/Ticket_Overlay.pm:1163
+msgid "InitialPriority"
+msgstr "InitialPriority"
+
+#: lib/RT/ScripAction_Overlay.pm:105
+msgid "Input error"
+msgstr "Erro de entrada"
+
+#: NOT FOUND IN SOURCE
+msgid "Interest noted"
+msgstr "Interesse notado"
+
+#: lib/RT/Ticket_Overlay.pm:3729
+msgid "Internal Error"
+msgstr "Erro Interno"
+
+#: lib/RT/Record.pm:143
+#. ($id->{error_message})
+msgid "Internal Error: %1"
+msgstr "Erro Interno: %1"
+
+#: lib/RT/Group_Overlay.pm:644
+msgid "Invalid Group Type"
+msgstr "Tipo Inválido de Grupo"
+
+#: lib/RT/Principal_Overlay.pm:128
+msgid "Invalid Right"
+msgstr "Direito Inválido"
+
+#: NOT FOUND IN SOURCE
+msgid "Invalid Type"
+msgstr "Tipo Inválido"
+
+#: lib/RT/Interface/Web.pm:865
+msgid "Invalid data"
+msgstr "Dado inválido"
+
+#: lib/RT/Ticket_Overlay.pm:438
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr "Proprietário inválido.  Usando 'nobody'."
+
+#: lib/RT/Scrip_Overlay.pm:134 lib/RT/Template_Overlay.pm:251
+msgid "Invalid queue"
+msgstr "Fila inválida"
+
+#: lib/RT/ACE_Overlay.pm:244 lib/RT/ACE_Overlay.pm:253 lib/RT/ACE_Overlay.pm:259 lib/RT/ACE_Overlay.pm:270 lib/RT/ACE_Overlay.pm:275
+msgid "Invalid right"
+msgstr "Direito de acesso inválido"
+
+#: lib/RT/Record.pm:118
+#. ($key)
+msgid "Invalid value for %1"
+msgstr "Valor inválido para %1"
+
+#: lib/RT/Ticket_Overlay.pm:3367
+msgid "Invalid value for custom field"
+msgstr "Valor inválido para o campo personalizado"
+
+#: lib/RT/Ticket_Overlay.pm:345
+msgid "Invalid value for status"
+msgstr "Valor inválido para o estado"
+
+#: bin/rt-crontool:191
+msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
+msgstr "É extremamente importante que usuários não privilegiados não possam executar esta ferramenta."
+
+#: bin/rt-crontool:192
+msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
+msgstr "Sugere-se que você crie um usuário UNIX não privilegiado com o grupo e acesso RT corretos para executar esta ferramenta."
+
+#: bin/rt-crontool:163
+msgid "It takes several arguments:"
+msgstr "Requer vários argumentos:"
+
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
+msgstr "Itens requerendo minha aprovação"
+
+#: lib/RT/Date.pm:411
+msgid "Jan."
+msgstr "Jan."
+
+#: NOT FOUND IN SOURCE
+msgid "January"
+msgstr "Janeiro"
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "Join or leave this group"
+msgstr "Entre ou deixe este grupo"
+
+#: lib/RT/Date.pm:417
+msgid "Jul."
+msgstr "Jul."
+
+#: NOT FOUND IN SOURCE
+msgid "July"
+msgstr "Julho"
+
+#: html/Ticket/Elements/Tabs:99
+msgid "Jumbo"
+msgstr "Jumbo"
+
+#: lib/RT/Date.pm:416
+msgid "Jun."
+msgstr "Jun."
+
+#: NOT FOUND IN SOURCE
+msgid "June"
+msgstr "Junho"
+
+#: NOT FOUND IN SOURCE
+msgid "Keyword"
+msgstr "Palavra chave"
+
+#: html/Admin/Elements/ModifyUser:52
+msgid "Lang"
+msgstr "Líng"
+
+#: html/Ticket/Elements/Tabs:73
+msgid "Last"
+msgstr "Último"
+
+#: html/Ticket/Elements/EditDates:38 html/Ticket/Elements/ShowDates:39
+msgid "Last Contact"
+msgstr "Último Contato"
+
+#: html/Elements/SelectDateType:29
+msgid "Last Contacted"
+msgstr "Contactado em"
+
+#: html/Search/Elements/TicketHeader:41
+msgid "Last Notified"
+msgstr "Notificado em"
+
+#: html/Elements/SelectDateType:30
+msgid "Last Updated"
+msgstr "Atualizado em"
+
+#: NOT FOUND IN SOURCE
+msgid "LastUpdated"
+msgstr "LastUpdated"
+
+#: NOT FOUND IN SOURCE
+msgid "Left"
+msgstr "Resta"
+
+#: html/Admin/Users/Modify.html:83
+msgid "Let this user access RT"
+msgstr "Deixar este usuário acessar RT"
+
+#: html/Admin/Users/Modify.html:87
+msgid "Let this user be granted rights"
+msgstr "Deixar este usuário receber direitos de acesso adicionais"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting owner to %1 %2"
+msgstr "Limitando proprietário a %1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting queue to %1 %2"
+msgstr "Limitando fila a %1 %2"
+
+#: lib/RT/Ticket_Overlay.pm:2697
+msgid "Link already exists"
+msgstr "A ligação já existe"
+
+#: lib/RT/Ticket_Overlay.pm:2709
+msgid "Link could not be created"
+msgstr "A ligação não pôde ser criada"
+
+#: lib/RT/Ticket_Overlay.pm:2717 lib/RT/Ticket_Overlay.pm:2727
+#. ($TransString)
+msgid "Link created (%1)"
+msgstr "Ligação criada (%1)"
+
+#: lib/RT/Ticket_Overlay.pm:2638
+#. ($TransString)
+msgid "Link deleted (%1)"
+msgstr "Ligação removida (%1)"
+
+#: lib/RT/Ticket_Overlay.pm:2644
+msgid "Link not found"
+msgstr "Ligação não encontrada"
+
+#: html/Ticket/ModifyLinks.html:25 html/Ticket/ModifyLinks.html:29
+#. ($Ticket->Id)
+msgid "Link ticket #%1"
+msgstr "Ligar o tíquete #%1"
+
+#: NOT FOUND IN SOURCE
+msgid "Link ticket %1"
+msgstr "Ligar o tíquete %1"
+
+#: html/Ticket/Elements/Tabs:97
+msgid "Links"
+msgstr "Ligações"
+
+#: html/Admin/Users/Modify.html:114 html/User/Prefs.html:85
+msgid "Location"
+msgstr "Localização"
+
+#: lib/RT.pm:158
+#. ($RT::LogDir)
+msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
+msgstr "O diretório de log %1 não foi encontrado ou não pôde ser alterado.\\n RT não pode funcionar desta maneira."
+
+#: html/Elements/Header:57
+#. ("<b>".$session{'CurrentUser'}->Name."</b>")
+msgid "Logged in as %1"
+msgstr "Assinado como %1"
+
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:25 html/Elements/Login:34 html/Elements/Login:45
+msgid "Login"
+msgstr "Entrar"
+
+#: html/Elements/Header:54
+msgid "Logout"
+msgstr "Sair"
+
+#: html/Search/Bulk.html:86
+msgid "Make Owner"
+msgstr "Definir como proprietário"
+
+#: html/Search/Bulk.html:102
+msgid "Make Status"
+msgstr "Definir o estado"
+
+#: html/Search/Bulk.html:109
+msgid "Make date Due"
+msgstr "Definir o prazo final"
+
+#: html/Search/Bulk.html:110
+msgid "Make date Resolved"
+msgstr "Definir a data de resolução"
+
+#: html/Search/Bulk.html:107
+msgid "Make date Started"
+msgstr "Definir a data de iniciado"
+
+#: html/Search/Bulk.html:106
+msgid "Make date Starts"
+msgstr "Definir a data início"
+
+#: html/Search/Bulk.html:108
+msgid "Make date Told"
+msgstr "Definir a data de última alteração"
+
+#: html/Search/Bulk.html:99
+msgid "Make priority"
+msgstr "Definir a prioridade"
+
+#: html/Search/Bulk.html:100
+msgid "Make queue"
+msgstr "Definir a fila"
+
+#: html/Search/Bulk.html:98
+msgid "Make subject"
+msgstr "Definir o assunto"
+
+#: html/Admin/index.html:33
+msgid "Manage groups and group membership"
+msgstr "Administrar grupos e seus membros"
+
+#: html/Admin/index.html:39
+msgid "Manage properties and configuration which apply to all queues"
+msgstr "Administrar propriedades e configurações aplicáveis a todas as filas"
+
+#: html/Admin/index.html:36
+msgid "Manage queues and queue-specific properties"
+msgstr "Administrar filas e suas propriedades específicas"
+
+#: html/Admin/index.html:30
+msgid "Manage users and passwords"
+msgstr "Administrar usuários e senhas"
+
+#: lib/RT/Date.pm:413
+msgid "Mar."
+msgstr "Mar."
+
+#: NOT FOUND IN SOURCE
+msgid "March"
+msgstr "Março"
+
+#: NOT FOUND IN SOURCE
+msgid "May"
+msgstr "Maio"
+
+#: lib/RT/Date.pm:415
+msgid "May."
+msgstr "Mai."
+
+#: lib/RT/Group_Overlay.pm:982
+msgid "Member added"
+msgstr "Membro adicionado"
+
+#: lib/RT/Group_Overlay.pm:1140
+msgid "Member deleted"
+msgstr "Membro removido"
+
+#: lib/RT/Group_Overlay.pm:1144
+msgid "Member not deleted"
+msgstr "Membro não removido"
+
+#: html/Elements/SelectLinkType:26
+msgid "Member of"
+msgstr "Membro de"
+
+#: NOT FOUND IN SOURCE
+msgid "MemberOf"
+msgstr "MemberOf"
+
+#: html/Admin/Elements/GroupTabs:42 html/User/Elements/GroupTabs:42
+msgid "Members"
+msgstr "Membros"
+
+#: lib/RT/Ticket_Overlay.pm:2843
+msgid "Merge Successful"
+msgstr "União bem sucedida"
+
+#: lib/RT/Ticket_Overlay.pm:2804
+msgid "Merge failed. Couldn't set EffectiveId"
+msgstr "União falhou. Não pude definir o EffectiveId"
+
+#: html/Ticket/Elements/EditLinks:115
+msgid "Merge into"
+msgstr "Unir a"
+
+#: html/Ticket/Update.html:102
+msgid "Message"
+msgstr "Mensagem"
+
+#: lib/RT/Interface/Web.pm:867
+msgid "Missing a primary key?: %1"
+msgstr "Faltando uma chave primária?: %1"
+
+#: html/Admin/Users/Modify.html:169 html/User/Prefs.html:54
+msgid "Mobile"
+msgstr "Móvel"
+
+#: html/Admin/Elements/ModifyUser:72
+msgid "MobilePhone"
+msgstr "Celular"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "Modify Access Control List"
+msgstr "Modificar Lista de Controle de Acesso"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Field %1"
+msgstr "Modificar o campo personalizado %1"
+
+#: html/Admin/Global/CustomFields.html:44 html/Admin/Global/index.html:51
+msgid "Modify Custom Fields which apply to all queues"
+msgstr "Modificar Campos Personalizados que se aplicam a todas as filas"
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "Modify Scrip templates for this queue"
+msgstr "Modificar esquemas de Scrip para esta fila"
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "Modify Scrips for this queue"
+msgstr "Modificar Scrips para esta fila"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify System ACLS"
+msgstr "Modificar ACLs do Sistema"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Template %1"
+msgstr "Modificar Esquema %1"
+
+#: html/Admin/Queues/CustomField.html:45
+#. ($QueueObj->Name())
+msgid "Modify a CustomField for queue %1"
+msgstr "Modificar um Campo Personalizado para a fila %1"
+
+#: html/Admin/Global/CustomField.html:53
+msgid "Modify a CustomField which applies to all queues"
+msgstr "Modificar um Campo Personalizado que se aplica a todas as filas"
+
+#: html/Admin/Queues/Scrip.html:54
+#. ($QueueObj->Name)
+msgid "Modify a scrip for queue %1"
+msgstr "Modificar um scrip para a fila %1"
+
+#: html/Admin/Global/Scrip.html:48
+msgid "Modify a scrip which applies to all queues"
+msgstr "Modificar um scrip aplicável a todas as filas"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify dates for # %1"
+msgstr "Modificar datas para # %1"
+
+#: html/Ticket/ModifyDates.html:25 html/Ticket/ModifyDates.html:29
+#. ($TicketObj->Id)
+msgid "Modify dates for #%1"
+msgstr "Modificar as datas para #%1"
+
+#: html/Ticket/ModifyDates.html:35
+#. ($TicketObj->Id)
+msgid "Modify dates for ticket # %1"
+msgstr "Modificar as datas para o tíquete # %1"
+
+#: html/Admin/Global/GroupRights.html:25 html/Admin/Global/GroupRights.html:28 html/Admin/Global/index.html:56
+msgid "Modify global group rights"
+msgstr "Modificar direitos de acesso globais de grupo"
+
+#: html/Admin/Global/GroupRights.html:33
+msgid "Modify global group rights."
+msgstr "Modificar direitos de acesso globais de grupo."
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for groups"
+msgstr "Modificar direitos globais para grupos"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for users"
+msgstr "Modificar direitos globais para usuários"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global scrips"
+msgstr "Modificar scrips globais"
+
+#: html/Admin/Global/UserRights.html:25 html/Admin/Global/UserRights.html:28 html/Admin/Global/index.html:60
+msgid "Modify global user rights"
+msgstr "Modificar direitos de acesso globais de usuário"
+
+#: html/Admin/Global/UserRights.html:33
+msgid "Modify global user rights."
+msgstr "Modificar direitos de acesso globais de usuário."
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "Modify group metadata or delete group"
+msgstr "Modificar metadados do grupo ou removê-lo"
+
+#: html/Admin/Groups/GroupRights.html:25 html/Admin/Groups/GroupRights.html:29 html/Admin/Groups/GroupRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify group rights for group %1"
+msgstr "Modificar os direitos de acesso do grupo %1"
+
+#: html/Admin/Queues/GroupRights.html:25 html/Admin/Queues/GroupRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify group rights for queue %1"
+msgstr "Modificar os direitos de acesso de grupo para a fila %1"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "Modify membership roster for this group"
+msgstr "Modificar lista de membros deste grupo"
+
+#: lib/RT/System.pm:61
+msgid "Modify one's own RT account"
+msgstr "Modificar sua própria conta RT"
+
+#: html/Admin/Queues/People.html:25 html/Admin/Queues/People.html:29
+#. ($QueueObj->Name)
+msgid "Modify people related to queue %1"
+msgstr "Modificar as pessoas relacionadas à fila %1"
+
+#: html/Ticket/ModifyPeople.html:25 html/Ticket/ModifyPeople.html:29 html/Ticket/ModifyPeople.html:35
+#. ($Ticket->id)
+#. ($Ticket->Id)
+msgid "Modify people related to ticket #%1"
+msgstr "Modificar as pessoas relacionadas ao tíquete #%1"
+
+#: html/Admin/Queues/Scrips.html:44
+#. ($QueueObj->Name)
+msgid "Modify scrips for queue %1"
+msgstr "Modificar os scrips da fila %1"
+
+#: html/Admin/Global/Scrips.html:44 html/Admin/Global/index.html:42
+msgid "Modify scrips which apply to all queues"
+msgstr "Modificar scrips aplicáveis a todas as filas"
+
+#: html/Admin/Global/Template.html:25 html/Admin/Global/Template.html:30 html/Admin/Global/Template.html:81 html/Admin/Queues/Template.html:78
+#. (loc($TemplateObj->Name()))
+#. ($TemplateObj->id)
+msgid "Modify template %1"
+msgstr "Modificar o modelo %1"
+
+#: html/Admin/Global/Templates.html:44
+msgid "Modify templates which apply to all queues"
+msgstr "Modificar esquemas que se aplicam a todas as filas"
+
+#: html/Admin/Groups/Modify.html:87 html/User/Groups/Modify.html:86
+#. ($Group->Name)
+msgid "Modify the group %1"
+msgstr "Modificar o grupo %1"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "Modify the queue watchers"
+msgstr "Modificar os observadores da fila"
+
+#: html/Admin/Users/Modify.html:236
+#. ($UserObj->Name)
+msgid "Modify the user %1"
+msgstr "Modificar o usuário %1"
+
+#: html/Ticket/ModifyAll.html:37
+#. ($Ticket->Id)
+msgid "Modify ticket # %1"
+msgstr "Modificar o tíquete # %1"
+
+#: html/Ticket/Modify.html:25 html/Ticket/Modify.html:28 html/Ticket/Modify.html:34
+#. ($TicketObj->Id)
+msgid "Modify ticket #%1"
+msgstr "Modificar o tíquete #%1"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "Modify tickets"
+msgstr "Modificar tíquetes"
+
+#: html/Admin/Groups/UserRights.html:25 html/Admin/Groups/UserRights.html:29 html/Admin/Groups/UserRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify user rights for group %1"
+msgstr "Modificar os direitos de acesso de usuário para o grupo %1"
+
+#: html/Admin/Queues/UserRights.html:25 html/Admin/Queues/UserRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify user rights for queue %1"
+msgstr "Modificar os direitos de acesso de usuário para a fila %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify watchers for queue '%1'"
+msgstr "Modificar os observadores para a fila '%1'"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ModifyACL"
+msgstr "ModifyACL"
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "ModifyOwnMembership"
+msgstr "ModifyOwnMembership"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "ModifyQueueWatchers"
+msgstr "ModifyQueueWatchers"
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "ModifyScrips"
+msgstr "ModifyScrips"
+
+#: lib/RT/System.pm:61
+msgid "ModifySelf"
+msgstr "ModifySelf"
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "ModifyTemplate"
+msgstr "ModifyTemplate"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "ModifyTicket"
+msgstr "ModifyTicket"
+
+#: lib/RT/Date.pm:388
+msgid "Mon."
+msgstr "Seg."
+
+#: html/Ticket/Elements/ShowRequestor:42
+#. ($name)
+msgid "More about %1"
+msgstr "Mais sobre %1"
+
+#: html/Admin/Elements/EditCustomFields:61
+msgid "Move down"
+msgstr "Descer"
+
+#: html/Admin/Elements/EditCustomFields:53
+msgid "Move up"
+msgstr "Subir"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:27
+msgid "Multiple"
+msgstr "Múltiplo"
+
+#: lib/RT/User_Overlay.pm:179
+msgid "Must specify 'Name' attribute"
+msgstr "O atributo 'Name' deve ser especificado"
+
+#: NOT FOUND IN SOURCE
+msgid "My Approvals"
+msgstr "Minhas Aprovações"
+
+#: html/Approvals/index.html:25 html/Approvals/index.html:26
+msgid "My approvals"
+msgstr "Minhas aprovações"
+
+#: html/Admin/Elements/AddCustomFieldValue:26 html/Admin/Elements/EditCustomField:32 html/Admin/Elements/ModifyTemplate:28 html/Admin/Elements/ModifyUser:30 html/Admin/Groups/Modify.html:44 html/Elements/SelectGroups:26 html/Elements/SelectUsers:28 html/User/Groups/Modify.html:44
+msgid "Name"
+msgstr "Nome"
+
+#: lib/RT/User_Overlay.pm:186
+msgid "Name in use"
+msgstr "Nome em uso"
+
+#: NOT FOUND IN SOURCE
+msgid "Need approval from system administrator"
+msgstr "Precisa de aprovação do administrador do sistema"
+
+#: html/Ticket/Elements/ShowDates:52
+msgid "Never"
+msgstr "Nunca"
+
+#: html/Elements/Quicksearch:30
+msgid "New"
+msgstr "Novo"
+
+#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:93 html/User/Prefs.html:65
+msgid "New Password"
+msgstr "Nova Senha"
+
+#: etc/initialdata:311 etc/upgrade/2.1.71:16
+msgid "New Pending Approval"
+msgstr "Nova Aprovação Pendente"
+
+#: html/Ticket/Elements/EditLinks:111
+msgid "New Relationships"
+msgstr "Novos Relacionamentos"
+
+#: html/Ticket/Elements/Tabs:36
+msgid "New Search"
+msgstr "Nova busca"
+
+#: html/Admin/Global/CustomField.html:41 html/Admin/Global/CustomFields.html:39 html/Admin/Queues/CustomField.html:52 html/Admin/Queues/CustomFields.html:40
+msgid "New custom field"
+msgstr "Novo campo personalizado"
+
+#: html/Admin/Elements/GroupTabs:54 html/User/Elements/GroupTabs:52
+msgid "New group"
+msgstr "Novo grupo"
+
+#: html/SelfService/Prefs.html:32
+msgid "New password"
+msgstr "Nova senha"
+
+#: lib/RT/User_Overlay.pm:639
+msgid "New password notification sent"
+msgstr "Notificação de nova senha enviada"
+
+#: html/Admin/Elements/QueueTabs:70
+msgid "New queue"
+msgstr "Nova fila"
+
+#: html/SelfService/Elements/Tabs:63
+msgid "New request"
+msgstr "Nova requisição"
+
+#: html/Admin/Elements/SelectRights:42
+msgid "New rights"
+msgstr "Novos direitos de acesso"
+
+#: html/Admin/Global/Scrip.html:40 html/Admin/Global/Scrips.html:39 html/Admin/Queues/Scrip.html:43 html/Admin/Queues/Scrips.html:53
+msgid "New scrip"
+msgstr "Novo scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "New search"
+msgstr "Nova busca"
+
+#: html/Admin/Global/Template.html:60 html/Admin/Global/Templates.html:39 html/Admin/Queues/Template.html:58 html/Admin/Queues/Templates.html:46
+msgid "New template"
+msgstr "Novo esquema"
+
+#: lib/RT/Ticket_Overlay.pm:2771
+msgid "New ticket doesn't exist"
+msgstr "O novo tíquete não existe"
+
+#: html/Admin/Elements/UserTabs:52
+msgid "New user"
+msgstr "Novo usuário"
+
+#: html/Admin/Elements/CreateUserCalled:26
+msgid "New user called"
+msgstr "Novo usuário chamado"
+
+#: html/Admin/Queues/People.html:55 html/Ticket/Elements/EditPeople:29
+msgid "New watchers"
+msgstr "Novos observadores"
+
+#: html/Admin/Users/Prefs.html:42
+msgid "New window setting"
+msgstr "Abrir nova janela"
+
+#: html/Ticket/Elements/Tabs:69
+msgid "Next"
+msgstr "Próximo"
+
+#: html/Search/Listing.html:48
+msgid "Next page"
+msgstr "Próxima página"
+
+#: html/Admin/Elements/ModifyUser:50
+msgid "NickName"
+msgstr "Apelido"
+
+#: html/Admin/Users/Modify.html:63 html/User/Prefs.html:46
+msgid "Nickname"
+msgstr "Apelido"
+
+#: html/Admin/Elements/EditCustomField:73 html/Admin/Elements/EditCustomFields:105
+msgid "No CustomField"
+msgstr "Não há Campo Personalizado"
+
+#: html/Admin/Groups/GroupRights.html:84 html/Admin/Groups/UserRights.html:71
+msgid "No Group defined"
+msgstr "Não há Grupo definido"
+
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:68
+msgid "No Queue defined"
+msgstr "Não há Fila definida"
+
+#: bin/rt-crontool:56
+msgid "No RT user found. Please consult your RT administrator.\\n"
+msgstr "Nenhum usuário RT foi encontrado. Favor consultar o administrador do RT.\\n"
+
+#: html/Admin/Global/Template.html:79 html/Admin/Queues/Template.html:76
+msgid "No Template"
+msgstr "Não há Modelo"
+
+#: bin/rt-commit-handler:764
+msgid "No Ticket specified. Aborting ticket "
+msgstr "Não há Tíquete especificado.  Abortando o tíquete "
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgstr "Não há Tíquete especificado. Abortando modificações no tíquete\\n\\n"
+
+#: html/Approvals/Elements/Approve:47
+msgid "No action"
+msgstr "Não há ação"
+
+#: lib/RT/Interface/Web.pm:862
+msgid "No column specified"
+msgstr "Não há coluna especificada"
+
+#: NOT FOUND IN SOURCE
+msgid "No command found\\n"
+msgstr "Comando não encontrado\\n"
+
+#: html/Elements/ViewUser:36 html/Ticket/Elements/ShowRequestor:45
+msgid "No comment entered about this user"
+msgstr "Não há comentário sobre este usuário"
+
+#: lib/RT/Ticket_Overlay.pm:2189 lib/RT/Ticket_Overlay.pm:2257
+msgid "No correspondence attached"
+msgstr "Não há nenhum arquivo anexado"
+
+#: lib/RT/Action/Generic.pm:150 lib/RT/Condition/Generic.pm:176 lib/RT/Search/ActiveTicketsInQueue.pm:56 lib/RT/Search/Generic.pm:113
+#. (ref $self)
+msgid "No description for %1"
+msgstr "Não há descrição para %1"
+
+#: lib/RT/Users_Overlay.pm:151
+msgid "No group specified"
+msgstr "Não há grupo especificado"
+
+#: lib/RT/User_Overlay.pm:857
+msgid "No password set"
+msgstr "Não há senha especificada"
+
+#: lib/RT/Queue_Overlay.pm:259
+msgid "No permission to create queues"
+msgstr "Não há permissão para criar filas"
+
+#: lib/RT/Ticket_Overlay.pm:341
+#. ($QueueObj->Name)
+msgid "No permission to create tickets in the queue '%1'"
+msgstr "Sem permissão para criar tíquetes na fila '%1'"
+
+#: lib/RT/User_Overlay.pm:151
+msgid "No permission to create users"
+msgstr "Sem permissão para criar usuários"
+
+#: html/SelfService/Display.html:174
+msgid "No permission to display that ticket"
+msgstr "Sem permissão para mostrar o tíquete"
+
+#: html/SelfService/Update.html:55
+msgid "No permission to view update ticket"
+msgstr "sem permissão para ver modificar o tíquete"
+
+#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1488
+msgid "No principal specified"
+msgstr "Não há principal especificado"
+
+#: html/Admin/Queues/People.html:154 html/Admin/Queues/People.html:164
+msgid "No principals selected."
+msgstr "Não há principal selecionado."
+
+#: html/Admin/Queues/index.html:35
+msgid "No queues matching search criteria found."
+msgstr "Não há fila satisfazendo o critério de busca."
+
+#: html/Admin/Elements/SelectRights:81
+msgid "No rights found"
+msgstr "Nenhum direito encontrado"
+
+#: html/Admin/Elements/SelectRights:33
+msgid "No rights granted."
+msgstr "Nenhum direito outorgado."
+
+#: html/Search/Bulk.html:149
+msgid "No search to operate on."
+msgstr "Não há busca a realizar"
+
+#: NOT FOUND IN SOURCE
+msgid "No ticket id specified"
+msgstr "Não há identificador de tíquete especificado"
+
+#: lib/RT/Transaction_Overlay.pm:480 lib/RT/Transaction_Overlay.pm:518
+msgid "No transaction type specified"
+msgstr "Não há tipo de transação especificada"
+
+#: NOT FOUND IN SOURCE
+msgid "No user or email address specified"
+msgstr "Não há usuário ou endereço de email especificado"
+
+#: html/Admin/Users/index.html:36
+msgid "No users matching search criteria found."
+msgstr "Nenhum usuário satisfazendo o critério de busca foi encontrado."
+
+#: bin/rt-commit-handler:644
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr "Nenhum usuário RT válido foi encontrado. O tratador de CVS do RT está desabilitado. Por favor, consulte o administrador do RT.\\n"
+
+#: lib/RT/Interface/Web.pm:859
+msgid "No value sent to _Set!\\n"
+msgstr "Nenhum valor enviado a _Set!\\n"
+
+#: html/Search/Elements/TicketRow:37
+msgid "Nobody"
+msgstr "Ninguém"
+
+#: lib/RT/Interface/Web.pm:864
+msgid "Nonexistant field?"
+msgstr "Campo inexistente?"
+
+#: html/Elements/Login:99
+msgid "Not logged in"
+msgstr "Não logado"
+
+#: html/Elements/Header:59 html/SelfService/Elements/Header:58
+msgid "Not logged in."
+msgstr "Não entrou."
+
+#: lib/RT/Date.pm:369
+msgid "Not set"
+msgstr "Não definido"
+
+#: html/NoAuth/Reminder.html:27
+msgid "Not yet implemented."
+msgstr "Ainda não implementado."
+
+#: html/Admin/Groups/Rights.html:25
+msgid "Not yet implemented...."
+msgstr "Ainda não implementado..."
+
+#: html/Approvals/Elements/Approve:50
+msgid "Notes"
+msgstr "Notas"
+
+#: lib/RT/User_Overlay.pm:642
+msgid "Notification could not be sent"
+msgstr "A notificação não pôde ser enviada"
+
+#: etc/initialdata:94
+msgid "Notify AdminCcs"
+msgstr "Notificar AdminCcs"
+
+#: etc/initialdata:90
+msgid "Notify AdminCcs as Comment"
+msgstr "Notificar AdminCcs como Comentário"
+
+#: etc/initialdata:121
+msgid "Notify Other Recipients"
+msgstr "Notificar Outros Destinatários"
+
+#: etc/initialdata:117
+msgid "Notify Other Recipients as Comment"
+msgstr "Notificar Outros Destinatários como Comentário"
+
+#: etc/initialdata:86
+msgid "Notify Owner"
+msgstr "Notificar Proprietário"
+
+#: etc/initialdata:82
+msgid "Notify Owner as Comment"
+msgstr "Notificar Proprietário como Comentário"
+
+#: etc/initialdata:313 etc/upgrade/2.1.71:17
+msgid "Notify Owners and AdminCcs of new items pending their approval"
+msgstr "Notificar Proprietários e AdminCcs sobre novos itens pendendo suas aprovações"
+
+#: etc/initialdata:78
+msgid "Notify Requestors"
+msgstr "Notificar Requisitantes"
+
+#: etc/initialdata:104
+msgid "Notify Requestors and Ccs"
+msgstr "Notificar Requisitantes e Ccs"
+
+#: etc/initialdata:99
+msgid "Notify Requestors and Ccs as Comment"
+msgstr "Notificar Requisitantes e Ccs como Comentário"
+
+#: etc/initialdata:113
+msgid "Notify Requestors, Ccs and AdminCcs"
+msgstr "Notificar Requisitantes, Ccs e AdminCcs"
+
+#: etc/initialdata:109
+msgid "Notify Requestors, Ccs and AdminCcs as Comment"
+msgstr "Notificar Requisitantes, Ccs e AdminCcs como Comentário"
+
+#: lib/RT/Date.pm:421
+msgid "Nov."
+msgstr "Nov."
+
+#: NOT FOUND IN SOURCE
+msgid "November"
+msgstr "Novembro"
+
+#: lib/RT/Record.pm:157
+msgid "Object could not be created"
+msgstr "Objeto não pôde ser criado"
+
+#: lib/RT/Record.pm:176
+msgid "Object created"
+msgstr "Objeto criado"
+
+#: lib/RT/Date.pm:420
+msgid "Oct."
+msgstr "Out."
+
+#: NOT FOUND IN SOURCE
+msgid "October"
+msgstr "Outubro"
+
+#: html/Elements/SelectDateRelation:35
+msgid "On"
+msgstr "Em"
+
+#: etc/initialdata:155
+msgid "On Comment"
+msgstr "Sobre Comentário"
+
+#: etc/initialdata:148
+msgid "On Correspond"
+msgstr "Sobre Correspondência"
+
+#: etc/initialdata:137
+msgid "On Create"
+msgstr "Sobre Criação"
+
+#: etc/initialdata:169
+msgid "On Owner Change"
+msgstr "Sobre Mudança de Propriedade"
+
+#: etc/initialdata:177
+msgid "On Queue Change"
+msgstr "Sobre Mudança de Fila"
+
+#: etc/initialdata:183
+msgid "On Resolve"
+msgstr "Sobre Resolução"
+
+#: etc/initialdata:161
+msgid "On Status Change"
+msgstr "Sobre Mudança de Estado"
+
+#: etc/initialdata:142
+msgid "On Transaction"
+msgstr "Sobre Transação"
+
+#: html/Approvals/Elements/PendingMyApproval:50
+#. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
+msgid "Only show approvals for requests created after %1"
+msgstr "Só mostrar aprovações para requisições criadas depois de %1"
+
+#: html/Approvals/Elements/PendingMyApproval:48
+#. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
+msgid "Only show approvals for requests created before %1"
+msgstr "Só mostrar aprovações para requisições criadas antes de %1"
+
+#: html/Elements/Quicksearch:31
+msgid "Open"
+msgstr "Aberto"
+
+#: html/Ticket/Elements/Tabs:136
+msgid "Open it"
+msgstr "Abrir"
+
+#: html/SelfService/Elements/Tabs:57
+msgid "Open requests"
+msgstr "Requisições abertas"
+
+#: html/Admin/Users/Prefs.html:41
+msgid "Open tickets (from listing) in a new window"
+msgstr "Abrir tíquetes (da listagem) em uma nova janela"
+
+#: html/Admin/Users/Prefs.html:40
+msgid "Open tickets (from listing) in another window"
+msgstr "Abrir tíquetes (da listagem) em outra janela"
+
+#: etc/initialdata:133
+msgid "Open tickets on correspondence"
+msgstr "Abrir tíquetes na correspondência"
+
+#: html/Search/Elements/PickRestriction:101
+msgid "Ordering and sorting"
+msgstr "Requisitando e ordenando"
+
+#: html/Admin/Elements/ModifyUser:46 html/Admin/Users/Modify.html:117 html/Elements/SelectUsers:29 html/User/Prefs.html:86
+msgid "Organization"
+msgstr "Organização"
+
+#: html/Approvals/Elements/Approve:34
+#. ($approving->Id, $approving->Subject)
+msgid "Originating ticket: #%1"
+msgstr "Tíquete originador: #%1"
+
+#: html/Admin/Elements/ModifyQueue:55 html/Admin/Queues/Modify.html:69
+msgid "Over time, priority moves toward"
+msgstr "Após a data, a prioridade tende a"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "Own tickets"
+msgstr "Próprios tíquetes"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "OwnTicket"
+msgstr "OwnTicket"
+
+#: etc/initialdata:38 html/Elements/MyRequests:32 html/SelfService/Elements/MyRequests:30 html/Ticket/Create.html:48 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/EditPeople:44 html/Ticket/Elements/ShowPeople:27 html/Ticket/Update.html:63 lib/RT/ACE_Overlay.pm:86 lib/RT/Tickets_Overlay.pm:1244
+msgid "Owner"
+msgstr "Proprietário"
+
+#: lib/RT/Ticket_Overlay.pm:3004
+#. ($OldOwnerObj->Name,  $NewOwnerObj->Name)
+msgid "Owner changed from %1 to %2"
+msgstr "Proprietário mudou de %1 para %2"
+
+#: lib/RT/Transaction_Overlay.pm:584
+#. ($Old->Name , $New->Name)
+msgid "Owner forcibly changed from %1 to %2"
+msgstr "Proprietário alterado à força de %1 para %2"
+
+#: html/Search/Elements/PickRestriction:31
+msgid "Owner is"
+msgstr "O proprietário é"
+
+#: html/Admin/Users/Modify.html:174 html/User/Prefs.html:56
+msgid "Pager"
+msgstr "Pager"
+
+#: html/Admin/Elements/ModifyUser:74
+msgid "PagerPhone"
+msgstr "Telefone do Pager"
+
+#: NOT FOUND IN SOURCE
+msgid "Parent"
+msgstr "Pai"
+
+#: html/Ticket/Create.html:182 html/Ticket/Elements/EditLinks:127 html/Ticket/Elements/EditLinks:58 html/Ticket/Elements/ShowLinks:43
+msgid "Parents"
+msgstr "Pais"
+
+#: html/Elements/Login:43 html/User/Prefs.html:61
+msgid "Password"
+msgstr "Senha"
+
+#: html/NoAuth/Reminder.html:25
+msgid "Password Reminder"
+msgstr "Lembrete de Senha"
+
+#: lib/RT/User_Overlay.pm:168 lib/RT/User_Overlay.pm:860
+msgid "Password too short"
+msgstr "Senha muito curta"
+
+#: html/Admin/Users/Modify.html:291 html/User/Prefs.html:172
+#. (loc_fuzzy($msg))
+msgid "Password: %1"
+msgstr "Senha: %1"
+
+#: html/Ticket/Elements/ShowSummary:43 html/Ticket/Elements/Tabs:96 html/Ticket/ModifyAll.html:51
+msgid "People"
+msgstr "Pessoas"
+
+#: etc/initialdata:126
+msgid "Perform a user-defined action"
+msgstr "Realizar uma ação definida pelo usuário"
+
+#: lib/RT/ACE_Overlay.pm:231 lib/RT/ACE_Overlay.pm:237 lib/RT/ACE_Overlay.pm:563 lib/RT/ACE_Overlay.pm:573 lib/RT/ACE_Overlay.pm:583 lib/RT/ACE_Overlay.pm:648 lib/RT/CurrentUser.pm:83 lib/RT/CurrentUser.pm:92 lib/RT/CustomField_Overlay.pm:445 lib/RT/CustomField_Overlay.pm:451 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1099 lib/RT/Group_Overlay.pm:1108 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1163 lib/RT/Group_Overlay.pm:1169 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:904 lib/RT/Group_Overlay.pm:908 lib/RT/Group_Overlay.pm:921 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:931 lib/RT/Scrip_Overlay.pm:126 lib/RT/Scrip_Overlay.pm:137 lib/RT/Scrip_Overlay.pm:197 lib/RT/Scrip_Overlay.pm:430 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:88 lib/RT/Template_Overlay.pm:94 lib/RT/Ticket_Overlay.pm:1341 lib/RT/Ticket_Overlay.pm:1351 lib/RT/Ticket_Overlay.pm:1365 lib/RT/Ticket_Overlay.pm:1518 lib/RT/Ticket_Overlay.pm:1527 lib/RT/Ticket_Overlay.pm:1540 lib/RT/Ticket_Overlay.pm:1875 lib/RT/Ticket_Overlay.pm:2013 lib/RT/Ticket_Overlay.pm:2177 lib/RT/Ticket_Overlay.pm:2244 lib/RT/Ticket_Overlay.pm:2596 lib/RT/Ticket_Overlay.pm:2668 lib/RT/Ticket_Overlay.pm:2762 lib/RT/Ticket_Overlay.pm:2777 lib/RT/Ticket_Overlay.pm:2910 lib/RT/Ticket_Overlay.pm:3139 lib/RT/Ticket_Overlay.pm:3337 lib/RT/Ticket_Overlay.pm:3499 lib/RT/Ticket_Overlay.pm:3551 lib/RT/Ticket_Overlay.pm:3716 lib/RT/Transaction_Overlay.pm:468 lib/RT/Transaction_Overlay.pm:475 lib/RT/Transaction_Overlay.pm:504 lib/RT/Transaction_Overlay.pm:511 lib/RT/User_Overlay.pm:1334 lib/RT/User_Overlay.pm:562 lib/RT/User_Overlay.pm:597 lib/RT/User_Overlay.pm:853 lib/RT/User_Overlay.pm:941
+msgid "Permission Denied"
+msgstr "Permissão Negada"
+
+#: html/User/Elements/Tabs:35
+msgid "Personal Groups"
+msgstr "Grupoas Pessoais"
+
+#: html/User/Groups/index.html:30 html/User/Groups/index.html:40
+msgid "Personal groups"
+msgstr "Grupos pessoais"
+
+#: html/User/Elements/DelegateRights:37
+msgid "Personal groups:"
+msgstr "Grupos pessoais:"
+
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:49
+msgid "Phone numbers"
+msgstr "Telefones"
+
+#: html/Admin/Users/Rights.html:25
+msgid "Placeholder"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Pref"
+msgstr ""
+
+#: html/Elements/Header:52 html/Elements/Tabs:55 html/SelfService/Prefs.html:25 html/User/Prefs.html:25 html/User/Prefs.html:28
+msgid "Preferences"
+msgstr "Preferências"
+
+#: NOT FOUND IN SOURCE
+msgid "Prefs"
+msgstr "Prefs"
+
+#: lib/RT/Action/Generic.pm:160
+msgid "Prepare Stubbed"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:61
+msgid "Prev"
+msgstr "Anterior"
+
+#: html/Search/Listing.html:44
+msgid "Previous page"
+msgstr "Página anterior"
+
+#: NOT FOUND IN SOURCE
+msgid "Pri"
+msgstr "Pri"
+
+#: lib/RT/ACE_Overlay.pm:133 lib/RT/ACE_Overlay.pm:208 lib/RT/ACE_Overlay.pm:552
+#. ($args{'PrincipalId'})
+msgid "Principal %1 not found."
+msgstr "Principal %1 não encontrado."
+
+#: html/Search/Elements/PickRestriction:54 html/SelfService/Display.html:76 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:54 html/Ticket/Elements/ShowBasics:39 lib/RT/Tickets_Overlay.pm:1042
+msgid "Priority"
+msgstr "Prioridade"
+
+#: html/Admin/Elements/ModifyQueue:51 html/Admin/Queues/Modify.html:65
+msgid "Priority starts at"
+msgstr "A prioridade inicia em"
+
+#: etc/initialdata:25
+msgid "Privileged"
+msgstr "Privilegiado"
+
+#: html/Admin/Users/Modify.html:271 html/User/Prefs.html:163
+#. (loc_fuzzy($msg))
+msgid "Privileged status: %1"
+msgstr "Estado privilegiado: %1"
+
+#: html/Admin/Users/index.html:62
+msgid "Privileged users"
+msgstr "Usuários privilegiados"
+
+#: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
+msgid "Pseudogroup for internal use"
+msgstr "Falso-grupo para uso interno"
+
+#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Elements/Quicksearch:29 html/Search/Elements/PickRestriction:46 html/SelfService/Create.html:35 html/SelfService/Display.html:68 html/Ticket/Create.html:38 html/Ticket/Elements/EditBasics:64 html/Ticket/Elements/ShowBasics:43 html/User/Elements/DelegateRights:80 lib/RT/Tickets_Overlay.pm:883
+msgid "Queue"
+msgstr "Fila"
+
+#: html/Admin/Queues/CustomField.html:42 html/Admin/Queues/Scrip.html:50 html/Admin/Queues/Scrips.html:46 html/Admin/Queues/Templates.html:43
+#. ($Queue)
+#. ($id)
+msgid "Queue %1 not found"
+msgstr "Fila %1 não encontrada"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue '%1' not found\\n"
+msgstr "A fila '%1' não foi encontrada\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Keyword Selections"
+msgstr "Seleções de Palavras-chave da Fila"
+
+#: html/Admin/Elements/ModifyQueue:31 html/Admin/Queues/Modify.html:43
+msgid "Queue Name"
+msgstr "Nome da Fila"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Scrips"
+msgstr "Scrips da Fila"
+
+#: lib/RT/Queue_Overlay.pm:263
+msgid "Queue already exists"
+msgstr "A fila já existe"
+
+#: lib/RT/Queue_Overlay.pm:272 lib/RT/Queue_Overlay.pm:278
+msgid "Queue could not be created"
+msgstr "A fila não pôde ser criada"
+
+#: html/Ticket/Create.html:209
+msgid "Queue could not be loaded."
+msgstr "A fila não pôde ser carregada"
+
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:282
+msgid "Queue created"
+msgstr "Fila criada"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue is not specified."
+msgstr "A fila não foi especificada."
+
+#: html/SelfService/Display.html:129
+msgid "Queue not found"
+msgstr "Fila não encontrada"
+
+#: html/Admin/Elements/Tabs:38 html/Admin/index.html:35
+msgid "Queues"
+msgstr "Filas"
+
+#: html/Elements/Login:34
+#. ($RT::VERSION)
+msgid "RT %1"
+msgstr "RT %1"
+
+#: docs/design_docs/string-extraction-guide.txt:70
+#. ($RT::VERSION, $RT::rtname)
+msgid "RT %1 for %2"
+msgstr "RT %1 para %2"
+
+#: html/Elements/Footer:32
+#. ($RT::VERSION)
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr "RT %1 por <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1. Direitos reservados 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1. Direitos reservados 1996-2002 Jesse Vincent <jesse\\\\@bestpractical.com>\\\\n"
+
+#: html/Admin/index.html:25 html/Admin/index.html:26
+msgid "RT Administration"
+msgstr "Adiministração do RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Authentication error."
+msgstr "Erro de autenticação no RT."
+
+#: NOT FOUND IN SOURCE
+msgid "RT Bounce: %1"
+msgstr "Ricocheteio do RT: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Configuration error"
+msgstr "Erro de configuração do RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Critical error. Message not recorded!"
+msgstr "Erro crítico no RT.  A mensagem não foi registrada!"
+
+#: html/Elements/Error:41 html/SelfService/Error.html:41
+msgid "RT Error"
+msgstr "Erro no RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Received mail (%1) from itself."
+msgstr "O RT recebeu email (%1) dele próprio."
+
+#: NOT FOUND IN SOURCE
+msgid "RT Recieved mail (%1) from itself."
+msgstr "O RT recebeu email (%1) de si próprio."
+
+#: html/SelfService/Closed.html:25
+msgid "RT Self Service / Closed Tickets"
+msgstr "Auto-serviço do RT / Tíquetes Fechados"
+
+#: html/index.html:25 html/index.html:28
+msgid "RT at a glance"
+msgstr "RT por alto"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't authenticate you"
+msgstr "O RT não pôde autenticá-lo"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find requestor via its external database lookup"
+msgstr "O RT não pôde encontrar o requisitante através de consulta ao banco de dados externo"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find the queue: %1"
+msgstr "O RT não pôde encontrar a fila: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't validate this PGP signature. \\n"
+msgstr "O RT não pôde validar esta assinatura PGP. \\n"
+
+#: html/Elements/PageLayout:26
+#. ($RT::rtname)
+msgid "RT for %1"
+msgstr "RT para %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr "RT para %1: %2"
+
+#: NOT FOUND IN SOURCE
+msgid "RT has proccessed your commands"
+msgstr "O RT processou seus comandos"
+
+#: html/Elements/Login:83
+#. ('2003')
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT tem &copy; Direitos Reservados 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  Ele é distribuído sob a <a href=\"http://www.gnu.org/copyleft/gpl.html\">Versão 2 da Licença Pública Geral GNU (GPL).</a>"
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT tem &copy; Direitos Reservados 1996-%1 por Jesse Vincent &lt;jesse@bestpractical.com&gt;.  Ele é distribuído sob a <a href=\\\"http://www.gnu.org/copyleft/gpl.html\\\">Versão 2 da Licença Pública Geral GNU (GPL).</a>"
+
+#: NOT FOUND IN SOURCE
+msgid "RT thinks this message may be a bounce"
+msgstr "O RT crê que esta mensagem seja um ricochete"
+
+#: NOT FOUND IN SOURCE
+msgid "RT will process this message as if it were unsigned.\\n"
+msgstr "O RT vai processar esta mensagem como se não fosse assinada.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+msgstr "O modo de comandos por email do RT requer autenticação PGP. Ou você não assinou sua mensagem ou sua assinatura não pôde ser verificada."
+
+#: html/Admin/Users/Modify.html:58 html/Admin/Users/Prefs.html:52 html/User/Prefs.html:44
+msgid "Real Name"
+msgstr "Nome real"
+
+#: html/Admin/Elements/ModifyUser:48
+msgid "RealName"
+msgstr "Nome real"
+
+#: html/Ticket/Create.html:185 html/Ticket/Elements/EditLinks:139 html/Ticket/Elements/EditLinks:94 html/Ticket/Elements/ShowLinks:63
+msgid "Referred to by"
+msgstr "Referenciado por"
+
+#: html/Elements/SelectLinkType:28 html/Ticket/Create.html:184 html/Ticket/Elements/EditLinks:135 html/Ticket/Elements/EditLinks:80 html/Ticket/Elements/ShowLinks:55
+msgid "Refers to"
+msgstr "Faz referência a"
+
+#: NOT FOUND IN SOURCE
+msgid "RefersTo"
+msgstr "RefersTo"
+
+#: NOT FOUND IN SOURCE
+msgid "Refine"
+msgstr "Refinar"
+
+#: html/Search/Elements/PickRestriction:27
+msgid "Refine search"
+msgstr "Refinar a Busca"
+
+#: html/Elements/Refresh:36
+#. ($value/60)
+msgid "Refresh this page every %1 minutes."
+msgstr "Recarregar esta página a cada %1 minutos."
+
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:60 html/Ticket/ModifyAll.html:57
+msgid "Relationships"
+msgstr "Relacionamentos"
+
+#: html/Search/Bulk.html:93
+msgid "Remove AdminCc"
+msgstr "Remover AdminCc"
+
+#: html/Search/Bulk.html:91
+msgid "Remove Cc"
+msgstr "Remover Cc"
+
+#: html/Search/Bulk.html:89
+msgid "Remove Requestor"
+msgstr "Remover Requisitante"
+
+#: html/Ticket/Elements/ShowTransaction:173 html/Ticket/Elements/Tabs:122
+msgid "Reply"
+msgstr "Responder"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "Reply to tickets"
+msgstr "Responder aos tíquetes"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "ReplyToTicket"
+msgstr "ReplyToTicket"
+
+#: etc/initialdata:44 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:87
+msgid "Requestor"
+msgstr "Requisitante"
+
+#: html/Search/Elements/PickRestriction:38
+msgid "Requestor email address"
+msgstr "Endereço eletrônico do requisitante"
+
+#: NOT FOUND IN SOURCE
+msgid "Requestor(s)"
+msgstr "Requisitante(s)"
+
+#: NOT FOUND IN SOURCE
+msgid "RequestorAddresses"
+msgstr "RequestorAddresses"
+
+#: html/SelfService/Create.html:43 html/SelfService/Display.html:42 html/Ticket/Create.html:56 html/Ticket/Elements/EditPeople:48 html/Ticket/Elements/ShowPeople:31
+msgid "Requestors"
+msgstr "Requisitantes"
+
+#: html/Admin/Elements/ModifyQueue:61 html/Admin/Queues/Modify.html:75
+msgid "Requests should be due in"
+msgstr "A requisições vencem em"
+
+#: html/Elements/Submit:62
+msgid "Reset"
+msgstr "Restaurar"
+
+#: html/Admin/Users/Modify.html:159 html/User/Prefs.html:50
+msgid "Residence"
+msgstr "Residência"
+
+#: html/Ticket/Elements/Tabs:132
+msgid "Resolve"
+msgstr "Resolver"
+
+#: html/Ticket/Update.html:133
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Resolve ticket #%1 (%2)"
+msgstr "Resolver tíquete #%1 (%2)"
+
+#: etc/initialdata:302 html/Elements/SelectDateType:28 lib/RT/Ticket_Overlay.pm:1170
+msgid "Resolved"
+msgstr "Resolvido"
+
+#: html/Search/Bulk.html:123 html/Ticket/ModifyAll.html:73 html/Ticket/Update.html:73
+msgid "Response to requestors"
+msgstr "Resposta aos requisitantes"
+
+#: html/Elements/ListActions:26
+msgid "Results"
+msgstr "Resultados"
+
+#: html/Search/Elements/PickRestriction:105
+msgid "Results per page"
+msgstr "Resultados por página"
+
+#: html/Admin/Elements/ModifyUser:33 html/Admin/Users/Modify.html:100 html/User/Prefs.html:72
+msgid "Retype Password"
+msgstr "Confirmar a Senha"
+
+#: NOT FOUND IN SOURCE
+msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+msgstr "Direito de acesso %1 não encontrado para %2  %3 referente a %4 (%5)\\n"
+
+#: lib/RT/ACE_Overlay.pm:613
+msgid "Right Delegated"
+msgstr "Direito de Acesso Delegado"
+
+#: lib/RT/ACE_Overlay.pm:303
+msgid "Right Granted"
+msgstr "Direito de Acesso Outorgado"
+
+#: lib/RT/ACE_Overlay.pm:161
+msgid "Right Loaded"
+msgstr "Direito de Acesso Carregado"
+
+#: lib/RT/ACE_Overlay.pm:678 lib/RT/ACE_Overlay.pm:693
+msgid "Right could not be revoked"
+msgstr "Direito de acesso não pôde ser revogado"
+
+#: html/User/Delegation.html:64
+msgid "Right not found"
+msgstr "Direito de acesso não encontrado"
+
+#: lib/RT/ACE_Overlay.pm:543 lib/RT/ACE_Overlay.pm:638
+msgid "Right not loaded."
+msgstr "Direito de acesso não carregado."
+
+#: lib/RT/ACE_Overlay.pm:689
+msgid "Right revoked"
+msgstr "Direito de acesso revogado"
+
+#: html/Admin/Elements/UserTabs:41
+msgid "Rights"
+msgstr "Direitos de Acesso"
+
+#: lib/RT/Interface/Web.pm:758
+#. ($object_type)
+msgid "Rights could not be granted for %1"
+msgstr "Direitos de acesso não puderam ser outorgados a %1"
+
+#: lib/RT/Interface/Web.pm:791
+#. ($object_type)
+msgid "Rights could not be revoked for %1"
+msgstr "Direitos de acesso não puderam ser revogados de %1"
+
+#: html/Admin/Global/GroupRights.html:51 html/Admin/Queues/GroupRights.html:52
+msgid "Roles"
+msgstr "Papéis"
+
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr "RootApproval"
+
+#: lib/RT/Date.pm:393
+msgid "Sat."
+msgstr "Sáb."
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
+msgid "Save Changes"
+msgstr "Salvar as Alterações"
+
+#: html/Ticket/ModifyLinks.html:39
+msgid "Save changes"
+msgstr "Salvar as alterações"
+
+#: html/Admin/Global/Scrip.html:49
+#. ($ARGS{'id'})
+msgid "Scrip #%1"
+msgstr "Scrip #%1"
+
+#: lib/RT/Scrip_Overlay.pm:176
+msgid "Scrip Created"
+msgstr "Scrip Criado"
+
+#: html/Admin/Elements/EditScrips:84
+msgid "Scrip deleted"
+msgstr "Scrip removido"
+
+#: html/Admin/Elements/QueueTabs:46 html/Admin/Elements/SystemTabs:33 html/Admin/Global/index.html:41
+msgid "Scrips"
+msgstr "Scrips"
+
+#: NOT FOUND IN SOURCE
+msgid "Scrips for %1\\n"
+msgstr "Scrips para %1\\n"
+
+#: html/Admin/Queues/Scrips.html:33
+msgid "Scrips which apply to all queues"
+msgstr "Scrips aplicáveis a todas as filas"
+
+#: html/Elements/SimpleSearch:27 html/Search/Elements/PickRestriction:126 html/Ticket/Elements/Tabs:159
+msgid "Search"
+msgstr "Buscar"
+
+#: NOT FOUND IN SOURCE
+msgid "Search Criteria"
+msgstr "Critérios de Busca"
+
+#: html/Approvals/Elements/PendingMyApproval:39
+msgid "Search for approvals"
+msgstr "Buscar por aprovações"
+
+#: bin/rt-crontool:188
+msgid "Security:"
+msgstr "Segurança:"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "SeeQueue"
+msgstr "SeeQueue"
+
+#: html/Admin/Groups/index.html:40
+msgid "Select a group"
+msgstr "Selecionar um grupo"
+
+#: NOT FOUND IN SOURCE
+msgid "Select a queue"
+msgstr "Selecionar uma fila"
+
+#: html/Admin/Users/index.html:25 html/Admin/Users/index.html:28
+msgid "Select a user"
+msgstr "Selecionar um usuário"
+
+#: html/Admin/Global/CustomField.html:38 html/Admin/Global/CustomFields.html:36
+msgid "Select custom field"
+msgstr "Selecionar um campo personalizado"
+
+#: html/Admin/Elements/GroupTabs:52 html/User/Elements/GroupTabs:50
+msgid "Select group"
+msgstr "Selecionar um grupo"
+
+#: lib/RT/CustomField_Overlay.pm:355
+msgid "Select multiple values"
+msgstr "Selecionar múltiplos valores"
+
+#: lib/RT/CustomField_Overlay.pm:352
+msgid "Select one value"
+msgstr "Selecionar um valor"
+
+#: html/Admin/Elements/QueueTabs:67
+msgid "Select queue"
+msgstr "Selecionar uma fila"
+
+#: html/Admin/Global/Scrip.html:37 html/Admin/Global/Scrips.html:36 html/Admin/Queues/Scrip.html:40 html/Admin/Queues/Scrips.html:50
+msgid "Select scrip"
+msgstr "Selecionar um scrip"
+
+#: html/Admin/Global/Template.html:57 html/Admin/Global/Templates.html:36 html/Admin/Queues/Template.html:55
+msgid "Select template"
+msgstr "Selecionar um esquema"
+
+#: html/Admin/Elements/UserTabs:49
+msgid "Select user"
+msgstr "Selecionar um usuário"
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "SelectMultiple"
+msgstr "SelectMultiple"
+
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectSingle"
+msgstr "SelectSingle"
+
+#: html/SelfService/index.html:25
+msgid "Self Service"
+msgstr "Auto-serviço"
+
+#: etc/initialdata:114
+msgid "Send mail to all watchers"
+msgstr "Enviar mensagem a todos os observadores"
+
+#: etc/initialdata:110
+msgid "Send mail to all watchers as a \"comment\""
+msgstr "Enviar mensagem a todos os observadores como um \"comentário\""
+
+#: etc/initialdata:105
+msgid "Send mail to requestors and Ccs"
+msgstr "Enviar mensagem aos requisitantes e Ccs"
+
+#: etc/initialdata:100
+msgid "Send mail to requestors and Ccs as a comment"
+msgstr "Enviar mensagem aos requisitantes e Ccs como um comentário"
+
+#: etc/initialdata:79
+msgid "Sends a message to the requestors"
+msgstr "Envia uma mensagem aos requisitantes"
+
+#: etc/initialdata:118 etc/initialdata:122
+msgid "Sends mail to explicitly listed Ccs and Bccs"
+msgstr "Envia uma mensagem aos Ccs e Bccs explicitamente listados"
+
+#: etc/initialdata:95
+msgid "Sends mail to the administrative Ccs"
+msgstr "Envia uma mensagem aos Ccs administrativos"
+
+#: etc/initialdata:91
+msgid "Sends mail to the administrative Ccs as a comment"
+msgstr "Envia uma mensagem aos Ccs administrativos como um comentário"
+
+#: etc/initialdata:83 etc/initialdata:87
+msgid "Sends mail to the owner"
+msgstr "Envia uma mensagem ao proprietário"
+
+#: lib/RT/Date.pm:419
+msgid "Sep."
+msgstr "Set."
+
+#: NOT FOUND IN SOURCE
+msgid "September"
+msgstr "Setembro"
+
+#: NOT FOUND IN SOURCE
+msgid "Show Results"
+msgstr "Mostrar os Resultados"
+
+#: html/Approvals/Elements/PendingMyApproval:44
+msgid "Show approved requests"
+msgstr "Mostrar requisições aprovadas"
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show basics"
+msgstr "Mostrar o sumário"
+
+#: html/Approvals/Elements/PendingMyApproval:45
+msgid "Show denied requests"
+msgstr "Mostrar requisições negadas"
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show details"
+msgstr "Mostrar os detalhes"
+
+#: html/Approvals/Elements/PendingMyApproval:43
+msgid "Show pending requests"
+msgstr "Mostrar requisições pendentes"
+
+#: html/Approvals/Elements/PendingMyApproval:46
+msgid "Show requests awaiting other approvals"
+msgstr "Mostrar requisições aguardando outras aprovações"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "Show ticket private commentary"
+msgstr "Mostrar comentário privado do tíquete"
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "Show ticket summaries"
+msgstr "Mostrar sumários do tíquete"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "ShowACL"
+msgstr "ShowACL"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "ShowScrips"
+msgstr "ShowScrips"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "ShowTemplate"
+msgstr "ShowTemplate"
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "ShowTicket"
+msgstr "ShowTicket"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "ShowTicketComments"
+msgstr "ShowTicketComments"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Sign up as a ticket Requestor or ticket or queue Cc"
+msgstr "Cadastrar como um Requisitante de tíquete ou um Cc de tíquete ou fila"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "Sign up as a ticket or queue AdminCc"
+msgstr "Cadastrar como um AdminCC de tíquete ou fila"
+
+#: html/Admin/Elements/ModifyUser:39 html/Admin/Users/Modify.html:191 html/Admin/Users/Prefs.html:32 html/SelfService/Prefs.html:37 html/User/Prefs.html:112
+msgid "Signature"
+msgstr "Assinatura"
+
+#: html/SelfService/Elements/Header:52
+#. ($session{'CurrentUser'}->Name)
+msgid "Signed in as %1"
+msgstr "Assinado como %1"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:26
+msgid "Single"
+msgstr "Único"
+
+#: html/Elements/Header:51
+msgid "Skip Menu"
+msgstr "Saltar Menu"
+
+#: html/Admin/Elements/EditCustomFieldValues:31
+msgid "Sort key"
+msgstr "Chave de ordenação"
+
+#: html/Search/Elements/PickRestriction:109
+msgid "Sort results by"
+msgstr "Ordenar os resultados por"
+
+#: html/Admin/Elements/AddCustomFieldValue:25
+msgid "SortOrder"
+msgstr "Ordenação"
+
+#: NOT FOUND IN SOURCE
+msgid "Stalled"
+msgstr "Pendente"
+
+#: NOT FOUND IN SOURCE
+msgid "Start page"
+msgstr "Página inicial"
+
+#: html/Elements/SelectDateType:27 html/Ticket/Elements/EditDates:32 html/Ticket/Elements/ShowDates:35
+msgid "Started"
+msgstr "Iniciado"
+
+#: NOT FOUND IN SOURCE
+msgid "Started date '%1' could not be parsed"
+msgstr "A data de iníciado '%1' não pôde ser compreendida"
+
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:27 html/Ticket/Elements/ShowDates:31
+msgid "Starts"
+msgstr "Inicia"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts By"
+msgstr "Inicia Por"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts date '%1' could not be parsed"
+msgstr "A data de início '%1' não pôde ser compreendida"
+
+#: html/Admin/Elements/ModifyUser:82 html/Admin/Users/Modify.html:138 html/User/Prefs.html:94
+msgid "State"
+msgstr "Estado"
+
+#: html/Elements/MyRequests:31 html/Elements/MyTickets:31 html/Search/Elements/PickRestriction:74 html/SelfService/Display.html:59 html/SelfService/Elements/MyRequests:29 html/SelfService/Update.html:31 html/Ticket/Create.html:42 html/Ticket/Elements/EditBasics:38 html/Ticket/Elements/ShowBasics:31 html/Ticket/Update.html:60 lib/RT/Ticket_Overlay.pm:1164 lib/RT/Tickets_Overlay.pm:908
+msgid "Status"
+msgstr "Estado"
+
+#: etc/initialdata:288
+msgid "Status Change"
+msgstr "Mudança de Estado"
+
+#: lib/RT/Transaction_Overlay.pm:530
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
+msgid "Status changed from %1 to %2"
+msgstr "Estado alterado de %1 para %2"
+
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr "StatusChange"
+
+#: html/Ticket/Elements/Tabs:147
+msgid "Steal"
+msgstr "Roubar"
+
+#: lib/RT/Transaction_Overlay.pm:589
+#. ($Old->Name)
+msgid "Stolen from %1 "
+msgstr "Roubado de %1 "
+
+#: html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Search/Bulk.html:126 html/Search/Elements/PickRestriction:43 html/SelfService/Create.html:59 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:35 html/Ticket/Create.html:84 html/Ticket/Elements/EditBasics:28 html/Ticket/ModifyAll.html:79 html/Ticket/Update.html:77 lib/RT/Ticket_Overlay.pm:1160 lib/RT/Tickets_Overlay.pm:987
+msgid "Subject"
+msgstr "Assunto"
+
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/Transaction_Overlay.pm:611
+#. ($self->Data)
+msgid "Subject changed to %1"
+msgstr "Assunto modou para %1"
+
+#: html/Elements/Submit:59
+msgid "Submit"
+msgstr "Enviar"
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr "Enviar Workflow"
+
+#: lib/RT/Group_Overlay.pm:749
+msgid "Succeeded"
+msgstr "Deu certo"
+
+#: lib/RT/Date.pm:394
+msgid "Sun."
+msgstr "Dom."
+
+#: lib/RT/System.pm:54
+msgid "SuperUser"
+msgstr "SuperUser"
+
+#: html/User/Elements/DelegateRights:77
+msgid "System"
+msgstr "Sistema"
+
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:567 lib/RT/Interface/Web.pm:757 lib/RT/Interface/Web.pm:790
+msgid "System Error"
+msgstr "Erro do Sistema"
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. Right not granted."
+msgstr "Erro de sistema.  Direito não outorgado."
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. right not granted"
+msgstr "Erro de sistema.  direito não outorgado"
+
+#: lib/RT/ACE_Overlay.pm:616
+msgid "System error. Right not delegated."
+msgstr "Erro do sistema. Direito de acesso não delegado."
+
+#: lib/RT/ACE_Overlay.pm:146 lib/RT/ACE_Overlay.pm:223 lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:898
+msgid "System error. Right not granted."
+msgstr "Erro do sistema. Direito de acesso não outorgado."
+
+#: NOT FOUND IN SOURCE
+msgid "System error. Unable to grant rights."
+msgstr "Erro de sistema.  Não posso outorgar direitos de acesso."
+
+#: html/Admin/Global/GroupRights.html:35 html/Admin/Groups/GroupRights.html:37 html/Admin/Queues/GroupRights.html:36
+msgid "System groups"
+msgstr "Grupos do sistema"
+
+#: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
+msgid "SystemRolegroup for internal use"
+msgstr "SystemRolegroup para uso interno"
+
+#: lib/RT/CurrentUser.pm:320
+msgid "TEST_STRING"
+msgstr "TEST_STRING"
+
+#: html/Ticket/Elements/Tabs:143
+msgid "Take"
+msgstr "Tomar"
+
+#: lib/RT/Transaction_Overlay.pm:575
+msgid "Taken"
+msgstr "Tomado"
+
+#: html/Admin/Elements/EditScrip:81
+msgid "Template"
+msgstr "Modelo"
+
+#: html/Admin/Global/Template.html:91 html/Admin/Queues/Template.html:90
+#. ($TemplateObj->Id())
+msgid "Template #%1"
+msgstr "Esquema #%1"
+
+#: html/Admin/Elements/EditTemplates:89
+msgid "Template deleted"
+msgstr "Esquema removido"
+
+#: lib/RT/Scrip_Overlay.pm:153
+msgid "Template not found"
+msgstr "Modelo não encontrado"
+
+#: NOT FOUND IN SOURCE
+msgid "Template not found\\n"
+msgstr "Modelo não encontrado\\n"
+
+#: lib/RT/Template_Overlay.pm:347
+msgid "Template parsed"
+msgstr "Modelo processado"
+
+#: html/Admin/Elements/QueueTabs:49 html/Admin/Elements/SystemTabs:36 html/Admin/Global/index.html:45
+msgid "Templates"
+msgstr "Modelos"
+
+#: NOT FOUND IN SOURCE
+msgid "Templates for %1\\n"
+msgstr "Modelos de %1\\n"
+
+#: lib/RT/Interface/Web.pm:858
+msgid "That is already the current value"
+msgstr "Este já é o valor atual"
+
+#: lib/RT/CustomField_Overlay.pm:178
+msgid "That is not a value for this custom field"
+msgstr "Este não é um valor para este campo personalizado"
+
+#: lib/RT/Ticket_Overlay.pm:1886
+msgid "That is the same value"
+msgstr "Este é o mesmo valor"
+
+#: lib/RT/Queue_Overlay.pm:633
+#. ($args{'Type'})
+msgid "That principal is already a %1 for this queue"
+msgstr "Este principal já é um %1 para esta fila"
+
+#: lib/RT/Ticket_Overlay.pm:1434
+#. ($self->loc($args{'Type'}))
+msgid "That principal is already a %1 for this ticket"
+msgstr "Este principal já é um %1 para este tíquete"
+
+#: lib/RT/Queue_Overlay.pm:732
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this queue"
+msgstr "Este principal não é um %1 para esta fila"
+
+#: lib/RT/Ticket_Overlay.pm:1551
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this ticket"
+msgstr "Este principal não é um %1 para este tíquete"
+
+#: lib/RT/Ticket_Overlay.pm:1882
+msgid "That queue does not exist"
+msgstr "Esta fila não existe"
+
+#: lib/RT/Ticket_Overlay.pm:3143
+msgid "That ticket has unresolved dependencies"
+msgstr "Este tíquete tem dependências não resolvidas"
+
+#: lib/RT/ACE_Overlay.pm:288 lib/RT/ACE_Overlay.pm:597
+msgid "That user already has that right"
+msgstr "Este usuário já tem este direito de acesso"
+
+#: lib/RT/Ticket_Overlay.pm:2952
+msgid "That user already owns that ticket"
+msgstr "Este usuário já possui este tíquete"
+
+#: lib/RT/Ticket_Overlay.pm:2918
+msgid "That user does not exist"
+msgstr "Este usuário não existe"
+
+#: lib/RT/User_Overlay.pm:315
+msgid "That user is already privileged"
+msgstr "Este usuário já tem privilégios"
+
+#: lib/RT/User_Overlay.pm:332
+msgid "That user is already unprivileged"
+msgstr "Este usuário já não tem privilégios"
+
+#: lib/RT/User_Overlay.pm:327
+msgid "That user is now privileged"
+msgstr "Este usuário agora tem privilégios"
+
+#: lib/RT/User_Overlay.pm:344
+msgid "That user is now unprivileged"
+msgstr "Este usuário agora não tem privilégios"
+
+#: NOT FOUND IN SOURCE
+msgid "That user is now unprivilegedileged"
+msgstr "Este usuário agora é não privilegiado"
+
+#: lib/RT/Ticket_Overlay.pm:2944
+msgid "That user may not own tickets in that queue"
+msgstr "Este usuário não pode possuir tíquetes nesta fila"
+
+#: lib/RT/Link_Overlay.pm:206
+msgid "That's not a numerical id"
+msgstr "Este não é um identificador numérico"
+
+#: html/Ticket/Create.html:150 html/Ticket/Elements/ShowSummary:28
+msgid "The Basics"
+msgstr "Sumário"
+
+#: lib/RT/ACE_Overlay.pm:88
+msgid "The CC of a ticket"
+msgstr "O CC de um tíquete"
+
+#: lib/RT/ACE_Overlay.pm:89
+msgid "The administrative CC of a ticket"
+msgstr "O CC administrativo de um tíquete"
+
+#: lib/RT/Ticket_Overlay.pm:2213
+msgid "The comment has been recorded"
+msgstr "O comentário foi registrado"
+
+#: bin/rt-crontool:198
+msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
+msgstr "O seguinte comando procurará por todos os tíquetes ativos na fila 'geral' e alterar sua prioridade para 99 se eles não tiverem sido alterados em 4 horas:"
+
+#: bin/rt-commit-handler:756 bin/rt-commit-handler:766
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr "Os seguintes comandos não foram processados:\\n\\n"
+
+#: lib/RT/Interface/Web.pm:861
+msgid "The new value has been set."
+msgstr "O novo valor foi atribuído."
+
+#: lib/RT/ACE_Overlay.pm:86
+msgid "The owner of a ticket"
+msgstr "O proprietário de um tíquete"
+
+#: lib/RT/ACE_Overlay.pm:87
+msgid "The requestor of a ticket"
+msgstr "O requisitante de um tíquete"
+
+#: html/Admin/Elements/EditUserComments:26
+msgid "These comments aren't generally visible to the user"
+msgstr "Estes comandos geralmente não estão visíveis para o usuário"
+
+#: NOT FOUND IN SOURCE
+msgid "This ticket %1 %2 (%3)\\n"
+msgstr "Este tíquete %1 %2 (%3)\\n"
+
+#: bin/rt-crontool:189
+msgid "This tool allows the user to run arbitrary perl modules from within RT."
+msgstr "Esta ferramenta permite o usuário invocar módulos Perl arbitrários de dentro do RT."
+
+#: lib/RT/Transaction_Overlay.pm:253
+msgid "This transaction appears to have no content"
+msgstr "Parece que esta transação não tem conteúdo"
+
+#: html/Ticket/Elements/ShowRequestor:47
+#. ($rows)
+msgid "This user's %1 highest priority tickets"
+msgstr "Os %1 tíquetes mais prioritários deste usuário"
+
+#: NOT FOUND IN SOURCE
+msgid "This user's 25 highest priority tickets"
+msgstr "Os 25 tíquetes de mais alta prioridade deste usuário"
+
+#: lib/RT/Date.pm:391
+msgid "Thu."
+msgstr "Qui."
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket"
+msgstr "Tíquete"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1  %2"
+msgstr "Tíquete # %1  %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1 Jumbo update: %2"
+msgstr "Tíquete # %1 atualização jumbo: %2"
+
+#: html/Ticket/ModifyAll.html:25 html/Ticket/ModifyAll.html:29
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket #%1 Jumbo update: %2"
+msgstr "Tíquete #%1 Atualização jumbo: %2"
+
+#: html/Approvals/Elements/ShowDependency:46
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Ticket #%1: %2"
+msgstr "Tíquete #%1: %2"
+
+#: lib/RT/Ticket_Overlay.pm:608
+#. ($self->Id, $QueueObj->Name)
+msgid "Ticket %1 created in queue '%2'"
+msgstr "Tíquete %1 criado na fila '%2'"
+
+#: bin/rt-commit-handler:760
+#. ($Ticket->Id)
+msgid "Ticket %1 loaded\\n"
+msgstr "Tíquete %1 carregado\\n"
+
+#: html/Search/Bulk.html:181
+#. ($Ticket->Id,$_)
+msgid "Ticket %1: %2"
+msgstr "Tíquete %1: %2"
+
+#: html/Ticket/History.html:25 html/Ticket/History.html:28
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket History # %1 %2"
+msgstr "Histórico do Tíquete # %1 %2"
+
+#: html/SelfService/Display.html:34
+msgid "Ticket Id"
+msgstr "Identificador do tíquete"
+
+#: etc/initialdata:303
+msgid "Ticket Resolved"
+msgstr "Tíquete Resolvido"
+
+#: html/Search/Elements/PickRestriction:63
+msgid "Ticket attachment"
+msgstr "Arquivo anexo do tíquete"
+
+#: lib/RT/Tickets_Overlay.pm:1166
+msgid "Ticket content"
+msgstr "Conteúdo do tíquete"
+
+#: lib/RT/Tickets_Overlay.pm:1212
+msgid "Ticket content type"
+msgstr "Tipo do conteúdo do tíquete"
+
+#: lib/RT/Ticket_Overlay.pm:495 lib/RT/Ticket_Overlay.pm:597
+msgid "Ticket could not be created due to an internal error"
+msgstr "O tíquete não pôde ser criado devido a um erro interno"
+
+#: lib/RT/Transaction_Overlay.pm:522
+msgid "Ticket created"
+msgstr "Tíquete criado"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket creation failed"
+msgstr "A criação do tíquete falhou"
+
+#: lib/RT/Transaction_Overlay.pm:527
+msgid "Ticket deleted"
+msgstr "Tíquete removido"
+
+#: html/REST/1.0/modify:29 html/REST/1.0/update:34
+msgid "Ticket id not found"
+msgstr "Id de tíquete não encontrado"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket killed"
+msgstr "Tíquete destruído"
+
+#: html/REST/1.0/modify:36 html/REST/1.0/update:41
+msgid "Ticket not found"
+msgstr "Tíquete não encontrado"
+
+#: etc/initialdata:289
+msgid "Ticket status changed"
+msgstr "O estado do tíquete mudou"
+
+#: html/Ticket/Update.html:39
+msgid "Ticket watchers"
+msgstr "Observadores do tíquete"
+
+#: html/Elements/Tabs:49
+msgid "Tickets"
+msgstr "Tíquetes"
+
+#: lib/RT/Tickets_Overlay.pm:1383
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr "Tíquetes %1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:1348
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr "Tíquetes %1 por %2"
+
+#: html/Elements/ViewUser:26
+#. ($name)
+msgid "Tickets from %1"
+msgstr "Tíquetes de %1"
+
+#: html/Approvals/Elements/ShowDependency:27
+msgid "Tickets which depend on this approval:"
+msgstr "Tíquetes dependentes desta aprovação:"
+
+#: html/Ticket/Create.html:157 html/Ticket/Elements/EditBasics:48
+msgid "Time Left"
+msgstr "Tempo Restante"
+
+#: html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:43
+msgid "Time Worked"
+msgstr "Tempo Trabalhado"
+
+#: lib/RT/Tickets_Overlay.pm:1139
+msgid "Time left"
+msgstr "Tempo restante"
+
+#: html/Elements/Footer:36
+msgid "Time to display"
+msgstr "Tempo de apresentação"
+
+#: lib/RT/Tickets_Overlay.pm:1115
+msgid "Time worked"
+msgstr "Tempo trabalhado"
+
+#: NOT FOUND IN SOURCE
+msgid "TimeLeft"
+msgstr "TimeLeft"
+
+#: lib/RT/Ticket_Overlay.pm:1165
+msgid "TimeWorked"
+msgstr "TimeWorked"
+
+#: bin/rt-commit-handler:402
+msgid "To generate a diff of this commit:"
+msgstr "Para gerar as diferenças desta transação"
+
+#: bin/rt-commit-handler:391
+msgid "To generate a diff of this commit:\\n"
+msgstr "Para gerar as diferenças desta transação:\\n"
+
+#: lib/RT/Ticket_Overlay.pm:1168
+msgid "Told"
+msgstr "Última atualização"
+
+#: etc/initialdata:237
+msgid "Transaction"
+msgstr "Transação"
+
+#: lib/RT/Transaction_Overlay.pm:642
+#. ($self->Data)
+msgid "Transaction %1 purged"
+msgstr "Transação %1 removida"
+
+#: lib/RT/Transaction_Overlay.pm:177
+msgid "Transaction Created"
+msgstr "Transação Criada"
+
+#: lib/RT/Transaction_Overlay.pm:89
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr "Transaction->Create não pôde, já que você não especificou um id de tíquete"
+
+#: lib/RT/Transaction_Overlay.pm:701
+msgid "Transactions are immutable"
+msgstr "Transações são imutáveis"
+
+#: NOT FOUND IN SOURCE
+msgid "Trying to delete a right: %1"
+msgstr "Tentando remover um direito de acesso: %1"
+
+#: lib/RT/Date.pm:389
+msgid "Tue."
+msgstr "Ter."
+
+#: html/Admin/Elements/EditCustomField:34 html/Ticket/Elements/AddWatchers:33 html/Ticket/Elements/AddWatchers:44 html/Ticket/Elements/AddWatchers:54 lib/RT/Ticket_Overlay.pm:1166 lib/RT/Tickets_Overlay.pm:959
+msgid "Type"
+msgstr "Tipo"
+
+#: lib/RT/ScripCondition_Overlay.pm:104
+msgid "Unimplemented"
+msgstr "Não implementado"
+
+#: html/Admin/Users/Modify.html:68
+msgid "Unix login"
+msgstr "Usuário Unix"
+
+#: html/Admin/Elements/ModifyUser:62
+msgid "UnixUsername"
+msgstr "Usuário Unix"
+
+#: lib/RT/Attachment_Overlay.pm:265
+#. ($self->ContentEncoding)
+msgid "Unknown ContentEncoding %1"
+msgstr "Codificação de conteúdo desconhecida %1"
+
+#: html/Elements/SelectResultsPerPage:37
+msgid "Unlimited"
+msgstr "Ilimitado"
+
+#: etc/initialdata:32
+msgid "Unprivileged"
+msgstr "Não privilegiado"
+
+#: lib/RT/Transaction_Overlay.pm:571
+msgid "Untaken"
+msgstr "Não tomado"
+
+#: html/Elements/MyTickets:64 html/Search/Bulk.html:33
+msgid "Update"
+msgstr "Atualizar"
+
+#: html/Admin/Users/Prefs.html:62
+msgid "Update ID"
+msgstr "Identificador de atualização"
+
+#: html/Search/Bulk.html:120 html/Ticket/ModifyAll.html:66 html/Ticket/Update.html:67
+msgid "Update Type"
+msgstr "Tipo de atualização"
+
+#: html/Search/Listing.html:61
+msgid "Update all these tickets at once"
+msgstr "Atualizar todos estes tíquetes de uma vez"
+
+#: html/Admin/Users/Prefs.html:49
+msgid "Update email"
+msgstr "Atualizar email"
+
+#: html/Admin/Users/Prefs.html:55
+msgid "Update name"
+msgstr "Atualizar nome"
+
+#: lib/RT/Interface/Web.pm:375
+msgid "Update not recorded."
+msgstr "Atualização não registrada."
+
+#: html/Search/Bulk.html:81
+msgid "Update selected tickets"
+msgstr "Atualizar os tíquetes selecionados"
+
+#: html/Admin/Users/Prefs.html:36
+msgid "Update signature"
+msgstr "Atualizar assinatura"
+
+#: html/Ticket/ModifyAll.html:63
+msgid "Update ticket"
+msgstr "Atualizar o tíquete"
+
+#: html/SelfService/Update.html:25 html/SelfService/Update.html:27
+#. ($Ticket->id)
+msgid "Update ticket # %1"
+msgstr "Atualizar o tíquete # %1"
+
+#: html/SelfService/Update.html:50
+#. ($Ticket->id)
+msgid "Update ticket #%1"
+msgstr "Atualizar o tíquete #%1"
+
+#: html/Ticket/Update.html:135
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Update ticket #%1 (%2)"
+msgstr "Atualizar tíquete #%1 (%2)"
+
+#: lib/RT/Interface/Web.pm:373
+msgid "Update type was neither correspondence nor comment."
+msgstr "O tipo da atualização não foi nem correspondência e nem comentário."
+
+#: html/Elements/SelectDateType:33 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1169
+msgid "Updated"
+msgstr "Atualizado"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 %2: %3\\n"
+msgstr "Usuário %1 %2: %3\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 Password: %2\\n"
+msgstr "Usuário %1 Senha: %2\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found"
+msgstr "Usuário '%1' não encontrado"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found\\n"
+msgstr "Usuário '%1' não encontrado\\n"
+
+#: etc/initialdata:125 etc/initialdata:191
+msgid "User Defined"
+msgstr "Definido pelo Usuário"
+
+#: html/Admin/Users/Prefs.html:59
+msgid "User ID"
+msgstr "Identificador de usuário"
+
+#: html/Elements/SelectUsers:26
+msgid "User Id"
+msgstr "Identificador do usuário"
+
+#: html/Admin/Elements/GroupTabs:47 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/SystemTabs:47 html/Admin/Global/index.html:59
+msgid "User Rights"
+msgstr "Direitos de Acesso de Usuário"
+
+#: html/Admin/Users/Modify.html:226
+#. ($msg)
+msgid "User could not be created: %1"
+msgstr "O usuário não pôde ser criado: %1"
+
+#: lib/RT/User_Overlay.pm:262
+msgid "User created"
+msgstr "Usuário criado"
+
+#: html/Admin/Global/GroupRights.html:67 html/Admin/Groups/GroupRights.html:54 html/Admin/Queues/GroupRights.html:68
+msgid "User defined groups"
+msgstr "Grupos definidos pelo usuário"
+
+#: NOT FOUND IN SOURCE
+msgid "User notified"
+msgstr "Usuário notificado"
+
+#: html/Admin/Users/Prefs.html:25 html/Admin/Users/Prefs.html:29
+msgid "User view"
+msgstr "Visualização de usuário"
+
+#: html/Admin/Users/Modify.html:48 html/Elements/Login:42 html/Ticket/Elements/AddWatchers:35
+msgid "Username"
+msgstr "Nome de usuário"
+
+#: html/Admin/Elements/SelectNewGroupMembers:26 html/Admin/Elements/Tabs:32 html/Admin/Groups/Members.html:55 html/Admin/Queues/People.html:68 html/Admin/index.html:29 html/User/Groups/Members.html:58
+msgid "Users"
+msgstr "Usuários"
+
+#: html/Admin/Users/index.html:65
+msgid "Users matching search criteria"
+msgstr "Usuários que satisfazem o critério de busca"
+
+#: html/Search/Elements/PickRestriction:51
+msgid "ValueOfQueue"
+msgstr "Valor da fila"
+
+#: html/Admin/Elements/EditCustomField:40
+msgid "Values"
+msgstr "Valores"
+
+#: NOT FOUND IN SOURCE
+msgid "VrijevormEnkele"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Watch"
+msgstr "Observar"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "WatchAsAdminCc"
+msgstr "WatchAsAdminCc"
+
+#: NOT FOUND IN SOURCE
+msgid "Watcher loaded"
+msgstr "Observador carregado"
+
+#: html/Admin/Elements/QueueTabs:42
+msgid "Watchers"
+msgstr "Observadores"
+
+#: html/Admin/Elements/ModifyUser:56
+msgid "WebEncoding"
+msgstr "Codificação de Web"
+
+#: lib/RT/Date.pm:390
+msgid "Wed."
+msgstr "Qua."
+
+#: etc/upgrade/2.1.71:161
+msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
+msgstr "Quando um tíquete for aprovado por todos os aprovadores, adicione uma correspondência ao tíquete original"
+
+#: etc/upgrade/2.1.71:135
+msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
+msgstr "Quando um tíquete for aprovado por qualquer aprovador, adicione uma correspondência ao tíquete original"
+
+#: etc/initialdata:138
+msgid "When a ticket is created"
+msgstr "Quando um tíquete é criado"
+
+#: etc/upgrade/2.1.71:79
+msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
+msgstr "Quando um tíquete de aprovação é criado, notificar o Proprietário e o AdminCc do item aguardando sua aprovação"
+
+#: etc/initialdata:143
+msgid "When anything happens"
+msgstr "Quando acontecer qualquer coisa"
+
+#: etc/initialdata:184
+msgid "Whenever a ticket is resolved"
+msgstr "Sempre que um tíquete for resolvido"
+
+#: etc/initialdata:170
+msgid "Whenever a ticket's owner changes"
+msgstr "Sempre que mudar o proprietário de um tíquete"
+
+#: etc/initialdata:178
+msgid "Whenever a ticket's queue changes"
+msgstr "Sempre que um tíquete mudar de fila"
+
+#: etc/initialdata:162
+msgid "Whenever a ticket's status changes"
+msgstr "Sempre que o estado de um tíquete mudar"
+
+#: etc/initialdata:192
+msgid "Whenever a user-defined condition occurs"
+msgstr "Sempre que ocorrer uma condição definida por usuário"
+
+#: etc/initialdata:156
+msgid "Whenever comments come in"
+msgstr "Sempre que um novo comentário é adicionado"
+
+#: etc/initialdata:149
+msgid "Whenever correspondence comes in"
+msgstr "Sempre que uma nova correspondência é adicionada"
+
+#: html/Admin/Users/Modify.html:164 html/User/Prefs.html:52
+msgid "Work"
+msgstr "Trabalho"
+
+#: html/Admin/Elements/ModifyUser:70
+msgid "WorkPhone"
+msgstr "Telefone de trabalho"
+
+#: html/SelfService/Display.html:86 html/Ticket/Elements/ShowBasics:35 html/Ticket/Update.html:65
+msgid "Worked"
+msgstr "Trabalhado"
+
+#: lib/RT/Ticket_Overlay.pm:3056
+msgid "You already own this ticket"
+msgstr "Você já é proprietário deste tíquete"
+
+#: html/autohandler:121
+msgid "You are not an authorized user"
+msgstr "Você não é um usuário autorizado"
+
+#: lib/RT/Ticket_Overlay.pm:2930
+msgid "You can only reassign tickets that you own or that are unowned"
+msgstr "Você só pode reatribuir seus próprios tíquetes ou aqueles que não têm dono"
+
+#: NOT FOUND IN SOURCE
+msgid "You don't have permission to view that ticket.\\n"
+msgstr "Você não tem permissão para ver este tíquete.\\n"
+
+#: docs/design_docs/string-extraction-guide.txt:47
+#. ($num, $queue)
+msgid "You found %1 tickets in queue %2"
+msgstr "Você encontrou %1 tíquetes na fila %2"
+
+#: html/NoAuth/Logout.html:31 html/REST/1.0/logout:25
+msgid "You have been logged out of RT."
+msgstr "Você foi desconectado do RT."
+
+#: html/SelfService/Display.html:134
+msgid "You have no permission to create tickets in that queue."
+msgstr "Você não tem permissão para criar tíquetes nesta fila."
+
+#: lib/RT/Ticket_Overlay.pm:1895
+msgid "You may not create requests in that queue."
+msgstr "Você não pode criar requisições nesta fila."
+
+#: html/NoAuth/Logout.html:36
+msgid "You're welcome to login again"
+msgstr "Volte sempre"
+
+#: html/SelfService/Elements/MyRequests:25
+#. ($friendly_status)
+msgid "Your %1 requests"
+msgstr "Suas %1 requisições"
+
+#: NOT FOUND IN SOURCE
+msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
+msgstr "Seu administrador do RT configurou erradamente os endereços eletrônicos que invocam o RT"
+
+#: etc/initialdata:429 etc/upgrade/2.1.71:146
+msgid "Your request has been approved by %1. Other approvals may still be pending."
+msgstr "Sua requisição foi aprovada por %1.  Outras aprovações ainda podem estar pendentes."
+
+#: etc/initialdata:463 etc/upgrade/2.1.71:180
+msgid "Your request has been approved."
+msgstr "Sua requisição foi aprovada."
+
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr "Sua requisição foi rejeitada"
+
+#: etc/initialdata:384 etc/upgrade/2.1.71:101
+msgid "Your request was rejected."
+msgstr "Sua requisição foi rejeitada."
+
+#: html/autohandler:136 html/autohandler:142
+msgid "Your username or password is incorrect"
+msgstr "Nome de usuário ou senha incorretos"
+
+#: html/Admin/Elements/ModifyUser:84 html/Admin/Users/Modify.html:144 html/User/Prefs.html:96
+msgid "Zip"
+msgstr "CEP"
+
+#: NOT FOUND IN SOURCE
+msgid "[no subject]"
+msgstr "[sem assunto]"
+
+#: html/User/Elements/DelegateRights:59
+#. ($right->PrincipalObj->Object->SelfDescription)
+msgid "as granted to %1"
+msgstr "como outorgado a %1"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:34
+msgid "contains"
+msgstr "contém"
+
+#: html/Elements/SelectAttachmentField:26
+msgid "content"
+msgstr "content"
+
+#: html/Elements/SelectAttachmentField:27
+msgid "content-type"
+msgstr "content-type"
+
+#: lib/RT/Ticket_Overlay.pm:2282
+msgid "correspondence (probably) not sent"
+msgstr "correspondência (provavelmente) não enviada"
+
+#: lib/RT/Ticket_Overlay.pm:2292
+msgid "correspondence sent"
+msgstr "correspondência enviada"
+
+#: html/Admin/Elements/ModifyQueue:63 html/Admin/Queues/Modify.html:77 lib/RT/Date.pm:319
+msgid "days"
+msgstr "dias"
+
+#: NOT FOUND IN SOURCE
+msgid "dead"
+msgstr "morto"
+
+#: html/Search/Listing.html:75
+msgid "delete"
+msgstr "remover"
+
+#: lib/RT/Queue_Overlay.pm:63
+msgid "deleted"
+msgstr "removido"
+
+#: html/Search/Elements/PickRestriction:68
+msgid "does not match"
+msgstr "não satisfaz"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:35
+msgid "doesn't contain"
+msgstr "não contém"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "equal to"
+msgstr "igual a"
+
+#: NOT FOUND IN SOURCE
+msgid "false"
+msgstr "falso"
+
+#: html/Elements/SelectAttachmentField:28
+msgid "filename"
+msgstr "filename"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "greater than"
+msgstr "maior que"
+
+#: lib/RT/Group_Overlay.pm:194
+#. ($self->Name)
+msgid "group '%1'"
+msgstr "grupo '%1'"
+
+#: lib/RT/Date.pm:315
+msgid "hours"
+msgstr "horas"
+
+#: NOT FOUND IN SOURCE
+msgid "id"
+msgstr "identificador"
+
+#: html/Elements/SelectBoolean:32 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88
+msgid "is"
+msgstr "é"
+
+#: html/Elements/SelectBoolean:36 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:37 html/Search/Elements/PickRestriction:48 html/Search/Elements/PickRestriction:77 html/Search/Elements/PickRestriction:89
+msgid "isn't"
+msgstr "não é"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "less than"
+msgstr "menor que"
+
+#: html/Search/Elements/PickRestriction:67
+msgid "matches"
+msgstr "satisfaz"
+
+#: lib/RT/Date.pm:311
+msgid "min"
+msgstr "min"
+
+#: html/Ticket/Update.html:66
+msgid "minutes"
+msgstr "minutos"
+
+#: bin/rt-commit-handler:765
+msgid "modifications\\n\\n"
+msgstr "modificações\\n\\n"
+
+#: lib/RT/Date.pm:327
+msgid "months"
+msgstr "meses"
+
+#: lib/RT/Queue_Overlay.pm:58
+msgid "new"
+msgstr "novo"
+
+#: html/Admin/Elements/EditScrips:43
+msgid "no value"
+msgstr "sem valor"
+
+#: html/Ticket/Elements/EditWatchers:28
+msgid "none"
+msgstr "nenhum"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "not equal to"
+msgstr "diferente de"
+
+#: NOT FOUND IN SOURCE
+msgid "notlike"
+msgstr "diferente"
+
+#: lib/RT/Queue_Overlay.pm:59
+msgid "open"
+msgstr "aberto"
+
+#: lib/RT/Group_Overlay.pm:199
+#. ($self->Name, $user->Name)
+msgid "personal group '%1' for user '%2'"
+msgstr "grupo pessoal '%1' para o usuário '%2'"
+
+#: lib/RT/Group_Overlay.pm:207
+#. ($queue->Name, $self->Type)
+msgid "queue %1 %2"
+msgstr "fila %1 %2"
+
+#: lib/RT/Queue_Overlay.pm:62
+msgid "rejected"
+msgstr "rejeitado"
+
+#: lib/RT/Queue_Overlay.pm:61
+msgid "resolved"
+msgstr "resolvido"
+
+#: lib/RT/Date.pm:307
+msgid "sec"
+msgstr "seg"
+
+#: lib/RT/Queue_Overlay.pm:60
+msgid "stalled"
+msgstr "pendente"
+
+#: lib/RT/Group_Overlay.pm:202
+#. ($self->Type)
+msgid "system %1"
+msgstr "sistema %1"
+
+#: lib/RT/Group_Overlay.pm:213
+#. ($self->Type)
+msgid "system group '%1'"
+msgstr "grupo do sistema '%1'"
+
+#: html/Elements/Error:42 html/SelfService/Error.html:42
+msgid "the calling component did not specify why"
+msgstr "o componente chamador não especificou por que"
+
+#: lib/RT/Group_Overlay.pm:210
+#. ($self->Instance, $self->Type)
+msgid "ticket #%1 %2"
+msgstr "tíquete #%1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "true"
+msgstr "verdadeiro"
+
+#: lib/RT/Group_Overlay.pm:216
+#. ($self->Id)
+msgid "undescribed group %1"
+msgstr "grupo %1 não descrito"
+
+#: NOT FOUND IN SOURCE
+msgid "undescripbed group %1"
+msgstr "grupo sem descrição %1"
+
+#: lib/RT/Group_Overlay.pm:191
+#. ($user->Object->Name)
+msgid "user %1"
+msgstr "usuário %1"
+
+#: lib/RT/Date.pm:323
+msgid "weeks"
+msgstr "semanas"
+
+#: NOT FOUND IN SOURCE
+msgid "with template %1"
+msgstr "com modelo %1"
+
+#: lib/RT/Date.pm:331
+msgid "years"
+msgstr "anos"
+
+#: NOT FOUND IN SOURCE
+msgid "ニック�ーム"
+msgstr ""
+
diff --git a/rt/lib/RT/I18N/ru.po b/rt/lib/RT/I18N/ru.po
new file mode 100644
index 000000000..eb1434606
--- /dev/null
+++ b/rt/lib/RT/I18N/ru.po
@@ -0,0 +1,4826 @@
+msgid ""
+msgstr ""
+"Last-Translator: Kirill Pushkin <kirill@mns.ru>\n"
+"PO-Revision-Date: 2002-10-04 19:28+0400\n"
+"Language-Team: Russian <ru@li.org>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 0.9.6\n"
+
+#: html/Elements/MyRequests:28 html/Elements/MyTickets:28
+msgid "#"
+msgstr "&#8470;"
+
+#: html/Admin/Queues/Scrip.html:55
+#. ($QueueObj->id)
+msgid "#%1"
+msgstr ""
+
+#: html/Approvals/Elements/ShowDependency:50 html/Ticket/Display.html:26 html/Ticket/Display.html:30
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "#%1: %2"
+msgstr ""
+
+#: lib/RT/Date.pm:337
+#. ($s, $time_unit)
+msgid "%1 %2"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:771
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr ""
+
+#: lib/RT/Date.pm:373
+#. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
+msgid "%1 %2 %3 %4:%5:%6 %7"
+msgstr "%1 %2 %3 %4:%5:%6 %7"
+
+#: lib/RT/Ticket_Overlay.pm:3438 lib/RT/Transaction_Overlay.pm:559 lib/RT/Transaction_Overlay.pm:601
+#. ($cf->Name, $new_value->Content)
+#. ($field, $self->NewValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 added"
+msgstr ""
+
+#: lib/RT/Date.pm:334
+#. ($s, $time_unit)
+msgid "%1 %2 ago"
+msgstr "%1 %2 назад"
+
+#: lib/RT/Ticket_Overlay.pm:3444 lib/RT/Transaction_Overlay.pm:566
+#. ($cf->Name, $old_value, $new_value->Content)
+#. ($field, $self->OldValue, $self->NewValue)
+msgid "%1 %2 changed to %3"
+msgstr "%1 %2 изменено на %3"
+
+#: lib/RT/Ticket_Overlay.pm:3441 lib/RT/Transaction_Overlay.pm:562 lib/RT/Transaction_Overlay.pm:607
+#. ($cf->Name, $old_value)
+#. ($field, $self->OldValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 of group %3"
+msgstr ""
+
+#: html/Admin/Elements/EditScrips:44 html/Admin/Elements/ListGlobalScrips:28
+#. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
+msgid "%1 %2 with template %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 this ticket\\n"
+msgstr "%1 (%2) %3 �тот тикет\\n"
+
+#: html/Search/Listing.html:57
+#. (($session{'tickets'}->FirstRow+1), ($session{'tickets'}->FirstRow() + $session{'tickets'}->RowsPerPage()  ))
+msgid "%1 - %2 shown"
+msgstr ""
+
+#: bin/rt-crontool:169 bin/rt-crontool:176 bin/rt-crontool:182
+#. ("--search-argument", "--search")
+#. ("--condition-argument", "--condition")
+#. ("--action-argument", "--action")
+msgid "%1 - An argument to pass to %2"
+msgstr ""
+
+#: bin/rt-crontool:185
+#. ("--verbose")
+msgid "%1 - Output status updates to STDOUT"
+msgstr ""
+
+#: bin/rt-crontool:179
+#. ("--action")
+msgid "%1 - Specify the action module you want to use"
+msgstr ""
+
+#: bin/rt-crontool:173
+#. ("--condition")
+msgid "%1 - Specify the condition module you want to use"
+msgstr ""
+
+#: bin/rt-crontool:166
+#. ("--search")
+msgid "%1 - Specify the search module you want to use"
+msgstr ""
+
+#: lib/RT/ScripAction_Overlay.pm:122
+#. ($self->Id)
+msgid "%1 ScripAction loaded"
+msgstr "%1 �крипт загружен"
+
+#: lib/RT/Ticket_Overlay.pm:3471
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 added as a value for %2"
+msgstr "%1 добавлено как значение дл� %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on"
+msgstr "%1 алиа�ы требуют идентификатор тикета дл� продолжени� работы"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on "
+msgstr "%1 алиа�ы требуют идентификатор тикета дл� продолжени� работы "
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on (from %2) %3"
+msgstr "%1 алиа�ы требуют идентификатор тикета дл� продолжени� работы над (от %2) %3"
+
+#: lib/RT/Link_Overlay.pm:117 lib/RT/Link_Overlay.pm:124
+#. ($args{'Base'})
+#. ($args{'Target'})
+msgid "%1 appears to be a local object, but can't be found in the database"
+msgstr ""
+
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:483
+#. ($self->BriefDescription , $self->CreatorObj->Name)
+#. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
+msgid "%1 by %2"
+msgstr "%1 пользователем %2"
+
+#: lib/RT/Transaction_Overlay.pm:537 lib/RT/Transaction_Overlay.pm:626 lib/RT/Transaction_Overlay.pm:635 lib/RT/Transaction_Overlay.pm:638
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
+#. ($self->Field , $q1->Name , $q2->Name)
+#. ($self->Field, $t2->AsString, $t1->AsString)
+#. ($self->Field, $self->OldValue, $self->NewValue)
+msgid "%1 changed from %2 to %3"
+msgstr "%1 изменило�ь � %2 на %3"
+
+#: lib/RT/Interface/Web.pm:857
+msgid "%1 could not be set to %2."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 couldn't init a transaction (%2)\\n"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2813
+#. ($self)
+msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
+msgstr "%1 не могу закрыть тикет. Возможно, база данных RT и�порчена."
+
+#: html/Elements/MyTickets:25
+#. ($rows)
+msgid "%1 highest priority tickets I own..."
+msgstr ""
+
+#: html/Elements/MyRequests:25
+#. ($rows)
+msgid "%1 highest priority tickets I requested..."
+msgstr ""
+
+#: bin/rt-crontool:161
+#. ($0)
+msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:743
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this queue."
+msgstr "%1 больше не �вл�ет�� %2 дл� �той очереди."
+
+#: lib/RT/Ticket_Overlay.pm:1570
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this ticket."
+msgstr "%1 больше не �вл�ет�� %2 дл� �того тикета."
+
+#: lib/RT/Ticket_Overlay.pm:3527
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 is no longer a value for custom field %2"
+msgstr "%1 больше не �вл�ет�� значением дл� не�тандартного пол� %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 isn't a valid Queue id."
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:36
+#. ($TimeWorked)
+msgid "%1 min"
+msgstr "%1 мин"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 not shown"
+msgstr "%1 не отображает��"
+
+#: html/User/Elements/DelegateRights:76
+#. (loc($ObjectType =~ /^RT::(.*)$/))
+msgid "%1 rights"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 succeeded\\n"
+msgstr "%1 у�пешно произведено\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for $MessageId"
+msgstr "%1 тип не изве�тен дл� $MessageId"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for %2"
+msgstr "%1 тип не изве�тен дл� %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 was created without a CurrentUser\\n"
+msgstr ""
+
+#: lib/RT/Action/ResolveMembers.pm:42
+#. (ref $self)
+msgid "%1 will resolve all members of a resolved group ticket."
+msgstr "%1 закроет в�е тикеты, вход�щие в групповой запро�"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr "%1 отложит тикеты, которые зави��т запро�а или включены в него"
+
+#: lib/RT/Transaction_Overlay.pm:435
+#. ($self)
+msgid "%1: no attachment specified"
+msgstr "%1: без вложений"
+
+#: html/Ticket/Elements/ShowTransaction:102
+#. ($size)
+msgid "%1b"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransaction:99
+#. (int($size/102.4)/10)
+msgid "%1k"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1140
+#. ($args{'Status'})
+msgid "'%1' is an invalid value for status"
+msgstr "'%1' �вл�ет�� неверным значением �тату�а"
+
+#: NOT FOUND IN SOURCE
+msgid "'%1' not a recognized action. "
+msgstr "Что делать ? : '%1'"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete group member)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete scrip)"
+msgstr ""
+
+#: html/Admin/Elements/EditQueueWatchers:29 html/Admin/Elements/EditScrips:35 html/Admin/Elements/EditTemplates:36 html/Admin/Groups/Members.html:52 html/Ticket/Elements/EditLinks:33 html/Ticket/Elements/EditPeople:46 html/User/Groups/Members.html:55
+msgid "(Check box to delete)"
+msgstr "(Пометьте то, что хотите удалить)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check boxes to delete)"
+msgstr ""
+
+#: html/Ticket/Create.html:178
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr "(Введите номера или ��ылки на тикеты. �е�колько тикетов раздел�ют�� пробелами.)"
+
+#: html/Admin/Queues/Modify.html:54 html/Admin/Queues/Modify.html:60
+#. ($RT::CorrespondAddress)
+#. ($RT::CommentAddress)
+msgid "(If left blank, will default to %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(No Value)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:33 html/Admin/Elements/ListGlobalCustomFields:32
+msgid "(No custom fields)"
+msgstr ""
+
+#: html/Admin/Groups/Members.html:50 html/User/Groups/Members.html:53
+msgid "(No members)"
+msgstr "(�ет пользователей)"
+
+#: html/Admin/Elements/EditScrips:32 html/Admin/Elements/ListGlobalScrips:32
+msgid "(No scrips)"
+msgstr "(�ет �криптов)"
+
+#: html/Admin/Elements/EditTemplates:31
+msgid "(No templates)"
+msgstr ""
+
+#: html/Ticket/Update.html:85
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(�а �ти адре�а [разделенные зап�той] отправл�ют�� копии �ообщени�. Спи�ок �тих адре�атов в пи�ьме не виден. �дре�а <b>не</b> �охран�ют�� дл� по�ледующих уведомлений.)"
+
+#: html/Ticket/Create.html:79
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
+msgstr ""
+
+#: html/Ticket/Update.html:81
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(�а �ти адре�а [разделенные зап�той] отправл�ют�� копии �ообщени�. �дре�а не �охран�ют�� дл� по�ледующих уведомлений.)"
+
+#: html/Ticket/Create.html:69
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
+msgstr ""
+
+#: html/Admin/Groups/index.html:33 html/User/Groups/index.html:33
+msgid "(empty)"
+msgstr "(пу�то)"
+
+#: html/Admin/Users/index.html:39
+msgid "(no name listed)"
+msgstr ""
+
+#: html/Elements/MyRequests:43 html/Elements/MyTickets:45
+msgid "(no subject)"
+msgstr "(без темы)"
+
+#: html/Admin/Elements/SelectRights:48 html/Elements/SelectCustomFieldValue:30 html/Ticket/Elements/EditCustomField:59 html/Ticket/Elements/ShowCustomFields:36 lib/RT/Transaction_Overlay.pm:536
+msgid "(no value)"
+msgstr "(нет значени�)"
+
+#: html/Ticket/Elements/EditLinks:116
+msgid "(only one ticket)"
+msgstr "(только один тикет)"
+
+#: html/Elements/MyRequests:52 html/Elements/MyTickets:55
+msgid "(pending approval)"
+msgstr ""
+
+#: html/Elements/MyRequests:54 html/Elements/MyTickets:57
+msgid "(pending other tickets)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(requestor's group)"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:50
+msgid "(required)"
+msgstr "(требует��)"
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "(untitled)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr "25 важнейших моих тикетов..."
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr "25 �амых важных моих запро�ов..."
+
+#: html/Ticket/Elements/ShowBasics:32
+msgid "<% $Ticket->Status%>"
+msgstr "<% $Ticket->Status%>"
+
+#: html/Elements/SelectTicketTypes:27
+msgid "<% $_ %>"
+msgstr ""
+
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:26
+#. ($m->scomp('/Elements/SelectNewTicketQueue'))
+msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
+msgstr "<input type=\"submit\" value=\"Создать тикет в очереди\">&nbsp;%1"
+
+#: NOT FOUND IN SOURCE
+msgid "??????"
+msgstr ""
+
+#: etc/initialdata:203
+msgid "A blank template"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Loaded"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be found"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:157 lib/RT/Principal_Overlay.pm:181
+msgid "ACE not found"
+msgstr "ACE не найден"
+
+#: lib/RT/ACE_Overlay.pm:831
+msgid "ACEs can only be created and deleted."
+msgstr "ACEы можно только �оздавать и удал�ть"
+
+#: bin/rt-commit-handler:755
+msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgstr "Прекращаем работу во избежание нежелательного изменени� тикета.\\n"
+
+#: html/User/Elements/Tabs:32
+msgid "About me"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:80
+msgid "Access control"
+msgstr "Права до�тупа"
+
+#: html/Admin/Elements/EditScrip:57
+msgid "Action"
+msgstr "Дей�твие"
+
+#: lib/RT/Scrip_Overlay.pm:147
+#. ($args{'ScripAction'})
+msgid "Action %1 not found"
+msgstr ""
+
+#: bin/rt-crontool:123
+msgid "Action committed."
+msgstr "Дей�твие прин�то."
+
+#: bin/rt-crontool:119
+msgid "Action prepared..."
+msgstr "Дей�твие подготовлено..."
+
+#: html/Search/Bulk.html:92
+msgid "Add AdminCc"
+msgstr "Добавить админи�тративную копию"
+
+#: html/Search/Bulk.html:90
+msgid "Add Cc"
+msgstr "Добавить копию"
+
+#: html/Ticket/Create.html:114 html/Ticket/Update.html:100
+msgid "Add More Files"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add Next State"
+msgstr ""
+
+#: html/Search/Bulk.html:88
+msgid "Add Requestor"
+msgstr "Добавить про�ител�"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip to this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip which will apply to all queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a new a global scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a scrip to this queue"
+msgstr ""
+
+#: html/Admin/Global/Scrip.html:55
+msgid "Add a scrip which will apply to all queues"
+msgstr "Добавить �крипт, который будет дей�твовать на в�е очереди"
+
+#: html/Search/Bulk.html:118
+msgid "Add comments or replies to selected tickets"
+msgstr "Добавить комментарии или ответы на выбранные тикеты"
+
+#: html/Admin/Groups/Members.html:42 html/User/Groups/Members.html:39
+msgid "Add members"
+msgstr "Добавить пользователей"
+
+#: html/Admin/Queues/People.html:66 html/Ticket/Elements/AddWatchers:28
+msgid "Add new watchers"
+msgstr "Добавить наблюдателей"
+
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:643
+#. ($args{'Type'})
+msgid "Added principal as a %1 for this queue"
+msgstr "Добавить пользовател� как %1 дл� �той очереди"
+
+#: lib/RT/Ticket_Overlay.pm:1454
+#. ($self->loc($args{'Type'}))
+msgid "Added principal as a %1 for this ticket"
+msgstr "Добавить пользовател� как %1 дл� �того тикета"
+
+#: html/Admin/Elements/ModifyUser:76 html/Admin/Users/Modify.html:122 html/User/Prefs.html:88
+msgid "Address1"
+msgstr "�дре�1"
+
+#: html/Admin/Elements/ModifyUser:78 html/Admin/Users/Modify.html:127 html/User/Prefs.html:90
+msgid "Address2"
+msgstr "�дре�2"
+
+#: html/Ticket/Create.html:74
+msgid "Admin Cc"
+msgstr "�дмини�тративна� копи�"
+
+#: etc/initialdata:274
+msgid "Admin Comment"
+msgstr ""
+
+#: etc/initialdata:256
+msgid "Admin Correspondence"
+msgstr ""
+
+#: html/Admin/Queues/index.html:25 html/Admin/Queues/index.html:28
+msgid "Admin queues"
+msgstr "Управление очеред�ми"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin users"
+msgstr "Управление пользовател�ми"
+
+#: html/Admin/Global/index.html:26 html/Admin/Global/index.html:28
+msgid "Admin/Global configuration"
+msgstr "Общие на�тройки"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Groups"
+msgstr "Группы"
+
+#: html/Admin/Queues/Modify.html:25 html/Admin/Queues/Modify.html:29
+msgid "Admin/Queue/Basics"
+msgstr "Параметры очереди"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr ""
+
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:39 html/Ticket/Update.html:50 lib/RT/ACE_Overlay.pm:89
+msgid "AdminCc"
+msgstr "�дмини�тративна� копи�"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "AdminCustomFields"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "AdminGroup"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "AdminGroupMembership"
+msgstr ""
+
+#: lib/RT/System.pm:59
+msgid "AdminOwnPersonalGroups"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "AdminQueue"
+msgstr ""
+
+#: lib/RT/System.pm:60
+msgid "AdminUsers"
+msgstr ""
+
+#: html/Admin/Queues/People.html:48 html/Ticket/Elements/EditPeople:54
+msgid "Administrative Cc"
+msgstr "�дмини�тративна� копи�"
+
+#: NOT FOUND IN SOURCE
+msgid "Admins"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search"
+msgstr ""
+
+#: html/Elements/SelectDateRelation:36
+msgid "After"
+msgstr "По�ле"
+
+#: NOT FOUND IN SOURCE
+msgid "Age"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Alias"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Alias for"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:96
+msgid "All Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:53
+msgid "All Queues"
+msgstr "В�е очереди"
+
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
+msgstr ""
+
+#: html/Elements/Tabs:58
+msgid "Approval"
+msgstr ""
+
+#: html/Approvals/Display.html:46 html/Approvals/Elements/Approve:27 html/Approvals/Elements/ShowDependency:42 html/Approvals/index.html:65
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($ticket->id, $msg)
+#. ($ticket->Id, $ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Approval #%1: %2"
+msgstr "Виза #%1: %2"
+
+#: html/Approvals/index.html:54
+#. ($ticket->Id)
+msgid "Approval #%1: Notes not recorded due to a system error"
+msgstr "Виза #%1: Примечани� не �охранены из-за ошибки �и�темы"
+
+#: html/Approvals/index.html:52
+#. ($ticket->Id)
+msgid "Approval #%1: Notes recorded"
+msgstr "Виза #%1: Примечани� запи�аны"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Details"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Approval diagram"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:45
+msgid "Approve"
+msgstr "Завизировать"
+
+#: etc/initialdata:431 etc/upgrade/2.1.71:148
+msgid "Approver's notes: %1"
+msgstr ""
+
+#: lib/RT/Date.pm:414
+msgid "Apr."
+msgstr "�пр."
+
+#: NOT FOUND IN SOURCE
+msgid "April"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:35
+msgid "Ascending"
+msgstr "В пор�дке возра�тани�"
+
+#: html/Search/Bulk.html:127 html/SelfService/Update.html:36 html/Ticket/ModifyAll.html:83 html/Ticket/Update.html:100
+msgid "Attach"
+msgstr "Вложение"
+
+#: html/SelfService/Create.html:67 html/Ticket/Create.html:110
+msgid "Attach file"
+msgstr "Вложить файл"
+
+#: html/Ticket/Create.html:98 html/Ticket/Update.html:89
+msgid "Attached file"
+msgstr ""
+
+#: html/SelfService/Attachment/dhandler:36
+msgid "Attachment '%1' could not be loaded"
+msgstr "Вложение '%1' не может быть загружено"
+
+#: lib/RT/Transaction_Overlay.pm:443
+msgid "Attachment created"
+msgstr "Создано вложение"
+
+#: lib/RT/Tickets_Overlay.pm:1189
+msgid "Attachment filename"
+msgstr "Им� файла"
+
+#: html/Ticket/Elements/ShowAttachments:26
+msgid "Attachments"
+msgstr "Вложени�"
+
+#: lib/RT/Date.pm:418
+msgid "Aug."
+msgstr "�вг."
+
+#: NOT FOUND IN SOURCE
+msgid "August"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:66
+msgid "AuthSystem"
+msgstr "Тип реги�трации"
+
+#: etc/initialdata:206
+msgid "Autoreply"
+msgstr ""
+
+#: etc/initialdata:72
+msgid "Autoreply To Requestors"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Bad PGP Signature: %1\\n"
+msgstr "�еправильна� подпи�ь PGP: %1\\n"
+
+#: html/SelfService/Attachment/dhandler:40
+msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
+msgstr "�еверный идентификатор вложени�. От�ут�твует вложение '%1'\\n"
+
+#: bin/rt-commit-handler:827
+#. ($val)
+msgid "Bad data in %1"
+msgstr "�еправильна� дата в %1"
+
+#: html/SelfService/Attachment/dhandler:43
+#. ($trans, $AttachmentObj->TransactionId())
+msgid "Bad transaction number for attachment. %1 should be %2\\n"
+msgstr "�еправильный номер транзакции дл� вложени�. %1 должен быть %2\\n"
+
+#: html/Admin/Elements/GroupTabs:39 html/Admin/Elements/QueueTabs:39 html/Admin/Elements/UserTabs:38 html/Ticket/Elements/Tabs:90 html/User/Elements/GroupTabs:38
+msgid "Basics"
+msgstr "Главное"
+
+#: html/Ticket/Update.html:83
+msgid "Bcc"
+msgstr "Скрыта� копи�"
+
+#: html/Admin/Elements/EditScrip:88 html/Admin/Global/GroupRights.html:85 html/Admin/Global/Template.html:46 html/Admin/Global/UserRights.html:54 html/Admin/Groups/GroupRights.html:73 html/Admin/Groups/Members.html:81 html/Admin/Groups/Modify.html:56 html/Admin/Groups/UserRights.html:55 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:45 html/Admin/Queues/UserRights.html:54 html/User/Groups/Modify.html:56
+msgid "Be sure to save your changes"
+msgstr "�е забудьте �охранить на�тройки"
+
+#: html/Elements/SelectDateRelation:34 lib/RT/CurrentUser.pm:322
+msgid "Before"
+msgstr "До"
+
+#: NOT FOUND IN SOURCE
+msgid "Begin Approval"
+msgstr ""
+
+#: etc/initialdata:202
+msgid "Blank"
+msgstr ""
+
+#: html/Search/Listing.html:79
+msgid "Bookmarkable URL for this search"
+msgstr "Получить URL дл� �того пои�ка"
+
+#: html/Ticket/Elements/ShowHistory:39 html/Ticket/Elements/ShowHistory:45
+msgid "Brief headers"
+msgstr "Сокращенный"
+
+#: html/Search/Bulk.html:25 html/Search/Bulk.html:26
+msgid "Bulk ticket update"
+msgstr "Изменение одним махом"
+
+#: lib/RT/User_Overlay.pm:1331
+msgid "Can not modify system users"
+msgstr "�е могу измен�ть �и�темных пользователей"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "Can this principal see this queue"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:144
+msgid "Can't add a custom field value without a name"
+msgstr "�е могу добавить значение пол� без имени"
+
+#: lib/RT/Link_Overlay.pm:132
+msgid "Can't link a ticket to itself"
+msgstr "Тикет не может быть �в�зан � �амим �обой"
+
+#: lib/RT/Ticket_Overlay.pm:2787
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr "�е могу �оединить � объединенным тикетом (�та ошибка никогда не должна прои�ходить)."
+
+#: lib/RT/Ticket_Overlay.pm:2605 lib/RT/Ticket_Overlay.pm:2674
+msgid "Can't specifiy both base and target"
+msgstr "�е могу указать одновременно и и�точник, и адре� назначени�"
+
+#: html/autohandler:112
+#. ($msg)
+msgid "Cannot create user: %1"
+msgstr "�е могу �оздать пользовател�: %1"
+
+#: etc/initialdata:50 html/Admin/Queues/People.html:44 html/SelfService/Create.html:51 html/SelfService/Display.html:50 html/Ticket/Create.html:64 html/Ticket/Elements/EditPeople:51 html/Ticket/Elements/ShowPeople:35 html/Ticket/Update.html:45 html/Ticket/Update.html:78 lib/RT/ACE_Overlay.pm:88
+msgid "Cc"
+msgstr "Копи�"
+
+#: html/SelfService/Prefs.html:31
+msgid "Change password"
+msgstr "Сменить пароль"
+
+#: html/Ticket/Create.html:101 html/Ticket/Update.html:92
+msgid "Check box to delete"
+msgstr ""
+
+#: html/Admin/Elements/SelectRights:31
+msgid "Check box to revoke right"
+msgstr "Выберите права, которые хотите отозвать"
+
+#: html/Ticket/Create.html:183 html/Ticket/Elements/EditLinks:131 html/Ticket/Elements/EditLinks:69 html/Ticket/Elements/ShowLinks:51
+msgid "Children"
+msgstr "Потомки"
+
+#: html/Admin/Elements/ModifyUser:80 html/Admin/Users/Modify.html:132 html/User/Prefs.html:92
+msgid "City"
+msgstr "Город"
+
+#: html/Ticket/Elements/ShowDates:47
+msgid "Closed"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:60
+msgid "Closed requests"
+msgstr "Закрытые запро�ы"
+
+#: NOT FOUND IN SOURCE
+msgid "Code"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Command not understood!\\n"
+msgstr "Чего-чего?\\n"
+
+#: html/Ticket/Elements/ShowTransaction:179 html/Ticket/Elements/Tabs:153
+msgid "Comment"
+msgstr "Комментировать"
+
+#: html/Admin/Elements/ModifyQueue:45 html/Admin/Queues/Modify.html:58
+msgid "Comment Address"
+msgstr "�дре� дл� комментариев"
+
+#: NOT FOUND IN SOURCE
+msgid "Comment not recorded"
+msgstr "Комментарий не запи�ан"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "Comment on tickets"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "CommentOnTicket"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:35
+msgid "Comments"
+msgstr "Комментарии"
+
+#: html/Ticket/ModifyAll.html:70 html/Ticket/Update.html:70
+msgid "Comments (Not sent to requestors)"
+msgstr "Комментарии (�е отправл�ют�� про�ител�м)"
+
+#: html/Search/Bulk.html:122
+msgid "Comments (not sent to requestors)"
+msgstr "Комментарии (не отправл�ют�� про�ителю)"
+
+#: html/Elements/ViewUser:27
+#. ($name)
+msgid "Comments about %1"
+msgstr "Информаци� о %1"
+
+#: html/Admin/Users/Modify.html:185 html/Ticket/Elements/ShowRequestor:44
+msgid "Comments about this user"
+msgstr "Дополнительна� информаци� об �том пользователе"
+
+#: lib/RT/Transaction_Overlay.pm:545
+msgid "Comments added"
+msgstr "Добавлены комментарии"
+
+#: lib/RT/Action/Generic.pm:140
+msgid "Commit Stubbed"
+msgstr "Дей�твие не реализовано"
+
+#: NOT FOUND IN SOURCE
+msgid "Compile Restrictions"
+msgstr "Применить ограничени�"
+
+#: html/Admin/Elements/EditScrip:41
+msgid "Condition"
+msgstr "У�ловие"
+
+#: bin/rt-crontool:109
+msgid "Condition matches..."
+msgstr "Подход�щее у�ловие..."
+
+#: lib/RT/Scrip_Overlay.pm:160
+msgid "Condition not found"
+msgstr "У�ловие не найдено"
+
+#: html/Elements/Tabs:52
+msgid "Configuration"
+msgstr "�а�тройка"
+
+#: html/SelfService/Prefs.html:33
+msgid "Confirm"
+msgstr "Подтвердить"
+
+#: html/Admin/Elements/ModifyUser:60
+msgid "ContactInfoSystem"
+msgstr "Контактна� информаци�"
+
+#: NOT FOUND IN SOURCE
+msgid "Contacted date '%1' could not be parsed"
+msgstr "�е могу разобрать дату по�леднего контакта '%1'"
+
+#: html/Admin/Elements/ModifyTemplate:44 html/Ticket/ModifyAll.html:87
+msgid "Content"
+msgstr "Тек�т"
+
+#: NOT FOUND IN SOURCE
+msgid "Coould not create group"
+msgstr ""
+
+#: etc/initialdata:266
+msgid "Correspondence"
+msgstr ""
+
+#: html/Admin/Elements/ModifyQueue:39 html/Admin/Queues/Modify.html:51
+msgid "Correspondence Address"
+msgstr "�дре� дл� �ообщений"
+
+#: lib/RT/Transaction_Overlay.pm:541
+msgid "Correspondence added"
+msgstr "Добавлено �ообщение"
+
+#: NOT FOUND IN SOURCE
+msgid "Correspondence not recorded"
+msgstr "Сообщение не запи�ано"
+
+#: lib/RT/Ticket_Overlay.pm:3458
+msgid "Could not add new custom field value for ticket. "
+msgstr "�е могу добавить новое поле � таким значением."
+
+#: NOT FOUND IN SOURCE
+msgid "Could not add new custom field value for ticket. %1 "
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2963 lib/RT/Ticket_Overlay.pm:2971 lib/RT/Ticket_Overlay.pm:2987
+msgid "Could not change owner. "
+msgstr "�е могу �менить владельца. "
+
+#: html/Admin/Elements/EditCustomField:68 html/Admin/Elements/EditCustomFields:166
+#. ($msg)
+msgid "Could not create CustomField"
+msgstr "�е могу добавить поле"
+
+#: html/User/Groups/Modify.html:77 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
+msgid "Could not create group"
+msgstr "�е могу �оздать группу"
+
+#: html/Admin/Global/Template.html:75 html/Admin/Queues/Template.html:72
+#. ($msg)
+msgid "Could not create template: %1"
+msgstr "�е могу �оздать шаблон: %1"
+
+#: lib/RT/Ticket_Overlay.pm:1073 lib/RT/Ticket_Overlay.pm:333
+msgid "Could not create ticket. Queue not set"
+msgstr "�е могу �оздать тикет. Очередь не определена."
+
+#: lib/RT/User_Overlay.pm:208 lib/RT/User_Overlay.pm:220 lib/RT/User_Overlay.pm:238 lib/RT/User_Overlay.pm:414
+msgid "Could not create user"
+msgstr "�е могу �оздать пользовател�"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not create watcher for requestor"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find a ticket with id %1"
+msgstr "�е могу найти тикет по идентификатору %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find group %1."
+msgstr "�е найдена группа %1."
+
+#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1422
+msgid "Could not find or create that user"
+msgstr "�е могу найти или �оздать �того пользовател�"
+
+#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1501
+msgid "Could not find that principal"
+msgstr "�е могу найти �того пользовател�"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find user %1."
+msgstr "�е найден пользователь %1."
+
+#: html/Admin/Groups/Members.html:88 html/User/Groups/Members.html:90 html/User/Groups/Modify.html:82
+msgid "Could not load group"
+msgstr "�е могу загрузить группу"
+
+#: lib/RT/Queue_Overlay.pm:641
+#. ($args{'Type'})
+msgid "Could not make that principal a %1 for this queue"
+msgstr "�е могу назначить �того пользовател� %1 дл� �той очереди"
+
+#: lib/RT/Ticket_Overlay.pm:1443
+#. ($self->loc($args{'Type'}))
+msgid "Could not make that principal a %1 for this ticket"
+msgstr "�е могу назначить �того пользовател� %1 дл� �того тикета"
+
+#: lib/RT/Queue_Overlay.pm:740
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this queue"
+msgstr "�е могу отобрать функции у пользовател� как %1 в �той очереди"
+
+#: lib/RT/Ticket_Overlay.pm:1559
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this ticket"
+msgstr "�е могу отобрать функции у пользовател� как %1 дл� �того тикета"
+
+#: lib/RT/Group_Overlay.pm:985
+msgid "Couldn't add member to group"
+msgstr "�е могу добавить пользовател� в группу"
+
+#: lib/RT/Ticket_Overlay.pm:3468 lib/RT/Ticket_Overlay.pm:3524
+#. ($Msg)
+msgid "Couldn't create a transaction: %1"
+msgstr "�е могу �оздать транзакцию: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't figure out what to do from gpg's reply\\n"
+msgstr "�е пойму что делать из ответа gpg\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find group\\n"
+msgstr "�е найти группу\\n"
+
+#: lib/RT/Interface/Web.pm:866
+msgid "Couldn't find row"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:959
+msgid "Couldn't find that principal"
+msgstr "�е найти �того пользовател�"
+
+#: lib/RT/CustomField_Overlay.pm:175
+msgid "Couldn't find that value"
+msgstr "�е найти �того значени�"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find that watcher"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find user\\n"
+msgstr "Пользователь не найден\\n"
+
+#: lib/RT/CurrentUser.pm:112
+#. ($self->Id)
+msgid "Couldn't load %1 from the users database.\\n"
+msgstr "�е загрузить %1 из базы пользователей.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load KeywordSelects."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load RT config file '%1' %2"
+msgstr "�е загрузить файл на�троек RT '%1' %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load Scrips."
+msgstr ""
+
+#: html/Admin/Groups/GroupRights.html:88 html/Admin/Groups/UserRights.html:75
+#. ($id)
+msgid "Couldn't load group %1"
+msgstr "�е загрузить группу %1"
+
+#: lib/RT/Link_Overlay.pm:175 lib/RT/Link_Overlay.pm:184 lib/RT/Link_Overlay.pm:211
+msgid "Couldn't load link"
+msgstr "�е загрузить ��ылку"
+
+#: html/Admin/Elements/EditCustomFields:147 html/Admin/Queues/People.html:121
+#. ($id)
+msgid "Couldn't load queue"
+msgstr "�е загрузить очередь"
+
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:72
+#. ($id)
+msgid "Couldn't load queue %1"
+msgstr "�е загрузить очередь %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load scrip"
+msgstr "�е загрузить �крипт"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load template"
+msgstr "�е загрузить шаблон"
+
+#: html/Admin/Users/Prefs.html:79
+#. ($id)
+msgid "Couldn't load that user (%1)"
+msgstr "�е загрузить �того пользовател� (%1)"
+
+#: html/SelfService/Display.html:166
+#. ($id)
+msgid "Couldn't load ticket '%1'"
+msgstr "�е загрузить тикет '%1'"
+
+#: html/Admin/Elements/ModifyUser:86 html/Admin/Users/Modify.html:149 html/User/Prefs.html:98
+msgid "Country"
+msgstr "Страна"
+
+#: html/Admin/Elements/CreateUserCalled:26 html/Ticket/Create.html:135 html/Ticket/Create.html:195
+msgid "Create"
+msgstr "Создать"
+
+#: etc/initialdata:128
+msgid "Create Tickets"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:58
+msgid "Create a CustomField"
+msgstr "Добавить поле"
+
+#: html/Admin/Queues/CustomField.html:48
+#. ($QueueObj->Name())
+msgid "Create a CustomField for queue %1"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:48
+msgid "Create a CustomField which applies to all queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new Custom Field"
+msgstr "Добавить новое поле"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global Scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global scrip"
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:67 html/Admin/Groups/Modify.html:93
+msgid "Create a new group"
+msgstr "Добавить новую группу"
+
+#: html/User/Groups/Modify.html:67 html/User/Groups/Modify.html:92
+msgid "Create a new personal group"
+msgstr "Добавить новую личную группу"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new queue"
+msgstr "Добавить новую очередь"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new scrip"
+msgstr "Добавить новый �крипт"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new template"
+msgstr "Добавить новый шаблон"
+
+#: html/SelfService/Create.html:30 html/Ticket/Create.html:25 html/Ticket/Create.html:28 html/Ticket/Create.html:36
+msgid "Create a new ticket"
+msgstr "Добавить новый тикет"
+
+#: html/Admin/Users/Modify.html:214 html/Admin/Users/Modify.html:241
+msgid "Create a new user"
+msgstr "Добавить нового пользовател�"
+
+#: html/Admin/Queues/Modify.html:103
+msgid "Create a queue"
+msgstr "Создать очередь"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a queue called"
+msgstr "Создать очередь � именем"
+
+#: html/SelfService/Create.html:25 html/SelfService/Create.html:27
+msgid "Create a request"
+msgstr "Создать запро�"
+
+#: html/Admin/Queues/Scrip.html:59
+#. ($QueueObj->Name)
+msgid "Create a scrip for queue %1"
+msgstr "Создать �крипт дл� очереди %1"
+
+#: html/Admin/Global/Template.html:69 html/Admin/Queues/Template.html:65
+msgid "Create a template"
+msgstr "Создать запро�"
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1 / %2 / %3 "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1/%2/%3"
+msgstr ""
+
+#: etc/initialdata:130
+msgid "Create new tickets based on this scrip's template"
+msgstr ""
+
+#: html/SelfService/Create.html:81
+msgid "Create ticket"
+msgstr "Создать тикет"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "Create tickets in this queue"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "Create, delete and modify custom fields"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "Create, delete and modify queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
+msgstr ""
+
+#: lib/RT/System.pm:59
+msgid "Create, delete and modify the members of personal groups"
+msgstr ""
+
+#: lib/RT/System.pm:60
+msgid "Create, delete and modify users"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "CreateTicket"
+msgstr ""
+
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1167
+msgid "Created"
+msgstr "Создан"
+
+#: html/Admin/Elements/EditCustomField:71
+#. ($CustomFieldObj->Name())
+msgid "Created CustomField %1"
+msgstr "Добавлено поле %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Created template %1"
+msgstr "Создан шаблон %1"
+
+#: html/Ticket/Elements/EditLinks:28
+msgid "Current Relationships"
+msgstr "Текущие �в�зи"
+
+#: html/Admin/Elements/EditScrips:30
+msgid "Current Scrips"
+msgstr "Текущие �крипты"
+
+#: html/Admin/Groups/Members.html:39 html/User/Groups/Members.html:42
+msgid "Current members"
+msgstr "Текущие пользователи"
+
+#: html/Admin/Elements/SelectRights:29
+msgid "Current rights"
+msgstr "Текущие права"
+
+#: html/Search/Listing.html:71
+msgid "Current search criteria"
+msgstr ""
+
+#: html/Admin/Queues/People.html:41 html/Ticket/Elements/EditPeople:45
+msgid "Current watchers"
+msgstr "Текущие наблюдатели"
+
+#: html/Admin/Global/CustomField.html:55
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:53 html/Admin/Elements/SystemTabs:40 html/Admin/Global/index.html:50 html/Ticket/Elements/ShowSummary:35
+msgid "Custom Fields"
+msgstr "Дополнительные пол�"
+
+#: html/Admin/Elements/EditScrip:73
+msgid "Custom action cleanup code"
+msgstr "Пользователь�кий код очи�тки"
+
+#: html/Admin/Elements/EditScrip:65
+msgid "Custom action preparation code"
+msgstr "Пользователь�кий подготовительный код"
+
+#: html/Admin/Elements/EditScrip:49
+msgid "Custom condition"
+msgstr "Пользователь�кое у�ловие"
+
+#: lib/RT/Tickets_Overlay.pm:1618
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
+msgid "Custom field %1 %2 %3"
+msgstr "Дополнительное поле %1 %2 %3"
+
+#: lib/RT/Tickets_Overlay.pm:1613
+#. ($CF->Name)
+msgid "Custom field %1 has a value."
+msgstr "Дополнительное поле %1 имеет значение."
+
+#: lib/RT/Tickets_Overlay.pm:1610
+#. ($CF->Name)
+msgid "Custom field %1 has no value."
+msgstr "Дополнительное поле %1 не имеет значени�."
+
+#: lib/RT/Ticket_Overlay.pm:3360
+#. ($args{'Field'})
+msgid "Custom field %1 not found"
+msgstr "Дополнительное поле %1 не найдено"
+
+#: html/Admin/Elements/EditCustomFields:197
+msgid "Custom field deleted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3510
+msgid "Custom field not found"
+msgstr "Дополнительное поле не найдено"
+
+#: lib/RT/CustomField_Overlay.pm:283
+#. ($args{'Content'}, $self->Name)
+msgid "Custom field value %1 could not be found for custom field %2"
+msgstr "Значение %1 не может быть найдено дл� пол� %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Custom field value changed from %1 to %2"
+msgstr "Значение пол� изменено � %1 на %2"
+
+#: lib/RT/CustomField_Overlay.pm:185
+msgid "Custom field value could not be deleted"
+msgstr "Значение дополнительного пол� не может быть удалено"
+
+#: lib/RT/CustomField_Overlay.pm:289
+msgid "Custom field value could not be found"
+msgstr "Значение дополнительного пол� не найдено"
+
+#: lib/RT/CustomField_Overlay.pm:183 lib/RT/CustomField_Overlay.pm:291
+msgid "Custom field value deleted"
+msgstr "Значение дополнительного пол� было удалено"
+
+#: lib/RT/Transaction_Overlay.pm:550
+msgid "CustomField"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Data error"
+msgstr ""
+
+#: html/Ticket/Create.html:161 html/Ticket/Elements/ShowSummary:53 html/Ticket/Elements/Tabs:93 html/Ticket/ModifyAll.html:44
+msgid "Dates"
+msgstr "Даты"
+
+#: lib/RT/Date.pm:422
+msgid "Dec."
+msgstr "Дек."
+
+#: NOT FOUND IN SOURCE
+msgid "December"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr ""
+
+#: etc/initialdata:207
+msgid "Default Autoresponse template"
+msgstr ""
+
+#: etc/initialdata:275
+msgid "Default admin comment template"
+msgstr ""
+
+#: etc/initialdata:257
+msgid "Default admin correspondence template"
+msgstr ""
+
+#: etc/initialdata:267
+msgid "Default correspondence template"
+msgstr ""
+
+#: etc/initialdata:238
+msgid "Default transaction template"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:645
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr ""
+
+#: html/User/Delegation.html:25 html/User/Delegation.html:28
+msgid "Delegate rights"
+msgstr "Передача прав"
+
+#: lib/RT/System.pm:63
+msgid "Delegate specific rights which have been granted to you."
+msgstr ""
+
+#: lib/RT/System.pm:63
+msgid "DelegateRights"
+msgstr ""
+
+#: html/User/Elements/Tabs:38
+msgid "Delegation"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Delete"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "Delete tickets"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "DeleteTicket"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:187
+msgid "Deleting this object could break referential integrity"
+msgstr "Удаление �того объекта может нарушить ��ылочную цело�тно�ть"
+
+#: lib/RT/Queue_Overlay.pm:292
+msgid "Deleting this object would break referential integrity"
+msgstr "Удаление �того объекта нарушит ��ылочную цело�тно�ть"
+
+#: lib/RT/User_Overlay.pm:430
+msgid "Deleting this object would violate referential integrity"
+msgstr "Удаление �того объекта нарушит ��ылочную цело�тно�ть"
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity. That's bad."
+msgstr ""
+
+#: html/Approvals/Elements/Approve:46
+msgid "Deny"
+msgstr "Отказать"
+
+#: html/Ticket/Create.html:181 html/Ticket/Elements/EditLinks:123 html/Ticket/Elements/EditLinks:47 html/Ticket/Elements/ShowDependencies:32 html/Ticket/Elements/ShowLinks:35
+msgid "Depended on by"
+msgstr "От него зави��т"
+
+#: NOT FOUND IN SOURCE
+msgid "Dependencies: \\n"
+msgstr "Зави�имо�ти: \\n"
+
+#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:180 html/Ticket/Elements/EditLinks:119 html/Ticket/Elements/EditLinks:36 html/Ticket/Elements/ShowDependencies:25 html/Ticket/Elements/ShowLinks:27
+msgid "Depends on"
+msgstr "Зави�ит от"
+
+#: NOT FOUND IN SOURCE
+msgid "DependsOn"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:35
+msgid "Descending"
+msgstr "В пор�дке убывани�"
+
+#: html/SelfService/Create.html:75 html/Ticket/Create.html:119
+msgid "Describe the issue below"
+msgstr "Опишите проблему"
+
+#: html/Admin/Elements/AddCustomFieldValue:27 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyQueue:36 html/Admin/Elements/ModifyTemplate:36 html/Admin/Groups/Modify.html:49 html/Admin/Queues/Modify.html:48 html/Elements/SelectGroups:27 html/User/Groups/Modify.html:49
+msgid "Description"
+msgstr "Опи�ание"
+
+#: html/SelfService/Elements/MyRequests:44
+msgid "Details"
+msgstr "Подробно�ти"
+
+#: html/Ticket/Elements/Tabs:85
+msgid "Display"
+msgstr "Показать"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "Display Access Control List"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "Display Scrip templates for this queue"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "Display Scrips for this queue"
+msgstr ""
+
+#: html/Ticket/Elements/ShowHistory:35
+msgid "Display mode"
+msgstr "Режим показа"
+
+#: html/SelfService/Display.html:25 html/SelfService/Display.html:29
+#. ($Ticket->id)
+msgid "Display ticket #%1"
+msgstr "Показать тикет #%1"
+
+#: lib/RT/System.pm:54
+msgid "Do anything and everything"
+msgstr ""
+
+#: html/Elements/Refresh:30
+msgid "Don't refresh this page."
+msgstr "�е обновл�ть �ту �траницу"
+
+#: html/Search/Elements/PickRestriction:114
+msgid "Don't show search results"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransaction:105
+msgid "Download"
+msgstr "Скачать"
+
+#: html/Elements/SelectDateType:32 html/Ticket/Create.html:167 html/Ticket/Elements/EditDates:45 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1171
+msgid "Due"
+msgstr "Дан �рок"
+
+#: NOT FOUND IN SOURCE
+msgid "Due date '%1' could not be parsed"
+msgstr "�е могу проче�ть �рок решени� проблемы '%1'"
+
+#: bin/rt-commit-handler:754
+#. ($1, $msg)
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
+msgstr "ОШИБК�: �е могу загрузить тикет '%1': %2.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit"
+msgstr "Изменить"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit Conditions"
+msgstr ""
+
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr "Изменение дополнительных полей дл� %1"
+
+#: html/Ticket/ModifyLinks.html:36
+msgid "Edit Relationships"
+msgstr "Изменение �в�зей"
+
+#: html/Admin/Queues/Templates.html:41
+#. ($QueueObj->Name)
+msgid "Edit Templates for queue %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit keywords"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr ""
+
+#: html/Admin/Global/index.html:46
+msgid "Edit system templates"
+msgstr "Изменение �и�темных шаблонов"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit templates for %1"
+msgstr "Изменение шаблонов дл� %1"
+
+#: html/Admin/Elements/ModifyQueue:25 html/Admin/Queues/Modify.html:117
+#. ($QueueObj->Name)
+#. ($QueueObj->Id)
+msgid "Editing Configuration for queue %1"
+msgstr "Изменение на�троек очереди %1"
+
+#: html/Admin/Elements/ModifyUser:25
+#. ($UserObj->Name)
+msgid "Editing Configuration for user %1"
+msgstr "Изменение на�троек пользовател� %1"
+
+#: html/Admin/Elements/EditCustomField:74
+#. ($CustomFieldObj->Name())
+msgid "Editing CustomField %1"
+msgstr "Изменение пол� %1"
+
+#: html/Admin/Groups/Members.html:32
+#. ($Group->Name)
+msgid "Editing membership for group %1"
+msgstr "Пользователи в группе %1"
+
+#: html/User/Groups/Members.html:129
+#. ($Group->Name)
+msgid "Editing membership for personal group %1"
+msgstr "Пользователи в личной группе %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Editing template %1"
+msgstr "Изменение шаблона %1"
+
+#: lib/RT/Ticket_Overlay.pm:2615 lib/RT/Ticket_Overlay.pm:2683
+msgid "Either base or target must be specified"
+msgstr "�ужно указать либо и�точник, либо адре� назначени�"
+
+#: html/Admin/Users/Modify.html:53 html/Admin/Users/Prefs.html:46 html/Elements/SelectUsers:27 html/Ticket/Elements/AddWatchers:56 html/User/Prefs.html:42
+msgid "Email"
+msgstr "Email"
+
+#: lib/RT/User_Overlay.pm:188
+msgid "Email address in use"
+msgstr "Email уже зан�т"
+
+#: html/Admin/Elements/ModifyUser:42
+msgid "EmailAddress"
+msgstr "EmailAddress"
+
+#: html/Admin/Elements/ModifyUser:54
+msgid "EmailEncoding"
+msgstr "EmailEncoding"
+
+#: html/Admin/Elements/EditCustomField:36
+msgid "Enabled (Unchecking this box disables this custom field)"
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:53 html/User/Groups/Modify.html:53
+msgid "Enabled (Unchecking this box disables this group)"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:84
+msgid "Enabled (Unchecking this box disables this queue)"
+msgstr "Включена (Сн�та� галочка означает отключенную очередь)"
+
+#: html/Admin/Elements/EditCustomFields:99
+msgid "Enabled Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:56
+msgid "Enabled Queues"
+msgstr "Включенные очереди"
+
+#: html/Admin/Elements/EditCustomField:90 html/Admin/Groups/Modify.html:117 html/Admin/Queues/Modify.html:138 html/Admin/Users/Modify.html:283 html/User/Groups/Modify.html:117
+#. (loc_fuzzy($msg))
+msgid "Enabled status %1"
+msgstr "Включен �тату� %1"
+
+#: lib/RT/CustomField_Overlay.pm:361
+msgid "Enter multiple values"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:358
+msgid "Enter one value"
+msgstr ""
+
+#: html/Ticket/Elements/EditLinks:112
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "Введите номера или ��ылки на тикеты. �е�колько тикетов раздел�ют�� пробелами."
+
+#: html/Elements/Login:29 html/SelfService/Error.html:25 html/SelfService/Error.html:26
+msgid "Error"
+msgstr "Ошибка"
+
+#: NOT FOUND IN SOURCE
+msgid "Error adding watcher"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:555
+msgid "Error in parameters to Queue->AddWatcher"
+msgstr "Ошибка в параметрах Queue->AddWatcher"
+
+#: lib/RT/Queue_Overlay.pm:713
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr "Ошибка в параметрах Queue->DelWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1356
+msgid "Error in parameters to Ticket->AddWatcher"
+msgstr "Ошибка в параметрах Ticket->AddWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1532
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr "Ошибка в параметрах Ticket->DelWatcher"
+
+#: etc/initialdata:20
+msgid "Everyone"
+msgstr ""
+
+#: bin/rt-crontool:194
+msgid "Example:"
+msgstr "Пример:"
+
+#: html/Admin/Elements/ModifyUser:64
+msgid "ExternalAuthId"
+msgstr "ExternalAuthId"
+
+#: html/Admin/Elements/ModifyUser:58
+msgid "ExternalContactInfoId"
+msgstr "ExternalContactInfoId"
+
+#: html/Admin/Users/Modify.html:73
+msgid "Extra info"
+msgstr "Доп. информаци�"
+
+#: lib/RT/User_Overlay.pm:302
+msgid "Failed to find 'Privileged' users pseudogroup."
+msgstr "�е могу найти п�евдо-группу 'Полномочных' пользователей"
+
+#: lib/RT/User_Overlay.pm:309
+msgid "Failed to find 'Unprivileged' users pseudogroup"
+msgstr "�е могу найти п�евдо-группу '�еполномочных' пользователей"
+
+#: bin/rt-crontool:138
+#. ($modname, $@)
+msgid "Failed to load module %1. (%2)"
+msgstr ""
+
+#: lib/RT/Date.pm:412
+msgid "Feb."
+msgstr "Фев."
+
+#: NOT FOUND IN SOURCE
+msgid "February"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Fin"
+msgstr "Конец"
+
+#: html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:59 lib/RT/Tickets_Overlay.pm:1091
+msgid "Final Priority"
+msgstr "Конечный приоритет"
+
+#: lib/RT/Ticket_Overlay.pm:1162
+msgid "FinalPriority"
+msgstr ""
+
+#: html/Admin/Queues/People.html:61 html/Ticket/Elements/EditPeople:34
+msgid "Find group whose"
+msgstr ""
+
+#: html/Elements/Quicksearch:25
+msgid "Find new/open tickets"
+msgstr "Информаци� о тикетах"
+
+#: html/Admin/Queues/People.html:57 html/Admin/Users/index.html:46 html/Ticket/Elements/EditPeople:30
+msgid "Find people whose"
+msgstr "�айти людей, у которых"
+
+#: html/Search/Listing.html:108
+msgid "Find tickets"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Finish Approval"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:58
+msgid "First"
+msgstr "�ачало"
+
+#: html/Search/Listing.html:41
+msgid "First page"
+msgstr "Перва� �траница"
+
+#: docs/design_docs/string-extraction-guide.txt:33
+msgid "Foo Bar Baz"
+msgstr "Foo Bar Baz"
+
+#: docs/design_docs/string-extraction-guide.txt:24
+msgid "Foo!"
+msgstr "Foo!"
+
+#: html/Search/Bulk.html:87
+msgid "Force change"
+msgstr "Изменить �илой"
+
+#: html/Search/Listing.html:106
+#. ($ticketcount)
+msgid "Found %quant(%1,ticket)"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:868
+msgid "Found Object"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:44
+msgid "FreeformContactInfo"
+msgstr "FreeformContactInfo"
+
+#: lib/RT/CustomField_Overlay.pm:38
+msgid "FreeformMultiple"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformSingle"
+msgstr ""
+
+#: lib/RT/Date.pm:392
+msgid "Fri."
+msgstr "Птн."
+
+#: html/Ticket/Elements/ShowHistory:41 html/Ticket/Elements/ShowHistory:51
+msgid "Full headers"
+msgstr "Полный"
+
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr "Берем текущего пользовател� из pgp подпи�и\\n"
+
+#: lib/RT/Transaction_Overlay.pm:595
+#. ($New->Name)
+msgid "Given to %1"
+msgstr ""
+
+#: html/Admin/Elements/Tabs:41 html/Admin/index.html:38
+msgid "Global"
+msgstr "Общие"
+
+#: NOT FOUND IN SOURCE
+msgid "Global Keyword Selections"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
+msgstr ""
+
+#: html/Admin/Elements/SelectTemplate:38
+#. (loc($Template->Name))
+msgid "Global template: %1"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:75 html/Admin/Queues/People.html:59 html/Admin/Queues/People.html:63 html/Admin/Queues/index.html:44 html/Admin/Users/index.html:49 html/Ticket/Elements/EditPeople:32 html/Ticket/Elements/EditPeople:36 html/index.html:41
+msgid "Go!"
+msgstr "Поехали!"
+
+#: NOT FOUND IN SOURCE
+msgid "Good pgp sig from %1\\n"
+msgstr "Хороша� pgp подпи�ь от %1\\n"
+
+#: html/Search/Listing.html:50
+msgid "Goto page"
+msgstr "Перейти на �траницу"
+
+#: html/Elements/GotoTicket:25 html/SelfService/Elements/GotoTicket:25
+msgid "Goto ticket"
+msgstr "Показать тикет"
+
+#: NOT FOUND IN SOURCE
+msgid "Grand"
+msgstr ""
+
+#: html/Ticket/Elements/AddWatchers:46 html/User/Elements/DelegateRights:78
+msgid "Group"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Group %1 %2: %3"
+msgstr "Группа %1 %2: %3"
+
+#: html/Admin/Elements/GroupTabs:45 html/Admin/Elements/QueueTabs:57 html/Admin/Elements/SystemTabs:44 html/Admin/Global/index.html:55
+msgid "Group Rights"
+msgstr "Права группы"
+
+#: lib/RT/Group_Overlay.pm:965
+msgid "Group already has member"
+msgstr "Пользователь уже входит в группу"
+
+#: NOT FOUND IN SOURCE
+msgid "Group could not be created."
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:77
+#. ($create_msg)
+msgid "Group could not be created: %1"
+msgstr "�е могу �оздать группу: %1"
+
+#: lib/RT/Group_Overlay.pm:497
+msgid "Group created"
+msgstr "Создана группа"
+
+#: lib/RT/Group_Overlay.pm:1133
+msgid "Group has no such member"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:945 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1429 lib/RT/Ticket_Overlay.pm:1507
+msgid "Group not found"
+msgstr "Группа не найдена"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not found.\\n"
+msgstr "Группа не найдена.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not specified.\\n"
+msgstr "�е задана группа.\\n"
+
+#: html/Admin/Elements/SelectNewGroupMembers:35 html/Admin/Elements/Tabs:35 html/Admin/Groups/Members.html:64 html/Admin/Queues/People.html:83 html/Admin/index.html:32 html/User/Groups/Members.html:67
+msgid "Groups"
+msgstr "Группы"
+
+#: lib/RT/Group_Overlay.pm:971
+msgid "Groups can't be members of their members"
+msgstr "Группы не могут быть членами вход�щих в них пользователей"
+
+#: lib/RT/Interface/CLI.pm:73 lib/RT/Interface/CLI.pm:73
+msgid "Hello!"
+msgstr "Здрав�твуйте!"
+
+#: docs/design_docs/string-extraction-guide.txt:40
+#. ($name)
+msgid "Hello, %1"
+msgstr "Hello, %1"
+
+#: html/Ticket/Elements/ShowHistory:30 html/Ticket/Elements/Tabs:88
+msgid "History"
+msgstr "И�тори�"
+
+#: html/Admin/Elements/ModifyUser:68
+msgid "HomePhone"
+msgstr "HomePhone"
+
+#: html/Elements/Tabs:46
+msgid "Homepage"
+msgstr "Домой"
+
+#: lib/RT/Base.pm:74
+#. (6)
+msgid "I have %quant(%1,concrete mixer)."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
+msgstr "I have [quant,_1,concrete mixer]."
+
+#: html/Ticket/Elements/ShowBasics:27 lib/RT/Tickets_Overlay.pm:1018
+msgid "Id"
+msgstr "Тикет"
+
+#: html/Admin/Users/Modify.html:44 html/User/Prefs.html:39
+msgid "Identity"
+msgstr "Лично�ть"
+
+#: etc/upgrade/2.1.71:86
+msgid "If an approval is rejected, reject the original and delete pending approvals"
+msgstr ""
+
+#: bin/rt-crontool:190
+msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
+msgstr "Е�ли бы �та программа имела у�тановленный бит setgid, то зловредный пользователь мог бы во�пользовать�� �тим дл� получени� админи�тративных полномочий в RT."
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
+msgid "If you've updated anything above, be sure to"
+msgstr "Е�ли вы что-либо изменили, то удо�товерьте�ь, что"
+
+#: lib/RT/Interface/Web.pm:860
+msgid "Illegal value for %1"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:863
+msgid "Immutable field"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:74
+msgid "Include disabled custom fields in listing."
+msgstr ""
+
+#: html/Admin/Queues/index.html:43
+msgid "Include disabled queues in listing."
+msgstr "Показывать отключенные очереди."
+
+#: html/Admin/Users/index.html:47
+msgid "Include disabled users in search."
+msgstr "Показать отключенных пользователей."
+
+#: lib/RT/Tickets_Overlay.pm:1067
+msgid "Initial Priority"
+msgstr "�ачальный приоритет"
+
+#: lib/RT/Ticket_Overlay.pm:1161 lib/RT/Ticket_Overlay.pm:1163
+msgid "InitialPriority"
+msgstr ""
+
+#: lib/RT/ScripAction_Overlay.pm:105
+msgid "Input error"
+msgstr "Ошибка ввода"
+
+#: NOT FOUND IN SOURCE
+msgid "Interest noted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3729
+msgid "Internal Error"
+msgstr "Внутренн�� ошибка"
+
+#: lib/RT/Record.pm:143
+#. ($id->{error_message})
+msgid "Internal Error: %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:644
+msgid "Invalid Group Type"
+msgstr "�еправильный тип группы"
+
+#: lib/RT/Principal_Overlay.pm:128
+msgid "Invalid Right"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Invalid Type"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:865
+msgid "Invalid data"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:438
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr "Владелец от�ут�твует. Замен�ем его на 'nobody'."
+
+#: lib/RT/Scrip_Overlay.pm:134 lib/RT/Template_Overlay.pm:251
+msgid "Invalid queue"
+msgstr "�еверна� очередь"
+
+#: lib/RT/ACE_Overlay.pm:244 lib/RT/ACE_Overlay.pm:253 lib/RT/ACE_Overlay.pm:259 lib/RT/ACE_Overlay.pm:270 lib/RT/ACE_Overlay.pm:275
+msgid "Invalid right"
+msgstr "�еверные права"
+
+#: lib/RT/Record.pm:118
+#. ($key)
+msgid "Invalid value for %1"
+msgstr "�еправильное значение дл� %1"
+
+#: lib/RT/Ticket_Overlay.pm:3367
+msgid "Invalid value for custom field"
+msgstr "�еправильное значение дл� �того пол�"
+
+#: lib/RT/Ticket_Overlay.pm:345
+msgid "Invalid value for status"
+msgstr "Такого �тату�а не бывает"
+
+#: bin/rt-crontool:191
+msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
+msgstr "Обратите внимание, что обычные пользователи не имеют права запу�кать �ту программу."
+
+#: bin/rt-crontool:192
+msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
+msgstr "Предполагает��, что дл� запу�ка �той программы вы должны �оздать учетную запи�ь пользовател� Unix � корректными у�тановками групп и до�тупом к RT."
+
+#: bin/rt-crontool:163
+msgid "It takes several arguments:"
+msgstr "Она требует не�колько параметров:"
+
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
+msgstr "Тикеты, ожидающие моей визы"
+
+#: lib/RT/Date.pm:411
+msgid "Jan."
+msgstr "Янв."
+
+#: NOT FOUND IN SOURCE
+msgid "January"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "Join or leave this group"
+msgstr ""
+
+#: lib/RT/Date.pm:417
+msgid "Jul."
+msgstr "Июл."
+
+#: NOT FOUND IN SOURCE
+msgid "July"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:99
+msgid "Jumbo"
+msgstr "В�е вме�те"
+
+#: lib/RT/Date.pm:416
+msgid "Jun."
+msgstr "Июн."
+
+#: NOT FOUND IN SOURCE
+msgid "June"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Keyword"
+msgstr "Ключевое �лово"
+
+#: html/Admin/Elements/ModifyUser:52
+msgid "Lang"
+msgstr "Язык"
+
+#: html/Ticket/Elements/Tabs:73
+msgid "Last"
+msgstr "Конец"
+
+#: html/Ticket/Elements/EditDates:38 html/Ticket/Elements/ShowDates:39
+msgid "Last Contact"
+msgstr "Контакт"
+
+#: html/Elements/SelectDateType:29
+msgid "Last Contacted"
+msgstr "Контакт"
+
+#: html/Search/Elements/TicketHeader:41
+msgid "Last Notified"
+msgstr ""
+
+#: html/Elements/SelectDateType:30
+msgid "Last Updated"
+msgstr "Обновлен"
+
+#: NOT FOUND IN SOURCE
+msgid "LastUpdated"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Left"
+msgstr "О�тало�ь"
+
+#: html/Admin/Users/Modify.html:83
+msgid "Let this user access RT"
+msgstr "Разрешить до�туп к RT"
+
+#: html/Admin/Users/Modify.html:87
+msgid "Let this user be granted rights"
+msgstr "Пользователь может иметь права"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting owner to %1 %2"
+msgstr "Ограничиваем владельца %1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting queue to %1 %2"
+msgstr "Ограничиваем очередь дл� %1 %2"
+
+#: lib/RT/Ticket_Overlay.pm:2697
+msgid "Link already exists"
+msgstr "Св�зь уже �уще�твует"
+
+#: lib/RT/Ticket_Overlay.pm:2709
+msgid "Link could not be created"
+msgstr "�е могу �в�зать тикеты"
+
+#: lib/RT/Ticket_Overlay.pm:2717 lib/RT/Ticket_Overlay.pm:2727
+#. ($TransString)
+msgid "Link created (%1)"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2638
+#. ($TransString)
+msgid "Link deleted (%1)"
+msgstr "Удалена �в�зь (%1)"
+
+#: lib/RT/Ticket_Overlay.pm:2644
+msgid "Link not found"
+msgstr "Св�зь не найдена"
+
+#: html/Ticket/ModifyLinks.html:25 html/Ticket/ModifyLinks.html:29
+#. ($Ticket->Id)
+msgid "Link ticket #%1"
+msgstr "Св�зываем тикет #%1"
+
+#: NOT FOUND IN SOURCE
+msgid "Link ticket %1"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:97
+msgid "Links"
+msgstr "Св�зи"
+
+#: html/Admin/Users/Modify.html:114 html/User/Prefs.html:85
+msgid "Location"
+msgstr "Ме�тонахождение"
+
+#: lib/RT.pm:158
+#. ($RT::LogDir)
+msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
+msgstr "�е найден каталог дл� протоколировани� %1 или не до�тупен на запи�ь.\\n RT не может продолжить работу."
+
+#: html/Elements/Header:57
+#. ("<b>".$session{'CurrentUser'}->Name."</b>")
+msgid "Logged in as %1"
+msgstr "Зареги�трирован как %1"
+
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:25 html/Elements/Login:34 html/Elements/Login:45
+msgid "Login"
+msgstr "Логин"
+
+#: html/Elements/Header:54
+msgid "Logout"
+msgstr "Выйти"
+
+#: html/Search/Bulk.html:86
+msgid "Make Owner"
+msgstr "�азначить владельцем"
+
+#: html/Search/Bulk.html:102
+msgid "Make Status"
+msgstr "�азначить �тату�"
+
+#: html/Search/Bulk.html:109
+msgid "Make date Due"
+msgstr "�азначить �рок"
+
+#: html/Search/Bulk.html:110
+msgid "Make date Resolved"
+msgstr "Изменить дату решени�"
+
+#: html/Search/Bulk.html:107
+msgid "Make date Started"
+msgstr "Изменить дату '�ачал��'"
+
+#: html/Search/Bulk.html:106
+msgid "Make date Starts"
+msgstr "Изменить дату '�ачинает��'"
+
+#: html/Search/Bulk.html:108
+msgid "Make date Told"
+msgstr "Изменить дату по�леднего контакта"
+
+#: html/Search/Bulk.html:99
+msgid "Make priority"
+msgstr "�азначить приоритет"
+
+#: html/Search/Bulk.html:100
+msgid "Make queue"
+msgstr "�азначить очередь"
+
+#: html/Search/Bulk.html:98
+msgid "Make subject"
+msgstr "Изменить тему"
+
+#: html/Admin/index.html:33
+msgid "Manage groups and group membership"
+msgstr "�а�тройка групп и их пользователей"
+
+#: html/Admin/index.html:39
+msgid "Manage properties and configuration which apply to all queues"
+msgstr "�а�тройки дл� в�ех очередей"
+
+#: html/Admin/index.html:36
+msgid "Manage queues and queue-specific properties"
+msgstr "�а�тройка очередей и их параметров"
+
+#: html/Admin/index.html:30
+msgid "Manage users and passwords"
+msgstr "�а�тройка пользователей и их паролей"
+
+#: lib/RT/Date.pm:413
+msgid "Mar."
+msgstr "Мар."
+
+#: NOT FOUND IN SOURCE
+msgid "March"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "May"
+msgstr ""
+
+#: lib/RT/Date.pm:415
+msgid "May."
+msgstr "Май"
+
+#: lib/RT/Group_Overlay.pm:982
+msgid "Member added"
+msgstr "Пользователь добавлен в группу"
+
+#: lib/RT/Group_Overlay.pm:1140
+msgid "Member deleted"
+msgstr "Пользователь удален из группы"
+
+#: lib/RT/Group_Overlay.pm:1144
+msgid "Member not deleted"
+msgstr "Пользователь не удален из группы"
+
+#: html/Elements/SelectLinkType:26
+msgid "Member of"
+msgstr "Входит в"
+
+#: NOT FOUND IN SOURCE
+msgid "MemberOf"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:42 html/User/Elements/GroupTabs:42
+msgid "Members"
+msgstr "Пользователи"
+
+#: lib/RT/Ticket_Overlay.pm:2843
+msgid "Merge Successful"
+msgstr "Тикеты у�пешно �клеены"
+
+#: lib/RT/Ticket_Overlay.pm:2804
+msgid "Merge failed. Couldn't set EffectiveId"
+msgstr "Склейка не удала�ь. �е �могла у�тановить идентификатор тикета."
+
+#: html/Ticket/Elements/EditLinks:115
+msgid "Merge into"
+msgstr "Приклеить к"
+
+#: html/Ticket/Update.html:102
+msgid "Message"
+msgstr "Тек�т"
+
+#: lib/RT/Interface/Web.pm:867
+msgid "Missing a primary key?: %1"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:169 html/User/Prefs.html:54
+msgid "Mobile"
+msgstr "Мобильник"
+
+#: html/Admin/Elements/ModifyUser:72
+msgid "MobilePhone"
+msgstr "MobilePhone"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "Modify Access Control List"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Field %1"
+msgstr "Изменение дополнительного пол� %1"
+
+#: html/Admin/Global/CustomFields.html:44 html/Admin/Global/index.html:51
+msgid "Modify Custom Fields which apply to all queues"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "Modify Scrip templates for this queue"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "Modify Scrips for this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify System ACLS"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Template %1"
+msgstr ""
+
+#: html/Admin/Queues/CustomField.html:45
+#. ($QueueObj->Name())
+msgid "Modify a CustomField for queue %1"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:53
+msgid "Modify a CustomField which applies to all queues"
+msgstr ""
+
+#: html/Admin/Queues/Scrip.html:54
+#. ($QueueObj->Name)
+msgid "Modify a scrip for queue %1"
+msgstr "Изменить �крипт дл� очереди %1"
+
+#: html/Admin/Global/Scrip.html:48
+msgid "Modify a scrip which applies to all queues"
+msgstr "Изменение �крипта, который дей�твует дл� в�ех очередей"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify dates for # %1"
+msgstr ""
+
+#: html/Ticket/ModifyDates.html:25 html/Ticket/ModifyDates.html:29
+#. ($TicketObj->Id)
+msgid "Modify dates for #%1"
+msgstr "Изменение дат в тикете #%1"
+
+#: html/Ticket/ModifyDates.html:35
+#. ($TicketObj->Id)
+msgid "Modify dates for ticket # %1"
+msgstr "Изменение дат в тикете #%1"
+
+#: html/Admin/Global/GroupRights.html:25 html/Admin/Global/GroupRights.html:28 html/Admin/Global/index.html:56
+msgid "Modify global group rights"
+msgstr "Изменение глобальных прав группы"
+
+#: html/Admin/Global/GroupRights.html:33
+msgid "Modify global group rights."
+msgstr "Изменение глобальных прав группы"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for groups"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for users"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global scrips"
+msgstr ""
+
+#: html/Admin/Global/UserRights.html:25 html/Admin/Global/UserRights.html:28 html/Admin/Global/index.html:60
+msgid "Modify global user rights"
+msgstr ""
+
+#: html/Admin/Global/UserRights.html:33
+msgid "Modify global user rights."
+msgstr "Изменение глобальных прав пользовател�"
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "Modify group metadata or delete group"
+msgstr ""
+
+#: html/Admin/Groups/GroupRights.html:25 html/Admin/Groups/GroupRights.html:29 html/Admin/Groups/GroupRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify group rights for group %1"
+msgstr "Изменение прав групп дл� группе %1"
+
+#: html/Admin/Queues/GroupRights.html:25 html/Admin/Queues/GroupRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify group rights for queue %1"
+msgstr "Изменение прав групп дл� очереди %1"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "Modify membership roster for this group"
+msgstr ""
+
+#: lib/RT/System.pm:61
+msgid "Modify one's own RT account"
+msgstr ""
+
+#: html/Admin/Queues/People.html:25 html/Admin/Queues/People.html:29
+#. ($QueueObj->Name)
+msgid "Modify people related to queue %1"
+msgstr "Изменение пользователей отно��щих�� к очереди %1"
+
+#: html/Ticket/ModifyPeople.html:25 html/Ticket/ModifyPeople.html:29 html/Ticket/ModifyPeople.html:35
+#. ($Ticket->id)
+#. ($Ticket->Id)
+msgid "Modify people related to ticket #%1"
+msgstr "Изменение пользователей отно��щих�� к тикету #%1"
+
+#: html/Admin/Queues/Scrips.html:44
+#. ($QueueObj->Name)
+msgid "Modify scrips for queue %1"
+msgstr "Изменить �крипты дл� очереди %1"
+
+#: html/Admin/Global/Scrips.html:44 html/Admin/Global/index.html:42
+msgid "Modify scrips which apply to all queues"
+msgstr "Изменение �криптов, которые дей�твуют на в�е очереди"
+
+#: html/Admin/Global/Template.html:25 html/Admin/Global/Template.html:30 html/Admin/Global/Template.html:81 html/Admin/Queues/Template.html:78
+#. (loc($TemplateObj->Name()))
+#. ($TemplateObj->id)
+msgid "Modify template %1"
+msgstr "Изменение шаблона %1"
+
+#: html/Admin/Global/Templates.html:44
+msgid "Modify templates which apply to all queues"
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:87 html/User/Groups/Modify.html:86
+#. ($Group->Name)
+msgid "Modify the group %1"
+msgstr "�а�тройки дл� группы %1"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "Modify the queue watchers"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:236
+#. ($UserObj->Name)
+msgid "Modify the user %1"
+msgstr "�а�тройки дл� пользовател� %1"
+
+#: html/Ticket/ModifyAll.html:37
+#. ($Ticket->Id)
+msgid "Modify ticket # %1"
+msgstr "Изменение тикета # %1"
+
+#: html/Ticket/Modify.html:25 html/Ticket/Modify.html:28 html/Ticket/Modify.html:34
+#. ($TicketObj->Id)
+msgid "Modify ticket #%1"
+msgstr "Изменение тикета # %1"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "Modify tickets"
+msgstr ""
+
+#: html/Admin/Groups/UserRights.html:25 html/Admin/Groups/UserRights.html:29 html/Admin/Groups/UserRights.html:35
+#. ($GroupObj->Name)
+msgid "Modify user rights for group %1"
+msgstr "Изменение прав пользовател� дл� группы %1"
+
+#: html/Admin/Queues/UserRights.html:25 html/Admin/Queues/UserRights.html:29
+#. ($QueueObj->Name)
+msgid "Modify user rights for queue %1"
+msgstr "Изменение прав пользовател� дл� очереди %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify watchers for queue '%1'"
+msgstr "Изменение наблюдателей дл� очереди '%1'"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ModifyACL"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "ModifyOwnMembership"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "ModifyQueueWatchers"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "ModifyScrips"
+msgstr ""
+
+#: lib/RT/System.pm:61
+msgid "ModifySelf"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "ModifyTemplate"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "ModifyTicket"
+msgstr ""
+
+#: lib/RT/Date.pm:388
+msgid "Mon."
+msgstr "Пнд."
+
+#: html/Ticket/Elements/ShowRequestor:42
+#. ($name)
+msgid "More about %1"
+msgstr "Информаци� о %1"
+
+#: html/Admin/Elements/EditCustomFields:61
+msgid "Move down"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:53
+msgid "Move up"
+msgstr ""
+
+#: html/Admin/Elements/SelectSingleOrMultiple:27
+msgid "Multiple"
+msgstr "�е�колько значений"
+
+#: lib/RT/User_Overlay.pm:179
+msgid "Must specify 'Name' attribute"
+msgstr "Вы должны указать Им�"
+
+#: NOT FOUND IN SOURCE
+msgid "My Approvals"
+msgstr "Мои визы"
+
+#: html/Approvals/index.html:25 html/Approvals/index.html:26
+msgid "My approvals"
+msgstr ""
+
+#: html/Admin/Elements/AddCustomFieldValue:26 html/Admin/Elements/EditCustomField:32 html/Admin/Elements/ModifyTemplate:28 html/Admin/Elements/ModifyUser:30 html/Admin/Groups/Modify.html:44 html/Elements/SelectGroups:26 html/Elements/SelectUsers:28 html/User/Groups/Modify.html:44
+msgid "Name"
+msgstr "Им�"
+
+#: lib/RT/User_Overlay.pm:186
+msgid "Name in use"
+msgstr "Им� уже и�пользует��"
+
+#: NOT FOUND IN SOURCE
+msgid "Need approval from system administrator"
+msgstr ""
+
+#: html/Ticket/Elements/ShowDates:52
+msgid "Never"
+msgstr ""
+
+#: html/Elements/Quicksearch:30
+msgid "New"
+msgstr "�овых"
+
+#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:93 html/User/Prefs.html:65
+msgid "New Password"
+msgstr "�овый пароль"
+
+#: etc/initialdata:311 etc/upgrade/2.1.71:16
+msgid "New Pending Approval"
+msgstr ""
+
+#: html/Ticket/Elements/EditLinks:111
+msgid "New Relationships"
+msgstr "�овые �в�зи"
+
+#: html/Ticket/Elements/Tabs:36
+msgid "New Search"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:41 html/Admin/Global/CustomFields.html:39 html/Admin/Queues/CustomField.html:52 html/Admin/Queues/CustomFields.html:40
+msgid "New custom field"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:54 html/User/Elements/GroupTabs:52
+msgid "New group"
+msgstr ""
+
+#: html/SelfService/Prefs.html:32
+msgid "New password"
+msgstr "�овый пароль"
+
+#: lib/RT/User_Overlay.pm:639
+msgid "New password notification sent"
+msgstr "Отправлено �ообщение � новым паролем"
+
+#: html/Admin/Elements/QueueTabs:70
+msgid "New queue"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:63
+msgid "New request"
+msgstr "�овый запро�"
+
+#: html/Admin/Elements/SelectRights:42
+msgid "New rights"
+msgstr "�овые права"
+
+#: html/Admin/Global/Scrip.html:40 html/Admin/Global/Scrips.html:39 html/Admin/Queues/Scrip.html:43 html/Admin/Queues/Scrips.html:53
+msgid "New scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "New search"
+msgstr "�овый пои�к"
+
+#: html/Admin/Global/Template.html:60 html/Admin/Global/Templates.html:39 html/Admin/Queues/Template.html:58 html/Admin/Queues/Templates.html:46
+msgid "New template"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2771
+msgid "New ticket doesn't exist"
+msgstr "�овый тикет не �уще�твует"
+
+#: html/Admin/Elements/UserTabs:52
+msgid "New user"
+msgstr ""
+
+#: html/Admin/Elements/CreateUserCalled:26
+msgid "New user called"
+msgstr "Добавить пользовател� � именем"
+
+#: html/Admin/Queues/People.html:55 html/Ticket/Elements/EditPeople:29
+msgid "New watchers"
+msgstr "�овые наблюдатели"
+
+#: html/Admin/Users/Prefs.html:42
+msgid "New window setting"
+msgstr "�овые на�тройки окна"
+
+#: html/Ticket/Elements/Tabs:69
+msgid "Next"
+msgstr "Вперед"
+
+#: html/Search/Listing.html:48
+msgid "Next page"
+msgstr "Следующа� �траница"
+
+#: html/Admin/Elements/ModifyUser:50
+msgid "NickName"
+msgstr "П�евдоним"
+
+#: html/Admin/Users/Modify.html:63 html/User/Prefs.html:46
+msgid "Nickname"
+msgstr "П�евдоним"
+
+#: html/Admin/Elements/EditCustomField:73 html/Admin/Elements/EditCustomFields:105
+msgid "No CustomField"
+msgstr "�ет такого пол�"
+
+#: html/Admin/Groups/GroupRights.html:84 html/Admin/Groups/UserRights.html:71
+msgid "No Group defined"
+msgstr "�ет такой группы"
+
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:68
+msgid "No Queue defined"
+msgstr "�ет такой очереди"
+
+#: bin/rt-crontool:56
+msgid "No RT user found. Please consult your RT administrator.\\n"
+msgstr "Пользователь RT не найден. Пожалуй�та, обратите�ь к вашему админи�тратору RT.\\n"
+
+#: html/Admin/Global/Template.html:79 html/Admin/Queues/Template.html:76
+msgid "No Template"
+msgstr "Шаблон не определен"
+
+#: bin/rt-commit-handler:764
+msgid "No Ticket specified. Aborting ticket "
+msgstr "Тикет не задан. �ичего не делаем."
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgstr "Тикет не задан. Отмен�ем изменени� тикета\\n\\n"
+
+#: html/Approvals/Elements/Approve:47
+msgid "No action"
+msgstr "�ет дей�тви�"
+
+#: lib/RT/Interface/Web.pm:862
+msgid "No column specified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "No command found\\n"
+msgstr "Команда не найдена\\n"
+
+#: html/Elements/ViewUser:36 html/Ticket/Elements/ShowRequestor:45
+msgid "No comment entered about this user"
+msgstr "Без комментариев"
+
+#: lib/RT/Ticket_Overlay.pm:2189 lib/RT/Ticket_Overlay.pm:2257
+msgid "No correspondence attached"
+msgstr "Пу�тое �ообщение"
+
+#: lib/RT/Action/Generic.pm:150 lib/RT/Condition/Generic.pm:176 lib/RT/Search/ActiveTicketsInQueue.pm:56 lib/RT/Search/Generic.pm:113
+#. (ref $self)
+msgid "No description for %1"
+msgstr "�ет опи�ани� дл� %1"
+
+#: lib/RT/Users_Overlay.pm:151
+msgid "No group specified"
+msgstr "�е указана группа"
+
+#: lib/RT/User_Overlay.pm:857
+msgid "No password set"
+msgstr "От�ут�твует пароль"
+
+#: lib/RT/Queue_Overlay.pm:259
+msgid "No permission to create queues"
+msgstr "У ва� нет права на �оздание очереди"
+
+#: lib/RT/Ticket_Overlay.pm:341
+#. ($QueueObj->Name)
+msgid "No permission to create tickets in the queue '%1'"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:151
+msgid "No permission to create users"
+msgstr "Вы не имеете права �оздавать пользователей"
+
+#: html/SelfService/Display.html:174
+msgid "No permission to display that ticket"
+msgstr "Показ �того тикета запрещен"
+
+#: html/SelfService/Update.html:55
+msgid "No permission to view update ticket"
+msgstr "Запрещен показ изменений �того тикета"
+
+#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1488
+msgid "No principal specified"
+msgstr "Пользователь не указан"
+
+#: html/Admin/Queues/People.html:154 html/Admin/Queues/People.html:164
+msgid "No principals selected."
+msgstr "Пользователи не выбраны."
+
+#: html/Admin/Queues/index.html:35
+msgid "No queues matching search criteria found."
+msgstr "�ичего подход�щего не найдено."
+
+#: html/Admin/Elements/SelectRights:81
+msgid "No rights found"
+msgstr ""
+
+#: html/Admin/Elements/SelectRights:33
+msgid "No rights granted."
+msgstr "�ет прав."
+
+#: html/Search/Bulk.html:149
+msgid "No search to operate on."
+msgstr "�ечего делать."
+
+#: NOT FOUND IN SOURCE
+msgid "No ticket id specified"
+msgstr "�е указан номер тикета"
+
+#: lib/RT/Transaction_Overlay.pm:480 lib/RT/Transaction_Overlay.pm:518
+msgid "No transaction type specified"
+msgstr "�е указан тип транзакции"
+
+#: NOT FOUND IN SOURCE
+msgid "No user or email address specified"
+msgstr ""
+
+#: html/Admin/Users/index.html:36
+msgid "No users matching search criteria found."
+msgstr "�и одного подход�щего пользовател� не найдено."
+
+#: bin/rt-commit-handler:644
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr "�е найден пользователь RT. Обработчик CVS отключен. Обратите�ь к админи�тратору RT.\\n"
+
+#: lib/RT/Interface/Web.pm:859
+msgid "No value sent to _Set!\\n"
+msgstr ""
+
+#: html/Search/Elements/TicketRow:37
+msgid "Nobody"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:864
+msgid "Nonexistant field?"
+msgstr ""
+
+#: html/Elements/Login:99
+msgid "Not logged in"
+msgstr ""
+
+#: html/Elements/Header:59 html/SelfService/Elements/Header:58
+msgid "Not logged in."
+msgstr "�е зареги�трирован."
+
+#: lib/RT/Date.pm:369
+msgid "Not set"
+msgstr "�е у�тановлено"
+
+#: html/NoAuth/Reminder.html:27
+msgid "Not yet implemented."
+msgstr "Еще не реализовано."
+
+#: html/Admin/Groups/Rights.html:25
+msgid "Not yet implemented...."
+msgstr "Еще не реализовано..."
+
+#: html/Approvals/Elements/Approve:50
+msgid "Notes"
+msgstr "Примечание"
+
+#: lib/RT/User_Overlay.pm:642
+msgid "Notification could not be sent"
+msgstr "�е могу ото�лать уведомление"
+
+#: etc/initialdata:94
+msgid "Notify AdminCcs"
+msgstr ""
+
+#: etc/initialdata:90
+msgid "Notify AdminCcs as Comment"
+msgstr ""
+
+#: etc/initialdata:121
+msgid "Notify Other Recipients"
+msgstr ""
+
+#: etc/initialdata:117
+msgid "Notify Other Recipients as Comment"
+msgstr ""
+
+#: etc/initialdata:86
+msgid "Notify Owner"
+msgstr ""
+
+#: etc/initialdata:82
+msgid "Notify Owner as Comment"
+msgstr ""
+
+#: etc/initialdata:313 etc/upgrade/2.1.71:17
+msgid "Notify Owners and AdminCcs of new items pending their approval"
+msgstr ""
+
+#: etc/initialdata:78
+msgid "Notify Requestors"
+msgstr ""
+
+#: etc/initialdata:104
+msgid "Notify Requestors and Ccs"
+msgstr ""
+
+#: etc/initialdata:99
+msgid "Notify Requestors and Ccs as Comment"
+msgstr ""
+
+#: etc/initialdata:113
+msgid "Notify Requestors, Ccs and AdminCcs"
+msgstr ""
+
+#: etc/initialdata:109
+msgid "Notify Requestors, Ccs and AdminCcs as Comment"
+msgstr ""
+
+#: lib/RT/Date.pm:421
+msgid "Nov."
+msgstr "�о�."
+
+#: NOT FOUND IN SOURCE
+msgid "November"
+msgstr ""
+
+#: lib/RT/Record.pm:157
+msgid "Object could not be created"
+msgstr "�е могу �оздать объект"
+
+#: lib/RT/Record.pm:176
+msgid "Object created"
+msgstr "Создан объект"
+
+#: lib/RT/Date.pm:420
+msgid "Oct."
+msgstr "Окт."
+
+#: NOT FOUND IN SOURCE
+msgid "October"
+msgstr ""
+
+#: html/Elements/SelectDateRelation:35
+msgid "On"
+msgstr "�а"
+
+#: etc/initialdata:155
+msgid "On Comment"
+msgstr ""
+
+#: etc/initialdata:148
+msgid "On Correspond"
+msgstr ""
+
+#: etc/initialdata:137
+msgid "On Create"
+msgstr ""
+
+#: etc/initialdata:169
+msgid "On Owner Change"
+msgstr ""
+
+#: etc/initialdata:177
+msgid "On Queue Change"
+msgstr ""
+
+#: etc/initialdata:183
+msgid "On Resolve"
+msgstr ""
+
+#: etc/initialdata:161
+msgid "On Status Change"
+msgstr ""
+
+#: etc/initialdata:142
+msgid "On Transaction"
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:50
+#. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
+msgid "Only show approvals for requests created after %1"
+msgstr "Показывать визы только дл� запро�ов �озданных по�ле %1"
+
+#: html/Approvals/Elements/PendingMyApproval:48
+#. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
+msgid "Only show approvals for requests created before %1"
+msgstr "Показывать визы только дл� запро�ов �озданных до %1"
+
+#: html/Elements/Quicksearch:31
+msgid "Open"
+msgstr "Открытых"
+
+#: html/Ticket/Elements/Tabs:136
+msgid "Open it"
+msgstr "Открыть"
+
+#: html/SelfService/Elements/Tabs:57
+msgid "Open requests"
+msgstr "Открыть запро�ы"
+
+#: html/Admin/Users/Prefs.html:41
+msgid "Open tickets (from listing) in a new window"
+msgstr "Открыть тикеты (из �пи�ка) в новом окне"
+
+#: html/Admin/Users/Prefs.html:40
+msgid "Open tickets (from listing) in another window"
+msgstr "Открыть тикеты (из �пи�ка) в другом окне"
+
+#: etc/initialdata:133
+msgid "Open tickets on correspondence"
+msgstr ""
+
+#: html/Search/Elements/PickRestriction:101
+msgid "Ordering and sorting"
+msgstr "Пор�док и �ортировка"
+
+#: html/Admin/Elements/ModifyUser:46 html/Admin/Users/Modify.html:117 html/Elements/SelectUsers:29 html/User/Prefs.html:86
+msgid "Organization"
+msgstr "Организаци�"
+
+#: html/Approvals/Elements/Approve:34
+#. ($approving->Id, $approving->Subject)
+msgid "Originating ticket: #%1"
+msgstr ""
+
+#: html/Admin/Elements/ModifyQueue:55 html/Admin/Queues/Modify.html:69
+msgid "Over time, priority moves toward"
+msgstr "Со временем подн�ть приоритет до"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "Own tickets"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "OwnTicket"
+msgstr ""
+
+#: etc/initialdata:38 html/Elements/MyRequests:32 html/SelfService/Elements/MyRequests:30 html/Ticket/Create.html:48 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/EditPeople:44 html/Ticket/Elements/ShowPeople:27 html/Ticket/Update.html:63 lib/RT/ACE_Overlay.pm:86 lib/RT/Tickets_Overlay.pm:1244
+msgid "Owner"
+msgstr "Владелец"
+
+#: lib/RT/Ticket_Overlay.pm:3004
+#. ($OldOwnerObj->Name,  $NewOwnerObj->Name)
+msgid "Owner changed from %1 to %2"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:584
+#. ($Old->Name , $New->Name)
+msgid "Owner forcibly changed from %1 to %2"
+msgstr "Владелец �илой изменен � %1 на %2"
+
+#: html/Search/Elements/PickRestriction:31
+msgid "Owner is"
+msgstr "Владелец"
+
+#: html/Admin/Users/Modify.html:174 html/User/Prefs.html:56
+msgid "Pager"
+msgstr "Пейджер"
+
+#: html/Admin/Elements/ModifyUser:74
+msgid "PagerPhone"
+msgstr "Телефон пейджера"
+
+#: NOT FOUND IN SOURCE
+msgid "Parent"
+msgstr ""
+
+#: html/Ticket/Create.html:182 html/Ticket/Elements/EditLinks:127 html/Ticket/Elements/EditLinks:58 html/Ticket/Elements/ShowLinks:43
+msgid "Parents"
+msgstr "Предки"
+
+#: html/Elements/Login:43 html/User/Prefs.html:61
+msgid "Password"
+msgstr "Пароль"
+
+#: html/NoAuth/Reminder.html:25
+msgid "Password Reminder"
+msgstr "Под�казка к паролю"
+
+#: lib/RT/User_Overlay.pm:168 lib/RT/User_Overlay.pm:860
+msgid "Password too short"
+msgstr "Пароль �лишком короткий"
+
+#: html/Admin/Users/Modify.html:291 html/User/Prefs.html:172
+#. (loc_fuzzy($msg))
+msgid "Password: %1"
+msgstr "Пароль: %1"
+
+#: html/Ticket/Elements/ShowSummary:43 html/Ticket/Elements/Tabs:96 html/Ticket/ModifyAll.html:51
+msgid "People"
+msgstr "Люди"
+
+#: etc/initialdata:126
+msgid "Perform a user-defined action"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:231 lib/RT/ACE_Overlay.pm:237 lib/RT/ACE_Overlay.pm:563 lib/RT/ACE_Overlay.pm:573 lib/RT/ACE_Overlay.pm:583 lib/RT/ACE_Overlay.pm:648 lib/RT/CurrentUser.pm:83 lib/RT/CurrentUser.pm:92 lib/RT/CustomField_Overlay.pm:445 lib/RT/CustomField_Overlay.pm:451 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1099 lib/RT/Group_Overlay.pm:1108 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1163 lib/RT/Group_Overlay.pm:1169 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:904 lib/RT/Group_Overlay.pm:908 lib/RT/Group_Overlay.pm:921 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:931 lib/RT/Scrip_Overlay.pm:126 lib/RT/Scrip_Overlay.pm:137 lib/RT/Scrip_Overlay.pm:197 lib/RT/Scrip_Overlay.pm:430 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:88 lib/RT/Template_Overlay.pm:94 lib/RT/Ticket_Overlay.pm:1341 lib/RT/Ticket_Overlay.pm:1351 lib/RT/Ticket_Overlay.pm:1365 lib/RT/Ticket_Overlay.pm:1518 lib/RT/Ticket_Overlay.pm:1527 lib/RT/Ticket_Overlay.pm:1540 lib/RT/Ticket_Overlay.pm:1875 lib/RT/Ticket_Overlay.pm:2013 lib/RT/Ticket_Overlay.pm:2177 lib/RT/Ticket_Overlay.pm:2244 lib/RT/Ticket_Overlay.pm:2596 lib/RT/Ticket_Overlay.pm:2668 lib/RT/Ticket_Overlay.pm:2762 lib/RT/Ticket_Overlay.pm:2777 lib/RT/Ticket_Overlay.pm:2910 lib/RT/Ticket_Overlay.pm:3139 lib/RT/Ticket_Overlay.pm:3337 lib/RT/Ticket_Overlay.pm:3499 lib/RT/Ticket_Overlay.pm:3551 lib/RT/Ticket_Overlay.pm:3716 lib/RT/Transaction_Overlay.pm:468 lib/RT/Transaction_Overlay.pm:475 lib/RT/Transaction_Overlay.pm:504 lib/RT/Transaction_Overlay.pm:511 lib/RT/User_Overlay.pm:1334 lib/RT/User_Overlay.pm:562 lib/RT/User_Overlay.pm:597 lib/RT/User_Overlay.pm:853 lib/RT/User_Overlay.pm:941
+msgid "Permission Denied"
+msgstr "В до�тупе отказано"
+
+#: html/User/Elements/Tabs:35
+msgid "Personal Groups"
+msgstr ""
+
+#: html/User/Groups/index.html:30 html/User/Groups/index.html:40
+msgid "Personal groups"
+msgstr "Личные группы"
+
+#: html/User/Elements/DelegateRights:37
+msgid "Personal groups:"
+msgstr "Личные группы:"
+
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:49
+msgid "Phone numbers"
+msgstr "�омера телефонов"
+
+#: html/Admin/Users/Rights.html:25
+msgid "Placeholder"
+msgstr "Заполнитель"
+
+#: NOT FOUND IN SOURCE
+msgid "Pref"
+msgstr ""
+
+#: html/Elements/Header:52 html/Elements/Tabs:55 html/SelfService/Prefs.html:25 html/User/Prefs.html:25 html/User/Prefs.html:28
+msgid "Preferences"
+msgstr "Предпочтени�"
+
+#: NOT FOUND IN SOURCE
+msgid "Prefs"
+msgstr "Предпочтени�"
+
+#: lib/RT/Action/Generic.pm:160
+msgid "Prepare Stubbed"
+msgstr "Подготовка не реализована"
+
+#: html/Ticket/Elements/Tabs:61
+msgid "Prev"
+msgstr "�азад"
+
+#: html/Search/Listing.html:44
+msgid "Previous page"
+msgstr "Предыдуща� �траница"
+
+#: NOT FOUND IN SOURCE
+msgid "Pri"
+msgstr "Приоритет"
+
+#: lib/RT/ACE_Overlay.pm:133 lib/RT/ACE_Overlay.pm:208 lib/RT/ACE_Overlay.pm:552
+#. ($args{'PrincipalId'})
+msgid "Principal %1 not found."
+msgstr ""
+
+#: html/Search/Elements/PickRestriction:54 html/SelfService/Display.html:76 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:54 html/Ticket/Elements/ShowBasics:39 lib/RT/Tickets_Overlay.pm:1042
+msgid "Priority"
+msgstr "Приоритет"
+
+#: html/Admin/Elements/ModifyQueue:51 html/Admin/Queues/Modify.html:65
+msgid "Priority starts at"
+msgstr "Приоритет начинает�� �"
+
+#: etc/initialdata:25
+msgid "Privileged"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:271 html/User/Prefs.html:163
+#. (loc_fuzzy($msg))
+msgid "Privileged status: %1"
+msgstr "Со�то�ние полномочий: %1"
+
+#: html/Admin/Users/index.html:62
+msgid "Privileged users"
+msgstr "Полномочные пользователи"
+
+#: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
+msgid "Pseudogroup for internal use"
+msgstr ""
+
+#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Elements/Quicksearch:29 html/Search/Elements/PickRestriction:46 html/SelfService/Create.html:35 html/SelfService/Display.html:68 html/Ticket/Create.html:38 html/Ticket/Elements/EditBasics:64 html/Ticket/Elements/ShowBasics:43 html/User/Elements/DelegateRights:80 lib/RT/Tickets_Overlay.pm:883
+msgid "Queue"
+msgstr "Очередь"
+
+#: html/Admin/Queues/CustomField.html:42 html/Admin/Queues/Scrip.html:50 html/Admin/Queues/Scrips.html:46 html/Admin/Queues/Templates.html:43
+#. ($Queue)
+#. ($id)
+msgid "Queue %1 not found"
+msgstr "�е найдена очередь %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue '%1' not found\\n"
+msgstr "�е найдена очередь '%1'\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Keyword Selections"
+msgstr ""
+
+#: html/Admin/Elements/ModifyQueue:31 html/Admin/Queues/Modify.html:43
+msgid "Queue Name"
+msgstr "Им� очереди"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Scrips"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:263
+msgid "Queue already exists"
+msgstr "Очередь уже �уще�твует"
+
+#: lib/RT/Queue_Overlay.pm:272 lib/RT/Queue_Overlay.pm:278
+msgid "Queue could not be created"
+msgstr "�е могу �оздать очередь"
+
+#: html/Ticket/Create.html:209
+msgid "Queue could not be loaded."
+msgstr "�е могу загрузить очередь"
+
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:282
+msgid "Queue created"
+msgstr "Создана очередь"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue is not specified."
+msgstr ""
+
+#: html/SelfService/Display.html:129
+msgid "Queue not found"
+msgstr "�ет такой очереди"
+
+#: html/Admin/Elements/Tabs:38 html/Admin/index.html:35
+msgid "Queues"
+msgstr "Очереди"
+
+#: html/Elements/Login:34
+#. ($RT::VERSION)
+msgid "RT %1"
+msgstr "RT %1"
+
+#: docs/design_docs/string-extraction-guide.txt:70
+#. ($RT::VERSION, $RT::rtname)
+msgid "RT %1 for %2"
+msgstr "RT %1 дл� %2"
+
+#: html/Elements/Footer:32
+#. ($RT::VERSION)
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr "RT %1 от <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr ""
+
+#: html/Admin/index.html:25 html/Admin/index.html:26
+msgid "RT Administration"
+msgstr "�а�тройка RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Authentication error."
+msgstr "Ошибка реги�трации в RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Bounce: %1"
+msgstr "Пи�ьмо возвращено RT: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Configuration error"
+msgstr "Ошибка конфигурации RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Critical error. Message not recorded!"
+msgstr "Критиче�ка� ошибка RT: Сообщение не было �охранено!"
+
+#: html/Elements/Error:41 html/SelfService/Error.html:41
+msgid "RT Error"
+msgstr "Ошибка RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Received mail (%1) from itself."
+msgstr "RT получил �вое �об�твенное �ообщение (%1)"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Recieved mail (%1) from itself."
+msgstr ""
+
+#: html/SelfService/Closed.html:25
+msgid "RT Self Service / Closed Tickets"
+msgstr "Самооб�луживание RT / Закрытые тикеты"
+
+#: html/index.html:25 html/index.html:28
+msgid "RT at a glance"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't authenticate you"
+msgstr "RT не может зареги�трировать ва�"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find requestor via its external database lookup"
+msgstr "RT не �мог найти про�ител� во внешней базе данных"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find the queue: %1"
+msgstr "RT не �мог найти очередь: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't validate this PGP signature. \\n"
+msgstr "RT не �мог проверить �ту подпи�ь PGP. \\n"
+
+#: html/Elements/PageLayout:26
+#. ($RT::rtname)
+msgid "RT for %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT has proccessed your commands"
+msgstr "RT выполнил ваши команды"
+
+#: html/Elements/Login:83
+#. ('2003')
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "В�е права на RT защищены и охран�ют�� законом.  &copy; 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  ПО ра�про�тран�ет�� под <a href=\"http://www.gnu.org/copyleft/gpl.html\">Стандартной Обще�твенной Лицензией GNU Вер�ии 2.</a>"
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT thinks this message may be a bounce"
+msgstr "RT �читает, что �то �ообщение может быть возвратом"
+
+#: NOT FOUND IN SOURCE
+msgid "RT will process this message as if it were unsigned.\\n"
+msgstr "RT будет обрабатывать �то �ообщение как неподпи�анное.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+msgstr "Командный режим RT требует и�пользовани� подпи�и .PGP. Вы либо не подпи�али �ообщение, либо ваша подпи�ь не может быть проверена."
+
+#: html/Admin/Users/Modify.html:58 html/Admin/Users/Prefs.html:52 html/User/Prefs.html:44
+msgid "Real Name"
+msgstr "Им�"
+
+#: html/Admin/Elements/ModifyUser:48
+msgid "RealName"
+msgstr "Им�"
+
+#: html/Ticket/Create.html:185 html/Ticket/Elements/EditLinks:139 html/Ticket/Elements/EditLinks:94 html/Ticket/Elements/ShowLinks:63
+msgid "Referred to by"
+msgstr "�а него ��ылают��"
+
+#: html/Elements/SelectLinkType:28 html/Ticket/Create.html:184 html/Ticket/Elements/EditLinks:135 html/Ticket/Elements/EditLinks:80 html/Ticket/Elements/ShowLinks:55
+msgid "Refers to"
+msgstr "С�ылает�� на"
+
+#: NOT FOUND IN SOURCE
+msgid "RefersTo"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Refine"
+msgstr "Улучшить"
+
+#: html/Search/Elements/PickRestriction:27
+msgid "Refine search"
+msgstr "Улучшить пои�к"
+
+#: html/Elements/Refresh:36
+#. ($value/60)
+msgid "Refresh this page every %1 minutes."
+msgstr "Обновл�ть �ту �траницу каждые %1 минут."
+
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:60 html/Ticket/ModifyAll.html:57
+msgid "Relationships"
+msgstr "Св�зи"
+
+#: html/Search/Bulk.html:93
+msgid "Remove AdminCc"
+msgstr "Удалить админи�тративную копию"
+
+#: html/Search/Bulk.html:91
+msgid "Remove Cc"
+msgstr "Удалить копию"
+
+#: html/Search/Bulk.html:89
+msgid "Remove Requestor"
+msgstr "Удалить про�ител�"
+
+#: html/Ticket/Elements/ShowTransaction:173 html/Ticket/Elements/Tabs:122
+msgid "Reply"
+msgstr "Ответить"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "Reply to tickets"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "ReplyToTicket"
+msgstr ""
+
+#: etc/initialdata:44 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:87
+msgid "Requestor"
+msgstr "Про�итель"
+
+#: html/Search/Elements/PickRestriction:38
+msgid "Requestor email address"
+msgstr "Email про�ител�"
+
+#: NOT FOUND IN SOURCE
+msgid "Requestor(s)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RequestorAddresses"
+msgstr ""
+
+#: html/SelfService/Create.html:43 html/SelfService/Display.html:42 html/Ticket/Create.html:56 html/Ticket/Elements/EditPeople:48 html/Ticket/Elements/ShowPeople:31
+msgid "Requestors"
+msgstr "Про�ители"
+
+#: html/Admin/Elements/ModifyQueue:61 html/Admin/Queues/Modify.html:75
+msgid "Requests should be due in"
+msgstr "Запро�ы должны быть обработаны за"
+
+#: html/Elements/Submit:62
+msgid "Reset"
+msgstr "Очи�тить"
+
+#: html/Admin/Users/Modify.html:159 html/User/Prefs.html:50
+msgid "Residence"
+msgstr "Домашний"
+
+#: html/Ticket/Elements/Tabs:132
+msgid "Resolve"
+msgstr "Закрыть"
+
+#: html/Ticket/Update.html:133
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Resolve ticket #%1 (%2)"
+msgstr ""
+
+#: etc/initialdata:302 html/Elements/SelectDateType:28 lib/RT/Ticket_Overlay.pm:1170
+msgid "Resolved"
+msgstr "Закрыт"
+
+#: html/Search/Bulk.html:123 html/Ticket/ModifyAll.html:73 html/Ticket/Update.html:73
+msgid "Response to requestors"
+msgstr "Ответ про�ител�м"
+
+#: html/Elements/ListActions:26
+msgid "Results"
+msgstr "Отчет"
+
+#: html/Search/Elements/PickRestriction:105
+msgid "Results per page"
+msgstr "Тикетов на �траницу"
+
+#: html/Admin/Elements/ModifyUser:33 html/Admin/Users/Modify.html:100 html/User/Prefs.html:72
+msgid "Retype Password"
+msgstr "Повторите пароль"
+
+#: NOT FOUND IN SOURCE
+msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+msgstr "Право %1 не найдено дл� %2  %3 в рамках %4 (%5)\\n"
+
+#: lib/RT/ACE_Overlay.pm:613
+msgid "Right Delegated"
+msgstr "Право делегировано"
+
+#: lib/RT/ACE_Overlay.pm:303
+msgid "Right Granted"
+msgstr "Право выдано"
+
+#: lib/RT/ACE_Overlay.pm:161
+msgid "Right Loaded"
+msgstr "Право загружено"
+
+#: lib/RT/ACE_Overlay.pm:678 lib/RT/ACE_Overlay.pm:693
+msgid "Right could not be revoked"
+msgstr "Право не может быть отобрано"
+
+#: html/User/Delegation.html:64
+msgid "Right not found"
+msgstr "Право не найдено"
+
+#: lib/RT/ACE_Overlay.pm:543 lib/RT/ACE_Overlay.pm:638
+msgid "Right not loaded."
+msgstr "Право не загружено"
+
+#: lib/RT/ACE_Overlay.pm:689
+msgid "Right revoked"
+msgstr "Право отобрано"
+
+#: html/Admin/Elements/UserTabs:41
+msgid "Rights"
+msgstr "Права"
+
+#: lib/RT/Interface/Web.pm:758
+#. ($object_type)
+msgid "Rights could not be granted for %1"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:791
+#. ($object_type)
+msgid "Rights could not be revoked for %1"
+msgstr ""
+
+#: html/Admin/Global/GroupRights.html:51 html/Admin/Queues/GroupRights.html:52
+msgid "Roles"
+msgstr "П�евдо-группы"
+
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr ""
+
+#: lib/RT/Date.pm:393
+msgid "Sat."
+msgstr "Суб."
+
+#: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
+msgid "Save Changes"
+msgstr "Сохранить изменени�"
+
+#: html/Ticket/ModifyLinks.html:39
+msgid "Save changes"
+msgstr "Сохранить изменени�"
+
+#: html/Admin/Global/Scrip.html:49
+#. ($ARGS{'id'})
+msgid "Scrip #%1"
+msgstr ""
+
+#: lib/RT/Scrip_Overlay.pm:176
+msgid "Scrip Created"
+msgstr "Создан �крипт"
+
+#: html/Admin/Elements/EditScrips:84
+msgid "Scrip deleted"
+msgstr "Удален �крипт"
+
+#: html/Admin/Elements/QueueTabs:46 html/Admin/Elements/SystemTabs:33 html/Admin/Global/index.html:41
+msgid "Scrips"
+msgstr "Скрипты"
+
+#: NOT FOUND IN SOURCE
+msgid "Scrips for %1\\n"
+msgstr "Скрипты дл� %1\\n"
+
+#: html/Admin/Queues/Scrips.html:33
+msgid "Scrips which apply to all queues"
+msgstr "Скрипты, которые дей�твуют дл� в�ех очередей"
+
+#: html/Elements/SimpleSearch:27 html/Search/Elements/PickRestriction:126 html/Ticket/Elements/Tabs:159
+msgid "Search"
+msgstr "Пои�к"
+
+#: NOT FOUND IN SOURCE
+msgid "Search Criteria"
+msgstr "Параметры пои�ка"
+
+#: html/Approvals/Elements/PendingMyApproval:39
+msgid "Search for approvals"
+msgstr "И�кать визы"
+
+#: bin/rt-crontool:188
+msgid "Security:"
+msgstr "Безопа�но�ть:"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "SeeQueue"
+msgstr ""
+
+#: html/Admin/Groups/index.html:40
+msgid "Select a group"
+msgstr "Выбор группы"
+
+#: NOT FOUND IN SOURCE
+msgid "Select a queue"
+msgstr "Выбор очереди"
+
+#: html/Admin/Users/index.html:25 html/Admin/Users/index.html:28
+msgid "Select a user"
+msgstr "Выбор пользовател�"
+
+#: html/Admin/Global/CustomField.html:38 html/Admin/Global/CustomFields.html:36
+msgid "Select custom field"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:52 html/User/Elements/GroupTabs:50
+msgid "Select group"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:355
+msgid "Select multiple values"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:352
+msgid "Select one value"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:67
+msgid "Select queue"
+msgstr ""
+
+#: html/Admin/Global/Scrip.html:37 html/Admin/Global/Scrips.html:36 html/Admin/Queues/Scrip.html:40 html/Admin/Queues/Scrips.html:50
+msgid "Select scrip"
+msgstr ""
+
+#: html/Admin/Global/Template.html:57 html/Admin/Global/Templates.html:36 html/Admin/Queues/Template.html:55
+msgid "Select template"
+msgstr ""
+
+#: html/Admin/Elements/UserTabs:49
+msgid "Select user"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "SelectMultiple"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectSingle"
+msgstr ""
+
+#: html/SelfService/index.html:25
+msgid "Self Service"
+msgstr "Самооб�луживание"
+
+#: etc/initialdata:114
+msgid "Send mail to all watchers"
+msgstr ""
+
+#: etc/initialdata:110
+msgid "Send mail to all watchers as a \"comment\""
+msgstr ""
+
+#: etc/initialdata:105
+msgid "Send mail to requestors and Ccs"
+msgstr ""
+
+#: etc/initialdata:100
+msgid "Send mail to requestors and Ccs as a comment"
+msgstr ""
+
+#: etc/initialdata:79
+msgid "Sends a message to the requestors"
+msgstr ""
+
+#: etc/initialdata:118 etc/initialdata:122
+msgid "Sends mail to explicitly listed Ccs and Bccs"
+msgstr ""
+
+#: etc/initialdata:95
+msgid "Sends mail to the administrative Ccs"
+msgstr ""
+
+#: etc/initialdata:91
+msgid "Sends mail to the administrative Ccs as a comment"
+msgstr ""
+
+#: etc/initialdata:83 etc/initialdata:87
+msgid "Sends mail to the owner"
+msgstr ""
+
+#: lib/RT/Date.pm:419
+msgid "Sep."
+msgstr "Сен."
+
+#: NOT FOUND IN SOURCE
+msgid "September"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Show Results"
+msgstr "И�кать"
+
+#: html/Approvals/Elements/PendingMyApproval:44
+msgid "Show approved requests"
+msgstr "Показать завизированные запро�ы"
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show basics"
+msgstr "Показать главное"
+
+#: html/Approvals/Elements/PendingMyApproval:45
+msgid "Show denied requests"
+msgstr "Показать отвергнутые запро�ы"
+
+#: html/Ticket/Create.html:144 html/Ticket/Create.html:34
+msgid "Show details"
+msgstr "Показать в�е"
+
+#: html/Approvals/Elements/PendingMyApproval:43
+msgid "Show pending requests"
+msgstr "Показать ожидающие запро�ы"
+
+#: html/Approvals/Elements/PendingMyApproval:46
+msgid "Show requests awaiting other approvals"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "Show ticket private commentary"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "Show ticket summaries"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "ShowACL"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "ShowScrips"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "ShowTemplate"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "ShowTicket"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "ShowTicketComments"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Sign up as a ticket Requestor or ticket or queue Cc"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "Sign up as a ticket or queue AdminCc"
+msgstr ""
+
+#: html/Admin/Elements/ModifyUser:39 html/Admin/Users/Modify.html:191 html/Admin/Users/Prefs.html:32 html/SelfService/Prefs.html:37 html/User/Prefs.html:112
+msgid "Signature"
+msgstr "Подпи�ь"
+
+#: html/SelfService/Elements/Header:52
+#. ($session{'CurrentUser'}->Name)
+msgid "Signed in as %1"
+msgstr ""
+
+#: html/Admin/Elements/SelectSingleOrMultiple:26
+msgid "Single"
+msgstr "Одно значение"
+
+#: html/Elements/Header:51
+msgid "Skip Menu"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFieldValues:31
+msgid "Sort key"
+msgstr "Ключ дл� �ортировки"
+
+#: html/Search/Elements/PickRestriction:109
+msgid "Sort results by"
+msgstr "Сортировать по полю"
+
+#: html/Admin/Elements/AddCustomFieldValue:25
+msgid "SortOrder"
+msgstr "Пор�док �ортировки"
+
+#: NOT FOUND IN SOURCE
+msgid "Stalled"
+msgstr "Отложенных"
+
+#: NOT FOUND IN SOURCE
+msgid "Start page"
+msgstr "�ачальна� �траница"
+
+#: html/Elements/SelectDateType:27 html/Ticket/Elements/EditDates:32 html/Ticket/Elements/ShowDates:35
+msgid "Started"
+msgstr "�ачал��"
+
+#: NOT FOUND IN SOURCE
+msgid "Started date '%1' could not be parsed"
+msgstr "�е могу разобрать дату '�ачал��': '%1'"
+
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:27 html/Ticket/Elements/ShowDates:31
+msgid "Starts"
+msgstr "�ачнет��"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts By"
+msgstr "Запу�ки"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts date '%1' could not be parsed"
+msgstr "�е могу разобрать дату 'Запу�ки': '%1'"
+
+#: html/Admin/Elements/ModifyUser:82 html/Admin/Users/Modify.html:138 html/User/Prefs.html:94
+msgid "State"
+msgstr "Со�то�ние"
+
+#: html/Elements/MyRequests:31 html/Elements/MyTickets:31 html/Search/Elements/PickRestriction:74 html/SelfService/Display.html:59 html/SelfService/Elements/MyRequests:29 html/SelfService/Update.html:31 html/Ticket/Create.html:42 html/Ticket/Elements/EditBasics:38 html/Ticket/Elements/ShowBasics:31 html/Ticket/Update.html:60 lib/RT/Ticket_Overlay.pm:1164 lib/RT/Tickets_Overlay.pm:908
+msgid "Status"
+msgstr "Стату�"
+
+#: etc/initialdata:288
+msgid "Status Change"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:530
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
+msgid "Status changed from %1 to %2"
+msgstr "Стату� изменен � %1 на %2"
+
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:147
+msgid "Steal"
+msgstr "Отобрать"
+
+#: lib/RT/Transaction_Overlay.pm:589
+#. ($Old->Name)
+msgid "Stolen from %1 "
+msgstr "Отобран у %1"
+
+#: html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Search/Bulk.html:126 html/Search/Elements/PickRestriction:43 html/SelfService/Create.html:59 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:35 html/Ticket/Create.html:84 html/Ticket/Elements/EditBasics:28 html/Ticket/ModifyAll.html:79 html/Ticket/Update.html:77 lib/RT/Ticket_Overlay.pm:1160 lib/RT/Tickets_Overlay.pm:987
+msgid "Subject"
+msgstr "Тема"
+
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/Transaction_Overlay.pm:611
+#. ($self->Data)
+msgid "Subject changed to %1"
+msgstr ""
+
+#: html/Elements/Submit:59
+msgid "Submit"
+msgstr "Готово"
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:749
+msgid "Succeeded"
+msgstr ""
+
+#: lib/RT/Date.pm:394
+msgid "Sun."
+msgstr "В�к."
+
+#: lib/RT/System.pm:54
+msgid "SuperUser"
+msgstr ""
+
+#: html/User/Elements/DelegateRights:77
+msgid "System"
+msgstr ""
+
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:567 lib/RT/Interface/Web.pm:757 lib/RT/Interface/Web.pm:790
+msgid "System Error"
+msgstr "Ошибка �и�темы"
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. Right not granted."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. right not granted"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:616
+msgid "System error. Right not delegated."
+msgstr "Ошибка �и�темы. Право не было делегировано."
+
+#: lib/RT/ACE_Overlay.pm:146 lib/RT/ACE_Overlay.pm:223 lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:898
+msgid "System error. Right not granted."
+msgstr "Ошибка �и�темы. Право не было выдано."
+
+#: NOT FOUND IN SOURCE
+msgid "System error. Unable to grant rights."
+msgstr ""
+
+#: html/Admin/Global/GroupRights.html:35 html/Admin/Groups/GroupRights.html:37 html/Admin/Queues/GroupRights.html:36
+msgid "System groups"
+msgstr "Си�темные группы"
+
+#: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
+msgid "SystemRolegroup for internal use"
+msgstr ""
+
+#: lib/RT/CurrentUser.pm:320
+msgid "TEST_STRING"
+msgstr "TEST_STRING"
+
+#: html/Ticket/Elements/Tabs:143
+msgid "Take"
+msgstr "Вз�ть"
+
+#: lib/RT/Transaction_Overlay.pm:575
+msgid "Taken"
+msgstr "Вз�т"
+
+#: html/Admin/Elements/EditScrip:81
+msgid "Template"
+msgstr "Шаблон"
+
+#: html/Admin/Global/Template.html:91 html/Admin/Queues/Template.html:90
+#. ($TemplateObj->Id())
+msgid "Template #%1"
+msgstr ""
+
+#: html/Admin/Elements/EditTemplates:89
+msgid "Template deleted"
+msgstr ""
+
+#: lib/RT/Scrip_Overlay.pm:153
+msgid "Template not found"
+msgstr "Шаблон не найден"
+
+#: NOT FOUND IN SOURCE
+msgid "Template not found\\n"
+msgstr "Шаблон не найден\\n"
+
+#: lib/RT/Template_Overlay.pm:347
+msgid "Template parsed"
+msgstr "Шаблон обработан"
+
+#: html/Admin/Elements/QueueTabs:49 html/Admin/Elements/SystemTabs:36 html/Admin/Global/index.html:45
+msgid "Templates"
+msgstr "Шаблоны"
+
+#: NOT FOUND IN SOURCE
+msgid "Templates for %1\\n"
+msgstr "Шаблоны дл� %1\\n"
+
+#: lib/RT/Interface/Web.pm:858
+msgid "That is already the current value"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:178
+msgid "That is not a value for this custom field"
+msgstr "Это поле не может иметь такого значени�"
+
+#: lib/RT/Ticket_Overlay.pm:1886
+msgid "That is the same value"
+msgstr "Значение не изменило�ь"
+
+#: lib/RT/Queue_Overlay.pm:633
+#. ($args{'Type'})
+msgid "That principal is already a %1 for this queue"
+msgstr "Этот пользователь уже %1 дл� �той очереди"
+
+#: lib/RT/Ticket_Overlay.pm:1434
+#. ($self->loc($args{'Type'}))
+msgid "That principal is already a %1 for this ticket"
+msgstr "Этот пользователь уже %1 дл� �того тикета"
+
+#: lib/RT/Queue_Overlay.pm:732
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this queue"
+msgstr "Этот пользователь не %1 �той очереди"
+
+#: lib/RT/Ticket_Overlay.pm:1551
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this ticket"
+msgstr "Этот пользователь не %1 �тому тикету"
+
+#: lib/RT/Ticket_Overlay.pm:1882
+msgid "That queue does not exist"
+msgstr "Этой очереди не �уще�твует"
+
+#: lib/RT/Ticket_Overlay.pm:3143
+msgid "That ticket has unresolved dependencies"
+msgstr "Этот тикет имеет неразрешенные зави�имо�ти"
+
+#: lib/RT/ACE_Overlay.pm:288 lib/RT/ACE_Overlay.pm:597
+msgid "That user already has that right"
+msgstr "Пользователь уже имеет �то право"
+
+#: lib/RT/Ticket_Overlay.pm:2952
+msgid "That user already owns that ticket"
+msgstr "Пользователь уже владеет �тим тикетом"
+
+#: lib/RT/Ticket_Overlay.pm:2918
+msgid "That user does not exist"
+msgstr "Пользователь не �уще�твует"
+
+#: lib/RT/User_Overlay.pm:315
+msgid "That user is already privileged"
+msgstr "Этот пользователь уже имеет в�е полномочи�"
+
+#: lib/RT/User_Overlay.pm:332
+msgid "That user is already unprivileged"
+msgstr "Этот пользователь уже не имеет полномочий"
+
+#: lib/RT/User_Overlay.pm:327
+msgid "That user is now privileged"
+msgstr "Этот пользователь теперь имеет в�е полномочи�"
+
+#: lib/RT/User_Overlay.pm:344
+msgid "That user is now unprivileged"
+msgstr "Этот пользователь теперь не имеет полномочий"
+
+#: NOT FOUND IN SOURCE
+msgid "That user is now unprivilegedileged"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2944
+msgid "That user may not own tickets in that queue"
+msgstr "Этот пользователь не может владеть тикетами из �той очереди"
+
+#: lib/RT/Link_Overlay.pm:206
+msgid "That's not a numerical id"
+msgstr "Это не чи�ловой идентификатор"
+
+#: html/Ticket/Create.html:150 html/Ticket/Elements/ShowSummary:28
+msgid "The Basics"
+msgstr "Главное"
+
+#: lib/RT/ACE_Overlay.pm:88
+msgid "The CC of a ticket"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:89
+msgid "The administrative CC of a ticket"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2213
+msgid "The comment has been recorded"
+msgstr "Запи�ан комментарий"
+
+#: bin/rt-crontool:198
+msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
+msgstr ""
+
+#: bin/rt-commit-handler:756 bin/rt-commit-handler:766
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr "Эти команды не были и�полнены:\\n\\n"
+
+#: lib/RT/Interface/Web.pm:861
+msgid "The new value has been set."
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:86
+msgid "The owner of a ticket"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:87
+msgid "The requestor of a ticket"
+msgstr ""
+
+#: html/Admin/Elements/EditUserComments:26
+msgid "These comments aren't generally visible to the user"
+msgstr "Эти комментарии не показывают�� обыкновенному пользователю"
+
+#: NOT FOUND IN SOURCE
+msgid "This ticket %1 %2 (%3)\\n"
+msgstr "Этот тикет %1 %2 (%3)\\n"
+
+#: bin/rt-crontool:189
+msgid "This tool allows the user to run arbitrary perl modules from within RT."
+msgstr "Этот ин�трумент позвол�ет пользователю запу�кать некоторые модули Perl из RT."
+
+#: lib/RT/Transaction_Overlay.pm:253
+msgid "This transaction appears to have no content"
+msgstr "Похоже, что �та транзакци� не имеет информации"
+
+#: html/Ticket/Elements/ShowRequestor:47
+#. ($rows)
+msgid "This user's %1 highest priority tickets"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "This user's 25 highest priority tickets"
+msgstr "25 важнейших тикетов пользовател�..."
+
+#: lib/RT/Date.pm:391
+msgid "Thu."
+msgstr "Чтв."
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1  %2"
+msgstr "Тикет # %1  %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1 Jumbo update: %2"
+msgstr ""
+
+#: html/Ticket/ModifyAll.html:25 html/Ticket/ModifyAll.html:29
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket #%1 Jumbo update: %2"
+msgstr "Тикет #%1 Обновление в�его: %2"
+
+#: html/Approvals/Elements/ShowDependency:46
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Ticket #%1: %2"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:608
+#. ($self->Id, $QueueObj->Name)
+msgid "Ticket %1 created in queue '%2'"
+msgstr "Тикет %1 �оздан в очереди '%2'"
+
+#: bin/rt-commit-handler:760
+#. ($Ticket->Id)
+msgid "Ticket %1 loaded\\n"
+msgstr "Загружен тикет %1\\n"
+
+#: html/Search/Bulk.html:181
+#. ($Ticket->Id,$_)
+msgid "Ticket %1: %2"
+msgstr "Тикет %1: %2"
+
+#: html/Ticket/History.html:25 html/Ticket/History.html:28
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket History # %1 %2"
+msgstr "И�тори� тикета # %1 %2"
+
+#: html/SelfService/Display.html:34
+msgid "Ticket Id"
+msgstr "Тикет #"
+
+#: etc/initialdata:303
+msgid "Ticket Resolved"
+msgstr ""
+
+#: html/Search/Elements/PickRestriction:63
+msgid "Ticket attachment"
+msgstr "Дл� вложений"
+
+#: lib/RT/Tickets_Overlay.pm:1166
+msgid "Ticket content"
+msgstr "Тек�т тикета"
+
+#: lib/RT/Tickets_Overlay.pm:1212
+msgid "Ticket content type"
+msgstr "Тип данных тикета"
+
+#: lib/RT/Ticket_Overlay.pm:495 lib/RT/Ticket_Overlay.pm:597
+msgid "Ticket could not be created due to an internal error"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:522
+msgid "Ticket created"
+msgstr "Создан тикет"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket creation failed"
+msgstr "�е удало�ь �оздать тикет"
+
+#: lib/RT/Transaction_Overlay.pm:527
+msgid "Ticket deleted"
+msgstr "Тикет удален"
+
+#: html/REST/1.0/modify:29 html/REST/1.0/update:34
+msgid "Ticket id not found"
+msgstr "Идентификатор тикета не найден"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket killed"
+msgstr ""
+
+#: html/REST/1.0/modify:36 html/REST/1.0/update:41
+msgid "Ticket not found"
+msgstr "Тикет не найден"
+
+#: etc/initialdata:289
+msgid "Ticket status changed"
+msgstr ""
+
+#: html/Ticket/Update.html:39
+msgid "Ticket watchers"
+msgstr "�аблюдатели дл� тикета"
+
+#: html/Elements/Tabs:49
+msgid "Tickets"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1383
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1348
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr ""
+
+#: html/Elements/ViewUser:26
+#. ($name)
+msgid "Tickets from %1"
+msgstr "Тикеты от %1"
+
+#: html/Approvals/Elements/ShowDependency:27
+msgid "Tickets which depend on this approval:"
+msgstr "От �той визы зави��т �ледующие тикеты:"
+
+#: html/Ticket/Create.html:157 html/Ticket/Elements/EditBasics:48
+msgid "Time Left"
+msgstr "О�тало�ь"
+
+#: html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:43
+msgid "Time Worked"
+msgstr "В работе"
+
+#: lib/RT/Tickets_Overlay.pm:1139
+msgid "Time left"
+msgstr "О�тало�ь"
+
+#: html/Elements/Footer:36
+msgid "Time to display"
+msgstr "Врем� дл� показа"
+
+#: lib/RT/Tickets_Overlay.pm:1115
+msgid "Time worked"
+msgstr "В работе"
+
+#: NOT FOUND IN SOURCE
+msgid "TimeLeft"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1165
+msgid "TimeWorked"
+msgstr ""
+
+#: bin/rt-commit-handler:402
+msgid "To generate a diff of this commit:"
+msgstr "Дл� генерации дифа �того коммита:"
+
+#: bin/rt-commit-handler:391
+msgid "To generate a diff of this commit:\\n"
+msgstr "Дл� генерации дифа �того коммита:\\n"
+
+#: lib/RT/Ticket_Overlay.pm:1168
+msgid "Told"
+msgstr "Контакт"
+
+#: etc/initialdata:237
+msgid "Transaction"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:642
+#. ($self->Data)
+msgid "Transaction %1 purged"
+msgstr "Транзакци� %1 удалена"
+
+#: lib/RT/Transaction_Overlay.pm:177
+msgid "Transaction Created"
+msgstr "Создана транзакци�"
+
+#: lib/RT/Transaction_Overlay.pm:89
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:701
+msgid "Transactions are immutable"
+msgstr "Транзакции не изменены"
+
+#: NOT FOUND IN SOURCE
+msgid "Trying to delete a right: %1"
+msgstr "Пытаем�� удалить право: %1"
+
+#: lib/RT/Date.pm:389
+msgid "Tue."
+msgstr "Ð’Ñ‚Ñ€."
+
+#: html/Admin/Elements/EditCustomField:34 html/Ticket/Elements/AddWatchers:33 html/Ticket/Elements/AddWatchers:44 html/Ticket/Elements/AddWatchers:54 lib/RT/Ticket_Overlay.pm:1166 lib/RT/Tickets_Overlay.pm:959
+msgid "Type"
+msgstr "Тип"
+
+#: lib/RT/ScripCondition_Overlay.pm:104
+msgid "Unimplemented"
+msgstr "�е реализовано"
+
+#: html/Admin/Users/Modify.html:68
+msgid "Unix login"
+msgstr "Логин UNIX"
+
+#: html/Admin/Elements/ModifyUser:62
+msgid "UnixUsername"
+msgstr "Им� пользовател� UNIX"
+
+#: lib/RT/Attachment_Overlay.pm:265
+#. ($self->ContentEncoding)
+msgid "Unknown ContentEncoding %1"
+msgstr "�еизве�тна� кодировка %1"
+
+#: html/Elements/SelectResultsPerPage:37
+msgid "Unlimited"
+msgstr "�е ограничено"
+
+#: etc/initialdata:32
+msgid "Unprivileged"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:571
+msgid "Untaken"
+msgstr "�ичей"
+
+#: html/Elements/MyTickets:64 html/Search/Bulk.html:33
+msgid "Update"
+msgstr "Обновить"
+
+#: html/Admin/Users/Prefs.html:62
+msgid "Update ID"
+msgstr "Обновить идентификатор"
+
+#: html/Search/Bulk.html:120 html/Ticket/ModifyAll.html:66 html/Ticket/Update.html:67
+msgid "Update Type"
+msgstr "Обновить тип"
+
+#: html/Search/Listing.html:61
+msgid "Update all these tickets at once"
+msgstr "Изменить одним махом"
+
+#: html/Admin/Users/Prefs.html:49
+msgid "Update email"
+msgstr "Обновить e-mail"
+
+#: html/Admin/Users/Prefs.html:55
+msgid "Update name"
+msgstr "Обновить им�"
+
+#: lib/RT/Interface/Web.pm:375
+msgid "Update not recorded."
+msgstr "Изменени� не �охранены."
+
+#: html/Search/Bulk.html:81
+msgid "Update selected tickets"
+msgstr "Изменить выбранные тикеты"
+
+#: html/Admin/Users/Prefs.html:36
+msgid "Update signature"
+msgstr "Обновить подпи�ь"
+
+#: html/Ticket/ModifyAll.html:63
+msgid "Update ticket"
+msgstr "Обновить тикет"
+
+#: html/SelfService/Update.html:25 html/SelfService/Update.html:27
+#. ($Ticket->id)
+msgid "Update ticket # %1"
+msgstr "Обновить тикет # %1"
+
+#: html/SelfService/Update.html:50
+#. ($Ticket->id)
+msgid "Update ticket #%1"
+msgstr "Обновить тикет # %1"
+
+#: html/Ticket/Update.html:135
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Update ticket #%1 (%2)"
+msgstr ""
+
+#: lib/RT/Interface/Web.pm:373
+msgid "Update type was neither correspondence nor comment."
+msgstr "Обновление не было ни �ообщением, ни комментарием."
+
+#: html/Elements/SelectDateType:33 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1169
+msgid "Updated"
+msgstr "Обновлен"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 %2: %3\\n"
+msgstr "Пользователь %1 %2: %3\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 Password: %2\\n"
+msgstr "Пользователь %1 Пароль: %2\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found"
+msgstr "Пользователь '%1' не найден"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found\\n"
+msgstr "Пользователь '%1' не найден\\n"
+
+#: etc/initialdata:125 etc/initialdata:191
+msgid "User Defined"
+msgstr ""
+
+#: html/Admin/Users/Prefs.html:59
+msgid "User ID"
+msgstr "Логин"
+
+#: html/Elements/SelectUsers:26
+msgid "User Id"
+msgstr "Логин"
+
+#: html/Admin/Elements/GroupTabs:47 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/SystemTabs:47 html/Admin/Global/index.html:59
+msgid "User Rights"
+msgstr "Права пользовател�"
+
+#: html/Admin/Users/Modify.html:226
+#. ($msg)
+msgid "User could not be created: %1"
+msgstr "�е могу �оздать пользовател�: %1"
+
+#: lib/RT/User_Overlay.pm:262
+msgid "User created"
+msgstr "Создан пользователь"
+
+#: html/Admin/Global/GroupRights.html:67 html/Admin/Groups/GroupRights.html:54 html/Admin/Queues/GroupRights.html:68
+msgid "User defined groups"
+msgstr "Группы, определенные пользователем"
+
+#: NOT FOUND IN SOURCE
+msgid "User notified"
+msgstr "Пользователю ото�лано напоминание"
+
+#: html/Admin/Users/Prefs.html:25 html/Admin/Users/Prefs.html:29
+msgid "User view"
+msgstr "Пользователь�кие на�тройки"
+
+#: html/Admin/Users/Modify.html:48 html/Elements/Login:42 html/Ticket/Elements/AddWatchers:35
+msgid "Username"
+msgstr "Логин"
+
+#: html/Admin/Elements/SelectNewGroupMembers:26 html/Admin/Elements/Tabs:32 html/Admin/Groups/Members.html:55 html/Admin/Queues/People.html:68 html/Admin/index.html:29 html/User/Groups/Members.html:58
+msgid "Users"
+msgstr "Пользователи"
+
+#: html/Admin/Users/index.html:65
+msgid "Users matching search criteria"
+msgstr "�айдены пользователи"
+
+#: html/Search/Elements/PickRestriction:51
+msgid "ValueOfQueue"
+msgstr "ValueOfQueue"
+
+#: html/Admin/Elements/EditCustomField:40
+msgid "Values"
+msgstr "Значени�"
+
+#: NOT FOUND IN SOURCE
+msgid "VrijevormEnkele"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Watch"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "WatchAsAdminCc"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Watcher loaded"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:42
+msgid "Watchers"
+msgstr "�аблюдатели"
+
+#: html/Admin/Elements/ModifyUser:56
+msgid "WebEncoding"
+msgstr "WebEncoding"
+
+#: lib/RT/Date.pm:390
+msgid "Wed."
+msgstr "Срд."
+
+#: etc/upgrade/2.1.71:161
+msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
+msgstr ""
+
+#: etc/upgrade/2.1.71:135
+msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
+msgstr ""
+
+#: etc/initialdata:138
+msgid "When a ticket is created"
+msgstr ""
+
+#: etc/upgrade/2.1.71:79
+msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
+msgstr ""
+
+#: etc/initialdata:143
+msgid "When anything happens"
+msgstr ""
+
+#: etc/initialdata:184
+msgid "Whenever a ticket is resolved"
+msgstr ""
+
+#: etc/initialdata:170
+msgid "Whenever a ticket's owner changes"
+msgstr ""
+
+#: etc/initialdata:178
+msgid "Whenever a ticket's queue changes"
+msgstr ""
+
+#: etc/initialdata:162
+msgid "Whenever a ticket's status changes"
+msgstr ""
+
+#: etc/initialdata:192
+msgid "Whenever a user-defined condition occurs"
+msgstr ""
+
+#: etc/initialdata:156
+msgid "Whenever comments come in"
+msgstr ""
+
+#: etc/initialdata:149
+msgid "Whenever correspondence comes in"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:164 html/User/Prefs.html:52
+msgid "Work"
+msgstr "Рабочий"
+
+#: html/Admin/Elements/ModifyUser:70
+msgid "WorkPhone"
+msgstr "Рабочий"
+
+#: html/SelfService/Display.html:86 html/Ticket/Elements/ShowBasics:35 html/Ticket/Update.html:65
+msgid "Worked"
+msgstr "В работе"
+
+#: lib/RT/Ticket_Overlay.pm:3056
+msgid "You already own this ticket"
+msgstr "Вы уже владеете �тим тикетом"
+
+#: html/autohandler:121
+msgid "You are not an authorized user"
+msgstr "Вам �юда запрещено"
+
+#: lib/RT/Ticket_Overlay.pm:2930
+msgid "You can only reassign tickets that you own or that are unowned"
+msgstr "Вы можете назначать владельца только дл� �воих или ничьих тикетов."
+
+#: NOT FOUND IN SOURCE
+msgid "You don't have permission to view that ticket.\\n"
+msgstr "У ва� нет права на про�мотр �того тикета.\\n"
+
+#: docs/design_docs/string-extraction-guide.txt:47
+#. ($num, $queue)
+msgid "You found %1 tickets in queue %2"
+msgstr "You found %1 tickets in queue %2"
+
+#: html/NoAuth/Logout.html:31 html/REST/1.0/logout:25
+msgid "You have been logged out of RT."
+msgstr "Вы вышли из RT."
+
+#: html/SelfService/Display.html:134
+msgid "You have no permission to create tickets in that queue."
+msgstr "У ва� нет права �оздавать тикеты в �той очереди."
+
+#: lib/RT/Ticket_Overlay.pm:1895
+msgid "You may not create requests in that queue."
+msgstr "Вы не можете �оздавать запро�ы в �той очереди."
+
+#: html/NoAuth/Logout.html:36
+msgid "You're welcome to login again"
+msgstr "Заходите еще"
+
+#: html/SelfService/Elements/MyRequests:25
+#. ($friendly_status)
+msgid "Your %1 requests"
+msgstr "Ваши запро�ы: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
+msgstr "�дмини�тратор RT неправильно на�троил почтовые алиа�ы"
+
+#: etc/initialdata:429 etc/upgrade/2.1.71:146
+msgid "Your request has been approved by %1. Other approvals may still be pending."
+msgstr ""
+
+#: etc/initialdata:463 etc/upgrade/2.1.71:180
+msgid "Your request has been approved."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr ""
+
+#: etc/initialdata:384 etc/upgrade/2.1.71:101
+msgid "Your request was rejected."
+msgstr ""
+
+#: html/autohandler:136 html/autohandler:142
+msgid "Your username or password is incorrect"
+msgstr "Вы ввели неверное им� или пароль"
+
+#: html/Admin/Elements/ModifyUser:84 html/Admin/Users/Modify.html:144 html/User/Prefs.html:96
+msgid "Zip"
+msgstr "Индек�"
+
+#: NOT FOUND IN SOURCE
+msgid "[no subject]"
+msgstr ""
+
+#: html/User/Elements/DelegateRights:59
+#. ($right->PrincipalObj->Object->SelfDescription)
+msgid "as granted to %1"
+msgstr "� правами %1"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:34
+msgid "contains"
+msgstr "�одержит"
+
+#: html/Elements/SelectAttachmentField:26
+msgid "content"
+msgstr "данные"
+
+#: html/Elements/SelectAttachmentField:27
+msgid "content-type"
+msgstr "тип данных"
+
+#: lib/RT/Ticket_Overlay.pm:2282
+msgid "correspondence (probably) not sent"
+msgstr "�ообщение (возможно) не отправлено"
+
+#: lib/RT/Ticket_Overlay.pm:2292
+msgid "correspondence sent"
+msgstr "отправлено �ообщение"
+
+#: html/Admin/Elements/ModifyQueue:63 html/Admin/Queues/Modify.html:77 lib/RT/Date.pm:319
+msgid "days"
+msgstr "дней"
+
+#: NOT FOUND IN SOURCE
+msgid "dead"
+msgstr ""
+
+#: html/Search/Listing.html:75
+msgid "delete"
+msgstr "удалить"
+
+#: lib/RT/Queue_Overlay.pm:63
+msgid "deleted"
+msgstr "удален"
+
+#: html/Search/Elements/PickRestriction:68
+msgid "does not match"
+msgstr "не �овпадает"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:35
+msgid "doesn't contain"
+msgstr "не �одержит"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "equal to"
+msgstr "равн�ет��"
+
+#: NOT FOUND IN SOURCE
+msgid "false"
+msgstr ""
+
+#: html/Elements/SelectAttachmentField:28
+msgid "filename"
+msgstr "им� файла"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "greater than"
+msgstr "больше чем"
+
+#: lib/RT/Group_Overlay.pm:194
+#. ($self->Name)
+msgid "group '%1'"
+msgstr "группа '%1'"
+
+#: lib/RT/Date.pm:315
+msgid "hours"
+msgstr "ча�ов"
+
+#: NOT FOUND IN SOURCE
+msgid "id"
+msgstr "идентификатор"
+
+#: html/Elements/SelectBoolean:32 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88
+msgid "is"
+msgstr "�вл�ет��"
+
+#: html/Elements/SelectBoolean:36 html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:37 html/Search/Elements/PickRestriction:48 html/Search/Elements/PickRestriction:77 html/Search/Elements/PickRestriction:89
+msgid "isn't"
+msgstr "не �вл�ет��"
+
+#: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
+msgid "less than"
+msgstr "меньше чем"
+
+#: html/Search/Elements/PickRestriction:67
+msgid "matches"
+msgstr "�овпадает"
+
+#: lib/RT/Date.pm:311
+msgid "min"
+msgstr "мин"
+
+#: html/Ticket/Update.html:66
+msgid "minutes"
+msgstr "минут"
+
+#: bin/rt-commit-handler:765
+msgid "modifications\\n\\n"
+msgstr "изменени�\\n\\n"
+
+#: lib/RT/Date.pm:327
+msgid "months"
+msgstr "ме��цев"
+
+#: lib/RT/Queue_Overlay.pm:58
+msgid "new"
+msgstr "новый"
+
+#: html/Admin/Elements/EditScrips:43
+msgid "no value"
+msgstr ""
+
+#: html/Ticket/Elements/EditWatchers:28
+msgid "none"
+msgstr "нет"
+
+#: html/Elements/SelectEqualityOperator:38
+msgid "not equal to"
+msgstr "не равен"
+
+#: NOT FOUND IN SOURCE
+msgid "notlike"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:59
+msgid "open"
+msgstr "открыт"
+
+#: lib/RT/Group_Overlay.pm:199
+#. ($self->Name, $user->Name)
+msgid "personal group '%1' for user '%2'"
+msgstr "лична� группа '%1' дл� пользовател� '%2'"
+
+#: lib/RT/Group_Overlay.pm:207
+#. ($queue->Name, $self->Type)
+msgid "queue %1 %2"
+msgstr "очередь %1 %2"
+
+#: lib/RT/Queue_Overlay.pm:62
+msgid "rejected"
+msgstr "отклонен"
+
+#: lib/RT/Queue_Overlay.pm:61
+msgid "resolved"
+msgstr "решен"
+
+#: lib/RT/Date.pm:307
+msgid "sec"
+msgstr "�ек"
+
+#: lib/RT/Queue_Overlay.pm:60
+msgid "stalled"
+msgstr "отложен"
+
+#: lib/RT/Group_Overlay.pm:202
+#. ($self->Type)
+msgid "system %1"
+msgstr "�и�тема %1"
+
+#: lib/RT/Group_Overlay.pm:213
+#. ($self->Type)
+msgid "system group '%1'"
+msgstr "�и�темна� группа '%1'"
+
+#: html/Elements/Error:42 html/SelfService/Error.html:42
+msgid "the calling component did not specify why"
+msgstr "вызывающий компонент не указал причину"
+
+#: lib/RT/Group_Overlay.pm:210
+#. ($self->Instance, $self->Type)
+msgid "ticket #%1 %2"
+msgstr "тикет #%1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "true"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:216
+#. ($self->Id)
+msgid "undescribed group %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "undescripbed group %1"
+msgstr "неопи�анна� группа %1"
+
+#: lib/RT/Group_Overlay.pm:191
+#. ($user->Object->Name)
+msgid "user %1"
+msgstr "пользователь %1"
+
+#: lib/RT/Date.pm:323
+msgid "weeks"
+msgstr "недель"
+
+#: NOT FOUND IN SOURCE
+msgid "with template %1"
+msgstr "� шаблоном %1"
+
+#: lib/RT/Date.pm:331
+msgid "years"
+msgstr "лет"
+
+#: NOT FOUND IN SOURCE
+msgid "ニック�ーム"
+msgstr ""
+
diff --git a/rt/lib/RT/I18N/zh_cn.po b/rt/lib/RT/I18N/zh_cn.po
new file mode 100644
index 000000000..ededc1ac3
--- /dev/null
+++ b/rt/lib/RT/I18N/zh_cn.po
@@ -0,0 +1,6384 @@
+# Traditional Chinese localization catalog for Request Tracker (RT)
+msgid ""
+msgstr ""
+"Last-Translator: Autrijus Tang <autrijus@autrijus.org>\n"
+"Language-Team: Chinese <members@ourinet.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: html/Elements/MyRequests:27 html/Elements/MyTickets:27 html/Work/Elements/MyApprovals:8 html/Work/Elements/MyRequests:9 html/Work/Elements/MyTickets:9
+msgid "#"
+msgstr "#"
+
+#: NOT FOUND IN SOURCE
+msgid "#%1"
+msgstr "#%1"
+
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($Ticket->id, $Ticket->Subject)
+#. ($ticket->Id, $ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "#%1: %2"
+msgstr "#%1: %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%*(%1,group ticket)"
+msgstr "%*(%1) 件�与的申请�"
+
+#: NOT FOUND IN SOURCE
+msgid "%*(%1,ticket) due"
+msgstr "%*(%1) 件�期完�的申请�"
+
+#: NOT FOUND IN SOURCE
+msgid "%*(%1,unresolved ticket)"
+msgstr "%*(%1) 件尚未解决的申请�"
+
+#: lib/RT/Date.pm:337
+#. ($s, $time_unit)
+msgid "%1 %2"
+msgstr "%1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:771
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr "%1 %2 %3"
+
+#: lib/RT/Date.pm:373
+#. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
+msgid "%1 %2 %3 %4:%5:%6 %7"
+msgstr "%7-%2-%3 %4:%5:%6 %1"
+
+#: lib/RT/Ticket_Overlay.pm:3541 lib/RT/Transaction_Overlay.pm:557 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $new_value->Content)
+#. ($field, $self->NewValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 added"
+msgstr "%2 已新增为 %1"
+
+#: lib/RT/Date.pm:334
+#. ($s, $time_unit)
+msgid "%1 %2 ago"
+msgstr "%1 %2 之�"
+
+#: lib/RT/Ticket_Overlay.pm:3547 lib/RT/Transaction_Overlay.pm:564
+#. ($cf->Name, $old_value, $new_value->Content)
+#. ($field, $self->OldValue, $self->NewValue)
+msgid "%1 %2 changed to %3"
+msgstr "%1 已从 %2 改为 %3"
+
+#: lib/RT/Ticket_Overlay.pm:3544 lib/RT/Transaction_Overlay.pm:560 lib/RT/Transaction_Overlay.pm:605
+#. ($cf->Name, $old_value)
+#. ($field, $self->OldValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 deleted"
+msgstr "%2 已自 %1 删除"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:157
+#. ($depth_str, $role_str, $group_str)
+msgid "%1 %2 of group %3"
+msgstr "%3 群组的 %1 %2"
+
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27
+#. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
+msgid "%1 %2 with template %3"
+msgstr "�件：%1 | 动作：%2 | 模�：%3"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 this ticket\\n"
+msgstr "%1 (%2) %3 这份申请�\\n"
+
+#: html/Search/Listing.html:56 html/Work/Search/index.html:28
+#. (($session{'tickets'}->FirstRow+1), ($session{'tickets'}->FirstRow() + $session{'tickets'}->RowsPerPage()  ))
+msgid "%1 - %2 shown"
+msgstr "显示第 %1 - %2 笔"
+
+#: bin/rt-crontool:168 bin/rt-crontool:175 bin/rt-crontool:181
+#. ("--search-argument", "--search")
+#. ("--condition-argument", "--condition")
+#. ("--action-argument", "--action")
+msgid "%1 - An argument to pass to %2"
+msgstr "%1 - 传递给 %2 的一个�数"
+
+#: bin/rt-crontool:184
+#. ("--verbose")
+msgid "%1 - Output status updates to STDOUT"
+msgstr "%1 - 将更新状�输出到 STDOUT"
+
+#: bin/rt-crontool:178
+#. ("--action")
+msgid "%1 - Specify the action module you want to use"
+msgstr "%1 - 指定欲使用的动作模�"
+
+#: bin/rt-crontool:172
+#. ("--condition")
+msgid "%1 - Specify the condition module you want to use"
+msgstr "%1 - 指定欲使用的�件模�"
+
+#: bin/rt-crontool:165
+#. ("--search")
+msgid "%1 - Specify the search module you want to use"
+msgstr "%1 - 指定欲使用的查询模�"
+
+#: lib/RT/ScripAction_Overlay.pm:121
+#. ($self->Id)
+msgid "%1 ScripAction loaded"
+msgstr "加载手续 %1"
+
+#: html/Edit/Elements/Page:48
+#. (scalar $count)
+msgid "%1 Total"
+msgstr "共 %1 笔"
+
+#: lib/RT/Ticket_Overlay.pm:3574
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 added as a value for %2"
+msgstr "新增 %1 作为 %2 的值"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on"
+msgstr "别� %1 需��用的申请�编�"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on "
+msgstr "别� %1 需��用的申请�编� "
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on (from %2) %3"
+msgstr "别� %1 需��用的申请�编�以处� %3(出自 %2)"
+
+#: lib/RT/Link_Overlay.pm:116 lib/RT/Link_Overlay.pm:123
+#. ($args{'Base'})
+#. ($args{'Target'})
+msgid "%1 appears to be a local object, but can't be found in the database"
+msgstr "%1 看�是个本地对象，��在数�库里"
+
+#: html/Ticket/Elements/ShowDates:51 lib/RT/Transaction_Overlay.pm:481
+#. ($self->BriefDescription , $self->CreatorObj->Name)
+#. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
+msgid "%1 by %2"
+msgstr "%1 (%2)"
+
+#: lib/RT/Transaction_Overlay.pm:535 lib/RT/Transaction_Overlay.pm:624 lib/RT/Transaction_Overlay.pm:633 lib/RT/Transaction_Overlay.pm:636
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
+#. ($self->Field , $q1->Name , $q2->Name)
+#. ($self->Field, $t2->AsString, $t1->AsString)
+#. ($self->Field, $self->OldValue, $self->NewValue)
+msgid "%1 changed from %2 to %3"
+msgstr "%1 的值从 %2 改为 %3"
+
+#: lib/RT/Interface/Web.pm:893
+msgid "%1 could not be set to %2."
+msgstr "无法将 %1 设定为 %2。"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 couldn't init a transaction (%2)\\n"
+msgstr "%1 无法�始更新 (%2)\\n"
+
+#: lib/RT/Ticket_Overlay.pm:2839
+#. ($self)
+msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
+msgstr "%1 无法将现况设�已解决。RT 数�库内容�能�一致。"
+
+#: html/Elements/MyTickets:24 html/Work/Elements/MyTickets:6
+#. ($rows)
+msgid "%1 highest priority tickets I own..."
+msgstr "� %1 份待处�申请�..."
+
+#: html/Elements/MyRequests:24 html/Work/Elements/MyRequests:6
+#. ($rows)
+msgid "%1 highest priority tickets I requested..."
+msgstr "� %1 份�出的申请�..."
+
+#: html/Work/Elements/MyApprovals:5
+#. ($rows)
+msgid "%1 highest priority tickets pending my approval..."
+msgstr "� %1 份待签核申请�..."
+
+#: bin/rt-crontool:160
+#. ($0)
+msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
+msgstr "%1 是从外部排程程�(如 cron)�对申请�进行�作的工具。"
+
+#: lib/RT/Queue_Overlay.pm:743
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this queue."
+msgstr "%1 已��是此表�的 %2。"
+
+#: lib/RT/Ticket_Overlay.pm:1578
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this ticket."
+msgstr "%1 已��是此申请�的 %2。"
+
+#: lib/RT/Ticket_Overlay.pm:3630
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 is no longer a value for custom field %2"
+msgstr "%1 已��是自订字段 %2 的值。"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 isn't a valid Queue id."
+msgstr "%1 �是一个�法的表�编�。"
+
+#: html/Ticket/Elements/ShowBasics:35
+#. ($TimeWorked)
+msgid "%1 min"
+msgstr "%1 分钟"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 not shown"
+msgstr "没有显示 %1"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 result(s) found"
+msgstr "找到 %1 项结果"
+
+#: html/User/Elements/DelegateRights:75
+#. (loc($ObjectType =~ /^RT::(.*)$/))
+msgid "%1 rights"
+msgstr "%1��"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 succeeded\\n"
+msgstr "%1 完�\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for $MessageId"
+msgstr "�知� $MessageID 的 %1 类别"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for %2"
+msgstr "�知� %2 的 %1 类别"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 was created without a CurrentUser\\n"
+msgstr "%1 新增时未指定现行使用者"
+
+#: lib/RT/Action/ResolveMembers.pm:41
+#. (ref $self)
+msgid "%1 will resolve all members of a resolved group ticket."
+msgstr "%1 会解决在已解决群组里�员的申请�。"
+
+#: lib/RT/Action/StallDependent.pm:40
+#. (ref $self)
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr "如果 %1 起始申请��赖于�个链接，或是�个链接的�员，它将会被延宕。"
+
+#: lib/RT/Transaction_Overlay.pm:433
+#. ($self)
+msgid "%1: no attachment specified"
+msgstr "%1：未指定附件"
+
+#: html/Ticket/Elements/ShowTransaction:89 html/Work/Tickets/Elements/ShowTransaction:152
+#. ($size)
+msgid "%1b"
+msgstr "%1 字节"
+
+#: html/Ticket/Elements/ShowTransaction:86 html/Work/Tickets/Elements/ShowTransaction:149
+#. (int($size/102.4)/10)
+msgid "%1k"
+msgstr "%1k 字节"
+
+#: NOT FOUND IN SOURCE
+msgid "%quant(%1,result) found"
+msgstr "找到 %1 项结果"
+
+#: lib/RT/Ticket_Overlay.pm:1148
+#. ($args{'Status'})
+msgid "'%1' is an invalid value for status"
+msgstr "'%1' �是一个�法的状�值"
+
+#: NOT FOUND IN SOURCE
+msgid "'%1' not a recognized action. "
+msgstr "'%1'为无法辨识的动作。 "
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete group member)"
+msgstr "(点选欲删除的�员)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete scrip)"
+msgstr "(点选欲删除的手续)"
+
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Elements/EditWorkflows:36 html/Admin/Groups/Members.html:51 html/Ticket/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
+msgid "(Check box to delete)"
+msgstr "(点选欲删除的项目)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check boxes to delete)"
+msgstr "(点选欲删除的项目)"
+
+#: html/Ticket/Create.html:177
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr "(键入申请�编�或网�，以空白分隔)"
+
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
+#. ($RT::CorrespondAddress)
+#. ($RT::CommentAddress)
+msgid "(If left blank, will default to %1"
+msgstr "(如果留白, 则预设为 %1)"
+
+#: NOT FOUND IN SOURCE
+msgid "(No Value)"
+msgstr "(没有值)"
+
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
+msgid "(No custom fields)"
+msgstr "(没有自订字段)"
+
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
+msgid "(No members)"
+msgstr "(没有�员)"
+
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
+msgid "(No scrips)"
+msgstr "(没有手续)"
+
+#: html/Admin/Elements/EditTemplates:30
+msgid "(No templates)"
+msgstr "没有模�"
+
+#: html/Admin/Elements/EditWorkflows:31
+msgid "(No workflows)"
+msgstr "没有�程"
+
+#: html/Ticket/Update.html:83 html/Work/Tickets/Update.html:52
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(�出本份更新的密件副本给��上以逗�隔开的电�邮件地�。这<b>�会</b>更改�续的收件者��。)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(�出本份更新的密件副本给��上以逗�隔开的电�邮件地�。这<b>�会</b>更改�续的收件者��。)"
+
+#: html/Ticket/Create.html:78
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(�出本份更新的副本给��上以逗�隔开的管�员电�邮件地�。这<b>将会</b>更改�续的收件者��。)"
+
+#: html/Ticket/Update.html:79
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(�出本份更新的副本给��上以逗�隔开的电�邮件地�。这<b>�会</b>更改�续的收件者��。)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(�出本份更新的副本给��上以逗�隔开的电�邮件地�。这<b>�会</b>更改�续的收件者��。)"
+
+#: html/Ticket/Create.html:68
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(�出本份更新的副本给��上以逗�隔开的电�邮件地�。这<b>将会</b>更改�续的收件者��。)"
+
+#: html/Ticket/Elements/EditCustomFieldEntries:35 html/Work/Tickets/Elements/EditCustomFieldEntries:33 html/Work/Tickets/Elements/ShowCustomFieldEntries:13
+msgid "(delete)"
+msgstr "(删除)"
+
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
+msgid "(empty)"
+msgstr "(空白)"
+
+#: html/Edit/Global/CustomField/index.html:113 html/Edit/Global/Scrip/index.html:111 html/Edit/Global/Template/index.html:106
+msgid "(new)"
+msgstr "(新增)"
+
+#: html/Admin/Users/index.html:38
+msgid "(no name listed)"
+msgstr "(没有列出姓�)"
+
+#: html/Elements/MyRequests:42 html/Elements/MyTickets:44 html/Work/Elements/MyApprovals:37 html/Work/Elements/MyRequests:36 html/Work/Elements/MyTickets:41
+msgid "(no subject)"
+msgstr "(没有主题)"
+
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:60 html/Ticket/Elements/EditCustomFieldValues:52 html/Ticket/Elements/ShowCustomFields:35 html/Work/Elements/EditCustomFieldValues:50 html/Work/Elements/EditCustomFields:32 html/Work/Tickets/Elements/EditCustomFieldValues:33 lib/RT/Transaction_Overlay.pm:534
+msgid "(no value)"
+msgstr "(æ— )"
+
+#: html/Ticket/Elements/BulkLinks:27 html/Ticket/Elements/EditLinks:115 html/Work/Search/BulkLinks:3
+msgid "(only one ticket)"
+msgstr "(仅能指定一份申请�)"
+
+#: html/Elements/MyRequests:51 html/Elements/MyTickets:54 html/Work/Elements/List:17 html/Work/Elements/MyRequests:46 html/Work/Elements/MyTickets:56 html/Work/Tickets/Elements/ShowBasics:44
+msgid "(pending approval)"
+msgstr "(等待签核)"
+
+#: html/Elements/MyRequests:53 html/Elements/MyTickets:56 html/Work/Elements/MyRequests:48 html/Work/Elements/MyTickets:58
+msgid "(pending other tickets)"
+msgstr "(等待其它申请�)"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:246
+msgid "(requestor's group)"
+msgstr "(申请人所属)"
+
+#: html/Admin/Users/Modify.html:49
+msgid "(required)"
+msgstr "(å¿…å¡«)"
+
+#: html/Ticket/Elements/ShowTransaction:92 html/Work/Tickets/Elements/ShowTransaction:37
+msgid "(untitled)"
+msgstr "(未命�)"
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr "� 25 份待处�申请�..."
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr "� 25 份�出的申请�..."
+
+#: NOT FOUND IN SOURCE
+msgid ":"
+msgstr "："
+
+#: html/Ticket/Elements/ShowBasics:31
+msgid "<% $Ticket->Status%>"
+msgstr "<% $Ticket->Status%>"
+
+#: html/Elements/SelectTicketTypes:26
+msgid "<% $_ %>"
+msgstr "<% $_ %>"
+
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 html/Work/Elements/104Header:43
+#. ($m->scomp('/Elements/SelectNewTicketQueue'))
+msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
+msgstr "<input type=\"submit\" value=\"�出申请�\">&nbsp;%1"
+
+#: etc/initialdata:221
+msgid "A blank template"
+msgstr "空白模�"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Deleted"
+msgstr "ACE 已删除"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Loaded"
+msgstr "ACE 已加载"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be deleted"
+msgstr "无法删除 ACE"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be found"
+msgstr "找�到 ACE"
+
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:179
+msgid "ACE not found"
+msgstr "找�到 ACE 设定"
+
+#: lib/RT/ACE_Overlay.pm:830
+msgid "ACEs can only be created and deleted."
+msgstr "祇能新增或删除 ACE 设定。"
+
+#: NOT FOUND IN SOURCE
+msgid "ACLEquivalence"
+msgstr "ACLEquivalence"
+
+#: bin/rt-commit-handler:754
+msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgstr "离开以���心更改到申请�。\\n"
+
+#: html/User/Elements/Tabs:31
+msgid "About me"
+msgstr "个人信�"
+
+#: html/Edit/Users/System:12
+msgid "Access Right"
+msgstr "系统使用登录��"
+
+#: html/Admin/Users/Modify.html:79
+msgid "Access control"
+msgstr "存���"
+
+#: html/Admin/Elements/EditScrip:56 html/Work/Tickets/Elements/ShowTransaction:18
+msgid "Action"
+msgstr "动作"
+
+#: lib/RT/Scrip_Overlay.pm:146
+#. ($args{'ScripAction'})
+msgid "Action %1 not found"
+msgstr "动作 %1 找�到"
+
+#: bin/rt-crontool:122
+msgid "Action committed."
+msgstr "动作执行完毕"
+
+#: bin/rt-crontool:118
+msgid "Action prepared..."
+msgstr "动作准备完毕..."
+
+#: html/Work/Elements/List:13 html/Work/Elements/SelectSearch:24 html/Work/Tickets/Create.html:26 html/Work/Tickets/Elements/ShowBasics:12
+msgid "Activated Date"
+msgstr "申请激活时间"
+
+#: html/Edit/Elements/104Buttons:71 html/Edit/Elements/ListButtons:7
+msgid "Add"
+msgstr "新增"
+
+#: html/Search/Bulk.html:95 html/Work/Search/Bulk.html:74
+msgid "Add AdminCc"
+msgstr "新增管�员副本收件人"
+
+#: html/Search/Bulk.html:91 html/Work/Search/Bulk.html:68
+msgid "Add Cc"
+msgstr "新增副本收件人"
+
+#: html/Ticket/Elements/EditCustomFieldEntries:71 html/Work/Tickets/Elements/ShowCustomFieldEntries:49
+msgid "Add Entry"
+msgstr "新增列"
+
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:98 html/Work/Tickets/Elements/AddAttachments:18
+msgid "Add More Files"
+msgstr "新增更多附件"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:112 html/Admin/Elements/ModifyTemplateAsWorkflow:45
+msgid "Add Next State"
+msgstr "新增下一项关�"
+
+#: html/Search/Bulk.html:87 html/Work/Search/Bulk.html:62
+msgid "Add Requestor"
+msgstr "新增申请人"
+
+#: html/Admin/Elements/AddCustomFieldValue:24
+msgid "Add Value"
+msgstr "新增字段值"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip to this queue"
+msgstr "新增此表�的手续"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip which will apply to all queues"
+msgstr "新增适用于所有表�的手续"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr "新增此表�的关键�"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a new a global scrip"
+msgstr "新增全域手续"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a scrip to this queue"
+msgstr "新增一�手续到此表�"
+
+#: html/Admin/Global/Scrip.html:54
+msgid "Add a scrip which will apply to all queues"
+msgstr "新增一�用于所有表�的手续"
+
+#: html/Search/Bulk.html:127 html/Work/Search/Bulk.html:80
+msgid "Add comments or replies to selected tickets"
+msgstr "新增评论或回�到指定的申请�"
+
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
+msgid "Add members"
+msgstr "新增�员"
+
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
+msgid "Add new watchers"
+msgstr "新增视察员"
+
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
+msgstr "新增下一项关�"
+
+#: lib/RT/Queue_Overlay.pm:643
+#. ($args{'Type'})
+msgid "Added principal as a %1 for this queue"
+msgstr "��已新增为此表�的 %1"
+
+#: lib/RT/Ticket_Overlay.pm:1462
+#. ($self->loc($args{'Type'}))
+msgid "Added principal as a %1 for this ticket"
+msgstr "��已新增为此申请�的 %1"
+
+#: html/Admin/Elements/ModifyUser:75 html/Admin/Users/Modify.html:121 html/User/Prefs.html:87 html/Work/Preferences/Info:76
+msgid "Address1"
+msgstr "��"
+
+#: html/Admin/Elements/ModifyUser:77 html/Admin/Users/Modify.html:126 html/User/Prefs.html:89 html/Work/Preferences/Info:78
+msgid "Address2"
+msgstr "��(续)"
+
+#: NOT FOUND IN SOURCE
+msgid "Adjust Blinking Rate"
+msgstr "调整闪�速度快慢"
+
+#: html/Edit/Groups/Admin:9
+msgid "Admin"
+msgstr "管�员"
+
+#: html/Ticket/Create.html:73
+msgid "Admin Cc"
+msgstr "管�员副本"
+
+#: etc/initialdata:303
+msgid "Admin Comment"
+msgstr "管�员评论"
+
+#: etc/initialdata:261
+msgid "Admin Correspondence"
+msgstr "管�员回�"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin Rights"
+msgstr "管�员��"
+
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
+msgid "Admin queues"
+msgstr "表�管�"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin users"
+msgstr "使用者管�"
+
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
+msgid "Admin/Global configuration"
+msgstr "管�/全域设定"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Groups"
+msgstr "管�/群组"
+
+#: html/Admin/Queues/Modify.html:24 html/Admin/Queues/Modify.html:28
+msgid "Admin/Queue/Basics"
+msgstr "管�/表�/基本信�"
+
+#: html/Edit/Global/Basic/Top:60
+msgid "AdminAddress"
+msgstr "管�员 Email"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr "管�所有代�人群组"
+
+#: etc/initialdata:74 html/Admin/Elements/ModifyTemplateAsWorkflow:155 html/Ticket/Elements/ShowPeople:38 html/Ticket/Update.html:49 lib/RT/ACE_Overlay.pm:88
+msgid "AdminCc"
+msgstr "管�员副本"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr "管�员评论"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr "管�员回�"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "AdminCustomFields"
+msgstr "管�自订字段"
+
+#: html/Edit/Groups/Admin:12 lib/RT/Group_Overlay.pm:145
+msgid "AdminGroup"
+msgstr "管�群组"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminGroupDescription"
+msgstr "管�群组�述"
+
+#: lib/RT/Group_Overlay.pm:147
+msgid "AdminGroupMembership"
+msgstr "管�群组�员"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminGroupName"
+msgstr "管�群组�称"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminGroupPermission"
+msgstr "管�群组��"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminGroupStatus"
+msgstr "管�群组状�"
+
+#: lib/RT/System.pm:58
+msgid "AdminOwnPersonalGroups"
+msgstr "管�代�人群组"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "AdminQueue"
+msgstr "管�表�"
+
+#: lib/RT/System.pm:59
+msgid "AdminUsers"
+msgstr "管�使用者"
+
+#: NOT FOUND IN SOURCE
+msgid "Administrative"
+msgstr "行政类"
+
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
+msgid "Administrative Cc"
+msgstr "管�员副本"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:233
+msgid "Admins"
+msgstr "主管"
+
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search"
+msgstr "进阶查询"
+
+#: html/Elements/SelectDateRelation:35
+msgid "After"
+msgstr "晚于"
+
+#: NOT FOUND IN SOURCE
+msgid "Age"
+msgstr "�历时间"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:172 html/Edit/Global/Workflow/Action:39
+msgid "Alias"
+msgstr "执行其它�程"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:175
+msgid "Alias for"
+msgstr "相当于"
+
+#: html/Edit/Queues/index.html:33 html/Work/Delegates/index.html:13 html/Work/Elements/SelectSearch:11 html/Work/Queues/Select.html:14 html/Work/Queues/index.html:13
+msgid "All"
+msgstr "全部"
+
+#: etc/initialdata:372
+msgid "All Approvals Passed"
+msgstr "完�全部签核"
+
+#: html/Edit/Global/Workflow/Condition:16
+msgid "All Condition"
+msgstr "所有�件"
+
+#: html/Admin/Elements/EditCustomFields:95
+msgid "All Custom Fields"
+msgstr "所有自订字段"
+
+#: html/Admin/Queues/index.html:52
+msgid "All Queues"
+msgstr "所有表�"
+
+#: NOT FOUND IN SOURCE
+msgid "All Users"
+msgstr "全体员工"
+
+#: NOT FOUND IN SOURCE
+msgid "Allowance Request"
+msgstr "�利补助申请"
+
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
+msgstr "无论寄件��为何，一律寄信给申请人"
+
+#: NOT FOUND IN SOURCE
+msgid "Amount"
+msgstr "数�"
+
+#: html/Edit/Global/Workflow/Condition:13
+msgid "Any Condition"
+msgstr "任��件"
+
+#: html/Edit/Global/Scrip/List:10 html/Edit/Global/Scrip/Top:74
+msgid "Apply Template"
+msgstr "引用模�"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:138 html/Elements/Tabs:55 html/Work/Approvals/Elements/Approve:6
+msgid "Approval"
+msgstr "签核"
+
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($ticket->id, $msg)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Approval #%1: %2"
+msgstr "签核� #%1：%2"
+
+#: html/Approvals/index.html:53
+#. ($ticket->Id)
+msgid "Approval #%1: Notes not recorded due to a system error"
+msgstr "签核� #%1：系统错误，记录失败"
+
+#: html/Approvals/index.html:51
+#. ($ticket->Id)
+msgid "Approval #%1: Notes recorded"
+msgstr "签核� #%1：记录完毕"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:123
+msgid "Approval Details"
+msgstr "签核细节"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Due"
+msgstr "签核时�"
+
+#: html/Work/Approvals/Elements/Approve:37
+msgid "Approval Notes"
+msgstr "签核��"
+
+#: etc/initialdata:357
+msgid "Approval Passed"
+msgstr "完��项签核"
+
+#: etc/initialdata:383
+msgid "Approval Rejected"
+msgstr "驳回�项签核"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Result"
+msgstr "签核结果"
+
+#: html/Work/Approvals/Elements/Approve:25
+msgid "Approval Status"
+msgstr "核准结果"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Type"
+msgstr "签核�类"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:25
+msgid "Approval diagram"
+msgstr "签核�程"
+
+#: html/Approvals/Elements/Approve:43 html/Work/Approvals/Elements/Approve:29
+msgid "Approve"
+msgstr "核准"
+
+#: html/Work/Approvals/Elements/Approve:21 html/Work/Elements/List:9
+msgid "Approver"
+msgstr "签核人"
+
+#: html/Edit/Global/Workflow/Action:29 html/Edit/Global/Workflow/Owner.html:10
+msgid "Approver Setting"
+msgstr "执行签核人设定"
+
+#: etc/initialdata:516 etc/upgrade/2.1.71:148 html/Edit/Elements/CreateApprovalsQueue:122
+msgid "Approver's notes: %1"
+msgstr "签核备注：%1"
+
+#: NOT FOUND IN SOURCE
+msgid "Apr"
+msgstr "四月"
+
+#: lib/RT/Date.pm:414
+msgid "Apr."
+msgstr "04"
+
+#: NOT FOUND IN SOURCE
+msgid "April"
+msgstr "四月"
+
+#: html/Edit/Elements/104Buttons:24
+msgid "Are you sure to delete checked items?"
+msgstr "您确定�删除？"
+
+#: html/Elements/SelectSortOrder:34
+msgid "Ascending"
+msgstr "递增"
+
+#: html/Search/Bulk.html:136 html/SelfService/Update.html:32 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:98 html/Work/Search/Bulk.html:88
+msgid "Attach"
+msgstr "附件"
+
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109 html/Work/Tickets/Elements/AddAttachments:15
+msgid "Attach file"
+msgstr "附加档案"
+
+#: html/Ticket/Create.html:97 html/Ticket/Update.html:87 html/Work/Tickets/Elements/AddAttachments:6
+msgid "Attached file"
+msgstr "现有附件"
+
+#: NOT FOUND IN SOURCE
+msgid "Attachment '%1' could not be loaded"
+msgstr "无法加载附件 '%1'"
+
+#: lib/RT/Transaction_Overlay.pm:441
+msgid "Attachment created"
+msgstr "附件新增完毕"
+
+#: lib/RT/Tickets_Overlay.pm:1189
+msgid "Attachment filename"
+msgstr "附件档�"
+
+#: html/Ticket/Elements/ShowAttachments:25 html/Work/Tickets/Elements/ShowTransaction:32
+msgid "Attachments"
+msgstr "附件"
+
+#: NOT FOUND IN SOURCE
+msgid "Aug"
+msgstr "八月"
+
+#: lib/RT/Date.pm:418
+msgid "Aug."
+msgstr "08"
+
+#: NOT FOUND IN SOURCE
+msgid "August"
+msgstr "八月"
+
+#: html/Admin/Elements/ModifyUser:65
+msgid "AuthSystem"
+msgstr "认�方�"
+
+#: NOT FOUND IN SOURCE
+msgid "AutoReject"
+msgstr "自动驳回表�"
+
+#: NOT FOUND IN SOURCE
+msgid "AutoResolve"
+msgstr "自动完�表�处�"
+
+#: etc/initialdata:224
+msgid "Autoreply"
+msgstr "自动回�"
+
+#: etc/initialdata:90
+msgid "Autoreply To Requestors"
+msgstr "自动对申请人回�"
+
+#: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr "自动对申请人回�"
+
+#: html/Edit/Rights/index.html:16
+msgid "Available Rights:"
+msgstr "��项目列表："
+
+#: NOT FOUND IN SOURCE
+msgid "Back to Homepage"
+msgstr "回到首页"
+
+#: html/Work/Elements/BackButton:2 html/Work/Search/Bulk.html:101
+msgid "Back to Previous"
+msgstr "回上页"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad PGP Signature: %1\\n"
+msgstr "错误的 PGP 签章：%1\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
+msgstr "错误的附件编�。无法找到附件 '%1'\\n"
+
+#: bin/rt-commit-handler:826
+#. ($val)
+msgid "Bad data in %1"
+msgstr "%1 的数�错误"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad transaction number for attachment. %1 should be %2\\n"
+msgstr "附件的处���错误。%1 应为 %2\\n"
+
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Edit/Global/autohandler:6 html/Edit/Queues/autohandler:17 html/Edit/Users/index.html:121 html/Ticket/Elements/Tabs:89 html/User/Elements/GroupTabs:37
+msgid "Basics"
+msgstr "基本信�"
+
+#: html/Ticket/Update.html:81 html/Work/Tickets/Update.html:49
+msgid "Bcc"
+msgstr "密件副本"
+
+#: html/Admin/Elements/EditScrip:87 html/Admin/Global/GroupRights.html:84 html/Admin/Global/Template.html:45 html/Admin/Global/UserRights.html:53 html/Admin/Global/Workflow.html:46 html/Admin/Groups/GroupRights.html:72 html/Admin/Groups/Members.html:80 html/Admin/Groups/Modify.html:55 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:44 html/Admin/Queues/UserRights.html:53 html/Admin/Queues/Workflow.html:44 html/User/Groups/Modify.html:55
+msgid "Be sure to save your changes"
+msgstr "请别忘了储存修改。"
+
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:321
+msgid "Before"
+msgstr "早于"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:44
+msgid "Begin Approval"
+msgstr "开始签核"
+
+#: NOT FOUND IN SOURCE
+msgid "Begin From "
+msgstr "起始日"
+
+#: html/Edit/Users/Info:25
+msgid "Birthday"
+msgstr "生日"
+
+#: etc/initialdata:220
+msgid "Blank"
+msgstr "空白模�"
+
+#: html/Search/Listing.html:78 html/Work/Search/index.html:53
+msgid "Bookmarkable URL for this search"
+msgstr "将查询结果转为�放入书签的网�"
+
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
+msgid "Brief headers"
+msgstr "精简标头档"
+
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
+msgid "Bulk ticket update"
+msgstr "更新整批申请�"
+
+#: NOT FOUND IN SOURCE
+msgid "Business Unit"
+msgstr "事业部"
+
+#: NOT FOUND IN SOURCE
+msgid "Business Unit:"
+msgstr "事业部："
+
+#: lib/RT/User_Overlay.pm:1411
+msgid "Can not modify system users"
+msgstr "无法更改系统使用者"
+
+#: lib/RT/Queue_Overlay.pm:66
+msgid "Can this principal see this queue"
+msgstr "该��是�能查阅此表�"
+
+#: lib/RT/CustomField_Overlay.pm:205
+msgid "Can't add a custom field value without a name"
+msgstr "�能新增没有�称的自订字段值"
+
+#: lib/RT/Link_Overlay.pm:131
+msgid "Can't link a ticket to itself"
+msgstr "申请��能链接自己。"
+
+#: lib/RT/Ticket_Overlay.pm:2816
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr "�能整�进已整�过的申请�。这个错误�该�生。"
+
+#: lib/RT/Ticket_Overlay.pm:2634 lib/RT/Ticket_Overlay.pm:2703
+msgid "Can't specifiy both base and target"
+msgstr "�能�时指定起始申请�与目的申请�"
+
+#: html/Edit/Elements/PopFooter:8
+msgid "Cancel"
+msgstr "�消"
+
+#: html/autohandler:113
+#. ($msg)
+msgid "Cannot create user: %1"
+msgstr "无法新增使用者：%1"
+
+#: NOT FOUND IN SOURCE
+msgid "Card No."
+msgstr "��"
+
+#: NOT FOUND IN SOURCE
+msgid "Categories"
+msgstr "分类管�"
+
+#: NOT FOUND IN SOURCE
+msgid "Category"
+msgstr "分类"
+
+#: etc/initialdata:68 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:44 html/Ticket/Update.html:76 html/Work/Tickets/Update.html:43 lib/RT/ACE_Overlay.pm:87
+msgid "Cc"
+msgstr "副本"
+
+#: NOT FOUND IN SOURCE
+msgid "Cc Type"
+msgstr "副本类别"
+
+#: NOT FOUND IN SOURCE
+msgid "Chairperson's Office"
+msgstr "董事长室"
+
+#: NOT FOUND IN SOURCE
+msgid "Change Ticket"
+msgstr "修改申请�"
+
+#: html/SelfService/Prefs.html:30
+msgid "Change password"
+msgstr "更改�令"
+
+#: html/Edit/Global/Basic/Top:70
+msgid "ChangeOwnerUI"
+msgstr "��选择表�承办人"
+
+#: html/Ticket/Create.html:100 html/Ticket/Elements/EditCustomFieldEntries:35 html/Ticket/Update.html:90 html/Work/Tickets/Elements/ShowCustomFieldEntries:13
+msgid "Check box to delete"
+msgstr "选择欲删除的项目"
+
+#: html/Admin/Elements/SelectRights:30
+msgid "Check box to revoke right"
+msgstr "选择欲撤消的�利"
+
+#: html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:42 html/Ticket/Elements/EditLinks:130 html/Ticket/Elements/EditLinks:68 html/Ticket/Elements/ShowLinks:56 html/Work/Search/BulkLinks:18
+msgid "Children"
+msgstr "�申请�"
+
+#: html/Edit/Elements/PickUsers:21 html/Edit/Global/UserRight/List:8 html/Edit/Global/UserRight/Top:19 html/Edit/Users/List:6 html/Edit/Users/Top:18
+msgid "Chinese Name"
+msgstr "中文姓�"
+
+#: NOT FOUND IN SOURCE
+msgid "Chinese/English"
+msgstr "中英文"
+
+#: html/Admin/Elements/ModifyUser:79 html/Admin/Users/Modify.html:131 html/User/Prefs.html:91 html/Work/Preferences/Info:80
+msgid "City"
+msgstr "所在城市"
+
+#: html/Ticket/Elements/ShowDates:46
+msgid "Closed"
+msgstr "已解决"
+
+#: html/SelfService/Closed.html:24
+msgid "Closed Tickets"
+msgstr "已解决的申请�"
+
+#: html/SelfService/Elements/Tabs:44
+msgid "Closed tickets"
+msgstr "已解决的申请�"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:181 html/Edit/Global/Workflow/Action:58 html/Edit/Global/Workflow/Condition:51
+msgid "Code"
+msgstr "执行程��"
+
+#: NOT FOUND IN SOURCE
+msgid "Command not understood!\\n"
+msgstr "指令无法辨识�\\n"
+
+#: html/Ticket/Elements/ShowTransaction:166 html/Ticket/Elements/Tabs:152 html/Work/Search/Bulk.html:89 html/Work/Tickets/Display.html:37 html/Work/Tickets/Elements/ShowTransaction:112 html/Work/Tickets/Elements/ShowTransaction:27
+msgid "Comment"
+msgstr "评论"
+
+#: html/Admin/Elements/ModifyQueue:44 html/Admin/Queues/Modify.html:57
+msgid "Comment Address"
+msgstr "评论电�邮件地�"
+
+#: NOT FOUND IN SOURCE
+msgid "Comment not recorded"
+msgstr "评论未被纪录"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "Comment on tickets"
+msgstr "对申请��出评论"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "CommentOnTicket"
+msgstr "评论申请�"
+
+#: html/Admin/Elements/ModifyUser:34 html/Work/Tickets/Update.html:59
+msgid "Comments"
+msgstr "评论"
+
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:68 html/Work/Tickets/Update.html:35
+msgid "Comments (Not sent to requestors)"
+msgstr "评论(��给申请人)"
+
+#: html/Search/Bulk.html:131 html/Work/Search/Bulk.html:83
+msgid "Comments (not sent to requestors)"
+msgstr "评论(��给申请人)"
+
+#: html/Elements/ViewUser:26
+#. ($name)
+msgid "Comments about %1"
+msgstr "对 %1 的评论"
+
+#: html/Admin/Users/Modify.html:184 html/Ticket/Elements/ShowRequestor:43
+msgid "Comments about this user"
+msgstr "使用者�述"
+
+#: lib/RT/Transaction_Overlay.pm:543
+msgid "Comments added"
+msgstr "新增评论完毕"
+
+#: html/Edit/Elements/PopFooter:4 html/Edit/Elements/PopFooter:6
+msgid "Commit"
+msgstr "确认"
+
+#: lib/RT/Action/Generic.pm:139
+msgid "Commit Stubbed"
+msgstr "消除更动完毕"
+
+#: html/Edit/Users/Info:42
+msgid "Company Name"
+msgstr "公��称"
+
+#: NOT FOUND IN SOURCE
+msgid "Compile Restrictions"
+msgstr "设定查询�件"
+
+#: html/Admin/Elements/EditScrip:40 html/Admin/Elements/ModifyTemplateAsWorkflow:127
+msgid "Condition"
+msgstr "�件"
+
+#: bin/rt-crontool:108
+msgid "Condition matches..."
+msgstr "符��件..."
+
+#: lib/RT/Scrip_Overlay.pm:159
+msgid "Condition not found"
+msgstr "未找到符�的现况"
+
+#: html/Edit/Global/GroupRight/Top:26 html/Edit/Global/UserRight/Top:45 html/Edit/Groups/Member:57 html/Elements/Tabs:49
+msgid "Configuration"
+msgstr "设定"
+
+#: html/SelfService/Prefs.html:32
+msgid "Confirm"
+msgstr "确认�令"
+
+#: NOT FOUND IN SOURCE
+msgid "Confirm Password"
+msgstr "�令确认"
+
+#: html/Work/Approvals/Display.html:25 html/Work/Tickets/Create.html:153 html/Work/Tickets/Create.html:165 html/Work/Tickets/Update.html:81
+msgid "Confirm Submit"
+msgstr "确定�出"
+
+#: NOT FOUND IN SOURCE
+msgid "Contact System Administrator"
+msgstr "连络系统管�员"
+
+#: html/Admin/Elements/ModifyUser:59
+msgid "ContactInfoSystem"
+msgstr "连络信�系统"
+
+#: NOT FOUND IN SOURCE
+msgid "Contacted date '%1' could not be parsed"
+msgstr "无法解读�络日期 '%1'"
+
+#: html/Admin/Elements/ModifyTemplate:43 html/Admin/Elements/ModifyTemplateAsWorkflow:200 html/Ticket/ModifyAll.html:86
+msgid "Content"
+msgstr "内容"
+
+#: NOT FOUND IN SOURCE
+msgid "Coould not create group"
+msgstr "无法新增群组"
+
+#: html/Edit/Elements/104Buttons:74
+msgid "Copy"
+msgstr "�制"
+
+#: NOT FOUND IN SOURCE
+msgid "Copy Field From:"
+msgstr "欲�制字段："
+
+#: etc/initialdata:282
+msgid "Correspondence"
+msgstr "回�"
+
+#: html/Admin/Elements/ModifyQueue:38 html/Admin/Queues/Modify.html:50
+msgid "Correspondence Address"
+msgstr "申请�回�地�"
+
+#: lib/RT/Transaction_Overlay.pm:539
+msgid "Correspondence added"
+msgstr "新增申请�回�"
+
+#: NOT FOUND IN SOURCE
+msgid "Correspondence not recorded"
+msgstr "未纪录申请�回�"
+
+#: lib/RT/Ticket_Overlay.pm:3561
+msgid "Could not add new custom field value for ticket. "
+msgstr "�能新增自订字段的值 "
+
+#: NOT FOUND IN SOURCE
+msgid "Could not add new custom field value for ticket. %1 "
+msgstr "�能新增自订字段的值。%1 "
+
+#: lib/RT/Ticket_Overlay.pm:3067 lib/RT/Ticket_Overlay.pm:3075 lib/RT/Ticket_Overlay.pm:3092
+msgid "Could not change owner. "
+msgstr "�能更改承办人。 "
+
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:165 html/Edit/Global/CustomField/index.html:117
+#. ($msg)
+msgid "Could not create CustomField"
+msgstr "无法新增自订字段"
+
+#: html/Edit/Global/Workflow/index.html:126
+#. ($msg)
+msgid "Could not create Scrip"
+msgstr "无法建立讯�通知"
+
+#: html/Edit/Global/Template/index.html:110
+#. ($msg)
+msgid "Could not create Template"
+msgstr "无法建立通知模�"
+
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:473 lib/RT/Group_Overlay.pm:480
+msgid "Could not create group"
+msgstr "无法新增群组"
+
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
+#. ($msg)
+msgid "Could not create template: %1"
+msgstr "无法新增模�：%1"
+
+#: lib/RT/Ticket_Overlay.pm:1081 lib/RT/Ticket_Overlay.pm:334
+msgid "Could not create ticket. Queue not set"
+msgstr "无法新增申请�。尚未指定表�。"
+
+#: lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:481
+msgid "Could not create user"
+msgstr "无法新增使用者"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not create watcher for requestor"
+msgstr "无法为申请人新增视察员"
+
+#: html/Admin/Elements/ModifyWorkflow:219 html/Admin/Global/Workflow.html:75 html/Admin/Queues/Workflow.html:71
+#. ($msg)
+msgid "Could not create workflow: %1"
+msgstr "无法新增�程：%1"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find a ticket with id %1"
+msgstr "找�到编� %1 的申请�"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find group %1."
+msgstr "找�到群组 %1。"
+
+#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1430
+msgid "Could not find or create that user"
+msgstr "找�到或无法新增该�使用者"
+
+#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1509
+msgid "Could not find that principal"
+msgstr "找�到该��"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find user %1."
+msgstr "找�到使用者 %1。"
+
+#: html/Admin/Groups/Members.html:87 html/Edit/Users/index.html:83 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
+#. ( . $GroupId)
+msgid "Could not load group"
+msgstr "无法加载群组"
+
+#: lib/RT/Queue_Overlay.pm:641
+#. ($args{'Type'})
+msgid "Could not make that principal a %1 for this queue"
+msgstr "无法将该��设为此表�的 %1。"
+
+#: lib/RT/Ticket_Overlay.pm:1451
+#. ($self->loc($args{'Type'}))
+msgid "Could not make that principal a %1 for this ticket"
+msgstr "无法将该��设为此申请�的 %1。"
+
+#: lib/RT/Queue_Overlay.pm:740
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this queue"
+msgstr "无法将�� %1 从表�移除。"
+
+#: lib/RT/Ticket_Overlay.pm:1567
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this ticket"
+msgstr "无法将�� %1 从申请�移除。"
+
+#: lib/RT/Group_Overlay.pm:984
+msgid "Couldn't add member to group"
+msgstr "无法新增�员至群组"
+
+#: lib/RT/Ticket_Overlay.pm:3571 lib/RT/Ticket_Overlay.pm:3627
+#. ($Msg)
+msgid "Couldn't create a transaction: %1"
+msgstr "无法新增更动报告"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't figure out what to do from gpg's reply\\n"
+msgstr "无法从 gpg 回函辨识出该采�的行动\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find group\\n"
+msgstr "找�到群组\\n"
+
+#: lib/RT/Interface/Web.pm:902
+msgid "Couldn't find row"
+msgstr "找�到此列数�"
+
+#: lib/RT/Group_Overlay.pm:958
+msgid "Couldn't find that principal"
+msgstr "找�到该��"
+
+#: lib/RT/CustomField_Overlay.pm:239
+msgid "Couldn't find that value"
+msgstr "找�到该值"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find that watcher"
+msgstr "找�到该视察员"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find user\\n"
+msgstr "找�到使用者\\n"
+
+#: lib/RT/CurrentUser.pm:111
+#. ($self->Id)
+msgid "Couldn't load %1 from the users database.\\n"
+msgstr "无法从使用者数�库加载 %1。\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load KeywordSelects."
+msgstr "无法加载 KeywordSelects。"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load RT config file '%1' %2"
+msgstr "无法加载 RT 设定档 '%1' %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load Scrips."
+msgstr "无法加载手续。"
+
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74 html/Edit/Global/GroupRight/Add.html:54 html/Edit/Global/UserRight/Add.html:23 html/Edit/Groups/Member:121 html/Edit/Groups/Members/Add.html:44 html/Edit/Rights/index.html:57
+#. ($Group)
+#. ($ObjectGroup)
+#. ($id)
+msgid "Couldn't load group %1"
+msgstr "无法加载手续 %1"
+
+#: lib/RT/Link_Overlay.pm:174 lib/RT/Link_Overlay.pm:183 lib/RT/Link_Overlay.pm:210
+msgid "Couldn't load link"
+msgstr "无法加载链接。"
+
+#: html/Admin/Elements/EditCustomFields:146 html/Admin/Queues/People.html:120
+#. ($id)
+msgid "Couldn't load queue"
+msgstr "无法加载表�"
+
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71 html/Edit/Global/GroupRight/Add.html:50 html/Edit/Global/GroupRight/index.html:81 html/Edit/Global/UserRight/Add.html:19 html/Edit/Global/UserRight/index.html:83 html/Edit/Rights/index.html:53
+#. ($Queue)
+#. ($id)
+msgid "Couldn't load queue %1"
+msgstr "无法加载表� %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load scrip"
+msgstr "无法加载手续"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load template"
+msgstr "无法加载模�"
+
+#: html/Admin/Users/Prefs.html:78
+#. ($id)
+msgid "Couldn't load that user (%1)"
+msgstr "无法加载该�使用者(%1)"
+
+#: html/SelfService/Display.html:108
+#. ($id)
+msgid "Couldn't load ticket '%1'"
+msgstr "无法加载申请� '%1'"
+
+#: html/Admin/Elements/ModifyUser:85 html/Admin/Users/Modify.html:148 html/User/Prefs.html:97 html/Work/Preferences/Info:86
+msgid "Country"
+msgstr "国家"
+
+#: html/Admin/Elements/CreateUserCalled:25 html/Edit/Elements/PopHeader:29 html/Edit/Global/GroupRight/Add.html:18 html/Ticket/Create.html:134 html/Ticket/Create.html:194
+msgid "Create"
+msgstr "新增"
+
+#: html/Edit/Groups/MemberGroups/Add.html:17
+msgid "Create Subgroup:"
+msgstr "新增�群组："
+
+#: etc/initialdata:145
+msgid "Create Tickets"
+msgstr "新增申请�"
+
+#: NOT FOUND IN SOURCE
+msgid "Create User:"
+msgstr "新增�员："
+
+#: html/Admin/Elements/EditCustomField:74
+msgid "Create a CustomField"
+msgstr "新增自订字段"
+
+#: html/Admin/Queues/CustomField.html:47
+#. ($QueueObj->Name())
+msgid "Create a CustomField for queue %1"
+msgstr "为 %1 表�新增自订字段"
+
+#: html/Admin/Global/CustomField.html:47
+msgid "Create a CustomField which applies to all queues"
+msgstr "为 %1 表�新增自订字段"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new Custom Field"
+msgstr "新增自订字段"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global Scrip"
+msgstr "新增全域手续"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global scrip"
+msgstr "新增全域手续"
+
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
+msgid "Create a new group"
+msgstr "新增群组"
+
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
+msgid "Create a new personal group"
+msgstr "新增代�人群组"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new queue"
+msgstr "新增表�"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new scrip"
+msgstr "新增手续"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new template"
+msgstr "新增模�"
+
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
+msgid "Create a new ticket"
+msgstr "新增申请�"
+
+#: html/Admin/Users/Modify.html:213 html/Admin/Users/Modify.html:240
+msgid "Create a new user"
+msgstr "新增使用者"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new workflow"
+msgstr "新增�程"
+
+#: html/Admin/Queues/Modify.html:103
+msgid "Create a queue"
+msgstr "新增表�"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a queue called"
+msgstr "新增表��称"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a request"
+msgstr "�出申请"
+
+#: html/Admin/Queues/Scrip.html:58
+#. ($QueueObj->Name)
+msgid "Create a scrip for queue %1"
+msgstr "为 %1 表�新增手续"
+
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
+msgid "Create a template"
+msgstr "新增模�"
+
+#: html/SelfService/Create.html:24
+msgid "Create a ticket"
+msgstr "�出申请�"
+
+#: html/Admin/Elements/ModifyWorkflow:206 html/Admin/Global/Workflow.html:69 html/Admin/Queues/Workflow.html:64
+msgid "Create a workflow"
+msgstr "新增�程"
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1 / %2 / %3 "
+msgstr "新增失败：%1 / %2 / %3"
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1/%2/%3"
+msgstr "新增失败：%1/%2/%3"
+
+#: NOT FOUND IN SOURCE
+msgid "Create new item"
+msgstr "建立新项目"
+
+#: etc/initialdata:147
+msgid "Create new tickets based on this scrip's template"
+msgstr "��此项手续内的模版，新增申请�"
+
+#: html/SelfService/Create.html:77
+msgid "Create ticket"
+msgstr "新增申请�"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "Create tickets in this queue"
+msgstr "在此表�中新增申请�"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "Create, delete and modify custom fields"
+msgstr "新增�删除�更改自订字段"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "Create, delete and modify queues"
+msgstr "新增�删除�更改表�"
+
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
+msgstr "新增�删除�更改任何使用者的代�人群组"
+
+#: lib/RT/System.pm:58
+msgid "Create, delete and modify the members of personal groups"
+msgstr "新增�删除�更改代�人群组"
+
+#: lib/RT/System.pm:59
+msgid "Create, delete and modify users"
+msgstr "新增�删除�更改使用者"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "CreateTicket"
+msgstr "新增申请�"
+
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:26 lib/RT/Ticket_Overlay.pm:1175
+msgid "Created"
+msgstr "新增日"
+
+#: html/Admin/Elements/EditCustomField:87
+#. ($CustomFieldObj->Name())
+msgid "Created CustomField %1"
+msgstr "自订字段 %1 新增�功"
+
+#: NOT FOUND IN SOURCE
+msgid "Created template %1"
+msgstr "模� %1 新增�功"
+
+#: html/Admin/Elements/ModifyWorkflow:221
+#. (loc( $WorkflowObj->Name() ))
+msgid "Created workflow %1"
+msgstr "�程 %1 新增�功"
+
+#: NOT FOUND IN SOURCE
+msgid "Currency"
+msgstr "�别"
+
+#: NOT FOUND IN SOURCE
+msgid "Current Approval Info"
+msgstr "截至目�签核信�"
+
+#: NOT FOUND IN SOURCE
+msgid "Current Custom Fields"
+msgstr "现有自订字段"
+
+#: html/Edit/Groups/MemberGroups/Add.html:14
+msgid "Current Groups:"
+msgstr "现有群组列表："
+
+#: html/Ticket/Elements/EditLinks:27
+msgid "Current Relationships"
+msgstr "现有关系"
+
+#: html/Edit/Rights/index.html:19
+msgid "Current Rights:"
+msgstr "现有��："
+
+#: html/Admin/Elements/EditScrips:29
+msgid "Current Scrips"
+msgstr "现有手续"
+
+#: html/Work/Tickets/Create.html:48 html/Work/Tickets/Elements/ShowBasics:39
+msgid "Current Status"
+msgstr "目�状�"
+
+#: NOT FOUND IN SOURCE
+msgid "Current Templates"
+msgstr "现有模�"
+
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
+msgid "Current members"
+msgstr "现有�员"
+
+#: html/Admin/Elements/SelectRights:28
+msgid "Current rights"
+msgstr "现有��"
+
+#: html/Search/Listing.html:70 html/Work/Search/index.html:42
+msgid "Current search criteria"
+msgstr "现有查询�件"
+
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
+msgid "Current watchers"
+msgstr "现有视察员"
+
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr "自订字段 #%1"
+
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Edit/Global/autohandler:7 html/Edit/Queues/autohandler:18 html/Ticket/Elements/ShowSummary:35
+msgid "Custom Fields"
+msgstr "自订字段"
+
+#: NOT FOUND IN SOURCE
+msgid "Custom Fields which apply to all queues"
+msgstr "适用于所有表�的自订字段"
+
+#: html/Admin/Elements/EditScrip:72 html/Edit/Global/Scrip/Top:69
+msgid "Custom action cleanup code"
+msgstr "动作�执行程�"
+
+#: html/Admin/Elements/EditScrip:64 html/Edit/Global/Scrip/Top:62
+msgid "Custom action preparation code"
+msgstr "动作�执行程�"
+
+#: html/Admin/Elements/EditScrip:48 html/Edit/Global/Scrip/Top:35 html/Edit/Global/Scrip/Top:61
+msgid "Custom condition"
+msgstr "自订�件"
+
+#: lib/RT/Tickets_Overlay.pm:1618
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
+msgid "Custom field %1 %2 %3"
+msgstr "自订字段 %1 %2 %3"
+
+#: lib/RT/Tickets_Overlay.pm:1613
+#. ($CF->Name)
+msgid "Custom field %1 has a value."
+msgstr "自订字段 %1 已有值"
+
+#: lib/RT/Tickets_Overlay.pm:1610
+#. ($CF->Name)
+msgid "Custom field %1 has no value."
+msgstr "自订字段 %1 没有值"
+
+#: lib/RT/Ticket_Overlay.pm:3463
+#. ($args{'Field'})
+msgid "Custom field %1 not found"
+msgstr "找�到自订字段 %1"
+
+#: html/Admin/Elements/EditCustomFields:196
+msgid "Custom field deleted"
+msgstr "自订字段已删除"
+
+#: lib/RT/Ticket_Overlay.pm:3613
+msgid "Custom field not found"
+msgstr "找�到自订字段"
+
+#: lib/RT/CustomField_Overlay.pm:349
+#. ($args{'Content'}, $self->Name)
+msgid "Custom field value %1 could not be found for custom field %2"
+msgstr "无法从自订字段 %2 中找到 %1 这个字段值"
+
+#: NOT FOUND IN SOURCE
+msgid "Custom field value changed from %1 to %2"
+msgstr "自订字段值从 %1 改为 %2"
+
+#: lib/RT/CustomField_Overlay.pm:249
+msgid "Custom field value could not be deleted"
+msgstr "无法删除自订字段值"
+
+#: lib/RT/CustomField_Overlay.pm:355
+msgid "Custom field value could not be found"
+msgstr "找�到自订字段值"
+
+#: lib/RT/CustomField_Overlay.pm:247 lib/RT/CustomField_Overlay.pm:357
+msgid "Custom field value deleted"
+msgstr "自订字段值删除�功"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:145 html/Edit/Global/Workflow/Owner.html:90 lib/RT/Transaction_Overlay.pm:548
+msgid "CustomField"
+msgstr "自订字段"
+
+#: NOT FOUND IN SOURCE
+msgid "Data error"
+msgstr "数�错误"
+
+#: NOT FOUND IN SOURCE
+msgid "Date of Departure"
+msgstr "出�日期"
+
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:92 html/Ticket/ModifyAll.html:43 html/Work/Tickets/Elements/ShowTransaction:14
+msgid "Dates"
+msgstr "日期"
+
+#: NOT FOUND IN SOURCE
+msgid "Dec"
+msgstr "�二月"
+
+#: lib/RT/Date.pm:422
+msgid "Dec."
+msgstr "12"
+
+#: NOT FOUND IN SOURCE
+msgid "December"
+msgstr "�二月"
+
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr "预设自动�应模�"
+
+#: etc/initialdata:225
+msgid "Default Autoresponse template"
+msgstr "预设自动�应模�"
+
+#: etc/initialdata:304
+msgid "Default admin comment template"
+msgstr "预设管�员评论模�"
+
+#: etc/initialdata:262
+msgid "Default admin correspondence template"
+msgstr "预设管�员回�模�"
+
+#: etc/initialdata:283
+msgid "Default correspondence template"
+msgstr "预设回�模�"
+
+#: etc/initialdata:240
+msgid "Default transaction template"
+msgstr "预设更动模�"
+
+#: lib/RT/Transaction_Overlay.pm:643
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr "预设：%1/%2 已自 %3 改为 %4"
+
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
+msgid "Delegate rights"
+msgstr "代表团��"
+
+#: lib/RT/System.pm:62
+msgid "Delegate specific rights which have been granted to you."
+msgstr "将拥有的��委托他人代�"
+
+#: lib/RT/System.pm:62
+msgid "DelegateRights"
+msgstr "设定代�人"
+
+#: NOT FOUND IN SOURCE
+msgid "Delegated Approval"
+msgstr "代�签核"
+
+#: NOT FOUND IN SOURCE
+msgid "Delegated Queue"
+msgstr "代�表��称"
+
+#: NOT FOUND IN SOURCE
+msgid "Delegated Queue:"
+msgstr "代�表�："
+
+#: NOT FOUND IN SOURCE
+msgid "Delegated Type"
+msgstr "代�表��类"
+
+#: html/Edit/Users/index.html:125 html/Work/Delegates/Info:31 html/Work/Delegates/List:8 html/Work/Elements/Tab:39 html/Work/Overview/Info:28
+msgid "Delegates"
+msgstr "代�人"
+
+#: NOT FOUND IN SOURCE
+msgid "Delegates Enabled Status"
+msgstr "代�激活状�"
+
+#: html/Work/Delegates/Info:18 html/Work/Overview/Info:18
+msgid "Delegates Info"
+msgstr "代�人信�"
+
+#: NOT FOUND IN SOURCE
+msgid "Delegates Period"
+msgstr "代�期间"
+
+#: NOT FOUND IN SOURCE
+msgid "Delegates Permission Setting"
+msgstr "代���设定"
+
+#: NOT FOUND IN SOURCE
+msgid "Delegates Permission:"
+msgstr "代���："
+
+#: NOT FOUND IN SOURCE
+msgid "Delegates Setting"
+msgstr "代�人设定"
+
+#: html/Work/Delegates/Info:46 html/Work/Delegates/List:11 html/Work/Overview/Info:39
+msgid "Delegates Status"
+msgstr "代�状�"
+
+#: html/User/Elements/Tabs:37
+msgid "Delegation"
+msgstr "代�人��"
+
+#: NOT FOUND IN SOURCE
+msgid "Delegation Groups"
+msgstr "代�人群组"
+
+#: NOT FOUND IN SOURCE
+msgid "Delegation Rights"
+msgstr "代�人��"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:113 html/Edit/Elements/104Buttons:73 html/Work/Search/index.html:48 html/Work/Search/index.html:48
+msgid "Delete"
+msgstr "删除"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "Delete tickets"
+msgstr "删除申请�"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "DeleteTicket"
+msgstr "删除申请�"
+
+#: lib/RT/Transaction_Overlay.pm:187
+msgid "Deleting this object could break referential integrity"
+msgstr "删除此对象�能破��考完整性"
+
+#: lib/RT/Queue_Overlay.pm:293
+msgid "Deleting this object would break referential integrity"
+msgstr "删除此对象�能破��考完整性"
+
+#: lib/RT/User_Overlay.pm:497
+msgid "Deleting this object would violate referential integrity"
+msgstr "删除此对象会���考完整性"
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity."
+msgstr "删除此对象会���考完整性"
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity. That's bad."
+msgstr "删除此对象会���考完整性"
+
+#: html/Approvals/Elements/Approve:44 html/Work/Approvals/Elements/Approve:32
+msgid "Deny"
+msgstr "驳回"
+
+#: NOT FOUND IN SOURCE
+msgid "Department"
+msgstr "部门"
+
+#: html/Edit/Global/UserRight/List:12 html/Edit/Global/UserRight/Top:13 html/Edit/Users/List:10 html/Edit/Users/Top:12
+msgid "Department ID"
+msgstr "部门代�"
+
+#: html/Edit/Global/UserRight/List:11 html/Edit/Global/UserRight/Top:49 html/Edit/Users/List:9 html/Edit/Users/Top:48 html/Work/Delegates/Info:78 html/Work/Overview/Info:60
+msgid "Department Name"
+msgstr "部门�称"
+
+#: NOT FOUND IN SOURCE
+msgid "Department's"
+msgstr "部门之"
+
+#: NOT FOUND IN SOURCE
+msgid "Departure Details"
+msgstr "差旅明细"
+
+#: NOT FOUND IN SOURCE
+msgid "Departure From"
+msgstr "差旅起始日"
+
+#: NOT FOUND IN SOURCE
+msgid "Departure Request"
+msgstr "请��"
+
+#: NOT FOUND IN SOURCE
+msgid "Departure Until"
+msgstr "差旅截止日"
+
+#: html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/EditLinks:122 html/Ticket/Elements/EditLinks:46 html/Ticket/Elements/ShowDependencies:31 html/Ticket/Elements/ShowLinks:36 html/Work/Search/BulkLinks:10
+msgid "Depended on by"
+msgstr "�接续处�的申请�"
+
+#: NOT FOUND IN SOURCE
+msgid "Dependencies: \\n"
+msgstr "附属性：\\n"
+
+#: html/Elements/SelectLinkType:26 html/Ticket/Create.html:179 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/EditLinks:118 html/Ticket/Elements/EditLinks:35 html/Ticket/Elements/ShowDependencies:24 html/Ticket/Elements/ShowLinks:26 html/Work/Search/BulkLinks:6
+msgid "Depends on"
+msgstr "需先处�"
+
+#: NOT FOUND IN SOURCE
+msgid "DependsOn"
+msgstr "需先处�"
+
+#: html/Elements/SelectSortOrder:34
+msgid "Descending"
+msgstr "递�"
+
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
+msgid "Describe the issue below"
+msgstr "在以下字段�述主题"
+
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:33 html/Admin/Elements/ModifyQueue:35 html/Admin/Elements/ModifyTemplate:35 html/Admin/Elements/ModifyTemplateAsWorkflow:192 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Edit/Global/Workflow/Action:14 html/Elements/SelectGroups:26 html/User/Groups/Modify.html:48 html/Work/Preferences/Info:98
+msgid "Description"
+msgstr "�述"
+
+#: NOT FOUND IN SOURCE
+msgid "Description of Responsibility"
+msgstr "�办业务说明"
+
+#: NOT FOUND IN SOURCE
+msgid "Description:"
+msgstr "�述："
+
+#: html/Work/Tickets/Create.html:108 html/Work/Tickets/Elements/EditCustomFields:39 html/Work/Tickets/Elements/ShowCustomFields:41
+msgid "Details"
+msgstr "细节"
+
+#: NOT FOUND IN SOURCE
+msgid "Direct"
+msgstr "直接"
+
+#: html/Edit/Users/Info:31
+msgid "Disability"
+msgstr "残障身分"
+
+#: html/Edit/Users/Info:29
+msgid "Disability Type"
+msgstr "残障类别"
+
+#: html/Edit/Global/GroupRight/List:9 html/Edit/Global/GroupRight/Top:16 html/Edit/Groups/List:11 html/Edit/Groups/Top:19 html/Edit/Queues/Basic/Top:70 html/Edit/Queues/List:13 html/Work/Delegates/Info:48 html/Work/Delegates/Info:53 html/Work/Delegates/List:12 html/Work/Overview/Info:42
+msgid "Disabled"
+msgstr "�用"
+
+#: html/Ticket/Elements/Tabs:84
+msgid "Display"
+msgstr "显示内容"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "Display Access Control List"
+msgstr "显示��控制清�"
+
+#: lib/RT/Queue_Overlay.pm:74
+msgid "Display Scrip templates for this queue"
+msgstr "显示此表�的模�"
+
+#: lib/RT/Queue_Overlay.pm:77
+msgid "Display Scrips for this queue"
+msgstr "显示此表�的手续"
+
+#: html/Ticket/Elements/ShowHistory:34
+msgid "Display mode"
+msgstr "显示模�"
+
+#: NOT FOUND IN SOURCE
+msgid "Display ticket #%1"
+msgstr "显示第%1�申请�"
+
+#: lib/RT/System.pm:53
+msgid "Do anything and everything"
+msgstr "�许一切�作"
+
+#: html/Elements/Refresh:29
+msgid "Don't refresh this page."
+msgstr "�更新此页�。"
+
+#: html/Search/Elements/PickRestriction:113 html/Work/Search/PickRestriction:95
+msgid "Don't show search results"
+msgstr "�显示查询结果"
+
+#: html/Edit/Elements/Page:19 html/Edit/Elements/Page:21
+msgid "Down"
+msgstr "下一页"
+
+#: html/Ticket/Elements/ShowTransaction:92
+msgid "Download"
+msgstr "下载"
+
+#: NOT FOUND IN SOURCE
+msgid "Dr."
+msgstr "�士"
+
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:42 lib/RT/Ticket_Overlay.pm:1179
+msgid "Due"
+msgstr "到期日"
+
+#: NOT FOUND IN SOURCE
+msgid "Due Date"
+msgstr "截止日"
+
+#: NOT FOUND IN SOURCE
+msgid "Due date '%1' could not be parsed"
+msgstr "无法解读日期 '%1'"
+
+#: bin/rt-commit-handler:753
+#. ($1, $msg)
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
+msgstr "无法加载申请� '%1'：%2.\\n"
+
+#: html/Work/Tickets/Update.html:46
+msgid "Edit"
+msgstr "编辑"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:132
+msgid "Edit Conditions"
+msgstr "编辑�置�件"
+
+#: html/Admin/Queues/CustomFields.html:44
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr "编辑 %1 的自订字段"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit Custom Fields for queue %1"
+msgstr "编辑表� %1 的自订字段"
+
+#: html/Search/Bulk.html:143 html/Ticket/ModifyLinks.html:35 html/Work/Search/Bulk.html:93
+msgid "Edit Relationships"
+msgstr "编辑申请�关系"
+
+#: html/Edit/Groups/MemberGroups/Add.html:3 html/Edit/Groups/MemberGroups/index.html:22
+msgid "Edit Subgroups"
+msgstr "新增/维护�群组"
+
+#: html/Admin/Queues/Templates.html:41
+#. ($QueueObj->Name)
+msgid "Edit Templates for queue %1"
+msgstr "编辑表� %1 的模�"
+
+#: html/Admin/Queues/Workflows.html:42
+#. ($QueueObj->Name)
+msgid "Edit Workflows for queue %1"
+msgstr "编辑表� %1 的�程"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit keywords"
+msgstr "编辑关键�"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr "编辑手续"
+
+#: html/Admin/Global/index.html:45
+msgid "Edit system templates"
+msgstr "编辑全域模�"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit system workflows"
+msgstr "编辑全域�程"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit templates for %1"
+msgstr "编辑 %1 的模�"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit workflows for %1"
+msgstr "编辑 %1 的�程"
+
+#: html/Admin/Elements/ModifyQueue:24 html/Admin/Queues/Modify.html:118
+#. ($QueueObj->Name)
+#. ($QueueObj->Id)
+msgid "Editing Configuration for queue %1"
+msgstr "编辑表� %1 的设定"
+
+#: html/Admin/Elements/ModifyUser:24
+#. ($UserObj->Name)
+msgid "Editing Configuration for user %1"
+msgstr "编辑使用者 %1 的设定"
+
+#: html/Admin/Elements/EditCustomField:90
+#. ($CustomFieldObj->Name())
+msgid "Editing CustomField %1"
+msgstr "编辑自订字段 %1"
+
+#: html/Admin/Groups/Members.html:31
+#. ($Group->Name)
+msgid "Editing membership for group %1"
+msgstr "编辑群组 %1 的�员信�"
+
+#: html/User/Groups/Members.html:128
+#. ($Group->Name)
+msgid "Editing membership for personal group %1"
+msgstr "编辑代�人群组 %1 的�员信�"
+
+#: NOT FOUND IN SOURCE
+msgid "Editing template %1"
+msgstr "编辑模� %1"
+
+#: html/Admin/Elements/ModifyWorkflow:238
+#. (loc( $WorkflowObj->Name() ))
+msgid "Editing workflow %1"
+msgstr "编辑�程 %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Education"
+msgstr "最高学历"
+
+#: NOT FOUND IN SOURCE
+msgid "EffectiveId"
+msgstr "有效编�"
+
+#: lib/RT/Ticket_Overlay.pm:2644 lib/RT/Ticket_Overlay.pm:2712
+msgid "Either base or target must be specified"
+msgstr "需�指定起始申请�或目的申请�"
+
+#: html/Admin/Users/Modify.html:52 html/Admin/Users/Prefs.html:45 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:41 html/Work/Delegates/Info:96 html/Work/Overview/Info:78 html/Work/Preferences/Info:16
+msgid "Email"
+msgstr "电�邮件信箱"
+
+#: lib/RT/User_Overlay.pm:247
+msgid "Email address in use"
+msgstr "此电�邮件信箱已被使用"
+
+#: html/Admin/Elements/ModifyUser:41
+msgid "EmailAddress"
+msgstr "电�邮件信箱地�"
+
+#: html/Admin/Elements/ModifyUser:53
+msgid "EmailEncoding"
+msgstr "电�邮件文字编�方�"
+
+#: NOT FOUND IN SOURCE
+msgid "Embark Date"
+msgstr "外�员工入境日"
+
+#: NOT FOUND IN SOURCE
+msgid "Embarked Date"
+msgstr "抵达日期"
+
+#: NOT FOUND IN SOURCE
+msgid "Embarked Location"
+msgstr "抵达地点"
+
+#: NOT FOUND IN SOURCE
+msgid "Enable Delegates"
+msgstr "代�激活"
+
+#: html/Admin/Elements/EditCustomField:50
+msgid "Enabled (Unchecking this box disables this custom field)"
+msgstr "�用(�消勾选将�用此自订字段)"
+
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
+msgid "Enabled (Unchecking this box disables this group)"
+msgstr "�用(�消勾选将�用此群组)"
+
+#: html/Admin/Queues/Modify.html:83
+msgid "Enabled (Unchecking this box disables this queue)"
+msgstr "�用(�消勾选将�用此表�)"
+
+#: html/Admin/Elements/EditCustomFields:98
+msgid "Enabled Custom Fields"
+msgstr "已�用的自订字段"
+
+#: html/Edit/Queues/Basic/Top:75 html/Edit/Queues/List:15
+msgid "Enabled Date"
+msgstr "�用日期"
+
+#: NOT FOUND IN SOURCE
+msgid "Enabled Date:"
+msgstr "激活日期："
+
+#: html/Admin/Queues/index.html:55
+msgid "Enabled Queues"
+msgstr "已�用的表�"
+
+#: html/Edit/Queues/Basic/Top:66 html/Edit/Queues/List:11
+msgid "Enabled Status"
+msgstr "�用状�"
+
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:282 html/User/Groups/Modify.html:116
+#. (loc_fuzzy($msg))
+msgid "Enabled status %1"
+msgstr "�用状� %1"
+
+#: html/Edit/Users/Info:35
+msgid "End of Trial"
+msgstr "试用期满日"
+
+#: NOT FOUND IN SOURCE
+msgid "English Name"
+msgstr "英文姓�"
+
+#: lib/RT/CustomField_Overlay.pm:427
+msgid "Enter multiple values"
+msgstr "键入多�项目"
+
+#: html/Edit/Users/Search.html:15
+msgid "Enter one or more conditions below to search for users"
+msgstr "输入下列�一或���件，查询用户数�"
+
+#: lib/RT/CustomField_Overlay.pm:424
+msgid "Enter one value"
+msgstr "键入�一项目"
+
+#: html/Search/Bulk.html:144 html/Ticket/Elements/EditLinks:111 html/Work/Search/Bulk.html:95
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "输入申请��链接到的申请�编�或网�。以空白隔开。"
+
+#: lib/RT/CustomField_Vendor.pm:20
+msgid "EntryBoolean"
+msgstr "是�填表"
+
+#: lib/RT/CustomField_Vendor.pm:17
+msgid "EntryDate"
+msgstr "日期填表"
+
+#: NOT FOUND IN SOURCE
+msgid "EntryExternal"
+msgstr "系统填表"
+
+#: lib/RT/CustomField_Vendor.pm:16
+msgid "EntryFreeform"
+msgstr "输入填表"
+
+#: NOT FOUND IN SOURCE
+msgid "EntryMultiple"
+msgstr "多选填表"
+
+#: lib/RT/CustomField_Vendor.pm:19
+msgid "EntryNumber"
+msgstr "数值填表"
+
+#: lib/RT/CustomField_Vendor.pm:15
+msgid "EntrySelect"
+msgstr "�选填表"
+
+#: lib/RT/CustomField_Vendor.pm:18
+msgid "EntryTime"
+msgstr "时间填表"
+
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
+msgid "Error"
+msgstr "错误"
+
+#: NOT FOUND IN SOURCE
+msgid "Error adding watcher"
+msgstr "新增视察员失败"
+
+#: lib/RT/Queue_Overlay.pm:555
+msgid "Error in parameters to Queue->AddWatcher"
+msgstr "表�->新增视察员的�数有误"
+
+#: lib/RT/Queue_Overlay.pm:713
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr "表�->删除视察员的�数有误"
+
+#: lib/RT/Ticket_Overlay.pm:1364
+msgid "Error in parameters to Ticket->AddWatcher"
+msgstr "申请�->新增视察员的�数有误"
+
+#: lib/RT/Ticket_Overlay.pm:1540
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr "申请�->删除视察员的�数有误"
+
+#: etc/initialdata:38
+msgid "Everyone"
+msgstr "所有人"
+
+#: bin/rt-crontool:193
+msgid "Example:"
+msgstr "范例："
+
+#: html/Edit/Elements/104Buttons:77
+msgid "Export"
+msgstr "汇出"
+
+#: html/Admin/Elements/ModifyUser:63
+msgid "ExternalAuthId"
+msgstr "外部认���"
+
+#: html/Admin/Elements/ModifyUser:57
+msgid "ExternalContactInfoId"
+msgstr "外部�络方���"
+
+#: html/Edit/Global/Basic/Top:64
+msgid "ExternalDatabaseDSN"
+msgstr "外部数�库连结字符串"
+
+#: html/Edit/Global/Basic/Top:68
+msgid "ExternalDatabasePass"
+msgstr "外部数�库�令"
+
+#: html/Edit/Global/Basic/Top:66
+msgid "ExternalDatabaseUser"
+msgstr "外部数�库用户"
+
+#: html/Edit/Global/Basic/Top:62
+msgid "ExternalURL"
+msgstr "外部接�网�"
+
+#: html/Admin/Users/Modify.html:72
+msgid "Extra info"
+msgstr "备注"
+
+#: lib/RT/User_Overlay.pm:361
+msgid "Failed to find 'Privileged' users pseudogroup."
+msgstr "找�到「内部�员�虚拟群组的使用者。"
+
+#: lib/RT/User_Overlay.pm:368
+msgid "Failed to find 'Unprivileged' users pseudogroup"
+msgstr "找�到「�内部�员�虚拟群组的使用者。"
+
+#: bin/rt-crontool:137
+#. ($modname, $@)
+msgid "Failed to load module %1. (%2)"
+msgstr "无法加载模� %1. (%2)"
+
+#: NOT FOUND IN SOURCE
+msgid "Feb"
+msgstr "二月"
+
+#: lib/RT/Date.pm:412
+msgid "Feb."
+msgstr "02"
+
+#: NOT FOUND IN SOURCE
+msgid "February"
+msgstr "二月"
+
+#: NOT FOUND IN SOURCE
+msgid "Female"
+msgstr "女"
+
+#: html/Edit/Global/CustomField/List:5 html/Edit/Global/CustomField/Top:9
+msgid "Field Attribute"
+msgstr "字段属性"
+
+#: html/Edit/Global/CustomField/Info:14
+msgid "Field Content:"
+msgstr "字段内容："
+
+#: html/Edit/Global/CustomField/List:7 html/Edit/Global/CustomField/Top:21
+msgid "Field Description"
+msgstr "字段�述"
+
+#: html/Edit/Global/CustomField/List:6 html/Edit/Global/CustomField/Top:15
+msgid "Field Name"
+msgstr "字段�称"
+
+#: html/Edit/Elements/PickUsers:52 html/Edit/Users/Add.html:47
+msgid "Filter"
+msgstr "筛选"
+
+#: html/Edit/Elements/PickUsers:6 html/Edit/Users/Add.html:7 html/Work/Tickets/Cc:4
+msgid "Filter people"
+msgstr "对象筛选"
+
+#: html/Edit/Elements/PickUsers:68 html/Edit/Users/Add.html:63 html/Work/Tickets/Cc:42
+msgid "Filtered list:"
+msgstr "筛选列表："
+
+#: NOT FOUND IN SOURCE
+msgid "Fin"
+msgstr "最终"
+
+#: html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:58 lib/RT/Tickets_Overlay.pm:1091
+msgid "Final Priority"
+msgstr "最低顺�"
+
+#: lib/RT/Ticket_Overlay.pm:1170
+msgid "FinalPriority"
+msgstr "最低顺�"
+
+#: NOT FOUND IN SOURCE
+msgid "Financial Department:"
+msgstr "财务部："
+
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
+msgid "Find group whose"
+msgstr "寻找群组的"
+
+#: NOT FOUND IN SOURCE
+msgid "Find new/open tickets"
+msgstr "寻找/开�申请�"
+
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
+msgid "Find people whose"
+msgstr "寻找人员的"
+
+#: html/Search/Listing.html:107 html/Work/Search/index.html:88
+msgid "Find tickets"
+msgstr "寻找申请�"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:118
+msgid "Finish Approval"
+msgstr "签核完毕"
+
+#: html/Ticket/Elements/Tabs:57
+msgid "First"
+msgstr "第一项"
+
+#: html/Search/Listing.html:40 html/Work/Search/index.html:17
+msgid "First page"
+msgstr "第一页"
+
+#: html/Edit/Global/Workflow/Owner.html:30
+msgid "First-"
+msgstr "一"
+
+#: NOT FOUND IN SOURCE
+msgid "First-level Admins"
+msgstr "一阶主管"
+
+#: html/Edit/Users/Info:40
+msgid "First-level Users"
+msgstr "一阶主管员工"
+
+#: NOT FOUND IN SOURCE
+msgid "Fixed shift"
+msgstr "固定�"
+
+#: docs/design_docs/string-extraction-guide.txt:33
+msgid "Foo Bar Baz"
+msgstr "甲 乙 丙"
+
+#: docs/design_docs/string-extraction-guide.txt:24
+msgid "Foo!"
+msgstr "甲�"
+
+#: html/Search/Bulk.html:86 html/Work/Search/Bulk.html:55
+msgid "Force change"
+msgstr "强制更新"
+
+#: html/Work/Elements/104Header:89
+msgid "Form Processing"
+msgstr "电�表�作业区"
+
+#: html/Search/Listing.html:105 html/Work/Search/index.html:86
+#. ($ticketcount)
+msgid "Found %quant(%1,ticket)"
+msgstr "找到 %1 张申请�"
+
+#: lib/RT/Interface/Web.pm:904
+msgid "Found Object"
+msgstr "已找到对象"
+
+#: html/Edit/Global/Workflow/Owner.html:33
+msgid "Fourth-"
+msgstr "å››"
+
+#: html/Admin/Elements/ModifyUser:43
+msgid "FreeformContactInfo"
+msgstr "�络方�"
+
+#: lib/RT/CustomField_Vendor.pm:11
+msgid "FreeformDate"
+msgstr "日期输入"
+
+#: NOT FOUND IN SOURCE
+msgid "FreeformExternal"
+msgstr "系统字段"
+
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformMultiple"
+msgstr "多�输入"
+
+#: lib/RT/CustomField_Vendor.pm:13
+msgid "FreeformNumber"
+msgstr "数值输入"
+
+#: lib/RT/CustomField_Vendor.pm:14
+msgid "FreeformPassword"
+msgstr "�令输入"
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "FreeformSingle"
+msgstr "�一输入"
+
+#: lib/RT/CustomField_Vendor.pm:12
+msgid "FreeformTime"
+msgstr "时间输入"
+
+#: NOT FOUND IN SOURCE
+msgid "Fri"
+msgstr "星期五"
+
+#: lib/RT/Date.pm:392
+msgid "Fri."
+msgstr "星期五"
+
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
+msgid "Full headers"
+msgstr "完整标头档"
+
+#: NOT FOUND IN SOURCE
+msgid "Gecos"
+msgstr "登入��"
+
+#: html/Edit/Users/Info:26
+msgid "Gender"
+msgstr "性别"
+
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr "�得目�使用者的 pgp 签章\\n"
+
+#: lib/RT/Transaction_Overlay.pm:593
+#. ($New->Name)
+msgid "Given to %1"
+msgstr "交予 %1"
+
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
+msgid "Global"
+msgstr "全域设定"
+
+#: NOT FOUND IN SOURCE
+msgid "Global Keyword Selections"
+msgstr "全域关键�选�"
+
+#: html/Edit/Users/System:24
+msgid "Global Rights:"
+msgstr "拥有全域��列表："
+
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
+msgstr "全域手续"
+
+#: html/Edit/Elements/Tab:38
+msgid "Global Setup"
+msgstr "全域设定"
+
+#: html/Admin/Elements/SelectTemplate:37 html/Edit/Elements/SelectTemplate:11
+#. (loc($Template->Name))
+msgid "Global template: %1"
+msgstr "全域模�：%1"
+
+#: html/Admin/Elements/EditCustomFields:74 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:40
+msgid "Go!"
+msgstr "执行"
+
+#: NOT FOUND IN SOURCE
+msgid "Good pgp sig from %1\\n"
+msgstr "%1 的 pgp 签章是正确的\\n"
+
+#: html/Search/Listing.html:49
+msgid "Goto page"
+msgstr "到页�"
+
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24 html/Work/Elements/104Header:49
+msgid "Goto ticket"
+msgstr "跳到申请�"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:224
+msgid "Grand"
+msgstr "上"
+
+#: html/Ticket/Elements/AddWatchers:45 html/User/Elements/DelegateRights:77
+msgid "Group"
+msgstr "群组"
+
+#: NOT FOUND IN SOURCE
+msgid "Group %1 %2: %3"
+msgstr "群组 %1 %2：%3"
+
+#: html/Edit/Global/GroupRight/List:5 html/Edit/Global/GroupRight/Top:20 html/Edit/Groups/List:7
+msgid "Group Description"
+msgstr "群组�述"
+
+#: NOT FOUND IN SOURCE
+msgid "Group Management"
+msgstr "群组管�"
+
+#: NOT FOUND IN SOURCE
+msgid "Group Members"
+msgstr "群组�员"
+
+#: html/Edit/Elements/PickUsers:28 html/Edit/Global/GroupRight/List:4 html/Edit/Global/GroupRight/Top:10 html/Edit/Groups/List:6 html/Edit/Groups/Top:7 html/Edit/Users/Add.html:29 html/Edit/Users/Group:10 html/Edit/Users/Search.html:43 html/Work/Delegates/Add.html:15 html/Work/Tickets/Cc:24
+msgid "Group Name"
+msgstr "群组�称"
+
+#: NOT FOUND IN SOURCE
+msgid "Group Name:"
+msgstr "群组�称："
+
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54 html/Edit/Global/autohandler:12 html/Edit/Queues/autohandler:23 html/Edit/Users/Group:11 html/Edit/Users/index.html:123
+msgid "Group Rights"
+msgstr "群组��"
+
+#: NOT FOUND IN SOURCE
+msgid "Group Rights:"
+msgstr "拥有群组��列表："
+
+#: html/Edit/Elements/Tab:34
+msgid "Group Setup"
+msgstr "群组设定"
+
+#: html/Edit/Global/GroupRight/List:8 html/Edit/Global/GroupRight/Top:14 html/Edit/Groups/List:10 html/Edit/Groups/Top:15
+msgid "Group Status"
+msgstr "群组状�"
+
+#: lib/RT/Group_Overlay.pm:964
+msgid "Group already has member"
+msgstr "群组内已有此�员"
+
+#: NOT FOUND IN SOURCE
+msgid "Group could not be created."
+msgstr "无法新增群组"
+
+#: html/Admin/Groups/Modify.html:76
+#. ($create_msg)
+msgid "Group could not be created: %1"
+msgstr "无法新增群组：%1"
+
+#: lib/RT/Group_Overlay.pm:496
+msgid "Group created"
+msgstr "群组新增完毕"
+
+#: lib/RT/Group_Overlay.pm:1132
+msgid "Group has no such member"
+msgstr "群组没有这个�员"
+
+#: lib/RT/Group_Overlay.pm:944 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1437 lib/RT/Ticket_Overlay.pm:1515
+msgid "Group not found"
+msgstr "找�到群组"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not found.\\n"
+msgstr "找�到群组。\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not specified.\\n"
+msgstr "未指定群组。\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Group with Queue Rights"
+msgstr "拥有表���群组"
+
+#: html/Edit/Global/Workflow/Owner.html:70
+msgid "Group's"
+msgstr "群组之"
+
+#: NOT FOUND IN SOURCE
+msgid "Group:"
+msgstr "群组："
+
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/Edit/Global/GroupRight/Add.html:15 html/User/Groups/Members.html:66
+msgid "Groups"
+msgstr "群组"
+
+#: lib/RT/Group_Overlay.pm:970
+msgid "Groups can't be members of their members"
+msgstr "�能将群组设为群组内�员"
+
+#: NOT FOUND IN SOURCE
+msgid "Groups with Global Rights"
+msgstr "拥有全域��群组"
+
+#: html/Edit/Global/GroupRight/List:6 html/Edit/Global/GroupRight/Top:22 html/Edit/Groups/List:8
+msgid "HRMSDefined"
+msgstr "组织架构"
+
+#: html/Edit/Users/Info:32
+msgid "Health Insurance"
+msgstr "��补助身份"
+
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
+msgid "Hello!"
+msgstr "嗨�"
+
+#: docs/design_docs/string-extraction-guide.txt:40
+#. ($name)
+msgid "Hello, %1"
+msgstr "嗨，%1"
+
+#: html/Edit/Elements/104Top:27
+msgid "Help"
+msgstr "辅助说明"
+
+#: NOT FOUND IN SOURCE
+msgid "Help Desks"
+msgstr "�项业务窗�"
+
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:87 html/Work/Tickets/Elements/ShowHistory:8
+msgid "History"
+msgstr "纪录"
+
+#: html/Admin/Elements/ModifyUser:67
+msgid "HomePhone"
+msgstr "�处电�"
+
+#: html/Edit/Elements/104Top:15 html/Edit/Elements/104Top:23 html/Edit/Elements/EDOMHeader:9 html/Elements/Tabs:43
+msgid "Homepage"
+msgstr "主页"
+
+#: NOT FOUND IN SOURCE
+msgid "Hotel Expense"
+msgstr "�宿费"
+
+#: lib/RT/Base.pm:73
+#. (6)
+msgid "I have %quant(%1,concrete mixer)."
+msgstr "我有 %quant(%1,份固体�拌器)。"
+
+#: NOT FOUND IN SOURCE
+msgid "ID Number"
+msgstr "身分��"
+
+#: NOT FOUND IN SOURCE
+msgid "ID Type"
+msgstr "身分类别"
+
+#: html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1018
+msgid "Id"
+msgstr "编�"
+
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38 html/Work/Preferences/Info:14
+msgid "Identity"
+msgstr "身份"
+
+#: etc/initialdata:439 etc/upgrade/2.1.71:86 html/Edit/Elements/CreateApprovalsQueue:58
+msgid "If an approval is rejected, reject the original and delete pending approvals"
+msgstr "若签核��到驳回，则连带驳回原申请�，并删除其它相关的待签核事项"
+
+#: bin/rt-crontool:189
+msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
+msgstr "如果此工具程�为 setgid，��的本地端用户�能由此�得 RT 的管�员��。"
+
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
+msgid "If you've updated anything above, be sure to"
+msgstr "若您已更新以上数�，请记得按一下"
+
+#: lib/RT/Interface/Web.pm:896
+msgid "Illegal value for %1"
+msgstr "%1 的值错误"
+
+#: lib/RT/Interface/Web.pm:899
+msgid "Immutable field"
+msgstr "此字段值��更动"
+
+#: html/Edit/Elements/104Buttons:76 html/Edit/Global/Workflow/Import.html:2
+msgid "Import"
+msgstr "汇入"
+
+#: html/Admin/Elements/EditCustomFields:73
+msgid "Include disabled custom fields in listing."
+msgstr "列出�用的自订字段"
+
+#: html/Admin/Queues/index.html:42 html/Edit/Queues/index.html:38
+msgid "Include disabled queues in listing."
+msgstr "列出�用的表�"
+
+#: html/Admin/Users/index.html:46 html/Edit/Users/Search.html:62
+msgid "Include disabled users in search."
+msgstr "列出�用的使用者"
+
+#: html/Edit/Users/Info:37
+msgid "Indirect Employee"
+msgstr "直接/间接员工"
+
+#: lib/RT/Tickets_Overlay.pm:1067
+msgid "Initial Priority"
+msgstr "�始优先�"
+
+#: lib/RT/Ticket_Overlay.pm:1169 lib/RT/Ticket_Overlay.pm:1171
+msgid "InitialPriority"
+msgstr "�始优先�"
+
+#: lib/RT/ScripAction_Overlay.pm:104
+msgid "Input error"
+msgstr "输入错误"
+
+#: NOT FOUND IN SOURCE
+msgid "Interest noted"
+msgstr "登记�功"
+
+#: lib/RT/Ticket_Overlay.pm:3835
+msgid "Internal Error"
+msgstr "内部错误"
+
+#: lib/RT/Record.pm:142
+#. ($id->{error_message})
+msgid "Internal Error: %1"
+msgstr "内部错误：%1"
+
+#: lib/RT/Group_Overlay.pm:643
+msgid "Invalid Group Type"
+msgstr "错误的群组类别"
+
+#: lib/RT/Principal_Overlay.pm:126
+msgid "Invalid Right"
+msgstr "错误的��"
+
+#: NOT FOUND IN SOURCE
+msgid "Invalid Type"
+msgstr "错误的类型"
+
+#: lib/RT/Interface/Web.pm:901
+msgid "Invalid data"
+msgstr "错误的数�"
+
+#: lib/RT/Ticket_Overlay.pm:439
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr "错误的承办人。改为预设承办人「nobody�。"
+
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:250
+msgid "Invalid queue"
+msgstr "错误的表�"
+
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
+msgid "Invalid right"
+msgstr "错误的��"
+
+#: lib/RT/Record.pm:117
+#. ($key)
+msgid "Invalid value for %1"
+msgstr "%1 的值错误"
+
+#: lib/RT/Ticket_Overlay.pm:3470
+msgid "Invalid value for custom field"
+msgstr "错误的自订字段值"
+
+#: lib/RT/Ticket_Overlay.pm:346
+msgid "Invalid value for status"
+msgstr "错误的状�值"
+
+#: NOT FOUND IN SOURCE
+msgid "IssueStatement"
+msgstr "�出陈述"
+
+#: bin/rt-crontool:190
+msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
+msgstr "请�对��让未具��的使用者执行此工具程�。"
+
+#: bin/rt-crontool:191
+msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
+msgstr "建议您新增一个隶属于正确群组的低��系统使用者，并以该身份执行此工具程�。"
+
+#: bin/rt-crontool:162
+msgid "It takes several arguments:"
+msgstr "它接�下列�数："
+
+#: NOT FOUND IN SOURCE
+msgid "Item Name"
+msgstr "��"
+
+#: NOT FOUND IN SOURCE
+msgid "Items"
+msgstr "笔"
+
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
+msgstr "待签核项目"
+
+#: NOT FOUND IN SOURCE
+msgid "Jan"
+msgstr "一月"
+
+#: lib/RT/Date.pm:411
+msgid "Jan."
+msgstr "01"
+
+#: NOT FOUND IN SOURCE
+msgid "January"
+msgstr "一月"
+
+#: NOT FOUND IN SOURCE
+msgid "Job"
+msgstr "�称"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "Join or leave this group"
+msgstr "加入或离开此群组"
+
+#: NOT FOUND IN SOURCE
+msgid "Jul"
+msgstr "七月"
+
+#: lib/RT/Date.pm:417
+msgid "Jul."
+msgstr "01"
+
+#: NOT FOUND IN SOURCE
+msgid "July"
+msgstr "七月"
+
+#: html/Ticket/Elements/Tabs:98
+msgid "Jumbo"
+msgstr "全部信�"
+
+#: NOT FOUND IN SOURCE
+msgid "Jun"
+msgstr "六月"
+
+#: lib/RT/Date.pm:416
+msgid "Jun."
+msgstr "06."
+
+#: NOT FOUND IN SOURCE
+msgid "June"
+msgstr "六月"
+
+#: NOT FOUND IN SOURCE
+msgid "Keyword"
+msgstr "关键�"
+
+#: lib/RT/CustomField_Vendor.pm:21
+msgid "LabelURL"
+msgstr "链接�标"
+
+#: html/Admin/Elements/ModifyUser:51
+msgid "Lang"
+msgstr "使用语言"
+
+#: html/Ticket/Elements/Tabs:72
+msgid "Last"
+msgstr "上次更新"
+
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:38
+msgid "Last Contact"
+msgstr "上次�络"
+
+#: html/Elements/SelectDateType:28
+msgid "Last Contacted"
+msgstr "上次�络日期"
+
+#: html/Search/Elements/TicketHeader:40 html/Work/Search/TicketHeader:19
+msgid "Last Notified"
+msgstr "上次通知"
+
+#: html/Elements/SelectDateType:29
+msgid "Last Updated"
+msgstr "上次更新"
+
+#: NOT FOUND IN SOURCE
+msgid "LastUpdated"
+msgstr "上次更新"
+
+#: NOT FOUND IN SOURCE
+msgid "Left"
+msgstr "剩馀时间"
+
+#: html/Admin/Users/Modify.html:82
+msgid "Let this user access RT"
+msgstr "�许这�使用者登入"
+
+#: html/Admin/Users/Modify.html:86
+msgid "Let this user be granted rights"
+msgstr "内部�员（具有个人��）"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting owner to %1 %2"
+msgstr "�制承办人为 %1 到%2"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting queue to %1 %2"
+msgstr "�制表�为 %1 到 %2"
+
+#: html/Work/Queues/Select.html:4
+msgid "Link a Queue"
+msgstr "申请表�连结"
+
+#: lib/RT/Ticket_Overlay.pm:2726
+msgid "Link already exists"
+msgstr "此链接已存在"
+
+#: lib/RT/Ticket_Overlay.pm:2738
+msgid "Link could not be created"
+msgstr "无法新增链接"
+
+#: lib/RT/Ticket_Overlay.pm:2746 lib/RT/Ticket_Overlay.pm:2756
+#. ($TransString)
+msgid "Link created (%1)"
+msgstr "链接(%1)新增完毕"
+
+#: lib/RT/Ticket_Overlay.pm:2667
+#. ($TransString)
+msgid "Link deleted (%1)"
+msgstr "链接(%1)删除完毕"
+
+#: lib/RT/Ticket_Overlay.pm:2673
+msgid "Link not found"
+msgstr "找�到链接"
+
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
+#. ($Ticket->Id)
+msgid "Link ticket #%1"
+msgstr "链接申请� #%1"
+
+#: NOT FOUND IN SOURCE
+msgid "Link ticket %1"
+msgstr "链接申请� %1"
+
+#: html/Ticket/Elements/Tabs:96
+msgid "Links"
+msgstr "链接"
+
+#: html/Edit/Users/Search.html:11
+msgid "List All Users"
+msgstr "列出所有用户数�"
+
+#: html/Admin/Users/Modify.html:113 html/User/Prefs.html:84 html/Work/Preferences/Info:72
+msgid "Location"
+msgstr "�置"
+
+#: lib/RT.pm:162
+#. ($RT::LogDir)
+msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
+msgstr "登入目录 %1 找�到或无法写入\\n。无法执行 RT。"
+
+#: html/Edit/Global/Basic/Top:52
+msgid "LogToFile"
+msgstr "纪录等级"
+
+#: html/Edit/Global/Basic/Top:54
+msgid "LogToFileNamed"
+msgstr "纪录档�"
+
+#: html/Elements/Header:56
+#. ("<b>".$session{'CurrentUser'}->Name."</b>")
+msgid "Logged in as %1"
+msgstr "使用者：%1"
+
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54
+msgid "Login"
+msgstr "登入"
+
+#: html/Edit/Elements/104Top:17 html/Edit/Elements/104Top:17 html/Edit/Elements/104Top:29 html/Elements/Header:53
+msgid "Logout"
+msgstr "注销"
+
+#: NOT FOUND IN SOURCE
+msgid "Long-term contractor"
+msgstr "长期契约员工"
+
+#: html/Search/Bulk.html:85 html/Work/Search/Bulk.html:54
+msgid "Make Owner"
+msgstr "新增承办人"
+
+#: html/Search/Bulk.html:109 html/Work/Search/Bulk.html:63
+msgid "Make Status"
+msgstr "新增现况"
+
+#: html/Search/Bulk.html:117 html/Work/Search/Bulk.html:75
+msgid "Make date Due"
+msgstr "新增到期日"
+
+#: html/Search/Bulk.html:119 html/Work/Search/Bulk.html:78
+msgid "Make date Resolved"
+msgstr "新增解决日期"
+
+#: html/Search/Bulk.html:113 html/Work/Search/Bulk.html:69
+msgid "Make date Started"
+msgstr "新增实际起始日期"
+
+#: html/Search/Bulk.html:111 html/Work/Search/Bulk.html:66
+msgid "Make date Starts"
+msgstr "新增应起始日期"
+
+#: html/Search/Bulk.html:115 html/Work/Search/Bulk.html:72
+msgid "Make date Told"
+msgstr "新增报告日期"
+
+#: html/Search/Bulk.html:105 html/Work/Search/Bulk.html:57
+msgid "Make priority"
+msgstr "新增优先顺�"
+
+#: html/Search/Bulk.html:107 html/Work/Search/Bulk.html:60
+msgid "Make queue"
+msgstr "新增表�"
+
+#: html/Search/Bulk.html:103 html/Work/Search/Bulk.html:59
+msgid "Make subject"
+msgstr "新增主题"
+
+#: NOT FOUND IN SOURCE
+msgid "Male"
+msgstr "ç”·"
+
+#: html/Admin/index.html:32
+msgid "Manage groups and group membership"
+msgstr "管�群组�所属�员"
+
+#: html/Admin/index.html:38
+msgid "Manage properties and configuration which apply to all queues"
+msgstr "管�适用于所有表�的属性与设定"
+
+#: html/Admin/index.html:35
+msgid "Manage queues and queue-specific properties"
+msgstr "管��表��相关属性"
+
+#: html/Admin/index.html:29
+msgid "Manage users and passwords"
+msgstr "管�使用者与�令"
+
+#: NOT FOUND IN SOURCE
+msgid "Manager"
+msgstr "��"
+
+#: NOT FOUND IN SOURCE
+msgid "Mar"
+msgstr "三月"
+
+#: lib/RT/Date.pm:413
+msgid "Mar."
+msgstr "03"
+
+#: NOT FOUND IN SOURCE
+msgid "March"
+msgstr "三月"
+
+#: NOT FOUND IN SOURCE
+msgid "Marketing Department"
+msgstr "行销部"
+
+#: NOT FOUND IN SOURCE
+msgid "May"
+msgstr "五月"
+
+#: lib/RT/Date.pm:415
+msgid "May."
+msgstr "05"
+
+#: lib/RT/Group_Overlay.pm:981
+msgid "Member added"
+msgstr "新增�员完毕"
+
+#: lib/RT/Group_Overlay.pm:1139
+msgid "Member deleted"
+msgstr "�员已删除"
+
+#: lib/RT/Group_Overlay.pm:1143
+msgid "Member not deleted"
+msgstr "�员未被删除"
+
+#: html/Elements/SelectLinkType:25
+msgid "Member of"
+msgstr "隶属于"
+
+#: html/Work/Preferences/index.html:20
+msgid "Member since"
+msgstr "注册日期"
+
+#: NOT FOUND IN SOURCE
+msgid "MemberOf"
+msgstr "隶属于"
+
+#: html/Admin/Elements/GroupTabs:41 html/Admin/Elements/ModifyTemplateAsWorkflow:232 html/User/Elements/GroupTabs:41
+msgid "Members"
+msgstr "�员"
+
+#: lib/RT/Ticket_Overlay.pm:2913
+msgid "Merge Successful"
+msgstr "整�完毕"
+
+#: lib/RT/Ticket_Overlay.pm:2833
+msgid "Merge failed. Couldn't set EffectiveId"
+msgstr "整�失败。无法设定 EffectiveId"
+
+#: html/Ticket/Elements/BulkLinks:26 html/Ticket/Elements/EditLinks:114 html/Work/Search/BulkLinks:2
+msgid "Merge into"
+msgstr "整�进"
+
+#: html/Search/Bulk.html:137 html/Ticket/Update.html:100
+msgid "Message"
+msgstr "讯�"
+
+#: NOT FOUND IN SOURCE
+msgid "Misc. Expense"
+msgstr "�费"
+
+#: lib/RT/Interface/Web.pm:903
+msgid "Missing a primary key?: %1"
+msgstr "缺少主键值？(%1)"
+
+#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:53 html/Work/Preferences/Info:33
+msgid "Mobile"
+msgstr "行动电�"
+
+#: html/Admin/Elements/ModifyUser:71
+msgid "MobilePhone"
+msgstr "行动电�"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "Modify Access Control List"
+msgstr "更改��控制清�"
+
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
+msgid "Modify Custom Fields which apply to all queues"
+msgstr "更改适用于所有表�的自订字段"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "Modify Scrip templates for this queue"
+msgstr "更改此表�的模�"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "Modify Scrips for this queue"
+msgstr "更改此表�的手续"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify System ACLS"
+msgstr "更改系统��清�"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Template %1"
+msgstr "更改模� %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Workflow"
+msgstr "更改�程"
+
+#: html/Admin/Queues/CustomField.html:44
+#. ($QueueObj->Name())
+msgid "Modify a CustomField for queue %1"
+msgstr "更改 %1 表�内的自订字段"
+
+#: html/Admin/Global/CustomField.html:52
+msgid "Modify a CustomField which applies to all queues"
+msgstr "更改适用于所有表�的自订字段"
+
+#: html/Admin/Queues/Scrip.html:53
+#. ($QueueObj->Name)
+msgid "Modify a scrip for queue %1"
+msgstr "更改 %1 表�内的手续"
+
+#: html/Admin/Global/Scrip.html:47
+msgid "Modify a scrip which applies to all queues"
+msgstr "更改适用于所有表�的手续"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify dates for # %1"
+msgstr "更改 # %1 的日期"
+
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
+#. ($TicketObj->Id)
+msgid "Modify dates for #%1"
+msgstr "更改 #%1 的日期"
+
+#: html/Ticket/ModifyDates.html:34
+#. ($TicketObj->Id)
+msgid "Modify dates for ticket # %1"
+msgstr "更改申请� # %1 的日期"
+
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
+msgid "Modify global group rights"
+msgstr "更改全域设定的群组��"
+
+#: html/Admin/Global/GroupRights.html:32
+msgid "Modify global group rights."
+msgstr "更改全域设定的群组��。"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for groups"
+msgstr "更改全域设定的群组��"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for users"
+msgstr "更改全域设定的使用者��"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global scrips"
+msgstr "更改全域手续"
+
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
+msgid "Modify global user rights"
+msgstr "更改全域设定的使用者��"
+
+#: html/Admin/Global/UserRights.html:32
+msgid "Modify global user rights."
+msgstr "更改全域设定的使用者��。"
+
+#: lib/RT/Group_Overlay.pm:145
+msgid "Modify group metadata or delete group"
+msgstr "更改群组数��删除群组"
+
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
+#. ($GroupObj->Name)
+msgid "Modify group rights for group %1"
+msgstr "更改 %1 的群组��"
+
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
+#. ($QueueObj->Name)
+msgid "Modify group rights for queue %1"
+msgstr "更改表� %1 的群组��"
+
+#: lib/RT/Group_Overlay.pm:147
+msgid "Modify membership roster for this group"
+msgstr "更改此群组的�员��"
+
+#: lib/RT/System.pm:60
+msgid "Modify one's own RT account"
+msgstr "更改个人的��信�"
+
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
+#. ($QueueObj->Name)
+msgid "Modify people related to queue %1"
+msgstr "更改链接到表� %1 的人员"
+
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
+#. ($Ticket->id)
+#. ($Ticket->Id)
+msgid "Modify people related to ticket #%1"
+msgstr "更改申请� #%1 链接到的人员"
+
+#: html/Admin/Queues/Scrips.html:45
+#. ($QueueObj->Name)
+msgid "Modify scrips for queue %1"
+msgstr "更改表� %1 的手续"
+
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
+msgid "Modify scrips which apply to all queues"
+msgstr "更改适用于所有表�的手续"
+
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
+#. (loc($TemplateObj->Name()))
+#. ($TemplateObj->id)
+msgid "Modify template %1"
+msgstr "更改模� %1"
+
+#: html/Admin/Global/Templates.html:43
+msgid "Modify templates which apply to all queues"
+msgstr "更改适用于所有表�的模�"
+
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
+#. ($Group->Name)
+msgid "Modify the group %1"
+msgstr "更改群组 %1"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "Modify the queue watchers"
+msgstr "更改表�视察员"
+
+#: html/Admin/Users/Modify.html:235
+#. ($UserObj->Name)
+msgid "Modify the user %1"
+msgstr "更改使用者 %1"
+
+#: html/Ticket/ModifyAll.html:36
+#. ($Ticket->Id)
+msgid "Modify ticket # %1"
+msgstr "更改申请� # %1"
+
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
+#. ($TicketObj->Id)
+msgid "Modify ticket #%1"
+msgstr "更改申请� # %1"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "Modify tickets"
+msgstr "更改申请�"
+
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
+#. ($GroupObj->Name)
+msgid "Modify user rights for group %1"
+msgstr "更改群组 %1 的使用者��"
+
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
+#. ($QueueObj->Name)
+msgid "Modify user rights for queue %1"
+msgstr "更改表� %1 的使用者��"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify watchers for queue '%1'"
+msgstr "更改 '%1' 的视察员"
+
+#: html/Admin/Global/Workflow.html:25 html/Admin/Global/Workflow.html:30 html/Admin/Global/Workflow.html:81 html/Admin/Queues/Workflow.html:77
+#. (loc($WorkflowObj->Name()))
+#. ($WorkflowObj->id)
+msgid "Modify workflow %1"
+msgstr "更改�程 %1"
+
+#: html/Admin/Global/Workflows.html:44
+msgid "Modify workflows which apply to all queues"
+msgstr "更改适用于所有表�的�程"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "ModifyACL"
+msgstr "更改��清�"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "ModifyOwnMembership"
+msgstr "更改自己是�属于�群组"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ModifyQueueWatchers"
+msgstr "更改表�视察员"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "ModifyScrips"
+msgstr "更改手续"
+
+#: lib/RT/System.pm:60
+msgid "ModifySelf"
+msgstr "更改个人��"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "ModifyTemplate"
+msgstr "更改模�"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "ModifyTicket"
+msgstr "更改申请�"
+
+#: NOT FOUND IN SOURCE
+msgid "Mon"
+msgstr "星期一"
+
+#: lib/RT/Date.pm:388
+msgid "Mon."
+msgstr "星期一"
+
+#: html/Ticket/Elements/ShowRequestor:41
+#. ($name)
+msgid "More about %1"
+msgstr "关于 %1 的进一步信�"
+
+#: NOT FOUND IN SOURCE
+msgid "Morning Shift"
+msgstr "早�"
+
+#: html/Edit/Elements/ListButtons:16
+msgid "Move All"
+msgstr "全移"
+
+#: html/Admin/Elements/EditCustomFields:60
+msgid "Move down"
+msgstr "下移"
+
+#: html/Admin/Elements/EditCustomFields:52
+msgid "Move up"
+msgstr "上移"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:26
+msgid "Multiple"
+msgstr "多�"
+
+#: lib/RT/User_Overlay.pm:238
+msgid "Must specify 'Name' attribute"
+msgstr "必须指定 'Name' 的属性"
+
+#: html/SelfService/Elements/MyRequests:48
+#. ($friendly_status)
+msgid "My %1 tickets"
+msgstr "我的 %1 申请�"
+
+#: html/Work/Elements/Tab:35
+msgid "My Approvals"
+msgstr "表�签核"
+
+#: html/Work/Elements/Tab:33
+msgid "My Requests"
+msgstr "表�申请追踪"
+
+#: html/Work/Elements/Tab:37
+msgid "My Tickets"
+msgstr "表�处�"
+
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
+msgid "My approvals"
+msgstr "表�签核"
+
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Elements/ModifyTemplateAsWorkflow:185 html/Admin/Elements/ModifyUser:29 html/Admin/Groups/Modify.html:43 html/Edit/Users/Add.html:22 html/Edit/Users/Search.html:31 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43 html/Work/Tickets/Cc:18
+msgid "Name"
+msgstr "�称"
+
+#: lib/RT/User_Overlay.pm:245
+msgid "Name in use"
+msgstr "��已有人使用"
+
+#: html/Edit/Users/Info:27
+msgid "Nationality"
+msgstr "国�"
+
+#: NOT FOUND IN SOURCE
+msgid "Need approval from system administrator"
+msgstr "需先由系统管�员进行批准"
+
+#: html/Ticket/Elements/ShowDates:51
+msgid "Never"
+msgstr "从未更动"
+
+#: html/Elements/Quicksearch:29 html/Work/Elements/Quicksearch:15 html/Work/Tickets/Create.html:52
+msgid "New"
+msgstr "新建立"
+
+#: html/Admin/Elements/ModifyUser:31 html/Admin/Users/Modify.html:92 html/User/Prefs.html:64 html/Work/Preferences/Info:44
+msgid "New Password"
+msgstr "新的�令"
+
+#: etc/initialdata:341 etc/upgrade/2.1.71:16 html/Edit/Elements/CreateApprovalsQueue:21
+msgid "New Pending Approval"
+msgstr "新的待签核事项"
+
+#: html/Ticket/Elements/EditLinks:110
+msgid "New Relationships"
+msgstr "新增关系"
+
+#: html/Work/Elements/Tab:31
+msgid "New Request"
+msgstr "表�申请"
+
+#: html/Ticket/Elements/Tabs:35
+msgid "New Search"
+msgstr "新增查询"
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:39
+msgid "New custom field"
+msgstr "新增自订字段"
+
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
+msgid "New group"
+msgstr "新增群组"
+
+#: html/SelfService/Prefs.html:31
+msgid "New password"
+msgstr "新的�令"
+
+#: lib/RT/User_Overlay.pm:706
+msgid "New password notification sent"
+msgstr "�出新�令通知"
+
+#: html/Admin/Elements/QueueTabs:69
+msgid "New queue"
+msgstr "新增表�"
+
+#: NOT FOUND IN SOURCE
+msgid "New request"
+msgstr "�出申请�"
+
+#: html/Admin/Elements/SelectRights:41
+msgid "New rights"
+msgstr "新增��"
+
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
+msgid "New scrip"
+msgstr "新增手续"
+
+#: html/Work/Search/index.html:62
+msgid "New search"
+msgstr "�新查询"
+
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
+msgid "New template"
+msgstr "新增模�"
+
+#: html/SelfService/Elements/Tabs:47
+msgid "New ticket"
+msgstr "�出申请�"
+
+#: lib/RT/Ticket_Overlay.pm:2800
+msgid "New ticket doesn't exist"
+msgstr "没有新申请�"
+
+#: html/Admin/Elements/UserTabs:51
+msgid "New user"
+msgstr "新增使用者"
+
+#: html/Admin/Elements/CreateUserCalled:25
+msgid "New user called"
+msgstr "新使用者�字"
+
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
+msgid "New watchers"
+msgstr "新视察员"
+
+#: html/Admin/Users/Prefs.html:41
+msgid "New window setting"
+msgstr "更新窗�设定"
+
+#: html/Admin/Global/Workflow.html:60 html/Admin/Global/Workflows.html:39 html/Admin/Queues/Workflow.html:57 html/Admin/Queues/Workflows.html:50
+msgid "New workflow"
+msgstr "新增�程"
+
+#: html/Ticket/Elements/Tabs:68
+msgid "Next"
+msgstr "下一项"
+
+#: html/Search/Listing.html:47 html/Work/Search/index.html:24
+msgid "Next page"
+msgstr "下一页"
+
+#: html/Admin/Elements/ModifyUser:49
+msgid "NickName"
+msgstr "昵称"
+
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:45 html/Work/Preferences/Info:23
+msgid "Nickname"
+msgstr "昵称"
+
+#: NOT FOUND IN SOURCE
+msgid "Night Shift"
+msgstr "�夜�"
+
+#: html/Edit/Global/Basic/Top:27
+msgid "No"
+msgstr "�"
+
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:104
+msgid "No CustomField"
+msgstr "无自订字段"
+
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
+msgid "No Group defined"
+msgstr "尚未定义群组"
+
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
+msgid "No Queue defined"
+msgstr "没有定义好的表�"
+
+#: bin/rt-crontool:55
+msgid "No RT user found. Please consult your RT administrator.\\n"
+msgstr "找�到 RT 使用者。请� RT 管�员查询。\\n"
+
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
+msgid "No Template"
+msgstr "没有模�"
+
+#: bin/rt-commit-handler:763
+msgid "No Ticket specified. Aborting ticket "
+msgstr "未指定申请�。退出申请� "
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgstr "未指定申请�。退出申请�更改\\n\\n"
+
+#: html/Admin/Elements/ModifyWorkflow:237 html/Admin/Global/Workflow.html:79 html/Admin/Queues/Workflow.html:75
+msgid "No Workflow"
+msgstr "没有�程"
+
+#: html/Approvals/Elements/Approve:45 html/Work/Approvals/Elements/Approve:35
+msgid "No action"
+msgstr "暂�处�"
+
+#: lib/RT/Interface/Web.pm:898
+msgid "No column specified"
+msgstr "未指定字段"
+
+#: NOT FOUND IN SOURCE
+msgid "No command found\\n"
+msgstr "找�到命令"
+
+#: html/Elements/ViewUser:35 html/Ticket/Elements/ShowRequestor:44
+msgid "No comment entered about this user"
+msgstr "没有对这�使用者的评论"
+
+#: lib/RT/Ticket_Overlay.pm:2211 lib/RT/Ticket_Overlay.pm:2279
+msgid "No correspondence attached"
+msgstr "没有附上申请�回�"
+
+#: lib/RT/Action/Generic.pm:149 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
+#. (ref $self)
+msgid "No description for %1"
+msgstr "没有对 %1 的�述"
+
+#: lib/RT/Users_Overlay.pm:150
+msgid "No group specified"
+msgstr "未指定群组"
+
+#: lib/RT/User_Overlay.pm:924
+msgid "No password set"
+msgstr "没有设定�令"
+
+#: lib/RT/Queue_Overlay.pm:260
+msgid "No permission to create queues"
+msgstr "没有新增表�的��"
+
+#: lib/RT/Ticket_Overlay.pm:342
+#. ($QueueObj->Name)
+msgid "No permission to create tickets in the queue '%1'"
+msgstr "没有在表� '%1' 新增申请�的��"
+
+#: lib/RT/User_Overlay.pm:211
+msgid "No permission to create users"
+msgstr "没有新增使用者的��"
+
+#: html/SelfService/Display.html:117
+msgid "No permission to display that ticket"
+msgstr "没有显示该申请�的��"
+
+#: html/SelfService/Update.html:51
+msgid "No permission to view update ticket"
+msgstr "没有检视申请�更新的��"
+
+#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1496
+msgid "No principal specified"
+msgstr "未指定��"
+
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
+msgid "No principals selected."
+msgstr "未指定��。"
+
+#: NOT FOUND IN SOURCE
+msgid "No protocol specified in %1"
+msgstr "%1 内未指定�议"
+
+#: html/Admin/Queues/index.html:34
+msgid "No queues matching search criteria found."
+msgstr "找�到符�查询�件的表�。"
+
+#: html/Admin/Elements/SelectRights:80
+msgid "No rights found"
+msgstr "找�到��"
+
+#: html/Admin/Elements/SelectRights:32
+msgid "No rights granted."
+msgstr "没有选定��"
+
+#: html/Search/Bulk.html:160 html/Work/Search/Bulk.html:117
+msgid "No search to operate on."
+msgstr "没有�进行的查询"
+
+#: NOT FOUND IN SOURCE
+msgid "No ticket id specified"
+msgstr "未指定申请�编�"
+
+#: lib/RT/Transaction_Overlay.pm:478 lib/RT/Transaction_Overlay.pm:516
+msgid "No transaction type specified"
+msgstr "未指定更动报告类别"
+
+#: NOT FOUND IN SOURCE
+msgid "No user or email address specified"
+msgstr "未指定使用者或电�邮件地�"
+
+#: html/Admin/Users/index.html:35
+msgid "No users matching search criteria found."
+msgstr "找�到符�查询�件的使用者。"
+
+#: bin/rt-commit-handler:643
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr "找�到�格的 RT 使用者。RT cvs 处�器已�用。请� RT 管�者询问。\\n"
+
+#: lib/RT/Interface/Web.pm:895
+msgid "No value sent to _Set!\\n"
+msgstr "_Set 没有收到任何值!\\n"
+
+#: html/Search/Elements/TicketRow:36 html/Work/Search/TicketRow:9
+msgid "Nobody"
+msgstr "没有人"
+
+#: lib/RT/Interface/Web.pm:900
+msgid "Nonexistant field?"
+msgstr "字段�存在？"
+
+#: NOT FOUND IN SOURCE
+msgid "Normal Users"
+msgstr "一般用户群组"
+
+#: NOT FOUND IN SOURCE
+msgid "Not configured to fetch the content from a %1 in %2"
+msgstr "未设定�从 %2 内撷� %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Not logged in"
+msgstr "尚未登入"
+
+#: html/Elements/Header:58
+msgid "Not logged in."
+msgstr "尚未登入"
+
+#: lib/RT/Date.pm:369
+msgid "Not set"
+msgstr "尚未设定"
+
+#: html/NoAuth/Reminder.html:26
+msgid "Not yet implemented."
+msgstr "尚未完工。"
+
+#: NOT FOUND IN SOURCE
+msgid "Not yet implemented...."
+msgstr "尚未完工..."
+
+#: html/Approvals/Elements/Approve:48 html/Work/Tickets/Create.html:134
+msgid "Notes"
+msgstr "备注"
+
+#: NOT FOUND IN SOURCE
+msgid "Notes:"
+msgstr "备注："
+
+#: lib/RT/User_Overlay.pm:709
+msgid "Notification could not be sent"
+msgstr "无法�出通知"
+
+#: etc/initialdata:111
+msgid "Notify AdminCcs"
+msgstr "通知管�员副本收件人"
+
+#: etc/initialdata:107
+msgid "Notify AdminCcs as Comment"
+msgstr "以评论方�通知管�员副本收件人"
+
+#: etc/initialdata:138
+msgid "Notify Other Recipients"
+msgstr "通知其它收件人"
+
+#: etc/initialdata:134
+msgid "Notify Other Recipients as Comment"
+msgstr "以评论方�通知其它收件人"
+
+#: etc/initialdata:103
+msgid "Notify Owner"
+msgstr "通知承办人"
+
+#: etc/initialdata:99
+msgid "Notify Owner as Comment"
+msgstr "以评论方�通知承办人"
+
+#: etc/initialdata:385
+msgid "Notify Owner of their rejected ticket"
+msgstr "通知承办人申请�已驳回"
+
+#: etc/initialdata:374
+msgid "Notify Owner of their ticket has been approved by all approvers"
+msgstr "通知承办人申请�已完�全部签核"
+
+#: etc/initialdata:359
+msgid "Notify Owner of their ticket has been approved by some approver"
+msgstr "通知承办人申请�已完��项签核"
+
+#: etc/initialdata:343 etc/upgrade/2.1.71:17 html/Edit/Elements/CreateApprovalsQueue:22
+msgid "Notify Owners and AdminCcs of new items pending their approval"
+msgstr "整�待签核事项，通知承办人�管�员副本收件人"
+
+#: etc/initialdata:95
+msgid "Notify Requestors"
+msgstr "通知申请人"
+
+#: etc/initialdata:121
+msgid "Notify Requestors and Ccs"
+msgstr "通知申请人�副本收件人"
+
+#: etc/initialdata:116
+msgid "Notify Requestors and Ccs as Comment"
+msgstr "以评论方�通知申请人�副本收件人"
+
+#: etc/initialdata:130
+msgid "Notify Requestors, Ccs and AdminCcs"
+msgstr "通知申请人�副本�管�员副本收件人"
+
+#: etc/initialdata:126
+msgid "Notify Requestors, Ccs and AdminCcs as Comment"
+msgstr "以评论方�通知申请人�副本�管�员副本收件人"
+
+#: html/Work/Tickets/Cc:55
+msgid "Notify people:"
+msgstr "通知对象"
+
+#: NOT FOUND IN SOURCE
+msgid "Nov"
+msgstr "�一月"
+
+#: lib/RT/Date.pm:421
+msgid "Nov."
+msgstr "11"
+
+#: NOT FOUND IN SOURCE
+msgid "November"
+msgstr "�一月"
+
+#: html/Edit/Global/Basic/Top:74
+msgid "OIN104"
+msgstr "�� 104eHRMS 接�"
+
+#: html/Edit/Global/Workflow/Export.html:30 html/Work/Copyright.html:23
+msgid "OK"
+msgstr "确定"
+
+#: lib/RT/Record.pm:156
+msgid "Object could not be created"
+msgstr "无法新增对象"
+
+#: lib/RT/Record.pm:175
+msgid "Object created"
+msgstr "对象新增完毕"
+
+#: html/Edit/Users/Info:36
+msgid "Occupation Status"
+msgstr "在�状�"
+
+#: NOT FOUND IN SOURCE
+msgid "Oct"
+msgstr "�月"
+
+#: lib/RT/Date.pm:420
+msgid "Oct."
+msgstr "10"
+
+#: NOT FOUND IN SOURCE
+msgid "October"
+msgstr "�月"
+
+#: html/Edit/Users/Info:33
+msgid "Office Phone"
+msgstr "办公室电�"
+
+#: html/Elements/SelectDateRelation:34
+msgid "On"
+msgstr "等于"
+
+#: etc/initialdata:173
+msgid "On Comment"
+msgstr "评论时"
+
+#: etc/initialdata:166
+msgid "On Correspond"
+msgstr "回�申请�时"
+
+#: etc/initialdata:155
+msgid "On Create"
+msgstr "新增申请�时"
+
+#: etc/initialdata:187
+msgid "On Owner Change"
+msgstr "承办人改�时"
+
+#: etc/initialdata:195
+msgid "On Queue Change"
+msgstr "表�改�时"
+
+#: etc/initialdata:201
+msgid "On Resolve"
+msgstr "解决申请�时"
+
+#: etc/initialdata:179
+msgid "On Status Change"
+msgstr "现况改�时"
+
+#: etc/initialdata:160
+msgid "On Transaction"
+msgstr "�生更动时"
+
+#: html/Approvals/Elements/PendingMyApproval:49
+#. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
+msgid "Only show approvals for requests created after %1"
+msgstr "仅显示 %1 之�新增的申请�"
+
+#: html/Approvals/Elements/PendingMyApproval:47
+#. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
+msgid "Only show approvals for requests created before %1"
+msgstr "仅显示 %1 之�新增的申请�"
+
+#: html/Edit/Global/GroupRight/List:9 html/Edit/Global/GroupRight/Top:16 html/Edit/Groups/List:11 html/Edit/Groups/Top:18 html/Edit/Queues/Basic/Top:69 html/Edit/Queues/List:13 html/Elements/Quicksearch:30 html/Work/Delegates/Info:48 html/Work/Delegates/Info:51 html/Work/Delegates/List:12 html/Work/Elements/Quicksearch:16 html/Work/Overview/Info:41 html/Work/Tickets/Display.html:28
+msgid "Open"
+msgstr "开�"
+
+#: html/Ticket/Elements/Tabs:135
+msgid "Open it"
+msgstr "开�"
+
+#: html/SelfService/Elements/Tabs:41
+msgid "Open tickets"
+msgstr "开�的申请�"
+
+#: html/Admin/Users/Prefs.html:40
+msgid "Open tickets (from listing) in a new window"
+msgstr "在新窗�开�(列表的)申请�"
+
+#: html/Admin/Users/Prefs.html:39
+msgid "Open tickets (from listing) in another window"
+msgstr "在�一个窗�开�(列表的)申请�"
+
+#: etc/initialdata:150
+msgid "Open tickets on correspondence"
+msgstr "收到回�时�开�申请�"
+
+#: NOT FOUND IN SOURCE
+msgid "Opened Tickets"
+msgstr "已申请�行中表�"
+
+#: NOT FOUND IN SOURCE
+msgid "Opinion"
+msgstr "��"
+
+#: html/Edit/Global/CustomField/Info:35
+msgid "Option Description"
+msgstr "选项�述"
+
+#: html/Edit/Global/CustomField/Info:29
+msgid "Option Name"
+msgstr "选项�称"
+
+#: html/Search/Elements/PickRestriction:100 html/Work/Search/PickRestriction:81
+msgid "Ordering and sorting"
+msgstr "顺�与排�方�"
+
+#: html/Admin/Elements/ModifyUser:45 html/Admin/Users/Modify.html:116 html/Edit/Global/Basic/Top:50 html/Elements/SelectUsers:28 html/User/Prefs.html:85 html/Work/Preferences/Info:74
+msgid "Organization"
+msgstr "组织�称"
+
+#: NOT FOUND IN SOURCE
+msgid "Organization:"
+msgstr "组织："
+
+#: html/Approvals/Elements/Approve:32
+#. ($approving->Id, $approving->Subject)
+msgid "Originating ticket: #%1"
+msgstr "原申请�：#%1"
+
+#: html/Edit/Elements/PickUsers:109 html/Edit/Users/Add.html:106 html/Work/Tickets/Cc:80
+msgid "Other comma-delimited email addresses"
+msgstr "其它e-mail�� (仅e-mail通知;多笔��请用逗�','区隔)"
+
+#: html/Admin/Elements/ModifyQueue:54 html/Admin/Queues/Modify.html:68 html/Edit/Queues/Basic/Top:41
+msgid "Over time, priority moves toward"
+msgstr "优先顺��时间增加调整为"
+
+#: NOT FOUND IN SOURCE
+msgid "Override current custom fields with fields from %1"
+msgstr "以 %1 表�的自订字段�代现有字段"
+
+#: html/Admin/Elements/CheckOverrideGlobalACL:25
+msgid "Override global rights"
+msgstr "�代全域��"
+
+#: html/Admin/Elements/CheckOverrideGlobalACL:34
+#. (loc_fuzzy($msg))
+msgid "OverrideGlobalACL status %1"
+msgstr "�代全域�� %1"
+
+#: html/Work/Elements/Tab:29
+msgid "Overview"
+msgstr "总览"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "Own tickets"
+msgstr "承办申请�"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "OwnTicket"
+msgstr "承办申请�"
+
+#: etc/initialdata:56 html/Admin/Elements/ModifyTemplateAsWorkflow:141 html/Edit/Global/Workflow/Owner.html:19 html/Edit/Queues/Basic/Top:47 html/Edit/Queues/Basic/Top:58 html/Elements/MyRequests:31 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:62 html/Work/Elements/MyRequests:13 html/Work/Elements/Quicksearch:18 html/Work/Tickets/Elements/ShowBasics:21 html/Work/Tickets/Update.html:27 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1244
+msgid "Owner"
+msgstr "承办人"
+
+#: NOT FOUND IN SOURCE
+msgid "Owner changed from %1 to %2"
+msgstr "承办人已从 %1 改为 %2"
+
+#: lib/RT/Transaction_Overlay.pm:582
+#. ($Old->Name , $New->Name)
+msgid "Owner forcibly changed from %1 to %2"
+msgstr "强制将承办人从 %1 改为 %2"
+
+#: html/Search/Elements/PickRestriction:30 html/Work/Search/PickRestriction:10
+msgid "Owner is"
+msgstr "承办人"
+
+#: html/Work/Elements/List:27 html/Work/Queues/List:8 html/Work/Tickets/Create.html:54 html/Work/Tickets/Elements/ShowBasics:52
+msgid "Owner's Phone"
+msgstr "承办人电�"
+
+#: html/Edit/Elements/Page:39
+msgid "Page"
+msgstr " "
+
+#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:55 html/Work/Preferences/Info:35
+msgid "Pager"
+msgstr "呼�器"
+
+#: html/Admin/Elements/ModifyUser:73
+msgid "PagerPhone"
+msgstr "呼�器��"
+
+#: html/Edit/Global/Workflow/Action:81 html/Edit/Global/Workflow/Condition:66
+msgid "Parameter"
+msgstr "呼��数"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:225
+msgid "Parent"
+msgstr "上级"
+
+#: html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:38 html/Ticket/Elements/EditLinks:126 html/Ticket/Elements/EditLinks:57 html/Ticket/Elements/ShowLinks:46 html/Work/Search/BulkLinks:14
+msgid "Parents"
+msgstr "�申请�"
+
+#: NOT FOUND IN SOURCE
+msgid "Park Space"
+msgstr "�车�申请"
+
+#: html/Elements/Login:52 html/User/Prefs.html:60 html/Work/Preferences/Info:41
+msgid "Password"
+msgstr "�令"
+
+#: html/NoAuth/Reminder.html:24
+msgid "Password Reminder"
+msgstr "�令�示"
+
+#: lib/RT/User_Overlay.pm:228 lib/RT/User_Overlay.pm:927
+msgid "Password too short"
+msgstr "�令太短"
+
+#: html/Admin/Users/Modify.html:290 html/User/Prefs.html:171 html/Work/Preferences/Info:162
+#. (loc_fuzzy($msg))
+msgid "Password: %1"
+msgstr "�令：%1"
+
+#: html/Admin/Users/Modify.html:292
+msgid "Passwords do not match."
+msgstr "�令确认失败。"
+
+#: html/User/Prefs.html:173 html/Work/Preferences/Info:164
+msgid "Passwords do not match. Your password has not been changed"
+msgstr "�令确认失败。您的�令并未改�。"
+
+#: NOT FOUND IN SOURCE
+msgid "Pelase select a queue"
+msgstr "请选择表��称"
+
+#: NOT FOUND IN SOURCE
+msgid "Pending Approval"
+msgstr "等待签核"
+
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:95 html/Ticket/ModifyAll.html:50
+msgid "People"
+msgstr "人员"
+
+#: NOT FOUND IN SOURCE
+msgid "People with Queue Rights"
+msgstr "拥有表���人员"
+
+#: etc/initialdata:143
+msgid "Perform a user-defined action"
+msgstr "执行使用者自订的动作"
+
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/CurrentUser.pm:82 lib/RT/CurrentUser.pm:91 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:201 lib/RT/CustomField_Overlay.pm:233 lib/RT/CustomField_Overlay.pm:510 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1094 lib/RT/Group_Overlay.pm:1098 lib/RT/Group_Overlay.pm:1107 lib/RT/Group_Overlay.pm:1158 lib/RT/Group_Overlay.pm:1162 lib/RT/Group_Overlay.pm:1168 lib/RT/Group_Overlay.pm:425 lib/RT/Group_Overlay.pm:517 lib/RT/Group_Overlay.pm:595 lib/RT/Group_Overlay.pm:603 lib/RT/Group_Overlay.pm:700 lib/RT/Group_Overlay.pm:704 lib/RT/Group_Overlay.pm:710 lib/RT/Group_Overlay.pm:903 lib/RT/Group_Overlay.pm:907 lib/RT/Group_Overlay.pm:920 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:931 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:196 lib/RT/Scrip_Overlay.pm:429 lib/RT/Template_Overlay.pm:283 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1349 lib/RT/Ticket_Overlay.pm:1359 lib/RT/Ticket_Overlay.pm:1373 lib/RT/Ticket_Overlay.pm:1526 lib/RT/Ticket_Overlay.pm:1535 lib/RT/Ticket_Overlay.pm:1548 lib/RT/Ticket_Overlay.pm:1897 lib/RT/Ticket_Overlay.pm:2035 lib/RT/Ticket_Overlay.pm:2199 lib/RT/Ticket_Overlay.pm:2266 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2697 lib/RT/Ticket_Overlay.pm:2791 lib/RT/Ticket_Overlay.pm:2806 lib/RT/Ticket_Overlay.pm:3005 lib/RT/Ticket_Overlay.pm:3015 lib/RT/Ticket_Overlay.pm:3020 lib/RT/Ticket_Overlay.pm:3242 lib/RT/Ticket_Overlay.pm:3440 lib/RT/Ticket_Overlay.pm:3602 lib/RT/Ticket_Overlay.pm:3654 lib/RT/Ticket_Overlay.pm:3829 lib/RT/Transaction_Overlay.pm:466 lib/RT/Transaction_Overlay.pm:473 lib/RT/Transaction_Overlay.pm:502 lib/RT/Transaction_Overlay.pm:509 lib/RT/User_Overlay.pm:1021 lib/RT/User_Overlay.pm:1414 lib/RT/User_Overlay.pm:629 lib/RT/User_Overlay.pm:664 lib/RT/User_Overlay.pm:920
+msgid "Permission Denied"
+msgstr "���足"
+
+#: html/Edit/Rights/index.html:3
+msgid "Permission Settings"
+msgstr "��设定"
+
+#: NOT FOUND IN SOURCE
+msgid "Permitted Queues:"
+msgstr "拥有��表�列表："
+
+#: NOT FOUND IN SOURCE
+msgid "Personal"
+msgstr "代�人群组"
+
+#: html/User/Elements/Tabs:34
+msgid "Personal Groups"
+msgstr "代�人群组"
+
+#: NOT FOUND IN SOURCE
+msgid "Personal Todo"
+msgstr "�人待办事项"
+
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
+msgid "Personal groups"
+msgstr "代�人群组"
+
+#: html/User/Elements/DelegateRights:36
+msgid "Personal groups:"
+msgstr "代�人群组："
+
+#: html/Work/Preferences/Info:21
+msgid "PersonalHomepage"
+msgstr "个人首页"
+
+#: NOT FOUND IN SOURCE
+msgid "Phone"
+msgstr "电�"
+
+#: html/Work/Delegates/Info:90 html/Work/Overview/Info:72
+msgid "Phone number"
+msgstr "电���"
+
+#: html/Admin/Users/Modify.html:155 html/User/Prefs.html:48 html/Work/Preferences/Info:27
+msgid "Phone numbers"
+msgstr "电���"
+
+#: html/Edit/Users/Add.html:3 html/Work/Delegates/Add.html:3 html/Work/Delegates/Info:34 html/Work/Tickets/ModifyPeople.html:2
+msgid "Pick"
+msgstr "挑选"
+
+#: NOT FOUND IN SOURCE
+msgid "Place of Departure"
+msgstr "出�地点"
+
+#: NOT FOUND IN SOURCE
+msgid "Placeholder"
+msgstr "尚未完工"
+
+#: html/Edit/Elements/PickUsers:31 html/Edit/Elements/PickUsers:44 html/Edit/Elements/SelectCustomFieldType:3 html/Work/Elements/SelectOwner:3 html/Work/Tickets/Elements/EditCustomField:104 html/Work/Tickets/Elements/EditCustomField:185 html/Work/Tickets/Elements/EditCustomField:75 html/Work/Tickets/Elements/EditCustomFieldEntries:66 html/Work/Tickets/Elements/EditCustomFieldEntries:73
+msgid "Please Select"
+msgstr "请选择"
+
+#: html/Edit/Elements/104Buttons:30
+msgid "Please check items to be deleted first."
+msgstr "请先选中�删除的对象"
+
+#: NOT FOUND IN SOURCE
+msgid "Please select a group"
+msgstr "请选择群组"
+
+#: NOT FOUND IN SOURCE
+msgid "Please select a queue's workflow"
+msgstr "请选择表��程"
+
+#: NOT FOUND IN SOURCE
+msgid "Please select role"
+msgstr "请选择角色"
+
+#: NOT FOUND IN SOURCE
+msgid "Policy"
+msgstr "��规章"
+
+#: NOT FOUND IN SOURCE
+msgid "Position"
+msgstr "�务"
+
+#: html/Edit/Users/Info:43
+msgid "Position Level"
+msgstr "�等"
+
+#: html/Edit/Elements/PickUsers:41 html/Edit/Global/UserRight/List:13 html/Edit/Global/UserRight/Top:23 html/Edit/Users/Add.html:41 html/Edit/Users/List:11 html/Edit/Users/Top:22 html/Work/Delegates/Add.html:26 html/Work/Delegates/Info:84 html/Work/Overview/Info:66
+msgid "Position Name"
+msgstr "�务�称"
+
+#: html/Edit/Global/UserRight/List:14 html/Edit/Global/UserRight/Top:33 html/Edit/Users/List:12 html/Edit/Users/Top:32
+msgid "Position Number"
+msgstr "�务代�"
+
+#: html/Edit/Users/Info:44
+msgid "Position Rank"
+msgstr "�级"
+
+#: NOT FOUND IN SOURCE
+msgid "Pref"
+msgstr "�好"
+
+#: html/Edit/Elements/104Top:25 html/Elements/Header:51 html/Elements/Tabs:52 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27 html/Work/Elements/Tab:41
+msgid "Preferences"
+msgstr "�好"
+
+#: NOT FOUND IN SOURCE
+msgid "Prefs"
+msgstr "个人信�"
+
+#: lib/RT/Action/Generic.pm:159
+msgid "Prepare Stubbed"
+msgstr "预备动作完毕"
+
+#: html/Ticket/Elements/Tabs:60
+msgid "Prev"
+msgstr "上一项"
+
+#: html/Search/Listing.html:43 html/Work/Search/index.html:20
+msgid "Previous page"
+msgstr "�一页"
+
+#: NOT FOUND IN SOURCE
+msgid "Pri"
+msgstr "优先顺�"
+
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
+#. ($args{'PrincipalId'})
+msgid "Principal %1 not found."
+msgstr "找�到�� %1。"
+
+#: html/Search/Elements/PickRestriction:53 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:38 html/Work/Search/PickRestriction:34 lib/RT/Tickets_Overlay.pm:1042
+msgid "Priority"
+msgstr "优先顺�"
+
+#: html/Admin/Elements/ModifyQueue:50 html/Admin/Queues/Modify.html:64
+msgid "Priority starts at"
+msgstr "优先顺�起始值"
+
+#: etc/initialdata:43
+msgid "Privileged"
+msgstr "内部�员"
+
+#: html/Admin/Users/Modify.html:270 html/User/Prefs.html:162 html/Work/Preferences/Info:153
+#. (loc_fuzzy($msg))
+msgid "Privileged status: %1"
+msgstr "内部�员状�：%1"
+
+#: html/Admin/Users/index.html:61
+msgid "Privileged users"
+msgstr "内部�员"
+
+#: html/Work/Elements/SelectSearch:16
+msgid "Process Status"
+msgstr "处�状�"
+
+#: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53 etc/initialdata:77
+msgid "Pseudogroup for internal use"
+msgstr "内部用的虚拟群组"
+
+#: html/Work/Preferences/Info:64
+msgid "Public Info"
+msgstr "公开信�"
+
+#: html/Work/Elements/104Header:88
+msgid "Public Service"
+msgstr "公共事务区"
+
+#: html/Edit/Users/Search.html:4
+msgid "Query"
+msgstr "查询"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:166 html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Elements/Quicksearch:28 html/Search/Elements/PickRestriction:45 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:63 html/Ticket/Elements/ShowBasics:42 html/User/Elements/DelegateRights:79 html/Work/Elements/MyApprovals:10 html/Work/Elements/MyRequests:11 html/Work/Elements/MyTickets:11 html/Work/Elements/Quicksearch:14 html/Work/Search/PickRestriction:26 lib/RT/Tickets_Overlay.pm:883
+msgid "Queue"
+msgstr "表�"
+
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43 html/Admin/Queues/Workflows.html:44
+#. ($Queue)
+#. ($id)
+msgid "Queue %1 not found"
+msgstr "找�到表� %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue '%1' not found\\n"
+msgstr "找�到表� '%1'\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Keyword Selections"
+msgstr "表�关键�选�"
+
+#: html/Admin/Elements/ModifyQueue:30 html/Admin/Queues/Modify.html:42 html/Edit/Queues/Basic/Top:12 html/Edit/Queues/Basic/index.html:36 html/Edit/Queues/Global:21 html/Edit/Queues/List:6 html/Edit/Users/Queue:10 html/Work/Delegates/List:6 html/Work/Elements/List:11 html/Work/Queues/List:5 html/Work/Tickets/Create.html:20 html/Work/Tickets/Elements/ShowBasics:6
+msgid "Queue Name"
+msgstr "表��称"
+
+#: html/Edit/Queues/List:8 html/Work/Elements/List:25 html/Work/Queues/List:7 html/Work/Tickets/Create.html:33 html/Work/Tickets/Elements/ShowBasics:19
+msgid "Queue Owner"
+msgstr "业务承办人"
+
+#: html/Edit/Queues/Basic/Top:35
+msgid "Queue Priority"
+msgstr "优先等级"
+
+#: html/Edit/Global/GroupRight/Top:24 html/Edit/Global/UserRight/Top:43 html/Edit/Users/Queue:11 html/Edit/Users/index.html:124
+msgid "Queue Rights"
+msgstr "表���"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Scrips"
+msgstr "表�手续"
+
+#: html/Edit/Elements/Tab:36
+msgid "Queue Setup"
+msgstr "表�设定"
+
+#: lib/RT/Queue_Overlay.pm:264
+msgid "Queue already exists"
+msgstr "表�已存在"
+
+#: lib/RT/Queue_Overlay.pm:273 lib/RT/Queue_Overlay.pm:279
+msgid "Queue could not be created"
+msgstr "无法新增表�"
+
+#: html/Edit/Queues/autohandler:8 html/Ticket/Create.html:204 html/Work/Tickets/Create.html:176
+msgid "Queue could not be loaded."
+msgstr "无法加载表�"
+
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:283
+msgid "Queue created"
+msgstr "表�新增完毕"
+
+#: html/Admin/Elements/ModifyWorkflow:32
+msgid "Queue is not specified."
+msgstr "未指定表�。"
+
+#: html/SelfService/Display.html:70 lib/RT/CustomField_Overlay.pm:97
+msgid "Queue not found"
+msgstr "找�到表�"
+
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
+msgid "Queues"
+msgstr "表�"
+
+#: html/Work/Elements/Quicksearch:10
+msgid "Quick Search"
+msgstr "表�现况"
+
+#: html/Elements/Quicksearch:24
+msgid "Quick search"
+msgstr "表�一览"
+
+#: html/Elements/Login:44
+#. ($RT::VERSION)
+msgid "RT %1"
+msgstr "RT %1"
+
+#: docs/design_docs/string-extraction-guide.txt:70
+#. ($RT::VERSION, $RT::rtname)
+msgid "RT %1 for %2"
+msgstr "%2：RT %1 版"
+
+#: html/Elements/Footer:32
+#. ($RT::VERSION)
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr "RT %1 版，<a href=\"http://bestpractical.com\">Best Practical Solutions 公�</a>出�。"
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1。版�所有 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1。版�所有 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: html/Admin/index.html:24 html/Admin/index.html:25
+msgid "RT Administration"
+msgstr "RT 管�页�"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Authentication error."
+msgstr "RT 认�错误。"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Bounce: %1"
+msgstr "RT 退信：%1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Configuration error"
+msgstr "RT 设定错误"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Critical error. Message not recorded!"
+msgstr "RT 致命错误。讯�未被纪录。"
+
+#: html/Elements/Error:41 html/SelfService/Error.html:40
+msgid "RT Error"
+msgstr "RT 错误"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Received mail (%1) from itself."
+msgstr "RT 收到从自己寄出的邮件 (%1)。"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Recieved mail (%1) from itself."
+msgstr "RT 收到从自己寄出的邮件 (%1)。"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Self Service / Closed Tickets"
+msgstr "RT 自助�务/已解决的申请�"
+
+#: html/index.html:24 html/index.html:27
+msgid "RT at a glance"
+msgstr "RT 一览"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't authenticate you"
+msgstr "RT 无法认�你"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find requestor via its external database lookup"
+msgstr "RT 无法从外部数�库查询找到申请人信�"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find the queue: %1"
+msgstr "RT 找�到表�：%1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't validate this PGP signature. \\n"
+msgstr "RT 无法确认这个 PGP 签章。\\n"
+
+#: html/Edit/Elements/104Header:7 html/Edit/Elements/104Top:20 html/Elements/PageLayout:85 html/Work/Elements/104Header:7
+#. ($RT::rtname)
+msgid "RT for %1"
+msgstr "%1 专用�程系统"
+
+#: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr "%1 专用 RT 系统：%2"
+
+#: NOT FOUND IN SOURCE
+msgid "RT has proccessed your commands"
+msgstr "RT 已执行您的命令"
+
+#: html/Elements/Login:94
+#. ('2003')
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT 版�所有 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;。<br>本软体� <a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU 通用公共授�第二版</a> 散布。"
+
+#: NOT FOUND IN SOURCE
+msgid "RT thinks this message may be a bounce"
+msgstr "RT 认为这�能是退信"
+
+#: NOT FOUND IN SOURCE
+msgid "RT will process this message as if it were unsigned.\\n"
+msgstr "RT 以未签章方�处�这�邮件。\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+msgstr "RT 的电�邮件命令模�须� PGP 认�。您�能没有签章，或是您的签章无法辨识。"
+
+#: NOT FOUND IN SOURCE
+msgid "RT::Queue-Role"
+msgstr "表��行角色"
+
+#: NOT FOUND IN SOURCE
+msgid "RT::System-Role"
+msgstr "系统�行角色"
+
+#: NOT FOUND IN SOURCE
+msgid "RT::Ticket-Role"
+msgstr "申请��行角色"
+
+#: html/Work/Tickets/Elements/ShowTransaction:11
+msgid "RT_System"
+msgstr "系统讯�"
+
+#: html/Admin/Users/Modify.html:57 html/Admin/Users/Prefs.html:51 html/User/Prefs.html:43 html/Work/Preferences/Info:18
+msgid "Real Name"
+msgstr "真实姓�"
+
+#: html/Admin/Elements/ModifyUser:47
+msgid "RealName"
+msgstr "真实姓�"
+
+#: html/Work/Approvals/Display.html:27 html/Work/Tickets/Update.html:85
+msgid "Really reject this ticket?"
+msgstr "您确定�驳回这张申请��？"
+
+#: html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:50 html/Ticket/Elements/EditLinks:138 html/Ticket/Elements/EditLinks:93 html/Ticket/Elements/ShowLinks:70 html/Work/Search/BulkLinks:26
+msgid "Referred to by"
+msgstr "被�考"
+
+#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:46 html/Ticket/Elements/EditLinks:134 html/Ticket/Elements/EditLinks:79 html/Ticket/Elements/ShowLinks:60 html/Work/Search/BulkLinks:22
+msgid "Refers to"
+msgstr "�考"
+
+#: NOT FOUND IN SOURCE
+msgid "RefersTo"
+msgstr "�考"
+
+#: NOT FOUND IN SOURCE
+msgid "Refine"
+msgstr "在结果范围内查询"
+
+#: html/Search/Elements/PickRestriction:26 html/Work/Search/PickRestriction:7
+msgid "Refine search"
+msgstr "调整查询�件"
+
+#: html/Work/Overview/index.html:12
+msgid "Refresh"
+msgstr "æ›´æ–°"
+
+#: html/Elements/Refresh:35
+#. ($value/60)
+msgid "Refresh this page every %1 minutes."
+msgstr "� %1 分钟更新页�"
+
+#: html/Ticket/Create.html:173 html/Ticket/Elements/ShowSummary:61 html/Ticket/ModifyAll.html:56
+msgid "Relationships"
+msgstr "关系"
+
+#: html/Edit/Elements/ListButtons:13
+msgid "Remove"
+msgstr "移除"
+
+#: html/Search/Bulk.html:97 html/Work/Search/Bulk.html:77
+msgid "Remove AdminCc"
+msgstr "移除管�员副本"
+
+#: html/Search/Bulk.html:93 html/Work/Search/Bulk.html:71
+msgid "Remove Cc"
+msgstr "移除副本"
+
+#: html/Search/Bulk.html:89 html/Work/Search/Bulk.html:65
+msgid "Remove Requestor"
+msgstr "移除申请人"
+
+#: html/Ticket/Elements/ShowTransaction:160 html/Ticket/Elements/Tabs:121 html/Work/Tickets/Display.html:31 html/Work/Tickets/Elements/ShowTransaction:106
+msgid "Reply"
+msgstr "回�"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "Reply to tickets"
+msgstr "对申请�进行回�"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "ReplyToTicket"
+msgstr "回�申请�"
+
+#: html/Edit/Users/Info:46
+msgid "Report to Duty"
+msgstr "上下�刷�"
+
+#: html/Edit/Users/Info:34
+msgid "Reported on"
+msgstr "到�日期"
+
+#: etc/initialdata:62 html/Ticket/Update.html:39 html/Work/Elements/List:21 html/Work/Elements/MyApprovals:12 html/Work/Elements/SelectSearch:30 html/Work/Tickets/Elements/ShowBasics:54 lib/RT/ACE_Overlay.pm:86
+msgid "Requestor"
+msgstr "申请人"
+
+#: html/Edit/Global/Workflow/Owner.html:44
+msgid "Requestor Group's"
+msgstr "申请人所属群组之"
+
+#: html/Search/Elements/PickRestriction:37 html/Work/Search/PickRestriction:17
+msgid "Requestor email address"
+msgstr "申请人电�邮件信箱地�"
+
+#: html/Edit/Global/Workflow/Owner.html:28
+msgid "Requestor's"
+msgstr "申请人所属之第上"
+
+#: html/Work/Elements/List:23
+msgid "Requestor's Phone"
+msgstr "申请人电�"
+
+#: NOT FOUND IN SOURCE
+msgid "Requestor(s)"
+msgstr "申请人"
+
+#: NOT FOUND IN SOURCE
+msgid "RequestorAddresses"
+msgstr "申请人地�"
+
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
+msgid "Requestors"
+msgstr "申请人"
+
+#: html/Admin/Elements/ModifyQueue:60 html/Admin/Queues/Modify.html:74
+msgid "Requests should be due in"
+msgstr "申请�处�期�"
+
+#: html/Elements/Submit:61
+msgid "Reset"
+msgstr "�设"
+
+#: html/Admin/Users/Modify.html:158 html/User/Prefs.html:49 html/Work/Preferences/Info:29
+msgid "Residence"
+msgstr "�处"
+
+#: NOT FOUND IN SOURCE
+msgid "Resolution"
+msgstr "解决状�"
+
+#: html/Ticket/Elements/Tabs:131 html/Work/Tickets/Display.html:34
+msgid "Resolve"
+msgstr "解决"
+
+#: html/Ticket/Update.html:136 html/Work/Tickets/Update.html:120
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Resolve ticket #%1 (%2)"
+msgstr "解决申请� #%1 (%2)"
+
+#: etc/initialdata:331 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1178
+msgid "Resolved"
+msgstr "已解决"
+
+#: html/Search/Bulk.html:132 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:71 html/Work/Search/Bulk.html:84 html/Work/Tickets/Update.html:38
+msgid "Response to requestors"
+msgstr "回�申请人"
+
+#: html/Edit/Users/Info:45
+msgid "Responsibility Type"
+msgstr "责任区分"
+
+#: html/Elements/ListActions:25
+msgid "Results"
+msgstr "结果"
+
+#: html/Search/Elements/PickRestriction:104 html/Work/Search/PickRestriction:84
+msgid "Results per page"
+msgstr "�页列出几笔结果"
+
+#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:99 html/User/Prefs.html:71 html/Work/Preferences/Info:51
+msgid "Retype Password"
+msgstr "�次输入�令"
+
+#: NOT FOUND IN SOURCE
+msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+msgstr "在 %4 (%5) 的范围内找�到 %2 %3 的 %1 ��\\n"
+
+#: lib/RT/ACE_Overlay.pm:612
+msgid "Right Delegated"
+msgstr "��代�完毕"
+
+#: lib/RT/ACE_Overlay.pm:302
+msgid "Right Granted"
+msgstr "��设定完毕"
+
+#: lib/RT/ACE_Overlay.pm:160
+msgid "Right Loaded"
+msgstr "��加载完毕"
+
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
+msgid "Right could not be revoked"
+msgstr "无法撤消��"
+
+#: html/User/Delegation.html:63
+msgid "Right not found"
+msgstr "找�到��"
+
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
+msgid "Right not loaded."
+msgstr "��并未加载。"
+
+#: lib/RT/ACE_Overlay.pm:688
+msgid "Right revoked"
+msgstr "��撤消完毕"
+
+#: html/Admin/Elements/UserTabs:40
+msgid "Rights"
+msgstr "���代�人"
+
+#: lib/RT/Interface/Web.pm:794
+#. ($object_type)
+msgid "Rights could not be granted for %1"
+msgstr "无法将��赋予 %1"
+
+#: lib/RT/Interface/Web.pm:827
+#. ($object_type)
+msgid "Rights could not be revoked for %1"
+msgstr "无法撤消 %1 的��"
+
+#: html/Edit/Groups/Member:55 html/Edit/Groups/Members/List:10
+msgid "Role Members"
+msgstr "角色�员"
+
+#: html/Edit/Groups/Member:37 html/Edit/Groups/Members/Add.html:13 html/Edit/Groups/Members/List:7 html/Edit/Groups/Roles/List:4 html/Edit/Groups/Roles/Top:7
+msgid "Role Name"
+msgstr "角色�称"
+
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52 html/Edit/Global/Workflow/Owner.html:55 html/Edit/Global/Workflow/Owner.html:81 html/Edit/Groups/Member:24
+msgid "Roles"
+msgstr "角色"
+
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr "交由系统管�员签核"
+
+#: html/Edit/Global/Workflow/Action:27
+msgid "Run Approval"
+msgstr "签核执行"
+
+#: html/Edit/Global/Basic/Top:72
+msgid "SMTPDebug"
+msgstr "SMTP 侦错纪录"
+
+#: html/Edit/Global/Basic/Top:58
+msgid "SMTPFrom"
+msgstr "SMTP 寄件地�"
+
+#: html/Edit/Global/Basic/Top:56
+msgid "SMTPServer"
+msgstr "SMTP �务器"
+
+#: NOT FOUND IN SOURCE
+msgid "Sat"
+msgstr "星期六"
+
+#: lib/RT/Date.pm:393
+msgid "Sat."
+msgstr "星期六"
+
+#: html/Edit/Elements/104Buttons:72 html/Work/Preferences/index.html:35
+msgid "Save"
+msgstr "储存"
+
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
+msgid "Save Changes"
+msgstr "储存更改"
+
+#: NOT FOUND IN SOURCE
+msgid "Save changes"
+msgstr "储存更改"
+
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
+#. ($QueueObj->id)
+#. ($ARGS{'id'})
+msgid "Scrip #%1"
+msgstr "手续 #%1"
+
+#: html/Edit/Global/Scrip/List:9 html/Edit/Global/Scrip/Top:41
+msgid "Scrip Action"
+msgstr "讯�通知动作"
+
+#: html/Edit/Global/Scrip/List:8 html/Edit/Global/Scrip/Top:15
+msgid "Scrip Condition"
+msgstr "讯�通知�件"
+
+#: lib/RT/Scrip_Overlay.pm:175
+msgid "Scrip Created"
+msgstr "手续新增完毕"
+
+#: html/Edit/Global/Scrip/List:7 html/Edit/Global/Scrip/Top:9
+msgid "Scrip Name"
+msgstr "讯��称"
+
+#: html/Admin/Elements/EditScrips:83
+msgid "Scrip deleted"
+msgstr "手续删除完毕"
+
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
+msgid "Scrips"
+msgstr "手续"
+
+#: html/Edit/Global/autohandler:9 html/Edit/Queues/autohandler:20
+msgid "Scrips "
+msgstr "讯�通知"
+
+#: NOT FOUND IN SOURCE
+msgid "Scrips for %1\\n"
+msgstr "%1 的手续\\n"
+
+#: html/Admin/Queues/Scrips.html:33
+msgid "Scrips which apply to all queues"
+msgstr "适用于所有表�的手续"
+
+#: html/Edit/Elements/104Buttons:75 html/Elements/SimpleSearch:26 html/Search/Elements/PickRestriction:125 html/Ticket/Elements/Tabs:158 html/Work/Elements/Tab:43 html/Work/Search/PickRestriction:102
+msgid "Search"
+msgstr "查询"
+
+#: NOT FOUND IN SOURCE
+msgid "Search Criteria"
+msgstr "查询�件"
+
+#: html/Approvals/Elements/PendingMyApproval:38
+msgid "Search for approvals"
+msgstr "签核�查询"
+
+#: html/Edit/Global/Workflow/Owner.html:31
+msgid "Second-"
+msgstr "二"
+
+#: html/Edit/Users/Info:41
+msgid "Second-level Users"
+msgstr "二阶主管员工"
+
+#: bin/rt-crontool:187
+msgid "Security:"
+msgstr "安全性："
+
+#: lib/RT/Queue_Overlay.pm:66
+msgid "SeeQueue"
+msgstr "查阅表�"
+
+#: html/Edit/Elements/ListButtons:10
+msgid "Select All"
+msgstr "全选"
+
+#: html/Admin/Groups/index.html:39
+msgid "Select a group"
+msgstr "选择群组"
+
+#: NOT FOUND IN SOURCE
+msgid "Select a queue"
+msgstr "选择表�"
+
+#: html/Work/Queues/Select.html:8
+msgid "Select a queue to link to"
+msgstr "请选择欲连结表�"
+
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
+msgid "Select a user"
+msgstr "选择使用者"
+
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
+msgid "Select custom field"
+msgstr "选择自订字段"
+
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
+msgid "Select group"
+msgstr "选择群组"
+
+#: lib/RT/CustomField_Overlay.pm:421
+msgid "Select multiple values"
+msgstr "选择多�项目"
+
+#: lib/RT/CustomField_Overlay.pm:418
+msgid "Select one value"
+msgstr "选择�一项目"
+
+#: html/Admin/Elements/QueueTabs:66
+msgid "Select queue"
+msgstr "选择表�"
+
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
+msgid "Select scrip"
+msgstr "选择手续"
+
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
+msgid "Select template"
+msgstr "选择模�"
+
+#: html/Admin/Elements/UserTabs:48
+msgid "Select user"
+msgstr "选择使用者"
+
+#: html/Admin/Global/Workflow.html:57 html/Admin/Global/Workflows.html:36 html/Admin/Queues/Workflow.html:54 html/Admin/Queues/Workflows.html:47
+msgid "Select workflow"
+msgstr "选择�程"
+
+#: NOT FOUND IN SOURCE
+msgid "SelectExternal"
+msgstr "系统选项"
+
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectMultiple"
+msgstr "多�选项"
+
+#: lib/RT/CustomField_Overlay.pm:34
+msgid "SelectSingle"
+msgstr "�一选项"
+
+#: html/Edit/Elements/PickUsers:85 html/Edit/Users/Add.html:78
+msgid "Selected users:"
+msgstr "新增对象："
+
+#: NOT FOUND IN SOURCE
+msgid "Self Service"
+msgstr "自助�务"
+
+#: etc/initialdata:131
+msgid "Send mail to all watchers"
+msgstr "寄信给所有视察员"
+
+#: etc/initialdata:127
+msgid "Send mail to all watchers as a \"comment\""
+msgstr "以评论方�寄信给所有视察员"
+
+#: etc/initialdata:122
+msgid "Send mail to requestors and Ccs"
+msgstr "寄信给申请人�副本收件人"
+
+#: etc/initialdata:117
+msgid "Send mail to requestors and Ccs as a comment"
+msgstr "以评论方�寄信给申请人�副本收件人"
+
+#: etc/initialdata:96
+msgid "Sends a message to the requestors"
+msgstr "寄信给申请人"
+
+#: etc/initialdata:135 etc/initialdata:139
+msgid "Sends mail to explicitly listed Ccs and Bccs"
+msgstr "寄信给特定的副本�密件副本收件人"
+
+#: etc/initialdata:112
+msgid "Sends mail to the administrative Ccs"
+msgstr "寄信给管�员副本收件人"
+
+#: etc/initialdata:108
+msgid "Sends mail to the administrative Ccs as a comment"
+msgstr "以评论寄信给管�员副本收件人"
+
+#: etc/initialdata:100 etc/initialdata:104
+msgid "Sends mail to the owner"
+msgstr "寄信给申请人"
+
+#: NOT FOUND IN SOURCE
+msgid "Sep"
+msgstr "�月"
+
+#: lib/RT/Date.pm:419
+msgid "Sep."
+msgstr "09"
+
+#: NOT FOUND IN SOURCE
+msgid "September"
+msgstr "�月"
+
+#: html/Edit/Users/Info:39
+msgid "Shift Type"
+msgstr "�别属性"
+
+#: NOT FOUND IN SOURCE
+msgid "Show Results"
+msgstr "显示结果"
+
+#: html/Approvals/Elements/PendingMyApproval:43
+msgid "Show approved requests"
+msgstr "显示已批准的签核�"
+
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
+msgid "Show basics"
+msgstr "显示基本信�"
+
+#: html/Approvals/Elements/PendingMyApproval:44
+msgid "Show denied requests"
+msgstr "显示已驳回的签核�"
+
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
+msgid "Show details"
+msgstr "显示细节"
+
+#: html/Approvals/Elements/PendingMyApproval:42
+msgid "Show pending requests"
+msgstr "显示待处�的签核�"
+
+#: html/Approvals/Elements/PendingMyApproval:45
+msgid "Show requests awaiting other approvals"
+msgstr "显示尚待他人批准的签核�"
+
+#: lib/RT/Queue_Overlay.pm:80
+msgid "Show ticket private commentary"
+msgstr "显示申请�内的�人评论"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "Show ticket summaries"
+msgstr "显示申请�摘�"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "ShowACL"
+msgstr "显示��清�"
+
+#: lib/RT/Queue_Overlay.pm:77
+msgid "ShowScrips"
+msgstr "显示手续"
+
+#: lib/RT/Queue_Overlay.pm:74
+msgid "ShowTemplate"
+msgstr "显示模�"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "ShowTicket"
+msgstr "显示申请�"
+
+#: lib/RT/Queue_Overlay.pm:80
+msgid "ShowTicketComments"
+msgstr "显示申请�的评论"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "Sign up as a ticket Requestor or ticket or queue Cc"
+msgstr "登记�为申请人或副本收件人"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Sign up as a ticket or queue AdminCc"
+msgstr "登记�为管�员副本收件人"
+
+#: html/Admin/Elements/ModifyUser:38 html/Admin/Users/Modify.html:190 html/Admin/Users/Prefs.html:31 html/User/Prefs.html:111 html/Work/Preferences/Info:106
+msgid "Signature"
+msgstr "签�档"
+
+#: NOT FOUND IN SOURCE
+msgid "Signed in as %1"
+msgstr "使用者：%1"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:25
+msgid "Single"
+msgstr "�一"
+
+#: html/Elements/Header:50
+msgid "Skip Menu"
+msgstr "略过选�"
+
+#: html/Admin/Elements/AddCustomFieldValue:27
+msgid "Sort"
+msgstr "顺�"
+
+#: NOT FOUND IN SOURCE
+msgid "Sort key"
+msgstr "排�方�"
+
+#: html/Search/Elements/PickRestriction:108 html/Work/Search/PickRestriction:89
+msgid "Sort results by"
+msgstr "结果排�方�"
+
+#: NOT FOUND IN SOURCE
+msgid "SortOrder"
+msgstr "排�顺�"
+
+#: html/Work/Elements/List:8 html/Work/Elements/MyApprovals:11
+msgid "Stage"
+msgstr "关�"
+
+#: html/Edit/Global/Workflow/Top:8
+msgid "Stage Action"
+msgstr "关��行动作"
+
+#: html/Edit/Global/Workflow/Top:5
+msgid "Stage Condition"
+msgstr "关��行�件"
+
+#: html/Work/Elements/Quicksearch:17
+msgid "Stalled"
+msgstr "延宕"
+
+#: NOT FOUND IN SOURCE
+msgid "Start page"
+msgstr "首页"
+
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:34
+msgid "Started"
+msgstr "实际起始日"
+
+#: NOT FOUND IN SOURCE
+msgid "Started date '%1' could not be parsed"
+msgstr "无法解读起始日期 '%1"
+
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:30
+msgid "Starts"
+msgstr "应起始日"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts By"
+msgstr "应起始日"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts date '%1' could not be parsed"
+msgstr "无法解读起始日期 '%1"
+
+#: html/Admin/Elements/ModifyUser:81 html/Admin/Users/Modify.html:137 html/User/Prefs.html:93 html/Work/Preferences/Info:82
+msgid "State"
+msgstr "å·ž"
+
+#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Search/Elements/PickRestriction:73 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:37 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:59 html/Work/Elements/List:15 html/Work/Elements/MyRequests:12 html/Work/Elements/MyTickets:12 html/Work/Search/PickRestriction:54 html/Work/Tickets/Update.html:22 lib/RT/Ticket_Overlay.pm:1172 lib/RT/Tickets_Overlay.pm:908
+msgid "Status"
+msgstr "现况"
+
+#: etc/initialdata:317
+msgid "Status Change"
+msgstr "现况改�时"
+
+#: lib/RT/Transaction_Overlay.pm:528
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
+msgid "Status changed from %1 to %2"
+msgstr "现况从 %1 改为 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr "现况改�时"
+
+#: html/Ticket/Elements/Tabs:146
+msgid "Steal"
+msgstr "强制更�承办人"
+
+#: lib/RT/Queue_Overlay.pm:91
+msgid "Steal tickets"
+msgstr "强制承办申请�"
+
+#: lib/RT/Queue_Overlay.pm:91
+msgid "StealTicket"
+msgstr "强制承办申请�"
+
+#: lib/RT/Transaction_Overlay.pm:587
+#. ($Old->Name)
+msgid "Stolen from %1 "
+msgstr "被 %1 强制更� "
+
+#: html/Edit/Groups/Member:69
+msgid "Subgroup"
+msgstr "�群组"
+
+#: html/Elements/MyRequests:28 html/Elements/MyTickets:28 html/Search/Bulk.html:135 html/Search/Elements/PickRestriction:42 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:27 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:75 html/Work/Elements/MyApprovals:9 html/Work/Elements/MyRequests:10 html/Work/Elements/MyTickets:10 html/Work/Search/Bulk.html:87 html/Work/Search/PickRestriction:22 html/Work/Tickets/Create.html:122 lib/RT/Ticket_Overlay.pm:1168 lib/RT/Tickets_Overlay.pm:987
+msgid "Subject"
+msgstr "主题"
+
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/Transaction_Overlay.pm:609
+#. ($self->Data)
+msgid "Subject changed to %1"
+msgstr "标题已改为 %1"
+
+#: html/Elements/Submit:58 html/Work/Search/Bulk.html:103
+msgid "Submit"
+msgstr "�出"
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr "�出�程"
+
+#: lib/RT/Group_Overlay.pm:748
+msgid "Succeeded"
+msgstr "设定�功"
+
+#: NOT FOUND IN SOURCE
+msgid "Sun"
+msgstr "星期日"
+
+#: lib/RT/Date.pm:394
+msgid "Sun."
+msgstr "星期日"
+
+#: html/Edit/Users/System:17 lib/RT/System.pm:53
+msgid "SuperUser"
+msgstr "系统管�员"
+
+#: html/User/Elements/DelegateRights:76
+msgid "System"
+msgstr "系统"
+
+#: html/Edit/Global/Scrip/Top:18 html/Edit/Global/Scrip/Top:44
+msgid "System Defined"
+msgstr "系统定义"
+
+#: html/Admin/Elements/SelectRights:80 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:793 lib/RT/Interface/Web.pm:826
+msgid "System Error"
+msgstr "系统错误"
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. Right not granted."
+msgstr "系统错误。设定��失败。"
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. right not granted"
+msgstr "系统错误。设定��失败。"
+
+#: html/Edit/Users/index.html:122
+msgid "System Rights"
+msgstr "系统��"
+
+#: lib/RT/ACE_Overlay.pm:615
+msgid "System error. Right not delegated."
+msgstr "系统错误。��代�失败。"
+
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
+msgid "System error. Right not granted."
+msgstr "系统错误。设定��失败。"
+
+#: NOT FOUND IN SOURCE
+msgid "System error. Unable to grant rights."
+msgstr "系统错误。无法设定��。"
+
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
+msgid "System groups"
+msgstr "系统群组"
+
+#: NOT FOUND IN SOURCE
+msgid "SystemInternal"
+msgstr "系统内部用"
+
+#: etc/initialdata:59 etc/initialdata:65 etc/initialdata:71
+msgid "SystemRolegroup for internal use"
+msgstr "内部使用的系统角色群组"
+
+#: lib/RT/CurrentUser.pm:319
+msgid "TEST_STRING"
+msgstr "TEST_STRING"
+
+#: html/Ticket/Elements/Tabs:142
+msgid "Take"
+msgstr "��"
+
+#: lib/RT/Queue_Overlay.pm:89
+msgid "Take tickets"
+msgstr "自行承办申请�"
+
+#: lib/RT/Queue_Overlay.pm:89
+msgid "TakeTicket"
+msgstr "自行承办申请�"
+
+#: lib/RT/Transaction_Overlay.pm:573
+msgid "Taken"
+msgstr "已��"
+
+#: html/Admin/Elements/EditScrip:80
+msgid "Template"
+msgstr "模�"
+
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
+#. ($TemplateObj->Id())
+msgid "Template #%1"
+msgstr "模� #%1"
+
+#: html/Edit/Global/Template/List:9 html/Edit/Global/Template/Top:17
+msgid "Template Content"
+msgstr "通知模�内容"
+
+#: html/Edit/Global/Template/List:8 html/Edit/Global/Template/Top:13
+msgid "Template Description"
+msgstr "通知模��述"
+
+#: html/Edit/Global/Template/List:7 html/Edit/Global/Template/Top:9
+msgid "Template Name"
+msgstr "通知模��称"
+
+#: html/Admin/Elements/EditTemplates:88
+msgid "Template deleted"
+msgstr "模�已删除"
+
+#: lib/RT/Scrip_Overlay.pm:152
+msgid "Template not found"
+msgstr "找�到模�"
+
+#: NOT FOUND IN SOURCE
+msgid "Template not found\\n"
+msgstr "找�到模�\\n"
+
+#: lib/RT/Template_Overlay.pm:352
+msgid "Template parsed"
+msgstr "模�剖�完毕"
+
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
+msgid "Templates"
+msgstr "模�"
+
+#: html/Edit/Global/autohandler:8 html/Edit/Queues/autohandler:19
+msgid "Templates "
+msgstr "通知模�"
+
+#: NOT FOUND IN SOURCE
+msgid "Templates for %1\\n"
+msgstr "找�到 %1 的模�\\n"
+
+#: lib/RT/Interface/Web.pm:894
+msgid "That is already the current value"
+msgstr "已�是目�字段的值"
+
+#: lib/RT/CustomField_Overlay.pm:242
+msgid "That is not a value for this custom field"
+msgstr "这�是该自订字段的值"
+
+#: lib/RT/Ticket_Overlay.pm:1908
+msgid "That is the same value"
+msgstr "�样的值"
+
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
+msgid "That principal already has that right"
+msgstr "这项��已�拥有该��"
+
+#: lib/RT/Queue_Overlay.pm:633
+#. ($args{'Type'})
+msgid "That principal is already a %1 for this queue"
+msgstr "这项��已�是这个表�的 %1"
+
+#: lib/RT/Ticket_Overlay.pm:1442
+#. ($self->loc($args{'Type'}))
+msgid "That principal is already a %1 for this ticket"
+msgstr "这项��已�是这份申请�的 %1"
+
+#: lib/RT/Queue_Overlay.pm:732
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this queue"
+msgstr "这项���是这个表�的 %1"
+
+#: lib/RT/Ticket_Overlay.pm:1559
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this ticket"
+msgstr "这项���是这份申请�的 %1"
+
+#: lib/RT/Ticket_Overlay.pm:1904
+msgid "That queue does not exist"
+msgstr "此表��存在"
+
+#: lib/RT/Ticket_Overlay.pm:3246
+msgid "That ticket has unresolved dependencies"
+msgstr "这份申请�有尚未解决的附属申请�"
+
+#: NOT FOUND IN SOURCE
+msgid "That user already has that right"
+msgstr "使用者已具有该项��"
+
+#: lib/RT/Ticket_Overlay.pm:3056
+msgid "That user already owns that ticket"
+msgstr "该使用者已�承办这份申请�"
+
+#: lib/RT/Ticket_Overlay.pm:3028
+msgid "That user does not exist"
+msgstr "使用者�存在"
+
+#: lib/RT/User_Overlay.pm:374
+msgid "That user is already privileged"
+msgstr "这�使用者已�是内部�员"
+
+#: lib/RT/User_Overlay.pm:395
+msgid "That user is already unprivileged"
+msgstr "这�使用者属于�内部�员群组"
+
+#: lib/RT/User_Overlay.pm:387
+msgid "That user is now privileged"
+msgstr "使用者加入内部�员群组完毕"
+
+#: lib/RT/User_Overlay.pm:408
+msgid "That user is now unprivileged"
+msgstr "这�使用者已加入�内部�员群组"
+
+#: NOT FOUND IN SOURCE
+msgid "That user is now unprivilegedileged"
+msgstr "这�使用者已加入�内部�员群组"
+
+#: lib/RT/Ticket_Overlay.pm:3049
+msgid "That user may not own tickets in that queue"
+msgstr "使用者�能没有承办表�里的申请�"
+
+#: lib/RT/Link_Overlay.pm:205
+msgid "That's not a numerical id"
+msgstr "这�是一个数字编�"
+
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
+msgid "The Basics"
+msgstr "基本信�"
+
+#: lib/RT/ACE_Overlay.pm:87
+msgid "The CC of a ticket"
+msgstr "申请�的副本收件人"
+
+#: lib/RT/ACE_Overlay.pm:88
+msgid "The administrative CC of a ticket"
+msgstr "申请�的管�员副本收件人"
+
+#: lib/RT/Ticket_Overlay.pm:2235
+msgid "The comment has been recorded"
+msgstr "评论已被纪录"
+
+#: bin/rt-crontool:197
+msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
+msgstr "下列命令会找到 'general' 表�内所有�作中的申请�，并将其中 4 �时内未处�的申请�优先程度设为 99："
+
+#: bin/rt-commit-handler:755 bin/rt-commit-handler:765
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr "以下命令未被执行：\\n\\n"
+
+#: lib/RT/Interface/Web.pm:897
+msgid "The new value has been set."
+msgstr "新的字段值设定完�。"
+
+#: lib/RT/ACE_Overlay.pm:85
+msgid "The owner of a ticket"
+msgstr "申请�的承办人"
+
+#: lib/RT/ACE_Overlay.pm:86
+msgid "The requestor of a ticket"
+msgstr "申请�的申请人"
+
+#: html/Admin/Elements/EditUserComments:25
+msgid "These comments aren't generally visible to the user"
+msgstr "该使用者�会看�这些评论"
+
+#: html/Edit/Global/Workflow/Owner.html:32
+msgid "Third-"
+msgstr "三"
+
+#: NOT FOUND IN SOURCE
+msgid "This ticket %1 %2 (%3)\\n"
+msgstr "申请� %1 %2 (%3)\\n"
+
+#: bin/rt-crontool:188
+msgid "This tool allows the user to run arbitrary perl modules from within RT."
+msgstr "此工具程�会让使用者�由 RT 执行任�命令。"
+
+#: lib/RT/Transaction_Overlay.pm:251
+msgid "This transaction appears to have no content"
+msgstr "此项更动报告没有内容"
+
+#: html/Ticket/Elements/ShowRequestor:46
+#. ($rows)
+msgid "This user's %1 highest priority tickets"
+msgstr "使用者�出的� %1 份优先处�申请�"
+
+#: NOT FOUND IN SOURCE
+msgid "This user's 25 highest priority tickets"
+msgstr "使用者�出的� 25 份优先处�申请�"
+
+#: NOT FOUND IN SOURCE
+msgid "Thu"
+msgstr "星期四"
+
+#: lib/RT/Date.pm:391
+msgid "Thu."
+msgstr "星期四"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:163
+msgid "Ticket"
+msgstr "申请�"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1  %2"
+msgstr "申请� # %1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1 Jumbo update: %2"
+msgstr "更新申请� # %1 的全部信�：%2"
+
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket #%1 Jumbo update: %2"
+msgstr "更新申请� #%1 的全部信�：%2"
+
+#: html/Approvals/Elements/ShowDependency:45
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Ticket #%1: %2"
+msgstr "申请� #%1: %2"
+
+#: lib/RT/Ticket_Overlay.pm:595 lib/RT/Ticket_Overlay.pm:616
+#. ($self->Id, $QueueObj->Name)
+msgid "Ticket %1 created in queue '%2'"
+msgstr "申请� #%1 �功新增于 '%2' 表�"
+
+#: bin/rt-commit-handler:759
+#. ($Ticket->Id)
+msgid "Ticket %1 loaded\\n"
+msgstr "加载申请� %1\\n"
+
+#: html/Search/Bulk.html:212 html/Work/Search/Bulk.html:169
+#. ($Ticket->Id,$_)
+msgid "Ticket %1: %2"
+msgstr "申请� %1：%2"
+
+#: html/Edit/Queues/Basic/Top:28 html/Edit/Queues/List:16 html/Work/Queues/List:9
+msgid "Ticket Due"
+msgstr "表�处�期�"
+
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket History # %1 %2"
+msgstr "申请�处�纪录 # %1 %2"
+
+#: html/Work/Elements/List:6
+msgid "Ticket ID"
+msgstr "��"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket Id"
+msgstr "申请�编�"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket Processing Due"
+msgstr "表��行期�"
+
+#: etc/initialdata:332
+msgid "Ticket Resolved"
+msgstr "申请�已解决"
+
+#: html/Edit/Queues/Basic/Top:18 html/Edit/Queues/Category/List:6 html/Edit/Queues/Category/Top:7 html/Edit/Queues/List:7 html/Edit/Queues/index.html:31 html/Work/Delegates/List:7 html/Work/Delegates/index.html:11 html/Work/Elements/List:12 html/Work/Elements/SelectSearch:9 html/Work/Queues/List:6 html/Work/Queues/Select.html:12 html/Work/Queues/index.html:11 html/Work/Tickets/Create.html:42 html/Work/Tickets/Elements/ShowBasics:33
+msgid "Ticket Type"
+msgstr "表��类"
+
+#: html/Search/Elements/PickRestriction:62 html/Work/Search/PickRestriction:43
+msgid "Ticket attachment"
+msgstr "申请�附件"
+
+#: lib/RT/Tickets_Overlay.pm:1166
+msgid "Ticket content"
+msgstr "申请�内容"
+
+#: lib/RT/Tickets_Overlay.pm:1212
+msgid "Ticket content type"
+msgstr "申请�内容类别"
+
+#: lib/RT/Ticket_Overlay.pm:485 lib/RT/Ticket_Overlay.pm:494 lib/RT/Ticket_Overlay.pm:504 lib/RT/Ticket_Overlay.pm:605
+msgid "Ticket could not be created due to an internal error"
+msgstr "内部错误，无法新增申请�"
+
+#: lib/RT/Transaction_Overlay.pm:520
+msgid "Ticket created"
+msgstr "申请�新增完毕"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket creation failed"
+msgstr "申请�新增失败"
+
+#: lib/RT/Transaction_Overlay.pm:525
+msgid "Ticket deleted"
+msgstr "申请�删除完毕"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket id not found"
+msgstr "找�到申请�编�"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket killed"
+msgstr "申请�删除完毕"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket not found"
+msgstr "找�到申请�"
+
+#: etc/initialdata:318
+msgid "Ticket status changed"
+msgstr "申请�现况已改�"
+
+#: html/Ticket/Update.html:38
+msgid "Ticket watchers"
+msgstr "申请�视察员"
+
+#: html/Elements/Tabs:46
+msgid "Tickets"
+msgstr "申请�"
+
+#: lib/RT/Tickets_Overlay.pm:1383
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr "申请� %1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:1348
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr "申请� %1 (%2)"
+
+#: html/Elements/ViewUser:25
+#. ($name)
+msgid "Tickets from %1"
+msgstr "%1 的申请�"
+
+#: html/Approvals/Elements/ShowDependency:26
+msgid "Tickets which depend on this approval:"
+msgstr "批准之�，�接续处�："
+
+#: html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
+msgid "Time Left"
+msgstr "剩馀时间"
+
+#: html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:42
+msgid "Time Worked"
+msgstr "处�时间"
+
+#: lib/RT/Tickets_Overlay.pm:1139
+msgid "Time left"
+msgstr "剩馀时间"
+
+#: html/Elements/Footer:36
+msgid "Time to display"
+msgstr "显示时间"
+
+#: lib/RT/Tickets_Overlay.pm:1115
+msgid "Time worked"
+msgstr "已处�时间"
+
+#: NOT FOUND IN SOURCE
+msgid "TimeLeft"
+msgstr "剩馀时间"
+
+#: lib/RT/Ticket_Overlay.pm:1173
+msgid "TimeWorked"
+msgstr "已处�时间"
+
+#: bin/rt-commit-handler:401
+msgid "To generate a diff of this commit:"
+msgstr "产生这次更动的差异档："
+
+#: bin/rt-commit-handler:390
+msgid "To generate a diff of this commit:\\n"
+msgstr "产生这次更动的差异档：\\n"
+
+#: lib/RT/Ticket_Overlay.pm:1176
+msgid "Told"
+msgstr "告知日期"
+
+#: html/Edit/Elements/Page:46
+msgid "Total"
+msgstr "页"
+
+#: etc/initialdata:239
+msgid "Transaction"
+msgstr "更动"
+
+#: lib/RT/Transaction_Overlay.pm:640
+#. ($self->Data)
+msgid "Transaction %1 purged"
+msgstr "清除更动报告 %1"
+
+#: lib/RT/Transaction_Overlay.pm:177
+msgid "Transaction Created"
+msgstr "更动报告已新增"
+
+#: lib/RT/Transaction_Overlay.pm:88
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr "未指定申请�编�，无法新增更动"
+
+#: lib/RT/Transaction_Overlay.pm:699
+msgid "Transactions are immutable"
+msgstr "��更改更动报告"
+
+#: NOT FOUND IN SOURCE
+msgid "Trying to delete a right: %1"
+msgstr "试图删除�项��：%1"
+
+#: NOT FOUND IN SOURCE
+msgid "Tue"
+msgstr "星期二"
+
+#: lib/RT/Date.pm:389
+msgid "Tue."
+msgstr "星期二"
+
+#: html/Admin/Elements/EditCustomField:43 html/Admin/Elements/ModifyTemplateAsWorkflow:135 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1174 lib/RT/Tickets_Overlay.pm:959
+msgid "Type"
+msgstr "类别"
+
+#: lib/RT/ScripCondition_Overlay.pm:103
+msgid "Unimplemented"
+msgstr "尚无实作"
+
+#: html/Admin/Users/Modify.html:67
+msgid "Unix login"
+msgstr "外部系统登入��"
+
+#: html/Admin/Elements/ModifyUser:61
+msgid "UnixUsername"
+msgstr "外部系统登入��"
+
+#: lib/RT/Attachment_Overlay.pm:273 lib/RT/Attachment_Overlay.pm:303
+#. ($self->ContentEncoding)
+msgid "Unknown ContentEncoding %1"
+msgstr "��解的内容文字编�方� %1"
+
+#: html/Elements/SelectResultsPerPage:36
+msgid "Unlimited"
+msgstr "全数显示"
+
+#: etc/initialdata:50
+msgid "Unprivileged"
+msgstr "�内部�员"
+
+#: lib/RT/Transaction_Overlay.pm:569
+msgid "Untaken"
+msgstr "未被��"
+
+#: html/Edit/Elements/Page:13 html/Edit/Elements/Page:15
+msgid "Up"
+msgstr "上一页"
+
+#: html/Elements/MyTickets:63 html/Search/Bulk.html:32 html/Work/Elements/MyTickets:72 html/Work/Search/Bulk.html:10 html/Work/Tickets/Elements/EditCustomFieldEntries:82
+msgid "Update"
+msgstr "处�"
+
+#: html/Admin/Users/Prefs.html:61
+msgid "Update ID"
+msgstr "更新编�"
+
+#: html/Search/Bulk.html:129 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:65 html/Work/Search/Bulk.html:81 html/Work/Tickets/Update.html:32
+msgid "Update Type"
+msgstr "更新类别"
+
+#: html/Search/Listing.html:60 html/Work/Search/index.html:32
+msgid "Update all these tickets at once"
+msgstr "整批更新申请�"
+
+#: html/Admin/Users/Prefs.html:48
+msgid "Update email"
+msgstr "更新电�邮件信箱"
+
+#: html/Admin/Users/Prefs.html:54
+msgid "Update name"
+msgstr "更新��"
+
+#: lib/RT/Interface/Web.pm:409
+msgid "Update not recorded."
+msgstr "更新未被记录"
+
+#: html/Search/Bulk.html:80 html/Work/Search/Bulk.html:52
+msgid "Update selected tickets"
+msgstr "更新选择的申请�"
+
+#: html/Admin/Users/Prefs.html:35
+msgid "Update signature"
+msgstr "更新签章"
+
+#: html/Ticket/ModifyAll.html:62
+msgid "Update ticket"
+msgstr "更新申请�"
+
+#: NOT FOUND IN SOURCE
+msgid "Update ticket # %1"
+msgstr "更新申请� # %1"
+
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:46
+#. ($Ticket->id)
+msgid "Update ticket #%1"
+msgstr "更新申请� #%1"
+
+#: html/Ticket/Update.html:138 html/Work/Tickets/Update.html:122
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Update ticket #%1 (%2)"
+msgstr "更新申请� #%1 (%2)"
+
+#: lib/RT/Interface/Web.pm:407
+msgid "Update type was neither correspondence nor comment."
+msgstr "更新的内容并�申请�回�也�是评论"
+
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:50 lib/RT/Ticket_Overlay.pm:1177
+msgid "Updated"
+msgstr "�次更新"
+
+#: html/Work/Preferences/index.html:15
+msgid "User"
+msgstr "使用者"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 %2: %3\\n"
+msgstr "使用者 %1 %2：%3\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 Password: %2\\n"
+msgstr "使用者 %1 �令：%2\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found"
+msgstr "找�到使用者 '%1'"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found\\n"
+msgstr "找�到使用者 '%1'\\n"
+
+#: etc/initialdata:142 etc/initialdata:209
+msgid "User Defined"
+msgstr "使用者自订"
+
+#: html/Admin/Users/Prefs.html:58 html/Edit/Users/List:13 html/Edit/Users/Top:42
+msgid "User ID"
+msgstr "使用者 ID"
+
+#: html/Elements/SelectUsers:25
+msgid "User Id"
+msgstr "使用者 ID"
+
+#: html/Edit/Elements/PickUsers:12 html/Edit/Global/UserRight/List:7 html/Edit/Global/UserRight/Top:9 html/Edit/Users/Add.html:13 html/Edit/Users/List:5 html/Edit/Users/Search.html:23 html/Edit/Users/Top:8 html/Work/Delegates/Info:60 html/Work/Tickets/Cc:10
+msgid "User Number"
+msgstr "员工编�"
+
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58 html/Edit/Global/autohandler:11 html/Edit/Queues/autohandler:22
+msgid "User Rights"
+msgstr "使用者��"
+
+#: html/Edit/Elements/Tab:32
+msgid "User Setup"
+msgstr "使用者设定"
+
+#: html/Edit/Users/Info:38
+msgid "User Shift"
+msgstr "员工�别"
+
+#: html/Admin/Users/Modify.html:225
+#. ($msg)
+msgid "User could not be created: %1"
+msgstr "无法新增使用者：%1"
+
+#: lib/RT/User_Overlay.pm:321
+msgid "User created"
+msgstr "使用者新增完毕"
+
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
+msgid "User defined groups"
+msgstr "使用者定义的群组"
+
+#: NOT FOUND IN SOURCE
+msgid "User notified"
+msgstr "已通知使用者"
+
+#: html/Admin/Users/Prefs.html:24 html/Admin/Users/Prefs.html:28
+msgid "User view"
+msgstr "使用者�人数�"
+
+#: NOT FOUND IN SOURCE
+msgid "UserDefined"
+msgstr "使用者自定"
+
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
+msgid "Username"
+msgstr "��"
+
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57 html/Work/Tickets/Elements/ShowTransaction:8
+msgid "Users"
+msgstr "使用者"
+
+#: html/Admin/Users/index.html:64
+msgid "Users matching search criteria"
+msgstr "符�查询�件的使用者"
+
+#: html/Search/Elements/PickRestriction:50 html/Work/Search/PickRestriction:31
+msgid "ValueOfQueue"
+msgstr "选择表�"
+
+#: html/Admin/Elements/EditCustomField:56
+msgid "Values"
+msgstr "字段值"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "Watch"
+msgstr "视察"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "WatchAsAdminCc"
+msgstr "以管�员副本收件人身份视察"
+
+#: NOT FOUND IN SOURCE
+msgid "Watcher loaded"
+msgstr "�功加载视察员信�"
+
+#: html/Admin/Elements/QueueTabs:41
+msgid "Watchers"
+msgstr "视察员"
+
+#: html/Admin/Elements/ModifyUser:55
+msgid "WebEncoding"
+msgstr "网页文字编�方�"
+
+#: NOT FOUND IN SOURCE
+msgid "Wed"
+msgstr "星期三"
+
+#: lib/RT/Date.pm:390
+msgid "Wed."
+msgstr "星期三"
+
+#: etc/initialdata:533 etc/upgrade/2.1.71:161 html/Edit/Elements/CreateApprovalsQueue:135
+msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
+msgstr "当申请�通过所有签核�，将此讯�回�到原申请�"
+
+#: etc/initialdata:497 etc/upgrade/2.1.71:135 html/Edit/Elements/CreateApprovalsQueue:107
+msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
+msgstr "当申请�通过�项签核�，将此讯�回�到原申请�"
+
+#: etc/initialdata:156
+msgid "When a ticket is created"
+msgstr "新增申请�时"
+
+#: etc/initialdata:428 etc/upgrade/2.1.71:79 html/Edit/Elements/CreateApprovalsQueue:51
+msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
+msgstr "签核�新增之�，通知应��的承办人�管�员副本收件人"
+
+#: etc/initialdata:161
+msgid "When anything happens"
+msgstr "当任何事情�生时"
+
+#: etc/initialdata:202
+msgid "Whenever a ticket is resolved"
+msgstr "当申请�解决时"
+
+#: etc/initialdata:188
+msgid "Whenever a ticket's owner changes"
+msgstr "当申请�更�承办人时"
+
+#: etc/initialdata:196
+msgid "Whenever a ticket's queue changes"
+msgstr "当申请�更�表�时"
+
+#: etc/initialdata:180
+msgid "Whenever a ticket's status changes"
+msgstr "当申请�更新现况时"
+
+#: etc/initialdata:210
+msgid "Whenever a user-defined condition occurs"
+msgstr "当使用者自订的情况�生时"
+
+#: etc/initialdata:174
+msgid "Whenever comments come in"
+msgstr "当评论�达时"
+
+#: etc/initialdata:167
+msgid "Whenever correspondence comes in"
+msgstr "当回��达时"
+
+#: html/Admin/Users/Modify.html:163 html/User/Prefs.html:51 html/Work/Preferences/Info:31
+msgid "Work"
+msgstr "公�"
+
+#: html/Admin/Elements/ModifyUser:69
+msgid "WorkPhone"
+msgstr "公�电�"
+
+#: html/Ticket/Elements/ShowBasics:34 html/Ticket/Update.html:64
+msgid "Worked"
+msgstr "处�时间"
+
+#: html/Admin/Global/Workflow.html:91 html/Admin/Queues/Workflow.html:89
+#. ($WorkflowObj->Id())
+msgid "Workflow #%1"
+msgstr "�程 #%1"
+
+#: html/Edit/Global/Workflow/List:15
+msgid "Workflow Begin"
+msgstr "�程开始"
+
+#: html/Edit/Global/Workflow/List:20
+msgid "Workflow End"
+msgstr "�程结�"
+
+#: html/Admin/Elements/EditWorkflows:90
+msgid "Workflow deleted"
+msgstr "�程已删除"
+
+#: html/Edit/Global/autohandler:10 html/Edit/Queues/autohandler:21
+msgid "Workflows"
+msgstr "�程"
+
+#: html/Edit/Global/Basic/Top:25
+msgid "Yes"
+msgstr "是"
+
+#: lib/RT/Ticket_Overlay.pm:3159
+msgid "You already own this ticket"
+msgstr "您已是这份申请�的承办人"
+
+#: html/autohandler:122
+msgid "You are not an authorized user"
+msgstr "您�是被授�的使用者"
+
+#: lib/RT/Ticket_Overlay.pm:3041
+msgid "You can only reassign tickets that you own or that are unowned"
+msgstr "祇能�新指派您所承办或是没有承办人的申请�"
+
+#: NOT FOUND IN SOURCE
+msgid "You don't have permission to view that ticket.\\n"
+msgstr "您没有看那份申请�的��。\\n"
+
+#: docs/design_docs/string-extraction-guide.txt:47
+#. ($num, $queue)
+msgid "You found %1 tickets in queue %2"
+msgstr "您会在表� %2 找到 %1 的申请�"
+
+#: html/NoAuth/Logout.html:30
+msgid "You have been logged out of RT."
+msgstr "您已注销 RT。"
+
+#: html/SelfService/Display.html:77
+msgid "You have no permission to create tickets in that queue."
+msgstr "您没有在该表�新增申请�的��。"
+
+#: lib/RT/Ticket_Overlay.pm:1917
+msgid "You may not create requests in that queue."
+msgstr "您�能在该表�中�出申请。"
+
+#: html/Edit/Global/Basic/Top:38
+msgid "You need to restart the Request Tracker service for saved changes to take effect."
+msgstr "您必须�新激活 Request Tracker �务，储存的更动�会生效。"
+
+#: html/NoAuth/Logout.html:34
+msgid "You're welcome to login again"
+msgstr "欢迎下次��"
+
+#: NOT FOUND IN SOURCE
+msgid "Your %1 requests"
+msgstr "您�出的 %1 申请�"
+
+#: NOT FOUND IN SOURCE
+msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
+msgstr "RT 管�员�能设错了由 RT 寄出的邮件收件人标头档"
+
+#: etc/initialdata:514 etc/upgrade/2.1.71:146 html/Edit/Elements/CreateApprovalsQueue:119
+msgid "Your request has been approved by %1. Other approvals may still be pending."
+msgstr "申请�已由 %1 批准。�能还有其它待签核的步骤。"
+
+#: etc/initialdata:552 etc/upgrade/2.1.71:180 html/Edit/Elements/CreateApprovalsQueue:154
+msgid "Your request has been approved."
+msgstr "您的申请�已完�签核程�。"
+
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr "您的申请�已被驳回"
+
+#: etc/initialdata:455
+msgid "Your request was rejected by %1."
+msgstr "您的申请�已被 %1 驳回。"
+
+#: etc/upgrade/2.1.71:101 html/Edit/Elements/CreateApprovalsQueue:73
+msgid "Your request was rejected."
+msgstr "您的申请�已被驳回。"
+
+#: html/autohandler:144
+msgid "Your username or password is incorrect"
+msgstr "您的��或�令有误"
+
+#: html/Admin/Elements/ModifyUser:83 html/Admin/Users/Modify.html:143 html/User/Prefs.html:95 html/Work/Preferences/Info:84
+msgid "Zip"
+msgstr "邮政编�"
+
+#: NOT FOUND IN SOURCE
+msgid "[no subject]"
+msgstr "[没有标题]"
+
+#: NOT FOUND IN SOURCE
+msgid "ago"
+msgstr "过期"
+
+#: NOT FOUND IN SOURCE
+msgid "alert"
+msgstr "急讯"
+
+#: html/User/Elements/DelegateRights:58
+#. ($right->PrincipalObj->Object->SelfDescription)
+msgid "as granted to %1"
+msgstr "��� %1"
+
+#: html/SelfService/Closed.html:27
+msgid "closed"
+msgstr "已解决"
+
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
+msgid "contains"
+msgstr "包�"
+
+#: html/Elements/SelectAttachmentField:25
+msgid "content"
+msgstr "内容"
+
+#: html/Elements/SelectAttachmentField:26
+msgid "content-type"
+msgstr "类型"
+
+#: lib/RT/Ticket_Overlay.pm:2304
+msgid "correspondence (probably) not sent"
+msgstr "申请�回�(�能)未�出"
+
+#: lib/RT/Ticket_Overlay.pm:2314
+msgid "correspondence sent"
+msgstr "申请�回�已�出"
+
+#: NOT FOUND IN SOURCE
+msgid "critical"
+msgstr "严�"
+
+#: html/Admin/Elements/ModifyQueue:62 html/Admin/Queues/Modify.html:76 html/Edit/Queues/Basic/Top:31 html/Edit/Queues/List:18 html/Work/Queues/List:11 lib/RT/Date.pm:319
+msgid "days"
+msgstr "天"
+
+#: NOT FOUND IN SOURCE
+msgid "dead"
+msgstr "拒�处�"
+
+#: NOT FOUND IN SOURCE
+msgid "debug"
+msgstr "侦错"
+
+#: html/Search/Listing.html:74
+msgid "delete"
+msgstr "删除"
+
+#: lib/RT/Queue_Overlay.pm:62
+msgid "deleted"
+msgstr "已删除"
+
+#: html/Search/Elements/PickRestriction:67 html/Work/Search/PickRestriction:47
+msgid "does not match"
+msgstr "�符�"
+
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
+msgid "doesn't contain"
+msgstr "�包�"
+
+#: NOT FOUND IN SOURCE
+msgid "emergency"
+msgstr "�难"
+
+#: html/Elements/SelectEqualityOperator:37
+msgid "equal to"
+msgstr "等于"
+
+#: NOT FOUND IN SOURCE
+msgid "error"
+msgstr "错误"
+
+#: NOT FOUND IN SOURCE
+msgid "false"
+msgstr "�"
+
+#: html/Elements/SelectAttachmentField:27
+msgid "filename"
+msgstr "档�"
+
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
+msgid "greater than"
+msgstr "大于"
+
+#: lib/RT/Group_Overlay.pm:193
+#. ($self->Name)
+msgid "group '%1'"
+msgstr "群组 '%1'"
+
+#: lib/RT/Date.pm:315
+msgid "hours"
+msgstr "�时"
+
+#: NOT FOUND IN SOURCE
+msgid "id"
+msgstr "编�"
+
+#: NOT FOUND IN SOURCE
+msgid "info"
+msgstr "信�"
+
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickRestriction:46 html/Search/Elements/PickRestriction:75 html/Search/Elements/PickRestriction:87 html/Work/Search/PickRestriction:27 html/Work/Search/PickRestriction:56 html/Work/Search/PickRestriction:69
+msgid "is"
+msgstr "是"
+
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88 html/Work/Search/PickRestriction:28 html/Work/Search/PickRestriction:57 html/Work/Search/PickRestriction:70
+msgid "isn't"
+msgstr "�是"
+
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
+msgid "less than"
+msgstr "�于"
+
+#: html/Edit/Global/Workflow/Owner.html:35
+msgid "level Admins"
+msgstr "层主管"
+
+#: html/Search/Elements/PickRestriction:66 html/Work/Search/PickRestriction:46
+msgid "matches"
+msgstr "符�"
+
+#: lib/RT/Date.pm:311
+msgid "min"
+msgstr "分"
+
+#: html/Ticket/Update.html:64
+msgid "minutes"
+msgstr "分钟"
+
+#: bin/rt-commit-handler:764
+msgid "modifications\\n\\n"
+msgstr "更改\\n\\n"
+
+#: lib/RT/Date.pm:327
+msgid "months"
+msgstr "月"
+
+#: lib/RT/Queue_Overlay.pm:57
+msgid "new"
+msgstr "新建立"
+
+#: html/Admin/Elements/EditScrips:42
+msgid "no value"
+msgstr "没有值"
+
+#: html/Admin/Elements/EditQueueWatchers:26 html/Edit/Groups/Member:40 html/Edit/Groups/Members/Add.html:17 html/Edit/Groups/Members/List:8 html/Edit/Queues/Basic/Top:50 html/Edit/Queues/List:18 html/Ticket/Elements/EditWatchers:27 html/Work/Delegates/Info:37 html/Work/Delegates/Info:48 html/Work/Overview/Info:31 html/Work/Queues/List:11 html/Work/Tickets/Elements/ShowBasics:27
+msgid "none"
+msgstr "æ— "
+
+#: html/Elements/SelectEqualityOperator:37
+msgid "not equal to"
+msgstr "�等于"
+
+#: NOT FOUND IN SOURCE
+msgid "notice"
+msgstr "�示"
+
+#: NOT FOUND IN SOURCE
+msgid "notlike"
+msgstr "�符�"
+
+#: html/Edit/Elements/PickUsers:17 html/Edit/Users/Add.html:18 html/Edit/Users/Search.html:28 html/Work/Tickets/Cc:15
+msgid "number"
+msgstr "�"
+
+#: html/SelfService/Elements/MyRequests:60 lib/RT/Queue_Overlay.pm:58
+msgid "open"
+msgstr "开�"
+
+#: NOT FOUND IN SOURCE
+msgid "opened"
+msgstr "已开�"
+
+#: lib/RT/Group_Overlay.pm:198
+#. ($self->Name, $user->Name)
+msgid "personal group '%1' for user '%2'"
+msgstr "使用者「%2�的「%1�代�人群组"
+
+#: lib/RT/Group_Overlay.pm:206
+#. ($queue->Name, $self->Type)
+msgid "queue %1 %2"
+msgstr "表� %1 %2"
+
+#: lib/RT/Queue_Overlay.pm:61
+msgid "rejected"
+msgstr "已驳回"
+
+#: html/Work/Elements/SelectSearch:21 lib/RT/Queue_Overlay.pm:60
+msgid "resolved"
+msgstr "已处�"
+
+#: html/Edit/Global/Basic/Top:48
+msgid "rtname"
+msgstr "�务器�称"
+
+#: lib/RT/Date.pm:307
+msgid "sec"
+msgstr "秒"
+
+#: lib/RT/Queue_Overlay.pm:59
+msgid "stalled"
+msgstr "延宕"
+
+#: lib/RT/Group_Overlay.pm:201
+#. ($self->Type)
+msgid "system %1"
+msgstr "系统 %1"
+
+#: lib/RT/Group_Overlay.pm:212
+#. ($self->Type)
+msgid "system group '%1'"
+msgstr "系统群组 '%1'"
+
+#: html/Elements/Error:42 html/SelfService/Error.html:41
+msgid "the calling component did not specify why"
+msgstr "呼�组件未指明原因"
+
+#: lib/RT/Group_Overlay.pm:209
+#. ($self->Instance, $self->Type)
+msgid "ticket #%1 %2"
+msgstr "申请� #%1 %2"
+
+#: html/Work/Elements/SelectSearch:27
+msgid "till"
+msgstr "至"
+
+#: html/Edit/Elements/PickUsers:15 html/Edit/Global/Workflow/Condition:30 html/Edit/Users/Add.html:16 html/Edit/Users/Search.html:26 html/Work/Tickets/Cc:13
+msgid "to"
+msgstr "到"
+
+#: NOT FOUND IN SOURCE
+msgid "true"
+msgstr "真"
+
+#: lib/RT/Group_Overlay.pm:215
+#. ($self->Id)
+msgid "undescribed group %1"
+msgstr "没有�述的群组 %1"
+
+#: html/Work/Elements/SelectSearch:19
+msgid "unresolved"
+msgstr "未处�"
+
+#: lib/RT/Group_Overlay.pm:190
+#. ($user->Object->Name)
+msgid "user %1"
+msgstr "使用者 %1"
+
+#: NOT FOUND IN SOURCE
+msgid "warning"
+msgstr "警告"
+
+#: lib/RT/Date.pm:323
+msgid "weeks"
+msgstr "周"
+
+#: NOT FOUND IN SOURCE
+msgid "with template %1"
+msgstr "模�：%1"
+
+#: lib/RT/Date.pm:331
+msgid "years"
+msgstr "å¹´"
+
diff --git a/rt/lib/RT/I18N/zh_tw.po b/rt/lib/RT/I18N/zh_tw.po
new file mode 100644
index 000000000..8c8c86e1f
--- /dev/null
+++ b/rt/lib/RT/I18N/zh_tw.po
@@ -0,0 +1,6416 @@
+# Traditional Chinese localization catalog for Request Tracker (RT)
+msgid ""
+msgstr ""
+"Last-Translator: Autrijus Tang <autrijus@autrijus.org>\n"
+"Language-Team: Chinese <members@ourinet.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: html/Elements/MyRequests:27 html/Elements/MyTickets:27 html/Work/Elements/MyApprovals:8 html/Work/Elements/MyRequests:15 html/Work/Elements/MyTickets:15
+msgid "#"
+msgstr "#"
+
+#: NOT FOUND IN SOURCE
+msgid "#%1"
+msgstr "#%1"
+
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($Ticket->id, $Ticket->Subject)
+#. ($ticket->Id, $ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "#%1: %2"
+msgstr "#%1: %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%*(%1,group ticket)"
+msgstr "%*(%1) 件�與的申請單"
+
+#: NOT FOUND IN SOURCE
+msgid "%*(%1,ticket) due"
+msgstr "%*(%1) 件�期完�的申請單"
+
+#: NOT FOUND IN SOURCE
+msgid "%*(%1,unresolved ticket)"
+msgstr "%*(%1) 件尚未解決的申請單"
+
+#: lib/RT/Date.pm:337
+#. ($s, $time_unit)
+msgid "%1 %2"
+msgstr "%1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:771
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr "%1 %2 %3"
+
+#: lib/RT/Date.pm:373
+#. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
+msgid "%1 %2 %3 %4:%5:%6 %7"
+msgstr "%7-%2-%3 %4:%5:%6 %1"
+
+#: lib/RT/Ticket_Overlay.pm:3532 lib/RT/Transaction_Overlay.pm:557 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $new_value->Content)
+#. ($field, $self->NewValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 added"
+msgstr "%2 已新增為 %1"
+
+#: lib/RT/Date.pm:334
+#. ($s, $time_unit)
+msgid "%1 %2 ago"
+msgstr "%1 %2 之�"
+
+#: lib/RT/Ticket_Overlay.pm:3538 lib/RT/Transaction_Overlay.pm:564
+#. ($cf->Name, $old_value, $new_value->Content)
+#. ($field, $self->OldValue, $self->NewValue)
+msgid "%1 %2 changed to %3"
+msgstr "%1 已從 %2 改為 %3"
+
+#: lib/RT/Ticket_Overlay.pm:3535 lib/RT/Transaction_Overlay.pm:560 lib/RT/Transaction_Overlay.pm:605
+#. ($cf->Name, $old_value)
+#. ($field, $self->OldValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 deleted"
+msgstr "%2 已自 %1 刪除"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:157
+#. ($depth_str, $role_str, $group_str)
+msgid "%1 %2 of group %3"
+msgstr "%3 群組的 %1 %2"
+
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27
+#. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
+msgid "%1 %2 with template %3"
+msgstr "�件：%1 | 動作：%2 | 範本：%3"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 this ticket\\n"
+msgstr "%1 (%2) %3 這份申請單\\n"
+
+#: html/Search/Listing.html:56 html/Work/Search/index.html:28
+#. (($session{'tickets'}->FirstRow+1), ($session{'tickets'}->FirstRow() + $session{'tickets'}->RowsPerPage()  ))
+msgid "%1 - %2 shown"
+msgstr "顯示第 %1 - %2 筆"
+
+#: bin/rt-crontool:168 bin/rt-crontool:175 bin/rt-crontool:181
+#. ("--search-argument", "--search")
+#. ("--condition-argument", "--condition")
+#. ("--action-argument", "--action")
+msgid "%1 - An argument to pass to %2"
+msgstr "%1 - 傳�給 %2 的一個�數"
+
+#: bin/rt-crontool:184
+#. ("--verbose")
+msgid "%1 - Output status updates to STDOUT"
+msgstr "%1 - 將更新狀態輸出到 STDOUT"
+
+#: bin/rt-crontool:178
+#. ("--action")
+msgid "%1 - Specify the action module you want to use"
+msgstr "%1 - 指定欲使用的動作模組"
+
+#: bin/rt-crontool:172
+#. ("--condition")
+msgid "%1 - Specify the condition module you want to use"
+msgstr "%1 - 指定欲使用的�件模組"
+
+#: bin/rt-crontool:165
+#. ("--search")
+msgid "%1 - Specify the search module you want to use"
+msgstr "%1 - 指定欲使用的查詢模組"
+
+#: lib/RT/ScripAction_Overlay.pm:121
+#. ($self->Id)
+msgid "%1 ScripAction loaded"
+msgstr "載入手續 %1"
+
+#: html/Edit/Elements/Page:48
+#. (scalar $count)
+msgid "%1 Total"
+msgstr "å…± %1 ç­†"
+
+#: lib/RT/Ticket_Overlay.pm:3565
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 added as a value for %2"
+msgstr "新增 %1 作為 %2 的值"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on"
+msgstr "別� %1 需��用的申請單編號"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on "
+msgstr "別� %1 需��用的申請單編號 "
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on (from %2) %3"
+msgstr "別� %1 需��用的申請單編號以處� %3(出自 %2)"
+
+#: lib/RT/Link_Overlay.pm:116 lib/RT/Link_Overlay.pm:123
+#. ($args{'Base'})
+#. ($args{'Target'})
+msgid "%1 appears to be a local object, but can't be found in the database"
+msgstr "%1 看來是個本地物件，��在資料庫裡"
+
+#: html/Ticket/Elements/ShowDates:51 lib/RT/Transaction_Overlay.pm:481
+#. ($self->BriefDescription , $self->CreatorObj->Name)
+#. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
+msgid "%1 by %2"
+msgstr "%1 (%2)"
+
+#: lib/RT/Transaction_Overlay.pm:535 lib/RT/Transaction_Overlay.pm:624 lib/RT/Transaction_Overlay.pm:633 lib/RT/Transaction_Overlay.pm:636
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
+#. ($self->Field , $q1->Name , $q2->Name)
+#. ($self->Field, $t2->AsString, $t1->AsString)
+#. ($self->Field, $self->OldValue, $self->NewValue)
+msgid "%1 changed from %2 to %3"
+msgstr "%1 的值從 %2 改為 %3"
+
+#: lib/RT/Interface/Web.pm:893 x:896
+msgid "%1 could not be set to %2."
+msgstr "無法將 %1 設定為 %2。"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 couldn't init a transaction (%2)\\n"
+msgstr "%1 無法�始更新 (%2)\\n"
+
+#: lib/RT/Ticket_Overlay.pm:2830
+#. ($self)
+msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
+msgstr "%1 無法將��設�已解決。RT 資料庫內容�能�一致。"
+
+#: html/Elements/MyTickets:24 html/Work/Elements/MyTickets:9
+#. ($rows)
+msgid "%1 highest priority tickets I own..."
+msgstr "� %1 份待處�申請單..."
+
+#: html/Elements/MyRequests:24 html/Work/Elements/MyRequests:9
+#. ($rows)
+msgid "%1 highest priority tickets I requested..."
+msgstr "� %1 份�出的申請單..."
+
+#: html/Work/Elements/MyApprovals:5
+#. ($rows)
+msgid "%1 highest priority tickets pending my approval..."
+msgstr "� %1 份待簽核申請單..."
+
+#: bin/rt-crontool:160
+#. ($0)
+msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
+msgstr "%1 是從外部排程程�(如 cron)來�申請單進行�作的工具。"
+
+#: lib/RT/Queue_Overlay.pm:743
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this queue."
+msgstr "%1 已��是此表單的 %2。"
+
+#: lib/RT/Ticket_Overlay.pm:1569
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this ticket."
+msgstr "%1 已��是此申請單的 %2。"
+
+#: lib/RT/Ticket_Overlay.pm:3621
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 is no longer a value for custom field %2"
+msgstr "%1 已��是自訂欄� %2 的值。"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 isn't a valid Queue id."
+msgstr "%1 �是一個�法的表單編號。"
+
+#: html/Ticket/Elements/ShowBasics:35
+#. ($TimeWorked)
+msgid "%1 min"
+msgstr "%1 分�"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 not shown"
+msgstr "沒有顯示 %1"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 result(s) found"
+msgstr "找到 %1 項�果"
+
+#: html/User/Elements/DelegateRights:75
+#. (loc($ObjectType =~ /^RT::(.*)$/))
+msgid "%1 rights"
+msgstr "%1權�"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 succeeded\\n"
+msgstr "%1 完�\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for $MessageId"
+msgstr "�知� $MessageID 的 %1 類別"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for %2"
+msgstr "�知� %2 的 %1 類別"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 was created without a CurrentUser\\n"
+msgstr "%1 新增時未指定�行使用者"
+
+#: lib/RT/Action/ResolveMembers.pm:41
+#. (ref $self)
+msgid "%1 will resolve all members of a resolved group ticket."
+msgstr "%1 會解決在已解決群組裡�員的申請單。"
+
+#: lib/RT/Action/StallDependent.pm:40
+#. (ref $self)
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr "如果 %1 起始申請單�賴於�個��，或是�個��的�員，它將會被延宕。"
+
+#: lib/RT/Transaction_Overlay.pm:433
+#. ($self)
+msgid "%1: no attachment specified"
+msgstr "%1：未指定附件"
+
+#: html/Ticket/Elements/ShowTransaction:89 html/Work/Tickets/Elements/ShowTransaction:154
+#. ($size)
+msgid "%1b"
+msgstr "%1 �元組"
+
+#: html/Ticket/Elements/ShowTransaction:86 html/Work/Tickets/Elements/ShowTransaction:151
+#. (int($size/102.4)/10)
+msgid "%1k"
+msgstr "%1k �元組"
+
+#: NOT FOUND IN SOURCE
+msgid "%quant(%1,result) found"
+msgstr "找到 %1 項�果"
+
+#: lib/RT/Ticket_Overlay.pm:1158
+#. ($args{'Status'})
+msgid "'%1' is an invalid value for status"
+msgstr "'%1' �是一個�法的狀態值"
+
+#: NOT FOUND IN SOURCE
+msgid "'%1' not a recognized action. "
+msgstr "'%1'為無法辨識的動作。 "
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete group member)"
+msgstr "(點�欲刪除的�員)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete scrip)"
+msgstr "(點�欲刪除的手續)"
+
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Elements/EditWorkflows:36 html/Admin/Groups/Members.html:51 html/Ticket/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
+msgid "(Check box to delete)"
+msgstr "(點�欲刪除的項目)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check boxes to delete)"
+msgstr "(點�欲刪除的項目)"
+
+#: html/Ticket/Create.html:177
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr "(�入申請單編號或網�，以空白分隔)"
+
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
+#. ($RT::CorrespondAddress)
+#. ($RT::CommentAddress)
+msgid "(If left blank, will default to %1"
+msgstr "(如果留白, 則�設為 %1)"
+
+#: NOT FOUND IN SOURCE
+msgid "(No Value)"
+msgstr "(沒有值)"
+
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
+msgid "(No custom fields)"
+msgstr "(沒有自訂欄�)"
+
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
+msgid "(No members)"
+msgstr "(沒有�員)"
+
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
+msgid "(No scrips)"
+msgstr "(沒有手續)"
+
+#: html/Admin/Elements/EditTemplates:30
+msgid "(No templates)"
+msgstr "沒有範本"
+
+#: html/Admin/Elements/EditWorkflows:31
+msgid "(No workflows)"
+msgstr "沒有�程"
+
+#: html/Ticket/Update.html:83 html/Work/Tickets/Update.html:52
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(�出本份更新的密件副本給�單上以逗號隔開的電�郵件��。這<b>�會</b>更改後續的收件者�單。)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(�出本份更新的密件副本給�單上以逗號隔開的電�郵件��。這<b>�會</b>更改後續的收件者�單。)"
+
+#: html/Ticket/Create.html:78
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(�出本份更新的副本給�單上以逗號隔開的管�員電�郵件��。這<b>將會</b>更改後續的收件者�單。)"
+
+#: html/Ticket/Update.html:79
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(�出本份更新的副本給�單上以逗號隔開的電�郵件��。這<b>�會</b>更改後續的收件者�單。)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(�出本份更新的副本給�單上以逗號隔開的電�郵件��。這<b>�會</b>更改後續的收件者�單。)"
+
+#: html/Ticket/Create.html:68
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(�出本份更新的副本給�單上以逗號隔開的電�郵件��。這<b>將會</b>更改後續的收件者�單。)"
+
+#: html/Ticket/Elements/EditCustomFieldEntries:35 html/Work/Tickets/Elements/EditCustomFieldEntries:48 html/Work/Tickets/Elements/ShowCustomFieldEntries:13
+msgid "(delete)"
+msgstr "(刪除)"
+
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
+msgid "(empty)"
+msgstr "(空白)"
+
+#: html/Edit/Global/CustomField/index.html:113 html/Edit/Global/Scrip/index.html:111 html/Edit/Global/Template/index.html:106
+msgid "(new)"
+msgstr "(新增)"
+
+#: html/Admin/Users/index.html:38
+msgid "(no name listed)"
+msgstr "(沒有列出姓�)"
+
+#: html/Elements/MyRequests:42 html/Elements/MyTickets:44 html/Work/Elements/MyApprovals:37 html/Work/Elements/MyRequests:42 html/Work/Elements/MyTickets:51
+msgid "(no subject)"
+msgstr "(沒有主題)"
+
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:60 html/Ticket/Elements/EditCustomFieldValues:52 html/Ticket/Elements/ShowCustomFields:35 html/Work/Elements/EditCustomFieldValues:50 html/Work/Elements/EditCustomFields:32 html/Work/Tickets/Elements/EditCustomFieldValues:33 lib/RT/Transaction_Overlay.pm:534
+msgid "(no value)"
+msgstr "(ç„¡)"
+
+#: html/Ticket/Elements/BulkLinks:27 html/Ticket/Elements/EditLinks:115 html/Work/Search/BulkLinks:3
+msgid "(only one ticket)"
+msgstr "(僅能指定一份申請單)"
+
+#: html/Elements/MyRequests:51 html/Elements/MyTickets:54 html/Work/Elements/List:17 html/Work/Elements/MyRequests:52 html/Work/Elements/MyTickets:66 html/Work/Tickets/Elements/ShowBasics:52
+msgid "(pending approval)"
+msgstr "(等待簽核)"
+
+#: html/Elements/MyRequests:53 html/Elements/MyTickets:56 html/Work/Elements/MyRequests:54 html/Work/Elements/MyTickets:68
+msgid "(pending other tickets)"
+msgstr "(等待其他申請單)"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:246
+msgid "(requestor's group)"
+msgstr "(申請人所屬)"
+
+#: html/Admin/Users/Modify.html:49
+msgid "(required)"
+msgstr "(å¿…å¡«)"
+
+#: html/Ticket/Elements/ShowTransaction:92 html/Work/Tickets/Elements/ShowTransaction:39
+msgid "(untitled)"
+msgstr "(未命�)"
+
+#: NOT FOUND IN SOURCE
+msgid ":"
+msgstr "："
+
+#: html/Ticket/Elements/ShowBasics:31
+msgid "<% $Ticket->Status%>"
+msgstr "<% $Ticket->Status%>"
+
+#: html/Elements/SelectTicketTypes:26
+msgid "<% $_ %>"
+msgstr "<% $_ %>"
+
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 html/Work/Elements/104Header:43
+#. ($m->scomp('/Elements/SelectNewTicketQueue'))
+msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
+msgstr "<input type=\"submit\" value=\"�出申請單\">&nbsp;%1"
+
+#: etc/initialdata.zh:221 etc/initialdata:203
+msgid "A blank template"
+msgstr "空白範本"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Deleted"
+msgstr "ACE 已刪除"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Loaded"
+msgstr "ACE 已載入"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be deleted"
+msgstr "無法刪除 ACE"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be found"
+msgstr "找�到 ACE"
+
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
+msgid "ACE not found"
+msgstr "找�到 ACE 設定"
+
+#: lib/RT/ACE_Overlay.pm:830
+msgid "ACEs can only be created and deleted."
+msgstr "祇能新增或刪除 ACE 設定。"
+
+#: NOT FOUND IN SOURCE
+msgid "ACLEquivalence"
+msgstr "ACLEquivalence"
+
+#: bin/rt-commit-handler:754
+msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgstr "離開以���心更改到申請單。\\n"
+
+#: html/User/Elements/Tabs:31
+msgid "About me"
+msgstr "個人資訊"
+
+#: html/Edit/Users/System:12
+msgid "Access Right"
+msgstr "系統使用登錄權�"
+
+#: html/Admin/Users/Modify.html:79
+msgid "Access control"
+msgstr "存�權�"
+
+#: html/Admin/Elements/EditScrip:56 html/Work/Tickets/Elements/ShowTransaction:18
+msgid "Action"
+msgstr "動作"
+
+#: lib/RT/Scrip_Overlay.pm:146
+#. ($args{'ScripAction'})
+msgid "Action %1 not found"
+msgstr "動作 %1 找�到"
+
+#: bin/rt-crontool:122
+msgid "Action committed."
+msgstr "動作執行完畢"
+
+#: bin/rt-crontool:118
+msgid "Action prepared..."
+msgstr "動作準備完畢..."
+
+#: html/Work/Elements/List:13 html/Work/Elements/SelectSearch:24 html/Work/Tickets/Create.html:28 html/Work/Tickets/Elements/ShowBasics:12
+msgid "Activated Date"
+msgstr "申請啟動時間"
+
+#: html/Edit/Elements/104Buttons:71 html/Edit/Elements/ListButtons:7
+msgid "Add"
+msgstr "新增"
+
+#: html/Search/Bulk.html:95 html/Work/Search/Bulk.html:74
+msgid "Add AdminCc"
+msgstr "新增管�員副本收件人"
+
+#: html/Search/Bulk.html:91 html/Work/Search/Bulk.html:68
+msgid "Add Cc"
+msgstr "新增副本收件人"
+
+#: html/Ticket/Elements/EditCustomFieldEntries:71 html/Work/Tickets/Elements/ShowCustomFieldEntries:49
+msgid "Add Entry"
+msgstr "新增列"
+
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:98 html/Work/Tickets/Elements/AddAttachments:18
+msgid "Add More Files"
+msgstr "新增更多附件"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:112 html/Admin/Elements/ModifyTemplateAsWorkflow:45
+msgid "Add Next State"
+msgstr "新增下一項關�"
+
+#: html/Search/Bulk.html:87 html/Work/Search/Bulk.html:62
+msgid "Add Requestor"
+msgstr "新增申請人"
+
+#: html/Admin/Elements/AddCustomFieldValue:24
+msgid "Add Value"
+msgstr "新增欄�值"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip to this queue"
+msgstr "新增此表單的手續"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip which will apply to all queues"
+msgstr "新增�用於所有表單的手續"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr "新增此表單的關�字"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a new a global scrip"
+msgstr "新增全域手續"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a scrip to this queue"
+msgstr "新增一�手續到此表單"
+
+#: html/Admin/Global/Scrip.html:54
+msgid "Add a scrip which will apply to all queues"
+msgstr "新增一�用於所有表單的手續"
+
+#: html/Search/Bulk.html:127 html/Work/Search/Bulk.html:80
+msgid "Add comments or replies to selected tickets"
+msgstr "新增評論或回覆到指定的申請單"
+
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
+msgid "Add members"
+msgstr "新增�員"
+
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
+msgid "Add new watchers"
+msgstr "新增視察員"
+
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
+msgstr "新增下一項關�"
+
+#: lib/RT/Queue_Overlay.pm:643
+#. ($args{'Type'})
+msgid "Added principal as a %1 for this queue"
+msgstr "單�已新增為此表單的 %1"
+
+#: lib/RT/Ticket_Overlay.pm:1453
+#. ($self->loc($args{'Type'}))
+msgid "Added principal as a %1 for this ticket"
+msgstr "單�已新增為此申請單的 %1"
+
+#: html/Admin/Elements/ModifyUser:75 html/Admin/Users/Modify.html:121 html/User/Prefs.html:87 html/Work/Preferences/Info:77
+msgid "Address1"
+msgstr "��"
+
+#: html/Admin/Elements/ModifyUser:77 html/Admin/Users/Modify.html:126 html/User/Prefs.html:89 html/Work/Preferences/Info:79
+msgid "Address2"
+msgstr "��(續)"
+
+#: NOT FOUND IN SOURCE
+msgid "Adjust Blinking Rate"
+msgstr "調整閃�速度快慢"
+
+#: html/Edit/Groups/Admin:9
+msgid "Admin"
+msgstr "管�員"
+
+#: html/Ticket/Create.html:73
+msgid "Admin Cc"
+msgstr "管�員副本"
+
+#: etc/initialdata.zh:303 etc/initialdata:280
+msgid "Admin Comment"
+msgstr "管�員評論"
+
+#: etc/initialdata.zh:261 etc/initialdata:259
+msgid "Admin Correspondence"
+msgstr "管�員回覆"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin Rights"
+msgstr "管�員權�"
+
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
+msgid "Admin queues"
+msgstr "表單管�"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin users"
+msgstr "使用者管�"
+
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
+msgid "Admin/Global configuration"
+msgstr "管�/全域設定"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Groups"
+msgstr "管�/群組"
+
+#: html/Admin/Queues/Modify.html:24 html/Admin/Queues/Modify.html:28
+msgid "Admin/Queue/Basics"
+msgstr "管�/表單/基本資訊"
+
+#: html/Edit/Global/Basic/Top:60
+msgid "AdminAddress"
+msgstr "管�員 Email"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr "管�所有代�人群組"
+
+#: etc/initialdata.zh:74 etc/initialdata:56 html/Admin/Elements/ModifyTemplateAsWorkflow:155 html/Ticket/Elements/ShowPeople:38 html/Ticket/Update.html:49 lib/RT/ACE_Overlay.pm:88
+msgid "AdminCc"
+msgstr "管�員副本"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr "管�員評論"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr "管�員回覆"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "AdminCustomFields"
+msgstr "管�自訂欄�"
+
+#: html/Edit/Groups/Admin:12 lib/RT/Group_Overlay.pm:145
+msgid "AdminGroup"
+msgstr "管�群組"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminGroupDescription"
+msgstr "管�群組�述"
+
+#: lib/RT/Group_Overlay.pm:147
+msgid "AdminGroupMembership"
+msgstr "管�群組�員"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminGroupName"
+msgstr "管�群組�稱"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminGroupPermission"
+msgstr "管�群組權�"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminGroupStatus"
+msgstr "管�群組狀態"
+
+#: lib/RT/System.pm:58
+msgid "AdminOwnPersonalGroups"
+msgstr "管�代�人群組"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "AdminQueue"
+msgstr "管�表單"
+
+#: lib/RT/System.pm:59
+msgid "AdminUsers"
+msgstr "管�使用者"
+
+#: NOT FOUND IN SOURCE
+msgid "Administrative"
+msgstr "行政類"
+
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
+msgid "Administrative Cc"
+msgstr "管�員副本"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:233
+msgid "Admins"
+msgstr "主管"
+
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search"
+msgstr "進階查詢"
+
+#: html/Elements/SelectDateRelation:35
+msgid "After"
+msgstr "晚於"
+
+#: NOT FOUND IN SOURCE
+msgid "Age"
+msgstr "經歷時間"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:172 html/Edit/Global/Workflow/Action:39
+msgid "Alias"
+msgstr "執行其他�程"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:175
+msgid "Alias for"
+msgstr "相當於"
+
+#: html/Edit/Queues/index.html:33 html/Work/Delegates/index.html:13 html/Work/Elements/SelectSearch:11 html/Work/Queues/Select.html:14 html/Work/Queues/index.html:13
+msgid "All"
+msgstr "全部"
+
+#: etc/initialdata.zh:372 etc/initialdata:348
+msgid "All Approvals Passed"
+msgstr "完�全部簽核"
+
+#: html/Edit/Global/Workflow/Condition:16
+msgid "All Condition"
+msgstr "所有�件"
+
+#: html/Admin/Elements/EditCustomFields:95
+msgid "All Custom Fields"
+msgstr "所有自訂欄�"
+
+#: html/Admin/Queues/index.html:52
+msgid "All Queues"
+msgstr "所有表單"
+
+#: NOT FOUND IN SOURCE
+msgid "All Users"
+msgstr "全體員工"
+
+#: NOT FOUND IN SOURCE
+msgid "Allowance Request"
+msgstr "�利補助申請"
+
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
+msgstr "無論寄件來�為何，一律寄信給申請人"
+
+#: NOT FOUND IN SOURCE
+msgid "Amount"
+msgstr "數�"
+
+#: html/Edit/Global/Workflow/Condition:13
+msgid "Any Condition"
+msgstr "任��件"
+
+#: html/Edit/Global/Scrip/List:10 html/Edit/Global/Scrip/Top:74
+msgid "Apply Template"
+msgstr "引用範本"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:138 html/Elements/Tabs:55 html/Work/Approvals/Elements/Approve:6
+msgid "Approval"
+msgstr "簽核"
+
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($ticket->id, $msg)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Approval #%1: %2"
+msgstr "簽核單 #%1：%2"
+
+#: html/Approvals/index.html:53
+#. ($ticket->Id)
+msgid "Approval #%1: Notes not recorded due to a system error"
+msgstr "簽核單 #%1：系統錯誤，記錄失敗"
+
+#: html/Approvals/index.html:51
+#. ($ticket->Id)
+msgid "Approval #%1: Notes recorded"
+msgstr "簽核單 #%1：記錄完畢"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:123
+msgid "Approval Details"
+msgstr "簽核細節"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Due"
+msgstr "簽核時�"
+
+#: html/Work/Approvals/Elements/Approve:37
+msgid "Approval Notes"
+msgstr "簽核�見"
+
+#: etc/initialdata.zh:357 etc/initialdata:336
+msgid "Approval Passed"
+msgstr "完��項簽核"
+
+#: etc/initialdata.zh:383 etc/initialdata:359
+msgid "Approval Rejected"
+msgstr "�回�項簽核"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Result"
+msgstr "簽核�果"
+
+#: html/Work/Approvals/Elements/Approve:25
+msgid "Approval Status"
+msgstr "核准�果"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Type"
+msgstr "簽核種類"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:25
+msgid "Approval diagram"
+msgstr "簽核�程"
+
+#: html/Approvals/Elements/Approve:43 html/Work/Approvals/Elements/Approve:29
+msgid "Approve"
+msgstr "核准"
+
+#: html/Work/Approvals/Elements/Approve:21 html/Work/Elements/List:9
+msgid "Approver"
+msgstr "簽核人"
+
+#: html/Edit/Global/Workflow/Action:29 html/Edit/Global/Workflow/Owner.html:10
+msgid "Approver Setting"
+msgstr "執行簽核人設定"
+
+#: etc/initialdata.zh:516 etc/initialdata:486 etc/upgrade/2.1.71:148 html/Edit/Elements/CreateApprovalsQueue:122
+msgid "Approver's notes: %1"
+msgstr "簽核備註：%1"
+
+#: NOT FOUND IN SOURCE
+msgid "Apr"
+msgstr "四月"
+
+#: lib/RT/Date.pm:414
+msgid "Apr."
+msgstr "04"
+
+#: NOT FOUND IN SOURCE
+msgid "April"
+msgstr "四月"
+
+#: html/Edit/Elements/104Buttons:24
+msgid "Are you sure to delete checked items?"
+msgstr "您確定�刪除？"
+
+#: html/Elements/SelectSortOrder:34
+msgid "Ascending"
+msgstr "�增"
+
+#: html/Search/Bulk.html:136 html/SelfService/Update.html:32 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:98 html/Work/Search/Bulk.html:88
+msgid "Attach"
+msgstr "附件"
+
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109 html/Work/Tickets/Elements/AddAttachments:15
+msgid "Attach file"
+msgstr "附加檔案"
+
+#: html/Ticket/Create.html:97 html/Ticket/Update.html:87 html/Work/Tickets/Elements/AddAttachments:6
+msgid "Attached file"
+msgstr "�有附件"
+
+#: NOT FOUND IN SOURCE
+msgid "Attachment '%1' could not be loaded"
+msgstr "無法載入附件 '%1'"
+
+#: lib/RT/Transaction_Overlay.pm:441
+msgid "Attachment created"
+msgstr "附件新增完畢"
+
+#: lib/RT/Tickets_Overlay.pm:1189
+msgid "Attachment filename"
+msgstr "附件檔�"
+
+#: html/Ticket/Elements/ShowAttachments:25 html/Work/Tickets/Elements/ShowTransaction:32
+msgid "Attachments"
+msgstr "附件"
+
+#: NOT FOUND IN SOURCE
+msgid "Aug"
+msgstr "八月"
+
+#: lib/RT/Date.pm:418
+msgid "Aug."
+msgstr "08"
+
+#: NOT FOUND IN SOURCE
+msgid "August"
+msgstr "八月"
+
+#: html/Admin/Elements/ModifyUser:65
+msgid "AuthSystem"
+msgstr "�證方�"
+
+#: NOT FOUND IN SOURCE
+msgid "AutoReject"
+msgstr "自動�回表單"
+
+#: NOT FOUND IN SOURCE
+msgid "AutoResolve"
+msgstr "自動完�表單處�"
+
+#: etc/initialdata.zh:224 etc/initialdata:206
+msgid "Autoreply"
+msgstr "自動回覆"
+
+#: etc/initialdata.zh:90 etc/initialdata:72
+msgid "Autoreply To Requestors"
+msgstr "自動�申請人回覆"
+
+#: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr "自動�申請人回覆"
+
+#: html/Edit/Rights/index.html:16
+msgid "Available Rights:"
+msgstr "權�項目列表："
+
+#: NOT FOUND IN SOURCE
+msgid "Back to Homepage"
+msgstr "回到首�"
+
+#: html/Work/Elements/BackButton:2 html/Work/Search/Bulk.html:101
+msgid "Back to Previous"
+msgstr "回上�"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad PGP Signature: %1\\n"
+msgstr "錯誤的 PGP 簽章：%1\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
+msgstr "錯誤的附件編號。無法找到附件 '%1'\\n"
+
+#: bin/rt-commit-handler:826
+#. ($val)
+msgid "Bad data in %1"
+msgstr "%1 的資料錯誤"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad transaction number for attachment. %1 should be %2\\n"
+msgstr "附件的處�號碼錯誤。%1 應為 %2\\n"
+
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Edit/Global/autohandler:6 html/Edit/Queues/autohandler:17 html/Edit/Users/index.html:121 html/Ticket/Elements/Tabs:89 html/User/Elements/GroupTabs:37
+msgid "Basics"
+msgstr "基本資訊"
+
+#: html/Ticket/Update.html:81 html/Work/Tickets/Update.html:49
+msgid "Bcc"
+msgstr "密件副本"
+
+#: html/Admin/Elements/EditScrip:87 html/Admin/Global/GroupRights.html:84 html/Admin/Global/Template.html:45 html/Admin/Global/UserRights.html:53 html/Admin/Global/Workflow.html:46 html/Admin/Groups/GroupRights.html:72 html/Admin/Groups/Members.html:80 html/Admin/Groups/Modify.html:55 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:44 html/Admin/Queues/UserRights.html:53 html/Admin/Queues/Workflow.html:44 html/User/Groups/Modify.html:55
+msgid "Be sure to save your changes"
+msgstr "請別忘了儲存修改。"
+
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:321
+msgid "Before"
+msgstr "æ—©æ–¼"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:44
+msgid "Begin Approval"
+msgstr "開始簽核"
+
+#: NOT FOUND IN SOURCE
+msgid "Begin From "
+msgstr "起始日"
+
+#: html/Edit/Users/Info:25
+msgid "Birthday"
+msgstr "生日"
+
+#: etc/initialdata.zh:220 etc/initialdata:202
+msgid "Blank"
+msgstr "空白範本"
+
+#: html/Search/Listing.html:78 html/Work/Search/index.html:53
+msgid "Bookmarkable URL for this search"
+msgstr "將查詢�果轉為�放入書籤的網�"
+
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
+msgid "Brief headers"
+msgstr "精簡標頭檔"
+
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
+msgid "Bulk ticket update"
+msgstr "更新整批申請單"
+
+#: NOT FOUND IN SOURCE
+msgid "Business Unit"
+msgstr "事業部"
+
+#: NOT FOUND IN SOURCE
+msgid "Business Unit:"
+msgstr "事業部："
+
+#: lib/RT/User_Overlay.pm:1524
+msgid "Can not modify system users"
+msgstr "無法更改系統使用者"
+
+#: lib/RT/Queue_Overlay.pm:66
+msgid "Can this principal see this queue"
+msgstr "該單�是�能查閱此表單"
+
+#: lib/RT/CustomField_Overlay.pm:205
+msgid "Can't add a custom field value without a name"
+msgstr "�能新增沒有�稱的自訂欄�值"
+
+#: lib/RT/Link_Overlay.pm:131
+msgid "Can't link a ticket to itself"
+msgstr "申請單�能��自己。"
+
+#: lib/RT/Ticket_Overlay.pm:2807
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr "�能整�進已整��的申請單。這個錯誤�該發生。"
+
+#: lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2694
+msgid "Can't specifiy both base and target"
+msgstr "�能�時指定起始申請單與目的申請單"
+
+#: html/Edit/Elements/PopFooter:8
+msgid "Cancel"
+msgstr "�消"
+
+#: html/autohandler:113
+#. ($msg)
+msgid "Cannot create user: %1"
+msgstr "無法新增使用者：%1"
+
+#: NOT FOUND IN SOURCE
+msgid "Card No."
+msgstr "�號"
+
+#: NOT FOUND IN SOURCE
+msgid "Categories"
+msgstr "分類管�"
+
+#: NOT FOUND IN SOURCE
+msgid "Category"
+msgstr "分類"
+
+#: etc/initialdata.zh:68 etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:44 html/Ticket/Update.html:76 html/Work/Tickets/Update.html:43 lib/RT/ACE_Overlay.pm:87
+msgid "Cc"
+msgstr "副本"
+
+#: NOT FOUND IN SOURCE
+msgid "Cc Type"
+msgstr "副本類別"
+
+#: NOT FOUND IN SOURCE
+msgid "Chairperson's Office"
+msgstr "董事長室"
+
+#: NOT FOUND IN SOURCE
+msgid "Change Ticket"
+msgstr "修改申請單"
+
+#: html/SelfService/Prefs.html:30
+msgid "Change password"
+msgstr "更改密碼"
+
+#: html/Edit/Global/Basic/Top:70
+msgid "ChangeOwnerUI"
+msgstr "���擇表單承辦人"
+
+#: html/Ticket/Create.html:100 html/Ticket/Elements/EditCustomFieldEntries:35 html/Ticket/Update.html:90 html/Work/Tickets/Elements/ShowCustomFieldEntries:13
+msgid "Check box to delete"
+msgstr "�擇欲刪除的項目"
+
+#: html/Admin/Elements/SelectRights:30
+msgid "Check box to revoke right"
+msgstr "�擇欲撤消的權利"
+
+#: html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:42 html/Ticket/Elements/EditLinks:130 html/Ticket/Elements/EditLinks:68 html/Ticket/Elements/ShowLinks:56 html/Work/Search/BulkLinks:18
+msgid "Children"
+msgstr "�申請單"
+
+#: html/Edit/Elements/PickUsers:21 html/Edit/Global/UserRight/List:8 html/Edit/Global/UserRight/Top:19 html/Edit/Users/List:6 html/Edit/Users/Top:18
+msgid "Chinese Name"
+msgstr "中文姓�"
+
+#: NOT FOUND IN SOURCE
+msgid "Chinese/English"
+msgstr "中英文"
+
+#: html/Admin/Elements/ModifyUser:79 html/Admin/Users/Modify.html:131 html/User/Prefs.html:91 html/Work/Preferences/Info:81
+msgid "City"
+msgstr "所在城市"
+
+#: html/Edit/Elements/104Top:30
+msgid "ClassicUI"
+msgstr "傳統介�"
+
+#: html/Ticket/Elements/ShowDates:46
+msgid "Closed"
+msgstr "已解決"
+
+#: html/SelfService/Closed.html:24
+msgid "Closed Tickets"
+msgstr "已解決的申請單"
+
+#: html/SelfService/Elements/Tabs:44
+msgid "Closed tickets"
+msgstr "已解決的申請單"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:181 html/Edit/Global/Workflow/Action:58 html/Edit/Global/Workflow/Condition:51
+msgid "Code"
+msgstr "執行程�碼"
+
+#: NOT FOUND IN SOURCE
+msgid "Command not understood!\\n"
+msgstr "指令無法辨識�\\n"
+
+#: html/Ticket/Elements/ShowTransaction:166 html/Ticket/Elements/Tabs:152 html/Work/Search/Bulk.html:89 html/Work/Tickets/Display.html:37 html/Work/Tickets/Elements/ShowTransaction:114 html/Work/Tickets/Elements/ShowTransaction:27
+msgid "Comment"
+msgstr "è©•è«–"
+
+#: html/Admin/Elements/ModifyQueue:44 html/Admin/Queues/Modify.html:57
+msgid "Comment Address"
+msgstr "評論電�郵件地�"
+
+#: NOT FOUND IN SOURCE
+msgid "Comment not recorded"
+msgstr "評論未被紀錄"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "Comment on tickets"
+msgstr "�申請單�出評論"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "CommentOnTicket"
+msgstr "評論申請單"
+
+#: html/Admin/Elements/ModifyUser:34 html/Work/Tickets/Update.html:59
+msgid "Comments"
+msgstr "è©•è«–"
+
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:68 html/Work/Tickets/Update.html:35
+msgid "Comments (Not sent to requestors)"
+msgstr "評論(��給申請人)"
+
+#: html/Search/Bulk.html:131 html/Work/Search/Bulk.html:83
+msgid "Comments (not sent to requestors)"
+msgstr "評論(��給申請人)"
+
+#: html/Elements/ViewUser:26
+#. ($name)
+msgid "Comments about %1"
+msgstr "å°� %1 çš„è©•è«–"
+
+#: html/Admin/Users/Modify.html:184 html/Ticket/Elements/ShowRequestor:43
+msgid "Comments about this user"
+msgstr "使用者�述"
+
+#: lib/RT/Transaction_Overlay.pm:543
+msgid "Comments added"
+msgstr "新增評論完畢"
+
+#: html/Edit/Elements/PopFooter:4 html/Edit/Elements/PopFooter:6
+msgid "Commit"
+msgstr "確�"
+
+#: lib/RT/Action/Generic.pm:139
+msgid "Commit Stubbed"
+msgstr "消除更動完畢"
+
+#: html/Edit/Users/Info:41
+msgid "Company Name"
+msgstr "公��稱"
+
+#: NOT FOUND IN SOURCE
+msgid "Compile Restrictions"
+msgstr "設定查詢�件"
+
+#: html/Admin/Elements/EditScrip:40 html/Admin/Elements/ModifyTemplateAsWorkflow:127
+msgid "Condition"
+msgstr "�件"
+
+#: bin/rt-crontool:108
+msgid "Condition matches..."
+msgstr "符��件..."
+
+#: lib/RT/Scrip_Overlay.pm:159
+msgid "Condition not found"
+msgstr "未找到符�的��"
+
+#: html/Edit/Global/GroupRight/Top:26 html/Edit/Global/UserRight/Top:45 html/Edit/Groups/Member:57 html/Elements/Tabs:49
+msgid "Configuration"
+msgstr "設定"
+
+#: html/SelfService/Prefs.html:32
+msgid "Confirm"
+msgstr "確�密碼"
+
+#: NOT FOUND IN SOURCE
+msgid "Confirm Password"
+msgstr "密碼確�"
+
+#: html/Work/Approvals/Display.html:25 html/Work/Tickets/Create.html:161 html/Work/Tickets/Create.html:174 html/Work/Tickets/Update.html:81
+msgid "Confirm Submit"
+msgstr "確定�出"
+
+#: NOT FOUND IN SOURCE
+msgid "Contact System Administrator"
+msgstr "連絡系統管�員"
+
+#: html/Admin/Elements/ModifyUser:59
+msgid "ContactInfoSystem"
+msgstr "連絡資訊系統"
+
+#: NOT FOUND IN SOURCE
+msgid "Contacted date '%1' could not be parsed"
+msgstr "無法解讀�絡日期 '%1'"
+
+#: html/Admin/Elements/ModifyTemplate:43 html/Admin/Elements/ModifyTemplateAsWorkflow:200 html/Ticket/ModifyAll.html:86
+msgid "Content"
+msgstr "內容"
+
+#: NOT FOUND IN SOURCE
+msgid "Coould not create group"
+msgstr "無法新增群組"
+
+#: html/Edit/Elements/104Buttons:74
+msgid "Copy"
+msgstr "複製"
+
+#: NOT FOUND IN SOURCE
+msgid "Copy Field From:"
+msgstr "欲複製欄�："
+
+#: etc/initialdata.zh:282 etc/initialdata:271
+msgid "Correspondence"
+msgstr "回覆"
+
+#: html/Admin/Elements/ModifyQueue:38 html/Admin/Queues/Modify.html:50
+msgid "Correspondence Address"
+msgstr "申請單回覆地�"
+
+#: lib/RT/Transaction_Overlay.pm:539
+msgid "Correspondence added"
+msgstr "新增申請單回覆"
+
+#: NOT FOUND IN SOURCE
+msgid "Correspondence not recorded"
+msgstr "未紀錄申請單回覆"
+
+#: lib/RT/Ticket_Overlay.pm:3552
+msgid "Could not add new custom field value for ticket. "
+msgstr "�能新增自訂欄�的值 "
+
+#: NOT FOUND IN SOURCE
+msgid "Could not add new custom field value for ticket. %1 "
+msgstr "�能新增自訂欄�的值。%1 "
+
+#: lib/RT/Ticket_Overlay.pm:3058 lib/RT/Ticket_Overlay.pm:3066 lib/RT/Ticket_Overlay.pm:3083
+msgid "Could not change owner. "
+msgstr "�能更改承辦人。 "
+
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:165 html/Edit/Global/CustomField/index.html:117
+#. ($msg)
+msgid "Could not create CustomField"
+msgstr "無法新增自訂欄�"
+
+#: html/Edit/Global/Workflow/index.html:126
+#. ($msg)
+msgid "Could not create Scrip"
+msgstr "無法建立訊�通知"
+
+#: html/Edit/Global/Template/index.html:110
+#. ($msg)
+msgid "Could not create Template"
+msgstr "無法建立通知範本"
+
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:473 lib/RT/Group_Overlay.pm:480
+msgid "Could not create group"
+msgstr "無法新增群組"
+
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
+#. ($msg)
+msgid "Could not create template: %1"
+msgstr "無法新增範本：%1"
+
+#: lib/RT/Ticket_Overlay.pm:1091 lib/RT/Ticket_Overlay.pm:334
+msgid "Could not create ticket. Queue not set"
+msgstr "無法新增申請單。尚未指定表單。"
+
+#: lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:483
+msgid "Could not create user"
+msgstr "無法新增使用者"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not create watcher for requestor"
+msgstr "無法為申請人新增視察員"
+
+#: html/Admin/Elements/ModifyWorkflow:219 html/Admin/Global/Workflow.html:75 html/Admin/Queues/Workflow.html:71
+#. ($msg)
+msgid "Could not create workflow: %1"
+msgstr "無法新增�程：%1"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find a ticket with id %1"
+msgstr "找�到編號 %1 的申請單"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find group %1."
+msgstr "找�到群組 %1。"
+
+#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1421
+msgid "Could not find or create that user"
+msgstr "找�到或無法新增該�使用者"
+
+#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1500
+msgid "Could not find that principal"
+msgstr "找�到該單�"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find user %1."
+msgstr "找�到使用者 %1。"
+
+#: html/Admin/Groups/Members.html:87 html/Edit/Users/index.html:83 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
+#. ( . $GroupId)
+msgid "Could not load group"
+msgstr "無法載入群組"
+
+#: lib/RT/Queue_Overlay.pm:641
+#. ($args{'Type'})
+msgid "Could not make that principal a %1 for this queue"
+msgstr "無法將該單�設為此表單的 %1。"
+
+#: lib/RT/Ticket_Overlay.pm:1442
+#. ($self->loc($args{'Type'}))
+msgid "Could not make that principal a %1 for this ticket"
+msgstr "無法將該單�設為此申請單的 %1。"
+
+#: lib/RT/Queue_Overlay.pm:740
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this queue"
+msgstr "無法將單� %1 從表單移除。"
+
+#: lib/RT/Ticket_Overlay.pm:1558
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this ticket"
+msgstr "無法將單� %1 從申請單移除。"
+
+#: lib/RT/Group_Overlay.pm:984
+msgid "Couldn't add member to group"
+msgstr "無法新增�員至群組"
+
+#: lib/RT/Ticket_Overlay.pm:3562 lib/RT/Ticket_Overlay.pm:3618
+#. ($Msg)
+msgid "Couldn't create a transaction: %1"
+msgstr "無法新增更動報告"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't figure out what to do from gpg's reply\\n"
+msgstr "無法從 gpg 回函辨識出該採�的行動\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find group\\n"
+msgstr "找�到群組\\n"
+
+#: lib/RT/Interface/Web.pm:902 x:905
+msgid "Couldn't find row"
+msgstr "找�到此列資料"
+
+#: lib/RT/Group_Overlay.pm:958
+msgid "Couldn't find that principal"
+msgstr "找�到該單�"
+
+#: lib/RT/CustomField_Overlay.pm:239
+msgid "Couldn't find that value"
+msgstr "找�到該值"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find that watcher"
+msgstr "找�到該視察員"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find user\\n"
+msgstr "找�到使用者\\n"
+
+#: lib/RT/CurrentUser.pm:111
+#. ($self->Id)
+msgid "Couldn't load %1 from the users database.\\n"
+msgstr "無法從使用者資料庫載入 %1。\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load KeywordSelects."
+msgstr "無法載入 KeywordSelects。"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load RT config file '%1' %2"
+msgstr "無法載入 RT 設定檔 '%1' %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load Scrips."
+msgstr "無法載入手續。"
+
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74 html/Edit/Global/GroupRight/Add.html:54 html/Edit/Global/UserRight/Add.html:23 html/Edit/Groups/Member:121 html/Edit/Groups/Members/Add.html:44 html/Edit/Rights/index.html:57
+#. ($Group)
+#. ($ObjectGroup)
+#. ($id)
+msgid "Couldn't load group %1"
+msgstr "無法載入手續 %1"
+
+#: lib/RT/Link_Overlay.pm:174 lib/RT/Link_Overlay.pm:183 lib/RT/Link_Overlay.pm:210
+msgid "Couldn't load link"
+msgstr "無法載入��。"
+
+#: html/Admin/Elements/EditCustomFields:146 html/Admin/Queues/People.html:120
+#. ($id)
+msgid "Couldn't load queue"
+msgstr "無法載入表單"
+
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71 html/Edit/Global/GroupRight/Add.html:50 html/Edit/Global/GroupRight/index.html:81 html/Edit/Global/UserRight/Add.html:19 html/Edit/Global/UserRight/index.html:83 html/Edit/Rights/index.html:53
+#. ($Queue)
+#. ($id)
+msgid "Couldn't load queue %1"
+msgstr "無法載入表單 %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load scrip"
+msgstr "無法載入手續"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load template"
+msgstr "無法載入範本"
+
+#: html/Admin/Users/Prefs.html:78
+#. ($id)
+msgid "Couldn't load that user (%1)"
+msgstr "無法載入該�使用者(%1)"
+
+#: html/SelfService/Display.html:108
+#. ($id)
+msgid "Couldn't load ticket '%1'"
+msgstr "無法載入申請單 '%1'"
+
+#: html/Admin/Elements/ModifyUser:85 html/Admin/Users/Modify.html:148 html/User/Prefs.html:97 html/Work/Preferences/Info:87
+msgid "Country"
+msgstr "國家"
+
+#: html/Admin/Elements/CreateUserCalled:25 html/Edit/Elements/PopHeader:29 html/Edit/Global/GroupRight/Add.html:18 html/Ticket/Create.html:134 html/Ticket/Create.html:194
+msgid "Create"
+msgstr "新增"
+
+#: html/Edit/Groups/MemberGroups/Add.html:17
+msgid "Create Subgroup:"
+msgstr "新增�群組："
+
+#: etc/initialdata.zh:145 etc/initialdata:127
+msgid "Create Tickets"
+msgstr "新增申請單"
+
+#: NOT FOUND IN SOURCE
+msgid "Create User:"
+msgstr "新增�員："
+
+#: html/Admin/Elements/EditCustomField:74
+msgid "Create a CustomField"
+msgstr "新增自訂欄�"
+
+#: html/Admin/Queues/CustomField.html:47
+#. ($QueueObj->Name())
+msgid "Create a CustomField for queue %1"
+msgstr "為 %1 表單新增自訂欄�"
+
+#: html/Admin/Global/CustomField.html:47
+msgid "Create a CustomField which applies to all queues"
+msgstr "為 %1 表單新增自訂欄�"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new Custom Field"
+msgstr "新增自訂欄�"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global Scrip"
+msgstr "新增全域手續"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global scrip"
+msgstr "新增全域手續"
+
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
+msgid "Create a new group"
+msgstr "新增群組"
+
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
+msgid "Create a new personal group"
+msgstr "新增代�人群組"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new queue"
+msgstr "新增表單"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new scrip"
+msgstr "新增手續"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new template"
+msgstr "新增範本"
+
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
+msgid "Create a new ticket"
+msgstr "新增申請單"
+
+#: html/Admin/Users/Modify.html:213 html/Admin/Users/Modify.html:240
+msgid "Create a new user"
+msgstr "新增使用者"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new workflow"
+msgstr "新增�程"
+
+#: html/Admin/Queues/Modify.html:103
+msgid "Create a queue"
+msgstr "新增表單"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a queue called"
+msgstr "新增表單�稱"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a request"
+msgstr "�出申請"
+
+#: html/Admin/Queues/Scrip.html:58
+#. ($QueueObj->Name)
+msgid "Create a scrip for queue %1"
+msgstr "為 %1 表單新增手續"
+
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
+msgid "Create a template"
+msgstr "新增範本"
+
+#: html/SelfService/Create.html:24
+msgid "Create a ticket"
+msgstr "�出申請單"
+
+#: html/Admin/Elements/ModifyWorkflow:206 html/Admin/Global/Workflow.html:69 html/Admin/Queues/Workflow.html:64
+msgid "Create a workflow"
+msgstr "新增�程"
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1 / %2 / %3 "
+msgstr "新增失敗：%1 / %2 / %3"
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1/%2/%3"
+msgstr "新增失敗：%1/%2/%3"
+
+#: NOT FOUND IN SOURCE
+msgid "Create new item"
+msgstr "建立新項目"
+
+#: etc/initialdata.zh:147 etc/initialdata:129
+msgid "Create new tickets based on this scrip's template"
+msgstr "�據此項手續內的模版，新增申請單"
+
+#: html/SelfService/Create.html:77
+msgid "Create ticket"
+msgstr "新增申請單"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "Create tickets in this queue"
+msgstr "在此表單中新增申請單"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "Create, delete and modify custom fields"
+msgstr "新增�刪除�更改自訂欄�"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "Create, delete and modify queues"
+msgstr "新增�刪除�更改表單"
+
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
+msgstr "新增�刪除�更改任何使用者的代�人群組"
+
+#: lib/RT/System.pm:58
+msgid "Create, delete and modify the members of personal groups"
+msgstr "新增�刪除�更改代�人群組"
+
+#: lib/RT/System.pm:59
+msgid "Create, delete and modify users"
+msgstr "新增�刪除�更改使用者"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "CreateTicket"
+msgstr "新增申請單"
+
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:26 lib/RT/Ticket_Overlay.pm:1185
+msgid "Created"
+msgstr "新增日"
+
+#: html/Admin/Elements/EditCustomField:87
+#. ($CustomFieldObj->Name())
+msgid "Created CustomField %1"
+msgstr "自訂欄� %1 新增�功"
+
+#: NOT FOUND IN SOURCE
+msgid "Created template %1"
+msgstr "範本 %1 新增�功"
+
+#: html/Admin/Elements/ModifyWorkflow:221
+#. (loc( $WorkflowObj->Name() ))
+msgid "Created workflow %1"
+msgstr "�程 %1 新增�功"
+
+#: NOT FOUND IN SOURCE
+msgid "Currency"
+msgstr "幣別"
+
+#: NOT FOUND IN SOURCE
+msgid "Current Approval Info"
+msgstr "截至目�簽核資訊"
+
+#: NOT FOUND IN SOURCE
+msgid "Current Custom Fields"
+msgstr "�有自訂欄�"
+
+#: html/Edit/Groups/MemberGroups/Add.html:14
+msgid "Current Groups:"
+msgstr "�有群組列表："
+
+#: html/Ticket/Elements/EditLinks:27
+msgid "Current Relationships"
+msgstr "�有關係"
+
+#: html/Edit/Rights/index.html:19
+msgid "Current Rights:"
+msgstr "�有權�："
+
+#: html/Admin/Elements/EditScrips:29
+msgid "Current Scrips"
+msgstr "�有手續"
+
+#: html/Work/Tickets/Create.html:50 html/Work/Tickets/Elements/ShowBasics:47
+msgid "Current Status"
+msgstr "目�狀態"
+
+#: NOT FOUND IN SOURCE
+msgid "Current Templates"
+msgstr "�有範本"
+
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
+msgid "Current members"
+msgstr "�有�員"
+
+#: html/Admin/Elements/SelectRights:28
+msgid "Current rights"
+msgstr "�有權�"
+
+#: html/Search/Listing.html:70 html/Work/Search/index.html:42
+msgid "Current search criteria"
+msgstr "�有查詢�件"
+
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
+msgid "Current watchers"
+msgstr "�有視察員"
+
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr "自訂欄� #%1"
+
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Edit/Global/autohandler:7 html/Edit/Queues/autohandler:18 html/Ticket/Elements/ShowSummary:35
+msgid "Custom Fields"
+msgstr "自訂欄�"
+
+#: NOT FOUND IN SOURCE
+msgid "Custom Fields which apply to all queues"
+msgstr "�用於所有表單的自訂欄�"
+
+#: html/Admin/Elements/EditScrip:72 html/Edit/Global/Scrip/Top:69
+msgid "Custom action cleanup code"
+msgstr "動作後執行程�"
+
+#: html/Admin/Elements/EditScrip:64 html/Edit/Global/Scrip/Top:62
+msgid "Custom action preparation code"
+msgstr "動作�執行程�"
+
+#: html/Admin/Elements/EditScrip:48 html/Edit/Global/Scrip/Top:35 html/Edit/Global/Scrip/Top:61
+msgid "Custom condition"
+msgstr "自訂�件"
+
+#: lib/RT/Tickets_Overlay.pm:1618
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
+msgid "Custom field %1 %2 %3"
+msgstr "自訂欄� %1 %2 %3"
+
+#: lib/RT/Tickets_Overlay.pm:1613
+#. ($CF->Name)
+msgid "Custom field %1 has a value."
+msgstr "自訂欄� %1 已有值"
+
+#: lib/RT/Tickets_Overlay.pm:1610
+#. ($CF->Name)
+msgid "Custom field %1 has no value."
+msgstr "自訂欄� %1 沒有值"
+
+#: lib/RT/Ticket_Overlay.pm:3454
+#. ($args{'Field'})
+msgid "Custom field %1 not found"
+msgstr "找�到自訂欄� %1"
+
+#: html/Admin/Elements/EditCustomFields:196
+msgid "Custom field deleted"
+msgstr "自訂欄�已刪除"
+
+#: lib/RT/Ticket_Overlay.pm:3604
+msgid "Custom field not found"
+msgstr "找�到自訂欄�"
+
+#: lib/RT/CustomField_Overlay.pm:349
+#. ($args{'Content'}, $self->Name)
+msgid "Custom field value %1 could not be found for custom field %2"
+msgstr "無法從自訂欄� %2 中找到 %1 這個欄�值"
+
+#: NOT FOUND IN SOURCE
+msgid "Custom field value changed from %1 to %2"
+msgstr "自訂欄�值從 %1 改為 %2"
+
+#: lib/RT/CustomField_Overlay.pm:249
+msgid "Custom field value could not be deleted"
+msgstr "無法刪除自訂欄�值"
+
+#: lib/RT/CustomField_Overlay.pm:355
+msgid "Custom field value could not be found"
+msgstr "找�到自訂欄�值"
+
+#: lib/RT/CustomField_Overlay.pm:247 lib/RT/CustomField_Overlay.pm:357
+msgid "Custom field value deleted"
+msgstr "自訂欄�值刪除�功"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:145 html/Edit/Global/Workflow/Owner.html:90 lib/RT/Transaction_Overlay.pm:548
+msgid "CustomField"
+msgstr "自訂欄�"
+
+#: NOT FOUND IN SOURCE
+msgid "Data error"
+msgstr "資料錯誤"
+
+#: NOT FOUND IN SOURCE
+msgid "Date of Departure"
+msgstr "出發日期"
+
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:92 html/Ticket/ModifyAll.html:43 html/Work/Tickets/Elements/ShowTransaction:14
+msgid "Dates"
+msgstr "日期"
+
+#: NOT FOUND IN SOURCE
+msgid "Dec"
+msgstr "�二月"
+
+#: lib/RT/Date.pm:422
+msgid "Dec."
+msgstr "12"
+
+#: NOT FOUND IN SOURCE
+msgid "December"
+msgstr "�二月"
+
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr "�設自動回應範本"
+
+#: etc/initialdata.zh:225 etc/initialdata:207
+msgid "Default Autoresponse template"
+msgstr "�設自動回應範本"
+
+#: etc/initialdata.zh:304 etc/initialdata:281
+msgid "Default admin comment template"
+msgstr "�設管�員評論範本"
+
+#: etc/initialdata.zh:262 etc/initialdata:260
+msgid "Default admin correspondence template"
+msgstr "�設管�員回覆範本"
+
+#: etc/initialdata.zh:283 etc/initialdata:272
+msgid "Default correspondence template"
+msgstr "�設回覆範本"
+
+#: etc/initialdata.zh:240 etc/initialdata:238
+msgid "Default transaction template"
+msgstr "�設更動範本"
+
+#: lib/RT/Transaction_Overlay.pm:643
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr "�設：%1/%2 已自 %3 改為 %4"
+
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
+msgid "Delegate rights"
+msgstr "代表團權�"
+
+#: lib/RT/System.pm:62
+msgid "Delegate specific rights which have been granted to you."
+msgstr "將�有的權�委託他人代�"
+
+#: lib/RT/System.pm:62
+msgid "DelegateRights"
+msgstr "設定代�人"
+
+#: NOT FOUND IN SOURCE
+msgid "Delegated Approval"
+msgstr "代�簽核"
+
+#: NOT FOUND IN SOURCE
+msgid "Delegated Queue"
+msgstr "代�表單�稱"
+
+#: NOT FOUND IN SOURCE
+msgid "Delegated Queue:"
+msgstr "代�表單："
+
+#: NOT FOUND IN SOURCE
+msgid "Delegated Type"
+msgstr "代�表單種類"
+
+#: html/Edit/Users/index.html:125 html/Work/Delegates/Info:31 html/Work/Delegates/List:8 html/Work/Elements/Tab:41 html/Work/Overview/Info:28
+msgid "Delegates"
+msgstr "代�人"
+
+#: NOT FOUND IN SOURCE
+msgid "Delegates Enabled Status"
+msgstr "代�啟動狀態"
+
+#: html/Work/Delegates/Info:18 html/Work/Overview/Info:18
+msgid "Delegates Info"
+msgstr "代�人資訊"
+
+#: NOT FOUND IN SOURCE
+msgid "Delegates Period"
+msgstr "代�期間"
+
+#: NOT FOUND IN SOURCE
+msgid "Delegates Permission Setting"
+msgstr "代�權�設定"
+
+#: NOT FOUND IN SOURCE
+msgid "Delegates Permission:"
+msgstr "代�權�："
+
+#: NOT FOUND IN SOURCE
+msgid "Delegates Setting"
+msgstr "代�人設定"
+
+#: html/Work/Delegates/Info:46 html/Work/Delegates/List:11 html/Work/Overview/Info:39
+msgid "Delegates Status"
+msgstr "代�狀態"
+
+#: html/User/Elements/Tabs:37
+msgid "Delegation"
+msgstr "代�人權�"
+
+#: NOT FOUND IN SOURCE
+msgid "Delegation Groups"
+msgstr "代�人群組"
+
+#: NOT FOUND IN SOURCE
+msgid "Delegation Rights"
+msgstr "代�人權�"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:113 html/Edit/Elements/104Buttons:73 html/Work/Search/index.html:48 html/Work/Search/index.html:48
+msgid "Delete"
+msgstr "刪除"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "Delete tickets"
+msgstr "刪除申請單"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "DeleteTicket"
+msgstr "刪除申請單"
+
+#: lib/RT/Transaction_Overlay.pm:187
+msgid "Deleting this object could break referential integrity"
+msgstr "刪除此物件�能破壞�考完整性"
+
+#: lib/RT/Queue_Overlay.pm:293
+msgid "Deleting this object would break referential integrity"
+msgstr "刪除此物件�能破壞�考完整性"
+
+#: lib/RT/User_Overlay.pm:499
+msgid "Deleting this object would violate referential integrity"
+msgstr "刪除此物件會���考完整性"
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity."
+msgstr "刪除此物件會���考完整性"
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity. That's bad."
+msgstr "刪除此物件會���考完整性"
+
+#: html/Approvals/Elements/Approve:44 html/Work/Approvals/Elements/Approve:32
+msgid "Deny"
+msgstr "�回"
+
+#: NOT FOUND IN SOURCE
+msgid "Department"
+msgstr "部門"
+
+#: html/Edit/Global/UserRight/List:12 html/Edit/Global/UserRight/Top:13 html/Edit/Users/List:10 html/Edit/Users/Top:12
+msgid "Department ID"
+msgstr "部門代碼"
+
+#: html/Edit/Global/UserRight/List:11 html/Edit/Global/UserRight/Top:49 html/Edit/Users/List:9 html/Edit/Users/Top:48 html/Work/Delegates/Info:78 html/Work/Overview/Info:60
+msgid "Department Name"
+msgstr "部門�稱"
+
+#: NOT FOUND IN SOURCE
+msgid "Department's"
+msgstr "部門之"
+
+#: NOT FOUND IN SOURCE
+msgid "Departure Details"
+msgstr "差旅明細"
+
+#: NOT FOUND IN SOURCE
+msgid "Departure From"
+msgstr "差旅起始日"
+
+#: NOT FOUND IN SOURCE
+msgid "Departure Request"
+msgstr "請�單"
+
+#: NOT FOUND IN SOURCE
+msgid "Departure Until"
+msgstr "差旅截止日"
+
+#: html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/EditLinks:122 html/Ticket/Elements/EditLinks:46 html/Ticket/Elements/ShowDependencies:31 html/Ticket/Elements/ShowLinks:36 html/Work/Search/BulkLinks:10
+msgid "Depended on by"
+msgstr "�接續處�的申請單"
+
+#: NOT FOUND IN SOURCE
+msgid "Dependencies: \\n"
+msgstr "附屬性：\\n"
+
+#: html/Elements/SelectLinkType:26 html/Ticket/Create.html:179 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/EditLinks:118 html/Ticket/Elements/EditLinks:35 html/Ticket/Elements/ShowDependencies:24 html/Ticket/Elements/ShowLinks:26 html/Work/Search/BulkLinks:6
+msgid "Depends on"
+msgstr "需先處�"
+
+#: NOT FOUND IN SOURCE
+msgid "DependsOn"
+msgstr "需先處�"
+
+#: html/Elements/SelectSortOrder:34
+msgid "Descending"
+msgstr "�減"
+
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
+msgid "Describe the issue below"
+msgstr "在以下欄��述主題"
+
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:33 html/Admin/Elements/ModifyQueue:35 html/Admin/Elements/ModifyTemplate:35 html/Admin/Elements/ModifyTemplateAsWorkflow:192 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Edit/Global/Workflow/Action:14 html/Elements/SelectGroups:26 html/User/Groups/Modify.html:48 html/Work/Preferences/Info:103
+msgid "Description"
+msgstr "�述"
+
+#: NOT FOUND IN SOURCE
+msgid "Description of Responsibility"
+msgstr "經辦業務說明"
+
+#: NOT FOUND IN SOURCE
+msgid "Description:"
+msgstr "�述："
+
+#: html/Work/Tickets/Create.html:117 html/Work/Tickets/Create.html:85 html/Work/Tickets/Elements/EditCustomFields:13 html/Work/Tickets/Elements/EditCustomFields:47 html/Work/Tickets/Elements/ShowCustomFields:15 html/Work/Tickets/Elements/ShowCustomFields:50
+msgid "Details"
+msgstr "細節"
+
+#: NOT FOUND IN SOURCE
+msgid "Direct"
+msgstr "直接"
+
+#: html/Edit/Users/Info:31
+msgid "Disability"
+msgstr "殘障身分"
+
+#: html/Edit/Users/Info:29
+msgid "Disability Type"
+msgstr "殘障類別"
+
+#: html/Edit/Global/GroupRight/List:9 html/Edit/Global/GroupRight/Top:16 html/Edit/Groups/List:11 html/Edit/Groups/Top:19 html/Edit/Queues/Basic/Top:70 html/Edit/Queues/List:13 html/Work/Delegates/Info:48 html/Work/Delegates/Info:53 html/Work/Delegates/List:12 html/Work/Overview/Info:42
+msgid "Disabled"
+msgstr "�用"
+
+#: html/Ticket/Elements/Tabs:84
+msgid "Display"
+msgstr "顯示內容"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "Display Access Control List"
+msgstr "顯示權�控制清單"
+
+#: lib/RT/Queue_Overlay.pm:74
+msgid "Display Scrip templates for this queue"
+msgstr "顯示此表單的範本"
+
+#: lib/RT/Queue_Overlay.pm:77
+msgid "Display Scrips for this queue"
+msgstr "顯示此表單的手續"
+
+#: html/Ticket/Elements/ShowHistory:34
+msgid "Display mode"
+msgstr "顯示模�"
+
+#: NOT FOUND IN SOURCE
+msgid "Display ticket #%1"
+msgstr "顯示第%1號申請單"
+
+#: lib/RT/System.pm:53
+msgid "Do anything and everything"
+msgstr "�許一切�作"
+
+#: html/Elements/Refresh:29
+msgid "Don't refresh this page."
+msgstr "�更新此��。"
+
+#: html/Search/Elements/PickRestriction:113 html/Work/Search/PickRestriction:95
+msgid "Don't show search results"
+msgstr "�顯示查詢�果"
+
+#: html/Edit/Elements/Page:19 html/Edit/Elements/Page:21
+msgid "Down"
+msgstr "下一�"
+
+#: html/Ticket/Elements/ShowTransaction:92
+msgid "Download"
+msgstr "下載"
+
+#: NOT FOUND IN SOURCE
+msgid "Dr."
+msgstr "�士"
+
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:42 lib/RT/Ticket_Overlay.pm:1189
+msgid "Due"
+msgstr "到期日"
+
+#: NOT FOUND IN SOURCE
+msgid "Due Date"
+msgstr "截止日"
+
+#: NOT FOUND IN SOURCE
+msgid "Due date '%1' could not be parsed"
+msgstr "無法解讀日期 '%1'"
+
+#: bin/rt-commit-handler:753
+#. ($1, $msg)
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
+msgstr "無法載入申請單 '%1'：%2.\\n"
+
+#: html/Work/Tickets/Update.html:46
+msgid "Edit"
+msgstr "編輯"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:132
+msgid "Edit Conditions"
+msgstr "編輯�置�件"
+
+#: html/Admin/Queues/CustomFields.html:44
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr "編輯 %1 的自訂欄�"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit Custom Fields for queue %1"
+msgstr "編輯表單 %1 的自訂欄�"
+
+#: html/Search/Bulk.html:143 html/Ticket/ModifyLinks.html:35 html/Work/Search/Bulk.html:93
+msgid "Edit Relationships"
+msgstr "編輯申請單關係"
+
+#: html/Edit/Groups/MemberGroups/Add.html:3 html/Edit/Groups/MemberGroups/index.html:22
+msgid "Edit Subgroups"
+msgstr "新增/維護�群組"
+
+#: html/Admin/Queues/Templates.html:41
+#. ($QueueObj->Name)
+msgid "Edit Templates for queue %1"
+msgstr "編輯表單 %1 的範本"
+
+#: html/Admin/Queues/Workflows.html:42
+#. ($QueueObj->Name)
+msgid "Edit Workflows for queue %1"
+msgstr "編輯表單 %1 的�程"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit keywords"
+msgstr "編輯關�字"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr "編輯手續"
+
+#: html/Admin/Global/index.html:45
+msgid "Edit system templates"
+msgstr "編輯全域範本"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit system workflows"
+msgstr "編輯全域�程"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit templates for %1"
+msgstr "編輯 %1 的範本"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit workflows for %1"
+msgstr "編輯 %1 的�程"
+
+#: html/Admin/Elements/ModifyQueue:24 html/Admin/Queues/Modify.html:118
+#. ($QueueObj->Name)
+#. ($QueueObj->Id)
+msgid "Editing Configuration for queue %1"
+msgstr "編輯表單 %1 的設定"
+
+#: html/Admin/Elements/ModifyUser:24
+#. ($UserObj->Name)
+msgid "Editing Configuration for user %1"
+msgstr "編輯使用者 %1 的設定"
+
+#: html/Admin/Elements/EditCustomField:90
+#. ($CustomFieldObj->Name())
+msgid "Editing CustomField %1"
+msgstr "編輯自訂欄� %1"
+
+#: html/Admin/Groups/Members.html:31
+#. ($Group->Name)
+msgid "Editing membership for group %1"
+msgstr "編輯群組 %1 的�員資訊"
+
+#: html/User/Groups/Members.html:128
+#. ($Group->Name)
+msgid "Editing membership for personal group %1"
+msgstr "編輯代�人群組 %1 的�員資訊"
+
+#: NOT FOUND IN SOURCE
+msgid "Editing template %1"
+msgstr "編輯範本 %1"
+
+#: html/Admin/Elements/ModifyWorkflow:238
+#. (loc( $WorkflowObj->Name() ))
+msgid "Editing workflow %1"
+msgstr "編輯�程 %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Education"
+msgstr "最高學歷"
+
+#: NOT FOUND IN SOURCE
+msgid "EffectiveId"
+msgstr "有效編號"
+
+#: lib/RT/Ticket_Overlay.pm:2635 lib/RT/Ticket_Overlay.pm:2703
+msgid "Either base or target must be specified"
+msgstr "需�指定起始申請單或目的申請單"
+
+#: html/Admin/Users/Modify.html:52 html/Admin/Users/Prefs.html:45 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:41 html/Work/Delegates/Info:96 html/Work/Overview/Info:78 html/Work/Preferences/Info:16
+msgid "Email"
+msgstr "電�郵件信箱"
+
+#: lib/RT/User_Overlay.pm:247
+msgid "Email address in use"
+msgstr "此電�郵件信箱已被使用"
+
+#: html/Admin/Elements/ModifyUser:41
+msgid "EmailAddress"
+msgstr "電�郵件信箱��"
+
+#: html/Admin/Elements/ModifyUser:53
+msgid "EmailEncoding"
+msgstr "電�郵件文字編碼方�"
+
+#: NOT FOUND IN SOURCE
+msgid "Embark Date"
+msgstr "外�員工入境日"
+
+#: NOT FOUND IN SOURCE
+msgid "Embarked Date"
+msgstr "抵�日期"
+
+#: NOT FOUND IN SOURCE
+msgid "Embarked Location"
+msgstr "抵�地點"
+
+#: NOT FOUND IN SOURCE
+msgid "Enable Delegates"
+msgstr "代�啟動"
+
+#: html/Admin/Elements/EditCustomField:50
+msgid "Enabled (Unchecking this box disables this custom field)"
+msgstr "啟用(�消勾�將�用此自訂欄�)"
+
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
+msgid "Enabled (Unchecking this box disables this group)"
+msgstr "啟用(�消勾�將�用此群組)"
+
+#: html/Admin/Queues/Modify.html:83
+msgid "Enabled (Unchecking this box disables this queue)"
+msgstr "啟用(�消勾�將�用此表單)"
+
+#: html/Admin/Elements/EditCustomFields:98
+msgid "Enabled Custom Fields"
+msgstr "已啟用的自訂欄�"
+
+#: html/Edit/Queues/Basic/Top:75 html/Edit/Queues/List:15
+msgid "Enabled Date"
+msgstr "啟用日期"
+
+#: NOT FOUND IN SOURCE
+msgid "Enabled Date:"
+msgstr "啟動日期："
+
+#: html/Admin/Queues/index.html:55
+msgid "Enabled Queues"
+msgstr "已啟用的表單"
+
+#: html/Edit/Queues/Basic/Top:66 html/Edit/Queues/List:11
+msgid "Enabled Status"
+msgstr "啟用狀態"
+
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:282 html/User/Groups/Modify.html:116
+#. (loc_fuzzy($msg))
+msgid "Enabled status %1"
+msgstr "啟用狀態 %1"
+
+#: html/Edit/Users/Info:34
+msgid "End of Trial"
+msgstr "試用期滿日"
+
+#: NOT FOUND IN SOURCE
+msgid "English Name"
+msgstr "英文姓�"
+
+#: lib/RT/CustomField_Overlay.pm:427
+msgid "Enter multiple values"
+msgstr "�入多�項目"
+
+#: html/Edit/Users/Search.html:15
+msgid "Enter one or more conditions below to search for users"
+msgstr "輸入下列單一或複��件，查詢用戶資料"
+
+#: lib/RT/CustomField_Overlay.pm:424
+msgid "Enter one value"
+msgstr "�入單一項目"
+
+#: html/Search/Bulk.html:144 html/Ticket/Elements/EditLinks:111 html/Work/Search/Bulk.html:95
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "輸入申請單���到的申請單編號或網�。以空白隔開。"
+
+#: lib/RT/CustomField_Vendor.pm:20
+msgid "EntryBoolean"
+msgstr "是�填表"
+
+#: lib/RT/CustomField_Vendor.pm:17
+msgid "EntryDate"
+msgstr "日期填表"
+
+#: NOT FOUND IN SOURCE
+msgid "EntryExternal"
+msgstr "系統填表"
+
+#: lib/RT/CustomField_Vendor.pm:16
+msgid "EntryFreeform"
+msgstr "輸入填表"
+
+#: NOT FOUND IN SOURCE
+msgid "EntryMultiple"
+msgstr "多�填表"
+
+#: lib/RT/CustomField_Vendor.pm:19
+msgid "EntryNumber"
+msgstr "數值填表"
+
+#: lib/RT/CustomField_Vendor.pm:15
+msgid "EntrySelect"
+msgstr "單�填表"
+
+#: lib/RT/CustomField_Vendor.pm:18
+msgid "EntryTime"
+msgstr "時間填表"
+
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
+msgid "Error"
+msgstr "錯誤"
+
+#: NOT FOUND IN SOURCE
+msgid "Error adding watcher"
+msgstr "新增視察員失敗"
+
+#: lib/RT/Queue_Overlay.pm:555
+msgid "Error in parameters to Queue->AddWatcher"
+msgstr "表單->新增視察員的�數有誤"
+
+#: lib/RT/Queue_Overlay.pm:713
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr "表單->刪除視察員的�數有誤"
+
+#: lib/RT/Ticket_Overlay.pm:1374
+msgid "Error in parameters to Ticket->AddWatcher"
+msgstr "申請單->新增視察員的�數有誤"
+
+#: lib/RT/Ticket_Overlay.pm:1531
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr "申請單->刪除視察員的�數有誤"
+
+#: etc/initialdata.zh:38 etc/initialdata:20
+msgid "Everyone"
+msgstr "所有人"
+
+#: bin/rt-crontool:193
+msgid "Example:"
+msgstr "範例："
+
+#: html/Edit/Elements/104Buttons:77
+msgid "Export"
+msgstr "匯出"
+
+#: html/Admin/Elements/ModifyUser:63
+msgid "ExternalAuthId"
+msgstr "外部�證帳號"
+
+#: html/Admin/Elements/ModifyUser:57
+msgid "ExternalContactInfoId"
+msgstr "外部�絡方�帳號"
+
+#: html/Edit/Global/Basic/Top:64
+msgid "ExternalDatabaseDSN"
+msgstr "外部資料庫連�字串"
+
+#: html/Edit/Global/Basic/Top:68
+msgid "ExternalDatabasePass"
+msgstr "外部資料庫密碼"
+
+#: html/Edit/Global/Basic/Top:66
+msgid "ExternalDatabaseUser"
+msgstr "外部資料庫用戶"
+
+#: html/Edit/Global/Basic/Top:62
+msgid "ExternalURL"
+msgstr "外部介�網�"
+
+#: html/Admin/Users/Modify.html:72
+msgid "Extra info"
+msgstr "備註"
+
+#: lib/RT/User_Overlay.pm:363
+msgid "Failed to find 'Privileged' users pseudogroup."
+msgstr "找�到「內部�員�虛擬群組的使用者。"
+
+#: lib/RT/User_Overlay.pm:370
+msgid "Failed to find 'Unprivileged' users pseudogroup"
+msgstr "找�到「�內部�員�虛擬群組的使用者。"
+
+#: bin/rt-crontool:137
+#. ($modname, $@)
+msgid "Failed to load module %1. (%2)"
+msgstr "無法載入模組 %1. (%2)"
+
+#: NOT FOUND IN SOURCE
+msgid "Feb"
+msgstr "二月"
+
+#: lib/RT/Date.pm:412
+msgid "Feb."
+msgstr "02"
+
+#: NOT FOUND IN SOURCE
+msgid "February"
+msgstr "二月"
+
+#: NOT FOUND IN SOURCE
+msgid "Female"
+msgstr "女"
+
+#: html/Edit/Global/CustomField/List:5 html/Edit/Global/CustomField/Top:9
+msgid "Field Attribute"
+msgstr "欄�屬性"
+
+#: html/Edit/Global/CustomField/Info:14
+msgid "Field Content:"
+msgstr "欄�內容："
+
+#: html/Edit/Global/CustomField/List:7 html/Edit/Global/CustomField/Top:21
+msgid "Field Description"
+msgstr "欄��述"
+
+#: html/Edit/Global/CustomField/List:6 html/Edit/Global/CustomField/Top:15
+msgid "Field Name"
+msgstr "欄��稱"
+
+#: html/Edit/Elements/PickUsers:52 html/Edit/Users/Add.html:47
+msgid "Filter"
+msgstr "篩�"
+
+#: html/Edit/Elements/PickUsers:6 html/Edit/Users/Add.html:7 html/Work/Tickets/Cc:4
+msgid "Filter people"
+msgstr "�象篩�"
+
+#: html/Edit/Elements/PickUsers:68 html/Edit/Users/Add.html:63 html/Work/Tickets/Cc:42
+msgid "Filtered list:"
+msgstr "篩�列表："
+
+#: NOT FOUND IN SOURCE
+msgid "Fin"
+msgstr "最終"
+
+#: html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:58 lib/RT/Tickets_Overlay.pm:1091
+msgid "Final Priority"
+msgstr "最低順�"
+
+#: lib/RT/Ticket_Overlay.pm:1180
+msgid "FinalPriority"
+msgstr "最低順�"
+
+#: NOT FOUND IN SOURCE
+msgid "Financial Department:"
+msgstr "財務部："
+
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
+msgid "Find group whose"
+msgstr "尋找群組的"
+
+#: NOT FOUND IN SOURCE
+msgid "Find new/open tickets"
+msgstr "尋找/開啟申請單"
+
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
+msgid "Find people whose"
+msgstr "尋找人員的"
+
+#: html/Search/Listing.html:107 html/Work/Search/index.html:88
+msgid "Find tickets"
+msgstr "尋找申請單"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:118
+msgid "Finish Approval"
+msgstr "簽核完畢"
+
+#: html/Ticket/Elements/Tabs:57
+msgid "First"
+msgstr "第一項"
+
+#: html/Search/Listing.html:40 html/Work/Search/index.html:17
+msgid "First page"
+msgstr "第一�"
+
+#: html/Edit/Global/Workflow/Owner.html:30
+msgid "First-"
+msgstr "一"
+
+#: NOT FOUND IN SOURCE
+msgid "First-level Admins"
+msgstr "一階主管"
+
+#: html/Edit/Users/Info:39
+msgid "First-level Users"
+msgstr "一階主管員工"
+
+#: NOT FOUND IN SOURCE
+msgid "Fixed shift"
+msgstr "固定�"
+
+#: docs/design_docs/string-extraction-guide.txt:33
+msgid "Foo Bar Baz"
+msgstr "甲 乙 丙"
+
+#: docs/design_docs/string-extraction-guide.txt:24
+msgid "Foo!"
+msgstr "甲�"
+
+#: html/Search/Bulk.html:86 html/Work/Search/Bulk.html:55
+msgid "Force change"
+msgstr "強制更新"
+
+#: html/Work/Elements/104Header:89
+msgid "Form Processing"
+msgstr "電�表單作業�"
+
+#: html/Search/Listing.html:105 html/Work/Search/index.html:86
+#. ($ticketcount)
+msgid "Found %quant(%1,ticket)"
+msgstr "找到 %1 張申請單"
+
+#: lib/RT/Interface/Web.pm:904 x:907
+msgid "Found Object"
+msgstr "已找到物件"
+
+#: html/Edit/Global/Workflow/Owner.html:33
+msgid "Fourth-"
+msgstr "å››"
+
+#: html/Admin/Elements/ModifyUser:43
+msgid "FreeformContactInfo"
+msgstr "�絡方�"
+
+#: lib/RT/CustomField_Vendor.pm:11
+msgid "FreeformDate"
+msgstr "日期輸入"
+
+#: NOT FOUND IN SOURCE
+msgid "FreeformExternal"
+msgstr "系統欄�"
+
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformMultiple"
+msgstr "多�輸入"
+
+#: lib/RT/CustomField_Vendor.pm:13
+msgid "FreeformNumber"
+msgstr "數值輸入"
+
+#: lib/RT/CustomField_Vendor.pm:14
+msgid "FreeformPassword"
+msgstr "密碼輸入"
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "FreeformSingle"
+msgstr "單一輸入"
+
+#: lib/RT/CustomField_Vendor.pm:12
+msgid "FreeformTime"
+msgstr "時間輸入"
+
+#: NOT FOUND IN SOURCE
+msgid "Fri"
+msgstr "星期五"
+
+#: lib/RT/Date.pm:392
+msgid "Fri."
+msgstr "星期五"
+
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
+msgid "Full headers"
+msgstr "完整標頭檔"
+
+#: NOT FOUND IN SOURCE
+msgid "Gecos"
+msgstr "登入帳號"
+
+#: html/Edit/Users/Info:26
+msgid "Gender"
+msgstr "性別"
+
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr "�得目�使用者的 pgp 簽章\\n"
+
+#: lib/RT/Transaction_Overlay.pm:593
+#. ($New->Name)
+msgid "Given to %1"
+msgstr "交予 %1"
+
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
+msgid "Global"
+msgstr "全域設定"
+
+#: NOT FOUND IN SOURCE
+msgid "Global Keyword Selections"
+msgstr "全域關�字��"
+
+#: html/Edit/Users/System:24
+msgid "Global Rights:"
+msgstr "�有全域權�列表："
+
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
+msgstr "全域手續"
+
+#: html/Edit/Elements/Tab:40
+msgid "Global Setup"
+msgstr "全域設定"
+
+#: html/Admin/Elements/SelectTemplate:37 html/Edit/Elements/SelectTemplate:11
+#. (loc($Template->Name))
+msgid "Global template: %1"
+msgstr "全域範本：%1"
+
+#: html/Admin/Elements/EditCustomFields:74 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:40
+msgid "Go!"
+msgstr "執行"
+
+#: NOT FOUND IN SOURCE
+msgid "Good pgp sig from %1\\n"
+msgstr "%1 的 pgp 簽章是正確的\\n"
+
+#: html/Search/Listing.html:49
+msgid "Goto page"
+msgstr "到��"
+
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24 html/Work/Elements/104Header:49
+msgid "Goto ticket"
+msgstr "跳到申請單"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:224
+msgid "Grand"
+msgstr "上"
+
+#: html/Ticket/Elements/AddWatchers:45 html/User/Elements/DelegateRights:77
+msgid "Group"
+msgstr "群組"
+
+#: NOT FOUND IN SOURCE
+msgid "Group %1 %2: %3"
+msgstr "群組 %1 %2：%3"
+
+#: html/Edit/Global/GroupRight/List:5 html/Edit/Global/GroupRight/Top:20 html/Edit/Groups/List:7
+msgid "Group Description"
+msgstr "群組�述"
+
+#: NOT FOUND IN SOURCE
+msgid "Group Management"
+msgstr "群組管�"
+
+#: NOT FOUND IN SOURCE
+msgid "Group Members"
+msgstr "群組�員"
+
+#: html/Edit/Elements/PickUsers:28 html/Edit/Global/GroupRight/List:4 html/Edit/Global/GroupRight/Top:10 html/Edit/Groups/List:6 html/Edit/Groups/Top:7 html/Edit/Users/Add.html:29 html/Edit/Users/Group:10 html/Edit/Users/Search.html:43 html/Work/Delegates/Add.html:15 html/Work/Tickets/Cc:24
+msgid "Group Name"
+msgstr "群組�稱"
+
+#: NOT FOUND IN SOURCE
+msgid "Group Name:"
+msgstr "群組�稱："
+
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54 html/Edit/Global/autohandler:12 html/Edit/Queues/autohandler:23 html/Edit/Users/Group:11 html/Edit/Users/index.html:123
+msgid "Group Rights"
+msgstr "群組權�"
+
+#: NOT FOUND IN SOURCE
+msgid "Group Rights:"
+msgstr "�有群組權�列表："
+
+#: html/Edit/Elements/Tab:36
+msgid "Group Setup"
+msgstr "群組設定"
+
+#: html/Edit/Global/GroupRight/List:8 html/Edit/Global/GroupRight/Top:14 html/Edit/Groups/List:10 html/Edit/Groups/Top:15
+msgid "Group Status"
+msgstr "群組狀態"
+
+#: lib/RT/Group_Overlay.pm:964
+msgid "Group already has member"
+msgstr "群組內已有此�員"
+
+#: NOT FOUND IN SOURCE
+msgid "Group could not be created."
+msgstr "無法新增群組"
+
+#: html/Admin/Groups/Modify.html:76
+#. ($create_msg)
+msgid "Group could not be created: %1"
+msgstr "無法新增群組：%1"
+
+#: lib/RT/Group_Overlay.pm:496
+msgid "Group created"
+msgstr "群組新增完畢"
+
+#: lib/RT/Group_Overlay.pm:1132
+msgid "Group has no such member"
+msgstr "群組沒有這個�員"
+
+#: lib/RT/Group_Overlay.pm:944 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1428 lib/RT/Ticket_Overlay.pm:1506
+msgid "Group not found"
+msgstr "找�到群組"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not found.\\n"
+msgstr "找�到群組。\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not specified.\\n"
+msgstr "未指定群組。\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Group with Queue Rights"
+msgstr "�有表單權�群組"
+
+#: html/Edit/Global/Workflow/Owner.html:70
+msgid "Group's"
+msgstr "群組之"
+
+#: NOT FOUND IN SOURCE
+msgid "Group:"
+msgstr "群組："
+
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/Edit/Global/GroupRight/Add.html:15 html/User/Groups/Members.html:66
+msgid "Groups"
+msgstr "群組"
+
+#: lib/RT/Group_Overlay.pm:970
+msgid "Groups can't be members of their members"
+msgstr "�能將群組設為群組內�員"
+
+#: NOT FOUND IN SOURCE
+msgid "Groups with Global Rights"
+msgstr "�有全域權�群組"
+
+#: html/Edit/Global/GroupRight/List:6 html/Edit/Global/GroupRight/Top:22 html/Edit/Groups/List:8
+msgid "HRMSDefined"
+msgstr "組織架構"
+
+#: NOT FOUND IN SOURCE
+msgid "Health Insurance"
+msgstr "��補助身份"
+
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
+msgid "Hello!"
+msgstr "嗨�"
+
+#: docs/design_docs/string-extraction-guide.txt:40
+#. ($name)
+msgid "Hello, %1"
+msgstr "嗨，%1"
+
+#: html/Edit/Elements/104Top:28
+msgid "Help"
+msgstr "輔助說明"
+
+#: NOT FOUND IN SOURCE
+msgid "Help Desks"
+msgstr "�項業務窗�"
+
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:87 html/Work/Tickets/Elements/ShowHistory:8
+msgid "History"
+msgstr "紀錄"
+
+#: html/Admin/Elements/ModifyUser:67
+msgid "HomePhone"
+msgstr "�處電話"
+
+#: html/Edit/Elements/104Top:15 html/Edit/Elements/104Top:24 html/Edit/Elements/EDOMHeader:9 html/Elements/Tabs:43
+msgid "Homepage"
+msgstr "主�"
+
+#: NOT FOUND IN SOURCE
+msgid "Hotel Expense"
+msgstr "�宿費"
+
+#: lib/RT/Base.pm:73
+#. (6)
+msgid "I have %quant(%1,concrete mixer)."
+msgstr "我有 %quant(%1,份固體攪拌器)。"
+
+#: NOT FOUND IN SOURCE
+msgid "ID Number"
+msgstr "身分證號"
+
+#: NOT FOUND IN SOURCE
+msgid "ID Type"
+msgstr "身分類別"
+
+#: html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1018
+msgid "Id"
+msgstr "編號"
+
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38 html/Work/Preferences/Info:14
+msgid "Identity"
+msgstr "身份"
+
+#: etc/initialdata.zh:439 etc/initialdata:411 etc/upgrade/2.1.71:86 html/Edit/Elements/CreateApprovalsQueue:58
+msgid "If an approval is rejected, reject the original and delete pending approvals"
+msgstr "若簽核單�到�回，則連帶�回原申請單，並刪除其他相關的待簽核事項"
+
+#: bin/rt-crontool:189
+msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
+msgstr "如果此工具程�為 setgid，惡�的本地端用戶�能由此�得 RT 的管�員權�。"
+
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
+msgid "If you've updated anything above, be sure to"
+msgstr "若您已更新以上資料，請記得按一下"
+
+#: lib/RT/Interface/Web.pm:896 x:899
+msgid "Illegal value for %1"
+msgstr "%1 的值錯誤"
+
+#: lib/RT/Interface/Web.pm:899 x:902
+msgid "Immutable field"
+msgstr "此欄�值��更動"
+
+#: html/Edit/Elements/104Buttons:76 html/Edit/Global/Workflow/Import.html:2
+msgid "Import"
+msgstr "匯入"
+
+#: html/Admin/Elements/EditCustomFields:73
+msgid "Include disabled custom fields in listing."
+msgstr "列出�用的自訂欄�"
+
+#: html/Admin/Queues/index.html:42 html/Edit/Queues/index.html:38
+msgid "Include disabled queues in listing."
+msgstr "列出�用的表單"
+
+#: html/Admin/Users/index.html:46 html/Edit/Users/Search.html:62
+msgid "Include disabled users in search."
+msgstr "列出�用的使用者"
+
+#: html/Edit/Users/Info:36
+msgid "Indirect Employee"
+msgstr "直接/間接員工"
+
+#: lib/RT/Tickets_Overlay.pm:1067
+msgid "Initial Priority"
+msgstr "�始優先權"
+
+#: lib/RT/Ticket_Overlay.pm:1179 lib/RT/Ticket_Overlay.pm:1181
+msgid "InitialPriority"
+msgstr "�始優先權"
+
+#: lib/RT/ScripAction_Overlay.pm:104
+msgid "Input error"
+msgstr "輸入錯誤"
+
+#: NOT FOUND IN SOURCE
+msgid "Interest noted"
+msgstr "登記�功"
+
+#: lib/RT/Ticket_Overlay.pm:3829
+msgid "Internal Error"
+msgstr "內部錯誤"
+
+#: lib/RT/Record.pm:142
+#. ($id->{error_message})
+msgid "Internal Error: %1"
+msgstr "內部錯誤：%1"
+
+#: lib/RT/Group_Overlay.pm:643
+msgid "Invalid Group Type"
+msgstr "錯誤的群組類別"
+
+#: lib/RT/Principal_Overlay.pm:127
+msgid "Invalid Right"
+msgstr "錯誤的權�"
+
+#: NOT FOUND IN SOURCE
+msgid "Invalid Type"
+msgstr "錯誤的類型"
+
+#: lib/RT/Interface/Web.pm:901 x:904
+msgid "Invalid data"
+msgstr "錯誤的資料"
+
+#: lib/RT/Ticket_Overlay.pm:439
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr "錯誤的承辦人。改為�設承辦人「nobody�。"
+
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:250
+msgid "Invalid queue"
+msgstr "錯誤的表單"
+
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
+msgid "Invalid right"
+msgstr "錯誤的權�"
+
+#: lib/RT/Record.pm:117
+#. ($key)
+msgid "Invalid value for %1"
+msgstr "%1 的值錯誤"
+
+#: lib/RT/Ticket_Overlay.pm:3461
+msgid "Invalid value for custom field"
+msgstr "錯誤的自訂欄�值"
+
+#: lib/RT/Ticket_Overlay.pm:346
+msgid "Invalid value for status"
+msgstr "錯誤的狀態值"
+
+#: NOT FOUND IN SOURCE
+msgid "IssueStatement"
+msgstr "�出陳述"
+
+#: bin/rt-crontool:190
+msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
+msgstr "請絕���讓未具權�的使用者執行此工具程�。"
+
+#: bin/rt-crontool:191
+msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
+msgstr "建議您新增一個隸屬於正確群組的低權�系統使用者，並以該身份執行此工具程�。"
+
+#: bin/rt-crontool:162
+msgid "It takes several arguments:"
+msgstr "它接�下列�數："
+
+#: NOT FOUND IN SOURCE
+msgid "Item Name"
+msgstr "��"
+
+#: NOT FOUND IN SOURCE
+msgid "Items"
+msgstr "ç­†"
+
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
+msgstr "待簽核項目"
+
+#: NOT FOUND IN SOURCE
+msgid "Jan"
+msgstr "一月"
+
+#: lib/RT/Date.pm:411
+msgid "Jan."
+msgstr "01"
+
+#: NOT FOUND IN SOURCE
+msgid "January"
+msgstr "一月"
+
+#: NOT FOUND IN SOURCE
+msgid "Job"
+msgstr "�稱"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "Join or leave this group"
+msgstr "加入或離開此群組"
+
+#: NOT FOUND IN SOURCE
+msgid "Jul"
+msgstr "七月"
+
+#: lib/RT/Date.pm:417
+msgid "Jul."
+msgstr "01"
+
+#: NOT FOUND IN SOURCE
+msgid "July"
+msgstr "七月"
+
+#: html/Ticket/Elements/Tabs:98
+msgid "Jumbo"
+msgstr "全部資訊"
+
+#: NOT FOUND IN SOURCE
+msgid "Jun"
+msgstr "六月"
+
+#: lib/RT/Date.pm:416
+msgid "Jun."
+msgstr "06."
+
+#: NOT FOUND IN SOURCE
+msgid "June"
+msgstr "六月"
+
+#: NOT FOUND IN SOURCE
+msgid "Keyword"
+msgstr "關�字"
+
+#: lib/RT/CustomField_Vendor.pm:23
+msgid "LabelAttachments"
+msgstr "附件標籤"
+
+#: lib/RT/CustomField_Vendor.pm:24
+msgid "LabelContent"
+msgstr "內容標籤"
+
+#: lib/RT/CustomField_Vendor.pm:22
+msgid "LabelSubject"
+msgstr "主題標籤"
+
+#: lib/RT/CustomField_Vendor.pm:21
+msgid "LabelURL"
+msgstr "��標籤"
+
+#: html/Admin/Elements/ModifyUser:51
+msgid "Lang"
+msgstr "使用語言"
+
+#: html/Ticket/Elements/Tabs:72
+msgid "Last"
+msgstr "上次更新"
+
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:38
+msgid "Last Contact"
+msgstr "上次�絡"
+
+#: html/Elements/SelectDateType:28
+msgid "Last Contacted"
+msgstr "上次�絡日期"
+
+#: html/Search/Elements/TicketHeader:40 html/Work/Search/TicketHeader:19
+msgid "Last Notified"
+msgstr "上次通知"
+
+#: html/Elements/SelectDateType:29
+msgid "Last Updated"
+msgstr "上次更新"
+
+#: NOT FOUND IN SOURCE
+msgid "LastUpdated"
+msgstr "上次更新"
+
+#: NOT FOUND IN SOURCE
+msgid "Left"
+msgstr "剩餘時間"
+
+#: html/Admin/Users/Modify.html:82
+msgid "Let this user access RT"
+msgstr "�許這�使用者登入"
+
+#: html/Admin/Users/Modify.html:86
+msgid "Let this user be granted rights"
+msgstr "內部�員（具有個人權�）"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting owner to %1 %2"
+msgstr "�制承辦人為 %1 到%2"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting queue to %1 %2"
+msgstr "�制表單為 %1 到 %2"
+
+#: html/Work/Queues/Select.html:4
+msgid "Link a Queue"
+msgstr "申請表單連�"
+
+#: lib/RT/Ticket_Overlay.pm:2717
+msgid "Link already exists"
+msgstr "此��已存在"
+
+#: lib/RT/Ticket_Overlay.pm:2729
+msgid "Link could not be created"
+msgstr "無法新增��"
+
+#: lib/RT/Ticket_Overlay.pm:2737 lib/RT/Ticket_Overlay.pm:2747
+#. ($TransString)
+msgid "Link created (%1)"
+msgstr "��(%1)新增完畢"
+
+#: lib/RT/Ticket_Overlay.pm:2658
+#. ($TransString)
+msgid "Link deleted (%1)"
+msgstr "��(%1)刪除完畢"
+
+#: lib/RT/Ticket_Overlay.pm:2664
+msgid "Link not found"
+msgstr "找�到��"
+
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
+#. ($Ticket->Id)
+msgid "Link ticket #%1"
+msgstr "��申請單 #%1"
+
+#: NOT FOUND IN SOURCE
+msgid "Link ticket %1"
+msgstr "��申請單 %1"
+
+#: html/Ticket/Elements/Tabs:96
+msgid "Links"
+msgstr "��"
+
+#: html/Edit/Users/Search.html:11
+msgid "List All Users"
+msgstr "列出所有用戶資料"
+
+#: html/Admin/Users/Modify.html:113 html/User/Prefs.html:84 html/Work/Preferences/Info:73
+msgid "Location"
+msgstr "�置"
+
+#: lib/RT.pm:162
+#. ($RT::LogDir)
+msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
+msgstr "登入目錄 %1 找�到或無法寫入\\n。無法執行 RT。"
+
+#: html/Edit/Global/Basic/Top:52
+msgid "LogToFile"
+msgstr "紀錄等級"
+
+#: html/Edit/Global/Basic/Top:54
+msgid "LogToFileNamed"
+msgstr "紀錄檔�"
+
+#: html/Elements/Header:57
+#. ("<b>".$session{'CurrentUser'}->Name."</b>")
+msgid "Logged in as %1"
+msgstr "使用者：%1"
+
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54
+msgid "Login"
+msgstr "登入"
+
+#: html/Edit/Elements/104Top:17 html/Edit/Elements/104Top:17 html/Edit/Elements/104Top:32 html/Elements/Header:54
+msgid "Logout"
+msgstr "登出"
+
+#: NOT FOUND IN SOURCE
+msgid "Long-term contractor"
+msgstr "長期契約員工"
+
+#: html/Search/Bulk.html:85 html/Work/Search/Bulk.html:54
+msgid "Make Owner"
+msgstr "新增承辦人"
+
+#: html/Search/Bulk.html:109 html/Work/Search/Bulk.html:63
+msgid "Make Status"
+msgstr "新增��"
+
+#: html/Search/Bulk.html:117 html/Work/Search/Bulk.html:75
+msgid "Make date Due"
+msgstr "新增到期日"
+
+#: html/Search/Bulk.html:119 html/Work/Search/Bulk.html:78
+msgid "Make date Resolved"
+msgstr "新增解決日期"
+
+#: html/Search/Bulk.html:113 html/Work/Search/Bulk.html:69
+msgid "Make date Started"
+msgstr "新增實際起始日期"
+
+#: html/Search/Bulk.html:111 html/Work/Search/Bulk.html:66
+msgid "Make date Starts"
+msgstr "新增應起始日期"
+
+#: html/Search/Bulk.html:115 html/Work/Search/Bulk.html:72
+msgid "Make date Told"
+msgstr "新增報告日期"
+
+#: html/Search/Bulk.html:105 html/Work/Search/Bulk.html:57
+msgid "Make priority"
+msgstr "新增優先順�"
+
+#: html/Search/Bulk.html:107 html/Work/Search/Bulk.html:60
+msgid "Make queue"
+msgstr "新增表單"
+
+#: html/Search/Bulk.html:103 html/Work/Search/Bulk.html:59
+msgid "Make subject"
+msgstr "新增主題"
+
+#: NOT FOUND IN SOURCE
+msgid "Male"
+msgstr "ç”·"
+
+#: html/Admin/index.html:32
+msgid "Manage groups and group membership"
+msgstr "管�群組�所屬�員"
+
+#: html/Admin/index.html:38
+msgid "Manage properties and configuration which apply to all queues"
+msgstr "管��用於所有表單的屬性與設定"
+
+#: html/Admin/index.html:35
+msgid "Manage queues and queue-specific properties"
+msgstr "管��表單�相關屬性"
+
+#: html/Admin/index.html:29
+msgid "Manage users and passwords"
+msgstr "管�使用者與密碼"
+
+#: NOT FOUND IN SOURCE
+msgid "Manager"
+msgstr "經�"
+
+#: NOT FOUND IN SOURCE
+msgid "Mar"
+msgstr "三月"
+
+#: lib/RT/Date.pm:413
+msgid "Mar."
+msgstr "03"
+
+#: NOT FOUND IN SOURCE
+msgid "March"
+msgstr "三月"
+
+#: NOT FOUND IN SOURCE
+msgid "Marketing Department"
+msgstr "行銷部"
+
+#: NOT FOUND IN SOURCE
+msgid "May"
+msgstr "五月"
+
+#: lib/RT/Date.pm:415
+msgid "May."
+msgstr "05"
+
+#: lib/RT/Group_Overlay.pm:981
+msgid "Member added"
+msgstr "新增�員完畢"
+
+#: lib/RT/Group_Overlay.pm:1139
+msgid "Member deleted"
+msgstr "�員已刪除"
+
+#: lib/RT/Group_Overlay.pm:1143
+msgid "Member not deleted"
+msgstr "�員未被刪除"
+
+#: html/Elements/SelectLinkType:25
+msgid "Member of"
+msgstr "隸屬於"
+
+#: html/Work/Preferences/index.html:20
+msgid "Member since"
+msgstr "註冊日期"
+
+#: NOT FOUND IN SOURCE
+msgid "MemberOf"
+msgstr "隸屬於"
+
+#: html/Admin/Elements/GroupTabs:41 html/Admin/Elements/ModifyTemplateAsWorkflow:232 html/User/Elements/GroupTabs:41
+msgid "Members"
+msgstr "�員"
+
+#: lib/RT/Ticket_Overlay.pm:2904
+msgid "Merge Successful"
+msgstr "整�完畢"
+
+#: lib/RT/Ticket_Overlay.pm:2824
+msgid "Merge failed. Couldn't set EffectiveId"
+msgstr "整�失敗。無法設定 EffectiveId"
+
+#: html/Ticket/Elements/BulkLinks:26 html/Ticket/Elements/EditLinks:114 html/Work/Search/BulkLinks:2
+msgid "Merge into"
+msgstr "整�進"
+
+#: html/Search/Bulk.html:137 html/Ticket/Update.html:100
+msgid "Message"
+msgstr "訊�"
+
+#: NOT FOUND IN SOURCE
+msgid "Misc. Expense"
+msgstr "雜費"
+
+#: lib/RT/Interface/Web.pm:903 x:906
+msgid "Missing a primary key?: %1"
+msgstr "缺少主�值？(%1)"
+
+#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:53 html/Work/Preferences/Info:36
+msgid "Mobile"
+msgstr "行動電話"
+
+#: html/Admin/Elements/ModifyUser:71
+msgid "MobilePhone"
+msgstr "行動電話"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "Modify Access Control List"
+msgstr "更改權�控制清單"
+
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
+msgid "Modify Custom Fields which apply to all queues"
+msgstr "更改�用於所有表單的自訂欄�"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "Modify Scrip templates for this queue"
+msgstr "更改此表單的範本"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "Modify Scrips for this queue"
+msgstr "更改此表單的手續"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify System ACLS"
+msgstr "更改系統權�清單"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Template %1"
+msgstr "更改範本 %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Workflow"
+msgstr "更改�程"
+
+#: html/Admin/Queues/CustomField.html:44
+#. ($QueueObj->Name())
+msgid "Modify a CustomField for queue %1"
+msgstr "更改 %1 表單內的自訂欄�"
+
+#: html/Admin/Global/CustomField.html:52
+msgid "Modify a CustomField which applies to all queues"
+msgstr "更改�用於所有表單的自訂欄�"
+
+#: html/Admin/Queues/Scrip.html:53
+#. ($QueueObj->Name)
+msgid "Modify a scrip for queue %1"
+msgstr "更改 %1 表單內的手續"
+
+#: html/Admin/Global/Scrip.html:47
+msgid "Modify a scrip which applies to all queues"
+msgstr "更改�用於所有表單的手續"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify dates for # %1"
+msgstr "更改 # %1 的日期"
+
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
+#. ($TicketObj->Id)
+msgid "Modify dates for #%1"
+msgstr "更改 #%1 的日期"
+
+#: html/Ticket/ModifyDates.html:34
+#. ($TicketObj->Id)
+msgid "Modify dates for ticket # %1"
+msgstr "更改申請單 # %1 的日期"
+
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
+msgid "Modify global group rights"
+msgstr "更改全域設定的群組權�"
+
+#: html/Admin/Global/GroupRights.html:32
+msgid "Modify global group rights."
+msgstr "更改全域設定的群組權�。"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for groups"
+msgstr "更改全域設定的群組權�"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for users"
+msgstr "更改全域設定的使用者權�"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global scrips"
+msgstr "更改全域手續"
+
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
+msgid "Modify global user rights"
+msgstr "更改全域設定的使用者權�"
+
+#: html/Admin/Global/UserRights.html:32
+msgid "Modify global user rights."
+msgstr "更改全域設定的使用者權�。"
+
+#: lib/RT/Group_Overlay.pm:145
+msgid "Modify group metadata or delete group"
+msgstr "更改群組資料�刪除群組"
+
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
+#. ($GroupObj->Name)
+msgid "Modify group rights for group %1"
+msgstr "更改 %1 的群組權�"
+
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
+#. ($QueueObj->Name)
+msgid "Modify group rights for queue %1"
+msgstr "更改表單 %1 的群組權�"
+
+#: lib/RT/Group_Overlay.pm:147
+msgid "Modify membership roster for this group"
+msgstr "更改此群組的�員�單"
+
+#: lib/RT/System.pm:60
+msgid "Modify one's own RT account"
+msgstr "更改個人的帳號資訊"
+
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
+#. ($QueueObj->Name)
+msgid "Modify people related to queue %1"
+msgstr "更改��到表單 %1 的人員"
+
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
+#. ($Ticket->id)
+#. ($Ticket->Id)
+msgid "Modify people related to ticket #%1"
+msgstr "更改申請單 #%1 ��到的人員"
+
+#: html/Admin/Queues/Scrips.html:45
+#. ($QueueObj->Name)
+msgid "Modify scrips for queue %1"
+msgstr "更改表單 %1 的手續"
+
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
+msgid "Modify scrips which apply to all queues"
+msgstr "更改�用於所有表單的手續"
+
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
+#. (loc($TemplateObj->Name()))
+#. ($TemplateObj->id)
+msgid "Modify template %1"
+msgstr "更改範本 %1"
+
+#: html/Admin/Global/Templates.html:43
+msgid "Modify templates which apply to all queues"
+msgstr "更改�用於所有表單的範本"
+
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
+#. ($Group->Name)
+msgid "Modify the group %1"
+msgstr "更改群組 %1"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "Modify the queue watchers"
+msgstr "更改表單視察員"
+
+#: html/Admin/Users/Modify.html:235
+#. ($UserObj->Name)
+msgid "Modify the user %1"
+msgstr "更改使用者 %1"
+
+#: html/Ticket/ModifyAll.html:36
+#. ($Ticket->Id)
+msgid "Modify ticket # %1"
+msgstr "更改申請單 # %1"
+
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
+#. ($TicketObj->Id)
+msgid "Modify ticket #%1"
+msgstr "更改申請單 # %1"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "Modify tickets"
+msgstr "更改申請單"
+
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
+#. ($GroupObj->Name)
+msgid "Modify user rights for group %1"
+msgstr "更改群組 %1 的使用者權�"
+
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
+#. ($QueueObj->Name)
+msgid "Modify user rights for queue %1"
+msgstr "更改表單 %1 的使用者權�"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify watchers for queue '%1'"
+msgstr "更改 '%1' 的視察員"
+
+#: html/Admin/Global/Workflow.html:25 html/Admin/Global/Workflow.html:30 html/Admin/Global/Workflow.html:81 html/Admin/Queues/Workflow.html:77
+#. (loc($WorkflowObj->Name()))
+#. ($WorkflowObj->id)
+msgid "Modify workflow %1"
+msgstr "更改�程 %1"
+
+#: html/Admin/Global/Workflows.html:44
+msgid "Modify workflows which apply to all queues"
+msgstr "更改�用於所有表單的�程"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "ModifyACL"
+msgstr "更改權�清單"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "ModifyOwnMembership"
+msgstr "更改自己是�屬於�群組"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ModifyQueueWatchers"
+msgstr "更改表單視察員"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "ModifyScrips"
+msgstr "更改手續"
+
+#: lib/RT/System.pm:60
+msgid "ModifySelf"
+msgstr "更改個人帳號"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "ModifyTemplate"
+msgstr "更改範本"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "ModifyTicket"
+msgstr "更改申請單"
+
+#: NOT FOUND IN SOURCE
+msgid "Mon"
+msgstr "星期一"
+
+#: lib/RT/Date.pm:388
+msgid "Mon."
+msgstr "星期一"
+
+#: html/Work/Elements/MyRequests:11 html/Work/Elements/MyTickets:11
+msgid "More"
+msgstr "更多"
+
+#: html/Ticket/Elements/ShowRequestor:41
+#. ($name)
+msgid "More about %1"
+msgstr "關於 %1 的進一步資訊"
+
+#: NOT FOUND IN SOURCE
+msgid "Morning Shift"
+msgstr "早�"
+
+#: html/Edit/Elements/ListButtons:16
+msgid "Move All"
+msgstr "全移"
+
+#: html/Admin/Elements/EditCustomFields:60
+msgid "Move down"
+msgstr "下移"
+
+#: html/Admin/Elements/EditCustomFields:52
+msgid "Move up"
+msgstr "上移"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:26
+msgid "Multiple"
+msgstr "多�"
+
+#: lib/RT/User_Overlay.pm:238
+msgid "Must specify 'Name' attribute"
+msgstr "必須指定 'Name' 的屬性"
+
+#: html/SelfService/Elements/MyRequests:48
+#. ($friendly_status)
+msgid "My %1 tickets"
+msgstr "我的 %1 申請單"
+
+#: html/Work/Elements/Tab:37
+msgid "My Approvals"
+msgstr "表單簽核"
+
+#: html/Work/Elements/Tab:35
+msgid "My Requests"
+msgstr "表單申請追蹤"
+
+#: html/Work/Elements/Tab:39
+msgid "My Tickets"
+msgstr "表單處�"
+
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
+msgid "My approvals"
+msgstr "表單簽核"
+
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Elements/ModifyTemplateAsWorkflow:185 html/Admin/Elements/ModifyUser:29 html/Admin/Groups/Modify.html:43 html/Edit/Users/Add.html:22 html/Edit/Users/Search.html:31 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43 html/Work/Tickets/Cc:18
+msgid "Name"
+msgstr "�稱"
+
+#: lib/RT/User_Overlay.pm:245
+msgid "Name in use"
+msgstr "帳號已有人使用"
+
+#: html/Edit/Users/Info:27
+msgid "Nationality"
+msgstr "國�"
+
+#: NOT FOUND IN SOURCE
+msgid "Need approval from system administrator"
+msgstr "需先由系統管�員進行批准"
+
+#: html/Ticket/Elements/ShowDates:51
+msgid "Never"
+msgstr "從未更動"
+
+#: html/Elements/Quicksearch:29 html/Work/Elements/Quicksearch:15 html/Work/Tickets/Create.html:54
+msgid "New"
+msgstr "新建立"
+
+#: html/Admin/Elements/ModifyUser:31 html/Admin/Users/Modify.html:92 html/User/Prefs.html:64 html/Work/Preferences/Info:47
+msgid "New Password"
+msgstr "新的密碼"
+
+#: etc/initialdata.zh:341 etc/initialdata:317 etc/upgrade/2.1.71:16 html/Edit/Elements/CreateApprovalsQueue:21
+msgid "New Pending Approval"
+msgstr "新的待簽核事項"
+
+#: html/Ticket/Elements/EditLinks:110
+msgid "New Relationships"
+msgstr "新增關係"
+
+#: html/Work/Elements/Tab:33
+msgid "New Request"
+msgstr "表單申請"
+
+#: html/Ticket/Elements/Tabs:35
+msgid "New Search"
+msgstr "新增查詢"
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:39
+msgid "New custom field"
+msgstr "新增自訂欄�"
+
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
+msgid "New group"
+msgstr "新增群組"
+
+#: html/SelfService/Prefs.html:31
+msgid "New password"
+msgstr "新的密碼"
+
+#: lib/RT/User_Overlay.pm:764
+msgid "New password notification sent"
+msgstr "�出新密碼通知"
+
+#: html/Admin/Elements/QueueTabs:69
+msgid "New queue"
+msgstr "新增表單"
+
+#: NOT FOUND IN SOURCE
+msgid "New request"
+msgstr "�出申請單"
+
+#: html/Admin/Elements/SelectRights:41
+msgid "New rights"
+msgstr "新增權�"
+
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
+msgid "New scrip"
+msgstr "新增手續"
+
+#: html/Work/Search/index.html:62
+msgid "New search"
+msgstr "�新查詢"
+
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
+msgid "New template"
+msgstr "新增範本"
+
+#: html/SelfService/Elements/Tabs:47
+msgid "New ticket"
+msgstr "�出申請單"
+
+#: lib/RT/Ticket_Overlay.pm:2791
+msgid "New ticket doesn't exist"
+msgstr "沒有新申請單"
+
+#: html/Admin/Elements/UserTabs:51
+msgid "New user"
+msgstr "新增使用者"
+
+#: html/Admin/Elements/CreateUserCalled:25
+msgid "New user called"
+msgstr "新使用者�字"
+
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
+msgid "New watchers"
+msgstr "新視察員"
+
+#: html/Admin/Users/Prefs.html:41
+msgid "New window setting"
+msgstr "更新視窗設定"
+
+#: html/Admin/Global/Workflow.html:60 html/Admin/Global/Workflows.html:39 html/Admin/Queues/Workflow.html:57 html/Admin/Queues/Workflows.html:50
+msgid "New workflow"
+msgstr "新增�程"
+
+#: html/Ticket/Elements/Tabs:68
+msgid "Next"
+msgstr "下一項"
+
+#: html/Search/Listing.html:47 html/Work/Search/index.html:24
+msgid "Next page"
+msgstr "下一�"
+
+#: html/Admin/Elements/ModifyUser:49
+msgid "NickName"
+msgstr "暱稱"
+
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:45 html/Work/Preferences/Info:26
+msgid "Nickname"
+msgstr "暱稱"
+
+#: NOT FOUND IN SOURCE
+msgid "Night Shift"
+msgstr "�夜�"
+
+#: html/Edit/Global/Basic/Top:27
+msgid "No"
+msgstr "�"
+
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:104
+msgid "No CustomField"
+msgstr "無自訂欄�"
+
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
+msgid "No Group defined"
+msgstr "尚未定義群組"
+
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
+msgid "No Queue defined"
+msgstr "沒有定義好的表單"
+
+#: bin/rt-crontool:55
+msgid "No RT user found. Please consult your RT administrator.\\n"
+msgstr "找�到 RT 使用者。請� RT 管�員查詢。\\n"
+
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
+msgid "No Template"
+msgstr "沒有範本"
+
+#: bin/rt-commit-handler:763
+msgid "No Ticket specified. Aborting ticket "
+msgstr "未指定申請單。退出申請單 "
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgstr "未指定申請單。退出申請單更改\\n\\n"
+
+#: html/Admin/Elements/ModifyWorkflow:237 html/Admin/Global/Workflow.html:79 html/Admin/Queues/Workflow.html:75
+msgid "No Workflow"
+msgstr "沒有�程"
+
+#: html/Approvals/Elements/Approve:45 html/Work/Approvals/Elements/Approve:35
+msgid "No action"
+msgstr "暫�處�"
+
+#: lib/RT/Interface/Web.pm:898 x:901
+msgid "No column specified"
+msgstr "未指定欄�"
+
+#: NOT FOUND IN SOURCE
+msgid "No command found\\n"
+msgstr "找�到命令"
+
+#: html/Elements/ViewUser:35 html/Ticket/Elements/ShowRequestor:44
+msgid "No comment entered about this user"
+msgstr "沒有�這�使用者的評論"
+
+#: lib/RT/Ticket_Overlay.pm:2202 lib/RT/Ticket_Overlay.pm:2270
+msgid "No correspondence attached"
+msgstr "沒有附上申請單回覆"
+
+#: lib/RT/Action/Generic.pm:149 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
+#. (ref $self)
+msgid "No description for %1"
+msgstr "沒有� %1 的�述"
+
+#: lib/RT/Users_Overlay.pm:150
+msgid "No group specified"
+msgstr "未指定群組"
+
+#: lib/RT/User_Overlay.pm:982
+msgid "No password set"
+msgstr "沒有設定密碼"
+
+#: lib/RT/Queue_Overlay.pm:260
+msgid "No permission to create queues"
+msgstr "沒有新增表單的權�"
+
+#: lib/RT/Ticket_Overlay.pm:342
+#. ($QueueObj->Name)
+msgid "No permission to create tickets in the queue '%1'"
+msgstr "沒有在表單 '%1' 新增申請單的權�"
+
+#: lib/RT/User_Overlay.pm:211
+msgid "No permission to create users"
+msgstr "沒有新增使用者的權�"
+
+#: html/SelfService/Display.html:117
+msgid "No permission to display that ticket"
+msgstr "沒有顯示該申請單的權�"
+
+#: html/SelfService/Update.html:51
+msgid "No permission to view update ticket"
+msgstr "沒有檢視申請單更新的權�"
+
+#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1487
+msgid "No principal specified"
+msgstr "未指定單�"
+
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
+msgid "No principals selected."
+msgstr "未指定單�。"
+
+#: NOT FOUND IN SOURCE
+msgid "No protocol specified in %1"
+msgstr "%1 內未指定�定"
+
+#: html/Admin/Queues/index.html:34
+msgid "No queues matching search criteria found."
+msgstr "找�到符�查詢�件的表單。"
+
+#: html/Admin/Elements/SelectRights:80
+msgid "No rights found"
+msgstr "找�到權�"
+
+#: html/Admin/Elements/SelectRights:32
+msgid "No rights granted."
+msgstr "沒有�定權�"
+
+#: html/Search/Bulk.html:160 html/Work/Search/Bulk.html:117
+msgid "No search to operate on."
+msgstr "沒有�進行的查詢"
+
+#: NOT FOUND IN SOURCE
+msgid "No ticket id specified"
+msgstr "未指定申請單編號"
+
+#: lib/RT/Transaction_Overlay.pm:478 lib/RT/Transaction_Overlay.pm:516
+msgid "No transaction type specified"
+msgstr "未指定更動報告類別"
+
+#: NOT FOUND IN SOURCE
+msgid "No user or email address specified"
+msgstr "未指定使用者或電�郵件地�"
+
+#: html/Admin/Users/index.html:35
+msgid "No users matching search criteria found."
+msgstr "找�到符�查詢�件的使用者。"
+
+#: bin/rt-commit-handler:643
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr "找�到�格的 RT 使用者。RT cvs 處�器已�用。請� RT 管�者詢�。\\n"
+
+#: lib/RT/Interface/Web.pm:895 x:898
+msgid "No value sent to _Set!\\n"
+msgstr "_Set 沒有收到任何值!\\n"
+
+#: html/Search/Elements/TicketRow:36 html/Work/Search/TicketRow:9
+msgid "Nobody"
+msgstr "沒有人"
+
+#: lib/RT/Interface/Web.pm:900 x:903
+msgid "Nonexistant field?"
+msgstr "欄��存在？"
+
+#: NOT FOUND IN SOURCE
+msgid "Normal Users"
+msgstr "一般用戶群組"
+
+#: NOT FOUND IN SOURCE
+msgid "Not configured to fetch the content from a %1 in %2"
+msgstr "未設定�從 %2 內擷� %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Not logged in"
+msgstr "尚未登入"
+
+#: html/Elements/Header:59
+msgid "Not logged in."
+msgstr "尚未登入"
+
+#: lib/RT/Date.pm:369
+msgid "Not set"
+msgstr "尚未設定"
+
+#: html/NoAuth/Reminder.html:26
+msgid "Not yet implemented."
+msgstr "尚未完工。"
+
+#: NOT FOUND IN SOURCE
+msgid "Not yet implemented...."
+msgstr "尚未完工..."
+
+#: html/Approvals/Elements/Approve:48 html/Work/Tickets/Create.html:143
+msgid "Notes"
+msgstr "備註"
+
+#: NOT FOUND IN SOURCE
+msgid "Notes:"
+msgstr "備註："
+
+#: lib/RT/User_Overlay.pm:767
+msgid "Notification could not be sent"
+msgstr "無法�出通知"
+
+#: etc/initialdata.zh:111 etc/initialdata:93
+msgid "Notify AdminCcs"
+msgstr "通知管�員副本收件人"
+
+#: etc/initialdata.zh:107 etc/initialdata:89
+msgid "Notify AdminCcs as Comment"
+msgstr "以評論方�通知管�員副本收件人"
+
+#: etc/initialdata.zh:138 etc/initialdata:120
+msgid "Notify Other Recipients"
+msgstr "通知其他收件人"
+
+#: etc/initialdata.zh:134 etc/initialdata:116
+msgid "Notify Other Recipients as Comment"
+msgstr "以評論方�通知其他收件人"
+
+#: etc/initialdata.zh:103 etc/initialdata:85
+msgid "Notify Owner"
+msgstr "通知承辦人"
+
+#: etc/initialdata.zh:99 etc/initialdata:81
+msgid "Notify Owner as Comment"
+msgstr "以評論方�通知承辦人"
+
+#: etc/initialdata.zh:385 etc/initialdata:361
+msgid "Notify Owner of their rejected ticket"
+msgstr "通知承辦人申請單已�回"
+
+#: etc/initialdata.zh:374 etc/initialdata:350
+msgid "Notify Owner of their ticket has been approved by all approvers"
+msgstr "通知承辦人申請單已完�全部簽核"
+
+#: etc/initialdata.zh:359 etc/initialdata:338
+msgid "Notify Owner of their ticket has been approved by some approver"
+msgstr "通知承辦人申請單已完��項簽核"
+
+#: etc/initialdata.zh:343 etc/initialdata:319 etc/upgrade/2.1.71:17 html/Edit/Elements/CreateApprovalsQueue:22
+msgid "Notify Owners and AdminCcs of new items pending their approval"
+msgstr "整�待簽核事項，通知承辦人�管�員副本收件人"
+
+#: etc/initialdata.zh:95 etc/initialdata:77
+msgid "Notify Requestors"
+msgstr "通知申請人"
+
+#: etc/initialdata.zh:121 etc/initialdata:103
+msgid "Notify Requestors and Ccs"
+msgstr "通知申請人�副本收件人"
+
+#: etc/initialdata.zh:116 etc/initialdata:98
+msgid "Notify Requestors and Ccs as Comment"
+msgstr "以評論方�通知申請人�副本收件人"
+
+#: etc/initialdata.zh:130 etc/initialdata:112
+msgid "Notify Requestors, Ccs and AdminCcs"
+msgstr "通知申請人�副本�管�員副本收件人"
+
+#: etc/initialdata.zh:126 etc/initialdata:108
+msgid "Notify Requestors, Ccs and AdminCcs as Comment"
+msgstr "以評論方�通知申請人�副本�管�員副本收件人"
+
+#: html/Work/Tickets/Cc:55
+msgid "Notify people:"
+msgstr "通知�象"
+
+#: NOT FOUND IN SOURCE
+msgid "Nov"
+msgstr "�一月"
+
+#: lib/RT/Date.pm:421
+msgid "Nov."
+msgstr "11"
+
+#: NOT FOUND IN SOURCE
+msgid "November"
+msgstr "�一月"
+
+#: html/Edit/Global/Basic/Top:74
+msgid "OIN104"
+msgstr "�� 104eHRMS 介�"
+
+#: html/Edit/Global/Workflow/Export.html:30 html/Work/Copyright.html:23
+msgid "OK"
+msgstr "確定"
+
+#: lib/RT/Record.pm:156
+msgid "Object could not be created"
+msgstr "無法新增物件"
+
+#: lib/RT/Record.pm:175
+msgid "Object created"
+msgstr "物件新增完畢"
+
+#: html/Edit/Users/Info:35
+msgid "Occupation Status"
+msgstr "在�狀態"
+
+#: NOT FOUND IN SOURCE
+msgid "Oct"
+msgstr "�月"
+
+#: lib/RT/Date.pm:420
+msgid "Oct."
+msgstr "10"
+
+#: NOT FOUND IN SOURCE
+msgid "October"
+msgstr "�月"
+
+#: html/Edit/Users/Info:32
+msgid "Office Phone"
+msgstr "辦公室電話"
+
+#: html/Elements/SelectDateRelation:34
+msgid "On"
+msgstr "等於"
+
+#: etc/initialdata.zh:173 etc/initialdata:155
+msgid "On Comment"
+msgstr "評論時"
+
+#: etc/initialdata.zh:166 etc/initialdata:148
+msgid "On Correspond"
+msgstr "回覆申請單時"
+
+#: etc/initialdata.zh:155 etc/initialdata:137
+msgid "On Create"
+msgstr "新增申請單時"
+
+#: etc/initialdata.zh:187 etc/initialdata:169
+msgid "On Owner Change"
+msgstr "承辦人改變時"
+
+#: etc/initialdata.zh:195 etc/initialdata:177
+msgid "On Queue Change"
+msgstr "表單改變時"
+
+#: etc/initialdata.zh:201 etc/initialdata:183
+msgid "On Resolve"
+msgstr "解決申請單時"
+
+#: etc/initialdata.zh:179 etc/initialdata:161
+msgid "On Status Change"
+msgstr "��改變時"
+
+#: etc/initialdata.zh:160 etc/initialdata:142
+msgid "On Transaction"
+msgstr "發生更動時"
+
+#: html/Approvals/Elements/PendingMyApproval:49
+#. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
+msgid "Only show approvals for requests created after %1"
+msgstr "僅顯示 %1 之後新增的申請單"
+
+#: html/Approvals/Elements/PendingMyApproval:47
+#. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
+msgid "Only show approvals for requests created before %1"
+msgstr "僅顯示 %1 之�新增的申請單"
+
+#: html/Edit/Global/GroupRight/List:9 html/Edit/Global/GroupRight/Top:16 html/Edit/Groups/List:11 html/Edit/Groups/Top:18 html/Edit/Queues/Basic/Top:69 html/Edit/Queues/List:13 html/Elements/Quicksearch:30 html/Work/Delegates/Info:48 html/Work/Delegates/Info:51 html/Work/Delegates/List:12 html/Work/Elements/Quicksearch:16 html/Work/Overview/Info:41 html/Work/Tickets/Display.html:28
+msgid "Open"
+msgstr "é–‹å•Ÿ"
+
+#: html/Ticket/Elements/Tabs:135
+msgid "Open it"
+msgstr "é–‹å•Ÿ"
+
+#: html/SelfService/Elements/Tabs:41
+msgid "Open tickets"
+msgstr "開啟的申請單"
+
+#: html/Admin/Users/Prefs.html:40
+msgid "Open tickets (from listing) in a new window"
+msgstr "在新視窗開啟(列表的)申請單"
+
+#: html/Admin/Users/Prefs.html:39
+msgid "Open tickets (from listing) in another window"
+msgstr "在�一個視窗開啟(列表的)申請單"
+
+#: etc/initialdata.zh:150 etc/initialdata:132
+msgid "Open tickets on correspondence"
+msgstr "收到回覆時�開啟申請單"
+
+#: NOT FOUND IN SOURCE
+msgid "Opened Tickets"
+msgstr "已申請�行中表單"
+
+#: NOT FOUND IN SOURCE
+msgid "Opinion"
+msgstr "�見"
+
+#: html/Edit/Global/CustomField/Info:35
+msgid "Option Description"
+msgstr "�項�述"
+
+#: html/Edit/Global/CustomField/Info:29
+msgid "Option Name"
+msgstr "�項�稱"
+
+#: html/Search/Elements/PickRestriction:100 html/Work/Search/PickRestriction:81
+msgid "Ordering and sorting"
+msgstr "順�與排�方�"
+
+#: html/Admin/Elements/ModifyUser:45 html/Admin/Users/Modify.html:116 html/Edit/Global/Basic/Top:50 html/Elements/SelectUsers:28 html/User/Prefs.html:85 html/Work/Preferences/Info:75
+msgid "Organization"
+msgstr "組織�稱"
+
+#: NOT FOUND IN SOURCE
+msgid "Organization:"
+msgstr "組織："
+
+#: html/Approvals/Elements/Approve:32
+#. ($approving->Id, $approving->Subject)
+msgid "Originating ticket: #%1"
+msgstr "原申請單：#%1"
+
+#: html/Edit/Elements/PickUsers:109 html/Edit/Users/Add.html:106 html/Work/Tickets/Cc:80
+msgid "Other comma-delimited email addresses"
+msgstr "其他e-mail帳號 (僅e-mail通知;多筆帳號請用逗號','�隔)"
+
+#: html/Admin/Elements/ModifyQueue:54 html/Admin/Queues/Modify.html:68 html/Edit/Queues/Basic/Top:41
+msgid "Over time, priority moves toward"
+msgstr "優先順�隨時間增加調整為"
+
+#: NOT FOUND IN SOURCE
+msgid "Override current custom fields with fields from %1"
+msgstr "以 %1 表單的自訂欄��代�有欄�"
+
+#: html/Admin/Elements/CheckOverrideGlobalACL:25
+msgid "Override global rights"
+msgstr "�代全域權�"
+
+#: html/Admin/Elements/CheckOverrideGlobalACL:34
+#. (loc_fuzzy($msg))
+msgid "OverrideGlobalACL status %1"
+msgstr "�代全域權� %1"
+
+#: html/Work/Elements/Tab:31
+msgid "Overview"
+msgstr "總覽"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "Own tickets"
+msgstr "承辦申請單"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "OwnTicket"
+msgstr "承辦申請單"
+
+#: etc/initialdata.zh:56 etc/initialdata:38 html/Admin/Elements/ModifyTemplateAsWorkflow:141 html/Edit/Global/Workflow/Owner.html:19 html/Edit/Queues/Basic/Top:47 html/Edit/Queues/Basic/Top:58 html/Elements/MyRequests:31 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:62 html/Work/Elements/MyRequests:19 html/Work/Elements/Quicksearch:18 html/Work/Tickets/Elements/ShowBasics:21 html/Work/Tickets/Update.html:27 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1244
+msgid "Owner"
+msgstr "承辦人"
+
+#: NOT FOUND IN SOURCE
+msgid "Owner changed from %1 to %2"
+msgstr "承辦人已從 %1 改為 %2"
+
+#: lib/RT/Transaction_Overlay.pm:582
+#. ($Old->Name , $New->Name)
+msgid "Owner forcibly changed from %1 to %2"
+msgstr "強制將承辦人從 %1 改為 %2"
+
+#: html/Search/Elements/PickRestriction:30 html/Work/Search/PickRestriction:10
+msgid "Owner is"
+msgstr "承辦人"
+
+#: html/Work/Elements/List:27 html/Work/Queues/List:8 html/Work/Tickets/Create.html:56 html/Work/Tickets/Elements/ShowBasics:60
+msgid "Owner's Phone"
+msgstr "承辦人電話"
+
+#: html/Edit/Elements/Page:39
+msgid "Page"
+msgstr " "
+
+#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:55 html/Work/Preferences/Info:38
+msgid "Pager"
+msgstr "呼�器"
+
+#: html/Admin/Elements/ModifyUser:73
+msgid "PagerPhone"
+msgstr "呼�器號碼"
+
+#: html/Edit/Global/Workflow/Action:81 html/Edit/Global/Workflow/Condition:66
+msgid "Parameter"
+msgstr "呼��數"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:225
+msgid "Parent"
+msgstr "上級"
+
+#: html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:38 html/Ticket/Elements/EditLinks:126 html/Ticket/Elements/EditLinks:57 html/Ticket/Elements/ShowLinks:46 html/Work/Search/BulkLinks:14
+msgid "Parents"
+msgstr "�申請單"
+
+#: NOT FOUND IN SOURCE
+msgid "Park Space"
+msgstr "�車�申請"
+
+#: html/Elements/Login:52 html/User/Prefs.html:60 html/Work/Preferences/Info:44
+msgid "Password"
+msgstr "密碼"
+
+#: html/NoAuth/Reminder.html:24
+msgid "Password Reminder"
+msgstr "密碼�示"
+
+#: lib/RT/User_Overlay.pm:228 lib/RT/User_Overlay.pm:985
+msgid "Password too short"
+msgstr "密碼太短"
+
+#: html/Admin/Users/Modify.html:290 html/User/Prefs.html:171 html/Work/Preferences/Info:167
+#. (loc_fuzzy($msg))
+msgid "Password: %1"
+msgstr "密碼：%1"
+
+#: html/Admin/Users/Modify.html:292
+msgid "Passwords do not match."
+msgstr "密碼確�失敗。"
+
+#: html/User/Prefs.html:173 html/Work/Preferences/Info:169
+msgid "Passwords do not match. Your password has not been changed"
+msgstr "密碼確�失敗。您的密碼並未改變。"
+
+#: NOT FOUND IN SOURCE
+msgid "Pelase select a queue"
+msgstr "請�擇表單�稱"
+
+#: NOT FOUND IN SOURCE
+msgid "Pending Approval"
+msgstr "等待簽核"
+
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:95 html/Ticket/ModifyAll.html:50
+msgid "People"
+msgstr "人員"
+
+#: NOT FOUND IN SOURCE
+msgid "People with Queue Rights"
+msgstr "�有表單權�人員"
+
+#: etc/initialdata.zh:143 etc/initialdata:125
+msgid "Perform a user-defined action"
+msgstr "執行使用者自訂的動作"
+
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/CurrentUser.pm:82 lib/RT/CurrentUser.pm:91 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:201 lib/RT/CustomField_Overlay.pm:233 lib/RT/CustomField_Overlay.pm:510 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1094 lib/RT/Group_Overlay.pm:1098 lib/RT/Group_Overlay.pm:1107 lib/RT/Group_Overlay.pm:1158 lib/RT/Group_Overlay.pm:1162 lib/RT/Group_Overlay.pm:1168 lib/RT/Group_Overlay.pm:425 lib/RT/Group_Overlay.pm:517 lib/RT/Group_Overlay.pm:595 lib/RT/Group_Overlay.pm:603 lib/RT/Group_Overlay.pm:700 lib/RT/Group_Overlay.pm:704 lib/RT/Group_Overlay.pm:710 lib/RT/Group_Overlay.pm:903 lib/RT/Group_Overlay.pm:907 lib/RT/Group_Overlay.pm:920 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:931 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:196 lib/RT/Scrip_Overlay.pm:433 lib/RT/Template_Overlay.pm:283 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1359 lib/RT/Ticket_Overlay.pm:1369 lib/RT/Ticket_Overlay.pm:1383 lib/RT/Ticket_Overlay.pm:1517 lib/RT/Ticket_Overlay.pm:1526 lib/RT/Ticket_Overlay.pm:1539 lib/RT/Ticket_Overlay.pm:1888 lib/RT/Ticket_Overlay.pm:2026 lib/RT/Ticket_Overlay.pm:2190 lib/RT/Ticket_Overlay.pm:2257 lib/RT/Ticket_Overlay.pm:2616 lib/RT/Ticket_Overlay.pm:2688 lib/RT/Ticket_Overlay.pm:2782 lib/RT/Ticket_Overlay.pm:2797 lib/RT/Ticket_Overlay.pm:2996 lib/RT/Ticket_Overlay.pm:3006 lib/RT/Ticket_Overlay.pm:3011 lib/RT/Ticket_Overlay.pm:3233 lib/RT/Ticket_Overlay.pm:3431 lib/RT/Ticket_Overlay.pm:3593 lib/RT/Ticket_Overlay.pm:3645 lib/RT/Ticket_Overlay.pm:3823 lib/RT/Transaction_Overlay.pm:466 lib/RT/Transaction_Overlay.pm:473 lib/RT/Transaction_Overlay.pm:502 lib/RT/Transaction_Overlay.pm:509 lib/RT/User_Overlay.pm:1079 lib/RT/User_Overlay.pm:1527 lib/RT/User_Overlay.pm:687 lib/RT/User_Overlay.pm:722 lib/RT/User_Overlay.pm:978
+msgid "Permission Denied"
+msgstr "權��足"
+
+#: html/Edit/Rights/index.html:3
+msgid "Permission Settings"
+msgstr "權�設定"
+
+#: NOT FOUND IN SOURCE
+msgid "Permitted Queues:"
+msgstr "�有權�表單列表："
+
+#: NOT FOUND IN SOURCE
+msgid "Personal"
+msgstr "代�人群組"
+
+#: html/User/Elements/Tabs:34
+msgid "Personal Groups"
+msgstr "代�人群組"
+
+#: NOT FOUND IN SOURCE
+msgid "Personal Todo"
+msgstr "�人待辦事項"
+
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
+msgid "Personal groups"
+msgstr "代�人群組"
+
+#: html/User/Elements/DelegateRights:36
+msgid "Personal groups:"
+msgstr "代�人群組："
+
+#: html/Work/Preferences/Info:24
+msgid "PersonalHomepage"
+msgstr "個人首�"
+
+#: NOT FOUND IN SOURCE
+msgid "Phone"
+msgstr "電話"
+
+#: html/Work/Delegates/Info:90 html/Work/Overview/Info:72
+msgid "Phone number"
+msgstr "電話號碼"
+
+#: html/Admin/Users/Modify.html:155 html/User/Prefs.html:48 html/Work/Preferences/Info:30
+msgid "Phone numbers"
+msgstr "電話號碼"
+
+#: html/Edit/Users/Add.html:3 html/Work/Delegates/Add.html:3 html/Work/Delegates/Info:34 html/Work/Tickets/ModifyPeople.html:2
+msgid "Pick"
+msgstr "挑�"
+
+#: NOT FOUND IN SOURCE
+msgid "Place of Departure"
+msgstr "出發地點"
+
+#: NOT FOUND IN SOURCE
+msgid "Placeholder"
+msgstr "尚未完工"
+
+#: html/Edit/Elements/PickUsers:31 html/Edit/Elements/PickUsers:44 html/Edit/Elements/SelectCustomFieldType:3 html/Work/Elements/SelectOwner:3 html/Work/Tickets/Elements/EditCustomField:183 html/Work/Tickets/Elements/EditCustomField:75 html/Work/Tickets/Elements/EditCustomFieldEntries:81 html/Work/Tickets/Elements/EditCustomFieldEntries:88
+msgid "Please Select"
+msgstr "請�擇"
+
+#: html/Edit/Elements/104Buttons:30
+msgid "Please check items to be deleted first."
+msgstr "請先�中�刪除的�象"
+
+#: NOT FOUND IN SOURCE
+msgid "Please select a group"
+msgstr "請�擇群組"
+
+#: NOT FOUND IN SOURCE
+msgid "Please select a queue's workflow"
+msgstr "請�擇表單�程"
+
+#: NOT FOUND IN SOURCE
+msgid "Please select role"
+msgstr "請�擇角色"
+
+#: NOT FOUND IN SOURCE
+msgid "Policy"
+msgstr "經營�章"
+
+#: NOT FOUND IN SOURCE
+msgid "Position"
+msgstr "�務"
+
+#: html/Edit/Users/Info:42
+msgid "Position Level"
+msgstr "�等"
+
+#: html/Edit/Elements/PickUsers:41 html/Edit/Global/UserRight/List:13 html/Edit/Global/UserRight/Top:23 html/Edit/Users/Add.html:41 html/Edit/Users/List:11 html/Edit/Users/Top:22 html/Work/Delegates/Add.html:26 html/Work/Delegates/Info:84 html/Work/Overview/Info:66
+msgid "Position Name"
+msgstr "�務�稱"
+
+#: html/Edit/Global/UserRight/List:14 html/Edit/Global/UserRight/Top:33 html/Edit/Users/List:12 html/Edit/Users/Top:32
+msgid "Position Number"
+msgstr "�務代碼"
+
+#: html/Edit/Users/Info:43
+msgid "Position Rank"
+msgstr "�級"
+
+#: NOT FOUND IN SOURCE
+msgid "Pref"
+msgstr "�好"
+
+#: html/Edit/Elements/104Top:26 html/Elements/Header:51 html/Elements/Tabs:52 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27 html/Work/Elements/Tab:43
+msgid "Preferences"
+msgstr "�好"
+
+#: NOT FOUND IN SOURCE
+msgid "Prefs"
+msgstr "個人資訊"
+
+#: lib/RT/Action/Generic.pm:159
+msgid "Prepare Stubbed"
+msgstr "�備動作完畢"
+
+#: html/Ticket/Elements/Tabs:60
+msgid "Prev"
+msgstr "上一項"
+
+#: html/Search/Listing.html:43 html/Work/Search/index.html:20
+msgid "Previous page"
+msgstr "�一�"
+
+#: NOT FOUND IN SOURCE
+msgid "Pri"
+msgstr "優先順�"
+
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
+#. ($args{'PrincipalId'})
+msgid "Principal %1 not found."
+msgstr "找�到單� %1。"
+
+#: html/Search/Elements/PickRestriction:53 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:38 html/Work/Search/PickRestriction:34 lib/RT/Tickets_Overlay.pm:1042
+msgid "Priority"
+msgstr "優先順�"
+
+#: html/Admin/Elements/ModifyQueue:50 html/Admin/Queues/Modify.html:64
+msgid "Priority starts at"
+msgstr "優先順�起始值"
+
+#: etc/initialdata.zh:43 etc/initialdata:25
+msgid "Privileged"
+msgstr "內部�員"
+
+#: html/Admin/Users/Modify.html:270 html/User/Prefs.html:162 html/Work/Preferences/Info:158
+#. (loc_fuzzy($msg))
+msgid "Privileged status: %1"
+msgstr "內部�員狀態：%1"
+
+#: html/Admin/Users/index.html:61
+msgid "Privileged users"
+msgstr "內部�員"
+
+#: html/Work/Elements/SelectSearch:16
+msgid "Process Status"
+msgstr "處�狀態"
+
+#: etc/initialdata.zh:41 etc/initialdata.zh:47 etc/initialdata.zh:53 etc/initialdata.zh:77 etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
+msgid "Pseudogroup for internal use"
+msgstr "內部用的虛擬群組"
+
+#: html/Work/Preferences/Info:68
+msgid "Public Info"
+msgstr "公開資訊"
+
+#: html/Work/Elements/104Header:88
+msgid "Public Service"
+msgstr "公共事務�"
+
+#: html/Edit/Users/Search.html:4
+msgid "Query"
+msgstr "查詢"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:166 html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Elements/Quicksearch:28 html/Search/Elements/PickRestriction:45 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:63 html/Ticket/Elements/ShowBasics:42 html/User/Elements/DelegateRights:79 html/Work/Elements/MyApprovals:10 html/Work/Elements/MyRequests:17 html/Work/Elements/MyTickets:17 html/Work/Elements/Quicksearch:14 html/Work/Search/PickRestriction:26 lib/RT/Tickets_Overlay.pm:883
+msgid "Queue"
+msgstr "表單"
+
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43 html/Admin/Queues/Workflows.html:44
+#. ($Queue)
+#. ($id)
+msgid "Queue %1 not found"
+msgstr "找�到表單 %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue '%1' not found\\n"
+msgstr "找�到表單 '%1'\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Keyword Selections"
+msgstr "表單關�字��"
+
+#: html/Admin/Elements/ModifyQueue:30 html/Admin/Queues/Modify.html:42 html/Edit/Queues/Basic/Top:12 html/Edit/Queues/Basic/index.html:36 html/Edit/Queues/Global:21 html/Edit/Queues/List:6 html/Edit/Users/Queue:10 html/Work/Delegates/List:6 html/Work/Elements/List:11 html/Work/Queues/List:5 html/Work/Tickets/Create.html:22 html/Work/Tickets/Elements/ShowBasics:6
+msgid "Queue Name"
+msgstr "表單�稱"
+
+#: html/Edit/Queues/List:8 html/Work/Elements/List:25 html/Work/Queues/List:7 html/Work/Tickets/Create.html:35 html/Work/Tickets/Elements/ShowBasics:19
+msgid "Queue Owner"
+msgstr "業務承辦人"
+
+#: html/Edit/Queues/Basic/Top:35
+msgid "Queue Priority"
+msgstr "優先等級"
+
+#: html/Edit/Global/GroupRight/Top:24 html/Edit/Global/UserRight/Top:43 html/Edit/Users/Queue:11 html/Edit/Users/index.html:124
+msgid "Queue Rights"
+msgstr "表單權�"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Scrips"
+msgstr "表單手續"
+
+#: html/Edit/Elements/Tab:38
+msgid "Queue Setup"
+msgstr "表單設定"
+
+#: lib/RT/Queue_Overlay.pm:264
+msgid "Queue already exists"
+msgstr "表單已存在"
+
+#: lib/RT/Queue_Overlay.pm:273 lib/RT/Queue_Overlay.pm:279
+msgid "Queue could not be created"
+msgstr "無法新增表單"
+
+#: html/Edit/Queues/autohandler:8 html/Ticket/Create.html:204 html/Work/Tickets/Create.html:185
+msgid "Queue could not be loaded."
+msgstr "無法載入表單"
+
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:283
+msgid "Queue created"
+msgstr "表單新增完畢"
+
+#: html/Admin/Elements/ModifyWorkflow:32
+msgid "Queue is not specified."
+msgstr "未指定表單。"
+
+#: html/SelfService/Display.html:70 lib/RT/CustomField_Overlay.pm:97
+msgid "Queue not found"
+msgstr "找�到表單"
+
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
+msgid "Queues"
+msgstr "表單"
+
+#: html/Work/Elements/Quicksearch:10
+msgid "Quick Search"
+msgstr "表單��"
+
+#: html/Elements/Quicksearch:24
+msgid "Quick search"
+msgstr "表單一覽"
+
+#: html/Elements/Login:44
+#. ($RT::VERSION)
+msgid "RT %1"
+msgstr "RT %1"
+
+#: docs/design_docs/string-extraction-guide.txt:70
+#. ($RT::VERSION, $RT::rtname)
+msgid "RT %1 for %2"
+msgstr "%2：RT %1 版"
+
+#: html/Elements/Footer:32
+#. ($RT::VERSION)
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr "RT %1 版，<a href=\"http://bestpractical.com\">Best Practical Solutions 公�</a>出�。"
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1。版權所有 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1。版權所有 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: html/Admin/index.html:24 html/Admin/index.html:25
+msgid "RT Administration"
+msgstr "RT 管���"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Authentication error."
+msgstr "RT �證錯誤。"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Bounce: %1"
+msgstr "RT 退信：%1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Configuration error"
+msgstr "RT 設定錯誤"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Critical error. Message not recorded!"
+msgstr "RT 致命錯誤。訊�未被紀錄。"
+
+#: html/Elements/Error:41 html/SelfService/Error.html:40
+msgid "RT Error"
+msgstr "RT 錯誤"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Received mail (%1) from itself."
+msgstr "RT 收到從自己寄出的郵件 (%1)。"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Recieved mail (%1) from itself."
+msgstr "RT 收到從自己寄出的郵件 (%1)。"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Self Service / Closed Tickets"
+msgstr "RT 自助�務/已解決的申請單"
+
+#: html/index.html:24 html/index.html:27
+msgid "RT at a glance"
+msgstr "RT 一覽"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't authenticate you"
+msgstr "RT 無法�證你"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find requestor via its external database lookup"
+msgstr "RT 無法從外部資料庫查詢找到申請人資訊"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find the queue: %1"
+msgstr "RT 找�到表單：%1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't validate this PGP signature. \\n"
+msgstr "RT 無法確�這個 PGP 簽章。\\n"
+
+#: html/Edit/Elements/104Header:7 html/Edit/Elements/104Top:20 html/Elements/PageLayout:85 html/Work/Elements/104Header:7
+#. ($RT::rtname)
+msgid "RT for %1"
+msgstr "%1 專用�程系統"
+
+#: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr "%1 專用 RT 系統：%2"
+
+#: NOT FOUND IN SOURCE
+msgid "RT has proccessed your commands"
+msgstr "RT 已執行您的命令"
+
+#: html/Elements/Login:94
+#. ('2003')
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT 版權所有 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;。<br>本軟體� <a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU 通用公共授權第二版</a> 散佈。"
+
+#: NOT FOUND IN SOURCE
+msgid "RT thinks this message may be a bounce"
+msgstr "RT �為這�能是退信"
+
+#: NOT FOUND IN SOURCE
+msgid "RT will process this message as if it were unsigned.\\n"
+msgstr "RT 以未簽章方�處�這�郵件。\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+msgstr "RT 的電�郵件命令模�須� PGP �證。您�能沒有簽章，或是您的簽章無法辨識。"
+
+#: NOT FOUND IN SOURCE
+msgid "RT::Queue-Role"
+msgstr "表單�行角色"
+
+#: NOT FOUND IN SOURCE
+msgid "RT::System-Role"
+msgstr "系統�行角色"
+
+#: NOT FOUND IN SOURCE
+msgid "RT::Ticket-Role"
+msgstr "申請單�行角色"
+
+#: html/Work/Tickets/Elements/ShowTransaction:11
+msgid "RT_System"
+msgstr "系統訊�"
+
+#: html/Admin/Users/Modify.html:57 html/Admin/Users/Prefs.html:51 html/User/Prefs.html:43 html/Work/Preferences/Info:18
+msgid "Real Name"
+msgstr "真實姓�"
+
+#: html/Admin/Elements/ModifyUser:47
+msgid "RealName"
+msgstr "真實姓�"
+
+#: html/Work/Approvals/Display.html:27 html/Work/Tickets/Update.html:85
+msgid "Really reject this ticket?"
+msgstr "您確定��回這張申請單嗎？"
+
+#: html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:50 html/Ticket/Elements/EditLinks:138 html/Ticket/Elements/EditLinks:93 html/Ticket/Elements/ShowLinks:70 html/Work/Search/BulkLinks:26
+msgid "Referred to by"
+msgstr "被�考"
+
+#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:46 html/Ticket/Elements/EditLinks:134 html/Ticket/Elements/EditLinks:79 html/Ticket/Elements/ShowLinks:60 html/Work/Search/BulkLinks:22
+msgid "Refers to"
+msgstr "�考"
+
+#: NOT FOUND IN SOURCE
+msgid "RefersTo"
+msgstr "�考"
+
+#: NOT FOUND IN SOURCE
+msgid "Refine"
+msgstr "在�果範�內查詢"
+
+#: html/Search/Elements/PickRestriction:26 html/Work/Search/PickRestriction:7
+msgid "Refine search"
+msgstr "調整查詢�件"
+
+#: html/Work/Overview/index.html:12
+msgid "Refresh"
+msgstr "æ›´æ–°"
+
+#: html/Elements/Refresh:35
+#. ($value/60)
+msgid "Refresh this page every %1 minutes."
+msgstr "� %1 分�更新��"
+
+#: html/Ticket/Create.html:173 html/Ticket/Elements/ShowSummary:61 html/Ticket/ModifyAll.html:56
+msgid "Relationships"
+msgstr "關係"
+
+#: html/Edit/Elements/ListButtons:13
+msgid "Remove"
+msgstr "移除"
+
+#: html/Search/Bulk.html:97 html/Work/Search/Bulk.html:77
+msgid "Remove AdminCc"
+msgstr "移除管�員副本"
+
+#: html/Search/Bulk.html:93 html/Work/Search/Bulk.html:71
+msgid "Remove Cc"
+msgstr "移除副本"
+
+#: html/Search/Bulk.html:89 html/Work/Search/Bulk.html:65
+msgid "Remove Requestor"
+msgstr "移除申請人"
+
+#: html/Ticket/Elements/ShowTransaction:160 html/Ticket/Elements/Tabs:121 html/Work/Tickets/Display.html:31 html/Work/Tickets/Elements/ShowTransaction:108
+msgid "Reply"
+msgstr "回覆"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "Reply to tickets"
+msgstr "�申請單進行回覆"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "ReplyToTicket"
+msgstr "回覆申請單"
+
+#: html/Edit/Users/Info:45
+msgid "Report to Duty"
+msgstr "上下�刷�"
+
+#: html/Edit/Users/Info:33
+msgid "Reported on"
+msgstr "到�日期"
+
+#: etc/initialdata.zh:62 etc/initialdata:44 html/Ticket/Update.html:39 html/Work/Elements/List:21 html/Work/Elements/MyApprovals:12 html/Work/Elements/MyTickets:20 html/Work/Elements/SelectSearch:30 html/Work/Tickets/Elements/ShowBasics:62 lib/RT/ACE_Overlay.pm:86
+msgid "Requestor"
+msgstr "申請人"
+
+#: html/Edit/Global/Workflow/Owner.html:44
+msgid "Requestor Group's"
+msgstr "申請人所屬群組之"
+
+#: html/Search/Elements/PickRestriction:37 html/Work/Search/PickRestriction:17
+msgid "Requestor email address"
+msgstr "申請人電�郵件信箱��"
+
+#: html/Edit/Global/Workflow/Owner.html:28
+msgid "Requestor's"
+msgstr "申請人所屬之第上"
+
+#: html/Work/Elements/List:23
+msgid "Requestor's Phone"
+msgstr "申請人電話"
+
+#: NOT FOUND IN SOURCE
+msgid "Requestor(s)"
+msgstr "申請人"
+
+#: NOT FOUND IN SOURCE
+msgid "RequestorAddresses"
+msgstr "申請人地�"
+
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
+msgid "Requestors"
+msgstr "申請人"
+
+#: html/Admin/Elements/ModifyQueue:60 html/Admin/Queues/Modify.html:74
+msgid "Requests should be due in"
+msgstr "申請單處�期�"
+
+#: html/Elements/Submit:61
+msgid "Reset"
+msgstr "�設"
+
+#: html/Admin/Users/Modify.html:158 html/User/Prefs.html:49 html/Work/Preferences/Info:32
+msgid "Residence"
+msgstr "�處"
+
+#: NOT FOUND IN SOURCE
+msgid "Resolution"
+msgstr "解決狀態"
+
+#: html/Ticket/Elements/Tabs:131 html/Work/Tickets/Display.html:34
+msgid "Resolve"
+msgstr "解決"
+
+#: html/Ticket/Update.html:136 html/Work/Tickets/Update.html:120
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Resolve ticket #%1 (%2)"
+msgstr "解決申請單 #%1 (%2)"
+
+#: etc/initialdata.zh:331 etc/initialdata:308 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1188
+msgid "Resolved"
+msgstr "已解決"
+
+#: html/Search/Bulk.html:132 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:71 html/Work/Search/Bulk.html:84 html/Work/Tickets/Update.html:38
+msgid "Response to requestors"
+msgstr "回覆申請人"
+
+#: html/Edit/Users/Info:44
+msgid "Responsibility Type"
+msgstr "責任�分"
+
+#: html/Elements/ListActions:25
+msgid "Results"
+msgstr "�果"
+
+#: html/Search/Elements/PickRestriction:104 html/Work/Search/PickRestriction:84
+msgid "Results per page"
+msgstr "��列出幾筆�果"
+
+#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:99 html/User/Prefs.html:71 html/Work/Preferences/Info:54
+msgid "Retype Password"
+msgstr "�次輸入密碼"
+
+#: NOT FOUND IN SOURCE
+msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+msgstr "在 %4 (%5) 的範�內找�到 %2 %3 的 %1 權�\\n"
+
+#: lib/RT/ACE_Overlay.pm:612
+msgid "Right Delegated"
+msgstr "權�代�完畢"
+
+#: lib/RT/ACE_Overlay.pm:302
+msgid "Right Granted"
+msgstr "權�設定完畢"
+
+#: lib/RT/ACE_Overlay.pm:160
+msgid "Right Loaded"
+msgstr "權�載入完畢"
+
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
+msgid "Right could not be revoked"
+msgstr "無法撤消權�"
+
+#: html/User/Delegation.html:63
+msgid "Right not found"
+msgstr "找�到權�"
+
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
+msgid "Right not loaded."
+msgstr "權�並未載入。"
+
+#: lib/RT/ACE_Overlay.pm:688
+msgid "Right revoked"
+msgstr "權�撤消完畢"
+
+#: html/Admin/Elements/UserTabs:40
+msgid "Rights"
+msgstr "權��代�人"
+
+#: lib/RT/Interface/Web.pm:794 x:797
+#. ($object_type)
+msgid "Rights could not be granted for %1"
+msgstr "無法將權�賦予 %1"
+
+#: lib/RT/Interface/Web.pm:827 x:830
+#. ($object_type)
+msgid "Rights could not be revoked for %1"
+msgstr "無法撤消 %1 的權�"
+
+#: html/Edit/Groups/Member:55 html/Edit/Groups/Members/List:10
+msgid "Role Members"
+msgstr "角色�員"
+
+#: html/Edit/Groups/Member:37 html/Edit/Groups/Members/Add.html:13 html/Edit/Groups/Members/List:7 html/Edit/Groups/Roles/List:4 html/Edit/Groups/Roles/Top:7
+msgid "Role Name"
+msgstr "角色�稱"
+
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52 html/Edit/Global/Workflow/Owner.html:55 html/Edit/Global/Workflow/Owner.html:81 html/Edit/Groups/Member:24
+msgid "Roles"
+msgstr "角色"
+
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr "交由系統管�員簽核"
+
+#: html/Edit/Global/Workflow/Action:27
+msgid "Run Approval"
+msgstr "簽核執行"
+
+#: html/Edit/Global/Basic/Top:72
+msgid "SMTPDebug"
+msgstr "SMTP �錯紀錄"
+
+#: html/Edit/Global/Basic/Top:58
+msgid "SMTPFrom"
+msgstr "SMTP 寄件��"
+
+#: html/Edit/Global/Basic/Top:56
+msgid "SMTPServer"
+msgstr "SMTP 伺�器"
+
+#: NOT FOUND IN SOURCE
+msgid "Sat"
+msgstr "星期六"
+
+#: lib/RT/Date.pm:393
+msgid "Sat."
+msgstr "星期六"
+
+#: html/Edit/Elements/104Buttons:72 html/Work/Preferences/index.html:35
+msgid "Save"
+msgstr "儲存"
+
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
+msgid "Save Changes"
+msgstr "儲存更改"
+
+#: NOT FOUND IN SOURCE
+msgid "Save changes"
+msgstr "儲存更改"
+
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
+#. ($QueueObj->id)
+#. ($ARGS{'id'})
+msgid "Scrip #%1"
+msgstr "手續 #%1"
+
+#: html/Edit/Global/Scrip/List:9 html/Edit/Global/Scrip/Top:41
+msgid "Scrip Action"
+msgstr "訊�通知動作"
+
+#: html/Edit/Global/Scrip/List:8 html/Edit/Global/Scrip/Top:15
+msgid "Scrip Condition"
+msgstr "訊�通知�件"
+
+#: lib/RT/Scrip_Overlay.pm:175
+msgid "Scrip Created"
+msgstr "手續新增完畢"
+
+#: html/Edit/Global/Scrip/List:7 html/Edit/Global/Scrip/Top:9
+msgid "Scrip Name"
+msgstr "訊��稱"
+
+#: html/Admin/Elements/EditScrips:83
+msgid "Scrip deleted"
+msgstr "手續刪除完畢"
+
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
+msgid "Scrips"
+msgstr "手續"
+
+#: html/Edit/Global/autohandler:9 html/Edit/Queues/autohandler:20
+msgid "Scrips "
+msgstr "訊�通知"
+
+#: NOT FOUND IN SOURCE
+msgid "Scrips for %1\\n"
+msgstr "%1 的手續\\n"
+
+#: html/Admin/Queues/Scrips.html:33
+msgid "Scrips which apply to all queues"
+msgstr "�用於所有表單的手續"
+
+#: html/Edit/Elements/104Buttons:75 html/Elements/SimpleSearch:26 html/Search/Elements/PickRestriction:125 html/Ticket/Elements/Tabs:158 html/Work/Elements/Tab:45 html/Work/Search/PickRestriction:102
+msgid "Search"
+msgstr "查詢"
+
+#: NOT FOUND IN SOURCE
+msgid "Search Criteria"
+msgstr "查詢�件"
+
+#: html/Approvals/Elements/PendingMyApproval:38
+msgid "Search for approvals"
+msgstr "簽核單查詢"
+
+#: html/Edit/Global/Workflow/Owner.html:31
+msgid "Second-"
+msgstr "二"
+
+#: html/Edit/Users/Info:40
+msgid "Second-level Users"
+msgstr "二階主管員工"
+
+#: bin/rt-crontool:187
+msgid "Security:"
+msgstr "安全性："
+
+#: lib/RT/Queue_Overlay.pm:66
+msgid "SeeQueue"
+msgstr "查閱表單"
+
+#: html/Edit/Elements/ListButtons:10
+msgid "Select All"
+msgstr "全�"
+
+#: html/Admin/Groups/index.html:39
+msgid "Select a group"
+msgstr "�擇群組"
+
+#: NOT FOUND IN SOURCE
+msgid "Select a queue"
+msgstr "�擇表單"
+
+#: html/Work/Queues/Select.html:8
+msgid "Select a queue to link to"
+msgstr "請�擇欲連�表單"
+
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
+msgid "Select a user"
+msgstr "�擇使用者"
+
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
+msgid "Select custom field"
+msgstr "�擇自訂欄�"
+
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
+msgid "Select group"
+msgstr "�擇群組"
+
+#: lib/RT/CustomField_Overlay.pm:421
+msgid "Select multiple values"
+msgstr "�擇多�項目"
+
+#: lib/RT/CustomField_Overlay.pm:418
+msgid "Select one value"
+msgstr "�擇單一項目"
+
+#: html/Admin/Elements/QueueTabs:66
+msgid "Select queue"
+msgstr "�擇表單"
+
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
+msgid "Select scrip"
+msgstr "�擇手續"
+
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
+msgid "Select template"
+msgstr "�擇範本"
+
+#: html/Admin/Elements/UserTabs:48
+msgid "Select user"
+msgstr "�擇使用者"
+
+#: html/Admin/Global/Workflow.html:57 html/Admin/Global/Workflows.html:36 html/Admin/Queues/Workflow.html:54 html/Admin/Queues/Workflows.html:47
+msgid "Select workflow"
+msgstr "�擇�程"
+
+#: NOT FOUND IN SOURCE
+msgid "SelectExternal"
+msgstr "系統�項"
+
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectMultiple"
+msgstr "多��項"
+
+#: lib/RT/CustomField_Overlay.pm:34
+msgid "SelectSingle"
+msgstr "單一�項"
+
+#: html/Edit/Elements/PickUsers:85 html/Edit/Users/Add.html:78
+msgid "Selected users:"
+msgstr "新增�象："
+
+#: NOT FOUND IN SOURCE
+msgid "Self Service"
+msgstr "自助�務"
+
+#: etc/initialdata.zh:131 etc/initialdata:113
+msgid "Send mail to all watchers"
+msgstr "寄信給所有視察員"
+
+#: etc/initialdata.zh:127 etc/initialdata:109
+msgid "Send mail to all watchers as a \"comment\""
+msgstr "以評論方�寄信給所有視察員"
+
+#: etc/initialdata.zh:122 etc/initialdata:104
+msgid "Send mail to requestors and Ccs"
+msgstr "寄信給申請人�副本收件人"
+
+#: etc/initialdata.zh:117 etc/initialdata:99
+msgid "Send mail to requestors and Ccs as a comment"
+msgstr "以評論方�寄信給申請人�副本收件人"
+
+#: etc/initialdata.zh:96 etc/initialdata:78
+msgid "Sends a message to the requestors"
+msgstr "寄信給申請人"
+
+#: etc/initialdata.zh:135 etc/initialdata.zh:139 etc/initialdata:117 etc/initialdata:121
+msgid "Sends mail to explicitly listed Ccs and Bccs"
+msgstr "寄信給特定的副本�密件副本收件人"
+
+#: etc/initialdata.zh:112 etc/initialdata:94
+msgid "Sends mail to the administrative Ccs"
+msgstr "寄信給管�員副本收件人"
+
+#: etc/initialdata.zh:108 etc/initialdata:90
+msgid "Sends mail to the administrative Ccs as a comment"
+msgstr "以評論寄信給管�員副本收件人"
+
+#: etc/initialdata.zh:100 etc/initialdata.zh:104 etc/initialdata:82 etc/initialdata:86
+msgid "Sends mail to the owner"
+msgstr "寄信給申請人"
+
+#: NOT FOUND IN SOURCE
+msgid "Sep"
+msgstr "�月"
+
+#: lib/RT/Date.pm:419
+msgid "Sep."
+msgstr "09"
+
+#: NOT FOUND IN SOURCE
+msgid "September"
+msgstr "�月"
+
+#: html/Edit/Users/Info:38
+msgid "Shift Type"
+msgstr "�別屬性"
+
+#: NOT FOUND IN SOURCE
+msgid "Show Results"
+msgstr "顯示�果"
+
+#: html/Approvals/Elements/PendingMyApproval:43
+msgid "Show approved requests"
+msgstr "顯示已批准的簽核單"
+
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
+msgid "Show basics"
+msgstr "顯示基本資訊"
+
+#: html/Approvals/Elements/PendingMyApproval:44
+msgid "Show denied requests"
+msgstr "顯示已�回的簽核單"
+
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
+msgid "Show details"
+msgstr "顯示細節"
+
+#: html/Approvals/Elements/PendingMyApproval:42
+msgid "Show pending requests"
+msgstr "顯示待處�的簽核單"
+
+#: html/Approvals/Elements/PendingMyApproval:45
+msgid "Show requests awaiting other approvals"
+msgstr "顯示尚待他人批准的簽核單"
+
+#: lib/RT/Queue_Overlay.pm:80
+msgid "Show ticket private commentary"
+msgstr "顯示申請單內的�人評論"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "Show ticket summaries"
+msgstr "顯示申請單摘�"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "ShowACL"
+msgstr "顯示權�清單"
+
+#: lib/RT/Queue_Overlay.pm:77
+msgid "ShowScrips"
+msgstr "顯示手續"
+
+#: lib/RT/Queue_Overlay.pm:74
+msgid "ShowTemplate"
+msgstr "顯示範本"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "ShowTicket"
+msgstr "顯示申請單"
+
+#: lib/RT/Queue_Overlay.pm:80
+msgid "ShowTicketComments"
+msgstr "顯示申請單的評論"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "Sign up as a ticket Requestor or ticket or queue Cc"
+msgstr "登記�為申請人或副本收件人"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Sign up as a ticket or queue AdminCc"
+msgstr "登記�為管�員副本收件人"
+
+#: html/Admin/Elements/ModifyUser:38 html/Admin/Users/Modify.html:190 html/Admin/Users/Prefs.html:31 html/User/Prefs.html:111 html/Work/Preferences/Info:111
+msgid "Signature"
+msgstr "簽�檔"
+
+#: NOT FOUND IN SOURCE
+msgid "Signed in as %1"
+msgstr "使用者：%1"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:25
+msgid "Single"
+msgstr "單一"
+
+#: html/Edit/Elements/104Top:21 html/Elements/Header:50
+msgid "Skip Menu"
+msgstr "略��單"
+
+#: html/Admin/Elements/AddCustomFieldValue:27
+msgid "Sort"
+msgstr "順�"
+
+#: NOT FOUND IN SOURCE
+msgid "Sort key"
+msgstr "排�方�"
+
+#: html/Search/Elements/PickRestriction:108 html/Work/Search/PickRestriction:89
+msgid "Sort results by"
+msgstr "�果排�方�"
+
+#: NOT FOUND IN SOURCE
+msgid "SortOrder"
+msgstr "排�順�"
+
+#: html/Work/Elements/List:8 html/Work/Elements/MyApprovals:11
+msgid "Stage"
+msgstr "關�"
+
+#: html/Edit/Global/Workflow/Top:8
+msgid "Stage Action"
+msgstr "關��行動作"
+
+#: html/Edit/Global/Workflow/Top:5
+msgid "Stage Condition"
+msgstr "關��行�件"
+
+#: html/Work/Elements/Quicksearch:17
+msgid "Stalled"
+msgstr "延宕"
+
+#: NOT FOUND IN SOURCE
+msgid "Start page"
+msgstr "首�"
+
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:34
+msgid "Started"
+msgstr "實際起始日"
+
+#: NOT FOUND IN SOURCE
+msgid "Started date '%1' could not be parsed"
+msgstr "無法解讀起始日期 '%1"
+
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:30
+msgid "Starts"
+msgstr "應起始日"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts By"
+msgstr "應起始日"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts date '%1' could not be parsed"
+msgstr "無法解讀起始日期 '%1"
+
+#: html/Admin/Elements/ModifyUser:81 html/Admin/Users/Modify.html:137 html/User/Prefs.html:93 html/Work/Preferences/Info:83
+msgid "State"
+msgstr "å·ž"
+
+#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Search/Elements/PickRestriction:73 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:37 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:59 html/Work/Elements/List:15 html/Work/Elements/MyRequests:18 html/Work/Elements/MyTickets:18 html/Work/Search/PickRestriction:54 html/Work/Tickets/Update.html:22 lib/RT/Ticket_Overlay.pm:1182 lib/RT/Tickets_Overlay.pm:908
+msgid "Status"
+msgstr "��"
+
+#: etc/initialdata.zh:317 etc/initialdata:294
+msgid "Status Change"
+msgstr "��改變時"
+
+#: lib/RT/Transaction_Overlay.pm:528
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
+msgid "Status changed from %1 to %2"
+msgstr "��從 %1 改為 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr "��改變時"
+
+#: html/Ticket/Elements/Tabs:146
+msgid "Steal"
+msgstr "強制更�承辦人"
+
+#: lib/RT/Queue_Overlay.pm:91
+msgid "Steal tickets"
+msgstr "強制承辦申請單"
+
+#: lib/RT/Queue_Overlay.pm:91
+msgid "StealTicket"
+msgstr "強制承辦申請單"
+
+#: lib/RT/Transaction_Overlay.pm:587
+#. ($Old->Name)
+msgid "Stolen from %1 "
+msgstr "被 %1 強制更� "
+
+#: html/Edit/Groups/Member:69
+msgid "Subgroup"
+msgstr "�群組"
+
+#: html/Elements/MyRequests:28 html/Elements/MyTickets:28 html/Search/Bulk.html:135 html/Search/Elements/PickRestriction:42 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:27 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:75 html/Work/Elements/MyApprovals:9 html/Work/Elements/MyRequests:16 html/Work/Elements/MyTickets:16 html/Work/Search/Bulk.html:87 html/Work/Search/PickRestriction:22 html/Work/Tickets/Create.html:131 html/Work/Tickets/Elements/ShowBasics:36 lib/RT/Ticket_Overlay.pm:1178 lib/RT/Tickets_Overlay.pm:987
+msgid "Subject"
+msgstr "主題"
+
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/Transaction_Overlay.pm:609
+#. ($self->Data)
+msgid "Subject changed to %1"
+msgstr "標題已改為 %1"
+
+#: html/Elements/Submit:58 html/Work/Search/Bulk.html:103
+msgid "Submit"
+msgstr "�出"
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr "�出�程"
+
+#: lib/RT/Group_Overlay.pm:748
+msgid "Succeeded"
+msgstr "設定�功"
+
+#: NOT FOUND IN SOURCE
+msgid "Sun"
+msgstr "星期日"
+
+#: lib/RT/Date.pm:394
+msgid "Sun."
+msgstr "星期日"
+
+#: html/Edit/Users/System:17 lib/RT/System.pm:53
+msgid "SuperUser"
+msgstr "系統管�員"
+
+#: html/User/Elements/DelegateRights:76
+msgid "System"
+msgstr "系統"
+
+#: html/Edit/Global/Scrip/Top:18 html/Edit/Global/Scrip/Top:44
+msgid "System Defined"
+msgstr "系統定義"
+
+#: html/Admin/Elements/SelectRights:80 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:793 lib/RT/Interface/Web.pm:826 x:796 x:829
+msgid "System Error"
+msgstr "系統錯誤"
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. Right not granted."
+msgstr "系統錯誤。設定權�失敗。"
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. right not granted"
+msgstr "系統錯誤。設定權�失敗。"
+
+#: html/Edit/Users/index.html:122
+msgid "System Rights"
+msgstr "系統權�"
+
+#: lib/RT/ACE_Overlay.pm:615
+msgid "System error. Right not delegated."
+msgstr "系統錯誤。權�代�失敗。"
+
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
+msgid "System error. Right not granted."
+msgstr "系統錯誤。設定權�失敗。"
+
+#: NOT FOUND IN SOURCE
+msgid "System error. Unable to grant rights."
+msgstr "系統錯誤。無法設定權�。"
+
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
+msgid "System groups"
+msgstr "系統群組"
+
+#: NOT FOUND IN SOURCE
+msgid "SystemInternal"
+msgstr "系統內部用"
+
+#: etc/initialdata.zh:59 etc/initialdata.zh:65 etc/initialdata.zh:71 etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
+msgid "SystemRolegroup for internal use"
+msgstr "內部使用的系統角色群組"
+
+#: lib/RT/CurrentUser.pm:319
+msgid "TEST_STRING"
+msgstr "TEST_STRING"
+
+#: NOT FOUND IN SOURCE
+msgid "TabbedUI"
+msgstr "�籤介�"
+
+#: html/Ticket/Elements/Tabs:142
+msgid "Take"
+msgstr "��"
+
+#: lib/RT/Queue_Overlay.pm:89
+msgid "Take tickets"
+msgstr "自行承辦申請單"
+
+#: lib/RT/Queue_Overlay.pm:89
+msgid "TakeTicket"
+msgstr "自行承辦申請單"
+
+#: lib/RT/Transaction_Overlay.pm:573
+msgid "Taken"
+msgstr "已��"
+
+#: html/Admin/Elements/EditScrip:80
+msgid "Template"
+msgstr "範本"
+
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
+#. ($TemplateObj->Id())
+msgid "Template #%1"
+msgstr "範本 #%1"
+
+#: html/Edit/Global/Template/List:9 html/Edit/Global/Template/Top:17
+msgid "Template Content"
+msgstr "通知範本內容"
+
+#: html/Edit/Global/Template/List:8 html/Edit/Global/Template/Top:13
+msgid "Template Description"
+msgstr "通知範本�述"
+
+#: html/Edit/Global/Template/List:7 html/Edit/Global/Template/Top:9
+msgid "Template Name"
+msgstr "通知範本�稱"
+
+#: html/Admin/Elements/EditTemplates:88
+msgid "Template deleted"
+msgstr "範本已刪除"
+
+#: lib/RT/Scrip_Overlay.pm:152
+msgid "Template not found"
+msgstr "找�到範本"
+
+#: NOT FOUND IN SOURCE
+msgid "Template not found\\n"
+msgstr "找�到範本\\n"
+
+#: lib/RT/Template_Overlay.pm:352
+msgid "Template parsed"
+msgstr "範本剖�完畢"
+
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
+msgid "Templates"
+msgstr "範本"
+
+#: html/Edit/Global/autohandler:8 html/Edit/Queues/autohandler:19
+msgid "Templates "
+msgstr "通知範本"
+
+#: NOT FOUND IN SOURCE
+msgid "Templates for %1\\n"
+msgstr "找�到 %1 的範本\\n"
+
+#: lib/RT/Interface/Web.pm:894 x:897
+msgid "That is already the current value"
+msgstr "已經是目�欄�的值"
+
+#: lib/RT/CustomField_Overlay.pm:242
+msgid "That is not a value for this custom field"
+msgstr "這�是該自訂欄�的值"
+
+#: lib/RT/Ticket_Overlay.pm:1899
+msgid "That is the same value"
+msgstr "�樣的值"
+
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
+msgid "That principal already has that right"
+msgstr "這項單�已經�有該權�"
+
+#: lib/RT/Queue_Overlay.pm:633
+#. ($args{'Type'})
+msgid "That principal is already a %1 for this queue"
+msgstr "這項單�已經是這個表單的 %1"
+
+#: lib/RT/Ticket_Overlay.pm:1433
+#. ($self->loc($args{'Type'}))
+msgid "That principal is already a %1 for this ticket"
+msgstr "這項單�已經是這份申請單的 %1"
+
+#: lib/RT/Queue_Overlay.pm:732
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this queue"
+msgstr "這項單��是這個表單的 %1"
+
+#: lib/RT/Ticket_Overlay.pm:1550
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this ticket"
+msgstr "這項單��是這份申請單的 %1"
+
+#: lib/RT/Ticket_Overlay.pm:1895
+msgid "That queue does not exist"
+msgstr "此表單�存在"
+
+#: lib/RT/Ticket_Overlay.pm:3237
+msgid "That ticket has unresolved dependencies"
+msgstr "這份申請單有尚未解決的附屬申請單"
+
+#: NOT FOUND IN SOURCE
+msgid "That user already has that right"
+msgstr "使用者已具有該項權�"
+
+#: lib/RT/Ticket_Overlay.pm:3047
+msgid "That user already owns that ticket"
+msgstr "該使用者已經承辦這份申請單"
+
+#: lib/RT/Ticket_Overlay.pm:3019
+msgid "That user does not exist"
+msgstr "使用者�存在"
+
+#: lib/RT/User_Overlay.pm:376
+msgid "That user is already privileged"
+msgstr "這�使用者已經是內部�員"
+
+#: lib/RT/User_Overlay.pm:397
+msgid "That user is already unprivileged"
+msgstr "這�使用者屬於�內部�員群組"
+
+#: lib/RT/User_Overlay.pm:389
+msgid "That user is now privileged"
+msgstr "使用者加入內部�員群組完畢"
+
+#: lib/RT/User_Overlay.pm:410
+msgid "That user is now unprivileged"
+msgstr "這�使用者已加入�內部�員群組"
+
+#: NOT FOUND IN SOURCE
+msgid "That user is now unprivilegedileged"
+msgstr "這�使用者已加入�內部�員群組"
+
+#: lib/RT/Ticket_Overlay.pm:3040
+msgid "That user may not own tickets in that queue"
+msgstr "使用者�能沒有承辦表單裡的申請單"
+
+#: lib/RT/Link_Overlay.pm:205
+msgid "That's not a numerical id"
+msgstr "這�是一個數字編號"
+
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
+msgid "The Basics"
+msgstr "基本資訊"
+
+#: lib/RT/ACE_Overlay.pm:87
+msgid "The CC of a ticket"
+msgstr "申請單的副本收件人"
+
+#: lib/RT/ACE_Overlay.pm:88
+msgid "The administrative CC of a ticket"
+msgstr "申請單的管�員副本收件人"
+
+#: lib/RT/Ticket_Overlay.pm:2226
+msgid "The comment has been recorded"
+msgstr "評論已被紀錄"
+
+#: bin/rt-crontool:197
+msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
+msgstr "下列命令會找到 'general' 表單內所有�作中的申請單，並將其中 4 �時內未處�的申請單優先程度設為 99："
+
+#: bin/rt-commit-handler:755 bin/rt-commit-handler:765
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr "以下命令未被執行：\\n\\n"
+
+#: lib/RT/Interface/Web.pm:897 x:900
+msgid "The new value has been set."
+msgstr "新的欄�值設定完�。"
+
+#: lib/RT/ACE_Overlay.pm:85
+msgid "The owner of a ticket"
+msgstr "申請單的承辦人"
+
+#: lib/RT/ACE_Overlay.pm:86
+msgid "The requestor of a ticket"
+msgstr "申請單的申請人"
+
+#: html/Admin/Elements/EditUserComments:25
+msgid "These comments aren't generally visible to the user"
+msgstr "該使用者�會看見這些評論"
+
+#: html/Edit/Global/Workflow/Owner.html:32
+msgid "Third-"
+msgstr "三"
+
+#: NOT FOUND IN SOURCE
+msgid "This ticket %1 %2 (%3)\\n"
+msgstr "申請單 %1 %2 (%3)\\n"
+
+#: bin/rt-crontool:188
+msgid "This tool allows the user to run arbitrary perl modules from within RT."
+msgstr "此工具程�會讓使用者經由 RT 執行任�命令。"
+
+#: lib/RT/Transaction_Overlay.pm:251
+msgid "This transaction appears to have no content"
+msgstr "此項更動報告沒有內容"
+
+#: html/Ticket/Elements/ShowRequestor:46
+#. ($rows)
+msgid "This user's %1 highest priority tickets"
+msgstr "使用者�出的� %1 份優先處�申請單"
+
+#: NOT FOUND IN SOURCE
+msgid "This user's 25 highest priority tickets"
+msgstr "使用者�出的� 25 份優先處�申請單"
+
+#: NOT FOUND IN SOURCE
+msgid "Thu"
+msgstr "星期四"
+
+#: lib/RT/Date.pm:391
+msgid "Thu."
+msgstr "星期四"
+
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:163
+msgid "Ticket"
+msgstr "申請單"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1  %2"
+msgstr "申請單 # %1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1 Jumbo update: %2"
+msgstr "更新申請單 # %1 的全部資訊：%2"
+
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket #%1 Jumbo update: %2"
+msgstr "更新申請單 #%1 的全部資訊：%2"
+
+#: html/Approvals/Elements/ShowDependency:45
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Ticket #%1: %2"
+msgstr "申請單 #%1: %2"
+
+#: lib/RT/Ticket_Overlay.pm:605 lib/RT/Ticket_Overlay.pm:626
+#. ($self->Id, $QueueObj->Name)
+msgid "Ticket %1 created in queue '%2'"
+msgstr "申請單 #%1 �功新增於 '%2' 表單"
+
+#: bin/rt-commit-handler:759
+#. ($Ticket->Id)
+msgid "Ticket %1 loaded\\n"
+msgstr "載入申請單 %1\\n"
+
+#: html/Search/Bulk.html:212 html/Work/Search/Bulk.html:169
+#. ($Ticket->Id,$_)
+msgid "Ticket %1: %2"
+msgstr "申請單 %1：%2"
+
+#: html/Edit/Queues/Basic/Top:28 html/Edit/Queues/List:16 html/Work/Queues/List:9
+msgid "Ticket Due"
+msgstr "表單處�期�"
+
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket History # %1 %2"
+msgstr "申請單處�紀錄 # %1 %2"
+
+#: html/Work/Elements/List:6
+msgid "Ticket ID"
+msgstr "單號"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket Id"
+msgstr "申請單編號"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket Processing Due"
+msgstr "表單�行期�"
+
+#: etc/initialdata.zh:332 etc/initialdata:309
+msgid "Ticket Resolved"
+msgstr "申請單已解決"
+
+#: html/Edit/Queues/Basic/Top:18 html/Edit/Queues/Category/List:6 html/Edit/Queues/Category/Top:7 html/Edit/Queues/List:7 html/Edit/Queues/index.html:31 html/Work/Delegates/List:7 html/Work/Delegates/index.html:11 html/Work/Elements/List:12 html/Work/Elements/SelectSearch:9 html/Work/Queues/List:6 html/Work/Queues/Select.html:12 html/Work/Queues/index.html:11 html/Work/Tickets/Create.html:44 html/Work/Tickets/Elements/ShowBasics:34
+msgid "Ticket Type"
+msgstr "表單種類"
+
+#: html/Search/Elements/PickRestriction:62 html/Work/Search/PickRestriction:43
+msgid "Ticket attachment"
+msgstr "申請單附件"
+
+#: lib/RT/Tickets_Overlay.pm:1166
+msgid "Ticket content"
+msgstr "申請單內容"
+
+#: lib/RT/Tickets_Overlay.pm:1212
+msgid "Ticket content type"
+msgstr "申請單內容類別"
+
+#: lib/RT/Ticket_Overlay.pm:496 lib/RT/Ticket_Overlay.pm:505 lib/RT/Ticket_Overlay.pm:515 lib/RT/Ticket_Overlay.pm:615
+msgid "Ticket could not be created due to an internal error"
+msgstr "內部錯誤，無法新增申請單"
+
+#: lib/RT/Transaction_Overlay.pm:520
+msgid "Ticket created"
+msgstr "申請單新增完畢"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket creation failed"
+msgstr "申請單新增失敗"
+
+#: lib/RT/Transaction_Overlay.pm:525
+msgid "Ticket deleted"
+msgstr "申請單刪除完畢"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket id not found"
+msgstr "找�到申請單編號"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket killed"
+msgstr "申請單刪除完畢"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket not found"
+msgstr "找�到申請單"
+
+#: etc/initialdata.zh:318 etc/initialdata:295
+msgid "Ticket status changed"
+msgstr "申請單��已改變"
+
+#: html/Ticket/Update.html:38
+msgid "Ticket watchers"
+msgstr "申請單視察員"
+
+#: html/Elements/Tabs:46
+msgid "Tickets"
+msgstr "申請單"
+
+#: lib/RT/Tickets_Overlay.pm:1383
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr "申請單 %1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:1348
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr "申請單 %1 (%2)"
+
+#: NOT FOUND IN SOURCE
+msgid "Tickets I own"
+msgstr "待處�的申請單"
+
+#: NOT FOUND IN SOURCE
+msgid "Tickets I requested"
+msgstr "�出的申請單"
+
+#: html/Elements/ViewUser:25
+#. ($name)
+msgid "Tickets from %1"
+msgstr "%1 的申請單"
+
+#: html/Approvals/Elements/ShowDependency:26
+msgid "Tickets which depend on this approval:"
+msgstr "批准之後，�接續處�："
+
+#: html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
+msgid "Time Left"
+msgstr "剩餘時間"
+
+#: html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:42
+msgid "Time Worked"
+msgstr "處�時間"
+
+#: lib/RT/Tickets_Overlay.pm:1139
+msgid "Time left"
+msgstr "剩餘時間"
+
+#: html/Elements/Footer:36
+msgid "Time to display"
+msgstr "顯示時間"
+
+#: lib/RT/Tickets_Overlay.pm:1115
+msgid "Time worked"
+msgstr "已處�時間"
+
+#: NOT FOUND IN SOURCE
+msgid "TimeLeft"
+msgstr "剩餘時間"
+
+#: lib/RT/Ticket_Overlay.pm:1183
+msgid "TimeWorked"
+msgstr "已處�時間"
+
+#: bin/rt-commit-handler:401
+msgid "To generate a diff of this commit:"
+msgstr "產生這次更動的差異檔："
+
+#: bin/rt-commit-handler:390
+msgid "To generate a diff of this commit:\\n"
+msgstr "產生這次更動的差異檔：\\n"
+
+#: lib/RT/Ticket_Overlay.pm:1186
+msgid "Told"
+msgstr "告知日期"
+
+#: html/Edit/Elements/Page:46
+msgid "Total"
+msgstr "é �"
+
+#: etc/initialdata.zh:239 etc/initialdata:237
+msgid "Transaction"
+msgstr "æ›´å‹•"
+
+#: lib/RT/Transaction_Overlay.pm:640
+#. ($self->Data)
+msgid "Transaction %1 purged"
+msgstr "清除更動報告 %1"
+
+#: lib/RT/Transaction_Overlay.pm:177
+msgid "Transaction Created"
+msgstr "更動報告已新增"
+
+#: lib/RT/Transaction_Overlay.pm:88
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr "未指定申請單編號，無法新增更動"
+
+#: lib/RT/Transaction_Overlay.pm:699
+msgid "Transactions are immutable"
+msgstr "��更改更動報告"
+
+#: NOT FOUND IN SOURCE
+msgid "Trying to delete a right: %1"
+msgstr "試圖刪除�項權�：%1"
+
+#: NOT FOUND IN SOURCE
+msgid "Tue"
+msgstr "星期二"
+
+#: lib/RT/Date.pm:389
+msgid "Tue."
+msgstr "星期二"
+
+#: html/Admin/Elements/EditCustomField:43 html/Admin/Elements/ModifyTemplateAsWorkflow:135 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1184 lib/RT/Tickets_Overlay.pm:959
+msgid "Type"
+msgstr "類別"
+
+#: lib/RT/ScripCondition_Overlay.pm:103
+msgid "Unimplemented"
+msgstr "尚無實作"
+
+#: html/Admin/Users/Modify.html:67
+msgid "Unix login"
+msgstr "外部系統登入帳號"
+
+#: html/Admin/Elements/ModifyUser:61
+msgid "UnixUsername"
+msgstr "外部系統登入帳號"
+
+#: lib/RT/Attachment_Overlay.pm:266 lib/RT/Attachment_Overlay.pm:298
+#. ($self->ContentEncoding)
+msgid "Unknown ContentEncoding %1"
+msgstr "��解的內容文字編碼方� %1"
+
+#: html/Elements/SelectResultsPerPage:36
+msgid "Unlimited"
+msgstr "全數顯示"
+
+#: etc/initialdata.zh:50 etc/initialdata:32
+msgid "Unprivileged"
+msgstr "�內部�員"
+
+#: lib/RT/Transaction_Overlay.pm:569
+msgid "Untaken"
+msgstr "未被��"
+
+#: html/Edit/Elements/Page:13 html/Edit/Elements/Page:15
+msgid "Up"
+msgstr "上一�"
+
+#: html/Elements/MyTickets:63 html/Search/Bulk.html:32 html/Work/Elements/MyTickets:82 html/Work/Search/Bulk.html:10 html/Work/Tickets/Elements/EditCustomFieldEntries:97
+msgid "Update"
+msgstr "處�"
+
+#: html/Admin/Users/Prefs.html:61
+msgid "Update ID"
+msgstr "更新編號"
+
+#: html/Search/Bulk.html:129 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:65 html/Work/Search/Bulk.html:81 html/Work/Tickets/Update.html:32
+msgid "Update Type"
+msgstr "更新類別"
+
+#: html/Search/Listing.html:60 html/Work/Search/index.html:32
+msgid "Update all these tickets at once"
+msgstr "整批更新申請單"
+
+#: html/Admin/Users/Prefs.html:48
+msgid "Update email"
+msgstr "更新電�郵件信箱"
+
+#: html/Admin/Users/Prefs.html:54
+msgid "Update name"
+msgstr "更新帳號"
+
+#: lib/RT/Interface/Web.pm:409 x:412
+msgid "Update not recorded."
+msgstr "更新未被記錄"
+
+#: html/Search/Bulk.html:80 html/Work/Search/Bulk.html:52
+msgid "Update selected tickets"
+msgstr "更新�擇的申請單"
+
+#: html/Admin/Users/Prefs.html:35
+msgid "Update signature"
+msgstr "更新簽章"
+
+#: html/Ticket/ModifyAll.html:62
+msgid "Update ticket"
+msgstr "更新申請單"
+
+#: NOT FOUND IN SOURCE
+msgid "Update ticket # %1"
+msgstr "更新申請單 # %1"
+
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:46
+#. ($Ticket->id)
+msgid "Update ticket #%1"
+msgstr "更新申請單 #%1"
+
+#: html/Ticket/Update.html:138 html/Work/Tickets/Update.html:122
+#. ($Ticket->id, $Ticket->Subject)
+msgid "Update ticket #%1 (%2)"
+msgstr "更新申請單 #%1 (%2)"
+
+#: lib/RT/Interface/Web.pm:407 x:410
+msgid "Update type was neither correspondence nor comment."
+msgstr "更新的內容並�申請單回覆也�是評論"
+
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:50 lib/RT/Ticket_Overlay.pm:1187
+msgid "Updated"
+msgstr "�次更新"
+
+#: html/Work/Preferences/index.html:15
+msgid "User"
+msgstr "使用者"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 %2: %3\\n"
+msgstr "使用者 %1 %2：%3\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 Password: %2\\n"
+msgstr "使用者 %1 密碼：%2\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found"
+msgstr "找�到使用者 '%1'"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found\\n"
+msgstr "找�到使用者 '%1'\\n"
+
+#: etc/initialdata.zh:142 etc/initialdata.zh:209 etc/initialdata:124 etc/initialdata:191
+msgid "User Defined"
+msgstr "使用者自訂"
+
+#: html/Admin/Users/Prefs.html:58 html/Edit/Users/List:13 html/Edit/Users/Top:42
+msgid "User ID"
+msgstr "使用者 ID"
+
+#: html/Elements/SelectUsers:25
+msgid "User Id"
+msgstr "使用者 ID"
+
+#: html/Edit/Elements/PickUsers:12 html/Edit/Global/UserRight/List:7 html/Edit/Global/UserRight/Top:9 html/Edit/Users/Add.html:13 html/Edit/Users/List:5 html/Edit/Users/Search.html:23 html/Edit/Users/Top:8 html/Work/Delegates/Info:60 html/Work/Tickets/Cc:10
+msgid "User Number"
+msgstr "員工編號"
+
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58 html/Edit/Global/autohandler:11 html/Edit/Queues/autohandler:22
+msgid "User Rights"
+msgstr "使用者權�"
+
+#: html/Edit/Elements/Tab:34
+msgid "User Setup"
+msgstr "使用者設定"
+
+#: html/Edit/Users/Info:37
+msgid "User Shift"
+msgstr "員工�別"
+
+#: html/Admin/Users/Modify.html:225
+#. ($msg)
+msgid "User could not be created: %1"
+msgstr "無法新增使用者：%1"
+
+#: lib/RT/User_Overlay.pm:321
+msgid "User created"
+msgstr "使用者新增完畢"
+
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
+msgid "User defined groups"
+msgstr "使用者定義的群組"
+
+#: lib/RT/User_Overlay.pm:575 lib/RT/User_Overlay.pm:592
+msgid "User loaded"
+msgstr "已載入使用者"
+
+#: NOT FOUND IN SOURCE
+msgid "User notified"
+msgstr "已通知使用者"
+
+#: html/Admin/Users/Prefs.html:24 html/Admin/Users/Prefs.html:28
+msgid "User view"
+msgstr "使用者�人資料"
+
+#: NOT FOUND IN SOURCE
+msgid "UserDefined"
+msgstr "使用者自定"
+
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
+msgid "Username"
+msgstr "帳號"
+
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57 html/Work/Tickets/Elements/ShowTransaction:8
+msgid "Users"
+msgstr "使用者"
+
+#: html/Admin/Users/index.html:64
+msgid "Users matching search criteria"
+msgstr "符�查詢�件的使用者"
+
+#: html/Search/Elements/PickRestriction:50 html/Work/Search/PickRestriction:31
+msgid "ValueOfQueue"
+msgstr "�擇表單"
+
+#: html/Admin/Elements/EditCustomField:56
+msgid "Values"
+msgstr "欄�值"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "Watch"
+msgstr "視察"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "WatchAsAdminCc"
+msgstr "以管�員副本收件人身份視察"
+
+#: NOT FOUND IN SOURCE
+msgid "Watcher loaded"
+msgstr "�功載入視察員資訊"
+
+#: html/Admin/Elements/QueueTabs:41
+msgid "Watchers"
+msgstr "視察員"
+
+#: html/Admin/Elements/ModifyUser:55
+msgid "WebEncoding"
+msgstr "網�文字編碼方�"
+
+#: NOT FOUND IN SOURCE
+msgid "Wed"
+msgstr "星期三"
+
+#: lib/RT/Date.pm:390
+msgid "Wed."
+msgstr "星期三"
+
+#: etc/initialdata.zh:533 etc/initialdata:503 etc/upgrade/2.1.71:161 html/Edit/Elements/CreateApprovalsQueue:135
+msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
+msgstr "當申請單通�所有簽核後，將此訊�回覆到原申請單"
+
+#: etc/initialdata.zh:497 etc/initialdata:467 etc/upgrade/2.1.71:135 html/Edit/Elements/CreateApprovalsQueue:107
+msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
+msgstr "當申請單通��項簽核後，將此訊�回覆到原申請單"
+
+#: etc/initialdata.zh:156 etc/initialdata:138
+msgid "When a ticket is created"
+msgstr "新增申請單時"
+
+#: etc/initialdata.zh:428 etc/initialdata:400 etc/upgrade/2.1.71:79 html/Edit/Elements/CreateApprovalsQueue:51
+msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
+msgstr "簽核單新增之後，通知應��的承辦人�管�員副本收件人"
+
+#: etc/initialdata.zh:161 etc/initialdata:143
+msgid "When anything happens"
+msgstr "當任何事情發生時"
+
+#: etc/initialdata.zh:202 etc/initialdata:184
+msgid "Whenever a ticket is resolved"
+msgstr "當申請單解決時"
+
+#: etc/initialdata.zh:188 etc/initialdata:170
+msgid "Whenever a ticket's owner changes"
+msgstr "當申請單更�承辦人時"
+
+#: etc/initialdata.zh:196 etc/initialdata:178
+msgid "Whenever a ticket's queue changes"
+msgstr "當申請單更�表單時"
+
+#: etc/initialdata.zh:180 etc/initialdata:162
+msgid "Whenever a ticket's status changes"
+msgstr "當申請單更新��時"
+
+#: etc/initialdata.zh:210 etc/initialdata:192
+msgid "Whenever a user-defined condition occurs"
+msgstr "當使用者自訂的情�發生時"
+
+#: etc/initialdata.zh:174 etc/initialdata:156
+msgid "Whenever comments come in"
+msgstr "當評論��時"
+
+#: etc/initialdata.zh:167 etc/initialdata:149
+msgid "Whenever correspondence comes in"
+msgstr "當回覆��時"
+
+#: html/Admin/Users/Modify.html:163 html/User/Prefs.html:51 html/Work/Preferences/Info:34
+msgid "Work"
+msgstr "公�"
+
+#: html/Admin/Elements/ModifyUser:69
+msgid "WorkPhone"
+msgstr "公�電話"
+
+#: html/Ticket/Elements/ShowBasics:34 html/Ticket/Update.html:64
+msgid "Worked"
+msgstr "處�時間"
+
+#: html/Admin/Global/Workflow.html:91 html/Admin/Queues/Workflow.html:89
+#. ($WorkflowObj->Id())
+msgid "Workflow #%1"
+msgstr "�程 #%1"
+
+#: html/Edit/Global/Workflow/List:15
+msgid "Workflow Begin"
+msgstr "�程開始"
+
+#: html/Edit/Global/Workflow/List:20
+msgid "Workflow End"
+msgstr "�程��"
+
+#: html/Admin/Elements/EditWorkflows:90
+msgid "Workflow deleted"
+msgstr "�程已刪除"
+
+#: html/Edit/Global/autohandler:10 html/Edit/Queues/autohandler:21
+msgid "Workflows"
+msgstr "�程"
+
+#: html/Edit/Global/Basic/Top:25
+msgid "Yes"
+msgstr "是"
+
+#: lib/RT/Ticket_Overlay.pm:3150
+msgid "You already own this ticket"
+msgstr "您已是這份申請單的承辦人"
+
+#: html/autohandler:122
+msgid "You are not an authorized user"
+msgstr "您�是被授權的使用者"
+
+#: lib/RT/Ticket_Overlay.pm:3032
+msgid "You can only reassign tickets that you own or that are unowned"
+msgstr "祇能�新指派您所承辦或是沒有承辦人的申請單"
+
+#: NOT FOUND IN SOURCE
+msgid "You don't have permission to view that ticket.\\n"
+msgstr "您沒有看那份申請單的權�。\\n"
+
+#: docs/design_docs/string-extraction-guide.txt:47
+#. ($num, $queue)
+msgid "You found %1 tickets in queue %2"
+msgstr "您會在表單 %2 找到 %1 的申請單"
+
+#: html/NoAuth/Logout.html:30
+msgid "You have been logged out of RT."
+msgstr "您已登出 RT。"
+
+#: html/SelfService/Display.html:77
+msgid "You have no permission to create tickets in that queue."
+msgstr "您沒有在該表單新增申請單的權�。"
+
+#: lib/RT/Ticket_Overlay.pm:1908
+msgid "You may not create requests in that queue."
+msgstr "您�能在該表單中�出申請。"
+
+#: html/Edit/Global/Basic/Top:38
+msgid "You need to restart the Request Tracker service for saved changes to take effect."
+msgstr "您必須�新啟動 Request Tracker �務，儲存的更動纔會生效。"
+
+#: html/NoAuth/Logout.html:34
+msgid "You're welcome to login again"
+msgstr "歡迎下次�來"
+
+#: NOT FOUND IN SOURCE
+msgid "Your %1 requests"
+msgstr "您�出的 %1 申請單"
+
+#: NOT FOUND IN SOURCE
+msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
+msgstr "RT 管�員�能設錯了由 RT 寄出的郵件收件人標頭檔"
+
+#: etc/initialdata.zh:514 etc/initialdata:484 etc/upgrade/2.1.71:146 html/Edit/Elements/CreateApprovalsQueue:119
+msgid "Your request has been approved by %1. Other approvals may still be pending."
+msgstr "申請單已由 %1 批准。�能還有其他待簽核的步驟。"
+
+#: etc/initialdata.zh:552 etc/initialdata:522 etc/upgrade/2.1.71:180 html/Edit/Elements/CreateApprovalsQueue:154
+msgid "Your request has been approved."
+msgstr "您的申請單已完�簽核程�。"
+
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr "您的申請單已被�回"
+
+#: etc/initialdata.zh:455
+msgid "Your request was rejected by %1."
+msgstr "您的申請單已被 %1 �回。"
+
+#: etc/initialdata:427 etc/upgrade/2.1.71:101 html/Edit/Elements/CreateApprovalsQueue:73
+msgid "Your request was rejected."
+msgstr "您的申請單已被�回。"
+
+#: html/autohandler:144
+msgid "Your username or password is incorrect"
+msgstr "您的帳號或密碼有誤"
+
+#: html/Admin/Elements/ModifyUser:83 html/Admin/Users/Modify.html:143 html/User/Prefs.html:95 html/Work/Preferences/Info:85
+msgid "Zip"
+msgstr "郵��號"
+
+#: NOT FOUND IN SOURCE
+msgid "[no subject]"
+msgstr "[沒有標題]"
+
+#: NOT FOUND IN SOURCE
+msgid "ago"
+msgstr "�期"
+
+#: NOT FOUND IN SOURCE
+msgid "alert"
+msgstr "急訊"
+
+#: html/User/Elements/DelegateRights:58
+#. ($right->PrincipalObj->Object->SelfDescription)
+msgid "as granted to %1"
+msgstr "權�� %1"
+
+#: html/SelfService/Closed.html:27
+msgid "closed"
+msgstr "已解決"
+
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
+msgid "contains"
+msgstr "包�"
+
+#: html/Elements/SelectAttachmentField:25
+msgid "content"
+msgstr "內容"
+
+#: html/Elements/SelectAttachmentField:26
+msgid "content-type"
+msgstr "é¡žåž‹"
+
+#: lib/RT/Ticket_Overlay.pm:2295
+msgid "correspondence (probably) not sent"
+msgstr "申請單回覆(�能)未�出"
+
+#: lib/RT/Ticket_Overlay.pm:2305
+msgid "correspondence sent"
+msgstr "申請單回覆已�出"
+
+#: NOT FOUND IN SOURCE
+msgid "critical"
+msgstr "嚴�"
+
+#: html/Admin/Elements/ModifyQueue:62 html/Admin/Queues/Modify.html:76 html/Edit/Queues/Basic/Top:31 html/Edit/Queues/List:18 html/Work/Queues/List:11 lib/RT/Date.pm:319
+msgid "days"
+msgstr "天"
+
+#: NOT FOUND IN SOURCE
+msgid "dead"
+msgstr "拒絕處�"
+
+#: NOT FOUND IN SOURCE
+msgid "debug"
+msgstr "�錯"
+
+#: html/Search/Listing.html:74
+msgid "delete"
+msgstr "刪除"
+
+#: lib/RT/Queue_Overlay.pm:62
+msgid "deleted"
+msgstr "已刪除"
+
+#: html/Search/Elements/PickRestriction:67 html/Work/Search/PickRestriction:47
+msgid "does not match"
+msgstr "�符�"
+
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
+msgid "doesn't contain"
+msgstr "�包�"
+
+#: NOT FOUND IN SOURCE
+msgid "emergency"
+msgstr "�難"
+
+#: html/Elements/SelectEqualityOperator:37
+msgid "equal to"
+msgstr "等於"
+
+#: NOT FOUND IN SOURCE
+msgid "error"
+msgstr "錯誤"
+
+#: NOT FOUND IN SOURCE
+msgid "false"
+msgstr "�"
+
+#: html/Elements/SelectAttachmentField:27
+msgid "filename"
+msgstr "檔�"
+
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
+msgid "greater than"
+msgstr "大於"
+
+#: lib/RT/Group_Overlay.pm:193
+#. ($self->Name)
+msgid "group '%1'"
+msgstr "群組 '%1'"
+
+#: lib/RT/Date.pm:315
+msgid "hours"
+msgstr "�時"
+
+#: NOT FOUND IN SOURCE
+msgid "id"
+msgstr "編號"
+
+#: NOT FOUND IN SOURCE
+msgid "info"
+msgstr "資訊"
+
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickRestriction:46 html/Search/Elements/PickRestriction:75 html/Search/Elements/PickRestriction:87 html/Work/Search/PickRestriction:27 html/Work/Search/PickRestriction:56 html/Work/Search/PickRestriction:69
+msgid "is"
+msgstr "是"
+
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88 html/Work/Search/PickRestriction:28 html/Work/Search/PickRestriction:57 html/Work/Search/PickRestriction:70
+msgid "isn't"
+msgstr "�是"
+
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
+msgid "less than"
+msgstr "�於"
+
+#: html/Edit/Global/Workflow/Owner.html:35
+msgid "level Admins"
+msgstr "層主管"
+
+#: html/Search/Elements/PickRestriction:66 html/Work/Search/PickRestriction:46
+msgid "matches"
+msgstr "符�"
+
+#: lib/RT/Date.pm:311
+msgid "min"
+msgstr "分"
+
+#: html/Ticket/Update.html:64
+msgid "minutes"
+msgstr "分�"
+
+#: bin/rt-commit-handler:764
+msgid "modifications\\n\\n"
+msgstr "更改\\n\\n"
+
+#: lib/RT/Date.pm:327
+msgid "months"
+msgstr "月"
+
+#: lib/RT/Queue_Overlay.pm:57
+msgid "new"
+msgstr "新建立"
+
+#: html/Admin/Elements/EditScrips:42
+msgid "no value"
+msgstr "沒有值"
+
+#: html/Admin/Elements/EditQueueWatchers:26 html/Edit/Groups/Member:40 html/Edit/Groups/Members/Add.html:17 html/Edit/Groups/Members/List:8 html/Edit/Queues/Basic/Top:50 html/Edit/Queues/List:18 html/Ticket/Elements/EditWatchers:27 html/Work/Delegates/Info:37 html/Work/Delegates/Info:48 html/Work/Overview/Info:31 html/Work/Queues/List:11 html/Work/Tickets/Elements/ShowBasics:27
+msgid "none"
+msgstr "ç„¡"
+
+#: html/Elements/SelectEqualityOperator:37
+msgid "not equal to"
+msgstr "�等於"
+
+#: NOT FOUND IN SOURCE
+msgid "notice"
+msgstr "�示"
+
+#: NOT FOUND IN SOURCE
+msgid "notlike"
+msgstr "�符�"
+
+#: html/Edit/Elements/PickUsers:17 html/Edit/Users/Add.html:18 html/Edit/Users/Search.html:28 html/Work/Tickets/Cc:15
+msgid "number"
+msgstr "號"
+
+#: html/SelfService/Elements/MyRequests:60 lib/RT/Queue_Overlay.pm:58
+msgid "open"
+msgstr "é–‹å•Ÿ"
+
+#: NOT FOUND IN SOURCE
+msgid "opened"
+msgstr "已開啟"
+
+#: lib/RT/Group_Overlay.pm:198
+#. ($self->Name, $user->Name)
+msgid "personal group '%1' for user '%2'"
+msgstr "使用者「%2�的「%1�代�人群組"
+
+#: lib/RT/Group_Overlay.pm:206
+#. ($queue->Name, $self->Type)
+msgid "queue %1 %2"
+msgstr "表單 %1 %2"
+
+#: lib/RT/Queue_Overlay.pm:61
+msgid "rejected"
+msgstr "已�回"
+
+#: html/Work/Elements/SelectSearch:21 lib/RT/Queue_Overlay.pm:60
+msgid "resolved"
+msgstr "已處�"
+
+#: html/Edit/Global/Basic/Top:48
+msgid "rtname"
+msgstr "伺�器�稱"
+
+#: lib/RT/Date.pm:307
+msgid "sec"
+msgstr "秒"
+
+#: lib/RT/Queue_Overlay.pm:59
+msgid "stalled"
+msgstr "延宕"
+
+#: lib/RT/Group_Overlay.pm:201
+#. ($self->Type)
+msgid "system %1"
+msgstr "系統 %1"
+
+#: lib/RT/Group_Overlay.pm:212
+#. ($self->Type)
+msgid "system group '%1'"
+msgstr "系統群組 '%1'"
+
+#: html/Elements/Error:42 html/SelfService/Error.html:41
+msgid "the calling component did not specify why"
+msgstr "呼�元件未指明原因"
+
+#: lib/RT/Group_Overlay.pm:209
+#. ($self->Instance, $self->Type)
+msgid "ticket #%1 %2"
+msgstr "申請單 #%1 %2"
+
+#: html/Work/Elements/SelectSearch:27
+msgid "till"
+msgstr "至"
+
+#: html/Edit/Elements/PickUsers:15 html/Edit/Global/Workflow/Condition:30 html/Edit/Users/Add.html:16 html/Edit/Users/Search.html:26 html/Work/Tickets/Cc:13
+msgid "to"
+msgstr "到"
+
+#: NOT FOUND IN SOURCE
+msgid "true"
+msgstr "真"
+
+#: lib/RT/Group_Overlay.pm:215
+#. ($self->Id)
+msgid "undescribed group %1"
+msgstr "沒有�述的群組 %1"
+
+#: html/Work/Elements/SelectSearch:19
+msgid "unresolved"
+msgstr "未處�"
+
+#: lib/RT/Group_Overlay.pm:190
+#. ($user->Object->Name)
+msgid "user %1"
+msgstr "使用者 %1"
+
+#: NOT FOUND IN SOURCE
+msgid "warning"
+msgstr "警告"
+
+#: lib/RT/Date.pm:323
+msgid "weeks"
+msgstr "週"
+
+#: NOT FOUND IN SOURCE
+msgid "with template %1"
+msgstr "範本：%1"
+
+#: lib/RT/Date.pm:331
+msgid "years"
+msgstr "å¹´"
+
+#: lib/RT/Date.pm:331
+msgid "approving"
+msgstr "待簽核"
+
diff --git a/rt/lib/RT/Interface/CLI.pm b/rt/lib/RT/Interface/CLI.pm
index a3bf92d5f..a3c840af5 100644
--- a/rt/lib/RT/Interface/CLI.pm
+++ b/rt/lib/RT/Interface/CLI.pm
@@ -1,9 +1,31 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Interface/CLI.pm,v 1.1 2002-08-12 06:17:08 ivan Exp $
-# RT is (c) 1996-2001 Jesse Vincent <jesse@fsck.com>
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+use strict;
 
+use RT;
 package RT::Interface::CLI;
 
-use strict;
 
 
 BEGIN {
@@ -11,14 +33,14 @@ BEGIN {
     use vars qw ($VERSION  @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
     
     # set the version for version checking
-    $VERSION = do { my @r = (q$Revision: 1.1 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
+    $VERSION = do { my @r = (q$Revision: 1.1.1.1 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
     
     @ISA         = qw(Exporter);
     
     # your exported package globals go here,
     # as well as any optionally exported functions
-    @EXPORT_OK   = qw(&CleanEnv &LoadConfig &DBConnect 
-		      &GetCurrentUser &GetMessageContent &debug);
+    @EXPORT_OK   = qw(&CleanEnv 
+		      &GetCurrentUser &GetMessageContent &debug &loc);
 }
 
 =head1 NAME
@@ -27,25 +49,28 @@ BEGIN {
 
 =head1 SYNOPSIS
 
-  use lib "!!RT_LIB_PATH!!";
-  use lib "!!RT_ETC_PATH!!";
+  use lib "/path/to/rt/libraries/";
 
-  use RT::Interface::CLI  qw(CleanEnv LoadConfig DBConnect 
-	  		   GetCurrentUser GetMessageContent);
+  use RT::Interface::CLI  qw(CleanEnv 
+	  		   GetCurrentUser GetMessageContent loc);
 
   #Clean out all the nasties from the environment
   CleanEnv();
 
-  #Load etc/config.pm and drop privs
-  LoadConfig();
+  #let's talk to RT'
+  use RT;
 
-  #Connect to the database and get RT::SystemUser and RT::Nobody loaded
-  DBConnect();
+  #Load RT's config file
+  RT::LoadConfig();
 
+  # Connect to the database. set up loggign
+  RT::Init();
 
   #Get the current user all loaded
   my $CurrentUser = GetCurrentUser();
 
+  print loc('Hello!'); # Synonym of $CuurentUser->loc('Hello!');
+
 =head1 DESCRIPTION
 
 
@@ -53,7 +78,6 @@ BEGIN {
 
 =begin testing
 
-ok(require RT::TestHarness);
 ok(require RT::Interface::CLI);
 
 =end testing
@@ -77,35 +101,10 @@ sub CleanEnv {
 
 
 
-=head2 LoadConfig
-
-Loads RT's config file and then drops setgid privileges.
-
-=cut
-
-sub LoadConfig {
-    
-    #This drags in  RT's config.pm
-    use config;
-    
-}	
-
-
-
-=head2 DBConnect
-
-  Calls RT::Init, which creates a database connection and then creates $RT::Nobody
-  and $RT::SystemUser
-
-=cut
-
-
-sub DBConnect {
-    use RT;
-    RT::Init();
-}
 
+{
 
+    my $CurrentUser; # shared betwen GetCurrentUser and loc
 
 # {{{ sub GetCurrentUser 
 
@@ -115,15 +114,14 @@ sub DBConnect {
 loaded with that user.  if the current user isn't found, returns a copy of RT::Nobody.
 
 =cut
+
 sub GetCurrentUser  {
     
-    my ($Gecos, $CurrentUser);
-    
     require RT::CurrentUser;
     
     #Instantiate a user object
     
-    $Gecos=(getpwuid($<))[0];
+    my $Gecos= ($^O eq 'MSWin32') ? Win32::LoginName() : (getpwuid($<))[0];
 
     #If the current user is 0, then RT will assume that the User object
     #is that of the currentuser.
@@ -134,10 +132,29 @@ sub GetCurrentUser  {
     unless ($CurrentUser->Id) {
 	$RT::Logger->debug("No user with a unix login of '$Gecos' was found. ");
     }
+
     return($CurrentUser);
 }
 # }}}
 
+
+# {{{ sub loc 
+
+=head2 loc
+
+  Synonym of $CurrentUser->loc().
+
+=cut
+
+sub loc {
+    die "No current user yet" unless $CurrentUser ||= RT::CurrentUser->new;
+    return $CurrentUser->loc(@_);
+}
+# }}}
+
+}
+
+
 # {{{ sub GetMessageContent
 
 =head2 GetMessageContent
@@ -221,4 +238,9 @@ sub debug {
 # }}}
 
 
+eval "require RT::Interface::CLI_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/CLI_Vendor.pm});
+eval "require RT::Interface::CLI_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/CLI_Local.pm});
+
 1;
diff --git a/rt/lib/RT/Interface/Email.pm b/rt/lib/RT/Interface/Email.pm
index e95436091..bc1a55da2 100755
--- a/rt/lib/RT/Interface/Email.pm
+++ b/rt/lib/RT/Interface/Email.pm
@@ -1,41 +1,58 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Interface/Email.pm,v 1.1 2002-08-12 06:17:08 ivan Exp $
-# RT is (c) 1996-2001 Jesse Vincent <jesse@fsck.com>
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 package RT::Interface::Email;
 
 use strict;
 use Mail::Address;
 use MIME::Entity;
+use RT::EmailParser;
+
 
 BEGIN {
     use Exporter ();
     use vars qw ($VERSION  @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
     
     # set the version for version checking
-    $VERSION = do { my @r = (q$Revision: 1.1 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
+    $VERSION = do { my @r = (q$Revision: 1.1.1.1 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
     
     @ISA         = qw(Exporter);
     
     # your exported package globals go here,
     # as well as any optionally exported functions
-    @EXPORT_OK   = qw(&CleanEnv 
-		      &LoadConfig 
-		      &DBConnect 
-		      &GetCurrentUser
+    @EXPORT_OK   = qw(
+              &CreateUser
 		      &GetMessageContent
 		      &CheckForLoops 
 		      &CheckForSuspiciousSender
 		      &CheckForAutoGenerated 
-		      &ParseMIMEEntityFromSTDIN
-		      &ParseTicketId 
 		      &MailError 
 		      &ParseCcAddressesFromHead
 		      &ParseSenderAddressFromHead 
-   		      &ParseErrorsToAddressFromHead
-              &ParseAddressFromHeader
-
+		      &ParseErrorsToAddressFromHead
+                      &ParseAddressFromHeader
+              &Gateway);
 
-		      &debug);
 }
 
 =head1 NAME
@@ -47,28 +64,13 @@ BEGIN {
   use lib "!!RT_LIB_PATH!!";
   use lib "!!RT_ETC_PATH!!";
 
-  use RT::Interface::Email  qw(CleanEnv LoadConfig DBConnect 
-			      );
-
-  #Clean out all the nasties from the environment
-  CleanEnv();
-
-  #Load etc/config.pm and drop privs
-  LoadConfig();
-
-  #Connect to the database and get RT::SystemUser and RT::Nobody loaded
-  DBConnect();
-
-
-  #Get the current user all loaded
-  my $CurrentUser = GetCurrentUser();
+  use RT::Interface::Email  qw(Gateway CreateUser);
 
 =head1 DESCRIPTION
 
 
 =begin testing
 
-ok(require RT::TestHarness);
 ok(require RT::Interface::Email);
 
 =end testing
@@ -79,71 +81,6 @@ ok(require RT::Interface::Email);
 =cut
 
 
-=head2 CleanEnv
-
-Removes some of the nastiest nasties from the user\'s environment.
-
-=cut
-
-sub CleanEnv {
-    $ENV{'PATH'} = '/bin:/usr/bin';    # or whatever you need
-    $ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
-    $ENV{'SHELL'} = '/bin/sh' if defined $ENV{'SHELL'};
-    $ENV{'ENV'} = '' if defined $ENV{'ENV'};
-    $ENV{'IFS'} = '' if defined $ENV{'IFS'};
-}
-
-
-
-=head2 LoadConfig
-
-Loads RT's config file and then drops setgid privileges.
-
-=cut
-
-sub LoadConfig {
-    
-    #This drags in  RT's config.pm
-    use config;
-    
-}	
-
-
-
-=head2 DBConnect
-
-  Calls RT::Init, which creates a database connection and then creates $RT::Nobody
-  and $RT::SystemUser
-
-=cut
-
-
-sub DBConnect {
-    use RT;
-    RT::Init();
-}
-
-
-
-# {{{ sub debug
-
-sub debug {
-    my $val = shift;
-    my ($debug);
-    if ($val) {
-	$RT::Logger->debug($val."\n");
-	if ($debug) {
-	    print STDERR "$val\n";
-	}
-    }
-    if ($debug) {
-	return(1);
-    }	
-}
-
-# }}}
-
-
 # {{{ sub CheckForLoops 
 
 sub CheckForLoops  {
@@ -207,82 +144,6 @@ sub CheckForAutoGenerated {
 
 # }}}
 
-# {{{ sub ParseMIMEEntityFromSTDIN
-
-sub ParseMIMEEntityFromSTDIN {
-
-    # Create a new parser object:
-    
-    my $parser = new MIME::Parser;
-    
-    # {{{ Config $parser to store large attacments in temp dir
-
-    ## TODO: Does it make sense storing to disk at all?  After all, we
-    ## need to put each msg as an in-core scalar before saving it to
-    ## the database, don't we?
-
-    ## At the same time, we should make sure that we nuke attachments 
-    ## Over max size and return them
-
-    ## TODO: Remove the temp dir when we don't need it any more.
-
-    my $AttachmentDir = File::Temp::tempdir (TMPDIR => 1, CLEANUP => 1);
-    
-    # Set up output directory for files:
-    $parser->output_dir("$AttachmentDir");
-  
-    #If someone includes a message, don't extract it
-    $parser->extract_nested_messages(0);
-
-   
-    # Set up the prefix for files with auto-generated names:
-    $parser->output_prefix("part");
-
-    # If content length is <= 20000 bytes, store each msg as in-core scalar;
-    # Else, write to a disk file (the default action):
-  
-    $parser->output_to_core(20000);
-
-    # }}} (temporary directory)
-
-    #Ok. now that we're set up, let's get the stdin.
-    my $entity;
-    unless ($entity = $parser->read(\*STDIN)) {
-	die "couldn't parse MIME stream";
-    }
-    #Now we've got a parsed mime object. 
-    
-    # Get the head, a MIME::Head:
-    my $head = $entity->head;
-   
-
-    # Unfold headers that are have embedded newlines
-    $head->unfold; 
-    
-    # TODO - information about the charset is lost here!
-    $head->decode;
-
-    return ($entity, $head);
-
-}
-# }}}
-
-# {{{ sub ParseTicketId 
-
-sub ParseTicketId {
-    my $Subject = shift;
-    my ($Id);
-    
-    if ($Subject =~ s/\[$RT::rtname \#(\d+)\]//i) {
-	$Id = $1;
-	$RT::Logger->debug("Found a ticket ID. It's $Id");
-	return($Id);
-    }
-    else {
-	return(undef);
-    }
-}
-# }}}
 
 # {{{ sub MailError 
 sub MailError {
@@ -313,8 +174,8 @@ sub MailError {
     if ($mimeobj) {
         $mimeobj->sync_headers();
         $entity->add_part($mimeobj);
-    } 
-
+    }
+    
     if ($RT::MailCommand eq 'sendmailpipe') {
         open (MAIL, "|$RT::SendmailPath $RT::SendmailArguments") || return(0);
         print MAIL $entity->as_string;
@@ -327,144 +188,66 @@ sub MailError {
 
 # }}}
 
-# {{{ sub GetCurrentUser 
-
-sub GetCurrentUser  {
-    my $head = shift;
-    my $entity = shift;
-    my $ErrorsTo = shift;
+# {{{ Create User
 
-    my %UserInfo = ();
+sub CreateUser {
+    my ($Username, $Address, $Name, $ErrorsTo, $entity) = @_;
+    my $NewUser = RT::User->new($RT::SystemUser);
 
-    #Suck the address of the sender out of the header
-    my ($Address, $Name) = ParseSenderAddressFromHead($head);
-    
-    #This will apply local address canonicalization rules
-    $Address = RT::CanonicalizeAddress($Address);
-  
-    #If desired, synchronize with an external database
-
-    my $UserFoundInExternalDatabase = 0;
-
-    # Username is the 'Name' attribute of the user that RT uses for things
-    # like authentication
-    my $Username = undef;
-    if ($RT::LookupSenderInExternalDatabase) {
-	($UserFoundInExternalDatabase, %UserInfo) = 
-	  RT::LookupExternalUserInfo($Address, $Name);
-   
-       $Address = $UserInfo{'EmailAddress'};
-       $Username = $UserInfo{'Name'}; 
-    }
-    
-    my $CurrentUser = RT::CurrentUser->new();
+    # This data is tainted by some Very Broken mailers.
+    # (Sometimes they send raw ISO 8859-1 data here. fear that.
+    require Encode;
+    $Username = Encode::encode(utf8 => $Username, Encode::FB_PERLQQ()) if defined $Username;
+    $Name = Encode::encode(utf8 => $Name, Encode::FB_PERLQQ()) if defined $Name;
     
-    # First try looking up by a username, if we got one from the external
-    # db lookup. Next, try looking up by email address. Failing that,
-    # try looking up by users who have this user's email address as their
-    # username.
-
-    if ($Username) {
-	$CurrentUser->LoadByName($Username);
-    }	
+    my ($Val, $Message) = 
+      $NewUser->Create(Name => ($Username || $Address),
+                       EmailAddress => $Address,
+                       RealName => $Name,
+                       Password => undef,
+                       Privileged => 0,
+                       Comments => 'Autocreated on ticket submission'
+                      );
     
-    unless ($CurrentUser->Id) {
-	$CurrentUser->LoadByEmail($Address);
-    }	
-
-    #If we can't get it by email address, try by name.  
-    unless ($CurrentUser->Id) {
-	$CurrentUser->LoadByName($Address);
+    unless ($Val) {
+        
+        # Deal with the race condition of two account creations at once
+        #
+        if ($Username) {
+            $NewUser->LoadByName($Username);
+        }
+        
+        unless ($NewUser->Id) {
+            $NewUser->LoadByEmail($Address);
+        }
+        
+        unless ($NewUser->Id) {  
+            MailError( To => $ErrorsTo,
+                       Subject => "User could not be created",
+                       Explanation => "User creation failed in mailgateway: $Message",
+                       MIMEObj => $entity,
+                       LogLevel => 'crit'
+                     );
+        }
     }
-    
-    
-    unless ($CurrentUser->Id) {
-        #If we couldn't load a user, determine whether to create a user
-
-        # {{{ If we require an incoming address to be found in the external
-	# user database, reject the incoming message appropriately
-        if ( $RT::LookupSenderInExternalDatabase &&
-	     $RT::SenderMustExistInExternalDatabase && 
-	     !$UserFoundInExternalDatabase) {
-	    
-	    my $Message = "Sender's email address was not found in the user database.";
-
-	    # {{{  This code useful only if you've defined an AutoRejectRequest template
-	    
-	    require RT::Template;
-	    my $template = new RT::Template($RT::Nobody);
-	    $template->Load('AutoRejectRequest');
-	    $Message = $template->Content || $Message;
-	    
-	    # }}}
-	    
-	    MailError( To => $ErrorsTo,
-		       Subject => "Ticket Creation failed: user could not be created",
-		       Explanation => $Message,
-		       MIMEObj => $entity,
-		       LogLevel => 'notice'
-		     );
-
-	    return($CurrentUser);
-
-	} 
-	# }}}
-	
-	else {
-	    my $NewUser = RT::User->new($RT::SystemUser);
-	    
-	    my ($Val, $Message) = 
-	      $NewUser->Create(Name => ($Username || $Address),
-			       EmailAddress => $Address,
-			       RealName => "$Name",
-			       Password => undef,
-			       Privileged => 0,
-			       Comments => 'Autocreated on ticket submission'
-			      );
-	    
-	    unless ($Val) {
-		
-		# Deal with the race condition of two account creations at once
-		#
-           	if ($Username) {
-		    $NewUser->LoadByName($Username);
-		}
-		
-		unless ($NewUser->Id) {
-	            $NewUser->LoadByEmail($Address);
-		}
-		
-		unless ($NewUser->Id) {  
-		    MailError( To => $ErrorsTo,
-			       Subject => "User could not be created",
-			       Explanation => "User creation failed in mailgateway: $Message",
-			       MIMEObj => $entity,
-			       LogLevel => 'crit'
-			     );
-		}
-	    }
-	}
-	
-	#Load the new user object
-	$CurrentUser->LoadByEmail($Address);
-	
-	unless ($CurrentUser->id) {
-	    $RT::Logger->warning("Couldn't load user '$Address'.".  "giving up");
-		MailError( To => $ErrorsTo,
-			   Subject => "User could not be loaded",
-			   Explanation => "User  '$Address' could not be loaded in the mail gateway",
-			   MIMEObj => $entity,
-			   LogLevel => 'crit'
-			 );
-	    
-	}
+
+    #Load the new user object
+    my $CurrentUser = RT::CurrentUser->new();
+    $CurrentUser->LoadByEmail($Address);
+
+    unless ($CurrentUser->id) {
+            $RT::Logger->warning("Couldn't load user '$Address'.".  "giving up");
+                MailError( To => $ErrorsTo,
+                           Subject => "User could not be loaded",
+                           Explanation => "User  '$Address' could not be loaded in the mail gateway",
+                           MIMEObj => $entity,
+                           LogLevel => 'crit'
+                     );
     }
-    
-    return ($CurrentUser);
-    
-}
-# }}}
 
+    return $CurrentUser;
+}
+# }}}	    
 # {{{ ParseCcAddressesFromHead 
 
 =head2 ParseCcAddressesFromHead HASHREF
@@ -489,11 +272,11 @@ sub ParseCcAddressesFromHead {
     
     foreach my $AddrObj (@ToObjs, @CcObjs) {
 	my $Address = $AddrObj->address;
-	$Address = RT::CanonicalizeAddress($Address);
+	$Address = $args{'CurrentUser'}->UserObj->CanonicalizeEmailAddress($Address);
  	next if ($args{'CurrentUser'}->EmailAddress =~ /^$Address$/i);
 	next if ($args{'QueueObj'}->CorrespondAddress =~ /^$Address$/i);
 	next if ($args{'QueueObj'}->CommentAddress =~ /^$Address$/i);
-	next if (RT::IsRTAddress($Address));
+	next if (RT::EmailParser::IsRTAddress(undef, $Address));
 	
 	push (@Addresses, $Address);
     }
@@ -568,8 +351,7 @@ sub ParseAddressFromHeader{
     }
  
     my $Name =  ($AddrObj->phrase || $AddrObj->comment || $AddrObj->address);
-
-
+    
     #Lets take the from and load a user object.
     my $Address = $AddrObj->address;
 
@@ -578,4 +360,289 @@ sub ParseAddressFromHeader{
 # }}}
 
 
+
+=head2 Gateway
+
+This performs all the "guts" of the mail rt-mailgate program, and is
+designed to be called from the web interface with a message, user
+object, and so on.
+
+=cut
+
+sub Gateway {
+    my %args = ( message => undef,
+                 queue   => 1,
+                 action  => 'correspond',
+                 ticket  => undef,
+                 @_ );
+
+    # Validate the action
+    unless ( $args{'action'} =~ /^(comment|correspond|action)$/ ) {
+
+        # Can't safely loc this. What object do we loc around?
+        return ( 0, "Invalid 'action' parameter", undef );
+    }
+
+    my $parser = RT::EmailParser->new();
+    $parser->ParseMIMEEntityFromScalar( $args{'message'} );
+
+    my $Message = $parser->Entity();
+    my $head = $Message->head;
+
+    my ( $CurrentUser, $AuthStat, $status, $error );
+
+    my $ErrorsTo = ParseErrorsToAddressFromHead($head);
+
+    my $MessageId = $head->get('Message-Id')
+      || "<no-message-id-" . time . rand(2000) . "\@.$RT::Organization>";
+
+    #Pull apart the subject line
+    my $Subject = $head->get('Subject') || '';
+    chomp $Subject;
+
+
+    $args{'ticket'} ||= $parser->ParseTicketId($Subject);
+
+    my $SystemTicket;
+    if ($args{'ticket'} ) {
+        $SystemTicket = RT::Ticket->new($RT::SystemUser);
+        $SystemTicket->Load($args{'ticket'});
+    }
+
+    #Set up a queue object
+    my $SystemQueueObj = RT::Queue->new($RT::SystemUser);
+    $SystemQueueObj->Load( $args{'queue'} );
+
+
+    # We can safely have no queue of we have a known-good ticket
+    unless ( $args{'ticket'} || $SystemQueueObj->id ) {
+        MailError(
+                 To          => $RT::OwnerEmail,
+                 Subject     => "RT Bounce: $Subject",
+                 Explanation => "RT couldn't find the queue: " . $args{'queue'},
+                 MIMEObj     => $Message );
+        return ( 0, "RT couldn't find the queue: " . $args{'queue'}, undef );
+    }
+
+    # Authentication Level
+    # -1 - Get out.  this user has been explicitly declined 
+    # 0 - User may not do anything (Not used at the moment)
+    # 1 - Normal user
+    # 2 - User is allowed to specify status updates etc. a la enhanced-mailgate
+
+    push @RT::MailPlugins, "Auth::MailFrom"   unless @RT::MailPlugins;
+    # Since this needs loading, no matter what
+
+    for (@RT::MailPlugins) {
+        my $Code;
+        my $NewAuthStat;
+        if ( ref($_) eq "CODE" ) {
+            $Code = $_;
+        }
+        else {
+            $_ = "RT::Interface::Email::$_" unless /^RT::Interface::Email::/;
+            eval "require $_;";
+            if ($@) {
+                die ("Couldn't load module $_: $@");
+                next;
+            }
+            no strict 'refs';
+            if ( !defined( $Code = *{ $_ . "::GetCurrentUser" }{CODE} ) ) {
+                die ("No GetCurrentUser code found in $_ module");
+                next;
+            }
+        }
+
+        ( $CurrentUser, $NewAuthStat ) = $Code->( Message     => $Message,
+                                                  CurrentUser => $CurrentUser,
+                                                  AuthLevel   => $AuthStat,
+                                                  Action => $args{'action'},
+                                                  Ticket => $SystemTicket,
+                                                  Queue  => $SystemQueueObj );
+
+        # You get the highest level of authentication you were assigned.
+        last if $AuthStat == -1;
+        $AuthStat = $NewAuthStat if $NewAuthStat > $AuthStat;
+    }
+
+    # {{{ If authentication fails and no new user was created, get out.
+    if ( !$CurrentUser or !$CurrentUser->Id or $AuthStat == -1 ) {
+
+        # If the plugins refused to create one, they lose.
+        MailError(
+            Subject     => "Could not load a valid user",
+            Explanation => <<EOT,
+RT could not load a valid user, and RT's configuration does not allow
+for the creation of a new user for your email.
+
+Your RT administrator needs to grant 'Everyone' the right 'CreateTicket'
+for this queue.
+
+EOT
+            MIMEObj  => $Message,
+            LogLevel => 'error' )
+          unless $AuthStat == -1;
+        return ( 0, "Could not load a valid user", undef );
+    }
+
+    # }}}
+
+    # {{{ Lets check for mail loops of various sorts.
+    my $IsAutoGenerated = CheckForAutoGenerated($head);
+
+    my $IsSuspiciousSender = CheckForSuspiciousSender($head);
+
+    my $IsALoop = CheckForLoops($head);
+
+    my $SquelchReplies = 0;
+
+    #If the message is autogenerated, we need to know, so we can not
+    # send mail to the sender
+    if ( $IsSuspiciousSender || $IsAutoGenerated || $IsALoop ) {
+        $SquelchReplies = 1;
+        $ErrorsTo       = $RT::OwnerEmail;
+    }
+
+    # }}}
+
+    # {{{ Drop it if it's disallowed
+    if ( $AuthStat == 0 ) {
+        MailError(
+             To          => $ErrorsTo,
+             Subject     => "Permission Denied",
+             Explanation => "You do not have permission to communicate with RT",
+             MIMEObj     => $Message );
+    }
+
+    # }}}
+    # {{{ Warn someone  if it's a loop
+
+    # Warn someone if it's a loop, before we drop it on the ground
+    if ($IsALoop) {
+        $RT::Logger->crit("RT Recieved mail ($MessageId) from itself.");
+
+        #Should we mail it to RTOwner?
+        if ($RT::LoopsToRTOwner) {
+            MailError( To          => $RT::OwnerEmail,
+                       Subject     => "RT Bounce: $Subject",
+                       Explanation => "RT thinks this message may be a bounce",
+                       MIMEObj     => $Message );
+
+            #Do we actually want to store it?
+            return ( 0, "Message Bounced", undef ) unless ($RT::StoreLoops);
+        }
+    }
+
+    # }}}
+
+    # {{{ Squelch replies if necessary
+    # Don't let the user stuff the RT-Squelch-Replies-To header.
+    if ( $head->get('RT-Squelch-Replies-To') ) {
+        $head->add( 'RT-Relocated-Squelch-Replies-To',
+                    $head->get('RT-Squelch-Replies-To') );
+        $head->delete('RT-Squelch-Replies-To');
+    }
+
+    if ($SquelchReplies) {
+        ## TODO: This is a hack.  It should be some other way to
+        ## indicate that the transaction should be "silent".
+
+        my ( $Sender, $junk ) = ParseSenderAddressFromHead($head);
+        $head->add( 'RT-Squelch-Replies-To', $Sender );
+    }
+
+    # }}}
+
+    my $Ticket = RT::Ticket->new($CurrentUser);
+
+    # {{{ If we don't have a ticket Id, we're creating a new ticket
+    if ( !$args{'ticket'} ) {
+
+        # {{{ Create a new ticket
+
+        my @Cc;
+        my @Requestors = ( $CurrentUser->id );
+
+        if ($RT::ParseNewMessageForTicketCcs) {
+            @Cc = ParseCcAddressesFromHead( Head        => $head,
+                                            CurrentUser => $CurrentUser,
+                                            QueueObj    => $SystemQueueObj );
+        }
+
+        my ( $id, $Transaction, $ErrStr ) = $Ticket->Create(
+                                                      Queue     => $SystemQueueObj->Id,
+                                                      Subject   => $Subject,
+                                                      Requestor => \@Requestors,
+                                                      Cc        => \@Cc,
+                                                      MIMEObj   => $Message );
+        if ( $id == 0 ) {
+            MailError( To          => $ErrorsTo,
+                       Subject     => "Ticket creation failed",
+                       Explanation => $ErrStr,
+                       MIMEObj     => $Message );
+            $RT::Logger->error("Create failed: $id / $Transaction / $ErrStr ");
+            return ( 0, "Ticket creation failed", $Ticket );
+        }
+
+        # }}}
+    }
+
+    # }}}
+
+    #   If the action is comment, add a comment.
+    elsif ( $args{'action'} =~ /^(comment|correspond)$/i ) {
+        $Ticket->Load($args{'ticket'});
+        unless ( $Ticket->Id ) {
+            my $message = "Could not find a ticket with id ".$args{'ticket'};
+            MailError( To          => $ErrorsTo,
+                     Subject     => "Message not recorded",
+                     Explanation => $message,
+                     MIMEObj     => $Message );
+
+            return ( 0, $message);
+        }
+
+        my ( $status, $msg );
+        if ( $args{'action'} =~ /^correspond$/ ) {
+            ( $status, $msg ) = $Ticket->Correspond( MIMEObj => $Message );
+        }
+        else {
+            ( $status, $msg ) = $Ticket->Comment( MIMEObj => $Message );
+        }
+        unless ($status) {
+
+            #Warn the sender that we couldn't actually submit the comment.
+            MailError( To          => $ErrorsTo,
+                       Subject     => "Message not recorded",
+                       Explanation => $msg,
+                       MIMEObj     => $Message );
+            return ( 0, "Message not recorded", $Ticket );
+        }
+    }
+
+    else {
+
+        #Return mail to the sender with an error
+        MailError( To          => $ErrorsTo,
+                   Subject     => "RT Configuration error",
+                   Explanation => "'"
+                     . $args{'action'}
+                     . "' not a recognized action."
+                     . " Your RT administrator has misconfigured "
+                     . "the mail aliases which invoke RT",
+                   MIMEObj => $Message );
+        $RT::Logger->crit( $args{'action'} . " type unknown for $MessageId" );
+        return ( 0, "Configuration error: " . $args{'action'} . " not a recognized action", $Ticket );
+
+    }
+
+
+return ( 1, "Success", $Ticket );
+}
+
+eval "require RT::Interface::Email_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/Email_Vendor.pm});
+eval "require RT::Interface::Email_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/Email_Local.pm});
+
 1;
diff --git a/rt/lib/RT/Interface/Email/Auth/MailFrom.pm b/rt/lib/RT/Interface/Email/Auth/MailFrom.pm
new file mode 100644
index 000000000..eb778ff30
--- /dev/null
+++ b/rt/lib/RT/Interface/Email/Auth/MailFrom.pm
@@ -0,0 +1,131 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+package RT::Interface::Email::Auth::MailFrom;
+use RT::Interface::Email qw(ParseSenderAddressFromHead CreateUser);
+
+# This is what the ordinary, non-enhanced gateway does at the moment.
+
+sub GetCurrentUser {
+    my %args = ( Message     => undef,
+                 CurrentUser => undef,
+                 AuthLevel   => undef,
+                 Ticket      => undef,
+                 Queue       => undef,
+                 Action      => undef,
+                 @_ );
+
+    # We don't need to do any external lookups
+    my ( $Address, $Name ) = ParseSenderAddressFromHead( $args{'Message'}->head );
+    my $CurrentUser = RT::CurrentUser->new();
+    $CurrentUser->LoadByEmail($Address);
+
+    unless ( $CurrentUser->Id ) {
+        $CurrentUser->LoadByName($Address);
+    }
+
+    if ( $CurrentUser->Id ) {
+        return ( $CurrentUser, 1 );
+    }
+    
+
+
+    # If the user can't be loaded, we may need to create one. Figure out the acl situation.
+    my $unpriv = RT::Group->new($RT::SystemUser);
+    $unpriv->LoadSystemInternalGroup('Unprivileged');
+    unless ( $unpriv->Id ) {
+        $RT::Logger->crit( "Auth::MailFrom couldn't find the 'Unprivileged' internal group" );
+        return ( $args{'CurrentUser'}, -1 );
+    }
+
+    my $everyone = RT::Group->new($RT::SystemUser);
+    $everyone->LoadSystemInternalGroup('Everyone');
+    unless ( $everyone->Id ) {
+        $RT::Logger->crit( "Auth::MailFrom couldn't find the 'Everyone' internal group");
+        return ( $args{'CurrentUser'}, -1 );
+    }
+
+    # but before we do that, we need to make sure that the created user would have the right
+    # to do what we're doing.
+    if ( $args{'Ticket'} && $args{'Ticket'}->Id ) {
+        # We have a ticket. that means we're commenting or corresponding
+        if ( $args{'Action'} =~ /^comment$/i ) {
+
+            # check to see whether "Everybody" or "Unprivileged users" can comment on tickets
+            unless ( $everyone->PrincipalObj->HasRight(
+                                                      Object => $args{'Queue'},
+                                                      Right => 'CommentOnTicket'
+                     )
+                     || $unpriv->PrincipalObj->HasRight(
+                                                      Object => $args{'Queue'},
+                                                      Right => 'CommentOnTicket'
+                     )
+              ) {
+                return ( $args{'CurrentUser'}, 0 );
+            }
+        }
+        elsif ( $args{'Action'} =~ /^correspond$/i ) {
+
+            # check to see whether "Everybody" or "Unprivileged users" can correspond on tickets
+            unless ( $everyone->PrincipalObj->HasRight(Object => $args{'Queue'},
+                                                       Right  => 'ReplyToTicket'
+                     )
+                     || $unpriv->PrincipalObj->HasRight(
+                                                       Object => $args{'Queue'},
+                                                       Right  => 'ReplyToTicket'
+                     )
+              ) {
+                return ( $args{'CurrentUser'}, 0 );
+            }
+
+        }
+        else {
+            return ( $args{'CurrentUser'}, 0 );
+        }
+    }
+
+    # We're creating a ticket
+    elsif ( $args{'Queue'} && $args{'Queue'}->Id ) {
+
+        # check to see whether "Everybody" or "Unprivileged users" can create tickets in this queue
+        unless ( $everyone->PrincipalObj->HasRight( Object => $args{'Queue'},
+                                                    Right  => 'CreateTicket' )
+                 || $unpriv->PrincipalObj->HasRight( Object => $args{'Queue'},
+                                                     Right  => 'CreateTicket' )
+          ) {
+            return ( $args{'CurrentUser'}, 0 );
+        }
+
+    }
+
+    $CurrentUser = CreateUser( undef, $Address, $Name, $args{'Message'} );
+
+    return ( $CurrentUser, 1 );
+}
+
+eval "require RT::Interface::Email::Auth::MailFrom_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/Email/Auth/MailFrom_Vendor.pm});
+eval "require RT::Interface::Email::Auth::MailFrom_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/Email/Auth/MailFrom_Local.pm});
+
+1;
diff --git a/rt/lib/RT/Interface/Email/Filter/SpamAssassin.pm b/rt/lib/RT/Interface/Email/Filter/SpamAssassin.pm
new file mode 100644
index 000000000..f00e2d82b
--- /dev/null
+++ b/rt/lib/RT/Interface/Email/Filter/SpamAssassin.pm
@@ -0,0 +1,63 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+package RT::Interface::Email::Filter::SpamAssassin;
+
+use Mail::SpamAssassin;
+my $spamtest = Mail::SpamAssassin->new();
+
+sub GetCurrentUser {
+    my $item = shift;
+    my $status = $spamtest->check ($item);
+    return (undef, 0) unless $status->is_spam();
+    eval { $status->rewrite_mail() };
+    if ($status->get_hits > $status->get_required_hits()*1.5) { 
+        # Spammy indeed
+        return (undef, -1);
+    }
+    return (undef, 0);
+}
+
+=head1 NAME
+
+RT::Interface::Email::Filter::SpamAssassin - Spam filter for RT
+
+=head1 SYNOPSIS
+
+    @RT::MailPlugins = ("Filter::SpamAssassin", ...);
+
+=head1 DESCRIPTION
+
+This plugin checks to see if an incoming mail is spam (using
+C<spamassassin>) and if so, rewrites its headers. If the mail is very
+definitely spam - 1.5x more hits than required - then it is dropped on
+the floor; otherwise, it is passed on as normal.
+
+=cut
+
+eval "require RT::Interface::Email::Filter::SpamAssassin_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/Email/Filter/SpamAssassin_Vendor.pm});
+eval "require RT::Interface::Email::Filter::SpamAssassin_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/Email/Filter/SpamAssassin_Local.pm});
+
+1;
diff --git a/rt/lib/RT/Interface/Web.pm b/rt/lib/RT/Interface/Web.pm
index 6b5272848..5097f54a4 100644
--- a/rt/lib/RT/Interface/Web.pm
+++ b/rt/lib/RT/Interface/Web.pm
@@ -1,129 +1,214 @@
-## $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Interface/Web.pm,v 1.1 2002-08-12 06:17:08 ivan Exp $
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 ## Portions Copyright 2000 Tobias Brox <tobix@fsck.com>
-## Copyright 1996-2002 Jesse Vincent <jesse@bestpractical.com>
 
 ## This is a library of static subs to be used by the Mason web
 ## interface to RT
 
+
+=head1 NAME
+
+RT::Interface::Web
+
+=begin testing
+
+use_ok(RT::Interface::Web);
+
+=end testing
+
+=cut
+
+
 package RT::Interface::Web;
+use strict;
 
-# {{{ sub NewParser
 
-=head2 NewParser
 
-  Returns a new Mason::Parser object. Takes a param hash of things 
-  that get passed to HTML::Mason::Parser. Currently hard coded to only
-  take the parameter 'allow_globals'.
+
+
+# {{{ sub NewApacheHandler 
+
+=head2 NewApacheHandler
+
+  Takes extra options to pass to HTML::Mason::ApacheHandler->new
+  Returns a new Mason::ApacheHandler object
 
 =cut
 
-sub NewParser {
-    my %args = (
-        allow_globals => undef,
+sub NewApacheHandler {
+    require HTML::Mason::ApacheHandler;
+    my $ah = new HTML::Mason::ApacheHandler( 
+    
+        comp_root                    => [
+            [ local    => $RT::MasonLocalComponentRoot ],
+            [ standard => $RT::MasonComponentRoot ]
+        ],
+        args_method => "CGI",
+        default_escape_flags => 'h',
+        allow_globals        => [qw(%session)],
+        data_dir => "$RT::MasonDataDir",
         @_
     );
 
-    my $parser = new HTML::Mason::Parser(
-        default_escape_flags => 'h',
-        allow_globals        => $args{'allow_globals'}
-    );
-    return ($parser);
+    $ah->interp->set_escape( h => \&RT::Interface::Web::EscapeUTF8 );
+    
+    return ($ah);
 }
 
 # }}}
 
-# {{{ sub NewInterp
+# {{{ sub NewCGIHandler 
 
-=head2 NewInterp 
+=head2 NewCGIHandler
 
-  Takes a paremeter hash. Needs a param called 'parser' which is a reference
-  to an HTML::Mason::Parser.
-  returns a new Mason::Interp object
+  Returns a new Mason::CGIHandler object
 
 =cut
 
-sub NewInterp {
-    my %params = (
+sub NewCGIHandler {
+    my %args = (
+        @_
+    );
+
+    my $handler = HTML::Mason::CGIHandler->new(
         comp_root                    => [
             [ local    => $RT::MasonLocalComponentRoot ],
             [ standard => $RT::MasonComponentRoot ]
         ],
         data_dir => "$RT::MasonDataDir",
-        @_
+        default_escape_flags => 'h',
+        allow_globals        => [qw(%session)]
     );
+  
 
-    #We allow recursive autohandlers to allow for RT auth.
+    $handler->interp->set_escape( h => \&RT::Interface::Web::EscapeUTF8 );
 
-    use HTML::Mason::Interp;
-    my $interp = new HTML::Mason::Interp(%params);
 
-}
+    return ($handler);
 
+}
 # }}}
 
-# {{{ sub NewApacheHandler 
 
-=head2 NewApacheHandler
+# {{{ EscapeUTF8
 
-  Takes a Mason::Interp object
-  Returns a new Mason::ApacheHandler object
+=head2 EscapeUTF8 SCALARREF
+
+does a css-busting but minimalist escaping of whatever html you're passing in.
 
 =cut
 
-sub NewApacheHandler {
-    my $interp = shift;
-    my $ah = new HTML::Mason::ApacheHandler( interp => $interp );
-    return ($ah);
+sub EscapeUTF8  {
+        my  $ref = shift;
+        my $val = $$ref;
+        use bytes;
+        $val =~ s/&/&#38;/g;
+        $val =~ s/</&lt;/g; 
+        $val =~ s/>/&gt;/g;
+        $val =~ s/\(/&#40;/g;
+        $val =~ s/\)/&#41;/g;
+        $val =~ s/"/&#34;/g;
+        $val =~ s/'/&#39;/g;
+        $$ref = $val;
+        Encode::_utf8_on($$ref);
+
 }
 
 # }}}
 
 
-# {{{ sub NewMason11ApacheHandler
+package HTML::Mason::Commands;
+use strict;
+use vars qw/$r $m %session/;
 
-=head2 NewMason11ApacheHandler
 
-  Returns a new Mason::ApacheHandler object
+# {{{ loc
+
+=head2 loc ARRAY
+
+loc is a nice clean global routine which calls $session{'CurrentUser'}->loc()
+with whatever it's called with. If there is no $session{'CurrentUser'}, 
+it creates a temporary user, so we have something to get a localisation handle
+through
 
 =cut
 
-sub NewMason11ApacheHandler {
-        my %args = ( default_escape_flags => 'h',
-                    allow_globals        => [%session],
-        comp_root                    => [
-            [ local    => $RT::MasonLocalComponentRoot ],
-            [ standard => $RT::MasonComponentRoot ]
-        ],
-        data_dir => "$RT::MasonDataDir",
-        args_method => 'CGI'
-    );
-    my $ah = new HTML::Mason::ApacheHandler(%args);
-    return ($ah);
+sub loc {
+
+    if ($session{'CurrentUser'} && 
+        UNIVERSAL::can($session{'CurrentUser'}, 'loc')){
+        return($session{'CurrentUser'}->loc(@_));
+    }
+    else  {
+        my $u = RT::CurrentUser->new($RT::SystemUser);
+        return ($u->loc(@_));
+    }
 }
 
 # }}}
 
 
+# {{{ loc_fuzzy
+
+=head2 loc_fuzzy STRING
 
+loc_fuzzy is for handling localizations of messages that may already
+contain interpolated variables, typically returned from libraries
+outside RT's control.  It takes the message string and extracts the
+variable array automatically by matching against the candidate entries
+inside the lexicon file.
+
+=cut
 
+sub loc_fuzzy {
+    my $msg  = shift;
+    
+    if ($session{'CurrentUser'} && 
+        UNIVERSAL::can($session{'CurrentUser'}, 'loc')){
+        return($session{'CurrentUser'}->loc_fuzzy($msg));
+    }
+    else  {
+        my $u = RT::CurrentUser->new($RT::SystemUser);
+        return ($u->loc_fuzzy($msg));
+    }
+}
 
 # }}}
 
-package HTML::Mason::Commands;
 
 # {{{ sub Abort
 # Error - calls Error and aborts
 sub Abort {
 
-    if ( $session{'ErrorDocument'} && $session{'ErrorDocumentType'} ) {
-        SetContentType( $session{'ErrorDocumentType'} );
-        $m->comp( $session{'ErrorDocument'}, Why => shift );
+    if ($session{'ErrorDocument'} && 
+        $session{'ErrorDocumentType'}) {
+        $r->content_type($session{'ErrorDocumentType'});
+        $m->comp($session{'ErrorDocument'} , Why => shift);
         $m->abort;
-    }
-    else {
-        SetContentType('text/html');
-        $m->comp( "/Elements/Error", Why => shift );
+    } 
+    else  {
+        $m->comp("/Elements/Error" , Why => shift);
         $m->abort;
     }
 }
@@ -135,6 +220,7 @@ sub Abort {
 =head2 CreateTicket ARGS
 
 Create a new ticket, using Mason's %ARGS.  returns @results.
+
 =cut
 
 sub CreateTicket {
@@ -158,38 +244,45 @@ sub CreateTicket {
     my $starts = new RT::Date( $session{'CurrentUser'} );
     $starts->Set( Format => 'unknown', Value => $ARGS{'Starts'} );
 
-    my @Requestors = split ( /,/, $ARGS{'Requestors'} );
-    my @Cc         = split ( /,/, $ARGS{'Cc'} );
-    my @AdminCc    = split ( /,/, $ARGS{'AdminCc'} );
+    my @Requestors = split ( /\s*,\s*/, $ARGS{'Requestors'} );
+    my @Cc         = split ( /\s*,\s*/, $ARGS{'Cc'} );
+    my @AdminCc    = split ( /\s*,\s*/, $ARGS{'AdminCc'} );
 
     my $MIMEObj = MakeMIMEEntity(
         Subject             => $ARGS{'Subject'},
         From                => $ARGS{'From'},
         Cc                  => $ARGS{'Cc'},
         Body                => $ARGS{'Content'},
-        AttachmentFieldName => 'Attach'
     );
 
+    if ($ARGS{'Attachments'}) {
+        $MIMEObj->make_multipart;
+        $MIMEObj->add_part($_) foreach values %{$ARGS{'Attachments'}};
+    }
+
     my %create_args = (
-        Queue           => $ARGS{Queue},
-        Owner           => $ARGS{Owner},
-        InitialPriority => $ARGS{InitialPriority},
-        FinalPriority   => $ARGS{FinalPriority},
-        TimeLeft        => $ARGS{TimeLeft},
-        TimeWorked      => $ARGS{TimeWorked},
+        Queue           => $ARGS{'Queue'},
+        Owner           => $ARGS{'Owner'},
+        InitialPriority => $ARGS{'InitialPriority'},
+        FinalPriority   => $ARGS{'FinalPriority'},
+        TimeLeft        => $ARGS{'TimeLeft'},
+        TimeEstimated        => $ARGS{'TimeEstimated'},
+        TimeWorked      => $ARGS{'TimeWorked'},
         Requestor       => \@Requestors,
         Cc              => \@Cc,
         AdminCc         => \@AdminCc,
-        Subject         => $ARGS{Subject},
-        Status          => $ARGS{Status},
+        Subject         => $ARGS{'Subject'},
+        Status          => $ARGS{'Status'},
         Due             => $due->ISO,
         Starts          => $starts->ISO,
         MIMEObj         => $MIMEObj
     );
-
-    # we need to get any KeywordSelect-<integer> fields into %create_args..
-    grep { $_ =~ /^KeywordSelect-/ &&{ $create_args{$_} = $ARGS{$_} } } %ARGS;
-
+  foreach my $arg (%ARGS) {
+        if ($arg =~ /^CustomField-(\d+)(.*?)$/) {
+            next if ($arg =~ /-Magic$/);
+            $create_args{"CustomField-".$1} = $ARGS{"$arg"};
+        }
+    }
     my ( $id, $Trans, $ErrMsg ) = $Ticket->Create(%create_args);
     unless ( $id && $Trans ) {
         Abort($ErrMsg);
@@ -216,7 +309,7 @@ sub CreateTicket {
         }
     }
 
-    push ( @Actions, $ErrMsg );
+    push ( @Actions, split("\n", $ErrMsg) );
     unless ( $Ticket->CurrentUserHasRight('ShowTicket') ) {
         Abort( "No permission to view newly created ticket #"
             . $Ticket->id . "." );
@@ -283,80 +376,38 @@ sub ProcessUpdateMessage {
         my $Message = MakeMIMEEntity(
             Subject             => $args{ARGSRef}->{'UpdateSubject'},
             Body                => $args{ARGSRef}->{'UpdateContent'},
-            AttachmentFieldName => 'UpdateAttachment'
         );
 
-	## Check whether this was a refresh or not.  
-
-	# Match Correspondence or Comments.
-        my $trans_flag = -2;
-	my $trans_type = undef;
-	my $orig_trans = $args{ARGSRef}->{'UpdateType'};
-        if ( $orig_trans =~ /^(private|public)$/ ) {
-	    $trans_type = "Comment";
-        }elsif ( $orig_trans eq 'response' ) {
-	    $trans_type = "Correspond";
-	}
-
-	# Do we have a transaction that we need to update on? session
-	if( defined( $trans_type ) ){
-	    $trans_flag = 0;
-
-	    # Prepare a checksum.
-	    # See perldoc -f unpack for example of this.
-	    my $this_checksum = unpack("%32C*", $Message->body_as_string ) % 65535;
-
-	    # The above *could* generate duplicate checksums.  Crosscheck with
-	    # the length.
-	    my $this_length = length( $Message->body_as_string );
-
-	    # Don't forget the ticket id.
-	    my $this_id = $args{TicketObj}->id;
-
-	    # Check whether the previous transaction in the
-	    # ticket is the same as the current transaction.
-	    if( defined( $session{'prev_trans_type'} ) && defined( $session{'prev_trans_chksum'} ) && defined( $session{'prev_trans_length'} ) && defined( $session{'prev_trans_tickid'} ) ){
-		if( $session{'prev_trans_type'} eq $orig_trans && $session{'prev_trans_chksum'} == $this_checksum && $session{'prev_trans_length'} == $this_length && $session{'prev_trans_tickid'} == $this_id ){
-		    # Its the same as the previous transaction for this user.
-		    $trans_flag = -1;
-		}
-	    }
-
-	    # Store them for next time.
-	    $session{'prev_trans_type'} = $orig_trans;
-	    $session{'prev_trans_chksum'} = $this_checksum;
-	    $session{'prev_trans_length'} = $this_length;
-	    $session{'prev_trans_tickid'} = $this_id;
-
-	    if( $trans_flag == -1 ){
-                push ( @{ $args{'Actions'} },
-"This appears to be a duplicate of your previous update (please do not refresh this page)" );
-	    }
-
-
-            if ( $trans_type eq 'Comment' && $trans_flag >= 0 ) {
-                my ( $Transaction, $Description ) = $args{TicketObj}->Comment(
-                    CcMessageTo  => $args{ARGSRef}->{'UpdateCc'},
-                    BccMessageTo => $args{ARGSRef}->{'UpdateBcc'},
-                    MIMEObj      => $Message,
-                    TimeTaken    => $args{ARGSRef}->{'UpdateTimeWorked'}
-                );
-                push ( @{ $args{Actions} }, $Description );
-            }
-            elsif ( $trans_type eq 'Correspond' && $trans_flag >= 0 ) {
-                my ( $Transaction, $Description ) = $args{TicketObj}->Correspond(
-                    CcMessageTo  => $args{ARGSRef}->{'UpdateCc'},
-                    BccMessageTo => $args{ARGSRef}->{'UpdateBcc'},
-                    MIMEObj      => $Message,
-                    TimeTaken    => $args{ARGSRef}->{'UpdateTimeWorked'}
-                );
-                push ( @{ $args{Actions} }, $Description );
-            }
-	}
+        if ($args{ARGSRef}->{'UpdateAttachments'}) {
+            $Message->make_multipart;
+            $Message->add_part($_) foreach values %{$args{ARGSRef}->{'UpdateAttachments'}};
+        }
+
+        ## TODO: Implement public comments
+        if ( $args{ARGSRef}->{'UpdateType'} =~ /^(private|public)$/ ) {
+            my ( $Transaction, $Description ) = $args{TicketObj}->Comment(
+                CcMessageTo  => $args{ARGSRef}->{'UpdateCc'},
+                BccMessageTo => $args{ARGSRef}->{'UpdateBcc'},
+                MIMEObj      => $Message,
+                TimeTaken    => $args{ARGSRef}->{'UpdateTimeWorked'}
+            );
+            push ( @{ $args{Actions} }, $Description );
+        }
+        elsif ( $args{ARGSRef}->{'UpdateType'} eq 'response' ) {
+            my ( $Transaction, $Description ) = $args{TicketObj}->Correspond(
+                CcMessageTo  => $args{ARGSRef}->{'UpdateCc'},
+                BccMessageTo => $args{ARGSRef}->{'UpdateBcc'},
+                MIMEObj      => $Message,
+                TimeTaken    => $args{ARGSRef}->{'UpdateTimeWorked'}
+            );
+            push ( @{ $args{Actions} }, $Description );
+        }
         else {
             push ( @{ $args{'Actions'} },
-    "Update type was neither correspondence nor comment. Update not recorded"
-                );
+                loc("Update type was neither correspondence nor comment.").
+                " ".
+                loc("Update not recorded.")
+            );
         }
     }
 }
@@ -382,61 +433,66 @@ sub MakeMIMEEntity {
         Cc                  => undef,
         Body                => undef,
         AttachmentFieldName => undef,
-        @_
+        map Encode::encode_utf8($_), @_,
     );
 
     #Make the update content have no 'weird' newlines in it
 
     $args{'Body'} =~ s/\r\n/\n/gs;
-    my $Message = MIME::Entity->build(
-        Subject => $args{'Subject'} || "",
-        From    => $args{'From'},
-        Cc      => $args{'Cc'},
-        Data    => [ $args{'Body'} ]
-    );
+    my $Message;
+    {
+        # MIME::Head is not happy in utf-8 domain.  This only happens
+        # when processing an incoming email (so far observed).
+        no utf8;
+        use bytes;
+        $Message = MIME::Entity->build(
+            Subject => $args{'Subject'} || "",
+            From    => $args{'From'},
+            Cc      => $args{'Cc'},
+            Data    => [ $args{'Body'} ]
+        );
+    }
 
-    my $cgi_object = CGIObject();
-    if ( $cgi_object->param( $args{'AttachmentFieldName'} ) ) {
+    my $cgi_object = $m->cgi_object;
 
-        my $cgi_filehandle =
-          $cgi_object->upload( $args{'AttachmentFieldName'} );
+    if (my $filehandle = $cgi_object->upload( $args{'AttachmentFieldName'} ) ) {
 
-        use File::Temp qw(tempfile tempdir);
 
-        #foreach my $filehandle (@filenames) {
 
-        # my ( $fh, $temp_file ) = tempfile();
+    use File::Temp qw(tempfile tempdir);
 
-        #$binmode $fh;    #thank you, windows
+    #foreach my $filehandle (@filenames) {
 
-        # We're having trouble with tempfiles not getting created. Let's try it with 
-        # a scalar instead
+    my ( $fh, $temp_file ) = tempfile();
 
-        my ( $buffer, @file );
+    binmode $fh;    #thank you, windows
+    my ($buffer);
+    while ( my $bytesread = read( $filehandle, $buffer, 4096 ) ) {
+        print $fh $buffer;
+    }
 
-        while ( my $bytesread = read( $cgi_filehandle, $buffer, 4096 ) ) {
-            push ( @file, $buffer );
-        }
+    my $uploadinfo = $cgi_object->uploadInfo($filehandle);
 
-        $RT::Logger->debug($file);
-        my $filename = "$cgi_filehandle";
-        $filename =~ s#^(.*)/##;
-        $filename =~ s#^(.*)\\##;
-        my $uploadinfo = $cgi_object->uploadInfo($cgi_filehandle);
-        $Message->attach(
-            Data => \@file,
-
-            #Path     => $temp_file,
-            Filename => $filename,
-            Type     => $uploadinfo->{'Content-Type'}
-        );
+    # Prefer the cached name first over CGI.pm stringification.
+    my $filename = $RT::Mason::CGI::Filename;
+    $filename = "$filehandle" unless defined($filename);
+                   
+    $filename =~ s#^.*[\\/]##;
+
+    $Message->attach(
+        Path     => $temp_file,
+        Filename => $filename,
+        Type     => $uploadinfo->{'Content-Type'},
+    );
+    close($fh);
 
-        #close($fh);
-        #unlink($temp_file);
+    #   }
 
-        #	}
     }
+
     $Message->make_singlepart();
+    RT::I18N::SetMIMEEntityToUTF8($Message); # convert text parts into utf-8
+
     return ($Message);
 
 }
@@ -485,6 +541,9 @@ sub ProcessSearchQuery {
     elsif ( $args{ARGS}->{'GotoPage'} eq 'Prev' ) {
         $session{'tickets'}->PrevPage;
     }
+    elsif ( $args{ARGS}->{'GotoPage'} > 0 ) {
+        $session{'tickets'}->GotoPage( $args{ARGS}->{GotoPage} - 1 );
+    }
 
     # }}}
 
@@ -576,8 +635,12 @@ sub ProcessSearchQuery {
     # }}}
     # {{{ Limit Subject
     if ( $args{ARGS}->{'ValueOfSubject'} ne '' ) {
+            my $val = $args{ARGS}->{'ValueOfSubject'};
+        if ($args{ARGS}->{'SubjectOp'} =~ /like/) {
+            $val = "%".$val."%";
+        }
         $session{'tickets'}->LimitSubject(
-            VALUE    => $args{ARGS}->{'ValueOfSubject'},
+            VALUE    => $val,
             OPERATOR => $args{ARGS}->{'SubjectOp'},
         );
     }
@@ -585,40 +648,59 @@ sub ProcessSearchQuery {
     # }}}    
     # {{{ Limit Dates
     if ( $args{ARGS}->{'ValueOfDate'} ne '' ) {
-
         my $date = ParseDateToISO( $args{ARGS}->{'ValueOfDate'} );
         $args{ARGS}->{'DateType'} =~ s/_Date$//;
 
-        $session{'tickets'}->LimitDate(
-            FIELD    => $args{ARGS}->{'DateType'},
-            VALUE    => $date,
-            OPERATOR => $args{ARGS}->{'DateOp'},
-        );
+        if ( $args{ARGS}->{'DateType'} eq 'Updated' ) {
+            $session{'tickets'}->LimitTransactionDate(
+                                            VALUE    => $date,
+                                            OPERATOR => $args{ARGS}->{'DateOp'},
+            );
+        }
+        else {
+            $session{'tickets'}->LimitDate( FIELD => $args{ARGS}->{'DateType'},
+                                            VALUE => $date,
+                                            OPERATOR => $args{ARGS}->{'DateOp'},
+            );
+        }
     }
 
     # }}}    
     # {{{ Limit Content
-    if ( $args{ARGS}->{'ValueOfContent'} ne '' ) {
-        $session{'tickets'}->LimitContent(
-            VALUE    => $args{ARGS}->{'ValueOfContent'},
-            OPERATOR => $args{ARGS}->{'ContentOp'},
+    if ( $args{ARGS}->{'ValueOfAttachmentField'} ne '' ) {
+        my $val = $args{ARGS}->{'ValueOfAttachmentField'};
+        if ($args{ARGS}->{'AttachmentFieldOp'} =~ /like/) {
+            $val = "%".$val."%";
+        }
+        $session{'tickets'}->Limit(
+            FIELD   => $args{ARGS}->{'AttachmentField'},
+            VALUE    => $val,
+            OPERATOR => $args{ARGS}->{'AttachmentFieldOp'},
         );
     }
 
     # }}}   
-    # {{{ Limit KeywordSelects
 
-    foreach my $KeywordSelectId (
-        map { /^KeywordSelect(\d+)$/; $1 }
-        grep { /^KeywordSelect(\d+)$/; } keys %{ $args{ARGS} }
-      )
-    {
-        my $form = $args{ARGS}->{"KeywordSelect$KeywordSelectId"};
-        my $oper = $args{ARGS}->{"KeywordSelectOp$KeywordSelectId"};
-        foreach my $KeywordId ( ref($form) ? @{$form} : ($form) ) {
-            next unless ($KeywordId);
+ # {{{ Limit CustomFields
+
+    foreach my $arg ( keys %{ $args{ARGS} } ) {
+        my $id;
+        if ( $arg =~ /^CustomField(\d+)$/ ) {
+            $id = $1;
+        }
+        else {
+            next;
+        }
+        next unless ( $args{ARGS}->{$arg} );
+
+        my $form = $args{ARGS}->{$arg};
+        my $oper = $args{ARGS}->{ "CustomFieldOp" . $id };
+        foreach my $value ( ref($form) ? @{$form} : ($form) ) {
             my $quote = 1;
-            if ( $KeywordId =~ /^null$/i ) {
+            if ($oper =~ /like/i) {
+                $value = "%".$value."%";
+            }
+            if ( $value =~ /^null$/i ) {
 
                 #Don't quote the string 'null'
                 $quote = 0;
@@ -627,17 +709,16 @@ sub ProcessSearchQuery {
                 $oper = 'IS'     if ( $oper eq '=' );
                 $oper = 'IS NOT' if ( $oper eq '!=' );
             }
-            $session{'tickets'}->LimitKeyword(
-                KEYWORDSELECT => $KeywordSelectId,
-                OPERATOR      => $oper,
-                QUOTEVALUE    => $quote,
-                KEYWORD       => $KeywordId
-            );
+            $session{'tickets'}->LimitCustomField( CUSTOMFIELD => $id,
+                                                   OPERATOR    => $oper,
+                                                   QUOTEVALUE  => $quote,
+                                                   VALUE       => $value );
         }
     }
 
     # }}}
 
+
 }
 
 # }}}
@@ -654,7 +735,7 @@ Returns an ISO date and time in GMT
 sub ParseDateToISO {
     my $date = shift;
 
-    my $date_obj = new RT::Date($CurrentUser);
+    my $date_obj = RT::Date->new($session{'CurrentUser'});
     $date_obj->Set(
         Format => 'unknown',
         Value  => $date
@@ -680,172 +761,82 @@ sub Config {
 # {{{ sub ProcessACLChanges
 
 sub ProcessACLChanges {
-    my $ACLref  = shift;
     my $ARGSref = shift;
 
-    my @CheckACL = @$ACLref;
     my %ARGS     = %$ARGSref;
 
     my ( $ACL, @results );
 
-    # {{{ Add rights
-    foreach $ACL (@CheckACL) {
-        my ($Principal);
 
-        next unless ($ACL);
+    foreach my $arg (keys %ARGS) {
+        if ($arg =~ /GrantRight-(\d+)-(.*?)-(\d+)$/) {
+            my $principal_id = $1;
+            my $object_type = $2;
+            my $object_id = $3;
+            my $rights = $ARGS{$arg};
 
-        # Parse out what we're really talking about. 
-        if ( $ACL =~ /^(.*?)-(\d+)-(.*?)-(\d+)/ ) {
-            my $PrincipalType = $1;
-            my $PrincipalId   = $2;
-            my $Scope         = $3;
-            my $AppliesTo     = $4;
+            my $principal = RT::Principal->new($session{'CurrentUser'});
+            $principal->Load($principal_id);
 
-            # {{{ Create an object called Principal
-            # so we can do rights operations
+            my $obj;
 
-            if ( $PrincipalType eq 'User' ) {
-                $Principal = new RT::User( $session{'CurrentUser'} );
-            }
-            elsif ( $PrincipalType eq 'Group' ) {
-                $Principal = new RT::Group( $session{'CurrentUser'} );
-            }
-            else {
-                Abort("$PrincipalType unknown principal type");
-            }
+            if ($object_type eq 'RT::Queue') {
+                $obj = RT::Queue->new($session{'CurrentUser'});
+                $obj->Load($object_id);      
+            } elsif ($object_type eq 'RT::Group') {
+                $obj = RT::Group->new($session{'CurrentUser'});
+                $obj->Load($object_id);      
 
-            $Principal->Load($PrincipalId)
-              || Abort("$PrincipalType $PrincipalId couldn't be loaded");
-
-            # }}}
-
-            # {{{ load up an RT::ACL object with the same current vals of this ACL
-
-            my $CurrentACL = new RT::ACL( $session{'CurrentUser'} );
-            if ( $Scope eq 'Queue' ) {
-                $CurrentACL->LimitToQueue($AppliesTo);
+            } elsif ($object_type eq 'RT::System') {
+                $obj = $RT::System;
+            } else {
+                push (@results, loc("System Error").
+                                loc("Rights could not be granted for [_1]", $object_type));
+                next;
             }
-            elsif ( $Scope eq 'System' ) {
-                $CurrentACL->LimitToSystem();
-            }
-
-            $CurrentACL->LimitPrincipalToType($PrincipalType);
-            $CurrentACL->LimitPrincipalToId($PrincipalId);
-
-            # }}}
-
-            # {{{ Get the values of the select we're working with 
-            # into an array. it will contain all the new rights that have 
-            # been granted
-            #Hack to turn the ACL returned into an array
-            my @rights =
-              ref( $ARGS{"GrantACE-$ACL"} ) eq 'ARRAY'
-              ? @{ $ARGS{"GrantACE-$ACL"} }
-              : ( $ARGS{"GrantACE-$ACL"} );
-
-            # }}}
-
-            # {{{ Add any rights we need.
 
+            my @rights = ref($ARGS{$arg}) eq 'ARRAY' ? @{$ARGS{$arg}} : ($ARGS{$arg});
             foreach my $right (@rights) {
                 next unless ($right);
-
-                #if the right that's been selected wasn't there before, add it.
-                unless (
-                    $CurrentACL->HasEntry(
-                        RightScope     => "$Scope",
-                        RightName      => "$right",
-                        RightAppliesTo => "$AppliesTo",
-                        PrincipalType  => $PrincipalType,
-                        PrincipalId    => $Principal->Id
-                    )
-                  )
-                {
-
-                    #Add new entry to list of rights.
-                    if ( $Scope eq 'Queue' ) {
-                        my $Queue = new RT::Queue( $session{'CurrentUser'} );
-                        $Queue->Load($AppliesTo);
-                        unless ( $Queue->id ) {
-                            Abort("Couldn't find a queue called $AppliesTo");
-                        }
-
-                        my ( $val, $msg ) = $Principal->GrantQueueRight(
-                            RightAppliesTo => $Queue->id,
-                            RightName      => "$right"
-                        );
-
-                        if ($val) {
-                            push ( @results,
-                                "Granted right $right to "
-                                  . $Principal->Name
-                                  . " for queue "
-                                  . $Queue->Name );
-                        }
-                        else {
-                            push ( @results, $msg );
-                        }
-                    }
-                    elsif ( $Scope eq 'System' ) {
-                        my ( $val, $msg ) = $Principal->GrantSystemRight(
-                            RightAppliesTo => $AppliesTo,
-                            RightName      => "$right"
-                        );
-                        if ($val) {
-                            push ( @results, "Granted system right '$right' to "
-                                  . $Principal->Name );
-                        }
-                        else {
-                            push ( @results, $msg );
-                        }
-                    }
-                }
+                my ($val, $msg) = $principal->GrantRight(Object => $obj, Right => $right);
+                push (@results, $msg);
             }
-
-            # }}}
         }
-    }
-
-    # }}} Add rights
-
-    # {{{ remove any rights that have been deleted
-
-    my @RevokeACE =
-      ref( $ARGS{"RevokeACE"} ) eq 'ARRAY' 
-      ? @{ $ARGS{"RevokeACE"} }
-      : ( $ARGS{"RevokeACE"} );
-
-    foreach my $aceid (@RevokeACE) {
-
-        my $right = new RT::ACE( $session{'CurrentUser'} );
-        $right->Load($aceid);
-        next unless ( $right->id );
+       elsif ($arg =~ /RevokeRight-(\d+)-(.*?)-(\d+)-(.*?)$/) {
+            my $principal_id = $1;
+            my $object_type = $2;
+            my $object_id = $3;
+            my $right = $4;
+
+            my $principal = RT::Principal->new($session{'CurrentUser'});
+            $principal->Load($principal_id);
+            next unless ($right);
+            my $obj;
+
+            if ($object_type eq 'RT::Queue') {
+                $obj = RT::Queue->new($session{'CurrentUser'});
+                $obj->Load($object_id);      
+            } elsif ($object_type eq 'RT::Group') {
+                $obj = RT::Group->new($session{'CurrentUser'});
+                $obj->Load($object_id);      
+
+            } elsif ($object_type eq 'RT::System') {
+                $obj = $RT::System;
+            } else {
+                push (@results, loc("System Error").
+                                loc("Rights could not be revoked for [_1]", $object_type));
+                next;
+            }
+            my ($val, $msg) = $principal->RevokeRight(Object => $obj, Right => $right);
+            push (@results, $msg);
+        }
 
-        my $phrase = "Revoked "
-          . $right->PrincipalType . " "
-          . $right->PrincipalObj->Name
-          . "'s right to "
-          . $right->RightName;
 
-        if ( $right->RightScope eq 'System' ) {
-            $phrase .= ' across all queues.';
-        }
-        else {
-            $phrase .= ' for the queue ' . $right->AppliesToObj->Name . '.';
-        }
-        my ( $val, $msg ) = $right->Delete();
-        if ($val) {
-            push ( @results, $phrase );
-        }
-        else {
-            push ( @results, $msg );
-        }
     }
 
-    # }}}
-
     return (@results);
-}
+
+    }
 
 # }}}
 
@@ -864,6 +855,7 @@ sub UpdateRecordObject {
         ARGSRef       => undef,
         AttributesRef => undef,
         Object        => undef,
+        AttributePrefix => undef,
         @_
     );
 
@@ -872,17 +864,94 @@ sub UpdateRecordObject {
     my $object     = $args{'Object'};
     my $attributes = $args{'AttributesRef'};
     my $ARGSRef    = $args{'ARGSRef'};
+    foreach my $attribute (@$attributes) {
+        my $value;
+        if ( defined $ARGSRef->{$attribute} ) {
+            $value = $ARGSRef->{$attribute};
+        }
+        elsif (
+              defined( $args{'AttributePrefix'} )
+              && defined(
+                  $ARGSRef->{ $args{'AttributePrefix'} . "-" . $attribute }
+              )
+          ) {
+            $value = $ARGSRef->{ $args{'AttributePrefix'} . "-" . $attribute };
+
+        } else {
+                next;
+        }
 
-    foreach $attribute (@$attributes) {
-        if ( ( defined $ARGSRef->{"$attribute"} )
-            and ( $ARGSRef->{"$attribute"} ne $object->$attribute() ) )
-        {
-            $ARGSRef->{"$attribute"} =~ s/\r\n/\n/gs;
+            $value =~ s/\r\n/\n/gs;
+
+        if ($value ne $object->$attribute()){
+
+              my $method = "Set$attribute";
+              my ( $code, $msg ) = $object->$method($value);
+
+              push @results, loc($attribute) . ': ' . loc_fuzzy($msg);
+=for loc
+                                   "[_1] could not be set to [_2].",       # loc
+                                   "That is already the current value",    # loc
+                                   "No value sent to _Set!\n",             # loc
+                                   "Illegal value for [_1]",               # loc
+                                   "The new value has been set.",          # loc
+                                   "No column specified",                  # loc
+                                   "Immutable field",                      # loc
+                                   "Nonexistant field?",                   # loc
+                                   "Invalid data",                         # loc
+                                   "Couldn't find row",                    # loc
+                                   "Missing a primary key?: [_1]",         # loc
+                                   "Found Object",                         # loc
+=cut
+          };
+    }
+    return (@results);
+}
 
-            my $method = "Set$attribute";
-            my ( $code, $msg ) = $object->$method( $ARGSRef->{"$attribute"} );
-            push @results, "$attribute: $msg";
-        }
+# }}}
+
+# {{{ Sub ProcessCustomFieldUpdates
+
+sub ProcessCustomFieldUpdates {
+    my %args = (
+        CustomFieldObj => undef,
+        ARGSRef        => undef,
+        @_
+    );
+
+    my $Object  = $args{'CustomFieldObj'};
+    my $ARGSRef = $args{'ARGSRef'};
+
+    my @attribs = qw( Name Type Description Queue SortOrder);
+    my @results = UpdateRecordObject(
+        AttributesRef => \@attribs,
+        Object        => $Object,
+        ARGSRef       => $ARGSRef
+    );
+
+    if ( $ARGSRef->{ "CustomField-" . $Object->Id . "-AddValue-Name" } ) {
+
+        my ( $addval, $addmsg ) = $Object->AddValue(
+            Name =>
+              $ARGSRef->{ "CustomField-" . $Object->Id . "-AddValue-Name" },
+            Description => $ARGSRef->{ "CustomField-"
+                  . $Object->Id
+                  . "-AddValue-Description" },
+            SortOrder => $ARGSRef->{ "CustomField-"
+                  . $Object->Id
+                  . "-AddValue-SortOrder" },
+        );
+        push ( @results, $addmsg );
+    }
+    my @delete_values = (
+        ref $ARGSRef->{ 'CustomField-' . $Object->Id . '-DeleteValue' } eq
+          'ARRAY' )
+      ? @{ $ARGSRef->{ 'CustomField-' . $Object->Id . '-DeleteValue' } }
+      : ( $ARGSRef->{ 'CustomField-' . $Object->Id . '-DeleteValue' } );
+    foreach my $id (@delete_values) {
+        next unless defined $id;
+        my ( $err, $msg ) = $Object->DeleteValue($id);
+        push ( @results, $msg );
     }
     return (@results);
 }
@@ -913,6 +982,7 @@ sub ProcessTicketBasics {
       Subject
       FinalPriority
       Priority
+      TimeEstimated
       TimeWorked
       TimeLeft
       Status
@@ -934,7 +1004,7 @@ sub ProcessTicketBasics {
     );
 
     # We special case owner changing, so we can use ForceOwnerChange
-    if ( $ARGSRef->{'Owner'} && ( $TicketObj->Owner ne $ARGSRef->{'Owner'} ) ) {
+    if ( $ARGSRef->{'Owner'} && ( $TicketObj->Owner != $ARGSRef->{'Owner'} ) ) {
         my ($ChownType);
         if ( $ARGSRef->{'ForceOwnerChange'} ) {
             $ChownType = "Force";
@@ -945,7 +1015,7 @@ sub ProcessTicketBasics {
 
         my ( $val, $msg ) =
           $TicketObj->SetOwner( $ARGSRef->{'Owner'}, $ChownType );
-        push ( @results, "$msg" );
+        push ( @results, $msg );
     }
 
     # }}}
@@ -955,6 +1025,142 @@ sub ProcessTicketBasics {
 
 # }}}
 
+# {{{ Sub ProcessTicketCustomFieldUpdates
+
+sub ProcessTicketCustomFieldUpdates {
+    my %args = (
+        ARGSRef => undef,
+        @_
+    );
+
+    my @results;
+
+    my $ARGSRef = $args{'ARGSRef'};
+
+    # Build up a list of tickets that we want to work with
+    my %tickets_to_mod;
+    my %custom_fields_to_mod;
+    foreach my $arg ( keys %{$ARGSRef} ) {
+        if ( $arg =~ /^Ticket-(\d+)-CustomField-(\d+)-/ ) {
+
+            # For each of those tickets, find out what custom fields we want to work with.
+            $custom_fields_to_mod{$1}{$2} = 1;
+        }
+    }
+
+    # For each of those tickets
+    foreach my $tick ( keys %custom_fields_to_mod ) {
+        my $Ticket = RT::Ticket->new( $session{'CurrentUser'} );
+        $Ticket->Load($tick);
+
+        # For each custom field  
+        foreach my $cf ( keys %{ $custom_fields_to_mod{$tick} } ) {
+
+	    my $CustomFieldObj = RT::CustomField->new($session{'CurrentUser'});
+	    $CustomFieldObj->LoadById($cf);
+
+            foreach my $arg ( keys %{$ARGSRef} ) {
+                # since http won't pass in a form element with a null value, we need
+                # to fake it
+                if ($arg =~ /^(.*?)-Values-Magic$/ ) {
+                    # We don't care about the magic, if there's really a values element;
+                    next if (exists $ARGSRef->{$1.'-Values'}) ;
+
+                    $arg = $1."-Values";
+                    $ARGSRef->{$1."-Values"} = undef;
+                
+                }
+                next unless ( $arg =~ /^Ticket-$tick-CustomField-$cf-/ );
+                my @values =
+                  ( ref( $ARGSRef->{$arg} ) eq 'ARRAY' ) 
+                  ? @{ $ARGSRef->{$arg} }
+                  : ( $ARGSRef->{$arg} );
+                if ( ( $arg =~ /-AddValue$/ ) || ( $arg =~ /-Value$/ ) ) {
+                    foreach my $value (@values) {
+                        next unless ($value);
+                        my ( $val, $msg ) = $Ticket->AddCustomFieldValue(
+                            Field => $cf,
+                            Value => $value
+                        );
+                        push ( @results, $msg );
+                    }
+                }
+                elsif ( $arg =~ /-DeleteValues$/ ) {
+                    foreach my $value (@values) {
+                        next unless ($value);
+                        my ( $val, $msg ) = $Ticket->DeleteCustomFieldValue(
+                            Field => $cf,
+                            Value => $value
+                        );
+                        push ( @results, $msg );
+                    }
+                }
+                elsif ( $arg =~ /-Values$/ and $CustomFieldObj->Type !~ /Entry/) {
+                    my $cf_values = $Ticket->CustomFieldValues($cf);
+
+                    my %values_hash;
+                    foreach my $value (@values) {
+                        next unless ($value);
+
+                        # build up a hash of values that the new set has
+                        $values_hash{$value} = 1;
+
+                        unless ( $cf_values->HasEntry($value) ) {
+                            my ( $val, $msg ) = $Ticket->AddCustomFieldValue(
+                                Field => $cf,
+                                Value => $value
+                            );
+                            push ( @results, $msg );
+                        }
+
+                    }
+                    while ( my $cf_value = $cf_values->Next ) {
+                        unless ( $values_hash{ $cf_value->Content } == 1 ) {
+                            my ( $val, $msg ) = $Ticket->DeleteCustomFieldValue(
+                                Field => $cf,
+                                Value => $cf_value->Content
+                            );
+                            push ( @results, $msg);
+
+                        }
+
+                    }
+                }
+                elsif ( $arg =~ /-Values$/ ) {
+                    my $cf_values = $Ticket->CustomFieldValues($cf);
+
+		    # keep everything up to the point of difference, delete the rest
+		    my $delete_flag;
+		    foreach my $old_cf (@{$cf_values->ItemsArrayRef}) {
+			if (!$delete_flag and @values and $old_cf->Content eq $values[0]) {
+			    shift @values;
+			    next;
+			}
+
+			$delete_flag ||= 1;
+			$old_cf->Delete;
+		    }
+
+		    # now add/replace extra things, if any
+		    foreach my $value (@values) {
+			my ( $val, $msg ) = $Ticket->AddCustomFieldValue(
+			    Field => $cf,
+			    Value => $value
+			);
+			push ( @results, $msg );
+		    }
+		}
+                else {
+                    push ( @results, "User asked for an unknown update type for custom field " . $cf->Name . " for ticket " . $Ticket->id );
+                }
+            }
+        }
+        return (@results);
+    }
+}
+
+# }}}
+
 # {{{ sub ProcessTicketWatchers
 
 =head2 ProcessTicketWatchers ( TicketObj => $Ticket, ARGSRef => \%ARGS );
@@ -978,18 +1184,22 @@ sub ProcessTicketWatchers {
 
     foreach my $key ( keys %$ARGSRef ) {
 
-        # Delete deletable watchers
-        if ( ( $key =~ /^DelWatcher(\d*)$/ ) and ( $ARGSRef->{$key} ) ) {
-            my ( $code, $msg ) = $Ticket->DeleteWatcher($1);
+        # {{{ Delete deletable watchers
+        if ( ( $key =~ /^Ticket-DelWatcher-Type-(.*)-Principal-(\d+)$/ )  ) {
+            my ( $code, $msg ) = 
+                $Ticket->DeleteWatcher(PrincipalId => $2,
+                                       Type => $1);
             push @results, $msg;
         }
 
         # Delete watchers in the simple style demanded by the bulk manipulator
         elsif ( $key =~ /^Delete(Requestor|Cc|AdminCc)$/ ) {
-            my ( $code, $msg ) = $Ticket->DeleteWatcher( $ARGSRef->{$key}, $1 );
+            my ( $code, $msg ) = $Ticket->DeleteWatcher( Type => $ARGSRef->{$key}, PrincipalId => $1 );
             push @results, $msg;
         }
 
+        # }}}
+
         # Add new wathchers by email address      
         elsif ( ( $ARGSRef->{$key} =~ /^(AdminCc|Cc|Requestor)$/ )
             and ( $key =~ /^WatcherTypeEmail(\d*)$/ ) )
@@ -1014,12 +1224,11 @@ sub ProcessTicketWatchers {
 
         # Add new  watchers by owner
         elsif ( ( $ARGSRef->{$key} =~ /^(AdminCc|Cc|Requestor)$/ )
-            and ( $key =~ /^WatcherTypeUser(\d*)$/ ) )
-        {
+            and ( $key =~ /^Ticket-AddWatcher-Principal-(\d*)$/ ) ) {
 
             #They're in this order because otherwise $1 gets clobbered :/
             my ( $code, $msg ) =
-              $Ticket->AddWatcher( Type => $ARGSRef->{$key}, Owner => $1 );
+              $Ticket->AddWatcher( Type => $ARGSRef->{$key}, PrincipalId => $1 );
             push @results, $msg;
         }
     }
@@ -1061,7 +1270,7 @@ sub ProcessTicketDates {
     );
 
     #Run through each field in this list. update the value if apropriate
-    foreach $field (@date_fields) {
+    foreach my $field (@date_fields) {
         my ( $code, $msg );
 
         my $DateObj = RT::Date->new( $session{'CurrentUser'} );
@@ -1098,11 +1307,9 @@ Returns an array of results messages.
 =cut
 
 sub ProcessTicketLinks {
-    my %args = (
-        TicketObj => undef,
-        ARGSRef   => undef,
-        @_
-    );
+    my %args = ( TicketObj => undef,
+                 ARGSRef   => undef,
+                 @_ );
 
     my $Ticket  = $args{'TicketObj'};
     my $ARGSRef = $args{'ARGSRef'};
@@ -1118,11 +1325,9 @@ sub ProcessTicketLinks {
 
             push @results,
               "Trying to delete: Base: $base Target: $target  Type $type";
-            my ( $val, $msg ) = $Ticket->DeleteLink(
-                Base   => $base,
-                Type   => $type,
-                Target => $target
-            );
+            my ( $val, $msg ) = $Ticket->DeleteLink( Base   => $base,
+                                                     Type   => $type,
+                                                     Target => $target );
 
             push @results, $msg;
 
@@ -1133,26 +1338,23 @@ sub ProcessTicketLinks {
     my @linktypes = qw( DependsOn MemberOf RefersTo );
 
     foreach my $linktype (@linktypes) {
-
-        for my $luri ( split ( / /, $ARGSRef->{ $Ticket->Id . "-$linktype" } ) )
-        {
-            $luri =~ s/\s*$//;    # Strip trailing whitespace
-            my ( $val, $msg ) = $Ticket->AddLink(
-                Target => $luri,
-                Type   => $linktype
-            );
-            push @results, $msg;
+        if ( $ARGSRef->{ $Ticket->Id . "-$linktype" } ) {
+            for my $luri ( split ( / /, $ARGSRef->{ $Ticket->Id . "-$linktype" } ) ) {
+                $luri =~ s/\s*$//;    # Strip trailing whitespace
+                my ( $val, $msg ) = $Ticket->AddLink( Target => $luri,
+                                                      Type   => $linktype );
+                push @results, $msg;
+            }
         }
+        if ( $ARGSRef->{ "$linktype-" . $Ticket->Id } ) {
 
-        for my $luri ( split ( / /, $ARGSRef->{ "$linktype-" . $Ticket->Id } ) )
-        {
-            my ( $val, $msg ) = $Ticket->AddLink(
-                Base => $luri,
-                Type => $linktype
-            );
+            for my $luri ( split ( / /, $ARGSRef->{ "$linktype-" . $Ticket->Id } ) ) {
+                my ( $val, $msg ) = $Ticket->AddLink( Base => $luri,
+                                                      Type => $linktype );
 
-            push @results, $msg;
-        }
+                push @results, $msg;
+            }
+        } 
     }
 
     #Merge if we need to
@@ -1167,121 +1369,9 @@ sub ProcessTicketLinks {
 
 # }}}
 
-# {{{ sub ProcessTicketObjectKeywords
-
-=head2 ProcessTicketObjectKeywords ( TicketObj => $Ticket, ARGSRef => \%ARGS );
-
-Returns an array of results messages.
-
-=cut
-
-sub ProcessTicketObjectKeywords {
-    my %args = (
-        TicketObj => undef,
-        ARGSRef   => undef,
-        @_
-    );
-
-    my $TicketObj = $args{'TicketObj'};
-    my $ARGSRef   = $args{'ARGSRef'};
-
-    my (@results);
-
-    # {{{ set ObjectKeywords.
-
-    my $KeywordSelects = $TicketObj->QueueObj->KeywordSelects;
-
-    # iterate through all the keyword selects for this queue
-    while ( my $KeywordSelect = $KeywordSelects->Next ) {
-
-        # {{{ do some setup
-
-        # if we have KeywordSelectMagic for this keywordselect:
-        next
-          unless
-          defined $ARGSRef->{ 'KeywordSelectMagic' . $KeywordSelect->id };
-
-        # Lets get a hash of the possible values to work with
-        my $value = $ARGSRef->{ 'KeywordSelect' . $KeywordSelect->id } || [];
-
-        #lets get all those values in a hash. regardless of # of entries
-        #we'll use this for adding and deleting keywords from this object.
-        my %values = map { $_ => 1 } ref($value) ? @{$value} : ($value);
-
-        # Load up the ObjectKeywords for this KeywordSelect for this ticket
-        my $ObjectKeys = $TicketObj->KeywordsObj( $KeywordSelect->id );
-
-        # }}}
-        # {{{ add new keywords
-
-        foreach my $key ( keys %values ) {
-
-            #unless the ticket has that keyword for that keyword select,
-            unless ( $ObjectKeys->HasEntry($key) ) {
-
-                #Add the keyword
-                my ( $result, $msg ) = $TicketObj->AddKeyword(
-                    Keyword       => $key,
-                    KeywordSelect => $KeywordSelect->id
-                );
-                push ( @results, $msg );
-            }
-        }
-
-        # }}}
-        # {{{ Delete unused keywords
-
-        #redo this search, so we don't ask it to delete things that are already gone
-        # such as when a single keyword select gets its value changed.
-        $ObjectKeys = $TicketObj->KeywordsObj( $KeywordSelect->id );
-
-        while ( my $TicketKey = $ObjectKeys->Next ) {
-
-            # if the hash defined above doesn\'t contain the keyword mentioned,
-            unless ( $values{ $TicketKey->Keyword } ) {
-
-                #I'd really love to just call $keyword->Delete, but then 
-                # we wouldn't get a transaction recorded
-                my ( $result, $msg ) = $TicketObj->DeleteKeyword(
-                    Keyword       => $TicketKey->Keyword,
-                    KeywordSelect => $KeywordSelect->id
-                );
-                push ( @results, $msg );
-            }
-        }
-
-        # }}}
-    }
-
-    #Iterate through the keyword selects for BulkManipulator style access
-    while ( my $KeywordSelect = $KeywordSelects->Next ) {
-        if ( $ARGSRef->{ "AddToKeywordSelect" . $KeywordSelect->Id } ) {
-
-            #Add the keyword
-            my ( $result, $msg ) = $TicketObj->AddKeyword(
-                Keyword =>
-                $ARGSRef->{ "AddToKeywordSelect" . $KeywordSelect->Id },
-                KeywordSelect => $KeywordSelect->id
-            );
-            push ( @results, $msg );
-        }
-        if ( $ARGSRef->{ "DeleteFromKeywordSelect" . $KeywordSelect->Id } ) {
-
-            #Delete the keyword
-            my ( $result, $msg ) = $TicketObj->DeleteKeyword(
-                Keyword =>
-                $ARGSRef->{ "DeleteFromKeywordSelect" . $KeywordSelect->Id },
-                KeywordSelect => $KeywordSelect->id
-            );
-            push ( @results, $msg );
-        }
-    }
-
-    # }}}
-
-    return (@results);
-}
-
-# }}}
+eval "require RT::Interface::Web_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/Web_Vendor.pm});
+eval "require RT::Interface::Web_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/Web_Local.pm});
 
 1;
diff --git a/rt/lib/RT/Link.pm b/rt/lib/RT/Link.pm
index 885ffe3ed..962c378a8 100644
--- a/rt/lib/RT/Link.pm
+++ b/rt/lib/RT/Link.pm
@@ -1,373 +1,302 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Link.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-1999 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::Link - an RT Link object
+RT::Link
 
-=head1 SYNOPSIS
 
-  use RT::Link;
+=head1 SYNOPSIS
 
 =head1 DESCRIPTION
 
-This module should never be called directly by client code. it's an internal module which
-should only be accessed through exported APIs in Ticket other similar objects.
-
 =head1 METHODS
 
+=cut
 
-=begin testing
+package RT::Link;
+use RT::Record; 
 
-ok (require RT::TestHarness);
-ok (require RT::Link);
 
-=end testing
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
 
-=cut
+sub _Init {
+  my $self = shift; 
 
-package RT::Link;
-use RT::Record;
-use Carp;
-@ISA= qw(RT::Record);
-
-# {{{ sub _Init
-sub _Init  {
-  my $self  = shift;
-  $self->{'table'} = "Links";
-  return ($self->SUPER::_Init(@_));
+  $self->Table('Links');
+  $self->SUPER::_Init(@_);
 }
 
-# }}}
 
-# {{{ sub Create 
 
-=head2 Create PARAMHASH
 
-Create a new link object. Takes 'Base', 'Target' and 'Type'.
-Returns undef on failure or a Link Id on success.
+
+=item Create PARAMHASH
+
+Create takes a hash of values and creates a row in the database:
+
+  varchar(240) 'Base'.
+  varchar(240) 'Target'.
+  varchar(20) 'Type'.
+  int(11) 'LocalTarget'.
+  int(11) 'LocalBase'.
 
 =cut
 
-sub Create  {
+
+
+
+sub Create {
     my $self = shift;
-    my %args = ( Base => undef,
-		 Target => undef,
-		 Type => undef,
-		 @_ # get the real argumentlist
-	       );
-    
-    my $BaseURI = $self->CanonicalizeURI($args{'Base'});
-    my $TargetURI = $self->CanonicalizeURI($args{'Target'});
-    
-    unless (defined $BaseURI) {
-	$RT::Logger->warning ("$self couldn't resolve base:'".$args{'Base'}.
-			      "' into a URI\n");
-	return (undef);
-    }
-    unless (defined $TargetURI) {
-	$RT::Logger->warning ("$self couldn't resolve target:'".$args{'Target'}.
-			      "' into a URI\n");
-	return(undef);
-    }
-    
-    my $LocalBase = $self->_IsLocal($BaseURI);
-    my $LocalTarget = $self->_IsLocal($TargetURI);
-    my $id = $self->SUPER::Create(Base => "$BaseURI",
-				  Target => "$TargetURI",
-				  LocalBase => $LocalBase, 
-				  LocalTarget => $LocalTarget,
-				  Type => $args{'Type'});
-    return ($id);
+    my %args = ( 
+                Base => '',
+                Target => '',
+                Type => '',
+                LocalTarget => '0',
+                LocalBase => '0',
+
+		  @_);
+    $self->SUPER::Create(
+                         Base => $args{'Base'},
+                         Target => $args{'Target'},
+                         Type => $args{'Type'},
+                         LocalTarget => $args{'LocalTarget'},
+                         LocalBase => $args{'LocalBase'},
+);
+
 }
 
-# }}}
- 
-# {{{ sub Load 
 
-=head2 Load
 
-  Load an RT::Link object from the database.  Takes one parameter or three.
-  One parameter is the id of an entry in the links table.  Three parameters are a tuple of (base, linktype, target);
+=item id
+
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
 
 
 =cut
 
-sub Load  {
-  my $self = shift;
-  my $identifier = shift;
-  my $linktype = shift if (@_);
-  my $target = shift if (@_);
-  
-  if ($target) {
-      my $BaseURI = $self->CanonicalizeURI($identifier);
-      my $TargetURI = $self->CanonicalizeURI($target);
-      $self->LoadByCols( Base => $BaseURI,
-			 Type => $linktype,
-			 Target => $TargetURI
-		       ) || return (0, "Couldn't load link");
-  }
-  
-  elsif ($identifier =~ /^\d+$/) {
-      $self->LoadById($identifier) ||
-	return (0, "Couldn't load link");
-  }
-  else {
-	return (0, "That's not a numerical id");
-  }
-}
 
-# }}}
+=item Base
 
-# {{{ sub TargetObj 
+Returns the current value of Base. 
+(In the database, Base is stored as varchar(240).)
 
-=head2 TargetObj
 
-=cut
 
-sub TargetObj {
-  my $self = shift;
-   return $self->_TicketObj('base',$self->Target);
-}
-# }}}
+=item SetBase VALUE
+
 
-# {{{ sub BaseObj
+Set Base to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Base will be stored as a varchar(240).)
 
-=head2 BaseObj
 
 =cut
 
-sub BaseObj {
-  my $self = shift;
-  return $self->_TicketObj('target',$self->Base);
-}
-# }}}
-
-# {{{ sub _TicketObj
-sub _TicketObj {
-  my $self = shift;
-  my $name = shift;
-  my $ref = shift;
-  my $tag="$name\_obj";
-  
-  unless (exists $self->{$tag}) {
-
-  $self->{$tag}=RT::Ticket->new($self->CurrentUser);
-
-  #If we can get an actual ticket, load it up.
-  if ($self->_IsLocal($ref)) {
-      $self->{$tag}->Load($ref);
-    }
-  }
-  return $self->{$tag};
-}
-# }}}
-
-# {{{ sub _Accessible 
-sub _Accessible  {
-  my $self = shift;
-  my %Cols = (
-	      LocalBase => 'read',
-	      LocalTarget => 'read',
-	      Base => 'read',
-	      Target => 'read',
-	      Type => 'read',
-	      Creator => 'read/auto',
-	      Created => 'read/auto',
-	      LastUpdatedBy => 'read/auto',
-	      LastUpdated => 'read/auto'
-	     );
-  return($self->SUPER::_Accessible(@_, %Cols));
-}
-# }}}
 
+=item Target
 
-# Static methods:
+Returns the current value of Target. 
+(In the database, Target is stored as varchar(240).)
 
-# {{{ sub BaseIsLocal
 
-=head2 BaseIsLocal
 
-Returns true if the base of this link is a local ticket
+=item SetTarget VALUE
+
+
+Set Target to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Target will be stored as a varchar(240).)
+
 
 =cut
 
-sub BaseIsLocal {
-  my $self = shift;
-  return $self->_IsLocal($self->Base);
-}
 
-# }}}
+=item Type
 
-# {{{ sub TargetIsLocal
+Returns the current value of Type. 
+(In the database, Type is stored as varchar(20).)
 
-=head2 TargetIsLocal
 
-Returns true if the target of this link is a local ticket
+
+=item SetType VALUE
+
+
+Set Type to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Type will be stored as a varchar(20).)
+
 
 =cut
 
-sub TargetIsLocal {
-  my $self = shift;
-  return $self->_IsLocal($self->Target);
-}
 
-# }}}
+=item LocalTarget
+
+Returns the current value of LocalTarget. 
+(In the database, LocalTarget is stored as int(11).)
+
+
+
+=item SetLocalTarget VALUE
 
-# {{{ sub _IsLocal
 
-=head2 _IsLocal URI 
+Set LocalTarget to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, LocalTarget will be stored as a int(11).)
 
-When handed a URI returns the local ticket id if it\'s local. otherwise returns undef.
 
 =cut
 
-sub _IsLocal {
-    my $self = shift;
-    my $URI=shift;
-    unless ($URI) {
-	$RT::Logger->warning ("$self _IsLocal called without a URI\n");
-	return (undef);
-    }
-    # TODO: More thorough check
-    if ($URI =~ /^$RT::TicketBaseURI(\d+)$/) {
-	return($1);
-    }
-    else {
-	return (undef);
-    }
-}
-# }}}
+
+=item LocalBase
+
+Returns the current value of LocalBase. 
+(In the database, LocalBase is stored as int(11).)
+
 
 
-# {{{ sub BaseAsHREF 
+=item SetLocalBase VALUE
 
-=head2 BaseAsHREF
 
-Returns an HTTP url to access the base of this link
+Set LocalBase to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, LocalBase will be stored as a int(11).)
+
 
 =cut
 
-sub BaseAsHREF {
-  my $self = shift;
-  return $self->AsHREF($self->Base);
-}
-# }}}
 
-# {{{ sub TargetAsHREF 
+=item LastUpdatedBy
 
-=head2 TargetAsHREF
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
 
-return an HTTP url to access the target of this link
 
 =cut
 
-sub TargetAsHREF {
-  my $self = shift;
-  return $self->AsHREF($self->Target);
-}
-# }}}
 
-# {{{ sub AsHREF - Converts Link URIs to HTTP URLs
-=head2 URI
+=item LastUpdated
+
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
 
-Takes a URI and returns an http: url to access that object.
 
 =cut
-sub AsHREF {
-    my $self=shift;
-    my $URI=shift;
-    if ($self->_IsLocal($URI)) {
-	my $url=$RT::WebURL . "Ticket/Display.html?id=$URI";
-	return($url);
-    } 
-    else {
-	my ($protocol) = $URI =~ m|(.*?)://|;
-	unless (exists $RT::URI2HTTP{$protocol}) {
-	    $RT::Logger->warning("Linking for protocol $protocol not defined in the config file!");
-	    return("");
-	}
-	return $RT::URI2HTTP{$protocol}->($URI);
-    }
-}
 
-# }}}
-
-# {{{ sub GetContent - gets the content from a link
-sub GetContent {
-    my ($self, $URI)= @_;
-    if ($self->_IsLocal($URI)) {
-	die "stub";
-    } else {
-	# Find protocol
-	if ($URI =~ m|^(.*?)://|) {
-	    if (exists $RT::ContentFromURI{$1}) {
-		return $RT::ContentFromURI{$1}->($URI);
-	    } else {
-		warn "No sub exists for fetching the content from a $1 in $URI";
-	    }
-	} else {
-	    warn "No protocol specified in $URI";
-	}
-    }
-}
-# }}}
 
-# {{{ sub CanonicalizeURI
+=item Creator
+
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
 
-=head2 CanonicalizeURI
 
-Takes a single argument: some form of ticket identifier. 
-Returns its canonicalized URI.
+=cut
+
+
+=item Created
+
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
 
-Bug: ticket aliases can't have :// in them. URIs must have :// in them.
 
 =cut
 
-sub CanonicalizeURI {
-    my $self = shift;
-    my $id = shift;
-    
-    
-    #If it's a local URI, load the ticket object and return its URI
-    if ($id =~ /^$RT::TicketBaseURI/) {
-	my $ticket = new RT::Ticket($self->CurrentUser);
-	$ticket->Load($id);
-	#If we couldn't find a ticket, return undef.
-	return undef unless (defined $ticket->Id);
-	#$RT::Logger->debug("$self -> CanonicalizeURI was passed $id and returned ".$ticket->URI ." (uri)\n");
-	return ($ticket->URI);
-    }
-    #If it's a remote URI, we're going to punt for now
-    elsif ($id =~ '://' ) {
-	return ($id);
-    }
-  
-    #If the base is an integer, load it as a ticket 
-    elsif ( $id =~ /^\d+$/ ) {
-	
-	#$RT::Logger->debug("$self -> CanonicalizeURI was passed $id. It's a ticket id.\n");
-	my $ticket = new RT::Ticket($self->CurrentUser);
-	$ticket->Load($id);
-	#If we couldn't find a ticket, return undef.
-	return undef unless (defined $ticket->Id);
-	#$RT::Logger->debug("$self returned ".$ticket->URI ." (id #)\n");
-	return ($ticket->URI);
-    }
-
-    #It's not a URI. It's not a numerical ticket ID
-    else { 
+
+
+sub _ClassAccessible {
+    {
      
-	#If we couldn't find a ticket, return undef.
-	return( undef);
-    
-    }
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        Base => 
+		{read => 1, write => 1, type => 'varchar(240)', default => ''},
+        Target => 
+		{read => 1, write => 1, type => 'varchar(240)', default => ''},
+        Type => 
+		{read => 1, write => 1, type => 'varchar(20)', default => ''},
+        LocalTarget => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        LocalBase => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
 
- 
-}
+ }
+};
+
+
+        eval "require RT::Link_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Link_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Link_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Link_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Link_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Link_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Link_Overlay, RT::Link_Vendor, RT::Link_Local
+
+=cut
 
-# }}}
 
 1;
- 
diff --git a/rt/lib/RT/Link_Overlay.pm b/rt/lib/RT/Link_Overlay.pm
new file mode 100644
index 000000000..ac1bc370c
--- /dev/null
+++ b/rt/lib/RT/Link_Overlay.pm
@@ -0,0 +1,360 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::Link - an RT Link object
+
+=head1 SYNOPSIS
+
+  use RT::Link;
+
+=head1 DESCRIPTION
+
+This module should never be called directly by client code. it's an internal module which
+should only be accessed through exported APIs in Ticket other similar objects.
+
+=head1 METHODS
+
+
+=begin testing
+
+
+use RT::Link;
+my $link = RT::Link->new($RT::SystemUser);
+
+
+ok (ref $link);
+ok (UNIVERSAL::isa($link, 'RT::Link'));
+ok (UNIVERSAL::isa($link, 'RT::Base'));
+ok (UNIVERSAL::isa($link, 'RT::Record'));
+ok (UNIVERSAL::isa($link, 'DBIx::SearchBuilder::Record'));
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+
+use Carp;
+use RT::URI;
+
+
+# {{{ sub Create 
+
+=head2 Create PARAMHASH
+
+Create a new link object. Takes 'Base', 'Target' and 'Type'.
+Returns undef on failure or a Link Id on success.
+
+=cut
+
+sub Create {
+    my $self = shift;
+    my %args = ( Base   => undef,
+                 Target => undef,
+                 Type   => undef,
+                 @_ );
+
+    my $base = RT::URI->new( $self->CurrentUser );
+    $base->FromURI( $args{'Base'} );
+
+    unless ( $base->Scheme ) {
+        $RT::Logger->warning( "$self couldn't resolve base:'"
+                              . $args{'Base'} . " - "
+                              . $base->Scheme
+                              . "' into a URI\n" );
+
+        #use Data::Dumper;
+        #$RT::Logger->warning(scalar Dumper $base);
+        return (undef);
+    }
+
+    my $target = RT::URI->new( $self->CurrentUser );
+    $target->FromURI( $args{'Target'} );
+
+    unless ( $target->Resolver ) {
+        $RT::Logger->warning( "$self couldn't resolve target:'"
+                              . $args{'Target'} . " - "
+                              . "' into a URI\n" );
+
+        #use Data::Dumper;
+        #$RT::Logger->warning(scalar Dumper $target);
+        return (undef);
+    }
+
+    my $base_id   = 0;
+    my $target_id = 0;
+
+
+
+
+    if ( $base->IsLocal ) {
+        unless (UNIVERSAL::can($base->Object, 'Id')) {
+            return (undef, $self->loc("[_1] appears to be a local object, but can't be found in the database", $args{'Base'}));
+        
+        }
+        $base_id = $base->Object->Id;
+    }
+    if ( $target->IsLocal ) {
+        unless (UNIVERSAL::can($target->Object, 'Id')) {
+            return (undef, $self->loc("[_1] appears to be a local object, but can't be found in the database", $args{'Target'}));
+        
+        }
+        $target_id = $target->Object->Id;
+    }
+
+    # {{{ We don't want references to ourself
+    if ( $base->URI eq $target->URI ) {
+        return ( 0, $self->loc("Can't link a ticket to itself") );
+    }
+
+    # }}}
+
+    my ( $id, $msg ) = $self->SUPER::Create( Base        => $base->URI,
+                                             Target      => $target->URI,
+                                             LocalBase   => $base_id,
+                                             LocalTarget => $target_id,
+                                             Type        => $args{'Type'} );
+    return ( $id, $msg );
+}
+
+# }}}
+ # {{{ sub LoadByParams
+
+=head2 LoadByParams
+
+  Load an RT::Link object from the database.  Takes three parameters
+  
+  Base => undef,
+  Target => undef,
+  Type =>undef
+ 
+  Base and Target are expected to be integers which refer to Tickets or URIs
+  Type is the link type
+
+=cut
+
+sub LoadByParams {
+    my $self = shift;
+    my %args = ( Base   => undef,
+                 Target => undef,
+                 Type   => undef,
+                 @_ );
+
+    my $base = RT::URI->new($self->CurrentUser);
+    $base->FromURI( $args{'Base'} );
+
+    my $target = RT::URI->new($self->CurrentUser);
+    $target->FromURI( $args{'Target'} );
+    
+    unless ($base->Resolver && $target->Resolver) {
+        return ( 0, $self->loc("Couldn't load link") );
+    }
+
+
+    my ( $id, $msg ) = $self->LoadByCols( Base   => $base->URI,
+                                          Type   => $args{'Type'},
+                                          Target => $target->URI );
+
+    unless ($id) {
+        return ( 0, $self->loc("Couldn't load link") );
+    }
+}
+
+# }}}
+# {{{ sub Load 
+
+=head2 Load
+
+  Load an RT::Link object from the database.  Takes one parameter, the id of an entry in the links table.
+
+
+=cut
+
+sub Load {
+    my $self       = shift;
+    my $identifier = shift;
+
+
+
+
+    if ( $identifier !~ /^\d+$/ ) {
+        return ( 0, $self->loc("That's not a numerical id") );
+    }
+    else {
+        my ( $id, $msg ) = $self->LoadById($identifier);
+        unless ( $self->Id ) {
+            return ( 0, $self->loc("Couldn't load link") );
+        }
+        return ( $id, $msg );
+    }
+}
+
+# }}}
+
+
+# {{{ TargetURI
+
+=head2 TargetURI
+
+returns an RT::URI object for the "Target" of this link.
+
+=cut
+
+sub TargetURI {
+    my $self = shift;
+    my $URI = RT::URI->new($self->CurrentUser);
+    $URI->FromURI($self->Target);
+    return ($URI);
+}
+
+# }}}
+# {{{ sub TargetObj 
+
+=head2 TargetObj
+
+=cut
+
+sub TargetObj {
+  my $self = shift;
+   return $self->TargetURI->Object;
+}
+# }}}
+
+# {{{ BaseURI
+
+=head2 BaseURI
+
+returns an RT::URI object for the "Base" of this link.
+
+=cut
+
+sub BaseURI {
+    my $self = shift;
+    my $URI = RT::URI->new($self->CurrentUser);
+    $URI->FromURI($self->Base);
+    return ($URI);
+}
+
+# }}}
+# {{{ sub BaseObj
+
+=head2 BaseObj
+
+=cut
+
+sub BaseObj {
+  my $self = shift;
+  return $self->BaseURI->Object;
+}
+# }}}
+
+
+
+# Static methods:
+
+# {{{ sub BaseIsLocal
+
+=head2 BaseIsLocal
+
+Returns true if the base of this link is a local ticket
+
+=cut
+
+sub BaseIsLocal {
+  my $self = shift;
+  $RT::Logger->crit("Link::BaseIsLocal is deprecated in favor of Link->BaseURI->IsLocal");
+  return $self->BaseURI->IsLocal;
+}
+
+# }}}
+
+# {{{ sub TargetIsLocal
+
+=head2 TargetIsLocal
+
+Returns true if the target of this link is a local ticket
+
+=cut
+
+sub TargetIsLocal {
+  my $self = shift;
+  $RT::Logger->crit("Link::BaseIsLocal is deprecated in favor of Link->BaseURI->IsLocal");
+  return $self->TargetURI->IsLocal;
+}
+
+# }}}
+
+
+# {{{ sub BaseAsHREF 
+
+=head2 BaseAsHREF
+
+Returns an HTTP url to access the base of this link
+
+=cut
+
+sub BaseAsHREF {
+  my $self = shift;
+  $RT::Logger->crit("Link::BaseAsHREF deprecated in favor of ->BaseURI->AsHREF");
+  return $self->BaseURI->HREF;
+}
+# }}}
+
+# {{{ sub TargetAsHREF 
+
+=head2 TargetAsHREF
+
+return an HTTP url to access the target of this link
+
+=cut
+
+sub TargetAsHREF {
+  my $self = shift;
+  $RT::Logger->crit("Link::TargetAsHREF deprecated in favor of ->TargetURI->AsHREF");
+  return $self->TargetURI->HREF;
+}
+# }}}
+
+# {{{ sub AsHREF - Converts Link URIs to HTTP URLs
+
+=head2 URI
+
+Takes a URI and returns an http: url to access that object.
+
+=cut
+
+
+sub AsHREF {
+    my $self=shift;
+   
+    $RT::Logger->crit("AsHREF is gone. look at URI::HREF to figure out what to do with \$URI");
+}
+
+# }}}
+
+1;
+ 
diff --git a/rt/lib/RT/Links.pm b/rt/lib/RT/Links.pm
index a8180caf0..7a1773af9 100644
--- a/rt/lib/RT/Links.pm
+++ b/rt/lib/RT/Links.pm
@@ -1,90 +1,115 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Links.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::Links - A collection of Link objects
+=head1 NAME
 
+  RT::Links -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::Links;
-  my $links = new RT::Links($CurrentUser);
+  use RT::Links
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Links);
-
-=end testing
-
 =cut
 
 package RT::Links;
-use RT::EasySearch;
+
+use RT::SearchBuilder;
 use RT::Link;
 
-@ISA= qw(RT::EasySearch);
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-# {{{ sub _Init  
-sub _Init   {
-  my $self = shift;
- 
-  $self->{'table'} = "Links";
-  $self->{'primary_key'} = "id";
 
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'Links';
+    $self->{'primary_key'} = 'id';
 
-  return ( $self->SUPER::_Init(@_));
-}
-# }}}
 
-# {{{ sub Limit 
-sub Limit  {
-    my $self = shift;
-    my %args = ( ENTRYAGGREGATOR => 'AND',
-		 OPERATOR => '=',
-		 @_);
-    
-    #if someone's trying to search for tickets, try to resolve the uris for searching.
-    
-    if (  ( $args{'OPERATOR'} eq '=') and
-	  ( $args{'FIELD'}  eq 'Base') or ($args{'FIELD'} eq 'Target')
-       ) {
-	my $dummy = $self->NewItem();
-	  $uri = $dummy->CanonicalizeURI($args{'VALUE'});
-    }
-
-
-    # If we're limiting by target, order by base
-    # (Order by the thing that's changing)
-
-    if ( ($args{'FIELD'} eq 'Target') or 
-	 ($args{'FIELD'} eq 'LocalTarget') ) {
-	$self->OrderBy (ALIAS => 'main',
-			FIELD => 'Base',
-			ORDER => 'ASC');
-    }
-    elsif ( ($args{'FIELD'} eq 'Base') or 
-	    ($args{'FIELD'} eq 'LocalBase') ) {
-	$self->OrderBy (ALIAS => 'main',
-			FIELD => 'Target',
-			ORDER => 'ASC');
-    }
-    
-
-    $self->SUPER::Limit(%args);
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
-# {{{ sub NewItem 
-sub NewItem  {
+
+=item NewItem
+
+Returns an empty new RT::Link item
+
+=cut
+
+sub NewItem {
     my $self = shift;
     return(RT::Link->new($self->CurrentUser));
 }
-# }}}
-  1;
 
+        eval "require RT::Links_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Links_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Links_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Links_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Links_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Links_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Links_Overlay, RT::Links_Vendor, RT::Links_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/Links_Overlay.pm b/rt/lib/RT/Links_Overlay.pm
new file mode 100644
index 000000000..d788a4275
--- /dev/null
+++ b/rt/lib/RT/Links_Overlay.pm
@@ -0,0 +1,125 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::Links - A collection of Link objects
+
+=head1 SYNOPSIS
+
+  use RT::Links;
+  my $links = new RT::Links($CurrentUser);
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::Links);
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+use RT::URI;
+
+# {{{ sub Limit 
+sub Limit  {
+    my $self = shift;
+    my %args = ( ENTRYAGGREGATOR => 'AND',
+		 OPERATOR => '=',
+		 @_);
+    
+    #if someone's trying to search for tickets, try to resolve the uris for searching.
+    
+    if (  ( $args{'OPERATOR'} eq '=') and
+	  ( $args{'FIELD'}  eq 'Base') or ($args{'FIELD'} eq 'Target')
+       ) {
+	  my $dummy = RT::URI->new($self->CurrentUser);
+	   $dummy->FromURI($args{'VALUE'});
+	   # $uri = $dummy->URI;
+    }
+
+
+    # If we're limiting by target, order by base
+    # (Order by the thing that's changing)
+
+    if ( ($args{'FIELD'} eq 'Target') or 
+	 ($args{'FIELD'} eq 'LocalTarget') ) {
+	$self->OrderBy (ALIAS => 'main',
+			FIELD => 'Base',
+			ORDER => 'ASC');
+    }
+    elsif ( ($args{'FIELD'} eq 'Base') or 
+	    ($args{'FIELD'} eq 'LocalBase') ) {
+	$self->OrderBy (ALIAS => 'main',
+			FIELD => 'Target',
+			ORDER => 'ASC');
+    }
+    
+
+    $self->SUPER::Limit(%args);
+}
+# }}}
+
+# {{{ LimitRefersTo 
+
+=head2 LimitRefersTo URI
+
+find all things that refer to URI
+
+=cut
+
+sub LimitRefersTo {
+    my $self = shift;
+    my $URI = shift;
+
+    $self->Limit(FIELD => 'Type', VALUE => 'RefersTo');
+    $self->Limit(FIELD => 'Target', VALUE => $URI);
+}
+
+# }}}
+# {{{ LimitReferredToBy
+
+=head2 LimitReferredToBy URI
+
+find all things that URI refers to
+
+=cut
+
+sub LimitReferredToBy {
+    my $self = shift;
+    my $URI = shift;
+
+    $self->Limit(FIELD => 'Type', VALUE => 'RefersTo');
+    $self->Limit(FIELD => 'Base', VALUE => $URI);
+}
+
+# }}}
+1;
+
diff --git a/rt/lib/RT/Principal.pm b/rt/lib/RT/Principal.pm
new file mode 100644
index 000000000..cffee4cb2
--- /dev/null
+++ b/rt/lib/RT/Principal.pm
@@ -0,0 +1,212 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
+
+=head1 NAME
+
+RT::Principal
+
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=cut
+
+package RT::Principal;
+use RT::Record; 
+
+
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
+
+sub _Init {
+  my $self = shift; 
+
+  $self->Table('Principals');
+  $self->SUPER::_Init(@_);
+}
+
+
+
+
+
+=item Create PARAMHASH
+
+Create takes a hash of values and creates a row in the database:
+
+  varchar(16) 'PrincipalType'.
+  int(11) 'ObjectId'.
+  smallint(6) 'Disabled'.
+
+=cut
+
+
+
+
+sub Create {
+    my $self = shift;
+    my %args = ( 
+                PrincipalType => '',
+                ObjectId => '',
+                Disabled => '0',
+
+		  @_);
+    $self->SUPER::Create(
+                         PrincipalType => $args{'PrincipalType'},
+                         ObjectId => $args{'ObjectId'},
+                         Disabled => $args{'Disabled'},
+);
+
+}
+
+
+
+=item id
+
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
+
+
+=cut
+
+
+=item PrincipalType
+
+Returns the current value of PrincipalType. 
+(In the database, PrincipalType is stored as varchar(16).)
+
+
+
+=item SetPrincipalType VALUE
+
+
+Set PrincipalType to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, PrincipalType will be stored as a varchar(16).)
+
+
+=cut
+
+
+=item ObjectId
+
+Returns the current value of ObjectId. 
+(In the database, ObjectId is stored as int(11).)
+
+
+
+=item SetObjectId VALUE
+
+
+Set ObjectId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ObjectId will be stored as a int(11).)
+
+
+=cut
+
+
+=item Disabled
+
+Returns the current value of Disabled. 
+(In the database, Disabled is stored as smallint(6).)
+
+
+
+=item SetDisabled VALUE
+
+
+Set Disabled to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Disabled will be stored as a smallint(6).)
+
+
+=cut
+
+
+
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        PrincipalType => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        ObjectId => 
+		{read => 1, write => 1, type => 'int(11)', default => ''},
+        Disabled => 
+		{read => 1, write => 1, type => 'smallint(6)', default => '0'},
+
+ }
+};
+
+
+        eval "require RT::Principal_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Principal_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Principal_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Principal_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Principal_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Principal_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Principal_Overlay, RT::Principal_Vendor, RT::Principal_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/Principal_Overlay.pm b/rt/lib/RT/Principal_Overlay.pm
new file mode 100644
index 000000000..d2782b730
--- /dev/null
+++ b/rt/lib/RT/Principal_Overlay.pm
@@ -0,0 +1,557 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+use strict;
+
+no warnings qw(redefine);
+use vars qw(%_ACL_KEY_CACHE);
+
+use RT::Group;
+use RT::User;
+
+# {{{ IsGroup
+
+=head2 IsGroup
+
+Returns true if this principal is a group. 
+Returns undef, otherwise
+
+=cut
+
+sub IsGroup {
+    my $self = shift;
+    if ($self->PrincipalType eq 'Group') {
+        return(1);
+    }
+    else {
+        return undef;
+    }
+}
+
+# }}}
+
+# {{{ IsUser
+
+=head2 IsUser 
+
+Returns true if this principal is a User. 
+Returns undef, otherwise
+
+=cut
+
+sub IsUser {
+    my $self = shift;
+    if ($self->PrincipalType eq 'User') {
+        return(1);
+    }
+    else {
+        return undef;
+    }
+}
+
+# }}}
+
+# {{{ Object
+
+=head2 Object
+
+Returns the user or group associated with this principal
+
+=cut
+
+sub Object {
+    my $self = shift;
+
+    unless ($self->{'object'}) {
+    if ($self->IsUser) {
+       $self->{'object'} = RT::User->new($self->CurrentUser);
+    }
+    elsif ($self->IsGroup) {
+        $self->{'object'}  = RT::Group->new($self->CurrentUser);
+    }
+    else { 
+        $RT::Logger->crit("Found a principal (".$self->Id.") that was neither a user nor a group");
+        return(undef);
+    }
+    $self->{'object'}->Load($self->ObjectId());
+    }
+    return ($self->{'object'});
+
+
+}
+# }}} 
+
+# {{{ ACL Related routines
+
+# {{{ GrantRight 
+
+=head2 GrantRight  { Right => RIGHTNAME, Object => undef }
+
+A helper function which calls RT::ACE->Create
+
+=cut
+
+sub GrantRight {
+    my $self = shift;
+    my %args = ( Right => undef,
+                Object => undef,
+                @_);
+
+
+    #if we haven't specified any sort of right, we're talking about a global right
+    if (!defined $args{'Object'} && !defined $args{'ObjectId'} && !defined $args{'ObjectType'}) {
+        $args{'Object'} = $RT::System;
+    }
+
+    unless ($args{'Right'}) {
+        return(0, $self->loc("Invalid Right"));
+    }
+
+
+    #ACL check handled in ACE.pm
+    my $ace = RT::ACE->new( $self->CurrentUser );
+
+
+    my $type = $self->_GetPrincipalTypeForACL();
+
+    # If it's a user, we really want to grant the right to their 
+    # user equivalence group
+        return ( $ace->Create(RightName => $args{'Right'},
+                          Object => $args{'Object'},
+                          PrincipalType =>  $type,
+                          PrincipalId => $self->Id
+                          ) );
+}
+# }}}
+
+# {{{ RevokeRight
+
+=head2 RevokeRight { Right => "RightName", Object => "object" }
+
+Delete a right that a user has 
+
+=cut
+
+sub RevokeRight {
+
+    my $self = shift;
+    my %args = (
+        Right      => undef,
+        Object => undef,
+        @_
+    );
+
+    #if we haven't specified any sort of right, we're talking about a global right
+    if (!defined $args{'Object'} && !defined $args{'ObjectId'} && !defined $args{'ObjectType'}) {
+        $args{'Object'} = $RT::System;
+    }
+    #ACL check handled in ACE.pm
+    my $type = $self->_GetPrincipalTypeForACL();
+
+    my $ace = RT::ACE->new( $self->CurrentUser );
+    $ace->LoadByValues(
+        RightName     => $args{'Right'},
+        Object    => $args{'Object'},
+        PrincipalType => $type,
+        PrincipalId   => $self->Id
+    );
+
+    unless ( $ace->Id ) {
+        return ( 0, $self->loc("ACE not found") );
+    }
+    return ( $ace->Delete );
+}
+
+# }}}
+
+
+
+# {{{ sub HasRight
+
+=head2 sub HasRight (Right => 'right' Object => undef)
+
+
+Checks to see whether this principal has the right "Right" for the Object
+specified. If the Object parameter is omitted, checks to see whether the 
+user has the right globally.
+
+This still hard codes to check to see if a user has queue-level rights
+if we ask about a specific ticket.
+
+
+This takes the params:
+
+    Right => name of a right
+
+    And either:
+
+    Object => an RT style object (->id will get its id)
+
+
+
+
+Returns 1 if a matching ACE was found.
+
+Returns undef if no ACE was found.
+
+=cut
+
+sub HasRight {
+
+    my $self = shift;
+    my %args = ( Right      => undef,
+                 Object     => undef,
+                 EquivObjects    => undef,
+                 @_ );
+
+    if ( $self->Disabled ) {
+        $RT::Logger->err( "Disabled User:  " . $self->id . " failed access check for " . $args{'Right'} );
+        return (undef);
+    }
+
+    if ( !defined $args{'Right'} ) {
+        require Carp;
+        $RT::Logger->debug( Carp::cluck("HasRight called without a right") );
+        return (undef);
+    }
+
+    if ( defined( $args{'Object'} )) {
+        return (undef) unless (UNIVERSAL::can( $args{'Object'}, 'id' ) );
+        push(@{$args{'EquivObjects'}}, $args{Object});
+    }
+    elsif ( $args{'ObjectId'} && $args{'ObjectType'} ) {
+        $RT::Logger->crit(Carp::cluck("API not supprted"));
+    }
+    else {
+        $RT::Logger->crit("$self HasRight called with no valid object");
+        return (undef);
+    }
+
+    # If this object is a ticket, we care about ticket roles and queue roles
+    if ( (ref($args{'Object'}) eq 'RT::Ticket') && $args{'Object'}->Id) {
+        # this is a little bit hacky, but basically, now that we've done the ticket roles magic, we load the queue object
+        # and ask all the rest of our questions about the queue.
+        push (@{$args{'EquivObjects'}}, $args{'Object'}->QueueObj);
+
+    }
+
+
+    # {{{ If we've cached a win or loss for this lookup say so
+
+    # {{{ Construct a hashkey to cache decisions in
+    my $hashkey = do {
+	no warnings 'uninitialized';
+        
+	# We don't worry about the hash ordering, as this is only
+	# temporarily used; also if the key changes it would be
+	# invalidated anyway.
+        join (
+            ";:;", $self->Id, map {
+                $_,                              # the key of each arguments
+                ($_ eq 'EquivObjects')           # for object arrayref...
+		    ? map(_ReferenceId($_), @{$args{$_}}) # calculate each
+                    : _ReferenceId( $args{$_} ) # otherwise just the value
+            } keys %args
+        );
+    };
+    # }}}
+
+    #Anything older than 60 seconds needs to be rechecked
+    my $cache_timeout = ( time - 60 );
+
+    # {{{ if we've cached a positive result for this query, return 1
+    if (    ( defined $self->_ACLCache->{"$hashkey"} )
+         && ( $self->_ACLCache->{"$hashkey"}{'val'} == 1 )
+         && ( defined $self->_ACLCache->{"$hashkey"}{'set'} )
+         && ( $self->_ACLCache->{"$hashkey"}{'set'} > $cache_timeout ) ) {
+
+        #$RT::Logger->debug("Cached ACL win for ".  $args{'Right'}.$args{'Scope'}.  $args{'AppliesTo'}."\n");	    
+        return ( 1);
+    }
+    # }}}
+
+    #  {{{ if we've cached a negative result for this query return undef
+    elsif (    ( defined $self->_ACLCache->{"$hashkey"} )
+            && ( $self->_ACLCache->{"$hashkey"}{'val'} == -1 )
+            && ( defined $self->_ACLCache->{"$hashkey"}{'set'} )
+            && ( $self->_ACLCache->{"$hashkey"}{'set'} > $cache_timeout ) ) {
+
+        #$RT::Logger->debug("Cached ACL loss decision for ".  $args{'Right'}.$args{'Scope'}.  $args{'AppliesTo'}."\n");	    
+
+        return (undef);
+    }
+    # }}}
+
+    # }}}
+
+
+
+    #  {{{ Out of date docs
+    
+    #   We want to grant the right if:
+
+
+    #    # The user has the right as a member of a system-internal or 
+    #    # user-defined group
+    #
+    #    Find all records from the ACL where they're granted to a group 
+    #    of type "UserDefined" or "System"
+    #    for the object "System or the object "Queue N" and the group we're looking
+    #    at has the recursive member $self->Id
+    #
+    #    # The user has the right based on a role
+    #
+    #    Find all the records from ACL where they're granted to the role "foo"
+    #    for the object "System" or the object "Queue N" and the group we're looking
+    #   at is of domain  ("RT::Queue-Role" and applies to the right queue)
+    #                             or ("RT::Ticket-Role" and applies to the right ticket)
+    #    and the type is the same as the type of the ACL and the group has
+    #    the recursive member $self->Id
+    #
+
+    # }}}
+
+    my ( $or_look_at_object_rights, $or_check_roles );
+    my $right = $args{'Right'};
+
+    # {{{ Construct Right Match
+
+    # If an object is defined, we want to look at rights for that object
+   
+    my @look_at_objects;
+    push (@look_at_objects, "ACL.ObjectType = 'RT::System'")
+        unless $self->can('_IsOverrideGlobalACL') and $self->_IsOverrideGlobalACL($args{Object});
+
+
+
+    foreach my $obj (@{$args{'EquivObjects'}}) {
+            next unless (UNIVERSAL::can($obj, 'id'));
+            my $type = ref($obj);
+            my $id = $obj->id;
+            push @look_at_objects, "(ACL.ObjectType = '$type' AND ACL.ObjectId = '$id')"; 
+            }
+
+     
+    # }}}
+
+    # {{{ Build that honkin-big SQL query
+
+    
+
+    my $query_base = "SELECT ACL.id from ACL, Groups, Principals, CachedGroupMembers WHERE  ".
+    # Only find superuser or rights with the name $right
+   "(ACL.RightName = 'SuperUser' OR  ACL.RightName = '$right') ".
+   # Never find disabled groups.
+   "AND Principals.Disabled = 0 " .
+   "AND CachedGroupMembers.Disabled = 0  ".
+    "AND Principals.id = Groups.id " .  # We always grant rights to Groups
+
+    # See if the principal is a member of the group recursively or _is the rightholder_
+    # never find recursively disabled group members
+    # also, check to see if the right is being granted _directly_ to this principal,
+    #  as is the case when we want to look up group rights
+    "AND  Principals.id = CachedGroupMembers.GroupId AND CachedGroupMembers.MemberId = '" . $self->Id . "' ".
+
+    # Make sure the rights apply to the entire system or to the object in question
+    "AND ( ".join(' OR ', @look_at_objects).") ";
+
+
+
+    # The groups query does the query based on group membership and individual user rights
+
+	my $groups_query = $query_base . 
+
+    # limit the result set to groups of types ACLEquivalence (user)  UserDefined, SystemInternal and Personal
+    "AND ( (  ACL.PrincipalId = Principals.id AND ACL.PrincipalType = 'Group' AND ".
+        "(Groups.Domain = 'SystemInternal' OR Groups.Domain = 'UserDefined' OR Groups.Domain = 'ACLEquivalence' OR Groups.Domain = 'Personal'))".
+
+        " ) LIMIT 1";
+        
+    my @roles;
+    foreach my $object (@{$args{'EquivObjects'}}) { 
+          push (@roles, $self->_RolesForObject(ref($object), $object->id));
+    }
+
+    # The roles query does the query based on roles
+    my $roles_query;
+    if (@roles) {
+	 $roles_query = $query_base . "AND ".
+            " ( (".join (' OR ', @roles)." ) ".  
+        " AND Groups.Type = ACL.PrincipalType AND Groups.Id = Principals.id AND Principals.PrincipalType = 'Group') LIMIT 1";
+
+   }
+
+
+
+    # }}}
+
+    # {{{ Actually check the ACL by performing an SQL query
+    #   $RT::Logger->debug("Now Trying $groups_query");	
+    my $hitcount = $self->_Handle->FetchResult($groups_query);
+
+    # }}}
+    
+    # {{{ if there's a match, the right is granted 
+    if ($hitcount) {
+
+        # Cache a positive hit.
+        $self->_ACLCache->{"$hashkey"}{'set'} = time;
+        $self->_ACLCache->{"$hashkey"}{'val'} = 1;
+        return (1);
+    }
+    # }}}
+    # {{{ If there's no match on groups, try it on roles
+    else {   
+
+    	$hitcount = $self->_Handle->FetchResult($roles_query);
+
+        if ($hitcount) {
+
+            # Cache a positive hit.
+            $self->_ACLCache->{"$hashkey"}{'set'} = time;
+            $self->_ACLCache->{"$hashkey"}{'val'} = 1;
+            return (1);
+	    }
+
+        else {
+            # cache a negative hit
+            $self->_ACLCache->{"$hashkey"}{'set'} = time;
+            $self->_ACLCache->{"$hashkey"}{'val'} = -1;
+
+            return (undef);
+	    }
+    }
+    # }}}
+}
+
+# }}}
+
+# {{{ _RolesForObject
+
+
+
+=head2 _RolesForObject( $object_type, $object_id)
+
+Returns an SQL clause finding role groups for Objects
+
+=cut
+
+
+sub _RolesForObject {
+    my $self = shift;
+    my $type = shift;
+    my $id = shift;
+    my $clause = "(Groups.Domain = '".$type."-Role' AND Groups.Instance = '" . $id. "') ";
+
+    return($clause);
+}
+
+# }}}
+
+# }}}
+
+# {{{ ACL caching
+
+# {{{ _ACLCache
+
+=head2 _ACLCache
+
+# Function: _ACLCache
+# Type    : private instance
+# Args    : none
+# Lvalue  : hash: ACLCache
+# Desc    : Returns a reference to the Key cache hash
+
+=cut
+
+sub _ACLCache {
+    return(\%_ACL_KEY_CACHE);
+}
+
+# }}}
+
+# {{{ _InvalidateACLCache
+
+=head2 _InvalidateACLCache
+
+Cleans out and reinitializes the user rights key cache
+
+=cut
+
+sub _InvalidateACLCache {
+    %_ACL_KEY_CACHE = ();
+}
+
+# }}}
+
+# }}}
+
+
+# {{{ _GetPrincipalTypeForACL
+
+=head2 _GetPrincipalTypeForACL
+
+Gets the principal type. if it's a user, it's a user. if it's a role group and it has a Type, 
+return that. if it has no type, return group.
+
+=cut
+
+sub _GetPrincipalTypeForACL {
+    my $self = shift;
+    my $type;    
+    if ($self->PrincipalType eq 'Group' && $self->Object->Domain =~ /Role$/) {
+        $type = $self->Object->Type;
+    }
+    else {
+        $type = $self->PrincipalType;
+    }
+
+    return($type);
+}
+
+# }}}
+
+# {{{ _ReferenceId
+
+=head2 _ReferenceId
+
+Returns a list uniquely representing an object or normal scalar.
+
+For scalars, its string value is returned; for objects that has an
+id() method, its class name and Id are returned as a string seperated by a "-".
+
+=cut
+
+sub _ReferenceId {
+    my $scalar = shift;
+
+    # just return the value for non-objects
+    return $scalar unless UNIVERSAL::can($scalar, 'id');
+
+    # an object -- return the class and id
+    return(ref($scalar)."-". $scalar->id);
+}
+
+# }}}
+
+1;
diff --git a/rt/lib/RT/Principals.pm b/rt/lib/RT/Principals.pm
new file mode 100644
index 000000000..c45a4c734
--- /dev/null
+++ b/rt/lib/RT/Principals.pm
@@ -0,0 +1,115 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
+
+=head1 NAME
+
+  RT::Principals -- Class Description
+ 
+=head1 SYNOPSIS
+
+  use RT::Principals
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=cut
+
+package RT::Principals;
+
+use RT::SearchBuilder;
+use RT::Principal;
+
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
+
+
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'Principals';
+    $self->{'primary_key'} = 'id';
+
+
+    return ( $self->SUPER::_Init(@_) );
+}
+
+
+=item NewItem
+
+Returns an empty new RT::Principal item
+
+=cut
+
+sub NewItem {
+    my $self = shift;
+    return(RT::Principal->new($self->CurrentUser));
+}
+
+        eval "require RT::Principals_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Principals_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Principals_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Principals_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Principals_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Principals_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Principals_Overlay, RT::Principals_Vendor, RT::Principals_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/Principals_Overlay.pm b/rt/lib/RT/Principals_Overlay.pm
new file mode 100644
index 000000000..0d8c54c76
--- /dev/null
+++ b/rt/lib/RT/Principals_Overlay.pm
@@ -0,0 +1,52 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::Principals - a collection of RT::Principal objects
+
+=head1 SYNOPSIS
+
+  use RT::Principals;
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::Principals);
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+
+
+
+1;
diff --git a/rt/lib/RT/Queue.pm b/rt/lib/RT/Queue.pm
index 1656903b3..b362c9f0d 100755
--- a/rt/lib/RT/Queue.pm
+++ b/rt/lib/RT/Queue.pm
@@ -1,944 +1,371 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Queue.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::Queue - an RT Queue object
+RT::Queue
 
-=head1 SYNOPSIS
 
-  use RT::Queue;
+=head1 SYNOPSIS
 
 =head1 DESCRIPTION
 
-
 =head1 METHODS
 
-=begin testing 
-use RT::TestHarness;
-
-use RT::Queue;
-
-=end testing
-
 =cut
 
-
-
 package RT::Queue;
-use RT::Record;
-
-@ISA= qw(RT::Record);
-
-use vars (@STATUS);
-
-@STATUS = qw(new open stalled resolved dead); 
-
-=head2 StatusArray
-
-Returns an array of all statuses for this queue
-
-=cut
-
-sub StatusArray {
-    my $self = shift;
-    return (@STATUS);
-}
-
-
-=head2 IsValidStatus VALUE
-
-Returns true if VALUE is a valid status.  Otherwise, returns 0
-
-=for testing
-my $q = new RT::Queue($RT::SystemUser);
-ok($q->IsValidStatus('new')== 1, 'New is a valid status');
-ok($q->IsValidStatus('f00')== 0, 'f00 is not a valid status');
-
-=cut
-
-sub IsValidStatus {
-	my $self = shift;
-	my $value = shift;
-
-	my $retval = grep (/^$value$/, $self->StatusArray);
- 	return ($retval);	
-
-}
-	
-
-
-
-# {{{  sub _Init 
-sub _Init  {
-    my $self = shift;
-    $self->{'table'} = "Queues";
-    return ($self->SUPER::_Init(@_));
-}
-# }}}
-
-# {{{ sub _Accessible 
-
-sub _Accessible  {
-    my $self = shift;
-    my %Cols = ( Name => 'read/write',
-		 CorrespondAddress => 'read/write',
-		 Description => 'read/write',
-		 CommentAddress =>  'read/write',
-		 InitialPriority =>  'read/write',
-		 FinalPriority =>  'read/write',
-		 DefaultDueIn =>  'read/write',
-		 Creator => 'read/auto',
-		 Created => 'read/auto',
-		 LastUpdatedBy => 'read/auto',
-		 LastUpdated => 'read/auto',
-		 Disabled => 'read/write',
-		 
-	       );
-    return($self->SUPER::_Accessible(@_, %Cols));
-}
-
-# }}}
+use RT::Record; 
 
-# {{{ sub Create
 
-=head2 Create
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
 
-Create takes the name of the new queue 
-If you pass the ACL check, it creates the queue and returns its queue id.
+sub _Init {
+  my $self = shift; 
 
-=cut
-
-sub Create  {
-    my $self = shift;
-    my %args = ( Name => undef,
-		 CorrespondAddress => '',
-		 Description => '',
-		 CommentAddress => '',
-		 InitialPriority => "0",
-		 FinalPriority =>  "0",
-		 DefaultDueIn =>  "0",
-		 @_); 
-    
-    unless ($self->CurrentUser->HasSystemRight('AdminQueue')) {    #Check them ACLs
-	return (0, "No permission to create queues") 
-    }
-
-    unless ($self->ValidateName($args{'Name'})) {
-	return(0, 'Queue already exists');
-    }
-    #TODO better input validation
-    
-    my $id = $self->SUPER::Create(%args);
-    unless ($id) {
-	return (0, 'Queue could not be created');
-    }
-
-    return ($id, "Queue $id created");
+  $self->Table('Queues');
+  $self->SUPER::_Init(@_);
 }
 
-# }}}
 
-# {{{ sub Delete 
 
-sub Delete {
-    my $self = shift;
-    return (0, 'Deleting this object would break referential integrity');
-}
 
-# }}}
 
-# {{{ sub SetDisabled
+=item Create PARAMHASH
 
-=head2 SetDisabled
+Create takes a hash of values and creates a row in the database:
 
-Takes a boolean.
-1 will cause this queue to no longer be avaialble for tickets.
-0 will re-enable this queue
+  varchar(200) 'Name'.
+  varchar(255) 'Description'.
+  varchar(120) 'CorrespondAddress'.
+  varchar(120) 'CommentAddress'.
+  int(11) 'InitialPriority'.
+  int(11) 'FinalPriority'.
+  int(11) 'DefaultDueIn'.
+  smallint(6) 'Disabled'.
 
 =cut
 
-# }}}
 
-# {{{ sub Load 
 
-=head2 Load
 
-Takes either a numerical id or a textual Name and loads the specified queue.
-  
-=cut
-
-sub Load  {
+sub Create {
     my $self = shift;
-    
-    my $identifier = shift;
-    if (!$identifier) {
-	return (undef);
-    }	    
-    
-    if ($identifier !~ /\D/) {
-	$self->SUPER::LoadById($identifier);
-    }
-    else {
-	$self->LoadByCol("Name", $identifier);
-    }
-
-    return ($self->Id);
+    my %args = ( 
+                Name => '',
+                Description => '',
+                CorrespondAddress => '',
+                CommentAddress => '',
+                InitialPriority => '0',
+                FinalPriority => '0',
+                DefaultDueIn => '0',
+                Disabled => '0',
 
+		  @_);
+    $self->SUPER::Create(
+                         Name => $args{'Name'},
+                         Description => $args{'Description'},
+                         CorrespondAddress => $args{'CorrespondAddress'},
+                         CommentAddress => $args{'CommentAddress'},
+                         InitialPriority => $args{'InitialPriority'},
+                         FinalPriority => $args{'FinalPriority'},
+                         DefaultDueIn => $args{'DefaultDueIn'},
+                         Disabled => $args{'Disabled'},
+);
 
 }
-# }}}
 
-# {{{ sub ValidateName
 
-=head2 ValidateName NAME
 
-Takes a queue name. Returns true if it's an ok name for
-a new queue. Returns undef if there's already a queue by that name.
+=item id
 
-=cut
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
 
-sub ValidateName {
-    my $self = shift;
-    my $name = shift;
-   
-    my $tempqueue = new RT::Queue($RT::SystemUser);
-    $tempqueue->Load($name);
-
-    #If we couldn't load it :)
-    unless ($tempqueue->id()) {
-	return(1);
-    }
-
-    #If this queue exists, return undef
-    #Avoid the ACL check.
-    if ($tempqueue->Name()){
-        return(undef);
-    }
-
-    #If the queue doesn't exist, return 1
-    else {
-        return(1);
-    }
-
-}
-
-
-# }}}
-
-# {{{ sub Templates
-
-=head2 Templates
-
-Returns an RT::Templates object of all of this queue's templates.
 
 =cut
 
-sub Templates {
-    my $self = shift;
-    
 
-    my $templates = RT::Templates->new($self->CurrentUser);
+=item Name
 
-    if ($self->CurrentUserHasRight('ShowTemplate')) {
-	$templates->LimitToQueue($self->id);
-    }
-    
-    return ($templates); 
-}
-
-# }}}
+Returns the current value of Name. 
+(In the database, Name is stored as varchar(200).)
 
-# {{{ Dealing with watchers
 
-# {{{ sub Watchers
 
-=head2 Watchers
+=item SetName VALUE
 
-Watchers returns a Watchers object preloaded with this queue\'s watchers.
 
-=cut
+Set Name to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Name will be stored as a varchar(200).)
 
-sub Watchers {
-    my $self = shift;
-    
-    require RT::Watchers;
-    my $watchers =RT::Watchers->new($self->CurrentUser);
-    
-    if ($self->CurrentUserHasRight('SeeQueue')) {
-	$watchers->LimitToQueue($self->id);	
-    }	
-    
-    return($watchers);
-}
-
-# }}}
-
-# {{{ sub WatchersAsString
-=head2 WatchersAsString
-
-Returns a string of all queue watchers email addresses concatenated with ','s.
 
 =cut
 
-sub WatchersAsString {
-    my $self=shift;
-    return($self->Watchers->EmailsAsString());
-}
-
-# }}}
-
-# {{{ sub AdminCcAsString 
 
-=head2 AdminCcAsString
+=item Description
 
-Takes nothing. returns a string: All Ticket/Queue AdminCcs.
+Returns the current value of Description. 
+(In the database, Description is stored as varchar(255).)
 
-=cut
 
 
-sub AdminCcAsString {
-    my $self=shift;
-    
-    return($self->AdminCc->EmailsAsString());
-  }
+=item SetDescription VALUE
 
-# }}}
 
-# {{{ sub CcAsString
+Set Description to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Description will be stored as a varchar(255).)
 
-=head2 CcAsString
-
-B<Returns> String: All Queue Ccs as a comma delimited set of email addresses.
 
 =cut
 
-sub CcAsString {
-    my $self=shift;
-    
-    return ($self->Cc->EmailsAsString());
-}
-
-# }}}
-
-# {{{ sub Cc
-
-=head2 Cc
-
-Takes nothing.
-Returns a watchers object which contains this queue\'s Cc watchers
 
-=cut
+=item CorrespondAddress
 
-sub Cc {
-    my $self = shift;
-    my $cc = $self->Watchers();
-    if ($self->CurrentUserHasRight('SeeQueue')) {
-	$cc->LimitToCc();
-    }
-    return ($cc);
-}
+Returns the current value of CorrespondAddress. 
+(In the database, CorrespondAddress is stored as varchar(120).)
 
-# A helper function for Cc, so that we can call it from the ACL checks 
-# without going through acl checks.
 
-sub _Cc {
-    my $self = shift;
-    my $cc = $self->Watchers();
-    $cc->LimitToCc();
-    return($cc);
-    
-}
 
-# }}}
+=item SetCorrespondAddress VALUE
 
-# {{{ sub AdminCc
 
-=head2 AdminCc
+Set CorrespondAddress to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, CorrespondAddress will be stored as a varchar(120).)
 
-Takes nothing.
-Returns this queue's administrative Ccs as an RT::Watchers object
 
 =cut
 
-sub AdminCc {
-    my $self = shift;
-    my $admin_cc = $self->Watchers();
-    if ($self->CurrentUserHasRight('SeeQueue')) {
- 	$admin_cc->LimitToAdminCc();
-    }
-    return($admin_cc);
-}
-
-#helper function for AdminCc so we can call it without ACLs
-sub _AdminCc {
-    my $self = shift;
-    my $admin_cc = $self->Watchers();
-    $admin_cc->LimitToAdminCc();
-    return($admin_cc);
-}
 
-# }}}
+=item CommentAddress
 
-# {{{ IsWatcher, IsCc, IsAdminCc
-
-# {{{ sub IsWatcher
-
-# a generic routine to be called by IsRequestor, IsCc and IsAdminCc
-
-=head2 IsWatcher
-
-Takes a param hash with the attributes Type and User. User is either a user object or string containing an email address. Returns true if that user or string
-is a queue watcher. Returns undef otherwise
-
-=cut
-
-sub IsWatcher {
-    my $self = shift;
-    
-    my %args = ( Type => 'Requestor',
-		 Id => undef,
-		 Email => undef,
-		 @_
-	       );
-    #ACL check - can't do it. we need this method for ACL checks
-    #    unless ($self->CurrentUserHasRight('SeeQueue')) {
-    #	return(undef);
-    #    }
-
-
-    my %cols = ('Type' => $args{'Type'},
-		'Scope' => 'Queue',
-		'Value' => $self->Id
-	       );
-    if (defined ($args{'Id'})) {
-	if (ref($args{'Id'})){ #If it's a ref, assume it's an RT::User object;
-	    #Dangerous but ok for now
-	    $cols{'Owner'} = $args{'Id'}->Id;
-	}
-	elsif ($args{'Id'} =~ /^\d+$/) { # if it's an integer, it's an RT::User obj
-	    $cols{'Owner'} = $args{'Id'};
-	}
-	else {
-	    $cols{'Email'} = $args{'Id'};
-	}	
-    }	
-    
-    if (defined $args{'Email'}) {
-	$cols{'Email'} = $args{'Email'};
-    }
-
-    my ($description);
-    $description = join(":",%cols);
-    
-    #If we've cached a positive match...
-    if (defined $self->{'watchers_cache'}->{"$description"}) {
-	if ($self->{'watchers_cache'}->{"$description"} == 1) {
-	    return(1);
-	}
-	#If we've cached a negative match...
-	else {
-	    return(undef);
-	}
-    }
-
-    require RT::Watcher;
-    my $watcher = new RT::Watcher($self->CurrentUser);
-    $watcher->LoadByCols(%cols);
-    
-    
-    if ($watcher->id) {
-	$self->{'watchers_cache'}->{"$description"} = 1;
-	return(1);
-    }	
-    else {
-	$self->{'watchers_cache'}->{"$description"} = 0;
-	return(undef);
-    }
-    
-}
+Returns the current value of CommentAddress. 
+(In the database, CommentAddress is stored as varchar(120).)
 
-# }}}
 
-# {{{ sub IsCc
 
-=head2 IsCc
+=item SetCommentAddress VALUE
 
-Takes a string. Returns true if the string is a Cc watcher of the current queue
 
-=item Bugs
+Set CommentAddress to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, CommentAddress will be stored as a varchar(120).)
 
-Should also be able to handle an RT::User object
 
 =cut
 
 
-sub IsCc {
-  my $self = shift;
-  my $cc = shift;
-  
-  return ($self->IsWatcher( Type => 'Cc', Id => $cc ));
-  
-}
-
-# }}}
-
-# {{{ sub IsAdminCc
-
-=head2 IsAdminCc
-
-Takes a string. Returns true if the string is an AdminCc watcher of the current queue
+=item InitialPriority
 
-=item Bugs
+Returns the current value of InitialPriority. 
+(In the database, InitialPriority is stored as int(11).)
 
-Should also be able to handle an RT::User object
-
-=cut
-
-sub IsAdminCc {
-  my $self = shift;
-  my $admincc = shift;
-  
-  return ($self->IsWatcher( Type => 'AdminCc', Id => $admincc ));
-  
-}
 
-# }}}
 
-# }}}
+=item SetInitialPriority VALUE
 
-# {{{ sub AddWatcher
 
-=head2 AddWatcher
+Set InitialPriority to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, InitialPriority will be stored as a int(11).)
 
-Takes a paramhash of Email, Owner and Type. Type is one of 'Cc' or 'AdminCc',
-We need either an Email Address in Email or a userid in Owner
 
 =cut
 
-sub AddWatcher {
-    my $self = shift;
-    my %args = ( Email => undef,
-		 Type => undef,
-		 Owner => 0,
-		 @_
-	       );
-    
-    # {{{ Check ACLS
-    #If the watcher we're trying to add is for the current user
-    if ( ( ( defined $args{'Email'})  && 
-           ( $args{'Email'} eq $self->CurrentUser->EmailAddress) ) or 
-	 ($args{'Owner'} eq $self->CurrentUser->Id)) {
-	
-	#  If it's an AdminCc and they don't have 
-	#   'WatchAsAdminCc' or 'ModifyQueueWatchers', bail
-	if ($args{'Type'} eq 'AdminCc') {
-	    unless ($self->CurrentUserHasRight('ModifyQueueWatchers') or 
-		    $self->CurrentUserHasRight('WatchAsAdminCc')) {
-		return(0, 'Permission Denied');
-	    }
-	}
-
-	#  If it's a Requestor or Cc and they don't have
-	#   'Watch' or 'ModifyQueueWatchers', bail
-	elsif ($args{'Type'} eq 'Cc') {
-	    unless ($self->CurrentUserHasRight('ModifyQueueWatchers') or 
-		    $self->CurrentUserHasRight('Watch')) {
-		return(0, 'Permission Denied');
-	    }
-	}
-	else {
-	    $RT::Logger->warn("$self -> AddWatcher hit code".
-			      " it never should. We got passed ".
-			      " a type of ". $args{'Type'});
-	    return (0,'Error in parameters to $self AddWatcher');
-	}
-    }
-    # If the watcher isn't the current user 
-    # and the current user  doesn't have 'ModifyQueueWatchers'
-    # bail
-    else {
-	unless ($self->CurrentUserHasRight('ModifyQueueWatchers')) {
-	    return (0, "Permission Denied");
-	}
-    }
-    # }}}
-        
-    require RT::Watcher;
-    my $Watcher = new RT::Watcher ($self->CurrentUser);
-    return ($Watcher->Create(Scope => 'Queue', 
-			     Value => $self->Id,
-			     Email => $args{'Email'},
-			     Type => $args{'Type'},
-			     Owner => $args{'Owner'}
-			    ));
-}
 
-# }}}
+=item FinalPriority
 
-# {{{ sub AddCc
+Returns the current value of FinalPriority. 
+(In the database, FinalPriority is stored as int(11).)
 
-=head2 AddCc
 
-Add a Cc to this queue.
-Takes a paramhash of Email and Owner. 
-We need either an Email Address in Email or a userid in Owner
 
-=cut
+=item SetFinalPriority VALUE
 
 
-sub AddCc {
-    my $self = shift;
-    return ($self->AddWatcher( Type => 'Cc', @_));
-}
-# }}}
+Set FinalPriority to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, FinalPriority will be stored as a int(11).)
 
-# {{{ sub AddAdminCc
-
-=head2 AddAdminCc
-
-Add an Administrative Cc to this queue.
-Takes a paramhash of Email and Owner. 
-We need either an Email Address in Email or a userid in Owner
 
 =cut
 
-sub AddAdminCc {
-    my $self = shift;
-    return ($self->AddWatcher( Type => 'AdminCc', @_));
-}
-# }}}
-
-# {{{ sub DeleteWatcher
-
-=head2 DeleteWatcher id [type]
 
-DeleteWatcher takes a single argument which is either an email address 
-or a watcher id.  
-If the first argument is an email address, you need to specify the watcher type you're talking
-about as the second argument. Valid values are 'Cc' or 'AdminCc'.
-It removes that watcher from this Queue\'s list of watchers.
+=item DefaultDueIn
 
+Returns the current value of DefaultDueIn. 
+(In the database, DefaultDueIn is stored as int(11).)
 
-=cut
 
 
-sub DeleteWatcher {
-    my $self = shift;
-    my $id = shift;
-    
-    my $type;
-    
-    $type = shift if (@_);
-    
-
-    require RT::Watcher;
-    my $Watcher = new RT::Watcher($self->CurrentUser);
-    
-    #If it\'s a numeric watcherid
-    if ($id =~ /^(\d*)$/) {
-	$Watcher->Load($id);
-    }
-    
-    #Otherwise, we'll assume it's an email address
-    elsif ($type) {
-	my ($result, $msg) = 
-	  $Watcher->LoadByValue( Email => $id,
-				 Scope => 'Queue',
-				 Value => $self->id,
-				 Type => $type);
-	return (0,$msg) unless ($result);
-    }
-    
-    else {
-	return(0,"Can\'t delete a watcher by email address without specifying a type");
-    }
-    
-    # {{{ Check ACLS 
-
-    #If the watcher we're trying to delete is for the current user
-    if ($Watcher->Email eq $self->CurrentUser->EmailAddress) {
-		
-	#  If it's an AdminCc and they don't have 
-	#   'WatchAsAdminCc' or 'ModifyQueueWatchers', bail
-	if ($Watcher->Type eq 'AdminCc') {
-	    unless ($self->CurrentUserHasRight('ModifyQueueWatchers') or 
-		    $self->CurrentUserHasRight('WatchAsAdminCc')) {
-		return(0, 'Permission Denied');
-	    }
-	}
-
-	#  If it's a  Cc and they don't have
-	#   'Watch' or 'ModifyQueueWatchers', bail
-	elsif ($Watcher->Type eq 'Cc') {
-	    unless ($self->CurrentUserHasRight('ModifyQueueWatchers') or 
-		    $self->CurrentUserHasRight('Watch')) {
-		return(0, 'Permission Denied');
-	    }
-	}
-	else {
-	    $RT::Logger->warn("$self -> DeleteWatcher hit code".
-			      " it never should. We got passed ".
-			      " a type of ". $args{'Type'});
-	    return (0,'Error in parameters to $self DeleteWatcher');
-	}
-    }
-    # If the watcher isn't the current user 
-    # and the current user  doesn't have 'ModifyQueueWatchers'
-    # bail
-    else {
-	unless ($self->CurrentUserHasRight('ModifyQueueWatchers')) {
-	    return (0, "Permission Denied");
-	}
-    }
-
-    # }}}
-    
-    unless (($Watcher->Scope eq 'Queue') and
-	    ($Watcher->Value == $self->id) ) {
-	return (0, "Not a watcher for this queue");
-    }
-    
-
-    #Clear out the watchers hash.
-    $self->{'watchers'} = undef;
-    
-    my $retval = $Watcher->Delete();
-    
-    unless ($retval) {
-	return(0,"Watcher could not be deleted.");
-    }
-    
-    return(1, "Watcher deleted");
-}
-
-# {{{ sub DeleteCc
+=item SetDefaultDueIn VALUE
 
-=head2 DeleteCc EMAIL
 
-Takes an email address. It calls DeleteWatcher with a preset 
-type of 'Cc'
+Set DefaultDueIn to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, DefaultDueIn will be stored as a int(11).)
 
 
 =cut
 
-sub DeleteCc {
-   my $self = shift;
-   my $id = shift;
-   return ($self->DeleteWatcher ($id, 'Cc'))
-}
-
-# }}}
 
-# {{{ sub DeleteAdminCc
+=item Creator
 
-=head2 DeleteAdminCc EMAIL
-
-Takes an email address. It calls DeleteWatcher with a preset 
-type of 'AdminCc'
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
 
 
 =cut
 
-sub DeleteAdminCc {
-   my $self = shift;
-   my $id = shift;
-   return ($self->DeleteWatcher ($id, 'AdminCc'))
-}
 
-# }}}
+=item Created
 
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
 
-# }}}
-
-# }}}
-
-# {{{ Dealing with keyword selects
-
-# {{{ sub AddKeywordSelect
-
-=head2 AddKeywordSelect
-
-Takes a paramhash of Name, Keyword, Depth and Single.  Adds a new KeywordSelect for 
-this queue with those attributes.
 
 =cut
 
 
-sub AddKeywordSelect {
-    my $self = shift;
-    my %args = ( Keyword => undef,
-		 Depth => undef,
-		 Single => undef,
-		 Name => undef,
-		 @_);
-    
-    #ACLS get handled in KeywordSelect
-    my $NewKeywordSelect = new RT::KeywordSelect($self->CurrentUser);
-    
-    return ($NewKeywordSelect->Create (Keyword => $args{'Keyword'},
-			       Depth => $args{'Depth'},
-			       Name => $args{'Name'},
-			       Single => $args{'Single'},
-			       ObjectType => 'Ticket',
-			       ObjectField => 'Queue',
-			       ObjectValue => $self->Id()
-			      )	);
-}
-
-# }}}
-
-# {{{ sub KeywordSelect
+=item LastUpdatedBy
 
-=head2 KeywordSelect([NAME])
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
 
-Takes the name of a keyword select for this queue or that's global.
-Returns the relevant KeywordSelect object.  Prefers a keywordselect that's 
-specific to this queue over a global one.  If it can't find the proper
-Keword select or the user doesn't have permission, returns an empty 
-KeywordSelect object
 
 =cut
 
-sub KeywordSelect {
-    my $self = shift;
-    my $name = shift;
-    
-    require RT::KeywordSelect;
-
-    my $select = RT::KeywordSelect->new($self->CurrentUser);
-    if ($self->CurrentUserHasRight('SeeQueue')) {
-	$select->LoadByName( Name => $name, Queue => $self->Id);
-    }
-    return ($select);
-}
-
 
-# }}}
+=item LastUpdated
 
-# {{{ sub KeywordSelects
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
 
-=head2 KeywordSelects
-
-Returns an B<RT::KeywordSelects> object containing the collection of
-B<RT::KeywordSelect> objects which apply to this queue. (Both queue specific keyword selects
-and global keyword selects.
 
 =cut
 
-sub KeywordSelects {
-  my $self = shift;
 
+=item Disabled
 
-  use RT::KeywordSelects;
-  my $KeywordSelects = new RT::KeywordSelects($self->CurrentUser);
+Returns the current value of Disabled. 
+(In the database, Disabled is stored as smallint(6).)
 
-  if ($self->CurrentUserHasRight('SeeQueue')) {
-      $KeywordSelects->LimitToQueue($self->id);
-      $KeywordSelects->IncludeGlobals();
-  }
-  return ($KeywordSelects);
-}
-# }}}
 
-# }}}
 
-# {{{ ACCESS CONTROL
+=item SetDisabled VALUE
 
-# {{{ sub ACL 
 
-=head2 ACL
+Set Disabled to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Disabled will be stored as a smallint(6).)
 
-#Returns an RT::ACL object of ACEs everyone who has anything to do with this queue.
 
 =cut
 
-sub ACL  {
-    my $self = shift;
-    
-    use RT::ACL;
-    my $acl = new RT::ACL($self->CurrentUser);
-    
-    if ($self->CurrentUserHasRight('ShowACL')) {
-	$acl->LimitToQueue($self->Id);
-    }
-    
-    return ($acl);
-}
-
-# }}}
-
-# {{{ sub _Set
-sub _Set {
-    my $self = shift;
 
-    unless ($self->CurrentUserHasRight('AdminQueue')) {
-	return(0, 'Permission Denied');
-    }	
-    return ($self->SUPER::_Set(@_));
-}
-# }}}
 
-# {{{ sub _Value
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        Name => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Description => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        CorrespondAddress => 
+		{read => 1, write => 1, type => 'varchar(120)', default => ''},
+        CommentAddress => 
+		{read => 1, write => 1, type => 'varchar(120)', default => ''},
+        InitialPriority => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        FinalPriority => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        DefaultDueIn => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        Disabled => 
+		{read => 1, write => 1, type => 'smallint(6)', default => '0'},
 
-sub _Value {
-    my $self = shift;
+ }
+};
 
-    unless ($self->CurrentUserHasRight('SeeQueue')) {
-	return (undef);
-    }
 
-    return ($self->__Value(@_));
-}
+        eval "require RT::Queue_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Queue_Overlay.pm}) {
+            die $@;
+        };
 
-# }}}
+        eval "require RT::Queue_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Queue_Vendor.pm}) {
+            die $@;
+        };
 
-# {{{ sub CurrentUserHasRight
+        eval "require RT::Queue_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Queue_Local.pm}) {
+            die $@;
+        };
 
-=head2 CurrentUserHasRight
 
-Takes one argument. A textual string with the name of the right we want to check.
-Returns true if the current user has that right for this queue.
-Returns undef otherwise.
 
-=cut
 
-sub CurrentUserHasRight {
-  my $self = shift;
-  my $right = shift;
+=head1 SEE ALSO
 
-  return ($self->HasRight( Principal=> $self->CurrentUser,
-                            Right => "$right"));
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
-}
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-# }}}
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
-# {{{ sub HasRight
+   no warnings qw(redefine);
 
-=head2 HasRight
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
-Takes a param hash with the fields 'Right' and 'Principal'.
-Principal defaults to the current user.
-Returns true if the principal has that right for this queue.
-Returns undef otherwise.
+RT::Queue_Overlay, RT::Queue_Vendor, RT::Queue_Local
 
 =cut
 
-# TAKES: Right and optional "Principal" which defaults to the current user
-sub HasRight {
-    my $self = shift;
-        my %args = ( Right => undef,
-                     Principal => $self->CurrentUser,
-                     @_);
-        unless(defined $args{'Principal'}) {
-                $RT::Logger->debug("Principal undefined in Queue::HasRight");
-
-        }
-        return($args{'Principal'}->HasQueueRight(QueueObj => $self,
-          Right => $args{'Right'}));
-}
-# }}}
-
-# }}}
 
 1;
diff --git a/rt/lib/RT/Queue_Overlay.pm b/rt/lib/RT/Queue_Overlay.pm
new file mode 100644
index 000000000..4eb265f2a
--- /dev/null
+++ b/rt/lib/RT/Queue_Overlay.pm
@@ -0,0 +1,1012 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::Queue - an RT Queue object
+
+=head1 SYNOPSIS
+
+  use RT::Queue;
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing 
+
+use RT::Queue;
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+use vars qw(@STATUS @ACTIVE_STATUS @INACTIVE_STATUS $RIGHTS);
+use RT::Groups;
+use RT::ACL;
+
+
+@ACTIVE_STATUS = qw(new open stalled);
+@INACTIVE_STATUS = qw(resolved rejected deleted);
+@STATUS = (@ACTIVE_STATUS, @INACTIVE_STATUS);
+
+# $self->loc('new'); # For the string extractor to get a string to localize
+# $self->loc('open'); # For the string extractor to get a string to localize
+# $self->loc('stalled'); # For the string extractor to get a string to localize
+# $self->loc('resolved'); # For the string extractor to get a string to localize
+# $self->loc('rejected'); # For the string extractor to get a string to localize
+# $self->loc('deleted'); # For the string extractor to get a string to localize
+
+
+$RIGHTS = {
+    SeeQueue            => 'Can this principal see this queue',       # loc_pair
+    AdminQueue          => 'Create, delete and modify queues',        # loc_pair
+    ShowACL             => 'Display Access Control List',             # loc_pair
+    ModifyACL           => 'Modify Access Control List',              # loc_pair
+    ModifyQueueWatchers => 'Modify the queue watchers',               # loc_pair
+    AdminCustomFields   => 'Create, delete and modify custom fields', # loc_pair
+    ModifyTemplate      => 'Modify Scrip templates for this queue',   # loc_pair
+    ShowTemplate        => 'Display Scrip templates for this queue',  # loc_pair
+
+    ModifyScrips => 'Modify Scrips for this queue',                   # loc_pair
+    ShowScrips   => 'Display Scrips for this queue',                  # loc_pair
+
+    ShowTicket         => 'Show ticket summaries',                    # loc_pair
+    ShowTicketComments => 'Show ticket private commentary',           # loc_pair
+
+    Watch => 'Sign up as a ticket Requestor or ticket or queue Cc',   # loc_pair
+    WatchAsAdminCc  => 'Sign up as a ticket or queue AdminCc',        # loc_pair
+    CreateTicket    => 'Create tickets in this queue',                # loc_pair
+    ReplyToTicket   => 'Reply to tickets',                            # loc_pair
+    CommentOnTicket => 'Comment on tickets',                          # loc_pair
+    OwnTicket       => 'Own tickets',                                 # loc_pair
+    ModifyTicket    => 'Modify tickets',                              # loc_pair
+    DeleteTicket    => 'Delete tickets',                              # loc_pair
+    TakeTicket      => 'Take tickets',                                # loc_pair
+    StealTicket     => 'Steal tickets',                               # loc_pair
+
+};
+
+# Tell RT::ACE that this sort of object can get acls granted
+$RT::ACE::OBJECT_TYPES{'RT::Queue'} = 1;
+
+# TODO: This should be refactored out into an RT::ACLedObject or something
+# stuff the rights into a hash of rights that can exist.
+
+foreach my $right ( keys %{$RIGHTS} ) {
+    $RT::ACE::LOWERCASERIGHTNAMES{ lc $right } = $right;
+}
+    
+
+=head2 AvailableRights
+
+Returns a hash of available rights for this object. The keys are the right names and the values are a description of what the rights do
+
+=cut
+
+sub AvailableRights {
+    my $self = shift;
+    return($RIGHTS);
+}
+
+# {{{ ActiveStatusArray
+
+=head2 ActiveStatusArray
+
+Returns an array of all ActiveStatuses for this queue
+
+=cut
+
+sub ActiveStatusArray {
+    my $self = shift;
+    return (@ACTIVE_STATUS);
+}
+
+# }}}
+
+# {{{ InactiveStatusArray
+
+=head2 InactiveStatusArray
+
+Returns an array of all InactiveStatuses for this queue
+
+=cut
+
+sub InactiveStatusArray {
+    my $self = shift;
+    return (@INACTIVE_STATUS);
+}
+
+# }}}
+
+# {{{ StatusArray
+
+=head2 StatusArray
+
+Returns an array of all statuses for this queue
+
+=cut
+
+sub StatusArray {
+    my $self = shift;
+    return (@STATUS);
+}
+
+# }}}
+
+# {{{ IsValidStatus
+
+=head2 IsValidStatus VALUE
+
+Returns true if VALUE is a valid status.  Otherwise, returns 0
+
+=for testing
+my $q = RT::Queue->new($RT::SystemUser);
+ok($q->IsValidStatus('new')== 1, 'New is a valid status');
+ok($q->IsValidStatus('f00')== 0, 'f00 is not a valid status');
+
+=cut
+
+sub IsValidStatus {
+    my $self  = shift;
+    my $value = shift;
+
+    my $retval = grep ( /^$value$/, $self->StatusArray );
+    return ($retval);
+
+}
+
+# }}}
+
+# {{{ IsActiveStatus
+
+=head2 IsActiveStatus VALUE
+
+Returns true if VALUE is a Active status.  Otherwise, returns 0
+
+=for testing
+my $q = RT::Queue->new($RT::SystemUser);
+ok($q->IsActiveStatus('new')== 1, 'New is a Active status');
+ok($q->IsActiveStatus('rejected')== 0, 'Rejected is an inactive status');
+ok($q->IsActiveStatus('f00')== 0, 'f00 is not a Active status');
+
+=cut
+
+sub IsActiveStatus {
+    my $self  = shift;
+    my $value = shift;
+
+    my $retval = grep ( /^$value$/, $self->ActiveStatusArray );
+    return ($retval);
+
+}
+
+# }}}
+
+# {{{ IsInactiveStatus
+
+=head2 IsInactiveStatus VALUE
+
+Returns true if VALUE is a Inactive status.  Otherwise, returns 0
+
+=for testing
+my $q = RT::Queue->new($RT::SystemUser);
+ok($q->IsInactiveStatus('new')== 0, 'New is a Active status');
+ok($q->IsInactiveStatus('rejected')== 1, 'rejeected is an Inactive status');
+ok($q->IsInactiveStatus('f00')== 0, 'f00 is not a Active status');
+
+=cut
+
+sub IsInactiveStatus {
+    my $self  = shift;
+    my $value = shift;
+
+    my $retval = grep ( /^$value$/, $self->InactiveStatusArray );
+    return ($retval);
+
+}
+
+# }}}
+
+
+# {{{ sub Create
+
+=head2 Create
+
+Create takes the name of the new queue 
+If you pass the ACL check, it creates the queue and returns its queue id.
+
+=cut
+
+sub Create {
+    my $self = shift;
+    my %args = (
+        Name              => undef,
+        CorrespondAddress => '',
+        Description       => '',
+        CommentAddress    => '',
+        InitialPriority   => "0",
+        FinalPriority     => "0",
+        DefaultDueIn      => "0",
+        @_
+    );
+
+    unless ( $self->CurrentUser->HasRight(Right => 'AdminQueue', Object => $RT::System) )
+    {    #Check them ACLs
+        return ( 0, $self->loc("No permission to create queues") );
+    }
+
+    unless ( $self->ValidateName( $args{'Name'} ) ) {
+        return ( 0, $self->loc('Queue already exists') );
+    }
+
+    #TODO better input validation
+    $RT::Handle->BeginTransaction();
+
+    my $id = $self->SUPER::Create(%args);
+    unless ($id) {
+        $RT::Handle->Rollback();
+        return ( 0, $self->loc('Queue could not be created') );
+    }
+
+    my $create_ret = $self->_CreateQueueGroups();
+    unless ($create_ret) {
+        $RT::Handle->Rollback();
+        return ( 0, $self->loc('Queue could not be created') );
+    }
+
+    $RT::Handle->Commit();
+    return ( $id, $self->loc("Queue created") );
+}
+
+# }}}
+
+# {{{ sub Delete 
+
+sub Delete {
+    my $self = shift;
+    return ( 0,
+        $self->loc('Deleting this object would break referential integrity') );
+}
+
+# }}}
+
+# {{{ sub SetDisabled
+
+=head2 SetDisabled
+
+Takes a boolean.
+1 will cause this queue to no longer be avaialble for tickets.
+0 will re-enable this queue
+
+=cut
+
+# }}}
+
+# {{{ sub Load 
+
+=head2 Load
+
+Takes either a numerical id or a textual Name and loads the specified queue.
+
+=cut
+
+sub Load {
+    my $self = shift;
+
+    my $identifier = shift;
+    if ( !$identifier ) {
+        return (undef);
+    }
+
+    if ( $identifier =~ /^(\d+)$/ ) {
+        $self->SUPER::LoadById($identifier);
+    }
+    else {
+        $self->LoadByCol( "Name", $identifier );
+    }
+
+    return ( $self->Id );
+
+}
+
+# }}}
+
+# {{{ sub ValidateName
+
+=head2 ValidateName NAME
+
+Takes a queue name. Returns true if it's an ok name for
+a new queue. Returns undef if there's already a queue by that name.
+
+=cut
+
+sub ValidateName {
+    my $self = shift;
+    my $name = shift;
+
+    my $tempqueue = new RT::Queue($RT::SystemUser);
+    $tempqueue->Load($name);
+
+    #If we couldn't load it :)
+    unless ( $tempqueue->id() ) {
+        return (1);
+    }
+
+    #If this queue exists, return undef
+    #Avoid the ACL check.
+    if ( $tempqueue->Name() ) {
+        return (undef);
+    }
+
+    #If the queue doesn't exist, return 1
+    else {
+        return (1);
+    }
+
+}
+
+# }}}
+
+# {{{ sub Templates
+
+=head2 Templates
+
+Returns an RT::Templates object of all of this queue's templates.
+
+=cut
+
+sub Templates {
+    my $self = shift;
+
+    my $templates = RT::Templates->new( $self->CurrentUser );
+
+    if ( $self->CurrentUserHasRight('ShowTemplate') ) {
+        $templates->LimitToQueue( $self->id );
+    }
+
+    return ($templates);
+}
+
+# }}}
+
+# {{{ Dealing with custom fields
+
+# {{{  CustomField
+
+=item CustomField NAME
+
+Load the queue-specific custom field named NAME
+
+=cut
+
+sub CustomField {
+    my $self = shift;
+    my $name = shift;
+    my $cf = RT::CustomField->new($self->CurrentUser);
+    $cf->LoadByNameAndQueue(Name => $name, Queue => $self->Id); 
+    return ($cf);
+}
+
+
+# {{{ CustomFields
+
+=item CustomFields
+
+Returns an RT::CustomFields object containing all global custom fields, as well as those tied to this queue
+
+=cut
+
+sub CustomFields {
+    my $self = shift;
+
+    my $cfs = RT::CustomFields->new( $self->CurrentUser );
+    if ( $self->CurrentUserHasRight('SeeQueue') ) {
+        $cfs->LimitToGlobalOrQueue( $self->Id );
+    }
+    return ($cfs);
+}
+
+# }}}
+
+# }}}
+
+
+# {{{ Routines dealing with watchers.
+
+# {{{ _CreateQueueGroups 
+
+=head2 _CreateQueueGroups
+
+Create the ticket groups and relationships for this ticket. 
+This routine expects to be called from Ticket->Create _inside of a transaction_
+
+It will create four groups for this ticket: Requestor, Cc, AdminCc and Owner.
+
+It will return true on success and undef on failure.
+
+=begin testing
+
+my $Queue = RT::Queue->new($RT::SystemUser); my ($id, $msg) = $Queue->Create(Name => "Foo",
+                );
+ok ($id, "Foo $id was created");
+ok(my $group = RT::Group->new($RT::SystemUser));
+ok($group->LoadQueueRoleGroup(Queue => $id, Type=> 'Cc'));
+ok ($group->Id, "Found the requestors object for this Queue");
+
+
+ok ((my $add_id, $add_msg) = $Queue->AddWatcher(Type => 'Cc', Email => 'bob@fsck.com'), "Added bob at fsck.com as a requestor");
+ok ($add_id, "Add succeeded: ($add_msg)");
+ok(my $bob = RT::User->new($RT::SystemUser), "Creating a bob rt::user");
+$bob->LoadByEmail('bob@fsck.com');
+ok($bob->Id,  "Found the bob rt user");
+ok ($Queue->IsWatcher(Type => 'Cc', PrincipalId => $bob->PrincipalId), "The Queue actually has bob at fsck.com as a requestor");;
+ok ((my $add_id, $add_msg) = $Queue->DeleteWatcher(Type =>'Cc', Email => 'bob@fsck.com'), "Added bob at fsck.com as a requestor");
+ok (!$Queue->IsWatcher(Type => 'Cc', Principal => $bob->PrincipalId), "The Queue no longer has bob at fsck.com as a requestor");;
+
+
+$group = RT::Group->new($RT::SystemUser);
+ok($group->LoadQueueRoleGroup(Queue => $id, Type=> 'Cc'));
+ok ($group->Id, "Found the cc object for this Queue");
+$group = RT::Group->new($RT::SystemUser);
+ok($group->LoadQueueRoleGroup(Queue => $id, Type=> 'AdminCc'));
+ok ($group->Id, "Found the AdminCc object for this Queue");
+
+=end testing
+
+=cut
+
+
+sub _CreateQueueGroups {
+    my $self = shift;
+
+    my @types = qw(Cc AdminCc Requestor Owner);
+
+    foreach my $type (@types) {
+        my $type_obj = RT::Group->new($self->CurrentUser);
+        my ($id, $msg) = $type_obj->CreateRoleGroup(Instance => $self->Id, 
+                                                     Type => $type,
+                                                     Domain => 'RT::Queue-Role');
+        unless ($id) {
+            $RT::Logger->error("Couldn't create a Queue group of type '$type' for ticket ".
+                               $self->Id.": ".$msg);
+            return(undef);
+        }
+     }
+    return(1);
+   
+}
+
+
+# }}}
+
+# {{{ sub AddWatcher
+
+=head2 AddWatcher
+
+AddWatcher takes a parameter hash. The keys are as follows:
+
+Type        One of Requestor, Cc, AdminCc
+
+PrinicpalId The RT::Principal id of the user or group that's being added as a watcher
+Email       The email address of the new watcher. If a user with this 
+            email address can't be found, a new nonprivileged user will be created.
+
+If the watcher you\'re trying to set has an RT account, set the Owner paremeter to their User Id. Otherwise, set the Email parameter to their Email address.
+
+=cut
+
+sub AddWatcher {
+    my $self = shift;
+    my %args = (
+        Type  => undef,
+        PrincipalId => undef,
+        Email => undef,
+        @_
+    );
+
+    # {{{ Check ACLS
+    #If the watcher we're trying to add is for the current user
+    if ( $self->CurrentUser->PrincipalId  eq $args{'PrincipalId'}) {
+        #  If it's an AdminCc and they don't have 
+        #   'WatchAsAdminCc' or 'ModifyTicket', bail
+        if ( $args{'Type'} eq 'AdminCc' ) {
+            unless ( $self->CurrentUserHasRight('ModifyQueueWatchers')
+                or $self->CurrentUserHasRight('WatchAsAdminCc') ) {
+                return ( 0, $self->loc('Permission Denied'))
+            }
+        }
+
+        #  If it's a Requestor or Cc and they don't have
+        #   'Watch' or 'ModifyTicket', bail
+        elsif ( ( $args{'Type'} eq 'Cc' ) or ( $args{'Type'} eq 'Requestor' ) ) {
+
+            unless ( $self->CurrentUserHasRight('ModifyQueueWatchers')
+                or $self->CurrentUserHasRight('Watch') ) {
+                return ( 0, $self->loc('Permission Denied'))
+            }
+        }
+     else {
+            $RT::Logger->warn( "$self -> AddWatcher got passed a bogus type");
+            return ( 0, $self->loc('Error in parameters to Queue->AddWatcher') );
+        }
+    }
+
+    # If the watcher isn't the current user 
+    # and the current user  doesn't have 'ModifyQueueWatcher'
+    # bail
+    else {
+        unless ( $self->CurrentUserHasRight('ModifyQueueWatchers') ) {
+            return ( 0, $self->loc("Permission Denied") );
+        }
+    }
+
+    # }}}
+
+    return ( $self->_AddWatcher(%args) );
+}
+
+#This contains the meat of AddWatcher. but can be called from a routine like
+# Create, which doesn't need the additional acl check
+sub _AddWatcher {
+    my $self = shift;
+    my %args = (
+        Type   => undef,
+        Silent => undef,
+        PrincipalId => undef,
+        Email => undef,
+        @_
+    );
+
+
+    my $principal = RT::Principal->new($self->CurrentUser);
+    if ($args{'PrincipalId'}) {
+        $principal->Load($args{'PrincipalId'});
+    }
+    elsif ($args{'Email'}) {
+
+        my $user = RT::User->new($self->CurrentUser);
+        $user->LoadByEmail($args{'Email'});
+
+        unless ($user->Id) {
+            $user->Load($args{'Email'});
+        }
+        if ($user->Id) { # If the user exists
+            $principal->Load($user->PrincipalId);
+        } else {
+
+        # if the user doesn't exist, we need to create a new user
+             my $new_user = RT::User->new($RT::SystemUser);
+
+            my ( $Val, $Message ) = $new_user->Create(
+                Name => $args{'Email'},
+                EmailAddress => $args{'Email'},
+                RealName     => $args{'Email'},
+                Privileged   => 0,
+                Comments     => 'Autocreated when added as a watcher');
+            unless ($Val) {
+                $RT::Logger->error("Failed to create user ".$args{'Email'} .": " .$Message);
+                # Deal with the race condition of two account creations at once
+                $new_user->LoadByEmail($args{'Email'});
+            }
+            $principal->Load($new_user->PrincipalId);
+        }
+    }
+    # If we can't find this watcher, we need to bail.
+    unless ($principal->Id) {
+        return(0, $self->loc("Could not find or create that user"));
+    }
+
+
+    my $group = RT::Group->new($self->CurrentUser);
+    $group->LoadQueueRoleGroup(Type => $args{'Type'}, Queue => $self->Id);
+    unless ($group->id) {
+        return(0,$self->loc("Group not found"));
+    }
+
+    if ( $group->HasMember( $principal)) {
+
+        return ( 0, $self->loc('That principal is already a [_1] for this queue', $args{'Type'}) );
+    }
+
+
+    my ($m_id, $m_msg) = $group->_AddMember(PrincipalId => $principal->Id);
+    unless ($m_id) {
+        $RT::Logger->error("Failed to add ".$principal->Id." as a member of group ".$group->Id."\n".$m_msg);
+
+        return ( 0, $self->loc('Could not make that principal a [_1] for this queue', $args{'Type'}) );
+    }
+    return ( 1, $self->loc('Added principal as a [_1] for this queue', $args{'Type'}) );
+}
+
+# }}}
+
+# {{{ sub DeleteWatcher
+
+=head2 DeleteWatcher { Type => TYPE, PrincipalId => PRINCIPAL_ID, Email => EMAIL_ADDRESS }
+
+
+Deletes a queue  watcher.  Takes two arguments:
+
+Type  (one of Requestor,Cc,AdminCc)
+
+and one of
+
+PrincipalId (an RT::Principal Id of the watcher you want to remove)
+    OR
+Email (the email address of an existing wathcer)
+
+
+=cut
+
+
+sub DeleteWatcher {
+    my $self = shift;
+
+    my %args = ( Type => undef,
+                 PrincipalId => undef,
+                 @_ );
+
+    unless ($args{'PrincipalId'} ) {
+        return(0, $self->loc("No principal specified"));
+    }
+    my $principal = RT::Principal->new($self->CurrentUser);
+    $principal->Load($args{'PrincipalId'});
+
+    # If we can't find this watcher, we need to bail.
+    unless ($principal->Id) {
+        return(0, $self->loc("Could not find that principal"));
+    }
+
+    my $group = RT::Group->new($self->CurrentUser);
+    $group->LoadQueueRoleGroup(Type => $args{'Type'}, Queue => $self->Id);
+    unless ($group->id) {
+        return(0,$self->loc("Group not found"));
+    }
+
+    # {{{ Check ACLS
+    #If the watcher we're trying to add is for the current user
+    if ( $self->CurrentUser->PrincipalId  eq $args{'PrincipalId'}) {
+        #  If it's an AdminCc and they don't have 
+        #   'WatchAsAdminCc' or 'ModifyQueue', bail
+  if ( $args{'Type'} eq 'AdminCc' ) {
+            unless ( $self->CurrentUserHasRight('ModifyQueueWatchers')
+                or $self->CurrentUserHasRight('WatchAsAdminCc') ) {
+                return ( 0, $self->loc('Permission Denied'))
+            }
+        }
+
+        #  If it's a Requestor or Cc and they don't have
+        #   'Watch' or 'ModifyQueue', bail
+        elsif ( ( $args{'Type'} eq 'Cc' ) or ( $args{'Type'} eq 'Requestor' ) ) {
+            unless ( $self->CurrentUserHasRight('ModifyQueueWatchers')
+                or $self->CurrentUserHasRight('Watch') ) {
+                return ( 0, $self->loc('Permission Denied'))
+            }
+        }
+        else {
+            $RT::Logger->warn( "$self -> DelWatcher got passed a bogus type");
+            return ( 0, $self->loc('Error in parameters to Queue->DelWatcher') );
+        }
+    }
+
+    # If the watcher isn't the current user 
+    # and the current user  doesn't have 'ModifyQueueWathcers' bail
+    else {
+        unless ( $self->CurrentUserHasRight('ModifyQueueWatchers') ) {
+            return ( 0, $self->loc("Permission Denied") );
+        }
+    }
+
+    # }}}
+
+
+    # see if this user is already a watcher.
+
+    unless ( $group->HasMember($principal)) {
+        return ( 0,
+        $self->loc('That principal is not a [_1] for this queue', $args{'Type'}) );
+    }
+
+    my ($m_id, $m_msg) = $group->_DeleteMember($principal->Id);
+    unless ($m_id) {
+        $RT::Logger->error("Failed to delete ".$principal->Id.
+                           " as a member of group ".$group->Id."\n".$m_msg);
+
+        return ( 0,    $self->loc('Could not remove that principal as a [_1] for this queue', $args{'Type'}) );
+    }
+
+    return ( 1, $self->loc("[_1] is no longer a [_2] for this queue.", $principal->Object->Name, $args{'Type'} ));
+}
+
+# }}}
+
+# {{{ AdminCcAddresses
+
+=head2 AdminCcAddresses
+
+returns String: All queue AdminCc email addresses as a string
+
+=cut
+
+sub AdminCcAddresses {
+    my $self = shift;
+    
+    unless ( $self->CurrentUserHasRight('SeeQueue') ) {
+        return undef;
+    }   
+    
+    return ( $self->AdminCc->MemberEmailAddressesAsString )
+    
+}   
+
+# }}}
+
+# {{{ CcAddresses
+
+=head2 CcAddresses
+
+returns String: All queue Ccs as a string of email addresses
+
+=cut
+
+sub CcAddresses {
+    my $self = shift;
+
+    unless ( $self->CurrentUserHasRight('SeeQueue') ) {
+        return undef;
+    }
+
+    return ( $self->Cc->MemberEmailAddressesAsString);
+
+}
+# }}}
+
+
+# {{{ sub Cc
+
+=head2 Cc
+
+Takes nothing.
+Returns an RT::Group object which contains this Queue's Ccs.
+If the user doesn't have "ShowQueue" permission, returns an empty group
+
+=cut
+
+sub Cc {
+    my $self = shift;
+
+    my $group = RT::Group->new($self->CurrentUser);
+    if ( $self->CurrentUserHasRight('SeeQueue') ) {
+        $group->LoadQueueRoleGroup(Type => 'Cc', Queue => $self->Id);
+    }
+    return ($group);
+
+}
+
+# }}}
+
+# {{{ sub AdminCc
+
+=head2 AdminCc
+
+Takes nothing.
+Returns an RT::Group object which contains this Queue's AdminCcs.
+If the user doesn't have "ShowQueue" permission, returns an empty group
+
+=cut
+
+sub AdminCc {
+    my $self = shift;
+
+    my $group = RT::Group->new($self->CurrentUser);
+    if ( $self->CurrentUserHasRight('SeeQueue') ) {
+        $group->LoadQueueRoleGroup(Type => 'AdminCc', Queue => $self->Id);
+    }
+    return ($group);
+
+}
+
+# }}}
+
+# {{{ IsWatcher, IsCc, IsAdminCc
+
+# {{{ sub IsWatcher
+# a generic routine to be called by IsRequestor, IsCc and IsAdminCc
+
+=head2 IsWatcher { Type => TYPE, PrincipalId => PRINCIPAL_ID }
+
+Takes a param hash with the attributes Type and PrincipalId
+
+Type is one of Requestor, Cc, AdminCc and Owner
+
+PrincipalId is an RT::Principal id 
+
+Returns true if that principal is a member of the group Type for this queue
+
+
+=cut
+
+sub IsWatcher {
+    my $self = shift;
+
+    my %args = ( Type  => 'Cc',
+        PrincipalId    => undef,
+        @_
+    );
+
+    # Load the relevant group. 
+    my $group = RT::Group->new($self->CurrentUser);
+    $group->LoadQueueRoleGroup(Type => $args{'Type'}, Queue => $self->id);
+    # Ask if it has the member in question
+
+    my $principal = RT::Principal->new($self->CurrentUser);
+    $principal->Load($args{'PrincipalId'});
+
+    return ($group->HasMember($principal));
+}
+
+# }}}
+
+
+# {{{ sub IsCc
+
+=head2 IsCc PRINCIPAL_ID
+
+  Takes an RT::Principal id.
+  Returns true if the principal is a requestor of the current queue.
+
+
+=cut
+
+sub IsCc {
+    my $self = shift;
+    my $cc   = shift;
+
+    return ( $self->IsWatcher( Type => 'Cc', PrincipalId => $cc ) );
+
+}
+
+# }}}
+
+# {{{ sub IsAdminCc
+
+=head2 IsAdminCc PRINCIPAL_ID
+
+  Takes an RT::Principal id.
+  Returns true if the principal is a requestor of the current queue.
+
+=cut
+
+sub IsAdminCc {
+    my $self   = shift;
+    my $person = shift;
+
+    return ( $self->IsWatcher( Type => 'AdminCc', PrincipalId => $person ) );
+
+}
+
+# }}}
+
+
+# }}}
+
+
+
+
+
+# }}}
+
+# {{{ ACCESS CONTROL
+
+# {{{ sub _Set
+sub _Set {
+    my $self = shift;
+
+    unless ( $self->CurrentUserHasRight('AdminQueue') ) {
+        return ( 0, $self->loc('Permission Denied') );
+    }
+    return ( $self->SUPER::_Set(@_) );
+}
+
+# }}}
+
+# {{{ sub _Value
+
+sub _Value {
+    my $self = shift;
+
+    unless ( $self->CurrentUserHasRight('SeeQueue') ) {
+        return (undef);
+    }
+
+    return ( $self->__Value(@_) );
+}
+
+# }}}
+
+# {{{ sub CurrentUserHasRight
+
+=head2 CurrentUserHasRight
+
+Takes one argument. A textual string with the name of the right we want to check.
+Returns true if the current user has that right for this queue.
+Returns undef otherwise.
+
+=cut
+
+sub CurrentUserHasRight {
+    my $self  = shift;
+    my $right = shift;
+
+    return (
+        $self->HasRight(
+            Principal => $self->CurrentUser,
+            Right     => "$right"
+          )
+    );
+
+}
+
+# }}}
+
+# {{{ sub HasRight
+
+=head2 HasRight
+
+Takes a param hash with the fields 'Right' and 'Principal'.
+Principal defaults to the current user.
+Returns true if the principal has that right for this queue.
+Returns undef otherwise.
+
+=cut
+
+# TAKES: Right and optional "Principal" which defaults to the current user
+sub HasRight {
+    my $self = shift;
+    my %args = (
+        Right     => undef,
+        Principal => $self->CurrentUser,
+        @_
+    );
+    unless ( defined $args{'Principal'} ) {
+        $RT::Logger->debug("Principal undefined in Queue::HasRight");
+
+    }
+    return (
+        $args{'Principal'}->HasRight(
+            Object => $self,
+            Right    => $args{'Right'}
+          )
+    );
+}
+
+# }}}
+
+# }}}
+
+1;
diff --git a/rt/lib/RT/Queues.pm b/rt/lib/RT/Queues.pm
index ab58d8d6d..60aec9086 100755
--- a/rt/lib/RT/Queues.pm
+++ b/rt/lib/RT/Queues.pm
@@ -1,123 +1,115 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Queues.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::Queues - a collection of RT::Queue objects
+=head1 NAME
 
+  RT::Queues -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::Queues;
+  use RT::Queues
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Queues);
-
-=end testing
-
 =cut
 
 package RT::Queues;
-use RT::EasySearch;
-@ISA= qw(RT::EasySearch);
 
+use RT::SearchBuilder;
+use RT::Queue;
 
-# {{{ sub _Init
-sub _Init { 
-  my $self = shift;
-  $self->{'table'} = "Queues";
-  $self->{'primary_key'} = "id";
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-  # By default, order by name
-  $self->OrderBy( ALIAS => 'main',
-		  FIELD => 'Name',
-		  ORDER => 'ASC');
 
-  return ($self->SUPER::_Init(@_));
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'Queues';
+    $self->{'primary_key'} = 'id';
+
+
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
-# {{{ sub _DoSearch 
 
-=head2 _DoSearch
+=item NewItem
 
-  A subclass of DBIx::SearchBuilder::_DoSearch that makes sure that _Disabled rows never get seen unless
-we're explicitly trying to see them.
+Returns an empty new RT::Queue item
 
 =cut
 
-sub _DoSearch {
+sub NewItem {
     my $self = shift;
-    
-    #unless we really want to find disabled rows, make sure we\'re only finding enabled ones.
-    unless($self->{'find_disabled_rows'}) {
-	$self->LimitToEnabled();
-    }
-    
-    return($self->SUPER::_DoSearch(@_));
-    
+    return(RT::Queue->new($self->CurrentUser));
 }
 
-# }}}
-  
+        eval "require RT::Queues_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Queues_Overlay.pm}) {
+            die $@;
+        };
 
-# {{{ sub Limit 
-sub Limit  {
-  my $self = shift;
-  my %args = ( ENTRYAGGREGATOR => 'AND',
-	       @_);
-  $self->SUPER::Limit(%args);
-}
-# }}}
+        eval "require RT::Queues_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Queues_Vendor.pm}) {
+            die $@;
+        };
 
-# {{{ sub NewItem 
-sub NewItem  {
-  my $self = shift;
-  my $item;
+        eval "require RT::Queues_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Queues_Local.pm}) {
+            die $@;
+        };
 
-  use RT::Queue;
-  $item = new RT::Queue($self->CurrentUser);
-  return($item);
-}
-# }}}
 
-# {{{ sub Next 
 
-=head2 Next
 
-Returns the next queue that this user can see.
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Queues_Overlay, RT::Queues_Vendor, RT::Queues_Local
 
 =cut
-  
-sub Next {
-    my $self = shift;
-    
-    
-    my $Queue = $self->SUPER::Next();
-    if ((defined($Queue)) and (ref($Queue))) {
-
-	if ($Queue->CurrentUserHasRight('SeeQueue')) {
-	    return($Queue);
-	}
-	
-	#If the user doesn't have the right to show this queue
-	else {	
-	    return($self->Next());
-	}
-    }
-    #if there never was any queue
-    else {
-	return(undef);
-    }	
-    
-}
-# }}}
 
-1;
 
+1;
diff --git a/rt/lib/RT/Queues_Overlay.pm b/rt/lib/RT/Queues_Overlay.pm
new file mode 100644
index 000000000..b85144b52
--- /dev/null
+++ b/rt/lib/RT/Queues_Overlay.pm
@@ -0,0 +1,130 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::Queues - a collection of RT::Queue objects
+
+=head1 SYNOPSIS
+
+  use RT::Queues;
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::Queues);
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+# {{{ sub _Init
+sub _Init { 
+  my $self = shift;
+  $self->{'table'} = "Queues";
+  $self->{'primary_key'} = "id";
+
+  # By default, order by name
+  $self->OrderBy( ALIAS => 'main',
+		  FIELD => 'Name',
+		  ORDER => 'ASC');
+
+  return ($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub _DoSearch 
+
+=head2 _DoSearch
+
+  A subclass of DBIx::SearchBuilder::_DoSearch that makes sure that _Disabled rows never get seen unless
+we're explicitly trying to see them.
+
+=cut
+
+sub _DoSearch {
+    my $self = shift;
+    
+    #unless we really want to find disabled rows, make sure we\'re only finding enabled ones.
+    unless($self->{'find_disabled_rows'}) {
+	$self->LimitToEnabled();
+    }
+    
+    return($self->SUPER::_DoSearch(@_));
+    
+}
+
+# }}}
+  
+
+# {{{ sub Limit 
+sub Limit  {
+  my $self = shift;
+  my %args = ( ENTRYAGGREGATOR => 'AND',
+	       @_);
+  $self->SUPER::Limit(%args);
+}
+# }}}
+
+# {{{ sub Next 
+
+=head2 Next
+
+Returns the next queue that this user can see.
+
+=cut
+  
+sub Next {
+    my $self = shift;
+    
+    
+    my $Queue = $self->SUPER::Next();
+    if ((defined($Queue)) and (ref($Queue))) {
+
+	if ($Queue->CurrentUserHasRight('SeeQueue')) {
+	    return($Queue);
+	}
+	
+	#If the user doesn't have the right to show this queue
+	else {	
+	    return($self->Next());
+	}
+    }
+    #if there never was any queue
+    else {
+	return(undef);
+    }	
+    
+}
+# }}}
+
+1;
+
diff --git a/rt/lib/RT/Record.pm b/rt/lib/RT/Record.pm
index 5340f7de4..6962221ea 100755
--- a/rt/lib/RT/Record.pm
+++ b/rt/lib/RT/Record.pm
@@ -1,5 +1,26 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Record.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 =head1 NAME
 
   RT::Record - Base class for RT record objects
@@ -20,20 +41,31 @@ ok (require RT::Record);
 
 =cut
 
-
 package RT::Record;
-use DBIx::SearchBuilder::Record::Cachable;
 use RT::Date;
 use RT::User;
 
-@ISA= qw(DBIx::SearchBuilder::Record::Cachable);
+use RT::Base;
+use DBIx::SearchBuilder::Record::Cachable;
+
+use strict;
+use vars qw/@ISA/;
+
+@ISA = qw(RT::Base);
+
+if ($RT::DontCacheSearchBuilderRecords ) {
+    push (@ISA, 'DBIx::SearchBuilder::Record');
+} else {
+    push (@ISA, 'DBIx::SearchBuilder::Record::Cachable');
+
+}
 
 # {{{ sub _Init 
 
-sub _Init  {
-  my $self = shift;
-  $self->_MyCurrentUser(@_);
-  
+sub _Init {
+    my $self = shift;
+    $self->CurrentUser(@_);
+
 }
 
 # }}}
@@ -48,68 +80,108 @@ The primary keys for RT classes is 'id'
 
 sub _PrimaryKeys {
     my $self = shift;
-    return(['id']);
+    return ( ['id'] );
 }
 
 # }}}
 
-# {{{ sub _MyCurrentUser 
-
-sub _MyCurrentUser  {
+# {{{ sub _Handle 
+sub _Handle {
     my $self = shift;
-  
-    $self->CurrentUser(@_);
-    if(!defined($self->CurrentUser)) {
-	use Carp;
-	Carp::cluck();
-	$RT::Logger->err("$self was created without a CurrentUser\n"); 
-      return(0);
-    }
+    return ($RT::Handle);
 }
 
 # }}}
 
-# {{{ sub _Handle 
-sub _Handle  {
-  my $self = shift;
-  return($RT::Handle);
-}
-# }}}
-
 # {{{ sub Create 
 
-sub Create  {
-    my $self = shift;
-    my $now = new RT::Date($self->CurrentUser);
-    $now->Set(Format=> 'unix', Value => time);
-    push @_, 'Created', $now->ISO()
-      if ($self->_Accessible('Created', 'auto'));
-    
-
-    push @_, 'Creator', $self->{'user'}->id
-      if $self->_Accessible('Creator', 'auto');
-    
-    push @_, 'LastUpdated', $now->ISO()
-      if ($self->_Accessible('LastUpdated', 'auto'));
-
-    push @_, 'LastUpdatedBy', $self->{'user'}->id
-      if $self->_Accessible('LastUpdatedBy', 'auto');
-    
-    
-
-   my $id = $self->SUPER::Create(@_);
-    
-    if ($id) {
-	$self->Load($id);
+=item  Create PARAMHASH
+
+Takes a PARAMHASH of Column -> Value pairs.
+If any Column has a Validate$PARAMNAME subroutine defined and the 
+value provided doesn't pass validation, this routine returns
+an error.
+
+If this object's table has any of the following atetributes defined as
+'Auto', this routine will automatically fill in their values.
+
+=cut
+
+sub Create {
+    my $self    = shift;
+    my %attribs = (@_);
+    foreach my $key ( keys %attribs ) {
+        my $method = "Validate$key";
+        unless ( $self->$method( $attribs{$key} ) ) {
+            if (wantarray) {
+                return ( 0, $self->loc('Invalid value for [_1]', $key) );
+            }
+            else {
+                return (0);
+            }
+        }
+    }
+    my $now = RT::Date->new( $self->CurrentUser );
+    $now->Set( Format => 'unix', Value => time );
+    $attribs{'Created'} = $now->ISO() if ( $self->_Accessible( 'Created', 'auto' ) && !$attribs{'Created'});
+
+    if ($self->_Accessible( 'Creator', 'auto' ) && !$attribs{'Creator'}) {
+         $attribs{'Creator'} = $self->CurrentUser->id || '0'; 
+    }
+    $attribs{'LastUpdated'} = $now->ISO()
+      if ( $self->_Accessible( 'LastUpdated', 'auto' ) && !$attribs{'LastUpdated'});
+
+    $attribs{'LastUpdatedBy'} = $self->CurrentUser->id || '0'
+      if ( $self->_Accessible( 'LastUpdatedBy', 'auto' ) && !$attribs{'LastUpdatedBy'});
+
+    my $id = $self->SUPER::Create(%attribs);
+    if ( UNIVERSAL::isa( $id, 'Class::ReturnValue' ) ) {
+        if ( $id->errno ) {
+            if (wantarray) {
+                return ( 0,
+                    $self->loc( "Internal Error: [_1]", $id->{error_message} ) );
+            }
+            else {
+                return (0);
+            }
+        }
+    }
+    # If the object was created in the database, 
+    # load it up now, so we're sure we get what the database 
+    # has.  Arguably, this should not be necessary, but there
+    # isn't much we can do about it.
+
+   unless ($id) { 
+    if (wantarray) {
+        return ( $id, $self->loc('Object could not be created') );
+    }
+    else {
+        return ($id);
+    }
+
+   }
+
+    if  (UNIVERSAL::isa('errno',$id)) {
+        exit(0);
+       warn "It's here!";
+        return(undef);
+    }
+
+    $self->Load($id) if ($id);
+
+
+
+    if (wantarray) {
+        return ( $id, $self->loc('Object created') );
+    }
+    else {
+        return ($id);
     }
-    
-    return($id);
-    
+
 }
 
 # }}}
 
-
 # {{{ sub LoadByCols
 
 =head2 LoadByCols
@@ -125,28 +197,33 @@ sub LoadByCols {
 
     # If this database is case sensitive we need to uncase objects for
     # explicit loading
-    if ($self->_Handle->CaseSensitive) {
-	 my %newhash;
-	 foreach my $key (keys %hash) {
-        # If we've been passed an empty value, we can't do the lookup. 
-		# We don't need to explicitly downcase integers or an id.
-		if ($key =~ '^id$' || $hash{$key} =~/^\d+$/ || !defined ($hash{$key}) ) {
-			$newhash{$key} = $hash{$key};
-		}
-		else {
-			$newhash{"lower(".$key.")"} = lc($hash{$key});	
-		}
-	 }
-	$self->SUPER::LoadByCols(%newhash);
-    }
-    else {
-	$self->SUPER::LoadByCols(%hash);
+    if ( $self->_Handle->CaseSensitive ) {
+        my %newhash;
+        foreach my $key ( keys %hash ) {
+
+            # If we've been passed an empty value, we can't do the lookup. 
+            # We don't need to explicitly downcase integers or an id.
+            if ( $key =~ '^id$'
+                || !defined( $hash{$key} )
+                || $hash{$key} =~ /^\d+$/
+                 )
+            {
+                $newhash{$key} = $hash{$key};
+            }
+            else {
+                $newhash{ "lower(" . $key . ")" } = lc( $hash{$key} );
+            }
+        }
+
+        # We've clobbered everything we care about. bash the old hash
+        # and replace it with the new hash
+        %hash = %newhash;
     }
+    $self->SUPER::LoadByCols(%hash);
 }
 
 # }}}
 
-
 # {{{ Datehandling
 
 # There is room for optimizations in most of those subs:
@@ -154,10 +231,10 @@ sub LoadByCols {
 # {{{ LastUpdatedObj
 
 sub LastUpdatedObj {
-    my $self=shift;
-    my $obj = new RT::Date($self->CurrentUser);
-    
-    $obj->Set(Format => 'sql', Value => $self->LastUpdated);
+    my $self = shift;
+    my $obj  = new RT::Date( $self->CurrentUser );
+
+    $obj->Set( Format => 'sql', Value => $self->LastUpdated );
     return $obj;
 }
 
@@ -166,12 +243,11 @@ sub LastUpdatedObj {
 # {{{ CreatedObj
 
 sub CreatedObj {
-    my $self=shift;
-    my $obj = new RT::Date($self->CurrentUser);
-    
-    $obj->Set(Format => 'sql', Value => $self->Created);
+    my $self = shift;
+    my $obj  = new RT::Date( $self->CurrentUser );
+
+    $obj->Set( Format => 'sql', Value => $self->Created );
 
-    
     return $obj;
 }
 
@@ -182,9 +258,10 @@ sub CreatedObj {
 # TODO: This should be deprecated
 #
 sub AgeAsString {
-    my $self=shift;
-    return($self->CreatedObj->AgeAsString());
+    my $self = shift;
+    return ( $self->CreatedObj->AgeAsString() );
 }
+
 # }}}
 
 # {{{ LastUpdatedAsString
@@ -192,12 +269,13 @@ sub AgeAsString {
 # TODO this should be deprecated
 
 sub LastUpdatedAsString {
-    my $self=shift;
-    if ($self->LastUpdated) {
-	return ($self->LastUpdatedObj->AsString());
-	  
-    } else {
-	return "never";
+    my $self = shift;
+    if ( $self->LastUpdated ) {
+        return ( $self->LastUpdatedObj->AsString() );
+
+    }
+    else {
+        return "never";
     }
 }
 
@@ -209,8 +287,9 @@ sub LastUpdatedAsString {
 #
 sub CreatedAsString {
     my $self = shift;
-    return ($self->CreatedObj->AsString());
+    return ( $self->CreatedObj->AsString() );
 }
+
 # }}}
 
 # {{{ LongSinceUpdateAsString
@@ -218,42 +297,47 @@ sub CreatedAsString {
 # TODO This should be deprecated
 #
 sub LongSinceUpdateAsString {
-    my $self=shift;
-    if ($self->LastUpdated) {
-      
-        return ($self->LastUpdatedObj->AgeAsString());
-	
-    } else {
-	return "never";
+    my $self = shift;
+    if ( $self->LastUpdated ) {
+
+        return ( $self->LastUpdatedObj->AgeAsString() );
+
+    }
+    else {
+        return "never";
     }
 }
+
 # }}}
 
 # }}} Datehandling
 
-
 # {{{ sub _Set 
-sub _Set  {
-  my $self = shift;
+sub _Set {
+    my $self = shift;
 
-  my %args = ( Field => undef,
-	       Value => undef,
-	       IsSQL => undef,
-	       @_ );
+    my %args = (
+        Field => undef,
+        Value => undef,
+        IsSQL => undef,
+        @_
+    );
 
+    #if the user is trying to modify the record
+    # TODO: document _why_ this code is here
 
-  #if the user is trying to modify the record
-  if ((!defined ($args{'Field'})) || (!defined ($args{'Value'}))) {
-    $args{'Value'} = 0; 
-   }
+    if ( ( !defined( $args{'Field'} ) ) || ( !defined( $args{'Value'} ) ) ) {
+        $args{'Value'} = 0;
+    }
 
-  $self->_SetLastUpdated();
-  $self->SUPER::_Set(Field => $args{'Field'},
-		     Value => $args{'Value'},
-		     IsSQL => $args{'IsSQL'});
-  
-  
+    $self->_SetLastUpdated();
+    my ( $val, $msg ) = $self->SUPER::_Set(
+        Field => $args{'Field'},
+        Value => $args{'Value'},
+        IsSQL => $args{'IsSQL'}
+    );
 }
+
 # }}}
 
 # {{{ sub _SetLastUpdated
@@ -268,16 +352,20 @@ It takes no options. Arguably, this is a bug
 sub _SetLastUpdated {
     my $self = shift;
     use RT::Date;
-    my $now = new RT::Date($self->CurrentUser);
+    my $now = new RT::Date( $self->CurrentUser );
     $now->SetToNow();
 
-    if ($self->_Accessible('LastUpdated','auto')) {
-    	my ($msg, $val) = $self->__Set( Field => 'LastUpdated',
-                                        Value => $now->ISO);
+    if ( $self->_Accessible( 'LastUpdated', 'auto' ) ) {
+        my ( $msg, $val ) = $self->__Set(
+            Field => 'LastUpdated',
+            Value => $now->ISO
+        );
     }
-    if ($self->_Accessible('LastUpdatedBy','auto')) {
-        my ($msg, $val) = $self->__Set( Field => 'LastUpdatedBy', 
-				        Value => $self->CurrentUser->id);
+    if ( $self->_Accessible( 'LastUpdatedBy', 'auto' ) ) {
+        my ( $msg, $val ) = $self->__Set(
+            Field => 'LastUpdatedBy',
+            Value => $self->CurrentUser->id
+        );
     }
 }
 
@@ -291,15 +379,16 @@ Returns an RT::User object with the RT account of the creator of this row
 
 =cut
 
-sub CreatorObj  {
-  my $self = shift;
-  unless (exists $self->{'CreatorObj'}) {
-    
-    $self->{'CreatorObj'} = RT::User->new($self->CurrentUser);
-    $self->{'CreatorObj'}->Load($self->Creator);
-  }
-  return($self->{'CreatorObj'});
+sub CreatorObj {
+    my $self = shift;
+    unless ( exists $self->{'CreatorObj'} ) {
+
+        $self->{'CreatorObj'} = RT::User->new( $self->CurrentUser );
+        $self->{'CreatorObj'}->Load( $self->Creator );
+    }
+    return ( $self->{'CreatorObj'} );
 }
+
 # }}}
 
 # {{{ sub LastUpdatedByObj
@@ -311,35 +400,56 @@ sub CreatorObj  {
 =cut
 
 sub LastUpdatedByObj {
-    my $self=shift;
-    unless (exists $self->{LastUpdatedByObj}) {
-	$self->{'LastUpdatedByObj'}=RT::User->new($self->CurrentUser);
-	$self->{'LastUpdatedByObj'}->Load($self->LastUpdatedBy);
+    my $self = shift;
+    unless ( exists $self->{LastUpdatedByObj} ) {
+        $self->{'LastUpdatedByObj'} = RT::User->new( $self->CurrentUser );
+        $self->{'LastUpdatedByObj'}->Load( $self->LastUpdatedBy );
     }
     return $self->{'LastUpdatedByObj'};
 }
 
 # }}}
 
-# {{{ sub CurrentUser 
 
-=head2 CurrentUser
+require Encode::compat if $] < 5.007001;
+require Encode;
 
-If called with an argument, sets the current user to that user object.
-This will affect ACL decisions, etc.  
-Returns the current user
+sub __Value {
+    my $self  = shift;
+    my $field = shift;
+    my %args = ( decode_utf8 => 1,
+                 @_ );
 
-=cut
+    unless (defined $field && $field) {
+        $RT::Logger->error("$self __Value called with undef field");
+    }
+    my $value = $self->SUPER::__Value($field);
+
+    return('') if ( !defined($value) || $value eq '');
+
+    return Encode::decode_utf8($value) || $value if $args{'decode_utf8'};
+    return $value;
+}
 
-sub CurrentUser  {
-  my $self = shift;
+# Set up defaults for DBIx::SearchBuilder::Record::Cachable
 
-  if (@_) {
-    $self->{'user'} = shift;
+sub _CacheConfig {
+  {
+     'cache_p'        => 1,
+     'fast_update_p'  => 1,
+     'cache_for_sec'  => 30,
   }
-  return ($self->{'user'});
 }
-# }}}
 
+=head2 _DecodeUTF8
+
+ When passed a string will "decode" it int a proper UTF-8 string
+
+=cut
+
+eval "require RT::Record_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Record_Vendor.pm});
+eval "require RT::Record_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Record_Local.pm});
 
 1;
diff --git a/rt/lib/RT/Scrip.pm b/rt/lib/RT/Scrip.pm
index aef011ca3..a69dde04e 100755
--- a/rt/lib/RT/Scrip.pm
+++ b/rt/lib/RT/Scrip.pm
@@ -1,372 +1,500 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Scrip.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::Scrip - an RT Scrip object
+RT::Scrip
 
-=head1 SYNOPSIS
 
-  use RT::Scrip;
+=head1 SYNOPSIS
 
 =head1 DESCRIPTION
 
-
 =head1 METHODS
 
-=begin testing
+=cut
 
-ok (require RT::TestHarness);
-ok (require RT::Scrip);
+package RT::Scrip;
+use RT::Record; 
+use RT::Queue;
+use RT::Template;
+use RT::ScripCondition;
+use RT::ScripAction;
 
-=end testing
 
-=cut
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
 
-package RT::Scrip;
-use RT::Record;
-@ISA= qw(RT::Record);
+sub _Init {
+  my $self = shift; 
 
-# {{{ sub _Init
-sub _Init  {
-    my $self = shift;
-    $self->{'table'} = "Scrips";
-    return ($self->SUPER::_Init(@_));
+  $self->Table('Scrips');
+  $self->SUPER::_Init(@_);
 }
-# }}}
 
-# {{{ sub _Accessible 
-sub _Accessible  {
-    my $self = shift;
-    my %Cols = ( ScripAction  => 'read/write',
-		 ScripCondition => 'read/write',
-		 Stage => 'read/write',
-		 Queue => 'read/write', 
-		 Template => 'read/write',
-	       );
-    return($self->SUPER::_Accessible(@_, %Cols));
-}
-# }}}
 
-# {{{ sub Create 
 
-=head2 Create
 
-Creates a new entry in the Scrips table. Takes a paramhash with the attributes:
 
-    Queue           A queue id or 0 for a global scrip
-    Template        A template ID or name.  
-                    Behavior is undefined if you have multiple items with 
-                    the same name
-    ScripAction     A ScripAction id or name
-                    Behavior is undefined if you have multiple items with 
-                    the same name
-    ScripCondition  A ScripCondition id or name
-                    Behavior is undefined if you have multiple items with 
-                    the same name
+=item Create PARAMHASH
 
-Returns (retval, msg);
-retval is 0 for failure or scrip id.  msg is a textual description of what happened.
+Create takes a hash of values and creates a row in the database:
+
+  varchar(255) 'Description'.
+  int(11) 'ScripCondition'.
+  int(11) 'ScripAction'.
+  text 'ConditionRules'.
+  text 'ActionRules'.
+  text 'CustomIsApplicableCode'.
+  text 'CustomPrepareCode'.
+  text 'CustomCommitCode'.
+  varchar(32) 'Stage'.
+  int(11) 'Queue'.
+  int(11) 'Template'.
 
 =cut
 
-sub Create  {
+
+
+
+sub Create {
     my $self = shift;
-    my %args = ( Queue => undef,
-		 Template => undef,
-		 ScripAction => undef,
-		 ScripCondition => undef,
-		 Stage => 'TransactionCreate',
-		 @_
-	       );
-    
-      
-    if ($args{'Queue'} == 0 ) { 
-	unless ($self->CurrentUser->HasSystemRight('ModifyScrips')) {
-	    return (0, 'Permission Denied');
- 	}	
-    }
-    else {
-	my $QueueObj = new RT::Queue($self->CurrentUser);
-	$QueueObj->Load($args{'Queue'});
-	unless ($QueueObj->id()) {
-	    return (0,'Invalid queue');
-	}
-	unless ($QueueObj->CurrentUserHasRight('ModifyScrips')) {
-	    return (0, 'Permssion Denied');
-	}	
-    }
-
-    #TODO +++ validate input 
-
-    require RT::ScripAction;
-    my $action = new RT::ScripAction($self->CurrentUser);
-    $action->Load($args{'ScripAction'});
-    return (0, "Action ".$args{'ScripAction'}." not found") unless $action->Id;
-
-    require RT::Template;
-    my $template = new RT::Template($self->CurrentUser);
-    $template->Load($args{'Template'});
-    return (0, 'Template not found') unless $template->Id;
-
-    require RT::ScripCondition;
-    my $condition = new RT::ScripCondition($self->CurrentUser);
-    $condition->Load($args{'ScripCondition'});
-
-    unless ($condition->Id) {
-	return (0, 'Condition not found');
-    }	
-    
-    my $id = $self->SUPER::Create(Queue => $args{'Queue'},
-				  Template => $template->Id,
-				  ScripCondition => $condition->id,
-				  Stage => $args{'Stage'},
-				  ScripAction => $action->Id
-				 );
-    return ($id, 'Scrip Created'); 
+    my %args = ( 
+                Description => '',
+                ScripCondition => '0',
+                ScripAction => '0',
+                ConditionRules => '',
+                ActionRules => '',
+                CustomIsApplicableCode => '',
+                CustomPrepareCode => '',
+                CustomCommitCode => '',
+                Stage => '',
+                Queue => '0',
+                Template => '0',
+
+		  @_);
+    $self->SUPER::Create(
+                         Description => $args{'Description'},
+                         ScripCondition => $args{'ScripCondition'},
+                         ScripAction => $args{'ScripAction'},
+                         ConditionRules => $args{'ConditionRules'},
+                         ActionRules => $args{'ActionRules'},
+                         CustomIsApplicableCode => $args{'CustomIsApplicableCode'},
+                         CustomPrepareCode => $args{'CustomPrepareCode'},
+                         CustomCommitCode => $args{'CustomCommitCode'},
+                         Stage => $args{'Stage'},
+                         Queue => $args{'Queue'},
+                         Template => $args{'Template'},
+);
+
 }
 
-# }}}
 
-# {{{ sub Delete
 
-=head2 Delete
+=item id
+
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
 
-Delete this object
 
 =cut
 
-sub Delete {
-    my $self = shift;
-    
-    unless ($self->CurrentUserHasRight('ModifyScrips')) {
-	return (0, 'Permission Denied');
-    }
-    
-    return ($self->SUPER::Delete(@_));
-}
-# }}}
 
-# {{{ sub QueueObj
+=item Description
+
+Returns the current value of Description. 
+(In the database, Description is stored as varchar(255).)
+
 
-=head2 QueueObj
 
-Retuns an RT::Queue object with this Scrip\'s queue
+=item SetDescription VALUE
+
+
+Set Description to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Description will be stored as a varchar(255).)
+
 
 =cut
 
-sub QueueObj {
-    my $self = shift;
-    
-    if (!$self->{'QueueObj'})  {
-	require RT::Queue;
-	$self->{'QueueObj'} = RT::Queue->new($self->CurrentUser);
-	$self->{'QueueObj'}->Load($self->Queue);
-    }
-    return ($self->{'QueueObj'});
-}
 
-# }}}
+=item ScripCondition
+
+Returns the current value of ScripCondition. 
+(In the database, ScripCondition is stored as int(11).)
+
 
-# {{{ sub ActionObj
 
+=item SetScripCondition VALUE
 
-=head2 ActionObj
 
-Retuns an RT::Action object with this Scrip\'s Action
+Set ScripCondition to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ScripCondition will be stored as a int(11).)
+
 
 =cut
 
-sub ActionObj {
-    my $self = shift;
-    
-    unless (defined $self->{'ScripActionObj'})  {
-	require RT::ScripAction;
-	
-	$self->{'ScripActionObj'} = RT::ScripAction->new($self->CurrentUser);
-	#TODO: why are we loading Actions with templates like this. 
-	# two seperate methods might make more sense
-	$self->{'ScripActionObj'}->Load($self->ScripAction, $self->Template);
-    }
-    return ($self->{'ScripActionObj'});
+
+=item ScripConditionObj
+
+Returns the ScripCondition Object which has the id returned by ScripCondition
+
+
+=cut
+
+sub ScripConditionObj {
+	my $self = shift;
+	my $ScripCondition =  RT::ScripCondition->new($self->CurrentUser);
+	$ScripCondition->Load($self->__Value('ScripCondition'));
+	return($ScripCondition);
 }
 
-# }}}
+=item ScripAction
+
+Returns the current value of ScripAction. 
+(In the database, ScripAction is stored as int(11).)
+
+
+
+=item SetScripAction VALUE
 
 
-# {{{ sub TemplateObj
-=head2 TemplateObj
+Set ScripAction to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ScripAction will be stored as a int(11).)
 
-Retuns an RT::Template object with this Scrip\'s Template
 
 =cut
 
-sub TemplateObj {
-    my $self = shift;
-    
-    unless (defined $self->{'TemplateObj'})  {
-	require RT::Template;
-	$self->{'TemplateObj'} = RT::Template->new($self->CurrentUser);
-	$self->{'TemplateObj'}->Load($self->Template);
-    }
-    return ($self->{'TemplateObj'});
-}
 
-# }}}
+=item ScripActionObj
 
-# {{{ sub Prepare
-=head2 Prepare
+Returns the ScripAction Object which has the id returned by ScripAction
 
-Calls the action object's prepare method
 
 =cut
 
-sub Prepare {
-    my $self = shift;
-    $self->ActionObj->Prepare(@_);
+sub ScripActionObj {
+	my $self = shift;
+	my $ScripAction =  RT::ScripAction->new($self->CurrentUser);
+	$ScripAction->Load($self->__Value('ScripAction'));
+	return($ScripAction);
 }
 
-# }}}
+=item ConditionRules
+
+Returns the current value of ConditionRules. 
+(In the database, ConditionRules is stored as text.)
+
 
-# {{{ sub Commit
-=head2 Commit
 
-Calls the action object's commit method
+=item SetConditionRules VALUE
+
+
+Set ConditionRules to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ConditionRules will be stored as a text.)
+
 
 =cut
 
-sub Commit {
-    my $self = shift;
-    $self->ActionObj->Commit(@_);
-}
 
-# }}}
+=item ActionRules
 
-# {{{ sub ConditionObj
+Returns the current value of ActionRules. 
+(In the database, ActionRules is stored as text.)
 
-=head2 ConditionObj
 
-Retuns an RT::ScripCondition object with this Scrip's IsApplicable
+
+=item SetActionRules VALUE
+
+
+Set ActionRules to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ActionRules will be stored as a text.)
+
 
 =cut
 
-sub ConditionObj {
-    my $self = shift;
-    
-    unless (defined $self->{'ScripConditionObj'})  {
-	require RT::ScripCondition;
-	$self->{'ScripConditionObj'} = RT::ScripCondition->new($self->CurrentUser);
-	$self->{'ScripConditionObj'}->Load($self->ScripCondition);
-    }
-    return ($self->{'ScripConditionObj'});
-}
 
-# }}}
+=item CustomIsApplicableCode
+
+Returns the current value of CustomIsApplicableCode. 
+(In the database, CustomIsApplicableCode is stored as text.)
+
+
+
+=item SetCustomIsApplicableCode VALUE
 
-# {{{ sub IsApplicable
 
-=head2 IsApplicable
+Set CustomIsApplicableCode to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, CustomIsApplicableCode will be stored as a text.)
 
-Calls the  Condition object\'s IsApplicable method
 
 =cut
 
-sub IsApplicable {
-    my $self = shift;
-    return ($self->ConditionObj->IsApplicable(@_));
-}
 
-# }}}
+=item CustomPrepareCode
 
-# {{{ sub DESTROY
-sub DESTROY {
-    my $self = shift;
-    $self->{'ActionObj'} = undef;
-}
-# }}}
+Returns the current value of CustomPrepareCode. 
+(In the database, CustomPrepareCode is stored as text.)
 
-# {{{ ACL related methods
 
-# {{{ sub _Set
 
-# does an acl check and then passes off the call
-sub _Set {
-    my $self = shift;
-    
-    unless ($self->CurrentUserHasRight('ModifyScrips')) {
-        $RT::Logger->debug("CurrentUser can't modify Scrips for ".$self->Queue."\n");
-	return (0, 'Permission Denied');
-    }
-    return $self->__Set(@_);
-}
+=item SetCustomPrepareCode VALUE
 
-# }}}
 
-# {{{ sub _Value
-# does an acl check and then passes off the call
-sub _Value {
-    my $self = shift;
-    
-    unless ($self->CurrentUserHasRight('ShowScrips')) {
-        $RT::Logger->debug("CurrentUser can't modify Scrips for ".$self->__Value('Queue')."\n");
-	return (undef);
-    }
-    
-    return $self->__Value(@_);
-}
-# }}}
+Set CustomPrepareCode to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, CustomPrepareCode will be stored as a text.)
+
+
+=cut
+
+
+=item CustomCommitCode
+
+Returns the current value of CustomCommitCode. 
+(In the database, CustomCommitCode is stored as text.)
+
 
-# {{{ sub CurrentUserHasRight
 
-=head2 CurrentUserHasRight
+=item SetCustomCommitCode VALUE
+
+
+Set CustomCommitCode to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, CustomCommitCode will be stored as a text.)
 
-Helper menthod for HasRight. Presets Principal to CurrentUser then 
-calls HasRight.
 
 =cut
 
-sub CurrentUserHasRight {
-    my $self = shift;
-    my $right = shift;
-    return ($self->HasRight( Principal => $self->CurrentUser->UserObj,
-                             Right => $right ));
-    
+
+=item Stage
+
+Returns the current value of Stage. 
+(In the database, Stage is stored as varchar(32).)
+
+
+
+=item SetStage VALUE
+
+
+Set Stage to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Stage will be stored as a varchar(32).)
+
+
+=cut
+
+
+=item Queue
+
+Returns the current value of Queue. 
+(In the database, Queue is stored as int(11).)
+
+
+
+=item SetQueue VALUE
+
+
+Set Queue to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Queue will be stored as a int(11).)
+
+
+=cut
+
+
+=item QueueObj
+
+Returns the Queue Object which has the id returned by Queue
+
+
+=cut
+
+sub QueueObj {
+	my $self = shift;
+	my $Queue =  RT::Queue->new($self->CurrentUser);
+	$Queue->Load($self->__Value('Queue'));
+	return($Queue);
 }
 
-# }}}
+=item Template
+
+Returns the current value of Template. 
+(In the database, Template is stored as int(11).)
+
+
+
+=item SetTemplate VALUE
 
-# {{{ sub HasRight
 
-=head2 HasRight
+Set Template to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Template will be stored as a int(11).)
 
-Takes a param-hash consisting of "Right" and "Principal"  Principal is 
-an RT::User object or an RT::CurrentUser object. "Right" is a textual
-Right string that applies to Scrips.
 
 =cut
 
-sub HasRight {
-    my $self = shift;
-    my %args = ( Right => undef,
-                 Principal => undef,
-                 @_ );
-    
-    if ((defined $self->SUPER::_Value('Queue')) and ($self->SUPER::_Value('Queue') != 0)) {
-        return ( $args{'Principal'}->HasQueueRight(
-						   Right => $args{'Right'},
-						   Queue => $self->SUPER::_Value('Queue'),
-						   Principal => $args{'Principal'}
-						  ) 
-	       );
-	
-    }
-    else {
-        return( $args{'Principal'}->HasSystemRight( $args{'Right'}) );
-    }
+
+=item TemplateObj
+
+Returns the Template Object which has the id returned by Template
+
+
+=cut
+
+sub TemplateObj {
+	my $self = shift;
+	my $Template =  RT::Template->new($self->CurrentUser);
+	$Template->Load($self->__Value('Template'));
+	return($Template);
 }
-# }}}
 
-# }}}
+=item Creator
+
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
+
+
+=cut
+
+
+=item Created
+
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
+
+
+=cut
+
+
+=item LastUpdatedBy
+
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
+
+
+=cut
+
+
+=item LastUpdated
+
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
+
+
+=cut
 
-1;
 
 
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        Description => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        ScripCondition => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        ScripAction => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        ConditionRules => 
+		{read => 1, write => 1, type => 'text', default => ''},
+        ActionRules => 
+		{read => 1, write => 1, type => 'text', default => ''},
+        CustomIsApplicableCode => 
+		{read => 1, write => 1, type => 'text', default => ''},
+        CustomPrepareCode => 
+		{read => 1, write => 1, type => 'text', default => ''},
+        CustomCommitCode => 
+		{read => 1, write => 1, type => 'text', default => ''},
+        Stage => 
+		{read => 1, write => 1, type => 'varchar(32)', default => ''},
+        Queue => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Template => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+
+ }
+};
+
+
+        eval "require RT::Scrip_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Scrip_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Scrip_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Scrip_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Scrip_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Scrip_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Scrip_Overlay, RT::Scrip_Vendor, RT::Scrip_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/ScripAction.pm b/rt/lib/RT/ScripAction.pm
index 471ad9191..26824df5d 100755
--- a/rt/lib/RT/ScripAction.pm
+++ b/rt/lib/RT/ScripAction.pm
@@ -1,200 +1,279 @@
-# Copyright 1999-2000 Jesse Vincent <jesse@fsck.com>
-# Released under the terms of the GNU Public License
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/ScripAction.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::ScripAction - RT Action object
+RT::ScripAction
+
 
 =head1 SYNOPSIS
 
-  use RT::ScripAction;
+=head1 DESCRIPTION
 
+=head1 METHODS
+
+=cut
+
+package RT::ScripAction;
+use RT::Record; 
 
-=head1 DESCRIPTION
 
-This module should never be called directly by client code. it's an internal module which
-should only be accessed through exported APIs in other modules.
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
 
+sub _Init {
+  my $self = shift; 
 
-=begin testing
+  $self->Table('ScripActions');
+  $self->SUPER::_Init(@_);
+}
 
-ok (require RT::TestHarness);
-ok (require RT::ScripAction);
 
-=end testing
 
-=head1 METHODS
+
+
+=item Create PARAMHASH
+
+Create takes a hash of values and creates a row in the database:
+
+  varchar(200) 'Name'.
+  varchar(255) 'Description'.
+  varchar(60) 'ExecModule'.
+  varchar(255) 'Argument'.
 
 =cut
 
-package RT::ScripAction;
-use RT::Record;
-@ISA= qw(RT::Record);
-
-# {{{  sub _Init 
-sub _Init  {
-    my $self = shift; 
-    $self->{'table'} = "ScripActions";
-    return ($self->SUPER::_Init(@_));
-}
-# }}}
 
-# {{{ sub _Accessible 
-sub _Accessible  {
+
+
+sub Create {
     my $self = shift;
-    my %Cols = ( Name  => 'read',
-		 Description => 'read',
-		 ExecModule  => 'read',
-		 Argument  => 'read',
-		 Creator => 'read/auto',
-		 Created => 'read/auto',
-		 LastUpdatedBy => 'read/auto',
-		 LastUpdated => 'read/auto'
-       );
-    return($self->SUPER::_Accessible(@_, %Cols));
+    my %args = ( 
+                Name => '',
+                Description => '',
+                ExecModule => '',
+                Argument => '',
+
+		  @_);
+    $self->SUPER::Create(
+                         Name => $args{'Name'},
+                         Description => $args{'Description'},
+                         ExecModule => $args{'ExecModule'},
+                         Argument => $args{'Argument'},
+);
+
 }
-# }}}
 
-# {{{ sub Create 
-=head2 Create
-  
- Takes a hash. Creates a new Action entry.
- should be better documented.
+
+
+=item id
+
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
+
+
 =cut
 
-sub Create  {
-    my $self = shift;
-    #TODO check these args and do smart things.
-    return($self->SUPER::Create(@_));
-}
-# }}}
 
-# {{{ sub Delete 
-sub Delete  {
-    my $self = shift;
-    
-    return (0, "ScripAction->Delete not implemented");
-}
-# }}}
+=item Name
+
+Returns the current value of Name. 
+(In the database, Name is stored as varchar(200).)
 
-# {{{ sub Load 
-sub Load  {
-    my $self = shift;
-    my $identifier = shift;
-    
-    if (!$identifier) {
-	return (0, 'Input error');
-    }	    
-    
-    if ($identifier !~ /\D/) {
-	$self->SUPER::LoadById($identifier);
-    }
-    else {
-	$self->LoadByCol('Name', $identifier);
-	
-    }
-
-    if (@_) {
-	# Set the template Id to the passed in template    
-	my $template = shift;
-	
-	$self->{'Template'} = $template;
-    }
-    return ($self->Id, 'ScripAction loaded');
-}
-# }}}
 
-# {{{ sub LoadAction 
 
-=head2 LoadAction HASH
+=item SetName VALUE
+
+
+Set Name to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Name will be stored as a varchar(200).)
 
-  Takes a hash consisting of TicketObj and TransactionObj.  Loads an RT::Action:: module.
 
 =cut
 
-sub LoadAction  {
-    my $self = shift;
-    my %args = ( TransactionObj => undef,
-		 TicketObj => undef,
-		 @_ );
-    
-    #TODO: Put this in an eval  
-    $self->ExecModule =~ /^(\w+)$/;
-    my $module = $1;
-    my $type = "RT::Action::". $module;
- 
-    $RT::Logger->debug("now requiring $type\n"); 
-    eval "require $type" || die "Require of $type failed.\n$@\n";
-    
-    $self->{'Action'}  = $type->new ( 'ScripActionObj' => $self, 
-				      'TicketObj' => $args{'TicketObj'},
-				      'TransactionObj' => $args{'TransactionObj'},
-				      'TemplateObj' => $self->TemplateObj,
-				      'Argument' => $self->Argument,
-				    );
-}
-# }}}
 
-# {{{ sub TemplateObj
+=item Description
+
+Returns the current value of Description. 
+(In the database, Description is stored as varchar(255).)
+
+
 
-=head2 TemplateObj
+=item SetDescription VALUE
+
+
+Set Description to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Description will be stored as a varchar(255).)
 
-Return this action\'s template object
 
 =cut
 
-sub TemplateObj {
-    my $self = shift;
-    return undef unless $self->{Template};
-    if (!$self->{'TemplateObj'})  {
-	require RT::Template;
-	$self->{'TemplateObj'} = RT::Template->new($self->CurrentUser);
-	$self->{'TemplateObj'}->LoadById($self->{'Template'});
-	
-    }
-    
-    return ($self->{'TemplateObj'});
-}
-# }}}
 
-# The following methods call the action object
+=item ExecModule
 
-# {{{ sub Prepare 
+Returns the current value of ExecModule. 
+(In the database, ExecModule is stored as varchar(60).)
 
-sub Prepare  {
-    my $self = shift;
-    return ($self->{'Action'}->Prepare());
-  
-}
-# }}}
 
-# {{{ sub Commit 
-sub Commit  {
-    my $self = shift;
-    return($self->{'Action'}->Commit());
-    
-    
-}
-# }}}
 
-# {{{ sub Describe 
-sub Describe  {
-    my $self = shift;
-    return ($self->{'Action'}->Describe());
-    
-}
-# }}}
+=item SetExecModule VALUE
 
-# {{{ sub DESTROY
-sub DESTROY {
-    my $self=shift;
-    $self->{'Action'} = undef;
-    $self->{'TemplateObj'} = undef;
-}
-# }}}
 
+Set ExecModule to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ExecModule will be stored as a varchar(60).)
 
-1;
 
+=cut
+
+
+=item Argument
+
+Returns the current value of Argument. 
+(In the database, Argument is stored as varchar(255).)
 
+
+
+=item SetArgument VALUE
+
+
+Set Argument to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Argument will be stored as a varchar(255).)
+
+
+=cut
+
+
+=item Creator
+
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
+
+
+=cut
+
+
+=item Created
+
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
+
+
+=cut
+
+
+=item LastUpdatedBy
+
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
+
+
+=cut
+
+
+=item LastUpdated
+
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
+
+
+=cut
+
+
+
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        Name => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Description => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        ExecModule => 
+		{read => 1, write => 1, type => 'varchar(60)', default => ''},
+        Argument => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+
+ }
+};
+
+
+        eval "require RT::ScripAction_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripAction_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::ScripAction_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripAction_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::ScripAction_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripAction_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::ScripAction_Overlay, RT::ScripAction_Vendor, RT::ScripAction_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/ScripAction_Overlay.pm b/rt/lib/RT/ScripAction_Overlay.pm
new file mode 100644
index 000000000..e2b018aaf
--- /dev/null
+++ b/rt/lib/RT/ScripAction_Overlay.pm
@@ -0,0 +1,217 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::ScripAction - RT Action object
+
+=head1 SYNOPSIS
+
+  use RT::ScripAction;
+
+
+=head1 DESCRIPTION
+
+This module should never be called directly by client code. it's an internal module which
+should only be accessed through exported APIs in other modules.
+
+
+=begin testing
+
+ok (require RT::ScripAction);
+
+=end testing
+
+=head1 METHODS
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+# {{{  sub _Init 
+sub _Init  {
+    my $self = shift; 
+    $self->{'table'} = "ScripActions";
+    return ($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub _Accessible 
+sub _Accessible  {
+    my $self = shift;
+    my %Cols = ( Name  => 'read',
+		 Description => 'read',
+		 ExecModule  => 'read',
+		 Argument  => 'read',
+		 Creator => 'read/auto',
+		 Created => 'read/auto',
+		 LastUpdatedBy => 'read/auto',
+		 LastUpdated => 'read/auto'
+       );
+    return($self->SUPER::_Accessible(@_, %Cols));
+}
+# }}}
+
+# {{{ sub Create 
+=head2 Create
+  
+ Takes a hash. Creates a new Action entry.
+ should be better documented.
+=cut
+
+sub Create  {
+    my $self = shift;
+    #TODO check these args and do smart things.
+    return($self->SUPER::Create(@_));
+}
+# }}}
+
+# {{{ sub Delete 
+sub Delete  {
+    my $self = shift;
+    
+    return (0, "ScripAction->Delete not implemented");
+}
+# }}}
+
+# {{{ sub Load 
+sub Load  {
+    my $self = shift;
+    my $identifier = shift;
+    
+    if (!$identifier) {
+	return (0, $self->loc('Input error'));
+    }	    
+    
+    if ($identifier !~ /\D/) {
+	$self->SUPER::Load($identifier);
+    }
+    else {
+	$self->LoadByCol('Name', $identifier);
+	
+    }
+
+    if (@_) {
+	# Set the template Id to the passed in template    
+	my $template = shift;
+	
+	$self->{'Template'} = $template;
+    }
+    return ($self->loc('[_1] ScripAction loaded', $self->Id));
+}
+# }}}
+
+# {{{ sub LoadAction 
+
+=head2 LoadAction HASH
+
+  Takes a hash consisting of TicketObj and TransactionObj.  Loads an RT::Action:: module.
+
+=cut
+
+sub LoadAction  {
+    my $self = shift;
+    my %args = ( TransactionObj => undef,
+		 TicketObj => undef,
+		 @_ );
+    
+    #TODO: Put this in an eval  
+    $self->ExecModule =~ /^(\w+)$/;
+    my $module = $1;
+    my $type = "RT::Action::". $module;
+ 
+    eval "require $type" || die "Require of $type failed.\n$@\n";
+    
+    $self->{'Action'}  = $type->new ( 'ScripActionObj' => $self, 
+				      'TicketObj' => $args{'TicketObj'},
+				      'ScripObj' => $args{'ScripObj'},
+				      'TransactionObj' => $args{'TransactionObj'},
+				      'TemplateObj' => $self->TemplateObj,
+				      'Argument' => $self->Argument,
+				    );
+}
+# }}}
+
+# {{{ sub TemplateObj
+
+=head2 TemplateObj
+
+Return this action\'s template object
+
+=cut
+
+sub TemplateObj {
+    my $self = shift;
+    return undef unless $self->{Template};
+    if (!$self->{'TemplateObj'})  {
+	require RT::Template;
+	$self->{'TemplateObj'} = RT::Template->new($self->CurrentUser);
+	$self->{'TemplateObj'}->LoadById($self->{'Template'});
+	
+    }
+    
+    return ($self->{'TemplateObj'});
+}
+# }}}
+
+# The following methods call the action object
+
+# {{{ sub Prepare 
+
+sub Prepare  {
+    my $self = shift;
+    return ($self->{'Action'}->Prepare());
+  
+}
+# }}}
+
+# {{{ sub Commit 
+sub Commit  {
+    my $self = shift;
+    return($self->{'Action'}->Commit());
+    
+    
+}
+# }}}
+
+# {{{ sub Describe 
+sub Describe  {
+    my $self = shift;
+    return ($self->{'Action'}->Describe());
+    
+}
+# }}}
+
+# {{{ sub DESTROY
+sub DESTROY {
+    my $self=shift;
+    $self->{'Action'} = undef;
+    $self->{'TemplateObj'} = undef;
+}
+# }}}
+
+
+1;
+
+
diff --git a/rt/lib/RT/ScripActions.pm b/rt/lib/RT/ScripActions.pm
index ec6141559..614ff374f 100755
--- a/rt/lib/RT/ScripActions.pm
+++ b/rt/lib/RT/ScripActions.pm
@@ -1,70 +1,115 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/ScripActions.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::ScripActions - Collection of Action objects
+=head1 NAME
 
+  RT::ScripActions -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::ScripActions;
-
+  use RT::ScripActions
 
 =head1 DESCRIPTION
 
 
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::ScripActions);
-
-=end testing
-
 =head1 METHODS
 
 =cut
 
 package RT::ScripActions;
-use RT::EasySearch;
+
+use RT::SearchBuilder;
 use RT::ScripAction;
 
-@ISA= qw(RT::EasySearch);
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-# {{{ sub _Init
-sub _Init { 
-  my $self = shift;
-  $self->{'table'} = "ScripActions";
-  $self->{'primary_key'} = "id";
-  return ( $self->SUPER::_Init(@_));
-}
-# }}}
-
-# {{{ sub LimitToType 
-sub LimitToType  {
-  my $self = shift;
-  my $type = shift;
-  $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Type',
-		VALUE => "$type")
-      if defined $type;
-  $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Type',
-		VALUE => "Correspond")
-      if $type eq "Create";
-  $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Type',
-		VALUE => 'any');
-  
+
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'ScripActions';
+    $self->{'primary_key'} = 'id';
+
+
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
-# {{{ sub NewItem 
-sub NewItem  {
-  my $self = shift;
-  return(RT::ScripAction->new($self->CurrentUser));
 
+=item NewItem
+
+Returns an empty new RT::ScripAction item
+
+=cut
+
+sub NewItem {
+    my $self = shift;
+    return(RT::ScripAction->new($self->CurrentUser));
 }
-# }}}
 
+        eval "require RT::ScripActions_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripActions_Overlay.pm}) {
+            die $@;
+        };
 
-1;
+        eval "require RT::ScripActions_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripActions_Vendor.pm}) {
+            die $@;
+        };
 
+        eval "require RT::ScripActions_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripActions_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::ScripActions_Overlay, RT::ScripActions_Vendor, RT::ScripActions_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/ScripActions_Overlay.pm b/rt/lib/RT/ScripActions_Overlay.pm
new file mode 100644
index 000000000..83cd646ef
--- /dev/null
+++ b/rt/lib/RT/ScripActions_Overlay.pm
@@ -0,0 +1,87 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::ScripActions - Collection of Action objects
+
+=head1 SYNOPSIS
+
+  use RT::ScripActions;
+
+
+=head1 DESCRIPTION
+
+
+=begin testing
+
+ok (require RT::ScripActions);
+
+=end testing
+
+=head1 METHODS
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+# {{{ sub _Init
+sub _Init { 
+  my $self = shift;
+  $self->{'table'} = "ScripActions";
+  $self->{'primary_key'} = "id";
+  return ( $self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub LimitToType 
+sub LimitToType  {
+  my $self = shift;
+  my $type = shift;
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Type',
+		VALUE => "$type")
+      if defined $type;
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Type',
+		VALUE => "Correspond")
+      if $type eq "Create";
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Type',
+		VALUE => 'any');
+  
+}
+# }}}
+
+# {{{ sub NewItem 
+sub NewItem  {
+  my $self = shift;
+  return(RT::ScripAction->new($self->CurrentUser));
+
+}
+# }}}
+
+
+1;
+
diff --git a/rt/lib/RT/ScripCondition.pm b/rt/lib/RT/ScripCondition.pm
index 253502bd4..fe0aa2d5a 100755
--- a/rt/lib/RT/ScripCondition.pm
+++ b/rt/lib/RT/ScripCondition.pm
@@ -1,192 +1,302 @@
-# Copyright 1999-2000 Jesse Vincent <jesse@fsck.com>
-# Released under the terms of the GNU Public License
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/ScripCondition.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::ScripCondition - RT scrip conditional
+RT::ScripCondition
+
 
 =head1 SYNOPSIS
 
-  use RT::ScripCondition;
+=head1 DESCRIPTION
 
+=head1 METHODS
 
-=head1 DESCRIPTION
+=cut
 
-This module should never be called directly by client code. it's an internal module which
-should only be accessed through exported APIs in other modules.
+package RT::ScripCondition;
+use RT::Record; 
 
 
-=begin testing
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
 
-ok (require RT::TestHarness);
-ok (require RT::ScripCondition);
+sub _Init {
+  my $self = shift; 
 
-=end testing
+  $self->Table('ScripConditions');
+  $self->SUPER::_Init(@_);
+}
 
-=head1 METHODS
+
+
+
+
+=item Create PARAMHASH
+
+Create takes a hash of values and creates a row in the database:
+
+  varchar(200) 'Name'.
+  varchar(255) 'Description'.
+  varchar(60) 'ExecModule'.
+  varchar(255) 'Argument'.
+  varchar(60) 'ApplicableTransTypes'.
 
 =cut
 
-package RT::ScripCondition;
-use RT::Record;
-@ISA= qw(RT::Record);
-
-# {{{  sub _Init 
-sub _Init  {
-    my $self = shift; 
-    $self->{'table'} = "ScripConditions";
-    return ($self->SUPER::_Init(@_));
-}
-# }}}
 
-# {{{ sub _Accessible 
-sub _Accessible  {
+
+
+sub Create {
     my $self = shift;
-    my %Cols = ( Name  => 'read',
-		 Description => 'read',
-		 ApplicableTransTypes	 => 'read',
-		 ExecModule  => 'read',
-		 Argument  => 'read',
-		 Creator => 'read/auto',
-		 Created => 'read/auto',
-		 LastUpdatedBy => 'read/auto',
-		 LastUpdated => 'read/auto'
-	       );
-    return($self->SUPER::_Accessible(@_, %Cols));
+    my %args = ( 
+                Name => '',
+                Description => '',
+                ExecModule => '',
+                Argument => '',
+                ApplicableTransTypes => '',
+
+		  @_);
+    $self->SUPER::Create(
+                         Name => $args{'Name'},
+                         Description => $args{'Description'},
+                         ExecModule => $args{'ExecModule'},
+                         Argument => $args{'Argument'},
+                         ApplicableTransTypes => $args{'ApplicableTransTypes'},
+);
+
 }
-# }}}
 
-# {{{ sub Create 
 
-=head2 Create
-  
-  Takes a hash. Creates a new Condition entry.
-  should be better documented.
+
+=item id
+
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
+
 
 =cut
 
-sub Create  {
-    my $self = shift;
-    return($self->SUPER::Create(@_));
-}
-# }}}
 
-# {{{ sub Delete 
+=item Name
 
-=head2 Delete
+Returns the current value of Name. 
+(In the database, Name is stored as varchar(200).)
+
+
+
+=item SetName VALUE
+
+
+Set Name to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Name will be stored as a varchar(200).)
 
-No API available for deleting things just yet.
 
 =cut
 
-sub Delete  {
-    my $self = shift;
-    return(0,'Unimplemented');
-}
-# }}}
 
-# {{{ sub Load 
+=item Description
 
-=head2 Load IDENTIFIER
+Returns the current value of Description. 
+(In the database, Description is stored as varchar(255).)
+
+
+
+=item SetDescription VALUE
+
+
+Set Description to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Description will be stored as a varchar(255).)
 
-Loads a condition takes a name or ScripCondition id.
 
 =cut
 
-sub Load  {
-    my $self = shift;
-    my $identifier = shift;
-    
-    unless (defined $identifier) {
-	return (undef);
-    }	    
-    
-    if ($identifier !~ /\D/) {
-	return ($self->SUPER::LoadById($identifier));
-    }
-    else {
-	return ($self->LoadByCol('Name', $identifier));
-    }
-}
-# }}}
 
-# {{{ sub LoadCondition 
+=item ExecModule
+
+Returns the current value of ExecModule. 
+(In the database, ExecModule is stored as varchar(60).)
+
+
+
+=item SetExecModule VALUE
+
 
-=head2 LoadCondition  HASH
+Set ExecModule to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ExecModule will be stored as a varchar(60).)
 
-takes a hash which has the following elements:  TransactionObj and TicketObj.
-Loads the Condition module in question.
 
 =cut
 
 
-sub LoadCondition  {
-    my $self = shift;
-    my %args = ( TransactionObj => undef,
-		 TicketObj => undef,
-		 @_ );
-    
-    #TODO: Put this in an eval  
-    $self->ExecModule =~ /^(\w+)$/;
-    my $module = $1;
-    my $type = "RT::Condition::". $module;
-    
-    $RT::Logger->debug("now requiring $type\n"); 
-    eval "require $type" || die "Require of $type failed.\n$@\n";
-    
-    $self->{'Condition'}  = $type->new ( 'ScripConditionObj' => $self, 
-					 'TicketObj' => $args{'TicketObj'},
-					 'TransactionObj' => $args{'TransactionObj'},
-					 'Argument' => $self->Argument,
-					 'ApplicableTransTypes' => $self->ApplicableTransTypes,
-				       );
-}
-# }}}
+=item Argument
+
+Returns the current value of Argument. 
+(In the database, Argument is stored as varchar(255).)
 
-# {{{ The following methods call the Condition object
 
 
-# {{{ sub Describe 
+=item SetArgument VALUE
 
-=head2 Describe 
 
-Helper method to call the condition module\'s Describe method.
+Set Argument to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Argument will be stored as a varchar(255).)
+
 
 =cut
 
-sub Describe  {
-    my $self = shift;
-    return ($self->{'Condition'}->Describe());
-    
-}
-# }}}
 
-# {{{ sub IsApplicable 
+=item ApplicableTransTypes
 
-=head2 IsApplicable
+Returns the current value of ApplicableTransTypes. 
+(In the database, ApplicableTransTypes is stored as varchar(60).)
+
+
+
+=item SetApplicableTransTypes VALUE
+
+
+Set ApplicableTransTypes to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ApplicableTransTypes will be stored as a varchar(60).)
 
-Helper method to call the condition module\'s IsApplicable method.
 
 =cut
 
-sub IsApplicable  {
-    my $self = shift;
-    return ($self->{'Condition'}->IsApplicable());
-    
-}
-# }}}
 
-# }}}
+=item Creator
 
-# {{{ sub DESTROY
-sub DESTROY {
-    my $self=shift;
-    $self->{'Condition'} = undef;
-}
-# }}}
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
 
 
-1;
+=cut
+
+
+=item Created
+
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
+
+
+=cut
+
+
+=item LastUpdatedBy
+
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
+
+
+=cut
+
+
+=item LastUpdated
+
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
 
 
+=cut
+
+
+
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        Name => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Description => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        ExecModule => 
+		{read => 1, write => 1, type => 'varchar(60)', default => ''},
+        Argument => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        ApplicableTransTypes => 
+		{read => 1, write => 1, type => 'varchar(60)', default => ''},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+
+ }
+};
+
+
+        eval "require RT::ScripCondition_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripCondition_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::ScripCondition_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripCondition_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::ScripCondition_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripCondition_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::ScripCondition_Overlay, RT::ScripCondition_Vendor, RT::ScripCondition_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/ScripCondition_Overlay.pm b/rt/lib/RT/ScripCondition_Overlay.pm
new file mode 100644
index 000000000..158bc5771
--- /dev/null
+++ b/rt/lib/RT/ScripCondition_Overlay.pm
@@ -0,0 +1,210 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::ScripCondition - RT scrip conditional
+
+=head1 SYNOPSIS
+
+  use RT::ScripCondition;
+
+
+=head1 DESCRIPTION
+
+This module should never be called directly by client code. it's an internal module which
+should only be accessed through exported APIs in other modules.
+
+
+=begin testing
+
+ok (require RT::ScripCondition);
+
+=end testing
+
+=head1 METHODS
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+
+# {{{  sub _Init 
+sub _Init  {
+    my $self = shift; 
+    $self->{'table'} = "ScripConditions";
+    return ($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub _Accessible 
+sub _Accessible  {
+    my $self = shift;
+    my %Cols = ( Name  => 'read',
+		 Description => 'read',
+		 ApplicableTransTypes	 => 'read',
+		 ExecModule  => 'read',
+		 Argument  => 'read',
+		 Creator => 'read/auto',
+		 Created => 'read/auto',
+		 LastUpdatedBy => 'read/auto',
+		 LastUpdated => 'read/auto'
+	       );
+    return($self->SUPER::_Accessible(@_, %Cols));
+}
+# }}}
+
+# {{{ sub Create 
+
+=head2 Create
+  
+  Takes a hash. Creates a new Condition entry.
+  should be better documented.
+
+=cut
+
+sub Create  {
+    my $self = shift;
+    return($self->SUPER::Create(@_));
+}
+# }}}
+
+# {{{ sub Delete 
+
+=head2 Delete
+
+No API available for deleting things just yet.
+
+=cut
+
+sub Delete  {
+    my $self = shift;
+    return(0, $self->loc('Unimplemented'));
+}
+# }}}
+
+# {{{ sub Load 
+
+=head2 Load IDENTIFIER
+
+Loads a condition takes a name or ScripCondition id.
+
+=cut
+
+sub Load  {
+    my $self = shift;
+    my $identifier = shift;
+    
+    unless (defined $identifier) {
+	return (undef);
+    }	    
+    
+    if ($identifier !~ /\D/) {
+	return ($self->SUPER::LoadById($identifier));
+    }
+    else {
+	return ($self->LoadByCol('Name', $identifier));
+    }
+}
+# }}}
+
+# {{{ sub LoadCondition 
+
+=head2 LoadCondition  HASH
+
+takes a hash which has the following elements:  TransactionObj and TicketObj.
+Loads the Condition module in question.
+
+=cut
+
+
+sub LoadCondition  {
+    my $self = shift;
+    my %args = ( TransactionObj => undef,
+		 TicketObj => undef,
+		 @_ );
+    
+    #TODO: Put this in an eval  
+    $self->ExecModule =~ /^(\w+)$/;
+    my $module = $1;
+    my $type = "RT::Condition::". $module;
+    
+    eval "require $type" || die "Require of $type failed.\n$@\n";
+    
+    $self->{'Condition'}  = $type->new ( 'ScripConditionObj' => $self, 
+					 'TicketObj' => $args{'TicketObj'},
+					 'ScripObj' => $args{'ScripObj'},
+					 'TransactionObj' => $args{'TransactionObj'},
+					 'Argument' => $self->Argument,
+					 'ApplicableTransTypes' => $self->ApplicableTransTypes,
+				       );
+}
+# }}}
+
+# {{{ The following methods call the Condition object
+
+
+# {{{ sub Describe 
+
+=head2 Describe 
+
+Helper method to call the condition module\'s Describe method.
+
+=cut
+
+sub Describe  {
+    my $self = shift;
+    return ($self->{'Condition'}->Describe());
+    
+}
+# }}}
+
+# {{{ sub IsApplicable 
+
+=head2 IsApplicable
+
+Helper method to call the condition module\'s IsApplicable method.
+
+=cut
+
+sub IsApplicable  {
+    my $self = shift;
+    return ($self->{'Condition'}->IsApplicable());
+    
+}
+# }}}
+
+# }}}
+
+# {{{ sub DESTROY
+sub DESTROY {
+    my $self=shift;
+    $self->{'Condition'} = undef;
+}
+# }}}
+
+
+1;
+
+
diff --git a/rt/lib/RT/ScripConditions.pm b/rt/lib/RT/ScripConditions.pm
index 236e6718d..34f788d9c 100755
--- a/rt/lib/RT/ScripConditions.pm
+++ b/rt/lib/RT/ScripConditions.pm
@@ -1,69 +1,115 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/ScripConditions.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::ScripConditions - Collection of Action objects
+=head1 NAME
 
+  RT::ScripConditions -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::ScripConditions;
-
+  use RT::ScripConditions
 
 =head1 DESCRIPTION
 
 
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::ScripConditions);
-
-=end testing
-
 =head1 METHODS
 
 =cut
 
 package RT::ScripConditions;
-use RT::EasySearch;
+
+use RT::SearchBuilder;
 use RT::ScripCondition;
-@ISA= qw(RT::EasySearch);
-
-# {{{ sub _Init
-sub _Init { 
-  my $self = shift;
-  $self->{'table'} = "ScripConditions";
-  $self->{'primary_key'} = "id";
-  return ( $self->SUPER::_Init(@_));
-}
-# }}}
-
-# {{{ sub LimitToType 
-sub LimitToType  {
-  my $self = shift;
-  my $type = shift;
-  $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Type',
-		VALUE => "$type")
-      if defined $type;
-  $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Type',
-		VALUE => "Correspond")
-      if $type eq "Create";
-  $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Type',
-		VALUE => 'any');
-  
+
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
+
+
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'ScripConditions';
+    $self->{'primary_key'} = 'id';
+
+
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
-# {{{ sub NewItem 
-sub NewItem  {
-  my $self = shift;
-  return(RT::ScripCondition->new($self->CurrentUser));
+
+=item NewItem
+
+Returns an empty new RT::ScripCondition item
+
+=cut
+
+sub NewItem {
+    my $self = shift;
+    return(RT::ScripCondition->new($self->CurrentUser));
 }
-# }}}
 
+        eval "require RT::ScripConditions_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripConditions_Overlay.pm}) {
+            die $@;
+        };
 
-1;
+        eval "require RT::ScripConditions_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripConditions_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::ScripConditions_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripConditions_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::ScripConditions_Overlay, RT::ScripConditions_Vendor, RT::ScripConditions_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/ScripConditions_Overlay.pm b/rt/lib/RT/ScripConditions_Overlay.pm
new file mode 100644
index 000000000..8bef90801
--- /dev/null
+++ b/rt/lib/RT/ScripConditions_Overlay.pm
@@ -0,0 +1,87 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::ScripConditions - Collection of Action objects
+
+=head1 SYNOPSIS
+
+  use RT::ScripConditions;
+
+
+=head1 DESCRIPTION
+
+
+
+=begin testing
+
+ok (require RT::ScripConditions);
+
+=end testing
+
+=head1 METHODS
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+# {{{ sub _Init
+sub _Init { 
+  my $self = shift;
+  $self->{'table'} = "ScripConditions";
+  $self->{'primary_key'} = "id";
+  return ( $self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ sub LimitToType 
+sub LimitToType  {
+  my $self = shift;
+  my $type = shift;
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Type',
+		VALUE => "$type")
+      if defined $type;
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Type',
+		VALUE => "Correspond")
+      if $type eq "Create";
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Type',
+		VALUE => 'any');
+  
+}
+# }}}
+
+# {{{ sub NewItem 
+sub NewItem  {
+  my $self = shift;
+  return(RT::ScripCondition->new($self->CurrentUser));
+}
+# }}}
+
+
+1;
+
diff --git a/rt/lib/RT/Scrip_Overlay.pm b/rt/lib/RT/Scrip_Overlay.pm
new file mode 100644
index 000000000..06462a9ac
--- /dev/null
+++ b/rt/lib/RT/Scrip_Overlay.pm
@@ -0,0 +1,507 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::Scrip - an RT Scrip object
+
+=head1 SYNOPSIS
+
+  use RT::Scrip;
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing
+
+ok (require RT::Scrip);
+
+
+my $q = RT::Queue->new($RT::SystemUser);
+$q->Create(Name => 'ScripTest');
+ok($q->Id, "Created a scriptest queue");
+
+my $s1 = RT::Scrip->new($RT::SystemUser);
+my ($val, $msg) =$s1->Create( Queue => $q->Id,
+             ScripAction => 'User Defined',
+             ScripCondition => 'User Defined',
+             CustomIsApplicableCode => 'if ($self->TicketObj->Subject =~ /fire/) { return (1);} else { return(0)}',
+             CustomPrepareCode => 'return 1',
+             CustomCommitCode => '$self->TicketObj->SetPriority("87");',
+             Template => 'Blank'
+    );
+ok($val,$msg);
+
+my $ticket = RT::Ticket->new($RT::SystemUser);
+my ($tv,$ttv,$tm) = $ticket->Create(Queue => $q->Id,
+                                    Subject => "hair on fire",
+                                    );
+ok($tv, $tm);
+
+ok ($ticket->Priority == '87', "Ticket priority is set right");
+
+
+my $ticket2 = RT::Ticket->new($RT::SystemUser);
+my ($t2v,$t2tv,$t2m) = $ticket2->Create(Queue => $q->Id,
+                                    Subject => "hair in water",
+                                    );
+ok($t2v, $t2m);
+
+ok ($ticket2->Priority != '87', "Ticket priority is set right");
+
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+
+# {{{ sub Create 
+
+=head2 Create
+
+Creates a new entry in the Scrips table. Takes a paramhash with:
+
+        Queue                  => 0,
+        Description            => undef,
+        Template               => undef,
+        ScripAction            => undef,
+        ScripCondition         => undef,
+        CustomPrepareCode      => undef,
+        CustomCommitCode       => undef,
+        CustomIsApplicableCode => undef,
+
+
+
+
+Returns (retval, msg);
+retval is 0 for failure or scrip id.  msg is a textual description of what happened.
+
+=cut
+
+sub Create {
+    my $self = shift;
+    my %args = (
+        Queue                  => 0,
+        Template               => 0, # name or id
+        ScripAction            => 0, # name or id
+        ScripCondition         => 0, # name or id
+        Stage                  => 'TransactionCreate',
+        Description            => undef,
+        CustomPrepareCode      => undef,
+        CustomCommitCode       => undef,
+        CustomIsApplicableCode => undef,
+
+        @_
+    );
+
+
+    if (! $args{'Queue'} ) {
+        unless ( $self->CurrentUser->HasRight( Object => $RT::System, Right => 'ModifyScrips') ) {
+            return ( 0, $self->loc('Permission Denied') );
+        }
+        $args{'Queue'} = 0;		# avoid undef sneaking in
+    }
+    else {
+        my $QueueObj = new RT::Queue( $self->CurrentUser );
+        $QueueObj->Load( $args{'Queue'} );
+        unless ( $QueueObj->id() ) {
+            return ( 0, $self->loc('Invalid queue') );
+        }
+        unless ( $QueueObj->CurrentUserHasRight('ModifyScrips') ) {
+            return ( 0, $self->loc('Permission Denied') );
+        }
+        $args{'Queue'} = $QueueObj->id();
+    }
+
+    #TODO +++ validate input 
+
+    require RT::ScripAction;
+    my $action = new RT::ScripAction( $self->CurrentUser );
+    $action->Load( $args{'ScripAction'} || '0' );
+    return ( 0, $self->loc( "Action [_1] not found", $args{'ScripAction'} ) )
+      unless $action->Id;
+
+    require RT::Template;
+    my $template = new RT::Template( $self->CurrentUser );
+    $template->Load( $args{'Template'}||'0' );
+    return ( 0, $self->loc('Template not found') ) unless $template->Id;
+
+    require RT::ScripCondition;
+    my $condition = new RT::ScripCondition( $self->CurrentUser );
+    $condition->Load( $args{'ScripCondition'}||'0' );
+
+    unless ( $condition->Id ) {
+        return ( 0, $self->loc('Condition not found') );
+    }
+
+    my ($id,$msg) = $self->SUPER::Create(
+        Queue                  => $args{'Queue'},
+        Template               => $template->Id,
+        ScripCondition         => $condition->id,
+        Stage                  => $args{'Stage'},
+        ScripAction            => $action->Id,
+        Description            => $args{'Description'},
+        CustomPrepareCode      => $args{'CustomPrepareCode'},
+        CustomCommitCode       => $args{'CustomCommitCode'},
+        CustomIsApplicableCode => $args{'CustomIsApplicableCode'},
+
+    );
+    if ($id) {
+        return ( $id, $self->loc('Scrip Created') );
+    }
+    else {
+        return($id,$msg);
+    }
+}
+
+# }}}
+
+# {{{ sub Delete
+
+=head2 Delete
+
+Delete this object
+
+=cut
+
+sub Delete {
+    my $self = shift;
+    
+    unless ($self->CurrentUserHasRight('ModifyScrips')) {
+	return (0, $self->loc('Permission Denied'));
+    }
+    
+    return ($self->SUPER::Delete(@_));
+}
+# }}}
+
+# {{{ sub QueueObj
+
+=head2 QueueObj
+
+Retuns an RT::Queue object with this Scrip\'s queue
+
+=cut
+
+sub QueueObj {
+    my $self = shift;
+    
+    if (!$self->{'QueueObj'})  {
+	require RT::Queue;
+	$self->{'QueueObj'} = RT::Queue->new($self->CurrentUser);
+	$self->{'QueueObj'}->Load($self->__Value('Queue'));
+    }
+    return ($self->{'QueueObj'});
+}
+
+# }}}
+
+# {{{ sub ActionObj
+
+
+=head2 ActionObj
+
+Retuns an RT::Action object with this Scrip\'s Action
+
+=cut
+
+sub ActionObj {
+    my $self = shift;
+    
+    unless (defined $self->{'ScripActionObj'})  {
+	require RT::ScripAction;
+	
+	$self->{'ScripActionObj'} = RT::ScripAction->new($self->CurrentUser);
+	#TODO: why are we loading Actions with templates like this. 
+	# two seperate methods might make more sense
+	$self->{'ScripActionObj'}->Load($self->ScripAction, $self->Template);
+    }
+    return ($self->{'ScripActionObj'});
+}
+
+# }}}
+
+# {{{ sub ConditionObj
+
+=head2 ConditionObj
+
+Retuns an RT::ScripCondition object with this Scrip's IsApplicable
+
+=cut
+
+sub ConditionObj {
+    my $self = shift;
+    
+    unless (defined $self->{'ScripConditionObj'})  {
+	require RT::ScripCondition;
+	$self->{'ScripConditionObj'} = RT::ScripCondition->new($self->CurrentUser);
+	$self->{'ScripConditionObj'}->Load($self->ScripCondition);
+    }
+    return ($self->{'ScripConditionObj'});
+}
+
+# }}}
+
+# {{{ sub TemplateObj
+=head2 TemplateObj
+
+Retuns an RT::Template object with this Scrip\'s Template
+
+=cut
+
+sub TemplateObj {
+    my $self = shift;
+    
+    unless (defined $self->{'TemplateObj'})  {
+	require RT::Template;
+	    $self->{'TemplateObj'} = RT::Template->new($self->CurrentUser);
+	    $self->{'TemplateObj'}->Load($self->Template);
+    }
+    return ($self->{'TemplateObj'});
+}
+
+# }}}
+
+
+# {{{ Dealing with this instance of a scrip
+
+=head2 Apply { TicketObj => undef, TransactionObj => undef}
+
+This method instantiates the ScripCondition and ScripAction objects for a
+single execution of this scrip. it then calls the IsApplicable method of the 
+ScripCondition.
+If that succeeds, it calls the Prepare method of the
+ScripAction. If that succeeds, it calls the Commit method of the ScripAction.
+
+Usually, the ticket and transaction objects passed to this method
+should be loaded by the SuperUser role
+
+=cut
+
+
+# {{{ sub Apply
+
+sub Apply {
+    my $self = shift;
+    my %args = ( TicketObj      => undef,
+                 TransactionObj => undef,
+                 @_ );
+
+    # We want to make sure that if a scrip dies, we don't get
+    # hurt
+    eval {
+
+        #Load the scrip's Condition object
+        $self->ConditionObj->LoadCondition(
+                                      ScripObj       => $self,
+                                      TicketObj      => $args{'TicketObj'},
+                                      TransactionObj => $args{'TransactionObj'},
+        );
+
+        unless ( $self->IsApplicable() ) {
+            $self->ConditionObj->DESTROY;
+            return (undef);
+        }
+
+        #If it's applicable, prepare and commit it
+        $self->ActionObj->LoadAction( ScripObj       => $self,
+                                      TicketObj      => $args{'TicketObj'},
+                                      TransactionObj => $args{'TransactionObj'},
+        );
+
+        unless ( $self->Prepare() ) {
+            $RT::Logger->info(
+                          "$self: Couldn't prepare " . $self->ActionObj->Name );
+            $self->ActionObj->DESTROY();
+            $self->ConditionObj->DESTROY();
+            return (undef);
+        }
+        unless ( $self->Commit() ) {
+            $RT::Logger->info(
+                           "$self: Couldn't commit " . $self->ActionObj->Name );
+            $self->ActionObj->DESTROY();
+            $self->ConditionObj->DESTROY();
+            return (undef);
+        }
+
+        #Searchbuilder caching isn't perfectly coherent. got to reload the ticket object, since it
+        # may have changed
+        $args{'TicketObj'}->Load($args{'TicketObj'}->Id);
+
+        #We're done with it. lets clean up.
+        #TODO: something else isn't letting these get garbage collected. check em out.
+        $self->ActionObj->DESTROY();
+        $self->ConditionObj->DESTROY();
+        return (1);
+    };
+    if ($@) {
+        $RT::Logger->error( "Scrip " . $self->Id . " died. - " . $@ );
+    }
+
+}
+# }}}
+
+# {{{ sub IsApplicable
+
+=head2 IsApplicable
+
+Calls the  Condition object\'s IsApplicable method
+
+=cut
+
+sub IsApplicable {
+    my $self = shift;
+    return ($self->ConditionObj->IsApplicable(@_));
+}
+
+# }}}
+
+# {{{ sub Prepare
+
+=head2 Prepare
+
+Calls the action object's prepare method
+
+=cut
+
+sub Prepare {
+    my $self = shift;
+    $self->ActionObj->Prepare(@_);
+}
+
+# }}}
+
+# {{{ sub Commit
+
+=head2 Commit
+
+Calls the action object's commit method
+
+=cut
+
+sub Commit {
+    my $self = shift;
+    $self->ActionObj->Commit(@_);
+}
+
+# }}}
+
+# }}}
+
+# {{{ sub DESTROY
+sub DESTROY {
+    my $self = shift;
+    $self->{'ActionObj'} = undef;
+}
+# }}}
+
+# {{{ ACL related methods
+
+# {{{ sub _Set
+
+# does an acl check and then passes off the call
+sub _Set {
+    my $self = shift;
+    
+    unless ($self->CurrentUserHasRight('ModifyScrips')) {
+        $RT::Logger->debug("CurrentUser can't modify Scrips for ".$self->Queue."\n");
+	return (0, $self->loc('Permission Denied'));
+    }
+    return $self->__Set(@_);
+}
+
+# }}}
+
+# {{{ sub _Value
+# does an acl check and then passes off the call
+sub _Value {
+    my $self = shift;
+    
+    unless ($self->CurrentUserHasRight('ShowScrips')) {
+        $RT::Logger->debug("CurrentUser can't modify Scrips for ".$self->__Value('Queue')."\n");
+	return (undef);
+    }
+    
+    return $self->__Value(@_);
+}
+# }}}
+
+# {{{ sub CurrentUserHasRight
+
+=head2 CurrentUserHasRight
+
+Helper menthod for HasRight. Presets Principal to CurrentUser then 
+calls HasRight.
+
+=cut
+
+sub CurrentUserHasRight {
+    my $self = shift;
+    my $right = shift;
+    return ($self->HasRight( Principal => $self->CurrentUser->UserObj,
+                             Right => $right ));
+    
+}
+
+# }}}
+
+# {{{ sub HasRight
+
+=head2 HasRight
+
+Takes a param-hash consisting of "Right" and "Principal"  Principal is 
+an RT::User object or an RT::CurrentUser object. "Right" is a textual
+Right string that applies to Scrips.
+
+=cut
+
+sub HasRight {
+    my $self = shift;
+    my %args = ( Right => undef,
+                 Principal => undef,
+                 @_ );
+    
+    if ((defined $self->SUPER::_Value('Queue')) and ($self->SUPER::_Value('Queue') != 0)) {
+        return ( $args{'Principal'}->HasRight(
+						   Right => $args{'Right'},
+						   Object => $self->QueueObj
+						  ) 
+	       );
+	
+    }
+    else {
+        return( $args{'Principal'}->HasRight( Object => $RT::System, Right =>  $args{'Right'}) );
+    }
+}
+# }}}
+
+# }}}
+
+1;
+
+
diff --git a/rt/lib/RT/Scrips.pm b/rt/lib/RT/Scrips.pm
index 90be847d8..a39443136 100755
--- a/rt/lib/RT/Scrips.pm
+++ b/rt/lib/RT/Scrips.pm
@@ -1,127 +1,115 @@
-# Copyright 1999-2001 Jesse Vincent <jesse@fsck.com>
-# Released under the terms of the GNU Public License
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Scrips.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::Scrips - a collection of RT Scrip objects
+=head1 NAME
 
+  RT::Scrips -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::Scrips;
+  use RT::Scrips
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
+=cut
 
-=begin testing
+package RT::Scrips;
 
-ok (require RT::TestHarness);
-ok (require RT::Scrips);
+use RT::SearchBuilder;
+use RT::Scrip;
 
-=end testing
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-=cut
 
-package RT::Scrips;
-use RT::EasySearch;
-use RT::Scrip;
-@ISA= qw(RT::EasySearch);
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'Scrips';
+    $self->{'primary_key'} = 'id';
 
 
-# {{{ sub _Init
-sub _Init { 
-  my $self = shift;
-  $self->{'table'} = "Scrips";
-  $self->{'primary_key'} = "id";
-  return ( $self->SUPER::_Init(@_));
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
-# {{{ sub LimitToQueue 
 
-=head2 LimitToQueue
+=item NewItem
 
-Takes a queue id (numerical) as its only argument. Makes sure that 
-Scopes it pulls out apply to this queue (or another that you've selected with
-another call to this method
+Returns an empty new RT::Scrip item
 
 =cut
 
-sub LimitToQueue  {
-   my $self = shift;
-  my $queue = shift;
- 
-  $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Queue',
-		VALUE => "$queue")
-      if defined $queue;
-  
+sub NewItem {
+    my $self = shift;
+    return(RT::Scrip->new($self->CurrentUser));
 }
-# }}}
 
-# {{{ sub LimitToGlobal
+        eval "require RT::Scrips_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Scrips_Overlay.pm}) {
+            die $@;
+        };
 
-=head2 LimitToGlobal
+        eval "require RT::Scrips_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Scrips_Vendor.pm}) {
+            die $@;
+        };
 
-Makes sure that 
-Scopes it pulls out apply to all queues (or another that you've selected with
-another call to this method or LimitToQueue
+        eval "require RT::Scrips_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Scrips_Local.pm}) {
+            die $@;
+        };
 
-=cut
 
 
-sub LimitToGlobal  {
-   my $self = shift;
- 
-  $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Queue',
-		VALUE => 0);
-  
-}
-# }}}
 
-# {{{ sub NewItem 
-sub NewItem  {
-  my $self = shift;
-  
-  return(new RT::Scrip($self->CurrentUser));
-}
-# }}}
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-# {{{ sub Next 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
-=head2 Next
+   no warnings qw(redefine);
 
-Returns the next scrip that this user can see.
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Scrips_Overlay, RT::Scrips_Vendor, RT::Scrips_Local
 
 =cut
-  
-sub Next {
-    my $self = shift;
-    
-    
-    my $Scrip = $self->SUPER::Next();
-    if ((defined($Scrip)) and (ref($Scrip))) {
-
-	if ($Scrip->CurrentUserHasRight('ShowScrips')) {
-	    return($Scrip);
-	}
-	
-	#If the user doesn't have the right to show this scrip
-	else {	
-	    return($self->Next());
-	}
-    }
-    #if there never was any scrip
-    else {
-	return(undef);
-    }	
-    
-}
-# }}}
 
-1;
 
+1;
diff --git a/rt/lib/RT/Scrips_Overlay.pm b/rt/lib/RT/Scrips_Overlay.pm
new file mode 100644
index 000000000..46e31c2a8
--- /dev/null
+++ b/rt/lib/RT/Scrips_Overlay.pm
@@ -0,0 +1,133 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::Scrips - a collection of RT Scrip objects
+
+=head1 SYNOPSIS
+
+  use RT::Scrips;
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::Scrips);
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+# {{{ sub LimitToQueue 
+
+=head2 LimitToQueue
+
+Takes a queue id (numerical) as its only argument. Makes sure that 
+Scopes it pulls out apply to this queue (or another that you've selected with
+another call to this method
+
+=cut
+
+sub LimitToQueue  {
+   my $self = shift;
+  my $queue = shift;
+ 
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Queue',
+		VALUE => "$queue")
+      if defined $queue;
+  
+}
+# }}}
+
+# {{{ sub LimitToGlobal
+
+=head2 LimitToGlobal
+
+Makes sure that 
+Scopes it pulls out apply to all queues (or another that you've selected with
+another call to this method or LimitToQueue
+
+=cut
+
+
+sub LimitToGlobal  {
+   my $self = shift;
+ 
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Queue',
+		VALUE => 0);
+  
+}
+# }}}
+
+# {{{ sub NewItem 
+sub NewItem  {
+  my $self = shift;
+  
+  return(new RT::Scrip($self->CurrentUser));
+}
+# }}}
+
+# {{{ sub Next 
+
+=head2 Next
+
+Returns the next scrip that this user can see.
+
+=cut
+  
+sub Next {
+    my $self = shift;
+    
+    
+    my $Scrip = $self->SUPER::Next();
+    if ((defined($Scrip)) and (ref($Scrip))) {
+
+	if ($Scrip->CurrentUserHasRight('ShowScrips')) {
+	    return($Scrip);
+	}
+	
+	#If the user doesn't have the right to show this scrip
+	else {	
+	    return($self->Next());
+	}
+    }
+    #if there never was any scrip
+    else {
+	return(undef);
+    }	
+    
+}
+# }}}
+
+1;
+
diff --git a/rt/lib/RT/Search/ActiveTicketsInQueue.pm b/rt/lib/RT/Search/ActiveTicketsInQueue.pm
new file mode 100644
index 000000000..766e42e47
--- /dev/null
+++ b/rt/lib/RT/Search/ActiveTicketsInQueue.pm
@@ -0,0 +1,78 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::Search::ActiveTicketsInQueue
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+Find all active tickets in the queue named in the argument passed in
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::Search::Generic);
+
+=end testing
+
+
+=cut
+
+package RT::Search::ActiveTicketsInQueue;
+
+use strict;
+use base qw(RT::Search::Generic);
+
+
+# {{{ sub Describe 
+sub Describe  {
+  my $self = shift;
+  return ($self->loc("No description for [_1]", ref $self));
+}
+# }}}
+
+# {{{ sub Prepare
+sub Prepare  {
+  my $self = shift;
+
+  $self->TicketsObj->LimitQueue(VALUE => $self->Argument);
+
+  foreach my $status (RT::Queue->ActiveStatusArray()) {
+        $self->TicketsObj->LimitStatus(VALUE => $status);
+  }
+
+  return(1);
+}
+# }}}
+
+eval "require RT::Search::ActiveTicketsInQueue_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Search/ActiveTicketsInQueue_Vendor.pm});
+eval "require RT::Search::ActiveTicketsInQueue_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Search/ActiveTicketsInQueue_Local.pm});
+
+1;
diff --git a/rt/lib/RT/Search/Generic.pm b/rt/lib/RT/Search/Generic.pm
new file mode 100644
index 000000000..f872c2a3f
--- /dev/null
+++ b/rt/lib/RT/Search/Generic.pm
@@ -0,0 +1,128 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::Search::Generic - ;
+
+=head1 SYNOPSIS
+
+    use RT::Search::Generic;
+    my $tickets = RT::Tickets->new($CurrentUser);
+    my $foo = RT::Search::Generic->new(Argument => $arg,
+                                       TicketsObj => $tickets);
+    $foo->Prepare();
+    while ( my $ticket = $foo->Next ) {
+        # Do something with each ticket we've found
+    }
+
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::Search::Generic);
+
+=end testing
+
+
+=cut
+
+package RT::Search::Generic;
+
+use strict;
+
+# {{{ sub new 
+sub new  {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self  = {};
+  bless ($self, $class);
+  $self->_Init(@_);
+  return $self;
+}
+# }}}
+
+# {{{ sub _Init 
+sub _Init  {
+  my $self = shift;
+  my %args = ( 
+           TicketsObj => undef,
+	       Argument => undef,
+	       @_ );
+  
+  $self->{'TicketsObj'} = $args{'TicketsObj'}; 
+  $self->{'Argument'} = $args{'Argument'};
+}
+# }}}
+
+# {{{ sub Argument 
+
+=head2 Argument
+
+Return the optional argument associated with this Search
+
+=cut
+
+sub Argument  {
+  my $self = shift;
+  return($self->{'Argument'});
+}
+# }}}
+
+
+=head2 TicketsObj 
+
+Return the Tickets object passed into this search
+
+=cut
+
+sub TicketsObj {
+    my $self = shift;
+    return($self->{'TicketsObj'});
+}
+
+# {{{ sub Describe 
+sub Describe  {
+  my $self = shift;
+  return ($self->loc("No description for [_1]", ref $self));
+}
+# }}}
+
+# {{{ sub Prepare
+sub Prepare  {
+  my $self = shift;
+  return(1);
+}
+# }}}
+
+eval "require RT::Search::Generic_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Search/Generic_Vendor.pm});
+eval "require RT::Search::Generic_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Search/Generic_Local.pm});
+
+1;
diff --git a/rt/lib/RT/SearchBuilder.pm b/rt/lib/RT/SearchBuilder.pm
new file mode 100644
index 000000000..22c9aff8c
--- /dev/null
+++ b/rt/lib/RT/SearchBuilder.pm
@@ -0,0 +1,200 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::SearchBuilder - a baseclass for RT collection objects
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+
+=begin testing
+
+ok (require RT::SearchBuilder);
+
+=end testing
+
+
+=cut
+
+package RT::SearchBuilder;
+
+use RT::Base;
+use DBIx::SearchBuilder;
+
+use strict;
+use vars qw(@ISA);
+@ISA = qw(DBIx::SearchBuilder RT::Base);
+
+# {{{ sub _Init 
+sub _Init  {
+    my $self = shift;
+    
+    $self->{'user'} = shift;
+    unless(defined($self->CurrentUser)) {
+	use Carp;
+	Carp::confess("$self was created without a CurrentUser");
+	$RT::Logger->err("$self was created without a CurrentUser");
+	return(0);
+    }
+    $self->SUPER::_Init( 'Handle' => $RT::Handle);
+}
+# }}}
+
+# {{{ sub LimitToEnabled
+
+=head2 LimitToEnabled
+
+Only find items that haven\'t been disabled
+
+=cut
+
+sub LimitToEnabled {
+    my $self = shift;
+    
+    $self->Limit( FIELD => 'Disabled',
+		  VALUE => '0',
+		  OPERATOR => '=' );
+}
+# }}}
+
+# {{{ sub LimitToDisabled
+
+=head2 LimitToDeleted
+
+Only find items that have been deleted.
+
+=cut
+
+sub LimitToDeleted {
+    my $self = shift;
+    
+    $self->{'find_disabled_rows'} = 1;
+    $self->Limit( FIELD => 'Disabled',
+		  OPERATOR => '=',
+		  VALUE => '1'
+		);
+}
+# }}}
+
+# {{{ sub FindAllRows
+
+=head2 FindAllRows
+
+Find all matching rows, regardless of whether they are disabled or not
+
+=cut
+
+sub FindAllRows {
+  shift->{'find_disabled_rows'} = 1;
+}
+
+# {{{ sub Limit 
+
+=head2 Limit PARAMHASH
+
+This Limit sub calls SUPER::Limit, but defaults "CASESENSITIVE" to 1, thus
+making sure that by default lots of things don't do extra work trying to 
+match lower(colname) agaist lc($val);
+
+=cut
+
+sub Limit {
+	my $self = shift;
+	my %args = ( CASESENSITIVE => 1,
+		     @_ );
+
+   return $self->SUPER::Limit(%args);
+}
+
+# }}}
+
+# {{{ sub ItemsArrayRef
+
+=item ItemsArrayRef
+
+Return this object's ItemsArray.
+If it has a SortOrder attribute, sort the array by SortOrder.
+Otherwise, if it has a "Name" attribute, sort alphabetically by Name
+Otherwise, just give up and return it in the order it came from the db.
+
+
+=begin testing
+
+use_ok(RT::Queues);
+ok(my $queues = RT::Queues->new($RT::SystemUser), 'Created a queues object');
+ok( $queues->UnLimit(),'Unlimited the result set of the queues object');
+my $items = $queues->ItemsArrayRef();
+my @items = @{$items};
+
+ok($queues->NewItem->_Accessible('Name','read'));
+my @sorted = sort {lc($a->Name) cmp lc($b->Name)} @items;
+ok (@sorted, "We have an array of queues, sorted". join(',',map {$_->Name} @sorted));
+
+ok (@items, "We have an array of queues, raw". join(',',map {$_->Name} @items));
+my @sorted_ids = map {$_->id } @sorted;
+my @items_ids = map {$_->id } @items;
+
+is ($#sorted, $#items);
+is ($sorted[0]->Name, $items[0]->Name);
+is ($sorted[-1]->Name, $items[-1]->Name);
+is_deeply(\@items_ids, \@sorted_ids, "ItemsArrayRef sorts alphabetically by name");;
+
+
+=end testing
+
+=cut
+
+sub ItemsArrayRef {
+    my $self = shift;
+    my @items;
+    
+    if ($self->NewItem()->_Accessible('SortOrder','read')) {
+        @items = sort { $a->SortOrder <=> $b->SortOrder } @{$self->SUPER::ItemsArrayRef()};
+    }
+    elsif ($self->NewItem()->_Accessible('Name','read')) {
+        @items = sort { lc($a->Name) cmp lc($b->Name) } @{$self->SUPER::ItemsArrayRef()};
+    }
+    else {
+        @items = @{$self->SUPER::ItemsArrayRef()};
+    }
+
+    return(\@items);
+
+}
+
+# }}}
+
+eval "require RT::SearchBuilder_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/SearchBuilder_Vendor.pm});
+eval "require RT::SearchBuilder_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/SearchBuilder_Local.pm});
+
+1;
+
+
diff --git a/rt/lib/RT/System.pm b/rt/lib/RT/System.pm
new file mode 100644
index 000000000..bfa5a4eb2
--- /dev/null
+++ b/rt/lib/RT/System.pm
@@ -0,0 +1,165 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME 
+
+RT::System
+
+=head1 DESCRIPTION
+
+RT::System is a simple global object used as a focal point for things
+that are system-wide.
+
+It works sort of like an RT::Record, except it's really a single object that has
+an id of "1" when instantiated.
+
+This gets used by the ACL system so that you can have rights for the scope "RT::System"
+
+In the future, there will probably be other API goodness encapsulated here.
+
+=cut
+
+
+package RT::System;
+use base qw /RT::Base/;
+use strict;
+
+use RT::ACL;
+use vars qw/ $RIGHTS/;
+
+# System rights are rights granted to the whole system
+# XXX TODO Can't localize these outside of having an object around.
+$RIGHTS = {
+    SuperUser              => 'Do anything and everything',           # loc_pair
+    AdminAllPersonalGroups =>
+      "Create, delete and modify the members of any user's personal groups"
+    ,                                                                 # loc_pair
+    AdminOwnPersonalGroups =>
+      'Create, delete and modify the members of personal groups',     # loc_pair
+    AdminUsers     => 'Create, delete and modify users',              # loc_pair
+    ModifySelf     => "Modify one's own RT account",                  # loc_pair
+    DelegateRights =>
+      "Delegate specific rights which have been granted to you."      # loc_pair
+};
+
+# Tell RT::ACE that this sort of object can get acls granted
+$RT::ACE::OBJECT_TYPES{'RT::System'} = 1;
+
+foreach my $right ( keys %{$RIGHTS} ) {
+    $RT::ACE::LOWERCASERIGHTNAMES{ lc $right } = $right;
+}
+
+
+=head2 AvailableRights
+
+Returns a hash of available rights for this object. The keys are the right names and the values are a description of what the rights do
+
+=begin testing
+
+my $s = RT::System->new($RT::SystemUser);
+my $rights = $s->AvailableRights;
+ok ($rights, "Rights defined");
+ok ($rights->{'AdminUsers'},"AdminUsers right found");
+ok ($rights->{'CreateTicket'},"CreateTicket right found");
+ok ($rights->{'AdminGroupMembership'},"ModifyGroupMembers right found");
+ok (!$rights->{'CasdasdsreateTicket'},"bogus right not found");
+
+
+
+=end testing
+
+
+=cut
+
+sub AvailableRights {
+    my $self = shift;
+
+    my $queue = RT::Queue->new($RT::SystemUser);
+    my $group = RT::Group->new($RT::SystemUser);
+
+    my $qr =$queue->AvailableRights();
+    my $gr = $group->AvailableRights();
+
+    # Build a merged list of all system wide rights, queue rights and group rights.
+    my %rights = (%{$RIGHTS}, %{$gr}, %{$qr});
+    return(\%rights);
+}
+
+
+=head2 new
+
+Create a new RT::System object. Really, you should be using $RT::System
+
+=cut
+
+                         
+sub new {
+    my $proto = shift;
+    my $class = ref($proto) || $proto;
+    my $self  = {};
+    bless( $self, $class );
+
+
+    return ($self);
+}
+
+=head2 id
+
+Returns RT::System's id. It's 1. 
+
+
+=begin testing
+
+use RT::System;
+my $sys = RT::System->new();
+is( $sys->Id, 1);
+is ($sys->id, 1);
+
+=end testing
+
+
+=cut
+
+*Id = \&id;
+
+sub id {
+    return (1);
+}
+
+=head2 Load
+
+Since this object is pretending to be an RT::Record, we need a load method.
+It does nothing
+
+=cut
+
+sub Load {
+	return (1);
+}
+
+eval "require RT::System_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/System_Vendor.pm});
+eval "require RT::System_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/System_Local.pm});
+
+1;
diff --git a/rt/lib/RT/Template.pm b/rt/lib/RT/Template.pm
index 3ef96c7df..f73ea3ed6 100755
--- a/rt/lib/RT/Template.pm
+++ b/rt/lib/RT/Template.pm
@@ -1,395 +1,363 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Template.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Copyright 1996-2002 Jesse Vincent <jesse@bestpractical.com>
-# Portions Copyright 2000 Tobias Brox <tobix@cpan.org> 
-# Released under the terms of the GNU General Public License
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::Template - RT's template object
+RT::Template
+
 
 =head1 SYNOPSIS
 
-  use RT::Template;
+=head1 DESCRIPTION
 
+=head1 METHODS
 
-=head1 DESCRIPTION
+=cut
 
+package RT::Template;
+use RT::Record; 
+use RT::Queue;
 
-=head1 METHODS
 
-=begin testing
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
+
+sub _Init {
+  my $self = shift; 
+
+  $self->Table('Templates');
+  $self->SUPER::_Init(@_);
+}
+
+
+
+
+
+=item Create PARAMHASH
 
-ok(require RT::TestHarness);
-ok(require RT::Template);
+Create takes a hash of values and creates a row in the database:
 
-=end testing
+  int(11) 'Queue'.
+  varchar(200) 'Name'.
+  varchar(255) 'Description'.
+  varchar(16) 'Type'.
+  varchar(16) 'Language'.
+  int(11) 'TranslationOf'.
+  blob 'Content'.
 
 =cut
 
-package RT::Template;
-use RT::Record;
-use MIME::Entity;
-use MIME::Parser;
 
-@ISA = qw(RT::Record);
 
-# {{{ sub _Init
 
-sub _Init {
+sub Create {
     my $self = shift;
-    $self->{'table'} = "Templates";
-    return ( $self->SUPER::_Init(@_) );
+    my %args = ( 
+                Queue => '0',
+                Name => '',
+                Description => '',
+                Type => '',
+                Language => '',
+                TranslationOf => '0',
+                Content => '',
+
+		  @_);
+    $self->SUPER::Create(
+                         Queue => $args{'Queue'},
+                         Name => $args{'Name'},
+                         Description => $args{'Description'},
+                         Type => $args{'Type'},
+                         Language => $args{'Language'},
+                         TranslationOf => $args{'TranslationOf'},
+                         Content => $args{'Content'},
+);
+
 }
 
-# }}}
 
-# {{{ sub _Accessible 
 
-sub _Accessible {
-    my $self = shift;
-    my %Cols = (
-        id            => 'read',
-        Name          => 'read/write',
-        Description   => 'read/write',
-        Type          => 'read/write',    #Type is one of Action or Message
-        Content       => 'read/write',
-        Queue         => 'read/write',
-        Creator       => 'read/auto',
-        Created       => 'read/auto',
-        LastUpdatedBy => 'read/auto',
-        LastUpdated   => 'read/auto'
-    );
-    return $self->SUPER::_Accessible( @_, %Cols );
-}
+=item id
 
-# }}}
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
 
-# {{{ sub _Set
 
-sub _Set {
-    my $self = shift;
+=cut
 
-    # use super::value or we get acl blocked
-    if ( ( defined $self->SUPER::_Value('Queue') )
-        && ( $self->SUPER::_Value('Queue') == 0 ) )
-    {
-        unless ( $self->CurrentUser->HasSystemRight('ModifyTemplate') ) {
-            return ( 0, 'Permission Denied' );
-        }
-    }
-    else {
-
-        unless ( $self->CurrentUserHasQueueRight('ModifyTemplate') ) {
-            return ( 0, 'Permission Denied' );
-        }
-    }
-    return ( $self->SUPER::_Set(@_) );
 
-}
+=item Queue
+
+Returns the current value of Queue. 
+(In the database, Queue is stored as int(11).)
 
-# }}}
 
-# {{{ sub _Value 
 
-=head2 _Value
+=item SetQueue VALUE
+
+
+Set Queue to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Queue will be stored as a int(11).)
 
-Takes the name of a table column.
-Returns its value as a string, if the user passes an ACL check
 
 =cut
 
-sub _Value {
 
-    my $self  = shift;
-    my $field = shift;
+=item QueueObj
 
-    #If the current user doesn't have ACLs, don't let em at it.  
-    #use super::value or we get acl blocked
-    if ( ( !defined $self->__Value('Queue') )
-        || ( $self->__Value('Queue') == 0 ) )
-    {
-        unless ( $self->CurrentUser->HasSystemRight('ShowTemplate') ) {
-            return (undef);
-        }
-    }
-    else {
-        unless ( $self->CurrentUserHasQueueRight('ShowTemplate') ) {
-            return (undef);
-        }
-    }
-    return ( $self->__Value($field) );
+Returns the Queue Object which has the id returned by Queue
 
+
+=cut
+
+sub QueueObj {
+	my $self = shift;
+	my $Queue =  RT::Queue->new($self->CurrentUser);
+	$Queue->Load($self->__Value('Queue'));
+	return($Queue);
 }
 
-# }}}
+=item Name
+
+Returns the current value of Name. 
+(In the database, Name is stored as varchar(200).)
+
+
 
-# {{{ sub Load
+=item SetName VALUE
 
-=head2 Load <identifer>
 
-Load a template, either by number or by name
+Set Name to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Name will be stored as a varchar(200).)
+
 
 =cut
 
-sub Load {
-    my $self       = shift;
-    my $identifier = shift;
 
-    if ( !$identifier ) {
-        return (undef);
-    }
+=item Description
+
+Returns the current value of Description. 
+(In the database, Description is stored as varchar(255).)
 
-    if ( $identifier !~ /\D/ ) {
-        $self->SUPER::LoadById($identifier);
-    }
-    else {
-        $self->LoadByCol( 'Name', $identifier );
 
-    }
-}
 
-# }}}
+=item SetDescription VALUE
 
-# {{{ sub LoadGlobalTemplate
 
-=head2 LoadGlobalTemplate NAME
+Set Description to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Description will be stored as a varchar(255).)
 
-Load the global tempalte with the name NAME
 
 =cut
 
-sub LoadGlobalTemplate {
-    my $self = shift;
-    my $id   = shift;
 
-    return ( $self->LoadQueueTemplate( Queue => 0, Name => $id ) );
-}
+=item Type
 
-# }}}
+Returns the current value of Type. 
+(In the database, Type is stored as varchar(16).)
 
-# {{{ sub LoadQueueTemplate
 
-=head2  LoadQueueTemplate (Queue => QUEUEID, Name => NAME)
 
-Loads the Queue template named NAME for Queue QUEUE.
+=item SetType VALUE
+
+
+Set Type to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Type will be stored as a varchar(16).)
+
 
 =cut
 
-sub LoadQueueTemplate {
-    my $self = shift;
-    my %args = (
-        Queue => undef,
-        Name  => undef
-    );
 
-    return ( $self->LoadByCols( Name => $args{'Name'}, Queue => {'Queue'} ) );
+=item Language
 
-}
+Returns the current value of Language. 
+(In the database, Language is stored as varchar(16).)
 
-# }}}
 
-# {{{ sub Create
 
-=head2 Create
+=item SetLanguage VALUE
 
-Takes a paramhash of Content, Queue, Name and Description.
-Name should be a unique string identifying this Template.
-Description and Content should be the template's title and content.
-Queue should be 0 for a global template and the queue # for a queue-specific 
-template.
 
-Returns the Template's id # if the create was successful. Returns undef for
-unknown database failure.
+Set Language to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Language will be stored as a varchar(16).)
 
 
 =cut
 
-sub Create {
-    my $self = shift;
-    my %args = (
-        Content     => undef,
-        Queue       => 0,
-        Description => '[no description]',
-        Type => 'Action',    #By default, template are 'Action' templates
-        Name => undef,
-        @_
-    );
-
-    if ( $args{'Queue'} == 0 ) {
-        unless ( $self->CurrentUser->HasSystemRight('ModifyTemplate') ) {
-            return (undef);
-        }
-    }
-    else {
-        my $QueueObj = new RT::Queue( $self->CurrentUser );
-        $QueueObj->Load( $args{'Queue'} ) || return ( 0, 'Invalid queue' );
-
-        unless ( $QueueObj->CurrentUserHasRight('ModifyTemplate') ) {
-            return (undef);
-        }
-    }
-
-    my $result = $self->SUPER::Create(
-        Content => $args{'Content'},
-        Queue   => $args{'Queue'},
-        ,
-        Description => $args{'Description'},
-        Name        => $args{'Name'}
-    );
-
-    return ($result);
 
-}
+=item TranslationOf
+
+Returns the current value of TranslationOf. 
+(In the database, TranslationOf is stored as int(11).)
+
+
 
-# }}}
+=item SetTranslationOf VALUE
 
-# {{{ sub Delete
 
-=head2 Delete
+Set TranslationOf to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, TranslationOf will be stored as a int(11).)
 
-Delete this template.
 
 =cut
 
-sub Delete {
-    my $self = shift;
 
-    unless ( $self->CurrentUserHasRight('ModifyTemplate') ) {
-        return ( 0, 'Permission Denied' );
-    }
+=item Content
 
-    return ( $self->SUPER::Delete(@_) );
-}
+Returns the current value of Content. 
+(In the database, Content is stored as blob.)
 
-# }}}
 
-# {{{ sub MIMEObj
-sub MIMEObj {
-    my $self = shift;
-    return ( $self->{'MIMEObj'} );
-}
 
-# }}}
+=item SetContent VALUE
 
-# {{{ sub Parse 
 
-=item Parse
+Set Content to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Content will be stored as a blob.)
 
- This routine performs Text::Template parsing on thte template and then imports the 
- results into a MIME::Entity so we can really use it
- It returns a tuple of (val, message)
- If val is 0, the message contains an error message
 
 =cut
 
-sub Parse {
-    my $self = shift;
 
-    #We're passing in whatever we were passed. it's destined for _ParseContent
-    my $content = $self->_ParseContent(@_);
+=item LastUpdated
 
-    #Lets build our mime Entity
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
 
-    my $parser = MIME::Parser->new();
-    
-    # Do work on the parsed template in memory, rather than on disk
-    $parser->output_to_core(1); 
 
-    ### Should we forgive normally-fatal errors?
-    $parser->ignore_errors(1);
-    $self->{'MIMEObj'} = eval { $parser->parse_data($content) };
-    $error = ( $@ || $parser->last_error );
+=cut
 
-    if ($error) {
-        $RT::Logger->error("$error");
-        return ( 0, $error );
-    }
 
-    # Unfold all headers
-    $self->{'MIMEObj'}->head->unfold();
+=item LastUpdatedBy
 
-    return ( 1, "Template parsed" );
-   
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
 
-}
 
-# }}}
+=cut
 
-# {{{ sub _ParseContent
 
-# Perform Template substitutions on the template
+=item Creator
 
-sub _ParseContent {
-    my $self = shift;
-    my %args = (
-        Argument       => undef,
-        TicketObj      => undef,
-        TransactionObj => undef,
-        @_
-    );
-
-    # Might be subject to change
-    use Text::Template;
-
-    $T::Ticket      = $args{'TicketObj'};
-    $T::Transaction = $args{'TransactionObj'};
-    $T::Argument    = $args{'Argument'};
-    $T::rtname      = $RT::rtname;
-
-    # We need to untaint the content of the template, since we'll be working
-    # with it
-    my $content = $self->Content();
-    $content =~ s/^(.*)$/$1/;
-    $template = Text::Template->new(
-        TYPE   => STRING,
-        SOURCE => $content
-    );
-
-    my $retval = $template->fill_in( PACKAGE => T );
-    return ($retval);
-}
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
 
-# }}}
 
-# {{{ sub QueueObj
+=cut
 
-=head2 QueueObj
 
-Takes nothing. returns this ticket's queue object
+=item Created
+
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
+
 
 =cut
 
-sub QueueObj {
-    my $self = shift;
-    if ( !defined $self->{'queue'} ) {
-        require RT::Queue;
-        $self->{'queue'} = RT::Queue->new( $self->CurrentUser );
-
-        unless ( $self->{'queue'} ) {
-            $RT::Logger->crit(
-                "RT::Queue->new(" . $self->CurrentUser . ") returned false" );
-            return (undef);
-        }
-        my ($result) = $self->{'queue'}->Load( $self->__Value('Queue') );
-
-    }
-    return ( $self->{'queue'} );
-}
 
-# }}}
 
-# {{{ sub CurrentUserHasQueueRight
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        Queue => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Name => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Description => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        Type => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        Language => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        TranslationOf => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Content => 
+		{read => 1, write => 1, type => 'blob', default => ''},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+
+ }
+};
+
+
+        eval "require RT::Template_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Template_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Template_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Template_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Template_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Template_Local.pm}) {
+            die $@;
+        };
 
-=head2 CurrentUserHasQueueRight
 
-Helper function to call the template's queue's CurrentUserHasQueueRight with the passed in args.
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Template_Overlay, RT::Template_Vendor, RT::Template_Local
 
 =cut
 
-sub CurrentUserHasQueueRight {
-    my $self = shift;
-    return ( $self->QueueObj->CurrentUserHasRight(@_) );
-}
 
-# }}}
 1;
diff --git a/rt/lib/RT/Template_Overlay.pm b/rt/lib/RT/Template_Overlay.pm
new file mode 100644
index 000000000..0b5e67d0f
--- /dev/null
+++ b/rt/lib/RT/Template_Overlay.pm
@@ -0,0 +1,411 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Portions Copyright 2000 Tobias Brox <tobix@cpan.org> 
+
+=head1 NAME
+
+  RT::Template - RT's template object
+
+=head1 SYNOPSIS
+
+  use RT::Template;
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing
+
+ok(require RT::Template);
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+use Text::Template;
+use MIME::Entity;
+use MIME::Parser;
+use File::Temp qw /tempdir/;
+
+
+# {{{ sub _Accessible 
+
+sub _Accessible {
+    my $self = shift;
+    my %Cols = (
+        id            => 'read',
+        Name          => 'read/write',
+        Description   => 'read/write',
+        Type          => 'read/write',    #Type is one of Action or Message
+        Content       => 'read/write',
+        Queue         => 'read/write',
+        Creator       => 'read/auto',
+        Created       => 'read/auto',
+        LastUpdatedBy => 'read/auto',
+        LastUpdated   => 'read/auto'
+    );
+    return $self->SUPER::_Accessible( @_, %Cols );
+}
+
+# }}}
+
+# {{{ sub _Set
+
+sub _Set {
+    my $self = shift;
+
+    # use super::value or we get acl blocked
+    if ( ( defined $self->SUPER::_Value('Queue') )
+        && ( $self->SUPER::_Value('Queue') == 0 ) )
+    {
+        unless ( $self->CurrentUser->HasRight( Object => $RT::System, Right => 'ModifyTemplate') ) {
+            return ( 0, $self->loc('Permission Denied') );
+        }
+    }
+    else {
+
+        unless ( $self->CurrentUserHasQueueRight('ModifyTemplate') ) {
+            return ( 0, $self->loc('Permission Denied') );
+        }
+    }
+    return ( $self->SUPER::_Set(@_) );
+
+}
+
+# }}}
+
+# {{{ sub _Value 
+
+=head2 _Value
+
+Takes the name of a table column.
+Returns its value as a string, if the user passes an ACL check
+
+
+=begin testing
+
+my $t = RT::Template->new($RT::SystemUser);
+$t->Create(Name => "Foo", Queue => 1);
+my $t2 = RT::Template->new($RT::Nobody);
+$t2->Load($t->Id);
+ok($t2->QueueObj->id, "Got the template's queue objet");
+
+=end testing
+
+
+
+=cut
+
+sub _Value {
+
+    my $self  = shift;
+    my $field = shift;
+
+   
+    #If the current user doesn't have ACLs, don't let em at it.  
+    #use super::value or we get acl blocked
+    if ( ( !defined $self->__Value('Queue') )
+        || ( $self->__Value('Queue') == 0 ) )
+    {
+        unless ( $self->CurrentUser->HasRight( Object => $RT::System, Right => 'ShowTemplate') ) {
+            return (undef);
+        }
+    }
+    else {
+        unless ( $self->CurrentUserHasQueueRight('ShowTemplate') ) {
+            return (undef);
+        }
+    }
+    return ( $self->__Value($field) );
+
+}
+
+# }}}
+
+# {{{ sub Load
+
+=head2 Load <identifer>
+
+Load a template, either by number or by name
+
+=cut
+
+sub Load {
+    my $self       = shift;
+    my $identifier = shift;
+
+    if ( !$identifier ) {
+        return (undef);
+    }
+
+    if ( $identifier !~ /\D/ ) {
+        $self->SUPER::LoadById($identifier);
+    }
+    else {
+        $self->LoadByCol( 'Name', $identifier );
+
+    }
+}
+
+# }}}
+
+# {{{ sub LoadGlobalTemplate
+
+=head2 LoadGlobalTemplate NAME
+
+Load the global tempalte with the name NAME
+
+=cut
+
+sub LoadGlobalTemplate {
+    my $self = shift;
+    my $id   = shift;
+
+    return ( $self->LoadQueueTemplate( Queue => 0, Name => $id ) );
+}
+
+# }}}
+
+# {{{ sub LoadQueueTemplate
+
+=head2  LoadQueueTemplate (Queue => QUEUEID, Name => NAME)
+
+Loads the Queue template named NAME for Queue QUEUE.
+
+=cut
+
+sub LoadQueueTemplate {
+    my $self = shift;
+    my %args = (
+        Queue => undef,
+        Name  => undef
+    );
+
+    return ( $self->LoadByCols( Name => $args{'Name'}, Queue => {'Queue'} ) );
+
+}
+
+# }}}
+
+# {{{ sub Create
+
+=head2 Create
+
+Takes a paramhash of Content, Queue, Name and Description.
+Name should be a unique string identifying this Template.
+Description and Content should be the template's title and content.
+Queue should be 0 for a global template and the queue # for a queue-specific 
+template.
+
+Returns the Template's id # if the create was successful. Returns undef for
+unknown database failure.
+
+
+=cut
+
+sub Create {
+    my $self = shift;
+    my %args = (
+        Content     => undef,
+        Queue       => 0,
+        Description => '[no description]',
+        Type => 'Action',    #By default, template are 'Action' templates
+        Name => undef,
+        @_
+    );
+
+    if ( !$args{'Queue'}  ) {
+        unless ( $self->CurrentUser->HasRight(Right =>'ModifyTemplate', Object => $RT::System) ) {
+            return (undef);
+        }
+        $args{'Queue'} = 0;
+    }
+    else {
+        my $QueueObj = new RT::Queue( $self->CurrentUser );
+        $QueueObj->Load( $args{'Queue'} ) || return ( 0, $self->loc('Invalid queue') );
+    
+        unless ( $QueueObj->CurrentUserHasRight('ModifyTemplate') ) {
+            return (undef);
+        }
+        $args{'Queue'} = $QueueObj->Id;
+    }
+
+    my $result = $self->SUPER::Create(
+        Content => $args{'Content'},
+        Queue   =>  $args{'Queue'},
+        Description => $args{'Description'},
+        Name        => $args{'Name'}
+    );
+
+    return ($result);
+
+}
+
+# }}}
+
+# {{{ sub Delete
+
+=head2 Delete
+
+Delete this template.
+
+=cut
+
+sub Delete {
+    my $self = shift;
+
+    unless ( $self->CurrentUserHasQueueRight('ModifyTemplate') ) {
+        return ( 0, $self->loc('Permission Denied') );
+    }
+
+    return ( $self->SUPER::Delete(@_) );
+}
+
+# }}}
+
+# {{{ sub MIMEObj
+sub MIMEObj {
+    my $self = shift;
+    return ( $self->{'MIMEObj'} );
+}
+
+# }}}
+
+# {{{ sub Parse 
+
+=item Parse
+
+ This routine performs Text::Template parsing on the template and then
+ imports the results into a MIME::Entity so we can really use it
+ It returns a tuple of (val, message)
+ If val is 0, the message contains an error message
+
+=cut
+
+sub Parse {
+    my $self = shift;
+
+    #We're passing in whatever we were passed. it's destined for _ParseContent
+    my $content = $self->_ParseContent(@_);
+
+    #Lets build our mime Entity
+
+    my $parser = MIME::Parser->new();
+
+    # Setup output directory for files. from RT::EmailParser::_SetupMIMEParser
+    if (my $AttachmentDir = eval { File::Temp::tempdir( TMPDIR => 1, CLEANUP => 1 ) }) {
+	# Set up output directory for files:
+	$parser->output_dir("$AttachmentDir");
+    }
+    else {
+	# On some situations TMPDIR is non-writable. sad but true.
+	$parser->output_to_core(1);
+	$parser->tmp_to_core(1);
+    }
+    #If someone includes a message, don't extract it
+    $parser->extract_nested_messages(1);
+    # Set up the prefix for files with auto-generated names:
+    $parser->output_prefix("part");
+    # If content length is <= 50000 bytes, store each msg as in-core scalar;
+    # Else, write to a disk file (the default action):
+    $parser->output_to_core(50000);
+
+
+    ### Should we forgive normally-fatal errors?
+    $parser->ignore_errors(1);
+    $self->{'MIMEObj'} = eval { $parser->parse_data($content) };
+    my $error = ( $@ || $parser->last_error );
+
+    if ($error) {
+        $RT::Logger->error("$error");
+        return ( 0, $error );
+    }
+
+    # Unfold all headers
+    $self->{'MIMEObj'}->head->unfold();
+
+    return ( 1, $self->loc("Template parsed") );
+   
+
+}
+
+# }}}
+
+# {{{ sub _ParseContent
+
+# Perform Template substitutions on the template
+
+sub _ParseContent {
+    my $self = shift;
+    my %args = (
+        Argument       => undef,
+        TicketObj      => undef,
+        TransactionObj => undef,
+        @_
+    );
+
+
+    $T::Ticket      = $args{'TicketObj'};
+    $T::Transaction = $args{'TransactionObj'};
+    $T::Argument    = $args{'Argument'};
+    $T::Requestor   = eval { $T::Ticket->Requestors->UserMembersObj->First->Name };
+    $T::rtname      = $RT::rtname;
+
+    # We need to untaint the content of the template, since we'll be working
+    # with it
+    my $content = $self->Content();
+    $content =~ s/^(.*)$/$1/;
+    my $template = Text::Template->new(
+        TYPE   => 'STRING',
+        SOURCE => $content
+    );
+
+    my $retval = $template->fill_in( PACKAGE => 'T' );
+
+    # MIME::Parser has problems dealing with high-bit utf8 data.
+    Encode::_utf8_off($retval);
+    return ($retval);
+}
+
+# }}}
+
+# {{{ sub CurrentUserHasQueueRight
+
+=head2 CurrentUserHasQueueRight
+
+Helper function to call the template's queue's CurrentUserHasQueueRight with the passed in args.
+
+=cut
+
+sub CurrentUserHasQueueRight {
+    my $self = shift;
+    return ( $self->QueueObj->CurrentUserHasRight(@_) );
+}
+
+# }}}
+1;
diff --git a/rt/lib/RT/Templates.pm b/rt/lib/RT/Templates.pm
index b5b483c96..37db84086 100755
--- a/rt/lib/RT/Templates.pm
+++ b/rt/lib/RT/Templates.pm
@@ -1,122 +1,115 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Templates.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::Templates - a collection of RT Template objects
+=head1 NAME
 
+  RT::Templates -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::Templates;
+  use RT::Templates
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Templates);
-
-=end testing
-
 =cut
 
 package RT::Templates;
-use RT::EasySearch;
-@ISA= qw(RT::EasySearch);
 
+use RT::SearchBuilder;
+use RT::Template;
 
-# {{{ sub _Init
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-=head2 _Init
-
-  Returns RT::Templates specific init info like table and primary key names
-
-=cut
 
 sub _Init {
-    
     my $self = shift;
-    $self->{'table'} = "Templates";
-    $self->{'primary_key'} = "id";
-    return ($self->SUPER::_Init(@_));
+    $self->{'table'} = 'Templates';
+    $self->{'primary_key'} = 'id';
+
+
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
-# {{{ LimitToNotInQueue
 
-=head2 LimitToNotInQueue
+=item NewItem
 
-Takes a queue id # and limits the returned set of templates to those which 
-aren't that queue's templates.
+Returns an empty new RT::Template item
 
 =cut
 
-sub LimitToNotInQueue {
+sub NewItem {
     my $self = shift;
-    my $queue_id = shift;
-    $self->Limit(FIELD => 'Queue',
-                 VALUE => "$queue_id",
-                 OPERATOR => '!='
-                );
+    return(RT::Template->new($self->CurrentUser));
 }
-# }}}
 
-# {{{ LimitToGlobal
+        eval "require RT::Templates_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Templates_Overlay.pm}) {
+            die $@;
+        };
 
-=head2 LimitToGlobal
+        eval "require RT::Templates_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Templates_Vendor.pm}) {
+            die $@;
+        };
 
-Takes no arguments. Limits the returned set to "Global" templates
-which can be used with any queue.
+        eval "require RT::Templates_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Templates_Local.pm}) {
+            die $@;
+        };
 
-=cut
 
-sub LimitToGlobal {
-    my $self = shift;
-    my $queue_id = shift;
-    $self->Limit(FIELD => 'Queue',
-                 VALUE => "0",
-                 OPERATOR => '='
-                );
-}
-# }}}
 
-# {{{ LimitToQueue
 
-=head2 LimitToQueue
+=head1 SEE ALSO
 
-Takes a queue id # and limits the returned set of templates to that queue's
-templates
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
-=cut
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-sub LimitToQueue {
-    my $self = shift;
-    my $queue_id = shift;
-    $self->Limit(FIELD => 'Queue',
-                 VALUE => "$queue_id",
-                 OPERATOR => '='
-                );
-}
-# }}}
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
-# {{{ sub NewItem 
+   no warnings qw(redefine);
 
-=head2 NewItem
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
-Returns a new empty Template object
+RT::Templates_Overlay, RT::Templates_Vendor, RT::Templates_Local
 
 =cut
 
-sub NewItem  {
-  my $self = shift;
-
-  use RT::Template;
-  my $item = new RT::Template($self->CurrentUser);
-  return($item);
-}
-# }}}
 
 1;
-
diff --git a/rt/lib/RT/Templates_Overlay.pm b/rt/lib/RT/Templates_Overlay.pm
new file mode 100644
index 000000000..6bc992e05
--- /dev/null
+++ b/rt/lib/RT/Templates_Overlay.pm
@@ -0,0 +1,141 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::Templates - a collection of RT Template objects
+
+=head1 SYNOPSIS
+
+  use RT::Templates;
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing
+
+ok (require RT::Templates);
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+
+# {{{ sub _Init
+
+=head2 _Init
+
+  Returns RT::Templates specific init info like table and primary key names
+
+=cut
+
+sub _Init {
+    
+    my $self = shift;
+    $self->{'table'} = "Templates";
+    $self->{'primary_key'} = "id";
+    return ($self->SUPER::_Init(@_));
+}
+# }}}
+
+# {{{ LimitToNotInQueue
+
+=head2 LimitToNotInQueue
+
+Takes a queue id # and limits the returned set of templates to those which 
+aren't that queue's templates.
+
+=cut
+
+sub LimitToNotInQueue {
+    my $self = shift;
+    my $queue_id = shift;
+    $self->Limit(FIELD => 'Queue',
+                 VALUE => "$queue_id",
+                 OPERATOR => '!='
+                );
+}
+# }}}
+
+# {{{ LimitToGlobal
+
+=head2 LimitToGlobal
+
+Takes no arguments. Limits the returned set to "Global" templates
+which can be used with any queue.
+
+=cut
+
+sub LimitToGlobal {
+    my $self = shift;
+    my $queue_id = shift;
+    $self->Limit(FIELD => 'Queue',
+                 VALUE => "0",
+                 OPERATOR => '='
+                );
+}
+# }}}
+
+# {{{ LimitToQueue
+
+=head2 LimitToQueue
+
+Takes a queue id # and limits the returned set of templates to that queue's
+templates
+
+=cut
+
+sub LimitToQueue {
+    my $self = shift;
+    my $queue_id = shift;
+    $self->Limit(FIELD => 'Queue',
+                 VALUE => "$queue_id",
+                 OPERATOR => '='
+                );
+}
+# }}}
+
+# {{{ sub NewItem 
+
+=head2 NewItem
+
+Returns a new empty Template object
+
+=cut
+
+sub NewItem  {
+  my $self = shift;
+
+  use RT::Template;
+  my $item = new RT::Template($self->CurrentUser);
+  return($item);
+}
+# }}}
+
+1;
+
diff --git a/rt/lib/RT/Ticket.pm b/rt/lib/RT/Ticket.pm
index f7275e4e3..2f075a20c 100755
--- a/rt/lib/RT/Ticket.pm
+++ b/rt/lib/RT/Ticket.pm
@@ -1,3004 +1,662 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Ticket.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-2001 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
 #
 
-=head1 NAME
+use strict;
 
-  RT::Ticket - RT ticket object
 
-=head1 SYNOPSIS
+=head1 NAME
 
-  use RT::Ticket;
-  my $ticket = new RT::Ticket($CurrentUser);
-  $ticket->Load($ticket_id);
+RT::Ticket
 
-=head1 DESCRIPTION
 
-This module lets you manipulate RT\'s ticket object.
+=head1 SYNOPSIS
 
+=head1 DESCRIPTION
 
 =head1 METHODS
 
 =cut
 
-
-
 package RT::Ticket;
+use RT::Record; 
 use RT::Queue;
-use RT::User;
-use RT::Record;
-use RT::Link;
-use RT::Links;
-use RT::Date;
-use RT::Watcher;
-
-
-@ISA= qw(RT::Record);
-
 
-=begin testing
 
-use RT::TestHarness;
-
-ok(require RT::Ticket, "Loading the RT::Ticket library");
-
-=end testing
-
-=cut
-
-# {{{ sub _Init
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
 
 sub _Init {
-    my $self = shift;
-    $self->{'table'} = "Tickets";
-    return ($self->SUPER::_Init(@_));
-}
-
-# }}}
-
-# {{{ sub Load
-
-=head2 Load
-
-Takes a single argument. This can be a ticket id, ticket alias or 
-local ticket uri.  If the ticket can't be loaded, returns undef.
-Otherwise, returns the ticket id.
-
-=cut
-
-sub Load {
-   my $self = shift;
-   my $id = shift;
-
-   #TODO modify this routine to look at EffectiveId and do the recursive load
-   # thing. be careful to cache all the interim tickets we try so we don't loop forever.
-   
-   #If it's a local URI, turn it into a ticket id
-   if ($id =~ /^$RT::TicketBaseURI(\d+)$/)  {
-       $id = $1;
-   }
-   #If it's a remote URI, we're going to punt for now
-   elsif ($id =~ '://' ) {
-       return (undef);
-   }
-   
-   #If we have an integer URI, load the ticket
-   if ( $id =~ /^\d+$/ ) {
-       my $ticketid = $self->LoadById($id);
-   
-       unless ($ticketid) {
-	   $RT::Logger->debug("$self tried to load a bogus ticket: $id\n");
-	   return(undef);
-       }
-   }
-   
-   #It's not a URI. It's not a numerical ticket ID. Punt!
-   else {
-       return(undef);
-   }
-   
-   #If we're merged, resolve the merge.
-   if (($self->EffectiveId) and
-       ($self->EffectiveId != $self->Id)) {
-	   return ($self->Load($self->EffectiveId));
-       }
-
-   #Ok. we're loaded. lets get outa here.
-   return ($self->Id);
-   
-}
-
-# }}}
+  my $self = shift; 
 
-# {{{ sub LoadByURI
-
-=head2 LoadByURI
-
-Given a local ticket URI, loads the specified ticket.
-
-=cut
-
-sub LoadByURI {
-    my $self = shift;
-    my $uri = shift;
-    
-    if ($uri =~ /^$RT::TicketBaseURI(\d+)$/) {
-        my $id = $1;
-        return ($self->Load($id));
-    }
-    else {
-        return(undef);
-    }
+  $self->Table('Tickets');
+  $self->SUPER::_Init(@_);
 }
 
-# }}}
-
-# {{{ sub Create
-
-=head2 Create (ARGS)
-
-Arguments: ARGS is a hash of named parameters.  Valid parameters are:
-
-  Queue  - Either a Queue object or a Queue Name
-  Requestor -  A reference to a list of RT::User objects, email addresses or RT user Names
-  Cc  - A reference to a list of RT::User objects, email addresses or Names
-  AdminCc  - A reference to a  list of RT::User objects, email addresses or Names
-  Type -- The ticket\'s type. ignore this for now
-  Owner -- This ticket\'s owner. either an RT::User object or this user\'s id
-  Subject -- A string describing the subject of the ticket
-  InitialPriority -- an integer from 0 to 99
-  FinalPriority -- an integer from 0 to 99
-  Status -- any valid status (Defined in RT::Queue)
-  TimeWorked -- an integer
-  TimeLeft -- an integer
-  Starts -- an ISO date describing the ticket\'s start date and time in GMT
-  Due -- an ISO date describing the ticket\'s due date and time in GMT
-  MIMEObj -- a MIME::Entity object with the content of the initial ticket request.
-
-  KeywordSelect-<id> -- an array of keyword ids for that keyword select
-
-
-Returns: TICKETID, Transaction Object, Error Message
-
-
-=begin testing
-
-my $t = RT::Ticket->new($RT::SystemUser);
-
-ok( $t->Create(Queue => 'General', Subject => 'This is a subject'), "Ticket Created");
-
-ok ( my $id = $t->Id, "Got ticket id");
-
-=end testing
-
-=cut
-
-sub Create {
-    my $self = shift;
-    
-    my %args = (
-		Queue => undef,
-		Requestor => undef,
-		Cc => undef,
-		AdminCc => undef,
-		Type => 'ticket',
-		Owner => $RT::Nobody->UserObj,
-		Subject => '[no subject]',
-		InitialPriority => undef,
-		FinalPriority => undef,
-		Status => 'new',
-		TimeWorked => "0",
-		TimeLeft => 0,
-		Due => undef,
-		Starts => undef,
-		MIMEObj => undef,
-		@_);
-
-    my ($ErrStr, $QueueObj, $Owner, $resolved);
-    my (@non_fatal_errors);
-    
-    my $now = RT::Date->new($self->CurrentUser);
-    $now->SetToNow();
-
-    if ( (defined($args{'Queue'})) && (!ref($args{'Queue'})) ) {
-	$QueueObj=RT::Queue->new($RT::SystemUser);
-	$QueueObj->Load($args{'Queue'});
-    }
-    elsif (ref($args{'Queue'}) eq 'RT::Queue') {
-	$QueueObj=RT::Queue->new($RT::SystemUser);
-	$QueueObj->Load($args{'Queue'}->Id);
-    }
-    else {
-	$RT::Logger->debug("$self ". $args{'Queue'} . 
-			 " not a recognised queue object.");
-    }
-  
-    #Can't create a ticket without a queue.
-    unless (defined ($QueueObj)) {
-	$RT::Logger->debug( "$self No queue given for ticket creation.");
-	return (0, 0,'Could not create ticket. Queue not set');
-    }
-    
-    #Now that we have a queue, Check the ACLS
-    unless ($self->CurrentUser->HasQueueRight(Right => 'CreateTicket',
-					      QueueObj => $QueueObj )) {
-	return (0,0,"No permission to create tickets in the queue '". 
-		$QueueObj->Name."'.");
-    }
-    
-    #Since we have a queue, we can set queue defaults
-    #Initial Priority
-
-    # If there's no queue default initial priority and it's not set, set it to 0
-    $args{'InitialPriority'} = ($QueueObj->InitialPriority || 0)
-      unless (defined $args{'InitialPriority'});
-	
-    #Final priority 
-
-    # If there's no queue default final priority and it's not set, set it to 0
-    $args{'FinalPriority'} = ($QueueObj->FinalPriority  || 0)
-      unless (defined $args{'FinalPriority'});
-    
-    
-    #TODO we should see what sort of due date we're getting, rather +
-    # than assuming it's in ISO format.
-    
-    #Set the due date. if we didn't get fed one, use the queue default due in
-    my $due = new RT::Date($self->CurrentUser);
-    if (defined $args{'Due'}) {
-	$due->Set (Format => 'ISO',
-		   Value => $args{'Due'});
-    }	
-    elsif (defined ($QueueObj->DefaultDueIn)) {
-	$due->SetToNow;
-	$due->AddDays($QueueObj->DefaultDueIn);
-    }	
-    
-    my $starts = new RT::Date($self->CurrentUser);
-    if (defined $args{'Starts'}) {
-	$starts->Set (Format => 'ISO',
-		   Value => $args{'Starts'});
-    }
-
-	
-    # {{{ Deal with setting the owner
-    
-    if (ref($args{'Owner'}) eq 'RT::User') {
-	$Owner = $args{'Owner'};
-    }
-    #If we've been handed something else, try to load the user.
-    elsif ($args{'Owner'}) {
-	$Owner = new RT::User($self->CurrentUser);
-	$Owner->Load($args{'Owner'});
-	
-    }
-    #If we can't handle it, call it nobody
-    else {
-	if (ref($args{'Owner'})) {
-	    $RT::Logger->warning("$ticket ->Create called with an Owner of ".
-		 "type ".ref($args{'Owner'}) .". Defaulting to nobody.\n");
-
-	    push @non_fatal_errors, "Invalid owner. Defaulting to 'nobody'.";
-	}
-	else { 
-	    $RT::Logger->warning("$self ->Create called with an ".
-				 "unknown datatype for Owner: ".$args{'Owner'} .
-				 ". Defaulting to Nobody.\n");
-	}
-    }
-    
-    #If we have a proposed owner and they don't have the right 
-    #to own a ticket, scream about it and make them not the owner
-    if ((defined ($Owner)) and
-	($Owner->Id != $RT::Nobody->Id) and 
-	(!$Owner->HasQueueRight( QueueObj => $QueueObj, 
-				 Right => 'OwnTicket'))) {
-	
-	$RT::Logger->warning("$self user ".$Owner->Name . "(".$Owner->id .
-			     ") was proposed ".
-			     "as a ticket owner but has no rights to own ".
-			     "tickets in this queue\n");
-
-	push @non_fatal_errors, "Invalid owner. Defaulting to 'nobody'.";
-
-	$Owner = undef;
-    }
-    
-    #If we haven't been handed a valid owner, make it nobody.
-    unless (defined ($Owner)) {
-	$Owner = new RT::User($self->CurrentUser);
-	$Owner->Load($RT::Nobody->UserObj->Id);
-    }	
-
-    # }}}
-
-    unless ($self->ValidateStatus($args{'Status'})) {
-	return (0,0,'Invalid value for status');
-    }
-
-    if ($args{'Status'} eq 'resolved') {
-	$resolved = $now->ISO;
-    } else{
-	$resolved = undef;
-    }
-
-    my $id = $self->SUPER::Create(
-				  Queue => $QueueObj->Id,
-				  Owner => $Owner->Id,
-				  Subject => $args{'Subject'},
-				  InitialPriority => $args{'InitialPriority'},
-				  FinalPriority => $args{'FinalPriority'},
-				  Priority => $args{'InitialPriority'},
-				  Status => $args{'Status'},
-				  TimeWorked => $args{'TimeWorked'},
-				  TimeLeft => $args{'TimeLeft'},
-				  Type => $args{'Type'},	
-				  Starts => $starts->ISO,
-				  Resolved => $resolved,
-				  Due => $due->ISO
-				 );
-    #Set the ticket's effective ID now that we've created it.
-    my ($val, $msg) = $self->__Set(Field => 'EffectiveId', Value => $id);
-    
-    unless ($val) {
-	$RT::Logger->err("$self ->Create couldn't set EffectiveId: $msg\n");
-    }	
-     
-
-    my $watcher;
-    foreach $watcher (@{$args{'Cc'}}) {
-	my ($wval, $wmsg) = 
-	  $self->_AddWatcher( Type => 'Cc', Person => $watcher, Silent => 1);
-	push @non_fatal_errors, $wmsg	unless ($wval);
-    }	
-
-    foreach $watcher (@{$args{'Requestor'}}) {
-	my ($wval, $wmsg) = 
-	  $self->_AddWatcher( Type => 'Requestor', Person => $watcher, Silent => 1);
-	push @non_fatal_errors, $wmsg	unless ($wval);
-    }
-
-    foreach $watcher (@{$args{'AdminCc'}}) {
-	# Note that we're using AddWatcher, rather than _AddWatcher, as we 
-	# actually _want_ that ACL check. Otherwise, random ticket creators
-	# could make themselves adminccs and maybe get ticket rights. that would
-	# be poor
-	my ($wval, $wmsg) = 
-	  $self->AddWatcher( Type => 'AdminCc', Person => $watcher, Silent => 1);
-	push @non_fatal_errors, $wmsg	unless ($wval);
-    }
-
-    # Iterate through all the KeywordSelect-<int> params passed in, calling _AddKeyword
-    # for each of them
-
-
-    foreach my $key (keys %args) {
-
-	next unless ($key =~ /^KeywordSelect-(.*)$/);
-	
-	my $ks = $1;
-
-
-	my @keywords = ref($args{$key}) eq 'ARRAY' ?
-	      @{$args{$key}} : ($args{$key});
-	
-	foreach my $keyword (@keywords) {  
-	    my ($kval, $kmsg) = $self->_AddKeyword(KeywordSelect => $ks,
-						   Keyword => $keyword,
-						   Silent => 1);
-	}	
-	push @non_fatal_errors, $kmsg unless ($kval);
-    }
-
-    
-    
-    #Add a transaction for the create
-    my ($Trans, $Msg, $TransObj) = 
-	$self->_NewTransaction( Type => "Create",
-			  	TimeTaken => 0, 
-			  	MIMEObj=>$args{'MIMEObj'});
-    
-    # Logging
-    if ($self->Id && $Trans) {
-	$ErrStr = "Ticket ".$self->Id . " created in queue '". $QueueObj->Name. 
-	  "'.\n" . join("\n", @non_fatal_errors);
-	
-	$RT::Logger->info($ErrStr);
-    }
-    else {
-	# TODO where does this get errstr from?
-	$RT::Logger->warning("Ticket couldn't be created: $ErrStr");
-    }
-    
-    return($self->Id, $TransObj->Id, $ErrStr);
-}
 
-# }}}
 
-# {{{ sub Import
 
-=head2 Import PARAMHASH
 
-Import a ticket. 
-Doesn\'t create a transaction. 
-Doesn\'t supply queue defaults, etc.
+=item Create PARAMHASH
 
-Arguments are identical to Create(), with the addition of
-    Id -    Ticket Id
+Create takes a hash of values and creates a row in the database:
 
-Returns: TICKETID
+  int(11) 'EffectiveId'.
+  int(11) 'Queue'.
+  varchar(16) 'Type'.
+  int(11) 'IssueStatement'.
+  int(11) 'Resolution'.
+  int(11) 'Owner'.
+  varchar(200) 'Subject' defaults to '[no subject]'.
+  int(11) 'InitialPriority'.
+  int(11) 'FinalPriority'.
+  int(11) 'Priority'.
+  int(11) 'TimeEstimated'.
+  int(11) 'TimeWorked'.
+  varchar(10) 'Status'.
+  int(11) 'TimeLeft'.
+  datetime 'Told'.
+  datetime 'Starts'.
+  datetime 'Started'.
+  datetime 'Due'.
+  datetime 'Resolved'.
+  smallint(6) 'Disabled'.
 
 =cut
 
 
-sub Import {
-    my $self = shift;
-    my ( $ErrStr, $QueueObj, $Owner);
-    
-    my %args = (id => undef,
-		EffectiveId => undef,
-		Queue => undef,
-		Requestor => undef,
-		Type => 'ticket',
-		Owner => $RT::Nobody->Id,
-		Subject => '[no subject]',
-		InitialPriority => undef,
-		FinalPriority => undef,
-		Status => 'new',
-		TimeWorked => "0",
-		Due => undef,
-		Created => undef,
-		Updated => undef,
-	Resolved => undef,
-		Told => undef,
-		@_);
-    
-    if ( (defined($args{'Queue'})) && (!ref($args{'Queue'})) ) {
-	$QueueObj=RT::Queue->new($RT::SystemUser);
-	$QueueObj->Load($args{'Queue'});
-	#TODO error check this and return 0 if it\'s not loading properly +++
-    }
-    elsif (ref($args{'Queue'}) eq 'RT::Queue') {
-	$QueueObj=RT::Queue->new($RT::SystemUser);
-	$QueueObj->Load($args{'Queue'}->Id);
-    }
-    else {
-	$RT::Logger->debug("$self ". $args{'Queue'} . 
-			   " not a recognised queue object.");
-    }
-    
-    #Can't create a ticket without a queue.
-    unless (defined ($QueueObj) and $QueueObj->Id) {
-	$RT::Logger->debug( "$self No queue given for ticket creation.");
-	return (0,'Could not create ticket. Queue not set');
-    }
-    
-    #Now that we have a queue, Check the ACLS
-    unless ($self->CurrentUser->HasQueueRight(Right => 'CreateTicket',
-					      QueueObj => $QueueObj )) {
-	return (0,"No permission to create tickets in the queue '". 
-		$QueueObj->Name."'.");
-    }
-    
-    
-
-
-    # {{{ Deal with setting the owner
-      
-    # Attempt to take user object, user name or user id.
-    # Assign to nobody if lookup fails.
-    if (defined ($args{'Owner'})) { 
-	if ( ref($args{'Owner'}) ) {
-	    $Owner = $args{'Owner'};
-	}
-	else {
-	    $Owner = new RT::User($self->CurrentUser);
-	    $Owner->Load($args{'Owner'});
-	    if ( ! defined($Owner->id) ) {
-		$Owner->Load($RT::Nobody->id);
-	    }
-	}
-    }
-    
-
-    #If we have a proposed owner and they don't have the right 
-    #to own a ticket, scream about it and make them not the owner
-    if ((defined ($Owner)) and
-	($Owner->Id != $RT::Nobody->Id) and 
-	(!$Owner->HasQueueRight( QueueObj => $QueueObj, 
-				 Right => 'OwnTicket'))) {
-	
-	$RT::Logger->warning("$self user ".$Owner->Name . "(".$Owner->id .
-			     ") was proposed ".
-			     "as a ticket owner but has no rights to own ".
-			     "tickets in '".$QueueObj->Name."'\n");
-	
-	$Owner = undef;
-    }
-    
-    #If we haven't been handed a valid owner, make it nobody.
-    unless (defined ($Owner)) {
-	$Owner = new RT::User($self->CurrentUser);
-	$Owner->Load($RT::Nobody->UserObj->Id);
-    }	
-
-    # }}}
-
-    unless ($self->ValidateStatus($args{'Status'})) {
-	return (0,"'$args{'Status'}' is an invalid value for status");
-    }
-    
-    $self->{'_AccessibleCache'}{Created} = { 'read'=>1, 'write'=>1 };
-    $self->{'_AccessibleCache'}{Creator} = { 'read'=>1, 'auto'=>1 };
-    $self->{'_AccessibleCache'}{LastUpdated} = { 'read'=>1, 'write'=>1 };
-    $self->{'_AccessibleCache'}{LastUpdatedBy} = { 'read'=>1, 'auto'=>1 };
-
-
-    # If we're coming in with an id, set that now.
-    my $EffectiveId = undef;
-    if ($args{'id'}) {
-	$EffectiveId = $args{'id'};
-
-    }
-
-
-    my $id = $self->SUPER::Create(
-				  id => $args{'id'},
-				  EffectiveId => $EffectiveId,
-				  Queue => $QueueObj->Id,
-				  Owner => $Owner->Id,
-				  Subject => $args{'Subject'},
-				  InitialPriority => $args{'InitialPriority'},
-				  FinalPriority => $args{'FinalPriority'},
-				  Priority => $args{'InitialPriority'},
-				  Status => $args{'Status'},
-				  TimeWorked => $args{'TimeWorked'},
-				  Type => $args{'Type'},	
-				  Created => $args{'Created'},
-				  Told => $args{'Told'},
-				  LastUpdated => $args{'Updated'},
-	Resolved => $args{Resolved},
-				  Due => $args{'Due'},
-				 );
-
-
-
-    # If the ticket didn't have an id
-    # Set the ticket's effective ID now that we've created it.
-    if ($args{'id'} ) { 
-	  $self->Load($args{'id'});
-    }
-    else {
-	   my ($val, $msg) = $self->__Set(Field => 'EffectiveId', Value => $id);
-    
-    	   unless ($val) {
-	    $RT::Logger->err($self."->Import couldn't set EffectiveId: $msg\n");
-   	   }	
-    } 
-
-    my $watcher;
-    foreach $watcher (@{$args{'Cc'}}) {
-	$self->_AddWatcher( Type => 'Cc', Person => $watcher, Silent => 1);
-    }	
-    foreach $watcher (@{$args{'AdminCc'}}) {
-	$self->_AddWatcher( Type => 'AdminCc', Person => $watcher, Silent => 1);
-    }	
-    foreach $watcher (@{$args{'Requestor'}}) {
-	$self->_AddWatcher( Type => 'Requestor', Person => $watcher, Silent => 1);
-    }
-    
-    return($self->Id, $ErrStr);
-}
-
-# }}}
-
-# {{{ sub Delete
-
-sub Delete {
-    my $self = shift;
-    return (0, 'Deleting this object would violate referential integrity.'.
-	    ' That\'s bad.');
-}
-# }}}
-
-# {{{ Routines dealing with watchers.
-
-# {{{ Routines dealing with adding new watchers
-
-# {{{ sub AddWatcher
-
-=head2 AddWatcher
-
-AddWatcher takes a parameter hash. The keys are as follows:
-
-Email
-Type
-Owner
-
-If the watcher you\'re trying to set has an RT account, set the Owner paremeter to their User Id. Otherwise, set the Email parameter to their Email address.
-
-=cut
-
-sub AddWatcher {
-    my $self = shift;
-    my %args = ( Email => undef,
-		 Type => undef,
-		 Owner => undef,
-		 @_
-	       );
-
-    # {{{ Check ACLS
-    #If the watcher we're trying to add is for the current user
-    if ( ( $self->CurrentUser->EmailAddress &&
-           ($args{'Email'} eq $self->CurrentUser->EmailAddress) ) or
-           ($args{'Owner'} eq $self->CurrentUser->Id) 
-        ) {
-
-	
-	#  If it's an AdminCc and they don't have 
-	#   'WatchAsAdminCc' or 'ModifyTicket', bail
-	if ($args{'Type'} eq 'AdminCc') {
-	    unless ($self->CurrentUserHasRight('ModifyTicket') or 
-		    $self->CurrentUserHasRight('WatchAsAdminCc')) {
-		return(0, 'Permission Denied');
-	    }
-	}
-
-	#  If it's a Requestor or Cc and they don't have
-	#   'Watch' or 'ModifyTicket', bail
-	elsif (($args{'Type'} eq 'Cc') or 
-	       ($args{'Type'} eq 'Requestor')) {
-		   
-	    unless ($self->CurrentUserHasRight('ModifyTicket') or 
-		    $self->CurrentUserHasRight('Watch')) {
-		return(0, 'Permission Denied');
-	    }
-	}
-	else {
-	    $RT::Logger->warn("$self -> AddWatcher hit code".
-			      " it never should. We got passed ".
-			      " a type of ". $args{'Type'});
-	    return (0,'Error in parameters to TicketAddWatcher');
-	}
-    }
-    # If the watcher isn't the current user 
-    # and the current user  doesn't have 'ModifyTicket'
-    # bail
-    else {
-	unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	    return (0, "Permission Denied");
-	}
-    }
-    # }}}
-
-    return ($self->_AddWatcher(%args));
-}
-
-
-#This contains the meat of AddWatcher. but can be called from a routine like
-# Create, which doesn't need the additional acl check
-sub _AddWatcher {
-    my $self = shift;
-    my %args = (
-		Type => undef,
-		Silent => undef,
-		Email => undef,
-		Owner => 0,
-		Person => undef,
-		@_ );
-    
-    
-    
-    #clear the watchers cache
-    $self->{'watchers_cache'} = undef;
-    
-    if (defined $args{'Person'}) {
-	#if it's an RT::User object, pull out the id and shove it in Owner
-	if (ref ($args{'Person'}) =~ /RT::User/) {
-	    $args{'Owner'} = $args{'Person'}->id;
-	}	
-	#if it's an int, shove it in Owner
-	elsif ($args{'Person'} =~ /^\d+$/) {
-	    $args{'Owner'} = $args{'Person'};
-	}
-	#if it's an email address, shove it in Email
-       else {
-	   $args{'Email'} = $args{'Person'};
-       }	
-    }	
-
-    # Turn an email address int a watcher if we possibly can.
-    if ($args{'Email'}) {
-	my $watcher = new RT::User($self->CurrentUser);
-	$watcher->LoadByEmail($args{'Email'});
-	if ($watcher->Id) {
-		$args{'Owner'} = $watcher->Id;
-		delete $args{'Email'};
-	}
-    }
-
-
-    # see if this user is already a watcher. if we have an owner, check it
-    # otherwise, we've got an email-address watcher. use that.
-
-    if ($self->IsWatcher(Type => $args{'Type'},
-                         Id => ($args{'Owner'} || $args{'Email'}) ) ) {
-
-
-        return(0, 'That user is already that sort of watcher for this ticket');
-    }
-
-    
-    require RT::Watcher;
-    my $Watcher = new RT::Watcher ($self->CurrentUser);
-    my ($retval, $msg) = ($Watcher->Create( Value => $self->Id,
-					    Scope => 'Ticket',
-					    Email => $args{'Email'},
-					    Type => $args{'Type'},
-					    Owner => $args{'Owner'},
-					  ));
-    
-    unless ($args{'Silent'}) {
-	$self->_NewTransaction( Type => 'AddWatcher',
-				NewValue => $Watcher->Email,
-				Field => $Watcher->Type);
-    }
-    
-    return ($retval, $msg);
-}
-
-# }}}
-
-# {{{ sub AddRequestor
-
-=head2 AddRequestor
-
-AddRequestor takes what AddWatcher does, except it presets
-the "Type" parameter to \'Requestor\'
-
-=cut
-
-sub AddRequestor {
-   my $self = shift;
-   return ($self->AddWatcher ( Type => 'Requestor', @_));
-}
-
-# }}}
-
-# {{{ sub AddCc
-
-=head2 AddCc
-
-AddCc takes what AddWatcher does, except it presets
-the "Type" parameter to \'Cc\'
-
-=cut
-
-sub AddCc {
-   my $self = shift;
-   return ($self->AddWatcher ( Type => 'Cc', @_));
-}
-# }}}
-	
-# {{{ sub AddAdminCc
-
-=head2 AddAdminCc
-
-AddAdminCc takes what AddWatcher does, except it presets
-the "Type" parameter to \'AdminCc\'
-
-=cut
-
-sub AddAdminCc {
-   my $self = shift;
-   return ($self->AddWatcher ( Type => 'AdminCc', @_));
-}
-
-# }}}
-
-# }}}
-
-# {{{ sub DeleteWatcher
-
-=head2 DeleteWatcher id [type]
-
-DeleteWatcher takes a single argument which is either an email address 
-or a watcher id.  
-If the first argument is an email address, you need to specify the watcher type you're talking
-about as the second argument. Valid values are 'Requestor', 'Cc' or 'AdminCc'.
-It removes that watcher from this Ticket\'s list of watchers.
-
-
-=cut
 
-#TODO It is lame that you can't call this the same way you can call AddWatcher
 
-sub DeleteWatcher {
+sub Create {
     my $self = shift;
-    my $id = shift;
-
-    my $type;
-    
-    $type = shift if (@_);
-    
-    my $Watcher = new RT::Watcher($self->CurrentUser);
-    
-    #If it\'s a numeric watcherid
-    if ($id =~ /^(\d*)$/) {
-	$Watcher->Load($id);
-    }
-    
-    #Otherwise, we'll assume it's an email address
-    elsif ($type) {
-	my ($result, $msg) = 
-	  $Watcher->LoadByValue( Email => $id,
-				 Scope => 'Ticket',
-				 Value => $self->id,
-				 Type => $type);
-	return (0,$msg) unless ($result);
-    }
-    
-    else {
-	return(0,"Can\'t delete a watcher by email address without specifying a type");
-    }
-    
-    # {{{ Check ACLS 
-
-    #If the watcher we're trying to delete is for the current user
-    if ($Watcher->Email eq $self->CurrentUser->EmailAddress) {
-		
-	#  If it's an AdminCc and they don't have 
-	#   'WatchAsAdminCc' or 'ModifyTicket', bail
-	if ($Watcher->Type eq 'AdminCc') {
-	    unless ($self->CurrentUserHasRight('ModifyTicket') or 
-		    $self->CurrentUserHasRight('WatchAsAdminCc')) {
-		return(0, 'Permission Denied');
-	    }
-	}
-
-	#  If it's a Requestor or Cc and they don't have
-	#   'Watch' or 'ModifyTicket', bail
-	elsif (($Watcher->Type eq 'Cc') or 
-	       ($Watcher->Type eq 'Requestor')) {
-		   
-	    unless ($self->CurrentUserHasRight('ModifyTicket') or 
-		    $self->CurrentUserHasRight('Watch')) {
-		return(0, 'Permission Denied');
-	    }
-	}
-	else {
-	    $RT::Logger->warn("$self -> DeleteWatcher hit code".
-			      " it never should. We got passed ".
-			      " a type of ". $args{'Type'});
-	    return (0,'Error in parameters to $self DeleteWatcher');
-	}
-    }
-    # If the watcher isn't the current user 
-    # and the current user  doesn't have 'ModifyTicket'
-    # bail
-    else {
-	unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	    return (0, "Permission Denied");
-	}
-    }	
-    
-    # }}}
-    
-    unless (($Watcher->Scope eq 'Ticket') and
-	    ($Watcher->Value == $self->id) ) {
-	return (0, "Not a watcher for this ticket");
-    }
-
-
-    #Clear out the watchers hash.
-    $self->{'watchers'} = undef;
-    
-    #If we\'ve validated that it is a watcher for this ticket 
-    $self->_NewTransaction ( Type => 'DelWatcher',        
-			     OldValue => $Watcher->Email,
-			     Field => $Watcher->Type,
-			   );
-    
-    my $retval = $Watcher->Delete();
-    
-    unless ($retval) {
-	return(0,"Watcher could not be deleted. Database inconsistency possible.");
-    }
-    
-    return(1, "Watcher deleted");
-}
-
-# {{{ sub DeleteRequestor
-
-=head2 DeleteRequestor EMAIL
+    my %args = ( 
+                EffectiveId => '0',
+                Queue => '0',
+                Type => '',
+                IssueStatement => '0',
+                Resolution => '0',
+                Owner => '0',
+                Subject => '[no subject]',
+                InitialPriority => '0',
+                FinalPriority => '0',
+                Priority => '0',
+                TimeEstimated => '0',
+                TimeWorked => '0',
+                Status => '',
+                TimeLeft => '0',
+                Told => '',
+                Starts => '',
+                Started => '',
+                Due => '',
+                Resolved => '',
+                Disabled => '0',
 
-Takes an email address. It calls DeleteWatcher with a preset 
-type of 'Requestor'
-
-
-=cut
+		  @_);
+    $self->SUPER::Create(
+                         EffectiveId => $args{'EffectiveId'},
+                         Queue => $args{'Queue'},
+                         Type => $args{'Type'},
+                         IssueStatement => $args{'IssueStatement'},
+                         Resolution => $args{'Resolution'},
+                         Owner => $args{'Owner'},
+                         Subject => $args{'Subject'},
+                         InitialPriority => $args{'InitialPriority'},
+                         FinalPriority => $args{'FinalPriority'},
+                         Priority => $args{'Priority'},
+                         TimeEstimated => $args{'TimeEstimated'},
+                         TimeWorked => $args{'TimeWorked'},
+                         Status => $args{'Status'},
+                         TimeLeft => $args{'TimeLeft'},
+                         Told => $args{'Told'},
+                         Starts => $args{'Starts'},
+                         Started => $args{'Started'},
+                         Due => $args{'Due'},
+                         Resolved => $args{'Resolved'},
+                         Disabled => $args{'Disabled'},
+);
 
-sub DeleteRequestor {
-   my $self = shift;
-   my $id = shift;
-   return ($self->DeleteWatcher ($id, 'Requestor'))
 }
 
-# }}}
-
-# {{{ sub DeleteCc
-
-=head2 DeleteCc EMAIL
-
-Takes an email address. It calls DeleteWatcher with a preset 
-type of 'Cc'
-
-
-=cut
-
-sub DeleteCc {
-   my $self = shift;
-   my $id = shift;
-   return ($self->DeleteWatcher ($id, 'Cc'))
-}
-
-# }}}
-
-# {{{ sub DeleteAdminCc
-
-=head2 DeleteAdminCc EMAIL
-
-Takes an email address. It calls DeleteWatcher with a preset 
-type of 'AdminCc'
-
-
-=cut
-
-sub DeleteAdminCc {
-   my $self = shift;
-   my $id = shift;
-   return ($self->DeleteWatcher ($id, 'AdminCc'))
-}
-
-# }}}
-
-
-# }}}
 
-# {{{ sub Watchers
 
-=head2 Watchers
+=item id
 
-Watchers returns a Watchers object preloaded with this ticket\'s watchers.
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
 
-# It should return only the ticket watchers. the actual FooAsString
-# methods capture the queue watchers too. I don't feel thrilled about this,
-# but we don't want the Cc Requestors and AdminCc objects to get filled up
-# with all the queue watchers too. we've got seperate objects for that.
-  # should we rename these as s/(.*)AsString/$1Addresses/ or somesuch?
 
 =cut
 
-sub Watchers {
-  my $self = shift;
-  
-  require RT::Watchers;
-  my $watchers=RT::Watchers->new($self->CurrentUser);
-  if ($self->CurrentUserHasRight('ShowTicket')) {
-      $watchers->LimitToTicket($self->id);
-  }
-  
-  return($watchers);
-  
-}
-
-# }}}
 
-# {{{ a set of  [foo]AsString subs that will return the various sorts of watchers for a ticket/queue as a comma delineated string
+=item EffectiveId
 
-=head2 RequestorsAsString
+Returns the current value of EffectiveId. 
+(In the database, EffectiveId is stored as int(11).)
 
- B<Returns> String: All Ticket Requestor email addresses as a string.
 
-=cut
 
-sub RequestorsAsString {
-    my $self=shift;
+=item SetEffectiveId VALUE
 
-    unless ($self->CurrentUserHasRight('ShowTicket')) {
-        return undef;
-    }
-    
-    return ($self->Requestors->EmailsAsString() );
-}
 
-=head2 WatchersAsString
+Set EffectiveId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, EffectiveId will be stored as a int(11).)
 
-B<Returns> String: All Ticket Watchers email addresses as a string
 
 =cut
 
-sub WatchersAsString {
-    my $self=shift;
-
-    unless ($self->CurrentUserHasRight('ShowTicket')) {
-	return (0, "Permission Denied");
-    }
-    
-    return ($self->Watchers->EmailsAsString());
-
-}
 
-=head2 AdminCcAsString
+=item Queue
 
-returns String: All Ticket AdminCc email addresses as a string
+Returns the current value of Queue. 
+(In the database, Queue is stored as int(11).)
 
-=cut
 
 
-sub AdminCcAsString {
-    my $self=shift;
+=item SetQueue VALUE
 
-    unless ($self->CurrentUserHasRight('ShowTicket')) {
-	return undef;
-    }
-    
-    return ($self->AdminCc->EmailsAsString());
-    
-}
 
-=head2 CcAsString
+Set Queue to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Queue will be stored as a int(11).)
 
-returns String: All Ticket Ccs as a string of email addresses
 
 =cut
 
-sub CcAsString {
-    my $self=shift;
-
-    unless ($self->CurrentUserHasRight('ShowTicket')) {
-        return undef; 
-    }
-    
-    return ($self->Cc->EmailsAsString());
-
-}
-
-# }}}
-
-# {{{ Routines that return RT::Watchers objects of Requestors, Ccs and AdminCcs
 
-# {{{ sub Requestors
+=item QueueObj
 
-=head2 Requestors
+Returns the Queue Object which has the id returned by Queue
 
-Takes nothing.
-Returns this ticket's Requestors as an RT::Watchers object
-
-=cut
-
-sub Requestors {
-    my $self = shift;
-    
-    my $requestors = $self->Watchers();
-    if ($self->CurrentUserHasRight('ShowTicket')) {
-	$requestors->LimitToRequestors();
-    }	
-    
-    return($requestors);
-    
-}
-
-# }}}
-
-# {{{ sub Cc
-
-=head2 Cc
-
-Takes nothing.
-Returns a watchers object which contains this ticket's Cc watchers
-
-=cut
-
-sub Cc {
-    my $self = shift;
-    
-    my $cc = $self->Watchers();
-    
-    if ($self->CurrentUserHasRight('ShowTicket')) {
-	$cc->LimitToCc();
-    }
-    
-    return($cc);
-    
-}
-
-# }}}
-
-# {{{ sub AdminCc
-
-=head2 AdminCc
-
-Takes nothing.
-Returns this ticket\'s administrative Ccs as an RT::Watchers object
-
-=cut
-
-sub AdminCc {
-    my $self = shift;
-    
-    my $admincc = $self->Watchers();
-    if ($self->CurrentUserHasRight('ShowTicket')) {
-	$admincc->LimitToAdminCc();
-    }
-    return($admincc);
-}
-
-# }}}
-
-# }}}
-
-# {{{ IsWatcher,IsRequestor,IsCc, IsAdminCc
-
-# {{{ sub IsWatcher
-# a generic routine to be called by IsRequestor, IsCc and IsAdminCc
-
-=head2 IsWatcher
-
-Takes a param hash with the attributes Type and User. User is either a user object or string containing an email address. Returns true if that user or string
-is a ticket watcher. Returns undef otherwise
-
-=cut
-
-sub IsWatcher {
-    my $self = shift;
-
-    my %args = ( Type => 'Requestor',
-		 Email => undef,
-		 Id => undef,
-		 @_
-	       );
-    
-    my %cols = ('Type' => $args{'Type'},
-		'Scope' => 'Ticket',
-		'Value' => $self->Id,
-		'Owner' => undef,
-		'Email' => undef
-	       );
-    
-    if (ref($args{'Id'})){ 
-	#If it's a ref, it's an RT::User object;
-	$cols{'Owner'} = $args{'Id'}->Id;
-    }
-    elsif ($args{'Id'} =~ /^\d+$/) { 
-	# if it's an integer, it's a reference to an RT::User obj
-	$cols{'Owner'} = $args{'Id'};
-    }
-    else {
-	$cols{'Email'} = $args{'Id'};
-    }	
-    
-    if ($args{'Email'}) {
-	$cols{'Email'} = $args{'Email'};
-    }
-
-    my $description = join(":",%cols);
-    
-    #If we've cached a positive match...
-    if (defined $self->{'watchers_cache'}->{"$description"}) {
-	if ($self->{'watchers_cache'}->{"$description"} == 1) {
-	    return(1);
-	}
-	else { #If we've cached a negative match...
-	    return(undef);
-	}
-    }
-    
-    
-    my $watcher = new RT::Watcher($self->CurrentUser);
-    $watcher->LoadByCols(%cols);
-    
-    
-    if ($watcher->id) {
-	$self->{'watchers_cache'}->{"$description"} = 1;
-	return(1);
-    }	
-    else {
-	$self->{'watchers_cache'}->{"$description"} = 0;
-	return(undef);
-    }
-    
-}
-# }}}
-
-# {{{ sub IsRequestor
-
-=head2 IsRequestor
-  
-  Takes an email address, RT::User object or integer (RT user id)
-  Returns true if the string is a requestor of the current ticket.
-
-
-=cut
-
-sub IsRequestor {
-    my $self = shift;
-    my $person = shift;
-
-    return ($self->IsWatcher(Type => 'Requestor', Id => $person));
-	    
-};
-
-# }}}
-
-# {{{ sub IsCc
-
-=head2 IsCc
-
-Takes a string. Returns true if the string is a Cc watcher of the current ticket.
-
-=cut
-
-sub IsCc {
-  my $self = shift;
-  my $cc = shift;
-  
-  return ($self->IsWatcher( Type => 'Cc', Id => $cc ));
-  
-}
-
-# }}}
-
-# {{{ sub IsAdminCc
-
-=head2 IsAdminCc
-
-Takes a string. Returns true if the string is an AdminCc watcher of the current ticket.
-
-=cut
-
-sub IsAdminCc {
-  my $self = shift;
-  my $person = shift;
-  
-  return ($self->IsWatcher( Type => 'AdminCc', Id => $person ));
-  
-}
-
-# }}}
-
-# {{{ sub IsOwner
-
-=head2 IsOwner
-
-  Takes an RT::User object. Returns true if that user is this ticket's owner.
-returns undef otherwise
-
-=cut
-
-sub IsOwner {
-    my $self = shift;
-    my $person = shift;
-  
-
-    # no ACL check since this is used in acl decisions
-    # unless ($self->CurrentUserHasRight('ShowTicket')) {
-    #	return(undef);
-    #   }	
-
-    
-    #Tickets won't yet have owners when they're being created.
-    unless ($self->OwnerObj->id) {
-        return(undef);
-    }
-    
-    if ($person->id == $self->OwnerObj->id) {
-	return(1);
-    }
-    else {
-	return(undef);
-    }
-}
-
-
-# }}}
-
-# }}}
-
-# }}}
-
-# {{{ Routines dealing with queues 
-
-# {{{ sub ValidateQueue
-
-sub ValidateQueue {
-  my $self = shift;
-  my $Value = shift;
-  
-  #TODO I don't think this should be here. We shouldn't allow anything to have an undef queue,
-  if (!$Value) {
-    $RT::Logger->warning( " RT:::Queue::ValidateQueue called with a null value. this isn't ok.");
-    return (1);
-  }
-  
-  my $QueueObj = RT::Queue->new($self->CurrentUser);
-  my $id = $QueueObj->Load($Value);
-  
-  if ($id) {
-    return (1);
-  }
-  else {
-    return (undef);
-  }
-}
-
-# }}}
-
-# {{{ sub SetQueue  
-
-sub SetQueue {
-    my $self = shift;
-    my $NewQueue = shift;
-
-    #Redundant. ACL gets checked in _Set;
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	return (0, "Permission Denied");
-    }
-   
- 
-    my $NewQueueObj = RT::Queue->new($self->CurrentUser);
-    $NewQueueObj->Load($NewQueue);
-    
-    unless ($NewQueueObj->Id()) {
-	return (0, "That queue does not exist");
-    }
-    
-    if ($NewQueueObj->Id == $self->QueueObj->Id) {
-	return (0, 'That is the same value');
-    }
-    unless ($self->CurrentUser->HasQueueRight(Right =>'CreateTicket',
-					      QueueObj => $NewQueueObj )) {
-	return (0, "You may not create requests in that queue.");
-    }
-    
-    unless ($self->OwnerObj->HasQueueRight(Right=> 'OwnTicket',  
-					   QueueObj => $NewQueueObj)) {
-	    $self->Untake();
-    }
-
-    return($self->_Set(Field => 'Queue', Value => $NewQueueObj->Id()));
-    
-}
-
-# }}}
-
-# {{{ sub QueueObj
-
-=head2 QueueObj
-
-Takes nothing. returns this ticket's queue object
 
 =cut
 
 sub QueueObj {
-    my $self = shift;
-    
-    my $queue_obj = RT::Queue->new($self->CurrentUser);
-    #We call __Value so that we can avoid the ACL decision and some deep recursion
-    my ($result) = $queue_obj->Load($self->__Value('Queue'));
-    return ($queue_obj);
+	my $self = shift;
+	my $Queue =  RT::Queue->new($self->CurrentUser);
+	$Queue->Load($self->__Value('Queue'));
+	return($Queue);
 }
 
+=item Type
 
-# }}}
+Returns the current value of Type. 
+(In the database, Type is stored as varchar(16).)
 
-# }}}
 
-# {{{ Date printing routines
 
-# {{{ sub DueObj
-
-=head2 DueObj
-
-  Returns an RT::Date object containing this ticket's due date
-
-=cut
-sub DueObj {
-    my $self = shift;
-    
-    my $time = new RT::Date($self->CurrentUser);
-
-    # -1 is RT::Date slang for never
-    if ($self->Due) {
-	$time->Set(Format => 'sql', Value => $self->Due );
-    }
-    else {
-	$time->Set(Format => 'unix', Value => -1);
-    }
-    
-    return $time;
-}
-# }}}
+=item SetType VALUE
 
-# {{{ sub DueAsString 
 
-=head2 DueAsString
+Set Type to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Type will be stored as a varchar(16).)
 
-Returns this ticket's due date as a human readable string
 
 =cut
 
-sub DueAsString {
-  my $self = shift;
-  return $self->DueObj->AsString();
-}
-
-# }}}
 
-# {{{ sub GraceTimeAsString 
+=item IssueStatement
 
-=head2 GraceTimeAsString
+Returns the current value of IssueStatement. 
+(In the database, IssueStatement is stored as int(11).)
 
-Return the time until this ticket is due as a string
-
-=cut
-
-# TODO This should be deprecated 
-
-sub GraceTimeAsString {
-    my $self=shift;
-    
-    if ($self->Due) {
-	return ($self->DueObj->AgeAsString());
-    } else {
-	return "";
-    }
-}
 
-# }}}
 
+=item SetIssueStatement VALUE
 
-# {{{ sub ResolvedObj
 
-=head2 ResolvedObj
+Set IssueStatement to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, IssueStatement will be stored as a int(11).)
 
-  Returns an RT::Date object of this ticket's 'resolved' time.
 
 =cut
 
-sub ResolvedObj {
-  my $self = shift;
 
-  my $time = new RT::Date($self->CurrentUser);
-  $time->Set(Format => 'sql', Value => $self->Resolved);
-  return $time;
-}
-# }}}
+=item Resolution
 
-# {{{ sub SetStarted
+Returns the current value of Resolution. 
+(In the database, Resolution is stored as int(11).)
 
-=head2 SetStarted
 
-Takes a date in ISO format or undef
-Returns a transaction id and a message
-The client calls "Start" to note that the project was started on the date in $date.
-A null date means "now"
 
-=cut
-  
-sub SetStarted {
-    my $self = shift;
-    my $time = shift || 0;
-    
-
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	return (0, "Permission Denied");
-    }
-
-    #We create a date object to catch date weirdness
-    my $time_obj = new RT::Date($self->CurrentUser());
-    if ($time != 0)  {
-	$time_obj->Set(Format => 'ISO', Value => $time);
-    }
-    else {
-	$time_obj->SetToNow();
-    }
-    
-    #Now that we're starting, open this ticket
-    #TODO do we really want to force this as policy? it should be a scrip
-    
-    #We need $TicketAsSystem, in case the current user doesn't have
-    #ShowTicket
-    #
-    my $TicketAsSystem = new RT::Ticket($RT::SystemUser);
-    $TicketAsSystem->Load($self->Id);	
-    if ($TicketAsSystem->Status eq 'new') {
-	$TicketAsSystem->Open();
-    }	
-    
-    return ($self->_Set(Field => 'Started', Value =>$time_obj->ISO));
-    
-}
+=item SetResolution VALUE
 
-# }}}
 
-# {{{ sub StartedObj
+Set Resolution to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Resolution will be stored as a int(11).)
 
-=head2 StartedObj
-
-  Returns an RT::Date object which contains this ticket's 
-'Started' time.
 
 =cut
 
 
-sub StartedObj {
-    my $self = shift;
-    
-    my $time = new RT::Date($self->CurrentUser);
-    $time->Set(Format => 'sql', Value => $self->Started);
-    return $time;
-}
-# }}}
+=item Owner
 
-# {{{ sub StartsObj
+Returns the current value of Owner. 
+(In the database, Owner is stored as int(11).)
 
-=head2 StartsObj
 
-  Returns an RT::Date object which contains this ticket's 
-'Starts' time.
 
-=cut
-
-sub StartsObj {
-  my $self = shift;
-  
-  my $time = new RT::Date($self->CurrentUser);
-  $time->Set(Format => 'sql', Value => $self->Starts);
-  return $time;
-}
-# }}}
+=item SetOwner VALUE
 
-# {{{ sub ToldObj
 
-=head2 ToldObj
+Set Owner to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Owner will be stored as a int(11).)
 
-  Returns an RT::Date object which contains this ticket's 
-'Told' time.
 
 =cut
 
 
-sub ToldObj {
-  my $self = shift;
-  
-  my $time = new RT::Date($self->CurrentUser);
-  $time->Set(Format => 'sql', Value => $self->Told);
-  return $time;
-}
+=item Subject
 
-# }}}
+Returns the current value of Subject. 
+(In the database, Subject is stored as varchar(200).)
 
-# {{{ sub LongSinceToldAsString
 
-# TODO this should be deprecated
 
+=item SetSubject VALUE
 
-sub LongSinceToldAsString {
-  my $self = shift;
-
-  if ($self->Told) {
-      return $self->ToldObj->AgeAsString();
-  } else {
-      return "Never";
-  }
-}
-# }}}
-
-# {{{ sub ToldAsString
 
-=head2 ToldAsString
+Set Subject to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Subject will be stored as a varchar(200).)
 
-A convenience method that returns ToldObj->AsString
-
-TODO: This should be deprecated
 
 =cut
 
 
-sub ToldAsString {
-    my $self = shift;
-    if ($self->Told) {
-	return $self->ToldObj->AsString();
-    }
-    else {
-	return("Never");
-    }
-}
-# }}}
-
-# {{{ sub TimeWorkedAsString
+=item InitialPriority
 
-=head2 TimeWorkedAsString
+Returns the current value of InitialPriority. 
+(In the database, InitialPriority is stored as int(11).)
 
-Returns the amount of time worked on this ticket as a Text String
 
-=cut
 
-sub TimeWorkedAsString {
-    my $self=shift;
-    return "0" unless $self->TimeWorked;
-    
-    #This is not really a date object, but if we diff a number of seconds 
-    #vs the epoch, we'll get a nice description of time worked.
-    
-    my $worked = new RT::Date($self->CurrentUser);
-    #return the  #of minutes worked turned into seconds and written as
-    # a simple text string
-
-    return($worked->DurationAsString($self->TimeWorked*60));
-}
+=item SetInitialPriority VALUE
 
-# }}}
 
+Set InitialPriority to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, InitialPriority will be stored as a int(11).)
 
-# }}}
-
-# {{{ Routines dealing with correspondence/comments
-
-# {{{ sub Comment
-
-=head2 Comment
-
-Comment on this ticket.
-Takes a hashref with the follwoing attributes:
-
-MIMEObj, TimeTaken, CcMessageTo, BccMessageTo
 
 =cut
 
-sub Comment {
-  my $self = shift;
-  
-  my %args = (
-          CcMessageTo => undef,
-          BccMessageTo => undef,
-	      MIMEObj => undef,
-	      TimeTaken => 0,
-	      @_ );
-
-  unless (($self->CurrentUserHasRight('CommentOnTicket')) or
-	  ($self->CurrentUserHasRight('ModifyTicket'))) {
-      return (0, "Permission Denied");
-  }
- 
-   unless ($args{'MIMEObj'}) {
-       return(0,"No correspondence attached");
-   }
-
-  # If we've been passed in CcMessageTo and BccMessageTo fields,
-  # add them to the mime object for passing on to the transaction handler
-  # The "NotifyOtherRecipients" scripAction will look for RT--Send-Cc: and
-  # RT-Send-Bcc: headers
- 
-  $args{'MIMEObj'}->head->add('RT-Send-Cc', $args{'CcMessageTo'});
-  $args{'MIMEObj'}->head->add('RT-Send-Bcc', $args{'BccMessageTo'});
-
-  #Record the correspondence (write the transaction)
-  my ($Trans, $Msg, $TransObj) = $self->_NewTransaction( Type => 'Comment',
-				      Data =>($args{'MIMEObj'}->head->get('subject') || 'No Subject'),
-				      TimeTaken => $args{'TimeTaken'},
-				      MIMEObj => $args{'MIMEObj'}
-				    );
-  
-  
-  return ($Trans, "The comment has been recorded");
-}
-
-# }}}
 
-# {{{ sub Correspond
+=item FinalPriority
 
-=head2 Correspond
+Returns the current value of FinalPriority. 
+(In the database, FinalPriority is stored as int(11).)
 
-Correspond on this ticket.
-Takes a hashref with the following attributes:
-
-
-MIMEObj, TimeTaken, CcMessageTo, BccMessageTo
-
-=cut
-
-sub Correspond {
-    my $self = shift;
-    my %args = (
-          CcMessageTo => undef,
-          BccMessageTo => undef,
-		MIMEObj => undef,
-		TimeTaken => 0,
-		@_ );
-    
-    unless (($self->CurrentUserHasRight('ReplyToTicket')) or
-	    ($self->CurrentUserHasRight('ModifyTicket'))) {
-	return (0, "Permission Denied");
-    }
-    
-    unless ($args{'MIMEObj'}) {
-	return(0,"No correspondence attached");
-    }
-    
-  # If we've been passed in CcMessageTo and BccMessageTo fields,
-  # add them to the mime object for passing on to the transaction handler
-  # The "NotifyOtherRecipients" scripAction will look for RT-Send-Cc: and RT-Send-Bcc:
-  # headers
- 
-  $args{'MIMEObj'}->head->add('RT-Send-Cc', $args{'CcMessageTo'});
-  $args{'MIMEObj'}->head->add('RT-Send-Bcc', $args{'BccMessageTo'});
-
-    #Record the correspondence (write the transaction)
-    my ($Trans,$msg, $TransObj) = $self->_NewTransaction
-      (Type => 'Correspond',
-       Data => ($args{'MIMEObj'}->head->get('subject') || 'No Subject'),
-       TimeTaken => $args{'TimeTaken'},
-       MIMEObj=> $args{'MIMEObj'}     
-      );
-    
-    # TODO this bit of logic should really become a scrip for 2.2
-    my $TicketAsSystem = new RT::Ticket($RT::SystemUser);
-    $TicketAsSystem->Load($self->Id);
-	
-    if (
-	($TicketAsSystem->Status ne 'open') and
-	($TicketAsSystem->Status ne 'new')
-       ) {
-	
-	my $oldstatus = $TicketAsSystem->Status();
-	$TicketAsSystem->__Set(Field => 'Status', Value => 'open');
-	$TicketAsSystem->_NewTransaction 
-	  ( Type => 'Set',
-	    Field => 'Status',
-	    OldValue => $oldstatus,
-	    NewValue => 'open',
-	    Data => 'Ticket auto-opened on incoming correspondence'
-	  );
-    }
-    
-    unless ($Trans) {
-	$RT::Logger->err("$self couldn't init a transaction ($msg)\n");
-	return ($Trans, "correspondence (probably) not sent", $args{'MIMEObj'});
-    }
-    
-    #Set the last told date to now if this isn't mail from the requestor.
-    #TODO: Note that this will wrongly ack mail from any non-requestor as a "told"
-    
-    unless ($TransObj->IsInbound) {
-	$self->_SetTold;
-    }
-    
-    return ($Trans, "correspondence sent");
-}
 
-# }}}
 
-# }}}
+=item SetFinalPriority VALUE
 
-# {{{ Routines dealing with Links and Relations between tickets
 
-# {{{ Link Collections
+Set FinalPriority to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, FinalPriority will be stored as a int(11).)
 
-# {{{ sub Members
-
-=head2 Members
-
-  This returns an RT::Links object which references all the tickets 
-which are 'MembersOf' this ticket
 
 =cut
 
-sub Members {
-   my $self = shift;
-   return ($self->_Links('Target', 'MemberOf'));
-}
-
-# }}}
 
-# {{{ sub MemberOf
+=item Priority
 
-=head2 MemberOf
+Returns the current value of Priority. 
+(In the database, Priority is stored as int(11).)
 
-  This returns an RT::Links object which references all the tickets that this
-ticket is a 'MemberOf'
 
-=cut
-
-sub MemberOf {
-   my $self = shift;
-   return ($self->_Links('Base', 'MemberOf'));
-}
 
-# }}}
+=item SetPriority VALUE
 
-# {{{ RefersTo
 
-=head2 RefersTo
+Set Priority to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Priority will be stored as a int(11).)
 
-  This returns an RT::Links object which shows all references for which this ticket is a base
 
 =cut
 
-sub RefersTo {
-    my $self = shift;
-    return ($self->_Links('Base', 'RefersTo'));
-}
-
-# }}}
 
-# {{{ ReferredToBy
+=item TimeEstimated
 
-=head2 ReferredToBy
+Returns the current value of TimeEstimated. 
+(In the database, TimeEstimated is stored as int(11).)
 
-  This returns an RT::Links object which shows all references for which this ticket is a target
 
-=cut
 
-sub ReferredToBy {
-    my $self = shift;
-    return ($self->_Links('Target', 'RefersTo'));
-}
+=item SetTimeEstimated VALUE
 
-# }}}
 
-# {{{ DependedOnBy
+Set TimeEstimated to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, TimeEstimated will be stored as a int(11).)
 
-=head2 DependedOnBy
-
-  This returns an RT::Links object which references all the tickets that depend on this one
 
 =cut
-sub DependedOnBy {
-    my $self = shift;
-    return ($self->_Links('Target','DependsOn'));
-}
-
-# }}}
-
-# {{{ DependsOn
-
-=head2 DependsOn
-
-  This returns an RT::Links object which references all the tickets that this ticket depends on
-
-=cut
-sub DependsOn {
-   my $self = shift;
-    return ($self->_Links('Base','DependsOn'));
-}
-
-# }}}
-
-# {{{ sub _Links 
-
-sub _Links {
-    my $self = shift;
-    
-    #TODO: Field isn't the right thing here. but I ahave no idea what mnemonic ---
-    #tobias meant by $f
-    my $field = shift;
-    my $type =shift || "";
-
-    unless ($self->{"$field$type"}) {
-	$self->{"$field$type"} = new RT::Links($self->CurrentUser);
-	if ($self->CurrentUserHasRight('ShowTicket')) {
-	    
-	    $self->{"$field$type"}->Limit(FIELD=>$field, VALUE=>$self->URI);
-	    $self->{"$field$type"}->Limit(FIELD=>'Type', 
-					  VALUE=>$type) if ($type);
-	}
-    }
-    return ($self->{"$field$type"});
-}
-
-# }}}
-
-# }}}
 
 
-# {{{ sub DeleteLink 
+=item TimeWorked
 
-=head2 DeleteLink
+Returns the current value of TimeWorked. 
+(In the database, TimeWorked is stored as int(11).)
 
-Delete a link. takes a paramhash of Base, Target and Type.
-Either Base or Target must be null. The null value will 
-be replaced with this ticket\'s id
 
-=cut 
 
-sub DeleteLink {
-    my $self = shift;
-    my %args = ( Base =>  undef,
-		 Target => undef,
-		 Type => undef,
-		 @_ );
-    
-    #check acls
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-        $RT::Logger->debug("No permission to delete links\n"); 
-        return (0, 'Permission Denied');
-
-    
-    }
-    
-    #we want one of base and target. we don't care which
-    #but we only want _one_
-
-    if ($args{'Base'} and $args{'Target'}) {
-	$RT::Logger->debug("$self ->_DeleteLink. got both Base and Target\n");
-	return (0, 'Can\'t specifiy both base and target');
-    }
-    elsif ($args{'Base'}) {
-	$args{'Target'} = $self->Id();
-    }
-    elsif ($args{'Target'}) {
-	$args{'Base'} = $self->Id();
-    }
-    else {  
-        $RT::Logger->debug("$self: Base or Target must be specified\n");
-	return (0, 'Either base or target must be specified');
-    }
-     
-    my $link = new RT::Link($self->CurrentUser);
-    $RT::Logger->debug("Trying to load link: ". $args{'Base'}." ". $args{'Type'}. " ". $args{'Target'}. "\n");
-    
-    $link->Load($args{'Base'}, $args{'Type'}, $args{'Target'});
-    
-    
-    
-    #it's a real link. 
-    if ($link->id) {
-        $RT::Logger->debug("We're going to delete link ".$link->id."\n");
-	$link->Delete();
-
-	my $TransString=
-	  "Ticket $args{'Base'} no longer $args{Type} ticket $args{'Target'}.";
-	my ($Trans, $Msg, $TransObj) = $self->_NewTransaction
-	  (Type => 'DeleteLink',
-	   Field => $args{'Type'},
-	   Data => $TransString,
-	   TimeTaken => 0
-	  );
-	
-	return ($linkid, "Link deleted ($TransString)", $transactionid);
-    }
-    #if it's not a link we can find
-    else {
-        $RT::Logger->debug("Couldn't find that link\n");
-	return (0, "Link not found");
-    }
-}
+=item SetTimeWorked VALUE
 
-# }}}
 
-# {{{ sub AddLink
-
-=head2 AddLink
-
-Takes a paramhash of Type and one of Base or Target. Adds that link to this ticket.
+Set TimeWorked to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, TimeWorked will be stored as a int(11).)
 
 
 =cut
 
-sub AddLink {
-    my $self = shift;
-    my %args = ( Target => '',
-		 Base => '',
-	 	 Type => '',
-		 @_ );
-    
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	return (0, "Permission Denied");
-    }
-    
-    if ($args{'Base'} and $args{'Target'}) {
-	$RT::Logger->debug("$self tried to delete a link. both base and target were specified\n");
-	return (0, 'Can\'t specifiy both base and target');
-    }
-    elsif ($args{'Base'}) {
-        $args{'Target'} = $self->Id();
-    }
-    elsif ($args{'Target'}) {
-	$args{'Base'} = $self->Id();
-    }
-    else {  
-	return (0, 'Either base or target must be specified');
-    }
-    
-    # {{{ We don't want references to ourself
-    if ($args{Base} eq $args{Target}) {
-	return (0, "Can\'t link a ticket to itself");
-    }	
-		
-    # }}}
-    
-    # If the base isn't a URI, make it a URI. 
-    # If the target isn't a URI, make it a URI. 
-        
-    # {{{ Check if the link already exists - we don't want duplicates
-    my $old_link= new RT::Link ($self->CurrentUser);
-    $old_link->Load($args{'Base'}, $args{'Type'}, $args{'Target'});
-    if ($old_link->Id) {
-	$RT::Logger->debug("$self Somebody tried to duplicate a link");
-	return ($old_link->id, "Link already exists",0);
-    }
-    # }}}
-    
-    # Storing the link in the DB.
-    my $link = RT::Link->new($self->CurrentUser);
-    my ($linkid) = $link->Create(Target => $args{Target}, 
-				 Base => $args{Base}, 
-				 Type => $args{Type});
-    
-    unless ($linkid) {
-	return (0,"Link could not be created");
-    }
-	#Write the transaction
-    
-    my $TransString="Ticket $args{'Base'} $args{Type} ticket $args{'Target'}.";
-    
-    my ($Trans, $Msg, $TransObj) = $self->_NewTransaction
-      (Type => 'AddLink',
-       Field => $args{'Type'},
-       Data => $TransString,
-       TimeTaken => 0
-      );
-    
-    return ($Trans, "Link created ($TransString)");
-	
-	
-}
-# }}}
 
-# {{{ sub URI 
+=item Status
 
-=head2 URI
+Returns the current value of Status. 
+(In the database, Status is stored as varchar(10).)
 
-Returns this ticket's URI
 
-=cut
 
-sub URI {
-    my $self = shift;
-    return $RT::TicketBaseURI.$self->id;
-}
+=item SetStatus VALUE
 
-# }}}
 
-# {{{ sub MergeInto
+Set Status to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Status will be stored as a varchar(10).)
 
-=head2 MergeInto
-MergeInto take the id of the ticket to merge this ticket into.
 
 =cut
 
-sub MergeInto {
-    my $self = shift;
-    my $MergeInto = shift;
-    
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	return (0, "Permission Denied");
-    }
-    
-    # Load up the new ticket.
-    my $NewTicket = RT::Ticket->new($RT::SystemUser);
-    $NewTicket->Load($MergeInto);
-
-    # make sure it exists.
-    unless (defined $NewTicket->Id) {
-	return (0, 'New ticket doesn\'t exist');
-    }
-
-    
-    # Make sure the current user can modify the new ticket.
-    unless ($NewTicket->CurrentUserHasRight('ModifyTicket')) {
-	$RT::Logger->debug("failed...");
-	return (0, "Permission Denied");
-    }
-    
-    $RT::Logger->debug("checking if the new ticket has the same id and effective id...");
-    unless ($NewTicket->id == $NewTicket->EffectiveId) {
-	$RT::Logger->err('$self trying to merge into '.$NewTicket->Id .
-			 ' which is itself merged.\n');
-	return (0, "Can't merge into a merged ticket. ".
-		"You should never get this error");
-    }
-
-    
-    # We use EffectiveId here even though it duplicates information from
-    # the links table becasue of the massive performance hit we'd take
-    # by trying to do a seperate database query for merge info everytime 
-    # loaded a ticket. 
-    
-    
-    #update this ticket's effective id to the new ticket's id.
-    my ($id_val, $id_msg) = $self->__Set(Field => 'EffectiveId', 
-					 Value => $NewTicket->Id());
-    
-    unless ($id_val) {
-	$RT::Logger->error("Couldn't set effective ID for ".$self->Id.
-			   ": $id_msg");
-	return(0,"Merge failed. Couldn't set EffectiveId");
-    }
-    
-    my ($status_val, $status_msg) = $self->__Set(Field => 'Status',
-						 Value => 'resolved');
-    
-    unless ($status_val) {
-	$RT::Logger->error("$self couldn't set status to resolved.".
-			   "RT's Database may be inconsistent.");
-    }	    
-    
-    #make a new link: this ticket is merged into that other ticket.
-    $self->AddLink( Type =>'MergedInto',
-		    Target => $NewTicket->Id() );
-    
-    #add all of this ticket's watchers to that ticket.
-    my $watchers = $self->Watchers();
-    
-    while (my $watcher = $watchers->Next()) {
-	unless (
-		($watcher->Owner && 
-		$NewTicket->IsWatcher (Type => $watcher->Type,
-				       Id => $watcher->Owner)) or 
-		($watcher->Email && 
-		 $NewTicket->IsWatcher (Type => $watcher->Type,
-					Id => $watcher->Email)) 
-	       ) {
-	    
-	    
-	    
-	    $NewTicket->_AddWatcher(Silent => 1, 
-				    Type => $watcher->Type, 
-				    Email => $watcher->Email,
-				    Owner => $watcher->Owner);
-	}
-    }
-    
-    
-    #find all of the tickets that were merged into this ticket. 
-    my $old_mergees = new RT::Tickets($self->CurrentUser);
-    $old_mergees->Limit( FIELD => 'EffectiveId',
-			 OPERATOR => '=',
-			 VALUE => $self->Id );
-    
-    #   update their EffectiveId fields to the new ticket's id
-    while (my $ticket = $old_mergees->Next()) {
-	my ($val, $msg) = $ticket->__Set(Field => 'EffectiveId', 
-					 Value => $NewTicket->Id());
-    }	
-    $NewTicket->_SetLastUpdated;
-
-    return ($TransactionObj, "Merge Successful");
-}  
-
-# }}}
-
-# }}}
-
-# {{{ Routines dealing with keywords
-
-# {{{ sub KeywordsObj
-
-=head2 KeywordsObj [KEYWORD_SELECT_ID]
-
-  Returns an B<RT::ObjectKeywords> object preloaded with this ticket's ObjectKeywords.
-If the optional KEYWORD_SELECT_ID parameter is set, limit the keywords object to that keyword
-select.
-
-=cut
-
-sub KeywordsObj {
-    my $self = shift;
-    my $keyword_select; 
-    
-    $keyword_select = shift if (@_);
-    
-    use RT::ObjectKeywords;
-    my $Keywords = new RT::ObjectKeywords($self->CurrentUser);
-
-    #ACL check
-    if ($self->CurrentUserHasRight('ShowTicket')) {
-	$Keywords->LimitToTicket($self->id);
-	if ($keyword_select) {
-	    $Keywords->LimitToKeywordSelect($keyword_select);
-	}	
-    }
-    return ($Keywords);
-}
-# }}}
 
-# {{{ sub AddKeyword
+=item TimeLeft
 
-=head2 AddKeyword
+Returns the current value of TimeLeft. 
+(In the database, TimeLeft is stored as int(11).)
 
-Takes a paramhash of Keyword and KeywordSelect.  If Keyword is a valid choice
-for KeywordSelect, creates a KeywordObject.  If the KeywordSelect says this should
-be a single KeywordObject, automatically removes the old value.
 
- Issues: probably doesn't enforce the depth restrictions or make sure that keywords
-are coming from the right part of the tree. really should.
 
-=cut
+=item SetTimeLeft VALUE
 
-sub AddKeyword {
-    my $self = shift;
-   #ACL check
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	return (0, 'Permission Denied');
-    }
-    
-    return($self->_AddKeyword(@_));
-    
-}
 
+Set TimeLeft to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, TimeLeft will be stored as a int(11).)
 
-# Helper version of AddKeyword without that pesky ACL check
-sub _AddKeyword {
-    my $self = shift;
-    my %args = ( KeywordSelect => undef,  # id of a keyword select record
-		 Keyword => undef, #id of the keyword to add
-		 Silent => 0,
-		 @_
-	       );
-    
-    my ($OldValue);
-
-    #TODO make sure that $args{'Keyword'} is valid for $args{'KeywordSelect'}
-
-    #TODO: make sure that $args{'KeywordSelect'} applies to this ticket's queue.
-    
-    my $Keyword = new RT::Keyword($self->CurrentUser);
-    unless ($Keyword->Load($args{'Keyword'}) ) {
-	$RT::Logger->err("$self Couldn't load Keyword ".$args{'Keyword'} ."\n");
-	return(0, "Couldn't load keyword");
-    }
-    
-    my $KeywordSelectObj = new RT::KeywordSelect($self->CurrentUser);
-    unless ($KeywordSelectObj->Load($args{'KeywordSelect'})) {
-	$RT::Logger->err("$self Couldn't load KeywordSelect ".$args{'KeywordSelect'});
-	return(0, "Couldn't load keywordselect");
-    }
-    
-    my $Keywords = $self->KeywordsObj($KeywordSelectObj->id);
-
-    #If the ticket already has this keyword, just get out of here.
-    if ($Keywords->HasEntry($Keyword->id)) {
-	return(0, "That is already the current value");
-    }	
-
-    #If the keywordselect wants this to be a singleton:
-
-    if ($KeywordSelectObj->Single) {
-
-	#Whack any old values...keep track of the last value that we get.
-	#we shouldn't need a loop ehre, but we do it anyway, to try to 
-	# help keep the database clean.
-	while (my $OldKey = $Keywords->Next) {
-	    $OldValue = $OldKey->KeywordObj->Name;
-	    $OldKey->Delete();
-	}	
-	
-	
-    }
-
-    # create the new objectkeyword 
-    my $ObjectKeyword = new RT::ObjectKeyword($self->CurrentUser);
-    my $result = $ObjectKeyword->Create( Keyword => $Keyword->Id,
-					 ObjectType => 'Ticket',
-					 ObjectId => $self->Id,
-					 KeywordSelect => $KeywordSelectObj->Id );
-    
-
-    # record a single transaction, unless we were told not to
-    unless ($args{'Silent'}) {
-	my ($TransactionId, $Msg, $TransactionObj) = 
-	  $self->_NewTransaction( Type => 'Keyword',
-				  Field => $KeywordSelectObj->Id,
-				  OldValue => $OldValue,
-				  NewValue => $Keyword->Name );
-    }
-    return ($TransactionId, "Keyword ".$ObjectKeyword->KeywordObj->Name ." added.");    
-
-}	
-
-# }}}
-
-# {{{ sub DeleteKeyword
-
-=head2 DeleteKeyword
-  
-  Takes a paramhash. Deletes the Keyword denoted by the I<Keyword> parameter from this
-  ticket's object keywords.
 
 =cut
 
-sub DeleteKeyword {
-    my $self = shift;
-    my %args = ( Keyword => undef,
-		 KeywordSelect => undef,
-		 @_ );
-
-   #ACL check
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {    
-	return (0, 'Permission Denied');
-    }
-
-    
-    #Load up the ObjectKeyword we\'re talking about
-    my $ObjectKeyword = new RT::ObjectKeyword($self->CurrentUser);
-    $ObjectKeyword->LoadByCols(Keyword => $args{'Keyword'},
-			       KeywordSelect => $args{'KeywordSelect'},
-			       ObjectType => 'Ticket',
-			       ObjectId => $self->id()
-			      );
-    
-    #if we can\'t find it, bail
-    unless ($ObjectKeyword->id) {
-	$RT::Logger->err("Couldn't find the keyword ".$args{'Keyword'} .
-			 " for keywordselect ". $args{'KeywordSelect'} . 
-			 "for ticket ".$self->id );
-	return (undef, "Couldn't load keyword while trying to delete it.");
-    };
-    
-    #record transaction here.
-    my ($TransactionId, $Msg, $TransObj) = 
-      $self->_NewTransaction( Type => 'Keyword', 
-			      OldValue => $ObjectKeyword->KeywordObj->Name);
-    
-    $ObjectKeyword->Delete();
-    
-    return ($TransactionId, "Keyword ".$ObjectKeyword->KeywordObj->Name ." deleted.");
-    
-}
 
-# }}}
+=item Told
 
-# }}}
+Returns the current value of Told. 
+(In the database, Told is stored as datetime.)
 
-# {{{ Routines dealing with ownership
 
-# {{{ sub OwnerObj
 
-=head2 OwnerObj
+=item SetTold VALUE
 
-Takes nothing and returns an RT::User object of 
-this ticket's owner
 
-=cut
+Set Told to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Told will be stored as a datetime.)
 
-sub OwnerObj {
-    my $self = shift;
-    
-    #If this gets ACLed, we lose on a rights check in User.pm and
-    #get deep recursion. if we need ACLs here, we need
-    #an equiv without ACLs
-    
-    $owner = new RT::User ($self->CurrentUser);
-    $owner->Load($self->__Value('Owner'));
-    
-    #Return the owner object
-    return ($owner);
-}
-
-# }}}
-
-# {{{ sub OwnerAsString 
-
-=head2 OwnerAsString
-
-Returns the owner's email address
 
 =cut
 
-sub OwnerAsString {
-  my $self = shift;
-  return($self->OwnerObj->EmailAddress);
 
-}
+=item Starts
 
-# }}}
+Returns the current value of Starts. 
+(In the database, Starts is stored as datetime.)
 
-# {{{ sub SetOwner
 
-=head2 SetOwner
-
-Takes two arguments:
-     the Id or Name of the owner 
-and  (optionally) the type of the SetOwner Transaction. It defaults
-to 'Give'.  'Steal' is also a valid option.
-
-=cut
-
-sub SetOwner {
-    my $self = shift;
-    my $NewOwner = shift;
-    my $Type = shift || "Give";
-    
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	return (0, "Permission Denied");
-    }  
-    
-    my $NewOwnerObj = RT::User->new($self->CurrentUser);
-    my $OldOwnerObj = $self->OwnerObj;
-  
-    $NewOwnerObj->Load($NewOwner);
-    if (!$NewOwnerObj->Id) {
-	    return (0, "That user does not exist");
-    }
-    
-    #If thie ticket has an owner and it's not the current user
-    
-    if (($Type ne 'Steal' ) and ($Type ne 'Force') and	#If we're not stealing
-	($self->OwnerObj->Id != $RT::Nobody->Id ) and #and the owner is set
-	($self->CurrentUser->Id ne $self->OwnerObj->Id())) { #and it's not us
-	return(0, "You can only reassign tickets that you own or that are unowned");
-    }
-    
-    #If we've specified a new owner and that user can't modify the ticket
-    elsif (($NewOwnerObj->Id) and 
-	   (!$NewOwnerObj->HasQueueRight(Right => 'OwnTicket',
-					 QueueObj => $self->QueueObj,
-					 TicketObj => $self))
-	  ) {
-	return (0, "That user may not own requests in that queue");
-    }
-  
-  
-    #If the ticket has an owner and it's the new owner, we don't need
-    #To do anything
-    elsif (($self->OwnerObj) and ($NewOwnerObj->Id eq $self->OwnerObj->Id)) {
-	return(0, "That user already owns that request");
-    }
-  
-  
-    my ($trans,$msg)=$self->_Set(Field => 'Owner',
-				 Value => $NewOwnerObj->Id, 
-				 TimeTaken => 0,
-				 TransactionType => $Type);
-  
-    if ($trans) {
-	$msg = "Owner changed from ".$OldOwnerObj->Name." to ".$NewOwnerObj->Name;
-    }
-    return ($trans, $msg);
-	  
-}
 
-# }}}
+=item SetStarts VALUE
 
-# {{{ sub Take
 
-=head2 Take
+Set Starts to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Starts will be stored as a datetime.)
 
-A convenince method to set the ticket's owner to the current user
 
 =cut
 
-sub Take {
-    my $self = shift;
-    return ($self->SetOwner($self->CurrentUser->Id, 'Take'));
-}
 
-# }}}
+=item Started
 
-# {{{ sub Untake
+Returns the current value of Started. 
+(In the database, Started is stored as datetime.)
 
-=head2 Untake
 
-Convenience method to set the owner to 'nobody' if the current user is the owner.
 
-=cut
+=item SetStarted VALUE
 
-sub Untake {
-    my $self = shift;
-    return($self->SetOwner($RT::Nobody->UserObj->Id, 'Untake'));
-}
-# }}}
-
-# {{{ sub Steal 
 
-=head2 Steal
+Set Started to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Started will be stored as a datetime.)
 
-A convenience method to change the owner of the current ticket to the
-current user. Even if it's owned by another user.
 
 =cut
 
-sub Steal {
-    my $self = shift;
-  
-    if ($self->IsOwner($self->CurrentUser)) {
-	return (0,"You already own this ticket"); 
-    } else {
-	return($self->SetOwner($self->CurrentUser->Id, 'Steal'));
-      
-    }
-  
-}
-
-# }}}
-
-# }}}
 
-# {{{ Routines dealing with status
+=item Due
 
-# {{{ sub ValidateStatus 
+Returns the current value of Due. 
+(In the database, Due is stored as datetime.)
 
-=head2 ValidateStatus STATUS
 
-Takes a string. Returns true if that status is a valid status for this ticket.
-Returns false otherwise.
 
-=cut
-
-sub ValidateStatus {
-    my $self = shift;
-    my $status = shift;
+=item SetDue VALUE
 
-    #Make sure the status passed in is valid
-    unless ($self->QueueObj->IsValidStatus($status)) {
-	return (undef);
-    }
-    
-    return (1);
 
-}
+Set Due to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Due will be stored as a datetime.)
 
 
-# }}}
+=cut
 
-# {{{ sub SetStatus
 
-=head2 SetStatus STATUS
+=item Resolved
 
-Set this ticket\'s status. STATUS can be one of: new, open, stalled, resolved or dead.
+Returns the current value of Resolved. 
+(In the database, Resolved is stored as datetime.)
 
-=cut
 
-sub SetStatus { 
-    my $self = shift;
-    my $status = shift;
-
-    #Check ACL
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	return (0, 'Permission Denied');
-    }
-
-    my $now = new RT::Date($self->CurrentUser);
-    $now->SetToNow();
-    
-    #If we're changing the status from new, record that we've started
-    if (($self->Status =~ /new/) && ($status ne 'new')) {
-	#Set the Started time to "now"
-	$self->_Set(Field => 'Started',
-		    Value => $now->ISO,
-		    RecordTransaction => 0);
-    }
-    
-
-    if ($status eq 'resolved') {
-	#When we resolve a ticket, set the 'Resolved' attribute to now.
-	$self->_Set(Field => 'Resolved',
-		    Value => $now->ISO, 
-		    RecordTransaction => 0);
-    }
-    
-    
-    #Actually update the status
-    return($self->_Set(Field => 'Status', 
-		       Value => $status,
-		       TimeTaken => 0,
-		       TransactionType => 'Status'));
-}
 
-# }}}
+=item SetResolved VALUE
 
-# {{{ sub Kill
 
-=head2 Kill
+Set Resolved to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Resolved will be stored as a datetime.)
 
-Takes no arguments. Marks this ticket for garbage collection
 
 =cut
 
-sub Kill {
-  my $self = shift;
-  return ($self->SetStatus('dead'));
-  # TODO: garbage collection
-}
-
-# }}}
 
-# {{{ sub Stall
+=item LastUpdatedBy
 
-=head2 Stall
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
 
-Sets this ticket's status to stalled
 
 =cut
 
-sub Stall {
-  my $self = shift;
-  return ($self->SetStatus('stalled'));
-}
-
-# }}}
 
-# {{{ sub Open
+=item LastUpdated
 
-=head2 Open
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
 
-Sets this ticket\'s status to Open
 
 =cut
 
-sub Open {
-    my $self = shift;
-    return ($self->SetStatus('open'));
-}
-
-# }}}
 
-# {{{ sub Resolve
+=item Creator
 
-=head2 Resolve
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
 
-Sets this ticket\'s status to Resolved
 
 =cut
 
-sub Resolve {
-    my $self = shift;
-    return ($self->SetStatus('resolved'));
-}
-
-# }}}
-
-# }}}
-
-# {{{ Actions + Routines dealing with transactions
 
-# {{{ sub SetTold and _SetTold
+=item Created
 
-=head2 SetTold ISO  [TIMETAKEN]
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
 
-Updates the told and records a transaction
 
 =cut
 
-sub SetTold {
-    my $self=shift;
-    my $told;
-    $told = shift if (@_);
-    my $timetaken=shift || 0;
-   
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	return (0, "Permission Denied");
-    }
-
-    my $datetold = new RT::Date($self->CurrentUser);
-    if ($told) {
-	$datetold->Set( Format => 'iso',
-			Value => $told);
-    }
-    else {
-	 $datetold->SetToNow(); 
-    }
-    
-    return($self->_Set(Field => 'Told', 
-		       Value => $datetold->ISO,
-		       TimeTaken => $timetaken,
-		       TransactionType => 'Told'));
-}
 
-=head2 _SetTold
+=item Disabled
 
-Updates the told without a transaction or acl check. Useful when we're sending replies.
+Returns the current value of Disabled. 
+(In the database, Disabled is stored as smallint(6).)
 
-=cut
 
-sub _SetTold {
-    my $self=shift;
-    
-    my $now = new RT::Date($self->CurrentUser);
-    $now->SetToNow();
-    #use __Set to get no ACLs ;)
-    return($self->__Set(Field => 'Told',
-			Value => $now->ISO));
-}
 
-# }}}
+=item SetDisabled VALUE
 
-# {{{ sub Transactions 
 
-=head2 Transactions
+Set Disabled to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Disabled will be stored as a smallint(6).)
 
-  Returns an RT::Transactions object of all transactions on this ticket
 
 =cut
-  
-sub Transactions {
-    my $self = shift;
-    
-    use RT::Transactions;
-    my $transactions = RT::Transactions->new($self->CurrentUser);
-
-    #If the user has no rights, return an empty object
-    if ($self->CurrentUserHasRight('ShowTicket')) {
-	my $tickets = $transactions->NewAlias('Tickets');
-	$transactions->Join( ALIAS1 => 'main',
-			      FIELD1 => 'Ticket',
-			      ALIAS2 => $tickets,
-			      FIELD2 => 'id');
-	$transactions->Limit( ALIAS => $tickets,
-			      FIELD => 'EffectiveId',
-			      VALUE => $self->id());
-        # if the user may not see comments do not return them
-        unless ($self->CurrentUserHasRight('ShowTicketComments')) {
-            $transactions->Limit( FIELD => 'Type',
-                                  OPERATOR => '!=',
-                                  VALUE => "Comment");
-        }
-    }
-    
-    return($transactions);
-}
-
-# }}}
-
-# {{{ sub _NewTransaction
-
-sub _NewTransaction {
-    my $self = shift;
-    my %args = ( TimeTaken => 0,
-		 Type => undef,
-		 OldValue => undef,
-		 NewValue => undef,
-		 Data => undef,
-		 Field => undef,
-		 MIMEObj => undef,
-		 @_ );
-    
-    
-    require RT::Transaction;
-    my $trans = new RT::Transaction($self->CurrentUser);
-    my ($transaction, $msg) = 
-      $trans->Create( Ticket => $self->Id,
-		      TimeTaken => $args{'TimeTaken'},
-		      Type => $args{'Type'},
-		      Data => $args{'Data'},
-		      Field => $args{'Field'},
-		      NewValue => $args{'NewValue'},
-		      OldValue => $args{'OldValue'},
-		      MIMEObj => $args{'MIMEObj'}
-		    );
-    
-    $RT::Logger->warning($msg) unless $transaction;
-    
-    $self->_SetLastUpdated;
-    
-    if (defined $args{'TimeTaken'} ) {
-	$self->_UpdateTimeTaken($args{'TimeTaken'}); 
-    }
-    return($transaction, $msg, $trans);
-}
 
-# }}}
 
-# }}}
-
-# {{{ PRIVATE UTILITY METHODS. Mostly needed so Ticket can be a DBIx::Record
-
-# {{{ sub _ClassAccessible
 
 sub _ClassAccessible {
     {
-	EffectiveId => { 'read' => 1, 'write' => 1, 'public' => 1 },
-	Queue => { 'read' => 1, 'write' => 1 },
-	Requestors => { 'read' => 1, 'write' => 1 },
-	Owner => { 'read' => 1, 'write' => 1 },
-	Subject => { 'read' => 1, 'write' => 1 },
-	InitialPriority => { 'read' => 1, 'write' => 1 },
-	FinalPriority => { 'read' => 1, 'write' => 1 },
-	Priority => { 'read' => 1, 'write' => 1 },
-	Status => { 'read' => 1, 'write' => 1 },
-	TimeWorked => { 'read' => 1, 'write' => 1 },
-	TimeLeft => { 'read' => 1, 'write' => 1 },
-	Created => { 'read' => 1, 'auto' => 1 },
-	Creator => { 'read' => 1,  'auto' => 1 },
-	Told => { 'read' => 1, 'write' => 1 },
-	Resolved => {'read' => 1},
-	Starts => { 'read' => 1, 'write' => 1 },
-	Started => { 'read' => 1, 'write' => 1 },
-	Due => { 'read' => 1, 'write' => 1 },
-	Creator => { 'read' => 1, 'auto' => 1 },
-	Created => { 'read' => 1, 'auto' => 1 },
-	LastUpdatedBy => { 'read' => 1, 'auto' => 1 },
-	LastUpdated => { 'read' => 1, 'auto' => 1 }
-    };
-
-}    
-
-# }}}
-
-# {{{ sub _Set
-
-sub _Set {
-    my $self = shift;
-    
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	return (0, "Permission Denied");
-    }
-    
-    my %args = (Field => undef,
-		Value => undef,
-		TimeTaken => 0,
-		RecordTransaction => 1,
-		TransactionType => 'Set',
-		@_
-	       );
-    #if the user is trying to modify the record
-    
-    #Take care of the old value we really don't want to get in an ACL loop.
-    # so ask the super::_Value
-    my $Old=$self->SUPER::_Value("$args{'Field'}");
-    
-    #Set the new value
-    my ($ret, $msg)=$self->SUPER::_Set(Field => $args{'Field'}, 
-				       Value=> $args{'Value'});
-    
-    #If we can't actually set the field to the value, don't record
-    # a transaction. instead, get out of here.
-    if ($ret==0) {return (0,$msg);}
-    
-    if ($args{'RecordTransaction'} == 1) {
-	
-	my ($Trans, $Msg, $TransObj) =	
-	  $self->_NewTransaction(Type => $args{'TransactionType'},
-				 Field => $args{'Field'},
-				 NewValue => $args{'Value'},
-				 OldValue =>  $Old,
-				 TimeTaken => $args{'TimeTaken'},
-				);
-      return ($Trans,$TransObj->Description);
-    }
-    else {
-	return ($ret, $msg);
-  }
-}
-
-# }}}
-
-# {{{ sub _Value 
-
-=head2 _Value
-
-Takes the name of a table column.
-Returns its value as a string, if the user passes an ACL check
-
-=cut
-
-sub _Value  {
-
-  my $self = shift;
-  my $field = shift;
-
-  
-  #if the field is public, return it.
-  if ($self->_Accessible($field, 'public')) {
-      #$RT::Logger->debug("Skipping ACL check for $field\n");
-      return($self->SUPER::_Value($field));
-      
-  }
-  
-  #If the current user doesn't have ACLs, don't let em at it.  
-  
-  unless ($self->CurrentUserHasRight('ShowTicket')) {
-      return (undef);
-  }
-  return($self->SUPER::_Value($field));
-  
-}
-
-# }}}
-
-# {{{ sub _UpdateTimeTaken
-
-=head2 _UpdateTimeTaken
-
-This routine will increment the timeworked counter. it should
-only be called from _NewTransaction 
-
-=cut
-
-sub _UpdateTimeTaken {
-  my $self = shift;
-  my $Minutes = shift;
-  my ($Total);
-   
-  $Total = $self->SUPER::_Value("TimeWorked");
-  $Total = ($Total || 0) + ($Minutes || 0);
-  $self->SUPER::_Set(Field => "TimeWorked", 
-		     Value => $Total);
-
-  return ($Total);
-}
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        EffectiveId => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Queue => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Type => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        IssueStatement => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Resolution => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Owner => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Subject => 
+		{read => 1, write => 1, type => 'varchar(200)', default => '[no subject]'},
+        InitialPriority => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        FinalPriority => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Priority => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        TimeEstimated => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        TimeWorked => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Status => 
+		{read => 1, write => 1, type => 'varchar(10)', default => ''},
+        TimeLeft => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Told => 
+		{read => 1, write => 1, type => 'datetime', default => ''},
+        Starts => 
+		{read => 1, write => 1, type => 'datetime', default => ''},
+        Started => 
+		{read => 1, write => 1, type => 'datetime', default => ''},
+        Due => 
+		{read => 1, write => 1, type => 'datetime', default => ''},
+        Resolved => 
+		{read => 1, write => 1, type => 'datetime', default => ''},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        Disabled => 
+		{read => 1, write => 1, type => 'smallint(6)', default => '0'},
+
+ }
+};
 
-# }}}
 
-# }}}
+        eval "require RT::Ticket_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Ticket_Overlay.pm}) {
+            die $@;
+        };
 
-# {{{ Routines dealing with ACCESS CONTROL
+        eval "require RT::Ticket_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Ticket_Vendor.pm}) {
+            die $@;
+        };
 
-# {{{ sub CurrentUserHasRight 
+        eval "require RT::Ticket_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Ticket_Local.pm}) {
+            die $@;
+        };
 
-=head2 CurrentUserHasRight
 
-  Takes the textual name of a Ticket scoped right (from RT::ACE) and returns
-1 if the user has that right. It returns 0 if the user doesn't have that right.
 
-=cut
 
-sub CurrentUserHasRight {
-  my $self = shift;
-  my $right = shift;
-  
-  return ($self->HasRight( Principal=> $self->CurrentUser->UserObj(),
-			    Right => "$right"));
+=head1 SEE ALSO
 
-}
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
-# }}}
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-# {{{ sub HasRight 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
-=head2 HasRight
+   no warnings qw(redefine);
 
- Takes a paramhash with the attributes 'Right' and 'Principal'
-  'Right' is a ticket-scoped textual right from RT::ACE 
-  'Principal' is an RT::User object
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
-  Returns 1 if the principal has the right. Returns undef if not.
+RT::Ticket_Overlay, RT::Ticket_Vendor, RT::Ticket_Local
 
 =cut
 
-sub HasRight {
-    my $self = shift;
-    my %args = ( Right => undef,
-		 Principal => undef,
-		 @_);
-    
-    unless ((defined $args{'Principal'}) and (ref($args{'Principal'}))) {
-	$RT::Logger->warning("Principal attrib undefined for Ticket::HasRight");
-    }
-    
-    return($args{'Principal'}->HasQueueRight(TicketObj => $self,
-					     Right => $args{'Right'}));
-}
-
-# }}}
-
-# }}}
-
 
 1;
-
-=head1 AUTHOR
-
-Jesse Vincent, jesse@fsck.com
-
-=head1 SEE ALSO
-
-RT
-
-=cut
-
-
diff --git a/rt/lib/RT/TicketCustomFieldValue.pm b/rt/lib/RT/TicketCustomFieldValue.pm
new file mode 100644
index 000000000..862a5dc13
--- /dev/null
+++ b/rt/lib/RT/TicketCustomFieldValue.pm
@@ -0,0 +1,286 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
+
+=head1 NAME
+
+RT::TicketCustomFieldValue
+
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=cut
+
+package RT::TicketCustomFieldValue;
+use RT::Record; 
+use RT::CustomField;
+use RT::Ticket;
+
+
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
+
+sub _Init {
+  my $self = shift; 
+
+  $self->Table('TicketCustomFieldValues');
+  $self->SUPER::_Init(@_);
+}
+
+
+
+
+
+=item Create PARAMHASH
+
+Create takes a hash of values and creates a row in the database:
+
+  int(11) 'Ticket'.
+  int(11) 'CustomField'.
+  varchar(255) 'Content'.
+
+=cut
+
+
+
+
+sub Create {
+    my $self = shift;
+    my %args = ( 
+                Ticket => '0',
+                CustomField => '0',
+                Content => '',
+
+		  @_);
+    $self->SUPER::Create(
+                         Ticket => $args{'Ticket'},
+                         CustomField => $args{'CustomField'},
+                         Content => $args{'Content'},
+);
+
+}
+
+
+
+=item id
+
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
+
+
+=cut
+
+
+=item Ticket
+
+Returns the current value of Ticket. 
+(In the database, Ticket is stored as int(11).)
+
+
+
+=item SetTicket VALUE
+
+
+Set Ticket to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Ticket will be stored as a int(11).)
+
+
+=cut
+
+
+=item TicketObj
+
+Returns the Ticket Object which has the id returned by Ticket
+
+
+=cut
+
+sub TicketObj {
+	my $self = shift;
+	my $Ticket =  RT::Ticket->new($self->CurrentUser);
+	$Ticket->Load($self->__Value('Ticket'));
+	return($Ticket);
+}
+
+=item CustomField
+
+Returns the current value of CustomField. 
+(In the database, CustomField is stored as int(11).)
+
+
+
+=item SetCustomField VALUE
+
+
+Set CustomField to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, CustomField will be stored as a int(11).)
+
+
+=cut
+
+
+=item CustomFieldObj
+
+Returns the CustomField Object which has the id returned by CustomField
+
+
+=cut
+
+sub CustomFieldObj {
+	my $self = shift;
+	my $CustomField =  RT::CustomField->new($self->CurrentUser);
+	$CustomField->Load($self->__Value('CustomField'));
+	return($CustomField);
+}
+
+=item Content
+
+Returns the current value of Content. 
+(In the database, Content is stored as varchar(255).)
+
+
+
+=item SetContent VALUE
+
+
+Set Content to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Content will be stored as a varchar(255).)
+
+
+=cut
+
+
+=item Creator
+
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
+
+
+=cut
+
+
+=item Created
+
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
+
+
+=cut
+
+
+=item LastUpdatedBy
+
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
+
+
+=cut
+
+
+=item LastUpdated
+
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
+
+
+=cut
+
+
+
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        Ticket => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        CustomField => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Content => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+
+ }
+};
+
+
+        eval "require RT::TicketCustomFieldValue_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/TicketCustomFieldValue_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::TicketCustomFieldValue_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/TicketCustomFieldValue_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::TicketCustomFieldValue_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/TicketCustomFieldValue_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::TicketCustomFieldValue_Overlay, RT::TicketCustomFieldValue_Vendor, RT::TicketCustomFieldValue_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/TicketCustomFieldValue_Overlay.pm b/rt/lib/RT/TicketCustomFieldValue_Overlay.pm
new file mode 100644
index 000000000..c395ecac4
--- /dev/null
+++ b/rt/lib/RT/TicketCustomFieldValue_Overlay.pm
@@ -0,0 +1,52 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+use strict;
+no warnings qw(redefine);
+
+
+
+=head2 LoadByTicketContentAndCustomField { Ticket => TICKET, CustomField => CUSTOMFIELD, Content => CONTENT }
+
+Loads a custom field value by Ticket, Content and which CustomField it's tied to
+
+=cut
+
+
+sub LoadByTicketContentAndCustomField {
+    my $self = shift;
+    my %args = ( Ticket => undef,
+                CustomField => undef,
+                Content => undef,
+                @_
+                );
+
+
+    $self->LoadByCols( Content => $args{'Content'},
+                         CustomField => $args{'CustomField'},
+                         Ticket => $args{'Ticket'});
+
+    
+}
+
+1;
diff --git a/rt/lib/RT/TicketCustomFieldValues.pm b/rt/lib/RT/TicketCustomFieldValues.pm
new file mode 100644
index 000000000..f137f5375
--- /dev/null
+++ b/rt/lib/RT/TicketCustomFieldValues.pm
@@ -0,0 +1,115 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
+
+=head1 NAME
+
+  RT::TicketCustomFieldValues -- Class Description
+ 
+=head1 SYNOPSIS
+
+  use RT::TicketCustomFieldValues
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=cut
+
+package RT::TicketCustomFieldValues;
+
+use RT::SearchBuilder;
+use RT::TicketCustomFieldValue;
+
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
+
+
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'TicketCustomFieldValues';
+    $self->{'primary_key'} = 'id';
+
+
+    return ( $self->SUPER::_Init(@_) );
+}
+
+
+=item NewItem
+
+Returns an empty new RT::TicketCustomFieldValue item
+
+=cut
+
+sub NewItem {
+    my $self = shift;
+    return(RT::TicketCustomFieldValue->new($self->CurrentUser));
+}
+
+        eval "require RT::TicketCustomFieldValues_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/TicketCustomFieldValues_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::TicketCustomFieldValues_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/TicketCustomFieldValues_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::TicketCustomFieldValues_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/TicketCustomFieldValues_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::TicketCustomFieldValues_Overlay, RT::TicketCustomFieldValues_Vendor, RT::TicketCustomFieldValues_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/TicketCustomFieldValues_Overlay.pm b/rt/lib/RT/TicketCustomFieldValues_Overlay.pm
new file mode 100644
index 000000000..5777c37e3
--- /dev/null
+++ b/rt/lib/RT/TicketCustomFieldValues_Overlay.pm
@@ -0,0 +1,86 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+use strict;
+no warnings qw(redefine);
+
+# {{{ sub LimitToCustomField
+
+=head2 LimitToCustomField FIELD
+
+Limits the returned set to values for the custom field with Id FIELD
+
+=cut
+  
+sub LimitToCustomField {
+    my $self = shift;
+    my $cf = shift;
+    return ($self->Limit( FIELD => 'CustomField',
+			  VALUE => $cf,
+			  OPERATOR => '='));
+
+}
+
+# }}}
+
+# {{{ sub LimitToTicket
+
+=head2 LimitToTicket TICKETID
+
+Limits the returned set to values for the ticket with Id TICKETID
+
+=cut
+  
+sub LimitToTicket {
+    my $self = shift;
+    my $ticket = shift;
+    return ($self->Limit( FIELD => 'Ticket',
+			  VALUE => $ticket,
+			  OPERATOR => '='));
+
+}
+
+# }}}
+
+
+=sub HasEntry VALUE
+
+Returns true if this CustomFieldValues collection has an entry with content that eq VALUE
+
+=cut
+
+
+sub HasEntry {
+    my $self = shift;
+    my $value = shift;
+
+    #TODO: this could cache and optimize a fair bit.
+    foreach my $item (@{$self->ItemsArrayRef}) {
+        return(1) if ($item->Content eq $value);  
+    }
+    return undef;
+
+}
+
+1;
+
diff --git a/rt/lib/RT/Ticket_Overlay.pm b/rt/lib/RT/Ticket_Overlay.pm
new file mode 100644
index 000000000..c88bbc90f
--- /dev/null
+++ b/rt/lib/RT/Ticket_Overlay.pm
@@ -0,0 +1,4040 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# {{{ Front Material 
+
+=head1 SYNOPSIS
+
+  use RT::Ticket;
+  my $ticket = new RT::Ticket($CurrentUser);
+  $ticket->Load($ticket_id);
+
+=head1 DESCRIPTION
+
+This module lets you manipulate RT\'s ticket object.
+
+
+=head1 METHODS
+
+=begin testing
+
+use_ok ( RT::Queue);
+ok(my $testqueue = RT::Queue->new($RT::SystemUser));
+ok($testqueue->Create( Name => 'ticket tests'));
+ok($testqueue->Id != 0);
+use_ok(RT::CustomField);
+ok(my $testcf = RT::CustomField->new($RT::SystemUser));
+ok($testcf->Create( Name => 'selectmulti',
+                    Queue => $testqueue->id,
+                               Type => 'SelectMultiple'));
+ok($testcf->AddValue ( Name => 'Value1',
+                        SortOrder => '1',
+                        Description => 'A testing value'));
+ok($testcf->AddValue ( Name => 'Value2',
+                        SortOrder => '2',
+                        Description => 'Another testing value'));
+ok($testcf->AddValue ( Name => 'Value3',
+                        SortOrder => '3',
+                        Description => 'Yet Another testing value'));
+                       
+ok($testcf->Values->Count == 3);
+
+use_ok(RT::Ticket);
+
+my $u = RT::User->new($RT::SystemUser);
+$u->Load("root");
+ok ($u->Id, "Found the root user");
+ok(my $t = RT::Ticket->new($RT::SystemUser));
+ok(my ($id, $msg) = $t->Create( Queue => $testqueue->Id,
+               Subject => 'Testing',
+               Owner => $u->Id
+              ));
+ok($id != 0);
+ok ($t->OwnerObj->Id == $u->Id, "Root is the ticket owner");
+ok(my ($cfv, $cfm) =$t->AddCustomFieldValue(Field => $testcf->Id,
+                           Value => 'Value1'));
+ok($cfv != 0, "Custom field creation didn't return an error: $cfm");
+ok($t->CustomFieldValues($testcf->Id)->Count == 1);
+ok($t->CustomFieldValues($testcf->Id)->First &&
+    $t->CustomFieldValues($testcf->Id)->First->Content eq 'Value1');;
+
+ok(my ($cfdv, $cfdm) = $t->DeleteCustomFieldValue(Field => $testcf->Id,
+                        Value => 'Value1'));
+ok ($cfdv != 0, "Deleted a custom field value: $cfdm");
+ok($t->CustomFieldValues($testcf->Id)->Count == 0);
+
+ok(my $t2 = RT::Ticket->new($RT::SystemUser));
+ok($t2->Load($id));
+ok($t2->Subject eq 'Testing');
+ok($t2->QueueObj->Id eq $testqueue->id);
+ok($t2->OwnerObj->Id == $u->Id);
+
+my $t3 = RT::Ticket->new($RT::SystemUser);
+my ($id3, $msg3) = $t3->Create( Queue => $testqueue->Id,
+                                Subject => 'Testing',
+                                Owner => $u->Id);
+my ($cfv1, $cfm1) = $t->AddCustomFieldValue(Field => $testcf->Id,
+ Value => 'Value1');
+ok($cfv1 != 0, "Adding a custom field to ticket 1 is successful: $cfm");
+my ($cfv2, $cfm2) = $t3->AddCustomFieldValue(Field => $testcf->Id,
+ Value => 'Value2');
+ok($cfv2 != 0, "Adding a custom field to ticket 2 is successful: $cfm");
+my ($cfv3, $cfm3) = $t->AddCustomFieldValue(Field => $testcf->Id,
+ Value => 'Value3');
+ok($cfv3 != 0, "Adding a custom field to ticket 1 is successful: $cfm");
+ok($t->CustomFieldValues($testcf->Id)->Count == 2,
+   "This ticket has 2 custom field values");
+ok($t3->CustomFieldValues($testcf->Id)->Count == 1,
+   "This ticket has 1 custom field value");
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+use RT::Queue;
+use RT::User;
+use RT::Record;
+use RT::Links;
+use RT::Date;
+use RT::CustomFields;
+use RT::TicketCustomFieldValues;
+use RT::Tickets;
+use RT::URI::fsck_com_rt;
+use RT::URI;
+
+=begin testing
+
+
+ok(require RT::Ticket, "Loading the RT::Ticket library");
+
+=end testing
+
+=cut
+
+# }}}
+
+# {{{ LINKTYPEMAP
+# A helper table for relationships mapping to make it easier
+# to build and parse links between tickets
+
+use vars '%LINKTYPEMAP';
+
+%LINKTYPEMAP = (
+    MemberOf => { Type => 'MemberOf',
+                  Mode => 'Target', },
+    Members => { Type => 'MemberOf',
+                 Mode => 'Base', },
+    HasMember => { Type => 'MemberOf',
+                   Mode => 'Base', },
+    RefersTo => { Type => 'RefersTo',
+                  Mode => 'Target', },
+    ReferredToBy => { Type => 'RefersTo',
+                      Mode => 'Base', },
+    DependsOn => { Type => 'DependsOn',
+                   Mode => 'Target', },
+    DependedOnBy => { Type => 'DependsOn',
+                      Mode => 'Base', },
+
+);
+
+# }}}
+
+# {{{ LINKDIRMAP
+# A helper table for relationships mapping to make it easier
+# to build and parse links between tickets
+
+use vars '%LINKDIRMAP';
+
+%LINKDIRMAP = (
+    MemberOf => { Base => 'MemberOf',
+                  Target => 'HasMember', },
+    RefersTo => { Base => 'RefersTo',
+                Target => 'ReferredToBy', },
+    DependsOn => { Base => 'DependsOn',
+                   Target => 'DependedOnBy', },
+
+);
+
+# }}}
+
+# {{{ sub Load
+
+=head2 Load
+
+Takes a single argument. This can be a ticket id, ticket alias or 
+local ticket uri.  If the ticket can't be loaded, returns undef.
+Otherwise, returns the ticket id.
+
+=cut
+
+sub Load {
+    my $self = shift;
+    my $id   = shift;
+
+    #TODO modify this routine to look at EffectiveId and do the recursive load
+    # thing. be careful to cache all the interim tickets we try so we don't loop forever.
+
+    #If it's a local URI, turn it into a ticket id
+    if ( $id =~ /^$RT::TicketBaseURI(\d+)$/ ) {
+        $id = $1;
+    }
+
+    #If it's a remote URI, we're going to punt for now
+    elsif ( $id =~ '://' ) {
+        return (undef);
+    }
+
+    #If we have an integer URI, load the ticket
+    if ( $id =~ /^\d+$/ ) {
+        my $ticketid = $self->LoadById($id);
+
+        unless ($ticketid) {
+            $RT::Logger->debug("$self tried to load a bogus ticket: $id\n");
+            return (undef);
+        }
+    }
+
+    #It's not a URI. It's not a numerical ticket ID. Punt!
+    else {
+        return (undef);
+    }
+
+    #If we're merged, resolve the merge.
+    if ( ( $self->EffectiveId ) and ( $self->EffectiveId != $self->Id ) ) {
+        return ( $self->Load( $self->EffectiveId ) );
+    }
+
+    #Ok. we're loaded. lets get outa here.
+    return ( $self->Id );
+
+}
+
+# }}}
+
+# {{{ sub LoadByURI
+
+=head2 LoadByURI
+
+Given a local ticket URI, loads the specified ticket.
+
+=cut
+
+sub LoadByURI {
+    my $self = shift;
+    my $uri  = shift;
+
+    if ( $uri =~ /^$RT::TicketBaseURI(\d+)$/ ) {
+        my $id = $1;
+        return ( $self->Load($id) );
+    }
+    else {
+        return (undef);
+    }
+}
+
+# }}}
+
+# {{{ sub Create
+
+=head2 Create (ARGS)
+
+Arguments: ARGS is a hash of named parameters.  Valid parameters are:
+
+  id 
+  Queue  - Either a Queue object or a Queue Name
+  Requestor -  A reference to a list of RT::User objects, email addresses or RT user Names
+  Cc  - A reference to a list of RT::User objects, email addresses or Names
+  AdminCc  - A reference to a  list of RT::User objects, email addresses or Names
+  Type -- The ticket\'s type. ignore this for now
+  Owner -- This ticket\'s owner. either an RT::User object or this user\'s id
+  Subject -- A string describing the subject of the ticket
+  InitialPriority -- an integer from 0 to 99
+  FinalPriority -- an integer from 0 to 99
+  Status -- any valid status (Defined in RT::Queue)
+  TimeEstimated -- an integer. estimated time for this task in minutes
+  TimeWorked -- an integer. time worked so far in minutes
+  TimeLeft -- an integer. time remaining in minutes
+  Starts -- an ISO date describing the ticket\'s start date and time in GMT
+  Due -- an ISO date describing the ticket\'s due date and time in GMT
+  MIMEObj -- a MIME::Entity object with the content of the initial ticket request.
+  CustomField-<n> -- a scalar or array of values for the customfield with the id <n>
+
+
+Returns: TICKETID, Transaction Object, Error Message
+
+
+=begin testing
+
+my $t = RT::Ticket->new($RT::SystemUser);
+
+ok( $t->Create(Queue => 'General', Due => '2002-05-21 00:00:00', ReferredToBy => 'http://www.cpan.org', RefersTo => 'http://fsck.com', Subject => 'This is a subject'), "Ticket Created");
+
+ok ( my $id = $t->Id, "Got ticket id");
+ok ($t->RefersTo->First->Target =~ /fsck.com/, "Got refers to");
+ok ($t->ReferredToBy->First->Base =~ /cpan.org/, "Got referredtoby");
+ok ($t->ResolvedObj->Unix == -1, "It hasn't been resolved - ". $t->ResolvedObj->Unix);
+
+=end testing
+
+=cut
+
+sub Create {
+    my $self = shift;
+
+    my %args = ( id              => undef,
+                 Queue           => undef,
+                 Requestor       => undef,
+                 Cc              => undef,
+                 AdminCc         => undef,
+                 Type            => 'ticket',
+                 Owner           => undef,
+                 Subject         => '',
+                 InitialPriority => undef,
+                 FinalPriority   => undef,
+                 Status          => 'new',
+                 TimeWorked      => "0",
+                 TimeLeft        => 0,
+                 TimeEstimated        => 0,
+                 Due             => undef,
+                 Starts          => undef,
+                 Started         => undef,
+                 Resolved        => undef,
+                 MIMEObj         => undef,
+                 _RecordTransaction => 1,
+                 
+
+
+                 @_ );
+
+    my ( $ErrStr, $Owner, $resolved );
+    my (@non_fatal_errors);
+
+    my $QueueObj = RT::Queue->new($RT::SystemUser);
+
+    
+    if ( ( defined( $args{'Queue'} ) ) && ( !ref( $args{'Queue'} ) ) ) {
+        $QueueObj->Load( $args{'Queue'} );
+    }
+    elsif ( ref( $args{'Queue'} ) eq 'RT::Queue' ) {
+        $QueueObj->Load( $args{'Queue'}->Id );
+    }
+    else {
+        $RT::Logger->debug( $args{'Queue'} . " not a recognised queue object.");
+    }
+;
+
+    #Can't create a ticket without a queue.
+    unless ( defined($QueueObj) && $QueueObj->Id ) {
+        $RT::Logger->debug("$self No queue given for ticket creation.");
+        return ( 0, 0, $self->loc('Could not create ticket. Queue not set') );
+    }
+
+    #Now that we have a queue, Check the ACLS
+    unless ( $self->CurrentUser->HasRight( Right    => 'CreateTicket',
+                                                Object => $QueueObj )
+      ) {
+        return ( 0, 0,
+                 $self->loc( "No permission to create tickets in the queue '[_1]'", $QueueObj->Name ) );
+    }
+
+    unless ( $QueueObj->IsValidStatus( $args{'Status'} ) ) {
+        return ( 0, 0, $self->loc('Invalid value for status') );
+    }
+
+
+    #Since we have a queue, we can set queue defaults
+    #Initial Priority
+
+    # If there's no queue default initial priority and it's not set, set it to 0
+    $args{'InitialPriority'} = ( $QueueObj->InitialPriority || 0 )
+      unless ( defined $args{'InitialPriority'} );
+
+    #Final priority 
+
+    # If there's no queue default final priority and it's not set, set it to 0
+    $args{'FinalPriority'} = ( $QueueObj->FinalPriority || 0 )
+      unless ( defined $args{'FinalPriority'} );
+
+    # {{{ Dates
+    #TODO we should see what sort of due date we're getting, rather +
+    # than assuming it's in ISO format.
+
+    #Set the due date. if we didn't get fed one, use the queue default due in
+    my $Due = new RT::Date( $self->CurrentUser );
+
+    if ( $args{'Due'} ) {
+        $Due->Set( Format => 'ISO', Value  => $args{'Due'} );
+    }
+    elsif (  $QueueObj->DefaultDueIn  ) {
+        $Due->SetToNow;
+        $Due->AddDays( $QueueObj->DefaultDueIn );
+    }
+
+    my $Starts = new RT::Date( $self->CurrentUser );
+    if ( defined $args{'Starts'} ) {
+        $Starts->Set( Format => 'ISO', Value  => $args{'Starts'} );
+    }
+
+    my $Started = new RT::Date( $self->CurrentUser );
+    if ( defined $args{'Started'} ) {
+        $Started->Set( Format => 'ISO', Value  => $args{'Started'} );
+    }
+
+    my $Resolved = new RT::Date( $self->CurrentUser );
+    if ( defined $args{'Resolved'} ) {
+        $Resolved->Set( Format => 'ISO', Value  => $args{'Resolved'} );
+    }
+
+
+    #If the status is an inactive status, set the resolved date
+    if ($QueueObj->IsInactiveStatus($args{'Status'}) && !$args{'Resolved'}) {
+        $RT::Logger->debug("Got a ".$args{'Status'} . "ticket with a resolved of ".$args{'Resolved'});
+        $Resolved->SetToNow;
+    }
+
+    # }}}
+
+    # {{{ Dealing with time fields
+
+    $args{'TimeEstimated'} = 0 unless defined $args{'TimeEstimated'};
+    $args{'TimeWorked'}    = 0 unless defined $args{'TimeWorked'};
+    $args{'TimeLeft'}      = 0 unless defined $args{'TimeLeft'};
+
+    # }}}
+
+    # {{{ Deal with setting the owner
+
+    if ( ref( $args{'Owner'} ) eq 'RT::User' ) {
+        $Owner = $args{'Owner'};
+    }
+
+    #If we've been handed something else, try to load the user.
+    elsif ( defined $args{'Owner'} ) {
+        $Owner = RT::User->new( $self->CurrentUser );
+        $Owner->Load( $args{'Owner'} );
+
+    }
+
+    #If we have a proposed owner and they don't have the right 
+    #to own a ticket, scream about it and make them not the owner
+    if (     ( defined($Owner) )
+         and ( $Owner->Id )
+         and ( $Owner->Id != $RT::Nobody->Id )
+         and ( !$Owner->HasRight( Object => $QueueObj,
+                                       Right    => 'OwnTicket' ) )
+      ) {
+
+        $RT::Logger->warning( "User "
+                              . $Owner->Name . "("
+                              . $Owner->id
+                              . ") was proposed "
+                              . "as a ticket owner but has no rights to own "
+                              . "tickets in ".$QueueObj->Name );
+
+        push @non_fatal_errors, $self->loc("Invalid owner. Defaulting to 'nobody'.");
+
+        $Owner = undef;
+    }
+
+    #If we haven't been handed a valid owner, make it nobody.
+    unless ( defined($Owner) && $Owner->Id ) {
+        $Owner = new RT::User( $self->CurrentUser );
+        $Owner->Load( $RT::Nobody->Id );
+    }
+
+    # }}}
+
+    # We attempt to load or create each of the people who might have a role for this ticket
+    # _outside_ the transaction, so we don't get into ticket creation races
+    foreach my $type ( "Cc", "AdminCc", "Requestor" ) {
+     next unless (defined $args{$type});
+        foreach my $watcher ( ref( $args{$type} ) ? @{ $args{$type} } : ( $args{$type} ) ) {
+        my $user = RT::User->new($RT::SystemUser);
+        $user->LoadOrCreateByEmail($watcher) if ($watcher !~ /^\d+$/);
+        }
+    }
+
+
+    $RT::Handle->BeginTransaction();
+
+    my %params =( Queue           => $QueueObj->Id,
+                                   Owner           => $Owner->Id,
+                                   Subject         => $args{'Subject'},
+                                   InitialPriority => $args{'InitialPriority'},
+                                   FinalPriority   => $args{'FinalPriority'},
+                                   Priority        => $args{'InitialPriority'},
+                                   Status          => $args{'Status'},
+                                   TimeWorked      => $args{'TimeWorked'},
+                                   TimeEstimated   => $args{'TimeEstimated'},
+                                   TimeLeft        => $args{'TimeLeft'},
+                                   Type            => $args{'Type'},
+                                   Starts          => $Starts->ISO,
+                                   Started         => $Started->ISO,
+                                   Resolved        => $Resolved->ISO,
+                                   Due             => $Due->ISO );
+
+    # Parameters passed in during an import that we probably don't want to touch, otherwise
+    foreach my $attr qw(id Creator Created LastUpdated LastUpdatedBy) {
+        $params{$attr} = $args{$attr} if ($args{$attr});
+    }
+
+    # Delete null integer parameters
+    foreach my $attr qw(TimeWorked TimeLeft TimeEstimated InitialPriority FinalPriority) {
+        delete $params{$attr}  unless (exists $params{$attr} && $params{$attr});
+    }
+
+
+    my $id = $self->SUPER::Create( %params);
+    unless ($id) {
+        $RT::Logger->crit( "Couldn't create a ticket");
+        $RT::Handle->Rollback();
+        return ( 0, 0, $self->loc( "Ticket could not be created due to an internal error") );
+    }
+
+    #Set the ticket's effective ID now that we've created it.
+    my ( $val, $msg ) = $self->__Set( Field => 'EffectiveId', Value => $id );
+
+    unless ($val) {
+        $RT::Logger->crit("$self ->Create couldn't set EffectiveId: $msg\n");
+        $RT::Handle->Rollback();
+        return ( 0, 0, $self->loc( "Ticket could not be created due to an internal error") );
+    }
+
+    my $create_groups_ret = $self->_CreateTicketGroups();
+    unless ($create_groups_ret) {
+        $RT::Logger->crit( "Couldn't create ticket groups for ticket "
+                           . $self->Id
+                           . ". aborting Ticket creation." );
+        $RT::Handle->Rollback();
+        return ( 0, 0,
+                 $self->loc( "Ticket could not be created due to an internal error") );
+    }
+
+    # Set the owner in the Groups table
+    # We denormalize it into the Ticket table too because doing otherwise would 
+    # kill performance, bigtime. It gets kept in lockstep thanks to the magic of transactionalization
+
+    $self->OwnerGroup->_AddMember( PrincipalId => $Owner->PrincipalId , InsideTransaction => 1);
+
+    # {{{ Deal with setting up watchers
+
+
+    foreach my $type ( "Cc", "AdminCc", "Requestor" ) {
+        next unless (defined $args{$type});
+        foreach my $watcher ( ref( $args{$type} ) ? @{ $args{$type} } : ( $args{$type} ) ) {
+
+	    # we reason that all-digits number must be a principal id, not email
+	    # this is the only way to can add
+	    my $field = 'Email';
+	    $field = 'PrincipalId' if $watcher =~ /^\d+$/;
+
+	    my ( $wval, $wmsg );
+
+            if ( $type eq 'AdminCc' ) {
+
+                # Note that we're using AddWatcher, rather than _AddWatcher, as we 
+                # actually _want_ that ACL check. Otherwise, random ticket creators
+                # could make themselves adminccs and maybe get ticket rights. that would
+                # be poor
+                ( $wval, $wmsg ) = $self->AddWatcher( Type   => $type,
+                                                         $field => $watcher,
+                                                         Silent => 1 );
+            }
+            else {
+                ( $wval, $wmsg ) = $self->_AddWatcher( Type   => $type,
+                                                          $field => $watcher,
+                                                          Silent => 1 );
+            }
+
+            push @non_fatal_errors, $wmsg unless ($wval);
+        }
+    }
+
+    # }}}
+    # {{{ Deal with setting up links
+
+
+    foreach my $type ( keys %LINKTYPEMAP ) {
+        next unless (defined $args{$type});
+        foreach my $link (
+            ref( $args{$type} ) ? @{ $args{$type} } : ( $args{$type} ) )
+        {
+            my ( $wval, $wmsg ) = $self->AddLink(
+                Type                          => $LINKTYPEMAP{$type}->{'Type'},
+                $LINKTYPEMAP{$type}->{'Mode'} => $link,
+                Silent                        => 1
+            );
+
+            push @non_fatal_errors, $wmsg unless ($wval);
+        }
+    }
+
+    # }}}
+
+   # {{{ Add all the custom fields 
+
+    foreach my $arg ( keys %args ) {
+    next unless ( $arg =~ /^CustomField-(\d+)$/i );
+    my $cfid = $1;
+    foreach
+      my $value ( ref( $args{$arg} ) ? @{ $args{$arg} } : ( $args{$arg} ) ) {
+        next unless ($value);
+        $self->_AddCustomFieldValue( Field => $cfid,
+                                     Value => $value,
+                                     RecordTransaction => 0
+                                 );
+    }
+    }
+    # }}}
+
+    if ( $args{'_RecordTransaction'} ) {
+        # {{{ Add a transaction for the create
+        my ( $Trans, $Msg, $TransObj ) = $self->_NewTransaction(
+                                                     Type      => "Create",
+                                                     TimeTaken => 0,
+                                                     MIMEObj => $args{'MIMEObj'}
+        );
+
+
+        if ( $self->Id && $Trans ) {
+            $ErrStr = $self->loc( "Ticket [_1] created in queue '[_2]'", $self->Id, $QueueObj->Name );
+            $ErrStr = join ( "\n", $ErrStr, @non_fatal_errors );
+
+            $RT::Logger->info("Ticket ".$self->Id. " created in queue '".$QueueObj->Name."' by ".$self->CurrentUser->Name);
+        }
+        else {
+            $RT::Handle->Rollback();
+
+            # TODO where does this get errstr from?
+            $RT::Logger->error("Ticket couldn't be created: $ErrStr");
+            return ( 0, 0, $self->loc( "Ticket could not be created due to an internal error"));
+        }
+
+        $RT::Handle->Commit();
+        return ( $self->Id, $TransObj->Id, $ErrStr );
+        # }}}
+    }
+    else {
+
+        # Not going to record a transaction
+        $RT::Handle->Commit();
+        $ErrStr = $self->loc( "Ticket [_1] created in queue '[_2]'", $self->Id, $QueueObj->Name );
+        $ErrStr = join ( "\n", $ErrStr, @non_fatal_errors );
+        return ( $self->Id, $0, $ErrStr );
+
+    }
+}
+
+
+# }}}
+
+# {{{ sub CreateFromEmailMessage
+
+
+=head2 CreateFromEmailMessage { Message, Queue, ExtractActorFromHeaders } 
+
+This code replaces what was once a large part of the email gateway.
+It takes an email message as a parameter, parses out the sender, subject
+and a MIME object. It then creates a ticket based on those attributes
+
+=cut
+
+sub CreateFromEmailMessage {
+    my $self = shift;
+    my %args = ( Message => undef,
+                 Queue => undef,
+                 ExtractActorFromSender => undef,
+                 @_ );
+
+    
+    # Pull out requestor
+
+    # Pull out Cc?
+
+    # 
+
+
+}
+
+# }}}
+
+
+# {{{ CreateFrom822
+
+=head2 FORMAT
+
+CreateTickets uses the template as a template for an ordered set of tickets 
+to create. The basic format is as follows:
+
+
+ ===Create-Ticket: identifier
+ Param: Value
+ Param2: Value
+ Param3: Value
+ Content: Blah
+ blah
+ blah
+ ENDOFCONTENT
+=head2 Acceptable fields
+
+A complete list of acceptable fields for this beastie:
+
+
+    *  Queue           => Name or id# of a queue
+       Subject         => A text string
+       Status          => A valid status. defaults to 'new'
+
+       Due             => Dates can be specified in seconds since the epoch
+                          to be handled literally or in a semi-free textual
+                          format which RT will attempt to parse.
+       Starts          => 
+       Started         => 
+       Resolved        => 
+       Owner           => Username or id of an RT user who can and should own 
+                          this ticket
+   +   Requestor       => Email address
+   +   Cc              => Email address 
+   +   AdminCc         => Email address 
+       TimeWorked      => 
+       TimeEstimated   => 
+       TimeLeft        => 
+       InitialPriority => 
+       FinalPriority   => 
+       Type            => 
+    +  DependsOn       => 
+    +  DependedOnBy    =>
+    +  RefersTo        =>
+    +  ReferredToBy    => 
+    +  Members         =>
+    +  MemberOf        => 
+       Content         => content. Can extend to multiple lines. Everything
+                          within a template after a Content: header is treated
+                          as content until we hit a line containing only 
+                          ENDOFCONTENT
+       ContentType     => the content-type of the Content field
+       CustomField-<id#> => custom field value
+
+Fields marked with an * are required.
+
+Fields marked with a + man have multiple values, simply
+by repeating the fieldname on a new line with an additional value.
+
+
+When parsed, field names are converted to lowercase and have -s stripped.
+Refers-To, RefersTo, refersto, refers-to and r-e-f-er-s-tO will all 
+be treated as the same thing.
+
+
+=begin testing
+
+use_ok(RT::Ticket);
+
+=end testing
+
+
+=cut
+
+sub CreateFrom822 {
+    my $self    = shift;
+    my $content = shift;
+
+
+
+    my %args = $self->_Parse822HeadersForAttributes($content);
+
+    # Now we have a %args to work with.
+    # Make sure we have at least the minimum set of
+    # reasonable data and do our thang
+    my $ticket = RT::Ticket->new($RT::SystemUser);
+
+    my %ticketargs = (
+        Queue           => $args{'queue'},
+        Subject         => $args{'subject'},
+        Status          => $args{'status'},
+        Due             => $args{'due'},
+        Starts          => $args{'starts'},
+        Started         => $args{'started'},
+        Resolved        => $args{'resolved'},
+        Owner           => $args{'owner'},
+        Requestor       => $args{'requestor'},
+        Cc              => $args{'cc'},
+        AdminCc         => $args{'admincc'},
+        TimeWorked      => $args{'timeworked'},
+        TimeEstimated   => $args{'timeestimated'},
+        TimeLeft        => $args{'timeleft'},
+        InitialPriority => $args{'initialpriority'},
+        FinalPriority   => $args{'finalpriority'},
+        Type            => $args{'type'},
+        DependsOn       => $args{'dependson'},
+        DependedOnBy    => $args{'dependedonby'},
+        RefersTo        => $args{'refersto'},
+        ReferredToBy    => $args{'referredtoby'},
+        Members         => $args{'members'},
+        MemberOf        => $args{'memberof'},
+        MIMEObj         => $args{'mimeobj'}
+    );
+
+    # Add custom field entries to %ticketargs.
+    # TODO: allow named custom fields
+    map {
+        /^customfield-(\d+)$/
+          && ( $ticketargs{ "CustomField-" . $1 } = $args{$_} );
+    } keys(%args);
+
+    my ( $id, $transid, $msg ) = $ticket->Create(%ticketargs);
+    unless ($id) {
+        $RT::Logger->error( "Couldn't create a related ticket for "
+              . $self->TicketObj->Id . " "
+              . $msg );
+    }
+
+    return (1);
+}
+
+# }}}
+
+# {{{ UpdateFrom822 
+
+=head2 UpdateFrom822 $MESSAGE
+
+Takes an RFC822 format message as a string and uses it to make a bunch of changes to a ticket.
+Returns an um. ask me again when the code exists
+
+
+=begin testing
+
+my $simple_update = <<EOF;
+Subject: target
+AddRequestor: jesse\@example.com
+EOF
+
+my $ticket = RT::Ticket->new($RT::SystemUser);
+$ticket->Create(Subject => 'first', Queue => 'general');
+ok($ticket->Id, "Created the test ticket");
+$ticket->UpdateFrom822($simple_update);
+is($ticket->Subject, 'target', "changed the subject");
+my $jesse = RT::User->new($RT::SystemUser);
+$jesse->LoadByEmail('jesse@example.com');
+ok ($jesse->Id, "There's a user for jesse");
+ok($ticket->Requestors->HasMember( $jesse->PrincipalObj), "It has the jesse principal object as a requestor ");
+
+=end testing
+
+
+=cut
+
+sub UpdateFrom822 {
+        my $self = shift;
+        my $content = shift;
+        my %args = $self->_Parse822HeadersForAttributes($content);
+
+        
+    my %ticketargs = (
+        Queue           => $args{'queue'},
+        Subject         => $args{'subject'},
+        Status          => $args{'status'},
+        Due             => $args{'due'},
+        Starts          => $args{'starts'},
+        Started         => $args{'started'},
+        Resolved        => $args{'resolved'},
+        Owner           => $args{'owner'},
+        Requestor       => $args{'requestor'},
+        Cc              => $args{'cc'},
+        AdminCc         => $args{'admincc'},
+        TimeWorked      => $args{'timeworked'},
+        TimeEstimated   => $args{'timeestimated'},
+        TimeLeft        => $args{'timeleft'},
+        InitialPriority => $args{'initialpriority'},
+        Priority => $args{'priority'},
+        FinalPriority   => $args{'finalpriority'},
+        Type            => $args{'type'},
+        DependsOn       => $args{'dependson'},
+        DependedOnBy    => $args{'dependedonby'},
+        RefersTo        => $args{'refersto'},
+        ReferredToBy    => $args{'referredtoby'},
+        Members         => $args{'members'},
+        MemberOf        => $args{'memberof'},
+        MIMEObj         => $args{'mimeobj'}
+    );
+
+    foreach my $type qw(Requestor Cc Admincc) {
+
+        foreach my $action ( 'Add', 'Del', '' ) {
+
+            my $lctag = lc($action) . lc($type);
+            foreach my $list ( $args{$lctag}, $args{ $lctag . 's' } ) {
+
+                foreach my $entry ( ref($list) ? @{$list} : ($list) ) {
+                    push @{$ticketargs{ $action . $type }} , split ( /\s*,\s*/, $entry );
+                }
+
+            }
+
+            # Todo: if we're given an explicit list, transmute it into a list of adds/deletes
+
+        }
+    }
+
+    # Add custom field entries to %ticketargs.
+    # TODO: allow named custom fields
+    map {
+        /^customfield-(\d+)$/
+          && ( $ticketargs{ "CustomField-" . $1 } = $args{$_} );
+    } keys(%args);
+
+# for each ticket we've been told to update, iterate through the set of
+# rfc822 headers and perform that update to the ticket.
+
+
+    # {{{ Set basic fields 
+    my @attribs = qw(
+      Subject
+      FinalPriority
+      Priority
+      TimeEstimated
+      TimeWorked
+      TimeLeft
+      Status
+      Queue
+      Type
+    );
+
+
+    # Resolve the queue from a name to a numeric id.
+    if ( $ticketargs{'Queue'} and ( $ticketargs{'Queue'} !~ /^(\d+)$/ ) ) {
+        my $tempqueue = RT::Queue->new($RT::SystemUser);
+        $tempqueue->Load( $ticketargs{'Queue'} );
+        $ticketargs{'Queue'} = $tempqueue->Id() if ( $tempqueue->id );
+    }
+
+    # die "updaterecordobject is a webui thingy";
+    my @results;
+
+    foreach my $attribute (@attribs) {
+        my $value = $ticketargs{$attribute};
+
+        if ( $value ne $self->$attribute() ) {
+
+            my $method = "Set$attribute";
+            my ( $code, $msg ) = $self->$method($value);
+
+            push @results, $self->loc($attribute) . ': ' . $msg;
+
+        }
+    }
+
+    # We special case owner changing, so we can use ForceOwnerChange
+    if ( $ticketargs{'Owner'} && ( $self->Owner != $ticketargs{'Owner'} ) ) {
+        my $ChownType = "Give";
+        $ChownType = "Force" if ( $ticketargs{'ForceOwnerChange'} );
+
+        my ( $val, $msg ) = $self->SetOwner( $ticketargs{'Owner'}, $ChownType );
+        push ( @results, $msg );
+    }
+
+    # }}}
+# Deal with setting watchers
+
+
+# Acceptable arguments:
+#  Requestor
+#  Requestors
+#  AddRequestor
+#  AddRequestors
+#  DelRequestor
+ 
+ foreach my $type qw(Requestor Cc AdminCc) {
+
+        # If we've been given a number of delresses to del, do it.
+                foreach my $address (@{$ticketargs{'Del'.$type}}) {
+                my ($id, $msg) = $self->DelWatcher( Type => $type, Email => $address);
+                push (@results, $msg) ;
+                }
+
+        # If we've been given a number of addresses to add, do it.
+                foreach my $address (@{$ticketargs{'Add'.$type}}) {
+                $RT::Logger->debug("Adding $address as a $type");
+                my ($id, $msg) = $self->AddWatcher( Type => $type, Email => $address);
+                push (@results, $msg) ;
+
+        }
+
+
+}
+
+
+}
+# }}}
+
+# {{{ _Parse822HeadersForAttributes Content
+
+=head2 _Parse822HeadersForAttributes Content
+
+Takes an RFC822 style message and parses its attributes into a hash.
+
+=cut
+
+sub _Parse822HeadersForAttributes {
+    my $self    = shift;
+    my $content = shift;
+    my %args;
+
+    my @lines = ( split ( /\n/, $content ) );
+    while ( defined( my $line = shift @lines ) ) {
+        if ( $line =~ /^(.*?):(?:\s+(.*))?$/ ) {
+            my $value = $2;
+            my $tag   = lc($1);
+
+            $tag =~ s/-//g;
+            if ( defined( $args{$tag} ) )
+            {    #if we're about to get a second value, make it an array
+                $args{$tag} = [ $args{$tag} ];
+            }
+            if ( ref( $args{$tag} ) )
+            {    #If it's an array, we want to push the value
+                push @{ $args{$tag} }, $value;
+            }
+            else {    #if there's nothing there, just set the value
+                $args{$tag} = $value;
+            }
+        } elsif ($line =~ /^$/) {
+
+            #TODO: this won't work, since "" isn't of the form "foo:value"
+
+                while ( defined( my $l = shift @lines ) ) {
+                    push @{ $args{'content'} }, $l;
+                }
+            }
+        
+    }
+
+    foreach my $date qw(due starts started resolved) {
+        my $dateobj = RT::Date->new($RT::SystemUser);
+        if ( $args{$date} =~ /^\d+$/ ) {
+            $dateobj->Set( Format => 'unix', Value => $args{$date} );
+        }
+        else {
+            $dateobj->Set( Format => 'unknown', Value => $args{$date} );
+        }
+        $args{$date} = $dateobj->ISO;
+    }
+    $args{'mimeobj'} = MIME::Entity->new();
+    $args{'mimeobj'}->build(
+        Type => ( $args{'contenttype'} || 'text/plain' ),
+        Data => ($args{'content'} || '')
+    );
+
+    return (%args);
+}
+
+# }}}
+
+# {{{ sub Import
+
+=head2 Import PARAMHASH
+
+Import a ticket. 
+Doesn\'t create a transaction. 
+Doesn\'t supply queue defaults, etc.
+
+Returns: TICKETID
+
+=cut
+
+sub Import {
+    my $self = shift;
+    my ( $ErrStr, $QueueObj, $Owner );
+
+    my %args = (
+        id              => undef,
+        EffectiveId     => undef,
+        Queue           => undef,
+        Requestor       => undef,
+        Type            => 'ticket',
+        Owner           => $RT::Nobody->Id,
+        Subject         => '[no subject]',
+        InitialPriority => undef,
+        FinalPriority   => undef,
+        Status          => 'new',
+        TimeWorked      => "0",
+        Due             => undef,
+        Created         => undef,
+        Updated         => undef,
+        Resolved        => undef,
+        Told            => undef,
+        @_
+    );
+
+    if ( ( defined( $args{'Queue'} ) ) && ( !ref( $args{'Queue'} ) ) ) {
+        $QueueObj = RT::Queue->new($RT::SystemUser);
+        $QueueObj->Load( $args{'Queue'} );
+
+        #TODO error check this and return 0 if it\'s not loading properly +++
+    }
+    elsif ( ref( $args{'Queue'} ) eq 'RT::Queue' ) {
+        $QueueObj = RT::Queue->new($RT::SystemUser);
+        $QueueObj->Load( $args{'Queue'}->Id );
+    }
+    else {
+        $RT::Logger->debug(
+            "$self " . $args{'Queue'} . " not a recognised queue object." );
+    }
+
+    #Can't create a ticket without a queue.
+    unless ( defined($QueueObj) and $QueueObj->Id ) {
+        $RT::Logger->debug("$self No queue given for ticket creation.");
+        return ( 0, $self->loc('Could not create ticket. Queue not set') );
+    }
+
+    #Now that we have a queue, Check the ACLS
+    unless (
+        $self->CurrentUser->HasRight(
+            Right    => 'CreateTicket',
+            Object => $QueueObj
+        )
+      )
+    {
+        return ( 0,
+            $self->loc("No permission to create tickets in the queue '[_1]'"
+              , $QueueObj->Name));
+    }
+
+    # {{{ Deal with setting the owner
+
+    # Attempt to take user object, user name or user id.
+    # Assign to nobody if lookup fails.
+    if ( defined( $args{'Owner'} ) ) {
+        if ( ref( $args{'Owner'} ) ) {
+            $Owner = $args{'Owner'};
+        }
+        else {
+            $Owner = new RT::User( $self->CurrentUser );
+            $Owner->Load( $args{'Owner'} );
+            if ( !defined( $Owner->id ) ) {
+                $Owner->Load( $RT::Nobody->id );
+            }
+        }
+    }
+
+    #If we have a proposed owner and they don't have the right 
+    #to own a ticket, scream about it and make them not the owner
+    if (
+        ( defined($Owner) )
+        and ( $Owner->Id != $RT::Nobody->Id )
+        and (
+            !$Owner->HasRight(
+                Object => $QueueObj,
+                Right    => 'OwnTicket'
+            )
+        )
+      )
+    {
+
+        $RT::Logger->warning( "$self user "
+              . $Owner->Name . "("
+              . $Owner->id
+              . ") was proposed "
+              . "as a ticket owner but has no rights to own "
+              . "tickets in '"
+              . $QueueObj->Name . "'\n" );
+
+        $Owner = undef;
+    }
+
+    #If we haven't been handed a valid owner, make it nobody.
+    unless ( defined($Owner) ) {
+        $Owner = new RT::User( $self->CurrentUser );
+        $Owner->Load( $RT::Nobody->UserObj->Id );
+    }
+
+    # }}}
+
+    unless ( $self->ValidateStatus( $args{'Status'} ) ) {
+        return ( 0, $self->loc("'[_1]' is an invalid value for status", $args{'Status'}) );
+    }
+
+    $self->{'_AccessibleCache'}{Created}       = { 'read' => 1, 'write' => 1 };
+    $self->{'_AccessibleCache'}{Creator}       = { 'read' => 1, 'auto'  => 1 };
+    $self->{'_AccessibleCache'}{LastUpdated}   = { 'read' => 1, 'write' => 1 };
+    $self->{'_AccessibleCache'}{LastUpdatedBy} = { 'read' => 1, 'auto'  => 1 };
+
+    # If we're coming in with an id, set that now.
+    my $EffectiveId = undef;
+    if ( $args{'id'} ) {
+        $EffectiveId = $args{'id'};
+
+    }
+
+    my $id = $self->SUPER::Create(
+        id              => $args{'id'},
+        EffectiveId     => $EffectiveId,
+        Queue           => $QueueObj->Id,
+        Owner           => $Owner->Id,
+        Subject         => $args{'Subject'},		# loc
+        InitialPriority => $args{'InitialPriority'},	# loc
+        FinalPriority   => $args{'FinalPriority'},	# loc
+        Priority        => $args{'InitialPriority'},	# loc
+        Status          => $args{'Status'},		# loc
+        TimeWorked      => $args{'TimeWorked'},		# loc
+        Type            => $args{'Type'},		# loc
+        Created         => $args{'Created'},		# loc
+        Told            => $args{'Told'},		# loc
+        LastUpdated     => $args{'Updated'},		# loc
+        Resolved        => $args{'Resolved'},		# loc
+        Due             => $args{'Due'},		# loc
+    );
+
+    # If the ticket didn't have an id
+    # Set the ticket's effective ID now that we've created it.
+    if ( $args{'id'} ) {
+        $self->Load( $args{'id'} );
+    }
+    else {
+        my ( $val, $msg ) =
+          $self->__Set( Field => 'EffectiveId', Value => $id );
+
+        unless ($val) {
+            $RT::Logger->err(
+                $self . "->Import couldn't set EffectiveId: $msg\n" );
+        }
+    }
+
+    my $watcher;
+    foreach $watcher ( @{ $args{'Cc'} } ) {
+        $self->_AddWatcher( Type => 'Cc', Person => $watcher, Silent => 1 );
+    }
+    foreach $watcher ( @{ $args{'AdminCc'} } ) {
+        $self->_AddWatcher( Type => 'AdminCc', Person => $watcher,
+            Silent => 1 );
+    }
+    foreach $watcher ( @{ $args{'Requestor'} } ) {
+        $self->_AddWatcher( Type => 'Requestor', Person => $watcher,
+            Silent => 1 );
+    }
+
+    return ( $self->Id, $ErrStr );
+}
+
+# }}}
+
+
+# {{{ Routines dealing with watchers.
+
+# {{{ _CreateTicketGroups 
+
+=head2 _CreateTicketGroups
+
+Create the ticket groups and relationships for this ticket. 
+This routine expects to be called from Ticket->Create _inside of a transaction_
+
+It will create four groups for this ticket: Requestor, Cc, AdminCc and Owner.
+
+It will return true on success and undef on failure.
+
+=begin testing
+
+my $ticket = RT::Ticket->new($RT::SystemUser);
+my ($id, $msg) = $ticket->Create(Subject => "Foo",
+                Owner => $RT::SystemUser->Id,
+                Status => 'open',
+                Requestor => ['jesse@example.com'],
+                Queue => '1'
+                );
+ok ($id, "Ticket $id was created");
+ok(my $group = RT::Group->new($RT::SystemUser));
+ok($group->LoadTicketRoleGroup(Ticket => $id, Type=> 'Requestor'));
+ok ($group->Id, "Found the requestors object for this ticket");
+
+ok(my $jesse = RT::User->new($RT::SystemUser), "Creating a jesse rt::user");
+$jesse->LoadByEmail('jesse@example.com');
+ok($jesse->Id,  "Found the jesse rt user");
+
+
+ok ($ticket->IsWatcher(Type => 'Requestor', PrincipalId => $jesse->PrincipalId), "The ticket actually has jesse at fsck.com as a requestor");
+ok ((my $add_id, $add_msg) = $ticket->AddWatcher(Type => 'Requestor', Email => 'bob@fsck.com'), "Added bob at fsck.com as a requestor");
+ok ($add_id, "Add succeeded: ($add_msg)");
+ok(my $bob = RT::User->new($RT::SystemUser), "Creating a bob rt::user");
+$bob->LoadByEmail('bob@fsck.com');
+ok($bob->Id,  "Found the bob rt user");
+ok ($ticket->IsWatcher(Type => 'Requestor', PrincipalId => $bob->PrincipalId), "The ticket actually has bob at fsck.com as a requestor");;
+ok ((my $add_id, $add_msg) = $ticket->DeleteWatcher(Type =>'Requestor', Email => 'bob@fsck.com'), "Added bob at fsck.com as a requestor");
+ok (!$ticket->IsWatcher(Type => 'Requestor', Principal => $bob->PrincipalId), "The ticket no longer has bob at fsck.com as a requestor");;
+
+
+$group = RT::Group->new($RT::SystemUser);
+ok($group->LoadTicketRoleGroup(Ticket => $id, Type=> 'Cc'));
+ok ($group->Id, "Found the cc object for this ticket");
+$group = RT::Group->new($RT::SystemUser);
+ok($group->LoadTicketRoleGroup(Ticket => $id, Type=> 'AdminCc'));
+ok ($group->Id, "Found the AdminCc object for this ticket");
+$group = RT::Group->new($RT::SystemUser);
+ok($group->LoadTicketRoleGroup(Ticket => $id, Type=> 'Owner'));
+ok ($group->Id, "Found the Owner object for this ticket");
+ok($group->HasMember($RT::SystemUser->UserObj->PrincipalObj), "the owner group has the member 'RT_System'");
+
+=end testing
+
+=cut
+
+
+sub _CreateTicketGroups {
+    my $self = shift;
+    
+    my @types = qw(Requestor Owner Cc AdminCc);
+
+    foreach my $type (@types) {
+        my $type_obj = RT::Group->new($self->CurrentUser);
+        my ($id, $msg) = $type_obj->CreateRoleGroup(Domain => 'RT::Ticket-Role',
+                                                       Instance => $self->Id, 
+                                                       Type => $type);
+        unless ($id) {
+            $RT::Logger->error("Couldn't create a ticket group of type '$type' for ticket ".
+                               $self->Id.": ".$msg);     
+            return(undef);
+        }
+     }
+    return(1);
+    
+}
+
+# }}}
+
+# {{{ sub OwnerGroup
+
+=head2 OwnerGroup
+
+A constructor which returns an RT::Group object containing the owner of this ticket.
+
+=cut
+
+sub OwnerGroup {
+    my $self = shift;
+    my $owner_obj = RT::Group->new($self->CurrentUser);
+    $owner_obj->LoadTicketRoleGroup( Ticket => $self->Id,  Type => 'Owner');
+    return ($owner_obj);
+}
+
+# }}}
+
+
+# {{{ sub AddWatcher
+
+=head2 AddWatcher
+
+AddWatcher takes a parameter hash. The keys are as follows:
+
+Type        One of Requestor, Cc, AdminCc
+
+PrinicpalId The RT::Principal id of the user or group that's being added as a watcher
+
+Email       The email address of the new watcher. If a user with this 
+            email address can't be found, a new nonprivileged user will be created.
+
+If the watcher you\'re trying to set has an RT account, set the Owner paremeter to their User Id. Otherwise, set the Email parameter to their Email address.
+
+=cut
+
+sub AddWatcher {
+    my $self = shift;
+    my %args = (
+        Type  => undef,
+        PrincipalId => undef,
+        Email => undef,
+        @_
+    );
+
+    # {{{ Check ACLS
+    #If the watcher we're trying to add is for the current user
+    if ( $self->CurrentUser->PrincipalId  eq $args{'PrincipalId'}) {
+        #  If it's an AdminCc and they don't have 
+        #   'WatchAsAdminCc' or 'ModifyTicket', bail
+        if ( $args{'Type'} eq 'AdminCc' ) {
+            unless ( $self->CurrentUserHasRight('ModifyTicket')
+                or $self->CurrentUserHasRight('WatchAsAdminCc') ) {
+                return ( 0, $self->loc('Permission Denied'))
+            }
+        }
+
+        #  If it's a Requestor or Cc and they don't have
+        #   'Watch' or 'ModifyTicket', bail
+        elsif ( ( $args{'Type'} eq 'Cc' ) or ( $args{'Type'} eq 'Requestor' ) ) {
+
+            unless ( $self->CurrentUserHasRight('ModifyTicket')
+                or $self->CurrentUserHasRight('Watch') ) {
+                return ( 0, $self->loc('Permission Denied'))
+            }
+        }
+        else {
+            $RT::Logger->warn( "$self -> AddWatcher got passed a bogus type");
+            return ( 0, $self->loc('Error in parameters to Ticket->AddWatcher') );
+        }
+    }
+
+    # If the watcher isn't the current user 
+    # and the current user  doesn't have 'ModifyTicket'
+    # bail
+    else {
+        unless ( $self->CurrentUserHasRight('ModifyTicket') ) {
+            return ( 0, $self->loc("Permission Denied") );
+        }
+    }
+
+    # }}}
+
+    return ( $self->_AddWatcher(%args) );
+}
+
+#This contains the meat of AddWatcher. but can be called from a routine like
+# Create, which doesn't need the additional acl check
+sub _AddWatcher {
+    my $self = shift;
+    my %args = (
+        Type   => undef,
+        Silent => undef,
+        PrincipalId => undef,
+        Email => undef,
+        @_
+    );
+
+
+    my $principal = RT::Principal->new($self->CurrentUser);
+    if ($args{'Email'}) {
+        my $user = RT::User->new($RT::SystemUser);
+        my ($pid, $msg) = $user->LoadOrCreateByEmail($args{'Email'});
+        if ($pid) {
+            $args{'PrincipalId'} = $pid; 
+        }
+    }
+    if ($args{'PrincipalId'}) {
+        $principal->Load($args{'PrincipalId'});
+    } 
+
+ 
+    # If we can't find this watcher, we need to bail.
+    unless ($principal->Id) {
+            $RT::Logger->error("Could not load create a user with the email address '".$args{'Email'}. "' to add as a watcher for ticket ".$self->Id);
+        return(0, $self->loc("Could not find or create that user"));
+    }
+
+
+    my $group = RT::Group->new($self->CurrentUser);
+    $group->LoadTicketRoleGroup(Type => $args{'Type'}, Ticket => $self->Id);
+    unless ($group->id) {
+        return(0,$self->loc("Group not found"));
+    }
+
+    if ( $group->HasMember( $principal)) {
+
+        return ( 0, $self->loc('That principal is already a [_1] for this ticket', $self->loc($args{'Type'})) );
+    }
+
+
+    my ( $m_id, $m_msg ) = $group->_AddMember( PrincipalId => $principal->Id,
+                                               InsideTransaction => 1 );
+    unless ($m_id) {
+        $RT::Logger->error("Failed to add ".$principal->Id." as a member of group ".$group->Id."\n".$m_msg);
+
+        return ( 0, $self->loc('Could not make that principal a [_1] for this ticket', $self->loc($args{'Type'})) );
+    }
+
+    unless ( $args{'Silent'} ) {
+        $self->_NewTransaction(
+            Type     => 'AddWatcher',
+            NewValue => $principal->Id,
+            Field    => $args{'Type'}
+        );
+    }
+
+        return ( 1, $self->loc('Added principal as a [_1] for this ticket', $self->loc($args{'Type'})) );
+}
+
+# }}}
+
+
+# {{{ sub DeleteWatcher
+
+=head2 DeleteWatcher { Type => TYPE, PrincipalId => PRINCIPAL_ID, Email => EMAIL_ADDRESS }
+
+
+Deletes a Ticket watcher.  Takes two arguments:
+
+Type  (one of Requestor,Cc,AdminCc)
+
+and one of
+
+PrincipalId (an RT::Principal Id of the watcher you want to remove)
+    OR
+Email (the email address of an existing wathcer)
+
+
+=cut
+
+
+sub DeleteWatcher {
+    my $self = shift;
+
+    my %args = ( Type => undef,
+                 PrincipalId => undef,
+                 Email => undef,
+                 @_ );
+
+    unless ($args{'PrincipalId'} || $args{'Email'} ) {
+        return(0, $self->loc("No principal specified"));
+    }
+    my $principal = RT::Principal->new($self->CurrentUser);
+    if ($args{'PrincipalId'} ) {
+
+        $principal->Load($args{'PrincipalId'});
+    } else {
+        my $user = RT::User->new($self->CurrentUser);
+        $user->LoadByEmail($args{'Email'});
+        $principal->Load($user->Id);
+    }
+    # If we can't find this watcher, we need to bail.
+    unless ($principal->Id) {
+        return(0, $self->loc("Could not find that principal"));
+    }
+
+    my $group = RT::Group->new($self->CurrentUser);
+    $group->LoadTicketRoleGroup(Type => $args{'Type'}, Ticket => $self->Id);
+    unless ($group->id) {
+        return(0,$self->loc("Group not found"));
+    }
+
+    # {{{ Check ACLS
+    #If the watcher we're trying to add is for the current user
+    if ( $self->CurrentUser->PrincipalId  eq $args{'PrincipalId'}) {
+        #  If it's an AdminCc and they don't have 
+        #   'WatchAsAdminCc' or 'ModifyTicket', bail
+        if ( $args{'Type'} eq 'AdminCc' ) {
+            unless ( $self->CurrentUserHasRight('ModifyTicket')
+                or $self->CurrentUserHasRight('WatchAsAdminCc') ) {
+                return ( 0, $self->loc('Permission Denied'))
+            }
+        }
+
+        #  If it's a Requestor or Cc and they don't have
+        #   'Watch' or 'ModifyTicket', bail
+        elsif ( ( $args{'Type'} eq 'Cc' ) or ( $args{'Type'} eq 'Requestor' ) ) {
+            unless ( $self->CurrentUserHasRight('ModifyTicket')
+                or $self->CurrentUserHasRight('Watch') ) {
+                return ( 0, $self->loc('Permission Denied'))
+            }
+        }
+        else {
+            $RT::Logger->warn( "$self -> DeleteWatcher got passed a bogus type");
+            return ( 0, $self->loc('Error in parameters to Ticket->DelWatcher') );
+        }
+    }
+
+    # If the watcher isn't the current user 
+    # and the current user  doesn't have 'ModifyTicket' bail
+    else {
+        unless ( $self->CurrentUserHasRight('ModifyTicket') ) {
+            return ( 0, $self->loc("Permission Denied") );
+        }
+    }
+
+    # }}}
+
+
+    # see if this user is already a watcher.
+
+    unless ( $group->HasMember($principal)) {
+        return ( 0, 
+        $self->loc('That principal is not a [_1] for this ticket', $args{'Type'}) );
+    }
+
+    my ($m_id, $m_msg) = $group->_DeleteMember($principal->Id);
+    unless ($m_id) {
+        $RT::Logger->error("Failed to delete ".$principal->Id.
+                           " as a member of group ".$group->Id."\n".$m_msg);
+
+        return ( 0,    $self->loc('Could not remove that principal as a [_1] for this ticket', $args{'Type'}) );
+    }
+
+    unless ( $args{'Silent'} ) {
+        $self->_NewTransaction(
+            Type     => 'DelWatcher',
+            OldValue => $principal->Id,
+            Field    => $args{'Type'}
+        );
+    }
+
+    return ( 1, $self->loc("[_1] is no longer a [_2] for this ticket.", $principal->Object->Name, $args{'Type'} ));
+}
+
+
+
+
+# }}}
+
+
+# {{{ a set of  [foo]AsString subs that will return the various sorts of watchers for a ticket/queue as a comma delineated string
+
+=head2 RequestorAddresses
+
+ B<Returns> String: All Ticket Requestor email addresses as a string.
+
+=cut
+
+sub RequestorAddresses {
+    my $self = shift;
+
+    unless ( $self->CurrentUserHasRight('ShowTicket') ) {
+        return undef;
+    }
+
+    return ( $self->Requestors->MemberEmailAddressesAsString );
+}
+
+
+=head2 AdminCcAddresses
+
+returns String: All Ticket AdminCc email addresses as a string
+
+=cut
+
+sub AdminCcAddresses {
+    my $self = shift;
+
+    unless ( $self->CurrentUserHasRight('ShowTicket') ) {
+        return undef;
+    }
+
+    return ( $self->AdminCc->MemberEmailAddressesAsString )
+
+}
+
+=head2 CcAddresses
+
+returns String: All Ticket Ccs as a string of email addresses
+
+=cut
+
+sub CcAddresses {
+    my $self = shift;
+
+    unless ( $self->CurrentUserHasRight('ShowTicket') ) {
+        return undef;
+    }
+
+    return ( $self->Cc->MemberEmailAddressesAsString);
+
+}
+
+# }}}
+
+# {{{ Routines that return RT::Watchers objects of Requestors, Ccs and AdminCcs
+
+# {{{ sub Requestors
+
+=head2 Requestors
+
+Takes nothing.
+Returns this ticket's Requestors as an RT::Group object
+
+=cut
+
+sub Requestors {
+    my $self = shift;
+
+    my $group = RT::Group->new($self->CurrentUser);
+    if ( $self->CurrentUserHasRight('ShowTicket') ) {
+        $group->LoadTicketRoleGroup(Type => 'Requestor', Ticket => $self->Id);
+    }
+    return ($group);
+
+}
+
+# }}}
+
+# {{{ sub Cc
+
+=head2 Cc
+
+Takes nothing.
+Returns an RT::Group object which contains this ticket's Ccs.
+If the user doesn't have "ShowTicket" permission, returns an empty group
+
+=cut
+
+sub Cc {
+    my $self = shift;
+
+    my $group = RT::Group->new($self->CurrentUser);
+    if ( $self->CurrentUserHasRight('ShowTicket') ) {
+        $group->LoadTicketRoleGroup(Type => 'Cc', Ticket => $self->Id);
+    }
+    return ($group);
+
+}
+
+# }}}
+
+# {{{ sub AdminCc
+
+=head2 AdminCc
+
+Takes nothing.
+Returns an RT::Group object which contains this ticket's AdminCcs.
+If the user doesn't have "ShowTicket" permission, returns an empty group
+
+=cut
+
+sub AdminCc {
+    my $self = shift;
+
+    my $group = RT::Group->new($self->CurrentUser);
+    if ( $self->CurrentUserHasRight('ShowTicket') ) {
+        $group->LoadTicketRoleGroup(Type => 'AdminCc', Ticket => $self->Id);
+    }
+    return ($group);
+
+}
+
+# }}}
+
+# }}}
+
+# {{{ IsWatcher,IsRequestor,IsCc, IsAdminCc
+
+# {{{ sub IsWatcher
+# a generic routine to be called by IsRequestor, IsCc and IsAdminCc
+
+=head2 IsWatcher { Type => TYPE, PrincipalId => PRINCIPAL_ID, Email => EMAIL }
+
+Takes a param hash with the attributes Type and either PrincipalId or Email
+
+Type is one of Requestor, Cc, AdminCc and Owner
+
+PrincipalId is an RT::Principal id, and Email is an email address.
+
+Returns true if the specified principal (or the one corresponding to the
+specified address) is a member of the group Type for this ticket.
+
+=cut
+
+sub IsWatcher {
+    my $self = shift;
+
+    my %args = ( Type  => 'Requestor',
+        PrincipalId    => undef,
+        Email          => undef,
+        @_
+    );
+
+    # Load the relevant group. 
+    my $group = RT::Group->new($self->CurrentUser);
+    $group->LoadTicketRoleGroup(Type => $args{'Type'}, Ticket => $self->id);
+
+    # Find the relevant principal.
+    my $principal = RT::Principal->new($self->CurrentUser);
+    if (!$args{PrincipalId} && $args{Email}) {
+        # Look up the specified user.
+        my $user = RT::User->new($self->CurrentUser);
+        $user->LoadByEmail($args{Email});
+        if ($user->Id) {
+            $args{PrincipalId} = $user->PrincipalId;
+        }
+        else {
+            # A non-existent user can't be a group member.
+            return 0;
+        }
+    }
+    $principal->Load($args{'PrincipalId'});
+
+    # Ask if it has the member in question
+    return ($group->HasMember($principal));
+}
+
+# }}}
+
+# {{{ sub IsRequestor
+
+=head2 IsRequestor PRINCIPAL_ID
+  
+  Takes an RT::Principal id
+  Returns true if the principal is a requestor of the current ticket.
+
+
+=cut
+
+sub IsRequestor {
+    my $self   = shift;
+    my $person = shift;
+
+    return ( $self->IsWatcher( Type => 'Requestor', PrincipalId => $person ) );
+
+};
+
+# }}}
+
+# {{{ sub IsCc
+
+=head2 IsCc PRINCIPAL_ID
+
+  Takes an RT::Principal id.
+  Returns true if the principal is a requestor of the current ticket.
+
+
+=cut
+
+sub IsCc {
+    my $self = shift;
+    my $cc   = shift;
+
+    return ( $self->IsWatcher( Type => 'Cc', PrincipalId => $cc ) );
+
+}
+
+# }}}
+
+# {{{ sub IsAdminCc
+
+=head2 IsAdminCc PRINCIPAL_ID
+
+  Takes an RT::Principal id.
+  Returns true if the principal is a requestor of the current ticket.
+
+=cut
+
+sub IsAdminCc {
+    my $self   = shift;
+    my $person = shift;
+
+    return ( $self->IsWatcher( Type => 'AdminCc', PrincipalId => $person ) );
+
+}
+
+# }}}
+
+# {{{ sub IsOwner
+
+=head2 IsOwner
+
+  Takes an RT::User object. Returns true if that user is this ticket's owner.
+returns undef otherwise
+
+=cut
+
+sub IsOwner {
+    my $self   = shift;
+    my $person = shift;
+
+    # no ACL check since this is used in acl decisions
+    # unless ($self->CurrentUserHasRight('ShowTicket')) {
+    #	return(undef);
+    #   }	
+
+    #Tickets won't yet have owners when they're being created.
+    unless ( $self->OwnerObj->id ) {
+        return (undef);
+    }
+
+    if ( $person->id == $self->OwnerObj->id ) {
+        return (1);
+    }
+    else {
+        return (undef);
+    }
+}
+
+# }}}
+
+# }}}
+
+# }}}
+
+# {{{ Routines dealing with queues 
+
+# {{{ sub ValidateQueue
+
+sub ValidateQueue {
+    my $self  = shift;
+    my $Value = shift;
+
+    if ( !$Value ) {
+        $RT::Logger->warning( " RT:::Queue::ValidateQueue called with a null value. this isn't ok.");
+        return (1);
+    }
+
+    my $QueueObj = RT::Queue->new( $self->CurrentUser );
+    my $id       = $QueueObj->Load($Value);
+
+    if ($id) {
+        return (1);
+    }
+    else {
+        return (undef);
+    }
+}
+
+# }}}
+
+# {{{ sub SetQueue  
+
+sub SetQueue {
+    my $self     = shift;
+    my $NewQueue = shift;
+
+    #Redundant. ACL gets checked in _Set;
+    unless ( $self->CurrentUserHasRight('ModifyTicket') ) {
+        return ( 0, $self->loc("Permission Denied") );
+    }
+
+    my $NewQueueObj = RT::Queue->new( $self->CurrentUser );
+    $NewQueueObj->Load($NewQueue);
+
+    unless ( $NewQueueObj->Id() ) {
+        return ( 0, $self->loc("That queue does not exist") );
+    }
+
+    if ( $NewQueueObj->Id == $self->QueueObj->Id ) {
+        return ( 0, $self->loc('That is the same value') );
+    }
+    unless (
+        $self->CurrentUser->HasRight(
+            Right    => 'CreateTicket',
+            Object => $NewQueueObj
+        )
+      )
+    {
+        return ( 0, $self->loc("You may not create requests in that queue.") );
+    }
+
+    unless (
+        $self->OwnerObj->HasRight(
+            Right    => 'OwnTicket',
+            Object => $NewQueueObj
+        )
+      )
+    {
+        $self->Untake();
+    }
+
+    return ( $self->_Set( Field => 'Queue', Value => $NewQueueObj->Id() ) );
+
+}
+
+# }}}
+
+# {{{ sub QueueObj
+
+=head2 QueueObj
+
+Takes nothing. returns this ticket's queue object
+
+=cut
+
+sub QueueObj {
+    my $self = shift;
+
+    my $queue_obj = RT::Queue->new( $self->CurrentUser );
+
+    #We call __Value so that we can avoid the ACL decision and some deep recursion
+    my ($result) = $queue_obj->Load( $self->__Value('Queue') );
+    return ($queue_obj);
+}
+
+# }}}
+
+# }}}
+
+# {{{ Date printing routines
+
+# {{{ sub DueObj
+
+=head2 DueObj
+
+  Returns an RT::Date object containing this ticket's due date
+
+=cut
+
+sub DueObj {
+    my $self = shift;
+
+    my $time = new RT::Date( $self->CurrentUser );
+
+    # -1 is RT::Date slang for never
+    if ( $self->Due ) {
+        $time->Set( Format => 'sql', Value => $self->Due );
+    }
+    else {
+        $time->Set( Format => 'unix', Value => -1 );
+    }
+
+    return $time;
+}
+
+# }}}
+
+# {{{ sub DueAsString 
+
+=head2 DueAsString
+
+Returns this ticket's due date as a human readable string
+
+=cut
+
+sub DueAsString {
+    my $self = shift;
+    return $self->DueObj->AsString();
+}
+
+# }}}
+
+# {{{ sub ResolvedObj
+
+=head2 ResolvedObj
+
+  Returns an RT::Date object of this ticket's 'resolved' time.
+
+=cut
+
+sub ResolvedObj {
+    my $self = shift;
+
+    my $time = new RT::Date( $self->CurrentUser );
+    $time->Set( Format => 'sql', Value => $self->Resolved );
+    return $time;
+}
+
+# }}}
+
+# {{{ sub SetStarted
+
+=head2 SetStarted
+
+Takes a date in ISO format or undef
+Returns a transaction id and a message
+The client calls "Start" to note that the project was started on the date in $date.
+A null date means "now"
+
+=cut
+
+sub SetStarted {
+    my $self = shift;
+    my $time = shift || 0;
+
+    unless ( $self->CurrentUserHasRight('ModifyTicket') ) {
+        return ( 0, self->loc("Permission Denied") );
+    }
+
+    #We create a date object to catch date weirdness
+    my $time_obj = new RT::Date( $self->CurrentUser() );
+    if ( $time != 0 ) {
+        $time_obj->Set( Format => 'ISO', Value => $time );
+    }
+    else {
+        $time_obj->SetToNow();
+    }
+
+    #Now that we're starting, open this ticket
+    #TODO do we really want to force this as policy? it should be a scrip
+
+    #We need $TicketAsSystem, in case the current user doesn't have
+    #ShowTicket
+    #
+    my $TicketAsSystem = new RT::Ticket($RT::SystemUser);
+    $TicketAsSystem->Load( $self->Id );
+    if ( $TicketAsSystem->Status eq 'new' ) {
+        $TicketAsSystem->Open();
+    }
+
+    return ( $self->_Set( Field => 'Started', Value => $time_obj->ISO ) );
+
+}
+
+# }}}
+
+# {{{ sub StartedObj
+
+=head2 StartedObj
+
+  Returns an RT::Date object which contains this ticket's 
+'Started' time.
+
+=cut
+
+sub StartedObj {
+    my $self = shift;
+
+    my $time = new RT::Date( $self->CurrentUser );
+    $time->Set( Format => 'sql', Value => $self->Started );
+    return $time;
+}
+
+# }}}
+
+# {{{ sub StartsObj
+
+=head2 StartsObj
+
+  Returns an RT::Date object which contains this ticket's 
+'Starts' time.
+
+=cut
+
+sub StartsObj {
+    my $self = shift;
+
+    my $time = new RT::Date( $self->CurrentUser );
+    $time->Set( Format => 'sql', Value => $self->Starts );
+    return $time;
+}
+
+# }}}
+
+# {{{ sub ToldObj
+
+=head2 ToldObj
+
+  Returns an RT::Date object which contains this ticket's 
+'Told' time.
+
+=cut
+
+sub ToldObj {
+    my $self = shift;
+
+    my $time = new RT::Date( $self->CurrentUser );
+    $time->Set( Format => 'sql', Value => $self->Told );
+    return $time;
+}
+
+# }}}
+
+# {{{ sub ToldAsString
+
+=head2 ToldAsString
+
+A convenience method that returns ToldObj->AsString
+
+TODO: This should be deprecated
+
+=cut
+
+sub ToldAsString {
+    my $self = shift;
+    if ( $self->Told ) {
+        return $self->ToldObj->AsString();
+    }
+    else {
+        return ("Never");
+    }
+}
+
+# }}}
+
+# {{{ sub TimeWorkedAsString
+
+=head2 TimeWorkedAsString
+
+Returns the amount of time worked on this ticket as a Text String
+
+=cut
+
+sub TimeWorkedAsString {
+    my $self = shift;
+    return "0" unless $self->TimeWorked;
+
+    #This is not really a date object, but if we diff a number of seconds 
+    #vs the epoch, we'll get a nice description of time worked.
+
+    my $worked = new RT::Date( $self->CurrentUser );
+
+    #return the  #of minutes worked turned into seconds and written as
+    # a simple text string
+
+    return ( $worked->DurationAsString( $self->TimeWorked * 60 ) );
+}
+
+# }}}
+
+# }}}
+
+# {{{ Routines dealing with correspondence/comments
+
+# {{{ sub Comment
+
+=head2 Comment
+
+Comment on this ticket.
+Takes a hashref with the following attributes:
+If MIMEObj is undefined, Content will be used to build a MIME::Entity for this
+commentl
+
+MIMEObj, TimeTaken, CcMessageTo, BccMessageTo, Content.
+
+=cut
+
+## Please see file perltidy.ERR
+sub Comment {
+    my $self = shift;
+
+    my %args = ( CcMessageTo  => undef,
+                 BccMessageTo => undef,
+                 MIMEObj      => undef,
+                 Content      => undef,
+                 TimeTaken => 0,
+                 @_ );
+
+    unless (    ( $self->CurrentUserHasRight('CommentOnTicket') )
+             or ( $self->CurrentUserHasRight('ModifyTicket') ) ) {
+        return ( 0, $self->loc("Permission Denied") );
+    }
+
+    unless ( $args{'MIMEObj'} ) {
+        if ( $args{'Content'} ) {
+            use MIME::Entity;
+            $args{'MIMEObj'} = MIME::Entity->build(
+		Data => ( ref $args{'Content'} ? $args{'Content'} : [ $args{'Content'} ] )
+	    );
+        }
+        else {
+
+            return ( 0, $self->loc("No correspondence attached") );
+        }
+    }
+
+    RT::I18N::SetMIMEEntityToUTF8($args{'MIMEObj'}); # convert text parts into utf-8
+
+    # If we've been passed in CcMessageTo and BccMessageTo fields,
+    # add them to the mime object for passing on to the transaction handler
+    # The "NotifyOtherRecipients" scripAction will look for RT--Send-Cc: and
+    # RT-Send-Bcc: headers
+
+    $args{'MIMEObj'}->head->add( 'RT-Send-Cc',  $args{'CcMessageTo'} )
+	if defined $args{'CcMessageTo'};
+    $args{'MIMEObj'}->head->add( 'RT-Send-Bcc', $args{'BccMessageTo'} )
+	if defined $args{'BccMessageTo'};
+
+    #Record the correspondence (write the transaction)
+    my ( $Trans, $Msg, $TransObj ) = $self->_NewTransaction(
+        Type      => 'Comment',
+        Data      => ( $args{'MIMEObj'}->head->get('subject') || 'No Subject' ),
+        TimeTaken => $args{'TimeTaken'},
+        MIMEObj   => $args{'MIMEObj'}
+    );
+
+    return ( $Trans, $self->loc("The comment has been recorded") );
+}
+
+# }}}
+
+# {{{ sub Correspond
+
+=head2 Correspond
+
+Correspond on this ticket.
+Takes a hashref with the following attributes:
+
+
+MIMEObj, TimeTaken, CcMessageTo, BccMessageTo, Content
+
+if there's no MIMEObj, Content is used to build a MIME::Entity object
+
+
+=cut
+
+sub Correspond {
+    my $self = shift;
+    my %args = ( CcMessageTo  => undef,
+                 BccMessageTo => undef,
+                 MIMEObj      => undef,
+                 Content      => undef,
+                 TimeTaken    => 0,
+                 @_ );
+
+    unless (    ( $self->CurrentUserHasRight('ReplyToTicket') )
+             or ( $self->CurrentUserHasRight('ModifyTicket') ) ) {
+        return ( 0, $self->loc("Permission Denied") );
+    }
+
+    unless ( $args{'MIMEObj'} ) {
+        if ( $args{'Content'} ) {
+            use MIME::Entity;
+            $args{'MIMEObj'} = MIME::Entity->build(
+		Data => ( ref $args{'Content'} ?  $args{'Content'} : [ $args{'Content'} ] )
+	    );
+
+        }
+        else {
+
+            return ( 0, $self->loc("No correspondence attached") );
+        }
+    }
+
+    RT::I18N::SetMIMEEntityToUTF8($args{'MIMEObj'}); # convert text parts into utf-8
+
+    # If we've been passed in CcMessageTo and BccMessageTo fields,
+    # add them to the mime object for passing on to the transaction handler
+    # The "NotifyOtherRecipients" scripAction will look for RT-Send-Cc: and RT-Send-Bcc:
+    # headers
+
+    $args{'MIMEObj'}->head->add( 'RT-Send-Cc',  $args{'CcMessageTo'} )
+	if defined $args{'CcMessageTo'};
+    $args{'MIMEObj'}->head->add( 'RT-Send-Bcc', $args{'BccMessageTo'} )
+	if defined $args{'BccMessageTo'};
+
+    #Record the correspondence (write the transaction)
+    my ( $Trans, $msg, $TransObj ) = $self->_NewTransaction(
+             Type => 'Correspond',
+             Data => ( $args{'MIMEObj'}->head->get('subject') || 'No Subject' ),
+             TimeTaken => $args{'TimeTaken'},
+             MIMEObj   => $args{'MIMEObj'} );
+
+    unless ($Trans) {
+        $RT::Logger->err( "$self couldn't init a transaction $msg");
+        return ( $Trans, $self->loc("correspondence (probably) not sent"), $args{'MIMEObj'} );
+    }
+
+    #Set the last told date to now if this isn't mail from the requestor.
+    #TODO: Note that this will wrongly ack mail from any non-requestor as a "told"
+
+    unless ( $TransObj->IsInbound ) {
+        $self->_SetTold;
+    }
+
+    return ( $Trans, $self->loc("correspondence sent") );
+}
+
+# }}}
+
+# }}}
+
+# {{{ Routines dealing with Links and Relations between tickets
+
+# {{{ Link Collections
+
+# {{{ sub Members
+
+=head2 Members
+
+  This returns an RT::Links object which references all the tickets 
+which are 'MembersOf' this ticket
+
+=cut
+
+sub Members {
+    my $self = shift;
+    return ( $self->_Links( 'Target', 'MemberOf' ) );
+}
+
+# }}}
+
+# {{{ sub MemberOf
+
+=head2 MemberOf
+
+  This returns an RT::Links object which references all the tickets that this
+ticket is a 'MemberOf'
+
+=cut
+
+sub MemberOf {
+    my $self = shift;
+    return ( $self->_Links( 'Base', 'MemberOf' ) );
+}
+
+# }}}
+
+# {{{ RefersTo
+
+=head2 RefersTo
+
+  This returns an RT::Links object which shows all references for which this ticket is a base
+
+=cut
+
+sub RefersTo {
+    my $self = shift;
+    return ( $self->_Links( 'Base', 'RefersTo' ) );
+}
+
+# }}}
+
+# {{{ ReferredToBy
+
+=head2 ReferredToBy
+
+  This returns an RT::Links object which shows all references for which this ticket is a target
+
+=cut
+
+sub ReferredToBy {
+    my $self = shift;
+    return ( $self->_Links( 'Target', 'RefersTo' ) );
+}
+
+# }}}
+
+# {{{ DependedOnBy
+
+=head2 DependedOnBy
+
+  This returns an RT::Links object which references all the tickets that depend on this one
+
+=cut
+
+sub DependedOnBy {
+    my $self = shift;
+    return ( $self->_Links( 'Target', 'DependsOn' ) );
+}
+
+# }}}
+
+
+
+=head2 HasUnresolvedDependencies
+
+  Takes a paramhash of Type (default to '__any').  Returns true if
+$self->UnresolvedDependencies returns an object with one or more members
+of that type.  Returns false otherwise
+
+
+=begin testing
+
+my $t1 = RT::Ticket->new($RT::SystemUser);
+my ($id, $trans, $msg) = $t1->Create(Subject => 'DepTest1', Queue => 'general');
+ok($id, "Created dep test 1 - $msg");
+
+my $t2 = RT::Ticket->new($RT::SystemUser);
+my ($id2, $trans, $msg2) = $t2->Create(Subject => 'DepTest2', Queue => 'general');
+ok($id2, "Created dep test 2 - $msg2");
+my $t3 = RT::Ticket->new($RT::SystemUser);
+my ($id3, $trans, $msg3) = $t3->Create(Subject => 'DepTest3', Queue => 'general', Type => 'approval');
+ok($id3, "Created dep test 3 - $msg3");
+
+ok ($t1->AddLink( Type => 'DependsOn', Target => $t2->id));
+ok ($t1->AddLink( Type => 'DependsOn', Target => $t3->id));
+
+ok ($t1->HasUnresolvedDependencies, "Ticket ".$t1->Id." has unresolved deps");
+ok (!$t1->HasUnresolvedDependencies( Type => 'blah' ), "Ticket ".$t1->Id." has no unresolved blahs");
+ok ($t1->HasUnresolvedDependencies( Type => 'approval' ), "Ticket ".$t1->Id." has unresolved approvals");
+ok (!$t2->HasUnresolvedDependencies, "Ticket ".$t2->Id." has no unresolved deps");
+my ($rid, $rmsg)= $t1->Resolve();
+ok(!$rid, $rmsg);
+ok($t2->Resolve);
+($rid, $rmsg)= $t1->Resolve();
+ok(!$rid, $rmsg);
+ok($t3->Resolve);
+($rid, $rmsg)= $t1->Resolve();
+ok($rid, $rmsg);
+
+
+=end testing
+
+=cut
+
+sub HasUnresolvedDependencies {
+    my $self = shift;
+    my %args = (
+        Type   => undef,
+        @_
+    );
+
+    my $deps = $self->UnresolvedDependencies;
+
+    if ($args{Type}) {
+        $deps->Limit( FIELD => 'Type', 
+              OPERATOR => '=',
+              VALUE => $args{Type}); 
+    }
+    else {
+	    $deps->IgnoreType;
+    }
+
+    if ($deps->Count > 0) {
+        return 1;
+    }
+    else {
+        return (undef);
+    }
+}
+
+
+# {{{ UnresolvedDependencies 
+
+=head2 UnresolvedDependencies
+
+Returns an RT::Tickets object of tickets which this ticket depends on
+and which have a status of new, open or stalled. (That list comes from
+RT::Queue->ActiveStatusArray
+
+=cut
+
+
+sub UnresolvedDependencies {
+    my $self = shift;
+    my $deps = RT::Tickets->new($self->CurrentUser);
+
+    my @live_statuses = RT::Queue->ActiveStatusArray();
+    foreach my $status (@live_statuses) {
+        $deps->LimitStatus(VALUE => $status);
+    }
+    $deps->LimitDependedOnBy($self->Id);
+
+    return($deps);
+
+}
+
+# }}}
+
+# {{{ AllDependedOnBy
+
+=head2 AllDependedOnBy
+
+Returns an array of RT::Ticket objects which (directly or indirectly)
+depends on this ticket; takes an optional 'Type' argument in the param
+hash, which will limit returned tickets to that type, as well as cause
+tickets with that type to serve as 'leaf' nodes that stops the recursive
+dependency search.
+
+=cut
+
+sub AllDependedOnBy {
+    my $self = shift;
+    my $dep = $self->DependedOnBy;
+    my %args = (
+        Type   => undef,
+	_found => {},
+	_top   => 1,
+        @_
+    );
+
+    while (my $link = $dep->Next()) {
+	next unless ($link->BaseURI->IsLocal());
+	next if $args{_found}{$link->BaseObj->Id};
+
+	if (!$args{Type}) {
+	    $args{_found}{$link->BaseObj->Id} = $link->BaseObj;
+	    $link->BaseObj->AllDependedOnBy( %args, _top => 0 );
+	}
+	elsif ($link->BaseObj->Type eq $args{Type}) {
+	    $args{_found}{$link->BaseObj->Id} = $link->BaseObj;
+	}
+	else {
+	    $link->BaseObj->AllDependedOnBy( %args, _top => 0 );
+	}
+    }
+
+    if ($args{_top}) {
+	return map { $args{_found}{$_} } sort keys %{$args{_found}};
+    }
+    else {
+	return 1;
+    }
+}
+
+# }}}
+
+# {{{ DependsOn
+
+=head2 DependsOn
+
+  This returns an RT::Links object which references all the tickets that this ticket depends on
+
+=cut
+
+sub DependsOn {
+    my $self = shift;
+    return ( $self->_Links( 'Base', 'DependsOn' ) );
+}
+
+# }}}
+
+
+
+
+# {{{ sub _Links 
+
+sub _Links {
+    my $self = shift;
+
+    #TODO: Field isn't the right thing here. but I ahave no idea what mnemonic ---
+    #tobias meant by $f
+    my $field = shift;
+    my $type  = shift || "";
+
+    unless ( $self->{"$field$type"} ) {
+        $self->{"$field$type"} = new RT::Links( $self->CurrentUser );
+        if ( $self->CurrentUserHasRight('ShowTicket') ) {
+            # Maybe this ticket is a merged ticket
+            my $Tickets = new RT::Tickets( $self->CurrentUser );
+            # at least to myself
+            $self->{"$field$type"}->Limit( FIELD => $field,
+                                           VALUE => $self->URI,
+                                           ENTRYAGGREGATOR => 'OR' );
+            $Tickets->Limit( FIELD => 'EffectiveId',
+                             VALUE => $self->EffectiveId );
+            while (my $Ticket = $Tickets->Next) {
+                $self->{"$field$type"}->Limit( FIELD => $field,
+                                               VALUE => $Ticket->URI,
+                                               ENTRYAGGREGATOR => 'OR' );
+            }
+            $self->{"$field$type"}->Limit( FIELD => 'Type',
+                                           VALUE => $type )
+              if ($type);
+        }
+    }
+    return ( $self->{"$field$type"} );
+}
+
+# }}}
+
+# }}}
+
+# {{{ sub DeleteLink 
+
+=head2 DeleteLink
+
+Delete a link. takes a paramhash of Base, Target and Type.
+Either Base or Target must be null. The null value will 
+be replaced with this ticket\'s id
+
+=cut 
+
+sub DeleteLink {
+    my $self = shift;
+    my %args = (
+        Base   => undef,
+        Target => undef,
+        Type   => undef,
+        @_
+    );
+
+    #check acls
+    unless ( $self->CurrentUserHasRight('ModifyTicket') ) {
+        $RT::Logger->debug("No permission to delete links\n");
+        return ( 0, $self->loc('Permission Denied'))
+
+    }
+
+    #we want one of base and target. we don't care which
+    #but we only want _one_
+
+    my $direction;
+    my $remote_link;
+
+    if ( $args{'Base'} and $args{'Target'} ) {
+        $RT::Logger->debug("$self ->_DeleteLink. got both Base and Target\n");
+        return ( 0, $self->loc("Can't specifiy both base and target") );
+    }
+    elsif ( $args{'Base'} ) {
+        $args{'Target'} = $self->URI();
+	$remote_link = $args{'Base'};
+    	$direction = 'Target';
+    }
+    elsif ( $args{'Target'} ) {
+        $args{'Base'} = $self->URI();
+	$remote_link = $args{'Target'};
+        $direction='Base';
+    }
+    else {
+        $RT::Logger->debug("$self: Base or Target must be specified\n");
+        return ( 0, $self->loc('Either base or target must be specified') );
+    }
+
+    my $link = new RT::Link( $self->CurrentUser );
+    $RT::Logger->debug( "Trying to load link: " . $args{'Base'} . " " . $args{'Type'} . " " . $args{'Target'} . "\n" );
+
+
+    $link->LoadByParams( Base=> $args{'Base'}, Type=> $args{'Type'}, Target=>  $args{'Target'} );
+    #it's a real link. 
+    if ( $link->id ) {
+
+        my $linkid = $link->id;
+        $link->Delete();
+
+        my $TransString = "Ticket $args{'Base'} no longer $args{Type} ticket $args{'Target'}.";
+	my $remote_uri = RT::URI->new( $RT::SystemUser );
+    	$remote_uri->FromURI( $remote_link );
+
+        my ( $Trans, $Msg, $TransObj ) = $self->_NewTransaction(
+            Type      => 'DeleteLink',
+            Field => $LINKDIRMAP{$args{'Type'}}->{$direction},
+	    OldValue =>  $remote_uri->URI || $remote_link,
+            TimeTaken => 0
+        );
+
+        return ( $Trans, $self->loc("Link deleted ([_1])", $TransString));
+    }
+
+    #if it's not a link we can find
+    else {
+        $RT::Logger->debug("Couldn't find that link\n");
+        return ( 0, $self->loc("Link not found") );
+    }
+}
+
+# }}}
+
+# {{{ sub AddLink
+
+=head2 AddLink
+
+Takes a paramhash of Type and one of Base or Target. Adds that link to this ticket.
+
+
+=cut
+
+sub AddLink {
+    my $self = shift;
+    my %args = ( Target => '',
+                 Base   => '',
+                 Type   => '',
+                 Silent => undef,
+                 @_ );
+
+    unless ( $self->CurrentUserHasRight('ModifyTicket') ) {
+        return ( 0, $self->loc("Permission Denied") );
+    }
+
+    # Remote_link is the URI of the object that is not this ticket
+    my $remote_link;
+    my $direction;
+
+    if ( $args{'Base'} and $args{'Target'} ) {
+        $RT::Logger->debug(
+"$self tried to delete a link. both base and target were specified\n" );
+        return ( 0, $self->loc("Can't specifiy both base and target") );
+    }
+    elsif ( $args{'Base'} ) {
+        $args{'Target'} = $self->URI();
+	$remote_link = $args{'Base'};
+    	$direction = 'Target';
+    }
+    elsif ( $args{'Target'} ) {
+        $args{'Base'} = $self->URI();
+	$remote_link = $args{'Target'};
+        $direction='Base';
+    }
+    else {
+        return ( 0, $self->loc('Either base or target must be specified') );
+    }
+
+    # If the base isn't a URI, make it a URI. 
+    # If the target isn't a URI, make it a URI. 
+
+    # {{{ Check if the link already exists - we don't want duplicates
+    use RT::Link;
+    my $old_link = RT::Link->new( $self->CurrentUser );
+    $old_link->LoadByParams( Base   => $args{'Base'},
+                             Type   => $args{'Type'},
+                             Target => $args{'Target'} );
+    if ( $old_link->Id ) {
+        $RT::Logger->debug("$self Somebody tried to duplicate a link");
+        return ( $old_link->id, $self->loc("Link already exists"), 0 );
+    }
+
+    # }}}
+
+    # Storing the link in the DB.
+    my $link = RT::Link->new( $self->CurrentUser );
+    my ($linkid) = $link->Create( Target => $args{Target},
+                                  Base   => $args{Base},
+                                  Type   => $args{Type} );
+
+    unless ($linkid) {
+        return ( 0, $self->loc("Link could not be created") );
+    }
+
+    my $TransString =
+      "Ticket $args{'Base'} $args{Type} ticket $args{'Target'}.";
+
+    # Don't write the transaction if we're doing this on create
+    if ( $args{'Silent'} ) {
+        return ( 1, $self->loc( "Link created ([_1])", $TransString ) );
+    }
+    else {
+	my $remote_uri = RT::URI->new( $RT::SystemUser );
+    	$remote_uri->FromURI( $remote_link );
+
+        #Write the transaction
+        my ( $Trans, $Msg, $TransObj ) = $self->_NewTransaction(
+                                                         Type  => 'AddLink',
+                                                         Field => $LINKDIRMAP{$args{'Type'}}->{$direction},
+							                             NewValue =>  $remote_uri->URI || $remote_link,
+                                                         TimeTaken => 0 );
+        return ( $Trans, $self->loc( "Link created ([_1])", $TransString ) );
+    }
+
+}
+
+# }}}
+
+# {{{ sub URI 
+
+=head2 URI
+
+Returns this ticket's URI
+
+=cut
+
+sub URI {
+    my $self = shift;
+    my $uri = RT::URI::fsck_com_rt->new($self->CurrentUser);
+    return($uri->URIForObject($self));
+}
+
+# }}}
+
+# {{{ sub MergeInto
+
+=head2 MergeInto
+MergeInto take the id of the ticket to merge this ticket into.
+
+=cut
+
+sub MergeInto {
+    my $self      = shift;
+    my $MergeInto = shift;
+
+    unless ( $self->CurrentUserHasRight('ModifyTicket') ) {
+        return ( 0, $self->loc("Permission Denied") );
+    }
+
+    # Load up the new ticket.
+    my $NewTicket = RT::Ticket->new($RT::SystemUser);
+    $NewTicket->Load($MergeInto);
+
+    # make sure it exists.
+    unless ( defined $NewTicket->Id ) {
+        return ( 0, $self->loc("New ticket doesn't exist") );
+    }
+
+    # Make sure the current user can modify the new ticket.
+    unless ( $NewTicket->CurrentUserHasRight('ModifyTicket') ) {
+        $RT::Logger->debug("failed...");
+        return ( 0, $self->loc("Permission Denied") );
+    }
+
+    $RT::Logger->debug(
+        "checking if the new ticket has the same id and effective id...");
+    unless ( $NewTicket->id == $NewTicket->EffectiveId ) {
+        $RT::Logger->err( "$self trying to merge into "
+              . $NewTicket->Id
+              . " which is itself merged.\n" );
+        return ( 0,
+            $self->loc("Can't merge into a merged ticket. You should never get this error") );
+    }
+
+    # We use EffectiveId here even though it duplicates information from
+    # the links table becasue of the massive performance hit we'd take
+    # by trying to do a seperate database query for merge info everytime 
+    # loaded a ticket. 
+
+    #update this ticket's effective id to the new ticket's id.
+    my ( $id_val, $id_msg ) = $self->__Set(
+        Field => 'EffectiveId',
+        Value => $NewTicket->Id()
+    );
+
+    unless ($id_val) {
+        $RT::Logger->error(
+            "Couldn't set effective ID for " . $self->Id . ": $id_msg" );
+        return ( 0, $self->loc("Merge failed. Couldn't set EffectiveId") );
+    }
+
+    my ( $status_val, $status_msg ) = $self->__Set( Field => 'Status', Value => 'resolved');
+
+    unless ($status_val) {
+        $RT::Logger->error( $self->loc("[_1] couldn't set status to resolved. RT's Database may be inconsistent.", $self) );
+    }
+
+
+    # update all the links that point to that old ticket
+    my $old_links_to = RT::Links->new($self->CurrentUser);
+    $old_links_to->Limit(FIELD => 'Target', VALUE => $self->URI);
+
+    while (my $link = $old_links_to->Next) {
+        if ($link->Base eq $NewTicket->URI) {
+            $link->Delete;
+        } else {
+            $link->SetTarget($NewTicket->URI);
+        }
+
+    }
+
+    my $old_links_from = RT::Links->new($self->CurrentUser);
+    $old_links_from->Limit(FIELD => 'Base', VALUE => $self->URI);
+
+    while (my $link = $old_links_from->Next) {
+        if ($link->Target eq $NewTicket->URI) {
+            $link->Delete;
+        } else {
+            $link->SetBase($NewTicket->URI);
+        }
+
+    }
+
+
+    #make a new link: this ticket is merged into that other ticket.
+    $self->AddLink( Type   => 'MergedInto', Target => $NewTicket->Id());
+
+    #add all of this ticket's watchers to that ticket.
+    my $requestors = $self->Requestors->MembersObj;
+    while (my $watcher = $requestors->Next) { 
+        $NewTicket->_AddWatcher( Type => 'Requestor',
+                                  Silent => 1,
+                                  PrincipalId => $watcher->MemberId);
+    }
+
+    my $Ccs = $self->Cc->MembersObj;
+    while (my $watcher = $Ccs->Next) { 
+        $NewTicket->_AddWatcher( Type => 'Cc',
+                                  Silent => 1,
+                                  PrincipalId => $watcher->MemberId);
+    }
+
+    my $AdminCcs = $self->AdminCc->MembersObj;
+    while (my $watcher = $AdminCcs->Next) { 
+        $NewTicket->_AddWatcher( Type => 'AdminCc',
+                                  Silent => 1,
+                                  PrincipalId => $watcher->MemberId);
+    }
+
+
+    #find all of the tickets that were merged into this ticket. 
+    my $old_mergees = new RT::Tickets( $self->CurrentUser );
+    $old_mergees->Limit(
+        FIELD    => 'EffectiveId',
+        OPERATOR => '=',
+        VALUE    => $self->Id
+    );
+
+    #   update their EffectiveId fields to the new ticket's id
+    while ( my $ticket = $old_mergees->Next() ) {
+        my ( $val, $msg ) = $ticket->__Set(
+            Field => 'EffectiveId',
+            Value => $NewTicket->Id()
+        );
+    }
+
+    $NewTicket->_SetLastUpdated;
+
+    return ( 1, $self->loc("Merge Successful") );
+}
+
+# }}}
+
+# }}}
+
+# {{{ Routines dealing with ownership
+
+# {{{ sub OwnerObj
+
+=head2 OwnerObj
+
+Takes nothing and returns an RT::User object of 
+this ticket's owner
+
+=cut
+
+sub OwnerObj {
+    my $self = shift;
+
+    #If this gets ACLed, we lose on a rights check in User.pm and
+    #get deep recursion. if we need ACLs here, we need
+    #an equiv without ACLs
+
+    my $owner = new RT::User( $self->CurrentUser );
+    $owner->Load( $self->__Value('Owner') );
+
+    #Return the owner object
+    return ($owner);
+}
+
+# }}}
+
+# {{{ sub OwnerAsString 
+
+=head2 OwnerAsString
+
+Returns the owner's email address
+
+=cut
+
+sub OwnerAsString {
+    my $self = shift;
+    return ( $self->OwnerObj->EmailAddress );
+
+}
+
+# }}}
+
+# {{{ sub SetOwner
+
+=head2 SetOwner
+
+Takes two arguments:
+     the Id or Name of the owner 
+and  (optionally) the type of the SetOwner Transaction. It defaults
+to 'Give'.  'Steal' is also a valid option.
+
+=begin testing
+
+my $root = RT::User->new($RT::SystemUser);
+$root->Load('root');
+ok ($root->Id, "Loaded the root user");
+my $t = RT::Ticket->new($RT::SystemUser);
+$t->Load(1);
+$t->SetOwner('root');
+ok ($t->OwnerObj->Name eq 'root' , "Root owns the ticket");
+$t->Steal();
+ok ($t->OwnerObj->id eq $RT::SystemUser->id , "SystemUser owns the ticket");
+my $txns = RT::Transactions->new($RT::SystemUser);
+$txns->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$txns->Limit(FIELD => 'Ticket', VALUE => '1');
+my $steal  = $txns->First;
+ok($steal->OldValue == $root->Id , "Stolen from root");
+ok($steal->NewValue == $RT::SystemUser->Id , "Stolen by the systemuser");
+
+=end testing
+
+=cut
+
+sub SetOwner {
+    my $self     = shift;
+    my $NewOwner = shift;
+    my $Type     = shift || "Give";
+
+    # must have ModifyTicket rights
+    # or TakeTicket/StealTicket and $NewOwner is self
+    # see if it's a take
+    if ( $self->OwnerObj->Id == $RT::Nobody->Id ) {
+        unless (    $self->CurrentUserHasRight('ModifyTicket')
+                 || $self->CurrentUserHasRight('TakeTicket') ) {
+            return ( 0, $self->loc("Permission Denied") );
+        }
+    }
+
+    # see if it's a steal
+    elsif (    $self->OwnerObj->Id != $RT::Nobody->Id
+            && $self->OwnerObj->Id != $self->CurrentUser->id ) {
+
+        unless (    $self->CurrentUserHasRight('ModifyTicket')
+                 || $self->CurrentUserHasRight('StealTicket') ) {
+            return ( 0, $self->loc("Permission Denied") );
+        }
+    }
+    else {
+        unless ( $self->CurrentUserHasRight('ModifyTicket') ) {
+            return ( 0, $self->loc("Permission Denied") );
+        }
+    }
+    my $NewOwnerObj = RT::User->new( $self->CurrentUser );
+    my $OldOwnerObj = $self->OwnerObj;
+
+    $NewOwnerObj->Load($NewOwner);
+    if ( !$NewOwnerObj->Id ) {
+        return ( 0, $self->loc("That user does not exist") );
+    }
+
+    #If thie ticket has an owner and it's not the current user
+
+    if (    ( $Type ne 'Steal' )
+        and ( $Type ne 'Force' )
+        and    #If we're not stealing
+        ( $self->OwnerObj->Id != $RT::Nobody->Id ) and    #and the owner is set
+        ( $self->CurrentUser->Id ne $self->OwnerObj->Id() )
+      ) {                                                 #and it's not us
+        return ( 0,
+                 $self->loc(
+"You can only reassign tickets that you own or that are unowned" ) );
+    }
+
+    #If we've specified a new owner and that user can't modify the ticket
+    elsif ( ( $NewOwnerObj->Id )
+            and ( !$NewOwnerObj->HasRight( Right  => 'OwnTicket',
+                                           Object => $self ) )
+      ) {
+        return ( 0, $self->loc("That user may not own tickets in that queue") );
+    }
+
+    #If the ticket has an owner and it's the new owner, we don't need
+    #To do anything
+    elsif (     ( $self->OwnerObj )
+            and ( $NewOwnerObj->Id eq $self->OwnerObj->Id ) ) {
+        return ( 0, $self->loc("That user already owns that ticket") );
+    }
+
+    $RT::Handle->BeginTransaction();
+
+    # Delete the owner in the owner group, then add a new one
+    # TODO: is this safe? it's not how we really want the API to work
+    # for most things, but it's fast.
+    my ( $del_id, $del_msg ) = $self->OwnerGroup->MembersObj->First->Delete();
+    unless ($del_id) {
+        $RT::Handle->Rollback();
+        return ( 0, $self->loc("Could not change owner. ") . $del_msg );
+    }
+
+    my ( $add_id, $add_msg ) = $self->OwnerGroup->_AddMember(
+                                       PrincipalId => $NewOwnerObj->PrincipalId,
+                                       InsideTransaction => 1 );
+    unless ($add_id) {
+        $RT::Handle->Rollback();
+        return ( 0, $self->loc("Could not change owner. ") . $add_msg );
+    }
+
+    # We call set twice with slightly different arguments, so
+    # as to not have an SQL transaction span two RT transactions
+
+    my ( $val, $msg ) = $self->_Set(
+                      Field             => 'Owner',
+                      RecordTransaction => 0,
+                      Value             => $NewOwnerObj->Id,
+                      TimeTaken         => 0,
+                      TransactionType   => $Type,
+                      CheckACL          => 0,                  # don't check acl
+    );
+
+    unless ($val) {
+        $RT::Handle->Rollback;
+        return ( 0, $self->loc("Could not change owner. ") . $msg );
+    }
+
+    $RT::Handle->Commit();
+
+    my ( $trans, $msg, undef ) = $self->_NewTransaction(
+                                                   Type     => $Type,
+                                                   Field    => 'Owner',
+                                                   NewValue => $NewOwnerObj->Id,
+                                                   OldValue => $OldOwnerObj->Id,
+                                                   TimeTaken => 0 );
+
+    if ($trans) {
+        $msg = $self->loc( "Owner changed from [_1] to [_2]",
+                           $OldOwnerObj->Name, $NewOwnerObj->Name );
+
+        # TODO: make sure the trans committed properly
+    }
+    return ( $trans, $msg );
+
+}
+
+# }}}
+
+# {{{ sub Take
+
+=head2 Take
+
+A convenince method to set the ticket's owner to the current user
+
+=cut
+
+sub Take {
+    my $self = shift;
+    return ( $self->SetOwner( $self->CurrentUser->Id, 'Take' ) );
+}
+
+# }}}
+
+# {{{ sub Untake
+
+=head2 Untake
+
+Convenience method to set the owner to 'nobody' if the current user is the owner.
+
+=cut
+
+sub Untake {
+    my $self = shift;
+    return ( $self->SetOwner( $RT::Nobody->UserObj->Id, 'Untake' ) );
+}
+
+# }}}
+
+# {{{ sub Steal 
+
+=head2 Steal
+
+A convenience method to change the owner of the current ticket to the
+current user. Even if it's owned by another user.
+
+=cut
+
+sub Steal {
+    my $self = shift;
+
+    if ( $self->IsOwner( $self->CurrentUser ) ) {
+        return ( 0, $self->loc("You already own this ticket") );
+    }
+    else {
+        return ( $self->SetOwner( $self->CurrentUser->Id, 'Steal' ) );
+
+    }
+
+}
+
+# }}}
+
+# }}}
+
+# {{{ Routines dealing with status
+
+# {{{ sub ValidateStatus 
+
+=head2 ValidateStatus STATUS
+
+Takes a string. Returns true if that status is a valid status for this ticket.
+Returns false otherwise.
+
+=cut
+
+sub ValidateStatus {
+    my $self   = shift;
+    my $status = shift;
+
+    #Make sure the status passed in is valid
+    unless ( $self->QueueObj->IsValidStatus($status) ) {
+        return (undef);
+    }
+
+    return (1);
+
+}
+
+# }}}
+
+# {{{ sub SetStatus
+
+=head2 SetStatus STATUS
+
+Set this ticket\'s status. STATUS can be one of: new, open, stalled, resolved, rejected or deleted.
+
+Alternatively, you can pass in a list of named parameters (Status => STATUS, Force => FORCE).  If FORCE is true, ignore unresolved dependencies and force a status change.
+
+=begin testing
+
+my $tt = RT::Ticket->new($RT::SystemUser);
+my ($id, $tid, $msg)= $tt->Create(Queue => 'general',
+            Subject => 'test');
+ok($id, $msg);
+ok($tt->Status eq 'new', "New ticket is created as new");
+
+($id, $msg) = $tt->SetStatus('open');
+ok($id, $msg);
+ok ($msg =~ /open/i, "Status message is correct");
+($id, $msg) = $tt->SetStatus('resolved');
+ok($id, $msg);
+ok ($msg =~ /resolved/i, "Status message is correct");
+($id, $msg) = $tt->SetStatus('resolved');
+ok(!$id,$msg);
+
+
+=end testing
+
+
+=cut
+
+sub SetStatus {
+    my $self   = shift;
+    my %args;
+
+    if (@_ == 1) {
+	$args{Status} = shift;
+    }
+    else {
+	%args = (@_);
+    }
+
+    #Check ACL
+    unless ( $self->CurrentUserHasRight('ModifyTicket') ) {
+        return ( 0, $self->loc('Permission Denied') );
+    }
+
+    if (!$args{Force} && ($args{'Status'} eq 'resolved') && $self->HasUnresolvedDependencies) {
+        return (0, $self->loc('That ticket has unresolved dependencies'));
+    }
+
+    my $now = RT::Date->new( $self->CurrentUser );
+    $now->SetToNow();
+
+    #If we're changing the status from new, record that we've started
+    if ( ( $self->Status =~ /new/ ) && ( $args{Status} ne 'new' ) ) {
+
+        #Set the Started time to "now"
+        $self->_Set( Field             => 'Started',
+                     Value             => $now->ISO,
+                     RecordTransaction => 0 );
+    }
+
+    if ( $args{Status} =~ /^(resolved|rejected|dead)$/ ) {
+
+        #When we resolve a ticket, set the 'Resolved' attribute to now.
+        $self->_Set( Field             => 'Resolved',
+                     Value             => $now->ISO,
+                     RecordTransaction => 0 );
+    }
+
+    #Actually update the status
+   my ($val, $msg)= $self->_Set( Field           => 'Status',
+                          Value           => $args{Status},
+                          TimeTaken       => 0,
+                          TransactionType => 'Status'  );
+
+    return($val,$msg);
+}
+
+# }}}
+
+# {{{ sub Kill
+
+=head2 Kill
+
+Takes no arguments. Marks this ticket for garbage collection
+
+=cut
+
+sub Kill {
+    my $self = shift;
+    $RT::Logger->crit("'Kill' is deprecated. use 'Delete' instead.");
+    return $self->Delete;
+}
+
+sub Delete {
+    my $self = shift;
+    return ( $self->SetStatus('deleted') );
+
+    # TODO: garbage collection
+}
+
+# }}}
+
+# {{{ sub Stall
+
+=head2 Stall
+
+Sets this ticket's status to stalled
+
+=cut
+
+sub Stall {
+    my $self = shift;
+    return ( $self->SetStatus('stalled') );
+}
+
+# }}}
+
+# {{{ sub Reject
+
+=head2 Reject
+
+Sets this ticket's status to rejected
+
+=cut
+
+sub Reject {
+    my $self = shift;
+    return ( $self->SetStatus('rejected') );
+}
+
+# }}}
+
+# {{{ sub Open
+
+=head2 Open
+
+Sets this ticket\'s status to Open
+
+=cut
+
+sub Open {
+    my $self = shift;
+    return ( $self->SetStatus('open') );
+}
+
+# }}}
+
+# {{{ sub Resolve
+
+=head2 Resolve
+
+Sets this ticket\'s status to Resolved
+
+=cut
+
+sub Resolve {
+    my $self = shift;
+    return ( $self->SetStatus('resolved') );
+}
+
+# }}}
+
+# }}}
+
+# {{{ Routines dealing with custom fields
+
+
+# {{{ FirstCustomFieldValue
+
+=item FirstCustomFieldValue FIELD
+
+Return the content of the first value of CustomField FIELD for this ticket
+Takes a field id or name
+
+=cut
+
+sub FirstCustomFieldValue {
+    my $self = shift;
+    my $field = shift;
+    my $values = $self->CustomFieldValues($field);
+    if ($values->First) {
+        return $values->First->Content;
+    } else {
+        return undef;
+    }
+
+}
+
+
+
+# {{{ CustomFieldValues
+
+=item CustomFieldValues FIELD
+
+Return a TicketCustomFieldValues object of all values of CustomField FIELD for this ticket.  
+Takes a field id or name.
+
+
+=cut
+
+sub CustomFieldValues {
+    my $self  = shift;
+    my $field = shift;
+
+    my $cf = RT::CustomField->new($self->CurrentUser);
+
+    if ($field =~ /^\d+$/) {
+        $cf->LoadById($field);
+    } else {
+        $cf->LoadByNameAndQueue(Name => $field, Queue => $self->QueueObj->Id);
+    }
+    my $cf_values = RT::TicketCustomFieldValues->new( $self->CurrentUser );
+    $cf_values->LimitToCustomField($cf->id);
+    $cf_values->LimitToTicket($self->Id());
+
+    # @values is a CustomFieldValues object;
+    return ($cf_values);
+}
+
+# }}}
+
+# {{{ AddCustomFieldValue
+
+=item AddCustomFieldValue { Field => FIELD, Value => VALUE }
+
+VALUE can either be a CustomFieldValue object or a string.
+FIELD can be a CustomField object OR a CustomField ID.
+
+
+Adds VALUE as a value of CustomField FIELD.  If this is a single-value custom field,
+deletes the old value. 
+If VALUE isn't a valid value for the custom field, returns 
+(0, 'Error message' ) otherwise, returns (1, 'Success Message')
+
+=cut
+
+sub AddCustomFieldValue {
+    my $self = shift;
+    unless ( $self->CurrentUserHasRight('ModifyTicket') ) {
+        return ( 0, $self->loc("Permission Denied") );
+    }
+    $self->_AddCustomFieldValue(@_);
+}
+
+sub _AddCustomFieldValue {
+    my $self = shift;
+    my %args = (
+        Field => undef,
+        Value => undef,
+	RecordTransaction => 1,
+        @_
+    );
+
+    my $cf = RT::CustomField->new( $self->CurrentUser );
+    if ( UNIVERSAL::isa( $args{'Field'}, "RT::CustomField" ) ) {
+        $cf->Load( $args{'Field'}->id );
+    }
+    else {
+        $cf->Load( $args{'Field'} );
+    }
+
+    unless ( $cf->Id ) {
+        return ( 0, $self->loc("Custom field [_1] not found", $args{'Field'}) );
+    }
+
+    # Load up a TicketCustomFieldValues object for this custom field and this ticket
+    my $values = $cf->ValuesForTicket( $self->id );
+
+    unless ( $cf->ValidateValue( $args{'Value'} ) ) {
+        return ( 0, $self->loc("Invalid value for custom field") );
+    }
+
+    # If the custom field only accepts a single value, delete the existing
+    # value and record a "changed from foo to bar" transaction
+    if ( $cf->SingleValue ) {
+
+        # We need to whack any old values here.  In most cases, the custom field should
+        # only have one value to delete.  In the pathalogical case, this custom field
+        # used to be a multiple and we have many values to whack....
+        my $cf_values = $values->Count;
+
+        if ( $cf_values > 1 ) {
+            my $i = 0;   #We want to delete all but the last one, so we can then
+                 # execute the same code to "change" the value from old to new
+            while ( my $value = $values->Next ) {
+                $i++;
+                if ( $i < $cf_values ) {
+                    my $old_value = $value->Content;
+                    my ($val, $msg) = $cf->DeleteValueForTicket(Ticket => $self->Id, Content => $value->Content);
+                    unless ($val) {
+                        return (0,$msg);
+                    }
+                    my ( $TransactionId, $Msg, $TransactionObj ) =
+                      $self->_NewTransaction(
+                        Type     => 'CustomField',
+                        Field    => $cf->Id,
+                        OldValue => $old_value
+                      );
+                }
+            }
+        }
+
+        my $old_value;
+        if (my $value = $cf->ValuesForTicket( $self->Id )->First) {
+	    $old_value = $value->Content();
+	    return (1) if $old_value eq $args{'Value'};
+	}
+
+        my ( $new_value_id, $value_msg ) = $cf->AddValueForTicket(
+            Ticket  => $self->Id,
+            Content => $args{'Value'}
+        );
+
+        unless ($new_value_id) {
+            return ( 0,
+                $self->loc("Could not add new custom field value for ticket. [_1] ",
+                  ,$value_msg) );
+        }
+
+        my $new_value = RT::TicketCustomFieldValue->new( $self->CurrentUser );
+        $new_value->Load($new_value_id);
+
+        # now that adding the new value was successful, delete the old one
+	if ($old_value) {
+	    my ($val, $msg) = $cf->DeleteValueForTicket(Ticket => $self->Id, Content => $old_value);
+	    unless ($val) { 
+	    		return (0,$msg);
+	    }
+	}
+
+	if ($args{'RecordTransaction'}) {
+        my ( $TransactionId, $Msg, $TransactionObj ) = $self->_NewTransaction(
+            Type     => 'CustomField',
+            Field    => $cf->Id,
+            OldValue => $old_value,
+            NewValue => $new_value->Content
+        );
+	}
+
+        if ( $old_value eq '' ) {
+            return ( 1, $self->loc("[_1] [_2] added", $cf->Name, $new_value->Content) );
+        }
+        elsif ( $new_value->Content eq '' ) {
+            return ( 1, $self->loc("[_1] [_2] deleted", $cf->Name, $old_value) );
+        }
+        else {
+            return ( 1, $self->loc("[_1] [_2] changed to [_3]", $cf->Name, $old_value, $new_value->Content ) );
+        }
+
+    }
+
+    # otherwise, just add a new value and record "new value added"
+    else {
+        my ( $new_value_id ) = $cf->AddValueForTicket(
+            Ticket  => $self->Id,
+            Content => $args{'Value'}
+        );
+
+        unless ($new_value_id) {
+            return ( 0,
+                $self->loc("Could not add new custom field value for ticket. "));
+        }
+    if ( $args{'RecordTransaction'} ) {
+        my ( $TransactionId, $Msg, $TransactionObj ) = $self->_NewTransaction(
+            Type     => 'CustomField',
+            Field    => $cf->Id,
+            NewValue => $args{'Value'}
+        );
+        unless ($TransactionId) {
+            return ( 0,
+                $self->loc( "Couldn't create a transaction: [_1]", $Msg ) );
+        }
+    }
+        return ( 1, $self->loc("[_1] added as a value for [_2]",$args{'Value'}, $cf->Name));
+    }
+
+}
+
+# }}}
+
+# {{{ DeleteCustomFieldValue
+
+=item DeleteCustomFieldValue { Field => FIELD, Value => VALUE }
+
+Deletes VALUE as a value of CustomField FIELD. 
+
+VALUE can be a string, a CustomFieldValue or a TicketCustomFieldValue.
+
+If VALUE isn't a valid value for the custom field, returns 
+(0, 'Error message' ) otherwise, returns (1, 'Success Message')
+
+=cut
+
+sub DeleteCustomFieldValue {
+    my $self = shift;
+    my %args = (
+        Field => undef,
+        Value => undef,
+        @_);
+
+    unless ( $self->CurrentUserHasRight('ModifyTicket') ) {
+        return ( 0, $self->loc("Permission Denied") );
+    }
+    my $cf = RT::CustomField->new( $self->CurrentUser );
+    if ( UNIVERSAL::isa( $args{'Field'}, "RT::CustomField" ) ) {
+        $cf->LoadById( $args{'Field'}->id );
+    }
+    else {
+        $cf->LoadById( $args{'Field'} );
+    }
+
+    unless ( $cf->Id ) {
+        return ( 0, $self->loc("Custom field not found") );
+    }
+
+
+     my ($val, $msg) = $cf->DeleteValueForTicket(Ticket => $self->Id, Content => $args{'Value'});
+     unless ($val) { 
+            return (0,$msg);
+     }
+        my ( $TransactionId, $Msg, $TransactionObj ) = $self->_NewTransaction(
+            Type     => 'CustomField',
+            Field    => $cf->Id,
+            OldValue => $args{'Value'}
+        );
+        unless($TransactionId) {
+            return(0, $self->loc("Couldn't create a transaction: [_1]", $Msg));
+        } 
+
+        return($TransactionId, $self->loc("[_1] is no longer a value for custom field [_2]", $args{'Value'}, $cf->Name));
+}
+
+# }}}
+
+# }}}
+
+# {{{ Actions + Routines dealing with transactions
+
+# {{{ sub SetTold and _SetTold
+
+=head2 SetTold ISO  [TIMETAKEN]
+
+Updates the told and records a transaction
+
+=cut
+
+sub SetTold {
+    my $self = shift;
+    my $told;
+    $told = shift if (@_);
+    my $timetaken = shift || 0;
+
+    unless ( $self->CurrentUserHasRight('ModifyTicket') ) {
+        return ( 0, $self->loc("Permission Denied") );
+    }
+
+    my $datetold = new RT::Date( $self->CurrentUser );
+    if ($told) {
+        $datetold->Set( Format => 'iso',
+                        Value  => $told );
+    }
+    else {
+        $datetold->SetToNow();
+    }
+
+    return ( $self->_Set( Field           => 'Told',
+                          Value           => $datetold->ISO,
+                          TimeTaken       => $timetaken,
+                          TransactionType => 'Told' ) );
+}
+
+=head2 _SetTold
+
+Updates the told without a transaction or acl check. Useful when we're sending replies.
+
+=cut
+
+sub _SetTold {
+    my $self = shift;
+
+    my $now = new RT::Date( $self->CurrentUser );
+    $now->SetToNow();
+
+    #use __Set to get no ACLs ;)
+    return ( $self->__Set( Field => 'Told',
+                           Value => $now->ISO ) );
+}
+
+# }}}
+
+# {{{ sub Transactions 
+
+=head2 Transactions
+
+  Returns an RT::Transactions object of all transactions on this ticket
+
+=cut
+
+sub Transactions {
+    my $self = shift;
+
+    use RT::Transactions;
+    my $transactions = RT::Transactions->new( $self->CurrentUser );
+
+    #If the user has no rights, return an empty object
+    if ( $self->CurrentUserHasRight('ShowTicket') ) {
+        my $tickets = $transactions->NewAlias('Tickets');
+        $transactions->Join(
+            ALIAS1 => 'main',
+            FIELD1 => 'Ticket',
+            ALIAS2 => $tickets,
+            FIELD2 => 'id'
+        );
+        $transactions->Limit(
+            ALIAS => $tickets,
+            FIELD => 'EffectiveId',
+            VALUE => $self->id()
+        );
+
+        # if the user may not see comments do not return them
+        unless ( $self->CurrentUserHasRight('ShowTicketComments') ) {
+            $transactions->Limit(
+                FIELD    => 'Type',
+                OPERATOR => '!=',
+                VALUE    => "Comment"
+            );
+        }
+    }
+
+    return ($transactions);
+}
+
+# }}}
+
+# {{{ sub _NewTransaction
+
+sub _NewTransaction {
+    my $self = shift;
+    my %args = (
+        TimeTaken => 0,
+        Type      => undef,
+        OldValue  => undef,
+        NewValue  => undef,
+        Data      => undef,
+        Field     => undef,
+        MIMEObj   => undef,
+        @_
+    );
+
+    require RT::Transaction;
+    my $trans = new RT::Transaction( $self->CurrentUser );
+    my ( $transaction, $msg ) = $trans->Create(
+        Ticket    => $self->Id,
+        TimeTaken => $args{'TimeTaken'},
+        Type      => $args{'Type'},
+        Data      => $args{'Data'},
+        Field     => $args{'Field'},
+        NewValue  => $args{'NewValue'},
+        OldValue  => $args{'OldValue'},
+        MIMEObj   => $args{'MIMEObj'}
+    );
+
+
+    $self->Load($self->Id);
+
+    $RT::Logger->warning($msg) unless $transaction;
+
+    $self->_SetLastUpdated;
+
+    if ( defined $args{'TimeTaken'} ) {
+        $self->_UpdateTimeTaken( $args{'TimeTaken'} );
+    }
+    return ( $transaction, $msg, $trans );
+}
+
+# }}}
+
+# }}}
+
+# {{{ PRIVATE UTILITY METHODS. Mostly needed so Ticket can be a DBIx::Record
+
+# {{{ sub _ClassAccessible
+
+sub _ClassAccessible {
+    {
+        EffectiveId       => { 'read' => 1,  'write' => 1,  'public' => 1 },
+          Queue           => { 'read' => 1,  'write' => 1 },
+          Requestors      => { 'read' => 1,  'write' => 1 },
+          Owner           => { 'read' => 1,  'write' => 1 },
+          Subject         => { 'read' => 1,  'write' => 1 },
+          InitialPriority => { 'read' => 1,  'write' => 1 },
+          FinalPriority   => { 'read' => 1,  'write' => 1 },
+          Priority        => { 'read' => 1,  'write' => 1 },
+          Status          => { 'read' => 1,  'write' => 1 },
+          TimeEstimated      => { 'read' => 1,  'write' => 1 },
+          TimeWorked      => { 'read' => 1,  'write' => 1 },
+          TimeLeft        => { 'read' => 1,  'write' => 1 },
+          Created         => { 'read' => 1,  'auto'  => 1 },
+          Creator         => { 'read' => 1,  'auto'  => 1 },
+          Told            => { 'read' => 1,  'write' => 1 },
+          Resolved        => { 'read' => 1 },
+          Type            => { 'read' => 1 },
+          Starts        => { 'read' => 1, 'write' => 1 },
+          Started       => { 'read' => 1, 'write' => 1 },
+          Due           => { 'read' => 1, 'write' => 1 },
+          Creator       => { 'read' => 1, 'auto'  => 1 },
+          Created       => { 'read' => 1, 'auto'  => 1 },
+          LastUpdatedBy => { 'read' => 1, 'auto'  => 1 },
+          LastUpdated   => { 'read' => 1, 'auto'  => 1 }
+    };
+
+}
+
+# }}}
+
+# {{{ sub _Set
+
+sub _Set {
+    my $self = shift;
+
+    my %args = ( Field             => undef,
+                 Value             => undef,
+                 TimeTaken         => 0,
+                 RecordTransaction => 1,
+                 UpdateTicket      => 1,
+                 CheckACL          => 1,
+                 TransactionType   => 'Set',
+                 @_ );
+
+    if ($args{'CheckACL'}) {
+      unless ( $self->CurrentUserHasRight('ModifyTicket')) {
+          return ( 0, $self->loc("Permission Denied"));
+      }
+   }
+
+    unless ($args{'UpdateTicket'} || $args{'RecordTransaction'}) {
+        $RT::Logger->error("Ticket->_Set called without a mandate to record an update or update the ticket");
+        return(0, $self->loc("Internal Error"));
+    }
+
+    #if the user is trying to modify the record
+
+    #Take care of the old value we really don't want to get in an ACL loop.
+    # so ask the super::_Value
+    my $Old = $self->SUPER::_Value("$args{'Field'}");
+    
+    my ($ret, $msg);
+    if ( $args{'UpdateTicket'}  ) {
+
+        #Set the new value
+        ( $ret, $msg ) = $self->SUPER::_Set( Field => $args{'Field'},
+                                                Value => $args{'Value'} );
+    
+        #If we can't actually set the field to the value, don't record
+        # a transaction. instead, get out of here.
+        if ( $ret == 0 ) { return ( 0, $msg ); }
+    }
+
+    if ( $args{'RecordTransaction'} == 1 ) {
+
+        my ( $Trans, $Msg, $TransObj ) = $self->_NewTransaction(
+                                               Type => $args{'TransactionType'},
+                                               Field     => $args{'Field'},
+                                               NewValue  => $args{'Value'},
+                                               OldValue  => $Old,
+                                               TimeTaken => $args{'TimeTaken'},
+        );
+        return ( $Trans, scalar $TransObj->Description );
+    }
+    else {
+        return ( $ret, $msg );
+    }
+}
+
+# }}}
+
+# {{{ sub _Value 
+
+=head2 _Value
+
+Takes the name of a table column.
+Returns its value as a string, if the user passes an ACL check
+
+=cut
+
+sub _Value {
+
+    my $self  = shift;
+    my $field = shift;
+
+    #if the field is public, return it.
+    if ( $self->_Accessible( $field, 'public' ) ) {
+
+        #$RT::Logger->debug("Skipping ACL check for $field\n");
+        return ( $self->SUPER::_Value($field) );
+
+    }
+
+    #If the current user doesn't have ACLs, don't let em at it.  
+
+    unless ( $self->CurrentUserHasRight('ShowTicket') ) {
+        return (undef);
+    }
+    return ( $self->SUPER::_Value($field) );
+
+}
+
+# }}}
+
+# {{{ sub _UpdateTimeTaken
+
+=head2 _UpdateTimeTaken
+
+This routine will increment the timeworked counter. it should
+only be called from _NewTransaction 
+
+=cut
+
+sub _UpdateTimeTaken {
+    my $self    = shift;
+    my $Minutes = shift;
+    my ($Total);
+
+    $Total = $self->SUPER::_Value("TimeWorked");
+    $Total = ( $Total || 0 ) + ( $Minutes || 0 );
+    $self->SUPER::_Set(
+        Field => "TimeWorked",
+        Value => $Total
+    );
+
+    return ($Total);
+}
+
+# }}}
+
+# }}}
+
+# {{{ Routines dealing with ACCESS CONTROL
+
+# {{{ sub CurrentUserHasRight 
+
+=head2 CurrentUserHasRight
+
+  Takes the textual name of a Ticket scoped right (from RT::ACE) and returns
+1 if the user has that right. It returns 0 if the user doesn't have that right.
+
+=cut
+
+sub CurrentUserHasRight {
+    my $self  = shift;
+    my $right = shift;
+
+    return (
+        $self->HasRight(
+            Principal => $self->CurrentUser->UserObj(),
+            Right     => "$right"
+          )
+    );
+
+}
+
+# }}}
+
+# {{{ sub HasRight 
+
+=head2 HasRight
+
+ Takes a paramhash with the attributes 'Right' and 'Principal'
+  'Right' is a ticket-scoped textual right from RT::ACE 
+  'Principal' is an RT::User object
+
+  Returns 1 if the principal has the right. Returns undef if not.
+
+=cut
+
+sub HasRight {
+    my $self = shift;
+    my %args = (
+        Right     => undef,
+        Principal => undef,
+        @_
+    );
+
+    unless ( ( defined $args{'Principal'} ) and ( ref( $args{'Principal'} ) ) )
+    {
+        $RT::Logger->warning("Principal attrib undefined for Ticket::HasRight");
+    }
+
+    return (
+        $args{'Principal'}->HasRight(
+            Object => $self,
+            Right     => $args{'Right'}
+          )
+    );
+}
+
+# }}}
+
+# }}}
+
+1;
+
+=head1 AUTHOR
+
+Jesse Vincent, jesse@bestpractical.com
+
+=head1 SEE ALSO
+
+RT
+
+=cut
+
diff --git a/rt/lib/RT/Tickets.pm b/rt/lib/RT/Tickets.pm
index dd91126c4..b6b349144 100755
--- a/rt/lib/RT/Tickets.pm
+++ b/rt/lib/RT/Tickets.pm
@@ -1,1789 +1,115 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Tickets.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
 
-=head1 NAME
+use strict;
 
-  RT::Tickets - A collection of Ticket objects
 
+=head1 NAME
 
+  RT::Tickets -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::Tickets;
-  my $tickets = new RT::Tickets($CurrentUser);
+  use RT::Tickets
 
 =head1 DESCRIPTION
 
-   A collection of RT::Tickets.
 
 =head1 METHODS
 
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Tickets);
-
-=end testing
-
 =cut
 
 package RT::Tickets;
-use RT::EasySearch;
-use RT::Ticket;
-@ISA= qw(RT::EasySearch);
-
-use vars qw(%TYPES @SORTFIELDS);
-
-# {{{ TYPES
-
-%TYPES =    ( Status => 'ENUM',
-	      Queue  => 'ENUM',
-	      Type => 'ENUM',
-	      Creator => 'ENUM',
-	      LastUpdatedBy => 'ENUM',
-	      Owner => 'ENUM',
-	      EffectiveId => 'INT',
-	      id => 'INT',
-	      InitialPriority => 'INT',
-	      FinalPriority => 'INT',
-	      Priority => 'INT',
-	      TimeLeft => 'INT',
-	      TimeWorked => 'INT',
-	      MemberOf => 'LINK',
-	      DependsOn => 'LINK',
-	      HasMember => 'LINK',
-	      HasDepender => 'LINK',
-	      RelatedTo => 'LINK',
-              Told => 'DATE',
-              StartsBy => 'DATE',
-              Started => 'DATE',
-              Due  => 'DATE',
-              Resolved => 'DATE',
-              LastUpdated => 'DATE',
-              Created => 'DATE',
-              Subject => 'STRING',
-	      Type => 'STRING',
-              Content => 'TRANSFIELD',
-	      ContentType => 'TRANSFIELD',
- 	      TransactionDate => 'TRANSDATE',
-	      Watcher => 'WATCHERFIELD',
-	      LinkedTo => 'LINKFIELD',
-              Keyword => 'KEYWORDFIELD'
-
-	    );
-
-
-# }}}
-
-# {{{ sub SortFields
-
-@SORTFIELDS = qw(id Status Owner Created Due Starts Started
-		 Queue Subject Told Started 
-		    Resolved LastUpdated Priority TimeWorked TimeLeft);
-
-=head2 SortFields
-
-Returns the list of fields that lists of tickets can easily be sorted by
-
-=cut
-
-
-sub SortFields {
-	my $self = shift;
-	return(@SORTFIELDS);
-}
-
-
-# }}}
-
-# {{{ Limit the result set based on content
-
-# {{{ sub Limit 
-
-=head2 Limit
-
-Takes a paramhash with the fields FIELD, OPERATOR, VALUE and DESCRIPTION
-Generally best called from LimitFoo methods
-
-=cut
-sub Limit {
-    my $self = shift;
-    my %args = ( FIELD => undef,
-		 OPERATOR => '=',
-		 VALUE => undef,
-		 DESCRIPTION => undef,
-		 @_
-	       );
-   $args{'DESCRIPTION'} = "Autodescribed: ".$args{'FIELD'} . $args{'OPERATOR'} . $args{'VALUE'},
-    if (!defined $args{'DESCRIPTION'}) ;
-
-    my $index = $self->_NextIndex;
-    
-    #make the TicketRestrictions hash the equivalent of whatever we just passed in;
-    
-    %{$self->{'TicketRestrictions'}{$index}} = %args;
-
-    $self->{'RecalcTicketLimits'} = 1;
-
-    # If we're looking at the effective id, we don't want to append the other clause
-    # which limits us to tickets where id = effective id 
-    if ($args{'FIELD'} eq 'EffectiveId') {
-        $self->{'looking_at_effective_id'} = 1;
-    }
-
-    return ($index);
-}
-
-# }}}
-
-
-
-
-=head2 FreezeLimits
-
-Returns a frozen string suitable for handing back to ThawLimits.
-
-=cut
-# {{{ sub FreezeLimits
-
-sub FreezeLimits {
-	my $self = shift;
-	require FreezeThaw;
-	return (FreezeThaw::freeze($self->{'TicketRestrictions'},
-				   $self->{'restriction_index'}
-				  ));
-}
-
-# }}}
-
-=head2 ThawLimits
-
-Take a frozen Limits string generated by FreezeLimits and make this tickets
-object have that set of limits.
-
-=cut
-# {{{ sub ThawLimits
-
-sub ThawLimits {
-	my $self = shift;
-	my $in = shift;
-	
-	#if we don't have $in, get outta here.
-	return undef unless ($in);
-
-    	$self->{'RecalcTicketLimits'} = 1;
-
-	require FreezeThaw;
-	
-	#We don't need to die if the thaw fails.
-	
-	eval {
-		($self->{'TicketRestrictions'},
-		$self->{'restriction_index'}
-		) = FreezeThaw::thaw($in);
-	}
-
-}
-
-# }}}
-
-# {{{ Limit by enum or foreign key
-
-# {{{ sub LimitQueue
-
-=head2 LimitQueue
-
-LimitQueue takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of = or !=. (It defaults to =).
-VALUE is a queue id. 
-
-=cut
-
-sub LimitQueue {
-    my $self = shift;
-    my %args = (VALUE => undef,
-		OPERATOR => '=',
-		@_);
-
-    #TODO  VALUE should also take queue names and queue objects
-    my $queue = new RT::Queue($self->CurrentUser);
-    $queue->Load($args{'VALUE'});
-    
-    #TODO check for a valid queue here
-
-    $self->Limit (FIELD => 'Queue',
-		  VALUE => $queue->id(),
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Queue ' .  $args{'OPERATOR'}. " ". $queue->Name
-		 );
-    
-}
-# }}}
-
-# {{{ sub LimitStatus
-
-=head2 LimitStatus
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of = or !=.
-VALUE is a status.
-
-=cut
-
-sub LimitStatus {
-    my $self = shift;
-    my %args = ( OPERATOR => '=',
-                  @_);
-    $self->Limit (FIELD => 'Status',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Status ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-		 );
-}
-
-# }}}
-
-# {{{ sub LimitType
-
-=head2 LimitType
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of = or !=, it defaults to "=".
-VALUE is a string to search for in the type of the ticket.
-
-=cut
-
-sub LimitType {
-    my $self = shift;
-    my %args = (OPERATOR => '=',
-		VALUE => undef,
-		@_);
-    $self->Limit (FIELD => 'Type',
-                  VALUE => $args{'VALUE'},
-                  OPERATOR => $args{'OPERATOR'},
-                  DESCRIPTION => 'Type ' .  $args{'OPERATOR'}. " ". $args{'Limit'},
-                 );
-}
-
-# }}}
-
-# }}}
-
-# {{{ Limit by string field
-
-# {{{ sub LimitSubject
-
-=head2 LimitSubject
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of = or !=.
-VALUE is a string to search for in the subject of the ticket.
-
-=cut
-
-sub LimitSubject {
-    my $self = shift;
-    my %args = (@_);
-    $self->Limit (FIELD => 'Subject',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Subject ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-		 );
-}
-
-# }}}
-
-# }}}
-
-# {{{ Limit based on ticket numerical attributes
-# Things that can be > < = !=
-
-# {{{ sub LimitId
-
-=head2 LimitId
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of =, >, < or !=.
-VALUE is a ticket Id to search for
-
-=cut
-
-sub LimitId {
-    my $self = shift;
-    my %args = (OPERATOR => '=',
-                @_);
-    
-    $self->Limit (FIELD => 'id',
-                  VALUE => $args{'VALUE'},
-                  OPERATOR => $args{'OPERATOR'},
-                  DESCRIPTION => 'Id ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-                 );
-}
-
-# }}}
-
-# {{{ sub LimitPriority
-
-=head2 LimitPriority
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of =, >, < or !=.
-VALUE is a value to match the ticket\'s priority against
-
-=cut
-
-sub LimitPriority {
-    my $self = shift;
-    my %args = (@_);
-    $self->Limit (FIELD => 'Priority',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Priority ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-		 );
-}
-
-# }}}
-
-# {{{ sub LimitInitialPriority
-
-=head2 LimitInitialPriority
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of =, >, < or !=.
-VALUE is a value to match the ticket\'s initial priority against
-
-
-=cut
-
-sub LimitInitialPriority {
-    my $self = shift;
-    my %args = (@_);
-    $self->Limit (FIELD => 'InitialPriority',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Initial Priority ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-		 );
-}
-
-# }}}
 
-# {{{ sub LimitFinalPriority
-
-=head2 LimitFinalPriority
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of =, >, < or !=.
-VALUE is a value to match the ticket\'s final priority against
-
-=cut
-
-sub LimitFinalPriority {
-    my $self = shift;
-    my %args = (@_);
-    $self->Limit (FIELD => 'FinalPriority',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Final Priority ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-		 );
-}
-
-# }}}
-
-# {{{ sub LimitTimeWorked
-
-=head2 LimitTimeWorked
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of =, >, < or !=.
-VALUE is a value to match the ticket's TimeWorked attribute
-
-=cut
-
-sub LimitTimeWorked {
-    my $self = shift;
-    my %args = (@_);
-    $self->Limit (FIELD => 'TimeWorked',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Time worked ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-		 );
-}
-
-# }}}
-
-# {{{ sub LimitTimeLeft
-
-=head2 LimitTimeLeft
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of =, >, < or !=.
-VALUE is a value to match the ticket's TimeLeft attribute
-
-=cut
-
-sub LimitTimeLeft {
-    my $self = shift;
-    my %args = (@_);
-    $self->Limit (FIELD => 'TimeLeft',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Time left ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-		 );
-}
-
-# }}}
-
-# }}}
-
-# {{{ Limiting based on attachment attributes
-
-# {{{ sub LimitContent
-
-=head2 LimitContent
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of =, LIKE, NOT LIKE or !=.
-VALUE is a string to search for in the body of the ticket
-
-=cut
-sub LimitContent {
-    my $self = shift;
-    my %args = (@_);
-    $self->Limit (FIELD => 'Content',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Ticket content ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-		 );
-}
-
-# }}}
-# {{{ sub LimitContentType
-
-=head2 LimitContentType
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of =, LIKE, NOT LIKE or !=.
-VALUE is a content type to search ticket attachments for
-
-=cut
-  
-sub LimitContentType {
-    my $self = shift;
-    my %args = (@_);
-    $self->Limit (FIELD => 'ContentType',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Ticket content type ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-		 );
-}
-# }}}
-
-# }}}
-
-# {{{ Limiting based on people
-
-# {{{ sub LimitOwner
-
-=head2 LimitOwner
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of = or !=.
-VALUE is a user id.
-
-=cut
-
-sub LimitOwner {
-    my $self = shift;
-    my %args = ( OPERATOR => '=',
-                 @_);
-    
-    my $owner = new RT::User($self->CurrentUser);
-    $owner->Load($args{'VALUE'});
-    $self->Limit (FIELD => 'Owner',
-		  VALUE => $owner->Id,
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Owner ' .  $args{'OPERATOR'}. " ". $owner->Name()
-		 );
-    
-}
-
-# }}}
-
-# {{{ Limiting watchers
-
-# {{{ sub LimitWatcher
+use RT::SearchBuilder;
+use RT::Ticket;
 
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-=head2 LimitWatcher
-  
-  Takes a paramhash with the fields OPERATOR, TYPE and VALUE.
-  OPERATOR is one of =, LIKE, NOT LIKE or !=.
-  VALUE is a value to match the ticket\'s watcher email addresses against
-  TYPE is the sort of watchers you want to match against. Leave it undef if you want to search all of them
 
-=cut
-   
-sub LimitWatcher {
+sub _Init {
     my $self = shift;
-    my %args = ( OPERATOR => '=',
-		 VALUE => undef,
-		 TYPE => undef,
-		@_);
-
-
-    #build us up a description
-    my ($watcher_type, $desc);
-    if ($args{'TYPE'}) {
-	$watcher_type = $args{'TYPE'};
-    }
-    else {
-	$watcher_type = "Watcher";
-    }
-    $desc = "$watcher_type ".$args{'OPERATOR'}." ".$args{'VALUE'};
-
-
-    $self->Limit (FIELD => 'Watcher',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  TYPE => $args{'TYPE'},
-		  DESCRIPTION => "$desc"
-		 );
-}
-
-# }}}
-
-# {{{ sub LimitRequestor
+    $self->{'table'} = 'Tickets';
+    $self->{'primary_key'} = 'id';
 
-=head2 LimitRequestor
 
-It\'s like LimitWatcher, but it presets TYPE to Requestor
-
-=cut
-
-
-sub LimitRequestor {
-    my $self = shift;
-    $self->LimitWatcher(TYPE=> 'Requestor', @_);
+    return ( $self->SUPER::_Init(@_) );
 }
 
-# }}}
-
-# {{{ sub LimitCc
 
-=head2 LimitCC
+=item NewItem
 
-It\'s like LimitWatcher, but it presets TYPE to Cc
+Returns an empty new RT::Ticket item
 
 =cut
 
-sub LimitCc {
-    my $self = shift;
-    $self->LimitWatcher(TYPE=> 'Cc', @_);
-}
-
-# }}}
-
-# {{{ sub LimitAdminCc
-
-=head2 LimitAdminCc
-
-It\'s like LimitWatcher, but it presets TYPE to AdminCc
-
-=cut
-  
-sub LimitAdminCc {
+sub NewItem {
     my $self = shift;
-    $self->LimitWatcher(TYPE=> 'AdminCc', @_);
+    return(RT::Ticket->new($self->CurrentUser));
 }
 
-# }}}
-
-# }}}
-
-# }}}
+        eval "require RT::Tickets_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Tickets_Overlay.pm}) {
+            die $@;
+        };
 
-# {{{ Limiting based on links
+        eval "require RT::Tickets_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Tickets_Vendor.pm}) {
+            die $@;
+        };
 
-# {{{ LimitLinkedTo
+        eval "require RT::Tickets_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Tickets_Local.pm}) {
+            die $@;
+        };
 
-=head2 LimitLinkedTo
 
-LimitLinkedTo takes a paramhash with two fields: TYPE and TARGET
-TYPE limits the sort of relationship we want to search on
 
-TARGET is the id or URI of the TARGET of the link
-(TARGET used to be 'TICKET'.  'TICKET' is deprecated, but will be treated as TARGET
 
-=cut
-
-sub LimitLinkedTo {
-    my $self = shift;
-    my %args = ( 
-		TICKET => undef,
-		TARGET => undef,
-		TYPE => undef,
-		 @_);
-
-
-    $self->Limit( FIELD => 'LinkedTo',
-		  BASE => undef,
-		  TARGET => ($args{'TARGET'} || $args{'TICKET'}),
-		  TYPE => $args{'TYPE'},
-		  DESCRIPTION => "Tickets ".$args{'TYPE'}." by ".($args{'TARGET'} || $args{'TICKET'})
-		);
-}
-
-
-# }}}
+=head1 SEE ALSO
 
-# {{{ LimitLinkedFrom
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
-=head2 LimitLinkedFrom
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-LimitLinkedFrom takes a paramhash with two fields: TYPE and BASE
-TYPE limits the sort of relationship we want to search on
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
+   no warnings qw(redefine);
 
-BASE is the id or URI of the BASE of the link
-(BASE used to be 'TICKET'.  'TICKET' is deprecated, but will be treated as BASE
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
+RT::Tickets_Overlay, RT::Tickets_Vendor, RT::Tickets_Local
 
 =cut
 
-sub LimitLinkedFrom {
-    my $self = shift;
-    my %args = ( BASE => undef,
-		 TICKET => undef,
-		 TYPE => undef,
-		 @_);
-
-    
-    $self->Limit( FIELD => 'LinkedTo',
-		  TARGET => undef,
-		  BASE => ($args{'BASE'} || $args{'TICKET'}),
-		  TYPE => $args{'TYPE'},
-		  DESCRIPTION => "Tickets " .($args{'BASE'} || $args{'TICKET'}) ." ".$args{'TYPE'}
-		);
-}
-
-
-# }}}
-
-# {{{ LimitMemberOf 
-sub LimitMemberOf {
-    my $self = shift;
-    my $ticket_id = shift;
-    $self->LimitLinkedTo ( TARGET=> "$ticket_id",
-			   TYPE => 'MemberOf',
-			  );
-    
-}
-# }}}
-
-# {{{ LimitHasMember
-sub LimitHasMember {
-    my $self = shift;
-    my $ticket_id =shift;
-    $self->LimitLinkedFrom ( BASE => "$ticket_id",
-			     TYPE => 'MemberOf',
-			     );
-    
-}
-# }}}
-
-# {{{ LimitDependsOn
-
-sub LimitDependsOn {
-    my $self = shift;
-    my $ticket_id = shift;
-    $self->LimitLinkedTo ( TARGET => "$ticket_id",
-                           TYPE => 'DependsOn',
-			   );
-    
-}
-
-# }}}
-
-# {{{ LimitDependedOnBy
-
-sub LimitDependedOnBy {
-    my $self = shift;
-    my $ticket_id = shift;
-    $self->LimitLinkedFrom (  BASE => "$ticket_id",
-                               TYPE => 'DependsOn',
-			     );
-    
-}
-
-# }}}
-
-
-# {{{ LimitRefersTo
-
-sub LimitRefersTo {
-    my $self = shift;
-    my $ticket_id = shift;
-    $self->LimitLinkedTo ( TARGET => "$ticket_id",
-                           TYPE => 'RefersTo',
-			   );
-    
-}
-
-# }}}
-
-# {{{ LimitReferredToBy
-
-sub LimitReferredToBy {
-    my $self = shift;
-    my $ticket_id = shift;
-    $self->LimitLinkedFrom (  BASE=> "$ticket_id",
-                               TYPE => 'RefersTo',
-			     );
-    
-}
-
-# }}}
-
-# }}}
-
-# {{{ limit based on ticket date attribtes
-
-# {{{ sub LimitDate
-
-=head2 LimitDate (FIELD => 'DateField', OPERATOR => $oper, VALUE => $ISODate)
-
-Takes a paramhash with the fields FIELD OPERATOR and VALUE.
-
-OPERATOR is one of > or < 
-VALUE is a date and time in ISO format in GMT
-FIELD is one of Starts, Started, Told, Created, Resolved, LastUpdated
-
-There are also helper functions of the form LimitFIELD that eliminate
-the need to pass in a FIELD argument.
-
-=cut
-
-sub LimitDate {
-    my $self = shift;
-    my %args = (
-                  FIELD => undef,
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-
-                  @_);
-
-    #Set the description if we didn't get handed it above
-    unless ($args{'DESCRIPTION'} ) {
-	$args{'DESCRIPTION'} = $args{'FIELD'} . " " .$args{'OPERATOR'}. " ". $args{'VALUE'} . " GMT"
-    }
-
-    $self->Limit (%args);
-
-}
-
-# }}}
-
-
-
-
-sub LimitCreated {
-    my $self = shift;
-    $self->LimitDate( FIELD => 'Created', @_);
-}
-sub LimitDue {
-    my $self = shift;
-    $self->LimitDate( FIELD => 'Due', @_);
-
-}
-sub LimitStarts {
-    my $self = shift;
-    $self->LimitDate( FIELD => 'Starts', @_);
-
-}
-sub LimitStarted {
-    my $self = shift;
-    $self->LimitDate( FIELD => 'Started', @_);
-}
-sub LimitResolved { 
-    my $self = shift;
-    $self->LimitDate( FIELD => 'Resolved', @_);
-}
-sub LimitTold {
-    my $self = shift;
-    $self->LimitDate( FIELD => 'Told', @_);
-}
-sub LimitLastUpdated {
-    my $self = shift;
-    $self->LimitDate( FIELD => 'LastUpdated', @_);
-}
-#
-# {{{ sub LimitTransactionDate
-
-=head2 LimitTransactionDate (OPERATOR => $oper, VALUE => $ISODate)
-
-Takes a paramhash with the fields FIELD OPERATOR and VALUE.
-
-OPERATOR is one of > or < 
-VALUE is a date and time in ISO format in GMT
-
-
-=cut
-
-sub LimitTransactionDate {
-    my $self = shift;
-    my %args = (
-                  FIELD => 'TransactionDate',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-
-                  @_);
-
-    #Set the description if we didn't get handed it above
-    unless ($args{'DESCRIPTION'} ) {
-	$args{'DESCRIPTION'} = $args{'FIELD'} . " " .$args{'OPERATOR'}. " ". $args{'VALUE'} . " GMT"
-    }
-
-    $self->Limit (%args);
-
-}
-
-# }}}
-
-# }}}
-
-# {{{ sub LimitKeyword
-
-=head2 LimitKeyword 
-
-Takes a paramhash of key/value pairs with the following keys:
-
-=over 4
-
-=item KEYWORDSELECT - KeywordSelect id
-
-=item OPERATOR - (for KEYWORD only - KEYWORDSELECT operator is always `=')
-
-=item KEYWORD - Keyword id
-
-=back
-
-=cut
-
-sub LimitKeyword {
-    my $self = shift;
-    my %args = ( KEYWORD => undef,
-                 KEYWORDSELECT => undef,
-		 OPERATOR => '=',
-		 DESCRIPTION => undef,
-		 FIELD => 'Keyword',
-		 QUOTEVALUE => 1,
-		 @_
-	       );
-
-    use RT::KeywordSelect;
-    my $KeywordSelect = RT::KeywordSelect->new($self->CurrentUser);
-    $KeywordSelect->Load($args{KEYWORDSELECT});
-    
-
-    # Below, We're checking to see whether the keyword we're searching for
-    # is null or not.
-    # This could probably be rewritten to be easier to read and  understand
-
-    
-    #If we are looking to compare with a null value.
-    if ($args{'OPERATOR'} =~ /is/i)  {
-	if ($args{'OPERATOR'} =~ /^is$/i) {
-	    $args{'DESCRIPTION'} ||= "Keyword Selection ". $KeywordSelect->Name . " has no value";
-	}
-	elsif ($args{'OPERATOR'} =~ /^is not$/i) {
-	    $args{'DESCRIPTION'} ||= "Keyword Selection ". $KeywordSelect->Name . " has a value";
-	}
-    }
-	# if we're not looking to compare with a null value
-    else { 	
-        use RT::Keyword;
-	my $Keyword = RT::Keyword->new($self->CurrentUser);
-	$Keyword->Load($args{KEYWORD});
-	$args{'DESCRIPTION'} ||= "Keyword Selection " . $KeywordSelect->Name.  " $args{OPERATOR} ". $Keyword->Name;
-    }
-    
-    $args{SingleValued} = $KeywordSelect->Single();
- 
-    
-    my $index = $self->_NextIndex;
-    %{$self->{'TicketRestrictions'}{$index}} = %args;
-    
-    $self->{'RecalcTicketLimits'} = 1;
-    return ($index);
-}
-
-# }}}
-
-# {{{ sub _NextIndex
-
-=head2 _NextIndex
-
-Keep track of the counter for the array of restrictions
-
-=cut
-
-sub _NextIndex {
-    my $self = shift;
-    return ($self->{'restriction_index'}++);
-}
-# }}}
-
-# }}} 
-
-# {{{ Core bits to make this a DBIx::SearchBuilder object
-
-# {{{ sub _Init 
-sub _Init  {
-    my $self = shift;
-    $self->{'table'} = "Tickets";
-    $self->{'RecalcTicketLimits'} = 1;
-    $self->{'looking_at_effective_id'} = 0;
-    $self->{'restriction_index'} =1;
-    $self->{'primary_key'} = "id";
-    $self->SUPER::_Init(@_);
-
-}
-# }}}
-
-# {{{ sub NewItem 
-sub NewItem  {
-  my $self = shift;
-  return(RT::Ticket->new($self->CurrentUser));
-
-}
-# }}}
-
-# {{{ sub Count
-sub Count {
-  my $self = shift;
-  $self->_ProcessRestrictions if ($self->{'RecalcTicketLimits'} == 1 );
-  return($self->SUPER::Count());
-}
-# }}}
-
-# {{{ sub ItemsArrayRef
-
-=head2 ItemsArrayRef
-
-Returns a reference to the set of all items found in this search
-
-=cut
-
-sub ItemsArrayRef {
-    my $self = shift;
-    my @items;
-    
-    my $placeholder = $self->_ItemsCounter;
-    $self->GotoFirstItem();
-    while (my $item = $self->Next) { 
-	push (@items, $item);
-    }
-    
-    $self->GotoItem($placeholder);
-    return(\@items);
-}
-# }}}
-
-# {{{ sub Next 
-sub Next {
-	my $self = shift;
- 	
-	$self->_ProcessRestrictions if ($self->{'RecalcTicketLimits'} == 1 );
-
-	my $Ticket = $self->SUPER::Next();
-	if ((defined($Ticket)) and (ref($Ticket))) {
-
-    	    #Make sure we _never_ show dead tickets
-	    #TODO we should be doing this in the where clause.
-	    #but you can't do multiple clauses on the same field just yet :/
-
-	    if ($Ticket->Status eq 'dead') {
-		return($self->Next());
-	    }
-  	    elsif ($Ticket->CurrentUserHasRight('ShowTicket')) {
-		return($Ticket);
-	    }
-
-	    #If the user doesn't have the right to show this ticket
-	    else {	
-		return($self->Next());
-	    }
-	}
-	#if there never was any ticket
-	else {
-		return(undef);
-	}	
-
-}
-# }}}
-
-# }}}
-
-# {{{ Deal with storing and restoring restrictions
-
-# {{{ sub LoadRestrictions
-
-=head2 LoadRestrictions
-
-LoadRestrictions takes a string which can fully populate the TicketRestrictons hash.
-TODO It is not yet implemented
-
-=cut
-
-# }}}
-
-# {{{ sub DescribeRestrictions
-
-=head2 DescribeRestrictions
-
-takes nothing.
-Returns a hash keyed by restriction id. 
-Each element of the hash is currently a one element hash that contains DESCRIPTION which
-is a description of the purpose of that TicketRestriction
-
-=cut
-
-sub DescribeRestrictions  {
-    my $self = shift;
-    
-    my ($row, %listing);
-    
-    foreach $row (keys %{$self->{'TicketRestrictions'}}) {
-	$listing{$row} = $self->{'TicketRestrictions'}{$row}{'DESCRIPTION'};
-    }
-    return (%listing);
-}
-# }}}
-
-# {{{ sub RestrictionValues
-
-=head2 RestrictionValues FIELD
-
-Takes a restriction field and returns a list of values this field is restricted
-to.
-
-=cut
-
-sub RestrictionValues {
-    my $self = shift;
-    my $field = shift;
-    map $self->{'TicketRestrictions'}{$_}{'VALUE'},
-      grep {
-             $self->{'TicketRestrictions'}{$_}{'FIELD'} eq $field
-             && $self->{'TicketRestrictions'}{$_}{'OPERATOR'} eq "="
-           }
-        keys %{$self->{'TicketRestrictions'}};
-}
-
-# }}}
-
-# {{{ sub ClearRestrictions
-
-=head2 ClearRestrictions
-
-Removes all restrictions irretrievably
-
-=cut
-  
-sub ClearRestrictions {
-    my $self = shift;
-    delete $self->{'TicketRestrictions'};
-    $self->{'looking_at_effective_id'} = 0;
-    $self->{'RecalcTicketLimits'} =1;
-}
-
-# }}}
-
-# {{{ sub DeleteRestriction
-
-=head2 DeleteRestriction
-
-Takes the row Id of a restriction (From DescribeRestrictions' output, for example.
-Removes that restriction from the session's limits.
-
-=cut
-
-
-sub DeleteRestriction {
-    my $self = shift;
-    my $row = shift;
-    delete $self->{'TicketRestrictions'}{$row};
-    
-    $self->{'RecalcTicketLimits'} = 1;
-    #make the underlying easysearch object forget all its preconceptions
-}
-
-# }}}
-
-# {{{ sub _ProcessRestrictions 
-
-sub _ProcessRestrictions {
-    my $self = shift;
-
-    #Need to clean the EasySearch slate because it makes things too sticky
-    $self->CleanSlate();
-
-    #Blow away ticket aliases since we'll need to regenerate them for a new search
-    delete $self->{'TicketAliases'};
-    delete $self->{KeywordsAliases};
-
-    my $row;
-    
-    foreach $row (keys %{$self->{'TicketRestrictions'}}) {
-        my $restriction = $self->{'TicketRestrictions'}{$row};
-	# {{{ if it's an int
-	
-	if ($TYPES{$restriction->{'FIELD'}} eq 'INT' ) {
-	    if ($restriction->{'OPERATOR'} =~ /^(=|!=|>|<|>=|<=)$/) {
-		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
-			      ENTRYAGGREGATOR => 'AND',
-			      OPERATOR => $restriction->{'OPERATOR'},
-			      VALUE => $restriction->{'VALUE'},
-			      );
-	    }
-	}
-	# }}}
-	# {{{ if it's an enum
-	elsif ($TYPES{$restriction->{'FIELD'}} eq 'ENUM') {
-	    
-	    if ($restriction->{'OPERATOR'} eq '=') {
-		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
-			      ENTRYAGGREGATOR => 'OR',
-			      OPERATOR => '=',
-			      VALUE => $restriction->{'VALUE'},
-			    );
-	    }
-	    elsif ($restriction->{'OPERATOR'} eq '!=') {
-		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
-			      ENTRYAGGREGATOR => 'AND',
-			      OPERATOR => '!=',
-			      VALUE => $restriction->{'VALUE'},
-			    );
-	    }
-	    
-	}
-	# }}}
-	# {{{ if it's a date
-
-	elsif ($TYPES{$restriction->{'FIELD'}} eq 'DATE') {
-	    $self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
-				 ENTRYAGGREGATOR => 'AND',
-				 OPERATOR => $restriction->{'OPERATOR'},
-				 VALUE => $restriction->{'VALUE'},
-			       );
-	}
-	# }}}
- 	# {{{ if it's a string
-
-	elsif ($TYPES{$restriction->{'FIELD'}} eq 'STRING') {
-	    
-	    if ($restriction->{'OPERATOR'} eq '=') {
-		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
-			      ENTRYAGGREGATOR => 'OR',
-			      OPERATOR => '=',
-			      VALUE => $restriction->{'VALUE'},
-			      CASESENSITIVE => 0
-			    );
-	    }
-	    elsif ($restriction->{'OPERATOR'} eq '!=') {
-		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
-			      ENTRYAGGREGATOR => 'AND',
-			      OPERATOR => '!=',
-			      VALUE => $restriction->{'VALUE'},
-			      CASESENSITIVE => 0
-			    );
-	    }
-	    elsif ($restriction->{'OPERATOR'} eq 'LIKE') {
-		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
-			      ENTRYAGGREGATOR => 'AND',
-			      OPERATOR => 'LIKE',
-			      VALUE => $restriction->{'VALUE'},
-			      CASESENSITIVE => 0
-			    );
-	    }
-	    elsif ($restriction->{'OPERATOR'} eq 'NOT LIKE') {
-		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
-			      ENTRYAGGREGATOR => 'AND',
-			      OPERATOR => 'NOT LIKE',
-			      VALUE => $restriction->{'VALUE'},
-			      CASESENSITIVE => 0
-			    );
-	    }
-	}
-
-	# }}}
-	# {{{ if it's Transaction content that we're hunting for
-	elsif ($TYPES{$restriction->{'FIELD'}} eq 'TRANSFIELD') {
-
-	    #Basically, we want to make sure that the limits apply to the same attachment,
-	    #rather than just another attachment for the same ticket, no matter how many 
-	    #clauses we lump on. 
-	    #We put them in TicketAliases so that they get nuked when we redo the join.
-	    
-	    unless (defined $self->{'TicketAliases'}{'TransFieldAlias'}) {
-		$self->{'TicketAliases'}{'TransFieldAlias'} = $self->NewAlias ('Transactions');
-	    }
-	    unless (defined $self->{'TicketAliases'}{'TransFieldAttachAlias'}){
-		$self->{'TicketAliases'}{'TransFieldAttachAlias'} = $self->NewAlias('Attachments');
-		
-	    }
-	    #Join transactions to attachments
-	    $self->Join( ALIAS1 => $self->{'TicketAliases'}{'TransFieldAttachAlias'},  
-			 FIELD1 => 'TransactionId',
-			 ALIAS2 => $self->{'TicketAliases'}{'TransFieldAlias'}, FIELD2=> 'id');
-	    
-	    #Join transactions to tickets
-	    $self->Join( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
-			 ALIAS2 =>$self->{'TicketAliases'}{'TransFieldAlias'}, FIELD2 => 'Ticket');
-	    
-	    #Search for the right field
-	    $self->SUPER::Limit(ALIAS => $self->{'TicketAliases'}{'TransFieldAttachAlias'},
-				  ENTRYAGGREGATOR => 'AND',
-				  FIELD =>    $restriction->{'FIELD'},
-				  OPERATOR => $restriction->{'OPERATOR'} ,
-				  VALUE =>    $restriction->{'VALUE'},
-			      	  CASESENSITIVE => 0
- 				);
-	    
-
-	}
-
-	# }}}
-	# {{{ if it's a Transaction date that we're hunting for
-	elsif ($TYPES{$restriction->{'FIELD'}} eq 'TRANSDATE') {
-
-	    #Basically, we want to make sure that the limits apply to the same attachment,
-	    #rather than just another attachment for the same ticket, no matter how many 
-	    #clauses we lump on. 
-	    #We put them in TicketAliases so that they get nuked when we redo the join.
-	    
-	    unless (defined $self->{'TicketAliases'}{'TransFieldAlias'}) {
-		$self->{'TicketAliases'}{'TransFieldAlias'} = $self->NewAlias ('Transactions');
-	    }
-
-	    #Join transactions to tickets
-	    $self->Join( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
-			 ALIAS2 =>$self->{'TicketAliases'}{'TransFieldAlias'}, FIELD2 => 'Ticket');
-	    
-	    #Search for the right field
-	    $self->SUPER::Limit(ALIAS => $self->{'TicketAliases'}{'TransFieldAlias'},
-				ENTRYAGGREGATOR => 'AND',
-				FIELD =>    'Created',
-				OPERATOR => $restriction->{'OPERATOR'} ,
-				VALUE =>    $restriction->{'VALUE'} );
-	}
-
-	# }}}
-	# {{{ if it's a relationship that we're hunting for
-	
-	# Takes FIELD: which is something like "LinkedTo"
-	# takes TARGET or BASE which is the TARGET or BASE id that we're searching for
-	# takes TYPE which is the type of link we're looking for.
-
-	elsif ($TYPES{$restriction->{'FIELD'}} eq 'LINKFIELD') {
-
-	    
-	    my $LinkAlias = $self->NewAlias ('Links');
-
-	    
-	    #Make sure we get the right type of link, if we're restricting it
-	    if ($restriction->{'TYPE'}) {
-		$self->SUPER::Limit(ALIAS => $LinkAlias,
-				    ENTRYAGGREGATOR => 'AND',
-				    FIELD =>   'Type',
-				    OPERATOR => '=',
-				    VALUE =>    $restriction->{'TYPE'} );
-	    }
-	    
-	    #If we're trying to limit it to things that are target of
-	    if ($restriction->{'TARGET'}) {
-		
-
-		# If the TARGET is an integer that means that we want to look at the LocalTarget
-		# field. otherwise, we want to look at the "Target" field
-
-		my ($matchfield);
-		if ($restriction->{'TARGET'} =~/^(\d+)$/) {
-		    $matchfield = "LocalTarget";
-		}	
-		else {
-		    $matchfield = "Target";
-		}	
-
-		$self->SUPER::Limit(ALIAS => $LinkAlias,
-				    ENTRYAGGREGATOR => 'AND',
-				    FIELD =>   $matchfield,
-				    OPERATOR => '=',
-				    VALUE =>    $restriction->{'TARGET'} );
-
-		
-		#If we're searching on target, join the base to ticket.id
-		$self->Join( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
-			     ALIAS2 => $LinkAlias,
-			     FIELD2 => 'LocalBase');
-
-	    
-
-
-	    }
-	    #If we're trying to limit it to things that are base of
-	    elsif ($restriction->{'BASE'}) {
-
-
-		# If we're trying to match a numeric link, we want to look at LocalBase,
-		# otherwise we want to look at "Base"
-
-		my ($matchfield);
-		if ($restriction->{'BASE'} =~/^(\d+)$/) {
-		    $matchfield = "LocalBase";
-		}	
-		else {
-		    $matchfield = "Base";
-		}	
-
-
-		$self->SUPER::Limit(ALIAS => $LinkAlias,
-				    ENTRYAGGREGATOR => 'AND',
-				    FIELD => $matchfield,
-				    OPERATOR => '=',
-				    VALUE =>    $restriction->{'BASE'} );
-		
-		#If we're searching on base, join the target to ticket.id
-		$self->Join( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
-			     ALIAS2 => $LinkAlias,
-			     FIELD2 => 'LocalTarget');
-		
-	    }
-
-	}
-		
-	# }}}
-	# {{{ if it's a watcher that we're hunting for
-	elsif ($TYPES{$restriction->{'FIELD'}} eq 'WATCHERFIELD') {
-
-	    my $Watch = $self->NewAlias('Watchers');
-
-	    #Join watchers to users
-	    my $User = $self->Join( TYPE => 'left',
-				     ALIAS1 => $Watch, 
-				     FIELD1 => 'Owner',
-				     TABLE2 => 'Users', 
-				     FIELD2 => 'id',
-				   );
-
-	    #Join Ticket to watchers
-	    $self->Join( ALIAS1 => 'main', FIELD1 => 'id',
-			 ALIAS2 => $Watch, FIELD2 => 'Value');
-
-
-	    #Make sure we're only talking about ticket watchers
-	    $self->SUPER::Limit( ALIAS => $Watch,
-				 FIELD => 'Scope',
-				 VALUE => 'Ticket',
-				 OPERATOR => '=');
-
-
-	    # Find email address watchers
-	    $self->SUPER::Limit( SUBCLAUSE => 'WatcherEmailAddress',
-				 ALIAS => $Watch,
-				 FIELD => 'Email',
-				 ENTRYAGGREGATOR => 'OR',
-				 VALUE => $restriction->{'VALUE'},
-				 OPERATOR => $restriction->{'OPERATOR'},
-			         CASESENSITIVE => 0
-			);
-
-
-
-	    #Find user watchers
-	    $self->SUPER::Limit(
-				SUBCLAUSE => 'WatcherEmailAddress',
-				ALIAS => $User,
-				FIELD => 'EmailAddress',
-				ENTRYAGGREGATOR => 'OR',
-				VALUE => $restriction->{'VALUE'},
-				OPERATOR => $restriction->{'OPERATOR'},
-			        CASESENSITIVE => 0
-			       );
-
-	    
-	    #If we only want a specific type of watchers, then limit it to that
-	    if ($restriction->{'TYPE'}) {
-		$self->SUPER::Limit( ALIAS => $Watch,
-				     FIELD => 'Type',
-				     ENTRYAGGREGATOR => 'OR',
-				     VALUE => $restriction->{'TYPE'},
-				     OPERATOR => '=');
-	    }
-	}
-
-	# }}}
-	# {{{ if it's a keyword
-	elsif ($TYPES{$restriction->{'FIELD'}} eq 'KEYWORDFIELD') {
- 
-	    my $null_columns_ok;
-
-            my $ObjKeywordsAlias;
-	    $ObjKeywordsAlias = $self->{KeywordsAliases}{$restriction->{'KEYWORDSELECT'}}
-	      if $restriction->{SingleValued};
-	    unless (defined $ObjKeywordsAlias) {
-	      $ObjKeywordsAlias = $self->Join(
-					       TYPE => 'left',
-					       ALIAS1 => 'main',
-					       FIELD1 => 'id',
-					       TABLE2 => 'ObjectKeywords',
-					       FIELD2 => 'ObjectId'
-					      );
-	      if ($restriction->{'SingleValued'}) {
-		$self->{KeywordsAliases}{$restriction->{'KEYWORDSELECT'}} 
-		  = $ObjKeywordsAlias;
-	      }
-	    }
-
-	  
-            $self->SUPER::Limit(
-				ALIAS => $ObjKeywordsAlias,
-				FIELD => 'Keyword',
-				OPERATOR => $restriction->{'OPERATOR'},
-				VALUE => $restriction->{'KEYWORD'},
-				QUOTEVALUE => $restriction->{'QUOTEVALUE'},
-				ENTRYAGGREGATOR => 'OR',
-                               );
-	    
-            if  ( ($restriction->{'OPERATOR'} =~ /^IS$/i) or 
-	          ($restriction->{'OPERATOR'} eq '!=') ) {
-		
-		$null_columns_ok=1;
-
-	    } 
-
-	    #If we're trying to find tickets where the keyword isn't somethng, also check ones where it _IS_ null
-	    if ( $restriction->{'OPERATOR'} eq '!=') {
-	        $self->SUPER::Limit(
-				    ALIAS => $ObjKeywordsAlias,
-				    FIELD => 'Keyword',
-				    OPERATOR => 'IS',
-				    VALUE => 'NULL',
-				    QUOTEVALUE => 0,
-				    ENTRYAGGREGATOR => 'OR',
-				   );
-	      }
-
-
-            $self->SUPER::Limit(LEFTJOIN => $ObjKeywordsAlias,
-				FIELD => 'KeywordSelect',
-				VALUE => $restriction->{'KEYWORDSELECT'},
-				ENTRYAGGREGATOR => 'OR');
-
-
- 
-            $self->SUPER::Limit( ALIAS => $ObjKeywordsAlias,
-                                 FIELD => 'ObjectType',
-                                 VALUE => 'Ticket',
-                                 ENTRYAGGREGATOR => 'AND');
-	    
-	    if ($null_columns_ok) {
-	         $self->SUPER::Limit(ALIAS => $ObjKeywordsAlias,
-                                    FIELD => 'ObjectType',
-	   	  		    OPERATOR => 'IS',
-                                    VALUE => 'NULL',
-				    QUOTEVALUE => 0,
-                                    ENTRYAGGREGATOR => 'OR');
-	    }
-	   
-        }
-        # }}}
-
-    
-     }
-
-     
-     # here, we make sure we don't get any tickets that have been merged  into other tickets
-     # (Ticket Id == Ticket EffectiveId
-     # note that we _really_ don't want to do this if we're already looking at the effectiveid
-     if ($self->_isLimited && (! $self->{'looking_at_effective_id'})) {
-        $self->SUPER::Limit( FIELD => 'EffectiveId', 
-              OPERATOR => '=',
-              QUOTEVALUE => 0,
-              VALUE => 'main.id');   #TODO, we shouldn't be hard coding the tablename to main.
-      } 
-    $self->{'RecalcTicketLimits'} = 0;
-}
-
-# }}}
-
-# }}}
-
-# {{{ Deal with displaying rows of the listing 
-
-#
-#  Everything in this section is stub code for 2.2
-# It's not part of the API. It's not for your use
-# It's not for our use.
-#
-
-
-# {{{ sub SetListingFormat
-
-=head2 SetListingFormat
-
-Takes a single Format string as specified below. parses that format string and makes the various listing output
-things DTRT.
-
-=item Format strings
-
-Format strings are made up of a chain of Elements delimited with vertical pipes (|).
-Elements of a Format string 
-
-
-FormatString:    Element[::FormatString]
-
-Element:         AttributeName[;HREF=<URL>][;TITLE=<TITLE>]
-
-AttributeName    Id | Subject | Status | Owner | Priority | InitialPriority | TimeWorked | TimeLeft |
-  
-                 Keywords[;SELECT=<KeywordSelect>] | 
-	
-                <Created|Starts|Started|Contacted|Due|Resolved>Date<AsString|AsISO|AsAge>
-
-
-=cut
-
-
-
-
-#accept a format string
-
-
-
-sub SetListingFormat {
-    my $self = shift;
-    my $listing_format = shift;
-    
-    my ($element, $attribs);
-    my $i = 0;
-    foreach $element (split (/::/,$listing_format)) {
-	if ($element =~ /^(.*?);(.*)$/) {
-	    $element = $1;
-	    $attribs = $2;
-	}	
-	$self->{'format_string'}->[$i]->{'Element'} = $element;
-	foreach $attrib (split (/;/, $attribs)) {
-	    my $value = "";
-	    if ($attrib =~ /^(.*?)=(.*)$/) {
-		$attrib = $1;
-		$value = $2;
-	    }	
-	    $self->{'format_string'}->[$i]->{"$attrib"} = $val;
-	    
-	}
-    
-    }
-    return(1);
-}
-
-# }}}
-
-# {{{ sub HeaderAsHTML
-sub HeaderAsHTML {
-    my $self = shift;
-    my $header = "";
-    my $col;
-    foreach $col ( @{[ $self->{'format_string'} ]}) {
-	$header .= "<TH>" . $self->_ColumnTitle($self->{'format_string'}->[$col]) . "</TH>";
-	
-    }
-    return ($header);
-}
-# }}}
-
-# {{{ sub HeaderAsText
-#Print text header
-sub HeaderAsText {
-    my $self = shift;
-    my ($header);
-    
-    return ($header);
-}
-# }}}
-
-# {{{ sub TicketAsHTMLRow
-#Print HTML row
-sub TicketAsHTMLRow {
-    my $self = shift;
-    my $Ticket = shift;
-    my ($row, $col);
-    foreach $col (@{[$self->{'format_string'}]}) {
-	$row .= "<TD>" . $self->_TicketColumnValue($ticket,$self->{'format_string'}->[$col]) . "</TD>";
-	
-    }
-    return ($row);
-}
-# }}}
-
-# {{{ sub TicketAsTextRow
-#Print text row
-sub TicketAsTextRow {
-    my $self = shift;
-    my ($row);
-
-    #TODO implement
-    
-    return ($row);
-}
-# }}}
-
-# {{{ _ColumnTitle {
-
-sub _ColumnTitle {
-    my $self = shift;
-    
-    # Attrib is a hash 
-    my $attrib = shift;
-    
-    # return either attrib->{'TITLE'} or..
-    if ($attrib->{'TITLE'}) {
-	return($attrib->{'TITLE'});
-    }	
-    # failing that, Look up the title in a hash
-    else {
-	#TODO create $self->{'ColumnTitles'};
-	return ($self->{'ColumnTitles'}->{$attrib->{'Element'}});
-    }	
-    
-}
-
-# }}}
-
-# {{{ _TicketColumnValue
-sub _TicketColumnValue {
-    my $self = shift;
-    my $Ticket = shift;
-    my $attrib = shift;
-
-    
-    my $out;
-
-  SWITCH: {
-	/^id/i && do {
-	    $out = $Ticket->id;
-	    last SWITCH; 
-	};
-	/^subj/i && do {
-	    last SWITCH; 
-	    $Ticket->Subject;
-		   };	
-	/^status/i && do {
-	    last SWITCH; 
-	    $Ticket->Status;
-	};
-	/^prio/i && do {
-	    last SWITCH; 
-	    $Ticket->Priority;
-	};
-	/^finalprio/i && do {
-	    
-	    last SWITCH; 
-	    $Ticket->FinalPriority
-	};
-	/^initialprio/i && do {
-	    
-	    last SWITCH; 
-	    $Ticket->InitialPriority;
-	};	
-	/^timel/i && do {
-	    
-	    last SWITCH; 
-	    $Ticket->TimeWorked;
-	};
-	/^timew/i && do {
-	    
-	    last SWITCH; 
-	    $Ticket->TimeLeft;
-	};
-	
-	/^(.*?)date(.*)$/i && do {
-	    my $o = $1;
-	    my $m = $2;
-	    my ($obj);
-	    #TODO: optimize
-	    $obj = $Ticket->DueObj         if $o =~ /due/i;
-	    $obj = $Ticket->CreatedObj     if $o =~ /created/i;
-	    $obj = $Ticket->StartsObj      if $o =~ /starts/i;
-	    $obj = $Ticket->StartedObj     if $o =~ /started/i;
-	    $obj = $Ticket->ToldObj        if $o =~ /told/i;
-	    $obj = $Ticket->LastUpdatedObj if $o =~ /lastu/i;
-	    
-	    $method = 'ISO' if $m =~ /iso/i;
-	    
-	    $method = 'AsString' if $m =~ /asstring/i;
-	    $method = 'AgeAsString' if $m =~ /age/i;
-	    last SWITCH;
-	    $obj->$method();
-	      
-	};
-	  
-	  /^watcher/i && do {
-	      last SWITCH; 
-	      $Ticket->WatchersAsString();
-	  };	
-	
-	/^requestor/i && do {
-	    last SWITCH; 
-	    $Ticket->RequestorsAsString();
-	};	
-	/^cc/i && do {
-	    last SWITCH; 
-	    $Ticket->CCAsString();
-	};	
-	
-	
-	/^admincc/i && do {
-	    last SWITCH; 
-	    $Ticket->AdminCcAsString();
-	};
-	
-	/^keywords/i && do {
-	    last SWITCH; 
-	    #Limit it to the keyword select we're talking about, if we've got one.
-	    my $objkeys =$Ticket->KeywordsObj($attrib->{'SELECT'});
-	    $objkeys->KeywordRelativePathsAsString();
-	};
-	
-    }
-      
-}
-
-# }}}
-
-# }}}
-
-# {{{ POD
-=head2 notes
-"Enum" Things that get Is, IsNot
-
-
-"Int" Things that get Is LessThan and GreaterThan
-id
-InitialPriority
-FinalPriority
-Priority
-TimeLeft
-TimeWorked
-
-"Text" Things that get Is, Like
-Subject
-TransactionContent
-
-
-"Link" OPERATORs
-
-
-"Date" OPERATORs Is, Before, After
 
-  =cut
-# }}}
 1;
diff --git a/rt/lib/RT/Tickets_Overlay.pm b/rt/lib/RT/Tickets_Overlay.pm
new file mode 100644
index 000000000..d8a1ac803
--- /dev/null
+++ b/rt/lib/RT/Tickets_Overlay.pm
@@ -0,0 +1,2055 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Major Changes:
+
+# - Decimated ProcessRestrictions and broke it into multiple
+# functions joined by a LUT
+# - Semi-Generic SQL stuff moved to another file
+
+# Known Issues: FIXME!
+
+# - ClearRestrictions and Reinitialization is messy and unclear.  The
+# only good way to do it is to create a new RT::Tickets object.
+
+=head1 NAME
+
+  RT::Tickets - A collection of Ticket objects
+
+
+=head1 SYNOPSIS
+
+  use RT::Tickets;
+  my $tickets = new RT::Tickets($CurrentUser);
+
+=head1 DESCRIPTION
+
+   A collection of RT::Tickets.
+
+=head1 METHODS
+
+=begin testing
+
+ok (require RT::Tickets);
+
+=end testing
+
+=cut
+use strict;
+no warnings qw(redefine);
+use vars qw(@SORTFIELDS);
+
+
+# Configuration Tables:
+
+# FIELDS is a mapping of searchable Field name, to Type, and other
+# metadata.
+
+my %FIELDS =
+  ( Status	    => ['ENUM'],
+    Queue	    => ['ENUM' => 'Queue',],
+    Type	    => ['ENUM',],
+    Creator	    => ['ENUM' => 'User',],
+    LastUpdatedBy   => ['ENUM' => 'User',],
+    Owner	    => ['ENUM' => 'User',],
+    EffectiveId	    => ['INT',],
+    id		    => ['INT',],
+    InitialPriority => ['INT',],
+    FinalPriority   => ['INT',],
+    Priority	    => ['INT',],
+    TimeLeft	    => ['INT',],
+    TimeWorked	    => ['INT',],
+    MemberOf	    => ['LINK' => To => 'MemberOf', ],
+    DependsOn	    => ['LINK' => To => 'DependsOn',],
+    RefersTo        => ['LINK' => To => 'RefersTo',],
+    HasMember	    => ['LINK' => From => 'MemberOf',],
+    DependentOn     => ['LINK' => From => 'DependsOn',],
+    ReferredTo      => ['LINK' => From => 'RefersTo',],
+#   HasDepender	    => ['LINK',],
+#   RelatedTo	    => ['LINK',],
+    Told	    => ['DATE' => 'Told',],
+    Starts	    => ['DATE' => 'Starts',],
+    Started	    => ['DATE' => 'Started',],
+    Due		    => ['DATE' => 'Due',],
+    Resolved	    => ['DATE' => 'Resolved',],
+    LastUpdated	    => ['DATE' => 'LastUpdated',],
+    Created	    => ['DATE' => 'Created',],
+    Subject	    => ['STRING',],
+    Type	    => ['STRING',],
+    Content	    => ['TRANSFIELD',],
+    ContentType	    => ['TRANSFIELD',],
+    Filename        => ['TRANSFIELD',],
+    TransactionDate => ['TRANSDATE',],
+    Requestor       => ['WATCHERFIELD' => 'Requestor',],
+    CC              => ['WATCHERFIELD' => 'Cc',],
+    AdminCC         => ['WATCHERFIELD' => 'AdminCC',],
+    Watcher	    => ['WATCHERFIELD'],
+    LinkedTo	    => ['LINKFIELD',],
+    CustomFieldValue =>['CUSTOMFIELD',],
+    CF              => ['CUSTOMFIELD',],
+  );
+
+# Mapping of Field Type to Function
+my %dispatch =
+  ( ENUM	    => \&_EnumLimit,
+    INT		    => \&_IntLimit,
+    LINK	    => \&_LinkLimit,
+    DATE	    => \&_DateLimit,
+    STRING	    => \&_StringLimit,
+    TRANSFIELD	    => \&_TransLimit,
+    TRANSDATE	    => \&_TransDateLimit,
+    WATCHERFIELD    => \&_WatcherLimit,
+    LINKFIELD	    => \&_LinkFieldLimit,
+    CUSTOMFIELD    => \&_CustomFieldLimit,
+  );
+
+# Default EntryAggregator per type
+my %DefaultEA = (
+                 INT		=> 'AND',
+                 ENUM		=> { '=' => 'OR',
+				     '!='=> 'AND'
+				   },
+                 DATE		=> 'AND',
+                 STRING		=> { '=' => 'OR',
+				     '!='=> 'AND',
+				     'LIKE'=> 'AND',
+				     'NOT LIKE'	=> 'AND'
+				   },
+                 TRANSFIELD	=> 'AND',
+                 TRANSDATE	=> 'AND',
+                 LINKFIELD	=> 'AND',
+                 TARGET		=> 'AND',
+                 BASE		=> 'AND',
+                 WATCHERFIELD	=> { '=' => 'OR',
+				     '!='=> 'AND',
+				     'LIKE'=> 'OR',
+				     'NOT LIKE'	=> 'AND'
+				   },
+
+                 CUSTOMFIELD	=> 'OR',
+                );
+
+
+# Helper functions for passing the above lexically scoped tables above
+# into Tickets_Overlay_SQL.
+sub FIELDS   { return \%FIELDS   }
+sub dispatch { return \%dispatch }
+
+# Bring in the clowns.
+require RT::Tickets_Overlay_SQL;
+
+# {{{ sub SortFields
+
+@SORTFIELDS = qw(id Status
+		 Queue Subject
+         Owner Created Due Starts Started
+         Told
+		 Resolved LastUpdated Priority TimeWorked TimeLeft);
+
+=head2 SortFields
+
+Returns the list of fields that lists of tickets can easily be sorted by
+
+=cut
+
+sub SortFields {
+	my $self = shift;
+	return(@SORTFIELDS);
+}
+
+
+# }}}
+
+
+# BEGIN SQL STUFF *********************************
+
+=head1 Limit Helper Routines
+
+These routines are the targets of a dispatch table depending on the
+type of field.  They all share the same signature:
+
+  my ($self,$field,$op,$value,@rest) = @_;
+
+The values in @rest should be suitable for passing directly to
+DBIx::SearchBuilder::Limit.
+
+Essentially they are an expanded/broken out (and much simplified)
+version of what ProcessRestrictions used to do.  They're also much
+more clearly delineated by the TYPE of field being processed.
+
+=head2 _EnumLimit
+
+Handle Fields which are limited to certain values, and potentially
+need to be looked up from another class.
+
+This subroutine actually handles two different kinds of fields.  For
+some the user is responsible for limiting the values.  (i.e. Status,
+Type).
+
+For others, the value specified by the user will be looked by via
+specified class.
+
+Meta Data:
+  name of class to lookup in (Optional)
+
+=cut
+
+sub _EnumLimit {
+  my ($sb,$field,$op,$value,@rest) = @_;
+
+  # SQL::Statement changes != to <>.  (Can we remove this now?)
+  $op = "!=" if $op eq "<>";
+
+  die "Invalid Operation: $op for $field"
+    unless $op eq "=" or $op eq "!=";
+
+  my $meta = $FIELDS{$field};
+  if (defined $meta->[1]) {
+    my $class = "RT::" . $meta->[1];
+    my $o = $class->new($sb->CurrentUser);
+    $o->Load( $value );
+    $value = $o->Id;
+  }
+  $sb->_SQLLimit( FIELD => $field,,
+	      VALUE => $value,
+	      OPERATOR => $op,
+	      @rest,
+	    );
+}
+
+=head2 _IntLimit
+
+Handle fields where the values are limited to integers.  (For example,
+Priority, TimeWorked.)
+
+Meta Data:
+  None
+
+=cut
+
+sub _IntLimit {
+  my ($sb,$field,$op,$value,@rest) = @_;
+
+  die "Invalid Operator $op for $field"
+    unless $op =~ /^(=|!=|>|<|>=|<=)$/;
+
+  $sb->_SQLLimit(
+	     FIELD => $field,
+	     VALUE => $value,
+	     OPERATOR => $op,
+	     @rest,
+	    );
+}
+
+
+=head2 _LinkLimit
+
+Handle fields which deal with links between tickets.  (MemberOf, DependsOn)
+
+Meta Data:
+  1: Direction (From,To)
+  2: Relationship Type (MemberOf, DependsOn,RefersTo)
+
+=cut
+
+sub _LinkLimit {
+  my ($sb,$field,$op,$value,@rest) = @_;
+
+  die "Op must be ="
+    unless $op eq "=";
+
+  my $meta = $FIELDS{$field};
+  die "Incorrect Meta Data for $field"
+    unless (defined $meta->[1] and defined $meta->[2]);
+
+  my $LinkAlias = $sb->NewAlias ('Links');
+
+  $sb->_OpenParen();
+
+  $sb->_SQLLimit(
+	     ALIAS => $LinkAlias,
+	     FIELD =>   'Type',
+	     OPERATOR => '=',
+	     VALUE => $meta->[2],
+	     @rest,
+	    );
+
+  if ($meta->[1] eq "To") {
+    my $matchfield = ( $value  =~ /^(\d+)$/ ? "LocalTarget" : "Target" );
+
+    $sb->_SQLLimit(
+	       ALIAS => $LinkAlias,
+	       ENTRYAGGREGATOR => 'AND',
+	       FIELD =>   $matchfield,
+	       OPERATOR => '=',
+	       VALUE => $value ,
+	      );
+
+    #If we're searching on target, join the base to ticket.id
+    $sb->Join( ALIAS1 => 'main', FIELD1 => $sb->{'primary_key'},
+	       ALIAS2 => $LinkAlias,	 FIELD2 => 'LocalBase');
+
+  } elsif ( $meta->[1] eq "From" ) {
+    my $matchfield = ( $value  =~ /^(\d+)$/ ? "LocalBase" : "Base" );
+
+    $sb->_SQLLimit(
+	       ALIAS => $LinkAlias,
+	       ENTRYAGGREGATOR => 'AND',
+	       FIELD =>   $matchfield,
+	       OPERATOR => '=',
+	       VALUE => $value ,
+	      );
+
+    #If we're searching on base, join the target to ticket.id
+    $sb->Join( ALIAS1 => 'main',     FIELD1 => $sb->{'primary_key'},
+	       ALIAS2 => $LinkAlias, FIELD2 => 'LocalTarget');
+
+  } else {
+    die "Invalid link direction '$meta->[1]' for $field\n";
+  }
+
+  $sb->_CloseParen();
+
+}
+
+=head2 _DateLimit
+
+Handle date fields.  (Created, LastTold..)
+
+Meta Data:
+  1: type of relationship.  (Probably not necessary.)
+
+=cut
+
+sub _DateLimit {
+  my ($sb,$field,$op,$value,@rest) = @_;
+
+  die "Invalid Date Op: $op"
+     unless $op =~ /^(=|!=|>|<|>=|<=)$/;
+
+  my $meta = $FIELDS{$field};
+  die "Incorrect Meta Data for $field"
+    unless (defined $meta->[1]);
+
+  require Time::ParseDate;
+  use POSIX 'strftime';
+
+  my $time = Time::ParseDate::parsedate( $value,
+			UK => $RT::DateDayBeforeMonth,
+			PREFER_PAST => $RT::AmbiguousDayInPast,
+			PREFER_FUTURE => !($RT::AmbiguousDayInPast));
+  $value = strftime("%Y-%m-%d %H:%M",localtime($time));
+
+  $sb->_SQLLimit(
+	     FIELD => $meta->[1],
+	     OPERATOR => $op,
+	     VALUE => $value,
+	     @rest,
+	    );
+}
+
+=head2 _StringLimit
+
+Handle simple fields which are just strings.  (Subject,Type)
+
+Meta Data:
+  None
+
+=cut
+
+sub _StringLimit {
+  my ($sb,$field,$op,$value,@rest) = @_;
+
+  # FIXME:
+  # Valid Operators:
+  #  =, !=, LIKE, NOT LIKE
+
+  $sb->_SQLLimit(
+	     FIELD => $field,
+	     OPERATOR => $op,
+	     VALUE => $value,
+	     CASESENSITIVE => 0,
+	     @rest,
+	    );
+}
+
+=head2 _TransDateLimit
+
+Handle fields limiting based on Transaction Date.
+
+The inpupt value must be in a format parseable by Time::ParseDate
+
+Meta Data:
+  None
+
+=cut
+
+sub _TransDateLimit {
+  my ($sb,$field,$op,$value,@rest) = @_;
+
+  # See the comments for TransLimit, they apply here too
+
+  $sb->{_sql_transalias} = $sb->NewAlias ('Transactions')
+    unless defined $sb->{_sql_transalias};
+  $sb->{_sql_trattachalias} = $sb->NewAlias ('Attachments')
+    unless defined $sb->{_sql_trattachalias};
+
+  $sb->_OpenParen;
+
+  # Join Transactions To Attachments
+  $sb->Join( ALIAS1 => $sb->{_sql_trattachalias}, FIELD1 => 'TransactionId',
+	     ALIAS2 => $sb->{_sql_transalias}, FIELD2 => 'id');
+
+  # Join Transactions to Tickets
+  $sb->Join( ALIAS1 => 'main', FIELD1 => $sb->{'primary_key'}, # UGH!
+	     ALIAS2 => $sb->{_sql_transalias}, FIELD2 => 'Ticket');
+
+  my $d = new RT::Date( $sb->CurrentUser );
+  $d->Set($value);
+  $value = $d->ISO;
+
+  #Search for the right field
+  $sb->_SQLLimit(ALIAS => $sb->{_sql_trattachalias},
+		 FIELD =>    'Created',
+		 OPERATOR => $op,
+		 VALUE =>    $value,
+		 CASESENSITIVE => 0,
+		 @rest
+		);
+
+  $sb->_CloseParen;
+}
+
+=head2 _TransLimit
+
+Limit based on the Content of a transaction or the ContentType.
+
+Meta Data:
+  none
+
+=cut
+
+sub _TransLimit {
+  # Content, ContentType, Filename
+
+  # If only this was this simple.  We've got to do something
+  # complicated here:
+
+            #Basically, we want to make sure that the limits apply to
+            #the same attachment, rather than just another attachment
+            #for the same ticket, no matter how many clauses we lump
+            #on. We put them in TicketAliases so that they get nuked
+            #when we redo the join.
+
+  # In the SQL, we might have
+  #       (( Content = foo ) or ( Content = bar AND Content = baz ))
+  # The AND group should share the same Alias.
+
+  # Actually, maybe it doesn't matter.  We use the same alias and it
+  # works itself out? (er.. different.)
+
+  # Steal more from _ProcessRestrictions
+
+  # FIXME: Maybe look at the previous FooLimit call, and if it was a
+  # TransLimit and EntryAggregator == AND, reuse the Aliases?
+
+  # Or better - store the aliases on a per subclause basis - since
+  # those are going to be the things we want to relate to each other,
+  # anyway.
+
+  # maybe we should not allow certain kinds of aggregation of these
+  # clauses and do a psuedo regex instead? - the problem is getting
+  # them all into the same subclause when you have (A op B op C) - the
+  # way they get parsed in the tree they're in different subclauses.
+
+  my ($sb,$field,$op,$value,@rest) = @_;
+
+  $sb->{_sql_transalias} = $sb->NewAlias ('Transactions')
+    unless defined $sb->{_sql_transalias};
+  $sb->{_sql_trattachalias} = $sb->NewAlias ('Attachments')
+    unless defined $sb->{_sql_trattachalias};
+
+  $sb->_OpenParen;
+
+  # Join Transactions To Attachments
+  $sb->Join( ALIAS1 => $sb->{_sql_trattachalias}, FIELD1 => 'TransactionId',
+	     ALIAS2 => $sb->{_sql_transalias}, FIELD2 => 'id');
+
+  # Join Transactions to Tickets
+  $sb->Join( ALIAS1 => 'main', FIELD1 => $sb->{'primary_key'}, # UGH!
+	     ALIAS2 => $sb->{_sql_transalias}, FIELD2 => 'Ticket');
+
+  #Search for the right field
+  $sb->_SQLLimit(ALIAS => $sb->{_sql_trattachalias},
+		 FIELD =>    $field,
+		 OPERATOR => $op,
+		 VALUE =>    $value,
+		 CASESENSITIVE => 0,
+		 @rest
+		);
+
+  $sb->_CloseParen;
+
+}
+
+=head2 _WatcherLimit
+
+Handle watcher limits.  (Requestor, CC, etc..)
+
+Meta Data:
+  1: Field to query on
+
+=cut
+
+sub _WatcherLimit {
+  my ($self,$field,$op,$value,@rest) = @_;
+  my %rest = @rest;
+
+  $self->_OpenParen;
+
+  my $groups	    = $self->NewAlias('Groups');
+  my $group_princs  = $self->NewAlias('Principals');
+  my $groupmembers  = $self->NewAlias('CachedGroupMembers');
+  my $member_princs = $self->NewAlias('Principals');
+  my $users	    = $self->NewAlias('Users');
+
+
+  #Find user watchers
+#  my $subclause = undef;
+#  my $aggregator = 'OR';
+#  if ($restriction->{'OPERATOR'} =~ /!|NOT/i ){
+#    $subclause = 'AndEmailIsNot';
+#    $aggregator = 'AND';
+#  }
+
+
+  $self->_SQLLimit(ALIAS => $users,
+		   FIELD => $rest{SUBKEY} || 'EmailAddress',
+		   VALUE           => $value,
+		   OPERATOR        => $op,
+		   CASESENSITIVE   => 0,
+		   @rest,
+		  );
+
+  # {{{ Tie to groups for tickets we care about
+  $self->_SQLLimit(ALIAS => $groups,
+		   FIELD => 'Domain',
+		   VALUE => 'RT::Ticket-Role',
+		   ENTRYAGGREGATOR => 'AND');
+
+  $self->Join(ALIAS1 => $groups, FIELD1 => 'Instance',
+	      ALIAS2 => 'main',   FIELD2 => 'id');
+  # }}}
+
+  # If we care about which sort of watcher
+  my $meta = $FIELDS{$field};
+  my $type = ( defined $meta->[1] ? $meta->[1] : undef );
+
+  if ( $type ) {
+    $self->_SQLLimit(ALIAS => $groups,
+		     FIELD => 'Type',
+		     VALUE => $type,
+		     ENTRYAGGREGATOR => 'AND');
+  }
+
+  $self->Join (ALIAS1 => $groups,  FIELD1 => 'id',
+	       ALIAS2 => $group_princs, FIELD2 => 'ObjectId');
+  $self->_SQLLimit(ALIAS => $group_princs,
+		   FIELD => 'PrincipalType',
+		   VALUE => 'Group',
+		   ENTRYAGGREGATOR => 'AND');
+  $self->Join( ALIAS1 => $group_princs, FIELD1 => 'id',
+	       ALIAS2 => $groupmembers, FIELD2 => 'GroupId');
+
+  $self->Join( ALIAS1 => $groupmembers, FIELD1 => 'MemberId',
+	       ALIAS2 => $member_princs, FIELD2 => 'id');
+  $self->Join (ALIAS1 => $member_princs, FIELD1 => 'ObjectId',
+	       ALIAS2 => $users, FIELD2 => 'id');
+
+ $self->_CloseParen;
+
+}
+
+sub _LinkFieldLimit {
+  my $restriction;
+  my $self;
+  my $LinkAlias;
+  my %args;
+  if ($restriction->{'TYPE'}) {
+    $self->SUPER::Limit(ALIAS => $LinkAlias,
+			ENTRYAGGREGATOR => 'AND',
+			FIELD =>   'Type',
+			OPERATOR => '=',
+			VALUE =>    $restriction->{'TYPE'} );
+  }
+
+   #If we're trying to limit it to things that are target of
+  if ($restriction->{'TARGET'}) {
+    # If the TARGET is an integer that means that we want to look at
+    # the LocalTarget field. otherwise, we want to look at the
+    # "Target" field
+    my ($matchfield);
+    if ($restriction->{'TARGET'} =~/^(\d+)$/) {
+      $matchfield = "LocalTarget";
+    } else {
+      $matchfield = "Target";
+    }
+    $self->SUPER::Limit(ALIAS => $LinkAlias,
+			ENTRYAGGREGATOR => 'AND',
+			FIELD =>   $matchfield,
+			OPERATOR => '=',
+			VALUE =>    $restriction->{'TARGET'} );
+    #If we're searching on target, join the base to ticket.id
+    $self->Join( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
+		 ALIAS2 => $LinkAlias,
+		 FIELD2 => 'LocalBase');
+  }
+  #If we're trying to limit it to things that are base of
+  elsif ($restriction->{'BASE'}) {
+    # If we're trying to match a numeric link, we want to look at
+    # LocalBase, otherwise we want to look at "Base"
+    my ($matchfield);
+    if ($restriction->{'BASE'} =~/^(\d+)$/) {
+      $matchfield = "LocalBase";
+    } else {
+      $matchfield = "Base";
+    }
+
+    $self->SUPER::Limit(ALIAS => $LinkAlias,
+			ENTRYAGGREGATOR => 'AND',
+			FIELD => $matchfield,
+			OPERATOR => '=',
+			VALUE =>    $restriction->{'BASE'} );
+    #If we're searching on base, join the target to ticket.id
+    $self->Join( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
+		 ALIAS2 => $LinkAlias,
+		 FIELD2 => 'LocalTarget')
+  }
+}
+
+
+=head2 KeywordLimit
+
+Limit based on Keywords
+
+Meta Data:
+  none
+
+=cut
+
+sub _CustomFieldLimit {
+  my ($self,$_field,$op,$value,@rest) = @_;
+
+  my %rest = @rest;
+  my $field = $rest{SUBKEY} || die "No field specified";
+
+  # For our sanity, we can only limit on one queue at a time
+  my $queue = undef;
+  # Ugh.    This will not do well for things with underscores in them
+
+  use RT::CustomFields;
+  my $CF = RT::CustomFields->new( $self->CurrentUser );
+  #$CF->Load( $cfid} );
+
+  my $q;
+  if ($field =~ /^(.+?)\.{(.+)}$/) {
+    my $q = RT::Queue->new($self->CurrentUser);
+    $q->Load($1);
+    $field = $2;
+    $CF->LimitToQueue( $q->Id );
+    $queue = $q->Id;
+  } else {
+    $CF->LimitToGlobal;
+  }
+  $CF->FindAllRows;
+
+  my $cfid = 0;
+
+  while ( my $CustomField = $CF->Next ) {
+    if ($CustomField->Name eq $field) {
+      $cfid = $CustomField->Id;
+      last;
+    }
+  }
+  die "No custom field named $field found\n"
+    unless $cfid;
+
+#   use RT::CustomFields;
+#   my $CF = RT::CustomField->new( $self->CurrentUser );
+#   $CF->Load( $cfid );
+
+
+  my $null_columns_ok;
+  my $TicketCFs = $self->Join( TYPE   => 'left',
+			       ALIAS1 => 'main',
+			       FIELD1 => 'id',
+			       TABLE2 => 'TicketCustomFieldValues',
+			       FIELD2 => 'Ticket' );
+
+  $self->_OpenParen;
+
+  $self->_SQLLimit( ALIAS      => $TicketCFs,
+		    FIELD      => 'Content',
+		    OPERATOR   => $op,
+		    VALUE      => $value,
+		    QUOTEVALUE => 1,
+		    @rest );
+
+  if (   $op =~ /^IS$/i
+	 or ( $op eq '!=' ) ) {
+    $null_columns_ok = 1;
+  }
+
+  #If we're trying to find tickets where the keyword isn't somethng,
+  #also check ones where it _IS_ null
+
+  if ( $op eq '!=' ) {
+    $self->_SQLLimit( ALIAS           => $TicketCFs,
+		      FIELD           => 'Content',
+		      OPERATOR        => 'IS',
+		      VALUE           => 'NULL',
+		      QUOTEVALUE      => 0,
+		      ENTRYAGGREGATOR => 'OR', );
+  }
+
+  $self->_SQLLimit( LEFTJOIN => $TicketCFs,
+		    FIELD    => 'CustomField',
+		    VALUE    => $cfid,
+		    ENTRYAGGREGATOR => 'OR' );
+
+
+
+  $self->_CloseParen;
+
+}
+
+
+# End Helper Functions
+
+# End of SQL Stuff -------------------------------------------------
+
+# {{{ Limit the result set based on content
+
+# {{{ sub Limit
+
+=head2 Limit
+
+Takes a paramhash with the fields FIELD, OPERATOR, VALUE and DESCRIPTION
+Generally best called from LimitFoo methods
+
+=cut
+sub Limit {
+    my $self = shift;
+    my %args = ( FIELD => undef,
+		 OPERATOR => '=',
+		 VALUE => undef,
+		 DESCRIPTION => undef,
+		 @_
+	       );
+    $args{'DESCRIPTION'} = $self->loc(
+	"[_1] [_2] [_3]", $args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'}
+    ) if (!defined $args{'DESCRIPTION'}) ;
+
+    my $index = $self->_NextIndex;
+
+    #make the TicketRestrictions hash the equivalent of whatever we just passed in;
+
+    %{$self->{'TicketRestrictions'}{$index}} = %args;
+
+    $self->{'RecalcTicketLimits'} = 1;
+
+    # If we're looking at the effective id, we don't want to append the other clause
+    # which limits us to tickets where id = effective id
+    if ($args{'FIELD'} eq 'EffectiveId') {
+        $self->{'looking_at_effective_id'} = 1;
+    }
+
+    if ($args{'FIELD'} eq 'Type') {
+        $self->{'looking_at_type'} = 1;
+    }
+
+    return ($index);
+}
+
+# }}}
+
+
+
+
+=head2 FreezeLimits
+
+Returns a frozen string suitable for handing back to ThawLimits.
+
+=cut
+# {{{ sub FreezeLimits
+
+sub FreezeLimits {
+	my $self = shift;
+	require FreezeThaw;
+	return (FreezeThaw::freeze($self->{'TicketRestrictions'},
+				   $self->{'restriction_index'}
+				  ));
+}
+
+# }}}
+
+=head2 ThawLimits
+
+Take a frozen Limits string generated by FreezeLimits and make this tickets
+object have that set of limits.
+
+=cut
+# {{{ sub ThawLimits
+
+sub ThawLimits {
+	my $self = shift;
+	my $in = shift;
+	
+	#if we don't have $in, get outta here.
+	return undef unless ($in);
+
+    	$self->{'RecalcTicketLimits'} = 1;
+
+	require FreezeThaw;
+	
+	#We don't need to die if the thaw fails.
+	
+	eval {
+		($self->{'TicketRestrictions'},
+		$self->{'restriction_index'}
+		) = FreezeThaw::thaw($in);
+	}
+
+}
+
+# }}}
+
+# {{{ Limit by enum or foreign key
+
+# {{{ sub LimitQueue
+
+=head2 LimitQueue
+
+LimitQueue takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of = or !=. (It defaults to =).
+VALUE is a queue id or Name.
+
+
+=cut
+
+sub LimitQueue {
+    my $self = shift;
+    my %args = (VALUE => undef,
+		OPERATOR => '=',
+		@_);
+
+    #TODO  VALUE should also take queue names and queue objects
+    #TODO FIXME why are we canonicalizing to name, not id, robrt?
+    if ($args{VALUE} =~ /^\d+$/) {
+      my $queue = new RT::Queue($self->CurrentUser);
+      $queue->Load($args{'VALUE'});
+      $args{VALUE} = $queue->Name;
+    }
+
+    # What if they pass in an Id?  Check for isNum() and convert to
+    # string.
+
+    #TODO check for a valid queue here
+
+    $self->Limit (FIELD => 'Queue',
+		  VALUE => $args{VALUE},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Queue'), $args{'OPERATOR'}, $args{VALUE},
+		  ),
+		 );
+
+}
+# }}}
+
+# {{{ sub LimitStatus
+
+=head2 LimitStatus
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of = or !=.
+VALUE is a status.
+
+=cut
+
+sub LimitStatus {
+    my $self = shift;
+    my %args = ( OPERATOR => '=',
+                  @_);
+    $self->Limit (FIELD => 'Status',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Status'), $args{'OPERATOR'}, $self->loc($args{'VALUE'})
+		  ),
+		 );
+}
+
+# }}}
+
+# {{{ sub IgnoreType
+
+=head2 IgnoreType
+
+If called, this search will not automatically limit the set of results found
+to tickets of type "Ticket". Tickets of other types, such as "project" and
+"approval" will be found.
+
+=cut
+
+sub IgnoreType {
+    my $self = shift;
+
+    # Instead of faking a Limit that later gets ignored, fake up the
+    # fact that we're already looking at type, so that the check in
+    # Tickets_Overlay_SQL/FromSQL goes down the right branch
+
+    #  $self->LimitType(VALUE => '__any');
+    $self->{looking_at_type} = 1;
+}
+
+# }}}
+
+# {{{ sub LimitType
+
+=head2 LimitType
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of = or !=, it defaults to "=".
+VALUE is a string to search for in the type of the ticket.
+
+
+
+=cut
+
+sub LimitType {
+    my $self = shift;
+    my %args = (OPERATOR => '=',
+		VALUE => undef,
+		@_);
+    $self->Limit (FIELD => 'Type',
+                  VALUE => $args{'VALUE'},
+                  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Type'), $args{'OPERATOR'}, $args{'Limit'},
+		  ),
+                 );
+}
+
+# }}}
+
+# }}}
+
+# {{{ Limit by string field
+
+# {{{ sub LimitSubject
+
+=head2 LimitSubject
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of = or !=.
+VALUE is a string to search for in the subject of the ticket.
+
+=cut
+
+sub LimitSubject {
+    my $self = shift;
+    my %args = (@_);
+    $self->Limit (FIELD => 'Subject',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Subject'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
+}
+
+# }}}
+
+# }}}
+
+# {{{ Limit based on ticket numerical attributes
+# Things that can be > < = !=
+
+# {{{ sub LimitId
+
+=head2 LimitId
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of =, >, < or !=.
+VALUE is a ticket Id to search for
+
+=cut
+
+sub LimitId {
+    my $self = shift;
+    my %args = (OPERATOR => '=',
+                @_);
+
+    $self->Limit (FIELD => 'id',
+                  VALUE => $args{'VALUE'},
+                  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Id'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+                 );
+}
+
+# }}}
+
+# {{{ sub LimitPriority
+
+=head2 LimitPriority
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of =, >, < or !=.
+VALUE is a value to match the ticket\'s priority against
+
+=cut
+
+sub LimitPriority {
+    my $self = shift;
+    my %args = (@_);
+    $self->Limit (FIELD => 'Priority',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Priority'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
+}
+
+# }}}
+
+# {{{ sub LimitInitialPriority
+
+=head2 LimitInitialPriority
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of =, >, < or !=.
+VALUE is a value to match the ticket\'s initial priority against
+
+
+=cut
+
+sub LimitInitialPriority {
+    my $self = shift;
+    my %args = (@_);
+    $self->Limit (FIELD => 'InitialPriority',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Initial Priority'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
+}
+
+# }}}
+
+# {{{ sub LimitFinalPriority
+
+=head2 LimitFinalPriority
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of =, >, < or !=.
+VALUE is a value to match the ticket\'s final priority against
+
+=cut
+
+sub LimitFinalPriority {
+    my $self = shift;
+    my %args = (@_);
+    $self->Limit (FIELD => 'FinalPriority',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Final Priority'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
+}
+
+# }}}
+
+# {{{ sub LimitTimeWorked
+
+=head2 LimitTimeWorked
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of =, >, < or !=.
+VALUE is a value to match the ticket's TimeWorked attribute
+
+=cut
+
+sub LimitTimeWorked {
+    my $self = shift;
+    my %args = (@_);
+    $self->Limit (FIELD => 'TimeWorked',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Time worked'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
+}
+
+# }}}
+
+# {{{ sub LimitTimeLeft
+
+=head2 LimitTimeLeft
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of =, >, < or !=.
+VALUE is a value to match the ticket's TimeLeft attribute
+
+=cut
+
+sub LimitTimeLeft {
+    my $self = shift;
+    my %args = (@_);
+    $self->Limit (FIELD => 'TimeLeft',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Time left'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
+}
+
+# }}}
+
+# }}}
+
+# {{{ Limiting based on attachment attributes
+
+# {{{ sub LimitContent
+
+=head2 LimitContent
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of =, LIKE, NOT LIKE or !=.
+VALUE is a string to search for in the body of the ticket
+
+=cut
+sub LimitContent {
+    my $self = shift;
+    my %args = (@_);
+    $self->Limit (FIELD => 'Content',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Ticket content'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
+}
+
+# }}}
+
+# {{{ sub LimitFilename
+
+=head2 LimitFilename
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of =, LIKE, NOT LIKE or !=.
+VALUE is a string to search for in the body of the ticket
+
+=cut
+sub LimitFilename {
+    my $self = shift;
+    my %args = (@_);
+    $self->Limit (FIELD => 'Filename',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Attachment filename'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
+}
+
+# }}}
+# {{{ sub LimitContentType
+
+=head2 LimitContentType
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of =, LIKE, NOT LIKE or !=.
+VALUE is a content type to search ticket attachments for
+
+=cut
+
+sub LimitContentType {
+    my $self = shift;
+    my %args = (@_);
+    $self->Limit (FIELD => 'ContentType',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Ticket content type'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
+}
+# }}}
+
+# }}}
+
+# {{{ Limiting based on people
+
+# {{{ sub LimitOwner
+
+=head2 LimitOwner
+
+Takes a paramhash with the fields OPERATOR and VALUE.
+OPERATOR is one of = or !=.
+VALUE is a user id.
+
+=cut
+
+sub LimitOwner {
+    my $self = shift;
+    my %args = ( OPERATOR => '=',
+                 @_);
+
+    my $owner = new RT::User($self->CurrentUser);
+    $owner->Load($args{'VALUE'});
+    # FIXME: check for a valid $owner
+    $self->Limit (FIELD => 'Owner',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Owner'), $args{'OPERATOR'}, $owner->Name(),
+		  ),
+		 );
+
+}
+
+# }}}
+
+# {{{ Limiting watchers
+
+# {{{ sub LimitWatcher
+
+
+=head2 LimitWatcher
+
+  Takes a paramhash with the fields OPERATOR, TYPE and VALUE.
+  OPERATOR is one of =, LIKE, NOT LIKE or !=.
+  VALUE is a value to match the ticket\'s watcher email addresses against
+  TYPE is the sort of watchers you want to match against. Leave it undef if you want to search all of them
+
+=begin testing
+
+my $t1 = RT::Ticket->new($RT::SystemUser);
+$t1->Create(Queue => 'general', Subject => "LimitWatchers test", Requestors => \['requestor1@example.com']);
+
+=end testing
+
+=cut
+
+sub LimitWatcher {
+    my $self = shift;
+    my %args = ( OPERATOR => '=',
+		 VALUE => undef,
+		 TYPE => undef,
+		@_);
+
+
+    #build us up a description
+    my ($watcher_type, $desc);
+    if ($args{'TYPE'}) {
+	$watcher_type = $args{'TYPE'};
+    }
+    else {
+	$watcher_type = "Watcher";
+    }
+
+    $self->Limit (FIELD => $watcher_type,
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  TYPE => $args{'TYPE'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc($watcher_type), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
+}
+
+
+sub LimitRequestor {
+    my $self = shift;
+    my %args = (@_);
+  my ($package, $filename, $line) = caller;
+    $RT::Logger->error("Tickets->LimitRequestor is deprecated. please rewrite call at  $package - $filename: $line");
+    $self->LimitWatcher(TYPE => 'Requestor', @_);
+
+}
+
+# }}}
+
+
+# }}}
+
+# }}}
+
+# {{{ Limiting based on links
+
+# {{{ LimitLinkedTo
+
+=head2 LimitLinkedTo
+
+LimitLinkedTo takes a paramhash with two fields: TYPE and TARGET
+TYPE limits the sort of relationship we want to search on
+
+TYPE = { RefersTo, MemberOf, DependsOn }
+
+TARGET is the id or URI of the TARGET of the link
+(TARGET used to be 'TICKET'.  'TICKET' is deprecated, but will be treated as TARGET
+
+=cut
+
+sub LimitLinkedTo {
+    my $self = shift;
+    my %args = (
+		TICKET => undef,
+		TARGET => undef,
+		TYPE => undef,
+		 @_);
+
+    $self->Limit(
+		 FIELD => 'LinkedTo',
+		 BASE => undef,
+		 TARGET => ($args{'TARGET'} || $args{'TICKET'}),
+		 TYPE => $args{'TYPE'},
+		 DESCRIPTION => $self->loc(
+		   "Tickets [_1] by [_2]", $self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'})
+		  ),
+		);
+}
+
+
+# }}}
+
+# {{{ LimitLinkedFrom
+
+=head2 LimitLinkedFrom
+
+LimitLinkedFrom takes a paramhash with two fields: TYPE and BASE
+TYPE limits the sort of relationship we want to search on
+
+
+BASE is the id or URI of the BASE of the link
+(BASE used to be 'TICKET'.  'TICKET' is deprecated, but will be treated as BASE
+
+
+=cut
+
+sub LimitLinkedFrom {
+    my $self = shift;
+    my %args = ( BASE => undef,
+		 TICKET => undef,
+		 TYPE => undef,
+		 @_);
+
+
+    $self->Limit( FIELD => 'LinkedTo',
+		  TARGET => undef,
+		  BASE => ($args{'BASE'} || $args{'TICKET'}),
+		  TYPE => $args{'TYPE'},
+		  DESCRIPTION => $self->loc(
+		   "Tickets [_1] [_2]", $self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'})
+		  ),
+		);
+}
+
+
+# }}}
+
+# {{{ LimitMemberOf
+sub LimitMemberOf {
+    my $self = shift;
+    my $ticket_id = shift;
+    $self->LimitLinkedTo ( TARGET=> "$ticket_id",
+			   TYPE => 'MemberOf',
+			  );
+
+}
+# }}}
+
+# {{{ LimitHasMember
+sub LimitHasMember {
+    my $self = shift;
+    my $ticket_id =shift;
+    $self->LimitLinkedFrom ( BASE => "$ticket_id",
+			     TYPE => 'HasMember',
+			     );
+
+}
+# }}}
+
+# {{{ LimitDependsOn
+
+sub LimitDependsOn {
+    my $self = shift;
+    my $ticket_id = shift;
+    $self->LimitLinkedTo ( TARGET => "$ticket_id",
+                           TYPE => 'DependsOn',
+			   );
+
+}
+
+# }}}
+
+# {{{ LimitDependedOnBy
+
+sub LimitDependedOnBy {
+    my $self = shift;
+    my $ticket_id = shift;
+    $self->LimitLinkedFrom (  BASE => "$ticket_id",
+                               TYPE => 'DependentOn',
+			     );
+
+}
+
+# }}}
+
+
+# {{{ LimitRefersTo
+
+sub LimitRefersTo {
+    my $self = shift;
+    my $ticket_id = shift;
+    $self->LimitLinkedTo ( TARGET => "$ticket_id",
+                           TYPE => 'RefersTo',
+			   );
+
+}
+
+# }}}
+
+# {{{ LimitReferredToBy
+
+sub LimitReferredToBy {
+    my $self = shift;
+    my $ticket_id = shift;
+    $self->LimitLinkedFrom (  BASE=> "$ticket_id",
+                               TYPE => 'ReferredTo',
+			     );
+
+}
+
+# }}}
+
+# }}}
+
+# {{{ limit based on ticket date attribtes
+
+# {{{ sub LimitDate
+
+=head2 LimitDate (FIELD => 'DateField', OPERATOR => $oper, VALUE => $ISODate)
+
+Takes a paramhash with the fields FIELD OPERATOR and VALUE.
+
+OPERATOR is one of > or <
+VALUE is a date and time in ISO format in GMT
+FIELD is one of Starts, Started, Told, Created, Resolved, LastUpdated
+
+There are also helper functions of the form LimitFIELD that eliminate
+the need to pass in a FIELD argument.
+
+=cut
+
+sub LimitDate {
+    my $self = shift;
+    my %args = (
+                  FIELD => undef,
+		  VALUE => undef,
+		  OPERATOR => undef,
+
+                  @_);
+
+    #Set the description if we didn't get handed it above
+    unless ($args{'DESCRIPTION'} ) {
+	$args{'DESCRIPTION'} = $args{'FIELD'} . " " .$args{'OPERATOR'}. " ". $args{'VALUE'} . " GMT"
+    }
+
+    $self->Limit (%args);
+
+}
+
+# }}}
+
+
+
+
+sub LimitCreated {
+    my $self = shift;
+    $self->LimitDate( FIELD => 'Created', @_);
+}
+sub LimitDue {
+    my $self = shift;
+    $self->LimitDate( FIELD => 'Due', @_);
+
+}
+sub LimitStarts {
+    my $self = shift;
+    $self->LimitDate( FIELD => 'Starts', @_);
+
+}
+sub LimitStarted {
+    my $self = shift;
+    $self->LimitDate( FIELD => 'Started', @_);
+}
+sub LimitResolved {
+    my $self = shift;
+    $self->LimitDate( FIELD => 'Resolved', @_);
+}
+sub LimitTold {
+    my $self = shift;
+    $self->LimitDate( FIELD => 'Told', @_);
+}
+sub LimitLastUpdated {
+    my $self = shift;
+    $self->LimitDate( FIELD => 'LastUpdated', @_);
+}
+#
+# {{{ sub LimitTransactionDate
+
+=head2 LimitTransactionDate (OPERATOR => $oper, VALUE => $ISODate)
+
+Takes a paramhash with the fields FIELD OPERATOR and VALUE.
+
+OPERATOR is one of > or <
+VALUE is a date and time in ISO format in GMT
+
+
+=cut
+
+sub LimitTransactionDate {
+    my $self = shift;
+    my %args = (
+                  FIELD => 'TransactionDate',
+		  VALUE => undef,
+		  OPERATOR => undef,
+
+                  @_);
+
+    #  <20021217042756.GK28744@pallas.fsck.com>
+    #    "Kill It" - Jesse.
+
+    #Set the description if we didn't get handed it above
+    unless ($args{'DESCRIPTION'} ) {
+	$args{'DESCRIPTION'} = $args{'FIELD'} . " " .$args{'OPERATOR'}. " ". $args{'VALUE'} . " GMT"
+    }
+
+    $self->Limit (%args);
+
+}
+
+# }}}
+
+# }}}
+
+# {{{ Limit based on custom fields
+# {{{ sub LimitCustomField
+
+=head2 LimitCustomField
+
+Takes a paramhash of key/value pairs with the following keys:
+
+=over 4
+
+=item KEYWORDSELECT - KeywordSelect id
+
+=item OPERATOR - (for KEYWORD only - KEYWORDSELECT operator is always `=')
+
+=item KEYWORD - Keyword id
+
+=back
+
+=cut
+
+sub LimitCustomField {
+    my $self = shift;
+    my %args = ( VALUE        => undef,
+                 CUSTOMFIELD   => undef,
+                 OPERATOR      => '=',
+                 DESCRIPTION   => undef,
+                 FIELD         => 'CustomFieldValue',
+                 QUOTEVALUE    => 1,
+                 @_ );
+
+    use RT::CustomFields;
+    my $CF = RT::CustomField->new( $self->CurrentUser );
+    $CF->Load( $args{CUSTOMFIELD} );
+
+    #If we are looking to compare with a null value.
+    if ( $args{'OPERATOR'} =~ /^is$/i ) {
+      $args{'DESCRIPTION'} ||= $self->loc("Custom field [_1] has no value.", $CF->Name);
+    }
+    elsif ( $args{'OPERATOR'} =~ /^is not$/i ) {
+      $args{'DESCRIPTION'} ||= $self->loc("Custom field [_1] has a value.", $CF->Name);
+    }
+
+    # if we're not looking to compare with a null value
+    else {
+        $args{'DESCRIPTION'} ||= $self->loc("Custom field [_1] [_2] [_3]",  $CF->Name , $args{OPERATOR} , $args{VALUE});
+    }
+
+#    my $index = $self->_NextIndex;
+#    %{ $self->{'TicketRestrictions'}{$index} } = %args;
+
+
+    my $q = "";
+    if ($CF->Queue) {
+      my $qo = new RT::Queue( $self->CurrentUser );
+      $qo->load( $CF->Queue );
+      $q = $qo->Name;
+    }
+
+    $self->Limit( VALUE => $args{VALUE},
+		  FIELD => "CF.".( $q
+			     ? $q . ".{" . $CF->Name . "}"
+			     : $CF->Name
+			   ),
+		  OPERATOR => $args{OPERATOR},
+		  CUSTOMFIELD => 1,
+		);
+
+
+    $self->{'RecalcTicketLimits'} = 1;
+  #  return ($index);
+}
+
+# }}}
+# }}}
+
+
+# {{{ sub _NextIndex
+
+=head2 _NextIndex
+
+Keep track of the counter for the array of restrictions
+
+=cut
+
+sub _NextIndex {
+    my $self = shift;
+    return ($self->{'restriction_index'}++);
+}
+# }}}
+
+# }}}
+
+# {{{ Core bits to make this a DBIx::SearchBuilder object
+
+# {{{ sub _Init
+sub _Init  {
+    my $self = shift;
+    $self->{'table'} = "Tickets";
+    $self->{'RecalcTicketLimits'} = 1;
+    $self->{'looking_at_effective_id'} = 0;
+    $self->{'looking_at_type'} = 0;
+    $self->{'restriction_index'} =1;
+    $self->{'primary_key'} = "id";
+    delete $self->{'items_array'};
+    delete $self->{'item_map'};
+    $self->SUPER::_Init(@_);
+
+    $self->_InitSQL;
+
+}
+# }}}
+
+# {{{ sub Count
+sub Count {
+  my $self = shift;
+  $self->_ProcessRestrictions() if ($self->{'RecalcTicketLimits'} == 1 );
+  return($self->SUPER::Count());
+}
+# }}}
+
+# {{{ sub CountAll
+sub CountAll {
+  my $self = shift;
+  $self->_ProcessRestrictions() if ($self->{'RecalcTicketLimits'} == 1 );
+  return($self->SUPER::CountAll());
+}
+# }}}
+
+
+# {{{ sub ItemsArrayRef
+
+=head2 ItemsArrayRef
+
+Returns a reference to the set of all items found in this search
+
+=cut
+
+sub ItemsArrayRef {
+    my $self = shift;
+    my @items;
+
+    unless ( $self->{'items_array'} ) {
+
+        my $placeholder = $self->_ItemsCounter;
+        $self->GotoFirstItem();
+        while ( my $item = $self->Next ) {
+            push ( @{ $self->{'items_array'} }, $item );
+        }
+        $self->GotoItem($placeholder);
+    }
+    return ( $self->{'items_array'} );
+}
+# }}}
+
+# {{{ sub Next
+sub Next {
+	my $self = shift;
+ 	
+	$self->_ProcessRestrictions() if ($self->{'RecalcTicketLimits'} == 1 );
+
+	my $Ticket = $self->SUPER::Next();
+	if ((defined($Ticket)) and (ref($Ticket))) {
+
+    	    #Make sure we _never_ show deleted tickets
+	    #TODO we should be doing this in the where clause.
+	    #but you can't do multiple clauses on the same field just yet :/
+
+	    if ($Ticket->__Value('Status') eq 'deleted') {
+		return($self->Next());
+	    }
+            # Since Ticket could be granted with more rights instead
+            # of being revoked, it's ok if queue rights allow
+            # ShowTicket.  It seems need another query, but we have
+            # rights cache in Principal::HasRight.
+  	    elsif ($Ticket->QueueObj->CurrentUserHasRight('ShowTicket') ||
+                   $Ticket->CurrentUserHasRight('ShowTicket')) {
+		return($Ticket);
+	    }
+
+	    #If the user doesn't have the right to show this ticket
+	    else {	
+		return($self->Next());
+	    }
+	}
+	#if there never was any ticket
+	else {
+		return(undef);
+	}	
+
+}
+# }}}
+
+# }}}
+
+# {{{ Deal with storing and restoring restrictions
+
+# {{{ sub LoadRestrictions
+
+=head2 LoadRestrictions
+
+LoadRestrictions takes a string which can fully populate the TicketRestrictons hash.
+TODO It is not yet implemented
+
+=cut
+
+# }}}
+
+# {{{ sub DescribeRestrictions
+
+=head2 DescribeRestrictions
+
+takes nothing.
+Returns a hash keyed by restriction id.
+Each element of the hash is currently a one element hash that contains DESCRIPTION which
+is a description of the purpose of that TicketRestriction
+
+=cut
+
+sub DescribeRestrictions  {
+    my $self = shift;
+
+    my ($row, %listing);
+
+    foreach $row (keys %{$self->{'TicketRestrictions'}}) {
+	$listing{$row} = $self->{'TicketRestrictions'}{$row}{'DESCRIPTION'};
+    }
+    return (%listing);
+}
+# }}}
+
+# {{{ sub RestrictionValues
+
+=head2 RestrictionValues FIELD
+
+Takes a restriction field and returns a list of values this field is restricted
+to.
+
+=cut
+
+sub RestrictionValues {
+    my $self = shift;
+    my $field = shift;
+    map $self->{'TicketRestrictions'}{$_}{'VALUE'},
+      grep {
+             $self->{'TicketRestrictions'}{$_}{'FIELD'} eq $field
+             && $self->{'TicketRestrictions'}{$_}{'OPERATOR'} eq "="
+           }
+        keys %{$self->{'TicketRestrictions'}};
+}
+
+# }}}
+
+# {{{ sub ClearRestrictions
+
+=head2 ClearRestrictions
+
+Removes all restrictions irretrievably
+
+=cut
+
+sub ClearRestrictions {
+    my $self = shift;
+    delete $self->{'TicketRestrictions'};
+    $self->{'looking_at_effective_id'} = 0;
+    $self->{'looking_at_type'} = 0;
+    $self->{'RecalcTicketLimits'} =1;
+}
+
+# }}}
+
+# {{{ sub DeleteRestriction
+
+=head2 DeleteRestriction
+
+Takes the row Id of a restriction (From DescribeRestrictions' output, for example.
+Removes that restriction from the session's limits.
+
+=cut
+
+
+sub DeleteRestriction {
+    my $self = shift;
+    my $row = shift;
+    delete $self->{'TicketRestrictions'}{$row};
+
+    $self->{'RecalcTicketLimits'} = 1;
+    #make the underlying easysearch object forget all its preconceptions
+}
+
+# }}}
+
+# {{{ sub _RestrictionsToClauses
+
+# Convert a set of oldstyle SB Restrictions to Clauses for RQL
+
+sub _RestrictionsToClauses {
+  my $self = shift;
+
+  my $row;
+  my %clause;
+  foreach $row (keys %{$self->{'TicketRestrictions'}}) {
+    my $restriction = $self->{'TicketRestrictions'}{$row};
+    #use Data::Dumper;
+    #print Dumper($restriction),"\n";
+
+      # We need to reimplement the subclause aggregation that SearchBuilder does.
+      # Default Subclause is ALIAS.FIELD, and default ALIAS is 'main',
+      # Then SB AND's the different Subclauses together.
+
+      # So, we want to group things into Subclauses, convert them to
+      # SQL, and then join them with the appropriate DefaultEA.
+      # Then join each subclause group with AND.
+
+    my $field = $restriction->{'FIELD'};
+    my $realfield = $field;	# CustomFields fake up a fieldname, so
+                                # we need to figure that out
+
+    # One special case
+    # Rewrite LinkedTo meta field to the real field
+    if ($field =~ /LinkedTo/) {
+      $realfield = $field = $restriction->{'TYPE'};
+    }
+
+    # Two special case
+    # CustomFields have a different real field
+    if ($field =~ /^CF\./) {
+      $realfield = "CF"
+    }
+
+    die "I don't know about $field yet"
+      unless (exists $FIELDS{$realfield} or $restriction->{CUSTOMFIELD});
+
+    my $type = $FIELDS{$realfield}->[0];
+    my $op   = $restriction->{'OPERATOR'};
+
+    my $value = ( grep { defined }
+		  map { $restriction->{$_} } qw(VALUE TICKET BASE TARGET))[0];
+
+    # this performs the moral equivalent of defined or/dor/C<//>,
+    # without the short circuiting.You need to use a 'defined or'
+    # type thing instead of just checking for truth values, because
+    # VALUE could be 0.(i.e. "false")
+
+    # You could also use this, but I find it less aesthetic:
+    # (although it does short circuit)
+    #( defined $restriction->{'VALUE'}? $restriction->{VALUE} :
+    # defined $restriction->{'TICKET'} ?
+    # $restriction->{TICKET} :
+    # defined $restriction->{'BASE'} ?
+    # $restriction->{BASE} :
+    # defined $restriction->{'TARGET'} ?
+    # $restriction->{TARGET} )
+
+    my $ea = $DefaultEA{$type};
+    if ( ref $ea ) {
+      die "Invalid operator $op for $field ($type)"
+	unless exists $ea->{$op};
+      $ea = $ea->{$op};
+    }
+    exists $clause{$realfield} or $clause{$realfield} = [];
+    # Escape Quotes
+    $field =~ s!(['"])!\\$1!g;
+    $value =~ s!(['"])!\\$1!g;
+    my $data = [ $ea, $type, $field, $op, $value ];
+
+    # here is where we store extra data, say if it's a keyword or
+    # something.  (I.e. "TYPE SPECIFIC STUFF")
+
+    #print Dumper($data);
+    push @{$clause{$realfield}}, $data;
+  }
+  return \%clause;
+}
+
+# }}}
+
+# {{{ sub _ProcessRestrictions
+
+=head2 _ProcessRestrictions PARAMHASH
+
+# The new _ProcessRestrictions is somewhat dependent on the SQL stuff,
+# but isn't quite generic enough to move into Tickets_Overlay_SQL.
+
+=cut
+
+sub _ProcessRestrictions {
+    my $self = shift;
+    
+    #Blow away ticket aliases since we'll need to regenerate them for
+    #a new search
+    delete $self->{'TicketAliases'};
+    delete $self->{'items_array'};                                                                                                                   
+    my $sql = $self->{_sql_query}; # Violating the _SQL namespace
+    if (!$sql||$self->{'RecalcTicketLimits'}) {
+      #  "Restrictions to Clauses Branch\n";
+      my $clauseRef = eval { $self->_RestrictionsToClauses; };
+      if ($@) {
+	$RT::Logger->error( "RestrictionsToClauses: " . $@ );
+	$self->FromSQL("");
+      } else {
+	$sql = $self->ClausesToSQL($clauseRef);
+	$self->FromSQL($sql);
+      }
+    }
+
+
+    $self->{'RecalcTicketLimits'} = 0;
+
+}
+
+=head2 _BuildItemMap
+
+    # Build up a map of first/last/next/prev items, so that we can display search nav quickly
+
+=cut
+
+sub _BuildItemMap {
+    my $self = shift;
+
+    my $items = $self->ItemsArrayRef;
+    my $prev = 0 ;
+
+    delete $self->{'item_map'};
+    if ($items->[0]) {
+    $self->{'item_map'}->{'first'} = $items->[0]->Id;
+    while (my $item = shift @$items ) {
+        my $id = $item->Id;
+        $self->{'item_map'}->{$id}->{'defined'} = 1;
+        $self->{'item_map'}->{$id}->{prev}  = $prev;
+        $self->{'item_map'}->{$id}->{next}  = $items->[0]->Id if ($items->[0]);
+        $prev = $id;
+    }
+    $self->{'item_map'}->{'last'} = $prev;
+    }
+} 
+
+
+=head2 ItemMap
+
+Returns an a map of all items found by this search. The map is of the form
+
+$ItemMap->{'first'} = first ticketid found
+$ItemMap->{'last'} = last ticketid found
+$ItemMap->{$id}->{prev} = the tikcet id found before $id
+$ItemMap->{$id}->{next} = the tikcet id found after $id
+
+=cut
+
+sub ItemMap {
+    my $self = shift;
+    $self->_BuildItemMap() unless ($self->{'item_map'});
+    return ($self->{'item_map'});
+}
+
+
+
+
+=cut
+
+}
+
+
+
+# }}}
+
+# }}}
+
+=head2 PrepForSerialization
+
+You don't want to serialize a big tickets object, as the {items} hash will be instantly invalid _and_ eat lots of space
+
+=cut
+
+
+sub PrepForSerialization {
+    my $self = shift;
+    delete $self->{'items'};
+    $self->RedoSearch();
+}
+
+1;
+
diff --git a/rt/lib/RT/Tickets_Overlay_SQL.pm b/rt/lib/RT/Tickets_Overlay_SQL.pm
new file mode 100644
index 000000000..d78a56db3
--- /dev/null
+++ b/rt/lib/RT/Tickets_Overlay_SQL.pm
@@ -0,0 +1,382 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+use strict;
+use warnings;
+
+# Import configuration data from the lexcial scope of __PACKAGE__ (or
+# at least where those two Subroutines are defined.)
+
+my %FIELDS = %{FIELDS()};
+my %dispatch = %{dispatch()};
+
+sub _InitSQL {
+  my $self = shift;
+
+  # How many of these do we actually still use?
+
+  # Private Member Variales (which should get cleaned)
+  $self->{'_sql_linksc'}        = 0;
+  $self->{'_sql_watchersc'}     = 0;
+  $self->{'_sql_keywordsc'}     = 0;
+  $self->{'_sql_subclause'}     = "a";
+  $self->{'_sql_first'}         = 0;
+  $self->{'_sql_opstack'}       = [''];
+  $self->{'_sql_transalias'}    = undef;
+  $self->{'_sql_trattachalias'} = undef;
+  $self->{'_sql_keywordalias'}  = undef;
+  $self->{'_sql_depth'}         = 0;
+  $self->{'_sql_localdepth'}    = 0;
+  $self->{'_sql_query'}         = '';
+  $self->{'_sql_looking_at'}    = {};
+
+}
+
+sub _SQLLimit {
+  # All SQL stuff goes into one SB subclause so we can deal with all
+  # the aggregation
+  my $this = shift;
+  $this->SUPER::Limit(@_,
+                      SUBCLAUSE => 'ticketsql');
+}
+
+# Helpers
+sub _OpenParen {
+  $_[0]->SUPER::_OpenParen( 'ticketsql' );
+}
+sub _CloseParen {
+  $_[0]->SUPER::_CloseParen( 'ticketsql' );
+}
+
+=head1 SQL Functions
+
+=cut
+
+sub _match {
+  # Case insensitive equality
+  my ($y,$x) = @_;
+  return 1 if $x =~ /^$y$/i;
+  #  return 1 if ((lc $x) eq (lc $y)); # Why isnt this equiv?
+  return 0;
+}
+
+=head2 Robert's Simple SQL Parser
+
+Documentation In Progress
+
+The Parser/Tokenizer is a relatively simple state machine that scans through a SQL WHERE clause type string extracting a token at a time (where a token is:
+
+  VALUE -> quoted string or number
+  AGGREGator -> AND or OR
+  KEYWORD -> quoted string or single word
+  OPerator -> =,!=,LIKE,etc..
+  PARENthesis -> open or close.
+
+And that stream of tokens is passed through the "machine" in order to build up a structure that looks like:
+
+       KEY OP VALUE
+  AND  KEY OP VALUE
+  OR   KEY OP VALUE
+
+That also deals with parenthesis for nesting.  (The parentheses are
+just handed off the SearchBuilder)
+
+=cut
+
+use Regexp::Common qw /delimited/;
+
+# States
+use constant VALUE => 1;
+use constant AGGREG => 2;
+use constant OP => 4;
+use constant PAREN => 8;
+use constant KEYWORD => 16;
+my @tokens = qw[VALUE AGGREG OP PAREN KEYWORD];
+
+my $re_aggreg = qr[(?i:AND|OR)];
+my $re_value  = qr[$RE{delimited}{-delim=>qq{\'\"}}|\d+];
+my $re_keyword = qr[$RE{delimited}{-delim=>qq{\'\"}}|(?:\{|\}|\w|\.)+];
+my $re_op     = qr[=|!=|>=|<=|>|<|(?i:IS NOT)|(?i:IS)|(?i:NOT LIKE)|(?i:LIKE)]; # long to short
+my $re_paren  = qr'\(|\)';
+
+sub _parser {
+  my ($self,$string) = @_;
+  my $want = KEYWORD | PAREN;
+  my $last = undef;
+
+  my $depth = 0;
+
+  my ($ea,$key,$op,$value) = ("","","","");
+
+  while ($string =~ /(
+                      $re_aggreg
+                      |$re_keyword
+                      |$re_value
+                      |$re_op
+                      |$re_paren
+                     )/igx ) {
+    my $val = $1;
+    my $current = 0;
+
+    # Highest priority is last
+    $current = OP      if _match($re_op,$val);
+    $current = VALUE   if _match($re_value,$val);
+    $current = KEYWORD if _match($re_keyword,$val) && ($want & KEYWORD);
+    $current = AGGREG  if _match($re_aggreg,$val);
+    $current = PAREN   if _match($re_paren,$val);
+
+    unless ($current && $want & $current) {
+      # Error
+      # FIXME: I will only print out the highest $want value
+      die "Error near ->$val<- expecting a ", $tokens[((log $want)/(log 2))], " in $string\n";
+    }
+
+    # State Machine:
+
+    # Parens are highest priority
+    if ($current & PAREN) {
+      if ($val eq "(") {
+        $depth++;
+        $self->_OpenParen;
+
+      } else {
+        $depth--;
+        $self->_CloseParen;
+      }
+
+      $want = KEYWORD | PAREN | AGGREG;
+    }
+    elsif ( $current & AGGREG ) {
+      $ea = $val;
+      $want = KEYWORD | PAREN;
+    }
+    elsif ( $current & KEYWORD ) {
+      $key = $val;
+      $want = OP;
+    }
+    elsif ( $current & OP ) {
+      $op = $val;
+      $want = VALUE;
+    }
+    elsif ( $current & VALUE ) {
+      $value = $val;
+
+      # Remove surrounding quotes from $key, $val
+      # (in future, simplify as for($key,$val) { action on $_ })
+      if ($key =~ /$RE{delimited}{-delim=>qq{\'\"}}/) {
+        substr($key,0,1) = "";
+        substr($key,-1,1) = "";
+      }
+      if ($val =~ /$RE{delimited}{-delim=>qq{\'\"}}/) {
+        substr($val,0,1) = "";
+        substr($val,-1,1) = "";
+      }
+      # Unescape escaped characters                                            
+      $key =~ s!\\(.)!$1!g;                                                    
+      $val =~ s!\\(.)!$1!g;     
+      #    print "$ea Key=[$key] op=[$op]  val=[$val]\n";
+
+
+   my $subkey;
+   if ($key =~ /^(.+?)\.(.+)$/) {
+     $key = $1;
+     $subkey = $2;
+   }
+
+      my $class;
+      my ($stdkey) = grep { /^$key$/i } (keys %FIELDS);
+      if ($stdkey && exists $FIELDS{$stdkey}) {
+        $class = $FIELDS{$key}->[0];
+        $key = $stdkey;
+      }
+   # no longer have a default, since CF's are now a real class, not fallthrough
+   # fixme: "default class" is not Generic.
+
+ 
+   die "Unknown field: $key" unless $class;
+
+      $self->{_sql_localdepth} = 0;
+      die "No such dispatch method: $class"
+        unless exists $dispatch{$class};
+      my $sub = $dispatch{$class} || die;;
+      $sub->(
+             $self,
+             $key,
+             $op,
+             $val,
+             SUBCLAUSE =>  "",  # don't need anymore
+             ENTRYAGGREGATOR => $ea || "",
+             SUBKEY => $subkey,
+            );
+
+      $self->{_sql_looking_at}{lc $key} = 1;
+
+      ($ea,$key,$op,$value) = ("","","","");
+
+      $want = PAREN | AGGREG;
+    } else {
+      die "I'm lost";
+    }
+
+    $last = $current;
+  } # while
+
+  die "Incomplete query"
+    unless (($want | PAREN) || ($want | KEYWORD));
+
+  die "Incomplete Query"
+    unless ($last && ($last | PAREN) || ($last || VALUE));
+
+  # This will never happen, because the parser will complain
+  die "Mismatched parentheses"
+    unless $depth == 0;
+
+}
+
+
+=head2 ClausesToSQL
+
+=cut
+
+sub ClausesToSQL {
+  my $self = shift;
+  my $clauses = shift;
+  my @sql;
+
+  for my $f (keys %{$clauses}) {
+    my $sql;
+    my $first = 1;
+
+    # Build SQL from the data hash
+     for my $data ( @{ $clauses->{$f} } ) {
+      $sql .= $data->[0] unless $first; $first=0;
+      $sql .= " '". $data->[2] . "' ";
+      $sql .= $data->[3] . " ";
+      $sql .= "'". $data->[4] . "' ";
+    }
+
+    push @sql, " ( " . $sql . " ) ";
+  }
+
+  return join("AND",@sql);
+}
+
+=head2 FromSQL
+
+Convert a RT-SQL string into a set of SearchBuilder restrictions.
+
+Returns (1, 'Status message') on success and (0, 'Error Message') on
+failure.
+
+=cut
+
+sub FromSQL {
+  my ($self,$query) = @_;
+
+  $self->CleanSlate;
+  $self->_InitSQL();
+  return (1,"No Query") unless $query;
+
+  $self->{_sql_query} = $query;
+  eval { $self->_parser( $query ); };
+  $RT::Logger->error( $@ ) if $@;
+  return(0,$@) if $@;
+
+  # We only want to look at EffectiveId's (mostly) for these searches.
+  unless (exists $self->{_sql_looking_at}{'effectiveid'}) {
+  $self->SUPER::Limit( FIELD           => 'EffectiveId',
+                     ENTRYAGGREGATOR => 'AND',
+                     OPERATOR        => '=',
+                     QUOTEVALUE      => 0,
+                     VALUE           => 'main.id'
+    );    #TODO, we shouldn't be hard #coding the tablename to main.
+    }
+  # FIXME: Need to bring this logic back in
+
+  #      if ($self->_isLimited && (! $self->{'looking_at_effective_id'})) {
+  #         $self->SUPER::Limit( FIELD => 'EffectiveId',
+  #               OPERATOR => '=',
+  #               QUOTEVALUE => 0,
+  #               VALUE => 'main.id');   #TODO, we shouldn't be hard coding the tablename to main.
+  #       }
+  # --- This is hardcoded above.  This comment block can probably go.
+  # Or, we need to reimplement the looking_at_effective_id toggle.
+
+  # Unless we've explicitly asked to look at a specific Type, we need
+  # to limit to it.
+  unless ($self->{looking_at_type}) {
+    $self->SUPER::Limit( FIELD => 'Type',
+                         OPERATOR => '=',
+                         VALUE => 'ticket');
+  }
+
+  # set SB's dirty flag
+  $self->{'must_redo_search'} = 1;
+  $self->{'RecalcTicketLimits'} = 0;                                           
+
+  return (1,"Good Query");
+
+}
+
+
+1;
+
+=pod
+
+=head2 Exceptions
+
+Most of the RT code does not use Exceptions (die/eval) but it is used
+in the TicketSQL code for simplicity and historical reasons.  Lest you
+be worried that the dies will trigger user visible errors, all are
+trapped via evals.
+
+99% of the dies fall in subroutines called via FromSQL and then parse.
+(This includes all of the _FooLimit routines in Tickets_Overlay.pm.)
+The other 1% or so are via _ProcessRestrictions.
+
+All dies are trapped by eval {}s, and will be logged at the 'error'
+log level.  The general failure mode is to not display any tickets.
+
+=head2 General Flow
+
+Legacy Layer:
+
+   Legacy LimitFoo routines build up a RestrictionsHash
+
+   _ProcessRestrictions converts the Restrictions to Clauses
+   ([key,op,val,rest]).
+
+   Clauses are converted to RT-SQL (TicketSQL)
+
+New RT-SQL Layer:
+
+   FromSQL calls the parser
+
+   The parser calls the _FooLimit routines to do DBIx::SearchBuilder
+   limits.
+
+And then the normal SearchBuilder/Ticket routines are used for
+display/navigation.
+
+=cut
+
diff --git a/rt/lib/RT/Transaction.pm b/rt/lib/RT/Transaction.pm
index ee1f069b2..ca491a6c7 100755
--- a/rt/lib/RT/Transaction.pm
+++ b/rt/lib/RT/Transaction.pm
@@ -1,783 +1,364 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Transaction.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Copyright 1999-2001 Jesse Vincent <jesse@fsck.com>
-# Released under the terms of the GNU Public License
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::Transaction - RT\'s transaction object
+RT::Transaction
+
 
 =head1 SYNOPSIS
 
-  use RT::Transaction;
+=head1 DESCRIPTION
 
+=head1 METHODS
 
-=head1 DESCRIPTION
+=cut
 
+package RT::Transaction;
+use RT::Record; 
+use RT::Ticket;
 
-Each RT::Transaction describes an atomic change to a ticket object 
-or an update to an RT::Ticket object.
-It can have arbitrary MIME attachments.
 
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
+
+sub _Init {
+  my $self = shift; 
+
+  $self->Table('Transactions');
+  $self->SUPER::_Init(@_);
+}
 
-=head1 METHODS
 
-=begin testing
 
-ok(require RT::TestHarness);
-ok(require RT::Transaction);
 
-=end testing
+
+=item Create PARAMHASH
+
+Create takes a hash of values and creates a row in the database:
+
+  int(11) 'EffectiveTicket'.
+  int(11) 'Ticket'.
+  int(11) 'TimeTaken'.
+  varchar(20) 'Type'.
+  varchar(40) 'Field'.
+  varchar(255) 'OldValue'.
+  varchar(255) 'NewValue'.
+  varchar(100) 'Data'.
 
 =cut
 
-package RT::Transaction;
 
-use RT::Record;
-@ISA= qw(RT::Record);
-    
-use RT::Attachments;
 
-# {{{ sub _Init 
-sub _Init  {
+
+sub Create {
     my $self = shift;
-  $self->{'table'} = "Transactions";
-  return ($self->SUPER::_Init(@_));
+    my %args = ( 
+                EffectiveTicket => '0',
+                Ticket => '0',
+                TimeTaken => '0',
+                Type => '',
+                Field => '',
+                OldValue => '',
+                NewValue => '',
+                Data => '',
+
+		  @_);
+    $self->SUPER::Create(
+                         EffectiveTicket => $args{'EffectiveTicket'},
+                         Ticket => $args{'Ticket'},
+                         TimeTaken => $args{'TimeTaken'},
+                         Type => $args{'Type'},
+                         Field => $args{'Field'},
+                         OldValue => $args{'OldValue'},
+                         NewValue => $args{'NewValue'},
+                         Data => $args{'Data'},
+);
 
 }
-# }}}
 
-# {{{ sub Create 
 
-=head2 Create
 
-Create a new transaction.
+=item id
 
-This routine should _never_ be called anything other Than RT::Ticket. It should not be called 
-from client code. Ever. Not ever.  If you do this, we will hunt you down. and break your kneecaps.
-Then the unpleasant stuff will start.
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
 
-TODO: Document what gets passed to this
 
 =cut
 
-sub Create  {
-    my $self = shift;
-    my %args = ( id => undef,
-		 TimeTaken => 0,
-		 Ticket => 0 ,
-		 Type => 'undefined',
-		 Data => '',
-		 Field => undef,
-		 OldValue => undef,
-		 NewValue => undef,
-		 MIMEObj => undef,
-		 ActivateScrips => 1,
-		 @_
-	       );
-    
-    #if we didn't specify a ticket, we need to bail
-    unless ( $args{'Ticket'} ) {
-	return(0, "RT::Transaction->Create couldn't, as you didn't specify a ticket id");
-    }
-        
-    #lets create our transaction
-    my $id = $self->SUPER::Create(Ticket => $args{'Ticket'},
-	                          TimeTaken => $args{'TimeTaken'},
-				  Type => $args{'Type'},
-				  Data => $args{'Data'},
-				  Field => $args{'Field'},
-				  OldValue => $args{'OldValue'},
-				  NewValue => $args{'NewValue'},
-				  Created => $args{'Created'}
-				 );
-    $self->Load($id);
-    $self->_Attach($args{'MIMEObj'})
-      if defined $args{'MIMEObj'};
-    
-    #Provide a way to turn off scrips if we need to
-    if ($args{'ActivateScrips'}) {
-
-	#We're really going to need a non-acled ticket for the scrips to work
-	my $TicketAsSystem = RT::Ticket->new($RT::SystemUser);
-	$TicketAsSystem->Load($args{'Ticket'}) || 
-	  $RT::Logger->err("$self couldn't load ticket $args{'Ticket'}\n");
-	
-	my $TransAsSystem = RT::Transaction->new($RT::SystemUser);
-	$TransAsSystem->Load($self->id) ||
-	  $RT::Logger->err("$self couldn't load a copy of itself as superuser\n");
-	
-	# {{{ Deal with Scrips
-    
-    #Load a scripscopes object
-    use RT::Scrips;
-    my $PossibleScrips = RT::Scrips->new($RT::SystemUser);
-    
-    $PossibleScrips->LimitToQueue($TicketAsSystem->QueueObj->Id); #Limit it to  $Ticket->QueueObj->Id
-    $PossibleScrips->LimitToGlobal(); # or to "global"
-    my $ConditionsAlias = $PossibleScrips->NewAlias('ScripConditions');
-    
-    $PossibleScrips->Join(ALIAS1 => 'main',  FIELD1 => 'ScripCondition',
-			  ALIAS2 => $ConditionsAlias, FIELD2=> 'id');
-    
-    
-    #We only want things where the scrip applies to this sort of transaction
-    $PossibleScrips->Limit(ALIAS=> $ConditionsAlias,
-			   FIELD=>'ApplicableTransTypes',
-			   OPERATOR => 'LIKE',
-			   VALUE => $args{'Type'},
-			   ENTRYAGGREGATOR => 'OR',
-			  );
-    
-    # Or where the scrip applies to any transaction
-    $PossibleScrips->Limit(ALIAS=> $ConditionsAlias,
-			   FIELD=>'ApplicableTransTypes',
-			   OPERATOR => 'LIKE',
-			   VALUE => "Any",
-			   ENTRYAGGREGATOR => 'OR',
-			  );			    
-    
-    #Iterate through each script and check it's applicability.
-    
-    while (my $Scrip = $PossibleScrips->Next()) {
-      
-      #TODO: properly deal with errors raised in this scrip loop
-	
-      #$RT::Logger->debug("$self now dealing with ".$Scrip->Id. "\n");      
-	eval {
-	  local $SIG{__DIE__} = sub { $RT::Logger->error($_[0])};
-	  
-	  
-	  #Load the scrip's Condition object
-	  $Scrip->ConditionObj->LoadCondition(TicketObj => $TicketAsSystem, 
-					      TransactionObj => $TransAsSystem);	  
-	  
-	  
-	  #If it's applicable, prepare and commit it
-	  
-	$RT::Logger->debug ("$self: Checking condition ".$Scrip->ConditionObj->Name. "...\n");
-	  
-	  if ( $Scrip->IsApplicable() ) {
-	      
-		$RT::Logger->debug ("$self: Matches condition ".$Scrip->ConditionObj->Name. "...\n");
-	      #TODO: handle some errors here
-	      
-	      $Scrip->ActionObj->LoadAction(TicketObj => $TicketAsSystem, 
-					   TransactionObj => $TransAsSystem);
-	  
-	      
-	      if ($Scrip->Prepare()) {
-		  $RT::Logger->debug("$self: Prepared " .
-				   $Scrip->ActionObj->Name . "\n");
-		  if ($Scrip->Commit()) {
-			$RT::Logger->debug("$self: Committed " .
-					   $Scrip->ActionObj->Name . "\n");
-	     	  }
-		  else {
-			$RT::Logger->info("$self: Failed to commit ".
-					   $Scrip->ActionObj->Name . "\n");
-		  } 
-	      }
-	      else {
-		  $RT::Logger->info("$self: Failed to prepare " .
-				     $Scrip->ActionObj->Name . "\n");
-	      }
-
-	      #We're done with it. lets clean up.
-	      #TODO: something else isn't letting these get garbage collected. check em out.
-	      $Scrip->ActionObj->DESTROY();
-	      $Scrip->ConditionObj->DESTROY;
-	  }
-	  
-	  
-	else {
-	    $RT::Logger->debug ("$self: Doesn't match condition ".$Scrip->ConditionObj->Name. "...\n");
-
-	    # TODO: why doesn't this catch all the ScripObjs we create. 
-	    # and why do we explictly need to destroy them?
-	    $Scrip->ConditionObj->DESTROY;
-	}
-      }	
-    }
-
-    # }}}
-	
-    }
-
-    return ($id, "Transaction Created");
-}
 
-# }}}
+=item EffectiveTicket
 
-# {{{ sub Delete
+Returns the current value of EffectiveTicket. 
+(In the database, EffectiveTicket is stored as int(11).)
 
-sub Delete {
-    my $self = shift;
-    return (0, 'Deleting this object could break referential integrity');
-}
 
-# }}}
 
-# {{{ Routines dealing with Attachments
+=item SetEffectiveTicket VALUE
 
-# {{{ sub Message 
 
-=head2 Message
+Set EffectiveTicket to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, EffectiveTicket will be stored as a int(11).)
 
-  Returns the RT::Attachments Object which contains the "top-level" object
-  attachment for this transaction
 
 =cut
 
-sub Message  {
 
-    my $self = shift;
-    
-    if (!defined ($self->{'message'}) ){
-	
-	$self->{'message'} = new RT::Attachments($self->CurrentUser);
-	$self->{'message'}->Limit(FIELD => 'TransactionId',
-				  VALUE => $self->Id);
-	
-	$self->{'message'}->ChildrenOf(0);
-    } 
-    return($self->{'message'});
-}
-# }}}
+=item Ticket
+
+Returns the current value of Ticket. 
+(In the database, Ticket is stored as int(11).)
+
 
-# {{{ sub Content
 
-=head2 Content PARAMHASH
+=item SetTicket VALUE
 
-If this transaction has attached mime objects, returns the first text/ part.
-Otherwise, returns undef.
 
-Takes a paramhash.  If the $args{'Quote'} parameter is set, wraps this message 
-at $args{'Wrap'}.  $args{'Wrap'} defaults to 70.
+Set Ticket to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Ticket will be stored as a int(11).)
 
 
 =cut
 
-sub Content {
-    my $self = shift;
-    my %args = ( Quote => 0,
-		 Wrap => 70,
-		 @_ );
-
-    my $content = undef;
-
-    # If we don\'t have any content, return undef now.
-    unless ($self->Message->First) {
-	return (undef);
-    }	
-    
-    # Get the set of toplevel attachments to this transaction.
-    my $MIMEObj = $self->Message->First();
-    
-    # If it's a message or a plain part, just return the
-    # body. 
-    if ($MIMEObj->ContentType() =~ '^(text|message)(/|$)') {
-	$content = $MIMEObj->Content();
-    }
-    
-    # If it's a multipart object, first try returning the first 
-    # text/plain part. 
-    
-    elsif ($MIMEObj->ContentType() =~ '^multipart/') {
-	my $plain_parts = $MIMEObj->Children();
-	$plain_parts->ContentType(VALUE => 'text/plain');
-	
-	# If we actully found a part, return its content
-	if ($plain_parts->First && 
-        $plain_parts->First->Content ne '') {
-	    $content = $plain_parts->First->Content;		
-	}	
-	
-	# If that fails, return the  first text/ or message/ part 
-	# which has some content.
-    
-	else {
-	    my $all_parts = $MIMEObj->Children();
-	    while (($content == undef) && 
-		   (my $part = $all_parts->Next)) {
-		if (($part->ContentType() =~ '^(text|message)(/|$)') and
-		    ($part->Content())) {
-		    $content = $part->Content;
-		}	
-	    }
-	}	
-
-    }
-    # If all else fails, return a message that we couldn't find
-    # any content
-    else { 
-        $content = 'This transaction appears to have no content';
-    }	
-
-    if ($args{'Quote'}) {
-	# Remove quoted signature.
-	$content =~ s/\n-- \n(.*)$//s;
-
-	# What's the longest line like?
-	foreach (split (/\n/,$content)) {
-	    $max=length if ( length > $max);
-	}
-
-	if ($max>76) {
-	    require Text::Wrapper;
-	    my $wrapper=new Text::Wrapper
-		(
-		 columns => $args{'Wrap'}, 
-		 body_start => ($max > 70*3 ? '   ' : ''),
-		 par_start => ''
-		 );
-	    $content=$wrapper->wrap($content);
-	}
-
-	$content =~ s/^/> /gm;
-	$content = '[' . $self->CreatorObj->Name() . ' - ' . $self->CreatedAsString()
-	            . "]:\n\n"
-   	        . $content . "\n\n";
-
-    }
-
-    return ($content); 
-}
-# }}}
 
-# {{{ sub Subject
+=item TicketObj
+
+Returns the Ticket Object which has the id returned by Ticket
 
-=head2 Subject
 
-If this transaction has attached mime objects, returns the first one's subject
-Otherwise, returns null
-  
 =cut
 
-sub Subject {
-    my $self = shift;
-    if ($self->Message->First) {
-	return ($self->Message->First->Subject);
-    }
-    else {
-	return (undef);
-    }
+sub TicketObj {
+	my $self = shift;
+	my $Ticket =  RT::Ticket->new($self->CurrentUser);
+	$Ticket->Load($self->__Value('Ticket'));
+	return($Ticket);
 }
-# }}}
 
-# {{{ sub Attachments 
+=item TimeTaken
+
+Returns the current value of TimeTaken. 
+(In the database, TimeTaken is stored as int(11).)
+
 
-=head2 Attachments
 
-  Returns all the RT::Attachment objects which are attached
-to this transaction. Takes an optional parameter, which is
-a ContentType that Attachments should be restricted to.
+=item SetTimeTaken VALUE
+
+
+Set TimeTaken to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, TimeTaken will be stored as a int(11).)
+
 
 =cut
 
 
-sub Attachments  {
-    my $self = shift;
-    my $Types = '';
-    $Types = shift if (@_);
-
-    my $Attachments = new RT::Attachments($self->CurrentUser);
-    
-    #If it's a comment, return an empty object if they don't have the right to see it
-    if ($self->Type eq 'Comment') {
-	unless ($self->CurrentUserHasRight('ShowTicketComments')) {
-	    return ($Attachments);
-	}
-    }	
-    #if they ain't got rights to see, return an empty object
-    else {
-	unless ($self->CurrentUserHasRight('ShowTicket')) {
-	    return ($Attachments);
-	}
-    }
-    
-    $Attachments->Limit(FIELD => 'TransactionId',
-			VALUE => $self->Id);
-
-    # Get the attachments in the order they're put into
-    # the database.  Arguably, we should be returning a tree
-    # of attachments, not a set...but no current app seems to need
-    # it. 
-
-    $Attachments->OrderBy(ALIAS => 'main', 
-			  FIELD => 'Id',
-			  ORDER => 'asc');
-
-    if ($Types) {
-	$Attachments->ContentType( VALUE => "$Types",
-				   OPERATOR => "LIKE");
-    }
-    
-    
-    return($Attachments);
-    
-}
+=item Type
 
-# }}}
+Returns the current value of Type. 
+(In the database, Type is stored as varchar(20).)
 
-# {{{ sub _Attach 
 
-=head2 _Attach
 
-A private method used to attach a mime object to this transaction.
+=item SetType VALUE
+
+
+Set Type to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Type will be stored as a varchar(20).)
+
 
 =cut
 
-sub _Attach  {
-    my $self = shift;
-    my $MIMEObject = shift;
-    
-    if (!defined($MIMEObject)) {
-	$RT::Logger->error("$self _Attach: We can't attach a mime object if you don't give us one.\n");
-	return(0, "$self: no attachment specified");
-    }
-    
-  
-    use RT::Attachment;
-    my $Attachment = new RT::Attachment ($self->CurrentUser);
-    $Attachment->Create(TransactionId => $self->Id,
-			Attachment => $MIMEObject);
-    return ($Attachment, "Attachment created");
-    
-}
 
-# }}}
+=item Field
 
-# }}}
+Returns the current value of Field. 
+(In the database, Field is stored as varchar(40).)
 
-# {{{ Routines dealing with Transaction Attributes
 
-# {{{ sub TicketObj
 
-=head2 TicketObj
+=item SetField VALUE
+
+
+Set Field to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Field will be stored as a varchar(40).)
 
-Returns this transaction's ticket object.
 
 =cut
 
-sub TicketObj {
-    my $self = shift;
-    if (! exists $self->{'TicketObj'}) {
-	$self->{'TicketObj'} = new RT::Ticket($self->CurrentUser);
-	$self->{'TicketObj'}->Load($self->Ticket);
-    }
-    
-    return $self->{'TicketObj'};
-}
-# }}}
 
-# {{{ sub Description 
+=item OldValue
+
+Returns the current value of OldValue. 
+(In the database, OldValue is stored as varchar(255).)
+
+
+
+=item SetOldValue VALUE
+
 
-=head2 Description
+Set OldValue to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, OldValue will be stored as a varchar(255).)
 
-Returns a text string which describes this transaction
 
 =cut
 
 
-sub Description  {
-    my $self = shift;
+=item NewValue
+
+Returns the current value of NewValue. 
+(In the database, NewValue is stored as varchar(255).)
 
-    #Check those ACLs
-    #If it's a comment, we need to be extra special careful
-    if ($self->__Value('Type') eq 'Comment') {
-     	unless ($self->CurrentUserHasRight('ShowTicketComments')) {
-	    return (0, "Permission Denied");
-	}
-    }	
-
-    #if they ain't got rights to see, don't let em
-    else {
-	unless ($self->CurrentUserHasRight('ShowTicket')) {
-	    return (0, "Permission Denied");
-	}
-    }
-
-    if (!defined($self->Type)) {
-	return("No transaction type specified");
-    }
-    
-    return ($self->BriefDescription . " by " . $self->CreatorObj->Name);
-}
 
-# }}}
 
-# {{{ sub BriefDescription 
+=item SetNewValue VALUE
 
-=head2 BriefDescription
 
-Returns a text string which briefly describes this transaction
+Set NewValue to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, NewValue will be stored as a varchar(255).)
+
 
 =cut
 
 
-sub BriefDescription  {
-    my $self = shift;
+=item Data
 
-    #Check those ACLs
-    #If it's a comment, we need to be extra special careful
-    if ($self->__Value('Type') eq 'Comment') {
-     	unless ($self->CurrentUserHasRight('ShowTicketComments')) {
-	    return (0, "Permission Denied");
-	}
-    }	
-
-    #if they ain't got rights to see, don't let em
-    else {
-	unless ($self->CurrentUserHasRight('ShowTicket')) {
-	    return (0, "Permission Denied");
-	}
-    }
-
-    if (!defined($self->Type)) {
-	return("No transaction type specified");
-    }
-    
-    if ($self->Type eq 'Create'){
-	return("Ticket created");
-    }
-    elsif ($self->Type =~ /Status/) {
-	if ($self->Field eq 'Status') {
-	    if ($self->NewValue eq 'dead') {
-		return ("Ticket killed");
-      }
-	    else {
-		return( "Status changed from ".  $self->OldValue . 
-			" to ". $self->NewValue);
-
-	    }
-	}
-	# Generic:
-	return ($self->Field." changed from ".($self->OldValue||"(empty value)").
-	  " to ".$self->NewValue );
-      }
-    
-    if ($self->Type eq 'Correspond')    {
-	return("Correspondence added");
-    }
-    
-    elsif ($self->Type eq 'Comment')  {
-	return( "Comments added");
-    }
-    
-    elsif ($self->Type eq 'Keyword') {
-
-	my $field = 'Keyword';
-
-	if ($self->Field) {
-	    my $keywordsel = new RT::KeywordSelect ($self->CurrentUser);
-	    $keywordsel->Load($self->Field);
-	    $field = $keywordsel->Name();
-	}
-
-	if ($self->OldValue eq '') {
-	    return ($field." ".$self->NewValue." added");
-	}
-	elsif ($self->NewValue eq '') {
-	    return ($field." ".$self->OldValue." deleted"); 
-	    
-	}
-	else {
-	    return ($field." ".$self->OldValue . " changed to ". 
-		     $self->NewValue);
-	}	
-    }
-    
-    elsif ($self->Type eq 'Untake'){
-	    return( "Untaken");
-	}
-    
-    elsif ($self->Type eq "Take") {
-	return( "Taken");
-    }
-    
-    elsif ($self->Type eq "Force") {
-        my $Old = RT::User->new($self->CurrentUser);
-        $Old->Load($self->OldValue);
-        my $New = RT::User->new($self->CurrentUser);
-        $New->Load($self->NewValue);
-	return "Owner forcibly changed from ".$Old->Name . " to ". $New->Name;
-    }
-    elsif ($self->Type eq "Steal") {
-	my $Old = RT::User->new($self->CurrentUser);
-	$Old->Load($self->OldValue);
-	return "Stolen from ".$Old->Name;
-    }
-    
-    elsif ($self->Type eq "Give") {
-	my $New = RT::User->new($self->CurrentUser);
-	$New->Load($self->NewValue);
-	return( "Given to ".$New->Name);
-    }
-    
-    elsif ($self->Type eq 'AddWatcher'){
-	return( $self->Field." ". $self->NewValue ." added");
-    }
-    
-    elsif ($self->Type eq 'DelWatcher'){
-	return( $self->Field." ".$self->OldValue ." deleted");
-    }
-    
-    elsif ($self->Type eq 'Subject') {
-	return( "Subject changed to ".$self->Data);
-    }
-    elsif ($self->Type eq 'Told') {
-	return( "User notified");
-    }
-    
-    elsif ($self->Type eq 'AddLink') {
-	return ($self->Data);
-    }
-    elsif ($self->Type eq 'DeleteLink') {
-	return ($self->Data);
-    }
-    elsif ($self->Type eq 'Set') {
-	if ($self->Field eq 'Queue') {
-	    my $q1 = new RT::Queue($self->CurrentUser);
-	    $q1->Load($self->OldValue);
-	    my $q2 = new RT::Queue($self->CurrentUser);
-	    $q2->Load($self->NewValue);
-	    return ($self->Field . " changed from " . $q1->Name . " to ".
-		    $q2->Name);
-	}
-
-        # Write the date/time change at local time:                    
-    elsif ($self->Field =~  /Due|Starts|Started|Told/) {           
-        my $t1 = new RT::Date($self->CurrentUser);                 
-        $t1->Set(Format => 'ISO', Value => $self->NewValue);       
-        my $t2 = new RT::Date($self->CurrentUser);                 
-        $t2->Set(Format => 'ISO', Value => $self->OldValue);       
-        return ($self->Field . " changed from " . $t2->AsString .  
-                    " to ".$t1->AsString);      
-    }                
-	else {
-	    return ($self->Field . " changed from " . $self->OldValue . 
-		    " to ".$self->NewValue);
-	}	
-    }
-    elsif ($self->Type eq 'PurgeTransaction') {
-	return ("Transaction ".$self->Data. " purged");
-    }
-    else {
-	return ("Default: ". $self->Type ."/". $self->Field . 
-		" changed from " . $self->OldValue . 
-		" to ".$self->NewValue);
-	
-    }
-}
+Returns the current value of Data. 
+(In the database, Data is stored as varchar(100).)
 
-# }}}
 
-# {{{ Utility methods
 
-# {{{ sub IsInbound
+=item SetData VALUE
 
-=head2 IsInbound
 
-Returns true if the creator of the transaction is a requestor of the ticket.
-Returns false otherwise
+Set Data to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Data will be stored as a varchar(100).)
 
-=cut
 
-sub IsInbound {
-    my $self=shift;
-    return ($self->TicketObj->IsRequestor($self->CreatorObj));
-}
+=cut
 
-# }}}
-
-# }}}
-
-# {{{ sub _Accessible 
-
-sub _Accessible  {
-  my $self = shift;
-  my %Cols = (
-	      TimeTaken => 'read',
-	      Ticket => 'read/public',
-	      Type=> 'read',
-	      Field => 'read',
-	      Data => 'read',
-	      NewValue => 'read',
-	      OldValue => 'read',
-	      Creator => 'read/auto',
-	      Created => 'read/auto',
-	     );
-  return $self->SUPER::_Accessible(@_, %Cols);
-}
 
-# }}}
+=item Creator
 
-# }}}
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
 
-# {{{ sub _Set
 
-sub _Set {
-    my $self = shift;
-    return(0, 'Transactions are immutable');
-}
+=cut
 
-# }}}
 
-# {{{ sub _Value 
+=item Created
 
-=head2 _Value
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
 
-Takes the name of a table column.
-Returns its value as a string, if the user passes an ACL check
 
 =cut
 
-sub _Value  {
 
-    my $self = shift;
-    my $field = shift;
-    
-    
-    #if the field is public, return it.
-    if ($self->_Accessible($field, 'public')) {
-	return($self->__Value($field));
-	
-    }
-    #If it's a comment, we need to be extra special careful
-    if ($self->__Value('Type') eq 'Comment') {
-	unless ($self->CurrentUserHasRight('ShowTicketComments')) {
-	    return (undef);
-	}
-    }	
-    #if they ain't got rights to see, don't let em
-    else {
-	unless ($self->CurrentUserHasRight('ShowTicket')) {
-	    return (undef);
-	}
-    }	
-    
-    return($self->__Value($field));
-    
-}
 
-# }}}
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        EffectiveTicket => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Ticket => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        TimeTaken => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Type => 
+		{read => 1, write => 1, type => 'varchar(20)', default => ''},
+        Field => 
+		{read => 1, write => 1, type => 'varchar(40)', default => ''},
+        OldValue => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        NewValue => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        Data => 
+		{read => 1, write => 1, type => 'varchar(100)', default => ''},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
 
-# {{{ sub CurrentUserHasRight
+ }
+};
 
-=head2 CurrentUserHasRight RIGHT
 
-Calls $self->CurrentUser->HasQueueRight for the right passed in here.
-passed in here.
+        eval "require RT::Transaction_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Transaction_Overlay.pm}) {
+            die $@;
+        };
 
-=cut
+        eval "require RT::Transaction_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Transaction_Vendor.pm}) {
+            die $@;
+        };
 
-sub CurrentUserHasRight {
-    my $self = shift;
-    my $right = shift;
-    return ($self->CurrentUser->HasQueueRight(Right => "$right", 
-                                              TicketObj => $self->TicketObj));            
-}
+        eval "require RT::Transaction_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Transaction_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Transaction_Overlay, RT::Transaction_Vendor, RT::Transaction_Local
+
+=cut
 
-# }}}
 
 1;
diff --git a/rt/lib/RT/Transaction_Overlay.pm b/rt/lib/RT/Transaction_Overlay.pm
new file mode 100644
index 000000000..54bb326a9
--- /dev/null
+++ b/rt/lib/RT/Transaction_Overlay.pm
@@ -0,0 +1,817 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::Transaction - RT\'s transaction object
+
+=head1 SYNOPSIS
+
+  use RT::Transaction;
+
+
+=head1 DESCRIPTION
+
+
+Each RT::Transaction describes an atomic change to a ticket object 
+or an update to an RT::Ticket object.
+It can have arbitrary MIME attachments.
+
+
+=head1 METHODS
+
+=begin testing
+
+ok(require RT::Transaction);
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+use RT::Attachments;
+
+# {{{ sub Create 
+
+=head2 Create
+
+Create a new transaction.
+
+This routine should _never_ be called anything other Than RT::Ticket. It should not be called 
+from client code. Ever. Not ever.  If you do this, we will hunt you down. and break your kneecaps.
+Then the unpleasant stuff will start.
+
+TODO: Document what gets passed to this
+
+=cut
+
+sub Create {
+    my $self = shift;
+    my %args = (
+        id             => undef,
+        TimeTaken      => 0,
+        Ticket         => 0,
+        Type           => 'undefined',
+        Data           => '',
+        Field          => undef,
+        OldValue       => undef,
+        NewValue       => undef,
+        MIMEObj        => undef,
+        ActivateScrips => 1,
+        @_
+    );
+
+    #if we didn't specify a ticket, we need to bail
+    unless ( $args{'Ticket'} ) {
+        return ( 0, $self->loc( "Transaction->Create couldn't, as you didn't specify a ticket id"));
+    }
+
+
+
+    #lets create our transaction
+    my %params = (Ticket    => $args{'Ticket'},
+        Type      => $args{'Type'},
+        Data      => $args{'Data'},
+        Field     => $args{'Field'},
+        OldValue  => $args{'OldValue'},
+        NewValue  => $args{'NewValue'},
+        Created   => $args{'Created'}
+    );
+
+    # Parameters passed in during an import that we probably don't want to touch, otherwise
+    foreach my $attr qw(id Creator Created LastUpdated TimeTaken LastUpdatedBy) {
+        $params{$attr} = $args{$attr} if ($args{$attr});
+    }
+ 
+    my $id = $self->SUPER::Create(%params);
+    $self->Load($id);
+    $self->_Attach( $args{'MIMEObj'} )
+      if defined $args{'MIMEObj'};
+
+    #Provide a way to turn off scrips if we need to
+    if ( $args{'ActivateScrips'} ) {
+
+        #We're really going to need a non-acled ticket for the scrips to work
+        my $TicketAsSystem = RT::Ticket->new($RT::SystemUser);
+        $TicketAsSystem->Load( $args{'Ticket'} )
+          || $RT::Logger->err("$self couldn't load ticket $args{'Ticket'}\n");
+
+        my $TransAsSystem = RT::Transaction->new($RT::SystemUser);
+        $TransAsSystem->Load( $self->id )
+          || $RT::Logger->err(
+            "$self couldn't load a copy of itself as superuser\n"); 
+        # {{{ Deal with Scrips
+
+        use RT::Scrips;
+        my $PossibleScrips = RT::Scrips->new($RT::SystemUser);
+
+        $PossibleScrips->LimitToQueue( $TicketAsSystem->QueueObj->Id )
+          ;                                  #Limit it to  $Ticket->QueueObj->Id
+        $PossibleScrips->LimitToGlobal()
+	    unless $TicketAsSystem->QueueObj->Disabled;    # or to "global"
+
+
+        $PossibleScrips->Limit(FIELD => "Stage", VALUE => "TransactionCreate");
+
+
+        my $ConditionsAlias = $PossibleScrips->NewAlias('ScripConditions');
+
+        $PossibleScrips->Join(
+            ALIAS1 => 'main',
+            FIELD1 => 'ScripCondition',
+            ALIAS2 => $ConditionsAlias,
+            FIELD2 => 'id'
+        );
+
+        #We only want things where the scrip applies to this sort of transaction
+        $PossibleScrips->Limit(
+            ALIAS           => $ConditionsAlias,
+            FIELD           => 'ApplicableTransTypes',
+            OPERATOR        => 'LIKE',
+            VALUE           => $args{'Type'},
+            ENTRYAGGREGATOR => 'OR',
+        );
+
+        # Or where the scrip applies to any transaction
+        $PossibleScrips->Limit(
+            ALIAS           => $ConditionsAlias,
+            FIELD           => 'ApplicableTransTypes',
+            OPERATOR        => 'LIKE',
+            VALUE           => "Any",
+            ENTRYAGGREGATOR => 'OR',
+        );
+
+        #Iterate through each script and check it's applicability.
+
+        while ( my $Scrip = $PossibleScrips->Next() ) {
+            $Scrip->Apply (TicketObj => $TicketAsSystem,
+                           TransactionObj => $TransAsSystem);
+        }
+
+        # }}}
+
+    }
+
+    return ( $id, $self->loc("Transaction Created") );
+}
+
+# }}}
+
+# {{{ sub Delete
+
+sub Delete {
+    my $self = shift;
+    return ( 0,
+        $self->loc('Deleting this object could break referential integrity') );
+}
+
+# }}}
+
+# {{{ Routines dealing with Attachments
+
+# {{{ sub Message 
+
+=head2 Message
+
+  Returns the RT::Attachments Object which contains the "top-level"object
+  attachment for this transaction
+
+=cut
+
+sub Message {
+
+    my $self = shift;
+    
+    if ( !defined( $self->{'message'} ) ) {
+
+        $self->{'message'} = new RT::Attachments( $self->CurrentUser );
+        $self->{'message'}->Limit(
+            FIELD => 'TransactionId',
+            VALUE => $self->Id
+        );
+
+        $self->{'message'}->ChildrenOf(0);
+    }
+    return ( $self->{'message'} );
+}
+
+# }}}
+
+# {{{ sub Content
+
+=head2 Content PARAMHASH
+
+If this transaction has attached mime objects, returns the first text/plain part.
+Otherwise, returns undef.
+
+Takes a paramhash.  If the $args{'Quote'} parameter is set, wraps this message 
+at $args{'Wrap'}.  $args{'Wrap'} defaults to 70.
+
+
+=cut
+
+sub Content {
+    my $self = shift;
+    my %args = (
+        Quote => 0,
+        Wrap  => 70,
+        @_
+    );
+
+    my $content;
+    my $content_obj = $self->ContentObj;
+    if ($content_obj) {
+        $content = $content_obj->Content;
+    }
+
+    # If all else fails, return a message that we couldn't find any content
+    else {
+        $content = $self->loc('This transaction appears to have no content');
+    }
+
+    if ( $args{'Quote'} ) {
+
+        # Remove quoted signature.
+        $content =~ s/\n-- \n(.*)$//s;
+
+        # What's the longest line like?
+        my $max = 0;
+        foreach ( split ( /\n/, $content ) ) {
+            $max = length if ( length > $max );
+        }
+
+        if ( $max > 76 ) {
+            require Text::Wrapper;
+            my $wrapper = new Text::Wrapper(
+                columns    => $args{'Wrap'},
+                body_start => ( $max > 70 * 3 ? '   ' : '' ),
+                par_start  => ''
+            );
+            $content = $wrapper->wrap($content);
+        }
+
+        $content = '['
+          . $self->CreatorObj->Name() . ' - '
+          . $self->CreatedAsString() . "]:\n\n" . $content . "\n\n";
+        $content =~ s/^/> /gm;
+
+    }
+
+    return ($content);
+}
+
+# }}}
+
+# {{{ ContentObj
+
+=head2 ContentObj 
+
+Returns the RT::Attachment object which contains the content for this Transaction
+
+=cut
+
+
+
+sub ContentObj {
+
+    my $self = shift;
+
+    # If we don\'t have any content, return undef now.
+    unless ( $self->Attachments->First ) {
+        return (undef);
+    }
+
+    # Get the set of toplevel attachments to this transaction.
+    my $Attachment = $self->Attachments->First();
+
+    # If it's a message or a plain part, just return the
+    # body.
+    if ( $Attachment->ContentType() =~ '^(text/plain$|message/)' ) {
+        return ($Attachment);
+    }
+
+    # If it's a multipart object, first try returning the first
+    # text/plain part.
+
+    elsif ( $Attachment->ContentType() =~ '^multipart/' ) {
+        my $plain_parts = $Attachment->Children();
+        $plain_parts->ContentType( VALUE => 'text/plain' );
+
+        # If we actully found a part, return its content
+        if ( $plain_parts->First && $plain_parts->First->Content ne '' ) {
+            return ( $plain_parts->First );
+        }
+
+        # If that fails, return the  first text/plain or message/ part
+        # which has some content.
+
+        else {
+            my $all_parts = $Attachment->Children();
+            while ( my $part = $all_parts->Next ) {
+                if (( $part->ContentType() =~ '^(text/plain$|message/)' ) &&  $part->Content()  ) {
+                    return ($part);
+                }
+            }
+        }
+
+    }
+
+    # We found no content. suck
+    return (undef);
+}
+
+# }}}
+
+# {{{ sub Subject
+
+=head2 Subject
+
+If this transaction has attached mime objects, returns the first one's subject
+Otherwise, returns null
+  
+=cut
+
+sub Subject {
+    my $self = shift;
+    if ( $self->Attachments->First ) {
+        return ( $self->Attachments->First->Subject );
+    }
+    else {
+        return (undef);
+    }
+}
+
+# }}}
+
+# {{{ sub Attachments 
+
+=head2 Attachments
+
+  Returns all the RT::Attachment objects which are attached
+to this transaction. Takes an optional parameter, which is
+a ContentType that Attachments should be restricted to.
+
+=cut
+
+sub Attachments {
+    my $self = shift;
+
+    unless ( $self->{'attachments'} ) {
+        $self->{'attachments'} = RT::Attachments->new( $self->CurrentUser );
+
+        #If it's a comment, return an empty object if they don't have the right to see it
+        if ( $self->Type eq 'Comment' ) {
+            unless ( $self->CurrentUserHasRight('ShowTicketComments') ) {
+                return ( $self->{'attachments'} );
+            }
+        }
+
+        #if they ain't got rights to see, return an empty object
+        else {
+            unless ( $self->CurrentUserHasRight('ShowTicket') ) {
+                return ( $self->{'attachments'} );
+            }
+        }
+
+        $self->{'attachments'}->Limit( FIELD => 'TransactionId',
+                                       VALUE => $self->Id );
+
+        # Get the self->{'attachments'} in the order they're put into
+        # the database.  Arguably, we should be returning a tree
+        # of self->{'attachments'}, not a set...but no current app seems to need
+        # it.
+
+        $self->{'attachments'}->OrderBy( ALIAS => 'main',
+                                         FIELD => 'id',
+                                         ORDER => 'asc' );
+
+    }
+    return ( $self->{'attachments'} );
+
+}
+
+# }}}
+
+# {{{ sub _Attach 
+
+=head2 _Attach
+
+A private method used to attach a mime object to this transaction.
+
+=cut
+
+sub _Attach {
+    my $self       = shift;
+    my $MIMEObject = shift;
+
+    if ( !defined($MIMEObject) ) {
+        $RT::Logger->error(
+"$self _Attach: We can't attach a mime object if you don't give us one.\n"
+        );
+        return ( 0, $self->loc("[_1]: no attachment specified", $self) );
+    }
+
+    my $Attachment = new RT::Attachment( $self->CurrentUser );
+    $Attachment->Create(
+        TransactionId => $self->Id,
+        Attachment    => $MIMEObject
+    );
+    return ( $Attachment, $self->loc("Attachment created") );
+
+}
+
+# }}}
+
+# }}}
+
+# {{{ Routines dealing with Transaction Attributes
+
+# {{{ sub Description 
+
+=head2 Description
+
+Returns a text string which describes this transaction
+
+=cut
+
+sub Description {
+    my $self = shift;
+
+    #Check those ACLs
+    #If it's a comment, we need to be extra special careful
+    if ( $self->__Value('Type') eq 'Comment' ) {
+        unless ( $self->CurrentUserHasRight('ShowTicketComments') ) {
+            return ( $self->loc("Permission Denied") );
+        }
+    }
+
+    #if they ain't got rights to see, don't let em
+    else {
+        unless ( $self->CurrentUserHasRight('ShowTicket') ) {
+            return ($self->loc("Permission Denied") );
+        }
+    }
+
+    if ( !defined( $self->Type ) ) {
+        return ( $self->loc("No transaction type specified"));
+    }
+
+    return ( $self->loc("[_1] by [_2]",$self->BriefDescription , $self->CreatorObj->Name ));
+}
+
+# }}}
+
+# {{{ sub BriefDescription 
+
+=head2 BriefDescription
+
+Returns a text string which briefly describes this transaction
+
+=cut
+
+sub BriefDescription {
+    my $self = shift;
+
+
+    #Check those ACLs
+    #If it's a comment, we need to be extra special careful
+    if ( $self->__Value('Type') eq 'Comment' ) {
+        unless ( $self->CurrentUserHasRight('ShowTicketComments') ) {
+            return ( $self->loc("Permission Denied") );
+        }
+    }
+
+    #if they ain't got rights to see, don't let em
+    else {
+        unless ( $self->CurrentUserHasRight('ShowTicket') ) {
+            return ( $self->loc("Permission Denied") );
+        }
+    }
+
+    my $type = $self->Type; #cache this, rather than calling it 30 times
+
+    if ( !defined( $type ) ) {
+        return $self->loc("No transaction type specified");
+    }
+
+    if ( $type eq 'Create' ) {
+        return ($self->loc("Ticket created"));
+    }
+    elsif ( $type =~ /Status/ ) {
+        if ( $self->Field eq 'Status' ) {
+            if ( $self->NewValue eq 'deleted' ) {
+                return ($self->loc("Ticket deleted"));
+            }
+            else {
+                return ( $self->loc("Status changed from [_1] to [_2]", $self->loc($self->OldValue), $self->loc($self->NewValue) ));
+
+            }
+        }
+
+        # Generic:
+       my $no_value = $self->loc("(no value)"); 
+        return ( $self->loc( "[_1] changed from [_2] to [_3]", $self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue ));
+    }
+
+    if ( $type eq 'Correspond' ) {
+        return $self->loc("Correspondence added");
+    }
+
+    elsif ( $type eq 'Comment' ) {
+        return $self->loc("Comments added");
+    }
+
+    elsif ( $type eq 'CustomField' ) {
+
+        my $field = $self->loc('CustomField');
+
+        if ( $self->Field ) {
+            my $cf = RT::CustomField->new( $self->CurrentUser );
+            $cf->Load( $self->Field );
+            $field = $cf->Name();
+        }
+
+        if ( $self->OldValue eq '' ) {
+            return ( $self->loc("[_1] [_2] added", $field, $self->NewValue) );
+        }
+        elsif ( $self->NewValue eq '' ) {
+            return ( $self->loc("[_1] [_2] deleted", $field, $self->OldValue) );
+
+        }
+        else {
+            return $self->loc("[_1] [_2] changed to [_3]", $field, $self->OldValue, $self->NewValue );
+        }
+    }
+
+    elsif ( $type eq 'Untake' ) {
+        return $self->loc("Untaken");
+    }
+
+    elsif ( $type eq "Take" ) {
+        return $self->loc("Taken");
+    }
+
+    elsif ( $type eq "Force" ) {
+        my $Old = RT::User->new( $self->CurrentUser );
+        $Old->Load( $self->OldValue );
+        my $New = RT::User->new( $self->CurrentUser );
+        $New->Load( $self->NewValue );
+
+        return $self->loc("Owner forcibly changed from [_1] to [_2]" , $Old->Name , $New->Name);
+    }
+    elsif ( $type eq "Steal" ) {
+        my $Old = RT::User->new( $self->CurrentUser );
+        $Old->Load( $self->OldValue );
+        return $self->loc("Stolen from [_1] ",  $Old->Name);
+    }
+
+    elsif ( $type eq "Give" ) {
+        my $New = RT::User->new( $self->CurrentUser );
+        $New->Load( $self->NewValue );
+        return $self->loc( "Given to [_1]",  $New->Name );
+    }
+
+    elsif ( $type eq 'AddWatcher' ) {
+        my $principal = RT::Principal->new($self->CurrentUser);
+        $principal->Load($self->NewValue);
+        return $self->loc( "[_1] [_2] added", $self->Field, $principal->Object->Name);
+    }
+
+    elsif ( $type eq 'DelWatcher' ) {
+        my $principal = RT::Principal->new($self->CurrentUser);
+        $principal->Load($self->OldValue);
+        return $self->loc( "[_1] [_2] deleted", $self->Field, $principal->Object->Name);
+    }
+
+    elsif ( $type eq 'Subject' ) {
+        return $self->loc( "Subject changed to [_1]", $self->Data );
+    }
+
+    elsif ( $type eq 'AddLink' ) {
+        my $value;
+	if ($self->NewValue) {
+		my $URI = RT::URI->new($self->CurrentUser);
+		$URI->FromURI($self->NewValue);
+		if ($URI->Resolver) {
+			$value = $URI->Resolver->AsString;
+		} else {
+			$value = $self->NewValue;
+		}
+	}
+	if ($self->Field eq 'DependsOn') {
+		return $self->loc("Dependency on [_1] added",$value);
+	} elsif ($self->Field eq 'DependedOnBy') {
+		return $self->loc("Dependency by [_1] added",$value);
+		
+	} elsif ($self->Field eq 'RefersTo') {
+		return $self->loc("Reference to [_1] added",$value);
+	} elsif ($self->Field eq 'ReferredToBy') {
+		return $self->loc("Reference by [_1] added",$value);
+	} elsif ($self->Field eq 'MemberOf') {
+		return $self->loc("Membership in [_1] added",$value);
+	} elsif ($self->Field eq 'HasMember') {
+		return $self->loc("Member [_1] added",$value);
+	} else {
+        return ( $self->Data );
+	}
+    }
+    elsif ( $type eq 'DeleteLink' ) {
+    my $value;
+	if ($self->OldValue) {
+		my $URI = RT::URI->new($self->CurrentUser);
+		$URI->FromURI($self->OldValue);
+		if ($URI->Resolver) {
+			$value = $URI->Resolver->AsString;
+		} else {
+			$value = $self->OldValue;
+		}
+	}
+
+	if ($self->Field eq 'DependsOn') {
+		return $self->loc("Dependency on [_1] deleted",$value);
+	} elsif ($self->Field eq 'DependedOnBy') {
+		return $self->loc("Dependency by [_1] deleted",$value);
+		
+	} elsif ($self->Field eq 'RefersTo') {
+		return $self->loc("Reference to [_1] deleted",$value);
+	} elsif ($self->Field eq 'ReferredToBy') {
+		return $self->loc("Reference by [_1] deleted",$value);
+	} elsif ($self->Field eq 'MemberOf') {
+		return $self->loc("Membership in [_1] deleted",$value);
+	} elsif ($self->Field eq 'HasMember') {
+		return $self->loc("Member [_1] deleted",$value);
+	} else {
+        return ( $self->Data );
+	}
+    }
+    elsif ( $type eq 'Set' ) {
+        if ( $self->Field eq 'Queue' ) {
+            my $q1 = new RT::Queue( $self->CurrentUser );
+            $q1->Load( $self->OldValue );
+            my $q2 = new RT::Queue( $self->CurrentUser );
+            $q2->Load( $self->NewValue );
+            return $self->loc("[_1] changed from [_2] to [_3]", $self->Field , $q1->Name , $q2->Name);
+        }
+
+        # Write the date/time change at local time:
+    elsif ($self->Field =~  /Due|Starts|Started|Told/) {
+        my $t1 = new RT::Date($self->CurrentUser);
+        $t1->Set(Format => 'ISO', Value => $self->NewValue);
+        my $t2 = new RT::Date($self->CurrentUser);
+        $t2->Set(Format => 'ISO', Value => $self->OldValue);
+        return $self->loc( "[_1] changed from [_2] to [_3]", $self->Field, $t2->AsString, $t1->AsString );
+    }
+        else {
+            return $self->loc( "[_1] changed from [_2] to [_3]", $self->Field, $self->OldValue, $self->NewValue );
+        }
+    }
+    elsif ( $type eq 'PurgeTransaction' ) {
+        return $self->loc("Transaction [_1] purged", $self->Data);
+    }
+    else {
+        return $self->loc( "Default: [_1]/[_2] changed from [_3] to [_4]", $type, $self->Field, $self->OldValue, $self->NewValue );
+
+    }
+}
+
+# }}}
+
+# {{{ Utility methods
+
+# {{{ sub IsInbound
+
+=head2 IsInbound
+
+Returns true if the creator of the transaction is a requestor of the ticket.
+Returns false otherwise
+
+=cut
+
+sub IsInbound {
+    my $self = shift;
+    return ( $self->TicketObj->IsRequestor( $self->CreatorObj->PrincipalId ) );
+}
+
+# }}}
+
+# }}}
+
+sub _ClassAccessible {
+    {
+
+        id => { read => 1, type => 'int(11)', default => '' },
+          EffectiveTicket =>
+          { read => 1, write => 1, type => 'int(11)', default => '' },
+          Ticket =>
+          { read => 1, public => 1, type => 'int(11)', default => '' },
+          TimeTaken => { read => 1, type => 'int(11)',      default => '' },
+          Type      => { read => 1, type => 'varchar(20)',  default => '' },
+          Field     => { read => 1, type => 'varchar(40)',  default => '' },
+          OldValue  => { read => 1, type => 'varchar(255)', default => '' },
+          NewValue  => { read => 1, type => 'varchar(255)', default => '' },
+          Data      => { read => 1, type => 'varchar(100)', default => '' },
+          Creator => { read => 1, auto => 1, type => 'int(11)', default => '' },
+          Created =>
+          { read => 1, auto => 1, type => 'datetime', default => '' },
+
+    }
+};
+
+# }}}
+
+# }}}
+
+# {{{ sub _Set
+
+sub _Set {
+    my $self = shift;
+    return ( 0, $self->loc('Transactions are immutable') );
+}
+
+# }}}
+
+# {{{ sub _Value 
+
+=head2 _Value
+
+Takes the name of a table column.
+Returns its value as a string, if the user passes an ACL check
+
+=cut
+
+sub _Value {
+
+    my $self  = shift;
+    my $field = shift;
+
+    #if the field is public, return it.
+    if ( $self->_Accessible( $field, 'public' ) ) {
+        return ( $self->__Value($field) );
+
+    }
+
+    #If it's a comment, we need to be extra special careful
+    if ( $self->__Value('Type') eq 'Comment' ) {
+        unless ( $self->CurrentUserHasRight('ShowTicketComments') ) {
+            return (undef);
+        }
+    }
+
+    #if they ain't got rights to see, don't let em
+    else {
+        unless ( $self->CurrentUserHasRight('ShowTicket') ) {
+            return (undef);
+        }
+    }
+
+    return ( $self->__Value($field) );
+
+}
+
+# }}}
+
+# {{{ sub CurrentUserHasRight
+
+=head2 CurrentUserHasRight RIGHT
+
+Calls $self->CurrentUser->HasQueueRight for the right passed in here.
+passed in here.
+
+=cut
+
+sub CurrentUserHasRight {
+    my $self  = shift;
+    my $right = shift;
+    return (
+        $self->CurrentUser->HasRight(
+            Right     => "$right",
+            Object => $self->TicketObj
+          )
+    );
+}
+
+# }}}
+
+1;
diff --git a/rt/lib/RT/Transactions.pm b/rt/lib/RT/Transactions.pm
index 2ae98f286..23a475ac6 100755
--- a/rt/lib/RT/Transactions.pm
+++ b/rt/lib/RT/Transactions.pm
@@ -1,78 +1,115 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Transactions.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::Transactions - a collection of RT Transaction objects
+=head1 NAME
 
+  RT::Transactions -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::Transactions;
-
+  use RT::Transactions
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Transactions);
-
-=end testing
-
 =cut
 
 package RT::Transactions;
-use RT::EasySearch;
 
-@ISA= qw(RT::EasySearch);
+use RT::SearchBuilder;
 use RT::Transaction;
 
-# {{{ sub _Init  
-sub _Init   {
-  my $self = shift;
-  
-  $self->{'table'} = "Transactions";
-  $self->{'primary_key'} = "id";
-  
-  # By default, order by the date of the transaction, rather than ID.
-  $self->OrderBy( ALIAS => 'main',
-		  FIELD => 'Created',
-		  ORDER => 'ASC');
-
-  return ( $self->SUPER::_Init(@_));
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
+
+
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'Transactions';
+    $self->{'primary_key'} = 'id';
+
+
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
-# {{{ sub NewItem 
-sub NewItem  {
+
+=item NewItem
+
+Returns an empty new RT::Transaction item
+
+=cut
+
+sub NewItem {
     my $self = shift;
-    
     return(RT::Transaction->new($self->CurrentUser));
 }
-# }}}
+
+        eval "require RT::Transactions_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Transactions_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Transactions_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Transactions_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Transactions_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Transactions_Local.pm}) {
+            die $@;
+        };
 
 
-=head2 example methods
 
-  Queue RT::Queue or Queue Id
-  Ticket RT::Ticket or Ticket Id
 
+=head1 SEE ALSO
 
-LimitDate 
-  
-Type TRANSTYPE
-Field STRING
-OldValue OLDVAL
-NewValue NEWVAL
-Data DATA
-TimeTaken
-Actor USEROBJ/USERID
-ContentMatches STRING
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Transactions_Overlay, RT::Transactions_Vendor, RT::Transactions_Local
 
 =cut
 
 
 1;
-
diff --git a/rt/lib/RT/Transactions_Overlay.pm b/rt/lib/RT/Transactions_Overlay.pm
new file mode 100644
index 000000000..3a7d4c14f
--- /dev/null
+++ b/rt/lib/RT/Transactions_Overlay.pm
@@ -0,0 +1,86 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::Transactions - a collection of RT Transaction objects
+
+=head1 SYNOPSIS
+
+  use RT::Transactions;
+
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing
+
+ok (require RT::Transactions);
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+# {{{ sub _Init  
+sub _Init   {
+  my $self = shift;
+  
+  $self->{'table'} = "Transactions";
+  $self->{'primary_key'} = "id";
+  
+  # By default, order by the date of the transaction, rather than ID.
+  $self->OrderBy( ALIAS => 'main',
+		  FIELD => 'Created',
+		  ORDER => 'ASC');
+
+  return ( $self->SUPER::_Init(@_));
+}
+# }}}
+
+=head2 example methods
+
+  Queue RT::Queue or Queue Id
+  Ticket RT::Ticket or Ticket Id
+
+
+LimitDate 
+  
+Type TRANSTYPE
+Field STRING
+OldValue OLDVAL
+NewValue NEWVAL
+Data DATA
+TimeTaken
+Actor USEROBJ/USERID
+ContentMatches STRING
+
+=cut
+
+
+1;
+
diff --git a/rt/lib/RT/URI.pm b/rt/lib/RT/URI.pm
new file mode 100644
index 000000000..7acc1dc98
--- /dev/null
+++ b/rt/lib/RT/URI.pm
@@ -0,0 +1,244 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+package RT::URI;;
+
+use strict;
+use vars qw/@ISA/;
+@ISA = qw(RT::Base);
+
+use RT::URI::base;
+use Carp;
+
+=head1 NAME
+
+RT::URI
+
+=head1 DESCRIPTION
+
+This class provides a base class for URIs, such as those handled
+by RT::Link objects.  
+
+=head1 API
+
+
+
+=cut
+
+
+
+
+=head2 new
+
+Create a new RT::URI object.
+
+=cut
+
+                         
+sub new {
+    my $proto = shift;
+    my $class = ref($proto) || $proto;
+    my $self  = {};
+    bless( $self, $class );
+
+    $self->CurrentUser(@_);
+
+    return ($self);
+}
+
+
+
+# {{{ FromObject
+
+=head2 FromObject <Object>
+
+Given a local object, such as an RT::Ticket or an RT::FM::Article, this routine will return a URI for
+the local object
+
+=cut
+
+sub FromObject {
+    my $self = shift;
+    my $obj = shift;
+
+    return undef unless  $obj->can('URI');
+    return $self->FromURI($obj->URI);
+}
+
+# }}}
+
+# {{{ FromURI
+
+=head2 FromURI <URI>
+
+Returns a local object id for this content.  You are expected to know what sort of object this is the Id 
+of 
+
+=cut
+
+sub FromURI {
+    my $self = shift;
+    my $uri = shift;    
+
+    return undef unless ($uri);
+
+	my $scheme;
+	# Special case: integers passed in as URIs must be ticket ids
+	if ($uri =~ /^(\d+)$/) {
+		$scheme = "fsck.com-rt";
+	} elsif ($uri =~ /^((?:\w|\.|-)+?):/) {
+         $scheme = $1;
+    }
+    else {
+        $RT::Logger->warning("$self Could not determine a URI scheme for $uri");
+		return (undef);
+    }
+     
+    # load up a resolver object for this scheme  
+    $self->_GetResolver($scheme);
+    
+    unless ($self->Resolver->ParseURI($uri)) {
+        $RT::Logger->warning("Resolver ".ref($self->Resolver)." could not parse $uri");
+    	return (undef);
+    }
+
+}
+
+# }}}
+
+# {{{ _GetResolver
+
+=private _GetResolver <scheme>
+
+Gets an RT URI resolver for the scheme <scheme>. 
+Falls back to a null resolver. RT::URI::base.
+
+=cut
+
+sub _GetResolver {
+    my $self = shift;
+    my $scheme = shift;
+
+    $scheme =~ s/(\.|-)/_/g;
+    my $resolver;
+
+    
+       eval " 
+            require RT::URI::$scheme;
+            \$resolver = RT::URI::$scheme->new(\$self->CurrentUser);
+       ";
+     
+        if ($resolver) {
+        $self->{'resolver'} = $resolver;
+        } else {
+        $self->{'resolver'} = RT::URI::base->new($self->CurrentUser); 
+        }
+
+}
+
+# }}}
+
+# {{{ Scheme
+
+=head2 Scheme
+
+Returns a local object id for this content.  You are expected to know what sort of object this is the Id 
+of 
+
+=cut
+
+sub Scheme {
+    my $self = shift;
+    return ($self->Resolver->Scheme);
+
+}
+# }}}
+# {{{ URI
+
+=head2 URI
+
+Returns a local object id for this content.  You are expected to know what sort of object this is the Id 
+of 
+
+=cut
+
+sub URI {
+    my $self = shift;
+    return ($self->Resolver->URI);
+
+}
+# }}}
+
+# {{{ Object
+
+=head2 Object
+
+Returns a local object for this content. This will usually be an RT::Ticket or somesuch
+
+=cut
+
+
+sub Object {   
+    my $self = shift;
+    return($self->Resolver->Object);
+
+}
+
+
+# }}}
+
+# {{{ IsLocal
+
+=head2 IsLocal
+
+Returns a local object for this content. This will usually be an RT::Ticket or somesuch
+
+=cut
+
+sub IsLocal {
+    my $self = shift;
+    return $self->Resolver->IsLocal;     
+}
+
+
+# }}}
+
+
+=head Resolver
+
+Returns this URI's URI resolver object
+
+=cut
+
+
+sub Resolver {
+    my $self =shift;
+    return ($self->{'resolver'});
+}
+
+eval "require RT::URI_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/URI_Vendor.pm});
+eval "require RT::URI_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/URI_Local.pm});
+
+1;
diff --git a/rt/lib/RT/URI/base.pm b/rt/lib/RT/URI/base.pm
new file mode 100644
index 000000000..a599f3ad8
--- /dev/null
+++ b/rt/lib/RT/URI/base.pm
@@ -0,0 +1,129 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+package RT::URI::base;
+
+use strict;
+use base qw(RT::Base);
+
+=head1 NAME
+
+RT::URI::base
+
+=head1 DESCRIPTION
+
+A baseclass (and fallback) RT::URI handler. Every URI handler needs to 
+handle the API presented here
+
+=cut
+
+
+=head1 API
+
+=head2 new
+
+Create a new URI handler
+
+=cut
+
+sub new {
+    my $proto = shift;
+    my $class = ref($proto) || $proto;
+    my $self  = {};
+    bless( $self, $class );
+    $self->CurrentUser(@_);
+    return ($self);
+}
+
+sub ParseObject  {
+    my $self = shift;
+    my $obj = shift;
+    $self->{'uri'} = "unknown-object:".ref($obj);
+
+
+}
+
+
+
+sub ParseURI { 
+    my $self = shift;
+    my $uri = shift;
+
+    if ($uri =~  /^(.*?):/) { 
+        $self->{'scheme'} = $1;
+    }
+    $self->{'uri'} = $uri;
+   
+    
+}
+
+
+sub Object {
+    my $self = shift;
+    return undef;
+
+}
+
+sub URI {
+    my $self = shift;
+    return($self->{'uri'});
+}
+
+sub Scheme { 
+    my $self = shift;
+    return($self->{'scheme'});
+
+}
+
+sub HREF {
+    my $self = shift;
+    return($self->{'href'} || $self->{'uri'});
+}
+
+sub IsLocal {
+    my $self = shift;
+    return undef;
+}
+
+=head2 AsString
+
+Return a "pretty" string representing the URI object.
+
+This is meant to be used like this:
+
+ % $re = $uri->Resolver;
+ <A HREF="<% $re->HREF %>"><% $re->AsString %></A>
+
+=cut
+
+sub AsString {
+    my $self = shift;
+    return $self->URI;
+}
+
+eval "require RT::URI::base_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/URI/base_Vendor.pm});
+eval "require RT::URI::base_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/URI/base_Local.pm});
+
+1;
diff --git a/rt/lib/RT/URI/fsck_com_rt.pm b/rt/lib/RT/URI/fsck_com_rt.pm
new file mode 100644
index 000000000..36e8f82fd
--- /dev/null
+++ b/rt/lib/RT/URI/fsck_com_rt.pm
@@ -0,0 +1,247 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+package RT::URI::fsck_com_rt;
+
+use RT::Ticket;
+
+use RT::URI::base;
+
+use strict;
+use vars qw(@ISA);
+@ISA = qw/RT::URI::base/;
+
+
+
+
+=head2 LocalURIPrefix 
+
+Returns the prefix for a local ticket URI
+
+=begin testing
+
+use_ok("RT::URI::fsck_com_rt");
+my $uri = RT::URI::fsck_com_rt->new($RT::SystemUser);
+
+ok(ref($uri));
+
+use Data::Dumper;
+
+
+ok (UNIVERSAL::isa($uri,RT::URI::fsck_com_rt), "It's an RT::URI::fsck_com_rt");
+
+ok ($uri->isa('RT::URI::base'), "It's an RT::URI::base");
+ok ($uri->isa('RT::Base'), "It's an RT::Base");
+
+is ($uri->LocalURIPrefix , 'fsck.com-rt://example.com/ticket/');
+
+=end testing
+
+
+
+=cut
+
+sub LocalURIPrefix {
+    my $self = shift;
+    my $prefix = $self->Scheme. "://$RT::Organization/ticket/";
+    return ($prefix);
+}
+
+
+
+
+
+=head2 URIForObject RT::Ticket
+
+Returns the RT URI for a local RT::Ticket object
+
+=begin testing
+
+my $ticket = RT::Ticket->new($RT::SystemUser);
+$ticket->Load(1);
+my $uri = RT::URI::fsck_com_rt->new($ticket->CurrentUser);
+is($uri->LocalURIPrefix . "1" , $uri->URIForObject($ticket));
+
+=end testing
+
+=cut
+
+sub URIForObject {
+
+    my $self = shift;
+
+    my $obj = shift;
+    return ($self->LocalURIPrefix. $obj->Id);
+}
+
+
+=head2 ParseObject $TicketObj
+
+When handed an RT::Ticekt object, figure out its URI
+
+
+=cut
+
+
+
+=head2 ParseURI URI
+
+When handed an fsck.com-rt: URI, figures out things like whether its a local ticket
+and what its ID is
+
+=cut
+
+
+sub ParseURI { 
+    my $self = shift;
+    my $uri = shift;
+
+	my $ticket;
+ 
+ 	if ($uri =~ /^(\d+)$/) {
+ 		$ticket = RT::Ticket->new($self->CurrentUser);
+ 		$ticket->Load($uri);	
+ 		$self->{'uri'} = $ticket->URI;
+ 	}
+ 	else {
+	    $self->{'uri'} = $uri;
+ 	}
+ 
+ 
+ 
+       #If it's a local URI, load the ticket object and return its URI
+    if ( $self->IsLocal) {
+   
+        my $local_uri_prefix = $self->LocalURIPrefix;
+    	if ($self->{'uri'} =~ /^$local_uri_prefix(\d+)$/) {
+    		my $id = $1;
+    	
+    
+	        $ticket = RT::Ticket->new( $self->CurrentUser );
+    	    $ticket->Load($id);
+
+    	    #If we couldn't find a ticket, return undef.
+    	    unless ( defined $ticket->Id ) {
+    	    	return undef;
+    	    }
+    	    } else {
+    	    return undef;
+    	    }	
+    }
+ 
+ 	$self->{'object'} = $ticket;
+    if ( UNIVERSAL::can( $ticket, 'Id' ) ) {
+        return ( $ticket->Id );
+    }
+    else {
+        return undef;
+    }
+}
+
+=head2 IsLocal 
+
+Returns true if this URI is for a local ticket.
+Returns undef otherwise.
+
+
+
+=cut
+
+sub IsLocal {
+	my $self = shift;
+        my $local_uri_prefix = $self->LocalURIPrefix;
+	if ($self->{'uri'} =~ /^$local_uri_prefix/) {
+		return 1;
+    }
+	else {
+		return undef;
+	}
+}
+
+
+
+=head2 Object
+
+Returns the object for this URI, if it's local. Otherwise returns undef.
+
+=cut
+
+sub Object {
+    my $self = shift;
+    return ($self->{'object'});
+
+}
+
+=head2 Scheme
+
+Return the URI scheme for RT tickets
+
+=cut
+
+
+sub Scheme {
+    my $self = shift;
+	return "fsck.com-rt";
+}
+
+=head2 HREF
+
+If this is a local ticket, return an HTTP url to it.
+Otherwise, return its URI
+
+=cut
+
+
+sub HREF {
+    my $self = shift;
+    if ($self->IsLocal) {
+        return ( $RT::WebURL . "Ticket/Display.html?id=".$self->Object->Id);
+    }   
+    else {
+        return ($self->URI);
+    }
+}
+
+=head2 AsString
+
+Returns either a localized string 'ticket #23' or the full URI if the object is not local
+
+=cut
+
+sub AsString {
+    my $self = shift;
+    if ($self->IsLocal) {
+	return $self->loc("ticket #[_1]", $self->Object->Id);
+
+    }
+    else {
+	return $self->Object->URI;
+    }
+}
+
+eval "require RT::URI::fsck_com_rt_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/URI/fsck_com_rt_Vendor.pm});
+eval "require RT::URI::fsck_com_rt_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/URI/fsck_com_rt_Local.pm});
+
+1;
diff --git a/rt/lib/RT/User.pm b/rt/lib/RT/User.pm
index 4e8554030..cbc10f5b4 100755
--- a/rt/lib/RT/User.pm
+++ b/rt/lib/RT/User.pm
@@ -1,1222 +1,854 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/User.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-2000 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::User - RT User object
+RT::User
 
-=head1 SYNOPSIS
 
-  use RT::User;
+=head1 SYNOPSIS
 
 =head1 DESCRIPTION
 
-
 =head1 METHODS
 
-=begin testing
+=cut
+
+package RT::User;
+use RT::Record; 
+
+
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
+
+sub _Init {
+  my $self = shift; 
+
+  $self->Table('Users');
+  $self->SUPER::_Init(@_);
+}
 
-ok(require RT::TestHarness);
-ok(require RT::User);
 
-=end testing
 
 
+
+=item Create PARAMHASH
+
+Create takes a hash of values and creates a row in the database:
+
+  varchar(200) 'Name'.
+  varchar(40) 'Password'.
+  blob 'Comments'.
+  blob 'Signature'.
+  varchar(120) 'EmailAddress'.
+  blob 'FreeformContactInfo'.
+  varchar(200) 'Organization'.
+  varchar(120) 'RealName'.
+  varchar(16) 'NickName'.
+  varchar(16) 'Lang'.
+  varchar(16) 'EmailEncoding'.
+  varchar(16) 'WebEncoding'.
+  varchar(100) 'ExternalContactInfoId'.
+  varchar(30) 'ContactInfoSystem'.
+  varchar(100) 'ExternalAuthId'.
+  varchar(30) 'AuthSystem'.
+  varchar(16) 'Gecos'.
+  varchar(30) 'HomePhone'.
+  varchar(30) 'WorkPhone'.
+  varchar(30) 'MobilePhone'.
+  varchar(30) 'PagerPhone'.
+  varchar(200) 'Address1'.
+  varchar(200) 'Address2'.
+  varchar(100) 'City'.
+  varchar(100) 'State'.
+  varchar(16) 'Zip'.
+  varchar(50) 'Country'.
+  varchar(50) 'Timezone'.
+  text 'PGPKey'.
+
 =cut
 
 
-package RT::User;
-use RT::Record;
-@ISA= qw(RT::Record);
 
-# {{{ sub _Init
-sub _Init  {
+
+sub Create {
     my $self = shift;
-    $self->{'table'} = "Users";
-    return($self->SUPER::_Init(@_));
-}
-# }}}
-
-# {{{ sub _Accessible 
-
-sub _Accessible  {
-  my $self = shift;
-  my %Cols = (
-	      # {{{ Core RT info
-	      Name => 'public/read/write/admin',
-	      Password => 'write',
-	      Comments => 'read/write/admin',
-	      Signature => 'read/write',
-	      EmailAddress => 'public/read/write',
-	      PagerEmailAddress => 'read/write',
-	      FreeformContactInfo => 'read/write',
-	      Organization => 'public/read/write/admin',
-	      Disabled => 'public/read/write/admin', #To modify this attribute, we have helper
-	      #methods
-	      Privileged => 'read/write/admin', # 0=no 1=user 2=system
-
-	      # }}}
-	      
-	      # {{{ Names
-	      
-	      RealName => 'public/read/write',
-	      NickName => 'public/read/write',
-	      # }}}
-	      	      
-	      # {{{ Localization and Internationalization
-	      Lang => 'public/read/write',
-	      EmailEncoding => 'public/read/write',
-	      WebEncoding => 'public/read/write',
-	      # }}}
-	      
-	      # {{{ External ContactInfo Linkage
-	      ExternalContactInfoId => 'public/read/write/admin',
-	      ContactInfoSystem => 'public/read/write/admin',
-	      # }}}
-	      
-	      # {{{ User Authentication identifier
-	      ExternalAuthId => 'public/read/write/admin',
-	      #Authentication system used for user 
-	      AuthSystem => 'public/read/write/admin',
-	      Gecos => 'public/read/write/admin', #Gecos is the name of the fields in a 
-	      # unix passwd file. In this case, it refers to "Unix Username"
-	      # }}}
-	      
-	      # {{{ Telephone numbers
-	      HomePhone =>  'read/write',
-	      WorkPhone => 'read/write',
-	      MobilePhone => 'read/write',
-	      PagerPhone => 'read/write',
-
-	      # }}}
-	      
-	      # {{{ Paper Address
-	      Address1 => 'read/write',
-	      Address2 => 'read/write',
-	      City => 'read/write',
-	      State => 'read/write',
-	      Zip => 'read/write',
-	      Country => 'read/write',
-	      # }}}
-	      
-	      # {{{ Core DBIx::Record Attributes
-	      Creator => 'read/auto',
-	      Created => 'read/auto',
-	      LastUpdatedBy => 'read/auto',
-	      LastUpdated => 'read/auto'
-
-	      # }}}
-	     );
-  return($self->SUPER::_Accessible(@_, %Cols));
+    my %args = ( 
+                Name => '',
+                Password => '',
+                Comments => '',
+                Signature => '',
+                EmailAddress => '',
+                FreeformContactInfo => '',
+                Organization => '',
+                RealName => '',
+                NickName => '',
+                Lang => '',
+                EmailEncoding => '',
+                WebEncoding => '',
+                ExternalContactInfoId => '',
+                ContactInfoSystem => '',
+                ExternalAuthId => '',
+                AuthSystem => '',
+                Gecos => '',
+                HomePhone => '',
+                WorkPhone => '',
+                MobilePhone => '',
+                PagerPhone => '',
+                Address1 => '',
+                Address2 => '',
+                City => '',
+                State => '',
+                Zip => '',
+                Country => '',
+                Timezone => '',
+                PGPKey => '',
+
+		  @_);
+    $self->SUPER::Create(
+                         Name => $args{'Name'},
+                         Password => $args{'Password'},
+                         Comments => $args{'Comments'},
+                         Signature => $args{'Signature'},
+                         EmailAddress => $args{'EmailAddress'},
+                         FreeformContactInfo => $args{'FreeformContactInfo'},
+                         Organization => $args{'Organization'},
+                         RealName => $args{'RealName'},
+                         NickName => $args{'NickName'},
+                         Lang => $args{'Lang'},
+                         EmailEncoding => $args{'EmailEncoding'},
+                         WebEncoding => $args{'WebEncoding'},
+                         ExternalContactInfoId => $args{'ExternalContactInfoId'},
+                         ContactInfoSystem => $args{'ContactInfoSystem'},
+                         ExternalAuthId => $args{'ExternalAuthId'},
+                         AuthSystem => $args{'AuthSystem'},
+                         Gecos => $args{'Gecos'},
+                         HomePhone => $args{'HomePhone'},
+                         WorkPhone => $args{'WorkPhone'},
+                         MobilePhone => $args{'MobilePhone'},
+                         PagerPhone => $args{'PagerPhone'},
+                         Address1 => $args{'Address1'},
+                         Address2 => $args{'Address2'},
+                         City => $args{'City'},
+                         State => $args{'State'},
+                         Zip => $args{'Zip'},
+                         Country => $args{'Country'},
+                         Timezone => $args{'Timezone'},
+                         PGPKey => $args{'PGPKey'},
+);
+
 }
 
-# }}}
 
-# {{{ sub Create 
 
-sub Create  {
-    my $self = shift;
-    my %args = (Privileged => 0,
-		@_ # get the real argumentlist
-	       );
-    
-    #Check the ACL
-    unless ($self->CurrentUserHasRight('AdminUsers')) {
-	return (0, 'No permission to create users');
-    }
-    
-    if (! $args{'Password'})  {
-	$args{'Password'} = '*NO-PASSWORD*';
-    }
-    elsif (length($args{'Password'}) < $RT::MinimumPasswordLength) {
-        return(0,"Password too short");
-    }
-    else {
-        my $salt = join '', ('.','/',0..9,'A'..'Z','a'..'z')[rand 64, rand 64];
-        $args{'Password'} = crypt($args{'Password'}, $salt);     
-    }   
-        
-    
-    #TODO Specify some sensible defaults.
-    
-    unless (defined ($args{'Name'})) {
-	return(0, "Must specify 'Name' attribute");
-    }	
-    
-    
-    #SANITY CHECK THE NAME AND ABORT IF IT'S TAKEN
-    if ($RT::SystemUser) { #This only works if RT::SystemUser has been defined
-		my $TempUser = RT::User->new($RT::SystemUser);
-		$TempUser->Load($args{'Name'});
-		return (0, 'Name in use') if ($TempUser->Id);
-	
-		return(0, 'Email address in use') 
-			unless ($self->ValidateEmailAddress($args{'EmailAddress'}));
-    }
-    else {
-		$RT::Logger->warning("$self couldn't check for pre-existing ".
-			     " users on create. This will happen".
-			     " on installation\n");
-    }
-    
-    my $id = $self->SUPER::Create(%args);
-    
-    #If the create failed.
-    unless ($id) {
-		return (0, 'Could not create user');
-    }
-      
-    
-    #TODO post 2.0
-    #if ($args{'SendWelcomeMessage'}) {
-    #	#TODO: Check if the email exists and looks valid
-    #	#TODO: Send the user a "welcome message" 
-    #}
-    
-    return ($id, 'User created');
-}
+=item id
 
-# }}}
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
 
-# {{{ sub _BootstrapCreate 
 
-#create a user without validating _any_ data.
+=cut
 
-#To be used only on database init.
 
-sub _BootstrapCreate {
-    my $self = shift;
-    my %args = (@_);
+=item Name
 
-    $args{'Password'} = "*NO-PASSWORD*";
-    my $id = $self->SUPER::Create(%args);
-    
-    #If the create failed.
-    return (0, 'Could not create user') 
-      unless ($id);
+Returns the current value of Name. 
+(In the database, Name is stored as varchar(200).)
 
-    return ($id, 'User created');
-}
 
-# }}}
 
-# {{{ sub Delete 
+=item SetName VALUE
 
-sub Delete  {
-    my $self = shift;
-    
-    return(0, 'Deleting this object would violate referential integrity');
-    
-}
 
-# }}}
+Set Name to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Name will be stored as a varchar(200).)
+
+
+=cut
+
+
+=item Password
+
+Returns the current value of Password. 
+(In the database, Password is stored as varchar(40).)
 
-# {{{ sub Load 
 
-=head2 Load
 
-Load a user object from the database. Takes a single argument.
-If the argument is numerical, load by the column 'id'. Otherwise, load by
-the "Name" column which is the user's textual username.
+=item SetPassword VALUE
+
+
+Set Password to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Password will be stored as a varchar(40).)
+
 
 =cut
 
-sub Load  {
-    my $self = shift;
-    my $identifier = shift || return undef;
-    
-    #if it's an int, load by id. otherwise, load by name.
-    if ($identifier !~ /\D/) {
-	$self->SUPER::LoadById($identifier);
-    }
-    else {
-	$self->LoadByCol("Name",$identifier);
-    }
-}
 
-# }}}
+=item Comments
+
+Returns the current value of Comments. 
+(In the database, Comments is stored as blob.)
 
 
-# {{{ sub LoadByEmail
 
-=head2 LoadByEmail
+=item SetComments VALUE
 
-Tries to load this user object from the database by the user's email address.
+
+Set Comments to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Comments will be stored as a blob.)
 
 
 =cut
 
-sub LoadByEmail {
-    my $self=shift;
-    my $address = shift;
 
-    # Never load an empty address as an email address.
-    unless ($address) {
-	return(undef);
-    }
+=item Signature
 
-    $address = RT::CanonicalizeAddress($address);
-    #$RT::Logger->debug("Trying to load an email address: $address\n");
-    return $self->LoadByCol("EmailAddress", $address);
-}
-# }}}
+Returns the current value of Signature. 
+(In the database, Signature is stored as blob.)
 
 
-# {{{ sub ValidateEmailAddress
 
-=head2 ValidateEmailAddress ADDRESS
+=item SetSignature VALUE
+
+
+Set Signature to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Signature will be stored as a blob.)
 
-Returns true if the email address entered is not in use by another user or is 
-undef or ''. Returns false if it's in use. 
 
 =cut
 
-sub ValidateEmailAddress {
-	my $self = shift;
-	my $Value = shift;
 
- 	# if the email address is null, it's always valid
- 	return (1) if(!$Value || $Value eq "");
+=item EmailAddress
 
- 	my $TempUser = RT::User->new($RT::SystemUser);
- 	$TempUser->LoadByEmail($Value);
+Returns the current value of EmailAddress. 
+(In the database, EmailAddress is stored as varchar(120).)
 
- 	if( $TempUser->id && 
-	   ($TempUser->id != $self->id)) { # if we found a user with that address 
-					# it's invalid to set this user's address to it
- 		return(undef);
- 	}
- 	else { #it's a valid email address
- 		return(1);
- 	}
-}
 
-# }}}
 
+=item SetEmailAddress VALUE
+
+
+Set EmailAddress to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, EmailAddress will be stored as a varchar(120).)
+
+
+=cut
+
+
+=item FreeformContactInfo
+
+Returns the current value of FreeformContactInfo. 
+(In the database, FreeformContactInfo is stored as blob.)
 
 
 
-# {{{ sub SetRandomPassword
+=item SetFreeformContactInfo VALUE
 
-=head2 SetRandomPassword
 
-Takes no arguments. Returns a status code and a new password or an error message.
-If the status is 1, the second value returned is the new password.
-If the status is anything else, the new value returned is the error code.
+Set FreeformContactInfo to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, FreeformContactInfo will be stored as a blob.)
+
 
 =cut
 
-sub SetRandomPassword  {
-    my $self = shift;
 
+=item Organization
 
-    unless ($self->CurrentUserCanModify('Password')) {
-	return (0, "Permission Denied");
-    }
-    
-    my $pass = $self->GenerateRandomPassword(6,8);
+Returns the current value of Organization. 
+(In the database, Organization is stored as varchar(200).)
 
-    # If we have "notify user on 
 
-    my ($val, $msg) = $self->SetPassword($pass);
-    
-    #If we got an error return the error.
-    return (0, $msg) unless ($val);
-    
-    #Otherwise, we changed the password, lets return it.
-    return (1, $pass);
-    
-}
 
-# }}}
+=item SetOrganization VALUE
+
+
+Set Organization to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Organization will be stored as a varchar(200).)
+
+
+=cut
+
+
+=item RealName
+
+Returns the current value of RealName. 
+(In the database, RealName is stored as varchar(120).)
 
 
-# {{{ sub ResetPassword
 
-=head2 ResetPassword
+=item SetRealName VALUE
+
+
+Set RealName to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, RealName will be stored as a varchar(120).)
 
-Returns status, [ERROR or new password].  Resets this user\'s password to
-a randomly generated pronouncable password and emails them, using a 
-global template called "RT_PasswordChange", which can be overridden
-with global templates "RT_PasswordChange_Privileged" or "RT_PasswordChange_NonPrivileged" 
-for privileged and Non-privileged users respectively.
 
 =cut
 
-sub ResetPassword {
-    my $self = shift;
-    
-    unless ($self->CurrentUserCanModify('Password')) {
-	return (0, "Permission Denied");
-    }
-    my ($status, $pass) = $self->SetRandomPassword();
-
-    unless ($status) {
-	return (0, "$pass");
-    }
-    
-    my $template = RT::Template->new($self->CurrentUser);
-
-
-    if ($self->IsPrivileged) {
-	$template->LoadGlobalTemplate('RT_PasswordChange_Privileged');
-    } 
-    else {
-	$template->LoadGlobalTemplate('RT_PasswordChange_Privileged');
-    }	
-    
-    unless ($template->Id) {
-	$template->LoadGlobalTemplate('RT_PasswordChange');
-    }	
-    
-    unless ($template->Id) {
-	$RT::Logger->crit("$self tried to send ".$self->Name." a password reminder ".
-			  "but couldn't find a password change template");
-    }	
-
-    my $notification =  RT::Action::SendPasswordEmail->new(TemplateObj => $template,
-							   Argument => $pass);
-    
-    $notification->SetTo($self->EmailAddress);
-
-    my ($ret);
-    $ret = $notification->Prepare();
-    if ($ret) {
-	$ret = $notification->Commit();
-    }
-    
-    if ($ret) {
-	return(1, 'New password notification sent');
-    }	else {
-	return (0, 'Notification could not be sent');
-    }	
-    
-}
 
+=item NickName
 
-# }}}
+Returns the current value of NickName. 
+(In the database, NickName is stored as varchar(16).)
 
-# {{{ sub GenerateRandomPassword
 
-=head2 GenerateRandomPassword MIN_LEN and MAX_LEN
 
-Returns a random password between MIN_LEN and MAX_LEN characters long.
+=item SetNickName VALUE
+
+
+Set NickName to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, NickName will be stored as a varchar(16).)
+
 
 =cut
 
-sub GenerateRandomPassword {
-    my $self = shift;
-    my $min_length = shift;
-    my $max_length = shift;
-    
-    #This code derived from mpw.pl, a bit of code with a sordid history
-    # Its notes: 
-    
-    # Perl cleaned up a bit by Jesse Vincent 1/14/2001.
-    # Converted to perl from C by Marc Horowitz, 1/20/2000.
-    # Converted to C from Multics PL/I by Bill Sommerfeld, 4/21/86.
-    # Original PL/I version provided by Jerry Saltzer.
-
-    
-    my ($frequency, $start_freq, $total_sum, $row_sums);
-
-    #When munging characters, we need to know where to start counting letters from
-    my $a = ord('a');
-
-    # frequency of English digraphs (from D Edwards 1/27/66) 
-    $frequency =
-      [ [ 4, 20, 28, 52, 2, 11, 28, 4, 32, 4, 6, 62, 23,
-	  167, 2, 14, 0, 83, 76, 127, 7, 25, 8, 1, 9, 1 ], # aa - az
-	[ 13, 0, 0, 0, 55, 0, 0, 0, 8, 2, 0, 22, 0,
-	  0, 11, 0, 0, 15, 4, 2, 13, 0, 0, 0, 15, 0 ], # ba - bz
-	[ 32, 0, 7, 1, 69, 0, 0, 33, 17, 0, 10, 9, 1,
-	  0, 50, 3, 0, 10, 0, 28, 11, 0, 0, 0, 3, 0 ], # ca - cz
-	[ 40, 16, 9, 5, 65, 18, 3, 9, 56, 0, 1, 4, 15,
-	  6, 16, 4, 0, 21, 18, 53, 19, 5, 15, 0, 3, 0 ], # da - dz
-	[ 84, 20, 55, 125, 51, 40, 19, 16, 50, 1, 4, 55, 54,
-	  146, 35, 37, 6, 191, 149, 65, 9, 26, 21, 12, 5, 0 ], # ea - ez
-	[ 19, 3, 5, 1, 19, 21, 1, 3, 30, 2, 0, 11, 1,
-	  0, 51, 0, 0, 26, 8, 47, 6, 3, 3, 0, 2, 0 ], # fa - fz
-	[ 20, 4, 3, 2, 35, 1, 3, 15, 18, 0, 0, 5, 1,
-	  4, 21, 1, 1, 20, 9, 21, 9, 0, 5, 0, 1, 0 ], # ga - gz
-	[ 101, 1, 3, 0, 270, 5, 1, 6, 57, 0, 0, 0, 3,
-	  2, 44, 1, 0, 3, 10, 18, 6, 0, 5, 0, 3, 0 ], # ha - hz
-	[ 40, 7, 51, 23, 25, 9, 11, 3, 0, 0, 2, 38, 25,
-	  202, 56, 12, 1, 46, 79, 117, 1, 22, 0, 4, 0, 3 ], # ia - iz
-	[ 3, 0, 0, 0, 5, 0, 0, 0, 1, 0, 0, 0, 0,
-	  0, 4, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0 ], # ja - jz
-	[ 1, 0, 0, 0, 11, 0, 0, 0, 13, 0, 0, 0, 0,
-	  2, 0, 0, 0, 0, 6, 2, 1, 0, 2, 0, 1, 0 ], # ka - kz
-	[ 44, 2, 5, 12, 62, 7, 5, 2, 42, 1, 1, 53, 2,
-	  2, 25, 1, 1, 2, 16, 23, 9, 0, 1, 0, 33, 0 ], # la - lz
-	[ 52, 14, 1, 0, 64, 0, 0, 3, 37, 0, 0, 0, 7,
-	  1, 17, 18, 1, 2, 12, 3, 8, 0, 1, 0, 2, 0 ], # ma - mz
-	[ 42, 10, 47, 122, 63, 19, 106, 12, 30, 1, 6, 6, 9,
-	  7, 54, 7, 1, 7, 44, 124, 6, 1, 15, 0, 12, 0 ], # na - nz
-	[ 7, 12, 14, 17, 5, 95, 3, 5, 14, 0, 0, 19, 41,
-	  134, 13, 23, 0, 91, 23, 42, 55, 16, 28, 0, 4, 1 ], # oa - oz
-	[ 19, 1, 0, 0, 37, 0, 0, 4, 8, 0, 0, 15, 1,
-	  0, 27, 9, 0, 33, 14, 7, 6, 0, 0, 0, 0, 0 ], # pa - pz
-	[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	  0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0 ], # qa - qz
-	[ 83, 8, 16, 23, 169, 4, 8, 8, 77, 1, 10, 5, 26,
-	  16, 60, 4, 0, 24, 37, 55, 6, 11, 4, 0, 28, 0 ], # ra - rz
-	[ 65, 9, 17, 9, 73, 13, 1, 47, 75, 3, 0, 7, 11,
-	  12, 56, 17, 6, 9, 48, 116, 35, 1, 28, 0, 4, 0 ], # sa - sz
-	[ 57, 22, 3, 1, 76, 5, 2, 330, 126, 1, 0, 14, 10,
-	  6, 79, 7, 0, 49, 50, 56, 21, 2, 27, 0, 24, 0 ], # ta - tz
-	[ 11, 5, 9, 6, 9, 1, 6, 0, 9, 0, 1, 19, 5,
-	  31, 1, 15, 0, 47, 39, 31, 0, 3, 0, 0, 0, 0 ],	# ua - uz
-	[ 7, 0, 0, 0, 72, 0, 0, 0, 28, 0, 0, 0, 0,
-	  0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0 ], # va - vz
-	[ 36, 1, 1, 0, 38, 0, 0, 33, 36, 0, 0, 4, 1,
-	  8, 15, 0, 0, 0, 4, 2, 0, 0, 1, 0, 0, 0 ], # wa - wz
-	[ 1, 0, 2, 0, 0, 1, 0, 0, 3, 0, 0, 0, 0,
-	  0, 1, 5, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0 ], # xa - xz
-	[ 14, 5, 4, 2, 7, 12, 12, 6, 10, 0, 0, 3, 7,
-	  5, 17, 3, 0, 4, 16, 30, 0, 0, 5, 0, 0, 0 ], # ya - yz
-	[ 1, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0,
-	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] ]; # za - zz
-
-    #We need to know the totals for each row 
-    $row_sums =
-      [ map { my $sum = 0; map { $sum += $_ } @$_; $sum } @$frequency ];
-    
-
-    #Frequency with which a given letter starts a word.
-    $start_freq =
-      [ 1299, 425, 725, 271, 375, 470, 93, 223, 1009, 24, 20, 355, 379,
-	319, 823, 618, 21, 317, 962, 1991, 271, 104, 516, 6, 16, 14 ];
-    
-    $total_sum = 0; map { $total_sum += $_ } @$start_freq;
-    
-    
-    my $length = $min_length + int(rand($max_length-$min_length));
-    
-    my $char = $self->GenerateRandomNextChar($total_sum, $start_freq);
-    my @word = ($char+$a);
-    for (2..$length) {
-	$char = $self->_GenerateRandomNextChar($row_sums->[$char], $frequency->[$char]);
-	push(@word, $char+$a);
-    }
-    
-    #Return the password
-    return pack("C*",@word);
-    
-}
 
+=item Lang
+
+Returns the current value of Lang. 
+(In the database, Lang is stored as varchar(16).)
 
-#A private helper function for RandomPassword
-# Takes a row summary and a frequency chart for the next character to be searched
-sub _GenerateRandomNextChar {
-    my $self = shift;
-    my($all, $freq) = @_;
-    my($pos, $i);
-    
-    for ($pos = int(rand($all)), $i=0;
-	 $pos >= $freq->[$i];
-	 $pos -= $freq->[$i], $i++) {};
-    
-    return($i);
-}
 
-# }}}
 
-# {{{ sub SetPassword
+=item SetLang VALUE
 
-=head2 SetPassword
 
-Takes a string. Checks the string's length and sets this user's password 
-to that string.
+Set Lang to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Lang will be stored as a varchar(16).)
+
 
 =cut
 
-sub SetPassword {
-    my $self = shift;
-    my $password = shift;
-    
-    unless ($self->CurrentUserCanModify('Password')) {
-	return(0, 'Permission Denied');
-    }
-    
-    if (! $password)  {
-        return(0, "No password set");
-    }
-    elsif (length($password) < $RT::MinimumPasswordLength) {
-        return(0,"Password too short");
-    }
-    else {
-        my $salt = join '', ('.','/',0..9,'A'..'Z','a'..'z')[rand 64, rand 64];
-        return ( $self->SUPER::SetPassword(crypt($password, $salt)) );
-    }   
-    
-}
 
-# }}}
+=item EmailEncoding
+
+Returns the current value of EmailEncoding. 
+(In the database, EmailEncoding is stored as varchar(16).)
 
-# {{{ sub IsPassword 
 
-=head2 IsPassword
 
-Returns true if the passed in value is this user's password.
-Returns undef otherwise.
+=item SetEmailEncoding VALUE
+
+
+Set EmailEncoding to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, EmailEncoding will be stored as a varchar(16).)
+
 
 =cut
 
-sub IsPassword { 
-    my $self = shift;
-    my $value = shift;
-
-    #TODO there isn't any apparent way to legitimately ACL this
-
-    # RT does not allow null passwords 
-    if ((!defined ($value)) or ($value eq '')) {
-	return(undef);
-    } 
-    if ($self->Disabled) {
-  	$RT::Logger->info("Disabled user ".$self->Name." tried to log in");
-	return(undef);
-    }
-
-    if ( ($self->__Value('Password') eq '') || 
-         ($self->__Value('Password') eq undef) )  {
-        return(undef);
-     }
-    if ($self->__Value('Password') eq crypt($value, $self->__Value('Password'))) {
-	return (1);
-    }
-    else {
-	return (undef);
-    }
-}
 
-# }}}
+=item WebEncoding
+
+Returns the current value of WebEncoding. 
+(In the database, WebEncoding is stored as varchar(16).)
 
-# {{{ sub SetDisabled
 
-=head2 Sub SetDisabled
 
-Toggles the user's disabled flag.
-If this flag is
-set, all password checks for this user will fail. All ACL checks for this
-user will fail. The user will appear in no user listings.
+=item SetWebEncoding VALUE
 
-=cut 
 
-# }}}
+Set WebEncoding to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, WebEncoding will be stored as a varchar(16).)
 
-# {{{ ACL Related routines
 
-# {{{ GrantQueueRight
+=cut
+
 
-=head2 GrantQueueRight
+=item ExternalContactInfoId
+
+Returns the current value of ExternalContactInfoId. 
+(In the database, ExternalContactInfoId is stored as varchar(100).)
+
+
+
+=item SetExternalContactInfoId VALUE
+
+
+Set ExternalContactInfoId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ExternalContactInfoId will be stored as a varchar(100).)
 
-Grant a queue right to this user.  Takes a paramhash of which the elements
-RightAppliesTo and RightName are important.
 
 =cut
 
-sub GrantQueueRight {
-    
-    my $self = shift;
-    my %args = ( RightScope => 'Queue',
-		 RightName => undef,
-		 RightAppliesTo => undef,
-		 PrincipalType => 'User',
-		 PrincipalId => $self->Id,
-		 @_);
-   
-    #ACL check handled in ACE.pm
-
-    require RT::ACE;
-
-#    $RT::Logger->debug("$self ->GrantQueueRight right:". $args{'RightName'} .
-#		       " applies to queue ".$args{'RightAppliesTo'}."\n");
-    
-    my $ace = new RT::ACE($self->CurrentUser);
-    
-    return ($ace->Create(%args));
-}
 
-# }}}
+=item ContactInfoSystem
+
+Returns the current value of ContactInfoSystem. 
+(In the database, ContactInfoSystem is stored as varchar(30).)
+
+
 
-# {{{ GrantSystemRight
+=item SetContactInfoSystem VALUE
 
-=head2 GrantSystemRight
 
-Grant a system right to this user. 
-The only element that's important to set is RightName.
+Set ContactInfoSystem to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ContactInfoSystem will be stored as a varchar(30).)
+
 
 =cut
-sub GrantSystemRight {
-    
-    my $self = shift;
-    my %args = ( RightScope => 'System',
-		 RightName => undef,
-		 RightAppliesTo => 0,
-		 PrincipalType => 'User',
-		 PrincipalId => $self->Id,
-		 @_);
-   
-
-    #ACL check handled in ACE.pm
-
-    require RT::ACE;    
-    my $ace = new RT::ACE($self->CurrentUser);
-    
-    return ($ace->Create(%args));
-}
 
 
-# }}}
+=item ExternalAuthId
+
+Returns the current value of ExternalAuthId. 
+(In the database, ExternalAuthId is stored as varchar(100).)
 
-# {{{ sub HasQueueRight
 
-=head2 HasQueueRight
 
-Takes a paramhash which can contain
-these items:
-    TicketObj => RT::Ticket or QueueObj => RT::Queue or Queue => integer
-    IsRequestor => undef, (for bootstrapping create)
-    Right => 'Right' 
+=item SetExternalAuthId VALUE
 
 
-Returns 1 if this user has the right specified in the paramhash. for the queue
-passed in.
+Set ExternalAuthId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ExternalAuthId will be stored as a varchar(100).)
 
-Returns undef if they don't
 
 =cut
 
-sub HasQueueRight {
-    my $self = shift;
-    my %args = ( TicketObj => undef,
-                 QueueObj => undef,
-		 Queue => undef,
-		 IsRequestor => undef,
-		 Right => undef,
-		 @_);
-    
-    my ($IsRequestor, $IsCc, $IsAdminCc, $IsOwner);
-    
-    if (defined $args{'Queue'}) {
-	$args{'QueueObj'} = new RT::Queue($self->CurrentUser);
-	$args{'QueueObj'}->Load($args{'Queue'});
-    }
-    
-    if (defined $args{'TicketObj'}) {
-	$args{'QueueObj'} = $args{'TicketObj'}->QueueObj();
-    }
-
-    # {{{ Validate and load up the QueueId
-    unless ((defined $args{'QueueObj'}) and ($args{'QueueObj'}->Id)) {
-	require Carp;
-	$RT::Logger->debug(Carp::cluck ("$self->HasQueueRight Couldn't find a queue id"));
-	return undef;
-    }
-
-    # }}}
-
-        
-    # Figure out whether a user has the right we're asking about.
-    # first see if they have the right personally for the queue in question. 
-    my $retval = $self->_HasRight(Scope => 'Queue',
-				  AppliesTo => $args{'QueueObj'}->Id,
-				  Right => $args{'Right'},
-				  IsOwner => $IsOwner);
-
-    return ($retval) if (defined $retval);
-    
-    # then we see whether they have the right personally globally. 
-    $retval = $self->HasSystemRight( $args{'Right'});
-
-    return ($retval) if (defined $retval);
-    
-    # now that we know they don't have the right personally,
-    
-    # {{{ Find out about whether the current user is a Requestor, Cc, AdminCc or Owner
-
-    if (defined $args{'TicketObj'}) {
-	if ($args{'TicketObj'}->IsRequestor($self)) {#user is requestor
-	    $IsRequestor = 1;
-	}	
-
-	if ($args{'TicketObj'}->IsCc($self)) { #If user is a cc
-	    $IsCc = 1;
-	}
-
-	if ($args{'TicketObj'}->IsAdminCc($self)) { #If user is an admin cc
-	    $IsAdminCc = 1;
-	}	
-	
-	if ($args{'TicketObj'}->IsOwner($self)) { #If user is an owner
-	    $IsOwner = 1;
-	}
-    }
-    
-    if (defined $args{'QueueObj'}) {
-	if ($args{'QueueObj'}->IsCc($self)) { #If user is a cc
-	    $IsCc = 1;
-	}
-	if ($args{'QueueObj'}->IsAdminCc($self)) { #If user is an admin cc
-	    $IsAdminCc = 1;
-	}
-	
-    } 
-    # }}}
-    
-    # then see whether they have the right for the queue as a member of a metagroup 
-
-    $retval = $self->_HasRight(Scope => 'Queue',
-				  AppliesTo => $args{'QueueObj'}->Id,
-				  Right => $args{'Right'},
-				  IsOwner => $IsOwner,
-				  IsCc => $IsCc,
-				  IsAdminCc => $IsAdminCc,
-				  IsRequestor => $IsRequestor
-				 );
-
-    return ($retval) if (defined $retval);
-
-    #   then we see whether they have the right globally as a member of a metagroup
-    $retval = $self->HasSystemRight( $args{'Right'},
-				     (IsOwner => $IsOwner,
-				      IsCc => $IsCc,
-				      IsAdminCc => $IsAdminCc,
-				      IsRequestor => $IsRequestor
-				     ) );
-
-    #If they haven't gotten it by now, they just lose.
-    return ($retval);
-    
-}
 
-# }}}
-  
-# {{{ sub HasSystemRight
+=item AuthSystem
+
+Returns the current value of AuthSystem. 
+(In the database, AuthSystem is stored as varchar(30).)
+
 
-=head2 HasSystemRight
 
-takes an array of a single value and a paramhash.
-The single argument is the right being passed in.
-the param hash is some additional data. (IsCc, IsOwner, IsAdminCc and IsRequestor)
+=item SetAuthSystem VALUE
+
+
+Set AuthSystem to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, AuthSystem will be stored as a varchar(30).)
 
-Returns 1 if this user has the listed 'right'. Returns undef if this user doesn't.
 
 =cut
 
-sub HasSystemRight {
-    my $self = shift;
-    my $right = shift;
-
-    my %args = ( IsOwner => undef,
-		 IsCc => undef,
-		 IsAdminCc => undef,
-		 IsRequestor => undef,
-		 @_);
-    
-    unless (defined $right) {
-
-	$RT::Logger->debug("$self RT::User::HasSystemRight was passed in no right.");
-	return(undef);
-    }	
-    return ( $self->_HasRight ( Scope => 'System',
-				AppliesTo => '0',
-				Right => $right,
-				IsOwner => $args{'IsOwner'},
-				IsCc => $args{'IsCc'},
-				IsAdminCc => $args{'IsAdminCc'},
-				IsRequestor => $args{'IsRequestor'},
-				
-			      )
-	   );
-    
-}
 
-# }}}
+=item Gecos
+
+Returns the current value of Gecos. 
+(In the database, Gecos is stored as varchar(16).)
+
+
 
-# {{{ sub _HasRight
+=item SetGecos VALUE
 
-=head2 sub _HasRight (Right => 'right', Scope => 'scope',  AppliesTo => int, ExtendedPrincipals => SQL)
 
-_HasRight is a private helper method for checking a user's rights. It takes
-several options:
+Set Gecos to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Gecos will be stored as a varchar(16).)
+
+
+=cut
+
 
-=item Right is a textual right name
+=item HomePhone
 
-=item Scope is a textual scope name. (As of July these were Queue, Ticket and System
+Returns the current value of HomePhone. 
+(In the database, HomePhone is stored as varchar(30).)
 
-=item AppliesTo is the numerical Id of the object identified in the scope. For tickets, this is the queue #. for queues, this is the queue #
 
-=item ExtendedPrincipals is an  SQL select clause which assumes that the only
-table in play is ACL.  It's used by HasQueueRight to pass in which 
-metaprincipals apply. Actually, it's probably obsolete. TODO: remove it.
 
-Returns 1 if a matching ACE was found.
+=item SetHomePhone VALUE
+
+
+Set HomePhone to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, HomePhone will be stored as a varchar(30).)
 
-Returns undef if no ACE was found.
 
 =cut
 
 
-sub _HasRight {
-    
-    my $self = shift;
-    my %args = ( Right => undef,
-		 Scope => undef,
-		 AppliesTo => undef,
-		 IsRequestor => undef,
-		 IsCc => undef,
-		 IsAdminCc => undef,
-		 IsOwner => undef,
-		 ExtendedPrincipals => undef,
-		 @_);
-    
-    if ($self->Disabled) {
-	$RT::Logger->debug ("Disabled User:  ".$self->Name.
-			    " failed access check for ".$args{'Right'}.
-			    " to object ".$args{'Scope'}."/".
-			    $args{'AppliesTo'}."\n");
-	return (undef);
-    }
-    
-    if (!defined $args{'Right'}) {
-    	$RT::Logger->debug("_HasRight called without a right\n");
-    	return(undef);
-    }
-    elsif (!defined $args{'Scope'}) {
-    	$RT::Logger->debug("_HasRight called without a scope\n");
-    	return(undef);
-    }
-    elsif (!defined $args{'AppliesTo'}) {
-    	$RT::Logger->debug("_HasRight called without an AppliesTo object\n");
-    	return(undef);
-    }
-    
-    #If we've cached a win or loss for this lookup say so
-    
-    #TODO Security +++ check to make sure this is complete and right
-    
-    #Construct a hashkey to cache decisions in
-    my ($hashkey);
-    { #it's ugly, but we need to turn off warning, cuz we're joining nulls.
-	local $^W=0;
-	$hashkey =$self->Id .":". join(':',%args);
-    }	
-    
-  # $RT::Logger->debug($hashkey."\n");
-    
-    #Anything older than 10 seconds needs to be rechecked
-    my $cache_timeout = (time - 10);
-    
-    
-    if ((defined $self->{'rights'}{"$hashkey"}) &&
-	    ($self->{'rights'}{"$hashkey"} == 1 ) &&
-        (defined $self->{'rights'}{"$hashkey"}{'set'} ) &&
-	    ($self->{'rights'}{"$hashkey"}{'set'} > $cache_timeout)) {
-#	  $RT::Logger->debug("Cached ACL win for ". 
-#			     $args{'Right'}.$args{'Scope'}.
-#			     $args{'AppliesTo'}."\n");	    
-	return ($self->{'rights'}{"$hashkey"});
-    }
-    elsif ((defined $self->{'rights'}{"$hashkey"}) &&
-	       ($self->{'rights'}{"$hashkey"} == -1)  &&
-           (defined $self->{'rights'}{"$hashkey"}{'set'}) &&
-	       ($self->{'rights'}{"$hashkey"}{'set'} > $cache_timeout)) {
-	
-#	$RT::Logger->debug("Cached ACL loss decision for ". 
-#			   $args{'Right'}.$args{'Scope'}.
-#			   $args{'AppliesTo'}."\n");	    
-	
-	return(undef);
-    }
-    
-    
-    my $RightClause = "(RightName = '$args{'Right'}')";
-    my $ScopeClause = "(RightScope = '$args{'Scope'}')";
-    
-    #If an AppliesTo was passed in, we should pay attention to it.
-    #otherwise, none is needed
-    
-    $ScopeClause = "($ScopeClause AND (RightAppliesTo = $args{'AppliesTo'}))"
-      if ($args{'AppliesTo'});
-    
-    
-    # The generic principals clause looks for users with my id
-    # and Rights that apply to _everyone_
-    my $PrincipalsClause = "((PrincipalType = 'User') AND (PrincipalId = ".$self->Id."))";
-    
-    
-    # If the user is the superuser, grant them the damn right ;)
-    my $SuperUserClause = 
-      "(RightName = 'SuperUser') AND (RightScope = 'System') AND (RightAppliesTo = 0)";
-    
-    # If we've been passed in an extended principals clause, we should lump it
-    # on to the existing principals clause. it'll make life easier
-    if ($args{'ExtendedPrincipals'}) {
-	$PrincipalsClause = "(($PrincipalsClause) OR ".
-	  "($args{'ExtendedPrincipalsClause'}))";
-    }
-    
-    my $GroupPrincipalsClause = "((ACL.PrincipalType = 'Group') ".
-      "AND (ACL.PrincipalId = Groups.Id) AND (GroupMembers.GroupId = Groups.Id) ".
-     " AND (GroupMembers.UserId = ".$self->Id."))";
-    
-    
-
-
-    # {{{ A bunch of magic statements that make the metagroups listed
-    # work. basically, we if the user falls into the right group,
-    # we add the type of ACL check needed
-    my (@MetaPrincipalsSubClauses, $MetaPrincipalsClause);
-    
-    #The user is always part of the 'Everyone' Group
-    push (@MetaPrincipalsSubClauses,  "((Groups.Name = 'Everyone') AND 
-                                       (PrincipalType = 'Group') AND 
-                                       (Groups.Id = PrincipalId))");
-
-    if ($args{'IsAdminCc'}) {
-	push (@MetaPrincipalsSubClauses,  "((Groups.Name = 'AdminCc') AND 
-                                       (PrincipalType = 'Group') AND 
-                                       (Groups.Id = PrincipalId))");
-    }
-    if ($args{'IsCc'}) {
-	push (@MetaPrincipalsSubClauses, " ((Groups.Name = 'Cc') AND 
-                                       (PrincipalType = 'Group') AND 
-                                       (Groups.Id = PrincipalId))");
-    }
-    if ($args{'IsRequestor'}) {
-	push (@MetaPrincipalsSubClauses,  " ((Groups.Name = 'Requestor') AND 
-                                       (PrincipalType = 'Group') AND 
-                                       (Groups.Id = PrincipalId))");
-    }
-    if ($args{'IsOwner'}) {
-	
-	push (@MetaPrincipalsSubClauses, " ((Groups.Name = 'Owner') AND 
-                                       (PrincipalType = 'Group') AND 
-                                       (Groups.Id = PrincipalId))");
-    }
-
-    # }}}
-    
-    my ($GroupRightsQuery, $MetaGroupRightsQuery, $IndividualRightsQuery, $hitcount);
-    
-    # {{{ If there are any metaprincipals to be checked
-    if (@MetaPrincipalsSubClauses) {
-	#chop off the leading or
-	#TODO redo this with an array and a join
-	$MetaPrincipalsClause = join (" OR ", @MetaPrincipalsSubClauses);
-	
-	$MetaGroupRightsQuery =  "SELECT COUNT(ACL.id) FROM ACL, Groups".
-	  " WHERE " .
-	    " ($ScopeClause) AND ($RightClause) AND ($MetaPrincipalsClause)";
-	
-	# {{{ deal with checking if the user has a right as a member of a metagroup
-
-#	$RT::Logger->debug("Now Trying $MetaGroupRightsQuery\n");	
-	$hitcount = $self->_Handle->FetchResult($MetaGroupRightsQuery);
-	
-	#if there's a match, the right is granted
-	if ($hitcount) {
-	    $self->{'rights'}{"$hashkey"}{'set'} = time;
-	    $self->{'rights'}{"$hashkey"} = 1;
-	    return (1);
-	}
-	
-#	$RT::Logger->debug("No ACL matched MetaGroups query: $MetaGroupRightsQuery\n");	
-
-	# }}}    
-	
-    }
-    # }}}
-
-    # {{{ deal with checking if the user has a right as a member of a group
-    # This query checks to se whether the user has the right as a member of a
-    # group
-    $GroupRightsQuery = "SELECT COUNT(ACL.id) FROM ACL, GroupMembers, Groups".
-      " WHERE " .
-	" (((($ScopeClause) AND ($RightClause)) OR ($SuperUserClause)) ".
-	  " AND ($GroupPrincipalsClause))";    
-    
-    #  $RT::Logger->debug("Now Trying $GroupRightsQuery\n");	
-    $hitcount = $self->_Handle->FetchResult($GroupRightsQuery);
-    
-    #if there's a match, the right is granted
-    if ($hitcount) {
-	$self->{'rights'}{"$hashkey"}{'set'} = time;
-	$self->{'rights'}{"$hashkey"} = 1;
-	return (1);
-    }
-    
-#    $RT::Logger->debug("No ACL matched $GroupRightsQuery\n");	
-    
-    # }}}
-
-    # {{{ Check to see whether the user has a right as an individual
-    
-    # This query checks to see whether the current user has the right directly
-    $IndividualRightsQuery = "SELECT COUNT(ACL.id) FROM ACL WHERE ".
-      " ((($ScopeClause) AND ($RightClause)) OR ($SuperUserClause)) " .
-	" AND ($PrincipalsClause)";
-
-    
-    $hitcount = $self->_Handle->FetchResult($IndividualRightsQuery);
-    
-    if ($hitcount) {
-	$self->{'rights'}{"$hashkey"}{'set'} = time;
-	$self->{'rights'}{"$hashkey"} = 1;
-	return (1);
-    }
-    # }}}
-
-    else { #If the user just doesn't have the right
-	
-#	$RT::Logger->debug("No ACL matched $IndividualRightsQuery\n");
-	
-	#If nothing matched, return 0.
-	$self->{'rights'}{"$hashkey"}{'set'} = time;
-	$self->{'rights'}{"$hashkey"} = -1;
-
-	
-	return (undef);
-    }
-}
+=item WorkPhone
+
+Returns the current value of WorkPhone. 
+(In the database, WorkPhone is stored as varchar(30).)
+
+
 
-# }}}
+=item SetWorkPhone VALUE
 
-# {{{ sub CurrentUserCanModify
 
-=head2 CurrentUserCanModify RIGHT
+Set WorkPhone to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, WorkPhone will be stored as a varchar(30).)
 
-If the user has rights for this object, either because
-he has 'AdminUsers' or (if he\'s trying to edit himself and the right isn\'t an 
-admin right) 'ModifySelf', return 1. otherwise, return undef.
 
 =cut
 
-sub CurrentUserCanModify {
-    my $self = shift;
-    my $right = shift;
-
-    if ($self->CurrentUserHasRight('AdminUsers')) {
-	return (1);
-    }
-    #If the field is marked as an "administrators only" field, 
-    # don\'t let the user touch it.
-    elsif ($self->_Accessible($right, 'admin')) {
-	return(undef);
-    }
-    
-    #If the current user is trying to modify themselves
-    elsif ( ($self->id == $self->CurrentUser->id)  and
-	    ($self->CurrentUserHasRight('ModifySelf'))) {
-	return(1);
-    }
- 
-    #If we don\'t have a good reason to grant them rights to modify
-    # by now, they lose
-    else {
-	return(undef);
-    }
-    
-}
 
-# }}}
+=item MobilePhone
+
+Returns the current value of MobilePhone. 
+(In the database, MobilePhone is stored as varchar(30).)
+
 
-# {{{ sub CurrentUserHasRight
 
-=head2 CurrentUserHasRight
-  
-  Takes a single argument. returns 1 if $Self->CurrentUser
-  has the requested right. returns undef otherwise
+=item SetMobilePhone VALUE
+
+
+Set MobilePhone to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, MobilePhone will be stored as a varchar(30).)
+
 
 =cut
 
-sub CurrentUserHasRight {
-    my $self = shift;
-    my $right = shift;
-    
-    return ($self->CurrentUser->HasSystemRight($right));
-}
 
-# }}}
+=item PagerPhone
 
+Returns the current value of PagerPhone. 
+(In the database, PagerPhone is stored as varchar(30).)
 
-# {{{ sub _Set
 
-sub _Set {
-  my $self = shift;
-  
-  my %args = (Field => undef,
-	      Value => undef,
-	      @_
-	     );
 
-  # Nobody is allowed to futz with RT_System or Nobody unless they
-  # want to change an email address. For 2.2, neither should have an email address
+=item SetPagerPhone VALUE
 
-  if ($self->Privileged == 2) {
-    return (0, "Can not modify system users"); 
-  }
-  unless ($self->CurrentUserCanModify($args{'Field'})) {
-      return (0, "Permission Denied");
-  }
 
+Set PagerPhone to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, PagerPhone will be stored as a varchar(30).)
+
+
+=cut
+
+
+=item Address1
+
+Returns the current value of Address1. 
+(In the database, Address1 is stored as varchar(200).)
 
-  
-  #Set the new value
-  my ($ret, $msg)=$self->SUPER::_Set(Field => $args{'Field'}, 
-				     Value=> $args{'Value'});
-  
-    return ($ret, $msg);
-}
 
-# }}}
 
-# {{{ sub _Value 
+=item SetAddress1 VALUE
 
-=head2 _Value
 
-Takes the name of a table column.
-Returns its value as a string, if the user passes an ACL check
+Set Address1 to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Address1 will be stored as a varchar(200).)
+
 
 =cut
 
-sub _Value  {
-
-  my $self = shift;
-  my $field = shift;
-  
-  #If the current user doesn't have ACLs, don't let em at it.  
-  
-  my @PublicFields = qw( Name EmailAddress Organization Disabled
-			 RealName NickName Gecos ExternalAuthId 
-			 AuthSystem ExternalContactInfoId 
-			 ContactInfoSystem );
-
-  #if the field is public, return it.
-  if ($self->_Accessible($field, 'public')) {
-      return($self->SUPER::_Value($field));
-      
-  }
-  #If the user wants to see their own values, let them
-  elsif ($self->CurrentUser->Id == $self->Id) {	
-      return($self->SUPER::_Value($field));
-  } 
-  #If the user has the admin users right, return the field
-  elsif ($self->CurrentUserHasRight('AdminUsers')) {
-      return($self->SUPER::_Value($field));
-  }
-  else {
-      return(undef);
-  }	
- 
 
-}
+=item Address2
+
+Returns the current value of Address2. 
+(In the database, Address2 is stored as varchar(200).)
+
+
+
+=item SetAddress2 VALUE
+
+
+Set Address2 to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Address2 will be stored as a varchar(200).)
+
+
+=cut
+
+
+=item City
+
+Returns the current value of City. 
+(In the database, City is stored as varchar(100).)
+
+
+
+=item SetCity VALUE
+
+
+Set City to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, City will be stored as a varchar(100).)
+
+
+=cut
+
+
+=item State
+
+Returns the current value of State. 
+(In the database, State is stored as varchar(100).)
+
+
+
+=item SetState VALUE
+
+
+Set State to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, State will be stored as a varchar(100).)
+
+
+=cut
+
+
+=item Zip
+
+Returns the current value of Zip. 
+(In the database, Zip is stored as varchar(16).)
+
+
+
+=item SetZip VALUE
+
+
+Set Zip to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Zip will be stored as a varchar(16).)
+
+
+=cut
+
+
+=item Country
+
+Returns the current value of Country. 
+(In the database, Country is stored as varchar(50).)
+
+
+
+=item SetCountry VALUE
+
+
+Set Country to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Country will be stored as a varchar(50).)
+
+
+=cut
+
+
+=item Timezone
+
+Returns the current value of Timezone. 
+(In the database, Timezone is stored as varchar(50).)
+
+
+
+=item SetTimezone VALUE
+
+
+Set Timezone to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Timezone will be stored as a varchar(50).)
+
+
+=cut
+
+
+=item PGPKey
+
+Returns the current value of PGPKey. 
+(In the database, PGPKey is stored as text.)
+
+
+
+=item SetPGPKey VALUE
+
+
+Set PGPKey to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, PGPKey will be stored as a text.)
+
+
+=cut
+
+
+=item Creator
+
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
+
+
+=cut
+
+
+=item Created
+
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
+
+
+=cut
+
+
+=item LastUpdatedBy
+
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
+
+
+=cut
+
+
+=item LastUpdated
+
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
+
+
+=cut
+
+
+
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        Name => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Password => 
+		{read => 1, write => 1, type => 'varchar(40)', default => ''},
+        Comments => 
+		{read => 1, write => 1, type => 'blob', default => ''},
+        Signature => 
+		{read => 1, write => 1, type => 'blob', default => ''},
+        EmailAddress => 
+		{read => 1, write => 1, type => 'varchar(120)', default => ''},
+        FreeformContactInfo => 
+		{read => 1, write => 1, type => 'blob', default => ''},
+        Organization => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        RealName => 
+		{read => 1, write => 1, type => 'varchar(120)', default => ''},
+        NickName => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        Lang => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        EmailEncoding => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        WebEncoding => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        ExternalContactInfoId => 
+		{read => 1, write => 1, type => 'varchar(100)', default => ''},
+        ContactInfoSystem => 
+		{read => 1, write => 1, type => 'varchar(30)', default => ''},
+        ExternalAuthId => 
+		{read => 1, write => 1, type => 'varchar(100)', default => ''},
+        AuthSystem => 
+		{read => 1, write => 1, type => 'varchar(30)', default => ''},
+        Gecos => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        HomePhone => 
+		{read => 1, write => 1, type => 'varchar(30)', default => ''},
+        WorkPhone => 
+		{read => 1, write => 1, type => 'varchar(30)', default => ''},
+        MobilePhone => 
+		{read => 1, write => 1, type => 'varchar(30)', default => ''},
+        PagerPhone => 
+		{read => 1, write => 1, type => 'varchar(30)', default => ''},
+        Address1 => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Address2 => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        City => 
+		{read => 1, write => 1, type => 'varchar(100)', default => ''},
+        State => 
+		{read => 1, write => 1, type => 'varchar(100)', default => ''},
+        Zip => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        Country => 
+		{read => 1, write => 1, type => 'varchar(50)', default => ''},
+        Timezone => 
+		{read => 1, write => 1, type => 'varchar(50)', default => ''},
+        PGPKey => 
+		{read => 1, write => 1, type => 'text', default => ''},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+
+ }
+};
+
+
+        eval "require RT::User_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/User_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::User_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/User_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::User_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/User_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::User_Overlay, RT::User_Vendor, RT::User_Local
+
+=cut
 
-# }}}
 
-# }}}
 1;
- 
diff --git a/rt/lib/RT/User_Overlay.pm b/rt/lib/RT/User_Overlay.pm
new file mode 100644
index 000000000..e828ebd71
--- /dev/null
+++ b/rt/lib/RT/User_Overlay.pm
@@ -0,0 +1,1589 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::User - RT User object
+
+=head1 SYNOPSIS
+
+  use RT::User;
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing
+
+ok(require RT::User);
+
+=end testing
+
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+use vars qw(%_USERS_KEY_CACHE);
+
+%_USERS_KEY_CACHE = ();
+
+use Digest::MD5;
+use RT::Principals;
+use RT::ACE;
+
+
+# {{{ sub _Accessible 
+
+
+sub _ClassAccessible {
+    {
+     
+        id =>
+                {read => 1, type => 'int(11)', default => ''},
+        Name => 
+                {read => 1, write => 1, public => 1, admin => 1, type => 'varchar(120)', default => ''},
+        Password => 
+                { write => 1, type => 'varchar(40)', default => ''},
+        Comments => 
+                {read => 1, write => 1, admin => 1, type => 'blob', default => ''},
+        Signature => 
+                {read => 1, write => 1, type => 'blob', default => ''},
+        EmailAddress => 
+                {read => 1, write => 1, public => 1,  type => 'varchar(120)', default => ''},
+        FreeformContactInfo => 
+                {read => 1, write => 1, type => 'blob', default => ''},
+        Organization => 
+                {read => 1, write => 1, public => 1, admin => 1, type => 'varchar(200)', default => ''},
+        RealName => 
+                {read => 1, write => 1, public => 1, type => 'varchar(120)', default => ''},
+        NickName => 
+                {read => 1, write => 1, public => 1, type => 'varchar(16)', default => ''},
+        Lang => 
+                {read => 1, write => 1, public => 1, type => 'varchar(16)', default => ''},
+        EmailEncoding => 
+                {read => 1, write => 1, public => 1, type => 'varchar(16)', default => ''},
+        WebEncoding => 
+                {read => 1, write => 1, public => 1, type => 'varchar(16)', default => ''},
+        ExternalContactInfoId => 
+                {read => 1, write => 1, public => 1, admin => 1, type => 'varchar(100)', default => ''},
+        ContactInfoSystem => 
+                {read => 1, write => 1, public => 1, admin => 1, type => 'varchar(30)', default => ''},
+        ExternalAuthId => 
+                {read => 1, write => 1, public => 1, admin => 1, type => 'varchar(100)', default => ''},
+        AuthSystem => 
+                {read => 1, write => 1, public => 1, admin => 1,type => 'varchar(30)', default => ''},
+        Gecos => 
+                {read => 1, write => 1, public => 1, admin => 1, type => 'varchar(16)', default => ''},
+
+        PGPKey => {
+                {read => 1, write => 1, public => 1, admin => 1, type => 'text', default => ''},
+        },
+        HomePhone => 
+                {read => 1, write => 1, type => 'varchar(30)', default => ''},
+        WorkPhone => 
+                {read => 1, write => 1, type => 'varchar(30)', default => ''},
+        MobilePhone => 
+                {read => 1, write => 1, type => 'varchar(30)', default => ''},
+        PagerPhone => 
+                {read => 1, write => 1, type => 'varchar(30)', default => ''},
+        Address1 => 
+                {read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Address2 => 
+                {read => 1, write => 1, type => 'varchar(200)', default => ''},
+        City => 
+                {read => 1, write => 1, type => 'varchar(100)', default => ''},
+        State => 
+                {read => 1, write => 1, type => 'varchar(100)', default => ''},
+        Zip => 
+                {read => 1, write => 1, type => 'varchar(16)', default => ''},
+        Country => 
+                {read => 1, write => 1, type => 'varchar(50)', default => ''},
+        Creator => 
+                {read => 1, auto => 1, type => 'int(11)', default => ''},
+        Created => 
+                {read => 1, auto => 1, type => 'datetime', default => ''},
+        LastUpdatedBy => 
+                {read => 1, auto => 1, type => 'int(11)', default => ''},
+        LastUpdated => 
+                {read => 1, auto => 1, type => 'datetime', default => ''},
+
+ }
+};
+
+
+# }}}
+
+# {{{ sub Create 
+
+=head2 Create { PARAMHASH }
+
+
+=begin testing
+
+# Make sure we can create a user
+
+my $u1 = RT::User->new($RT::SystemUser);
+is(ref($u1), 'RT::User');
+my ($id, $msg) = $u1->Create(Name => 'CreateTest1', EmailAddress => 'create-test-1@example.com');
+ok ($id, "Creating user CreateTest1 - " . $msg );
+
+# Make sure we can't create a second user with the same name
+my $u2 = RT::User->new($RT::SystemUser);
+($id, $msg) = $u2->Create(Name => 'CreateTest1', EmailAddress => 'create-test-2@example.com');
+ok (!$id, $msg);
+
+
+# Make sure we can't create a second user with the same EmailAddress address
+my $u3 = RT::User->new($RT::SystemUser);
+($id, $msg) = $u3->Create(Name => 'CreateTest2', EmailAddress => 'create-test-1@example.com');
+ok (!$id, $msg);
+
+# Make sure we can create a user with no EmailAddress address
+my $u4 = RT::User->new($RT::SystemUser);
+($id, $msg) = $u4->Create(Name => 'CreateTest3');
+ok ($id, $msg);
+
+# make sure we can create a second user with no EmailAddress address
+my $u5 = RT::User->new($RT::SystemUser);
+($id, $msg) = $u5->Create(Name => 'CreateTest4');
+ok ($id, $msg);
+
+# make sure we can create a user with a blank EmailAddress address
+my $u6 = RT::User->new($RT::SystemUser);
+($id, $msg) = $u6->Create(Name => 'CreateTest6', EmailAddress => '');
+ok ($id, $msg);
+# make sure we can create a second user with a blankEmailAddress address
+my $u7 = RT::User->new($RT::SystemUser);
+($id, $msg) = $u7->Create(Name => 'CreateTest7', EmailAddress => '');
+ok ($id, $msg);
+
+# Can we change the email address away from from "";
+($id,$msg) = $u7->SetEmailAddress('foo@bar');
+ok ($id, $msg);
+# can we change the address back to "";  
+($id,$msg) = $u7->SetEmailAddress('');
+ok ($id, $msg);
+is ($u7->EmailAddress, '');
+
+
+=end testing
+
+=cut
+
+
+sub Create {
+    my $self = shift;
+    my %args = (
+        Privileged => 0,
+        Disabled => 0,
+        EmailAddress => '',
+        @_    # get the real argumentlist
+    );
+
+
+    $args{'EmailAddress'} = $self->CanonicalizeEmailAddress($args{'EmailAddress'});
+
+    #Check the ACL
+    unless ( $self->CurrentUser->HasRight(Right => 'AdminUsers', Object => $RT::System) ) {
+        return ( 0, $self->loc('No permission to create users') );
+    }
+
+
+    # Privileged is no longer a column in users
+    my $privileged = $args{'Privileged'};
+    delete $args{'Privileged'};
+
+
+    if ($args{'CryptedPassword'} ) {
+        $args{'Password'} = $args{'CryptedPassword'};
+        delete $args{'CryptedPassword'};
+    }
+    elsif ( !$args{'Password'} ) {
+        $args{'Password'} = '*NO-PASSWORD*';
+    }
+    elsif ( length( $args{'Password'} ) < $RT::MinimumPasswordLength ) {
+        return ( 0, $self->loc("Password too short") );
+    }
+
+    else {
+        $args{'Password'} = $self->_GeneratePassword($args{'Password'});
+    }
+
+    #TODO Specify some sensible defaults.
+
+    unless ( defined( $args{'Name'} ) ) {
+        return ( 0, $self->loc("Must specify 'Name' attribute") );
+    }
+
+    #SANITY CHECK THE NAME AND ABORT IF IT'S TAKEN
+    if ($RT::SystemUser) {   #This only works if RT::SystemUser has been defined
+        my $TempUser = RT::User->new($RT::SystemUser);
+        $TempUser->Load( $args{'Name'} );
+        return ( 0, $self->loc('Name in use') ) if ( $TempUser->Id );
+
+        return ( 0, $self->loc('Email address in use') )
+          unless ( $self->ValidateEmailAddress( $args{'EmailAddress'} ) );
+    }
+    else {
+        $RT::Logger->warning( "$self couldn't check for pre-existing users");
+    }
+
+
+    $RT::Handle->BeginTransaction();
+    # Groups deal with principal ids, rather than user ids.
+    # When creating this user, set up a principal Id for it.
+    my $principal = RT::Principal->new($self->CurrentUser);
+    my $principal_id = $principal->Create(PrincipalType => 'User',
+                                Disabled => $args{'Disabled'},
+                                ObjectId => '0');
+    $principal->__Set(Field => 'ObjectId', Value => $principal_id);
+    # If we couldn't create a principal Id, get the fuck out.
+    unless ($principal_id) {
+        $RT::Handle->Rollback();
+        $RT::Logger->crit("Couldn't create a Principal on new user create. Strange things are afoot at the circle K");
+        return ( 0, $self->loc('Could not create user') );
+    }
+
+    delete $args{'Disabled'};
+
+    $self->SUPER::Create(id => $principal_id , %args);
+    my $id = $self->Id;
+
+    #If the create failed.
+    unless ($id) {
+        $RT::Logger->error("Could not create a new user - " .join('-'. %args));
+
+        return ( 0, $self->loc('Could not create user') );
+    }
+
+
+    #TODO post 2.0
+    #if ($args{'SendWelcomeMessage'}) {
+    #	#TODO: Check if the email exists and looks valid
+    #	#TODO: Send the user a "welcome message" 
+    #}
+
+
+
+    my $aclstash = RT::Group->new($self->CurrentUser);
+    my $stash_id = $aclstash->_CreateACLEquivalenceGroup($principal);
+
+    unless ($stash_id) {
+        $RT::Handle->Rollback();
+        $RT::Logger->crit("Couldn't stash the user in groumembers");
+        return ( 0, $self->loc('Could not create user') );
+    }
+
+    $RT::Handle->Commit;
+
+    #$RT::Logger->debug("Adding the user as a member of everyone"); 
+    my $everyone = RT::Group->new($self->CurrentUser);
+    $everyone->LoadSystemInternalGroup('Everyone');
+    $everyone->AddMember($self->PrincipalId);
+
+    if ($privileged)  {
+        my $priv = RT::Group->new($self->CurrentUser);
+        #$RT::Logger->debug("Making ".$self->Id." a privileged user");
+        $priv->LoadSystemInternalGroup('Privileged');
+        $priv->AddMember($self->PrincipalId);  
+    } else {
+        my $unpriv = RT::Group->new($self->CurrentUser);
+        #$RT::Logger->debug("Making ".$self->Id." an unprivileged user");
+        $unpriv->LoadSystemInternalGroup('Unprivileged');
+        $unpriv->AddMember($self->PrincipalId);  
+    }
+
+
+   #  $RT::Logger->debug("Finished creating the user");
+    return ( $id, $self->loc('User created') );
+}
+
+# }}}
+
+
+
+# {{{ SetPrivileged
+
+=head2 SetPrivileged BOOL
+
+If passed a true value, makes this user a member of the "Privileged"  PseudoGroup.
+Otherwise, makes this user a member of the "Unprivileged" pseudogroup. 
+
+Returns a standard RT tuple of (val, msg);
+
+=begin testing
+
+
+ok(my $user = RT::User->new($RT::SystemUser));
+ok($user->Load('root'), "Loaded user 'root'");
+ok($user->Privileged, "User 'root' is privileged");
+ok(my ($v,$m) = $user->SetPrivileged(0));
+ok ($v ==1, "Set unprivileged suceeded ($m)");
+ok(!$user->Privileged, "User 'root' is no longer privileged");
+ok(my ($v2,$m2) = $user->SetPrivileged(1));
+ok ($v2 ==1, "Set privileged suceeded ($m2");
+ok($user->Privileged, "User 'root' is privileged again");
+
+=end testing
+
+=cut
+
+sub SetPrivileged {
+    my $self = shift;
+    my $val = shift;
+
+    my $priv = RT::Group->new($self->CurrentUser);
+    $priv->LoadSystemInternalGroup('Privileged');
+   
+    unless ($priv->Id) {
+        $RT::Logger->crit("Could not find Privileged pseudogroup");
+        return(0,$self->loc("Failed to find 'Privileged' users pseudogroup."));
+    }
+
+    my $unpriv = RT::Group->new($self->CurrentUser);
+    $unpriv->LoadSystemInternalGroup('Unprivileged');
+    unless ($unpriv->Id) {
+        $RT::Logger->crit("Could not find unprivileged pseudogroup");
+        return(0,$self->loc("Failed to find 'Unprivileged' users pseudogroup"));
+    }
+
+    if ($val) {
+        if ($priv->HasMember($self->PrincipalObj)) {
+            #$RT::Logger->debug("That user is already privileged");
+            return (0,$self->loc("That user is already privileged"));
+        }
+        if ($unpriv->HasMember($self->PrincipalObj)) {
+            $unpriv->DeleteMember($self->PrincipalId);
+        } else {
+        # if we had layered transactions, life would be good
+        # sadly, we have to just go ahead, even if something
+        # bogus happened
+            $RT::Logger->crit("User ".$self->Id." is neither privileged nor ".
+                "unprivileged. something is drastically wrong.");
+        }
+        my ($status, $msg) = $priv->AddMember($self->PrincipalId);  
+        if ($status) {
+            return (1, $self->loc("That user is now privileged"));
+        } else {
+            return (0, $msg);
+        }
+    }
+    else {
+        if ($unpriv->HasMember($self->PrincipalObj)) {
+            #$RT::Logger->debug("That user is already unprivileged");
+            return (0,$self->loc("That user is already unprivileged"));
+        }
+        if ($priv->HasMember($self->PrincipalObj)) {
+            $priv->DeleteMember($self->PrincipalId);
+        } else {
+        # if we had layered transactions, life would be good
+        # sadly, we have to just go ahead, even if something
+        # bogus happened
+            $RT::Logger->crit("User ".$self->Id." is neither privileged nor ".
+                "unprivileged. something is drastically wrong.");
+        }
+        my ($status, $msg) = $unpriv->AddMember($self->PrincipalId);  
+        if ($status) {
+            return (1, $self->loc("That user is now unprivileged"));
+        } else {
+            return (0, $msg);
+        }
+    }
+}
+
+# }}}
+
+# {{{ Privileged
+
+=head2 Privileged
+
+Returns true if this user is privileged. Returns undef otherwise.
+
+=cut
+
+sub Privileged {
+    my $self = shift;
+    my $priv = RT::Group->new($self->CurrentUser);
+    $priv->LoadSystemInternalGroup('Privileged');
+    if ($priv->HasMember($self->PrincipalObj)) {
+        return(1);
+    }
+    else {
+        return(undef);
+    }
+}
+
+# }}}
+
+# {{{ sub _BootstrapCreate 
+
+#create a user without validating _any_ data.
+
+#To be used only on database init.
+# We can't localize here because it's before we _have_ a loc framework
+
+sub _BootstrapCreate {
+    my $self = shift;
+    my %args = (@_);
+
+    $args{'Password'} = '*NO-PASSWORD*';
+
+
+    $RT::Handle->BeginTransaction(); 
+
+    # Groups deal with principal ids, rather than user ids.
+    # When creating this user, set up a principal Id for it.
+    my $principal = RT::Principal->new($self->CurrentUser);
+    my $principal_id = $principal->Create(PrincipalType => 'User', ObjectId => '0');
+    $principal->__Set(Field => 'ObjectId', Value => $principal_id);
+   
+    # If we couldn't create a principal Id, get the fuck out.
+    unless ($principal_id) {
+        $RT::Handle->Rollback();
+        $RT::Logger->crit("Couldn't create a Principal on new user create. Strange things are afoot at the circle K");
+        return ( 0, 'Could not create user' );
+    }
+    $self->SUPER::Create(id => $principal_id, %args);
+    my $id = $self->Id;
+    #If the create failed.
+      unless ($id) {
+      $RT::Handle->Rollback();
+      return ( 0, 'Could not create user' ) ; #never loc this
+    }
+
+    my $aclstash = RT::Group->new($self->CurrentUser);
+    my $stash_id  = $aclstash->_CreateACLEquivalenceGroup($principal);
+
+    unless ($stash_id) {
+        $RT::Handle->Rollback();
+        $RT::Logger->crit("Couldn't stash the user in groupmembers");
+        return ( 0, $self->loc('Could not create user') );
+    }
+
+                                    
+    $RT::Handle->Commit();
+
+    return ( $id, 'User created' );
+}
+
+# }}}
+
+# {{{ sub Delete 
+
+sub Delete {
+    my $self = shift;
+
+    return ( 0, $self->loc('Deleting this object would violate referential integrity') );
+
+}
+
+# }}}
+
+# {{{ sub Load 
+
+=head2 Load
+
+Load a user object from the database. Takes a single argument.
+If the argument is numerical, load by the column 'id'. Otherwise, load by
+the "Name" column which is the user's textual username.
+
+=cut
+
+sub Load {
+    my $self       = shift;
+    my $identifier = shift || return undef;
+
+    #if it's an int, load by id. otherwise, load by name.
+    if ( $identifier !~ /\D/ ) {
+        $self->SUPER::LoadById($identifier);
+    }
+    else {
+        $self->LoadByCol( "Name", $identifier );
+    }
+}
+
+# }}}
+
+# {{{ sub LoadByEmail
+
+=head2 LoadByEmail
+
+Tries to load this user object from the database by the user's email address.
+
+
+=cut
+
+sub LoadByEmail {
+    my $self    = shift;
+    my $address = shift;
+
+    # Never load an empty address as an email address.
+    unless ($address) {
+        return (undef);
+    }
+
+    $address = $self->CanonicalizeEmailAddress($address);
+
+    #$RT::Logger->debug("Trying to load an email address: $address\n");
+    return $self->LoadByCol( "EmailAddress", $address );
+}
+
+# }}}
+
+# {{{ LoadOrCreateByEmail 
+
+=head2 LoadOrCreateByEmail ADDRESS
+
+Attempts to find a user who has the provided email address. If that fails, creates an unprivileged user with
+the provided email address. and loads them.
+
+Returns a tuple of the user's id and a status message.
+0 will be returned in place of the user's id in case of failure.
+
+=cut
+
+sub LoadOrCreateByEmail {
+    my $self = shift;
+    my $email = shift;
+
+        my ($val, $message);
+
+        $self->LoadByEmail($email);
+        $message = $self->loc('User loaded');
+        unless ($self->Id) {
+            ( $val, $message ) = $self->Create(
+                Name => $email,
+                EmailAddress => $email,
+                RealName     => $email,
+                Privileged   => 0,
+                Comments     => 'Autocreated when added as a watcher');
+            unless ($val) {
+                # Deal with the race condition of two account creations at once
+                $self->LoadByEmail($email);
+                unless ($self->Id) {
+                    sleep 5;
+                    $self->LoadByEmail($email);
+                }
+                if ($self->Id) {
+                    $RT::Logger->error("Recovered from creation failure due to race condition");
+                    $message = $self->loc("User loaded");
+                }
+                else {
+                    $RT::Logger->crit("Failed to create user ".$email .": " .$message);
+                }
+            }
+        }
+
+        if ($self->Id) {
+            return($self->Id, $message);
+        }
+        else {
+            return(0, $message);
+        }
+
+
+    }
+
+# }}}
+
+# {{{ sub ValidateEmailAddress
+
+=head2 ValidateEmailAddress ADDRESS
+
+Returns true if the email address entered is not in use by another user or is 
+undef or ''. Returns false if it's in use. 
+
+=cut
+
+sub ValidateEmailAddress {
+    my $self  = shift;
+    my $Value = shift;
+
+    # if the email address is null, it's always valid
+    return (1) if ( !$Value || $Value eq "" );
+
+    my $TempUser = RT::User->new($RT::SystemUser);
+    $TempUser->LoadByEmail($Value);
+
+    if ( $TempUser->id && ( $TempUser->id != $self->id ) )
+    {    # if we found a user with that address
+            # it's invalid to set this user's address to it
+        return (undef);
+    }
+    else {    #it's a valid email address
+        return (1);
+    }
+}
+
+# }}}
+
+# {{{ sub CanonicalizeEmailAddress
+
+
+
+=item CanonicalizeEmailAddress ADDRESS
+
+# CanonicalizeEmailAddress converts email addresses into canonical form.
+# it takes one email address in and returns the proper canonical
+# form. You can dump whatever your proper local config is in here
+
+=cut
+
+sub CanonicalizeEmailAddress {
+    my $self = shift;
+    my $email = shift;
+    # Example: the following rule would treat all email
+    # coming from a subdomain as coming from second level domain
+    # foo.com
+    if ($RT::CanonicalizeEmailAddressMatch && $RT::CanonicalizeEmailAddressReplace ) {
+        $email =~ s/$RT::CanonicalizeEmailAddressMatch/$RT::CanonicalizeEmailAddressReplace/gi;
+    }
+    return ($email);
+}
+
+
+# }}}
+
+
+# {{{ Password related functions
+
+# {{{ sub SetRandomPassword
+
+=head2 SetRandomPassword
+
+Takes no arguments. Returns a status code and a new password or an error message.
+If the status is 1, the second value returned is the new password.
+If the status is anything else, the new value returned is the error code.
+
+=cut
+
+sub SetRandomPassword {
+    my $self = shift;
+
+    unless ( $self->CurrentUserCanModify('Password') ) {
+        return ( 0, $self->loc("Permission Denied") );
+    }
+
+    my $pass = $self->GenerateRandomPassword( 6, 8 );
+
+    # If we have "notify user on 
+
+    my ( $val, $msg ) = $self->SetPassword($pass);
+
+    #If we got an error return the error.
+    return ( 0, $msg ) unless ($val);
+
+    #Otherwise, we changed the password, lets return it.
+    return ( 1, $pass );
+
+}
+
+# }}}
+
+# {{{ sub ResetPassword
+
+=head2 ResetPassword
+
+Returns status, [ERROR or new password].  Resets this user\'s password to
+a randomly generated pronouncable password and emails them, using a 
+global template called "RT_PasswordChange", which can be overridden
+with global templates "RT_PasswordChange_Privileged" or "RT_PasswordChange_NonPrivileged" 
+for privileged and Non-privileged users respectively.
+
+=cut
+
+sub ResetPassword {
+    my $self = shift;
+
+    unless ( $self->CurrentUserCanModify('Password') ) {
+        return ( 0, $self->loc("Permission Denied") );
+    }
+    my ( $status, $pass ) = $self->SetRandomPassword();
+
+    unless ($status) {
+        return ( 0, "$pass" );
+    }
+
+    my $template = RT::Template->new( $self->CurrentUser );
+
+    if ( $self->IsPrivileged ) {
+        $template->LoadGlobalTemplate('RT_PasswordChange_Privileged');
+    }
+    else {
+        $template->LoadGlobalTemplate('RT_PasswordChange_Privileged');
+    }
+
+    unless ( $template->Id ) {
+        $template->LoadGlobalTemplate('RT_PasswordChange');
+    }
+
+    unless ( $template->Id ) {
+        $RT::Logger->crit( "$self tried to send "
+              . $self->Name
+              . " a password reminder "
+              . "but couldn't find a password change template" );
+    }
+
+    my $notification = RT::Action::SendPasswordEmail->new(
+        TemplateObj => $template,
+        Argument    => $pass
+    );
+
+    $notification->SetTo( $self->EmailAddress );
+
+    my ($ret);
+    $ret = $notification->Prepare();
+    if ($ret) {
+        $ret = $notification->Commit();
+    }
+
+    if ($ret) {
+        return ( 1, $self->loc('New password notification sent') );
+    }
+    else {
+        return ( 0, $self->loc('Notification could not be sent') );
+    }
+
+}
+
+# }}}
+
+# {{{ sub GenerateRandomPassword
+
+=head2 GenerateRandomPassword MIN_LEN and MAX_LEN
+
+Returns a random password between MIN_LEN and MAX_LEN characters long.
+
+=cut
+
+sub GenerateRandomPassword {
+    my $self       = shift;
+    my $min_length = shift;
+    my $max_length = shift;
+
+    #This code derived from mpw.pl, a bit of code with a sordid history
+    # Its notes: 
+
+    # Perl cleaned up a bit by Jesse Vincent 1/14/2001.
+    # Converted to perl from C by Marc Horowitz, 1/20/2000.
+    # Converted to C from Multics PL/I by Bill Sommerfeld, 4/21/86.
+    # Original PL/I version provided by Jerry Saltzer.
+
+    my ( $frequency, $start_freq, $total_sum, $row_sums );
+
+    #When munging characters, we need to know where to start counting letters from
+    my $a = ord('a');
+
+    # frequency of English digraphs (from D Edwards 1/27/66) 
+    $frequency = [
+        [
+            4, 20, 28, 52, 2,  11,  28, 4,  32, 4, 6, 62, 23, 167,
+            2, 14, 0,  83, 76, 127, 7,  25, 8,  1, 9, 1
+        ],    # aa - az
+        [
+            13, 0, 0, 0,  55, 0, 0,  0, 8, 2, 0,  22, 0, 0,
+            11, 0, 0, 15, 4,  2, 13, 0, 0, 0, 15, 0
+        ],    # ba - bz
+        [
+            32, 0, 7, 1,  69, 0,  0,  33, 17, 0, 10, 9, 1, 0,
+            50, 3, 0, 10, 0,  28, 11, 0,  0,  0, 3,  0
+        ],    # ca - cz
+        [
+            40, 16, 9, 5,  65, 18, 3,  9, 56, 0, 1, 4, 15, 6,
+            16, 4,  0, 21, 18, 53, 19, 5, 15, 0, 3, 0
+        ],    # da - dz
+        [
+            84, 20, 55, 125, 51, 40, 19, 16,  50,  1,
+            4,  55, 54, 146, 35, 37, 6,  191, 149, 65,
+            9,  26, 21, 12,  5,  0
+        ],    # ea - ez
+        [
+            19, 3, 5, 1,  19, 21, 1, 3, 30, 2, 0, 11, 1, 0,
+            51, 0, 0, 26, 8,  47, 6, 3, 3,  0, 2, 0
+        ],    # fa - fz
+        [
+            20, 4, 3, 2,  35, 1,  3, 15, 18, 0, 0, 5, 1, 4,
+            21, 1, 1, 20, 9,  21, 9, 0,  5,  0, 1, 0
+        ],    # ga - gz
+        [
+            101, 1, 3, 0, 270, 5,  1, 6, 57, 0, 0, 0, 3, 2,
+            44,  1, 0, 3, 10,  18, 6, 0, 5,  0, 3, 0
+        ],    # ha - hz
+        [
+            40, 7,  51, 23, 25, 9,   11, 3,  0, 0, 2, 38, 25, 202,
+            56, 12, 1,  46, 79, 117, 1,  22, 0, 4, 0, 3
+        ],    # ia - iz
+        [
+            3, 0, 0, 0, 5, 0, 0, 0, 1, 0, 0, 0, 0, 0,
+            4, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0
+        ],    # ja - jz
+        [
+            1, 0, 0, 0, 11, 0, 0, 0, 13, 0, 0, 0, 0, 2,
+            0, 0, 0, 0, 6,  2, 1, 0, 2,  0, 1, 0
+        ],    # ka - kz
+        [
+            44, 2, 5, 12, 62, 7,  5, 2, 42, 1, 1,  53, 2, 2,
+            25, 1, 1, 2,  16, 23, 9, 0, 1,  0, 33, 0
+        ],    # la - lz
+        [
+            52, 14, 1, 0, 64, 0, 0, 3, 37, 0, 0, 0, 7, 1,
+            17, 18, 1, 2, 12, 3, 8, 0, 1,  0, 2, 0
+        ],    # ma - mz
+        [
+            42, 10, 47, 122, 63, 19, 106, 12, 30, 1,
+            6,  6,  9,  7,   54, 7,  1,   7,  44, 124,
+            6,  1,  15, 0,   12, 0
+        ],    # na - nz
+        [
+            7,  12, 14, 17, 5,  95, 3,  5,  14, 0, 0, 19, 41, 134,
+            13, 23, 0,  91, 23, 42, 55, 16, 28, 0, 4, 1
+        ],    # oa - oz
+        [
+            19, 1, 0, 0,  37, 0, 0, 4, 8, 0, 0, 15, 1, 0,
+            27, 9, 0, 33, 14, 7, 6, 0, 0, 0, 0, 0
+        ],    # pa - pz
+        [
+            0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0
+        ],    # qa - qz
+        [
+            83, 8, 16, 23, 169, 4,  8, 8,  77, 1, 10, 5, 26, 16,
+            60, 4, 0,  24, 37,  55, 6, 11, 4,  0, 28, 0
+        ],    # ra - rz
+        [
+            65, 9,  17, 9, 73, 13,  1,  47, 75, 3, 0, 7, 11, 12,
+            56, 17, 6,  9, 48, 116, 35, 1,  28, 0, 4, 0
+        ],    # sa - sz
+        [
+            57, 22, 3,  1, 76, 5, 2, 330, 126, 1,
+            0,  14, 10, 6, 79, 7, 0, 49,  50,  56,
+            21, 2,  27, 0, 24, 0
+        ],    # ta - tz
+        [
+            11, 5,  9, 6,  9,  1,  6, 0, 9, 0, 1, 19, 5, 31,
+            1,  15, 0, 47, 39, 31, 0, 3, 0, 0, 0, 0
+        ],    # ua - uz
+        [
+            7, 0, 0, 0, 72, 0, 0, 0, 28, 0, 0, 0, 0, 0,
+            5, 0, 0, 0, 0,  0, 0, 0, 0,  0, 3, 0
+        ],    # va - vz
+        [
+            36, 1, 1, 0, 38, 0, 0, 33, 36, 0, 0, 4, 1, 8,
+            15, 0, 0, 0, 4,  2, 0, 0,  1,  0, 0, 0
+        ],    # wa - wz
+        [
+            1, 0, 2, 0, 0, 1, 0, 0, 3, 0, 0, 0, 0, 0,
+            1, 5, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0
+        ],    # xa - xz
+        [
+            14, 5, 4, 2, 7,  12, 12, 6, 10, 0, 0, 3, 7, 5,
+            17, 3, 0, 4, 16, 30, 0,  0, 5,  0, 0, 0
+        ],    # ya - yz
+        [
+            1, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        ]
+    ];    # za - zz
+
+    #We need to know the totals for each row 
+    $row_sums = [
+        map {
+            my $sum = 0;
+            map { $sum += $_ } @$_;
+            $sum;
+          } @$frequency
+    ];
+
+    #Frequency with which a given letter starts a word.
+    $start_freq = [
+        1299, 425, 725, 271, 375, 470, 93, 223, 1009, 24,
+        20,   355, 379, 319, 823, 618, 21, 317, 962,  1991,
+        271,  104, 516, 6,   16,  14
+    ];
+
+    $total_sum = 0;
+    map { $total_sum += $_ } @$start_freq;
+
+    my $length = $min_length + int( rand( $max_length - $min_length ) );
+
+    my $char = $self->GenerateRandomNextChar( $total_sum, $start_freq );
+    my @word = ( $char + $a );
+    for ( 2 .. $length ) {
+        $char =
+          $self->_GenerateRandomNextChar( $row_sums->[$char],
+            $frequency->[$char] );
+        push ( @word, $char + $a );
+    }
+
+    #Return the password
+    return pack( "C*", @word );
+
+}
+
+#A private helper function for RandomPassword
+# Takes a row summary and a frequency chart for the next character to be searched
+sub _GenerateRandomNextChar {
+    my $self = shift;
+    my ( $all, $freq ) = @_;
+    my ( $pos, $i );
+
+    for ( $pos = int( rand($all) ), $i = 0 ;
+        $pos >= $freq->[$i] ;
+        $pos -= $freq->[$i], $i++ )
+    {
+    }
+
+    return ($i);
+}
+
+# }}}
+
+# {{{ sub SetPassword
+
+=head2 SetPassword
+
+Takes a string. Checks the string's length and sets this user's password 
+to that string.
+
+=cut
+
+sub SetPassword {
+    my $self     = shift;
+    my $password = shift;
+
+    unless ( $self->CurrentUserCanModify('Password') ) {
+        return ( 0, $self->loc('Permission Denied') );
+    }
+
+    if ( !$password ) {
+        return ( 0, $self->loc("No password set") );
+    }
+    elsif ( length($password) < $RT::MinimumPasswordLength ) {
+        return ( 0, $self->loc("Password too short") );
+    }
+    else {
+        $password = $self->_GeneratePassword($password);
+        return ( $self->SUPER::SetPassword( $password));
+    }
+
+}
+
+=head2 _GeneratePassword PASSWORD
+
+returns an MD5 hash of the password passed in, in base64 encoding.
+
+=cut
+
+sub _GeneratePassword {
+    my $self = shift;
+    my $password = shift;
+
+    my $md5 = Digest::MD5->new();
+    $md5->add($password);
+    return ($md5->b64digest);
+
+}
+
+# }}}
+
+# {{{ sub IsPassword 
+
+=head2 IsPassword
+
+Returns true if the passed in value is this user's password.
+Returns undef otherwise.
+
+=cut
+
+sub IsPassword {
+    my $self  = shift;
+    my $value = shift;
+
+    #TODO there isn't any apparent way to legitimately ACL this
+
+    # RT does not allow null passwords 
+    if ( ( !defined($value) ) or ( $value eq '' ) ) {
+        return (undef);
+    }
+
+   if ( $self->PrincipalObj->Disabled ) {
+        $RT::Logger->info(
+            "Disabled user " . $self->Name . " tried to log in" );
+        return (undef);
+    }
+
+    if ( ($self->__Value('Password') eq '') || 
+         ($self->__Value('Password') eq undef) )  {
+        return(undef);
+     }
+
+    # generate an md5 password 
+    if ($self->_GeneratePassword($value) eq $self->__Value('Password')) {
+        return(1);
+    }
+
+    #  if it's a historical password we say ok.
+
+    if ( $self->__Value('Password') eq crypt( $value, $self->__Value('Password') ) ) {
+        return (1);
+    }
+
+    # no password check has succeeded. get out
+
+    return (undef);
+}
+
+# }}}
+
+# }}}
+
+# {{{ sub SetDisabled
+
+=head2 Sub SetDisabled
+
+Toggles the user's disabled flag.
+If this flag is
+set, all password checks for this user will fail. All ACL checks for this
+user will fail. The user will appear in no user listings.
+
+=cut 
+
+# }}}
+
+sub SetDisabled {
+    my $self = shift;
+    unless ( $self->CurrentUser->HasRight(Right => 'AdminUsers', Object => $RT::System) ) {
+        return (0, $self->loc('Permission Denied'));
+    }
+    return $self->PrincipalObj->SetDisabled(@_);
+}
+
+sub Disabled {
+    my $self = shift;
+    return $self->PrincipalObj->Disabled(@_);
+}
+
+
+# {{{ Principal related routines
+
+=head2 PrincipalObj 
+
+Returns the principal object for this user. returns an empty RT::Principal
+if there's no principal object matching this user. 
+The response is cached. PrincipalObj should never ever change.
+
+=begin testing
+
+ok(my $u = RT::User->new($RT::SystemUser));
+ok($u->Load(1), "Loaded the first user");
+ok($u->PrincipalObj->ObjectId == 1, "user 1 is the first principal");
+ok($u->PrincipalObj->PrincipalType eq 'User' , "Principal 1 is a user, not a group");
+
+=end testing
+
+=cut
+
+
+sub PrincipalObj {
+    my $self = shift;
+    unless ($self->{'PrincipalObj'} && 
+            ($self->{'PrincipalObj'}->ObjectId == $self->Id) &&
+            ($self->{'PrincipalObj'}->PrincipalType eq 'User')) {
+
+            $self->{'PrincipalObj'} = RT::Principal->new($self->CurrentUser);
+            $self->{'PrincipalObj'}->LoadByCols('ObjectId' => $self->Id,
+                                                'PrincipalType' => 'User') ;
+            }
+    return($self->{'PrincipalObj'});
+}
+
+
+=head2 PrincipalId  
+
+Returns this user's PrincipalId
+
+=cut
+
+sub PrincipalId {
+    my $self = shift;
+    return $self->Id;
+}
+
+# }}}
+
+
+
+# {{{ sub HasGroupRight
+
+=head2 HasGroupRight
+
+Takes a paramhash which can contain
+these items:
+    GroupObj => RT::Group or Group => integer
+    Right => 'Right' 
+
+
+Returns 1 if this user has the right specified in the paramhash for the Group
+passed in.
+
+Returns undef if they don't.
+
+=cut
+
+sub HasGroupRight {
+    my $self = shift;
+    my %args = (
+        GroupObj    => undef,
+        Group       => undef,
+        Right       => undef,
+        @_
+    );
+
+
+    if ( defined $args{'Group'} ) {
+        $args{'GroupObj'} = RT::Group->new( $self->CurrentUser );
+        $args{'GroupObj'}->Load( $args{'Group'} );
+    }
+
+    # {{{ Validate and load up the GroupId
+    unless ( ( defined $args{'GroupObj'} ) and ( $args{'GroupObj'}->Id ) ) {
+        return undef;
+    }
+
+    # }}}
+
+
+    # Figure out whether a user has the right we're asking about.
+    my $retval = $self->HasRight(
+        Object => $args{'GroupObj'},
+        Right     => $args{'Right'},
+    );
+
+    return ($retval);
+
+
+}
+
+# }}}
+
+# {{{ sub Rights testing
+
+=head2 Rights testing
+
+
+=begin testing
+
+my $root = RT::User->new($RT::SystemUser);
+$root->Load('root');
+ok($root->Id, "Found the root user");
+my $rootq = RT::Queue->new($root);
+$rootq->Load(1);
+ok($rootq->Id, "Loaded the first queue");
+
+ok ($rootq->CurrentUser->HasRight(Right=> 'CreateTicket', Object => $rootq), "Root can create tickets");
+
+my $new_user = RT::User->new($RT::SystemUser);
+my ($id, $msg) = $new_user->Create(Name => 'ACLTest');
+
+ok ($id, "Created a new user for acl test $msg");
+
+my $q = RT::Queue->new($new_user);
+$q->Load(1);
+ok($q->Id, "Loaded the first queue");
+
+
+ok (!$q->CurrentUser->HasRight(Right => 'CreateTicket', Object => $q), "Some random user doesn't have the right to create tickets");
+ok (my ($gval, $gmsg) = $new_user->PrincipalObj->GrantRight( Right => 'CreateTicket', Object => $q), "Granted the random user the right to create tickets");
+ok ($gval, "Grant succeeded - $gmsg");
+
+
+ok ($q->CurrentUser->HasRight(Right => 'CreateTicket', Object => $q), "The user can create tickets after we grant him the right");
+ok (my ($gval, $gmsg) = $new_user->PrincipalObj->RevokeRight( Right => 'CreateTicket', Object => $q), "revoked the random user the right to create tickets");
+ok ($gval, "Revocation succeeded - $gmsg");
+ok (!$q->CurrentUser->HasRight(Right => 'CreateTicket', Object => $q), "The user can't create tickets anymore");
+
+
+
+
+
+# Create a ticket in the queue
+my $new_tick = RT::Ticket->new($RT::SystemUser);
+my ($tickid, $tickmsg) = $new_tick->Create(Subject=> 'ACL Test', Queue => 'General');
+ok($tickid, "Created ticket: $tickid");
+# Make sure the user doesn't have the right to modify tickets in the queue
+ok (!$new_user->HasRight( Object => $new_tick, Right => 'ModifyTicket'), "User can't modify the ticket without group membership");
+# Create a new group
+my $group = RT::Group->new($RT::SystemUser);
+$group->CreateUserDefinedGroup(Name => 'ACLTest');
+ok($group->Id, "Created a new group Ok");
+# Grant a group the right to modify tickets in a queue
+ok(my ($gv,$gm) = $group->PrincipalObj->GrantRight( Object => $q, Right => 'ModifyTicket'),"Granted the group the right to modify tickets");
+ok($gv,"Grant succeeed - $gm");
+# Add the user to the group
+ok( my ($aid, $amsg) = $group->AddMember($new_user->PrincipalId), "Added the member to the group");
+ok ($aid, "Member added to group: $amsg");
+# Make sure the user does have the right to modify tickets in the queue
+ok ($new_user->HasRight( Object => $new_tick, Right => 'ModifyTicket'), "User can modify the ticket with group membership");
+
+
+# Remove the user from the group
+ok( my ($did, $dmsg) = $group->DeleteMember($new_user->PrincipalId), "Deleted the member from the group");
+ok ($did,"Deleted the group member: $dmsg");
+# Make sure the user doesn't have the right to modify tickets in the queue
+ok (!$new_user->HasRight( Object => $new_tick, Right => 'ModifyTicket'), "User can't modify the ticket without group membership");
+
+
+my $q_as_system = RT::Queue->new($RT::SystemUser);
+$q_as_system->Load(1);
+ok($q_as_system->Id, "Loaded the first queue");
+
+# Create a ticket in the queue
+my $new_tick2 = RT::Ticket->new($RT::SystemUser);
+my ($tick2id, $tickmsg) = $new_tick2->Create(Subject=> 'ACL Test 2', Queue =>$q_as_system->Id);
+ok($tick2id, "Created ticket: $tick2id");
+ok($new_tick2->QueueObj->id eq $q_as_system->Id, "Created a new ticket in queue 1");
+
+
+# make sure that the user can't do this without subgroup membership
+ok (!$new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User can't modify the ticket without group membership");
+
+# Create a subgroup
+my $subgroup = RT::Group->new($RT::SystemUser);
+$subgroup->CreateUserDefinedGroup(Name => 'Subgrouptest');
+ok($subgroup->Id, "Created a new group ".$subgroup->Id."Ok");
+#Add the subgroup as a subgroup of the group
+my ($said, $samsg) =  $group->AddMember($subgroup->PrincipalId);
+ok ($said, "Added the subgroup as a member of the group");
+# Add the user to a subgroup of the group
+
+my ($usaid, $usamsg) =  $subgroup->AddMember($new_user->PrincipalId);
+ok($usaid,"Added the user ".$new_user->Id."to the subgroup");
+# Make sure the user does have the right to modify tickets in the queue
+ok ($new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User can modify the ticket with subgroup membership");
+
+#  {{{ Deal with making sure that members of subgroups of a disabled group don't have rights
+
+my ($id, $msg);
+ ($id, $msg) =  $group->SetDisabled(1);
+ ok ($id,$msg);
+ok (!$new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User can't modify the ticket when the group ".$group->Id. " is disabled");
+ ($id, $msg) =  $group->SetDisabled(0);
+ok($id,$msg);
+# Test what happens when we disable the group the user is a member of directly
+
+($id, $msg) =  $subgroup->SetDisabled(1);
+ ok ($id,$msg);
+ok (!$new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User can't modify the ticket when the group ".$subgroup->Id. " is disabled");
+ ($id, $msg) =  $subgroup->SetDisabled(0);
+ ok ($id,$msg);
+ok ($new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User can modify the ticket without group membership");
+
+# }}}
+
+
+my ($usrid, $usrmsg) =  $subgroup->DeleteMember($new_user->PrincipalId);
+ok($usrid,"removed the user from the group - $usrmsg");
+# Make sure the user doesn't have the right to modify tickets in the queue
+ok (!$new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User can't modify the ticket without group membership");
+
+#revoke the right to modify tickets in a queue
+ok(($gv,$gm) = $group->PrincipalObj->RevokeRight( Object => $q, Right => 'ModifyTicket'),"Granted the group the right to modify tickets");
+ok($gv,"revoke succeeed - $gm");
+
+# {{{ Test the user's right to modify a ticket as a _queue_ admincc for a right granted at the _queue_ level
+
+# Grant queue admin cc the right to modify ticket in the queue 
+ok(my ($qv,$qm) = $q_as_system->AdminCc->PrincipalObj->GrantRight( Object => $q_as_system, Right => 'ModifyTicket'),"Granted the queue adminccs the right to modify tickets");
+ok($qv, "Granted the right successfully - $qm");
+
+# Add the user as a queue admincc
+ok ((my $add_id, $add_msg) = $q_as_system->AddWatcher(Type => 'AdminCc', PrincipalId => $new_user->PrincipalId)  , "Added the new user as a queue admincc");
+ok ($add_id, "the user is now a queue admincc - $add_msg");
+
+# Make sure the user does have the right to modify tickets in the queue
+ok ($new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User can modify the ticket as an admincc");
+# Remove the user from the role  group
+ok ((my $del_id, $del_msg) = $q_as_system->DeleteWatcher(Type => 'AdminCc', PrincipalId => $new_user->PrincipalId)  , "Deleted the new user as a queue admincc");
+
+# Make sure the user doesn't have the right to modify tickets in the queue
+ok (!$new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User can't modify the ticket without group membership");
+
+# }}}
+
+# {{{ Test the user's right to modify a ticket as a _ticket_ admincc with the right granted at the _queue_ level
+
+# Add the user as a ticket admincc
+ok ((my $uadd_id, $uadd_msg) = $new_tick2->AddWatcher(Type => 'AdminCc', PrincipalId => $new_user->PrincipalId)  , "Added the new user as a queue admincc");
+ok ($add_id, "the user is now a queue admincc - $add_msg");
+
+# Make sure the user does have the right to modify tickets in the queue
+ok ($new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User can modify the ticket as an admincc");
+
+# Remove the user from the role  group
+ok ((my $del_id, $del_msg) = $new_tick2->DeleteWatcher(Type => 'AdminCc', PrincipalId => $new_user->PrincipalId)  , "Deleted the new user as a queue admincc");
+
+# Make sure the user doesn't have the right to modify tickets in the queue
+ok (!$new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User can't modify the ticket without group membership");
+
+
+# Revoke the right to modify ticket in the queue 
+ok(my ($rqv,$rqm) = $q_as_system->AdminCc->PrincipalObj->RevokeRight( Object => $q_as_system, Right => 'ModifyTicket'),"Revokeed the queue adminccs the right to modify tickets");
+ok($rqv, "Revoked the right successfully - $rqm");
+
+# }}}
+
+
+
+# {{{ Test the user's right to modify a ticket as a _queue_ admincc for a right granted at the _system_ level
+
+# Before we start Make sure the user does not have the right to modify tickets in the queue
+ok (!$new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User can not modify the ticket without it being granted");
+ok (!$new_user->HasRight( Object => $new_tick2->QueueObj, Right => 'ModifyTicket'), "User can not modify tickets in the queue without it being granted");
+
+# Grant queue admin cc the right to modify ticket in the queue 
+ok(my ($qv,$qm) = $q_as_system->AdminCc->PrincipalObj->GrantRight( Object => $RT::System, Right => 'ModifyTicket'),"Granted the queue adminccs the right to modify tickets");
+ok($qv, "Granted the right successfully - $qm");
+
+# Make sure the user can't modify the ticket before they're added as a watcher
+ok (!$new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User can not modify the ticket without being an admincc");
+ok (!$new_user->HasRight( Object => $new_tick2->QueueObj, Right => 'ModifyTicket'), "User can not modify tickets in the queue without being an admincc");
+
+# Add the user as a queue admincc
+ok ((my $add_id, $add_msg) = $q_as_system->AddWatcher(Type => 'AdminCc', PrincipalId => $new_user->PrincipalId)  , "Added the new user as a queue admincc");
+ok ($add_id, "the user is now a queue admincc - $add_msg");
+
+# Make sure the user does have the right to modify tickets in the queue
+ok ($new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User can modify the ticket as an admincc");
+ok ($new_user->HasRight( Object => $new_tick2->QueueObj, Right => 'ModifyTicket'), "User can modify tickets in the queue as an admincc");
+# Remove the user from the role  group
+ok ((my $del_id, $del_msg) = $q_as_system->DeleteWatcher(Type => 'AdminCc', PrincipalId => $new_user->PrincipalId)  , "Deleted the new user as a queue admincc");
+
+# Make sure the user doesn't have the right to modify tickets in the queue
+ok (!$new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User can't modify the ticket without group membership");
+ok (!$new_user->HasRight( Object => $new_tick2->QueueObj, Right => 'ModifyTicket'), "User can't modify tickets in the queue without group membership");
+
+# }}}
+
+# {{{ Test the user's right to modify a ticket as a _ticket_ admincc with the right granted at the _queue_ level
+
+ok (!$new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User can not modify the ticket without being an admincc");
+ok (!$new_user->HasRight( Object => $new_tick2->QueueObj, Right => 'ModifyTicket'), "User can not modify tickets in the queue obj without being an admincc");
+
+
+# Add the user as a ticket admincc
+ok ((my $uadd_id, $uadd_msg) = $new_tick2->AddWatcher(Type => 'AdminCc', PrincipalId => $new_user->PrincipalId)  , "Added the new user as a queue admincc");
+ok ($add_id, "the user is now a queue admincc - $add_msg");
+
+# Make sure the user does have the right to modify tickets in the queue
+ok ($new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User can modify the ticket as an admincc");
+ok (!$new_user->HasRight( Object => $new_tick2->QueueObj, Right => 'ModifyTicket'), "User can not modify tickets in the queue obj being only a ticket admincc");
+
+# Remove the user from the role  group
+ok ((my $del_id, $del_msg) = $new_tick2->DeleteWatcher(Type => 'AdminCc', PrincipalId => $new_user->PrincipalId)  , "Deleted the new user as a queue admincc");
+
+# Make sure the user doesn't have the right to modify tickets in the queue
+ok (!$new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User can't modify the ticket without being an admincc");
+ok (!$new_user->HasRight( Object => $new_tick2->QueueObj, Right => 'ModifyTicket'), "User can not modify tickets in the queue obj without being an admincc");
+
+
+# Revoke the right to modify ticket in the queue 
+ok(my ($rqv,$rqm) = $q_as_system->AdminCc->PrincipalObj->RevokeRight( Object => $RT::System, Right => 'ModifyTicket'),"Revokeed the queue adminccs the right to modify tickets");
+ok($rqv, "Revoked the right successfully - $rqm");
+
+# }}}
+
+
+
+
+# Grant "privileged users" the system right to create users
+# Create a privileged user.
+# have that user create another user
+# Revoke the right for privileged users to create users
+# have the privileged user try to create another user and fail the ACL check
+
+=end testing
+
+=cut
+
+# }}}
+
+
+# {{{ sub HasRight
+
+=head2 sub HasRight
+
+Shim around PrincipalObj->HasRight. See RT::Principal
+
+=cut
+
+sub HasRight {
+
+    my $self = shift;
+    return $self->PrincipalObj->HasRight(@_);
+}
+
+# }}}
+
+# {{{ sub CurrentUserCanModify
+
+=head2 CurrentUserCanModify RIGHT
+
+If the user has rights for this object, either because
+he has 'AdminUsers' or (if he\'s trying to edit himself and the right isn\'t an 
+admin right) 'ModifySelf', return 1. otherwise, return undef.
+
+=cut
+
+sub CurrentUserCanModify {
+    my $self  = shift;
+    my $right = shift;
+
+    if ( $self->CurrentUser->HasRight(Right => 'AdminUsers', Object => $RT::System) ) {
+        return (1);
+    }
+
+    #If the field is marked as an "administrators only" field, 
+    # don\'t let the user touch it.
+    elsif ( $self->_Accessible( $right, 'admin' ) ) {
+        return (undef);
+    }
+
+    #If the current user is trying to modify themselves
+    elsif ( ( $self->id == $self->CurrentUser->id )
+        and ( $self->CurrentUser->HasRight(Right => 'ModifySelf', Object => $RT::System) ) )
+    {
+        return (1);
+    }
+
+    #If we don\'t have a good reason to grant them rights to modify
+    # by now, they lose
+    else {
+        return (undef);
+    }
+
+}
+
+# }}}
+
+# {{{ sub CurrentUserHasRight
+
+=head2 CurrentUserHasRight
+  
+  Takes a single argument. returns 1 if $Self->CurrentUser
+  has the requested right. returns undef otherwise
+
+=cut
+
+sub CurrentUserHasRight {
+    my $self  = shift;
+    my $right = shift;
+
+    return ( $self->CurrentUser->HasRight(Right => $right, Object => $RT::System) );
+}
+
+# }}}
+
+# {{{ sub _Set
+
+sub _Set {
+    my $self = shift;
+
+    my %args = (
+        Field => undef,
+        Value => undef,
+        @_
+    );
+
+    # Nobody is allowed to futz with RT_System or Nobody 
+
+    if ( ($self->Id == $RT::SystemUser->Id )  || 
+         ($self->Id == $RT::Nobody->Id)) {
+        return ( 0, $self->loc("Can not modify system users") );
+    }
+    unless ( $self->CurrentUserCanModify( $args{'Field'} ) ) {
+        return ( 0, $self->loc("Permission Denied") );
+    }
+
+    #Set the new value
+    my ( $ret, $msg ) = $self->SUPER::_Set(
+        Field => $args{'Field'},
+        Value => $args{'Value'}
+    );
+
+    return ( $ret, $msg );
+}
+
+# }}}
+
+# {{{ sub _Value 
+
+=head2 _Value
+
+Takes the name of a table column.
+Returns its value as a string, if the user passes an ACL check
+
+=cut
+
+sub _Value {
+
+    my $self  = shift;
+    my $field = shift;
+
+    #If the current user doesn't have ACLs, don't let em at it.  
+
+    my @PublicFields = qw( Name EmailAddress Organization Disabled
+      RealName NickName Gecos ExternalAuthId
+      AuthSystem ExternalContactInfoId
+      ContactInfoSystem );
+
+    #if the field is public, return it.
+    if ( $self->_Accessible( $field, 'public' ) ) {
+        return ( $self->SUPER::_Value($field) );
+
+    }
+
+    #If the user wants to see their own values, let them
+    # TODO figure ouyt a better way to deal with this
+   elsif ( $self->CurrentUser->Id == $self->Id ) {
+        return ( $self->SUPER::_Value($field) );
+    }
+
+    #If the user has the admin users right, return the field
+    elsif ( $self->CurrentUser->HasRight(Right =>'AdminUsers', Object => $RT::System) ) {
+        return ( $self->SUPER::_Value($field) );
+    }
+    else {
+        return (undef);
+    }
+
+}
+
+# }}}
+
+
+1;
+
+
diff --git a/rt/lib/RT/Users.pm b/rt/lib/RT/Users.pm
index f4a97268c..d58f69653 100755
--- a/rt/lib/RT/Users.pm
+++ b/rt/lib/RT/Users.pm
@@ -1,281 +1,115 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Users.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-1999 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
 
 =head1 NAME
 
-  RT::Users - Collection of RT::User objects
-
+  RT::Users -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::Users;
-
+  use RT::Users
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
-=begin testing
-
-ok(require RT::TestHarness);
-ok(require RT::Users);
-
-=end testing
-
 =cut
 
 package RT::Users;
-use RT::EasySearch;
-@ISA = qw(RT::EasySearch);
-
-# {{{ sub _Init 
-sub _Init  {
-  my $self = shift;
-  $self->{'table'} = "Users";
-  $self->{'primary_key'} = "id";
-
-  # By default, order by name
-  $self->OrderBy( ALIAS => 'main',
-		  FIELD => 'Name',
-		  ORDER => 'ASC');
-
-  return ($self->SUPER::_Init(@_));
-  
-}
-# }}}
-
-# {{{ sub _DoSearch 
-
-=head2 _DoSearch
-
-  A subclass of DBIx::SearchBuilder::_DoSearch that makes sure that _Disabled rows never get seen unless
-we're explicitly trying to see them.
-
-=cut
-
-sub _DoSearch {
-    my $self = shift;
-    
-    #unless we really want to find disabled rows, make sure we\'re only finding enabled ones.
-    unless($self->{'find_disabled_rows'}) {
-	$self->LimitToEnabled();
-    }
-    
-    return($self->SUPER::_DoSearch(@_));
-    
-}
-
-# }}}
-
-# {{{ sub NewItem 
-
-sub NewItem  {
-  my $self = shift;
 
-  use RT::User;
-  my $item = new RT::User($self->CurrentUser);
-  return($item);
-}
-# }}}
-
-# {{{ LimitToEmail
-=head2 LimitToEmail
+use RT::SearchBuilder;
+use RT::User;
 
-Takes one argument. an email address. limits the returned set to
-that email address
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-=cut
 
-sub LimitToEmail {
+sub _Init {
     my $self = shift;
-    my $addr = shift;
-    $self->Limit(FIELD => 'EmailAddress', VALUE => "$addr");
-}
-
-# }}}
-
-# {{{ MemberOfGroup
-
-=head2 MemberOfGroup
-
-takes one argument, a group id number. Limits the returned set
-to members of a given group
-
-=cut
-
-sub MemberOfGroup {
-    my $self = shift;
-    my $group = shift;
-    
-    return ("No group specified") if (!defined $group);
-
-    my $groupalias = $self->NewAlias('GroupMembers');
-
-    $self->Join( ALIAS1 => 'main', FIELD1 => 'id', 
-		 ALIAS2 => "$groupalias", FIELD2 => 'Name');
-    
-    $self->Limit (ALIAS => "$groupalias",
-		  FIELD => 'GroupId',
-		  VALUE => "$group",
-		  OPERATOR => "="
-		 );
-}
-
-# }}}
-
-# {{{ LimitToPrivileged
-
-=head2 LimitToPrivileged
-
-Limits to users who can be made members of ACLs and groups
+    $self->{'table'} = 'Users';
+    $self->{'primary_key'} = 'id';
 
-=cut
 
-sub LimitToPrivileged {
-    my $self = shift;
-    $self->Limit( FIELD => 'Privileged',
-                  OPERATOR => '=',
-                  VALUE => '1');
+    return ( $self->SUPER::_Init(@_) );
 }
 
-# }}}
-
-
-
-# {{{ LimitToSystem
 
-=head2 LimitToSystem
+=item NewItem
 
-Limits to users who can be granted rights, but who should
-never have their rights modified by a user or be made members of groups.
+Returns an empty new RT::User item
 
 =cut
 
-sub LimitToSystem {
+sub NewItem {
     my $self = shift;
-    $self->Limit( FIELD => 'Privileged',
-                  OPERATOR => '=',
-                  VALUE => '2');
+    return(RT::User->new($self->CurrentUser));
 }
 
-# }}}
-
-# {{{ HasQueueRight
-
-=head2 HasQueueRight
-
-Takes a queue id as its first argument.  Queue Id "0" is treated by RT as "applies to all queues"
-Takes a specific right as an optional second argument
-
-Limits the returned set to users who have rights in the queue specified, personally.  If the optional second argument is supplied, limits to users who have been explicitly granted that right.
-
-
-
-This should not be used as an ACL check, but only for obtaining lists of
-users with explicit rights in a given queue.
-
-=cut
-
-sub HasQueueRight {
-    my $self = shift;
-    my $queue = shift;
-    my $right;
-    
-    $right = shift if (@_);
-
+        eval "require RT::Users_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Users_Overlay.pm}) {
+            die $@;
+        };
 
-    my $acl_alias  = $self->NewAlias('ACL');
-    $self->Join( ALIAS1 => 'main',  FIELD1 => 'id',
-		 ALIAS2 => $acl_alias, FIELD2 => 'PrincipalId');
-    $self->Limit (ALIAS => $acl_alias,
-		 FIELD => 'PrincipalType',
-		 OPERATOR => '=',
-		 VALUE => 'User');
+        eval "require RT::Users_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Users_Vendor.pm}) {
+            die $@;
+        };
 
+        eval "require RT::Users_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Users_Local.pm}) {
+            die $@;
+        };
 
-    $self->Limit(ALIAS => $acl_alias,
-		 FIELD => 'RightAppliesTo',
-		 OPERATOR => '=',
-		 VALUE => "$queue");
 
 
-    $self->Limit(ALIAS => $acl_alias,
-		 FIELD => 'RightScope',
-		 OPERATOR => '=',
-		 ENTRYAGGREGATOR => 'OR',
-		 VALUE => 'Queue');
 
+=head1 SEE ALSO
 
-    $self->Limit(ALIAS => $acl_alias,
-		 FIELD => 'RightScope',
-		 OPERATOR => '=',
-		 ENTRYAGGREGATOR => 'OR',
-		 VALUE => 'Ticket');
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-    #TODO: is this being initialized properly if the right isn't there?
-    if (defined ($right)) {
-	
-	$self->Limit(ALIAS => $acl_alias,
-		     FIELD => 'RightName',
-		     OPERATOR => '=',
-		     VALUE => "$right");
-	
-	
-       };
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
+   no warnings qw(redefine);
 
-}
-
-
-
-# }}}
-
-# {{{ HasSystemRight
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
-=head2 HasSystemRight
-
-Takes one optional argument:
-   The name of a System level right.
-
-Limits the returned set to users who have been granted system rights, personally.  If the optional argument is passed in, limits to users who have been granted the explicit right listed.   Please see the note attached to LimitToQueueRights
+RT::Users_Overlay, RT::Users_Vendor, RT::Users_Local
 
 =cut
 
-sub HasSystemRight {
-    my $self = shift;
-    my $right = shift if (@_);
-       my $acl_alias  = $self->NewAlias('ACL');
-
-
-    $self->Join( ALIAS1 => 'main',  FIELD1 => 'id',
-		 ALIAS2 => $acl_alias, FIELD2 => 'PrincipalId');
-    $self->Limit (ALIAS => $acl_alias,
-		 FIELD => 'PrincipalType',
-		 OPERATOR => '=',
-		 VALUE => 'User');
-
-    $self->Limit(ALIAS => $acl_alias,
-		 FIELD => 'RightScope',
-		 OPERATOR => '=',
-		 VALUE => 'System');
-
-
-    #TODO: is this being initialized properly if the right isn't there?
-    if (defined ($right)) {
-	$self->Limit(ALIAS => $acl_alias,
-		     FIELD => 'RightName',
-		     OPERATOR => '=',
-		     VALUE => "$right");
-	
-       }
-
-    
-}
-
-# }}}
 
 1;
-
diff --git a/rt/lib/RT/Users_Overlay.pm b/rt/lib/RT/Users_Overlay.pm
new file mode 100644
index 000000000..b397c3bc4
--- /dev/null
+++ b/rt/lib/RT/Users_Overlay.pm
@@ -0,0 +1,290 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2002 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org
+# 
+# This work 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.
+# 
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+=head1 NAME
+
+  RT::Users - Collection of RT::User objects
+
+=head1 SYNOPSIS
+
+  use RT::Users;
+
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=begin testing
+
+ok(require RT::Users);
+
+=end testing
+
+=cut
+
+use strict;
+no warnings qw(redefine);
+
+# {{{ sub _Init 
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'Users';
+        $self->{'primary_key'} = 'id';
+
+
+
+    my @result =          $self->SUPER::_Init(@_);
+    # By default, order by name
+    $self->OrderBy( ALIAS => 'main',
+                    FIELD => 'Name',
+                    ORDER => 'ASC' );
+
+    $self->{'princalias'} = $self->NewAlias('Principals');
+
+    $self->Join( ALIAS1 => 'main',
+                 FIELD1 => 'id',
+                 ALIAS2 => $self->{'princalias'},
+                 FIELD2 => 'id' );
+
+    $self->Limit( ALIAS    => $self->{'princalias'},
+                  FIELD    => 'PrincipalType',
+                  OPERATOR => '=',
+                  VALUE    => 'User' );
+    return (@result);
+}
+
+# }}}
+
+# {{{ sub _DoSearch 
+
+=head2 _DoSearch
+
+  A subclass of DBIx::SearchBuilder::_DoSearch that makes sure that _Disabled rows never get seen unless
+we're explicitly trying to see them.
+
+=cut
+
+sub _DoSearch {
+    my $self = shift;
+
+    #unless we really want to find disabled rows, make sure we\'re only finding enabled ones.
+    unless ( $self->{'find_disabled_rows'} ) {
+        $self->LimitToEnabled();
+    }
+    return ( $self->SUPER::_DoSearch(@_) );
+
+}
+
+# }}}
+# {{{ sub LimitToEnabled
+
+=head2 LimitToEnabled
+
+Only find items that haven\'t been disabled
+
+=cut
+
+sub LimitToEnabled {
+    my $self = shift;
+
+    $self->Limit( ALIAS    => $self->{'princalias'},
+                  FIELD    => 'Disabled',
+                  VALUE    => '0',
+                  OPERATOR => '=' );
+}
+
+# }}}
+
+# {{{ LimitToEmail
+
+=head2 LimitToEmail
+
+Takes one argument. an email address. limits the returned set to
+that email address
+
+=cut
+
+sub LimitToEmail {
+    my $self = shift;
+    my $addr = shift;
+    $self->Limit( FIELD => 'EmailAddress', VALUE => "$addr" );
+}
+
+# }}}
+
+# {{{ MemberOfGroup
+
+=head2 MemberOfGroup PRINCIPAL_ID
+
+takes one argument, a group's principal id. Limits the returned set
+to members of a given group
+
+=cut
+
+sub MemberOfGroup {
+    my $self  = shift;
+    my $group = shift;
+
+    return $self->loc("No group specified") if ( !defined $group );
+
+    my $groupalias = $self->NewAlias('CachedGroupMembers');
+
+    # Join the principal to the groups table
+    $self->Join( ALIAS1 => $self->{'princalias'},
+                 FIELD1 => 'id',
+                 ALIAS2 => $groupalias,
+                 FIELD2 => 'MemberId' );
+
+    $self->Limit( ALIAS    => "$groupalias",
+                  FIELD    => 'GroupId',
+                  VALUE    => "$group",
+                  OPERATOR => "=" );
+}
+
+# }}}
+
+# {{{ LimitToPrivileged
+
+=head2 LimitToPrivileged
+
+Limits to users who can be made members of ACLs and groups
+
+=cut
+
+sub LimitToPrivileged {
+    my $self = shift;
+
+    my $priv = RT::Group->new( $self->CurrentUser );
+    $priv->LoadSystemInternalGroup('Privileged');
+    unless ( $priv->Id ) {
+        $RT::Logger->crit("Couldn't find a privileged users group");
+    }
+    $self->MemberOfGroup( $priv->PrincipalId );
+}
+
+# }}}
+
+# {{{ WhoHaveRight
+
+=head2 WhoHaveRight { Right => 'name', Object => $rt_object , IncludeSuperusers => undef, IncludeSubgroupMembers => undef, IncludeSystemRights => undef }
+
+=begin testing
+
+ok(my $users = RT::Users->new($RT::SystemUser));
+$users->WhoHaveRight(Object =>$RT::System, Right =>'SuperUser');
+ok($users->Count == 1, "There is one privileged superuser - Found ". $users->Count );
+# TODO: this wants more testing
+
+
+=end testing
+
+
+find all users who the right Right for this group, either individually
+or as members of groups
+
+
+
+
+
+=cut
+
+sub WhoHaveRight {
+    my $self = shift;
+    my %args = ( Right                  => undef,
+                 Object =>              => undef,
+                 IncludeSystemRights    => undef,
+                 IncludeSuperusers      => undef,
+                 IncludeSubgroupMembers => 1,
+                 @_ );
+
+    if (defined $args{'ObjectType'} || defined $args{'ObjectId'}) {
+        $RT::Logger->crit("$self WhoHaveRight called with the Obsolete ObjectId/ObjectType API");
+        return(undef);
+    }
+        my @privgroups;
+        my $Groups = RT::Groups->new($RT::SystemUser);
+        $Groups->WithRight(Right=> $args{'Right'},
+                     Object => $args{'Object'},
+                     IncludeSystemRights => $args{'IncludeSystemRights'},
+                     IncludeSuperusers => $args{'IncludeSuperusers'});
+        while (my $Group = $Groups->Next()) {
+                push @privgroups, $Group->Id();
+        }
+
+        $self->WhoBelongToGroups(Groups => \@privgroups,
+                                 IncludeSubgroupMembers => $args{'IncludeSubgroupMembers'});
+}
+
+# }}}
+
+# {{{ WhoBelongToGroups 
+
+=head2 WhoBelongToGroups { Groups => ARRAYREF, IncludeSubgroupMembers => 1 }
+
+=cut
+
+sub WhoBelongToGroups {
+    my $self = shift;
+    my %args = ( Groups                 => undef,
+                 IncludeSubgroupMembers => 1,
+                 @_ );
+
+    # Unprivileged users can't be granted real system rights. 
+    # is this really the right thing to be saying?
+    $self->LimitToPrivileged();
+
+    my $userprinc  = $self->{'princalias'};
+    my $cgm;
+
+    # The cachedgroupmembers table is used for unrolling group memberships to allow fast lookups 
+    # if we bind to CachedGroupMembers, we'll find all members of groups recursively.
+    # if we don't we'll find only 'direct' members of the group in question
+
+    if ( $args{'IncludeSubgroupMembers'} ) {
+        $cgm = $self->NewAlias('CachedGroupMembers');
+    }
+    else {
+        $cgm = $self->NewAlias('GroupMembers');
+    }
+
+    # {{{ Tie the users we're returning ($userprinc) to the groups that have rights granted to them ($groupprinc)
+    $self->Join( ALIAS1 => $cgm, FIELD1 => 'MemberId',
+                 ALIAS2 => $userprinc, FIELD2 => 'id' );
+    # }}} 
+
+ #   my $and_check_groups = "($cgm.GroupId = NULL";
+    foreach my $groupid (@{$args{'Groups'}}) {
+        $self->Limit(ALIAS => $cgm, FIELD => 'GroupId', VALUE => $groupid, QUOTEVALUE => 0, ENTRYAGGREGATOR=> 'OR')
+
+        #$and_check_groups .= " OR $cgm.GroupId = $groupid";
+    }
+    #$and_check_groups .= ")";
+
+    #$self->_AddSubClause("WhichGroup", $and_check_groups);
+}
+# }}}
+
+
+1;
diff --git a/rt/lib/t/00smoke.t b/rt/lib/t/00smoke.t
new file mode 100644
index 000000000..4f36bb346
--- /dev/null
+++ b/rt/lib/t/00smoke.t
@@ -0,0 +1,14 @@
+#!/usr/bin/perl
+
+use Test::More qw(no_plan);
+
+use lib "/opt/rt3/lib";
+use RT;
+ok(RT::LoadConfig);
+ok(RT::Init, "Basic initialization and DB connectivity");
+
+use File::Find;
+File::Find::find({wanted => \&wanted}, '.');
+sub wanted { /^*\.pm\z/s && ok(require $_, "Requiring '$_'"); }
+
+
diff --git a/rt/lib/t/00smoke.t.in b/rt/lib/t/00smoke.t.in
new file mode 100644
index 000000000..11f0a9c43
--- /dev/null
+++ b/rt/lib/t/00smoke.t.in
@@ -0,0 +1,14 @@
+#!@PERL@
+
+use Test::More qw(no_plan);
+
+use lib "@RT_LIB_PATH@";
+use RT;
+ok(RT::LoadConfig);
+ok(RT::Init, "Basic initialization and DB connectivity");
+
+use File::Find;
+File::Find::find({wanted => \&wanted}, '.');
+sub wanted { /^*\.pm\z/s && ok(require $_, "Requiring '$_'"); }
+
+
diff --git a/rt/lib/t/01harness.t b/rt/lib/t/01harness.t
new file mode 100644
index 000000000..98c28d2ba
--- /dev/null
+++ b/rt/lib/t/01harness.t
@@ -0,0 +1,12 @@
+#!/usr/bin/perl
+
+use Test::More qw(no_plan);
+
+use lib "/opt/rt3/lib";
+use RT;
+ok(RT::LoadConfig);
+ok(RT::Init, "Basic initialization and DB connectivity");
+
+my $test = shift @ARGV;
+require $test;
+
diff --git a/rt/lib/t/01harness.t.in b/rt/lib/t/01harness.t.in
new file mode 100644
index 000000000..d132330c2
--- /dev/null
+++ b/rt/lib/t/01harness.t.in
@@ -0,0 +1,12 @@
+#!@PERL@
+
+use Test::More qw(no_plan);
+
+use lib "@RT_LIB_PATH@";
+use RT;
+ok(RT::LoadConfig);
+ok(RT::Init, "Basic initialization and DB connectivity");
+
+my $test = shift @ARGV;
+require $test;
+
diff --git a/rt/lib/t/02regression.t b/rt/lib/t/02regression.t
new file mode 100644
index 000000000..62b4e9a69
--- /dev/null
+++ b/rt/lib/t/02regression.t
@@ -0,0 +1,44 @@
+#!/usr/bin/perl
+
+use Test::More qw(no_plan);
+
+use lib "/opt/rt3/lib";
+use RT;
+ok(RT::LoadConfig);
+ok(RT::Init, "Basic initialization and DB connectivity");
+
+# Create a new queue
+use_ok(RT::Queue);
+my $q = RT::Queue->new($RT::SystemUser);
+
+$q->Load('regression');
+if ($q->id != 0) {
+        die "Regression tests not starting with a clean DB. Bailing";
+}
+
+my ($id, $msg) = $q->Create( Name => 'Regression',
+            Description => 'A regression test queue',
+            CorrespondAddress => 'correspond@a',
+            CommentAddress => 'comment@a');
+
+isnt($id, 0, "Queue was created sucessfully - $msg");
+
+my $q2 = RT::Queue->new($RT::SystemUser);
+
+ok($q2->Load($id));
+is($q2->id, $id, "Sucessfully loaded the queue again");
+is($q2->Name, 'Regression');
+is($q2->Description, 'A regression test queue');
+is($q2->CorrespondAddress, 'correspond@a');
+is($q2->CommentAddress, 'comment@a');
+
+
+use File::Find;
+File::Find::find({wanted => \&wanted_autogen}, 'lib/t/autogen');
+sub wanted_autogen { /^autogen.*\.t\z/s && require $_; }
+
+File::Find::find({wanted => \&wanted_regression}, 'lib/t/regression');
+sub wanted_regression { /^*\.t\z/s && require $_; }
+
+require "lib/t/03web.pl";
+require "lib/t/04_send_email.pl";
diff --git a/rt/lib/t/02regression.t.in b/rt/lib/t/02regression.t.in
new file mode 100644
index 000000000..51cd7e378
--- /dev/null
+++ b/rt/lib/t/02regression.t.in
@@ -0,0 +1,44 @@
+#!@PERL@
+
+use Test::More qw(no_plan);
+
+use lib "@RT_LIB_PATH@";
+use RT;
+ok(RT::LoadConfig);
+ok(RT::Init, "Basic initialization and DB connectivity");
+
+# Create a new queue
+use_ok(RT::Queue);
+my $q = RT::Queue->new($RT::SystemUser);
+
+$q->Load('regression');
+if ($q->id != 0) {
+        die "Regression tests not starting with a clean DB. Bailing";
+}
+
+my ($id, $msg) = $q->Create( Name => 'Regression',
+            Description => 'A regression test queue',
+            CorrespondAddress => 'correspond@a',
+            CommentAddress => 'comment@a');
+
+isnt($id, 0, "Queue was created sucessfully - $msg");
+
+my $q2 = RT::Queue->new($RT::SystemUser);
+
+ok($q2->Load($id));
+is($q2->id, $id, "Sucessfully loaded the queue again");
+is($q2->Name, 'Regression');
+is($q2->Description, 'A regression test queue');
+is($q2->CorrespondAddress, 'correspond@a');
+is($q2->CommentAddress, 'comment@a');
+
+
+use File::Find;
+File::Find::find({wanted => \&wanted_autogen}, 'lib/t/autogen');
+sub wanted_autogen { /^autogen.*\.t\z/s && require $_; }
+
+File::Find::find({wanted => \&wanted_regression}, 'lib/t/regression');
+sub wanted_regression { /^*\.t\z/s && require $_; }
+
+require "lib/t/03web.pl";
+require "lib/t/04_send_email.pl";
diff --git a/rt/lib/t/03web.pl b/rt/lib/t/03web.pl
new file mode 100644
index 000000000..4500ff281
--- /dev/null
+++ b/rt/lib/t/03web.pl
@@ -0,0 +1,62 @@
+#!/usr/bin/perl
+
+use strict;
+use WWW::Mechanize;
+use HTTP::Request::Common;
+use HTTP::Cookies;
+use LWP;
+
+my $cookie_jar = HTTP::Cookies->new;
+my $agent = WWW::Mechanize->new();
+
+# give the agent a place to stash the cookies
+
+$agent->cookie_jar($cookie_jar);
+
+
+# get the top page
+my $url = "http://localhost/";
+$agent->get($url);
+
+is ($agent->{'status'}, 200, "Loaded a page");
+
+
+# {{{ test a login
+
+# follow the link marked "Login"
+
+ok($agent->{form}->find_input('user'));
+
+ok($agent->{form}->find_input('pass'));
+ok ($agent->{'content'} =~ /username:/i);
+$agent->field( 'user' => 'root' );
+$agent->field( 'pass' => 'password' );
+# the field isn't named, so we have to click link 0
+$agent->click(0);
+is($agent->{'status'}, 200, "Fetched the page ok");
+ok( $agent->{'content'} =~ /Logout/i, "Found a logout link");
+
+
+use File::Find;
+find ( \&wanted , 'html/');
+
+sub wanted {
+        -f  && /\.html$/ && $_ !~ /Logout.html$/  && test_get($File::Find::name);
+}       
+
+sub test_get {
+        my $file = shift;
+
+
+        $file =~ s#^html/##; 
+        ok ($agent->get("$url/$file", "GET $url/$file"));
+        is ($agent->{'status'}, 200, "Loaded $file");
+        ok( $agent->{'content'} =~ /Logout/i, "Found a logout link on $file ");
+        ok( $agent->{'content'} !~ /Not logged in/i, "Still logged in for  $file");
+        ok( $agent->{'content'} !~ /System error/i, "Didn't get a Mason compilation error on $file");
+        
+}
+
+# }}}
+
+1;
diff --git a/rt/lib/t/03web.pl.in b/rt/lib/t/03web.pl.in
new file mode 100644
index 000000000..abe446eeb
--- /dev/null
+++ b/rt/lib/t/03web.pl.in
@@ -0,0 +1,62 @@
+#!@PERL@
+
+use strict;
+use WWW::Mechanize;
+use HTTP::Request::Common;
+use HTTP::Cookies;
+use LWP;
+
+my $cookie_jar = HTTP::Cookies->new;
+my $agent = WWW::Mechanize->new();
+
+# give the agent a place to stash the cookies
+
+$agent->cookie_jar($cookie_jar);
+
+
+# get the top page
+my $url = "http://localhost/";
+$agent->get($url);
+
+is ($agent->{'status'}, 200, "Loaded a page");
+
+
+# {{{ test a login
+
+# follow the link marked "Login"
+
+ok($agent->{form}->find_input('user'));
+
+ok($agent->{form}->find_input('pass'));
+ok ($agent->{'content'} =~ /username:/i);
+$agent->field( 'user' => 'root' );
+$agent->field( 'pass' => 'password' );
+# the field isn't named, so we have to click link 0
+$agent->click(0);
+is($agent->{'status'}, 200, "Fetched the page ok");
+ok( $agent->{'content'} =~ /Logout/i, "Found a logout link");
+
+
+use File::Find;
+find ( \&wanted , 'html/');
+
+sub wanted {
+        -f  && /\.html$/ && $_ !~ /Logout.html$/  && test_get($File::Find::name);
+}       
+
+sub test_get {
+        my $file = shift;
+
+
+        $file =~ s#^html/##; 
+        ok ($agent->get("$url/$file", "GET $url/$file"));
+        is ($agent->{'status'}, 200, "Loaded $file");
+        ok( $agent->{'content'} =~ /Logout/i, "Found a logout link on $file ");
+        ok( $agent->{'content'} !~ /Not logged in/i, "Still logged in for  $file");
+        ok( $agent->{'content'} !~ /System error/i, "Didn't get a Mason compilation error on $file");
+        
+}
+
+# }}}
+
+1;
diff --git a/rt/lib/t/04_send_email.pl b/rt/lib/t/04_send_email.pl
new file mode 100644
index 000000000..46e3d7472
--- /dev/null
+++ b/rt/lib/t/04_send_email.pl
@@ -0,0 +1,389 @@
+#!/usr/bin/perl -w
+
+use strict;
+use RT::EmailParser;
+use RT::Tickets;
+use RT::Action::SendEmail;
+
+my @_outgoing_messages;
+my @scrips_fired;
+
+#We're not testing acls here.
+my $everyone = RT::Group->new($RT::SystemUser);
+$everyone->LoadSystemInternalGroup('Everyone');
+$everyone->PrincipalObj->GrantRight(Right =>'SuperUser');
+
+
+is (__PACKAGE__, 'main', "We're operating in the main package");
+
+
+{
+no warnings qw/redefine/;
+sub RT::Action::SendEmail::SendMessage {
+        my $self = shift;
+        my $MIME = shift;
+
+        main::_fired_scrip($self->ScripObj);
+        main::ok(ref($MIME) eq 'MIME::Entity', "hey, look. it's a mime entity");
+}
+
+}
+
+# instrument SendEmail to pass us what it's about to send.
+# create a regular ticket
+
+my $parser = RT::EmailParser->new();
+$parser->ParseMIMEEntityFromScalar('From: root@localhost
+To: rt@example.com
+Subject: This is a test of new ticket creation as an unknown user
+
+Blah!
+Foob!');
+
+                                  
+use Data::Dumper;
+
+my $ticket = RT::Ticket->new($RT::SystemUser);
+my ($id,  $tid, $msg ) = $ticket->Create(Requestor => ['root@localhost'], Queue => 'general', Subject => 'I18NTest', MIMEObj => $parser->Entity);
+ok ($id,$msg);
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+ok ($tick->Subject eq 'I18NTest', "failed to create the new ticket from an unprivileged account");
+
+# make sure it fires scrips.
+is ($#scrips_fired, 1, "Fired 2 scrips on ticket creation");
+# make sure it sends an autoreply
+# make sure it sends a notification to adminccs
+
+
+# we need to swap out SendMessage to test the new things we care about;
+&utf8_redef_sendmessage;
+
+# create an iso 8859-1 ticket
+@scrips_fired = ();
+
+my $content =  `cat ./lib/t/data/new-ticket-from-iso-8859-1` || die "couldn't find new content";
+
+
+
+$parser->ParseMIMEEntityFromScalar($content);
+
+
+# be as much like the mail gateway as possible.
+use RT::Interface::Email;
+                                  
+ RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+
+ok ($tick->Transactions->First->Content =~ /H\x{e5}vard/, "It's signed by havard. yay");
+
+
+# make sure it fires scrips.
+is ($#scrips_fired, 1, "Fired 2 scrips on ticket creation");
+# make sure it sends an autoreply
+
+
+# make sure it sends a notification to adminccs
+
+# If we correspond, does it do the right thing to the outbound messages?
+
+$parser->ParseMIMEEntityFromScalar($content);
+my ($id, $msg) = $tick->Comment(MIMEObj => $parser->Entity);
+ok ($id, $msg);
+
+$parser->ParseMIMEEntityFromScalar($content);
+($id, $msg) = $tick->Correspond(MIMEObj => $parser->Entity);
+ok ($id, $msg);
+
+
+# we need to swap out SendMessage to test the new things we care about;
+&iso8859_redef_sendmessage;
+$RT::EmailOutputEncoding = 'iso-8859-1';
+# create an iso 8859-1 ticket
+@scrips_fired = ();
+
+my $content =  `cat ./lib/t/data/new-ticket-from-iso-8859-1` || die "couldn't find new content";
+# be as much like the mail gateway as possible.
+use RT::Interface::Email;
+                                  
+ RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+
+ok ($tick->Transactions->First->Content =~ /H\x{e5}vard/, "It's signed by havard. yay");
+
+
+# make sure it fires scrips.
+is ($#scrips_fired, 1, "Fired 2 scrips on ticket creation");
+# make sure it sends an autoreply
+
+
+# make sure it sends a notification to adminccs
+
+
+# If we correspond, does it do the right thing to the outbound messages?
+
+$parser->ParseMIMEEntityFromScalar($content);
+my ($id, $msg) = $tick->Comment(MIMEObj => $parser->Entity);
+ok ($id, $msg);
+
+$parser->ParseMIMEEntityFromScalar($content);
+($id, $msg) = $tick->Correspond(MIMEObj => $parser->Entity);
+ok ($id, $msg);
+
+
+sub _fired_scrip {
+        my $scrip = shift;
+        push @scrips_fired, $scrip;
+}       
+
+sub utf8_redef_sendmessage {
+    no warnings qw/redefine/;
+    eval ' 
+    sub RT::Action::SendEmail::SendMessage {
+        my $self = shift;
+        my $MIME = shift;
+
+        my $scrip = $self->ScripObj->id;
+        ok(1, $self->ScripObj->ConditionObj->Name . " ".$self->ScripObj->ActionObj->Name);
+        main::_fired_scrip($self->ScripObj);
+        $MIME->make_singlepart;
+        main::ok( ref($MIME) eq \'MIME::Entity\',
+                  "hey, look. it\'s a mime entity" );
+        main::ok( ref( $MIME->head ) eq \'MIME::Head\',
+                  "its mime header is a mime header. yay" );
+        main::ok( $MIME->head->get(\'Content-Type\') =~ /utf-8/,
+                  "Its content type is utf-8" );
+        my $message_as_string = $MIME->bodyhandle->as_string();
+        use Encode;
+        $message_as_string = Encode::decode_utf8($message_as_string);
+        main::ok(
+            $message_as_string =~ /H\x{e5}vard/,
+"The message\'s content contains havard\'s name. this will fail if it\'s not utf8 out");
+
+    }';
+}
+
+sub iso8859_redef_sendmessage {
+    no warnings qw/redefine/;
+    eval ' 
+    sub RT::Action::SendEmail::SendMessage {
+        my $self = shift;
+        my $MIME = shift;
+
+        my $scrip = $self->ScripObj->id;
+        ok(1, $self->ScripObj->ConditionObj->Name . " ".$self->ScripObj->ActionObj->Name);
+        main::_fired_scrip($self->ScripObj);
+        $MIME->make_singlepart;
+        main::ok( ref($MIME) eq \'MIME::Entity\',
+                  "hey, look. it\'s a mime entity" );
+        main::ok( ref( $MIME->head ) eq \'MIME::Head\',
+                  "its mime header is a mime header. yay" );
+        main::ok( $MIME->head->get(\'Content-Type\') =~ /iso-8859-1/,
+                  "Its content type is iso-8859-1 - " . $MIME->head->get("Content-Type") );
+        my $message_as_string = $MIME->bodyhandle->as_string();
+        use Encode;
+        $message_as_string = Encode::decode("iso-8859-1",$message_as_string);
+        main::ok(
+            $message_as_string =~ /H\x{e5}vard/, "The message\'s content contains havard\'s name. this will fail if it\'s not utf8 out");
+
+    }';
+}
+
+# {{{ test a multipart alternative containing a text-html part with an umlaut
+
+my $content =  `cat ./lib/t/data/multipart-alternative-with-umlaut` || die "couldn't find new content";
+
+$parser->ParseMIMEEntityFromScalar($content);
+
+
+# be as much like the mail gateway as possible.
+&umlauts_redef_sendmessage;
+
+RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+
+ok ($tick->Transactions->First->Content =~ /causes Error/, "We recorded the content right as text-plain");
+is ($tick->Transactions->First->Attachments->Count , 3 , "Has three attachments, presumably a text-plain, a text-html and a multipart alternative");
+
+sub umlauts_redef_sendmessage {
+    no warnings qw/redefine/;
+    eval 'sub RT::Action::SendEmail::SendMessage { }';
+}
+
+# }}}
+
+# {{{ test a text-html message with an umlaut
+
+my $content =  `cat ./lib/t/data/text-html-with-umlaut` || die "couldn't find new content";
+
+$parser->ParseMIMEEntityFromScalar($content);
+
+
+# be as much like the mail gateway as possible.
+&text_html_umlauts_redef_sendmessage;
+
+RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+
+ok ($tick->Transactions->First->Attachments->First->Content =~ /causes Error/, "We recorded the content as containing 'causes error'");
+ok ($tick->Transactions->First->Attachments->First->ContentType =~ /text\/html/, "We recorded the content as text/html");
+ok ($tick->Transactions->First->Attachments->Count ==1 , "Has one attachment, presumably a text-html and a multipart alternative");
+
+sub text_html_umlauts_redef_sendmessage {
+    no warnings qw/redefine/;
+    eval 'sub RT::Action::SendEmail::SendMessage { 
+                my $self = shift; 
+                my $MIME = shift; 
+                use Data::Dumper;
+                return (1) unless ($self->ScripObj->ScripActionObj->Name eq "Notify AdminCcs" );
+                ok (is $MIME->parts, 2, "generated correspondence mime entityis composed of three parts");
+                is ($MIME->head->mime_type , "multipart/mixed", "The first part is a multipart mixed". $MIME->head->mime_type);
+                is ($MIME->parts(0)->head->mime_type , "text/plain", "The second part is a plain");
+                is ($MIME->parts(1)->head->mime_type , "text/html", "The third part is an html ");
+                 }';
+}
+
+# }}}
+
+# {{{ test a text-html message with russian characters
+
+my $content =  `cat ./lib/t/data/text-html-in-russian` || die "couldn't find new content";
+
+$parser->ParseMIMEEntityFromScalar($content);
+
+
+# be as much like the mail gateway as possible.
+&text_html_russian_redef_sendmessage;
+
+RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+
+ok ($tick->Transactions->First->Attachments->First->ContentType =~ /text\/html/, "We recorded the content right as text-html");
+ok ($tick->Transactions->First->Attachments->Count ==1 , "Has one attachment, presumably a text-html and a multipart alternative");
+
+sub text_html_russian_redef_sendmessage {
+    no warnings qw/redefine/;
+    eval 'sub RT::Action::SendEmail::SendMessage { 
+                my $self = shift; 
+                my $MIME = shift; 
+                use Data::Dumper;
+                return (1) unless ($self->ScripObj->ScripActionObj->Name eq "Notify AdminCcs" );
+                ok (is $MIME->parts, 2, "generated correspondence mime entityis composed of three parts");
+                is ($MIME->head->mime_type , "multipart/mixed", "The first part is a multipart mixed". $MIME->head->mime_type);
+                is ($MIME->parts(0)->head->mime_type , "text/plain", "The second part is a plain");
+                is ($MIME->parts(1)->head->mime_type , "text/html", "The third part is an html ");
+                my $content_1251;
+                $content_1251 = $MIME->parts(1)->bodyhandle->as_string();
+                ok ($content_1251 =~ qr{Ó÷eáíûé Öeíòp "ÊÀÄÐÛ ÄÅËÎÂÎÃÎ ÌÈÐÀ" ïpèãëaøaeò ía òpeíèíã:},
+"Content matches drugim in codepage 1251" );
+                 }';
+}
+
+# }}}
+
+# {{{ test a message containing a russian subject and NO content type
+
+unshift (@RT::EmailInputEncodings, 'koi8-r');
+$RT::EmailOutputEncoding = 'koi8-r';
+my $content =  `cat ./lib/t/data/russian-subject-no-content-type` || die "couldn't find new content";
+
+$parser->ParseMIMEEntityFromScalar($content);
+
+
+# be as much like the mail gateway as possible.
+&text_plain_russian_redef_sendmessage;
+RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+
+ok ($tick->Transactions->First->Attachments->First->ContentType =~ /text\/plain/, "We recorded the content type right");
+ok ($tick->Transactions->First->Attachments->Count ==1 , "Has one attachment, presumably a text-plain");
+is ($tick->Subject, "\x{442}\x{435}\x{441}\x{442} \x{442}\x{435}\x{441}\x{442}", "Recorded the subject right");
+sub text_plain_russian_redef_sendmessage {
+    no warnings qw/redefine/;
+    eval 'sub RT::Action::SendEmail::SendMessage { 
+                my $self = shift; 
+                my $MIME = shift; 
+                return (1) unless ($self->ScripObj->ScripActionObj->Name eq "Notify AdminCcs" );
+                is ($MIME->head->mime_type , "text/plain", "The only part is text/plain ");
+                 my $subject  = $MIME->head->get("subject");
+                chomp($subject);
+                #is( $subject ,      /^=\?KOI8-R\?B\?W2V4YW1wbGUuY39tICM3XSDUxdPUINTF09Q=\?=/ , "The $subject is encoded correctly");
+		};
+                 ';
+}
+
+shift @RT::EmailInputEncodings;
+$RT::EmailOutputEncoding = 'utf-8';
+# }}}
+
+
+# {{{ test a message containing a nested RFC 822 message
+
+my $content =  `cat ./lib/t/data/nested-rfc-822` || die "couldn't find new content";
+ok ($content, "Loaded nested-rfc-822 to test");
+
+$parser->ParseMIMEEntityFromScalar($content);
+
+
+# be as much like the mail gateway as possible.
+&text_plain_nested_redef_sendmessage;
+RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+is ($tick->Subject, "[Jonas Liljegren] Re: [Para] Niv\x{e5}er?");
+ok ($tick->Transactions->First->Attachments->First->ContentType =~ /multipart\/mixed/, "We recorded the content type right");
+is ($tick->Transactions->First->Attachments->Count , 5 , "Has one attachment, presumably a text-plain and a message RFC 822 and another plain");
+sub text_plain_nested_redef_sendmessage {
+    no warnings qw/redefine/;
+    eval 'sub RT::Action::SendEmail::SendMessage { 
+                my $self = shift; 
+                my $MIME = shift; 
+                return (1) unless ($self->ScripObj->ScripActionObj->Name eq "Notify AdminCcs" );
+                is ($MIME->head->mime_type , "multipart/mixed", "It is a mixed multipart");
+                 my $subject  =  $MIME->head->get("subject");
+                 $subject  = MIME::Base64::decode_base64( $subject);
+                chomp($subject);
+		# TODO, why does this test fail
+                #ok($subject =~ qr{Niv\x{e5}er}, "The subject matches the word - $subject");
+		1;
+                 }';
+}
+
+# }}}
+
+
+
+
+# Don't taint the environment
+$everyone->PrincipalObj->RevokeRight(Right =>'SuperUser');
+1;
diff --git a/rt/lib/t/04_send_email.pl.in b/rt/lib/t/04_send_email.pl.in
new file mode 100644
index 000000000..e171cdc9b
--- /dev/null
+++ b/rt/lib/t/04_send_email.pl.in
@@ -0,0 +1,389 @@
+#!@PERL@ -w
+
+use strict;
+use RT::EmailParser;
+use RT::Tickets;
+use RT::Action::SendEmail;
+
+my @_outgoing_messages;
+my @scrips_fired;
+
+#We're not testing acls here.
+my $everyone = RT::Group->new($RT::SystemUser);
+$everyone->LoadSystemInternalGroup('Everyone');
+$everyone->PrincipalObj->GrantRight(Right =>'SuperUser');
+
+
+is (__PACKAGE__, 'main', "We're operating in the main package");
+
+
+{
+no warnings qw/redefine/;
+sub RT::Action::SendEmail::SendMessage {
+        my $self = shift;
+        my $MIME = shift;
+
+        main::_fired_scrip($self->ScripObj);
+        main::ok(ref($MIME) eq 'MIME::Entity', "hey, look. it's a mime entity");
+}
+
+}
+
+# instrument SendEmail to pass us what it's about to send.
+# create a regular ticket
+
+my $parser = RT::EmailParser->new();
+$parser->ParseMIMEEntityFromScalar('From: root@localhost
+To: rt@example.com
+Subject: This is a test of new ticket creation as an unknown user
+
+Blah!
+Foob!');
+
+                                  
+use Data::Dumper;
+
+my $ticket = RT::Ticket->new($RT::SystemUser);
+my ($id,  $tid, $msg ) = $ticket->Create(Requestor => ['root@localhost'], Queue => 'general', Subject => 'I18NTest', MIMEObj => $parser->Entity);
+ok ($id,$msg);
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+ok ($tick->Subject eq 'I18NTest', "failed to create the new ticket from an unprivileged account");
+
+# make sure it fires scrips.
+is ($#scrips_fired, 1, "Fired 2 scrips on ticket creation");
+# make sure it sends an autoreply
+# make sure it sends a notification to adminccs
+
+
+# we need to swap out SendMessage to test the new things we care about;
+&utf8_redef_sendmessage;
+
+# create an iso 8859-1 ticket
+@scrips_fired = ();
+
+my $content =  `cat ./lib/t/data/new-ticket-from-iso-8859-1` || die "couldn't find new content";
+
+
+
+$parser->ParseMIMEEntityFromScalar($content);
+
+
+# be as much like the mail gateway as possible.
+use RT::Interface::Email;
+                                  
+ RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+
+ok ($tick->Transactions->First->Content =~ /H\x{e5}vard/, "It's signed by havard. yay");
+
+
+# make sure it fires scrips.
+is ($#scrips_fired, 1, "Fired 2 scrips on ticket creation");
+# make sure it sends an autoreply
+
+
+# make sure it sends a notification to adminccs
+
+# If we correspond, does it do the right thing to the outbound messages?
+
+$parser->ParseMIMEEntityFromScalar($content);
+my ($id, $msg) = $tick->Comment(MIMEObj => $parser->Entity);
+ok ($id, $msg);
+
+$parser->ParseMIMEEntityFromScalar($content);
+($id, $msg) = $tick->Correspond(MIMEObj => $parser->Entity);
+ok ($id, $msg);
+
+
+# we need to swap out SendMessage to test the new things we care about;
+&iso8859_redef_sendmessage;
+$RT::EmailOutputEncoding = 'iso-8859-1';
+# create an iso 8859-1 ticket
+@scrips_fired = ();
+
+my $content =  `cat ./lib/t/data/new-ticket-from-iso-8859-1` || die "couldn't find new content";
+# be as much like the mail gateway as possible.
+use RT::Interface::Email;
+                                  
+ RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+
+ok ($tick->Transactions->First->Content =~ /H\x{e5}vard/, "It's signed by havard. yay");
+
+
+# make sure it fires scrips.
+is ($#scrips_fired, 1, "Fired 2 scrips on ticket creation");
+# make sure it sends an autoreply
+
+
+# make sure it sends a notification to adminccs
+
+
+# If we correspond, does it do the right thing to the outbound messages?
+
+$parser->ParseMIMEEntityFromScalar($content);
+my ($id, $msg) = $tick->Comment(MIMEObj => $parser->Entity);
+ok ($id, $msg);
+
+$parser->ParseMIMEEntityFromScalar($content);
+($id, $msg) = $tick->Correspond(MIMEObj => $parser->Entity);
+ok ($id, $msg);
+
+
+sub _fired_scrip {
+        my $scrip = shift;
+        push @scrips_fired, $scrip;
+}       
+
+sub utf8_redef_sendmessage {
+    no warnings qw/redefine/;
+    eval ' 
+    sub RT::Action::SendEmail::SendMessage {
+        my $self = shift;
+        my $MIME = shift;
+
+        my $scrip = $self->ScripObj->id;
+        ok(1, $self->ScripObj->ConditionObj->Name . " ".$self->ScripObj->ActionObj->Name);
+        main::_fired_scrip($self->ScripObj);
+        $MIME->make_singlepart;
+        main::ok( ref($MIME) eq \'MIME::Entity\',
+                  "hey, look. it\'s a mime entity" );
+        main::ok( ref( $MIME->head ) eq \'MIME::Head\',
+                  "its mime header is a mime header. yay" );
+        main::ok( $MIME->head->get(\'Content-Type\') =~ /utf-8/,
+                  "Its content type is utf-8" );
+        my $message_as_string = $MIME->bodyhandle->as_string();
+        use Encode;
+        $message_as_string = Encode::decode_utf8($message_as_string);
+        main::ok(
+            $message_as_string =~ /H\x{e5}vard/,
+"The message\'s content contains havard\'s name. this will fail if it\'s not utf8 out");
+
+    }';
+}
+
+sub iso8859_redef_sendmessage {
+    no warnings qw/redefine/;
+    eval ' 
+    sub RT::Action::SendEmail::SendMessage {
+        my $self = shift;
+        my $MIME = shift;
+
+        my $scrip = $self->ScripObj->id;
+        ok(1, $self->ScripObj->ConditionObj->Name . " ".$self->ScripObj->ActionObj->Name);
+        main::_fired_scrip($self->ScripObj);
+        $MIME->make_singlepart;
+        main::ok( ref($MIME) eq \'MIME::Entity\',
+                  "hey, look. it\'s a mime entity" );
+        main::ok( ref( $MIME->head ) eq \'MIME::Head\',
+                  "its mime header is a mime header. yay" );
+        main::ok( $MIME->head->get(\'Content-Type\') =~ /iso-8859-1/,
+                  "Its content type is iso-8859-1 - " . $MIME->head->get("Content-Type") );
+        my $message_as_string = $MIME->bodyhandle->as_string();
+        use Encode;
+        $message_as_string = Encode::decode("iso-8859-1",$message_as_string);
+        main::ok(
+            $message_as_string =~ /H\x{e5}vard/, "The message\'s content contains havard\'s name. this will fail if it\'s not utf8 out");
+
+    }';
+}
+
+# {{{ test a multipart alternative containing a text-html part with an umlaut
+
+my $content =  `cat ./lib/t/data/multipart-alternative-with-umlaut` || die "couldn't find new content";
+
+$parser->ParseMIMEEntityFromScalar($content);
+
+
+# be as much like the mail gateway as possible.
+&umlauts_redef_sendmessage;
+
+RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+
+ok ($tick->Transactions->First->Content =~ /causes Error/, "We recorded the content right as text-plain");
+is ($tick->Transactions->First->Attachments->Count , 3 , "Has three attachments, presumably a text-plain, a text-html and a multipart alternative");
+
+sub umlauts_redef_sendmessage {
+    no warnings qw/redefine/;
+    eval 'sub RT::Action::SendEmail::SendMessage { }';
+}
+
+# }}}
+
+# {{{ test a text-html message with an umlaut
+
+my $content =  `cat ./lib/t/data/text-html-with-umlaut` || die "couldn't find new content";
+
+$parser->ParseMIMEEntityFromScalar($content);
+
+
+# be as much like the mail gateway as possible.
+&text_html_umlauts_redef_sendmessage;
+
+RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+
+ok ($tick->Transactions->First->Attachments->First->Content =~ /causes Error/, "We recorded the content as containing 'causes error'");
+ok ($tick->Transactions->First->Attachments->First->ContentType =~ /text\/html/, "We recorded the content as text/html");
+ok ($tick->Transactions->First->Attachments->Count ==1 , "Has one attachment, presumably a text-html and a multipart alternative");
+
+sub text_html_umlauts_redef_sendmessage {
+    no warnings qw/redefine/;
+    eval 'sub RT::Action::SendEmail::SendMessage { 
+                my $self = shift; 
+                my $MIME = shift; 
+                use Data::Dumper;
+                return (1) unless ($self->ScripObj->ScripActionObj->Name eq "Notify AdminCcs" );
+                ok (is $MIME->parts, 2, "generated correspondence mime entityis composed of three parts");
+                is ($MIME->head->mime_type , "multipart/mixed", "The first part is a multipart mixed". $MIME->head->mime_type);
+                is ($MIME->parts(0)->head->mime_type , "text/plain", "The second part is a plain");
+                is ($MIME->parts(1)->head->mime_type , "text/html", "The third part is an html ");
+                 }';
+}
+
+# }}}
+
+# {{{ test a text-html message with russian characters
+
+my $content =  `cat ./lib/t/data/text-html-in-russian` || die "couldn't find new content";
+
+$parser->ParseMIMEEntityFromScalar($content);
+
+
+# be as much like the mail gateway as possible.
+&text_html_russian_redef_sendmessage;
+
+RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+
+ok ($tick->Transactions->First->Attachments->First->ContentType =~ /text\/html/, "We recorded the content right as text-html");
+ok ($tick->Transactions->First->Attachments->Count ==1 , "Has one attachment, presumably a text-html and a multipart alternative");
+
+sub text_html_russian_redef_sendmessage {
+    no warnings qw/redefine/;
+    eval 'sub RT::Action::SendEmail::SendMessage { 
+                my $self = shift; 
+                my $MIME = shift; 
+                use Data::Dumper;
+                return (1) unless ($self->ScripObj->ScripActionObj->Name eq "Notify AdminCcs" );
+                ok (is $MIME->parts, 2, "generated correspondence mime entityis composed of three parts");
+                is ($MIME->head->mime_type , "multipart/mixed", "The first part is a multipart mixed". $MIME->head->mime_type);
+                is ($MIME->parts(0)->head->mime_type , "text/plain", "The second part is a plain");
+                is ($MIME->parts(1)->head->mime_type , "text/html", "The third part is an html ");
+                my $content_1251;
+                $content_1251 = $MIME->parts(1)->bodyhandle->as_string();
+                ok ($content_1251 =~ qr{Ó÷eáíûé Öeíòp "ÊÀÄÐÛ ÄÅËÎÂÎÃÎ ÌÈÐÀ" ïpèãëaøaeò ía òpeíèíã:},
+"Content matches drugim in codepage 1251" );
+                 }';
+}
+
+# }}}
+
+# {{{ test a message containing a russian subject and NO content type
+
+unshift (@RT::EmailInputEncodings, 'koi8-r');
+$RT::EmailOutputEncoding = 'koi8-r';
+my $content =  `cat ./lib/t/data/russian-subject-no-content-type` || die "couldn't find new content";
+
+$parser->ParseMIMEEntityFromScalar($content);
+
+
+# be as much like the mail gateway as possible.
+&text_plain_russian_redef_sendmessage;
+RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+
+ok ($tick->Transactions->First->Attachments->First->ContentType =~ /text\/plain/, "We recorded the content type right");
+ok ($tick->Transactions->First->Attachments->Count ==1 , "Has one attachment, presumably a text-plain");
+is ($tick->Subject, "\x{442}\x{435}\x{441}\x{442} \x{442}\x{435}\x{441}\x{442}", "Recorded the subject right");
+sub text_plain_russian_redef_sendmessage {
+    no warnings qw/redefine/;
+    eval 'sub RT::Action::SendEmail::SendMessage { 
+                my $self = shift; 
+                my $MIME = shift; 
+                return (1) unless ($self->ScripObj->ScripActionObj->Name eq "Notify AdminCcs" );
+                is ($MIME->head->mime_type , "text/plain", "The only part is text/plain ");
+                 my $subject  = $MIME->head->get("subject");
+                chomp($subject);
+                #is( $subject ,      /^=\?KOI8-R\?B\?W2V4YW1wbGUuY39tICM3XSDUxdPUINTF09Q=\?=/ , "The $subject is encoded correctly");
+		};
+                 ';
+}
+
+shift @RT::EmailInputEncodings;
+$RT::EmailOutputEncoding = 'utf-8';
+# }}}
+
+
+# {{{ test a message containing a nested RFC 822 message
+
+my $content =  `cat ./lib/t/data/nested-rfc-822` || die "couldn't find new content";
+ok ($content, "Loaded nested-rfc-822 to test");
+
+$parser->ParseMIMEEntityFromScalar($content);
+
+
+# be as much like the mail gateway as possible.
+&text_plain_nested_redef_sendmessage;
+RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+is ($tick->Subject, "[Jonas Liljegren] Re: [Para] Niv\x{e5}er?");
+ok ($tick->Transactions->First->Attachments->First->ContentType =~ /multipart\/mixed/, "We recorded the content type right");
+is ($tick->Transactions->First->Attachments->Count , 5 , "Has one attachment, presumably a text-plain and a message RFC 822 and another plain");
+sub text_plain_nested_redef_sendmessage {
+    no warnings qw/redefine/;
+    eval 'sub RT::Action::SendEmail::SendMessage { 
+                my $self = shift; 
+                my $MIME = shift; 
+                return (1) unless ($self->ScripObj->ScripActionObj->Name eq "Notify AdminCcs" );
+                is ($MIME->head->mime_type , "multipart/mixed", "It is a mixed multipart");
+                 my $subject  =  $MIME->head->get("subject");
+                 $subject  = MIME::Base64::decode_base64( $subject);
+                chomp($subject);
+		# TODO, why does this test fail
+                #ok($subject =~ qr{Niv\x{e5}er}, "The subject matches the word - $subject");
+		1;
+                 }';
+}
+
+# }}}
+
+
+
+
+# Don't taint the environment
+$everyone->PrincipalObj->RevokeRight(Right =>'SuperUser');
+1;
diff --git a/rt/lib/t/data/8859-15-message-series/dir b/rt/lib/t/data/8859-15-message-series/dir
new file mode 100644
index 000000000..b9f8ec3ba
--- /dev/null
+++ b/rt/lib/t/data/8859-15-message-series/dir
@@ -0,0 +1,356 @@
+Return-Path: <rt-users-admin@lists.fsck.com>
+Delivered-To: j@pallas.eruditorum.org
+Received: from pallas.eruditorum.org (localhost [127.0.0.1])
+	by pallas.eruditorum.org (Postfix) with ESMTP
+	id 72E3A111B3; Mon, 26 May 2003 14:50:14 -0400 (EDT)
+Delivered-To: rt-users@pallas.eruditorum.org
+Received: from mail-in-02.arcor-online.net (mail-in-02.arcor-online.net [151.189.21.42])
+	by pallas.eruditorum.org (Postfix) with ESMTP id 15E761118D
+	for <rt-users@lists.fsck.com>; Mon, 26 May 2003 14:49:56 -0400 (EDT)
+Received: from otdial-212-144-012-186.arcor-ip.net (otdial-212-144-011-024.arcor-ip.net [212.144.11.24])
+	by mail-in-02.arcor-online.net (Postfix) with ESMTP
+	id 745EE15E87; Mon, 26 May 2003 20:53:15 +0200 (CEST)
+From: Dirk Pape <pape-rt@inf.fu-berlin.de>
+To: Jesse Vincent <jesse@bestpractical.com>,
+	rt-users <rt-users@lists.fsck.com>
+Subject: Re: [rt-users] [rt-announce] Development Snapshot 3.0.2++
+Message-ID: <2147483647.1053982235@otdial-212-144-011-024.arcor-ip.net>
+In-Reply-To: <2147483647.1053974498@[10.0.255.35]>
+References: <20030523202405.GF23719@fsck.com>
+ <2147483647.1053974498@[10.0.255.35]>
+X-Mailer: Mulberry/3.0.3 (Mac OS X)
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="==========2147500486=========="
+Sender: rt-users-admin@lists.fsck.com
+Errors-To: rt-users-admin@lists.fsck.com
+X-BeenThere: rt-users@lists.fsck.com
+X-Mailman-Version: 2.0.12
+Precedence: bulk
+List-Help: <mailto:rt-users-request@lists.fsck.com?subject=help>
+List-Post: <mailto:rt-users@lists.fsck.com>
+List-Subscribe: <http://lists.fsck.com/mailman/listinfo/rt-users>,
+	<mailto:rt-users-request@lists.fsck.com?subject=subscribe>
+List-Id: For users of RT: Request Tracker <rt-users.lists.fsck.com>
+List-Unsubscribe: <http://lists.fsck.com/mailman/listinfo/rt-users>,
+	<mailto:rt-users-request@lists.fsck.com?subject=unsubscribe>
+List-Archive: <http://lists.fsck.com/pipermail/rt-users/>
+Date: Mon, 26 May 2003 20:50:36 +0200
+X-Spam-Status: No, hits=-2.5 required=5.0
+	tests=AWL,IN_REP_TO,KNOWN_MAILING_LIST,QUOTED_EMAIL_TEXT,
+	      REFERENCES,REPLY_WITH_QUOTES
+	autolearn=ham version=2.55
+X-Spam-Level: 
+X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp)
+
+--==========2147500486==========
+Content-Type: text/plain; charset=us-ascii; format=flowed
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline
+
+Hello,
+
+here is the digest I forgot to attach. And I also forgot to say, that these 
+were the only messages after a restart of apache.
+
+The messages in the digest are the copies which I - for testing purpose - 
+allways queue into a mailbox just befor it is queued via rt-mailgate into 
+the rt-system.
+
+--Am Montag, 26. Mai 2003 18:41 Uhr +0200 schrieb Dirk Pape 
+<pape-rt@inf.fu-berlin.de>:
+
+> I attach a digest with mails I send one after another to the rt-system
+> and they get queued into one queue, each as a new ticket.
+
+
+
+
+--==========2147500486==========
+Content-Type: multipart/digest; boundary="==========2147489407=========="
+
+--==========2147489407==========
+Content-Type: message/rfc822; name="test _________"
+
+Return-Path: <pape@inf.fu-berlin.de>
+Delivered-To: pape-rtdoublecheck@mi.fu-berlin.de
+Received: (qmail 27591 invoked by uid 9804); 26 May 2003 18:10:50 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:10:46 +0200
+Received: (Qmail 27575 invoked from network); 26 May 2003 18:10:46 +0200
+Received: From es.inf.fu-berlin.de (160.45.110.22)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:10:46 +0200
+Received: from leibniz ([160.45.40.10] helo=math.fu-berlin.de)
+	by es.inf.fu-berlin.de with smtp (Exim 3.35 #1 (Debian))
+	id 19KKYe-0000Yi-00
+	for <staff@tec.mi.fu-berlin.de>; Mon, 26 May 2003 18:10:44 +0200
+Received: (qmail 27557 invoked by uid 9804); 26 May 2003 18:10:44 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:10:40 +0200
+Received: (Qmail 27540 invoked from network); 26 May 2003 18:10:40 +0200
+Received: From eremix.inf.fu-berlin.de (HELO eremix) (160.45.113.36)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:10:40 +0200
+Date: Mon, 26 May 2003 18:11:00 +0200
+From: Dirk Pape <pape@inf.fu-berlin.de>
+To: staff@tec.mi.fu-berlin.de
+Subject: =?ISO-8859-15?Q?test_=E4=F6=FC=DF=C4=D6=DC=DF=A4?=
+Message-ID: <2147483647.1053972660@[10.0.255.35]>
+X-Mailer: Mulberry/3.0.3 (Mac OS X)
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Virus-Scanned: by AMaViS 0.3.12pre7-U23 [27578] (NAI-uvscan@math.fu-berlin.de)
+X-Remote-IP: 160.45.110.22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=iso-8859-15; FORMAT=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+test nochmal in anderer Queue
+test =E4=F6=FC=DF=C4=D6=DC=DF=A4
+
+--==========2147489407==========
+Content-Type: message/rfc822; name="test _________"
+
+Return-Path: <pape@inf.fu-berlin.de>
+Delivered-To: pape-rtdoublecheck@mi.fu-berlin.de
+Received: (qmail 27754 invoked by uid 9804); 26 May 2003 18:11:24 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:11:20 +0200
+Received: (Qmail 27704 invoked from network); 26 May 2003 18:11:19 +0200
+Received: From es.inf.fu-berlin.de (160.45.110.22)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:11:19 +0200
+Received: from leibniz ([160.45.40.10] helo=math.fu-berlin.de)
+	by es.inf.fu-berlin.de with smtp (Exim 3.35 #1 (Debian))
+	id 19KKZA-0000Yy-00
+	for <staff@tec.mi.fu-berlin.de>; Mon, 26 May 2003 18:11:16 +0200
+Received: (qmail 27690 invoked by uid 9804); 26 May 2003 18:11:16 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:11:13 +0200
+Received: (Qmail 27677 invoked from network); 26 May 2003 18:11:13 +0200
+Received: From eremix.inf.fu-berlin.de (HELO eremix) (160.45.113.36)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:11:13 +0200
+Date: Mon, 26 May 2003 18:11:32 +0200
+From: Dirk Pape <pape@inf.fu-berlin.de>
+To: staff@tec.mi.fu-berlin.de
+Subject: =?ISO-8859-15?Q?test_=E4=F6=FC=DF=C4=D6=DC=DF=A4?=
+Message-ID: <2147483647.1053972692@[10.0.255.35]>
+X-Mailer: Mulberry/3.0.3 (Mac OS X)
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Virus-Scanned: by AMaViS 0.3.12pre7-U23 [27711] (NAI-uvscan@math.fu-berlin.de)
+X-Remote-IP: 160.45.110.22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=iso-8859-15; FORMAT=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+test nochmal in anderer Queue
+test =E4=F6=FC=DF=C4=D6=DC=DF=A4
+
+--==========2147489407==========
+Content-Type: message/rfc822; name="test _________"
+
+Return-Path: <pape@inf.fu-berlin.de>
+Delivered-To: pape-rtdoublecheck@mi.fu-berlin.de
+Received: (qmail 27971 invoked by uid 9804); 26 May 2003 18:12:02 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:11:52 +0200
+Received: (Qmail 27908 invoked from network); 26 May 2003 18:11:52 +0200
+Received: From es.inf.fu-berlin.de (160.45.110.22)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:11:52 +0200
+Received: from leibniz ([160.45.40.10] helo=math.fu-berlin.de)
+	by es.inf.fu-berlin.de with smtp (Exim 3.35 #1 (Debian))
+	id 19KKZj-0000ZC-00
+	for <staff@tec.mi.fu-berlin.de>; Mon, 26 May 2003 18:11:51 +0200
+Received: (qmail 27848 invoked by uid 9804); 26 May 2003 18:11:50 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:11:46 +0200
+Received: (Qmail 27809 invoked from network); 26 May 2003 18:11:45 +0200
+Received: From eremix.inf.fu-berlin.de (HELO eremix) (160.45.113.36)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:11:45 +0200
+Date: Mon, 26 May 2003 18:12:05 +0200
+From: Dirk Pape <pape@inf.fu-berlin.de>
+To: staff@tec.mi.fu-berlin.de
+Subject: =?ISO-8859-15?Q?test_=E4=F6=FC=DF=C4=D6=DC=DF=A4?=
+Message-ID: <2147483647.1053972725@[10.0.255.35]>
+X-Mailer: Mulberry/3.0.3 (Mac OS X)
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Virus-Scanned: by AMaViS 0.3.12pre7-U23 [27911] (NAI-uvscan@math.fu-berlin.de)
+X-Remote-IP: 160.45.110.22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=iso-8859-15; FORMAT=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+test nochmal in anderer Queue
+test =E4=F6=FC=DF=C4=D6=DC=DF=A4
+
+--==========2147489407==========
+Content-Type: message/rfc822; name="test _________"
+
+Return-Path: <pape@inf.fu-berlin.de>
+Delivered-To: pape-rtdoublecheck@mi.fu-berlin.de
+Received: (qmail 28283 invoked by uid 9804); 26 May 2003 18:12:39 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:12:36 +0200
+Received: (Qmail 28256 invoked from network); 26 May 2003 18:12:35 +0200
+Received: From es.inf.fu-berlin.de (160.45.110.22)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:12:35 +0200
+Received: from leibniz ([160.45.40.10] helo=math.fu-berlin.de)
+	by es.inf.fu-berlin.de with smtp (Exim 3.35 #1 (Debian))
+	id 19KKaQ-0000ZQ-00
+	for <staff@tec.mi.fu-berlin.de>; Mon, 26 May 2003 18:12:34 +0200
+Received: (qmail 28236 invoked by uid 9804); 26 May 2003 18:12:34 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:12:30 +0200
+Received: (Qmail 28224 invoked from network); 26 May 2003 18:12:30 +0200
+Received: From eremix.inf.fu-berlin.de (HELO eremix) (160.45.113.36)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:12:30 +0200
+Date: Mon, 26 May 2003 18:12:50 +0200
+From: Dirk Pape <pape@inf.fu-berlin.de>
+To: staff@tec.mi.fu-berlin.de
+Subject: =?ISO-8859-15?Q?test_=E4=F6=FC=DF=C4=D6=DC=DF=A4?=
+Message-ID: <2147483647.1053972770@[10.0.255.35]>
+X-Mailer: Mulberry/3.0.3 (Mac OS X)
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Virus-Scanned: by AMaViS 0.3.12pre7-U23 [28259] (NAI-uvscan@math.fu-berlin.de)
+X-Remote-IP: 160.45.110.22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=iso-8859-15; FORMAT=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+test nochmal in anderer Queue
+test =E4=F6=FC=DF=C4=D6=DC=DF=A4
+
+--==========2147489407==========
+Content-Type: message/rfc822; name="test _________"
+
+Return-Path: <pape@inf.fu-berlin.de>
+Delivered-To: pape-rtdoublecheck@mi.fu-berlin.de
+Received: (qmail 28578 invoked by uid 9804); 26 May 2003 18:13:20 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:13:15 +0200
+Received: (Qmail 28534 invoked from network); 26 May 2003 18:13:14 +0200
+Received: From es.inf.fu-berlin.de (160.45.110.22)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:13:14 +0200
+Received: from leibniz ([160.45.40.10] helo=math.fu-berlin.de)
+	by es.inf.fu-berlin.de with smtp (Exim 3.35 #1 (Debian))
+	id 19KKb1-0000Ze-00
+	for <staff@tec.mi.fu-berlin.de>; Mon, 26 May 2003 18:13:11 +0200
+Received: (qmail 28516 invoked by uid 9804); 26 May 2003 18:13:11 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:13:08 +0200
+Received: (Qmail 28479 invoked from network); 26 May 2003 18:13:07 +0200
+Received: From eremix.inf.fu-berlin.de (HELO eremix) (160.45.113.36)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:13:07 +0200
+Date: Mon, 26 May 2003 18:13:27 +0200
+From: Dirk Pape <pape@inf.fu-berlin.de>
+To: staff@tec.mi.fu-berlin.de
+Subject: =?ISO-8859-15?Q?test_=E4=F6=FC=DF=C4=D6=DC=DF=A4?=
+Message-ID: <2147483647.1053972807@[10.0.255.35]>
+X-Mailer: Mulberry/3.0.3 (Mac OS X)
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Virus-Scanned: by AMaViS 0.3.12pre7-U23 [28540] (NAI-uvscan@math.fu-berlin.de)
+X-Remote-IP: 160.45.110.22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=iso-8859-15; FORMAT=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+test nochmal in anderer Queue
+test =E4=F6=FC=DF=C4=D6=DC=DF=A4
+
+
+--==========2147489407==========
+Content-Type: message/rfc822; name="test _________"
+
+Return-Path: <pape@inf.fu-berlin.de>
+Delivered-To: pape-rtdoublecheck@mi.fu-berlin.de
+Received: (qmail 29108 invoked by uid 9804); 26 May 2003 18:14:15 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:14:10 +0200
+Received: (Qmail 29066 invoked from network); 26 May 2003 18:14:10 +0200
+Received: From es.inf.fu-berlin.de (160.45.110.22)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:14:10 +0200
+Received: from leibniz ([160.45.40.10] helo=math.fu-berlin.de)
+	by es.inf.fu-berlin.de with smtp (Exim 3.35 #1 (Debian))
+	id 19KKbw-0000Zr-00
+	for <staff@tec.mi.fu-berlin.de>; Mon, 26 May 2003 18:14:08 +0200
+Received: (qmail 29054 invoked by uid 9804); 26 May 2003 18:14:08 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:14:04 +0200
+Received: (Qmail 29036 invoked from network); 26 May 2003 18:14:04 +0200
+Received: From eremix.inf.fu-berlin.de (HELO eremix) (160.45.113.36)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:14:04 +0200
+Date: Mon, 26 May 2003 18:14:24 +0200
+From: Dirk Pape <pape@inf.fu-berlin.de>
+To: staff@tec.mi.fu-berlin.de
+Subject: =?ISO-8859-15?Q?test_=E4=F6=FC=DF=C4=D6=DC=DF=A4?=
+Message-ID: <2147483647.1053972864@[10.0.255.35]>
+X-Mailer: Mulberry/3.0.3 (Mac OS X)
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Virus-Scanned: by AMaViS 0.3.12pre7-U23 [29069] (NAI-uvscan@math.fu-berlin.de)
+X-Remote-IP: 160.45.110.22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=iso-8859-15; FORMAT=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+test nochmal in anderer Queue
+test =E4=F6=FC=DF=C4=D6=DC=DF=A4
+
+--==========2147489407==========
+Content-Type: message/rfc822; name="test _________"
+
+Return-Path: <pape@inf.fu-berlin.de>
+Delivered-To: pape-rtdoublecheck@mi.fu-berlin.de
+Received: (qmail 29551 invoked by uid 9804); 26 May 2003 18:15:16 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:15:12 +0200
+Received: (Qmail 29521 invoked from network); 26 May 2003 18:15:12 +0200
+Received: From es.inf.fu-berlin.de (160.45.110.22)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:15:12 +0200
+Received: from leibniz ([160.45.40.10] helo=math.fu-berlin.de)
+	by es.inf.fu-berlin.de with smtp (Exim 3.35 #1 (Debian))
+	id 19KKcx-0000a4-00
+	for <staff@tec.mi.fu-berlin.de>; Mon, 26 May 2003 18:15:11 +0200
+Received: (qmail 29511 invoked by uid 9804); 26 May 2003 18:15:10 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:15:07 +0200
+Received: (Qmail 29465 invoked from network); 26 May 2003 18:15:06 +0200
+Received: From eremix.inf.fu-berlin.de (HELO eremix) (160.45.113.36)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:15:06 +0200
+Date: Mon, 26 May 2003 18:15:26 +0200
+From: Dirk Pape <pape@inf.fu-berlin.de>
+To: staff@tec.mi.fu-berlin.de
+Subject: =?ISO-8859-15?Q?test_=E4=F6=FC=DF=C4=D6=DC=DF=A4?=
+Message-ID: <2147483647.1053972926@[10.0.255.35]>
+X-Mailer: Mulberry/3.0.3 (Mac OS X)
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Virus-Scanned: by AMaViS 0.3.12pre7-U23 [29524] (NAI-uvscan@math.fu-berlin.de)
+X-Remote-IP: 160.45.110.22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=iso-8859-15; FORMAT=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+test nochmal in anderer Queue
+test =E4=F6=FC=DF=C4=D6=DC=DF=A4
+
+
+--==========2147489407==========--
+
+--==========2147500486==========--
+
+_______________________________________________
+rt-users mailing list
+rt-users@lists.fsck.com
+http://lists.fsck.com/mailman/listinfo/rt-users
+
+Have you read the FAQ? The RT FAQ Manager lives at http://fsck.com/rtfm
+
diff --git a/rt/lib/t/data/8859-15-message-series/msg1 b/rt/lib/t/data/8859-15-message-series/msg1
new file mode 100644
index 000000000..cc99c406c
--- /dev/null
+++ b/rt/lib/t/data/8859-15-message-series/msg1
@@ -0,0 +1,36 @@
+Return-Path: <pape@inf.fu-berlin.de>
+Delivered-To: pape-rtdoublecheck@mi.fu-berlin.de
+Received: (qmail 27591 invoked by uid 9804); 26 May 2003 18:10:50 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:10:46 +0200
+Received: (Qmail 27575 invoked from network); 26 May 2003 18:10:46 +0200
+Received: From es.inf.fu-berlin.de (160.45.110.22)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:10:46 +0200
+Received: from leibniz ([160.45.40.10] helo=math.fu-berlin.de)
+	by es.inf.fu-berlin.de with smtp (Exim 3.35 #1 (Debian))
+	id 19KKYe-0000Yi-00
+	for <staff@tec.mi.fu-berlin.de>; Mon, 26 May 2003 18:10:44 +0200
+Received: (qmail 27557 invoked by uid 9804); 26 May 2003 18:10:44 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:10:40 +0200
+Received: (Qmail 27540 invoked from network); 26 May 2003 18:10:40 +0200
+Received: From eremix.inf.fu-berlin.de (HELO eremix) (160.45.113.36)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:10:40 +0200
+Date: Mon, 26 May 2003 18:11:00 +0200
+From: Dirk Pape <pape@inf.fu-berlin.de>
+To: staff@tec.mi.fu-berlin.de
+Subject: =?ISO-8859-15?Q?test_=E4=F6=FC=DF=C4=D6=DC=DF=A4?=
+Message-ID: <2147483647.1053972660@[10.0.255.35]>
+X-Mailer: Mulberry/3.0.3 (Mac OS X)
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Virus-Scanned: by AMaViS 0.3.12pre7-U23 [27578] (NAI-uvscan@math.fu-berlin.de)
+X-Remote-IP: 160.45.110.22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=iso-8859-15; FORMAT=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+test nochmal in anderer Queue
+test =E4=F6=FC=DF=C4=D6=DC=DF=A4
+
diff --git a/rt/lib/t/data/8859-15-message-series/msg2 b/rt/lib/t/data/8859-15-message-series/msg2
new file mode 100644
index 000000000..dc442cfc3
--- /dev/null
+++ b/rt/lib/t/data/8859-15-message-series/msg2
@@ -0,0 +1,36 @@
+Return-Path: <pape@inf.fu-berlin.de>
+Delivered-To: pape-rtdoublecheck@mi.fu-berlin.de
+Received: (qmail 27754 invoked by uid 9804); 26 May 2003 18:11:24 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:11:20 +0200
+Received: (Qmail 27704 invoked from network); 26 May 2003 18:11:19 +0200
+Received: From es.inf.fu-berlin.de (160.45.110.22)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:11:19 +0200
+Received: from leibniz ([160.45.40.10] helo=math.fu-berlin.de)
+	by es.inf.fu-berlin.de with smtp (Exim 3.35 #1 (Debian))
+	id 19KKZA-0000Yy-00
+	for <staff@tec.mi.fu-berlin.de>; Mon, 26 May 2003 18:11:16 +0200
+Received: (qmail 27690 invoked by uid 9804); 26 May 2003 18:11:16 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:11:13 +0200
+Received: (Qmail 27677 invoked from network); 26 May 2003 18:11:13 +0200
+Received: From eremix.inf.fu-berlin.de (HELO eremix) (160.45.113.36)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:11:13 +0200
+Date: Mon, 26 May 2003 18:11:32 +0200
+From: Dirk Pape <pape@inf.fu-berlin.de>
+To: staff@tec.mi.fu-berlin.de
+Subject: =?ISO-8859-15?Q?test_=E4=F6=FC=DF=C4=D6=DC=DF=A4?=
+Message-ID: <2147483647.1053972692@[10.0.255.35]>
+X-Mailer: Mulberry/3.0.3 (Mac OS X)
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Virus-Scanned: by AMaViS 0.3.12pre7-U23 [27711] (NAI-uvscan@math.fu-berlin.de)
+X-Remote-IP: 160.45.110.22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=iso-8859-15; FORMAT=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+test nochmal in anderer Queue
+test =E4=F6=FC=DF=C4=D6=DC=DF=A4
+
diff --git a/rt/lib/t/data/8859-15-message-series/msg3 b/rt/lib/t/data/8859-15-message-series/msg3
new file mode 100644
index 000000000..e23866d5f
--- /dev/null
+++ b/rt/lib/t/data/8859-15-message-series/msg3
@@ -0,0 +1,35 @@
+Return-Path: <pape@inf.fu-berlin.de>
+Delivered-To: pape-rtdoublecheck@mi.fu-berlin.de
+Received: (qmail 27971 invoked by uid 9804); 26 May 2003 18:12:02 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:11:52 +0200
+Received: (Qmail 27908 invoked from network); 26 May 2003 18:11:52 +0200
+Received: From es.inf.fu-berlin.de (160.45.110.22)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:11:52 +0200
+Received: from leibniz ([160.45.40.10] helo=math.fu-berlin.de)
+	by es.inf.fu-berlin.de with smtp (Exim 3.35 #1 (Debian))
+	id 19KKZj-0000ZC-00
+	for <staff@tec.mi.fu-berlin.de>; Mon, 26 May 2003 18:11:51 +0200
+Received: (qmail 27848 invoked by uid 9804); 26 May 2003 18:11:50 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:11:46 +0200
+Received: (Qmail 27809 invoked from network); 26 May 2003 18:11:45 +0200
+Received: From eremix.inf.fu-berlin.de (HELO eremix) (160.45.113.36)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:11:45 +0200
+Date: Mon, 26 May 2003 18:12:05 +0200
+From: Dirk Pape <pape@inf.fu-berlin.de>
+To: staff@tec.mi.fu-berlin.de
+Subject: =?ISO-8859-15?Q?test_=E4=F6=FC=DF=C4=D6=DC=DF=A4?=
+Message-ID: <2147483647.1053972725@[10.0.255.35]>
+X-Mailer: Mulberry/3.0.3 (Mac OS X)
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Virus-Scanned: by AMaViS 0.3.12pre7-U23 [27911] (NAI-uvscan@math.fu-berlin.de)
+X-Remote-IP: 160.45.110.22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=iso-8859-15; FORMAT=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+test nochmal in anderer Queue
+test =E4=F6=FC=DF=C4=D6=DC=DF=A4
diff --git a/rt/lib/t/data/8859-15-message-series/msg4 b/rt/lib/t/data/8859-15-message-series/msg4
new file mode 100644
index 000000000..831695cc7
--- /dev/null
+++ b/rt/lib/t/data/8859-15-message-series/msg4
@@ -0,0 +1,35 @@
+Return-Path: <pape@inf.fu-berlin.de>
+Delivered-To: pape-rtdoublecheck@mi.fu-berlin.de
+Received: (qmail 28283 invoked by uid 9804); 26 May 2003 18:12:39 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:12:36 +0200
+Received: (Qmail 28256 invoked from network); 26 May 2003 18:12:35 +0200
+Received: From es.inf.fu-berlin.de (160.45.110.22)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:12:35 +0200
+Received: from leibniz ([160.45.40.10] helo=math.fu-berlin.de)
+	by es.inf.fu-berlin.de with smtp (Exim 3.35 #1 (Debian))
+	id 19KKaQ-0000ZQ-00
+	for <staff@tec.mi.fu-berlin.de>; Mon, 26 May 2003 18:12:34 +0200
+Received: (qmail 28236 invoked by uid 9804); 26 May 2003 18:12:34 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:12:30 +0200
+Received: (Qmail 28224 invoked from network); 26 May 2003 18:12:30 +0200
+Received: From eremix.inf.fu-berlin.de (HELO eremix) (160.45.113.36)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:12:30 +0200
+Date: Mon, 26 May 2003 18:12:50 +0200
+From: Dirk Pape <pape@inf.fu-berlin.de>
+To: staff@tec.mi.fu-berlin.de
+Subject: =?ISO-8859-15?Q?test_=E4=F6=FC=DF=C4=D6=DC=DF=A4?=
+Message-ID: <2147483647.1053972770@[10.0.255.35]>
+X-Mailer: Mulberry/3.0.3 (Mac OS X)
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Virus-Scanned: by AMaViS 0.3.12pre7-U23 [28259] (NAI-uvscan@math.fu-berlin.de)
+X-Remote-IP: 160.45.110.22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=iso-8859-15; FORMAT=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+test nochmal in anderer Queue
+test =E4=F6=FC=DF=C4=D6=DC=DF=A4
diff --git a/rt/lib/t/data/8859-15-message-series/msg5 b/rt/lib/t/data/8859-15-message-series/msg5
new file mode 100644
index 000000000..272c93c4f
--- /dev/null
+++ b/rt/lib/t/data/8859-15-message-series/msg5
@@ -0,0 +1,35 @@
+Return-Path: <pape@inf.fu-berlin.de>
+Delivered-To: pape-rtdoublecheck@mi.fu-berlin.de
+Received: (qmail 28578 invoked by uid 9804); 26 May 2003 18:13:20 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:13:15 +0200
+Received: (Qmail 28534 invoked from network); 26 May 2003 18:13:14 +0200
+Received: From es.inf.fu-berlin.de (160.45.110.22)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:13:14 +0200
+Received: from leibniz ([160.45.40.10] helo=math.fu-berlin.de)
+	by es.inf.fu-berlin.de with smtp (Exim 3.35 #1 (Debian))
+	id 19KKb1-0000Ze-00
+	for <staff@tec.mi.fu-berlin.de>; Mon, 26 May 2003 18:13:11 +0200
+Received: (qmail 28516 invoked by uid 9804); 26 May 2003 18:13:11 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:13:08 +0200
+Received: (Qmail 28479 invoked from network); 26 May 2003 18:13:07 +0200
+Received: From eremix.inf.fu-berlin.de (HELO eremix) (160.45.113.36)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:13:07 +0200
+Date: Mon, 26 May 2003 18:13:27 +0200
+From: Dirk Pape <pape@inf.fu-berlin.de>
+To: staff@tec.mi.fu-berlin.de
+Subject: =?ISO-8859-15?Q?test_=E4=F6=FC=DF=C4=D6=DC=DF=A4?=
+Message-ID: <2147483647.1053972807@[10.0.255.35]>
+X-Mailer: Mulberry/3.0.3 (Mac OS X)
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Virus-Scanned: by AMaViS 0.3.12pre7-U23 [28540] (NAI-uvscan@math.fu-berlin.de)
+X-Remote-IP: 160.45.110.22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=iso-8859-15; FORMAT=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+test nochmal in anderer Queue
+test =E4=F6=FC=DF=C4=D6=DC=DF=A4
diff --git a/rt/lib/t/data/8859-15-message-series/msg6 b/rt/lib/t/data/8859-15-message-series/msg6
new file mode 100644
index 000000000..3ae9d3b69
--- /dev/null
+++ b/rt/lib/t/data/8859-15-message-series/msg6
@@ -0,0 +1,35 @@
+Return-Path: <pape@inf.fu-berlin.de>
+Delivered-To: pape-rtdoublecheck@mi.fu-berlin.de
+Received: (qmail 29108 invoked by uid 9804); 26 May 2003 18:14:15 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:14:10 +0200
+Received: (Qmail 29066 invoked from network); 26 May 2003 18:14:10 +0200
+Received: From es.inf.fu-berlin.de (160.45.110.22)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:14:10 +0200
+Received: from leibniz ([160.45.40.10] helo=math.fu-berlin.de)
+	by es.inf.fu-berlin.de with smtp (Exim 3.35 #1 (Debian))
+	id 19KKbw-0000Zr-00
+	for <staff@tec.mi.fu-berlin.de>; Mon, 26 May 2003 18:14:08 +0200
+Received: (qmail 29054 invoked by uid 9804); 26 May 2003 18:14:08 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:14:04 +0200
+Received: (Qmail 29036 invoked from network); 26 May 2003 18:14:04 +0200
+Received: From eremix.inf.fu-berlin.de (HELO eremix) (160.45.113.36)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:14:04 +0200
+Date: Mon, 26 May 2003 18:14:24 +0200
+From: Dirk Pape <pape@inf.fu-berlin.de>
+To: staff@tec.mi.fu-berlin.de
+Subject: =?ISO-8859-15?Q?test_=E4=F6=FC=DF=C4=D6=DC=DF=A4?=
+Message-ID: <2147483647.1053972864@[10.0.255.35]>
+X-Mailer: Mulberry/3.0.3 (Mac OS X)
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Virus-Scanned: by AMaViS 0.3.12pre7-U23 [29069] (NAI-uvscan@math.fu-berlin.de)
+X-Remote-IP: 160.45.110.22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=iso-8859-15; FORMAT=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+test nochmal in anderer Queue
+test =E4=F6=FC=DF=C4=D6=DC=DF=A4
diff --git a/rt/lib/t/data/8859-15-message-series/msg7 b/rt/lib/t/data/8859-15-message-series/msg7
new file mode 100644
index 000000000..6149dd644
--- /dev/null
+++ b/rt/lib/t/data/8859-15-message-series/msg7
@@ -0,0 +1,36 @@
+Return-Path: <pape@inf.fu-berlin.de>
+Delivered-To: pape-rtdoublecheck@mi.fu-berlin.de
+Received: (qmail 29551 invoked by uid 9804); 26 May 2003 18:15:16 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:15:12 +0200
+Received: (Qmail 29521 invoked from network); 26 May 2003 18:15:12 +0200
+Received: From es.inf.fu-berlin.de (160.45.110.22)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:15:12 +0200
+Received: from leibniz ([160.45.40.10] helo=math.fu-berlin.de)
+	by es.inf.fu-berlin.de with smtp (Exim 3.35 #1 (Debian))
+	id 19KKcx-0000a4-00
+	for <staff@tec.mi.fu-berlin.de>; Mon, 26 May 2003 18:15:11 +0200
+Received: (qmail 29511 invoked by uid 9804); 26 May 2003 18:15:10 +0200
+Received: from localhost (HELO math.fu-berlin.de) (127.0.0.1)
+  by localhost with SMTP; 26 May 2003 18:15:07 +0200
+Received: (Qmail 29465 invoked from network); 26 May 2003 18:15:06 +0200
+Received: From eremix.inf.fu-berlin.de (HELO eremix) (160.45.113.36)
+  by leibniz.math.fu-berlin.de with SMTP; 26 May 2003 18:15:06 +0200
+Date: Mon, 26 May 2003 18:15:26 +0200
+From: Dirk Pape <pape@inf.fu-berlin.de>
+To: staff@tec.mi.fu-berlin.de
+Subject: =?ISO-8859-15?Q?test_=E4=F6=FC=DF=C4=D6=DC=DF=A4?=
+Message-ID: <2147483647.1053972926@[10.0.255.35]>
+X-Mailer: Mulberry/3.0.3 (Mac OS X)
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Envelope-Sender: pape@inf.fu-berlin.de
+X-Virus-Scanned: by AMaViS 0.3.12pre7-U23 [29524] (NAI-uvscan@math.fu-berlin.de)
+X-Remote-IP: 160.45.110.22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=iso-8859-15; FORMAT=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+test nochmal in anderer Queue
+test =E4=F6=FC=DF=C4=D6=DC=DF=A4
+
diff --git a/rt/lib/t/data/multipart-alternative-with-umlaut b/rt/lib/t/data/multipart-alternative-with-umlaut
new file mode 100644
index 000000000..1ad4fe323
--- /dev/null
+++ b/rt/lib/t/data/multipart-alternative-with-umlaut
@@ -0,0 +1,62 @@
+Return-Path: <gst@example.com>
+Delivered-To: j@pallas.eruditorum.org
+Received: from vis.example.com (vis.example.com [212.68.68.251])
+	by pallas.eruditorum.org (Postfix) with SMTP id 59236111C3
+	for <jesse@example.com>; Thu, 12 Jun 2003 02:14:44 -0400 (EDT)
+Received: (qmail 29541 invoked by uid 502); 12 Jun 2003 06:14:42 -0000
+Received: from sivd.example.com (HELO example.com) (192.168.42.1)
+  by 192.168.42.42 with SMTP; 12 Jun 2003 06:14:42 -0000
+Received: received from 172.20.72.174 by odie.example.com; Thu, 12 Jun 2003 08:14:27 +0200
+Received: by mailserver.example.com with Internet Mail Service (5.5.2653.19) id <LJSB7T54>; Thu, 12 Jun 2003 08:14:39 +0200
+Message-ID: <50362EC956CBD411A339009027F6257E013DD495@mailserver.example.com>
+Date: Thu, 12 Jun 2003 08:14:39 +0200
+From: "Stever, Gregor" <gst@example.com>
+MIME-Version: 1.0
+X-Mailer: Internet Mail Service (5.5.2653.19)
+To: "'jesse@example.com'" <jesse@example.com>
+Subject: RE: [rt-users] HTML-encoded mails with umlaute
+Date: Thu, 12 Jun 2003 08:14:39 +0200
+Content-Type: multipart/alternative;
+	boundary="----_=_NextPart_001_01C330A9.E7BDD590"
+X-Spam-Status: No, hits=0.0 required=5.0
+	tests=AWL,HTML_50_60,HTML_MESSAGE,INVALID_DATE
+	version=2.55
+X-Spam-Level: 
+X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp)
+
+------_=_NextPart_001_01C330A9.E7BDD590
+Content-Type: text/plain;
+	charset="iso-8859-1"
+Content-Transfer-Encoding: quoted-printable
+
+Hello,
+
+ist this kind of Messages, that causes rt to crash.=20
+
+Mit freundlichen Gr=FC=DFen
+Gregor Stever      ^^causes Error!!
+
+
+------_=_NextPart_001_01C330A9.E7BDD590
+Content-Type: text/html;
+	charset="iso-8859-1"
+Content-Transfer-Encoding: quoted-printable
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD>
+<META HTTP-EQUIV=3D"Content-Type" CONTENT=3D"text/html; charset=3Diso-8859-=
+1">
+
+
+<META content=3D"MSHTML 6.00.2800.1170" name=3DGENERATOR></HEAD>
+<BODY>
+<DIV><FONT face=3DArial><FONT size=3D2>Hello,<BR><BR>ist this kind of Messa=
+ges, that=20
+causes rt to crash.<BR><BR>Mit freundlichen Gr=FC=DFen<BR>Gregor=20
+Stever&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ^^causes Error<SPAN=20
+class=3D975501206-12062003>!!</SPAN></FONT></FONT></DIV></BODY></HTML>
+
+
+------_=_NextPart_001_01C330A9.E7BDD590--
+
+
diff --git a/rt/lib/t/data/nested-mime-sample b/rt/lib/t/data/nested-mime-sample
new file mode 100644
index 000000000..8b85d948c
--- /dev/null
+++ b/rt/lib/t/data/nested-mime-sample
@@ -0,0 +1,396 @@
+Return-Path: <Xxxxxx_Yyyyyyy@some.net>
+Delivered-To: jesse@pallas.eruditorum.org
+Received: by pallas.eruditorum.org (Postfix)
+	id B5D3E1123A; Fri, 12 Jul 2002 11:35:27 -0400 (EDT)
+Delivered-To: rt-2.0-bugs@pallas.eruditorum.org
+Received: from postman.some.net (postman.some.net [193.0.0.199])
+	by pallas.eruditorum.org (Postfix) with SMTP id 2736011234
+	for <rt-2.0-bugs@fsck.com>; Fri, 12 Jul 2002 11:35:27 -0400 (EDT)
+Received: (qmail 11615 invoked by uid 0); 12 Jul 2002 15:35:26 -0000
+Received: from x22.some.net (HELO x22.some.net.some.net) (193.0.1.22)
+  by postman.some.net with SMTP; 12 Jul 2002 15:35:26 -0000
+Date: Fri, 12 Jul 2002 17:35:26 +0200 (CEST)
+From: Xxxxxx Yyyyyyy <Xxxxxx_Yyyyyyy@some.net>
+To: rt-0.0-bugs@fsck.com
+Subject: Example MIME within MIME within MIME message
+Message-ID: <Pine.LNX.4.44.0207121734250.25020-120000@x22.some.net>
+MIME-Version: 1.0
+Content-Type: MULTIPART/MIXED; BOUNDARY="12654081-192303556-1026488126=:25020"
+X-Spam-Status: No, hits=4.0 required=7.0
+	tests=DOUBLE_CAPSWORD,MIME_NULL_BLOCK,MIME_MISSING_BOUNDARY
+	version=2.31
+Content-Length: 11478
+
+  This message is in MIME format.  The first part should be readable text,
+  while the remaining parts are likely unreadable without MIME-aware tools.
+  Send mail to mime@docserver.cac.washington.edu for more info.
+
+--12654081-192303556-1026488126=:25020
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+
+
+MIME is fun at times.
+
+
+-- 
+                             Xxxxxx Yyyyyyy                            SOME
+                   Systems/Network Engineer                             NCC
+                 www.some.net - PGP000C8B1B             Operations/Security
+
+--12654081-192303556-1026488126=:25020
+Content-Type: MULTIPART/Digest; BOUNDARY="12654081-2102091261-1026488126=:25020"
+Content-ID: <Pine.LNX.4.44.0207121734322.25020@x22.some.net>
+Content-Description: Digest of 2 messages
+
+  This message is in MIME format.  The first part should be readable text,
+  while the remaining parts are likely unreadable without MIME-aware tools.
+  Send mail to mime@docserver.cac.washington.edu for more info.
+
+--12654081-2102091261-1026488126=:25020
+Content-Type: MESSAGE/RFC822; CHARSET=US-ASCII
+Content-ID: <Pine.LNX.4.44.0207121734320.25020@x22.some.net>
+Content-Description: first outer message (fwd)
+
+Date: Fri, 12 Jul 2002 17:32:37 +0200 (CEST)
+From: Xxxxxx Yyyyyyy <Xxxxxx_Yyyyyyy@some.net>
+X-X-Sender: bc@x22.some.net
+To: Xxxxxx_Yyyyyyy@some.net
+Subject: first outer message
+Message-ID: <Pine.LNX.4.44.0207121732180.25020-120000@x22.some.net>
+MIME-Version: 1.0
+Content-Type: MULTIPART/MIXED; BOUNDARY="12654081-113777422-1026487957=:25020"
+
+
+--12654081-113777422-1026487957=:25020
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+
+
+first outer message
+
+--12654081-113777422-1026487957=:25020
+Content-Type: MULTIPART/Digest; BOUNDARY="12654081-387266385-1026487957=:25020"
+Content-ID: <Pine.LNX.4.44.0207121732222.25020@x22.some.net>
+Content-Description: Digest of 2 messages
+
+--12654081-387266385-1026487957=:25020
+Content-Type: MESSAGE/RFC822; CHARSET=US-ASCII
+Content-ID: <Pine.LNX.4.44.0207121732220.25020@x22.some.net>
+Content-Description: middle message (fwd)
+
+Date: Fri, 12 Jul 2002 17:31:45 +0200 (CEST)
+From: Xxxxxx Yyyyyyy <Xxxxxx_Yyyyyyy@some.net>
+X-X-Sender: bc@x22.some.net
+To: Xxxxxx_Yyyyyyy@some.net
+Subject: middle message
+Message-ID: <Pine.LNX.4.44.0207121731190.25020-120000@x22.some.net>
+MIME-Version: 1.0
+Content-Type: MULTIPART/MIXED; BOUNDARY="12654081-1711788944-1026487905=:25020"
+
+
+--12654081-1711788944-1026487905=:25020
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+
+
+This is the first middle message
+
+
+--12654081-1711788944-1026487905=:25020
+Content-Type: MULTIPART/Digest; BOUNDARY="12654081-1221085552-1026487905=:25020"
+Content-ID: <Pine.LNX.4.44.0207121731262.25020@x22.some.net>
+Content-Description: Digest of 2 messages
+
+--12654081-1221085552-1026487905=:25020
+Content-Type: MESSAGE/RFC822; CHARSET=US-ASCII
+Content-ID: <Pine.LNX.4.44.0207121731260.25020@x22.some.net>
+Content-Description: This is the inner-most message (fwd)
+
+Date: Fri, 12 Jul 2002 17:30:31 +0200 (CEST)
+From: Xxxxxx Yyyyyyy <Xxxxxx_Yyyyyyy@some.net>
+X-X-Sender: bc@x22.some.net
+To: Xxxxxx_Yyyyyyy@some.net
+Subject: This is the inner-most message
+Message-ID: <Pine.LNX.4.44.0207121730070.25020-100000@x22.some.net>
+MIME-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+
+
+
+inner-msg
+
+
+
+--12654081-1221085552-1026487905=:25020
+Content-Type: MESSAGE/RFC822; CHARSET=US-ASCII
+Content-ID: <Pine.LNX.4.44.0207121731261.25020@x22.some.net>
+Content-Description: another inner message (need two before pine will do the mime-digest thing) (fwd)
+
+Date: Fri, 12 Jul 2002 17:31:12 +0200 (CEST)
+From: Xxxxxx Yyyyyyy <Xxxxxx_Yyyyyyy@some.net>
+X-X-Sender: bc@x22.some.net
+To: Xxxxxx_Yyyyyyy@some.net
+Subject: another inner message (need two before pine will do the mime-digest
+ thing)
+Message-ID: <Pine.LNX.4.44.0207121730480.25020-100000@x22.some.net>
+MIME-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+
+
+
+again
+
+
+
+--12654081-1221085552-1026487905=:25020--
+--12654081-1711788944-1026487905=:25020--
+
+--12654081-387266385-1026487957=:25020
+Content-Type: MESSAGE/RFC822; CHARSET=US-ASCII
+Content-ID: <Pine.LNX.4.44.0207121732221.25020@x22.some.net>
+Content-Description: middle message (fwd)
+
+Date: Fri, 12 Jul 2002 17:32:05 +0200 (CEST)
+From: Xxxxxx Yyyyyyy <Xxxxxx_Yyyyyyy@some.net>
+X-X-Sender: bc@x22.some.net
+To: Xxxxxx_Yyyyyyy@some.net
+Subject: middle message
+Message-ID: <Pine.LNX.4.44.0207121731470.25020-120000@x22.some.net>
+MIME-Version: 1.0
+Content-Type: MULTIPART/MIXED; BOUNDARY="12654081-1731270459-1026487925=:25020"
+
+
+--12654081-1731270459-1026487925=:25020
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+
+
+
+This is the second middle message
+
+
+--12654081-1731270459-1026487925=:25020
+Content-Type: MULTIPART/Digest; BOUNDARY="12654081-128832654-1026487925=:25020"
+Content-ID: <Pine.LNX.4.44.0207121731502.25020@x22.some.net>
+Content-Description: Digest of 2 messages
+
+--12654081-128832654-1026487925=:25020
+Content-Type: MESSAGE/RFC822; CHARSET=US-ASCII
+Content-ID: <Pine.LNX.4.44.0207121731500.25020@x22.some.net>
+Content-Description: This is the inner-most message (fwd)
+
+Date: Fri, 12 Jul 2002 17:30:31 +0200 (CEST)
+From: Xxxxxx Yyyyyyy <Xxxxxx_Yyyyyyy@some.net>
+X-X-Sender: bc@x22.some.net
+To: Xxxxxx_Yyyyyyy@some.net
+Subject: This is the inner-most message
+Message-ID: <Pine.LNX.4.44.0207121730070.25020-100000@x22.some.net>
+MIME-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+
+
+
+inner-msg
+
+
+
+--12654081-128832654-1026487925=:25020
+Content-Type: MESSAGE/RFC822; CHARSET=US-ASCII
+Content-ID: <Pine.LNX.4.44.0207121731501.25020@x22.some.net>
+Content-Description: another inner message (need two before pine will do the mime-digest thing) (fwd)
+
+Date: Fri, 12 Jul 2002 17:31:12 +0200 (CEST)
+From: Xxxxxx Yyyyyyy <Xxxxxx_Yyyyyyy@some.net>
+X-X-Sender: bc@x22.some.net
+To: Xxxxxx_Yyyyyyy@some.net
+Subject: another inner message (need two before pine will do the mime-digest
+ thing)
+Message-ID: <Pine.LNX.4.44.0207121730480.25020-100000@x22.some.net>
+MIME-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+
+
+
+again
+
+
+
+--12654081-128832654-1026487925=:25020--
+--12654081-1731270459-1026487925=:25020--
+
+--12654081-387266385-1026487957=:25020--
+--12654081-113777422-1026487957=:25020--
+
+--12654081-2102091261-1026488126=:25020
+Content-Type: MESSAGE/RFC822; CHARSET=US-ASCII
+Content-ID: <Pine.LNX.4.44.0207121734321.25020@x22.some.net>
+Content-Description: 2nd outer message (fwd)
+
+Date: Fri, 12 Jul 2002 17:32:54 +0200 (CEST)
+From: Xxxxxx Yyyyyyy <Xxxxxx_Yyyyyyy@some.net>
+X-X-Sender: bc@x22.some.net
+To: Xxxxxx_Yyyyyyy@some.net
+Subject: 2nd outer message
+Message-ID: <Pine.LNX.4.44.0207121732380.25020-120000@x22.some.net>
+MIME-Version: 1.0
+Content-Type: MULTIPART/MIXED; BOUNDARY="12654081-1955637437-1026487974=:25020"
+
+
+--12654081-1955637437-1026487974=:25020
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+
+
+2nd outer message
+
+
+--12654081-1955637437-1026487974=:25020
+Content-Type: MULTIPART/Digest; BOUNDARY="12654081-362457126-1026487974=:25020"
+Content-ID: <Pine.LNX.4.44.0207121732412.25020@x22.some.net>
+Content-Description: Digest of 2 messages
+
+--12654081-362457126-1026487974=:25020
+Content-Type: MESSAGE/RFC822; CHARSET=US-ASCII
+Content-ID: <Pine.LNX.4.44.0207121732410.25020@x22.some.net>
+Content-Description: middle message (fwd)
+
+Date: Fri, 12 Jul 2002 17:31:45 +0200 (CEST)
+From: Xxxxxx Yyyyyyy <Xxxxxx_Yyyyyyy@some.net>
+X-X-Sender: bc@x22.some.net
+To: Xxxxxx_Yyyyyyy@some.net
+Subject: middle message
+Message-ID: <Pine.LNX.4.44.0207121731190.25020-120000@x22.some.net>
+MIME-Version: 1.0
+Content-Type: MULTIPART/MIXED; BOUNDARY="12654081-1711788944-1026487905=:25020"
+
+
+--12654081-1711788944-1026487905=:25020
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+
+
+This is the first middle message
+
+
+--12654081-1711788944-1026487905=:25020
+Content-Type: MULTIPART/Digest; BOUNDARY="12654081-1221085552-1026487905=:25020"
+Content-ID: <Pine.LNX.4.44.0207121731262.25020@x22.some.net>
+Content-Description: Digest of 2 messages
+
+--12654081-1221085552-1026487905=:25020
+Content-Type: MESSAGE/RFC822; CHARSET=US-ASCII
+Content-ID: <Pine.LNX.4.44.0207121731260.25020@x22.some.net>
+Content-Description: This is the inner-most message (fwd)
+
+Date: Fri, 12 Jul 2002 17:30:31 +0200 (CEST)
+From: Xxxxxx Yyyyyyy <Xxxxxx_Yyyyyyy@some.net>
+X-X-Sender: bc@x22.some.net
+To: Xxxxxx_Yyyyyyy@some.net
+Subject: This is the inner-most message
+Message-ID: <Pine.LNX.4.44.0207121730070.25020-100000@x22.some.net>
+MIME-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+
+
+
+inner-msg
+
+
+
+--12654081-1221085552-1026487905=:25020
+Content-Type: MESSAGE/RFC822; CHARSET=US-ASCII
+Content-ID: <Pine.LNX.4.44.0207121731261.25020@x22.some.net>
+Content-Description: another inner message (need two before pine will do the mime-digest thing) (fwd)
+
+Date: Fri, 12 Jul 2002 17:31:12 +0200 (CEST)
+From: Xxxxxx Yyyyyyy <Xxxxxx_Yyyyyyy@some.net>
+X-X-Sender: bc@x22.some.net
+To: Xxxxxx_Yyyyyyy@some.net
+Subject: another inner message (need two before pine will do the mime-digest
+ thing)
+Message-ID: <Pine.LNX.4.44.0207121730480.25020-100000@x22.some.net>
+MIME-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+
+
+
+again
+
+
+
+--12654081-1221085552-1026487905=:25020--
+--12654081-1711788944-1026487905=:25020--
+
+--12654081-362457126-1026487974=:25020
+Content-Type: MESSAGE/RFC822; CHARSET=US-ASCII
+Content-ID: <Pine.LNX.4.44.0207121732411.25020@x22.some.net>
+Content-Description: middle message (fwd)
+
+Date: Fri, 12 Jul 2002 17:32:05 +0200 (CEST)
+From: Xxxxxx Yyyyyyy <Xxxxxx_Yyyyyyy@some.net>
+X-X-Sender: bc@x22.some.net
+To: Xxxxxx_Yyyyyyy@some.net
+Subject: middle message
+Message-ID: <Pine.LNX.4.44.0207121731470.25020-120000@x22.some.net>
+MIME-Version: 1.0
+Content-Type: MULTIPART/MIXED; BOUNDARY="12654081-1731270459-1026487925=:25020"
+
+
+--12654081-1731270459-1026487925=:25020
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+
+
+
+This is the second middle message
+
+
+--12654081-1731270459-1026487925=:25020
+Content-Type: MULTIPART/Digest; BOUNDARY="12654081-128832654-1026487925=:25020"
+Content-ID: <Pine.LNX.4.44.0207121731502.25020@x22.some.net>
+Content-Description: Digest of 2 messages
+
+--12654081-128832654-1026487925=:25020
+Content-Type: MESSAGE/RFC822; CHARSET=US-ASCII
+Content-ID: <Pine.LNX.4.44.0207121731500.25020@x22.some.net>
+Content-Description: This is the inner-most message (fwd)
+
+Date: Fri, 12 Jul 2002 17:30:31 +0200 (CEST)
+From: Xxxxxx Yyyyyyy <Xxxxxx_Yyyyyyy@some.net>
+X-X-Sender: bc@x22.some.net
+To: Xxxxxx_Yyyyyyy@some.net
+Subject: This is the inner-most message
+Message-ID: <Pine.LNX.4.44.0207121730070.25020-100000@x22.some.net>
+MIME-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+
+
+
+inner-msg
+
+
+
+--12654081-128832654-1026487925=:25020
+Content-Type: MESSAGE/RFC822; CHARSET=US-ASCII
+Content-ID: <Pine.LNX.4.44.0207121731501.25020@x22.some.net>
+Content-Description: another inner message (need two before pine will do the mime-digest thing) (fwd)
+
+Date: Fri, 12 Jul 2002 17:31:12 +0200 (CEST)
+From: Xxxxxx Yyyyyyy <Xxxxxx_Yyyyyyy@some.net>
+X-X-Sender: bc@x22.some.net
+To: Xxxxxx_Yyyyyyy@some.net
+Subject: another inner message (need two before pine will do the mime-digest
+ thing)
+Message-ID: <Pine.LNX.4.44.0207121730480.25020-100000@x22.some.net>
+MIME-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+
+
+
+again
+
+
+
+--12654081-128832654-1026487925=:25020--
+--12654081-1731270459-1026487925=:25020--
+
+--12654081-362457126-1026487974=:25020--
+--12654081-1955637437-1026487974=:25020--
+
+--12654081-2102091261-1026488126=:25020--
+--12654081-192303556-1026488126=:25020--
+
diff --git a/rt/lib/t/data/nested-rfc-822 b/rt/lib/t/data/nested-rfc-822
new file mode 100644
index 000000000..d4f118df2
--- /dev/null
+++ b/rt/lib/t/data/nested-rfc-822
@@ -0,0 +1,253 @@
+Return-Path: <jonas@astral.example.com>
+Delivered-To: j@pallas.eruditorum.org
+Received: from example.com (example.com [213.88.137.35])
+	by pallas.eruditorum.org (Postfix) with ESMTP id 869591115E
+	for <jesse@bestpractical.com>; Sun, 29 Jun 2003 18:04:04 -0400 (EDT)
+Received: from jonas by example.com with local (Exim 4.20)
+	id 19WkLK-0004Vr-0I
+	for jesse@bestpractical.com; Mon, 30 Jun 2003 00:08:18 +0200
+Resent-To: jesse@bestpractical.com
+Resent-From: Jonas Liljegren <jonas@example.com>
+Resent-Date: Mon, 30 Jun 2003 00:08:17 +0200
+Received: from mail by example.com with spam-scanned (Exim 4.20)
+	id 19Wayz-00068j-KO
+	for jonas@astral.example.com; Sun, 29 Jun 2003 14:08:42 +0200
+Received: from jonas by example.com with local (Exim 4.20)
+	id 19Wayz-00068g-FY
+	for red@example.com; Sun, 29 Jun 2003 14:08:37 +0200
+To: Redaktionen <red@example.com>
+Subject: [Jonas Liljegren] Re: [Para] =?iso-8859-1?q?Niv=E5er=3F?=
+From: Jonas Liljegren <jonas@example.com>
+Date: Sun, 29 Jun 2003 14:08:37 +0200
+Message-ID: <87d6gxt7ay.fsf@example.com>
+User-Agent: Gnus/5.1002 (Gnus v5.10.2) Emacs/21.2 (gnu/linux)
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="=-=-="
+Sender: Jonas Liljegren <jonas@astral.example.com>
+Resent-Message-Id: <E19WkLK-0004Vr-0I@example.com>
+Resent-Sender: Jonas Liljegren <jonas@astral.example.com>
+Resent-Date: Mon, 30 Jun 2003 00:08:18 +0200
+X-Spam-Status: No, hits=-5.7 required=5.0
+	tests=AWL,BAYES_10,EMAIL_ATTRIBUTION,MAILTO_WITH_SUBJ,
+	      QUOTED_EMAIL_TEXT,USER_AGENT_GNUS_UA
+	version=2.55
+X-Spam-Level: 
+X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp)
+
+--=-=-=
+Content-Type: text/plain; charset=iso-8859-1
+Content-Transfer-Encoding: quoted-printable
+
+Material f=F6r att uppdatera texten om niv=E5er.
+
+Denna text b=F6r dessutom ligga som ett uppslagsord och inte d=E4r den ligg=
+er nu.
+
+
+--=-=-=
+Content-Type: message/rfc822
+Content-Disposition: inline
+
+Return-path: <list-bounces@example.com>
+Received: from mail by example.com with spam-scanned (Exim 4.20)
+	id 19WFzq-0005i1-WE
+	for jonas@example.com; Sat, 28 Jun 2003 15:44:13 +0200
+Received: from localhost
+	([127.0.0.1] helo=example.com ident=list)
+	by example.com with esmtp (Exim 4.20)
+	id 19WFzp-0005hf-Tz; Sat, 28 Jun 2003 15:44:05 +0200
+Received: from mail by example.com with spam-scanned (Exim 4.20)
+	id 19WFzh-0005hR-Bu
+	for list@example.com; Sat, 28 Jun 2003 15:44:03 +0200
+Received: from jonas by example.com with local (Exim 4.20)
+	id 19WFzh-0005hO-AO
+	for list@example.com; Sat, 28 Jun 2003 15:43:57 +0200
+To: list@example.com
+Subject: Re: [Para] =?iso-8859-1?q?Niv=E5er=3F?=
+References: <002701c33d62$170fb2e0$a33740d5@TELIA.COM>
+	<002301c33d66$bf6483e0$d97864d5@remotel2tu76c8>
+	<64753.217.210.4.156.1056801224.squirrel@example.com>
+From: Jonas Liljegren <jonas@example.com>
+Date: Sat, 28 Jun 2003 15:43:57 +0200
+In-Reply-To: <64753.217.210.4.156.1056801224.squirrel@example.com> (Jakob
+	Carlsson's message of "Sat, 28 Jun 2003 13:53:44 +0200 (CEST)")
+Message-ID: <877k76uxk2.fsf@example.com>
+User-Agent: Gnus/5.1002 (Gnus v5.10.2) Emacs/21.2 (gnu/linux)
+X-BeenThere: list@example.com
+X-Mailman-Version: 2.1.2
+Precedence: list
+List-Id: &#214;ppen lista f&#246;r alla medlemmar  <list.example.com>
+List-Unsubscribe: <http://example.com/cgi-bin/mailman/listinfo/list>,
+	<mailto:list-request@example.com?subject=unsubscribe>
+List-Archive: <http://example.com/pipermail/list>
+List-Post: <mailto:list@example.com>
+List-Help: <mailto:list-request@example.com?subject=help>
+List-Subscribe: <http://example.com/cgi-bin/mailman/listinfo/list>,
+	<mailto:list-request@example.com?subject=subscribe>
+Sender: list-bounces@example.com
+Errors-To: list-bounces@example.com
+X-Spam-Status: No, hits=-7.0 required=5.0
+	tests=BAYES_00,EMAIL_ATTRIBUTION,IN_REP_TO,QUOTED_EMAIL_TEXT,
+	      REFERENCES,REPLY_WITH_QUOTES,USER_AGENT_GNUS_UA
+	version=2.55
+X-Spam-Level: 
+X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=iso-8859-1
+Content-Transfer-Encoding: quoted-printable
+
+"Jakob Carlsson" <esrange@example.com> writes:
+
+>> Om du g=E5r in p=E5 Hemsidan och sen p=E5 Torget.
+>> D=E4r ser du att det st=E5r ditt anv=E4ndarnamn och
+>> bredvid det Niv=E5 5.
+>> Klicka p=E5 niv=E5 5 s=E5 kommer du in p=E5 en sida som
+>>  f=F6rklarar allt om niv=E5systemet.
+>
+> Bra svar. Men jag k=E4nner f=F6r att ge en kort f=F6rklaring av niv=E5-sy=
+stemet.
+
+Jag skulle kunna l=E4gga en massa tid p=E5 at skriva samma sak om och om
+igen.  Fliker in h=E4r f=F6r att s=E4ga detta =E4nnu en g=E5ng...:
+
+ * Det =E4r jag som hittat p=E5 det h=E4r med niv=E5system
+
+ * Det =E4r en stor skillnad p=E5 hur det =E4r t=E4nkt att vara och hur det=
+ =E4r
+   nu.  Jag har stora planer och en massa id=E9er jag vill genomf=F6ra.
+
+ * Niv=E5systemet =E4r en =E5terkoppling f=F6r vad man gjort f=F6r webbplat=
+sen.
+   Som ett tack g=F6r hj=E4lpen.
+
+ * Systemet finns som en inspiration f=F6r de som d=E5 k=E4nner f=F6r att g=
+=F6ra
+   mer.  Men jag vill inte att det ska ge en negativ influens f=F6r de
+   som inte gillar niv=E5er.  Var och en ska kunna v=E4lja att ignorera
+   niv=E5n.  Speciellt b=F6r de f=F6rst=E5 att det inte har att g=F6ra med
+   graden av andlig utveckling, esoteriska kunskaper eller n=E5got
+   s=E5dant.
+
+ * Inspirationen till niv=E5erna kommer fr=E5n spel, hemliga ordenssystem,
+   kosmska hiearkier, skr=E5v=E4sen, akademier, politisk administration,
+   osv.  Det =E4r ett element av rollspel. En lek.
+
+ * Olika niv=E5er motsvarar olika roller p=E5 webbplatsen.  Webbplatsen
+   webbmaster och ansvbariga har en viss niv=E5, bes=F6kare och g=E4ster har
+   en annan niv=E5.
+
+ * Alla datorsystem har administrat=F6rssystem f=F6r dem som sk=F6ter
+   systemet.  Jag har valt att arrangera dessa funktioner i en skala.
+   Niv=E5n anger hur mycket av systemet du har r=E4tt att administrera.
+
+ * Att ha ett niv=E5system f=F6r access g=F6r att man kan g=F6ra som p=E5 f=
+ilm;
+   att l=E5ta de med h=F6gre access komma =E5t mer information.  De med
+   riktigt h=F6g niv=E5 kan n=E5 topphemlig information.  P=E5 denna webbpl=
+ats
+   kan varje anv=E4ndae v=E4lja att h=E5lla vissa personliga uppgifter.  Har
+   du h=F6g niv=E5 har du rollen som anv=E4ndaradministrat=F6r och har
+   tillg=E5ng till dessa uppgifter.  Just nu =E4r vi tre personer med
+   denna niv=E5n.
+
+ * Niv=E5systemet =E4r ett m=E5tt p=E5 p=E5litlighet.  Vi ger dig h=F6gre n=
+iv=E5 n=E4r
+   vi litar p=E5 att du inte kommer att f=F6rst=F6ra f=F6r oss.  F=F6r ju h=
+=F6gre
+   niv=E5, desto l=E4ttare kan du sabbotera inneh=E5llet.
+
+ * P=E5 en h=F6gre niv=E5 beh=F6vs det inte bara att vi litar p=E5 att du v=
+ill
+   v=E4l.  Du m=E5ste =E4ven ha ett gott omd=F6me, teknisk f=F6rst=E5else,
+   intresse och logiskt t=E4nkande.  Utan detta =E4r det l=E4tt h=E4nt att =
+du
+   f=F6rst=F6r saker av misstag.
+
+ * Vi vill uppmuntra medlemmarna att g=F6ra det som =E4r bra f=F6r
+   webbplatsen.  Tilldelandet av h=F6gre niv=E5 ska uppmuntra till att
+   g=F6ra det som =E4r bra.
+
+ * F=F6r att minska missbruk av e-postadresser visar vi e-postadresser
+   bara f=F6r de med lite h=F6gre niv=E5.  P=E5 s=E5 vis vill vi undvika att
+   n=E5gon g=E5r med som medlem bara f=F6r att samla e-postadresser f=F6r a=
+tt
+   sedan g=F6ra reklamutskick.
+
+ * Idag n=E5r du olika niv=E5er p=E5 detta vis:
+
+   0. Kom in p=E5 webbplatsen som g=E4st
+
+   1. V=E4lj anv=E4ndarnamn och ange e-postadress
+
+   2. Logga in med det l=F6senord som skickats till dig
+
+   3. Skrivit en presentation
+
+   5. Presentationen har godk=E4nts
+
+   6. Du har svarat p=E5 ett f=E5tal fr=E5gor om dina intressen
+
+   7. Du har svarat p=E5 en massa fr=E5gor om intressen och beskrivit dem
+      detaljerat
+
+  10. N=E5gon v=E4ktare tycker du f=F6rtj=E4nar h=F6gre niv=E5 f=F6r att du=
+ =E4r s=E5
+      trevlig och engagerad i webbplatsen.
+
+  11. Du har gjort ett antal kopplingar mellan =E4mnen och =F6verv=E4gande
+      delan av dem har godk=E4nts av en v=E4ktare, och du accepterar att
+      b=F6rja som l=E4rling i v=E4ktarakademin (jobbet som
+      systemadministrat=F6r)
+
+  12-39. D=E5 och d=E5 tittar jag p=E5 vad du gjort i form av skrivande av
+      texter och arbetande med uppslagsverkets =E4mnen, och justerar din
+      niv=E5 i f=F6rh=E5llande till m=E4ngd och kvalit=E9 p=E5 arbetet
+
+  40. Du har full=E4ndat ett helt =E4mnesomr=E5de.  En m=E4ngd sammanl=E4nk=
+ade
+      =E4mnen med bra textinneh=E5ll.
+
+  41. F=F6rtroende att arbeta med adminstration av medlemsregistret.
+
+  42. Delaktig i utvecklandet av webbplatsens prgrammering.
+
+
+ * Allts=E5.  Automatik tar dig till niv=E5 7.
+
+ * Men som sagt.  Jag har en massa andra planer d=E4r mycket mer kopplas
+   till niv=E5er och d=E4r det finns systemautomatik f=F6r hela v=E4gen till
+   niv=E5 40.
+
+ * 41 och 42 ligger utanf=F6r niv=E5systemet i =F6vrigt.  Den som har de
+   niv=E5erna har inte n=F6dv=E4ndigtvis tagit sig till niv=E5 40 innan. De
+   motsvaras av anv=E4ndaradministrat=F6r och systemadministrat=F6r och
+   niv=E5n speglar maktbefogenheterna snarare =E4n vad man i =F6vrigt gjort
+   f=F6r webbplatsen.
+
+ * Alla texter. Allt inneh=E5ll =E4r =F6ppet f=F6r alla. =C4ven f=F6r bes=
+=F6kare som
+   inte loggar in.  Du kan till och med g=E5 in p=E5
+   administrationssidorna utan att logga in.  Vi g=F6mmer inte inneh=E5ll.
+   Det vi g=F6r =E4r att hindra dig fr=E5n att =E4ndra inneh=E5llet.  Vi d=
+=F6ljer
+   dock en del information om andra medlemmar i syfte att f=E5 s=E5 m=E5nga
+   som m=F6jligt att sj=E4lv skriva in sig och skriva en presentation.
+
+--=20
+/ Jonas  -  http://jonas.example.com/myself/en/index.html
+
+_______________________________________________
+List mailing list
+List@example.com
+http://example.com/cgi-bin/mailman/listinfo/list
+
+
+--=-=-=
+
+
+
+-- 
+/ Jonas  -  http://jonas.example.com/myself/en/index.html
+
+--=-=-=--
+
diff --git a/rt/lib/t/data/new-ticket-from-iso-8859-1 b/rt/lib/t/data/new-ticket-from-iso-8859-1
new file mode 100644
index 000000000..299392d26
--- /dev/null
+++ b/rt/lib/t/data/new-ticket-from-iso-8859-1
@@ -0,0 +1,31 @@
+Return-Path: <hw@nordkapp.net>
+Delivered-To: j@pallas.eruditorum.org
+Received: from sm1.nordkapp.net (sm1.nordkapp.net [62.70.54.150])
+	by pallas.eruditorum.org (Postfix) with ESMTP id 48F4E11112
+	for <jesse@bestpractical.com>; Mon,  2 Jun 2003 14:58:37 -0400 (EDT)
+Received: (qmail 3612 invoked by uid 1009); 2 Jun 2003 18:58:36 -0000
+Received: from unknown (HELO office.nordkapp.net) (213.161.186.83)
+  by 0 with SMTP; 2 Jun 2003 18:58:36 -0000
+Message-Id: <5.2.1.1.0.20030602205708.0314c5f8@mail.nordkapp.net>
+X-Sender: hw@nordkapp.net@mail.nordkapp.net
+X-Mailer: QUALCOMM Windows Eudora Version 5.2.1
+Date: Mon, 02 Jun 2003 20:58:30 +0200
+To: Jesse Vincent <jesse@bestpractical.com>
+From: Wilhelmsen Håvard <hw@nordkapp.net>
+Subject: Re: rt-3.0.3pre1
+In-Reply-To: <20030602185607.GN10811@fsck.com>
+References: <5.2.1.1.0.20030602204834.031406d8@mail.nordkapp.net>
+ <5.2.1.1.0.20030530194214.0371c988@mail.nordkapp.net>
+ <5.2.1.1.0.20030530194214.0371c988@mail.nordkapp.net>
+ <5.2.1.1.0.20030602204834.031406d8@mail.nordkapp.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset="iso-8859-1"; format=flowed
+Content-Transfer-Encoding: 8bit
+X-Spam-Status: No, hits=-1.9 required=5.0
+	tests=AWL,EMAIL_ATTRIBUTION,IN_REP_TO,QUOTED_EMAIL_TEXT,
+	      REFERENCES,REPLY_WITH_QUOTES
+	autolearn=ham version=2.55
+X-Spam-Level: 
+X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp)
+
+Håvard
diff --git a/rt/lib/t/data/new-ticket-from-iso-8859-1-full b/rt/lib/t/data/new-ticket-from-iso-8859-1-full
new file mode 100644
index 000000000..493ca1591
--- /dev/null
+++ b/rt/lib/t/data/new-ticket-from-iso-8859-1-full
@@ -0,0 +1,38 @@
+X-Mailer: QUALCOMM Windows Eudora Version 5.2.1
+To: Jesse Vincent <jesse@bestpractical.com>
+From: Wilhelmsen Håvard <hw@nordkapp.net>
+Subject: Re: rt-3.0.3pre1
+X-Spam-Status: No, hits=-1.9 required=5.0
+	tests=AWL,EMAIL_ATTRIBUTION,IN_REP_TO,QUOTED_EMAIL_TEXT,
+	      REFERENCES,REPLY_WITH_QUOTES
+	autolearn=ham version=2.55
+X-Spam-Level: 
+X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp)
+
+At 14:56 02.06.2003 -0400, you wrote:
+>> This patch didn't help us out.
+>> We still got problems with auto responding e-mails sent from the system
+>> when a new ticket is created.
+>> The same problem appears when one of the staff replays to an new ticket.
+>> All Norwegian letters is converted to strange letters like ø
+>>
+>> We would love if this bug could be fixed. On our mail server we are 
+>running
+>> perl 5.6.1 since we are using debian stabel packet lists.
+>
+>I'd love it too. I just can't find it. Can you send me
+>(jesse@bestpractical.com) a couple of email messages containing
+>characters that break your RT?
+
+Hello again,
+
+Thanks for your fast replay!
+
+I don't know how this looks at your end but it is letters like: ø æ å
+If your want to make this in html it will be &oslash; &aring; and &aerlig;
+
+
+-- 
+HÃ¥vard 
+
+
diff --git a/rt/lib/t/data/russian-subject-no-content-type b/rt/lib/t/data/russian-subject-no-content-type
new file mode 100644
index 000000000..03d95b8c4
--- /dev/null
+++ b/rt/lib/t/data/russian-subject-no-content-type
@@ -0,0 +1,42 @@
+Return-Path: <mitya@fling-wing.example.com>
+X-Real-To: <mitya@second.example.com>
+Received: from [194.87.5.31] (HELO sinbin.example.com)
+  by cgp.second.example.com (CommuniGate Pro SMTP 4.0.5/D)
+  with ESMTP-TLS id 69661026 for mitya@second.example.com; Wed, 18 Jun 2003 11:14:49 +0400
+Received: (from daemon@localhost)
+	by sinbin.example.com (8.12.8/8.11.6) id h5I7EfOj096595
+	for mitya@second.example.com; Wed, 18 Jun 2003 11:14:41 +0400 (MSD)
+	(envelope-from mitya@fling-wing.example.com)
+Received: from example.com by sinbin.example.com with ESMTP id h5I7Ee8K096580;
+	(8.12.9/D) Wed, 18 Jun 2003 11:14:40 +0400 (MSD)
+X-Real-To: <mitya@second.example.com>
+Received: from [194.87.0.31] (HELO mail.example.com)
+  by example.com (CommuniGate Pro SMTP 4.1b7/D)
+  with ESMTP id 76217696 for mitya@example.com; Wed, 18 Jun 2003 11:14:40 +0400
+Received: by mail.example.com (CommuniGate Pro PIPE 4.1b7/D)
+  with PIPE id 63920083; Wed, 18 Jun 2003 11:14:40 +0400
+Received: from [194.87.5.69] (HELO fling-wing.example.com)
+  by mail.example.com (CommuniGate Pro SMTP 4.1b7/D)
+  with ESMTP-TLS id 63920055 for mitya@example.com; Wed, 18 Jun 2003 11:14:38 +0400
+Received: from fling-wing.example.com (localhost [127.0.0.1])
+	by fling-wing.example.com (8.12.9/8.12.6) with ESMTP id h5I7Ec5R000153
+	for <mitya@example.com>; Wed, 18 Jun 2003 11:14:38 +0400 (MSD)
+	(envelope-from mitya@fling-wing.example.com)
+Received: (from mitya@localhost)
+	by fling-wing.example.com (8.12.9/8.12.6/Submit) id h5I7Ec0J000152
+	for mitya@example.com; Wed, 18 Jun 2003 11:14:38 +0400 (MSD)
+Date: Wed, 18 Jun 2003 11:14:38 +0400 (MSD)
+From: "Dmitry S. Sivachenko" <mitya@fling-wing.example.com>
+Message-Id: <200306180714.h5I7Ec0J000152@fling-wing.example.com>
+To: mitya@example.com
+Subject: ÔÅÓÔ ÔÅÓÔ
+X-Spam-Checker-Version: SpamAssassin 2.60-cvs-mail.demos (1.193-2003-06-13-exp)
+X-Spam-Level: +
+X-Spam-Status: No, hits=1.0 required=5.0 tests=SUBJ_ILLEGAL_CHARS autolearn=no
+	version=2.60-cvs-mail.demos
+X-Spam-Report: * SUBJ_ILLEGAL_CHARS  1.0 (Subject contains too many raw illegal characters)
+	
+Content-Length: 6
+
+ôåóô
+
diff --git a/rt/lib/t/data/text-html-in-russian b/rt/lib/t/data/text-html-in-russian
new file mode 100644
index 000000000..b965b1b59
--- /dev/null
+++ b/rt/lib/t/data/text-html-in-russian
@@ -0,0 +1,87 @@
+From rickt@other-example.com  Tue Jun 17 20:39:13 2003
+Return-Path: <rickt@other-example.com>
+X-Original-To: info
+Delivered-To: mitya@vh.example.com
+Received: from example.com (mx.example.com [194.87.0.32])
+	by vh.example.com (Postfix) with ESMTP id 8D77B16E6BD
+	for <info>; Tue, 17 Jun 2003 20:39:05 +0400 (MSD)
+Received: from hotline@example.com
+  by example.com (CommuniGate Pro GROUP 4.1b7/D)
+  with GROUP id 76033026; Tue, 17 Jun 2003 20:38:00 +0400
+Received: by example.com (CommuniGate Pro PIPE 4.1b7/D)
+  with PIPE id 76033052; Tue, 17 Jun 2003 20:38:00 +0400
+Received: from [217.132.49.75] (HELO compuserve.com)
+  by example.com (CommuniGate Pro SMTP 4.1b7/D)
+  with SMTP id 76032971 for info@example.com; Tue, 17 Jun 2003 20:37:41 +0400
+Date: Wed, 18 Jun 2003 01:41:01 +0000
+From: Ó÷åáíûé Öåíòð <rickt@other-example.com>
+Subject: Ïðèãëàøàåì ðóêîâîäèòåëÿ, íà÷àëüíèêîâ ïîäðàçäåëåíèé íà òðåíèíã                                                         YXLWLJ3LPT9UHuLyGTzyuKQc06eIZ96Y6RVTCZFt
+To: Info <info@example.com>
+References: <0ID97EGL951H1907@example.com>
+In-Reply-To: <0ID97EGL951H1907@example.com>
+Message-ID: <HDE46LIK8GGJJ72I@other-example.com>
+MIME-Version: 1.0
+Content-Type: text/html; charset=Windows-1251
+Content-Transfer-Encoding: 8bit
+X-Spam-Flag: YES
+X-Spam-Checker-Version: SpamAssassin 2.60-cvs-jumbo.demos (1.190-2003-06-01-exp)
+X-Spam-Level: ++++++++++++++
+X-Spam-Status: Yes, hits=14.9 required=5.0 tests=BAYES_99,DATE_IN_FUTURE_06_12
+	FROM_ILLEGAL_CHARS,HTML_10_20,HTML_FONTCOLOR_UNKNOWN,HTML_FONT_BIG
+	MIME_HTML_ONLY,RCVD_IN_NJABL,SUBJ_HAS_SPACES,SUBJ_HAS_UNIQ_ID
+	SUBJ_ILLEGAL_CHARS autolearn=no version=2.60-cvs-jumbo.demos
+X-Spam-Report: 14.9 points, 5.0 required;
+	*  2.3 -- Subject contains lots of white space
+	*  1.0 -- BODY: HTML font color is unknown to us
+	*  0.3 -- BODY: FONT Size +2 and up or 3 and up
+		  [score: 1.0000]
+	*  2.8 -- BODY: Bayesian classifier spam probability is 99 to 100%
+	*  1.0 -- BODY: Message is 10% to 20% HTML
+	*  1.0 -- From contains too many raw illegal characters
+	*  1.0 -- Subject contains a unique ID
+	*  1.0 -- Subject contains too many raw illegal characters
+	*  1.2 -- Date: is 6 to 12 hours after Received: date
+		  [217.132.49.75 listed in dnsbl.njabl.org]
+	*  1.2 -- RBL: Received via a relay in dnsbl.njabl.org
+	*  2.0 -- Message only has text/html MIME parts
+Status: RO
+Content-Length: 2743
+Lines: 36
+
+<html><body><basefont face="times new roman, times, serif" size="2">
+<center>Ó÷eáíûé Öeíòp "ÊÀÄÐÛ ÄÅËÎÂÎÃÎ ÌÈÐÀ" ïpèãëaøaeò ía òpeíèíã:<br>
+<font size="5"><b>ÌÎÒÈÂÀÖÈß ÊÀÊ ÈÍÑÒÐÓÌÅÍÒ ÓÏÐÀÂËÅÍÈß ÏÅÐÑÎÍÀËÎÌ</b></font><br>
+<font color="red"><b>19 èþíÿ 2003 ã.</b></font><br>
+<b><i>Òpeíèíã ïpeäíaçía÷eí äëÿ âûcøeão è cpeäíeão óïpaâëeí÷ecêoão ïepcoíaëa.</i></b><br></center><br>
+<p align="justify"><b>Òpeíep: Áopìoòoâ Ïaâeë.</b> Ïpaêòè÷ecêèé ïcèõoëoã, oïûò paáoòû áoëee 10 ëeò â oáëacòè ïcèõoëoãèè è áèçíec-òpeíèíãoâ. Àâòop pÿäa ïóáëèêaöèé è ìeòoäè÷ecêèõ ïocoáèé paçëè÷íûõ íaïpaâëeíèé ïcèõoëoãèè, â òoì ÷ècëe: “Òeõíoëoãèÿ äeëoâoão oáùeíèÿ”, “Òeõíèêè è ïpèeìû ýôôeêòèâíûõ ïepeãoâopoâ”, “Ñòpaòeãèè ôopìèpoâaíèÿ êopïopaòèâíoão èìèäæa” è äp. Çaêoí÷èë ËÃÓ ôaêóëüòeò coöèaëüíoé ïcèõoëoãèè, Ðoccèécêóþ Àêaäeìèþ ãocóäapcòâeííoé cëóæáû ïpè Ïpeçèäeíòe ÐÔ, êópcû MBA.<br><br>
+<b><u>Öeëè òpeíèíãa:</u></b><br>
+1. Îcâoèòü ïpèeìû óïpaâëeíèÿ ìoòèâaöèeé;<br>
+2. Ïoëó÷èòü ïpaêòè÷ecêèe íaâûêè ìoòèâaöèè ïepcoíaëa ê paáoòe;<br>
+3. Îcâoèòü ocíoâíûe íaâûêè êoìaíäooápaçoâaíèÿ;<br>
+4. Îâëaäeòü ïpaêòè÷ecêèìè ìeòoäaìè coçäaíèÿ è ócèëeíèÿ paáo÷eé ìoòèâaöèè, êoìaíäooápaçoâaíèÿ.<br><br>
+<b><u>Çaäa÷è òpeíèíãa:</u></b><br>
+&nbsp;- Îcâoèòü ìeòoäû ïoáóæäeíèÿ äpóãèõ ëþäeé ê âûïoëíeíèþ oïpeäeëeííoé äeÿòeëüíocòè;<br>
+&nbsp;- Íaó÷èòücÿ íaïpaâëÿòü ïoáóæäeíèÿ coòpóäíèêoâ â cooòâeòcòâèe c çaäa÷aìè opãaíèçaöèè.<br><br>
+<b><u>Ñoäepæaíèe ïpoãpaììû:</u></b><br>
+<b>I. Ìaòepèaëüíûe è íeìaòepèaëüíûe ôopìû ìoòèâaöèè:</b><br>
+1. Ìecòo è poëü ìoòèâaöèè â óïpaâëeíèè ïepcoíaëoì;<br>
+2. Ïpaêòèêa óïpaâëeíèÿ opãaíèçaöèÿìè.<br>
+<b>II. Ïpaêòè÷ecêoe ïpèìeíeíèe ìoòèâaöèè â óïpaâëeíèè ïepcoíaëoì:</b><br>
+1. Àíòèìoòèâèpóþùèe pacïopÿæeíèÿ;<br>
+2. Ìoòèâaöèÿ è oöeíêa äeÿòeëüíocòè (poëü aòòecòaöèè coòpóäíèêoâ);<br>
+3. Ìoòèâaöèÿ è ïpaêòèêa íaêaçaíèé.<br><br>
+<b><u>Â çaâepøeíèè ïpoãpaììû ó÷acòíèêè cìoãóò:</u></b><br>
+1. Îpèeíòèpoâaòü coòpóäíèêoâ ía äocòèæeíèe oïpeäeëeííoão peçóëüòaòa;<br>
+2. Îâëaäeòü íeoáõoäèìûìè íaâûêaìè óïpaâëeíèÿ ìoòèâaöèeé ïepcoíaëa;<br>
+3. Ïpèìeíÿòü ïoëó÷eííûe çíaíèÿ â ïpaêòèêe óïpaâëeíèÿ ïepcoíaëoì;<br>
+4. Îïpeäeëÿòü èíäèâèäóaëüíûe ocoáeííocòè (ïpeäïo÷òeíèÿ) ìoòèâaöèè coòpóäíèêoâ â opãaíèçaöèè.<br>
+<i> õoäe òpeíèíãa ècïoëüçóeòcÿ paáo÷èé è cïpaâo÷íûé ìaòepèaë ïo ìoòèâaöèè è còèìóëèpoâaíèþ ïepcoíaëa poccèécêèõ êoìïaíèé. Ïo oêoí÷aíèè âûäaeòcÿ cepòèôèêaò.</i><br><br>
+<center>Ïpoäoëæèòeëüíocòü: 1 äeíü, 8 ÷acoâ (äâa ïepepûâa, oáeä)<br>
+<b>Ñòoèìocòü ó÷acòèÿ: 4 700 póáëeé áeç ÍÄÑ.</b><br>
+921-5862, 928-4156, 928-4200, 928-5321</center><br>
+<font size=1>  Åcëè èíôopìaöèÿ ïoäoáíoão poäa Âac íe èíòepecóeò è ïo äpóãèì âoïpocaì - ïèøèòe:  <a href="mailto:motiv@mailje.nl">seminar</a></font>
+<br><font size="1" color="#ffffff">3ZkRPb60QBbiHef1IRVl</font>
+</body></html>
+
+
+
diff --git a/rt/lib/t/data/text-html-with-umlaut b/rt/lib/t/data/text-html-with-umlaut
new file mode 100644
index 000000000..90e5d3fa9
--- /dev/null
+++ b/rt/lib/t/data/text-html-with-umlaut
@@ -0,0 +1,35 @@
+Return-Path: <gst@example.com>
+Delivered-To: j@pallas.eruditorum.org
+Received: from vis.example.com (vis.example.com [212.68.68.251])
+	by pallas.eruditorum.org (Postfix) with SMTP id 59236111C3
+	for <jesse@example.com>; Thu, 12 Jun 2003 02:14:44 -0400 (EDT)
+Received: (qmail 29541 invoked by uid 502); 12 Jun 2003 06:14:42 -0000
+Received: from sivd.example.com (HELO example.com) (192.168.42.1)
+  by 192.168.42.42 with SMTP; 12 Jun 2003 06:14:42 -0000
+Received: received from 172.20.72.174 by odie.example.com; Thu, 12 Jun 2003 08:14:27 +0200
+Received: by mailserver.example.com with Internet Mail Service (5.5.2653.19) id <LJSB7T54>; Thu, 12 Jun 2003 08:14:39 +0200
+Message-ID: <50362EC956CBD411A339009027F6257E013DD495@mailserver.example.com>
+Date: Thu, 12 Jun 2003 08:14:39 +0200
+From: "Stever, Gregor" <gst@example.com>
+MIME-Version: 1.0
+X-Mailer: Internet Mail Service (5.5.2653.19)
+To: "'jesse@example.com'" <jesse@example.com>
+Subject: An example of mail containing text-html with an umlaut in the content
+Date: Thu, 12 Jun 2003 08:14:39 +0200
+Content-Type: text/html;
+	charset="iso-8859-1"
+Content-Transfer-Encoding: quoted-printable
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD>
+<META HTTP-EQUIV=3D"Content-Type" CONTENT=3D"text/html; charset=3Diso-8859-=
+1">
+
+
+<META content=3D"MSHTML 6.00.2800.1170" name=3DGENERATOR></HEAD>
+<BODY>
+<DIV><FONT face=3DArial><FONT size=3D2>Hello,<BR><BR>ist this kind of Messa=
+ges, that=20
+causes rt to crash.<BR><BR>Mit freundlichen Gr=FC=DFen<BR>Gregor=20
+Stever&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ^^causes Error<SPAN=20
+class=3D975501206-12062003>!!</SPAN></FONT></FONT></DIV></BODY></HTML>
diff --git a/rt/lib/t/regression/00placeholder b/rt/lib/t/regression/00placeholder
new file mode 100644
index 000000000..0afc6045c
--- /dev/null
+++ b/rt/lib/t/regression/00placeholder
@@ -0,0 +1 @@
+1;
diff --git a/rt/lib/t/regression/mime_tests b/rt/lib/t/regression/mime_tests
new file mode 100644
index 000000000..26e4dbf84
--- /dev/null
+++ b/rt/lib/t/regression/mime_tests
@@ -0,0 +1,19 @@
+use RT::Ticket;
+use RT::Queue;
+
+use MIME::Parser;
+use File::Temp;
+use RT::EmailParser;
+
+open (HANDLE, "data/nested-mime-sample");
+my $parser = RT::EmailParser->new()
+ $parser->ParseMIMEEntityFromFileHandle(\*HANDLE);
+my $entity = $parser->Entity;
+
+my $q = RT::Queue->new($RT::SystemUser);
+$q->Load('general');
+ok ($q->Id, "Queue is loaded");
+my $Ticket = RT::Ticket->new($RT::SystemUser);
+my ($tid, $ttid, $msg) =$Ticket->Create( Queue => $q->Id, Subject => "Nested mime test", MIMEObj => $entity);
+ok ($tid, $msg);
+ok($Ticket->Id);
diff --git a/rt/m4/rt_enable_layout.m4 b/rt/m4/rt_enable_layout.m4
new file mode 100644
index 000000000..cadec1cf2
--- /dev/null
+++ b/rt/m4/rt_enable_layout.m4
@@ -0,0 +1,36 @@
+dnl
+dnl @synopsis RT_ENABLE_LAYOUT()
+dnl
+dnl Enable a specific directory layout for the installation to use.
+dnl This configures a command-line parameter that can be specified
+dnl at ./configure invocation.
+dnl
+dnl The use of this feature in this way is a little hackish, but
+dnl better than a heap of options for every directory.
+dnl
+dnl This code is heavily borrowed *cough* from the Apache 2 code.
+dnl
+
+AC_DEFUN([RT_ENABLE_LAYOUT],[
+AC_ARG_ENABLE(layout,
+	      AC_HELP_STRING([--enable-layout=LAYOUT],
+	      		     [Use a specific directory layout (Default: RT3)]),
+	      LAYOUT=$enableval)
+
+if test "x$LAYOUT" = "x"; then
+	LAYOUT="RT3"
+fi
+RT_LAYOUT($srcdir/config.layout, $LAYOUT)
+AC_MSG_CHECKING(for chosen layout)
+if test "x$rt_layout_name" = "xno"; then
+	if test "x$LAYOUT" = "xno"; then
+		AC_MSG_RESULT(none)
+	else
+		AC_MSG_RESULT($LAYOUT)
+	fi
+	AC_MSG_ERROR([a valid layout must be specified (or the default used)])
+else
+	AC_SUBST(rt_layout_name)
+	AC_MSG_RESULT($rt_layout_name)
+fi
+])
diff --git a/rt/m4/rt_expand_var.m4 b/rt/m4/rt_expand_var.m4
new file mode 100644
index 000000000..cec884abc
--- /dev/null
+++ b/rt/m4/rt_expand_var.m4
@@ -0,0 +1,18 @@
+dnl
+dnl @synopsis	RT_EXPAND_VAR(baz, $fraz)
+dnl
+dnl Iteratively expands the second parameter, until successive iterations
+dnl yield no change. The result is then assigned to the first parameter.
+dnl
+dnl This code is heavily borrowed from the Apache 2 codebase.
+dnl
+
+AC_DEFUN([RT_EXPAND_VAR],[
+	ap_last=''
+	ap_cur='$2'
+	while test "x${ap_cur}" != "x${ap_last}"; do
+		ap_last="${ap_cur}"
+		ap_cur=`eval "echo ${ap_cur}"`
+	done
+	$1="${ap_cur}"
+])
diff --git a/rt/m4/rt_layout.m4 b/rt/m4/rt_layout.m4
new file mode 100644
index 000000000..393b32175
--- /dev/null
+++ b/rt/m4/rt_layout.m4
@@ -0,0 +1,74 @@
+dnl
+dnl @synopsis RT_LAYOUT(configlayout, layoutname)
+dnl
+dnl This macro reads an Apache-style layout file (specified as the
+dnl configlayout parameter), and searches for a specific layout
+dnl (named using the layoutname parameter).
+dnl
+dnl The entries for a given layout are then inserted into the
+dnl environment such that they become available as substitution
+dnl variables. In addition, the rt_layout_name variable is set
+dnl (but not exported) if the layout is valid.
+dnl
+dnl This code is heavily borrowed *cough* from the Apache 2 codebase.
+dnl
+
+AC_DEFUN([RT_LAYOUT],[
+	if test ! -f $srcdir/config.layout; then
+		AC_MSG_WARN([Layout file $srcdir/config.layout not found])
+		rt_layout_name=no
+	else
+		pldconf=./config.pld
+		$PERL  -0777 -p -e "\$layout = '$2';"  -e '
+		s/.*<Layout\s+$layout>//gims; 
+		s/\<\/Layout\>.*//s; 
+		s/^#.*$//m;
+		s/^\s+//gim;
+		s/\s+$/\n/gim;
+		s/\+$/\/rt3/gim;
+		# m4 will not let us just use $1, we need @S|@1
+		s/^\s*((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
+		s/^\s*(.*?)\s*:\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim;
+		 ' < $1 > $pldconf
+
+		if test -s $pldconf; then
+			rt_layout_name=$2
+			. $pldconf
+			changequote({,})
+			for var in prefix exec_prefix bindir sbindir \
+				 sysconfdir mandir libdir datadir htmldir \
+				 localstatedir logfiledir masonstatedir \
+				 sessionstatedir customdir custometcdir customhtmldir \
+				 customlexdir customlibdir manualdir; do
+				eval "val=\"\$$var\""
+				val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
+				val=`echo $val | 
+					sed -e 's:[\$]\([a-z_]*\):${\1}:g'`
+				eval "$var='$val'"
+			done
+			changequote([,])
+		else
+			rt_layout_name=no
+		fi
+		#rm $pldconf
+	fi
+	RT_SUBST_EXPANDED_ARG(prefix)
+	RT_SUBST_EXPANDED_ARG(exec_prefix)
+	RT_SUBST_EXPANDED_ARG(bindir)
+	RT_SUBST_EXPANDED_ARG(sbindir)
+	RT_SUBST_EXPANDED_ARG(sysconfdir)
+	RT_SUBST_EXPANDED_ARG(mandir)
+	RT_SUBST_EXPANDED_ARG(libdir)
+	RT_SUBST_EXPANDED_ARG(datadir)
+	RT_SUBST_EXPANDED_ARG(htmldir)
+	RT_SUBST_EXPANDED_ARG(manualdir)
+	RT_SUBST_EXPANDED_ARG(localstatedir)
+	RT_SUBST_EXPANDED_ARG(logfiledir)
+	RT_SUBST_EXPANDED_ARG(masonstatedir)
+	RT_SUBST_EXPANDED_ARG(sessionstatedir)
+	RT_SUBST_EXPANDED_ARG(customdir)
+	RT_SUBST_EXPANDED_ARG(custometcdir)
+	RT_SUBST_EXPANDED_ARG(customhtmldir)
+	RT_SUBST_EXPANDED_ARG(customlexdir)
+	RT_SUBST_EXPANDED_ARG(customlibdir)
+])dnl
diff --git a/rt/m4/rt_subst_expanded_arg.m4 b/rt/m4/rt_subst_expanded_arg.m4
new file mode 100644
index 000000000..02002b08f
--- /dev/null
+++ b/rt/m4/rt_subst_expanded_arg.m4
@@ -0,0 +1,14 @@
+dnl
+dnl @synopsis	RT_SUBST_EXPANDED_ARG(var)
+dnl
+dnl Export (via AC_SUBST) a given variable, along with an expanded
+dnl version of the variable (same name, but with exp_ prefix).
+dnl
+dnl This code is heavily borrowed *cough* from the Apache 2 source.
+dnl
+
+AC_DEFUN([RT_SUBST_EXPANDED_ARG],[
+	RT_EXPAND_VAR(exp_$1, [$]$1)
+	AC_SUBST($1)
+	AC_SUBST(exp_$1)
+])
diff --git a/rt/sbin/extract-message-catalog b/rt/sbin/extract-message-catalog
new file mode 100644
index 000000000..af7b2c733
--- /dev/null
+++ b/rt/sbin/extract-message-catalog
@@ -0,0 +1,246 @@
+#!/usr/bin/perl -w 
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+# Portions Copyright 2002 Autrijus Tang <autrijus@autrijus.org>
+
+use strict;
+
+use File::Find;
+use File::Copy;
+use Regexp::Common;
+use Carp;
+
+use vars qw($DEBUG $FILECAT);
+
+$DEBUG = 1;
+
+@ARGV = <lib/RT/I18N/*.po> unless @ARGV;
+
+$FILECAT = {};
+
+# extract all strings and stuff them into $FILECAT
+File::Find::find( { wanted => \&extract_strings_from_code, follow => 0 }, '.' );
+
+# ensure proper escaping and [_1] => %1 transformation
+foreach my $str ( sort keys %{$FILECAT} ) {
+    my $entry = $FILECAT->{$str};
+    my $oldstr = $str;
+
+    $str =~ s/\\/\\\\/g;
+    $str =~ s/\"/\\"/g;
+    $str =~ s/((?<!~)(?:~~)*)\[_(\d+)\]/$1%$2/g;
+    $str =~ s/((?<!~)(?:~~)*)\[([A-Za-z#*]\w*),([^\]]+)\]/"$1%$2(".escape($3).")"/eg;
+    $str =~ s/~([\[\]])/$1/g;
+
+    delete $FILECAT->{$oldstr};
+    $FILECAT->{$str} = $entry;
+}
+
+# update all language dictionaries
+foreach my $dict (@ARGV) {
+    $dict = "lib/RT/I18N/$dict.po" unless -f $dict or $dict =~ m!/!;
+
+    my $lang = $dict;
+    $lang =~ s|.*/||;
+    $lang =~ s|\.po$||;
+
+    update($lang, $dict);
+}
+
+
+# {{{ pull strings out of the code.
+
+sub extract_strings_from_code {
+    my $file = $_;
+
+    local $/;
+    return if ( -d $_ );
+    return if ( $File::Find::dir =~ 'lib/blib|lib/t/autogen|var|m4|local' );
+    return if ( /\.po$|\.bak$|~|,D|,B$|extract-message-catalog$/ );
+    return if ( /^[\.#]/ );
+    return if ( -f "$_.in" );
+
+    print "Looking at $File::Find::name\n";
+    my $filename = $File::Find::name;
+    $filename =~ s'^\./'';
+    $filename =~ s'\.in$'';
+
+    unless (open _, $file) {
+        print "Cannot open $file for reading ($!), skipping.\n";
+        return;
+    }
+
+    $_ = <_>;
+
+    # Mason filter: <&|/l>...</&>
+    my $line = 1;
+    while (m!\G.*?<&\|/l(.*?)&>(.*?)</&>!sg) {
+        my ( $vars, $str ) = ( $1, $2 );
+        $line += ( () = ( $& =~ /\n/g ) );    # cryptocontext!
+        $str =~ s/\\'/\'/g;
+        #print "STR IS $str\n";
+        push @{ $FILECAT->{$str} }, [ $filename, $line, $vars ];
+    }
+
+    # Localization function: loc(...)
+    $line = 1;
+    pos($_) = 0;
+    while (m/\G.*?\bloc$RE{balanced}{-parens=>'()'}{-keep}/sg) {
+        my $match = $1;
+        $line += ( () = ( $& =~ /\n/g ) );    # cryptocontext!
+
+        my ( $vars, $str );
+        if ( $match =~
+                /\(\s*($RE{delimited}{-delim=>q{'"}}{-keep})(.*?)\s*\)$/ ) {
+
+            $str = substr( $1, 1, -1 );       # $str comes before $vars now
+            $vars = $9;
+        }
+        else {
+            next;
+        }
+
+        $vars =~ s/[\n\r]//g;
+        $str  =~ s/\\'/\'/g;
+
+        push @{ $FILECAT->{$str} }, [ $filename, $line, $vars ];
+    }
+
+    # Comment-based mark: "..." # loc
+    $line = 1;
+    pos($_) = 0;
+    while (m/\G.*?($RE{delimited}{-delim=>q{'"}}{-keep})[\}\)\],]*\s*\#\s*loc\s*$/smg) {
+	my $str = substr($1, 1, -1);
+	$line += ( () = ( $& =~ /\n/g ) );    # cryptocontext!
+	$str  =~ s/\\'/\'/g;
+	push @{ $FILECAT->{$str} }, [ $filename, $line, '' ];
+    }
+
+    # Comment-based pair mark: "..." => "..." # loc_pair
+    $line = 1;
+    pos($_) = 0;
+    while (m/\G.*?(\w+)\s*=>\s*($RE{delimited}{-delim=>q{'"}}{-keep})[\}\)\],]*\s*\#\s*loc_pair\s*$/smg) {
+	my $key = $1;
+	my $val = substr($2, 1, -1);
+	$line += ( () = ( $& =~ /\n/g ) );    # cryptocontext!
+	$key  =~ s/\\'/\'/g;
+	$val  =~ s/\\'/\'/g;
+	push @{ $FILECAT->{$key} }, [ $filename, $line, '' ];
+	push @{ $FILECAT->{$val} }, [ $filename, $line, '' ];
+    }
+
+    close (_);
+}
+# }}} extract from strings
+
+sub update {
+    my $lang = shift;
+    my $file = shift;
+    my ( %Lexicon, %Header);
+    my $out = '';
+
+    unless (!-e $file or -w $file) {
+	warn "Can't write to $lang, skipping...\n";
+	return;
+    }
+
+    print "Updating $lang...\n";
+
+    my @lines;
+    @lines = (<LEXICON>) if open (LEXICON, $file);
+    @lines = grep { !/^(#(:|\.)\s*|$)/ } @lines;
+    while (@lines) {
+        my $msghdr = "";
+        $msghdr .= shift @lines while ( $lines[0] && $lines[0] !~ /^msgid/ );
+        my $msgid  = shift @lines;
+        my $msgstr = "";
+        $msgstr .= shift @lines while ( $lines[0] && $lines[0] =~ /^(msgstr|")/ );
+
+        last unless $msgid;
+
+        chomp $msgid;
+        chomp $msgstr;
+        $msgid  =~ s/^msgid "(.*)"$/$1/    or warn $msgid;
+        $msgstr =~ s/^msgstr "(.*)"$/$1/ms or warn $msgstr;
+
+        $Lexicon{$msgid} = $msgstr;
+        $Header{$msgid}  = $msghdr;
+    }
+
+    my $is_english = ( $lang =~ /^en(?:[^A-Za-z]|$)/ );
+
+    foreach my $str ( sort keys %{$FILECAT} ) {
+        $Lexicon{$str} ||= '';;
+    }
+    foreach ( sort keys %Lexicon ) {
+        my $f = join ( ' ', sort map $_->[0].":".$_->[1], @{ $FILECAT->{$_} } );
+        my $nospace = $_;
+        $nospace =~ s/ +$//;
+
+        if ( !$Lexicon{$_} and $Lexicon{$nospace} ) {
+            $Lexicon{$_} =
+              $Lexicon{$nospace} . ( ' ' x ( length($_) - length($nospace) ) );
+        }
+
+        next if !length( $Lexicon{$_} ) and $is_english;
+
+        my %seen;
+        $out .= $Header{$_} if exists $Header{$_};
+        if ( $f && $f !~ /^\s+$/ ) {
+
+            $out .= "#: $f\n";
+        }
+        elsif ($_) {
+            $out .= "#: NOT FOUND IN SOURCE\n";
+        }
+        foreach my $entry ( grep { $_->[2] } @{ $FILECAT->{$_} } ) {
+            my ( $file, $line, $var ) = @{$entry};
+            $var =~ s/^\s*,\s*//;
+            $var =~ s/\s*$//;
+            $out .= "#. ($var)\n" unless $seen{$var}++;
+        }
+        $out .= "msgid \"$_\"\nmsgstr \"$Lexicon{$_}\"\n\n";
+    }
+
+    open PO, ">$file" or die $!;
+    print PO $out;
+    close PO;
+
+    return 1;
+}
+
+sub escape {
+    my $text = shift;
+    $text =~ s/\b_(\d+)/%$1/;
+    return $text;
+}
+
+__END__
+# Local variables:
+# c-indentation-style: bsd
+# c-basic-offset: 4
+# indent-tabs-mode: nil
+# End:
+# vim: expandtab shiftwidth=4:
diff --git a/rt/sbin/extract_pod_tests b/rt/sbin/extract_pod_tests
new file mode 100644
index 000000000..ed01c7dc2
--- /dev/null
+++ b/rt/sbin/extract_pod_tests
@@ -0,0 +1,129 @@
+#!/usr/bin/perl
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+use strict;
+use vars qw($VERSION);
+$VERSION = '0.06';
+
+use Pod::Tests;
+use Symbol;
+
+=pod
+
+=head1 NAME
+
+extract_pod_tests -  RT-specific variant of pod2tests
+
+=head1 SYNOPSIS
+
+  pod2test [-Mmodule] [input [output]]
+
+=head1 DESCRIPTION
+
+B<pod2test> is a front-end for Test::Inline.  It generates the 
+"Bodies" of MakeMaker style .t testing files from embedded tests and 
+code examples.
+
+If output is not specified, the resulting .t file will go to STDOUT.
+Otherwise, it will go to the given output file.  If input is not
+given, it will draw from STDIN.
+
+If the given file contains no tests or code examples, no output will
+be given and no output file will be created.
+
+=cut
+
+my($infile, $outfile) = @ARGV;
+my($infh,$outfh);
+
+
+if( defined $infile ) {
+    $infh = gensym;
+    open($infh, $infile) or 
+      die "Can't open the POD file $infile: $!";
+}
+else {
+    $infh = \*STDIN;
+}
+
+unless ($outfile) {
+     ( my $test = $infile ) =~ s/\.(pm|pod)$//;
+            $test =~ s/^lib\W//;
+            $test =~ s/\W/-/;
+            $test =~ s/\//__/g;
+
+        $outfile = "lib/t/autogen/autogen-$test.t";
+}
+
+
+my $p = Pod::Tests->new;
+$p->parse_fh($infh);
+
+# XXX Hack to put the filename into the #line directive
+$p->{file} = $infile || '';
+
+my @tests    = $p->build_tests($p->tests);
+my @examples = $p->build_examples($p->examples);
+
+exit unless @tests or @examples;
+
+
+if( defined $outfile) {
+    $outfh = gensym;
+    open($outfh, ">$outfile") or
+      die "Can't open the test file $outfile: $!";
+}
+else {
+    $outfh = \*STDOUT;
+}
+
+
+
+foreach my $test (@tests, @examples) {
+    print $outfh "$test\n";
+}
+
+print $outfh "1;\n";
+
+=pod
+
+=head1 BUGS and CAVEATS
+
+This is a very simple rough cut.  It only does very rudimentary tests
+on the examples.
+
+=head1 AUTHOR
+
+
+
+Based on pod2tests by Michael G Schwern <schwern@pobox.com>
+
+=head1 SEE ALSO
+
+L<Test::Inline>
+
+=cut
+
+1;
diff --git a/rt/sbin/factory b/rt/sbin/factory
new file mode 100644
index 000000000..8abb1922f
--- /dev/null
+++ b/rt/sbin/factory
@@ -0,0 +1,427 @@
+#!/usr/bin/perl
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+use DBI;
+
+my $database  = shift;
+my $namespace = shift;
+
+my $CollectionBaseclass = 'RT::SearchBuilder';
+my $RecordBaseclass     = 'RT::Record';
+
+my $driver   = 'mysql';
+my $hostname = 'localhost';
+my $user     = 'root';
+my $password = '';
+
+
+my $LicenseBlock = << '.';
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+.
+
+my $Attribution = << '.';
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+.
+
+my $dsn = "DBI:$driver:database=$database;host=$hostname";
+
+my $dbh = DBI->connect( $dsn, $user, $password );
+
+#get all tables out of database
+my @tables = $dbh->tables();
+
+my ( %tablemap, $typemap, %modulemap );
+
+foreach my $table (@tables) {
+    next if ($table eq 'sessions');
+    $tablemap{$table}  = $table;
+    $modulemap{$table} = $table;
+    if ( $table =~ /^(.*)s$/ ) {
+        $tablemap{$1}  = $table;
+        $modulemap{$1} = $1;
+    }
+}
+$tablemap{'CreatedBy'} = 'User';
+$tablemap{'UpdatedBy'} = 'User';
+
+$typemap{'id'}            = 'ro';
+$typemap{'Creator'}       = 'auto';
+$typemap{'Created'}       = 'auto';
+$typemap{'Updated'}       = 'auto';
+$typemap{'UpdatedBy'}     = 'auto';
+$typemap{'LastUpdated'}   = 'auto';
+$typemap{'LastUpdatedBy'} = 'auto';
+
+foreach my $table (@tables) {
+    next if ($table eq 'sessions');
+    my $tablesingle = $table;
+    $tablesingle =~ s/s$//;
+    my $tableplural = $tablesingle . "s";
+
+    if ( $tablesingle eq 'ACL' ) {
+        $tablesingle = "ACE";
+        $tableplural = "ACL";
+    }
+
+    my %requirements;
+
+    my $CollectionClassName = $namespace . "::" . $tableplural;
+    my $RecordClassName     = $namespace . "::" . $tablesingle;
+
+    my $path = $namespace;
+    $path =~ s/::/\//g;
+
+    my $RecordClassPath     = $path . "/" . $tablesingle . ".pm";
+    my $CollectionClassPath = $path . "/" . $tableplural . ".pm";
+
+    #create a collection class
+    my $CreateInParams;
+    my $CreateOutParams;
+    my $ClassAccessible = "";
+    my $FieldsPod       = "";
+    my $CreatePod       = "";
+    my %fields;
+    my $sth = $dbh->prepare("DESCRIBE $table");
+    $sth->execute;
+
+    while ( my $row = $sth->fetchrow_hashref() ) {
+        my $field   = $row->{'Field'};
+        my $type    = $row->{'Type'};
+        my $default = $row->{'Default'};
+        $fields{$field} = 1;
+
+        #generate the 'accessible' datastructure
+
+        if ( $typemap{$field} eq 'auto' ) {
+            $ClassAccessible .= "        $field => 
+		{read => 1, auto => 1,";
+        }
+        elsif ( $typemap{$field} eq 'ro' ) {
+            $ClassAccessible .= "        $field =>
+		{read => 1,";
+        }
+        else {
+            $ClassAccessible .= "        $field => 
+		{read => 1, write => 1,";
+
+        }
+
+        $ClassAccessible .= " type => '$type', default => '$default'},\n";
+
+        #generate pod for the accessible fields
+        $FieldsPod .= "
+=head2 $field
+
+Returns the current value of $field. 
+(In the database, $field is stored as $type.)
+
+";
+
+        unless ( $typemap{$field} eq 'auto' || $typemap{$field} eq 'ro' ) {
+            $FieldsPod .= "
+
+=head2 Set$field VALUE
+
+
+Set $field to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, $field will be stored as a $type.)
+
+";
+        }
+
+        $FieldsPod .= "
+=cut
+
+";
+
+        if ( $modulemap{$field} ) {
+            $FieldsPod .= "
+=head2 ${field}Obj
+
+Returns the $modulemap{$field} Object which has the id returned by $field
+
+
+=cut
+
+sub ${field}Obj {
+	my \$self = shift;
+	my \$$field =  ${namespace}::$modulemap{$field}->new(\$self->CurrentUser);
+	\$$field->Load(\$self->__Value('$field'));
+	return(\$$field);
+}
+";
+            $requirements{ $tablemap{$field} } =
+              "use ${namespace}::$modulemap{$field};";
+
+        }
+
+        unless ( $typemap{$field} eq 'auto' || $field eq 'id' ) {
+
+            #generate create statement
+            $CreateInParams .= "                $field => '$default',\n";
+            $CreateOutParams .=
+              "                         $field => \$args{'$field'},\n";
+
+            #gerenate pod for the create statement	
+            $CreatePod .= "  $type '$field'";
+            $CreatePod .= " defaults to '$default'" if ($default);
+            $CreatePod .= ".\n";
+
+        }
+
+    }
+
+    $Create = "
+sub Create {
+    my \$self = shift;
+    my \%args = ( 
+$CreateInParams
+		  \@_);
+    \$self->SUPER::Create(
+$CreateOutParams);
+
+}
+";
+    $CreatePod .= "\n=cut\n\n";
+
+    my $CollectionClass = $LicenseBlock . $Attribution .
+
+      "
+
+=head1 NAME
+
+  $CollectionClassName -- Class Description
+ 
+=head1 SYNOPSIS
+
+  use $CollectionClassName
+
+=head1 DESCRIPTION
+
+
+=head1 METHODS
+
+=cut
+
+package $CollectionClassName;
+
+use $CollectionBaseclass;
+use $RecordClassName;
+
+use vars qw( \@ISA );
+\@ISA= qw($CollectionBaseclass);
+
+
+sub _Init {
+    my \$self = shift;
+    \$self->{'table'} = '$table';
+    \$self->{'primary_key'} = 'id';
+
+";
+
+    if ( $fields{'SortOrder'} ) {
+
+        $CollectionClass .= "
+
+  # By default, order by name
+  \$self->OrderBy( ALIAS => 'main',
+                  FIELD => 'SortOrder',
+                  ORDER => 'ASC');
+";
+    }
+    $CollectionClass .= "
+    return ( \$self->SUPER::_Init(\@_) );
+}
+
+
+=head2 NewItem
+
+Returns an empty new $RecordClassName item
+
+=cut
+
+sub NewItem {
+    my \$self = shift;
+    return($RecordClassName->new(\$self->CurrentUser));
+}
+" . MagicImport($CollectionClassName);
+
+    my $RecordClassHeader = $Attribution . "
+
+=head1 NAME
+
+$RecordClassName
+
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=cut
+
+package $RecordClassName;
+use $RecordBaseclass; 
+";
+
+    foreach my $key ( keys %requirements ) {
+        $RecordClassHeader .= $requirements{$key} . "\n";
+    }
+    $RecordClassHeader .= "
+
+use vars qw( \@ISA );
+\@ISA= qw( $RecordBaseclass );
+
+sub _Init {
+  my \$self = shift; 
+
+  \$self->Table('$table');
+  \$self->SUPER::_Init(\@_);
+}
+
+";
+
+    my $RecordClass = $LicenseBlock .  $RecordClassHeader . "
+
+$RecordInit
+
+=head2 Create PARAMHASH
+
+Create takes a hash of values and creates a row in the database:
+
+$CreatePod
+
+$Create
+
+$FieldsPod
+
+sub _ClassAccessible {
+    {
+     
+$ClassAccessible
+ }
+};
+
+" . MagicImport($RecordClassName);
+
+    print "About to make $RecordClassPath, $CollectionClassPath\n";
+    `mkdir -p $path`;
+
+    open( RECORD, ">$RecordClassPath" );
+    print RECORD $RecordClass;
+    close(RECORD);
+
+    open( COL, ">$CollectionClassPath" );
+    print COL $CollectionClass;
+    close($COL);
+
+}
+
+sub MagicImport {
+    my $class = shift;
+
+    #if (exists \$warnings::{unimport})  {
+    #        no warnings qw(redefine);
+
+    my $path = $class;
+    $path =~ s#::#/#gi;
+
+
+    my $content = "
+        eval \"require @{[$class]}_Overlay\";
+        if (\$@ && \$@ !~ qr{^Can't locate ".$path."_Overlay.pm}) {
+            die \$@;
+        };
+
+        eval \"require @{[$class]}_Vendor\";
+        if (\$@ && \$@ !~ qr{^Can't locate ".$path."_Vendor.pm}) {
+            die \$@;
+        };
+
+        eval \"require @{[$class]}_Local\";
+        if (\$@ && \$@ !~ qr{^Can't locate ".$path."_Local.pm}) {
+            die \$@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows \"overlay\" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+@{[$class]}_Overlay, @{[$class]}_Vendor, @{[$class]}_Local
+
+=cut
+
+
+1;
+";
+
+    return $content;
+}
+
+# }}}
+
diff --git a/rt/sbin/license_tag b/rt/sbin/license_tag
new file mode 100644
index 000000000..33da2e026
--- /dev/null
+++ b/rt/sbin/license_tag
@@ -0,0 +1,196 @@
+#!/usr/bin/perl
+
+
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+my $LICENSE  = <<EOL;
+
+Copyright (c) 1996-2003 Jesse Vincent <jesse\@bestpractical.com>
+
+(Except where explictly superceded by other copyright notices)
+
+This work is made available to you under the terms of Version 2 of
+the GNU General Public License. A copy of that license should have
+been provided with this software, but in any event can be snarfed
+from www.gnu.org.
+
+This work 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.
+
+Unless otherwise specified, all modifications, corrections or
+extensions to this work which alter its source code become the
+property of Best Practical Solutions, LLC when submitted for
+inclusion in the work.
+
+
+EOL
+
+use File::Find;
+
+my @MAKE = qw(Makefile);
+
+File::Find::find({ no_chdir => 1, wanted => \&tag_pm}, 'lib');
+File::Find::find({ no_chdir => 1, wanted => \&tag_mason}, 'html');
+File::Find::find({ no_chdir => 1, wanted => \&tag_script}, 'sbin');
+File::Find::find({ no_chdir => 1, wanted => \&tag_script}, 'bin');
+tag_makefile ('Makefile');
+tag_makefile ('README');
+
+
+sub tag_mason {
+        my $pm = $_;
+        next unless (-f $pm);
+        next if ($pm =~ /images/);
+        open(FILE,"<$pm") || die "Failed to open $pm";
+        my $file = (join "", <FILE>); 
+        close (FILE);
+        my $pmlic = $LICENSE;
+        $pmlic =~ s/^/%# /mg;
+
+
+        print "$pm - ";
+        if ($file =~ /^%# BEGIN LICENSE BLOCK/ms) {
+                print "has license section";
+             $file =~ s/^%# BEGIN LICENSE BLOCK(.*?)%# END LICENSE BLOCK/%# BEGIN LICENSE BLOCK\n$pmlic%# END LICENSE BLOCK/ms;
+             
+
+        } else {
+                print "no license section";
+             $file ="%# BEGIN LICENSE BLOCK\n$pmlic%# END LICENSE BLOCK\n". $file;
+        }
+        $file =~ s/%# END LICENSE BLOCK(\n+)/%# END LICENSE BLOCK\n/mg;
+        print "\n";
+        
+        
+
+
+        open (FILE, ">$pm") || die "couldn't write new file";
+        print FILE $file;
+        close FILE;
+
+}
+
+
+sub tag_makefile {
+        my $pm = shift;
+        open(FILE,"<$pm") || die "Failed to open $pm";
+        my $file = (join "", <FILE>); 
+        close (FILE);
+        my $pmlic = $LICENSE;
+        $pmlic =~ s/^/# /mg;
+
+
+        print "$pm - ";
+        if ($file =~ /^# BEGIN LICENSE BLOCK/ms) {
+                print "has license section";
+             $file =~ s/^# BEGIN LICENSE BLOCK(.*?)# END LICENSE BLOCK/# BEGIN LICENSE BLOCK\n$pmlic# END LICENSE BLOCK/ms;
+             
+
+        } else {
+                print "no license section";
+             $file ="# BEGIN LICENSE BLOCK\n$pmlic# END LICENSE BLOCK\n". $file;
+        }
+        $file =~ s/# END LICENSE BLOCK(\n+)/# END LICENSE BLOCK\n/mg;
+        print "\n";
+        
+        
+
+
+        open (FILE, ">$pm") || die "couldn't write new file";
+        print FILE $file;
+        close FILE;
+
+}
+
+
+sub tag_pm {
+        my $pm = $_;
+        next unless $pm =~ /\.pm\z/s;
+        open(FILE,"<$pm") || die "Failed to open $pm";
+        my $file = (join "", <FILE>); 
+        close (FILE);
+        my $pmlic = $LICENSE;
+        $pmlic =~ s/^/# /mg;
+
+
+        print "$pm - ";
+        if ($file =~ /^# BEGIN LICENSE BLOCK/ms) {
+                print "has license section";
+             $file =~ s/^# BEGIN LICENSE BLOCK(.*?)# END LICENSE BLOCK/# BEGIN LICENSE BLOCK\n$pmlic# END LICENSE BLOCK/ms;
+             
+
+        } else {
+                print "no license section";
+             $file ="# BEGIN LICENSE BLOCK\n$pmlic# END LICENSE BLOCK\n". $file;
+        }
+        $file =~ s/# END LICENSE BLOCK(\n+)/# END LICENSE BLOCK\n/mg;
+        print "\n";
+        
+        
+
+
+        open (FILE, ">$pm") || die "couldn't write new file $pm";
+        print FILE $file;
+        close FILE;
+
+}
+
+
+sub tag_script {
+        my $pm = $_;
+        return unless (-f $pm);
+        open(FILE,"<$pm") || die "Failed to open $pm";
+        my $file = (join "", <FILE>); 
+        close (FILE);
+        my $pmlic = $LICENSE;
+        $pmlic =~ s/^/# /msg;
+
+        print "$pm - ";
+        if ($file =~ /^# BEGIN LICENSE BLOCK/ms) {
+                print "has license section";
+             $file =~ s/^# BEGIN LICENSE BLOCK(.*?)# END LICENSE BLOCK/# BEGIN LICENSE BLOCK\n$pmlic# END LICENSE BLOCK/ms;
+             
+
+        } else {
+                print "no license section";
+                if ($file =~ /^(#!.*?)\n/) {
+
+            my  $lic ="# BEGIN LICENSE BLOCK\n$pmlic# END LICENSE BLOCK\n";
+                $file =~ s/^(#!.*?)\n/$1\n$lic/; 
+
+                } 
+        }
+        $file =~ s/# END LICENSE BLOCK(\n+)/# END LICENSE BLOCK\n\n/mg;
+        print "\n";
+        
+
+        open (FILE, ">$pm") || die "couldn't write new file";
+        print FILE $file;
+        close FILE;
+
+}
+
diff --git a/rt/sbin/regression_harness b/rt/sbin/regression_harness
new file mode 100644
index 000000000..fc1e29304
--- /dev/null
+++ b/rt/sbin/regression_harness
@@ -0,0 +1,33 @@
+#!/usr/bin/perl
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+open (FH,"make regression|");
+
+my $skip_frontmatter = 1;
+while (<FH>) {
+        next if /^ok/;
+	$skip_frontmatter = 0 if (/autogen/);
+        print $_ unless ($skip_frontmatter);
+}
diff --git a/rt/sbin/rt-setup-database b/rt/sbin/rt-setup-database
new file mode 100644
index 000000000..f84f290b7
--- /dev/null
+++ b/rt/sbin/rt-setup-database
@@ -0,0 +1,585 @@
+#!/usr/bin/perl -w
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+use strict;
+use vars qw($PROMPT $VERSION $Handle $Nobody $SystemUser $item);
+use vars
+  qw(@Groups @Users @ACL @Queues @ScripActions @ScripConditions @Templates @CustomFields @Scrips);
+
+use lib "/opt/rt3/lib";
+
+#This drags in  RT's config.pm
+# We do it in a begin block because RT::Handle needs to know the type to do its
+# inheritance
+use RT;
+use Carp;
+use RT::User;
+use RT::CurrentUser;
+use RT::Template;
+use RT::ScripAction;
+use RT::ACE;
+use RT::Group;
+use RT::User;
+use RT::Queue;
+use RT::ScripCondition;
+use RT::CustomField;
+use RT::Scrip;
+
+RT::LoadConfig();
+use Term::ReadKey;
+use Getopt::Long;
+
+my %args;
+
+GetOptions(
+    \%args,
+    'prompt-for-dba-password', 'force', 'debug',
+    'action=s',                'dba=s', 'dba-password=s', 'datafile=s',
+    'datadir=s'
+);
+
+$| = 1;    #unbuffer that output.
+
+require RT::Handle;
+my $Handle = RT::Handle->new($RT::DatabaseType);
+$Handle->BuildDSN;
+my $dbh;
+
+if ( $args{'prompt-for-dba-password'} ) {
+    $args{'dba-password'} = get_dba_password();
+    chomp( $args{'dba-password'} );
+}
+
+unless ( $args{'action'} ) {
+    help();
+    die;
+}
+if ( $args{'action'} eq 'init' ) {
+    $dbh = DBI->connect( get_system_dsn(), $args{'dba'}, $args{'dba-password'} )
+      || die "Failed to connect to " . get_system_dsn() . " as $args{'dba'}: $DBI::errstr";
+    print "Now creating a database for RT.\n";
+    create_db();
+
+    $dbh->disconnect;
+    $dbh = DBI->connect( $Handle->DSN, $args{'dba'}, $args{'dba-password'} )
+      || die $DBI::errstr;
+
+    print "Now populating database schema.\n";
+    insert_schema();
+    print "Now inserting database ACLs\n";
+    insert_acl();
+    print "Now inserting RT core system objects\n";
+    insert_initial_data();
+    print "Now inserting RT data\n";
+    insert_data( $RT::EtcPath . "/initialdata" );
+}
+elsif ( $args{'action'} eq 'drop' ) {
+    unless ( $dbh =
+         DBI->connect( get_system_dsn(), $args{'dba'}, $args{'dba-password'} ) )
+    {
+        warn $DBI::errstr;
+        warn "Database doesn't appear to exist. Aborting database drop.";
+        exit(0);
+    }
+    drop_db();
+}
+elsif ( $args{'action'} eq 'insert' ) {
+    insert_data( $args{'datafile'} );
+}
+elsif ($args{'action'} eq 'acl') {
+    $dbh = DBI->connect( $Handle->DSN, $args{'dba'}, $args{'dba-password'} )
+      || die "Failed to connect to " . get_system_dsn() . " as $args{'dba'}: $DBI::errstr";
+     insert_acl($args{'datadir'});
+}
+elsif ($args{'action'} eq 'schema') {
+    $dbh = DBI->connect( $Handle->DSN, $args{'dba'}, $args{'dba-password'} )
+      || die "Failed to connect to " . get_system_dsn() . " as $args{'dba'}: $DBI::errstr";
+        insert_schema($args{'datadir'});
+}
+
+else {
+    print STDERR '$0 called with an invalid --action parameter';
+    exit(-1);
+}
+
+# {{{ sub insert_schema
+sub insert_schema {
+        my $base_path = (shift || $RT::EtcPath);
+    my (@schema);
+    print "Creating database schema.\n";
+
+    if ( -f $base_path . "/schema." . $RT::DatabaseType ) {
+	no warnings 'unopened';
+
+        open( SCHEMA, "<" . $base_path . "/schema." . $RT::DatabaseType );
+        open( SCHEMA_LOCAL, "<" . $RT::LocalEtcPath . "/schema." . $RT::DatabaseType );
+
+        my $statement = "";
+        foreach my $line (<SCHEMA>, <SCHEMA_LOCAL>) {
+            $line =~ s/\#.*//g;
+            $statement .= $line;
+            if ( $line =~ /;(\s*)$/ ) {
+                $statement =~ s/;(\s*)$//g;
+                push @schema, $statement;
+                $statement = "";
+            }
+        }
+
+        foreach my $statement (@schema) {
+            print STDERR $statement if $args{'debug'};
+            my $sth = $dbh->prepare($statement) or die $dbh->errstr;
+            unless ( $sth->execute ) {
+                die "Problem with statement:\n $statement\n" . $sth->errstr;
+            }
+        }
+
+    }
+    else {
+        die "Couldn't find schema file for " . $RT::DatabaseType . "\n";
+    }
+    print "schema sucessfully inserted\n";
+
+}
+
+# }}}
+
+# {{{ sub drop_db
+sub drop_db {
+    return if ( $RT::DatabaseType eq 'SQLite' );
+    unless ( $args{'force'} ) {
+        print <<END;
+
+About to drop $RT::DatabaseType database $RT::DatabaseName on $RT::DatabaseHost.
+WARNING: This will erase all data in $RT::DatabaseName.
+
+END
+        exit unless _yesno();
+
+    }
+
+    print "Dropping $RT::DatabaseType database $RT::DatabaseName.\n";
+
+    $dbh->do("Drop DATABASE $RT::DatabaseName") or warn $DBI::errstr;
+}
+
+# }}}
+
+# {{{ sub create_db
+sub create_db {
+    print "Creating $RT::DatabaseType database $RT::DatabaseName.\n";
+    if ( $RT::DatabaseType eq 'SQLite' ) {
+        return;
+    }
+    elsif ( $RT::DatabaseType eq 'Pg' ) {
+        $dbh->do("CREATE DATABASE $RT::DatabaseName WITH ENCODING='UNICODE'");
+        if ($DBI::errstr) {
+            $dbh->do("CREATE DATABASE $RT::DatabaseName") || die $DBI::errstr;
+        }
+    }
+    else {
+        $dbh->do("CREATE DATABASE $RT::DatabaseName") or die $DBI::errstr;
+    }
+}
+
+# }}}
+
+sub get_dba_password {
+    print
+"In order to create a new database and grant RT access to that database,\n";
+    print "this script needs to connect to your "
+      . $RT::DatabaseType
+      . " instance on "
+      . $RT::DatabaseHost . " as "
+      . $args{'dba'} . ".\n";
+    print
+"Please specify that user's database password below. If the user has no database\n";
+    print "password, just press return.\n\n";
+    print "Password: ";
+    ReadMode('noecho');
+    my $password = ReadLine(0);
+    ReadMode('normal');
+    return ($password);
+}
+
+# {{{ sub _yesno
+sub _yesno {
+    print "Proceed [y/N]:";
+    my $x = scalar(<STDIN>);
+    $x =~ /^y/i;
+}
+
+# }}}
+
+# {{{ insert_acls
+sub insert_acl {
+
+        my $base_path = (shift || $RT::EtcPath);
+
+    if ( $RT::DatabaseType =~ /^oracle$/i ) {
+        do $base_path . "/acl.Oracle"
+          || die "Couldn't find ACLS for Oracle\n" . $@;
+    }
+    elsif ( $RT::DatabaseType =~ /^pg$/i ) {
+        do $base_path . "/acl.Pg" || die "Couldn't find ACLS for Pg\n" . $@;
+    }
+    elsif ( $RT::DatabaseType =~ /^mysql$/i ) {
+        do $base_path . "/acl.mysql"
+          || die "Couldn't find ACLS for mysql in " . $RT::EtcPath . "\n" . $@;
+    }
+    elsif ( $RT::DatabaseType =~ /^SQLite$/i ) {
+        return;
+    }
+    else {
+        die "Unknown RT database type";
+    }
+
+    my @acl = acl($dbh);
+    foreach my $statement (@acl) {
+        print STDERR $statement if $args{'debug'};
+        my $sth = $dbh->prepare($statement) or die $dbh->errstr;
+        unless ( $sth->execute ) {
+            die "Problem with statement:\n $statement\n" . $sth->errstr;
+        }
+    }
+}
+
+# }}}
+
+=head2 get_system_dsn
+
+Returns a dsn suitable for database creates and drops
+and user creates and drops
+
+=cut
+
+sub get_system_dsn {
+
+    my $dsn = $Handle->DSN;
+
+    #with mysql, you want to connect sans database to funge things
+    if ( $RT::DatabaseType eq 'mysql' ) {
+        $dsn =~ s/dbname=$RT::DatabaseName//;
+
+        # with postgres, you want to connect to database1
+    }
+    elsif ( $RT::DatabaseType eq 'Pg' ) {
+        $dsn =~ s/dbname=$RT::DatabaseName/dbname=template1/;
+    }
+    return $dsn;
+}
+
+sub insert_initial_data {
+
+    RT::InitLogging();
+
+    #connect to the db, for actual RT work
+    require RT::Handle;
+    $RT::Handle = RT::Handle->new();
+    $RT::Handle->Connect();
+
+    #Put together a current user object so we can create a User object
+    my $CurrentUser = new RT::CurrentUser();
+
+    print "Checking for existing system user...";
+    my $test_user = RT::User->new($CurrentUser);
+    $test_user->Load('RT_System');
+    if ( $test_user->id ) {
+        print "found!\n\nYou appear to have a functional RT database.\n"
+          . "Exiting, so as not to clobber your existing data.\n";
+        exit(-1);
+
+    }
+    else {
+        print "not found.  This appears to be a new installation.\n";
+    }
+
+    print "Creating system user...";
+    my $RT_System = new RT::User($CurrentUser);
+
+    my ( $val, $msg ) = $RT_System->_BootstrapCreate(
+        Name     => 'RT_System',
+        RealName => 'The RT System itself',
+        Comments =>
+'Do not delete or modify this user. It is integral to RT\'s internal database structures',
+        Creator => '1' );
+
+    unless ($val) {
+        print "$msg\n";
+        exit(1);
+    }
+    print "done.\n";
+    $RT::Handle->dbh->disconnect();
+
+}
+
+# load some sort of data into the database
+
+sub insert_data {
+    my $datafile = shift;
+
+    #Connect to the database and get RT::SystemUser and RT::Nobody loaded
+    RT::Init;
+
+    my $CurrentUser = RT::CurrentUser->new();
+    $CurrentUser->LoadByName('RT_System');
+
+    if ( $datafile eq $RT::EtcPath . "/initialdata" ) {
+
+        print "Creating Superuser  ACL...";
+
+        my $superuser_ace = RT::ACE->new($CurrentUser);
+        $superuser_ace->_BootstrapCreate(
+                             PrincipalId => ACLEquivGroupId( $CurrentUser->Id ),
+                             PrincipalType => 'Group',
+                             RightName     => 'SuperUser',
+                             ObjectType    => 'RT::System',
+                             ObjectId      => '1' );
+
+    }
+
+    # Slurp in stuff to insert from the datafile. Possible things to go in here:-
+    # @groups, @users, @acl, @queues, @ScripActions, @ScripConditions, @templates
+
+    require $datafile
+      || die "Couldn't find initial data for import\n" . $@;
+
+    if (@Groups) {
+        print "Creating groups...";
+        foreach $item (@Groups) {
+            my $new_entry = RT::Group->new($CurrentUser);
+            my ( $return, $msg ) = $new_entry->_Create(%$item);
+            print "(Error: $msg)" unless ($return);
+            print $return. ".";
+        }
+        print "done.\n";
+    }
+    if (@Users) {
+        print "Creating users...";
+        foreach $item (@Users) {
+            my $new_entry = new RT::User($CurrentUser);
+            my ( $return, $msg ) = $new_entry->Create(%$item);
+            print "(Error: $msg)" unless ($return);
+            print $return. ".";
+        }
+        print "done.\n";
+    }
+    if (@Queues) {
+        print "Creating queues...";
+        for $item (@Queues) {
+            my $new_entry = new RT::Queue($CurrentUser);
+            my ( $return, $msg ) = $new_entry->Create(%$item);
+            print "(Error: $msg)" unless ($return);
+            print $return. ".";
+        }
+        print "done.\n";
+    }
+    if (@ACL) {
+        print "Creating ACL...";
+        for my $item (@ACL) {
+
+	    my ($princ, $object);
+
+	    # Global rights or Queue rights?
+	    if ($item->{'Queue'}) {
+                $object = RT::Queue->new($CurrentUser);
+                $object->Load( $item->{'Queue'} );
+	    } else {
+		$object = $RT::System;
+	    }
+
+	    # Group rights or user rights?
+	    if ($item->{'GroupDomain'}) {
+                $princ = RT::Group->new($CurrentUser);
+	        if ($item->{'GroupDomain'} eq 'UserDefined') {
+                  $princ->LoadUserDefinedGroup( $item->{'GroupId'} );
+	        } elsif ($item->{'GroupDomain'} eq 'SystemInternal') {
+                  $princ->LoadSystemInternalGroup( $item->{'GroupType'} );
+	        } elsif ($item->{'GroupDomain'} eq 'RT::Queue-Role' &&
+			 $item->{'Queue'}) {
+                  $princ->LoadQueueRoleGroup( Type => $item->{'GroupType'},
+					      Queue => $object->id);
+	        } else {
+                  $princ->Load( $item->{'GroupId'} );
+	        }
+	    } else {
+		$princ = RT::User->new($CurrentUser);
+		$princ->Load( $item->{'UserId'} );
+	    }
+
+	    # Grant it
+	    my ( $return, $msg ) = $princ->PrincipalObj->GrantRight(
+                                                     Right => $item->{'Right'},
+                                                     Object => $object );
+
+            if ($return) {
+                print $return. ".";
+            }
+            else {
+                print $msg . ".";
+
+            }
+
+        }
+        print "done.\n";
+    }
+    if (@CustomFields) {
+        print "Creating custom fields...";
+        for $item (@CustomFields) {
+            my $new_entry = new RT::CustomField($CurrentUser);
+            my $values    = $item->{'Values'};
+            delete $item->{'Values'};
+            my $q     = $item->{'Queue'};
+            my $q_obj = RT::Queue->new($CurrentUser);
+            $q_obj->Load($q);
+            if ( $q_obj->Id ) {
+                $item->{'Queue'} = $q_obj->Id;
+            }
+            elsif ( $q == 0 ) {
+                $item->{'Queue'} = 0;
+            }
+            else {
+                print "(Error: Could not find queue " . $q . ")\n"
+                  unless ( $q_obj->Id );
+                next;
+            }
+            my ( $return, $msg ) = $new_entry->Create(%$item);
+
+            foreach my $value ( @{$values} ) {
+                my ( $eval, $emsg ) = $new_entry->AddValue(%$value);
+                print "(Error: $emsg)\n" unless ($eval);
+            }
+
+            print "(Error: $msg)\n" unless ($return);
+            print $return. ".";
+        }
+
+        print "done.\n";
+    }
+
+    if (@ScripActions) {
+        print "Creating ScripActions...";
+
+        for $item (@ScripActions) {
+            my $new_entry = RT::ScripAction->new($CurrentUser);
+            my $return    = $new_entry->Create(%$item);
+            print $return. ".";
+        }
+
+        print "done.\n";
+    }
+
+    if (@ScripConditions) {
+        print "Creating ScripConditions...";
+
+        for $item (@ScripConditions) {
+            my $new_entry = RT::ScripCondition->new($CurrentUser);
+            my $return    = $new_entry->Create(%$item);
+            print $return. ".";
+        }
+
+        print "done.\n";
+    }
+
+    if (@Templates) {
+        print "Creating templates...";
+
+        for $item (@Templates) {
+            my $new_entry = new RT::Template($CurrentUser);
+            my $return    = $new_entry->Create(%$item);
+            print $return. ".";
+        }
+        print "done.\n";
+    }
+    if (@Scrips) {
+        print "Creating scrips...";
+
+        for $item (@Scrips) {
+            my $new_entry = new RT::Scrip($CurrentUser);
+            my ( $return, $msg ) = $new_entry->Create(%$item);
+            if ($return) {
+                print $return. ".";
+            }
+            else {
+                print "(Error: $msg)\n";
+            }
+        }
+        print "done.\n";
+    }
+    $RT::Handle->Disconnect();
+
+}
+
+=head2 ACLEquivGroupId
+
+Given a userid, return that user's acl equivalence group
+
+=cut
+
+sub ACLEquivGroupId {
+    my $username = shift;
+    my $user     = RT::User->new($RT::SystemUser);
+    $user->Load($username);
+    my $equiv_group = RT::Group->new($RT::SystemUser);
+    $equiv_group->LoadACLEquivalenceGroup($user);
+    return ( $equiv_group->Id );
+}
+
+sub help {
+
+    print <<EOF;
+
+$0: Set up RT's database
+
+--action        init    Initialize the database
+                drop    Drop the database. 
+                        This will ERASE ALL YOUR DATA
+                insert  Insert data into RT's database. 
+                        By default, will use RT's installation data.
+                        To use a local or supplementary datafile, specify it
+                        using the '--datafile' option below.
+                        
+                acl     Initialize only the database ACLs
+                        To use a local or supplementary datafile, specify it
+                        using the '--datadir' option below.
+                        
+                schema  Initialize only the database schema
+                        To use a local or supplementary datafile, specify it
+                        using the '--datadir' option below.
+
+--datafile /path/to/datafile
+--datadir /path/to/              Used to specify a path to find the local
+                                database schema and acls to be installed.
+
+
+--dba                           dba's username
+--dba-password                  dba's password
+--prompt-for-dba-password       Ask for the database administrator's password interactively
+
+
+EOF
+
+}
+
+1;
diff --git a/rt/sbin/rt-setup-database.in b/rt/sbin/rt-setup-database.in
new file mode 100644
index 000000000..e49a32ed9
--- /dev/null
+++ b/rt/sbin/rt-setup-database.in
@@ -0,0 +1,585 @@
+#!@PERL@ -w
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+use strict;
+use vars qw($PROMPT $VERSION $Handle $Nobody $SystemUser $item);
+use vars
+  qw(@Groups @Users @ACL @Queues @ScripActions @ScripConditions @Templates @CustomFields @Scrips);
+
+use lib "@RT_LIB_PATH@";
+
+#This drags in  RT's config.pm
+# We do it in a begin block because RT::Handle needs to know the type to do its
+# inheritance
+use RT;
+use Carp;
+use RT::User;
+use RT::CurrentUser;
+use RT::Template;
+use RT::ScripAction;
+use RT::ACE;
+use RT::Group;
+use RT::User;
+use RT::Queue;
+use RT::ScripCondition;
+use RT::CustomField;
+use RT::Scrip;
+
+RT::LoadConfig();
+use Term::ReadKey;
+use Getopt::Long;
+
+my %args;
+
+GetOptions(
+    \%args,
+    'prompt-for-dba-password', 'force', 'debug',
+    'action=s',                'dba=s', 'dba-password=s', 'datafile=s',
+    'datadir=s'
+);
+
+$| = 1;    #unbuffer that output.
+
+require RT::Handle;
+my $Handle = RT::Handle->new($RT::DatabaseType);
+$Handle->BuildDSN;
+my $dbh;
+
+if ( $args{'prompt-for-dba-password'} ) {
+    $args{'dba-password'} = get_dba_password();
+    chomp( $args{'dba-password'} );
+}
+
+unless ( $args{'action'} ) {
+    help();
+    die;
+}
+if ( $args{'action'} eq 'init' ) {
+    $dbh = DBI->connect( get_system_dsn(), $args{'dba'}, $args{'dba-password'} )
+      || die "Failed to connect to " . get_system_dsn() . " as $args{'dba'}: $DBI::errstr";
+    print "Now creating a database for RT.\n";
+    create_db();
+
+    $dbh->disconnect;
+    $dbh = DBI->connect( $Handle->DSN, $args{'dba'}, $args{'dba-password'} )
+      || die $DBI::errstr;
+
+    print "Now populating database schema.\n";
+    insert_schema();
+    print "Now inserting database ACLs\n";
+    insert_acl();
+    print "Now inserting RT core system objects\n";
+    insert_initial_data();
+    print "Now inserting RT data\n";
+    insert_data( $RT::EtcPath . "/initialdata" );
+}
+elsif ( $args{'action'} eq 'drop' ) {
+    unless ( $dbh =
+         DBI->connect( get_system_dsn(), $args{'dba'}, $args{'dba-password'} ) )
+    {
+        warn $DBI::errstr;
+        warn "Database doesn't appear to exist. Aborting database drop.";
+        exit(0);
+    }
+    drop_db();
+}
+elsif ( $args{'action'} eq 'insert' ) {
+    insert_data( $args{'datafile'} );
+}
+elsif ($args{'action'} eq 'acl') {
+    $dbh = DBI->connect( $Handle->DSN, $args{'dba'}, $args{'dba-password'} )
+      || die "Failed to connect to " . get_system_dsn() . " as $args{'dba'}: $DBI::errstr";
+     insert_acl($args{'datadir'});
+}
+elsif ($args{'action'} eq 'schema') {
+    $dbh = DBI->connect( $Handle->DSN, $args{'dba'}, $args{'dba-password'} )
+      || die "Failed to connect to " . get_system_dsn() . " as $args{'dba'}: $DBI::errstr";
+        insert_schema($args{'datadir'});
+}
+
+else {
+    print STDERR '$0 called with an invalid --action parameter';
+    exit(-1);
+}
+
+# {{{ sub insert_schema
+sub insert_schema {
+        my $base_path = (shift || $RT::EtcPath);
+    my (@schema);
+    print "Creating database schema.\n";
+
+    if ( -f $base_path . "/schema." . $RT::DatabaseType ) {
+	no warnings 'unopened';
+
+        open( SCHEMA, "<" . $base_path . "/schema." . $RT::DatabaseType );
+        open( SCHEMA_LOCAL, "<" . $RT::LocalEtcPath . "/schema." . $RT::DatabaseType );
+
+        my $statement = "";
+        foreach my $line (<SCHEMA>, <SCHEMA_LOCAL>) {
+            $line =~ s/\#.*//g;
+            $statement .= $line;
+            if ( $line =~ /;(\s*)$/ ) {
+                $statement =~ s/;(\s*)$//g;
+                push @schema, $statement;
+                $statement = "";
+            }
+        }
+
+        foreach my $statement (@schema) {
+            print STDERR $statement if $args{'debug'};
+            my $sth = $dbh->prepare($statement) or die $dbh->errstr;
+            unless ( $sth->execute ) {
+                die "Problem with statement:\n $statement\n" . $sth->errstr;
+            }
+        }
+
+    }
+    else {
+        die "Couldn't find schema file for " . $RT::DatabaseType . "\n";
+    }
+    print "schema sucessfully inserted\n";
+
+}
+
+# }}}
+
+# {{{ sub drop_db
+sub drop_db {
+    return if ( $RT::DatabaseType eq 'SQLite' );
+    unless ( $args{'force'} ) {
+        print <<END;
+
+About to drop $RT::DatabaseType database $RT::DatabaseName on $RT::DatabaseHost.
+WARNING: This will erase all data in $RT::DatabaseName.
+
+END
+        exit unless _yesno();
+
+    }
+
+    print "Dropping $RT::DatabaseType database $RT::DatabaseName.\n";
+
+    $dbh->do("Drop DATABASE $RT::DatabaseName") or warn $DBI::errstr;
+}
+
+# }}}
+
+# {{{ sub create_db
+sub create_db {
+    print "Creating $RT::DatabaseType database $RT::DatabaseName.\n";
+    if ( $RT::DatabaseType eq 'SQLite' ) {
+        return;
+    }
+    elsif ( $RT::DatabaseType eq 'Pg' ) {
+        $dbh->do("CREATE DATABASE $RT::DatabaseName WITH ENCODING='UNICODE'");
+        if ($DBI::errstr) {
+            $dbh->do("CREATE DATABASE $RT::DatabaseName") || die $DBI::errstr;
+        }
+    }
+    else {
+        $dbh->do("CREATE DATABASE $RT::DatabaseName") or die $DBI::errstr;
+    }
+}
+
+# }}}
+
+sub get_dba_password {
+    print
+"In order to create a new database and grant RT access to that database,\n";
+    print "this script needs to connect to your "
+      . $RT::DatabaseType
+      . " instance on "
+      . $RT::DatabaseHost . " as "
+      . $args{'dba'} . ".\n";
+    print
+"Please specify that user's database password below. If the user has no database\n";
+    print "password, just press return.\n\n";
+    print "Password: ";
+    ReadMode('noecho');
+    my $password = ReadLine(0);
+    ReadMode('normal');
+    return ($password);
+}
+
+# {{{ sub _yesno
+sub _yesno {
+    print "Proceed [y/N]:";
+    my $x = scalar(<STDIN>);
+    $x =~ /^y/i;
+}
+
+# }}}
+
+# {{{ insert_acls
+sub insert_acl {
+
+        my $base_path = (shift || $RT::EtcPath);
+
+    if ( $RT::DatabaseType =~ /^oracle$/i ) {
+        do $base_path . "/acl.Oracle"
+          || die "Couldn't find ACLS for Oracle\n" . $@;
+    }
+    elsif ( $RT::DatabaseType =~ /^pg$/i ) {
+        do $base_path . "/acl.Pg" || die "Couldn't find ACLS for Pg\n" . $@;
+    }
+    elsif ( $RT::DatabaseType =~ /^mysql$/i ) {
+        do $base_path . "/acl.mysql"
+          || die "Couldn't find ACLS for mysql in " . $RT::EtcPath . "\n" . $@;
+    }
+    elsif ( $RT::DatabaseType =~ /^SQLite$/i ) {
+        return;
+    }
+    else {
+        die "Unknown RT database type";
+    }
+
+    my @acl = acl($dbh);
+    foreach my $statement (@acl) {
+        print STDERR $statement if $args{'debug'};
+        my $sth = $dbh->prepare($statement) or die $dbh->errstr;
+        unless ( $sth->execute ) {
+            die "Problem with statement:\n $statement\n" . $sth->errstr;
+        }
+    }
+}
+
+# }}}
+
+=head2 get_system_dsn
+
+Returns a dsn suitable for database creates and drops
+and user creates and drops
+
+=cut
+
+sub get_system_dsn {
+
+    my $dsn = $Handle->DSN;
+
+    #with mysql, you want to connect sans database to funge things
+    if ( $RT::DatabaseType eq 'mysql' ) {
+        $dsn =~ s/dbname=$RT::DatabaseName//;
+
+        # with postgres, you want to connect to database1
+    }
+    elsif ( $RT::DatabaseType eq 'Pg' ) {
+        $dsn =~ s/dbname=$RT::DatabaseName/dbname=template1/;
+    }
+    return $dsn;
+}
+
+sub insert_initial_data {
+
+    RT::InitLogging();
+
+    #connect to the db, for actual RT work
+    require RT::Handle;
+    $RT::Handle = RT::Handle->new();
+    $RT::Handle->Connect();
+
+    #Put together a current user object so we can create a User object
+    my $CurrentUser = new RT::CurrentUser();
+
+    print "Checking for existing system user...";
+    my $test_user = RT::User->new($CurrentUser);
+    $test_user->Load('RT_System');
+    if ( $test_user->id ) {
+        print "found!\n\nYou appear to have a functional RT database.\n"
+          . "Exiting, so as not to clobber your existing data.\n";
+        exit(-1);
+
+    }
+    else {
+        print "not found.  This appears to be a new installation.\n";
+    }
+
+    print "Creating system user...";
+    my $RT_System = new RT::User($CurrentUser);
+
+    my ( $val, $msg ) = $RT_System->_BootstrapCreate(
+        Name     => 'RT_System',
+        RealName => 'The RT System itself',
+        Comments =>
+'Do not delete or modify this user. It is integral to RT\'s internal database structures',
+        Creator => '1' );
+
+    unless ($val) {
+        print "$msg\n";
+        exit(1);
+    }
+    print "done.\n";
+    $RT::Handle->dbh->disconnect();
+
+}
+
+# load some sort of data into the database
+
+sub insert_data {
+    my $datafile = shift;
+
+    #Connect to the database and get RT::SystemUser and RT::Nobody loaded
+    RT::Init;
+
+    my $CurrentUser = RT::CurrentUser->new();
+    $CurrentUser->LoadByName('RT_System');
+
+    if ( $datafile eq $RT::EtcPath . "/initialdata" ) {
+
+        print "Creating Superuser  ACL...";
+
+        my $superuser_ace = RT::ACE->new($CurrentUser);
+        $superuser_ace->_BootstrapCreate(
+                             PrincipalId => ACLEquivGroupId( $CurrentUser->Id ),
+                             PrincipalType => 'Group',
+                             RightName     => 'SuperUser',
+                             ObjectType    => 'RT::System',
+                             ObjectId      => '1' );
+
+    }
+
+    # Slurp in stuff to insert from the datafile. Possible things to go in here:-
+    # @groups, @users, @acl, @queues, @ScripActions, @ScripConditions, @templates
+
+    require $datafile
+      || die "Couldn't find initial data for import\n" . $@;
+
+    if (@Groups) {
+        print "Creating groups...";
+        foreach $item (@Groups) {
+            my $new_entry = RT::Group->new($CurrentUser);
+            my ( $return, $msg ) = $new_entry->_Create(%$item);
+            print "(Error: $msg)" unless ($return);
+            print $return. ".";
+        }
+        print "done.\n";
+    }
+    if (@Users) {
+        print "Creating users...";
+        foreach $item (@Users) {
+            my $new_entry = new RT::User($CurrentUser);
+            my ( $return, $msg ) = $new_entry->Create(%$item);
+            print "(Error: $msg)" unless ($return);
+            print $return. ".";
+        }
+        print "done.\n";
+    }
+    if (@Queues) {
+        print "Creating queues...";
+        for $item (@Queues) {
+            my $new_entry = new RT::Queue($CurrentUser);
+            my ( $return, $msg ) = $new_entry->Create(%$item);
+            print "(Error: $msg)" unless ($return);
+            print $return. ".";
+        }
+        print "done.\n";
+    }
+    if (@ACL) {
+        print "Creating ACL...";
+        for my $item (@ACL) {
+
+	    my ($princ, $object);
+
+	    # Global rights or Queue rights?
+	    if ($item->{'Queue'}) {
+                $object = RT::Queue->new($CurrentUser);
+                $object->Load( $item->{'Queue'} );
+	    } else {
+		$object = $RT::System;
+	    }
+
+	    # Group rights or user rights?
+	    if ($item->{'GroupDomain'}) {
+                $princ = RT::Group->new($CurrentUser);
+	        if ($item->{'GroupDomain'} eq 'UserDefined') {
+                  $princ->LoadUserDefinedGroup( $item->{'GroupId'} );
+	        } elsif ($item->{'GroupDomain'} eq 'SystemInternal') {
+                  $princ->LoadSystemInternalGroup( $item->{'GroupType'} );
+	        } elsif ($item->{'GroupDomain'} eq 'RT::Queue-Role' &&
+			 $item->{'Queue'}) {
+                  $princ->LoadQueueRoleGroup( Type => $item->{'GroupType'},
+					      Queue => $object->id);
+	        } else {
+                  $princ->Load( $item->{'GroupId'} );
+	        }
+	    } else {
+		$princ = RT::User->new($CurrentUser);
+		$princ->Load( $item->{'UserId'} );
+	    }
+
+	    # Grant it
+	    my ( $return, $msg ) = $princ->PrincipalObj->GrantRight(
+                                                     Right => $item->{'Right'},
+                                                     Object => $object );
+
+            if ($return) {
+                print $return. ".";
+            }
+            else {
+                print $msg . ".";
+
+            }
+
+        }
+        print "done.\n";
+    }
+    if (@CustomFields) {
+        print "Creating custom fields...";
+        for $item (@CustomFields) {
+            my $new_entry = new RT::CustomField($CurrentUser);
+            my $values    = $item->{'Values'};
+            delete $item->{'Values'};
+            my $q     = $item->{'Queue'};
+            my $q_obj = RT::Queue->new($CurrentUser);
+            $q_obj->Load($q);
+            if ( $q_obj->Id ) {
+                $item->{'Queue'} = $q_obj->Id;
+            }
+            elsif ( $q == 0 ) {
+                $item->{'Queue'} = 0;
+            }
+            else {
+                print "(Error: Could not find queue " . $q . ")\n"
+                  unless ( $q_obj->Id );
+                next;
+            }
+            my ( $return, $msg ) = $new_entry->Create(%$item);
+
+            foreach my $value ( @{$values} ) {
+                my ( $eval, $emsg ) = $new_entry->AddValue(%$value);
+                print "(Error: $emsg)\n" unless ($eval);
+            }
+
+            print "(Error: $msg)\n" unless ($return);
+            print $return. ".";
+        }
+
+        print "done.\n";
+    }
+
+    if (@ScripActions) {
+        print "Creating ScripActions...";
+
+        for $item (@ScripActions) {
+            my $new_entry = RT::ScripAction->new($CurrentUser);
+            my $return    = $new_entry->Create(%$item);
+            print $return. ".";
+        }
+
+        print "done.\n";
+    }
+
+    if (@ScripConditions) {
+        print "Creating ScripConditions...";
+
+        for $item (@ScripConditions) {
+            my $new_entry = RT::ScripCondition->new($CurrentUser);
+            my $return    = $new_entry->Create(%$item);
+            print $return. ".";
+        }
+
+        print "done.\n";
+    }
+
+    if (@Templates) {
+        print "Creating templates...";
+
+        for $item (@Templates) {
+            my $new_entry = new RT::Template($CurrentUser);
+            my $return    = $new_entry->Create(%$item);
+            print $return. ".";
+        }
+        print "done.\n";
+    }
+    if (@Scrips) {
+        print "Creating scrips...";
+
+        for $item (@Scrips) {
+            my $new_entry = new RT::Scrip($CurrentUser);
+            my ( $return, $msg ) = $new_entry->Create(%$item);
+            if ($return) {
+                print $return. ".";
+            }
+            else {
+                print "(Error: $msg)\n";
+            }
+        }
+        print "done.\n";
+    }
+    $RT::Handle->Disconnect();
+
+}
+
+=head2 ACLEquivGroupId
+
+Given a userid, return that user's acl equivalence group
+
+=cut
+
+sub ACLEquivGroupId {
+    my $username = shift;
+    my $user     = RT::User->new($RT::SystemUser);
+    $user->Load($username);
+    my $equiv_group = RT::Group->new($RT::SystemUser);
+    $equiv_group->LoadACLEquivalenceGroup($user);
+    return ( $equiv_group->Id );
+}
+
+sub help {
+
+    print <<EOF;
+
+$0: Set up RT's database
+
+--action        init    Initialize the database
+                drop    Drop the database. 
+                        This will ERASE ALL YOUR DATA
+                insert  Insert data into RT's database. 
+                        By default, will use RT's installation data.
+                        To use a local or supplementary datafile, specify it
+                        using the '--datafile' option below.
+                        
+                acl     Initialize only the database ACLs
+                        To use a local or supplementary datafile, specify it
+                        using the '--datadir' option below.
+                        
+                schema  Initialize only the database schema
+                        To use a local or supplementary datafile, specify it
+                        using the '--datadir' option below.
+
+--datafile /path/to/datafile
+--datadir /path/to/              Used to specify a path to find the local
+                                database schema and acls to be installed.
+
+
+--dba                           dba's username
+--dba-password                  dba's password
+--prompt-for-dba-password       Ask for the database administrator's password interactively
+
+
+EOF
+
+}
+
+1;
diff --git a/rt/sbin/rt-test-dependencies b/rt/sbin/rt-test-dependencies
new file mode 100644
index 000000000..637d33a32
--- /dev/null
+++ b/rt/sbin/rt-test-dependencies
@@ -0,0 +1,246 @@
+#!/usr/bin/perl
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+#
+# This is just a basic script that checks to make sure that all
+# the modules needed by RT before you can install it.
+#
+
+use strict;
+no warnings qw(numeric redefine);
+use Getopt::Long;
+use CPAN;
+my %args;
+my %deps;
+GetOptions(\%args,'install', 'with-MYSQL', 'with-POSTGRESQL|with-pg|with-pgsql', 'with-SQLITE', 'with-ORACLE', 'with-FASTCGI', 'with-SPEEDYCGI', 'with-MODPERL1', 'with-MODPERL2' ,'with-DEV');
+
+if  (!keys %args) {
+help();
+exit(0);
+}
+$args{'with-MASON'} = 1;
+$args{'with-CORE'} = 1;
+$args{'with-DEV'} =1; 
+$args{'with-CLI'} =1; 
+$args{'with-MAILGATE'} =1; 
+if ($] < 5.007) {
+$args{'with-I18N-COMPAT'} = 1;
+}
+
+
+sub help {
+
+print <<'.'
+
+By default, testdeps determine whether you have 
+installed all the perl modules RT needs to run.
+
+	--install		Install missing modules
+
+The following switches will tell the tool to check for specific dependencies
+
+	--with-mysql		Database interface for MySQL
+	--with-postgresql	Database interface for PostgreSQL 
+	--with-sqlite		Database interface and driver for SQLite (unsupported)
+	--with-oracle		Database interface for oracle (unsupported)
+
+	--with-fastcgi		Libraries needed to support the fastcgi handler
+	--with-speedycgi	Libraries needed to support the speedycgi handler
+	--with-modperl1		Libraries needed to support the modperl 1 handler
+	--with-modperl2		Libraries needed to support the modperl 2 handler
+
+	--with-dev		Tools needed for RT development
+.
+}
+
+
+sub _ {
+    map { /(\S+)\s*(\S*)/; $1 => ($2 ? $2 :'') } split ( /\n/, $_[0] );
+}
+
+$deps{'CORE'} = [ _( << '.') ];
+Digest::MD5
+DBI 1.18
+Test::Inline
+Class::ReturnValue 0.40
+DBIx::SearchBuilder 0.86
+Text::Template
+File::Spec 0.8
+HTML::Entities 
+Net::Domain
+Log::Dispatch 2.0
+Locale::Maketext 1.04
+Locale::Maketext::Lexicon 0.25
+Locale::Maketext::Fuzzy
+MIME::Entity 5.108
+Mail::Mailer 1.57
+Net::SMTP
+Text::Wrapper 
+Time::ParseDate
+File::Temp
+Term::ReadKey
+Text::Autoformat
+Text::Quoted
+.
+
+$deps{'MASON'} = [ _( << '.') ];
+Params::Validate 0.02
+Cache::Cache
+Exception::Class
+HTML::Mason 1.16
+MLDBM
+Errno
+FreezeThaw
+Digest::MD5
+CGI::Cookie 1.20
+Storable
+Apache::Session 1.53
+.
+
+$deps{'MAILGATE'} = [ _( << '.') ];
+HTML::TreeBuilder
+HTML::FormatText
+Getopt::Long
+LWP::UserAgent
+.
+
+$deps{'CLI'} = [ _( << '.') ];
+Getopt::Long 2.24
+.
+
+$deps{'DEV'} = [ _( << '.') ];
+Regexp::Common
+Time::HiRes 
+Test::Inline 
+WWW::Mechanize
+.
+
+$deps{'FASTCGI'} = [ _( << '.') ];
+CGI
+FCGI
+CGI::Fast 
+.
+
+$deps{'SPEEDYCGI'} = [ _( << '.') ];
+CGI
+CGI::SpeedyCGI
+.
+
+
+$deps{'MODPERL1'} = [ _( << '.') ];
+CGI
+Apache::Request
+Apache::DBI
+.
+
+$deps{'MODPERL2'} = [ _( << '.') ];
+CGI 2.89
+Apache::DBI
+.
+
+$deps{'I18N-COMPAT'} = [ _( << '.') ];
+Text::Iconv
+Encode::compat 0.04
+.
+
+$deps{'MYSQL'} = [ _( << '.') ];
+DBD::mysql 2.1018
+.
+$deps{'ORACLE'} = [ _( << '.') ];
+DBD::Oracle
+.
+$deps{'POSTGRESQL'} = [ _( << '.') ];
+DBD::Pg
+.
+
+
+foreach my $type (keys %args)  {
+next unless ($type =~ /^with-(.*?)$/);
+my $type = $1;
+print "$type dependencies:\n";
+	my @deps = (@{$deps{$type}});
+	while (@deps) {
+		my $module = shift @deps;
+		my $version = shift @deps;
+my $ret;
+	$ret =test_dep($module, $version);	
+
+if ($args{'install'} && !$ret) {
+	resolve_dep($module);		
+}
+}
+}
+sub test_dep {
+	my $module = shift;
+	my $version = shift;
+
+	  print "\t$module $version";
+        eval "use $module $version" ;
+        if ($@) {
+	my $error = $@;
+	$error =~ s/\n(.*)$//s;
+	print "...MISSING\n";
+		print "\t\t$error\n" if $error =~ /this is only/;
+
+	return undef;
+	} else {
+	print "...found\n";
+return 1;
+	}
+}
+
+sub resolve_dep {
+	my $module = shift;
+	use CPAN;
+	CPAN::Shell->install($module);		
+	
+}
+
+
+sub print_help {
+    print << "EOF";
+
+$0 FLAG DBTYPE
+
+
+$0 is a tool for RT that will tell you if you've got all
+the modules RT depends on properly installed.
+
+Flags: (only one flag is valid for a given run)
+
+-quiet will check to see if we've got everything we need
+	and will exit with a return code of (1) if we don't.
+
+-warn will tell you what isn't properly installed
+
+-fix will use CPANPLUS.pm or CPAN.pm to magically make everything better
+
+DBTYPE is one of:
+	oracle, pg, mysql
+
+EOF
+
+    exit(0);
+}
diff --git a/rt/sbin/rt-test-dependencies.in b/rt/sbin/rt-test-dependencies.in
new file mode 100644
index 000000000..6951290c4
--- /dev/null
+++ b/rt/sbin/rt-test-dependencies.in
@@ -0,0 +1,246 @@
+#!@PERL@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+#
+# This is just a basic script that checks to make sure that all
+# the modules needed by RT before you can install it.
+#
+
+use strict;
+no warnings qw(numeric redefine);
+use Getopt::Long;
+use CPAN;
+my %args;
+my %deps;
+GetOptions(\%args,'install', 'with-MYSQL', 'with-POSTGRESQL|with-pg|with-pgsql', 'with-SQLITE', 'with-ORACLE', 'with-FASTCGI', 'with-SPEEDYCGI', 'with-MODPERL1', 'with-MODPERL2' ,'with-DEV');
+
+if  (!keys %args) {
+help();
+exit(0);
+}
+$args{'with-MASON'} = 1;
+$args{'with-CORE'} = 1;
+$args{'with-DEV'} =1; 
+$args{'with-CLI'} =1; 
+$args{'with-MAILGATE'} =1; 
+if ($] < 5.007) {
+$args{'with-I18N-COMPAT'} = 1;
+}
+
+
+sub help {
+
+print <<'.'
+
+By default, testdeps determine whether you have 
+installed all the perl modules RT needs to run.
+
+	--install		Install missing modules
+
+The following switches will tell the tool to check for specific dependencies
+
+	--with-mysql		Database interface for MySQL
+	--with-postgresql	Database interface for PostgreSQL 
+	--with-sqlite		Database interface and driver for SQLite (unsupported)
+	--with-oracle		Database interface for oracle (unsupported)
+
+	--with-fastcgi		Libraries needed to support the fastcgi handler
+	--with-speedycgi	Libraries needed to support the speedycgi handler
+	--with-modperl1		Libraries needed to support the modperl 1 handler
+	--with-modperl2		Libraries needed to support the modperl 2 handler
+
+	--with-dev		Tools needed for RT development
+.
+}
+
+
+sub _ {
+    map { /(\S+)\s*(\S*)/; $1 => ($2 ? $2 :'') } split ( /\n/, $_[0] );
+}
+
+$deps{'CORE'} = [ _( << '.') ];
+Digest::MD5
+DBI 1.18
+Test::Inline
+Class::ReturnValue 0.40
+DBIx::SearchBuilder 0.86
+Text::Template
+File::Spec 0.8
+HTML::Entities 
+Net::Domain
+Log::Dispatch 2.0
+Locale::Maketext 1.04
+Locale::Maketext::Lexicon 0.25
+Locale::Maketext::Fuzzy
+MIME::Entity 5.108
+Mail::Mailer 1.57
+Net::SMTP
+Text::Wrapper 
+Time::ParseDate
+File::Temp
+Term::ReadKey
+Text::Autoformat
+Text::Quoted
+.
+
+$deps{'MASON'} = [ _( << '.') ];
+Params::Validate 0.02
+Cache::Cache
+Exception::Class
+HTML::Mason 1.16
+MLDBM
+Errno
+FreezeThaw
+Digest::MD5
+CGI::Cookie 1.20
+Storable
+Apache::Session 1.53
+.
+
+$deps{'MAILGATE'} = [ _( << '.') ];
+HTML::TreeBuilder
+HTML::FormatText
+Getopt::Long
+LWP::UserAgent
+.
+
+$deps{'CLI'} = [ _( << '.') ];
+Getopt::Long 2.24
+.
+
+$deps{'DEV'} = [ _( << '.') ];
+Regexp::Common
+Time::HiRes 
+Test::Inline 
+WWW::Mechanize
+.
+
+$deps{'FASTCGI'} = [ _( << '.') ];
+CGI
+FCGI
+CGI::Fast 
+.
+
+$deps{'SPEEDYCGI'} = [ _( << '.') ];
+CGI
+CGI::SpeedyCGI
+.
+
+
+$deps{'MODPERL1'} = [ _( << '.') ];
+CGI
+Apache::Request
+Apache::DBI
+.
+
+$deps{'MODPERL2'} = [ _( << '.') ];
+CGI 2.89
+Apache::DBI
+.
+
+$deps{'I18N-COMPAT'} = [ _( << '.') ];
+Text::Iconv
+Encode::compat 0.04
+.
+
+$deps{'MYSQL'} = [ _( << '.') ];
+DBD::mysql 2.1018
+.
+$deps{'ORACLE'} = [ _( << '.') ];
+DBD::Oracle
+.
+$deps{'POSTGRESQL'} = [ _( << '.') ];
+DBD::Pg
+.
+
+
+foreach my $type (keys %args)  {
+next unless ($type =~ /^with-(.*?)$/);
+my $type = $1;
+print "$type dependencies:\n";
+	my @deps = (@{$deps{$type}});
+	while (@deps) {
+		my $module = shift @deps;
+		my $version = shift @deps;
+my $ret;
+	$ret =test_dep($module, $version);	
+
+if ($args{'install'} && !$ret) {
+	resolve_dep($module);		
+}
+}
+}
+sub test_dep {
+	my $module = shift;
+	my $version = shift;
+
+	  print "\t$module $version";
+        eval "use $module $version" ;
+        if ($@) {
+	my $error = $@;
+	$error =~ s/\n(.*)$//s;
+	print "...MISSING\n";
+		print "\t\t$error\n" if $error =~ /this is only/;
+
+	return undef;
+	} else {
+	print "...found\n";
+return 1;
+	}
+}
+
+sub resolve_dep {
+	my $module = shift;
+	use CPAN;
+	CPAN::Shell->install($module);		
+	
+}
+
+
+sub print_help {
+    print << "EOF";
+
+$0 FLAG DBTYPE
+
+
+$0 is a tool for RT that will tell you if you've got all
+the modules RT depends on properly installed.
+
+Flags: (only one flag is valid for a given run)
+
+-quiet will check to see if we've got everything we need
+	and will exit with a return code of (1) if we don't.
+
+-warn will tell you what isn't properly installed
+
+-fix will use CPANPLUS.pm or CPAN.pm to magically make everything better
+
+DBTYPE is one of:
+	oracle, pg, mysql
+
+EOF
+
+    exit(0);
+}
-- 
cgit v1.2.1


From ded0451e9582df33cae6099a2fb72b4ea25076cf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 15 Jul 2003 13:30:43 +0000
Subject: reverting to vendor branch rt 3.0.4, hopefully

---
 rt/ChangeLog                                      | 16016 --------------------
 rt/Makefile                                       |   517 +-
 rt/README                                         |   402 +-
 rt/TODO                                           |     9 -
 rt/bin/initacls.Oracle                            |    26 -
 rt/bin/initacls.Pg                                |    28 -
 rt/bin/initacls.mysql                             |    20 -
 rt/bin/mason_handler.fcgi                         |   255 +-
 rt/bin/mason_handler.scgi                         |   218 +-
 rt/bin/rt                                         |  1391 --
 rt/bin/rt-mailgate                                |   842 +-
 rt/bin/rtadmin                                    |  1040 --
 rt/bin/webmux.pl                                  |   248 +-
 rt/docs/design_docs/acls                          |   228 +-
 rt/docs/design_docs/basic-definitions.txt         |    54 -
 rt/docs/design_docs/cli_spec                      |   361 +-
 rt/docs/design_docs/evil_plans                    |     9 +-
 rt/docs/design_docs/local_hacking                 |    32 -
 rt/docs/rt.gif                                    |   Bin 8811 -> 0 bytes
 rt/etc/acl.Oracle                                 |    19 +-
 rt/etc/acl.Pg                                     |    96 +-
 rt/etc/acl.mysql                                  |    12 +-
 rt/etc/config.pm                                  |   473 -
 rt/etc/schema.Oracle                              |   287 -
 rt/etc/schema.Pg                                  |   747 +-
 rt/etc/schema.mysql                               |   429 +-
 rt/etc/schema.pm                                  |   349 -
 rt/lib/MANIFEST                                   |    57 -
 rt/lib/MANIFEST.SKIP                              |     1 -
 rt/lib/Makefile.PL                                |    49 -
 rt/lib/RT.pm                                      |   191 +-
 rt/lib/RT/ACE.pm                                  |   806 +-
 rt/lib/RT/ACL.pm                                  |   329 +-
 rt/lib/RT/Action/Autoreply.pm                     |    40 +-
 rt/lib/RT/Action/Generic.pm                       |    56 +-
 rt/lib/RT/Action/Notify.pm                        |    83 +-
 rt/lib/RT/Action/NotifyAsComment.pm               |    34 +-
 rt/lib/RT/Action/OpenDependent.pm                 |    55 -
 rt/lib/RT/Action/ResolveMembers.pm                |    35 +-
 rt/lib/RT/Action/SendEmail.pm                     |   699 +-
 rt/lib/RT/Action/SendPasswordEmail.pm             |   170 -
 rt/lib/RT/Action/StallDependent.pm                |    68 -
 rt/lib/RT/Attachment.pm                           |   601 +-
 rt/lib/RT/Attachments.pm                          |   136 +-
 rt/lib/RT/Condition/AnyTransaction.pm             |    34 +-
 rt/lib/RT/Condition/Generic.pm                    |    55 +-
 rt/lib/RT/Condition/NewDependency.pm              |     0
 rt/lib/RT/Condition/StatusChange.pm               |    35 +-
 rt/lib/RT/CurrentUser.pm                          |   166 +-
 rt/lib/RT/Date.pm                                 |   335 +-
 rt/lib/RT/EasySearch.pm                           |   115 -
 rt/lib/RT/Group.pm                                |   430 +-
 rt/lib/RT/GroupMember.pm                          |   231 +-
 rt/lib/RT/GroupMembers.pm                         |   124 +-
 rt/lib/RT/Groups.pm                               |   135 +-
 rt/lib/RT/Handle.pm                               |    62 +-
 rt/lib/RT/Interface/CLI.pm                        |   112 +-
 rt/lib/RT/Interface/Email.pm                      |   683 +-
 rt/lib/RT/Interface/Web.pm                        |  1124 +-
 rt/lib/RT/Keyword.pm                              |   446 -
 rt/lib/RT/KeywordSelect.pm                        |   452 -
 rt/lib/RT/KeywordSelects.pm                       |   143 -
 rt/lib/RT/Keywords.pm                             |   106 -
 rt/lib/RT/Link.pm                                 |   487 +-
 rt/lib/RT/Links.pm                                |   153 +-
 rt/lib/RT/ObjectKeyword.pm                        |   192 -
 rt/lib/RT/ObjectKeywords.pm                       |   234 -
 rt/lib/RT/Queue.pm                                |   961 +-
 rt/lib/RT/Queues.pm                               |   162 +-
 rt/lib/RT/Record.pm                               |   400 +-
 rt/lib/RT/Scrip.pm                                |   654 +-
 rt/lib/RT/ScripAction.pm                          |   385 +-
 rt/lib/RT/ScripActions.pm                         |   137 +-
 rt/lib/RT/ScripCondition.pm                       |   366 +-
 rt/lib/RT/ScripConditions.pm                      |   142 +-
 rt/lib/RT/Scrips.pm                               |   162 +-
 rt/lib/RT/Template.pm                             |   512 +-
 rt/lib/RT/Templates.pm                            |   143 +-
 rt/lib/RT/TestHarness.pm                          |    14 -
 rt/lib/RT/Ticket.pm                               |  3026 +---
 rt/lib/RT/Tickets.pm                              |  1806 +--
 rt/lib/RT/Transaction.pm                          |   895 +-
 rt/lib/RT/Transactions.pm                         |   129 +-
 rt/lib/RT/User.pm                                 |  1696 +--
 rt/lib/RT/Users.pm                                |   298 +-
 rt/lib/RT/Watcher.pm                              |   313 -
 rt/lib/RT/Watchers.pm                             |   226 -
 rt/lib/test.pl                                    |    52 -
 rt/tools/cpan2rpm                                 |   299 -
 rt/tools/initdb                                   |   216 -
 rt/tools/insertdata                               |   618 -
 rt/tools/testdeps                                 |   115 -
 rt/webrt/Admin/Elements/CreateQueueCalled         |     3 -
 rt/webrt/Admin/Elements/CreateUserCalled          |     3 -
 rt/webrt/Admin/Elements/EditUserComments          |     9 -
 rt/webrt/Admin/Elements/GrantQueueRightsTo        |    30 -
 rt/webrt/Admin/Elements/GroupTabs                 |    18 -
 rt/webrt/Admin/Elements/Header                    |     5 -
 rt/webrt/Admin/Elements/ListGlobalKeywordSelects  |    15 -
 rt/webrt/Admin/Elements/ListGlobalScrips          |    10 -
 rt/webrt/Admin/Elements/ModifyKeyword             |    95 -
 rt/webrt/Admin/Elements/ModifyKeywordSelect       |   120 -
 rt/webrt/Admin/Elements/ModifyQueue               |    56 -
 rt/webrt/Admin/Elements/ModifyTemplate            |    78 -
 rt/webrt/Admin/Elements/ModifyUser                |    77 -
 rt/webrt/Admin/Elements/QueueRightsForUser        |    17 -
 rt/webrt/Admin/Elements/QueueTabs                 |    36 -
 rt/webrt/Admin/Elements/SelectKeywordSelect       |    22 -
 rt/webrt/Admin/Elements/SelectModifyGroup         |    10 -
 rt/webrt/Admin/Elements/SelectModifyKeyword       |    13 -
 rt/webrt/Admin/Elements/SelectModifyKeywordSelect |    13 -
 rt/webrt/Admin/Elements/SelectModifyQueue         |    10 -
 rt/webrt/Admin/Elements/SelectModifyUser          |    26 -
 rt/webrt/Admin/Elements/SelectQueueRights         |    29 -
 rt/webrt/Admin/Elements/SelectRights              |    58 -
 rt/webrt/Admin/Elements/SelectScrip               |    25 -
 rt/webrt/Admin/Elements/SelectScripAction         |    25 -
 rt/webrt/Admin/Elements/SelectScripCondition      |    25 -
 rt/webrt/Admin/Elements/SelectSingleOrMultiple    |    20 -
 rt/webrt/Admin/Elements/SelectTemplate            |    37 -
 rt/webrt/Admin/Elements/SelectUsers               |    17 -
 rt/webrt/Admin/Elements/SystemTabs                |    31 -
 rt/webrt/Admin/Elements/Tabs                      |    31 -
 rt/webrt/Admin/Elements/UserTabs                  |    21 -
 rt/webrt/Admin/Global/GroupRights.html            |    78 -
 rt/webrt/Admin/Global/Keywords.html               |    97 -
 rt/webrt/Admin/Global/Scrips.html                 |    95 -
 rt/webrt/Admin/Global/Template.html               |    66 -
 rt/webrt/Admin/Global/Templates.html              |    24 -
 rt/webrt/Admin/Global/UserRights.html             |    42 -
 rt/webrt/Admin/Global/index.html                  |     2 -
 rt/webrt/Admin/Groups/Members.html                |    76 -
 rt/webrt/Admin/Groups/Modify.html                 |    83 -
 rt/webrt/Admin/Groups/Rights.html                 |     1 -
 rt/webrt/Admin/Groups/index.html                  |    33 -
 rt/webrt/Admin/KeywordSelects/Modify.html         |    17 -
 rt/webrt/Admin/KeywordSelects/index.html          |   137 -
 rt/webrt/Admin/Keywords/Modify.html               |    96 -
 rt/webrt/Admin/Keywords/index.html                |   110 -
 rt/webrt/Admin/Queues/Create.html                 |    13 -
 rt/webrt/Admin/Queues/GroupRights.html            |   103 -
 rt/webrt/Admin/Queues/Keywords.html               |   114 -
 rt/webrt/Admin/Queues/Modify.html                 |   137 -
 rt/webrt/Admin/Queues/People.html                 |   161 -
 rt/webrt/Admin/Queues/Scrips.html                 |   111 -
 rt/webrt/Admin/Queues/Template.html               |    68 -
 rt/webrt/Admin/Queues/Templates.html              |    24 -
 rt/webrt/Admin/Queues/UserRights.html             |    72 -
 rt/webrt/Admin/Queues/index.html                  |    52 -
 rt/webrt/Admin/Users/Modify.html                  |   259 -
 rt/webrt/Admin/Users/Prefs.html                   |    97 -
 rt/webrt/Admin/Users/Rights.html                  |     1 -
 rt/webrt/Admin/Users/index.html                   |    71 -
 rt/webrt/Admin/index.html                         |     4 -
 rt/webrt/Elements/Checkbox                        |    17 -
 rt/webrt/Elements/CreateTicket                    |     1 -
 rt/webrt/Elements/CustomHomepageHeader            |     0
 rt/webrt/Elements/Error                           |    23 -
 rt/webrt/Elements/Footer                          |    10 -
 rt/webrt/Elements/GotoTicket                      |     1 -
 rt/webrt/Elements/Header                          |    61 -
 rt/webrt/Elements/ListActions                     |    14 -
 rt/webrt/Elements/Login                           |    69 -
 rt/webrt/Elements/MessageBox                      |    30 -
 rt/webrt/Elements/MyRequests                      |    45 -
 rt/webrt/Elements/MyTickets                       |    43 -
 rt/webrt/Elements/Quicksearch                     |    41 -
 rt/webrt/Elements/Refresh                         |    22 -
 rt/webrt/Elements/Section                         |    11 -
 rt/webrt/Elements/SelectBoolean                   |    24 -
 rt/webrt/Elements/SelectDate                      |    25 -
 rt/webrt/Elements/SelectDateRelation              |    14 -
 rt/webrt/Elements/SelectDateType                  |    12 -
 rt/webrt/Elements/SelectEqualityOperator          |    18 -
 rt/webrt/Elements/SelectKeyword                   |    38 -
 rt/webrt/Elements/SelectKeywordOptions            |    18 -
 rt/webrt/Elements/SelectLinkType                  |    16 -
 rt/webrt/Elements/SelectMatch                     |    31 -
 rt/webrt/Elements/SelectNewTicketQueue            |     9 -
 rt/webrt/Elements/SelectOwner                     |    22 -
 rt/webrt/Elements/SelectQueue                     |    38 -
 rt/webrt/Elements/SelectResultsPerPage            |    22 -
 rt/webrt/Elements/SelectSortOrder                 |    18 -
 rt/webrt/Elements/SelectStatus                    |    17 -
 rt/webrt/Elements/SelectTicketSortBy              |    15 -
 rt/webrt/Elements/SelectUsers                     |     8 -
 rt/webrt/Elements/SelectWatcherType               |    26 -
 rt/webrt/Elements/ShadedBox                       |     5 -
 rt/webrt/Elements/Submit                          |    44 -
 rt/webrt/Elements/Tabs                            |   133 -
 rt/webrt/Elements/TitleBoxEnd                     |    10 -
 rt/webrt/Elements/TitleBoxStart                   |    20 -
 rt/webrt/Elements/ViewUser                        |    29 -
 rt/webrt/Elements/dayMenu                         |    19 -
 rt/webrt/Elements/monthMenu                       |    37 -
 rt/webrt/Elements/yearMenu                        |    24 -
 rt/webrt/NoAuth/Logout.html                       |    22 -
 rt/webrt/NoAuth/Reminder.html                     |     3 -
 rt/webrt/NoAuth/images/rt.jpg                     |   Bin 917 -> 0 bytes
 rt/webrt/NoAuth/images/spacer.gif                 |   Bin 43 -> 0 bytes
 rt/webrt/NoAuth/webrt.css                         |   102 -
 rt/webrt/Search/Bulk.html                         |   186 -
 rt/webrt/Search/Listing.html                      |   134 -
 rt/webrt/Search/PickRestriction                   |   112 -
 rt/webrt/Search/RestrictSearch.html               |     3 -
 rt/webrt/Search/TicketCell                        |    28 -
 rt/webrt/SelfService/Attachment/dhandler          |    27 -
 rt/webrt/SelfService/Closed.html                  |     4 -
 rt/webrt/SelfService/Create.html                  |    63 -
 rt/webrt/SelfService/Display.html                 |   190 -
 rt/webrt/SelfService/Elements/GotoTicket          |     1 -
 rt/webrt/SelfService/Elements/Header              |    55 -
 rt/webrt/SelfService/Elements/MyRequests          |    41 -
 rt/webrt/SelfService/Elements/Tabs                |    49 -
 rt/webrt/SelfService/Error.html                   |    22 -
 rt/webrt/SelfService/Prefs.html                   |    51 -
 rt/webrt/SelfService/Update.html                  |    40 -
 rt/webrt/SelfService/index.html                   |     3 -
 rt/webrt/Ticket/Attachment/dhandler               |    27 -
 rt/webrt/Ticket/Create.html                       |   199 -
 rt/webrt/Ticket/Display.html                      |   152 -
 rt/webrt/Ticket/Elements/AddWatchers              |    54 -
 rt/webrt/Ticket/Elements/EditBasics               |    62 -
 rt/webrt/Ticket/Elements/EditDates                |    46 -
 rt/webrt/Ticket/Elements/EditKeywordSelects       |    45 -
 rt/webrt/Ticket/Elements/EditLinks                |   109 -
 rt/webrt/Ticket/Elements/EditPeople               |    37 -
 rt/webrt/Ticket/Elements/EditWatchers             |    46 -
 rt/webrt/Ticket/Elements/ShowBasics               |    29 -
 rt/webrt/Ticket/Elements/ShowDates                |    54 -
 rt/webrt/Ticket/Elements/ShowDependencies         |    18 -
 rt/webrt/Ticket/Elements/ShowHistory              |    43 -
 rt/webrt/Ticket/Elements/ShowKeywordSelects       |    26 -
 rt/webrt/Ticket/Elements/ShowLinks                |    61 -
 rt/webrt/Ticket/Elements/ShowMemberOf             |    12 -
 rt/webrt/Ticket/Elements/ShowMembers              |    22 -
 rt/webrt/Ticket/Elements/ShowPeople               |    12 -
 rt/webrt/Ticket/Elements/ShowReferences           |    27 -
 rt/webrt/Ticket/Elements/ShowRequestor            |    35 -
 rt/webrt/Ticket/Elements/ShowSummary              |    61 -
 rt/webrt/Ticket/Elements/ShowTransaction          |   162 -
 rt/webrt/Ticket/Elements/Tabs                     |   126 -
 rt/webrt/Ticket/Elements/ToolBar                  |     3 -
 rt/webrt/Ticket/History.html                      |    30 -
 rt/webrt/Ticket/Modify.html                       |    39 -
 rt/webrt/Ticket/ModifyAll.html                    |   124 -
 rt/webrt/Ticket/ModifyDates.html                  |    26 -
 rt/webrt/Ticket/ModifyLinks.html                  |    31 -
 rt/webrt/Ticket/ModifyPeople.html                 |    38 -
 rt/webrt/Ticket/Update.html                       |   110 -
 rt/webrt/User/Prefs.html                          |    53 -
 rt/webrt/autohandler                              |    73 -
 rt/webrt/index.html                               |    25 -
 253 files changed, 9307 insertions(+), 45254 deletions(-)
 delete mode 100644 rt/ChangeLog
 delete mode 100755 rt/TODO
 delete mode 100644 rt/bin/initacls.Oracle
 delete mode 100755 rt/bin/initacls.Pg
 delete mode 100755 rt/bin/initacls.mysql
 delete mode 100755 rt/bin/rt
 delete mode 100644 rt/bin/rtadmin
 delete mode 100644 rt/docs/design_docs/basic-definitions.txt
 delete mode 100644 rt/docs/design_docs/local_hacking
 delete mode 100755 rt/docs/rt.gif
 delete mode 100755 rt/etc/config.pm
 delete mode 100644 rt/etc/schema.Oracle
 delete mode 100644 rt/etc/schema.pm
 delete mode 100644 rt/lib/MANIFEST
 delete mode 100644 rt/lib/MANIFEST.SKIP
 delete mode 100644 rt/lib/Makefile.PL
 delete mode 100644 rt/lib/RT/Action/OpenDependent.pm
 delete mode 100755 rt/lib/RT/Action/SendPasswordEmail.pm
 delete mode 100644 rt/lib/RT/Action/StallDependent.pm
 delete mode 100644 rt/lib/RT/Condition/NewDependency.pm
 delete mode 100755 rt/lib/RT/EasySearch.pm
 delete mode 100644 rt/lib/RT/Keyword.pm
 delete mode 100644 rt/lib/RT/KeywordSelect.pm
 delete mode 100644 rt/lib/RT/KeywordSelects.pm
 delete mode 100644 rt/lib/RT/Keywords.pm
 delete mode 100644 rt/lib/RT/ObjectKeyword.pm
 delete mode 100644 rt/lib/RT/ObjectKeywords.pm
 delete mode 100644 rt/lib/RT/TestHarness.pm
 delete mode 100755 rt/lib/RT/Watcher.pm
 delete mode 100755 rt/lib/RT/Watchers.pm
 delete mode 100644 rt/lib/test.pl
 delete mode 100644 rt/tools/cpan2rpm
 delete mode 100644 rt/tools/initdb
 delete mode 100755 rt/tools/insertdata
 delete mode 100644 rt/tools/testdeps
 delete mode 100755 rt/webrt/Admin/Elements/CreateQueueCalled
 delete mode 100755 rt/webrt/Admin/Elements/CreateUserCalled
 delete mode 100755 rt/webrt/Admin/Elements/EditUserComments
 delete mode 100755 rt/webrt/Admin/Elements/GrantQueueRightsTo
 delete mode 100755 rt/webrt/Admin/Elements/GroupTabs
 delete mode 100755 rt/webrt/Admin/Elements/Header
 delete mode 100644 rt/webrt/Admin/Elements/ListGlobalKeywordSelects
 delete mode 100755 rt/webrt/Admin/Elements/ListGlobalScrips
 delete mode 100644 rt/webrt/Admin/Elements/ModifyKeyword
 delete mode 100644 rt/webrt/Admin/Elements/ModifyKeywordSelect
 delete mode 100755 rt/webrt/Admin/Elements/ModifyQueue
 delete mode 100755 rt/webrt/Admin/Elements/ModifyTemplate
 delete mode 100755 rt/webrt/Admin/Elements/ModifyUser
 delete mode 100644 rt/webrt/Admin/Elements/QueueRightsForUser
 delete mode 100755 rt/webrt/Admin/Elements/QueueTabs
 delete mode 100644 rt/webrt/Admin/Elements/SelectKeywordSelect
 delete mode 100644 rt/webrt/Admin/Elements/SelectModifyGroup
 delete mode 100644 rt/webrt/Admin/Elements/SelectModifyKeyword
 delete mode 100644 rt/webrt/Admin/Elements/SelectModifyKeywordSelect
 delete mode 100755 rt/webrt/Admin/Elements/SelectModifyQueue
 delete mode 100755 rt/webrt/Admin/Elements/SelectModifyUser
 delete mode 100755 rt/webrt/Admin/Elements/SelectQueueRights
 delete mode 100644 rt/webrt/Admin/Elements/SelectRights
 delete mode 100755 rt/webrt/Admin/Elements/SelectScrip
 delete mode 100644 rt/webrt/Admin/Elements/SelectScripAction
 delete mode 100644 rt/webrt/Admin/Elements/SelectScripCondition
 delete mode 100644 rt/webrt/Admin/Elements/SelectSingleOrMultiple
 delete mode 100755 rt/webrt/Admin/Elements/SelectTemplate
 delete mode 100644 rt/webrt/Admin/Elements/SelectUsers
 delete mode 100755 rt/webrt/Admin/Elements/SystemTabs
 delete mode 100755 rt/webrt/Admin/Elements/Tabs
 delete mode 100755 rt/webrt/Admin/Elements/UserTabs
 delete mode 100755 rt/webrt/Admin/Global/GroupRights.html
 delete mode 100644 rt/webrt/Admin/Global/Keywords.html
 delete mode 100755 rt/webrt/Admin/Global/Scrips.html
 delete mode 100755 rt/webrt/Admin/Global/Template.html
 delete mode 100755 rt/webrt/Admin/Global/Templates.html
 delete mode 100755 rt/webrt/Admin/Global/UserRights.html
 delete mode 100755 rt/webrt/Admin/Global/index.html
 delete mode 100644 rt/webrt/Admin/Groups/Members.html
 delete mode 100644 rt/webrt/Admin/Groups/Modify.html
 delete mode 100644 rt/webrt/Admin/Groups/Rights.html
 delete mode 100644 rt/webrt/Admin/Groups/index.html
 delete mode 100644 rt/webrt/Admin/KeywordSelects/Modify.html
 delete mode 100644 rt/webrt/Admin/KeywordSelects/index.html
 delete mode 100644 rt/webrt/Admin/Keywords/Modify.html
 delete mode 100644 rt/webrt/Admin/Keywords/index.html
 delete mode 100755 rt/webrt/Admin/Queues/Create.html
 delete mode 100755 rt/webrt/Admin/Queues/GroupRights.html
 delete mode 100644 rt/webrt/Admin/Queues/Keywords.html
 delete mode 100755 rt/webrt/Admin/Queues/Modify.html
 delete mode 100755 rt/webrt/Admin/Queues/People.html
 delete mode 100755 rt/webrt/Admin/Queues/Scrips.html
 delete mode 100755 rt/webrt/Admin/Queues/Template.html
 delete mode 100755 rt/webrt/Admin/Queues/Templates.html
 delete mode 100755 rt/webrt/Admin/Queues/UserRights.html
 delete mode 100755 rt/webrt/Admin/Queues/index.html
 delete mode 100755 rt/webrt/Admin/Users/Modify.html
 delete mode 100755 rt/webrt/Admin/Users/Prefs.html
 delete mode 100644 rt/webrt/Admin/Users/Rights.html
 delete mode 100755 rt/webrt/Admin/Users/index.html
 delete mode 100755 rt/webrt/Admin/index.html
 delete mode 100755 rt/webrt/Elements/Checkbox
 delete mode 100644 rt/webrt/Elements/CreateTicket
 delete mode 100644 rt/webrt/Elements/CustomHomepageHeader
 delete mode 100755 rt/webrt/Elements/Error
 delete mode 100755 rt/webrt/Elements/Footer
 delete mode 100644 rt/webrt/Elements/GotoTicket
 delete mode 100755 rt/webrt/Elements/Header
 delete mode 100755 rt/webrt/Elements/ListActions
 delete mode 100755 rt/webrt/Elements/Login
 delete mode 100644 rt/webrt/Elements/MessageBox
 delete mode 100644 rt/webrt/Elements/MyRequests
 delete mode 100644 rt/webrt/Elements/MyTickets
 delete mode 100644 rt/webrt/Elements/Quicksearch
 delete mode 100644 rt/webrt/Elements/Refresh
 delete mode 100755 rt/webrt/Elements/Section
 delete mode 100755 rt/webrt/Elements/SelectBoolean
 delete mode 100755 rt/webrt/Elements/SelectDate
 delete mode 100755 rt/webrt/Elements/SelectDateRelation
 delete mode 100755 rt/webrt/Elements/SelectDateType
 delete mode 100755 rt/webrt/Elements/SelectEqualityOperator
 delete mode 100644 rt/webrt/Elements/SelectKeyword
 delete mode 100644 rt/webrt/Elements/SelectKeywordOptions
 delete mode 100644 rt/webrt/Elements/SelectLinkType
 delete mode 100644 rt/webrt/Elements/SelectMatch
 delete mode 100755 rt/webrt/Elements/SelectNewTicketQueue
 delete mode 100755 rt/webrt/Elements/SelectOwner
 delete mode 100755 rt/webrt/Elements/SelectQueue
 delete mode 100644 rt/webrt/Elements/SelectResultsPerPage
 delete mode 100644 rt/webrt/Elements/SelectSortOrder
 delete mode 100755 rt/webrt/Elements/SelectStatus
 delete mode 100644 rt/webrt/Elements/SelectTicketSortBy
 delete mode 100755 rt/webrt/Elements/SelectUsers
 delete mode 100644 rt/webrt/Elements/SelectWatcherType
 delete mode 100755 rt/webrt/Elements/ShadedBox
 delete mode 100755 rt/webrt/Elements/Submit
 delete mode 100755 rt/webrt/Elements/Tabs
 delete mode 100755 rt/webrt/Elements/TitleBoxEnd
 delete mode 100755 rt/webrt/Elements/TitleBoxStart
 delete mode 100644 rt/webrt/Elements/ViewUser
 delete mode 100755 rt/webrt/Elements/dayMenu
 delete mode 100755 rt/webrt/Elements/monthMenu
 delete mode 100755 rt/webrt/Elements/yearMenu
 delete mode 100755 rt/webrt/NoAuth/Logout.html
 delete mode 100755 rt/webrt/NoAuth/Reminder.html
 delete mode 100644 rt/webrt/NoAuth/images/rt.jpg
 delete mode 100644 rt/webrt/NoAuth/images/spacer.gif
 delete mode 100755 rt/webrt/NoAuth/webrt.css
 delete mode 100755 rt/webrt/Search/Bulk.html
 delete mode 100755 rt/webrt/Search/Listing.html
 delete mode 100755 rt/webrt/Search/PickRestriction
 delete mode 100755 rt/webrt/Search/RestrictSearch.html
 delete mode 100644 rt/webrt/Search/TicketCell
 delete mode 100644 rt/webrt/SelfService/Attachment/dhandler
 delete mode 100644 rt/webrt/SelfService/Closed.html
 delete mode 100755 rt/webrt/SelfService/Create.html
 delete mode 100755 rt/webrt/SelfService/Display.html
 delete mode 100755 rt/webrt/SelfService/Elements/GotoTicket
 delete mode 100755 rt/webrt/SelfService/Elements/Header
 delete mode 100644 rt/webrt/SelfService/Elements/MyRequests
 delete mode 100644 rt/webrt/SelfService/Elements/Tabs
 delete mode 100755 rt/webrt/SelfService/Error.html
 delete mode 100755 rt/webrt/SelfService/Prefs.html
 delete mode 100755 rt/webrt/SelfService/Update.html
 delete mode 100644 rt/webrt/SelfService/index.html
 delete mode 100644 rt/webrt/Ticket/Attachment/dhandler
 delete mode 100755 rt/webrt/Ticket/Create.html
 delete mode 100755 rt/webrt/Ticket/Display.html
 delete mode 100755 rt/webrt/Ticket/Elements/AddWatchers
 delete mode 100755 rt/webrt/Ticket/Elements/EditBasics
 delete mode 100755 rt/webrt/Ticket/Elements/EditDates
 delete mode 100644 rt/webrt/Ticket/Elements/EditKeywordSelects
 delete mode 100755 rt/webrt/Ticket/Elements/EditLinks
 delete mode 100755 rt/webrt/Ticket/Elements/EditPeople
 delete mode 100755 rt/webrt/Ticket/Elements/EditWatchers
 delete mode 100755 rt/webrt/Ticket/Elements/ShowBasics
 delete mode 100755 rt/webrt/Ticket/Elements/ShowDates
 delete mode 100755 rt/webrt/Ticket/Elements/ShowDependencies
 delete mode 100755 rt/webrt/Ticket/Elements/ShowHistory
 delete mode 100644 rt/webrt/Ticket/Elements/ShowKeywordSelects
 delete mode 100755 rt/webrt/Ticket/Elements/ShowLinks
 delete mode 100755 rt/webrt/Ticket/Elements/ShowMemberOf
 delete mode 100755 rt/webrt/Ticket/Elements/ShowMembers
 delete mode 100755 rt/webrt/Ticket/Elements/ShowPeople
 delete mode 100755 rt/webrt/Ticket/Elements/ShowReferences
 delete mode 100644 rt/webrt/Ticket/Elements/ShowRequestor
 delete mode 100755 rt/webrt/Ticket/Elements/ShowSummary
 delete mode 100755 rt/webrt/Ticket/Elements/ShowTransaction
 delete mode 100755 rt/webrt/Ticket/Elements/Tabs
 delete mode 100755 rt/webrt/Ticket/Elements/ToolBar
 delete mode 100755 rt/webrt/Ticket/History.html
 delete mode 100755 rt/webrt/Ticket/Modify.html
 delete mode 100755 rt/webrt/Ticket/ModifyAll.html
 delete mode 100755 rt/webrt/Ticket/ModifyDates.html
 delete mode 100755 rt/webrt/Ticket/ModifyLinks.html
 delete mode 100755 rt/webrt/Ticket/ModifyPeople.html
 delete mode 100755 rt/webrt/Ticket/Update.html
 delete mode 100755 rt/webrt/User/Prefs.html
 delete mode 100755 rt/webrt/autohandler
 delete mode 100644 rt/webrt/index.html

diff --git a/rt/ChangeLog b/rt/ChangeLog
deleted file mode 100644
index 549a5cac7..000000000
--- a/rt/ChangeLog
+++ /dev/null
@@ -1,16016 +0,0 @@
-2002-07-19 22:47  jesse
-
-	* README:
-
-	Fixed the readme about fastcgi
-	
-2002-07-19 22:42  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.0.14
-	
-2002-07-19 01:22  jesse
-
-	* Makefile, bin/rt, webrt/Search/Bulk.html:
-
-	RT-Ticket: 1547
-	
-	Bumping the version to 2.0.14-pre4
-	Fixing a typo that pdh caught in Tickets/Bulk.html
-	
-2002-07-13 00:22  jesse
-
-	* Makefile:
-
-	Bumped to 2.0.14-pre3
-	
-2002-07-13 00:19  jesse
-
-	* bin/webmux.pl:
-
-	modperl handler now speaks Mason 1.11 properly.
-	
-2002-07-13 00:00  jesse
-
-	* etc/config.pm:
-
-	Shifted some config defaults to make things easier for newbie users
-	
-2002-07-12 13:31  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Now we properly strip long pathnames from attachments uploaded from windows boxes.
-	
-2002-07-11 01:41  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Fixing a typo in the mason 11 handler
-	
-2002-07-10 14:41  jesse
-
-	* Makefile:
-
-	Bumping the version to 2.0.14-pre2
-	
-2002-07-10 14:36  jesse
-
-	* lib/RT/User.pm:
-
-	[no log message]
-	
-2002-07-10 14:35  jesse
-
-	* lib/RT/: Queue.pm, Ticket.pm:
-
-	RT-Ticket: 1418
-	RT-Status: resolved
-	
-	minor perldoc cleanups from pdh@snapgear
-	
-2002-07-10 14:32  jesse
-
-	* bin/rt-mailgate, lib/RT/Action/SendEmail.pm:
-
-	RT-Ticket: 1425
-	RT-Status: resolved
-	RT-Milestone: 2.0.x
-	RT-Subsystem: Mail Sending
-	
-	Fixes to create more proper message ids.
-	
-2002-07-10 14:28  jesse
-
-	* lib/RT/Ticket.pm:
-
-	RT-Ticket: 1431
-	RT-Status: resolved
-	
-	Importing tickets now lets you set the "Resolved" date
-	
-2002-07-10 14:17  jesse
-
-	* lib/RT/Tickets.pm:
-
-	RT-Ticket: 1434
-	RT-Status: resolved
-	RT-Subsystem: Core
-	RT-Milestone: 2.0.x
-	
-	RT is now smarter about letting you do "or" searches on single-value
-	keyword selections. Thanks to sam hartman.
-	
-2002-07-10 14:15  jesse
-
-	* webrt/Ticket/: Display.html, ModifyAll.html:
-
-	RT-Ticket: 1433
-	RT-Status: resolved
-	RT-Milestone: 2.0.x
-	RT-Subsystem: HTML::Mason frontend
-	RT-Severity: Nice to have
-	RT-Broken In: 2.0.13
-	RT-Broken In: 2.0.12
-	RT-Broken In: 2.0.11
-	RT-Broken In: 2.0.10
-	RT-Broken In: 2.0.0
-	RT-Broken In: 2.0.1
-	RT-Broken In: 2.0.2
-	RT-Broken In: 2.0.3
-	RT-Broken In: 2.0.4
-	RT-Broken In: 2.0.5
-	RT-Broken In: 2.0.6
-	RT-Broken In: 2.0.7
-	RT-Broken In: 2.0.8
-	RT-Broken In: 2.0.9
-	
-	Some signatures weren't setting off the "don't record comments if the update
-	is only a signature" code. Fixed.
-	
-2002-07-10 13:59  jesse
-
-	* lib/RT/Transaction.pm:
-
-	RT-Ticket: 1501
-	RT-Status: resolved
-	
-	Fixing docs in Transaction.pm's Message method
-	
-2002-07-10 13:19  jesse
-
-	* bin/rt:
-
-	RT-Ticket: 1528
-	RT-Milestone: 2.0.x
-	RT-Subsystem: CLI
-	RT-Severity: Normal
-	RT-Status: resolved
-	
-	Fixed docs for cli to say that --limit-status=dead isn't a valid option
-	
-2002-06-26 15:22  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	support for mason 1.1
-	
-2002-06-26 15:19  jesse
-
-	* Makefile, bin/mason_handler.fcgi, bin/webmux.pl,
-	webrt/Admin/Queues/GroupRights.html,
-	webrt/Admin/Queues/UserRights.html, webrt/Elements/ListActions,
-	webrt/Ticket/Elements/ShowBasics, webrt/Ticket/Elements/ToolBar:
-
-	Adding support for mason 1.10
-	
-2002-06-26 15:15  jesse
-
-	* lib/RT/Action/Notify.pm:
-
-	Fixed notify cc behavior
-	
-2002-06-26 15:13  jesse
-
-	* lib/RT/Action/SendEmail.pm:
-
-	Fixed pseudo-list syntax in To: lines
-	
-2002-06-26 15:09  jesse
-
-	* webrt/Search/Bulk.html:
-
-	Added support for bulk comment/reply
-	
-2002-05-03 02:07  jesse
-
-	* lib/RT/Ticket.pm:
-
-	RT-Ticket: 1369
-	RT-Status: resolved
-	
-	When a ticket has another merged into it, it now has its "LastUpdated" date
-	updated
-	
-2002-05-03 01:58  jesse
-
-	* lib/RT/Ticket.pm:
-
-	RT-Ticket: 1412
-	RT-status: resolved
-	
-	Fixed a docs bug in Ticket->Import which didn't make it clear that Import
-	took an "Id" parameter and "Create" didn't.
-	
-2002-05-03 01:54  jesse
-
-	* webrt/autohandler:
-
-	rt-ticket: 1410
-	rt-status: resolved
-	
-	Applied a patch from rich lafferty which prevented NoAuth from not
-	requiring authentication on some fastcgi setups.
-	
-	A similar bug bit SelfService.
-	
-	This commit fixes that one too.
-	
-2002-05-03 01:51  jesse
-
-	* Makefile:
-
-	RT-Ticket: 1272
-	rt-status: resolved
-	
-	Applied a patch from Ilya Martynov which allows make insert to work
-	in a scenario where DESTDIR is being set to something funny This may be necessary when installing into AFS
-	
-2002-05-03 01:36  jesse
-
-	* lib/RT/Action/SendEmail.pm:
-
-	RT-Ticket: 1367
-	RT-Status: resolved
-	
-	Added a check which only sets precedence to bulk if it's not already set,
-	say by a template.
-	
-2002-05-03 01:30  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	RT-Ticket: 1370
-	RT-Status: resolved
-	
-	From: Jason Edgecombe <jedgecombe@carolina.rr.com>
-	To: rt-devel@lists.fsck.com
-	Subject: [rt-devel] An oversite in Interface/Email.pm
-	
-	Hi,
-	
-	   I found an problem in Interface/Email.pm when I was modifying
-	   enhanced mailgate. I have attached a diff of the modifications.
-	
-	   In the function MailError, it assumes MIMIEOBJ is defined. I added a
-	   simple "if" test to only run $MIMEOBJ->sync_headers if $MIMEOBJ is defined.
-	
-2002-05-03 01:24  jesse
-
-	* lib/RT/Action/SendEmail.pm:
-
-	RT-Ticket: 1348
-	RT-Status: resolved
-	
-	Fixed a bug in mail sending that improperly quoted the usernames of users
-	who had " in their names
-	
-2002-04-29 00:39  jesse
-
-	* lib/RT.pm:
-
-	Fixed a tiny typo
-	
-2002-04-28 23:46  jesse
-
-	* lib/RT.pm:
-
-	Fixed up the rt log messages.
-	
-2002-04-21 02:14  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Fixed a couple bugs in setting owners that were only revealed by the poor data
-	validation on rt.cpan.org
-	
-2002-04-21 02:06  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Fixed a couple bugs in setting owners that were only revealed by the poor data
-	validation on rt.cpan.org
-	
-2002-04-19 00:32  jesse
-
-	* Makefile:
-
-	Adding a new Makefile target to ease packaging.
-	
-2002-04-18 12:47  jesse
-
-	* lib/RT/GroupMember.pm:
-
-	RT-Ticket: 1385
-	RT-Broken-In: 2.0.0
-	RT-Broken-In: 2.0.1
-	RT-Broken-In: 2.0.2
-	RT-Broken-In: 2.0.3
-	RT-Broken-In: 2.0.4
-	RT-Broken-In: 2.0.5
-	RT-Broken-In: 2.0.6
-	RT-Broken-In: 2.0.7
-	RT-Broken-In: 2.0.8
-	RT-Broken-In: 2.0.9
-	RT-Broken-In: 2.0.10
-	RT-Broken-In: 2.0.11
-	RT-Broken-In: 2.0.12
-	RT-Broken-In: 2.0.13
-	RT-Status: resolved
-	
-	GroupMemmber was looking for the "ModifyGroups" right, when it should have
-	been looking for the "AdminGroups" right
-	
-2002-04-05 10:24  jesse
-
-	* webrt/Ticket/Update.html:
-
-	RT-Ticket: 1330
-	RT-Status: Resolved
-	
-	Fixed an html escaping bug in Ticket/Update.html
-	
-2002-03-27 22:59  jesse
-
-	* Makefile, lib/RT/User.pm:
-
-	Fixed a CRITICAL security bug that allowed remote administrative access
-	to RT without a password.  (Security advisory to follow)
-	
-2002-03-14 16:15  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.0.12
-	
-2002-03-06 18:57  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.0.12pre6
-	
-2002-03-06 18:57  jesse
-
-	* lib/RT/Transaction.pm:
-
-	Added an update that will make dates changed as parts of transaction updates show up in local time
-	
-2002-03-06 18:56  jesse
-
-	* webrt/Admin/Queues/Modify.html:
-
-	Added a note to the queue creation screen about defaults.
-	
-2002-03-01 01:41  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	This patch fixes a small problem with printing a message.It checks if themessage is true, not if it has length, so a message containing 0 will notbe printed.  From Blair Zajac <blair@orcaware.com>
-	
-2002-03-01 01:39  jesse
-
-	* bin/rt:
-
-	RT-Ticket:438
-	RT-Status: resolved
-	
-	Added brandon's patch to allow searching for tickets by keyword on the commandline
-	
-2002-02-28 02:03  jesse
-
-	* bin/rt:
-
-	RT-Ticket: 1258
-	RT-Milestone: 2.0.x
-	RT-Subsystem: CLI
-	RT-Severity: normal
-	RT-Broken in: 2.0-beta3
-	RT-Broken in: 2.0.1
-	RT-Broken in: 2.0.2
-	RT-Broken in: 2.0.3
-	RT-Broken in: 2.0.4
-	RT-Broken in: 2.0.5
-	RT-Broken in: 2.0.6
-	RT-Broken in: 2.0.7
-	RT-Broken in: 2.0.8
-	RT-Broken in: 2.0.9
-	RT-Broken in: 2.0.10
-	RT-Broken in: 2.0.11
-	
-	Removed a line that make --limit-priority and --limit-final-priority not
-	work
-	
-2002-02-28 01:49  jesse
-
-	* lib/RT/Action/: Autoreply.pm, SendEmail.pm:
-
-	RT-Ticket: 1196
-	RT-Status: resolved
-	
-2002-02-28 01:38  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	RT-Ticket: 1246
-	RT-Status: resolved
-	
-2002-02-28 01:38  jesse
-
-	* tools/testdeps:
-
-	Added a couple explicit dependencies to testdeps that should have been there
-	forever ago. you'll only run into this if your cpan doesn't do recursive deps.
-	
-2002-02-20 20:45  jesse
-
-	* Makefile, lib/RT/Interface/Web.pm, webrt/Admin/Users/index.html,
-	webrt/Ticket/Update.html:
-
-	Bumped the version to 2.0.12-pre5.
-	
-	Web: Fixed a typo in user administration that prevented user listing
-	
-	Web: fixed recieve to receive in ticket/update
-	
-2002-02-19 03:23  jesse
-
-	* lib/RT/Scrips.pm:
-
-	Fixed a typo. (Added a missing ;)
-	
-2002-02-19 01:04  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0.12pre4
-	
-2002-02-18 18:35  jesse
-
-	* lib/RT/Condition/Generic.pm:
-
-	RT-Ticket: 1194
-	
-	cleaned up a reference to "ApplicableTypes", a nonexistent parameter to Condition->new
-	
-2002-02-18 18:30  jesse
-
-	* webrt/Elements/Login:
-
-	RT-Ticket: 1226
-	RT-Status: resolved
-	
-	Added an explicit reset of the content-type to 'text/html' when displaying hte login page
-	
-2002-02-18 18:25  jesse
-
-	* webrt/Admin/Users/index.html:
-
-	rt-ticket: 1190
-	rt-status: resolved
-	
-	Modified administrative userlist to make it easier to click on users who have no Name attribute defined
-	
-2002-02-18 18:18  jesse
-
-	* webrt/: Elements/Header, SelfService/Elements/Header:
-
-	rt-ticket: 1176
-	rt-status: resolved
-	
-	Applied tom's patch which hides the preferences link if the user doesn't have the right to "modify self"
-	
-2002-02-18 18:14  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	RT-Ticket: 1165
-	RT-Status: resolved
-	
-	exporting the ParseAddressFromHeader subroutine so others can play with it
-	
-2002-02-18 18:06  jesse
-
-	* webrt/Ticket/Update.html:
-
-	RT-Ticket:1209
-	RT-Milestone: 2.0.x
-	RT-Status: resolved
-	
-	Removed  a bogus font tag from the Ticket update screen
-	
-2002-02-18 18:00  jesse
-
-	* lib/RT/Interface/Web.pm, webrt/Search/Listing.html:
-
-	RT-Ticket: 1243
-	RT-Status: resolved
-	RT-Milestone: 2.0.x
-	RT-Broken-In: 2.0.8
-	RT-Broken-In: 2.0.9
-	RT-Broken-In: 2.0.10
-	RT-Broken-In: 2.0.11
-	RT-Subsystem: HTML::Mason Frontend
-	RT-Severity: Normal
-	
-	Switched the web frontend to use an in-core scalar for uploaded attachment content,
-	rather than a tempfile which wasn't getting cleaned up properly
-	
-2002-02-18 16:53  jesse
-
-	* webrt/Search/Listing.html:
-
-	RT-Ticket: 1245
-	Rt-status: resolved
-	
-	Applied a patch to nuke duplicate restrictions in the webui.
-	
-2002-02-18 16:47  jesse
-
-	* webrt/Admin/Groups/Members.html:
-
-	RT-Ticket: 1421
-	RT-Status: resolved
-	
-	moved a label inside a loop to make the ui easier to understand
-	
-2002-02-18 16:36  jesse
-
-	* etc/config.pm:
-
-	Set Default for UseFriendlyToLines to 0 by default, to deal with users running
-	redhat who have trouble configuring RT.
-	
-2002-02-18 16:31  jesse
-
-	* Makefile, lib/RT/Scrip.pm, tools/insertdata:
-
-	Edited insertdata to insert scrips by default, so that users don't need
-	to go through the configuration task themselves.
-	
-	Change the Makefile's WEB_GROUP to www by default for redhat and OSX.
-	
-	Correced docs for lib/RT/Scrip new() method
-	
-2002-02-08 01:23  jesse
-
-	* webrt/SelfService/Display.html:
-
-	cleanup to "last trans" in SelfService
-	
-2002-02-08 00:53  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Generalized "Abort" function to allow other non-html error messages with
-	proper handlers
-	
-2002-02-08 00:49  jesse
-
-	* etc/: schema.Pg, schema.mysql:
-
-	removed duplicate indices
-	
-2002-02-07 16:41  jesse
-
-	* etc/config.pm:
-
-	Added some docs to the config file from Rich Lafferty
-	
-2002-02-04 12:37  jesse
-
-	* lib/RT/Template.pm:
-
-	Output template content to core rather than disk when parsing.
-	
-2002-01-28 01:01  jesse
-
-	* webrt/Ticket/Elements/ShowHistory:
-
-	closing lasttrans anchor
-	
-2002-01-28 00:59  jesse
-
-	* webrt/Ticket/Elements/ShowHistory:
-
-	Closing the #lasttrans anchor
-	
-2002-01-28 00:58  jesse
-
-	* lib/RT/Record.pm:
-
-	RT-Ticket: 1156
-	
-	Pulling forward the patch for 1156
-	
-2002-01-28 00:57  jesse
-
-	* lib/RT/Record.pm:
-
-	RT-Ticket: 1156
-	RT-Status: resolved
-	
-2002-01-28 00:47  jesse
-
-	* bin/mason_handler.fcgi:
-
-	Small fix to the fastcgi handler to make attachment display work better,
-	thanks to rich lafferty.
-	
-2002-01-28 00:47  jesse
-
-	* etc/config.pm:
-
-	Removed some extraneous slashes from the config file.
-	
-2002-01-28 00:46  jesse
-
-	* README:
-
-	Clarified some readme stuff
-	
-2002-01-28 00:44  jesse
-
-	* bin/rt-commit-handler:
-
-	Bringing forward a fix to the cvs commit handler to deal with branched
-	version #s.
-	
-2002-01-28 00:40  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.1.1
-	
-2002-01-28 00:27  jesse
-
-	* etc/RT_Config.pm:
-
-	file RT_Config.pm was initially added on branch rt-2-1.
-	
-2002-01-28 00:27  jesse
-
-	* bin/enhanced-mailgate:
-
-	file enhanced-mailgate was initially added on branch rt-2-1.
-	
-2002-01-28 00:27  jesse
-
-	* bin/rt-commit-handler:
-
-	file rt-commit-handler was initially added on branch rt-2-1.
-	
-2002-01-28 00:27  jesse
-
-	* Makefile, bin/enhanced-mailgate, bin/mason_handler.fcgi, bin/rt,
-	bin/rt-commit-handler, bin/rt-mailgate, bin/rtadmin, bin/webmux.pl,
-	etc/RT_Config.pm, etc/acl.Oracle, etc/acl.Pg, etc/acl.mysql,
-	etc/config.pm, lib/RT.pm, lib/RT/Handle.pm, lib/RT/User.pm,
-	lib/RT/Watcher.pm, lib/RT/Interface/CLI.pm,
-	lib/RT/Interface/Email.pm, tools/cpan2rpm, tools/initdb,
-	tools/insertdata, tools/testdeps:
-
-	First RT 2.1 checkin. don't expect this to run.  (though it does here)
-	
-2002-01-25 17:37  jesse
-
-	* README:
-
-	Added a warning to the readme that 2.1 is scary and people shouldn't use it
-	
-2002-01-25 17:24  jesse
-
-	* Makefile:
-
-	Branching 2.1.0  and incrementing the makefile to 2.1.
-	
-	Welcome to the future.
-	
-2002-01-24 13:30  jesse
-
-	* lib/RT/Transaction.pm:
-
-	RT-Ticket: 1201
-	RT-Status: resolved
-	
-	Better transaction display for "text" and "message" parts.
-	
-2002-01-24 13:00  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	RT-Ticket: 1166
-	RT-Status: resolved
-	
-	Implemented better URL regexp matching.
-	
-2002-01-24 10:39  jesse
-
-	* bin/rt-mailgate:
-
-	Fixed a typo in a debug message in rt-mailgate
-	
-2002-01-24 10:34  jesse
-
-	* lib/RT/Template.pm:
-
-	Switched from bogus mime parsing to using MIME::Parser like we should have
-	from the get-go.
-	
-	Used perltidy to clean up template.pm before we started working on it.
-	
-2002-01-24 10:28  jesse
-
-	* lib/RT/Record.pm:
-
-	Added a check to LoadByCols which causes postgres mode to not try to lookup
-	lc(undef)
-	
-2002-01-24 10:23  jesse
-
-	* webrt/NoAuth/webrt.css:
-
-	Added a new style to the stylesheet to support some new reports
-	
-2002-01-24 10:21  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	mail gateway now unfolds long headers on parse.
-	
-2002-01-11 15:20  jesse
-
-	* Makefile, lib/RT/Transaction.pm:
-
-	RT-Ticket: 950
-	
-	Aoolyed the recommended patch to make blank bodies not get
-	mailed in lieu of the real message
-	
-2002-01-11 15:00  jesse
-
-	* Makefile, webrt/Ticket/ModifyAll.html:
-
-	Fixed a small bug that broke the "jumbo" page after 2.0.11
-	
-2002-01-11 01:17  jesse
-
-	* bin/rt-mailgate:
-
-	Added a new flag to rt-mailgate to enable setting the owner of new tickets based on +extension
-	
-2002-01-11 01:13  jesse
-
-	* webrt/Ticket/: Modify.html, ModifyAll.html:
-
-	Adding a couple ACL checks to better deal with moving tickets to queues the user can't see
-	
-2002-01-11 01:11  jesse
-
-	* webrt/Admin/Queues/index.html:
-
-	Fixed typo in ACL check that resulted in "Create Queue" being more restrictive than
-	it needed to be
-	
-2002-01-10 19:07  jesse
-
-	* webrt/Ticket/Update.html:
-
-	more tweaking
-	
-2002-01-10 19:05  jesse
-
-	* webrt/Ticket/Update.html:
-
-	Cleaned up the Ticekt Update ui some
-	
-2002-01-10 19:02  jesse
-
-	* lib/RT/: Attachment.pm, Action/Notify.pm, Condition/Generic.pm:
-
-	Cleanups to make Also-Cc and Also-Bcc go
-	
-2002-01-10 19:01  jesse
-
-	* lib/RT/Queue.pm:
-
-	Changed a test to work the way that Test::Inline does now
-	
-2002-01-10 18:34  jesse
-
-	* lib/RT/Attachment.pm:
-
-	Changes to attachment to provide the header frobbing necessary to send mail to ccs and bccs
-	
-2002-01-10 18:32  jesse
-
-	* Makefile, README, lib/RT/Ticket.pm, tools/insertdata,
-	webrt/Ticket/Update.html, lib/RT/Action/Notify.pm:
-
-	Work on "Explicit Cc" and "Explicit Bcc" for a client
-	
-2002-01-10 18:27  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	abstracting out a number to a named variable
-	
-2002-01-09 02:24  jesse
-
-	* webrt/Admin/: Groups/index.html, Keywords/index.html:
-
-	A couple tiny ui cleanups (removed some object ids from the UI where they were just being clutter
-	
-2002-01-02 21:58  jesse
-
-	* Makefile, README, webrt/Elements/Login:
-
-	Bumped some copyright notices to 2002. bumped version to 2.0.11
-	
-2001-12-26 14:59  jesse
-
-	* Makefile:
-
-	Bumping version to 2.0.11pre1
-	
-2001-12-26 14:51  jesse
-
-	* lib/RT/Tickets.pm:
-
-	Merges were being over-zealous in what they twiddled the effective id of.
-	
-	this meant that far too many tickets would show up in ticket listings.
-	
-2001-12-24 18:58  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.0.10
-	
-2001-12-19 00:24  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0.10pre4
-	
-	fix to makefile to genereate changelog for head
-	
-2001-12-18 03:58  jesse
-
-	* lib/RT/Tickets.pm:
-
-	The "null search" was finding all tickets in 2.0.10pre3.  Fixed in CVS
-	
-2001-12-18 03:53  jesse
-
-	* bin/rt:
-
-	fixed typos in bin/rt that stopped --limit-subject --limit-requestors and --limit-body from
-	working
-	
-2001-12-17 15:13  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.0.10-test3
-	
-2001-12-17 14:58  jesse
-
-	* lib/RT/User.pm, tools/insertdata, webrt/Admin/Users/Modify.html:
-
-	RT-Ticket: 935
-	RT-Status: resolved
-	
-	cleaned up seph's patch. this enabled me to actually really properly support
-	users with no email address, which meant there were a couple other cleanups
-	to go through too.
-	
-2001-12-17 14:26  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Some small cleanups to the IsWatcher stuff.
-	
-	Added checks to make sure that watchers aren't duplicated to ticket.pm
-	
-2001-12-17 13:04  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	Fixed an unclosed anchor which caused IE to render ticket listings wrong.
-	
-2001-12-14 18:29  jesse
-
-	* lib/Makefile.PL, tools/testdeps:
-
-	Bumped DBIx::SearchBuilder dependency to 0.48
-	
-2001-12-14 18:28  jesse
-
-	* tools/testdeps, webrt/Elements/Login:
-
-	Removed code to special case for bugs in mason < 1.01.
-	Moved us up to a mason 1.02 dependency
-	
-2001-12-14 18:26  jesse
-
-	* bin/rt:
-
-	bin/rt: added support for --version, fixed --status = !closed, docced --merge-into
-	
-2001-12-14 18:25  jesse
-
-	* Makefile:
-
-	Some stylistic cleanups  to the makefile from blair.
-	
-2001-12-14 16:42  jesse
-
-	* bin/rtadmin:
-
-	rtadmin had some issues where it would assume a 'name' if called without --name for user group and queue editing.
-	
-2001-12-14 16:06  jesse
-
-	* lib/RT/Tickets.pm:
-
-	
-	Ticket listings will no longer show tickets which have been merged into others.
-	
-		-j
-	
-2001-12-14 15:27  jesse
-
-	* lib/RT/User.pm:
-
-	Prevent users from futzing with nobody or rt_System, unless you're setting an email address.
-	(Arguably, that's a bug too)
-	
-2001-12-14 14:03  jesse
-
-	* lib/RT/: ACE.pm, Group.pm, GroupMember.pm, Keyword.pm,
-	KeywordSelect.pm, Queue.pm, Scrip.pm, Template.pm, Ticket.pm:
-
-	Standardised on "Permission Denied" instead of having some "Permission denied". Thanks simon.
-	
-	        -j
-	
-2001-12-14 13:46  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Reordered the order that Basics actions are committed, so that Queue changes
-	come after other changes, so that users don't move tickets out of a queue before they have a
-	chance to update them.
-	
-2001-12-13 02:18  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Addition to Ticket->Import, so you can set owner by name.
-	
-	Fix for a bug in Ticket->AddWatcher that would let privileged watchers without
-	email addresses add others as watchers.
-	
-2001-12-03 20:13  jesse
-
-	* Makefile, lib/RT/EasySearch.pm, lib/RT/Keyword.pm,
-	lib/RT/Record.pm, lib/RT/Tickets.pm, lib/RT/User.pm:
-
-	more work on making sure that only the things we want are case sensitive
-	(IE name, content email address should always be insensitive.  when loading a row by any field other than ID, that should be case-insensitive)
-	
-2001-12-03 19:17  jesse
-
-	* Makefile:
-
-	bumped the version  to 2.0.10-test1
-	
-2001-12-03 19:14  jesse
-
-	* lib/RT/EasySearch.pm:
-
-	We now default to case sensitive searches, rather than case-insensitive ones.
-	(This should speed up Pg a LOT. We'll be adding in case-insensitive searching
-	for the 13 attributes that matter:
-	
-	Watcher->Email
-	User->name
-	User->email
-	User->gecos
-	Ticket->Subject
-	Queue->name
-	KeywordSelect->name
-	Keyword->Name
-	ObjectKeyword->Name
-	Attachment->Subject
-	Attachment->Content
-	Attachment->Headers
-	
-2001-12-03 19:13  jesse
-
-	* webrt/: Admin/Queues/Modify.html, Admin/Queues/People.html,
-	Elements/GotoTicket:
-
-	Some small UI cleanups from Hakke
-	
-2001-11-29 03:50  jesse
-
-	* webrt/: Elements/SelectEqualityOperator, Elements/SelectOwner,
-	Search/PickRestriction:
-
-	SelectOwner now passes a ticket up the line.
-	
-	Priority can now have = and != searches
-	
-2001-11-29 03:49  jesse
-
-	* tools/insertdata:
-
-	Cleaned up a template to display Ticket subject, if no transaction subject is given.
-	
-2001-11-29 03:48  jesse
-
-	* webrt/Ticket/: Update.html, Elements/EditPeople:
-
-	Now pass in ticket Id, so that "owner" can be someone who only has rights to that tikcet.
-	
-2001-11-29 03:47  jesse
-
-	* lib/RT/Ticket.pm:
-
-	FinalPriority should never get set to null if a ticket doesn't have the attribute set on create
-	
-	Untake's arguments were debognifed
-	
-2001-11-29 03:45  jesse
-
-	* webrt/SelfService/Elements/Header:
-
-	"Logout" no longer shows up when using external auth with SelfService
-	
-2001-11-29 03:44  jesse
-
-	* bin/rt:
-
-	Fix for setting priority when creating tickets with the cli
-	
-2001-11-29 03:42  jesse
-
-	* bin/rt-mailgate:
-
-	Added support for --ticket-id-from-extension to rt-mailgate
-	
-2001-11-14 14:28  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.0.9
-	
-2001-11-13 11:33  jesse
-
-	* Makefile, bin/initacls.Pg, bin/rt:
-
-	rt-ticket:1007
-	rt-status: resolved
-	
-	initacls.pg no longer has extranious spaces which break variable assignment for port and host.
-	
-	Bumped version to 2.0.9pre9
-	
-2001-11-12 13:19  jesse
-
-	* Makefile, bin/initacls.Pg:
-
-	Fix for #1007 (Typo in bin/initacls.Pg)
-	Bumped version to 2.0.9pre8
-	
-2001-11-09 18:24  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	URL higlighting should now work with mailto: urls
-	
-2001-11-09 18:15  jesse
-
-	* Makefile, webrt/Ticket/Elements/ShowTransaction:
-
-	Cleaned up the url highlighting code
-	
-	Bumped the version to 2.0.9pre7
-	
-2001-11-09 17:27  jesse
-
-	* Makefile:
-
-	Fixing the new taggy stuff
-	
-2001-11-09 17:23  jesse
-
-	* Makefile:
-
-	Fixing the new branchy stuff
-	
-2001-11-09 17:07  jesse
-
-	* Makefile, bin/rtadmin, etc/config.pm,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Added a bit of doc to etc/config.pm
-	
-	Modified ShowTransaction to more properly escape html
-	
-	Fixed some of the cli help for rtadmin
-	
-	Added support for branch specification to the makefile
-	
-2001-11-08 15:15  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	I can commit on the head. really.
-	
-2001-11-08 15:06  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Dealing with defined but blank Owner fields
-	
-2001-11-06 18:06  jesse
-
-	* tools/cpan2rpm, tools/initdb, tools/insertdata, tools/testdeps,
-	webrt/autohandler, webrt/index.html, webrt/Admin/index.html,
-	webrt/Admin/Elements/CreateQueueCalled,
-	webrt/Admin/Elements/CreateUserCalled,
-	webrt/Admin/Elements/EditUserComments,
-	webrt/Admin/Elements/GrantQueueRightsTo,
-	webrt/Admin/Elements/GroupTabs, webrt/Admin/Elements/Header,
-	webrt/Admin/Elements/ListGlobalKeywordSelects,
-	webrt/Admin/Elements/ListGlobalScrips,
-	webrt/Admin/Elements/ModifyKeyword,
-	webrt/Admin/Elements/ModifyKeywordSelect,
-	webrt/Admin/Elements/ModifyQueue,
-	webrt/Admin/Elements/ModifyTemplate,
-	webrt/Admin/Elements/ModifyUser,
-	webrt/Admin/Elements/QueueRightsForUser,
-	webrt/Admin/Elements/QueueTabs,
-	webrt/Admin/Elements/SelectKeywordSelect,
-	webrt/Admin/Elements/SelectModifyGroup,
-	webrt/Admin/Elements/SelectModifyKeyword,
-	webrt/Admin/Elements/SelectModifyKeywordSelect,
-	webrt/Admin/Elements/SelectModifyQueue,
-	webrt/Admin/Elements/SelectModifyUser,
-	webrt/Admin/Elements/SelectQueueRights,
-	webrt/Admin/Elements/SelectRights,
-	webrt/Admin/Elements/SelectScrip,
-	webrt/Admin/Elements/SelectScripAction,
-	webrt/Admin/Elements/SelectScripCondition,
-	webrt/Admin/Elements/SelectSingleOrMultiple,
-	webrt/Admin/Elements/SelectTemplate,
-	webrt/Admin/Elements/SelectUsers, webrt/Admin/Elements/SystemTabs,
-	webrt/Admin/Elements/Tabs, webrt/Admin/Elements/UserTabs,
-	webrt/Admin/Global/GroupRights.html,
-	webrt/Admin/Global/Keywords.html, webrt/Admin/Global/Scrips.html,
-	webrt/Admin/Global/Template.html,
-	webrt/Admin/Global/Templates.html,
-	webrt/Admin/Global/UserRights.html, webrt/Admin/Global/index.html,
-	webrt/Admin/Groups/Members.html, webrt/Admin/Groups/Modify.html,
-	webrt/Admin/Groups/Rights.html, webrt/Admin/Groups/index.html,
-	webrt/Admin/KeywordSelects/Modify.html,
-	webrt/Admin/KeywordSelects/index.html,
-	webrt/Admin/Keywords/Modify.html, webrt/Admin/Keywords/index.html,
-	webrt/Admin/Queues/Create.html,
-	webrt/Admin/Queues/GroupRights.html,
-	webrt/Admin/Queues/Keywords.html, webrt/Admin/Queues/Modify.html,
-	webrt/Admin/Queues/People.html, webrt/Admin/Queues/Scrips.html,
-	webrt/Admin/Queues/Template.html,
-	webrt/Admin/Queues/Templates.html,
-	webrt/Admin/Queues/UserRights.html, webrt/Admin/Queues/index.html,
-	webrt/Admin/Users/Modify.html, webrt/Admin/Users/Prefs.html,
-	webrt/Admin/Users/Rights.html, webrt/Admin/Users/index.html,
-	webrt/Elements/Checkbox, webrt/Elements/CreateTicket,
-	webrt/Elements/CustomHomepageHeader, webrt/Elements/Error,
-	webrt/Elements/Footer, webrt/Elements/GotoTicket,
-	webrt/Elements/Header, webrt/Elements/ListActions,
-	webrt/Elements/Login, webrt/Elements/MessageBox,
-	webrt/Elements/MyRequests, webrt/Elements/MyTickets,
-	webrt/Elements/Quicksearch, webrt/Elements/Refresh,
-	webrt/Elements/Section, webrt/Elements/SelectBoolean,
-	webrt/Elements/SelectDate, webrt/Elements/SelectDateRelation,
-	webrt/Elements/SelectDateType, webrt/Elements/SelectKeyword,
-	webrt/Elements/SelectKeywordOptions, webrt/Elements/SelectLinkType,
-	webrt/Elements/SelectMatch, webrt/Elements/SelectNewTicketQueue,
-	webrt/Elements/SelectOwner, webrt/Elements/SelectQueue,
-	webrt/Elements/SelectResultsPerPage,
-	webrt/Elements/SelectSortOrder, webrt/Elements/SelectStatus,
-	webrt/Elements/SelectTicketSortBy, webrt/Elements/SelectUsers,
-	webrt/Elements/SelectWatcherType, webrt/Elements/ShadedBox,
-	webrt/Elements/Submit, webrt/Elements/Tabs,
-	webrt/Elements/TitleBoxEnd, webrt/Elements/TitleBoxStart,
-	webrt/Elements/ViewUser, webrt/Elements/dayMenu,
-	webrt/Elements/monthMenu, webrt/Elements/yearMenu,
-	webrt/NoAuth/Logout.html, webrt/NoAuth/Reminder.html,
-	webrt/NoAuth/webrt.css, webrt/NoAuth/images/rt.jpg,
-	webrt/NoAuth/images/spacer.gif, webrt/Search/Bulk.html,
-	webrt/Search/Listing.html, webrt/Search/PickRestriction,
-	webrt/Search/RestrictSearch.html, webrt/Search/TicketCell,
-	webrt/SelfService/Closed.html, webrt/SelfService/Create.html,
-	webrt/SelfService/Display.html, webrt/SelfService/Error.html,
-	webrt/SelfService/Prefs.html, webrt/SelfService/Update.html,
-	webrt/SelfService/index.html,
-	webrt/SelfService/Attachment/dhandler,
-	webrt/SelfService/Elements/GotoTicket,
-	webrt/SelfService/Elements/Header,
-	webrt/SelfService/Elements/MyRequests,
-	webrt/SelfService/Elements/Tabs, webrt/Ticket/Create.html,
-	webrt/Ticket/Display.html, webrt/Ticket/History.html,
-	webrt/Ticket/Modify.html, webrt/Ticket/ModifyAll.html,
-	webrt/Ticket/ModifyDates.html, webrt/Ticket/ModifyLinks.html,
-	webrt/Ticket/ModifyPeople.html, webrt/Ticket/Update.html,
-	webrt/Ticket/Attachment/dhandler,
-	webrt/Ticket/Elements/AddWatchers,
-	webrt/Ticket/Elements/EditBasics, webrt/Ticket/Elements/EditDates,
-	webrt/Ticket/Elements/EditKeywordSelects,
-	webrt/Ticket/Elements/EditLinks, webrt/Ticket/Elements/EditPeople,
-	webrt/Ticket/Elements/EditWatchers,
-	webrt/Ticket/Elements/ShowBasics, webrt/Ticket/Elements/ShowDates,
-	webrt/Ticket/Elements/ShowDependencies,
-	webrt/Ticket/Elements/ShowHistory,
-	webrt/Ticket/Elements/ShowKeywordSelects,
-	webrt/Ticket/Elements/ShowLinks,
-	webrt/Ticket/Elements/ShowMemberOf,
-	webrt/Ticket/Elements/ShowMembers,
-	webrt/Ticket/Elements/ShowPeople,
-	webrt/Ticket/Elements/ShowReferences,
-	webrt/Ticket/Elements/ShowRequestor,
-	webrt/Ticket/Elements/ShowSummary,
-	webrt/Ticket/Elements/ShowTransaction, webrt/Ticket/Elements/Tabs,
-	webrt/Ticket/Elements/ToolBar, webrt/User/Prefs.html:
-
-	Merging rt-1-1 to the head.
-	
-	RT 1.0 now lives on the rt-1-0 branch.
-	
-2001-11-06 18:03  jesse
-
-	* Makefile, NEWS, README, TODO, bin/initacls.Oracle,
-	bin/initacls.Pg, bin/initacls.mysql, bin/mason_handler.fcgi,
-	bin/mason_handler.scgi, bin/rt, bin/rt-mailgate, bin/rtadmin,
-	bin/rtmux.pl, bin/testdeps.pl, bin/webmux.pl, docs/FAQ,
-	docs/FAQ.html, docs/README.docs, docs/Security,
-	docs/rt-templates.html, docs/rt_users_guide.html,
-	docs/design_docs/CARS, docs/design_docs/TransactionTypes.txt,
-	docs/design_docs/acls, docs/design_docs/basic-definitions.txt,
-	docs/design_docs/cli_spec, docs/design_docs/cvs_integration,
-	docs/design_docs/evil_plans, docs/design_docs/link-definitions.txt,
-	docs/design_docs/local_hacking,
-	docs/design_docs/subscription-definitions.txt,
-	docs/design_docs/users, etc/acl.Oracle, etc/acl.Pg, etc/acl.mysql,
-	etc/config.pm, etc/mysql.acl, etc/rt.spec, etc/schema,
-	etc/schema.Oracle, etc/schema.Pg, etc/schema.mysql, etc/schema.pm,
-	etc/suidrt.c, lib/MANIFEST, lib/MANIFEST.SKIP, lib/Makefile.PL,
-	lib/RT.pm, lib/test.pl, lib/RT/ACE.pm, lib/RT/ACL.pm,
-	lib/RT/Attachment.pm, lib/RT/Attachments.pm, lib/RT/CurrentUser.pm,
-	lib/RT/Date.pm, lib/RT/EasySearch.pm, lib/RT/Group.pm,
-	lib/RT/GroupMember.pm, lib/RT/GroupMembers.pm, lib/RT/Groups.pm,
-	lib/RT/Handle.pm, lib/RT/Keyword.pm, lib/RT/KeywordSelect.pm,
-	lib/RT/KeywordSelects.pm, lib/RT/Keywords.pm, lib/RT/Link.pm,
-	lib/RT/Links.pm, lib/RT/ObjectKeyword.pm, lib/RT/ObjectKeywords.pm,
-	lib/RT/Queue.pm, lib/RT/Queues.pm, lib/RT/Record.pm,
-	lib/RT/Scrip.pm, lib/RT/ScripAction.pm, lib/RT/ScripActions.pm,
-	lib/RT/ScripCondition.pm, lib/RT/ScripConditions.pm,
-	lib/RT/Scrips.pm, lib/RT/Template.pm, lib/RT/Templates.pm,
-	lib/RT/TestHarness.pm, lib/RT/Ticket.pm, lib/RT/Tickets.pm,
-	lib/RT/Transaction.pm, lib/RT/Transactions.pm, lib/RT/User.pm,
-	lib/RT/Users.pm, lib/RT/Watcher.pm, lib/RT/Watchers.pm,
-	lib/RT/Action/Autoreply.pm, lib/RT/Action/Generic.pm,
-	lib/RT/Action/Notify.pm, lib/RT/Action/NotifyAsComment.pm,
-	lib/RT/Action/OpenDependent.pm, lib/RT/Action/README.hackers,
-	lib/RT/Action/ResolveMembers.pm, lib/RT/Action/SendEmail.pm,
-	lib/RT/Action/SendPasswordEmail.pm,
-	lib/RT/Action/StallDependent.pm,
-	lib/RT/Condition/AnyTransaction.pm, lib/RT/Condition/Generic.pm,
-	lib/RT/Condition/NewDependency.pm,
-	lib/RT/Condition/StatusChange.pm, lib/RT/Interface/CLI.pm,
-	lib/RT/Interface/Email.pm, lib/RT/Interface/Web.pm:
-
-	Merging rt-1-1 to the head.
-	
-	RT 1.0 now lives on the rt-1-0 branch.
-	
-2001-11-06 17:57  jesse
-
-	* rt.spec, etc/rt.spec:
-
-	Cleaned up spec file goodness
-	
-2001-11-06 16:28  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0.9pre5
-	
-2001-11-05 00:55  jesse
-
-	* rt.spec, lib/Makefile.PL, tools/testdeps:
-
-	Bumped the searchbuilder dependency to 0.47
-	
-2001-11-05 00:54  jesse
-
-	* webrt/Ticket/Update.html:
-
-	Named the ticket update form.
-	
-2001-11-05 00:52  jesse
-
-	* etc/config.pm, lib/RT/Handle.pm:
-
-	Added support for postgres' connections-over-ssl
-	
-2001-11-05 00:49  jesse
-
-	* webrt/Admin/Elements/SelectRights:
-
-	Updated ACL selecting UI to work properly with browsers that try to auto-select
-	a value in a SELECT
-	
-2001-11-02 01:39  jesse
-
-	* Makefile:
-
-	bumped the version to 2.0.9pre4
-	
-2001-11-02 01:31  jesse
-
-	* webrt/Ticket/: Display.html, ModifyAll.html:
-
-	Fix to not automatically record comments if nothing was typed.
-	
-2001-11-02 00:52  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Fix for duplicated requestors on merge. #791
-	
-2001-11-01 17:40  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	More tweaking transaction display
-	
-2001-11-01 17:36  jesse
-
-	* webrt/: Admin/Users/Modify.html, Ticket/Elements/ShowTransaction:
-
-	Fixed newlines between ticket body and headers.
-	
-	Fix for 934: creating users doesn't completely fail (new)
-	
-2001-11-01 17:24  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	Cleanups to ShowTransaction
-	
-2001-11-01 17:10  jesse
-
-	* lib/RT/: Keyword.pm, Interface/Web.pm:
-
-	Fix for loading queue (post 2.0.8) when called by name
-	Fix for _not_ trying to load keywords when called with no value.
-	
-2001-10-31 17:38  jesse
-
-	* Makefile:
-
-	Fixed the make dist
-	
-2001-10-31 02:56  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.0.9pre3
-	
-2001-10-31 02:54  jesse
-
-	* lib/RT/Action/SendPasswordEmail.pm:
-
-	file SendPasswordEmail.pm was initially added on branch rt-1-1.
-	
-2001-10-31 02:54  jesse
-
-	* lib/RT/Action/SendPasswordEmail.pm:
-
-	Added an action to mail a password to the user.
-	
-2001-10-31 02:54  jesse
-
-	* bin/rt-mailgate:
-
-	added support to rt-mailgate for putting the queue name in a +extension
-	
-2001-10-31 02:52  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Tickets which are created in a "resolved" state will now have their "resolved"
-	date set right.
-	
-2001-10-31 02:51  jesse
-
-	* lib/RT/User.pm:
-
-	Started work on "Email password to user"
-	
-2001-10-31 02:48  jesse
-
-	* lib/RT/Watcher.pm:
-
-	Added a patch from Simon Cozens which makes sure that a requestor is always a user, rather than an email address.
-	
-2001-10-31 02:47  jesse
-
-	* lib/RT/Keyword.pm:
-
-	Added a helper Load function to Keyword to load by Id or Path
-	
-2001-10-31 02:42  jesse
-
-	* lib/RT/Template.pm:
-
-	
-	Template got new helper functions for loading queue and system templates.
-	
-2001-10-31 02:40  jesse
-
-	* bin/rt, bin/rtadmin, lib/RT/Interface/CLI.pm,
-	lib/RT/Interface/Email.pm:
-
-	Bringing forward a security fix from 2.0.8_01.  (nonusers could get superuser permissions from the CLI)
-	
-2001-10-31 02:37  jesse
-
-	* webrt/: Elements/MyRequests, Elements/MyTickets,
-	Ticket/Create.html:
-
-	Fixed a display bug in mytickets and myrequests which prevented clicking on
-	subjectless email
-	
-2001-10-31 02:04  jesse
-
-	* etc/: config.pm, schema.Pg, schema.mysql, schema.pm:
-
-	Lengthened queue name and email addresses in the default DB schema
-	
-2001-10-31 02:02  jesse
-
-	* webrt/Ticket/Update.html, lib/RT/Interface/Web.pm:
-
-	Now show the current ticket subject by default in the update subject box.
-	But don't include it in the transaction if it hasn't changed.
-	
-2001-10-31 01:09  jesse
-
-	* Makefile, bin/rt, bin/rt-mailgate, bin/rtadmin,
-	lib/RT/Interface/CLI.pm, lib/RT/Interface/Email.pm:
-
-	Security fixes per Jay at mojomole
-	
-2001-10-25 17:40  jesse
-
-	* webrt/Search/Listing.html:
-
-	Fixed a bug in new listing display. introduced after 2.0.8
-	
-2001-10-24 14:10  jesse
-
-	* Makefile, lib/RT/Ticket.pm:
-
-	Fixed the ticket status changes from open to open bug, thanks to raphael
-	at linkvest.
-	
-2001-10-23 17:34  jesse
-
-	* webrt/Ticket/Create.html:
-
-	Some cleanups to the Create form. No new functionality, just a little bit prettier
-	
-2001-10-23 17:34  jesse
-
-	* webrt/Elements/SelectTicketSortBy:
-
-	Elements/SelectTicketsSortBy now uses new list of sortable Tickets fields
-	in Tickets.pm
-	
-2001-10-23 17:32  jesse
-
-	* webrt/Search/Listing.html:
-
-	Column headings in searches are now clicky, where possible
-	
-2001-10-23 17:31  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	URLs in ticket history should now be clicky
-	
-2001-10-23 17:26  jesse
-
-	* webrt/Elements/CustomHomepageHeader:
-
-	file CustomHomepageHeader was initially added on branch rt-1-1.
-	
-2001-10-23 17:26  jesse
-
-	* webrt/: index.html, Elements/CustomHomepageHeader:
-
-	Added a hook for sites to put their own html in the top of the "Home" page
-	
-2001-10-23 17:24  jesse
-
-	* webrt/Elements/: SelectNewTicketQueue, SelectQueue:
-
-	Frefactored SelectQueue to elimintate dupicate code and enable a "too many queues" option
-	
-2001-10-23 17:22  jesse
-
-	* lib/: RT.pm, RT/Date.pm, RT/Keyword.pm, RT/KeywordSelect.pm,
-	RT/Keywords.pm, RT/Link.pm, RT/Links.pm, RT/ObjectKeywords.pm,
-	RT/Record.pm, RT/Scrip.pm, RT/ScripActions.pm,
-	RT/ScripConditions.pm, RT/Ticket.pm, RT/Action/SendEmail.pm,
-	RT/Condition/Generic.pm, RT/Interface/CLI.pm,
-	RT/Interface/Email.pm:
-
-	Simple fixes to POD from Feargal Reilly to fix complaints from pod2man
-	
-2001-10-23 17:08  jesse
-
-	* lib/RT/Tickets.pm:
-
-	Refactored Tickets.pm a bit to provide better access to fields
-	that tickets can be sorted on.
-	
-2001-10-23 17:06  jesse
-
-	* etc/: config.pm, schema.Pg, schema.mysql, schema.pm:
-
-	Added some new indices, based on recommendations from Nobel Tse at Outblaze
-	
-	Started to cleanup config.pm to not use deprecated methods when displaying
-	ticket columns.
-	
-2001-10-19 15:44  jesse
-
-	* Makefile, bin/initacls.Pg, bin/initacls.mysql, tools/initdb:
-
-	Reverting last patch. it lead to too much brokenness
-	
-2001-10-19 15:16  jesse
-
-	* Makefile, bin/initacls.Pg, bin/initacls.mysql, tools/initdb:
-
-	Work on the install procedure to automate it some more. (automatically supply
-	passwords defined in the makefile)
-	
-2001-10-19 00:49  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0.9pre1
-	
-2001-10-19 00:46  jesse
-
-	* docs/design_docs/cvs_integration:
-
-	file cvs_integration was initially added on branch rt-1-1.
-	
-2001-10-19 00:46  jesse
-
-	* webrt/NoAuth/images/rt.jpg:
-
-	file rt.jpg was initially added on branch rt-1-1.
-	
-2001-10-19 00:46  jesse
-
-	* rt.spec, docs/design_docs/cvs_integration, etc/config.pm,
-	webrt/rt.jpg, webrt/Elements/Header, webrt/Elements/TitleBoxEnd,
-	webrt/Elements/TitleBoxStart, webrt/NoAuth/images/rt.jpg,
-	webrt/SelfService/Elements/Header:
-
-	Refactored images path to have a configurable URL, so it will work with fastcgi ;)
-	
-2001-10-19 00:37  jesse
-
-	* webrt/: Elements/Footer, autohandler:
-
-	Added support for timing of page display with &Debug=1
-	
-2001-10-19 00:29  jesse
-
-	* lib/RT/User.pm:
-
-	User.pm: a fix to allow you to create multiple users with no email address.
-	
-2001-10-19 00:25  jesse
-
-	* lib/RT/Tickets.pm:
-
-	Added sub Due to Tickets.pm. fixes #910
-	
-2001-10-19 00:17  jesse
-
-	* etc/rt.spec:
-
-	file rt.spec was initially added on branch rt-1-1.
-	
-2001-10-19 00:17  jesse
-
-	* Makefile, rt.spec, etc/rt.spec:
-
-	Some work on the rpm build infrastructure
-	
-2001-10-19 00:03  jesse
-
-	* tools/cpan2rpm:
-
-	cpan2rpm doesn't repeat builds of the same distribution, even if we're looking for differnet  modules
-	
-2001-10-18 23:30  jesse
-
-	* tools/cpan2rpm:
-
-	cpan2rpm has been cleaned up a whole lot. it should actually be somewhat smarter about not doing the same work twice
-	
-2001-10-18 22:42  jesse
-
-	* tools/cpan2rpm:
-
-	Added cpan2rpm to the tools directory, for autogenerating rpms of cpan modules
-	
-2001-10-18 22:42  jesse
-
-	* tools/cpan2rpm:
-
-	file cpan2rpm was initially added on branch rt-1-1.
-	
-2001-10-18 21:20  jesse
-
-	* Makefile, rt.spec:
-
-	Added support for autobuilding an rpm with "make rpm"
-	
-2001-10-18 02:15  jesse
-
-	* tools/insertdata:
-
-	Fixed templates to include the ticket subject if it was otherwise blank
-	
-2001-10-18 02:14  jesse
-
-	* lib/RT/Interface/Web.pm, webrt/Ticket/Display.html:
-
-	work on web-based ticket creation. fixed bugs setting due dates, etc
-	
-2001-10-18 02:13  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	fixed a user creation race condition in the mail gateway
-	
-2001-10-18 02:11  jesse
-
-	* webrt/Elements/SelectStatus:
-
-	use the new status abstraction in the web ui
-	
-2001-10-18 02:08  jesse
-
-	* tools/testdeps:
-
-	moved to a dbix::searchbuilder 0.46 dependency
-	
-2001-10-18 02:07  jesse
-
-	* lib/RT/Tickets.pm:
-
-	Movign away from a deprecated API
-	
-2001-10-18 02:07  jesse
-
-	* tools/initdb:
-
-	initdb won't whine if you don't set a host
-	
-2001-10-18 02:05  jesse
-
-	* docs/design_docs/evil_plans:
-
-	Added some docs about what 2.2 might hold
-	
-2001-10-18 02:00  jesse
-
-	* lib/RT/: Ticket.pm, Queue.pm:
-
-	Abstracted out status enumeration and validation
-	
-2001-10-18 01:57  jesse
-
-	* webrt/Ticket/Elements/EditLinks:
-
-	added WebPath to fix some links in showlinks
-	
-2001-10-17 16:34  jesse
-
-	* lib/Makefile.PL:
-
-	Bumped searchbuilder dependency to 0.46
-	
-2001-10-17 16:33  jesse
-
-	* webrt/Ticket/Elements/ShowHistory:
-
-	Added an optional bit of configuration to not show the "History" header
-	
-2001-10-06 03:01  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	Added a new option "Show commands" to show tranasaction
-	
-2001-10-06 03:00  jesse
-
-	* webrt/Admin/: Keywords/index.html, Queues/index.html:
-
-	Added support for reenabling deleted queues and keywords
-	
-2001-10-06 02:57  jesse
-
-	* lib/RT/Condition/Generic.pm:
-
-	Added test harness glue
-	
-2001-10-06 02:55  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Added code to detect bogus ticket update types
-	
-2001-10-06 02:54  jesse
-
-	* lib/RT/Interface/: CLI.pm, Email.pm:
-
-	Added support for unit testing
-	
-2001-10-06 02:51  jesse
-
-	* lib/RT/Handle.pm:
-
-	Added support for unit testing
-	
-	Added a test for Database Port definition to stop perl from whining
-	
-2001-10-06 02:49  jesse
-
-	* lib/RT/: ACE.pm, ACL.pm, Action/Generic.pm, Action/SendEmail.pm,
-	Attachment.pm, Attachments.pm:
-
-	Added support for unit testing
-	
-2001-10-06 02:46  jesse
-
-	* lib/RT/: Tickets.pm, Transaction.pm, Transactions.pm, User.pm,
-	Users.pm, Watcher.pm, Watchers.pm, Queues.pm, Record.pm, Scrip.pm,
-	ScripAction.pm, ScripActions.pm, ScripCondition.pm,
-	ScripConditions.pm, Scrips.pm, Template.pm, Templates.pm:
-
-	Added support for unit testing
-	
-2001-10-06 02:43  jesse
-
-	* lib/RT/: Keyword.pm, KeywordSelect.pm, KeywordSelects.pm,
-	Keywords.pm, Link.pm, Links.pm, ObjectKeyword.pm,
-	ObjectKeywords.pm, CurrentUser.pm, Date.pm, EasySearch.pm,
-	Group.pm, GroupMember.pm, GroupMembers.pm, Groups.pm:
-
-	Added support for unit testing
-	
-2001-10-06 02:38  jesse
-
-	* lib/RT.pm:
-
-	Added the beginnings of test support to RT.pm
-	
-2001-10-06 02:22  jesse
-
-	* lib/RT/TestHarness.pm:
-
-	file TestHarness.pm was initially added on branch rt-1-1.
-	
-2001-10-06 02:22  jesse
-
-	* lib/: Makefile.PL, RT/TestHarness.pm:
-
-	First bits of glue for new RT unit testing infrastructure
-	
-2001-10-06 02:19  jesse
-
-	* bin/rt:
-
-	bin/rt: Documentation cleanups. removing an unnecessary data tainting check
-	
-2001-10-06 02:18  jesse
-
-	* bin/initacls.Pg:
-
-	Fixes to initacls.Pg to allow installation with Unix Domain sockets
-	
-2001-10-04 02:01  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.0.8
-	
-2001-10-01 02:44  jesse
-
-	* rt.spec:
-
-	Revved the version of DBIx::SearchBuilder needed in the .spec file
-	
-2001-10-01 02:42  jesse
-
-	* Makefile, lib/RT/Interface/Email.pm:
-
-	Fixed the call to MIME::Entity::Build in Email.pm
-	
-	Bumped the version to 2.0.8pre3
-	
-2001-09-30 23:03  jesse
-
-	* README, bin/rt, lib/RT/Tickets.pm, lib/RT/Interface/Email.pm,
-	webrt/Search/PickRestriction, webrt/Ticket/History.html,
-	webrt/Ticket/Elements/EditBasics,
-	webrt/Ticket/Elements/ShowHistory:
-
-	Code refactoring to allow searching for nonlocal links
-	Cleanup to the Loop prevention stuff (v. 2.0.8pre2)
-	Readme cleanup
-	CLI cleanups.  changed "return" to "exit"
-	
-2001-09-26 16:31  jesse
-
-	* tools/testdeps:
-
-	Bumped the searchbuilder dependency.  to 0.43
-	
-2001-09-26 16:28  jesse
-
-	* Makefile, bin/rt, lib/RT/Tickets.pm,
-	webrt/Admin/Queues/Scrips.html:
-
-	Added a fix for ItemsArrayRef to Tickets which causes the Next/Prev links in
-	the web ui to be smarter.
-	
-	Fixed a typo in SCrips.html
-	
-	Bumped the version to 2.0.8pre2
-	
-2001-09-24 20:10  jesse
-
-	* rt.spec:
-
-	file rt.spec was initially added on branch rt-1-1.
-	
-2001-09-24 20:10  jesse
-
-	* Makefile, rt.spec:
-
-	Added destdir support to allow building of RPMS.
-	added rt.spec for building of RPMS.
-	
-2001-09-21 16:51  jesse
-
-	* Makefile:
-
-	Bumped makefule version to 2.0.8pre1
-	
-2001-09-21 16:45  jesse
-
-	* bin/rt, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	lib/RT/Interface/Web.pm, webrt/Ticket/Elements/ShowTransaction:
-
-	Fixed a typo in the bin/rt docs
-	Allowed "Force owner change" from bulk update screen.
-	
-2001-09-20 22:34  jesse
-
-	* bin/rt, lib/RT/Action/SendEmail.pm, lib/RT/Interface/Email.pm,
-	webrt/Search/Bulk.html, webrt/Ticket/Elements/ShowTransaction:
-
-	Fixes for:
-	
-	888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888862 Re: [rt-users] how does rt --limit-last-updated work?
-	
-	863 Ticket/Elements/ShowTransaction doesn't show headers sometimes
-	
-	Fix for a bug in the code that prevents RT from looping with itself.
-	
-	Start of work for "force change owner" in Bulk.html
-	
-2001-09-19 16:49  jesse
-
-	* bin/initacls.Pg, bin/rt, etc/config.pm, lib/RT/Queue.pm,
-	lib/RT/Ticket.pm, lib/RT/Tickets.pm, webrt/Elements/Header,
-	webrt/Search/Listing.html, webrt/Ticket/Create.html,
-	webrt/Ticket/Display.html, webrt/Ticket/ModifyAll.html,
-	webrt/Ticket/Update.html, webrt/Ticket/Elements/ShowLinks:
-
-	Fixed a bug that would cause installation on postgres to lose if $PORT wasn't
-	specified
-	
-	Changed " to ' in a few places in the config file, to make file and variable
-	names with embedded metacharacters not lose as badly
-	
-	Set some logical defaults for Queue->Create, so it's not as likely to fail
-	to create a queue if you leave out some fields
-	
-	Ticket->Create: now takes a Starts date.  Also, fixed some API docs.
-	
-	Tickets: Negative searching on fields like "subject" should now work
-	
-	WebUI:  Added a pragma NO-CACHE pseudo-header, to stop overzealous browsers from caching RT's pages
-	
-	WebUI: changed the "Bookmark this search" link to "Bookmarkable URL for this search"
-	
-	WebUI: ticket create now has a "more detail" section
-	
-	WebUI: ticket updates no longer have a default subject preset.
-	
-	WebUI: fixed a bug in ShowLinks that generated bogus urls within RT if RT wasn't at / on your server
-	
-2001-09-13 00:03  jesse
-
-	* Makefile:
-
-	Bumping the version to 2.0.7
-	
-2001-09-10 02:18  jesse
-
-	* Makefile:
-
-	Bumped the makefile version to 2.0.7pre1
-	
-2001-09-10 02:11  jesse
-
-	* bin/mason_handler.fcgi, lib/RT/User.pm:
-
-	Fixed #883, a permissions caching bug.
-	
-	Added the Text::Wrapper dependency to mason_handler.fcgi
-	
-2001-09-06 15:59  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Reverted reopen on correspondence to 1.0 behaviour
-	
-2001-09-06 15:41  jesse
-
-	* webrt/SelfService/Display.html:
-
-	make row coloring alternate in selfservice transaction history
-	
-2001-09-06 15:39  jesse
-
-	* webrt/SelfService/Display.html:
-
-	Fixed cell spacing in selfservice transaction display
-	
-2001-09-06 15:33  jesse
-
-	* bin/webmux.pl, webrt/SelfService/Display.html,
-	webrt/Ticket/Display.html, webrt/Ticket/Elements/ShowHistory,
-	webrt/Ticket/Elements/ShowKeywordSelects,
-	webrt/Ticket/Elements/ShowSummary,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Cleaned up the web ticket transaction display.
-	
-2001-09-06 15:32  jesse
-
-	* lib/RT/: ObjectKeyword.pm, Queue.pm:
-
-	Added some docs.
-	Started refactoring Ticket statuses.
-	
-2001-09-06 15:32  jesse
-
-	* lib/RT/Ticket.pm:
-
-	$Ticket->SetTold  now optionally takes a date to set it to.
-	
-2001-09-06 15:30  jesse
-
-	* bin/rt:
-
-	Fixing some docs in bin/rt
-	
-2001-09-05 11:00  jesse
-
-	* webrt/Elements/: Header, Refresh:
-
-	Fix for #823 from martin@schapendonk.org
-		Refresh now allows you to turn off refresh.
-	
-2001-09-01 19:01  jesse
-
-	* webrt/Elements/MessageBox:
-
-	Fix for [fsck.com #803] Jumbo recording comments accidentally
-	
-2001-09-01 18:23  jesse
-
-	* Makefile:
-
-	Bumped the version to 2.0.6
-	
-2001-08-28 15:49  jesse
-
-	* Makefile:
-
-	Bumped the version to pre7, fixed a typo in the makefile's install instructions.
-	
-2001-08-24 00:13  jesse
-
-	* lib/RT/Attachment.pm:
-
-	importing the Crit->crit typo fix from 2.0.5_01
-	
-2001-08-24 00:08  jesse
-
-	* Makefile, lib/RT/Interface/Email.pm:
-
-	Rolled in the 2.05 perl 5.005 compatibility fix.
-	bumped the version to 2.0.6pre6
-	
-2001-08-23 19:49  jesse
-
-	* bin/rt-mailgate, tools/initdb:
-
-	fixed initdb to not append a port= to the db connect string unless it needs one.
-	
-	added support for $SenderMustExistInExternalDatabase to mailgate.
-	
-2001-08-23 19:46  jesse
-
-	* lib/RT/Groups.pm:
-
-	Added a default alphabetical sort order to lib/RT/Groups
-	
-2001-08-23 19:45  jesse
-
-	* etc/: config.pm, schema.Pg, schema.mysql, schema.pm:
-
-	Added new indices to schema. Regenerated mysql and postgres schema.
-	
-	Cleaned up etc/config.pm's docs some more, based on comments from Christian Gimore
-	Added a default value for RT::OwnerEmail, which was documented by not defined
-	by default
-	
-2001-08-22 18:48  jesse
-
-	* bin/rt, lib/RT/Ticket.pm, webrt/Ticket/Update.html:
-
-	bin/rt --create now deals with watchers.
-	
-	fixed a typo in Ticket/Update.html introduced after 2.0.5_03
-	
-2001-08-22 01:37  jesse
-
-	* Makefile, lib/RT/Tickets.pm, webrt/Admin/Global/Keywords.html:
-
-	Bumped version to 2.0.6-pre5
-	
-	Fixed 'deep' merges.
-	
-	Fixed a typo in Global/Keywords
-	
-2001-08-22 00:41  jesse
-
-	* Makefile, lib/RT/Interface/Email.pm:
-
-	Fixed a couple of bugs in the new email db lookups
-	
-2001-08-21 23:57  jesse
-
-	* Makefile, bin/initacls.Oracle, bin/initacls.Pg,
-	bin/initacls.mysql, tools/initdb:
-
-	Added support for setting the database port for postgres and mysql
-	
-2001-08-21 23:48  jesse
-
-	* README:
-
-	Updated jesse's email address and shuffled things around a bit.
-	
-2001-08-21 23:45  jesse
-
-	* etc/config.pm:
-
-	Added more docs and updated the default config for the external db lookups
-	
-2001-08-21 23:35  jesse
-
-	* webrt/: index.html, NoAuth/webrt.css, Search/Listing.html,
-	Search/PickRestriction, Ticket/ModifyDates.html,
-	Ticket/Update.html, Ticket/Elements/ShowHistory,
-	Ticket/Elements/ShowTransaction:
-
-	Added support for autorefresh to / and /Search/Listing.html
-	
-	Tightened up Transaction display. Fixed 'full headers' display.
-	
-	Cleaned up the ui in ModifyDates a bit
-	
-	Cleaned up the ui in Ticket/Update.html
-	
-	fixed a few typos in the css file
-	
-2001-08-21 23:30  jesse
-
-	* lib/RT/Attachment.pm:
-
-	Added some documentation
-	
-2001-08-21 23:25  jesse
-
-	* bin/rt-mailgate:
-
-	Bringing forward a patch to the mailgate from 2.0.5_01
-	
-2001-08-21 23:19  jesse
-
-	* webrt/Elements/Refresh:
-
-	file Refresh was initially added on branch rt-1-1.
-	
-2001-08-21 23:19  jesse
-
-	* webrt/Elements/Refresh:
-
-	Commiting a Refresh control to cvs
-	
-2001-08-21 23:17  jesse
-
-	* bin/rtadmin:
-
-	Fixed cli group creation
-	
-2001-08-21 23:12  jesse
-
-	* webrt/Elements/MessageBox:
-
-	Fixed transaction quoting to use the new transaction content quoting method.
-	
-2001-08-21 23:07  jesse
-
-	* webrt/Elements/Login:
-
-	Display a version string in the login box.
-	
-2001-08-21 23:06  jesse
-
-	* webrt/Elements/Header:
-
-	Added support for refresh to webrt/Elements/Header
-	Don't display the logout link if using external auth.
-	
-2001-08-21 23:05  jesse
-
-	* webrt/Admin/Users/Modify.html:
-
-	Little bit of ui and code cleanup to the User editing page
-	
-2001-08-21 23:04  jesse
-
-	* lib/RT/Record.pm:
-
-	Fixed broken caching of the CreatorObj
-	
-2001-08-21 23:03  jesse
-
-	* lib/RT/Handle.pm:
-
-	Added support for Database port to Handle.pm
-	
-2001-08-21 22:50  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Added vivek khera's patch to clean up newline processing for incoming messages
-	
-	Removed debugging output from file attachment subroutine
-	
-	Added support for setting refresh interval to the search page
-	
-2001-08-21 22:46  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	Fixed the bug fixed in 2.0.5_?? which called the wrong function for finding
-	sender name
-	
-	Altered the mail interface's external user lookup function to be returned
-	 a hash of parameters
-	
-2001-08-21 22:43  jesse
-
-	* lib/RT/Transaction.pm:
-
-	Added support for Quoting a transaction to the Content sub.
-	
-2001-08-16 00:23  jesse
-
-	* Makefile, tools/testdeps:
-
-	dependency on CGI::Cookie 1.20 had reverted.
-	Bumped version to 2.0.5_03
-	
-2001-08-15 16:44  jesse
-
-	* Makefile, bin/rt-mailgate, lib/RT/Interface/Email.pm:
-
-	A couple of fixes to the mail gateway to deal with proper processing
-	of sender email addresses
-	
-2001-08-15 16:12  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	Trying for 2.0.5-01 again
-	Fixed a perl 5.6ism in Interface/Email
-	Fixed a bug in Attachment.pm that would cause a DIE on a fatal error
-	
-2001-08-15 16:12  jesse
-
-	* lib/RT/Attachment.pm:
-
-	Trying for 2.0.5-01 again
-	Fixed a bug in Attachment.pm that would cause a DIE on a fatal error
-	
-2001-08-15 16:12  jesse
-
-	* Makefile:
-
-	Trying for 2.0.5-01 again
-	
-2001-08-15 15:44  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	Fixed an error message in Attachment that should never be reached
-	Bumped the Makefile version to 2.0.5_01
-	Fixed an inadvertent perl 5.6ism in the mail gateway.
-	
-2001-08-15 15:42  jesse
-
-	* lib/RT/Attachment.pm:
-
-	Fixed an error message in Attachment that should never be reached
-	
-	Bumped the Makefile version to 2.0.5_01
-	
-2001-08-15 15:42  jesse
-
-	* Makefile:
-
-	Bumped the Makefile version to 2.0.5_01
-	
-2001-08-15 01:01  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0.6-pre1
-	
-2001-08-15 01:00  jesse
-
-	* webrt/: autohandler, Admin/Users/Modify.html, Elements/Login,
-	SelfService/Prefs.html, User/Prefs.html:
-
-	Added support for external authentication to the web ui
-	
-2001-08-15 01:00  jesse
-
-	* bin/rt-mailgate, lib/RT/Interface/Email.pm:
-
-	Added support for looking up new users in an external datasource
-	
-2001-08-15 00:58  jesse
-
-	* etc/config.pm:
-
-	Added new configuration variables for external authentication for the web ui and
-	to support looking up new users in the mail gateway from a site-defined external datasource.
-	
-2001-08-15 00:17  jesse
-
-	* tools/testdeps:
-
-	Fixed testdeps to depend on the right version of CGI.pm
-	
-2001-08-14 23:55  jesse
-
-	* Makefile:
-
-	Released RT 2.0.5  No changes since 2.0.5-test3.
-	
-2001-08-12 21:13  jesse
-
-	* Makefile, bin/webmux.pl:
-
-	Fixed a typo in webmux.pl created after 2.0.4
-	Bumped the version to 2.0.5-test3
-	
-2001-08-12 20:00  jesse
-
-	* docs/manual.pod, lib/RT/Transaction.pm:
-
-	Core:  Updated Transaction->Content to be smarter about showing the first
-	message in the transaction.
-	
-	Removed the old manual skeleton in docs in favor of the web based docs.
-	
-2001-08-12 19:58  jesse
-
-	* lib/RT/Attachment.pm:
-
-	Core: Added a convenience function to RT::Attachemnt to find Children of this attachment.
-	Core: Added code to RT::Attachemnt to allow access to the 'Parent' attribute
-	
-2001-08-12 19:55  jesse
-
-	* lib/RT/Attachments.pm:
-
-	Core: A convenience function to search for Attachments by ContentType.
-	Core: Added some docs to RT::Attachments
-	
-2001-08-12 19:53  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	WebUI: Show 'comment' and 'correspond' for multipart messages in the per-transaction listing.
-	
-2001-08-10 23:59  jesse
-
-	* README:
-
-	README: added more pointers to the 'complete' docs.
-	README: Removed the little bit of configuration info in the readme in favor of the 'complete' docs on the web
-	
-2001-08-10 23:58  jesse
-
-	* bin/rt-mailgate:
-
-	mailgate: RT is now less likely to try to send mail to senders which will cause loops
-	
-2001-08-10 23:57  jesse
-
-	* webrt/index.html:
-
-	Webui: [home] now gets greyed out when you're there
-	
-2001-08-10 15:32  jesse
-
-	* Makefile, webrt/Elements/MessageBox:
-
-	Added a pair of () in webrt/Elements/MessageBox to correct a typo in an if
-	Bumped version to 2.0.5-test2
-	
-2001-08-10 00:24  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0.5test1
-	
-2001-08-10 00:24  jesse
-
-	* lib/RT/Users.pm, webrt/Elements/MessageBox,
-	webrt/Ticket/Elements/AddWatchers, webrt/Ticket/Elements/EditDates:
-
-	Cleanup to date editing ui
-	
-	Code cleanups to Elements/MessageBox for more readable and maintainable code
-	Code cleanups to TicketElements/AddWatchers for more readable and maintainable code
-	
-2001-08-10 00:23  jesse
-
-	* webrt/Ticket/Elements/: EditLinks, ShowLinks:
-
-	Cleanup to Relationship editing and display ui
-	
-2001-08-10 00:21  jesse
-
-	* webrt/Ticket/ModifyDates.html:
-
-	UI cleanups in Ticket/ModifyDates.html
-	
-2001-08-10 00:20  jesse
-
-	* webrt/Ticket/ModifyAll.html:
-
-	Jumbo no longer loses ticket update contents.
-	
-2001-08-09 20:07  jesse
-
-	* webrt/Admin/Users/index.html:
-
-	Cleaned up Admin/Users search functionality and made it look more like
-	other user searching screens and enables searching for disabled users.
-	
-2001-08-09 20:02  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Properly strip trailing spaces from things we're trying to link to.
-	
-2001-08-09 20:00  jesse
-
-	* lib/RT/Links.pm:
-
-	By default, try to sort Links by something intelligent when displaying them
-	
-2001-08-03 01:52  jesse
-
-	* lib/RT/Action/Autoreply.pm:
-
-	Autoreplies are now from "Queuename" rather than from "RT"
-	
-2001-08-02 04:57  jesse
-
-	* webrt/: Admin/Queues/People.html, Elements/Quicksearch,
-	Elements/SelectResultsPerPage, Elements/SelectStatus,
-	Search/PickRestriction:
-
-	WebUI: Fixed a typo in hte 'bookmark this search' link display.
-	WebUI: By default, limit displayed results to 50 per page.
-	
-2001-08-02 04:57  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Documented a function in the web ui library
-	
-2001-08-02 04:56  jesse
-
-	* etc/config.pm:
-
-	Fixed a typo in the docs in the config file, thanks to sheeri.
-	
-2001-08-02 04:55  jesse
-
-	* bin/rt-mailgate:
-
-	rt-mailgate: bug-fix to properly grab 'from' addresses for purposes of determinigng whether something's a mailer-daemon
-	
-2001-08-02 04:54  jesse
-
-	* bin/rt:
-
-	Added support for merging to the CLI
-	Cli now works as described when linking tickets. Formerly, you couldn't admit the "+" before an added link
-	
-2001-08-02 04:53  jesse
-
-	* webrt/User/Prefs.html:
-
-	Bugfix to allow users to fully delete their rt signatures
-	
-2001-07-30 03:54  jesse
-
-	* docs/design_docs/evil_plans:
-
-	file evil_plans was initially added on branch rt-1-1.
-	
-2001-07-30 03:54  jesse
-
-	* Makefile, docs/design_docs/evil_plans:
-
-	bumped the version, so as not to get confused users complaining to the lists
-	
-	added some notes about what may happen for 2.2
-	
-2001-07-30 03:52  jesse
-
-	* webrt/SelfService/Display.html:
-
-	file Display.html was initially added on branch rt-1-1.
-	
-2001-07-30 03:52  jesse
-
-	* bin/mason_handler.fcgi, bin/webmux.pl, lib/RT/Interface/Web.pm,
-	webrt/SelfService/Create.html, webrt/SelfService/Details.html,
-	webrt/SelfService/Display.html, webrt/SelfService/Update.html,
-	webrt/SelfService/Elements/GotoTicket,
-	webrt/SelfService/Elements/MyRequests, webrt/Ticket/Create.html,
-	webrt/Ticket/Display.html, webrt/Ticket/Modify.html,
-	webrt/Ticket/ModifyAll.html, webrt/Ticket/ModifyDates.html,
-	webrt/Ticket/ModifyLinks.html, webrt/Ticket/ModifyPeople.html,
-	webrt/Ticket/Update.html, webrt/Ticket/Elements/EditBasics,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Switched SelfService/Details to SelfService/Display  to better jibe
-	with the regular UI.
-	
-	Added better current-page navigation hints to most per-ticket pages.
-	
-	Added support for uploading attachments on ticket create or update.
-	
-2001-07-30 03:51  jesse
-
-	* webrt/Admin/Elements/ListGlobalScrips:
-
-	file ListGlobalScrips was initially added on branch rt-1-1.
-	
-2001-07-30 03:51  jesse
-
-	* webrt/Admin/: Elements/ListGlobalKeywordSelects,
-	Elements/ListGlobalScrips, Global/Scrips.html,
-	Queues/Keywords.html, Queues/Scrips.html:
-
-	Added some ui to show global scrips and keywordselects in the queue
-	uis for adminning the same.
-	
-2001-07-30 03:51  jesse
-
-	* webrt/Admin/Elements/ListGlobalKeywordSelects:
-
-	file ListGlobalKeywordSelects was initially added on branch rt-1-1.
-	
-2001-07-30 03:49  jesse
-
-	* TODO:
-
-	Clarified the errata urls
-	
-2001-07-30 03:48  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Cleaned up the return values from Ticket->CreateLink. (always return $status, $msg);
-	
-2001-07-30 03:48  jesse
-
-	* lib/RT/Action/SendEmail.pm:
-
-	changed the case of the Managed-by header to be less grating
-	
-2001-07-30 03:45  jesse
-
-	* bin/rt-mailgate, lib/RT/Interface/Email.pm:
-
-	Moving a bunch of mail gateway library routines to the library where they
-	belong
-	
-2001-07-27 01:06  jesse
-
-	* README:
-
-	fixed a typo in the cronjob
-	
-2001-07-25 01:05  jesse
-
-	* bin/rt-mailgate, lib/RT/Tickets.pm:
-
-	Fix for mailgateway being unable to send error mail with 'sendmailpipe' mailing
-	Fix for 'blank' searches when using search bookmarking.
-	
-2001-07-25 01:00  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0.4
-	Fixed bookmarkable searches
-	Fix for sendmailpipe errors in mailgateway
-	
-2001-07-24 12:10  jesse
-
-	* Makefile, webrt/Search/PickRestriction:
-
-	Fixed a bug in Search/PickRestriction, thanks to Vivek Khera
-	Bumped version to 2.0.3
-	
-2001-07-24 00:28  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0.2
-	
-2001-07-24 00:21  jesse
-
-	* lib/RT/Tickets.pm, webrt/Elements/Submit,
-	webrt/Search/Listing.html, webrt/Search/PickRestriction:
-
-	Bookmarked searches now keep track of sorting and record count limits
-	New "Refine" button to allow faster updates of search criteria.
-	
-2001-07-24 00:01  jesse
-
-	* bin/rt:
-
-	Added support for --limit-queue to  RT cli tool
-	
-2001-07-23 10:43  jesse
-
-	* Makefile, tools/testdeps:
-
-	Testdeps was accidentally looking for Freeze::Thaw, rather than FreezeThaw
-	
-2001-07-23 00:31  jesse
-
-	* Makefile:
-
-	bumped version to 2.0.2test2
-	
-2001-07-23 00:30  jesse
-
-	* lib/RT/Tickets.pm, lib/RT/Interface/Web.pm, tools/testdeps,
-	webrt/Search/Listing.html:
-
-	Added support for bookmarkable searches.
-	
-2001-07-22 22:12  jesse
-
-	* lib/RT/: KeywordSelect.pm, User.pm:
-
-	Better error checking in User ACL checking
-	
-	Fixed an ACL check bug in KeywordSelect.pm, thanks to Matthew Stock.
-	
-2001-07-22 22:09  jesse
-
-	* webrt/Admin/Users/index.html:
-
-	Fix for a users search bug and a clarification of another search option.
-	
-2001-07-22 22:06  jesse
-
-	* lib/RT/: Keywords.pm, Queues.pm, Users.pm:
-
-	By default, order Queues, Users and Keywords alphabetically
-	
-2001-07-22 22:05  jesse
-
-	* Makefile:
-
-	Permissions fix for the data dirs for the fastcgi handler
-	
-	rt/etc is now mode 755, rather than 555.
-	
-2001-07-22 22:03  jesse
-
-	* bin/mason_handler.fcgi:
-
-	fastcgi handler no longer drops setgidness, so it can deal with session files.
-	
-2001-07-22 21:55  jesse
-
-	* etc/config.pm:
-
-	Cleaned up the config file a bit to make installation easier.
-	
-2001-07-22 21:52  jesse
-
-	* webrt/Elements/MyRequests:
-
-	Clean up phrasing of the "Tickets I own dialogbox"
-	
-2001-07-19 00:57  jesse
-
-	* Makefile:
-
-	Changed Makefile to not use MAN[13]INSTALLSITEPATH per Robert Shaw's changes
-	
-2001-07-18 16:20  jesse
-
-	* Makefile, lib/RT/Queue.pm:
-
-	Added a newline to Queue.pm to fix a pod bug
-	
-	Bumped version to 2.0.2-test1  to get some feedback
-	
-2001-07-18 16:16  jesse
-
-	* lib/RT/User.pm:
-
-	RT should now honor queue-level pseudogroup memebership for ACL checks.
-	Also, simplified some of the queue related ACL checking code.
-	
-	Reduced the ACL permissions cache from 30sec to 10sec.
-	
-2001-07-18 16:13  jesse
-
-	* lib/RT/Transaction.pm:
-
-	Added BriefDescription, which is just like Description without the "By actor"
-	at the end
-	
-	Descriptions Keyword operations should include _which_ keyword select from
-	here on in (also touched the last update to Ticket.pm)
-	
-2001-07-18 16:06  jesse
-
-	* lib/RT/Ticket.pm:
-
-	TTicket->Create no longer just adds admin ccs..unless the person doing the add
-	has the right to do so.  otherwise, there was an ACL related attack that
-	could happen. luckily none of the UI exposedd this hole yet.
-	
-	Ticket->Create should now be able to set keywords on create
-	
-	Ticket->Create now reports back non-fatal errors and how they were dealt with
-	
-	Ticket->AddKeyword got split into AddKeyword and _AddKeyword. The former
-	has the acl check and calls the latter. the latter just does the adding.
-	
-	Ticket->AddKeyword got a Silent flag, which causes a transaction not
-	to be written. useful on ticket create.
-	
-2001-07-18 15:59  jesse
-
-	* tools/testdeps:
-
-	Added tests for Apache::Cookie
-	and DBI 1.18 to testdeps
-	
-2001-07-18 15:53  jesse
-
-	* webrt/SelfService/: Details.html, Update.html:
-
-	Added the ability for requestors to use the self-service ui to comment on / reply to tickets.
-	
-2001-07-18 15:53  jesse
-
-	* webrt/SelfService/Update.html:
-
-	file Update.html was initially added on branch rt-1-1.
-	
-2001-07-17 22:12  jesse
-
-	* webrt/Admin/Queues/People.html:
-
-	Fixed a link to Users/Modify.html in Queue/People.html
-	
-2001-07-17 22:01  jesse
-
-	* bin/webmux.pl:
-
-	Fix to the solaris chown problem
-	
-2001-07-17 18:37  jesse
-
-	* README:
-
-	Fixed typo in the cron job description
-	
-2001-07-13 02:17  jesse
-
-	* lib/RT/Tickets.pm:
-
-	Work on tickets.pm to support some new searching options
-	
-2001-07-12 19:43  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0.1
-	
-2001-07-11 23:17  jesse
-
-	* etc/config.pm:
-
-	No longer log things of less than 'error' to the logfile
-	
-2001-07-11 23:16  jesse
-
-	* Makefile, bin/mason_handler.fcgi, bin/rt, bin/rt-mailgate,
-	bin/rtadmin, lib/Makefile.PL, lib/RT.pm, lib/RT/Interface/CLI.pm,
-	lib/RT/Interface/Email.pm:
-
-	Make sure that the setgid programs don't drop setgidness before trying to open logfiles
-	
-2001-07-10 20:15  jesse
-
-	* Makefile, lib/Makefile.PL, lib/RT/Tickets.pm,
-	lib/RT/Interface/Web.pm, tools/testdeps:
-
-	Fixes to allow search-by-requestor to search for requestors who don't have RT accounts
-	
-2001-07-10 13:53  jesse
-
-	* bin/webmux.pl:
-
-	Fix for the weird sessiondata permissions bug folks have seen on solaris
-	
-2001-07-10 11:47  jesse
-
-	* lib/RT/Tickets.pm:
-
-	Change to Tickets.pm to fix description of watcher limits
-	
-2001-07-10 11:36  jesse
-
-	* bin/webmux.pl, webrt/Elements/SelectMatch:
-
-	Fixed a bug in webmux.pl that prevented Apache::Cookie support from working
-	
-	Fixed a bug in the enw SelectMatch code
-	
-2001-07-10 11:20  jesse
-
-	* lib/RT/Ticket.pm, webrt/Elements/SelectMatch,
-	webrt/Search/PickRestriction:
-
-	Cleanup to SelectMatch and PickRestriction to clear up the UI issues
-	with searching for Tickets from a give nrequestor
-	
-2001-07-09 10:36  jesse
-
-	* lib/RT/Template.pm:
-
-	Fixed a typo in Template.pm that squashed templates on outgoing mail. (Bug in my untainting fix)
-	
-	Bumped version to 2.0.1-test2
-	
-2001-07-09 10:36  jesse
-
-	* Makefile:
-
-	Fixed a typo in Template.pm that squashed templates on outgoing mail. (Bug in my untainting fix)
-	
-2001-07-08 22:31  jesse
-
-	* README:
-
-	Added some polite comments about supporting the development of RT
-	with contracts, cash or gifts
-	
-2001-07-08 20:14  jesse
-
-	* Makefile, bin/mason_handler.fcgi,
-	webrt/SelfService/Elements/ShowTransaction:
-
-	Bumped version to 2.01pre1
-	
-	Fixed mason_handler header newlines
-	
-2001-07-08 20:12  jesse
-
-	* lib/RT/: ScripAction.pm, ScripCondition.pm, Template.pm,
-	Ticket.pm:
-
-	Taint fixes for ScripAction, ScripCondtion,Template.
-	Header wrapping fix in Template.pm.
-	Fix in Ticket.pm to make EffectiveId a public field.
-	
-2001-07-06 18:32  jesse
-
-	* lib/RT/Attachment.pm:
-
-	Applied a patch from ivan to deal with poorly formed mime messages
-	and clean up the attachment proccessing code.
-	
-2001-07-06 18:26  jesse
-
-	* webrt/SelfService/Attachment/dhandler:
-
-	file dhandler was initially added on branch rt-1-1.
-	
-2001-07-06 18:26  jesse
-
-	* webrt/: SelfService/Details.html,
-	Ticket/Elements/ShowTransaction, SelfService/Attachment/dhandler:
-
-	ShowTransaction now no longer displays 'Comment' and 'Reply' if the user
-	doesn't have the right rights.
-	
-	SelfService uses the 'standard' ShowTransaction.
-	
-	SelfService now displays Attachments
-	
-2001-07-06 18:21  jesse
-
-	* etc/schema.mysql:
-
-	Switched mysql to use LONGTEXT rather than LONGBLOB to get
-	case insensitive searching.
-	
-2001-07-06 18:19  jesse
-
-	* bin/mason_handler.fcgi, lib/RT/Interface/Web.pm,
-	webrt/NoAuth/Logout.html:
-
-	Cleanups to deal better with the fastcgi handler.
-	
-	Switched to CGI::Fast from FCGI
-	
-	ContentType fixes.
-	
-	Logging out now clears the session hash, rather than detaching a perfectly good session. (This gets around an obnoxious tainting issue too)
-	
-2001-07-06 16:14  jesse
-
-	* webrt/Ticket/Attachment/dhandler:
-
-	Changed default attachment type to text/plain from text/html
-	
-2001-07-05 16:48  jesse
-
-	* bin/rt-mailgate, lib/RT/Ticket.pm:
-
-	Updates to make Correspondence on a closed or stalled ticket reopen the ticket
-	
-2001-07-04 00:51  jesse
-
-	* bin/rt:
-
-	bin/rt will now show transactions of type 'text'
-	
-2001-07-04 00:36  jesse
-
-	* bin/webmux.pl:
-
-	Minor fixes to webmux.pl for content type stuff.
-	
-2001-07-03 23:15  jesse
-
-	* lib/RT/Interface/Web.pm, webrt/Admin/Queues/index.html,
-	webrt/Search/PickRestriction:
-
-	Web ui now supports 'SearchByPriority'
-	
-2001-07-03 23:14  jesse
-
-	* etc/config.pm:
-
-	Added a few comments about configuration variables
-	
-2001-07-03 23:12  jesse
-
-	* webrt/SelfService/Elements/ShowTransaction:
-
-	Now SelfService displays attachments of type 'text'
-	
-2001-07-03 23:08  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	With the web ticket display, now display attachments of type 'text' properly.
-	Also, always have a download link.
-	
-2001-07-03 23:00  jesse
-
-	* webrt/Ticket/Elements/ShowLinks:
-
-	Changed SubTickets/SuperTickets to Parents/Children
-	
-2001-07-03 22:57  jesse
-
-	* Makefile:
-
-	Added notes to the effect that the speedycgi and fastcgi handlers aren't
-	supported.
-	
-2001-07-03 22:52  jesse
-
-	* bin/webmux.pl, bin/mason_handler.fcgi,
-	webrt/Ticket/Attachment/dhandler:
-
-	Switched mod_perl hander to use Apache::Cookie
-	
-	Refactored mime type handling to properly set the mime type with the modperl
-	handler and the fastcgi handler
-	
-	Added untainting for the requirred parts of the fastcgi wrapper.
-	I'm not yet confident that it works properly, but it does the right
-	thing in the trivial case.
-	
-2001-06-27 00:11  jesse
-
-	* Makefile:
-
-	Bumped version to 2.0 for release to the unsuspecting masses
-	
-2001-06-25 16:28  jesse
-
-	* Makefile, lib/RT/Ticket.pm:
-
-	Fix for a bug introduced by RC2  (while fixing another bug with _Links)
-	 which caused Links listings to recurse rather infinitely.
-	
-	Bumped RC2 to RC3
-	
-2001-06-25 16:25  jesse
-
-	* webrt/Admin/Elements/SelectRights:
-
-	Fix for a crashing bug when editing ACLs without permission
-	
-2001-06-25 12:19  jesse
-
-	* Makefile, lib/RT/Ticket.pm:
-
-	Fixed bug in Ticket.pm -> _Links that caused it to return an error
-	rather than an empty links object if permission denied.
-	
-	Bumped version to RC2
-	
-2001-06-23 02:48  jesse
-
-	* Makefile, README, tools/import-1.0-to-2.0:
-
-	removed 1.0-2.0 importer. (it's now in the contrib archive)
-	updated readme and makefile to know about the change.
-	
-	Bumped the version to 2.0.0-RC1. Yeah. That's right. the major version
-	number just got incremented.
-	
-2001-06-22 14:50  jesse
-
-	* Makefile, lib/RT/Ticket.pm:
-
-	hopefully a fix for everyone's favorite import bug.
-	
-2001-06-20 23:56  jesse
-
-	* webrt/Search/Bulk.html:
-
-	Display cleanups to Bulk.html.
-	Removed bogus nav items
-	
-2001-06-20 17:33  jesse
-
-	* NEWS, lib/Makefile.PL:
-
-	Removed the out of date NEWS file. It's been superceeded by the changelog
-	
-2001-06-20 17:27  jesse
-
-	* Makefile, README, lib/RT/Ticket.pm, lib/RT/User.pm,
-	lib/RT/Interface/Web.pm, tools/import-1.0-to-2.0, tools/testdeps,
-	webrt/Ticket/Display.html, webrt/Ticket/History.html:
-
-	Fixes for the import problems some folks have been seeing
-	Fixes for the Can't click on URL issues reported by mixo and Carl Potter.
-	Turned off some overly verbose debugging.
-	
-	Bumped the version to 1.3.105
-	
-2001-06-19 00:34  jesse
-
-	* Makefile:
-
-	Bumped version to 1.3.104
-	
-2001-06-19 00:25  jesse
-
-	* lib/RT/Tickets.pm:
-
-	A fix for search based on keywords that don't exist. (Some rows would be lost, due to poorly constructed SELECT statements.  This change requires DBIx::SearchBuilder 0.39
-	
-2001-06-18 15:39  jesse
-
-	* Makefile, README, webrt/Ticket/Elements/ShowTransaction:
-
-	Updated README to note new RT2 Errata list
-	Bumped version to 1.3.103
-	Added comments in ShowTransaction to let you see exact transaction / ticket Ids
-	if you view source.
-	
-2001-06-18 15:32  jesse
-
-	* bin/rt:
-
-	Better fomating for cli queue listing.
-	
-2001-06-17 16:45  jesse
-
-	* lib/RT/: Transaction.pm, User.pm:
-
-	Added PurgeTransaction datatype for Transactions.
-	
-	Removed debugging code from User.pm
-	
-2001-06-17 14:36  jesse
-
-	* webrt/Ticket/Elements/Tabs:
-
-	Fix for webui error when displaying next/prev tabs on new tix.
-	
-2001-06-15 22:23  jesse
-
-	* Makefile, README:
-
-	Bumped the version to a private pre-test 1.3.103
-	
-2001-06-15 22:19  jesse
-
-	* README, lib/RT/Ticket.pm, lib/RT/User.pm:
-
-	Debugging fixes for import oddness folks are having
-	
-2001-06-15 01:13  jesse
-
-	* webrt/Search/Bulk.html:
-
-	removed debugging output from bulk.html
-	
-2001-06-14 15:53  jesse
-
-	* Makefile, lib/RT/Transactions.pm,
-	webrt/Ticket/Elements/AddWatchers:
-
-	Installation path of man pages is now configurable
-	By default Transactions should now be ordered by date, no matter what their id sequence is.
-	Fixed an html typo in Tickets/Elements/AddWatchers
-	
-	Bumped version to 1.3.102
-	
-2001-06-14 03:21  jesse
-
-	* Makefile:
-
-	Bumped the version to 1.3.101
-	
-2001-06-14 02:47  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Interface/Web.pm, webrt/Elements/Tabs,
-	webrt/Ticket/Elements/Tabs:
-
-	Comments in Ticket.pm about less than optimal design
-	Enhancments to Interface/Web for the bulk ticket manipulation tool.
-	Search navigation was cleaned up a bunch.
-	
-2001-06-14 01:52  jesse
-
-	* webrt/Search/Bulk.html:
-
-	file Bulk.html was initially added on branch rt-1-1.
-	
-2001-06-14 01:52  jesse
-
-	* webrt/Search/: BuildSearch, Bulk.html, Listing.html, QueueFooter,
-	QueueHeader, QueueItem:
-
-	Be vewwy vewwy quiet. I'm hunting cweeping features.
-	Like the brand new Bulk Ticket manipulator
-	
-	Removed some cruft from the repository. (unused files from tobix' first
-	search implementation)
-	
-2001-06-13 03:53  jesse
-
-	* Makefile:
-
-	Bumped version to 1.3.100
-	
-2001-06-13 03:52  jesse
-
-	* bin/mason_handler.fcgi:
-
-	The fastcgi handler works for everything except attachment viewing.  I'm going to have to think a bit about how to set
-	content type properly in a nice handler-agnostic manner.
-	
-2001-06-13 03:51  jesse
-
-	* bin/rt-mailgate:
-
-	Fixed a warn -> warning in mailgate's logging
-	
-2001-06-13 03:50  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Adjusting spacing
-	
-2001-06-13 03:50  jesse
-
-	* webrt/Ticket/Elements/Tabs:
-
-	
-	Added an error check to the new navigation bars to deal with a possible lack of active search
-	
-2001-06-12 21:28  jesse
-
-	* etc/config.pm:
-
-	Clarified required permissions for the RT Logdir
-	
-2001-06-12 19:12  jesse
-
-	* etc/config.pm, lib/RT/Queue.pm, lib/RT/Transaction.pm:
-
-	Cleaned up some docs in config.pm and Queue.pm
-	Updated the Transaction Descriptions in transaction.pm to make sure
-	that the Actor is listed.
-	
-2001-06-12 18:08  jesse
-
-	* webrt/Ticket/Elements/Tabs:
-
-	Added links to navigate within an existing search.
-	
-2001-06-08 23:57  jesse
-
-	* webrt/Ticket/Elements/EditKeywordSelects:
-
-	Made "(empty)" the same between "EditKeywordSelects" and "SearchByKeywordSelect"
-	
-2001-06-08 23:51  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Ability to set owner by name when creating tickets.
-	Ability to set timeleft when creating tickets
-	
-2001-06-08 23:00  jesse
-
-	* Makefile, README, etc/schema.Pg, lib/RT/Ticket.pm:
-
-	Added an index to etc/schema.Pg
-	Ticket.pm->Create now passes through a few more values that were missing.
-	
-	Added doc on imports w/ postgres to the readme.
-	
-	bumped the version to 1.3.99
-	
-2001-06-08 18:32  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	Fix for merging more than one ticket.
-	Fix for req2rt which imported transactions in reverse order.
-	
-2001-06-07 16:02  jesse
-
-	* Makefile, lib/RT/Queue.pm, tools/import-1.0-to-2.0:
-
-	Catch a possibly undefined value in Queue::AddWatcher
-	Bumped verion to 1.3.97
-	another attempt at fixing the owner change generation code in import.
-	
-2001-06-07 14:59  jesse
-
-	* tools/import-1.0-to-2.0:
-
-	The importer now imports the root user and the general queue.
-	
-2001-06-07 12:44  jesse
-
-	* Makefile, etc/config.pm, lib/RT/Interface/Web.pm:
-
-	Support for a seperate local component root for local WebRT mods and additions.
-	
-2001-06-06 17:25  jesse
-
-	* README:
-
-	Added instructions for migrating  1.0 instances to 2.0
-	
-2001-06-06 16:15  jesse
-
-	* Makefile:
-
-	Bumped version to 1.3.95
-	
-2001-06-06 16:15  jesse
-
-	* tools/import-1.0-to-2.0:
-
-	Importer should now import tickets created by the req importer
-	
-2001-06-06 16:12  jesse
-
-	* bin/initacls.Pg:
-
-	initacls.Pg should now handle pg database on remote machine
-	
-2001-06-06 16:05  jesse
-
-	* webrt/Ticket/Elements/ShowRequestor:
-
-	Don't show the 'About this Requestor' box if the user is privileged.
-	
-2001-06-06 15:37  jesse
-
-	* lib/RT/Date.pm:
-
-	Now date comparisons against never dtrt.
-	
-2001-06-06 15:30  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Search by content now works on the web
-	
-2001-06-06 14:22  jesse
-
-	* webrt/Admin/Groups/Members.html:
-
-	Fix for #552: spurious warning when going into group membership editor
-	
-2001-06-06 14:14  jesse
-
-	* webrt/Ticket/Elements/EditKeywordSelects:
-
-	keywordSelect selction fix (fsck #555)
-	
-2001-06-06 10:57  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	Removed spurious 'u' from line 1 of importer.
-	bumped version to 1.3.95-test2
-	
-2001-06-06 09:39  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	Possible fix for jens' user import troubles.
-	bounced version to 1.3.95-test1
-	
-2001-06-06 02:12  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	Importer wasn't properly grabbing ACLs. Bumped version to 1.3.94
-	
-2001-06-06 01:33  jesse
-
-	* tools/import-1.0-to-2.0:
-
-	Fixed a bug in the 'Make users superusers' code in the importer
-	
-2001-06-06 00:41  jesse
-
-	* lib/RT/Ticket.pm:
-
-	fixed a missing =cut (end of perldoc in ticket.pm
-	
-2001-06-06 00:40  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	fixing a typo in importer's mime parser
-	
-2001-06-06 00:19  jesse
-
-	* Makefile, lib/Makefile.PL, lib/RT/Action/Notify.pm,
-	lib/RT/Action/SendEmail.pm, tools/testdeps:
-
-	Cleaned up some dependencies
-	RT should no longer send mail when there are no recipients. thanks to the nice folks at Sensarray.com for some good debugging.
-	
-2001-06-05 23:16  jesse
-
-	* Makefile, bin/webmux.pl, tools/import-1.0-to-2.0:
-
-	Fixed some bogus header parsing in import.
-	web mux now tries to chown files again. (christian's going to test it again ;)
-	Bumped to 1.3.91 for a release
-	
-2001-06-05 11:34  jesse
-
-	* webrt/Admin/Users/Modify.html:
-
-	Rephrased the "Privileged" checkbox in AdminUsers.
-	
-2001-06-05 11:18  jesse
-
-	* Makefile, bin/webmux.pl, tools/import-1.0-to-2.0,
-	webrt/NoAuth/Logout.html:
-
-	webmux no longer tries to chown its data directories on startup
-	import now handles final_priority
-	Logout.html now refreshes to a login page
-	
-2001-06-05 10:42  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	When we added support for 'priority' transactions, we accidentally broke
-	support for 'subject' transactions.  fixed now.
-	
-2001-06-05 03:25  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	Import tool now handles priority changes.
-	
-2001-06-05 02:56  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	Minor tweak to importer to try even harder to find users in the database before creating new ones.
-	
-2001-06-05 02:32  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	importer is now less likely to try to greate nonexitent empty users.
-	
-	Makefile now chgrps web ui datafiles
-	
-2001-06-05 00:06  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	Removed out of date comments in the importer
-	Made the importer grab its libraries from the makefile. (Turned off testing code)
-	
-2001-06-05 00:01  jesse
-
-	* Makefile:
-
-	Bumped the version # to 1.3.84 for immediate release
-	
-2001-06-04 23:50  jesse
-
-	* Makefile, lib/RT/Ticket.pm, tools/import-1.0-to-2.0:
-
-	Cleanups to Ticket->Import
-	import-1.0-to-2.0 now deals with dates right.
-	
-2001-06-04 20:52  jesse
-
-	* lib/RT/Link.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
-	tools/import-1.0-to-2.0:
-
-	Cleanup to Ticket, Link and User.
-	
-	merge now works on import.
-	
-	most everything in import other than ticket dates should work now.
-	
-2001-06-04 01:34  jesse
-
-	* tools/import-1.0-to-2.0:
-
-	more cleanup
-	
-2001-06-04 00:03  jesse
-
-	* tools/import-1.0-to-2.0:
-
-	First cut at importing queue adminccs and acls
-	
-2001-06-03 22:16  jesse
-
-	* tools/import-1.0-to-2.0:
-
-	Cleanup and better progress indication
-	
-2001-06-03 13:33  jesse
-
-	* lib/RT/Record.pm, lib/RT/Ticket.pm, tools/import-1.0-to-2.0:
-
-	More work on the importer. now it gets transaction creators right and catches requestor email addreses.
-	
-2001-06-03 03:43  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Transaction.pm, tools/import-1.0-to-2.0:
-
-	Transaction.pm now allows the caller to turn off scrips (for import)
-	Ticket.pm now has a mostly working import method.
-	import-1.0-to-2.0 seems to have some basic functionality.  it's not _working_ yet, but it
-	will do most of what we want it to.
-	
-2001-06-02 20:36  jesse
-
-	* webrt/Ticket/Display.html:
-
-	Fix for Ticket #537 Crash when creating ticket without permission to view ticket
-	
-2001-06-02 14:22  jesse
-
-	* tools/import-1.0-to-2.0:
-
-	added a couple of todos to the import tool
-	
-2001-06-02 14:14  jesse
-
-	* Makefile, tools/import-1.0-to-2.0:
-
-	Work on the importer. it now runs.  (note that it probably won't yet _import_ anything)
-	
-2001-06-02 12:58  jesse
-
-	* Makefile, bin/webmux.pl, lib/RT/Ticket.pm, lib/RT/Transaction.pm:
-
-	Bumped the version to 1.3.84
-	
-	Once again chown mason data directory in webmux.pl, this time
-	using more reliable, dynamic userids, rather than compiled in defaults.
-	
-	Added an 'import' method to Ticket, for the RT1 importer.
-	
-	Added a Subject method to transaction, to simplify the lives of template authors
-	
-2001-06-01 23:38  jesse
-
-	* tools/: import-1.0-to-2.0, insertdata:
-
-	Cleaned up some names and descriptions in insertdata
-	
-	First checkin of outline of code of import tool. It's never been run.
-	It's incomplete.
-	
-2001-06-01 23:38  jesse
-
-	* tools/import-1.0-to-2.0:
-
-	file import-1.0-to-2.0 was initially added on branch rt-1-1.
-	
-2001-05-31 23:27  jesse
-
-	* lib/RT/Tickets.pm:
-
-	Cleaned up Tickets->LimitQueue a bit
-	
-2001-05-31 21:22  jesse
-
-	* Makefile, tools/testdeps:
-
-	Fixed testdeps to use new searchbuilder. bumped version to 1.3.83
-	
-2001-05-31 21:14  jesse
-
-	* lib/RT/Tickets.pm, lib/RT/Interface/Web.pm,
-	webrt/Elements/SelectKeyword:
-
-	Logic fixes for keyword select negation
-	
-2001-05-31 20:30  jesse
-
-	* lib/RT/Tickets.pm, lib/RT/Interface/Web.pm,
-	webrt/Elements/SelectKeyword:
-
-	Added support for "Tickets without keyword 'foo'.
-	
-2001-05-31 17:32  jesse
-
-	* bin/webmux.pl, lib/RT/Interface/Web.pm,
-	webrt/Ticket/Attachment/dhandler:
-
-	Fix for #522: attachments without names got short shrift.
-	webRT now dies rather than run when users can't log in due to a permissions
-	bug.
-	
-2001-05-31 02:57  jesse
-
-	* etc/: schema.Pg, schema.mysql:
-
-	Cleaned up the table indices a bit. for mysql, yanked duplicate indices.
-	for Pg, added an index (we need to regen the schema for pg soon)
-	
-2001-05-31 02:46  jesse
-
-	* Makefile, lib/RT/Interface/Web.pm, webrt/Ticket/ModifyAll.html,
-	webrt/Ticket/ModifyPeople.html, webrt/Ticket/Elements/AddWatchers,
-	webrt/Ticket/Elements/EditPeople:
-
-	You can now add watchers by email address
-	Bumped version to 1.3.82
-	
-2001-05-29 15:58  jesse
-
-	* webrt/Ticket/Attachment/dhandler:
-
-	Fixed the attachments display bug.
-	
-2001-05-29 15:48  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Fix for #513 - status update without permissions returns no error message
-	
-2001-05-29 00:38  jesse
-
-	* Makefile:
-
-	Bumped version to 1.3.81
-	
-2001-05-28 20:39  jesse
-
-	* bin/webmux.pl:
-
-	Removed a bogus line from webmux
-	
-2001-05-28 20:29  jesse
-
-	* lib/RT/: Ticket.pm, Interface/Web.pm:
-
-	Work to solve 325: updating detritus in update listing
-	
-2001-05-28 17:35  jesse
-
-	* bin/rt, etc/schema.mysql, etc/schema.pm, lib/RT/Ticket.pm,
-	lib/RT/Interface/CLI.pm, webrt/Ticket/Attachment/dhandler:
-
-	Work on the CLI to resolve #482.  Can't add content when creating tix with the CLI
-	Do a bunch of better error checking on ticket creation.
-	
-	Generalized the ticket status checking code.
-	
-	Added another index on Attachments for increased speed.
-	
-2001-05-28 15:49  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Removed code which auto-opened tickets that were new.  It should
-	be a scrip and it's too late in teh release cycle to do this right now.
-	
-2001-05-28 15:24  jesse
-
-	* webrt/SelfService/: Details.html, Elements/MyRequests:
-
-	Fixed #506. Non-priv user can't see tickets
-	
-2001-05-23 23:53  jesse
-
-	* webrt/SelfService/Elements/MyRequests:
-
-	Fixed MyRequest so it shows your tickets.
-	
-2001-05-23 23:18  jesse
-
-	* Makefile:
-
-	Bumped the version to 1.3.80
-	
-2001-05-23 23:01  jesse
-
-	* bin/webmux.pl, docs/manual.pod, webrt/Elements/MyRequests,
-	webrt/Elements/MyTickets, webrt/NoAuth/Logout.html,
-	webrt/Ticket/ModifyAll.html:
-
-	Fixed logout bug from 1.3.79 http://fsck.com/rt2/Ticket/Display.html?id=500
-	Fixed bug in jumbo from 1.3.79 http://fsck.com/rt2/Ticket/Display.html?id=496
-	Added a bit of docs about templates to the manual
-	
-	Cleaned up the ui for MyRequests and MyTickets a bit.
-	
-2001-05-23 12:34  jesse
-
-	* webrt/SelfService/: Prefs.html, index.html:
-
-	Little bit of cleanup to SelfService. added prefs.
-	
-2001-05-23 12:34  jesse
-
-	* webrt/SelfService/Prefs.html:
-
-	file Prefs.html was initially added on branch rt-1-1.
-	
-2001-05-23 12:07  jesse
-
-	* Makefile:
-
-	Bumped version to 1.3.79.
-	
-2001-05-23 12:06  jesse
-
-	* README, tools/testdeps:
-
-	Added dependecy on DBIx::SearchBuilder 0.34
-	
-2001-05-23 11:43  jesse
-
-	* bin/: rt-mailgate, webmux.pl:
-
-	Made sure that the webui always writes sessions to disk
-	Fixed a typo in the mail gateway.
-	
-2001-05-23 00:09  jesse
-
-	* Makefile, bin/rt-mailgate:
-
-	Added a bit of code to rt-mailgate to deal with not properly loading users on
-	ticket creation.
-	
-2001-05-22 23:01  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Within Ticket->Create, always get a Queue object as SystemUser for like, defaults and stuff.
-	
-2001-05-21 18:12  jesse
-
-	* etc/config.pm:
-
-	Added comments from Feargal about how to configure RT for http urls.
-	
-2001-05-21 16:37  jesse
-
-	* Makefile:
-
-	bumped version to 1.3.78
-	
-2001-05-21 16:36  jesse
-
-	* lib/RT/Ticket.pm, webrt/Ticket/Display.html:
-
-	Tickets now open when they're new and get acted on.
-	
-2001-05-21 16:09  jesse
-
-	* lib/RT/Action/: Autoreply.pm, SendEmail.pm:
-
-	Fix for Ticket #481 $CorrespondAddress= variable in config.pm doesn't work
-	
-2001-05-21 15:54  jesse
-
-	* webrt/Elements/MessageBox:
-
-	Added a space at teh end of the line, per the standard convention for signature
-	dashes.
-	
-2001-05-21 15:54  jesse
-
-	* webrt/Elements/MessageBox:
-
-	If the user doesn't have a signature, don't include signature dashes
-	
-2001-05-21 15:17  jesse
-
-	* lib/RT/Tickets.pm, webrt/Ticket/ModifyAll.html:
-
-	Dead tickets aren't searchable via the ui anymore.
-	ModifyAll is a bit smarter about what to let people do.
-	
-2001-05-21 14:02  jesse
-
-	* lib/RT/Keyword.pm, webrt/Admin/Keywords/index.html:
-
-	Editing keywords without permission now actually tells you so.
-	
-2001-05-21 13:32  jesse
-
-	* webrt/Admin/: Global/Scrips.html, Queues/Scrips.html:
-
-	Users without permission to delete scrips now get a proper permission denied.
-	
-2001-05-21 13:20  jesse
-
-	* webrt/Ticket/: Update.html, Elements/Tabs:
-
-	The ticket update form is now a little smarter about only letting people perform
-	updates that they have the right to perform.
-	
-2001-05-17 23:09  jesse
-
-	* Makefile:
-
-	Chmod the makefile in the make dist procedure.
-	
-2001-05-17 23:05  jesse
-
-	* README:
-
-	Cleaned up some instructions. Thanks Feargal.
-	
-2001-05-17 22:50  jesse
-
-	* Makefile, lib/RT/Transaction.pm, lib/RT/Action/SendEmail.pm,
-	tools/insertdata:
-
-	Fixed scrip actions to activate when there's a missing scripcontent.
-	
-	Added a Content method to Transaction.pm
-	Fixed Tempates to use new Content method.
-	
-2001-05-17 16:19  jesse
-
-	* lib/RT/Transaction.pm, lib/RT/Action/SendEmail.pm,
-	webrt/Ticket/Display.html, webrt/Ticket/Update.html:
-
-	Better debugging info for some scrips.
-	
-	Fixed bugs which prevented status and owner to change on correspondence
-	and comment.
-	
-2001-05-17 12:36  jesse
-
-	* Makefile, README:
-
-	Bumped the version. Added Mark Vevers to the thansk in the readme.
-	
-2001-05-17 12:34  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Removed some obsolete code. fixed a bug in Comment recording from Mark Vevers
-	
-2001-05-16 18:51  jesse
-
-	* Makefile, tools/testdeps:
-
-	Fixed testdeps to not install bogus new DBD::mysql rev.
-	Bumped rev to 1.3.75
-	
-2001-05-16 17:30  jesse
-
-	* Makefile:
-
-	bumped to 1.3.74
-	
-2001-05-16 17:30  jesse
-
-	* webrt/Admin/Groups/Modify.html:
-
-	Fixed a small bug in Groups editing
-	
-2001-05-16 17:21  jesse
-
-	* tools/testdeps:
-
-	Bumped version to 1.3.73.
-	Bumped dependency on searchbuilder to 0.33
-	
-2001-05-16 17:15  jesse
-
-	* webrt/: Elements/TitleBoxStart, Ticket/Update.html,
-	Ticket/Elements/Tabs:
-
-	The quick link for 'Resolve' now requests that the user enter a ticket update
-	
-2001-05-16 15:45  jesse
-
-	* README, lib/RT/Interface/Web.pm, tools/testdeps,
-	webrt/Ticket/Display.html:
-
-	Added some documentation about what to do if the install fails.
-	
-	Specified a minimum working version of DBD::mysql.
-	
-	Fixed support for entering updates via the webui.
-	
-2001-05-15 00:55  jesse
-
-	* lib/RT/Action/Autoreply.pm:
-
-	Fixed a typo that broke autoreplies
-	
-2001-05-15 00:37  jesse
-
-	* tools/testdeps:
-
-	added Errno dependency
-	
-2001-05-14 23:44  jesse
-
-	* etc/config.pm, tools/insertdata, webrt/Admin/Queues/People.html:
-
-	Cleaned up a bit of phrasing. cleaned up some extra /s in urls.
-	
-2001-05-14 22:49  jesse
-
-	* Makefile, bin/mason_handler.fcgi, bin/mason_handler.scgi, bin/rt,
-	bin/webmux.pl, lib/Makefile.PL, lib/RT/Date.pm,
-	lib/RT/Interface/Web.pm, tools/testdeps:
-
-	Switched from Date::Manip To Graham Barr's Date::Parse
-	
-2001-05-14 18:58  jesse
-
-	* lib/RT/Scrips.pm, lib/RT/Ticket.pm, lib/RT/Interface/Web.pm,
-	webrt/Ticket/Display.html, webrt/Ticket/Elements/Tabs:
-
-	Work on the web frontend. the "quick" links have been cleaned up and decomplexified.
-	
-2001-05-14 17:11  jesse
-
-	* lib/RT/User.pm, lib/RT/Interface/Web.pm,
-	webrt/Admin/Groups/Modify.html, webrt/Admin/Users/Modify.html:
-
-	Cleaned up bugs related to spurious extra display of information in user and group modification and ACL deletion
-	when the user didn't have the right to do so.
-	
-2001-05-13 23:05  jesse
-
-	* webrt/Admin/Users/index.html:
-
-	no longer provide a link to create a new user to someone who doesn't have rights to do so.
-	
-2001-05-13 22:49  jesse
-
-	* lib/RT/Ticket.pm, tools/insertdata, webrt/Ticket/Modify.html:
-
-	yanked bogus Ticket Queue caching
-	rephrased ticket creation autoreply
-	
-2001-05-13 22:15  jesse
-
-	* webrt/User/Prefs.html:
-
-	Added a hack to make sure that session gets written to disk
-	
-2001-05-13 22:11  jesse
-
-	* webrt/User/Prefs.html:
-
-	more work on letting users edit their own passwords
-	
-2001-05-13 21:40  jesse
-
-	* webrt/Ticket/: Attachment/dhandler, Elements/ShowTransaction:
-
-	Fix for #433. now attachements are displayable after merges.
-	
-2001-05-12 17:46  jesse
-
-	* Makefile, lib/Makefile.PL, tools/testdeps, webrt/User/Prefs.html:
-
-	Started work on user prefs. password changing is untested
-	
-	Fixed dependency on SB to .31 and bumped version
-	
-2001-05-11 12:32  jesse
-
-	* lib/RT/Record.pm:
-
-	turned on use of DBIx::SearchBuilder::Record::Cachable
-	
-2001-05-11 12:30  jesse
-
-	* lib/RT/User.pm, webrt/Elements/Quicksearch:
-
-	Redid how the ACL checking works for great perf gains.
-	Added stalled lists to quicksearch.
-	
-2001-05-09 20:11  jesse
-
-	* Makefile:
-
-	Bumping the version # so people working off cvs get less confused.
-	
-2001-05-09 20:11  jesse
-
-	* bin/rt-mailgate, lib/RT/Queue.pm, lib/RT/Action/Autoreply.pm,
-	lib/RT/Action/Notify.pm, lib/RT/Action/NotifyAsComment.pm,
-	lib/RT/Action/SendEmail.pm:
-
-	Cleanup in the mail sending stuff.
-		fix for ticket 403:  RT should no longer send mail when it has
-		no recipients
-	
-		fix for #404: Squelch-Replies-To should be a bit more intelligent,
-		since it was rewritten from scratch
-	
-		RT should now properly send mail to queue ccs and queue admin ccs
-		when you ask it to
-	
-		internally, RT's mail sending stuff now lets you pass around
-		arrays of addresses to send mail to, rather than comma delimited
-		strings. More flexible down the line.
-	
-2001-05-09 16:39  jesse
-
-	* README:
-
-	Updated the readme to note the dependency on setuid perl
-	
-2001-05-09 16:08  jesse
-
-	* webrt/Ticket/Elements/ShowLinks:
-
-	fix for RT/fsck.com: Ticket #440 [rt-devel] 'Depended on by' doesn't work
-	
-2001-05-08 20:48  jesse
-
-	* etc/schema.mysql, etc/schema.pm, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm, webrt/Admin/Elements/UserTabs,
-	webrt/Admin/Queues/People.html, webrt/Elements/MyRequests,
-	webrt/Elements/MyTickets, webrt/Elements/Tabs,
-	webrt/Ticket/Elements/ShowBasics,
-	webrt/Ticket/Elements/ShowRequestor:
-
-	Schema.pm now has a few more indices. the mysql schema has been regenerated, but not
-	the Pg or oracle schemas.
-	
-	in Ticket.pm, a message got the queue id replaced with the queue name
-	
-	removed a spurious variable localization in Transaction.pm
-	
-	Removed a pointer to a nonexistent page  on admin/user/modify
-	
-	Modifying queue watchers now has a more coherent title
-	
-	"This user's tickets, My requests and My tickets are now limited to the 25 highest priority items
-	attached to you.
-	
-	The "Administration" tab has been changed to the "Configuration" tab
-	
-2001-04-04 16:55  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Fixing a comment in the web interface. no functional changes.
-	
-2001-04-04 16:52  jesse
-
-	* Makefile:
-
-	
-	Bumping the version to 1.3.70 for release
-	
-2001-04-04 16:51  jesse
-
-	* lib/RT/User.pm:
-
-	lib/RT/User no longer treats "ModifySelf" as equivalent to "AdminUsers" for the current user.
-	
-2001-04-04 15:08  jesse
-
-	* lib/RT/KeywordSelect.pm, lib/RT/Action/Autoreply.pm,
-	webrt/Admin/Global/Keywords.html, webrt/Admin/Queues/Keywords.html:
-
-	Fixed a crashing bug and an ACL violation on keywordselect deletion
-	
-2001-04-04 00:19  jesse
-
-	* Makefile:
-
-	bumping version for release
-	
-2001-04-03 21:14  jesse
-
-	* Makefile:
-
-	Bumped the version
-	
-2001-04-03 21:08  jesse
-
-	* etc/config.pm, lib/RT/Action/Notify.pm:
-
-	Added configuration tweak to not set a :; To header if the user doesn't want it.
-	
-2001-04-03 17:32  jesse
-
-	* lib/RT/Action/Notify.pm:
-
-	Fix for sendmail null list syntax.  : ;  is not the same as :; to sendmail
-	
-2001-04-03 17:05  jesse
-
-	* webrt/Admin/Queues/: GroupRights.html, UserRights.html:
-
-	removed a couple of stray 's in the html
-	
-2001-04-03 16:50  jesse
-
-	* webrt/Elements/Header:
-
-	Dropped doctype back to 4.0 because 4.01 makes mozilla render things funny
-	
-2001-04-03 16:47  jesse
-
-	* webrt/Elements/Quicksearch:
-
-	<TABLE>
-	should have been </TABLE>
-	
-2001-04-03 16:30  jesse
-
-	* webrt/Elements/Quicksearch:
-
-	Added a feature request/patch from nick@netability.ie
-	http://fsck.com/rt2/Ticket/Display.html?id=345
-	
-2001-04-03 16:01  jesse
-
-	* tools/testdeps:
-
-	Adding in testing for params::validate 0.02
-	
-2001-04-03 15:46  jesse
-
-	* Makefile:
-
-	Bumped the version slightly for a prerelease
-	
-2001-04-03 15:40  jesse
-
-	* lib/RT/Action/Autoreply.pm, lib/RT/Action/SendEmail.pm,
-	tools/insertdata:
-
-	Fixed autoreply by adding a new scrip. some misc. cleanup in SendEmail (method calls were on the wrong object)
-	
-2001-04-03 15:40  jesse
-
-	* lib/RT/Action/Autoreply.pm:
-
-	file Autoreply.pm was initially added on branch rt-1-1.
-	
-2001-04-03 15:15  jesse
-
-	* lib/RT/Action/SendEmail.pm:
-
-	Fixed a bug in the 'blacklist' regexp
-	
-2001-04-03 15:04  jesse
-
-	* etc/config.pm, lib/RT/Action/SendEmail.pm,
-	lib/RT/Interface/Web.pm, webrt/Ticket/Elements/ShowRequestor:
-
-	Two seperate fixes for the "RT doesn't send mail" problem. One that helps fix Mail::Internet->send
-	and one that provides an alternative.
-	
-	A fix for a bad link in ShowRequestor.
-	
-	Updating fields via the web ui should now be a bit more descriptive
-	
-2001-04-03 02:31  jesse
-
-	* webrt/Ticket/ModifyPeople.html:
-
-	Missed one of the mason fixes
-	
-2001-04-03 02:31  jesse
-
-	* Makefile, bin/rt-mailgate, etc/config.pm, lib/RT/Date.pm,
-	lib/RT/Ticket.pm, lib/RT/Transaction.pm, lib/RT/Watcher.pm,
-	lib/RT/Interface/Web.pm, webrt/Admin/Global/GroupRights.html,
-	webrt/Admin/Global/Keywords.html, webrt/Admin/Global/Scrips.html,
-	webrt/Admin/Global/UserRights.html,
-	webrt/Admin/Keywords/index.html,
-	webrt/Admin/Queues/GroupRights.html,
-	webrt/Admin/Queues/Keywords.html, webrt/Admin/Queues/People.html,
-	webrt/Admin/Queues/Scrips.html, webrt/Admin/Queues/UserRights.html,
-	webrt/Ticket/Modify.html, webrt/Ticket/ModifyAll.html,
-	webrt/Ticket/ModifyDates.html, webrt/Ticket/ModifyPeople.html:
-
-	Added support for parsing Cc and To in the mail gateway
-	(resolves the last work item for beta 2 - #219)
-	
-	Ticket due date is no longer set to "right now" if the queue has an
-	undefined "default due in"
-	
-	Cleanup warnings in date, ticket and watcher
-	
-	fixes for a bunch of mason 1.01 related bugs (Mason changed handling of combined GET and POST, thus breaking RT)
-	
-2001-04-02 23:15  jesse
-
-	* README, bin/webmux.pl:
-
-	Cleanup for mason 1.01.
-	Moved Apache::DBI out of the webmux into the instructions
-	
-2001-04-02 17:56  jesse
-
-	* tools/initdb:
-
-	Typo fix from  "Nick Hilliard" <nick@netability.ie>
-	
-2001-04-02 15:32  jesse
-
-	* Makefile, lib/RT/Keyword.pm, webrt/NoAuth/Logout.html:
-
-	Makefile cleanup.
-	Fix for #342 - reported by ivan
-	
-	Fix for a bug that clobbered logouts.
-	
-2001-04-02 03:09  jesse
-
-	* Makefile:
-
-	Bumped version for release
-	
-2001-04-01 19:19  jesse
-
-	* bin/rtadmin, lib/RT/ACE.pm, lib/RT/Interface/Web.pm,
-	webrt/Admin/Elements/SelectRights,
-	webrt/Admin/Global/GroupRights.html,
-	webrt/Admin/Global/UserRights.html,
-	webrt/Admin/Queues/GroupRights.html,
-	webrt/Admin/Queues/UserRights.html:
-
-	Redid the ACL editor so that it's much much faster. and easier to use...if not quite as pretty.
-	
-2001-04-01 17:31  jesse
-
-	* webrt/Ticket/Elements/: ShowDates, ShowRequestor:
-
-	fixing a couple of html typos
-	
-2001-03-31 03:07  jesse
-
-	* Makefile:
-
-	fixing Changelog generation
-	
-2001-03-31 02:52  jesse
-
-	* Makefile:
-
-	Bumped the version.
-	
-2001-03-31 02:52  jesse
-
-	* webrt/User/Prefs.html:
-
-	Cleaned up user preferences somewhat. removed things that don't do anything.
-	
-		-j
-	
-2001-03-31 01:59  jesse
-
-	* bin/rt:
-
-	Fix for #88   RT now lets you use the CLI to search for tickets, based on links to other tickets
-	
-2001-03-31 01:20  jesse
-
-	* README:
-
-	Fix for #216: Web session files need better handling and cleanup
-	
-2001-03-31 00:49  jesse
-
-	* Makefile, README, bin/rtadmin, bin/webmux.pl, etc/config.pm:
-
-	Moved RT Session data out of /tmp to somewhere that makes more sense.
-	This is the first half of the fix for #216.  Now we just need to document the cronjob reaper to kill old sessions
-	
-	Cleaned up creation of queues and users in bin/rtadmin
-	
-	Updates to the README
-	
-2001-03-30 23:44  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Fix for http://fsck.com/rt2/Ticket/Display.html?id=324
-	mail from requestors does not reopen ticket
-	
-2001-03-30 23:19  jesse
-
-	* bin/rtadmin, lib/RT/Queue.pm, lib/RT/Watcher.pm:
-
-	Work on Watchers and editing watchers from the CLI tool.  added support for --list-{queues|users|groups}
-	
-2001-03-30 19:31  jesse
-
-	* bin/rt, lib/RT/ACE.pm, lib/RT/Queue.pm, lib/RT/Ticket.pm,
-	lib/RT/Tickets.pm, lib/RT/Watcher.pm, lib/RT/Action/SendEmail.pm,
-	lib/RT/Interface/Web.pm:
-
-	A bunch of reworking of access control for watchers. should be much more robust
-	and more flexible.
-	
-	Resolves http://fsck.com/rt2/Ticket/Display.html?id=253 by adding the "Watch" and "WatchAsAdminCc" rights.
-	
-2001-03-30 15:41  jesse
-
-	* lib/RT/: Action/Notify.pm, Interface/Web.pm:
-
-	Tiny cleanup in Interface/Web.pm.  no functional difference there just being more explicit.
-	
-	Fix for #292: Sender of a message is no longer notified of that message.
-	
-2001-03-30 02:55  jesse
-
-	* Makefile:
-
-	Bumped the version
-	
-2001-03-30 02:37  jesse
-
-	* webrt/Elements/SelectDate:
-
-	Fixed an as-yet-untickled bug in SelectDate that incremented things too much
-	
-2001-03-30 02:32  jesse
-
-	* lib/RT/Template.pm, webrt/Admin/Global/Scrips.html:
-
-	Fixes to template creation. stupid typo.
-	Global scrips creation should now work better
-	
-2001-03-30 02:12  jesse
-
-	* webrt/: Admin/Elements/GroupTabs, Admin/Groups/Members.html,
-	Admin/Groups/Modify.html, Admin/Users/Modify.html,
-	Elements/ListActions:
-
-	Fix for PseudoGroups having a prompt to add members.
-	some cleanups to not make the "Results" box pop up when it's not wanted.
-	
-2001-03-30 01:41  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Attached is a patch to implement the ShowTicketComments in the
-	display of transactions of a ticket.
-	
-			Arthur de Jong <arthur@West.NL>
-	
-2001-03-30 01:34  jesse
-
-	* lib/RT/Scrip.pm, webrt/Admin/Global/Scrips.html,
-	webrt/Admin/Queues/Scrips.html:
-
-	Fix for 328: Re: [rt-users] 1.3.64 & postgres & scrips
-	there was an ACL bug.
-	
-2001-03-28 22:15  jesse
-
-	* Makefile, webrt/autohandler:
-
-	Fixed a tiny bug in the new authandler that caused logout to fail
-	
-2001-03-27 22:30  jesse
-
-	* webrt/index.html:
-
-	fixed index.html
-	
-2001-03-27 22:26  jesse
-
-	* Makefile, webrt/Admin/Groups/Members.html,
-	webrt/Ticket/Update.html:
-
-	Added a couple of fixes from Arthur at west.nl
-	Groups/Members deals better with multiple selections
-	Ticket/Update now displays queue watchers.
-	bumped the version to 1.3.63
-	
-2001-03-27 04:25  jesse
-
-	* docs/manual.pod, webrt/autohandler, webrt/index.html,
-	webrt/Admin/Users/index.html, webrt/Elements/ShadedBox,
-	webrt/Search/Listing.html:
-
-	Lots of cleanup of the auothandler.
-	a tiny bit of doc about an alternative apache configuration.
-	some web ui cleanup so that when you are on a page, your location is more properly hilighted.
-	admin/users includes some more verbiage explaining what's going on.
-	
-2001-03-25 00:44  jesse
-
-	* Makefile, lib/RT/Interface/Web.pm:
-
-	Bumped the version.
-	cosmetic fix in Interface/Web.pm
-	
-2001-03-23 20:33  jesse
-
-	* lib/RT/: Action/SendEmail.pm, Interface/Web.pm:
-
-	Fixed for TEXTAREA newline bug and Correspondence subject bug.
-	
-2001-03-23 00:34  jesse
-
-	* lib/RT/Action/Notify.pm:
-
-	: goes outside the '' in undisclosed recipients
-	
-2001-03-23 00:30  jesse
-
-	* lib/RT/: ACL.pm, ObjectKeywords.pm:
-
-	Removed some very loud uneccesary debugging statements
-	
-2001-03-23 00:27  jesse
-
-	* Makefile, lib/RT/Action/Notify.pm, lib/RT/Action/SendEmail.pm:
-
-	Work on mail sending routines to be more careful about newlines in subjects.
-	And about Undisclosed recipients
-	
-2001-03-22 23:17  jesse
-
-	* lib/RT/Action/Notify.pm:
-
-	yet another typo in notify.pm
-	
-2001-03-22 23:12  jesse
-
-	* lib/RT/Action/Notify.pm:
-
-	typo fix
-	
-2001-03-22 23:09  jesse
-
-	* lib/RT/Action/: Notify.pm, SendEmail.pm:
-
-	Cleanups and fixes to Notify and SendEmail
-	
-2001-03-22 19:46  jesse
-
-	* webrt/Ticket/ModifyAll.html:
-
-	TicketObj->Ticket
-	
-2001-03-22 19:42  jesse
-
-	* lib/RT/Action/Notify.pm:
-
-	A more functional Undisclosed Recipients;
-	
-2001-03-22 19:28  jesse
-
-	* webrt/Ticket/: ModifyAll.html, Elements/Tabs:
-
-	Elements/Tabs now does better access control checking before making
-	buttons available to people.
-	
-	ModifyAll.html has a better title and should now update objectkeywords.
-	
-2001-03-22 18:18  jesse
-
-	* lib/RT/: Date.pm, Ticket.pm:
-
-	Added  a routine to Date.pm to advance the date N days
-	
-	Started using queue defaults on Ticket->Create
-	
-2001-03-22 18:17  jesse
-
-	* webrt/: autohandler, Elements/Login, NoAuth/Login.html,
-	Search/autohandler, Ticket/autohandler:
-
-	Cleanup of the login process. now you can't accidentally call "Login.html"
-	when you're already logged in.
-	removed a couple of bogus old autohandlers
-	
-2001-03-22 18:17  jesse
-
-	* webrt/Elements/Login:
-
-	file Login was initially added on branch rt-1-1.
-	
-2001-03-22 14:45  jesse
-
-	* webrt/Ticket/Elements/EditPeople:
-
-	EditPeople should now enforce a list of possible owners reasonably
-	
-2001-03-21 21:40  jesse
-
-	* Makefile:
-
-	bumped the version to .60
-	
-2001-03-21 21:22  jesse
-
-	* docs/manual.pod:
-
-	Adding some content to the manual. and even more places where the manual is
-	missing content. :/
-	
-2001-03-21 12:21  jesse
-
-	* lib/RT/Action/NotifyAsComment.pm:
-
-	NotifyAsComment should now DTRT and send mail from the comments email address
-	
-2001-03-21 02:46  jesse
-
-	* Makefile:
-
-	yanked some cruft from the ChangeLog creator
-	
-2001-03-21 02:44  jesse
-
-	* Makefile, README:
-
-	Bumped the version. added some people to the readme
-	
-2001-03-21 02:39  jesse
-
-	* webrt/Ticket/Elements/ShowBasics:
-
-	Fix for 242: time left displayed via the web ui is now more intuitive
-	
-2001-03-21 02:37  jesse
-
-	* bin/rt, bin/rt-mailgate, lib/RT.pm, lib/RT/Attachment.pm,
-	lib/RT/Date.pm, lib/RT/Tickets.pm, lib/RT/User.pm:
-
-	Added more error checking and error handling to the mail gateway
-	finished code in Attachment.pm to handle too-long attachments
-	
-	added support for limiting by date to the CLI
-	
-	fixed little bugs in user, date and tickets.
-	
-2001-03-20 19:02  jesse
-
-	* docs/manual.pod:
-
-	file manual.pod was initially added on branch rt-1-1.
-	
-2001-03-20 19:02  jesse
-
-	* docs/manual.pod:
-
-	actually adding the outline of the manual
-	
-2001-03-20 19:01  jesse
-
-	* Makefile, bin/rt, docs/API, docs/README.docs, docs/Security,
-	docs/keywords, etc/config.pm:
-
-	Starting the doc cleanup
-	
-2001-03-20 15:26  jesse
-
-	* webrt/Elements/SelectTicketSortBy:
-
-	LastUpdated, not LastUpdate
-	
-2001-03-20 15:21  jesse
-
-	* webrt/Elements/: SelectDate, SelectTicketSortBy:
-
-	more things to sort by.
-	select date shouldn't insert spurious null dates.
-	
-2001-03-20 13:27  jesse
-
-	* lib/RT/Action/SendEmail.pm:
-
-	fixed a typo. $defined is not useful perl ;)
-	
-2001-03-20 13:21  jesse
-
-	* lib/RT/Action/: Notify.pm, SendEmail.pm:
-
-	Fixed a couple bugs in Notify and SendEmail that should get mail flowing
-	for transactions without content.
-	
-2001-03-20 13:08  jesse
-
-	* webrt/Ticket/: Attachment/dhandler, Elements/ShowTransaction:
-
-	Making web based attachment display deal nicely with too-long message bodies
-	
-2001-03-20 04:26  jesse
-
-	* Makefile:
-
-	bumping the version
-	
-2001-03-20 04:20  jesse
-
-	* lib/RT/Action/SendEmail.pm:
-
-	regexps with three /s need a leading s ;)
-	
-2001-03-20 04:16  jesse
-
-	* bin/rt-mailgate, lib/RT/Template.pm:
-
-	fixing scrips-related mailing stuff. some transaction mailing used to bomb out.
-	
-2001-03-20 02:46  jesse
-
-	* Makefile, bin/rt-mailgate, etc/config.pm,
-	lib/RT/Action/SendEmail.pm, tools/insertdata:
-
-	Work on robustification of the mail gateway. including single-transaction
-	blacklisting of addresses that might generate bounces.
-	
-2001-03-20 00:41  jesse
-
-	* lib/RT/User.pm:
-
-	Work on user.pm to allow users to be disabled.
-	
-2001-03-19 18:03  jesse
-
-	* webrt/: autohandler, Elements/MyRequests, NoAuth/Login.html,
-	NoAuth/Reminder.html:
-
-	fixed the MyRequests bug that caused them not to be listed.
-	nonexistent users no longer get shunted to SelfService.
-	
-2001-03-19 15:30  jesse
-
-	* Makefile, bin/mason_handler.fcgi, bin/mason_handler.scgi, bin/rt,
-	bin/rt-mailgate, bin/rtadmin, webrt/Admin/Elements/ModifyTemplate,
-	webrt/Admin/Elements/ModifyUser, webrt/Admin/Global/Template.html,
-	webrt/Admin/Queues/Template.html, webrt/Admin/Users/Modify.html,
-	webrt/Elements/MessageBox:
-
-	Fixes for perl path and textarea bugs noted by Arthur de Jong
-	
-2001-03-18 14:58  jesse
-
-	* lib/RT/Attachment.pm:
-
-	Removed an extra signature attachment
-	
-2001-03-17 14:57  jesse
-
-	* Makefile:
-
-	bumped version
-	
-2001-03-17 14:55  jesse
-
-	* lib/Makefile.PL, lib/RT/Tickets.pm, lib/RT/Interface/Web.pm,
-	webrt/Elements/Quicksearch, webrt/Elements/SelectDate,
-	webrt/Elements/SelectDateType, webrt/Elements/TitleBoxEnd,
-	webrt/Search/PickRestriction:
-
-	Fixed a bug on simple actions reported by christian.
-	Implemented search by date via web ui
-	
-2001-03-16 03:55  jesse
-
-	* Makefile, lib/RT/Interface/Web.pm, webrt/Elements/Header:
-
-	Fixed a tiny typo that prevented objectkeyword editing
-	
-2001-03-16 02:29  jesse
-
-	* Makefile:
-
-	Bumped the version.
-	
-2001-03-16 02:27  jesse
-
-	* Makefile, README, bin/initacls.Oracle, bin/initacls.Pg,
-	bin/initacls.mysql, bin/initdb.Oracle, tools/initdb:
-
-	some clarifications to the install procedure.
-	
-2001-03-16 02:10  jesse
-
-	* lib/RT/Tickets.pm, webrt/Search/Listing.html:
-
-	Fixed #2 WebRT doesn't refresh searches properly. the oldest bug in the bug tracking
-	system ;)
-	
-	Fixed Tickets->Count
-	
-2001-03-16 01:39  jesse
-
-	* webrt/Admin/: Global/Template.html, Global/Templates.html,
-	Queues/Modify.html, Queues/Template.html, Queues/Templates.html:
-
-	now you can create templates with the web ui.
-	
-2001-03-16 00:39  jesse
-
-	* webrt/Ticket/Elements/EditLinks:
-
-	file EditLinks was initially added on branch rt-1-1.
-	
-2001-03-16 00:39  jesse
-
-	* webrt/Ticket/ModifyAll.html:
-
-	file ModifyAll.html was initially added on branch rt-1-1.
-	
-2001-03-16 00:39  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Interface/Web.pm, webrt/Elements/Tabs,
-	webrt/Ticket/Modify.html, webrt/Ticket/ModifyAll.html,
-	webrt/Ticket/ModifyDates.html, webrt/Ticket/ModifyLinks.html,
-	webrt/Ticket/ModifyPeople.html, webrt/Ticket/ValidateUpdate.html,
-	webrt/Ticket/Elements/EditKeywordSelects,
-	webrt/Ticket/Elements/EditLinks, webrt/Ticket/Elements/EditPeople,
-	webrt/Ticket/Elements/Tabs:
-
-	A bunch of Ticket modification refactoring and cleanup.
-	Added a "ModifyAll" at sam hartman's suggestion
-	
-2001-03-14 21:20  jesse
-
-	* bin/rt:
-
-	--id=43-45 should now work. there was a regex typo
-	
-2001-03-14 04:37  jesse
-
-	* Makefile, bin/initacls.Oracle, etc/acl.Oracle, etc/acl.mysql,
-	etc/schema.Oracle, etc/user.Oracle, tools/initdb, tools/testdeps:
-
-	reworked init procedures, oracle schema and
-	acl setup for mysql and postgres and oracle.
-	
-	RT2 now runs on oracle.
-	
-2001-03-14 02:08  jesse
-
-	* etc/acl.Oracle, etc/schema.Oracle, tools/initdb:
-
-	hacking to make oracle work. we're much of the way there. next up:
-	schema updates
-	
-2001-03-14 02:08  jesse
-
-	* etc/acl.Oracle:
-
-	file acl.Oracle was initially added on branch rt-1-1.
-	
-2001-03-14 01:03  jesse
-
-	* webrt/Admin/Queues/GroupRights.html:
-
-	file GroupRights.html was initially added on branch rt-1-1.
-	
-2001-03-14 01:03  jesse
-
-	* webrt/Admin/Queues/UserRights.html:
-
-	file UserRights.html was initially added on branch rt-1-1.
-	
-2001-03-14 01:03  jesse
-
-	* Makefile, lib/RT/ACE.pm, lib/RT/Interface/Web.pm, tools/initdb,
-	webrt/Admin/Elements/QueueTabs,
-	webrt/Admin/Global/GroupRights.html, webrt/Admin/Queues/ACL.html,
-	webrt/Admin/Queues/GroupRights.html,
-	webrt/Admin/Queues/UserRights.html, webrt/Elements/Tabs,
-	webrt/NoAuth/webrt.css:
-
-	Cleanup to the ACL editors (consistency)
-	a bit of web ui tuning.
-	
-	fixes for initdb issues (thanks, jhutz)
-	
-	minor cleanups to ACE.pm
-	
-2001-03-13 22:44  jesse
-
-	* lib/RT/Transaction.pm, lib/RT/Transactions.pm, tools/testdeps:
-
-	Updated DBIx::SearchBuilder dependency
-	
-	code cleanup and sketching in Transaction.pm and Transactions.pm
-	
-2001-03-12 21:14  jesse
-
-	* Makefile, etc/schema.Pg, etc/schema.mysql, tools/initdb,
-	tools/testdeps:
-
-	initdb now caches schema, eliminating the install-time dependency on DBIx::DBSchema.
-	
-	this is 1.3.50, folks. it has what I believe to be functional postgres support
-	
-2001-03-11 21:58  jesse
-
-	* etc/config.pm, etc/schema.pm, lib/RT/Attachment.pm,
-	lib/RT/Ticket.pm, tools/initdb:
-
-	Cleanup in Ticket.pm
-	Bugfixes to Attachment.pm (for postgres mimencoding supporT)
-	
-	reconfigured to use the new DBIx::DBSchema (which isn't out yet. but should
-	be soon)
-	
-	still need to do a bit more work on attachments configuration.
-	
-2001-03-11 02:45  jesse
-
-	* bin/rt-mailgate:
-
-	file rt-mailgate was initially added on branch rt-1-1.
-	
-2001-03-11 02:45  jesse
-
-	* Makefile, README, bin/rt-mailgate, bin/rtmux.pl, bin/webmux.pl,
-	etc/config.pm, etc/schema.Oracle, etc/schema.pm, lib/RT.pm,
-	lib/RT/Attachment.pm, lib/RT/ScripAction.pm, lib/RT/Ticket.pm,
-	lib/RT/Action/SendEmail.pm, lib/RT/Interface/CLI.pm,
-	lib/RT/Interface/Email.pm, tools/insertdata:
-
-	This is a bit more of a 'comprehensive' diff than I'd intended. That's what
-	I get for working for 1/2 a week at my parents place without real net ;)
-	
-	Cleanups in the makefile and readme to make installation simpler and more
-	sensical.
-	
-	removed outdated rtmux.pl
-	moved old Interface/Email.pm to bin/rt-mailgate
-	started new baseclass for new mail gateways (Interface/Email.pm)
-	
-	first cut implementation of attachment size limits.
-	
-	switched mysql to use 'longblob' rather than just 'blob', so
-	that users can submit > 64k attachments.  with the next release
-	of DBIx::DBSchema, we should have what we need to get
-	PG attachmetns of more reasonable sizes working.
-	
-	first cut implementation of base64 encoding for MIME objects
-	on databases that don't support BLOBs (postgres)
-	
-	restructured initdb so we'll be able to support databases
-	for which we need to hand-hack schema.
-	
-	added the 'Owner' pseudogroup to insertdata
-	
-	fixed the bug in logging for the mail gateway that caused
-	lots of warnings about joins.
-	
-	lots of work on the mail gateway to start to clean up and restructure
-	things.
-	
-2001-03-10 18:53  jesse
-
-	* tools/initdb:
-
-	Refactoring initdb to make it easier to do things like add oracle support. yay
-	
-2001-03-09 15:19  jesse
-
-	* lib/RT/Condition/StatusChange.pm:
-
-	file StatusChange.pm was initially added on branch rt-1-1.
-	
-2001-03-09 15:19  jesse
-
-	* Makefile, etc/config.pm, lib/RT/Attachment.pm, lib/RT/Link.pm,
-	lib/RT/Ticket.pm, lib/RT/Transaction.pm, lib/RT/Watcher.pm,
-	lib/RT/Action/SendEmail.pm, lib/RT/Condition/AnyTransaction.pm,
-	lib/RT/Condition/Generic.pm, lib/RT/Condition/StatusChange.pm,
-	tools/insertdata, tools/testdeps:
-
-	OnResolve scrip now works.
-	some cleanup on Scrips and Watchers.
-	commented out some debug messages that aren't immediately useful
-	
-2001-03-09 15:15  jesse
-
-	* webrt/Ticket/: ModifyDates.html, Elements/EditWatchers:
-
-	Two bugfixes:
-		one, editdates no longer errors out on 5.005
-		two, links from watchers to the ModifyUser page now work properly
-	
-2001-03-08 15:21  jesse
-
-	* Makefile, lib/RT/User.pm, tools/insertdata:
-
-	
-	Fixed a bootstrapping bug introduced with the new acls on Create.
-	bumped version to 1.3.49_01
-	
-2001-03-07 00:40  jesse
-
-	* lib/: test.pl, RT/ACE.pm, RT/CurrentUser.pm, RT/Group.pm,
-	RT/GroupMember.pm, RT/Keyword.pm, RT/KeywordSelect.pm, RT/Link.pm,
-	RT/Queue.pm, RT/Scrip.pm, RT/ScripAction.pm, RT/Template.pm,
-	RT/Ticket.pm, RT/Transaction.pm, RT/User.pm, RT/Watcher.pm:
-
-	acls for Delete methods that needed them.
-	flat lockouts on Delete methods that needed them.
-	
-	test.pl got 'use *' added to it
-	
-2001-03-06 18:07  jesse
-
-	* lib/RT/Attachment.pm:
-
-	Backing out changes that broke ->Content
-	
-2001-03-06 17:42  jesse
-
-	* Makefile, lib/RT/Attachment.pm, lib/RT/Record.pm,
-	lib/RT/Interface/Web.pm, webrt/Elements/SelectSortOrder,
-	webrt/Search/Listing.html, webrt/Search/PickRestriction:
-
-	work on Attachments.
-	cleanup on sorting and limiting.
-	
-2001-03-06 16:26  jesse
-
-	* webrt/Search/PickRestriction:
-
-	adding a header
-	
-2001-03-04 19:46  jesse
-
-	* etc/schema.pm:
-
-	Schema change to support postgres
-	
-2001-03-04 19:44  jesse
-
-	* lib/RT/Record.pm:
-
-	Small change for new DBIx::SearchBuilder::Record PrimaryKey behaviors..
-	
-2001-03-04 19:15  jesse
-
-	* bin/rt:
-
-	rt --id=<int> should work now
-	
-2001-03-02 00:26  jesse
-
-	* etc/config.pm, lib/RT/Date.pm, lib/RT/Ticket.pm,
-	webrt/Ticket/ModifyDates.html:
-
-	first pass on dates and timezones...seems to work. for common ops
-	
-2001-02-28 16:34  jesse
-
-	* lib/RT/User.pm:
-
-	fix for RT/fsck.com: Ticket #208 User->Create needs more argument checking
-		added a check to User->Create to make sure a name was specified
-	
-2001-02-28 08:56  jesse
-
-	* Makefile, bin/rtadmin:
-
-	Enabled the ability to set a user's password via the CLI
-	
-2001-02-27 22:09  jesse
-
-	* lib/Makefile.PL, tools/testdeps:
-
-	Bumping required version of searchbuilder in testdeps and lib/Makefile.pl
-	
-2001-02-27 22:00  jesse
-
-	* webrt/Elements/SelectKeyword:
-
-	allowing undef keywords
-	
-2001-02-27 21:43  jesse
-
-	* webrt/Admin/Queues/Scrips.html:
-
-	Fix for ticket #50. grammar in per queue scrip descriptions
-	
-2001-02-27 21:41  jesse
-
-	* tools/insertdata:
-
-	resolving ticket #181- extra \s in the autoreply template
-	
-2001-02-27 21:36  jesse
-
-	* Makefile, lib/RT/Transaction.pm, tools/testdeps:
-
-	testdeps now erorrs out if you don't specify a db type.
-	
-	queue change transaction descriptions are better.
-	
-	bumped the version
-	
-2001-02-27 21:12  jesse
-
-	* webrt/Elements/SelectTicketSortBy:
-
-	file SelectTicketSortBy was initially added on branch rt-1-1.
-	
-2001-02-27 21:12  jesse
-
-	* webrt/Elements/SelectSortOrder:
-
-	file SelectSortOrder was initially added on branch rt-1-1.
-	
-2001-02-27 21:12  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/Interface/Web.pm,
-	webrt/Elements/SelectKeyword, webrt/Elements/SelectResultsPerPage,
-	webrt/Elements/SelectSortOrder, webrt/Elements/SelectTicketSortBy,
-	webrt/Search/Listing.html, webrt/Search/PickRestriction:
-
-	Basic ticket sorting has been implemented.
-	Ticket listing by pages works too.
-	
-	a bit of cleanup in the ticket listing.  now select by keywords uses the component designed for that purpose
-	
-2001-02-26 15:44  jesse
-
-	* lib/RT/Ticket.pm:
-
-	No longer generate spurious watchers transactions when merging tickets.
-	
-2001-02-26 03:08  jesse
-
-	* lib/RT/Ticket.pm:
-
-	fixed a typo in a debug message that prevented compilation
-	
-2001-02-26 02:53  jesse
-
-	* Makefile:
-
-	bumped the version for release. again.
-	
-2001-02-26 02:52  jesse
-
-	* lib/RT/: ACE.pm, Ticket.pm:
-
-	Fixed a variable redef in ticket and an acl granting bug in ACE
-	
-2001-02-26 01:24  jesse
-
-	* Makefile, webrt/Ticket/ModifyLinks.html:
-
-	A bit more merging support.
-	Bumped version for release
-	
-2001-02-25 22:28  jesse
-
-	* webrt/Ticket/Elements/: ShowHistory, ShowTransaction:
-
-	Cleaning up the transaction display.
-	
-2001-02-25 22:22  jesse
-
-	* lib/RT/: Scrip.pm, ScripCondition.pm, Ticket.pm:
-
-	Some bug fixes for merging.
-	Fixed a bug in Scrips that caused an infinite loop if the user had no rights.
-	
-2001-02-24 02:42  jesse
-
-	* Makefile, lib/RT/Ticket.pm:
-
-	Fixed a bug that prevented ticket loading from appearing to work
-	
-2001-02-23 19:17  jesse
-
-	* Makefile, lib/RT/Ticket.pm, lib/RT/Interface/Web.pm:
-
-	Fixed a typo in Ticket.pm that prevented transaction lists from working
-	fixed a paste error in Web.pm
-	
-2001-02-23 17:41  jesse
-
-	* Makefile:
-
-	Bumped the version # for release
-	
-2001-02-23 17:31  jesse
-
-	* Makefile, README, bin/initacls.mysql, bin/webmux.pl,
-	lib/RT/ACE.pm, lib/RT/ACL.pm, lib/RT/Link.pm, lib/RT/Queue.pm,
-	lib/RT/Ticket.pm, lib/RT/User.pm, lib/RT/Interface/Web.pm,
-	tools/initdb, tools/testdeps:
-
-	Fixed a bug that made a first install with mysql fail
-	yanked a UNIVERSAL::AUTOLOADER handler I inserted to test things out.
-	Fixed several ACL creation bugs.
-	Initial implementation of merge for the core.
-	Testdeps now does database testing.
-	
-	Made Ticket->Load smarter. (nolonger needs a seperate LoadByURI sub.
-	
-	fixed bugs in the readme
-	
-2001-02-22 01:03  jesse
-
-	* tools/testdeps:
-
-	Updated dependencies.
-	
-2001-02-21 17:49  jesse
-
-	* lib/RT/: Ticket.pm, Tickets.pm:
-
-	Cache Queue in Ticket.pm for added perf.
-	formatting cleanup in Tickets.pm
-	
-2001-02-20 14:38  jesse
-
-	* webrt/Ticket/Display.html:
-
-	Uncompressed history on summary page...
-	
-2001-02-20 14:18  jesse
-
-	* lib/RT/ScripCondition.pm:
-
-	fixed a pod typo
-	
-2001-02-20 14:07  jesse
-
-	* Makefile, etc/schema.pm, lib/MANIFEST, tools/insertdata,
-	webrt/Admin/Users/Modify.html,
-	webrt/SelfService/Elements/ShowTransaction,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	removed a false unique index from schema. pm.
-	make web interface and insertdata deal properly with the fact that email addresses
-	should be unique.
-	
-	cleaned up ShowTransaction for the webui. (now uses CreatorObj rather than Creator,
-	as it was confusing
-	
-2001-02-20 01:42  jesse
-
-	* lib/RT/: ACE.pm, ACL.pm, Attachment.pm, Attachments.pm,
-	CurrentUser.pm, EasySearch.pm, Group.pm, GroupMember.pm,
-	GroupMembers.pm, Groups.pm, Keyword.pm, KeywordSelect.pm,
-	Keywords.pm, Link.pm, Links.pm, ObjectKeyword.pm,
-	ObjectKeywords.pm, Queue.pm, Queues.pm, Record.pm, Scrip.pm,
-	ScripAction.pm, ScripActions.pm, ScripCondition.pm,
-	ScripConditions.pm, Scrips.pm, Template.pm, Templates.pm,
-	Ticket.pm, Tickets.pm, Transaction.pm, Transactions.pm, User.pm,
-	Users.pm, Utils.pm, Watcher.pm, Watchers.pm, Action/SendEmail.pm:
-
-	A major security audit of the codebase has taken place.  I was primarily out for
-	ACL related issues, but took care of a number of other minor cleanups at the same time.
-	
-2001-02-19 17:16  jesse
-
-	* NEWS:
-
-	fixed a typo in cli_respond_req
-	
-2001-02-15 18:02  jesse
-
-	* webrt/SelfService/: Details.html, Error.html:
-
-	fixing bug #90: SelfService calls to Abort use the 'standard' handler. which includes the wrong header.
-	
-2001-02-15 18:02  jesse
-
-	* webrt/SelfService/Error.html:
-
-	file Error.html was initially added on branch rt-1-1.
-	
-2001-02-15 17:39  jesse
-
-	* webrt/Admin/Elements/SelectSingleOrMultiple:
-
-	file SelectSingleOrMultiple was initially added on branch rt-1-1.
-	
-2001-02-15 17:39  jesse
-
-	* lib/RT/Keyword.pm, lib/RT/KeywordSelect.pm,
-	webrt/Admin/Elements/SelectKeywordSelect,
-	webrt/Admin/Elements/SelectSingleOrMultiple,
-	webrt/Admin/Global/Keywords.html, webrt/Admin/Queues/Keywords.html,
-	webrt/Elements/SelectKeyword, webrt/Elements/SelectKeywordOptions,
-	webrt/Ticket/Elements/ModifyTicket:
-
-	KeywordSelect.pm got an ACL bug fixed.
-	Keyword.pm now does recursive searches in Descendants properly.
-	
-	KeyworSelect editing via the webui is now much smarter. and cleaner. and better. and faster, and resolving bug 123
-	
-2001-02-15 17:39  jesse
-
-	* webrt/Admin/Elements/SelectKeywordSelect:
-
-	file SelectKeywordSelect was initially added on branch rt-1-1.
-	
-2001-02-13 22:54  jesse
-
-	* lib/: Makefile.PL, RT/ACE.pm, RT/Keyword.pm, RT/KeywordSelect.pm,
-	RT/Scrip.pm:
-
-	Better ACL handling for ACEs, Keywords and KeywordSelects.
-	specified more accurate versions of some dependencies in lib/Makefile.PL
-	
-2001-02-13 12:51  jesse
-
-	* bin/rtadmin, etc/schema.pm, lib/RT/Keyword.pm,
-	lib/RT/KeywordSelect.pm, lib/RT/KeywordSelects.pm,
-	lib/RT/Keywords.pm, lib/RT/Queue.pm, lib/RT/Queues.pm,
-	lib/RT/User.pm, lib/RT/Users.pm, webrt/Admin/Global/Keywords.html,
-	webrt/Admin/Keywords/index.html, webrt/Admin/Queues/Keywords.html,
-	webrt/Admin/Queues/Modify.html, webrt/Admin/Users/Modify.html:
-
-	Implemented 'Disabled' for Keywords, KeywordSelects, Queues and Users.
-	This supplants 'Delete' for these objects which need to exist to guarantee
-	referential integrity.
-	
-	Implemented cli and web interfaces to support the new code.
-	
-2001-02-12 18:27  jesse
-
-	* README, bin/rtadmin, etc/schema.pm, lib/RT/Attachment.pm,
-	lib/RT/EasySearch.pm, lib/RT/Link.pm, lib/RT/ObjectKeyword.pm,
-	lib/RT/Queue.pm, lib/RT/Queues.pm, lib/RT/Record.pm,
-	lib/RT/ScripAction.pm, lib/RT/ScripCondition.pm,
-	lib/RT/Template.pm, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	lib/RT/Watcher.pm, tools/testdeps:
-
-	Cleaned up LastUpdated / Created/ LastUpdatedBy / Creator to all get set on
-	create for all relevant objects.
-	
-	Based on discussions with ivan, changed the 'Deleted' flag on various objects to 'Disabled'
-	to better represent its purpose.
-	
-	Fully implemented Disable for queue as a prototype.
-	
-	fixed queue attribute editing in cli.
-	
-2001-02-12 13:59  jesse
-
-	* tools/testdeps:
-
-	specified a minimum known good version of Getopt::Long
-	
-2001-02-12 12:38  jesse
-
-	* lib/RT/Queue.pm, webrt/Ticket/Elements/ShowTransaction:
-
-	transaction links work again.
-	admin ccs get listed.
-	
-2001-02-11 22:16  jesse
-
-	* Makefile:
-
-	bumped the version # for a new release
-	
-2001-02-11 22:13  jesse
-
-	* lib/RT/Queue.pm, lib/RT/Template.pm, tools/insertdata:
-
-	cleaning up queue create.
-	
-2001-02-11 22:12  jesse
-
-	* etc/schema.pm:
-
-	started the work on dealing with Deleting records that need to exist to guarantee ref. integrity
-	
-2001-02-11 18:40  jesse
-
-	* NEWS:
-
-	imported brandon's url importing code
-	
-2001-02-06 22:59  jesse
-
-	* lib/RT/Queue.pm, webrt/Admin/Queues/Modify.html,
-	webrt/Admin/Users/index.html:
-
-	Fixes to Queue.pm to stop it from clobbering the Name.
-	
-	fixed a typo in the webui Admin/Users/index.html
-	
-2001-02-06 15:22  jesse
-
-	* lib/RT/Queue.pm, webrt/Admin/Elements/QueueRightsForUser,
-	webrt/Admin/Elements/SelectRights,
-	webrt/Ticket/Elements/ShowMembers:
-
-	ACL fixes in Queue.pm.
-	ACL search fies for the web ui.
-	fixed a recursive subticket display bug.
-	
-2001-02-06 12:49  jesse
-
-	* Makefile:
-
-	removed the old rt 1.0 lib/rt directory forever. yay
-	
-2001-02-06 12:48  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	Added a tiny patch from ivan to not extract nested messages. not totally sure about this one yet.
-	
-2001-02-02 01:26  jesse
-
-	* Makefile:
-
-	version bumpin
-	
-2001-02-02 01:11  jesse
-
-	* bin/rtadmin, lib/RT/Keyword.pm:
-
-	keyword creation, editing and deletion now works via the cli tool.
-	
-	This means that for alpha 4, we're *gasp* feature complete.  now to fix lots of bugs.
-	
-2001-02-01 02:46  jesse
-
-	* bin/rtadmin, lib/RT/Group.pm, lib/RT/Keyword.pm,
-	lib/RT/KeywordSelect.pm, tools/testdeps, webrt/Ticket/Display.html,
-	webrt/Ticket/Elements/ShowHistory,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Commandline editing of keywordselects now works.
-	
-	Added in a patch to collapse history on the ticket listing
-	page from Byron Ellacott
-	
-	Bumped a few dependecy versions. added a File::Spec dependency, since File::Temp
-	gets it not quote right.
-	
-2001-01-31 02:08  jesse
-
-	* bin/rtadmin, lib/RT/Group.pm, webrt/Admin/Groups/Members.html:
-
-	Commandline group editing now works. yay. group membership even.
-	the api changed to be easier to work with and more consistent with other functions
-	
-2001-01-30 23:12  jesse
-
-	* lib/RT/Interface/Email.pm, webrt/Ticket/Elements/ShowLinks,
-	webrt/Ticket/Elements/ShowRequestor:
-
-	The email interface now uses tempdir from File::Temp for increased security.
-	
-	A couple of webui cleanups to display more sensible things.
-	
-2001-01-30 16:42  jesse
-
-	* etc/config.pm, lib/RT/User.pm, lib/RT/Interface/Email.pm:
-
-	Added mail-on-error to the mail gateway. now it should tell you when it fails.
-	
-	turned off debugging output from ACLs....
-	
-2001-01-29 23:58  jesse
-
-	* bin/rtadmin, lib/RT/ACE.pm, lib/RT/ACL.pm, lib/RT/Scrip.pm,
-	lib/RT/ScripAction.pm, lib/RT/ScripCondition.pm, lib/RT/Scrips.pm,
-	lib/RT/Template.pm, lib/RT/Templates.pm, lib/RT/User.pm,
-	lib/RT/Interface/CLI.pm, lib/RT/Interface/Web.pm,
-	webrt/Admin/Elements/SelectTemplate,
-	webrt/Admin/Global/Template.html,
-	webrt/Admin/Global/Templates.html,
-	webrt/Admin/Queues/Template.html:
-
-	A bunch of work on the admin cli (acl editor now works)
-	
-	a couple API changes to standardize method names across classes
-	template editing via the web should work better now.
-	
-2001-01-29 23:56  jesse
-
-	* webrt/Elements/: TitleBoxEnd, TitleBoxStart:
-
-	Futzing with the title box to make it a bit more consistent
-	
-2001-01-29 23:54  jesse
-
-	* lib/RT/Record.pm:
-
-	Removed a redundant sub new
-	
-2001-01-29 22:22  jesse
-
-	* lib/RT/Group.pm:
-
-	Groups can now be loaded by name.
-	
-2001-01-23 15:46  jesse
-
-	* bin/rtadmin, etc/schema.pm, lib/RT/Queue.pm, lib/RT/Template.pm,
-	lib/RT/Ticket.pm, lib/RT/User.pm, lib/RT/Interface/CLI.pm,
-	tools/initdb:
-
-	initdb now punts on database creation for oracle.
-	
-	Ticket->Name removed from code (retargeted to post 2.0 and its own table)
-	Some better error checking in User and Queue.
-	
-	Can now edit templates (And create them) from the CLI.
-	
-2001-01-22 12:51  jesse
-
-	* lib/RT/Action/Notify.pm:
-
-	
-	It's amazing how much effect 3 little letters can have. with this patch,
-	scrips that depend on notify (most everything other than autoreply)
-	just work. woo!
-	
-2001-01-22 06:18  jesse
-
-	* lib/RT/Template.pm:
-
-	Fixed a couple ACL bugs in Template::_Set
-	
-2001-01-22 05:04  jesse
-
-	* Makefile:
-
-	Bumped the version # because of the schema change
-	
-2001-01-22 04:51  jesse
-
-	* lib/RT/Interface/CLI.pm:
-
-	file CLI.pm was initially added on branch rt-1-1.
-	
-2001-01-22 04:51  jesse
-
-	* lib/RT/Interface/CLI.pm:
-
-	Added CLI.pm, which rt and adminrt are dependant on
-	
-2001-01-22 04:46  jesse
-
-	* bin/rtadmin, lib/MANIFEST, lib/RT/Template.pm:
-
-	a bit more work on rtadmin (the start of template editing)
-	
-	added Interface/CLI to the manifest.
-	added a comment to Template.pm
-	
-2001-01-22 02:51  jesse
-
-	* Makefile, TODO, bin/mason_handler.scgi, bin/rt, bin/rtadmin,
-	bin/rtmux.pl, bin/webmux.pl, etc/config.pm, etc/schema.Oracle,
-	etc/schema.pm, lib/RT.pm, lib/RT/Attachment.pm,
-	lib/RT/CurrentUser.pm, lib/RT/Group.pm, lib/RT/Link.pm,
-	lib/RT/ObjectKeywords.pm, lib/RT/Queue.pm, lib/RT/Template.pm,
-	lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/Transaction.pm,
-	lib/RT/User.pm, lib/RT/Users.pm, lib/RT/Watchers.pm,
-	lib/RT/Interface/Email.pm, tools/insertdata,
-	webrt/Admin/Elements/CreateQueueCalled,
-	webrt/Admin/Elements/CreateUserCalled,
-	webrt/Admin/Elements/GrantQueueRightsTo,
-	webrt/Admin/Elements/ModifyKeywordSelect,
-	webrt/Admin/Elements/ModifyQueue,
-	webrt/Admin/Elements/ModifyTemplate,
-	webrt/Admin/Elements/ModifyUser,
-	webrt/Admin/Elements/SelectModifyQueue,
-	webrt/Admin/Elements/SelectModifyUser,
-	webrt/Admin/Elements/SelectTemplate,
-	webrt/Admin/Elements/SelectUsers, webrt/Admin/Global/Scrips.html,
-	webrt/Admin/Global/Template.html,
-	webrt/Admin/Global/Templates.html,
-	webrt/Admin/Global/UserRights.html,
-	webrt/Admin/Groups/Members.html,
-	webrt/Admin/KeywordSelects/index.html, webrt/Admin/Queues/ACL.html,
-	webrt/Admin/Queues/Create.html, webrt/Admin/Queues/Keywords.html,
-	webrt/Admin/Queues/Modify.html, webrt/Admin/Queues/People.html,
-	webrt/Admin/Queues/Scrips.html, webrt/Admin/Queues/Template.html,
-	webrt/Admin/Queues/Templates.html, webrt/Admin/Queues/index.html,
-	webrt/Admin/Users/Modify.html, webrt/Admin/Users/Prefs.html,
-	webrt/Admin/Users/index.html, webrt/Elements/Header,
-	webrt/Elements/MyRequests, webrt/Elements/MyTickets,
-	webrt/Elements/Quicksearch, webrt/Elements/SelectNewTicketQueue,
-	webrt/Elements/SelectOwner, webrt/Elements/SelectQueue,
-	webrt/Elements/SelectUsers, webrt/SelfService/Details.html,
-	webrt/SelfService/Elements/Header,
-	webrt/SelfService/Elements/MyRequests,
-	webrt/SelfService/Elements/ShowTransaction,
-	webrt/Ticket/Create.html, webrt/Ticket/ModifyLinks.html,
-	webrt/Ticket/autohandler, webrt/Ticket/Elements/AddWatchers,
-	webrt/Ticket/Elements/ShowBasics, webrt/Ticket/Elements/ShowDates,
-	webrt/Ticket/Elements/ShowDependencies,
-	webrt/Ticket/Elements/ShowLinks, webrt/Ticket/Elements/ShowPeople,
-	webrt/Ticket/Elements/ShowReferences,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	In prep for a true schema freeze, I fixed a number of attribute names that were troublesome for
-	one reason or another.
-	
-	        Queue->QueueId and User->UserId have been changed to Queue->Name and User->Name, so
-	        as not to conflict with queue->id and user->id any more.  A number of tables
-	        used "Alias" and "Title" and things like that, rather than the somewhat
-	        more standard "Name" and "Description"
-	
-	Abstracted a bunch of the CLI setup stuff out into lib/RT/Interface/CLI
-	
-	Abstracted some of the core DB startup code into RT.pm
-	
-	fixed the makefile to handle the new rtadmin.
-	
-	lots of updates to the new rtadmin (which works for user editing!)
-	
-	fixed a bug in ObjectKeywords->LoadByName....
-	
-2001-01-19 04:23  jesse
-
-	* bin/rtadmin:
-
-	A bit of cleanup and a bit more docs.  it's now actually implementable with getopt::long
-	
-2001-01-19 04:16  jesse
-
-	* bin/rtadmin:
-
-	file rtadmin was initially added on branch rt-1-1.
-	
-2001-01-19 04:16  jesse
-
-	* bin/rtadmin:
-
-	Docced the proposed cli for the new rtadmin tool. It's rather more intense than I'd intended
-	
-2001-01-19 02:15  jesse
-
-	* lib/RT/User.pm:
-
-	Fixed ACL bug that prevented by-group auth from working
-	
-2001-01-19 00:52  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/User.pm, webrt/SelfService/Details.html:
-
-	Work on SelfService (fixing the a permission denied bug)
-	
-2001-01-19 00:21  jesse
-
-	* webrt/NoAuth/webrt.css:
-
-	file webrt.css was initially added on branch rt-1-1.
-	
-2001-01-19 00:21  jesse
-
-	* webrt/: webrt.css, Elements/Header, NoAuth/webrt.css,
-	SelfService/Details.html, SelfService/Elements/Header:
-
-	webui cleanups
-	
-2001-01-19 00:07  jesse
-
-	* bin/rt:
-
-	bug-fixing in bin/rt
-	
-2001-01-18 23:47  jesse
-
-	* lib/RT/Link.pm, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	webrt/Ticket/ModifyLinks.html, webrt/Ticket/Elements/ShowLinks,
-	webrt/Ticket/Elements/ShowMembers,
-	webrt/Ticket/Elements/ShowReferences,
-	webrt/Ticket/Elements/ShowSummary:
-
-	A bunch of work on links.
-	API cleanups.
-	Ticket-> Members and MemberOf  now return Links objects rather than Tickets Objects
-	Edit links via the webui works now
-	
-2001-01-18 15:11  jesse
-
-	* HACKING, docs/API:
-
-	Added a bit more documentation and philosophy
-	to the API file. yanked tobix' old out of date "HACKING"
-	doc
-	
-2001-01-18 03:18  jesse
-
-	* Makefile, NEWS:
-
-	Headers in incoming mail are now parsed case insensitively.
-	
-	Version is now 1.0.7
-	
-2001-01-17 16:41  jesse
-
-	* Makefile, tools/testdeps:
-
-	updated searchbuilder dependency in testdeps
-	
-	revved version in Makefile for release.
-	
-2001-01-17 14:27  jesse
-
-	* Makefile, bin/rt, lib/RT/Date.pm:
-
-	Fixed #45 Permissions bug on redhat 6.0
-	Fixed #51 RT CLI doesn't check for valid user
-	
-	Implemented a bunch more searching in bin/rt
-	
-	Refactored RT::Date a bit.
-	
-	Fixed some unreported permissions eits.
-	
-2001-01-16 11:43  jesse
-
-	* webrt/Ticket/Elements/: ShowLinks, ShowMemberOf, ShowMembers,
-	ShowPeople, ShowSummary:
-
-	Cleaned up and shortened the Ticket Display screen
-	
-2001-01-16 10:56  jesse
-
-	* lib/RT/Ticket.pm, webrt/Ticket/Modify.html:
-
-	Cleaned up and better documented Ticket->SetStatus
-	Ticket/Modify.html got rid of a whole bunch of evals.
-	
-2001-01-15 23:57  jesse
-
-	* Makefile, lib/MANIFEST, lib/RT/Tickets.pm:
-
-	Removed a deleted file from the manifest. revved the version
-	
-2001-01-15 15:19  jesse
-
-	* lib/RT/: KeywordSelect.pm, Queue.pm:
-
-	Adding the ability to load keyword selects by name.
-	
-2001-01-15 03:49  jesse
-
-	* lib/RT/Ticket.pm, webrt/Ticket/Elements/EditKeywordSelects:
-
-	keyword display now cleaner. doesn't force you to select a keyword if none
-	is selected yet.
-	
-2001-01-15 03:36  jesse
-
-	* lib/RT/Ticket.pm:
-
-	SetQueue is no-longer heinously broken. thanks eoin
-	
-2001-01-15 03:10  jesse
-
-	* lib/RT/: Queue.pm, User.pm, Action/Notify.pm, Action/Spam.pm:
-
-	removed an old RT::Action that didn't actually do anything useful these days.  it'll get replaced later.
-	
-	Scrips which sign watchers up for things _actually seem to work_
-	(required some frobbing of watchers)
-	
-2001-01-15 02:44  jesse
-
-	* bin/rt, etc/schema.pm, lib/RT/ObjectKeywords.pm, lib/RT/Queue.pm,
-	lib/RT/Template.pm, lib/RT/Ticket.pm, lib/RT/Tickets.pm,
-	lib/RT/Watchers.pm, webrt/Elements/ViewUser,
-	webrt/Ticket/Elements/ShowRequestor:
-
-	Added a 'Type' column to templates, to more easily allow for insertable templates for quick responses from customer service folks ,etc.
-	Reworked a bunch of the watchers code to not do its own potentially very bogus caching and to reuse more core code.
-	Oh. and it always returns the expected object type now.
-	
-	Redid tobias' old "ViewUser" box to use a set of tickets, rather than a bogus search for watchers (ignoring tickets).
-	
-	Fixed a bug in searching for tickets by watcher.
-	
-2001-01-15 00:53  jesse
-
-	* bin/rt, webrt/Elements/SelectOwner, webrt/Elements/TitleBoxStart,
-	webrt/NoAuth/Login.html, webrt/Ticket/Elements/ShowSummary:
-
-	Added a bunch of doc to bin/rt. probably should have check to see if it runs ;)
-	TitleBoxStart got the attributes:  class, title_href and titleright_href. makes calls to it cleaner.
-	showsummary got a few more links to the places things should go.
-	selectOwner now will actually default to nobody if that's the right value.
-	
-2001-01-13 03:22  jesse
-
-	* TODO:
-
-	Changed the TODO file to point to the current TODO list
-	
-2001-01-13 03:18  jesse
-
-	* Makefile:
-
-	Bumped version # for release
-	
-2001-01-13 03:11  jesse
-
-	* bin/rtmux.pl, lib/RT/Queue.pm, lib/RT/Action/SendEmail.pm:
-
-	Fixing a couple minor things in rtmux and Queue.pm so that the mail interfaces work ok.
-	
-2001-01-13 02:34  jesse
-
-	* lib/RT/User.pm:
-
-	Added the ability to generate a random password to RT::User.  we don't yet
-	have a nice way to email this information to the user. which is a real bummer.
-	
-2001-01-12 17:35  jesse
-
-	* etc/config.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
-	lib/RT/Interface/Web.pm, webrt/Admin/Users/Modify.html,
-	webrt/SelfService/Create.html, webrt/SelfService/Details.html,
-	webrt/SelfService/Elements/Header, webrt/SelfService/Elements/Tabs:
-
-	Made ACLs for 'Everyone' work. fixed a few other small ACL bugs.
-	Made the 'Requestor-mode' ticket create tool work.
-	
-2001-01-12 12:27  jesse
-
-	* webrt/Elements/: SelectDate, SelectOwner:
-
-	Commented out unimplemented select relative date bits.
-	SelectOwner now lets you pick nobody.
-	
-2001-01-12 03:16  jesse
-
-	* bin/rt, bin/rtmux.pl, lib/RT/Ticket.pm, tools/testdeps:
-
-	Comments and Correspondence work from the cli now. with and without --source (for source data) and --no-edit (to disable invocation of $EDITOR)
-	
-	rt and rtmux.pl now drop setgidness as soon as they can. it's happier this
-	way. really :)
-	
-	testdeps now installs File::Temp, which is needed to do safe tempfile usage.
-	
-2001-01-12 00:11  jesse
-
-	* webrt/Elements/: MyRequests, MyTickets:
-
-	Bug fix for #47 (Id flows into subject on 'home' screen)
-	
-2001-01-11 03:34  jesse
-
-	* webrt/Elements/Header:
-
-	Removed extra spaces from the header
-	
-2001-01-11 02:57  jesse
-
-	* webrt/Elements/SelectOwner:
-
-	Made SelectOwner actually show all the right people
-	
-2001-01-11 02:53  jesse
-
-	* tools/testdeps:
-
-	Added a requirement for the current DBIx::SearchBuilder to testdeps
-	
-2001-01-11 02:28  jesse
-
-	* Makefile:
-
-	revved the version for distribution
-	
-2001-01-11 02:28  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Interface/Web.pm,
-	webrt/Elements/Quicksearch, webrt/Elements/TitleBoxStart,
-	webrt/Ticket/Display.html, webrt/Ticket/Elements/EditBasics:
-
-	fixed a couple of UI bugs. the 'quick' links in the web ticket view should now all work.
-	Logger->warn  -> Logger->warning in the web ui
-	
-2001-01-10 17:42  jesse
-
-	* Makefile:
-
-	Bumped to 1.3.33
-	
-2001-01-10 01:46  jesse
-
-	* webrt/Ticket/Attachment/dhandler:
-
-	Date: Wed, 10 Jan 2001 16:22:43 +1000 (EST)                                     From: Byron Ellacott <bje@apnic.net>                                            To: rt-devel@fsck.com                                                           Subject: Re: [rt-devel] [rt-announce] RT 1.3.30 released                        List-Id: RT Development <rt-devel.lists.fsck.com>                                                                                                               [-- Attachment #1 --]                                                           [-- Type: text/PLAIN, Encoding: 7bit, Size: 0.7K --]                                                                                                            On Wed, 3 Jan 2001, Jesse wrote:                                                                                                                                [snip]                                                                                                                                                          I noticed 1-3-31 sitting around, so I installed that.  I'm giving a             demonstration tomorrow, so I've been running through the web UI.  I             noticed a problem with attachments - HTML::Mason was munging everything to      be HTML-nice, but a jpg doesn't display if its < characters are changed to      &lt;, and it's not good to have </BODY></HTML> on the end of binary             attachments.
-	
-2001-01-10 00:24  jesse
-
-	* Makefile:
-
-	Revved the version to 1.3.32
-	
-2001-01-09 23:57  jesse
-
-	* webrt/Admin/Users/Rights.html:
-
-	file Rights.html was initially added on branch rt-1-1.
-	
-2001-01-09 23:57  jesse
-
-	* lib/RT/Record.pm, lib/RT/User.pm, lib/RT/Interface/Email.pm,
-	tools/insertdata, webrt/Admin/Elements/UserTabs,
-	webrt/Admin/Users/Modify.html, webrt/Admin/Users/Rights.html,
-	webrt/Elements/Quicksearch, webrt/Elements/TitleBoxEnd,
-	webrt/Elements/TitleBoxStart:
-
-	Did some work on User creation to check for duplicate userids on create.
-	Better user create error checking.
-	Switched the TitleBox UI to a compromise between new and old.
-	
-	Did a bit of ui work on web based user modification
-	
-2001-01-09 02:15  jesse
-
-	* Makefile, lib/RT/User.pm, tools/insertdata,
-	webrt/Admin/Users/Modify.html:
-
-	shuffling around hte user password stuff. hopefully the user modification issues seen in 1.3.30 will be fixed.
-	
-2001-01-09 00:48  jesse
-
-	* webrt/Ticket/History.html:
-
-	file History.html was initially added on branch rt-1-1.
-	
-2001-01-09 00:48  jesse
-
-	* docs/keywords:
-
-	file keywords was initially added on branch rt-1-1.
-	
-2001-01-09 00:48  jesse
-
-	* bin/mason_handler.scgi:
-
-	file mason_handler.scgi was initially added on branch rt-1-1.
-	
-2001-01-09 00:48  jesse
-
-	* Makefile, bin/mason_handler.scgi, bin/webmux.pl, docs/keywords,
-	lib/RT/Tickets.pm, lib/RT/Interface/Web.pm,
-	webrt/Admin/Elements/GrantQueueRightsTo~,
-	webrt/Ticket/History.html:
-
-	Started to write out notes on a testsuite.
-	Started work on a CGI/SpeedyCGI frontend
-	added a file that was missing in 1.3.30
-	
-2001-01-08 14:04  jesse
-
-	* NEWS, README:
-
-	Added a web based due-date patch.
-	
-2001-01-06 15:17  jesse
-
-	* etc/schema.pm:
-
-	Added 'Deleted' attributes for tables whose entries can not be safely
-	removed from the database for ref. integrity problems.
-	
-2001-01-03 23:07  jesse
-
-	* Makefile:
-
-	Bumped version to 1.3.30
-	
-2001-01-03 23:02  jesse
-
-	* tools/testdeps:
-
-	file testdeps was initially added on branch rt-1-1.
-	
-2001-01-03 23:02  jesse
-
-	* README, bin/testdeps.pl, lib/Makefile.PL, tools/testdeps,
-	webrt/Elements/TitleBoxStart:
-
-	a bit of quick UI work.
-	an update to depend on DBIx::SearchBuilder 0.15 (just releaseD)
-	testdeps moved to tools
-	
-2001-01-03 03:21  jesse
-
-	* bin/rt, lib/RT/Tickets.pm:
-
-	ticket searches for integers are a bit more flexible now (and the code's tighter)
-	
-	the rtq section of the new bin/rt appears functional, if underdocced.
-	
-2001-01-02 22:55  jesse
-
-	* lib/RT/Tickets.pm, lib/RT/Interface/Web.pm,
-	webrt/Search/PickRestriction:
-
-	Imported ivan's keyword search patch, along with a modification to allow
-	for _not_ selecting keywords.
-	
-2001-01-02 21:45  jesse
-
-	* Makefile, bin/testdeps.pl, lib/RT/KeywordSelect.pm,
-	lib/RT/ObjectKeyword.pm, lib/RT/ObjectKeywords.pm,
-	lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/Watchers.pm,
-	lib/RT/Interface/Web.pm, tools/insertdata, webrt/webrt.css,
-	webrt/Elements/Header, webrt/Elements/TitleBoxStart,
-	webrt/Elements/ViewUser, webrt/Search/Listing.html,
-	webrt/Search/PickRestriction, webrt/Ticket/Create.html,
-	webrt/Ticket/Display.html, webrt/Ticket/Elements/ShowBasics,
-	webrt/Ticket/Elements/ShowSummary,
-	webrt/Ticket/Elements/ShowTransaction, webrt/Ticket/Elements/Tabs:
-
-	Fixed a warning in testdeps (Well, worked around it, anyway)
-	Added some helper functions for keywords and keyword selects.
-	
-	did a bunch of UI cleanup. started to color-code the webui
-	
-	started work on a generic queue listing format in Tickets.pm
-	
-2001-01-02 15:02  jesse
-
-	* webrt/SelfService/Elements/ShowTransaction:
-
-	file ShowTransaction was initially added on branch rt-1-1.
-	
-2001-01-02 15:02  jesse
-
-	* webrt/SelfService/: Create.html, Details.html,
-	Elements/GotoTicket, Elements/Header, Elements/ShowTransaction,
-	Elements/Tabs:
-
-	Fleshed out more of the requestor UI.
-	It's good enough for the alpha. yay!
-	
-2001-01-02 15:02  jesse
-
-	* webrt/SelfService/Elements/GotoTicket:
-
-	file GotoTicket was initially added on branch rt-1-1.
-	
-2001-01-01 19:06  jesse
-
-	* webrt/Ticket/: Modify.html, ModifyDates.html, ModifyPeople.html,
-	Elements/EditBasics, Elements/EditKeywordSelects,
-	Elements/ShowDates, Elements/ShowSummary:
-
-	Even yet still more Technicolor!
-	
-2001-01-01 18:42  jesse
-
-	* webrt/NoAuth/images/spacer.gif:
-
-	file spacer.gif was initially added on branch rt-1-1.
-	
-2001-01-01 18:42  jesse
-
-	* webrt/NoAuth/Reminder.html:
-
-	file Reminder.html was initially added on branch rt-1-1.
-	
-2001-01-01 18:42  jesse
-
-	* webrt/Elements/Section:
-
-	file Section was initially added on branch rt-1-1.
-	
-2001-01-01 18:42  jesse
-
-	* lib/RT/CurrentUser.pm, lib/RT/KeywordSelect.pm, webrt/webrt.css,
-	webrt/Admin/Keywords/index.html, webrt/Admin/Queues/People.html,
-	webrt/Elements/Header, webrt/Elements/ListActions,
-	webrt/Elements/MyRequests, webrt/Elements/MyTickets,
-	webrt/Elements/Section, webrt/Elements/Submit,
-	webrt/Elements/TitleBoxEnd, webrt/Elements/TitleBoxStart,
-	webrt/NoAuth/Login.html, webrt/NoAuth/Reminder.html,
-	webrt/NoAuth/images/spacer.gif, webrt/Ticket/Display.html,
-	webrt/Ticket/ModifyPeople.html, webrt/Ticket/Elements/ShowSummary,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	A bunch of UI work.
-	Ticket Display is significantly different. and _much_ faster loading.
-	A color style guide for the web ui is forthcoming.
-	
-	removed a Die from CurrentUser.
-	
-2000-12-30 03:27  jesse
-
-	* webrt/Elements/Tabs:
-
-	fixed a ui nit from ivan
-	
-2000-12-30 03:03  jesse
-
-	* webrt/Ticket/Elements/ShowSummary:
-
-	fixed a hyperlink.
-	
-2000-12-30 00:07  jesse
-
-	* Makefile:
-
-	bumped version for release
-	
-2000-12-30 00:03  jesse
-
-	* etc/config.pm, lib/RT/User.pm,
-	webrt/Admin/Elements/ModifyKeywordSelect,
-	webrt/Admin/Global/Keywords.html,
-	webrt/Admin/KeywordSelects/index.html,
-	webrt/Admin/Keywords/Modify.html, webrt/Admin/Keywords/index.html,
-	webrt/Admin/Queues/Keywords.html, webrt/Admin/Users/index.html:
-
-	Fixed a bug in keyword creation that caused urls and param values to get buggered.
-	
-	Passwords are now encrypted in the database
-	
-2000-12-29 05:54  jesse
-
-	* bin/rt, lib/RT/Link.pm, lib/RT/Ticket.pm,
-	lib/RT/Interface/Web.pm, webrt/Ticket/Display.html,
-	webrt/Ticket/Elements/ShowDependencies,
-	webrt/Ticket/Elements/ShowLinks:
-
-	Did a bunch of work on the linking interface. It's now got
-	a much easier API. and it's twice as functional (you can delete links)
-	
-	Did the proof-of concept for the link code in the CLI. it'll need
-	fleshing out tomorrow.
-	
-	Fleshed out other parts of the CLI.
-	
-	stayed up way too late.
-	
-2000-12-29 00:30  jesse
-
-	* Makefile, bin/rt, lib/RT/Keyword.pm, lib/RT/Ticket.pm:
-
-	Added keyword support to the CLI.
-	fixed a couple of Keyword core bugs
-	
-2000-12-28 03:56  jesse
-
-	* bin/rt, bin/testdeps.pl, lib/RT/Keyword.pm,
-	lib/RT/KeywordSelect.pm, lib/RT/User.pm:
-
-	Removed unused keyword related code. added in a bit of
-	new keyword related code to get "relative" paths of keywords.
-	
-	fixed a longstanding warning in ACL checking.
-	
-	first 1/2 of keywords support for the new rt cli.
-	
-	added Tie::IxHash to testdeps.pl (keywords needs it)
-	
-2000-12-27 02:19  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	missed a comma
-	
-2000-12-27 01:21  jesse
-
-	* webrt/Admin/Global/Keywords.html:
-
-	file Keywords.html was initially added on branch rt-1-1.
-	
-2000-12-27 01:21  jesse
-
-	* etc/schema.pm, lib/RT/ACE.pm, lib/RT/KeywordSelect.pm,
-	lib/RT/KeywordSelects.pm, lib/RT/Queue.pm, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm, webrt/Admin/Elements/SystemTabs,
-	webrt/Admin/Global/Keywords.html, webrt/Admin/Queues/Keywords.html,
-	webrt/Ticket/Create.html, webrt/Ticket/ModifyPeople.html,
-	webrt/Ticket/Elements/EditKeywordSelects,
-	webrt/Ticket/Elements/ShowKeywordSelects,
-	webrt/Ticket/Elements/ShowSummary,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Added the ability to name keyword selects.
-	first round of ACLing for keywords.
-	
-	Added the ability to create KeywordSelects which apply to all queues (Rather than just
-	a single queue)
-	
-	misc bigfixes.
-	
-2000-12-26 02:56  jesse
-
-	* webrt/Elements/SelectKeywordOptions:
-
-	file SelectKeywordOptions was initially added on branch rt-1-1.
-	
-2000-12-26 02:56  jesse
-
-	* webrt/Admin/Keywords/index.html:
-
-	file index.html was initially added on branch rt-1-1.
-	
-2000-12-26 02:56  jesse
-
-	* webrt/Admin/Queues/Keywords.html:
-
-	file Keywords.html was initially added on branch rt-1-1.
-	
-2000-12-26 02:56  jesse
-
-	* webrt/Elements/SelectKeyword:
-
-	file SelectKeyword was initially added on branch rt-1-1.
-	
-2000-12-26 02:56  jesse
-
-	* bin/webmux.pl, etc/schema.pm, lib/RT/Keyword.pm,
-	lib/RT/KeywordSelect.pm, lib/RT/KeywordSelects.pm,
-	lib/RT/Keywords.pm, lib/RT/ObjectKeyword.pm,
-	lib/RT/ObjectKeywords.pm, lib/RT/Queue.pm, lib/RT/Ticket.pm,
-	lib/RT/Watchers.pm, webrt/Admin/Elements/ModifyKeyword,
-	webrt/Admin/Elements/ModifyKeywordSelect,
-	webrt/Admin/Elements/QueueTabs, webrt/Admin/Elements/Tabs,
-	webrt/Admin/KeywordSelects/index.html,
-	webrt/Admin/Keywords/Modify.html, webrt/Admin/Keywords/index.html,
-	webrt/Admin/Queues/Keywords.html, webrt/Elements/SelectKeyword,
-	webrt/Elements/SelectKeywordOptions, webrt/Ticket/Modify.html,
-	webrt/Ticket/Elements/EditKeywordSelects,
-	webrt/Ticket/Elements/ShowKeywordSelects:
-
-	My first pass at making the keywords stuff work more like the rest of the RT core.
-	A couple of minor fixes on non-keywords things, but mostly this was an
-	edit of the keywords code to:
-		1. make the admin UI work more like the rest of the admin ui
-		(still need to do "global" keyword selections)
-	
-		2. bring the coding style of the keywords stuff more into line
-		with the rest of the codebase
-	
-		3. flesh out the helper methods in the keywords modules.
-	
-2000-12-24 02:04  jesse
-
-	* lib/RT/: Keyword.pm, KeywordSelect.pm, ObjectKeyword.pm:
-
-	A first round of commentary and cleanup on a few modules
-	
-2000-12-24 01:34  jesse
-
-	* webrt/Ticket/Elements/ShowKeywordSelects:
-
-	file ShowKeywordSelects was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* webrt/Ticket/Elements/EditKeywordSelects:
-
-	file EditKeywordSelects was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* webrt/Admin/: KeywordSelects/Modify.html, Keywords/Modify.html:
-
-	file Modify.html was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* webrt/Admin/KeywordSelects/index.html:
-
-	file index.html was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* webrt/Admin/Elements/ModifyKeyword:
-
-	file ModifyKeyword was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* webrt/Admin/Elements/ModifyKeywordSelect:
-
-	file ModifyKeywordSelect was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* webrt/Admin/Elements/SelectModifyKeyword:
-
-	file SelectModifyKeyword was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* webrt/Admin/Elements/SelectModifyKeywordSelect:
-
-	file SelectModifyKeywordSelect was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/RT/ObjectKeyword.pm:
-
-	file ObjectKeyword.pm was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/RT/Keyword.pm:
-
-	file Keyword.pm was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/RT/KeywordSelect.pm:
-
-	file KeywordSelect.pm was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/test.pl:
-
-	file test.pl was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/RT/ObjectKeywords.pm:
-
-	file ObjectKeywords.pm was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/RT/KeywordSelects.pm:
-
-	file KeywordSelects.pm was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/RT/Keywords.pm:
-
-	file Keywords.pm was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* Makefile, etc/acl.Pg, etc/schema.pm, lib/MANIFEST,
-	lib/MANIFEST.SKIP, lib/Makefile.PL, lib/RT.pm, lib/test.pl,
-	lib/RT/Keyword.pm, lib/RT/KeywordSelect.pm,
-	lib/RT/KeywordSelects.pm, lib/RT/Keywords.pm,
-	lib/RT/ObjectKeyword.pm, lib/RT/ObjectKeywords.pm,
-	lib/RT/Ticket.pm, webrt/Admin/Elements/ModifyKeyword,
-	webrt/Admin/Elements/ModifyKeywordSelect,
-	webrt/Admin/Elements/SelectModifyKeyword,
-	webrt/Admin/Elements/SelectModifyKeywordSelect,
-	webrt/Admin/Elements/Tabs, webrt/Admin/KeywordSelects/Modify.html,
-	webrt/Admin/KeywordSelects/index.html,
-	webrt/Admin/Keywords/Modify.html, webrt/Ticket/Modify.html,
-	webrt/Ticket/Elements/EditBasics,
-	webrt/Ticket/Elements/EditKeywordSelects,
-	webrt/Ticket/Elements/ShowKeywordSelects,
-	webrt/Ticket/Elements/ShowSummary:
-
-	Importing two largish patches from ivan@420.am:
-		First up, ivan switched lib/RT over to using MakeMaker..so now
-		we get man pages for the core modules and a bunch of other cool stuff.
-	
-		Second: ivan handed us an almost complete keywords system.  Over the next
-		week or two, I'm going to be adding ACL support to the keywords system
-		and starting to integrate bits of it better into the rest of the core
-		(though it's nearly all done already).
-	
-			Thanks, ivan!
-	
-2000-12-24 01:34  jesse
-
-	* lib/MANIFEST:
-
-	file MANIFEST was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/Makefile.PL:
-
-	file Makefile.PL was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/RT.pm:
-
-	file RT.pm was initially added on branch rt-1-1.
-	
-2000-12-24 01:34  jesse
-
-	* lib/MANIFEST.SKIP:
-
-	file MANIFEST.SKIP was initially added on branch rt-1-1.
-	
-2000-12-23 23:45  jesse
-
-	* Makefile, webrt/Ticket/Elements/Tabs:
-
-	made the links in the ticket tool bar point to the right places.
-	
-2000-12-23 23:15  jesse
-
-	* lib/RT/Ticket.pm:
-
-	fixing a typo and the docs.
-	
-2000-12-23 23:12  jesse
-
-	* lib/RT/Ticket.pm:
-
-	the internal function _SetTold shouldn't be hitting an ACL check.
-	
-2000-12-23 17:37  jesse
-
-	* lib/RT/Ticket.pm, webrt/Ticket/Display.html,
-	webrt/Ticket/Modify.html, webrt/Ticket/ModifyDates.html,
-	webrt/Ticket/ModifyLinks.html, webrt/Ticket/ModifyPeople.html,
-	webrt/Ticket/Update.html, webrt/Ticket/Elements/Tabs,
-	webrt/Ticket/Elements/TicketToolBox:
-
-	Cleaned up a bit of date diff related functionality.
-	
-	Did work on the ticket tool bar.
-	
-2000-12-23 16:46  jesse
-
-	* lib/RT/Record.pm:
-
-	Lets try that again..
-	
-2000-12-23 16:39  jesse
-
-	* lib/RT/Record.pm:
-
-	LongSinceUpdatedAsString is now actually relative :)
-	
-2000-12-23 16:09  jesse
-
-	* lib/RT/Tickets.pm:
-
-	added a default to LimitStatus.
-	
-2000-12-23 01:47  jesse
-
-	* bin/: rt, testdeps.pl:
-
-	updated testdeps to require the latest mason (for ease of debugging)
-	the new combined bin/rt actually implements the behavior of rtq and rt -show
-	fully (I believe). next up, more ticket modification and a code cleanup
-	
-2000-12-22 18:37  jesse
-
-	* Makefile:
-
-	bumped to 1.3.28 for release
-	
-2000-12-19 22:38  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/Transaction.pm,
-	lib/RT/Interface/Web.pm, webrt/Elements/Tabs,
-	webrt/Ticket/ModifyPeople.html, webrt/Ticket/Elements/EditPeople,
-	webrt/User/Prefs.html:
-
-	Removed outdated CC request to and BCC request to
-	did some UI touchups.
-	
-	started a bit of work in tickets.pm for the new CLI (more explicit searching)
-	
-2000-12-19 21:50  jesse
-
-	* bin/rt:
-
-	Modifying ticket requestors from the commandline works. yay.
-	Simplified the commandline arguments a bit too.
-	
-2000-12-19 18:37  jesse
-
-	* bin/: mason_handler.fcgi, webmux.pl:
-
-	updaes to webmux.pl to work on with new versions of HTML::Mason
-	
-2000-12-19 14:05  jesse
-
-	* webrt/Ticket/Display.html:
-
-	Fixed a bug in Ticket/Display.html that caused navigation not to work within new tickets.
-	
-2000-12-19 04:03  jesse
-
-	* bin/rt:
-
-	implemented --history (show ticket history)
-	and --limit-status (limit to a ticket status)
-	just to make sure that this works at all.  it does.
-	
-	With the new ui, you'll be able to trivially perform actions on large #s of tickets.
-	
-2000-12-19 03:38  jesse
-
-	* bin/rt:
-
-	After playing with a few Getopt variants, I've settled on Getopt::Long for now...
-	and implemented the skeleton of the new RT cli.  I suspect that with another day's work,
-	it should be mostly functional. yay.
-	
-2000-12-19 03:38  jesse
-
-	* bin/rt:
-
-	file rt was initially added on branch rt-1-1.
-	
-2000-12-18 19:34  jesse
-
-	* docs/design_docs/cli_spec:
-
-	file cli_spec was initially added on branch rt-1-1.
-	
-2000-12-18 19:34  jesse
-
-	* docs/design_docs/cli_spec:
-
-	Added the CLI spec from deborah.
-	
-2000-12-18 02:11  jesse
-
-	* webrt/Elements/: CreateTicket, GotoTicket:
-
-	Fixed a basepath error.
-	
-2000-12-18 01:19  jesse
-
-	* webrt/Elements/CreateTicket:
-
-	file CreateTicket was initially added on branch rt-1-1.
-	
-2000-12-18 01:19  jesse
-
-	* webrt/Elements/GotoTicket:
-
-	file GotoTicket was initially added on branch rt-1-1.
-	
-2000-12-18 01:19  jesse
-
-	* README, webrt/Admin/Queues/Modify.html,
-	webrt/Admin/Users/Modify.html, webrt/Elements/CreateTicket,
-	webrt/Elements/GotoTicket, webrt/Search/Listing.html:
-
-	A few more changes from Lee Ann and a couple of files I missed on the earlier  checkins.
-	
-2000-12-18 01:14  jesse
-
-	* webrt/Admin/Groups/Rights.html:
-
-	file Rights.html was initially added on branch rt-1-1.
-	
-2000-12-18 01:14  jesse
-
-	* webrt/Admin/Groups/: Members.html, Rights.html:
-
-	a couple UI tweaks from Lee Ann Goldstein
-	
-2000-12-18 00:51  jesse
-
-	* webrt/: Admin/Elements/SystemTabs, Admin/Groups/index.html,
-	Admin/Users/index.html, Elements/Submit, Elements/Tabs:
-
-	More UI hacking. whee
-	
-2000-12-17 23:55  jesse
-
-	* webrt/: Elements/SelectNewTicketQueue, Elements/SelectOwner,
-	Elements/Tabs, Ticket/Create.html, Ticket/Elements/Tabs:
-
-	ui hacking to add the "Create Ticket" and "Goto Ticket" ui elements at the top.
-	
-2000-12-17 22:17  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	webrt/Elements/MessageBox, webrt/Ticket/Modify.html,
-	webrt/Ticket/ModifyPeople.html:
-
-	Fixing bugs 7,8,28
-	
-2000-12-17 02:38  jesse
-
-	* webrt/Ticket/Elements/ShowDates:
-
-	*sigh* typo in ShowDates.
-	
-2000-12-17 02:34  jesse
-
-	* lib/RT/Date.pm, webrt/Ticket/Elements/EditDates,
-	webrt/Ticket/Elements/ShowDates:
-
-	A bit of work on Dates. a postgres fix from ivan and some display prettification.
-	
-2000-12-17 02:15  jesse
-
-	* Makefile, webrt/Ticket/Elements/TicketToolBox:
-
-	commeted out some toolbar actions which don't work yet.
-	
-	bumped the version to 1.3.27 for imminent release.
-	
-2000-12-17 01:51  jesse
-
-	* lib/RT/Attachment.pm:
-
-	The ACL problem on attachments was a bootstrapping issue. couldn't check acls because it
-	couldn't necessarily see what to check
-	
-2000-12-17 01:44  jesse
-
-	* lib/RT/Attachment.pm:
-
-	acl fix for attachments.
-	
-2000-12-17 01:15  jesse
-
-	* lib/RT/Ticket.pm:
-
-	fixing ugly disgusting ACL bugs
-	
-2000-12-17 00:35  jesse
-
-	* lib/RT/Transaction.pm, lib/RT/User.pm,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Fixing bugs in Transaction ACLs.
-	
-2000-12-16 03:56  jesse
-
-	* webrt/Admin/Groups/Members.html:
-
-	ui nit in admin/groups/members.
-	
-2000-12-16 03:31  jesse
-
-	* lib/RT/: Group.pm, GroupMember.pm:
-
-	$object->$SUPER::Foo is wrong. $object->SUPER::Foo is not.
-	
-2000-12-16 03:28  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Rights checks for ticket ownership work best when the right that's set is the same
-	as the right that's checked for *sigh*
-	
-2000-12-16 03:26  jesse
-
-	* webrt/Admin/Groups/Members.html:
-
-	Fixed a couple bugs in Group mebership administration code.
-	
-2000-12-16 03:04  jesse
-
-	* webrt/: Admin/Elements/GroupTabs, Admin/Elements/QueueTabs,
-	Admin/Elements/SystemTabs, Admin/Elements/Tabs,
-	Admin/Elements/UserTabs, Admin/Global/index.html,
-	Admin/Groups/Modify.html, Admin/Groups/index.html,
-	Admin/Queues/People.html, Admin/Queues/index.html,
-	Admin/Users/Modify.html, Admin/Users/index.html,
-	Elements/SelectWatcherType, Elements/Tabs, Ticket/Create.html,
-	Ticket/Display.html, Ticket/Elements/Tabs:
-
-	Bugfix in user admin (no longer automatically revokes "privileged status)
-	a bunch of tab-related UI cleanup. the start of tabs that reflect the current page.
-	
-	added the ability to configure queue watchers from the web ui
-	
-2000-12-16 03:04  jesse
-
-	* webrt/Admin/Queues/People.html:
-
-	file People.html was initially added on branch rt-1-1.
-	
-2000-12-16 00:58  jesse
-
-	* webrt/Admin/Users/index.html:
-
-	typo fixing.
-	
-2000-12-15 19:12  jesse
-
-	* webrt/Admin/Global/GroupRights.html:
-
-	file GroupRights.html was initially added on branch rt-1-1.
-	
-2000-12-15 19:12  jesse
-
-	* webrt/Admin/Global/UserRights.html:
-
-	file UserRights.html was initially added on branch rt-1-1.
-	
-2000-12-15 19:12  jesse
-
-	* webrt/Admin/Elements/GroupTabs:
-
-	file GroupTabs was initially added on branch rt-1-1.
-	
-2000-12-15 19:12  jesse
-
-	* lib/RT/ACE.pm, lib/RT/Group.pm, lib/RT/Groups.pm,
-	lib/RT/Record.pm, lib/RT/Scrip.pm, lib/RT/ScripAction.pm,
-	lib/RT/Ticket.pm, lib/RT/Transaction.pm, lib/RT/User.pm,
-	lib/RT/Users.pm, tools/insertdata, webrt/Admin/Elements/GroupTabs,
-	webrt/Admin/Elements/SystemTabs, webrt/Admin/Global/ACL.html,
-	webrt/Admin/Global/GroupRights.html,
-	webrt/Admin/Global/UserRights.html,
-	webrt/Admin/Groups/Members.html, webrt/Admin/Groups/Modify.html,
-	webrt/Admin/Groups/index.html, webrt/Admin/Users/Modify.html,
-	webrt/Admin/Users/index.html:
-
-	A bunch of cleanup work on Users and Groups (and a couple of small bugfixes, one
-	which might prevent install of Alpha 2) mostly aimed at improving the admin ui.
-	
-	We now have two levels of "Privileged" for a user, 1 which means "can be granted rights"
-	and 2 which means "should not be futzed with by the user"
-	
-2000-12-14 23:04  jesse
-
-	* webrt/Ticket/Attachment/dhandler:
-
-	Accidentally left out of the last rev. sorry about that.
-	
-2000-12-14 23:04  jesse
-
-	* webrt/Ticket/Attachment/dhandler:
-
-	file dhandler was initially added on branch rt-1-1.
-	
-2000-12-12 20:44  jesse
-
-	* Makefile:
-
-	Bumped version to 1.3.26. This is RT2 Alpha 2, folks.
-	
-2000-12-12 20:34  jesse
-
-	* lib/RT/Attachment.pm, lib/RT/Record.pm, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm, lib/RT/User.pm,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Attachment display in the webui now just works [tm] RT2 Alpha 2 will be rolled later tonight.
-	
-2000-12-12 19:03  jesse
-
-	* webrt/Admin/Global/Template.html:
-
-	file Template.html was initially added on branch rt-1-1.
-	
-2000-12-12 19:03  jesse
-
-	* webrt/Admin/Global/Templates.html:
-
-	file Templates.html was initially added on branch rt-1-1.
-	
-2000-12-12 19:03  jesse
-
-	* README, bin/webmux.pl, lib/RT/Attachment.pm, lib/RT/Template.pm,
-	lib/RT/Transaction.pm, webrt/Admin/Elements/SelectTemplate,
-	webrt/Admin/Elements/SystemTabs, webrt/Admin/Global/Template.html,
-	webrt/Admin/Global/Templates.html,
-	webrt/Admin/Queues/Templates.html,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Working on attachments support.
-	
-	did some work on global templates
-	
-2000-12-12 15:15  jesse
-
-	* lib/RT/Template.pm, lib/RT/Templates.pm, tools/insertdata:
-
-	Core support for system-scoped templates
-	
-2000-12-12 14:12  jesse
-
-	* webrt/Admin/: Queues/Modify.html, Users/Create.html,
-	Users/Modify.html:
-
-	Fixed queue and user creation problems.
-	
-2000-12-12 03:05  jesse
-
-	* webrt/Ticket/: Link.html, ModifyLinks.html, Elements/ShowSummary,
-	Elements/Tabs:
-
-	Brought the still basic link editing ui into conformance with the rest of the ticket ui
-	
-2000-12-12 03:05  jesse
-
-	* webrt/Ticket/ModifyLinks.html:
-
-	file ModifyLinks.html was initially added on branch rt-1-1.
-	
-2000-12-12 02:41  jesse
-
-	* webrt/Ticket/: ModifyDates.html, ModifyPeople.html:
-
-	split out the ticket modify screen into 3 more bite-sized pages.
-	
-2000-12-12 02:41  jesse
-
-	* webrt/Ticket/ModifyPeople.html:
-
-	file ModifyPeople.html was initially added on branch rt-1-1.
-	
-2000-12-12 02:41  jesse
-
-	* webrt/Ticket/ModifyDates.html:
-
-	file ModifyDates.html was initially added on branch rt-1-1.
-	
-2000-12-12 02:41  jesse
-
-	* webrt/Ticket/: Modify.html, Elements/Tabs:
-
-	[no log message]
-	
-2000-12-11 15:01  jesse
-
-	* webrt/NoAuth/Login.html:
-
-	file Login.html was initially added on branch rt-1-1.
-	
-2000-12-11 15:01  jesse
-
-	* webrt/NoAuth/Logout.html:
-
-	file Logout.html was initially added on branch rt-1-1.
-	
-2000-12-11 15:01  jesse
-
-	* webrt/: Login.html, Logout.html, autohandler, Elements/Footer,
-	Elements/Header, NoAuth/Login.html, NoAuth/Logout.html:
-
-	Moving Login and Logout around so they work right with the new NoAuth scheme
-	
-2000-12-11 05:00  jesse
-
-	* webrt/: Login.html, autohandler:
-
-	fixed a couple login bugs. implemented some logic to deal with different auth classes:
-	/NoAuth/ and /SelfService/
-	
-2000-12-11 01:46  jesse
-
-	* webrt/: rt.jpg, Elements/Header, Elements/MyRequests,
-	Elements/MyTickets, Search/Listing.html, Ticket/Create.html,
-	Ticket/Create_Detail.html, Ticket/Display.html, Ticket/Modify.html,
-	Ticket/Update.html, Ticket/Elements/ShowTransaction,
-	Ticket/Elements/Tabs, Ticket/Elements/TicketToolBox:
-
-	 Work on ticket display. we're getting there.
-	
-2000-12-10 23:53  jesse
-
-	* webrt/Admin/Queues/Template.html:
-
-	file Template.html was initially added on branch rt-1-1.
-	
-2000-12-10 23:53  jesse
-
-	* webrt/Admin/Queues/Templates.html:
-
-	file Templates.html was initially added on branch rt-1-1.
-	
-2000-12-10 23:53  jesse
-
-	* webrt/Admin/Elements/QueueTabs:
-
-	file QueueTabs was initially added on branch rt-1-1.
-	
-2000-12-10 23:53  jesse
-
-	* webrt/Admin/Elements/SystemTabs:
-
-	file SystemTabs was initially added on branch rt-1-1.
-	
-2000-12-10 23:53  jesse
-
-	* webrt/Admin/: Global/Scrips.html, Queues/Scrips.html:
-
-	file Scrips.html was initially added on branch rt-1-1.
-	
-2000-12-10 23:53  jesse
-
-	* webrt/Admin/Elements/UserTabs:
-
-	file UserTabs was initially added on branch rt-1-1.
-	
-2000-12-10 23:53  jesse
-
-	* webrt/Admin/: Global/ACL.html, Queues/ACL.html:
-
-	file ACL.html was initially added on branch rt-1-1.
-	
-2000-12-10 23:53  jesse
-
-	* webrt/Admin/Global/index.html:
-
-	file index.html was initially added on branch rt-1-1.
-	
-2000-12-10 23:53  jesse
-
-	* Makefile, webrt/index.html, webrt/Admin/ModifyUser,
-	webrt/Admin/index.html, webrt/Admin/Elements/Header,
-	webrt/Admin/Elements/QueueTabs, webrt/Admin/Elements/SystemTabs,
-	webrt/Admin/Elements/Tabs, webrt/Admin/Elements/UserTabs,
-	webrt/Admin/Global/ACL.html, webrt/Admin/Global/Scrips.html,
-	webrt/Admin/Global/index.html, webrt/Admin/Queues/ACL.html,
-	webrt/Admin/Queues/Modify.html, webrt/Admin/Queues/Scrips.html,
-	webrt/Admin/Queues/Template.html,
-	webrt/Admin/Queues/Templates.html, webrt/Admin/Queues/index.html,
-	webrt/Admin/Users/Modify.html, webrt/Admin/Users/index.html,
-	webrt/Elements/Header, webrt/Elements/Tabs:
-
-	Bunch of work on the web administration framework.
-	Lots of stuff should be much cleaner now.
-	
-2000-12-10 01:21  jesse
-
-	* Makefile:
-
-	Bumped version to 1.3.25 for release
-	
-2000-12-10 01:15  jesse
-
-	* webrt/: Elements/TitleBoxEnd, Elements/TitleBoxStart,
-	SelfService/Elements/MyRequests, SelfService/Elements/Tabs,
-	Ticket/Update.html, User/Prefs.html:
-
-	Work on SSRI and a bit of overall UI tweaking
-	
-2000-12-09 22:48  jesse
-
-	* webrt/SelfService/Elements/Header:
-
-	file Header was initially added on branch rt-1-1.
-	
-2000-12-09 22:48  jesse
-
-	* webrt/SelfService/Elements/: Header, MyRequests, Tabs:
-
-	Missed a couple files for SSRI
-	
-2000-12-09 22:48  jesse
-
-	* webrt/SelfService/Elements/MyRequests:
-
-	file MyRequests was initially added on branch rt-1-1.
-	
-2000-12-09 22:48  jesse
-
-	* webrt/SelfService/Elements/Tabs:
-
-	file Tabs was initially added on branch rt-1-1.
-	
-2000-12-09 22:43  jesse
-
-	* webrt/SelfService/Create.html:
-
-	file Create.html was initially added on branch rt-1-1.
-	
-2000-12-09 22:43  jesse
-
-	* webrt/SelfService/Details.html:
-
-	file Details.html was initially added on branch rt-1-1.
-	
-2000-12-09 22:43  jesse
-
-	* webrt/SelfService/index.html:
-
-	file index.html was initially added on branch rt-1-1.
-	
-2000-12-09 22:43  jesse
-
-	* webrt/SelfService/Closed.html:
-
-	file Closed.html was initially added on branch rt-1-1.
-	
-2000-12-09 22:43  jesse
-
-	* webrt/Elements/SelectNewTicketQueue:
-
-	file SelectNewTicketQueue was initially added on branch rt-1-1.
-	
-2000-12-09 22:43  jesse
-
-	* webrt/Admin/Groups/Members.html:
-
-	file Members.html was initially added on branch rt-1-1.
-	
-2000-12-09 22:43  jesse
-
-	* webrt/Admin/Elements/SelectUsers:
-
-	file SelectUsers was initially added on branch rt-1-1.
-	
-2000-12-09 22:43  jesse
-
-	* lib/RT/CurrentUser.pm, lib/RT/Group.pm, lib/RT/GroupMember.pm,
-	lib/RT/Record.pm, lib/RT/User.pm, lib/RT/Users.pm,
-	webrt/Login.html, webrt/autohandler,
-	webrt/Admin/Elements/SelectModifyGroup,
-	webrt/Admin/Elements/SelectUsers, webrt/Admin/Groups/Members.html,
-	webrt/Admin/Groups/Modify.html, webrt/Admin/Groups/index.html,
-	webrt/Admin/Users/Modify.html, webrt/Admin/Users/index.html,
-	webrt/Elements/Header, webrt/Elements/SelectNewTicketQueue,
-	webrt/SelfService/Closed.html, webrt/SelfService/Create.html,
-	webrt/SelfService/Details.html, webrt/SelfService/index.html,
-	webrt/User/Prefs.html:
-
-	First rev of SSRI, the Self Service Requestor Interface.
-	Did a bunch of work on groups and the admin UI
-	
-2000-12-05 23:24  jesse
-
-	* webrt/Admin/Groups/Modify.html:
-
-	file Modify.html was initially added on branch rt-1-1.
-	
-2000-12-05 23:24  jesse
-
-	* webrt/Admin/Groups/index.html:
-
-	file index.html was initially added on branch rt-1-1.
-	
-2000-12-05 23:24  jesse
-
-	* webrt/Admin/Elements/SelectModifyGroup:
-
-	file SelectModifyGroup was initially added on branch rt-1-1.
-	
-2000-12-05 23:24  jesse
-
-	* lib/RT/Action/NotifyAsComment.pm:
-
-	file NotifyAsComment.pm was initially added on branch rt-1-1.
-	
-2000-12-05 23:24  jesse
-
-	* lib/RT/Group.pm, lib/RT/GroupMembers.pm, lib/RT/Scrip.pm,
-	lib/RT/Action/Notify.pm, lib/RT/Action/NotifyAsComment.pm,
-	lib/RT/Action/SendEmail.pm, tools/insertdata,
-	webrt/Admin/Elements/SelectModifyGroup,
-	webrt/Admin/Groups/Modify.html, webrt/Admin/Groups/index.html,
-	webrt/Admin/Queues/Modify.html, webrt/Admin/Queues/index.html:
-
-	Lots of work on groups. I think the core is basically set.  UI has been started
-	
-	Scrips got even more work and more code. they now work at least as well as
-	they ever have _and_ they now do it for the right reasons.
-	
-2000-12-02 13:44  jesse
-
-	* Makefile:
-
-	
-	fixed a local customization in the makefile
-	
-2000-12-02 13:34  jesse
-
-	* Makefile:
-
-	bumped version to 1.0.6
-	
-2000-12-02 03:22  jesse
-
-	* webrt/Ticket/Link.html:
-
-	file Link.html was initially added on branch rt-1-1.
-	
-2000-12-02 03:22  jesse
-
-	* lib/RT/Scrip.pm, lib/RT/ScripActions.pm, lib/RT/Scrips.pm,
-	webrt/Ticket/Link.html:
-
-	catching some stragglers.
-	
-2000-12-02 03:22  jesse
-
-	* lib/RT/ScripActions.pm:
-
-	file ScripActions.pm was initially added on branch rt-1-1.
-	
-2000-12-02 03:20  jesse
-
-	* webrt/Admin/Elements/SelectScripAction:
-
-	file SelectScripAction was initially added on branch rt-1-1.
-	
-2000-12-02 03:20  jesse
-
-	* webrt/Admin/Elements/SelectScripCondition:
-
-	file SelectScripCondition was initially added on branch rt-1-1.
-	
-2000-12-02 03:20  jesse
-
-	* lib/RT/: Action/Generic.pm, Condition/Generic.pm:
-
-	file Generic.pm was initially added on branch rt-1-1.
-	
-2000-12-02 03:20  jesse
-
-	* lib/RT/Condition/AnyTransaction.pm:
-
-	file AnyTransaction.pm was initially added on branch rt-1-1.
-	
-2000-12-02 03:20  jesse
-
-	* lib/RT/Condition/NewDependency.pm:
-
-	file NewDependency.pm was initially added on branch rt-1-1.
-	
-2000-12-02 03:20  jesse
-
-	* lib/RT/ScripAction.pm:
-
-	file ScripAction.pm was initially added on branch rt-1-1.
-	
-2000-12-02 03:20  jesse
-
-	* lib/RT/ScripCondition.pm:
-
-	file ScripCondition.pm was initially added on branch rt-1-1.
-	
-2000-12-02 03:20  jesse
-
-	* lib/RT/ScripConditions.pm:
-
-	file ScripConditions.pm was initially added on branch rt-1-1.
-	
-2000-12-02 03:20  jesse
-
-	* bin/webmux.pl, docs/design_docs/subscription-definitions.txt,
-	etc/schema.pm, lib/RT/Action.pm, lib/RT/Scrip.pm,
-	lib/RT/ScripAction.pm, lib/RT/ScripCondition.pm,
-	lib/RT/ScripConditions.pm, lib/RT/ScripScope.pm,
-	lib/RT/ScripScopes.pm, lib/RT/Scrips.pm, lib/RT/Transaction.pm,
-	lib/RT/Action/Generic.pm, lib/RT/Action/Notify.pm,
-	lib/RT/Action/OpenDependent.pm, lib/RT/Action/ResolveMembers.pm,
-	lib/RT/Action/SendEmail.pm, lib/RT/Action/SendEmailOnResolve.pm,
-	lib/RT/Action/StallDependent.pm,
-	lib/RT/Condition/AnyTransaction.pm, lib/RT/Condition/Generic.pm,
-	lib/RT/Condition/NewDependency.pm, tools/insertdata,
-	webrt/Admin/Elements/SelectScripAction,
-	webrt/Admin/Elements/SelectScripCondition:
-
-	Major major major work on scrips
-	scrips now specify a 'Stage' which has only one value for now but should be easier to add in other
-	points in the code where they get called
-	
-	What used to be called Scrip got split into ScripCondition and ScripAction
-	
-	ScripScope got renamed 'Scrip', like it should have been from the getgo.
-	
-	Did some work to the scrip mailing routines.All in all, scrips are much
-	cleaner and more flexible. and at least as functional as they were last night.
-	
-	I'll be adjusting the templates as I get to them
-	
-2000-12-01 14:02  jesse
-
-	* NEWS:
-
-	fixed a display bug in how we split messages for the webui
-	
-2000-11-30 02:18  jesse
-
-	* lib/RT/Action/AutoReply.pm, lib/RT/Action/SendEmail.pm,
-	tools/insertdata:
-
-	Working on cleaning up the Scrips system.  The whole templating system
-	was really, really incredibly overdesigned and badly implemented on the first go-round.
-	Over the next few checkins, I'll be cleaning it up and cleaning it out...
-	
-2000-11-29 16:31  jesse
-
-	* bin/testdeps.pl:
-
-	updated apache::session dependency
-	
-2000-11-29 01:32  jesse
-
-	* lib/RT/ACE.pm, lib/RT/ScripScope.pm, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm, lib/RT/User.pm, lib/RT/Action/AutoReply.pm,
-	lib/RT/Action/SendEmail.pm, lib/RT/Interface/Email.pm,
-	webrt/Admin/Elements/SelectScrip,
-	webrt/Admin/Elements/SelectTemplate,
-	webrt/Ticket/Create_Detail.html:
-
-	Work on scrips all around:
-		web ui cleanups
-		Action::SendEmail cleanups
-	
-	work on acls for Ticket creation.
-	now users who only have "CreateTicket" can actually create tickets,
-	even if they can't see the ticket once created.
-	RT1's "allow nonmembers to create requests" can be replicated by
-	granting  the metagroup 'requestors' the right "CreateTicket".
-	
-	Mail gateway got a lot of debugging stubs. mail gateway now uses
-	modern semantics for Create.
-	
-2000-11-28 17:46  jesse
-
-	* lib/RT/User.pm:
-
-	cacheed acl decisions are now properly granular.
-	
-2000-11-28 17:39  jesse
-
-	* lib/RT/User.pm:
-
-	Cached ACL decisions are now expire after 2 minutes.
-	
-2000-11-28 03:37  jesse
-
-	* etc/config.pm, lib/RT/Ticket.pm, webrt/Ticket/Update.html,
-	webrt/Ticket/Elements/ShowReferences,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	fixed a small bug in ticket update.
-	fixed a set of bugs in "external" links that were discovered when my roommate suggested
-	that RT could be used as an mp3 playlist server.  Now it can. no, you really don't want to.
-	At least until we have asset managment.
-	
-2000-11-28 00:20  jesse
-
-	* Makefile, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	lib/RT/Action/SendEmail.pm:
-
-	a couple little tweask to transaction and sendemail.
-	
-	bumped the version #
-	
-2000-11-28 00:12  jesse
-
-	* webrt/Ticket/: Display.html, LinkIt.html, ProcessUpdate.html,
-	Update.html, Elements/ShowSummary, Elements/ShowTransaction,
-	Elements/TicketToolBox:
-
-	Work on cleaning up the web ui. got rid of processupdate.html.
-	cleaned up the code in display.html..  linking is no longer nearly as offensive.
-	
-2000-11-27 20:26  jesse
-
-	* webrt/Ticket/Elements/ShowRequestor:
-
-	small display fix to not show nobody as a possible requestor
-	
-2000-11-27 20:05  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/User.pm, webrt/Ticket/Display.html:
-
-	Updates to how Create handles Requestor, Cc and Admin Cc.
-	it's now much more flexible, cleaner and simpler. yay.
-	
-2000-11-27 04:01  jesse
-
-	* webrt/Elements/: Error, Header, MyRequests:
-
-	Web error reporting tweaks.
-	added MyRequests to the front page
-	
-2000-11-27 04:01  jesse
-
-	* webrt/Elements/MyRequests:
-
-	file MyRequests was initially added on branch rt-1-1.
-	
-2000-11-27 03:30  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Interface/Web.pm,
-	webrt/Ticket/Display.html, webrt/Ticket/Elements/ShowHistory:
-
-	more work on ACLs
-	
-	Ticket.pm has been fully ACLed.
-	Did work on web ticket create.  it's no longer a festering pile of garbage.
-	Now it's more of an office wastepaper basket full of clean white 20lb paper.
-	Seriously, though, it's cleaner. I got rid of some of Tobias' temporary ticket creation
-	code.
-	
-2000-11-26 23:45  jesse
-
-	* lib/RT/ACE.pm, lib/RT/GroupMember.pm, lib/RT/Queue.pm,
-	lib/RT/Queues.pm, lib/RT/Template.pm, lib/RT/Ticket.pm,
-	lib/RT/User.pm, lib/RT/Interface/Web.pm, tools/insertdata,
-	webrt/Admin/Elements/ModifyQueue, webrt/Elements/Header,
-	webrt/Elements/Tabs:
-
-	
-	
-	lots more ACL work.
-	a little bit of UI cleanup.
-	
-2000-11-25 01:56  jesse
-
-	* lib/RT/Tickets.pm, webrt/index.html,
-	webrt/Ticket/Elements/ShowDates:
-
-	made "my requests" doable.
-	fixed some ui in showdates.
-	
-2000-11-24 20:14  jesse
-
-	* lib/RT/: Queue.pm, User.pm:
-
-	Fixed a couple of bugs in HasSystemRight that make RT install correctly again.
-	
-2000-11-24 19:21  jesse
-
-	* etc/schema.pm:
-
-	schema fix to make pg happy
-	
-2000-11-22 03:08  jesse
-
-	* webrt/Ticket/Update.html:
-
-	cleaned up the ticket udpdate form. made it more concise.::
-	
-2000-11-22 03:04  jesse
-
-	* webrt/Ticket/Update.html:
-
-	cleaning up the ticket update form
-	
-2000-11-22 02:49  jesse
-
-	* bin/testdeps.pl:
-
-	bumped searchbuilder dependency to the version now in CPAN...
-	
-2000-11-22 02:31  jesse
-
-	* Makefile, lib/RT/ACE.pm, lib/RT/ACL.pm, lib/RT/Action.pm,
-	lib/RT/Attachment.pm, lib/RT/Attachments.pm, lib/RT/CurrentUser.pm,
-	lib/RT/Date.pm, lib/RT/EasySearch.pm, lib/RT/Group.pm,
-	lib/RT/GroupMember.pm, lib/RT/GroupMembers.pm, lib/RT/Groups.pm,
-	lib/RT/Handle.pm, lib/RT/Link.pm, lib/RT/Links.pm, lib/RT/Queue.pm,
-	lib/RT/Queues.pm, lib/RT/Record.pm, lib/RT/Scrip.pm,
-	lib/RT/ScripScope.pm, lib/RT/ScripScopes.pm, lib/RT/Scrips.pm,
-	lib/RT/Template.pm, lib/RT/Templates.pm, lib/RT/Ticket.pm,
-	lib/RT/Tickets.pm, lib/RT/Transaction.pm, lib/RT/Transactions.pm,
-	lib/RT/User.pm, lib/RT/Users.pm, lib/RT/Utils.pm,
-	lib/RT/Watcher.pm, lib/RT/Watchers.pm:
-
-	Bumped version to 1.3.23
-	Added pod headers to most core modules?
-	
-2000-11-21 23:05  jesse
-
-	* webrt/Ticket/Elements/ShowSummary:
-
-	removed a dead link
-	
-2000-11-21 04:07  jesse
-
-	* Makefile, lib/RT/Queue.pm, lib/RT/Scrip.pm, lib/RT/ScripScope.pm,
-	lib/RT/Transaction.pm, lib/RT/User.pm:
-
-	tmp logfiles now go in /tmp
-	oh. and SCRIPS NOW WORK. RT can send mail.
-	and recieve mail. life is good.
-	
-2000-11-21 02:55  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Implemented Ticket->IsWatcher.
-	This is what we needed to make pseudogroup based ACLs work
-	
-2000-11-21 00:55  jesse
-
-	* lib/RT/Queue.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
-	webrt/Elements/Tabs:
-
-	fixed a couple of bugs while I was out and about.
-	Oh. and most of the rest of the ACL core is implemented now.
-	rights for requestor/owner/cc/admincc should now work.
-	
-2000-11-20 11:59  jesse
-
-	* lib/RT/ACE.pm, lib/RT/User.pm, tools/insertdata:
-
-	Added "Requestor" and "Everyone" metagroups to tools/insertdata
-	
-	Fixed a bug with yet another way to call HasQueueRight.
-	
-2000-11-20 00:39  jesse
-
-	* Makefile:
-
-	bumped to 1.3.22 for release
-	
-2000-11-20 00:24  jesse
-
-	* webrt/Search/Listing.html:
-
-	fixed a big triggered when clearing empty ticket searches
-	
-2000-11-19 23:55  jesse
-
-	* bin/webmux.pl, lib/RT/User.pm:
-
-	fixed a bug that stopped you from specifying an owner on ticket create
-	Watcher and Watchers are now preloaded in the App server.
-	
-2000-11-19 23:20  jesse
-
-	* webrt/Ticket/Elements/Tabs:
-
-	file Tabs was initially added on branch rt-1-1.
-	
-2000-11-19 23:20  jesse
-
-	* webrt/: index.html, Admin/Elements/Tabs, Elements/Header,
-	Elements/Tabs, Search/Listing.html, Search/RestrictSearch.html,
-	Ticket/Create.html, Ticket/Create_Detail.html, Ticket/Display.html,
-	Ticket/EditWatchers.html, Ticket/Modify.html, Ticket/Update.html,
-	Ticket/Elements/Tabs:
-
-	more UI tweaking. yay.
-	
-2000-11-19 17:57  jesse
-
-	* webrt/Elements/Quicksearch:
-
-	file Quicksearch was initially added on branch rt-1-1.
-	
-2000-11-19 17:57  jesse
-
-	* webrt/Elements/MyTickets:
-
-	file MyTickets was initially added on branch rt-1-1.
-	
-2000-11-19 17:57  jesse
-
-	* webrt/rt.jpg:
-
-	file rt.jpg was initially added on branch rt-1-1.
-	
-2000-11-19 17:57  jesse
-
-	* lib/RT/ACE.pm, lib/RT/Ticket.pm, lib/RT/Tickets.pm,
-	lib/RT/Interface/Web.pm, webrt/index.html, webrt/rt.jpg,
-	webrt/Elements/MyTickets, webrt/Elements/Quicksearch,
-	webrt/Search/Listing.html:
-
-	A bunch of UI work. we now have a placeholder logo
-	
-2000-11-18 03:03  jesse
-
-	* lib/RT/: User.pm, Interface/Web.pm:
-
-	ACL  change messages are now properly scoped. so now they don't hang out
-	between sessions
-	
-	if a user has a system right, that right now applies to all queues.
-	
-2000-11-17 00:19  jesse
-
-	* Makefile:
-
-	Rolled rev 1.3.21. now with an ACL editor.
-	
-2000-11-17 00:15  jesse
-
-	* webrt/Admin/Elements/SelectRights:
-
-	file SelectRights was initially added on branch rt-1-1.
-	
-2000-11-17 00:15  jesse
-
-	* lib/RT/ACE.pm, lib/RT/Group.pm, lib/RT/Queue.pm,
-	lib/RT/Template.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
-	lib/RT/Interface/Web.pm, webrt/Admin/Elements/SelectRights:
-
-	Woo! the ACL editor is now much cleaner. and it works. :)
-	
-2000-11-16 01:17  jesse
-
-	* lib/RT/: ACE.pm, ACL.pm, Attachment.pm, Attachments.pm,
-	CurrentUser.pm, EasySearch.pm, Group.pm, GroupMember.pm,
-	GroupMembers.pm, Groups.pm, Link.pm, Links.pm, Queue.pm, Queues.pm,
-	Record.pm, Scrip.pm, ScripScope.pm, ScripScopes.pm, Scrips.pm,
-	Template.pm, Templates.pm, Ticket.pm, Transaction.pm,
-	Transactions.pm, User.pm, Users.pm, Watcher.pm, Watchers.pm,
-	Interface/Web.pm:
-
-	
-	LEANED UP A WHOLE BUNCH OF NEW ROUTINES. FIXED A FREW ACL BUGS.
-	
-2000-11-15 02:29  jesse
-
-	* lib/RT/ACE.pm, lib/RT/ACL.pm, lib/RT/CurrentUser.pm,
-	lib/RT/Queue.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
-	webrt/Admin/Elements/Tabs, webrt/Elements/Submit:
-
-	refactored ACLS to take out a layer of complexity or two.
-	
-2000-11-14 13:17  jesse
-
-	* Makefile:
-
-	bumped the makefuile version
-	
-2000-11-13 23:19  jesse
-
-	* bin/webmux.pl, lib/RT/ACL.pm, lib/RT/EasySearch.pm,
-	lib/RT/Group.pm, lib/RT/GroupMember.pm, lib/RT/Record.pm,
-	lib/RT/User.pm:
-
-	A bunch of refactoring to make ACL editable. Lots of work on the ACL editor.
-	Basic user ACLs are now editable.
-	It needs some more refactoring, since I stopped being on quite as much crack
-	over the wekeend and figured out a much less intense way to do a bunch of stuff. Yay.
-	
-2000-11-08 14:55  jesse
-
-	* Makefile, NEWS:
-
-	all mail sent out is now sent out precedence "bulk" like it should be.
-	
-2000-11-08 01:24  jesse
-
-	* webrt/Admin/Elements/SelectScrip:
-
-	file SelectScrip was initially added on branch rt-1-1.
-	
-2000-11-08 01:24  jesse
-
-	* webrt/Admin/Elements/SelectTemplate:
-
-	file SelectTemplate was initially added on branch rt-1-1.
-	
-2000-11-08 01:24  jesse
-
-	* etc/schema.pm, lib/RT/ACE.pm, lib/RT/ACL.pm,
-	lib/RT/CurrentUser.pm, lib/RT/Group.pm, lib/RT/Ticket.pm,
-	lib/RT/Tickets.pm, lib/RT/Transaction.pm, lib/RT/User.pm,
-	lib/RT/Users.pm, tools/insertdata,
-	webrt/Admin/Elements/SelectScrip,
-	webrt/Admin/Elements/SelectTemplate:
-
-	A whole slew of work on ACLs and assorted other related things.
-	This involved a lot of cleanup of ACL related code and things it touched.
-	ACL decisions are now being made. (Yes, you're all still superusers) but I
-	think I've got a bunch of the infrastructure cleaned up, so it should be
-	easier to finish off the ACL editor. yay!
-	
-	As part of this, I had to add more groups support. all you groups-maniacs should be pleased ;)
-	
-2000-11-06 11:55  jesse
-
-	* Makefile:
-
-	Fixed yet another typo in manipulate.pm.
-	
-	Bumped version to 1.0.5
-	
-2000-11-05 15:24  jesse
-
-	* Makefile:
-
-	A fix for action vs actions in mail manipulate.
-	fixed a typo normailize -> normalize in database/manipulate.pm
-	
-2000-11-03 17:54  jesse
-
-	* README, etc/schema.pm, lib/RT/ACE.pm, lib/RT/ACL.pm,
-	lib/RT/CurrentUser.pm, lib/RT/GroupMember.pm, lib/RT/Queue.pm,
-	lib/RT/Ticket.pm, lib/RT/User.pm, lib/RT/Users.pm,
-	lib/RT/Interface/Email.pm, lib/RT/Interface/Web.pm,
-	tools/insertdata, webrt/Admin/ModifyUser,
-	webrt/Admin/Elements/QueueRightsForUser, webrt/Admin/Elements/Tabs,
-	webrt/Elements/SelectOwner:
-
-	A bunch of work on the ACLs. we're getting closer to having a workable ACL
-	editor.
-	
-2000-11-03 15:37  jesse
-
-	* Makefile, NEWS:
-
-	We now deal better with merging merged tickets.
-	
-	We now properly ignore Precedence: {junk|bulk} headers
-	
-2000-10-31 00:06  jesse
-
-	* lib/RT/: ACE.pm, ScripScope.pm:
-
-	Added ACL support to the ScripScope system.
-	
-2000-10-29 21:31  jesse
-
-	* Makefile, README, bin/webmux.pl, lib/RT/ACE.pm, lib/RT/Group.pm,
-	lib/RT/Groups.pm, lib/RT/Queue.pm, lib/RT/ScripScope.pm,
-	lib/RT/ScripScopes.pm, lib/RT/Scrips.pm, lib/RT/Template.pm,
-	lib/RT/Templates.pm, lib/RT/Transaction.pm, tools/insertdata:
-
-	A bunch of hacking to the ScripScopes system.
-	
-	You can now edit scrips for a given queue.
-	but hey, scrips have no ACL checking yet.
-	
-2000-10-29 17:51  jesse
-
-	* etc/schema.pm:
-
-	Added a whole lot of documentation to schema.pm.
-	
-2000-10-25 21:09  jesse
-
-	* Makefile, bin/testdeps.pl, etc/schema.pm:
-
-	Updated schema.pm and testdeps to jibe with the current CPAN versions of things.
-	And I bumped the version to 1.3.20
-	
-2000-10-23 16:53  jesse
-
-	* Makefile, lib/RT/Date.pm:
-
-	Reverted to using mysql by default.
-	Finished off the postgresql support in the rt core. (well, at least finished the initial support)
-	
-2000-10-23 16:35  jesse
-
-	* Makefile, lib/RT/ACE.pm, lib/RT/Ticket.pm, tools/insertdata:
-
-	Cleanups related to making postgres support work right.
-	
-2000-10-22 20:57  jesse
-
-	* Makefile, bin/initacls.Pg, bin/testdeps.pl, etc/acl.Pg,
-	etc/config.pm, etc/schema.pm, lib/RT/Link.pm, lib/RT/Ticket.pm,
-	lib/RT/Tickets.pm, tools/initdb, tools/insertdata,
-	webrt/Ticket/Display.html:
-
-	merged in ivan's postgres patches.
-	made local ticket links work again. *sigh* SQL evil. eeeeevil.
-	
-2000-10-16 16:32  jesse
-
-	* docs/Security:
-
-	file Security was initially added on branch rt-1-1.
-	
-2000-10-16 16:32  jesse
-
-	* docs/Security:
-
-	some initial notes on security. targetted at RT admins.
-	
-2000-10-16 03:01  jesse
-
-	* lib/RT/: Link.pm, Links.pm, Ticket.pm:
-
-	Fixed a couple of typos in link and links.
-	Ticket->Load will now do the right hting with ticket uris or aliases.
-	
-2000-10-16 00:47  jesse
-
-	* etc/config.pm, lib/RT/Link.pm, lib/RT/Links.pm, lib/RT/Ticket.pm:
-
-	The linking interface now uses URIs internally. and it does lots of
-	sanity checking.
-	
-	Tickets now understand what their uris should be. you can load tickets by
-	uri. and by alias.
-	
-	We need a bit more work to make alias support just transparent, but we're
-	getting really close.
-	
-	You shouldn't be able to link to nonexistent local objects any mroe.
-	
-2000-10-15 01:57  jesse
-
-	* lib/RT/CurrentUser.pm:
-
-	Added CurrentUser->LoadByGecos.
-	The CLI now uses LoadByGecos to load the currentuser.
-	This means that users other than root might actually be able to use the cli now
-	VS: ----------------------------------------------------------------------
-	
-2000-10-15 01:11  jesse
-
-	* Makefile:
-
-	Significantly redid the installation procedure. we're now _much_
-	more careful about what gets installed where and what's owned by whom.
-	
-	Oh. and RT's now setgid, rather than setuid. and there's no setuid wrapper anymore
-	
-2000-10-15 01:08  jesse
-
-	* etc/: config.pm, suidrt.c:
-
-	Yanked suidrt.c, since we now run setgid.
-	
-	rt now logs to /tmp/rt.log.pid.userid
-	
-2000-10-14 02:56  jesse
-
-	* bin/rtmux.pl, bin/webmux.pl, etc/schema.pm,
-	lib/RT/CurrentUser.pm, lib/RT/Interface/Email.pm, tools/initdb,
-	tools/insertdata:
-
-	CurrentUser.pm had LoadByEmail and LoadByUserId methods added and they're now
-	actually used most everywhere.
-	
-	insertdata doesn't force ids for users now.
-	
-	the schema now actually enforces a lot of important uniqueness constraints.
-	
-2000-10-13 10:59  jesse
-
-	* etc/schema.mysql:
-
-	Removed the old schema.mysql, lest it lead people astray
-	
-2000-10-13 02:27  jesse
-
-	* webrt/Ticket/Elements/: EditPeople, ShowMembers:
-
-	Removed some old warning text that's not true any more.
-	Fixed a relative url problem in "show memebers"
-	
-2000-10-12 23:22  jesse
-
-	* Makefile, bin/testdeps.pl:
-
-	updated testdeps.
-	Makefile now defaults to installing rt2 in /opt/rt2
-	
-2000-10-12 22:54  jesse
-
-	* Makefile, lib/RT/ACL.pm, lib/RT/Queue.pm, lib/RT/Ticket.pm,
-	lib/RT/User.pm, lib/RT/Users.pm, tools/insertdata,
-	webrt/index.html:
-
-	A couple of links on the front page.
-	Makefile now assumes www-data instead of nobody as the web user. this is not quite right.
-	
-	Fixed a little bit of the POD in User.pm.
-	
-	Redid how Ticket.pm deals with Owner on create. the new logic should actually catch errors
-	instead of easily letting referential integrity checks just _fail_.
-	
-	Insertdata got cleaned up a little bit.
-	
-	ACL got its cleaned up a bit
-	
-2000-10-11 23:22  jesse
-
-	* webrt/Admin/Elements/QueueRightsForUser:
-
-	file QueueRightsForUser was initially added on branch rt-1-1.
-	
-2000-10-11 23:22  jesse
-
-	* lib/RT/Users.pm, webrt/Admin/Elements/QueueRightsForUser:
-
-	Work on ACLs. and the ACL editor
-	
-2000-10-11 21:23  jesse
-
-	* tools/insertdata:
-
-	gave root a password
-	
-2000-10-11 12:28  jesse
-
-	* Makefile, tools/initdb:
-
-	Databasename changed from RT2 to rt2 to make postgres happier.
-	
-	initdb quoting bug fixed.
-	
-	debug mode in initdb turned off.
-	
-	If you're using mysql and running with ivan's current CVS version of DBIx::DBSchema, RT should once again work.
-	
-2000-10-09 02:32  jesse
-
-	* etc/schema.pm, tools/initdb:
-
-	a debugging hook in initdb and defaults (though they don't work just right yet)
-	in schema.pm. Note that we now need DBIx::DBSchema from CVS.
-	
-2000-10-09 01:59  jesse
-
-	* Makefile, NEWS, etc/suidrt.c:
-
-	Jan Kujawa fixed a bug in the setuid wrapper
-	Jan Okrouhly fixed some bugs in the merged ticket resolution in the cli.
-	
-	Rolled 1.0.5pre3
-	
-2000-10-05 17:30  jesse
-
-	* lib/RT/: ACE.pm, ACL.pm:
-
-	more work on RT's acl core
-	
-2000-10-05 17:30  jesse
-
-	* webrt/Admin/Elements/: GrantQueueRightsTo, GrantQueueRightsTo~,
-	SelectQueueRights:
-
-	more acl work
-	
-2000-10-05 17:30  jesse
-
-	* webrt/Admin/Elements/GrantQueueRightsTo~:
-
-	file GrantQueueRightsTo~ was initially added on branch rt-1-1.
-	
-2000-10-05 17:30  jesse
-
-	* webrt/Admin/Elements/GrantQueueRightsTo:
-
-	file GrantQueueRightsTo was initially added on branch rt-1-1.
-	
-2000-10-05 17:30  jesse
-
-	* webrt/Admin/Elements/SelectQueueRights:
-
-	file SelectQueueRights was initially added on branch rt-1-1.
-	
-2000-10-05 15:49  jesse
-
-	* etc/suidrt.c:
-
-	reordering things in suidrt.c seemed to make them happier.
-	
-2000-10-05 15:39  jesse
-
-	* etc/suidrt.c:
-
-	missed a comma
-	
-2000-10-05 15:03  jesse
-
-	* bin/testdeps.pl:
-
-	added a dependency test script to make installation by newbies easier.
-	
-2000-10-05 15:03  jesse
-
-	* Makefile, README, etc/suidrt.c:
-
-	Major rewrite of suidrt.c by jan kujawa.
-	A couple of bugfixes from Jan Okrouhly
-		Public history should now work right in the cli
-		Web viewing of merged tickets by their old # should now work better.
-	
-2000-10-03 20:22  jesse
-
-	* bin/testdeps.pl:
-
-	cleaned up testedeps.pl output
-	
-2000-10-03 02:41  jesse
-
-	* tools/insertdata:
-
-	file insertdata was initially added on branch rt-1-1.
-	
-2000-10-03 02:41  jesse
-
-	* tools/initdb:
-
-	file initdb was initially added on branch rt-1-1.
-	
-2000-10-03 02:41  jesse
-
-	* etc/schema.pm:
-
-	file schema.pm was initially added on branch rt-1-1.
-	
-2000-10-03 02:41  jesse
-
-	* Makefile, bin/initdb.Oracle, bin/initdb.Pg, bin/initdb.mysql,
-	bin/testdeps.pl, etc/schema.Pg, etc/schema.pm, lib/RT/ACE.pm,
-	lib/RT/Queue.pm, lib/RT/Scrip.pm, lib/RT/User.pm, tools/initdb,
-	tools/insertdata:
-
-	Fairly massive installation changes.
-		We now use ivan's really cool DBIx::DBschema, which, when things
-	settle out a bit mean that the oracle and postgres (and possibly other) ports
-	get their schema updated automatically.
-	
-	The initial seed data is now inserted by tools/insertdata through the RT API.
-	
-	ACE::Create now actually works.
-	Same with Scrip::Create.
-	and Queue::Create.
-	
-	There are a couple of new installation-only dependencies. One of them (DBSchema) may become a build-only
-	dependency if people whine enough :)
-	
-	date/time handling was a casualty of the changes. some things will be handled oddly for now.
-	Once Ivan releases the next DBSchema update, this should get better again. it was
-	the result of a namespace collision between pg and mysql. the timestamp column has
-	different behavior. go fig.
-	
-	This version will require DBIx::SearchBuilder 0.06 (aka what I'm about to check in)
-	
-2000-10-03 02:07  jesse
-
-	* tools/test:
-
-	blew away old, crufty "extras"
-	
-2000-09-28 13:55  jesse
-
-	* lib/RT/Group.pm:
-
-	file Group.pm was initially added on branch rt-1-1.
-	
-2000-09-28 13:55  jesse
-
-	* lib/RT/: Group.pm, GroupMember.pm, GroupMembers.pm, Groups.pm:
-
-	Long overdue adding of completely untested (and unused) code for groups in RT.
-	note that this implementation does not assume recursive group membership
-	
-2000-09-28 13:55  jesse
-
-	* lib/RT/GroupMember.pm:
-
-	file GroupMember.pm was initially added on branch rt-1-1.
-	
-2000-09-28 13:55  jesse
-
-	* lib/RT/GroupMembers.pm:
-
-	file GroupMembers.pm was initially added on branch rt-1-1.
-	
-2000-09-28 13:55  jesse
-
-	* lib/RT/Groups.pm:
-
-	file Groups.pm was initially added on branch rt-1-1.
-	
-2000-09-18 01:57  jesse
-
-	* lib/RT/: ACE.pm, Queue.pm, Ticket.pm:
-
-	Lots of work on Queue.pm  Most cleanups related to queue watchers, but I
-	also added a bit more documentation and fixed a bug that could cause DelWatcher
-	in ticket.pm to delete watchers it shouldn't
-	
-2000-09-18 00:03  jesse
-
-	* docs/API, docs/FAQ, docs/README.oracle, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm:
-
-	More documentation. removed outdated docs.
-	
-	docs/API now talks about what those of you writing your own RT client
-	code shouldn't be doing. (Which objects you shouldn't touch).
-	
-2000-09-18 00:00  jesse
-
-	* README:
-
-	Clarified license terms. RT is available under Version 2 of the GPL.
-	Not version 1. Not some as-yet-unwritten version 3 that says you can only
-	use it if you agree to license your children under the GPL. Version 2.
-	
-2000-09-17 19:57  jesse
-
-	* lib/RT/: TicketCollection.pm, User.pm, Interface/Email.pm:
-
-	Removed bogus signature code.
-	Documented User->IsPassword
-	removed --area flag from Mailgateway (We ain't got no stinking areas)
-	
-2000-09-17 19:21  jesse
-
-	* etc/schema.Oracle, etc/schema.mysql, lib/RT/ACE.pm,
-	lib/RT/ACL.pm, lib/RT/Scrip.pm, lib/RT/User.pm:
-
-	Ugh. Mysql isn't respecting SQL92 reserved words. which meant that I didn't
-	notice that I was using "Type" and "Action" in my schema.
-	This required a bit of churn to the ACE and User modules.
-	
-2000-09-17 17:38  jesse
-
-	* Makefile:
-
-	Ok. I think I've got it now. This is RT 1.3.18. aka RT2 - Alpha 1.
-	        The "Bear Suit" Release.
-	
-	        A formal release announcement is forthcoming.
-	
-2000-09-17 17:29  jesse
-
-	* Makefile:
-
-	work on the changelog generator
-	
-2000-09-17 17:19  jesse
-
-	* HACKING, Makefile, README, bin/initdb.mysql, bin/testdeps.pl:
-
-	Bumped the required version of SearchBuilder in testdeps, now that it's
-	propagated throughout CPAN
-	
-	Replaced initdb.mysql with ivan's new version.
-	
-	Tweaked ivan's initdb.mysql to be a little friendlier, create the schema
-	(it was missing a FILEHANDLE in a print statement and deal
-	better with omitted passwords.
-	
-	Updated the readme some more.
-	
-	Added experimental ChangeLog generation to the make dist process
-	
-	Bumped the version number to 1.3.18 for release as alpha1 for RT2 today.
-	
-2000-09-17 01:40  jesse
-
-	* Makefile, README, bin/initacls.mysql, bin/testdeps.pl,
-	bin/webmux.pl:
-
-	Bumped the Mason version requirement up, so we avoid the poisoned v 0.88
-	Applied ivan's alpha-1 patches.
-	Did some tweaking for the alpha 1 release.
-	Cleaned up the readme a bit
-	
-2000-09-15 01:21  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-2000-09-15 01:17  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	Mail gateway now handles followup correspondence properly
-	(It gets the ticket # right)
-	
-2000-09-15 01:06  jesse
-
-	* lib/RT/Watcher.pm:
-
-	fixed a typo (left off a > ) in Watcher.pm
-	
-2000-09-15 00:59  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Watcher.pm, webrt/Ticket/Modify.html:
-
-	Editing ticket watchers from the webui now works.
-	this required a bunch of work on the internal wathers stuff
-	in ticket.pm.
-	Also added documentation and watcher-related sanity checks
-	
-2000-09-14 00:04  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/Watcher.pm,
-	webrt/Elements/SelectWatcherType, webrt/Ticket/Elements/EditPeople,
-	webrt/Ticket/Elements/EditWatchers,
-	webrt/Ticket/Elements/ModifyTicket:
-
-	Some cleanup to Watcher and Ticket. (mainly documentation updates)
-	Added an IsUser sub to Watcher.pm (which tells you if the watcher
-	object refers to a local user or a remote email address)
-	
-	the ui for editing tickets should work now.
-	note that the backend for the watchers side of this isn't there
-	yet.
-	
-	        -j
-	
-2000-09-13 18:10  jesse
-
-	* etc/config.pm:
-
-	fixed a configfile typo that would break a new installation
-	
-2000-09-12 01:28  jesse
-
-	* lib/RT/Date.pm, lib/RT/Ticket.pm, webrt/Elements/ListActions,
-	webrt/Elements/SelectDate, webrt/Elements/SelectUsers,
-	webrt/Elements/SelectWatcherType, webrt/Ticket/Modify.html,
-	webrt/Ticket/Elements/AddWatchers, webrt/Ticket/Elements/EditDates,
-	webrt/Ticket/Elements/EditPeople,
-	webrt/Ticket/Elements/ModifyTicket:
-
-	TimeWorked is now read/write (which may be a bad idea. but I'm willing to try it.
-	RT::Date now better understands that "never" doesn't mean 1970.
-	
-	The web modify interface is getting closer to working.
-	I mainly need to finish making the watchers column go.
-	
-2000-09-11 00:37  jesse
-
-	* etc/config.pm:
-
-	Some sanity cleanups to the web queue listing.
-	
-2000-09-11 00:35  jesse
-
-	* webrt/Ticket/Elements/EditDates:
-
-	file EditDates was initially added on branch rt-1-1.
-	
-2000-09-11 00:35  jesse
-
-	* webrt/Ticket/Elements/EditWatchers:
-
-	file EditWatchers was initially added on branch rt-1-1.
-	
-2000-09-11 00:35  jesse
-
-	* webrt/Ticket/Elements/AddWatchers:
-
-	file AddWatchers was initially added on branch rt-1-1.
-	
-2000-09-11 00:35  jesse
-
-	* webrt/Ticket/Elements/EditBasics:
-
-	file EditBasics was initially added on branch rt-1-1.
-	
-2000-09-11 00:35  jesse
-
-	* webrt/Ticket/Elements/EditPeople:
-
-	file EditPeople was initially added on branch rt-1-1.
-	
-2000-09-11 00:35  jesse
-
-	* webrt/Ticket/Elements/ModifyTicket:
-
-	file ModifyTicket was initially added on branch rt-1-1.
-	
-2000-09-11 00:35  jesse
-
-	* webrt/: Login.html, webrt.css, Elements/SelectDate,
-	Elements/SelectMatch, Elements/SelectQueue, Elements/SelectUsers,
-	Elements/ShadedBox, Ticket/EditWatchers.html, Ticket/Modify.html,
-	Ticket/Elements/AddWatchers, Ticket/Elements/EditBasics,
-	Ticket/Elements/EditDates, Ticket/Elements/EditPeople,
-	Ticket/Elements/EditWatcherList, Ticket/Elements/EditWatchers,
-	Ticket/Elements/ModifyTicket, Ticket/Elements/ShowBasics,
-	Ticket/Elements/ShowDates, Ticket/Elements/ShowDependencies,
-	Ticket/Elements/ShowHistory, Ticket/Elements/ShowPeople,
-	Ticket/Elements/ShowSummary, Ticket/Elements/TicketToolBox:
-
-	Lots and lots of work on the webui.
-	The display UI has been cleaned up a bit and the modify UI has been started.
-	It's not in its final for yet, nor is there any logic backing many of the new ui features, but those will come next.
-	
-	If I'm remebering my list correctly, this is the one "biggie" before Alpha 1.
-	
-	Yay!
-	
-2000-09-11 00:35  jesse
-
-	* webrt/Elements/SelectUsers:
-
-	file SelectUsers was initially added on branch rt-1-1.
-	
-2000-09-07 00:52  jesse
-
-	* webrt/: Login.html, autohandler, Ticket/Elements/ShowSummary:
-
-	Replaced tobias' web arg preservation code with something that's actually based on _mason_ rather than the external apache object. This should make the fastcgi port easier
-	
-	Fixed a bug in showsummary (unqualified WebPath)
-	
-2000-09-07 00:30  jesse
-
-	* Makefile, bin/rtmux.pl, lib/RT/Handle.pm:
-
-	Look ma! it should install again (i'd flubbed a bit of the
-	fastcgi mason handler install.
-	
-	Oh. and oracle support should work now.
-	
-2000-09-06 00:52  jesse
-
-	* webrt/Logout.html:
-
-	Logout.html links you to the right place now
-	
-2000-09-05 23:47  jesse
-
-	* webrt/Search/Listing.html:
-
-	YA typo fix
-	
-2000-09-05 23:45  jesse
-
-	* webrt/Search/Listing.html:
-
-	Damn I wish I could type tonight. :/ missed an $RT::
-	
-2000-09-05 23:43  jesse
-
-	* webrt/: Search/Listing.html, Ticket/Elements/ShowSummary:
-
-	Fixed a few more Absolute url bugs
-	
-2000-09-05 23:35  jesse
-
-	* webrt/Elements/Tabs:
-
-	Tabs needed / as the final character for transparent proxying
-	
-2000-09-05 22:39  jesse
-
-	* webrt/: Login.html, Admin/Elements/CreateUserCalled,
-	Admin/Elements/ModifyQueue, Admin/Elements/ModifyTemplate,
-	Admin/Elements/ModifyUser, Admin/Users/index.html:
-
-	more work on proper absolute pathing
-	
-2000-09-05 22:08  jesse
-
-	* webrt/: Login.html, Admin/Elements/CreateQueueCalled,
-	Admin/Elements/CreateUserCalled, Admin/Elements/ModifyUser,
-	Admin/Users/index.html:
-
-	A bunch of the admin tools weren't properly dealing with absolute pathed requests. it made it impossible to have RT2 anywhere other than at the / of your webserver
-	
-2000-09-05 21:40  jesse
-
-	* lib/RT/Handle.pm:
-
-	file Handle.pm was initially added on branch rt-1-1.
-	
-2000-09-05 21:40  jesse
-
-	* bin/mason_handler.fcgi:
-
-	file mason_handler.fcgi was initially added on branch rt-1-1.
-	
-2000-09-05 21:40  jesse
-
-	* Makefile, bin/mason_handler.fcgi, bin/testdeps.pl,
-	lib/RT/Handle.pm:
-
-	Updated testdeps to ask for the new version of mailtools
-	Added in the new fastcgi handler (not working yet)
-	and RT::Handle, which is a wrapper for SearchBuilder::Handle
-	
-2000-09-04 22:52  jesse
-
-	* Makefile, TODO, bin/rtmux.pl, bin/webmux.pl, etc/config.pm,
-	lib/RT/Record.pm, lib/RT/User.pm, lib/RT/Interface/Web.pm,
-	webrt/Ticket/Display.html, webrt/Ticket/Elements/ShowRequestor,
-	webrt/Ticket/Elements/TicketToolBox:
-
-	A couple of bugfixes related to the switch to SearchBuilder.
-	A few webui cleanups.
-	A bit of abstraction to make the eventual fastcgi port easier.
-	
-2000-09-04 12:48  jesse
-
-	* bin/testdeps.pl, lib/RT/Attachments.pm, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm, lib/RT/Watcher.pm, lib/RT/Watchers.pm,
-	lib/RT/Interface/Web.pm, webrt/Ticket/Elements/ShowDates:
-
-	Several batched updates from when pallas was off-net
-	
-	UpdateTold changed to SetTold.
-	A bunch of work to get Scrips working.
-	Lots more POD in Ticket.pm
-	Transaction->Describe  is better about printing what really happened.
-	Attachments.pm had a typo that prevented it from dealing with multipart messages.
-	
-2000-08-31 02:18  jesse
-
-	* Makefile, NEWS, etc/suidrt.c:
-
-	Added ENV squashing to suidrt.c
-	
-2000-08-30 14:46  jesse
-
-	* bin/rtmux.pl:
-
-	Rolling in some oracle changes...they're not done yet, but nothing should
-	break with mysql. fixed a typo in rtmux.pl that was introduced with the switch to searchbuilder.
-	
-2000-08-29 17:02  jesse
-
-	* README, bin/rtmux.pl, bin/testdeps.pl, bin/webmux.pl,
-	lib/RT/EasySearch.pm, lib/RT/Record.pm:
-
-	MAJOR CHANGE: Switched to the new name of the DBIx:: modules.
-	We now use DBIx::SearchBuilder rather than DBIx::EasySearch and friends.
-	Note that this is only a name and structure change for the module set.
-	The functionality is the same...though seperating out oracle and mysql
-	specific features comes soon.
-	
-2000-08-29 16:57  jesse
-
-	* etc/schema.Oracle:
-
-	updated the schema.Oracle
-	
-2000-08-29 02:02  jesse
-
-	* webrt/: Elements/SelectWatcherType, Ticket/EditWatchers.html,
-	Ticket/Update.html:
-
-	Started hacking on watchers and ticket update webui a bit.
-	they need a lot more work
-	
-2000-08-29 01:51  jesse
-
-	* webrt/Ticket/: Display.html, DisplayHistory, DisplayTransaction,
-	Elements/ShowHistory, Elements/ShowTransaction:
-
-	Made FullHeaders/BriefHeaders work in the webui
-	
-2000-08-28 01:46  jesse
-
-	* webrt/Admin/Elements/: CreateUserCalled, ModifyUser:
-
-	Fixed some display buglets from tobi oetiker
-	
-2000-08-28 01:31  jesse
-
-	* webrt/Ticket/Update.html:
-
-	Removed some text that harassed the user. that's generally bad policy
-	
-2000-08-27 23:56  jesse
-
-	* webrt/: Admin/Elements/Header, Admin/Elements/ModifyTemplate,
-	Admin/Elements/Tabs, Elements/ListActions, Elements/Tabs:
-
-	A few more added helper elements from the webui
-	
-2000-08-27 23:56  jesse
-
-	* webrt/Admin/Elements/Header:
-
-	file Header was initially added on branch rt-1-1.
-	
-2000-08-27 23:56  jesse
-
-	* webrt/: Admin/Elements/Tabs, Elements/Tabs:
-
-	file Tabs was initially added on branch rt-1-1.
-	
-2000-08-27 23:56  jesse
-
-	* webrt/Admin/Elements/ModifyTemplate:
-
-	file ModifyTemplate was initially added on branch rt-1-1.
-	
-2000-08-27 23:56  jesse
-
-	* webrt/Elements/ListActions:
-
-	file ListActions was initially added on branch rt-1-1.
-	
-2000-08-27 23:54  jesse
-
-	* webrt/Admin/Users/Prefs.html:
-
-	file Prefs.html was initially added on branch rt-1-1.
-	
-2000-08-27 23:54  jesse
-
-	* webrt/Admin/: Queues/Create.html, Users/Create.html:
-
-	file Create.html was initially added on branch rt-1-1.
-	
-2000-08-27 23:54  jesse
-
-	* webrt/Admin/: Queues/Modify.html, Users/Modify.html:
-
-	file Modify.html was initially added on branch rt-1-1.
-	
-2000-08-27 23:54  jesse
-
-	* webrt/Admin/: Queues/index.html, Users/index.html:
-
-	file index.html was initially added on branch rt-1-1.
-	
-2000-08-27 23:54  jesse
-
-	* bin/webmux.pl, lib/RT/Area.pm, lib/RT/Areas.pm, lib/RT/Queue.pm,
-	lib/RT/ScripScopes.pm, lib/RT/Template.pm, lib/RT/Templates.pm,
-	webrt/Admin/CreateQueue.html, webrt/Admin/CreateUser.html,
-	webrt/Admin/EditUser.html, webrt/Admin/ModifyQueue.html,
-	webrt/Admin/ModifyUser.html, webrt/Admin/index.html,
-	webrt/Admin/Elements/CreateQueueCalled,
-	webrt/Admin/Elements/CreateUserCalled,
-	webrt/Admin/Elements/ModifyQueue, webrt/Admin/Elements/ModifyUser,
-	webrt/Admin/Elements/SelectModifyQueue,
-	webrt/Admin/Elements/SelectModifyUser,
-	webrt/Admin/Queues/Create.html, webrt/Admin/Queues/Modify.html,
-	webrt/Admin/Queues/index.html, webrt/Admin/Users/Create.html,
-	webrt/Admin/Users/Modify.html, webrt/Admin/Users/Prefs.html,
-	webrt/Admin/Users/index.html:
-
-	Lots of work on the web admin ui. basic user and queue editing working.
-	and template editing
-	
-2000-08-24 15:53  jesse
-
-	* Makefile, README, bin/rtmux.pl, etc/config.pm,
-	lib/RT/Action/SendEmail.pm, webrt/Elements/Footer,
-	webrt/Elements/Header, webrt/Elements/ViewUser,
-	webrt/Ticket/Elements/EditWatcherList:
-
-	The first cut at better configuration.
-	
-	Updated the readme
-	
-	Made the mail send routine in lib/RT/Action/Email.pm somewhat
-	more configurable (though we're still using printing to a pipe
-	because Mail::Mailer is busted :/)
-	
-	Most options moved out of the makefile..this will make packaging
-	possible.
-	
-	Fixed a couple places where tobias had been using a non-relative
-	url unnecessarily.
-	
-2000-08-22 03:08  jesse
-
-	* Makefile:
-
-	Getting version #s in sync for RT 1.3.15
-	
-2000-08-22 03:05  jesse
-
-	* lib/RT/: Scrip.pm, Transaction.pm, Action/AutoReply.pm,
-	Action/SendEmail.pm:
-
-	Work on making sure mail gets sent. It's not "right" yet but it's getting
-	closer.
-	
-2000-08-21 19:46  jesse
-
-	* webrt/autohandler:
-
-	Fixed a minor issue that let people "log in as ''"
-	
-2000-08-21 01:12  jesse
-
-	* bin/rtmux.pl, etc/config.pm, lib/RT/Ticket.pm, lib/RT/Tickets.pm:
-
-	Set a default type in ticket.pm
-	allowed restriction based on type in tickets.pm
-	
-	now set the timezone in the config file rather than the rtmux.
-	means it effects webmux.pl too.
-	
-2000-08-20 23:41  jesse
-
-	* etc/schema.mysql, lib/RT/Date.pm, webrt/Elements/SelectOwner:
-
-	Standardized StartsBy to Starts.
-	Removed a warning from SelectOwner
-	Fixed a bug in RT::Date->Set(Format => 'unknown')
-	
-2000-08-20 01:46  jesse
-
-	* lib/RT/Ticket.pm, webrt/Search/Listing.html,
-	webrt/Ticket/Elements/ShowMemberOf,
-	webrt/Ticket/Elements/ShowMembers:
-
-	Work on MemberOf and Members in Ticket.pm
-	they're both now Tickets objects rather than links objects.
-	and the things that use them have been updated
-	
-2000-08-19 03:03  jesse
-
-	* Makefile:
-
-	Bumped the version 1.3.14
-	
-2000-08-19 02:49  jesse
-
-	* README, etc/config.pm, lib/RT/Ticket.pm:
-
-	Did some work on logging. switched some carping to some logging.
-	
-2000-08-18 02:04  jesse
-
-	* Makefile, README:
-
-	Minor readme updates.
-	
-	Bumped the version to 1.3.13
-	
-2000-08-18 01:04  jesse
-
-	* lib/RT/Transaction.pm:
-
-	CurrentUser objects act on things. not user Objects.  Thanks, Jens
-	
-2000-08-17 23:55  jesse
-
-	* webrt/Elements/: SelectOwner, Submit:
-
-	notes in select owner. a bit of tweaking in submit ot make it more visible
-	
-2000-08-17 16:16  jesse
-
-	* Makefile:
-
-	Changes to rt-mailgate to properly respect authenticated users
-	when performing %RT RESOLVE commands.
-	
-2000-08-17 03:01  jesse
-
-	* lib/RT/Interface/Web.pm:
-
-	Missed a checkin on Web.pm. sorry about that
-	
-2000-08-17 02:53  jesse
-
-	* bin/webmux.pl, lib/RT/Database.pm, lib/RT/Date.pm,
-	lib/RT/Ticket.pm, lib/RT/Interface/Web.pm:
-
-	Yanked the ancient lib/RT/Database.pm. It  never served any purpose
-	added some functionality to RT::Date. it can now take a date type
-	of 'unknown.'  This will "require" Date::Manip and parse it into
-	an ISO style date.  note that this should NEVER be called from RT's
-	core due to overhead. It is useful from web interfaces and CLI tools....
-	
-	added date::manip as a requirement to webmux.pl (so it gets loaded before
-	client hits)
-	
-	cleaned up Interface/Web.pm
-	
-	rationalized some of the routines dealing with date stuff in ticket.pm.
-	
-	Actual working web date changing should be coming "soon." (where soon is
-	defined as sometime this week)
-	
-2000-08-16 14:46  jesse
-
-	* webrt/Elements/Submit:
-
-	file Submit was initially added on branch rt-1-1.
-	
-2000-08-16 14:46  jesse
-
-	* webrt/: Login.html, index.html, Elements/Footer, Elements/Header,
-	Elements/Submit, Ticket/Elements/ShowBasics,
-	Ticket/Elements/ShowTransaction:
-
-	Various bits of webui cleanup
-	
-2000-08-16 14:16  jesse
-
-	* lib/RT/: Tickets.pm, Interface/Email.pm:
-
-	We can now search for tickets by relationship
-	
-2000-08-16 13:18  jesse
-
-	* lib/RT/CurrentUser.pm:
-
-	the real oneline patch that should make rt-mailgate work for new users again.
-	
-2000-08-15 01:17  jesse
-
-	* lib/RT/: Tickets.pm, Interface/Web.pm:
-
-	The first round of convenience methods in RT/Tickets.pm
-	Still need to do the ticket relations methods and the
-	date methods
-	
-2000-08-14 23:47  jesse
-
-	* webrt/Elements/SelectDateType:
-
-	file SelectDateType was initially added on branch rt-1-1.
-	
-2000-08-14 23:47  jesse
-
-	* webrt/Elements/SelectDateType:
-
-	ack. missed this in the wackiness with tonight's earlier checkin.
-	
-2000-08-14 19:35  jesse
-
-	* webrt/: Elements/Header, Elements/SelectDate,
-	Elements/SelectQueue, Elements/TitleBoxStart, Search/Listing.html,
-	Search/PickRestriction:
-
-	The rest of the previous commit.
-	
-2000-08-14 19:27  jesse
-
-	* etc/config.pm, webrt/Login.html, webrt/Logout.html,
-	webrt/autohandler, webrt/index.html, webrt/webrt.css,
-	webrt/Ticket/autohandler, webrt/Ticket/Elements/ShowMemberOf,
-	webrt/Ticket/Elements/ShowMembers,
-	webrt/Ticket/Elements/ShowSummary,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Cleaned up the ticket display a bit.
-	made logout actually properly erase session data
-	protected _everything_ with an autohandler in /
-	prettified Login.html
-	added some options to /Elements/TitleBoxHead...which seems to have been missed
-	
-2000-08-14 14:37  jesse
-
-	* README:
-
-	Added a warning about postmaster from JD
-	
-2000-08-13 21:57  jesse
-
-	* lib/RT/TicketCollection.pm, lib/RT/Tickets.pm,
-	lib/RT/Interface/Web.pm, webrt/Elements/SelectBoolean,
-	webrt/Elements/SelectDate, webrt/Elements/SelectMatch,
-	webrt/Elements/SelectOwner, webrt/Elements/SelectQueue,
-	webrt/Elements/SelectStatus, webrt/Elements/SelectWatcherType,
-	webrt/Search/Listing.html, webrt/Search/PickRestriction,
-	webrt/Search/TicketCell:
-
-	Significant work on the search and display code.
-	I'm not convinced that this doesn't introduce new bugs.
-	However, you can now search by ticket content.
-	
-	I will be reworking Tickets.pm a bit more to add a bunch of convenience methods
-	over then next week or so.
-	
-2000-08-12 18:07  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Fixed a bug in WatchersAsString. (RT::Watchers wasn't required early enough)
-	this whole routine needs to be redone :/
-	
-2000-08-12 18:06  jesse
-
-	* lib/RT/User.pm:
-
-	User->Create CanManipulate now defaults to 0.
-	
-2000-08-12 18:05  jesse
-
-	* etc/schema.mysql:
-
-	Updated the default user entries in schema.mysql to have the "CanManipulate"
-	flag set so they'd show up in owner lists.
-	
-2000-08-10 19:16  jesse
-
-	* README:
-
-	updated instructions for Apache install
-	
-2000-08-10 18:59  jesse
-
-	* etc/schema.mysql:
-
-	the queue values for the first queue were wrong
-	
-2000-08-10 17:55  jesse
-
-	* lib/RT/Ticket.pm:
-
-	BUGFIX: _UpdateTold now doesn't record a transaction, as things should be
-	
-2000-08-10 15:43  jesse
-
-	* etc/config.pm, etc/schema.Oracle, etc/schema.mysql,
-	lib/RT/Attachment.pm, lib/RT/Record.pm, lib/RT/Scrip.pm,
-	lib/RT/ScripScope.pm, lib/RT/Ticket.pm, lib/RT/TicketCollection.pm,
-	lib/RT/Tickets.pm, lib/RT/Transaction.pm, lib/RT/User.pm,
-	lib/RT/Action/AutoReply.pm, lib/RT/Action/Notify.pm,
-	lib/RT/Action/SendEmail.pm, lib/RT/Interface/Web.pm,
-	webrt/autohandler, webrt/Elements/Error,
-	webrt/Elements/SelectStatus, webrt/Ticket/Update.html,
-	webrt/Ticket/Elements/ShowBasics,
-	webrt/Ticket/Elements/ShowDependencies,
-	webrt/Ticket/Elements/ShowMemberOf,
-	webrt/Ticket/Elements/ShowMembers,
-	webrt/Ticket/Elements/ShowPeople,
-	webrt/Ticket/Elements/ShowReferences,
-	webrt/Ticket/Elements/ShowRequestor,
-	webrt/Ticket/Elements/TicketToolBox:
-
-	Fixed ACL caching bugs
-	Finished adding status "new"
-	cli searching based on status works better.
-	
-	API Change. Queue is NO LONGER the Queue Object for a ticket
-	API Change. Owner is NO LONGER the Owner Object for a ticket
-	
-	instead, both point to their proper database values and OwnerObj and QueueObj
-	do the right thing throughout. This was rather more code churn than I was hoping for, but we've now got a cleaner, more consistent API that's easier to work
-	with.
-	
-	little bits of POD update.
-	
-	Cleaned out some unused code.
-	
-	Made some error messages more professional.
-	
-	We now keep track of date started as well as a "start by" date.  these both
-	need a bit more work.
-	
-	Calling convention for _Set changed. Rather than three different calling
-	conventions which weren't very extensible, DBIx::Record::_Set and all its
-	subclasses now use paramhash style calling. it's much more extensible and
-	flexible now. (This was necessary for some ACL work, among other things)
-	
-2000-08-09 01:11  jesse
-
-	* lib/RT/Record.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
-	webrt/Elements/SelectStatus, webrt/Elements/dayMenu,
-	webrt/Elements/monthMenu, webrt/Elements/yearMenu:
-
-	ACL Decisions are now cached
-	date menus have a "never" option in the webui
-	added a new status. "new" for tickets that aren't yet open
-	
-2000-08-08 01:45  jesse
-
-	* etc/schema.mysql, lib/RT/Queue.pm:
-
-	schema updates.
-	fixed queue->Create
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/ModifyQueue.html:
-
-	file ModifyQueue.html was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/: CreateQueue.html, CreateUser.html,
-	ModifyQueue.html, ModifyUser.html, index.html,
-	Elements/CreateQueueCalled, Elements/CreateUserCalled,
-	Elements/ModifyQueue, Elements/ModifyUser,
-	Elements/SelectModifyQueue, Elements/SelectModifyUser:
-
-	Started the new web admin interface.
-	it can now edit queues and users and create queues and users
-	I'm fairly leery of its user handling stuff. particularly passwords
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/CreateUser.html:
-
-	file CreateUser.html was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/Elements/SelectModifyUser:
-
-	file SelectModifyUser was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/Elements/ModifyUser:
-
-	file ModifyUser was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/Elements/CreateUserCalled:
-
-	file CreateUserCalled was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/ModifyUser.html:
-
-	file ModifyUser.html was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/index.html:
-
-	file index.html was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/CreateQueue.html:
-
-	file CreateQueue.html was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/Elements/ModifyQueue:
-
-	file ModifyQueue was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/Elements/SelectModifyQueue:
-
-	file SelectModifyQueue was initially added on branch rt-1-1.
-	
-2000-08-08 01:44  jesse
-
-	* webrt/Admin/Elements/CreateQueueCalled:
-
-	file CreateQueueCalled was initially added on branch rt-1-1.
-	
-2000-08-07 22:28  jesse
-
-	* etc/schema.mysql, lib/RT/Date.pm, lib/RT/Ticket.pm,
-	lib/RT/Users.pm:
-
-	added a few ticket attributes for forwards compatibility
-	fixed another ACL problem in users.pm
-	fixed a date display bug
-	
-2000-08-07 01:03  jesse
-
-	* lib/RT/Transaction.pm, webrt/Ticket/Create.html,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Transaction.pm had some lingering ACL bugs ($CurrentUser) isn't a reasonable
-	global in core library routines :/
-	
-	Working on spawning subtickets.
-	
-2000-08-07 00:31  jesse
-
-	* webrt/User/Prefs.html:
-
-	file Prefs.html was initially added on branch rt-1-1.
-	
-2000-08-07 00:31  jesse
-
-	* webrt/Ticket/Elements/ShowDependencies:
-
-	file ShowDependencies was initially added on branch rt-1-1.
-	
-2000-08-07 00:31  jesse
-
-	* webrt/Ticket/Elements/ShowReferences:
-
-	file ShowReferences was initially added on branch rt-1-1.
-	
-2000-08-07 00:31  jesse
-
-	* webrt/Ticket/Elements/ShowMembers:
-
-	file ShowMembers was initially added on branch rt-1-1.
-	
-2000-08-07 00:31  jesse
-
-	* webrt/Ticket/Elements/ShowMemberOf:
-
-	file ShowMemberOf was initially added on branch rt-1-1.
-	
-2000-08-07 00:31  jesse
-
-	* webrt/Admin/EditUser.html:
-
-	file EditUser.html was initially added on branch rt-1-1.
-	
-2000-08-07 00:31  jesse
-
-	* webrt/Admin/Elements/EditUserComments:
-
-	file EditUserComments was initially added on branch rt-1-1.
-	
-2000-08-07 00:31  jesse
-
-	* etc/config.pm, lib/RT/Ticket.pm, webrt/EditUserComments.html,
-	webrt/ViewUser.html, webrt/webrt.css, webrt/Admin/EditUser.html,
-	webrt/Admin/ModifyUser, webrt/Admin/Elements/EditUserComments,
-	webrt/Elements/Error, webrt/Elements/Header,
-	webrt/Elements/SelectOwner, webrt/Ticket/Create.html,
-	webrt/Ticket/Create_Detail.html, webrt/Ticket/Display.html,
-	webrt/Ticket/Elements/EditWatcherList,
-	webrt/Ticket/Elements/ShowDependencies,
-	webrt/Ticket/Elements/ShowMemberOf,
-	webrt/Ticket/Elements/ShowMembers,
-	webrt/Ticket/Elements/ShowPeople,
-	webrt/Ticket/Elements/ShowReferences,
-	webrt/Ticket/Elements/ShowSummary, webrt/User/Prefs.html:
-
-	Did a bunch of work on the webui. cleaned up a lot of the link display stuff
-	did some work on ticket create
-	
-	dependencies and subtickets are now listed in the ticketview. yay!
-	
-2000-08-05 19:47  jesse
-
-	* lib/RT/Ticket.pm, webrt/Ticket/Elements/ShowSummary:
-
-	more Nobody fixes in Ticket.pm
-	justification fixes in ShowSummary
-	
-2000-08-05 18:50  jesse
-
-	* webrt/Ticket/ProcessUpdate.html:
-
-	The webui can now process updates.
-	it needed YA currentuser fix
-	
-2000-08-05 18:43  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Ticket::Create(Owner =>  now takes either a user object or a userid.
-	and defaults to nobody.
-	
-2000-08-05 17:51  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-2000-08-05 17:49  jesse
-
-	* lib/RT/: Date.pm, Interface/Email.pm:
-
-	fixed a few more bugs in the mailgateway. it can create tickets now.
-	fixed an undefined default in the cli query
-	made the date routine not spit out a stupid warning
-	
-2000-08-05 17:21  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	fixed typos in the mailgate. thanks gary
-	
-2000-08-05 00:16  jesse
-
-	* Makefile, NEWS, webrt/Login.html, webrt/autohandler,
-	webrt/webrt.css:
-
-	little tweaks to the webui.
-	bumped the version to 1.3.11 for distribution
-	
-2000-08-04 18:45  jesse
-
-	* README, bin/rtmux.pl, bin/webmux.pl, lib/RT/Areas.pm,
-	lib/RT/Attachments.pm, lib/RT/Date.pm, lib/RT/Link.pm,
-	lib/RT/Links.pm, lib/RT/Queue.pm, lib/RT/Queues.pm,
-	lib/RT/Record.pm, lib/RT/ScripScopes.pm, lib/RT/Scrips.pm,
-	lib/RT/Template.pm, lib/RT/Ticket.pm, lib/RT/Tickets.pm,
-	lib/RT/Transaction.pm, lib/RT/Transactions.pm, lib/RT/Users.pm,
-	lib/RT/Watchers.pm, lib/RT/Interface/Web.pm,
-	webrt/Admin/ModifyUser, webrt/Elements/SelectOwner,
-	webrt/Elements/SelectQueue, webrt/Elements/ViewUser,
-	webrt/Ticket/Display.html, webrt/Ticket/LinkIt.html,
-	webrt/Ticket/Elements/ShowPeople:
-
-	When creating an object, you ALWAYS need to pass in the current user
-	or acls break. we were a bit too lax about this before.
-	
-	this was a major round of bugfixing for the webui
-	
-2000-08-04 15:41  jesse
-
-	* Makefile, lib/RT/CurrentUser.pm, lib/RT/User.pm, webrt/webrt.css,
-	webrt/Elements/Header, webrt/Search/Listing.html,
-	webrt/Search/autohandler, webrt/Ticket/autohandler:
-
-	Queue listing doesn't have that ugly blue any more. And its code for
-	setting row color is a bit cleaner.
-	
-	we now actually _check_ passwords for web logins.
-	
-	webrt.css now has slightly darker hyperlinks.
-	
-	CurrentUser->IsPassword now uses the UserObj
-	
-	users can't use null passwords for authentication.
-	
-2000-08-03 02:19  jesse
-
-	* lib/RT/Interface/Web.pm, webrt/Elements/ShadedBox,
-	webrt/Elements/TitleBoxStart:
-
-	misc fixes to the webui and a leftover fix to the cli.
-	
-	the webui needs to have some of its internals gutted and
-	put back together. it feels very kludgy and not really "planned"
-	
-2000-08-03 02:04  jesse
-
-	* lib/RT/: Record.pm, Scrip.pm, Ticket.pm, Tickets.pm,
-	Transaction.pm, Action/SendEmail.pm:
-
-	made status changes work. (RT::Action::SendEmail was being stupid
-	and not error checking until it was too late)
-	
-	removed more use of hardwired SQL "now()"
-	
-	moved the handling of LastUpdated into RT::Record. from DBIx::Record
-	
-2000-08-03 01:09  jesse
-
-	* lib/RT/Queue.pm:
-
-	fixed a bug in the cli that kept ticket creates from working.
-	queue->hasright's calling convention changed.
-	
-2000-08-03 00:59  jesse
-
-	* Makefile:
-
-	fixed a makefile typo. added back the comment about pg
-	
-2000-08-03 00:42  jesse
-
-	* docs/design_docs/users:
-
-	file users was initially added on branch rt-1-1.
-	
-2000-08-03 00:42  jesse
-
-	* etc/user.Oracle:
-
-	file user.Oracle was initially added on branch rt-1-1.
-	
-2000-08-03 00:42  jesse
-
-	* etc/schema.Oracle:
-
-	file schema.Oracle was initially added on branch rt-1-1.
-	
-2000-08-03 00:42  jesse
-
-	* bin/initacls.Oracle, bin/initdb.Oracle, docs/README.oracle,
-	docs/design_docs/users, etc/schema.Oracle, etc/user.Oracle:
-
-	A first cut at oracle support from Dave Morgan <dmorgan@bartertrust.com>.
-	It is pretty much untested and guaranteed to break. Among other
-	things, the schema isn't current. but it's a start.
-	Thanks, Dave!
-	
-2000-08-03 00:42  jesse
-
-	* docs/README.oracle:
-
-	file README.oracle was initially added on branch rt-1-1.
-	
-2000-08-03 00:42  jesse
-
-	* bin/initacls.Oracle:
-
-	file initacls.Oracle was initially added on branch rt-1-1.
-	
-2000-08-03 00:42  jesse
-
-	* bin/initdb.Oracle:
-
-	file initdb.Oracle was initially added on branch rt-1-1.
-	
-2000-08-03 00:31  jesse
-
-	* docs/design_docs/local_hacking:
-
-	file local_hacking was initially added on branch rt-1-1.
-	
-2000-08-03 00:31  jesse
-
-	* HACKING, Makefile, docs/FAQ.html, docs/actions.html,
-	docs/admin.html, docs/attributes.html, docs/outline.html,
-	docs/rt_users_guide.html, docs/design_docs/local_hacking:
-
-	doc updates. removed outdated 1.x docs
-	
-2000-08-02 23:53  jesse
-
-	* etc/config.pm:
-
-	added some comments from tobias
-	
-2000-08-02 00:20  jesse
-
-	* Makefile, NEWS, TODO, etc/config.pm, etc/schema.mysql,
-	lib/RT/ACE.pm, lib/RT/ACL.pm, lib/RT/CurrentUser.pm,
-	lib/RT/Date.pm, lib/RT/Queue.pm, lib/RT/Record.pm,
-	lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/User.pm,
-	lib/RT/Interface/Email.pm:
-
-	
-	Weekend of 1 Aug 2000
-	---------------------
-	I spent the weekend in DC visiting family.   This meant I got a bit of
-	code written ;)  Sadly, I have no access to the CVS server,
-	so I'll be batching a bunch of commits.
-	
-	1. Enabled CLI admin tool
-	2. Added ACL listing functionality to the CLI admin tool.
-	3. Enhanced RT::Queue->Grant such that it works with the structure of RT2
-	   ACLs
-	4. Made the Logging framework actually log errors to STDERR.
-	   (This makes debugging the CLI tools much easier. It also means
-	    that the cli tools explain _why_ they're dying.)
-	5. Fully expunged use of Mysql's SQL keyword "now()". I'd have left this
-	   stuff in, except mysql doesn't seem to deal well with the idea that the
-	   entire world isn't one timezone.  On top of that, it doesn't seem to
-	   have a way to force it into GMT mode that doesn't involve modifying init
-	   scripts. *sigh*
-	6. Did a whole bunch more work on the ACL checking in RT::User
-	7. Wrote up some preliminary docs on local hacks to RT
-	8. Added in a routine to allow local canonicalization of email addresses
-	9. Added in the concept of "Disabled users"  To preserve RT2's database
-	   Integrity, whacking user accounts would be a bad thing. So, instead,
-	   we've got the concept of 'disabled' users. A disabled user fails ANY
-	   ACL check, ANY password check and doesn't appear in any lists of ACLs.
-	   (note that the lastmost statement isn't yet true)
-	
-	10. rtadmin user -enable and rtadmin user -disable now work.
-	11. ACLs are now enforced for many ticket related actions.
-	    (this does mean that you'll want to insert some acls like those below)
-	
-	INSERT INTO ACL VALUES (1,0,'User','SuperUser','Queue',0);
-	INSERT INTO ACL VALUES (2,3,'User','CreateTicket','Queue',0);
-	INSERT INTO ACL VALUES (3,3,'User','ShowTicket','Ticket',0);
-	INSERT INTO ACL VALUES (4,3,'User','ShowTicketHistory','Ticket',0);
-	INSERT INTO ACL VALUES (6,3,'User','CreateTicket','Queue',1);
-	INSERT INTO ACL VALUES (7,3,'User','ModifyTicket','Ticket',1);
-	INSERT INTO ACL VALUES (8,1,'User','Superuser','System',0);
-	INSERT INTO ACL VALUES (9,0,'Everyone','Superuser','System',0);
-	
-2000-08-02 00:17  jesse
-
-	* bin/: rtmux.pl, testdeps.pl:
-
-	Bumped us up to requiring Log::Dispatch 1.6.
-	Cleaned up testdeps a bit. Now, you knwo it passes.
-	
-2000-07-27 03:01  jesse
-
-	* Makefile:
-
-	Bumped the version to 1.3.9
-	Rolled RT 1.3.9
-	
-2000-07-27 02:37  jesse
-
-	* lib/RT/Date.pm, lib/RT/Ticket.pm, webrt/Elements/ViewUser,
-	webrt/Ticket/Elements/ShowDates, webrt/Ticket/Elements/ShowSummary,
-	webrt/Ticket/Elements/ShowTransaction, bin/webmux.pl:
-
-	Fixed a bug with null due dates.
-	Made RT/Date deal with a time of -1 as "Never"
-	made html escaping on included entities on webrt default.
-	
-2000-07-27 02:01  jesse
-
-	* lib/RT/Date.pm:
-
-	file Date.pm was initially added on branch rt-1-1.
-	
-2000-07-27 02:01  jesse
-
-	* README, lib/RT/Date.pm, lib/RT/Record.pm, lib/RT/Ticket.pm,
-	bin/testdeps.pl:
-
-	Moved Date managment routines from DBIx::Record to RT::Record.
-	Initial Checkin of RT::Date, a lightweight Date object capable
-	of doing everything RT needs. Oh. and it's fully documented in POD.
-	
-	Converted RT::Record and RT::Ticket and the cli to use RT::Date instead
-	of Date::Kronos.  The CLI now feels _much_ zippier and code within
-	RT::Ticket is a bit easier to read.
-	
-2000-07-27 01:55  jesse
-
-	* etc/schema.mysql:
-
-	removed extraneous whitespace
-	
-2000-07-27 01:51  jesse
-
-	* lib/RT/Attachment.pm:
-
-	changed the header on attachment.pm
-	
-2000-07-24 10:17  tobiasb
-
-	* lib/RT/Interface/Web.pm, webrt/ViewUser.html,
-	webrt/Search/TicketCell, webrt/Ticket/Display.html,
-	webrt/Ticket/ProcessUpdate.html, webrt/Ticket/Update.html:
-
-	Moved some things to Web.pm, made some nifty options for getting tickets from the listing in a new window
-	
-2000-07-24 06:56  tobiasb
-
-	* lib/RT/User.pm:
-
-	Some TODOs
-	
-2000-07-24 06:54  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	Some comments and TODOs.
-	
-	I fixed one simple TODO about putting in pid + rand into the name of
-	the temp directory needed for parsing the mime entity.
-	
-2000-07-24 00:52  jesse
-
-	* lib/RT/User.pm:
-
-	Added a few comments where they really should be
-	
-2000-07-24 00:48  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	Did a bunch of cleanup work on Interface/Email.pm
-		It could still use more.
-	
-2000-07-23 03:50  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Added the method 'TimeWorkedAsString'.  Ok, I'll start looking into Date::Kronos shortly :)
-	
-2000-07-22 20:10  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	[no log message]
-	
-2000-07-22 20:05  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	Inserted a reference to [fsck 290] in a TODO-comment.
-	
-2000-07-22 13:06  tobiasb
-
-	* lib/RT/Interface/Web.pm, webrt/Search/Listing.html:
-
-	Moved stuff from Listing.html to Web.pm, sub ProcessSearchQuery (suggestions to a better name for the sub?)
-	
-2000-07-21 15:11  tobiasb
-
-	* lib/RT/Ticket.pm, lib/RT/Interface/Web.pm,
-	webrt/Search/Listing.html:
-
-	bugfixing
-	
-2000-07-21 11:09  tobiasb
-
-	* etc/schema.mysql:
-
-	Bugfix
-	
-2000-07-21 10:57  tobiasb
-
-	* webrt/index.html:
-
-	Now it's possible to select queue from the start page
-	
-2000-07-21 10:35  tobiasb
-
-	* lib/RT/Attachment.pm, lib/RT/Ticket.pm, webrt/Elements/Header,
-	webrt/Elements/SelectOwner, webrt/Ticket/Elements/EditWatcherList:
-
-	bugfixes, comments.  I restricted the Owner-list to those that CanManipulate - this should eventually go away when we have proper access control.  Tiny improvement of EditWatcherList - it's now possible to edit user information if the user is found.
-	
-2000-07-21 05:48  tobiasb
-
-	* lib/RT/CurrentUser.pm:
-
-	bugfix
-	
-2000-07-21 00:08  jesse
-
-	* lib/RT/ACE.pm, lib/RT/Attachment.pm, lib/RT/Queue.pm,
-	lib/RT/Ticket.pm, lib/RT/User.pm, webrt/EditUserComments.html:
-
-	Cleaned up language in EditUserComments
-	
-	did work on watchers in ui/cli/admin and Ticket.pm and User.pm
-	cleaned up code in Ticket.pm
-	
-	Start of some work on acls in Queue.pm
-	
-2000-07-20 22:13  tobiasb
-
-	* lib/RT/Interface/Web.pm, webrt/Elements/SelectWatcherType,
-	webrt/Ticket/Display.html, webrt/Ticket/EditWatchers.html,
-	webrt/Ticket/Elements/EditWatcherList,
-	webrt/Ticket/Elements/ShowHistory, webrt/Ticket/Elements/ShowLinks,
-	webrt/Ticket/Elements/TicketToolBox:
-
-	Some code improvements, added one popular demand here; to avoid spending too much time clicking around, it should be possible to show all histoies of member requests at the same page.
-	
-2000-07-20 18:31  tobiasb
-
-	* lib/RT/CurrentUser.pm:
-
-	Fixing a bit.  Please try to remember to test code before committing
-	it :)
-	
-2000-07-20 18:09  tobiasb
-
-	* webrt/Ticket/ProcessUpdate.html:
-
-	once more I've committed without testing..
-	
-2000-07-20 18:02  tobiasb
-
-	* lib/RT/CurrentUser.pm:
-
-	Removed a compile-time bug
-	
-2000-07-20 17:48  tobiasb
-
-	* lib/RT/User.pm:
-
-	bugfix
-	
-2000-07-20 17:39  tobiasb
-
-	* etc/config.pm, lib/RT/Ticket.pm, lib/RT/User.pm,
-	lib/RT/Watcher.pm, lib/RT/Interface/Web.pm,
-	webrt/Ticket/Display.html:
-
-	bugfixes + conflict resolving at the signature + moved something to Web.pm from Display.html
-	
-2000-07-20 17:31  jesse
-
-	* lib/RT/: CurrentUser.pm, User.pm:
-
-	Culled some not-for-now signature stuff.
-	Cleaned up and optimised CurrentUser->UserObj
-	
-2000-07-20 16:39  jesse
-
-	* Makefile, NEWS:
-
-	doing some work for a customer.  rt-mailgate --help should tell you
-	about the fabulous new mail mode
-	
-2000-07-20 15:39  tobiasb
-
-	* lib/RT/Interface/Web.pm, webrt/Ticket/Display.html:
-
-	moving things from the template to Web.pm was not as straight-forwarded as I had hoped.
-	
-2000-07-20 15:20  tobiasb
-
-	* lib/RT/Attachment.pm, lib/RT/CurrentUser.pm, lib/RT/User.pm,
-	lib/RT/Interface/Web.pm, webrt/Ticket/Display.html:
-
-	Started moving stuff to Web.pm, fixed and tested signatures
-	
-2000-07-20 14:50  tobiasb
-
-	* lib/RT/: CurrentUser.pm, User.pm:
-
-	moved signature from currentuser to user (but does it make sense, anyway?  Signatures is something 'personal' that belongs only to the current user?)
-	
-2000-07-20 14:43  tobiasb
-
-	* webrt/ViewUser.html:
-
-	bugfix ... hmpf, always test before committing .. always test before committing ...
-	
-2000-07-20 14:33  tobiasb
-
-	* lib/RT/Interface/Web.pm, webrt/ViewUser.html:
-
-	bugfix
-	
-2000-07-20 14:11  tobiasb
-
-	* lib/RT/Interface/Web.pm:
-
-	file Web.pm was initially added on branch rt-1-1.
-	
-2000-07-20 14:11  tobiasb
-
-	* lib/RT/Interface/Web.pm:
-
-	I'm considering to move things from Display.html and ProcessUpdate.html to Web.pm.  Comments?
-	
-2000-07-20 14:06  jesse
-
-	* lib/RT/Watcher.pm:
-
-	Removed the bogus code frol lib/RT/Watcher.pm
-	
-2000-07-20 13:39  jesse
-
-	* lib/RT/User.pm:
-
-	reversed some bogus code
-	
-2000-07-20 11:44  tobiasb
-
-	* webrt/Ticket/Elements/EditWatcherList:
-
-	file EditWatcherList was initially added on branch rt-1-1.
-	
-2000-07-20 11:44  tobiasb
-
-	* webrt/Elements/SelectWatcherType:
-
-	file SelectWatcherType was initially added on branch rt-1-1.
-	
-2000-07-20 11:44  tobiasb
-
-	* webrt/: Elements/SelectWatcherType,
-	Ticket/Elements/EditWatcherList:
-
-	Now it's possible to edit ticket and queue watchers.  It's really horrible, but at least it works
-	
-2000-07-20 11:43  tobiasb
-
-	* webrt/Ticket/: EditWatchers.html, Update.html:
-
-	Small comment
-	
-2000-07-20 11:40  tobiasb
-
-	* webrt/Ticket/Update.html:
-
-	Linked in the 'edit watchers' functionality
-	
-2000-07-20 11:27  tobiasb
-
-	* lib/RT/Ticket.pm, lib/RT/Watcher.pm,
-	webrt/Ticket/EditWatchers.html:
-
-	Now it's possible to edit ticket and queue watchers.  It's really horrible, but at least it works
-	
-2000-07-20 11:27  tobiasb
-
-	* lib/RT/User.pm:
-
-	bugfix
-	
-2000-07-20 11:23  tobiasb
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	This is sort of a local hack, I guess it should be separated ... but maybe not.  if content-type =~ /^text/(?\!plain)/, there is now a link for 'view this as plain text', which might be useful for unknown text formats and for viewing 'code'
-	
-2000-07-20 02:59  jesse
-
-	* lib/RT/: ACE.pm, ACL.pm:
-
-	I'm committing ACE.pm and ACL.pm so people can get a bit of a taste of what I'm doing. They don't work, they probably don't even compile yet, but they're not getting called from the rest of the code yet.
-	
-	These aren't the droids you're looking for.
-	
-2000-07-20 02:58  jesse
-
-	* lib/RT/User.pm:
-
-	updated User.pm to match the schema
-	
-2000-07-19 16:45  tobiasb
-
-	* webrt/Ticket/EditWatchers.html:
-
-	file EditWatchers.html was initially added on branch rt-1-1.
-	
-2000-07-19 16:45  tobiasb
-
-	* webrt/Ticket/EditWatchers.html:
-
-	This should be a template for adding and removing watchers; will be completed tomorrow
-	
-2000-07-19 16:10  tobiasb
-
-	* webrt/: Logout.html, ViewUser.html, Search/Listing.html,
-	Ticket/Display.html, Ticket/Update.html,
-	Ticket/Elements/ShowPeople, Ticket/Elements/ShowSummary:
-
-	It's now possible to edit user data (realname, userid, email) from the web ui
-	
-2000-07-19 16:04  tobiasb
-
-	* lib/RT/: CurrentUser.pm, Ticket.pm, Watcher.pm,
-	Interface/Email.pm:
-
-	Worked a bit with requestors; 1) if we already have a user object at the requestor, we should use it.  2) it should be possible to edit the users email without also updating the watcher email if those are the same.  3) if a user enters an email with a different from address, but can be identified as a previous user (by equal real name or other means of authentication), the email field in the watcher table should be used
-	
-2000-07-19 10:06  tobiasb
-
-	* webrt/Elements/Header:
-
-	bugfixing
-	
-2000-07-19 08:53  tobiasb
-
-	* webrt/webrt.css:
-
-	Our web designer didn't like red table borders
-	
-2000-07-19 08:52  tobiasb
-
-	* webrt/: Elements/Header, Search/Listing.html:
-
-	Fun #440: Popular wish: Fixed alternating colours at the lines in Listing.html
-	
-2000-07-19 07:41  tobiasb
-
-	* webrt/webrt.css:
-
-	oddline for use in Listing.html
-	
-2000-07-19 06:54  tobiasb
-
-	* webrt/Elements/Header:
-
-	nicer
-	
-2000-07-19 06:51  tobiasb
-
-	* webrt/: index.html, Elements/Header:
-
-	Fun #666; Form 'view bug #xxx' from display and the front page
-	
-2000-07-18 04:17  tobiasb
-
-	* etc/schema.mysql:
-
-	bug #286; two nines in schema.sql
-	
-2000-07-14 11:40  tobiasb
-
-	* webrt/Search/TicketCell:
-
-	I'm currently trying to fix it so that each user can put in options in the session information (or should it rather be in the DB?) about whether they want tickets to pop up in separate windows or not.
-	
-2000-07-14 10:47  tobiasb
-
-	* etc/schema.mysql, lib/RT/Link.pm, lib/RT/Ticket.pm,
-	lib/RT/Action/StallDependent.pm,
-	webrt/Ticket/Elements/TicketToolBox:
-
-	added a scrip for stalling members upon membership linking ... now it's impossible for a request to make a link to itself ... now it's possible to open a request from the ticket display
-	
-2000-07-14 09:29  tobiasb
-
-	* webrt/Ticket/ProcessUpdate.html:
-
-	TODO: Public comments are currently beeing threated as private
-	comments (that's better than it beeing ignored ... at least at the
-	moment)
-	
-	Now it skips trying to build a MIME entity if there are no message.
-	
-2000-07-14 09:11  tobiasb
-
-	* webrt/ViewUser.html:
-
-	Bugfix
-	
-2000-07-14 09:09  tobiasb
-
-	* webrt/Search/Listing.html:
-
-	Killed a warning
-	
-2000-07-13 13:31  tobiasb
-
-	* webrt/index.html:
-
-	Typo
-	
-2000-07-13 11:44  tobiasb
-
-	* webrt/Elements/Header:
-
-	huh?  seems like I've lost the control of CVS a bit today :)
-	
-2000-07-13 11:43  tobiasb
-
-	* webrt/Elements/Header:
-
-	[no log message]
-	
-2000-07-13 11:36  jesse
-
-	* webrt/index.html:
-
-	tobix missed a &>
-	
-2000-07-13 11:08  tobiasb
-
-	* webrt/: Search/RestrictSearch.html, Ticket/Display.html,
-	Ticket/ProcessUpdate.html, Ticket/Update.html:
-
-	Dealt with the footer; it does not need overriding anywhere, and is thus placed in the autohandler
-	
-2000-07-13 11:04  tobiasb
-
-	* webrt/: Logout.html, ViewUser.html, autohandler, index.html,
-	Elements/Header, Search/Listing.html, Ticket/Modify.html,
-	Ticket/ValidateUpdate.html:
-
-	Dealt with the header module; it's now in the .html templates, not in autohandler ... the title should be nice and informative in all the templates ... and the instance name is viewed along with the header
-	
-2000-07-13 07:26  tobiasb
-
-	* lib/RT/Link.pm, lib/RT/Ticket.pm, webrt/index.html,
-	webrt/Elements/SelectResultsPerPage, webrt/Search/Listing.html,
-	webrt/Search/PickRestriction:
-
-	small bugfix + better handling of LimitResultsOnPage
-	
-2000-07-12 14:09  tobiasb
-
-	* lib/RT/: Ticket.pm, Transaction.pm:
-
-	bugfix'es.  duplicated linking actions are now turned down.
-	
-2000-07-12 01:39  jesse
-
-	* etc/schema.mysql:
-
-	updated the schema for User objects. now they've got _even more_ data.
-	and better extension capabilities.
-	
-2000-07-12 00:10  tobiasb
-
-	* lib/RT/Attachment.pm, lib/RT/Scrip.pm, lib/RT/ScripScope.pm,
-	lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	lib/RT/Action/SendEmail.pm, lib/RT/Action/StallDependent.pm,
-	webrt/Elements/SelectResultsPerPage, webrt/Elements/ViewUser,
-	webrt/Ticket/Create.html, webrt/Ticket/Elements/ShowTransaction:
-
-	Debugged a bit and removed some critical bugs
-	
-2000-07-11 14:43  tobiasb
-
-	* webrt/Elements/ViewUser:
-
-		<% $User->Comments || "No comment entered about this user" |h %>
-	
-	"|h" seems like some random noise, or have I misunderstood something?
-	
-2000-07-11 12:19  tobiasb
-
-	* etc/schema.mysql:
-
-	Comments
-	
-2000-07-11 11:30  tobiasb
-
-	* lib/RT/Transaction.pm, lib/RT/Action/AutoReply.pm,
-	webrt/Logout.html, webrt/ViewUser.html:
-
-	more debug logging + some bugfixing (exception handling)
-	
-2000-07-10 20:09  jesse
-
-	* bin/testdeps.pl, etc/schema.mysql, lib/RT/Ticket.pm:
-
-	work on ACLs. some acl decisions are now made.
-	
-2000-07-10 17:13  jesse
-
-	* etc/schema.mysql, lib/RT/ACL.pm, lib/RT/CurrentUser.pm,
-	lib/RT/Queue.pm, lib/RT/Record.pm, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm, lib/RT/User.pm, lib/RT/Interface/Email.pm,
-	webrt/Ticket/Display.html:
-
-	Wow. all kinds of work.
-	
-	Beginning of implementation of ACLs. lots of code cleanup.
-	
-	schema changes for Groups and Acls.
-	
-	we now use MIMEObj EVERYWHERE instead of MIMEEntity.
-	
-2000-06-29 20:36  jesse
-
-	* Makefile:
-
-	bumped to 1.0.4pre2
-	fixed perms issue for lib/templates
-	
-2000-06-29 16:11  jesse
-
-	* Makefile, etc/schema:
-
-	makefile fixes. bump to 1.0.4pre1
-	schema.mysql has a longer phone number field
-	
-2000-06-26 15:35  jesse
-
-	* README:
-
-	[no log message]
-	
-2000-06-26 15:10  jesse
-
-	* Makefile, bin/rtmux.pl, bin/testdeps.pl:
-
-	added Date::Manip to testdeps.pl
-	set $ENV{'TZ'} in bin/rtmux.pl to deal with a bug in Date::Manip
-	bumped the version to 1.3.8
-	
-2000-06-26 14:38  jesse
-
-	* bin/testdeps.pl:
-
-	added Date::Kronos to testdeps.pl
-	
-2000-06-26 14:36  jesse
-
-	* bin/testdeps.pl:
-
-	added Time::Seconds to testdeps.pl
-	
-2000-06-26 14:31  jesse
-
-	* bin/testdeps.pl, webrt/autohandler, webrt/webrt.css,
-	webrt/Elements/ViewUser, webrt/Ticket/Elements/ShowTransaction:
-
-	various hacking for RTCon pilsen. a much enhanced testdeps.pl
-	
-2000-06-16 10:51  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	some commentary.
-	
-2000-06-16 08:57  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	Sort of a bugfix
-	
-2000-06-16 08:56  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	Removed some old garbage
-	
-	TODO: Fix message trailer
-	
-2000-06-16 04:37  tobiasb
-
-	* lib/RT/: Attachment.pm, Record.pm, Ticket.pm, Transaction.pm:
-
-	It's no longer mandatory to have a Creator in every RT table.  It's just to set them 'read/auto'-accessible.  This should fix bug #275
-	
-2000-06-15 16:43  tobiasb
-
-	* etc/config.pm, lib/RT/Attachment.pm, lib/RT/Link.pm,
-	lib/RT/Ticket.pm, webrt/Elements/MessageBox,
-	webrt/Ticket/Display.html, webrt/Ticket/LinkIt.html,
-	webrt/Ticket/ProcessUpdate.html, webrt/Ticket/Update.html,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	some few bugfixes + some work to get 'reply-linking' working.  In my local version of RT (only changes in the config.pm) people can now enter a 'FAQ-tag', and the right article from KB is automaticly inserted in the reply.
-	
-2000-06-15 12:22  tobiasb
-
-	* webrt/ViewUser.html:
-
-	file ViewUser.html was initially added on branch rt-1-1.
-	
-2000-06-15 12:22  tobiasb
-
-	* lib/RT/Attachment.pm, lib/RT/CurrentUser.pm, lib/RT/Ticket.pm,
-	lib/RT/User.pm, lib/RT/Interface/Email.pm, webrt/ViewUser.html,
-	webrt/autohandler, webrt/Elements/Error, webrt/Elements/Footer,
-	webrt/Elements/Header, webrt/Elements/ViewUser,
-	webrt/Ticket/ProcessUpdate.html, webrt/Ticket/Update.html,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	lots of bugfixes and some enhancements:
-	- signature in replies
-	- Creator, LastUpdated etc. should be updated in User.pm
-	- The message headers of inbound requests is now decoded ... this is
-	  some sort of a hack as it discards charset information in the header.
-	  Anyway, in those cases where the header data will be in the same charset
-	  as the body, this works out nicely.
-	- I'm allowing a user to see what data is stored at him.  We might need ACLs
-	  for the user comment.  Also, this one is placed directly on the root, so
-	  it will break if the user is not logged in.  Also, the page and the module
-	  is 'ViewUser', 'ShowUser' would be more consistent.
-	- Prettified the ShowTransaction header
-	
-2000-06-15 09:02  tobiasb
-
-	* etc/schema.mysql:
-
-	Added "Signature" to the Users table and worked a bit at the comments
-	
-2000-06-14 09:24  tobiasb
-
-	* lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	webrt/Ticket/Display.html, webrt/Ticket/Elements/TicketToolBox:
-
-	Tons of minor bugfixes and enhancements
-	
-2000-06-14 09:19  tobiasb
-
-	* etc/schema.mysql:
-
-	Added this:
-	
-	##TODO: Get Notify.pm to support OldOwner + fix a template
-	#INSERT INTO Scrips VALUES (20, 'NotifyOldOwnerOnSteal',
-	#			  'Sends mail to the old owner when the ticket is stolen',
-	#			  'Steal','Notify',10,'OldOwner',1,NULL,1,NULL);
-	
-2000-06-14 06:54  tobiasb
-
-	* etc/schema.mysql, lib/RT/Attachment.pm, lib/RT/Record.pm,
-	lib/RT/Ticket.pm, webrt/Ticket/Display.html,
-	webrt/Ticket/Elements/ShowDates:
-
-	minor enhancements and bugfixes
-	
-2000-06-14 03:30  tobiasb
-
-	* etc/schema.mysql:
-
-	I just noticed that Jesse already had a 'resolution' attribute in the ticket.  I guess that covers the same as my 'state' attribute
-	
-2000-06-14 00:12  tobiasb
-
-	* lib/RT/Attachment.pm, webrt/Elements/ViewUser,
-	webrt/Search/Listing.html, webrt/Search/PickRestriction,
-	webrt/Ticket/Elements/ShowDates:
-
-	Some enhancements and bugfixes
-	
-2000-06-13 23:26  tobiasb
-
-	* webrt/Ticket/Elements/ShowDates:
-
-	improved
-	
-2000-06-13 20:42  tobiasb
-
-	* etc/schema.mysql:
-
-	Bugfix
-	
-2000-06-13 15:53  tobiasb
-
-	* lib/RT/TicketCollection.pm, webrt/Search/Listing.html:
-
-	Trying to get search on requestor to work - unsuccessful so far :/
-	
-2000-06-13 10:23  tobiasb
-
-	* webrt/: autohandler, Ticket/Display.html,
-	Ticket/Elements/TicketToolBox:
-
-	Some bugfixes
-	
-2000-06-13 06:41  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Bugfix
-	
-2000-06-09 14:43  tobiasb
-
-	* webrt/EditUserComments.html:
-
-	Hm, aaaalways check if everything is working before committing.  Argh.
-	
-2000-06-09 14:30  tobiasb
-
-	* webrt/: EditUserComments.html, autohandler, Elements/Error,
-	Elements/ViewUser:
-
-	added a minimum interface for editing comments about users
-	
-2000-06-09 12:53  tobiasb
-
-	* webrt/Ticket/Elements/ShowRequestor:
-
-	file ShowRequestor was initially added on branch rt-1-1.
-	
-2000-06-09 12:53  tobiasb
-
-	* webrt/Elements/ViewUser:
-
-	file ViewUser was initially added on branch rt-1-1.
-	
-2000-06-09 12:53  tobiasb
-
-	* webrt/EditUserComments.html:
-
-	file EditUserComments.html was initially added on branch rt-1-1.
-	
-2000-06-09 12:53  tobiasb
-
-	* etc/schema.mysql, lib/RT/Ticket.pm, lib/RT/User.pm,
-	lib/RT/Users.pm, lib/RT/Watcher.pm, lib/RT/Interface/Email.pm,
-	webrt/EditUserComments.html, webrt/Elements/ViewUser,
-	webrt/Ticket/ProcessUpdate.html, webrt/Ticket/Elements/ShowPeople,
-	webrt/Ticket/Elements/ShowRequestor,
-	webrt/Ticket/Elements/ShowSummary:
-
-	added a large section in the ticket view for earlier requests (stubbed) by the same requestor and comments about the requestor (the interface for editing those comments are stubbed)
-	
-2000-06-09 04:32  tobiasb
-
-	* etc/schema.mysql:
-
-	Added "Lang" to the users table
-	
-2000-06-08 10:17  tobiasb
-
-	* etc/config.pm, etc/schema.mysql, lib/RT/Ticket.pm,
-	webrt/Elements/SelectMatch, webrt/Ticket/Display.html,
-	webrt/Ticket/Elements/TicketToolBox:
-
-	Added 'UpdateTold' sub to Tickets.  Some minor bugfixes and enhancements.  Not much testing done.
-	
-2000-06-08 08:19  tobiasb
-
-	* lib/RT/Ticket.pm, lib/RT/Transaction.pm, lib/RT/Watcher.pm,
-	lib/RT/Action/SendEmail.pm, lib/RT/Interface/Email.pm,
-	webrt/Ticket/Update.html:
-
-	A bit of debugging, and I managed to remove some annoying warnings
-	
-2000-06-08 08:10  tobiasb
-
-	* etc/schema.mysql:
-
-	bugfix
-	
-2000-06-08 07:59  tobiasb
-
-	* etc/schema.mysql:
-
-	Removed the area in one template.
-	
-2000-06-08 07:55  tobiasb
-
-	* etc/schema.mysql:
-
-	# I think it might make sense replacing "TIMESTAMP" with "DATETIME"
-	# for mysql.  Yes, indeed, I'll do that right away.
-	
-2000-06-08 06:53  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Removed some redundant lines.
-	
-2000-06-08 06:38  tobiasb
-
-	* etc/schema.mysql:
-
-	Inserted table AlternateEmails (commented out as for now).
-	
-	One bugfix (typo) in the ACL table.
-	
-2000-06-08 06:31  tobiasb
-
-	* etc/schema.mysql:
-
-	Grouped into folders
-	
-2000-06-08 05:47  tobiasb
-
-	* lib/RT/Attachment.pm, lib/RT/Ticket.pm, webrt/Login.html,
-	webrt/Search/Listing.html, webrt/Ticket/ProcessUpdate.html,
-	webrt/Ticket/Elements/ShowTransaction,
-	webrt/Ticket/Elements/TicketToolBox:
-
-	bugfixes + improvements requested from the support team; kill & take link from the front page, table borders in listing, reduced header printing ...
-	
-2000-06-07 16:15  tobiasb
-
-	* lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	webrt/Elements/MessageBox, webrt/Ticket/Elements/ShowTransaction:
-
-	bugfixes
-	
-2000-06-07 15:46  tobiasb
-
-	* etc/schema.mysql:
-
-	bugfix
-	
-2000-06-07 15:42  tobiasb
-
-	* lib/RT/: Ticket.pm, Transaction.pm:
-
-	bugfixes
-	
-2000-06-07 15:22  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Now, if some Record decendant can _Accessible('Created', auto) and _Accessible('LastUpdated', auto), they will be set automaticly (at least, that's the theory)
-	
-2000-06-07 14:16  tobiasb
-
-	* etc/schema.mysql:
-
-	mysql autosets the first TIMESTAMP in the table on every
-	update/insert.
-	
-2000-06-07 12:33  tobiasb
-
-	* webrt/autohandler:
-
-	The error handling here seems to work now ... but only for documents
-	at the root.  I thought those autohandlers were called recursively?
-	
-2000-06-07 12:12  tobiasb
-
-	* etc/config.pm, lib/RT/Record.pm, lib/RT/Ticket.pm:
-
-	working with those pesky dates
-	
-2000-06-07 11:51  tobiasb
-
-	* bin/webmux.pl:
-
-	bugfix
-	
-2000-06-07 08:37  tobiasb
-
-	* README:
-
-	Added Date::Kronos (not on CPAN yet) to README
-	
-2000-06-07 08:17  tobiasb
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	Different Comment and Reply links.  They link to the same page, but the default
-	action is changed.
-	
-2000-06-07 07:36  tobiasb
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	Now it doesn't display looooong text/plain attachments.
-	
-	We have a lot of ~1M text/plain attachments in our RT queue.
-	
-	I'm trying to hack my webrt.cgi to show attachments upon a
-	"PickUpTransaction" parameter.  I don't know how to do it in the
-	mason/mod_perl model.
-	
-2000-06-07 04:09  tobiasb
-
-	* webrt/Elements/MessageBox:
-
-	bugfix
-	
-2000-06-06 18:44  jesse
-
-	* etc/schema.mysql:
-
-	removed an outdated table
-	
-2000-06-06 15:42  jesse
-
-	* webrt/Login.html:
-
-	changed the name of the mason package to RT::Mason, so it didn't conflict with other instances
-	on the same webserver
-	
-	fixed a couple of Log::Dispatch(warn)s to (warning)s
-	
-	removed tobix' weird session crunching code that was messign me up
-	
-2000-06-06 15:42  jesse
-
-	* etc/config.pm, lib/RT/Ticket.pm:
-
-	changed the name of the mason package to RT::Mason, so it didn't conflict with other instances
-	on the same webserver
-	
-	fixed a couple of Log::Dispatch(warn)s to (warning)s
-	
-2000-06-06 15:41  jesse
-
-	* bin/webmux.pl:
-
-	changed the name of the mason package to RT::Mason, so it didn't conflict with other instances
-	on the same webserver
-	
-	f
-	
-2000-06-06 15:41  jesse
-
-	* README:
-
-	changed the name of the mason package to RT::Mason, so it didn't conflict with other instances
-	on the same webserver
-	
-2000-06-06 14:40  tobiasb
-
-	* webrt/Ticket/: Update.html, Elements/TicketToolBox:
-
-	I'm trying to set default action in Update.html dependent on which link the
-	user clicked at (update, comment or reply).  I'll continue tomorrow (dinnertime
-	now :)
-	
-2000-06-06 14:11  tobiasb
-
-	* webrt/Ticket/ProcessUpdate.html:
-
-	bugfix
-	
-2000-06-06 13:48  jesse
-
-	* etc/config.pm:
-
-	changed Log::Dispatch::VERSION (1.2) which didn't work
-	to the more standard perl syntax:  use Log::Dispatch 1.2;
-	
-	\ed an @ that tobix left in rtmux.pl
-	
-2000-06-06 13:47  jesse
-
-	* bin/rtmux.pl:
-
-	\ed an @ that tobix left in rtmux.pl
-	
-2000-06-06 13:32  jesse
-
-	* Makefile:
-
-	:%s/        /	/ in the makefile (convert spaces to tabs)
-	
-2000-06-06 13:15  tobiasb
-
-	* README:
-
-	Mostly doc changes
-	
-2000-06-06 11:36  tobiasb
-
-	* etc/config.pm:
-
-	bugfix
-	
-2000-06-06 11:15  tobiasb
-
-	* docs/FAQ:
-
-	Added some few tips
-	
-2000-06-06 11:05  tobiasb
-
-	* bin/rtmux.pl:
-
-	putted in some warnings about things that doesn't work
-	
-2000-06-06 04:21  tobiasb
-
-	* README:
-
-	added comments about DBMS'es
-	
-2000-06-05 16:54  tobiasb
-
-	* Makefile:
-
-	more bugfixes
-	
-2000-06-05 16:46  tobiasb
-
-	* Makefile:
-
-	bgfx
-	
-2000-06-05 14:01  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-2000-06-05 09:26  tobiasb
-
-	* README, etc/config.pm, etc/schema.mysql, webrt/autohandler:
-
-	done some documentation fixes
-	
-2000-06-05 07:14  tobiasb
-
-	* README:
-
-	updated the STATUS
-	
-2000-06-02 03:32  tobiasb
-
-	* etc/schema.mysql, lib/RT/Action/SendEmail.pm,
-	lib/RT/Interface/Email.pm, webrt/autohandler, webrt/Elements/Error:
-
-	bugfix
-	
-2000-06-01 23:28  tobiasb
-
-	* webrt/Ticket/Elements/TicketToolBox:
-
-	file TicketToolBox was initially added on branch rt-1-1.
-	
-2000-06-01 23:28  tobiasb
-
-	* etc/config.pm, etc/schema.mysql, lib/RT/Link.pm,
-	lib/RT/Ticket.pm, lib/RT/Action/SendEmail.pm,
-	lib/RT/Interface/Email.pm, webrt/autohandler, webrt/Elements/Error,
-	webrt/Elements/SelectOwner, webrt/Ticket/Create_Detail.html,
-	webrt/Ticket/Display.html, webrt/Ticket/ProcessUpdate.html,
-	webrt/Ticket/Update.html, webrt/Ticket/Elements/TicketToolBox:
-
-	 ... better logging (logs a warning when it's dieing during an eval) ... maybe the URL in the mails will work now ... misc bugfixes ... some better foldings ... better error handling in the WebUI (not tested!  You should absolutely see this, I have a feeling it's unsmart.  Check autohandler and Elements/Error) ... misc features added (default values on selectowners now work, auto-fill-in of requestor on create, auto-fill-in of subject on spawn, viewing actions on the ProcessUpdate, ProcessUpdate fixed up a bit ... hm, that's it)
-	
-2000-06-01 20:54  tobiasb
-
-	* bin/testdeps.pl:
-
-	Added Text::Wrapper for quoting of wide messages
-	
-2000-06-01 20:50  tobiasb
-
-	* lib/RT/Transaction.pm, lib/RT/Action/StallDependent.pm,
-	lib/RT/Interface/Email.pm, webrt/Login.html,
-	webrt/Ticket/autohandler, webrt/Ticket/Elements/ShowLinks:
-
-	lots of bugfixes and minor enhancements
-	
-2000-06-01 02:58  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-2000-06-01 02:20  jesse
-
-	* Makefile, NEWS:
-
-	work on the web ui. cleanups to the comment and reply pages as well as the
-	queue view and the ticket detail page
-	
-2000-05-31 14:28  tobiasb
-
-	* etc/config.pm, webrt/Search/Listing.html,
-	webrt/Search/TicketCell, webrt/Ticket/Display.html:
-
-	Popular demand: A link for taking an action from the listing page (reduces the change for concurrency problems)
-	
-2000-05-31 13:59  tobiasb
-
-	* webrt/Search/autohandler:
-
-	Uh, some weird debugging stuff came into the last commit - I should
-	have checked better.
-	
-	Some of those autohandlers seems like copies of each other.  There
-	must be better ways to do this (i.e. separating all the common stuff
-	into some module)?
-	
-2000-05-31 13:52  tobiasb
-
-	* lib/RT/Transaction.pm, lib/RT/Interface/Email.pm,
-	webrt/Search/Listing.html, webrt/Search/PickRestriction,
-	webrt/Search/autohandler, webrt/Ticket/Display.html,
-	webrt/Ticket/Elements/ShowHistory:
-
-	popular demands; more navigation ({back to listing} and {last transaction}) and misc details
-	
-2000-05-31 12:20  tobiasb
-
-	* webrt/Elements/SelectMatch:
-
-	This one is plain ugly at the moment.  Anyway, it's ment for a more advanced 'regexp match / glob match / word match / substring match / total match'
-	
-2000-05-31 12:20  tobiasb
-
-	* webrt/Elements/SelectMatch:
-
-	file SelectMatch was initially added on branch rt-1-1.
-	
-2000-05-31 11:55  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	bugfix
-	
-2000-05-31 09:53  tobiasb
-
-	* webrt/: Elements/SelectStatus, Ticket/Update.html:
-
-	Some popular demands from the support dept;
-	
-	I've made it possible to kill by selecting status dead
-	
-	Response is the default action.  I've added a cryptical line which
-	might or might not give a warning.  Ideally, I guess we should do the comment /
-	reply selection through submit buttons rather than through a select menu - what
-	di you think?
-	
-2000-05-30 22:46  tobiasb
-
-	* etc/config.pm, lib/RT/Attachment.pm:
-
-	Ah ... I had forgotten signatures.  Some stubbed work, I'll continue tomorrow
-	
-2000-05-30 22:31  tobiasb
-
-	* lib/RT/Attachment.pm, lib/RT/Attachments.pm, lib/RT/Record.pm,
-	lib/RT/Ticket.pm, lib/RT/Transaction.pm, webrt/Login.html,
-	webrt/Elements/MessageBox, webrt/Search/Listing.html,
-	webrt/Ticket/autohandler, webrt/Ticket/Elements/ShowTransaction:
-
-	Quoting works now ... fixed some other misc details + bugfixes ... and I've moved the date handling to RT::Record, it will be completed tomorrow (I hopecvs diff -uw | less)
-	
-2000-05-30 20:31  tobiasb
-
-	* webrt/Ticket/Create_Detail.html:
-
-	Removed those annoying blink tags.. :)
-	
-2000-05-30 20:14  tobiasb
-
-	* webrt/: Elements/MessageBox, Ticket/Create_Detail.html:
-
-	Still working on that MessageBox
-	
-2000-05-30 20:09  tobiasb
-
-	* webrt/: Elements/MessageBox, Ticket/Update.html:
-
-	Separated out the MessageBox
-	
-2000-05-30 20:09  tobiasb
-
-	* webrt/Elements/MessageBox:
-
-	file MessageBox was initially added on branch rt-1-1.
-	
-2000-05-30 19:56  tobiasb
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	Changed <BLOCKQUOTE> to <pre> for the message content.
-	
-	TODO: We really should HTML'ify and/or HTML-escape the Content.
-	
-2000-05-29 06:59  tobiasb
-
-	* Makefile:
-
-	Some bugfixes, but absolutely not tested.
-	
-2000-05-26 12:11  tobiasb
-
-	* webrt/Search/Listing.html:
-
-	Now it runs /Elements/Header - I was a bit annoyed because it was missing Title
-	
-2000-05-26 10:11  tobiasb
-
-	* webrt/Ticket/Display.html:
-
-	Seems like I had introduced an error here
-	
-2000-05-24 21:50  jesse
-
-	* lib/RT/Ticket.pm, lib/RT/TicketCollection.pm, lib/RT/Tickets.pm,
-	webrt/Search/Listing.html, webrt/Ticket/Display.html:
-
-	Working on persistable web queries. Introduced RT::TicketCollection
-	Arguably this should be in RT::Tickets. and may be some day
-	
-2000-05-24 21:50  jesse
-
-	* lib/RT/TicketCollection.pm:
-
-	file TicketCollection.pm was initially added on branch rt-1-1.
-	
-2000-05-24 08:00  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	It should also be possible to "unlink" something (i.e. if a link was
-	wrongly set).  This is not implemented, but at least mails with
-	an "unlink" command will not bounce now.
-	
-2000-05-23 18:49  tobiasb
-
-	* lib/RT/Transaction.pm:
-
-	Made the transaction text from a link action a bit more readable,
-	though this still needs quite some work.
-	
-2000-05-23 16:57  jesse
-
-	* Makefile:
-
-	Bumped to 1.3.7
-	
-2000-05-23 10:12  tobiasb
-
-	* etc/config.pm, lib/RT/Link.pm, lib/RT/Ticket.pm,
-	lib/RT/Interface/Email.pm, webrt/Ticket/Display.html:
-
-	I've started looking at the mail interface.  Now linking works through the mailgate, though we need some info in the docs.  I'm proposing that it should accept both commands in the headerlines ("RT-Command: Link/Resolve/Whatever blahblah") and traditional commands in the mail ("%RT Link", "%RT Resolve", etc), though I've only supported the first one yet.  Look at the comments in Email.pm for details.
-	
-2000-05-23 10:04  tobiasb
-
-	* lib/RT/Scrip.pm:
-
-	Bugfix/optimalization or something?
-	
-2000-05-22 19:09  tobiasb
-
-	* lib/RT/Ticket.pm, webrt/Ticket/Create_Detail.html,
-	webrt/Ticket/Display.html, webrt/Ticket/LinkIt.html:
-
-	I'm not very happy about some comprimises, choises and short-cuts I've done here, but anyway linking & spawning seems to work now.
-	
-2000-05-22 18:05  tobiasb
-
-	* lib/RT/Transaction.pm, lib/RT/Action/AutoReply.pm,
-	webrt/Ticket/Create.html, webrt/Ticket/Create_Detail.html,
-	webrt/Ticket/Display.html, webrt/Ticket/LinkIt.html:
-
-	all changes here are either related to getting the Create working from the web, or harmless details
-	
-2000-05-22 17:39  tobiasb
-
-	* webrt/Ticket/Display.html:
-
-	$Subject => $Subject||(no subject given)
-	
-	TODO: HTML-escape
-	
-2000-05-22 17:38  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Removed VerboseSubject and HTMLSubject
-	
-2000-05-22 17:24  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	I do use $Ticket->Subject (and other stuff as well) frequently when
-	I'm editing Mason.  There is two issues;
-	
-	1) Things might look freaked if the ticket has no subject, i.e. Display.html
-	
-	2) Things might get totally whacko if the subject contains HTML code.
-	
-	I could ensure the "right" behaviour all the places by using
-	HTML::Entities::encode (I've done it one place), and by always using
-	$Subject||"(No subject)".  Anyway, I think it might be more
-	appropriate to have a sub RT::Ticket::VerboseSubject and
-	RT::Ticket::HTMLSubject.
-	
-	What do you think?
-	
-2000-05-22 16:51  tobiasb
-
-	* webrt/Ticket/Display.html:
-
-	It seems like it can create and view new transactions now.
-	
-	My next step will be to fix linking
-	
-2000-05-22 16:47  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	I should never commit before testing ... I should never commit before testing ... I should never commit before ...
-	
-	bugfix.
-	
-2000-05-22 16:38  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	I'm trying to get a better propagation of error messages.  I'm a bit
-	amused to find lots of things that shouldn't pass `perl -w' and `use
-	strict'?
-	
-2000-05-22 15:52  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Removed a debug (?) line that was commented out:
-	
-	#      print "From is $From\n";
-	
-	...and inserted some other logging:
-	
-	- logs an info message with ticket id, subject and queue upon
-	successful message creation.
-	
-	- logs a warning if it couldn't be created.
-	
-2000-05-22 14:11  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	In RT::Ticket::Create: Defaulting queue to 'general', and warning when it's not set
-	
-2000-05-22 14:06  tobiasb
-
-	* README:
-
-	Added a 'rt-comment' to the recommended mail configuration
-	
-2000-05-22 14:04  tobiasb
-
-	* Makefile:
-
-	added a comment-mail-alias
-	
-2000-05-22 14:03  tobiasb
-
-	* etc/config.pm:
-
-	Hm ... $RT::CorrespondAddress is used in AutoReply.pm, while only
-	$MailAlias is set in config.pm.  I'm not sure if this is the Right(tm)
-	solution, but anyway ... I added those two lines, additions to the
-	Makefile and README file is coming up shortly ...
-	
-	$CorrespondAddress=$MailAlias;
-	$CommentAddress="!!RT_COMMENT_MAIL_ALIAS!!";
-	
-2000-05-22 12:53  tobiasb
-
-	* webrt/Ticket/Create_Detail.html:
-
-	fixed up a bug caused by too quick usage of cut&paste
-	
-2000-05-22 12:01  tobiasb
-
-	* webrt/Ticket/Create_Detail.html:
-
-	Done some work making this page look OK.  Now I will put in some logic
-	in Display.html for creating and linking requests.
-	
-2000-05-22 05:30  tobiasb
-
-	* webrt/Elements/SelectOwner:
-
-	# TODO: respect the ACLs!!
-	# This will be a list of some thousands requestors with the current scheme.
-	
-2000-05-19 12:37  tobiasb
-
-	* webrt/Ticket/Create.html:
-
-	Added a box for setting link information.  Only a web mockup, the
-	logic doesn't work yet.  Feel free to do whatever you'd like with this
-	one.  It might make sense to move this to the details page.
-	
-2000-05-19 12:17  jesse
-
-	* webrt/Ticket/LinkIt.html:
-
-	Code and formatting cleanups
-	
-2000-05-19 11:23  tobiasb
-
-	* etc/config.pm:
-
-	Removed some weird stuff
-	
-2000-05-19 10:59  jesse
-
-	* webrt/: index.html, Search/PickRestriction:
-
-	fixed some typos
-	
-2000-05-19 10:59  jesse
-
-	* etc/config.pm:
-
-	cleaned up the config file a bit
-	
-	<M-}>CVS: 	etc/config.pm
-	
-2000-05-19 08:42  tobiasb
-
-	* bin/testdeps.pl, bin/webmux.pl, webrt/Elements/SelectLinkType,
-	webrt/Ticket/Display.html, webrt/Ticket/LinkIt.html,
-	webrt/Ticket/ProcessUpdate.html, webrt/Ticket/Elements/ShowSummary,
-	webrt/Ticket/Elements/ShowTransaction:
-
-	Started the work getting links to work.  While the linking doesn't work yet, this is a hint about how I think things might work
-	
-2000-05-19 08:42  tobiasb
-
-	* webrt/Elements/SelectLinkType:
-
-	file SelectLinkType was initially added on branch rt-1-1.
-	
-2000-05-19 08:42  tobiasb
-
-	* webrt/Ticket/LinkIt.html:
-
-	file LinkIt.html was initially added on branch rt-1-1.
-	
-2000-05-18 14:46  jesse
-
-	* lib/RT/Ticket.pm:
-
-	a tiny bit of doc added to Ticket.pm
-	still not happy with the format
-	
-2000-05-18 10:56  tobiasb
-
-	* webrt/Ticket/autohandler:
-
-	undo of last commit; only local modifications for debugging
-	
-2000-05-18 10:51  tobiasb
-
-	* webrt/: Search/Listing.html, Ticket/Elements/ShowTransaction:
-
-	the previous commit had wrong loginfo; those files are modified according to the latest changes in etc/config.pm
-	
-2000-05-18 10:42  jesse
-
-	* webrt/Elements/SelectResultsPerPage:
-
-	adding missing file
-	
-2000-05-18 10:41  tobiasb
-
-	* webrt/: index.html, Search/Listing.html, Ticket/autohandler,
-	Ticket/Elements/ShowTransaction:
-
-	A front page for navigation.  This one needs work; Masonifying, generalizing and possibilities for customizations needs to be implemented
-	
-2000-05-18 10:41  tobiasb
-
-	* webrt/index.html:
-
-	file index.html was initially added on branch rt-1-1.
-	
-2000-05-18 10:36  tobiasb
-
-	* webrt/Elements/SelectResultsPerPage:
-
-	Added an empty file as for now
-	
-2000-05-18 10:36  tobiasb
-
-	* webrt/Elements/SelectResultsPerPage:
-
-	file SelectResultsPerPage was initially added on branch rt-1-1.
-	
-2000-05-18 05:48  tobiasb
-
-	* etc/config.pm:
-
-	I'm planning to deal with web customizations with one hash RT::WebOptions in config.pm.  This hash might contain callbacks and maybe names of extra Mason modules to pull in.  What do you think?
-	
-2000-05-17 19:08  jesse
-
-	* webrt/Search/autohandler:
-
-	file autohandler was initially added on branch rt-1-1.
-	
-2000-05-17 19:08  jesse
-
-	* webrt/Search/: Listing.html, PickRestriction, autohandler:
-
-	Work on searches. in the cli  -maxitems <n> now does the right thing
-	
-2000-05-16 17:48  jesse
-
-	* webrt/Ticket/Elements/ShowLinks:
-
-	file ShowLinks was initially added on branch rt-1-1.
-	
-2000-05-16 17:48  jesse
-
-	* bin/rtmux.pl, bin/webmux.pl, lib/RT/Link.pm, lib/RT/Ticket.pm,
-	lib/RT/Action/OpenDependent.pm, lib/RT/Action/ResolveMembers.pm,
-	lib/RT/Action/Spam.pm, lib/RT/Action/StallDependent.pm,
-	webrt/Elements/Error, webrt/Ticket/Elements/ShowLinks,
-	webrt/Ticket/Elements/ShowSummary:
-
-	Converted the new link code to a fully oo setup, rahter than a mishmash of
-	procedural and oo.  seperated out webrt/Ticket/Elements/ShowLinks
-	
-	It's by no means done, but it does seem to work.
-	
-	jesse
-	
-2000-05-16 12:30  tobiasb
-
-	* Makefile, etc/config.pm, lib/RT/Link.pm, lib/RT/Ticket.pm,
-	webrt/Ticket/Elements/ShowSummary:
-
-	Done quite some work at the right hand 'Other Links' window (well, it's not good enough, and it also lists dependencies as for now).  Jesse, you might want to do something with ShowSummary, my Mason code seems horribly ugly.
-	
-2000-05-16 09:18  tobiasb
-
-	* etc/config.pm:
-
-	(...)
-	# A hash table of convertion subs to be used for transforming RT Link
-	# URIs to URLs in the web interface.  If you want to use RT towards
-	# locally installed databases, this is the right place to configure it.
-	# (TODO!)
-	my %URI2HTML=
-	    (
-	     'fsck.com-rt' => sub {warn "stub!";},
-	     'mozilla.com-bugzilla' => sub {warn "stub!";},
-	     'fsck.com-kb' => sub {warn "stub!"}
-	     );
-	(...)
-	
-	I will also make a sub RT::Links::URI2HTML which gives smart links to
-	internal references, and passes other URIs to this hash table, and
-	eventually we should make default subs for KB and RT.
-	
-	What do you think of this idea?
-	
-2000-05-16 04:58  tobiasb
-
-	* lib/RT/: Link.pm, Ticket.pm:
-
-	Enabled link display in the CLI
-	
-2000-05-16 04:43  tobiasb
-
-	* lib/RT/Transaction.pm:
-
-	Seems like I had broken something...(bugfix)
-	
-2000-05-13 19:56  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Right, we need to work a bit with the links API.
-	
-	- we need an AllLinks sub.  How to tell EasySearch to give both links
-	where we're BASE and were we're TARGET?
-	
-	- we need an "unresolved dependencies" according to the current
-	design.  How to tell if a dependency is unresolved?  Dependencies can
-	point out of this RT instance!
-	
-	- we might need more subs, but not right now anyway.
-	
-2000-05-12 11:32  tobiasb
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	partly a bugfix; 'QouteTransaction=attachment-id' doesn't work very well for transactions without attachment.  Maybe that link should only be for attachments, and not for transactions.  Anyway, I changed it to transaction-id instead.  And I also added 'spawn' to the title; I think 'spawning' should be done through the same page.  'spawn' is when creating a new request that is linked up somehow to the old one.  Maybe it rather should be titled 'forward' or 'create new' or something?
-	
-2000-05-12 07:54  tobiasb
-
-	* webrt/: Elements/Error, Ticket/Display.html:
-
-	Bugfixing ... ehrm, why don't I test things before committing? :)
-	
-2000-05-12 07:34  tobiasb
-
-	* webrt/Elements/Error:
-
-	It logs errors now
-	
-2000-05-12 07:32  tobiasb
-
-	* webrt/Ticket/Display.html:
-
-	dies if element can't be loaded
-	
-2000-05-12 06:55  tobiasb
-
-	* webrt/Login.html:
-
-	seems like CGI won't take a combined get+post
-	
-2000-05-12 06:51  tobiasb
-
-	* etc/config.pm:
-
-	bugfix
-	
-2000-05-11 12:45  jesse
-
-	* webrt/Elements/ShadedBox:
-
-	file ShadedBox was initially added on branch rt-1-1.
-	
-2000-05-11 12:45  jesse
-
-	* webrt/Elements/ShadedBox:
-
-	missed this one before. it's somewhat misnamed right now. basically, it
-	prints a title and content.
-	
-2000-05-11 12:39  jesse
-
-	* webrt/Elements/: TitleBoxEnd, TitleBoxStart:
-
-	the title box for webui
-	
-2000-05-11 12:39  jesse
-
-	* webrt/Elements/TitleBoxStart:
-
-	file TitleBoxStart was initially added on branch rt-1-1.
-	
-2000-05-11 12:39  jesse
-
-	* webrt/Elements/TitleBoxEnd:
-
-	file TitleBoxEnd was initially added on branch rt-1-1.
-	
-2000-05-11 12:37  jesse
-
-	* webrt/Ticket/: Display.html, Elements/ShowSummary:
-
-	hrml cleanup. it's not as pretty, but man does it render faster
-	
-2000-05-11 01:07  jesse
-
-	* webrt/: Elements/Footer, Elements/Header, Ticket/Display.html,
-	Ticket/Elements/ShowHistory, Ticket/Elements/ShowSummary,
-	Ticket/Elements/ShowTransaction:
-
-	
-	Cleanup
-	\
-	
-2000-05-11 00:46  tobiasb
-
-	* TODO:
-
-	Added a list
-	
-2000-05-10 23:43  jesse
-
-	* webrt/webrt.css:
-
-	file webrt.css was initially added on branch rt-1-1.
-	
-2000-05-10 23:43  jesse
-
-	* webrt/webrt.css:
-
-	The base stylesheet.
-	
-2000-05-10 23:41  jesse
-
-	* webrt/Ticket/Elements/ShowSummary:
-
-	file ShowSummary was initially added on branch rt-1-1.
-	
-2000-05-10 23:41  jesse
-
-	* webrt/Ticket/Elements/ShowTransaction:
-
-	file ShowTransaction was initially added on branch rt-1-1.
-	
-2000-05-10 23:41  jesse
-
-	* webrt/Ticket/Elements/ShowDates:
-
-	file ShowDates was initially added on branch rt-1-1.
-	
-2000-05-10 23:41  jesse
-
-	* webrt/Ticket/Elements/ShowHistory:
-
-	file ShowHistory was initially added on branch rt-1-1.
-	
-2000-05-10 23:41  jesse
-
-	* webrt/Ticket/Elements/ToolBar:
-
-	file ToolBar was initially added on branch rt-1-1.
-	
-2000-05-10 23:41  jesse
-
-	* webrt/Ticket/Elements/ShowBasics:
-
-	file ShowBasics was initially added on branch rt-1-1.
-	
-2000-05-10 23:41  jesse
-
-	* webrt/Ticket/Elements/ShowPeople:
-
-	file ShowPeople was initially added on branch rt-1-1.
-	
-2000-05-10 23:41  jesse
-
-	* webrt/: Elements/Header, Ticket/Display.html,
-	Ticket/DisplayHeader, Ticket/DisplaySummary, Ticket/DisplayTicket,
-	Ticket/ProcessUpdate.html, Ticket/ToolBar, Ticket/autohandler,
-	Ticket/Elements/ShowBasics, Ticket/Elements/ShowDates,
-	Ticket/Elements/ShowHistory, Ticket/Elements/ShowPeople,
-	Ticket/Elements/ShowSummary, Ticket/Elements/ShowTransaction,
-	Ticket/Elements/ToolBar:
-
-	Work on the web ui. mostly on the ticket display interface
-	
-2000-05-10 15:43  tobiasb
-
-	* README:
-
-	Added a comment about how to do the CGI :) Well:
-	
-		To get it up running even without mod_perl, you will need to
-	consult Tobix or the rt-devel mailinglist.  Tobix is actively working
-	on a (Fast)CGI version, but as for now he has been too lazy to update
-	the template for the cgi executable.
-	
-2000-05-10 15:39  tobiasb
-
-	* webrt/Ticket/Create_Detail.html:
-
-	added a require statement.  No effect for the mod_perl version, but makes sense for a CGI version.
-	
-2000-05-09 05:35  tobiasb
-
-	* bin/webmux.pl:
-
-	Better formatting
-	
-2000-05-08 05:01  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	bugfix
-	
-2000-05-05 19:20  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	This one shouldn't loop now - though it's not tested :)
-	
-2000-05-05 19:15  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	Fixing up the loop control.  When a possible loop occurs, an error
-	flag is set, and a new header field RT-Loop-Alarm appears.  I feel a
-	bit bad about the latter, we are indeed changing an email after it
-	arrived to the system, which I think is a bad thing - but anyway not
-	as bad as dropping the email completely.  My idea is that the Actions,
-	particularly the SendEmail.pm Action remain silent when this header
-	field is set.
-	
-2000-05-05 19:01  tobiasb
-
-	* etc/config.pm:
-
-	Added this about logging to the comments:
-	
-	# It might generally make sense to send error and higher by email to
-	# some administrator.  For heavens sake; be sure that the email goes
-	# directly to a mailbox, and not via RT :) Mail loops will generate a
-	# critical log message.
-	
-2000-05-05 16:47  jesse
-
-	* bin/testdeps.pl:
-
-	Added Log::Dispatch to testdeps.pl
-	
-2000-05-05 13:04  tobiasb
-
-	* lib/RT/Transaction.pm:
-
-	bugfix
-	
-2000-05-05 12:47  tobiasb
-
-	* etc/config.pm:
-
-	I need help, I can't really figure out from this;
-	
-	When commenting out the $SIG{__DIE__} stuff, everything works fine.
-	
-	When having this line in the config:
-	
-	$SIG{__DIE__}  = sub {$RT::Logger->log(level=>'crit',message=>$_[0]); print STDERR $_[0]; exit(-1);};
-	
-	I get this error:
-	
-	Can't locate Mail/Field/addrlist.pm in @INC (@INC contains: /tmp/FunRT /tmp/DBIx /etc/rt /usr/local/lib/perl5/5.6.0/i686-linux /usr/local/lib/perl5/5.6.0 /usr/local/lib/perl5/site_perl/5.6.0/i686-linux /usr/local/lib/perl5/site_perl/5.6.0 /usr/local/lib/perl5/site_perl .) at (eval 115)[/usr/local/lib/perl5/site_perl/5.6.0/Mail/Field.pm:87] line 3.
-	
-	WTF???
-	
-2000-05-05 10:29  tobiasb
-
-	* bin/rtmux.pl:
-
-	I guess this should block that stupid warnings
-	
-2000-05-05 10:01  tobiasb
-
-	* etc/config.pm:
-
-	Added Log::Dispatch.  I also have added those comments, which I would
-	like comments on (:
-	
-	# Most (if not all?) $RT:: global variables should be here.  I'd
-	# suggest putting session information in another Namespace (main:: or
-	# RT::main or maybe something like that).
-	
-	#use strict;
-	
-	#use vars qw/%SitePolicy $dirmode $transactionmode $DatabasePassword $rtname $domain $host $DatabaseHost $DatabaseUser $RT::DatabaseName $DatabaseType $user_passwd_min $MailAlias $WebrtImagePath $web_auth_mechanism $web_auth_cookies_allow_no_path $DefaultLocale $LocalePath $Nobody $Logger/;
-	
-	I'm not sure if "use strict" breaks, but at least "use vars" breaks
-	bigtime as we are using it other places (like rtmux.pl).  I suggest
-	using another package name for the execution logic.  What do you
-	think?
-	
-2000-05-05 08:07  tobiasb
-
-	* Makefile:
-
-	Added RT_LOGFILE, and comments on how to fix advanced logging
-	
-2000-05-05 02:31  jesse
-
-	* bin/rtmux.pl:
-
-	a bit of performance hacking. now require mason and cgi rather than 'use'ing them
-	
-2000-05-05 02:22  jesse
-
-	* lib/RT/: Action.pm, Scrip.pm, ScripScope.pm, Template.pm,
-	Ticket.pm, Transaction.pm, Action/AutoReply.pm,
-	Action/SendEmail.pm, Action/Spam.pm:
-
-	Cleaned up a couple minor things (like precedence, again) and changed "FixSubject" to "SetSubjectTag"
-	
-	Fixed the memory leak in Transaction.pm (it wasn't letting go of Scrip objects)
-	The fix was a bit of a "large mallet on a small nail" in that I'm now _explicitly_ destroying ScripObjects two different ways and don't quite understand why I have to do it. It does, however, work.
-	
-2000-05-04 09:00  tobiasb
-
-	* lib/RT/Action/Spam.pm:
-
-	Completely untested - but I guess this should do real spamming, that
-	is one email for each request(or).
-	
-2000-05-04 08:59  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	bugfix
-	
-2000-05-04 07:04  tobiasb
-
-	* lib/RT/Action/: AutoReply.pm, SendEmail.pm:
-
-	Precedence: Bulk should only be set for AutoReply
-	
-2000-05-04 05:29  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	sub FixSubject sets the RT tag (unless it is already there).  I moved
-	it out from Prepare because I need to override this behaviour when
-	Spamming people.
-	
-2000-05-04 01:34  jesse
-
-	* etc/schema.mysql:
-
-	spec some defaults in the schema
-	
-2000-05-04 01:32  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Bugfix to ticket.pm for better handling of default values for some queue fields
-	
-2000-05-03 14:19  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Sorry, the last commit on this file was not really a bugfix.  I'd say all Ticket (Transaction) Actions should return status, message and eventually optional things after the message.
-	
-2000-05-03 14:16  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Bugfix
-	
-2000-05-03 14:13  tobiasb
-
-	* lib/RT/Action/: ResolveMembers.pm, Spam.pm:
-
-	Those actually seems to work :)
-	
-2000-05-03 14:13  tobiasb
-
-	* lib/RT/Action/Spam.pm:
-
-	file Spam.pm was initially added on branch rt-1-1.
-	
-2000-05-03 14:13  tobiasb
-
-	* lib/RT/Action/ResolveMembers.pm:
-
-	file ResolveMembers.pm was initially added on branch rt-1-1.
-	
-2000-05-03 14:13  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	gubfix
-	
-2000-05-03 14:00  tobiasb
-
-	* etc/schema.mysql:
-
-	Bugfix
-	
-2000-05-03 13:29  tobiasb
-
-	* etc/schema.mysql:
-
-	Commented out the AutoReplies table.
-	
-2000-05-03 13:17  tobiasb
-
-	* lib/RT/Action/AutoReply.pm:
-
-	Putted in "#TODO: " comments for avoiding duplicate AutoReplies.
-	
-2000-05-03 13:15  tobiasb
-
-	* etc/schema.mysql:
-
-	Added a table AutoReplies to avoid sending the same autoreply template
-	more than once to each requestor.
-	
-	Eventually entries should be removed (i.e. after a week) through the
-	(upcoming?) timer system (eventually through the good, old crontab(5))
-	
-2000-05-03 11:48  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	LinkTo and LinkFrom are tested a bit, and they seem to work OK now.
-	
-2000-05-03 11:02  tobiasb
-
-	* etc/schema.mysql:
-
-	Bugfix.
-	
-2000-05-03 07:40  tobiasb
-
-	* etc/schema.mysql:
-
-	I'm putting ResolveGroupTicket on hold.  It's just not important.
-	
-2000-05-02 18:05  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Starting to add a bit of inline pod documentation. the style isn't finalized yet
-	
-2000-05-02 14:30  tobiasb
-
-	* lib/RT/Action/OpenDependent.pm:
-
-	file OpenDependent.pm was initially added on branch rt-1-1.
-	
-2000-05-02 14:30  tobiasb
-
-	* etc/schema.mysql, lib/RT/Link.pm, lib/RT/Ticket.pm,
-	lib/RT/Action/OpenDependent.pm, lib/RT/Action/StallDependent.pm:
-
-	I just got DependsOn Links to work as they should in the CLI :)
-	
-2000-05-02 13:36  tobiasb
-
-	* lib/RT/Links.pm:
-
-	file Links.pm was initially added on branch rt-1-1.
-	
-2000-05-02 13:36  tobiasb
-
-	* lib/RT/: Links.pm, Ticket.pm, Action/StallDependent.pm:
-
-	[no log message]
-	
-2000-05-02 13:07  tobiasb
-
-	* lib/RT/Action/StallDependent.pm:
-
-	Bugfix.  Also, only Open requests should be Stalled.
-	
-2000-05-02 13:01  tobiasb
-
-	* lib/RT/: Ticket.pm, Action/StallDependent.pm:
-
-	Bugfixing
-	
-2000-05-02 12:21  tobiasb
-
-	* lib/RT/: Ticket.pm, Action/StallDependent.pm:
-
-	bugfixes
-	
-2000-05-02 11:55  tobiasb
-
-	* etc/schema.mysql:
-
-	Added TobiX-style logic scrips for DependsOn link and MemberOf link.
-	
-2000-05-02 07:55  tobiasb
-
-	* lib/RT/: Link.pm, Ticket.pm:
-
-	oup, forgot to keep a consistant style
-	base => Base
-	target => Target
-	etc
-	
-2000-05-02 07:55  tobiasb
-
-	* Makefile, etc/config.pm:
-
-	forgot to commit those changes ... configuration for the URI method
-	
-2000-05-02 05:45  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Agh, compile error.
-	
-2000-05-02 05:30  tobiasb
-
-	* lib/RT/Action/StallDependent.pm:
-
-	file StallDependent.pm was initially added on branch rt-1-1.
-	
-2000-05-02 05:30  tobiasb
-
-	* lib/RT/Action/: README.hackers, StallDependent.pm:
-
-	Ok, so lets put all Actions into one directory - though I'd say it would be better for future hackers to orient themselves if we grouped them somehow.
-	
-2000-05-02 00:11  jesse
-
-	* Makefile:
-
-	Version bumping
-	
-2000-05-01 17:16  jesse
-
-	* lib/RT/Ticket.pm:
-
-	moved URIIsLocal closer to other linking routines.
-	
-2000-05-01 10:16  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Made the transaction data a bit "nicer", should look something like:
-	
-	THIS DependsOn 4323 as of 342
-	<URI> DependsOn THIS as of 343
-	
-2000-05-01 08:58  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Changed URL -> URI
-	
-	Changed NewLink and ReverseLink to LinkTo and LinkFrom
-	
-	Added one byte to indicate if it's a From-link or a To-link in the
-	transaction data.
-	
-2000-05-01 01:52  jesse
-
-	* etc/schema.mysql:
-
-	fixed a few typos in the schema
-	
-2000-05-01 01:50  jesse
-
-	* lib/RT/ACL.pm:
-
-	Initial sketches at RT::ACL.pm. there's no running code here yet.
-	
-2000-05-01 01:48  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Fixed Ticket->URL. changed queue->load to queue->Load
-	
-2000-05-01 01:04  jesse
-
-	* bin/rtmux.pl:
-
-	Fixed improper rt program selection code.
-	
-2000-05-01 00:14  jesse
-
-	* lib/RT/Queue.pm:
-
-	a stub for ACL work.
-	
-2000-04-30 13:28  tobiasb
-
-	* lib/RT/Link.pm:
-
-	file Link.pm was initially added on branch rt-1-1.
-	
-2000-04-30 13:28  tobiasb
-
-	* lib/RT/: Link.pm, Ticket.pm:
-
-	Link.pm
-	
-2000-04-30 13:13  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Added a static method URIIsLocal which checks if it's a local URI or not.
-	
-2000-04-28 14:20  jesse
-
-	* lib/RT/Transaction.pm:
-
-	Cleaned up some comments and formatting. and did a bit of reorganizing
-	of routines to more closely model other files. Oh. i finally have
-	emacs doing proper indenting per perlstyle. so we'll hopefully start
-	to get better about that :) Tobix has only been bugging me for a year
-	
-2000-04-28 09:05  tobiasb
-
-	* lib/RT/Action/README.hackers:
-
-	Just some documentation for future hackers :)
-	
-2000-04-28 09:05  tobiasb
-
-	* lib/RT/Action/README.hackers:
-
-	file README.hackers was initially added on branch rt-1-1.
-	
-2000-04-28 08:20  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Started the work of implementing links
-	
-2000-04-28 04:40  tobiasb
-
-	* etc/schema.mysql:
-
-	Didn't we once agree that we needed "state" (user-configurable logic)
-	and "status" (fixed open/stalled/resolved/dead)? :)
-	
-2000-04-28 01:17  jesse
-
-	* lib/RT/Ticket.pm:
-
-	didn't balance parens. grr
-	
-2000-04-28 00:54  jesse
-
-	* lib/RT/Ticket.pm:
-
-	a bunch of cleanup.. a bunch more folding mode braces.
-	a few minor (still not in any codepath) changes for the start of some
-	acls work
-	
-2000-04-28 00:51  jesse
-
-	* docs/design_docs/link-definitions.txt:
-
-	a few comments, additions and clarifications. nothing really major
-	
-2000-04-27 02:06  jesse
-
-	* docs/design_docs/acls:
-
-	more thoughts on ACLs. this time including some code snippits.
-	
-2000-04-27 02:01  jesse
-
-	* etc/schema.mysql:
-
-	added the schema for the new ACL system.
-	responded to tobix' comments about GECOS.
-	
-2000-04-26 14:58  tobiasb
-
-	* docs/design_docs/subscription-definitions.txt:
-
-	marginal updates to reflect that scrips/actions can be used for more things than subscriptions (the whole document might need a rename)
-	
-2000-04-26 14:50  tobiasb
-
-	* docs/design_docs/link-definitions.txt, etc/schema.mysql:
-
-	only insignificant comments - some made weeks ago
-	
-2000-04-26 12:59  jesse
-
-	* docs/design_docs/link-definitions.txt:
-
-	some comments on link definitions
-	my comments are marked with # as the first character of the line.
-	
-2000-04-26 02:27  tobiasb
-
-	* docs/design_docs/: link-definitions.txt,
-	subscription-definitions.txt:
-
-	updates
-	
-2000-04-26 00:14  jesse
-
-	* docs/design_docs/acls:
-
-	some more hacking on acls design
-	
-2000-04-25 17:58  jesse
-
-	* docs/design_docs/acls:
-
-	thoughts on acls
-	
-2000-04-24 00:17  jesse
-
-	* webrt/Ticket/Create_Detail.html:
-
-	file Create_Detail.html was initially added on branch rt-1-1.
-	
-2000-04-24 00:17  jesse
-
-	* webrt/Ticket/Create_Detail.html:
-
-	some work on create. nothing ready for consumption yet.
-	
-2000-04-24 00:16  jesse
-
-	* webrt/: Logout.html, Elements/Footer, Elements/Header,
-	Elements/SelectQueue, Ticket/Create.html, Ticket/Display.html,
-	Ticket/ProcessUpdate.html, Ticket/SetOwner, Ticket/SetStatus,
-	Ticket/Update.html, Ticket/autohandler:
-
-	Look ma, $session{'CurrentUser'} contains the current user object.
-	you can depend on this being set if the user's authenticated.
-	
-2000-04-24 00:16  jesse
-
-	* webrt/Logout.html:
-
-	file Logout.html was initially added on branch rt-1-1.
-	
-2000-04-24 00:14  jesse
-
-	* Makefile, bin/testdeps.pl, bin/webmux.pl:
-
-	Added Apache::Session support to the HTML::Mason version of things.
-	
-2000-04-23 19:45  jesse
-
-	* bin/testdeps.pl:
-
-	added a little script to test perl dependencies.
-	it should probably get integrated into the makefile
-	
-2000-04-23 19:45  jesse
-
-	* bin/testdeps.pl:
-
-	file testdeps.pl was initially added on branch rt-1-1.
-	
-2000-04-23 17:28  jesse
-
-	* Makefile, docs/design_docs/acls, etc/schema.mysql:
-
-	installation seems to work a bit better now
-	
-2000-04-20 02:18  jesse
-
-	* webrt/Login.html:
-
-	Removing cruft from login.html
-	
-2000-04-20 02:17  jesse
-
-	* webrt/Ticket/autohandler:
-
-	Look ma! this autohandler seems to make webauth (with $pass = $user ) work.
-	
-2000-04-20 02:09  jesse
-
-	* webrt/: autohandler, Ticket/autohandler:
-
-	file autohandler was initially added on branch rt-1-1.
-	
-2000-04-20 02:09  jesse
-
-	* webrt/Login.html:
-
-	file Login.html was initially added on branch rt-1-1.
-	
-2000-04-20 02:09  jesse
-
-	* Makefile, bin/webmux.pl, webrt/Login.html, webrt/autohandler,
-	webrt/Ticket/autohandler:
-
-	Doing work on cookie-based authentication for WebRT. The basic idea
-	is that the autohandler in each directory (unless the global handlers can be made to work) will check to see if the user is authenticated. If they are, then it keeps going happily. otherwise, it forces the user to login with the form in /Login.html, which should eventually be smart enough to put them back to where they want to go.
-	
-2000-04-18 02:43  jesse
-
-	* docs/design_docs/acls:
-
-	checking in design work on ACLs. a bit more work, such as notes
-	on order of evaluation and a rough implementation plan and then I'll
-	implement
-	
-2000-04-13 11:58  tobiasb
-
-	* etc/config.pm:
-
-	Introduced all columns we need locally, that is all columns as of RT
-	1.0, except due, area and priorities.  I guess somebody might want to
-	add those columns as well :)
-	
-2000-04-13 11:52  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	hrmwell, you did introduse a slight bug here.. :)
-	
-2000-04-13 11:26  tobiasb
-
-	* webrt/Search/: Listing.html, TicketCell:
-
-	Looks gruesome, but hey - it works\!
-	
-2000-04-13 11:26  tobiasb
-
-	* webrt/Search/TicketCell:
-
-	file TicketCell was initially added on branch rt-1-1.
-	
-2000-04-13 10:52  tobiasb
-
-	* etc/config.pm:
-
-	agh..
-	
-2000-04-13 10:50  tobiasb
-
-	* etc/config.pm:
-
-	Added the site configurable option "QueueListingCols".  It should also
-	be possible to override this one at least through the query, but it
-	might not be trivial.  (maybe you have better suggestions?)
-	
-2000-04-13 10:23  tobiasb
-
-	* webrt/Search/QueueItem:
-
-	I think I want to remove this one, I have other thoughts about how to
-	handle this - let's discuss it more when I've made some implementation :)
-	
-2000-04-13 10:05  tobiasb
-
-	* webrt/Search/Listing.html:
-
-	Added this:
-	
-	# TODO: This one should _not_ be here, rather somewhere else
-	# (suggestions?).  It might eventually read the cookies, user
-	# configuration information from the DB, queue configuration information
-	# from the DB, etc.  It should be object oriented.  But what object can
-	# it belong to, and how should it get access to all this data?
-	
-	sub _cfg {
-	  my $key=shift;
-	  return $ARGS{$key} || $RT::SitePolicy{$key};
-	}
-	
-2000-04-13 10:05  tobiasb
-
-	* etc/config.pm:
-
-	Added a hash for "tunable" configurations:
-	
-	# This is where RT's preferences are kept track of
-	
-	package RT;
-	
-	# Different "tunable" configuration options should be in this hash:
-	%SitePolicy=();
-	
-2000-04-13 02:30  jesse
-
-	* lib/RT/Ticket.pm:
-
-	Ticket::clean became Ticket::_CleanAddressesAsString
-	references to clean changed accordingly. i feel a bit dirty not
-	making this $self->_CleanAddressesAsString.
-	
-2000-04-12 08:53  tobiasb
-
-	* webrt/: Elements/SelectStatus, Ticket/ProcessUpdate.html,
-	Ticket/Update.html:
-
-	bugfixes and insignificant enhancements
-	
-2000-04-12 07:14  tobiasb
-
-	* webrt/Elements/yearMenu:
-
-	"Last year" is now (by default) available
-	
-2000-04-12 07:11  tobiasb
-
-	* webrt/Search/PickRestriction:
-
-	Changed the default to select one queue, not select "anything but" a queue.
-	
-2000-04-12 07:07  tobiasb
-
-	* webrt/Search/PickRestriction:
-
-	Added a stupid "under construction" message.
-	
-2000-04-12 07:00  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	Ehm .. the last commit message should be more descriptive;
-	
-	From the README:
-	
-	        rt:     |"/path/to/rt/bin/rt-mailgate general correspond"
-	                                                    |          |
-	                                   <<queue-name>----/          |
-	                                                               |
-	                <<correspond or comment depending on whether   |
-	                 the mail shoud be resent to the requestor>---/
-	                 "action" here will make this address only
-	                  parse actions in the message without
-	                  recording the message as a transaction
-	                  of its own"
-	
-	...while the implementation required "correspond general"
-	
-2000-04-12 06:58  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	This was not in sync with the README
-	
-2000-04-12 06:50  tobiasb
-
-	* webrt/Search/PickRestriction:
-
-	Bugfix
-	
-2000-04-12 06:45  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Agh, should have tested before committing :)
-	
-2000-04-12 06:44  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Fixd SetOwner to allow stealing and to respect the new Nobody user
-	
-2000-04-12 05:19  tobiasb
-
-	* webrt/Elements/SelectQueue:
-
-	Now this one actually works
-	
-2000-04-11 07:30  tobiasb
-
-	* webrt/Elements/SelectQueue:
-
-	This won't work yet.
-	
-2000-04-11 07:17  tobiasb
-
-	* lib/RT/Transaction.pm:
-
-	Ehr...right.  Still fixing at the same bug; the IsInbound sub didn't work....well
-	
-2000-04-11 07:08  tobiasb
-
-	* lib/RT/: Ticket.pm, Transaction.pm:
-
-	argh .. I should learn to test the bugfixes before committing
-	
-2000-04-11 06:46  tobiasb
-
-	* lib/RT/Transaction.pm:
-
-	bugfix
-	
-2000-04-11 06:42  tobiasb
-
-	* lib/RT/Template.pm, lib/RT/Ticket.pm, webrt/Elements/SelectOwner,
-	webrt/Ticket/ProcessUpdate.html:
-
-	bugfixes
-	
-2000-04-11 05:47  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	bugfixing
-	
-2000-04-11 04:46  tobiasb
-
-	* lib/RT/Watchers.pm:
-
-	Bugfix
-	
-2000-04-11 04:41  tobiasb
-
-	* etc/config.pm, lib/RT/Ticket.pm:
-
-	I'm trying to fix this nobody user..
-	
-2000-04-11 04:36  tobiasb
-
-	* etc/schema.mysql:
-
-	I'm trying to fix this nobody user..
-	
-2000-04-11 04:29  tobiasb
-
-	* lib/RT/Queue.pm, webrt/Ticket/ProcessUpdate.html:
-
-	Bugfixing
-	
-2000-04-11 03:16  tobiasb
-
-	* webrt/Search/Listing.html:
-
-	Insignificant.  Oh, how should errors be trapped?
-	
-2000-04-11 00:40  jesse
-
-	* lib/RT/: Queue.pm, Ticket.pm, Watchers.pm:
-
-	all the watcher types now have AsString methods. this was done by dropping
-	an EmailsAsString method into RT::Watcher
-	
-2000-04-10 23:04  tobiasb
-
-	* webrt/Ticket/ProcessUpdate.html:
-
-	Added those use statements
-	
-	This page seems very broken in Netscape.
-	
-2000-04-10 23:00  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Darn, I thought I had tested this.  Well, now it should work!?
-	
-2000-04-10 22:54  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	...some work is needed to get Watchers work OK.  I commented out my
-	try on it, so now it will ignore queue watchers (it simply ignored all
-	watchers as it was).
-	
-2000-04-10 14:29  tobiasb
-
-	* webrt/Ticket/: DisplayTicket, DisplayTransaction:
-
-	Update and Modify-links
-	
-2000-04-10 14:20  tobiasb
-
-	* webrt/Ticket/DisplayTransaction:
-
-	Added an "act" link and touched the comments
-	
-2000-04-10 14:11  tobiasb
-
-	* webrt/Ticket/DisplaySummary:
-
-	Reinserted the "Last Contact" and "Last Update" lines, but they're "cleaned" a bit.
-	
-	(btw, this seems like a crude copy from the cli, does the cli have similar problems?)
-	
-2000-04-10 13:51  tobiasb
-
-	* webrt/Ticket/DisplaySummary:
-
-	Hacking a bit on this
-	
-2000-04-10 13:48  tobiasb
-
-	* webrt/Ticket/: DisplayTransaction, Update.html:
-
-	Hacking a bit on this
-	
-2000-04-10 13:18  tobiasb
-
-	* webrt/Ticket/Modify.html:
-
-	'undo' (well, not really :)
-	
-2000-04-10 13:13  tobiasb
-
-	* webrt/Ticket/Update.html:
-
-	This 'fix' is maybe only temporary?
-	
-2000-04-10 13:08  tobiasb
-
-	* webrt/Ticket/Modify.html:
-
-	I'd daresay this one is superceded by Update.html?
-	
-2000-04-10 13:07  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	just added some comments
-	
-2000-04-10 12:52  tobiasb
-
-	* webrt/Ticket/DisplaySummary:
-
-	This 'fix' is maybe only temporary?
-	
-2000-04-10 10:35  tobiasb
-
-	* webrt/: Elements/SelectBoolean, Search/Listing.html:
-
-	insignificant changes
-	
-2000-04-10 06:53  tobiasb
-
-	* webrt/Elements/SelectOwner:
-
-	Insignificant fix (wouldn't work here without)
-	
-2000-04-10 05:38  tobiasb
-
-	* bin/rtmux.pl:
-
-	Might be a bugfix
-	
-2000-04-09 16:56  jesse
-
-	* lib/RT/Users.pm, webrt/Elements/SelectBoolean,
-	webrt/Elements/SelectOwner, webrt/Search/Listing.html,
-	webrt/Search/PickRestriction:
-
-	I can now get a listing of tickets whose owner is or isn't a given owner.
-	and it even lists them. Next, I'll probably make searches for
-	other attributes work.
-	the plan of attack is requestor, then probably ticket content (as a test
-	of whether this whole system works ;)
-	
-2000-04-07 20:41  jesse
-
-	* webrt/Search/Listing.html:
-
-	Added the first bit of code to support queue/owner/requestor/subject search.
-	This will make up the core of the  web search functionality of the first release of the webui. (not the 2.0 release, but the "tobix needs it now) release.
-	
-2000-04-07 14:53  tobiasb
-
-	* etc/schema.mysql, lib/RT/Ticket.pm, lib/RT/Watchers.pm,
-	lib/RT/Action/SendEmail.pm:
-
-	hm ... seems like I forgot to commit my last work
-	
-2000-04-07 03:55  tobiasb
-
-	* lib/RT/: Ticket.pm, Transaction.pm:
-
-	it almost works now
-	
-2000-04-06 17:40  tobiasb
-
-	* lib/RT/Transaction.pm:
-
-	development
-	
-2000-04-06 17:21  tobiasb
-
-	* lib/RT/: Ticket.pm, Transaction.pm, Action/Notify.pm,
-	Action/SendEmail.pm:
-
-	ouch, found a lot of fatal stubs
-	
-2000-04-06 16:54  tobiasb
-
-	* etc/schema.mysql, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	lib/RT/Action/Notify.pm, lib/RT/Action/SendEmail.pm:
-
-	still fighting with the mail handling
-	
-2000-04-06 16:12  tobiasb
-
-	* etc/schema.mysql, lib/RT/Scrips.pm, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm, lib/RT/Action/Notify.pm:
-
-	New snapshot of development.  Note the change I've done in the Type recognizion
-	when selecting the right Scrips in Transaction::Create - it should be more
-	flexible this way (replaced "ne" with "!~").  Check the change to schema for
-	an example of how this is more flexible.
-	
-2000-04-06 15:36  tobiasb
-
-	* lib/RT/Action/Notify.pm:
-
-	Recipient finder
-	
-2000-04-06 15:35  tobiasb
-
-	* etc/schema.mysql, lib/RT/Template.pm, lib/RT/Action/SendEmail.pm:
-
-	Snapshot; I'm not finished debugging yet, but this should (hopefully) be
-	very close to actually work.
-	
-2000-04-06 11:38  tobiasb
-
-	* docs/FAQ:
-
-	this clearly needs a lot more work ...
-	
-2000-04-06 11:31  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	...ah, this felt good.
-	
-	Checked the recent version of Mailtools at CPAN, so I used the "right"
-	method for sending emails.
-	
-	I also added back again the SetRecipients method, and documented it in
-	the POD.
-	
-	I think I will get this working in a couple of hours, so please don't
-	disturb me saying that you disagree very much to those changes.. :)
-	
-2000-04-06 10:46  tobiasb
-
-	* etc/schema.mysql:
-
-	Bugfixing
-	
-2000-04-06 10:40  tobiasb
-
-	* etc/schema.mysql:
-
-	I think that I will get this up working during the next few hours.
-	
-	If I eventually get it working, I'd really appreciate that you don't
-	wreck it until the web interface is working and until we've discussed
-	the design thoroughly and come down to some consensus about it.
-	
-2000-04-06 06:22  tobiasb
-
-	* webrt/Elements/Checkbox:
-
-	This is not my turf ... and I don't know what I'm doing ... anyway, it didn't work, but now it works (?) :)
-	
-2000-04-06 01:49  jesse
-
-	* lib/RT/Action/SendEmailOnResolve.pm:
-
-	file SendEmailOnResolve.pm was initially added on branch rt-1-1.
-	
-2000-04-06 01:49  jesse
-
-	* Makefile, etc/schema.mysql, lib/RT/Template.pm,
-	lib/RT/Action/MailComment.pm, lib/RT/Action/MailCorrespondence.pm,
-	lib/RT/Action/Notify.pm, lib/RT/Action/NotifyOnResolve.pm,
-	lib/RT/Action/SendEmail.pm, lib/RT/Action/SendEmailOnResolve.pm:
-
-	Ok, i think i significantly cut down the complexity of the actions we've got
-	so far. I nuked the old notify rules, as they were superceeded by my more
-	capable SendEmail.pm There are still a few things I'm not happy with...
-	like, the way that scrips, scripscopes and templates are related. it needs
-	some thought and cleanup. but i think it'll work just fine for now.
-	
-	I redid the templates and scrips to fit with the revised actions and added
-	some more docs to SendEmail.pm
-	
-	the generic RT::Action should deal with templates, not SendEmail, I think,
-	but I'm leaving that abstraction for another day.
-	
-	Oh, the Argument from the scrip is now passed into the template as $T::Argument.
-	
-2000-04-05 23:24  jesse
-
-	* webrt/Elements/Checkbox:
-
-	stylistic cleanup
-	using an explicit defined ($foo)
-	
-2000-04-05 18:02  tobiasb
-
-	* webrt/: Elements/Checkbox, Search/PickRestriction:
-
-	Only minor corrections
-	
-2000-04-05 17:43  tobiasb
-
-	* webrt/Search/PickRestriction:
-
-	It certainly doesn't work okay ... I think I should look into it a bit ...
-	
-2000-04-05 17:08  tobiasb
-
-	* webrt/Search/PickRestriction:
-
-	Added ugly submit button
-	
-2000-04-05 10:34  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Temporary implementation of kill
-	
-	As mentionated earlier, I think the right thing is to just set status
-	'dead' and then eventually do some garbage collection later.
-	
-2000-04-05 08:55  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	More error handling
-	
-2000-04-05 08:51  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	added some comments around the dies pointing out that we need better error handling.
-	
-2000-04-05 05:34  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	Doh...I'm really stupid sometimes...
-	
-2000-04-05 05:31  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	For some weird reason (perl 5.6.0 bug?) it wouldn't work here without this fix.
-	
-2000-04-05 00:35  jesse
-
-	* docs/design_docs/acls:
-
-	initial musings on acls for 2.0
-	
-2000-04-05 00:35  jesse
-
-	* docs/design_docs/acls:
-
-	file acls was initially added on branch rt-1-1.
-	
-2000-04-04 09:52  tobiasb
-
-	* etc/schema.mysql:
-
-	Language idea
-	
-2000-04-04 02:17  jesse
-
-	* Makefile, README, bin/rtmux.pl, etc/config.pm:
-
-	The first little bits of structure for future L10n support
-	
-2000-04-03 12:40  tobiasb
-
-	* Makefile, bin/rtmux.pl:
-
-	Cleaned out yet some more visible configuration bugs
-	
-2000-04-03 12:29  tobiasb
-
-	* README:
-
-	Some fixes
-	
-2000-04-03 10:44  tobiasb
-
-	* Makefile, bin/rtmux.pl:
-
-	Just a configuration fix.
-	
-2000-04-03 01:26  jesse
-
-	* Makefile, bin/rtmux.pl:
-
-	Ok, I've modified rtmux.pl and Makefile to add in the first bits of stub
-	code for running Mason as a cgi. it compiles and appears to invoke.
-	but I haven't tested it under a webserver. I've gotta get to sleep now, but
-	figured this would give tobias a leg up with his testing today.
-	
-	Subject:      RE: [Mason] Mason under CGI (was: replacing storyserver)
-	Author:       Ilmari Karonen <iltzu@sci.fi>
-	Date:         Fri, 17 Sep 1999 15:10:20 +0300 (EET DST)
-	
-	On Thu, 16 Sep 1999, Ben Munoz wrote:
-	> I'm running Apache 1.3.6 on NT.  I'm looking to install HTML::Mason and see
-	> what it can do, but from what I've read, I can't install mod_perl with the
-	> current version of ActiveState's Perl, which I have installed on my machine.
-	
-	I realize this is probably not what you were asking for, but I'd like to
-	mention here my recent (yesterday) experience in setting up Mason under
-	plain ol' CGI.
-	
-	Setting: One Mason top level component plus a few subcomponents on a
-	development server with mod_perl and Mason. One production server with the
-	least possible selection of modules. (Not even mod_so!)
-	
-	Needed to quickly get the Mason component up and running on the second
-	server. Installing Mason itself and a few other perl modules was easy.
-	But adding mod_perl was definitely out of the question.
-	
-	What I did was take the usual handler.pl, copy it to cgi-bin, deleting
-	everything from "my $ah = new HTML::Mason::ApacheHandler" onward
-	inclusive, and replacing it with the following:
-	
-	    use CGI;
-	    my $q = new CGI;
-	
-	    # This routine comes from ApacheHandler.pm:
-	    my (%args);
-	    foreach my $key ( $q->param ) {
-	      foreach my $value ( $q->param($key) ) {
-	        if (exists($args{$key})) {
-	          if (ref($args{$key})) {
-	            $args{$key} = [@{$args{$key}}, $value];
-	          } else {
-	            $args{$key} = [$args{$key}, $value];
-	          }
-	        } else {
-	          $args{$key} = $value;
-	        }
-	    }
-	
-	    my $comp = $ENV{'PATH_TRANSLATED'};
-	    my $root = $interp->comp_root;
-	    $comp ~= s/^$root//  or die "Component outside comp_root";
-	
-	    $interp->exec($comp, %args);
-	
-	This, plus an Action line in httpd.conf mapping *.mas to this script, has
-	so far done the job just fine.
-	
-	One problem I noticed was that this all would've been much harder if I
-	hadn't been familiar with the way ApacheHandler.pm uses CGI.pm and hadn't
-	known where to find that parsing routine. IMHO it'd be a good idea to
-	separate this loop into a user-callable subroutine.
-	
-	(Note: this was Mason 0.6.mumble - I have no experience with the newer
-	versions.)
-	
-	--
-	Ilmari Karonen (iltzu@sci.fi)
-	http://www.sci.fi/~iltzu/
-	
-	_______________________________________________
-	Mason maillist  -  Mason@netizen.com.au
-	http://netizen.com.au/mailman/listinfo/mason
-	
-2000-04-03 00:49  jesse
-
-	* bin/rtmux.pl, etc/schema.mysql, lib/RT/Action.pm,
-	lib/RT/CurrentUser.pm, lib/RT/Scrip.pm, lib/RT/ScripScopes.pm,
-	lib/RT/Template.pm, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	lib/RT/Watchers.pm, lib/RT/Action/AutoReply.pm,
-	lib/RT/Action/SendEmail.pm:
-
-	Well, that was an exciting afternoon! Er, an exciting evening!
-	*grin* AutoReply now works. which means that all the infrastructure for
-	scrips is back in place.  It required refactoring things a bit. as cool
-	as making RT::Template a MIME::Entity seemed, I just couldn't get it to work
-	right, so now, it just creates a MIME::Entity when it needs it, which is
-	probably better anyway.  I simplified templates a bit. Now they only have
-	access to the Ticket and Transaction. This may not be wise, but we'll see.
-	
-	Also, I merged the two blobs per template (headers and body).
-	
-2000-03-31 08:25  tobiasb
-
-	* bin/webmux.pl:
-
-	rmvd dupl line
-	
-2000-03-31 02:47  jesse
-
-	* Makefile:
-
-	removed old webui hooks from the makefile. bumped the version to 1.3.0
-	
-2000-03-31 02:32  jesse
-
-	* webrt/Elements/Error:
-
-	file Error was initially added on branch rt-1-1.
-	
-2000-03-31 02:32  jesse
-
-	* webrt/Ticket/DisplayTicket:
-
-	file DisplayTicket was initially added on branch rt-1-1.
-	
-2000-03-31 02:32  jesse
-
-	* webrt/: Elements/Error, Elements/SelectStatus,
-	Ticket/Display.html, Ticket/DisplayTicket,
-	Ticket/DisplayTransaction, Ticket/ProcessUpdate.html,
-	Ticket/Update.html:
-
-	Ticket/Update.html will now allow you to submit a ticket update.
-	It's the RT2 equivalent of RT1.0's "comment" and "correspond" pages...
-	with a bit of added value. it's not a global "modify ticket" page. that comes
-	next. but it's where 90% of your single-ticket action will take place.
-	
-2000-03-31 02:28  jesse
-
-	* lib/RT/Ticket.pm:
-
-	TimeTaken should increment now
-	
-2000-03-31 02:26  jesse
-
-	* README:
-
-	added the mason dependency to the README
-	
-2000-03-31 02:25  jesse
-
-	* bin/webmux.pl:
-
-	added some uses to the webmux so I don't have to add them to each page that
-	calls them
-	
-2000-03-30 00:44  jesse
-
-	* webrt/Search/PickRestriction:
-
-	made the variable names in PickRestriction look more like the parameter names
-	in EasySearch. Wanna guess why?
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Search/RestrictSearch.html:
-
-	file RestrictSearch.html was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Search/PickRestriction:
-
-	file PickRestriction was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/Footer:
-
-	file Footer was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/: Elements/Checkbox, Elements/Footer, Elements/Header,
-	Elements/SelectBoolean, Elements/SelectDate,
-	Elements/SelectDateRelation, Elements/SelectOwner,
-	Elements/SelectQueue, Elements/SelectStatus, Elements/dayMenu,
-	Elements/monthMenu, Elements/yearMenu, Search/PickRestriction,
-	Search/RestrictSearch.html:
-
-	A bunch of infrasturcture work on the Ticket Search interface. it doesn't
-	have any real logic behind it. that's next.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/SelectBoolean:
-
-	file SelectBoolean was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/dayMenu:
-
-	file dayMenu was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/SelectStatus:
-
-	file SelectStatus was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/SelectQueue:
-
-	file SelectQueue was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/yearMenu:
-
-	file yearMenu was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/Checkbox:
-
-	file Checkbox was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/Header:
-
-	file Header was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/SelectOwner:
-
-	file SelectOwner was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/monthMenu:
-
-	file monthMenu was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/SelectDateRelation:
-
-	file SelectDateRelation was initially added on branch rt-1-1.
-	
-2000-03-29 23:52  jesse
-
-	* webrt/Elements/SelectDate:
-
-	file SelectDate was initially added on branch rt-1-1.
-	
-2000-03-29 00:33  jesse
-
-	* etc/schema.mysql:
-
-	added a generic "RefersTo" ticket type to the comments.
-	changed the types of Link.Base and Link.Target to VARCHAR(255) from INT(11)
-	
-2000-03-28 05:16  tobiasb
-
-	* README, tools/test:
-
-	darn, it seems like I'll need to install mod-perl ... actually I haven't done that earlier..
-	
-2000-03-28 00:13  jesse
-
-	* Makefile, lib/RT/Record.pm, lib/RT/Transaction.pm,
-	webrt/Search/Listing.html, webrt/Search/QueueItem:
-
-	webrt/Search/Listing.html now gives a basic listing of all open tickets
-	It even has links to the _still display only_ Display.html for each ticket
-	
-2000-03-27 23:55  jesse
-
-	* webrt/Ticket/DisplayTransaction:
-
-	missed this one. sorry.
-	
-2000-03-27 23:55  jesse
-
-	* webrt/Ticket/DisplayTransaction:
-
-	file DisplayTransaction was initially added on branch rt-1-1.
-	
-2000-03-27 23:54  jesse
-
-	* webrt/Ticket/: Display.html, DisplayHistory:
-
-	Hey. Look Ticket/Display.html?id=<int> works!
-	
-2000-03-27 22:35  jesse
-
-	* webrt/Ticket/ToolBar:
-
-	file ToolBar was initially added on branch rt-1-1.
-	
-2000-03-27 22:35  jesse
-
-	* webrt/Ticket/DisplaySummary:
-
-	file DisplaySummary was initially added on branch rt-1-1.
-	
-2000-03-27 22:35  jesse
-
-	* webrt/Ticket/DisplayHistory:
-
-	file DisplayHistory was initially added on branch rt-1-1.
-	
-2000-03-27 22:35  jesse
-
-	* README, webrt/Ticket/DisplayHistory, webrt/Ticket/DisplaySummary,
-	webrt/Ticket/ToolBar:
-
-	Work on WebRT, including a README update!
-	
-	check out  http://s.ly/~jesse/2000_03_28_171606_shot.jpg
-	
-2000-03-27 22:31  jesse
-
-	* lib/RT/Watchers.pm:
-
-	Bugfix in Watchers AdministrativeCc -> AdminCc
-	
-2000-03-27 22:30  jesse
-
-	* webrt/Ticket/: Display.html, Displaysummary, Update.html:
-
-	Work on WebUI. Display.html has slight functionality
-	
-2000-03-27 22:13  tobiasb
-
-	* docs/design_docs/basic-definitions.txt, tools/test:
-
-	minor
-	
-2000-03-27 21:50  tobiasb
-
-	* tools/test:
-
-	added some stuff to the test script
-	
-2000-03-27 21:32  tobiasb
-
-	* lib/RT/: ScripScope.pm, Transaction.pm:
-
-	bugfixing
-	
-2000-03-27 21:22  tobiasb
-
-	* lib/RT/Transaction.pm:
-
-	...well, even more bugs...
-	
-2000-03-27 21:09  tobiasb
-
-	* lib/RT/: Scrip.pm, ScripScope.pm, Template.pm, Transaction.pm:
-
-	First level bugfixing completed; Now the create (from the cli) calls up the action (though as earlier mentionated no emails are sent).
-	
-2000-03-27 20:54  tobiasb
-
-	* lib/RT/Scrip.pm:
-
-	bgfx
-	
-2000-03-27 20:47  tobiasb
-
-	* lib/RT/Scrip.pm:
-
-	Bugfix
-	
-2000-03-27 20:22  tobiasb
-
-	* lib/RT/ScripScope.pm:
-
-	bugfix
-	
-2000-03-27 20:19  tobiasb
-
-	* docs/design_docs/basic-definitions.txt:
-
-	clarified
-	
-2000-03-27 18:58  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	The recipients aren't set anywhere as far as I can see ... and I'm really uncertain what you've thought of with SetEnvelopeTo vs SetTo, etc.  You'd better take a look.  Obviously, this won't work until the recipients are set somehow
-	
-2000-03-27 18:40  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	I've mostly only added comments.  Anyway, I must say that I like this
-	code. (maybe I'll say something different when I've tried debugging it
-	;)
-	
-2000-03-27 17:59  tobiasb
-
-	* lib/RT/ScripScope.pm:
-
-	bugfix
-	
-2000-03-27 17:57  tobiasb
-
-	* lib/RT/Action.pm:
-
-	comment/folding bugfix
-	
-2000-03-27 17:56  tobiasb
-
-	* docs/design_docs/basic-definitions.txt:
-
-	file basic-definitions.txt was initially added on branch rt-1-1.
-	
-2000-03-27 17:56  tobiasb
-
-	* docs/design_docs/basic-definitions.txt:
-
-	(no comment :)
-	
-2000-03-27 17:55  tobiasb
-
-	* docs/design_docs/link-definitions.txt:
-
-	I think maybe those additions might be appreciated by Rouillard ... and this was (hopefully) the last thing I do with design documentation/discussion until 1.3 is finished :)
-	
-2000-03-27 17:33  tobiasb
-
-	* docs/design_docs/link-definitions.txt:
-
-	Doh ... I really shouldn't waste my time on this now ...
-	
-2000-03-27 17:17  tobiasb
-
-	* lib/RT/Scrip.pm:
-
-	Did you ever try to see if those modules would pass `perl -c'? :)
-	
-2000-03-27 16:44  jesse
-
-	* etc/schema.mysql, lib/RT/Action.pm, lib/RT/Scrip.pm,
-	lib/RT/ScripScope.pm, lib/RT/Action/AutoReply.pm,
-	lib/RT/Action/SendEmail.pm:
-
-	Lots of works on Scrip, ScripScope, Action. Tobias: wanna take a look?
-	Basically, now Templates are autoloaded by RT::Scrip.pm and passed into
-	the Action as TemplateObj.  Also, Templates are now of type MIME::Entity,
-	which means that they have all the attributes of mail messages and can
-	just be sent.
-	
-2000-03-27 16:20  tobiasb
-
-	* docs/design_docs/: TransactionTypes.txt, link-definitions.txt:
-
-	Linking definitions
-	
-2000-03-27 16:20  tobiasb
-
-	* docs/design_docs/link-definitions.txt:
-
-	file link-definitions.txt was initially added on branch rt-1-1.
-	
-2000-03-27 16:01  tobiasb
-
-	* docs/README.docs:
-
-	Updated the README to reflect that the docs are old :)
-	
-2000-03-27 15:45  tobiasb
-
-	* README:
-
-	status update
-	
-2000-03-27 15:41  tobiasb
-
-	* lib/RT/ScripScope.pm:
-
-	minor string fix
-	
-2000-03-27 15:36  tobiasb
-
-	* docs/design_docs/subscription-definitions.txt:
-
-	How does the system determinate whom to send mail to?
-	
-	The ScripScope table in the DB should indicate whether a Scrip is relevant
-	for a queue or not /* TobiX thinks that this might eventually be extended to
-	keywords, tickets, etc, and not only Queues */ ... the Scope table should
-	indicate whether the Scrip is relevant for a given transaction type ... then
-	the given Action should determinate whether it applies or not, and finally
-	the Action has to find out (via the Watchers table) whom it applies to, and
-	how to contact them ... and the Template tells how the mails that are sent
-	out should look like.
-	
-2000-03-27 12:33  jesse
-
-	* lib/RT/ScripScopes.pm:
-
-	file ScripScopes.pm was initially added on branch rt-1-1.
-	
-2000-03-27 12:33  jesse
-
-	* lib/RT/: ScripScope.pm, ScripScopes.pm:
-
-	a bit more stub work on ScripScopes for tobias.
-	more work after lunch
-	
-2000-03-27 07:18  tobiasb
-
-	* lib/RT/ScripScope.pm:
-
-	test..?
-	
-2000-03-27 07:04  tobiasb
-
-	* lib/RT/: ScripScope.pm, Scrips.pm:
-
-	Initiated work to get the code understand the Scrips/Scripscope split
-	
-2000-03-27 07:04  tobiasb
-
-	* lib/RT/ScripScope.pm:
-
-	file ScripScope.pm was initially added on branch rt-1-1.
-	
-2000-03-27 06:55  tobiasb
-
-	* etc/schema.mysql:
-
-	Added yet a stupid design thought as a comment:
-	
-	# {{{ TABLE ScripScope
-	  (...)
-	  Queue INT(11), #Queue Id 0 for global
-			 # (maybe there might be conditions where otherb
-	                 # Scopes apply, i.e. a ticket, keyword, owner, etc?)
-	
-2000-03-27 00:45  jesse
-
-	* lib/RT/Action/Notify.pm:
-
-	Oops. forgot to commit Notify.pm
-	
-2000-03-27 00:45  jesse
-
-	* lib/RT/Action/Notify.pm:
-
-	file Notify.pm was initially added on branch rt-1-1.
-	
-2000-03-27 00:44  jesse
-
-	* lib/RT/Action/NotifyOnResolve.pm:
-
-	file NotifyOnResolve.pm was initially added on branch rt-1-1.
-	
-2000-03-27 00:44  jesse
-
-	* etc/schema.mysql, lib/RT/Ticket.pm,
-	lib/RT/Action/NotifyOnResolve.pm, lib/RT/Action/NotifyWatchers.pm:
-
-	Work on Notify (Formerly NotifyWatchers)
-	Work on NotifyOnResolve (Formerly NotifyWatchersOnResolve)
-	
-	They don't _work_ per se. But they're getting closer. I'm wondering
-	whether we want to do something smarter with all the addresses we're passing
-	in to make it easier to remove specific ones...for example, we currently
-	have no way to _not_ send mail to the reuqestor.
-	
-2000-03-26 18:13  jesse
-
-	* lib/RT/Action/: AutoReply.pm, SendEmail.pm:
-
-	AutoReply is now a proper subclass of SendEmail.pm
-	Maybe tonight, I'll try to get through some work on the Scrips and ScripScope stuff to make it work again.
-	then to wrok on NotifyWatchers.pm
-	
-2000-03-25 01:03  jesse
-
-	* Makefile, lib/RT/Template.pm, lib/RT/Ticket.pm,
-	lib/RT/Action/SendEmail.pm:
-
-	Work on the templating system. I actually gutted Template.pm and SendEmail.pm
-	(sorry tobix :/)  Basically RT::Template is now A MIME::Entity object, which
-	means that the various things one can do to mail messages can now be done to
-	RT::Template objects, once you run $TemplateObj->Parse on them..
-	SendEmail was cleaned up somewhat to be less intimidating to people who aren't
-	as comfortable with big chunks of fairly dense perl.  Oh and it's a heck of a
-	lot more subclassable now ;)
-	
-	Fixed a tiny bug in Ticket.pm resulting from the changes to Watchers.
-	
-2000-03-24 08:29  tobiasb
-
-	* tools/test:
-
-	I'm making a test suite which is intended to be run off from the Makefile after an install
-	
-2000-03-24 08:29  tobiasb
-
-	* tools/test:
-
-	file test was initially added on branch rt-1-1.
-	
-2000-03-24 08:06  tobiasb
-
-	* etc/schema.mysql:
-
-	Added some more noise
-	
-2000-03-23 23:41  jesse
-
-	* subscription-definitions.txt,
-	docs/design_docs/subscription-definitions.txt, etc/schema.mysql,
-	lib/RT/Action/NotifyWatchers.pm, lib/RT/Action/SendEmail.pm:
-
-	A little bit of cleanup to the SendEmail and NotifyWatchers actions.
-	I probably did more damage than good, but that's what I get for messing
-	with code that makes little sense to me.
-	
-2000-03-23 23:41  jesse
-
-	* docs/design_docs/subscription-definitions.txt:
-
-	file subscription-definitions.txt was initially added on branch rt-1-1.
-	
-2000-03-23 22:19  jesse
-
-	* webrt/Search/BuildSearch:
-
-	Testing the setgid repository. commiting an empty file
-	
-2000-03-23 22:19  jesse
-
-	* webrt/Search/BuildSearch:
-
-	file BuildSearch was initially added on branch rt-1-1.
-	
-2000-03-23 00:50  jesse
-
-	* webrt/Search/QueueFooter:
-
-	file QueueFooter was initially added on branch rt-1-1.
-	
-2000-03-23 00:50  jesse
-
-	* webrt/Search/QueueItem:
-
-	file QueueItem was initially added on branch rt-1-1.
-	
-2000-03-23 00:50  jesse
-
-	* webrt/Search/QueueHeader:
-
-	file QueueHeader was initially added on branch rt-1-1.
-	
-2000-03-23 00:50  jesse
-
-	* webrt/Admin/ModifyUser:
-
-	file ModifyUser was initially added on branch rt-1-1.
-	
-2000-03-23 00:50  jesse
-
-	* lib/RT/Action/NotifyWatchers.pm:
-
-	file NotifyWatchers.pm was initially added on branch rt-1-1.
-	
-2000-03-23 00:50  jesse
-
-	* Makefile, bin/rtmux.pl, etc/schema.mysql, lib/RT/Queue.pm,
-	lib/RT/Scrip.pm, lib/RT/Ticket.pm, lib/RT/Watcher.pm,
-	lib/RT/Action/NotifyWatchers.pm, webrt/Admin/ModifyUser,
-	webrt/Search/Listing.html, webrt/Search/QueueFooter,
-	webrt/Search/QueueHeader, webrt/Search/QueueItem,
-	webrt/Ticket/Displaysummary:
-
-	Did a bit of hacking on webrt2
-	Redid the watchers system according to what I posted earlier to rt-devel
-	Scrips have now broken..but we'll get them working again really soon.
-	Queue Cc and AdminCc now exist in cli adminrt.
-	
-2000-03-22 14:56  tobiasb
-
-	* subscription-definitions.txt:
-
-	definitions in the subscription system
-	
-2000-03-22 14:56  tobiasb
-
-	* subscription-definitions.txt:
-
-	file subscription-definitions.txt was initially added on branch rt-1-1.
-	
-2000-03-22 14:42  tobiasb
-
-	* etc/schema.mysql:
-
-	This is a suggestion about a simple splitting of the Scrips table.  I
-	think the admin tools will be significantly easier to set up if we do
-	it this way.  An administrator can through some UI just add and remove
-	Scrips from a queue.
-	
-2000-03-22 01:02  jesse
-
-	* lib/RT/: ACE.pm, ACL.pm, Action.pm, Area.pm, Areas.pm,
-	Attachment.pm, Attachments.pm, CurrentUser.pm, EasySearch.pm,
-	Queue.pm, Queues.pm, Record.pm, Scrip.pm, Scrips.pm, Template.pm,
-	Templates.pm, Ticket.pm, Tickets.pm, Transaction.pm,
-	Transactions.pm, User.pm, Users.pm, Utils.pm, Watcher.pm,
-	Watchers.pm, Action/AutoReply.pm, Action/MailComment.pm,
-	Action/SendEmail.pm, Interface/Email.pm:
-
-	This may look like a lot of code. but it's not.
-	It's merely the result of running
-	
-	perl -pi.bak -e 's/sub (.*?){\n/# {{{ sub $1\nsub $1 {\n/; s/^}$/}\n# }}}/'
-	
-	basically, this adds # {{{ sub function
-		         and # }}}
-	around all the function names. The main reason to do this is for
-	emacs fold-minor-mode.  It makes things a lot easier to read.
-	In an ideal world, we'd have perl-aware folding editor and there'd be
-	no need for this markup
-	
-2000-03-21 20:38  jesse
-
-	* lib/RT/: Queue.pm, Ticket.pm, Watcher.pm, Watchers.pm:
-
-	Work on watchers.
-	
-2000-03-20 15:21  jesse
-
-	* etc/schema.mysql:
-
-	Modified the schema for my "New Improved Watchers" system. Basically,
-	now you'll be able to tie a template to a given watch. along with a
-	boolean "send mail" flag.  We'll need a special "Mail Watchers" action to
-	make this all work..but the code should be pretty easy.
-	
-		jesse
-	
-2000-03-20 05:27  tobiasb
-
-	* bin/initdb.mysql:
-
-	bugfix
-	
-2000-03-17 15:20  jesse
-
-	* webrt/Ticket/Create.html:
-
-	file Create.html was initially added on branch rt-1-1.
-	
-2000-03-17 15:20  jesse
-
-	* webrt/Ticket/DisplayHeader:
-
-	file DisplayHeader was initially added on branch rt-1-1.
-	
-2000-03-17 15:20  jesse
-
-	* webrt/Ticket/SetOwner:
-
-	file SetOwner was initially added on branch rt-1-1.
-	
-2000-03-17 15:20  jesse
-
-	* webrt/Ticket/SetStatus:
-
-	file SetStatus was initially added on branch rt-1-1.
-	
-2000-03-17 15:20  jesse
-
-	* webrt/Ticket/: Create.html, Display.html, DisplayHeader,
-	Displaysummary, SetOwner, SetStatus, Update.html:
-
-	More work on the basic webui
-	
-2000-03-17 15:20  jesse
-
-	* webrt/Ticket/Displaysummary:
-
-	file Displaysummary was initially added on branch rt-1-1.
-	
-2000-03-17 11:32  tobiasb
-
-	* bin/initdb.mysql:
-
-	Bugfix, the password passing didn't work as it should.
-	
-2000-03-17 10:52  tobiasb
-
-	* etc/schema.mysql:
-
-	- Slashed away the old "MailQueueMembersOn..." junk.
-	
-	- Added Scrips to the Watchers table.  ... the Watchers/Scrips system
-	seems quite flexible .. BUT .. I have a certain feeling that it might
-	be hard to make administration tools that helps a non-hacking
-	administrator to find out which mails are sent where, etc.  Well,
-	that's something we'll have to worry about later :)
-	
-2000-03-17 08:47  tobiasb
-
-	* Makefile, etc/schema.mysql:
-
-	removed some instanses of 'su' that really shouldn't be needed, and which also broke on anything but GNU shellutils
-	
-2000-03-17 07:32  tobiasb
-
-	* README:
-
-	Some additions and changes to reflect that this is, after all, a
-	development version.  Meri, do you subscribe to cvs-commit? :)
-	
-2000-03-17 06:01  tobiasb
-
-	* etc/schema.mysql:
-
-	# Those subscription field are not used in RT 1.1 as I see it.
-	# I think we should modify the Scrips system so it by default
-	# respects those fields.
-	 MailOwnerOnTransaction INT,             # notify owner on transaction
-	 MailMembersOnTransaction INT,		# notify list members on transaction
-	 MailRequestorOnTransaction INT,	# notify requestor on transaction
-	 MailRequestorOnCreation INT,		# notify user on creation
-	 MailMembersOnCorrespondence INT,		# notify members on creation
-	 MailMembersOnComment INT,		# notify members on comment
-	
-2000-03-16 16:31  jesse
-
-	* webrt/: Search/Listing.html, Ticket/Display.html,
-	Ticket/Modify.html, Ticket/ProcessUpdate.html, Ticket/Update.html,
-	Ticket/ValidateUpdate.html:
-
-	The beginnings of the All New! Web UI based around HTML::Mason
-	There's nothing functional here yet. but it's a start at a framework.
-	Ticket/Update.html is probably the closest to "real" code so far.
-	
-2000-03-16 16:31  jesse
-
-	* webrt/Ticket/ValidateUpdate.html:
-
-	file ValidateUpdate.html was initially added on branch rt-1-1.
-	
-2000-03-16 16:31  jesse
-
-	* webrt/Ticket/Display.html:
-
-	file Display.html was initially added on branch rt-1-1.
-	
-2000-03-16 16:31  jesse
-
-	* webrt/Ticket/Modify.html:
-
-	file Modify.html was initially added on branch rt-1-1.
-	
-2000-03-16 16:31  jesse
-
-	* webrt/Search/Listing.html:
-
-	file Listing.html was initially added on branch rt-1-1.
-	
-2000-03-16 16:31  jesse
-
-	* webrt/Ticket/ProcessUpdate.html:
-
-	file ProcessUpdate.html was initially added on branch rt-1-1.
-	
-2000-03-16 16:31  jesse
-
-	* webrt/Ticket/Update.html:
-
-	file Update.html was initially added on branch rt-1-1.
-	
-2000-03-16 14:46  tobiasb
-
-	* Makefile:
-
-	Changed the default database name from rt to RT to avoid confusion with previously installed versions of rt
-	
-2000-03-16 02:34  tobiasb
-
-	* lib/RT/User.pm:
-
-	Bugfixes:  It was impossible not to give requests to somebody.
-	
-2000-03-16 01:32  tobiasb
-
-	* lib/RT/Interface/Email.pm:
-
-	Bugfixes
-	
-	was
-	
-	  if ($CurrentUser->Id == 0) {
-	    #If it fails, create a user
-	
-	now
-	
-	  unless ($CurrentUser->Id) {
-	    #If it fails, create a user
-	
-	as Id returned undef.
-	
-	Changed 'Queue' to 'QueueTag'.
-	
-	Added some few comments
-	
-2000-03-14 00:40  jesse
-
-	* README:
-
-	Modified the README for the beginnings of the new webui
-	
-2000-03-14 00:39  jesse
-
-	* bin/: rtmux.pl, webmux.pl:
-
-	added webmux. modified rtmux.pl to clean out some cruft
-	
-2000-03-14 00:39  jesse
-
-	* bin/webmux.pl:
-
-	file webmux.pl was initially added on branch rt-1-1.
-	
-2000-03-13 12:53  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	rt-mailgate has now recieved and logged correspondence and comments with current schema.
-	
-2000-03-08 23:26  jesse
-
-	* lib/RT/: Ticket.pm, Transaction.pm:
-
-	DBIx cleanups to deal with load by id when id is null
-	Work on comment and correspond. Eventually, we'll get the
-	per-transaction cc and bcc working.
-	
-2000-03-08 18:22  jesse
-
-	* bin/rtmux.pl, lib/RT/Queue.pm, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm, lib/RT/User.pm:
-
-	rtq works a bit better
-	rtadmin works again.
-	rtadmin -user create
-		-user modify
-	 both seem to work ok
-	
-	rt -create now makes sure a queue exists and permits ticket creation
-	rt -create now make sure a prospective owner has queue membership.
-	
-2000-03-02 17:23  tobiasb
-
-	* lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	lib/RT/Action/SendEmail.pm, etc/schema.mysql:
-
-	resolve, open, take (if unowned, at least) seems to work
-	
-2000-03-02 16:10  tobiasb
-
-	* lib/RT/: Ticket.pm, Ticket.pm:
-
-	Bugfixing
-	
-2000-03-02 14:35  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Correspondence almost works
-	
-2000-03-02 13:26  tobiasb
-
-	* lib/RT/Ticket.pm, lib/RT/Action/MailComment.pm, etc/schema.mysql:
-
-	Comments almost work now (from the cli)
-	
-2000-03-02 12:38  tobiasb
-
-	* lib/RT/Action/: MailComment.pm, MailCorrespondence.pm:
-
-	one minor bugfix + some comments
-	
-2000-03-01 23:58  jesse
-
-	* NEWS:
-
-	brought the news up to date.
-	nuked old /contrib
-	nuked old /etc/templates.
-	
-	bedtime now.
-	
-2000-03-01 23:57  jesse
-
-	* NEWS:
-
-	brought the news up to date (a bit)
-	
-2000-03-01 23:50  jesse
-
-	* Makefile:
-
-	removed a lot of outdated cruft.
-	Bumped the version to 1.1.11 for a release later this week.
-	
-2000-03-01 23:18  jesse
-
-	* lib/RT/: Ticket.pm, Interface/Email.pm:
-
-	The mail gateway now lets you create, comment and correspond on tickets.
-	Ticket->Owner now deals better when the owner is NULL
-	
-2000-03-01 21:27  jesse
-
-	* HACKING:
-
-	minor comments added to hacking
-	
-2000-03-01 21:20  jesse
-
-	* HACKING:
-
-	Trivial change to HACKING to test commitinfo
-	
-2000-03-01 21:09  jesse
-
-	* lib/RT/Interface/Email.pm:
-
-	file Email.pm was initially added on branch rt-1-1.
-	
-2000-03-01 21:09  jesse
-
-	* bin/rtmux.pl, lib/RT/Interface/Email.pm:
-
-	work on mailgate
-	
-2000-03-01 18:36  tobiasb
-
-	* docs/design_docs/TransactionTypes.txt, etc/schema.mysql:
-
-	Some loose thoughts only ... as comments and a doc which I'm not sure
-	if it's possible to understand by others than me anyway :)
-	
-	Anyway, it is too complex.  We'll just continue following the current design.
-	
-2000-03-01 18:36  tobiasb
-
-	* docs/design_docs/TransactionTypes.txt:
-
-	file TransactionTypes.txt was initially added on branch rt-1-1.
-	
-2000-03-01 17:51  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Seems like it's a lot of things that doesn't work here.
-	
-2000-03-01 16:26  tobiasb
-
-	* etc/schema.mysql:
-
-	Ehm ... maybe I forgot to commit this one.  It contains some fixes.
-	
-2000-03-01 16:08  jesse
-
-	* TODO:
-
-	ripped a bit of obsolete code from rtmux.pl
-	updated the TODO to reference the production instance of RT.
-	
-2000-03-01 14:48  jesse
-
-	* bin/rtmux.pl:
-
-	removed the old web ui hooks from rtmux.pl
-	
-2000-03-01 12:12  tobiasb
-
-	* lib/RT/: Action.pm, Scrip.pm, Template.pm, Ticket.pm,
-	Watchers.pm, Action/AutoReply.pm, Action/SendEmail.pm:
-
-	I've done some debugging and polishing.  I hope it won't break with stuff you're eventually working with
-	
-2000-02-29 16:58  tobiasb
-
-	* lib/RT/: Queue.pm, Ticket.pm, Watchers.pm:
-
-	One sort of bugfix..
-	
-2000-02-29 16:35  tobiasb
-
-	* lib/RT/: Queue.pm, Template.pm, Ticket.pm, Watcher.pm,
-	Watchers.pm, Action/SendEmail.pm:
-
-	Scrips work for me.  Well, I'm not that sure anyway.  I had actually
-	expected one email to drop in for each Scrip - but I only got the
-	AutoReply and the Correspondence.  Maybe I should debug even more.
-	
-2000-02-29 14:29  tobiasb
-
-	* lib/RT/Watchers.pm:
-
-	LimitToTicket updated (not tested, though)
-	LimitToQueue added     (not tested, though)
-	
-2000-02-29 14:27  tobiasb
-
-	* etc/schema.mysql:
-
-	
-	# Primarly used by RT::Actions::SendEmail as well as some subclasses
-	# to determinate whom to send emails to.  This scheme should work out
-	# better than the scheme under RT 1.0, and should suit most users.
-	# For more fine grained control, it's possible to create tables as you
-	# like and make a new subclass of RT::Actions::SendEmail where the
-	# SetRecepients sub is overloaded :)
-	
-	CREATE TABLE Watchers (
-	   id int(11) AUTO_INCREMENT PRIMARY KEY,
-	   Value int(11),
-	   Scope varchar(16), # Might be "Queue" and "Ticket" as for now
-	                      # ... might be extended to "Keywords", "Owners", etc.
-	   Email VARCHAR(255),
-	   Type VARCHAR(16), #Requestor, Cc, Bcc
-	   Creator INT(11),
-	   Created TIMESTAMP,
-	   LastUpdatedBy INT(11),
-	   LastUpdated TIMESTAMP
-	)\g
-	
-2000-02-29 13:40  tobiasb
-
-	* etc/schema.mysql:
-
-	CREATE TABLE Watchers (
-	   id int(11) AUTO_INCREMENT PRIMARY KEY,
-	   Ticket int(11), # 0 for all
-	   Queue int(11), # 0 for all
-		# We might consider adding more power here,
-		# i.e. TransactionType, Scrip, etc
-	   Email VARCHAR(255),
-	   Type VARCHAR(16), #Requestor, Cc, Bcc
-	   Creator INT(11),
-	   Created TIMESTAMP,
-	   LastUpdatedBy INT(11),
-	   LastUpdated TIMESTAMP
-	)\g
-	
-2000-02-29 10:43  tobiasb
-
-	* etc/schema.mysql:
-
-	Template.{content and title} => Content and Title - since we use
-	UpperCase in the rest of the DD.
-	
-2000-02-29 10:31  tobiasb
-
-	* etc/schema.mysql:
-
-	Blob, that is..
-	
-2000-02-29 10:12  tobiasb
-
-	* etc/schema.mysql:
-
-	Added ExtraHeaders as VARCHAR(255).  255 characters should be enough
-	for storing some few extra header lines, but anyway maybe it should
-	have been blob instead?
-	
-2000-02-29 09:51  tobiasb
-
-	* lib/RT/: Attachment.pm, Action/AutoReply.pm, Action/SendEmail.pm:
-
-	I've continued the work on mail sending.  There is still some missing
-	stuff:
-	
-	1. EasySearch/Scrips issue - currently it doesn't properly output "
-	all scrips that has (queue=0 or queue=this) and (type="any" or type=this)".
-	
-	2. A serious stub in RT::Action::SendEmail - I don't know where to find
-	"interessted parties".  I think it could be nice putting queue watchers
-	in the same table as ticket watchers.
-	
-2000-02-29 09:42  tobiasb
-
-	* lib/RT/Scrips.pm:
-
-	Hack - everything that applies for a Correspondence action also
-	applies for a Create action (I'd daresay).
-	
-2000-02-29 07:02  tobiasb
-
-	* lib/RT/Transaction.pm:
-
-	Some insignificant changes.  Well, one marginally significant; it
-	shouldn't $Scrip->Commit unless $Scrip->Prepare()
-	
-2000-02-29 04:12  tobiasb
-
-	* etc/schema.mysql:
-
-	I've started at general transaction emails.
-	
-2000-02-29 03:58  tobiasb
-
-	* lib/RT/Watchers.pm:
-
-	Added an Emails method.  It can be used like:
-	
-	   print join(",", @{$Watchers->Emails("Requestors")});
-	
-	or
-	
-	   $Watchers->LimitToRequestors;
-	   $Emails=$Watchers->Emails;
-	
-	...
-	
-2000-02-29 02:31  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	Sender => RT-Originator
-	
-2000-02-29 00:40  jesse
-
-	* README:
-
-	Added Into Netowrks and Funcom to the thanks at the top of the readme
-	`
-	
-2000-02-28 23:20  jesse
-
-	* Makefile:
-
-	RT 1.1.10 released. Tobix has autoreply basically working :)
-	
-2000-02-28 22:49  jesse
-
-	* Makefile, NEWS, README:
-
-	Fixed a longstanding bug in the WebRT administrator
-	added a note about stripmime to the readme.
-	added a bit of code from curl.com that adds functionality to rtq for reporting
-	
-2000-02-28 22:17  jesse
-
-	* Makefile, NEWS:
-
-	bumped the version for release of 1.0.2
-	
-2000-02-28 11:33  tobiasb
-
-	* lib/RT/: Template.pm, Transaction.pm, Action/AutoReply.pm,
-	Action/SendEmail.pm:
-
-	AutoReply seems to work now ... except that rtadmin didn't set email
-	aliases for the queue, so the mail bounces with invalid from address.
-	I won't look more at this until tomorrow.  You're very welcome to take
-	over for a while if you feel like it :)
-	
-2000-02-28 11:29  tobiasb
-
-	* etc/schema.mysql:
-
-	AutoReply seems to work now
-	
-2000-02-28 08:18  tobiasb
-
-	* HACKING:
-
-	Added some hints and misc.  Please look through.
-	
-2000-02-28 05:25  tobiasb
-
-	* lib/RT/: Ticket.pm, Transaction.pm, Action/AutoReply.pm,
-	Action/SendEmail.pm:
-
-	- The queue tag rather than queue id is delievered from the cli, this
-	  broke in Ticket::Create.  Fixed.
-	
-	- The Attachments have to be assigned to a transaction before Scrips
-	   is run.  Now the Attachments are delievered as a part of the parameters
-	   to Transaction::Create
-	
-2000-02-27 23:28  tobiasb
-
-	* etc/schema.mysql:
-
-	Fixed the AutoReply template ... still not tested, though.
-	
-2000-02-27 22:04  tobiasb
-
-	* lib/RT/Action/: AutoReply.pm, SendEmail.pm:
-
-	I think we can nuke the old rt/lib/rt/support/mail.pm now - everything
-	should be located in SendEmail.pm, AutoReply.pm and Template.pm by now :)
-	
-	It's not tested yet, and the templates needs upgrading.  Anyway, I will
-	probably not mess more around with the perl code as for now.
-	
-2000-02-27 21:43  tobiasb
-
-	* bin/rtmux.pl:
-
-	Seems like $rtversion="!!RT_VERSION!!" had disappeared.  I renamed the
-	variable to $VERSION.
-	
-2000-02-27 21:22  jesse
-
-	* lib/RT/Ticket.pm:
-
-	dates now display in the cli.
-	
-2000-02-27 20:53  tobiasb
-
-	* lib/RT/Templates.pm:
-
-	Fixed DBIx::EasySearch => RT::EasySearch
-	
-2000-02-27 20:53  tobiasb
-
-	* lib/RT/Template.pm:
-
-	Method Template::Parse added, Text::Template used for the moment.
-	
-	(sigh ... that means my next worktask will be to update the
-	templates...)
-	
-2000-02-27 20:49  jesse
-
-	* lib/RT/Ticket.pm:
-
-	so. Ticket->Create now actually figures out ccs and bccs and requestors from the mime
-	object passed in to it.
-	
-2000-02-27 19:05  jesse
-
-	* lib/RT/Transaction.pm:
-
-	added a comment for tobias about a new line that didn't make sense.
-	
-2000-02-27 18:46  jesse
-
-	* lib/RT/: Ticket.pm, Watchers.pm:
-
-	watchers updates.
-	
-2000-02-27 17:25  tobiasb
-
-	* lib/RT/Template.pm:
-
-	file Template.pm was initially added on branch rt-1-1.
-	
-2000-02-27 17:25  tobiasb
-
-	* lib/RT/: Attachment.pm, Template.pm, Templates.pm,
-	Action/AutoReply.pm, Action/SendEmail.pm:
-
-	Development snapshot.  I guess I'll have it working in half an hour
-	with _efficient_ working, that is some four hours working at my
-	current efficiency rate :/
-	
-2000-02-27 17:25  tobiasb
-
-	* lib/RT/Templates.pm:
-
-	file Templates.pm was initially added on branch rt-1-1.
-	
-2000-02-27 16:43  tobiasb
-
-	* etc/schema.mysql:
-
-	Added some templates
-	
-2000-02-27 11:19  tobiasb
-
-	* lib/RT/: Scrip.pm, Transaction.pm:
-
-	development snapshot
-	
-2000-02-27 10:31  tobiasb
-
-	* lib/RT/Action/: AutoReply.pm, MailComment.pm,
-	MailCorrespondence.pm, SendEmail.pm:
-
-	I've started bashing at the mail sending functionallity.  It seemed quite
-	stubbed to me.
-	
-2000-02-24 03:44  tobiasb
-
-	* etc/schema.mysql:
-
-	minor bug in comment
-	
-2000-02-24 03:24  tobiasb
-
-	* lib/RT/Action/SendEmail.pm:
-
-	clearing out a potential weird bug
-	
-2000-02-24 00:27  jesse
-
-	* lib/RT/Scrips.pm:
-
-	Fixed a typo in my code near tobix' changes to Scrips.pm. his changes look good.
-	
-2000-02-24 00:03  jesse
-
-	* Makefile, NEWS, README:
-
-	little fix to mail manipulate from "Heather L. Sherman" <heather@idealab.com>
-	
-2000-02-23 17:06  tobiasb
-
-	* lib/RT/: Scrips.pm, Action/SendEmail.pm:
-
-	Some small fixes.  You'd better look through it, as I'm not completely sure what I'm doing :)
-	
-2000-02-23 16:07  tobiasb
-
-	* etc/schema.mysql:
-
-	An insert entry here reffers to SendMail.pm, while the file is SendEmail.pm
-	
-2000-02-23 15:26  jesse
-
-	* docs/rt-templates.html:
-
-	[no log message]
-	
-2000-02-23 11:38  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Could not get 'rt -create' working.  It seems more sane now, but I'm not really sure what I'm doing ... so you should have a peek at it.  I changed  $Id->SUPER::_Set("EffectiveId",$id); to $self->SUPER::_Set etc
-	
-2000-02-22 23:35  jesse
-
-	* lib/RT/InterestedParty.pm:
-
-	removed vestigal code
-	
-2000-02-22 23:25  jesse
-
-	* etc/schema.mysql, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	lib/RT/Transactions.pm, lib/RT/Watchers.pm:
-
-	A bit more work on watchers. we're getting close.
-	rtq works today.
-	rt -create basically works.
-	rt -take works.
-	
-	rt -show will now start to show ownership changes.
-	
-2000-02-22 08:06  jesse
-
-	* Makefile, etc/schema.mysql, lib/RT/Ticket.pm:
-
-	Work on Watchers.  Most of the code needed to make this work is now
-	present. sadly I haven't even _tried_ to run it yet.
-	
-2000-02-21 01:33  jesse
-
-	* lib/RT/Watcher.pm:
-
-	file Watcher.pm was initially added on branch rt-1-1.
-	
-2000-02-21 01:33  jesse
-
-	* lib/RT/: InterestedParties.pm, InterestedParties.pm~,
-	Notification.pm, Ticket.pm, Watcher.pm, Watchers.pm:
-
-	Renamed interested parties to "Watchers"
-	Watchers are now keyed by EmailAddress rather than UserId. Not every CC will have an rt account, i think
-	
-2000-02-21 01:33  jesse
-
-	* lib/RT/Watchers.pm:
-
-	file Watchers.pm was initially added on branch rt-1-1.
-	
-2000-02-20 18:28  jesse
-
-	* lib/RT/InterestedParties.pm~:
-
-	file InterestedParties.pm~ was initially added on branch rt-1-1.
-	
-2000-02-20 18:28  jesse
-
-	* lib/RT/InterestedParties.pm:
-
-	file InterestedParties.pm was initially added on branch rt-1-1.
-	
-2000-02-20 18:28  jesse
-
-	* lib/RT/InterestedParty.pm:
-
-	file InterestedParty.pm was initially added on branch rt-1-1.
-	
-2000-02-20 18:28  jesse
-
-	* lib/RT/: InterestedParties.pm, InterestedParties.pm~,
-	InterestedParty.pm:
-
-	[no log message]
-	
-2000-02-20 18:24  jesse
-
-	* etc/schema.mysql, lib/RT/Ticket.pm:
-
-	[no log message]
-	
-2000-02-20 15:27  jesse
-
-	* etc/schema.mysql, lib/RT/Action.pm, lib/RT/Scrip.pm,
-	lib/RT/Action/AutoReply.pm, lib/RT/Action/SendEmail.pm:
-
-	Work on scrips. stubs for the webui
-	
-2000-02-19 17:45  jesse
-
-	* lib/RT/: Action.pm, Scrip.pm:
-
-	work on actions. checking in for eric to take a look
-	
-2000-02-19 16:48  jesse
-
-	* lib/RT/Action/AutoReply.pm:
-
-	file AutoReply.pm was initially added on branch rt-1-1.
-	
-2000-02-19 16:48  jesse
-
-	* lib/RT/Action/MailCorrespondence.pm:
-
-	file MailCorrespondence.pm was initially added on branch rt-1-1.
-	
-2000-02-19 16:48  jesse
-
-	* lib/RT/Action.pm:
-
-	file Action.pm was initially added on branch rt-1-1.
-	
-2000-02-19 16:48  jesse
-
-	* lib/RT/Action/MailComment.pm:
-
-	file MailComment.pm was initially added on branch rt-1-1.
-	
-2000-02-19 16:48  jesse
-
-	* lib/RT/: Action.pm, Action/AutoReply.pm, Action/MailComment.pm,
-	Action/MailCorrespondence.pm, Action/SendEmail.pm:
-
-	As it turns out, Action needed to be abstracted a bit and renamed.
-	
-	I'm also making the Object syntax a bit.
-	
-2000-02-19 16:48  jesse
-
-	* lib/RT/Action/SendEmail.pm:
-
-	file SendEmail.pm was initially added on branch rt-1-1.
-	
-2000-02-17 09:19  jesse
-
-	* etc/schema.mysql, lib/RT/Scrip.pm, lib/RT/Scrips.pm,
-	lib/RT/Transaction.pm:
-
-	The base architecture for Scrips to work should now be in place.
-	Next up: write example "Actions" (gotta move the Scrips directory to Actions)
-	for the scrip handlers to use.
-	
-2000-02-16 09:59  jesse
-
-	* lib/RT/: Scrip.pm, Transaction.pm:
-
-	Starting to make scrips actually work
-	
-2000-02-10 23:24  jesse
-
-	* lib/RT/Scrips.pm:
-
-	file Scrips.pm was initially added on branch rt-1-1.
-	
-2000-02-10 23:24  jesse
-
-	* lib/RT/: Scrip.pm, Scrips.pm, Transaction.pm:
-
-	more work stubbing scrips. but now my arms hurt badly enough that i'm going to log out.
-	
-2000-02-10 23:24  jesse
-
-	* lib/RT/Scrip.pm:
-
-	file Scrip.pm was initially added on branch rt-1-1.
-	
-2000-01-31 02:38  tobiasb
-
-	* README, lib/RT/Attachments.pm:
-
-	does the commit automail work now?
-	
-2000-01-30 23:54  jesse
-
-	* NEWS, README, etc/schema.mysql, lib/RT/CurrentUser.pm,
-	lib/RT/Record.pm, lib/RT/User.pm:
-
-	Work on the User object.
-	The mail gateway now autocreates users. (This will make more sense
-	once we start tying tickets to users by means of the InterestedParties table.
-	
-2000-01-29 01:33  jesse
-
-	* Makefile:
-
-	makefile cleanup. including removing the C compiler and template and
-	transaction directories
-	
-2000-01-29 01:30  jesse
-
-	* Makefile:
-
-	removed C compiler from the makefile
-	
-2000-01-29 01:25  jesse
-
-	* Makefile:
-
-	Removed C compiler from the makefile. we just don't need it anymore
-	
-2000-01-29 01:22  jesse
-
-	* Makefile:
-
-	bumped version to 1-1-8
-	
-2000-01-29 01:20  jesse
-
-	* Makefile:
-
-	removed template and transaction paths from the makefile.
-	(to test new cvs wrappers and cuz they should be gona anyway)
-	
-2000-01-29 00:26  jesse
-
-	* etc/schema.mysql:
-
-	Started to do work on scrips. see the schema for how it would work.
-	
-2000-01-28 20:04  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Some modifications and bugfixes on the messages popping up after a `successful' correspondence/comment
-	
-2000-01-28 19:47  tobiasb
-
-	* lib/RT/Ticket.pm:
-
-	Removed some annoying warnings.  I don't know if this is the "right"
-	way to remove them, but it works (for me, at least), it's an easy
-	way to do it, and it's harmless;
-	
-	instead of writing
-		$var_that_might_be_undef
-	I write
-		$var_that_might_be_undef || ""
-	eventually with parantheses, and eventually with "" replaced by 0, or maybe
-	(not tested) even undef.
-	
-2000-01-28 13:22  tobiasb
-
-	* Makefile:
-
-	Two substitution parameters was forgotten in config.pm
-	
-2000-01-28 13:12  tobiasb
-
-	* etc/schema.mysql:
-
-	Oups, committed the wrong file
-	
-2000-01-28 13:10  tobiasb
-
-	* Makefile, etc/schema.mysql:
-
-	Two substitution parameters was forgotten in config.pm
-	
-2000-01-27 04:09  tobiasb
-
-	* Makefile, bin/initdb.mysql:
-
-	small password fix
-	
-2000-01-25 23:26  jesse
-
-	* Makefile:
-
-	bumped the version to 1.1.7 for tonight's release.
-	
-2000-01-25 23:12  jesse
-
-	* lib/RT/: Attachments.pm, Ticket.pm, Transaction.pm:
-
-	DBIx::EasySearch now has a -> First method. which is like -> Next, but picks
-	the first element
-	
-	DBIx::Record -> now returns '' rather than undef for null values. it's less
-	likely to break interfaces.
-	
-2000-01-25 16:36  tobiasb
-
-	* README:
-
-	aargh
-	
-2000-01-25 16:31  tobiasb
-
-	* TODO:
-
-	test
-	
-2000-01-25 14:57  tobiasb
-
-	* etc/schema.mysql:
-
-	bugfix
-	
-2000-01-25 14:44  tobiasb
-
-	* Makefile:
-
-	removed obsoleteness
-	
-2000-01-25 14:37  tobiasb
-
-	* README:
-
-	The UPGRADE section of the README was inaccurate
-	
-2000-01-25 14:31  tobiasb
-
-	* lib/RT/Transaction.pm:
-
-	comment bug
-	
-2000-01-24 01:45  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-2000-01-24 01:43  jesse
-
-	* Makefile, NEWS, lib/RT/Attachment.pm, lib/RT/Attachments.pm,
-	lib/RT/Record.pm, lib/RT/Ticket.pm, lib/RT/Tickets.pm,
-	lib/RT/Transaction.pm, lib/RT/Transactions.pm:
-
-	
-	* Attachments support in code. rtq now basically works
-	  Mailgate creates new tickets
-	  rt -show now works a bit (doesn't display transaction content yet)
-	  rt -subject works. several other commandline tools work
-	
-2000-01-23 18:32  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-2000-01-23 18:27  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-2000-01-23 18:19  jesse
-
-	* etc/schema.mysql, lib/RT/Attachment.pm, lib/RT/Attachments.pm,
-	lib/RT/Ticket.pm, lib/RT/Transaction.pm:
-
-	Work to make attachments work. So far we've got something that puts attachments
-	in the database.
-	
-2000-01-21 12:25  tobiasb
-
-	* README:
-
-	doc-bugfix
-	
-2000-01-18 23:56  jesse
-
-	* lib/RT/Ticket.pm:
-
-	work on the mail gateway. (mainly disemboweled it)
-	
-2000-01-18 00:34  jesse
-
-	* lib/RT/Attachments.pm:
-
-	file Attachments.pm was initially added on branch rt-1-1.
-	
-2000-01-18 00:34  jesse
-
-	* docs/API:
-
-	file API was initially added on branch rt-1-1.
-	
-2000-01-18 00:34  jesse
-
-	* lib/RT/Attachment.pm:
-
-	file Attachment.pm was initially added on branch rt-1-1.
-	
-2000-01-18 00:34  jesse
-
-	* HACKING:
-
-	file HACKING was initially added on branch rt-1-1.
-	
-2000-01-18 00:34  jesse
-
-	* HACKING, Makefile, docs/API, etc/schema.mysql,
-	lib/RT/Attachment.pm, lib/RT/Attachments.pm, lib/RT/CurrentUser.pm,
-	lib/RT/Queue.pm, lib/RT/Record.pm, lib/RT/Ticket.pm,
-	lib/RT/Transaction.pm, lib/RT/Utils.pm:
-
-	work on attachments.
-	work on structure
-	
-2000-01-17 12:59  jesse
-
-	* Makefile, etc/schema.mysql, lib/RT/ACE.pm, lib/RT/ACL.pm,
-	lib/RT/CurrentUser.pm, lib/RT/Queue.pm, lib/RT/Queues.pm,
-	lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/Transaction.pm,
-	lib/RT/Transactions.pm, lib/RT/User.pm, lib/RT/Users.pm:
-
-	work on create. work on attachments. upcased the table names.
-	
-2000-01-14 15:34  jesse
-
-	* etc/schema.mysql:
-
-	work on schema
-	
-2000-01-14 14:47  jesse
-
-	* NEWS, etc/schema:
-
-	schema change to make long email addresses work better for queue members.
-	
-2000-01-14 01:07  jesse
-
-	* lib/RT/: EasySearch.pm, Record.pm, Ticket.pm, Tickets.pm,
-	Transaction.pm:
-
-	basic searches now work.
-	comments almost work.
-	creates are having an issue with effectiveid not getting set.
-	
-2000-01-13 18:04  jesse
-
-	* Makefile, lib/RT/EasySearch.pm, lib/RT/Tickets.pm:
-
-	[no log message]
-	
-2000-01-13 15:03  jesse
-
-	* lib/RT/Utils.pm:
-
-	file Utils.pm was initially added on branch rt-1-1.
-	
-2000-01-13 15:03  jesse
-
-	* lib/RT/Utils.pm:
-
-	[no log message]
-	
-2000-01-09 20:38  jesse
-
-	* lib/RT/EasySearch.pm:
-
-	file EasySearch.pm was initially added on branch rt-1-1.
-	
-2000-01-09 20:38  jesse
-
-	* lib/RT/: EasySearch.pm, Queue.pm, Queues.pm, Record.pm,
-	Tickets.pm:
-
-	added RT/EasySearch.pm
-	
-	rtadmin queue -list will now show all queues.
-	removed some debugging output
-	
-2000-01-04 01:21  jesse
-
-	* etc/schema.mysql, lib/RT/CurrentUser.pm, lib/RT/Queue.pm,
-	lib/RT/Record.pm, lib/RT/Ticket.pm, lib/RT/Transaction.pm,
-	lib/RT/User.pm:
-
-	Lots of work. first working ticket update.
-	
-2000-01-04 01:21  jesse
-
-	* lib/RT/CurrentUser.pm:
-
-	file CurrentUser.pm was initially added on branch rt-1-1.
-	
-2000-01-03 07:40  tobiasb
-
-	* README, README:
-
-	bugfix
-	
-2000-01-03 01:39  jesse
-
-	* lib/RT/: Record.pm, Ticket.pm, User.pm:
-
-	basic create support working.
-	more boackend and abstraction work
-	
-2000-01-02 22:04  jesse
-
-	* lib/RT/Ticket.pm:
-
-	[no log message]
-	
-2000-01-02 20:31  jesse
-
-	* lib/RT/: ACE.pm, Area.pm, Queue.pm, Record.pm, Ticket.pm,
-	Transaction.pm, User.pm:
-
-	work on a buit more abstraction
-	
-2000-01-01 19:01  jesse
-
-	* etc/schema.mysql, lib/RT/ACE.pm, lib/RT/Ticket.pm,
-	lib/RT/User.pm:
-
-	work on Ticket.pm, schema.
-	things are starting to use immutable ids when referring to other tables.
-	
-1999-12-30 02:13  jesse
-
-	* Makefile, etc/schema.mysql, lib/RT/Queue.pm, lib/RT/Record.pm,
-	lib/RT/User.pm:
-
-	reworked things to use autoloaded functions.
-	
-1999-12-29 00:24  jesse
-
-	* Makefile, bin/rtmux.pl, etc/schema.mysql, lib/RT/ACE.pm,
-	lib/RT/Area.pm, lib/RT/Queue.pm, lib/RT/Record.pm,
-	lib/RT/Ticket.pm, lib/RT/Transaction.pm, lib/RT/User.pm:
-
-	lots of changes. some of them not quite done perfectly.
-	but admin is closer
-	
-1999-12-28 01:39  jesse
-
-	* bin/rtmux.pl, etc/config.pm, lib/RT/ACE.pm, lib/RT/ACL.pm,
-	lib/RT/Area.pm, lib/RT/Areas.pm, lib/RT/Notification.pm,
-	lib/RT/Queue.pm, lib/RT/Queues.pm, lib/RT/Record.pm,
-	lib/RT/Ticket.pm, lib/RT/Tickets.pm, lib/RT/Transaction.pm,
-	lib/RT/Transactions.pm, lib/RT/User.pm, lib/RT/Users.pm:
-
-	rtadmin will now invoke and exit.
-	
-1999-12-27 19:54  jesse
-
-	* Makefile, bin/initacls.mysql, bin/rtmux.pl, etc/acl.mysql,
-	etc/config.pm, lib/RT/Record.pm:
-
-	first steps toward runability
-	
-1999-12-27 01:51  jesse
-
-	* Makefile, bin/rtmux.pl, etc/config.pm:
-
-	trying to get the config worked out
-	
-1999-12-26 21:58  jesse
-
-	* Makefile, Makefile:
-
-	[no log message]
-	
-1999-12-26 21:55  jesse
-
-	* Makefile, Makefile:
-
-	[no log message]
-	
-1999-12-26 21:53  jesse
-
-	* Makefile, Makefile, Makefile:
-
-	[no log message]
-	
-1999-12-26 21:51  jesse
-
-	* Makefile, Makefile, Makefile:
-
-	[no log message]
-	
-1999-12-26 21:45  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1999-12-26 21:42  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1999-12-26 21:34  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1999-12-26 21:19  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1999-12-26 18:35  jesse
-
-	* Makefile:
-
-	work on the makefile
-	
-1999-12-26 17:42  jesse
-
-	* lib/RT/User.pm:
-
-	more fixes for the new Handle object
-	
-1999-12-26 17:03  jesse
-
-	* bin/rtmux.pl, lib/RT/ACL.pm, lib/RT/Areas.pm, lib/RT/Queues.pm,
-	lib/RT/Tickets.pm, lib/RT/Transactions.pm, lib/RT/Users.pm:
-
-	more work on making everything use DBIx::Handle
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Ticket.pm:
-
-	file Ticket.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Queue.pm:
-
-	file Queue.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Transaction.pm:
-
-	file Transaction.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Notification.pm:
-
-	file Notification.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/ACE.pm:
-
-	file ACE.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Areas.pm:
-
-	file Areas.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/ACL.pm:
-
-	file ACL.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Users.pm:
-
-	file Users.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Database.pm:
-
-	file Database.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Tickets.pm:
-
-	file Tickets.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Queues.pm:
-
-	file Queues.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Transactions.pm:
-
-	file Transactions.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Area.pm:
-
-	file Area.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/: ACE.pm, ACL.pm, Area.pm, Areas.pm, Database.pm,
-	Notification.pm, Queue.pm, Queues.pm, Record.pm, Ticket.pm,
-	Tickets.pm, Transaction.pm, Transactions.pm, User.pm, Users.pm:
-
-	moving things to a more sane directory
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/Record.pm:
-
-	file Record.pm was initially added on branch rt-1-1.
-	
-1999-12-26 15:58  jesse
-
-	* lib/RT/User.pm:
-
-	file User.pm was initially added on branch rt-1-1.
-	
-1999-12-23 01:05  jesse
-
-	* Makefile, NEWS:
-
-	23 Dec 1999
-	-----------
-	
-	* Enabled a status = unresolved option for the web ui. thanks to
-	  brandon allbery <allbery@ece.cmu.edu> and Marion Hakanson <hakanson@cse.ogi.edu>
-	
-	* Made most of the permissions and directory changes from Marion
-	  Hakanson <hakanson@cse.ogi.edu> generally cleaned things up. but DID not
-	  include the changes to the directory creation, file copying and permission
-	  fixing code to enable RT_VAR_DIR
-	
-	* Made the web ui use $MESSAGE_FONT when putting up the compose window.
-	    Marion Hakanson <hakanson@cse.ogi.edu>
-	
-	* Genericised the templates to not mention the mythical "systems group"
-	
-1999-12-19 01:54  jesse
-
-	* Makefile, etc/schema.mysql:
-
-	work on ticket, transaction.
-	schema cleanup
-	
-1999-12-18 13:25  jesse
-
-	* etc/schema:
-
-	removed obsolete schema
-	
-1999-12-17 01:28  jesse
-
-	* Makefile:
-
-	set version
-	
-1999-12-17 01:27  jesse
-
-	* etc/: config.pm, schema.mysql:
-
-	more cleanup. we're getting there. just another zillion hours or so
-	
-1999-12-15 23:56  jesse
-
-	* docs/: FAQ, FAQ.html:
-
-	faq updates committed
-	
-1999-12-15 23:26  jesse
-
-	* README:
-
-	updates to tobix' additions
-	
-1999-12-15 18:32  tobiasb
-
-	* README:
-
-	duh
-	
-1999-12-15 18:04  tobiasb
-
-	* README:
-
-	Some few pitfalls mentionated
-	
-1999-12-09 00:38  jesse
-
-	* etc/schema.mysql:
-
-	work on Ticket and Transaction.
-	we're getting there.
-	
-1999-12-08 03:40  tobiasb
-
-	* etc/suidrt.c:
-
-	bugfixes
-	
-1999-12-06 21:41  jesse
-
-	* Makefile, NEWS:
-
-	[no log message]
-	
-1999-12-06 06:27  tobiasb
-
-	* Makefile:
-
-	insignificant output fix
-	
-1999-12-04 03:30  jesse
-
-	* NEWS, etc/schema.mysql:
-
-	[no log message]
-	
-1999-12-04 01:46  jesse
-
-	* NEWS:
-
-	Fixed tobix-induced bug in lib/rt/database/manipulate.pm
-	that'll teach him to make untested fixes to the stable branch.
-	
-1999-12-02 13:18  tobiasb
-
-	* etc/schema:
-
-	I'm unfortunately not even half on the way in my merging. I'm in a hurry, some small notes:
-	
-	1.1:
-	- work on dependencies done
-	- work on mail distribution done.
-	- requires sub dist_list
-	- requires sub open_parents
-	- requires sub add_link
-	
-	Dependencies & linking in general.
-	
-	Mail distribution. The distribution list is set by a &dist_list
-	sub. The transaction mail is never sent out for comments and
-	correspondence, but people who subscribe all transactions will get the
-	comments and correspondence.
-	
-1999-12-02 03:10  tobiasb
-
-	* etc/mysql.acl:
-
-	This file is renamed
-	
-1999-12-02 03:05  tobiasb
-
-	* etc/: schema.Pg, schema.mysql:
-
-	This file was fucked up, I don't know why. I'll just truncate it for now
-	
-1999-12-02 02:56  jesse
-
-	* Makefile:
-
-	bumped version
-	
-1999-12-02 02:54  tobiasb
-
-	* etc/schema:
-
-	Added links (dependency + knowledge db)
-	
-1999-12-02 01:42  jesse
-
-	* Makefile:
-
-	some makefile cleanup
-	
-1999-12-01 23:16  jesse
-
-	* NEWS:
-
-	[no log message]
-	
-1999-12-01 23:10  jesse
-
-	* bin/rtmux.pl, etc/schema.mysql:
-
-	mots of work on the new backend.
-	cliadmin is mostly up to date.
-	no, i haven't run any of the code :)
-	
-1999-11-30 21:52  jesse
-
-	* etc/: acl.Pg, schema.mysql:
-
-	[no log message]
-	
-1999-11-23 17:21  jesse
-
-	* docs/design_docs/CARS:
-
-	file CARS was initially added on branch rt-1-1.
-	
-1999-11-23 17:21  jesse
-
-	* README, docs/design_docs/CARS, etc/schema.mysql:
-
-	schema hacking for rt-1-1 features.
-	
-1999-11-18 21:40  jesse
-
-	* Makefile, Makefile, Makefile:
-
-	[no log message]
-	
-1999-11-17 17:36  tobiasb
-
-	* NEWS:
-
-	merged in changes from 1.0
-	
-1999-11-16 23:09  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1999-11-08 20:54  jesse
-
-	* NEWS:
-
-	fixed a longstanding bug in cli/query
-	
-1999-11-08 18:02  jesse
-
-	* Makefile, NEWS, etc/config.pm:
-
-	[no log message]
-	
-1999-11-05 03:50  tobiasb
-
-	* Makefile, NEWS, README, bin/initacls.mysql, bin/initdb.mysql,
-	etc/acl.mysql, etc/config.pm:
-
-	patch from khamer integrated - no testing done, however
-	
-1999-10-22 14:09  tobiasb
-
-	* etc/schema:
-
-	merged 1.1-changes
-	
-1999-10-22 12:14  tobiasb
-
-	* NEWS, etc/mysql.acl, etc/schema:
-
-	Merged in changes from 1.0. I haven't checked that things works quite well, anyway.
-	
-1999-10-21 16:21  jesse
-
-	* Makefile, NEWS:
-
-	changes to date_diff, some of the oldest code in RT
-	
-1999-10-21 07:07  tobiasb
-
-	* docs/actions.txt, docs/admin.txt, docs/attributes.txt,
-	docs/outline.txt, docs/rt_users_guide.html, etc/config.pm:
-
-	merged from 1.0
-	
-1999-10-20 23:16  jesse
-
-	* NEWS:
-
-	[no log message]
-	
-1999-10-20 22:25  jesse
-
-	* NEWS:
-
-	[no log message]
-	
-1999-10-20 21:58  jesse
-
-	* NEWS:
-
-	[no log message]
-	
-1999-10-20 21:43  jesse
-
-	* Makefile, NEWS:
-
-	[no log message]
-	
-1999-10-20 10:33  tobiasb
-
-	* Makefile, NEWS, README, README.91UPGRADE, TODO,
-	bin/initacls.mysql, bin/initdb.mysql, docs/README.docs:
-
-	Merged 1.0-development into 1.1
-	
-1999-10-20 01:23  jesse
-
-	* Makefile, NEWS:
-
-	
-	20 Oct 1999
-	-----------
-	* RT now uses a queue's mail alias when sending mail.
-	
-1999-10-20 00:44  jesse
-
-	* Makefile, NEWS:
-
-	
-	20 Oct 1999
-	-----------
-	
-	* Using the web UI to send correspondence should no longer not
-	  sent the correspondence if there are CCs, BCCs or the actor is
-	  the same as the requestor. thanks to <douglas@arepa.com> for
-	  pointing out the deficiency.
-	
-1999-10-13 19:32  jesse
-
-	* Makefile, TODO:
-
-	Released version 1.0 Updated the TODO file.
-	
-1999-10-06 18:01  jesse
-
-	* Makefile:
-
-	bumped version
-	
-1999-10-06 17:57  jesse
-
-	* Makefile, NEWS, README, docs/README.docs:
-
-	[no log message]
-	
-1999-10-06 17:48  jesse
-
-	* docs/: FAQ, FAQ.html, README.docs, actions.html, actions.txt,
-	admin.html, admin.txt, attributes.html, attributes.txt,
-	outline.html, outline.txt, rt_users_guide.html:
-
-	major documentation updates from mbrader
-	
-1999-10-04 14:22  jesse
-
-	* Makefile, NEWS:
-
-	bumped the version to 1.0.0pre2
-	
-1999-10-01 01:39  jesse
-
-	* Makefile:
-
-	fixed a makefile typo
-	
-1999-10-01 01:37  jesse
-
-	* NEWS, README, README.91UPGRADE:
-
-	updated readme
-	
-1999-10-01 01:07  jesse
-
-	* NEWS:
-
-	[no log message]
-	
-1999-10-01 00:22  jesse
-
-	* NEWS, etc/config.pm:
-
-	
-	30 Sep 1999
-	-----------
-	
-	*  Fixed a bug which caused RT to go crazy when comments were submitted
-	   by may without a ticket #.
-	
-	The following changes are from johnl@microware.com
-	
-	   1. Directories were not getting created with the correct modes under            /usr/local/rt/transactions.                                                         The umask() takes an octal file mode mask, not a file mode.                                                                                                     In addition I read the comments about $dirmode not working when             doing the mkdir's in content.pm.  I also fixed content.pm to use                $dirmode.  The main problem was the $dirmode was being set to a string          instead of an octal number.
-	
-	  Fixes to database.pm
-	    1.  The first hunk fixes problem where the call to write_content is             passing $time.  This variable does not exist.   It looked like $time was        supposed to be the current time.  ($time always == 0).  I changed all           occurances of $time to time (IE: time()).                                                                                                                       2.  The first hunk also passes $in_time instead of $time.                                                                                                       3.  The rest of the hunks fix $time and replace them with time().
-	
-	27 Sep 1999
-	-----------
-	Fixed a bug which caused the priority not to get set to the default
-	when requests were created in the webui. Thanks to <Elmar.Knipp@knipp.de>
-	
-1999-09-23 23:16  anoncvs
-
-	* Makefile:
-
-	[no log message]
-	
-1999-09-23 23:09  anoncvs
-
-	* Makefile, Makefile:
-
-	[no log message]
-	
-1999-09-23 23:07  anoncvs
-
-	* Makefile:
-
-	[no log message]
-	
-1999-09-23 23:01  anoncvs
-
-	* Makefile:
-
-	[no log message]
-	
-1999-09-23 22:52  anoncvs
-
-	* Makefile:
-
-	[no log message]
-	
-1999-08-08 22:20  tobiasb
-
-	* etc/schema:
-
-	ups
-	
-1999-08-07 02:27  tobiasb
-
-	* etc/schema:
-
-	in-work
-	
-1999-08-04 02:48  tobiasb
-
-	* Makefile, NEWS:
-
-	Merge
-	
-1999-08-03 22:38  jesse
-
-	* NEWS:
-
-	first cut of -trans
-	
-1999-08-03 22:27  jesse
-
-	* Makefile, NEWS:
-
-	reved the version to .99.9. tiny mail manipulate fix
-	
-1999-08-03 11:31  tobiasb
-
-	* bin/initdb.mysql:
-
-	file initdb.mysql was initially added on branch rt-1-1.
-	
-1999-08-03 11:31  tobiasb
-
-	* bin/initdb.Pg:
-
-	file initdb.Pg was initially added on branch rt-1-1.
-	
-1999-08-03 11:31  tobiasb
-
-	* bin/initacls.mysql:
-
-	file initacls.mysql was initially added on branch rt-1-1.
-	
-1999-08-03 11:31  tobiasb
-
-	* bin/: initacls.Pg, initacls.mysql, initdb.Pg, initdb.mysql:
-
-	Scripts for initing the DB
-	
-1999-08-03 11:31  tobiasb
-
-	* bin/initacls.Pg:
-
-	file initacls.Pg was initially added on branch rt-1-1.
-	
-1999-08-03 10:31  tobiasb
-
-	* etc/schema.mysql:
-
-	file schema.mysql was initially added on branch rt-1-1.
-	
-1999-08-03 10:31  tobiasb
-
-	* etc/schema.Pg:
-
-	file schema.Pg was initially added on branch rt-1-1.
-	
-1999-08-03 10:31  tobiasb
-
-	* etc/acl.mysql:
-
-	file acl.mysql was initially added on branch rt-1-1.
-	
-1999-08-03 10:31  tobiasb
-
-	* etc/acl.Pg:
-
-	file acl.Pg was initially added on branch rt-1-1.
-	
-1999-08-03 10:31  tobiasb
-
-	* Makefile, etc/acl.Pg, etc/acl.mysql, etc/mysql.acl, etc/schema,
-	etc/schema.Pg, etc/schema.mysql:
-
-	More work on the move to a DBMS-independent RT. The Makefile and executables _really_ need some testing and eventually debugging.
-	
-1999-08-03 02:14  tobiasb
-
-	* Makefile, etc/config.pm:
-
-	It seems to me that I've somehow managed to go to DBI...WebRT seems to work locally, but that's the only testing I've done
-	
-1999-08-02 07:07  tobiasb
-
-	* etc/schema:
-
-	in-work
-	
-1999-07-29 02:55  tobiasb
-
-	* etc/schema:
-
-	uuuurghh
-	
-1999-07-28 10:42  tobiasb
-
-	* README:
-
-	One small update on the work to link requests...
-	
-1999-07-27 07:08  tobiasb
-
-	* NEWS:
-
-	1.0-gospel
-	
-1999-07-27 06:48  tobiasb
-
-	* etc/schema:
-
-	asdfjlsadfhjkhdfawhi
-	
-1999-07-26 21:21  jesse
-
-	* Makefile, NEWS:
-
-	fixes to the mail gateway header handling
-	added cli rtq flags to the help
-	
-1999-07-26 07:03  tobiasb
-
-	* NEWS:
-
-	Merge
-	
-1999-07-24 20:43  jesse
-
-	* Makefile:
-
-	bumpted the version
-	
-1999-07-24 20:40  jesse
-
-	* NEWS:
-
-	added a few options to the cli query engine. area limitying and display of due dates.
-	
-1999-07-23 03:20  tobiasb
-
-	* NEWS:
-
-	Some merges
-	
-1999-07-23 02:56  tobiasb
-
-	* etc/schema:
-
-	With generic links
-	
-1999-07-22 23:13  jesse
-
-	* Makefile, NEWS:
-
-	22 Jul 99 (Jesse)
-	-----------------
-	Inital cleanup to the web ticket view. I'd like to significantly
-	compact and simplify that display.  More tables are probably in
-	order.  Additionally, I want to get rid of all those buttons "I
-	changed this." There's just no need for them. we can write logic
-	to do that for us.  Also, I bumped the version to 1.1.1.  I'd like
-	to do this 'linux-kernel-esque' The 1.1.x
-	series will be a development series leading toward 1.2.  Once we
-	get the DB changes in, I'll feel comfortable rolling a 'releaseable'
-	1.1 version for people who like pain.
-	
-1999-07-21 23:47  jesse
-
-	* Makefile, NEWS:
-
-	21 July 1999
-	------------
-	
-	Fix for [fsck #102] Better checks in is_not_a_requestor. this should fix
-	        issues with external users being equated with queue members.
-	
-	Fix for [fsck #114] Comment from bin/rt was accidentaly access controlled.
-	
-	Fix for [fsck #113] Display of requests users can't manipulate should now give
-	        ian error
-	
-1999-07-20 23:40  tobiasb
-
-	* etc/schema:
-
-	For a general way of linking WebRT requests to other web-based DBs
-	
-1999-07-20 21:42  tobiasb
-
-	* NEWS:
-
-	[no log message]
-	
-1999-07-20 21:11  tobiasb
-
-	* NEWS:
-
-	Hmf.
-	
-1999-07-20 21:07  tobiasb
-
-	* README, etc/config.pm:
-
-	updated for Internet::Mail
-	
-1999-07-20 21:01  tobiasb
-
-	* Makefile:
-
-	updated for Internet::Mail
-	
-1999-07-20 01:21  jesse
-
-	* NEWS:
-
-	Fix for [fsck #88] WebUI area SELECT bug.
-	
-	Fix for [fsck #90] A small html bug in WebRT
-	
-	Fix for [fsck #92] "Allow non-members to create requests" appeared twice
-	        in the WebAdmin
-	
-	Fix for [fsck #94] web ui forms are now 78 chars wide
-	
-1999-07-20 00:09  jesse
-
-	* NEWS:
-
-	19 July 1999
-	------------
-	Fix for [fsck #104]  We no longer try to reset the user's uid after writing
-	        transaction content to the filesystem. This should help out Net/OpenBSD
-	        compatibility
-	
-	Removed some legacy support for glimpse searching
-	
-	Fix for [fsck #115] The web ticket list should now wrap reasonably, so it's
-	        printable.
-	
-1999-07-19 03:26  tobiasb
-
-	* NEWS:
-
-	some updates
-	
-1999-07-17 13:14  tobiasb
-
-	* NEWS:
-
-	Updated a bit
-	
-1999-07-16 23:42  tobiasb
-
-	* Makefile:
-
-	Version number 1.pre1.1 - what do you think about it?
-	
-1999-07-16 22:49  tobiasb
-
-	* bin/rtmux.pl:
-
-	Filled in a missing comment
-	
-1999-07-16 22:46  tobiasb
-
-	* Makefile:
-
-	Set version to 1.1.0pre1, and changed /opt/rt to /usr/local/rt, I'd
-	daresay the next is more widely preffered.
-	
-1999-07-16 18:36  tobiasb
-
-	* COPYING, Makefile, NEWS, README, README.91UPGRADE, TODO,
-	bin/rtmux.pl, docs/FAQ, docs/FAQ.html, docs/README.docs,
-	docs/actions.html, docs/actions.txt, docs/admin.html,
-	docs/admin.txt, docs/attributes.html, docs/attributes.txt,
-	docs/outline.html, docs/outline.txt, etc/config.pm, etc/mysql.acl,
-	etc/schema, etc/suidrt.c:
-
-	Imported Tobix' current version
-	
-1999-07-08 02:10  jesse
-
-	* Makefile, NEWS, TODO:
-
-	Rolled .99.8
-	
-1999-07-07 15:37  jesse
-
-	* NEWS:
-
-	[no log message]
-	
-1999-07-07 00:45  jesse
-
-	* Makefile, NEWS:
-
-	updated makefile and news.
-	
-1999-07-06 22:58  jesse
-
-	* NEWS:
-
-	6 Jul 99
-	--------
-	Now, if you move a request to a new queue, it won't disown it if the same person can own reqs in the new queue. [fsck #75] (untested)
-	
-	Fixed a problem with cli create not properly handling due dates ([fsck #67])
-	Fixed a duplicate --help entry for bin/rt [fsck #69]
-	Fixed bugs fsck  #68/77: Odness Merging RT requests
-	
-	Transactions from merged requests will now be displayed along with the request id of the request that transaction was originially associated with.
-	
-	Fixed [fsck #74], which was reported by charlie brady:
-	   Messages are sent out from the mail interface with content first, then
-	   "--- Headers Follow ---", then the headers. In our vanilla sendmail setup,
-	   before the headers is a UUCP style deliver notification "From blah Tue Jul
-	   6 18:13:01 1999" line. This is interpreted by many mail agents as a
-	   message delimiter, so that what is seen in the mail agent is not one, but
-	   two messages. This is easily fixed by using the conventional quoting
-	   mechanism...
-	Fixed [fsck #71] WebRT: "User" should be "Requestor"
-	
-1999-07-06 21:35  jesse
-
-	* NEWS:
-
-	resovled #71, #74. worked on merge functionality
-	
-1999-06-29 17:39  jesse
-
-	* Makefile, NEWS:
-
-	[no log message]
-	
-1999-06-29 17:20  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1999-06-24 00:52  jesse
-
-	* Makefile, NEWS, README, TODO:
-
-	lots of touchups.
-	
-1999-06-23 23:29  jesse
-
-	* NEWS:
-
-	moved to CGI.pm's form parser.
-	
-1999-06-17 01:49  jesse
-
-	* NEWS:
-
-	edited news
-	
-1999-06-16 23:21  jesse
-
-	* Makefile, NEWS:
-
-	Fixed an auth bug.
-	
-1999-06-15 02:13  jesse
-
-	* Makefile:
-
-	upped the version to .99.8pre5
-	
-1999-06-15 02:09  jesse
-
-	* Makefile, NEWS:
-
-	lots of misc changes. see the diff to the news file
-	
-1999-05-12 20:37  jesse
-
-	* Makefile, NEWS:
-
-	cookies hacked to deal with the fact that netscape can't handle path=/
-	
-1999-05-12 01:57  jesse
-
-	* Makefile:
-
-	bumped the version number to .99.8pre3
-	
-1999-05-12 01:56  jesse
-
-	* NEWS:
-
-	Made error messages on the web admin interface more prominent.
-	
-	All the following changes are from tobix:
-	
-		Correspondence from RT now properly reflect the name of the sender
-		in the "from" header.
-	
-		Automated messages now properly have a "Precedence: bulk" header
-	
-		A stupid error with rt::mail_alias has been fixed
-	
-		Tobix' patch removes headers from all correspondence.  I'm relatively
-		afraid of this change, so I'm going to comment it out for now.
-	
-		rtadmin (the commandline has a new tool) :
-		     -update <passwd> <admin> [<users>]  updates user(s) from the
-	                   /etc/passwd file. If no users are specified, ALL
-	                   of /etc/passwd will be processed.
-	
-1999-05-11 16:46  jesse
-
-	* Makefile, NEWS, README:
-
-	mail loop fix from toby
-	
-1999-05-09 20:35  jesse
-
-	* Makefile:
-
-	bumped version numbers
-	
-1999-05-09 20:35  jesse
-
-	* Makefile, NEWS, README:
-
-	updated makefile and news
-	
-1999-05-09 20:17  jesse
-
-	* bin/rtmux.pl:
-
-	modifications to cookies support to md5 hash the password.
-	modification to allow non-nph web ui
-	
-1999-05-05 02:39  jesse
-
-	* NEWS:
-
-	fixed some cookies/frames problems
-	
-1999-05-05 02:10  jesse
-
-	* Makefile, NEWS:
-
-	fixed bugs in web auth from charlie brady
-	
-1999-05-03 21:44  jesse
-
-	* Makefile:
-
-	bumped the version #
-	
-1999-04-28 16:03  jesse
-
-	* Makefile:
-
-	bumped version
-	
-1999-04-28 16:03  jesse
-
-	* NEWS:
-
-	updated content.pm to spit errors.
-	
-1999-04-27 02:58  jesse
-
-	* Makefile:
-
-	downed the makefile version
-	
-1999-04-27 02:57  jesse
-
-	* Makefile:
-
-	fixed a makefile bug
-	
-1999-04-26 21:57  jesse
-
-	* NEWS, README:
-
-	added configuration info about mod_auth_mysql
-	
-1999-04-26 21:45  jesse
-
-	* Makefile, etc/config.pm:
-
-	Updated authetication stuff with patches from ingo. updated them further.
-	Added the ability to configure whether external authentication is done for webrt
-	added the ability to turn off ie compatibility mode
-	
-1999-04-23 19:31  jesse
-
-	* Makefile, NEWS, README, TODO:
-
-	started to update the README and Makefile
-	
-1999-04-13 04:00  jesse
-
-	* Makefile:
-
-	fixed totally fuxored makefile
-	
-1999-04-13 03:28  jesse
-
-	* README:
-
-	noted that there's a dependency on gnu make
-	
-1999-04-13 03:07  jesse
-
-	* Makefile:
-
-	bumped version
-	
-1999-04-13 03:06  jesse
-
-	* NEWS:
-
-	updated news
-	
-1999-04-08 04:36  jesse
-
-	* docs/rt.gif:
-
-	added the gif to the docs
-	
-1999-04-08 04:35  jesse
-
-	* NEWS:
-
-	fixes for new mysql modules
-	
-1999-04-07 23:57  jesse
-
-	* NEWS:
-
-	updates
-	
-1999-04-07 02:14  jesse
-
-	* NEWS:
-
-	[no log message]
-	
-1999-04-07 02:09  jesse
-
-	* Makefile, README:
-
-	fixes for cookie auth from charlie brady
-	
-1999-04-06 06:30  jesse
-
-	* Makefile, NEWS, README:
-
-	misc changes to support cookie authentication
-	
-1999-04-03 04:57  jesse
-
-	* NEWS, docs/FAQ, docs/FAQ.html, docs/README.docs,
-	docs/actions.html, docs/actions.txt, docs/admin.html,
-	docs/admin.txt, docs/attributes.html, docs/attributes.txt,
-	docs/outline.html, docs/outline.txt:
-
-	major update of the docs from adam.
-	
-1999-04-03 04:49  jesse
-
-	* Makefile:
-
-	makefile hackery to ease installs slightly.
-	
-1999-03-21 20:24  jesse
-
-	* Makefile:
-
-	updated makefile
-	
-1999-03-21 20:22  jesse
-
-	* NEWS, README:
-
-	mail changes
-	
-1999-03-08 14:50  jesse
-
-	* NEWS:
-
-	turned off the troll
-	
-1999-03-08 14:02  jesse
-
-	* Makefile:
-
-	fixed makefile bogosity for ACLs
-	
-1999-03-04 01:50  jesse
-
-	* Makefile, NEWS:
-
-	fixed a subject line parsing error.
-	
-1999-02-26 22:29  jesse
-
-	* NEWS:
-
-	added a check to make sure you don't merge ar equest into a non-existent other request
-	
-1999-02-26 21:43  jesse
-
-	* README.91UPGRADE, README.FIRST, TODO:
-
-	moved readme.fdirst to readmne.91upgrade
-	
-1999-02-26 19:59  jesse
-
-	* Makefile, NEWS:
-
-	updated makefile: added upgrade-noclobber
-	
-1999-02-24 19:11  jesse
-
-	* NEWS:
-
-	[no log message]
-	
-1999-02-23 14:41  jesse
-
-	* NEWS:
-
-	updated bnews
-	
-1999-02-23 03:20  jesse
-
-	* docs/: actions.txt, admin.txt, attributes.txt:
-
-	added updates for adam for the docs.
-	
-	updated the news
-	
-1999-02-23 03:20  jesse
-
-	* NEWS:
-
-	updated the news
-	
-1999-02-21 01:56  jesse
-
-	* Makefile:
-
-	fixed the .4
-	
-1999-02-21 01:53  jesse
-
-	* Makefile:
-
-	fixed make pre
-	
-1999-02-20 23:27  jesse
-
-	* Makefile:
-
-	addded back predist
-	
-1999-02-20 16:36  jesse
-
-	* NEWS:
-
-	edited the news to reflect changes
-	
-1999-02-20 14:56  jesse
-
-	* Makefile, NEWS:
-
-	bumped the version to .99.4 for testing.
-	
-1999-02-20 14:48  jesse
-
-	* etc/mysql.acl:
-
-	updated acls so they'll work with newer versions of mysql 3.22
-	
-1999-01-20 02:21  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1999-01-20 02:13  jesse
-
-	* Makefile:
-
-	On another note, here is a fix for the "HTML turd" reported by Benji
-	Cline in lib/rt/ui/web/forms.pm:
-	==========                                                                      diff -r0.99.2 forms.pm
-	87c87                                                                           <               $u = 0;
-	---                                                                             >               $u = 1;
-	91c91                                                                           <                       $u = 1;                                                 ---                                                                             >                       $u = 0;
-	==========
-	
-	With this patch applied, v0.99.2 (0.99.3?)                                      appears to be as solid as v0.9.18, if not more
-	so.
-	
-	Upgraded the version to .99.3
-	
-1999-01-16 20:44  jesse
-
-	* NEWS:
-
-	[no log message]
-	
-1999-01-16 20:39  jesse
-
-	* Makefile:
-
-	fixed a web acls bug. incremented the version.
-	
-1999-01-16 01:22  jesse
-
-	* Makefile:
-
-	bumped version to .99.1
-	
-1999-01-16 01:20  jesse
-
-	* Makefile, NEWS:
-
-	fixed some web admin sillyness..acls work better.
-	we no longer dump back to the main menu quite as gratuitously.
-	acls are no longer broken on the CLI either.
-	
-1998-12-16 01:31  jesse
-
-	* Makefile:
-
-	fixed the following things:
-	
-	From owner-rt-users@horked.fsck.com  Tue Nov 24 02:24:03 1998
-	Return-Path: <owner-rt-users@lists.fsck.com>
-	Received: (from majordomo@localhost)
-		by horked.fsck.com (8.8.7/8.8.7) id CAA11181
-		for rt-users-outgoing; Tue, 24 Nov 1998 02:24:01 -0500
-	X-Authentication-Warning: horked.fsck.com: majordomo set sender to owner-rt-users@lists.fsck.com using -f
-	Received: from modgud.nordicdms.com (h21-168-107.nordicdms.com [207.21.168.107] (may be forged))
-		by horked.fsck.com (8.8.7/8.8.7) with SMTP id CAA11177
-		for <rt-users@lists.fsck.com>; Tue, 24 Nov 1998 02:23:58 -0500
-	Received: (qmail 6211 invoked by alias); 24 Nov 1998 07:25:59 -0000
-	Message-ID: <19981124072559.6209.qmail@modgud.nordicdms.com>
-	Received: (qmail 6197 invoked from network); 24 Nov 1998 07:25:59 -0000
-	Received: from mail-ftp.nordicdms.com (HELO mail-ftp) (207.21.168.100)
-	  by mail.nordicdms.com with SMTP; 24 Nov 1998 07:25:59 -0000
-	From: "Dave Walton" <walton@nordicdms.com>
-	Organization: Nordic Entertainment Worldwide
-	To: Jesse <jrvincent@wesleyan.edu>, rt-users@lists.fsck.com
-	Date: Mon, 23 Nov 1998 23:25:58 -0800
-	MIME-Version: 1.0
-	Content-type: text/plain; charset=US-ASCII
-	Content-transfer-encoding: 7BIT
-	Subject: Two bugfixes
-	Reply-to: walton@nordicdms.com
-	In-reply-to: <19981013013318.H18644@horked.fsck.com>
-	References: <19981013042506.9798.qmail@modgud.nordicdms.com>; from Dave Walton on Mon, Oct 12, 1998 at 09:25:06PM -0700
-	X-mailer: Pegasus Mail for Win32 (v3.01d)
-	Sender: owner-rt-users@lists.fsck.com
-	Precedence: bulk
-	
-	1.  A backwards search was causing lib/rt/ui/web/support.pm to
-	crash when data that looks like an invalid regex is present in the
-	message headers.
-	------------------------------------------------------------
-	# diff support.old.pm support.pm
-	44c44
-	<               ($headers_ignore !~ /$field/i)) {
-	---
-	>               ($field !~ /$headers_ignore/i)) {
-	------------------------------------------------------------
-	
-	2.  HTML buglet in lib/rt/ui/web/manipulate.pm.
-	------------------------------------------------------------
-	# diff manipulate.old.pm manipulate.pm
-	894c894
-	< <font color=\"\$fg_color\">
-	---
-	> <font color=\"$fg_color\">
-	------------------------------------------------------------
-	
-	Dave
-	
-	----------------------------------------------------------------------
-	Dave Walton
-	Webmaster, Postmaster                   Nordic Entertainment Worldwide
-	walton@nordicdms.com                          http://www.nordicdms.com
-	----------------------------------------------------------------------
-	
-	From benji@hnt.com  Fri Nov 20 14:28:44 1998
-	Return-Path: <benji@hnt.com>
-	Received: from horked.fsck.com (jesse@localhost [127.0.0.1])
-		by horked.fsck.com (8.8.7/8.8.7) with ESMTP id OAA04739
-		for <jesse@localhost>; Fri, 20 Nov 1998 14:28:44 -0500
-	Received: from mail.wesleyan.edu
-		by horked.fsck.com (fetchmail-4.3.2 POP3 run by jrvincent)
-		for <jesse@localhost> (single-drop); Fri Nov 20 14:28:44 1998
-	Received: from columbus.hnt.com (columbus.hnt.com [208.221.11.10]) by mail.wesleyan.edu (8.8.6/8.7.3) with ESMTP id OAA18408 for <jrvincent@wesleyan.edu>; Fri, 20 Nov 1998 14:30:34 -0500 (EST)
-	Received: from peppermint.hnt.com (peppermint.hnt.com [208.221.11.51])
-		by columbus.hnt.com (8.9.1/8.9.1/HnT-980729) with ESMTP id OAA26134
-		for <jrvincent@wesleyan.edu>; Fri, 20 Nov 1998 14:30:32 -0500 (EST)
-	Received: from localhost by peppermint.hnt.com (8.9.1/8.9.1/HnT-nullclient-980724) with ESMTP id OAA02733
-		for <jrvincent@wesleyan.edu>; Fri, 20 Nov 1998 14:30:32 -0500 (EST)
-	X-Authentication-Warning: peppermint.hnt.com: benji owned process doing -bs
-	Date: Fri, 20 Nov 1998 14:30:31 -0500 (EST)
-	From: Benjamin Cline <benji@hnt.com>
-	To: Jesse <jrvincent@mail.wesleyan.edu>
-	Subject: Re: 0.9.20 is out
-	In-Reply-To: <19981120005718.F28841@horked.fsck.com>
-	Message-ID: <Pine.GSO.4.05.9811201427100.2438-100000@peppermint.hnt.com>
-	MIME-Version: 1.0
-	Content-Type: TEXT/PLAIN; charset=US-ASCII
-	X-UIDL: 4f1695a69f7cdbefcfce9198121fef95
-	
-	I think I've found a buglet in 0.9.20, I had to add an extra curly bracket
-	("}") to the end of lib/rt/database/admin.pm (just before the "1;") to get
-	it to work right.
-	
-		benji
-	
-	P.S. Sorry if that's not the most coherent bug report/fix, I'm afraid I'm
-	not much of a perl hacker.
-	
-	On Fri, 20 Nov 1998, Jesse wrote:
-	
-	> ftp://horked.fsck.com/pub/rt/devel/rt-0.9.20.tar.gz
-	>
-	> 19 Nov 98
-	> ---------
-	>
-	> Incorportated patches from Dave Walton to fix a typo, replace an
-	> accidentally
-	> blown away library and add a "last acted" column to the web ui.
-	> incremented version to .9.20
-	>
-	>
-	> 	jesse
-	>
-	> --
-	> jesse reed vincent -- jrvincent@wesleyan.edu -- jesse@fsck.com
-	> pgp keyprint:  50 41 9C 03 D0 BC BC C8 2C B9 77 26 6F E1 EB 91
-	> --------------------------------------------------------------
-	> They'll take my private key when they pry it from my cold dead fingers!
-	>
-	
-	--
-	Benjamin R. Cline       Harrison & Troxell, Inc.         benji@hnt.com
-	                     Quis Custodiet Ipsos Custodes?
-	
-	From adam@baz.org  Fri Nov 13 17:07:09 1998
-	Return-Path: <adam@baz.org>
-	Received: from horked.fsck.com (jesse@localhost [127.0.0.1])
-		by horked.fsck.com (8.8.7/8.8.7) with ESMTP id RAA10943
-		for <jesse@localhost>; Fri, 13 Nov 1998 17:07:09 -0500
-	Received: from mail.wesleyan.edu
-		by horked.fsck.com (fetchmail-4.3.2 POP3 run by jrvincent)
-		for <jesse@localhost> (single-drop); Fri Nov 13 17:07:09 1998
-	Received: from impei.baz.org (adam@impei.baz.org [139.167.64.229]) by mail.wesleyan.edu (8.8.6/8.7.3) with ESMTP id RAA08425 for <jrvincent@wesleyan.edu>; Fri, 13 Nov 1998 17:08:38 -0500 (EST)
-	Received: (from adam@localhost)
-		by impei.baz.org (8.8.7/8.8.8) id RAA18674
-		for jrvincent@wesleyan.edu; Fri, 13 Nov 1998 17:08:38 -0500
-	Message-ID: <19981113170837.A18668@baz.org>
-	Date: Fri, 13 Nov 1998 17:08:37 -0500
-	From: secret agent man <adam@baz.org>
-	To: "J.R.Ewing" <jrvincent@mail.wesleyan.edu>
-	Subject: RT bug, mebbe?
-	Mime-Version: 1.0
-	X-Mailer: Mutt 0.93.2i
-	Content-Type: text/plain; charset=us-ascii
-	X-UIDL: 5563064ca159a5eee88e16843932a45f
-	
-	<jailbait> q: If you leave the field blank when clicking on "create new
-	(queue|user) named", it goes to the create screen with an empty field that
-	can't be filled. It should either be editable there or it should reject
-	you.
-	
-	A
-	
-	--
-	Everything I needed to know about life I learned       <adam@baz.org>
-	from killing smarter people and eating their brains.    adam hirsch
-	
-1998-11-20 00:45  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1998-11-20 00:28  jesse
-
-	* Makefile, NEWS:
-
-	19 Nov 98
-	---------
-	
-	Incorportated patches from Dave Walton to fix a typo, replace an accidentally
-	blown away library and add a "last acted" column to the web ui.
-	incremented version to .9.20
-	
-1998-11-18 02:26  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1998-10-13 03:37  jesse
-
-	* Makefile, README, etc/mysql.acl:
-
-	shiny:% cat >> changes                                          ~ 10:53PM:tt
-	2.  Made comments and replies update date_acted.
-	
-	        -- Dave Walton
-	
-	Ok.. I know this is being picky, but, in rt/lib/ui/web/support.pm, the
-	subroutine "content_header", at line 290, should have:
-	    print "<head><title>WebRT</title></head>\n";
-	
-	Otherwise, when running in frames, you never get a title on the page. :(
-	
-	No biggie...
-	
-	-Rich
-	
-	Oh, one other.
-	
-	8.  etc/mysql.acl, line 5
-	The RT_MYSQL_HOST entry on that line doesn't make any sense
-	when MySQL is on a different host than RT.  That should be
-	RT_HOST, or some such thing.
-	
-	Dave
-	
-	After just upgrading to Apache 1.3.0 from 1.2.5, I figured I would make it
-	known that, in the file <apache_src_dir>/src/main/util_script.c, you have
-	to define SECURITY_HOLE_PASS_AUTHORIZATION to allow for RT's authorization
-	to work properly.
-	-Rich
-	
-	On Tue, Oct 06, 1998 at 09:19:07PM -0700, Dave Walton wrote:
-	> I just discovered that if there is an error in add_correspondence, the
-	> mail interface discards the incoming mail without comment.  To
-	> correct this, I took the following steps:
-	>
-	In mail.pm, there's a space before :
-	
-	From: $rt::mail_alias
-	
-	This causes problems in some mail clients, putting the From: line on the
-	same line as the subject.  If the spaces are removed this is fixed.
-	
-	Regards,
-	From: "Andrew Foster" <adf@fl.net.au>
-	
-1998-09-11 01:15  jesse
-
-	* docs/README.docs:
-
-	updated lists for rt docs.
-	
-1998-09-08 03:23  jesse
-
-	* NEWS:
-
-	updated news
-	
-1998-09-08 03:18  jesse
-
-	* Makefile, NEWS, README, etc/config.pm:
-
-	Final bug fixes for .9.18
-	
-1998-08-09 17:43  jesse
-
-	* NEWS, README, TODO:
-
-	All kinds of crazy updates for .9.18. Mostly from serge zhuk
-	
-1998-08-04 03:09  jesse
-
-	* NEWS:
-
-	first round of updates from serge
-	
-1998-06-26 17:07  jesse
-
-	* Makefile, NEWS:
-
-	modified makefile and news
-	
-1998-06-26 16:34  jesse
-
-	* docs/: README.docs, actions.txt, admin.txt, attributes.txt,
-	outline.txt:
-
-	Added documentation from <adam@apocalypse.org>
-	
-1998-06-25 17:06  jesse
-
-	* Makefile, README, etc/config.pm:
-
-	removed refs to glimpse
-	
-1998-06-25 15:46  jesse
-
-	* Makefile:
-
-	dist fixes
-	
-1998-06-25 15:44  jesse
-
-	* Makefile:
-
-	dist fixes
-	
-1998-06-25 14:09  jesse
-
-	* Makefile:
-
-	edited dist. maker
-	
-1998-05-21 22:40  jesse
-
-	* Makefile:
-
-	added httpd.conf configurator for cern
-	
-1998-04-27 20:17  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1998-04-20 14:53  jesse
-
-	* Makefile:
-
-	bumped version to .9.14.
-	
-1998-04-20 14:53  jesse
-
-	* Makefile:
-
-	bumped version to .9.13.1
-	
-1998-04-19 03:14  jesse
-
-	* Makefile:
-
-	updated version number.
-	now explicitly create rt-etc-dir
-	
-1998-04-16 21:40  jesse
-
-	* bin/rtmux.pl:
-
-	removed a spurious addition to the lib path from the mux
-	abstracted a bunch of stuff out of the mux and throughout the makefile.
-	like program names.
-	
-1998-04-16 21:39  jesse
-
-	* Makefile:
-
-	abstracted a bunch of stuff out of the mux and throughout the makefile.
-	like program names.
-	
-1998-04-16 19:47  jesse
-
-	* COPYING, Makefile, NEWS, README, README.FIRST, TODO:
-
-	commiting updates
-	
-1998-04-08 13:35  jesse
-
-	* etc/config.pm:
-
-	fixed typos in config.pm that prevented mail from working with .9.11
-	bumped version to .12
-	
-1998-04-08 13:34  jesse
-
-	* Makefile:
-
-	bumped version to .12
-	
-1998-04-02 21:30  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1998-04-02 21:27  jesse
-
-	* Makefile:
-
-	fixed make dist
-	
-1998-04-02 15:36  jesse
-
-	* Makefile, Makefile:
-
-	[no log message]
-	
-1998-04-02 15:29  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1998-04-02 15:25  jesse
-
-	* etc/config.pm:
-
-	split mail program and mail program flags
-	hopefully fixed make dist
-	
-1998-04-02 15:25  jesse
-
-	* Makefile:
-
-	hopefully fixed make dist
-	
-1998-04-02 11:02  jesse
-
-	* Makefile, NEWS:
-
-	updated news
-	
-1998-04-02 10:55  jesse
-
-	* Makefile:
-
-	[no log message]
-	
-1998-04-02 10:31  jesse
-
-	* etc/config.pm:
-
-	reshuffled files that the user won't be changing out of etc and into lib
-	this includes generic templates and images for the web ui
-	updated src and makefiles accordingly.
-	verbosifoed part of config.pm
-	
-1998-04-02 10:31  jesse
-
-	* Makefile:
-
-	reshuffled files that the user won't be changing out of etc and into lib
-	this includes generic templates and images for the web ui
-	updated src and makefiles accordingly.
-	
-1998-04-02 10:20  jesse
-
-	* Makefile:
-
-	built more auto-dist stuff
-	
-1998-04-02 03:22  jesse
-
-	* README:
-
-	added apache patch to readme
-	
-1998-04-02 03:13  jesse
-
-	* Makefile, README, TODO, etc/config.pm:
-
-	updated makefile and readme and todo
-	added toggle for mysql 3.21
-	moved sendmail flags to makefile for compat w 8.6
-	
-1998-02-08 21:12  jesse
-
-	* Makefile:
-
-	make upgrade now calls mux-install
-	
-1998-01-30 22:31  jesse
-
-	* Makefile, README, README.FIRST:
-
-	added bits to upgrade from .9.1
-	made make upgrade upgrade the conf file
-	
-1998-01-27 01:56  jesse
-
-	* NEWS:
-
-	updated news
-	
-1998-01-27 01:48  jesse
-
-	* Makefile:
-
-	started a make dist
-	
-1998-01-26 17:59  jesse
-
-	* Makefile, README, README.FIRST:
-
-	updated readme
-	
-1998-01-21 18:37  jesse
-
-	* Makefile:
-
-	fixes to makefile to allow for proper specification of database as local.
-	added "you are logged in as..." to web/support...
-	changed sendmail options in mail.pm/
-	
-1998-01-14 23:49  jesse
-
-	* Makefile, etc/mysql.acl:
-
-	incremented version number
-	
-1998-01-09 14:48  jesse
-
-	* bin/rtmux.pl:
-
-	added taint safeness for $ENV{'ENV}
-	updated makefile version number
-	
-1998-01-09 14:47  jesse
-
-	* Makefile:
-
-	updated makefile version number
-	
-1998-01-08 16:17  jesse
-
-	* README.FIRST:
-
-	ipdated readme.first.
-	
-1998-01-08 14:53  jesse
-
-	* etc/suidrt.c:
-
-	made suidrt.c work
-	updated the mux
-	
-1998-01-08 14:53  jesse
-
-	* bin/rtmux.pl:
-
-	updated the mux
-	
-1998-01-08 13:10  jesse
-
-	* Makefile:
-
-	more fixes to make suid wrapper stuff work.
-	
-1998-01-08 12:51  jesse
-
-	* bin/rtmux.pl:
-
-	made rtmux attempt to work with the suid wrapper
-	
-1998-01-08 12:48  jesse
-
-	* etc/suidrt.c:
-
-	added back suidrt.c. blech.
-	
-1998-01-08 12:44  jesse
-
-	* Makefile, bin/rtmux.pl:
-
-	brought back suidrt.c
-	bleck.
-	
-1998-01-07 18:06  jesse
-
-	* Makefile:
-
-	added a sane mode for $(RT_PATH)
-	
-1998-01-07 00:37  jesse
-
-	* Makefile, README.FIRST:
-
-	added basic old upgrade instructions.
-	added info to README.FIRST about upgrading.
-	
-1998-01-07 00:31  jesse
-
-	* bin/rtmux.pl:
-
-	made mailing work.
-	
-1998-01-06 10:27  jesse
-
-	* bin/rtmux.pl:
-
-	made the mux require ui::mail before it tried to invoke it.
-	
-1998-01-04 02:26  jesse
-
-	* README:
-
-	told users to read readme.first.
-	
-1998-01-04 02:25  jesse
-
-	* README, README.FIRST:
-
-	added readme.first
-	
-1998-01-04 02:12  jesse
-
-	* Makefile:
-
-	updated webadmin interface. fixed some logout problems. fixed an html bug in web-manip.
-	
-1998-01-02 01:14  jesse
-
-	* Makefile, bin/rtmux.pl:
-
-	fixed more problems w/ making cliadmin run
-	merged mux-install and mux-links into one section of makefile
-	
-1998-01-02 00:59  jesse
-
-	* Makefile, NEWS, README, TODO, bin/rtmux.pl, etc/config.pm:
-
-	fixed typo in Makefile: install-libs -> libs-install
-	
-1998-01-01 03:07  jesse
-
-	* Makefile, bin/rtmux.pl:
-
-	commented makefile better
-	added more stuff for taint checks to rtmux.pl
-	fixed a non-frames web bug in FormComment
-	
-1997-12-31 01:55  jesse
-
-	* Makefile, bin/rtmux.pl, etc/config.pm:
-
-	lots of cleanup to get web interface running.
-	beginnigs of taint-safe scripts.
-	
-1997-12-30 23:49  jesse
-
-	* Makefile, bin/rtmux.pl:
-
-	cleanup in cli admin.pm, cli query.pm, the mux, the makefile
-	database routines now assign an effective serial # to a request when you get
-	the fact's serial number
-	
-1997-12-30 22:56  jesse
-
-	* Makefile, README, bin/rtmux.pl:
-
-	remodded rtmux to use correct vars for command line arguments.
-	moved RT_VERSION to makefile.
-	updated README for new install procedure
-	
-1997-12-30 01:09  jesse
-
-	* Makefile, etc/config.pm, etc/mysql.acl:
-
-	fixed typo in web/admin.pm
-	set up config.pm mysql.acl and rtmux.pl to get themselves parsed from the makefile.
-	removed last vestiges of C
-	
-1997-12-28 18:59  jesse
-
-	* Makefile, etc/schema:
-
-	removed suidrt for a preparation to move to a c-free system
-	added provisions for token-parsing to makefile
-	
-1997-12-28 03:10  jesse
-
-	* etc/schema:
-
-	added tags to schema
-	
-1997-12-28 02:48  jesse
-
-	* Makefile:
-
-	started to modify toplevel makefile
-	
-1997-12-19 03:04  jesse
-
-	* lib/rtmux.pl:
-
-	moved the executable rtmux.pl to bin, where it belongs.
-	made sure bin/cgi gets created on checkout
-	
-1997-12-19 03:03  jesse
-
-	* bin/rtmux.pl:
-
-	moved the executable rtmux.pl to bin, where it belongs.
-	
-1997-12-18 19:05  jesse
-
-	* lib/rtmux.pl:
-
-	worked on the mux
-	
-1997-12-09 15:14  jesse
-
-	* TODO:
-
-	added things for v1.0 to the todo list
-	
-1997-12-09 02:03  jesse
-
-	* etc/config.pm:
-
-	broke configuration out into config.pm
-	
-1997-12-09 01:54  jesse
-
-	* COPYING, Makefile, NEWS, README, TODO, etc/mysql.acl, etc/schema:
-
-	initial commit after i nuked the repository
-	
-1997-12-09 01:54  jesse
-
-	* COPYING, Makefile, NEWS, README, TODO, etc/mysql.acl, etc/schema:
-
-	Initial revision
-	
diff --git a/rt/Makefile b/rt/Makefile
index fe01b71c1..644722109 100644
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -1,18 +1,49 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/Makefile,v 1.1 2002-08-12 06:17:06 ivan Exp $
-# RT is Copyright 1996-2002 Jesse Vincent <jesse@bestpractical.com>
-# It is distributed under the terms of the GNU General Public License, version 2
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2002 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org
+# 
+# This work 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.
+# 
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+
+#
+# DO NOT HAND-EDIT the file named 'Makefile'. This file is autogenerated.
+# Have a look at "configure" and "Makefile.in" instead
+#
+
 
 PERL			= 	/usr/bin/perl
 
-RT_VERSION_MAJOR	=	2
-RT_VERSION_MINOR	=	0
-RT_VERSION_PATCH	=	14
+CONFIG_FILE_PATH	=	/opt/rt3/etc
+CONFIG_FILE		= 	$(CONFIG_FILE_PATH)/RT_Config.pm
+SITE_CONFIG_FILE		= 	$(CONFIG_FILE_PATH)/RT_SiteConfig.pm
 
 
+RT_VERSION_MAJOR	=	3
+RT_VERSION_MINOR	=	0
+RT_VERSION_PATCH	=	4
+
 RT_VERSION =	$(RT_VERSION_MAJOR).$(RT_VERSION_MINOR).$(RT_VERSION_PATCH)
 TAG 	   =	rt-$(RT_VERSION_MAJOR)-$(RT_VERSION_MINOR)-$(RT_VERSION_PATCH)
 
-BRANCH			=	HEAD
 
 # This is the group that all of the installed files will be chgrp'ed to.
 RTGROUP			=	rt
@@ -27,7 +58,8 @@ LIBS_OWNER 		=	root
 # Group that should own all of RT's libraries, generally root.
 LIBS_GROUP		=	bin
 
-
+WEB_USER		=	www
+WEB_GROUP		=	www
 
 # {{{ Files and directories 
 
@@ -37,33 +69,22 @@ LIBS_GROUP		=	bin
 DESTDIR			=	
 
 
-# RT_PATH is the name of the directory you want make to install RT in
-# RT must be installed in its own directory (don't set this to /usr/local)
-
-RT_PATH			=	/opt/rt2
-
-# The rest of these paths are all configurable, but you probably don't want to 
-# put them elsewhere
-
-RT_LIB_PATH		=	$(RT_PATH)/lib
-RT_ETC_PATH		=	$(RT_PATH)/etc
-RT_CONFIG_PATH		=	$(RT_ETC_PATH)
-RT_BIN_PATH		=	$(RT_PATH)/bin
-RT_MAN_PATH		=	$(RT_PATH)/man
-MASON_HTML_PATH		=	$(RT_PATH)/WebRT/html
-
-
-# RT allows sites to overlay the default web ui with 
-# local customizations Those files can be placed in MASON_LOCAL_HTML_PATH
-
-MASON_LOCAL_HTML_PATH	=	$(RT_PATH)/local/WebRT/html
-
-# RT needs to be able to write to MASON_DATA_PATH and MASON_SESSION_PATH
-# RT will create and chown these directories. Don't just set them to /tmp
-MASON_DATA_PATH		=       $(RT_PATH)/WebRT/data
-MASON_SESSION_PATH	=       $(RT_PATH)/WebRT/sessiondata
-
-RT_LOG_PATH             =       /tmp
+RT_PATH			=	/opt/rt3
+RT_ETC_PATH		=	/opt/rt3/etc
+RT_BIN_PATH		=	/opt/rt3/bin
+RT_SBIN_PATH		=	/opt/rt3/sbin
+RT_LIB_PATH		=	/opt/rt3/lib
+RT_MAN_PATH		=	/opt/rt3/man
+RT_VAR_PATH		=	/opt/rt3/var
+RT_DOC_PATH		=	/opt/rt3/share/doc
+RT_LOCAL_PATH		=	/opt/rt3/local
+LOCAL_ETC_PATH		=	/opt/rt3/local/etc
+LOCAL_LEXICON_PATH	=	/opt/rt3/local/po
+MASON_HTML_PATH		=	/opt/rt3/share/html
+MASON_LOCAL_HTML_PATH	=	/opt/rt3/local/html
+MASON_DATA_PATH		=	/opt/rt3/var/mason_data
+MASON_SESSION_PATH	=	/opt/rt3/var/session_data
+RT_LOG_PATH	    =       /opt/rt3/var/log
 
 # RT_READABLE_DIR_MODE is the mode of directories that are generally meant
 # to be accessable
@@ -71,25 +92,33 @@ RT_READABLE_DIR_MODE	=	0755
 
 
 
-# The location of your rt configuration file
-RT_CONFIG		=	$(RT_CONFIG_PATH)/config.pm
+
+# {{{ all these define the places that RT's binaries should get installed
 
 # RT_MODPERL_HANDLER is the mason handler script for mod_perl
 RT_MODPERL_HANDLER	=	$(RT_BIN_PATH)/webmux.pl
-
 # RT_FASTCGI_HANDLER is the mason handler script for FastCGI
-# THIS HANDLER IS NOT CURRENTLY SUPPORTED
 RT_FASTCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.fcgi
+# RT_WIN32_FASTCGI_HANDLER is the mason handler script for FastCGI
+RT_WIN32_FASTCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.svc
+# RT's admin CLI
+RT_CLI_ADMIN_BIN	=	$(RT_BIN_PATH)/rtadmin
+# RT's mail gateway
+RT_MAILGATE_BIN		=	$(RT_BIN_PATH)/rt-mailgate
+# RT's cron tool
+RT_CRON_BIN		=	$(RT_BIN_PATH)/rt-crontool
 
-# RT_SPEEDYCGI_HANDLER is the mason handler script for SpeedyCGI
-# THIS HANDLER IS NOT CURRENTLY SUPPORTED
-RT_SPEEDYCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.scgi
+# }}}
 
-# The following are the names of the various binaries which make up RT 
+SETGID_BINARIES	 	= 	$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
+				$(DESTDIR)/$(RT_WIN32_FASTCGI_HANDLER)
+
+BINARIES		=	$(DESTDIR)/$(RT_MODPERL_HANDLER) \
+				$(DESTDIR)/$(RT_MAILGATE_BIN) \
+				$(DESTDIR)/$(RT_CRON_BIN) \
+				$(SETGID_BINARIES)
+SYSTEM_BINARIES		=	$(DESTDIR)/$(RT_SBIN_PATH)/
 
-RT_CLI_BIN		=	$(RT_BIN_PATH)/rt
-RT_CLI_ADMIN_BIN	=	$(RT_BIN_PATH)/rtadmin
-RT_MAILGATE_BIN		=	$(RT_BIN_PATH)/rt-mailgate
 
 # }}}
 
@@ -99,34 +128,19 @@ RT_MAILGATE_BIN		=	$(RT_BIN_PATH)/rt-mailgate
 # DB_TYPE defines what sort of database RT trys to talk to
 # "mysql" is known to work.
 # "Pg" is known to work
-# "Oracle" is in the early stages of working.
 
 DB_TYPE			=	mysql
 
-# DB_HOME is where the Database's commandline tools live.  $DB_HOME/bin
-# should contain the binaries themselves, e.g. if "which mysql" gives
-# "/usr/local/mysql/bin/mysql", $DB_HOME should be "/usr/local/mysql"
-
-DB_HOME			= /usr
-
 # Set DBA to the name of a unix account with the proper permissions and 
-# environment to run your commandline SQL tools
+# environment to run your commandline SQL sbin
 
 # Set DB_DBA to the name of a DB user with permission to create new databases 
-# Set DB_DBA_PASSWORD to that user's password (if you don't, you'll be prompted
-# later)
 
 # For mysql, you probably want 'root'
 # For Pg, you probably want 'postgres' 
 # For oracle, you want 'system'
 
 DB_DBA			=	root
-DB_DBA_PASSWORD		=	
- 
-#
-# Set this to the Fully Qualified Domain Name of your database server.
-# If the database is local, rather than on a remote host, using "localhost" 
-# will greatly enhance performance.
 
 DB_HOST			=	localhost
 
@@ -136,6 +150,9 @@ DB_HOST			=	localhost
 
 DB_PORT			=	
 
+
+
+
 #
 # Set this to the canonical name of the interface RT will be talking to the 
 # database on.  If you said that the RT_DB_HOST above was "localhost," this 
@@ -149,81 +166,72 @@ DB_RT_HOST		=	localhost
 # set this to the name you want to give to the RT database in 
 # your database server. For Oracle, this should be the name of your sid
 
-DB_DATABASE		=	rt2
-
-# Set this to the name of the rt database user
-
+DB_DATABASE		=	rt3
 DB_RT_USER		=	rt_user
-
-# Set this to the password used by the rt database user
-# *** Change This Before Installation***
-
 DB_RT_PASS		=	rt_pass
 
 # }}}
 
-# {{{ Web configuration 
-
-# The user your webserver runs as. needed so that webrt can cache mason
-# objectcode
 
-WEB_USER		=	www
-WEB_GROUP		=	rt
-
-# }}}
-
-
-####################################################################
-# No user servicable parts below this line.  Frob at your own risk #
 ####################################################################
 
+all: default
+
 default:
 	@echo "Please read RT's readme before installing. Not doing so could"
 	@echo "be dangerous."
 
-install: dirs initialize.$(DB_TYPE) upgrade insert instruct
+
 
 instruct:
 	@echo "Congratulations. RT has been installed. "
-	@echo "You must now configure it by editing $(RT_CONFIG)."
-	@echo "From here on in, you should refer to the users guide."
+	@echo ""
+	@echo ""
+	@echo "You must now configure RT by editing $(SITE_CONFIG_FILE)."
+	@echo ""
+	@echo "(You will definitely need to set RT's database password before continuing."
+	@echo " Not doing so could be very dangerous)"
+	@echo ""
+	@echo "After that, you need to initialize RT's database by running" 
+	@echo " 'make initialize-database'"
 
+#	@echo " or by executing "       
+#	@echo " '$(RT_SBIN_PATH)/rt-setup-database --action init \ "
+#	@echo "     --dba $(DB_DBA) --prompt-for-dba-password'"
 
-insert: insert-install
-	$(PERL) -I$(DESTDIR)/$(RT_ETC_PATH) -I$(DESTDIR)/$(RT_LIB_PATH) $(DESTDIR)/$(RT_ETC_PATH)/insertdata
 
-upgrade: dirs config-replace upgrade-noclobber  upgrade-instruct
 
 upgrade-instruct: 
 	@echo "Congratulations. RT has been upgraded. You should now check-over"
-	@echo "$(RT_CONFIG) for any necessary site customization. Additionally,"
+	@echo "$(CONFIG_FILE) for any necessary site customization. Additionally,"
 	@echo "you should update RT's system database objects by running "
-	@echo "	   $(RT_ETC_PATH)/insertdata <version>"
-	@echo "where <version> is the version of RT you're upgrading from."
+	@echo "   ls etc/upgrade"
+	@echo "For each file in that directory whose name is greater than"
+	@echo "your previously installed RT version, run:"
+	@echo "	   $(RT_SBIN_PATH)/rt-setup-database --action insert --datafile etc/upgrade/<version>"
 
-upgrade-noclobber: insert-install libs-install html-install bin-install nondestruct
 
-nondestruct: fixperms
+upgrade: dirs upgrade-noclobber upgrade-instruct
 
-testdeps:
-	$(PERL) ./tools/testdeps -warn $(DB_TYPE)
+upgrade-noclobber: config-install libs-install html-install bin-install local-install doc-install fixperms
 
-fixdeps:
-	$(PERL) ./tools/testdeps -fix $(DB_TYPE)
 
+# {{{ dependencies
+testdeps:
+	$(PERL) ./sbin/rt-test-dependencies --with-$(DB_TYPE)
 
+fixdeps:
+	$(PERL) ./sbin/rt-test-dependencies --install --with-$(DB_TYPE)
 
-all:
-	@echo "Read the readme."
+#}}}
 
+# {{{ fixperms
 fixperms:
 	# Make the libraries readable
-	chmod -R $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_PATH)
+	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_PATH)
 	chown -R $(LIBS_OWNER) $(DESTDIR)/$(RT_LIB_PATH)
 	chgrp -R $(LIBS_GROUP) $(DESTDIR)/$(RT_LIB_PATH)
-
-	chown -R $(BIN_OWNER) $(DESTDIR)/$(RT_BIN_PATH)
-	chgrp -R $(RTGROUP) $(DESTDIR)/$(RT_BIN_PATH)
+	chmod -R  u+rwX,go-w,go+rX 	$(DESTDIR)/$(RT_LIB_PATH)
 
 
 	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_BIN_PATH)
@@ -237,36 +245,19 @@ fixperms:
 	chown -R $(BIN_OWNER) $(DESTDIR)/$(RT_ETC_PATH)
 	chgrp -R $(RTGROUP) $(DESTDIR)/$(RT_ETC_PATH)
 
-	chmod 0550 $(DESTDIR)/$(RT_CONFIG)
+	chmod 0550 $(DESTDIR)/$(CONFIG_FILE)
+	chmod 0550 $(DESTDIR)/$(SITE_CONFIG_FILE)
 
 	# Make the interfaces executable and setgid rt
-	chown $(BIN_OWNER) $(DESTDIR)/$(RT_MAILGATE_BIN) \
-			$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
-			$(DESTDIR)/$(RT_SPEEDYCGI_HANDLER) \
-			$(DESTDIR)/$(RT_CLI_BIN) \
-			$(DESTDIR)/$(RT_CLI_ADMIN_BIN)
-
-	chgrp $(RTGROUP) $(DESTDIR)/$(RT_MAILGATE_BIN) \
-			$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
-			$(DESTDIR)/$(RT_SPEEDYCGI_HANDLER) \
-			$(DESTDIR)/$(RT_CLI_BIN) \
-			$(DESTDIR)/$(RT_CLI_ADMIN_BIN)
-
-	chmod 0755  	$(DESTDIR)/$(RT_MAILGATE_BIN) \
-			$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
-			$(DESTDIR)/$(RT_SPEEDYCGI_HANDLER) \
-			$(DESTDIR)/$(RT_CLI_BIN) \
-			$(DESTDIR)/$(RT_CLI_ADMIN_BIN)
-
-	chmod g+s 	$(DESTDIR)/$(RT_MAILGATE_BIN) \
-			$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
-			$(DESTDIR)/$(RT_SPEEDYCGI_HANDLER) \
-			$(DESTDIR)/$(RT_CLI_BIN) \
-			$(DESTDIR)/$(RT_CLI_ADMIN_BIN)
+	chown $(BIN_OWNER) $(BINARIES)
+	chgrp $(RTGROUP) $(BINARIES)
+	chmod 0755  $(BINARIES)
+	chmod g+s $(SETGID_BINARIES)
 
 	# Make the web ui readable by all. 
 	chmod -R  u+rwX,go-w,go+rX 	$(DESTDIR)/$(MASON_HTML_PATH) \
-					$(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
+					$(DESTDIR)/$(MASON_LOCAL_HTML_PATH) \
+					$(DESTDIR)/$(LOCAL_LEXICON_PATH)
 	chown -R $(LIBS_OWNER) 	$(DESTDIR)/$(MASON_HTML_PATH) \
 				$(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
 	chgrp -R $(LIBS_GROUP) 	$(DESTDIR)/$(MASON_HTML_PATH) \
@@ -279,140 +270,216 @@ fixperms:
 				$(DESTDIR)/$(MASON_SESSION_PATH)
 	chgrp -R $(WEB_GROUP) 	$(DESTDIR)/$(MASON_DATA_PATH) \
 				$(DESTDIR)/$(MASON_SESSION_PATH)
+# }}}
+
+fixperms-nosetgid: fixperms
+	@echo "You should never be running RT this way. it's unsafe"
+	chmod 0555 $(SETGID_BINARIES)
+	chmod 0555 $(DESTDIR)/$(CONFIG_FILE)
+	chmod 0555 $(DESTDIR)/$(SITE_CONFIG_FILE)
+
+# {{{ dirs
 dirs:
-	mkdir -p $(DESTDIR)/$(RT_BIN_PATH)
+	mkdir -p $(DESTDIR)/$(RT_LOG_PATH)
 	mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)
+	mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)/cache
+	mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)/etc
+	mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)/obj
 	mkdir -p $(DESTDIR)/$(MASON_SESSION_PATH)
-	mkdir -p $(DESTDIR)/$(RT_ETC_PATH)
-	mkdir -p $(DESTDIR)/$(RT_LIB_PATH)
 	mkdir -p $(DESTDIR)/$(MASON_HTML_PATH)
 	mkdir -p $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
+	mkdir -p $(DESTDIR)/$(LOCAL_ETC_PATH)
+	mkdir -p $(DESTDIR)/$(LOCAL_LEXICON_PATH)
+# }}}
 
-libs-install: 
-	[ -d $(DESTDIR)/$(RT_LIB_PATH) ] || mkdir $(DESTDIR)/$(RT_LIB_PATH)
-	chown -R $(LIBS_OWNER) $(DESTDIR)/$(RT_LIB_PATH)
-	chgrp -R $(LIBS_GROUP) $(DESTDIR)/$(RT_LIB_PATH)
-	chmod -R $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_LIB_PATH)
-	( cd ./lib; \
-	  $(PERL) Makefile.PL INSTALLSITELIB=$(DESTDIR)/$(RT_LIB_PATH) \
-			      INSTALLMAN1DIR=$(DESTDIR)/$(RT_MAN_PATH)/man1 \
-			      INSTALLMAN3DIR=$(DESTDIR)/$(RT_MAN_PATH)/man3 \
-	    && make \
-	    && make test \
-	    && $(PERL) -p -i -e " s'!!RT_VERSION!!'$(RT_VERSION)'g;" blib/lib/RT.pm ;\
-	    make install \
-			   INSTALLSITEMAN1DIR=$(DESTDIR)/$(RT_MAN_PATH)/man1 \
-			   INSTALLSITEMAN3DIR=$(DESTDIR)/$(RT_MAN_PATH)/man3 \
-	)
+install: config-install dirs files-install fixperms instruct
 
-html-install:
-	cp -rp ./webrt/* $(DESTDIR)/$(MASON_HTML_PATH)
+files-install: libs-install etc-install bin-install sbin-install html-install local-install doc-install
+
+config-install:
+	mkdir -p $(DESTDIR)/$(CONFIG_FILE_PATH)	
+	cp etc/RT_Config.pm $(DESTDIR)/$(CONFIG_FILE)
+	[ -f $(DESTDIR)/$(SITE_CONFIG_FILE) ] || cp etc/RT_SiteConfig.pm $(DESTDIR)/$(SITE_CONFIG_FILE) 
+
+	chgrp $(RTGROUP) $(DESTDIR)/$(CONFIG_FILE)
+	chown $(BIN_OWNER) $(DESTDIR)/$(CONFIG_FILE)
 
+	chgrp $(RTGROUP) $(DESTDIR)/$(SITE_CONFIG_FILE)
+	chown $(BIN_OWNER) $(DESTDIR)/$(SITE_CONFIG_FILE)
 
+	@echo "Installed configuration. about to install rt in  $(RT_PATH)"
 
-genschema:
-	$(PERL)	tools/initdb '$(DB_TYPE)' '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_DBA)' '$(DB_DATABASE)' generate
+test: 
+	$(PERL) -Ilib lib/t/00smoke.t
 
+regression-nosetgid-quiet: config-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms-nosetgid apachectl
+	$(PERL) sbin/regression_harness
 
-initialize.Pg: createdb initdb.dba acls 
+regression-nosetgid: config-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms-nosetgid apachectl
+	$(PERL) lib/t/02regression.t
 
-initialize.mysql: createdb acls initdb.rtuser
+regression: config-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods apachectl
+	$(PERL) lib/t/02regression.t
 
-initialize.Oracle: acls initdb.rtuser
+regression-quiet:
+	$(PERL) sbin/regression_harness
 
-acls:
-	cp etc/acl.$(DB_TYPE) '$(DESTDIR)/$(RT_ETC_PATH)/acl.$(DB_TYPE)'
-	$(PERL) -p -i -e " s'!!DB_TYPE!!'"$(DB_TYPE)"'g;\
-				s'!!DB_HOST!!'"$(DB_HOST)"'g;\
-				s'!!DB_RT_PASS!!'"$(DB_RT_PASS)"'g;\
-				s'!!DB_RT_HOST!!'"$(DB_RT_HOST)"'g;\
-				s'!!DB_RT_USER!!'"$(DB_RT_USER)"'g;\
-				s'!!DB_DATABASE!!'"$(DB_DATABASE)"'g;" $(DESTDIR)/$(RT_ETC_PATH)/acl.$(DB_TYPE)
-	bin/initacls.$(DB_TYPE) '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_DBA)' '$(DB_DBA_PASSWORD)' '$(DB_DATABASE)' '$(DESTDIR)/$(RT_ETC_PATH)/acl.$(DB_TYPE)' 
+regression-instruct:
+	@echo "About to wipe your database for a regression test. ABORT NOW with Control-C"
 
 
+# {{{ database-installation
+
+regression-reset-db:
+	$(PERL)	$(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action drop --dba $(DB_DBA) --dba-password ''
+	$(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action init --dba $(DB_DBA) --dba-password ''
+
+initialize-database: 
+	$(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action init --dba $(DB_DBA) --prompt-for-dba-password
 
 dropdb: 
-	$(PERL)	tools/initdb '$(DB_TYPE)' '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_DBA)' '$(DB_DATABASE)' drop
+	$(PERL)	$(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action drop --dba $(DB_DBA) --prompt-for-dba-password
+
+insert-approval-data: 
+	$(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/insert_approval_scrips
+# }}}
+
+# {{{ libs-install
+libs-install: 
+	[ -d $(DESTDIR)/$(RT_LIB_PATH) ] || mkdir $(DESTDIR)/$(RT_LIB_PATH)
+	-cp -rp lib/* $(DESTDIR)/$(RT_LIB_PATH)
+# }}}
+
+# {{{ html-install
+html-install:
+	[ -d $(DESTDIR)/$(MASON_HTML_PATH) ] || mkdir $(DESTDIR)/$(MASON_HTML_PATH)
+	-cp -rp ./html/* $(DESTDIR)/$(MASON_HTML_PATH)
+# }}}
+
+# {{{ doc-install
+doc-install:
+	# RT 3.0.0 - RT 3.0.2 would accidentally create a file instead of a dir
+	-[ -f $(DESTDIR)/$(RT_DOC_PATH) ] && rm $(DESTDIR)/$(RT_DOC_PATH) 
+	[ -d $(DESTDIR)/$(RT_DOC_PATH) ] || mkdir $(DESTDIR)/$(RT_DOC_PATH)
+	-cp -rp ./README $(DESTDIR)/$(RT_DOC_PATH)
+# }}}
 
+# {{{ etc-install
 
-createdb: 
-	$(PERL)	tools/initdb '$(DB_TYPE)' '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_DBA)' '$(DB_DATABASE)' create
-initdb.dba:
-	$(PERL)	tools/initdb '$(DB_TYPE)' '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_DBA)' '$(DB_DATABASE)' insert
+etc-install:
+	mkdir -p $(DESTDIR)/$(RT_ETC_PATH)
+	-cp -rp \
+		etc/acl.* \
+		etc/initialdata \
+		etc/schema.* \
+		$(DESTDIR)/$(RT_ETC_PATH)
+# }}}
 
-initdb.rtuser:
-	$(PERL)	tools/initdb '$(DB_TYPE)' '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_RT_USER)' '$(DB_DATABASE)' insert
+# {{{ sbin-install
 
+sbin-install:
+	mkdir -p $(DESTDIR)/$(RT_SBIN_PATH)
+	chmod +x sbin/rt-setup-database \
+		sbin/rt-test-dependencies
+	-cp -rp \
+		sbin/rt-setup-database \
+		sbin/rt-test-dependencies \
+		$(DESTDIR)/$(RT_SBIN_PATH)
 
+# }}}
 
-insert-install:
-	cp -rp ./tools/insertdata \
-		 $(DESTDIR)/$(RT_ETC_PATH)
-	$(PERL) -p -i -e " s'!!RT_ETC_PATH!!'$(RT_ETC_PATH)'g;\
-		           s'!!RT_LIB_PATH!!'$(RT_LIB_PATH)'g;"\
-		$(DESTDIR)/$(RT_ETC_PATH)/insertdata
+# {{{ bin-install
 
 bin-install:
-	cp -p ./bin/webmux.pl $(DESTDIR)/$(RT_MODPERL_HANDLER)
-	cp -p ./bin/rt-mailgate $(DESTDIR)/$(RT_MAILGATE_BIN)
-	cp -p ./bin/rtadmin $(DESTDIR)/$(RT_CLI_ADMIN_BIN)
-	cp -p ./bin/rt $(DESTDIR)/$(RT_CLI_BIN)
-	cp -p ./bin/mason_handler.fcgi $(DESTDIR)/$(RT_FASTCGI_HANDLER)
-	cp -p ./bin/mason_handler.scgi $(DESTDIR)/$(RT_SPEEDYCGI_HANDLER)
-
-	$(PERL) -p -i -e "s'!!RT_PATH!!'"$(RT_PATH)"'g;\
-				s'!!PERL!!'"$(PERL)"'g;\
-			      	s'!!RT_VERSION!!'"$(RT_VERSION)"'g;\
-				s'!!RT_ETC_PATH!!'"$(RT_CONFIG_PATH)"'g;\
-				s'!!RT_LIB_PATH!!'"$(RT_LIB_PATH)"'g;"\
-		$(DESTDIR)/$(RT_MODPERL_HANDLER) \
-		$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
-		$(DESTDIR)/$(RT_SPEEDYCGI_HANDLER) \
-		$(DESTDIR)/$(RT_CLI_BIN) \
-		$(DESTDIR)/$(RT_CLI_ADMIN_BIN) \
-		$(DESTDIR)/$(RT_MAILGATE_BIN)
-
-
-config-replace:
-	-[ -f $(DESTDIR)/$(RT_CONFIG) ] && \
-		mv $(DESTDIR)/$(RT_CONFIG) $(DESTDIR)/$(RT_CONFIG).old && \
-	 	chmod 000 $(DESTDIR)/$(RT_CONFIG).old
-	cp -rp ./etc/config.pm $(DESTDIR)/$(RT_CONFIG)
-	$(PERL) -p -i -e "\
-	s'!!DB_TYPE!!'"$(DB_TYPE)"'g;\
-	s'!!DB_HOST!!'"$(DB_HOST)"'g;\
-	s'!!DB_PORT!!'"$(DB_PORT)"'g;\
-	s'!!DB_RT_PASS!!'"$(DB_RT_PASS)"'g;\
-	s'!!DB_RT_USER!!'"$(DB_RT_USER)"'g;\
-	s'!!DB_DATABASE!!'"$(DB_DATABASE)"'g;\
-	s'!!MASON_HTML_PATH!!'"$(MASON_HTML_PATH)"'g;\
-	s'!!MASON_LOCAL_HTML_PATH!!'"$(MASON_LOCAL_HTML_PATH)"'g;\
-	s'!!MASON_SESSION_PATH!!'"$(MASON_SESSION_PATH)"'g;\
-	s'!!MASON_DATA_PATH!!'"$(MASON_DATA_PATH)"'g;\
-	s'!!RT_LOG_PATH!!'"$(RT_LOG_PATH)"'g;\
-	s'!!RT_VERSION!!'"$(RT_VERSION)"'g;\
-	" $(DESTDIR)/$(RT_CONFIG)
+	mkdir -p $(DESTDIR)/$(RT_BIN_PATH)
+	chmod +x bin/rt-mailgate \
+		bin/rt-crontool
+	-cp -rp \
+		bin/rt-mailgate \
+		bin/mason_handler.fcgi \
+		bin/mason_handler.svc \
+		bin/webmux.pl \
+		bin/rt-crontool \
+		$(DESTDIR)/$(RT_BIN_PATH)
+# }}}
+
+# {{{ local-install
+local-install:
+	-cp -rp ./local/html/* $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
+	-cp -rp ./local/po/* $(DESTDIR)/$(LOCAL_LEXICON_PATH)
+	-cp -rp ./local/etc/* $(DESTDIR)/$(LOCAL_ETC_PATH)
+# }}}
+
+# {{{ Best Practical Build targets -- no user servicable parts inside
+
+
+POD2TEST_EXE = sbin/extract_pod_tests
+
+testify-pods:
+	[ -d lib/t/autogen ] || mkdir lib/t/autogen
+	find lib -name \*pm |grep -v \*.in |xargs -n 1 $(PERL) $(POD2TEST_EXE)
+	find bin -type f |grep -v \~ | grep -v "\.in" | xargs -n 1 $(PERL) $(POD2TEST_EXE)
+
 
 
+regenerate-catalogs:
+	$(PERL) sbin/extract-message-catalog
+
+license-tag:
+	$(PERL) sbin/license_tag
+
+factory: initialize-database
+	cd lib; $(PERL) ../sbin/factory  $(DB_DATABASE) RT
+
 commit:
-	cvs commit
+	aegis -build ; aegis -diff ; aegis -test; aegis -develop_end
+
+integrate:
+	aegis -integrate_begin;	aegis -build; aegis -diff; aegis -test ; aegis -integrate_pass
+
+predist: commit tag-and-tar
+
+tag-and-release-baseline:
+	aegis -cp -ind Makefile -output /tmp/Makefile.tagandrelease; \
+	$(MAKE) -f /tmp/Makefile.tagandrelease tag-and-release-never-by-hand
 
-predist: commit
-	cvs tag -r $(BRANCH) -F $(TAG)
+
+# Running this target in a working directory is 
+# WRONG WRONG WRONG.
+# it will tag the current baseline with the version of RT defined 
+# in the currently-being-worked-on makefile. which is wrong.
+#  you want tag-and-release-baseline
+
+tag-and-release-never-by-hand:
+	aegis --delta-name $(TAG)
 	rm -rf /tmp/$(TAG)
-	cvs co -d /tmp/$(TAG) -r $(TAG) rt
-	cd /tmp/$(TAG); chmod 600 Makefile; /usr/local/bin/cvs2cl.pl \
-		--no-wrap --separate-header \
-		--window 120
+	mkdir /tmp/$(TAG)
+	cd /tmp/$(TAG); \
+		aegis -cp -ind -delta $(TAG) . ;\
+		make reconfigure;\
+		chmod 600 Makefile;\
+		aegis --report --project rt.$(RT_VERSION_MAJOR) \
+		      --page_width 80 \
+		      --page_length 9999 \
+		      --change $(RT_VERSION_MINOR) --output Changelog Change_Log
+
 	cd /tmp; tar czvf /home/ftp/pub/rt/devel/$(TAG).tar.gz $(TAG)/
 	chmod 644 /home/ftp/pub/rt/devel/$(TAG).tar.gz
 
-dist: commit predist
-	rm -rf /home/ftp/pub/rt/devel/rt.tar.gz
-	ln -s ./$(TAG).tar.gz /home/ftp/pub/rt/devel/rt.tar.gz
 
+reconfigure:
+	aclocal -I m4
+	autoconf
+	chmod 755 ./configure
+	./configure
 
 rpm:
 	(cd ..; tar czvf /usr/src/redhat/SOURCES/rt.tar.gz rt)
 	rpm -ba etc/rt.spec
+
+
+apachectl:
+	apachectl stop
+	sleep 3
+	apachectl start
+# }}}
diff --git a/rt/README b/rt/README
index d16100c5f..7c5e4d47a 100755
--- a/rt/README
+++ b/rt/README
@@ -1,139 +1,167 @@
-$Header: /home/cvs/cvsroot/freeside/rt/README,v 1.1 2002-08-12 06:17:06 ivan Exp $
-RT is (c) 1996-2002 by Jesse Vincent <jesse@bestpractical.com>
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+RT is an enterprise-grade issue tracking system. It allows
+organizations to keep track of their to-do lists, who is working
+on which tasks, what's already been done, and when tasks were
+completed. It is available under the terms of version 2 of the GNU
+General Public License (GPL), so it doesn't cost anything to set
+up and use.
 
-RT is licensed to you under the terms of version 2 of the GNU General 
-Public License. 
 
-If you don't have a copy of the GPL, you've been living in a cave,
-but one should be included in this distribution.
-
-
-INSTALLATION INSTRUCTIONS
--------------------------
-
-These instructions are a summary of those at http://www.fsck.com/rtfm/
-The docs on the web at www.fsck.com/rtfm/ are likely to be more up to
-date and complete than this document. You should consult them before 
-proceeding.
+        Jesse Vincent
+        Best Practical Solutions, LLC
+        March 2003
 
 REQUIRED PACKAGES:
 ------------------
 
-o   Perl5.005_03 or later with support for setgid perl scripts
-        RT's command line and mail gateway tools run setgid to the 'rt' group
-	to protect RT's database password.  You may need to install a special 
-	"suidperl" package or reconfigure your perl setup to support
-	 "setuid scripts".
+o   Perl 5.8.0 or later (http://www.perl.com).
+
+ 	(If you intend to use the FastCGI or SpeedyCGI support, you 
+	 need to make sure that perl has been built with support for 
+	 setgid perl scripts.)`
+
+    Perl 5.6.1 is currently deprecated and will be officially desupported
+    in a future release
 
 o   A DB backend; MySQL is recommended ( http://www.mysql.com ) 
-        Currently supported:    Mysql 3.23.38 or newer. 
-				 (Some older releases had crippling SQL bugs)
-				Postgres 7.1 or newer.
+        Currently supported:  Mysql 4.0.13 or later. 
+                              Postgres 7.2 or later.
+
+                              Mysql 3.23.46 or newer with support for InnoDB 
+			      is currently deprecated and will be officially
+			      desupported in a future release.
+
+o   Apache version 1.3.x or 2.x (http://httpd.apache.org) 
+    with mod_perl -- (http://perl.apache.org ) 
+    or a webserver with FastCGI support (www.fastcgi.com)
+
+        mod_perl 2.0 isn't quite ready for prime_time just yet;
+        Best Practical Solutions strongly recommends that sites use 
+        Apache 1.3 or FastCGI.
+
+        Compiling mod_perl on Apache 1.3.x as a DSO has been known 
+         to have massive stability problems and is not recommended.
+
+        mod_perl 1.x must be build with EVERYTHING=1
+
+        RT's FastCGI handler runs setgid to the 'rt' group to
+        protect RT's database password.  You may need to install
+        a special  "suidperl" package or reconfigure your perl
+        setup to support "setuid scripts" if you intend to use RT
+        with FastCGI.
+
+        Debian GNU/* 3.0+: the package which installs suidperl is
+         called perl-suid, and should work without any tweaking.
+
+        FreeBSD 4.2+: the package is called sperl, and should
+         install a suidperl that just works 
+
+        Conectiva Linux 6.0+: suidperl is installed by default when 
+         perl is installed, but the program /bin/suidperl is not setuid. 
+         You must use chmod to make it setuid.
 
-o   Apache + mod_perl -- ( http://perl.apache.org) 
-    or A webserver with FastCGI support (www.fastcgi.com)
 
-	If you compile mod_perl as a DSO, you're on your own. It's known
-	to have massive stability problems. 
-        mod_perl must be build with EVERYTHING=1
 
 o    Various and sundry perl modules
-        RT takes care of the installation of most of these automatically
-        during the "make testdeps" and "make fixdeps" stages below
+	A tool included with RT takes care of the installation of
+	most of these automatically during the install process.
+
+	The tool supplied with RT uses Perl's CPAN system
+	(http://www.cpan.org) to install modules. Some operating
+	systems package all or some of the modules required and
+	you may be better off installing the modules that way.
 
 
 GENERAL INSTALLATION
 --------------------
 
+This is a rough guide to installing RT. For more detail, you'll want 
+to read 'Chapter 2: Installing' in RT's manual, available at
+http://www.bestpractical.com/rt 
+
 1   Unpack this distribution SOMWHERE OTHER THAN where you want to install RT
 
         Granted, you've already got it open. To do this cleanly:
 
-        	tar xzvf rt.tar.gz -C /tmp
+                tar xzvf rt.tar.gz -C /tmp
 
-2   Check over /tmp/rt/Makefile
+2   Run the "configure" script. 
 
-	There are many variables you NEED to customize for your site.
-	Even if you are just upgrading, you must set ALL variables.
+        ./configure --help to see the list of options
+        ./configure (with the flags you want)
 
-3   Satisfy RT's myriad dependencies.  There's a perl script in rt/tools
-    called testdeps that uses CPAN to automate all of this.
+3   Satisfy RT's myriad dependencies. 
 
 3.1   Check for compliance:
-	make testdeps
+        
+   perl sbin/rt-test-dependencies \ 
+                --with-<databasename> --with-<web-environment>
+
+        databasename is one of: mysql, postgres
+        web-environment is one of: fastcgi, modperl1, modperl2
 
-3.2   If there are unsatisfied dependencies, install them by hand or run
-	make fixdeps
-	
-       (You may need to install Apache::Session and Apache::DBI by hand.
+3.2   If there are unsatisfied dependencies, install them by hand or run:
 
-	You might need to install Msql-Mysql-Modules by hand.
-	perl -MCPAN -e'install DBD::mysql::Install' should do it for you.
-       )
+        perl sbin/rt-test-dependencies \
+                --with-<databasename> --with-<web-environment> --install
+        
 
 3.3   Check to make sure everything was installed properly:
-	make testdeps
+
+        perl sbin/rt-test-dependencies \
+                --with-<databasename> --with-<web-environment>
 
 4   Create a group called 'rt'
 
 5a  FOR A NEW INSTALLATION: 
         
         As root, type:
-		 make install	(replace "make" with the local name for 
-				 Make, if you need to)
+                 make install        (replace "make" with the local name for 
+                                 Make, if you need to)
 
-	If the make fails, type:
-		make dropdb 
-	and start over from step 5a
+                       
+                 make initialize-database 
 
-5b  FOR UPGRADING: (Within the RT 2.0.x series)
 
-	Make a backup of /path/to/rt/etc/config.pm
- 
-        As root, type: 
-		make upgrade     (replace "make" with the local name for 
-				  Make, if you need to)
+        If the make fails, type:
+                make dropdb 
+        and start over from step 5a
 
-	This will build new binaries, config files and libraries without
-	overwriting your RT database. 
+5b  FOR UPGRADING: (Within the RT 3.0.x series)
 
-        WARNING: This WILL clobber your existing configuration file!
-        
-        The install process will then instruct you to update your RT system 
-        database objects by running rt/etc/insertdata <version> where 
-        <version> is the version of RT you're upgrading from.
+        As root, type: 
+                make upgrade     (replace "make" with the local name for 
+                                  Make, if you need to)
 
+        This will build new binaries, config files and libraries without
+        overwriting your RT database. 
         
-	
-5c  FOR UPGRADING (From 1.0.x):
-
-	Follow the instructions for installing RT 2.0.
+        It may then instruct you to update your RT system database objects 
 
-	Once you have installed RT 2.0, download import-1.0-to-2.0
-	from http://www.fsck.com/pub/rt/contrib/2.0/rt-addons
-
-	Edit the configuration defaults in import-1.0-to-2.0
-
-	If you don't set $DEFAULTQUEUE to the name of one of your
-	RT 1.0 queues, THE IMPORT WILL FAIL.
-
-	perl ./import-1.0-to-2.0
-
-	The import tool will do its thing. If you're using postgres, you'll
-	need to execute the following SQL statement within your RT2 database:
-
-	select setval('tickets_id_seq', (select max(id) from tickets));
-	
-	It imports:
-		Queues, Areas, Users, Acls, Mailing Rules, Queue Members,
-		Tickets and Transactions.
-
-	It DOES NOT IMPORT:
-		Attachments removed by stripmime or Templates.
-	
-6   Edit etc/config.pm in your RT installation directory.  In many
-    cases sensible defaults have been included. In others, you MUST
-    supply a value.
+6   Edit etc/RT_SiteConfig.pm in your RT installation directory, by specifying
+    any values you need to change from the defaults in etc/RT_Config.pm
 
 7   Configure the email and web gateways, as described below. 
 
@@ -142,97 +170,81 @@ GENERAL INSTALLATION
     NOTE: root's password for the web interface is "password" 
     (without the quotes.)  Not changing this is a SECURITY risk
     
-9   Configure RT per the instructions at http://www.fsck.com/rtfm/
+9   Configure RT per the instructions in RT's manual.
 
-    Until you do this, RT will not be able to send or recieve email,
+    Until you do this, RT will not be able to send or receive email,
     nor will it be more than marginally functional.  This is not an
     optional step.
 
 
-SETTING UP THE MAIL GATEWAY 
----------------------------
+THE WEB INTERFACE
+-----------------
 
-An alias for the initial queue will need to be made in either your
-global mail aliases file (if you are using NIS) or locally on your
-machine.
- 
-Add the following lines to /etc/aliases (or your local equivalent) :
-
-rt:         "|/path/to/rt2/bin/rt-mailgate --queue general --action correspond"
-rt-comment: "|/path/to/rt2/bin/rt-mailgate --queue general --action comment"
-                                                   |                |
-                                   <queue-name>----/                |
-                                                                    |
-                      <correspond or comment depending on whether   |
-                      the mail should be resent to the requestor>---/
-
-
-
-THE WEB UI
-----------
-
-RT's web ui is based around HTML::Mason, which works well with the mod_perl
-perl interpreter within Apache httpd as well as with a webserver which
-supports FastCGI. (Instructions for configuring RT for use with FastCGI
-are available at http://www.fsck.com/rtfm/ )
+RT's web interface is based around HTML::Mason, which works best with the mod_perl
+perl interpreter within Apache httpd.  Alternatively, support for the FastCGI
+(and plain CGI) interface is also provided as 'bin/mason_handler.fcgi'.
 
 Apache 
-        RT Uses HTML::Mason.  You'll need to add a few lines to your
-        httpd.conf telling it to use rt's web ui.  If you have mod-perl
-	(you should, the perl scripts will go quite a bit faster around with
-	it), you can do something like this:
-
+        You'll need to add a few lines to your httpd.conf telling it about RT:
 
 <VirtualHost your.ip.address>
-DocumentRoot /path/to/rt2/WebRT/html
-ServerName your.rt.server.hostname
-PerlModule Apache::DBI
-PerlFreshRestart On
-PerlRequire /path/to/rt2/bin/webmux.pl
-<Location />
- SetHandler perl-script
- PerlHandler RT::Mason
-</Location>
+    ServerName your.rt.server.hostname
+    DocumentRoot /opt/rt3/share/html
+    AddDefaultCharset UTF-8
+
+    # this line applies to Apache2+mod_perl2 only
+    PerlModule Apache2 Apache::compat
+
+    PerlModule Apache::DBI
+    PerlRequire /opt/rt3/bin/webmux.pl
+
+    # this section applies to Apache 1 only
+    <Location />
+        SetHandler perl-script
+        PerlHandler RT::Mason
+    </Location>
+
+    # this section applies to Apache2+mod_perl2 only
+    <FilesMatch "\.html$">
+        SetHandler perl-script
+        PerlHandler RT::Mason
+    </FilesMatch>
+    <LocationMatch "/Attachment/">
+        SetHandler perl-script
+        PerlHandler RT::Mason
+    </LocationMatch>
+    <LocationMatch "/REST/">
+        SetHandler perl-script
+        PerlHandler RT::Mason
+    </LocationMatch>
 </VirtualHost>
 
-Additionally, you should set up a cron job to remove stale session data.
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- WARNING: Don't install this cron job or run this find command if your
- MASON_SESSION_PATH (known in config.pm as $MasonSessionDir) 
- points to a directory that could  EVER contain any file that's not 
- a Apache::Session datafile.
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-# Every hour, nuke session files and lockfiles that haven't been 
-# touched in 10 hours
-
-0 * * * * find /path/to/rt2/WebRT/sessiondata -type f -amin +600 -exec rm {} \;
 
 
-THE CLI
--------
-        Binaries for the CLI are located in rt/bin
-        You've got:
+SETTING UP THE MAIL GATEWAY 
+---------------------------
 
-                "rt" (manipulate or display requests) 
-                "rtadmin" (modify queues, users and acls)
+An alias for the initial queue will need to be made in either your
+global mail aliases file (if you are using NIS) or locally on your
+machine.
+ 
+Add the following lines to /etc/aliases (or your local equivalent) :
 
-        Both of these programs take --help as an option.
+rt:         "|/opt/rt3/bin/rt-mailgate --queue general --action correspond --url http://localhost/"
+rt-comment: "|/opt/rt3/bin/rt-mailgate --queue general --action comment --url http://localhost/"
+                                            |                |             |
+                            <queue-name>----/                |             |
+                                                             |             |
+               <correspond or comment depending on whether   |             |
+               the mail should be resent to the requestor>---/             |
+                                                                           |
+                                            <URL for RT's web interface>---/
 
 
 BUGS
 ----
 
-Known issues with releases of RT2 are listed at 
-<URL:http://fsck.com/rt2/NoAuth/Errata.html>.  This includes every bug known
-to exist in each release of RT.  (When prompted, login as guest/guest)
-
-To find out more about currently open bugs, check out the live 
-Buglist at  <URL:http://fsck.com/rt2/NoAuth/Buglist.html>.
-(When prompted, login as guest/guest)
-
-To report a bug, send an email to rt-2.0-bugs@fsck.com.
+To report a bug, send email to rt-3.0-bugs@fsck.com.
 
 GETTING HELP
 ------------
@@ -249,8 +261,8 @@ information about commercial support options, please send email to
 RT-USERS MAILINGLIST
 --------------------
 
-To keep up to date on the latest RT tips, techniques and extections,
-you probably want to join the rt-users mailinglist.  Send a message to:
+To keep up to date on the latest RT tips, techniques and extensions,
+you probably want to join the rt-users mailing list.  Send a message to:
 
          rt-users-request@lists.fsck.com 
 
@@ -258,79 +270,31 @@ With the body of the message consisting of only the word:
 
         subscribe
 
-If you're interested in hacking on rt, you'll want to subscribe to
+If you're interested in hacking on RT, you'll want to subscribe to
 rt-devel@lists.fsck.com.  Subscribe to it with instructions similar to
 those above.
 
 Address questions about the stable release to the rt-users list, and
 questions about the development version to the rt-devel list.  If you feel
-your questions are best not asked publically, send them personally to
+your questions are best not asked publicly, send them personally to
 <jesse@bestpractical.com>.
 
-If you want to be informed of every commit to the CVS repository,
-subscribe to rt-commit@fsck.com using similar instructions to those above.
-
 
 RT WEBSITE
 ----------
 
 For current information about RT, check out the RT website at 
-http://www.bestpractical.com/rt  You'll find screenshots, a pointer
-to the current version of rt, contributed patches and lots of other great
-stuff.
+        http://www.bestpractical.com/  
+
+You'll find screenshots, a pointer to the current version of RT, contributed 
+patches, and lots of other great stuff.
 
 
 TROUBLESHOOTING
 ---------------
 
-All errors will be appended to a logfile, which lives in /tmp/rt.log.* unless 
-you've reconfigured it.  Check etc/config.pm for details.
-
 If the solution to the problem you're running into isn't obvious and you've 
-checked the FAQ, feel free to send mail to rt-users@fsck.com (for release 
+checked the FAQ, feel free to send mail to rt-users@fsck.com (for released 
 versions of RT) or rt-devel@fsck.com (for development versions).
 
-GIVING SOMETHING BACK
----------------------
-
-RT is free software. You are not obligated to pay for it.  You should be 
-aware, however, that bestpractical.com's sole source of revenue is commercial
-work related to RT. If you are able, either a contract to extend RT in some 
-way that would be useful to your organization, a financial contribution, or 
-even something off the author's amazon wishlist 
-	( http://www.amazon.com/exec/obidos/wishlist/2GMHUDAFBT2XR/ )
-would be much appreciated. 
-
 Thanks!
-
-
-CREDITS
--------
-
-A lot of people are responsible for making RT a better program.  Many
-thanks to Lauren Burka, who originally tasked me with writing this beast.
-She forced me to use a database backend.  I've thanked her for it every
-day since.  Rich West rewrote this readme and did some UI hacking.  Adam
-Hirsch, Kit Kraysha, Robin Garner, Jens Glaser, John Adams, Trey Belew, 
-Sean Dague, Nathan Mehl, Kee Hinckley, Rich West, Dale Bewley, Serge Zhuk,
-John Lengeling, Elmar Knipp, Gerald Abshez, Dave Hull, Dave Schenet,
-Dave Walton, Jan Okrouhly, Tobias Brox, Lamont Lucas, Charlie Brady,
-Robin Shostack, Eric Mumpower, Jerrod Wiesman, Adam Hammer, Ivan Kohler, Alex
-Pilosov, Mary Alderdice, Deborah Kaplan, Jens von Bülow, Tristan Horn,
-Lee Ann Goldstein, Karel P Kerezman, Feargal Reilly, Christian Steger,
-Christian Kurz, JD Falk, Arthur de Jong, Ben Carter, Mark Vevers
-and many others
-have all contributed bug reports, code or ideas that have helped RT along.  
-
-Arepa, Inc, Utopia Inc, Wesleyan University and The Leftbank Operation 
-have paid me to maintain RT and release it to the public.  Without their 
-support RT would not exist.  
-
-If I've left you out, please drop me a line ....it wasn't intentional. 
- 
-
-        Enjoy
-
-        Jesse Vincent
-	<jesse@bestpractical.com>
-        Best Practical Solutions, LLC
diff --git a/rt/TODO b/rt/TODO
deleted file mode 100755
index 3d1b7d02e..000000000
--- a/rt/TODO
+++ /dev/null
@@ -1,9 +0,0 @@
-Errata for RT 2.x can be found at http://fsck.com/rt2/NoAuth/Errata.html
-
-A list of all open issues, including those which haven't been added
-to the official Errata lists,  can be found at 
-http://fsck.com/rt2/NoAuth/Buglist.html
-
-If you want to look at bugs in more detail, you may need to login as guest with a password of 'guest'
-
-
diff --git a/rt/bin/initacls.Oracle b/rt/bin/initacls.Oracle
deleted file mode 100644
index 8d05f45e1..000000000
--- a/rt/bin/initacls.Oracle
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-DATABASEHOME=$1
-HOSTNAME=$2
-PORT=$3
-DATABASEADMIN=$4
-DBAPASSWD=$5
-DATABASENAME=$6
-DATABASEACLS=$7
-
-BINDIR=${DATABASEHOME}/bin
-
-echo "DBHOME = $DATABASEHOME"
-echo "HOSTNAME = $HOSTNAME"
-echo "PORT = $PORT"
-echo "DATABASEADMIN = $DATABASEADMIN"
-echo "DBAPASSWD = $DBAPASSWD"
-echo "DATABASENAME = $DATABASENAME"
-
-PATH=$PATH:$BINDIR
-export PATH
-
-echo "Please enter ${DATABASEADMIN}'s  password for the SID ${DATABASENAME} to create an rt user";
-
-$BINDIR/sqlplus ${DATABASEADMIN}@${DATABASENAME}  @$DATABASEACLS
-
diff --git a/rt/bin/initacls.Pg b/rt/bin/initacls.Pg
deleted file mode 100755
index 82e32de74..000000000
--- a/rt/bin/initacls.Pg
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-DATABASEHOME=$1
-HOSTNAME=$2
-PORT=$3
-DATABASEADMIN=$4
-DBAPASSWD=$5
-DATABASENAME=$6
-DATABASEACLS=$7
-
-BINDIR=${DATABASEHOME}/bin
-
-
-PATH=$PATH:$BINDIR
-export PATH
-
-echo "Enter the postgres administrator's database password to create a new user for rt"
-
-if [ "fnord$PORT" != "fnord" ]; then
-	PORT="-p $PORT"
-fi;
-
-if [ "fnord$HOSTNAME" != "fnord" ]; then
-	HOSTNAME="-h $HOSTNAME"
-fi;
-
-psql $HOSTNAME $PORT -d $DATABASENAME -f $DATABASEACLS -U $DATABASEADMIN
-
diff --git a/rt/bin/initacls.mysql b/rt/bin/initacls.mysql
deleted file mode 100755
index 17e63f837..000000000
--- a/rt/bin/initacls.mysql
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-DATABASEHOME=$1
-HOSTNAME=$2
-PORT=$3
-DATABASEADMIN=$4
-DBAPASSWD=$5
-DATABASENAME=$6
-DATABASEACLS=$7
-
-BINDIR=${DATABASEHOME}/bin
-
-PATH=$PATH:$BINDIR
-export PATH
-
-echo "Enter the mysql administrator's database password to create a new user for RT"
-$BINDIR/mysql --host=${HOSTNAME} --port=${PORT} --user=${DATABASEADMIN} -p${DBAPASSWD} mysql < $DATABASEACLS
-
-echo "Enter the mysql administrator's database password to nondestructively reload the database"
-$BINDIR/mysqladmin --host=${HOSTNAME} --port=${PORT} --user=${DATABASEADMIN} -p${DBAPASSWD} reload
diff --git a/rt/bin/mason_handler.fcgi b/rt/bin/mason_handler.fcgi
index e8a4e128f..431eccbd3 100755
--- a/rt/bin/mason_handler.fcgi
+++ b/rt/bin/mason_handler.fcgi
@@ -1,221 +1,54 @@
-#!!!PERL!!
-# $Header: /home/cvs/cvsroot/freeside/rt/bin/mason_handler.fcgi,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# RT is (c) 1996-2001 Jesse Vincent (jesse@fsck.com);
+#!/usr/bin/perl
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 
 use strict;
-$ENV{'PATH'} = '/bin:/usr/bin';    # or whatever you need
-$ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
-$ENV{'SHELL'} = '/bin/sh' if defined $ENV{'SHELL'};
-$ENV{'ENV'} = '' if defined $ENV{'ENV'};
-$ENV{'IFS'} = ''          if defined $ENV{'IFS'};
+use File::Basename;
+require ('/opt/rt3/bin/webmux.pl');
 
+my $h = &RT::Interface::Web::NewCGIHandler();
 
-# We really don't want apache to try to eat all vm
-# see http://perl.apache.org/guide/control.html#Preventing_mod_perl_Processes_Fr
-
-
-package RT::Mason;
-#use CGI qw(-private_tempfiles);   # pull in CGI with the private tempfiles
-				  #option predefined
-use HTML::Mason;  # brings in subpackages: Parser, Interp, etc.
-
-use vars qw($VERSION %session $Nobody $SystemUser $cgi);
-
-# List of modules that you want to use from components (see Admin
-# manual for details)
-
-#Clean up our umask...so that the session files aren't world readable, writable or executable
-umask(0077);
-
-
-  
-$VERSION="!!RT_VERSION!!";
-
-use lib "!!RT_LIB_PATH!!";
-use lib "!!RT_ETC_PATH!!";
-
-#This drags in  RT's config.pm
-use config;
-use Carp;
-
-{  
-    package HTML::Mason::Commands;
-    use vars qw(%session $ContentType);
-    
-    use RT; 
-    use RT::Ticket;
-    use RT::Tickets;
-    use RT::Transaction;
-    use RT::Transactions;
-    use RT::User;
-    use RT::Users;
-    use RT::CurrentUser;
-    use RT::Template;
-    use RT::Templates;
-    use RT::Queue;
-    use RT::Queues;
-    use RT::ScripAction;
-    use RT::ScripActions;
-    use RT::ScripCondition;
-    use RT::ScripConditions;
-    use RT::Scrip;
-    use RT::Scrips;
-    use RT::Group;
-    use RT::Groups;
-    use RT::Keyword;
-    use RT::Keywords;
-    use RT::ObjectKeyword;
-    use RT::ObjectKeywords;
-    use RT::KeywordSelect;
-    use RT::KeywordSelects;
-    use RT::GroupMember;
-    use RT::GroupMembers;
-    use RT::Watcher;
-    use RT::Watchers;
-    use RT::Handle;
-    use RT::Interface::Web;    
-    use MIME::Entity;
-    use CGI::Cookie;
-    use Date::Parse;
-    use HTML::Entities;
-    use Text::Wrapper;
- 
-    #TODO: make this use DBI
-    use Apache::Session::File;
-    use CGI::Fast;
-
-    # set the page's content type.
-    # In this case, just save it to a variable that we can pull later;
-    sub SetContentType {
-	$ContentType = shift;
-    }
-    sub CGIObject {
-	return $RT::Mason::cgi;
-    }
-}
-
-
-my ($output, $parser, $interp);
-if ($HTML::Mason::VERSION < 1.0902) {
-        require HTML::Mason::ApacheHandler;
-
-         $parser = &RT::Interface::Web::NewParser(allow_globals => [%session]);
-
-         $interp = &RT::Interface::Web::NewInterp(parser=>$parser,
-                                             allow_recursive_autohandlers => 1,
-					    out_method => \$output);
-}
-else {
-         $interp = &RT::Interface::Web::NewInterp(
-                                                  allow_globals => [%session],
-                                                  default_escape_flags => 'h',
-
-					    out_method => \$output);
-}
-# Die if WebSessionDir doesn't exist or we can't write to it
-
-stat ($RT::MasonSessionDir);
-die "Can't read and write $RT::MasonSessionDir"
-  unless (( -d _ ) and ( -r _ ) and ( -w _ ));
-
+# Enter CGI::Fast mode, which should also work as a vanilla CGI script.
+require CGI::Fast;
 
 RT::Init();
 
 # Response loop
-while ($RT::Mason::cgi = new CGI::Fast) {
-    
-    $HTML::Mason::Commands::ContentType = 'text/html';
-        
-    # This routine comes from ApacheHandler.pm:
-    my (%args, $cookie);
-    foreach my $key ( $cgi->param ) {
-	foreach my $value ( $cgi->param($key) ) {
-	    if (exists($args{$key})) {
-		if (ref($args{$key})) {
-		    $args{$key} = [@{$args{$key}}, $value];
-		} else {
-		    $args{$key} = [$args{$key}, $value];
-		}
-	    } else {
-		$args{$key} = $value;
-	    }
-
-	}
-	
-    }
-    
-
-    my $comp = $ENV{'PATH_INFO'};
-    
-    if ($comp =~ /^(.*)$/) {  # untaint the path info. apache should
-			      # never hand us a bogus path. 
-			      # We should be more careful here.
-	$comp = $1;
-    }    
-    
-    if ($comp =~ /\/$/) {
-	$comp .= "index.html";
-    }	
-    
-    #This is all largely cut and pasted from mason's session_handler.pl
-    
-    # {{{ Cookies
-    my %cookies = fetch CGI::Cookie();
-    
-    eval {
-	my $session_id = undef;
-
-	#Get the session id and untaint it
-	if ($cookies{'AF_SID'} && $cookies{'AF_SID'}->value() =~ /^(.*)$/) {
-		$session_id = $1;
-	}
- 
-	tie %HTML::Mason::Commands::session, 'Apache::Session::File',
-	  	$session_id, 
-	    { Directory => $RT::MasonSessionDir,
-	      LockDirectory => $RT::MasonSessionDir,
-	    }	;
-    };
-    
-    if ( $@ ) {
-	# If the session is invalid, create a new session.
-	if ( $@ =~ m#^Object does not exist in the data store# ) {
-	     tie %HTML::Mason::Commands::session, 'Apache::Session::File', undef,
-	     { Directory => $RT::MasonSessionDir,
-	       LockDirectory => $RT::MasonSessionDir,
-	     };
-	     undef $cookies{'AF_SID'};
-	}
-	  else {
-	      die "$@ \nProbably means that RT Couldn't write to session directory '$RT::MasonSessionDir'. Check that this directory's permissions are correct.";
-	  }
+while ( my $cgi = CGI::Fast->new ) {
+    # the whole point of fastcgi requires the env to get reset here..
+    # So we must squash it again
+    $ENV{'PATH'}   = '/bin:/usr/bin';
+    $ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
+    $ENV{'SHELL'}  = '/bin/sh' if defined $ENV{'SHELL'};
+    $ENV{'ENV'}    = '' if defined $ENV{'ENV'};
+    $ENV{'IFS'}    = '' if defined $ENV{'IFS'};
+
+    unless ($h->interp->comp_exists($cgi->path_info)) {
+	$cgi->path_info($cgi->path_info . "/index.html");
     }
-    
-    if ( !$cookies{'AF_SID'} ) {
-	$cookie = new CGI::Cookie
-	  (-name=>'AF_SID', 
-	   -value=>$HTML::Mason::Commands::session{_session_id}, 
-	   -path => '/',);
-	
-    } else {
-	$cookie = undef;
-    }
-    
-    # }}}
-    
-    $output = '';
-    eval {
-	    my $status = $interp->exec($comp, %args);
-    };
- 
-    if ($@) {
-	$output = "<PRE>$@</PRE>";
-    }
- 
-    print "Content-Type: $HTML::Mason::Commands::ContentType\r\n";
-    print "Set-Cookie: $cookie\r\n" if ($cookie);
-    print "\r\n";
-    print $output;
-    untie %HTML::Mason::Commands::session;
-    
+    $h->handle_cgi_object($cgi);
+    # _should_ always be tied
 }
+
+1;
diff --git a/rt/bin/mason_handler.scgi b/rt/bin/mason_handler.scgi
index b9846c898..8e1135c2f 100755
--- a/rt/bin/mason_handler.scgi
+++ b/rt/bin/mason_handler.scgi
@@ -1,193 +1,41 @@
-#!!!PERL!! -w
-
-#!/usr/bin/speedy -- -t600 -M8
-# $Header: /home/cvs/cvsroot/freeside/rt/bin/mason_handler.scgi,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# RT is (c) 1996-2001 Jesse Vincent (jesse@fsck.com);
-#
-# Contains code derived from mason.cgi
-# mason.cgi is Copyright December 2000 Joshua Kronengold (mneme@io.com, 
-# mneme@cyberspace.org).  All Rights Reserved.
+#!/usr/local/bin/speedy
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 
 use strict;
-# {{{ Clean out the environment a little bit
-$ENV{'PATH'} = '/bin:/usr/bin';    # or whatever you need
-$ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
-$ENV{'SHELL'} = '/bin/sh' if defined $ENV{'SHELL'};
-$ENV{'ENV'} = '' if defined $ENV{'ENV'};
-$ENV{'IFS'} = ''          if defined $ENV{'IFS'};
-# }}}
-
-package RT::Mason;
-use HTML::Mason;  # brings in subpackages: Parser, Interp, etc.
-use vars qw($VERSION %session $Nobody $SystemUser);
-
-# List of modules that you want to use from components (see Admin
-# manual for details)
-
-$VERSION="!!RT_VERSION!!";
-
-use lib "!!RT_LIB_PATH!!";
-use lib "!!RT_ETC_PATH!!";
-
-
-#This drags in  RT's config.pm
-use config;
-use Carp;
-
-use HTML::Mason::FakeApache;
-use CGI;
-
-# {{{ Set up CGI environment and grab CGI params:
+require ('/opt/rt3/bin/webmux.pl');
 
-my $r=new HTML::Mason::FakeApache;
+my $h = &RT::Interface::Web::NewCGIHandler();
 
-$|=1; # set output to non-buffered.
+require CGI;
 
-my %cgi;
-CGI::ReadParse(\%cgi); # %cgi is now a tied hash containing our params.
+RT::Init();
 
-my $q=$cgi{CGI}; # $q now contains the object tied to %cgi.
-# }}}
-
-# {{{ require what we need
-{  
-    package HTML::Mason::Commands;
-
-    use vars qw(%session);
-
-    use RT::Ticket;
-    use RT::Tickets;
-    use RT::Transaction;
-    use RT::Transactions;
-    use RT::User;
-    use RT::Users;
-    use RT::CurrentUser;
-    use RT::Template;
-    use RT::Templates;
-    use RT::Queue;
-    use RT::Queues;
-    use RT::ScripAction;
-    use RT::ScripActions;
-    use RT::ScripCondition;
-    use RT::ScripConditions;
-    use RT::Scrip;
-    use RT::Scrips;
-    use RT::Group;
-    use RT::Groups;
-    use RT::Keyword;
-    use RT::Keywords;
-    use RT::ObjectKeyword;
-    use RT::ObjectKeywords;
-    use RT::KeywordSelect;
-    use RT::KeywordSelects;
-    use RT::GroupMember;
-    use RT::GroupMembers;
-    use RT::Watcher;
-    use RT::Watchers;
-    use RT::Handle;
-    use RT::Interface::Web;    
-    use MIME::Entity;
-    use CGI::Cookie;
-    use Date::Parse;
-    use HTML::Entities;
-
-    
-    use Apache::Session::File;
-
-    
+my $cgi = CGI->new;
+unless ($h->interp->comp_exists($cgi->path_info)) {
+    $cgi->path_info($cgi->path_info . "/index.html");
 }
-# }}}
-
-# {{{ RT Database setup
-    $RT::Handle = new RT::Handle;
-    
-    $RT::Handle->Connect;
-   
-    use RT::CurrentUser;
-    
-    #RT's system user is a genuine database user. its id lives here
-    $RT::SystemUser = new RT::CurrentUser();
-    $RT::SystemUser->LoadByName('RT_System');
-
-    #RT's "nobody user" is a genuine database user. its ID lives here.
-    $RT::Nobody = new RT::CurrentUser();
-    $RT::Nobody->LoadByName('Nobody'); 
-     
-
-# }}}
-
-
-
-
-# {{{ Deal with cookies
-
-my %cookies = fetch CGI::Cookie();
-eval { 
-    tie %HTML::Mason::Commands::session, 'Apache::Session::File',
-      ( $cookies{'AF_SID'} ? $cookies{'AF_SID'}->value() : undef );
-};
-
-if ( $@ ) {
-    # If the session is invalid, create a new session.
-    if ( $@ =~ m#^Object does not exist in the data store# ) {
-	 tie %HTML::Mason::Commands::session, 'Apache::Session::File', undef;
-	 undef $cookies{'AF_SID'};
-    }
-}
-
-if ( !$cookies{'AF_SID'} ) {
-    my $cookie = new CGI::Cookie(
- 	 -name=>'AF_SID', 
-	 -value=>$HTML::Mason::Commands::session{_session_id}, 
-	  -path => '/');
-    print 'Set-Cookie: '. $cookie."\r\n";
-}
-
-# }}}
-
-my $path=$ENV{PATH_INFO} || "/"; $path=~s/\'/\\\'/g;
-
-my $type=`/usr/bin/file '$RT::MasonComponentRoot/$path'`;
-
-# {{{ if it's a text file, handle it with mason.
-if($type=~/text|directory/) { 
-	my ($out, %mason_params);
-        my $parser = RT::Interface::Web::NewParser(allow_globals=>[qw($r)]);
-	$mason_params{parser}=$parser;
-	$r->content_type('text/html');
-	# (get cookies line) ...
-	$r->access_hash('headers_in','Cookie',$ENV{HTTP_COOKIE});
-	$r->{'args@'}=[];
-	$mason_params{out_method}=\$out;
-
-	my $interp = RT::Interface::Web::NewInterp(%mason_params);
-
-	$interp->set_global(r=>$r);
-	$interp->exec($path,%cgi);
-	$r->send_http_header();
-        print $out;
-} 
-# }}} 
-
-# {{{ if it's not a text file, just stream it out.
-
-else { # file is binary, damn it
-	my $mime_type;
-	if ( $mime_type=
-	     eval{ use MIME::Types;
-		   my($type,$encoding)=MIME::Types::by_suffix($path);
-		   $type; }) {
-	    print $q->header($mime_type);	
-	    $path=~s/[\|\>\<\&]//g;
-	    open F,"$RT::MasonComponentRoot/$path" or 
-	      die "couldn't open $path -- $!";
-	    print while <F>; 
-	    close F;
-	} else {
-	    die "couldn't resolve type of non-text file (!@; $type) -- install Mime::Types\n";
-	}
-    }
-
-# }}}
+$h->handle_cgi_object($cgi);
 
-untie %HTML::Mason::Commands::session;
+1;
diff --git a/rt/bin/rt b/rt/bin/rt
deleted file mode 100755
index 41220bb56..000000000
--- a/rt/bin/rt
+++ /dev/null
@@ -1,1391 +0,0 @@
-#!!!PERL!! -w
-#
-# $Header: /home/cvs/cvsroot/freeside/rt/bin/Attic/rt,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# RT is (c) 1996-2001 Jesse Vincent <jesse@bestpractical.com>
-
-use strict;
-use Carp;
-use Getopt::Long;
-
-use lib "!!RT_LIB_PATH!!";
-use lib "!!RT_ETC_PATH!!";
-
-use RT::Interface::CLI  qw(CleanEnv LoadConfig DBConnect 
-			   GetCurrentUser GetMessageContent);
-
-#Clean out all the nasties from the environment
-CleanEnv();
-
-#Load etc/config.pm and drop privs
-LoadConfig();
-
-#Connect to the database and get RT::SystemUser and RT::Nobody loaded
-DBConnect();
-
-#Drop setgid permissions
-RT::DropSetGIDPermissions();
-
-#Get the current user all loaded
-my $CurrentUser = GetCurrentUser();
-
-unless ($CurrentUser->Id) {
-	print "No RT user found. Please consult your RT administrator.\n";
-	exit(1);
-}
-
-
-# {{{ commandline flags 
-
-my ( @id,
-     @limit_queue,
-     @limit_status,
-     @limit_owner,
-     @limit_priority,
-     @limit_final_priority,
-     @limit_requestor,
-     @limit_subject,
-     @limit_body,
-     @limit_created,
-     @limit_resolved,
-     @limit_lastupdated,
-     @limit_dependson,
-     @limit_dependedonby,
-     @limit_memberof,
-     @limit_hasmember,
-     @limit_refersto,
-     @limit_referredtoby,
-     @limit_keyword,
-     
-     @limit_due,
-     @limit_starts,
-     @limit_started,
-     $limit_first,
-     $limit_rows,
-     $history,
-     $summary,
-     $create,
-     @requestors,
-     @cc,
-     @admincc,
-     $status,
-     $subject,
-     $owner,
-     $steal,
-     $queue,
-     $time_left,
-     $priority,
-     $final_priority,
-     $due,
-     $starts,
-     $started,
-     $contacted,
-     $comment,
-     $reply,
-     $source,
-     $edit,
-     @dependson,
-     @memberof, 
-     @refersto,
-     $mergeinto,
-     @keywords,
-     $time_taken,
-     $verbose,
-     $debug,
-   $help,
-   $version);
-
-# }}}
-
-# Set defaults for cli args
-
-$edit = 1; # Assume the user wants to edit replies and comments 
-           # unless they specify --noedit
-
-# {{{    args
-
-my @args =("id=s" => \@id,
-	   "limit-queue=s" => \@limit_queue,
-	   "limit-status=s" => \@limit_status,
-	   "limit-owner=s" => \@limit_owner,
-	   "limit-priority=s" => \@limit_priority,
-	   "limit-final-priority=s" => \@limit_final_priority,
-	   "limit-requestor=s" => \@limit_requestor,
-	   "limit-subject=s" => \@limit_subject,
-	   "limit-body=s",	\@limit_body,
-	   "limit-created=s" => \@limit_created,
-	   "limit-due=s" =>	\@limit_due,
- 	   "limit-last-updated=s" => \@limit_lastupdated,
-	   "limit-keyword=s" => \@limit_keyword,
-
-	   "limit-member-of=s" => \@limit_memberof,
-	   "limit-has-member=s" => \@limit_hasmember,
-	   "limit-depended-on-by=s" => \@limit_dependedonby,
-	   "limit-depends-on=s" => \@limit_dependson,
-	   "limit-referred-to-by=s" => \@limit_referredtoby,
-	   "limit-refers-to=s" => \@limit_refersto,
-
-	   "limit-starts=s" => \@limit_starts,
-	   "limit-started=s" => \@limit_started,
-	   "limit-first=i" => \$limit_first,
-	   "limit-rows=i" => \$limit_rows,
-	   "history|show" => \$history,
-	   "summary:s" => \$summary,
-	   "create" => \$create,
-	   "keywords=s" => \@keywords,
-	   "requestor|requestors=s" => \@requestors,
-	   "cc=s" => \@cc,
-	   "admincc=s" => \@admincc,
-	   "status=s" => \$status,
-	   "subject=s" => \$subject,
-	   "owner=s" => \$owner,
-	   "steal" => \$steal,
-	   "queue=s" => \$queue,
-
-	   
-	   "priority=i" => \$priority,
-	   "final-priority=i" => \$final_priority,
-	   "due=s" => \$due,
-	   "starts=s" => \$starts,
-	   "started=s" => \$started,
-	   "contacted=s" => \$contacted,
-	   "comment", \$comment,
-	   "reply|respond", \$reply,
-	   "source=s" => \$source,
-	   "edit!" => \$edit,
-	   "depends-on=s" => \@dependson,
-	   "member-of=s" => \@memberof, 
-	   "merge-into=s" => \$mergeinto, 
-	   "refers-to=s" => \@refersto,
-	   "time-left=i" => \$time_left,
-	   "time-taken=i" => \$time_taken,
-	   "verbose+" => \$verbose,
-	   "debug" => \$debug,
-	   "version" => \$version,
-	   "help|h|usage" => \$help
-	  );
-
-# }}}
-
-
-
-GetOptions(@args);
-
-print join(':',@keywords);
-# {{{ If they want it, print a usage message and get out
-
-if ($help) {
-
-
-print <<EOUSAGE;
-
-Limit the set of records returned:
-
---id=[first][-][last]
-  Specify a single ticket, a range, or to start with (n-) or end with (-n)
-a specific ticket.
-  
-  --limit-queue=<queue>
-	  --limit-status=[!](new|open|stalled|resolved)
-
-	  --limit-owner=[!]<userid>
-	  --limit-priority=[starts][-][ends]
-	  --limit-final-priority=[starts][-][ends]
-	    starts is less than ends
-	  --limit-requestor=[!]<userid>|<email>
-	  --limit-subject=[!]<text>
-	  --limit-body=[!]<text>
-	  --limit-keyword=[!]<select>/<keyword>
-        
-       Links
-          --limit-member-of=<ticketid>
-          --limit-has-member=<ticketid>
-          --limit-refers-to=<ticketid>
-          --limit-referred-to-by=<ticketid>
-          --limit-depends-on=<ticketid>
-          --limit-depended-on-by=<ticketid>
-
-
-       Dates
-	  --limit-created=[starts][-][ends]
-	  --limit-due=[starts][-][ends]
-	  --limit-starts=[starts][-][ends]
-	  --limit-started=[starts][-][ends]
-          --limit-resolved=[starts][-][ends]
-          --limit-last-updated=[starts][-][ends]
-	    starts and ends are dates.  starts can not be less than ends
-
-	  --limit-first=<first row returned>
-	  --limit-rows=<row count>
-
-	  --history | --show
-            show a history of the tickets found
- 
-
-	  --summary [format-string]
-             show a listing-style summary of the tickets found. If format string
-             is ommitted, uses \$RT_SUMMARY_FORMAT or an internal default
-            
-
-             #TODO: doc summary 
-             format: <atom>%<format>
-             atom:   <name><size>
-             size: <integer>
-             name:  (grep for # {{{ attribs for the array of ok values)
-
-
-	  --create
-            create a new ticket. Any attributes that you can modify on an existing ticket
-            can also be used for ticket creation.
-
-
-
-Attributes
-  Basics
-	  --status=<new|open|stalled|resolved|dead>
-           sets status
-	   --subject=<subject>
-           sets subject
-	   --owner=<userid>
-           set owner to 
-           --steal
-           Become the owner, even if someone else owns the ticket
-	   --queue=<queueid>
-           set queue to
-	   
-	   --priority=<int>
-	  
-           --final-priority=<int>
-
-  Watchers
-	  --requestors=[+|-]<userid|email address>
-          add or remove this user as a ticket requestor 
-	  --cc=[+|-]<userid|email address>
-          add or remove this user as a ticket cc
-	  --admincc=[+|-]<userid|email address>
-          add or remove this user as a ticket admincc
-
-	(When creating tickets, just leave off the + or - )
-
-  Keywords
-	  --keywords[+|-]<keyword_select>/<keyword>
-          Add or remove a keyword.
-
-
-
-  Dates
-	   --due=<date>
-	   --starts=<date>
-	   --started=<date>
-	   --contacted=<date>
-
-	   --time-left=<int>
-	     
-	   --time-taken=<int>
-
-
-   Link related manipulation:
-
-	   --depends-on=[+|-]<ticketid>
-	   --member-of=[+|-]<ticketid>
-	   --refers-to=[+|-]<ticketid>
-           --merge-into=<ticketid>
-
-Comments and replies
-
-	   --comment
-	   --reply|respond
-	     --source <path>
-                Specify the path to the source file for this ticket update
-
-	      --noedit
-                Don't invoke \$EDITOR to edit the content of this update
-
-
-
-
-   Condiments
-
-	   --verbose
-	   --debug
-	   --version
-	   --help|h|usage
-             You're reading it.
-
-EOUSAGE
-
-    exit(0);
-}
-
-# Print version, and leave
-if ($version) {
-	print "RT $RT::VERSION for $RT::rtname. Copyright 1996-2001 Jesse Vincent <jesse\@fsck.com>\n";
-	exit(0);
-}
-
-# }}}
-
-# {{{ Validate any options that were passed in. normalize them.
-
-#if a queue was specified
-if ($queue) {
-    # make sure that $queue is a valid queue and load it into $queue_obj
-}
-
-#For each date in: $due, $starts, $started
-
-# load up an RT::Date object and parse it into a normalized form
-# if it can't parse it, log an error and null out the variable
-
-# }}}
-
-# {{{ Check if we're creating, if so, create the ticket and be done
-
-if ($create) {
-    $RT::Logger->debug("Creating a new ticket");
-
-    #Make sure the current user can create tickets in this queue
-    
-    #Make sure that the owner specified can own tickets in this queue
-
-
-	    
-    my $linesref = GetMessageContent( Edit => $edit, Source => $source,
-				      CurrentUser => $CurrentUser
-				    );
-    
-    require MIME::Entity;
-    my $MIMEObj;
-    
-    if ($linesref) {
-	$MIMEObj = MIME::Entity->build(Data => $linesref);
-    }	
-    
-    use RT::Ticket;
-    my $Ticket=new RT::Ticket($CurrentUser);
-    my ($ticket, $trans, $msg) =
-      $Ticket->Create(Queue => $queue,
-		      Owner => $owner,
-		      Status => $status || 'new' ,
-		      Subject => $subject,
-		      Requestor => \@requestors,
-		      Cc => \@cc,
-		      AdminCc => \@admincc,
-		      Due => $due,
-		      Starts => $starts,
-		      Started => $started,
-		      TimeLeft => $time_left,
-		      InitialPriority => $priority,
-		      FinalPriority => $final_priority,
-		      MIMEObj => $MIMEObj
-		     );
-    print $msg . "\n";
-}
-
-# }}}
-
-else {
-    #Apply restrictions
-    use RT::Tickets;
-    my $Tickets = new RT::Tickets($CurrentUser);
-    
-    # {{{ Limit our search
-    my $value;			#to use when iterating through restrictions
-    my $queue_id;		#to use when limiting by keyword
-    
-    # {{{ limit on id
-
-    foreach $value (@id) {
-	if ($value =~ /^(\d+)$/) {
-	    $Tickets->LimitId ( VALUE => $1,
-				OPERATOR => '=');
-	}	
-	elsif ($value =~ /^(\d*)\D?(\d*)$/) {
-	    my $start = $1;
-	    my $end = $2;
-	    $Tickets->LimitId(
-			      VALUE => "$start",
-			      OPERATOR => '>=') if ($start);
-	    $Tickets->LimitId(
-			      VALUE => "$end",
-			      OPERATOR => '<=') if ($end);
-	}	
-    }
-
-
-    # }}}
-    
-    # {{{ limit on status
-
-    foreach $value (@limit_status) {
-	if ($value =~ /^(=|!=|!|)(.*)$/) {
-	    my $op = $1;
-	    my $val = $2;
-	         
-
-	    $op = ParseBooleanOp($op);
-	    $Tickets->LimitStatus(VALUE => "$val",
-				  OPERATOR => "$op");
-	}	
-    }
-
-    # }}}
-
-
-
-    # {{{ limit on queue
-    foreach $value (@limit_queue) {
-	if ($value =~ /^(\W?)(.*?)$/i) {
-	    my $op = $1;
-	    my $val = $2;
-		
-	    $op = ParseBooleanOp($op);
-
-	    my $queue_obj = new RT::Queue($RT::SystemUser);
-		
-	    unless ($queue_obj->Load($val)) {
-		$RT::Logger->debug("Queue '$val' not found");
-		print STDERR "Queue '$val' not found\n";	
-		exit(-1);
-	    }
-	    $RT::Logger->debug ("Limiting queue to $op ".$queue_obj->Name);
-	    $Tickets->LimitQueue(VALUE => $queue_obj->Name,
-				 OPERATOR => $op);
-	    $queue_id=$queue_obj->id;
-	}	
-    }	
-
-    # {{{ limit on keyword
-    foreach $value (@limit_keyword) {
-	if ($value =~ /^(\W?)(.*?)\/(.*)$/i) {
-	    my $op = $1;
-	    my $select = $2;
-	    my $keyword = $3;
-
-	    $op = ParseBooleanOp($op);
-
-	    # load the keyword select
-	    my $keyselect = RT::KeywordSelect->new($RT::SystemUser);
-	    unless ($keyselect->LoadByName(Name=>$select, Queue=>$queue_id)) {
-		$RT::Logger->debug("KeywordSelect '$select' not found");
-		print STDERR "KeywordSelect '$select' not fount\n";
-		exit(-1);
-	    }
-
-	    # load the keyword
-	    my $k = RT::Keyword->new($RT::SystemUser);
-	    unless ($k->LoadByNameAndParentId($keyword, $keyselect->Keyword)) {
-		$RT::Logger->debug("Keyword '$keyword' not found");
-		print STDERR "Keyword '$keyword' not found\n";
-		exit(-1);
-	    }
-	    $Tickets->LimitKeyword(OPERATOR => $op,
-	                           KEYWORDSELECT => $keyselect->id,
-				   KEYWORD => $k->id);
-	    $RT::Logger->debug ("Limiting keyword to $op ".$k->Path);
-	}
-    }
-    # }}}
-    # {{{ limit on owner
-    foreach $value (@limit_owner) {
-	if ($value =~ /^(\W?)(.*?)$/i) {
-	    my $op = $1;
-	    my $val = $2;
-		
-	    $op = ParseBooleanOp($op);
-
-	    my $user_obj = new RT::User($RT::SystemUser);
-		
-	    unless ($user_obj->Load($val)) {
-		$RT::Logger->debug("User '$val' not found");
-		print STDERR "User '$val' not found\n";	
-		exit(-1);
-	    }
-	    $val = $user_obj->id();
-		
-	    $RT::Logger->debug ("Limiting owner to $op $val");
-	    $Tickets->LimitOwner(VALUE => "$val",
-				 OPERATOR => "$op");
-	}	
-    }	
-    # }}}
-    # {{{ limt on priority
-
-    foreach $value (@limit_priority) {
-	my ($start, $end) = ParseRange($value);
-	if ($start == $end) {
-	    $Tickets->LimitPriority( VALUE => $start,
-				     OPERATOR => '=');
-	} elsif ($start) {
-	    $Tickets->LimitPriority( VALUE => $start,
-				     OPERATOR => '>=');
-	} elsif ($end) {
-	    $Tickets->LimitPriority( VALUE => $end,
-				     OPERATOR => '<=');
-	}	
-	    
-    }
-    foreach $value (@limit_final_priority) {
-	my ($start, $end) = ParseRange($value);
-	if ($start == $end) {
-	    $Tickets->LimitFinalPriority( VALUE => $start,
-					  OPERATOR => '=');
-	} elsif ($start) {
-	    $Tickets->LimitFinalPriority( VALUE => $start,
-					  OPERATOR => '>=');
-	} elsif ($end) {
-	    $Tickets->LimitFinalPriority( VALUE => $end,
-					  OPERATOR => '<=');
-	}	
-    }
-    # }}}
-
-    foreach $value (@limit_requestor) {
-	if ($value =~ /^(\W?)(.*?)$/i) {
-	    my $op = $1;
-	    my $val = $2;
-		
-	    $op = ParseBooleanOp($op);
-	    $Tickets->LimitRequestor(VALUE => $val,
-				     OPERATOR => $op );
-	}
-	    
-    }
-    foreach $value (@limit_subject) {
-	
-	if ($value =~ /^(\W?)(.*?)$/i) {
-	    my $op = $1;
-	    my $val = $2;
-	    
-	    $op = ParseLikeOp($op);
-	    
-	    $Tickets->LimitSubject(VALUE => $val,
-				   OPERATOR => $op );
-	    }
-    }
-    
-    foreach $value (@limit_body) {
-	if ($value =~ /^(\W?)(.*?)$/i) {
-	    my $op = $1;
-	    my $val = $2;
-	    
-	    $op = ParseLikeOp($op);
-	    
-		$Tickets->LimitBody(VALUE => $val,
-				    OPERATOR => $op );
-	}	
-	
-    }
-    
-    
-    
-    # Dates
-    foreach my $date (@limit_created) {
-	my ($start, $end) = ParseDateRange($date);
-	$Tickets->LimitCreated ( VALUE => $start,
-				 OPERATOR => '>=' ) if ($start);
-	$Tickets->LimitCreated ( VALUE => $end,
-				 OPERATOR => '<=' ) if ($end);
-    }
-
-    foreach my $date (@limit_due) {
-	my ($start, $end) = ParseDateRange($date);
-	$Tickets->LimitDue ( VALUE => $start,
-				 OPERATOR => '>=' ) if ($start);
-	$Tickets->LimitDue ( VALUE => $end,
-				 OPERATOR => '<=' ) if ($end);
-    }
-
-    foreach my $date (@limit_starts) {
-	my ($start, $end) = ParseDateRange($date);
-	$Tickets->LimitStarts ( VALUE => $start,
-				 OPERATOR => '>=' ) if ($start);
-	$Tickets->LimitStarts ( VALUE => $end,
-				 OPERATOR => '<=' ) if ($end);
-    }
-
-    foreach my $date (@limit_started) {
-	my ($start, $end) = ParseDateRange($date);
-	$Tickets->LimitStarted ( VALUE => $start,
-				 OPERATOR => '>=' ) if ($start);
-	$Tickets->LimitStarted ( VALUE => $end,
-				 OPERATOR => '<=' ) if ($end);
-    }
-
-    foreach my $date (@limit_resolved) {
-	my ($start, $end) = ParseDateRange($date);
-	$Tickets->LimitResolved ( VALUE => $start,
-				 OPERATOR => '>=' ) if ($start);
-	$Tickets->LimitResolved ( VALUE => $end,
-				 OPERATOR => '<=' ) if ($end);
-    }
-
-    foreach my $date (@limit_lastupdated) {
-	my ($start, $end) = ParseDateRange($date);
-	$Tickets->LimitLastUpdated( VALUE => $start,
-				 OPERATOR => '>=' ) if ($start);
-	$Tickets->LimitLastUpdated ( VALUE => $end,
-				 OPERATOR => '<=' ) if ($end);
-    }
-
-    foreach my $link (@limit_memberof) {
-	$Tickets->LimitMemberOf($link);
-    }	
-
-    foreach my $link (@limit_hasmember) {
-	$Tickets->LimitHasMember($link);
-    }	
-
-    foreach my $link (@limit_dependson) {
-	$Tickets->LimitDependsOn($link);
-    }	
-
-    foreach my $link (@limit_dependedonby) {
-	$Tickets->LimitDependedOnBy($link);
-    }
-    foreach my $link (@limit_refersto) {
-	$Tickets->LimitRefersTo($link);
-    }	
-    
-    foreach my $link (@limit_referredtoby) {
-	$Tickets->LimitReferredToBy($link);
-    }	
-
-    
-    if ($limit_first){
-    }
-    if ($limit_rows){
-    }
-
-# }}}
-    
-    # {{{ Iterate through all tickets we found
-
-
-    my ($format, $titles, $code);
-    
-    #Set up the summary format if we need to
-    if (defined $summary) {
-	my $format_string = $summary || $ENV{'RT_SUMMARY_FORMAT'} || "%id4%status4%queue7%subject40%requestor16";
-
-	($format, $titles, $code) = BuildListingFormat($format_string);
-        printf "$format\n", eval "$titles";
-   }	
-
- 
-
-    while (my $Ticket = $Tickets->Next()) {
-	$RT::Logger->debug ("Now working on ticket ". $Ticket->id);
-    
-	#Run through all the ticket modifications we might want to do
-	#TODO: these are all insufficiently lazy and should be replaced with some 
-	# nice foreaches.
-
-
-	# {{{ deal with watchers
-	
-	# add / delete requestors
-	foreach $value (@requestors) {
-	    if ($value =~ /^(\W?)(.*)$/) {
-		my $op = $1;
-		my $addr = $2;
-		
-		$Ticket->AddRequestor(Email => $addr) if ($op eq '+');
-		$Ticket->DeleteRequestor( $addr) if ($op eq '-');
-	    }	
-	}
-	
-	# add / delete ccs
-	foreach $value (@cc) {
-	    if ($value =~ /^(\W?)(.*)$/) {
-		my $op = $1;
-		my $addr = $2;
-		$Ticket->AddCc(Email => $addr) if ($op eq '+');
-		$Ticket->DeleteCc($addr) if ($op eq '-');
-	    }	
-	}	
-	
-	# add / delete adminccs
-        $RT::Logger->debug("Looking at admin ccs");
-	foreach $value (@admincc) {
-	    if ($value =~ /^(\W?)(.*)$/) {
-		my $op = $1;
-		my $addr = $2;
-		$Ticket->AddAdminCc(Email => $addr) if ($op eq '+');
-		$Ticket->DeleteAdminCc($addr) if ($op eq '-');
-	    }	
-	}	
-
-	# }}}
-	
-	# {{{ Deal with ticket keywords
-
-	my $KeywordSelects = $Ticket->QueueObj->KeywordSelects();
-        $RT::Logger->debug ("Looking at keywords");
-	foreach $value (@keywords) {
-           $RT::Logger->debug("Looking at --keyword=$value");
-	    if ($value =~ /^(\W?)(.*?)\/(.*)$/) {
-		my $op = $1;
-		my $select = $2;
-		my $keyword = $3;
-		
-		$RT::Logger->debug("Going to $op Keyword $select / $keyword");	
-		while (my $ks = $KeywordSelects->Next) {
-                    $RT::Logger->debug("$select is select ".$ks->Name." is found");
-		    next unless ($ks->Name =~ /$select/i);
-		    $RT::Logger->debug ("Found a match for $select\n"); 
-		    my $kids = $ks->KeywordObj->Descendents;
-    
-                    my ($kid);
-		    foreach $kid (keys %{$kids}) {
-                        $RT::Logger->debug("Now comparing $keyword with ".$kids->{$kid}. "\n");
-			next unless ($kids->{$kid} =~ /^$keyword$/i);
-		        $RT::Logger->debug("Going to $op $select / $keyword (".$kids->{$kid} .")");	
-			$Ticket->DeleteKeyword(KeywordSelect => $ks->id,
-					    Keyword => $kid) if ($op eq '-');
-			
-			$Ticket->AddKeyword(KeywordSelect => $ks->id,
-					    Keyword => $kid) if ($op eq '+');
-		    }
-		    
-		}
-	    }
-	}
-	# }}}
-	
-	# {{{ deal with links
-
-	# Deal with merging {
-	if ($mergeinto) {
-		my ($trans, $msg) =$Ticket->MergeInto($mergeinto);
-		print $msg."\n";
-	}	
-	# add /delete depends-ons
-
-	foreach my $value (@dependson) {
-	    if ($value =~ /^(\W?)(.*)$/) {
-		my $op = $1;
-		my $ticket = $2;
-		if (!$op or ($op eq '+')) {
-		    my ($trans, $msg) =
-		      $Ticket->AddLink(Type => 'DependsOn', Target => $ticket);
-		    print $msg."\n";
-		}
-		elsif ($op eq '-') {
-		    my ($trans, $msg) = 
-		      $Ticket->DeleteLink(Type => 'DependsOn', Target => $ticket);
-		    print $msg."\n";
-		}
-
-	    }
-	}
-	# add /delete member-of
-	foreach my $value (@memberof) {
-	    if ($value =~ /^(\W?)(.*)$/) {
-		my $op = $1;
-		my $ticket = $2;
-		if ($op eq '+') {
-		    my ($trans, $msg) =
-		      $Ticket->AddLink(Type => 'MemberOf', Target => $ticket);
-		    print $msg;
-		}
-		elsif ($op eq '-') {
-		    my ($trans, $msg) = 
-		      $Ticket->DeleteLink(Type => 'MemberOf', Target => $ticket);
-		    print $msg;
-		}
-
-	    }
-	}	
-	# add / delete refers-to
-		foreach my $value (@refersto) {
-	    if ($value =~ /^(\W?)(.*)$/) {
-		my $op = $1;
-		my $ticket = $2;
-		if ($op eq '+') {
-		    my ($trans, $msg) =
-		      $Ticket->AddLink(Type => 'RefersTo', Target => $ticket);
-		    print $msg;
-		}
-		elsif ($op eq '-') {
-		    my ($trans, $msg) = 
-		      $Ticket->DeleteLink(Type => 'RefersTo', Target => $ticket);
-		    print $msg;
-		}
-
-	    }
-	}
-
-	# }}}
-	
-	# {{{ deal with dates
-	
-	#set due 
-	if ($due) {
-	    my $iso = ParseDateToISO($due);
-	    if ($iso) {
-		$RT::Logger->debug("Setting due date to $iso ($due)");
-		my ($trans, $msg) = 
-		  $Ticket->SetDue($iso);
-		print $msg;
-	    }
-	    else {
-		print "Due date '$due' could not be parsed";
-	    }
-	}
-
-	#set starts
-	if ($starts) {
-	    my $iso = ParseDateToISO($due);
-	    if ($iso) {
-		my ($trans, $msg) = 
-		  $Ticket->SetStarts($iso);
-		print $msg."\n";
-	    }
-	    else {
-		print "Starts date '$starts' could not be parsed";
-	    }
-	}
-	#set started
-		if ($started) {
-	    my $iso = ParseDateToISO($started);
-	    if ($iso) {
-		my ($trans, $msg) = 
-		  $Ticket->SetStarted($iso);
-		print $msg."\n";
-	    }
-	    else {
-		print "Started date '$started' could not be parsed";
-	    }
-	}
-	#set contacted
-		if ($contacted) {
-	    my $iso = ParseDateToISO($contacted);
-	    if ($iso) {
-		my ($trans, $msg) = 
-		  $Ticket->SetContacted($iso);
-		print $msg."\n";
-	    }
-	    else {
-		print "Contacted date '$contacted' could not be parsed";
-	    }
-	}
-
-    # }}}
-	
-	# {{{ set other attributes
-
-	#Set subject
-	if ($subject) {
-	    my ($trans, $msg) = $Ticket->SetSubject($subject);
-	    print $msg."\n";
-	}
-	
-	#Set priority
-	if ($priority) {
-	    my ($trans, $msg) = 
-	      $Ticket->SetPriority($priority);
-	    print $msg."\n";
-	}
-	
-	#Set final priority
-	if ($final_priority) {
-	    my ($trans, $msg) =
-	      $Ticket->SetFinalPriority($final_priority);
-	    print $msg."\n";
-	}
-
-	#Set status
-	if ($status) {
-	    my ($trans, $msg) = 
-	      $Ticket->SetStatus($status);
-	    print $msg."\n";
-	}
-	
-	#Set time left
-	if ($time_left) {
-	    my ($trans, $msg) = 
-	      $Ticket->SetTimeLeft($time_left);
-	    print $msg."\n";
-	}
-
-	#Set time_taken 
-	if ($time_taken) {
-	    my ($trans, $msg) = 
-	      $Ticket->SetTimeTaken($time_taken);
-	    print $msg."\n";
-	}
-	
-	#Set owner
-	if ($owner) {
-	    my ($trans, $msg) =
-	      $Ticket->SetOwner($owner);
-	    print $msg."\n";
-	}
-
-        # Steal
-        if ($steal) {
-                my ($trans, $msg) =
-                 $Ticket->Steal();
-                 print $msg . "\n";
-        }
-	#Set queue 
-	if ($queue) {
-	    my ($trans, $msg) = 
-	      $Ticket->SetQueue($queue);
-	    print $msg."\n";
-	}
-
-    # }}}
-	
-
-
-	# {{{ Perform ticket comments/replies
-	if ($reply) {
-	    $RT::Logger->debug("Replying to ticket ".$Ticket->Id);
-	    
-	    my $linesref = GetMessageContent( Edit => $edit, Source => $source,
-					     CurrentUser => $CurrentUser
-					   );
-	    
-	    #TODO build this entity
-	    require MIME::Entity;
-	    my $MIMEObj = MIME::Entity->build(Data => $linesref);
-	    
-	    $Ticket->Correspond( MIMEObj => $MIMEObj ,
-				 TimeTaken => $time_taken);
-	}	
-	
-	elsif ($comment) {
-	    $RT::Logger->debug("Commenting on ticket ".$Ticket->Id);
-	
-	    my $linesref =GetMessageContent(Edit => $edit, Source => $source,
-					    CurrentUser => $CurrentUser);
-	    #TODO build this entity
-	    require MIME::Entity;
-	    my $MIMEObj = MIME::Entity->build(Data => $linesref);
-	    
-	    $Ticket->Comment( MIMEObj => $MIMEObj,
-			      TimeTaken => $time_taken);
-	}
-
-    # }}}
-	
-	# {{{ Display whatever we need to display
-
-	# {{{ Display a full ticket listing and history
-	if ($history) {
-	    #Display the history
-	    $RT::Logger->debug("Show history for ".$Ticket->id);
-	    
-	    if ($Ticket->CurrentUserHasRight("ShowTicket")) {
-		&ShowSummary($Ticket);
-		print "\n";
-		&ShowHistory($Ticket);
-	    }
-	    else {
-		print "You don't have permission to view that ticket.\n";
-	    }
-	}	
-
-	# }}}
-	
-	# {{{ Display a summary if we need to
-	if (defined $summary) {
-	    $RT::Logger->debug ("Show ticket summary with format $format");
-	    
-	    printf $format."\n", eval $code;
-	    
-	}	
-	# }}}
-
-	# }}}
-	
-    }
-
-    # }}}
-    
-}
-
-
-$RT::Handle->Disconnect();
-
-
-
-
-
-
-
-# {{{ sub ParseBooleanOp
-
-=head2 ParseBooleanOp
-
-  Takes an option modifier. returns the apropriate SQL operator.
-  If it's handed ! or -, returns !=.  Otherwise returns =.
-
-=cut
-
-sub ParseBooleanOp {
-    
-    my $op = shift;
-    
-    #so that !new limits to not new, etc
-    if ($op =~ /^(\!|-)/) {
-	$op = "!=";
-    }
-    else {
-	$op = "=";
-    }
-    
-    return($op);
-}
-
-# }}}
-
-# {{{ sub ParseLikeOp
-=head2 ParseLikeOp
-
-  Takes an option modifier. returns the apropriate SQL operator.
-  If it's handed ! or -, returns NOT  LIKE.  Otherwise returns LIKE
-
-=cut
-
-sub ParseLikeOp {
-    
-    my $op = shift;
-    
-    #so that !new limits to not new, etc
-    if ($op =~ /^(\!|-)/) {
-	$op = "NOT LIKE";
-    }
-    else {
-	$op = "LIKE";
-    }
-    
-    return($op);
-}
-# }}}
-
-# {{{ sub ParseDateToISO
-
-=head2 ParseDateToISO
-
-Takes a date in an arbitrary format.
-Returns an ISO date and time in GMT
-
-=cut
-
-sub ParseDateToISO {
-    my $date = shift;
-
-	my $date_obj = new RT::Date($CurrentUser);
-	$date_obj->Set( Format => 'unknown',
-			Value => $date
-		      );
-	return ($date_obj->ISO);
-}
-
-# }}}
-
-# {{{ sub ParseDateRange
-
-=head2 ParseDateRange [RANGE]
-
-Takes a range of dates of the form [<date>][-][<date>] and returns 
-starting and ending dates (as ISOs) If a date is specified as neither a starting nor ending 
-date, we parse it it as "midnight tonight to midnight tomorrow"
-
-=cut
-
-sub ParseDateRange {
-    my $in = shift;
-    my ($start, $end);
-    
-    
-    use RT::Date;
-    my $start_obj = new RT::Date($CurrentUser);
-    my $end_obj = new RT::Date($CurrentUser);
-    
-    if ($in =~ /^(.*?)-(.*?)$/) {
-	$start = $1;
-	$end = $2;
-
-	if ($start) {
-	    $start_obj->Set(Format => 'unknown', 
-			    Value => $start);
-	}
-	if ($end) {
-	    $end_obj->Set(Format => 'unknown', 
-			  Value => $end);
-	}
-    }
-    else {
-	$start = $in;
-	$end = $in;
-
-	$start_obj->Set(Format => 'unknown', 
-			Value => $start);
-	
-	$end_obj->Set(Format => 'unknown', 
-		      Value => $end);
-	
-	$start_obj->SetToMidnight();
-	$end_obj->SetToMidnight();
-	$end_obj->AddDay();
-    }	
-    
-    if ($start) {
-	$start = $start_obj->ISO;
-    }
-    if ($end) {
-	$end = $end_obj->ISO;
-    }
-
-    return ($start, $end);
-}
-
-# }}}
-
-# {{{ ParseRange
-=head2 ParseRange [RANGE]
-
-Takes a range of the form [<int>][-][<int>] and returns 
-a first and a last value. If the - is omitted, both $start and $end are the same.
-=cut
-
-sub ParseRange {
-    my $in = shift;
-    my ($start, $end);
-    
-    if ($in =~ /(.*?)-(.*?)/) {
-	$start = $1;
-	$end = $2;
-    }
-    else {
-	$start = $in;
-	$end = $in;
-    }	
-    
-    return ($start, $end);
-    
-
-    
-}
-
-# }}}
-	  
-# {{{ sub ShowSummary 
-
-sub ShowSummary  {
-    my $Ticket = shift;
-
-
-    print <<EOFORM;
-Serial Number: @{[$Ticket->Id]}   Status:@{[$Ticket->Status]} Worked: @{[$Ticket->TimeWorked]} minutes  Queue:@{[$Ticket->QueueObj->Name]}
-      Subject: @{[$Ticket->Subject]}
-   Requestors: @{[$Ticket->RequestorsAsString]}
-           Cc: @{[$Ticket->CcAsString]}
-     Admin Cc: @{[$Ticket->AdminCcAsString]}
-        Owner: @{[$Ticket->OwnerObj->Name]}
-     Priority: @{[$Ticket->Priority]} / @{[$Ticket->FinalPriority]}
-          Due: @{[$Ticket->DueAsString]}
-      Created: @{[$Ticket->CreatedAsString]} (@{[$Ticket->AgeAsString]})
- Last Contact: @{[$Ticket->ToldAsString]} (@{[$Ticket->LongSinceToldAsString]})
-  Last Update: @{[$Ticket->LastUpdatedAsString]} by @{[$Ticket->LastUpdatedByObj->Name]}
-	         
-EOFORM
-
-my $selects = $Ticket->QueueObj->KeywordSelects();
-    #get the keyword selects
-    print "Keywords:\n";
-    while (my $select = $selects->Next) {
-	print "\t" .$select->Name .": ";
-	my $keys = $Ticket->KeywordsObj($select->id);	
-	while (my $key = $keys->Next) {
-	    print $key->KeywordObj->RelativePath($select->KeywordObj) . "  ";
-	    
-	}	
-	print "\n";
-    }
-    
-#iterate through the keyword selects.
-#print the keyword select and all the related keywords
-
-
-
-#TODO: finish link  descriptions
-print "Dependencies: \n";
-   while (my $l=$Ticket->DependedOnBy->Next) {
-       print $l->BaseObj->id," (",$l->BaseObj->Subject,") ",$l->Type," this ticket\n";
-   }
-   while (my $l=$Ticket->DependsOn->Next) {
-       print "This ticket ",$l->Type," ",$l->TargetObj->Id," (",$l->TargetObj->Subject,")\n";
-   }
-}
-
-# }}}
-
-# {{{ sub ShowHistory 
-sub ShowHistory  {
-    my $Ticket = shift;
-    my $Transaction;    
-    my $Transactions = $Ticket->Transactions;
-
-    while ($Transaction = $Transactions->Next) {
-      &ShowTransaction($Transaction);
-    }   
-  }
-# }}}
-
-# {{{ sub ShowTransaction 
-sub ShowTransaction  {
-  my $transaction = shift;
-  
-print <<EOFORM;
-==========================================================================
-Date: @{[$transaction->CreatedAsString]} (@{[$transaction->TimeTaken]} minutes)
-@{[$transaction->Description]}
-EOFORM
-    ;
-  my $attachments=$transaction->Attachments();
-  while (my $message=$attachments->Next) {
-    print <<EOFORM;
---------------------------------------------------------------------------
-@{[$message->Headers]}
-EOFORM
-
-    if ($message->ContentType =~ m{^(text/plain|message|text$)}) {
-	print $message->Content;
-    } else {
-	print $message->ContentType, " not shown";
-    }
-  }
-  print "\n";
-  return();
-}
-# }}}
-
-
-# {{{ sub BuildListingFormat
-
-sub BuildListingFormat {
-    my $format_string = shift;
-
-    my ($id, @format, @code, @titles);
-    my ($field,$titles,$length, $format);
-
-    my $code = "";
-
-    # {{{ attribs
-    my $attribs = { id => { chars => '4',
-			    justify => 'r',
-			    title => 'id',
-			    value => '$Ticket->id',
-			  },
-		    
-		    queue => { chars => '8',
-			       justify => 'l',
-			       title => 'Queue',
-			       value => '$Ticket->QueueObj->Name' 
-			     },
-		    subject => { chars => '30',
-				 justify => 'l',
-				 title => 'Subject',
-				 value => '$Ticket->Subject',
-			       },
-		    priority => { chars => '2',
-				  justify => 'r',
-				  title => 'Pri',
-				  value => '$Ticket->Priority',
-				},
-		    final_priority => {  chars => '2',
-					 justify => 'r',
-					 title => 'Fin',
-					 value => '$Ticket->FinalPriority',
-				      },
-		    time_worked => { chars => '6',
-				     justify => 'r',
-				     title => 'Worked',
-				     value => '$Ticket->TimeWorked',
-				   },
-		    time_left => { chars => '5',
-				   justify => 'r',
-				   title => 'Left',
-				   value => '$Ticket->TimeLeft',
-			       
-				 },
-		
-		    status => {  chars => '6',
-				 justify => 'r',
-				 title => 'Status',
-				 value => '$Ticket->Status',
-			      },
-		    owner => {  chars => '10',
-				justify => 'r',
-				title => 'Owner',
-				value => '$Ticket->OwnerObj->Name'
-			     },
-		    requestor => {  chars => '10',
-				    justify => 'r',
-				    title => 'Requestor',
-				    value => '$Ticket->RequestorsAsString'
-				 },
-		    created => {  chars => '12',
-				  justify => 'r',
-				  title => 'Created',
-				  value => '$Ticket->CreatedAsString'
-			       },
-		    updated => {  chars => '12',
-				  justify => 'r',
-				  title => 'Updated',
-				  value => '$Ticket->LastUpdatedAsString'
-			       },
-		    due => {  chars => '12',
-			      justify => 'r',
-			      title => 'Due',
-			      value => '$Ticket->DueAsString'
-			   },
-		    told => {  chars => '12',
-			       justify => 'r',
-			       title => 'Told',
-			       value => '$Ticket->ToldAsString'
-			    },
-		
-		
-		
-		  };
-
-    # }}}
-    
-
-    foreach $field (split ('%',$format_string)) {
-	
-	if ($field =~ /^(\D*?)(\d*?)$/) {
-	    $id = $1;
-	    $length = $2;
-	}
-	else {	
-	    $RT::Logger->debug ("Error parsing $field\n");
-	}
-	if ($length) {
-	    push (@format, "%".$length.".".$length."s ");
-	    
-	    push (@code,  $attribs->{"$id"}->{'value'});
-		  
-	    push (@titles, "'". $attribs->{"$id"}->{title}. "'");
-	}
-	
-	
-    }
-     $code = join (',', @code);
-     $format = join (" ", @format);
-     $titles = join (', ', @titles);
-    
-  
-    return ($format, $titles, $code);
-}
-
-# }}}
-
-
-
-1;
diff --git a/rt/bin/rt-mailgate b/rt/bin/rt-mailgate
index e6f0d95c5..b30443638 100755
--- a/rt/bin/rt-mailgate
+++ b/rt/bin/rt-mailgate
@@ -1,367 +1,587 @@
-#!!!PERL!! -w
+#!/usr/bin/perl -w
+# BEGIN LICENSE BLOCK
+#
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+#
+# (Except where explictly superceded by other copyright notices)
+#
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+#
+# This work 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.
+#
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+#
+#
+# END LICENSE BLOCK
+
+=head1 NAME
+
+rt-mailgate - Mail interface to RT3.
+
+=begin testing
+
+use RT::I18N;
+
+
+# {{{ Test new ticket creation by root who is privileged and superuser
+
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: root\@localhost
+To: rt\@example.com
+Subject: This is a test of new ticket creation
+
+Blah!
+Foob!
+EOF
+close (MAIL);
+
+use RT::Tickets;
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok (UNIVERSAL::isa($tick,'RT::Ticket'));
+ok ($tick->Id, "found ticket ".$tick->Id);
+ok ($tick->Subject eq 'This is a test of new ticket creation', "Created the ticket");
 
-# $Header: /home/cvs/cvsroot/freeside/rt/bin/rt-mailgate,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-2001 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
+# }}}
 
 
-package RT;
-use strict;
-use vars qw($VERSION $Handle $Nobody $SystemUser);
-
-$VERSION="!!RT_VERSION!!";
-
-
-use lib "!!RT_LIB_PATH!!";
-use lib "!!RT_ETC_PATH!!";
-
-use RT::Interface::Email  qw(CleanEnv LoadConfig DBConnect
-			     GetCurrentUser
-			     GetMessageContent
-			     CheckForLoops 
-			     CheckForSuspiciousSender
-			     CheckForAutoGenerated 
-			     ParseMIMEEntityFromSTDIN
-			     ParseTicketId 
-			     MailError 
-			     ParseCcAddressesFromHead
-			     ParseSenderAddressFromHead 
-			     ParseErrorsToAddressFromHead
-			    );
-
-#Clean out all the nasties from the environment
-CleanEnv();
-
-#Load etc/config.pm and drop privs
-LoadConfig();
-
-#Connect to the database and get RT::SystemUser and RT::Nobody loaded
-DBConnect();
-
-#Drop setgid permissions
-RT::DropSetGIDPermissions();
-
-use RT::Ticket;
-use RT::Queue;
-use MIME::Parser;
-use File::Temp;
-use Mail::Address;
-
-
-#Set some sensible defaults 
-my $Queue = 1;
-my $time = time;
-my $Action = "correspond";  
-
-my ($Verbose, $ReturnTid, $Debug);
-my ($From, $TicketId, $Subject,$SquelchReplies);
-
-# using --owner-from-extension, this will let you set ticket owner on create
-my $AssignTicketTo = undef;
-my ($status, $msg);
-
-# {{{ parse commandline 
-
-while (my $flag = shift @ARGV) {
-    if (($flag eq '-v') or ($flag eq '--verbose')) {
-	$Verbose = 1;
-    }
-    if (($flag eq '-t') or ($flag eq '--ticketid')) {
-	$ReturnTid = 1;
-    }
-    
-    if (($flag eq '-d') or ($flag eq '--debug')) {
-	$RT::Logger->debug("Debug mode enabled\n");
-	$Debug = 1;
-      }
-    
-    if (($flag eq '-q') or ($flag eq '--queue')) {
-	$Queue = shift @ARGV;
-    } 
-    if ($flag eq '--ticket-id-from-extension') {
-       $TicketId = $ENV{'EXTENSION'};
-    }
-    if ($flag eq '--queue-from-extension') {
-       $Queue = $ENV{'EXTENSION'};
-    }
-    if ($flag eq '--owner-from-extension') {
-        $AssignTicketTo = $ENV{'EXTENSION'};
-    }
-
-    if (($flag eq '-a') or ($flag eq '--action')) {
-	  $Action = shift @ARGV;
-    } 
-    
-    
-}
+# {{{This is a test of new ticket creation as an unknown user
+
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist\@example.com
+To: rt\@example.com
+Subject: This is a test of new ticket creation as an unknown user
+
+Blah!
+Foob!
+EOF
+close (MAIL);
+
+$tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+$tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+ok ($tick->Subject ne 'This is a test of new ticket creation as an unknown user', "failed to create the new ticket from an unprivileged account");
+my $u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist@example.com');
+ok( $u->Id == 0, " user does not exist and was not created by failed ticket submission");
+
 
 # }}}
 
-# get the current mime entity from stdin
-my ($entity, $head) = ParseMIMEEntityFromSTDIN();
+# {{{ now everybody can create tickets.  can a random unkown user create tickets?
 
-#Get someone to send runtime errors to;
-my $ErrorsTo = ParseErrorsToAddressFromHead($head);
+my $g = RT::Group->new($RT::SystemUser);
+$g->LoadSystemInternalGroup('Everyone');
+ok( $g->Id, "Found 'everybody'");
 
-#Get us a current user object.
-my $CurrentUser = GetCurrentUser($head, $entity, $ErrorsTo);
+my ($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CreateTicket');
+ok ($val, "Granted everybody the right to create tickets - $msg");
 
-# We've already performed a warning and sent the mail off to somewhere safe ($RTOwner).
-#  this is _exceedingly_ unlikely but we don't want to keep going if we don't have a current user
+sleep(60); # gotta sleep so the remote process' ACL cache times out
 
-unless ($CurrentUser->Id) {
-	exit(1);
-}
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist\@example.com
+To: rt\@example.com
+Subject: This is a test of new ticket creation as an unknown user
 
-my $MessageId = $head->get('Message-Id') || 
-  "<no-message-id-".time.rand(2000)."\@.$RT::Organization>";
+Blah!
+Foob!
+EOF
+close (MAIL);
 
-#Pull apart the subject line
-$Subject = $head->get('Subject') || "[no subject]";
-chomp $Subject;
 
-# Get the ticket ID unless it's already set
-$TicketId = ParseTicketId($Subject) unless ($TicketId);
+$tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+$tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+ok ($tick->Subject eq 'This is a test of new ticket creation as an unknown user', "failed to create the new ticket from an unprivileged account");
+my $u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist@example.com');
+ok( $u->Id != 0, " user does not exist and was created by ticket submission");
 
-#Set up a queue object
-my $QueueObj = RT::Queue->new($CurrentUser);
-$QueueObj->Load($Queue);
-unless ($QueueObj->id ) {
+# }}}
 
-  MailError(To => $RT::OwnerEmail,
-                  Subject => "RT Bounce: $Subject",
-                  Explanation => "RT couldn't find the queue: $Queue",
-                  MIMEObj => $entity);
 
-}
+# {{{  can another random reply to a ticket without being granted privs? answer should be no.
 
-# {{{ Lets check for mail loops of various sorts.
 
-my $IsAutoGenerated = CheckForAutoGenerated($head);
+#($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CreateTicket');
+#ok ($val, "Granted everybody the right to create tickets - $msg");
+#sleep(60); # gotta sleep so the remote process' ACL cache times out
 
-my $IsSuspiciousSender = CheckForSuspiciousSender($head);
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist-2\@example.com
+To: rt\@example.com
+Subject: [example.com #@{[$tick->Id]}] This is a test of a reply as an unknown user
 
-my $IsALoop = CheckForLoops($head);
+Blah!
+Foob!
+EOF
+close (MAIL);
 
+$u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist-2@example.com');
+ok( $u->Id == 0, " user does not exist and was not created by ticket correspondence submission");
+# }}}
+# {{{  can another random reply to a ticket after being granted privs? answer should be yes
 
-#If the message is autogenerated, we need to know, so we can not 
-# send mail to the sender
-if ($IsSuspiciousSender || $IsAutoGenerated || $IsALoop) {
-    $SquelchReplies = 1;
 
-    $ErrorsTo = $RT::OwnerEmail;
-    
-    #TODO: Is what we want to do here really 
-    #  "Make the requestor cease to get mail from RT"?
-    # This might wreak havoc with vacation-mailing users.
-    # Maybe have a "disabled for bouncing" state that gets
-    # turned off when we get a legit incoming message
+($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'ReplyToTicket');
+ok ($val, "Granted everybody the right to reply to  tickets - $msg");
+sleep(60); # gotta sleep so the remote process' ACL cache times out
 
-}
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist-2\@example.com
+To: rt\@example.com
+Subject: [example.com #@{[$tick->Id]}] This is a test of a reply as an unknown user
 
+Blah!
+Foob!
+EOF
+close (MAIL);
 
-# {{{ Warn someone  if it's a loop
-
-# Warn someone if it's a loop, before we drop it on the ground
-if ($IsALoop) {
-    $RT::Logger->crit("RT Received mail ($MessageId) from itself.");
-    
-    #Should we mail it to RTOwner?
-    if ($RT::LoopsToRTOwner) {
-	MailError(To => $RT::OwnerEmail,
-		  Subject => "RT Bounce: $Subject",
-		  Explanation => "RT thinks this message may be a bounce",
-		  MIMEObj => $entity);
-	
-	#Do we actually want to store it?
-	exit unless ($RT::StoreLoops);
-    }
-}
+
+$u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist-2@example.com');
+ok( $u->Id != 0, " user exists and was created by ticket correspondence submission");
 
 # }}}
 
+# {{{  can another random comment on a ticket without being granted privs? answer should be no.
 
-   #Don't let the user stuff the RT-Squelch-Replies-To header.
-    if ($head->get('RT-Squelch-Replies-To')) {
-        $head->add('RT-Relocated-Squelch-Replies-To',
-                   $head->get('RT-Squelch-Replies-To'));
-        $head->delete('RT-Squelch-Replies-To')
-    }
 
+#($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CreateTicket');
+#ok ($val, "Granted everybody the right to create tickets - $msg");
+#sleep(60); # gotta sleep so the remote process' ACL cache times out
 
-if ($SquelchReplies) {
-    ## TODO: This is a hack.  It should be some other way to
-    ## indicate that the transaction should be "silent".
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action comment"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist-3\@example.com
+To: rt\@example.com
+Subject: [example.com #@{[$tick->Id]}] This is a test of a comment as an unknown user
 
-    my ($Sender, $junk) = ParseSenderAddressFromHead($head);
-    $head->add('RT-Squelch-Replies-To', $Sender);
-}
+Blah!
+Foob!
+EOF
+close (MAIL);
+
+$u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist-3@example.com');
+ok( $u->Id == 0, " user does not exist and was not created by ticket comment submission");
 
 # }}}
+# {{{  can another random reply to a ticket after being granted privs? answer should be yes
 
 
-# {{{ If we require that the sender be found in an external DB and they're not
-# forward this message to RTOwner
+($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CommentOnTicket');
+ok ($val, "Granted everybody the right to reply to  tickets - $msg");
+sleep(60); # gotta sleep so the remote process' ACL cache times out
 
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action comment"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist-3\@example.com
+To: rt\@example.com
+Subject: [example.com #@{[$tick->Id]}] This is a test of a comment as an unknown user
 
+Blah!
+Foob!
+EOF
+close (MAIL);
 
-if ($RT::LookupSenderInExternalDatabase && 
-    $RT::SenderMustExistInExternalDatabase )  {
 
-    MailError(To => $RT::OwnerEmail,
-	      Subject => "RT Bounce: $Subject",
-	      Explanation => "RT couldn't find requestor via its external database lookup",
-	      MIMEObj => $entity);
-    
-}
+$u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist-3@example.com');
+ok( $u->Id != 0, " user exists and was created by ticket comment submission");
 
 # }}}
 
-# {{{ elsif we don't have a ticket Id, we're creating a new ticket
-
-
-
-elsif (!defined($TicketId)) {
-    
-    # {{{ Create a new ticket
-    if ($Action =~ /correspond/) {
-	
-	#    open a new ticket 
-	my @Requestors = ($CurrentUser->id);
-	
-	my @Cc;
-	if ($RT::ParseNewMessageForTicketCcs) {
-		@Cc = ParseCcAddressesFromHead(Head => $head, 
-					CurrentUser => $CurrentUser,
-					QueueObj => $QueueObj );
-	}
-
-	my $Ticket = new RT::Ticket($CurrentUser);
-	my ($id, $Transaction, $ErrStr) = 
-	  $Ticket->Create ( Queue => $Queue,
-			    Subject => $Subject,
-                            Owner => $AssignTicketTo,
-			    Requestor => \@Requestors,
-			    Cc => \@Cc,
-			    MIMEObj => $entity
-			  );
-	if ($id == 0 ) {
-	    MailError( To => $ErrorsTo,
- 		       Subject => "Ticket creation failed",
-		       Explanation => $ErrStr,
-		       MIMEObj => $entity
-		     );
-	    $RT::Logger->error("Create failed: $id / $Transaction / $ErrStr ");
-	}	
-    }
-
-    # }}}
-    
-    else {
-	#TODO Return an error message
-	MailError( To => $ErrorsTo,
-		   Subject => "No ticket id specified",
-		   Explanation => "$Action aliases require a TicketId to work on",
-		   MIMEObj => $entity
-		 );
-	
-	$RT::Logger->crit("$Action aliases require a TicketId to work on ".
-			  "(from ".$CurrentUser->UserObj->EmailAddress.") ".
-			  $MessageId);
-    }
-}
+# {{{ Testing preservation of binary attachments
+
+# Get a binary blob (Best Practical logo) 
+
+# Create a mime entity with an attachment
+
+use MIME::Entity;
+my $entity = MIME::Entity->build( From => 'root@localhost',
+                                 To => 'rt@localhost',
+                                Subject => 'binary attachment test',
+                                Data => ['This is a test of a binary attachment']);
+
+# currently in lib/t/autogen
+$entity->attach(Path => '../../../html/NoAuth/images/spacer.gif', 
+                Type => 'image/gif',
+                Encoding => 'base64');
+
+# Create a ticket with a binary attachment
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+
+$entity->print(\*MAIL);
+
+close (MAIL);
+
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
+ $tick = $tickets->First();
+ok (UNIVERSAL::isa($tick,'RT::Ticket'));
+ok ($tick->Id, "found ticket ".$tick->Id);
+ok ($tick->Subject eq 'binary attachment test', "Created the ticket - ".$tick->Id);
+
+my $file = `cat ../../../html/NoAuth/images/spacer.gif`;
+ok ($file, "Read in the logo image");
+
+
+        use Digest::MD5;
+warn "for the raw file the content is ".Digest::MD5::md5_base64($file);
+
+
+
+# Verify that the binary attachment is valid in the database
+my $attachments = RT::Attachments->new($RT::SystemUser);
+$attachments->Limit(FIELD => 'ContentType', VALUE => 'image/gif');
+ok ($attachments->Count == 1, 'Found only one gif in the database');
+my $attachment = $attachments->First;
+my $acontent = $attachment->Content;
+
+        warn "coming from the  database, the content is ".Digest::MD5::md5_base64($acontent);
+
+is( $acontent, $file, 'The attachment isn\'t screwed up in the database.');
+# Log in as root
+use Getopt::Long;
+use LWP::UserAgent;
+
+
+# Grab the binary attachment via the web ui
+my $ua      = LWP::UserAgent->new();
+
+my $full_url = "http://localhost/Ticket/Attachment/".$attachment->TransactionId."/".$attachment->id."/spacer.gif?&user=root&pass=password";
+my $r = $ua->get( $full_url);
+
+
+# Verify that the downloaded attachment is the same as what we uploaded.
+is($file, $r->content, 'The attachment isn\'t screwed up in download');
+
+
 
 # }}}
 
-# {{{ If we've got a ticket ID, update the ticket
-
-else {
-    
-    #   If the action is comment, add a comment.
-    if ($Action =~ /comment/i){
-	
-	my $Ticket = new RT::Ticket($CurrentUser);
-	$Ticket->Load($TicketId);
-	unless ($Ticket->Id) {
-	    MailError( To => $ErrorsTo,
-		       Subject => "Comment not recorded",
-		       Explanation => "Could not find a ticket with id $TicketId",
-		       MIMEObj => $entity
-		     );
-	    #Return an error message saying that Ticket "#foo" wasn't found.
-	}
-	
-	($status, $msg) = $Ticket->Comment(MIMEObj=>$entity);
-	unless ($status) {
-	    #Warn the sender that we couldn't actually submit the comment.
-	    MailError( To => $ErrorsTo,
-		       Subject => "Comment not recorded",
-		       Explanation => $msg,
-		       MIMEObj => $entity
-		     );
-	}	
-    }
-
-    # If the message is correspondence, add it to the ticket
-    elsif ($Action =~ /correspond/i) {
-	my $Ticket = RT::Ticket->new($CurrentUser);
-	$Ticket->Load($TicketId);
-	
-	#TODO: Check for error conditions
-	($status, $msg) = $Ticket->Correspond(MIMEObj => $entity);
-	unless ($status) {
-
-	    #Return mail to the sender with an error
-	    MailError( To => $ErrorsTo,
-		       Subject => "Correspondence not recorded",
-		       Explanation => $msg,
-		       MIMEObj => $entity
-		     );
-	}
-    }
-
-    else {
-	#Return mail to the sender with an error
-	    MailError( To => $ErrorsTo,
-		       Subject => "RT Configuration error",
-		       Explanation => "'$Action' not a recognized action.".
-		                      " Your RT administrator has misconfigured ".
-		                      "the mail aliases which invoke RT" ,
-		       MIMEObj => $entity
-		     );
-
-	$RT::Logger->crit("$Action type unknown for $MessageId");
-	
-    }
-    
-}
+# {{{ Simple I18N testing
+
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+                                                                         
+print MAIL <<EOF;
+From: root\@localhost
+To: rtemail\@example.com
+Subject: This is a test of I18N ticket creation
+Content-Type: text/plain; charset="utf-8"
+
+2 accented lines
+\303\242\303\252\303\256\303\264\303\273
+\303\241\303\251\303\255\303\263\303\272
+bye
+EOF
+close (MAIL);
+
+my $unitickets = RT::Tickets->new($RT::SystemUser);
+$unitickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$unitickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
+my $unitick = $unitickets->First();
+ok (UNIVERSAL::isa($unitick,'RT::Ticket'));
+ok ($unitick->Id, "found ticket ".$unitick->Id);
+ok ($unitick->Subject eq 'This is a test of I18N ticket creation', "Created the ticket - ". $unitick->Subject);
+
+
+
+my $unistring = "\303\241\303\251\303\255\303\263\303\272";
+Encode::_utf8_on($unistring);
+is ($unitick->Transactions->First->Content, $unitick->Transactions->First->Attachments->First->Content, "Content is ". $unitick->Transactions->First->Attachments->First->Content);
+ok($unitick->Transactions->First->Attachments->First->Content =~ /$unistring/i, $unitick->Id." appears to be unicode ". $unitick->Transactions->First->Attachments->First->Id);
+# supposedly I18N fails on the second message sent in.
+
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+                                                                         
+print MAIL <<EOF;
+From: root\@localhost
+To: rtemail\@example.com
+Subject: This is a test of I18N ticket creation
+Content-Type: text/plain; charset="utf-8"
+
+2 accented lines
+\303\242\303\252\303\256\303\264\303\273
+\303\241\303\251\303\255\303\263\303\272
+bye
+EOF
+close (MAIL);
+
+my $tickets2 = RT::Tickets->new($RT::SystemUser);
+$tickets2->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets2->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
+my $tick2 = $tickets2->First();
+ok (UNIVERSAL::isa($tick2,'RT::Ticket'));
+ok ($tick2->Id, "found ticket ".$tick2->Id);
+ok ($tick2->Subject eq 'This is a test of I18N ticket creation', "Created the ticket");
+
+
+
+my $unistring = "\303\241\303\251\303\255\303\263\303\272";
+Encode::_utf8_on($unistring);
+
+ok ($tick2->Transactions->First->Content =~ $unistring, "It appears to be unicode - ".$tick2->Transactions->First->Content);
 
 # }}}
 
-$RT::Handle->Disconnect();
 
+($val,$msg) = $g->PrincipalObj->RevokeRight(Right => 'CreateTicket');
+ok ($val, $msg);
+
+
+
+=end testing
+
+=cut
+
+
+use strict;
+use Getopt::Long;
+use LWP::UserAgent;
+
+use constant EX_TEMPFAIL => 75;
+
+my %opts;
+GetOptions( \%opts, "queue=s", "action=s", "url=s", "jar=s", "help", "debug", "extension=s" );
+
+if ( $opts{help} ) {
+    require Pod::Usage;
+    import Pod::Usage;
+    pod2usage("RT Mail Gateway\n");
+    exit 1;    # Don't want to succeed if this is really an email!
+}
+
+for (qw(url)) {
+    die "$0 invoked improperly\n\nNo $_ provided to mail gateway!\n" unless $opts{$_};
+}
+
+undef $/;
+my $message = <>;
+my $ua      = LWP::UserAgent->new();
+$ua->cookie_jar( { file => $opts{jar} } );
+
+my %args = (
+    queue   => $opts{queue},
+    action  => $opts{action},
+    message => $message,
+    SessionType => 'REST',    # Surpress login box
+);
+
+
+if ($opts{'extension'}) {
+        $args{$opts{'extension'}} = $ENV{'EXTENSION'};
+}
+
+# Set up cookie here.
+
+my $full_url = $opts{'url'}. "/REST/1.0/NoAuth/mail-gateway";
+warn "Connecting to $full_url" if $opts{'debug'};
+
+
+
+my $r = $ua->post( $full_url, {%args} );
+check_failure($r);
+
+my $content = $r->content;
+warn $content if ($opts{debug});
+
+if ( $content !~ /^(ok|not ok)/ ) {
+
+    # It's not the server's fault if the mail is bogus. We just want to know that
+    # *something* came out of the server.
+    die <<EOF
+RT server error.
+
+The RT server which handled your email did not behave as expected. It
+said:
+
+$content
+EOF
+
+}
+
+sub check_failure {
+    my $r = shift;
+    return if $r->is_success();
+
+    # This ordinarily oughtn't to be able to happen, suggests a bug in RT.
+    # So only load these heavy modules when they're needed.
+    require HTML::TreeBuilder;
+    require HTML::FormatText;
+
+    my $error = $r->error_as_HTML;
+    my $tree  = HTML::TreeBuilder->new->parse($error);
+    $tree->eof;
+
+    # It'll be a cold day in hell before RT sends out bounces in HTML
+    my $formatter = HTML::FormatText->new( leftmargin  => 0,
+                                           rightmargin => 50 );
+    warn $formatter->format($tree);
+    warn "This is $0 exiting because of an undefined server error" if ($opts{debug});
+    exit EX_TEMPFAIL;
+}
+
+
+=head1 SYNOPSIS
+
+    rt-mailgate --help : this text
+
+Usual invocation (from MTA):
+
+    rt-mailgate --action (correspond|comment) --queue queuename
+                --url http://your.rt.server/
+                [ --extension (queue|action|ticket)
+
+See C<man rt-mailgate> for more.
+
+=head1 OPTIONS
+
+=over 3
+
+=item C<--action>
+
+Specifies whether this is a correspondence or comment address.
+
+=item C<--queue>
+
+Reflects which queue this address handles.
+
+=item C<--url>
+
+The location of the web server for your RT instance.
+
+
+=item C<--extension> OPTIONAL
+
+Some MTAs will route mail sent to user-foo@host or user+foo@host to user@host
+and present "foo" in the environment variable $EXTENSION. By specifying
+the value "queue" for this parameter, the queue this message should be
+submitted to will be set to the value of $EXTENSION. By specifying
+"ticket", $EXTENSION will be interpreted as the id of the ticket this message
+is related to.  "action" will allow the user to specify either "comment" or
+"correspond" in the address extension.
+
+
+=head1 DESCRIPTION
+
+The RT mail gateway is the primary mechanism for communicating with RT
+via email. This program simply directs the email to the RT web server,
+which handles filing correspondence and sending out any required mail.
+It is designed to be run as part of the mail delivery process, either
+called directly by the MTA or C<procmail>, or in a F<.forward> or
+equivalent.
+
+=head1 SETUP
+
+Much of the set up of the mail gateway depends on your MTA and mail
+routing configuration. However, you will need first of all to create an
+RT user for the mail gateway and assign it a password; this helps to
+ensure that mail coming into the web server did originate from the
+gateway.
+
+Next, you need to route mail to C<rt-mailgate> for the queues you're
+monitoring. For instance, if you're using F</etc/aliases> and you have a
+"bugs" queue, you will want something like this:
+
+    bugs:         "|/opt/rt3/bin/rt-mailgate --queue bugs --action correspond
+              --url http://rt.mycorp.com/"
+
+    bugs-comment: "|/opt/rt3/bin/rt-mailgate --queue bugs --action comment
+              --url http://rt.mycorp.com/"
+
+Note that you don't have to run your RT server on your mail server, as
+the mail gateway will happily relay to a different machine.
+
+=head1 CUSTOMIZATION
+
+By default, the mail gateway will accept mail from anyone. However,
+there are situations in which you will want to authenticate users
+before allowing them to communicate with the system. You can do this
+via a plug-in mechanism in the RT configuration.
+
+You can set the array C<@RT::MailPlugins> to be a list of plugins. The
+default plugin, if this is not given, is C<Auth::MailFrom> - that is,
+authentication of the person is done based on the C<From> header of the
+email. If you have additional filters or authentication mechanisms, you
+can list them here and they will be called in order:
+
+    @RT::MailPlugins = (
+        "Filter::SpamAssassin",
+        "Auth::LDAP",
+        # ...
+    );
+
+See the documentation for any additional plugins you have.
+
+You may also put Perl subroutines into the C<@RT::MailPlugins> array, if
+they behave as described below.
+
+=head1 WRITING PLUGINS
+
+What's actually going on in the above is that C<@RT::MailPlugins> is a
+list of Perl modules; RT prepends C<RT::Interface::Email::> to the name,
+to form a package name, and then C<use>'s this module. The module is
+expected to provide a C<GetCurrentUser> subroutine, which takes a hash of
+several parameters:
+
+=over 4
+
+=item Message
+
+A C<MIME::Entity> object representing the email
+=item CurrentUser
+
+An C<RT::CurrentUser> object
+
+=item AuthStat
+
+The authentication level returned from the previous plugin.
+
+=item Ticket [OPTIONAL]
+
+The ticket under discussion
+
+=item Queue [OPTIONAL]
+
+If we don't already have a ticket id, we need to know which queue we're talking about
+
+=item Action
 
-# Everything below this line is a helper sub. most of them will eventually
-# move to Interface::Email
+The action being performed. At the moment, it's one of "comment" or "correspond"
 
-#When we call die, trap it and log->crit with the value of the die.
-$SIG{__DIE__}  = sub {
-    unless ($^S || !defined $^S ) {
-        $RT::Logger->crit("$_[0]");
-	MailError( To => $ErrorsTo,  
-		   Bcc => $RT::OwnerEmail,
-		   Subject => "RT Critical error. Message not recorded!",
-		   Explanation => "$_[0]",
-		   MIMEObj => $entity
-		 );
-	exit(-1);
-    }
-    else {
-        #Get out of here if we're in an eval
-        die $_[0];
-    }
-};
+=back 4
 
+It returns two values, the new C<RT::CurrentUser> object, and the new
+authentication level. The authentication level can be zero, not allowed
+to communicate with RT at all, (a "permission denied" error is mailed to
+the correspondent) or one, which is the normal mode of operation.
+Additionally, if C<-1> is returned, then the processing of the plug-ins
+stops immediately and the message is ignored.
 
+=cut
 
-1;
diff --git a/rt/bin/rtadmin b/rt/bin/rtadmin
deleted file mode 100644
index 25ba1b06a..000000000
--- a/rt/bin/rtadmin
+++ /dev/null
@@ -1,1040 +0,0 @@
-#!!!PERL!! -w
-#
-# $Header: /home/cvs/cvsroot/freeside/rt/bin/Attic/rtadmin,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# RT is (c) 1996-2001 Jesse Vincent <jesse@fsck.com>
-
-use strict;
-use Carp;
-use Getopt::Long qw(:config pass_through);
-
-use lib "!!RT_LIB_PATH!!";
-use lib "!!RT_ETC_PATH!!";
-
-use RT::Interface::CLI  qw(CleanEnv LoadConfig DBConnect 
-			   GetCurrentUser GetMessageContent);
-
-#Clean out all the nasties from the environment
-CleanEnv();
-
-#Load etc/config.pm and drop privs
-LoadConfig();
-
-#Connect to the database and get RT::SystemUser and RT::Nobody loaded
-DBConnect();
-
-#Drop setgid permissions
-RT::DropSetGIDPermissions();
-
-#Get the current user all loaded
-my $CurrentUser = GetCurrentUser();
-
-unless ($CurrentUser->Id) {
-        print "No RT user found. Please consult your RT administrator.\n";   
-        exit(1);
-}
-
-
-
-
-PickMode();
-
-
-# {{{ Help
-
-sub Help {
-
-    # {{{ help_acl
-my $help_acl ="
-        Access control
-	--grant-right <right> 
-	--revoke-right <right>
-	  --userid <user>
-          --groupid <group>
-	--list-rights";
-
-# }}}
-    
-    # {{{ help_keyword_sel
-my $help_keyword_sel = "
-       Keyword Selections
-       --add-keyword-select
-       --modify-keyword-select <name>
-          --ks-name <name>
-          --ks-keyword <keyword>
-          --ks-single 
-          --ks-multiple
-          --ks-depth  <int>
-
-        --disable-keyword-select <name>";
-# }}}
-    
-    # {{{ help_scrip
-my $help_scrip = "
-        Scrips
-        --create-scrip
-           --scrip-condition <condition name or id>
-           --scrip-action <action name or id>
-           --scrip-template <template name or id>
-
-        --delete-scrip <id>
-	--list-scrips";
-
-# }}}
-    
-    # {{{ help_template  
-my $help_template = "      
-        Templates
-        --delete-template [<id>|<name>]
-        --display-template [<id>|<name>]
-
-         --create-template
-         --modify-template [<id>|<name>]
-           Flags for --create-template and --modify-template
-           --template-name
-           --template-description
-           --template-edit-content
-         
-         --list-templates";
-
-# }}}
-    
-    
-print <<EOF;
-
-USAGE:  rtadmin --user <userid> [Userflags]
-	rtadmin --list-users
-	rtadmin --queue <queueid> [Queueflags]
-	rtadmin --list-queues
-	rtadmin --group [groupflags]
-	rtadmin --list-groups
-	rtadmin --system  [SystemFlags]
-	rtadmin --keyword [keywordflags]
-
-User configuration for --user <userid>
-   
-  	--disable
-  	--create
-	--display
-
-  Core Attributes
-	--userid
-	--gecos
-	--password
-	--emailaddress
-	--privileged
-	--comments
-	--signature
-	--organization
-
-  Names	
-	--realname
-	--nickname
-	
-  Auth and external info
-	--externalcontactinfoid
-	--contactinfosystem
-	--externalauthid
-	--authsystem
-
-  Phone numbers
-	--pagerphone
-	--workphone
-	--mobilemphone
-	--homephone
-
-  Paper address
-	--address1
-	--address2
-	--city
-	--state
-	--zip
-	--country
-	--freeformcontactqinfo	
-
-
-Group Configuration for --group <groupid>
-	--create 
-	--delete
-	--display
-
-	--name <new name>
-	--description <new description>
-
-
-
-	--add-member <userid>
-	--delete-member <userid>
-	--list-members	
-
-Queue Configuration for --queue <queueid>
-	--create
-	--disable
-	--display
-
-	--name <name>
-	--correspondaddress <email address>
-	--commentaddress <email address>
-	--initialpriority <int>
-	--finalpriority <int>
-	--defaultduein <days>
-
-	--add-cc <email address>
-	--delete-cc <email address>
-	--add-admincc <email address>
-	--delete-admincc <email address>
-        --list-watchers
-
-	
-
-$help_acl
-
-$help_keyword_sel
-
-$help_template
-
-$help_scrip
-
-
-System configuration for --system 
-
-$help_acl
-
-$help_keyword_sel
-
-$help_template
-
-$help_scrip
-
-
-Keyword configuration for --keyword  <fully qualified name>
-	--list-children
-  	--create-child <name>
-	--disable
-	--name <new name>
-	--description <new description>
-
-EOF
-
-
-
-}
-
-# }}}
-
-# {{{ PickMode
-
-sub PickMode {
-    my ($user,$group, $queue, $system, $keyword, $listusers, 
-	$listgroups, $listqueues, $help);
-
-
-    GetOptions ('help|h|usage' => \$help,
-		'user=s' => \$user,
-		'queue=s' => \$queue,
-		'group=s' => \$group,
-		'system' => \$system,
-		'keyword=s', => \$keyword,
-		'list-users' => \$listusers,
-		'list-queues' => \$listqueues,
-		'list-groups' => \$listgroups,
-	       );
-    
-
-    
-    if ($user)          { AdminUser($user) }  
-    elsif ($group)      { AdminGroup($group) }
-    elsif ($queue)      { AdminQueue($queue) }
-    elsif ($system)     { AdminSystem($system) }
-    elsif ($keyword)    { AdminKeywords($keyword) }
-    elsif ($listusers)  { ListUsers() }
-    elsif ($listgroups) { ListGroups()  }
-    elsif ($listqueues) { ListQueues() }
-    elsif ($help)       { Help()}
-    else {
-	print "No command found\n";
-    }
-    exit(0);
-}	
-
-# }}}
-
-# {{{ AdminUser
-
-sub AdminUser {
-    my $user=shift;
-    my %args;
-
-    GetOptions(\%args,
-	   'create', 'disable|delete', 'display',
-	   'Name=s', 'Gecos=s', 'Password=s',
-	   'EmailAddress=s', 'Privileged=s', 'Comments=s', 'Signature=s',
-	   'Organization=s', 'RealName=s', 'NickName=s',  
-	   'ExternalContactInfoId=s', 'ContactInfoSystem=s', 
-           'ExternalAuthId=s', 'AuthSystem=s',
-	   'HomePhone=s', 'WorkPhone=s', 'MobilePhone=s', 'PagerPhone=s',
-           'Address1=s', 'Address2=s', 'City=s', 'State=s', 'Zip=s', 
-           'Country=s', 'FreeformContactInfo=s');
-
-    my $user_obj = new RT::User($CurrentUser);
-    
- 
-    #Create the user if we need to 
-    if ($args{'create'}) {
-	my ($status, $msg) = 
-	  $user_obj->Create( Name => ($args{'Name'} || $user),
-			     Gecos => $args{'Gecos'},
-			     Password => $args{'Password'},
-			     EmailAddress => $args{'EmailAddress'},
-			     Privileged => $args{'Privileged'},
-			     Comments => $args{'Comments'},
-			     Signature => $args{'Signature'},
-			     Organization => $args{'Organization'},
-			     RealName => $args{'RealName'},
-			     NickName => $args{'NickName'},
-			     ExternalContactInfoId => $args{'ExternalContactInfoId'},
-			     ContactInfoSystem => $args{'ContactInfoSystem'},
-			     ExternalAuthId => $args{'ExternalAuthId'},
-			     AuthSystem => $args{'AuthSystem'},
-			     HomePhone => $args{'HomePhone'},
-			     WorkPhone => $args{'WorkPhone'},
-			     MobilePhone => $args{'MobilePhone'},
-			     PagerPhone => $args{'PagerPhone'},
-			     Address1 => $args{'Address1'},
-			     Address2 => $args{'Address2'},
-			     City  => $args{'City'},
-			     State => $args{'State'},
-			     Zip => $args{'Zip'},
-			     FreeformContactInfo => $args{'FreeformContactInfo'}
-			   );
-	
-	print "$msg\n";
-	return();
-	
-    }
-    else {
-	
-	
-	#Load the user
-	$user_obj->Load($user);
-	
-	unless ($user_obj->id) {
-	    print "User '$user' not found\n";
-	    return();
-	}	
-	
-	
-	
-	#modify the user if we need to
-	my @attributes = ('Name', 'Gecos',
-			  'EmailAddress', 'Privileged', 'Comments', 'Signature',
-			  'Organization', 'RealName', 'NickName',  
-			  'ExternalContactInfoId', 'ContactInfoSystem', 
-			  'ExternalAuthId', 'AuthSystem',
-			  'HomePhone', 'WorkPhone', 'MobilePhone', 'PagerPhone',
-			  'Address1', 'Address2', 'City', 'State', 'Zip', 
-			  'Country', 'FreeformContactInfo');
-	foreach my $attrib (@attributes) {
-	    if ( (exists ($args{"$attrib"})) and
-		 ($user_obj->$attrib() ne $args{"$attrib"})) {
-		
-		my $method = "Set$attrib";
-		my ($val, $msg) = $user_obj->$method($args{"$attrib"});
-		print "User ".$user_obj->Name. " $attrib:  $msg\n";
-		
-	    }
-	}		
-	
-	if (exists ($args{'Password'})) {
-	    my ($code, $msg);
-	    ($code, $msg) = $user_obj->SetPassword($args{'Password'});
-	    print "User ". $user_obj->Name. ' Password: '. $msg . "\n";
-	}
-	
-	#Check if we need to display the user
-	if ($args{'display'}) {
-	    foreach my $attrib (@attributes) {
-		next if ($attrib eq 'Password'); #Can't see the password
-		printf("%22.22s %-64s\n",$attrib, ($user_obj->$attrib()||'(undefined)'));
-		
-	    }	
-	}	
-	
-	#Check if we need to delete the user
-	if ($args{'disable'}) {
-	    my ($val, $msg) = $user_obj->SetDisabled(1);
-	    print "$msg\n";
-	}	
-	
-    }
-}
-
-# }}}
-
-# {{{ AdminQueue
-
-sub AdminQueue {
-    my $queue=shift;
-    my %args;
-
-    GetOptions(\%args,
-	       'create', 'disable|delete', 'display',
-	       'Name=s', 'CorrespondAddress=s', 'Description=s',
-	       'CommentAddress=s', 'InitialPriority=n', 'FinalPriority=n',
-	       'DefaultDueIn=n',
-	       
-	       'add-cc=s@', 'add-admincc=s@', 
-	       'delete-cc=s@', 'delete-admincc=s@',
-	       'list-watchers', 'create-template'
-	       );
-
-    use RT::Queue;
-    my $queue_obj = new RT::Queue($CurrentUser);
-    
-    #Create the queue if we need to 
-    if ($args{'create'}) {
-	my ($status, $msg) = 
-	  $queue_obj->Create(
-			     Name => ($args{'Name'} || $queue) ,
-			     CorrespondAddress => $args{'CorrespondAddress'},
-			     Description => $args{'Description'},
-			     CommentAddress  => $args{'CommentAddress'},
-			     InitialPriority => $args{'InitialPriority'},
-			     FinalPriority => $args{'FinalPriority'},
-			     DefaultDueIn => $args{'DefaultDueIn'}
-			    );
-	
-	print "$msg\n";
-    }
-    else {
-	#Load the queue
-	$queue_obj->Load($queue);
-	
-	unless ($queue_obj->id) {
-	    print "Queue '$queue' not found\n";
-	    return();
-	}	
-		
-        #modify if we need to
-	my @attributes = qw(Name CorrespondAddress Description
-			    CommentAddress InitialPriority FinalPriority
-			    DefaultDueIn
-			 );
-	foreach my $attrib (@attributes) {
-	    if ( (exists ($args{"$attrib"})) and
-		 ($queue_obj->$attrib() ne $args{"$attrib"})) {
-		
-		my $method = "Set$attrib";
-		my ($val, $msg) = $queue_obj->$method($args{"$attrib"});
-		print "Queue ".$queue_obj->Name. " $attrib:  $msg\n";
-		
-	    }
-	}		
-	    
-	
-	#Check if we need to display the queue
-	if ($args{'display'}) {
-	    foreach my $attrib (@attributes) {
-		printf("%22.22s %-64s\n",$attrib, ($queue_obj->$attrib()||'(undefined)'));
-		
-	    }	
-	}	
-       	
-	foreach my $person (@{$args{'add-cc'}}) {
-	    my ($val, $msg) = $queue_obj->AddCc(Email => $person);
-	    print "$msg\n";
-	}
-	foreach my $person (@{$args{'add-admincc'}}) {
-	    my ($val, $msg) = $queue_obj->AddAdminCc(Email => $person);
-	    print "$msg\n";
-	}
-
-	foreach my $person (@{$args{'delete-cc'}}) {
-	    my ($val, $msg) = $queue_obj->DeleteCc($person);
-	    print "$msg\n";
-	}
-	foreach my $person (@{$args{'delete-admincc'}}) {
-	    my ($val, $msg) = $queue_obj->DeleteAdminCc($person);
-	    print "$msg\n";
-	}
-
-	if ($args{'list-watchers'}) {
-	    require RT::Watchers;
-	    my $watchers = new RT::Watchers($CurrentUser);
-	    $watchers->LimitToQueue($queue_obj->id);
-	    while (my $watcher = $watchers->Next()) {
-		printf("%10s %-60s\n",
-		       $watcher->Type, $watcher->Email );
-	    }	
-	}	
-
-        AdminTemplates($queue_obj->Id());
-        AdminScrips($queue_obj->Id());
-	AdminRights($queue_obj->Id());
-	AdminKeywordSelects($queue_obj->Id());
-
-	#Check if we need to delete the queue
-	if ($args{'disable'}) {
-	    my ($val, $msg) = $queue_obj->SetDisabled(1);
-	    print "$msg\n";
-	}	
-	
-    }
-}
-
-# }}}
-
-# {{{ AdminKeywords
-
-sub AdminKeywords {
-    my $keyword = shift;
-    
-    my %args;
-    GetOptions(\%args, 'list-children', 'create-child=s', 'disable|delete', 'Name=s', 'Description=s');
-    
-    use RT::Keyword;
-    
-    my $key_obj = new RT::Keyword($CurrentUser);
-    my $key_id;
-    
-    #If we're dealing with the root of the keyword list
-    if ($keyword eq '/') {
-	$key_id=0;
-    }	
-    else {
-	my ($val, $msg) = $key_obj->LoadByPath( $keyword );
-	unless ($val) {
-	    print $msg ."\n";
-	}
-	$key_id = $key_obj->Id();
-    }	
-    
-    if ($args{'create-child'}) {
-	my $child = new RT::Keyword($CurrentUser);
-	
-	my ($val, $msg) = $child->Create( Parent => $key_id,
-					  Name => $args{'create-child'},
-					);
-	print $msg ."\n";
-    }	
-    
-    elsif ($args{'list-children'}) {
-	my $keywords;
-	if ($key_obj->id) {
-	    $keywords = $key_obj->Children();
-	}	
-	#If we didn't actually have a keyword object, we need to create our own Keywords object.
-	else {
-	    $keywords = new RT::Keywords($CurrentUser);
-	    $keywords->LimitToParent(0); 
-	}
-	
-	while (my $key=$keywords->Next) {
-	    print $key->Name;
-	    if ($key->Description) {
-		print " (" . $key->Description .")";
-	    }	
-	    print "\n";
-	}	
-	      
-
-    }	
-    
-    #Else we wanna do some modification.
-    else {
-	
-	#If we didn't load a keyword, get out
-	return(undef) unless ($key_obj->Id);
-	
-	
-	my @attributes = qw( Name Description );
-	foreach my $attrib (@attributes) {
-	    if ( (exists ($args{"$attrib"})) and
-		 ($key_obj->$attrib() ne $args{"$attrib"})) {
-		
-		my $method = "Set$attrib";
-		my ($val, $msg) = $key_obj->$method($args{"$attrib"});
-		
-		print "Keyword ".$key_obj->Name. " $attrib:  $msg\n";	    }
-	}
-	
-	if ($args{'disable'}) {
-	    $key_obj->SetDisabled(1);
-	    
-	}
-	
-    }
-}
-
-# }}}
-
-# {{{ AdminKeywordSelects
-
-sub AdminKeywordSelects {
-    my $queue = shift;
-    # O for queue means global
-
-    my %args;
-    GetOptions(\%args, 'add-keyword-select','disable-keyword-select|delete-keyword-select=s',
-	       'modify-keyword-select=s', 
-	       'keyword-select-Keyword|ks-keyword=s', 
-	       'keyword-select-Single|ks-single', 
-	       'keyword-select-Multiple|ks-multiple', 
-	       'keyword-select-Depth|ks-depth=i', 
-	       'keyword-select-Name|ks-name=s'
-	      );
-
-    # sanitize single vs multiple.
-    if ($args{'keyword-select-Multiple'}) {
-	$args{'keyword-select-Single'} = 0;
-    }
-    
-    use RT::KeywordSelect;
-    my $keysel_obj = new RT::KeywordSelect($CurrentUser);
-    if ($args{'add-keyword-select'}) {
-	
-	my ($val, $msg) = $keysel_obj->Create( Keyword => $args{'keyword-select-Keyword'},
-					       Depth => $args{'keyword-select-Depth'},
-					       Single => $args{'keyword-select-Single'},
-					       Name => $args{'keyword-select-Name'},
-					       ObjectType => 'Ticket',
-					       ObjectField => 'Queue',
-					       ObjectValue => $queue);
-	print $msg ."\n";
-    }	
-    elsif ($args{'modify-keyword-select'}) {
-	$keysel_obj->LoadByName(Name => $args{'modify-keyword-select'},
-				Queue => $queue
-			       );
-	
-	unless ($keysel_obj->Id()) {
-	    print "Keyword select not found\n";
-	    return();
-	}	
-	my @attributes = qw( Name Keyword Single Depth );
-	foreach my $attrib (@attributes) {
-	    if ( (exists ($args{"keyword-select-$attrib"})) and
-		 ($keysel_obj->$attrib() ne $args{"keyword-select-$attrib"})) {
-		
-		my $method = "Set$attrib";
-		my ($val, $msg) = $keysel_obj->$method($args{"keyword-select-$attrib"});
-				
-		print "Keyword select ".$keysel_obj->Name. " $attrib:  $msg\n";	    }
-	}
-
-
-    }	
-
-    
-    elsif ($args{'disable-keyword-select'}) {
-	$keysel_obj->LoadByName(Name => $args{'disable-keyword-select'},
-				Queue => $queue);
-	
-	$keysel_obj->SetDisabled(1);
-	
-    }
-}
-
-# }}}
-
-# {{{ AdminGroup
-
-sub AdminGroup {
-    my $group = shift;
-
-    my (%args);
-
-    GetOptions(\%args,
-	       'create', 'delete', 'display',
-	       'Name=s', 'Description=s',
-	       	       
-	       'add-member=s@', 'delete-member=s@',
-	       'list-members'
-	       );
-
-
-    use RT::Group;
-    my $group_obj = new RT::Group($CurrentUser);
-    unless ($group) {
-	print "Group not specified.\n";
-	return();
-    }	
-    
-
-    #Create the group if we need to
-    if ($args{'create'}) {
-	my ($val, $msg) = $group_obj->Create( Name => ($args{'Name'} || $group),
-					      Description => $args{'Description'} );
-	print $msg ."\n";
-    }	
-    #otherwise we load it
-    else {
-	$group_obj->Load($group);
-    }	
-    
-    #If we have no group object, get the hell out
-    unless ($group_obj->Id) {
-	print "Group not found.\n";
-    }
-
-    if ($args{'delete'}) {
-	my ($val, $msg) = $group_obj->Delete();
-	print $msg ."\n";
-	return();
-    }	
-
-
-    
-    #modify if we need to
-    my @attributes = qw(Name Description
-			
-		       );
-    foreach my $attrib (@attributes) {
-	if ( (exists ($args{"$attrib"})) and
-	     ($group_obj->$attrib() ne $args{"$attrib"})) {
-		
-	    my $method = "Set$attrib";
-	    my ($val, $msg) = $group_obj->$method($args{"$attrib"});
-	    print "Group ".$group_obj->Name. " $attrib:  $msg\n";
-	    
-	    }
-    }		
-    
-    foreach my $user (@{$args{'add-member'}}) {
-	my ($val, $msg) = $group_obj->AddMember($user);
-	print $msg. "\n";
-    }
-    foreach my $user (@{$args{'delete-member'}}) {
-	my ($val, $msg) = $group_obj->DeleteMember($user);
-	print $msg ."\n";
-    }
-    
-    if ($args{'list-members'}) {
-	my $members = $group_obj->MembersObj();
-	while (my $member = $members->Next()) {
-	    print $member->UserObj->Name() ."\n";
-	}
-    }	
-    
-}
-
-# }}}
-
-# {{{ AdminSystem
-sub AdminSystem {
-    print "In AdminSystem\n";
-
-    AdminTemplates(0);
-    AdminScrips(0);
-    AdminRights(0);
-    AdminKeywordSelects(0);
-}
-# }}}
-
-# {{{ sub AdminTemplates
-
-sub AdminTemplates {
-    my $queue = shift;
-    #Queue = 0 means 'global';
-
-    my %args;
-
-    
-    GetOptions(\%args, 'list-templates', 'create-template','modify-template=s',
-	       'delete-template=s', 'display-template=s',
-	       'template-Name=s', 'template-Description=s',
-	       'template-edit-content!');
-    
-    # {{{ List templates
-    if ($args{'list-templates'}) {
-	print "Templates for $queue\n";
-	require RT::Templates;
-	my $templates = new RT::Templates($CurrentUser);
-	if ($queue != 0) {
-	    $templates->LimitToQueue($queue);
-	}	
-	else {
-	    $templates->LimitToGlobal();
-	}	
-	while (my $template = $templates->Next) {
-	    print $template->Id.": ".$template->Name." - " . $template->Description ."\n";
-	}	
-    }
-
-    # }}}
-
-    require RT::Template;	
-    my $template = new RT::Template($CurrentUser);
-    if ($args{'delete-template'}) {
-	$template->Load($args{'delete-template'});
-	unless ($template->id) {
-	    print "Couldn't load template";
-	    return(undef);
-	}
-	my ($val, $msg) = $template->Delete();
-	print "$msg\n";
-    }
-    elsif ($args{'create-template'}) {
-	#TODO edit the template content
-	my $content;
-
-	my $linesref = GetMessageContent(CurrentUser => $CurrentUser,
-				      Edit => 1);
-	
-	$content = join("\n", @{$linesref});
-	
-
-	my ($val, $msg) = $template->Create(Name => $args{'template-Name'},
-					    Description => $args{'template-Description'},
-					    Content => $content,
-					    Queue => $queue);
-	print "$msg\n";
-    }	
-    elsif ($args{'modify-template'}) {
-	
-	$template->Load($args{'modify-template'});
-	unless ($template->Id()) {
-	    print "Template not found\n";
-	    return();
-	}	
-	my @attributes = qw( Name Description );
-	foreach my $attrib (@attributes) {
-	    if ( (exists ($args{"template-$attrib"})) and
-		 ($template->$attrib() ne $args{"template-$attrib"})) {
-		
-		my $method = "Set$attrib";
-		my $val = $template->$method($args{"template-$attrib"});
-				
-	    }
-	}
-	if ($args{'template-edit-content'}) {
-	    
-	    my $linesref = GetMessageContent(CurrentUser => $CurrentUser,
-					     Content => $template->Content,
-					     Edit => 1);
-	    
-	    my $content = join("\n", @{$linesref});	    
-	    my ($val) = $template->SetContent($content);
-	    print $val."\n";
-	}	
-
-    }	
-    if ($args{'display-template'}) {
-	$template->Load($args{'display-template'});
-	print $template->Name . "\n". $template->Description ."\n". $template->Content."\n";
-    }	
-}	
-
-# }}}
-
-# {{{ sub AdminScrips
-
-sub AdminScrips {
-    my $queue = shift;
-    #Queue = 0 means 'global';
-
-    my %args;
-
-    
-    GetOptions(\%args, 'list-scrips', 'create-scrip','modify-scrip=s',
-	       'scrip-action=s', 'scrip-template=s', 'scrip-condition=s',
-	       'delete-scrip=s');
-
-    
-    # {{{ List entries
-    if ($args{'list-scrips'}) {
-	print "Scrips for $queue\n";
-	require RT::Scrips;
-	my $scrips = new RT::Scrips($CurrentUser);
-	if ($queue != 0) {
-	    $scrips->LimitToQueue($queue);
-	}	
-	else {
-	    $scrips->LimitToGlobal();
-	}	
-	while (my $scrip = $scrips->Next) {
-	    print $scrip->Id.": If ".
-	      $scrip->ConditionObj->Name." then " .
-		$scrip->ActionObj->Name." with template " .
-		  $scrip->TemplateObj->Name."\n";
-	}	
-    }
-
-    # }}}
-
-    require RT::Scrip;
-    my $scrip = new RT::Scrip($CurrentUser);
-    if ($args{'delete-scrip'}) {
-	$scrip->Load($args{'delete-scrip'});
-	unless ($scrip->id) {
-	    print "Couldn't load scrip";
-	      return(undef);
-	}
-	my ($val, $msg) = $scrip->Delete();
-	print "$msg\n";
-    }
-    elsif ($args{'create-scrip'}) {
-	my ($val, $msg) = $scrip->Create( ScripAction => $args{'scrip-action'},
-					  ScripCondition => $args{'scrip-condition'},
-					  Template => $args{'scrip-template'},
-					  Queue => $queue);
-
-	print "$msg\n";
-    }	
-}	
-
-# }}}
-
-# {{{ sub AdminRights
-
-sub AdminRights {
-    my $queue = shift;
-    #Queue = 0 means 'global';
-
-    my ($scope, $appliesto);
-    if ($queue == 0) {
-	$scope = 'System';
-	$appliesto = 0;
-    }	
-    else {
-	$scope =  'Queue';
-	$appliesto = $queue;
-    }	
-
-    my %args;    
-    GetOptions(\%args, 
-	       'grant-right|add-right|new-right|create-right=s@',
-	       'revoke-right|del-right|delete-right=s@',
-	       'list-rights', 'userid=s@', 'groupid=s@',
-	      );
-    
-    
-    # {{{ List entries
-    if ($args{'list-rights'}) {
-	require RT::ACL;
-	my $acl = new RT::ACL($CurrentUser);
-	if ($queue != 0) {
-	    $acl->LimitToQueue($queue);
-	}	
-	else {
-	    $acl->LimitToSystem();
-	}	
-	while (my $ace = $acl->Next) {
-	    print $ace->RightScope;
-	    
-	    #Print the queue name if we have it.
-	    print " " . $ace->AppliesToObj->Name if (defined $ace->AppliesToObj);
-	    
-	    print ": ". $ace->PrincipalType . " " .$ace->PrincipalObj->Name .
-	      " has right " . $ace->RightName ."\n";
-	      
-	}	
-    }
-
-    # }}}
-
-    require RT::ACE;    
-
-    # {{{ Build up an array of principals
-    my (@principals);
-    my $i = 0;
-    foreach my $group (@{$args{'groupid'}}) { 
-
-
-	my $princ = new RT::Group($CurrentUser);
-	$princ->Load("$group");
-	if ($princ->id) {
-	    $principals[$i]->{'type'} = 'Group';
-	    $principals[$i]->{'id'} = $princ->id();
-	    $i++;
-	}	
-	else {
-	    print "Could not find group $group\n";
-	}	
-    }	
-
-
-    foreach my $user (@{$args{'userid'}}) { 
-	my $princ = new RT::User($CurrentUser);
-	$princ->Load("$user");
-	if ($princ->id) {
-	    $principals[$i]->{'type'} = 'User';
-	    $principals[$i]->{'id'} = $princ->id();
-	    $i++;
-	}	
-	else {
-	    print "Could not find user $user.\n";
-	    }
-    }
-    # }}}
-
-
-    foreach my $principal (@principals) {
-
-	# {{{ Delete rights that need deleting
-	foreach my $right (@{$args{'revoke-right'}}) {
-	    my $ace = new RT::ACE($CurrentUser);
-	    $RT::Logger->debug("Trying to delete a right: $right \n");
-	    my ($val, $msg) = $ace->LoadByValues( RightName => $right,
-						  RightScope => $scope,
-						  PrincipalType => $principal->{'type'},
-						  PrincipalId => $principal->{'id'},
-						  RightAppliesTo => $appliesto);
-	    
-	    unless ($val) {
-		print "Right $right not found for" . $principal->{'type'} . " " .
-		  $principal->{'id'} . " in scope $scope ($appliesto)\n";
-		next;
-	    }	
-	    my ($delval, $delmsg) =$ace->Delete;
-	    print "$delmsg\n";
-	    
-	    
-	}
-
-	# }}}
-	
-	# {{{ grant rights that need granting
-	foreach my $right (@{$args{'grant-right'}}) {
-	    my $ace = new RT::ACE($CurrentUser);
-	    my ($val, $msg) = $ace->Create(RightName => $right,
-					   PrincipalType => $principal->{'type'},
-					   PrincipalId => $principal->{'id'},
-					   RightScope => $scope,
-					   RightAppliesTo => $appliesto);
-	    
-	    print $msg . "\n";
-	}
-
-	# }}}
-    }	
-
-}
-
-# }}}
-
-
-sub ListUsers {
-    require RT::Users;
-    my $users = new RT::Users($CurrentUser);
-    $users->UnLimit();
-    while (my $user = $users->Next()) {
-	printf ("%16s %-16s\n",$user->Name(), $user->EmailAddress());
-    }
-}
-sub ListQueues {
-    require RT::Queues;
-    my $queues = new RT::Queues($CurrentUser);
-    $queues->UnLimit();
-    while (my $queue = $queues->Next()) {
-	printf ("%16s %-16s\n",$queue->Name(), $queue->Description());
-    }
-}
-
-sub ListGroups {
-    require RT::Groups;
-    my $groups = new RT::Groups($CurrentUser);
-    $groups->UnLimit();
-    while (my $group = $groups->Next()) {
-	printf ("%16s %-16s\n",$group->Name(), $group->Description());
-    }	
-}
diff --git a/rt/bin/webmux.pl b/rt/bin/webmux.pl
index 6e1ae06de..21cb83f5e 100755
--- a/rt/bin/webmux.pl
+++ b/rt/bin/webmux.pl
@@ -1,177 +1,125 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/bin/Attic/webmux.pl,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# RT is (c) 1996-2000 Jesse Vincent (jesse@fsck.com);
+#!/usr/bin/perl
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 
 use strict;
-$ENV{'PATH'} = '/bin:/usr/bin';    # or whatever you need
-$ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
-$ENV{'SHELL'} = '/bin/sh' if defined $ENV{'SHELL'};
-$ENV{'ENV'} = '' if defined $ENV{'ENV'};
-$ENV{'IFS'} = ''          if defined $ENV{'IFS'};
 
+BEGIN {
+    $ENV{'PATH'}   = '/bin:/usr/bin';                      # or whatever you need
+    $ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
+    $ENV{'SHELL'}  = '/bin/sh' if defined $ENV{'SHELL'};
+    $ENV{'ENV'}    = '' if defined $ENV{'ENV'};
+    $ENV{'IFS'}    = '' if defined $ENV{'IFS'};
+}
 
-# We really don't want apache to try to eat all vm
-# see http://perl.apache.org/guide/control.html#Preventing_mod_perl_Processes_Fr
-
+use lib ("/opt/rt3/local/lib", "/opt/rt3/lib");
+use RT;
 
 package RT::Mason;
 
-use CGI qw(-private_tempfiles); #bring this in before mason, to make sure we
-				#set private_tempfiles
-use HTML::Mason::ApacheHandler (args_method => 'CGI');
-use HTML::Mason;  # brings in subpackages: Parser, Interp, etc.
-
-use vars qw($VERSION %session $Nobody $SystemUser $r $m);
+use CGI qw(-private_tempfiles);    #bring this in before mason, to make sure we
+                                   #set private_tempfiles
 
-# List of modules that you want to use from components (see Admin
-# manual for details)
-
-#Clean up our umask...so that the session files aren't world readable, writable or executable
-umask(0077);
+BEGIN {
+    if ($CGI::MOD_PERL) {
+	require HTML::Mason::ApacheHandler;
+    }
+    else {
+	require HTML::Mason::CGIHandler;
+    }
+}
 
+use HTML::Mason;                   # brings in subpackages: Parser, Interp, etc.
 
-	  
-$VERSION="!!RT_VERSION!!";
+use vars qw($Nobody $SystemUser $r);
 
-use lib "!!RT_LIB_PATH!!";
-use lib "!!RT_ETC_PATH!!";
+#This drags in RT's config.pm
+RT::LoadConfig();
 
-#This drags in  RT's config.pm
-use config;
 use Carp;
 
-{  
-	    package HTML::Mason::Commands;
-	    use vars qw(%session $m);
-	  
-	    use RT; 
-	    use RT::Ticket;
-	    use RT::Tickets;
-	    use RT::Transaction;
-	    use RT::Transactions;
-	    use RT::User;
-	    use RT::Users;
-	    use RT::CurrentUser;
-	    use RT::Template;
-	    use RT::Templates;
-	    use RT::Queue;
-	    use RT::Queues;
-	    use RT::ScripAction;
-	    use RT::ScripActions;
-	    use RT::ScripCondition;
-	    use RT::ScripConditions;
-	    use RT::Scrip;
-	    use RT::Scrips;
-	    use RT::Group;
-	    use RT::Groups;
-	    use RT::Keyword;
-	    use RT::Keywords;
-	    use RT::ObjectKeyword;
-	    use RT::ObjectKeywords;
-	    use RT::KeywordSelect;
-	    use RT::KeywordSelects;
-	    use RT::GroupMember;
-	    use RT::GroupMembers;
-	    use RT::Watcher;
-	    use RT::Watchers;
-	    use RT::Handle;
-	    use RT::Interface::Web;    
-	    use MIME::Entity;
-	    use Text::Wrapper;
-	    use Apache::Cookie;
-	    use Date::Parse;
-	    use HTML::Entities;
-	    
-	    #TODO: make this use DBI
-	    use Apache::Session::File;
-
-	    # Set this page's content type to whatever we are called with
-	    sub SetContentType {
-		my $type = shift;
-		$RT::Mason::r->content_type($type);
-	    }
-
-	    sub CGIObject {
-		$m->cgi_object();
-	    }
-
-	}
-my ($parser, $interp, $ah);
-if ($HTML::Mason::VERSION < 1.0902) {
- $parser = &RT::Interface::Web::NewParser(allow_globals => [%session]);
-
- $interp = &RT::Interface::Web::NewInterp(parser=>$parser,
-                                          allow_recursive_autohandlers => 1,
-                                                              );
-
- $ah = &RT::Interface::Web::NewApacheHandler($interp);
-} else {
- $ah = &RT::Interface::Web::NewMason11ApacheHandler();
+{
+    package HTML::Mason::Commands;
+    use vars qw(%session);
+
+    use RT::Tickets;
+    use RT::Transactions;
+    use RT::Users;
+    use RT::CurrentUser;
+    use RT::Templates;
+    use RT::Queues;
+    use RT::ScripActions;
+    use RT::ScripConditions;
+    use RT::Scrips;
+    use RT::Groups;
+    use RT::GroupMembers;
+    use RT::CustomFields;
+    use RT::CustomFieldValues;
+    use RT::TicketCustomFieldValues;
+
+    use RT::Interface::Web;
+    use MIME::Entity;
+    use Text::Wrapper;
+    use CGI::Cookie;
+    use Time::ParseDate;
+    use HTML::Entities;
 }
-# Activate the following if running httpd as root (the normal case).
-# Resets ownership of all files created by Mason at startup.
-#
-chown (Apache->server->uid, Apache->server->gid, 
-		[$RT::MasonSessionDir]);
-
-
-chown (Apache->server->uid, Apache->server->gid, 
-		$ah->interp->files_written);
 
-# Die if WebSessionDir doesn't exist or we can't write to it
 
-stat ($RT::MasonSessionDir);
-die "Can't read and write $RT::MasonSessionDir"
-  unless (( -d _ ) and ( -r _ ) and ( -w _ ));
+# Activate the following if running httpd as root (the normal case).
+# Resets ownership of all files created by Mason at startup.
+# Note that mysql uses DB for sessions, so there's no need to do this.
+unless ($RT::DatabaseType =~ /(mysql|Pg)/) {
+    # Clean up our umask to protect session files
+    umask(0077);
+
+if ( $CGI::MOD_PERL)  {
+    chown( Apache->server->uid, Apache->server->gid, [$RT::MasonSessionDir] )
+	if Apache->server->can('uid');
+        }
+    # Die if WebSessionDir doesn't exist or we can't write to it
+    stat($RT::MasonSessionDir);
+    die "Can't read and write $RT::MasonSessionDir"
+	unless ( ( -d _ ) and ( -r _ ) and ( -w _ ) );
+}
 
+my $ah = &RT::Interface::Web::NewApacheHandler() if $CGI::MOD_PERL;
 
 sub handler {
     ($r) = @_;
-    
+
     RT::Init();
- 
+
     # We don't need to handle non-text items
-    return -1 if defined($r->content_type) && $r->content_type !~ m|^text/|io;
-    
-    #This is all largely cut and pasted from mason's session_handler.pl
-    
-    my %cookies = Apache::Cookie::parse($r->header_in('Cookie'));
-    
-    eval { 
-	tie %HTML::Mason::Commands::session, 'Apache::Session::File',
-	  ( $cookies{'AF_SID'} ? $cookies{'AF_SID'}->value() : undef ), 
-	    { Directory => $RT::MasonSessionDir,
-	      LockDirectory => $RT::MasonSessionDir,
-	    }	;
-    };
-    
-    if ( $@ ) {
-	# If the session is invalid, create a new session.
-	if ( $@ =~ m#^Object does not exist in the data store# ) {
-	     tie %HTML::Mason::Commands::session, 'Apache::Session::File', undef,
-	     { Directory => $RT::MasonSessionDir,
-	       LockDirectory => $RT::MasonSessionDir,
-	     };
-	     undef $cookies{'AF_SID'};
-	}
-	  else {
-	     die "RT Couldn't write to session directory '$RT::MasonSessionDir'. Check that this directory's permissions are correct.";
-	  }
-    }
-    
-    if ( !$cookies{'AF_SID'} ) {
-	my $cookie = new Apache::Cookie
-	  ($r,
-	   -name=>'AF_SID', 
-	   -value=>$HTML::Mason::Commands::session{_session_id}, 
-	   -path => '/',);
-	$cookie->bake;
+    return -1 if defined( $r->content_type ) && $r->content_type !~ m|^text/|io;
 
-    }
+    my %session;
     my $status = $ah->handle_request($r);
-    untie %HTML::Mason::Commands::session;
-    
+    undef (%session);
+
+    $RT::Logger->crit("Transaction not committed. Usually indicates a software fault. Data loss may have occurred") if $RT::Handle->TransactionDepth;
     return $status;
-    
-  }
-1;
+}
 
+1;
diff --git a/rt/docs/design_docs/acls b/rt/docs/design_docs/acls
index 3b9d8567c..bb093adcb 100644
--- a/rt/docs/design_docs/acls
+++ b/rt/docs/design_docs/acls
@@ -1,206 +1,50 @@
-$Header: /home/cvs/cvsroot/freeside/rt/docs/design_docs/acls,v 1.1 2002-08-12 06:17:07 ivan Exp $
 
 
+Does principal baz have right foo for object bar
 
-# {{{ Requirements 
+What rights does user baz have for object bar
 
-Here's the rough scheme I was thinking of for RT2 acls. Thoughts? I think
-it's a lot more flexible than RT 1.0, but not so crazily complex that
-it will be impossible to implement.  One of the "interesting" features
-is the ability to grant acls based on watcher status. This now lives
-in design-docs/acls
+# {{{ Which principals have right foo for object bar
 
-        jesse
 
-Who can rights be granted to:
+if ($args{'ObjectType'} eq 'Ticket') {
+     $or_check_ticket_roles = " OR ( Groups.Domain = 'TicketRole' AND Groups.Instance = '".$args{'ObjectId'}."') ";
+     # If we're looking at ticket rights, we also want to look at the associated queue rights.
+     # this is a little bit hacky, but basically, now that we've done the ticket roles magic, we load the queue object
+     # and ask all the rest of our questions about the queue.
+     my $tick = RT::Ticket->new($RT::SystemUser);
+     $tick->Load($args{'ObjectId'});
+     $args{'ObjectType'} = 'Queue';
+     $args{'ObjectId'} = $tick->QueueObj->Id();
 
-	users whose id is <foo>
-	users who are watchers of type <requestor/cc/admincc> for <queue/ticket> <id>
-	users who are watchers of type <requestor/cc/admincc> for <this ticket / this queue>
-
-
-what scope do these rights apply to
-	queue <id>
-	system
-	
-
-What rights can be granted
-	Display Ticket
-	Manipulate Ticket
-		Only users with manipulate ticket level access will see comments
-	Maniplulate Ticket Status
-	Create Ticket	
-
-	Admin Queue Watchers 
-	Admin Ticket Watchers
-	Admin user accounts
-	Admin scrips
-	Admin scripscopes
-	Admin Queue ACLS
-	Admin System ACLs
-
-# }}}
-
-
-# {{{ Prinicpals  These are the entities in your Access Control Element
-#
-
-Principal: What user does this right apply to
-
-	Made up of: 
-		PrincipalScope, PrincipalType and PrincipalId
-
-	
-	User:	
-		Scope: 	User	
-		Type: 	null
-		Id:	A userid or 0
-
-	Owner:
-		Scope:  Owner
-		Type: 	null
-		Id:	none
-
-
-	Watchers:
-
-		Scope: Ticket
-		Type:	Requestors; Cc; AdminCc
-		Id:	A ticket id or 0 for "this ticket"
-
-		Scope: Queue
-		Type:	Cc; AdminCc
-		Id:	A queue id or 0 for "this queue"
-
-
-# }}}
-
-# {{{ Object: What object does this right apply to
-
-	Object is composed of an ObjectType and an ObjectId
-
-	Type:	System 	
-	Id:	NULL
-
-	Type:	Queue
-	Id:	Integer ref to queue id or 0 for all queues
-	
-# }}}
-
-# {{{ Right: (What does this entry give the principal the right to do)
-
-
-
-	For the Object System:
-		System::SetACL
-		System::AdminScrips
-
-		User::Display
-		User::Create
-		User::Destroy
-		User::Modify
-		User::SetPassword
-
-
-
-	For the Object "Queue":
-		Queue::Admin
-		Queue::SetACL
-		Queue::Create
-		Queue::Display
-		Queue::Destroy
-		Queue::ModifyWatchers
-		Ticket::Create
-		Ticket::Destory
-		Ticket::Display
-		Ticket::Update
-		Ticket::UpdateRequestors
-		Ticket::UpdateCc
-		Ticket::UpdateAdminCc
-		Ticket::NotifyWatchers
-
-		
-		DEFERRED
-
-		Ticket::SetStatus:	(Values)
-					Open
-					Resolved
-					Stalled
-					<null> means any
-
-
-# }}}
-
-
-# {{{ Implementation:
-
-# {{{ SQL Schema 
-CREATE TABLE ACL (
-	id int not null primary_key autoincrement,
-	PrinicpalId INT(11),
-	PrincipalType VARCHAR(16),
-	PrincipalScope VARCHAR(16),
-	ObjectType VARCHAR(16),
-	ObjectId  INT,
-	Right VARCHAR(16)
-);
-
-# }}}
-
-# {{{ perl implementation of rights searches
-
-sub Principals {
-if (defined $Ticket) {
-	return "($UserPrincipal) OR ($OwnerPrincipal) OR ($WatchersPrincipal)";
-	}
-else {
-	return 	 "($UserPrincipal) OR ($WatchersPrincipal)";
-	}  
 }
-	
-$Principals = " ($UserPrincipal) OR ($OwnerPrincipal) OR ($WatchersPrincipal)";
-
-$UserPrincipal = " ( ACE.PrincipalScope = 'User') AND 
-		   ( ACE.PrincipalId = $User OR ACE.PrincipalId = 0)";
-
-$OwnerPrincipal = " ( ACE.PrinciaplScope = 'Owner') AND 
-		      ( Tickets.Owner = "$User ) AND	
-		      ( Tickets.Id = $Ticket)";
-
-$WatchersPrincipal = " ( ACE.PrincipalScope = Watchers.Scope ) AND 
-		      ( ACE.PrincipalType = Watchers.Type ) AND 
-		      ( ACL.PrincipalId = Watchers.Value ) AND 
-		      ( Watchers.Owner = $User )";
-
-$QueueObject = "( ACE.ObjectType = 'Queue' and (ACE.ObjectId = $Queue OR ACE.ObjectId = 0)";
-
-$SystemObject = "( ACE.ObjectType = 'System' )";
-
-
-# This select statement would figure out if A user has $Right at the queue level
-
-SELECT ACE.id from ACE, Watchers, Tickets WHERE ( 
-	     $QueueObject
-	     AND ( ACE.Right = $Right) 
-	     AND ($Principals))
+if ($args{'ObjectType'} eq 'Queue') {
+     $or_check_roles = " OR ( ( (Groups.Domain = 'QueueRole' AND Groups.Instance = '".$args{'ObjectId'}."') $or_check_ticket_roles ) 
+                            AND Groups.Type = ACL.PrincipalType AND Groups.Id = Principals.ObjectId AND Principals.PrincipalType = 'Group') ";
+}
 
-# This select statement would figure outif a user has $Right for the "System"
+if (defined $args{'ObjectType'} ) {
+     $or_look_at_object_rights = " OR (ACL.ObjectType = '".$args{'ObjectType'}."'  AND ACL.ObjectId = '".$args{'ObjectId'}."') ";
 
-SELECT ACE.id from ACE, Watchers, Tickets WHERE ( 
-	     ($SystemObject) AND ( ACE.Right = $Right ) AND ($Principals))
+}
 
-# }}}
+my $query = "SELECT Users.*  from ACL, Groups, Users, Principals, Principals UserPrinc, CachedGroupMembers  WHERE  
+        Users.id = UserPrinc.ObjectId AND UserPrinc.PrincipalType = 'User' AND
+        Principals.Id = CachedGroupMembers.GroupId AND 
+        CachedGroupMembers.MemberId = UserPrinc.ObjectId AND 
+        UserPrinc.PrincipalType = 'User'  AND
+        (ACL.RightName = 'SuperUser' OR  ACL.RightName = '$right') AND
+        (ACL.ObjectType = 'System' $or_look_at_object_rights) AND 
+        (
+                (ACL.PrincipalId = Principals.Id AND 
+                 Principals.ObjectId = Groups.Id AND 
+                 ACL.PrincipalType = 'Group' AND 
+                 (Groups.Domain = 'SystemInternal' OR Groups.Domain = 'UserDefined' OR Groups.Domain = 'ACLEquivalence')
+                ) 
+           $or_check_roles
+        )";
 
 # }}}
 
-# {{{ Examples
-#
-
-# }}}	
-
-
-
-Unaddressed issues:
-
-	There needs to be a more refined method for grouping users, such that members of the customer service department
-can't change sysadmins' passwords.
+What objects does principal baz have right foo for
+;
diff --git a/rt/docs/design_docs/basic-definitions.txt b/rt/docs/design_docs/basic-definitions.txt
deleted file mode 100644
index 23d2c5748..000000000
--- a/rt/docs/design_docs/basic-definitions.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-(todo ... basically, those are untouched from 1.0)
-Ticket
-Queue
-(...more?)
-
-Requestor
-
-  (...definition of a requestor .. blahblah)
-
-  I'm often doing a distinction between "Internal Requestors" and "External
-  Requestors" (see below).  The system doesn't make any difference between
-  requestors, but the distinction might be useful to discuss usage patterns,
-  templates and configurations.
-
-
-External Requestor
-
-  Might be a customer or a potential customer.  The External Requestor
-  should be treated as a VIP.  (S)he shouldn't need to see too much of RT.
-  The support (s)he gets should be as personal as possible.  The external
-  requestor might eventually get access to the Web UI, but only to track
-  her/his own requests.  If you're not planning to use RT for handling
-  external customers, all your requestors are probably "Internal
-  Requestors".
-
-
-Watcher
-
-  Somebody that are "subscribing" to a queue or a ticket (or something
-  differently).  Basicly, somebody watching a queue or a ticket should get
-  all updates by email.  A requestor is a (special) watcher.
-
-
-Regular Watcher
-
-  People within the same organization, people that have read access to whole
-  queues.
-
-  I consider "Regular Watchers" as well as "Internal Requestors" as more
-  robust and capable human beeings than the fragile customers.  We don't
-  mind letting them get entagled with RT, and we let them access the Web UI.
-  They can live with beeing just the Cc or Bcc at an email.
-
-
-Internal Requestor
-
-  An Internal Requestor is usually internal to the company.  He might be 1st
-  line support sending matters to tech support or similar. Might be an
-  internal employee sending matters to tech support (or even 1st line
-  support if he's not sure where to send matters).  It might also be that
-  "ordinary" requestors actually might be treated as intelligent human
-  beeings rather than VIPs, i.e. in open source projects ... we'll still
-  call them "Internal Requestors" as they don't need the special VIP
-  treatment.
diff --git a/rt/docs/design_docs/cli_spec b/rt/docs/design_docs/cli_spec
index 48a7f34e1..ae5f29f76 100644
--- a/rt/docs/design_docs/cli_spec
+++ b/rt/docs/design_docs/cli_spec
@@ -1,354 +1,31 @@
 
-Find tickets to operate on:
-        --id=<tickets>          Find only tickets in the range <tickets>
-                synonyms:
-                --limit-id, --tickets, --limit-tickets
-        --limit-queue=<queue>
-        --limit-status=<status>
-        --limit-owner=<owner>
-        --limit-priority=<priority>
-        --limit-requestor=<email>
-        --limit-subject=<string>      (Subject contains)
-        --limit-body=<string>         (body contains)
-        --limit-created=(before/after) <date>
-        --limit-due=(before/after) <date>
-        --limit-starts=(before/after) <date>
-        --limit-started=(before/after) <date>
+Things the cli must do
+	create ticket
+	comment
+	reply
+	update ticket metadata
+	search for tickets
+	update a bunch of tickets.
+	list tickets
+        login/logout
 
-        --limit-first=<int>           Start on the <int>th row returned by the
-                                database  
-        --limit-rows=<int>      Find only <int> rows
 
-Display:
-        --show                  shows a ticket history
-        --history               ditto
+should support multiple rt servers
 
-        --summary               default option. shows a ticket summary
-                --format        Optional format string. If not specified,
-                                uses the value of ENV{'RT_LISTING_FORMAT'}
-                                or an internal default
-        
+create/edit/update should use EDITOR or take from a file or stdin
 
-Basic ticket editing:
+should be able to update ticket sttributes from a commandline without invoking an editor or needing to use stdin.
 
-	--status=(open|stall|resolve|kill)
-	--subject=<string>
-        --owner=<owner>
-	--queue=<queue>
-	--time-left=<minutes>
+login/logout should store RT session cookies rather than constantly transmitting the username/password combo.
 
-Watcher-related editing:
+rtserver and rt username should come from env variables. but should be able to be overridden by commandline options. 
 
-	--add-requestor=<email>
-	--del-requestor=<email>
-	--add-cc=<email>
-	--del-cc=<email>
-	--add-admincc=<email>
-	--del-admincc=<email>
+rt password should be able to be specified on the commandline (say from a script) or, failing that be prompted for within the application (as rt's sbin/initdb script does) ...or maybe able to be read from a stash file on disk.
 
-Priority related editing:
+must be able to dowaload attachments from cli.
+ 
+ it might also be cool to be able to generate session-length urls for attavhments so you can use a browser. but that's not necessary.
 
-	--priority=<int>
-	--final-priority=<int>
 
-Date related editing:
-
-	--due=date
-	--starts=date
-	--started=date
-	--contacted=date
-
-
-
-Ticket updates:
-
-	--comment 
-	--reply | --respond 
-
-
-Links
-
-	--add-link 
-		--type=<DependsOn|MemberOf|RelatedTo>
-		needs one of:
-		   --target=<ticketid> 
-		   --base=<ticketid>
-
-	--del-link <link-id>
-
-
-
-Condiments:
-	any update can take:
-
-		--time-taken <minutes>
-
-	Ticket updates can take:
-
-		--source 	-- specify a source file to read the content from
-		--edit		= give me an editor to edit the message
-		--no-edit	= don't give me an editor to edit the message.
-
-
-
-
------ Forwarded message from deborah kaplan <deborah@curl.com> -----
-
-Date: Fri, 14 Apr 2000 11:43:18 -0400 (EDT)
-From: deborah kaplan <deborah@curl.com>
-To: Jesse <jesse@fsck.com>
-Subject: Re: [rt-devel] RT Projects list
-
-Finally, here is the functional spec for the command line
-interface.  This is for the user interface only; if you think
-this is right, I will add the administrative interface as well.
-Should I post to rt-devel, add to the ticket, or just modify
-based on your kibbitzing?  When you are happy with it I'll start
-the code.
-
--deborah
-
-
-RT command line interface functional specification
-Author: Deborah Kaplan (Deborah@suberic.net)
-Version:0.1
-
-Requirements: 
-
-RT needs a CLI for various reasons.  If a user is restricted to a
-dumb terminal, she needs to be able to access the RT database and
-manipulate it fully.  The full functionality of both the RT
-database and the RT administrative interface should be available
-from this CLI.
-
-There are two possible types of CLI which I will discuss here.
-The first is a curses-style interface, which allows the user to
-move about a series of menus and choices, usually using arrow
-keys.  As RT supplies a Web interface, there is no need for this
-curses-style interface to be written as part of RT.  Instead, the
-RT developers should pick one tty-based Web browser (e.g. lynx,
-w3m) and make sure that all of the RT pages are easily readable
-with that tty based browser.  Installation of that browser should
-be recommended in the RT installation documentation as a
-supported method of accessing RT from a tty.
-
-The second possible type of CLI is more minimal: a series of
-commands which can be run at a UNIX command prompt which provide
-full functionality to the RT database and administrative
-interface.  There are two major benefits to this second type of
-CLI.  First of all, in order to use this CLI, you need no extra
-tools (Web browsers, etc.).  All that is required is a UNIX
-command line prompt and an installation of RT.  Secondly, a user
-of RT who has a very specific command to run and who knows the
-appropriate CLI commands can accomplish her task much more
-quickly with a single command then she could navigating through a
-menu based interface.
-
-In the specification, I will describe the second type of CLI.
-
-Caveats:
-
-This specification draws heavily on the structure of formatting
-command line options for cvs.  RT faces a smaller version of the
-same kinds of problems cvs faces: we want to create a very rich
-command set without sacrificing ease-of-use. 
-
-I am not wedded to any specific command names if they seem
-impractical; I merely am proposing the command names that seem
-reasonable to me at this moment.
-
-Finally, I am finding the functioning of the web UI from RT 1.
-If the functionality differs greatly in RT 2, I will need to
-modify this specification.
-
-Specification:
-
-There are two commands: "rt", which is the primary interface to
-the database, and "rtadmin", which is the administrative
-interface to the database.
-
-The format of an rt command is as follows:
-
- rt <command> 
-    <command> is one of:
-
-    - help
-      print an overview of the commands which can be run
-
-    - print <queue> <options> 
-      with no options, dump to the screen a list of all open
-      requests in <queue> -- the equivalent of "Display Queue" in
-      the existing Web interface.
-
-      <queue> is the name of an RT queue
-      <option> is either:
-
-        -f <filename> |  --filename <filename>
-	   where <filename> is the name of a file (defaulting to
-	   ~/.rtrc) in which the options described below can be
-	   placed in the format "^ <long option name> <option value>
-	   $".
-
-        Or a series of the following options:
-
-        -o <owner name> |  --owner <owner name>: restrict tickets
-	viewed to those owned by <owner name>.
-	   This option can be used multiple times in one call of
-	   the rt command in order to produce a list which
-	   contains tickets owned by multiple owners.  Giving the
-	   empty string ("") as an option to this switch will
-	   restrict tickets viewed to those which have no owner.
-	   If this switch is given with no argument, the option
-	   defaults to the user name of the currently running
-	   process.
-
-        -r <requestor name> | --requestor <requestor name>:
-	restrict tickets viewed to those requested by <requestor
-	name>.
-	   This option can be used multiple times in one call of
-	   the rt command in order to produce a list which
-	   contains tickets requested by multiple requesters.  If
-	   this switch is given with no arguments, it produces an
-	   error.
-
-        -s <status> | --status <status>: restrict tickets viewed
-	to those with the status named in <status>.
-	   This option can be used multiple times in one call of
-	   the rt command in order to produce a list which
-	   contains tickets with multiple statuses (statii?
-	   Dragon NaturallySpeaking recognizes "statuses" as a
-	   word).  This option defaults to status "open".
-
-        -j <subject> | --subject <subject>: restrict tickets
-	viewed to those which contain <subject> as a substring in
-	the subject field of the ticket.
-	   This command can be used multiple times in one call of
-	   the rt command in order to produce a list which
-	   contains tickets with various subject substrings.  If
-	   the option is called with no argument, the result is
-	   an error.
-
-        -h | --help: print a usage message.
-
-        -n | --number: print out a specific ticket.
-	   This command can be used multiple times to produce a
-	   list which contains multiple tickets.  If the option
-	   is called with no argument, the result is an error.
-
-    This completes all of the print options which are available
-    in the Web interface, except the sort options.  I maintain
-    that this command is already excessively complex, and that
-    adding functionality which can be replicated easily by
-    standard UNIX tools is unnecessary added complexity.  I
-    recommend that the man pages and documentation for this
-    option contain an example of a command line run (e.g. of rt |
-    awk) which replicates the sorting functionality provided by
-    the Web interface.
-
-    - edit <ticket> <options>
-      with no options, or with no <ticket>, produces the same
-      output as the --help option.
-      Otherwise, edits the ticket with number <ticket> as
-      indicated in the options given.  All options listed below
-      except for --help and --number can be used in conjunction
-      with one another to change many features of the same ticket
-      all at once.
-
-        -h | --help: print usage message
-
-        -s <status> | --status <status>: change the status to the
-	status listed in <status>.
-	   No <status> listed, or 1 listed it does not come from
-	   a list of approve statuses, produces an error.
-
-        -o <owner name> |  --owner <owner name>: set to the owner
-	of the ticket the owner named.
-	   Follows whatever convention is finally decided on for
-	   the requirement to steal a ticket that is owned by
-	   somebody else.  No <owner named> listed has the user
-	   who is running the rt program take the ticket.  If
-	   that user is not a valid owner, or the 1 listed does
-	   not come from a list of approve names, produces an
-	   error.
-
-        -r <requestor name> | --requestor <requestor name>: sets
-	the requestor to <requestor name>.
-	   Follows any conventions that the Web UI follows to
-	   make sure that this is a legal name.  If not legal, or
-	   left blank, produces an error.
-
-        -j <subject> | --subject <subject>:  sets the subject of
-	the ticket to <subject>.
-	   If the option is called with no argument, the result
-	   is an error.
-
-        -n <number one> <number 2> | --number <number one>
-	<number 2>: merges ticket number <number one> into ticket
-	<number 2>.
-	   If both arguments are not provided, the result is an
-	   error.
-
-        -q <queue> | --queue <queue>: set the queue to that
-	named.
-	   If <queue> is not listed, or the 1 listed does not
-	   come from a list of approve queues, produces an
-	   error.
-
-        -a <area> | --area <area>: set the area of the ticket to
-	that named.
-	   If <area> is not listed, or the 1 listed does not come
-	   from a list of approve areas, produces an error.
-
-        -c <time stamp> | --contact <time stamp>: sets the last
-	user contact field, and produces an error if the format
-	is invalid.
-	   If the argument is left blank, sets the last user
-	   contact field to now.
-
-        -p <priority> | --priority <priority>: sets the current
-	priority to the 1 listed.
-	   Produces an error if the argument is left blank.
-
-        -f <priority> | --final <priority>: sets the final
-	priority to the 1 listed.
-	   Produces an error if the arguments left blank.
-
-        -d <date due> | --datedue <date due>: sets the due date
-	to the 1 listed.
-	   Produces an error if the argument is left blank, or if
-	   the format is invalid.
-
-    - comment <options>
-      with no options, this command reads from standard input
-      until it sees EOF and appends that to the ticket as a
-      comment.
-
-        -h | --help: print usage message
-
-        -c | --comment: append as a comment.  This is the default behavior.
-
-        -r | --reply: append as a reply.
-
-        -f <filename> | --file <filename>: can be used with
-	either the comment or reply options.  Instead of reading
-	from standard input, read the text of the comment or
-	reply from the file <filename>.
-
-    - report <options>
-      this command is a place holder for reporting functionality
-      which does not yet exist.  It will probably have the
-      default behavior to select reports at the command line or
-      choose default reports from a .rtrc file.  In a future
-      version, it can output graphs in some graphical format.
-
-
-
------ End forwarded message -----
-
--- 
-jesse reed vincent -- root@eruditorum.org -- jesse@fsck.com 
-70EBAC90: 2A07 FC22 7DB4 42C1 9D71 0108 41A3 3FB3 70EB AC90
-
-"If IBM _wanted_ to make clones, we could make them cheaper and faster than
-anyone else!"  - An IBM Rep. visiting Vassar College's Comp Sci Department.
+I'm envisioning this as similar to the subversion cli, actually. 
 
diff --git a/rt/docs/design_docs/evil_plans b/rt/docs/design_docs/evil_plans
index 34b9f81a2..5b5cc58c1 100644
--- a/rt/docs/design_docs/evil_plans
+++ b/rt/docs/design_docs/evil_plans
@@ -3,8 +3,7 @@ Current planned 2.2 feature list. subject to change.
 
 Core
 
-Should	Make "Owner" a watcher type, rather than a special ticket attribute,
-	under the hood.  This wins for ACL and code consistency reasons.
+
 
 Web UI
 
@@ -67,8 +66,6 @@ nice	Scrips could apply to a list of queues, rather than just one queue or
 
 Custom fields
 
-Must	"KeywordSelects" become "Custom Fields"
-Should	String and multi-string custom fields.
 Nice	Date custom fields
 Nice	Some way to order and group custom fields.
 Nice	Default values
@@ -79,8 +76,6 @@ Nice	Make custom fields apply to an enumerated list of queues,
 
 Web infrastructure
 
-Must	Full fastcgi support.
-
 
 Installation 
 
@@ -116,7 +111,7 @@ Nice	Export full ticket metadata and history as XML
 Note: 	I currently favor the REST philosophy that GET and POST to specific,
 	defined URLs provides everything one needs to build comprehensive
 	web services without the massive added complexity of a SOAP or XML-RPC
-	framework.
+	framework. Sadly, the world doesn't agree with me
 
 
 ACLs:
diff --git a/rt/docs/design_docs/local_hacking b/rt/docs/design_docs/local_hacking
deleted file mode 100644
index c06d1126d..000000000
--- a/rt/docs/design_docs/local_hacking
+++ /dev/null
@@ -1,32 +0,0 @@
-To facilitate local hacking, RT needs a mechanism to allow site administrators
-to easily add HTML templates for the web ui and to replace sections
-of code in RT's core modules _without_ having to modify those modules
-
-We'll use several methods to achieve this goal.
-
-	Webui
-		HTML::Mason allows users to create multiple
-component hierarchies.  RT should ship with a local component root
-defined and available. This root should be configured as the "primary"
-component root.
-
-
-	Core modules
-
-	This gets a bit trickier. we want to allow people to trivially
-subclass core modules and to use those subclasses throughout the code.
-
-The way we're going to handle this is by setting up a number of subroutines
-in config.pm that look something like this:
-
-sub NewTicketObj {
-	eval "require $TicketClass";
-	my $object = new $TicketClass;
-	return ($object);
-}
-
-# This variable is used for ref type checking
-$TicketClass = "RT::Ticket";
-
-we could use an eval around the require and thus completely avoid specifying
-the object in two places. which feels like a win. but i'm worried about perf.
diff --git a/rt/docs/rt.gif b/rt/docs/rt.gif
deleted file mode 100755
index 693b06238..000000000
Binary files a/rt/docs/rt.gif and /dev/null differ
diff --git a/rt/etc/acl.Oracle b/rt/etc/acl.Oracle
index 59d35a028..c8667c031 100644
--- a/rt/etc/acl.Oracle
+++ b/rt/etc/acl.Oracle
@@ -1,9 +1,10 @@
-CREATE USER !!DB_RT_USER!! identified by !!DB_RT_PASS!!
-temporary tablespace TEMP
-default tablespace USERS
-quota unlimited on USERS;
-
-grant connect, resource to !!DB_RT_USER!!;
-
-exit;
-
+sub acl {
+return (
+"CREATE USER ${RT::DatabaseUser} identified by ${RT::DatabasePassword}".
+"temporary tablespace TEMP" .
+"default tablespace USERS" .
+"quota unlimited on USERS;" ,
+"grant connect, resource to ${RT::DatabaseUser};",
+"exit;");
+}
+1;
diff --git a/rt/etc/acl.Pg b/rt/etc/acl.Pg
index 13ac41dcf..16ea71b2d 100755
--- a/rt/etc/acl.Pg
+++ b/rt/etc/acl.Pg
@@ -1,39 +1,63 @@
-drop user !!DB_RT_USER!!;
-create user !!DB_RT_USER!! with password '!!DB_RT_PASS!!' NOCREATEDB NOCREATEUSER;
+sub acl {
+    my $dbh = shift;
 
-grant select, insert, update, delete on Groups to !!DB_RT_USER!!;
-grant select, insert, update, delete on Groups_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on ACL to !!DB_RT_USER!!;
-grant select, insert, update, delete on ACL_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Watchers to !!DB_RT_USER!!;
-grant select, insert, update, delete on Watchers_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Links to !!DB_RT_USER!!;
-grant select, insert, update, delete on Links_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Users to !!DB_RT_USER!!;
-grant select, insert, update, delete on Users_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Tickets to !!DB_RT_USER!!;
-grant select, insert, update, delete on Tickets_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on GroupMembers to !!DB_RT_USER!!;
-grant select, insert, update, delete on GroupMembers_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Queues to !!DB_RT_USER!!;
-grant select, insert, update, delete on Queues_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Transactions to !!DB_RT_USER!!;
-grant select, insert, update, delete on Transactions_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on ScripActions to !!DB_RT_USER!!;
-grant select, insert, update, delete on ScripActions_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on ScripConditions to !!DB_RT_USER!!;
-grant select, insert, update, delete on ScripConditions_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Scrips to !!DB_RT_USER!!;
-grant select, insert, update, delete on Scrips_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Attachments to !!DB_RT_USER!!;
-grant select, insert, update, delete on Attachments_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Templates to !!DB_RT_USER!!;
-grant select, insert, update, delete on Templates_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on Keywords to !!DB_RT_USER!!;
-grant select, insert, update, delete on Keywords_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on ObjectKeywords to !!DB_RT_USER!!;
-grant select, insert, update, delete on ObjectKeywords_id_seq to !!DB_RT_USER!!;
-grant select, insert, update, delete on KeywordSelects to !!DB_RT_USER!!;
-grant select, insert, update, delete on KeywordSelects_id_seq to !!DB_RT_USER!!;
+    my @acls;
 
+    my @tables = qw (
 
+      attachments_id_seq
+      Attachments
+      queues_id_seq
+      Queues
+      links_id_seq
+      Links
+      principals_id_seq
+      Principals
+      groups_id_seq
+      Groups
+      scripconditions_id_seq
+      ScripConditions
+      transactions_id_seq
+      Transactions
+      scrips_id_seq
+      Scrips
+      acl_id_seq
+      ACL
+      groupmembers_id_seq
+      GroupMembers
+      cachedgroupmembers_id_seq
+      CachedGroupMembers
+      users_id_seq
+      Users
+      tickets_id_seq
+      Tickets
+      scripactions_id_seq
+      ScripActions
+      templates_id_seq
+      Templates
+      ticketcustomfieldvalues_id_s
+      TicketCustomFieldValues
+      customfields_id_seq
+      CustomFields
+      customfieldvalues_id_seq
+      CustomFieldValues
+      sessions
+    );
+
+    # if there's already an rt_user, drop it.
+    my @row =
+      $dbh->selectrow_array( "select usename from pg_user where usename = '" . $RT::DatabaseUser."'" );
+    if ( $row[0] ) {
+        push @acls, "drop user ${RT::DatabaseUser};",;
+    }
+
+    push @acls, "create user ${RT::DatabaseUser} with password '${RT::DatabasePassword}' NOCREATEDB NOCREATEUSER;";
+    foreach my $table (@tables) {
+        push @acls,
+          "GRANT SELECT, INSERT, UPDATE, DELETE ON $table to "
+          . $RT::DatabaseUser . ";";
+
+    }
+    return (@acls);
+}
+1;
diff --git a/rt/etc/acl.mysql b/rt/etc/acl.mysql
index 7feb376f5..0ecaa3b15 100755
--- a/rt/etc/acl.mysql
+++ b/rt/etc/acl.mysql
@@ -1,4 +1,8 @@
-
-DELETE FROM user WHERE user like '!!DB_RT_USER!!';
-DELETE FROM db where db LIKE '!!DB_DATABASE!!';
-GRANT SELECT,INSERT,CREATE,INDEX,UPDATE,DELETE ON !!DB_DATABASE!!.* TO !!DB_RT_USER!!@!!DB_RT_HOST!! IDENTIFIED BY '!!DB_RT_PASS!!';
+sub acl {
+return  (
+"USE mysql;",
+"DELETE FROM user WHERE user = '${RT::DatabaseUser}';",
+"DELETE FROM db where db = '${RT::DatabaseName}';",
+"GRANT SELECT,INSERT,CREATE,INDEX,UPDATE,DELETE ON ${RT::DatabaseName}.* TO ${RT::DatabaseUser}\@${RT::DatabaseRTHost} IDENTIFIED BY '${RT::DatabasePassword}';");
+}
+1;
diff --git a/rt/etc/config.pm b/rt/etc/config.pm
deleted file mode 100755
index 52b1a0b25..000000000
--- a/rt/etc/config.pm
+++ /dev/null
@@ -1,473 +0,0 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/etc/Attic/config.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $	
-
-package RT;
-
-# {{{ Base Configuration
-
-# $rtname the string that RT will look for in mail messages to
-# figure out what ticket a new piece of mail belongs to
-
-# Your domain name is recommended, so as not to pollute the namespace.
-# once you start using a given tag, you should probably never change it. 
-# (otherwise, mail for existing tickets won't get put in the right place
-
-$rtname="example.com";  
-
-# You should set this to your organization's DNS domain. For example,
-# fsck.com or asylum.arkham.ma.us. It's used by the linking interface to 
-# guarantee that ticket URIs are unique and easy to construct.
-
-$Organization = "example.com";
-
-# $user_passwd_min defines the minimum length for user passwords. Setting
-# it to 0 disables this check
-$MinimumPasswordLength = "5";
-
-# $Timezone is used to convert times entered by users into GMT and back again
-# It should be set to a timezone recognized by your local unix box.
-$Timezone =  'US/Eastern'; 
-
-# LogDir is where RT writes its logfiles.
-# This directory should be writable by your rt group
-$LogDir = "!!RT_LOG_PATH!!";
-
-# }}}
-
-# {{{ Database Configuration
-
-# Database driver beeing used - i.e. MySQL.
-$DatabaseType="!!DB_TYPE!!";
-
-# The domain name of your database server
-# If you're running mysql and it's on localhost,
-# leave it blank for enhanced performance
-$DatabaseHost="!!DB_HOST!!";
-
-# The port that your database server is running on.  Ignored unless it's 
-# a positive integer. It's usually safe to leave this blank
-$DatabasePort="!!DB_PORT!!";
-
-
-#The name of the database user (inside the database) 
-$DatabaseUser='!!DB_RT_USER!!';
-
-# Password the DatabaseUser should use to access the database
-$DatabasePassword='!!DB_RT_PASS!!';
-
-
-# The name of the RT's database on your database server
-$DatabaseName='!!DB_DATABASE!!';
-
-# If you're using Postgres and have compiled in SSL support, 
-# set DatabaseRequireSSL to 1 to turn on SSL communication
-$DatabaseRequireSSL=undef;
-
-# }}}
-
-# {{{ Incoming mail gateway configuration
-
-
-# OwnerEmail is the address of a human who manages RT. RT will send
-# errors generated by the mail gateway to this address.  This address
-# should _not_ be an address that's managed by your RT instance.
-
-$OwnerEmail = 'root';
-
-# If $LoopsToRTOwner is defined, RT will send mail that it believes 
-# might be a loop to $RT::OwnerEmail 
-
-$LoopsToRTOwner = 1;
-
-# If $StoreLoopss is defined, RT will record messages that it believes 
-# to be part of mail loops.
-# As it does this, it will try to be careful not to send mail to the 
-# sender of these messages 
-
-$StoreLoops = undef;
-
-
-# $MaxAttachmentSize sets the maximum size (in bytes) of attachments stored
-# in the database. 
-
-# For mysql and oracle, we set this size at 10 megabytes.
-# If you're running a postgres version earlier than 7.1, you will need
-# to drop this to 8192. (8k)
-
-$MaxAttachmentSize = 10000000;  
-
-# $TruncateLongAttachments: if this is set to a non-undef value,
-# RT will truncate attachments longer than MaxAttachmentLength. 
-
-$TruncateLongAttachments = undef;
-
-
-# $DropLongAttachments: if this is set to a non-undef value,
-# RT will silently drop attachments longer than MaxAttachmentLength. 
-
-$DropLongAttachments = undef;
-
-# If $ParseNewMessageForTicketCcs is true, RT will attempt to divine
-# Ticket 'Cc' watchers from the To and Cc lines of incoming messages
-# Be forewarned that if you have _any_ addresses which forward mail to
-# RT automatically and you enable this option without modifying 
-# "IsRTAddress" below, you will get yourself into a heap of trouble.
-# And well, this is free software, so there isn't a warrantee, but
-# I disclaim all ability to help you if you do enable this without
-# modifying IsRTAddress below.
-
-$ParseNewMessageForTicketCcs = undef;
-
-# IsRTAddress is used to make sure RT doesn't add itself as a ticket CC if
-# the setting above is enabled.
-
-sub IsRTAddress {
-    my $address = shift;
-
-    # Example: the following rule would tell RT not to Cc 
-    #	"tickets@noc.example.com"
-    # return(1) if ($address =~ /^tickets\@noc.example.com$/i);
-    
-    return(undef)
-}
-
-# CanonicalizeAddress converts email addresses into canonical form.
-# it takes one email address in and returns the proper canonical
-# form. You can dump whatever your proper local config is in here
-
-sub CanonicalizeAddress {
-    my $email = shift;
-    # Example: the following rule would treat all email
-    # coming from a subdomain as coming from second level domain
-    # foo.com
-    #$email =~ s/\@(.*).foo.com/\@foo.com/;
-    return ($email)
-}
-
-# If $LookupSenderInExternalDatabase is defined, RT will attempt to
-# verify the incoming message sender with a known source, using the 
-# LookupExternalUserInfo routine below
-
-$LookupSenderInExternalDatabase = undef;
-
-# If $SenderMustExistInExternalDatabase is true, RT will refuse to
-# create non-privileged accounts for unknown users if you are using 
-# the "LookupSenderInExternalDatabase" option.
-# Instead, an error message will be mailed and RT will forward the 
-# message to $RTOwner.
-#
-# If you are not using $LookupSenderInExternalDatabase, this option
-# has no effect.
-#
-# If you define an AutoRejectRequest template, RT will use this   
-# template for the rejection message.
-
-$SenderMustExistInExternalDatabase = undef;
-
-# LookupExternalUserInfo is a site-definable method for synchronizing
-# incoming users with an external data source. 
-#
-# This routine takes a tuple of EmailAddress and FriendlyName
-# 	EmailAddress is the user's email address, ususally taken from
-#  		an email message's From: header.
-# 	FriendlyName is a freeform string, ususally taken from the "comment" 
-#		portion	of an email message's From: header.
-#
-# It returns (FoundInExternalDatabase, ParamHash);
-#
-#   FoundInExternalDatabase must  be set to 1 before return if the user was
-#   found in the external database.
-#
-#   ParamHash is a Perl parameter hash which can contain at least the following
-#   fields. These fields are used to populate RT's users database when the user 
-#   is created
-#
-# 	EmailAddress is the email address that RT should use for this user.  
-# 	Name is the 'Name' attribute RT should use for this user. 
-#   	     'Name' is used for things like access control and user lookups.
-# 	RealName is what RT should display as the user's name when displaying 
-#   	     'friendly' names
-
-sub LookupExternalUserInfo {
-  my ($EmailAddress, $RealName) = @_;
-
-  my $FoundInExternalDatabase = 1;
-  my %params = {};
-  
-  #Name is the RT username you want to use for this user.
-  $params{'Name'} = $EmailAddress;
-  $params{'EmailAddress'} = $EmailAddress;
-  $params{'RealName'} = $RealName;
-
-  # See RT's contributed code for examples.
-  # http://www.fsck.com/pub/rt/contrib/
-  return ($FoundInExternalDatabase, %params); 
-}
-
-# }}}
-
-# {{{ Outgoing mail configuration
-
-# RT is designed such that any mail which already has a ticket-id associated
-# with it will get to the right place automatically.
-
-# $CorrespondAddress and $CommentAddress are the default addresses 
-# that will be listed in From: and Reply-To: headers of correspondence
-# and comment mail tracked by RT, unless overridden by a queue-specific
-# address. 
-
-$CorrespondAddress='RT::CorrespondAddress.not.set';
-
-$CommentAddress='RT::CommentAddress.not.set';
-
-
-#Sendmail Configuration
-
-# $MailCommand defines which method RT will use to try to send mail
-# We know that 'sendmailpipe' works fairly well.
-# If 'sendmailpipe' doesn't work well for you, try 'sendmail' 
-#
-# Note that you should remove the '-t' from $SendmailArguments 
-# if you use 'sendmail rather than 'sendmailpipe'
-
-$MailCommand = 'sendmailpipe';
-
-# $SendmailArguments defines what flags to pass to $Sendmail
-# assuming you picked 'sendmail' or 'sendmailpipe' as the $MailCommand above.
-# If you picked 'sendmailpipe', you MUST add a -t flag to $SendmailArguments
-
-# These options are good for most sendmail wrappers and workalikes
-$SendmailArguments="-oi -t";
-
-# These arguments are good for sendmail brand sendmail 8 and newer
-#$SendmailArguments="-oi -t -ODeliveryMode=b -OErrorMode=m";
-
-# If you selected 'sendmailpipe' above, you MUST specify the path
-# to your sendmail binary in $SendmailPath.  
-# !! If you did not # select 'sendmailpipe' above, this has no effect!!
-$SendmailPath = "/usr/sbin/sendmail";
-
-# RT can optionally set a "Friendly" 'To:' header when sending messages to 
-# Ccs or AdminCcs (rather than having a blank 'To:' header.
-
-# This feature DOES NOT WORK WITH SENDMAIL[tm] BRAND SENDMAIL
-# If you are using sendmail, rather than postfix, qmail, exim or some other MTA,
-# you _must_ disable this option.
-
-$UseFriendlyToLine = 0;
-
-
-# }}}
-
-# {{{ Logging
-
-# Logging.  The default is to log anything except debugging
-# information to a logfile.  Check the Log::Dispatch POD for
-# information about how to get things by syslog, mail or anything
-# else, get debugging info in the log, etc. 
-
-#  It might generally make
-# sense to send error and higher by email to some administrator. 
-# If you do this, be careful that this email isn't sent to this RT instance.
-
-
-# the minimum level error that will be logged to the specific device.
-# levels from lowest to highest:  
-#  debug info notice warning error critical alert emergency 
-
-
-#  Mail loops will generate a critical log message.
-
-$LogToScreen = 'error';
-$LogToFile = 'error';
-#$LogToFileNamed = "$LogDir/rt.log.".$$.".".$<; #log to rt.log.<pid>.<user>
-$LogToFileNamed = "$LogDir/rt.log".$<; #log to rt.log.user;
-
-# }}}
-
-# {{{ Web interface configuration
-
-
-
-# Define the directory name to be used for images in rt web
-# documents.
-
-# If you're putting the web ui somewhere other than at the root of
-# your server
-# $WebPath requires a leading / but no trailing /     
-
-$WebPath = "";
-
-# This is the Scheme, server and port for constructing urls to webrt
-# $WebBaseURL doesn't need a trailing /                                                                            
-
-$WebBaseURL = "http://RT::WebBaseURL.not.configured:80";
-
-$WebURL = $WebBaseURL . $WebPath . "/";
-
-
-
-# $WebImagesURL points to the base URL where RT can find its images.
-# If you're running the FastCGI version of the RT web interface,
-# you should make RT's WebRT/html/NoAuth/images directory available on 
-# a static web server and supply that URL as $WebImagesURL.
-
-$WebImagesURL = $WebURL."NoAuth/images/";
-
-# $RTLogoURL points to the URL of the RT logo displayed in the web UI
-
-$LogoURL = $WebImagesURL."rt.jpg";
-
-# If $WebExternalAuth is defined, RT will defer to the environment's
-# REMOTE_USER variable.
-
-$WebExternalAuth = undef;
-
-# $MasonComponentRoot is where your rt instance keeps its mason html files
-# (this should be autoconfigured during 'make install' or 'make upgrade')
-
-$MasonComponentRoot = "!!MASON_HTML_PATH!!";
-
-# $MasonLocalComponentRoot is where your rt instance keeps its site-local
-# mason html files.
-# (this should be autoconfigured during 'make install' or 'make upgrade')
-
-$MasonLocalComponentRoot = "!!MASON_LOCAL_HTML_PATH!!";
-
-# $MasonDataDir Where mason keeps its datafiles
-# (this should be autoconfigured during 'make install' or 'make upgrade')
-
-$MasonDataDir = "!!MASON_DATA_PATH!!";
-
-# RT needs to put session data (for preserving state between connections
-# via the web interface)
-$MasonSessionDir = "!!MASON_SESSION_PATH!!";
-
-
-
-#This is from tobias' prototype web search UI. it may stay and it may go.
-%WebOptions=
-    (
-     # This is for putting in more user-actions at the Transaction
-     # bar.  I will typically add "Enter bug in Bugzilla" here.:
-     ExtraTransactionActions => sub { return ""; },
-
-     # Here you can modify the list view.  Be aware that the web
-     # interface might crash if TicketAttribute is wrongly set.
-     
-     QueueListingCols => 
-      [
-       { Header     => 'Id',
-	 TicketLink => 1,
-	 TicketAttribute => 'Id'
-	 },
-
-      { Header     => 'Subject',
-	 TicketAttribute => 'Subject'
-	 },
-       { Header => 'Requestor(s)',
-	 TicketAttribute => 'RequestorsAsString'
-	 },
-       { Header => 'Status',
-	 TicketAttribute => 'Status'
-	 },
-
-
-       { Header => 'Queue',
-	 TicketAttribute => 'QueueObj->Name'
-	 },
-
-
-
-       { Header => 'Told',
-	 TicketAttribute => 'ToldObj->AgeAsString'
-	 },
-
-       { Header => 'Age',
-	 TicketAttribute => 'CreatedObj->AgeAsString'
-	 },
-
-       { Header => 'Last',
-	 TicketAttribute => 'LastUpdatedObj->AgeAsString'
-	 },
-
-       # TODO: It would be nice with a link here to the Owner and all
-       # other request owned by this Owner.
-       { Header => 'Owner',
-	 TicketAttribute => 'OwnerObj->Name'
-       },
-   
- 
-       { Header     => 'Take',
-	 TicketLink => 1,
-	 Constant   => 'Take',
-	 ExtraLinks => '&Action=Take'
-	 },
-
-      ]
-     );
-
-# }}}
-
-# {{{ RT Linking Interface
-
-# $TicketBaseURI is the Base path of the URI for local tickets
-
-# You shouldn't need to touch this. it's used to link tickets both locally
-# and remotely
-
-$TicketBaseURI = "fsck.com-rt://$Organization/$rtname/ticket/";
-
-# A hash table of conversion subs to be used for transforming RT Link
-# URIs to URLs in the web interface.  If you want to use RT towards
-# locally installed databases, this is the right place to configure it.
-
-%URI2HTTP=
-    (
-      'http' => sub {return @_;},
-      'https' => sub {return @_;},
-      'ftp' => sub {return @_;},
-     'fsck.com-rt' => sub {warn "stub!";},
-     'mozilla.org-bugzilla' => sub {warn "stub!"},
-     'fsck.com-kb' => sub {warn "stub!"}
-     );
-
-
-# A hash table of subs for fetching content from an URI
-%ContentFromURI=   
-    (
-     'fsck.com-rt' => sub {warn "stub!";},
-     'mozilla.org-bugzilla' => sub {warn "stub!"},
-     'fsck.com-kb' => sub {warn "stub!"}
-     );
-
-# }}}
-
-# {{{ No User servicable parts inside 
-
-############################################
-############################################
-############################################
-#
-#  Don't edit anything below this line unless you really know
-#  what you're doing
-#
-#
-############################################
-############################################
-
-# TODO: get this stuff out of the config file and into RT.pm
-
-#Set up us the timezone
-$ENV{'TZ'} = $Timezone; #TODO: Bogus hack to deal with Date::Manip whining
-
-# Configure sendmail if we're using Entity->send('sendmail')
-if ($MailCommand eq 'sendmail') {
-    $MailParams = $SendmailArguments;
-}
-
-
-
-# }}}
-
-
-1;
diff --git a/rt/etc/schema.Oracle b/rt/etc/schema.Oracle
deleted file mode 100644
index 0c14cb39d..000000000
--- a/rt/etc/schema.Oracle
+++ /dev/null
@@ -1,287 +0,0 @@
-CREATE SEQUENCE KEYWORDSELECTS_seq;
-CREATE TABLE KeywordSelects (
-	id		NUMBER(11, 0) PRIMARY KEY,
-	Name		VARCHAR2(255),
-	Keyword		NUMBER(11, 0),
-	Single		NUMBER(11, 0),
-	Depth		NUMBER(11, 0) DEFAULT 0,
-	ObjectType	VARCHAR2(32) NOT NULL,
-	ObjectField	VARCHAR2(32),
-	ObjectValue	VARCHAR2(255),
-	Disabled		NUMBER(11, 0) DEFAULT 0
-);
-
-CREATE INDEX KeywordSelects1 ON KeywordSelects (Keyword);
-CREATE INDEX KeywordSelects2 ON 
-	KeywordSelects(ObjectType, ObjectField, ObjectValue);
-
-
-CREATE SEQUENCE ATTACHMENTS_seq;
-CREATE TABLE Attachments (
-  	id 		NUMBER(11,0) PRIMARY KEY,
-  	TransactionId	NUMBER(11,0) NOT NULL,
-  	Parent 		NUMBER(11,0), 		
-  	MessageId 	VARCHAR2(160),
-  	Subject 	VARCHAR2(255),
-  	Filename 	VARCHAR2(255),
-  	ContentType 	VARCHAR2(80),
-  	ContentEncoding 	VARCHAR2(80),
-  	Content 	CLOB,
-  	Headers 	CLOB,
-  	Creator 	NUMBER(11,0),
-  	Created 	DATE,
-  	Disabled 	NUMBER(11,0) DEFAULT 0
-);
-
-CREATE SEQUENCE QUEUES_seq;
-CREATE TABLE Queues (
- 	id 			NUMBER(11, 0) PRIMARY KEY,
-	Name 			VARCHAR2(40) NOT NULL UNIQUE,
-	Description 		VARCHAR2(120),
- 	CorrespondAddress 	VARCHAR2(40),
- 	CommentAddress 		VARCHAR2(40),
- 	InitialPriority 	NUMBER(11, 0),		
- 	FinalPriority 		NUMBER(11, 0),
- 	DefaultDueIn 		NUMBER(11, 0),
-  	Creator 		NUMBER(11, 0),
-  	Created 		DATE,
-  	LastUpdatedBy 		NUMBER(11, 0),
-  	LastUpdated		DATE,
-  	Disabled 		NUMBER(11,0) DEFAULT 0
-);
-
-CREATE SEQUENCE LINKS_seq;
-CREATE TABLE Links (
-  	id 		NUMBER(11,0) PRIMARY KEY,
-  	Base 		VARCHAR2(255),
-  	Target 		VARCHAR2(255),
-  	Type 		VARCHAR2(20) NOT NULL,
-	LocalTarget	NUMBER(11,0),
-	LocalBase	NUMBER(11,0),
-  	LastUpdatedBy 	NUMBER(11,0),
-  	LastUpdated 	DATE,
-  	Creator 	NUMBER(11,0),
-  	Created 	DATE
-);
-
-CREATE UNIQUE INDEX Links1 ON Links (Base, Target, Type);
-
-
-
-CREATE SEQUENCE GROUPS_seq;
-CREATE TABLE Groups (
-	id 		NUMBER(11,0) PRIMARY KEY,
-	Name 		VARCHAR2(16) UNIQUE,
-	Description 	VARCHAR(64),
-	Pseudo		NUMBER(11,0) DEFAULT 0
-);
-
-CREATE SEQUENCE WATCHERS_seq;
-CREATE TABLE Watchers (
-   	id 		NUMBER(11,0) PRIMARY KEY,
-   	Type 		VARCHAR2(16), 	
-   	Scope 		VARCHAR2(16),	
-   	Value 		NUMBER(11,0),	
-   	Email 		VARCHAR2(255),  
-   	Quiet 		NUMBER(11,0),	
-   	Owner 		NUMBER(11,0),	
-   	Creator 	NUMBER(11,0),
-   	Created 	DATE,
-   	LastUpdatedBy 	NUMBER(11,0),
-   	LastUpdated 	DATE
-);
-
-
-
-CREATE SEQUENCE SCRIPCONDITIONS_seq;
-CREATE TABLE ScripConditions (
- 	id 			NUMBER(11, 0) PRIMARY KEY,
-	Name 			VARCHAR2(255),
-	Description 		VARCHAR2(255),
-	ExecModule		VARCHAR2(60),
-	Argument		VARCHAR2(255),
-	ApplicableTransTypes	VARCHAR2(60),
-  	Creator 		NUMBER(11, 0),
-  	Created 		DATE,
-  	LastUpdatedBy 		NUMBER(11, 0),
-  	LastUpdated		DATE
-);
-
-
-CREATE SEQUENCE TRANSACTIONS_seq;
-CREATE TABLE Transactions (
-  	id 			NUMBER(11,0) PRIMARY KEY,
-  	EffectiveTicket 	NUMBER(11,0),
-  	Ticket 			NUMBER(11,0),
-  	TimeTaken 		NUMBER(11,0),
-  	Type 			VARCHAR2(20),
-  	Field 			VARCHAR2(40),
-  	OldValue 		VARCHAR2(255),
-  	NewValue 		VARCHAR2(255),
-  	Data 			VARCHAR2(100),
-  	Creator 		NUMBER(11,0),
-  	Created 		DATE,
-  	Disabled 		NUMBER(11,0) DEFAULT 0
-);
-
-CREATE SEQUENCE SCRIPS_seq;
-CREATE TABLE Scrips (
-  	id 		NUMBER(11,0) PRIMARY KEY,	
-	ScripCondition 	NUMBER(11,0),
-	ScripAction	NUMBER(11,0),
-	Stage		VARCHAR2(32),
-	Queue		NUMBER(11,0),
-	Template	NUMBER(11,0),
-  	Creator 	NUMBER(11,0),
-  	Created 	DATE,
-  	LastUpdatedBy 	NUMBER(11,0),
-  	LastUpdated 	DATE  
-);
-
-
-
-
-CREATE SEQUENCE ACL_seq;
-CREATE TABLE ACL (
-	id 		NUMBER(11,0) PRIMARY KEY,
-	PrincipalId 	NUMBER(11,0),
-	PrincipalType 	VARCHAR2(25),
-	RightName	VARCHAR2(25),
-	RightScope	VARCHAR2(25),
-	RightAppliesTo  NUMBER(11,0)
-);
-
-CREATE SEQUENCE GROUPMEMBERS_seq;
-CREATE TABLE GroupMembers (
-	id 		NUMBER(11,0) PRIMARY KEY,
-	GroupId 	NUMBER(11,0),
-	UserId 		NUMBER(11,0) 
-);
-
-CREATE UNIQUE INDEX GroupMembers1 ON GroupMembers (GroupId, UserId);
-
-
-CREATE SEQUENCE OBJECTKEYWORDS_seq;
-CREATE TABLE ObjectKeywords (
-  id 		NUMBER(11,0)  PRIMARY KEY,
-  Keyword	NUMBER(11,0) NOT NULL,
-  KeywordSelect NUMBER(11,0)  NOT NULL,
-  ObjectType	VARCHAR2(32) NOT NULL,
-  ObjectId	NUMBER(11,0) NOT NULL
-);
-
-CREATE UNIQUE INDEX ObjectKeywords1 ON ObjectKeywords
-	(ObjectId, ObjectType, KeywordSelect, Keyword);
-CREATE INDEX ObjectKeywords3 ON ObjectKeywords (Keyword);
-
-CREATE SEQUENCE KEYWORDS_seq;
-CREATE TABLE Keywords (
-	id		NUMBER(11, 0) PRIMARY KEY,
-	Name		VARCHAR2(255) NOT NULL,
-	Description	VARCHAR2(255),
-	Parent		NUMBER(11, 0),
-	Disabled		NUMBER(11, 0) DEFAULT 0
-);
-
-CREATE UNIQUE INDEX Keywords1 ON Keywords (Name, Parent);
-CREATE INDEX Keywords3 ON Keywords (Parent);
-
-CREATE SEQUENCE USERS_seq;
-CREATE TABLE Users (
-  	id 			NUMBER(11,0) PRIMARY KEY,
-  	Name 			VARCHAR2(120) NOT NULL UNIQUE,
-  	Password 		VARCHAR2(40),
-  	Comments 		CLOB,
-  	Signature 		CLOB,
-  	EmailAddress 		VARCHAR2(120),
-  	FreeFormContactInfo 	CLOB,
-	Organization		VARCHAR2(200),
-	Privileged		NUMBER(11,0),
-  	RealName 		VARCHAR2(120),
-  	NickName 		VARCHAR2(16),
-  	Lang 			VARCHAR2(16),
-	EmailEncoding		VARCHAR2(16),
-	WebEncoding		VARCHAR2(16),
-	ExternalContactInfoId	VARCHAR2(100),
-	ContactInfoSystem	VARCHAR2(30),
-	ExternalAuthId 		VARCHAR2(100),
-	AuthSystem		VARCHAR2(30),
-	Gecos			VARCHAR2(16),
-  	HomePhone 		VARCHAR2(30),
-  	WorkPhone 		VARCHAR2(30),
-  	MobilePhone 		VARCHAR2(30),
-  	PagerPhone 		VARCHAR2(30),
-  	Address1	 	VARCHAR2(200),
-  	Address2 		VARCHAR2(200),
-  	City 			VARCHAR2(100),
-  	State 			VARCHAR2(100),
-  	Zip 			VARCHAR2(16),
-  	Country 		VARCHAR2(50),
-  	Creator 		NUMBER(11,0),
-  	Created 		DATE,
-  	LastUpdatedBy 		NUMBER(11,0),
-  	LastUpdated 		DATE,
-	Disabled			NUMBER(11,0) DEFAULT 0
-);
-
-
-
-
-CREATE SEQUENCE TICKETS_seq;
-CREATE TABLE Tickets (
-  	id			NUMBER(11, 0) PRIMARY KEY,
-  	EffectiveId		NUMBER(11, 0),
-  	Queue 			NUMBER(11,0),
-  	Type 			VARCHAR2(16), 		
-  	IssueStatement 		NUMBER(11,0), 	
-  	Resolution 		NUMBER(11,0),		
-  	Owner 			NUMBER(11,0),		
-  	Subject			VARCHAR2(200) DEFAULT '', 
-  	InitialPriority 	NUMBER(11,0) DEFAULT 0,
-  	FinalPriority 		NUMBER(11,0) DEFAULT 0,
-  	Priority 		NUMBER(11,0) DEFAULT 0,
-  	Status 			VARCHAR2(10), 		
-  	TimeWorked 		NUMBER(11,0) DEFAULT 0,
-	TimeLeft 		NUMBER(11,0) DEFAULT 0,
-  	Told 			DATE,
-	Starts			DATE,
-	Started			DATE,
-  	Due 			DATE,
-	Resolved		DATE,
-  	LastUpdatedBy 		NUMBER(11,0),
-  	LastUpdated 		DATE,
-	Creator 		NUMBER(11,0),
-  	Created 		DATE,
-  	Disabled 		NUMBER(11,0) DEFAULT 0
-);
-
-CREATE SEQUENCE SCRIPACTIONS_seq;
-CREATE TABLE ScripActions (
-  id		NUMBER(11,0) PRIMARY KEY,
-  Name		VARCHAR2(255),
-  Description	VARCHAR2(255),
-  ExecModule	VARCHAR2(60),
-  Argument	VARCHAR2(255),
-  Creator	NUMBER(11,0),
-  Created	DATE,
-  LastUpdatedBy	NUMBER(11,0),
-  LastUpdated	DATE
-);
-
-
-CREATE SEQUENCE TEMPLATES_seq;
-CREATE TABLE Templates (
-  	id 		NUMBER(11,0) PRIMARY KEY,
-	Queue 		NUMBER(11,0) DEFAULT 0 NOT NULL,
-	Name		VARCHAR2(40) NOT NULL UNIQUE,
-	Description	VARCHAR2(120),
-	Type		VARCHAR2(16),
-  	Language 	VARCHAR2(16), 
-  	TranslationOf 	NUMBER(11,0),
-  	Content 	CLOB,
-  	LastUpdated 	DATE,
-  	LastUpdatedBy 	NUMBER(11,0),
-  	Creator 	NUMBER(11,0),
-  	Created 	DATE
-);
-
diff --git a/rt/etc/schema.Pg b/rt/etc/schema.Pg
index 21d981b4a..ba0d6fc6c 100755
--- a/rt/etc/schema.Pg
+++ b/rt/etc/schema.Pg
@@ -1,267 +1,578 @@
-CREATE TABLE KeywordSelects (
-  id serial NOT NULL  ,
-  Name varchar(255)   ,
-  Keyword integer   ,
-  Single integer   ,
-  Depth integer NOT NULL DEFAULT 0 ,
-  ObjectType varchar(32) NOT NULL  ,
-  ObjectField varchar(32)   ,
-  ObjectValue varchar(255)   ,
-  Disabled int2 NOT NULL DEFAULT 0 ,
-  PRIMARY KEY (id)
-);
-CREATE INDEX KeywordSelects1 ON KeywordSelects (Keyword);
-CREATE INDEX KeywordSelects2 ON KeywordSelects (ObjectType, ObjectField, ObjectValue);
+------------------------------------------------------------------
+-- My2Pg 1.23 translated dump
+--
+------------------------------------------------------------------
+
+BEGIN;
+
+
+
+
+--
+-- Sequences for table ATTACHMENTS
+--
+
+CREATE SEQUENCE attachments_id_seq;
+
+-- {{{ Attachments
+
 CREATE TABLE Attachments (
-  id serial NOT NULL  ,
+  id INTEGER DEFAULT nextval('attachments_id_seq'),
   TransactionId integer NOT NULL  ,
-  Parent integer   ,
-  MessageId varchar(160)   ,
-  Subject varchar(255)   ,
-  Filename varchar(255)   ,
-  ContentType varchar(80)   ,
-  ContentEncoding varchar(80)   ,
-  Content TEXT   ,
-  Headers TEXT   ,
-  Creator integer   ,
-  Created timestamp   ,
+  Parent integer NOT NULL DEFAULT 0  ,
+  MessageId varchar(160) NULL  ,
+  Subject varchar(255) NULL  ,
+  Filename varchar(255) NULL  ,
+  ContentType varchar(80) NULL  ,
+  ContentEncoding varchar(80) NULL  ,
+  Content text NULL  ,
+  Headers text NULL  ,
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
   PRIMARY KEY (id)
+
 );
-CREATE INDEX Attachments1 ON Attachments (Parent);
-CREATE INDEX Attachments2 ON Attachments (TransactionId);
-CREATE INDEX Attachments3 ON Attachments (Parent, TransactionId);
+
+CREATE INDEX Attachments1 ON Attachments (Parent) ;
+CREATE INDEX Attachments2 ON Attachments (TransactionId) ;
+CREATE INDEX Attachments3 ON Attachments (Parent, TransactionId) ;
+-- }}}
+
+-- {{{ Queues
+
+
+--
+-- Sequences for table QUEUES
+--
+
+CREATE SEQUENCE queues_id_seq;
+
 CREATE TABLE Queues (
-  id serial NOT NULL  ,
-  Name varchar(120) NOT NULL  ,
-  Description varchar(120)   ,
-  CorrespondAddress varchar(120)   ,
-  CommentAddress varchar(120)   ,
-  InitialPriority integer   ,
-  FinalPriority integer   ,
-  DefaultDueIn integer   ,
-  Creator integer   ,
-  Created timestamp   ,
-  LastUpdatedBy integer   ,
-  LastUpdated timestamp   ,
+  id INTEGER DEFAULT nextval('queues_id_seq'),
+  Name varchar(200) NOT NULL  ,
+  Description varchar(255) NULL  ,
+  CorrespondAddress varchar(120) NULL  ,
+  CommentAddress varchar(120) NULL  ,
+  InitialPriority integer NOT NULL DEFAULT 0  ,
+  FinalPriority integer NOT NULL DEFAULT 0  ,
+  DefaultDueIn integer NOT NULL DEFAULT 0  ,
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
   Disabled int2 NOT NULL DEFAULT 0 ,
   PRIMARY KEY (id)
+
 );
-CREATE UNIQUE INDEX Queues1 ON Queues (Name);
+CREATE UNIQUE INDEX Queues1 ON Queues (Name) ;
+
+-- }}}
+
+-- {{{ Links
+
+
+
+--
+-- Sequences for table LINKS
+--
+
+CREATE SEQUENCE links_id_seq;
+
 CREATE TABLE Links (
-  id serial NOT NULL  ,
-  Base varchar(240)   ,
-  Target varchar(240)   ,
+  id INTEGER DEFAULT nextval('links_id_seq'),
+  Base varchar(240) NULL  ,
+  Target varchar(240) NULL  ,
   Type varchar(20) NOT NULL  ,
-  LocalTarget integer   ,
-  LocalBase integer   ,
-  LastUpdatedBy integer   ,
-  LastUpdated timestamp   ,
-  Creator integer   ,
-  Created timestamp   ,
+  LocalTarget integer NOT NULL DEFAULT 0  ,
+  LocalBase integer NOT NULL DEFAULT 0  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
   PRIMARY KEY (id)
+
 );
-CREATE UNIQUE INDEX Links1 ON Links (Base, Target, Type);
-CREATE TABLE Groups (
-  id serial NOT NULL  ,
-  Name varchar(16)   ,
-  Description varchar(64)   ,
-  Pseudo integer NOT NULL DEFAULT 0 ,
-  PRIMARY KEY (id)
+CREATE UNIQUE INDEX Links1 ON Links (Base, Target, Type) ;
+
+-- }}}
+
+-- {{{ Principals
+
+
+
+--
+-- Sequences for table PRINCIPALS
+--
+
+CREATE SEQUENCE principals_id_seq;
+
+CREATE TABLE Principals (
+        id INTEGER DEFAULT nextval('principals_id_seq') not null,
+        PrincipalType VARCHAR(16) not null,
+        ObjectId integer, 
+        Disabled int2 NOT NULL DEFAULT 0 ,
+        PRIMARY KEY (id)
+
 );
-CREATE UNIQUE INDEX Groups1 ON Groups (Name);
-CREATE TABLE Watchers (
-  id serial NOT NULL  ,
-  Type varchar(16)   ,
-  Scope varchar(16)   ,
-  Value integer   ,
-  Email varchar(255)   ,
-  Quiet integer   ,
-  Owner integer   ,
-  Creator integer   ,
-  Created timestamp   ,
-  LastUpdatedBy integer   ,
-  LastUpdated timestamp   ,
+
+CREATE INDEX Principals2 ON Principals (ObjectId);
+
+
+-- }}}
+
+-- {{{ Groups
+
+
+
+--
+-- Sequences for table GROUPS
+--
+
+CREATE SEQUENCE groups_id_seq;
+
+CREATE TABLE Groups (
+  id INTEGER DEFAULT nextval('groups_id_seq'),
+  Name varchar(200) NULL  ,
+  Description varchar(255) NULL  ,
+  Domain varchar(64),
+  Type varchar(64),
+  Instance varchar(64),
   PRIMARY KEY (id)
+
 );
-CREATE INDEX Watchers1 ON Watchers (Scope, Value, Type, Owner);
+CREATE UNIQUE INDEX Groups1 ON Groups (Domain,Instance,Type,id, Name);
+CREATE INDEX Groups2 On Groups  (Type, Instance, Domain);
+
+
+-- }}}
+
+-- {{{ ScripConditions
+
+
+
+--
+-- Sequences for table SCRIPCONDITIONS
+--
+
+CREATE SEQUENCE scripconditions_id_seq;
+
 CREATE TABLE ScripConditions (
-  id serial NOT NULL  ,
-  Name varchar(255)   ,
-  Description varchar(255)   ,
-  ExecModule varchar(60)   ,
-  Argument varchar(255)   ,
-  ApplicableTransTypes varchar(60)   ,
-  Creator integer   ,
-  Created timestamp   ,
-  LastUpdatedBy integer   ,
-  LastUpdated timestamp   ,
+  id INTEGER DEFAULT nextval('scripconditions_id_seq'),
+  Name varchar(200) NULL  ,
+  Description varchar(255) NULL  ,
+  ExecModule varchar(60) NULL  ,
+  Argument varchar(255) NULL  ,
+  ApplicableTransTypes varchar(60) NULL  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
   PRIMARY KEY (id)
+
 );
+
+-- }}}
+
+-- {{{ Transactions
+
+
+--
+-- Sequences for table TRANSACTIONS
+--
+
+CREATE SEQUENCE transactions_id_seq;
+
 CREATE TABLE Transactions (
-  id serial NOT NULL  ,
-  EffectiveTicket integer   ,
-  Ticket integer   ,
-  TimeTaken integer   ,
-  Type varchar(20)   ,
-  Field varchar(40)   ,
-  OldValue varchar(255)   ,
-  NewValue varchar(255)   ,
-  Data varchar(100)   ,
-  Creator integer   ,
-  Created timestamp   ,
+  id INTEGER DEFAULT nextval('transactions_id_seq'),
+  EffectiveTicket integer NOT NULL DEFAULT 0  ,
+  Ticket integer NOT NULL DEFAULT 0  ,
+  TimeTaken integer NOT NULL DEFAULT 0  ,
+  Type varchar(20) NULL  ,
+  Field varchar(40) NULL  ,
+  OldValue varchar(255) NULL  ,
+  NewValue varchar(255) NULL  ,
+  Data varchar(100) NULL  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
   PRIMARY KEY (id)
+
 );
 CREATE INDEX Transactions1 ON Transactions (Ticket);
 CREATE INDEX Transactions2 ON Transactions (EffectiveTicket);
+
+-- }}}
+
+-- {{{ Scrips 
+
+
+
+--
+-- Sequences for table SCRIPS
+--
+
+CREATE SEQUENCE scrips_id_seq;
+
 CREATE TABLE Scrips (
-  id serial NOT NULL  ,
-  ScripCondition integer   ,
-  ScripAction integer   ,
-  Stage varchar(32)   ,
-  Queue integer   ,
-  Template integer   ,
-  Creator integer   ,
-  Created timestamp   ,
-  LastUpdatedBy integer   ,
-  LastUpdated timestamp   ,
+  id INTEGER DEFAULT nextval('scrips_id_seq'),
+  Description varchar(255),
+  ScripCondition integer NOT NULL DEFAULT 0  ,
+  ScripAction integer NOT NULL DEFAULT 0  ,
+  ConditionRules text NULL  ,
+  ActionRules text NULL  ,
+  CustomIsApplicableCode text NULL  ,
+  CustomPrepareCode text NULL  ,
+  CustomCommitCode text NULL  ,
+  Stage varchar(32) NULL  ,
+  Queue integer NOT NULL DEFAULT 0  ,
+  Template integer NOT NULL DEFAULT 0  ,
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
   PRIMARY KEY (id)
+
 );
+
+-- }}}
+
+-- {{{ ACL
+
+
+--
+-- Sequences for table ACL
+--
+
+CREATE SEQUENCE acl_id_seq;
+
 CREATE TABLE ACL (
-  id serial NOT NULL  ,
-  PrincipalId integer   ,
-  PrincipalType varchar(25)   ,
-  RightName varchar(25)   ,
-  RightScope varchar(25)   ,
-  RightAppliesTo integer   ,
+  id INTEGER DEFAULT nextval('acl_id_seq'),
+  PrincipalType varchar(25) NOT NULL, 
+
+  PrincipalId integer NOT NULL  , 
+  RightName varchar(25) NOT NULL  ,
+  ObjectType varchar(25) NOT NULL  ,
+  ObjectId integer NOT NULL DEFAULT 0,
+  DelegatedBy integer NOT NULL DEFAULT 0, 
+  DelegatedFrom integer NOT NULL DEFAULT 0, 
   PRIMARY KEY (id)
+
 );
-CREATE INDEX ACL1 ON ACL (RightScope, PrincipalId);
-CREATE INDEX ACL2 ON ACL (RightScope, RightAppliesTo, RightName, PrincipalType, PrincipalId);
+
+CREATE INDEX  ACL1 on ACL(RightName, ObjectType, ObjectId,PrincipalType,PrincipalId);
+
+
+-- }}}
+
+-- {{{ GroupMembers 
+
+
+
+--
+-- Sequences for table GROUPMEMBERS
+--
+
+CREATE SEQUENCE groupmembers_id_seq;
+
 CREATE TABLE GroupMembers (
-  id serial NOT NULL  ,
-  GroupId integer   ,
-  UserId integer   ,
-  PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX GroupMembers1 ON GroupMembers (GroupId, UserId);
-CREATE TABLE ObjectKeywords (
-  id serial NOT NULL  ,
-  Keyword integer NOT NULL  ,
-  KeywordSelect integer NOT NULL  ,
-  ObjectType varchar(32) NOT NULL  ,
-  ObjectId integer NOT NULL  ,
+  id INTEGER DEFAULT nextval('groupmembers_id_seq'),
+  GroupId integer NOT NULL DEFAULT 0,
+  MemberId integer NOT NULL DEFAULT 0,  
   PRIMARY KEY (id)
+
 );
-CREATE UNIQUE INDEX ObjectKeywords1 ON ObjectKeywords (ObjectId, ObjectType, KeywordSelect, Keyword);
-CREATE INDEX ObjectKeywords2 ON ObjectKeywords (ObjectId, ObjectType);
-CREATE INDEX ObjectKeywords3 ON ObjectKeywords (Keyword);
-CREATE TABLE Keywords (
-  id serial NOT NULL  ,
-  Name varchar(255) NOT NULL  ,
-  Description varchar(255)   ,
-  Parent integer   ,
-  Disabled int2 NOT NULL DEFAULT 0 ,
-  PRIMARY KEY (id)
+
+-- }}}
+
+-- {{{ GroupMembersCache
+
+
+
+--
+-- Sequences for table CACHEDGROUPMEMBERS
+--
+
+CREATE SEQUENCE cachedgroupmembers_id_seq;
+
+CREATE TABLE CachedGroupMembers (
+        id int DEFAULT nextval('cachedgroupmembers_id_seq'),
+        GroupId int, 
+        MemberId int, 
+        Via int, 
+        ImmediateParentId int, 
+        Disabled int2 NOT NULL DEFAULT 0 , 
+        PRIMARY KEY (id)
+
 );
-CREATE UNIQUE INDEX Keywords1 ON Keywords (Name, Parent);
-CREATE INDEX Keywords2 ON Keywords (Name);
-CREATE INDEX Keywords3 ON Keywords (Parent);
+
+CREATE INDEX CachedGroupMembers2 on CachedGroupMembers (MemberId);
+CREATE INDEX CachedGroupMembers3 on CachedGroupMembers (GroupId);
+CREATE INDEX DisGrouMem  on CachedGroupMembers (GroupId,MemberId,Disabled); 
+
+-- }}}
+
+-- {{{ Users
+
+
+
+--
+-- Sequences for table USERS
+--
+
+CREATE SEQUENCE users_id_seq;
+
 CREATE TABLE Users (
-  id serial NOT NULL  ,
-  Name varchar(120) NOT NULL  ,
-  Password varchar(40)   ,
-  Comments TEXT   ,
-  Signature TEXT   ,
-  EmailAddress varchar(120)   ,
-  FreeformContactInfo TEXT   ,
-  Organization varchar(200)   ,
-  Privileged integer   ,
-  RealName varchar(120)   ,
-  Nickname varchar(16)   ,
-  Lang varchar(16)   ,
-  EmailEncoding varchar(16)   ,
-  WebEncoding varchar(16)   ,
-  ExternalContactInfoId varchar(100)   ,
-  ContactInfoSystem varchar(30)   ,
-  ExternalAuthId varchar(100)   ,
-  AuthSystem varchar(30)   ,
-  Gecos varchar(16)   ,
-  HomePhone varchar(30)   ,
-  WorkPhone varchar(30)   ,
-  MobilePhone varchar(30)   ,
-  PagerPhone varchar(30)   ,
-  Address1 varchar(200)   ,
-  Address2 varchar(200)   ,
-  City varchar(100)   ,
-  State varchar(100)   ,
-  Zip varchar(16)   ,
-  Country varchar(50)   ,
-  Creator integer   ,
-  Created timestamp   ,
-  LastUpdatedBy integer   ,
-  LastUpdated timestamp   ,
-  Disabled int2 NOT NULL DEFAULT 0 ,
+  id INTEGER DEFAULT nextval('users_id_seq'),
+  Name varchar(200) NOT NULL  ,
+  Password varchar(40) NULL  ,
+  Comments text NULL  ,
+  Signature text NULL  ,
+  EmailAddress varchar(120) NULL  ,
+  FreeformContactInfo text NULL  ,
+  Organization varchar(200) NULL  ,
+  RealName varchar(120) NULL  ,
+  NickName varchar(16) NULL  ,
+  Lang varchar(16) NULL  ,
+  EmailEncoding varchar(16) NULL  ,
+  WebEncoding varchar(16) NULL  ,
+  ExternalContactInfoId varchar(100) NULL  ,
+  ContactInfoSystem varchar(30) NULL  ,
+  ExternalAuthId varchar(100) NULL  ,
+  AuthSystem varchar(30) NULL  ,
+  Gecos varchar(16) NULL  ,
+  HomePhone varchar(30) NULL  ,
+  WorkPhone varchar(30) NULL  ,
+  MobilePhone varchar(30) NULL  ,
+  PagerPhone varchar(30) NULL  ,
+  Address1 varchar(200) NULL  ,
+  Address2 varchar(200) NULL  ,
+  City varchar(100) NULL  ,
+  State varchar(100) NULL  ,
+  Zip varchar(16) NULL  ,
+  Country varchar(50) NULL  ,
+  Timezone varchar(50) NULL  ,
+  PGPKey text NULL,
+
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
   PRIMARY KEY (id)
+
 );
-CREATE UNIQUE INDEX Users1 ON Users (Name);
+
+
+CREATE UNIQUE INDEX Users1 ON Users (Name) ;
+CREATE INDEX Users2 ON Users (Name);
 CREATE INDEX Users3 ON Users (id, EmailAddress);
 CREATE INDEX Users4 ON Users (EmailAddress);
+
+
+-- }}}
+
+-- {{{ Tickets
+
+
+
+--
+-- Sequences for table TICKETS
+--
+
+CREATE SEQUENCE tickets_id_seq;
+
 CREATE TABLE Tickets (
-  id serial NOT NULL  ,
-  EffectiveId integer   ,
-  Queue integer   ,
-  Type varchar(16)   ,
-  IssueStatement integer   ,
-  Resolution integer   ,
-  Owner integer   ,
-  Subject varchar(200)  DEFAULT '[no subject]' ,
-  InitialPriority integer   ,
-  FinalPriority integer   ,
-  Priority integer   ,
-  Status varchar(10)   ,
-  TimeWorked integer   ,
-  TimeLeft integer   ,
-  Told timestamp   ,
-  Starts timestamp   ,
-  Started timestamp   ,
-  Due timestamp   ,
-  Resolved timestamp   ,
-  LastUpdatedBy integer   ,
-  LastUpdated timestamp   ,
-  Creator integer   ,
-  Created timestamp   ,
+  id INTEGER DEFAULT nextval('tickets_id_seq'),
+  EffectiveId integer NOT NULL DEFAULT 0  ,
+  Queue integer NOT NULL DEFAULT 0  ,
+  Type varchar(16) NULL  ,
+  IssueStatement integer NOT NULL DEFAULT 0  ,
+  Resolution integer NOT NULL DEFAULT 0  ,
+  Owner integer NOT NULL DEFAULT 0  ,
+  Subject varchar(200) NULL DEFAULT '[no subject]' ,
+  InitialPriority integer NOT NULL DEFAULT 0  ,
+  FinalPriority integer NOT NULL DEFAULT 0  ,
+  Priority integer NOT NULL DEFAULT 0  ,
+  TimeEstimated integer NOT NULL DEFAULT 0  ,
+  TimeWorked integer NOT NULL DEFAULT 0  ,
+  Status varchar(10) NULL  ,
+  TimeLeft integer NOT NULL DEFAULT 0  ,
+  Told TIMESTAMP NULL  ,
+  Starts TIMESTAMP NULL  ,
+  Started TIMESTAMP NULL  ,
+  Due TIMESTAMP NULL  ,
+  Resolved TIMESTAMP NULL  ,
+
+
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
   Disabled int2 NOT NULL DEFAULT 0 ,
   PRIMARY KEY (id)
+
 );
-CREATE INDEX Tickets1 ON Tickets (Queue, Status);
-CREATE INDEX Tickets2 ON Tickets (Owner);
-CREATE INDEX Tickets3 ON Tickets (EffectiveId);
-CREATE INDEX Tickets4 ON Tickets (id, Status);
-CREATE INDEX Tickets5 ON Tickets (id, EffectiveId);
+
+CREATE INDEX Tickets1 ON Tickets (Queue, Status) ;
+CREATE INDEX Tickets2 ON Tickets (Owner) ;
+CREATE INDEX Tickets3 ON Tickets (EffectiveId) ;
+CREATE INDEX Tickets4 ON Tickets (id, Status) ;
+CREATE INDEX Tickets5 ON Tickets (id, EffectiveId) ;
+
+-- }}}
+
+-- {{{ ScripActions
+
+
+
+--
+-- Sequences for table SCRIPACTIONS
+--
+
+CREATE SEQUENCE scripactions_id_seq;
+
 CREATE TABLE ScripActions (
-  id serial NOT NULL  ,
-  Name varchar(255)   ,
-  Description varchar(255)   ,
-  ExecModule varchar(60)   ,
-  Argument varchar(255)   ,
-  Creator integer   ,
-  Created timestamp   ,
-  LastUpdatedBy integer   ,
-  LastUpdated timestamp   ,
+  id INTEGER DEFAULT nextval('scripactions_id_seq'),
+  Name varchar(200) NULL  ,
+  Description varchar(255) NULL  ,
+  ExecModule varchar(60) NULL  ,
+  Argument varchar(255) NULL  ,
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
   PRIMARY KEY (id)
+
 );
+
+-- }}}
+
+-- {{{ Templates
+
+
+
+--
+-- Sequences for table TEMPLATES
+--
+
+CREATE SEQUENCE templates_id_seq;
+
 CREATE TABLE Templates (
-  id serial NOT NULL  ,
+  id INTEGER DEFAULT nextval('templates_id_seq'),
+  Queue integer NOT NULL DEFAULT 0 ,
+  Name varchar(200) NOT NULL  ,
+  Description varchar(255) NULL  ,
+  Type varchar(16) NULL  ,
+  Language varchar(16) NULL  ,
+  TranslationOf integer NOT NULL DEFAULT 0  ,
+  Content text NULL  ,
+  LastUpdated TIMESTAMP NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
+  PRIMARY KEY (id)
+
+);
+
+-- }}}
+
+-- {{{ TicketCustomFieldValues 
+
+
+
+--
+-- Sequences for table TICKETCUSTOMFIELDVALUES
+--
+
+CREATE SEQUENCE ticketcustomfieldvalues_id_s;
+
+CREATE TABLE TicketCustomFieldValues (
+  id INTEGER DEFAULT nextval('ticketcustomfieldvalues_id_s'),
+  Ticket int NOT NULL  ,
+  CustomField int NOT NULL  ,
+  Content varchar(255) NULL  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
+  PRIMARY KEY (id)
+
+);
+
+-- }}}
+
+-- {{{ CustomFields
+
+
+
+--
+-- Sequences for table CUSTOMFIELDS
+--
+
+CREATE SEQUENCE customfields_id_seq;
+
+CREATE TABLE CustomFields (
+  id INTEGER DEFAULT nextval('customfields_id_seq'),
+  Name varchar(200) NULL  ,
+  Type varchar(200) NULL  ,
   Queue integer NOT NULL DEFAULT 0 ,
-  Name varchar(40) NOT NULL  ,
-  Description varchar(120)   ,
-  Type varchar(16)   ,
-  Language varchar(16)   ,
-  TranslationOf integer   ,
-  Content TEXT   ,
-  LastUpdated timestamp   ,
-  LastUpdatedBy integer   ,
-  Creator integer   ,
-  Created timestamp   ,
+  Description varchar(255) NULL  ,
+  SortOrder integer NOT NULL DEFAULT 0  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
+  Disabled int2 NOT NULL DEFAULT 0 ,
   PRIMARY KEY (id)
+
+);
+
+-- }}}
+
+-- {{{ CustomFieldValues 
+
+
+
+--
+-- Sequences for table CUSTOMFIELDVALUES
+--
+
+CREATE SEQUENCE customfieldvalues_id_seq;
+
+CREATE TABLE CustomFieldValues (
+  id INTEGER DEFAULT nextval('customfieldvalues_id_seq'),
+  CustomField int NOT NULL  ,
+  Name varchar(200) NULL  ,
+  Description varchar(255) NULL  ,
+  SortOrder integer NOT NULL DEFAULT 0  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created TIMESTAMP NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated TIMESTAMP NULL  ,
+  PRIMARY KEY (id)
+
+);
+
+-- }}}
+
+-- {{{ Sessions
+
+-- sessions is used by Apache::Session to keep sessions in the database.
+-- We should have a reaper script somewhere.
+
+CREATE TABLE sessions (
+    id char(32) NOT NULL,
+    a_session bytea,
+    LastUpdated TIMESTAMP not null default current_timestamp,
+    PRIMARY KEY (id)
+
 );
+
+-- }}}
+
+
+
+COMMIT;
diff --git a/rt/etc/schema.mysql b/rt/etc/schema.mysql
index 7e715c201..46f8ec562 100755
--- a/rt/etc/schema.mysql
+++ b/rt/etc/schema.mysql
@@ -1,21 +1,9 @@
-CREATE TABLE KeywordSelects (
-  id INTEGER NOT NULL  AUTO_INCREMENT,
-  Name varchar(255) NULL  ,
-  Keyword integer NULL  ,
-  Single integer NULL  ,
-  Depth integer NOT NULL DEFAULT 0 ,
-  ObjectType varchar(32) NOT NULL  ,
-  ObjectField varchar(32) NULL  ,
-  ObjectValue varchar(255) NULL  ,
-  Disabled int2 NOT NULL DEFAULT 0 ,
-  PRIMARY KEY (id)
-);
-CREATE INDEX KeywordSelects1 ON KeywordSelects (Keyword);
-CREATE INDEX KeywordSelects2 ON KeywordSelects (ObjectType, ObjectField, ObjectValue);
+# {{{ Attachments
+
 CREATE TABLE Attachments (
   id INTEGER NOT NULL  AUTO_INCREMENT,
   TransactionId integer NOT NULL  ,
-  Parent integer NULL  ,
+  Parent integer NOT NULL DEFAULT 0  ,
   MessageId varchar(160) NULL  ,
   Subject varchar(255) NULL  ,
   Filename varchar(255) NULL  ,
@@ -23,161 +11,222 @@ CREATE TABLE Attachments (
   ContentEncoding varchar(80) NULL  ,
   Content LONGTEXT NULL  ,
   Headers LONGTEXT NULL  ,
-  Creator integer NULL  ,
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
   PRIMARY KEY (id)
-);
-CREATE INDEX Attachments1 ON Attachments (Parent);
-CREATE INDEX Attachments2 ON Attachments (TransactionId);
-CREATE INDEX Attachments3 ON Attachments (Parent, TransactionId);
+) TYPE=InnoDB;
+
+CREATE INDEX Attachments1 ON Attachments (Parent) ;
+CREATE INDEX Attachments2 ON Attachments (TransactionId) ;
+CREATE INDEX Attachments3 ON Attachments (Parent, TransactionId) ;
+# }}}
+
+# {{{ Queues
 CREATE TABLE Queues (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  Name varchar(120) NOT NULL  ,
-  Description varchar(120) NULL  ,
+  Name varchar(200) NOT NULL  ,
+  Description varchar(255) NULL  ,
   CorrespondAddress varchar(120) NULL  ,
   CommentAddress varchar(120) NULL  ,
-  InitialPriority integer NULL  ,
-  FinalPriority integer NULL  ,
-  DefaultDueIn integer NULL  ,
-  Creator integer NULL  ,
+  InitialPriority integer NOT NULL DEFAULT 0  ,
+  FinalPriority integer NOT NULL DEFAULT 0  ,
+  DefaultDueIn integer NOT NULL DEFAULT 0  ,
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
-  LastUpdatedBy integer NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated DATETIME NULL  ,
   Disabled int2 NOT NULL DEFAULT 0 ,
   PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX Queues1 ON Queues (Name);
+) TYPE=InnoDB;
+CREATE UNIQUE INDEX Queues1 ON Queues (Name) ;
+CREATE INDEX Queues2 ON Queues (Disabled) ;
+
+# }}}
+
+# {{{ Links
+
 CREATE TABLE Links (
   id INTEGER NOT NULL  AUTO_INCREMENT,
   Base varchar(240) NULL  ,
   Target varchar(240) NULL  ,
   Type varchar(20) NOT NULL  ,
-  LocalTarget integer NULL  ,
-  LocalBase integer NULL  ,
-  LastUpdatedBy integer NULL  ,
+  LocalTarget integer NOT NULL DEFAULT 0  ,
+  LocalBase integer NOT NULL DEFAULT 0  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated DATETIME NULL  ,
-  Creator integer NULL  ,
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
   PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX Links1 ON Links (Base, Target, Type);
+) TYPE=InnoDB;
+
+CREATE UNIQUE INDEX Links1 ON Links (Base, Target, Type) ;
+CREATE INDEX Links2 ON Links (Base,  Type) ;
+CREATE INDEX Links3 ON Links (Target,  Type) ;
+
+# }}}
+
+# {{{ Principals
+
+CREATE TABLE Principals (
+        id INTEGER  AUTO_INCREMENT not null,
+        PrincipalType VARCHAR(16) not null,
+        ObjectId integer, # foreign key to Users or Groups, depending
+        Disabled int2 NOT NULL DEFAULT 0 ,
+        PRIMARY KEY (id)
+) TYPE=InnoDB;
+
+CREATE INDEX Principals2 ON Principals (ObjectId);
+
+# }}}
+
+# {{{ Groups
+
 CREATE TABLE Groups (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  Name varchar(16) NULL  ,
-  Description varchar(64) NULL  ,
-  Pseudo integer NOT NULL DEFAULT 0 ,
-  PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX Groups1 ON Groups (Name);
-CREATE TABLE Watchers (
-  id INTEGER NOT NULL  AUTO_INCREMENT,
-  Type varchar(16) NULL  ,
-  Scope varchar(16) NULL  ,
-  Value integer NULL  ,
-  Email varchar(255) NULL  ,
-  Quiet integer NULL  ,
-  Owner integer NULL  ,
-  Creator integer NULL  ,
-  Created DATETIME NULL  ,
-  LastUpdatedBy integer NULL  ,
-  LastUpdated DATETIME NULL  ,
+  Name varchar(200) NULL  ,
+  Description varchar(255) NULL  ,
+  Domain varchar(64),
+  Type varchar(64),
+  Instance varchar(64),
   PRIMARY KEY (id)
-);
-CREATE INDEX Watchers1 ON Watchers (Scope, Value, Type, Owner);
+) TYPE=InnoDB;
+
+CREATE INDEX Groups1 ON Groups (Domain,Instance,Type,id);
+CREATE INDEX Groups2 On Groups  (Type, Instance, Domain);   
+
+# }}}
+
+# {{{ ScripConditions
+
 CREATE TABLE ScripConditions (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  Name varchar(255) NULL  ,
+  Name varchar(200) NULL  ,
   Description varchar(255) NULL  ,
   ExecModule varchar(60) NULL  ,
   Argument varchar(255) NULL  ,
   ApplicableTransTypes varchar(60) NULL  ,
-  Creator integer NULL  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
-  LastUpdatedBy integer NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated DATETIME NULL  ,
   PRIMARY KEY (id)
-);
+) TYPE=InnoDB;
+
+# }}}
+
+# {{{ Transactions
 CREATE TABLE Transactions (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  EffectiveTicket integer NULL  ,
-  Ticket integer NULL  ,
-  TimeTaken integer NULL  ,
+  EffectiveTicket integer NOT NULL DEFAULT 0  ,
+  Ticket integer NOT NULL DEFAULT 0  ,
+  TimeTaken integer NOT NULL DEFAULT 0  ,
   Type varchar(20) NULL  ,
   Field varchar(40) NULL  ,
   OldValue varchar(255) NULL  ,
   NewValue varchar(255) NULL  ,
   Data varchar(100) NULL  ,
-  Creator integer NULL  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
   PRIMARY KEY (id)
-);
+) TYPE=InnoDB;
 CREATE INDEX Transactions1 ON Transactions (Ticket);
 CREATE INDEX Transactions2 ON Transactions (EffectiveTicket);
+
+# }}}
+
+# {{{ Scrips 
+
 CREATE TABLE Scrips (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  ScripCondition integer NULL  ,
-  ScripAction integer NULL  ,
+  Description varchar(255),
+  ScripCondition integer NOT NULL DEFAULT 0  ,
+  ScripAction integer NOT NULL DEFAULT 0  ,
+  ConditionRules text NULL  ,
+  ActionRules text NULL  ,
+  CustomIsApplicableCode text NULL  ,
+  CustomPrepareCode text NULL  ,
+  CustomCommitCode text NULL  ,
   Stage varchar(32) NULL  ,
-  Queue integer NULL  ,
-  Template integer NULL  ,
-  Creator integer NULL  ,
+  Queue integer NOT NULL DEFAULT 0  ,
+  Template integer NOT NULL DEFAULT 0  ,
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
-  LastUpdatedBy integer NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated DATETIME NULL  ,
   PRIMARY KEY (id)
-);
+) TYPE=InnoDB;
+
+# }}}
+
+# {{{ ACL
 CREATE TABLE ACL (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  PrincipalId integer NULL  ,
-  PrincipalType varchar(25) NULL  ,
-  RightName varchar(25) NULL  ,
-  RightScope varchar(25) NULL  ,
-  RightAppliesTo integer NULL  ,
+  PrincipalType varchar(25) NOT NULL, #"User" "Group", "Owner", "Cc" "AdminCc", "Requestor", "Requestor" 
+
+  PrincipalId integer NOT NULL  , #Foreign key to principals
+  RightName varchar(25) NOT NULL  ,
+  ObjectType varchar(25) NOT NULL  ,
+  ObjectId integer NOT NULL default 0,
+  DelegatedBy integer NOT NULL default 0, #foreign key to principals with a userid
+  DelegatedFrom integer NOT NULL default 0, #foreign key to ACL
   PRIMARY KEY (id)
-);
-CREATE INDEX ACL1 ON ACL (RightScope, PrincipalId);
-CREATE INDEX ACL2 ON ACL (RightScope, RightAppliesTo, RightName, PrincipalType, PrincipalId);
+) TYPE=InnoDB;
+
+CREATE INDEX  ACL1 on ACL(RightName, ObjectType, ObjectId,PrincipalType,PrincipalId);
+
+# }}}
+
+# {{{ GroupMembers 
+
 CREATE TABLE GroupMembers (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  GroupId integer NULL  ,
-  UserId integer NULL  ,
-  PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX GroupMembers1 ON GroupMembers (GroupId, UserId);
-CREATE TABLE ObjectKeywords (
-  id INTEGER NOT NULL  AUTO_INCREMENT,
-  Keyword integer NOT NULL  ,
-  KeywordSelect integer NOT NULL  ,
-  ObjectType varchar(32) NOT NULL  ,
-  ObjectId integer NOT NULL  ,
-  PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX ObjectKeywords1 ON ObjectKeywords (ObjectId, ObjectType, KeywordSelect, Keyword);
-CREATE INDEX ObjectKeywords2 ON ObjectKeywords (ObjectId, ObjectType);
-CREATE INDEX ObjectKeywords3 ON ObjectKeywords (Keyword);
-CREATE TABLE Keywords (
-  id INTEGER NOT NULL  AUTO_INCREMENT,
-  Name varchar(255) NOT NULL  ,
-  Description varchar(255) NULL  ,
-  Parent integer NULL  ,
-  Disabled int2 NOT NULL DEFAULT 0 ,
+  GroupId integer NOT NULL DEFAULT 0,
+  MemberId integer NOT NULL DEFAULT 0,  #Foreign key to Principals
   PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX Keywords1 ON Keywords (Name, Parent);
-CREATE INDEX Keywords2 ON Keywords (Name);
-CREATE INDEX Keywords3 ON Keywords (Parent);
+) TYPE=InnoDB;
+CREATE UNIQUE INDEX GroupMembers1 on GroupMembers (GroupId, MemberId);
+
+
+# }}}
+
+# {{{ GroupMembersCache
+
+create table CachedGroupMembers (
+        id int auto_increment,
+        GroupId int, # foreign key to Principals
+        MemberId int, # foreign key to Principals
+        Via int, #foreign key to CachedGroupMembers. (may point to $self->id)
+        ImmediateParentId int, #foreign key to prinicpals.         
+                               # this points to the group that the member is
+                               # a member of, for ease of deletes.
+        Disabled int2 NOT NULL DEFAULT 0 , # if this cached group member is a member of this group by way of a disabled
+                                           # group or this group is disabled, this will be set to 1
+                                           # this allows us to not find members of disabled subgroups when listing off
+                                           # group members recursively.
+                                           # Also, this allows us to have the ACL system elide members of disabled groups
+        PRIMARY KEY (id)
+) TYPE=InnoDB;
+
+CREATE INDEX DisGrouMem  on CachedGroupMembers (GroupId,MemberId,Disabled);
+CREATE INDEX GrouMem  on CachedGroupMembers (GroupId,MemberId);
+
+# }}}
+
+# {{{ Users
+
 CREATE TABLE Users (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  Name varchar(120) NOT NULL  ,
+  Name varchar(200) NOT NULL  ,
   Password varchar(40) NULL  ,
   Comments blob NULL  ,
   Signature blob NULL  ,
   EmailAddress varchar(120) NULL  ,
   FreeformContactInfo blob NULL  ,
   Organization varchar(200) NULL  ,
-  Privileged integer NULL  ,
   RealName varchar(120) NULL  ,
-  Nickname varchar(16) NULL  ,
+  NickName varchar(16) NULL  ,
   Lang varchar(16) NULL  ,
   EmailEncoding varchar(16) NULL  ,
   WebEncoding varchar(16) NULL  ,
@@ -196,72 +245,172 @@ CREATE TABLE Users (
   State varchar(100) NULL  ,
   Zip varchar(16) NULL  ,
   Country varchar(50) NULL  ,
-  Creator integer NULL  ,
+  Timezone varchar(50) NULL  ,
+  PGPKey text NULL,
+
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
-  LastUpdatedBy integer NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated DATETIME NULL  ,
-  Disabled int2 NOT NULL DEFAULT 0 ,
   PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX Users1 ON Users (Name);
+) TYPE=InnoDB;
+
+
+CREATE UNIQUE INDEX Users1 ON Users (Name) ;
+CREATE INDEX Users2 ON Users (Name);
 CREATE INDEX Users3 ON Users (id, EmailAddress);
 CREATE INDEX Users4 ON Users (EmailAddress);
+
+
+# }}}
+
+# {{{ Tickets
+
 CREATE TABLE Tickets (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  EffectiveId integer NULL  ,
-  Queue integer NULL  ,
+  EffectiveId integer NOT NULL DEFAULT 0  ,
+  Queue integer NOT NULL DEFAULT 0  ,
   Type varchar(16) NULL  ,
-  IssueStatement integer NULL  ,
-  Resolution integer NULL  ,
-  Owner integer NULL  ,
+  IssueStatement integer NOT NULL DEFAULT 0  ,
+  Resolution integer NOT NULL DEFAULT 0  ,
+  Owner integer NOT NULL DEFAULT 0  ,
   Subject varchar(200) NULL DEFAULT '[no subject]' ,
-  InitialPriority integer NULL  ,
-  FinalPriority integer NULL  ,
-  Priority integer NULL  ,
+  InitialPriority integer NOT NULL DEFAULT 0  ,
+  FinalPriority integer NOT NULL DEFAULT 0  ,
+  Priority integer NOT NULL DEFAULT 0  ,
+  TimeEstimated integer NOT NULL DEFAULT 0  ,
+  TimeWorked integer NOT NULL DEFAULT 0  ,
   Status varchar(10) NULL  ,
-  TimeWorked integer NULL  ,
-  TimeLeft integer NULL  ,
+  TimeLeft integer NOT NULL DEFAULT 0  ,
   Told DATETIME NULL  ,
   Starts DATETIME NULL  ,
   Started DATETIME NULL  ,
   Due DATETIME NULL  ,
   Resolved DATETIME NULL  ,
-  LastUpdatedBy integer NULL  ,
+
+
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated DATETIME NULL  ,
-  Creator integer NULL  ,
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
   Disabled int2 NOT NULL DEFAULT 0 ,
   PRIMARY KEY (id)
-);
-CREATE INDEX Tickets1 ON Tickets (Queue, Status);
-CREATE INDEX Tickets2 ON Tickets (Owner);
-CREATE INDEX Tickets3 ON Tickets (EffectiveId);
-CREATE INDEX Tickets4 ON Tickets (id, Status);
-CREATE INDEX Tickets5 ON Tickets (id, EffectiveId);
+) TYPE=InnoDB;
+
+CREATE INDEX Tickets1 ON Tickets (Queue, Status) ;
+CREATE INDEX Tickets2 ON Tickets (Owner) ;
+CREATE INDEX Tickets3 ON Tickets (EffectiveId) ;
+CREATE INDEX Tickets4 ON Tickets (id, Status) ;
+CREATE INDEX Tickets5 ON Tickets (id, EffectiveId) ;
+CREATE INDEX Tickets6 ON Tickets (EffectiveId, Type) ;
+
+# }}}
+
+# {{{ ScripActions
+
 CREATE TABLE ScripActions (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  Name varchar(255) NULL  ,
+  Name varchar(200) NULL  ,
   Description varchar(255) NULL  ,
   ExecModule varchar(60) NULL  ,
   Argument varchar(255) NULL  ,
-  Creator integer NULL  ,
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
-  LastUpdatedBy integer NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated DATETIME NULL  ,
   PRIMARY KEY (id)
-);
+) TYPE=InnoDB;
+
+# }}}
+
+# {{{ Templates
+
 CREATE TABLE Templates (
   id INTEGER NOT NULL  AUTO_INCREMENT,
   Queue integer NOT NULL DEFAULT 0 ,
-  Name varchar(40) NOT NULL  ,
-  Description varchar(120) NULL  ,
+  Name varchar(200) NOT NULL  ,
+  Description varchar(255) NULL  ,
   Type varchar(16) NULL  ,
   Language varchar(16) NULL  ,
-  TranslationOf integer NULL  ,
+  TranslationOf integer NOT NULL DEFAULT 0  ,
   Content blob NULL  ,
   LastUpdated DATETIME NULL  ,
-  LastUpdatedBy integer NULL  ,
-  Creator integer NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created DATETIME NULL  ,
+  PRIMARY KEY (id)
+) TYPE=InnoDB;
+
+# }}}
+
+# {{{ TicketCustomFieldValues 
+
+CREATE TABLE TicketCustomFieldValues (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  Ticket int NOT NULL  ,
+  CustomField int NOT NULL  ,
+  Content varchar(255) NULL  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated DATETIME NULL  ,
+  PRIMARY KEY (id)
+) TYPE=InnoDB;
+
+# }}}
+
+# {{{ CustomFields
+
+CREATE TABLE CustomFields (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  Name varchar(200) NULL  ,
+  Type varchar(200) NULL  ,
+  Queue integer NOT NULL DEFAULT 0 ,
+  Description varchar(255) NULL  ,
+  SortOrder integer NOT NULL DEFAULT 0  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created DATETIME NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated DATETIME NULL  ,
+  Disabled int2 NOT NULL DEFAULT 0 ,
+  PRIMARY KEY (id)
+) TYPE=InnoDB;
+
+CREATE INDEX CustomFields1 on CustomFields (Disabled, Queue);
+
+
+# }}}
+
+# {{{ CustomFieldValues 
+
+CREATE TABLE CustomFieldValues (
+  id INTEGER NOT NULL  AUTO_INCREMENT,
+  CustomField int NOT NULL  ,
+  Name varchar(200) NULL  ,
+  Description varchar(255) NULL  ,
+  SortOrder integer NOT NULL DEFAULT 0  ,
+
+  Creator integer NOT NULL DEFAULT 0  ,
+  Created DATETIME NULL  ,
+  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+  LastUpdated DATETIME NULL  ,
   PRIMARY KEY (id)
+) TYPE=InnoDB;
+
+# }}}
+
+# {{{ Sessions
+
+# sessions is used by Apache::Session to keep sessions in the database.
+# We should have a reaper script somewhere.
+
+CREATE TABLE sessions (
+    id char(32) NOT NULL,
+    a_session LONGTEXT,
+    LastUpdated TIMESTAMP,
+    PRIMARY KEY (id)
 );
+
+# }}}
diff --git a/rt/etc/schema.pm b/rt/etc/schema.pm
deleted file mode 100644
index 44e143ecd..000000000
--- a/rt/etc/schema.pm
+++ /dev/null
@@ -1,349 +0,0 @@
-#   column, type, nullability, length, default, database-local
-
-my $gratuitous = {
-
-'Groups' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'Name', 'varchar', 'NULL', '16', '', '',
-    'Description', 'varchar', 'NULL', '64', '', '',
-    'Pseudo', 'integer', '', '', '0', '',
-  ],
-  'primary_key' => 'id',
-  'unique' => [ ['Name'] ],
-  'index' => [  ],
-},
-
-'ACL' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'PrincipalId', 'integer', 'NULL', '', '', '',
-    'PrincipalType', 'varchar', 'NULL', '25', '', '',
-    'RightName', 'varchar', 'NULL', '25', '', '',
-    'RightScope', 'varchar', 'NULL', '25', '', '',
-    'RightAppliesTo', 'integer', 'NULL', '', '', '',
-  ],
-  'primary_key' => 'id',
-  'unique' => [  ],
-  'index' => [ ['RightScope', 'PrincipalId'], 
-  	       ['RightScope','RightAppliesTo','RightName','PrincipalType','PrincipalId'] ],
-},
-
-'Watchers' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'Type', 'varchar', 'NULL', '16', '', '',
-    'Scope', 'varchar', 'NULL', '16', '', '',
-    'Value', 'integer', 'NULL', '', '', '',
-    'Email', 'varchar', 'NULL', '255', '', '',
-    'Quiet', 'integer', 'NULL', '', '', '',
-    'Owner', 'integer', 'NULL', '', '', '',
-    'Creator', 'integer', 'NULL', '', '', '',
-    'Created', 'timestamp', 'NULL', '', '', '',
-    'LastUpdatedBy', 'integer', 'NULL', '', '', '',
-    'LastUpdated', 'timestamp', 'NULL', '', '', '',
-  ],
-  'primary_key' => 'id',
-  'unique' => [  ],
-  'index' => [ ['Scope','Value','Type','Owner'] ],
-},
-
-'Links' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'Base', 'varchar', 'NULL', '240', '', '',
-    'Target', 'varchar', 'NULL', '240', '', '',
-    'Type', 'varchar', '', '20', '', '',
-    'LocalTarget', 'integer', 'NULL', '', '', '',
-    'LocalBase', 'integer', 'NULL', '', '', '',
-    'LastUpdatedBy', 'integer', 'NULL', '', '', '',
-    'LastUpdated', 'timestamp', 'NULL', '', '', '',
-    'Creator', 'integer', 'NULL', '', '', '',
-    'Created', 'timestamp', 'NULL', '', '', '',
-  ],
-  'primary_key' => 'id',
-  'unique' => [ ['Base', 'Target', 'Type'] ],
-  'index' => [  ],
-},
-
-'Users' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'Name', 'varchar', '', '120', '', '',
-    'Password', 'varchar', 'NULL', '40', '', '',
-    'Comments', 'blob', 'NULL', '', '', '',
-    'Signature', 'blob', 'NULL', '', '', '',
-    'EmailAddress', 'varchar', 'NULL', '120', '', '',
-    'FreeformContactInfo', 'blob', 'NULL', '', '', '',
-    'Organization', 'varchar', 'NULL', '200', '', '',
-    'Privileged', 'integer', 'NULL', '', '', '',
-    'RealName', 'varchar', 'NULL', '120', '', '',
-    'Nickname', 'varchar', 'NULL', '16', '', '',
-    'Lang', 'varchar', 'NULL', '16', '', '',
-    'EmailEncoding', 'varchar', 'NULL', '16', '', '',
-    'WebEncoding', 'varchar', 'NULL', '16', '', '',
-    'ExternalContactInfoId', 'varchar', 'NULL', '100', '', '',
-    'ContactInfoSystem', 'varchar', 'NULL', '30', '', '',
-    'ExternalAuthId', 'varchar', 'NULL', '100', '', '',
-    'AuthSystem', 'varchar', 'NULL', '30', '', '',
-    'Gecos', 'varchar', 'NULL', '16', '', '',
-    'HomePhone', 'varchar', 'NULL', '30', '', '',
-    'WorkPhone', 'varchar', 'NULL', '30', '', '',
-    'MobilePhone', 'varchar', 'NULL', '30', '', '',
-    'PagerPhone', 'varchar', 'NULL', '30', '', '',
-    'Address1', 'varchar', 'NULL', '200', '', '',
-    'Address2', 'varchar', 'NULL', '200', '', '',
-    'City', 'varchar', 'NULL', '100', '', '',
-    'State', 'varchar', 'NULL', '100', '', '',
-    'Zip', 'varchar', 'NULL', '16', '', '',
-    'Country', 'varchar', 'NULL', '50', '', '',
-    'Creator', 'integer', 'NULL', '', '', '',
-    'Created', 'timestamp', 'NULL', '', '', '',
-    'LastUpdatedBy', 'integer', 'NULL', '', '', '',
-    'LastUpdated', 'timestamp', 'NULL', '', '', '',
-    'Disabled', 'int2', '','','0','',
-  ],
-  'primary_key' => 'id',
-  'unique' => [ ['Name'] ],
-  'index' => [ ['Name'], 
-  	       ['id', 'EmailAddress'],
-  	       ['EmailAddress'] ],
-},
-
-'Tickets' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'EffectiveId', 'integer', 'NULL', '', '', '',
-    'Queue', 'integer', 'NULL', '', '', '',
-    'Type', 'varchar', 'NULL', '16', '', '',
-    'IssueStatement', 'integer', 'NULL', '', '', '',
-    'Resolution', 'integer', 'NULL', '', '', '',
-    'Owner', 'integer', 'NULL', '', '', '',
-    'Subject', 'varchar', 'NULL', '200', '[no subject]', '',
-    'InitialPriority', 'integer', 'NULL', '', '', '',
-    'FinalPriority', 'integer', 'NULL', '', '', '',
-    'Priority', 'integer', 'NULL', '', '', '',
-    'Status', 'varchar', 'NULL', '10', '', '',
-    'TimeWorked', 'integer', 'NULL', '', '', '',
-    'TimeLeft', 'integer', 'NULL', '', '', '',
-    'Told', 'timestamp', 'NULL', '', '', '',
-    'Starts', 'timestamp', 'NULL', '', '', '',
-    'Started', 'timestamp', 'NULL', '', '', '',
-    'Due', 'timestamp', 'NULL', '', '', '',
-    'Resolved', 'timestamp', 'NULL', '', '', '',
-    'LastUpdatedBy', 'integer', 'NULL', '', '', '',
-    'LastUpdated', 'timestamp', 'NULL', '', '', '',
-    'Creator', 'integer', 'NULL', '', '', '',
-    'Created', 'timestamp', 'NULL', '', '', '',
-    'Disabled', 'int2', '','','0','',
-  ],
-  'primary_key' => 'id',
-  'unique' => [ [] ],
-  'index' => [ ['Queue', 'Status'], 
-  	       ['Owner'], 
-	       ['EffectiveId'], 
-	       ['id', 'Status'], 
-	       ['id', 'EffectiveId'] ],
-},
-
-'GroupMembers' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'GroupId', 'integer', 'NULL', '', '', '', #foreign key, Groups::id
-    'UserId', 'integer', 'NULL', '', '', '', #foreign key, Users::id
-  ],
-  'primary_key' => 'id',
-  'unique' => [ ['GroupId', 'UserId']  ],
-  'index' => [  ],
-},
-
-'Queues' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'Name', 'varchar', '', '120', '', '', #Textual 'name' for this queue
-    'Description', 'varchar', 'NULL', '120', '', '', #Textual descr. of this
-    #queue
-    'CorrespondAddress', 'varchar', 'NULL', '120', '', '',
-    'CommentAddress', 'varchar', 'NULL', '120', '', '',
-    'InitialPriority', 'integer', 'NULL', '', '', '',
-    'FinalPriority', 'integer', 'NULL', '', '', '',
-    'DefaultDueIn', 'integer', 'NULL', '', '', '',
-
-    'Creator', 'integer', 'NULL', '', '', '',
-    'Created', 'timestamp', 'NULL', '', '', '',
-    'LastUpdatedBy', 'integer', 'NULL', '', '', '',
-    'LastUpdated', 'timestamp', 'NULL', '', '', '',
-    'Disabled', 'int2', '','','0','',
-  ],
-  'primary_key' => 'id',
-  'unique' => [ ['Name'] ],
-  'index' => [  ],
-},
-
-'Transactions' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'EffectiveTicket', 'integer', 'NULL', '', '', '', 
-    'Ticket', 'integer', 'NULL', '', '', '',  #Foreign key Ticket::id
-    'TimeTaken', 'integer', 'NULL', '', '', '', #Time spent on this trans in min
-    'Type', 'varchar', 'NULL', '20', '', '',
-    'Field', 'varchar', 'NULL', '40', '', '', #If it's a "Set" transaction, what
-    #field was set.
-    'OldValue', 'varchar', 'NULL', '255', '', '', 
-    'NewValue', 'varchar', 'NULL', '255', '', '',
-    'Data', 'varchar', 'NULL', '100', '', '',
-
-
-    'Creator', 'integer', 'NULL', '', '', '',
-    'Created', 'timestamp', 'NULL', '', '', '',
-
-  ],
-  'primary_key' => 'id',
-  'unique' => [  ],
-  'index' => [ ['Ticket'], ['EffectiveTicket'] ],
-},
-
-'ScripActions' => {
-  'columns' => [
-		'id', 'serial', '', '', '', '',
-		'Name', 'varchar', 'NULL', '255', '', '',  # Alias
-		'Description', 'varchar', 'NULL', '255', '', '', #Textual description
-		'ExecModule', 'varchar', 'NULL', '60', '', '', #This calles RT::Action::___
-		'Argument', 'varchar', 'NULL', '255', '', '', #We can pass a single argument
-		#to the scrip. sometimes, it's who to send mail to.
-		'Creator', 'integer', 'NULL', '', '', '',
-		'Created', 'timestamp', 'NULL', '', '', '',
-		'LastUpdatedBy', 'integer', 'NULL', '', '', '',
-		'LastUpdated', 'timestamp', 'NULL', '', '', '',
-  ],
-  'primary_key' => 'id',
-  'unique' => [  ],
-  'index' => [  ],
-},
-
-'ScripConditions' => {
-  'columns' => [
-		'id', 'serial', '', '', '', '',
-		'Name', 'varchar', 'NULL', '255', '', '',  # Alias
-		'Description', 'varchar', 'NULL', '255', '', '', #Textual description
-		'ExecModule', 'varchar', 'NULL', '60', '', '', #This calles RT::Condition::
-		'Argument', 'varchar', 'NULL', '255', '', '', #We can pass a single argument
-		#to the scrip. sometimes, it's who to send mail to.
-		'ApplicableTransTypes', 'varchar', 'NULL', '60', '', '',#Transaction types this scrip
-		# acts on. comma or / delimited is just great.
-		'Creator', 'integer', 'NULL', '', '', '',
-		'Created', 'timestamp', 'NULL', '', '', '',
-		'LastUpdatedBy', 'integer', 'NULL', '', '', '',
-		'LastUpdated', 'timestamp', 'NULL', '', '', '',
-  ],
-  'primary_key' => 'id',
-  'unique' => [  ],
-  'index' => [  ],
-},
-'Scrips' => {
-		 'columns' => [
-			       'id', 'serial', '', '', '', '',
-			       'ScripCondition', 'integer', 'NULL', '', '', '', #Foreign key ScripConditions::id
-			       'ScripAction', 'integer', 'NULL', '', '', '', #Foreign key ScripActions::id
-			       'Stage', 'varchar', 'NULL', '32','','', #What stage does this scrip
-			       #Happen in.  for now, everything is 'TransactionCreate',
-			       'Queue', 'integer', 'NULL', '', '', '', #Foreign key Queues::id
-			       'Template', 'integer', 'NULL', '', '', '', #Foreign key Templates::id
-			       
-			       'Creator', 'integer', 'NULL', '', '', '',
-			       'Created', 'timestamp', 'NULL', '', '', '',
-			       'LastUpdatedBy', 'integer', 'NULL', '', '', '',
-			       'LastUpdated', 'timestamp', 'NULL', '', '', '',
-			      ],
-		 'primary_key' => 'id',
-		 'unique' => [  ],
-		 'index' => [  ],
-},
-
-'Attachments' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'TransactionId', 'integer', '', '', '', '', #Foreign key Transactions::Id
-    'Parent', 'integer', 'NULL', '', '', '', # Attachments::Id
-    'MessageId', 'varchar', 'NULL', '160', '', '', #RFC822 messageid, if any
-    'Subject', 'varchar', 'NULL', '255', '', '', 
-    'Filename', 'varchar', 'NULL', '255', '', '',
-    'ContentType', 'varchar', 'NULL', '80', '', '',
-    'ContentEncoding', 'varchar', 'NULL', '80', '', '',
-    'Content', 'long varbinary', 'NULL', '', '', '',
-    'Headers', 'long varbinary', 'NULL', '', '', '',
-
-    'Creator', 'integer', 'NULL', '', '', '',
-    'Created', 'timestamp', 'NULL', '', '', '',
-
-  ],
-  'primary_key' => 'id',
-  'unique' => [  ],
-  'index' => [ ['Parent'], ['TransactionId'], ['Parent', 'TransactionId'] ],
-},
-
-'Templates' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'Queue', 'integer', 'NOT NULL', '', '0', '',
-    'Name', 'varchar', '', '40', '', '',
-    'Description', 'varchar', 'NULL', '120', '', '',
-    'Type', 'varchar', 'NULL', '16', '','',
-    'Language', 'varchar', 'NULL', '16', '', '',
-    'TranslationOf', 'integer', 'NULL', '', '', '',
-    'Content', 'blob', 'NULL', '', '', '',
-    'LastUpdated', 'timestamp', 'NULL', '', '', '',
-    'LastUpdatedBy', 'integer', 'NULL', '', '', '',
-    'Creator', 'integer', 'NULL', '', '', '',
-    'Created', 'timestamp', 'NULL', '', '', '',
-  ],
-  'primary_key' => 'id',
-  'unique' => [ [''] ],
-  'index' => [  ],
-},
-
-'Keywords' => {
-  'columns' => [
-    'id', 'serial', '', '', '', '',
-    'Name', 'varchar', 'NOT NULL', '255', '', '',
-    'Description', 'varchar', 'NULL', '255', '', '',
-    'Parent', 'integer', 'NULL', '', '', '',
-    'Disabled', 'int2', '','','0','',
-],
-  'primary_key' => 'id',
-  'unique' => [ [ 'Name', 'Parent' ] ],
-  'index' => [ [ 'Name', ], [ 'Parent' ] ],
-},
-
-'ObjectKeywords' => {
-  'columns' =>  [
-    'id', 'serial', '', '', '', '',
-    'Keyword', 'integer', 'NOT NULL', '', '', '',
-    'KeywordSelect', 'integer', 'NOT NULL', '', '', '',
-    'ObjectType', 'varchar', 'NOT NULL', '32', '', '',
-    'ObjectId', 'integer', 'NOT NULL', '', '', '',
-  ],
-  'primary_key' => 'id',
-  'unique' => [ [  'ObjectId', 'ObjectType','KeywordSelect', 'Keyword' ] ],
-  'index' => [ [ 'ObjectId', 'ObjectType'  ] , ['Keyword'] ],
-
-},
-
-'KeywordSelects' => {
-  'columns' =>  [
-    'id', 'serial', '', '', '', '',
-    'Name','varchar','NULL','255','','',
-    'Keyword', 'integer', 'NULL', '', '', '',
-    'Single', 'integer', 'NULL', '', '', '',
-    'Depth', 'integer', 'NOT NULL', '', 0, '',
-    'ObjectType', 'varchar', 'NOT NULL',  '32', '', '',
-    'ObjectField', 'varchar', 'NULL', '32', '', '',
-    'ObjectValue', 'varchar', 'NULL', '255', '', '',
-    'Disabled', 'int2', '','','0','',
-  ],
-  'primary_key' => 'id',
-  'unique' => [ [ ] ],
-  'index' => [ [ 'Keyword' ], [ 'ObjectType', 'ObjectField', 'ObjectValue'] ],
-},
-
-};
diff --git a/rt/lib/MANIFEST b/rt/lib/MANIFEST
deleted file mode 100644
index cda386be5..000000000
--- a/rt/lib/MANIFEST
+++ /dev/null
@@ -1,57 +0,0 @@
-MANIFEST
-MANIFEST.SKIP
-Makefile.PL
-RT.pm
-test.pl
-RT/ACE.pm
-RT/ACL.pm
-RT/Action/Generic.pm
-RT/Action/NotifyAsComment.pm
-RT/Action/OpenDependent.pm
-RT/Action/SendEmail.pm
-RT/Action/StallDependent.pm
-RT/Action/Notify.pm
-RT/Action/ResolveMembers.pm
-RT/Attachment.pm
-RT/Attachments.pm
-RT/Condition/AnyTransaction.pm
-RT/Condition/Generic.pm
-RT/Condition/NewDependency.pm
-RT/CurrentUser.pm
-RT/Date.pm
-RT/EasySearch.pm
-RT/Group.pm
-RT/GroupMember.pm
-RT/GroupMembers.pm
-RT/Groups.pm
-RT/Handle.pm
-RT/Interface/CLI.pm
-RT/Interface/Email.pm
-RT/Interface/Web.pm
-RT/Keyword.pm
-RT/Keywords.pm
-RT/KeywordSelect.pm
-RT/KeywordSelects.pm
-RT/Link.pm
-RT/Links.pm
-RT/ObjectKeyword.pm
-RT/ObjectKeywords.pm
-RT/Queue.pm
-RT/Queues.pm
-RT/Record.pm
-RT/Scrip.pm
-RT/Scrips.pm
-RT/ScripAction.pm
-RT/ScripActions.pm
-RT/ScripCondition.pm
-RT/ScripConditions.pm
-RT/Template.pm
-RT/Templates.pm
-RT/Ticket.pm
-RT/Tickets.pm
-RT/Transaction.pm
-RT/Transactions.pm
-RT/User.pm
-RT/Users.pm
-RT/Watcher.pm
-RT/Watchers.pm
diff --git a/rt/lib/MANIFEST.SKIP b/rt/lib/MANIFEST.SKIP
deleted file mode 100644
index ae335e78a..000000000
--- a/rt/lib/MANIFEST.SKIP
+++ /dev/null
@@ -1 +0,0 @@
-CVS/
diff --git a/rt/lib/Makefile.PL b/rt/lib/Makefile.PL
deleted file mode 100644
index c0e1af28c..000000000
--- a/rt/lib/Makefile.PL
+++ /dev/null
@@ -1,49 +0,0 @@
-use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-WriteMakefile(
-    'NAME'      => 'RT',
-    'VERSION_FROM' => 'RT.pm', # finds $VERSION
-    'PREREQ_PM' => {
-                     'DBI'                 => 1.16,
-                     'DBIx::SearchBuilder' => '0.48',
-                     'Date::Parse'         => 0,
-                     'Date::Format'        => 0,
-                     'MIME::Entity'        => 5.108,
-                     'Mail::Mailer'        => '1.20',
-                     'Log::Dispatch'       => 1.6,
-                     'HTML::Entities'      => 0,
-                     'Text::Wrapper'       => 0,
-                     'Text::Template'      => 0,
-		     'Getopt::Long'        => 2.24,
-                   },
-);
-
-     {
-                   package MY;
-                   sub top_targets {
-                       my($self) = @_;
-                       my $out = "POD2TEST_EXE = pod2test\n";
-
-                       $out .= $self->SUPER::top_targets(@_);
-                       # $out =~ s/^(pure_all\b.*)/$1 testifypods/m;
-
-                       $out .= "\n\ntestifypods : \n";
-
-			my @pods = (keys %{$self->{MAN1PODS}},
-				     keys %{$self->{MAN3PODS}});
-
-                       foreach my $pod (@pods) {
-                           (my $test = $pod) =~ s/\.(pm|pod)$//;
-                           $test =~ s/^lib\W//;
-                           $test =~ s/\W/-/;
-			   $test =~ s/\//__/g;
-                           $test = "autogen-$test.t";
-                           $out .= "\t$self->{NOECHO}\$(POD2TEST_EXE) ".
-                                   "$pod t/$test \n";
-                       }
-
-                       return $out;
-                   }
-               }
-
diff --git a/rt/lib/RT.pm b/rt/lib/RT.pm
index 1cfc428ee..90c332bc0 100644
--- a/rt/lib/RT.pm
+++ b/rt/lib/RT.pm
@@ -1,11 +1,82 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2002 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org
+# 
+# This work 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.
+# 
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+
 package RT;
-use RT::Handle;
-use RT::CurrentUser;
 use strict;
+use RT::I18N;
+use RT::CurrentUser;
+use RT::System;
+
+use vars qw($VERSION $System $SystemUser $Nobody $Handle $Logger
+        $CORE_CONFIG_FILE
+        $SITE_CONFIG_FILE
+        $VENDOR_CONFIG_FILE
+        $BasePath
+        $EtcPath
+        $VarPath
+        $LocalPath
+        $LocalEtcPath
+        $LocalLexiconPath
+        $LogDir
+        $MasonComponentRoot
+        $MasonLocalComponentRoot
+        $MasonDataDir
+        $MasonSessionDir
+);
+
+$VERSION = '3.0.4';
+$CORE_CONFIG_FILE = "/opt/rt3/etc/RT_Config.pm";
+$SITE_CONFIG_FILE = "/opt/rt3/etc/RT_SiteConfig.pm";
+
+$BasePath = '/opt/rt3';
+
+$EtcPath = '/opt/rt3/etc';
+$VarPath = '/opt/rt3/var';
+$LocalPath = '/opt/rt3/local';
+$LocalEtcPath = '/opt/rt3/local/etc';
+$LocalLexiconPath = '/opt/rt3/local/po';
+
+# $MasonComponentRoot is where your rt instance keeps its mason html files
+
+$MasonComponentRoot = '/opt/rt3/share/html';
+
+# $MasonLocalComponentRoot is where your rt instance keeps its site-local
+# mason html files.
+
+$MasonLocalComponentRoot = '/opt/rt3/local/html';
+
+# $MasonDataDir Where mason keeps its datafiles
+
+$MasonDataDir = '/opt/rt3/var/mason_data';
+
+# RT needs to put session data (for preserving state between connections
+# via the web interface)
+$MasonSessionDir = '/opt/rt3/var/session_data';
 
-use vars qw($VERSION $SystemUser $Nobody $Handle $Logger);
 
-$VERSION = '!!RT_VERSION!!';
 
 =head1 NAME
 
@@ -14,19 +85,45 @@ $VERSION = '!!RT_VERSION!!';
 =head1 SYNOPSIS
 
 	A fully featured request tracker package
-	
 
 =head1 DESCRIPTION
 
 
+=cut
+
+=item LoadConfig
+
+Load RT's config file. First, go after the core config file. 
+After that, try to load the vendor config.
+After that, go after the site config.
+
+=cut
+
+sub LoadConfig {
+     local *Set = sub { $_[0] = $_[1] unless defined $_[0] }; 
+    if ( -f "$SITE_CONFIG_FILE" ) {
+        require $SITE_CONFIG_FILE
+          || die ("Couldn't load RT config file  '$SITE_CONFIG_FILE'\n$@");
+    }
+    require $CORE_CONFIG_FILE
+      || die ("Couldn't load RT config file '$CORE_CONFIG_FILE'\n$@");
+    RT::I18N->Init;
+}
+
+=item Init
+
+    Conenct to the database, set up logging.
+    
 =cut
 
 sub Init {
+    require RT::Handle;
     #Get a database connection
-    $Handle = new RT::Handle($RT::DatabaseType);
+        unless ($Handle && $Handle->dbh->ping) {
+    $Handle = RT::Handle->new();
+        } 
     $Handle->Connect();
     
-    
     #RT's system user is a genuine database user. its id lives here
     $SystemUser = new RT::CurrentUser();
     $SystemUser->LoadByName('RT_System');
@@ -34,7 +131,9 @@ sub Init {
     #RT's "nobody user" is a genuine database user. its ID lives here.
     $Nobody = new RT::CurrentUser();
     $Nobody->LoadByName('Nobody');
-   
+  
+    $System = RT::System->new();
+
    InitLogging(); 
 }
 
@@ -51,30 +150,81 @@ sub InitLogging {
 
     $, = '';
     use Log::Dispatch 1.6;
-    use Log::Dispatch::File;
-    use Log::Dispatch::Screen;
 
-    $Logger=Log::Dispatch->new();
+    unless ($RT::Logger) {
+
+    $RT::Logger=Log::Dispatch->new();
     
     if ($RT::LogToFile) {
-	my $filename = $RT::LogToFileNamed || "$RT::LogDir/rt.log";
 
-	  $Logger->add(Log::Dispatch::File->new
+    unless (-d $RT::LogDir && -w $RT::LogDir) {
+        # localizing here would be hard when we don't have a current user yet
+        # die $self->loc("Log directory [_1] not found or couldn't be written.\n RT can't run.", $RT::LogDir);
+        die ("Log directory $RT::LogDir not found or couldn't be written.\n RT can't run.");
+    }
+
+	my $filename;
+	if ($RT::LogToFileNamed =~ m![/\\]!) {
+	    # looks like an absolute path.
+	    $filename = $RT::LogToFileNamed;
+	}
+	else {
+	    $filename = "$RT::LogDir/$RT::LogToFileNamed";
+	}
+    require Log::Dispatch::File;
+
+
+	  $RT::Logger->add(Log::Dispatch::File->new
 		       ( name=>'rtlog',
 			 min_level=> $RT::LogToFile,
 			 filename=> $filename,
 			 mode=>'append',
-            callbacks => sub {my %p=@_; return "[".gmtime(time)."] [".$p{level}."]: $p{message}\n"}
-
+			 callbacks => sub { my %p = @_;
+                                my ($package, $filename, $line) = caller(5);
+                                return "[".gmtime(time)."] [".$p{level}."]: $p{message} ($filename:$line)\n"}
+             
+             
+             
 		       ));
     }
     if ($RT::LogToScreen) {
-	$Logger->add(Log::Dispatch::Screen->new
+	require Log::Dispatch::Screen;
+	$RT::Logger->add(Log::Dispatch::Screen->new
 		     ( name => 'screen',
 		       min_level => $RT::LogToScreen,
+			 callbacks => sub { my %p = @_;
+                                my ($package, $filename, $line) = caller(5);
+                                return "[".gmtime(time)."] [".$p{level}."]: $p{message} ($filename:$line)\n"
+				},
+             
+		       stderr => 1
+		     ));
+    }
+    if ($RT::LogToSyslog) {
+	require Log::Dispatch::Syslog;
+	$RT::Logger->add(Log::Dispatch::Syslog->new
+		     ( name => 'syslog',
+                       ident => 'RT',
+		       min_level => $RT::LogToSyslog,
+			 callbacks => sub { my %p = @_;
+                                my ($package, $filename, $line) = caller(5);
+
+				# syswrite() cannot take utf8; turn it off here.
+				Encode::_utf8_off($p{message});
+
+				if ($p{level} eq 'debug') {
+
+                                return "$p{message}\n" }
+				else {
+                                return "$p{message} ($filename:$line)\n"}
+				},
+             
 		       stderr => 1
 		     ));
     }
+
+    }
+
 # {{{ Signal handlers
 
 ## This is the default handling of warnings and die'ings in the code
@@ -88,6 +238,7 @@ $SIG{__WARN__} = sub {$RT::Logger->warning($_[0])};
 
 $SIG{__DIE__}  = sub {
     unless ($^S || !defined $^S ) {
+        $RT::Handle->Rollback();
         $RT::Logger->crit("$_[0]");
         exit(-1);
     }
@@ -127,10 +278,6 @@ sub DropSetGIDPermissions {
 }
 
 
-=head1 NAME
-
-RT - Request Tracker
-
 =head1 SYNOPSIS
 
 =head1 BUGS
@@ -140,7 +287,6 @@ RT - Request Tracker
 
 =begin testing
 
-ok (require RT::TestHarness);
 
 ok ($RT::Nobody->Name() eq 'Nobody', "Nobody is nobody");
 ok ($RT::Nobody->Name() ne 'root', "Nobody isn't named root");
@@ -152,4 +298,7 @@ ok ($RT::SystemUser->Name() ne 'noname', "The system user isn't noname");
 
 =cut
 
+eval "require RT_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT_Local.pm});
+
 1;
diff --git a/rt/lib/RT/ACE.pm b/rt/lib/RT/ACE.pm
index d4681cf44..1501a125e 100755
--- a/rt/lib/RT/ACE.pm
+++ b/rt/lib/RT/ACE.pm
@@ -1,774 +1,304 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/ACE.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::ACE - RT\'s ACE object
+=head1 NAME
 
-=head1 SYNOPSIS
+RT::ACE
 
-  use RT::ACE;
-  my $ace = new RT::ACE($CurrentUser);
 
+=head1 SYNOPSIS
 
 =head1 DESCRIPTION
 
-
 =head1 METHODS
 
-=begin testing
-
-ok(require RT::TestHarness);
-ok(require RT::ACE);
-
-=end testing
-
 =cut
 
 package RT::ACE;
-use RT::Record;
-@ISA= qw(RT::Record);
-
-use vars qw (%SCOPES
-   	     %QUEUERIGHTS
-	     %SYSTEMRIGHTS
-	     %LOWERCASERIGHTNAMES
-	    ); 
-
-%SCOPES = (
-	   System => 'System-level right',
-	   Queue => 'Queue-level right'
-	  );
-
-# {{{ Descriptions of rights
-
-# Queue rights are the sort of queue rights that can only be granted
-# to real people or groups
-%QUEUERIGHTS = ( 
-		SeeQueue => 'Can this principal see this queue',
-		AdminQueue => 'Create, delete and modify queues', 
-		ShowACL => 'Display Access Control List',
-		ModifyACL => 'Modify Access Control List',
-		ModifyQueueWatchers => 'Modify the queue watchers',
-                AdminKeywordSelects => 'Create, delete and modify keyword selections',
-
-		
-		ModifyTemplate => 'Modify email templates for this queue',
-		ShowTemplate => 'Display email templates for this queue',
-		ModifyScrips => 'Modify Scrips for this queue',
-		ShowScrips => 'Display Scrips for this queue',
-
-		ShowTicket => 'Show ticket summaries',
-		ShowTicketComments => 'Show ticket private commentary',
+use RT::Record; 
 
-		Watch => 'Sign up as a ticket Requestor or ticket or queue Cc',
-		WatchAsAdminCc => 'Sign up as a ticket or queue AdminCc',
-		CreateTicket => 'Create tickets in this queue',
-		ReplyToTicket => 'Reply to tickets',
-		CommentOnTicket => 'Comment on tickets',
-		OwnTicket => 'Own tickets',
-		ModifyTicket => 'Modify tickets',
-		DeleteTicket => 'Delete tickets'
 
-	       );	
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
 
+sub _Init {
+  my $self = shift; 
 
-# System rights are rights granted to the whole system
-%SYSTEMRIGHTS = (
-                SuperUser => 'Do anything and everything',
-		AdminKeywords => 'Creatte, delete and modify keywords',	 
-		AdminGroups => 'Create, delete and modify groups',
-	        AdminUsers => 'Create, Delete and Modify users',
-		ModifySelf => 'Modify one\'s own RT account',
-
-		);
-
-# }}}
-
-# {{{ Descriptions of principals
-
-%TICKET_METAPRINCIPALS = ( Owner => 'The owner of a ticket',
-            			   Requestor => 'The requestor of a ticket',
-		            	   Cc => 'The CC of a ticket',
-			               AdminCc => 'The administrative CC of a ticket',
-			 );
-
-# }}}
-
-# {{{ We need to build a hash of all rights, keyed by lower case names
-
-#since you can't do case insensitive hash lookups
-
-foreach $right (keys %QUEUERIGHTS) {
-    $LOWERCASERIGHTNAMES{lc $right}=$right;
-}
-foreach $right (keys %SYSTEMRIGHTS) {
-    $LOWERCASERIGHTNAMES{lc $right}=$right;
+  $self->Table('ACL');
+  $self->SUPER::_Init(@_);
 }
 
-# }}}
-
-# {{{ sub _Init
-sub _Init  {
-  my $self = shift;
-  $self->{'table'} = "ACL";
-  return($self->SUPER::_Init(@_));
-}
-# }}}
 
-# {{{ sub LoadByValues
 
-=head2 LoadByValues PARAMHASH
 
-Load an ACE by specifying a paramhash with the following fields:
 
-              PrincipalId => undef,
-	      PrincipalType => undef,
-	      RightName => undef,
-	      RightScope => undef,
-	      RightAppliesTo => undef,
+=item Create PARAMHASH
 
-=cut
+Create takes a hash of values and creates a row in the database:
 
-sub LoadByValues {
-  my $self = shift;
-  my %args = (PrincipalId => undef,
-	      PrincipalType => undef,
-	      RightName => undef,
-	      RightScope => undef,
-	      RightAppliesTo => undef,
-	      @_);
-  
-  $self->LoadByCols (PrincipalId => $args{'PrincipalId'},
-		     PrincipalType => $args{'PrincipalType'},
-		     RightName => $args{'RightName'},
-		     RightScope => $args{'RightScope'},
-		     RightAppliesTo => $args{'RightAppliesTo'}
-		    );
-  
-  #If we couldn't load it.
-  unless ($self->Id) {
-      return (0, "ACE not found");
-  }
-  # if we could
-  return ($self->Id, "ACE Loaded");
-  
-}
+  varchar(25) 'PrincipalType'.
+  int(11) 'PrincipalId'.
+  varchar(25) 'RightName'.
+  varchar(25) 'ObjectType'.
+  int(11) 'ObjectId'.
+  int(11) 'DelegatedBy'.
+  int(11) 'DelegatedFrom'.
 
-# }}}
-
-# {{{ sub Create
-
-=head2 Create <PARAMS>
+=cut
 
-PARAMS is a parameter hash with the following elements:
 
-   PrincipalType => "Queue"|"User"
-   PrincipalId => an intentifier you can use to ->Load a user or group
-   RightName => the name of a right. in any case
-   RightScope => "System" | "Queue"
-   RightAppliesTo => a queue id or undef
 
-=cut
 
 sub Create {
     my $self = shift;
-    my %args = ( PrincipalId => undef,
-		 PrincipalType => undef,
-		 RightName => undef,
-		 RightScope => undef,
-		 RightAppliesTo => undef,
-		 @_
-	       );
-    
-    # {{{ Validate the principal
-    my ($princ_obj);
-    if ($args{'PrincipalType'} eq 'User') {
-	$princ_obj = new RT::User($RT::SystemUser);
-	
-    }	
-    elsif ($args{'PrincipalType'} eq 'Group') {
-	require RT::Group;
-	$princ_obj = new RT::Group($RT::SystemUser);
-    }
-    else {
-	return (0, 'Principal type '.$args{'PrincipalType'} . ' is invalid.');
-    }	
-    
-    $princ_obj->Load($args{'PrincipalId'});
-    my $princ_id = $princ_obj->Id();
-    
-    unless ($princ_id) {
-	return (0, 'Principal '.$args{'PrincipalId'}.' not found.');
-    }
-
-    # }}}
-    
-    #TODO allow loading of queues by name.    
-    
-    # {{{ Check the ACL
-    if ($args{'RightScope'} eq 'System') {
-	
-	unless ($self->CurrentUserHasSystemRight('ModifyACL')) {
-	    $RT::Logger->error("Permission Denied.");
-	    return(undef);
-	}
-    }
-    
-    elsif ($args{'RightScope'} eq 'Queue') {
-	unless ($self->CurrentUserHasQueueRight( Queue => $args{'RightAppliesTo'},
-						 Right => 'ModifyACL')) {
-	    return (0, 'Permission Denied.');
-	}
-	
-	
-	
-	
-    }
-    #If it's not a scope we recognise, something scary is happening.
-    else {
-	$RT::Logger->err("RT::ACE->Create got a scope it didn't recognize: ".
-			 $args{'RightScope'}." Bailing. \n");
-	return(0,"System error. Unable to grant rights.");
-    }
-
-    # }}}
-
-    # {{{ Canonicalize and check the right name
-    $args{'RightName'} = $self->CanonicalizeRightName($args{'RightName'});
-    
-    #check if it's a valid RightName
-    if ($args{'RightScope'} eq 'Queue') {
-	unless (exists $QUEUERIGHTS{$args{'RightName'}}) {
-	    return(0, 'Invalid right');
-	}	
-	}	
-    elsif ($args{'RightScope' eq 'System'}) {
-	unless (exists $SYSTEMRIGHTS{$args{'RightName'}}) {
-	    return(0, 'Invalid right');
-	}		    
-    }	
-    # }}}
-    
-    # Make sure the right doesn't already exist.
-    $self->LoadByCols (PrincipalId => $princ_id,
-		       PrincipalType => $args{'PrincipalType'},
-		       RightName => $args{'RightName'},
-		       RightScope => $args {'RightScope'},
-		       RightAppliesTo => $args{'RightAppliesTo'}
-		      );
-    if ($self->Id) {
-	return (0, 'That user already has that right');
-    }	
-
-    my $id = $self->SUPER::Create( PrincipalId => $princ_id,
-				   PrincipalType => $args{'PrincipalType'},
-				   RightName => $args{'RightName'},
-				   RightScope => $args {'RightScope'},
-				   RightAppliesTo => $args{'RightAppliesTo'}
-				 );
-    
-    
-    if ($id > 0 ) {
-	return ($id, 'Right Granted');
-    }
-    else {
-	$RT::Logger->err('System error. right not granted.');
-	return(0, 'System Error. right not granted');
-    }
-}
-
-# }}}
-
+    my %args = ( 
+                PrincipalType => '',
+                PrincipalId => '0',
+                RightName => '',
+                ObjectType => '',
+                ObjectId => '0',
+                DelegatedBy => '0',
+                DelegatedFrom => '0',
+
+		  @_);
+    $self->SUPER::Create(
+                         PrincipalType => $args{'PrincipalType'},
+                         PrincipalId => $args{'PrincipalId'},
+                         RightName => $args{'RightName'},
+                         ObjectType => $args{'ObjectType'},
+                         ObjectId => $args{'ObjectId'},
+                         DelegatedBy => $args{'DelegatedBy'},
+                         DelegatedFrom => $args{'DelegatedFrom'},
+);
 
-# {{{ sub Delete 
-
-=head2 Delete
-
-Delete this object.
-
-=cut
-
-sub Delete {
-    my $self = shift;
-    
-    unless ($self->CurrentUserHasRight('ModifyACL')) {
-	return (0, 'Permission Denied');
-    }	
-    
-    
-    my ($val,$msg) = $self->SUPER::Delete(@_);
-    if ($val) {
-	return ($val, 'ACE Deleted');
-    }	
-    else {
-	return (0, 'ACE could not be deleted');
-    }
 }
 
-# }}}
 
-# {{{ sub _BootstrapRight 
 
-=head2 _BootstrapRight
+=item id
 
-Grant a right with no error checking and no ACL. this is _only_ for 
-installation. If you use this routine without jesse@fsck.com's explicit 
-written approval, he will hunt you down and make you spend eternity
-translating mozilla's code into FORTRAN or intercal.
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
 
-=cut
-
-sub _BootstrapRight {
-    my $self = shift;
-    my %args = @_;
-
-    my $id = $self->SUPER::Create( PrincipalId => $args{'PrincipalId'},
-				   PrincipalType => $args{'PrincipalType'},
-				   RightName => $args{'RightName'},
-				   RightScope => $args {'RightScope'},
-				   RightAppliesTo => $args{'RightAppliesTo'}
-				 );
-    
-    if ($id > 0 ) {
-	return ($id);
-    }
-    else {
-	$RT::Logger->err('System error. right not granted.');
-	return(undef);
-    }
-    
-}
-
-# }}}
-
-# {{{ sub CanonicalizeRightName
-
-=head2 CanonicalizeRightName <RIGHT>
-
-Takes a queue or system right name in any case and returns it in
-the correct case. If it's not found, will return undef.
 
 =cut
 
-sub CanonicalizeRightName {
-    my $self = shift;
-    my $right = shift;
-    $right = lc $right;
-    if (exists $LOWERCASERIGHTNAMES{"$right"}) {
-	return ($LOWERCASERIGHTNAMES{"$right"});
-    }
-    else {
-	return (undef);
-    }
-}
-
-# }}}
 
-# {{{ sub QueueRights
+=item PrincipalType
 
-=head2 QueueRights
+Returns the current value of PrincipalType. 
+(In the database, PrincipalType is stored as varchar(25).)
 
-Returns a hash of all the possible rights at the queue scope
 
-=cut
 
-sub QueueRights {
-        return (%QUEUERIGHTS);
-}
+=item SetPrincipalType VALUE
 
-# }}}
 
-# {{{ sub SystemRights
+Set PrincipalType to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, PrincipalType will be stored as a varchar(25).)
 
-=head2 SystemRights
-
-Returns a hash of all the possible rights at the system scope
 
 =cut
 
-sub SystemRights {
-	return (%SYSTEMRIGHTS);
-}
 
+=item PrincipalId
 
-# }}}
+Returns the current value of PrincipalId. 
+(In the database, PrincipalId is stored as int(11).)
 
-# {{{ sub _Accessible 
 
-sub _Accessible  {
-  my $self = shift;  
-  my %Cols = (
-	      PrincipalId => 'read/write',
-	      PrincipalType => 'read/write',
-	      RightName => 'read/write', 
-	      RightScope => 'read/write',
-	      RightAppliesTo => 'read/write'
-	    );
-  return($self->SUPER::_Accessible(@_, %Cols));
-}
-# }}}
 
-# {{{ sub AppliesToObj
+=item SetPrincipalId VALUE
 
-=head2 AppliesToObj
 
-If the AppliesTo is a queue, returns the queue object. If it's 
-the system object, returns undef. If the user has no rights, returns undef.
+Set PrincipalId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, PrincipalId will be stored as a int(11).)
 
-=cut
-
-sub AppliesToObj {
-    my $self = shift;
-    if ($self->RightScope eq 'Queue') {
-	my $appliesto_obj = new RT::Queue($self->CurrentUser);
-	$appliesto_obj->Load($self->RightAppliesTo);
-	return($appliesto_obj);
-    }
-    elsif ($self->RightScope eq 'System') {
-	return (undef);
-    }	
-    else {
-	$RT::Logger->warning("$self -> AppliesToObj called for an object ".
-			     "of an unknown scope:" . $self->RightScope);
-	return(undef);
-    }
-}	
-
-# }}}
-
-# {{{ sub PrincipalObj
-
-=head2 PrincipalObj
-
-If the AppliesTo is a group, returns the group object.
-If the AppliesTo is a user, returns the user object.
-Otherwise, it logs a warning and returns undef.
 
 =cut
 
-sub PrincipalObj {
-    my $self = shift;
-    my ($princ_obj);
-
-    if ($self->PrincipalType eq 'Group') {
-	use RT::Group;
-	$princ_obj = new RT::Group($self->CurrentUser);
-    }
-    elsif ($self->PrincipalType eq 'User') {
-	$princ_obj = new RT::User($self->CurrentUser);
-    }
-    else {
-	$RT::Logger->warning("$self -> PrincipalObj called for an object ".
-			     "of an unknown principal type:" . 
-			     $self->PrincipalType ."\n");
-	return(undef);
-    }
-    
-    $princ_obj->Load($self->PrincipalId);
-    return($princ_obj);
-
-}	
-
-# }}}
-
-# {{{ ACL related methods
-
-# {{{ sub _Set
-
-sub _Set {
-  my $self = shift;
-  return (0, "ACEs can only be created and deleted.");
-}
-
-# }}}
-
-# {{{ sub _Value
-
-sub _Value {
-    my $self = shift;
-
-    unless ($self->CurrentUserHasRight('ShowACL')) {
-	return (undef);
-    }
 
-    return ($self->__Value(@_));
-}
-
-# }}}
+=item RightName
 
+Returns the current value of RightName. 
+(In the database, RightName is stored as varchar(25).)
 
-# {{{ sub CurrentUserHasQueueRight 
 
-=head2 CurrentUserHasQueueRight ( Queue => QUEUEID, Right => RIGHTNANAME )
 
-Check to see whether the current user has the specified right for the specified queue.
-
-=cut
-
-sub CurrentUserHasQueueRight {
-    my $self = shift;
-    my %args = (Queue => undef,
-		Right => undef,
-		@_
-		);
-    return ($self->HasRight( Right => $args{'Right'},
-			     Principal => $self->CurrentUser->UserObj,
-			     Queue => $args{'Queue'}));
-}
+=item SetRightName VALUE
 
-# }}}
 
-# {{{ sub CurrentUserHasSystemRight 
-=head2 CurrentUserHasSystemRight RIGHTNAME
+Set RightName to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, RightName will be stored as a varchar(25).)
 
-Check to see whether the current user has the specified right for the 'system' scope.
 
 =cut
 
-sub CurrentUserHasSystemRight {
-    my $self = shift;
-    my $right = shift;
-    return ($self->HasRight( Right => $right,
-			     Principal => $self->CurrentUser->UserObj,
-			     System => 1
-			   ));
-}
-
 
-# }}}
+=item ObjectType
 
-# {{{ sub CurrentUserHasRight
+Returns the current value of ObjectType. 
+(In the database, ObjectType is stored as varchar(25).)
 
-=item CurrentUserHasRight RIGHT 
-Takes a rightname as a string.
-
-Helper menthod for HasRight. Presets Principal to CurrentUser then 
-calls HasRight.
-
-=cut
 
-sub CurrentUserHasRight {
-    my $self = shift;
-    my $right = shift;
-    return ($self->HasRight( Principal => $self->CurrentUser->UserObj,
-                             Right => $right,
-			   ));
-}
 
-# }}}
+=item SetObjectType VALUE
 
-# {{{ sub HasRight
 
-=item HasRight
+Set ObjectType to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ObjectType will be stored as a varchar(25).)
 
-Takes a param-hash consisting of "Right" and "Principal"  Principal is 
-an RT::User object or an RT::CurrentUser object. "Right" is a textual
-Right string that applies to KeywordSelects
 
 =cut
 
-sub HasRight {
-    my $self = shift;
-    my %args = ( Right => undef,
-                 Principal => undef,
-		 Queue => undef,
-		 System => undef,
-                 @_ ); 
-
-    #If we're explicitly specifying a queue, as we need to do on create
-    if (defined $args{'Queue'}) {
-	return ($args{'Principal'}->HasQueueRight(Right => $args{'Right'},
-						  Queue => $args{'Queue'}));
-    }
-    #else if we're specifying to check a system right
-    elsif ((defined $args{'System'}) and (defined $args{'Right'})) {
-        return( $args{'Principal'}->HasSystemRight( $args{'Right'} ));
-    }	
-    
-    elsif ($self->__Value('RightScope') eq 'System') {
-	return $args{'Principal'}->HasSystemRight($args{'Right'});
-    }
-    elsif ($self->__Value('RightScope') eq 'Queue') {
-	return $args{'Principal'}->HasQueueRight( Queue => $self->__Value('RightAppliesTo'),
-						  Right => $args{'Right'} );
-    }	
-    else {
-	$RT::Logger->warning("$self: Trying to check an acl for a scope we ".
-			     "don't understand:" . $self->__Value('RightScope') ."\n");
-	return undef;
-    }
-
-
-
-}
-# }}}
-
-# }}}
-
-1;
-
-__DATA__
-
-# {{{ POD
-
-=head1 Out of date docs
 
-=head2 Table Structure
+=item ObjectId
 
-PrincipalType, PrincipalId, Right,Scope,AppliesTo
+Returns the current value of ObjectId. 
+(In the database, ObjectId is stored as int(11).)
 
-=head1 The docs are out of date. so you know.
 
-=head1 Scopes
 
-Scope is the scope of the right granted, not the granularity of the grant.
-For example, Queue and Ticket rights are both granted for a "queue." 
-Rights with a scope of 'System' don't have an AppliesTo. (They're global).
-Rights with a scope of "Queue" are rights that act on a queue.
-Rights with a scope of "System" are rights that act on some other aspect
-of the system.
+=item SetObjectId VALUE
 
 
-=item Queue
-=item System
+Set ObjectId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ObjectId will be stored as a int(11).)
 
 
-=head1 Rights
-
-=head2 Scope: Queue
-
-=head2 Queue rights that apply to a ticket within a queue
-
-Create Ticket in <queue>
-
-        Name: Create
-	Principals: <user> <group>
-Display Ticket Summary in <queue>
-
-	Name: Show
-	Principals: <user> <group> Owner Requestor Cc AdminCc
-
-Display Ticket History  <queue>
-
-	Name: ShowHistory
-	Principals: <user> <group> Owner Requestor Cc AdminCc
-
-Display Ticket Private Comments  <queue>
+=cut
 
-	Name: ShowComments
-	Principals: <user> <group> Owner Requestor Cc AdminCc
 
-Reply to Ticket in <queue>
+=item DelegatedBy
 
-	Name: Reply
-	Principals: <user> <group> Owner Requestor Cc AdminCc
+Returns the current value of DelegatedBy. 
+(In the database, DelegatedBy is stored as int(11).)
 
-Comment on Ticket in <queue>
 
-	Name: Comment
-	Principals: <user> <group> Owner Requestor Cc AdminCc
 
-Modify Ticket in <queue>
+=item SetDelegatedBy VALUE
 
-	Name: Modify
-	Principals: <user> <group> Owner Requestor Cc AdminCc
 
-Delete Tickets in <queue>
+Set DelegatedBy to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, DelegatedBy will be stored as a int(11).)
 
-	Name: Delete
-	Principals: <user> <group> Owner Requestor Cc AdminCc
 
+=cut
 
-=head2 Queue Rights that apply to a whole queue
 
-These rights can only be granted to "real people"
+=item DelegatedFrom
 
-List Tickets in <queue>
+Returns the current value of DelegatedFrom. 
+(In the database, DelegatedFrom is stored as int(11).)
 
-	Name: ListQueue
-	Principals: <user> <group>
 
-Know that <queue> exists
-    
-    Name: See
-    Principals: <user> <group>
 
-Display queue settings
+=item SetDelegatedFrom VALUE
 
-    Name: Explore
-    Principals: <user> <group>
 
-Modify Queue Watchers for <queue>
+Set DelegatedFrom to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, DelegatedFrom will be stored as a int(11).)
 
-	Name: ModifyQueueWatchers
-	Principals: <user> <group>
 
-Modify Queue Attributes for <queue> 
+=cut
 
-	Name: ModifyQueue
-	Principals: <user> <group>
 
-Modify Queue ACL for queue <queue>
 
-	Name: ModifyACL
-	Principals: <user> <group>
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        PrincipalType => 
+		{read => 1, write => 1, type => 'varchar(25)', default => ''},
+        PrincipalId => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        RightName => 
+		{read => 1, write => 1, type => 'varchar(25)', default => ''},
+        ObjectType => 
+		{read => 1, write => 1, type => 'varchar(25)', default => ''},
+        ObjectId => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        DelegatedBy => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        DelegatedFrom => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
 
+ }
+};
 
-=head2 Rights that apply to the System scope
 
-=head2 SystemRights
+        eval "require RT::ACE_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/ACE_Overlay.pm}) {
+            die $@;
+        };
 
-Create Queue
-  
-        Name: CreateQueue
-	Principals: <user> <group>
-Delete Queue
-  
-        Name: DeleteQueue
-  	Principals: <user> <group>
+        eval "require RT::ACE_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/ACE_Vendor.pm}) {
+            die $@;
+        };
 
-Create Users
-  
-        Name: CreateUser
-	Principals: <user> <group>
+        eval "require RT::ACE_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/ACE_Local.pm}) {
+            die $@;
+        };
 
-Delete Users
-  
-        Name: DeleteUser
-  	Principals: <user> <group>
-  
-Modify Users
-  
-        Name: ModifyUser
-	Principals: <user> <group>
 
-Modify Self
-        Name: ModifySelf
-	Principals: <user> <group>
 
-Browse Users
 
-        Name: BrowseUsers (NOT IMPLEMENTED in 2.0)
-	Principals: <user> <group>
+=head1 SEE ALSO
 
-Modify Self
-		    
-	Name: ModifySelf
-	Principals: <user> <group>
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
-Modify System ACL
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-	Name: ModifyACL		  
-	Principals: <user> <group>
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
-=head1 The Principal Side of the ACE
+   no warnings qw(redefine);
 
-=head2 PrincipalTypes,PrincipalIds in our Neighborhood
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
-  User,<userid>
-  Group,<groupip>
-  Everyone,NULL
+RT::ACE_Overlay, RT::ACE_Vendor, RT::ACE_Local
 
 =cut
 
-# }}}
+
+1;
diff --git a/rt/lib/RT/ACL.pm b/rt/lib/RT/ACL.pm
index 444a4c2af..81f59c6d0 100755
--- a/rt/lib/RT/ACL.pm
+++ b/rt/lib/RT/ACL.pm
@@ -1,308 +1,115 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/ACL.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Distributed under the terms of the GNU GPL
-# Copyright (c) 2000 Jesse Vincent <jesse@fsck.com>
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::ACL - collection of RT ACE objects
+=head1 NAME
 
+  RT::ACL -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::ACL;
-my $ACL = new RT::ACL($CurrentUser);
+  use RT::ACL
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
-=begin testing
-
-ok(require RT::TestHarness);
-ok(require RT::ACL);
-
-=end testing
-
 =cut
 
 package RT::ACL;
-use RT::EasySearch;
-use RT::ACE;
-@ISA= qw(RT::EasySearch);
-
-# {{{ sub _Init 
-sub _Init  {
-  my $self = shift;
-  $self->{'table'} = "ACL";
-  $self->{'primary_key'} = "id";
-  return ( $self->SUPER::_Init(@_));
-  
-}
-# }}}
-
-# {{{ sub NewItem 
-sub NewItem  {
-  my $self = shift;
-  return(RT::ACE->new($self->CurrentUser));
-}
-# }}}
-
-=head2 Next
-
-Hand out the next ACE that was found
-
-=cut
-
-# {{{ sub Next 
-sub Next {
-    my $self = shift;
-    
-    my $ACE = $self->SUPER::Next();
-    if ((defined($ACE)) and (ref($ACE))) {
-	
-	if ( $ACE->CurrentUserHasRight('ShowACL') or
-	     $ACE->CurrentUserHasRight('ModifyACL')
-	   ) {
-	    return($ACE);
-	}
-	
-	#If the user doesn't have the right to show this ACE
-	else {	
-	    return($self->Next());
-	}
-    }
-    #if there never was any ACE
-    else {
-	return(undef);
-    }	
-    
-}
 
-# }}}
-
-
-=head1 Limit the ACL to a specific scope
-
-There are two real scopes right now:
-
-=item Queue is for rights that apply to a single queue
-
-=item System is for rights that apply to the System (rights that aren't queue related)
-
-
-=head2 LimitToQueue
-
-Takes a single queueid as its argument.
+use RT::SearchBuilder;
+use RT::ACE;
 
-Limit the ACL to just a given queue when supplied with an integer queue id.
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-=cut
 
-sub LimitToQueue {
+sub _Init {
     my $self = shift;
-    my $queue = shift;
-    
-    
-    
-    $self->Limit( FIELD =>'RightScope',
-		  ENTRYAGGREGATOR => 'OR',
-		  VALUE => 'Queue');
-    $self->Limit( FIELD =>'RightScope',
-		  ENTRYAGGREGATOR => 'OR',
-		VALUE => 'Ticket');
-    
-    $self->Limit(ENTRYAGGREGATOR => 'OR',
-		 FIELD => 'RightAppliesTo',
-		 VALUE => $queue );
-  
-}
-
-
-=head2 LimitToSystem()
-
-Limit the ACL to system rights
-
-=cut 
-
-sub LimitToSystem {
-  my $self = shift;
-  
-  $self->Limit( FIELD =>'RightScope',
-		VALUE => 'System');
-}
-
-
-=head2 LimitRightTo
-
-Takes a single RightName as its only argument.
-Limits the search to the right $right.
-$right is a right listed in perldoc RT::ACE
-
-=cut
-
-sub LimitRightTo {
-  my $self = shift;
-  my $right = shift;
-  
-  $self->Limit(ENTRYAGGREGATOR => 'OR',
-	       FIELD => 'RightName',
-	       VALUE => $right );
-  
-}
-
-=head1 Limit to a specifc set of principals
-
-=head2 LimitPrincipalToUser
-
-Takes a single userid as its only argument.
-Limit the ACL to a just a specific user.
-
-=cut
-
-sub LimitPrincipalToUser {
-  my $self = shift;
-  my $user = shift;
-  
-  $self->Limit(ENTRYAGGREGATOR => 'OR',
-	       FIELD => 'PrincipalType',
-	       VALUE => 'User' );
-  
-  $self->Limit(ENTRYAGGREGATOR => 'OR',
-	       FIELD => 'PrincipalId',
-	       VALUE => $user );
-  
-}
-
+    $self->{'table'} = 'ACL';
+    $self->{'primary_key'} = 'id';
 
-=head2 LimitPrincipalToGroup
-
-Takes a single group as its only argument.
-Limit the ACL to just a specific group.
-
-=cut
-  
-sub LimitPrincipalToGroup {
-  my $self = shift;
-  my $group = shift;
-  
-  $self->Limit(ENTRYAGGREGATOR => 'OR',
-	       FIELD => 'PrincipalType',
-	       VALUE => 'Group' );
-
-  $self->Limit(ENTRYAGGREGATOR => 'OR',
-	       FIELD => 'PrincipalId',
-	       VALUE => $group );
 
+    return ( $self->SUPER::_Init(@_) );
 }
 
-=head2 LimitPrincipalToType($type)
 
-Takes a single argument, $type.
-Limit the ACL to just a specific principal type
+=item NewItem
 
-$type is one of:
-  TicketOwner
-  TicketRequestor
-  TicketCc
-  TicketAdminCc
-  Everyone
-  User
-  Group
+Returns an empty new RT::ACE item
 
 =cut
 
-sub LimitPrincipalToType {
-  my $self=shift;
-  my $type=shift;  
-  $self->Limit(ENTRYAGGREGATOR => 'OR',
-		FIELD => 'PrincipalType',
-		VALUE => $type );
+sub NewItem {
+    my $self = shift;
+    return(RT::ACE->new($self->CurrentUser));
 }
 
+        eval "require RT::ACL_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/ACL_Overlay.pm}) {
+            die $@;
+        };
 
-=head2 LimitPrincipalToId 
+        eval "require RT::ACL_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/ACL_Vendor.pm}) {
+            die $@;
+        };
 
-Takes a single argument, the numeric Id of the principal to limit this ACL to. Repeated calls to this 
-function will broaden the scope of the search to include all principals listed.
-
-=cut
-
-sub LimitPrincipalToId {
-    my $self = shift;
-    my $id = shift;
-
-    if ($id =~ /^\d+$/) {
-	$self->Limit(ENTRYAGGREGATOR => 'OR',
-		     FIELD => 'PrincipalId',
-		     VALUE => $id );
-    }
-    else {
-	$RT::Logger->warn($self."->LimitPrincipalToId called with '$id' as an id");
-	return undef;
-    }
-}
+        eval "require RT::ACL_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/ACL_Local.pm}) {
+            die $@;
+        };
 
 
-#wrap around _DoSearch  so that we can build the hash of returned
-#values 
-sub _DoSearch {
-    my $self = shift;
-   # $RT::Logger->debug("Now in ".$self."->_DoSearch");
-    my $return = $self->SUPER::_DoSearch(@_);
-  #  $RT::Logger->debug("In $self ->_DoSearch. return from SUPER::_DoSearch was $return\n");
-    $self->_BuildHash();
-    return ($return);
-}
 
 
-#Build a hash of this ACL's entries.
-sub _BuildHash {
-    my $self = shift;
+=head1 SEE ALSO
 
-    while (my $entry = $self->Next) {
-       my $hashkey = $entry->RightScope . "-" .
-                             $entry->RightAppliesTo . "-" . 
-                             $entry->RightName . "-" .
-                             $entry->PrincipalId . "-" .
-                             $entry->PrincipalType;
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
-        $self->{'as_hash'}->{"$hashkey"} =1;
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-    }
-}
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
+   no warnings qw(redefine);
 
-# {{{ HasEntry
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
-=head2 HasEntry
+RT::ACL_Overlay, RT::ACL_Vendor, RT::ACL_Local
 
 =cut
 
-sub HasEntry {
-
-    my $self = shift;
-    my %args = ( RightScope => undef,
-                 RightAppliesTo => undef,
-                 RightName => undef,
-                 PrincipalId => undef,
-                 PrincipalType => undef,
-                 @_ );
-
-    #if we haven't done the search yet, do it now.
-    $self->_DoSearch();
-
-    if ($self->{'as_hash'}->{ $args{'RightScope'} . "-" .
-			      $args{'RightAppliesTo'} . "-" . 
-			      $args{'RightName'} . "-" .
-			      $args{'PrincipalId'} . "-" .
-			      $args{'PrincipalType'}
-                            } == 1) {
-	return(1);
-    }
-    else {
-	return(undef);
-    }
-}
 
-# }}}
 1;
diff --git a/rt/lib/RT/Action/Autoreply.pm b/rt/lib/RT/Action/Autoreply.pm
index 624888e94..81f7bddfa 100755
--- a/rt/lib/RT/Action/Autoreply.pm
+++ b/rt/lib/RT/Action/Autoreply.pm
@@ -1,7 +1,31 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/Autoreply.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 package RT::Action::Autoreply;
 require RT::Action::SendEmail;
+
+use strict;
+use vars qw/@ISA/;
 @ISA = qw(RT::Action::SendEmail);
 
 
@@ -17,7 +41,7 @@ Sets the recipients of this message to this ticket's Requestor.
 sub SetRecipients {
     my $self=shift;
 
-    push(@{$self->{'To'}}, @{$self->TicketObj->Requestors->Emails});
+    push(@{$self->{'To'}}, $self->TicketObj->Requestors->MemberEmailAddresses);
     
     return(1);
 }
@@ -39,6 +63,7 @@ sub SetReturnAddress {
 		 @_
 	       );
     
+    my $replyto;
     if ($args{'is_comment'}) { 
 	$replyto = $self->TicketObj->QueueObj->CommentAddress || 
 		     $RT::CommentAddress;
@@ -49,7 +74,9 @@ sub SetReturnAddress {
     }
     
     unless ($self->TemplateObj->MIMEObj->head->get('From')) {
-	my $friendly_name=$self->TicketObj->QueueObj->Name;
+	my $friendly_name = $self->TicketObj->QueueObj->Description ||
+		$self->TicketObj->QueueObj->Name;
+	$friendly_name =~ s/"/\\"/g;
 	$self->SetHeader('From', "\"$friendly_name\" <$replyto>");
     }
     
@@ -61,4 +88,9 @@ sub SetReturnAddress {
   
 # }}}
 
+eval "require RT::Action::Autoreply_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/Autoreply_Vendor.pm});
+eval "require RT::Action::Autoreply_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/Autoreply_Local.pm});
+
 1;
diff --git a/rt/lib/RT/Action/Generic.pm b/rt/lib/RT/Action/Generic.pm
index ecfd4ab1a..007d299c7 100755
--- a/rt/lib/RT/Action/Generic.pm
+++ b/rt/lib/RT/Action/Generic.pm
@@ -1,7 +1,26 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/Generic.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-2000 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 =head1 NAME
 
   RT::Action::Generic - a generic baseclass for RT Actions
@@ -16,7 +35,6 @@
 
 =begin testing
 
-ok (require RT::TestHarness);
 ok (require RT::Action::Generic);
 
 =end testing
@@ -25,6 +43,8 @@ ok (require RT::Action::Generic);
 
 package RT::Action::Generic;
 
+use strict;
+
 # {{{ sub new 
 sub new  {
   my $proto = shift;
@@ -36,6 +56,13 @@ sub new  {
 }
 # }}}
 
+# {{{ sub new 
+sub loc {
+    my $self = shift;
+    return $self->{'ScripObj'}->loc(@_);
+}
+# }}}
+
 # {{{ sub _Init 
 sub _Init  {
   my $self = shift;
@@ -87,6 +114,13 @@ sub TemplateObj  {
 }
 # }}}
 
+# {{{ sub ScripObj
+sub ScripObj  {
+  my $self = shift;
+  return($self->{'ScripObj'});
+}
+# }}}
+
 # {{{ sub Type
 sub Type  {
   my $self = shift;
@@ -102,7 +136,7 @@ sub Type  {
 # {{{ sub Commit 
 sub Commit  {
   my $self = shift;
-  return(0,"Commit Stubbed");
+  return(0, $self->loc("Commit Stubbed"));
 }
 # }}}
 
@@ -112,7 +146,7 @@ sub Commit  {
 # {{{ sub Describe 
 sub Describe  {
   my $self = shift;
-  return ("No description for " . ref $self);
+  return $self->loc("No description for [_1]", ref $self);
 }
 # }}}
 
@@ -122,7 +156,7 @@ sub Describe  {
 # {{{ sub Prepare 
 sub Prepare  {
   my $self = shift;
-  return (0,"Prepare Stubbed");
+  return (0, $self->loc("Prepare Stubbed"));
 }
 # }}}
 
@@ -152,4 +186,10 @@ sub DESTROY {
 }
 
 # }}}
+
+eval "require RT::Action::Generic_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/Generic_Vendor.pm});
+eval "require RT::Action::Generic_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/Generic_Local.pm});
+
 1;
diff --git a/rt/lib/RT/Action/Notify.pm b/rt/lib/RT/Action/Notify.pm
index 6dca4fd41..1e4e4c073 100755
--- a/rt/lib/RT/Action/Notify.pm
+++ b/rt/lib/RT/Action/Notify.pm
@@ -1,7 +1,31 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/Notify.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 package RT::Action::Notify;
 require RT::Action::SendEmail;
+
+use strict;
+use vars qw/@ISA/;
 @ISA = qw(RT::Action::SendEmail);
 
 # {{{ sub SetRecipients
@@ -9,14 +33,14 @@ require RT::Action::SendEmail;
 =head2 SetRecipients
 
 Sets the recipients of this meesage to Owner, Requestor, AdminCc, Cc or All. 
-Explicitly B<does not> notify the creator of the transaction.
+Explicitly B<does not> notify the creator of the transaction by default
 
 =cut
 
 sub SetRecipients {
     my $self = shift;
 
-    $arg = $self->Argument;
+    my $arg = $self->Argument;
 
     $arg =~ s/\bAll\b/Owner,Requestor,AdminCc,Cc/;
 
@@ -24,14 +48,14 @@ sub SetRecipients {
 
 
     if ($arg =~ /\bOtherRecipients\b/) {
-        if ($self->TransactionObj->Message->First) {
-            push (@Cc, $self->TransactionObj->Message->First->GetHeader('RT-Send-Cc'));
-            push (@Bcc, $self->TransactionObj->Message->First->GetHeader('RT-Send-Bcc'));
+        if ($self->TransactionObj->Attachments->First) {
+            push (@Cc, $self->TransactionObj->Attachments->First->GetHeader('RT-Send-Cc'));
+            push (@Bcc, $self->TransactionObj->Attachments->First->GetHeader('RT-Send-Bcc'));
         }
     }
 
     if ( $arg =~ /\bRequestor\b/ ) {
-        push ( @To, @{ $self->TicketObj->Requestors->Emails } );
+        push ( @To, $self->TicketObj->Requestors->MemberEmailAddresses  );
     }
 
     
@@ -40,12 +64,12 @@ sub SetRecipients {
 
         #If we have a To, make the Ccs, Ccs, otherwise, promote them to To
         if (@To) {
-            push ( @Cc, @{ $self->TicketObj->Cc->Emails } );
-            push ( @Cc, @{ $self->TicketObj->QueueObj->Cc->Emails } );
+            push ( @Cc, $self->TicketObj->Cc->MemberEmailAddresses );
+            push ( @Cc, $self->TicketObj->QueueObj->Cc->MemberEmailAddresses  );
         }
         else {
-            push ( @Cc, @{ $self->TicketObj->Cc->Emails } );
-            push ( @To, @{ $self->TicketObj->QueueObj->Cc->Emails } );
+            push ( @Cc, $self->TicketObj->Cc->MemberEmailAddresses  );
+            push ( @To, $self->TicketObj->QueueObj->Cc->MemberEmailAddresses  );
         }
     }
 
@@ -65,15 +89,16 @@ sub SetRecipients {
     }
 
     if ( $arg =~ /\bAdminCc\b/ ) {
-        push ( @Bcc, @{ $self->TicketObj->AdminCc->Emails } );
-        push ( @Bcc, @{ $self->TicketObj->QueueObj->AdminCc->Emails } );
+        push ( @Bcc, $self->TicketObj->AdminCc->MemberEmailAddresses  );
+        push ( @Bcc, $self->TicketObj->QueueObj->AdminCc->MemberEmailAddresses  );
     }
 
     if ($RT::UseFriendlyToLine) {
         unless (@To) {
-            push ( @PseudoTo,
-                "\"$arg of $RT::rtname Ticket #"
-                  . $self->TicketObj->id . "\":;" );
+            push (
+		@PseudoTo,
+		sprintf($RT::FriendlyToLineFormat, $arg, $self->TicketObj->id),
+	    );
         }
     }
 
@@ -81,14 +106,17 @@ sub SetRecipients {
 
     #Strip the sender out of the To, Cc and AdminCc and set the 
     # recipients fields used to build the message by the superclass.
-
-    $RT::Logger->debug("$self: To is ".join(",",@To));
-    $RT::Logger->debug("$self: Cc is ".join(",",@Cc));
-    $RT::Logger->debug("$self: Bcc is ".join(",",@Bcc));
-
-    @{ $self->{'To'} }  = grep ( !/^$creator$/, @To );
-    @{ $self->{'Cc'} }  = grep ( !/^$creator$/, @Cc );
-    @{ $self->{'Bcc'} } = grep ( !/^$creator$/, @Bcc );
+    # unless a flag is set 
+    if ($RT::NotifyActor) {
+        @{ $self->{'To'} }  = @To;
+        @{ $self->{'Cc'} }  = @Cc;
+        @{ $self->{'Bcc'} } = @Bcc;
+    }
+    else {
+        @{ $self->{'To'} }  = grep ( !/^$creator$/, @To );
+        @{ $self->{'Cc'} }  = grep ( !/^$creator$/, @Cc );
+        @{ $self->{'Bcc'} } = grep ( !/^$creator$/, @Bcc );
+    }
     @{ $self->{'PseudoTo'} } = @PseudoTo;
     return (1);
 
@@ -96,4 +124,9 @@ sub SetRecipients {
 
 # }}}
 
+eval "require RT::Action::Notify_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/Notify_Vendor.pm});
+eval "require RT::Action::Notify_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/Notify_Local.pm});
+
 1;
diff --git a/rt/lib/RT/Action/NotifyAsComment.pm b/rt/lib/RT/Action/NotifyAsComment.pm
index c72bfff13..210e4ab15 100755
--- a/rt/lib/RT/Action/NotifyAsComment.pm
+++ b/rt/lib/RT/Action/NotifyAsComment.pm
@@ -1,7 +1,31 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/NotifyAsComment.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 package RT::Action::NotifyAsComment;
 require RT::Action::Notify;
+
+use strict;
+use vars qw/@ISA/;
 @ISA = qw(RT::Action::Notify);
 
 
@@ -21,5 +45,11 @@ sub SetReturnAddress {
 	
 	return($self->SUPER::SetReturnAddress(is_comment => 1));
 }
+
+eval "require RT::Action::NotifyAsComment_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/NotifyAsComment_Vendor.pm});
+eval "require RT::Action::NotifyAsComment_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/NotifyAsComment_Local.pm});
+
 1;
 
diff --git a/rt/lib/RT/Action/OpenDependent.pm b/rt/lib/RT/Action/OpenDependent.pm
deleted file mode 100644
index b271e4709..000000000
--- a/rt/lib/RT/Action/OpenDependent.pm
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/Attic/OpenDependent.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# This Action will open the BASE if a dependent is resolved.
-
-package RT::Action::OpenDependent;
-require RT::Action::Generic;
-require RT::Links;
-@ISA=qw(RT::Action::Generic);
-
-#Do what we need to do and send it out.
-
-#What does this type of Action does
-
-# {{{ sub Describe 
-sub Describe  {
-  my $self = shift;
-  return (ref $self . " will stall a [local] BASE if it's open and a dependency link is created.");
-}
-# }}}
-
-
-# {{{ sub Prepare 
-sub Prepare  {
-    # nothing to prepare
-    return 1;
-}
-# }}}
-
-sub Commit {
-    my $self = shift;
-
-    my $Links=RT::Links->new($RT::SystemUser);
-    $Links->Limit(FIELD => 'Type', VALUE => 'DependsOn');
-    $Links->Limit(FIELD => 'Target', VALUE => $self->TicketObj->id);
-
-    while (my $Link=$Links->Next()) {
-	next unless $Link->BaseIsLocal;
-	my $base=RT::Ticket->new($self->TicketObj->CurrentUser);
-	# Todo: Only work if Base is a plain ticket num:
-	$base->Load($Link->Base);
-        $base->Open if $base->Status eq 'stalled';
-    }
-}
-
-
-# Applicability checked in Commit.
-
-# {{{ sub IsApplicable 
-sub IsApplicable  {
-  my $self = shift;
-  1;  
-  return 1;
-}
-# }}}
-
-1;
diff --git a/rt/lib/RT/Action/ResolveMembers.pm b/rt/lib/RT/Action/ResolveMembers.pm
index 00547ebe8..02ff3a58c 100644
--- a/rt/lib/RT/Action/ResolveMembers.pm
+++ b/rt/lib/RT/Action/ResolveMembers.pm
@@ -1,8 +1,34 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 # This Action will resolve all members of a resolved group ticket
 
 package RT::Action::ResolveMembers;
 require RT::Action::Generic;
 require RT::Links;
+
+use strict;
+use vars qw/@ISA/;
 @ISA=qw(RT::Action::Generic);
 
 #Do what we need to do and send it out.
@@ -12,7 +38,7 @@ require RT::Links;
 # {{{ sub Describe 
 sub Describe  {
   my $self = shift;
-  return (ref $self . " will resolve all members of a resolved group ticket.");
+  return $self->loc("[_1] will resolve all members of a resolved group ticket.", ref $self);
 }
 # }}}
 
@@ -33,7 +59,7 @@ sub Commit {
 
     while (my $Link=$Links->Next()) {
 	# Todo: Try to deal with remote URIs as well
-	next unless $Link->BaseIsLocal;
+	next unless $Link->BaseURI->IsLocal;
 	my $base=RT::Ticket->new($self->TicketObj->CurrentUser);
 	# Todo: Only work if Base is a plain ticket num:
 	$base->Load($Link->Base);
@@ -53,5 +79,10 @@ sub IsApplicable  {
 }
 # }}}
 
+eval "require RT::Action::ResolveMembers_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/ResolveMembers_Vendor.pm});
+eval "require RT::Action::ResolveMembers_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/ResolveMembers_Local.pm});
+
 1;
 
diff --git a/rt/lib/RT/Action/SendEmail.pm b/rt/lib/RT/Action/SendEmail.pm
index e3abb1154..dac8fc8e7 100755
--- a/rt/lib/RT/Action/SendEmail.pm
+++ b/rt/lib/RT/Action/SendEmail.pm
@@ -1,20 +1,44 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/SendEmail.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Copyright 1996-2002  Jesse Vincent <jesse@bestpractical.com> 
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 # Portions Copyright 2000 Tobias Brox <tobix@cpan.org>
-# Released under the terms of version 2 of the GNU Public License
 
 package RT::Action::SendEmail;
 require RT::Action::Generic;
 
+use strict;
+use vars qw/@ISA/;
 @ISA = qw(RT::Action::Generic);
 
+use MIME::Words qw(encode_mimeword);
 
-=head1 NAME
+use RT::EmailParser;
 
-  RT::Action::SendEmail - An Action which users can use to send mail 
-  or can subclassed for more specialized mail sending behavior. 
-  RT::Action::AutoReply is a good example subclass.
+=head1 NAME
 
+RT::Action::SendEmail - An Action which users can use to send mail 
+or can subclassed for more specialized mail sending behavior. 
+RT::Action::AutoReply is a good example subclass.
 
 =head1 SYNOPSIS
 
@@ -36,7 +60,6 @@ the comments for the SetRecipients sub).
 
 =begin testing
 
-ok (require RT::TestHarness);
 ok (require RT::Action::SendEmail);
 
 =end testing
@@ -54,158 +77,266 @@ perl(1).
 
 # {{{ Scrip methods (_Init, Commit, Prepare, IsApplicable)
 
-# {{{ sub _Init 
+# {{{ sub _Init
 # We use _Init from RT::Action
 # }}}
 
-# {{{ sub Commit 
+# {{{ sub Commit
 #Do what we need to do and send it out.
-sub Commit  {
+sub Commit {
     my $self = shift;
+
+    my $MIMEObj = $self->TemplateObj->MIMEObj;
+    my $msgid = $MIMEObj->head->get('Message-Id');
+    chomp $msgid;
+    $RT::Logger->info($msgid." #".$self->TicketObj->id."/".$self->TransactionObj->id." - Scrip ". $self->ScripObj->id ." ".$self->ScripObj->Description);
     #send the email
-    
+
+        # Weed out any RT addresses. We really don't want to talk to ourselves!
+        @{$self->{'To'}} = RT::EmailParser::CullRTAddresses("", @{$self->{'To'}});
+        @{$self->{'Cc'}} = RT::EmailParser::CullRTAddresses("", @{$self->{'Cc'}});
+        @{$self->{'Bcc'}} = RT::EmailParser::CullRTAddresses("", @{$self->{'Bcc'}});
     # If there are no recipients, don't try to send the message.
     # If the transaction has content and has the header RT-Squelch-Replies-To
-    
-    if (defined $self->TransactionObj->Message->First()) { 
-	my $headers = $self->TransactionObj->Message->First->Headers();
-	
-	if ($headers =~ /^RT-Squelch-Replies-To: (.*?)$/si) {
-	    my @blacklist = split(/,/,$1);
-	    
-	    # Cycle through the people we're sending to and pull out anyone on the
-	    # system blacklist
-	    
-	    foreach my $person_to_yank (@blacklist) {
-		$person_to_yank =~ s/\s//g;
-		@{$self->{'To'}} = grep (!/^$person_to_yank$/, @{$self->{'To'}});
-		@{$self->{'Cc'}} = grep (!/^$person_to_yank$/, @{$self->{'Cc'}});
-		@{$self->{'Bcc'}} = grep (!/^$person_to_yank$/, @{$self->{'Bcc'}});
-	    }
-	}
+
+    if ( defined $self->TransactionObj->Attachments->First() ) {
+
+        my $squelch = $self->TransactionObj->Attachments->First->GetHeader( 'RT-Squelch-Replies-To');
+
+        if ($squelch) {
+            my @blacklist = split ( /,/, $squelch );
+
+            # Cycle through the people we're sending to and pull out anyone on the
+            # system blacklist
+
+            foreach my $person_to_yank (@blacklist) {
+                $person_to_yank =~ s/\s//g;
+                @{ $self->{'To'} } =
+                  grep ( !/^$person_to_yank$/, @{ $self->{'To'} } );
+                @{ $self->{'Cc'} } =
+                  grep ( !/^$person_to_yank$/, @{ $self->{'Cc'} } );
+                @{ $self->{'Bcc'} } =
+                  grep ( !/^$person_to_yank$/, @{ $self->{'Bcc'} } );
+            }
+        }
     }
-    
-    # Go add all the Tos, Ccs and Bccs that we need to to the message to 
+
+    # Go add all the Tos, Ccs and Bccs that we need to to the message to
     # make it happy, but only if we actually have values in those arrays.
-    
-    $self->SetHeader('To', join(',', @{$self->{'To'}})) 
-      if (@{$self->{'To'}});
-    $self->SetHeader('Cc', join(',' , @{$self->{'Cc'}})) 
-      if (@{$self->{'Cc'}});
-	$self->SetHeader('Bcc', join(',', @{$self->{'Bcc'}})) 
-	  if (@{$self->{'Bcc'}});;
-    
-    my $MIMEObj = $self->TemplateObj->MIMEObj;
-    
 
-    $MIMEObj->make_singlepart;
-    
-    
+    $self->SetHeader( 'To', join ( ',', @{ $self->{'To'} } ) )
+      if ( $self->{'To'} && @{ $self->{'To'} } );
+    $self->SetHeader( 'Cc', join ( ',', @{ $self->{'Cc'} } ) )
+      if ( $self->{'Cc'} && @{ $self->{'Cc'} } );
+    $self->SetHeader( 'Bcc', join ( ',', @{ $self->{'Bcc'} } ) )
+      if ( $self->{'Cc'} && @{ $self->{'Bcc'} } );
+
+
+    $self->SetHeader('MIME-Version', '1.0');
+
+    # try to convert message body from utf-8 to $RT::EmailOutputEncoding
+    $self->SetHeader( 'Content-Type', 'text/plain; charset="utf-8"' );
+
+    RT::I18N::SetMIMEEntityToEncoding( $MIMEObj, $RT::EmailOutputEncoding, 'mime_words_ok' );
+    $self->SetHeader( 'Content-Type', 'text/plain; charset="' . $RT::EmailOutputEncoding . '"' );
+
+
+    # Build up a MIME::Entity that looks like the original message.
+
+    my $do_attach = $self->TemplateObj->MIMEObj->head->get('RT-Attach-Message');
+
+    if ($do_attach) {
+        $self->TemplateObj->MIMEObj->head->delete('RT-Attach-Message');
+
+        my $attachments = RT::Attachments->new($RT::SystemUser);
+        $attachments->Limit( FIELD => 'TransactionId',
+                             VALUE => $self->TransactionObj->Id );
+        $attachments->OrderBy('id');
+
+        my $transaction_content_obj = $self->TransactionObj->ContentObj;
+
+        # attach any of this transaction's attachments
+        while ( my $attach = $attachments->Next ) {
+
+            # Don't attach anything blank
+            next unless ( $attach->ContentLength );
+
+            # We want to make sure that we don't include the attachment that's being sued as the "Content" of this message"
+            next
+              if (    $transaction_content_obj
+                   && $transaction_content_obj->Id == $attach->Id 
+                   && $transaction_content_obj->ContentType =~ qr{text/plain}i
+                );
+            $MIMEObj->make_multipart('mixed');
+            $MIMEObj->attach( Type => $attach->ContentType,
+                              Charset => $attach->OriginalEncoding,
+                              Data => $attach->OriginalContent,
+                              Filename => $self->MIMEEncodeString( $attach->Filename, $RT::EmailOutputEncoding ),
+                              Encoding    => '-SUGGEST');
+        }
+
+    }
+
+
+    my $retval = $self->SendMessage($MIMEObj);
+
+
+    return ($retval);
+}
+
+# }}}
+
+# {{{ sub Prepare
+
+sub Prepare {
+    my $self = shift;
+
+    # This actually populates the MIME::Entity fields in the Template Object
+
+    unless ( $self->TemplateObj ) {
+        $RT::Logger->warning("No template object handed to $self\n");
+    }
+
+    unless ( $self->TransactionObj ) {
+        $RT::Logger->warning("No transaction object handed to $self\n");
+
+    }
+
+    unless ( $self->TicketObj ) {
+        $RT::Logger->warning("No ticket object handed to $self\n");
+
+    }
+
+    my ( $result, $message ) = $self->TemplateObj->Parse(
+                                         Argument       => $self->Argument,
+                                         TicketObj      => $self->TicketObj,
+                                         TransactionObj => $self->TransactionObj
+    );
+    if ($result) {
+
+        # Header
+        $self->SetSubject();
+        $self->SetSubjectToken();
+        $self->SetRecipients();
+        $self->SetReturnAddress();
+        $self->SetRTSpecialHeaders();
+        if ($RT::EmailOutputEncoding) {
+
+            # l10n related header
+            $self->SetHeaderAsEncoding( 'Subject', $RT::EmailOutputEncoding );
+        }
+    }
+
+    return $result;
+
+}
+
+# }}}
+
+# }}}
+
+# {{{ SendMessage
+=head2 SendMessage MIMEObj
+
+sends the message using RT's preferred API.
+TODO: Break this out to a seperate module
+
+=cut
+
+sub SendMessage {
+    my $self = shift;
+    my $MIMEObj = shift;
+
+    my $msgid = $MIMEObj->head->get('Message-Id');
+
+
     #If we don't have any recipients to send to, don't send a message;
-    unless ($MIMEObj->head->get('To') ||
-	    $MIMEObj->head->get('Cc') || 
-	    $MIMEObj->head->get('Bcc') ) {
-	$RT::Logger->debug("$self: No recipients found. Not sending.\n");
-	return(1);
+    unless (    $MIMEObj->head->get('To')
+             || $MIMEObj->head->get('Cc')
+             || $MIMEObj->head->get('Bcc') ) {
+        $RT::Logger->info($msgid.  " No recipients found. Not sending.\n");
+        return (1);
     }
 
     # PseudoTo	(fake to headers) shouldn't get matched for message recipients.
     # If we don't have any 'To' header, drop in the pseudo-to header.
 
-    $self->SetHeader('To', join(',', @{$self->{'PseudoTo'}}))
-      if ( (@{$self->{'PseudoTo'}}) and (! $MIMEObj->head->get('To')));
-    
-    if ($RT::MailCommand eq 'sendmailpipe') {
-	open (MAIL, "|$RT::SendmailPath $RT::SendmailArguments") || return(0);
-	print MAIL $MIMEObj->as_string;
-	close(MAIL);
+    $self->SetHeader( 'To', join ( ',', @{ $self->{'PseudoTo'} } ) )
+      if ( $self->{'PseudoTo'} && ( @{ $self->{'PseudoTo'} } )
+           and ( !$MIMEObj->head->get('To') ) );
+    if ( $RT::MailCommand eq 'sendmailpipe' ) {
+        eval {
+            open( MAIL, "|$RT::SendmailPath $RT::SendmailArguments" );
+            print MAIL $MIMEObj->as_string;
+            close(MAIL);
+          };
+          if ($@) {
+            $RT::Logger->crit($msgid.  "Could not send mail. -".$@ );
+        }
     }
     else {
-	unless ($MIMEObj->send($RT::MailCommand, $RT::MailParams)) {
-	    $RT::Logger->crit("$self: Could not send mail for ".
-			      $self->TransactionObj . "\n");
-	    return(0);
+	my @mailer_args = ($RT::MailCommand);
+	local $ENV{MAILADDRESS};
+
+        if ( $RT::MailCommand eq 'sendmail' ) {
+	    push @mailer_args, $RT::SendmailArguments;
+        }
+        elsif ( $RT::MailCommand eq 'smtp' ) {
+	    $ENV{MAILADDRESS} = $RT::SMTPFrom || $MIMEObj->head->get('From');
+	    push @mailer_args, (Server => $RT::SMTPServer);
+	    push @mailer_args, (Debug => $RT::SMTPDebug);
+        }
+	else {
+	    push @mailer_args, $RT::MailParams;
 	}
+
+        unless ( $MIMEObj->send( @mailer_args ) ) {
+            $RT::Logger->crit($msgid.  "Could not send mail." );
+            return (0);
+        }
     }
-    
-    return (1);
-    
-}
-# }}}
 
-# {{{ sub Prepare 
 
-sub Prepare  {
-  my $self = shift;
-  
-  # This actually populates the MIME::Entity fields in the Template Object
-  
-  unless ($self->TemplateObj) {
-    $RT::Logger->warning("No template object handed to $self\n");
-  }
-  
-  unless ($self->TransactionObj) {
-    $RT::Logger->warning("No transaction object handed to $self\n");
-    
-  }
-  
-  unless ($self->TicketObj) {
-    $RT::Logger->warning("No ticket object handed to $self\n");
-      
-  }
-  
-  
-  $self->TemplateObj->Parse(Argument => $self->Argument,
-			    TicketObj => $self->TicketObj, 
-			    TransactionObj => $self->TransactionObj);
-  
-  # Header
-  
-  $self->SetSubject();
-  
-  $self->SetSubjectToken();
-  
-  $self->SetRecipients();  
-  
-  $self->SetReturnAddress();
+     my $success = ($msgid. " sent To: ".$MIMEObj->head->get('To') . " Cc: ".$MIMEObj->head->get('Cc') . " Bcc: ".$MIMEObj->head->get('Bcc'));
+    $success =~ s/\n//gi;
+    $RT::Logger->info($success);
 
-  $self->SetRTSpecialHeaders();
-  
-  return 1;
-  
+    return (1);
 }
 
 # }}}
 
-# }}}
-
 # {{{ Deal with message headers (Set* subs, designed for  easy overriding)
 
 # {{{ sub SetRTSpecialHeaders
 
-# This routine adds all the random headers that RT wants in a mail message
-# that don't matter much to anybody else.
+=head2 SetRTSpecialHeaders 
+
+This routine adds all the random headers that RT wants in a mail message
+that don't matter much to anybody else.
+
+=cut
 
 sub SetRTSpecialHeaders {
     my $self = shift;
-    
+
     $self->SetReferences();
 
     $self->SetMessageID();
-    
+
     $self->SetPrecedence();
 
-    $self->SetHeader('X-RT-Loop-Prevention', $RT::rtname); 
-    $self->SetHeader('RT-Ticket', $RT::rtname. " #".$self->TicketObj->id());
-    $self->SetHeader
-      ('Managed-by',"RT $RT::VERSION (http://bestpractical.com/rt/)");
-    
-    $self->SetHeader('RT-Originator', $self->TransactionObj->CreatorObj->EmailAddress);
-    return();
-    
-}
+    $self->SetHeader( 'X-RT-Loop-Prevention', $RT::rtname );
+    $self->SetHeader( 'RT-Ticket',
+                      $RT::rtname . " #" . $self->TicketObj->id() );
+    $self->SetHeader( 'Managed-by',
+                      "RT $RT::VERSION (http://www.bestpractical.com/rt/)" );
 
+    $self->SetHeader( 'RT-Originator',
+                      $self->TransactionObj->CreatorObj->EmailAddress );
+    return ();
 
+}
 
 # {{{ sub SetReferences
 
@@ -218,105 +349,126 @@ sub SetRTSpecialHeaders {
 =cut
 
 sub SetReferences {
-  my $self = shift;
-  
-  # TODO: this one is broken.  What is this email really a reply to?
-  # If it's a reply to an incoming message, we'll need to use the
-  # actual message-id from the appropriate Attachment object.  For
-  # incoming mails, we would like to preserve the In-Reply-To and/or
-  # References.
+    my $self = shift;
 
-  $self->SetHeader
-    ('In-Reply-To', "<rt-".$self->TicketObj->id().
-     "\@".$RT::rtname.">");
+    # TODO: this one is broken.  What is this email really a reply to?
+    # If it's a reply to an incoming message, we'll need to use the
+    # actual message-id from the appropriate Attachment object.  For
+    # incoming mails, we would like to preserve the In-Reply-To and/or
+    # References.
 
+    $self->SetHeader( 'In-Reply-To',
+                   "<rt-" . $self->TicketObj->id() . "\@" . $RT::rtname . ">" );
 
-  # TODO We should always add References headers for all message-ids
-  # of previous messages related to this ticket.
+    # TODO We should always add References headers for all message-ids
+    # of previous messages related to this ticket.
 }
 
 # }}}
 
 # {{{ sub SetMessageID
 
-# Without this one, threading won't work very nice in email agents.
-# Anyway, I'm not really sure it's that healthy if we need to send
-# several separate/different emails about the same transaction.
+=head2 SetMessageID 
 
-sub SetMessageID {
-  my $self = shift;
+Without this one, threading won't work very nice in email agents.
+Anyway, I'm not really sure it's that healthy if we need to send
+several separate/different emails about the same transaction.
 
-  # TODO this one might be sort of broken.  If we have several scrips +++
-  # sending several emails to several different persons, we need to
-  # pull out different message-ids.  I'd suggest message ids like
-  # "rt-ticket#-transaction#-scrip#-receipient#"
+=cut
+
+sub SetMessageID {
+    my $self = shift;
 
-  $self->SetHeader
-    ('Message-ID', "<rt-".$self->TicketObj->id().
-     "-".
-     $self->TransactionObj->id()."." .rand(20) . "\@".$RT::Organization.">")
+    # TODO this one might be sort of broken.  If we have several scrips +++
+    # sending several emails to several different persons, we need to
+    # pull out different message-ids.  I'd suggest message ids like
+    # "rt-ticket#-transaction#-scrip#-receipient#"
+
+    $self->SetHeader( 'Message-ID',
+                      "<rt-"
+                        . $RT::VERSION ."-"
+                        . $self->TicketObj->id() . "-"
+                        . $self->TransactionObj->id() . "."
+                        . rand(20) . "\@"
+                        . $RT::Organization . ">" )
       unless $self->TemplateObj->MIMEObj->head->get('Message-ID');
 }
 
-
 # }}}
 
 # }}}
 
-# {{{ sub SetReturnAddress 
+# {{{ sub SetReturnAddress
+
+=head2 SetReturnAddress is_comment => BOOLEAN
+
+Calculate and set From and Reply-To headers based on the is_comment flag.
+
+=cut
 
 sub SetReturnAddress {
 
-  my $self = shift;
-  my %args = ( is_comment => 0,
-	       @_ );
-
-  # From and Reply-To
-  # $args{is_comment} should be set if the comment address is to be used.
-  my $replyto;
-
-  if ($args{'is_comment'}) { 
-      $replyto = $self->TicketObj->QueueObj->CommentAddress || 
-		  $RT::CommentAddress;
-  }
-  else {
-      $replyto = $self->TicketObj->QueueObj->CorrespondAddress ||
-		  $RT::CorrespondAddress;
-  }
-    
-  unless ($self->TemplateObj->MIMEObj->head->get('From')) {
-      my $friendly_name=$self->TransactionObj->CreatorObj->RealName;
-
-      if ($friendly_name =~ /^\S+\@\S+$/) { # A "bare" mail address
-          $friendly_name =~ s/"/\\"/g;
-          $friendly_name = qq|"$friendly_name"|;
-      }
-
-
-      # TODO: this "via RT" should really be site-configurable.
-      $self->SetHeader('From', "\"$friendly_name via RT\" <$replyto>");
-  }
-  
-  unless ($self->TemplateObj->MIMEObj->head->get('Reply-To')) {
-      $self->SetHeader('Reply-To', "$replyto");
-  }
-  
+    my $self = shift;
+    my %args = ( is_comment => 0,
+                 @_ );
+
+    # From and Reply-To
+    # $args{is_comment} should be set if the comment address is to be used.
+    my $replyto;
+
+    if ( $args{'is_comment'} ) {
+        $replyto = $self->TicketObj->QueueObj->CommentAddress
+          || $RT::CommentAddress;
+    }
+    else {
+        $replyto = $self->TicketObj->QueueObj->CorrespondAddress
+          || $RT::CorrespondAddress;
+    }
+
+    unless ( $self->TemplateObj->MIMEObj->head->get('From') ) {
+	if ($RT::UseFriendlyFromLine) {
+	    my $friendly_name = $self->TransactionObj->CreatorObj->RealName;
+	    if ( $friendly_name =~ /^"(.*)"$/ ) {    # a quoted string
+		$friendly_name = $1;
+	    }
+
+	    $friendly_name =~ s/"/\\"/g;
+	    $self->SetHeader( 'From',
+		        sprintf($RT::FriendlyFromLineFormat, 
+                $self->MIMEEncodeString( $friendly_name, $RT::EmailOutputEncoding ), $replyto),
+	    );
+	}
+	else {
+	    $self->SetHeader( 'From', $replyto );
+	}
+    }
+
+    unless ( $self->TemplateObj->MIMEObj->head->get('Reply-To') ) {
+        $self->SetHeader( 'Reply-To', "$replyto" );
+    }
+
 }
 
 # }}}
 
 # {{{ sub SetHeader
 
+=head2 SetHeader FIELD, VALUE
+
+Set the FIELD of the current MIME object into VALUE.
+
+=cut
+
 sub SetHeader {
-  my $self = shift;
-  my $field = shift;
-  my $val = shift;
-
-  chomp $val;                                                                  
-  chomp $field;                                                                
-  $self->TemplateObj->MIMEObj->head->fold_length($field,10000);     
-  $self->TemplateObj->MIMEObj->head->add($field, $val);
-  return $self->TemplateObj->MIMEObj->head->get($field);
+    my $self  = shift;
+    my $field = shift;
+    my $val   = shift;
+
+    chomp $val;
+    chomp $field;
+    $self->TemplateObj->MIMEObj->head->fold_length( $field, 10000 );
+    $self->TemplateObj->MIMEObj->head->replace( $field,     $val );
+    return $self->TemplateObj->MIMEObj->head->get($field);
 }
 
 # }}}
@@ -331,21 +483,29 @@ Dummy method to be overriden by subclasses which want to set the recipients.
 
 sub SetRecipients {
     my $self = shift;
-    return();
+    return ();
 }
 
 # }}}
 
 # {{{ sub SetTo
 
+=head2 SetTo
+
+Takes a string that is the addresses you want to send mail to
+
+=cut
+
 sub SetTo {
-    my $self=shift;
+    my $self      = shift;
     my $addresses = shift;
-    return $self->SetHeader('To',$addresses);
+    return $self->SetHeader( 'To', $addresses );
 }
+
 # }}}
 
 # {{{ sub SetCc
+
 =head2 SetCc
 
 Takes a string that is the addresses you want to Cc
@@ -353,11 +513,12 @@ Takes a string that is the addresses you want to Cc
 =cut
 
 sub SetCc {
-    my $self=shift;
+    my $self      = shift;
     my $addresses = shift;
 
-    return $self->SetHeader('Cc', $addresses);
+    return $self->SetHeader( 'Cc', $addresses );
 }
+
 # }}}
 
 # {{{ sub SetBcc
@@ -367,23 +528,24 @@ sub SetCc {
 Takes a string that is the addresses you want to Bcc
 
 =cut
+
 sub SetBcc {
-    my $self=shift;
+    my $self      = shift;
     my $addresses = shift;
 
-    return $self->SetHeader('Bcc', $addresses);
+    return $self->SetHeader( 'Bcc', $addresses );
 }
 
 # }}}
 
-# {{{ sub SetPrecedence 
+# {{{ sub SetPrecedence
 
 sub SetPrecedence {
-  my $self = shift;
+    my $self = shift;
 
-  unless ($self->TemplateObj->MIMEObj->head->get("Precedence")) { 
-    $self->SetHeader('Precedence', "bulk");
-   }
+    unless ( $self->TemplateObj->MIMEObj->head->get("Precedence") ) {
+        $self->SetHeader( 'Precedence', "bulk" );
+    }
 }
 
 # }}}
@@ -399,70 +561,125 @@ the transaction's subject.
 =cut 
 
 sub SetSubject {
-  my $self = shift;
-  unless ($self->TemplateObj->MIMEObj->head->get('Subject')) {
-    my $message=$self->TransactionObj->Message;
-    my $ticket=$self->TicketObj->Id;
-    
+    my $self = shift;
     my $subject;
-    
-    if ($self->{'Subject'}) {
-      $subject = $self->{'Subject'};
-    }
-    elsif (($message->First()) &&
-	   ($message->First->Headers)) {
-      $header = $message->First->Headers();
-      $header =~ s/\n\s+/ /g; 
-      if ( $header =~ /^Subject: (.*?)$/m ) {
-	$subject = $1;
-      }
-      else {
-	$subject = $self->TicketObj->Subject();
-      }
-      
-    }
-    else {
-      $subject = $self->TicketObj->Subject();
-    }
-    
-    $subject =~ s/(\r\n|\n|\s)/ /gi;
 
-    chomp $subject;
-    $self->SetHeader('Subject',$subject);
-    
+    unless ( $self->TemplateObj->MIMEObj->head->get('Subject') ) {
+        my $message = $self->TransactionObj->Attachments;
+        my $ticket  = $self->TicketObj->Id;
+
+        if ( $self->{'Subject'} ) {
+            $subject = $self->{'Subject'};
+        }
+        elsif (    ( $message->First() )
+                && ( $message->First->Headers ) ) {
+            my $header = $message->First->Headers();
+            $header =~ s/\n\s+/ /g;
+            if ( $header =~ /^Subject: (.*?)$/m ) {
+                $subject = $1;
+            }
+            else {
+                $subject = $self->TicketObj->Subject();
+            }
+
+        }
+        else {
+            $subject = $self->TicketObj->Subject();
+        }
+
+        $subject =~ s/(\r\n|\n|\s)/ /gi;
+
+        chomp $subject;
+        $self->SetHeader( 'Subject', $subject );
+
     }
-  return($subject);
+    return ($subject);
 }
+
 # }}}
 
 # {{{ sub SetSubjectToken
 
 =head2 SetSubjectToken
 
- This routine fixes the RT tag in the subject. It's unlikely that you want to overwrite this.
+This routine fixes the RT tag in the subject. It's unlikely that you want to overwrite this.
 
 =cut
 
 sub SetSubjectToken {
-  my $self=shift;
-  my $tag = "[$RT::rtname #".$self->TicketObj->id."]";
-  my $sub = $self->TemplateObj->MIMEObj->head->get('Subject');
-  unless ($sub =~ /\Q$tag\E/) {
-    $sub =~ s/(\r\n|\n|\s)/ /gi;
-    chomp $sub;
-    $self->TemplateObj->MIMEObj->head->replace('Subject', "$tag $sub");
-  }
+    my $self = shift;
+    my $tag  = "[$RT::rtname #" . $self->TicketObj->id . "]";
+    my $sub  = $self->TemplateObj->MIMEObj->head->get('Subject');
+    unless ( $sub =~ /\Q$tag\E/ ) {
+        $sub =~ s/(\r\n|\n|\s)/ /gi;
+        chomp $sub;
+        $self->TemplateObj->MIMEObj->head->replace( 'Subject', "$tag $sub" );
+    }
 }
 
 # }}}
 
 # }}}
 
-__END__
+# {{{
+
+=head2 SetHeaderAsEncoding($field_name, $charset_encoding)
+
+This routine converts the field into specified charset encoding.
+
+=cut
+
+sub SetHeaderAsEncoding {
+    my $self = shift;
+    my ( $field, $enc ) = ( shift, shift );
+
+    if ($field eq 'From' and $RT::SMTPFrom) {
+        $self->TemplateObj->MIMEObj->head->replace( $field, $RT::SMTPFrom );
+	return;
+    }
+
+    my $value = $self->TemplateObj->MIMEObj->head->get($field);
+
+    # don't bother if it's us-ascii
+
+    # See RT::I18N, 'NOTES:  Why Encode::_utf8_off before Encode::from_to'
+
+    $value =  $self->MIMEEncodeString($value, $enc);
+
+    $self->TemplateObj->MIMEObj->head->replace( $field, $value );
+
+
+} 
+# }}}
+
+# {{{ MIMENcodeString
+
+=head2 MIMEEncodeString STRING ENCODING
+
+Takes a string and a possible encoding and returns the string wrapped in MIME goo.
+
+=cut
+
+sub MIMEEncodeString {
+    my  $self = shift;
+    my $value = shift;
+    my $enc = shift;
 
-# {{{ POD
+    chomp $value;
+    return ($value) unless $value =~ /[^\x20-\x7e]/;
+
+    $value =~ s/\s*$//;
+    Encode::_utf8_off($value);
+    my $res = Encode::from_to( $value, "utf-8", $enc );
+    $value = encode_mimeword( $value,  'B', $enc );
+}
 
 # }}}
 
+eval "require RT::Action::SendEmail_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/SendEmail_Vendor.pm});
+eval "require RT::Action::SendEmail_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/SendEmail_Local.pm});
+
 1;
 
diff --git a/rt/lib/RT/Action/SendPasswordEmail.pm b/rt/lib/RT/Action/SendPasswordEmail.pm
deleted file mode 100755
index 91bb3c1cb..000000000
--- a/rt/lib/RT/Action/SendPasswordEmail.pm
+++ /dev/null
@@ -1,170 +0,0 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/Attic/SendPasswordEmail.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Copyright 2001  Jesse Vincent <jesse@fsck.com>
-# Released under the terms of the GNU Public License
-
-package RT::Action::SendPasswordEmail;
-require RT::Action::Generic;
-
-@ISA = qw(RT::Action::Generic);
-
-
-=head1 NAME
-
-  RT::Action::SendGenericEmail - An Action which users can use to send mail 
-  or can subclassed for more specialized mail sending behavior. 
-
-
-
-=head1 SYNOPSIS
-
-  require RT::Action::SendPasswordEmail;
-
-
-=head1 DESCRIPTION
-
-Basically, you create another module RT::Action::YourAction which ISA
-RT::Action::SendEmail.
-
-If you want to set the recipients of the mail to something other than
-the addresses mentioned in the To, Cc, Bcc and headers in
-the template, you should subclass RT::Action::SendEmail and override
-either the SetRecipients method or the SetTo, SetCc, etc methods (see
-the comments for the SetRecipients sub).
-
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Action::SendPasswordEmail);
-
-=end testing
-
-
-=head1 AUTHOR
-
-Jesse Vincent <jesse@bestpractical.com>
-
-=head1 SEE ALSO
-
-perl(1).
-
-=cut
-
-# {{{ Scrip methods (_Init, Commit, Prepare, IsApplicable)
-
-# {{{ sub Commit 
-
-#Do what we need to do and send it out.
-
-sub Commit  {
-    my $self = shift;
-    #send the email
-    
-    
-    
-
-    
-    my $MIMEObj = $self->TemplateObj->MIMEObj;
-    
-    
-    $MIMEObj->make_singlepart;
-    
-    #If we don\'t have any recipients to send to, don\'t send a message;
-    unless ($MIMEObj->head->get('To')) {
-	$RT::Logger->debug("$self: No recipients found. Not sending.\n");
-	return(1);
-    }
-    
-    if ($RT::MailCommand eq 'sendmailpipe') {
-	open (MAIL, "|$RT::SendmailPath $RT::SendmailArguments") || return(0);
-	print MAIL $MIMEObj->as_string;
-	close(MAIL);
-    }
-    else {
-	unless ($MIMEObj->send($RT::MailCommand, $RT::MailParams)) {
-	    $RT::Logger->crit("$self: Could not send mail for ".
-			      $self->TransactionObj . "\n");
-	    return(0);
-	}
-    }
-    
-    return (1);
-    
-}
-# }}}
-
-# {{{ sub Prepare 
-
-sub Prepare  {
-    my $self = shift;
-    
-    # This actually populates the MIME::Entity fields in the Template Object
-    
-    unless ($self->TemplateObj) {
-	$RT::Logger->warning("No template object handed to $self\n");
-    }
-    
-    
-    unless ($self->TemplateObj->MIMEObj->head->get('Reply-To')) {
-	$self->SetHeader('Reply-To',$RT::CorrespondAddress );
-    }
-
-    
-    $self->SetHeader('Precedence', "bulk");
-    $self->SetHeader('X-RT-Loop-Prevention', $RT::rtname); 
-    $self->SetHeader
-      ('Managed-by',"Request Tracker $RT::VERSION (http://www.fsck.com/projects/rt/)");
-    
-    $self->TemplateObj->Parse(Argument => $self->Argument);
-    
-    
-    return 1;
-}
-
-# }}}
-
-# }}}
-
-
-# {{{ sub SetTo
-
-=head2 SetTo EMAIL
-
-Sets this message's "To" field to EMAIL
-
-=cut
-
-sub SetTo {
-    my $self = shift;
-    my $to = shift;
-    $self->SetHeader('To',$to);
-}
-
-# }}}
-
-# {{{ sub SetHeader
-
-sub SetHeader {
-  my $self = shift;
-  my $field = shift;
-  my $val = shift;
-
-  chomp $val;                                                                  
-  chomp $field;                                                                
-  $self->TemplateObj->MIMEObj->head->fold_length($field,10000);     
-  $self->TemplateObj->MIMEObj->head->add($field, $val);
-  return $self->TemplateObj->MIMEObj->head->get($field);
-}
-
-# }}}
-
-
-
-__END__
-
-# {{{ POD
-
-# }}}
-
-1;
-
diff --git a/rt/lib/RT/Action/StallDependent.pm b/rt/lib/RT/Action/StallDependent.pm
deleted file mode 100644
index 09d3448a8..000000000
--- a/rt/lib/RT/Action/StallDependent.pm
+++ /dev/null
@@ -1,68 +0,0 @@
-# This Action will stall the BASE if a dependency or membership link
-# (according to argument) is created and if BASE is open.
-
-# TODO: Rename this .pm
-
-package RT::Action::StallDependent;
-require RT::Action::Generic;
-@ISA=qw|RT::Action::Generic|;
-
-# {{{ sub Describe 
-sub Describe  {
-  my $self = shift;
-  return (ref $self . " will stall a [local] BASE if it's dependent [or member] of a linked up request.");
-}
-# }}}
-
-
-# {{{ sub Prepare 
-sub Prepare  {
-    # nothing to prepare
-    return 1;
-}
-# }}}
-
-sub Commit {
-    my $self = shift;
-    # Find all Dependent
-    my $arg=$self->Argument || "DependsOn";
-    unless ($self->TransactionObj->Data =~ /^([^ ]+) $arg /) {
-	warn; return 0;
-    }
-    my $base_id=$1;
-    my $base;
-    if ($1 eq "THIS") {
-	$base=$self->TicketObj;
-    } else {
-	$base_id=&RT::Link::_IsLocal(undef, $base_id) || return 0;
-	$base=RT::Ticket->new($self->TicketObj->CurrentUser);
-	$base->Load($base_id);
-    }
-    $base->Stall if $base->Status eq 'open';
-    return 0;
-}
-
-
-# {{{ sub IsApplicable 
-
-# Only applicable if:
-# 1. the link action is a dependency
-# 2. BASE is a local ticket
-
-sub IsApplicable  {
-  my $self = shift;
-
-  my $arg=$self->Argument || "DependsOn";
-
-  # 1:
-  $self->TransactionObj->Data =~ /^([^ ]*) $arg / || return 0;
-
-  # 2:
-  # (dirty!)
-  &RT::Link::_IsLocal(undef,$1) || return 0;
-
-  return 1;
-}
-# }}}
-
-1;
diff --git a/rt/lib/RT/Attachment.pm b/rt/lib/RT/Attachment.pm
index 916ac355e..2ed520162 100755
--- a/rt/lib/RT/Attachment.pm
+++ b/rt/lib/RT/Attachment.pm
@@ -1,423 +1,372 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attachment.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Copyright 2000 Jesse Vincent <jesse@fsck.com>
-# Released under the terms of the GNU Public License
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::Attachment -- an RT attachment object
+RT::Attachment
+
 
 =head1 SYNOPSIS
 
-  use RT::Attachment;
+=head1 DESCRIPTION
 
+=head1 METHODS
 
-=head1 DESCRIPTION
+=cut
 
-This module should never be instantiated directly by client code. it's an internal 
-module which should only be instantiated through exported APIs in Ticket, Queue and other 
-similar objects.
+package RT::Attachment;
+use RT::Record; 
+
+
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
+
+sub _Init {
+  my $self = shift; 
+
+  $self->Table('Attachments');
+  $self->SUPER::_Init(@_);
+}
 
 
-=head1 METHODS
 
 
-=begin testing
 
-ok (require RT::TestHarness);
-ok (require RT::Attachment);
+=item Create PARAMHASH
 
-=end testing
+Create takes a hash of values and creates a row in the database:
+
+  int(11) 'TransactionId'.
+  int(11) 'Parent'.
+  varchar(160) 'MessageId'.
+  varchar(255) 'Subject'.
+  varchar(255) 'Filename'.
+  varchar(80) 'ContentType'.
+  varchar(80) 'ContentEncoding'.
+  longtext 'Content'.
+  longtext 'Headers'.
 
 =cut
 
-package RT::Attachment;
-use RT::Record;
-use MIME::Base64;
-use vars qw|@ISA|;
-@ISA= qw(RT::Record);
-
-# {{{ sub _Init
-sub _Init  {
-    my $self = shift; 
-    $self->{'table'} = "Attachments";
-    return($self->SUPER::_Init(@_));
-}
-# }}}
 
-# {{{ sub _ClassAccessible 
-sub _ClassAccessible {
-    {
-    TransactionId   => { 'read'=>1, 'public'=>1, },
-    MessageId       => { 'read'=>1, },
-    Parent          => { 'read'=>1, },
-    ContentType     => { 'read'=>1, },
-    Subject         => { 'read'=>1, },
-    Content         => { 'read'=>1, },
-    ContentEncoding => { 'read'=>1, },
-    Headers         => { 'read'=>1, },
-    Filename        => { 'read'=>1, },
-    Creator         => { 'read'=>1, 'auto'=>1, },
-    Created         => { 'read'=>1, 'auto'=>1, },
-  };
+
+
+sub Create {
+    my $self = shift;
+    my %args = ( 
+                TransactionId => '0',
+                Parent => '0',
+                MessageId => '',
+                Subject => '',
+                Filename => '',
+                ContentType => '',
+                ContentEncoding => '',
+                Content => '',
+                Headers => '',
+
+		  @_);
+    $self->SUPER::Create(
+                         TransactionId => $args{'TransactionId'},
+                         Parent => $args{'Parent'},
+                         MessageId => $args{'MessageId'},
+                         Subject => $args{'Subject'},
+                         Filename => $args{'Filename'},
+                         ContentType => $args{'ContentType'},
+                         ContentEncoding => $args{'ContentEncoding'},
+                         Content => $args{'Content'},
+                         Headers => $args{'Headers'},
+);
+
 }
-# }}}
 
-# {{{ sub TransactionObj 
 
-=head2 TransactionObj
 
-Returns the transaction object asscoiated with this attachment.
+=item id
+
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
+
 
 =cut
 
-sub TransactionObj {
-    require RT::Transaction;
-    my $self=shift;
-    unless (exists $self->{_TransactionObj}) {
-	$self->{_TransactionObj}=RT::Transaction->new($self->CurrentUser);
-	$self->{_TransactionObj}->Load($self->TransactionId);
-    }
-    return $self->{_TransactionObj};
-}
 
-# }}}
+=item TransactionId
+
+Returns the current value of TransactionId. 
+(In the database, TransactionId is stored as int(11).)
 
-# {{{ sub Create 
 
-=head2 Create
 
-Create a new attachment. Takes a paramhash:
-    
-    'Attachment' Should be a single MIME body with optional subparts
-    'Parent' is an optional Parent RT::Attachment object
-    'TransactionId' is the mandatory id of the Transaction this attachment is associated with.;
+=item SetTransactionId VALUE
+
+
+Set TransactionId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, TransactionId will be stored as a int(11).)
+
 
 =cut
 
-sub Create  {
-    my $self = shift;
-    my ($id);
-    my %args = ( id => 0,
-		 TransactionId => 0,
-		 Parent => 0,
-		 Attachment => undef,
-		 @_
-	       );
-    
-    
-    #For ease of reference
-    my $Attachment = $args{'Attachment'};
-    
-    #if we didn't specify a ticket, we need to bail
-    if ( $args{'TransactionId'} == 0) {
-	$RT::Logger->crit("RT::Attachment->Create couldn't, as you didn't specify a transaction\n");
-	return (0);
-	
-    }
-    
-    #If we possibly can, collapse it to a singlepart
-    $Attachment->make_singlepart;
-    
-    #Get the subject
-    my $Subject = $Attachment->head->get('subject',0);
-    defined($Subject) or $Subject = '';
-    chomp($Subject);
-  
-    #Get the filename
-    my $Filename = $Attachment->head->recommended_filename;
-    
-    if ($Attachment->parts) {
-	$id = $self->SUPER::Create(TransactionId => $args{'TransactionId'},
-				   Parent => 0,
-				   ContentType  => $Attachment->mime_type,
-				   Headers => $Attachment->head->as_string,
-				   Subject => $Subject,
-				   
-				  );
- 	foreach my $part ($Attachment->parts) {	
-	    my $SubAttachment = new RT::Attachment($self->CurrentUser);
-	    $SubAttachment->Create(TransactionId => $args{'TransactionId'},
-				   Parent => $id,
-				   Attachment => $part,
-				   ContentType  => $Attachment->mime_type,
-				   Headers => $Attachment->head->as_string(),
-				   
-				  );
-	}
-	return ($id);
-    }
-  
-  
-    #If it's not multipart
-    else {
-	
-	my $ContentEncoding = 'none'; 
-	
-	my $Body = $Attachment->bodyhandle->as_string;
-	
-	#get the max attachment length from RT
-	my $MaxSize = $RT::MaxAttachmentSize;
-	
-	#if the current attachment contains nulls and the 
-	#database doesn't support embedded nulls
-	
-	if ( (! $RT::Handle->BinarySafeBLOBs) &&
-	     ( $Body =~ /\x00/ ) ) {
-	    # set a flag telling us to mimencode the attachment
-	    $ContentEncoding = 'base64';
-	    
-	    #cut the max attchment size by 25% (for mime-encoding overhead.
-	    $RT::Logger->debug("Max size is $MaxSize\n");
-	    $MaxSize = $MaxSize * 3/4;	
-	}
-	
-	#if the attachment is larger than the maximum size
-	if (($MaxSize) and ($MaxSize < length($Body))) {
-	    # if we're supposed to truncate large attachments
-	    if ($RT::TruncateLongAttachments) {
-		# truncate the attachment to that length.
-		$Body = substr ($Body, 0, $MaxSize);
-
-	    }
-	    
-	    # elsif we're supposed to drop large attachments on the floor,
-	    elsif ($RT::DropLongAttachments) {
-		# drop the attachment on the floor
-		$RT::Logger->info("$self: Dropped an attachment of size ". length($Body).
-				  "\n". "It started: ". substr($Body, 0, 60) . "\n");
-		return(undef);
-	    }
-	}
-	# if we need to mimencode the attachment
-	if ($ContentEncoding eq 'base64') {
-	    # base64 encode the attachment
-	    $Body = MIME::Base64::encode_base64($Body);
-	    
-	}
-	
-	my $id = $self->SUPER::Create(TransactionId => $args{'TransactionId'},
-				      ContentType  => $Attachment->mime_type,
-				      ContentEncoding => $ContentEncoding,
-				      Parent => $args{'Parent'},
-				      Content => $Body,
-				      Headers => $Attachment->head->as_string,
-				      Subject => $Subject,
-				      Filename => $Filename,
-				     );
-	return ($id);
-    }
-}
 
-# }}}
+=item Parent
+
+Returns the current value of Parent. 
+(In the database, Parent is stored as int(11).)
+
 
 
-# {{{ sub Content
+=item SetParent VALUE
 
-=head2 Content
 
-Returns the attachment's content. if it's base64 encoded, decode it 
-before returning it.
+Set Parent to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Parent will be stored as a int(11).)
+
 
 =cut
 
-sub Content {
-  my $self = shift;
-  if ( $self->ContentEncoding eq 'none' || ! $self->ContentEncoding ) {
-      return $self->_Value('Content');
-  } elsif ( $self->ContentEncoding eq 'base64' ) {
-      return MIME::Base64::decode_base64($self->_Value('Content'));
-  } else {
-      return( "Unknown ContentEncoding ". $self->ContentEncoding);
-  }
-}
 
+=item MessageId
+
+Returns the current value of MessageId. 
+(In the database, MessageId is stored as varchar(160).)
 
-# }}}
 
-# {{{ sub Children
 
-=head2 Children
+=item SetMessageId VALUE
+
+
+Set MessageId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, MessageId will be stored as a varchar(160).)
 
-  Returns an RT::Attachments object which is preloaded with all Attachments objects with this Attachment\'s Id as their 'Parent'
 
 =cut
 
-sub Children {
-    my $self = shift;
-    
-    my $kids = new RT::Attachments($self->CurrentUser);
-    $kids->ChildrenOf($self->Id);
-    return($kids);
-}
 
-# }}}
+=item Subject
 
-# {{{ UTILITIES
+Returns the current value of Subject. 
+(In the database, Subject is stored as varchar(255).)
 
-# {{{ sub Quote 
 
 
+=item SetSubject VALUE
 
-sub Quote {
-    my $self=shift;
-    my %args=(Reply=>undef, # Prefilled reply (i.e. from the KB/FAQ system)
-	      @_);
 
-    my ($quoted_content, $body, $headers);
-    my $max=0;
+Set Subject to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Subject will be stored as a varchar(255).)
 
-    # TODO: Handle Multipart/Mixed (eventually fix the link in the
-    # ShowHistory web template?)
-    if ($self->ContentType =~ m{^(text/plain|message)}i) {
-	$body=$self->Content;
 
-	# Do we need any preformatting (wrapping, that is) of the message?
+=cut
 
-	# Remove quoted signature.
-	$body =~ s/\n-- \n(.*)$//s;
 
-	# What's the longest line like?
-	foreach (split (/\n/,$body)) {
-	    $max=length if ( length > $max);
-	}
+=item Filename
 
-	if ($max>76) {
-	    require Text::Wrapper;
-	    my $wrapper=new Text::Wrapper
-		(
-		 columns => 70, 
-		 body_start => ($max > 70*3 ? '   ' : ''),
-		 par_start => ''
-		 );
-	    $body=$wrapper->wrap($body);
-	}
+Returns the current value of Filename. 
+(In the database, Filename is stored as varchar(255).)
 
-	$body =~ s/^/> /gm;
 
-	$body = '[' . $self->TransactionObj->CreatorObj->Name() . ' - ' . $self->TransactionObj->CreatedAsString()
-	            . "]:\n\n"
-   	        . $body . "\n\n";
 
-    } else {
-	$body = "[Non-text message not quoted]\n\n";
-    }
-    
-    $max=60 if $max<60;
-    $max=70 if $max>78;
-    $max+=2;
+=item SetFilename VALUE
+
+
+Set Filename to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Filename will be stored as a varchar(255).)
+
+
+=cut
+
+
+=item ContentType
+
+Returns the current value of ContentType. 
+(In the database, ContentType is stored as varchar(80).)
+
 
-    return (\$body, $max);
-}
-# }}}
 
-# {{{ sub NiceHeaders - pulls out only the most relevant headers
+=item SetContentType VALUE
 
-=head2 NiceHeaders
 
-Returns the To, From, Cc, Date and Subject headers.
+Set ContentType to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ContentType will be stored as a varchar(80).)
 
-It is a known issue that this breaks if any of these headers are not
-properly unfolded.
 
 =cut
 
-sub NiceHeaders {
-    my $self=shift;
-    my $hdrs="";
-    for (split(/\n/,$self->Headers)) {
-	    $hdrs.="$_\n" if /^(To|From|RT-Send-Cc|Cc|Date|Subject): /i
-    }
-    return $hdrs;
-}
-# }}}
 
-# {{{ sub Headers
+=item ContentEncoding
+
+Returns the current value of ContentEncoding. 
+(In the database, ContentEncoding is stored as varchar(80).)
+
+
 
-=head2 Headers
+=item SetContentEncoding VALUE
+
+
+Set ContentEncoding to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ContentEncoding will be stored as a varchar(80).)
 
-Returns this object's headers as a string.  This method specifically
-removes the RT-Send-Bcc: header, so as to never reveal to whom RT sent a Bcc.
-We need to record the RT-Send-Cc and RT-Send-Bcc values so that we can actually send
-out mail. (The mailing rules are seperated from the ticket update code by
-an abstraction barrier that makes it impossible to pass this data directly
 
 =cut
 
-sub Headers {
-    my $self = shift;
-    my $hdrs="";
-    for (split(/\n/,$self->SUPER::Headers)) {
-	    $hdrs.="$_\n" unless /^(RT-Send-Bcc): /i
-    }
-    return $hdrs;
-}
+
+=item Content
+
+Returns the current value of Content. 
+(In the database, Content is stored as longtext.)
 
 
-# }}}
 
-# {{{ sub GetHeader
+=item SetContent VALUE
 
-=head2 GetHeader ( 'Tag')
 
-Returns the value of the header Tag as a string. This bypasses the weeding out
-done in Headers() above.
+Set Content to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Content will be stored as a longtext.)
+
 
 =cut
 
-sub GetHeader {
-    my $self = shift;
-    my $tag = shift;
-    foreach my $line (split(/\n/,$self->SUPER::Headers)) {
-        $RT::Logger->debug( "Does $line match $tag\n");
-        if ($line =~ /^$tag:\s+(.*)$/i) { #if we find the header, return its value
-            return ($1);
-        }
-    }
-    
-    # we found no header. return an empty string
-    return undef;
-}
-# }}}
 
-# {{{ sub _Value 
+=item Headers
 
-=head2 _Value
+Returns the current value of Headers. 
+(In the database, Headers is stored as longtext.)
+
+
+
+=item SetHeaders VALUE
+
+
+Set Headers to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Headers will be stored as a longtext.)
 
-Takes the name of a table column.
-Returns its value as a string, if the user passes an ACL check
 
 =cut
 
-sub _Value  {
 
-    my $self = shift;
-    my $field = shift;
-    
-    
-    #if the field is public, return it.
-    if ($self->_Accessible($field, 'public')) {
-	#$RT::Logger->debug("Skipping ACL check for $field\n");
-	return($self->__Value($field));
-	
-    }
-    
-    #If it's a comment, we need to be extra special careful
-    elsif ( (($self->TransactionObj->CurrentUserHasRight('ShowTicketComments')) and
-	     ($self->TransactionObj->Type eq 'Comment') )  or
-	    ($self->TransactionObj->CurrentUserHasRight('ShowTicket'))) {
-	
-	return($self->__Value($field));
-    }
-    #if they ain't got rights to see, don't let em
-    else {
-	    return(undef);
-	}
-    	
-    
-}
+=item Creator
+
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
+
+
+=cut
+
+
+=item Created
 
-# }}}
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
+
+
+=cut
+
+
+
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        TransactionId => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Parent => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        MessageId => 
+		{read => 1, write => 1, type => 'varchar(160)', default => ''},
+        Subject => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        Filename => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        ContentType => 
+		{read => 1, write => 1, type => 'varchar(80)', default => ''},
+        ContentEncoding => 
+		{read => 1, write => 1, type => 'varchar(80)', default => ''},
+        Content => 
+		{read => 1, write => 1, type => 'longtext', default => ''},
+        Headers => 
+		{read => 1, write => 1, type => 'longtext', default => ''},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+
+ }
+};
+
+
+        eval "require RT::Attachment_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Attachment_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Attachment_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Attachment_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Attachment_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Attachment_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Attachment_Overlay, RT::Attachment_Vendor, RT::Attachment_Local
+
+=cut
 
-# }}}
 
 1;
diff --git a/rt/lib/RT/Attachments.pm b/rt/lib/RT/Attachments.pm
index 73cd350a4..177cdd094 100755
--- a/rt/lib/RT/Attachments.pm
+++ b/rt/lib/RT/Attachments.pm
@@ -1,99 +1,115 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attachments.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::Attachments - a collection of RT::Attachment objects
+=head1 NAME
 
+  RT::Attachments -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::Attachments;
+  use RT::Attachments
 
 =head1 DESCRIPTION
 
-This module should never be called directly by client code. it's an internal module which
-should only be accessed through exported APIs in Ticket, Queue and other similar objects.
-
 
 =head1 METHODS
 
+=cut
 
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Attachments);
+package RT::Attachments;
 
-=end testing
+use RT::SearchBuilder;
+use RT::Attachment;
 
-=cut
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-package RT::Attachments;
 
-use RT::EasySearch;
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'Attachments';
+    $self->{'primary_key'} = 'id';
 
-@ISA= qw(RT::EasySearch);
 
-# {{{ sub _Init  
-sub _Init   {
-  my $self = shift;
- 
-  $self->{'table'} = "Attachments";
-  $self->{'primary_key'} = "id";
-  return ( $self->SUPER::_Init(@_));
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
 
-# {{{ sub ContentType
+=item NewItem
 
-=head2 ContentType (VALUE => 'text/plain', ENTRYAGGREGATOR => 'OR', OPERATOR => '=' ) 
-
-Limit result set to attachments of ContentType 'TYPE'...
+Returns an empty new RT::Attachment item
 
 =cut
 
+sub NewItem {
+    my $self = shift;
+    return(RT::Attachment->new($self->CurrentUser));
+}
 
-sub ContentType  {
-  my $self = shift;
-  my %args = ( VALUE => 'text/plain',
-	       OPERATOR => '=',
-	       ENTRYAGGREGATOR => 'OR',
-	       @_);
+        eval "require RT::Attachments_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Attachments_Overlay.pm}) {
+            die $@;
+        };
 
-  $self->Limit ( FIELD => 'ContentType',
-		 VALUE => $args{'VALUE'},
-		 OPERATOR => $args{'OPERATOR'},
-		 ENTRYAGGREGATOR => $args{'ENTRYAGGREGATOR'});
-}
-# }}}
+        eval "require RT::Attachments_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Attachments_Vendor.pm}) {
+            die $@;
+        };
 
-# {{{ sub ChildrenOf 
+        eval "require RT::Attachments_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Attachments_Local.pm}) {
+            die $@;
+        };
 
-=head2 ChildrenOf ID
 
-Limit result set to children of Attachment ID
 
-=cut
 
+=head1 SEE ALSO
 
-sub ChildrenOf  {
-  my $self = shift;
-  my $attachment = shift;
-  $self->Limit ( FIELD => 'Parent',
-		 VALUE => $attachment);
-}
-# }}}
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
-# {{{ sub NewItem 
-sub NewItem  {
-  my $self = shift;
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-  use RT::Attachment;
-  my $item = new RT::Attachment($self->CurrentUser);
-  return($item);
-}
-# }}}
-  1;
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
 
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
+RT::Attachments_Overlay, RT::Attachments_Vendor, RT::Attachments_Local
+
+=cut
 
 
+1;
diff --git a/rt/lib/RT/Condition/AnyTransaction.pm b/rt/lib/RT/Condition/AnyTransaction.pm
index 83e5de6ce..4519fcf5a 100644
--- a/rt/lib/RT/Condition/AnyTransaction.pm
+++ b/rt/lib/RT/Condition/AnyTransaction.pm
@@ -1,10 +1,33 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Condition/AnyTransaction.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Copyright 1996-2001 Jesse Vincent <jesse@fsck.com> 
-# Released under the terms of the GNU General Public License
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+ 
 
 package RT::Condition::AnyTransaction;
 require RT::Condition::Generic;
 
+use strict;
+use vars qw/@ISA/;
 @ISA = qw(RT::Condition::Generic);
 
 
@@ -19,5 +42,10 @@ sub IsApplicable {
     return(1);
 }
 
+eval "require RT::Condition::AnyTransaction_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/AnyTransaction_Vendor.pm});
+eval "require RT::Condition::AnyTransaction_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/AnyTransaction_Local.pm});
+
 1;
 
diff --git a/rt/lib/RT/Condition/Generic.pm b/rt/lib/RT/Condition/Generic.pm
index 393f4b786..bd269315e 100755
--- a/rt/lib/RT/Condition/Generic.pm
+++ b/rt/lib/RT/Condition/Generic.pm
@@ -1,7 +1,26 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Condition/Generic.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-2000 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 =head1 NAME
 
   RT::Condition::Generic - ;
@@ -29,7 +48,6 @@
 
 =begin testing
 
-ok (require RT::TestHarness);
 ok (require RT::Condition::Generic);
 
 =end testing
@@ -39,6 +57,11 @@ ok (require RT::Condition::Generic);
 
 package RT::Condition::Generic;
 
+use RT::Base;
+use strict;
+use vars qw/@ISA/;
+@ISA = qw(RT::Base);
+
 # {{{ sub new 
 sub new  {
   my $proto = shift;
@@ -61,7 +84,6 @@ sub _Init  {
 	       ApplicableTransTypes => undef,
 	       @_ );
   
-  
   $self->{'Argument'} = $args{'Argument'};
   $self->{'ScripObj'} = $args{'ScripObj'};
   $self->{'TicketObj'} = $args{'TicketObj'};
@@ -100,6 +122,19 @@ sub TicketObj  {
 }
 # }}}
 
+# {{{ sub ScripObj
+
+=head2 ScripObj
+
+Return the Scrip object we're talking about
+
+=cut
+
+sub ScripObj  {
+  my $self = shift;
+  return($self->{'ScripObj'});
+}
+# }}}
 # {{{ sub TransactionObj
 
 =head2 TransactionObj
@@ -137,7 +172,7 @@ sub ApplicableTransTypes  {
 # {{{ sub Describe 
 sub Describe  {
   my $self = shift;
-  return ("No description for " . ref $self);
+  return ($self->loc("No description for [_1]", ref $self));
 }
 # }}}
 
@@ -167,4 +202,10 @@ sub DESTROY {
 }
 
 # }}}
+
+eval "require RT::Condition::Generic_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/Generic_Vendor.pm});
+eval "require RT::Condition::Generic_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/Generic_Local.pm});
+
 1;
diff --git a/rt/lib/RT/Condition/NewDependency.pm b/rt/lib/RT/Condition/NewDependency.pm
deleted file mode 100644
index e69de29bb..000000000
diff --git a/rt/lib/RT/Condition/StatusChange.pm b/rt/lib/RT/Condition/StatusChange.pm
index 56419b2c7..8afabcda0 100644
--- a/rt/lib/RT/Condition/StatusChange.pm
+++ b/rt/lib/RT/Condition/StatusChange.pm
@@ -1,10 +1,34 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Condition/StatusChange.pm,v 1.1 2002-08-12 06:17:08 ivan Exp $
-# Copyright 1996-2001 Jesse Vincent <jesse@fsck.com> 
-# Released under the terms of the GNU General Public License
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+ 
+
 
 package RT::Condition::StatusChange;
 require RT::Condition::Generic;
 
+use strict;
+use vars qw/@ISA/;
 @ISA = qw(RT::Condition::Generic);
 
 
@@ -26,5 +50,10 @@ sub IsApplicable {
     }
 }
 
+eval "require RT::Condition::StatusChange_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/StatusChange_Vendor.pm});
+eval "require RT::Condition::StatusChange_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition/StatusChange_Local.pm});
+
 1;
 
diff --git a/rt/lib/RT/CurrentUser.pm b/rt/lib/RT/CurrentUser.pm
index 6997ddbac..4ca2f9891 100755
--- a/rt/lib/RT/CurrentUser.pm
+++ b/rt/lib/RT/CurrentUser.pm
@@ -1,7 +1,26 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/CurrentUser.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-1999 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 =head1 NAME
 
   RT::CurrentUser - an RT object representing the current user
@@ -19,7 +38,6 @@
 
 =begin testing
 
-ok (require RT::TestHarness);
 ok (require RT::CurrentUser);
 
 =end testing
@@ -28,9 +46,13 @@ ok (require RT::CurrentUser);
 
 
 package RT::CurrentUser;
+
 use RT::Record;
-@ISA= qw(RT::Record);
+use RT::I18N;
 
+use strict;
+use vars qw/@ISA/;
+@ISA= qw(RT::Record);
 
 # {{{ sub _Init 
 
@@ -48,7 +70,7 @@ sub _Init  {
     $self->Load($Name);
   }
   
-  $self->_MyCurrentUser($self);
+  $self->CurrentUser($self);
 
 }
 # }}}
@@ -56,7 +78,8 @@ sub _Init  {
 # {{{ sub Create
 
 sub Create {
-    return (0, 'Permission Denied');
+    my $self = shift;
+    return (0, $self->loc('Permission Denied'));
 }
 
 # }}}
@@ -64,7 +87,8 @@ sub Create {
 # {{{ sub Delete
 
 sub Delete {
-    return (0, 'Permission Denied');
+    my $self = shift;
+    return (0, $self->loc('Permission Denied'));
 }
 
 # }}}
@@ -84,7 +108,7 @@ sub UserObj {
 	use RT::User;
 	$self->{'UserObj'} = RT::User->new($self);
 	unless ($self->{'UserObj'}->Load($self->Id)) {
-	    $RT::Logger->err("Couldn't load ".$self->Id. "from the users database.\n");
+	    $RT::Logger->err($self->loc("Couldn't load [_1] from the users database.\n", $self->Id));
 	}
 	
     }
@@ -92,6 +116,42 @@ sub UserObj {
 }
 # }}}
 
+# {{{ sub PrincipalObj 
+
+=head2 PrincipalObj
+
+    Returns this user's principal object.  this is just a helper routine for
+    $self->UserObj->PrincipalObj
+
+=cut
+
+sub PrincipalObj {
+    my $self = shift;
+    return($self->UserObj->PrincipalObj);
+}
+
+
+# }}}
+
+
+# {{{ sub PrincipalId 
+
+=head2 PrincipalId
+
+    Returns this user's principal Id.  this is just a helper routine for
+    $self->UserObj->PrincipalId
+
+=cut
+
+sub PrincipalId {
+    my $self = shift;
+    return($self->UserObj->PrincipalId);
+}
+
+
+# }}}
+
+
 # {{{ sub _Accessible 
 sub _Accessible  {
   my $self = shift;
@@ -120,6 +180,8 @@ Takes the email address of the user to load.
 sub LoadByEmail  {
     my $self = shift;
     my $identifier = shift;
+
+    $identifier = RT::User::CanonicalizeEmailAddress(undef, $identifier);
         
     $self->LoadByCol("EmailAddress",$identifier);
     
@@ -225,46 +287,88 @@ sub Privileged {
 
 # }}}
 
-# {{{ Convenient ACL methods
 
-=head2 HasQueueRight
+# {{{ sub HasRight
 
-calls $self->UserObj->HasQueueRight with the arguments passed in
+=head2 HasRight
+
+calls $self->UserObj->HasRight with the arguments passed in
 
 =cut
 
-sub HasQueueRight {
-	my $self = shift;
-	return ($self->UserObj->HasQueueRight(@_));
+sub HasRight {
+  my $self = shift;
+  return ($self->UserObj->HasRight(@_));
 }
 
-=head2 HasSystemRight
+# }}}
 
-calls $self->UserObj->HasSystemRight with the arguments passed in
+# {{{ Localization
 
-=cut
+=head2 LanguageHandle
 
+Returns this current user's langauge handle. Should take a language
+specification. but currently doesn't
 
-sub HasSystemRight {
-	my $self = shift;
-	return ($self->UserObj->HasSystemRight(@_));
-}
-# }}}
+=begin testing
 
-# {{{ sub HasRight
+ok (my $cu = RT::CurrentUser->new('root'));
+ok (my $lh = $cu->LanguageHandle);
+ok ($lh != undef);
+ok ($lh->isa('Locale::Maketext'));
+ok ($cu->loc('TEST_STRING') eq "Concrete Mixer", "Localized TEST_STRING into English");
+ok ($lh = $cu->LanguageHandle('fr'));
+ok ($cu->loc('Before') eq "Avant", "Localized TEST_STRING into Frenc");
 
-=head2 HasSystemRight
+=end testing
 
-calls $self->UserObj->HasRight with the arguments passed in
+=cut 
 
-=cut
+sub LanguageHandle {
+    my $self = shift;
+    if  ((!defined $self->{'LangHandle'}) || 
+         (!UNIVERSAL::can($self->{'LangHandle'}, 'maketext')) || 
+         (@_))  {
+        $self->{'LangHandle'} = RT::I18N->get_handle(@_);
+    }
+    # Fall back to english.
+    unless ($self->{'LangHandle'}) {
+        die "We couldn't get a dictionary. Nye mogu naidti slovar. No puedo encontrar dictionario.";
+    }
+    return ($self->{'LangHandle'});
+}
 
-sub HasRight {
-  my $self = shift;
-  return ($self->UserObj->HasRight(@_));
+sub loc {
+    my $self = shift;
+    return '' if $_[0] eq '';
+
+    my $handle = $self->LanguageHandle;
+
+    if (@_ == 1) {
+	# pre-scan the lexicon hashes to return _AUTO keys verbatim,
+	# to keep locstrings containing '[' and '~' from tripping over Maketext
+	return $_[0] unless grep { exists $_->{$_[0]} } @{ $handle->_lex_refs };
+    }
+
+    return $handle->maketext(@_);
 }
 
+sub loc_fuzzy {
+    my $self = shift;
+    return '' if $_[0] eq '';
+
+    # XXX: work around perl's deficiency when matching utf8 data
+    return $_[0] if Encode::is_utf8($_[0]);
+    my $result = $self->LanguageHandle->maketext_fuzzy(@_);
+
+    return($result);
+}
 # }}}
 
+eval "require RT::CurrentUser_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/CurrentUser_Vendor.pm});
+eval "require RT::CurrentUser_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/CurrentUser_Local.pm});
+
 1;
  
diff --git a/rt/lib/RT/Date.pm b/rt/lib/RT/Date.pm
index d56997174..355370ada 100644
--- a/rt/lib/RT/Date.pm
+++ b/rt/lib/RT/Date.pm
@@ -1,7 +1,26 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Date.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-2000 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 =head1 NAME
 
   RT::Date - a simple Object Oriented date.
@@ -28,7 +47,15 @@ ok (require RT::Date);
 
 
 package RT::Date;
+
 use Time::Local;
+
+use RT::Base;
+
+use strict;
+use vars qw/@ISA/;
+@ISA = qw/RT::Base/;
+
 use vars qw($MINUTE $HOUR $DAY $WEEK $MONTH $YEAR);
 
 $MINUTE = 60;
@@ -45,6 +72,7 @@ sub new  {
   my $class = ref($proto) || $proto;
   my $self  = {};
   bless ($self, $class);
+  $self->CurrentUser(@_);
   $self->Unix(0);
   return $self;
 }
@@ -61,91 +89,114 @@ if $args->{'Format'} is 'unix', takes the number of seconds since the epoch
 
 If $args->{'Format'} is ISO, tries to parse an ISO date.
 
-If $args->{'Format'} is 'unknown', require Date::Parse and make it figure things
-out. This is a heavyweight operation that should never be called from within 
-RT's core. But it's really useful for something like the textbox date entry
-where we let the user do whatever they want.
+If $args->{'Format'} is 'unknown', require Time::ParseDate and make it figure
+things out. This is a heavyweight operation that should never be called from
+within RT's core. But it's really useful for something like the textbox date
+entry where we let the user do whatever they want.
 
 If $args->{'Value'}  is 0, assumes you mean never.
 
+=begin testing
+
+use_ok(RT::Date);
+my $date = RT::Date->new($RT::SystemUser);
+$date->Set(Format => 'unix', Value => '0');
+ok ($date->ISO eq '1970-01-01 00:00:00', "Set a date to midnight 1/1/1970 GMT");
+
+=end testing
 
 =cut
 
 sub Set {
     my $self = shift;
     my %args = ( Format => 'unix',
-		 Value => time,
-		 @_);
-    if (($args{'Value'} =~ /^\d*$/) and ($args{'Value'} == 0)) {
-	$self->Unix(-1);
-	return($self->Unix());
+                 Value  => time,
+                 @_ );
+    if ( !$args{'Value'}
+         || ( ( $args{'Value'} =~ /^\d*$/ ) and ( $args{'Value'} == 0 ) ) ) {
+        $self->Unix(-1);
+        return ( $self->Unix() );
     }
 
-    if ($args{'Format'} =~ /^unix$/i) {
-	$self->Unix($args{'Value'});
+    if ( $args{'Format'} =~ /^unix$/i ) {
+        $self->Unix( $args{'Value'} );
     }
-    
-    elsif ($args{'Format'} =~ /^(sql|datemanip|iso)$/i) {
-	
-	if (($args{'Value'} =~ /^(\d{4}?)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) ||
-	    ($args{'Value'} =~ /^(\d{4}?)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)$/) ||
-	    ($args{'Value'} =~ /^(\d{4}?)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)\+00$/) ||
-	    ($args{'Value'} =~ /^(\d{4}?)(\d\d)(\d\d)(\d\d):(\d\d):(\d\d)$/)) {
-	    
-        my $year = $1;
-	    my $mon = $2;
-	    my $mday = $3;
-	    my $hours = $4;
-	    my $min = $5;
-	    my $sec = $6;
-	    
-	    #timegm expects month as 0->11
-	    $mon--;
-	    
-	    #now that we've parsed it, deal with the case where everything
-	    #was 0
-            if ($mon == -1) {
-	            $self->Unix(-1);
-	        } else {
-
-		    #Dateamnip strings aren't in GMT.
-		    if ($args{'Format'} =~ /^datemanip$/i) {
-			$self->Unix(timelocal($sec,$min,$hours,$mday,$mon,$year));
-		    }
-		    #ISO and SQL dates are in GMT
-		    else {
-			$self->Unix(timegm($sec,$min,$hours,$mday,$mon,$year));
-		    }
-		    
-		    $self->Unix(-1) unless $self->Unix;
-		}
-   }  
-	else {
-	    use Carp;
-	    Carp::cluck;
-	    $RT::Logger->debug( "Couldn't parse date $args{'Value'} as a $args{'Format'}");
-	    
-	}
+
+    elsif ( $args{'Format'} =~ /^(sql|datemanip|iso)$/i ) {
+	$args{'Value'} =~ s!/!-!g;
+
+        if (( $args{'Value'} =~ /^(\d{4}?)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/ )
+            || ( $args{'Value'} =~
+                 /^(\d{4}?)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)$/ )
+            || ( $args{'Value'} =~
+                 /^(\d{4}?)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)\+00$/ )
+            || ($args{'Value'} =~ /^(\d{4}?)(\d\d)(\d\d)(\d\d):(\d\d):(\d\d)$/ )
+          ) {
+
+            my $year  = $1;
+            my $mon   = $2;
+            my $mday  = $3;
+            my $hours = $4;
+            my $min   = $5;
+            my $sec   = $6;
+
+            #timegm expects month as 0->11
+            $mon--;
+
+            #now that we've parsed it, deal with the case where everything
+            #was 0
+            if ( $mon == -1 ) {
+                $self->Unix(-1);
+            }
+            else {
+
+                #Dateamnip strings aren't in GMT.
+                if ( $args{'Format'} =~ /^datemanip$/i ) {
+                    $self->Unix(
+                          timelocal( $sec, $min, $hours, $mday, $mon, $year ) );
+                }
+
+                #ISO and SQL dates are in GMT
+                else {
+                    $self->Unix(
+                             timegm( $sec, $min, $hours, $mday, $mon, $year ) );
+                }
+
+                $self->Unix(-1) unless $self->Unix;
+            }
+        }
+        else {
+            use Carp;
+            Carp::cluck;
+            $RT::Logger->debug(
+                     "Couldn't parse date $args{'Value'} as a $args{'Format'}");
+
+        }
+    }
+    elsif ( $args{'Format'} =~ /^unknown$/i ) {
+        require Time::ParseDate;
+
+        #Convert it to an ISO format string
+
+	my $date = Time::ParseDate::parsedate($args{'Value'},
+			UK => $RT::DateDayBeforeMonth,
+			PREFER_PAST => $RT::AmbiguousDayInPast,
+			PREFER_FUTURE => !($RT::AmbiguousDayInPast));
+
+        #This date has now been set to a date in the _local_ timezone.
+        #since ISO dates are known to be in GMT (for RT's purposes);
+
+        $RT::Logger->debug( "RT::Date used date::parse to make "
+                            . $args{'Value'}
+                            . " $date\n" );
+
+        return ( $self->Set( Format => 'unix', Value => "$date" ) );
     }
-    elsif ($args{'Format'} =~ /^unknown$/i) {
-        require Date::Parse;
-        #Convert it to an ISO format string 
-        
-	my $date = Date::Parse::str2time($args{'Value'});
-        
-	#This date has now been set to a date in the _local_ timezone.
-	#since ISO dates are known to be in GMT (for RT's purposes);
-	
-	$RT::Logger->debug("RT::Date used date::parse to make ".$args{'Value'} . " $date\n");
-        
-	
-	return ($self->Set( Format => 'unix', Value => "$date"));
-    }                                                    
     else {
-	die "Unknown Date format: ".$args{'Format'}."\n";
+        die "Unknown Date format: " . $args{'Format'} . "\n";
     }
-    
-    return($self->Unix());
+
+    return ( $self->Unix() );
 }
 
 # }}}
@@ -232,47 +283,59 @@ sub DiffAsString {
 
 # {{{ sub DurationAsString
 
+
 =head2 DurationAsString
 
 Takes a number of seconds. returns a string describing that duration
 
 =cut
 
-sub DurationAsString{
+sub DurationAsString {
 
-    my $self=shift;
+    my $self     = shift;
     my $duration = shift;
-    
-    my ($negative, $s);
-    
-    $negative = 'ago' if ($duration < 0);
+
+    my ( $negative, $s );
+
+    $negative = 1 if ( $duration < 0 );
 
     $duration = abs($duration);
 
-    if($duration < $MINUTE) {
-	$s=$duration;
-	$string="sec";
-    } elsif($duration < (2 * $HOUR)) {
-	$s = int($duration/$MINUTE);
-	$string="min";
-    } elsif($duration < (2 * $DAY)) {
-	$s = int($duration/$HOUR);
-	$string="hours";
-    } elsif($duration < (2 * $WEEK)) {
-	$s = int($duration/$DAY);
-	$string="days";
-    } elsif($duration < (2 * $MONTH)) {
-	$s = int($duration/$WEEK);
-	$string="weeks";
-    } elsif($duration < $YEAR) {
-	$s = int($duration/$MONTH);
-	$string="months";
-    } else {
-	$s = int($duration/$YEAR);
-	$string="years";
+    my $time_unit;
+    if ( $duration < $MINUTE ) {
+        $s         = $duration;
+        $time_unit = $self->loc("sec");
+    }
+    elsif ( $duration < ( 2 * $HOUR ) ) {
+        $s         = int( $duration / $MINUTE );
+        $time_unit = $self->loc("min");
+    }
+    elsif ( $duration < ( 2 * $DAY ) ) {
+        $s         = int( $duration / $HOUR );
+        $time_unit = $self->loc("hours");
+    }
+    elsif ( $duration < ( 2 * $WEEK ) ) {
+        $s         = int( $duration / $DAY );
+        $time_unit = $self->loc("days");
+    }
+    elsif ( $duration < ( 2 * $MONTH ) ) {
+        $s         = int( $duration / $WEEK );
+        $time_unit = $self->loc("weeks");
+    }
+    elsif ( $duration < $YEAR ) {
+        $s         = int( $duration / $MONTH );
+        $time_unit = $self->loc("months");
+    }
+    else {
+        $s         = int( $duration / $YEAR );
+        $time_unit = $self->loc("years");
+    }
+    if (0) { # For now, never display the "AGO" # $negative) {
+        return $self->loc( "[_1] [_2] ago", $s, $time_unit );
+    }
+    else {
+        return $self->loc( "[_1] [_2]", $s, $time_unit );
     }
-    
-    return ("$s $string $negative");
 }
 
 # }}}
@@ -303,12 +366,64 @@ Returns the object\'s time as a string with the current timezone.
 
 sub AsString {
     my $self = shift;
-    return ("Not set") if ($self->Unix <= 0);
+    return ($self->loc("Not set")) if ($self->Unix <= 0);
+
+    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($self->Unix);
 
-    return (scalar(localtime($self->Unix)));
+    return $self->loc("[_1] [_2] [_3] [_4]:[_5]:[_6] [_7]", $self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900));
 }
 # }}}
 
+# {{{ GetWeekday
+=head2 GetWeekday DAY
+
+Takes an integer day of week and returns a localized string for that day of week
+
+=cut
+
+sub GetWeekday {
+    my $self = shift;
+    my $dow = shift;
+    
+    return $self->loc('Mon.') if ($dow == 1);
+    return $self->loc('Tue.') if ($dow == 2);
+    return $self->loc('Wed.') if ($dow == 3);
+    return $self->loc('Thu.') if ($dow == 4);
+    return $self->loc('Fri.') if ($dow == 5);
+    return $self->loc('Sat.') if ($dow == 6);
+    return $self->loc('Sun.') if ($dow == 0);
+}
+
+# }}}
+
+# {{{ GetMonth
+=head2 GetMonth DAY
+
+Takes an integer month and returns a localized string for that month 
+
+=cut
+
+sub GetMonth {
+    my $self = shift;
+   my $mon = shift;
+
+    # We do this rather than an array so that we don't call localize 12x what we need to
+    return $self->loc('Jan.') if ($mon == 0);
+    return $self->loc('Feb.') if ($mon == 1);
+    return $self->loc('Mar.') if ($mon == 2);
+    return $self->loc('Apr.') if ($mon == 3);
+    return $self->loc('May.') if ($mon == 4);
+    return $self->loc('Jun.') if ($mon == 5);
+    return $self->loc('Jul.') if ($mon == 6);
+    return $self->loc('Aug.') if ($mon == 7);
+    return $self->loc('Sep.') if ($mon == 8);
+    return $self->loc('Oct.') if ($mon == 9);
+    return $self->loc('Nov.') if ($mon == 10);
+    return $self->loc('Dec.') if ($mon == 11);
+}
+
+# }}}
+
 # {{{ sub AddSeconds
 
 =head2 sub AddSeconds
@@ -425,12 +540,18 @@ pull from a 'Timezone' attribute of the CurrentUser
 
 sub LocalTimezone {
     my $self = shift;
-    
+
+    return $self->CurrentUser->Timezone
+	if $self->CurrentUser and $self->CurrentUser->can('Timezone');
+
     return ($RT::Timezone);
 }
 
 # }}}
 
-
+eval "require RT::Date_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Date_Vendor.pm});
+eval "require RT::Date_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Date_Local.pm});
 
 1;
diff --git a/rt/lib/RT/EasySearch.pm b/rt/lib/RT/EasySearch.pm
deleted file mode 100755
index bcbfa01b2..000000000
--- a/rt/lib/RT/EasySearch.pm
+++ /dev/null
@@ -1,115 +0,0 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/EasySearch.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
-=head1 NAME
-
-  RT::EasySearch - a baseclass for RT collection objects
-
-=head1 SYNOPSIS
-
-=head1 DESCRIPTION
-
-
-=head1 METHODS
-
-
-=begin testing
-
-ok (require RT::EasySearch);
-
-=end testing
-
-
-=cut
-
-package RT::EasySearch;
-use DBIx::SearchBuilder;
-@ISA= qw(DBIx::SearchBuilder);
-
-# {{{ sub _Init 
-sub _Init  {
-    my $self = shift;
-    
-    $self->{'user'} = shift;
-    unless(defined($self->CurrentUser)) {
-	use Carp;
-	Carp::confess("$self was created without a CurrentUser");
-	$RT::Logger->err("$self was created without a CurrentUser\n"); 
-	return(0);
-    }
-    $self->SUPER::_Init( 'Handle' => $RT::Handle);
-}
-# }}}
-
-# {{{ sub LimitToEnabled
-
-=head2 LimitToEnabled
-
-Only find items that haven\'t been disabled
-
-=cut
-
-sub LimitToEnabled {
-    my $self = shift;
-    
-    $self->Limit( FIELD => 'Disabled',
-		  VALUE => '0',
-		  OPERATOR => '=' );
-}
-# }}}
-
-# {{{ sub LimitToDisabled
-
-=head2 LimitToDeleted
-
-Only find items that have been deleted.
-
-=cut
-
-sub LimitToDeleted {
-    my $self = shift;
-    
-    $self->{'find_disabled_rows'} = 1;
-    $self->Limit( FIELD => 'Disabled',
-		  OPERATOR => '=',
-		  VALUE => '1'
-		);
-}
-# }}}
-
-
-# {{{ sub Limit 
-
-=head2 Limit PARAMHASH
-
-This Limit sub calls SUPER::Limit, but defaults "CASESENSITIVE" to 1, thus
-making sure that by default lots of things don't do extra work trying to 
-match lower(colname) agaist lc($val);
-
-=cut
-
-sub Limit {
-	my $self = shift;
-	my %args = ( CASESENSITIVE => 1,
-		     @_ );
-
-   return $self->SUPER::Limit(%args);
-}
-
-# {{{ sub CurrentUser 
-
-=head2 CurrentUser
-
-  Returns the current user as an RT::User object.
-
-=cut
-
-sub CurrentUser  {
-  my $self = shift;
-  return ($self->{'user'});
-}
-# }}}
-    
-
-1;
-
-
diff --git a/rt/lib/RT/Group.pm b/rt/lib/RT/Group.pm
index 005601f5e..4dcef3f07 100755
--- a/rt/lib/RT/Group.pm
+++ b/rt/lib/RT/Group.pm
@@ -1,364 +1,258 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Group.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Copyright 2000 Jesse Vincent <jesse@fsck.com>
-# Released under the terms of the GNU Public License
-#
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
 #
 
+use strict;
+
+
 =head1 NAME
 
-  RT::Group - RT\'s group object
+RT::Group
 
-=head1 SYNOPSIS
 
-  use RT::Group;
-my $group = new RT::Group($CurrentUser);
+=head1 SYNOPSIS
 
 =head1 DESCRIPTION
 
-An RT group object.
+=head1 METHODS
 
-=head1 AUTHOR
+=cut
 
-Jesse Vincent, jesse@fsck.com
+package RT::Group;
+use RT::Record; 
 
-=head1 SEE ALSO
 
-RT
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
 
-=head1 METHODS
+sub _Init {
+  my $self = shift; 
 
+  $self->Table('Groups');
+  $self->SUPER::_Init(@_);
+}
 
-=begin testing
 
-ok (require RT::TestHarness);
-ok (require RT::Group);
 
-=end testing
 
-=cut
 
+=item Create PARAMHASH
 
-package RT::Group;
-use RT::Record;
-use RT::GroupMember;
-use RT::ACE;
+Create takes a hash of values and creates a row in the database:
 
-use vars qw|@ISA|;
-@ISA= qw(RT::Record);
+  varchar(200) 'Name'.
+  varchar(255) 'Description'.
+  varchar(64) 'Domain'.
+  varchar(64) 'Type'.
+  varchar(64) 'Instance'.
+
+=cut
 
 
-# {{{ sub _Init
-sub _Init  {
-  my $self = shift; 
-  $self->{'table'} = "Groups";
-  return ($self->SUPER::_Init(@_));
-}
-# }}}
 
-# {{{ sub _Accessible 
-sub _Accessible  {
+
+sub Create {
     my $self = shift;
-    my %Cols = (
-		Name => 'read/write',
-		Description => 'read/write',
-		Pseudo => 'read'
-	       );
-    return $self->SUPER::_Accessible(@_, %Cols);
+    my %args = ( 
+                Name => '',
+                Description => '',
+                Domain => '',
+                Type => '',
+                Instance => '',
+
+		  @_);
+    $self->SUPER::Create(
+                         Name => $args{'Name'},
+                         Description => $args{'Description'},
+                         Domain => $args{'Domain'},
+                         Type => $args{'Type'},
+                         Instance => $args{'Instance'},
+);
+
 }
-# }}}
 
-# {{{ sub Load 
 
-=head2 Load
 
-Load a group object from the database. Takes a single argument.
-If the argument is numerical, load by the column 'id'. Otherwise, load by
-the "Name" column which is the group's textual name
+=item id
 
-=cut
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
 
-sub Load  {
-    my $self = shift;
-    my $identifier = shift || return undef;
-    
-    #if it's an int, load by id. otherwise, load by name.
-    if ($identifier !~ /\D/) {
-	$self->SUPER::LoadById($identifier);
-    }
-    else {
-	$self->LoadByCol("Name",$identifier);
-    }
-}
 
-# }}}
+=cut
 
-# {{{ sub Create
 
-=head2 Create
+=item Name
 
-Takes a paramhash with three named arguments: Name, Description and Pseudo.
-Pseudo is used internally by RT for certain special ACL decisions.
+Returns the current value of Name. 
+(In the database, Name is stored as varchar(200).)
 
-=cut
 
-sub Create {
-    my $self = shift;
-    my %args = ( Name => undef,
-		 Description => undef,
-		 Pseudo => 0,
-		 @_);
-    
-    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
-	$RT::Logger->warning($self->CurrentUser->Name ." Tried to create a group without permission.");
-	return(0, 'Permission Denied');
-    }
-    
-    my $retval = $self->SUPER::Create(Name => $args{'Name'},
-				      Description => $args{'Description'},
-				      Pseudo => $args{'Pseudo'});
-    
-    return ($retval);
-}
 
-# }}}
+=item SetName VALUE
 
-# {{{ sub Delete
 
-=head2 Delete
+Set Name to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Name will be stored as a varchar(200).)
 
-Delete this object
 
 =cut
 
-sub Delete {
-    my $self = shift;
-    
-    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
-	return (0, 'Permission Denied');
-    }
-    
-    return($self->SUPER::Delete(@_));    
-}
 
-# }}}
+=item Description
 
-# {{{ MembersObj
+Returns the current value of Description. 
+(In the database, Description is stored as varchar(255).)
 
-=head2 MembersObj
 
-Returns an RT::GroupMembers object of this group's members.
+
+=item SetDescription VALUE
+
+
+Set Description to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Description will be stored as a varchar(255).)
+
 
 =cut
 
-sub MembersObj {
-    my $self = shift;
-    unless (defined $self->{'members_obj'}) {
-	use RT::GroupMembers;
-        $self->{'members_obj'} = new RT::GroupMembers($self->CurrentUser);
-	
-	#If we don't have rights, don't include any results
-	$self->{'members_obj'}->LimitToGroup($self->id);
-	
-    }
-    return ($self->{'members_obj'});
-    
-}
 
-# }}}
+=item Domain
+
+Returns the current value of Domain. 
+(In the database, Domain is stored as varchar(64).)
+
 
-# {{{ AddMember
 
-=head2 AddMember
+=item SetDomain VALUE
+
+
+Set Domain to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Domain will be stored as a varchar(64).)
 
-AddMember adds a user to this group.  It takes a user id.
-Returns a two value array. the first value is true on successful 
-addition or 0 on failure.  The second value is a textual status msg.
 
 =cut
 
-sub AddMember {
-    my $self = shift;
-    my $new_member = shift;
-
-    my $new_member_obj = new RT::User($self->CurrentUser);
-    $new_member_obj->Load($new_member);
-    
-    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
-        #User has no permission to be doing this
-        return(0, "Permission Denied");
-    }
-
-    unless ($new_member_obj->Id) {
-	$RT::Logger->debug("Couldn't find user $new_member");
-	return(0, "Couldn't find user");
-    }	
-
-    if ($self->HasMember($new_member_obj->Id)) {
-        #User is already a member of this group. no need to add it
-        return(0, "Group already has member");
-    }
-    
-    my $member_object = new RT::GroupMember($self->CurrentUser);
-    $member_object->Create( UserId => $new_member_obj->Id, 
-			    GroupId => $self->id );
-    return(1, "Member added");
-}
 
-# }}}
+=item Type
+
+Returns the current value of Type. 
+(In the database, Type is stored as varchar(64).)
+
+
+
+=item SetType VALUE
 
-# {{{ HasMember
 
-=head2 HasMember
+Set Type to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Type will be stored as a varchar(64).)
 
-Takes a user Id and returns a GroupMember Id if that user is a member of 
-this group.
-Returns undef if the user isn't a member of the group or if the current
-user doesn't have permission to find out. Arguably, it should differentiate
-between ACL failure and non membership.
 
 =cut
 
-sub HasMember {
-    my $self = shift;
-    my $user_id = shift;
 
-    #Try to cons up a member object using "LoadByCols"
+=item Instance
 
-    my $member_obj = new RT::GroupMember($self->CurrentUser);
-    $member_obj->LoadByCols( UserId => $user_id, GroupId => $self->id);
+Returns the current value of Instance. 
+(In the database, Instance is stored as varchar(64).)
 
-    #If we have a member object
-    if (defined $member_obj->id) {
-        return ($member_obj->id);
-    }
 
-    #If Load returns no objects, we have an undef id. 
-    else {
-        return(undef);
-    } 
-}
 
-# }}}
+=item SetInstance VALUE
 
-# {{{ DeleteMember
 
-=head2 DeleteMember
+Set Instance to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Instance will be stored as a varchar(64).)
 
-Takes the user id of a member.
-If the current user has apropriate rights,
-removes that GroupMember from this group.
-Returns a two value array. the first value is true on successful 
-addition or 0 on failure.  The second value is a textual status msg.
 
 =cut
 
-sub DeleteMember {
-    my $self = shift;
-    my $member = shift;
-
-    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
-        #User has no permission to be doing this
-        return(0,"Permission Denied");
-    }
-
-    my $member_user_obj = new RT::User($self->CurrentUser);
-    $member_user_obj->Load($member);
-    
-    unless ($member_user_obj->Id) {
-	$RT::Logger->debug("Couldn't find user $member");
-	return(0, "User not found");
-    }	
-
-    my $member_obj = new RT::GroupMember($self->CurrentUser);
-    unless ($member_obj->LoadByCols ( UserId => $member_user_obj->Id,
-				      GroupId => $self->Id )) {
-	return(0, "Couldn\'t load member");  #couldn\'t load member object
-    }
-    
-    #If we couldn't load it, return undef.
-    unless ($member_obj->Id()) {
-	return (0, "Group has no such member");
-    }	
-    
-    #Now that we've checked ACLs and sanity, delete the groupmember
-    my $val = $member_obj->Delete();
-    if ($val) {
-	return ($val, "Member deleted");
-    }
-    else {
-	return (0, "Member not deleted");
-    }
-}
 
-# }}}
 
-# {{{ ACL Related routines
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        Name => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Description => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        Domain => 
+		{read => 1, write => 1, type => 'varchar(64)', default => ''},
+        Type => 
+		{read => 1, write => 1, type => 'varchar(64)', default => ''},
+        Instance => 
+		{read => 1, write => 1, type => 'varchar(64)', default => ''},
 
-# {{{ GrantQueueRight
+ }
+};
 
-=head2 GrantQueueRight
 
-Grant a queue right to this group.  Takes a paramhash of which the elements
-RightAppliesTo and RightName are important.
+        eval "require RT::Group_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Group_Overlay.pm}) {
+            die $@;
+        };
 
-=cut
+        eval "require RT::Group_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Group_Vendor.pm}) {
+            die $@;
+        };
 
-sub GrantQueueRight {
-    
-    my $self = shift;
-    my %args = ( RightScope => 'Queue',
-		 RightName => undef,
-		 RightAppliesTo => undef,
-		 PrincipalType => 'Group',
-		 PrincipalId => $self->Id,
-		 @_);
-   
-    #ACLs get checked in ACE.pm
-    
-    my $ace = new RT::ACE($self->CurrentUser);
-    
-    return ($ace->Create(%args));
-}
+        eval "require RT::Group_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Group_Local.pm}) {
+            die $@;
+        };
 
-# }}}
 
-# {{{ GrantSystemRight
 
-=head2 GrantSystemRight
 
-Grant a system right to this group. 
-The only element that's important to set is RightName.
+=head1 SEE ALSO
 
-=cut
-sub GrantSystemRight {
-    
-    my $self = shift;
-    my %args = ( RightScope => 'System',
-		 RightName => undef,
-		 RightAppliesTo => 0,
-		 PrincipalType => 'Group',
-		 PrincipalId => $self->Id,
-		 @_);
-    
-    # ACLS get checked in ACE.pm
-    
-    my $ace = new RT::ACE($self->CurrentUser);
-    return ($ace->Create(%args));
-}
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-# }}}
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
+   no warnings qw(redefine);
 
-# {{{ sub _Set
-sub _Set {
-    my $self = shift;
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
-    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
-	return (0, 'Permission Denied');
-    }	
+RT::Group_Overlay, RT::Group_Vendor, RT::Group_Local
 
-    return ($self->SUPER::_Set(@_));
+=cut
 
-}
-# }}}
+
+1;
diff --git a/rt/lib/RT/GroupMember.pm b/rt/lib/RT/GroupMember.pm
index 69de50b42..8de1a73fe 100755
--- a/rt/lib/RT/GroupMember.pm
+++ b/rt/lib/RT/GroupMember.pm
@@ -1,136 +1,189 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/GroupMember.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Copyright 2000 Jesse Vincent <jesse@fsck.com>
-# Released under the terms of the GNU Public License
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::GroupMember - a member of an RT Group
+RT::GroupMember
 
-=head1 SYNOPSIS
 
-RT::GroupMember should never be called directly. It should generally
-only be accessed through the helper functions in RT::Group;
+=head1 SYNOPSIS
 
 =head1 DESCRIPTION
 
+=head1 METHODS
 
+=cut
 
+package RT::GroupMember;
+use RT::Record; 
 
-=head1 METHODS
 
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
 
-=begin testing
+sub _Init {
+  my $self = shift; 
 
-ok (require RT::TestHarness);
-ok (require RT::GroupMember);
+  $self->Table('GroupMembers');
+  $self->SUPER::_Init(@_);
+}
 
-=end testing
 
 
-=cut
 
-package RT::GroupMember;
-use RT::Record;
-use vars qw|@ISA|;
-@ISA= qw(RT::Record);
 
-# {{{ sub _Init
-sub _Init {
-  my $self = shift; 
-  $self->{'table'} = "GroupMembers";
-  return($self->SUPER::_Init(@_));
-}
-# }}}
+=item Create PARAMHASH
 
-# {{{ sub _Accessible 
-sub _Accessible  {
-    my $self = shift;
-    my %Cols = (
-		GroupId => 'read',
-		UserId => 'read'
-		);
+Create takes a hash of values and creates a row in the database:
+
+  int(11) 'GroupId'.
+  int(11) 'MemberId'.
+
+=cut
 
-    return $self->SUPER::_Accessible(@_, %Cols);
-}
-# }}}
 
-# {{{ sub Create
 
-# a helper method for Add
 
 sub Create {
     my $self = shift;
-    my %args = ( GroupId => undef,
-		 UserId => undef,
-		 @_
-	       );
-    
-    unless( $self->CurrentUser->HasSystemRight('AdminGroups')) {
-	return (0, 'Permission Denied');
-    }
-
-    return ($self->SUPER::Create(GroupId => $args{'GroupId'},
-				 UserId => $args{'UserId'}))
+    my %args = ( 
+                GroupId => '0',
+                MemberId => '0',
+
+		  @_);
+    $self->SUPER::Create(
+                         GroupId => $args{'GroupId'},
+                         MemberId => $args{'MemberId'},
+);
+
 }
-# }}}
 
-# {{{ sub Add
 
-=head2 Add
 
-Takes a paramhash of UserId and GroupId.  makes that user a memeber
-of that group
+=item id
+
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
+
 
 =cut
 
-sub Add {
-    my $self = shift;
-    return ($self->Create(@_));
-}
-# }}}
 
-# {{{ sub Delete
+=item GroupId
+
+Returns the current value of GroupId. 
+(In the database, GroupId is stored as int(11).)
+
+
+
+=item SetGroupId VALUE
+
 
-=head2 Delete
+Set GroupId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, GroupId will be stored as a int(11).)
 
-Takes no arguments. deletes the currently loaded member from the 
-group in question.
 
 =cut
 
-sub Delete {
-    my $self = shift;
-    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
-	return (0, 'Permission Denied');
-    }
-    return($self->SUPER::Delete(@_));
-}
 
-# }}}
+=item MemberId
+
+Returns the current value of MemberId. 
+(In the database, MemberId is stored as int(11).)
+
 
-# {{{ sub UserObj
 
-=head2 UserObj
+=item SetMemberId VALUE
+
+
+Set MemberId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, MemberId will be stored as a int(11).)
 
-Returns an RT::User object for the user specified by $self->UserId
 
 =cut
 
-sub UserObj {
-    my $self = shift;
-    unless (defined ($self->{'user_obj'})) {
-        $self->{'user_obj'} = new RT::User($self->CurrentUser);
-        $self->{'user_obj'}->Load($self->UserId);
-    }
-    return($self->{'user_obj'});
-}
 
-# {{{ sub _Set
-sub _Set {
-    my $self = shift;
-    unless ($self->CurrentUser->HasSystemRight('AdminGroups')) {
-	return (0, 'Permission Denied');
-    }
-    return($self->SUPER::_Set(@_));
-}
-# }}}
+
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        GroupId => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        MemberId => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+
+ }
+};
+
+
+        eval "require RT::GroupMember_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/GroupMember_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::GroupMember_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/GroupMember_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::GroupMember_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/GroupMember_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::GroupMember_Overlay, RT::GroupMember_Vendor, RT::GroupMember_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/GroupMembers.pm b/rt/lib/RT/GroupMembers.pm
index a90a2a899..31cb9536f 100755
--- a/rt/lib/RT/GroupMembers.pm
+++ b/rt/lib/RT/GroupMembers.pm
@@ -1,73 +1,115 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/GroupMembers.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::GroupMembers - a collection of RT::GroupMember objects
+=head1 NAME
 
+  RT::GroupMembers -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::GroupMembers;
+  use RT::GroupMembers
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::GroupMembers);
-
-=end testing
-
 =cut
 
 package RT::GroupMembers;
-use RT::EasySearch;
+
+use RT::SearchBuilder;
 use RT::GroupMember;
 
-@ISA= qw(RT::EasySearch);
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
 
-# {{{ sub _Init  
-sub _Init   {
-  my $self = shift;
- 
-  $self->{'table'} = "GroupMembers";
-  $self->{'primary_key'} = "id";
-  return ( $self->SUPER::_Init(@_) );
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'GroupMembers';
+    $self->{'primary_key'} = 'id';
+
+
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
-# {{{ sub LimitToGroup
 
-=head2 LimitToGroup
+=item NewItem
 
-Takes a group id as its only argument.  Limits the current search to that
-group object
+Returns an empty new RT::GroupMember item
 
 =cut
 
-sub LimitToGroup {
+sub NewItem {
     my $self = shift;
-    my $group = shift;
+    return(RT::GroupMember->new($self->CurrentUser));
+}
 
-    return ($self->Limit( 
-                         VALUE => "$group",
-                         FIELD => 'GroupId',
-                         ENTRYAGGREGATOR => 'OR',
-                         ));
+        eval "require RT::GroupMembers_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/GroupMembers_Overlay.pm}) {
+            die $@;
+        };
 
-}
-# }}}
+        eval "require RT::GroupMembers_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/GroupMembers_Vendor.pm}) {
+            die $@;
+        };
 
-# {{{ sub NewItem 
+        eval "require RT::GroupMembers_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/GroupMembers_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::GroupMembers_Overlay, RT::GroupMembers_Vendor, RT::GroupMembers_Local
+
+=cut
 
-sub NewItem  {
-    my $self = shift;
-    return(RT::GroupMember->new($self->CurrentUser))
-}
 
-# }}}
 1;
diff --git a/rt/lib/RT/Groups.pm b/rt/lib/RT/Groups.pm
index f44f1fdb3..29f12a5a0 100755
--- a/rt/lib/RT/Groups.pm
+++ b/rt/lib/RT/Groups.pm
@@ -1,100 +1,115 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Groups.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::Groups - a collection of RT::Group objects
+=head1 NAME
 
+  RT::Groups -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::Groups;
-  my $groups = $RT::Groups->new($CurrentUser);
-  $groups->LimitToReal();
-  while (my $group = $groups->Next()) {
-     print $group->Id ." is a group id\n";
-  }
+  use RT::Groups
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Groups);
-
-=end testing
-
 =cut
 
 package RT::Groups;
-use RT::EasySearch;
-use RT::Groups;
 
-@ISA= qw(RT::EasySearch);
+use RT::SearchBuilder;
+use RT::Group;
 
-# {{{ sub _Init
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-sub _Init { 
-  my $self = shift;
-  $self->{'table'} = "Groups";
-  $self->{'primary_key'} = "id";
 
-  $self->OrderBy( ALIAS => 'main',
-		  FIELD => 'Name',
-		  ORDER => 'ASC');
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'Groups';
+    $self->{'primary_key'} = 'id';
 
 
-  return ( $self->SUPER::_Init(@_));
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
-# {{{ LimitToReal
 
-=head2 LimitToReal
+=item NewItem
 
-Make this groups object return only "real" groups, which can be
-granted rights and have members assigned to them
+Returns an empty new RT::Group item
 
 =cut
 
-sub LimitToReal {
+sub NewItem {
     my $self = shift;
+    return(RT::Group->new($self->CurrentUser));
+}
 
-    return ($self->Limit( FIELD => 'Pseudo',
-			  VALUE => '0',
-			  OPERATOR => '='));
+        eval "require RT::Groups_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Groups_Overlay.pm}) {
+            die $@;
+        };
 
-}
-# }}}
+        eval "require RT::Groups_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Groups_Vendor.pm}) {
+            die $@;
+        };
 
-# {{{ sub LimitToPseudo
+        eval "require RT::Groups_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Groups_Local.pm}) {
+            die $@;
+        };
 
-=head2 LimitToPseudo
 
-Make this groups object return only "pseudo" groups, which can be
-granted rights but whose membership lists are determined dynamically.
 
-=cut
-  
-  sub LimitToPseudo {
-    my $self = shift;
 
-    return ($self->Limit( FIELD => 'Pseudo',
-			  VALUE => '1',
-			  OPERATOR => '='));
+=head1 SEE ALSO
 
-}
-# }}}
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
-# {{{ sub NewItem 
-sub NewItem  {
-  my $self = shift;
-  return (RT::Group->new($self->CurrentUser));
-}
-# }}}
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
-1;
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
+RT::Groups_Overlay, RT::Groups_Vendor, RT::Groups_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/Handle.pm b/rt/lib/RT/Handle.pm
index 6b74f361b..5cdb65e5b 100644
--- a/rt/lib/RT/Handle.pm
+++ b/rt/lib/RT/Handle.pm
@@ -1,5 +1,26 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Handle.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 =head1 NAME
 
   RT::Handle - RT's database handle
@@ -22,14 +43,16 @@ ok(require RT::Handle);
 
 package RT::Handle;
 
-eval "use DBIx::SearchBuilder::Handle::$RT::DatabaseType;
+use strict;
+use vars qw/@ISA/;
 
+eval "use DBIx::SearchBuilder::Handle::$RT::DatabaseType;
 \@ISA= qw(DBIx::SearchBuilder::Handle::$RT::DatabaseType);";
-
 #TODO check for errors here.
 
 =head2 Connect
 
+Connects to RT's database handle.
 Takes nothing. Calls SUPER::Connect with the needed args
 
 =cut
@@ -38,16 +61,41 @@ sub Connect {
 my $self=shift;
 
 # Unless the database port is a positive integer, we really don't want to pass it.
-$RT::DatabasePort = undef unless (defined $RT::DatabasePort && $RT::DatabasePort =~ /^(\d+)$/);
 
-$self->SUPER::Connect(Host => $RT::DatabaseHost, 
-			 Database => $RT::DatabaseName, 
+$self->SUPER::Connect(
 			 User => $RT::DatabaseUser,
 			 Password => $RT::DatabasePassword,
+			);
+   
+}
+
+=item BuildDSN
+
+Build the DSN for the RT database. doesn't take any parameters, draws all that
+from the config file.
+
+=cut
+
+
+sub BuildDSN {
+    my $self = shift;
+$RT::DatabasePort = undef unless (defined $RT::DatabasePort && $RT::DatabasePort =~ /^(\d+)$/);
+$RT::DatabaseHost = undef unless (defined $RT::DatabaseHost && $RT::DatabaseHost ne '');
+
+    $self->SUPER::BuildDSN(Host => $RT::DatabaseHost, 
+			 Database => $RT::DatabaseName, 
 			 Port => $RT::DatabasePort,
 			 Driver => $RT::DatabaseType,
 			 RequireSSL => $RT::DatabaseRequireSSL,
+             DisconnectHandleOnDestroy => 1
 			);
    
+
 }
+
+eval "require RT::Handle_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Handle_Vendor.pm});
+eval "require RT::Handle_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Handle_Local.pm});
+
 1;
diff --git a/rt/lib/RT/Interface/CLI.pm b/rt/lib/RT/Interface/CLI.pm
index a3bf92d5f..ec0e877b4 100644
--- a/rt/lib/RT/Interface/CLI.pm
+++ b/rt/lib/RT/Interface/CLI.pm
@@ -1,9 +1,31 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Interface/CLI.pm,v 1.1 2002-08-12 06:17:08 ivan Exp $
-# RT is (c) 1996-2001 Jesse Vincent <jesse@fsck.com>
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+use strict;
 
+use RT;
 package RT::Interface::CLI;
 
-use strict;
 
 
 BEGIN {
@@ -11,14 +33,14 @@ BEGIN {
     use vars qw ($VERSION  @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
     
     # set the version for version checking
-    $VERSION = do { my @r = (q$Revision: 1.1 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
+    $VERSION = do { my @r = (q$Revision: 1.2 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
     
     @ISA         = qw(Exporter);
     
     # your exported package globals go here,
     # as well as any optionally exported functions
-    @EXPORT_OK   = qw(&CleanEnv &LoadConfig &DBConnect 
-		      &GetCurrentUser &GetMessageContent &debug);
+    @EXPORT_OK   = qw(&CleanEnv 
+		      &GetCurrentUser &GetMessageContent &debug &loc);
 }
 
 =head1 NAME
@@ -27,25 +49,28 @@ BEGIN {
 
 =head1 SYNOPSIS
 
-  use lib "!!RT_LIB_PATH!!";
-  use lib "!!RT_ETC_PATH!!";
+  use lib "/path/to/rt/libraries/";
 
-  use RT::Interface::CLI  qw(CleanEnv LoadConfig DBConnect 
-	  		   GetCurrentUser GetMessageContent);
+  use RT::Interface::CLI  qw(CleanEnv 
+	  		   GetCurrentUser GetMessageContent loc);
 
   #Clean out all the nasties from the environment
   CleanEnv();
 
-  #Load etc/config.pm and drop privs
-  LoadConfig();
+  #let's talk to RT'
+  use RT;
 
-  #Connect to the database and get RT::SystemUser and RT::Nobody loaded
-  DBConnect();
+  #Load RT's config file
+  RT::LoadConfig();
 
+  # Connect to the database. set up loggign
+  RT::Init();
 
   #Get the current user all loaded
   my $CurrentUser = GetCurrentUser();
 
+  print loc('Hello!'); # Synonym of $CuurentUser->loc('Hello!');
+
 =head1 DESCRIPTION
 
 
@@ -53,7 +78,6 @@ BEGIN {
 
 =begin testing
 
-ok(require RT::TestHarness);
 ok(require RT::Interface::CLI);
 
 =end testing
@@ -77,35 +101,10 @@ sub CleanEnv {
 
 
 
-=head2 LoadConfig
-
-Loads RT's config file and then drops setgid privileges.
-
-=cut
-
-sub LoadConfig {
-    
-    #This drags in  RT's config.pm
-    use config;
-    
-}	
-
-
-
-=head2 DBConnect
-
-  Calls RT::Init, which creates a database connection and then creates $RT::Nobody
-  and $RT::SystemUser
-
-=cut
-
-
-sub DBConnect {
-    use RT;
-    RT::Init();
-}
 
+{
 
+    my $CurrentUser; # shared betwen GetCurrentUser and loc
 
 # {{{ sub GetCurrentUser 
 
@@ -115,15 +114,14 @@ sub DBConnect {
 loaded with that user.  if the current user isn't found, returns a copy of RT::Nobody.
 
 =cut
+
 sub GetCurrentUser  {
     
-    my ($Gecos, $CurrentUser);
-    
     require RT::CurrentUser;
     
     #Instantiate a user object
     
-    $Gecos=(getpwuid($<))[0];
+    my $Gecos= ($^O eq 'MSWin32') ? Win32::LoginName() : (getpwuid($<))[0];
 
     #If the current user is 0, then RT will assume that the User object
     #is that of the currentuser.
@@ -134,10 +132,29 @@ sub GetCurrentUser  {
     unless ($CurrentUser->Id) {
 	$RT::Logger->debug("No user with a unix login of '$Gecos' was found. ");
     }
+
     return($CurrentUser);
 }
 # }}}
 
+
+# {{{ sub loc 
+
+=head2 loc
+
+  Synonym of $CurrentUser->loc().
+
+=cut
+
+sub loc {
+    die "No current user yet" unless $CurrentUser ||= RT::CurrentUser->new;
+    return $CurrentUser->loc(@_);
+}
+# }}}
+
+}
+
+
 # {{{ sub GetMessageContent
 
 =head2 GetMessageContent
@@ -221,4 +238,9 @@ sub debug {
 # }}}
 
 
+eval "require RT::Interface::CLI_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/CLI_Vendor.pm});
+eval "require RT::Interface::CLI_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/CLI_Local.pm});
+
 1;
diff --git a/rt/lib/RT/Interface/Email.pm b/rt/lib/RT/Interface/Email.pm
index e95436091..7eec0502f 100755
--- a/rt/lib/RT/Interface/Email.pm
+++ b/rt/lib/RT/Interface/Email.pm
@@ -1,41 +1,58 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Interface/Email.pm,v 1.1 2002-08-12 06:17:08 ivan Exp $
-# RT is (c) 1996-2001 Jesse Vincent <jesse@fsck.com>
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 package RT::Interface::Email;
 
 use strict;
 use Mail::Address;
 use MIME::Entity;
+use RT::EmailParser;
+
 
 BEGIN {
     use Exporter ();
     use vars qw ($VERSION  @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
     
     # set the version for version checking
-    $VERSION = do { my @r = (q$Revision: 1.1 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
+    $VERSION = do { my @r = (q$Revision: 1.2 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
     
     @ISA         = qw(Exporter);
     
     # your exported package globals go here,
     # as well as any optionally exported functions
-    @EXPORT_OK   = qw(&CleanEnv 
-		      &LoadConfig 
-		      &DBConnect 
-		      &GetCurrentUser
+    @EXPORT_OK   = qw(
+              &CreateUser
 		      &GetMessageContent
 		      &CheckForLoops 
 		      &CheckForSuspiciousSender
 		      &CheckForAutoGenerated 
-		      &ParseMIMEEntityFromSTDIN
-		      &ParseTicketId 
 		      &MailError 
 		      &ParseCcAddressesFromHead
 		      &ParseSenderAddressFromHead 
-   		      &ParseErrorsToAddressFromHead
-              &ParseAddressFromHeader
-
+		      &ParseErrorsToAddressFromHead
+                      &ParseAddressFromHeader
+              &Gateway);
 
-		      &debug);
 }
 
 =head1 NAME
@@ -47,28 +64,13 @@ BEGIN {
   use lib "!!RT_LIB_PATH!!";
   use lib "!!RT_ETC_PATH!!";
 
-  use RT::Interface::Email  qw(CleanEnv LoadConfig DBConnect 
-			      );
-
-  #Clean out all the nasties from the environment
-  CleanEnv();
-
-  #Load etc/config.pm and drop privs
-  LoadConfig();
-
-  #Connect to the database and get RT::SystemUser and RT::Nobody loaded
-  DBConnect();
-
-
-  #Get the current user all loaded
-  my $CurrentUser = GetCurrentUser();
+  use RT::Interface::Email  qw(Gateway CreateUser);
 
 =head1 DESCRIPTION
 
 
 =begin testing
 
-ok(require RT::TestHarness);
 ok(require RT::Interface::Email);
 
 =end testing
@@ -79,71 +81,6 @@ ok(require RT::Interface::Email);
 =cut
 
 
-=head2 CleanEnv
-
-Removes some of the nastiest nasties from the user\'s environment.
-
-=cut
-
-sub CleanEnv {
-    $ENV{'PATH'} = '/bin:/usr/bin';    # or whatever you need
-    $ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
-    $ENV{'SHELL'} = '/bin/sh' if defined $ENV{'SHELL'};
-    $ENV{'ENV'} = '' if defined $ENV{'ENV'};
-    $ENV{'IFS'} = '' if defined $ENV{'IFS'};
-}
-
-
-
-=head2 LoadConfig
-
-Loads RT's config file and then drops setgid privileges.
-
-=cut
-
-sub LoadConfig {
-    
-    #This drags in  RT's config.pm
-    use config;
-    
-}	
-
-
-
-=head2 DBConnect
-
-  Calls RT::Init, which creates a database connection and then creates $RT::Nobody
-  and $RT::SystemUser
-
-=cut
-
-
-sub DBConnect {
-    use RT;
-    RT::Init();
-}
-
-
-
-# {{{ sub debug
-
-sub debug {
-    my $val = shift;
-    my ($debug);
-    if ($val) {
-	$RT::Logger->debug($val."\n");
-	if ($debug) {
-	    print STDERR "$val\n";
-	}
-    }
-    if ($debug) {
-	return(1);
-    }	
-}
-
-# }}}
-
-
 # {{{ sub CheckForLoops 
 
 sub CheckForLoops  {
@@ -207,82 +144,6 @@ sub CheckForAutoGenerated {
 
 # }}}
 
-# {{{ sub ParseMIMEEntityFromSTDIN
-
-sub ParseMIMEEntityFromSTDIN {
-
-    # Create a new parser object:
-    
-    my $parser = new MIME::Parser;
-    
-    # {{{ Config $parser to store large attacments in temp dir
-
-    ## TODO: Does it make sense storing to disk at all?  After all, we
-    ## need to put each msg as an in-core scalar before saving it to
-    ## the database, don't we?
-
-    ## At the same time, we should make sure that we nuke attachments 
-    ## Over max size and return them
-
-    ## TODO: Remove the temp dir when we don't need it any more.
-
-    my $AttachmentDir = File::Temp::tempdir (TMPDIR => 1, CLEANUP => 1);
-    
-    # Set up output directory for files:
-    $parser->output_dir("$AttachmentDir");
-  
-    #If someone includes a message, don't extract it
-    $parser->extract_nested_messages(0);
-
-   
-    # Set up the prefix for files with auto-generated names:
-    $parser->output_prefix("part");
-
-    # If content length is <= 20000 bytes, store each msg as in-core scalar;
-    # Else, write to a disk file (the default action):
-  
-    $parser->output_to_core(20000);
-
-    # }}} (temporary directory)
-
-    #Ok. now that we're set up, let's get the stdin.
-    my $entity;
-    unless ($entity = $parser->read(\*STDIN)) {
-	die "couldn't parse MIME stream";
-    }
-    #Now we've got a parsed mime object. 
-    
-    # Get the head, a MIME::Head:
-    my $head = $entity->head;
-   
-
-    # Unfold headers that are have embedded newlines
-    $head->unfold; 
-    
-    # TODO - information about the charset is lost here!
-    $head->decode;
-
-    return ($entity, $head);
-
-}
-# }}}
-
-# {{{ sub ParseTicketId 
-
-sub ParseTicketId {
-    my $Subject = shift;
-    my ($Id);
-    
-    if ($Subject =~ s/\[$RT::rtname \#(\d+)\]//i) {
-	$Id = $1;
-	$RT::Logger->debug("Found a ticket ID. It's $Id");
-	return($Id);
-    }
-    else {
-	return(undef);
-    }
-}
-# }}}
 
 # {{{ sub MailError 
 sub MailError {
@@ -313,8 +174,8 @@ sub MailError {
     if ($mimeobj) {
         $mimeobj->sync_headers();
         $entity->add_part($mimeobj);
-    } 
-
+    }
+    
     if ($RT::MailCommand eq 'sendmailpipe') {
         open (MAIL, "|$RT::SendmailPath $RT::SendmailArguments") || return(0);
         print MAIL $entity->as_string;
@@ -327,144 +188,66 @@ sub MailError {
 
 # }}}
 
-# {{{ sub GetCurrentUser 
-
-sub GetCurrentUser  {
-    my $head = shift;
-    my $entity = shift;
-    my $ErrorsTo = shift;
+# {{{ Create User
 
-    my %UserInfo = ();
+sub CreateUser {
+    my ($Username, $Address, $Name, $ErrorsTo, $entity) = @_;
+    my $NewUser = RT::User->new($RT::SystemUser);
 
-    #Suck the address of the sender out of the header
-    my ($Address, $Name) = ParseSenderAddressFromHead($head);
-    
-    #This will apply local address canonicalization rules
-    $Address = RT::CanonicalizeAddress($Address);
-  
-    #If desired, synchronize with an external database
-
-    my $UserFoundInExternalDatabase = 0;
-
-    # Username is the 'Name' attribute of the user that RT uses for things
-    # like authentication
-    my $Username = undef;
-    if ($RT::LookupSenderInExternalDatabase) {
-	($UserFoundInExternalDatabase, %UserInfo) = 
-	  RT::LookupExternalUserInfo($Address, $Name);
-   
-       $Address = $UserInfo{'EmailAddress'};
-       $Username = $UserInfo{'Name'}; 
-    }
-    
-    my $CurrentUser = RT::CurrentUser->new();
+    # This data is tainted by some Very Broken mailers.
+    # (Sometimes they send raw ISO 8859-1 data here. fear that.
+    require Encode;
+    $Username = Encode::encode(utf8 => $Username, Encode::FB_PERLQQ()) if defined $Username;
+    $Name = Encode::encode(utf8 => $Name, Encode::FB_PERLQQ()) if defined $Name;
     
-    # First try looking up by a username, if we got one from the external
-    # db lookup. Next, try looking up by email address. Failing that,
-    # try looking up by users who have this user's email address as their
-    # username.
-
-    if ($Username) {
-	$CurrentUser->LoadByName($Username);
-    }	
+    my ($Val, $Message) = 
+      $NewUser->Create(Name => ($Username || $Address),
+                       EmailAddress => $Address,
+                       RealName => $Name,
+                       Password => undef,
+                       Privileged => 0,
+                       Comments => 'Autocreated on ticket submission'
+                      );
     
-    unless ($CurrentUser->Id) {
-	$CurrentUser->LoadByEmail($Address);
-    }	
-
-    #If we can't get it by email address, try by name.  
-    unless ($CurrentUser->Id) {
-	$CurrentUser->LoadByName($Address);
+    unless ($Val) {
+        
+        # Deal with the race condition of two account creations at once
+        #
+        if ($Username) {
+            $NewUser->LoadByName($Username);
+        }
+        
+        unless ($NewUser->Id) {
+            $NewUser->LoadByEmail($Address);
+        }
+        
+        unless ($NewUser->Id) {  
+            MailError( To => $ErrorsTo,
+                       Subject => "User could not be created",
+                       Explanation => "User creation failed in mailgateway: $Message",
+                       MIMEObj => $entity,
+                       LogLevel => 'crit'
+                     );
+        }
     }
-    
-    
-    unless ($CurrentUser->Id) {
-        #If we couldn't load a user, determine whether to create a user
-
-        # {{{ If we require an incoming address to be found in the external
-	# user database, reject the incoming message appropriately
-        if ( $RT::LookupSenderInExternalDatabase &&
-	     $RT::SenderMustExistInExternalDatabase && 
-	     !$UserFoundInExternalDatabase) {
-	    
-	    my $Message = "Sender's email address was not found in the user database.";
-
-	    # {{{  This code useful only if you've defined an AutoRejectRequest template
-	    
-	    require RT::Template;
-	    my $template = new RT::Template($RT::Nobody);
-	    $template->Load('AutoRejectRequest');
-	    $Message = $template->Content || $Message;
-	    
-	    # }}}
-	    
-	    MailError( To => $ErrorsTo,
-		       Subject => "Ticket Creation failed: user could not be created",
-		       Explanation => $Message,
-		       MIMEObj => $entity,
-		       LogLevel => 'notice'
-		     );
-
-	    return($CurrentUser);
-
-	} 
-	# }}}
-	
-	else {
-	    my $NewUser = RT::User->new($RT::SystemUser);
-	    
-	    my ($Val, $Message) = 
-	      $NewUser->Create(Name => ($Username || $Address),
-			       EmailAddress => $Address,
-			       RealName => "$Name",
-			       Password => undef,
-			       Privileged => 0,
-			       Comments => 'Autocreated on ticket submission'
-			      );
-	    
-	    unless ($Val) {
-		
-		# Deal with the race condition of two account creations at once
-		#
-           	if ($Username) {
-		    $NewUser->LoadByName($Username);
-		}
-		
-		unless ($NewUser->Id) {
-	            $NewUser->LoadByEmail($Address);
-		}
-		
-		unless ($NewUser->Id) {  
-		    MailError( To => $ErrorsTo,
-			       Subject => "User could not be created",
-			       Explanation => "User creation failed in mailgateway: $Message",
-			       MIMEObj => $entity,
-			       LogLevel => 'crit'
-			     );
-		}
-	    }
-	}
-	
-	#Load the new user object
-	$CurrentUser->LoadByEmail($Address);
-	
-	unless ($CurrentUser->id) {
-	    $RT::Logger->warning("Couldn't load user '$Address'.".  "giving up");
-		MailError( To => $ErrorsTo,
-			   Subject => "User could not be loaded",
-			   Explanation => "User  '$Address' could not be loaded in the mail gateway",
-			   MIMEObj => $entity,
-			   LogLevel => 'crit'
-			 );
-	    
-	}
+
+    #Load the new user object
+    my $CurrentUser = RT::CurrentUser->new();
+    $CurrentUser->LoadByEmail($Address);
+
+    unless ($CurrentUser->id) {
+            $RT::Logger->warning("Couldn't load user '$Address'.".  "giving up");
+                MailError( To => $ErrorsTo,
+                           Subject => "User could not be loaded",
+                           Explanation => "User  '$Address' could not be loaded in the mail gateway",
+                           MIMEObj => $entity,
+                           LogLevel => 'crit'
+                     );
     }
-    
-    return ($CurrentUser);
-    
-}
-# }}}
 
+    return $CurrentUser;
+}
+# }}}	    
 # {{{ ParseCcAddressesFromHead 
 
 =head2 ParseCcAddressesFromHead HASHREF
@@ -489,11 +272,11 @@ sub ParseCcAddressesFromHead {
     
     foreach my $AddrObj (@ToObjs, @CcObjs) {
 	my $Address = $AddrObj->address;
-	$Address = RT::CanonicalizeAddress($Address);
+	$Address = $args{'CurrentUser'}->UserObj->CanonicalizeEmailAddress($Address);
  	next if ($args{'CurrentUser'}->EmailAddress =~ /^$Address$/i);
 	next if ($args{'QueueObj'}->CorrespondAddress =~ /^$Address$/i);
 	next if ($args{'QueueObj'}->CommentAddress =~ /^$Address$/i);
-	next if (RT::IsRTAddress($Address));
+	next if (RT::EmailParser::IsRTAddress(undef, $Address));
 	
 	push (@Addresses, $Address);
     }
@@ -568,8 +351,7 @@ sub ParseAddressFromHeader{
     }
  
     my $Name =  ($AddrObj->phrase || $AddrObj->comment || $AddrObj->address);
-
-
+    
     #Lets take the from and load a user object.
     my $Address = $AddrObj->address;
 
@@ -578,4 +360,289 @@ sub ParseAddressFromHeader{
 # }}}
 
 
+
+=head2 Gateway
+
+This performs all the "guts" of the mail rt-mailgate program, and is
+designed to be called from the web interface with a message, user
+object, and so on.
+
+=cut
+
+sub Gateway {
+    my %args = ( message => undef,
+                 queue   => 1,
+                 action  => 'correspond',
+                 ticket  => undef,
+                 @_ );
+
+    # Validate the action
+    unless ( $args{'action'} =~ /^(comment|correspond|action)$/ ) {
+
+        # Can't safely loc this. What object do we loc around?
+        return ( 0, "Invalid 'action' parameter", undef );
+    }
+
+    my $parser = RT::EmailParser->new();
+    $parser->ParseMIMEEntityFromScalar( $args{'message'} );
+
+    my $Message = $parser->Entity();
+    my $head = $Message->head;
+
+    my ( $CurrentUser, $AuthStat, $status, $error );
+
+    my $ErrorsTo = ParseErrorsToAddressFromHead($head);
+
+    my $MessageId = $head->get('Message-Id')
+      || "<no-message-id-" . time . rand(2000) . "\@.$RT::Organization>";
+
+    #Pull apart the subject line
+    my $Subject = $head->get('Subject') || '';
+    chomp $Subject;
+
+
+    $args{'ticket'} ||= $parser->ParseTicketId($Subject);
+
+    my $SystemTicket;
+    if ($args{'ticket'} ) {
+        $SystemTicket = RT::Ticket->new($RT::SystemUser);
+        $SystemTicket->Load($args{'ticket'});
+    }
+
+    #Set up a queue object
+    my $SystemQueueObj = RT::Queue->new($RT::SystemUser);
+    $SystemQueueObj->Load( $args{'queue'} );
+
+
+    # We can safely have no queue of we have a known-good ticket
+    unless ( $args{'ticket'} || $SystemQueueObj->id ) {
+        MailError(
+                 To          => $RT::OwnerEmail,
+                 Subject     => "RT Bounce: $Subject",
+                 Explanation => "RT couldn't find the queue: " . $args{'queue'},
+                 MIMEObj     => $Message );
+        return ( 0, "RT couldn't find the queue: " . $args{'queue'}, undef );
+    }
+
+    # Authentication Level
+    # -1 - Get out.  this user has been explicitly declined 
+    # 0 - User may not do anything (Not used at the moment)
+    # 1 - Normal user
+    # 2 - User is allowed to specify status updates etc. a la enhanced-mailgate
+
+    push @RT::MailPlugins, "Auth::MailFrom"   unless @RT::MailPlugins;
+    # Since this needs loading, no matter what
+
+    for (@RT::MailPlugins) {
+        my $Code;
+        my $NewAuthStat;
+        if ( ref($_) eq "CODE" ) {
+            $Code = $_;
+        }
+        else {
+            $_ = "RT::Interface::Email::$_" unless /^RT::Interface::Email::/;
+            eval "require $_;";
+            if ($@) {
+                die ("Couldn't load module $_: $@");
+                next;
+            }
+            no strict 'refs';
+            if ( !defined( $Code = *{ $_ . "::GetCurrentUser" }{CODE} ) ) {
+                die ("No GetCurrentUser code found in $_ module");
+                next;
+            }
+        }
+
+        ( $CurrentUser, $NewAuthStat ) = $Code->( Message     => $Message,
+                                                  CurrentUser => $CurrentUser,
+                                                  AuthLevel   => $AuthStat,
+                                                  Action => $args{'action'},
+                                                  Ticket => $SystemTicket,
+                                                  Queue  => $SystemQueueObj );
+
+        # You get the highest level of authentication you were assigned.
+        last if $AuthStat == -1;
+        $AuthStat = $NewAuthStat if $NewAuthStat > $AuthStat;
+    }
+
+    # {{{ If authentication fails and no new user was created, get out.
+    if ( !$CurrentUser or !$CurrentUser->Id or $AuthStat == -1 ) {
+
+        # If the plugins refused to create one, they lose.
+        MailError(
+            Subject     => "Could not load a valid user",
+            Explanation => <<EOT,
+RT could not load a valid user, and RT's configuration does not allow
+for the creation of a new user for your email.
+
+Your RT administrator needs to grant 'Everyone' the right 'CreateTicket'
+for this queue.
+
+EOT
+            MIMEObj  => $Message,
+            LogLevel => 'error' )
+          unless $AuthStat == -1;
+        return ( 0, "Could not load a valid user", undef );
+    }
+
+    # }}}
+
+    # {{{ Lets check for mail loops of various sorts.
+    my $IsAutoGenerated = CheckForAutoGenerated($head);
+
+    my $IsSuspiciousSender = CheckForSuspiciousSender($head);
+
+    my $IsALoop = CheckForLoops($head);
+
+    my $SquelchReplies = 0;
+
+    #If the message is autogenerated, we need to know, so we can not
+    # send mail to the sender
+    if ( $IsSuspiciousSender || $IsAutoGenerated || $IsALoop ) {
+        $SquelchReplies = 1;
+        $ErrorsTo       = $RT::OwnerEmail;
+    }
+
+    # }}}
+
+    # {{{ Drop it if it's disallowed
+    if ( $AuthStat == 0 ) {
+        MailError(
+             To          => $ErrorsTo,
+             Subject     => "Permission Denied",
+             Explanation => "You do not have permission to communicate with RT",
+             MIMEObj     => $Message );
+    }
+
+    # }}}
+    # {{{ Warn someone  if it's a loop
+
+    # Warn someone if it's a loop, before we drop it on the ground
+    if ($IsALoop) {
+        $RT::Logger->crit("RT Recieved mail ($MessageId) from itself.");
+
+        #Should we mail it to RTOwner?
+        if ($RT::LoopsToRTOwner) {
+            MailError( To          => $RT::OwnerEmail,
+                       Subject     => "RT Bounce: $Subject",
+                       Explanation => "RT thinks this message may be a bounce",
+                       MIMEObj     => $Message );
+
+            #Do we actually want to store it?
+            return ( 0, "Message Bounced", undef ) unless ($RT::StoreLoops);
+        }
+    }
+
+    # }}}
+
+    # {{{ Squelch replies if necessary
+    # Don't let the user stuff the RT-Squelch-Replies-To header.
+    if ( $head->get('RT-Squelch-Replies-To') ) {
+        $head->add( 'RT-Relocated-Squelch-Replies-To',
+                    $head->get('RT-Squelch-Replies-To') );
+        $head->delete('RT-Squelch-Replies-To');
+    }
+
+    if ($SquelchReplies) {
+        ## TODO: This is a hack.  It should be some other way to
+        ## indicate that the transaction should be "silent".
+
+        my ( $Sender, $junk ) = ParseSenderAddressFromHead($head);
+        $head->add( 'RT-Squelch-Replies-To', $Sender );
+    }
+
+    # }}}
+
+    my $Ticket = RT::Ticket->new($CurrentUser);
+
+    # {{{ If we don't have a ticket Id, we're creating a new ticket
+    if ( !$args{'ticket'} ) {
+
+        # {{{ Create a new ticket
+
+        my @Cc;
+        my @Requestors = ( $CurrentUser->id );
+
+        if ($RT::ParseNewMessageForTicketCcs) {
+            @Cc = ParseCcAddressesFromHead( Head        => $head,
+                                            CurrentUser => $CurrentUser,
+                                            QueueObj    => $SystemQueueObj );
+        }
+
+        my ( $id, $Transaction, $ErrStr ) = $Ticket->Create(
+                                                      Queue     => $SystemQueueObj->Id,
+                                                      Subject   => $Subject,
+                                                      Requestor => \@Requestors,
+                                                      Cc        => \@Cc,
+                                                      MIMEObj   => $Message );
+        if ( $id == 0 ) {
+            MailError( To          => $ErrorsTo,
+                       Subject     => "Ticket creation failed",
+                       Explanation => $ErrStr,
+                       MIMEObj     => $Message );
+            $RT::Logger->error("Create failed: $id / $Transaction / $ErrStr ");
+            return ( 0, "Ticket creation failed", $Ticket );
+        }
+
+        # }}}
+    }
+
+    # }}}
+
+    #   If the action is comment, add a comment.
+    elsif ( $args{'action'} =~ /^(comment|correspond)$/i ) {
+        $Ticket->Load($args{'ticket'});
+        unless ( $Ticket->Id ) {
+            my $message = "Could not find a ticket with id ".$args{'ticket'};
+            MailError( To          => $ErrorsTo,
+                     Subject     => "Message not recorded",
+                     Explanation => $message,
+                     MIMEObj     => $Message );
+
+            return ( 0, $message);
+        }
+
+        my ( $status, $msg );
+        if ( $args{'action'} =~ /^correspond$/ ) {
+            ( $status, $msg ) = $Ticket->Correspond( MIMEObj => $Message );
+        }
+        else {
+            ( $status, $msg ) = $Ticket->Comment( MIMEObj => $Message );
+        }
+        unless ($status) {
+
+            #Warn the sender that we couldn't actually submit the comment.
+            MailError( To          => $ErrorsTo,
+                       Subject     => "Message not recorded",
+                       Explanation => $msg,
+                       MIMEObj     => $Message );
+            return ( 0, "Message not recorded", $Ticket );
+        }
+    }
+
+    else {
+
+        #Return mail to the sender with an error
+        MailError( To          => $ErrorsTo,
+                   Subject     => "RT Configuration error",
+                   Explanation => "'"
+                     . $args{'action'}
+                     . "' not a recognized action."
+                     . " Your RT administrator has misconfigured "
+                     . "the mail aliases which invoke RT",
+                   MIMEObj => $Message );
+        $RT::Logger->crit( $args{'action'} . " type unknown for $MessageId" );
+        return ( 0, "Configuration error: " . $args{'action'} . " not a recognized action", $Ticket );
+
+    }
+
+
+return ( 1, "Success", $Ticket );
+}
+
+eval "require RT::Interface::Email_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/Email_Vendor.pm});
+eval "require RT::Interface::Email_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/Email_Local.pm});
+
 1;
diff --git a/rt/lib/RT/Interface/Web.pm b/rt/lib/RT/Interface/Web.pm
index 6b5272848..5097f54a4 100644
--- a/rt/lib/RT/Interface/Web.pm
+++ b/rt/lib/RT/Interface/Web.pm
@@ -1,129 +1,214 @@
-## $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Interface/Web.pm,v 1.1 2002-08-12 06:17:08 ivan Exp $
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 ## Portions Copyright 2000 Tobias Brox <tobix@fsck.com>
-## Copyright 1996-2002 Jesse Vincent <jesse@bestpractical.com>
 
 ## This is a library of static subs to be used by the Mason web
 ## interface to RT
 
+
+=head1 NAME
+
+RT::Interface::Web
+
+=begin testing
+
+use_ok(RT::Interface::Web);
+
+=end testing
+
+=cut
+
+
 package RT::Interface::Web;
+use strict;
 
-# {{{ sub NewParser
 
-=head2 NewParser
 
-  Returns a new Mason::Parser object. Takes a param hash of things 
-  that get passed to HTML::Mason::Parser. Currently hard coded to only
-  take the parameter 'allow_globals'.
+
+
+# {{{ sub NewApacheHandler 
+
+=head2 NewApacheHandler
+
+  Takes extra options to pass to HTML::Mason::ApacheHandler->new
+  Returns a new Mason::ApacheHandler object
 
 =cut
 
-sub NewParser {
-    my %args = (
-        allow_globals => undef,
+sub NewApacheHandler {
+    require HTML::Mason::ApacheHandler;
+    my $ah = new HTML::Mason::ApacheHandler( 
+    
+        comp_root                    => [
+            [ local    => $RT::MasonLocalComponentRoot ],
+            [ standard => $RT::MasonComponentRoot ]
+        ],
+        args_method => "CGI",
+        default_escape_flags => 'h',
+        allow_globals        => [qw(%session)],
+        data_dir => "$RT::MasonDataDir",
         @_
     );
 
-    my $parser = new HTML::Mason::Parser(
-        default_escape_flags => 'h',
-        allow_globals        => $args{'allow_globals'}
-    );
-    return ($parser);
+    $ah->interp->set_escape( h => \&RT::Interface::Web::EscapeUTF8 );
+    
+    return ($ah);
 }
 
 # }}}
 
-# {{{ sub NewInterp
+# {{{ sub NewCGIHandler 
 
-=head2 NewInterp 
+=head2 NewCGIHandler
 
-  Takes a paremeter hash. Needs a param called 'parser' which is a reference
-  to an HTML::Mason::Parser.
-  returns a new Mason::Interp object
+  Returns a new Mason::CGIHandler object
 
 =cut
 
-sub NewInterp {
-    my %params = (
+sub NewCGIHandler {
+    my %args = (
+        @_
+    );
+
+    my $handler = HTML::Mason::CGIHandler->new(
         comp_root                    => [
             [ local    => $RT::MasonLocalComponentRoot ],
             [ standard => $RT::MasonComponentRoot ]
         ],
         data_dir => "$RT::MasonDataDir",
-        @_
+        default_escape_flags => 'h',
+        allow_globals        => [qw(%session)]
     );
+  
 
-    #We allow recursive autohandlers to allow for RT auth.
+    $handler->interp->set_escape( h => \&RT::Interface::Web::EscapeUTF8 );
 
-    use HTML::Mason::Interp;
-    my $interp = new HTML::Mason::Interp(%params);
 
-}
+    return ($handler);
 
+}
 # }}}
 
-# {{{ sub NewApacheHandler 
 
-=head2 NewApacheHandler
+# {{{ EscapeUTF8
 
-  Takes a Mason::Interp object
-  Returns a new Mason::ApacheHandler object
+=head2 EscapeUTF8 SCALARREF
+
+does a css-busting but minimalist escaping of whatever html you're passing in.
 
 =cut
 
-sub NewApacheHandler {
-    my $interp = shift;
-    my $ah = new HTML::Mason::ApacheHandler( interp => $interp );
-    return ($ah);
+sub EscapeUTF8  {
+        my  $ref = shift;
+        my $val = $$ref;
+        use bytes;
+        $val =~ s/&/&#38;/g;
+        $val =~ s/</&lt;/g; 
+        $val =~ s/>/&gt;/g;
+        $val =~ s/\(/&#40;/g;
+        $val =~ s/\)/&#41;/g;
+        $val =~ s/"/&#34;/g;
+        $val =~ s/'/&#39;/g;
+        $$ref = $val;
+        Encode::_utf8_on($$ref);
+
 }
 
 # }}}
 
 
-# {{{ sub NewMason11ApacheHandler
+package HTML::Mason::Commands;
+use strict;
+use vars qw/$r $m %session/;
 
-=head2 NewMason11ApacheHandler
 
-  Returns a new Mason::ApacheHandler object
+# {{{ loc
+
+=head2 loc ARRAY
+
+loc is a nice clean global routine which calls $session{'CurrentUser'}->loc()
+with whatever it's called with. If there is no $session{'CurrentUser'}, 
+it creates a temporary user, so we have something to get a localisation handle
+through
 
 =cut
 
-sub NewMason11ApacheHandler {
-        my %args = ( default_escape_flags => 'h',
-                    allow_globals        => [%session],
-        comp_root                    => [
-            [ local    => $RT::MasonLocalComponentRoot ],
-            [ standard => $RT::MasonComponentRoot ]
-        ],
-        data_dir => "$RT::MasonDataDir",
-        args_method => 'CGI'
-    );
-    my $ah = new HTML::Mason::ApacheHandler(%args);
-    return ($ah);
+sub loc {
+
+    if ($session{'CurrentUser'} && 
+        UNIVERSAL::can($session{'CurrentUser'}, 'loc')){
+        return($session{'CurrentUser'}->loc(@_));
+    }
+    else  {
+        my $u = RT::CurrentUser->new($RT::SystemUser);
+        return ($u->loc(@_));
+    }
 }
 
 # }}}
 
 
+# {{{ loc_fuzzy
+
+=head2 loc_fuzzy STRING
 
+loc_fuzzy is for handling localizations of messages that may already
+contain interpolated variables, typically returned from libraries
+outside RT's control.  It takes the message string and extracts the
+variable array automatically by matching against the candidate entries
+inside the lexicon file.
+
+=cut
 
+sub loc_fuzzy {
+    my $msg  = shift;
+    
+    if ($session{'CurrentUser'} && 
+        UNIVERSAL::can($session{'CurrentUser'}, 'loc')){
+        return($session{'CurrentUser'}->loc_fuzzy($msg));
+    }
+    else  {
+        my $u = RT::CurrentUser->new($RT::SystemUser);
+        return ($u->loc_fuzzy($msg));
+    }
+}
 
 # }}}
 
-package HTML::Mason::Commands;
 
 # {{{ sub Abort
 # Error - calls Error and aborts
 sub Abort {
 
-    if ( $session{'ErrorDocument'} && $session{'ErrorDocumentType'} ) {
-        SetContentType( $session{'ErrorDocumentType'} );
-        $m->comp( $session{'ErrorDocument'}, Why => shift );
+    if ($session{'ErrorDocument'} && 
+        $session{'ErrorDocumentType'}) {
+        $r->content_type($session{'ErrorDocumentType'});
+        $m->comp($session{'ErrorDocument'} , Why => shift);
         $m->abort;
-    }
-    else {
-        SetContentType('text/html');
-        $m->comp( "/Elements/Error", Why => shift );
+    } 
+    else  {
+        $m->comp("/Elements/Error" , Why => shift);
         $m->abort;
     }
 }
@@ -135,6 +220,7 @@ sub Abort {
 =head2 CreateTicket ARGS
 
 Create a new ticket, using Mason's %ARGS.  returns @results.
+
 =cut
 
 sub CreateTicket {
@@ -158,38 +244,45 @@ sub CreateTicket {
     my $starts = new RT::Date( $session{'CurrentUser'} );
     $starts->Set( Format => 'unknown', Value => $ARGS{'Starts'} );
 
-    my @Requestors = split ( /,/, $ARGS{'Requestors'} );
-    my @Cc         = split ( /,/, $ARGS{'Cc'} );
-    my @AdminCc    = split ( /,/, $ARGS{'AdminCc'} );
+    my @Requestors = split ( /\s*,\s*/, $ARGS{'Requestors'} );
+    my @Cc         = split ( /\s*,\s*/, $ARGS{'Cc'} );
+    my @AdminCc    = split ( /\s*,\s*/, $ARGS{'AdminCc'} );
 
     my $MIMEObj = MakeMIMEEntity(
         Subject             => $ARGS{'Subject'},
         From                => $ARGS{'From'},
         Cc                  => $ARGS{'Cc'},
         Body                => $ARGS{'Content'},
-        AttachmentFieldName => 'Attach'
     );
 
+    if ($ARGS{'Attachments'}) {
+        $MIMEObj->make_multipart;
+        $MIMEObj->add_part($_) foreach values %{$ARGS{'Attachments'}};
+    }
+
     my %create_args = (
-        Queue           => $ARGS{Queue},
-        Owner           => $ARGS{Owner},
-        InitialPriority => $ARGS{InitialPriority},
-        FinalPriority   => $ARGS{FinalPriority},
-        TimeLeft        => $ARGS{TimeLeft},
-        TimeWorked      => $ARGS{TimeWorked},
+        Queue           => $ARGS{'Queue'},
+        Owner           => $ARGS{'Owner'},
+        InitialPriority => $ARGS{'InitialPriority'},
+        FinalPriority   => $ARGS{'FinalPriority'},
+        TimeLeft        => $ARGS{'TimeLeft'},
+        TimeEstimated        => $ARGS{'TimeEstimated'},
+        TimeWorked      => $ARGS{'TimeWorked'},
         Requestor       => \@Requestors,
         Cc              => \@Cc,
         AdminCc         => \@AdminCc,
-        Subject         => $ARGS{Subject},
-        Status          => $ARGS{Status},
+        Subject         => $ARGS{'Subject'},
+        Status          => $ARGS{'Status'},
         Due             => $due->ISO,
         Starts          => $starts->ISO,
         MIMEObj         => $MIMEObj
     );
-
-    # we need to get any KeywordSelect-<integer> fields into %create_args..
-    grep { $_ =~ /^KeywordSelect-/ &&{ $create_args{$_} = $ARGS{$_} } } %ARGS;
-
+  foreach my $arg (%ARGS) {
+        if ($arg =~ /^CustomField-(\d+)(.*?)$/) {
+            next if ($arg =~ /-Magic$/);
+            $create_args{"CustomField-".$1} = $ARGS{"$arg"};
+        }
+    }
     my ( $id, $Trans, $ErrMsg ) = $Ticket->Create(%create_args);
     unless ( $id && $Trans ) {
         Abort($ErrMsg);
@@ -216,7 +309,7 @@ sub CreateTicket {
         }
     }
 
-    push ( @Actions, $ErrMsg );
+    push ( @Actions, split("\n", $ErrMsg) );
     unless ( $Ticket->CurrentUserHasRight('ShowTicket') ) {
         Abort( "No permission to view newly created ticket #"
             . $Ticket->id . "." );
@@ -283,80 +376,38 @@ sub ProcessUpdateMessage {
         my $Message = MakeMIMEEntity(
             Subject             => $args{ARGSRef}->{'UpdateSubject'},
             Body                => $args{ARGSRef}->{'UpdateContent'},
-            AttachmentFieldName => 'UpdateAttachment'
         );
 
-	## Check whether this was a refresh or not.  
-
-	# Match Correspondence or Comments.
-        my $trans_flag = -2;
-	my $trans_type = undef;
-	my $orig_trans = $args{ARGSRef}->{'UpdateType'};
-        if ( $orig_trans =~ /^(private|public)$/ ) {
-	    $trans_type = "Comment";
-        }elsif ( $orig_trans eq 'response' ) {
-	    $trans_type = "Correspond";
-	}
-
-	# Do we have a transaction that we need to update on? session
-	if( defined( $trans_type ) ){
-	    $trans_flag = 0;
-
-	    # Prepare a checksum.
-	    # See perldoc -f unpack for example of this.
-	    my $this_checksum = unpack("%32C*", $Message->body_as_string ) % 65535;
-
-	    # The above *could* generate duplicate checksums.  Crosscheck with
-	    # the length.
-	    my $this_length = length( $Message->body_as_string );
-
-	    # Don't forget the ticket id.
-	    my $this_id = $args{TicketObj}->id;
-
-	    # Check whether the previous transaction in the
-	    # ticket is the same as the current transaction.
-	    if( defined( $session{'prev_trans_type'} ) && defined( $session{'prev_trans_chksum'} ) && defined( $session{'prev_trans_length'} ) && defined( $session{'prev_trans_tickid'} ) ){
-		if( $session{'prev_trans_type'} eq $orig_trans && $session{'prev_trans_chksum'} == $this_checksum && $session{'prev_trans_length'} == $this_length && $session{'prev_trans_tickid'} == $this_id ){
-		    # Its the same as the previous transaction for this user.
-		    $trans_flag = -1;
-		}
-	    }
-
-	    # Store them for next time.
-	    $session{'prev_trans_type'} = $orig_trans;
-	    $session{'prev_trans_chksum'} = $this_checksum;
-	    $session{'prev_trans_length'} = $this_length;
-	    $session{'prev_trans_tickid'} = $this_id;
-
-	    if( $trans_flag == -1 ){
-                push ( @{ $args{'Actions'} },
-"This appears to be a duplicate of your previous update (please do not refresh this page)" );
-	    }
-
-
-            if ( $trans_type eq 'Comment' && $trans_flag >= 0 ) {
-                my ( $Transaction, $Description ) = $args{TicketObj}->Comment(
-                    CcMessageTo  => $args{ARGSRef}->{'UpdateCc'},
-                    BccMessageTo => $args{ARGSRef}->{'UpdateBcc'},
-                    MIMEObj      => $Message,
-                    TimeTaken    => $args{ARGSRef}->{'UpdateTimeWorked'}
-                );
-                push ( @{ $args{Actions} }, $Description );
-            }
-            elsif ( $trans_type eq 'Correspond' && $trans_flag >= 0 ) {
-                my ( $Transaction, $Description ) = $args{TicketObj}->Correspond(
-                    CcMessageTo  => $args{ARGSRef}->{'UpdateCc'},
-                    BccMessageTo => $args{ARGSRef}->{'UpdateBcc'},
-                    MIMEObj      => $Message,
-                    TimeTaken    => $args{ARGSRef}->{'UpdateTimeWorked'}
-                );
-                push ( @{ $args{Actions} }, $Description );
-            }
-	}
+        if ($args{ARGSRef}->{'UpdateAttachments'}) {
+            $Message->make_multipart;
+            $Message->add_part($_) foreach values %{$args{ARGSRef}->{'UpdateAttachments'}};
+        }
+
+        ## TODO: Implement public comments
+        if ( $args{ARGSRef}->{'UpdateType'} =~ /^(private|public)$/ ) {
+            my ( $Transaction, $Description ) = $args{TicketObj}->Comment(
+                CcMessageTo  => $args{ARGSRef}->{'UpdateCc'},
+                BccMessageTo => $args{ARGSRef}->{'UpdateBcc'},
+                MIMEObj      => $Message,
+                TimeTaken    => $args{ARGSRef}->{'UpdateTimeWorked'}
+            );
+            push ( @{ $args{Actions} }, $Description );
+        }
+        elsif ( $args{ARGSRef}->{'UpdateType'} eq 'response' ) {
+            my ( $Transaction, $Description ) = $args{TicketObj}->Correspond(
+                CcMessageTo  => $args{ARGSRef}->{'UpdateCc'},
+                BccMessageTo => $args{ARGSRef}->{'UpdateBcc'},
+                MIMEObj      => $Message,
+                TimeTaken    => $args{ARGSRef}->{'UpdateTimeWorked'}
+            );
+            push ( @{ $args{Actions} }, $Description );
+        }
         else {
             push ( @{ $args{'Actions'} },
-    "Update type was neither correspondence nor comment. Update not recorded"
-                );
+                loc("Update type was neither correspondence nor comment.").
+                " ".
+                loc("Update not recorded.")
+            );
         }
     }
 }
@@ -382,61 +433,66 @@ sub MakeMIMEEntity {
         Cc                  => undef,
         Body                => undef,
         AttachmentFieldName => undef,
-        @_
+        map Encode::encode_utf8($_), @_,
     );
 
     #Make the update content have no 'weird' newlines in it
 
     $args{'Body'} =~ s/\r\n/\n/gs;
-    my $Message = MIME::Entity->build(
-        Subject => $args{'Subject'} || "",
-        From    => $args{'From'},
-        Cc      => $args{'Cc'},
-        Data    => [ $args{'Body'} ]
-    );
+    my $Message;
+    {
+        # MIME::Head is not happy in utf-8 domain.  This only happens
+        # when processing an incoming email (so far observed).
+        no utf8;
+        use bytes;
+        $Message = MIME::Entity->build(
+            Subject => $args{'Subject'} || "",
+            From    => $args{'From'},
+            Cc      => $args{'Cc'},
+            Data    => [ $args{'Body'} ]
+        );
+    }
 
-    my $cgi_object = CGIObject();
-    if ( $cgi_object->param( $args{'AttachmentFieldName'} ) ) {
+    my $cgi_object = $m->cgi_object;
 
-        my $cgi_filehandle =
-          $cgi_object->upload( $args{'AttachmentFieldName'} );
+    if (my $filehandle = $cgi_object->upload( $args{'AttachmentFieldName'} ) ) {
 
-        use File::Temp qw(tempfile tempdir);
 
-        #foreach my $filehandle (@filenames) {
 
-        # my ( $fh, $temp_file ) = tempfile();
+    use File::Temp qw(tempfile tempdir);
 
-        #$binmode $fh;    #thank you, windows
+    #foreach my $filehandle (@filenames) {
 
-        # We're having trouble with tempfiles not getting created. Let's try it with 
-        # a scalar instead
+    my ( $fh, $temp_file ) = tempfile();
 
-        my ( $buffer, @file );
+    binmode $fh;    #thank you, windows
+    my ($buffer);
+    while ( my $bytesread = read( $filehandle, $buffer, 4096 ) ) {
+        print $fh $buffer;
+    }
 
-        while ( my $bytesread = read( $cgi_filehandle, $buffer, 4096 ) ) {
-            push ( @file, $buffer );
-        }
+    my $uploadinfo = $cgi_object->uploadInfo($filehandle);
 
-        $RT::Logger->debug($file);
-        my $filename = "$cgi_filehandle";
-        $filename =~ s#^(.*)/##;
-        $filename =~ s#^(.*)\\##;
-        my $uploadinfo = $cgi_object->uploadInfo($cgi_filehandle);
-        $Message->attach(
-            Data => \@file,
-
-            #Path     => $temp_file,
-            Filename => $filename,
-            Type     => $uploadinfo->{'Content-Type'}
-        );
+    # Prefer the cached name first over CGI.pm stringification.
+    my $filename = $RT::Mason::CGI::Filename;
+    $filename = "$filehandle" unless defined($filename);
+                   
+    $filename =~ s#^.*[\\/]##;
+
+    $Message->attach(
+        Path     => $temp_file,
+        Filename => $filename,
+        Type     => $uploadinfo->{'Content-Type'},
+    );
+    close($fh);
 
-        #close($fh);
-        #unlink($temp_file);
+    #   }
 
-        #	}
     }
+
     $Message->make_singlepart();
+    RT::I18N::SetMIMEEntityToUTF8($Message); # convert text parts into utf-8
+
     return ($Message);
 
 }
@@ -485,6 +541,9 @@ sub ProcessSearchQuery {
     elsif ( $args{ARGS}->{'GotoPage'} eq 'Prev' ) {
         $session{'tickets'}->PrevPage;
     }
+    elsif ( $args{ARGS}->{'GotoPage'} > 0 ) {
+        $session{'tickets'}->GotoPage( $args{ARGS}->{GotoPage} - 1 );
+    }
 
     # }}}
 
@@ -576,8 +635,12 @@ sub ProcessSearchQuery {
     # }}}
     # {{{ Limit Subject
     if ( $args{ARGS}->{'ValueOfSubject'} ne '' ) {
+            my $val = $args{ARGS}->{'ValueOfSubject'};
+        if ($args{ARGS}->{'SubjectOp'} =~ /like/) {
+            $val = "%".$val."%";
+        }
         $session{'tickets'}->LimitSubject(
-            VALUE    => $args{ARGS}->{'ValueOfSubject'},
+            VALUE    => $val,
             OPERATOR => $args{ARGS}->{'SubjectOp'},
         );
     }
@@ -585,40 +648,59 @@ sub ProcessSearchQuery {
     # }}}    
     # {{{ Limit Dates
     if ( $args{ARGS}->{'ValueOfDate'} ne '' ) {
-
         my $date = ParseDateToISO( $args{ARGS}->{'ValueOfDate'} );
         $args{ARGS}->{'DateType'} =~ s/_Date$//;
 
-        $session{'tickets'}->LimitDate(
-            FIELD    => $args{ARGS}->{'DateType'},
-            VALUE    => $date,
-            OPERATOR => $args{ARGS}->{'DateOp'},
-        );
+        if ( $args{ARGS}->{'DateType'} eq 'Updated' ) {
+            $session{'tickets'}->LimitTransactionDate(
+                                            VALUE    => $date,
+                                            OPERATOR => $args{ARGS}->{'DateOp'},
+            );
+        }
+        else {
+            $session{'tickets'}->LimitDate( FIELD => $args{ARGS}->{'DateType'},
+                                            VALUE => $date,
+                                            OPERATOR => $args{ARGS}->{'DateOp'},
+            );
+        }
     }
 
     # }}}    
     # {{{ Limit Content
-    if ( $args{ARGS}->{'ValueOfContent'} ne '' ) {
-        $session{'tickets'}->LimitContent(
-            VALUE    => $args{ARGS}->{'ValueOfContent'},
-            OPERATOR => $args{ARGS}->{'ContentOp'},
+    if ( $args{ARGS}->{'ValueOfAttachmentField'} ne '' ) {
+        my $val = $args{ARGS}->{'ValueOfAttachmentField'};
+        if ($args{ARGS}->{'AttachmentFieldOp'} =~ /like/) {
+            $val = "%".$val."%";
+        }
+        $session{'tickets'}->Limit(
+            FIELD   => $args{ARGS}->{'AttachmentField'},
+            VALUE    => $val,
+            OPERATOR => $args{ARGS}->{'AttachmentFieldOp'},
         );
     }
 
     # }}}   
-    # {{{ Limit KeywordSelects
 
-    foreach my $KeywordSelectId (
-        map { /^KeywordSelect(\d+)$/; $1 }
-        grep { /^KeywordSelect(\d+)$/; } keys %{ $args{ARGS} }
-      )
-    {
-        my $form = $args{ARGS}->{"KeywordSelect$KeywordSelectId"};
-        my $oper = $args{ARGS}->{"KeywordSelectOp$KeywordSelectId"};
-        foreach my $KeywordId ( ref($form) ? @{$form} : ($form) ) {
-            next unless ($KeywordId);
+ # {{{ Limit CustomFields
+
+    foreach my $arg ( keys %{ $args{ARGS} } ) {
+        my $id;
+        if ( $arg =~ /^CustomField(\d+)$/ ) {
+            $id = $1;
+        }
+        else {
+            next;
+        }
+        next unless ( $args{ARGS}->{$arg} );
+
+        my $form = $args{ARGS}->{$arg};
+        my $oper = $args{ARGS}->{ "CustomFieldOp" . $id };
+        foreach my $value ( ref($form) ? @{$form} : ($form) ) {
             my $quote = 1;
-            if ( $KeywordId =~ /^null$/i ) {
+            if ($oper =~ /like/i) {
+                $value = "%".$value."%";
+            }
+            if ( $value =~ /^null$/i ) {
 
                 #Don't quote the string 'null'
                 $quote = 0;
@@ -627,17 +709,16 @@ sub ProcessSearchQuery {
                 $oper = 'IS'     if ( $oper eq '=' );
                 $oper = 'IS NOT' if ( $oper eq '!=' );
             }
-            $session{'tickets'}->LimitKeyword(
-                KEYWORDSELECT => $KeywordSelectId,
-                OPERATOR      => $oper,
-                QUOTEVALUE    => $quote,
-                KEYWORD       => $KeywordId
-            );
+            $session{'tickets'}->LimitCustomField( CUSTOMFIELD => $id,
+                                                   OPERATOR    => $oper,
+                                                   QUOTEVALUE  => $quote,
+                                                   VALUE       => $value );
         }
     }
 
     # }}}
 
+
 }
 
 # }}}
@@ -654,7 +735,7 @@ Returns an ISO date and time in GMT
 sub ParseDateToISO {
     my $date = shift;
 
-    my $date_obj = new RT::Date($CurrentUser);
+    my $date_obj = RT::Date->new($session{'CurrentUser'});
     $date_obj->Set(
         Format => 'unknown',
         Value  => $date
@@ -680,172 +761,82 @@ sub Config {
 # {{{ sub ProcessACLChanges
 
 sub ProcessACLChanges {
-    my $ACLref  = shift;
     my $ARGSref = shift;
 
-    my @CheckACL = @$ACLref;
     my %ARGS     = %$ARGSref;
 
     my ( $ACL, @results );
 
-    # {{{ Add rights
-    foreach $ACL (@CheckACL) {
-        my ($Principal);
 
-        next unless ($ACL);
+    foreach my $arg (keys %ARGS) {
+        if ($arg =~ /GrantRight-(\d+)-(.*?)-(\d+)$/) {
+            my $principal_id = $1;
+            my $object_type = $2;
+            my $object_id = $3;
+            my $rights = $ARGS{$arg};
 
-        # Parse out what we're really talking about. 
-        if ( $ACL =~ /^(.*?)-(\d+)-(.*?)-(\d+)/ ) {
-            my $PrincipalType = $1;
-            my $PrincipalId   = $2;
-            my $Scope         = $3;
-            my $AppliesTo     = $4;
+            my $principal = RT::Principal->new($session{'CurrentUser'});
+            $principal->Load($principal_id);
 
-            # {{{ Create an object called Principal
-            # so we can do rights operations
+            my $obj;
 
-            if ( $PrincipalType eq 'User' ) {
-                $Principal = new RT::User( $session{'CurrentUser'} );
-            }
-            elsif ( $PrincipalType eq 'Group' ) {
-                $Principal = new RT::Group( $session{'CurrentUser'} );
-            }
-            else {
-                Abort("$PrincipalType unknown principal type");
-            }
+            if ($object_type eq 'RT::Queue') {
+                $obj = RT::Queue->new($session{'CurrentUser'});
+                $obj->Load($object_id);      
+            } elsif ($object_type eq 'RT::Group') {
+                $obj = RT::Group->new($session{'CurrentUser'});
+                $obj->Load($object_id);      
 
-            $Principal->Load($PrincipalId)
-              || Abort("$PrincipalType $PrincipalId couldn't be loaded");
-
-            # }}}
-
-            # {{{ load up an RT::ACL object with the same current vals of this ACL
-
-            my $CurrentACL = new RT::ACL( $session{'CurrentUser'} );
-            if ( $Scope eq 'Queue' ) {
-                $CurrentACL->LimitToQueue($AppliesTo);
+            } elsif ($object_type eq 'RT::System') {
+                $obj = $RT::System;
+            } else {
+                push (@results, loc("System Error").
+                                loc("Rights could not be granted for [_1]", $object_type));
+                next;
             }
-            elsif ( $Scope eq 'System' ) {
-                $CurrentACL->LimitToSystem();
-            }
-
-            $CurrentACL->LimitPrincipalToType($PrincipalType);
-            $CurrentACL->LimitPrincipalToId($PrincipalId);
-
-            # }}}
-
-            # {{{ Get the values of the select we're working with 
-            # into an array. it will contain all the new rights that have 
-            # been granted
-            #Hack to turn the ACL returned into an array
-            my @rights =
-              ref( $ARGS{"GrantACE-$ACL"} ) eq 'ARRAY'
-              ? @{ $ARGS{"GrantACE-$ACL"} }
-              : ( $ARGS{"GrantACE-$ACL"} );
-
-            # }}}
-
-            # {{{ Add any rights we need.
 
+            my @rights = ref($ARGS{$arg}) eq 'ARRAY' ? @{$ARGS{$arg}} : ($ARGS{$arg});
             foreach my $right (@rights) {
                 next unless ($right);
-
-                #if the right that's been selected wasn't there before, add it.
-                unless (
-                    $CurrentACL->HasEntry(
-                        RightScope     => "$Scope",
-                        RightName      => "$right",
-                        RightAppliesTo => "$AppliesTo",
-                        PrincipalType  => $PrincipalType,
-                        PrincipalId    => $Principal->Id
-                    )
-                  )
-                {
-
-                    #Add new entry to list of rights.
-                    if ( $Scope eq 'Queue' ) {
-                        my $Queue = new RT::Queue( $session{'CurrentUser'} );
-                        $Queue->Load($AppliesTo);
-                        unless ( $Queue->id ) {
-                            Abort("Couldn't find a queue called $AppliesTo");
-                        }
-
-                        my ( $val, $msg ) = $Principal->GrantQueueRight(
-                            RightAppliesTo => $Queue->id,
-                            RightName      => "$right"
-                        );
-
-                        if ($val) {
-                            push ( @results,
-                                "Granted right $right to "
-                                  . $Principal->Name
-                                  . " for queue "
-                                  . $Queue->Name );
-                        }
-                        else {
-                            push ( @results, $msg );
-                        }
-                    }
-                    elsif ( $Scope eq 'System' ) {
-                        my ( $val, $msg ) = $Principal->GrantSystemRight(
-                            RightAppliesTo => $AppliesTo,
-                            RightName      => "$right"
-                        );
-                        if ($val) {
-                            push ( @results, "Granted system right '$right' to "
-                                  . $Principal->Name );
-                        }
-                        else {
-                            push ( @results, $msg );
-                        }
-                    }
-                }
+                my ($val, $msg) = $principal->GrantRight(Object => $obj, Right => $right);
+                push (@results, $msg);
             }
-
-            # }}}
         }
-    }
-
-    # }}} Add rights
-
-    # {{{ remove any rights that have been deleted
-
-    my @RevokeACE =
-      ref( $ARGS{"RevokeACE"} ) eq 'ARRAY' 
-      ? @{ $ARGS{"RevokeACE"} }
-      : ( $ARGS{"RevokeACE"} );
-
-    foreach my $aceid (@RevokeACE) {
-
-        my $right = new RT::ACE( $session{'CurrentUser'} );
-        $right->Load($aceid);
-        next unless ( $right->id );
+       elsif ($arg =~ /RevokeRight-(\d+)-(.*?)-(\d+)-(.*?)$/) {
+            my $principal_id = $1;
+            my $object_type = $2;
+            my $object_id = $3;
+            my $right = $4;
+
+            my $principal = RT::Principal->new($session{'CurrentUser'});
+            $principal->Load($principal_id);
+            next unless ($right);
+            my $obj;
+
+            if ($object_type eq 'RT::Queue') {
+                $obj = RT::Queue->new($session{'CurrentUser'});
+                $obj->Load($object_id);      
+            } elsif ($object_type eq 'RT::Group') {
+                $obj = RT::Group->new($session{'CurrentUser'});
+                $obj->Load($object_id);      
+
+            } elsif ($object_type eq 'RT::System') {
+                $obj = $RT::System;
+            } else {
+                push (@results, loc("System Error").
+                                loc("Rights could not be revoked for [_1]", $object_type));
+                next;
+            }
+            my ($val, $msg) = $principal->RevokeRight(Object => $obj, Right => $right);
+            push (@results, $msg);
+        }
 
-        my $phrase = "Revoked "
-          . $right->PrincipalType . " "
-          . $right->PrincipalObj->Name
-          . "'s right to "
-          . $right->RightName;
 
-        if ( $right->RightScope eq 'System' ) {
-            $phrase .= ' across all queues.';
-        }
-        else {
-            $phrase .= ' for the queue ' . $right->AppliesToObj->Name . '.';
-        }
-        my ( $val, $msg ) = $right->Delete();
-        if ($val) {
-            push ( @results, $phrase );
-        }
-        else {
-            push ( @results, $msg );
-        }
     }
 
-    # }}}
-
     return (@results);
-}
+
+    }
 
 # }}}
 
@@ -864,6 +855,7 @@ sub UpdateRecordObject {
         ARGSRef       => undef,
         AttributesRef => undef,
         Object        => undef,
+        AttributePrefix => undef,
         @_
     );
 
@@ -872,17 +864,94 @@ sub UpdateRecordObject {
     my $object     = $args{'Object'};
     my $attributes = $args{'AttributesRef'};
     my $ARGSRef    = $args{'ARGSRef'};
+    foreach my $attribute (@$attributes) {
+        my $value;
+        if ( defined $ARGSRef->{$attribute} ) {
+            $value = $ARGSRef->{$attribute};
+        }
+        elsif (
+              defined( $args{'AttributePrefix'} )
+              && defined(
+                  $ARGSRef->{ $args{'AttributePrefix'} . "-" . $attribute }
+              )
+          ) {
+            $value = $ARGSRef->{ $args{'AttributePrefix'} . "-" . $attribute };
+
+        } else {
+                next;
+        }
 
-    foreach $attribute (@$attributes) {
-        if ( ( defined $ARGSRef->{"$attribute"} )
-            and ( $ARGSRef->{"$attribute"} ne $object->$attribute() ) )
-        {
-            $ARGSRef->{"$attribute"} =~ s/\r\n/\n/gs;
+            $value =~ s/\r\n/\n/gs;
+
+        if ($value ne $object->$attribute()){
+
+              my $method = "Set$attribute";
+              my ( $code, $msg ) = $object->$method($value);
+
+              push @results, loc($attribute) . ': ' . loc_fuzzy($msg);
+=for loc
+                                   "[_1] could not be set to [_2].",       # loc
+                                   "That is already the current value",    # loc
+                                   "No value sent to _Set!\n",             # loc
+                                   "Illegal value for [_1]",               # loc
+                                   "The new value has been set.",          # loc
+                                   "No column specified",                  # loc
+                                   "Immutable field",                      # loc
+                                   "Nonexistant field?",                   # loc
+                                   "Invalid data",                         # loc
+                                   "Couldn't find row",                    # loc
+                                   "Missing a primary key?: [_1]",         # loc
+                                   "Found Object",                         # loc
+=cut
+          };
+    }
+    return (@results);
+}
 
-            my $method = "Set$attribute";
-            my ( $code, $msg ) = $object->$method( $ARGSRef->{"$attribute"} );
-            push @results, "$attribute: $msg";
-        }
+# }}}
+
+# {{{ Sub ProcessCustomFieldUpdates
+
+sub ProcessCustomFieldUpdates {
+    my %args = (
+        CustomFieldObj => undef,
+        ARGSRef        => undef,
+        @_
+    );
+
+    my $Object  = $args{'CustomFieldObj'};
+    my $ARGSRef = $args{'ARGSRef'};
+
+    my @attribs = qw( Name Type Description Queue SortOrder);
+    my @results = UpdateRecordObject(
+        AttributesRef => \@attribs,
+        Object        => $Object,
+        ARGSRef       => $ARGSRef
+    );
+
+    if ( $ARGSRef->{ "CustomField-" . $Object->Id . "-AddValue-Name" } ) {
+
+        my ( $addval, $addmsg ) = $Object->AddValue(
+            Name =>
+              $ARGSRef->{ "CustomField-" . $Object->Id . "-AddValue-Name" },
+            Description => $ARGSRef->{ "CustomField-"
+                  . $Object->Id
+                  . "-AddValue-Description" },
+            SortOrder => $ARGSRef->{ "CustomField-"
+                  . $Object->Id
+                  . "-AddValue-SortOrder" },
+        );
+        push ( @results, $addmsg );
+    }
+    my @delete_values = (
+        ref $ARGSRef->{ 'CustomField-' . $Object->Id . '-DeleteValue' } eq
+          'ARRAY' )
+      ? @{ $ARGSRef->{ 'CustomField-' . $Object->Id . '-DeleteValue' } }
+      : ( $ARGSRef->{ 'CustomField-' . $Object->Id . '-DeleteValue' } );
+    foreach my $id (@delete_values) {
+        next unless defined $id;
+        my ( $err, $msg ) = $Object->DeleteValue($id);
+        push ( @results, $msg );
     }
     return (@results);
 }
@@ -913,6 +982,7 @@ sub ProcessTicketBasics {
       Subject
       FinalPriority
       Priority
+      TimeEstimated
       TimeWorked
       TimeLeft
       Status
@@ -934,7 +1004,7 @@ sub ProcessTicketBasics {
     );
 
     # We special case owner changing, so we can use ForceOwnerChange
-    if ( $ARGSRef->{'Owner'} && ( $TicketObj->Owner ne $ARGSRef->{'Owner'} ) ) {
+    if ( $ARGSRef->{'Owner'} && ( $TicketObj->Owner != $ARGSRef->{'Owner'} ) ) {
         my ($ChownType);
         if ( $ARGSRef->{'ForceOwnerChange'} ) {
             $ChownType = "Force";
@@ -945,7 +1015,7 @@ sub ProcessTicketBasics {
 
         my ( $val, $msg ) =
           $TicketObj->SetOwner( $ARGSRef->{'Owner'}, $ChownType );
-        push ( @results, "$msg" );
+        push ( @results, $msg );
     }
 
     # }}}
@@ -955,6 +1025,142 @@ sub ProcessTicketBasics {
 
 # }}}
 
+# {{{ Sub ProcessTicketCustomFieldUpdates
+
+sub ProcessTicketCustomFieldUpdates {
+    my %args = (
+        ARGSRef => undef,
+        @_
+    );
+
+    my @results;
+
+    my $ARGSRef = $args{'ARGSRef'};
+
+    # Build up a list of tickets that we want to work with
+    my %tickets_to_mod;
+    my %custom_fields_to_mod;
+    foreach my $arg ( keys %{$ARGSRef} ) {
+        if ( $arg =~ /^Ticket-(\d+)-CustomField-(\d+)-/ ) {
+
+            # For each of those tickets, find out what custom fields we want to work with.
+            $custom_fields_to_mod{$1}{$2} = 1;
+        }
+    }
+
+    # For each of those tickets
+    foreach my $tick ( keys %custom_fields_to_mod ) {
+        my $Ticket = RT::Ticket->new( $session{'CurrentUser'} );
+        $Ticket->Load($tick);
+
+        # For each custom field  
+        foreach my $cf ( keys %{ $custom_fields_to_mod{$tick} } ) {
+
+	    my $CustomFieldObj = RT::CustomField->new($session{'CurrentUser'});
+	    $CustomFieldObj->LoadById($cf);
+
+            foreach my $arg ( keys %{$ARGSRef} ) {
+                # since http won't pass in a form element with a null value, we need
+                # to fake it
+                if ($arg =~ /^(.*?)-Values-Magic$/ ) {
+                    # We don't care about the magic, if there's really a values element;
+                    next if (exists $ARGSRef->{$1.'-Values'}) ;
+
+                    $arg = $1."-Values";
+                    $ARGSRef->{$1."-Values"} = undef;
+                
+                }
+                next unless ( $arg =~ /^Ticket-$tick-CustomField-$cf-/ );
+                my @values =
+                  ( ref( $ARGSRef->{$arg} ) eq 'ARRAY' ) 
+                  ? @{ $ARGSRef->{$arg} }
+                  : ( $ARGSRef->{$arg} );
+                if ( ( $arg =~ /-AddValue$/ ) || ( $arg =~ /-Value$/ ) ) {
+                    foreach my $value (@values) {
+                        next unless ($value);
+                        my ( $val, $msg ) = $Ticket->AddCustomFieldValue(
+                            Field => $cf,
+                            Value => $value
+                        );
+                        push ( @results, $msg );
+                    }
+                }
+                elsif ( $arg =~ /-DeleteValues$/ ) {
+                    foreach my $value (@values) {
+                        next unless ($value);
+                        my ( $val, $msg ) = $Ticket->DeleteCustomFieldValue(
+                            Field => $cf,
+                            Value => $value
+                        );
+                        push ( @results, $msg );
+                    }
+                }
+                elsif ( $arg =~ /-Values$/ and $CustomFieldObj->Type !~ /Entry/) {
+                    my $cf_values = $Ticket->CustomFieldValues($cf);
+
+                    my %values_hash;
+                    foreach my $value (@values) {
+                        next unless ($value);
+
+                        # build up a hash of values that the new set has
+                        $values_hash{$value} = 1;
+
+                        unless ( $cf_values->HasEntry($value) ) {
+                            my ( $val, $msg ) = $Ticket->AddCustomFieldValue(
+                                Field => $cf,
+                                Value => $value
+                            );
+                            push ( @results, $msg );
+                        }
+
+                    }
+                    while ( my $cf_value = $cf_values->Next ) {
+                        unless ( $values_hash{ $cf_value->Content } == 1 ) {
+                            my ( $val, $msg ) = $Ticket->DeleteCustomFieldValue(
+                                Field => $cf,
+                                Value => $cf_value->Content
+                            );
+                            push ( @results, $msg);
+
+                        }
+
+                    }
+                }
+                elsif ( $arg =~ /-Values$/ ) {
+                    my $cf_values = $Ticket->CustomFieldValues($cf);
+
+		    # keep everything up to the point of difference, delete the rest
+		    my $delete_flag;
+		    foreach my $old_cf (@{$cf_values->ItemsArrayRef}) {
+			if (!$delete_flag and @values and $old_cf->Content eq $values[0]) {
+			    shift @values;
+			    next;
+			}
+
+			$delete_flag ||= 1;
+			$old_cf->Delete;
+		    }
+
+		    # now add/replace extra things, if any
+		    foreach my $value (@values) {
+			my ( $val, $msg ) = $Ticket->AddCustomFieldValue(
+			    Field => $cf,
+			    Value => $value
+			);
+			push ( @results, $msg );
+		    }
+		}
+                else {
+                    push ( @results, "User asked for an unknown update type for custom field " . $cf->Name . " for ticket " . $Ticket->id );
+                }
+            }
+        }
+        return (@results);
+    }
+}
+
+# }}}
+
 # {{{ sub ProcessTicketWatchers
 
 =head2 ProcessTicketWatchers ( TicketObj => $Ticket, ARGSRef => \%ARGS );
@@ -978,18 +1184,22 @@ sub ProcessTicketWatchers {
 
     foreach my $key ( keys %$ARGSRef ) {
 
-        # Delete deletable watchers
-        if ( ( $key =~ /^DelWatcher(\d*)$/ ) and ( $ARGSRef->{$key} ) ) {
-            my ( $code, $msg ) = $Ticket->DeleteWatcher($1);
+        # {{{ Delete deletable watchers
+        if ( ( $key =~ /^Ticket-DelWatcher-Type-(.*)-Principal-(\d+)$/ )  ) {
+            my ( $code, $msg ) = 
+                $Ticket->DeleteWatcher(PrincipalId => $2,
+                                       Type => $1);
             push @results, $msg;
         }
 
         # Delete watchers in the simple style demanded by the bulk manipulator
         elsif ( $key =~ /^Delete(Requestor|Cc|AdminCc)$/ ) {
-            my ( $code, $msg ) = $Ticket->DeleteWatcher( $ARGSRef->{$key}, $1 );
+            my ( $code, $msg ) = $Ticket->DeleteWatcher( Type => $ARGSRef->{$key}, PrincipalId => $1 );
             push @results, $msg;
         }
 
+        # }}}
+
         # Add new wathchers by email address      
         elsif ( ( $ARGSRef->{$key} =~ /^(AdminCc|Cc|Requestor)$/ )
             and ( $key =~ /^WatcherTypeEmail(\d*)$/ ) )
@@ -1014,12 +1224,11 @@ sub ProcessTicketWatchers {
 
         # Add new  watchers by owner
         elsif ( ( $ARGSRef->{$key} =~ /^(AdminCc|Cc|Requestor)$/ )
-            and ( $key =~ /^WatcherTypeUser(\d*)$/ ) )
-        {
+            and ( $key =~ /^Ticket-AddWatcher-Principal-(\d*)$/ ) ) {
 
             #They're in this order because otherwise $1 gets clobbered :/
             my ( $code, $msg ) =
-              $Ticket->AddWatcher( Type => $ARGSRef->{$key}, Owner => $1 );
+              $Ticket->AddWatcher( Type => $ARGSRef->{$key}, PrincipalId => $1 );
             push @results, $msg;
         }
     }
@@ -1061,7 +1270,7 @@ sub ProcessTicketDates {
     );
 
     #Run through each field in this list. update the value if apropriate
-    foreach $field (@date_fields) {
+    foreach my $field (@date_fields) {
         my ( $code, $msg );
 
         my $DateObj = RT::Date->new( $session{'CurrentUser'} );
@@ -1098,11 +1307,9 @@ Returns an array of results messages.
 =cut
 
 sub ProcessTicketLinks {
-    my %args = (
-        TicketObj => undef,
-        ARGSRef   => undef,
-        @_
-    );
+    my %args = ( TicketObj => undef,
+                 ARGSRef   => undef,
+                 @_ );
 
     my $Ticket  = $args{'TicketObj'};
     my $ARGSRef = $args{'ARGSRef'};
@@ -1118,11 +1325,9 @@ sub ProcessTicketLinks {
 
             push @results,
               "Trying to delete: Base: $base Target: $target  Type $type";
-            my ( $val, $msg ) = $Ticket->DeleteLink(
-                Base   => $base,
-                Type   => $type,
-                Target => $target
-            );
+            my ( $val, $msg ) = $Ticket->DeleteLink( Base   => $base,
+                                                     Type   => $type,
+                                                     Target => $target );
 
             push @results, $msg;
 
@@ -1133,26 +1338,23 @@ sub ProcessTicketLinks {
     my @linktypes = qw( DependsOn MemberOf RefersTo );
 
     foreach my $linktype (@linktypes) {
-
-        for my $luri ( split ( / /, $ARGSRef->{ $Ticket->Id . "-$linktype" } ) )
-        {
-            $luri =~ s/\s*$//;    # Strip trailing whitespace
-            my ( $val, $msg ) = $Ticket->AddLink(
-                Target => $luri,
-                Type   => $linktype
-            );
-            push @results, $msg;
+        if ( $ARGSRef->{ $Ticket->Id . "-$linktype" } ) {
+            for my $luri ( split ( / /, $ARGSRef->{ $Ticket->Id . "-$linktype" } ) ) {
+                $luri =~ s/\s*$//;    # Strip trailing whitespace
+                my ( $val, $msg ) = $Ticket->AddLink( Target => $luri,
+                                                      Type   => $linktype );
+                push @results, $msg;
+            }
         }
+        if ( $ARGSRef->{ "$linktype-" . $Ticket->Id } ) {
 
-        for my $luri ( split ( / /, $ARGSRef->{ "$linktype-" . $Ticket->Id } ) )
-        {
-            my ( $val, $msg ) = $Ticket->AddLink(
-                Base => $luri,
-                Type => $linktype
-            );
+            for my $luri ( split ( / /, $ARGSRef->{ "$linktype-" . $Ticket->Id } ) ) {
+                my ( $val, $msg ) = $Ticket->AddLink( Base => $luri,
+                                                      Type => $linktype );
 
-            push @results, $msg;
-        }
+                push @results, $msg;
+            }
+        } 
     }
 
     #Merge if we need to
@@ -1167,121 +1369,9 @@ sub ProcessTicketLinks {
 
 # }}}
 
-# {{{ sub ProcessTicketObjectKeywords
-
-=head2 ProcessTicketObjectKeywords ( TicketObj => $Ticket, ARGSRef => \%ARGS );
-
-Returns an array of results messages.
-
-=cut
-
-sub ProcessTicketObjectKeywords {
-    my %args = (
-        TicketObj => undef,
-        ARGSRef   => undef,
-        @_
-    );
-
-    my $TicketObj = $args{'TicketObj'};
-    my $ARGSRef   = $args{'ARGSRef'};
-
-    my (@results);
-
-    # {{{ set ObjectKeywords.
-
-    my $KeywordSelects = $TicketObj->QueueObj->KeywordSelects;
-
-    # iterate through all the keyword selects for this queue
-    while ( my $KeywordSelect = $KeywordSelects->Next ) {
-
-        # {{{ do some setup
-
-        # if we have KeywordSelectMagic for this keywordselect:
-        next
-          unless
-          defined $ARGSRef->{ 'KeywordSelectMagic' . $KeywordSelect->id };
-
-        # Lets get a hash of the possible values to work with
-        my $value = $ARGSRef->{ 'KeywordSelect' . $KeywordSelect->id } || [];
-
-        #lets get all those values in a hash. regardless of # of entries
-        #we'll use this for adding and deleting keywords from this object.
-        my %values = map { $_ => 1 } ref($value) ? @{$value} : ($value);
-
-        # Load up the ObjectKeywords for this KeywordSelect for this ticket
-        my $ObjectKeys = $TicketObj->KeywordsObj( $KeywordSelect->id );
-
-        # }}}
-        # {{{ add new keywords
-
-        foreach my $key ( keys %values ) {
-
-            #unless the ticket has that keyword for that keyword select,
-            unless ( $ObjectKeys->HasEntry($key) ) {
-
-                #Add the keyword
-                my ( $result, $msg ) = $TicketObj->AddKeyword(
-                    Keyword       => $key,
-                    KeywordSelect => $KeywordSelect->id
-                );
-                push ( @results, $msg );
-            }
-        }
-
-        # }}}
-        # {{{ Delete unused keywords
-
-        #redo this search, so we don't ask it to delete things that are already gone
-        # such as when a single keyword select gets its value changed.
-        $ObjectKeys = $TicketObj->KeywordsObj( $KeywordSelect->id );
-
-        while ( my $TicketKey = $ObjectKeys->Next ) {
-
-            # if the hash defined above doesn\'t contain the keyword mentioned,
-            unless ( $values{ $TicketKey->Keyword } ) {
-
-                #I'd really love to just call $keyword->Delete, but then 
-                # we wouldn't get a transaction recorded
-                my ( $result, $msg ) = $TicketObj->DeleteKeyword(
-                    Keyword       => $TicketKey->Keyword,
-                    KeywordSelect => $KeywordSelect->id
-                );
-                push ( @results, $msg );
-            }
-        }
-
-        # }}}
-    }
-
-    #Iterate through the keyword selects for BulkManipulator style access
-    while ( my $KeywordSelect = $KeywordSelects->Next ) {
-        if ( $ARGSRef->{ "AddToKeywordSelect" . $KeywordSelect->Id } ) {
-
-            #Add the keyword
-            my ( $result, $msg ) = $TicketObj->AddKeyword(
-                Keyword =>
-                $ARGSRef->{ "AddToKeywordSelect" . $KeywordSelect->Id },
-                KeywordSelect => $KeywordSelect->id
-            );
-            push ( @results, $msg );
-        }
-        if ( $ARGSRef->{ "DeleteFromKeywordSelect" . $KeywordSelect->Id } ) {
-
-            #Delete the keyword
-            my ( $result, $msg ) = $TicketObj->DeleteKeyword(
-                Keyword =>
-                $ARGSRef->{ "DeleteFromKeywordSelect" . $KeywordSelect->Id },
-                KeywordSelect => $KeywordSelect->id
-            );
-            push ( @results, $msg );
-        }
-    }
-
-    # }}}
-
-    return (@results);
-}
-
-# }}}
+eval "require RT::Interface::Web_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/Web_Vendor.pm});
+eval "require RT::Interface::Web_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/Web_Local.pm});
 
 1;
diff --git a/rt/lib/RT/Keyword.pm b/rt/lib/RT/Keyword.pm
deleted file mode 100644
index a41e0a585..000000000
--- a/rt/lib/RT/Keyword.pm
+++ /dev/null
@@ -1,446 +0,0 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/Keyword.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
-=head1 NAME
-
- RT::Keyword - Manipulate an RT::Keyword record
-
-=head1 SYNOPSIS
-
-  use RT::Keyword;
-
-  my $keyword = RT::Keyword->new($CurrentUser);
-  $keyword->Create( Name => 'tofu',
-		    Description => 'fermented soy beans',
-		  );
-  
-
-  my $keyword2 = RT::Keyword->new($CurrentUser);
-  $keyword2->Create( Name   => 'beast',
-		    Description => 'a wild animal',
-		    Parent => $keyword->id(),
-		  );
-
-=head1 DESCRIPTION
-
-An B<RT::Keyword> object is an arbitrary string. 
-
-=head1 METHODS
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Scrip);
-
-=end testing
-
-
-=cut 
-package RT::Keyword;
-
-use strict;
-use vars qw(@ISA);
-use Tie::IxHash;
-use RT::Record;
-use RT::Keywords;
-
-@ISA = qw(RT::Record);
-
-# {{{ Core methods
-
-sub _Init {
-    my $self = shift;
-    $self->{'table'} = "Keywords";
-    $self->SUPER::_Init(@_);
-}
-
-sub _Accessible {
-    my $self = shift;
-    my %cols = (
-		Name        => 'read/write', #the keyword itself
-		Description => 'read/write', #a description of the keyword
-		Parent      => 'read/write', #optional id of another B<RT::Keyword>, allowing keywords to be arranged hierarchically
-		Disabled    => 'read/write'
-	       );
-    return ($self->SUPER::_Accessible( @_, %cols));
-    
-}
-
-# }}}
-
-
-=over 4
-
-=item new CURRENT_USER
-
-Takes a single argument, an RT::CurrentUser object.  Instantiates a new
-(uncreated) RT::Keyword object.
-
-=cut
-
-# {{{ sub Create
-
-=item Create KEY => VALUE, ...
-
-Takes a list of key/value pairs and creates a the object.  Returns the id of
-the newly created record, or false if there was an error.
-
-Keys are:
-
-Name - the keyword itself
-Description - (not yet used)
-Parent - optional link to another B<RT::Keyword>, allowing keyword to be arranged in a hierarchical fashion.  Can be specified by id or Name.
-
-=cut
-
-sub Create {
-    my $self = shift;
-    my %args = (Name => undef,
-		Description => undef,
-		Parent => 0,
-		@_);
-    
-    unless ($self->CurrentUserHasRight('AdminKeywords')) {
-	return (0, 'Permission Denied');
-    }    
-  
-    if ( $args{'Parent'} && $args{'Parent'} !~ /^\d+$/ ) {
-	$RT::Logger->err( "can't yet specify parents by name, sorry: ". $args{'Parent'});
-	return(0,'Parent must be specified by id');
-    }
-    
-    my $val = $self->SUPER::Create(Name => $args{'Name'},
-				   Description => $args{'Description'},
-				   Parent => $args{'Parent'}
-				  );
-    if ($val) {
-	return ($val, 'Keyword created');
-    }
-    else {
-	return(0,'Could not create keyword');
-    }	
-}
-
-# }}}
-
-# {{{ sub Delete
-
-sub Delete {
-    my $self = shift;
-    
-    return (0, 'Deleting this object would break referential integrity.');
-}
-
-# }}}
-
-# {{{ sub LoadByPath 
-
-=head2 LoadByPath STRING
-
-LoadByPath takes a string.  Whatever character starts the string is assumed to be a delimter.  The routine parses the keyword path description and tries to load the keyword
-described by that path.  It returns a numerical status and a textual message.
-A non-zero status means 'Success'.
-
-=cut
-
-sub LoadByPath {
-    my $self = shift;
-
-    my $path = shift;
-    
-    my $delimiter = substr($path,0,1);
-    my @path_elements = split($delimiter, $path);
-    
-    #throw awya the first bogus path element
-    shift @path_elements;
-    
-    my $parent = 0;
-    my ($tempkey);
-    #iterate through all the path elements loading up a
-    #keyword object. when we're done, this object becomes 
-    #whatever the last tempkey object was.
-    while (my $name = shift @path_elements) {
-	
-	$tempkey = new RT::Keyword($self->CurrentUser);
-
-	my $loaded = $tempkey->LoadByNameAndParentId($name, $parent);
-	
-	#Set the new parent for loading its child.
-	$parent = $tempkey->Id;
-	
-	#If the parent Id is 0, then we're not recursing through the tree
-	# time to bail
-	return (0, "Couldn't find keyword") unless ($tempkey->id());
-
-    }	
-    #Now that we're through with the loop, the last keyword loaded
-    # is the the one we wanted.
-    # we shouldn't need to explicitly load it like this. but we do. Thanks SQL
-    
-    $self->Load($tempkey->Id);
-    
-    return (1, 'Keyword loaded');
-}
-
-
-# }}}
-
-# {{{ sub LoadByNameAndParentId
-
-=head2 LoadByNameAndParentId NAME PARENT_ID
-  
-Takes two arguments, a keyword name and a parent id. Loads a keyword into 
-  the current object.
-
-=cut
-  
-sub LoadByNameAndParentId {
-    my $self = shift;
-    my $name = shift;
-    my $parentid = shift;
-    
-    my $val = $self->LoadByCols( Name => $name, Parent => $parentid);
-    if ($self->Id) {
-	return ($self->Id, 'Keyword loaded');
-    }	
-    else {
-	return (0, 'Keyword could not be found');
-    }
-  }
-
-# }}}
-
-
-# {{{ sub Load
-
-=head2 Load KEYWORD
-
-Loads KEYWORD, either by id if it's an integer or by Path, otherwise
-
-=cut
-
-sub Load {
-    my $self = shift;
-    my $id = shift;
-
-    if (!$id) {
-	return (0, 'No keyword defined');
-    }	
-    if ($id =~ /^(\d+)$/) {
-	 return ($self->SUPER::Load($id));
-    }
-    else {
-	 return($self->LoadByPath($id));
-    }
-}
-
-
-# }}}
-
-# {{{ sub Path
-
-=item Path
-
-  Returns this Keyword's full path going back to the root. (eg /OS/Unix/Linux/Redhat if 
-this keyword is "Redhat" )
-
-=cut
-
-sub Path {
-    my $self = shift;
-    
-    if ($self->Parent == 0) {
-	return ("/".$self->Name);
-    }
-    else {
-	return ( $self->ParentObj->Path . "/" . $self->Name);
-    }	
-    
-}
-
-# }}}
-
-# {{{ sub RelativePath 
-
-=head2 RelativePath KEYWORD_OBJ
-
-Takes a keyword object.  Returns this keyword's path relative to that
-keyword.  
-
-=item Bugs
-
-Currently assumes that the "other" keyword is a predecessor of this keyword
-
-=cut
-
-sub RelativePath {
-    my $self = shift;
-    my $OtherKey = shift;
-    
-    my $OtherPath = $OtherKey->Path();
-    my $MyPath = $self->Path;
-    $MyPath =~ s/^$OtherPath\///g;
-    return ($MyPath);
-}
-
-
-# }}}
-
-# {{{ sub ParentObj
-
-=item ParentObj
-
-  Returns an RT::Keyword object of this Keyword's 'parents'
-
-=cut
-
-sub ParentObj {
-    my $self = shift;
-    
-    my $ParentObj = new RT::Keyword($self->CurrentUser);
-    $ParentObj->Load($self->Parent);
-    return ($ParentObj);
-}
-
-# }}}
-
-# {{{ sub Children
-
-=item Children
-
-Return an RT::Keywords object  this Object's children.
-
-=cut
-
-sub Children {
-    my $self = shift;
-    
-    my $Children = new RT::Keywords($self->CurrentUser);
-    $Children->LimitToParent($self->id);
-    return ($Children);
-}
-
-# }}}
-
-# {{{ sub Descendents
-
-=item Descendents [ NUM_GENERATIONS [ EXCLUDE_HASHREF ]  ]
-
-Returns an ordered (see L<Tie::IxHash>) hash reference of the descendents of
-this keyword, possibly limited to a given number of generations.  The keys
-are B<RT::Keyword> I<id>s, and the values are strings containing the I<Name>s
-of those B<RT::Keyword>s.
-
-=cut
-
-sub Descendents {
-    my $self = shift;
-    my $generations = shift || 0;
-    my $exclude = shift || {};
-    my %results;
-    
-
-    tie %results, 'Tie::IxHash';
-    my $Keywords = new RT::Keywords($self->CurrentUser);
-    $Keywords->LimitToParent($self->id || 0 ); #If we have no id, start at the top
-    
-    while ( my $Keyword = $Keywords->Next ) {
-	
-	next if defined $exclude->{ $Keyword->id };
-	$results{ $Keyword->id } = $Keyword->Name;
-		
-	if ( $generations == 0 || $generations > 1 ) {
-	    #if we're limiting to some number of generations,
-	    # decrement the number of generations
-
-	    my $nextgen = $generations;
-	    $nextgen-- if ( $nextgen > 1 );
-	    
-	    my $kids = $Keyword->Descendents($nextgen, \%results);
-	    
-	    foreach my $kid ( keys %{$kids}) {
-		$results{"$kid"} = $Keyword->Name. "/". $kids->{"$kid"};
-	    }
-	}
-    }
-    return(\%results);
-}
-
-# }}}
-
-# {{{ ACL related methods
-
-# {{{ sub _Set
-
-# does an acl check and then passes off the call
-sub _Set {
-    my $self = shift;
-    
-    unless ($self->CurrentUserHasRight('AdminKeywords')) {
-	return (0,'Permission Denied');
-    }
-    return $self->SUPER::_Set(@_);
-}
-
-# }}}
-
-# {{{ sub CurrentUserHasRight
-
-=head2 CurrentUserHasRight
-
-Helper menthod for HasRight. Presets Principal to CurrentUser then 
-calls HasRight.
-
-=cut
-
-sub CurrentUserHasRight {
-    my $self = shift;
-    my $right = shift;
-    return ($self->HasRight( Principal => $self->CurrentUser->UserObj,
-                             Right => $right ));
-    
-}
-
-# }}}
-
-# {{{ sub HasRight
-
-=head2 HasRight
-
-Takes a param-hash consisting of "Right" and "Principal"  Principal is 
-an RT::User object or an RT::CurrentUser object. "Right" is a textual
-Right string that applies to Keywords.
-
-=cut
-
-sub HasRight {
-    my $self = shift;
-    my %args = ( Right => undef,
-                 Principal => undef,
-                 @_ );
-
-    return( $args{'Principal'}->HasSystemRight( $args{'Right'}) );
-
-}
-# }}}
-
-# }}}
-
-=back
-
-=head1 AUTHOR
-
-Ivan Kohler <ivan-rt@420.am>
-
-=head1 BUGS
-
-Yes.
-
-=head1 SEE ALSO
-
-L<RT::Keywords>, L<RT::ObjectKeyword>, L<RT::ObjectKeywords>, L<RT::Ticket>,
-L<RT::Record>
-
-[A=cut
-
-1;
-
diff --git a/rt/lib/RT/KeywordSelect.pm b/rt/lib/RT/KeywordSelect.pm
deleted file mode 100644
index 6865216fd..000000000
--- a/rt/lib/RT/KeywordSelect.pm
+++ /dev/null
@@ -1,452 +0,0 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/KeywordSelect.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
-package RT::KeywordSelect;
-
-use strict;
-use vars qw(@ISA);
-use RT::Record;
-use RT::Keyword;
-
-@ISA = qw(RT::Record);
-
-# {{{ POD
-
-=head1 NAME
-
- RT::KeywordSelect - Manipulate an RT::KeywordSelect record
-
-=head1 SYNOPSIS
-
-  use RT::KeywordSelect;
-
-  my $keyword_select = RT::KeywordSelect->new($CurrentUser);
-  $keyword_select->Create(
-    Keyword     => 20,
-    ObjectType => 'Ticket',
-    Name       => 'Choices'
-  );
-
-  my $keyword_select = RT::KeywordSelect->new($CurrentUser);
-  $keyword_select->Create(
-    Name        => 'Choices',			  
-    Keyword     => 20,
-    ObjectType  => 'Ticket',
-    ObjectField => 'Queue',
-    ObjectValue => 1,
-    Single      => 1,
-    Depth => 4,
-  );
-
-=head1 DESCRIPTION
-
-An B<RT::KeywordSelect> object is a link between a Keyword and a object
-type (one of: Ticket), titled by the I<Name> field of the B<RT::Keyword> such
-that:
-
-=over 4
-
-=item Object display will contain a field, titled with the I<Name> field and
-  showing any descendent keywords which are related to this object via the
-  B<RT::ObjectKeywords> table.
-
-=item Object creation for this object will contain a field titled with the
-  I<Name> field and containing the descendents of the B<RT::Keyword> as
-  choices.  If the I<Single> field of this B<RT::KeywordSelect> is true, each
-  object must be associated (via an B<RT::ObjectKeywords> record) to a single
-  descendent.  If the I<Single> field is false, each object may be connect to
-  zero, one, or many descendents.
-
-=item Searches for this object type will contain a selection field titled with
-  the I<Name> field and containing the descendents of the B<RT::Keyword> as
-  choices.
-
-=item If I<ObjectField> is defined (one of: Queue), all of the above apply only
-  when the value of I<ObjectField> (Queue) in B<ObjectType> (Ticket) matches
-  I<ObjectValue>.
-
-=back
-
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::KeywordSelects);
-
-=end testing
-
-
-=head1 METHODS
-
-
-=cut
-
-
-=over 4
-
-=item new CURRENT_USER
-
-Takes a single argument, an RT::CurrentUser object.  Instantiates a new
-(uncreated) RT::KeywordSelect object.
-
-=cut
-# }}}
-
-# {{{ sub _Init
-sub _Init {
-    my $self = shift;
-    $self->{'table'} = "KeywordSelects";
-    $self->SUPER::_Init(@_);
-}
-# }}}
-
-# {{{ sub _Accessible
-sub _Accessible {
-    my $self = shift;
-    my %Cols = (
-		Name => 'read/write',
-		Keyword => 'read/write', # link to Keywords.  Can be specified by id
-		Single => 'read/write', # bool (described below)
-
-		Depth => 'read/write', #- If non-zero, limits the descendents to this number of levels deep.
-		ObjectType  => 'read/write', # currently only C<Ticket>
-		ObjectField => 'read/write', #optional, currently only C<Queue>
-		ObjectValue => 'read/write', #constrains KeywordSelect function to when B<ObjectType>.I<ObjectField> equals I<ObjectValue>
-		Disabled => 'read/write'
-	       );
-    return($self->SUPER::_Accessible(@_, %Cols));  
-}
-# }}}
-
-# {{{ sub LoadByName
-
-=head2 LoadByName( Name => [NAME], Queue => [QUEUE_ID])
-.  Takes a queue id and a keyword select name. 
-    tries to load the keyword select for that queue. if that fails, it tries to load it
-    without a queue specified.
-
-=cut
-
-
-sub LoadByName {
-    my $self = shift;
-    my %args = ( Name => undef,
-		 Queue => undef,
-		 @_
-	       );
-    if ($args{'Queue'}) {
-	#Try to get the keyword select for this queue
-	$self->LoadByCols( Name => $args{'Name'}, 
-			   ObjectType => 'Ticket', 
-			   ObjectField => 'Queue', 
-			   ObjectValue => $args{'Queue'});
-    }	
-    unless ($self->Id) { #if that failed to load an object
-	#Try to get the keyword select of that name that's global
-	$self->LoadByCols( Name => $args{'Name'}, 
-			   ObjectType => 'Ticket', 
-			   ObjectField => 'Queue', 
-			   ObjectValue => '0');
-    }
-    
-    return($self->Id);
-    
-}
-
-# }}}
-
-# {{{ sub Create
-=item Create KEY => VALUE, ...
-
-Takes a list of key/value pairs and creates a the object.  Returns the id of
-the newly created record, or false if there was an error.
-
-Keys are:
-
-Keyword - link to Keywords.  Can be specified by id.
-Name - A name for this KeywordSelect
-Single - bool (described above)
-Depth - If non-zero, limits the descendents to this number of levels deep.
-ObjectType - currently only C<Ticket>
-ObjectField - optional, currently only C<Queue>
-ObjectValue - constrains KeywordSelect function to when B<ObjectType>.I<ObjectField> equals I<ObjectValue>
-
-=cut
-
-sub Create {
-    my $self = shift;
-    my %args = ( Keyword => undef,
-		 Single => 1,
-		 Depth => 0,
-		 Name => undef,
-		 ObjectType => undef,
-		 ObjectField => undef,
-		 ObjectValue => undef,
-		 @_);
-
-    #If we're talking about a keyword select based on a ticket's 'Queue' field
-    if  ( ($args{'ObjectField'} eq 'Queue') and
-	  ($args{'ObjectType'} eq 'Ticket')) {
-	
-	#If we're talking about a keywordselect for all queues
-	if ($args{'ObjectValue'} == 0) {
-	    unless( $self->CurrentUserHasSystemRight('AdminKeywordSelects')) {
-		return (0, 'Permission Denied');
-	    }
-	}  
-	#otherwise, we're talking about a keywordselect for a specific queue
-	else {
-	    unless ($self->CurrentUserHasQueueRight( Right => 'AdminKeywordSelects',
-						     Queue => $args{'ObjectValue'})) {
-		return (0, 'Permission Denied');
-	    }
-	}
-    }
-    else {
-	return (0, "Can't create a KeywordSelect for that object/field combo");
-    }
-
-    my $Keyword = new RT::Keyword($self->CurrentUser);
-
-    if ( $args{'Keyword'} && $args{'Keyword'} !~ /^\d+$/ ) {
-	$Keyword->LoadByPath($args{'Keyword'});
-    }	
-    else {
-	$Keyword->Load($args{'Keyword'});
-    }
-
-    unless ($Keyword->Id) {
-	$RT::Logger->debug("Keyword ".$args{'Keyword'} ." not found\n");
-	return(0, 'Keyword not found');
-    }
-    
-    $args{'Name'} = $Keyword->Name if  (!$args{'Name'});
-    
-    my $val = $self->SUPER::Create( Name => $args{'Name'},
-				    Keyword => $Keyword->Id,
-				    Single => $args{'Single'},
-				    Depth => $args{'Depth'},
-				    ObjectType => $args{'ObjectType'},
-				    ObjectField => $args{'ObjectField'},
-				    ObjectValue => $args{'ObjectValue'});
-    if ($val) {
-	return ($val, 'KeywordSelect Created');
-    }
-    else {
-	return (0, 'System error. KeywordSelect not created');
-	
-    }
-}
-# }}}
-
-# {{{ sub Delete
-
-sub Delete {
-    my $self = shift;
-    
-    return (0, 'Deleting this object would break referential integrity.');
-}
-
-# }}}
-
-
-# {{{ sub SetDisabled
-
-=head2 Sub SetDisabled
-
-Toggles the KeywordSelect's disabled flag.
-
-
-=cut 
-
-sub SetDisabled {
-    my $self = shift;
-    my $value = shift;
-
-    unless ($self->CurrentUserHasRight('AdminKeywordSelects')) {
-	return (0, "Permission Denied");
-    }
-    return($self->_Set(Field => 'Disabled', Value => $value));
-}
-
-# }}}
-
-# {{{ sub KeywordObj
-
-=item KeywordObj
-
-Returns the B<RT::Keyword> referenced by the I<Keyword> field.
-
-=cut
-
-sub KeywordObj {
-    my $self = shift;
-
-    my $Keyword = new RT::Keyword($self->CurrentUser);
-    $Keyword->Load( $self->Keyword ); #or ?
-    return($Keyword);
-} 
-# }}}
-
-# {{{ sub Object
-
-=item Object
-
-Returns the object (currently only RT::Queue) specified by ObjectField and ObjectValue.
-
-=cut
-
-sub Object {
-    my $self = shift;
-    if ( $self->ObjectField eq 'Queue' ) {
-	my $Queue = new RT::Queue($self->CurrentUser);
-	$Queue->Load( $self->ObjectValue );
-	return ($Queue);
-    } else {
-	$RT::Logger->error("$self trying to load an object value for a non-queue object");
-	return (undef);
-    }
-}
-
-# }}}
-
-# {{{ sub _Set
-
-# does an acl check, then passes off the call
-sub _Set {
-    my $self = shift;
-
-    unless ($self->CurrentUserHasRight('AdminKeywordSelects')) {
-	return (0, "Permission Denied");
-    }
-    
-    return ($self->SUPER::_Set(@_));
-
-}
-
-# }}}
-
-
-# {{{ sub CurrentUserHasQueueRight 
-
-=head2 CurrentUserHasQueueRight ( Queue => QUEUEID, Right => RIGHTNANAME )
-
-Check to see whether the current user has the specified right for the specified queue.
-
-=cut
-
-sub CurrentUserHasQueueRight {
-    my $self = shift;
-    my %args = (Queue => undef,
-		Right => undef,
-		@_
-		);
-    return ($self->HasRight( Right => $args{'Right'},
-			     Principal => $self->CurrentUser->UserObj,
-			     Queue => $args{'Queue'}));
-}
-
-# }}}
-
-# {{{ sub CurrentUserHasSystemRight 
-
-=head2 CurrentUserHasSystemRight RIGHTNAME
-
-Check to see whether the current user has the specified right for the 'system' scope.
-
-=cut
-
-sub CurrentUserHasSystemRight {
-    my $self = shift;
-    my $right = shift;
-    $RT::Logger->debug("$self in hashsysright for right $right\n");
-    return ($self->HasRight( Right => $right,
-			     System => 1,
-			     Principal => $self->CurrentUser->UserObj));
-}
-
-# }}}
-
-# {{{ sub CurrentUserHasRight
-
-=item CurrentUserHasRight RIGHT  [QUEUEID]
-
-Takes a rightname as a string. Can take a queue id as a second
-optional parameter, which can be useful to a routine like create.
-Helper menthod for HasRight. Presets Principal to CurrentUser then 
-calls HasRight.
-
-=cut
-
-sub CurrentUserHasRight {
-    my $self = shift;
-    my $right = shift;
-    return ($self->HasRight( Principal => $self->CurrentUser->UserObj,
-                             Right => $right,
-			   ));
-}
-
-# }}}
-
-# {{{ sub HasRight
-
-=item HasRight
-
-Takes a param-hash consisting of "Right" and "Principal"  Principal is 
-an RT::User object or an RT::CurrentUser object. "Right" is a textual
-Right string that applies to KeywordSelects
-
-=cut
-
-sub HasRight {
-    my $self = shift;
-    my %args = ( Right => undef,
-                 Principal => undef,
-		 Queue => undef,
-		 System => undef,
-                 @_ );
-
-    #If we're explicitly specifying a queue, as we need to do on create
-    if ($args{'Queue'}) {
-	return ($args{'Principal'}->HasQueueRight(Right => $args{'Right'},
-						  Queue => $args{'Queue'}));
-    }
-    #else if we're specifying to check a system right
-    elsif ($args{'System'}) {
-        return( $args{'Principal'}->HasSystemRight( $args{'Right'} ));
-    }	
-
-    #else if we 're using the object's queue
-    elsif (($self->__Value('ObjectField') eq 'Queue') and
-	   ($self->__Value('ObjectValue') > 0 )) {
-        return ($args{'Principal'}->HasQueueRight(Right => $args{'Right'},
-						  Queue => $self->__Value('ObjectValue') )); 
-    }
-    
-    #If the object is system scoped.
-    else {
-        return( $args{'Principal'}->HasSystemRight( $args{'Right'} ));
-    }
-}
-
-# }}}
-
-=back
-
-=head1 AUTHORS
-
-Ivan Kohler <ivan-rt@420.am>, Jesse Vincent <jesse@fsck.com>
-
-=head1 BUGS
-
-The ACL system for this object is more byzantine than it should be.  reworking it eventually
-would be a good thing.
-
-=head1 SEE ALSO
-
-L<RT::KeywordSelects>, L<RT::Keyword>, L<RT::Keywords>, L<RT::ObjectKeyword>,
-L<RT::ObjectKeywords>, L<RT::Record>
-
-=cut
-
-1;
-
diff --git a/rt/lib/RT/KeywordSelects.pm b/rt/lib/RT/KeywordSelects.pm
deleted file mode 100644
index c220b39f9..000000000
--- a/rt/lib/RT/KeywordSelects.pm
+++ /dev/null
@@ -1,143 +0,0 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/KeywordSelects.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
-
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Scrip);
-
-=end testing
-
-=cut
-
-
-package RT::KeywordSelects;
-
-use strict;
-use vars qw( @ISA );
-use RT::EasySearch;
-use RT::KeywordSelect;
-
-@ISA = qw( RT::EasySearch );
-
-# {{{ _Init
-sub _Init {
-  my $self = shift;
-  $self->{'table'} = 'KeywordSelects';
-  $self->{'primary_key'} = 'id';
-  return ($self->SUPER::_Init(@_));
-}
-# }}}
-
-# {{{ sub _DoSearch 
-
-=head2 _DoSearch
-
-  A subclass of DBIx::SearchBuilder::_DoSearch that makes sure that _Disabled rows never get seen unless
-we're explicitly trying to see them.
-
-=cut
-
-sub _DoSearch {
-    my $self = shift;
-    
-    #unless we really want to find disabled rows, make sure we\'re only finding enabled ones.
-    unless($self->{'find_disabled_rows'}) {
-	$self->LimitToEnabled();
-    }
-    
-    return($self->SUPER::_DoSearch(@_));
-    
-}
-
-# }}}
-
-# {{{ sub LimitToQueue
-=head2 LimitToQueue 
-
-Takes a queue id. Limits the returned set to KeywordSelects for that queue.
-Repeated calls will be OR'd together.
-
-=cut
-
-sub LimitToQueue {
-    my $self = shift;
-    my $queue = shift;
-
-    $self->Limit( FIELD => 'ObjectValue',
-		  VALUE => $queue,
-		  OPERATOR => '=',
-		  ENTRYAGGREGATOR => 'OR'
-		);
-
-    $self->Limit( FIELD => 'ObjectType',
-		  VALUE => 'Ticket',
-		  OPERATOR => '=');
-
-    $self->Limit( FIELD => 'ObjectField',
-		  VALUE => 'Queue',
-		  OPERATOR => '=');
-
-    
-}
-# }}}
-
-# {{{ sub LimitToGlobals
-
-=head2 LimitToGlobals
-
-Limits the returned set to KeywordSelects for all queues.
-Repeated calls will be OR'd together.
-
-=cut
-
-sub LimitToGlobals {
-    my $self = shift;
-
-    $self->Limit( FIELD => 'ObjectType',
-		  VALUE => 'Ticket',
-		  OPERATOR => '=');
-
-    $self->Limit( FIELD => 'ObjectField',
-		  VALUE => 'Queue',
-		  OPERATOR => '=');
-
-    $self->Limit( FIELD => 'ObjectValue',
-		  VALUE => '0',
-		  OPERATOR => '=',
-		  ENTRYAGGREGATOR => 'OR'
-		);
-    
-}
-# }}}
-
-# {{{ sub IncludeGlobals
-=head2 IncludeGlobals
-
-Include KeywordSelects which apply globally in the set of returned results
-
-=cut
-
-
-sub IncludeGlobals {
-    my $self = shift;
-    $self->Limit( FIELD => 'ObjectValue',
-		  VALUE => '0',
-		  OPERATOR => '=',
-		  ENTRYAGGREGATOR => 'OR'
-		);
-    
-
-}
-# }}}
-
-# {{{ sub NewItem
-sub NewItem {
-    my $self = shift;
-    #my $Handle = shift;
-    return (new RT::KeywordSelect($self->CurrentUser));
-}
-# }}}
-1;
-
diff --git a/rt/lib/RT/Keywords.pm b/rt/lib/RT/Keywords.pm
deleted file mode 100644
index a9ecda2bc..000000000
--- a/rt/lib/RT/Keywords.pm
+++ /dev/null
@@ -1,106 +0,0 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/Keywords.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
-=head1 NAME
-
-  RT::Keywords - a collection of RT::Keyword objects
-
-=head1 SYNOPSIS
-
-  use RT::Keywords;
-  my $keywords = RT::Keywords->new($user);
-  $keywords->LimitToParent(0);
-  while my ($keyword = $keywords->Next()) {
-     print $keyword->Name ."\n";
-  }
-
-
-=head1 DESCRIPTION
-
-
-=head1 METHODS
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Keywords);
-
-=end testing
-
-=cut
-
-package RT::Keywords;
-
-use strict;
-use vars qw( @ISA );
-use RT::EasySearch;
-use RT::Keyword;
-
-@ISA = qw( RT::EasySearch );
-
-
-# {{{ sub _Init
-
-sub _Init {
-    my $self = shift;
-    $self->{'table'} = 'Keywords';
-    $self->{'primary_key'} = 'id';
-
-    # By default, order by name
-    $self->OrderBy( ALIAS => 'main',
-		    FIELD => 'Name',
-		    ORDER => 'ASC');
-
-    return ($self->SUPER::_Init(@_));
-}
-# }}}
-
-# {{{ sub _DoSearch 
-
-=head2 _DoSearch
-
-  A subclass of DBIx::SearchBuilder::_DoSearch that makes sure that _Disabled rows never get seen unless
-we're explicitly trying to see them.
-
-=cut
-
-sub _DoSearch {
-    my $self = shift;
-    
-    #unless we really want to find disabled rows, make sure we\'re only finding enabled ones.
-    unless($self->{'find_disabled_rows'}) {
-	$self->LimitToEnabled();
-    }
-    
-    return($self->SUPER::_DoSearch(@_));
-    
-}
-
-# }}}
-
-# {{{ sub NewItem 
-sub NewItem {
-    my $self = shift;
-    return (RT::Keyword->new($self->CurrentUser));
-}
-# }}}
-
-# {{{ sub LimitToParent
-
-=head2 LimitToParent
-
-Takes a parent id and limits the returned keywords to children of that parent.
-
-=cut
-
-sub LimitToParent {
-    my $self = shift;
-    my $parent = shift;
-    $self->Limit( FIELD => 'Parent',
-		  VALUE => $parent,
-		  OPERATOR => '=',
-		  ENTRYAGGREGATOR => 'OR' );
-}	
-# }}}
-
-1;
-
diff --git a/rt/lib/RT/Link.pm b/rt/lib/RT/Link.pm
index 885ffe3ed..962c378a8 100644
--- a/rt/lib/RT/Link.pm
+++ b/rt/lib/RT/Link.pm
@@ -1,373 +1,302 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Link.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-1999 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::Link - an RT Link object
+RT::Link
 
-=head1 SYNOPSIS
 
-  use RT::Link;
+=head1 SYNOPSIS
 
 =head1 DESCRIPTION
 
-This module should never be called directly by client code. it's an internal module which
-should only be accessed through exported APIs in Ticket other similar objects.
-
 =head1 METHODS
 
+=cut
 
-=begin testing
+package RT::Link;
+use RT::Record; 
 
-ok (require RT::TestHarness);
-ok (require RT::Link);
 
-=end testing
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
 
-=cut
+sub _Init {
+  my $self = shift; 
 
-package RT::Link;
-use RT::Record;
-use Carp;
-@ISA= qw(RT::Record);
-
-# {{{ sub _Init
-sub _Init  {
-  my $self  = shift;
-  $self->{'table'} = "Links";
-  return ($self->SUPER::_Init(@_));
+  $self->Table('Links');
+  $self->SUPER::_Init(@_);
 }
 
-# }}}
 
-# {{{ sub Create 
 
-=head2 Create PARAMHASH
 
-Create a new link object. Takes 'Base', 'Target' and 'Type'.
-Returns undef on failure or a Link Id on success.
+
+=item Create PARAMHASH
+
+Create takes a hash of values and creates a row in the database:
+
+  varchar(240) 'Base'.
+  varchar(240) 'Target'.
+  varchar(20) 'Type'.
+  int(11) 'LocalTarget'.
+  int(11) 'LocalBase'.
 
 =cut
 
-sub Create  {
+
+
+
+sub Create {
     my $self = shift;
-    my %args = ( Base => undef,
-		 Target => undef,
-		 Type => undef,
-		 @_ # get the real argumentlist
-	       );
-    
-    my $BaseURI = $self->CanonicalizeURI($args{'Base'});
-    my $TargetURI = $self->CanonicalizeURI($args{'Target'});
-    
-    unless (defined $BaseURI) {
-	$RT::Logger->warning ("$self couldn't resolve base:'".$args{'Base'}.
-			      "' into a URI\n");
-	return (undef);
-    }
-    unless (defined $TargetURI) {
-	$RT::Logger->warning ("$self couldn't resolve target:'".$args{'Target'}.
-			      "' into a URI\n");
-	return(undef);
-    }
-    
-    my $LocalBase = $self->_IsLocal($BaseURI);
-    my $LocalTarget = $self->_IsLocal($TargetURI);
-    my $id = $self->SUPER::Create(Base => "$BaseURI",
-				  Target => "$TargetURI",
-				  LocalBase => $LocalBase, 
-				  LocalTarget => $LocalTarget,
-				  Type => $args{'Type'});
-    return ($id);
+    my %args = ( 
+                Base => '',
+                Target => '',
+                Type => '',
+                LocalTarget => '0',
+                LocalBase => '0',
+
+		  @_);
+    $self->SUPER::Create(
+                         Base => $args{'Base'},
+                         Target => $args{'Target'},
+                         Type => $args{'Type'},
+                         LocalTarget => $args{'LocalTarget'},
+                         LocalBase => $args{'LocalBase'},
+);
+
 }
 
-# }}}
- 
-# {{{ sub Load 
 
-=head2 Load
 
-  Load an RT::Link object from the database.  Takes one parameter or three.
-  One parameter is the id of an entry in the links table.  Three parameters are a tuple of (base, linktype, target);
+=item id
+
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
 
 
 =cut
 
-sub Load  {
-  my $self = shift;
-  my $identifier = shift;
-  my $linktype = shift if (@_);
-  my $target = shift if (@_);
-  
-  if ($target) {
-      my $BaseURI = $self->CanonicalizeURI($identifier);
-      my $TargetURI = $self->CanonicalizeURI($target);
-      $self->LoadByCols( Base => $BaseURI,
-			 Type => $linktype,
-			 Target => $TargetURI
-		       ) || return (0, "Couldn't load link");
-  }
-  
-  elsif ($identifier =~ /^\d+$/) {
-      $self->LoadById($identifier) ||
-	return (0, "Couldn't load link");
-  }
-  else {
-	return (0, "That's not a numerical id");
-  }
-}
 
-# }}}
+=item Base
 
-# {{{ sub TargetObj 
+Returns the current value of Base. 
+(In the database, Base is stored as varchar(240).)
 
-=head2 TargetObj
 
-=cut
 
-sub TargetObj {
-  my $self = shift;
-   return $self->_TicketObj('base',$self->Target);
-}
-# }}}
+=item SetBase VALUE
+
 
-# {{{ sub BaseObj
+Set Base to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Base will be stored as a varchar(240).)
 
-=head2 BaseObj
 
 =cut
 
-sub BaseObj {
-  my $self = shift;
-  return $self->_TicketObj('target',$self->Base);
-}
-# }}}
-
-# {{{ sub _TicketObj
-sub _TicketObj {
-  my $self = shift;
-  my $name = shift;
-  my $ref = shift;
-  my $tag="$name\_obj";
-  
-  unless (exists $self->{$tag}) {
-
-  $self->{$tag}=RT::Ticket->new($self->CurrentUser);
-
-  #If we can get an actual ticket, load it up.
-  if ($self->_IsLocal($ref)) {
-      $self->{$tag}->Load($ref);
-    }
-  }
-  return $self->{$tag};
-}
-# }}}
-
-# {{{ sub _Accessible 
-sub _Accessible  {
-  my $self = shift;
-  my %Cols = (
-	      LocalBase => 'read',
-	      LocalTarget => 'read',
-	      Base => 'read',
-	      Target => 'read',
-	      Type => 'read',
-	      Creator => 'read/auto',
-	      Created => 'read/auto',
-	      LastUpdatedBy => 'read/auto',
-	      LastUpdated => 'read/auto'
-	     );
-  return($self->SUPER::_Accessible(@_, %Cols));
-}
-# }}}
 
+=item Target
 
-# Static methods:
+Returns the current value of Target. 
+(In the database, Target is stored as varchar(240).)
 
-# {{{ sub BaseIsLocal
 
-=head2 BaseIsLocal
 
-Returns true if the base of this link is a local ticket
+=item SetTarget VALUE
+
+
+Set Target to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Target will be stored as a varchar(240).)
+
 
 =cut
 
-sub BaseIsLocal {
-  my $self = shift;
-  return $self->_IsLocal($self->Base);
-}
 
-# }}}
+=item Type
 
-# {{{ sub TargetIsLocal
+Returns the current value of Type. 
+(In the database, Type is stored as varchar(20).)
 
-=head2 TargetIsLocal
 
-Returns true if the target of this link is a local ticket
+
+=item SetType VALUE
+
+
+Set Type to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Type will be stored as a varchar(20).)
+
 
 =cut
 
-sub TargetIsLocal {
-  my $self = shift;
-  return $self->_IsLocal($self->Target);
-}
 
-# }}}
+=item LocalTarget
+
+Returns the current value of LocalTarget. 
+(In the database, LocalTarget is stored as int(11).)
+
+
+
+=item SetLocalTarget VALUE
 
-# {{{ sub _IsLocal
 
-=head2 _IsLocal URI 
+Set LocalTarget to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, LocalTarget will be stored as a int(11).)
 
-When handed a URI returns the local ticket id if it\'s local. otherwise returns undef.
 
 =cut
 
-sub _IsLocal {
-    my $self = shift;
-    my $URI=shift;
-    unless ($URI) {
-	$RT::Logger->warning ("$self _IsLocal called without a URI\n");
-	return (undef);
-    }
-    # TODO: More thorough check
-    if ($URI =~ /^$RT::TicketBaseURI(\d+)$/) {
-	return($1);
-    }
-    else {
-	return (undef);
-    }
-}
-# }}}
+
+=item LocalBase
+
+Returns the current value of LocalBase. 
+(In the database, LocalBase is stored as int(11).)
+
 
 
-# {{{ sub BaseAsHREF 
+=item SetLocalBase VALUE
 
-=head2 BaseAsHREF
 
-Returns an HTTP url to access the base of this link
+Set LocalBase to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, LocalBase will be stored as a int(11).)
+
 
 =cut
 
-sub BaseAsHREF {
-  my $self = shift;
-  return $self->AsHREF($self->Base);
-}
-# }}}
 
-# {{{ sub TargetAsHREF 
+=item LastUpdatedBy
 
-=head2 TargetAsHREF
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
 
-return an HTTP url to access the target of this link
 
 =cut
 
-sub TargetAsHREF {
-  my $self = shift;
-  return $self->AsHREF($self->Target);
-}
-# }}}
 
-# {{{ sub AsHREF - Converts Link URIs to HTTP URLs
-=head2 URI
+=item LastUpdated
+
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
 
-Takes a URI and returns an http: url to access that object.
 
 =cut
-sub AsHREF {
-    my $self=shift;
-    my $URI=shift;
-    if ($self->_IsLocal($URI)) {
-	my $url=$RT::WebURL . "Ticket/Display.html?id=$URI";
-	return($url);
-    } 
-    else {
-	my ($protocol) = $URI =~ m|(.*?)://|;
-	unless (exists $RT::URI2HTTP{$protocol}) {
-	    $RT::Logger->warning("Linking for protocol $protocol not defined in the config file!");
-	    return("");
-	}
-	return $RT::URI2HTTP{$protocol}->($URI);
-    }
-}
 
-# }}}
-
-# {{{ sub GetContent - gets the content from a link
-sub GetContent {
-    my ($self, $URI)= @_;
-    if ($self->_IsLocal($URI)) {
-	die "stub";
-    } else {
-	# Find protocol
-	if ($URI =~ m|^(.*?)://|) {
-	    if (exists $RT::ContentFromURI{$1}) {
-		return $RT::ContentFromURI{$1}->($URI);
-	    } else {
-		warn "No sub exists for fetching the content from a $1 in $URI";
-	    }
-	} else {
-	    warn "No protocol specified in $URI";
-	}
-    }
-}
-# }}}
 
-# {{{ sub CanonicalizeURI
+=item Creator
+
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
 
-=head2 CanonicalizeURI
 
-Takes a single argument: some form of ticket identifier. 
-Returns its canonicalized URI.
+=cut
+
+
+=item Created
+
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
 
-Bug: ticket aliases can't have :// in them. URIs must have :// in them.
 
 =cut
 
-sub CanonicalizeURI {
-    my $self = shift;
-    my $id = shift;
-    
-    
-    #If it's a local URI, load the ticket object and return its URI
-    if ($id =~ /^$RT::TicketBaseURI/) {
-	my $ticket = new RT::Ticket($self->CurrentUser);
-	$ticket->Load($id);
-	#If we couldn't find a ticket, return undef.
-	return undef unless (defined $ticket->Id);
-	#$RT::Logger->debug("$self -> CanonicalizeURI was passed $id and returned ".$ticket->URI ." (uri)\n");
-	return ($ticket->URI);
-    }
-    #If it's a remote URI, we're going to punt for now
-    elsif ($id =~ '://' ) {
-	return ($id);
-    }
-  
-    #If the base is an integer, load it as a ticket 
-    elsif ( $id =~ /^\d+$/ ) {
-	
-	#$RT::Logger->debug("$self -> CanonicalizeURI was passed $id. It's a ticket id.\n");
-	my $ticket = new RT::Ticket($self->CurrentUser);
-	$ticket->Load($id);
-	#If we couldn't find a ticket, return undef.
-	return undef unless (defined $ticket->Id);
-	#$RT::Logger->debug("$self returned ".$ticket->URI ." (id #)\n");
-	return ($ticket->URI);
-    }
-
-    #It's not a URI. It's not a numerical ticket ID
-    else { 
+
+
+sub _ClassAccessible {
+    {
      
-	#If we couldn't find a ticket, return undef.
-	return( undef);
-    
-    }
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        Base => 
+		{read => 1, write => 1, type => 'varchar(240)', default => ''},
+        Target => 
+		{read => 1, write => 1, type => 'varchar(240)', default => ''},
+        Type => 
+		{read => 1, write => 1, type => 'varchar(20)', default => ''},
+        LocalTarget => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        LocalBase => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
 
- 
-}
+ }
+};
+
+
+        eval "require RT::Link_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Link_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Link_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Link_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Link_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Link_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Link_Overlay, RT::Link_Vendor, RT::Link_Local
+
+=cut
 
-# }}}
 
 1;
- 
diff --git a/rt/lib/RT/Links.pm b/rt/lib/RT/Links.pm
index a8180caf0..7a1773af9 100644
--- a/rt/lib/RT/Links.pm
+++ b/rt/lib/RT/Links.pm
@@ -1,90 +1,115 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Links.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::Links - A collection of Link objects
+=head1 NAME
 
+  RT::Links -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::Links;
-  my $links = new RT::Links($CurrentUser);
+  use RT::Links
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Links);
-
-=end testing
-
 =cut
 
 package RT::Links;
-use RT::EasySearch;
+
+use RT::SearchBuilder;
 use RT::Link;
 
-@ISA= qw(RT::EasySearch);
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-# {{{ sub _Init  
-sub _Init   {
-  my $self = shift;
- 
-  $self->{'table'} = "Links";
-  $self->{'primary_key'} = "id";
 
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'Links';
+    $self->{'primary_key'} = 'id';
 
-  return ( $self->SUPER::_Init(@_));
-}
-# }}}
 
-# {{{ sub Limit 
-sub Limit  {
-    my $self = shift;
-    my %args = ( ENTRYAGGREGATOR => 'AND',
-		 OPERATOR => '=',
-		 @_);
-    
-    #if someone's trying to search for tickets, try to resolve the uris for searching.
-    
-    if (  ( $args{'OPERATOR'} eq '=') and
-	  ( $args{'FIELD'}  eq 'Base') or ($args{'FIELD'} eq 'Target')
-       ) {
-	my $dummy = $self->NewItem();
-	  $uri = $dummy->CanonicalizeURI($args{'VALUE'});
-    }
-
-
-    # If we're limiting by target, order by base
-    # (Order by the thing that's changing)
-
-    if ( ($args{'FIELD'} eq 'Target') or 
-	 ($args{'FIELD'} eq 'LocalTarget') ) {
-	$self->OrderBy (ALIAS => 'main',
-			FIELD => 'Base',
-			ORDER => 'ASC');
-    }
-    elsif ( ($args{'FIELD'} eq 'Base') or 
-	    ($args{'FIELD'} eq 'LocalBase') ) {
-	$self->OrderBy (ALIAS => 'main',
-			FIELD => 'Target',
-			ORDER => 'ASC');
-    }
-    
-
-    $self->SUPER::Limit(%args);
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
-# {{{ sub NewItem 
-sub NewItem  {
+
+=item NewItem
+
+Returns an empty new RT::Link item
+
+=cut
+
+sub NewItem {
     my $self = shift;
     return(RT::Link->new($self->CurrentUser));
 }
-# }}}
-  1;
 
+        eval "require RT::Links_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Links_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Links_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Links_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Links_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Links_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Links_Overlay, RT::Links_Vendor, RT::Links_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/ObjectKeyword.pm b/rt/lib/RT/ObjectKeyword.pm
deleted file mode 100644
index 287d41fab..000000000
--- a/rt/lib/RT/ObjectKeyword.pm
+++ /dev/null
@@ -1,192 +0,0 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/ObjectKeyword.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Released under the terms of the GNU Public License
-
-=head1 NAME
-
-  RT::ObjectKeyword -- a keyword tied to an object in the database
-
-=head1 SYNOPSIS
-
-  use RT::ObjectKeyword;
-
-
-=head1 DESCRIPTION
-
-This module should never be called directly by client code. it's an internal module which
-should only be accessed through exported APIs in Ticket, Queue and other similar objects.
-
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::ObjectKeyword);
-
-=end testing
-
-=head1 METHODS
-
-=cut
-
-package RT::ObjectKeyword;
-
-use strict;
-use vars qw(@ISA);
-use RT::Record;
-
-@ISA = qw(RT::Record);
-
-sub _Init {
-    my $self = shift;
-    $self->{'table'} = "ObjectKeywords";
-    $self->SUPER::_Init(@_);
-}
-
-sub _Accessible {
-    my $self = shift;
-    
-    my %cols = (
-		Keyword       => 'read/write', #link to the B<RT::Keyword>
-		KeywordSelect => 'read/write', #link to the B<RT::KeywordSelect>
-		ObjectType    => 'read/write', #currently only C<Ticket>
-		ObjectId      => 'read/write', #link to the object specified in I<ObjectType>
-	       );
-    return ($self->SUPER::_Accessible( @_, %cols));
-}
-
-
-
-# TODO - post 2.0. add in _Set and _Value, so we can ACL them.  protected at another API level
-
-
-=head1 NAME
-
- RT::ObjectKeyword - Manipulate an RT::ObjectKeyword record
-
-=head1 SYNOPSIS
-
-  use RT::ObjectKeyword;
-
-  my $keyword = RT::ObjectKeyword->new($CurrentUser);
-  $keyword->Create;
-
-=head1 DESCRIPTION
-
-An B<RT::ObjectKeyword> object associates an B<RT::Keyword> with another
-object (currently only B<RT::Ticket>.
-
-This module should B<NEVER> be called directly by client code. its API is entirely through RT ticket or other objects which can have keywords assigned.
-
-
-=head1 METHODS
-
-=over 4
-
-=item new CURRENT_USER
-
-Takes a single argument, an RT::CurrentUser object.  Instantiates a new
-(uncreated) RT::ObjectKeyword object.
-
-=cut
-
-# {{{ sub Create
-
-=item Create KEY => VALUE, ...
-
-Takes a list of key/value pairs and creates a the object.  Returns the id of
-the newly created record, or false if there was an error.
-
-Keys are:
-
-Keyword - link to the B<RT::Keyword>
-ObjectType - currently only C<Ticket>
-ObjectId - link to the object specified in I<ObjectType>
-
-=cut
-
-
-sub Create {
-    my $self = shift;
-    my %args = (Keyword => undef,
-		KeywordSelect => undef,
-		ObjectType => undef,
-		ObjectId => undef,
-		@_);
-    
-    #TODO post 2.0 ACL check
-    
-    return ($self->SUPER::Create( Keyword => $args{'Keyword'}, 
-				  KeywordSelect => $args{'KeywordSelect'},
-				  ObjectType => $args{'ObjectType'}, 
-				  ObjectId => $args{'ObjectId'}))
-}
-# }}}
-
-# {{{ sub KeywordObj
-
-=item KeywordObj 
-
-Returns an B<RT::Keyword> object of the Keyword associated with this ObjectKeyword.
-
-=cut
-
-sub KeywordObj {
-    my $self = shift;
-    my $keyword = new RT::Keyword($self->CurrentUser);
-    $keyword->Load($self->Keyword);
-    return ($keyword);
-}
-# }}}
-
-# {{{ sub KeywordSelectObj
-
-=item KeywordSelectObj 
-
-Returns an B<RT::KeywordSelect> object of the KeywordSelect associated with this ObjectKeyword.
-
-=cut
-
-sub KeywordSelectObj {
-    my $self = shift;
-    my $keyword_sel = new RT::KeywordSelect($self->CurrentUser);
-    $keyword_sel->Load($self->KeywordSelect);
-    return ($keyword_sel);
-}
-# }}}
-
-# {{{ sub KeywordRelativePath
-
-=item KeywordRelativePath
-
-Returns a string of the Keyword's path relative to this ObjectKeyword's KeywordSelect
-
-
-
-=cut
-
-sub KeywordRelativePath {
-    my $self = shift;
-    return($self->KeywordObj->RelativePath(
-              $self->KeywordSelectObj->KeywordObj->Path));
-    
-}
-# }}}
-
-=back
-
-=head1 AUTHOR
-
-Ivan Kohler <ivan-rt@420.am>
-
-=head1 BUGS
-
-Yes.
-
-=head1 SEE ALSO
-
-L<RT::ObjectKeywords>, L<RT::Keyword>, L<RT::Keywords>, L<RT::Ticket>,
-L<RT::Record>
-
-=cut
-
-1;
-
diff --git a/rt/lib/RT/ObjectKeywords.pm b/rt/lib/RT/ObjectKeywords.pm
deleted file mode 100644
index 5df996e37..000000000
--- a/rt/lib/RT/ObjectKeywords.pm
+++ /dev/null
@@ -1,234 +0,0 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/ObjectKeywords.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
-package RT::ObjectKeywords;
-
-use strict;
-use vars qw( @ISA );
-
-=head1 NAME
-
-	RT::ObjectKeywords - note warning
-
-=head1 WARNING
-
-This module should B<NEVER> be called directly by client code. its API is entirely through RT ticket or other objects which can have keywords assigned.
-
-=head1 SYNOPSIS
-
-=head1 DESCRIPTION
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::ObjectKeywords);
-
-=end testing
-
-=cut
-
-use RT::EasySearch;
-use RT::ObjectKeyword;
-
-@ISA = qw( RT::EasySearch );
-
-# {{{ sub _Init
-sub _Init {
-    my $self = shift;
-    $self->{'table'} = 'ObjectKeywords';
-    $self->{'primary_key'} = 'id';
-    return ($self->SUPER::_Init(@_));
-}
-# }}}
-
-# {{{ sub NewItem
-sub NewItem {
-    my $self = shift;
-    return (new RT::ObjectKeyword($self->CurrentUser));
-}
-# }}}
-
-# {{{ sub LimitToKeywordSelect
-
-=head2 LimitToKeywordSelect
-
-  Takes a B<RT::KeywordSelect> id or Nameas its single argument. limits the returned set of ObjectKeywords
-to ObjectKeywords which apply to that ticket
-
-=cut
-
-
-sub LimitToKeywordSelect {
-    my $self = shift;
-    my $keywordselect = shift;
-    
-    if ($keywordselect =~ /^\d+$/) {
-
-	$self->Limit(FIELD => 'KeywordSelect',
-		     OPERATOR => '=',
-		     ENTRYAGGREGATOR => 'OR',
-		     VALUE => "$keywordselect");
-    }
-
-    #We're limiting by name. time to be klever
-    else {
-	my $ks = $self->NewAlias('KeywordSelects');
-	$self->Join(ALIAS1 => $ks, FIELD1 => 'id',
-		    ALIAS2 => 'main', FIELD2 => 'KeywordSelect');
-	
-	$self->Limit( ALIAS => "$ks",
-		       FIELD => 'Name',
-		       VALUE => "$keywordselect",
-		       OPERATOR => "=",
-		       ENTRYAGGREGATOR => "OR");
-
-	$self->Limit ( ALIAS => "$ks",
-		       FIELD => 'ObjectType',
-		       VALUE => 'Ticket',
-		       OPERATOR => '=',
-		     );
-
-	$self->Limit ( ALIAS => "$ks",
-		       FIELD => 'ObjectField',
-		       VALUE => 'Queue',
-		       OPERATOR => '=',
-		     );
-
-
-	# TODO +++ we need to be able to limit the returned
-	# keywordselects to ones that apply only to this queue
-	#	$self->Limit( ALIAS => "$ks",
-	#		       FIELD => 'ObjectValue',
-	#		       VALUE => $self->QueueObj->Id,
-	#		       OPERATOR => "=",
-	#		       ENTRYAGGREGATOR => "OR");	
-
-    }
-
-
-
-}
-
-# }}}
-
-# {{{ LimitToTicket
-
-=head2 LimitToTicket TICKET_ID
-
-  Takes an B<RT::Ticket> id as its single argument. limits the returned set of ObjectKeywords
-to ObjectKeywords which apply to that ticket
-
-=cut
-
-sub LimitToTicket {
-    my $self = shift;
-    my $ticket = shift;
-    $self->Limit(FIELD => 'ObjectId',
-		 OPERATOR => '=',
-		 ENTRYAGGREGATOR => 'OR',
-		 VALUE => "$ticket");
-
-    $self->Limit(FIELD => 'ObjectType',
-		 OPERATOR => '=',
-		 ENTRYAGGREGATOR => 'OR',
-		 VALUE => "Ticket");
-    
-}
-
-# }}}
-
-# {{{ sub _DoSearch
-#wrap around _DoSearch  so that we can build the hash of returned
-#values 
-
-sub _DoSearch {
-    my $self = shift;
-   # $RT::Logger->debug("Now in ".$self."->_DoSearch");
-    my $return = $self->SUPER::_DoSearch(@_);
-  #  $RT::Logger->debug("In $self ->_DoSearch. return from SUPER::_DoSearch was $return\n");
-    $self->_BuildHash();
-    return ($return);
-}
-# }}}
-
-# {{{ sub _BuildHash
-#Build a hash of this ACL's entries.
-sub _BuildHash {
-    my $self = shift;
-
-    while (my $entry = $self->Next) {
-
-	my $hashkey = $entry->Keyword;
-        $self->{'as_hash'}->{"$hashkey"} =1;
-    }
-
-}
-# }}}
-
-# {{{ HasEntry
-
-=head2 HasEntry KEYWORD_ID
-  
-  Takes a keyword id and returns true if this ObjectKeywords object has an entry for that
-keyword.  Returns undef otherwise.
-
-=cut
-
-sub HasEntry {
-
-    my $self = shift;
-    my $keyword = shift;
-
-
-    #if we haven't done the search yet, do it now.
-    $self->_DoSearch();
-    
-    #    $RT::Logger->debug("Now in ".$self."->HasEntry\n");
-    
-    
-    if ($self->{'as_hash'}->{ $keyword } == 1) {
-	return(1);
-    }
-    else {
-	return(undef);
-    }
-}
-
-# }}}
-
-# {{{ sub RelativePaths
-
-=head2 RelativePaths
-
-# Return a (reference to a) list of KeywordRelativePaths
-
-=cut
-
-sub RelativePaths  {
-    my $self = shift;
-
-    my @list;
-
-    # Here $key is a RT::ObjectKeyword
-    while (my $key=$self->Next()) {
-	push(@list, $key->KeywordRelativePath);
-    }
-    return(\@list);
-}
-# }}}
-
-# {{{ sub RelativePathsAsString
-
-=head2 RelativePathsAsString
-
-# Returns the RT::ObjectKeywords->RelativePaths as a comma seperated string
-
-=cut
-
-sub RelativePathsAsString {
-    my $self = shift;
-    return(join(", ",@{$self->KeywordRelativePaths}));
-}
-# }}}
-
-1;
-
diff --git a/rt/lib/RT/Queue.pm b/rt/lib/RT/Queue.pm
index 1656903b3..b362c9f0d 100755
--- a/rt/lib/RT/Queue.pm
+++ b/rt/lib/RT/Queue.pm
@@ -1,944 +1,371 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Queue.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::Queue - an RT Queue object
+RT::Queue
 
-=head1 SYNOPSIS
 
-  use RT::Queue;
+=head1 SYNOPSIS
 
 =head1 DESCRIPTION
 
-
 =head1 METHODS
 
-=begin testing 
-use RT::TestHarness;
-
-use RT::Queue;
-
-=end testing
-
 =cut
 
-
-
 package RT::Queue;
-use RT::Record;
-
-@ISA= qw(RT::Record);
-
-use vars (@STATUS);
-
-@STATUS = qw(new open stalled resolved dead); 
-
-=head2 StatusArray
-
-Returns an array of all statuses for this queue
-
-=cut
-
-sub StatusArray {
-    my $self = shift;
-    return (@STATUS);
-}
-
-
-=head2 IsValidStatus VALUE
-
-Returns true if VALUE is a valid status.  Otherwise, returns 0
-
-=for testing
-my $q = new RT::Queue($RT::SystemUser);
-ok($q->IsValidStatus('new')== 1, 'New is a valid status');
-ok($q->IsValidStatus('f00')== 0, 'f00 is not a valid status');
-
-=cut
-
-sub IsValidStatus {
-	my $self = shift;
-	my $value = shift;
-
-	my $retval = grep (/^$value$/, $self->StatusArray);
- 	return ($retval);	
-
-}
-	
-
-
-
-# {{{  sub _Init 
-sub _Init  {
-    my $self = shift;
-    $self->{'table'} = "Queues";
-    return ($self->SUPER::_Init(@_));
-}
-# }}}
-
-# {{{ sub _Accessible 
-
-sub _Accessible  {
-    my $self = shift;
-    my %Cols = ( Name => 'read/write',
-		 CorrespondAddress => 'read/write',
-		 Description => 'read/write',
-		 CommentAddress =>  'read/write',
-		 InitialPriority =>  'read/write',
-		 FinalPriority =>  'read/write',
-		 DefaultDueIn =>  'read/write',
-		 Creator => 'read/auto',
-		 Created => 'read/auto',
-		 LastUpdatedBy => 'read/auto',
-		 LastUpdated => 'read/auto',
-		 Disabled => 'read/write',
-		 
-	       );
-    return($self->SUPER::_Accessible(@_, %Cols));
-}
-
-# }}}
+use RT::Record; 
 
-# {{{ sub Create
 
-=head2 Create
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
 
-Create takes the name of the new queue 
-If you pass the ACL check, it creates the queue and returns its queue id.
+sub _Init {
+  my $self = shift; 
 
-=cut
-
-sub Create  {
-    my $self = shift;
-    my %args = ( Name => undef,
-		 CorrespondAddress => '',
-		 Description => '',
-		 CommentAddress => '',
-		 InitialPriority => "0",
-		 FinalPriority =>  "0",
-		 DefaultDueIn =>  "0",
-		 @_); 
-    
-    unless ($self->CurrentUser->HasSystemRight('AdminQueue')) {    #Check them ACLs
-	return (0, "No permission to create queues") 
-    }
-
-    unless ($self->ValidateName($args{'Name'})) {
-	return(0, 'Queue already exists');
-    }
-    #TODO better input validation
-    
-    my $id = $self->SUPER::Create(%args);
-    unless ($id) {
-	return (0, 'Queue could not be created');
-    }
-
-    return ($id, "Queue $id created");
+  $self->Table('Queues');
+  $self->SUPER::_Init(@_);
 }
 
-# }}}
 
-# {{{ sub Delete 
 
-sub Delete {
-    my $self = shift;
-    return (0, 'Deleting this object would break referential integrity');
-}
 
-# }}}
 
-# {{{ sub SetDisabled
+=item Create PARAMHASH
 
-=head2 SetDisabled
+Create takes a hash of values and creates a row in the database:
 
-Takes a boolean.
-1 will cause this queue to no longer be avaialble for tickets.
-0 will re-enable this queue
+  varchar(200) 'Name'.
+  varchar(255) 'Description'.
+  varchar(120) 'CorrespondAddress'.
+  varchar(120) 'CommentAddress'.
+  int(11) 'InitialPriority'.
+  int(11) 'FinalPriority'.
+  int(11) 'DefaultDueIn'.
+  smallint(6) 'Disabled'.
 
 =cut
 
-# }}}
 
-# {{{ sub Load 
 
-=head2 Load
 
-Takes either a numerical id or a textual Name and loads the specified queue.
-  
-=cut
-
-sub Load  {
+sub Create {
     my $self = shift;
-    
-    my $identifier = shift;
-    if (!$identifier) {
-	return (undef);
-    }	    
-    
-    if ($identifier !~ /\D/) {
-	$self->SUPER::LoadById($identifier);
-    }
-    else {
-	$self->LoadByCol("Name", $identifier);
-    }
-
-    return ($self->Id);
+    my %args = ( 
+                Name => '',
+                Description => '',
+                CorrespondAddress => '',
+                CommentAddress => '',
+                InitialPriority => '0',
+                FinalPriority => '0',
+                DefaultDueIn => '0',
+                Disabled => '0',
 
+		  @_);
+    $self->SUPER::Create(
+                         Name => $args{'Name'},
+                         Description => $args{'Description'},
+                         CorrespondAddress => $args{'CorrespondAddress'},
+                         CommentAddress => $args{'CommentAddress'},
+                         InitialPriority => $args{'InitialPriority'},
+                         FinalPriority => $args{'FinalPriority'},
+                         DefaultDueIn => $args{'DefaultDueIn'},
+                         Disabled => $args{'Disabled'},
+);
 
 }
-# }}}
 
-# {{{ sub ValidateName
 
-=head2 ValidateName NAME
 
-Takes a queue name. Returns true if it's an ok name for
-a new queue. Returns undef if there's already a queue by that name.
+=item id
 
-=cut
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
 
-sub ValidateName {
-    my $self = shift;
-    my $name = shift;
-   
-    my $tempqueue = new RT::Queue($RT::SystemUser);
-    $tempqueue->Load($name);
-
-    #If we couldn't load it :)
-    unless ($tempqueue->id()) {
-	return(1);
-    }
-
-    #If this queue exists, return undef
-    #Avoid the ACL check.
-    if ($tempqueue->Name()){
-        return(undef);
-    }
-
-    #If the queue doesn't exist, return 1
-    else {
-        return(1);
-    }
-
-}
-
-
-# }}}
-
-# {{{ sub Templates
-
-=head2 Templates
-
-Returns an RT::Templates object of all of this queue's templates.
 
 =cut
 
-sub Templates {
-    my $self = shift;
-    
 
-    my $templates = RT::Templates->new($self->CurrentUser);
+=item Name
 
-    if ($self->CurrentUserHasRight('ShowTemplate')) {
-	$templates->LimitToQueue($self->id);
-    }
-    
-    return ($templates); 
-}
-
-# }}}
+Returns the current value of Name. 
+(In the database, Name is stored as varchar(200).)
 
-# {{{ Dealing with watchers
 
-# {{{ sub Watchers
 
-=head2 Watchers
+=item SetName VALUE
 
-Watchers returns a Watchers object preloaded with this queue\'s watchers.
 
-=cut
+Set Name to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Name will be stored as a varchar(200).)
 
-sub Watchers {
-    my $self = shift;
-    
-    require RT::Watchers;
-    my $watchers =RT::Watchers->new($self->CurrentUser);
-    
-    if ($self->CurrentUserHasRight('SeeQueue')) {
-	$watchers->LimitToQueue($self->id);	
-    }	
-    
-    return($watchers);
-}
-
-# }}}
-
-# {{{ sub WatchersAsString
-=head2 WatchersAsString
-
-Returns a string of all queue watchers email addresses concatenated with ','s.
 
 =cut
 
-sub WatchersAsString {
-    my $self=shift;
-    return($self->Watchers->EmailsAsString());
-}
-
-# }}}
-
-# {{{ sub AdminCcAsString 
 
-=head2 AdminCcAsString
+=item Description
 
-Takes nothing. returns a string: All Ticket/Queue AdminCcs.
+Returns the current value of Description. 
+(In the database, Description is stored as varchar(255).)
 
-=cut
 
 
-sub AdminCcAsString {
-    my $self=shift;
-    
-    return($self->AdminCc->EmailsAsString());
-  }
+=item SetDescription VALUE
 
-# }}}
 
-# {{{ sub CcAsString
+Set Description to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Description will be stored as a varchar(255).)
 
-=head2 CcAsString
-
-B<Returns> String: All Queue Ccs as a comma delimited set of email addresses.
 
 =cut
 
-sub CcAsString {
-    my $self=shift;
-    
-    return ($self->Cc->EmailsAsString());
-}
-
-# }}}
-
-# {{{ sub Cc
-
-=head2 Cc
-
-Takes nothing.
-Returns a watchers object which contains this queue\'s Cc watchers
 
-=cut
+=item CorrespondAddress
 
-sub Cc {
-    my $self = shift;
-    my $cc = $self->Watchers();
-    if ($self->CurrentUserHasRight('SeeQueue')) {
-	$cc->LimitToCc();
-    }
-    return ($cc);
-}
+Returns the current value of CorrespondAddress. 
+(In the database, CorrespondAddress is stored as varchar(120).)
 
-# A helper function for Cc, so that we can call it from the ACL checks 
-# without going through acl checks.
 
-sub _Cc {
-    my $self = shift;
-    my $cc = $self->Watchers();
-    $cc->LimitToCc();
-    return($cc);
-    
-}
 
-# }}}
+=item SetCorrespondAddress VALUE
 
-# {{{ sub AdminCc
 
-=head2 AdminCc
+Set CorrespondAddress to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, CorrespondAddress will be stored as a varchar(120).)
 
-Takes nothing.
-Returns this queue's administrative Ccs as an RT::Watchers object
 
 =cut
 
-sub AdminCc {
-    my $self = shift;
-    my $admin_cc = $self->Watchers();
-    if ($self->CurrentUserHasRight('SeeQueue')) {
- 	$admin_cc->LimitToAdminCc();
-    }
-    return($admin_cc);
-}
-
-#helper function for AdminCc so we can call it without ACLs
-sub _AdminCc {
-    my $self = shift;
-    my $admin_cc = $self->Watchers();
-    $admin_cc->LimitToAdminCc();
-    return($admin_cc);
-}
 
-# }}}
+=item CommentAddress
 
-# {{{ IsWatcher, IsCc, IsAdminCc
-
-# {{{ sub IsWatcher
-
-# a generic routine to be called by IsRequestor, IsCc and IsAdminCc
-
-=head2 IsWatcher
-
-Takes a param hash with the attributes Type and User. User is either a user object or string containing an email address. Returns true if that user or string
-is a queue watcher. Returns undef otherwise
-
-=cut
-
-sub IsWatcher {
-    my $self = shift;
-    
-    my %args = ( Type => 'Requestor',
-		 Id => undef,
-		 Email => undef,
-		 @_
-	       );
-    #ACL check - can't do it. we need this method for ACL checks
-    #    unless ($self->CurrentUserHasRight('SeeQueue')) {
-    #	return(undef);
-    #    }
-
-
-    my %cols = ('Type' => $args{'Type'},
-		'Scope' => 'Queue',
-		'Value' => $self->Id
-	       );
-    if (defined ($args{'Id'})) {
-	if (ref($args{'Id'})){ #If it's a ref, assume it's an RT::User object;
-	    #Dangerous but ok for now
-	    $cols{'Owner'} = $args{'Id'}->Id;
-	}
-	elsif ($args{'Id'} =~ /^\d+$/) { # if it's an integer, it's an RT::User obj
-	    $cols{'Owner'} = $args{'Id'};
-	}
-	else {
-	    $cols{'Email'} = $args{'Id'};
-	}	
-    }	
-    
-    if (defined $args{'Email'}) {
-	$cols{'Email'} = $args{'Email'};
-    }
-
-    my ($description);
-    $description = join(":",%cols);
-    
-    #If we've cached a positive match...
-    if (defined $self->{'watchers_cache'}->{"$description"}) {
-	if ($self->{'watchers_cache'}->{"$description"} == 1) {
-	    return(1);
-	}
-	#If we've cached a negative match...
-	else {
-	    return(undef);
-	}
-    }
-
-    require RT::Watcher;
-    my $watcher = new RT::Watcher($self->CurrentUser);
-    $watcher->LoadByCols(%cols);
-    
-    
-    if ($watcher->id) {
-	$self->{'watchers_cache'}->{"$description"} = 1;
-	return(1);
-    }	
-    else {
-	$self->{'watchers_cache'}->{"$description"} = 0;
-	return(undef);
-    }
-    
-}
+Returns the current value of CommentAddress. 
+(In the database, CommentAddress is stored as varchar(120).)
 
-# }}}
 
-# {{{ sub IsCc
 
-=head2 IsCc
+=item SetCommentAddress VALUE
 
-Takes a string. Returns true if the string is a Cc watcher of the current queue
 
-=item Bugs
+Set CommentAddress to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, CommentAddress will be stored as a varchar(120).)
 
-Should also be able to handle an RT::User object
 
 =cut
 
 
-sub IsCc {
-  my $self = shift;
-  my $cc = shift;
-  
-  return ($self->IsWatcher( Type => 'Cc', Id => $cc ));
-  
-}
-
-# }}}
-
-# {{{ sub IsAdminCc
-
-=head2 IsAdminCc
-
-Takes a string. Returns true if the string is an AdminCc watcher of the current queue
+=item InitialPriority
 
-=item Bugs
+Returns the current value of InitialPriority. 
+(In the database, InitialPriority is stored as int(11).)
 
-Should also be able to handle an RT::User object
-
-=cut
-
-sub IsAdminCc {
-  my $self = shift;
-  my $admincc = shift;
-  
-  return ($self->IsWatcher( Type => 'AdminCc', Id => $admincc ));
-  
-}
 
-# }}}
 
-# }}}
+=item SetInitialPriority VALUE
 
-# {{{ sub AddWatcher
 
-=head2 AddWatcher
+Set InitialPriority to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, InitialPriority will be stored as a int(11).)
 
-Takes a paramhash of Email, Owner and Type. Type is one of 'Cc' or 'AdminCc',
-We need either an Email Address in Email or a userid in Owner
 
 =cut
 
-sub AddWatcher {
-    my $self = shift;
-    my %args = ( Email => undef,
-		 Type => undef,
-		 Owner => 0,
-		 @_
-	       );
-    
-    # {{{ Check ACLS
-    #If the watcher we're trying to add is for the current user
-    if ( ( ( defined $args{'Email'})  && 
-           ( $args{'Email'} eq $self->CurrentUser->EmailAddress) ) or 
-	 ($args{'Owner'} eq $self->CurrentUser->Id)) {
-	
-	#  If it's an AdminCc and they don't have 
-	#   'WatchAsAdminCc' or 'ModifyQueueWatchers', bail
-	if ($args{'Type'} eq 'AdminCc') {
-	    unless ($self->CurrentUserHasRight('ModifyQueueWatchers') or 
-		    $self->CurrentUserHasRight('WatchAsAdminCc')) {
-		return(0, 'Permission Denied');
-	    }
-	}
-
-	#  If it's a Requestor or Cc and they don't have
-	#   'Watch' or 'ModifyQueueWatchers', bail
-	elsif ($args{'Type'} eq 'Cc') {
-	    unless ($self->CurrentUserHasRight('ModifyQueueWatchers') or 
-		    $self->CurrentUserHasRight('Watch')) {
-		return(0, 'Permission Denied');
-	    }
-	}
-	else {
-	    $RT::Logger->warn("$self -> AddWatcher hit code".
-			      " it never should. We got passed ".
-			      " a type of ". $args{'Type'});
-	    return (0,'Error in parameters to $self AddWatcher');
-	}
-    }
-    # If the watcher isn't the current user 
-    # and the current user  doesn't have 'ModifyQueueWatchers'
-    # bail
-    else {
-	unless ($self->CurrentUserHasRight('ModifyQueueWatchers')) {
-	    return (0, "Permission Denied");
-	}
-    }
-    # }}}
-        
-    require RT::Watcher;
-    my $Watcher = new RT::Watcher ($self->CurrentUser);
-    return ($Watcher->Create(Scope => 'Queue', 
-			     Value => $self->Id,
-			     Email => $args{'Email'},
-			     Type => $args{'Type'},
-			     Owner => $args{'Owner'}
-			    ));
-}
 
-# }}}
+=item FinalPriority
 
-# {{{ sub AddCc
+Returns the current value of FinalPriority. 
+(In the database, FinalPriority is stored as int(11).)
 
-=head2 AddCc
 
-Add a Cc to this queue.
-Takes a paramhash of Email and Owner. 
-We need either an Email Address in Email or a userid in Owner
 
-=cut
+=item SetFinalPriority VALUE
 
 
-sub AddCc {
-    my $self = shift;
-    return ($self->AddWatcher( Type => 'Cc', @_));
-}
-# }}}
+Set FinalPriority to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, FinalPriority will be stored as a int(11).)
 
-# {{{ sub AddAdminCc
-
-=head2 AddAdminCc
-
-Add an Administrative Cc to this queue.
-Takes a paramhash of Email and Owner. 
-We need either an Email Address in Email or a userid in Owner
 
 =cut
 
-sub AddAdminCc {
-    my $self = shift;
-    return ($self->AddWatcher( Type => 'AdminCc', @_));
-}
-# }}}
-
-# {{{ sub DeleteWatcher
-
-=head2 DeleteWatcher id [type]
 
-DeleteWatcher takes a single argument which is either an email address 
-or a watcher id.  
-If the first argument is an email address, you need to specify the watcher type you're talking
-about as the second argument. Valid values are 'Cc' or 'AdminCc'.
-It removes that watcher from this Queue\'s list of watchers.
+=item DefaultDueIn
 
+Returns the current value of DefaultDueIn. 
+(In the database, DefaultDueIn is stored as int(11).)
 
-=cut
 
 
-sub DeleteWatcher {
-    my $self = shift;
-    my $id = shift;
-    
-    my $type;
-    
-    $type = shift if (@_);
-    
-
-    require RT::Watcher;
-    my $Watcher = new RT::Watcher($self->CurrentUser);
-    
-    #If it\'s a numeric watcherid
-    if ($id =~ /^(\d*)$/) {
-	$Watcher->Load($id);
-    }
-    
-    #Otherwise, we'll assume it's an email address
-    elsif ($type) {
-	my ($result, $msg) = 
-	  $Watcher->LoadByValue( Email => $id,
-				 Scope => 'Queue',
-				 Value => $self->id,
-				 Type => $type);
-	return (0,$msg) unless ($result);
-    }
-    
-    else {
-	return(0,"Can\'t delete a watcher by email address without specifying a type");
-    }
-    
-    # {{{ Check ACLS 
-
-    #If the watcher we're trying to delete is for the current user
-    if ($Watcher->Email eq $self->CurrentUser->EmailAddress) {
-		
-	#  If it's an AdminCc and they don't have 
-	#   'WatchAsAdminCc' or 'ModifyQueueWatchers', bail
-	if ($Watcher->Type eq 'AdminCc') {
-	    unless ($self->CurrentUserHasRight('ModifyQueueWatchers') or 
-		    $self->CurrentUserHasRight('WatchAsAdminCc')) {
-		return(0, 'Permission Denied');
-	    }
-	}
-
-	#  If it's a  Cc and they don't have
-	#   'Watch' or 'ModifyQueueWatchers', bail
-	elsif ($Watcher->Type eq 'Cc') {
-	    unless ($self->CurrentUserHasRight('ModifyQueueWatchers') or 
-		    $self->CurrentUserHasRight('Watch')) {
-		return(0, 'Permission Denied');
-	    }
-	}
-	else {
-	    $RT::Logger->warn("$self -> DeleteWatcher hit code".
-			      " it never should. We got passed ".
-			      " a type of ". $args{'Type'});
-	    return (0,'Error in parameters to $self DeleteWatcher');
-	}
-    }
-    # If the watcher isn't the current user 
-    # and the current user  doesn't have 'ModifyQueueWatchers'
-    # bail
-    else {
-	unless ($self->CurrentUserHasRight('ModifyQueueWatchers')) {
-	    return (0, "Permission Denied");
-	}
-    }
-
-    # }}}
-    
-    unless (($Watcher->Scope eq 'Queue') and
-	    ($Watcher->Value == $self->id) ) {
-	return (0, "Not a watcher for this queue");
-    }
-    
-
-    #Clear out the watchers hash.
-    $self->{'watchers'} = undef;
-    
-    my $retval = $Watcher->Delete();
-    
-    unless ($retval) {
-	return(0,"Watcher could not be deleted.");
-    }
-    
-    return(1, "Watcher deleted");
-}
-
-# {{{ sub DeleteCc
+=item SetDefaultDueIn VALUE
 
-=head2 DeleteCc EMAIL
 
-Takes an email address. It calls DeleteWatcher with a preset 
-type of 'Cc'
+Set DefaultDueIn to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, DefaultDueIn will be stored as a int(11).)
 
 
 =cut
 
-sub DeleteCc {
-   my $self = shift;
-   my $id = shift;
-   return ($self->DeleteWatcher ($id, 'Cc'))
-}
-
-# }}}
 
-# {{{ sub DeleteAdminCc
+=item Creator
 
-=head2 DeleteAdminCc EMAIL
-
-Takes an email address. It calls DeleteWatcher with a preset 
-type of 'AdminCc'
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
 
 
 =cut
 
-sub DeleteAdminCc {
-   my $self = shift;
-   my $id = shift;
-   return ($self->DeleteWatcher ($id, 'AdminCc'))
-}
 
-# }}}
+=item Created
 
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
 
-# }}}
-
-# }}}
-
-# {{{ Dealing with keyword selects
-
-# {{{ sub AddKeywordSelect
-
-=head2 AddKeywordSelect
-
-Takes a paramhash of Name, Keyword, Depth and Single.  Adds a new KeywordSelect for 
-this queue with those attributes.
 
 =cut
 
 
-sub AddKeywordSelect {
-    my $self = shift;
-    my %args = ( Keyword => undef,
-		 Depth => undef,
-		 Single => undef,
-		 Name => undef,
-		 @_);
-    
-    #ACLS get handled in KeywordSelect
-    my $NewKeywordSelect = new RT::KeywordSelect($self->CurrentUser);
-    
-    return ($NewKeywordSelect->Create (Keyword => $args{'Keyword'},
-			       Depth => $args{'Depth'},
-			       Name => $args{'Name'},
-			       Single => $args{'Single'},
-			       ObjectType => 'Ticket',
-			       ObjectField => 'Queue',
-			       ObjectValue => $self->Id()
-			      )	);
-}
-
-# }}}
-
-# {{{ sub KeywordSelect
+=item LastUpdatedBy
 
-=head2 KeywordSelect([NAME])
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
 
-Takes the name of a keyword select for this queue or that's global.
-Returns the relevant KeywordSelect object.  Prefers a keywordselect that's 
-specific to this queue over a global one.  If it can't find the proper
-Keword select or the user doesn't have permission, returns an empty 
-KeywordSelect object
 
 =cut
 
-sub KeywordSelect {
-    my $self = shift;
-    my $name = shift;
-    
-    require RT::KeywordSelect;
-
-    my $select = RT::KeywordSelect->new($self->CurrentUser);
-    if ($self->CurrentUserHasRight('SeeQueue')) {
-	$select->LoadByName( Name => $name, Queue => $self->Id);
-    }
-    return ($select);
-}
-
 
-# }}}
+=item LastUpdated
 
-# {{{ sub KeywordSelects
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
 
-=head2 KeywordSelects
-
-Returns an B<RT::KeywordSelects> object containing the collection of
-B<RT::KeywordSelect> objects which apply to this queue. (Both queue specific keyword selects
-and global keyword selects.
 
 =cut
 
-sub KeywordSelects {
-  my $self = shift;
 
+=item Disabled
 
-  use RT::KeywordSelects;
-  my $KeywordSelects = new RT::KeywordSelects($self->CurrentUser);
+Returns the current value of Disabled. 
+(In the database, Disabled is stored as smallint(6).)
 
-  if ($self->CurrentUserHasRight('SeeQueue')) {
-      $KeywordSelects->LimitToQueue($self->id);
-      $KeywordSelects->IncludeGlobals();
-  }
-  return ($KeywordSelects);
-}
-# }}}
 
-# }}}
 
-# {{{ ACCESS CONTROL
+=item SetDisabled VALUE
 
-# {{{ sub ACL 
 
-=head2 ACL
+Set Disabled to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Disabled will be stored as a smallint(6).)
 
-#Returns an RT::ACL object of ACEs everyone who has anything to do with this queue.
 
 =cut
 
-sub ACL  {
-    my $self = shift;
-    
-    use RT::ACL;
-    my $acl = new RT::ACL($self->CurrentUser);
-    
-    if ($self->CurrentUserHasRight('ShowACL')) {
-	$acl->LimitToQueue($self->Id);
-    }
-    
-    return ($acl);
-}
-
-# }}}
-
-# {{{ sub _Set
-sub _Set {
-    my $self = shift;
 
-    unless ($self->CurrentUserHasRight('AdminQueue')) {
-	return(0, 'Permission Denied');
-    }	
-    return ($self->SUPER::_Set(@_));
-}
-# }}}
 
-# {{{ sub _Value
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        Name => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Description => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        CorrespondAddress => 
+		{read => 1, write => 1, type => 'varchar(120)', default => ''},
+        CommentAddress => 
+		{read => 1, write => 1, type => 'varchar(120)', default => ''},
+        InitialPriority => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        FinalPriority => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        DefaultDueIn => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        Disabled => 
+		{read => 1, write => 1, type => 'smallint(6)', default => '0'},
 
-sub _Value {
-    my $self = shift;
+ }
+};
 
-    unless ($self->CurrentUserHasRight('SeeQueue')) {
-	return (undef);
-    }
 
-    return ($self->__Value(@_));
-}
+        eval "require RT::Queue_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Queue_Overlay.pm}) {
+            die $@;
+        };
 
-# }}}
+        eval "require RT::Queue_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Queue_Vendor.pm}) {
+            die $@;
+        };
 
-# {{{ sub CurrentUserHasRight
+        eval "require RT::Queue_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Queue_Local.pm}) {
+            die $@;
+        };
 
-=head2 CurrentUserHasRight
 
-Takes one argument. A textual string with the name of the right we want to check.
-Returns true if the current user has that right for this queue.
-Returns undef otherwise.
 
-=cut
 
-sub CurrentUserHasRight {
-  my $self = shift;
-  my $right = shift;
+=head1 SEE ALSO
 
-  return ($self->HasRight( Principal=> $self->CurrentUser,
-                            Right => "$right"));
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
-}
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-# }}}
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
-# {{{ sub HasRight
+   no warnings qw(redefine);
 
-=head2 HasRight
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
-Takes a param hash with the fields 'Right' and 'Principal'.
-Principal defaults to the current user.
-Returns true if the principal has that right for this queue.
-Returns undef otherwise.
+RT::Queue_Overlay, RT::Queue_Vendor, RT::Queue_Local
 
 =cut
 
-# TAKES: Right and optional "Principal" which defaults to the current user
-sub HasRight {
-    my $self = shift;
-        my %args = ( Right => undef,
-                     Principal => $self->CurrentUser,
-                     @_);
-        unless(defined $args{'Principal'}) {
-                $RT::Logger->debug("Principal undefined in Queue::HasRight");
-
-        }
-        return($args{'Principal'}->HasQueueRight(QueueObj => $self,
-          Right => $args{'Right'}));
-}
-# }}}
-
-# }}}
 
 1;
diff --git a/rt/lib/RT/Queues.pm b/rt/lib/RT/Queues.pm
index ab58d8d6d..60aec9086 100755
--- a/rt/lib/RT/Queues.pm
+++ b/rt/lib/RT/Queues.pm
@@ -1,123 +1,115 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Queues.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::Queues - a collection of RT::Queue objects
+=head1 NAME
 
+  RT::Queues -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::Queues;
+  use RT::Queues
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Queues);
-
-=end testing
-
 =cut
 
 package RT::Queues;
-use RT::EasySearch;
-@ISA= qw(RT::EasySearch);
 
+use RT::SearchBuilder;
+use RT::Queue;
 
-# {{{ sub _Init
-sub _Init { 
-  my $self = shift;
-  $self->{'table'} = "Queues";
-  $self->{'primary_key'} = "id";
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-  # By default, order by name
-  $self->OrderBy( ALIAS => 'main',
-		  FIELD => 'Name',
-		  ORDER => 'ASC');
 
-  return ($self->SUPER::_Init(@_));
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'Queues';
+    $self->{'primary_key'} = 'id';
+
+
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
-# {{{ sub _DoSearch 
 
-=head2 _DoSearch
+=item NewItem
 
-  A subclass of DBIx::SearchBuilder::_DoSearch that makes sure that _Disabled rows never get seen unless
-we're explicitly trying to see them.
+Returns an empty new RT::Queue item
 
 =cut
 
-sub _DoSearch {
+sub NewItem {
     my $self = shift;
-    
-    #unless we really want to find disabled rows, make sure we\'re only finding enabled ones.
-    unless($self->{'find_disabled_rows'}) {
-	$self->LimitToEnabled();
-    }
-    
-    return($self->SUPER::_DoSearch(@_));
-    
+    return(RT::Queue->new($self->CurrentUser));
 }
 
-# }}}
-  
+        eval "require RT::Queues_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Queues_Overlay.pm}) {
+            die $@;
+        };
 
-# {{{ sub Limit 
-sub Limit  {
-  my $self = shift;
-  my %args = ( ENTRYAGGREGATOR => 'AND',
-	       @_);
-  $self->SUPER::Limit(%args);
-}
-# }}}
+        eval "require RT::Queues_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Queues_Vendor.pm}) {
+            die $@;
+        };
 
-# {{{ sub NewItem 
-sub NewItem  {
-  my $self = shift;
-  my $item;
+        eval "require RT::Queues_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Queues_Local.pm}) {
+            die $@;
+        };
 
-  use RT::Queue;
-  $item = new RT::Queue($self->CurrentUser);
-  return($item);
-}
-# }}}
 
-# {{{ sub Next 
 
-=head2 Next
 
-Returns the next queue that this user can see.
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Queues_Overlay, RT::Queues_Vendor, RT::Queues_Local
 
 =cut
-  
-sub Next {
-    my $self = shift;
-    
-    
-    my $Queue = $self->SUPER::Next();
-    if ((defined($Queue)) and (ref($Queue))) {
-
-	if ($Queue->CurrentUserHasRight('SeeQueue')) {
-	    return($Queue);
-	}
-	
-	#If the user doesn't have the right to show this queue
-	else {	
-	    return($self->Next());
-	}
-    }
-    #if there never was any queue
-    else {
-	return(undef);
-    }	
-    
-}
-# }}}
 
-1;
 
+1;
diff --git a/rt/lib/RT/Record.pm b/rt/lib/RT/Record.pm
index 5340f7de4..6962221ea 100755
--- a/rt/lib/RT/Record.pm
+++ b/rt/lib/RT/Record.pm
@@ -1,5 +1,26 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Record.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 =head1 NAME
 
   RT::Record - Base class for RT record objects
@@ -20,20 +41,31 @@ ok (require RT::Record);
 
 =cut
 
-
 package RT::Record;
-use DBIx::SearchBuilder::Record::Cachable;
 use RT::Date;
 use RT::User;
 
-@ISA= qw(DBIx::SearchBuilder::Record::Cachable);
+use RT::Base;
+use DBIx::SearchBuilder::Record::Cachable;
+
+use strict;
+use vars qw/@ISA/;
+
+@ISA = qw(RT::Base);
+
+if ($RT::DontCacheSearchBuilderRecords ) {
+    push (@ISA, 'DBIx::SearchBuilder::Record');
+} else {
+    push (@ISA, 'DBIx::SearchBuilder::Record::Cachable');
+
+}
 
 # {{{ sub _Init 
 
-sub _Init  {
-  my $self = shift;
-  $self->_MyCurrentUser(@_);
-  
+sub _Init {
+    my $self = shift;
+    $self->CurrentUser(@_);
+
 }
 
 # }}}
@@ -48,68 +80,108 @@ The primary keys for RT classes is 'id'
 
 sub _PrimaryKeys {
     my $self = shift;
-    return(['id']);
+    return ( ['id'] );
 }
 
 # }}}
 
-# {{{ sub _MyCurrentUser 
-
-sub _MyCurrentUser  {
+# {{{ sub _Handle 
+sub _Handle {
     my $self = shift;
-  
-    $self->CurrentUser(@_);
-    if(!defined($self->CurrentUser)) {
-	use Carp;
-	Carp::cluck();
-	$RT::Logger->err("$self was created without a CurrentUser\n"); 
-      return(0);
-    }
+    return ($RT::Handle);
 }
 
 # }}}
 
-# {{{ sub _Handle 
-sub _Handle  {
-  my $self = shift;
-  return($RT::Handle);
-}
-# }}}
-
 # {{{ sub Create 
 
-sub Create  {
-    my $self = shift;
-    my $now = new RT::Date($self->CurrentUser);
-    $now->Set(Format=> 'unix', Value => time);
-    push @_, 'Created', $now->ISO()
-      if ($self->_Accessible('Created', 'auto'));
-    
-
-    push @_, 'Creator', $self->{'user'}->id
-      if $self->_Accessible('Creator', 'auto');
-    
-    push @_, 'LastUpdated', $now->ISO()
-      if ($self->_Accessible('LastUpdated', 'auto'));
-
-    push @_, 'LastUpdatedBy', $self->{'user'}->id
-      if $self->_Accessible('LastUpdatedBy', 'auto');
-    
-    
-
-   my $id = $self->SUPER::Create(@_);
-    
-    if ($id) {
-	$self->Load($id);
+=item  Create PARAMHASH
+
+Takes a PARAMHASH of Column -> Value pairs.
+If any Column has a Validate$PARAMNAME subroutine defined and the 
+value provided doesn't pass validation, this routine returns
+an error.
+
+If this object's table has any of the following atetributes defined as
+'Auto', this routine will automatically fill in their values.
+
+=cut
+
+sub Create {
+    my $self    = shift;
+    my %attribs = (@_);
+    foreach my $key ( keys %attribs ) {
+        my $method = "Validate$key";
+        unless ( $self->$method( $attribs{$key} ) ) {
+            if (wantarray) {
+                return ( 0, $self->loc('Invalid value for [_1]', $key) );
+            }
+            else {
+                return (0);
+            }
+        }
+    }
+    my $now = RT::Date->new( $self->CurrentUser );
+    $now->Set( Format => 'unix', Value => time );
+    $attribs{'Created'} = $now->ISO() if ( $self->_Accessible( 'Created', 'auto' ) && !$attribs{'Created'});
+
+    if ($self->_Accessible( 'Creator', 'auto' ) && !$attribs{'Creator'}) {
+         $attribs{'Creator'} = $self->CurrentUser->id || '0'; 
+    }
+    $attribs{'LastUpdated'} = $now->ISO()
+      if ( $self->_Accessible( 'LastUpdated', 'auto' ) && !$attribs{'LastUpdated'});
+
+    $attribs{'LastUpdatedBy'} = $self->CurrentUser->id || '0'
+      if ( $self->_Accessible( 'LastUpdatedBy', 'auto' ) && !$attribs{'LastUpdatedBy'});
+
+    my $id = $self->SUPER::Create(%attribs);
+    if ( UNIVERSAL::isa( $id, 'Class::ReturnValue' ) ) {
+        if ( $id->errno ) {
+            if (wantarray) {
+                return ( 0,
+                    $self->loc( "Internal Error: [_1]", $id->{error_message} ) );
+            }
+            else {
+                return (0);
+            }
+        }
+    }
+    # If the object was created in the database, 
+    # load it up now, so we're sure we get what the database 
+    # has.  Arguably, this should not be necessary, but there
+    # isn't much we can do about it.
+
+   unless ($id) { 
+    if (wantarray) {
+        return ( $id, $self->loc('Object could not be created') );
+    }
+    else {
+        return ($id);
+    }
+
+   }
+
+    if  (UNIVERSAL::isa('errno',$id)) {
+        exit(0);
+       warn "It's here!";
+        return(undef);
+    }
+
+    $self->Load($id) if ($id);
+
+
+
+    if (wantarray) {
+        return ( $id, $self->loc('Object created') );
+    }
+    else {
+        return ($id);
     }
-    
-    return($id);
-    
+
 }
 
 # }}}
 
-
 # {{{ sub LoadByCols
 
 =head2 LoadByCols
@@ -125,28 +197,33 @@ sub LoadByCols {
 
     # If this database is case sensitive we need to uncase objects for
     # explicit loading
-    if ($self->_Handle->CaseSensitive) {
-	 my %newhash;
-	 foreach my $key (keys %hash) {
-        # If we've been passed an empty value, we can't do the lookup. 
-		# We don't need to explicitly downcase integers or an id.
-		if ($key =~ '^id$' || $hash{$key} =~/^\d+$/ || !defined ($hash{$key}) ) {
-			$newhash{$key} = $hash{$key};
-		}
-		else {
-			$newhash{"lower(".$key.")"} = lc($hash{$key});	
-		}
-	 }
-	$self->SUPER::LoadByCols(%newhash);
-    }
-    else {
-	$self->SUPER::LoadByCols(%hash);
+    if ( $self->_Handle->CaseSensitive ) {
+        my %newhash;
+        foreach my $key ( keys %hash ) {
+
+            # If we've been passed an empty value, we can't do the lookup. 
+            # We don't need to explicitly downcase integers or an id.
+            if ( $key =~ '^id$'
+                || !defined( $hash{$key} )
+                || $hash{$key} =~ /^\d+$/
+                 )
+            {
+                $newhash{$key} = $hash{$key};
+            }
+            else {
+                $newhash{ "lower(" . $key . ")" } = lc( $hash{$key} );
+            }
+        }
+
+        # We've clobbered everything we care about. bash the old hash
+        # and replace it with the new hash
+        %hash = %newhash;
     }
+    $self->SUPER::LoadByCols(%hash);
 }
 
 # }}}
 
-
 # {{{ Datehandling
 
 # There is room for optimizations in most of those subs:
@@ -154,10 +231,10 @@ sub LoadByCols {
 # {{{ LastUpdatedObj
 
 sub LastUpdatedObj {
-    my $self=shift;
-    my $obj = new RT::Date($self->CurrentUser);
-    
-    $obj->Set(Format => 'sql', Value => $self->LastUpdated);
+    my $self = shift;
+    my $obj  = new RT::Date( $self->CurrentUser );
+
+    $obj->Set( Format => 'sql', Value => $self->LastUpdated );
     return $obj;
 }
 
@@ -166,12 +243,11 @@ sub LastUpdatedObj {
 # {{{ CreatedObj
 
 sub CreatedObj {
-    my $self=shift;
-    my $obj = new RT::Date($self->CurrentUser);
-    
-    $obj->Set(Format => 'sql', Value => $self->Created);
+    my $self = shift;
+    my $obj  = new RT::Date( $self->CurrentUser );
+
+    $obj->Set( Format => 'sql', Value => $self->Created );
 
-    
     return $obj;
 }
 
@@ -182,9 +258,10 @@ sub CreatedObj {
 # TODO: This should be deprecated
 #
 sub AgeAsString {
-    my $self=shift;
-    return($self->CreatedObj->AgeAsString());
+    my $self = shift;
+    return ( $self->CreatedObj->AgeAsString() );
 }
+
 # }}}
 
 # {{{ LastUpdatedAsString
@@ -192,12 +269,13 @@ sub AgeAsString {
 # TODO this should be deprecated
 
 sub LastUpdatedAsString {
-    my $self=shift;
-    if ($self->LastUpdated) {
-	return ($self->LastUpdatedObj->AsString());
-	  
-    } else {
-	return "never";
+    my $self = shift;
+    if ( $self->LastUpdated ) {
+        return ( $self->LastUpdatedObj->AsString() );
+
+    }
+    else {
+        return "never";
     }
 }
 
@@ -209,8 +287,9 @@ sub LastUpdatedAsString {
 #
 sub CreatedAsString {
     my $self = shift;
-    return ($self->CreatedObj->AsString());
+    return ( $self->CreatedObj->AsString() );
 }
+
 # }}}
 
 # {{{ LongSinceUpdateAsString
@@ -218,42 +297,47 @@ sub CreatedAsString {
 # TODO This should be deprecated
 #
 sub LongSinceUpdateAsString {
-    my $self=shift;
-    if ($self->LastUpdated) {
-      
-        return ($self->LastUpdatedObj->AgeAsString());
-	
-    } else {
-	return "never";
+    my $self = shift;
+    if ( $self->LastUpdated ) {
+
+        return ( $self->LastUpdatedObj->AgeAsString() );
+
+    }
+    else {
+        return "never";
     }
 }
+
 # }}}
 
 # }}} Datehandling
 
-
 # {{{ sub _Set 
-sub _Set  {
-  my $self = shift;
+sub _Set {
+    my $self = shift;
 
-  my %args = ( Field => undef,
-	       Value => undef,
-	       IsSQL => undef,
-	       @_ );
+    my %args = (
+        Field => undef,
+        Value => undef,
+        IsSQL => undef,
+        @_
+    );
 
+    #if the user is trying to modify the record
+    # TODO: document _why_ this code is here
 
-  #if the user is trying to modify the record
-  if ((!defined ($args{'Field'})) || (!defined ($args{'Value'}))) {
-    $args{'Value'} = 0; 
-   }
+    if ( ( !defined( $args{'Field'} ) ) || ( !defined( $args{'Value'} ) ) ) {
+        $args{'Value'} = 0;
+    }
 
-  $self->_SetLastUpdated();
-  $self->SUPER::_Set(Field => $args{'Field'},
-		     Value => $args{'Value'},
-		     IsSQL => $args{'IsSQL'});
-  
-  
+    $self->_SetLastUpdated();
+    my ( $val, $msg ) = $self->SUPER::_Set(
+        Field => $args{'Field'},
+        Value => $args{'Value'},
+        IsSQL => $args{'IsSQL'}
+    );
 }
+
 # }}}
 
 # {{{ sub _SetLastUpdated
@@ -268,16 +352,20 @@ It takes no options. Arguably, this is a bug
 sub _SetLastUpdated {
     my $self = shift;
     use RT::Date;
-    my $now = new RT::Date($self->CurrentUser);
+    my $now = new RT::Date( $self->CurrentUser );
     $now->SetToNow();
 
-    if ($self->_Accessible('LastUpdated','auto')) {
-    	my ($msg, $val) = $self->__Set( Field => 'LastUpdated',
-                                        Value => $now->ISO);
+    if ( $self->_Accessible( 'LastUpdated', 'auto' ) ) {
+        my ( $msg, $val ) = $self->__Set(
+            Field => 'LastUpdated',
+            Value => $now->ISO
+        );
     }
-    if ($self->_Accessible('LastUpdatedBy','auto')) {
-        my ($msg, $val) = $self->__Set( Field => 'LastUpdatedBy', 
-				        Value => $self->CurrentUser->id);
+    if ( $self->_Accessible( 'LastUpdatedBy', 'auto' ) ) {
+        my ( $msg, $val ) = $self->__Set(
+            Field => 'LastUpdatedBy',
+            Value => $self->CurrentUser->id
+        );
     }
 }
 
@@ -291,15 +379,16 @@ Returns an RT::User object with the RT account of the creator of this row
 
 =cut
 
-sub CreatorObj  {
-  my $self = shift;
-  unless (exists $self->{'CreatorObj'}) {
-    
-    $self->{'CreatorObj'} = RT::User->new($self->CurrentUser);
-    $self->{'CreatorObj'}->Load($self->Creator);
-  }
-  return($self->{'CreatorObj'});
+sub CreatorObj {
+    my $self = shift;
+    unless ( exists $self->{'CreatorObj'} ) {
+
+        $self->{'CreatorObj'} = RT::User->new( $self->CurrentUser );
+        $self->{'CreatorObj'}->Load( $self->Creator );
+    }
+    return ( $self->{'CreatorObj'} );
 }
+
 # }}}
 
 # {{{ sub LastUpdatedByObj
@@ -311,35 +400,56 @@ sub CreatorObj  {
 =cut
 
 sub LastUpdatedByObj {
-    my $self=shift;
-    unless (exists $self->{LastUpdatedByObj}) {
-	$self->{'LastUpdatedByObj'}=RT::User->new($self->CurrentUser);
-	$self->{'LastUpdatedByObj'}->Load($self->LastUpdatedBy);
+    my $self = shift;
+    unless ( exists $self->{LastUpdatedByObj} ) {
+        $self->{'LastUpdatedByObj'} = RT::User->new( $self->CurrentUser );
+        $self->{'LastUpdatedByObj'}->Load( $self->LastUpdatedBy );
     }
     return $self->{'LastUpdatedByObj'};
 }
 
 # }}}
 
-# {{{ sub CurrentUser 
 
-=head2 CurrentUser
+require Encode::compat if $] < 5.007001;
+require Encode;
 
-If called with an argument, sets the current user to that user object.
-This will affect ACL decisions, etc.  
-Returns the current user
+sub __Value {
+    my $self  = shift;
+    my $field = shift;
+    my %args = ( decode_utf8 => 1,
+                 @_ );
 
-=cut
+    unless (defined $field && $field) {
+        $RT::Logger->error("$self __Value called with undef field");
+    }
+    my $value = $self->SUPER::__Value($field);
+
+    return('') if ( !defined($value) || $value eq '');
+
+    return Encode::decode_utf8($value) || $value if $args{'decode_utf8'};
+    return $value;
+}
 
-sub CurrentUser  {
-  my $self = shift;
+# Set up defaults for DBIx::SearchBuilder::Record::Cachable
 
-  if (@_) {
-    $self->{'user'} = shift;
+sub _CacheConfig {
+  {
+     'cache_p'        => 1,
+     'fast_update_p'  => 1,
+     'cache_for_sec'  => 30,
   }
-  return ($self->{'user'});
 }
-# }}}
 
+=head2 _DecodeUTF8
+
+ When passed a string will "decode" it int a proper UTF-8 string
+
+=cut
+
+eval "require RT::Record_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Record_Vendor.pm});
+eval "require RT::Record_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Record_Local.pm});
 
 1;
diff --git a/rt/lib/RT/Scrip.pm b/rt/lib/RT/Scrip.pm
index aef011ca3..a69dde04e 100755
--- a/rt/lib/RT/Scrip.pm
+++ b/rt/lib/RT/Scrip.pm
@@ -1,372 +1,500 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Scrip.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::Scrip - an RT Scrip object
+RT::Scrip
 
-=head1 SYNOPSIS
 
-  use RT::Scrip;
+=head1 SYNOPSIS
 
 =head1 DESCRIPTION
 
-
 =head1 METHODS
 
-=begin testing
+=cut
 
-ok (require RT::TestHarness);
-ok (require RT::Scrip);
+package RT::Scrip;
+use RT::Record; 
+use RT::Queue;
+use RT::Template;
+use RT::ScripCondition;
+use RT::ScripAction;
 
-=end testing
 
-=cut
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
 
-package RT::Scrip;
-use RT::Record;
-@ISA= qw(RT::Record);
+sub _Init {
+  my $self = shift; 
 
-# {{{ sub _Init
-sub _Init  {
-    my $self = shift;
-    $self->{'table'} = "Scrips";
-    return ($self->SUPER::_Init(@_));
+  $self->Table('Scrips');
+  $self->SUPER::_Init(@_);
 }
-# }}}
 
-# {{{ sub _Accessible 
-sub _Accessible  {
-    my $self = shift;
-    my %Cols = ( ScripAction  => 'read/write',
-		 ScripCondition => 'read/write',
-		 Stage => 'read/write',
-		 Queue => 'read/write', 
-		 Template => 'read/write',
-	       );
-    return($self->SUPER::_Accessible(@_, %Cols));
-}
-# }}}
 
-# {{{ sub Create 
 
-=head2 Create
 
-Creates a new entry in the Scrips table. Takes a paramhash with the attributes:
 
-    Queue           A queue id or 0 for a global scrip
-    Template        A template ID or name.  
-                    Behavior is undefined if you have multiple items with 
-                    the same name
-    ScripAction     A ScripAction id or name
-                    Behavior is undefined if you have multiple items with 
-                    the same name
-    ScripCondition  A ScripCondition id or name
-                    Behavior is undefined if you have multiple items with 
-                    the same name
+=item Create PARAMHASH
 
-Returns (retval, msg);
-retval is 0 for failure or scrip id.  msg is a textual description of what happened.
+Create takes a hash of values and creates a row in the database:
+
+  varchar(255) 'Description'.
+  int(11) 'ScripCondition'.
+  int(11) 'ScripAction'.
+  text 'ConditionRules'.
+  text 'ActionRules'.
+  text 'CustomIsApplicableCode'.
+  text 'CustomPrepareCode'.
+  text 'CustomCommitCode'.
+  varchar(32) 'Stage'.
+  int(11) 'Queue'.
+  int(11) 'Template'.
 
 =cut
 
-sub Create  {
+
+
+
+sub Create {
     my $self = shift;
-    my %args = ( Queue => undef,
-		 Template => undef,
-		 ScripAction => undef,
-		 ScripCondition => undef,
-		 Stage => 'TransactionCreate',
-		 @_
-	       );
-    
-      
-    if ($args{'Queue'} == 0 ) { 
-	unless ($self->CurrentUser->HasSystemRight('ModifyScrips')) {
-	    return (0, 'Permission Denied');
- 	}	
-    }
-    else {
-	my $QueueObj = new RT::Queue($self->CurrentUser);
-	$QueueObj->Load($args{'Queue'});
-	unless ($QueueObj->id()) {
-	    return (0,'Invalid queue');
-	}
-	unless ($QueueObj->CurrentUserHasRight('ModifyScrips')) {
-	    return (0, 'Permssion Denied');
-	}	
-    }
-
-    #TODO +++ validate input 
-
-    require RT::ScripAction;
-    my $action = new RT::ScripAction($self->CurrentUser);
-    $action->Load($args{'ScripAction'});
-    return (0, "Action ".$args{'ScripAction'}." not found") unless $action->Id;
-
-    require RT::Template;
-    my $template = new RT::Template($self->CurrentUser);
-    $template->Load($args{'Template'});
-    return (0, 'Template not found') unless $template->Id;
-
-    require RT::ScripCondition;
-    my $condition = new RT::ScripCondition($self->CurrentUser);
-    $condition->Load($args{'ScripCondition'});
-
-    unless ($condition->Id) {
-	return (0, 'Condition not found');
-    }	
-    
-    my $id = $self->SUPER::Create(Queue => $args{'Queue'},
-				  Template => $template->Id,
-				  ScripCondition => $condition->id,
-				  Stage => $args{'Stage'},
-				  ScripAction => $action->Id
-				 );
-    return ($id, 'Scrip Created'); 
+    my %args = ( 
+                Description => '',
+                ScripCondition => '0',
+                ScripAction => '0',
+                ConditionRules => '',
+                ActionRules => '',
+                CustomIsApplicableCode => '',
+                CustomPrepareCode => '',
+                CustomCommitCode => '',
+                Stage => '',
+                Queue => '0',
+                Template => '0',
+
+		  @_);
+    $self->SUPER::Create(
+                         Description => $args{'Description'},
+                         ScripCondition => $args{'ScripCondition'},
+                         ScripAction => $args{'ScripAction'},
+                         ConditionRules => $args{'ConditionRules'},
+                         ActionRules => $args{'ActionRules'},
+                         CustomIsApplicableCode => $args{'CustomIsApplicableCode'},
+                         CustomPrepareCode => $args{'CustomPrepareCode'},
+                         CustomCommitCode => $args{'CustomCommitCode'},
+                         Stage => $args{'Stage'},
+                         Queue => $args{'Queue'},
+                         Template => $args{'Template'},
+);
+
 }
 
-# }}}
 
-# {{{ sub Delete
 
-=head2 Delete
+=item id
+
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
 
-Delete this object
 
 =cut
 
-sub Delete {
-    my $self = shift;
-    
-    unless ($self->CurrentUserHasRight('ModifyScrips')) {
-	return (0, 'Permission Denied');
-    }
-    
-    return ($self->SUPER::Delete(@_));
-}
-# }}}
 
-# {{{ sub QueueObj
+=item Description
+
+Returns the current value of Description. 
+(In the database, Description is stored as varchar(255).)
+
 
-=head2 QueueObj
 
-Retuns an RT::Queue object with this Scrip\'s queue
+=item SetDescription VALUE
+
+
+Set Description to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Description will be stored as a varchar(255).)
+
 
 =cut
 
-sub QueueObj {
-    my $self = shift;
-    
-    if (!$self->{'QueueObj'})  {
-	require RT::Queue;
-	$self->{'QueueObj'} = RT::Queue->new($self->CurrentUser);
-	$self->{'QueueObj'}->Load($self->Queue);
-    }
-    return ($self->{'QueueObj'});
-}
 
-# }}}
+=item ScripCondition
+
+Returns the current value of ScripCondition. 
+(In the database, ScripCondition is stored as int(11).)
+
 
-# {{{ sub ActionObj
 
+=item SetScripCondition VALUE
 
-=head2 ActionObj
 
-Retuns an RT::Action object with this Scrip\'s Action
+Set ScripCondition to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ScripCondition will be stored as a int(11).)
+
 
 =cut
 
-sub ActionObj {
-    my $self = shift;
-    
-    unless (defined $self->{'ScripActionObj'})  {
-	require RT::ScripAction;
-	
-	$self->{'ScripActionObj'} = RT::ScripAction->new($self->CurrentUser);
-	#TODO: why are we loading Actions with templates like this. 
-	# two seperate methods might make more sense
-	$self->{'ScripActionObj'}->Load($self->ScripAction, $self->Template);
-    }
-    return ($self->{'ScripActionObj'});
+
+=item ScripConditionObj
+
+Returns the ScripCondition Object which has the id returned by ScripCondition
+
+
+=cut
+
+sub ScripConditionObj {
+	my $self = shift;
+	my $ScripCondition =  RT::ScripCondition->new($self->CurrentUser);
+	$ScripCondition->Load($self->__Value('ScripCondition'));
+	return($ScripCondition);
 }
 
-# }}}
+=item ScripAction
+
+Returns the current value of ScripAction. 
+(In the database, ScripAction is stored as int(11).)
+
+
+
+=item SetScripAction VALUE
 
 
-# {{{ sub TemplateObj
-=head2 TemplateObj
+Set ScripAction to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ScripAction will be stored as a int(11).)
 
-Retuns an RT::Template object with this Scrip\'s Template
 
 =cut
 
-sub TemplateObj {
-    my $self = shift;
-    
-    unless (defined $self->{'TemplateObj'})  {
-	require RT::Template;
-	$self->{'TemplateObj'} = RT::Template->new($self->CurrentUser);
-	$self->{'TemplateObj'}->Load($self->Template);
-    }
-    return ($self->{'TemplateObj'});
-}
 
-# }}}
+=item ScripActionObj
 
-# {{{ sub Prepare
-=head2 Prepare
+Returns the ScripAction Object which has the id returned by ScripAction
 
-Calls the action object's prepare method
 
 =cut
 
-sub Prepare {
-    my $self = shift;
-    $self->ActionObj->Prepare(@_);
+sub ScripActionObj {
+	my $self = shift;
+	my $ScripAction =  RT::ScripAction->new($self->CurrentUser);
+	$ScripAction->Load($self->__Value('ScripAction'));
+	return($ScripAction);
 }
 
-# }}}
+=item ConditionRules
+
+Returns the current value of ConditionRules. 
+(In the database, ConditionRules is stored as text.)
+
 
-# {{{ sub Commit
-=head2 Commit
 
-Calls the action object's commit method
+=item SetConditionRules VALUE
+
+
+Set ConditionRules to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ConditionRules will be stored as a text.)
+
 
 =cut
 
-sub Commit {
-    my $self = shift;
-    $self->ActionObj->Commit(@_);
-}
 
-# }}}
+=item ActionRules
 
-# {{{ sub ConditionObj
+Returns the current value of ActionRules. 
+(In the database, ActionRules is stored as text.)
 
-=head2 ConditionObj
 
-Retuns an RT::ScripCondition object with this Scrip's IsApplicable
+
+=item SetActionRules VALUE
+
+
+Set ActionRules to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ActionRules will be stored as a text.)
+
 
 =cut
 
-sub ConditionObj {
-    my $self = shift;
-    
-    unless (defined $self->{'ScripConditionObj'})  {
-	require RT::ScripCondition;
-	$self->{'ScripConditionObj'} = RT::ScripCondition->new($self->CurrentUser);
-	$self->{'ScripConditionObj'}->Load($self->ScripCondition);
-    }
-    return ($self->{'ScripConditionObj'});
-}
 
-# }}}
+=item CustomIsApplicableCode
+
+Returns the current value of CustomIsApplicableCode. 
+(In the database, CustomIsApplicableCode is stored as text.)
+
+
+
+=item SetCustomIsApplicableCode VALUE
 
-# {{{ sub IsApplicable
 
-=head2 IsApplicable
+Set CustomIsApplicableCode to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, CustomIsApplicableCode will be stored as a text.)
 
-Calls the  Condition object\'s IsApplicable method
 
 =cut
 
-sub IsApplicable {
-    my $self = shift;
-    return ($self->ConditionObj->IsApplicable(@_));
-}
 
-# }}}
+=item CustomPrepareCode
 
-# {{{ sub DESTROY
-sub DESTROY {
-    my $self = shift;
-    $self->{'ActionObj'} = undef;
-}
-# }}}
+Returns the current value of CustomPrepareCode. 
+(In the database, CustomPrepareCode is stored as text.)
 
-# {{{ ACL related methods
 
-# {{{ sub _Set
 
-# does an acl check and then passes off the call
-sub _Set {
-    my $self = shift;
-    
-    unless ($self->CurrentUserHasRight('ModifyScrips')) {
-        $RT::Logger->debug("CurrentUser can't modify Scrips for ".$self->Queue."\n");
-	return (0, 'Permission Denied');
-    }
-    return $self->__Set(@_);
-}
+=item SetCustomPrepareCode VALUE
 
-# }}}
 
-# {{{ sub _Value
-# does an acl check and then passes off the call
-sub _Value {
-    my $self = shift;
-    
-    unless ($self->CurrentUserHasRight('ShowScrips')) {
-        $RT::Logger->debug("CurrentUser can't modify Scrips for ".$self->__Value('Queue')."\n");
-	return (undef);
-    }
-    
-    return $self->__Value(@_);
-}
-# }}}
+Set CustomPrepareCode to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, CustomPrepareCode will be stored as a text.)
+
+
+=cut
+
+
+=item CustomCommitCode
+
+Returns the current value of CustomCommitCode. 
+(In the database, CustomCommitCode is stored as text.)
+
 
-# {{{ sub CurrentUserHasRight
 
-=head2 CurrentUserHasRight
+=item SetCustomCommitCode VALUE
+
+
+Set CustomCommitCode to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, CustomCommitCode will be stored as a text.)
 
-Helper menthod for HasRight. Presets Principal to CurrentUser then 
-calls HasRight.
 
 =cut
 
-sub CurrentUserHasRight {
-    my $self = shift;
-    my $right = shift;
-    return ($self->HasRight( Principal => $self->CurrentUser->UserObj,
-                             Right => $right ));
-    
+
+=item Stage
+
+Returns the current value of Stage. 
+(In the database, Stage is stored as varchar(32).)
+
+
+
+=item SetStage VALUE
+
+
+Set Stage to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Stage will be stored as a varchar(32).)
+
+
+=cut
+
+
+=item Queue
+
+Returns the current value of Queue. 
+(In the database, Queue is stored as int(11).)
+
+
+
+=item SetQueue VALUE
+
+
+Set Queue to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Queue will be stored as a int(11).)
+
+
+=cut
+
+
+=item QueueObj
+
+Returns the Queue Object which has the id returned by Queue
+
+
+=cut
+
+sub QueueObj {
+	my $self = shift;
+	my $Queue =  RT::Queue->new($self->CurrentUser);
+	$Queue->Load($self->__Value('Queue'));
+	return($Queue);
 }
 
-# }}}
+=item Template
+
+Returns the current value of Template. 
+(In the database, Template is stored as int(11).)
+
+
+
+=item SetTemplate VALUE
 
-# {{{ sub HasRight
 
-=head2 HasRight
+Set Template to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Template will be stored as a int(11).)
 
-Takes a param-hash consisting of "Right" and "Principal"  Principal is 
-an RT::User object or an RT::CurrentUser object. "Right" is a textual
-Right string that applies to Scrips.
 
 =cut
 
-sub HasRight {
-    my $self = shift;
-    my %args = ( Right => undef,
-                 Principal => undef,
-                 @_ );
-    
-    if ((defined $self->SUPER::_Value('Queue')) and ($self->SUPER::_Value('Queue') != 0)) {
-        return ( $args{'Principal'}->HasQueueRight(
-						   Right => $args{'Right'},
-						   Queue => $self->SUPER::_Value('Queue'),
-						   Principal => $args{'Principal'}
-						  ) 
-	       );
-	
-    }
-    else {
-        return( $args{'Principal'}->HasSystemRight( $args{'Right'}) );
-    }
+
+=item TemplateObj
+
+Returns the Template Object which has the id returned by Template
+
+
+=cut
+
+sub TemplateObj {
+	my $self = shift;
+	my $Template =  RT::Template->new($self->CurrentUser);
+	$Template->Load($self->__Value('Template'));
+	return($Template);
 }
-# }}}
 
-# }}}
+=item Creator
+
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
+
+
+=cut
+
+
+=item Created
+
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
+
+
+=cut
+
+
+=item LastUpdatedBy
+
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
+
+
+=cut
+
+
+=item LastUpdated
+
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
+
+
+=cut
 
-1;
 
 
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        Description => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        ScripCondition => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        ScripAction => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        ConditionRules => 
+		{read => 1, write => 1, type => 'text', default => ''},
+        ActionRules => 
+		{read => 1, write => 1, type => 'text', default => ''},
+        CustomIsApplicableCode => 
+		{read => 1, write => 1, type => 'text', default => ''},
+        CustomPrepareCode => 
+		{read => 1, write => 1, type => 'text', default => ''},
+        CustomCommitCode => 
+		{read => 1, write => 1, type => 'text', default => ''},
+        Stage => 
+		{read => 1, write => 1, type => 'varchar(32)', default => ''},
+        Queue => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Template => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+
+ }
+};
+
+
+        eval "require RT::Scrip_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Scrip_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Scrip_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Scrip_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Scrip_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Scrip_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Scrip_Overlay, RT::Scrip_Vendor, RT::Scrip_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/ScripAction.pm b/rt/lib/RT/ScripAction.pm
index 471ad9191..26824df5d 100755
--- a/rt/lib/RT/ScripAction.pm
+++ b/rt/lib/RT/ScripAction.pm
@@ -1,200 +1,279 @@
-# Copyright 1999-2000 Jesse Vincent <jesse@fsck.com>
-# Released under the terms of the GNU Public License
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/ScripAction.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::ScripAction - RT Action object
+RT::ScripAction
+
 
 =head1 SYNOPSIS
 
-  use RT::ScripAction;
+=head1 DESCRIPTION
 
+=head1 METHODS
+
+=cut
+
+package RT::ScripAction;
+use RT::Record; 
 
-=head1 DESCRIPTION
 
-This module should never be called directly by client code. it's an internal module which
-should only be accessed through exported APIs in other modules.
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
 
+sub _Init {
+  my $self = shift; 
 
-=begin testing
+  $self->Table('ScripActions');
+  $self->SUPER::_Init(@_);
+}
 
-ok (require RT::TestHarness);
-ok (require RT::ScripAction);
 
-=end testing
 
-=head1 METHODS
+
+
+=item Create PARAMHASH
+
+Create takes a hash of values and creates a row in the database:
+
+  varchar(200) 'Name'.
+  varchar(255) 'Description'.
+  varchar(60) 'ExecModule'.
+  varchar(255) 'Argument'.
 
 =cut
 
-package RT::ScripAction;
-use RT::Record;
-@ISA= qw(RT::Record);
-
-# {{{  sub _Init 
-sub _Init  {
-    my $self = shift; 
-    $self->{'table'} = "ScripActions";
-    return ($self->SUPER::_Init(@_));
-}
-# }}}
 
-# {{{ sub _Accessible 
-sub _Accessible  {
+
+
+sub Create {
     my $self = shift;
-    my %Cols = ( Name  => 'read',
-		 Description => 'read',
-		 ExecModule  => 'read',
-		 Argument  => 'read',
-		 Creator => 'read/auto',
-		 Created => 'read/auto',
-		 LastUpdatedBy => 'read/auto',
-		 LastUpdated => 'read/auto'
-       );
-    return($self->SUPER::_Accessible(@_, %Cols));
+    my %args = ( 
+                Name => '',
+                Description => '',
+                ExecModule => '',
+                Argument => '',
+
+		  @_);
+    $self->SUPER::Create(
+                         Name => $args{'Name'},
+                         Description => $args{'Description'},
+                         ExecModule => $args{'ExecModule'},
+                         Argument => $args{'Argument'},
+);
+
 }
-# }}}
 
-# {{{ sub Create 
-=head2 Create
-  
- Takes a hash. Creates a new Action entry.
- should be better documented.
+
+
+=item id
+
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
+
+
 =cut
 
-sub Create  {
-    my $self = shift;
-    #TODO check these args and do smart things.
-    return($self->SUPER::Create(@_));
-}
-# }}}
 
-# {{{ sub Delete 
-sub Delete  {
-    my $self = shift;
-    
-    return (0, "ScripAction->Delete not implemented");
-}
-# }}}
+=item Name
+
+Returns the current value of Name. 
+(In the database, Name is stored as varchar(200).)
 
-# {{{ sub Load 
-sub Load  {
-    my $self = shift;
-    my $identifier = shift;
-    
-    if (!$identifier) {
-	return (0, 'Input error');
-    }	    
-    
-    if ($identifier !~ /\D/) {
-	$self->SUPER::LoadById($identifier);
-    }
-    else {
-	$self->LoadByCol('Name', $identifier);
-	
-    }
-
-    if (@_) {
-	# Set the template Id to the passed in template    
-	my $template = shift;
-	
-	$self->{'Template'} = $template;
-    }
-    return ($self->Id, 'ScripAction loaded');
-}
-# }}}
 
-# {{{ sub LoadAction 
 
-=head2 LoadAction HASH
+=item SetName VALUE
+
+
+Set Name to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Name will be stored as a varchar(200).)
 
-  Takes a hash consisting of TicketObj and TransactionObj.  Loads an RT::Action:: module.
 
 =cut
 
-sub LoadAction  {
-    my $self = shift;
-    my %args = ( TransactionObj => undef,
-		 TicketObj => undef,
-		 @_ );
-    
-    #TODO: Put this in an eval  
-    $self->ExecModule =~ /^(\w+)$/;
-    my $module = $1;
-    my $type = "RT::Action::". $module;
- 
-    $RT::Logger->debug("now requiring $type\n"); 
-    eval "require $type" || die "Require of $type failed.\n$@\n";
-    
-    $self->{'Action'}  = $type->new ( 'ScripActionObj' => $self, 
-				      'TicketObj' => $args{'TicketObj'},
-				      'TransactionObj' => $args{'TransactionObj'},
-				      'TemplateObj' => $self->TemplateObj,
-				      'Argument' => $self->Argument,
-				    );
-}
-# }}}
 
-# {{{ sub TemplateObj
+=item Description
+
+Returns the current value of Description. 
+(In the database, Description is stored as varchar(255).)
+
+
 
-=head2 TemplateObj
+=item SetDescription VALUE
+
+
+Set Description to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Description will be stored as a varchar(255).)
 
-Return this action\'s template object
 
 =cut
 
-sub TemplateObj {
-    my $self = shift;
-    return undef unless $self->{Template};
-    if (!$self->{'TemplateObj'})  {
-	require RT::Template;
-	$self->{'TemplateObj'} = RT::Template->new($self->CurrentUser);
-	$self->{'TemplateObj'}->LoadById($self->{'Template'});
-	
-    }
-    
-    return ($self->{'TemplateObj'});
-}
-# }}}
 
-# The following methods call the action object
+=item ExecModule
 
-# {{{ sub Prepare 
+Returns the current value of ExecModule. 
+(In the database, ExecModule is stored as varchar(60).)
 
-sub Prepare  {
-    my $self = shift;
-    return ($self->{'Action'}->Prepare());
-  
-}
-# }}}
 
-# {{{ sub Commit 
-sub Commit  {
-    my $self = shift;
-    return($self->{'Action'}->Commit());
-    
-    
-}
-# }}}
 
-# {{{ sub Describe 
-sub Describe  {
-    my $self = shift;
-    return ($self->{'Action'}->Describe());
-    
-}
-# }}}
+=item SetExecModule VALUE
 
-# {{{ sub DESTROY
-sub DESTROY {
-    my $self=shift;
-    $self->{'Action'} = undef;
-    $self->{'TemplateObj'} = undef;
-}
-# }}}
 
+Set ExecModule to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ExecModule will be stored as a varchar(60).)
 
-1;
 
+=cut
+
+
+=item Argument
+
+Returns the current value of Argument. 
+(In the database, Argument is stored as varchar(255).)
 
+
+
+=item SetArgument VALUE
+
+
+Set Argument to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Argument will be stored as a varchar(255).)
+
+
+=cut
+
+
+=item Creator
+
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
+
+
+=cut
+
+
+=item Created
+
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
+
+
+=cut
+
+
+=item LastUpdatedBy
+
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
+
+
+=cut
+
+
+=item LastUpdated
+
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
+
+
+=cut
+
+
+
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        Name => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Description => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        ExecModule => 
+		{read => 1, write => 1, type => 'varchar(60)', default => ''},
+        Argument => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+
+ }
+};
+
+
+        eval "require RT::ScripAction_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripAction_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::ScripAction_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripAction_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::ScripAction_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripAction_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::ScripAction_Overlay, RT::ScripAction_Vendor, RT::ScripAction_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/ScripActions.pm b/rt/lib/RT/ScripActions.pm
index ec6141559..614ff374f 100755
--- a/rt/lib/RT/ScripActions.pm
+++ b/rt/lib/RT/ScripActions.pm
@@ -1,70 +1,115 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/ScripActions.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::ScripActions - Collection of Action objects
+=head1 NAME
 
+  RT::ScripActions -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::ScripActions;
-
+  use RT::ScripActions
 
 =head1 DESCRIPTION
 
 
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::ScripActions);
-
-=end testing
-
 =head1 METHODS
 
 =cut
 
 package RT::ScripActions;
-use RT::EasySearch;
+
+use RT::SearchBuilder;
 use RT::ScripAction;
 
-@ISA= qw(RT::EasySearch);
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-# {{{ sub _Init
-sub _Init { 
-  my $self = shift;
-  $self->{'table'} = "ScripActions";
-  $self->{'primary_key'} = "id";
-  return ( $self->SUPER::_Init(@_));
-}
-# }}}
-
-# {{{ sub LimitToType 
-sub LimitToType  {
-  my $self = shift;
-  my $type = shift;
-  $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Type',
-		VALUE => "$type")
-      if defined $type;
-  $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Type',
-		VALUE => "Correspond")
-      if $type eq "Create";
-  $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Type',
-		VALUE => 'any');
-  
+
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'ScripActions';
+    $self->{'primary_key'} = 'id';
+
+
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
-# {{{ sub NewItem 
-sub NewItem  {
-  my $self = shift;
-  return(RT::ScripAction->new($self->CurrentUser));
 
+=item NewItem
+
+Returns an empty new RT::ScripAction item
+
+=cut
+
+sub NewItem {
+    my $self = shift;
+    return(RT::ScripAction->new($self->CurrentUser));
 }
-# }}}
 
+        eval "require RT::ScripActions_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripActions_Overlay.pm}) {
+            die $@;
+        };
 
-1;
+        eval "require RT::ScripActions_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripActions_Vendor.pm}) {
+            die $@;
+        };
 
+        eval "require RT::ScripActions_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripActions_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::ScripActions_Overlay, RT::ScripActions_Vendor, RT::ScripActions_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/ScripCondition.pm b/rt/lib/RT/ScripCondition.pm
index 253502bd4..fe0aa2d5a 100755
--- a/rt/lib/RT/ScripCondition.pm
+++ b/rt/lib/RT/ScripCondition.pm
@@ -1,192 +1,302 @@
-# Copyright 1999-2000 Jesse Vincent <jesse@fsck.com>
-# Released under the terms of the GNU Public License
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/ScripCondition.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::ScripCondition - RT scrip conditional
+RT::ScripCondition
+
 
 =head1 SYNOPSIS
 
-  use RT::ScripCondition;
+=head1 DESCRIPTION
 
+=head1 METHODS
 
-=head1 DESCRIPTION
+=cut
 
-This module should never be called directly by client code. it's an internal module which
-should only be accessed through exported APIs in other modules.
+package RT::ScripCondition;
+use RT::Record; 
 
 
-=begin testing
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
 
-ok (require RT::TestHarness);
-ok (require RT::ScripCondition);
+sub _Init {
+  my $self = shift; 
 
-=end testing
+  $self->Table('ScripConditions');
+  $self->SUPER::_Init(@_);
+}
 
-=head1 METHODS
+
+
+
+
+=item Create PARAMHASH
+
+Create takes a hash of values and creates a row in the database:
+
+  varchar(200) 'Name'.
+  varchar(255) 'Description'.
+  varchar(60) 'ExecModule'.
+  varchar(255) 'Argument'.
+  varchar(60) 'ApplicableTransTypes'.
 
 =cut
 
-package RT::ScripCondition;
-use RT::Record;
-@ISA= qw(RT::Record);
-
-# {{{  sub _Init 
-sub _Init  {
-    my $self = shift; 
-    $self->{'table'} = "ScripConditions";
-    return ($self->SUPER::_Init(@_));
-}
-# }}}
 
-# {{{ sub _Accessible 
-sub _Accessible  {
+
+
+sub Create {
     my $self = shift;
-    my %Cols = ( Name  => 'read',
-		 Description => 'read',
-		 ApplicableTransTypes	 => 'read',
-		 ExecModule  => 'read',
-		 Argument  => 'read',
-		 Creator => 'read/auto',
-		 Created => 'read/auto',
-		 LastUpdatedBy => 'read/auto',
-		 LastUpdated => 'read/auto'
-	       );
-    return($self->SUPER::_Accessible(@_, %Cols));
+    my %args = ( 
+                Name => '',
+                Description => '',
+                ExecModule => '',
+                Argument => '',
+                ApplicableTransTypes => '',
+
+		  @_);
+    $self->SUPER::Create(
+                         Name => $args{'Name'},
+                         Description => $args{'Description'},
+                         ExecModule => $args{'ExecModule'},
+                         Argument => $args{'Argument'},
+                         ApplicableTransTypes => $args{'ApplicableTransTypes'},
+);
+
 }
-# }}}
 
-# {{{ sub Create 
 
-=head2 Create
-  
-  Takes a hash. Creates a new Condition entry.
-  should be better documented.
+
+=item id
+
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
+
 
 =cut
 
-sub Create  {
-    my $self = shift;
-    return($self->SUPER::Create(@_));
-}
-# }}}
 
-# {{{ sub Delete 
+=item Name
 
-=head2 Delete
+Returns the current value of Name. 
+(In the database, Name is stored as varchar(200).)
+
+
+
+=item SetName VALUE
+
+
+Set Name to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Name will be stored as a varchar(200).)
 
-No API available for deleting things just yet.
 
 =cut
 
-sub Delete  {
-    my $self = shift;
-    return(0,'Unimplemented');
-}
-# }}}
 
-# {{{ sub Load 
+=item Description
 
-=head2 Load IDENTIFIER
+Returns the current value of Description. 
+(In the database, Description is stored as varchar(255).)
+
+
+
+=item SetDescription VALUE
+
+
+Set Description to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Description will be stored as a varchar(255).)
 
-Loads a condition takes a name or ScripCondition id.
 
 =cut
 
-sub Load  {
-    my $self = shift;
-    my $identifier = shift;
-    
-    unless (defined $identifier) {
-	return (undef);
-    }	    
-    
-    if ($identifier !~ /\D/) {
-	return ($self->SUPER::LoadById($identifier));
-    }
-    else {
-	return ($self->LoadByCol('Name', $identifier));
-    }
-}
-# }}}
 
-# {{{ sub LoadCondition 
+=item ExecModule
+
+Returns the current value of ExecModule. 
+(In the database, ExecModule is stored as varchar(60).)
+
+
+
+=item SetExecModule VALUE
+
 
-=head2 LoadCondition  HASH
+Set ExecModule to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ExecModule will be stored as a varchar(60).)
 
-takes a hash which has the following elements:  TransactionObj and TicketObj.
-Loads the Condition module in question.
 
 =cut
 
 
-sub LoadCondition  {
-    my $self = shift;
-    my %args = ( TransactionObj => undef,
-		 TicketObj => undef,
-		 @_ );
-    
-    #TODO: Put this in an eval  
-    $self->ExecModule =~ /^(\w+)$/;
-    my $module = $1;
-    my $type = "RT::Condition::". $module;
-    
-    $RT::Logger->debug("now requiring $type\n"); 
-    eval "require $type" || die "Require of $type failed.\n$@\n";
-    
-    $self->{'Condition'}  = $type->new ( 'ScripConditionObj' => $self, 
-					 'TicketObj' => $args{'TicketObj'},
-					 'TransactionObj' => $args{'TransactionObj'},
-					 'Argument' => $self->Argument,
-					 'ApplicableTransTypes' => $self->ApplicableTransTypes,
-				       );
-}
-# }}}
+=item Argument
+
+Returns the current value of Argument. 
+(In the database, Argument is stored as varchar(255).)
 
-# {{{ The following methods call the Condition object
 
 
-# {{{ sub Describe 
+=item SetArgument VALUE
 
-=head2 Describe 
 
-Helper method to call the condition module\'s Describe method.
+Set Argument to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Argument will be stored as a varchar(255).)
+
 
 =cut
 
-sub Describe  {
-    my $self = shift;
-    return ($self->{'Condition'}->Describe());
-    
-}
-# }}}
 
-# {{{ sub IsApplicable 
+=item ApplicableTransTypes
 
-=head2 IsApplicable
+Returns the current value of ApplicableTransTypes. 
+(In the database, ApplicableTransTypes is stored as varchar(60).)
+
+
+
+=item SetApplicableTransTypes VALUE
+
+
+Set ApplicableTransTypes to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ApplicableTransTypes will be stored as a varchar(60).)
 
-Helper method to call the condition module\'s IsApplicable method.
 
 =cut
 
-sub IsApplicable  {
-    my $self = shift;
-    return ($self->{'Condition'}->IsApplicable());
-    
-}
-# }}}
 
-# }}}
+=item Creator
 
-# {{{ sub DESTROY
-sub DESTROY {
-    my $self=shift;
-    $self->{'Condition'} = undef;
-}
-# }}}
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
 
 
-1;
+=cut
+
+
+=item Created
+
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
+
+
+=cut
+
+
+=item LastUpdatedBy
+
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
+
+
+=cut
+
+
+=item LastUpdated
+
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
 
 
+=cut
+
+
+
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        Name => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Description => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        ExecModule => 
+		{read => 1, write => 1, type => 'varchar(60)', default => ''},
+        Argument => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        ApplicableTransTypes => 
+		{read => 1, write => 1, type => 'varchar(60)', default => ''},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+
+ }
+};
+
+
+        eval "require RT::ScripCondition_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripCondition_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::ScripCondition_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripCondition_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::ScripCondition_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripCondition_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::ScripCondition_Overlay, RT::ScripCondition_Vendor, RT::ScripCondition_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/ScripConditions.pm b/rt/lib/RT/ScripConditions.pm
index 236e6718d..34f788d9c 100755
--- a/rt/lib/RT/ScripConditions.pm
+++ b/rt/lib/RT/ScripConditions.pm
@@ -1,69 +1,115 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/ScripConditions.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::ScripConditions - Collection of Action objects
+=head1 NAME
 
+  RT::ScripConditions -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::ScripConditions;
-
+  use RT::ScripConditions
 
 =head1 DESCRIPTION
 
 
-
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::ScripConditions);
-
-=end testing
-
 =head1 METHODS
 
 =cut
 
 package RT::ScripConditions;
-use RT::EasySearch;
+
+use RT::SearchBuilder;
 use RT::ScripCondition;
-@ISA= qw(RT::EasySearch);
-
-# {{{ sub _Init
-sub _Init { 
-  my $self = shift;
-  $self->{'table'} = "ScripConditions";
-  $self->{'primary_key'} = "id";
-  return ( $self->SUPER::_Init(@_));
-}
-# }}}
-
-# {{{ sub LimitToType 
-sub LimitToType  {
-  my $self = shift;
-  my $type = shift;
-  $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Type',
-		VALUE => "$type")
-      if defined $type;
-  $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Type',
-		VALUE => "Correspond")
-      if $type eq "Create";
-  $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Type',
-		VALUE => 'any');
-  
+
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
+
+
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'ScripConditions';
+    $self->{'primary_key'} = 'id';
+
+
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
-# {{{ sub NewItem 
-sub NewItem  {
-  my $self = shift;
-  return(RT::ScripCondition->new($self->CurrentUser));
+
+=item NewItem
+
+Returns an empty new RT::ScripCondition item
+
+=cut
+
+sub NewItem {
+    my $self = shift;
+    return(RT::ScripCondition->new($self->CurrentUser));
 }
-# }}}
 
+        eval "require RT::ScripConditions_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripConditions_Overlay.pm}) {
+            die $@;
+        };
 
-1;
+        eval "require RT::ScripConditions_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripConditions_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::ScripConditions_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/ScripConditions_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::ScripConditions_Overlay, RT::ScripConditions_Vendor, RT::ScripConditions_Local
+
+=cut
+
+
+1;
diff --git a/rt/lib/RT/Scrips.pm b/rt/lib/RT/Scrips.pm
index 90be847d8..a39443136 100755
--- a/rt/lib/RT/Scrips.pm
+++ b/rt/lib/RT/Scrips.pm
@@ -1,127 +1,115 @@
-# Copyright 1999-2001 Jesse Vincent <jesse@fsck.com>
-# Released under the terms of the GNU Public License
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Scrips.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::Scrips - a collection of RT Scrip objects
+=head1 NAME
 
+  RT::Scrips -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::Scrips;
+  use RT::Scrips
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
+=cut
 
-=begin testing
+package RT::Scrips;
 
-ok (require RT::TestHarness);
-ok (require RT::Scrips);
+use RT::SearchBuilder;
+use RT::Scrip;
 
-=end testing
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-=cut
 
-package RT::Scrips;
-use RT::EasySearch;
-use RT::Scrip;
-@ISA= qw(RT::EasySearch);
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'Scrips';
+    $self->{'primary_key'} = 'id';
 
 
-# {{{ sub _Init
-sub _Init { 
-  my $self = shift;
-  $self->{'table'} = "Scrips";
-  $self->{'primary_key'} = "id";
-  return ( $self->SUPER::_Init(@_));
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
-# {{{ sub LimitToQueue 
 
-=head2 LimitToQueue
+=item NewItem
 
-Takes a queue id (numerical) as its only argument. Makes sure that 
-Scopes it pulls out apply to this queue (or another that you've selected with
-another call to this method
+Returns an empty new RT::Scrip item
 
 =cut
 
-sub LimitToQueue  {
-   my $self = shift;
-  my $queue = shift;
- 
-  $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Queue',
-		VALUE => "$queue")
-      if defined $queue;
-  
+sub NewItem {
+    my $self = shift;
+    return(RT::Scrip->new($self->CurrentUser));
 }
-# }}}
 
-# {{{ sub LimitToGlobal
+        eval "require RT::Scrips_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Scrips_Overlay.pm}) {
+            die $@;
+        };
 
-=head2 LimitToGlobal
+        eval "require RT::Scrips_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Scrips_Vendor.pm}) {
+            die $@;
+        };
 
-Makes sure that 
-Scopes it pulls out apply to all queues (or another that you've selected with
-another call to this method or LimitToQueue
+        eval "require RT::Scrips_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Scrips_Local.pm}) {
+            die $@;
+        };
 
-=cut
 
 
-sub LimitToGlobal  {
-   my $self = shift;
- 
-  $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Queue',
-		VALUE => 0);
-  
-}
-# }}}
 
-# {{{ sub NewItem 
-sub NewItem  {
-  my $self = shift;
-  
-  return(new RT::Scrip($self->CurrentUser));
-}
-# }}}
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-# {{{ sub Next 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
-=head2 Next
+   no warnings qw(redefine);
 
-Returns the next scrip that this user can see.
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Scrips_Overlay, RT::Scrips_Vendor, RT::Scrips_Local
 
 =cut
-  
-sub Next {
-    my $self = shift;
-    
-    
-    my $Scrip = $self->SUPER::Next();
-    if ((defined($Scrip)) and (ref($Scrip))) {
-
-	if ($Scrip->CurrentUserHasRight('ShowScrips')) {
-	    return($Scrip);
-	}
-	
-	#If the user doesn't have the right to show this scrip
-	else {	
-	    return($self->Next());
-	}
-    }
-    #if there never was any scrip
-    else {
-	return(undef);
-    }	
-    
-}
-# }}}
 
-1;
 
+1;
diff --git a/rt/lib/RT/Template.pm b/rt/lib/RT/Template.pm
index 3ef96c7df..f73ea3ed6 100755
--- a/rt/lib/RT/Template.pm
+++ b/rt/lib/RT/Template.pm
@@ -1,395 +1,363 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Template.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Copyright 1996-2002 Jesse Vincent <jesse@bestpractical.com>
-# Portions Copyright 2000 Tobias Brox <tobix@cpan.org> 
-# Released under the terms of the GNU General Public License
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::Template - RT's template object
+RT::Template
+
 
 =head1 SYNOPSIS
 
-  use RT::Template;
+=head1 DESCRIPTION
 
+=head1 METHODS
 
-=head1 DESCRIPTION
+=cut
 
+package RT::Template;
+use RT::Record; 
+use RT::Queue;
 
-=head1 METHODS
 
-=begin testing
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
+
+sub _Init {
+  my $self = shift; 
+
+  $self->Table('Templates');
+  $self->SUPER::_Init(@_);
+}
+
+
+
+
+
+=item Create PARAMHASH
 
-ok(require RT::TestHarness);
-ok(require RT::Template);
+Create takes a hash of values and creates a row in the database:
 
-=end testing
+  int(11) 'Queue'.
+  varchar(200) 'Name'.
+  varchar(255) 'Description'.
+  varchar(16) 'Type'.
+  varchar(16) 'Language'.
+  int(11) 'TranslationOf'.
+  blob 'Content'.
 
 =cut
 
-package RT::Template;
-use RT::Record;
-use MIME::Entity;
-use MIME::Parser;
 
-@ISA = qw(RT::Record);
 
-# {{{ sub _Init
 
-sub _Init {
+sub Create {
     my $self = shift;
-    $self->{'table'} = "Templates";
-    return ( $self->SUPER::_Init(@_) );
+    my %args = ( 
+                Queue => '0',
+                Name => '',
+                Description => '',
+                Type => '',
+                Language => '',
+                TranslationOf => '0',
+                Content => '',
+
+		  @_);
+    $self->SUPER::Create(
+                         Queue => $args{'Queue'},
+                         Name => $args{'Name'},
+                         Description => $args{'Description'},
+                         Type => $args{'Type'},
+                         Language => $args{'Language'},
+                         TranslationOf => $args{'TranslationOf'},
+                         Content => $args{'Content'},
+);
+
 }
 
-# }}}
 
-# {{{ sub _Accessible 
 
-sub _Accessible {
-    my $self = shift;
-    my %Cols = (
-        id            => 'read',
-        Name          => 'read/write',
-        Description   => 'read/write',
-        Type          => 'read/write',    #Type is one of Action or Message
-        Content       => 'read/write',
-        Queue         => 'read/write',
-        Creator       => 'read/auto',
-        Created       => 'read/auto',
-        LastUpdatedBy => 'read/auto',
-        LastUpdated   => 'read/auto'
-    );
-    return $self->SUPER::_Accessible( @_, %Cols );
-}
+=item id
 
-# }}}
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
 
-# {{{ sub _Set
 
-sub _Set {
-    my $self = shift;
+=cut
 
-    # use super::value or we get acl blocked
-    if ( ( defined $self->SUPER::_Value('Queue') )
-        && ( $self->SUPER::_Value('Queue') == 0 ) )
-    {
-        unless ( $self->CurrentUser->HasSystemRight('ModifyTemplate') ) {
-            return ( 0, 'Permission Denied' );
-        }
-    }
-    else {
-
-        unless ( $self->CurrentUserHasQueueRight('ModifyTemplate') ) {
-            return ( 0, 'Permission Denied' );
-        }
-    }
-    return ( $self->SUPER::_Set(@_) );
 
-}
+=item Queue
+
+Returns the current value of Queue. 
+(In the database, Queue is stored as int(11).)
 
-# }}}
 
-# {{{ sub _Value 
 
-=head2 _Value
+=item SetQueue VALUE
+
+
+Set Queue to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Queue will be stored as a int(11).)
 
-Takes the name of a table column.
-Returns its value as a string, if the user passes an ACL check
 
 =cut
 
-sub _Value {
 
-    my $self  = shift;
-    my $field = shift;
+=item QueueObj
 
-    #If the current user doesn't have ACLs, don't let em at it.  
-    #use super::value or we get acl blocked
-    if ( ( !defined $self->__Value('Queue') )
-        || ( $self->__Value('Queue') == 0 ) )
-    {
-        unless ( $self->CurrentUser->HasSystemRight('ShowTemplate') ) {
-            return (undef);
-        }
-    }
-    else {
-        unless ( $self->CurrentUserHasQueueRight('ShowTemplate') ) {
-            return (undef);
-        }
-    }
-    return ( $self->__Value($field) );
+Returns the Queue Object which has the id returned by Queue
 
+
+=cut
+
+sub QueueObj {
+	my $self = shift;
+	my $Queue =  RT::Queue->new($self->CurrentUser);
+	$Queue->Load($self->__Value('Queue'));
+	return($Queue);
 }
 
-# }}}
+=item Name
+
+Returns the current value of Name. 
+(In the database, Name is stored as varchar(200).)
+
+
 
-# {{{ sub Load
+=item SetName VALUE
 
-=head2 Load <identifer>
 
-Load a template, either by number or by name
+Set Name to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Name will be stored as a varchar(200).)
+
 
 =cut
 
-sub Load {
-    my $self       = shift;
-    my $identifier = shift;
 
-    if ( !$identifier ) {
-        return (undef);
-    }
+=item Description
+
+Returns the current value of Description. 
+(In the database, Description is stored as varchar(255).)
 
-    if ( $identifier !~ /\D/ ) {
-        $self->SUPER::LoadById($identifier);
-    }
-    else {
-        $self->LoadByCol( 'Name', $identifier );
 
-    }
-}
 
-# }}}
+=item SetDescription VALUE
 
-# {{{ sub LoadGlobalTemplate
 
-=head2 LoadGlobalTemplate NAME
+Set Description to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Description will be stored as a varchar(255).)
 
-Load the global tempalte with the name NAME
 
 =cut
 
-sub LoadGlobalTemplate {
-    my $self = shift;
-    my $id   = shift;
 
-    return ( $self->LoadQueueTemplate( Queue => 0, Name => $id ) );
-}
+=item Type
 
-# }}}
+Returns the current value of Type. 
+(In the database, Type is stored as varchar(16).)
 
-# {{{ sub LoadQueueTemplate
 
-=head2  LoadQueueTemplate (Queue => QUEUEID, Name => NAME)
 
-Loads the Queue template named NAME for Queue QUEUE.
+=item SetType VALUE
+
+
+Set Type to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Type will be stored as a varchar(16).)
+
 
 =cut
 
-sub LoadQueueTemplate {
-    my $self = shift;
-    my %args = (
-        Queue => undef,
-        Name  => undef
-    );
 
-    return ( $self->LoadByCols( Name => $args{'Name'}, Queue => {'Queue'} ) );
+=item Language
 
-}
+Returns the current value of Language. 
+(In the database, Language is stored as varchar(16).)
 
-# }}}
 
-# {{{ sub Create
 
-=head2 Create
+=item SetLanguage VALUE
 
-Takes a paramhash of Content, Queue, Name and Description.
-Name should be a unique string identifying this Template.
-Description and Content should be the template's title and content.
-Queue should be 0 for a global template and the queue # for a queue-specific 
-template.
 
-Returns the Template's id # if the create was successful. Returns undef for
-unknown database failure.
+Set Language to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Language will be stored as a varchar(16).)
 
 
 =cut
 
-sub Create {
-    my $self = shift;
-    my %args = (
-        Content     => undef,
-        Queue       => 0,
-        Description => '[no description]',
-        Type => 'Action',    #By default, template are 'Action' templates
-        Name => undef,
-        @_
-    );
-
-    if ( $args{'Queue'} == 0 ) {
-        unless ( $self->CurrentUser->HasSystemRight('ModifyTemplate') ) {
-            return (undef);
-        }
-    }
-    else {
-        my $QueueObj = new RT::Queue( $self->CurrentUser );
-        $QueueObj->Load( $args{'Queue'} ) || return ( 0, 'Invalid queue' );
-
-        unless ( $QueueObj->CurrentUserHasRight('ModifyTemplate') ) {
-            return (undef);
-        }
-    }
-
-    my $result = $self->SUPER::Create(
-        Content => $args{'Content'},
-        Queue   => $args{'Queue'},
-        ,
-        Description => $args{'Description'},
-        Name        => $args{'Name'}
-    );
-
-    return ($result);
 
-}
+=item TranslationOf
+
+Returns the current value of TranslationOf. 
+(In the database, TranslationOf is stored as int(11).)
+
+
 
-# }}}
+=item SetTranslationOf VALUE
 
-# {{{ sub Delete
 
-=head2 Delete
+Set TranslationOf to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, TranslationOf will be stored as a int(11).)
 
-Delete this template.
 
 =cut
 
-sub Delete {
-    my $self = shift;
 
-    unless ( $self->CurrentUserHasRight('ModifyTemplate') ) {
-        return ( 0, 'Permission Denied' );
-    }
+=item Content
 
-    return ( $self->SUPER::Delete(@_) );
-}
+Returns the current value of Content. 
+(In the database, Content is stored as blob.)
 
-# }}}
 
-# {{{ sub MIMEObj
-sub MIMEObj {
-    my $self = shift;
-    return ( $self->{'MIMEObj'} );
-}
 
-# }}}
+=item SetContent VALUE
 
-# {{{ sub Parse 
 
-=item Parse
+Set Content to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Content will be stored as a blob.)
 
- This routine performs Text::Template parsing on thte template and then imports the 
- results into a MIME::Entity so we can really use it
- It returns a tuple of (val, message)
- If val is 0, the message contains an error message
 
 =cut
 
-sub Parse {
-    my $self = shift;
 
-    #We're passing in whatever we were passed. it's destined for _ParseContent
-    my $content = $self->_ParseContent(@_);
+=item LastUpdated
 
-    #Lets build our mime Entity
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
 
-    my $parser = MIME::Parser->new();
-    
-    # Do work on the parsed template in memory, rather than on disk
-    $parser->output_to_core(1); 
 
-    ### Should we forgive normally-fatal errors?
-    $parser->ignore_errors(1);
-    $self->{'MIMEObj'} = eval { $parser->parse_data($content) };
-    $error = ( $@ || $parser->last_error );
+=cut
 
-    if ($error) {
-        $RT::Logger->error("$error");
-        return ( 0, $error );
-    }
 
-    # Unfold all headers
-    $self->{'MIMEObj'}->head->unfold();
+=item LastUpdatedBy
 
-    return ( 1, "Template parsed" );
-   
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
 
-}
 
-# }}}
+=cut
 
-# {{{ sub _ParseContent
 
-# Perform Template substitutions on the template
+=item Creator
 
-sub _ParseContent {
-    my $self = shift;
-    my %args = (
-        Argument       => undef,
-        TicketObj      => undef,
-        TransactionObj => undef,
-        @_
-    );
-
-    # Might be subject to change
-    use Text::Template;
-
-    $T::Ticket      = $args{'TicketObj'};
-    $T::Transaction = $args{'TransactionObj'};
-    $T::Argument    = $args{'Argument'};
-    $T::rtname      = $RT::rtname;
-
-    # We need to untaint the content of the template, since we'll be working
-    # with it
-    my $content = $self->Content();
-    $content =~ s/^(.*)$/$1/;
-    $template = Text::Template->new(
-        TYPE   => STRING,
-        SOURCE => $content
-    );
-
-    my $retval = $template->fill_in( PACKAGE => T );
-    return ($retval);
-}
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
 
-# }}}
 
-# {{{ sub QueueObj
+=cut
 
-=head2 QueueObj
 
-Takes nothing. returns this ticket's queue object
+=item Created
+
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
+
 
 =cut
 
-sub QueueObj {
-    my $self = shift;
-    if ( !defined $self->{'queue'} ) {
-        require RT::Queue;
-        $self->{'queue'} = RT::Queue->new( $self->CurrentUser );
-
-        unless ( $self->{'queue'} ) {
-            $RT::Logger->crit(
-                "RT::Queue->new(" . $self->CurrentUser . ") returned false" );
-            return (undef);
-        }
-        my ($result) = $self->{'queue'}->Load( $self->__Value('Queue') );
-
-    }
-    return ( $self->{'queue'} );
-}
 
-# }}}
 
-# {{{ sub CurrentUserHasQueueRight
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        Queue => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Name => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Description => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        Type => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        Language => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        TranslationOf => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Content => 
+		{read => 1, write => 1, type => 'blob', default => ''},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+
+ }
+};
+
+
+        eval "require RT::Template_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Template_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Template_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Template_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Template_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Template_Local.pm}) {
+            die $@;
+        };
 
-=head2 CurrentUserHasQueueRight
 
-Helper function to call the template's queue's CurrentUserHasQueueRight with the passed in args.
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Template_Overlay, RT::Template_Vendor, RT::Template_Local
 
 =cut
 
-sub CurrentUserHasQueueRight {
-    my $self = shift;
-    return ( $self->QueueObj->CurrentUserHasRight(@_) );
-}
 
-# }}}
 1;
diff --git a/rt/lib/RT/Templates.pm b/rt/lib/RT/Templates.pm
index b5b483c96..37db84086 100755
--- a/rt/lib/RT/Templates.pm
+++ b/rt/lib/RT/Templates.pm
@@ -1,122 +1,115 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Templates.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::Templates - a collection of RT Template objects
+=head1 NAME
 
+  RT::Templates -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::Templates;
+  use RT::Templates
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Templates);
-
-=end testing
-
 =cut
 
 package RT::Templates;
-use RT::EasySearch;
-@ISA= qw(RT::EasySearch);
 
+use RT::SearchBuilder;
+use RT::Template;
 
-# {{{ sub _Init
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-=head2 _Init
-
-  Returns RT::Templates specific init info like table and primary key names
-
-=cut
 
 sub _Init {
-    
     my $self = shift;
-    $self->{'table'} = "Templates";
-    $self->{'primary_key'} = "id";
-    return ($self->SUPER::_Init(@_));
+    $self->{'table'} = 'Templates';
+    $self->{'primary_key'} = 'id';
+
+
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
-# {{{ LimitToNotInQueue
 
-=head2 LimitToNotInQueue
+=item NewItem
 
-Takes a queue id # and limits the returned set of templates to those which 
-aren't that queue's templates.
+Returns an empty new RT::Template item
 
 =cut
 
-sub LimitToNotInQueue {
+sub NewItem {
     my $self = shift;
-    my $queue_id = shift;
-    $self->Limit(FIELD => 'Queue',
-                 VALUE => "$queue_id",
-                 OPERATOR => '!='
-                );
+    return(RT::Template->new($self->CurrentUser));
 }
-# }}}
 
-# {{{ LimitToGlobal
+        eval "require RT::Templates_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Templates_Overlay.pm}) {
+            die $@;
+        };
 
-=head2 LimitToGlobal
+        eval "require RT::Templates_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Templates_Vendor.pm}) {
+            die $@;
+        };
 
-Takes no arguments. Limits the returned set to "Global" templates
-which can be used with any queue.
+        eval "require RT::Templates_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Templates_Local.pm}) {
+            die $@;
+        };
 
-=cut
 
-sub LimitToGlobal {
-    my $self = shift;
-    my $queue_id = shift;
-    $self->Limit(FIELD => 'Queue',
-                 VALUE => "0",
-                 OPERATOR => '='
-                );
-}
-# }}}
 
-# {{{ LimitToQueue
 
-=head2 LimitToQueue
+=head1 SEE ALSO
 
-Takes a queue id # and limits the returned set of templates to that queue's
-templates
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
-=cut
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-sub LimitToQueue {
-    my $self = shift;
-    my $queue_id = shift;
-    $self->Limit(FIELD => 'Queue',
-                 VALUE => "$queue_id",
-                 OPERATOR => '='
-                );
-}
-# }}}
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
-# {{{ sub NewItem 
+   no warnings qw(redefine);
 
-=head2 NewItem
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
-Returns a new empty Template object
+RT::Templates_Overlay, RT::Templates_Vendor, RT::Templates_Local
 
 =cut
 
-sub NewItem  {
-  my $self = shift;
-
-  use RT::Template;
-  my $item = new RT::Template($self->CurrentUser);
-  return($item);
-}
-# }}}
 
 1;
-
diff --git a/rt/lib/RT/TestHarness.pm b/rt/lib/RT/TestHarness.pm
deleted file mode 100644
index 160e9e636..000000000
--- a/rt/lib/RT/TestHarness.pm
+++ /dev/null
@@ -1,14 +0,0 @@
-use lib "/opt/rt2/etc/";
-
-use RT::Interface::CLI  qw(CleanEnv LoadConfig DBConnect 
-			   GetCurrentUser GetMessageContent);
-
-#Clean out all the nasties from the environment
-CleanEnv();
-
-#Load etc/config.pm and drop privs
-LoadConfig();
-
-
-use RT;
-RT::Init;
diff --git a/rt/lib/RT/Ticket.pm b/rt/lib/RT/Ticket.pm
index f7275e4e3..2f075a20c 100755
--- a/rt/lib/RT/Ticket.pm
+++ b/rt/lib/RT/Ticket.pm
@@ -1,3004 +1,662 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Ticket.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-2001 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
 #
 
-=head1 NAME
+use strict;
 
-  RT::Ticket - RT ticket object
 
-=head1 SYNOPSIS
+=head1 NAME
 
-  use RT::Ticket;
-  my $ticket = new RT::Ticket($CurrentUser);
-  $ticket->Load($ticket_id);
+RT::Ticket
 
-=head1 DESCRIPTION
 
-This module lets you manipulate RT\'s ticket object.
+=head1 SYNOPSIS
 
+=head1 DESCRIPTION
 
 =head1 METHODS
 
 =cut
 
-
-
 package RT::Ticket;
+use RT::Record; 
 use RT::Queue;
-use RT::User;
-use RT::Record;
-use RT::Link;
-use RT::Links;
-use RT::Date;
-use RT::Watcher;
-
-
-@ISA= qw(RT::Record);
-
 
-=begin testing
 
-use RT::TestHarness;
-
-ok(require RT::Ticket, "Loading the RT::Ticket library");
-
-=end testing
-
-=cut
-
-# {{{ sub _Init
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
 
 sub _Init {
-    my $self = shift;
-    $self->{'table'} = "Tickets";
-    return ($self->SUPER::_Init(@_));
-}
-
-# }}}
-
-# {{{ sub Load
-
-=head2 Load
-
-Takes a single argument. This can be a ticket id, ticket alias or 
-local ticket uri.  If the ticket can't be loaded, returns undef.
-Otherwise, returns the ticket id.
-
-=cut
-
-sub Load {
-   my $self = shift;
-   my $id = shift;
-
-   #TODO modify this routine to look at EffectiveId and do the recursive load
-   # thing. be careful to cache all the interim tickets we try so we don't loop forever.
-   
-   #If it's a local URI, turn it into a ticket id
-   if ($id =~ /^$RT::TicketBaseURI(\d+)$/)  {
-       $id = $1;
-   }
-   #If it's a remote URI, we're going to punt for now
-   elsif ($id =~ '://' ) {
-       return (undef);
-   }
-   
-   #If we have an integer URI, load the ticket
-   if ( $id =~ /^\d+$/ ) {
-       my $ticketid = $self->LoadById($id);
-   
-       unless ($ticketid) {
-	   $RT::Logger->debug("$self tried to load a bogus ticket: $id\n");
-	   return(undef);
-       }
-   }
-   
-   #It's not a URI. It's not a numerical ticket ID. Punt!
-   else {
-       return(undef);
-   }
-   
-   #If we're merged, resolve the merge.
-   if (($self->EffectiveId) and
-       ($self->EffectiveId != $self->Id)) {
-	   return ($self->Load($self->EffectiveId));
-       }
-
-   #Ok. we're loaded. lets get outa here.
-   return ($self->Id);
-   
-}
-
-# }}}
+  my $self = shift; 
 
-# {{{ sub LoadByURI
-
-=head2 LoadByURI
-
-Given a local ticket URI, loads the specified ticket.
-
-=cut
-
-sub LoadByURI {
-    my $self = shift;
-    my $uri = shift;
-    
-    if ($uri =~ /^$RT::TicketBaseURI(\d+)$/) {
-        my $id = $1;
-        return ($self->Load($id));
-    }
-    else {
-        return(undef);
-    }
+  $self->Table('Tickets');
+  $self->SUPER::_Init(@_);
 }
 
-# }}}
-
-# {{{ sub Create
-
-=head2 Create (ARGS)
-
-Arguments: ARGS is a hash of named parameters.  Valid parameters are:
-
-  Queue  - Either a Queue object or a Queue Name
-  Requestor -  A reference to a list of RT::User objects, email addresses or RT user Names
-  Cc  - A reference to a list of RT::User objects, email addresses or Names
-  AdminCc  - A reference to a  list of RT::User objects, email addresses or Names
-  Type -- The ticket\'s type. ignore this for now
-  Owner -- This ticket\'s owner. either an RT::User object or this user\'s id
-  Subject -- A string describing the subject of the ticket
-  InitialPriority -- an integer from 0 to 99
-  FinalPriority -- an integer from 0 to 99
-  Status -- any valid status (Defined in RT::Queue)
-  TimeWorked -- an integer
-  TimeLeft -- an integer
-  Starts -- an ISO date describing the ticket\'s start date and time in GMT
-  Due -- an ISO date describing the ticket\'s due date and time in GMT
-  MIMEObj -- a MIME::Entity object with the content of the initial ticket request.
-
-  KeywordSelect-<id> -- an array of keyword ids for that keyword select
-
-
-Returns: TICKETID, Transaction Object, Error Message
-
-
-=begin testing
-
-my $t = RT::Ticket->new($RT::SystemUser);
-
-ok( $t->Create(Queue => 'General', Subject => 'This is a subject'), "Ticket Created");
-
-ok ( my $id = $t->Id, "Got ticket id");
-
-=end testing
-
-=cut
-
-sub Create {
-    my $self = shift;
-    
-    my %args = (
-		Queue => undef,
-		Requestor => undef,
-		Cc => undef,
-		AdminCc => undef,
-		Type => 'ticket',
-		Owner => $RT::Nobody->UserObj,
-		Subject => '[no subject]',
-		InitialPriority => undef,
-		FinalPriority => undef,
-		Status => 'new',
-		TimeWorked => "0",
-		TimeLeft => 0,
-		Due => undef,
-		Starts => undef,
-		MIMEObj => undef,
-		@_);
-
-    my ($ErrStr, $QueueObj, $Owner, $resolved);
-    my (@non_fatal_errors);
-    
-    my $now = RT::Date->new($self->CurrentUser);
-    $now->SetToNow();
-
-    if ( (defined($args{'Queue'})) && (!ref($args{'Queue'})) ) {
-	$QueueObj=RT::Queue->new($RT::SystemUser);
-	$QueueObj->Load($args{'Queue'});
-    }
-    elsif (ref($args{'Queue'}) eq 'RT::Queue') {
-	$QueueObj=RT::Queue->new($RT::SystemUser);
-	$QueueObj->Load($args{'Queue'}->Id);
-    }
-    else {
-	$RT::Logger->debug("$self ". $args{'Queue'} . 
-			 " not a recognised queue object.");
-    }
-  
-    #Can't create a ticket without a queue.
-    unless (defined ($QueueObj)) {
-	$RT::Logger->debug( "$self No queue given for ticket creation.");
-	return (0, 0,'Could not create ticket. Queue not set');
-    }
-    
-    #Now that we have a queue, Check the ACLS
-    unless ($self->CurrentUser->HasQueueRight(Right => 'CreateTicket',
-					      QueueObj => $QueueObj )) {
-	return (0,0,"No permission to create tickets in the queue '". 
-		$QueueObj->Name."'.");
-    }
-    
-    #Since we have a queue, we can set queue defaults
-    #Initial Priority
-
-    # If there's no queue default initial priority and it's not set, set it to 0
-    $args{'InitialPriority'} = ($QueueObj->InitialPriority || 0)
-      unless (defined $args{'InitialPriority'});
-	
-    #Final priority 
-
-    # If there's no queue default final priority and it's not set, set it to 0
-    $args{'FinalPriority'} = ($QueueObj->FinalPriority  || 0)
-      unless (defined $args{'FinalPriority'});
-    
-    
-    #TODO we should see what sort of due date we're getting, rather +
-    # than assuming it's in ISO format.
-    
-    #Set the due date. if we didn't get fed one, use the queue default due in
-    my $due = new RT::Date($self->CurrentUser);
-    if (defined $args{'Due'}) {
-	$due->Set (Format => 'ISO',
-		   Value => $args{'Due'});
-    }	
-    elsif (defined ($QueueObj->DefaultDueIn)) {
-	$due->SetToNow;
-	$due->AddDays($QueueObj->DefaultDueIn);
-    }	
-    
-    my $starts = new RT::Date($self->CurrentUser);
-    if (defined $args{'Starts'}) {
-	$starts->Set (Format => 'ISO',
-		   Value => $args{'Starts'});
-    }
-
-	
-    # {{{ Deal with setting the owner
-    
-    if (ref($args{'Owner'}) eq 'RT::User') {
-	$Owner = $args{'Owner'};
-    }
-    #If we've been handed something else, try to load the user.
-    elsif ($args{'Owner'}) {
-	$Owner = new RT::User($self->CurrentUser);
-	$Owner->Load($args{'Owner'});
-	
-    }
-    #If we can't handle it, call it nobody
-    else {
-	if (ref($args{'Owner'})) {
-	    $RT::Logger->warning("$ticket ->Create called with an Owner of ".
-		 "type ".ref($args{'Owner'}) .". Defaulting to nobody.\n");
-
-	    push @non_fatal_errors, "Invalid owner. Defaulting to 'nobody'.";
-	}
-	else { 
-	    $RT::Logger->warning("$self ->Create called with an ".
-				 "unknown datatype for Owner: ".$args{'Owner'} .
-				 ". Defaulting to Nobody.\n");
-	}
-    }
-    
-    #If we have a proposed owner and they don't have the right 
-    #to own a ticket, scream about it and make them not the owner
-    if ((defined ($Owner)) and
-	($Owner->Id != $RT::Nobody->Id) and 
-	(!$Owner->HasQueueRight( QueueObj => $QueueObj, 
-				 Right => 'OwnTicket'))) {
-	
-	$RT::Logger->warning("$self user ".$Owner->Name . "(".$Owner->id .
-			     ") was proposed ".
-			     "as a ticket owner but has no rights to own ".
-			     "tickets in this queue\n");
-
-	push @non_fatal_errors, "Invalid owner. Defaulting to 'nobody'.";
-
-	$Owner = undef;
-    }
-    
-    #If we haven't been handed a valid owner, make it nobody.
-    unless (defined ($Owner)) {
-	$Owner = new RT::User($self->CurrentUser);
-	$Owner->Load($RT::Nobody->UserObj->Id);
-    }	
-
-    # }}}
-
-    unless ($self->ValidateStatus($args{'Status'})) {
-	return (0,0,'Invalid value for status');
-    }
-
-    if ($args{'Status'} eq 'resolved') {
-	$resolved = $now->ISO;
-    } else{
-	$resolved = undef;
-    }
-
-    my $id = $self->SUPER::Create(
-				  Queue => $QueueObj->Id,
-				  Owner => $Owner->Id,
-				  Subject => $args{'Subject'},
-				  InitialPriority => $args{'InitialPriority'},
-				  FinalPriority => $args{'FinalPriority'},
-				  Priority => $args{'InitialPriority'},
-				  Status => $args{'Status'},
-				  TimeWorked => $args{'TimeWorked'},
-				  TimeLeft => $args{'TimeLeft'},
-				  Type => $args{'Type'},	
-				  Starts => $starts->ISO,
-				  Resolved => $resolved,
-				  Due => $due->ISO
-				 );
-    #Set the ticket's effective ID now that we've created it.
-    my ($val, $msg) = $self->__Set(Field => 'EffectiveId', Value => $id);
-    
-    unless ($val) {
-	$RT::Logger->err("$self ->Create couldn't set EffectiveId: $msg\n");
-    }	
-     
-
-    my $watcher;
-    foreach $watcher (@{$args{'Cc'}}) {
-	my ($wval, $wmsg) = 
-	  $self->_AddWatcher( Type => 'Cc', Person => $watcher, Silent => 1);
-	push @non_fatal_errors, $wmsg	unless ($wval);
-    }	
-
-    foreach $watcher (@{$args{'Requestor'}}) {
-	my ($wval, $wmsg) = 
-	  $self->_AddWatcher( Type => 'Requestor', Person => $watcher, Silent => 1);
-	push @non_fatal_errors, $wmsg	unless ($wval);
-    }
-
-    foreach $watcher (@{$args{'AdminCc'}}) {
-	# Note that we're using AddWatcher, rather than _AddWatcher, as we 
-	# actually _want_ that ACL check. Otherwise, random ticket creators
-	# could make themselves adminccs and maybe get ticket rights. that would
-	# be poor
-	my ($wval, $wmsg) = 
-	  $self->AddWatcher( Type => 'AdminCc', Person => $watcher, Silent => 1);
-	push @non_fatal_errors, $wmsg	unless ($wval);
-    }
-
-    # Iterate through all the KeywordSelect-<int> params passed in, calling _AddKeyword
-    # for each of them
-
-
-    foreach my $key (keys %args) {
-
-	next unless ($key =~ /^KeywordSelect-(.*)$/);
-	
-	my $ks = $1;
-
-
-	my @keywords = ref($args{$key}) eq 'ARRAY' ?
-	      @{$args{$key}} : ($args{$key});
-	
-	foreach my $keyword (@keywords) {  
-	    my ($kval, $kmsg) = $self->_AddKeyword(KeywordSelect => $ks,
-						   Keyword => $keyword,
-						   Silent => 1);
-	}	
-	push @non_fatal_errors, $kmsg unless ($kval);
-    }
-
-    
-    
-    #Add a transaction for the create
-    my ($Trans, $Msg, $TransObj) = 
-	$self->_NewTransaction( Type => "Create",
-			  	TimeTaken => 0, 
-			  	MIMEObj=>$args{'MIMEObj'});
-    
-    # Logging
-    if ($self->Id && $Trans) {
-	$ErrStr = "Ticket ".$self->Id . " created in queue '". $QueueObj->Name. 
-	  "'.\n" . join("\n", @non_fatal_errors);
-	
-	$RT::Logger->info($ErrStr);
-    }
-    else {
-	# TODO where does this get errstr from?
-	$RT::Logger->warning("Ticket couldn't be created: $ErrStr");
-    }
-    
-    return($self->Id, $TransObj->Id, $ErrStr);
-}
 
-# }}}
 
-# {{{ sub Import
 
-=head2 Import PARAMHASH
 
-Import a ticket. 
-Doesn\'t create a transaction. 
-Doesn\'t supply queue defaults, etc.
+=item Create PARAMHASH
 
-Arguments are identical to Create(), with the addition of
-    Id -    Ticket Id
+Create takes a hash of values and creates a row in the database:
 
-Returns: TICKETID
+  int(11) 'EffectiveId'.
+  int(11) 'Queue'.
+  varchar(16) 'Type'.
+  int(11) 'IssueStatement'.
+  int(11) 'Resolution'.
+  int(11) 'Owner'.
+  varchar(200) 'Subject' defaults to '[no subject]'.
+  int(11) 'InitialPriority'.
+  int(11) 'FinalPriority'.
+  int(11) 'Priority'.
+  int(11) 'TimeEstimated'.
+  int(11) 'TimeWorked'.
+  varchar(10) 'Status'.
+  int(11) 'TimeLeft'.
+  datetime 'Told'.
+  datetime 'Starts'.
+  datetime 'Started'.
+  datetime 'Due'.
+  datetime 'Resolved'.
+  smallint(6) 'Disabled'.
 
 =cut
 
 
-sub Import {
-    my $self = shift;
-    my ( $ErrStr, $QueueObj, $Owner);
-    
-    my %args = (id => undef,
-		EffectiveId => undef,
-		Queue => undef,
-		Requestor => undef,
-		Type => 'ticket',
-		Owner => $RT::Nobody->Id,
-		Subject => '[no subject]',
-		InitialPriority => undef,
-		FinalPriority => undef,
-		Status => 'new',
-		TimeWorked => "0",
-		Due => undef,
-		Created => undef,
-		Updated => undef,
-	Resolved => undef,
-		Told => undef,
-		@_);
-    
-    if ( (defined($args{'Queue'})) && (!ref($args{'Queue'})) ) {
-	$QueueObj=RT::Queue->new($RT::SystemUser);
-	$QueueObj->Load($args{'Queue'});
-	#TODO error check this and return 0 if it\'s not loading properly +++
-    }
-    elsif (ref($args{'Queue'}) eq 'RT::Queue') {
-	$QueueObj=RT::Queue->new($RT::SystemUser);
-	$QueueObj->Load($args{'Queue'}->Id);
-    }
-    else {
-	$RT::Logger->debug("$self ". $args{'Queue'} . 
-			   " not a recognised queue object.");
-    }
-    
-    #Can't create a ticket without a queue.
-    unless (defined ($QueueObj) and $QueueObj->Id) {
-	$RT::Logger->debug( "$self No queue given for ticket creation.");
-	return (0,'Could not create ticket. Queue not set');
-    }
-    
-    #Now that we have a queue, Check the ACLS
-    unless ($self->CurrentUser->HasQueueRight(Right => 'CreateTicket',
-					      QueueObj => $QueueObj )) {
-	return (0,"No permission to create tickets in the queue '". 
-		$QueueObj->Name."'.");
-    }
-    
-    
-
-
-    # {{{ Deal with setting the owner
-      
-    # Attempt to take user object, user name or user id.
-    # Assign to nobody if lookup fails.
-    if (defined ($args{'Owner'})) { 
-	if ( ref($args{'Owner'}) ) {
-	    $Owner = $args{'Owner'};
-	}
-	else {
-	    $Owner = new RT::User($self->CurrentUser);
-	    $Owner->Load($args{'Owner'});
-	    if ( ! defined($Owner->id) ) {
-		$Owner->Load($RT::Nobody->id);
-	    }
-	}
-    }
-    
-
-    #If we have a proposed owner and they don't have the right 
-    #to own a ticket, scream about it and make them not the owner
-    if ((defined ($Owner)) and
-	($Owner->Id != $RT::Nobody->Id) and 
-	(!$Owner->HasQueueRight( QueueObj => $QueueObj, 
-				 Right => 'OwnTicket'))) {
-	
-	$RT::Logger->warning("$self user ".$Owner->Name . "(".$Owner->id .
-			     ") was proposed ".
-			     "as a ticket owner but has no rights to own ".
-			     "tickets in '".$QueueObj->Name."'\n");
-	
-	$Owner = undef;
-    }
-    
-    #If we haven't been handed a valid owner, make it nobody.
-    unless (defined ($Owner)) {
-	$Owner = new RT::User($self->CurrentUser);
-	$Owner->Load($RT::Nobody->UserObj->Id);
-    }	
-
-    # }}}
-
-    unless ($self->ValidateStatus($args{'Status'})) {
-	return (0,"'$args{'Status'}' is an invalid value for status");
-    }
-    
-    $self->{'_AccessibleCache'}{Created} = { 'read'=>1, 'write'=>1 };
-    $self->{'_AccessibleCache'}{Creator} = { 'read'=>1, 'auto'=>1 };
-    $self->{'_AccessibleCache'}{LastUpdated} = { 'read'=>1, 'write'=>1 };
-    $self->{'_AccessibleCache'}{LastUpdatedBy} = { 'read'=>1, 'auto'=>1 };
-
-
-    # If we're coming in with an id, set that now.
-    my $EffectiveId = undef;
-    if ($args{'id'}) {
-	$EffectiveId = $args{'id'};
-
-    }
-
-
-    my $id = $self->SUPER::Create(
-				  id => $args{'id'},
-				  EffectiveId => $EffectiveId,
-				  Queue => $QueueObj->Id,
-				  Owner => $Owner->Id,
-				  Subject => $args{'Subject'},
-				  InitialPriority => $args{'InitialPriority'},
-				  FinalPriority => $args{'FinalPriority'},
-				  Priority => $args{'InitialPriority'},
-				  Status => $args{'Status'},
-				  TimeWorked => $args{'TimeWorked'},
-				  Type => $args{'Type'},	
-				  Created => $args{'Created'},
-				  Told => $args{'Told'},
-				  LastUpdated => $args{'Updated'},
-	Resolved => $args{Resolved},
-				  Due => $args{'Due'},
-				 );
-
-
-
-    # If the ticket didn't have an id
-    # Set the ticket's effective ID now that we've created it.
-    if ($args{'id'} ) { 
-	  $self->Load($args{'id'});
-    }
-    else {
-	   my ($val, $msg) = $self->__Set(Field => 'EffectiveId', Value => $id);
-    
-    	   unless ($val) {
-	    $RT::Logger->err($self."->Import couldn't set EffectiveId: $msg\n");
-   	   }	
-    } 
-
-    my $watcher;
-    foreach $watcher (@{$args{'Cc'}}) {
-	$self->_AddWatcher( Type => 'Cc', Person => $watcher, Silent => 1);
-    }	
-    foreach $watcher (@{$args{'AdminCc'}}) {
-	$self->_AddWatcher( Type => 'AdminCc', Person => $watcher, Silent => 1);
-    }	
-    foreach $watcher (@{$args{'Requestor'}}) {
-	$self->_AddWatcher( Type => 'Requestor', Person => $watcher, Silent => 1);
-    }
-    
-    return($self->Id, $ErrStr);
-}
-
-# }}}
-
-# {{{ sub Delete
-
-sub Delete {
-    my $self = shift;
-    return (0, 'Deleting this object would violate referential integrity.'.
-	    ' That\'s bad.');
-}
-# }}}
-
-# {{{ Routines dealing with watchers.
-
-# {{{ Routines dealing with adding new watchers
-
-# {{{ sub AddWatcher
-
-=head2 AddWatcher
-
-AddWatcher takes a parameter hash. The keys are as follows:
-
-Email
-Type
-Owner
-
-If the watcher you\'re trying to set has an RT account, set the Owner paremeter to their User Id. Otherwise, set the Email parameter to their Email address.
-
-=cut
-
-sub AddWatcher {
-    my $self = shift;
-    my %args = ( Email => undef,
-		 Type => undef,
-		 Owner => undef,
-		 @_
-	       );
-
-    # {{{ Check ACLS
-    #If the watcher we're trying to add is for the current user
-    if ( ( $self->CurrentUser->EmailAddress &&
-           ($args{'Email'} eq $self->CurrentUser->EmailAddress) ) or
-           ($args{'Owner'} eq $self->CurrentUser->Id) 
-        ) {
-
-	
-	#  If it's an AdminCc and they don't have 
-	#   'WatchAsAdminCc' or 'ModifyTicket', bail
-	if ($args{'Type'} eq 'AdminCc') {
-	    unless ($self->CurrentUserHasRight('ModifyTicket') or 
-		    $self->CurrentUserHasRight('WatchAsAdminCc')) {
-		return(0, 'Permission Denied');
-	    }
-	}
-
-	#  If it's a Requestor or Cc and they don't have
-	#   'Watch' or 'ModifyTicket', bail
-	elsif (($args{'Type'} eq 'Cc') or 
-	       ($args{'Type'} eq 'Requestor')) {
-		   
-	    unless ($self->CurrentUserHasRight('ModifyTicket') or 
-		    $self->CurrentUserHasRight('Watch')) {
-		return(0, 'Permission Denied');
-	    }
-	}
-	else {
-	    $RT::Logger->warn("$self -> AddWatcher hit code".
-			      " it never should. We got passed ".
-			      " a type of ". $args{'Type'});
-	    return (0,'Error in parameters to TicketAddWatcher');
-	}
-    }
-    # If the watcher isn't the current user 
-    # and the current user  doesn't have 'ModifyTicket'
-    # bail
-    else {
-	unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	    return (0, "Permission Denied");
-	}
-    }
-    # }}}
-
-    return ($self->_AddWatcher(%args));
-}
-
-
-#This contains the meat of AddWatcher. but can be called from a routine like
-# Create, which doesn't need the additional acl check
-sub _AddWatcher {
-    my $self = shift;
-    my %args = (
-		Type => undef,
-		Silent => undef,
-		Email => undef,
-		Owner => 0,
-		Person => undef,
-		@_ );
-    
-    
-    
-    #clear the watchers cache
-    $self->{'watchers_cache'} = undef;
-    
-    if (defined $args{'Person'}) {
-	#if it's an RT::User object, pull out the id and shove it in Owner
-	if (ref ($args{'Person'}) =~ /RT::User/) {
-	    $args{'Owner'} = $args{'Person'}->id;
-	}	
-	#if it's an int, shove it in Owner
-	elsif ($args{'Person'} =~ /^\d+$/) {
-	    $args{'Owner'} = $args{'Person'};
-	}
-	#if it's an email address, shove it in Email
-       else {
-	   $args{'Email'} = $args{'Person'};
-       }	
-    }	
-
-    # Turn an email address int a watcher if we possibly can.
-    if ($args{'Email'}) {
-	my $watcher = new RT::User($self->CurrentUser);
-	$watcher->LoadByEmail($args{'Email'});
-	if ($watcher->Id) {
-		$args{'Owner'} = $watcher->Id;
-		delete $args{'Email'};
-	}
-    }
-
-
-    # see if this user is already a watcher. if we have an owner, check it
-    # otherwise, we've got an email-address watcher. use that.
-
-    if ($self->IsWatcher(Type => $args{'Type'},
-                         Id => ($args{'Owner'} || $args{'Email'}) ) ) {
-
-
-        return(0, 'That user is already that sort of watcher for this ticket');
-    }
-
-    
-    require RT::Watcher;
-    my $Watcher = new RT::Watcher ($self->CurrentUser);
-    my ($retval, $msg) = ($Watcher->Create( Value => $self->Id,
-					    Scope => 'Ticket',
-					    Email => $args{'Email'},
-					    Type => $args{'Type'},
-					    Owner => $args{'Owner'},
-					  ));
-    
-    unless ($args{'Silent'}) {
-	$self->_NewTransaction( Type => 'AddWatcher',
-				NewValue => $Watcher->Email,
-				Field => $Watcher->Type);
-    }
-    
-    return ($retval, $msg);
-}
-
-# }}}
-
-# {{{ sub AddRequestor
-
-=head2 AddRequestor
-
-AddRequestor takes what AddWatcher does, except it presets
-the "Type" parameter to \'Requestor\'
-
-=cut
-
-sub AddRequestor {
-   my $self = shift;
-   return ($self->AddWatcher ( Type => 'Requestor', @_));
-}
-
-# }}}
-
-# {{{ sub AddCc
-
-=head2 AddCc
-
-AddCc takes what AddWatcher does, except it presets
-the "Type" parameter to \'Cc\'
-
-=cut
-
-sub AddCc {
-   my $self = shift;
-   return ($self->AddWatcher ( Type => 'Cc', @_));
-}
-# }}}
-	
-# {{{ sub AddAdminCc
-
-=head2 AddAdminCc
-
-AddAdminCc takes what AddWatcher does, except it presets
-the "Type" parameter to \'AdminCc\'
-
-=cut
-
-sub AddAdminCc {
-   my $self = shift;
-   return ($self->AddWatcher ( Type => 'AdminCc', @_));
-}
-
-# }}}
-
-# }}}
-
-# {{{ sub DeleteWatcher
-
-=head2 DeleteWatcher id [type]
-
-DeleteWatcher takes a single argument which is either an email address 
-or a watcher id.  
-If the first argument is an email address, you need to specify the watcher type you're talking
-about as the second argument. Valid values are 'Requestor', 'Cc' or 'AdminCc'.
-It removes that watcher from this Ticket\'s list of watchers.
-
-
-=cut
 
-#TODO It is lame that you can't call this the same way you can call AddWatcher
 
-sub DeleteWatcher {
+sub Create {
     my $self = shift;
-    my $id = shift;
-
-    my $type;
-    
-    $type = shift if (@_);
-    
-    my $Watcher = new RT::Watcher($self->CurrentUser);
-    
-    #If it\'s a numeric watcherid
-    if ($id =~ /^(\d*)$/) {
-	$Watcher->Load($id);
-    }
-    
-    #Otherwise, we'll assume it's an email address
-    elsif ($type) {
-	my ($result, $msg) = 
-	  $Watcher->LoadByValue( Email => $id,
-				 Scope => 'Ticket',
-				 Value => $self->id,
-				 Type => $type);
-	return (0,$msg) unless ($result);
-    }
-    
-    else {
-	return(0,"Can\'t delete a watcher by email address without specifying a type");
-    }
-    
-    # {{{ Check ACLS 
-
-    #If the watcher we're trying to delete is for the current user
-    if ($Watcher->Email eq $self->CurrentUser->EmailAddress) {
-		
-	#  If it's an AdminCc and they don't have 
-	#   'WatchAsAdminCc' or 'ModifyTicket', bail
-	if ($Watcher->Type eq 'AdminCc') {
-	    unless ($self->CurrentUserHasRight('ModifyTicket') or 
-		    $self->CurrentUserHasRight('WatchAsAdminCc')) {
-		return(0, 'Permission Denied');
-	    }
-	}
-
-	#  If it's a Requestor or Cc and they don't have
-	#   'Watch' or 'ModifyTicket', bail
-	elsif (($Watcher->Type eq 'Cc') or 
-	       ($Watcher->Type eq 'Requestor')) {
-		   
-	    unless ($self->CurrentUserHasRight('ModifyTicket') or 
-		    $self->CurrentUserHasRight('Watch')) {
-		return(0, 'Permission Denied');
-	    }
-	}
-	else {
-	    $RT::Logger->warn("$self -> DeleteWatcher hit code".
-			      " it never should. We got passed ".
-			      " a type of ". $args{'Type'});
-	    return (0,'Error in parameters to $self DeleteWatcher');
-	}
-    }
-    # If the watcher isn't the current user 
-    # and the current user  doesn't have 'ModifyTicket'
-    # bail
-    else {
-	unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	    return (0, "Permission Denied");
-	}
-    }	
-    
-    # }}}
-    
-    unless (($Watcher->Scope eq 'Ticket') and
-	    ($Watcher->Value == $self->id) ) {
-	return (0, "Not a watcher for this ticket");
-    }
-
-
-    #Clear out the watchers hash.
-    $self->{'watchers'} = undef;
-    
-    #If we\'ve validated that it is a watcher for this ticket 
-    $self->_NewTransaction ( Type => 'DelWatcher',        
-			     OldValue => $Watcher->Email,
-			     Field => $Watcher->Type,
-			   );
-    
-    my $retval = $Watcher->Delete();
-    
-    unless ($retval) {
-	return(0,"Watcher could not be deleted. Database inconsistency possible.");
-    }
-    
-    return(1, "Watcher deleted");
-}
-
-# {{{ sub DeleteRequestor
-
-=head2 DeleteRequestor EMAIL
+    my %args = ( 
+                EffectiveId => '0',
+                Queue => '0',
+                Type => '',
+                IssueStatement => '0',
+                Resolution => '0',
+                Owner => '0',
+                Subject => '[no subject]',
+                InitialPriority => '0',
+                FinalPriority => '0',
+                Priority => '0',
+                TimeEstimated => '0',
+                TimeWorked => '0',
+                Status => '',
+                TimeLeft => '0',
+                Told => '',
+                Starts => '',
+                Started => '',
+                Due => '',
+                Resolved => '',
+                Disabled => '0',
 
-Takes an email address. It calls DeleteWatcher with a preset 
-type of 'Requestor'
-
-
-=cut
+		  @_);
+    $self->SUPER::Create(
+                         EffectiveId => $args{'EffectiveId'},
+                         Queue => $args{'Queue'},
+                         Type => $args{'Type'},
+                         IssueStatement => $args{'IssueStatement'},
+                         Resolution => $args{'Resolution'},
+                         Owner => $args{'Owner'},
+                         Subject => $args{'Subject'},
+                         InitialPriority => $args{'InitialPriority'},
+                         FinalPriority => $args{'FinalPriority'},
+                         Priority => $args{'Priority'},
+                         TimeEstimated => $args{'TimeEstimated'},
+                         TimeWorked => $args{'TimeWorked'},
+                         Status => $args{'Status'},
+                         TimeLeft => $args{'TimeLeft'},
+                         Told => $args{'Told'},
+                         Starts => $args{'Starts'},
+                         Started => $args{'Started'},
+                         Due => $args{'Due'},
+                         Resolved => $args{'Resolved'},
+                         Disabled => $args{'Disabled'},
+);
 
-sub DeleteRequestor {
-   my $self = shift;
-   my $id = shift;
-   return ($self->DeleteWatcher ($id, 'Requestor'))
 }
 
-# }}}
-
-# {{{ sub DeleteCc
-
-=head2 DeleteCc EMAIL
-
-Takes an email address. It calls DeleteWatcher with a preset 
-type of 'Cc'
-
-
-=cut
-
-sub DeleteCc {
-   my $self = shift;
-   my $id = shift;
-   return ($self->DeleteWatcher ($id, 'Cc'))
-}
-
-# }}}
-
-# {{{ sub DeleteAdminCc
-
-=head2 DeleteAdminCc EMAIL
-
-Takes an email address. It calls DeleteWatcher with a preset 
-type of 'AdminCc'
-
-
-=cut
-
-sub DeleteAdminCc {
-   my $self = shift;
-   my $id = shift;
-   return ($self->DeleteWatcher ($id, 'AdminCc'))
-}
-
-# }}}
-
-
-# }}}
 
-# {{{ sub Watchers
 
-=head2 Watchers
+=item id
 
-Watchers returns a Watchers object preloaded with this ticket\'s watchers.
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
 
-# It should return only the ticket watchers. the actual FooAsString
-# methods capture the queue watchers too. I don't feel thrilled about this,
-# but we don't want the Cc Requestors and AdminCc objects to get filled up
-# with all the queue watchers too. we've got seperate objects for that.
-  # should we rename these as s/(.*)AsString/$1Addresses/ or somesuch?
 
 =cut
 
-sub Watchers {
-  my $self = shift;
-  
-  require RT::Watchers;
-  my $watchers=RT::Watchers->new($self->CurrentUser);
-  if ($self->CurrentUserHasRight('ShowTicket')) {
-      $watchers->LimitToTicket($self->id);
-  }
-  
-  return($watchers);
-  
-}
-
-# }}}
 
-# {{{ a set of  [foo]AsString subs that will return the various sorts of watchers for a ticket/queue as a comma delineated string
+=item EffectiveId
 
-=head2 RequestorsAsString
+Returns the current value of EffectiveId. 
+(In the database, EffectiveId is stored as int(11).)
 
- B<Returns> String: All Ticket Requestor email addresses as a string.
 
-=cut
 
-sub RequestorsAsString {
-    my $self=shift;
+=item SetEffectiveId VALUE
 
-    unless ($self->CurrentUserHasRight('ShowTicket')) {
-        return undef;
-    }
-    
-    return ($self->Requestors->EmailsAsString() );
-}
 
-=head2 WatchersAsString
+Set EffectiveId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, EffectiveId will be stored as a int(11).)
 
-B<Returns> String: All Ticket Watchers email addresses as a string
 
 =cut
 
-sub WatchersAsString {
-    my $self=shift;
-
-    unless ($self->CurrentUserHasRight('ShowTicket')) {
-	return (0, "Permission Denied");
-    }
-    
-    return ($self->Watchers->EmailsAsString());
-
-}
 
-=head2 AdminCcAsString
+=item Queue
 
-returns String: All Ticket AdminCc email addresses as a string
+Returns the current value of Queue. 
+(In the database, Queue is stored as int(11).)
 
-=cut
 
 
-sub AdminCcAsString {
-    my $self=shift;
+=item SetQueue VALUE
 
-    unless ($self->CurrentUserHasRight('ShowTicket')) {
-	return undef;
-    }
-    
-    return ($self->AdminCc->EmailsAsString());
-    
-}
 
-=head2 CcAsString
+Set Queue to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Queue will be stored as a int(11).)
 
-returns String: All Ticket Ccs as a string of email addresses
 
 =cut
 
-sub CcAsString {
-    my $self=shift;
-
-    unless ($self->CurrentUserHasRight('ShowTicket')) {
-        return undef; 
-    }
-    
-    return ($self->Cc->EmailsAsString());
-
-}
-
-# }}}
-
-# {{{ Routines that return RT::Watchers objects of Requestors, Ccs and AdminCcs
 
-# {{{ sub Requestors
+=item QueueObj
 
-=head2 Requestors
+Returns the Queue Object which has the id returned by Queue
 
-Takes nothing.
-Returns this ticket's Requestors as an RT::Watchers object
-
-=cut
-
-sub Requestors {
-    my $self = shift;
-    
-    my $requestors = $self->Watchers();
-    if ($self->CurrentUserHasRight('ShowTicket')) {
-	$requestors->LimitToRequestors();
-    }	
-    
-    return($requestors);
-    
-}
-
-# }}}
-
-# {{{ sub Cc
-
-=head2 Cc
-
-Takes nothing.
-Returns a watchers object which contains this ticket's Cc watchers
-
-=cut
-
-sub Cc {
-    my $self = shift;
-    
-    my $cc = $self->Watchers();
-    
-    if ($self->CurrentUserHasRight('ShowTicket')) {
-	$cc->LimitToCc();
-    }
-    
-    return($cc);
-    
-}
-
-# }}}
-
-# {{{ sub AdminCc
-
-=head2 AdminCc
-
-Takes nothing.
-Returns this ticket\'s administrative Ccs as an RT::Watchers object
-
-=cut
-
-sub AdminCc {
-    my $self = shift;
-    
-    my $admincc = $self->Watchers();
-    if ($self->CurrentUserHasRight('ShowTicket')) {
-	$admincc->LimitToAdminCc();
-    }
-    return($admincc);
-}
-
-# }}}
-
-# }}}
-
-# {{{ IsWatcher,IsRequestor,IsCc, IsAdminCc
-
-# {{{ sub IsWatcher
-# a generic routine to be called by IsRequestor, IsCc and IsAdminCc
-
-=head2 IsWatcher
-
-Takes a param hash with the attributes Type and User. User is either a user object or string containing an email address. Returns true if that user or string
-is a ticket watcher. Returns undef otherwise
-
-=cut
-
-sub IsWatcher {
-    my $self = shift;
-
-    my %args = ( Type => 'Requestor',
-		 Email => undef,
-		 Id => undef,
-		 @_
-	       );
-    
-    my %cols = ('Type' => $args{'Type'},
-		'Scope' => 'Ticket',
-		'Value' => $self->Id,
-		'Owner' => undef,
-		'Email' => undef
-	       );
-    
-    if (ref($args{'Id'})){ 
-	#If it's a ref, it's an RT::User object;
-	$cols{'Owner'} = $args{'Id'}->Id;
-    }
-    elsif ($args{'Id'} =~ /^\d+$/) { 
-	# if it's an integer, it's a reference to an RT::User obj
-	$cols{'Owner'} = $args{'Id'};
-    }
-    else {
-	$cols{'Email'} = $args{'Id'};
-    }	
-    
-    if ($args{'Email'}) {
-	$cols{'Email'} = $args{'Email'};
-    }
-
-    my $description = join(":",%cols);
-    
-    #If we've cached a positive match...
-    if (defined $self->{'watchers_cache'}->{"$description"}) {
-	if ($self->{'watchers_cache'}->{"$description"} == 1) {
-	    return(1);
-	}
-	else { #If we've cached a negative match...
-	    return(undef);
-	}
-    }
-    
-    
-    my $watcher = new RT::Watcher($self->CurrentUser);
-    $watcher->LoadByCols(%cols);
-    
-    
-    if ($watcher->id) {
-	$self->{'watchers_cache'}->{"$description"} = 1;
-	return(1);
-    }	
-    else {
-	$self->{'watchers_cache'}->{"$description"} = 0;
-	return(undef);
-    }
-    
-}
-# }}}
-
-# {{{ sub IsRequestor
-
-=head2 IsRequestor
-  
-  Takes an email address, RT::User object or integer (RT user id)
-  Returns true if the string is a requestor of the current ticket.
-
-
-=cut
-
-sub IsRequestor {
-    my $self = shift;
-    my $person = shift;
-
-    return ($self->IsWatcher(Type => 'Requestor', Id => $person));
-	    
-};
-
-# }}}
-
-# {{{ sub IsCc
-
-=head2 IsCc
-
-Takes a string. Returns true if the string is a Cc watcher of the current ticket.
-
-=cut
-
-sub IsCc {
-  my $self = shift;
-  my $cc = shift;
-  
-  return ($self->IsWatcher( Type => 'Cc', Id => $cc ));
-  
-}
-
-# }}}
-
-# {{{ sub IsAdminCc
-
-=head2 IsAdminCc
-
-Takes a string. Returns true if the string is an AdminCc watcher of the current ticket.
-
-=cut
-
-sub IsAdminCc {
-  my $self = shift;
-  my $person = shift;
-  
-  return ($self->IsWatcher( Type => 'AdminCc', Id => $person ));
-  
-}
-
-# }}}
-
-# {{{ sub IsOwner
-
-=head2 IsOwner
-
-  Takes an RT::User object. Returns true if that user is this ticket's owner.
-returns undef otherwise
-
-=cut
-
-sub IsOwner {
-    my $self = shift;
-    my $person = shift;
-  
-
-    # no ACL check since this is used in acl decisions
-    # unless ($self->CurrentUserHasRight('ShowTicket')) {
-    #	return(undef);
-    #   }	
-
-    
-    #Tickets won't yet have owners when they're being created.
-    unless ($self->OwnerObj->id) {
-        return(undef);
-    }
-    
-    if ($person->id == $self->OwnerObj->id) {
-	return(1);
-    }
-    else {
-	return(undef);
-    }
-}
-
-
-# }}}
-
-# }}}
-
-# }}}
-
-# {{{ Routines dealing with queues 
-
-# {{{ sub ValidateQueue
-
-sub ValidateQueue {
-  my $self = shift;
-  my $Value = shift;
-  
-  #TODO I don't think this should be here. We shouldn't allow anything to have an undef queue,
-  if (!$Value) {
-    $RT::Logger->warning( " RT:::Queue::ValidateQueue called with a null value. this isn't ok.");
-    return (1);
-  }
-  
-  my $QueueObj = RT::Queue->new($self->CurrentUser);
-  my $id = $QueueObj->Load($Value);
-  
-  if ($id) {
-    return (1);
-  }
-  else {
-    return (undef);
-  }
-}
-
-# }}}
-
-# {{{ sub SetQueue  
-
-sub SetQueue {
-    my $self = shift;
-    my $NewQueue = shift;
-
-    #Redundant. ACL gets checked in _Set;
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	return (0, "Permission Denied");
-    }
-   
- 
-    my $NewQueueObj = RT::Queue->new($self->CurrentUser);
-    $NewQueueObj->Load($NewQueue);
-    
-    unless ($NewQueueObj->Id()) {
-	return (0, "That queue does not exist");
-    }
-    
-    if ($NewQueueObj->Id == $self->QueueObj->Id) {
-	return (0, 'That is the same value');
-    }
-    unless ($self->CurrentUser->HasQueueRight(Right =>'CreateTicket',
-					      QueueObj => $NewQueueObj )) {
-	return (0, "You may not create requests in that queue.");
-    }
-    
-    unless ($self->OwnerObj->HasQueueRight(Right=> 'OwnTicket',  
-					   QueueObj => $NewQueueObj)) {
-	    $self->Untake();
-    }
-
-    return($self->_Set(Field => 'Queue', Value => $NewQueueObj->Id()));
-    
-}
-
-# }}}
-
-# {{{ sub QueueObj
-
-=head2 QueueObj
-
-Takes nothing. returns this ticket's queue object
 
 =cut
 
 sub QueueObj {
-    my $self = shift;
-    
-    my $queue_obj = RT::Queue->new($self->CurrentUser);
-    #We call __Value so that we can avoid the ACL decision and some deep recursion
-    my ($result) = $queue_obj->Load($self->__Value('Queue'));
-    return ($queue_obj);
+	my $self = shift;
+	my $Queue =  RT::Queue->new($self->CurrentUser);
+	$Queue->Load($self->__Value('Queue'));
+	return($Queue);
 }
 
+=item Type
 
-# }}}
+Returns the current value of Type. 
+(In the database, Type is stored as varchar(16).)
 
-# }}}
 
-# {{{ Date printing routines
 
-# {{{ sub DueObj
-
-=head2 DueObj
-
-  Returns an RT::Date object containing this ticket's due date
-
-=cut
-sub DueObj {
-    my $self = shift;
-    
-    my $time = new RT::Date($self->CurrentUser);
-
-    # -1 is RT::Date slang for never
-    if ($self->Due) {
-	$time->Set(Format => 'sql', Value => $self->Due );
-    }
-    else {
-	$time->Set(Format => 'unix', Value => -1);
-    }
-    
-    return $time;
-}
-# }}}
+=item SetType VALUE
 
-# {{{ sub DueAsString 
 
-=head2 DueAsString
+Set Type to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Type will be stored as a varchar(16).)
 
-Returns this ticket's due date as a human readable string
 
 =cut
 
-sub DueAsString {
-  my $self = shift;
-  return $self->DueObj->AsString();
-}
-
-# }}}
 
-# {{{ sub GraceTimeAsString 
+=item IssueStatement
 
-=head2 GraceTimeAsString
+Returns the current value of IssueStatement. 
+(In the database, IssueStatement is stored as int(11).)
 
-Return the time until this ticket is due as a string
-
-=cut
-
-# TODO This should be deprecated 
-
-sub GraceTimeAsString {
-    my $self=shift;
-    
-    if ($self->Due) {
-	return ($self->DueObj->AgeAsString());
-    } else {
-	return "";
-    }
-}
 
-# }}}
 
+=item SetIssueStatement VALUE
 
-# {{{ sub ResolvedObj
 
-=head2 ResolvedObj
+Set IssueStatement to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, IssueStatement will be stored as a int(11).)
 
-  Returns an RT::Date object of this ticket's 'resolved' time.
 
 =cut
 
-sub ResolvedObj {
-  my $self = shift;
 
-  my $time = new RT::Date($self->CurrentUser);
-  $time->Set(Format => 'sql', Value => $self->Resolved);
-  return $time;
-}
-# }}}
+=item Resolution
 
-# {{{ sub SetStarted
+Returns the current value of Resolution. 
+(In the database, Resolution is stored as int(11).)
 
-=head2 SetStarted
 
-Takes a date in ISO format or undef
-Returns a transaction id and a message
-The client calls "Start" to note that the project was started on the date in $date.
-A null date means "now"
 
-=cut
-  
-sub SetStarted {
-    my $self = shift;
-    my $time = shift || 0;
-    
-
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	return (0, "Permission Denied");
-    }
-
-    #We create a date object to catch date weirdness
-    my $time_obj = new RT::Date($self->CurrentUser());
-    if ($time != 0)  {
-	$time_obj->Set(Format => 'ISO', Value => $time);
-    }
-    else {
-	$time_obj->SetToNow();
-    }
-    
-    #Now that we're starting, open this ticket
-    #TODO do we really want to force this as policy? it should be a scrip
-    
-    #We need $TicketAsSystem, in case the current user doesn't have
-    #ShowTicket
-    #
-    my $TicketAsSystem = new RT::Ticket($RT::SystemUser);
-    $TicketAsSystem->Load($self->Id);	
-    if ($TicketAsSystem->Status eq 'new') {
-	$TicketAsSystem->Open();
-    }	
-    
-    return ($self->_Set(Field => 'Started', Value =>$time_obj->ISO));
-    
-}
+=item SetResolution VALUE
 
-# }}}
 
-# {{{ sub StartedObj
+Set Resolution to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Resolution will be stored as a int(11).)
 
-=head2 StartedObj
-
-  Returns an RT::Date object which contains this ticket's 
-'Started' time.
 
 =cut
 
 
-sub StartedObj {
-    my $self = shift;
-    
-    my $time = new RT::Date($self->CurrentUser);
-    $time->Set(Format => 'sql', Value => $self->Started);
-    return $time;
-}
-# }}}
+=item Owner
 
-# {{{ sub StartsObj
+Returns the current value of Owner. 
+(In the database, Owner is stored as int(11).)
 
-=head2 StartsObj
 
-  Returns an RT::Date object which contains this ticket's 
-'Starts' time.
 
-=cut
-
-sub StartsObj {
-  my $self = shift;
-  
-  my $time = new RT::Date($self->CurrentUser);
-  $time->Set(Format => 'sql', Value => $self->Starts);
-  return $time;
-}
-# }}}
+=item SetOwner VALUE
 
-# {{{ sub ToldObj
 
-=head2 ToldObj
+Set Owner to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Owner will be stored as a int(11).)
 
-  Returns an RT::Date object which contains this ticket's 
-'Told' time.
 
 =cut
 
 
-sub ToldObj {
-  my $self = shift;
-  
-  my $time = new RT::Date($self->CurrentUser);
-  $time->Set(Format => 'sql', Value => $self->Told);
-  return $time;
-}
+=item Subject
 
-# }}}
+Returns the current value of Subject. 
+(In the database, Subject is stored as varchar(200).)
 
-# {{{ sub LongSinceToldAsString
 
-# TODO this should be deprecated
 
+=item SetSubject VALUE
 
-sub LongSinceToldAsString {
-  my $self = shift;
-
-  if ($self->Told) {
-      return $self->ToldObj->AgeAsString();
-  } else {
-      return "Never";
-  }
-}
-# }}}
-
-# {{{ sub ToldAsString
 
-=head2 ToldAsString
+Set Subject to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Subject will be stored as a varchar(200).)
 
-A convenience method that returns ToldObj->AsString
-
-TODO: This should be deprecated
 
 =cut
 
 
-sub ToldAsString {
-    my $self = shift;
-    if ($self->Told) {
-	return $self->ToldObj->AsString();
-    }
-    else {
-	return("Never");
-    }
-}
-# }}}
-
-# {{{ sub TimeWorkedAsString
+=item InitialPriority
 
-=head2 TimeWorkedAsString
+Returns the current value of InitialPriority. 
+(In the database, InitialPriority is stored as int(11).)
 
-Returns the amount of time worked on this ticket as a Text String
 
-=cut
 
-sub TimeWorkedAsString {
-    my $self=shift;
-    return "0" unless $self->TimeWorked;
-    
-    #This is not really a date object, but if we diff a number of seconds 
-    #vs the epoch, we'll get a nice description of time worked.
-    
-    my $worked = new RT::Date($self->CurrentUser);
-    #return the  #of minutes worked turned into seconds and written as
-    # a simple text string
-
-    return($worked->DurationAsString($self->TimeWorked*60));
-}
+=item SetInitialPriority VALUE
 
-# }}}
 
+Set InitialPriority to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, InitialPriority will be stored as a int(11).)
 
-# }}}
-
-# {{{ Routines dealing with correspondence/comments
-
-# {{{ sub Comment
-
-=head2 Comment
-
-Comment on this ticket.
-Takes a hashref with the follwoing attributes:
-
-MIMEObj, TimeTaken, CcMessageTo, BccMessageTo
 
 =cut
 
-sub Comment {
-  my $self = shift;
-  
-  my %args = (
-          CcMessageTo => undef,
-          BccMessageTo => undef,
-	      MIMEObj => undef,
-	      TimeTaken => 0,
-	      @_ );
-
-  unless (($self->CurrentUserHasRight('CommentOnTicket')) or
-	  ($self->CurrentUserHasRight('ModifyTicket'))) {
-      return (0, "Permission Denied");
-  }
- 
-   unless ($args{'MIMEObj'}) {
-       return(0,"No correspondence attached");
-   }
-
-  # If we've been passed in CcMessageTo and BccMessageTo fields,
-  # add them to the mime object for passing on to the transaction handler
-  # The "NotifyOtherRecipients" scripAction will look for RT--Send-Cc: and
-  # RT-Send-Bcc: headers
- 
-  $args{'MIMEObj'}->head->add('RT-Send-Cc', $args{'CcMessageTo'});
-  $args{'MIMEObj'}->head->add('RT-Send-Bcc', $args{'BccMessageTo'});
-
-  #Record the correspondence (write the transaction)
-  my ($Trans, $Msg, $TransObj) = $self->_NewTransaction( Type => 'Comment',
-				      Data =>($args{'MIMEObj'}->head->get('subject') || 'No Subject'),
-				      TimeTaken => $args{'TimeTaken'},
-				      MIMEObj => $args{'MIMEObj'}
-				    );
-  
-  
-  return ($Trans, "The comment has been recorded");
-}
-
-# }}}
 
-# {{{ sub Correspond
+=item FinalPriority
 
-=head2 Correspond
+Returns the current value of FinalPriority. 
+(In the database, FinalPriority is stored as int(11).)
 
-Correspond on this ticket.
-Takes a hashref with the following attributes:
-
-
-MIMEObj, TimeTaken, CcMessageTo, BccMessageTo
-
-=cut
-
-sub Correspond {
-    my $self = shift;
-    my %args = (
-          CcMessageTo => undef,
-          BccMessageTo => undef,
-		MIMEObj => undef,
-		TimeTaken => 0,
-		@_ );
-    
-    unless (($self->CurrentUserHasRight('ReplyToTicket')) or
-	    ($self->CurrentUserHasRight('ModifyTicket'))) {
-	return (0, "Permission Denied");
-    }
-    
-    unless ($args{'MIMEObj'}) {
-	return(0,"No correspondence attached");
-    }
-    
-  # If we've been passed in CcMessageTo and BccMessageTo fields,
-  # add them to the mime object for passing on to the transaction handler
-  # The "NotifyOtherRecipients" scripAction will look for RT-Send-Cc: and RT-Send-Bcc:
-  # headers
- 
-  $args{'MIMEObj'}->head->add('RT-Send-Cc', $args{'CcMessageTo'});
-  $args{'MIMEObj'}->head->add('RT-Send-Bcc', $args{'BccMessageTo'});
-
-    #Record the correspondence (write the transaction)
-    my ($Trans,$msg, $TransObj) = $self->_NewTransaction
-      (Type => 'Correspond',
-       Data => ($args{'MIMEObj'}->head->get('subject') || 'No Subject'),
-       TimeTaken => $args{'TimeTaken'},
-       MIMEObj=> $args{'MIMEObj'}     
-      );
-    
-    # TODO this bit of logic should really become a scrip for 2.2
-    my $TicketAsSystem = new RT::Ticket($RT::SystemUser);
-    $TicketAsSystem->Load($self->Id);
-	
-    if (
-	($TicketAsSystem->Status ne 'open') and
-	($TicketAsSystem->Status ne 'new')
-       ) {
-	
-	my $oldstatus = $TicketAsSystem->Status();
-	$TicketAsSystem->__Set(Field => 'Status', Value => 'open');
-	$TicketAsSystem->_NewTransaction 
-	  ( Type => 'Set',
-	    Field => 'Status',
-	    OldValue => $oldstatus,
-	    NewValue => 'open',
-	    Data => 'Ticket auto-opened on incoming correspondence'
-	  );
-    }
-    
-    unless ($Trans) {
-	$RT::Logger->err("$self couldn't init a transaction ($msg)\n");
-	return ($Trans, "correspondence (probably) not sent", $args{'MIMEObj'});
-    }
-    
-    #Set the last told date to now if this isn't mail from the requestor.
-    #TODO: Note that this will wrongly ack mail from any non-requestor as a "told"
-    
-    unless ($TransObj->IsInbound) {
-	$self->_SetTold;
-    }
-    
-    return ($Trans, "correspondence sent");
-}
 
-# }}}
 
-# }}}
+=item SetFinalPriority VALUE
 
-# {{{ Routines dealing with Links and Relations between tickets
 
-# {{{ Link Collections
+Set FinalPriority to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, FinalPriority will be stored as a int(11).)
 
-# {{{ sub Members
-
-=head2 Members
-
-  This returns an RT::Links object which references all the tickets 
-which are 'MembersOf' this ticket
 
 =cut
 
-sub Members {
-   my $self = shift;
-   return ($self->_Links('Target', 'MemberOf'));
-}
-
-# }}}
 
-# {{{ sub MemberOf
+=item Priority
 
-=head2 MemberOf
+Returns the current value of Priority. 
+(In the database, Priority is stored as int(11).)
 
-  This returns an RT::Links object which references all the tickets that this
-ticket is a 'MemberOf'
 
-=cut
-
-sub MemberOf {
-   my $self = shift;
-   return ($self->_Links('Base', 'MemberOf'));
-}
 
-# }}}
+=item SetPriority VALUE
 
-# {{{ RefersTo
 
-=head2 RefersTo
+Set Priority to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Priority will be stored as a int(11).)
 
-  This returns an RT::Links object which shows all references for which this ticket is a base
 
 =cut
 
-sub RefersTo {
-    my $self = shift;
-    return ($self->_Links('Base', 'RefersTo'));
-}
-
-# }}}
 
-# {{{ ReferredToBy
+=item TimeEstimated
 
-=head2 ReferredToBy
+Returns the current value of TimeEstimated. 
+(In the database, TimeEstimated is stored as int(11).)
 
-  This returns an RT::Links object which shows all references for which this ticket is a target
 
-=cut
 
-sub ReferredToBy {
-    my $self = shift;
-    return ($self->_Links('Target', 'RefersTo'));
-}
+=item SetTimeEstimated VALUE
 
-# }}}
 
-# {{{ DependedOnBy
+Set TimeEstimated to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, TimeEstimated will be stored as a int(11).)
 
-=head2 DependedOnBy
-
-  This returns an RT::Links object which references all the tickets that depend on this one
 
 =cut
-sub DependedOnBy {
-    my $self = shift;
-    return ($self->_Links('Target','DependsOn'));
-}
-
-# }}}
-
-# {{{ DependsOn
-
-=head2 DependsOn
-
-  This returns an RT::Links object which references all the tickets that this ticket depends on
-
-=cut
-sub DependsOn {
-   my $self = shift;
-    return ($self->_Links('Base','DependsOn'));
-}
-
-# }}}
-
-# {{{ sub _Links 
-
-sub _Links {
-    my $self = shift;
-    
-    #TODO: Field isn't the right thing here. but I ahave no idea what mnemonic ---
-    #tobias meant by $f
-    my $field = shift;
-    my $type =shift || "";
-
-    unless ($self->{"$field$type"}) {
-	$self->{"$field$type"} = new RT::Links($self->CurrentUser);
-	if ($self->CurrentUserHasRight('ShowTicket')) {
-	    
-	    $self->{"$field$type"}->Limit(FIELD=>$field, VALUE=>$self->URI);
-	    $self->{"$field$type"}->Limit(FIELD=>'Type', 
-					  VALUE=>$type) if ($type);
-	}
-    }
-    return ($self->{"$field$type"});
-}
-
-# }}}
-
-# }}}
 
 
-# {{{ sub DeleteLink 
+=item TimeWorked
 
-=head2 DeleteLink
+Returns the current value of TimeWorked. 
+(In the database, TimeWorked is stored as int(11).)
 
-Delete a link. takes a paramhash of Base, Target and Type.
-Either Base or Target must be null. The null value will 
-be replaced with this ticket\'s id
 
-=cut 
 
-sub DeleteLink {
-    my $self = shift;
-    my %args = ( Base =>  undef,
-		 Target => undef,
-		 Type => undef,
-		 @_ );
-    
-    #check acls
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-        $RT::Logger->debug("No permission to delete links\n"); 
-        return (0, 'Permission Denied');
-
-    
-    }
-    
-    #we want one of base and target. we don't care which
-    #but we only want _one_
-
-    if ($args{'Base'} and $args{'Target'}) {
-	$RT::Logger->debug("$self ->_DeleteLink. got both Base and Target\n");
-	return (0, 'Can\'t specifiy both base and target');
-    }
-    elsif ($args{'Base'}) {
-	$args{'Target'} = $self->Id();
-    }
-    elsif ($args{'Target'}) {
-	$args{'Base'} = $self->Id();
-    }
-    else {  
-        $RT::Logger->debug("$self: Base or Target must be specified\n");
-	return (0, 'Either base or target must be specified');
-    }
-     
-    my $link = new RT::Link($self->CurrentUser);
-    $RT::Logger->debug("Trying to load link: ". $args{'Base'}." ". $args{'Type'}. " ". $args{'Target'}. "\n");
-    
-    $link->Load($args{'Base'}, $args{'Type'}, $args{'Target'});
-    
-    
-    
-    #it's a real link. 
-    if ($link->id) {
-        $RT::Logger->debug("We're going to delete link ".$link->id."\n");
-	$link->Delete();
-
-	my $TransString=
-	  "Ticket $args{'Base'} no longer $args{Type} ticket $args{'Target'}.";
-	my ($Trans, $Msg, $TransObj) = $self->_NewTransaction
-	  (Type => 'DeleteLink',
-	   Field => $args{'Type'},
-	   Data => $TransString,
-	   TimeTaken => 0
-	  );
-	
-	return ($linkid, "Link deleted ($TransString)", $transactionid);
-    }
-    #if it's not a link we can find
-    else {
-        $RT::Logger->debug("Couldn't find that link\n");
-	return (0, "Link not found");
-    }
-}
+=item SetTimeWorked VALUE
 
-# }}}
 
-# {{{ sub AddLink
-
-=head2 AddLink
-
-Takes a paramhash of Type and one of Base or Target. Adds that link to this ticket.
+Set TimeWorked to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, TimeWorked will be stored as a int(11).)
 
 
 =cut
 
-sub AddLink {
-    my $self = shift;
-    my %args = ( Target => '',
-		 Base => '',
-	 	 Type => '',
-		 @_ );
-    
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	return (0, "Permission Denied");
-    }
-    
-    if ($args{'Base'} and $args{'Target'}) {
-	$RT::Logger->debug("$self tried to delete a link. both base and target were specified\n");
-	return (0, 'Can\'t specifiy both base and target');
-    }
-    elsif ($args{'Base'}) {
-        $args{'Target'} = $self->Id();
-    }
-    elsif ($args{'Target'}) {
-	$args{'Base'} = $self->Id();
-    }
-    else {  
-	return (0, 'Either base or target must be specified');
-    }
-    
-    # {{{ We don't want references to ourself
-    if ($args{Base} eq $args{Target}) {
-	return (0, "Can\'t link a ticket to itself");
-    }	
-		
-    # }}}
-    
-    # If the base isn't a URI, make it a URI. 
-    # If the target isn't a URI, make it a URI. 
-        
-    # {{{ Check if the link already exists - we don't want duplicates
-    my $old_link= new RT::Link ($self->CurrentUser);
-    $old_link->Load($args{'Base'}, $args{'Type'}, $args{'Target'});
-    if ($old_link->Id) {
-	$RT::Logger->debug("$self Somebody tried to duplicate a link");
-	return ($old_link->id, "Link already exists",0);
-    }
-    # }}}
-    
-    # Storing the link in the DB.
-    my $link = RT::Link->new($self->CurrentUser);
-    my ($linkid) = $link->Create(Target => $args{Target}, 
-				 Base => $args{Base}, 
-				 Type => $args{Type});
-    
-    unless ($linkid) {
-	return (0,"Link could not be created");
-    }
-	#Write the transaction
-    
-    my $TransString="Ticket $args{'Base'} $args{Type} ticket $args{'Target'}.";
-    
-    my ($Trans, $Msg, $TransObj) = $self->_NewTransaction
-      (Type => 'AddLink',
-       Field => $args{'Type'},
-       Data => $TransString,
-       TimeTaken => 0
-      );
-    
-    return ($Trans, "Link created ($TransString)");
-	
-	
-}
-# }}}
 
-# {{{ sub URI 
+=item Status
 
-=head2 URI
+Returns the current value of Status. 
+(In the database, Status is stored as varchar(10).)
 
-Returns this ticket's URI
 
-=cut
 
-sub URI {
-    my $self = shift;
-    return $RT::TicketBaseURI.$self->id;
-}
+=item SetStatus VALUE
 
-# }}}
 
-# {{{ sub MergeInto
+Set Status to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Status will be stored as a varchar(10).)
 
-=head2 MergeInto
-MergeInto take the id of the ticket to merge this ticket into.
 
 =cut
 
-sub MergeInto {
-    my $self = shift;
-    my $MergeInto = shift;
-    
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	return (0, "Permission Denied");
-    }
-    
-    # Load up the new ticket.
-    my $NewTicket = RT::Ticket->new($RT::SystemUser);
-    $NewTicket->Load($MergeInto);
-
-    # make sure it exists.
-    unless (defined $NewTicket->Id) {
-	return (0, 'New ticket doesn\'t exist');
-    }
-
-    
-    # Make sure the current user can modify the new ticket.
-    unless ($NewTicket->CurrentUserHasRight('ModifyTicket')) {
-	$RT::Logger->debug("failed...");
-	return (0, "Permission Denied");
-    }
-    
-    $RT::Logger->debug("checking if the new ticket has the same id and effective id...");
-    unless ($NewTicket->id == $NewTicket->EffectiveId) {
-	$RT::Logger->err('$self trying to merge into '.$NewTicket->Id .
-			 ' which is itself merged.\n');
-	return (0, "Can't merge into a merged ticket. ".
-		"You should never get this error");
-    }
-
-    
-    # We use EffectiveId here even though it duplicates information from
-    # the links table becasue of the massive performance hit we'd take
-    # by trying to do a seperate database query for merge info everytime 
-    # loaded a ticket. 
-    
-    
-    #update this ticket's effective id to the new ticket's id.
-    my ($id_val, $id_msg) = $self->__Set(Field => 'EffectiveId', 
-					 Value => $NewTicket->Id());
-    
-    unless ($id_val) {
-	$RT::Logger->error("Couldn't set effective ID for ".$self->Id.
-			   ": $id_msg");
-	return(0,"Merge failed. Couldn't set EffectiveId");
-    }
-    
-    my ($status_val, $status_msg) = $self->__Set(Field => 'Status',
-						 Value => 'resolved');
-    
-    unless ($status_val) {
-	$RT::Logger->error("$self couldn't set status to resolved.".
-			   "RT's Database may be inconsistent.");
-    }	    
-    
-    #make a new link: this ticket is merged into that other ticket.
-    $self->AddLink( Type =>'MergedInto',
-		    Target => $NewTicket->Id() );
-    
-    #add all of this ticket's watchers to that ticket.
-    my $watchers = $self->Watchers();
-    
-    while (my $watcher = $watchers->Next()) {
-	unless (
-		($watcher->Owner && 
-		$NewTicket->IsWatcher (Type => $watcher->Type,
-				       Id => $watcher->Owner)) or 
-		($watcher->Email && 
-		 $NewTicket->IsWatcher (Type => $watcher->Type,
-					Id => $watcher->Email)) 
-	       ) {
-	    
-	    
-	    
-	    $NewTicket->_AddWatcher(Silent => 1, 
-				    Type => $watcher->Type, 
-				    Email => $watcher->Email,
-				    Owner => $watcher->Owner);
-	}
-    }
-    
-    
-    #find all of the tickets that were merged into this ticket. 
-    my $old_mergees = new RT::Tickets($self->CurrentUser);
-    $old_mergees->Limit( FIELD => 'EffectiveId',
-			 OPERATOR => '=',
-			 VALUE => $self->Id );
-    
-    #   update their EffectiveId fields to the new ticket's id
-    while (my $ticket = $old_mergees->Next()) {
-	my ($val, $msg) = $ticket->__Set(Field => 'EffectiveId', 
-					 Value => $NewTicket->Id());
-    }	
-    $NewTicket->_SetLastUpdated;
-
-    return ($TransactionObj, "Merge Successful");
-}  
-
-# }}}
-
-# }}}
-
-# {{{ Routines dealing with keywords
-
-# {{{ sub KeywordsObj
-
-=head2 KeywordsObj [KEYWORD_SELECT_ID]
-
-  Returns an B<RT::ObjectKeywords> object preloaded with this ticket's ObjectKeywords.
-If the optional KEYWORD_SELECT_ID parameter is set, limit the keywords object to that keyword
-select.
-
-=cut
-
-sub KeywordsObj {
-    my $self = shift;
-    my $keyword_select; 
-    
-    $keyword_select = shift if (@_);
-    
-    use RT::ObjectKeywords;
-    my $Keywords = new RT::ObjectKeywords($self->CurrentUser);
-
-    #ACL check
-    if ($self->CurrentUserHasRight('ShowTicket')) {
-	$Keywords->LimitToTicket($self->id);
-	if ($keyword_select) {
-	    $Keywords->LimitToKeywordSelect($keyword_select);
-	}	
-    }
-    return ($Keywords);
-}
-# }}}
 
-# {{{ sub AddKeyword
+=item TimeLeft
 
-=head2 AddKeyword
+Returns the current value of TimeLeft. 
+(In the database, TimeLeft is stored as int(11).)
 
-Takes a paramhash of Keyword and KeywordSelect.  If Keyword is a valid choice
-for KeywordSelect, creates a KeywordObject.  If the KeywordSelect says this should
-be a single KeywordObject, automatically removes the old value.
 
- Issues: probably doesn't enforce the depth restrictions or make sure that keywords
-are coming from the right part of the tree. really should.
 
-=cut
+=item SetTimeLeft VALUE
 
-sub AddKeyword {
-    my $self = shift;
-   #ACL check
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	return (0, 'Permission Denied');
-    }
-    
-    return($self->_AddKeyword(@_));
-    
-}
 
+Set TimeLeft to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, TimeLeft will be stored as a int(11).)
 
-# Helper version of AddKeyword without that pesky ACL check
-sub _AddKeyword {
-    my $self = shift;
-    my %args = ( KeywordSelect => undef,  # id of a keyword select record
-		 Keyword => undef, #id of the keyword to add
-		 Silent => 0,
-		 @_
-	       );
-    
-    my ($OldValue);
-
-    #TODO make sure that $args{'Keyword'} is valid for $args{'KeywordSelect'}
-
-    #TODO: make sure that $args{'KeywordSelect'} applies to this ticket's queue.
-    
-    my $Keyword = new RT::Keyword($self->CurrentUser);
-    unless ($Keyword->Load($args{'Keyword'}) ) {
-	$RT::Logger->err("$self Couldn't load Keyword ".$args{'Keyword'} ."\n");
-	return(0, "Couldn't load keyword");
-    }
-    
-    my $KeywordSelectObj = new RT::KeywordSelect($self->CurrentUser);
-    unless ($KeywordSelectObj->Load($args{'KeywordSelect'})) {
-	$RT::Logger->err("$self Couldn't load KeywordSelect ".$args{'KeywordSelect'});
-	return(0, "Couldn't load keywordselect");
-    }
-    
-    my $Keywords = $self->KeywordsObj($KeywordSelectObj->id);
-
-    #If the ticket already has this keyword, just get out of here.
-    if ($Keywords->HasEntry($Keyword->id)) {
-	return(0, "That is already the current value");
-    }	
-
-    #If the keywordselect wants this to be a singleton:
-
-    if ($KeywordSelectObj->Single) {
-
-	#Whack any old values...keep track of the last value that we get.
-	#we shouldn't need a loop ehre, but we do it anyway, to try to 
-	# help keep the database clean.
-	while (my $OldKey = $Keywords->Next) {
-	    $OldValue = $OldKey->KeywordObj->Name;
-	    $OldKey->Delete();
-	}	
-	
-	
-    }
-
-    # create the new objectkeyword 
-    my $ObjectKeyword = new RT::ObjectKeyword($self->CurrentUser);
-    my $result = $ObjectKeyword->Create( Keyword => $Keyword->Id,
-					 ObjectType => 'Ticket',
-					 ObjectId => $self->Id,
-					 KeywordSelect => $KeywordSelectObj->Id );
-    
-
-    # record a single transaction, unless we were told not to
-    unless ($args{'Silent'}) {
-	my ($TransactionId, $Msg, $TransactionObj) = 
-	  $self->_NewTransaction( Type => 'Keyword',
-				  Field => $KeywordSelectObj->Id,
-				  OldValue => $OldValue,
-				  NewValue => $Keyword->Name );
-    }
-    return ($TransactionId, "Keyword ".$ObjectKeyword->KeywordObj->Name ." added.");    
-
-}	
-
-# }}}
-
-# {{{ sub DeleteKeyword
-
-=head2 DeleteKeyword
-  
-  Takes a paramhash. Deletes the Keyword denoted by the I<Keyword> parameter from this
-  ticket's object keywords.
 
 =cut
 
-sub DeleteKeyword {
-    my $self = shift;
-    my %args = ( Keyword => undef,
-		 KeywordSelect => undef,
-		 @_ );
-
-   #ACL check
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {    
-	return (0, 'Permission Denied');
-    }
-
-    
-    #Load up the ObjectKeyword we\'re talking about
-    my $ObjectKeyword = new RT::ObjectKeyword($self->CurrentUser);
-    $ObjectKeyword->LoadByCols(Keyword => $args{'Keyword'},
-			       KeywordSelect => $args{'KeywordSelect'},
-			       ObjectType => 'Ticket',
-			       ObjectId => $self->id()
-			      );
-    
-    #if we can\'t find it, bail
-    unless ($ObjectKeyword->id) {
-	$RT::Logger->err("Couldn't find the keyword ".$args{'Keyword'} .
-			 " for keywordselect ". $args{'KeywordSelect'} . 
-			 "for ticket ".$self->id );
-	return (undef, "Couldn't load keyword while trying to delete it.");
-    };
-    
-    #record transaction here.
-    my ($TransactionId, $Msg, $TransObj) = 
-      $self->_NewTransaction( Type => 'Keyword', 
-			      OldValue => $ObjectKeyword->KeywordObj->Name);
-    
-    $ObjectKeyword->Delete();
-    
-    return ($TransactionId, "Keyword ".$ObjectKeyword->KeywordObj->Name ." deleted.");
-    
-}
 
-# }}}
+=item Told
 
-# }}}
+Returns the current value of Told. 
+(In the database, Told is stored as datetime.)
 
-# {{{ Routines dealing with ownership
 
-# {{{ sub OwnerObj
 
-=head2 OwnerObj
+=item SetTold VALUE
 
-Takes nothing and returns an RT::User object of 
-this ticket's owner
 
-=cut
+Set Told to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Told will be stored as a datetime.)
 
-sub OwnerObj {
-    my $self = shift;
-    
-    #If this gets ACLed, we lose on a rights check in User.pm and
-    #get deep recursion. if we need ACLs here, we need
-    #an equiv without ACLs
-    
-    $owner = new RT::User ($self->CurrentUser);
-    $owner->Load($self->__Value('Owner'));
-    
-    #Return the owner object
-    return ($owner);
-}
-
-# }}}
-
-# {{{ sub OwnerAsString 
-
-=head2 OwnerAsString
-
-Returns the owner's email address
 
 =cut
 
-sub OwnerAsString {
-  my $self = shift;
-  return($self->OwnerObj->EmailAddress);
 
-}
+=item Starts
 
-# }}}
+Returns the current value of Starts. 
+(In the database, Starts is stored as datetime.)
 
-# {{{ sub SetOwner
 
-=head2 SetOwner
-
-Takes two arguments:
-     the Id or Name of the owner 
-and  (optionally) the type of the SetOwner Transaction. It defaults
-to 'Give'.  'Steal' is also a valid option.
-
-=cut
-
-sub SetOwner {
-    my $self = shift;
-    my $NewOwner = shift;
-    my $Type = shift || "Give";
-    
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	return (0, "Permission Denied");
-    }  
-    
-    my $NewOwnerObj = RT::User->new($self->CurrentUser);
-    my $OldOwnerObj = $self->OwnerObj;
-  
-    $NewOwnerObj->Load($NewOwner);
-    if (!$NewOwnerObj->Id) {
-	    return (0, "That user does not exist");
-    }
-    
-    #If thie ticket has an owner and it's not the current user
-    
-    if (($Type ne 'Steal' ) and ($Type ne 'Force') and	#If we're not stealing
-	($self->OwnerObj->Id != $RT::Nobody->Id ) and #and the owner is set
-	($self->CurrentUser->Id ne $self->OwnerObj->Id())) { #and it's not us
-	return(0, "You can only reassign tickets that you own or that are unowned");
-    }
-    
-    #If we've specified a new owner and that user can't modify the ticket
-    elsif (($NewOwnerObj->Id) and 
-	   (!$NewOwnerObj->HasQueueRight(Right => 'OwnTicket',
-					 QueueObj => $self->QueueObj,
-					 TicketObj => $self))
-	  ) {
-	return (0, "That user may not own requests in that queue");
-    }
-  
-  
-    #If the ticket has an owner and it's the new owner, we don't need
-    #To do anything
-    elsif (($self->OwnerObj) and ($NewOwnerObj->Id eq $self->OwnerObj->Id)) {
-	return(0, "That user already owns that request");
-    }
-  
-  
-    my ($trans,$msg)=$self->_Set(Field => 'Owner',
-				 Value => $NewOwnerObj->Id, 
-				 TimeTaken => 0,
-				 TransactionType => $Type);
-  
-    if ($trans) {
-	$msg = "Owner changed from ".$OldOwnerObj->Name." to ".$NewOwnerObj->Name;
-    }
-    return ($trans, $msg);
-	  
-}
 
-# }}}
+=item SetStarts VALUE
 
-# {{{ sub Take
 
-=head2 Take
+Set Starts to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Starts will be stored as a datetime.)
 
-A convenince method to set the ticket's owner to the current user
 
 =cut
 
-sub Take {
-    my $self = shift;
-    return ($self->SetOwner($self->CurrentUser->Id, 'Take'));
-}
 
-# }}}
+=item Started
 
-# {{{ sub Untake
+Returns the current value of Started. 
+(In the database, Started is stored as datetime.)
 
-=head2 Untake
 
-Convenience method to set the owner to 'nobody' if the current user is the owner.
 
-=cut
+=item SetStarted VALUE
 
-sub Untake {
-    my $self = shift;
-    return($self->SetOwner($RT::Nobody->UserObj->Id, 'Untake'));
-}
-# }}}
-
-# {{{ sub Steal 
 
-=head2 Steal
+Set Started to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Started will be stored as a datetime.)
 
-A convenience method to change the owner of the current ticket to the
-current user. Even if it's owned by another user.
 
 =cut
 
-sub Steal {
-    my $self = shift;
-  
-    if ($self->IsOwner($self->CurrentUser)) {
-	return (0,"You already own this ticket"); 
-    } else {
-	return($self->SetOwner($self->CurrentUser->Id, 'Steal'));
-      
-    }
-  
-}
-
-# }}}
-
-# }}}
 
-# {{{ Routines dealing with status
+=item Due
 
-# {{{ sub ValidateStatus 
+Returns the current value of Due. 
+(In the database, Due is stored as datetime.)
 
-=head2 ValidateStatus STATUS
 
-Takes a string. Returns true if that status is a valid status for this ticket.
-Returns false otherwise.
 
-=cut
-
-sub ValidateStatus {
-    my $self = shift;
-    my $status = shift;
+=item SetDue VALUE
 
-    #Make sure the status passed in is valid
-    unless ($self->QueueObj->IsValidStatus($status)) {
-	return (undef);
-    }
-    
-    return (1);
 
-}
+Set Due to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Due will be stored as a datetime.)
 
 
-# }}}
+=cut
 
-# {{{ sub SetStatus
 
-=head2 SetStatus STATUS
+=item Resolved
 
-Set this ticket\'s status. STATUS can be one of: new, open, stalled, resolved or dead.
+Returns the current value of Resolved. 
+(In the database, Resolved is stored as datetime.)
 
-=cut
 
-sub SetStatus { 
-    my $self = shift;
-    my $status = shift;
-
-    #Check ACL
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	return (0, 'Permission Denied');
-    }
-
-    my $now = new RT::Date($self->CurrentUser);
-    $now->SetToNow();
-    
-    #If we're changing the status from new, record that we've started
-    if (($self->Status =~ /new/) && ($status ne 'new')) {
-	#Set the Started time to "now"
-	$self->_Set(Field => 'Started',
-		    Value => $now->ISO,
-		    RecordTransaction => 0);
-    }
-    
-
-    if ($status eq 'resolved') {
-	#When we resolve a ticket, set the 'Resolved' attribute to now.
-	$self->_Set(Field => 'Resolved',
-		    Value => $now->ISO, 
-		    RecordTransaction => 0);
-    }
-    
-    
-    #Actually update the status
-    return($self->_Set(Field => 'Status', 
-		       Value => $status,
-		       TimeTaken => 0,
-		       TransactionType => 'Status'));
-}
 
-# }}}
+=item SetResolved VALUE
 
-# {{{ sub Kill
 
-=head2 Kill
+Set Resolved to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Resolved will be stored as a datetime.)
 
-Takes no arguments. Marks this ticket for garbage collection
 
 =cut
 
-sub Kill {
-  my $self = shift;
-  return ($self->SetStatus('dead'));
-  # TODO: garbage collection
-}
-
-# }}}
 
-# {{{ sub Stall
+=item LastUpdatedBy
 
-=head2 Stall
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
 
-Sets this ticket's status to stalled
 
 =cut
 
-sub Stall {
-  my $self = shift;
-  return ($self->SetStatus('stalled'));
-}
-
-# }}}
 
-# {{{ sub Open
+=item LastUpdated
 
-=head2 Open
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
 
-Sets this ticket\'s status to Open
 
 =cut
 
-sub Open {
-    my $self = shift;
-    return ($self->SetStatus('open'));
-}
-
-# }}}
 
-# {{{ sub Resolve
+=item Creator
 
-=head2 Resolve
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
 
-Sets this ticket\'s status to Resolved
 
 =cut
 
-sub Resolve {
-    my $self = shift;
-    return ($self->SetStatus('resolved'));
-}
-
-# }}}
-
-# }}}
-
-# {{{ Actions + Routines dealing with transactions
 
-# {{{ sub SetTold and _SetTold
+=item Created
 
-=head2 SetTold ISO  [TIMETAKEN]
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
 
-Updates the told and records a transaction
 
 =cut
 
-sub SetTold {
-    my $self=shift;
-    my $told;
-    $told = shift if (@_);
-    my $timetaken=shift || 0;
-   
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	return (0, "Permission Denied");
-    }
-
-    my $datetold = new RT::Date($self->CurrentUser);
-    if ($told) {
-	$datetold->Set( Format => 'iso',
-			Value => $told);
-    }
-    else {
-	 $datetold->SetToNow(); 
-    }
-    
-    return($self->_Set(Field => 'Told', 
-		       Value => $datetold->ISO,
-		       TimeTaken => $timetaken,
-		       TransactionType => 'Told'));
-}
 
-=head2 _SetTold
+=item Disabled
 
-Updates the told without a transaction or acl check. Useful when we're sending replies.
+Returns the current value of Disabled. 
+(In the database, Disabled is stored as smallint(6).)
 
-=cut
 
-sub _SetTold {
-    my $self=shift;
-    
-    my $now = new RT::Date($self->CurrentUser);
-    $now->SetToNow();
-    #use __Set to get no ACLs ;)
-    return($self->__Set(Field => 'Told',
-			Value => $now->ISO));
-}
 
-# }}}
+=item SetDisabled VALUE
 
-# {{{ sub Transactions 
 
-=head2 Transactions
+Set Disabled to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Disabled will be stored as a smallint(6).)
 
-  Returns an RT::Transactions object of all transactions on this ticket
 
 =cut
-  
-sub Transactions {
-    my $self = shift;
-    
-    use RT::Transactions;
-    my $transactions = RT::Transactions->new($self->CurrentUser);
-
-    #If the user has no rights, return an empty object
-    if ($self->CurrentUserHasRight('ShowTicket')) {
-	my $tickets = $transactions->NewAlias('Tickets');
-	$transactions->Join( ALIAS1 => 'main',
-			      FIELD1 => 'Ticket',
-			      ALIAS2 => $tickets,
-			      FIELD2 => 'id');
-	$transactions->Limit( ALIAS => $tickets,
-			      FIELD => 'EffectiveId',
-			      VALUE => $self->id());
-        # if the user may not see comments do not return them
-        unless ($self->CurrentUserHasRight('ShowTicketComments')) {
-            $transactions->Limit( FIELD => 'Type',
-                                  OPERATOR => '!=',
-                                  VALUE => "Comment");
-        }
-    }
-    
-    return($transactions);
-}
-
-# }}}
-
-# {{{ sub _NewTransaction
-
-sub _NewTransaction {
-    my $self = shift;
-    my %args = ( TimeTaken => 0,
-		 Type => undef,
-		 OldValue => undef,
-		 NewValue => undef,
-		 Data => undef,
-		 Field => undef,
-		 MIMEObj => undef,
-		 @_ );
-    
-    
-    require RT::Transaction;
-    my $trans = new RT::Transaction($self->CurrentUser);
-    my ($transaction, $msg) = 
-      $trans->Create( Ticket => $self->Id,
-		      TimeTaken => $args{'TimeTaken'},
-		      Type => $args{'Type'},
-		      Data => $args{'Data'},
-		      Field => $args{'Field'},
-		      NewValue => $args{'NewValue'},
-		      OldValue => $args{'OldValue'},
-		      MIMEObj => $args{'MIMEObj'}
-		    );
-    
-    $RT::Logger->warning($msg) unless $transaction;
-    
-    $self->_SetLastUpdated;
-    
-    if (defined $args{'TimeTaken'} ) {
-	$self->_UpdateTimeTaken($args{'TimeTaken'}); 
-    }
-    return($transaction, $msg, $trans);
-}
 
-# }}}
 
-# }}}
-
-# {{{ PRIVATE UTILITY METHODS. Mostly needed so Ticket can be a DBIx::Record
-
-# {{{ sub _ClassAccessible
 
 sub _ClassAccessible {
     {
-	EffectiveId => { 'read' => 1, 'write' => 1, 'public' => 1 },
-	Queue => { 'read' => 1, 'write' => 1 },
-	Requestors => { 'read' => 1, 'write' => 1 },
-	Owner => { 'read' => 1, 'write' => 1 },
-	Subject => { 'read' => 1, 'write' => 1 },
-	InitialPriority => { 'read' => 1, 'write' => 1 },
-	FinalPriority => { 'read' => 1, 'write' => 1 },
-	Priority => { 'read' => 1, 'write' => 1 },
-	Status => { 'read' => 1, 'write' => 1 },
-	TimeWorked => { 'read' => 1, 'write' => 1 },
-	TimeLeft => { 'read' => 1, 'write' => 1 },
-	Created => { 'read' => 1, 'auto' => 1 },
-	Creator => { 'read' => 1,  'auto' => 1 },
-	Told => { 'read' => 1, 'write' => 1 },
-	Resolved => {'read' => 1},
-	Starts => { 'read' => 1, 'write' => 1 },
-	Started => { 'read' => 1, 'write' => 1 },
-	Due => { 'read' => 1, 'write' => 1 },
-	Creator => { 'read' => 1, 'auto' => 1 },
-	Created => { 'read' => 1, 'auto' => 1 },
-	LastUpdatedBy => { 'read' => 1, 'auto' => 1 },
-	LastUpdated => { 'read' => 1, 'auto' => 1 }
-    };
-
-}    
-
-# }}}
-
-# {{{ sub _Set
-
-sub _Set {
-    my $self = shift;
-    
-    unless ($self->CurrentUserHasRight('ModifyTicket')) {
-	return (0, "Permission Denied");
-    }
-    
-    my %args = (Field => undef,
-		Value => undef,
-		TimeTaken => 0,
-		RecordTransaction => 1,
-		TransactionType => 'Set',
-		@_
-	       );
-    #if the user is trying to modify the record
-    
-    #Take care of the old value we really don't want to get in an ACL loop.
-    # so ask the super::_Value
-    my $Old=$self->SUPER::_Value("$args{'Field'}");
-    
-    #Set the new value
-    my ($ret, $msg)=$self->SUPER::_Set(Field => $args{'Field'}, 
-				       Value=> $args{'Value'});
-    
-    #If we can't actually set the field to the value, don't record
-    # a transaction. instead, get out of here.
-    if ($ret==0) {return (0,$msg);}
-    
-    if ($args{'RecordTransaction'} == 1) {
-	
-	my ($Trans, $Msg, $TransObj) =	
-	  $self->_NewTransaction(Type => $args{'TransactionType'},
-				 Field => $args{'Field'},
-				 NewValue => $args{'Value'},
-				 OldValue =>  $Old,
-				 TimeTaken => $args{'TimeTaken'},
-				);
-      return ($Trans,$TransObj->Description);
-    }
-    else {
-	return ($ret, $msg);
-  }
-}
-
-# }}}
-
-# {{{ sub _Value 
-
-=head2 _Value
-
-Takes the name of a table column.
-Returns its value as a string, if the user passes an ACL check
-
-=cut
-
-sub _Value  {
-
-  my $self = shift;
-  my $field = shift;
-
-  
-  #if the field is public, return it.
-  if ($self->_Accessible($field, 'public')) {
-      #$RT::Logger->debug("Skipping ACL check for $field\n");
-      return($self->SUPER::_Value($field));
-      
-  }
-  
-  #If the current user doesn't have ACLs, don't let em at it.  
-  
-  unless ($self->CurrentUserHasRight('ShowTicket')) {
-      return (undef);
-  }
-  return($self->SUPER::_Value($field));
-  
-}
-
-# }}}
-
-# {{{ sub _UpdateTimeTaken
-
-=head2 _UpdateTimeTaken
-
-This routine will increment the timeworked counter. it should
-only be called from _NewTransaction 
-
-=cut
-
-sub _UpdateTimeTaken {
-  my $self = shift;
-  my $Minutes = shift;
-  my ($Total);
-   
-  $Total = $self->SUPER::_Value("TimeWorked");
-  $Total = ($Total || 0) + ($Minutes || 0);
-  $self->SUPER::_Set(Field => "TimeWorked", 
-		     Value => $Total);
-
-  return ($Total);
-}
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        EffectiveId => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Queue => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Type => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        IssueStatement => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Resolution => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Owner => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Subject => 
+		{read => 1, write => 1, type => 'varchar(200)', default => '[no subject]'},
+        InitialPriority => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        FinalPriority => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Priority => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        TimeEstimated => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        TimeWorked => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Status => 
+		{read => 1, write => 1, type => 'varchar(10)', default => ''},
+        TimeLeft => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Told => 
+		{read => 1, write => 1, type => 'datetime', default => ''},
+        Starts => 
+		{read => 1, write => 1, type => 'datetime', default => ''},
+        Started => 
+		{read => 1, write => 1, type => 'datetime', default => ''},
+        Due => 
+		{read => 1, write => 1, type => 'datetime', default => ''},
+        Resolved => 
+		{read => 1, write => 1, type => 'datetime', default => ''},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        Disabled => 
+		{read => 1, write => 1, type => 'smallint(6)', default => '0'},
+
+ }
+};
 
-# }}}
 
-# }}}
+        eval "require RT::Ticket_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Ticket_Overlay.pm}) {
+            die $@;
+        };
 
-# {{{ Routines dealing with ACCESS CONTROL
+        eval "require RT::Ticket_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Ticket_Vendor.pm}) {
+            die $@;
+        };
 
-# {{{ sub CurrentUserHasRight 
+        eval "require RT::Ticket_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Ticket_Local.pm}) {
+            die $@;
+        };
 
-=head2 CurrentUserHasRight
 
-  Takes the textual name of a Ticket scoped right (from RT::ACE) and returns
-1 if the user has that right. It returns 0 if the user doesn't have that right.
 
-=cut
 
-sub CurrentUserHasRight {
-  my $self = shift;
-  my $right = shift;
-  
-  return ($self->HasRight( Principal=> $self->CurrentUser->UserObj(),
-			    Right => "$right"));
+=head1 SEE ALSO
 
-}
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
-# }}}
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-# {{{ sub HasRight 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
-=head2 HasRight
+   no warnings qw(redefine);
 
- Takes a paramhash with the attributes 'Right' and 'Principal'
-  'Right' is a ticket-scoped textual right from RT::ACE 
-  'Principal' is an RT::User object
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
-  Returns 1 if the principal has the right. Returns undef if not.
+RT::Ticket_Overlay, RT::Ticket_Vendor, RT::Ticket_Local
 
 =cut
 
-sub HasRight {
-    my $self = shift;
-    my %args = ( Right => undef,
-		 Principal => undef,
-		 @_);
-    
-    unless ((defined $args{'Principal'}) and (ref($args{'Principal'}))) {
-	$RT::Logger->warning("Principal attrib undefined for Ticket::HasRight");
-    }
-    
-    return($args{'Principal'}->HasQueueRight(TicketObj => $self,
-					     Right => $args{'Right'}));
-}
-
-# }}}
-
-# }}}
-
 
 1;
-
-=head1 AUTHOR
-
-Jesse Vincent, jesse@fsck.com
-
-=head1 SEE ALSO
-
-RT
-
-=cut
-
-
diff --git a/rt/lib/RT/Tickets.pm b/rt/lib/RT/Tickets.pm
index dd91126c4..b6b349144 100755
--- a/rt/lib/RT/Tickets.pm
+++ b/rt/lib/RT/Tickets.pm
@@ -1,1789 +1,115 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Tickets.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
 
-=head1 NAME
+use strict;
 
-  RT::Tickets - A collection of Ticket objects
 
+=head1 NAME
 
+  RT::Tickets -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::Tickets;
-  my $tickets = new RT::Tickets($CurrentUser);
+  use RT::Tickets
 
 =head1 DESCRIPTION
 
-   A collection of RT::Tickets.
 
 =head1 METHODS
 
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Tickets);
-
-=end testing
-
 =cut
 
 package RT::Tickets;
-use RT::EasySearch;
-use RT::Ticket;
-@ISA= qw(RT::EasySearch);
-
-use vars qw(%TYPES @SORTFIELDS);
-
-# {{{ TYPES
-
-%TYPES =    ( Status => 'ENUM',
-	      Queue  => 'ENUM',
-	      Type => 'ENUM',
-	      Creator => 'ENUM',
-	      LastUpdatedBy => 'ENUM',
-	      Owner => 'ENUM',
-	      EffectiveId => 'INT',
-	      id => 'INT',
-	      InitialPriority => 'INT',
-	      FinalPriority => 'INT',
-	      Priority => 'INT',
-	      TimeLeft => 'INT',
-	      TimeWorked => 'INT',
-	      MemberOf => 'LINK',
-	      DependsOn => 'LINK',
-	      HasMember => 'LINK',
-	      HasDepender => 'LINK',
-	      RelatedTo => 'LINK',
-              Told => 'DATE',
-              StartsBy => 'DATE',
-              Started => 'DATE',
-              Due  => 'DATE',
-              Resolved => 'DATE',
-              LastUpdated => 'DATE',
-              Created => 'DATE',
-              Subject => 'STRING',
-	      Type => 'STRING',
-              Content => 'TRANSFIELD',
-	      ContentType => 'TRANSFIELD',
- 	      TransactionDate => 'TRANSDATE',
-	      Watcher => 'WATCHERFIELD',
-	      LinkedTo => 'LINKFIELD',
-              Keyword => 'KEYWORDFIELD'
-
-	    );
-
-
-# }}}
-
-# {{{ sub SortFields
-
-@SORTFIELDS = qw(id Status Owner Created Due Starts Started
-		 Queue Subject Told Started 
-		    Resolved LastUpdated Priority TimeWorked TimeLeft);
-
-=head2 SortFields
-
-Returns the list of fields that lists of tickets can easily be sorted by
-
-=cut
-
-
-sub SortFields {
-	my $self = shift;
-	return(@SORTFIELDS);
-}
-
-
-# }}}
-
-# {{{ Limit the result set based on content
-
-# {{{ sub Limit 
-
-=head2 Limit
-
-Takes a paramhash with the fields FIELD, OPERATOR, VALUE and DESCRIPTION
-Generally best called from LimitFoo methods
-
-=cut
-sub Limit {
-    my $self = shift;
-    my %args = ( FIELD => undef,
-		 OPERATOR => '=',
-		 VALUE => undef,
-		 DESCRIPTION => undef,
-		 @_
-	       );
-   $args{'DESCRIPTION'} = "Autodescribed: ".$args{'FIELD'} . $args{'OPERATOR'} . $args{'VALUE'},
-    if (!defined $args{'DESCRIPTION'}) ;
-
-    my $index = $self->_NextIndex;
-    
-    #make the TicketRestrictions hash the equivalent of whatever we just passed in;
-    
-    %{$self->{'TicketRestrictions'}{$index}} = %args;
-
-    $self->{'RecalcTicketLimits'} = 1;
-
-    # If we're looking at the effective id, we don't want to append the other clause
-    # which limits us to tickets where id = effective id 
-    if ($args{'FIELD'} eq 'EffectiveId') {
-        $self->{'looking_at_effective_id'} = 1;
-    }
-
-    return ($index);
-}
-
-# }}}
-
-
-
-
-=head2 FreezeLimits
-
-Returns a frozen string suitable for handing back to ThawLimits.
-
-=cut
-# {{{ sub FreezeLimits
-
-sub FreezeLimits {
-	my $self = shift;
-	require FreezeThaw;
-	return (FreezeThaw::freeze($self->{'TicketRestrictions'},
-				   $self->{'restriction_index'}
-				  ));
-}
-
-# }}}
-
-=head2 ThawLimits
-
-Take a frozen Limits string generated by FreezeLimits and make this tickets
-object have that set of limits.
-
-=cut
-# {{{ sub ThawLimits
-
-sub ThawLimits {
-	my $self = shift;
-	my $in = shift;
-	
-	#if we don't have $in, get outta here.
-	return undef unless ($in);
-
-    	$self->{'RecalcTicketLimits'} = 1;
-
-	require FreezeThaw;
-	
-	#We don't need to die if the thaw fails.
-	
-	eval {
-		($self->{'TicketRestrictions'},
-		$self->{'restriction_index'}
-		) = FreezeThaw::thaw($in);
-	}
-
-}
-
-# }}}
-
-# {{{ Limit by enum or foreign key
-
-# {{{ sub LimitQueue
-
-=head2 LimitQueue
-
-LimitQueue takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of = or !=. (It defaults to =).
-VALUE is a queue id. 
-
-=cut
-
-sub LimitQueue {
-    my $self = shift;
-    my %args = (VALUE => undef,
-		OPERATOR => '=',
-		@_);
-
-    #TODO  VALUE should also take queue names and queue objects
-    my $queue = new RT::Queue($self->CurrentUser);
-    $queue->Load($args{'VALUE'});
-    
-    #TODO check for a valid queue here
-
-    $self->Limit (FIELD => 'Queue',
-		  VALUE => $queue->id(),
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Queue ' .  $args{'OPERATOR'}. " ". $queue->Name
-		 );
-    
-}
-# }}}
-
-# {{{ sub LimitStatus
-
-=head2 LimitStatus
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of = or !=.
-VALUE is a status.
-
-=cut
-
-sub LimitStatus {
-    my $self = shift;
-    my %args = ( OPERATOR => '=',
-                  @_);
-    $self->Limit (FIELD => 'Status',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Status ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-		 );
-}
-
-# }}}
-
-# {{{ sub LimitType
-
-=head2 LimitType
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of = or !=, it defaults to "=".
-VALUE is a string to search for in the type of the ticket.
-
-=cut
-
-sub LimitType {
-    my $self = shift;
-    my %args = (OPERATOR => '=',
-		VALUE => undef,
-		@_);
-    $self->Limit (FIELD => 'Type',
-                  VALUE => $args{'VALUE'},
-                  OPERATOR => $args{'OPERATOR'},
-                  DESCRIPTION => 'Type ' .  $args{'OPERATOR'}. " ". $args{'Limit'},
-                 );
-}
-
-# }}}
-
-# }}}
-
-# {{{ Limit by string field
-
-# {{{ sub LimitSubject
-
-=head2 LimitSubject
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of = or !=.
-VALUE is a string to search for in the subject of the ticket.
-
-=cut
-
-sub LimitSubject {
-    my $self = shift;
-    my %args = (@_);
-    $self->Limit (FIELD => 'Subject',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Subject ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-		 );
-}
-
-# }}}
-
-# }}}
-
-# {{{ Limit based on ticket numerical attributes
-# Things that can be > < = !=
-
-# {{{ sub LimitId
-
-=head2 LimitId
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of =, >, < or !=.
-VALUE is a ticket Id to search for
-
-=cut
-
-sub LimitId {
-    my $self = shift;
-    my %args = (OPERATOR => '=',
-                @_);
-    
-    $self->Limit (FIELD => 'id',
-                  VALUE => $args{'VALUE'},
-                  OPERATOR => $args{'OPERATOR'},
-                  DESCRIPTION => 'Id ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-                 );
-}
-
-# }}}
-
-# {{{ sub LimitPriority
-
-=head2 LimitPriority
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of =, >, < or !=.
-VALUE is a value to match the ticket\'s priority against
-
-=cut
-
-sub LimitPriority {
-    my $self = shift;
-    my %args = (@_);
-    $self->Limit (FIELD => 'Priority',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Priority ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-		 );
-}
-
-# }}}
-
-# {{{ sub LimitInitialPriority
-
-=head2 LimitInitialPriority
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of =, >, < or !=.
-VALUE is a value to match the ticket\'s initial priority against
-
-
-=cut
-
-sub LimitInitialPriority {
-    my $self = shift;
-    my %args = (@_);
-    $self->Limit (FIELD => 'InitialPriority',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Initial Priority ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-		 );
-}
-
-# }}}
 
-# {{{ sub LimitFinalPriority
-
-=head2 LimitFinalPriority
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of =, >, < or !=.
-VALUE is a value to match the ticket\'s final priority against
-
-=cut
-
-sub LimitFinalPriority {
-    my $self = shift;
-    my %args = (@_);
-    $self->Limit (FIELD => 'FinalPriority',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Final Priority ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-		 );
-}
-
-# }}}
-
-# {{{ sub LimitTimeWorked
-
-=head2 LimitTimeWorked
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of =, >, < or !=.
-VALUE is a value to match the ticket's TimeWorked attribute
-
-=cut
-
-sub LimitTimeWorked {
-    my $self = shift;
-    my %args = (@_);
-    $self->Limit (FIELD => 'TimeWorked',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Time worked ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-		 );
-}
-
-# }}}
-
-# {{{ sub LimitTimeLeft
-
-=head2 LimitTimeLeft
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of =, >, < or !=.
-VALUE is a value to match the ticket's TimeLeft attribute
-
-=cut
-
-sub LimitTimeLeft {
-    my $self = shift;
-    my %args = (@_);
-    $self->Limit (FIELD => 'TimeLeft',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Time left ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-		 );
-}
-
-# }}}
-
-# }}}
-
-# {{{ Limiting based on attachment attributes
-
-# {{{ sub LimitContent
-
-=head2 LimitContent
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of =, LIKE, NOT LIKE or !=.
-VALUE is a string to search for in the body of the ticket
-
-=cut
-sub LimitContent {
-    my $self = shift;
-    my %args = (@_);
-    $self->Limit (FIELD => 'Content',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Ticket content ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-		 );
-}
-
-# }}}
-# {{{ sub LimitContentType
-
-=head2 LimitContentType
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of =, LIKE, NOT LIKE or !=.
-VALUE is a content type to search ticket attachments for
-
-=cut
-  
-sub LimitContentType {
-    my $self = shift;
-    my %args = (@_);
-    $self->Limit (FIELD => 'ContentType',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Ticket content type ' .  $args{'OPERATOR'}. " ". $args{'VALUE'},
-		 );
-}
-# }}}
-
-# }}}
-
-# {{{ Limiting based on people
-
-# {{{ sub LimitOwner
-
-=head2 LimitOwner
-
-Takes a paramhash with the fields OPERATOR and VALUE.
-OPERATOR is one of = or !=.
-VALUE is a user id.
-
-=cut
-
-sub LimitOwner {
-    my $self = shift;
-    my %args = ( OPERATOR => '=',
-                 @_);
-    
-    my $owner = new RT::User($self->CurrentUser);
-    $owner->Load($args{'VALUE'});
-    $self->Limit (FIELD => 'Owner',
-		  VALUE => $owner->Id,
-		  OPERATOR => $args{'OPERATOR'},
-		  DESCRIPTION => 'Owner ' .  $args{'OPERATOR'}. " ". $owner->Name()
-		 );
-    
-}
-
-# }}}
-
-# {{{ Limiting watchers
-
-# {{{ sub LimitWatcher
+use RT::SearchBuilder;
+use RT::Ticket;
 
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-=head2 LimitWatcher
-  
-  Takes a paramhash with the fields OPERATOR, TYPE and VALUE.
-  OPERATOR is one of =, LIKE, NOT LIKE or !=.
-  VALUE is a value to match the ticket\'s watcher email addresses against
-  TYPE is the sort of watchers you want to match against. Leave it undef if you want to search all of them
 
-=cut
-   
-sub LimitWatcher {
+sub _Init {
     my $self = shift;
-    my %args = ( OPERATOR => '=',
-		 VALUE => undef,
-		 TYPE => undef,
-		@_);
-
-
-    #build us up a description
-    my ($watcher_type, $desc);
-    if ($args{'TYPE'}) {
-	$watcher_type = $args{'TYPE'};
-    }
-    else {
-	$watcher_type = "Watcher";
-    }
-    $desc = "$watcher_type ".$args{'OPERATOR'}." ".$args{'VALUE'};
-
-
-    $self->Limit (FIELD => 'Watcher',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-		  TYPE => $args{'TYPE'},
-		  DESCRIPTION => "$desc"
-		 );
-}
-
-# }}}
-
-# {{{ sub LimitRequestor
+    $self->{'table'} = 'Tickets';
+    $self->{'primary_key'} = 'id';
 
-=head2 LimitRequestor
 
-It\'s like LimitWatcher, but it presets TYPE to Requestor
-
-=cut
-
-
-sub LimitRequestor {
-    my $self = shift;
-    $self->LimitWatcher(TYPE=> 'Requestor', @_);
+    return ( $self->SUPER::_Init(@_) );
 }
 
-# }}}
-
-# {{{ sub LimitCc
 
-=head2 LimitCC
+=item NewItem
 
-It\'s like LimitWatcher, but it presets TYPE to Cc
+Returns an empty new RT::Ticket item
 
 =cut
 
-sub LimitCc {
-    my $self = shift;
-    $self->LimitWatcher(TYPE=> 'Cc', @_);
-}
-
-# }}}
-
-# {{{ sub LimitAdminCc
-
-=head2 LimitAdminCc
-
-It\'s like LimitWatcher, but it presets TYPE to AdminCc
-
-=cut
-  
-sub LimitAdminCc {
+sub NewItem {
     my $self = shift;
-    $self->LimitWatcher(TYPE=> 'AdminCc', @_);
+    return(RT::Ticket->new($self->CurrentUser));
 }
 
-# }}}
-
-# }}}
-
-# }}}
+        eval "require RT::Tickets_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Tickets_Overlay.pm}) {
+            die $@;
+        };
 
-# {{{ Limiting based on links
+        eval "require RT::Tickets_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Tickets_Vendor.pm}) {
+            die $@;
+        };
 
-# {{{ LimitLinkedTo
+        eval "require RT::Tickets_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Tickets_Local.pm}) {
+            die $@;
+        };
 
-=head2 LimitLinkedTo
 
-LimitLinkedTo takes a paramhash with two fields: TYPE and TARGET
-TYPE limits the sort of relationship we want to search on
 
-TARGET is the id or URI of the TARGET of the link
-(TARGET used to be 'TICKET'.  'TICKET' is deprecated, but will be treated as TARGET
 
-=cut
-
-sub LimitLinkedTo {
-    my $self = shift;
-    my %args = ( 
-		TICKET => undef,
-		TARGET => undef,
-		TYPE => undef,
-		 @_);
-
-
-    $self->Limit( FIELD => 'LinkedTo',
-		  BASE => undef,
-		  TARGET => ($args{'TARGET'} || $args{'TICKET'}),
-		  TYPE => $args{'TYPE'},
-		  DESCRIPTION => "Tickets ".$args{'TYPE'}." by ".($args{'TARGET'} || $args{'TICKET'})
-		);
-}
-
-
-# }}}
+=head1 SEE ALSO
 
-# {{{ LimitLinkedFrom
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
-=head2 LimitLinkedFrom
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-LimitLinkedFrom takes a paramhash with two fields: TYPE and BASE
-TYPE limits the sort of relationship we want to search on
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
+   no warnings qw(redefine);
 
-BASE is the id or URI of the BASE of the link
-(BASE used to be 'TICKET'.  'TICKET' is deprecated, but will be treated as BASE
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
+RT::Tickets_Overlay, RT::Tickets_Vendor, RT::Tickets_Local
 
 =cut
 
-sub LimitLinkedFrom {
-    my $self = shift;
-    my %args = ( BASE => undef,
-		 TICKET => undef,
-		 TYPE => undef,
-		 @_);
-
-    
-    $self->Limit( FIELD => 'LinkedTo',
-		  TARGET => undef,
-		  BASE => ($args{'BASE'} || $args{'TICKET'}),
-		  TYPE => $args{'TYPE'},
-		  DESCRIPTION => "Tickets " .($args{'BASE'} || $args{'TICKET'}) ." ".$args{'TYPE'}
-		);
-}
-
-
-# }}}
-
-# {{{ LimitMemberOf 
-sub LimitMemberOf {
-    my $self = shift;
-    my $ticket_id = shift;
-    $self->LimitLinkedTo ( TARGET=> "$ticket_id",
-			   TYPE => 'MemberOf',
-			  );
-    
-}
-# }}}
-
-# {{{ LimitHasMember
-sub LimitHasMember {
-    my $self = shift;
-    my $ticket_id =shift;
-    $self->LimitLinkedFrom ( BASE => "$ticket_id",
-			     TYPE => 'MemberOf',
-			     );
-    
-}
-# }}}
-
-# {{{ LimitDependsOn
-
-sub LimitDependsOn {
-    my $self = shift;
-    my $ticket_id = shift;
-    $self->LimitLinkedTo ( TARGET => "$ticket_id",
-                           TYPE => 'DependsOn',
-			   );
-    
-}
-
-# }}}
-
-# {{{ LimitDependedOnBy
-
-sub LimitDependedOnBy {
-    my $self = shift;
-    my $ticket_id = shift;
-    $self->LimitLinkedFrom (  BASE => "$ticket_id",
-                               TYPE => 'DependsOn',
-			     );
-    
-}
-
-# }}}
-
-
-# {{{ LimitRefersTo
-
-sub LimitRefersTo {
-    my $self = shift;
-    my $ticket_id = shift;
-    $self->LimitLinkedTo ( TARGET => "$ticket_id",
-                           TYPE => 'RefersTo',
-			   );
-    
-}
-
-# }}}
-
-# {{{ LimitReferredToBy
-
-sub LimitReferredToBy {
-    my $self = shift;
-    my $ticket_id = shift;
-    $self->LimitLinkedFrom (  BASE=> "$ticket_id",
-                               TYPE => 'RefersTo',
-			     );
-    
-}
-
-# }}}
-
-# }}}
-
-# {{{ limit based on ticket date attribtes
-
-# {{{ sub LimitDate
-
-=head2 LimitDate (FIELD => 'DateField', OPERATOR => $oper, VALUE => $ISODate)
-
-Takes a paramhash with the fields FIELD OPERATOR and VALUE.
-
-OPERATOR is one of > or < 
-VALUE is a date and time in ISO format in GMT
-FIELD is one of Starts, Started, Told, Created, Resolved, LastUpdated
-
-There are also helper functions of the form LimitFIELD that eliminate
-the need to pass in a FIELD argument.
-
-=cut
-
-sub LimitDate {
-    my $self = shift;
-    my %args = (
-                  FIELD => undef,
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-
-                  @_);
-
-    #Set the description if we didn't get handed it above
-    unless ($args{'DESCRIPTION'} ) {
-	$args{'DESCRIPTION'} = $args{'FIELD'} . " " .$args{'OPERATOR'}. " ". $args{'VALUE'} . " GMT"
-    }
-
-    $self->Limit (%args);
-
-}
-
-# }}}
-
-
-
-
-sub LimitCreated {
-    my $self = shift;
-    $self->LimitDate( FIELD => 'Created', @_);
-}
-sub LimitDue {
-    my $self = shift;
-    $self->LimitDate( FIELD => 'Due', @_);
-
-}
-sub LimitStarts {
-    my $self = shift;
-    $self->LimitDate( FIELD => 'Starts', @_);
-
-}
-sub LimitStarted {
-    my $self = shift;
-    $self->LimitDate( FIELD => 'Started', @_);
-}
-sub LimitResolved { 
-    my $self = shift;
-    $self->LimitDate( FIELD => 'Resolved', @_);
-}
-sub LimitTold {
-    my $self = shift;
-    $self->LimitDate( FIELD => 'Told', @_);
-}
-sub LimitLastUpdated {
-    my $self = shift;
-    $self->LimitDate( FIELD => 'LastUpdated', @_);
-}
-#
-# {{{ sub LimitTransactionDate
-
-=head2 LimitTransactionDate (OPERATOR => $oper, VALUE => $ISODate)
-
-Takes a paramhash with the fields FIELD OPERATOR and VALUE.
-
-OPERATOR is one of > or < 
-VALUE is a date and time in ISO format in GMT
-
-
-=cut
-
-sub LimitTransactionDate {
-    my $self = shift;
-    my %args = (
-                  FIELD => 'TransactionDate',
-		  VALUE => $args{'VALUE'},
-		  OPERATOR => $args{'OPERATOR'},
-
-                  @_);
-
-    #Set the description if we didn't get handed it above
-    unless ($args{'DESCRIPTION'} ) {
-	$args{'DESCRIPTION'} = $args{'FIELD'} . " " .$args{'OPERATOR'}. " ". $args{'VALUE'} . " GMT"
-    }
-
-    $self->Limit (%args);
-
-}
-
-# }}}
-
-# }}}
-
-# {{{ sub LimitKeyword
-
-=head2 LimitKeyword 
-
-Takes a paramhash of key/value pairs with the following keys:
-
-=over 4
-
-=item KEYWORDSELECT - KeywordSelect id
-
-=item OPERATOR - (for KEYWORD only - KEYWORDSELECT operator is always `=')
-
-=item KEYWORD - Keyword id
-
-=back
-
-=cut
-
-sub LimitKeyword {
-    my $self = shift;
-    my %args = ( KEYWORD => undef,
-                 KEYWORDSELECT => undef,
-		 OPERATOR => '=',
-		 DESCRIPTION => undef,
-		 FIELD => 'Keyword',
-		 QUOTEVALUE => 1,
-		 @_
-	       );
-
-    use RT::KeywordSelect;
-    my $KeywordSelect = RT::KeywordSelect->new($self->CurrentUser);
-    $KeywordSelect->Load($args{KEYWORDSELECT});
-    
-
-    # Below, We're checking to see whether the keyword we're searching for
-    # is null or not.
-    # This could probably be rewritten to be easier to read and  understand
-
-    
-    #If we are looking to compare with a null value.
-    if ($args{'OPERATOR'} =~ /is/i)  {
-	if ($args{'OPERATOR'} =~ /^is$/i) {
-	    $args{'DESCRIPTION'} ||= "Keyword Selection ". $KeywordSelect->Name . " has no value";
-	}
-	elsif ($args{'OPERATOR'} =~ /^is not$/i) {
-	    $args{'DESCRIPTION'} ||= "Keyword Selection ". $KeywordSelect->Name . " has a value";
-	}
-    }
-	# if we're not looking to compare with a null value
-    else { 	
-        use RT::Keyword;
-	my $Keyword = RT::Keyword->new($self->CurrentUser);
-	$Keyword->Load($args{KEYWORD});
-	$args{'DESCRIPTION'} ||= "Keyword Selection " . $KeywordSelect->Name.  " $args{OPERATOR} ". $Keyword->Name;
-    }
-    
-    $args{SingleValued} = $KeywordSelect->Single();
- 
-    
-    my $index = $self->_NextIndex;
-    %{$self->{'TicketRestrictions'}{$index}} = %args;
-    
-    $self->{'RecalcTicketLimits'} = 1;
-    return ($index);
-}
-
-# }}}
-
-# {{{ sub _NextIndex
-
-=head2 _NextIndex
-
-Keep track of the counter for the array of restrictions
-
-=cut
-
-sub _NextIndex {
-    my $self = shift;
-    return ($self->{'restriction_index'}++);
-}
-# }}}
-
-# }}} 
-
-# {{{ Core bits to make this a DBIx::SearchBuilder object
-
-# {{{ sub _Init 
-sub _Init  {
-    my $self = shift;
-    $self->{'table'} = "Tickets";
-    $self->{'RecalcTicketLimits'} = 1;
-    $self->{'looking_at_effective_id'} = 0;
-    $self->{'restriction_index'} =1;
-    $self->{'primary_key'} = "id";
-    $self->SUPER::_Init(@_);
-
-}
-# }}}
-
-# {{{ sub NewItem 
-sub NewItem  {
-  my $self = shift;
-  return(RT::Ticket->new($self->CurrentUser));
-
-}
-# }}}
-
-# {{{ sub Count
-sub Count {
-  my $self = shift;
-  $self->_ProcessRestrictions if ($self->{'RecalcTicketLimits'} == 1 );
-  return($self->SUPER::Count());
-}
-# }}}
-
-# {{{ sub ItemsArrayRef
-
-=head2 ItemsArrayRef
-
-Returns a reference to the set of all items found in this search
-
-=cut
-
-sub ItemsArrayRef {
-    my $self = shift;
-    my @items;
-    
-    my $placeholder = $self->_ItemsCounter;
-    $self->GotoFirstItem();
-    while (my $item = $self->Next) { 
-	push (@items, $item);
-    }
-    
-    $self->GotoItem($placeholder);
-    return(\@items);
-}
-# }}}
-
-# {{{ sub Next 
-sub Next {
-	my $self = shift;
- 	
-	$self->_ProcessRestrictions if ($self->{'RecalcTicketLimits'} == 1 );
-
-	my $Ticket = $self->SUPER::Next();
-	if ((defined($Ticket)) and (ref($Ticket))) {
-
-    	    #Make sure we _never_ show dead tickets
-	    #TODO we should be doing this in the where clause.
-	    #but you can't do multiple clauses on the same field just yet :/
-
-	    if ($Ticket->Status eq 'dead') {
-		return($self->Next());
-	    }
-  	    elsif ($Ticket->CurrentUserHasRight('ShowTicket')) {
-		return($Ticket);
-	    }
-
-	    #If the user doesn't have the right to show this ticket
-	    else {	
-		return($self->Next());
-	    }
-	}
-	#if there never was any ticket
-	else {
-		return(undef);
-	}	
-
-}
-# }}}
-
-# }}}
-
-# {{{ Deal with storing and restoring restrictions
-
-# {{{ sub LoadRestrictions
-
-=head2 LoadRestrictions
-
-LoadRestrictions takes a string which can fully populate the TicketRestrictons hash.
-TODO It is not yet implemented
-
-=cut
-
-# }}}
-
-# {{{ sub DescribeRestrictions
-
-=head2 DescribeRestrictions
-
-takes nothing.
-Returns a hash keyed by restriction id. 
-Each element of the hash is currently a one element hash that contains DESCRIPTION which
-is a description of the purpose of that TicketRestriction
-
-=cut
-
-sub DescribeRestrictions  {
-    my $self = shift;
-    
-    my ($row, %listing);
-    
-    foreach $row (keys %{$self->{'TicketRestrictions'}}) {
-	$listing{$row} = $self->{'TicketRestrictions'}{$row}{'DESCRIPTION'};
-    }
-    return (%listing);
-}
-# }}}
-
-# {{{ sub RestrictionValues
-
-=head2 RestrictionValues FIELD
-
-Takes a restriction field and returns a list of values this field is restricted
-to.
-
-=cut
-
-sub RestrictionValues {
-    my $self = shift;
-    my $field = shift;
-    map $self->{'TicketRestrictions'}{$_}{'VALUE'},
-      grep {
-             $self->{'TicketRestrictions'}{$_}{'FIELD'} eq $field
-             && $self->{'TicketRestrictions'}{$_}{'OPERATOR'} eq "="
-           }
-        keys %{$self->{'TicketRestrictions'}};
-}
-
-# }}}
-
-# {{{ sub ClearRestrictions
-
-=head2 ClearRestrictions
-
-Removes all restrictions irretrievably
-
-=cut
-  
-sub ClearRestrictions {
-    my $self = shift;
-    delete $self->{'TicketRestrictions'};
-    $self->{'looking_at_effective_id'} = 0;
-    $self->{'RecalcTicketLimits'} =1;
-}
-
-# }}}
-
-# {{{ sub DeleteRestriction
-
-=head2 DeleteRestriction
-
-Takes the row Id of a restriction (From DescribeRestrictions' output, for example.
-Removes that restriction from the session's limits.
-
-=cut
-
-
-sub DeleteRestriction {
-    my $self = shift;
-    my $row = shift;
-    delete $self->{'TicketRestrictions'}{$row};
-    
-    $self->{'RecalcTicketLimits'} = 1;
-    #make the underlying easysearch object forget all its preconceptions
-}
-
-# }}}
-
-# {{{ sub _ProcessRestrictions 
-
-sub _ProcessRestrictions {
-    my $self = shift;
-
-    #Need to clean the EasySearch slate because it makes things too sticky
-    $self->CleanSlate();
-
-    #Blow away ticket aliases since we'll need to regenerate them for a new search
-    delete $self->{'TicketAliases'};
-    delete $self->{KeywordsAliases};
-
-    my $row;
-    
-    foreach $row (keys %{$self->{'TicketRestrictions'}}) {
-        my $restriction = $self->{'TicketRestrictions'}{$row};
-	# {{{ if it's an int
-	
-	if ($TYPES{$restriction->{'FIELD'}} eq 'INT' ) {
-	    if ($restriction->{'OPERATOR'} =~ /^(=|!=|>|<|>=|<=)$/) {
-		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
-			      ENTRYAGGREGATOR => 'AND',
-			      OPERATOR => $restriction->{'OPERATOR'},
-			      VALUE => $restriction->{'VALUE'},
-			      );
-	    }
-	}
-	# }}}
-	# {{{ if it's an enum
-	elsif ($TYPES{$restriction->{'FIELD'}} eq 'ENUM') {
-	    
-	    if ($restriction->{'OPERATOR'} eq '=') {
-		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
-			      ENTRYAGGREGATOR => 'OR',
-			      OPERATOR => '=',
-			      VALUE => $restriction->{'VALUE'},
-			    );
-	    }
-	    elsif ($restriction->{'OPERATOR'} eq '!=') {
-		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
-			      ENTRYAGGREGATOR => 'AND',
-			      OPERATOR => '!=',
-			      VALUE => $restriction->{'VALUE'},
-			    );
-	    }
-	    
-	}
-	# }}}
-	# {{{ if it's a date
-
-	elsif ($TYPES{$restriction->{'FIELD'}} eq 'DATE') {
-	    $self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
-				 ENTRYAGGREGATOR => 'AND',
-				 OPERATOR => $restriction->{'OPERATOR'},
-				 VALUE => $restriction->{'VALUE'},
-			       );
-	}
-	# }}}
- 	# {{{ if it's a string
-
-	elsif ($TYPES{$restriction->{'FIELD'}} eq 'STRING') {
-	    
-	    if ($restriction->{'OPERATOR'} eq '=') {
-		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
-			      ENTRYAGGREGATOR => 'OR',
-			      OPERATOR => '=',
-			      VALUE => $restriction->{'VALUE'},
-			      CASESENSITIVE => 0
-			    );
-	    }
-	    elsif ($restriction->{'OPERATOR'} eq '!=') {
-		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
-			      ENTRYAGGREGATOR => 'AND',
-			      OPERATOR => '!=',
-			      VALUE => $restriction->{'VALUE'},
-			      CASESENSITIVE => 0
-			    );
-	    }
-	    elsif ($restriction->{'OPERATOR'} eq 'LIKE') {
-		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
-			      ENTRYAGGREGATOR => 'AND',
-			      OPERATOR => 'LIKE',
-			      VALUE => $restriction->{'VALUE'},
-			      CASESENSITIVE => 0
-			    );
-	    }
-	    elsif ($restriction->{'OPERATOR'} eq 'NOT LIKE') {
-		$self->SUPER::Limit( FIELD => $restriction->{'FIELD'},
-			      ENTRYAGGREGATOR => 'AND',
-			      OPERATOR => 'NOT LIKE',
-			      VALUE => $restriction->{'VALUE'},
-			      CASESENSITIVE => 0
-			    );
-	    }
-	}
-
-	# }}}
-	# {{{ if it's Transaction content that we're hunting for
-	elsif ($TYPES{$restriction->{'FIELD'}} eq 'TRANSFIELD') {
-
-	    #Basically, we want to make sure that the limits apply to the same attachment,
-	    #rather than just another attachment for the same ticket, no matter how many 
-	    #clauses we lump on. 
-	    #We put them in TicketAliases so that they get nuked when we redo the join.
-	    
-	    unless (defined $self->{'TicketAliases'}{'TransFieldAlias'}) {
-		$self->{'TicketAliases'}{'TransFieldAlias'} = $self->NewAlias ('Transactions');
-	    }
-	    unless (defined $self->{'TicketAliases'}{'TransFieldAttachAlias'}){
-		$self->{'TicketAliases'}{'TransFieldAttachAlias'} = $self->NewAlias('Attachments');
-		
-	    }
-	    #Join transactions to attachments
-	    $self->Join( ALIAS1 => $self->{'TicketAliases'}{'TransFieldAttachAlias'},  
-			 FIELD1 => 'TransactionId',
-			 ALIAS2 => $self->{'TicketAliases'}{'TransFieldAlias'}, FIELD2=> 'id');
-	    
-	    #Join transactions to tickets
-	    $self->Join( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
-			 ALIAS2 =>$self->{'TicketAliases'}{'TransFieldAlias'}, FIELD2 => 'Ticket');
-	    
-	    #Search for the right field
-	    $self->SUPER::Limit(ALIAS => $self->{'TicketAliases'}{'TransFieldAttachAlias'},
-				  ENTRYAGGREGATOR => 'AND',
-				  FIELD =>    $restriction->{'FIELD'},
-				  OPERATOR => $restriction->{'OPERATOR'} ,
-				  VALUE =>    $restriction->{'VALUE'},
-			      	  CASESENSITIVE => 0
- 				);
-	    
-
-	}
-
-	# }}}
-	# {{{ if it's a Transaction date that we're hunting for
-	elsif ($TYPES{$restriction->{'FIELD'}} eq 'TRANSDATE') {
-
-	    #Basically, we want to make sure that the limits apply to the same attachment,
-	    #rather than just another attachment for the same ticket, no matter how many 
-	    #clauses we lump on. 
-	    #We put them in TicketAliases so that they get nuked when we redo the join.
-	    
-	    unless (defined $self->{'TicketAliases'}{'TransFieldAlias'}) {
-		$self->{'TicketAliases'}{'TransFieldAlias'} = $self->NewAlias ('Transactions');
-	    }
-
-	    #Join transactions to tickets
-	    $self->Join( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
-			 ALIAS2 =>$self->{'TicketAliases'}{'TransFieldAlias'}, FIELD2 => 'Ticket');
-	    
-	    #Search for the right field
-	    $self->SUPER::Limit(ALIAS => $self->{'TicketAliases'}{'TransFieldAlias'},
-				ENTRYAGGREGATOR => 'AND',
-				FIELD =>    'Created',
-				OPERATOR => $restriction->{'OPERATOR'} ,
-				VALUE =>    $restriction->{'VALUE'} );
-	}
-
-	# }}}
-	# {{{ if it's a relationship that we're hunting for
-	
-	# Takes FIELD: which is something like "LinkedTo"
-	# takes TARGET or BASE which is the TARGET or BASE id that we're searching for
-	# takes TYPE which is the type of link we're looking for.
-
-	elsif ($TYPES{$restriction->{'FIELD'}} eq 'LINKFIELD') {
-
-	    
-	    my $LinkAlias = $self->NewAlias ('Links');
-
-	    
-	    #Make sure we get the right type of link, if we're restricting it
-	    if ($restriction->{'TYPE'}) {
-		$self->SUPER::Limit(ALIAS => $LinkAlias,
-				    ENTRYAGGREGATOR => 'AND',
-				    FIELD =>   'Type',
-				    OPERATOR => '=',
-				    VALUE =>    $restriction->{'TYPE'} );
-	    }
-	    
-	    #If we're trying to limit it to things that are target of
-	    if ($restriction->{'TARGET'}) {
-		
-
-		# If the TARGET is an integer that means that we want to look at the LocalTarget
-		# field. otherwise, we want to look at the "Target" field
-
-		my ($matchfield);
-		if ($restriction->{'TARGET'} =~/^(\d+)$/) {
-		    $matchfield = "LocalTarget";
-		}	
-		else {
-		    $matchfield = "Target";
-		}	
-
-		$self->SUPER::Limit(ALIAS => $LinkAlias,
-				    ENTRYAGGREGATOR => 'AND',
-				    FIELD =>   $matchfield,
-				    OPERATOR => '=',
-				    VALUE =>    $restriction->{'TARGET'} );
-
-		
-		#If we're searching on target, join the base to ticket.id
-		$self->Join( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
-			     ALIAS2 => $LinkAlias,
-			     FIELD2 => 'LocalBase');
-
-	    
-
-
-	    }
-	    #If we're trying to limit it to things that are base of
-	    elsif ($restriction->{'BASE'}) {
-
-
-		# If we're trying to match a numeric link, we want to look at LocalBase,
-		# otherwise we want to look at "Base"
-
-		my ($matchfield);
-		if ($restriction->{'BASE'} =~/^(\d+)$/) {
-		    $matchfield = "LocalBase";
-		}	
-		else {
-		    $matchfield = "Base";
-		}	
-
-
-		$self->SUPER::Limit(ALIAS => $LinkAlias,
-				    ENTRYAGGREGATOR => 'AND',
-				    FIELD => $matchfield,
-				    OPERATOR => '=',
-				    VALUE =>    $restriction->{'BASE'} );
-		
-		#If we're searching on base, join the target to ticket.id
-		$self->Join( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
-			     ALIAS2 => $LinkAlias,
-			     FIELD2 => 'LocalTarget');
-		
-	    }
-
-	}
-		
-	# }}}
-	# {{{ if it's a watcher that we're hunting for
-	elsif ($TYPES{$restriction->{'FIELD'}} eq 'WATCHERFIELD') {
-
-	    my $Watch = $self->NewAlias('Watchers');
-
-	    #Join watchers to users
-	    my $User = $self->Join( TYPE => 'left',
-				     ALIAS1 => $Watch, 
-				     FIELD1 => 'Owner',
-				     TABLE2 => 'Users', 
-				     FIELD2 => 'id',
-				   );
-
-	    #Join Ticket to watchers
-	    $self->Join( ALIAS1 => 'main', FIELD1 => 'id',
-			 ALIAS2 => $Watch, FIELD2 => 'Value');
-
-
-	    #Make sure we're only talking about ticket watchers
-	    $self->SUPER::Limit( ALIAS => $Watch,
-				 FIELD => 'Scope',
-				 VALUE => 'Ticket',
-				 OPERATOR => '=');
-
-
-	    # Find email address watchers
-	    $self->SUPER::Limit( SUBCLAUSE => 'WatcherEmailAddress',
-				 ALIAS => $Watch,
-				 FIELD => 'Email',
-				 ENTRYAGGREGATOR => 'OR',
-				 VALUE => $restriction->{'VALUE'},
-				 OPERATOR => $restriction->{'OPERATOR'},
-			         CASESENSITIVE => 0
-			);
-
-
-
-	    #Find user watchers
-	    $self->SUPER::Limit(
-				SUBCLAUSE => 'WatcherEmailAddress',
-				ALIAS => $User,
-				FIELD => 'EmailAddress',
-				ENTRYAGGREGATOR => 'OR',
-				VALUE => $restriction->{'VALUE'},
-				OPERATOR => $restriction->{'OPERATOR'},
-			        CASESENSITIVE => 0
-			       );
-
-	    
-	    #If we only want a specific type of watchers, then limit it to that
-	    if ($restriction->{'TYPE'}) {
-		$self->SUPER::Limit( ALIAS => $Watch,
-				     FIELD => 'Type',
-				     ENTRYAGGREGATOR => 'OR',
-				     VALUE => $restriction->{'TYPE'},
-				     OPERATOR => '=');
-	    }
-	}
-
-	# }}}
-	# {{{ if it's a keyword
-	elsif ($TYPES{$restriction->{'FIELD'}} eq 'KEYWORDFIELD') {
- 
-	    my $null_columns_ok;
-
-            my $ObjKeywordsAlias;
-	    $ObjKeywordsAlias = $self->{KeywordsAliases}{$restriction->{'KEYWORDSELECT'}}
-	      if $restriction->{SingleValued};
-	    unless (defined $ObjKeywordsAlias) {
-	      $ObjKeywordsAlias = $self->Join(
-					       TYPE => 'left',
-					       ALIAS1 => 'main',
-					       FIELD1 => 'id',
-					       TABLE2 => 'ObjectKeywords',
-					       FIELD2 => 'ObjectId'
-					      );
-	      if ($restriction->{'SingleValued'}) {
-		$self->{KeywordsAliases}{$restriction->{'KEYWORDSELECT'}} 
-		  = $ObjKeywordsAlias;
-	      }
-	    }
-
-	  
-            $self->SUPER::Limit(
-				ALIAS => $ObjKeywordsAlias,
-				FIELD => 'Keyword',
-				OPERATOR => $restriction->{'OPERATOR'},
-				VALUE => $restriction->{'KEYWORD'},
-				QUOTEVALUE => $restriction->{'QUOTEVALUE'},
-				ENTRYAGGREGATOR => 'OR',
-                               );
-	    
-            if  ( ($restriction->{'OPERATOR'} =~ /^IS$/i) or 
-	          ($restriction->{'OPERATOR'} eq '!=') ) {
-		
-		$null_columns_ok=1;
-
-	    } 
-
-	    #If we're trying to find tickets where the keyword isn't somethng, also check ones where it _IS_ null
-	    if ( $restriction->{'OPERATOR'} eq '!=') {
-	        $self->SUPER::Limit(
-				    ALIAS => $ObjKeywordsAlias,
-				    FIELD => 'Keyword',
-				    OPERATOR => 'IS',
-				    VALUE => 'NULL',
-				    QUOTEVALUE => 0,
-				    ENTRYAGGREGATOR => 'OR',
-				   );
-	      }
-
-
-            $self->SUPER::Limit(LEFTJOIN => $ObjKeywordsAlias,
-				FIELD => 'KeywordSelect',
-				VALUE => $restriction->{'KEYWORDSELECT'},
-				ENTRYAGGREGATOR => 'OR');
-
-
- 
-            $self->SUPER::Limit( ALIAS => $ObjKeywordsAlias,
-                                 FIELD => 'ObjectType',
-                                 VALUE => 'Ticket',
-                                 ENTRYAGGREGATOR => 'AND');
-	    
-	    if ($null_columns_ok) {
-	         $self->SUPER::Limit(ALIAS => $ObjKeywordsAlias,
-                                    FIELD => 'ObjectType',
-	   	  		    OPERATOR => 'IS',
-                                    VALUE => 'NULL',
-				    QUOTEVALUE => 0,
-                                    ENTRYAGGREGATOR => 'OR');
-	    }
-	   
-        }
-        # }}}
-
-    
-     }
-
-     
-     # here, we make sure we don't get any tickets that have been merged  into other tickets
-     # (Ticket Id == Ticket EffectiveId
-     # note that we _really_ don't want to do this if we're already looking at the effectiveid
-     if ($self->_isLimited && (! $self->{'looking_at_effective_id'})) {
-        $self->SUPER::Limit( FIELD => 'EffectiveId', 
-              OPERATOR => '=',
-              QUOTEVALUE => 0,
-              VALUE => 'main.id');   #TODO, we shouldn't be hard coding the tablename to main.
-      } 
-    $self->{'RecalcTicketLimits'} = 0;
-}
-
-# }}}
-
-# }}}
-
-# {{{ Deal with displaying rows of the listing 
-
-#
-#  Everything in this section is stub code for 2.2
-# It's not part of the API. It's not for your use
-# It's not for our use.
-#
-
-
-# {{{ sub SetListingFormat
-
-=head2 SetListingFormat
-
-Takes a single Format string as specified below. parses that format string and makes the various listing output
-things DTRT.
-
-=item Format strings
-
-Format strings are made up of a chain of Elements delimited with vertical pipes (|).
-Elements of a Format string 
-
-
-FormatString:    Element[::FormatString]
-
-Element:         AttributeName[;HREF=<URL>][;TITLE=<TITLE>]
-
-AttributeName    Id | Subject | Status | Owner | Priority | InitialPriority | TimeWorked | TimeLeft |
-  
-                 Keywords[;SELECT=<KeywordSelect>] | 
-	
-                <Created|Starts|Started|Contacted|Due|Resolved>Date<AsString|AsISO|AsAge>
-
-
-=cut
-
-
-
-
-#accept a format string
-
-
-
-sub SetListingFormat {
-    my $self = shift;
-    my $listing_format = shift;
-    
-    my ($element, $attribs);
-    my $i = 0;
-    foreach $element (split (/::/,$listing_format)) {
-	if ($element =~ /^(.*?);(.*)$/) {
-	    $element = $1;
-	    $attribs = $2;
-	}	
-	$self->{'format_string'}->[$i]->{'Element'} = $element;
-	foreach $attrib (split (/;/, $attribs)) {
-	    my $value = "";
-	    if ($attrib =~ /^(.*?)=(.*)$/) {
-		$attrib = $1;
-		$value = $2;
-	    }	
-	    $self->{'format_string'}->[$i]->{"$attrib"} = $val;
-	    
-	}
-    
-    }
-    return(1);
-}
-
-# }}}
-
-# {{{ sub HeaderAsHTML
-sub HeaderAsHTML {
-    my $self = shift;
-    my $header = "";
-    my $col;
-    foreach $col ( @{[ $self->{'format_string'} ]}) {
-	$header .= "<TH>" . $self->_ColumnTitle($self->{'format_string'}->[$col]) . "</TH>";
-	
-    }
-    return ($header);
-}
-# }}}
-
-# {{{ sub HeaderAsText
-#Print text header
-sub HeaderAsText {
-    my $self = shift;
-    my ($header);
-    
-    return ($header);
-}
-# }}}
-
-# {{{ sub TicketAsHTMLRow
-#Print HTML row
-sub TicketAsHTMLRow {
-    my $self = shift;
-    my $Ticket = shift;
-    my ($row, $col);
-    foreach $col (@{[$self->{'format_string'}]}) {
-	$row .= "<TD>" . $self->_TicketColumnValue($ticket,$self->{'format_string'}->[$col]) . "</TD>";
-	
-    }
-    return ($row);
-}
-# }}}
-
-# {{{ sub TicketAsTextRow
-#Print text row
-sub TicketAsTextRow {
-    my $self = shift;
-    my ($row);
-
-    #TODO implement
-    
-    return ($row);
-}
-# }}}
-
-# {{{ _ColumnTitle {
-
-sub _ColumnTitle {
-    my $self = shift;
-    
-    # Attrib is a hash 
-    my $attrib = shift;
-    
-    # return either attrib->{'TITLE'} or..
-    if ($attrib->{'TITLE'}) {
-	return($attrib->{'TITLE'});
-    }	
-    # failing that, Look up the title in a hash
-    else {
-	#TODO create $self->{'ColumnTitles'};
-	return ($self->{'ColumnTitles'}->{$attrib->{'Element'}});
-    }	
-    
-}
-
-# }}}
-
-# {{{ _TicketColumnValue
-sub _TicketColumnValue {
-    my $self = shift;
-    my $Ticket = shift;
-    my $attrib = shift;
-
-    
-    my $out;
-
-  SWITCH: {
-	/^id/i && do {
-	    $out = $Ticket->id;
-	    last SWITCH; 
-	};
-	/^subj/i && do {
-	    last SWITCH; 
-	    $Ticket->Subject;
-		   };	
-	/^status/i && do {
-	    last SWITCH; 
-	    $Ticket->Status;
-	};
-	/^prio/i && do {
-	    last SWITCH; 
-	    $Ticket->Priority;
-	};
-	/^finalprio/i && do {
-	    
-	    last SWITCH; 
-	    $Ticket->FinalPriority
-	};
-	/^initialprio/i && do {
-	    
-	    last SWITCH; 
-	    $Ticket->InitialPriority;
-	};	
-	/^timel/i && do {
-	    
-	    last SWITCH; 
-	    $Ticket->TimeWorked;
-	};
-	/^timew/i && do {
-	    
-	    last SWITCH; 
-	    $Ticket->TimeLeft;
-	};
-	
-	/^(.*?)date(.*)$/i && do {
-	    my $o = $1;
-	    my $m = $2;
-	    my ($obj);
-	    #TODO: optimize
-	    $obj = $Ticket->DueObj         if $o =~ /due/i;
-	    $obj = $Ticket->CreatedObj     if $o =~ /created/i;
-	    $obj = $Ticket->StartsObj      if $o =~ /starts/i;
-	    $obj = $Ticket->StartedObj     if $o =~ /started/i;
-	    $obj = $Ticket->ToldObj        if $o =~ /told/i;
-	    $obj = $Ticket->LastUpdatedObj if $o =~ /lastu/i;
-	    
-	    $method = 'ISO' if $m =~ /iso/i;
-	    
-	    $method = 'AsString' if $m =~ /asstring/i;
-	    $method = 'AgeAsString' if $m =~ /age/i;
-	    last SWITCH;
-	    $obj->$method();
-	      
-	};
-	  
-	  /^watcher/i && do {
-	      last SWITCH; 
-	      $Ticket->WatchersAsString();
-	  };	
-	
-	/^requestor/i && do {
-	    last SWITCH; 
-	    $Ticket->RequestorsAsString();
-	};	
-	/^cc/i && do {
-	    last SWITCH; 
-	    $Ticket->CCAsString();
-	};	
-	
-	
-	/^admincc/i && do {
-	    last SWITCH; 
-	    $Ticket->AdminCcAsString();
-	};
-	
-	/^keywords/i && do {
-	    last SWITCH; 
-	    #Limit it to the keyword select we're talking about, if we've got one.
-	    my $objkeys =$Ticket->KeywordsObj($attrib->{'SELECT'});
-	    $objkeys->KeywordRelativePathsAsString();
-	};
-	
-    }
-      
-}
-
-# }}}
-
-# }}}
-
-# {{{ POD
-=head2 notes
-"Enum" Things that get Is, IsNot
-
-
-"Int" Things that get Is LessThan and GreaterThan
-id
-InitialPriority
-FinalPriority
-Priority
-TimeLeft
-TimeWorked
-
-"Text" Things that get Is, Like
-Subject
-TransactionContent
-
-
-"Link" OPERATORs
-
-
-"Date" OPERATORs Is, Before, After
 
-  =cut
-# }}}
 1;
diff --git a/rt/lib/RT/Transaction.pm b/rt/lib/RT/Transaction.pm
index ee1f069b2..ca491a6c7 100755
--- a/rt/lib/RT/Transaction.pm
+++ b/rt/lib/RT/Transaction.pm
@@ -1,783 +1,364 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Transaction.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# Copyright 1999-2001 Jesse Vincent <jesse@fsck.com>
-# Released under the terms of the GNU Public License
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::Transaction - RT\'s transaction object
+RT::Transaction
+
 
 =head1 SYNOPSIS
 
-  use RT::Transaction;
+=head1 DESCRIPTION
 
+=head1 METHODS
 
-=head1 DESCRIPTION
+=cut
 
+package RT::Transaction;
+use RT::Record; 
+use RT::Ticket;
 
-Each RT::Transaction describes an atomic change to a ticket object 
-or an update to an RT::Ticket object.
-It can have arbitrary MIME attachments.
 
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
+
+sub _Init {
+  my $self = shift; 
+
+  $self->Table('Transactions');
+  $self->SUPER::_Init(@_);
+}
 
-=head1 METHODS
 
-=begin testing
 
-ok(require RT::TestHarness);
-ok(require RT::Transaction);
 
-=end testing
+
+=item Create PARAMHASH
+
+Create takes a hash of values and creates a row in the database:
+
+  int(11) 'EffectiveTicket'.
+  int(11) 'Ticket'.
+  int(11) 'TimeTaken'.
+  varchar(20) 'Type'.
+  varchar(40) 'Field'.
+  varchar(255) 'OldValue'.
+  varchar(255) 'NewValue'.
+  varchar(100) 'Data'.
 
 =cut
 
-package RT::Transaction;
 
-use RT::Record;
-@ISA= qw(RT::Record);
-    
-use RT::Attachments;
 
-# {{{ sub _Init 
-sub _Init  {
+
+sub Create {
     my $self = shift;
-  $self->{'table'} = "Transactions";
-  return ($self->SUPER::_Init(@_));
+    my %args = ( 
+                EffectiveTicket => '0',
+                Ticket => '0',
+                TimeTaken => '0',
+                Type => '',
+                Field => '',
+                OldValue => '',
+                NewValue => '',
+                Data => '',
+
+		  @_);
+    $self->SUPER::Create(
+                         EffectiveTicket => $args{'EffectiveTicket'},
+                         Ticket => $args{'Ticket'},
+                         TimeTaken => $args{'TimeTaken'},
+                         Type => $args{'Type'},
+                         Field => $args{'Field'},
+                         OldValue => $args{'OldValue'},
+                         NewValue => $args{'NewValue'},
+                         Data => $args{'Data'},
+);
 
 }
-# }}}
 
-# {{{ sub Create 
 
-=head2 Create
 
-Create a new transaction.
+=item id
 
-This routine should _never_ be called anything other Than RT::Ticket. It should not be called 
-from client code. Ever. Not ever.  If you do this, we will hunt you down. and break your kneecaps.
-Then the unpleasant stuff will start.
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
 
-TODO: Document what gets passed to this
 
 =cut
 
-sub Create  {
-    my $self = shift;
-    my %args = ( id => undef,
-		 TimeTaken => 0,
-		 Ticket => 0 ,
-		 Type => 'undefined',
-		 Data => '',
-		 Field => undef,
-		 OldValue => undef,
-		 NewValue => undef,
-		 MIMEObj => undef,
-		 ActivateScrips => 1,
-		 @_
-	       );
-    
-    #if we didn't specify a ticket, we need to bail
-    unless ( $args{'Ticket'} ) {
-	return(0, "RT::Transaction->Create couldn't, as you didn't specify a ticket id");
-    }
-        
-    #lets create our transaction
-    my $id = $self->SUPER::Create(Ticket => $args{'Ticket'},
-	                          TimeTaken => $args{'TimeTaken'},
-				  Type => $args{'Type'},
-				  Data => $args{'Data'},
-				  Field => $args{'Field'},
-				  OldValue => $args{'OldValue'},
-				  NewValue => $args{'NewValue'},
-				  Created => $args{'Created'}
-				 );
-    $self->Load($id);
-    $self->_Attach($args{'MIMEObj'})
-      if defined $args{'MIMEObj'};
-    
-    #Provide a way to turn off scrips if we need to
-    if ($args{'ActivateScrips'}) {
-
-	#We're really going to need a non-acled ticket for the scrips to work
-	my $TicketAsSystem = RT::Ticket->new($RT::SystemUser);
-	$TicketAsSystem->Load($args{'Ticket'}) || 
-	  $RT::Logger->err("$self couldn't load ticket $args{'Ticket'}\n");
-	
-	my $TransAsSystem = RT::Transaction->new($RT::SystemUser);
-	$TransAsSystem->Load($self->id) ||
-	  $RT::Logger->err("$self couldn't load a copy of itself as superuser\n");
-	
-	# {{{ Deal with Scrips
-    
-    #Load a scripscopes object
-    use RT::Scrips;
-    my $PossibleScrips = RT::Scrips->new($RT::SystemUser);
-    
-    $PossibleScrips->LimitToQueue($TicketAsSystem->QueueObj->Id); #Limit it to  $Ticket->QueueObj->Id
-    $PossibleScrips->LimitToGlobal(); # or to "global"
-    my $ConditionsAlias = $PossibleScrips->NewAlias('ScripConditions');
-    
-    $PossibleScrips->Join(ALIAS1 => 'main',  FIELD1 => 'ScripCondition',
-			  ALIAS2 => $ConditionsAlias, FIELD2=> 'id');
-    
-    
-    #We only want things where the scrip applies to this sort of transaction
-    $PossibleScrips->Limit(ALIAS=> $ConditionsAlias,
-			   FIELD=>'ApplicableTransTypes',
-			   OPERATOR => 'LIKE',
-			   VALUE => $args{'Type'},
-			   ENTRYAGGREGATOR => 'OR',
-			  );
-    
-    # Or where the scrip applies to any transaction
-    $PossibleScrips->Limit(ALIAS=> $ConditionsAlias,
-			   FIELD=>'ApplicableTransTypes',
-			   OPERATOR => 'LIKE',
-			   VALUE => "Any",
-			   ENTRYAGGREGATOR => 'OR',
-			  );			    
-    
-    #Iterate through each script and check it's applicability.
-    
-    while (my $Scrip = $PossibleScrips->Next()) {
-      
-      #TODO: properly deal with errors raised in this scrip loop
-	
-      #$RT::Logger->debug("$self now dealing with ".$Scrip->Id. "\n");      
-	eval {
-	  local $SIG{__DIE__} = sub { $RT::Logger->error($_[0])};
-	  
-	  
-	  #Load the scrip's Condition object
-	  $Scrip->ConditionObj->LoadCondition(TicketObj => $TicketAsSystem, 
-					      TransactionObj => $TransAsSystem);	  
-	  
-	  
-	  #If it's applicable, prepare and commit it
-	  
-	$RT::Logger->debug ("$self: Checking condition ".$Scrip->ConditionObj->Name. "...\n");
-	  
-	  if ( $Scrip->IsApplicable() ) {
-	      
-		$RT::Logger->debug ("$self: Matches condition ".$Scrip->ConditionObj->Name. "...\n");
-	      #TODO: handle some errors here
-	      
-	      $Scrip->ActionObj->LoadAction(TicketObj => $TicketAsSystem, 
-					   TransactionObj => $TransAsSystem);
-	  
-	      
-	      if ($Scrip->Prepare()) {
-		  $RT::Logger->debug("$self: Prepared " .
-				   $Scrip->ActionObj->Name . "\n");
-		  if ($Scrip->Commit()) {
-			$RT::Logger->debug("$self: Committed " .
-					   $Scrip->ActionObj->Name . "\n");
-	     	  }
-		  else {
-			$RT::Logger->info("$self: Failed to commit ".
-					   $Scrip->ActionObj->Name . "\n");
-		  } 
-	      }
-	      else {
-		  $RT::Logger->info("$self: Failed to prepare " .
-				     $Scrip->ActionObj->Name . "\n");
-	      }
-
-	      #We're done with it. lets clean up.
-	      #TODO: something else isn't letting these get garbage collected. check em out.
-	      $Scrip->ActionObj->DESTROY();
-	      $Scrip->ConditionObj->DESTROY;
-	  }
-	  
-	  
-	else {
-	    $RT::Logger->debug ("$self: Doesn't match condition ".$Scrip->ConditionObj->Name. "...\n");
-
-	    # TODO: why doesn't this catch all the ScripObjs we create. 
-	    # and why do we explictly need to destroy them?
-	    $Scrip->ConditionObj->DESTROY;
-	}
-      }	
-    }
-
-    # }}}
-	
-    }
-
-    return ($id, "Transaction Created");
-}
 
-# }}}
+=item EffectiveTicket
 
-# {{{ sub Delete
+Returns the current value of EffectiveTicket. 
+(In the database, EffectiveTicket is stored as int(11).)
 
-sub Delete {
-    my $self = shift;
-    return (0, 'Deleting this object could break referential integrity');
-}
 
-# }}}
 
-# {{{ Routines dealing with Attachments
+=item SetEffectiveTicket VALUE
 
-# {{{ sub Message 
 
-=head2 Message
+Set EffectiveTicket to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, EffectiveTicket will be stored as a int(11).)
 
-  Returns the RT::Attachments Object which contains the "top-level" object
-  attachment for this transaction
 
 =cut
 
-sub Message  {
 
-    my $self = shift;
-    
-    if (!defined ($self->{'message'}) ){
-	
-	$self->{'message'} = new RT::Attachments($self->CurrentUser);
-	$self->{'message'}->Limit(FIELD => 'TransactionId',
-				  VALUE => $self->Id);
-	
-	$self->{'message'}->ChildrenOf(0);
-    } 
-    return($self->{'message'});
-}
-# }}}
+=item Ticket
+
+Returns the current value of Ticket. 
+(In the database, Ticket is stored as int(11).)
+
 
-# {{{ sub Content
 
-=head2 Content PARAMHASH
+=item SetTicket VALUE
 
-If this transaction has attached mime objects, returns the first text/ part.
-Otherwise, returns undef.
 
-Takes a paramhash.  If the $args{'Quote'} parameter is set, wraps this message 
-at $args{'Wrap'}.  $args{'Wrap'} defaults to 70.
+Set Ticket to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Ticket will be stored as a int(11).)
 
 
 =cut
 
-sub Content {
-    my $self = shift;
-    my %args = ( Quote => 0,
-		 Wrap => 70,
-		 @_ );
-
-    my $content = undef;
-
-    # If we don\'t have any content, return undef now.
-    unless ($self->Message->First) {
-	return (undef);
-    }	
-    
-    # Get the set of toplevel attachments to this transaction.
-    my $MIMEObj = $self->Message->First();
-    
-    # If it's a message or a plain part, just return the
-    # body. 
-    if ($MIMEObj->ContentType() =~ '^(text|message)(/|$)') {
-	$content = $MIMEObj->Content();
-    }
-    
-    # If it's a multipart object, first try returning the first 
-    # text/plain part. 
-    
-    elsif ($MIMEObj->ContentType() =~ '^multipart/') {
-	my $plain_parts = $MIMEObj->Children();
-	$plain_parts->ContentType(VALUE => 'text/plain');
-	
-	# If we actully found a part, return its content
-	if ($plain_parts->First && 
-        $plain_parts->First->Content ne '') {
-	    $content = $plain_parts->First->Content;		
-	}	
-	
-	# If that fails, return the  first text/ or message/ part 
-	# which has some content.
-    
-	else {
-	    my $all_parts = $MIMEObj->Children();
-	    while (($content == undef) && 
-		   (my $part = $all_parts->Next)) {
-		if (($part->ContentType() =~ '^(text|message)(/|$)') and
-		    ($part->Content())) {
-		    $content = $part->Content;
-		}	
-	    }
-	}	
-
-    }
-    # If all else fails, return a message that we couldn't find
-    # any content
-    else { 
-        $content = 'This transaction appears to have no content';
-    }	
-
-    if ($args{'Quote'}) {
-	# Remove quoted signature.
-	$content =~ s/\n-- \n(.*)$//s;
-
-	# What's the longest line like?
-	foreach (split (/\n/,$content)) {
-	    $max=length if ( length > $max);
-	}
-
-	if ($max>76) {
-	    require Text::Wrapper;
-	    my $wrapper=new Text::Wrapper
-		(
-		 columns => $args{'Wrap'}, 
-		 body_start => ($max > 70*3 ? '   ' : ''),
-		 par_start => ''
-		 );
-	    $content=$wrapper->wrap($content);
-	}
-
-	$content =~ s/^/> /gm;
-	$content = '[' . $self->CreatorObj->Name() . ' - ' . $self->CreatedAsString()
-	            . "]:\n\n"
-   	        . $content . "\n\n";
-
-    }
-
-    return ($content); 
-}
-# }}}
 
-# {{{ sub Subject
+=item TicketObj
+
+Returns the Ticket Object which has the id returned by Ticket
 
-=head2 Subject
 
-If this transaction has attached mime objects, returns the first one's subject
-Otherwise, returns null
-  
 =cut
 
-sub Subject {
-    my $self = shift;
-    if ($self->Message->First) {
-	return ($self->Message->First->Subject);
-    }
-    else {
-	return (undef);
-    }
+sub TicketObj {
+	my $self = shift;
+	my $Ticket =  RT::Ticket->new($self->CurrentUser);
+	$Ticket->Load($self->__Value('Ticket'));
+	return($Ticket);
 }
-# }}}
 
-# {{{ sub Attachments 
+=item TimeTaken
+
+Returns the current value of TimeTaken. 
+(In the database, TimeTaken is stored as int(11).)
+
 
-=head2 Attachments
 
-  Returns all the RT::Attachment objects which are attached
-to this transaction. Takes an optional parameter, which is
-a ContentType that Attachments should be restricted to.
+=item SetTimeTaken VALUE
+
+
+Set TimeTaken to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, TimeTaken will be stored as a int(11).)
+
 
 =cut
 
 
-sub Attachments  {
-    my $self = shift;
-    my $Types = '';
-    $Types = shift if (@_);
-
-    my $Attachments = new RT::Attachments($self->CurrentUser);
-    
-    #If it's a comment, return an empty object if they don't have the right to see it
-    if ($self->Type eq 'Comment') {
-	unless ($self->CurrentUserHasRight('ShowTicketComments')) {
-	    return ($Attachments);
-	}
-    }	
-    #if they ain't got rights to see, return an empty object
-    else {
-	unless ($self->CurrentUserHasRight('ShowTicket')) {
-	    return ($Attachments);
-	}
-    }
-    
-    $Attachments->Limit(FIELD => 'TransactionId',
-			VALUE => $self->Id);
-
-    # Get the attachments in the order they're put into
-    # the database.  Arguably, we should be returning a tree
-    # of attachments, not a set...but no current app seems to need
-    # it. 
-
-    $Attachments->OrderBy(ALIAS => 'main', 
-			  FIELD => 'Id',
-			  ORDER => 'asc');
-
-    if ($Types) {
-	$Attachments->ContentType( VALUE => "$Types",
-				   OPERATOR => "LIKE");
-    }
-    
-    
-    return($Attachments);
-    
-}
+=item Type
 
-# }}}
+Returns the current value of Type. 
+(In the database, Type is stored as varchar(20).)
 
-# {{{ sub _Attach 
 
-=head2 _Attach
 
-A private method used to attach a mime object to this transaction.
+=item SetType VALUE
+
+
+Set Type to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Type will be stored as a varchar(20).)
+
 
 =cut
 
-sub _Attach  {
-    my $self = shift;
-    my $MIMEObject = shift;
-    
-    if (!defined($MIMEObject)) {
-	$RT::Logger->error("$self _Attach: We can't attach a mime object if you don't give us one.\n");
-	return(0, "$self: no attachment specified");
-    }
-    
-  
-    use RT::Attachment;
-    my $Attachment = new RT::Attachment ($self->CurrentUser);
-    $Attachment->Create(TransactionId => $self->Id,
-			Attachment => $MIMEObject);
-    return ($Attachment, "Attachment created");
-    
-}
 
-# }}}
+=item Field
 
-# }}}
+Returns the current value of Field. 
+(In the database, Field is stored as varchar(40).)
 
-# {{{ Routines dealing with Transaction Attributes
 
-# {{{ sub TicketObj
 
-=head2 TicketObj
+=item SetField VALUE
+
+
+Set Field to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Field will be stored as a varchar(40).)
 
-Returns this transaction's ticket object.
 
 =cut
 
-sub TicketObj {
-    my $self = shift;
-    if (! exists $self->{'TicketObj'}) {
-	$self->{'TicketObj'} = new RT::Ticket($self->CurrentUser);
-	$self->{'TicketObj'}->Load($self->Ticket);
-    }
-    
-    return $self->{'TicketObj'};
-}
-# }}}
 
-# {{{ sub Description 
+=item OldValue
+
+Returns the current value of OldValue. 
+(In the database, OldValue is stored as varchar(255).)
+
+
+
+=item SetOldValue VALUE
+
 
-=head2 Description
+Set OldValue to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, OldValue will be stored as a varchar(255).)
 
-Returns a text string which describes this transaction
 
 =cut
 
 
-sub Description  {
-    my $self = shift;
+=item NewValue
+
+Returns the current value of NewValue. 
+(In the database, NewValue is stored as varchar(255).)
 
-    #Check those ACLs
-    #If it's a comment, we need to be extra special careful
-    if ($self->__Value('Type') eq 'Comment') {
-     	unless ($self->CurrentUserHasRight('ShowTicketComments')) {
-	    return (0, "Permission Denied");
-	}
-    }	
-
-    #if they ain't got rights to see, don't let em
-    else {
-	unless ($self->CurrentUserHasRight('ShowTicket')) {
-	    return (0, "Permission Denied");
-	}
-    }
-
-    if (!defined($self->Type)) {
-	return("No transaction type specified");
-    }
-    
-    return ($self->BriefDescription . " by " . $self->CreatorObj->Name);
-}
 
-# }}}
 
-# {{{ sub BriefDescription 
+=item SetNewValue VALUE
 
-=head2 BriefDescription
 
-Returns a text string which briefly describes this transaction
+Set NewValue to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, NewValue will be stored as a varchar(255).)
+
 
 =cut
 
 
-sub BriefDescription  {
-    my $self = shift;
+=item Data
 
-    #Check those ACLs
-    #If it's a comment, we need to be extra special careful
-    if ($self->__Value('Type') eq 'Comment') {
-     	unless ($self->CurrentUserHasRight('ShowTicketComments')) {
-	    return (0, "Permission Denied");
-	}
-    }	
-
-    #if they ain't got rights to see, don't let em
-    else {
-	unless ($self->CurrentUserHasRight('ShowTicket')) {
-	    return (0, "Permission Denied");
-	}
-    }
-
-    if (!defined($self->Type)) {
-	return("No transaction type specified");
-    }
-    
-    if ($self->Type eq 'Create'){
-	return("Ticket created");
-    }
-    elsif ($self->Type =~ /Status/) {
-	if ($self->Field eq 'Status') {
-	    if ($self->NewValue eq 'dead') {
-		return ("Ticket killed");
-      }
-	    else {
-		return( "Status changed from ".  $self->OldValue . 
-			" to ". $self->NewValue);
-
-	    }
-	}
-	# Generic:
-	return ($self->Field." changed from ".($self->OldValue||"(empty value)").
-	  " to ".$self->NewValue );
-      }
-    
-    if ($self->Type eq 'Correspond')    {
-	return("Correspondence added");
-    }
-    
-    elsif ($self->Type eq 'Comment')  {
-	return( "Comments added");
-    }
-    
-    elsif ($self->Type eq 'Keyword') {
-
-	my $field = 'Keyword';
-
-	if ($self->Field) {
-	    my $keywordsel = new RT::KeywordSelect ($self->CurrentUser);
-	    $keywordsel->Load($self->Field);
-	    $field = $keywordsel->Name();
-	}
-
-	if ($self->OldValue eq '') {
-	    return ($field." ".$self->NewValue." added");
-	}
-	elsif ($self->NewValue eq '') {
-	    return ($field." ".$self->OldValue." deleted"); 
-	    
-	}
-	else {
-	    return ($field." ".$self->OldValue . " changed to ". 
-		     $self->NewValue);
-	}	
-    }
-    
-    elsif ($self->Type eq 'Untake'){
-	    return( "Untaken");
-	}
-    
-    elsif ($self->Type eq "Take") {
-	return( "Taken");
-    }
-    
-    elsif ($self->Type eq "Force") {
-        my $Old = RT::User->new($self->CurrentUser);
-        $Old->Load($self->OldValue);
-        my $New = RT::User->new($self->CurrentUser);
-        $New->Load($self->NewValue);
-	return "Owner forcibly changed from ".$Old->Name . " to ". $New->Name;
-    }
-    elsif ($self->Type eq "Steal") {
-	my $Old = RT::User->new($self->CurrentUser);
-	$Old->Load($self->OldValue);
-	return "Stolen from ".$Old->Name;
-    }
-    
-    elsif ($self->Type eq "Give") {
-	my $New = RT::User->new($self->CurrentUser);
-	$New->Load($self->NewValue);
-	return( "Given to ".$New->Name);
-    }
-    
-    elsif ($self->Type eq 'AddWatcher'){
-	return( $self->Field." ". $self->NewValue ." added");
-    }
-    
-    elsif ($self->Type eq 'DelWatcher'){
-	return( $self->Field." ".$self->OldValue ." deleted");
-    }
-    
-    elsif ($self->Type eq 'Subject') {
-	return( "Subject changed to ".$self->Data);
-    }
-    elsif ($self->Type eq 'Told') {
-	return( "User notified");
-    }
-    
-    elsif ($self->Type eq 'AddLink') {
-	return ($self->Data);
-    }
-    elsif ($self->Type eq 'DeleteLink') {
-	return ($self->Data);
-    }
-    elsif ($self->Type eq 'Set') {
-	if ($self->Field eq 'Queue') {
-	    my $q1 = new RT::Queue($self->CurrentUser);
-	    $q1->Load($self->OldValue);
-	    my $q2 = new RT::Queue($self->CurrentUser);
-	    $q2->Load($self->NewValue);
-	    return ($self->Field . " changed from " . $q1->Name . " to ".
-		    $q2->Name);
-	}
-
-        # Write the date/time change at local time:                    
-    elsif ($self->Field =~  /Due|Starts|Started|Told/) {           
-        my $t1 = new RT::Date($self->CurrentUser);                 
-        $t1->Set(Format => 'ISO', Value => $self->NewValue);       
-        my $t2 = new RT::Date($self->CurrentUser);                 
-        $t2->Set(Format => 'ISO', Value => $self->OldValue);       
-        return ($self->Field . " changed from " . $t2->AsString .  
-                    " to ".$t1->AsString);      
-    }                
-	else {
-	    return ($self->Field . " changed from " . $self->OldValue . 
-		    " to ".$self->NewValue);
-	}	
-    }
-    elsif ($self->Type eq 'PurgeTransaction') {
-	return ("Transaction ".$self->Data. " purged");
-    }
-    else {
-	return ("Default: ". $self->Type ."/". $self->Field . 
-		" changed from " . $self->OldValue . 
-		" to ".$self->NewValue);
-	
-    }
-}
+Returns the current value of Data. 
+(In the database, Data is stored as varchar(100).)
 
-# }}}
 
-# {{{ Utility methods
 
-# {{{ sub IsInbound
+=item SetData VALUE
 
-=head2 IsInbound
 
-Returns true if the creator of the transaction is a requestor of the ticket.
-Returns false otherwise
+Set Data to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Data will be stored as a varchar(100).)
 
-=cut
 
-sub IsInbound {
-    my $self=shift;
-    return ($self->TicketObj->IsRequestor($self->CreatorObj));
-}
+=cut
 
-# }}}
-
-# }}}
-
-# {{{ sub _Accessible 
-
-sub _Accessible  {
-  my $self = shift;
-  my %Cols = (
-	      TimeTaken => 'read',
-	      Ticket => 'read/public',
-	      Type=> 'read',
-	      Field => 'read',
-	      Data => 'read',
-	      NewValue => 'read',
-	      OldValue => 'read',
-	      Creator => 'read/auto',
-	      Created => 'read/auto',
-	     );
-  return $self->SUPER::_Accessible(@_, %Cols);
-}
 
-# }}}
+=item Creator
 
-# }}}
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
 
-# {{{ sub _Set
 
-sub _Set {
-    my $self = shift;
-    return(0, 'Transactions are immutable');
-}
+=cut
 
-# }}}
 
-# {{{ sub _Value 
+=item Created
 
-=head2 _Value
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
 
-Takes the name of a table column.
-Returns its value as a string, if the user passes an ACL check
 
 =cut
 
-sub _Value  {
 
-    my $self = shift;
-    my $field = shift;
-    
-    
-    #if the field is public, return it.
-    if ($self->_Accessible($field, 'public')) {
-	return($self->__Value($field));
-	
-    }
-    #If it's a comment, we need to be extra special careful
-    if ($self->__Value('Type') eq 'Comment') {
-	unless ($self->CurrentUserHasRight('ShowTicketComments')) {
-	    return (undef);
-	}
-    }	
-    #if they ain't got rights to see, don't let em
-    else {
-	unless ($self->CurrentUserHasRight('ShowTicket')) {
-	    return (undef);
-	}
-    }	
-    
-    return($self->__Value($field));
-    
-}
 
-# }}}
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        EffectiveTicket => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Ticket => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        TimeTaken => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Type => 
+		{read => 1, write => 1, type => 'varchar(20)', default => ''},
+        Field => 
+		{read => 1, write => 1, type => 'varchar(40)', default => ''},
+        OldValue => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        NewValue => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
+        Data => 
+		{read => 1, write => 1, type => 'varchar(100)', default => ''},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
 
-# {{{ sub CurrentUserHasRight
+ }
+};
 
-=head2 CurrentUserHasRight RIGHT
 
-Calls $self->CurrentUser->HasQueueRight for the right passed in here.
-passed in here.
+        eval "require RT::Transaction_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Transaction_Overlay.pm}) {
+            die $@;
+        };
 
-=cut
+        eval "require RT::Transaction_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Transaction_Vendor.pm}) {
+            die $@;
+        };
 
-sub CurrentUserHasRight {
-    my $self = shift;
-    my $right = shift;
-    return ($self->CurrentUser->HasQueueRight(Right => "$right", 
-                                              TicketObj => $self->TicketObj));            
-}
+        eval "require RT::Transaction_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Transaction_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Transaction_Overlay, RT::Transaction_Vendor, RT::Transaction_Local
+
+=cut
 
-# }}}
 
 1;
diff --git a/rt/lib/RT/Transactions.pm b/rt/lib/RT/Transactions.pm
index 2ae98f286..23a475ac6 100755
--- a/rt/lib/RT/Transactions.pm
+++ b/rt/lib/RT/Transactions.pm
@@ -1,78 +1,115 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Transactions.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-=head1 NAME
 
-  RT::Transactions - a collection of RT Transaction objects
+=head1 NAME
 
+  RT::Transactions -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::Transactions;
-
+  use RT::Transactions
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
-=begin testing
-
-ok (require RT::TestHarness);
-ok (require RT::Transactions);
-
-=end testing
-
 =cut
 
 package RT::Transactions;
-use RT::EasySearch;
 
-@ISA= qw(RT::EasySearch);
+use RT::SearchBuilder;
 use RT::Transaction;
 
-# {{{ sub _Init  
-sub _Init   {
-  my $self = shift;
-  
-  $self->{'table'} = "Transactions";
-  $self->{'primary_key'} = "id";
-  
-  # By default, order by the date of the transaction, rather than ID.
-  $self->OrderBy( ALIAS => 'main',
-		  FIELD => 'Created',
-		  ORDER => 'ASC');
-
-  return ( $self->SUPER::_Init(@_));
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
+
+
+sub _Init {
+    my $self = shift;
+    $self->{'table'} = 'Transactions';
+    $self->{'primary_key'} = 'id';
+
+
+    return ( $self->SUPER::_Init(@_) );
 }
-# }}}
 
-# {{{ sub NewItem 
-sub NewItem  {
+
+=item NewItem
+
+Returns an empty new RT::Transaction item
+
+=cut
+
+sub NewItem {
     my $self = shift;
-    
     return(RT::Transaction->new($self->CurrentUser));
 }
-# }}}
+
+        eval "require RT::Transactions_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Transactions_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Transactions_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Transactions_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::Transactions_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Transactions_Local.pm}) {
+            die $@;
+        };
 
 
-=head2 example methods
 
-  Queue RT::Queue or Queue Id
-  Ticket RT::Ticket or Ticket Id
 
+=head1 SEE ALSO
 
-LimitDate 
-  
-Type TRANSTYPE
-Field STRING
-OldValue OLDVAL
-NewValue NEWVAL
-Data DATA
-TimeTaken
-Actor USEROBJ/USERID
-ContentMatches STRING
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::Transactions_Overlay, RT::Transactions_Vendor, RT::Transactions_Local
 
 =cut
 
 
 1;
-
diff --git a/rt/lib/RT/User.pm b/rt/lib/RT/User.pm
index 4e8554030..cbc10f5b4 100755
--- a/rt/lib/RT/User.pm
+++ b/rt/lib/RT/User.pm
@@ -1,1222 +1,854 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/User.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-2000 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
+
 
 =head1 NAME
 
-  RT::User - RT User object
+RT::User
 
-=head1 SYNOPSIS
 
-  use RT::User;
+=head1 SYNOPSIS
 
 =head1 DESCRIPTION
 
-
 =head1 METHODS
 
-=begin testing
+=cut
+
+package RT::User;
+use RT::Record; 
+
+
+use vars qw( @ISA );
+@ISA= qw( RT::Record );
+
+sub _Init {
+  my $self = shift; 
+
+  $self->Table('Users');
+  $self->SUPER::_Init(@_);
+}
 
-ok(require RT::TestHarness);
-ok(require RT::User);
 
-=end testing
 
 
+
+=item Create PARAMHASH
+
+Create takes a hash of values and creates a row in the database:
+
+  varchar(200) 'Name'.
+  varchar(40) 'Password'.
+  blob 'Comments'.
+  blob 'Signature'.
+  varchar(120) 'EmailAddress'.
+  blob 'FreeformContactInfo'.
+  varchar(200) 'Organization'.
+  varchar(120) 'RealName'.
+  varchar(16) 'NickName'.
+  varchar(16) 'Lang'.
+  varchar(16) 'EmailEncoding'.
+  varchar(16) 'WebEncoding'.
+  varchar(100) 'ExternalContactInfoId'.
+  varchar(30) 'ContactInfoSystem'.
+  varchar(100) 'ExternalAuthId'.
+  varchar(30) 'AuthSystem'.
+  varchar(16) 'Gecos'.
+  varchar(30) 'HomePhone'.
+  varchar(30) 'WorkPhone'.
+  varchar(30) 'MobilePhone'.
+  varchar(30) 'PagerPhone'.
+  varchar(200) 'Address1'.
+  varchar(200) 'Address2'.
+  varchar(100) 'City'.
+  varchar(100) 'State'.
+  varchar(16) 'Zip'.
+  varchar(50) 'Country'.
+  varchar(50) 'Timezone'.
+  text 'PGPKey'.
+
 =cut
 
 
-package RT::User;
-use RT::Record;
-@ISA= qw(RT::Record);
 
-# {{{ sub _Init
-sub _Init  {
+
+sub Create {
     my $self = shift;
-    $self->{'table'} = "Users";
-    return($self->SUPER::_Init(@_));
-}
-# }}}
-
-# {{{ sub _Accessible 
-
-sub _Accessible  {
-  my $self = shift;
-  my %Cols = (
-	      # {{{ Core RT info
-	      Name => 'public/read/write/admin',
-	      Password => 'write',
-	      Comments => 'read/write/admin',
-	      Signature => 'read/write',
-	      EmailAddress => 'public/read/write',
-	      PagerEmailAddress => 'read/write',
-	      FreeformContactInfo => 'read/write',
-	      Organization => 'public/read/write/admin',
-	      Disabled => 'public/read/write/admin', #To modify this attribute, we have helper
-	      #methods
-	      Privileged => 'read/write/admin', # 0=no 1=user 2=system
-
-	      # }}}
-	      
-	      # {{{ Names
-	      
-	      RealName => 'public/read/write',
-	      NickName => 'public/read/write',
-	      # }}}
-	      	      
-	      # {{{ Localization and Internationalization
-	      Lang => 'public/read/write',
-	      EmailEncoding => 'public/read/write',
-	      WebEncoding => 'public/read/write',
-	      # }}}
-	      
-	      # {{{ External ContactInfo Linkage
-	      ExternalContactInfoId => 'public/read/write/admin',
-	      ContactInfoSystem => 'public/read/write/admin',
-	      # }}}
-	      
-	      # {{{ User Authentication identifier
-	      ExternalAuthId => 'public/read/write/admin',
-	      #Authentication system used for user 
-	      AuthSystem => 'public/read/write/admin',
-	      Gecos => 'public/read/write/admin', #Gecos is the name of the fields in a 
-	      # unix passwd file. In this case, it refers to "Unix Username"
-	      # }}}
-	      
-	      # {{{ Telephone numbers
-	      HomePhone =>  'read/write',
-	      WorkPhone => 'read/write',
-	      MobilePhone => 'read/write',
-	      PagerPhone => 'read/write',
-
-	      # }}}
-	      
-	      # {{{ Paper Address
-	      Address1 => 'read/write',
-	      Address2 => 'read/write',
-	      City => 'read/write',
-	      State => 'read/write',
-	      Zip => 'read/write',
-	      Country => 'read/write',
-	      # }}}
-	      
-	      # {{{ Core DBIx::Record Attributes
-	      Creator => 'read/auto',
-	      Created => 'read/auto',
-	      LastUpdatedBy => 'read/auto',
-	      LastUpdated => 'read/auto'
-
-	      # }}}
-	     );
-  return($self->SUPER::_Accessible(@_, %Cols));
+    my %args = ( 
+                Name => '',
+                Password => '',
+                Comments => '',
+                Signature => '',
+                EmailAddress => '',
+                FreeformContactInfo => '',
+                Organization => '',
+                RealName => '',
+                NickName => '',
+                Lang => '',
+                EmailEncoding => '',
+                WebEncoding => '',
+                ExternalContactInfoId => '',
+                ContactInfoSystem => '',
+                ExternalAuthId => '',
+                AuthSystem => '',
+                Gecos => '',
+                HomePhone => '',
+                WorkPhone => '',
+                MobilePhone => '',
+                PagerPhone => '',
+                Address1 => '',
+                Address2 => '',
+                City => '',
+                State => '',
+                Zip => '',
+                Country => '',
+                Timezone => '',
+                PGPKey => '',
+
+		  @_);
+    $self->SUPER::Create(
+                         Name => $args{'Name'},
+                         Password => $args{'Password'},
+                         Comments => $args{'Comments'},
+                         Signature => $args{'Signature'},
+                         EmailAddress => $args{'EmailAddress'},
+                         FreeformContactInfo => $args{'FreeformContactInfo'},
+                         Organization => $args{'Organization'},
+                         RealName => $args{'RealName'},
+                         NickName => $args{'NickName'},
+                         Lang => $args{'Lang'},
+                         EmailEncoding => $args{'EmailEncoding'},
+                         WebEncoding => $args{'WebEncoding'},
+                         ExternalContactInfoId => $args{'ExternalContactInfoId'},
+                         ContactInfoSystem => $args{'ContactInfoSystem'},
+                         ExternalAuthId => $args{'ExternalAuthId'},
+                         AuthSystem => $args{'AuthSystem'},
+                         Gecos => $args{'Gecos'},
+                         HomePhone => $args{'HomePhone'},
+                         WorkPhone => $args{'WorkPhone'},
+                         MobilePhone => $args{'MobilePhone'},
+                         PagerPhone => $args{'PagerPhone'},
+                         Address1 => $args{'Address1'},
+                         Address2 => $args{'Address2'},
+                         City => $args{'City'},
+                         State => $args{'State'},
+                         Zip => $args{'Zip'},
+                         Country => $args{'Country'},
+                         Timezone => $args{'Timezone'},
+                         PGPKey => $args{'PGPKey'},
+);
+
 }
 
-# }}}
 
-# {{{ sub Create 
 
-sub Create  {
-    my $self = shift;
-    my %args = (Privileged => 0,
-		@_ # get the real argumentlist
-	       );
-    
-    #Check the ACL
-    unless ($self->CurrentUserHasRight('AdminUsers')) {
-	return (0, 'No permission to create users');
-    }
-    
-    if (! $args{'Password'})  {
-	$args{'Password'} = '*NO-PASSWORD*';
-    }
-    elsif (length($args{'Password'}) < $RT::MinimumPasswordLength) {
-        return(0,"Password too short");
-    }
-    else {
-        my $salt = join '', ('.','/',0..9,'A'..'Z','a'..'z')[rand 64, rand 64];
-        $args{'Password'} = crypt($args{'Password'}, $salt);     
-    }   
-        
-    
-    #TODO Specify some sensible defaults.
-    
-    unless (defined ($args{'Name'})) {
-	return(0, "Must specify 'Name' attribute");
-    }	
-    
-    
-    #SANITY CHECK THE NAME AND ABORT IF IT'S TAKEN
-    if ($RT::SystemUser) { #This only works if RT::SystemUser has been defined
-		my $TempUser = RT::User->new($RT::SystemUser);
-		$TempUser->Load($args{'Name'});
-		return (0, 'Name in use') if ($TempUser->Id);
-	
-		return(0, 'Email address in use') 
-			unless ($self->ValidateEmailAddress($args{'EmailAddress'}));
-    }
-    else {
-		$RT::Logger->warning("$self couldn't check for pre-existing ".
-			     " users on create. This will happen".
-			     " on installation\n");
-    }
-    
-    my $id = $self->SUPER::Create(%args);
-    
-    #If the create failed.
-    unless ($id) {
-		return (0, 'Could not create user');
-    }
-      
-    
-    #TODO post 2.0
-    #if ($args{'SendWelcomeMessage'}) {
-    #	#TODO: Check if the email exists and looks valid
-    #	#TODO: Send the user a "welcome message" 
-    #}
-    
-    return ($id, 'User created');
-}
+=item id
 
-# }}}
+Returns the current value of id. 
+(In the database, id is stored as int(11).)
 
-# {{{ sub _BootstrapCreate 
 
-#create a user without validating _any_ data.
+=cut
 
-#To be used only on database init.
 
-sub _BootstrapCreate {
-    my $self = shift;
-    my %args = (@_);
+=item Name
 
-    $args{'Password'} = "*NO-PASSWORD*";
-    my $id = $self->SUPER::Create(%args);
-    
-    #If the create failed.
-    return (0, 'Could not create user') 
-      unless ($id);
+Returns the current value of Name. 
+(In the database, Name is stored as varchar(200).)
 
-    return ($id, 'User created');
-}
 
-# }}}
 
-# {{{ sub Delete 
+=item SetName VALUE
 
-sub Delete  {
-    my $self = shift;
-    
-    return(0, 'Deleting this object would violate referential integrity');
-    
-}
 
-# }}}
+Set Name to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Name will be stored as a varchar(200).)
+
+
+=cut
+
+
+=item Password
+
+Returns the current value of Password. 
+(In the database, Password is stored as varchar(40).)
 
-# {{{ sub Load 
 
-=head2 Load
 
-Load a user object from the database. Takes a single argument.
-If the argument is numerical, load by the column 'id'. Otherwise, load by
-the "Name" column which is the user's textual username.
+=item SetPassword VALUE
+
+
+Set Password to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Password will be stored as a varchar(40).)
+
 
 =cut
 
-sub Load  {
-    my $self = shift;
-    my $identifier = shift || return undef;
-    
-    #if it's an int, load by id. otherwise, load by name.
-    if ($identifier !~ /\D/) {
-	$self->SUPER::LoadById($identifier);
-    }
-    else {
-	$self->LoadByCol("Name",$identifier);
-    }
-}
 
-# }}}
+=item Comments
+
+Returns the current value of Comments. 
+(In the database, Comments is stored as blob.)
 
 
-# {{{ sub LoadByEmail
 
-=head2 LoadByEmail
+=item SetComments VALUE
 
-Tries to load this user object from the database by the user's email address.
+
+Set Comments to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Comments will be stored as a blob.)
 
 
 =cut
 
-sub LoadByEmail {
-    my $self=shift;
-    my $address = shift;
 
-    # Never load an empty address as an email address.
-    unless ($address) {
-	return(undef);
-    }
+=item Signature
 
-    $address = RT::CanonicalizeAddress($address);
-    #$RT::Logger->debug("Trying to load an email address: $address\n");
-    return $self->LoadByCol("EmailAddress", $address);
-}
-# }}}
+Returns the current value of Signature. 
+(In the database, Signature is stored as blob.)
 
 
-# {{{ sub ValidateEmailAddress
 
-=head2 ValidateEmailAddress ADDRESS
+=item SetSignature VALUE
+
+
+Set Signature to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Signature will be stored as a blob.)
 
-Returns true if the email address entered is not in use by another user or is 
-undef or ''. Returns false if it's in use. 
 
 =cut
 
-sub ValidateEmailAddress {
-	my $self = shift;
-	my $Value = shift;
 
- 	# if the email address is null, it's always valid
- 	return (1) if(!$Value || $Value eq "");
+=item EmailAddress
 
- 	my $TempUser = RT::User->new($RT::SystemUser);
- 	$TempUser->LoadByEmail($Value);
+Returns the current value of EmailAddress. 
+(In the database, EmailAddress is stored as varchar(120).)
 
- 	if( $TempUser->id && 
-	   ($TempUser->id != $self->id)) { # if we found a user with that address 
-					# it's invalid to set this user's address to it
- 		return(undef);
- 	}
- 	else { #it's a valid email address
- 		return(1);
- 	}
-}
 
-# }}}
 
+=item SetEmailAddress VALUE
+
+
+Set EmailAddress to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, EmailAddress will be stored as a varchar(120).)
+
+
+=cut
+
+
+=item FreeformContactInfo
+
+Returns the current value of FreeformContactInfo. 
+(In the database, FreeformContactInfo is stored as blob.)
 
 
 
-# {{{ sub SetRandomPassword
+=item SetFreeformContactInfo VALUE
 
-=head2 SetRandomPassword
 
-Takes no arguments. Returns a status code and a new password or an error message.
-If the status is 1, the second value returned is the new password.
-If the status is anything else, the new value returned is the error code.
+Set FreeformContactInfo to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, FreeformContactInfo will be stored as a blob.)
+
 
 =cut
 
-sub SetRandomPassword  {
-    my $self = shift;
 
+=item Organization
 
-    unless ($self->CurrentUserCanModify('Password')) {
-	return (0, "Permission Denied");
-    }
-    
-    my $pass = $self->GenerateRandomPassword(6,8);
+Returns the current value of Organization. 
+(In the database, Organization is stored as varchar(200).)
 
-    # If we have "notify user on 
 
-    my ($val, $msg) = $self->SetPassword($pass);
-    
-    #If we got an error return the error.
-    return (0, $msg) unless ($val);
-    
-    #Otherwise, we changed the password, lets return it.
-    return (1, $pass);
-    
-}
 
-# }}}
+=item SetOrganization VALUE
+
+
+Set Organization to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Organization will be stored as a varchar(200).)
+
+
+=cut
+
+
+=item RealName
+
+Returns the current value of RealName. 
+(In the database, RealName is stored as varchar(120).)
 
 
-# {{{ sub ResetPassword
 
-=head2 ResetPassword
+=item SetRealName VALUE
+
+
+Set RealName to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, RealName will be stored as a varchar(120).)
 
-Returns status, [ERROR or new password].  Resets this user\'s password to
-a randomly generated pronouncable password and emails them, using a 
-global template called "RT_PasswordChange", which can be overridden
-with global templates "RT_PasswordChange_Privileged" or "RT_PasswordChange_NonPrivileged" 
-for privileged and Non-privileged users respectively.
 
 =cut
 
-sub ResetPassword {
-    my $self = shift;
-    
-    unless ($self->CurrentUserCanModify('Password')) {
-	return (0, "Permission Denied");
-    }
-    my ($status, $pass) = $self->SetRandomPassword();
-
-    unless ($status) {
-	return (0, "$pass");
-    }
-    
-    my $template = RT::Template->new($self->CurrentUser);
-
-
-    if ($self->IsPrivileged) {
-	$template->LoadGlobalTemplate('RT_PasswordChange_Privileged');
-    } 
-    else {
-	$template->LoadGlobalTemplate('RT_PasswordChange_Privileged');
-    }	
-    
-    unless ($template->Id) {
-	$template->LoadGlobalTemplate('RT_PasswordChange');
-    }	
-    
-    unless ($template->Id) {
-	$RT::Logger->crit("$self tried to send ".$self->Name." a password reminder ".
-			  "but couldn't find a password change template");
-    }	
-
-    my $notification =  RT::Action::SendPasswordEmail->new(TemplateObj => $template,
-							   Argument => $pass);
-    
-    $notification->SetTo($self->EmailAddress);
-
-    my ($ret);
-    $ret = $notification->Prepare();
-    if ($ret) {
-	$ret = $notification->Commit();
-    }
-    
-    if ($ret) {
-	return(1, 'New password notification sent');
-    }	else {
-	return (0, 'Notification could not be sent');
-    }	
-    
-}
 
+=item NickName
 
-# }}}
+Returns the current value of NickName. 
+(In the database, NickName is stored as varchar(16).)
 
-# {{{ sub GenerateRandomPassword
 
-=head2 GenerateRandomPassword MIN_LEN and MAX_LEN
 
-Returns a random password between MIN_LEN and MAX_LEN characters long.
+=item SetNickName VALUE
+
+
+Set NickName to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, NickName will be stored as a varchar(16).)
+
 
 =cut
 
-sub GenerateRandomPassword {
-    my $self = shift;
-    my $min_length = shift;
-    my $max_length = shift;
-    
-    #This code derived from mpw.pl, a bit of code with a sordid history
-    # Its notes: 
-    
-    # Perl cleaned up a bit by Jesse Vincent 1/14/2001.
-    # Converted to perl from C by Marc Horowitz, 1/20/2000.
-    # Converted to C from Multics PL/I by Bill Sommerfeld, 4/21/86.
-    # Original PL/I version provided by Jerry Saltzer.
-
-    
-    my ($frequency, $start_freq, $total_sum, $row_sums);
-
-    #When munging characters, we need to know where to start counting letters from
-    my $a = ord('a');
-
-    # frequency of English digraphs (from D Edwards 1/27/66) 
-    $frequency =
-      [ [ 4, 20, 28, 52, 2, 11, 28, 4, 32, 4, 6, 62, 23,
-	  167, 2, 14, 0, 83, 76, 127, 7, 25, 8, 1, 9, 1 ], # aa - az
-	[ 13, 0, 0, 0, 55, 0, 0, 0, 8, 2, 0, 22, 0,
-	  0, 11, 0, 0, 15, 4, 2, 13, 0, 0, 0, 15, 0 ], # ba - bz
-	[ 32, 0, 7, 1, 69, 0, 0, 33, 17, 0, 10, 9, 1,
-	  0, 50, 3, 0, 10, 0, 28, 11, 0, 0, 0, 3, 0 ], # ca - cz
-	[ 40, 16, 9, 5, 65, 18, 3, 9, 56, 0, 1, 4, 15,
-	  6, 16, 4, 0, 21, 18, 53, 19, 5, 15, 0, 3, 0 ], # da - dz
-	[ 84, 20, 55, 125, 51, 40, 19, 16, 50, 1, 4, 55, 54,
-	  146, 35, 37, 6, 191, 149, 65, 9, 26, 21, 12, 5, 0 ], # ea - ez
-	[ 19, 3, 5, 1, 19, 21, 1, 3, 30, 2, 0, 11, 1,
-	  0, 51, 0, 0, 26, 8, 47, 6, 3, 3, 0, 2, 0 ], # fa - fz
-	[ 20, 4, 3, 2, 35, 1, 3, 15, 18, 0, 0, 5, 1,
-	  4, 21, 1, 1, 20, 9, 21, 9, 0, 5, 0, 1, 0 ], # ga - gz
-	[ 101, 1, 3, 0, 270, 5, 1, 6, 57, 0, 0, 0, 3,
-	  2, 44, 1, 0, 3, 10, 18, 6, 0, 5, 0, 3, 0 ], # ha - hz
-	[ 40, 7, 51, 23, 25, 9, 11, 3, 0, 0, 2, 38, 25,
-	  202, 56, 12, 1, 46, 79, 117, 1, 22, 0, 4, 0, 3 ], # ia - iz
-	[ 3, 0, 0, 0, 5, 0, 0, 0, 1, 0, 0, 0, 0,
-	  0, 4, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0 ], # ja - jz
-	[ 1, 0, 0, 0, 11, 0, 0, 0, 13, 0, 0, 0, 0,
-	  2, 0, 0, 0, 0, 6, 2, 1, 0, 2, 0, 1, 0 ], # ka - kz
-	[ 44, 2, 5, 12, 62, 7, 5, 2, 42, 1, 1, 53, 2,
-	  2, 25, 1, 1, 2, 16, 23, 9, 0, 1, 0, 33, 0 ], # la - lz
-	[ 52, 14, 1, 0, 64, 0, 0, 3, 37, 0, 0, 0, 7,
-	  1, 17, 18, 1, 2, 12, 3, 8, 0, 1, 0, 2, 0 ], # ma - mz
-	[ 42, 10, 47, 122, 63, 19, 106, 12, 30, 1, 6, 6, 9,
-	  7, 54, 7, 1, 7, 44, 124, 6, 1, 15, 0, 12, 0 ], # na - nz
-	[ 7, 12, 14, 17, 5, 95, 3, 5, 14, 0, 0, 19, 41,
-	  134, 13, 23, 0, 91, 23, 42, 55, 16, 28, 0, 4, 1 ], # oa - oz
-	[ 19, 1, 0, 0, 37, 0, 0, 4, 8, 0, 0, 15, 1,
-	  0, 27, 9, 0, 33, 14, 7, 6, 0, 0, 0, 0, 0 ], # pa - pz
-	[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	  0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0 ], # qa - qz
-	[ 83, 8, 16, 23, 169, 4, 8, 8, 77, 1, 10, 5, 26,
-	  16, 60, 4, 0, 24, 37, 55, 6, 11, 4, 0, 28, 0 ], # ra - rz
-	[ 65, 9, 17, 9, 73, 13, 1, 47, 75, 3, 0, 7, 11,
-	  12, 56, 17, 6, 9, 48, 116, 35, 1, 28, 0, 4, 0 ], # sa - sz
-	[ 57, 22, 3, 1, 76, 5, 2, 330, 126, 1, 0, 14, 10,
-	  6, 79, 7, 0, 49, 50, 56, 21, 2, 27, 0, 24, 0 ], # ta - tz
-	[ 11, 5, 9, 6, 9, 1, 6, 0, 9, 0, 1, 19, 5,
-	  31, 1, 15, 0, 47, 39, 31, 0, 3, 0, 0, 0, 0 ],	# ua - uz
-	[ 7, 0, 0, 0, 72, 0, 0, 0, 28, 0, 0, 0, 0,
-	  0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0 ], # va - vz
-	[ 36, 1, 1, 0, 38, 0, 0, 33, 36, 0, 0, 4, 1,
-	  8, 15, 0, 0, 0, 4, 2, 0, 0, 1, 0, 0, 0 ], # wa - wz
-	[ 1, 0, 2, 0, 0, 1, 0, 0, 3, 0, 0, 0, 0,
-	  0, 1, 5, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0 ], # xa - xz
-	[ 14, 5, 4, 2, 7, 12, 12, 6, 10, 0, 0, 3, 7,
-	  5, 17, 3, 0, 4, 16, 30, 0, 0, 5, 0, 0, 0 ], # ya - yz
-	[ 1, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0,
-	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] ]; # za - zz
-
-    #We need to know the totals for each row 
-    $row_sums =
-      [ map { my $sum = 0; map { $sum += $_ } @$_; $sum } @$frequency ];
-    
-
-    #Frequency with which a given letter starts a word.
-    $start_freq =
-      [ 1299, 425, 725, 271, 375, 470, 93, 223, 1009, 24, 20, 355, 379,
-	319, 823, 618, 21, 317, 962, 1991, 271, 104, 516, 6, 16, 14 ];
-    
-    $total_sum = 0; map { $total_sum += $_ } @$start_freq;
-    
-    
-    my $length = $min_length + int(rand($max_length-$min_length));
-    
-    my $char = $self->GenerateRandomNextChar($total_sum, $start_freq);
-    my @word = ($char+$a);
-    for (2..$length) {
-	$char = $self->_GenerateRandomNextChar($row_sums->[$char], $frequency->[$char]);
-	push(@word, $char+$a);
-    }
-    
-    #Return the password
-    return pack("C*",@word);
-    
-}
 
+=item Lang
+
+Returns the current value of Lang. 
+(In the database, Lang is stored as varchar(16).)
 
-#A private helper function for RandomPassword
-# Takes a row summary and a frequency chart for the next character to be searched
-sub _GenerateRandomNextChar {
-    my $self = shift;
-    my($all, $freq) = @_;
-    my($pos, $i);
-    
-    for ($pos = int(rand($all)), $i=0;
-	 $pos >= $freq->[$i];
-	 $pos -= $freq->[$i], $i++) {};
-    
-    return($i);
-}
 
-# }}}
 
-# {{{ sub SetPassword
+=item SetLang VALUE
 
-=head2 SetPassword
 
-Takes a string. Checks the string's length and sets this user's password 
-to that string.
+Set Lang to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Lang will be stored as a varchar(16).)
+
 
 =cut
 
-sub SetPassword {
-    my $self = shift;
-    my $password = shift;
-    
-    unless ($self->CurrentUserCanModify('Password')) {
-	return(0, 'Permission Denied');
-    }
-    
-    if (! $password)  {
-        return(0, "No password set");
-    }
-    elsif (length($password) < $RT::MinimumPasswordLength) {
-        return(0,"Password too short");
-    }
-    else {
-        my $salt = join '', ('.','/',0..9,'A'..'Z','a'..'z')[rand 64, rand 64];
-        return ( $self->SUPER::SetPassword(crypt($password, $salt)) );
-    }   
-    
-}
 
-# }}}
+=item EmailEncoding
+
+Returns the current value of EmailEncoding. 
+(In the database, EmailEncoding is stored as varchar(16).)
 
-# {{{ sub IsPassword 
 
-=head2 IsPassword
 
-Returns true if the passed in value is this user's password.
-Returns undef otherwise.
+=item SetEmailEncoding VALUE
+
+
+Set EmailEncoding to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, EmailEncoding will be stored as a varchar(16).)
+
 
 =cut
 
-sub IsPassword { 
-    my $self = shift;
-    my $value = shift;
-
-    #TODO there isn't any apparent way to legitimately ACL this
-
-    # RT does not allow null passwords 
-    if ((!defined ($value)) or ($value eq '')) {
-	return(undef);
-    } 
-    if ($self->Disabled) {
-  	$RT::Logger->info("Disabled user ".$self->Name." tried to log in");
-	return(undef);
-    }
-
-    if ( ($self->__Value('Password') eq '') || 
-         ($self->__Value('Password') eq undef) )  {
-        return(undef);
-     }
-    if ($self->__Value('Password') eq crypt($value, $self->__Value('Password'))) {
-	return (1);
-    }
-    else {
-	return (undef);
-    }
-}
 
-# }}}
+=item WebEncoding
+
+Returns the current value of WebEncoding. 
+(In the database, WebEncoding is stored as varchar(16).)
 
-# {{{ sub SetDisabled
 
-=head2 Sub SetDisabled
 
-Toggles the user's disabled flag.
-If this flag is
-set, all password checks for this user will fail. All ACL checks for this
-user will fail. The user will appear in no user listings.
+=item SetWebEncoding VALUE
 
-=cut 
 
-# }}}
+Set WebEncoding to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, WebEncoding will be stored as a varchar(16).)
 
-# {{{ ACL Related routines
 
-# {{{ GrantQueueRight
+=cut
+
 
-=head2 GrantQueueRight
+=item ExternalContactInfoId
+
+Returns the current value of ExternalContactInfoId. 
+(In the database, ExternalContactInfoId is stored as varchar(100).)
+
+
+
+=item SetExternalContactInfoId VALUE
+
+
+Set ExternalContactInfoId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ExternalContactInfoId will be stored as a varchar(100).)
 
-Grant a queue right to this user.  Takes a paramhash of which the elements
-RightAppliesTo and RightName are important.
 
 =cut
 
-sub GrantQueueRight {
-    
-    my $self = shift;
-    my %args = ( RightScope => 'Queue',
-		 RightName => undef,
-		 RightAppliesTo => undef,
-		 PrincipalType => 'User',
-		 PrincipalId => $self->Id,
-		 @_);
-   
-    #ACL check handled in ACE.pm
-
-    require RT::ACE;
-
-#    $RT::Logger->debug("$self ->GrantQueueRight right:". $args{'RightName'} .
-#		       " applies to queue ".$args{'RightAppliesTo'}."\n");
-    
-    my $ace = new RT::ACE($self->CurrentUser);
-    
-    return ($ace->Create(%args));
-}
 
-# }}}
+=item ContactInfoSystem
+
+Returns the current value of ContactInfoSystem. 
+(In the database, ContactInfoSystem is stored as varchar(30).)
+
+
 
-# {{{ GrantSystemRight
+=item SetContactInfoSystem VALUE
 
-=head2 GrantSystemRight
 
-Grant a system right to this user. 
-The only element that's important to set is RightName.
+Set ContactInfoSystem to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ContactInfoSystem will be stored as a varchar(30).)
+
 
 =cut
-sub GrantSystemRight {
-    
-    my $self = shift;
-    my %args = ( RightScope => 'System',
-		 RightName => undef,
-		 RightAppliesTo => 0,
-		 PrincipalType => 'User',
-		 PrincipalId => $self->Id,
-		 @_);
-   
-
-    #ACL check handled in ACE.pm
-
-    require RT::ACE;    
-    my $ace = new RT::ACE($self->CurrentUser);
-    
-    return ($ace->Create(%args));
-}
 
 
-# }}}
+=item ExternalAuthId
+
+Returns the current value of ExternalAuthId. 
+(In the database, ExternalAuthId is stored as varchar(100).)
 
-# {{{ sub HasQueueRight
 
-=head2 HasQueueRight
 
-Takes a paramhash which can contain
-these items:
-    TicketObj => RT::Ticket or QueueObj => RT::Queue or Queue => integer
-    IsRequestor => undef, (for bootstrapping create)
-    Right => 'Right' 
+=item SetExternalAuthId VALUE
 
 
-Returns 1 if this user has the right specified in the paramhash. for the queue
-passed in.
+Set ExternalAuthId to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, ExternalAuthId will be stored as a varchar(100).)
 
-Returns undef if they don't
 
 =cut
 
-sub HasQueueRight {
-    my $self = shift;
-    my %args = ( TicketObj => undef,
-                 QueueObj => undef,
-		 Queue => undef,
-		 IsRequestor => undef,
-		 Right => undef,
-		 @_);
-    
-    my ($IsRequestor, $IsCc, $IsAdminCc, $IsOwner);
-    
-    if (defined $args{'Queue'}) {
-	$args{'QueueObj'} = new RT::Queue($self->CurrentUser);
-	$args{'QueueObj'}->Load($args{'Queue'});
-    }
-    
-    if (defined $args{'TicketObj'}) {
-	$args{'QueueObj'} = $args{'TicketObj'}->QueueObj();
-    }
-
-    # {{{ Validate and load up the QueueId
-    unless ((defined $args{'QueueObj'}) and ($args{'QueueObj'}->Id)) {
-	require Carp;
-	$RT::Logger->debug(Carp::cluck ("$self->HasQueueRight Couldn't find a queue id"));
-	return undef;
-    }
-
-    # }}}
-
-        
-    # Figure out whether a user has the right we're asking about.
-    # first see if they have the right personally for the queue in question. 
-    my $retval = $self->_HasRight(Scope => 'Queue',
-				  AppliesTo => $args{'QueueObj'}->Id,
-				  Right => $args{'Right'},
-				  IsOwner => $IsOwner);
-
-    return ($retval) if (defined $retval);
-    
-    # then we see whether they have the right personally globally. 
-    $retval = $self->HasSystemRight( $args{'Right'});
-
-    return ($retval) if (defined $retval);
-    
-    # now that we know they don't have the right personally,
-    
-    # {{{ Find out about whether the current user is a Requestor, Cc, AdminCc or Owner
-
-    if (defined $args{'TicketObj'}) {
-	if ($args{'TicketObj'}->IsRequestor($self)) {#user is requestor
-	    $IsRequestor = 1;
-	}	
-
-	if ($args{'TicketObj'}->IsCc($self)) { #If user is a cc
-	    $IsCc = 1;
-	}
-
-	if ($args{'TicketObj'}->IsAdminCc($self)) { #If user is an admin cc
-	    $IsAdminCc = 1;
-	}	
-	
-	if ($args{'TicketObj'}->IsOwner($self)) { #If user is an owner
-	    $IsOwner = 1;
-	}
-    }
-    
-    if (defined $args{'QueueObj'}) {
-	if ($args{'QueueObj'}->IsCc($self)) { #If user is a cc
-	    $IsCc = 1;
-	}
-	if ($args{'QueueObj'}->IsAdminCc($self)) { #If user is an admin cc
-	    $IsAdminCc = 1;
-	}
-	
-    } 
-    # }}}
-    
-    # then see whether they have the right for the queue as a member of a metagroup 
-
-    $retval = $self->_HasRight(Scope => 'Queue',
-				  AppliesTo => $args{'QueueObj'}->Id,
-				  Right => $args{'Right'},
-				  IsOwner => $IsOwner,
-				  IsCc => $IsCc,
-				  IsAdminCc => $IsAdminCc,
-				  IsRequestor => $IsRequestor
-				 );
-
-    return ($retval) if (defined $retval);
-
-    #   then we see whether they have the right globally as a member of a metagroup
-    $retval = $self->HasSystemRight( $args{'Right'},
-				     (IsOwner => $IsOwner,
-				      IsCc => $IsCc,
-				      IsAdminCc => $IsAdminCc,
-				      IsRequestor => $IsRequestor
-				     ) );
-
-    #If they haven't gotten it by now, they just lose.
-    return ($retval);
-    
-}
 
-# }}}
-  
-# {{{ sub HasSystemRight
+=item AuthSystem
+
+Returns the current value of AuthSystem. 
+(In the database, AuthSystem is stored as varchar(30).)
+
 
-=head2 HasSystemRight
 
-takes an array of a single value and a paramhash.
-The single argument is the right being passed in.
-the param hash is some additional data. (IsCc, IsOwner, IsAdminCc and IsRequestor)
+=item SetAuthSystem VALUE
+
+
+Set AuthSystem to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, AuthSystem will be stored as a varchar(30).)
 
-Returns 1 if this user has the listed 'right'. Returns undef if this user doesn't.
 
 =cut
 
-sub HasSystemRight {
-    my $self = shift;
-    my $right = shift;
-
-    my %args = ( IsOwner => undef,
-		 IsCc => undef,
-		 IsAdminCc => undef,
-		 IsRequestor => undef,
-		 @_);
-    
-    unless (defined $right) {
-
-	$RT::Logger->debug("$self RT::User::HasSystemRight was passed in no right.");
-	return(undef);
-    }	
-    return ( $self->_HasRight ( Scope => 'System',
-				AppliesTo => '0',
-				Right => $right,
-				IsOwner => $args{'IsOwner'},
-				IsCc => $args{'IsCc'},
-				IsAdminCc => $args{'IsAdminCc'},
-				IsRequestor => $args{'IsRequestor'},
-				
-			      )
-	   );
-    
-}
 
-# }}}
+=item Gecos
+
+Returns the current value of Gecos. 
+(In the database, Gecos is stored as varchar(16).)
+
+
 
-# {{{ sub _HasRight
+=item SetGecos VALUE
 
-=head2 sub _HasRight (Right => 'right', Scope => 'scope',  AppliesTo => int, ExtendedPrincipals => SQL)
 
-_HasRight is a private helper method for checking a user's rights. It takes
-several options:
+Set Gecos to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Gecos will be stored as a varchar(16).)
+
+
+=cut
+
 
-=item Right is a textual right name
+=item HomePhone
 
-=item Scope is a textual scope name. (As of July these were Queue, Ticket and System
+Returns the current value of HomePhone. 
+(In the database, HomePhone is stored as varchar(30).)
 
-=item AppliesTo is the numerical Id of the object identified in the scope. For tickets, this is the queue #. for queues, this is the queue #
 
-=item ExtendedPrincipals is an  SQL select clause which assumes that the only
-table in play is ACL.  It's used by HasQueueRight to pass in which 
-metaprincipals apply. Actually, it's probably obsolete. TODO: remove it.
 
-Returns 1 if a matching ACE was found.
+=item SetHomePhone VALUE
+
+
+Set HomePhone to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, HomePhone will be stored as a varchar(30).)
 
-Returns undef if no ACE was found.
 
 =cut
 
 
-sub _HasRight {
-    
-    my $self = shift;
-    my %args = ( Right => undef,
-		 Scope => undef,
-		 AppliesTo => undef,
-		 IsRequestor => undef,
-		 IsCc => undef,
-		 IsAdminCc => undef,
-		 IsOwner => undef,
-		 ExtendedPrincipals => undef,
-		 @_);
-    
-    if ($self->Disabled) {
-	$RT::Logger->debug ("Disabled User:  ".$self->Name.
-			    " failed access check for ".$args{'Right'}.
-			    " to object ".$args{'Scope'}."/".
-			    $args{'AppliesTo'}."\n");
-	return (undef);
-    }
-    
-    if (!defined $args{'Right'}) {
-    	$RT::Logger->debug("_HasRight called without a right\n");
-    	return(undef);
-    }
-    elsif (!defined $args{'Scope'}) {
-    	$RT::Logger->debug("_HasRight called without a scope\n");
-    	return(undef);
-    }
-    elsif (!defined $args{'AppliesTo'}) {
-    	$RT::Logger->debug("_HasRight called without an AppliesTo object\n");
-    	return(undef);
-    }
-    
-    #If we've cached a win or loss for this lookup say so
-    
-    #TODO Security +++ check to make sure this is complete and right
-    
-    #Construct a hashkey to cache decisions in
-    my ($hashkey);
-    { #it's ugly, but we need to turn off warning, cuz we're joining nulls.
-	local $^W=0;
-	$hashkey =$self->Id .":". join(':',%args);
-    }	
-    
-  # $RT::Logger->debug($hashkey."\n");
-    
-    #Anything older than 10 seconds needs to be rechecked
-    my $cache_timeout = (time - 10);
-    
-    
-    if ((defined $self->{'rights'}{"$hashkey"}) &&
-	    ($self->{'rights'}{"$hashkey"} == 1 ) &&
-        (defined $self->{'rights'}{"$hashkey"}{'set'} ) &&
-	    ($self->{'rights'}{"$hashkey"}{'set'} > $cache_timeout)) {
-#	  $RT::Logger->debug("Cached ACL win for ". 
-#			     $args{'Right'}.$args{'Scope'}.
-#			     $args{'AppliesTo'}."\n");	    
-	return ($self->{'rights'}{"$hashkey"});
-    }
-    elsif ((defined $self->{'rights'}{"$hashkey"}) &&
-	       ($self->{'rights'}{"$hashkey"} == -1)  &&
-           (defined $self->{'rights'}{"$hashkey"}{'set'}) &&
-	       ($self->{'rights'}{"$hashkey"}{'set'} > $cache_timeout)) {
-	
-#	$RT::Logger->debug("Cached ACL loss decision for ". 
-#			   $args{'Right'}.$args{'Scope'}.
-#			   $args{'AppliesTo'}."\n");	    
-	
-	return(undef);
-    }
-    
-    
-    my $RightClause = "(RightName = '$args{'Right'}')";
-    my $ScopeClause = "(RightScope = '$args{'Scope'}')";
-    
-    #If an AppliesTo was passed in, we should pay attention to it.
-    #otherwise, none is needed
-    
-    $ScopeClause = "($ScopeClause AND (RightAppliesTo = $args{'AppliesTo'}))"
-      if ($args{'AppliesTo'});
-    
-    
-    # The generic principals clause looks for users with my id
-    # and Rights that apply to _everyone_
-    my $PrincipalsClause = "((PrincipalType = 'User') AND (PrincipalId = ".$self->Id."))";
-    
-    
-    # If the user is the superuser, grant them the damn right ;)
-    my $SuperUserClause = 
-      "(RightName = 'SuperUser') AND (RightScope = 'System') AND (RightAppliesTo = 0)";
-    
-    # If we've been passed in an extended principals clause, we should lump it
-    # on to the existing principals clause. it'll make life easier
-    if ($args{'ExtendedPrincipals'}) {
-	$PrincipalsClause = "(($PrincipalsClause) OR ".
-	  "($args{'ExtendedPrincipalsClause'}))";
-    }
-    
-    my $GroupPrincipalsClause = "((ACL.PrincipalType = 'Group') ".
-      "AND (ACL.PrincipalId = Groups.Id) AND (GroupMembers.GroupId = Groups.Id) ".
-     " AND (GroupMembers.UserId = ".$self->Id."))";
-    
-    
-
-
-    # {{{ A bunch of magic statements that make the metagroups listed
-    # work. basically, we if the user falls into the right group,
-    # we add the type of ACL check needed
-    my (@MetaPrincipalsSubClauses, $MetaPrincipalsClause);
-    
-    #The user is always part of the 'Everyone' Group
-    push (@MetaPrincipalsSubClauses,  "((Groups.Name = 'Everyone') AND 
-                                       (PrincipalType = 'Group') AND 
-                                       (Groups.Id = PrincipalId))");
-
-    if ($args{'IsAdminCc'}) {
-	push (@MetaPrincipalsSubClauses,  "((Groups.Name = 'AdminCc') AND 
-                                       (PrincipalType = 'Group') AND 
-                                       (Groups.Id = PrincipalId))");
-    }
-    if ($args{'IsCc'}) {
-	push (@MetaPrincipalsSubClauses, " ((Groups.Name = 'Cc') AND 
-                                       (PrincipalType = 'Group') AND 
-                                       (Groups.Id = PrincipalId))");
-    }
-    if ($args{'IsRequestor'}) {
-	push (@MetaPrincipalsSubClauses,  " ((Groups.Name = 'Requestor') AND 
-                                       (PrincipalType = 'Group') AND 
-                                       (Groups.Id = PrincipalId))");
-    }
-    if ($args{'IsOwner'}) {
-	
-	push (@MetaPrincipalsSubClauses, " ((Groups.Name = 'Owner') AND 
-                                       (PrincipalType = 'Group') AND 
-                                       (Groups.Id = PrincipalId))");
-    }
-
-    # }}}
-    
-    my ($GroupRightsQuery, $MetaGroupRightsQuery, $IndividualRightsQuery, $hitcount);
-    
-    # {{{ If there are any metaprincipals to be checked
-    if (@MetaPrincipalsSubClauses) {
-	#chop off the leading or
-	#TODO redo this with an array and a join
-	$MetaPrincipalsClause = join (" OR ", @MetaPrincipalsSubClauses);
-	
-	$MetaGroupRightsQuery =  "SELECT COUNT(ACL.id) FROM ACL, Groups".
-	  " WHERE " .
-	    " ($ScopeClause) AND ($RightClause) AND ($MetaPrincipalsClause)";
-	
-	# {{{ deal with checking if the user has a right as a member of a metagroup
-
-#	$RT::Logger->debug("Now Trying $MetaGroupRightsQuery\n");	
-	$hitcount = $self->_Handle->FetchResult($MetaGroupRightsQuery);
-	
-	#if there's a match, the right is granted
-	if ($hitcount) {
-	    $self->{'rights'}{"$hashkey"}{'set'} = time;
-	    $self->{'rights'}{"$hashkey"} = 1;
-	    return (1);
-	}
-	
-#	$RT::Logger->debug("No ACL matched MetaGroups query: $MetaGroupRightsQuery\n");	
-
-	# }}}    
-	
-    }
-    # }}}
-
-    # {{{ deal with checking if the user has a right as a member of a group
-    # This query checks to se whether the user has the right as a member of a
-    # group
-    $GroupRightsQuery = "SELECT COUNT(ACL.id) FROM ACL, GroupMembers, Groups".
-      " WHERE " .
-	" (((($ScopeClause) AND ($RightClause)) OR ($SuperUserClause)) ".
-	  " AND ($GroupPrincipalsClause))";    
-    
-    #  $RT::Logger->debug("Now Trying $GroupRightsQuery\n");	
-    $hitcount = $self->_Handle->FetchResult($GroupRightsQuery);
-    
-    #if there's a match, the right is granted
-    if ($hitcount) {
-	$self->{'rights'}{"$hashkey"}{'set'} = time;
-	$self->{'rights'}{"$hashkey"} = 1;
-	return (1);
-    }
-    
-#    $RT::Logger->debug("No ACL matched $GroupRightsQuery\n");	
-    
-    # }}}
-
-    # {{{ Check to see whether the user has a right as an individual
-    
-    # This query checks to see whether the current user has the right directly
-    $IndividualRightsQuery = "SELECT COUNT(ACL.id) FROM ACL WHERE ".
-      " ((($ScopeClause) AND ($RightClause)) OR ($SuperUserClause)) " .
-	" AND ($PrincipalsClause)";
-
-    
-    $hitcount = $self->_Handle->FetchResult($IndividualRightsQuery);
-    
-    if ($hitcount) {
-	$self->{'rights'}{"$hashkey"}{'set'} = time;
-	$self->{'rights'}{"$hashkey"} = 1;
-	return (1);
-    }
-    # }}}
-
-    else { #If the user just doesn't have the right
-	
-#	$RT::Logger->debug("No ACL matched $IndividualRightsQuery\n");
-	
-	#If nothing matched, return 0.
-	$self->{'rights'}{"$hashkey"}{'set'} = time;
-	$self->{'rights'}{"$hashkey"} = -1;
-
-	
-	return (undef);
-    }
-}
+=item WorkPhone
+
+Returns the current value of WorkPhone. 
+(In the database, WorkPhone is stored as varchar(30).)
+
+
 
-# }}}
+=item SetWorkPhone VALUE
 
-# {{{ sub CurrentUserCanModify
 
-=head2 CurrentUserCanModify RIGHT
+Set WorkPhone to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, WorkPhone will be stored as a varchar(30).)
 
-If the user has rights for this object, either because
-he has 'AdminUsers' or (if he\'s trying to edit himself and the right isn\'t an 
-admin right) 'ModifySelf', return 1. otherwise, return undef.
 
 =cut
 
-sub CurrentUserCanModify {
-    my $self = shift;
-    my $right = shift;
-
-    if ($self->CurrentUserHasRight('AdminUsers')) {
-	return (1);
-    }
-    #If the field is marked as an "administrators only" field, 
-    # don\'t let the user touch it.
-    elsif ($self->_Accessible($right, 'admin')) {
-	return(undef);
-    }
-    
-    #If the current user is trying to modify themselves
-    elsif ( ($self->id == $self->CurrentUser->id)  and
-	    ($self->CurrentUserHasRight('ModifySelf'))) {
-	return(1);
-    }
- 
-    #If we don\'t have a good reason to grant them rights to modify
-    # by now, they lose
-    else {
-	return(undef);
-    }
-    
-}
 
-# }}}
+=item MobilePhone
+
+Returns the current value of MobilePhone. 
+(In the database, MobilePhone is stored as varchar(30).)
+
 
-# {{{ sub CurrentUserHasRight
 
-=head2 CurrentUserHasRight
-  
-  Takes a single argument. returns 1 if $Self->CurrentUser
-  has the requested right. returns undef otherwise
+=item SetMobilePhone VALUE
+
+
+Set MobilePhone to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, MobilePhone will be stored as a varchar(30).)
+
 
 =cut
 
-sub CurrentUserHasRight {
-    my $self = shift;
-    my $right = shift;
-    
-    return ($self->CurrentUser->HasSystemRight($right));
-}
 
-# }}}
+=item PagerPhone
 
+Returns the current value of PagerPhone. 
+(In the database, PagerPhone is stored as varchar(30).)
 
-# {{{ sub _Set
 
-sub _Set {
-  my $self = shift;
-  
-  my %args = (Field => undef,
-	      Value => undef,
-	      @_
-	     );
 
-  # Nobody is allowed to futz with RT_System or Nobody unless they
-  # want to change an email address. For 2.2, neither should have an email address
+=item SetPagerPhone VALUE
 
-  if ($self->Privileged == 2) {
-    return (0, "Can not modify system users"); 
-  }
-  unless ($self->CurrentUserCanModify($args{'Field'})) {
-      return (0, "Permission Denied");
-  }
 
+Set PagerPhone to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, PagerPhone will be stored as a varchar(30).)
+
+
+=cut
+
+
+=item Address1
+
+Returns the current value of Address1. 
+(In the database, Address1 is stored as varchar(200).)
 
-  
-  #Set the new value
-  my ($ret, $msg)=$self->SUPER::_Set(Field => $args{'Field'}, 
-				     Value=> $args{'Value'});
-  
-    return ($ret, $msg);
-}
 
-# }}}
 
-# {{{ sub _Value 
+=item SetAddress1 VALUE
 
-=head2 _Value
 
-Takes the name of a table column.
-Returns its value as a string, if the user passes an ACL check
+Set Address1 to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Address1 will be stored as a varchar(200).)
+
 
 =cut
 
-sub _Value  {
-
-  my $self = shift;
-  my $field = shift;
-  
-  #If the current user doesn't have ACLs, don't let em at it.  
-  
-  my @PublicFields = qw( Name EmailAddress Organization Disabled
-			 RealName NickName Gecos ExternalAuthId 
-			 AuthSystem ExternalContactInfoId 
-			 ContactInfoSystem );
-
-  #if the field is public, return it.
-  if ($self->_Accessible($field, 'public')) {
-      return($self->SUPER::_Value($field));
-      
-  }
-  #If the user wants to see their own values, let them
-  elsif ($self->CurrentUser->Id == $self->Id) {	
-      return($self->SUPER::_Value($field));
-  } 
-  #If the user has the admin users right, return the field
-  elsif ($self->CurrentUserHasRight('AdminUsers')) {
-      return($self->SUPER::_Value($field));
-  }
-  else {
-      return(undef);
-  }	
- 
 
-}
+=item Address2
+
+Returns the current value of Address2. 
+(In the database, Address2 is stored as varchar(200).)
+
+
+
+=item SetAddress2 VALUE
+
+
+Set Address2 to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Address2 will be stored as a varchar(200).)
+
+
+=cut
+
+
+=item City
+
+Returns the current value of City. 
+(In the database, City is stored as varchar(100).)
+
+
+
+=item SetCity VALUE
+
+
+Set City to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, City will be stored as a varchar(100).)
+
+
+=cut
+
+
+=item State
+
+Returns the current value of State. 
+(In the database, State is stored as varchar(100).)
+
+
+
+=item SetState VALUE
+
+
+Set State to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, State will be stored as a varchar(100).)
+
+
+=cut
+
+
+=item Zip
+
+Returns the current value of Zip. 
+(In the database, Zip is stored as varchar(16).)
+
+
+
+=item SetZip VALUE
+
+
+Set Zip to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Zip will be stored as a varchar(16).)
+
+
+=cut
+
+
+=item Country
+
+Returns the current value of Country. 
+(In the database, Country is stored as varchar(50).)
+
+
+
+=item SetCountry VALUE
+
+
+Set Country to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Country will be stored as a varchar(50).)
+
+
+=cut
+
+
+=item Timezone
+
+Returns the current value of Timezone. 
+(In the database, Timezone is stored as varchar(50).)
+
+
+
+=item SetTimezone VALUE
+
+
+Set Timezone to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, Timezone will be stored as a varchar(50).)
+
+
+=cut
+
+
+=item PGPKey
+
+Returns the current value of PGPKey. 
+(In the database, PGPKey is stored as text.)
+
+
+
+=item SetPGPKey VALUE
+
+
+Set PGPKey to VALUE. 
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, PGPKey will be stored as a text.)
+
+
+=cut
+
+
+=item Creator
+
+Returns the current value of Creator. 
+(In the database, Creator is stored as int(11).)
+
+
+=cut
+
+
+=item Created
+
+Returns the current value of Created. 
+(In the database, Created is stored as datetime.)
+
+
+=cut
+
+
+=item LastUpdatedBy
+
+Returns the current value of LastUpdatedBy. 
+(In the database, LastUpdatedBy is stored as int(11).)
+
+
+=cut
+
+
+=item LastUpdated
+
+Returns the current value of LastUpdated. 
+(In the database, LastUpdated is stored as datetime.)
+
+
+=cut
+
+
+
+sub _ClassAccessible {
+    {
+     
+        id =>
+		{read => 1, type => 'int(11)', default => ''},
+        Name => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Password => 
+		{read => 1, write => 1, type => 'varchar(40)', default => ''},
+        Comments => 
+		{read => 1, write => 1, type => 'blob', default => ''},
+        Signature => 
+		{read => 1, write => 1, type => 'blob', default => ''},
+        EmailAddress => 
+		{read => 1, write => 1, type => 'varchar(120)', default => ''},
+        FreeformContactInfo => 
+		{read => 1, write => 1, type => 'blob', default => ''},
+        Organization => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        RealName => 
+		{read => 1, write => 1, type => 'varchar(120)', default => ''},
+        NickName => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        Lang => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        EmailEncoding => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        WebEncoding => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        ExternalContactInfoId => 
+		{read => 1, write => 1, type => 'varchar(100)', default => ''},
+        ContactInfoSystem => 
+		{read => 1, write => 1, type => 'varchar(30)', default => ''},
+        ExternalAuthId => 
+		{read => 1, write => 1, type => 'varchar(100)', default => ''},
+        AuthSystem => 
+		{read => 1, write => 1, type => 'varchar(30)', default => ''},
+        Gecos => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        HomePhone => 
+		{read => 1, write => 1, type => 'varchar(30)', default => ''},
+        WorkPhone => 
+		{read => 1, write => 1, type => 'varchar(30)', default => ''},
+        MobilePhone => 
+		{read => 1, write => 1, type => 'varchar(30)', default => ''},
+        PagerPhone => 
+		{read => 1, write => 1, type => 'varchar(30)', default => ''},
+        Address1 => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Address2 => 
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        City => 
+		{read => 1, write => 1, type => 'varchar(100)', default => ''},
+        State => 
+		{read => 1, write => 1, type => 'varchar(100)', default => ''},
+        Zip => 
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
+        Country => 
+		{read => 1, write => 1, type => 'varchar(50)', default => ''},
+        Timezone => 
+		{read => 1, write => 1, type => 'varchar(50)', default => ''},
+        PGPKey => 
+		{read => 1, write => 1, type => 'text', default => ''},
+        Creator => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        Created => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+        LastUpdatedBy => 
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
+        LastUpdated => 
+		{read => 1, auto => 1, type => 'datetime', default => ''},
+
+ }
+};
+
+
+        eval "require RT::User_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/User_Overlay.pm}) {
+            die $@;
+        };
+
+        eval "require RT::User_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/User_Vendor.pm}) {
+            die $@;
+        };
+
+        eval "require RT::User_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/User_Local.pm}) {
+            die $@;
+        };
+
+
+
+
+=head1 SEE ALSO
+
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
+
+These overlay files can contain new subs or subs to replace existing subs in this module.
+
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
+
+   no warnings qw(redefine);
+
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
+
+RT::User_Overlay, RT::User_Vendor, RT::User_Local
+
+=cut
 
-# }}}
 
-# }}}
 1;
- 
diff --git a/rt/lib/RT/Users.pm b/rt/lib/RT/Users.pm
index f4a97268c..d58f69653 100755
--- a/rt/lib/RT/Users.pm
+++ b/rt/lib/RT/Users.pm
@@ -1,281 +1,115 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
+# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
+# 
+# !! DO NOT EDIT THIS FILE !!
+#
+
+use strict;
 
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Users.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-1999 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
 
 =head1 NAME
 
-  RT::Users - Collection of RT::User objects
-
+  RT::Users -- Class Description
+ 
 =head1 SYNOPSIS
 
-  use RT::Users;
-
+  use RT::Users
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
-=begin testing
-
-ok(require RT::TestHarness);
-ok(require RT::Users);
-
-=end testing
-
 =cut
 
 package RT::Users;
-use RT::EasySearch;
-@ISA = qw(RT::EasySearch);
-
-# {{{ sub _Init 
-sub _Init  {
-  my $self = shift;
-  $self->{'table'} = "Users";
-  $self->{'primary_key'} = "id";
-
-  # By default, order by name
-  $self->OrderBy( ALIAS => 'main',
-		  FIELD => 'Name',
-		  ORDER => 'ASC');
-
-  return ($self->SUPER::_Init(@_));
-  
-}
-# }}}
-
-# {{{ sub _DoSearch 
-
-=head2 _DoSearch
-
-  A subclass of DBIx::SearchBuilder::_DoSearch that makes sure that _Disabled rows never get seen unless
-we're explicitly trying to see them.
-
-=cut
-
-sub _DoSearch {
-    my $self = shift;
-    
-    #unless we really want to find disabled rows, make sure we\'re only finding enabled ones.
-    unless($self->{'find_disabled_rows'}) {
-	$self->LimitToEnabled();
-    }
-    
-    return($self->SUPER::_DoSearch(@_));
-    
-}
-
-# }}}
-
-# {{{ sub NewItem 
-
-sub NewItem  {
-  my $self = shift;
 
-  use RT::User;
-  my $item = new RT::User($self->CurrentUser);
-  return($item);
-}
-# }}}
-
-# {{{ LimitToEmail
-=head2 LimitToEmail
+use RT::SearchBuilder;
+use RT::User;
 
-Takes one argument. an email address. limits the returned set to
-that email address
+use vars qw( @ISA );
+@ISA= qw(RT::SearchBuilder);
 
-=cut
 
-sub LimitToEmail {
+sub _Init {
     my $self = shift;
-    my $addr = shift;
-    $self->Limit(FIELD => 'EmailAddress', VALUE => "$addr");
-}
-
-# }}}
-
-# {{{ MemberOfGroup
-
-=head2 MemberOfGroup
-
-takes one argument, a group id number. Limits the returned set
-to members of a given group
-
-=cut
-
-sub MemberOfGroup {
-    my $self = shift;
-    my $group = shift;
-    
-    return ("No group specified") if (!defined $group);
-
-    my $groupalias = $self->NewAlias('GroupMembers');
-
-    $self->Join( ALIAS1 => 'main', FIELD1 => 'id', 
-		 ALIAS2 => "$groupalias", FIELD2 => 'Name');
-    
-    $self->Limit (ALIAS => "$groupalias",
-		  FIELD => 'GroupId',
-		  VALUE => "$group",
-		  OPERATOR => "="
-		 );
-}
-
-# }}}
-
-# {{{ LimitToPrivileged
-
-=head2 LimitToPrivileged
-
-Limits to users who can be made members of ACLs and groups
+    $self->{'table'} = 'Users';
+    $self->{'primary_key'} = 'id';
 
-=cut
 
-sub LimitToPrivileged {
-    my $self = shift;
-    $self->Limit( FIELD => 'Privileged',
-                  OPERATOR => '=',
-                  VALUE => '1');
+    return ( $self->SUPER::_Init(@_) );
 }
 
-# }}}
-
-
-
-# {{{ LimitToSystem
 
-=head2 LimitToSystem
+=item NewItem
 
-Limits to users who can be granted rights, but who should
-never have their rights modified by a user or be made members of groups.
+Returns an empty new RT::User item
 
 =cut
 
-sub LimitToSystem {
+sub NewItem {
     my $self = shift;
-    $self->Limit( FIELD => 'Privileged',
-                  OPERATOR => '=',
-                  VALUE => '2');
+    return(RT::User->new($self->CurrentUser));
 }
 
-# }}}
-
-# {{{ HasQueueRight
-
-=head2 HasQueueRight
-
-Takes a queue id as its first argument.  Queue Id "0" is treated by RT as "applies to all queues"
-Takes a specific right as an optional second argument
-
-Limits the returned set to users who have rights in the queue specified, personally.  If the optional second argument is supplied, limits to users who have been explicitly granted that right.
-
-
-
-This should not be used as an ACL check, but only for obtaining lists of
-users with explicit rights in a given queue.
-
-=cut
-
-sub HasQueueRight {
-    my $self = shift;
-    my $queue = shift;
-    my $right;
-    
-    $right = shift if (@_);
-
+        eval "require RT::Users_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/Users_Overlay.pm}) {
+            die $@;
+        };
 
-    my $acl_alias  = $self->NewAlias('ACL');
-    $self->Join( ALIAS1 => 'main',  FIELD1 => 'id',
-		 ALIAS2 => $acl_alias, FIELD2 => 'PrincipalId');
-    $self->Limit (ALIAS => $acl_alias,
-		 FIELD => 'PrincipalType',
-		 OPERATOR => '=',
-		 VALUE => 'User');
+        eval "require RT::Users_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/Users_Vendor.pm}) {
+            die $@;
+        };
 
+        eval "require RT::Users_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/Users_Local.pm}) {
+            die $@;
+        };
 
-    $self->Limit(ALIAS => $acl_alias,
-		 FIELD => 'RightAppliesTo',
-		 OPERATOR => '=',
-		 VALUE => "$queue");
 
 
-    $self->Limit(ALIAS => $acl_alias,
-		 FIELD => 'RightScope',
-		 OPERATOR => '=',
-		 ENTRYAGGREGATOR => 'OR',
-		 VALUE => 'Queue');
 
+=head1 SEE ALSO
 
-    $self->Limit(ALIAS => $acl_alias,
-		 FIELD => 'RightScope',
-		 OPERATOR => '=',
-		 ENTRYAGGREGATOR => 'OR',
-		 VALUE => 'Ticket');
+This class allows "overlay" methods to be placed
+into the following files _Overlay is for a System overlay by the original author,
+_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
 
+These overlay files can contain new subs or subs to replace existing subs in this module.
 
-    #TODO: is this being initialized properly if the right isn't there?
-    if (defined ($right)) {
-	
-	$self->Limit(ALIAS => $acl_alias,
-		     FIELD => 'RightName',
-		     OPERATOR => '=',
-		     VALUE => "$right");
-	
-	
-       };
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
+   no warnings qw(redefine);
 
-}
-
-
-
-# }}}
-
-# {{{ HasSystemRight
+so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
-=head2 HasSystemRight
-
-Takes one optional argument:
-   The name of a System level right.
-
-Limits the returned set to users who have been granted system rights, personally.  If the optional argument is passed in, limits to users who have been granted the explicit right listed.   Please see the note attached to LimitToQueueRights
+RT::Users_Overlay, RT::Users_Vendor, RT::Users_Local
 
 =cut
 
-sub HasSystemRight {
-    my $self = shift;
-    my $right = shift if (@_);
-       my $acl_alias  = $self->NewAlias('ACL');
-
-
-    $self->Join( ALIAS1 => 'main',  FIELD1 => 'id',
-		 ALIAS2 => $acl_alias, FIELD2 => 'PrincipalId');
-    $self->Limit (ALIAS => $acl_alias,
-		 FIELD => 'PrincipalType',
-		 OPERATOR => '=',
-		 VALUE => 'User');
-
-    $self->Limit(ALIAS => $acl_alias,
-		 FIELD => 'RightScope',
-		 OPERATOR => '=',
-		 VALUE => 'System');
-
-
-    #TODO: is this being initialized properly if the right isn't there?
-    if (defined ($right)) {
-	$self->Limit(ALIAS => $acl_alias,
-		     FIELD => 'RightName',
-		     OPERATOR => '=',
-		     VALUE => "$right");
-	
-       }
-
-    
-}
-
-# }}}
 
 1;
-
diff --git a/rt/lib/RT/Watcher.pm b/rt/lib/RT/Watcher.pm
deleted file mode 100755
index c7c6100cf..000000000
--- a/rt/lib/RT/Watcher.pm
+++ /dev/null
@@ -1,313 +0,0 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/Watcher.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-2001 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
-
-=head1 NAME
-
-  RT::Watcher - RT Watcher object
-
-=head1 SYNOPSIS
-
-  use RT::Watcher;
-
-
-=head1 DESCRIPTION
-
-This module should never be called directly by client code. it\'s an internal module which
-should only be accessed through exported APIs in Ticket, Queue and other similar objects.
-
-=head1 METHODS
-
-=begin testing
-
-ok(require RT::TestHarness);
-ok(require RT::Watcher);
-
-=end testing
-
-=cut
-
-package RT::Watcher;
-use RT::Record;
-@ISA= qw(RT::Record);
-
-
-# {{{ sub _Init 
-
-sub _Init {
-  my $self = shift;
-  
-  $self->{'table'} = "Watchers";
-  return ($self->SUPER::_Init(@_));
-
-}
-# }}}
-
-# {{{ sub Create 
-
-=head2 Create PARAMHASH
-
-Create a new watcher object with the following Attributes:
-
-Scope:  Ticket or Queue
-Value: Ticket or queue id
-Type: Requestor, Cc or AdminCc.  Requestor is not supported for a scope of \'Queue\'
-Email: The email address of the watcher.  If the email address maps to an RT User, this is resolved
-to an Owner object instead.
-Owner: The RT user id of the \'owner\' of this watcher object. 
-
-=cut
-
-sub Create  {
-    my $self = shift;
-    my %args = (
-		Owner => undef,
-		Email => undef,
-		Value => undef,
-		Scope => undef,
-		Type => undef,
-		Quiet => 0,
-		@_ # get the real argumentlist
-	       );
-    
-    #Do we have someone this applies to?
-    unless (($args{'Owner'} =~ /^(\d+)$/) || ($args{'Email'} =~ /\@/)) {
-	return (0, "No user or email address specified");
-    }
-    
-    #if we only have an email address, try to resolve it to an owner
-    if ($args{'Owner'} == 0) {
-        my $User = new RT::User($RT::SystemUser);
-        $User->LoadByEmail($args{'Email'});
-        if ($User->id) {
-            $args{'Owner'} = $User->id;
-   	    delete $args{'Email'};
-	}
-    }
-    
-    
-    if ($args{'Type'} eq "Requestor" and $args{'Owner'} == 0) {
-	# Requestors *MUST* have an account
-	
-	my $Address = RT::CanonicalizeAddress($args{'Email'});
-	
-	my $NewUser = RT::User->new($RT::SystemUser);
-	my ($Val, $Message) =
-	  $NewUser->Create(Name => $Address,
-			   EmailAddress => $Address,
-			   RealName => $Address,
-			   Password => undef,
-			   Privileged => 0,
-			   Comments => 'Autocreated on ticket submission'
-			  );
-	return (0, "Could not create watcher for requestor")
-	  unless $Val;
-	if ($NewUser->id) {
-	    $args{'Owner'} = $NewUser->id;
-	    delete $args{'Email'};
-	}
-    }
-    
-    
-    
-    
-    #Make sure we\'ve got a valid type
-    #TODO --- move this to ValidateType 
-    return (0, "Invalid Type")
-      unless ($args{'Type'} =~ /^(Requestor|Cc|AdminCc)$/i);
-
-    my $id = $self->SUPER::Create(%args);
-    if ($id) {
-	return (1,"Interest noted");
-    }
-    else {
-	return (0, "Error adding watcher");
-    }
-}
-# }}}
-
-# {{{ sub Load 
-
-=head2 Load ID
-  
-  Loads a watcher by the primary key of the watchers table ($Watcher->id)
-  
-=cut
-
-sub Load  {
-    my $self = shift;
-    my $identifier = shift;
-    
-    if ($identifier !~ /\D/) {
-	$self->SUPER::LoadById($identifier);
-    }
-    else {
-	return (0, "That's not a numerical id");
-    }
-}
-
-# }}}
-
-# {{{ sub LoadByValue
-
-=head2 LoadByValue PARAMHASH
-  
-LoadByValue takes a parameter hash with the following attributes:
-
-  Email, Owner, Scope, Type, Value
-
-The same rules enforced at create are enforced by Load.
-
-Returns a tuple of (retval, msg). Retval is 1 on success and 0 on failure.
-msg describes what happened in a human readable form.
-
-=cut
-
-sub LoadByValue {
-    my $self = shift;
-    my %args = ( Email => undef, 
-		 Owner => undef,
-		 Scope => undef,
-		 Type => undef,
-		 Value => undef,
-		 @_);
-    
-    #TODO: all this code is being copied from Create. that\'s silly
-    
-    #Do we have someone this applies to?
-    unless (($args{'Owner'} =~ /^(\d*)$/) || ($args{'Email'} =~ /\@/)) {
-	return (0, "No user or email address specified");
-    }
-    
-    #if we only have an email address, try to resolve it to an owner
-    unless ($args{'Owner'}) {
-        my $User = new RT::User($RT::SystemUser);
-        $User->LoadByEmail($args{'Email'});
-        if ($User->id > 0) {
-            $args{'Owner'} = $User->id;
-   	    delete $args{'Email'};
-	}
-    }
-    
-    if ((defined ($args{'Type'})) and 
-	($args{'Type'} !~ /^(Requestor|Cc|AdminCc)$/i)) {
-	return (0, "Invalid Type");
-    }
-    if ($args{'Owner'}) {
-	$self->LoadByCols( Type => $args{'Type'},
-			   Value => $args{'Value'},
-			   Owner => $args{'Owner'},
-			   Scope => $args{'Scope'},
-			 );
-    }
-    else {
-	$self->LoadByCols( Type => $args{'Type'},
-			   Email => $args{'Email'},
-			   Value => $args{'Value'},
-			   Scope => $args{'Scope'},
-			 );
-    }	
-    unless ($self->Id) {
-	return(0, "Couldn\'t find that watcher");
-    }
-    return (1, "Watcher loaded");
-}
-
-# }}}
-
-# {{{ sub OwnerObj 
-
-=head2 OwnerObj
-
-Return an RT Owner Object for this Watcher, if we have one
-
-=cut
-
-sub OwnerObj  {
-    my $self = shift;
-    if (!defined $self->{'OwnerObj'}) {
-	require RT::User;
-	$self->{'OwnerObj'} = RT::User->new($self->CurrentUser);
-	if ($self->Owner) {
-	    $self->{'OwnerObj'}->Load($self->Owner);
-	} else {
-	    return $RT::Nobody->UserObj;
-	}
-    }
-    return ($self->{'OwnerObj'});
-}
-# }}}
-
-# {{{ sub Email
-
-=head2 Email
-
-This custom data accessor does the right thing and returns
-the 'Email' attribute of this Watcher object. If that's undefined,
-it returns the 'EmailAddress' attribute of its 'Owner' object, which is
-an RT::User object.
-
-=cut
-
-sub Email {
-    my $self = shift;
-    
-    # IF Email is defined, return that. Otherwise, return the Owner's email address
-    if (defined($self->__Value('Email'))) {
-	return ($self->__Value('Email'));
-    }
-    elsif ($self->Owner) {
-	return ($self->OwnerObj->EmailAddress);
-    }
-    else {
-	return ("Data error");
-    }
-}
-# }}}
-  
-# {{{ sub IsUser
-
-=head2 IsUser
-
-Returns true if this watcher object is tied to a user object. (IE it
-isn't sending to some other email address).
-Otherwise, returns undef
-
-=cut
-
-sub IsUser {
-    my $self = shift;
-    # if this watcher has an email address glued onto it,
-    # return undef
-
-    if (defined($self->__Value('Email'))) {
-        return undef;
-    }
-    else {
-        return 1;
-    }
-}
-
-# }}}
-
-# {{{ sub _Accessible 
-sub _Accessible  {
-  my $self = shift;
-  my %Cols = (
-	      Email => 'read/write',
-	      Scope => 'read/write',
-	      Value => 'read/write',
-	      Type => 'read/write',
-	      Quiet => 'read/write',
-	      Owner => 'read/write',	      
-	      Creator => 'read/auto',
-	      Created => 'read/auto',
-	      LastUpdatedBy => 'read/auto',
-	      LastUpdated => 'read/auto'
-	     );
-  return($self->SUPER::_Accessible(@_, %Cols));
-}
-# }}}
-
-1;
- 
diff --git a/rt/lib/RT/Watchers.pm b/rt/lib/RT/Watchers.pm
deleted file mode 100755
index c55adda3f..000000000
--- a/rt/lib/RT/Watchers.pm
+++ /dev/null
@@ -1,226 +0,0 @@
-# $Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Attic/Watchers.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# (c) 1996-2000 Jesse Vincent <jesse@fsck.com>
-# This software is redistributable under the terms of the GNU GPL
-
-=head1 NAME
-
-  RT::Watchers - Collection of RT Watcher objects
-
-=head1 SYNOPSIS
-
-  use RT::Watchers;
-  my $watchers = new RT::Watchers($CurrentUser);
-  while (my $watcher = $watchers->Next()) {
-    print $watcher->Id . "is a watcher";
-  }  
-
-=head1 DESCRIPTION
-
-This module should never be called directly by client code. it's an internal module which
-should only be accessed through exported APIs in Ticket, Queue and other similar objects.
-
-
-=head1 METHODS
-
-=begin testing
-
-ok(require RT::TestHarness);
-ok(require RT::Watchers);
-
-=end testing
-
-=cut
-
-package RT::Watchers;
-
-use strict;
-use vars qw( @ISA );
-
-
-require RT::EasySearch;
-require RT::Watcher;
-@ISA= qw(RT::EasySearch);
-
-
-# {{{ sub _Init
-sub _Init  {
-  my $self = shift;
-  
-  $self->{'table'} = "Watchers";
-  $self->{'primary_key'} = "id";
-  return($self->SUPER::_Init(@_));
-}
-# }}}
-
-# {{{ sub Limit 
-
-=head2 Limit
-
-  A wrapper around RT::EasySearch::Limit which sets
-the default entry aggregator to 'AND'
-
-=cut
-
-sub Limit  {
-  my $self = shift;
-  my %args = ( ENTRYAGGREGATOR => 'AND',
-	       @_);
-
-  $self->SUPER::Limit(%args);
-}
-# }}}
-
-# {{{ sub LimitToTicket
-
-=head2 LimitToTicket
-
-Takes a single arg which is a ticket id
-Limits to watchers of that ticket
-
-=cut
-
-sub LimitToTicket { 
-  my $self = shift;
-  my $ticket = shift;
-  $self->Limit( ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Value',
-		VALUE => $ticket);
-  $self->Limit (ENTRYAGGREGATOR => 'AND',
-		FIELD => 'Scope',
-		VALUE => 'Ticket');
-}
-# }}}
-
-# {{{ sub LimitToQueue 
-
-=head2 LimitToQueue
-
-Takes a single arg, which is a queue id
-Limits to watchers of that queue.
-
-=cut
-
-sub LimitToQueue  {
-  my $self = shift;
-  my $queue = shift;
-  $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Value',
-		VALUE => $queue);
-  $self->Limit (ENTRYAGGREGATOR => 'AND',
-		FIELD => 'Scope',
-		VALUE => 'Queue');
-}
-# }}}
-
-# {{{ sub LimitToType 
-
-=head2 LimitToType
-
-Takes a single string as its argument. That string is a watcher type
-which is one of 'Requestor', 'Cc' or 'AdminCc'
-Limits to watchers of that type
-
-=cut
-
-
-sub LimitToType  {
-  my $self = shift;
-  my $type = shift;
-  $self->Limit(FIELD => 'Type',
-	       VALUE => "$type");
-}
-# }}}
-
-# {{{ sub LimitToRequestors 
-
-=head2 LimitToRequestors
-
-Limits to watchers of type 'Requestor'
-
-=cut
-
-sub LimitToRequestors  {
-  my $self = shift;
-  $self->LimitToType("Requestor");
-}
-# }}}
-
-# {{{ sub LimitToCc 
-
-=head2 LimitToCc
-
-Limits to watchers of type 'Cc'
-
-=cut
-
-sub LimitToCc  {
-    my $self = shift;
-    $self->LimitToType("Cc");
-}
-# }}}
-
-# {{{ sub LimitToAdminCc 
-
-=head2 LimitToAdminCc
-
-Limits to watchers of type AdminCc
-
-=cut
-
-sub LimitToAdminCc  {
-    my $self = shift;
-    $self->LimitToType("AdminCc");
-}
-# }}}
-
-# {{{ sub Emails 
-
-=head2 Emails
-
-# Return a (reference to a) list of emails
-
-=cut
-
-sub Emails  {
-    my $self = shift;
-    my @list;    # List is a list of watcher email addresses
-
-    # $watcher is an RT::Watcher object
-    while (my $watcher=$self->Next()) {
-	push(@list, $watcher->Email);
-    }
-    return \@list;
-}
-# }}}
-
-# {{{ sub EmailsAsString
-
-=head2 EmailsAsString
-
-# Returns the RT::Watchers->Emails as a comma seperated string
-
-=cut
-
-sub EmailsAsString {
-    my $self = shift;
-    return(join(", ",@{$self->Emails}));
-}
-# }}}
-
-# {{{ sub NewItem 
-
-
-
-sub NewItem  {
-    my $self = shift;
-    
-    use RT::Watcher;
-    my  $item = new RT::Watcher($self->CurrentUser);
-    return($item);
-}
-# }}}
-1;
-
-
-
-
diff --git a/rt/lib/test.pl b/rt/lib/test.pl
deleted file mode 100644
index f0da5df27..000000000
--- a/rt/lib/test.pl
+++ /dev/null
@@ -1,52 +0,0 @@
-# Before `make install' is performed this script should be runnable with
-# `make test'. After `make install' it should work as `perl test.pl'
-
-######################### We start with some black magic to print on failure.
-
-# Change 1..1 below to 1..last_test_to_print .
-# (It may become useful if the test is moved to ./t subdirectory.)
-
-BEGIN { $| = 1; print "1..1\n"; }
-END {print "not ok 1\n" unless $loaded;}
-use RT;
-$loaded = 1;
-print "ok 1\n";
-
-######################### End of black magic.
-
-# Insert your test code below (better if it prints "ok 13"
-# (correspondingly "not ok 13") depending on the success of chunk 13
-# of the test code):
-
-use RT::Record;
-use RT::EasySearch;
-use RT::Handle;
-use RT::Ticket;
-use RT::Tickets;
-use RT::ACE;
-use RT::ACL;
-use RT::Watcher;
-use RT::Watchers;
-use RT::Scrip;
-use RT::Scrips;
-use RT::ScripAction;
-use RT::ScripCondition;
-use RT::ScripActions;
-use RT::ScripConditions;
-use RT::Transaction;
-use RT::Transactions;
-use RT::Group;
-use RT::GroupMembers;
-use RT::User;
-use RT::Users;
-use RT::CurrentUser;
-use RT::Attachment;
-use RT::Attachments;
-use RT::Keyword;
-use RT::Keywords;
-use RT::KeywordSelect;
-use RT::KeywordSelects;
-use RT::ObjectKeyword;
-use RT::ObjectKeywords;
-use RT::Date;
-
diff --git a/rt/tools/cpan2rpm b/rt/tools/cpan2rpm
deleted file mode 100644
index 9b54cb912..000000000
--- a/rt/tools/cpan2rpm
+++ /dev/null
@@ -1,299 +0,0 @@
-#!/usr/bin/perl -w
-
-
-# Take a perl tarball and make a specfile for it. Now with bundles.
-#
-# Copyright 2000,2001 Simon Wilkinson. All rights reserved.
-#
-# 10/18/2001 - <jesse@bestpractical.com>
-#		Added resolution of prereq_pm modules
-#
-# This program is free software; you can redistribute it 
-# and/or modify it under the same terms as Perl itself.
-#
-
-use strict;
-
-use CPAN;
-use POSIX;
-use Sys::Hostname;
-use File::Basename;
-use Getopt::Long;
-
-use vars qw ($DEBUG $ARCH $builddir $seen @report);
-
-$ARCH = 'i386';
-
-$DEBUG = 0;
-# Icky globals
-
-my $release;
-my $package;
-
-$seen = {};
-
-
-sub usage 
-{
-  print STDERR <<EOM;
-
-Usage: cpan2rpm [--release <release>] [--builddir <rpm build dir>]  <Perl::Module>
-
-Where:
-<release> is the release number of the RPM you wish to produce
-<Perl::Module> is the name of the module to build
-EOM
-  exit(1);
-}
-
-
-my $ret=GetOptions("release" => \$release,
-		   "builddir=s" => \$builddir);
-
-$package=$ARGV[0];
-usage() if !$package;
-$release=1 if !$release;
-
-
-$builddir=ExtractRpmMacro($ENV{HOME}."/.rpmmacros","_topdir") if !$builddir;
-$builddir=ExtractRpmMacro("/etc/rpm/macros","_topdir") if !$builddir;
-$builddir=getcwd() if !$builddir;
-  
-die "Build directory $builddir doesn't look like an RPM build root\n"
-    if ((! -d "$builddir/SPECS") || (! -d "$builddir/SOURCES"));
-
-process($package,$release);
-
-print join("\n",@report)."\n";
-
-sub process {
-  my ($infile,$release)=@_;
-
-  
-
-# Convert our installation list into an unbundled one
-  unbundle($infile);
-
-  print "Building $infile\n";
-
-    cpan2rpm($infile,$builddir,$release);
-
-}
-
-# Given a Module, try to split it into its required components - this
-# currently only handles Bundles, but could also be extended to deal with
-# prereqs as well.
-
-sub unbundle {
-  my ($item) = @_;
-
-  if ($item=~/Bundle::/) {
-    my $obj=CPAN::Shell->expand('Bundle',$item);
-
-    foreach my $kid ($obj->contains) {
-     	process($kid,$release);
-    }
-  }
-}
-
-
-sub cpan2rpm($$$) {
-  my ($infile,$builddir,$release) = @_;
-
-  my $ret;
-
-  my $obj=CPAN::Shell->expand('Module',$infile);
-
-  print "CPAN tells us the following about $infile:\n",$obj->as_string if ($DEBUG);
-
-  $ret=fetch_source($obj,$builddir);
-  $ret=build_specfile($obj,$builddir,$release) if !$ret;
-  
-  return $ret;
-}
-
-# FIXME: Some error handling in the function below wouldn't go amiss ...
-sub fetch_source {
-  my ($obj,$builddir)=@_;
-
-  # Minor Sanity checks
-  my $id=$obj->{ID};
-
-  return "Error: No file for $id\n" 
-     if $obj->cpan_file eq "N/A";
-  return "Error: $id says 'Contact Author'\n" 
-     if $obj->cpan_file =~ /^Contact Author/;
-  return "Error: $id is contained within Perl itself!\n"
-     if ($obj->cpan_file =~/perl-5\.\d?\.\d?\.tar\.gz/xo);
-
-  # We do this so we can take advantage of CPAN's object caching. This is
-  # pinched from the CPAN::Distribution::get method, which we can't use
-  # directly, as it untars the package as well - which we let RPM do.
- 
-  my $dist = $CPAN::META->instance('CPAN::Distribution',$obj->cpan_file);
-
-
-  my($local_wanted) =
-       MM->catfile($CPAN::Config->{keep_source_where},
-                   "authors",
-                   "id",
-                   split("/",$dist->{ID})
-                   );
-
-  my $local_file = CPAN::FTP->localize("authors/id/$dist->{ID}", $local_wanted);
-  
-  $dist->{localfile} = $local_file;
-
-  $dist->verifyMD5 if ($CPAN::META->has_inst('MD5'));
-
-
-  # Find all the prereqs for this distribution, then build em.
-  # TODO this should be somewhere else
-
-  $dist->make;
-  build_prereqs( $dist->prereq_pm());
-
-
-
-  my $infile=basename($obj->cpan_file);
-
-  File::Copy::copy($local_file,"$builddir/SOURCES/$infile");
-
-  return undef;
-}
-
-
-sub build_prereqs($) {
-  my ($prereqs) = @_;
-  
-  foreach my $prereq (keys %{$prereqs}) {
-	process ($prereq, $release);
-  }
-}
-sub build_specfile($$$) {
-  my ($obj,$builddir,$release) = @_;
-
-  my $source=basename($obj->cpan_file);
-
-  # don't go through dependencies on something we've already dealt with
-  return() if ($seen->{$source});
-  $seen->{$source} = 1; 
-
-my ($name,$version)=($source=~/(.*)-(.*)\.tar\.gz/);
-  return "Couldn't get a name for $source\n" if !$name;
-  return "Couldn't get a version for $source\n" if !$version; 
-  
-  my $summary="$name module for perl";
-  my $description=$obj->{description};
-  $description= $summary if !$description;
-
-  open(SPEC, ">$builddir/SPECS/perl-$name.spec")
-    or die "Couldn't open perl-$name.spec for writing.";
-  print SPEC <<EOF;
-
-Summary: $summary
-Name: perl-$name
-Version: $version
-Release: $release
-Copyright: distributable
-Group: Applications/CPAN
-Source0: $source
-Url: http://www.cpan.org
-BuildRoot: /var/tmp/perl-${name}-buildroot/
-Requires: perl 
-
-%description
-This is a perl module, autogenerated by cpan2rpm. The original package's
-description was:
-
-$description
-
-%prep
-%setup -q -n $name-%{version}
-
-%build
-CFLAGS="\$RPM_OPT_FLAGS" perl Makefile.PL
-make
-
-%clean
-rm -rf \$RPM_BUILD_ROOT
-
-%install
-rm -rf \$RPM_BUILD_ROOT
-eval `perl '-V:installarchlib'`
-mkdir -p \$RPM_BUILD_ROOT/\$installarchlib
-make PREFIX=\$RPM_BUILD_ROOT/usr install
-/usr/lib/rpm/brp-compress
-find \$RPM_BUILD_ROOT/usr -type f -print | sed "s\@^\$RPM_BUILD_ROOT\@\@g" | grep -v perllocal.pod > $name-$version-filelist
-
-%files -f ${name}-${version}-filelist
-%defattr(-,root,root)
-
-%changelog
-EOF
-  print SPEC "* ",POSIX::strftime("%a %b %d %Y",localtime()), " ",$ENV{USER}," <",$ENV{USER},"\@",hostname(),">\n";
-  print SPEC "- Spec file automatically generated by cpan2rpm\n";
-
-  close(SPEC);
-
-  system("rpm -ba $builddir/SPECS/perl-$name.spec >/dev/null") == 0
-    or push (@report,  "RPM of $source failed with : $!\n"); 
- 
-  system("rpm -Uvh $builddir/RPMS/$ARCH/perl-$name-$version-$release.$ARCH.rpm") == 0
-    or warn "RPM of $source could not be installed: $!\n";
-
-  push (@report,  "Built perl-$name-$version-$release.$ARCH.rpm");
-}
-
-sub ExtractRpmMacro {
-  my ($file,$macro) = @_;
-
-  my $handle=new IO::File;
-
-  if (!$handle->open($file)) {
-    return undef;
-  }
-
-  while(<$handle>) {
-    if (/\%$macro (.*)/) {
-       return $1;
-    }
-  }
-
-  return undef;
-}
-
-=head1 NAME
-
-cpan2rpm - fetch and convert CPAN packages to RPMs
-
-=head1 SYNOPSIS
-
-cpan2rpm --release <release> <package>
-
-=head1 DESCRIPTION
-
-cpan2rpm provides a quick way of creating RPM packages from perl modules
-published on CPAN. It interfaces with the perl CPAN module to fetch the
-file from the selected mirror, and then creates a spec file from the 
-information in CPAN, and invokes RPM on that spec file.
-
-Files are created in the users RPM build root.
-
-=head1 OPTIONS
-
-=over 4
-
-=item release
-
-Sets the release number of the created RPMs.
-
-=back
-
-=head1 SEE ALSO
-
-rpm(1)
-
-=head1 AUTHOR
-
-Simon Wilkinson <sxw@sxw.org.uk>
diff --git a/rt/tools/initdb b/rt/tools/initdb
deleted file mode 100644
index ffb1ae3b0..000000000
--- a/rt/tools/initdb
+++ /dev/null
@@ -1,216 +0,0 @@
-#!/usr/bin/perl -w
-# $Header: /home/cvs/cvsroot/freeside/rt/tools/Attic/initdb,v 1.1 2002-08-12 06:17:08 ivan Exp $
-
-use strict;
-use vars qw($PROMPT $SCHEMA_FILE $SCHEMA_DIR
-	    $ACTION $DEBUG $DB_TYPE $DB_HOME 
-	    $DB_HOST $DB_PORT $DB_DBA $DB_DATABASE $DB_DBA_PASSWORD);
-
-use DBI;
-use DBIx::DataSource qw( create_database drop_database );
-
-
-$|=1; #unbuffer that output.
-
-$DEBUG=0;
-$PROMPT = 1; #by default, should at least *ask* before nuking databases
-$SCHEMA_DIR ="etc";
-$SCHEMA_FILE = "$SCHEMA_DIR/schema.pm"; #hmm
-
-($DB_TYPE, $DB_HOME, $DB_HOST, $DB_PORT, $DB_DBA, $DB_DATABASE, $ACTION) = @ARGV;
-
-
-if ($DEBUG) {
-  print_config_params();
-}
-my $dsn = "dbi:$DB_TYPE:";
-
-if (($DB_TYPE eq 'Pg') or ($DB_TYPE eq 'mysql')) {
-   $dsn .= "dbname=$DB_DATABASE";
-   if ($DB_HOST) {
-	$dsn .= ";host=$DB_HOST";
-    }
-   if ($DB_PORT) {
- 	$dsn .= ";port=$DB_PORT";
-   }
-}
-elsif ($DB_TYPE eq 'Oracle') {
-   $dsn .= "$DB_DATABASE";
-}
-
-
-if ($ACTION eq 'create') {
-    unless ($DB_TYPE eq 'Oracle') {
-        print "Now creating a database for RT.\n";
-	prompt_for_dba_password();
-	create_db();
-    }
-}
-elsif ($ACTION eq 'drop' ) {
-    unless ($DB_TYPE eq 'Oracle') {
-	print "Now dropping the RT2 database.\n";
-        prompt_for_dba_password();
-        drop_db();
-    }
-}
-elsif ($ACTION eq 'insert' ) {
-    print "Now populating database schema.\n";
-    prompt_for_dba_password();
-    insert_schema();
-}
-elsif ($ACTION eq 'generate') {
-    prompt_for_dba_password();
-    generate_schema();
-}
-else {
-    print STDERR '$ACTION unspecified. Makefile error. It was '.$ACTION ;
-    exit(-1);
-}
-
-
-# {{{ sub prompt_for_dba_password
-
-sub prompt_for_dba_password {
-    print "Enter the $DB_TYPE password for $DB_DBA: ";
-
-    system "stty -echo";
-    $DB_DBA_PASSWORD = scalar(<STDIN>); #keep off commandline
-    system "stty echo";
-    chomp $DB_DBA_PASSWORD;
-
-}
-# }}}
-
-# {{{ sub print_config_params
-sub print_config_params {
-    print <<END;
-Database creation parameters:
-
-DB_TYPE         = $DB_TYPE
-DB_HOME         = $DB_HOME
-DB_HOST         = $DB_HOST
-DB_DBA          = $DB_DBA
-DB_DBA_PASSWORD = <hidden>
-DB_DATABASE     = $DB_DATABASE
-END
-}
-# }}}
-
-# {{{ sub drop_db
-sub drop_db {
-    
-    if ( $PROMPT ) {
-	print <<END;
-
-About to drop $DB_TYPE database $DB_DATABASE.
-WARNING: This will erase all data in $DB_DATABASE.
-If you have an existing RT 2.x installation, this will destroy all your data.
-i
-END
-	exit unless _yesno();
-	
-    }
-    
-
-  print "\nDropping $DB_TYPE database $DB_DATABASE.\n";
-  drop_database( $dsn, $DB_DBA, $DB_DBA_PASSWORD )
-    or warn $DBIx::DataSource::errstr;
-
-
-}
-# }}}
-
-# {{{ sub generate_schema
-sub generate_schema {
-    my @schema = generate_schema_from_hash();
-    print "Generating schema for $DB_TYPE...";
-    
-    system('mv', "$SCHEMA_DIR/schema.$DB_TYPE", "$SCHEMA_DIR/schema.$DB_TYPE.bak")
-      if (-f "$SCHEMA_DIR/schema.$DB_TYPE");
-    open(SCHEMA, ">$SCHEMA_DIR/schema.$DB_TYPE");
-    foreach my $line (@schema) {
-	print SCHEMA "$line;\n";
-    }
-    close(SCHEMA);
-    print "done.\n";
-}
-# }}}
-
-# {{{ sub insert_schema
-sub insert_schema {
-    my (@schema);
-    print "\nCreating database schema.\n";
-   
-    my $dbh = DBI->connect( $dsn, $DB_DBA, $DB_DBA_PASSWORD ) or die $DBI::errstr;    
-    
-    if ( -f "$SCHEMA_DIR/schema.$DB_TYPE") {
-	open (SCHEMA, "<$SCHEMA_DIR/schema.$DB_TYPE");
-	my $statement = "";
-	foreach my $line (<SCHEMA>) {
-	    $statement .= $line;
-	    if ($line =~ /;$/) {
-		$statement =~ s/;$//g;
-		push @schema, $statement;
-		$statement = "";
-	    }
-	}	
-    }	
-    
-    else {
-	 @schema = generate_schema_from_hash();
-     }
-    
-    foreach my $statement (@schema) {
-	print STDERR $statement if $DEBUG;
-	my $sth = $dbh->prepare($statement) or die $dbh->errstr;
-	unless ($sth->execute) {
-	    print STDERR "Problem with statement:\n $statement\n";
-	    die $sth->errstr;
-	}
-    }
-    
-    
-    $dbh->disconnect;
-    print "schema sucessfully inserted\n";
-    
-}
-# }}}
-
-# {{{ sub generate_schema_from_hash
-sub generate_schema_from_hash {
-    my (@schema);
-    
-    require DBIx::DBSchema;    
-    my $schema_href = do "$SCHEMA_FILE" or die $@ || $!;
-    my $schema = DBIx::DBSchema->pretty_read($schema_href);
-    
-    
-    foreach my $statement ( $schema->sql($dsn, $DB_DBA, $DB_DBA_PASSWORD ) ) {
-	print STDERR $statement if $DEBUG;
-	chomp $statement;
-	push @schema, $statement;
-	
-    }
-    return (@schema);
-    
-}
-# }}}
-
-# {{{ sub create_db
-sub create_db {
-    
-    print "\nCreating $DB_TYPE database $DB_DATABASE.\n";
-    create_database( $dsn, $DB_DBA, $DB_DBA_PASSWORD )
-      or die $DBIx::DataSource::errstr;
-
-}
-# }}}
-
-# {{{ sub _yesno
-sub _yesno {
-    print "Proceed [y/N]:";
-    my $x = scalar(<STDIN>);
-    $x =~ /^y/i;
-}
-
-# }}}
diff --git a/rt/tools/insertdata b/rt/tools/insertdata
deleted file mode 100755
index b3e76e623..000000000
--- a/rt/tools/insertdata
+++ /dev/null
@@ -1,618 +0,0 @@
-#!/usr/bin/perl -w
-#
-# $Header: /home/cvs/cvsroot/freeside/rt/tools/Attic/insertdata,v 1.1 2002-08-12 06:17:08 ivan Exp $
-# RT is (c) 1996-2002 Jesse Vincent (jesse@bestpractical.com);
-
-package RT;
-use strict;
-use vars qw($VERSION $Handle $Nobody $SystemUser $item);
-
-use lib "!!RT_LIB_PATH!!";
-use lib "!!RT_ETC_PATH!!";
-
-#This drags in  RT's config.pm
-use config;
-use Carp;
-
-use RT::Handle;
-use RT::User;
-use RT::CurrentUser;
-
-# 
-my $LastVersion = shift || undef;
-my $LastMinorVersion = undef;
-
-#connect to the db
-$RT::Handle = new RT::Handle($RT::DatabaseType);
-$RT::Handle->Connect();
-
-#Put together a current user object so we can create a User object
-my $CurrentUser = new RT::CurrentUser();
-
-if ($LastVersion) {
-    if ( $LastVersion =~ /^2.0.(\d+)$/ ) {
-        $LastMinorVersion = $1;
-        print "Looking for new objects to add to the database"
-          . " since $LastVersion\n\n";
-    }
-    else {
-        print "This tool does not support upgrades from development releases "
-          . "or non 2.0.x versions";
-    }
-}
-else {    # this is a virgin install
-    print "Checking for existing system user...";
-    my $test_user = RT::User->new($CurrentUser);
-    $test_user->Load('RT_System');
-    if ( $test_user->id ) {
-        print "Found!\n\nYou appear to have already run insertdata.\n"
-          . "Exiting, so as not to clobber your existing data. To ERASE your\n"
-          . "RT database and start over, type 'make dropdb; make install' in\n"
-          . "the RT installation directory. If you just meant to upgrade the\n"
-          . "content of your database, rerun this program as: \n",
-          "       $0 <version>\n"
-          . "where <version> is the last RELEASED version of RT you installed\n"
-          . "for example, if you're upgrading from 2.0.4, you'd type:\n"
-          . "       $0 2.0.4\n";
-        exit(-1);
-
-    }
-    else {
-        print "not found.  This appears to be a new installation";
-    }
-
-    print "Creating system user...";
-    my $RT_System = new RT::User($CurrentUser);
-
-    my ( $val, $msg ) = $RT_System->_BootstrapCreate(
-        Name     => 'RT_System',
-        RealName => 'The RT System itself',
-        Comments =>
-'Do not delete or modify this user. It is integral to RT\'s internal database structures',
-        Privileged => '2',
-        Creator    => '1'
-    );
-
-    if ($val) {
-        print "done.\n";
-    }
-    else {
-        print "$msg\n";
-        exit(1);
-    }
-
-}
-
-#now that we bootstrapped that little bit, we can use the standard RT cli
-# helpers  to do what we need
-
-use RT::Interface::CLI qw(CleanEnv LoadConfig DBConnect
-  GetCurrentUser GetMessageContent);
-
-#Clean out all the nasties from the environment
-CleanEnv();
-
-#Load etc/config.pm and drop privs
-LoadConfig();
-
-#Connect to the database and get RT::SystemUser and RT::Nobody loaded
-DBConnect();
-
-$CurrentUser->LoadByName('RT_System');
-
-# {{{ Users
-
-my @users;
-
-unless ($LastVersion) {
-    @users = (
-        {
-            Name     => 'Nobody',
-            RealName => 'Nobody in particular',
-            Comments => 'Do not delete or modify this user. It is integral '
-              . 'to RT\'s internal data structures',
-            Privileged => '2',
-        },
-
-        {
-            Name         => 'root',
-            Gecos        => 'root',
-            RealName     => 'Enoch Root',
-            Password     => 'password',
-            EmailAddress => "root\@localhost",
-            Comments     => 'SuperUser',
-            Privileged   => '1',
-        }
-    );
-}
-
-# }}}
-
-# {{{ Groups 
-
-my @groups;
-unless ($LastVersion) {
-    @groups = (
-        {
-            Name        => 'Everyone',
-            Description => 'Pseudogroup for internal use',
-            Pseudo      => '1',
-        },
-        {
-            Name        => 'Owner',
-            Description => 'Pseudogroup for internal use',
-            Pseudo      => '1',
-        },
-        {
-            Name        => 'Requestor',
-            Description => 'Pseudogroup for internal use',
-            Pseudo      => '1',
-        },
-        {
-            Name        => 'Cc',
-            Description => 'Pseudogroup for internal use',
-            Pseudo      => '1',
-        },
-        {
-            Name        => 'AdminCc',
-            Description => 'Pseudogroup for internal use',
-            Pseudo      => '1',
-        },
-    );
-}
-
-# }}}
-
-# {{{ ACL
-my @acl;
-
-unless ($LastVersion) {
-    @acl = (    #TODO: make this actually take the serial # granted to root.
-        {
-            PrincipalId    => '1',
-            PrincipalType  => 'User',
-            RightName      => 'SuperUser',
-            RightScope     => 'System',
-            RightAppliesTo => '0'
-        },
-        {
-            PrincipalId    => '2',
-            PrincipalType  => 'User',
-            RightName      => 'SuperUser',
-            RightScope     => 'System',
-            RightAppliesTo => '0'
-        },
-
-        {
-            PrincipalId    => '3',
-            PrincipalType  => 'User',
-            RightName      => 'SuperUser',
-            RightScope     => 'System',
-            RightAppliesTo => '0'
-        }
-
-    );
-}
-
-# }}}
-
-# {{{ Queues
-
-my @queues;
-unless ($LastVersion) {
-    @queues = (
-        {
-            Name              => 'general',
-            Description       => 'The default queue',
-            CorrespondAddress => "rt\@localhost",
-            CommentAddress    => "rt-comment\@localhost"
-        }
-    );
-}
-
-# }}}
-
-# {{{ ScripActions
-
-my @ScripActions;
-
-unless ($LastVersion) {
-    @ScripActions = (
-
-        {
-            Name        => 'AutoreplyToRequestors',
-            Description =>
-'Always sends a message to the requestors independent of message sender',
-            ExecModule => 'Autoreply',
-            Argument   => 'Requestor'
-        },
-        {
-            Name        => 'NotifyRequestors',
-            Description => 'Sends a message to the requestors',
-            ExecModule  => 'Notify',
-            Argument    => 'Requestor'
-        },
-        {
-            Name        => 'NotifyOwnerAsComment',
-            Description => 'Sends mail to the owner',
-            ExecModule  => 'NotifyAsComment',
-            Argument    => 'Owner'
-        },
-        {
-            Name        => 'NotifyOwner',
-            Description => 'Sends mail to the owner',
-            ExecModule  => 'Notify',
-            Argument    => 'Owner'
-        },
-        {
-            Name        => 'NotifyAdminCcsAsComment',
-            Description => 'Sends mail to the administrative Ccs as a comment',
-            ExecModule  => 'NotifyAsComment',
-            Argument    => 'AdminCc'
-        },
-        {
-            Name        => 'NotifyAdminCcs',
-            Description => 'Sends mail to the administrative Ccs',
-            ExecModule  => 'Notify',
-            Argument    => 'AdminCc'
-        },
-
-        {
-            Name        => 'NotifyRequestorsAndCcsAsComment',
-            Description => 'Send mail to requestors and Ccs as a comment',
-            ExecModule  => 'NotifyAsComment',
-            Argument    => 'Requestor,Cc'
-        },
-
-        {
-            Name        => 'NotifyRequestorsAndCcs',
-            Description => 'Send mail to requestors and Ccs',
-            ExecModule  => 'Notify',
-            Argument    => 'Requestor,Cc'
-        },
-
-        {
-            Name        => 'NotifyAllWatchersAsComment',
-            Description => 'Send mail to all watchers',
-            ExecModule  => 'NotifyAsComment',
-            Argument    => 'All'
-        },
-        {
-            Name        => 'NotifyAllWatchers',
-            Description => 'Send mail to all watchers',
-            ExecModule  => 'Notify',
-            Argument    => 'All'
-        },
-    );
-}
-
-if ( $LastMinorVersion < 12 ) {
-    push (
-        @ScripActions,
-        {
-            Name        => 'NotifyOtherRecipientsAsComment',
-            Description => 'Sends mail to explicitly listed Ccs and Bccs',
-            ExecModule  => 'NotifyAsComment',
-            Argument    => 'OtherRecipients'
-        },
-        {
-            Name        => 'NotifyOtherRecipients',
-            Description => 'Sends mail to explicitly listed Ccs and Bccs',
-            ExecModule  => 'Notify',
-            Argument    => 'OtherRecipients'
-        },
-    );
-}
-
-# }}}
-
-# {{{ ScripConditions
-
-my @ScripConditions;
-unless ($LastVersion) {
-    @ScripConditions = (
-        {
-            Name                 => 'OnCreate',
-            Description          => 'When a ticket is created',
-            ApplicableTransTypes => 'Create',
-            ExecModule           => 'AnyTransaction',
-        },
-
-        {
-            Name                 => 'OnTransaction',
-            Description          => 'When anything happens',
-            ApplicableTransTypes => 'Any',
-            ExecModule           => 'AnyTransaction',
-        },
-        {
-
-            Name                 => 'OnCorrespond',
-            Description          => 'Whenever correspondence comes in',
-            ApplicableTransTypes => 'Correspond',
-            ExecModule           => 'AnyTransaction',
-        },
-
-        {
-
-            Name                 => 'OnComment',
-            Description          => 'Whenever comments come in',
-            ApplicableTransTypes => 'Comment',
-            ExecModule           => 'AnyTransaction'
-        },
-        {
-
-            Name                 => 'OnStatus',
-            Description          => 'Whenever a ticket\'s status changes',
-            ApplicableTransTypes => 'Status',
-            ExecModule           => 'AnyTransaction',
-
-        },
-        {
-            Name                 => 'OnResolve',
-            Description          => 'Whenever a ticket is resolved.',
-            ApplicableTransTypes => 'Status',
-            ExecModule           => 'StatusChange',
-            Argument             => 'resolved'
-
-        },
-
-    );
-}
-
-# }}}
-
-# {{{ Templates
-my @templates;
-
-unless ($LastVersion) {
-    @templates = (
-        {
-            Queue       => '0',
-            Name        => 'Autoreply',
-            Description => 'Default Autoresponse Template',
-            Content     => 'Subject: AutoReply: {$Ticket->Subject}
-
-
-Greetings,
-
-This message has been automatically generated in response to the
-creation of a trouble ticket regarding:
-	"{$Ticket->Subject()}", 
-a summary of which appears below.
-
-There is no need to reply to this message right now.  Your ticket has been
-assigned an ID of [{$rtname} #{$Ticket->id()}].
-
-Please include the string:
-
-         [{$rtname} #{$Ticket->id}]
-
-in the subject line of all future correspondence about this issue. To do so, 
-you may reply to this message.
-
-                        Thank you,
-                        {$Ticket->QueueObj->CorrespondAddress()}
-
--------------------------------------------------------------------------
-{$Transaction->Content()}
-'
-        },
-
-        {
-
-            #                  id => 2,
-            Queue       => '0',
-            Name        => 'Transaction',
-            Description => 'Default transaction template',
-            Content     => '
-
-
-{$Transaction->CreatedAsString}: Request {$Ticket->id} was acted upon.
-Transaction: {$Transaction->Description}
-       Queue: {$Ticket->QueueObj->Name}
-     Subject: {$Transaction->Subject || $Ticket->Subject || "(No subject given)"}
-       Owner: {$Ticket->OwnerObj->Name}
-  Requestors: {$Ticket->Requestors->EmailsAsString()}
-      Status: {$Ticket->Status}
- Ticket <URL: {$RT::WebURL}Ticket/Display.html?id={$Ticket->id} >
--------------------------------------------------------------------------
-{$Transaction->Content()}'
-        },
-
-        {
-
-            Queue       => '0',
-            Name        => 'AdminCorrespondence',
-            Description => 'Default admin correspondence template',
-            Content     => '
-
-
-<URL: {$RT::WebURL}Ticket/Display.html?id={$Ticket->id} >
-
-{$Transaction->Content()}'
-        },
-
-        {
-            Queue       => '0',
-            Name        => 'Correspondence',
-            Description => 'Default correspondence template',
-            Content     => '
-
-{$Transaction->Content()}'
-        },
-
-        {
-            Queue       => '0',
-            Name        => 'AdminComment',
-            Description => 'Default admin comment template',
-            Content     =>
-'Subject: [Comment] {my $s=($Transaction->Subject||$Ticket->Subject); $s =~ s/\\[Comment\\]//g; $comment =~ s/^Re//i; $s;}
-
-
-{$RT::WebURL}Ticket/Display.html?id={$Ticket->id}
-This is a comment.  It is not sent to the Requestor(s):
-
-{$Transaction->Content()}
-'
-        },
-
-        {
-            Queue       => '0',
-            Name        => 'StatusChange',
-            Description => 'Ticket status changed',
-            Content     => 'Subject: Status Changed to: {$Transaction->NewValue}
-
-
-{$RT::WebURL}Ticket/Display.html?id={$Ticket->id}
-
-{$Transaction->Content()}
-'
-        },
-
-        {
-
-            Queue       => '0',
-            Name        => 'Resolved',
-            Description => 'Ticket Resolved',
-            Content     => 'Subject: Ticket Resolved
-
-According to our records, your request has been resolved. If you have any
-further questions or concerns, please respond to this message.
-'
-        }
-    );
-}
-
-# }}}
-
-# {{{ Scrips;
-
-my @scrips;
-unless ($LastVersion) {
-     @scrips = (
-                { Queue => 0,
-                  ScripCondition => 'OnCreate',
-                  ScripAction => 'AutoreplyToRequestors',
-                  Template => 'Autoreply'
-                },
-                { Queue => 0,
-                  ScripCondition => 'OnCreate',
-                  ScripAction => 'NotifyAdminCcs',
-                  Template => 'Transaction',
-                },
-                { Queue => 0,
-                  ScripCondition => 'OnCorrespond',
-                  ScripAction => 'NotifyAllWatchers',
-                  Template => 'Correspondence',
-                },
-                { Queue => 0,
-                  ScripCondition => 'OnComment',
-                  ScripAction => 'NotifyAdminCcsAsComment',
-                  Template => 'AdminComment',
-                },
-     ) 
-}
-if ( $LastMinorVersion < 12 ) {
-    push (
-        @scrips,
-                { Queue => 0,
-                  ScripCondition => 'OnComment',
-                  ScripAction => 'NotifyOtherRecipientsAsComment',
-                  Template => 'Correspondence',
-                },
-                { Queue => 0,
-                  ScripCondition => 'OnCorrespond',
-                  ScripAction => 'NotifyOtherRecipients',
-                  Template => 'Correspondence',
-                },
-        );
-}
-# }}}
-
-print "Creating ACL...";
-use RT::ACE;
-for $item (@acl) {
-    my $new_entry = new RT::ACE($CurrentUser);
-
-    #Using an internal function. this should never be used outside of the bootstrap script
-    my $return = $new_entry->_BootstrapRight(%$item);
-    print $return. ".";
-}
-print "done.\n";
-
-print "Creating users...";
-use RT::User;
-foreach $item (@users) {
-    my $new_entry = new RT::User($CurrentUser);
-    my ( $return, $msg ) = $new_entry->Create(%$item);
-    print "(Error: $msg)" unless ($return);
-    print $return. ".";
-}
-print "done.\n";
-
-print "Creating groups...";
-use RT::Group;
-foreach $item (@groups) {
-    my $new_entry = new RT::Group($CurrentUser);
-    my $return    = $new_entry->Create(%$item);
-    print $return. ".";
-}
-print "done.\n";
-
-print "Creating queues...";
-use RT::Queue;
-for $item (@queues) {
-    my $new_entry = new RT::Queue($CurrentUser);
-    my ( $return, $msg ) = $new_entry->Create(%$item);
-    print "(Error: $msg)" unless ($return);
-    print $return. ".";
-}
-
-print "done.\n";
-print "Creating ScripActions...";
-
-use RT::ScripAction;
-for $item (@ScripActions) {
-    my $new_entry = new RT::ScripAction($CurrentUser);
-    my $return    = $new_entry->Create(%$item);
-    print $return. ".";
-}
-
-print "done.\n";
-print "Creating ScripConditions...";
-
-use RT::ScripCondition;
-for $item (@ScripConditions) {
-    my $new_entry = new RT::ScripCondition($CurrentUser);
-    my $return    = $new_entry->Create(%$item);
-    print $return. ".";
-}
-
-print "done.\n";
-
-print "Creating templates...";
-
-use RT::Template;
-for $item (@templates) {
-    my $new_entry = new RT::Template($CurrentUser);
-    my $return    = $new_entry->Create(%$item);
-    print $return. ".";
-}
-print "done.\n";
-
-print "Creating Scrips...";
-
-use RT::Scrip;
-for $item (@scrips) {
-        my $new_entry = RT::Scrip->new($CurrentUser);
-        my ($return,$msg) = $new_entry->Create(%$item);
-        print "(Error: $msg)" unless ($return);
-        print $return.".";
-
-}
-print "done.\n";
-
-$RT::Handle->Disconnect();
-
-1;
-
diff --git a/rt/tools/testdeps b/rt/tools/testdeps
deleted file mode 100644
index ddc338107..000000000
--- a/rt/tools/testdeps
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/bin/perl -w
-
-# $Header: /home/cvs/cvsroot/freeside/rt/tools/Attic/testdeps,v 1.1 2002-08-12 06:17:08 ivan Exp $
-
-# Copyright 2000 Jesse Vincent <jesse@fsck.com>
-# Distributed under the GNU General Public License
-# 
-
-#
-# This is just a basic script that checks to make sure that all
-# the modules needed by RT before you can install it.
-#
-
-use strict;
-
-use vars qw($mode $dbd $module @modules);
-
-$mode = shift || print_help();
-$dbd = shift || print_help();
-
-@modules = qw(
-Digest::MD5
-Storable
-DBI 1.18
-DBIx::DataSource 0.02
-DBIx::SearchBuilder 0.48
-HTML::Entities 
-MLDBM
-Net::Domain
-Net::SMTP
-Params::Validate 0.02
-HTML::Mason 1.02
-CGI::Cookie 1.20
-Apache::Cookie
-Apache::Session 1.53
-Date::Parse
-Date::Format 
-MIME::Entity 5.108
-Mail::Mailer 1.20
-Getopt::Long 2.24
-Tie::IxHash 
-Text::Wrapper 
-Text::Template
-File::Spec 0.8
-Errno
-FreezeThaw
-File::Temp 
-Log::Dispatch 1.6
-);
-
-
-if ($dbd =~ /mysql/i) {
-	push @modules, ('DBD::mysql','2.0416'); 
-}
-elsif ($dbd =~ /oracle/i) {
-	push @modules, ('DBD::Oracle','');
-}
-elsif ($dbd =~ /pg/i) {
-	push @modules, ('DBD::Pg','');
-}
-use CPAN;
-
-while ($module= shift @modules) {
-	my $version = "";
-	$version = " ". shift (@modules) . " " if ($modules[0] =~ /^([\d\.]*)$/);
-	print "Checking for $module$version";
-	eval "use $module$version" ;
-	if ($@) {
-	&resolve_dependency($module, $version) 
-	}
-	else {
-	print "...found\n";
-	}
-}
-
-sub print_help {
-print <<EOF;
-
-$0 FLAG DBTYPE
-
-
-$0 is a tool for RT that will tell you if you've got all
-the modules RT depends on properly installed.
-
-Flags: (only one flag is valid for a given run)
-
--quiet will check to see if we've got everything we need
-	and will exit with a return code of (1) if we don't.
-
--warn will tell you what isn't properly installed
-
--fix will use CPAN to magically make everything better
-
-DBTYPE is one of:
-	oracle, pg, mysql
-
-EOF
-
-exit(0);
-}
-
-sub resolve_dependency {
-	my $module = shift;
-	my $version = shift;
-        print "....$module$version not installed.";
-    if ($mode =~ /-f/) {
-	$module = "DBD::mysql::Install" if ($module =~ /DBD::mysql/);
-	
-        print "Installing with CPAN...";
-        CPAN::install($module);
-     }
-     print "\n";
-	exit(1) if ($mode =~ /-q/);
-}	
-	
diff --git a/rt/webrt/Admin/Elements/CreateQueueCalled b/rt/webrt/Admin/Elements/CreateQueueCalled
deleted file mode 100755
index aeed6e786..000000000
--- a/rt/webrt/Admin/Elements/CreateQueueCalled
+++ /dev/null
@@ -1,3 +0,0 @@
-<FORM METHOD=get ACTION="<% $RT::WebPath %>/Admin/Queues/Create.html">
-Create a queue called <INPUT NAME="Name" size=10><input type=submit>
-</form>
diff --git a/rt/webrt/Admin/Elements/CreateUserCalled b/rt/webrt/Admin/Elements/CreateUserCalled
deleted file mode 100755
index 7e4bb7554..000000000
--- a/rt/webrt/Admin/Elements/CreateUserCalled
+++ /dev/null
@@ -1,3 +0,0 @@
-<FORM METHOD=get ACTION="<%$RT::WebPath%>/Admin/Users/Create.html">
-New user called <INPUT NAME="Name" size=10><input type=submit value="Create">
-</form>
diff --git a/rt/webrt/Admin/Elements/EditUserComments b/rt/webrt/Admin/Elements/EditUserComments
deleted file mode 100755
index 1ac7e187f..000000000
--- a/rt/webrt/Admin/Elements/EditUserComments
+++ /dev/null
@@ -1,9 +0,0 @@
-<& /Elements/Header, Title => "Comments about $name" &>
-These comments aren't generally visible to the user:<br>
-<input type="hidden" name="id" value="<%$id%>">
-<TEXTAREA COLS=60 ROWS=15 WRAP=SOFT NAME="Comments"><% $UserObj->Comments %></TEXTAREA>
-</FORM>
-
-<%ARGS>
-$UserObj => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/GrantQueueRightsTo b/rt/webrt/Admin/Elements/GrantQueueRightsTo
deleted file mode 100755
index 3850a18f2..000000000
--- a/rt/webrt/Admin/Elements/GrantQueueRightsTo
+++ /dev/null
@@ -1,30 +0,0 @@
-<BR>
-
-% if ($msg) {
-<%$msg%>
-% } elsif ($Users) {
-<ul>
-% while (my $u = $Users->Next ) {
-<li> <%$u->Name%> (<%$u->RealName%>) <& SelectQueueRights, Name => "GrantTo".$u->id &>
-% }
-</ul>
-% }
-
-<%INIT>
-my ($msg, $Users);
-if (!$ARGS{'UserString'}) {
-$msg = "No users selected.";
- }
-else {
-    $Users = new RT::Users($session{'CurrentUser'});
-    $Users->Limit(FIELD => $ARGS{'UserField'},
-                 VALUE => $ARGS{'UserString'},
-                 OPERATOR => $ARGS{'UserOp'});
-     }
-</%INIT>
-
-<%ARGS>
-$UserField => 'Name'
-$UserOp => '='
-$UserString => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/GroupTabs b/rt/webrt/Admin/Elements/GroupTabs
deleted file mode 100755
index 261bef1e2..000000000
--- a/rt/webrt/Admin/Elements/GroupTabs
+++ /dev/null
@@ -1,18 +0,0 @@
-<& /Admin/Elements/Tabs, subtabs => $subtabs, current_tab => 'Admin/Groups/' &>
-<hr>
-<%INIT>
-my $subtabs = { 
-             Basics => { title => 'Basics',
-                         path => "Admin/Groups/Modify.html?id=". $GroupObj->id
-                       }
-	};
-
-unless ($GroupObj->Pseudo) {
-$subtabs->{'Members'} = { title => 'Members',
-                         path => "Admin/Groups/Members.html?id=".$GroupObj->id };
-}
-</%INIT>
-
-<%ARGS>
-$GroupObj => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/Header b/rt/webrt/Admin/Elements/Header
deleted file mode 100755
index 95acdac7e..000000000
--- a/rt/webrt/Admin/Elements/Header
+++ /dev/null
@@ -1,5 +0,0 @@
-<& /Elements/Header, Title => $Title &>
-
-<%ARGS>
-$Title => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/ListGlobalKeywordSelects b/rt/webrt/Admin/Elements/ListGlobalKeywordSelects
deleted file mode 100644
index b24d68989..000000000
--- a/rt/webrt/Admin/Elements/ListGlobalKeywordSelects
+++ /dev/null
@@ -1,15 +0,0 @@
-% while (my $KeywordSelect = $KeywordSelects->Next()) {
-
-<%$KeywordSelect->Name %>:
-<% $KeywordSelect->Single ? 'Single' : 'Multiple' %>
-children of
-<% $KeywordSelect->KeywordObj->Path %>
-% if ($KeywordSelect->Depth) {
-	  up to <%$KeywordSelect->Depth%> levels deep
-% }
-<BR>
-%} 
-<%INIT>
-my $KeywordSelects = RT::KeywordSelects->new($session{'CurrentUser'});
-$KeywordSelects->LimitToGlobals();
-</%INIT>
diff --git a/rt/webrt/Admin/Elements/ListGlobalScrips b/rt/webrt/Admin/Elements/ListGlobalScrips
deleted file mode 100755
index 2f044bf52..000000000
--- a/rt/webrt/Admin/Elements/ListGlobalScrips
+++ /dev/null
@@ -1,10 +0,0 @@
-%  while (my $scrip = $Scrips->Next ) {
-<% $scrip->ConditionObj->Name %> 
-<% $scrip->ActionObj->Name %> 
-with template <% $scrip->TemplateObj->Name %>
-<BR>
-%   }
-<%init>
-my $Scrips = new RT::Scrips ($session{'CurrentUser'});
-$Scrips->LimitToGlobal();
-</%INIT>
diff --git a/rt/webrt/Admin/Elements/ModifyKeyword b/rt/webrt/Admin/Elements/ModifyKeyword
deleted file mode 100644
index 4b01c3692..000000000
--- a/rt/webrt/Admin/Elements/ModifyKeyword
+++ /dev/null
@@ -1,95 +0,0 @@
-<FORM METHOD="get" ACTION="<%$RT::WebPath%>/Admin/Keywords/Modify.html">
-[<%$title |n %>]<BR>
-
-<INPUT TYPE="hidden" NAME="id" VALUE="<% $id %>">
-Keyword <INPUT NAME="Name" VALUE="<% $Keyword->Name %>"><BR>
-
-Parent <SELECT NAME="Parent">
-	      <OPTION VALUE=""<% defined($Keyword->Parent) ? '' : ' SELECTED' %>>-</OPTION>
-%while ( $parent = $parents->Next ) {
-	      <OPTION VALUE="<% $parent->id %>"<% defined($Keyword->Parent) && $parent->id == $Keyword->Parent ? ' SELECTED' : '' %>><% $parent->Name %></OPTION>
-%}
-</SELECT>
-
-
-Kids <FONT SIZE="-2">(separate by
-<INPUT TYPE="radio" NAME="delim" VALUE="n"<% $delim eq 'n' ? ' CHECKED' : '' %>>
-line or
-<INPUT TYPE="radio" NAME="delim" VALUE="s"<% $delim eq 's' ? ' CHECKED' : '' %>>
-whitespace)</FONT><BR>
-
-<TEXTAREA NAME="Kids" ROWS=4><% $kidstring %></TEXTAREA>
-<BR>
-
-<& /Elements/Submit, Label => $submit &>
-</FORM>
-
-<%INIT>
-
-my $Keyword = new RT::Keyword($session{CurrentUser});
-my ($title, $submit, %kids, $kid);
-
-if ( $Create ) {
-    $title = "Create a new Keyword";
-    $submit = "Create";
-    $id = "new";
-    %kids = ();
-    $Parent = ''; #silence 
-} elsif ( $id eq 'new' ) {
-    $id = $Keyword->Create( Name => $Name, Parent => $Parent )
-      or Abort("can't create keyword Name=>$Name, Parent=>$Parent");
-} else {
-    $Keyword->Load($id) || Abort("Can't load keyword id $id");
-    #foreach my $field ( grep eval "defined(\$$_)", qw( Name Parent )) {
-    #  eval "\$Keyword->Set(\$field=>\$$field); #sigh
-    #}
-    $Keyword->SetName($Name) if defined($Name);
-    $Keyword->SetParent($Parent) if defined($Parent);
-}
-
-$title = "Modify the Keyword <B>". $Keyword->Name. "</B>";
-$submit = "Modify";
-
-my $kids = new RT::Keywords($session{CurrentUser});
-$kids->Limit( FIELD => 'Parent', VALUE => $id, OPERATOR => '=' );
-$kids{$kid->Name} = $kid while $kid = $kids->Next;
-
-if ( defined($Kids) ) {
-    my %newkids;
-    if ( $delim eq 'n' ) {
-	%newkids = map { $_=>1 } split(/\n/, $Kids);
-    } elsif ( $delim eq 's' ) {
-	%newkids = map { $_=>1 } split(' ', $Kids);
-    } else {
-	Abort("'$delim' isn't a valid keyword delimiter.");
-    }
-    foreach ( grep { ! defined($newkids{$_}) } keys %kids ) {
-	$kids{$_}->Delete;
-	delete $kids{$_};
-    }
-    foreach ( grep { ! defined($kids{$_}) } keys %newkids ) {
-	$kids{$_} = new RT::Keyword($session{CurrentUser});
-	$kids{$_}->Create( Name => $_, Parent => $id )
-	  or Abort("can't create keyword Name=>$_, Parent=>$id");
-    }
-
-}
-
-
-my $parent;
-my $parents = new RT::Keywords($session{CurrentUser});
-$parents->UnLimit;
-
-$delim = ( grep /\s/, keys %kids ) ? 'n' : 's';
-my $kidstring = join("\n", keys %kids);
-
-</%INIT>
-
-<%ARGS>
-$id => undef
-$Create => undef
-$Name => undef
-$Parent => undef
-$Kids => undef
-$delim => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/ModifyKeywordSelect b/rt/webrt/Admin/Elements/ModifyKeywordSelect
deleted file mode 100644
index 470e62929..000000000
--- a/rt/webrt/Admin/Elements/ModifyKeywordSelect
+++ /dev/null
@@ -1,120 +0,0 @@
-  <FORM NAME="ModifyKeywordSelect" METHOD=POST ACTION="<%$RT::WebPath%>/Admin/KeywordSelects/Modify.html">
-
-    [<%$title |n %>]
-    <BR>
-      
-      <INPUT TYPE="hidden" NAME="id" VALUE="<% $id %>">
-	Keyword 
-	<SELECT NAME="Parent">
-	  
-%while ( $parent = $parents->Next ) {
-	  
-	  <OPTION VALUE="<% $parent->id %>" <% defined($KeywordSelect->Parent) && $parent->id == $KeywordSelect->Parent ? ' SELECTED' : '' %>><% $parent->Name %></OPTION>
-	  
-% }
-	  
-	</SELECT>
-	<BR>
-	  Object 
-	  <SELECT NAME="ObjectType">
-	    <OPTION SELECTED>Ticket</OPTION>
-	  </SELECT>
-	  <BR>
-	    
-<SCRIPT>
-function addOption(text, value, defaultselected, selected) {
-  var option = new Option(text, value, defaultselected, selected )
-  var length = document.ModifyKeywordSelect.ObjectValue.length;
-  document.ModifyKeywordSelect.ObjectValue.options[length] = option
-}
-function ChangeObjectValue(what) {
-  Value = what.options[what.selectedIndex].value
-  if ( Value == "(none)" ) {
-    document.ModifyKeywordSelect.ObjectValue.options.length = 0
-    addOption("(n/a)", "", false, false)
-  }
-  if ( Value == "Queue" ) {
-    document.ModifyKeywordSelect.ObjectValue.options.length = 0
-%foreach $queue ( keys %queues ) {
-    addOption("<% $queues{$queue} %>", "<% $queue %>", false, <% $queue == $KeywordSelect->ObjectValue ? 'true' : 'false' %> )
-%}
-  }
-}
-</SCRIPT>
-	    
-	    Limit to <SELECT NAME="ObjectField" onChange="ChangeObjectValue(this)">
-	      <OPTION VALUE="" <% $KeywordSelect->ObjectField ? '' : ' SELECTED' %>>(none)</OPTION>
-	      <OPTION VALUE="Queue" <% $KeywordSelect->ObjectField eq 'Queue' ? ' SELECTED' : '' %>>Queue</OPTION>
-	    </SELECT> 
-	    <SELECT NAME="ObjectValue">
-	      <OPTION VALUE="<% $KeywordSelect->ObjectValue %>">
-		<% $KeywordSelect->ObjectField ? $queues{$KeywordSelect->ObjectValue} : "(n/a)" %></OPTION>
-	    </SELECT><BR>
-	      <INPUT TYPE="hidden" NAME="SingleMagic" VALUE="1">
-		<INPUT TYPE="checkbox" NAME="Single" VALUE="1" <% $KeywordSelect->Single ? ' CHECKED' : '' %>>Allow single selection only<BR>
-		    Limit to <INPUT TYPE="text" NAME="Generations" SIZE="2" VALUE="<% $KeywordSelect->Generations %>"> generations (0 = no limit)<BR>
-			<& /Elements/Submit, Label => $submit &>
-
-</FORM>
-
-<%INIT>
-
-
-my $KeywordSelect = new RT::KeywordSelect($session{CurrentUser});
-  
-my($title, $submit);
-  
-if ( $Create ) {
-      $title = "Create a new KeywordSelect";
-      $submit = "Create";
-      $id = "new";
-} else {
-    if  ( $id eq 'new' ) {
-	$id = $KeywordSelect->Create (
-				      Parent      => $Parent,
-				      ObjectType  => $ObjectType,
-				      ObjectField => $ObjectField,
-				      ObjectValue => $ObjectValue,
-				      Single      => $Single,
-				      Generations => $Generations,
-				     ) or Abort "can't create KeywordSelect";
-    } else {
-	$KeywordSelect->Load($id) || Abort("Can't load keyword id $id");
-	#false laziness
-	$KeywordSelect->SetParent($Parent) if defined($Parent);
-	$KeywordSelect->SetObjectType($ObjectType) if defined($ObjectType);
-	$KeywordSelect->SetObjectField($ObjectField) if defined($ObjectField);
-	$KeywordSelect->SetObjectValue($ObjectValue) if defined($ObjectValue);
-	$KeywordSelect->SetSingle($Single) if defined($SingleMagic);
-	$KeywordSelect->SetGenerations($Generations) if defined($Generations);
-    }
-    $title = "Modify the KeywordSelect <B>". $KeywordSelect->KeywordObj->Name. "</B>";
-    $submit = "Modify";
-    
-}
-  
-  my $parents = new RT::Keywords($session{CurrentUser});
-  $parents->UnLimit;
-  my $parent;
-
-my $queues = new RT::Queues($session{CurrentUser});
-$queues->UnLimit;
-
-my %queues;
-my $queue;
-$queues{$queue->id} = $queue->Name while $queue = $queues->Next;
-
-</%INIT>
-
-<%ARGS>
-$id => undef
-$Create => undef
-$Parent => undef
-$ObjectType => undef
-$ObjectField => undef
-$ObjectValue => undef
-$Single => undef
-$SingleMagic => undef
-$Generations => undef
-</%ARGS>
-
diff --git a/rt/webrt/Admin/Elements/ModifyQueue b/rt/webrt/Admin/Elements/ModifyQueue
deleted file mode 100755
index a641c81af..000000000
--- a/rt/webrt/Admin/Elements/ModifyQueue
+++ /dev/null
@@ -1,56 +0,0 @@
-
-<& /Elements/TitleBoxStart, title => 'Editing Configuration for queue '.$QueueObj->Id &>
-
-<FORM ACTION="<%$RT::WebPath%>/Admin/Queues/Modify.html" METHOD=POST>
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$QueueObj->Id%>">
-<TABLE>
-<TR><TD ALIGN=RIGHT>
-Queue Name: 
-</TD>
-<TD><INPUT name="Name" value="<%$QueueObj->Name%>"></TD>
-</TR><TR>
-<TD ALIGN=RIGHT>
-Description:</TD><TD COLSPAN=3><INPUT name="Description" value="<%$QueueObj->Description%>" size=60></TD></TR>
-<TR>
-<TD ALIGN=RIGHT>
-Correspondence Address:
-</TD><TD>
-<INPUT name="CorrespondAddress" value="<%$QueueObj->CorrespondAddress%>">
-</TD>
-<TD ALIGN=RIGHT>
-
-Comment Address: </TD><TD>
-<INPUT NAME="CommentAddress" value="<%$QueueObj->CommentAddress%>">
-</TD>
-</TR><TR>
-
-<TD ALIGN=RIGHT>
-Priority starts at: 
-</TD><TD><INPUT NAME="InitialPriority" value="<%$QueueObj->InitialPriority %>">
-</TD>
-<TD ALIGN=RIGHT>
-Over time, priority moves toward:
-</TD><TD><INPUT NAME="FinalPriority" value="<%$QueueObj->FinalPriority %>">
-</TD>
-</TR>
-<TR>
-<TD ALIGN=RIGHT>
-Requests should be due in:
-</TD><TD>
-<INPUT NAME="DefaultDueIn" VALUE="<%$QueueObj->DefaultDueIn%>"> days.
-</TD>
-</TR>
-</TABLE>
-<& /Elements/Submit &>
-</form>
-<& /Elements/TitleBoxEnd &>
-
-<%INIT>
-
-</%INIT>
-
-<%ARGS>
-
-
-$QueueObj => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/ModifyTemplate b/rt/webrt/Admin/Elements/ModifyTemplate
deleted file mode 100755
index 6e4f8a379..000000000
--- a/rt/webrt/Admin/Elements/ModifyTemplate
+++ /dev/null
@@ -1,78 +0,0 @@
-
-<& /Elements/TitleBoxStart, title => 'Editing Configuration for user '.$UserObj->Name &>
-
-<FORM ACTION="<%$RT::WebPath%>/Admin/ModifyUser.html" METHOD=POST>
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$UserObj->Id%>">
-
-Name: <input name="Name" value="<%$UserObj->Name%>">
-<BR>
-New Password: <input type=password name="Pass1"><BR>
-Retype Password: <input type=password name="Pass2"><BR>
-
-Comments: <TEXTAREA name="Comments" COLS=20 ROWS=5>
-<%$UserObj->Comments%></TEXTAREA>
-
-<BR>
-Signature: <TEXTAREA COLS=80 ROWS=5 name="Signature">
-<%$UserObj->Signature%>"></TEXTAREA>
-<BR>
-EmailAddress: <input name="EmailAddress" value="<%$UserObj->EmailAddress%>">
-<BR>
-FreeformContactInfo: <input name="FreeformContactInfo" value="<%$UserObj->FreeformContactInfo%>">
-<BR>
-Organization: <input name="Organization" value="<%$UserObj->Organization%>">
-<BR>
-RealName: <input name="RealName" value="<%$UserObj->RealName%>">
-<BR>
-NickName: <input name="NickName" value="<%$UserObj->NickName%>">
-<BR>
-Lang: <input name="Lang" value="<%$UserObj->Lang%>">
-<BR>
-EmailEncoding: <input name="EmailEncoding" value="<%$UserObj->EmailEncoding%>">
-<BR>
-WebEncoding: <input name="WebEncoding" value="<%$UserObj->WebEncoding%>">
-<BR>
-ExternalContactInfoId: <input name="ExternalContactInfoId" value="<%$UserObj->ExternalContactInfoId%>">
-<BR>
-ContactInfoSystem: <input name="ContactInfoSystem" value="<%$UserObj->ContactInfoSystem%>">
-<BR>
-Gecos: <input name="Gecos" value="<%$UserObj->Gecos%>">
-<BR>
-ExternalAuthId: <input name="ExternalAuthId" value="<%$UserObj->ExternalAuthId%>">
-<BR>
-AuthSystem: <input name="AuthSystem" value="<%$UserObj->AuthSystem%>">
-<BR>
-HomePhone: <input name="HomePhone" value="<%$UserObj->HomePhone%>">
-<BR>
-WorkPhone: <input name="WorkPhone" value="<%$UserObj->WorkPhone%>">
-<BR>
-MobilePhone: <input name="MobilePhone" value="<%$UserObj->MobilePhone%>">
-<BR>
-PagerPhone: <input name="PagerPhone" value="<%$UserObj->PagerPhone%>">
-<BR>
-Address1: <input name="Address1" value="<%$UserObj->Address1%>">
-<BR>
-Address2: <input name="Address2" value="<%$UserObj->Address2%>">
-<BR>
-City: <input name="City" value="<%$UserObj->City%>">
-<BR>
-State: <input name="State" value="<%$UserObj->State%>">
-<BR>
-Zip: <input name="Zip" value="<%$UserObj->Zip%>">
-<BR>
-Country: <input name="Country" value="<%$UserObj->Country%>">
-<BR>
-
-<input type=submit>
-</form>
-<& /Elements/TitleBoxEnd &>
-
-<%INIT>
-
-</%INIT>
-
-<%ARGS>
-
-
-$UserObj => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/ModifyUser b/rt/webrt/Admin/Elements/ModifyUser
deleted file mode 100755
index 53aa027c0..000000000
--- a/rt/webrt/Admin/Elements/ModifyUser
+++ /dev/null
@@ -1,77 +0,0 @@
-
-<& /Elements/TitleBoxStart, title => 'Editing Configuration for user '.$UserObj->Name &>
-
-<FORM ACTION="<%$RT::WebPath%>/Admin/Users/Modify.html" METHOD=POST>
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$UserObj->Id%>">
-
-Name: <input name="Name" value="<%$UserObj->Name%>">
-<BR>
-New Password: <input type=password name="Pass1"><BR>
-Retype Password: <input type=password name="Pass2"><BR>
-
-Comments: <TEXTAREA name="Comments" COLS=80 ROWS=5 WRAP=VIRTUAL>
-<%$UserObj->Comments%></TEXTAREA>
-
-<BR>
-Signature: <TEXTAREA COLS=80 ROWS=5 name="Signature" WRAP=HARD>
-<%$UserObj->Signature%></TEXTAREA>
-<BR>
-EmailAddress: <input name="EmailAddress" value="<%$UserObj->EmailAddress%>">
-<BR>
-FreeformContactInfo: <input name="FreeformContactInfo" value="<%$UserObj->FreeformContactInfo%>">
-<BR>
-Organization: <input name="Organization" value="<%$UserObj->Organization%>">
-<BR>
-RealName: <input name="RealName" value="<%$UserObj->RealName%>">
-<BR>
-NickName: <input name="NickName" value="<%$UserObj->NickName%>">
-<BR>
-Lang: <input name="Lang" value="<%$UserObj->Lang%>">
-<BR>
-EmailEncoding: <input name="EmailEncoding" value="<%$UserObj->EmailEncoding%>">
-<BR>
-WebEncoding: <input name="WebEncoding" value="<%$UserObj->WebEncoding%>">
-<BR>
-ExternalContactInfoId: <input name="ExternalContactInfoId" value="<%$UserObj->ExternalContactInfoId%>">
-<BR>
-ContactInfoSystem: <input name="ContactInfoSystem" value="<%$UserObj->ContactInfoSystem%>">
-<BR>
-Gecos: <input name="Gecos" value="<%$UserObj->Gecos%>">
-<BR>
-ExternalAuthId: <input name="ExternalAuthId" value="<%$UserObj->ExternalAuthId%>">
-<BR>
-AuthSystem: <input name="AuthSystem" value="<%$UserObj->AuthSystem%>">
-<BR>
-HomePhone: <input name="HomePhone" value="<%$UserObj->HomePhone%>">
-<BR>
-WorkPhone: <input name="WorkPhone" value="<%$UserObj->WorkPhone%>">
-<BR>
-MobilePhone: <input name="MobilePhone" value="<%$UserObj->MobilePhone%>">
-<BR>
-PagerPhone: <input name="PagerPhone" value="<%$UserObj->PagerPhone%>">
-<BR>
-Address1: <input name="Address1" value="<%$UserObj->Address1%>">
-<BR>
-Address2: <input name="Address2" value="<%$UserObj->Address2%>">
-<BR>
-City: <input name="City" value="<%$UserObj->City%>">
-<BR>
-State: <input name="State" value="<%$UserObj->State%>">
-<BR>
-Zip: <input name="Zip" value="<%$UserObj->Zip%>">
-<BR>
-Country: <input name="Country" value="<%$UserObj->Country%>">
-<BR>
-<& /Elements/Submit &>
-</form>
-<& /Elements/TitleBoxEnd &>
-
-<%INIT>
-
-</%INIT>
-
-<%ARGS>
-
-
-$UserObj => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/QueueRightsForUser b/rt/webrt/Admin/Elements/QueueRightsForUser
deleted file mode 100644
index e62a124ce..000000000
--- a/rt/webrt/Admin/Elements/QueueRightsForUser
+++ /dev/null
@@ -1,17 +0,0 @@
-<UL>
-%while(my $ACE = $ACL->Next) {
-
-<LI><checkbox name="delete_ace_<%$ACE->id%>"> <%$ACE->RightName%> (<%$ACE->UserObj->RealName%>)
-
-%}
-</UL>
-
-<%INIT>
-my $ACL = new RT::ACL($session{'CurrentUser'});
-$ACL->LimitToQueue($QueueObj->id);
-$ACL->LimitPrincipalToUser($PrincipalId);
-</%INIT>
-<%ARGS>
-$PrincipalId => undef
-$QueueObj => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/QueueTabs b/rt/webrt/Admin/Elements/QueueTabs
deleted file mode 100755
index b7da7e007..000000000
--- a/rt/webrt/Admin/Elements/QueueTabs
+++ /dev/null
@@ -1,36 +0,0 @@
-<& /Admin/Elements/Tabs, subtabs => $subtabs, current_tab => 'Admin/Queues/' &>
-<hr>
-<%INIT>
-  my $subtabs = {
-		 A => { title => 'Basics',
-  		     	path => "Admin/Queues/Modify.html?id=".$id,
-			   },
-		 B => { title => 'Watchers',
-		 	path => "Admin/Queues/People.html?id=".$id,
-		      },
-
-		 C => { title => 'Scrips',
-			     path => "Admin/Queues/Scrips.html?id=".$id,
-			   },
-		 D => { title => 'Templates',
-				path => "Admin/Queues/Templates.html?id=".$id,
-			      },
-		 E => { title => 'Keyword Selections',
-				path => "Admin/Queues/Keywords.html?id=".$id,
-			},
-		 F => { title => 'Group Rights',
-			  path => "Admin/Queues/GroupRights.html?id=".$id,
-			},	
-		 G => { title => 'User Rights',
-			  path => "Admin/Queues/UserRights.html?id=".$id,
-			},
-
-
-		 
-};
-</%INIT>
-
-  
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectKeywordSelect b/rt/webrt/Admin/Elements/SelectKeywordSelect
deleted file mode 100644
index f5a8d77cd..000000000
--- a/rt/webrt/Admin/Elements/SelectKeywordSelect
+++ /dev/null
@@ -1,22 +0,0 @@
-<input size=10 name="<%$NamePrefix%>-Name" value="<% $KeywordSelect->Name %>">:
-<& /Admin/Elements/SelectSingleOrMultiple, 
-	  Name => $NamePrefix.'-Single',
-	  Default => $KeywordSelect->Single &>
-	  
-children of
-<& /Elements/SelectKeyword, Root => '0', 
-	                    Name => $NamePrefix.'-Keyword',
-                            Default => $KeywordSelect->KeywordObj->Id &>
-	  up to <input name="<%$NamePrefix%>-Depth" size=2 value="<%$KeywordSelect->Depth%>"> levels deep.
-<%INIT>
-unless ($NamePrefix) {
-	$NamePrefix = $KeywordSelect->Id;
-}
-$NamePrefix = "KeywordSelect-$NamePrefix";
-
-</%INIT>
-
-<%ARGS>
-$KeywordSelect => undef
-$NamePrefix => undef
-</%ARGS>
\ No newline at end of file
diff --git a/rt/webrt/Admin/Elements/SelectModifyGroup b/rt/webrt/Admin/Elements/SelectModifyGroup
deleted file mode 100644
index 45d437f41..000000000
--- a/rt/webrt/Admin/Elements/SelectModifyGroup
+++ /dev/null
@@ -1,10 +0,0 @@
-%while ( $Group = $Groups->Next) {
-<A HREF="Modify.html?id=<%$Group->id%>"><%$Group->id%>: <%$Group->Name%></a><BR>
-%}
-<%INIT>
-my ($Group);
-my $Groups = new RT::Groups($session{'CurrentUser'});
-$Groups->UnLimit;
-</%INIT>
-<%ARGS>
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectModifyKeyword b/rt/webrt/Admin/Elements/SelectModifyKeyword
deleted file mode 100644
index 6af223229..000000000
--- a/rt/webrt/Admin/Elements/SelectModifyKeyword
+++ /dev/null
@@ -1,13 +0,0 @@
-%while ( $keyword = $keywords->Next ) {
-<A HREF="/Admin/Keywords/Modify.html?id=<%$keyword->id%>"><%$keyword->id%>: <%$keyword->Name%></a><BR>
-%}
-
-<%INIT>
-
-use RT::Keywords;
-
-my $keyword;
-my $keywords = new RT::Keywords $session{CurrentUser};
-$keywords->UnLimit;
-</%INIT>
-
diff --git a/rt/webrt/Admin/Elements/SelectModifyKeywordSelect b/rt/webrt/Admin/Elements/SelectModifyKeywordSelect
deleted file mode 100644
index c91eb6cfe..000000000
--- a/rt/webrt/Admin/Elements/SelectModifyKeywordSelect
+++ /dev/null
@@ -1,13 +0,0 @@
-%while ( $keywordselect = $keywordselects->Next ) {
-<A HREF="/Admin/KeywordSelects/Modify.html?id=<%$keywordselect->id%>"><%$keywordselect->id%>: ( <%$keywordselect->Parent%>: <%$keywordselect->KeywordObj->Name%> )</a><BR>
-%}
-
-<%INIT>
-
-use RT::KeywordSelects;
-
-my $keywordselect;
-my $keywordselects = new RT::KeywordSelects $session{CurrentUser};
-$keywordselects->UnLimit;
-</%INIT>
-
diff --git a/rt/webrt/Admin/Elements/SelectModifyQueue b/rt/webrt/Admin/Elements/SelectModifyQueue
deleted file mode 100755
index 1c6cd7d5e..000000000
--- a/rt/webrt/Admin/Elements/SelectModifyQueue
+++ /dev/null
@@ -1,10 +0,0 @@
-%while ( $queue = $queues->Next) {
-<A HREF="Modify.html?id=<%$queue->id%>"><%$queue->id%>: <%$queue->Name%></a><BR>
-%}
-<%INIT>
-my ($queue);
-my $queues = new RT::Queues($session{'CurrentUser'});
-$queues->UnLimit;
-</%INIT>
-<%ARGS>
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectModifyUser b/rt/webrt/Admin/Elements/SelectModifyUser
deleted file mode 100755
index da49212e4..000000000
--- a/rt/webrt/Admin/Elements/SelectModifyUser
+++ /dev/null
@@ -1,26 +0,0 @@
-%while ( $user = $users->Next) {
-<A HREF="Modify.html?id=<%$user->id%>"><%$user->id%>: <%$user->Name%></a><BR>
-%}
-<%INIT>
-my ($user);
-my $users = new RT::Users($session{'CurrentUser'});
-$users->Limit(FIELD => 'id',
-              VALUE => $RT::SystemUser->id,
-              OPERATOR => '!=' );
-
-if (defined $IdLike) {
-$users->Limit(FIELD => 'Name',
-              VALUE => $IdLike,
-              OPERATOR => 'LIKE' );
-}
-if (defined $EmailLike) {
-$users->Limit(FIELD => 'EmailAddress',
-              VALUE => $EmailLike,
-              OPERATOR => 'LIKE');
-
-}
-</%INIT>
-<%ARGS>
-$IdLike => undef
-$EmailLike => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectQueueRights b/rt/webrt/Admin/Elements/SelectQueueRights
deleted file mode 100755
index 6861d40c6..000000000
--- a/rt/webrt/Admin/Elements/SelectQueueRights
+++ /dev/null
@@ -1,29 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Admin/Elements/Attic/SelectQueueRights,v 1.1 2002-08-12 06:17:08 ivan Exp $
-
-<SELECT NAME ="<%$Name%>">
-<OPTION VALUE="">-</OPTION>
-%foreach $right (@rights) {
-<OPTION VALUE="<%$right%>" <%($Default eq $right) && 'SELECTED'%>><%$right%></OPTION>
-% }
-</SELECT>
-<%ONCE>
-
-use RT::ACE;
-my $ACE = new RT::ACE($session{'CurrentUser'});
-my %QueueRights = $ACE->QueueRights;
-my %TicketRights = $ACE->TicketRights;
-
-my ($key, $right, @rights);
-
-foreach $key (sort keys %QueueRights) {
-push (@rights, $QueueRights{$key} . " ($key)");
-}
-foreach $key (sort keys %TicketRights) {
-push (@rights, $TicketRights{$key} . " ($key)");
-}
-</%ONCE>
-<%ARGS>
-$Name => undef
-$Default => undef
- 
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectRights b/rt/webrt/Admin/Elements/SelectRights
deleted file mode 100644
index 0ac774985..000000000
--- a/rt/webrt/Admin/Elements/SelectRights
+++ /dev/null
@@ -1,58 +0,0 @@
-<INPUT TYPE=HIDDEN NAME="CheckACL"  VALUE="<%$ACLDesc%>">
-     <TABLE BORDER=0>
-<TR>
-<TD valign=top>
-<h3>New rights</h3> 
-<SELECT SIZE=5  MULTIPLE  NAME="GrantACE-<%$ACLDesc%>">
-% foreach $right (sort keys %Rights) {
-      <OPTION VALUE="<%$right%>"  
-	><%$right%></OPTION>
-% }
-<OPTION VALUE="" SELECTED>(no value)</OPTION>
-</SELECT>
-</TD>
-<TD valign=top> 
-<h3>Current rights</h3>
-<i>(Check box to revoke right)</i> <BR>
-% while (my $right = $ACLObj->Next()) {
-% if ($right->RightName) {
-<input type=checkbox value="<%$right->Id%>" name="RevokeACE"> <%$right->RightName%><br>
-% }
-%  }
-</TD>
-</TR>
-</TABLE>
-<%INIT>
-    my ($right, $ACLDesc, $AppliesTo, %Rights);
-   
-       
-    my $ACLObj = new RT::ACL($session{'CurrentUser'});
-    my $ACE = new RT::ACE($session{'CurrentUser'});
-
-    if ($Scope eq 'Queue') { 
-        $AppliesTo = $QueueObj->Id;
-        $ACLObj->LimitToQueue($AppliesTo);
-        %Rights = $ACE->QueueRights();
-    } 
-    elsif ($Scope eq 'System') {
-        $AppliesTo = 0;
-        $ACLObj->LimitToSystem();
-        %Rights =  ( $ACE->SystemRights , $ACE->QueueRights());
-    }
-
-    if ($PrincipalType eq 'Group') {
-        $ACLObj->LimitPrincipalToGroup($PrincipalObj->Id);
-    } 
-    elsif ($PrincipalType eq 'User') {
-        $ACLObj->LimitPrincipalToUser($PrincipalObj->Id);
-    } 
-    
-    $ACLDesc = "$PrincipalType-".$PrincipalObj->Id."-$Scope-$AppliesTo";
-</%INIT>
-    
-<%ARGS>
-$PrincipalType => undef
-$PrincipalObj => undef
-$Scope => undef
-$QueueObj => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectScrip b/rt/webrt/Admin/Elements/SelectScrip
deleted file mode 100755
index 4ae15d8c3..000000000
--- a/rt/webrt/Admin/Elements/SelectScrip
+++ /dev/null
@@ -1,25 +0,0 @@
-<SELECT NAME=<%$Name%>>
-<OPTION VALUE="" 
-<% $Default eq undef && 'SELECTED' %>
->-</OPTION>
-%while  (my $Scrip = $Scrips->Next) {
-<OPTION VALUE=<%$Scrip->Id%>
-<% $Scrip->Id == $Default && 'SELECTED' %>
-><%$Scrip->Name%>
-</OPTION>
-%}
-</SELECT>
-
-<%INIT>
-my $Scrips = RT::Scrips->new($session{'CurrentUser'});
-$Scrips->UnLimit;
-
-
-
-</%INIT>
-<%ARGS>
-
-$Default => undef
-$Name => 'Scrip'
-
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectScripAction b/rt/webrt/Admin/Elements/SelectScripAction
deleted file mode 100644
index 08a173493..000000000
--- a/rt/webrt/Admin/Elements/SelectScripAction
+++ /dev/null
@@ -1,25 +0,0 @@
-<SELECT NAME=<%$Name%>>
-<OPTION VALUE="" 
-<% $Default eq undef && 'SELECTED' %>
->-</OPTION>
-%while  (my $ScripAction = $ScripActions->Next) {
-<OPTION VALUE=<%$ScripAction->Id%>
-<% $ScripAction->Id == $Default && 'SELECTED' %>
-><%$ScripAction->Name%>
-</OPTION>
-%}
-</SELECT>
-
-<%INIT>
-my $ScripActions = RT::ScripActions->new($session{'CurrentUser'});
-$ScripActions->UnLimit;
-
-
-
-</%INIT>
-<%ARGS>
-
-$Default => undef
-$Name => 'ScripAction'
-
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectScripCondition b/rt/webrt/Admin/Elements/SelectScripCondition
deleted file mode 100644
index 434f0c4ae..000000000
--- a/rt/webrt/Admin/Elements/SelectScripCondition
+++ /dev/null
@@ -1,25 +0,0 @@
-<SELECT NAME=<%$Name%>>
-<OPTION VALUE="" 
-<% $Default eq undef && 'SELECTED' %>
->-</OPTION>
-%while  (my $ScripCondition = $ScripConditions->Next) {
-<OPTION VALUE=<%$ScripCondition->Id%>
-<% $ScripCondition->Id == $Default && 'SELECTED' %>
-><%$ScripCondition->Name%>
-</OPTION>
-%}
-</SELECT>
-
-<%INIT>
-my $ScripConditions = RT::ScripConditions->new($session{'CurrentUser'});
-$ScripConditions->UnLimit;
-
-
-
-</%INIT>
-<%ARGS>
-
-$Default => undef
-$Name => 'ScripCondition'
-
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectSingleOrMultiple b/rt/webrt/Admin/Elements/SelectSingleOrMultiple
deleted file mode 100644
index 307b0211c..000000000
--- a/rt/webrt/Admin/Elements/SelectSingleOrMultiple
+++ /dev/null
@@ -1,20 +0,0 @@
-  <select name="<%$Name%>">
-    <option value="1" <%$SingleDefault%>>Single</option>
-    <option value="0" <%$MultipleDefault%>>Multiple</option>
-  </select>	
-
-
-<%INIT>
-my ($SingleDefault, $MultipleDefault);
-if ($Default == 1) {
-    $SingleDefault = "SELECTED";
-}
-elsif ($Default == 0 ) {
-    $MultipleDefault = "SELECTED";
-}
-
-</%INIT>
-<%ARGS>
-$Name => 'Single'
-$Default => 1
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectTemplate b/rt/webrt/Admin/Elements/SelectTemplate
deleted file mode 100755
index 76550dc4e..000000000
--- a/rt/webrt/Admin/Elements/SelectTemplate
+++ /dev/null
@@ -1,37 +0,0 @@
-<SELECT NAME=<%$Name%>>
-<OPTION VALUE="" 
-<% $Default eq 'none' && 'SELECTED' %>
->-</OPTION>
-%while  (my $Template = $PrimaryTemplates->Next) {
-<OPTION VALUE=<%$Template->Id%>
-<% ($Template->Id == $Default) && 'SELECTED' %>
-><%$Template->Name%>
-</OPTION>
-%}
-%while  (my $Template = $OtherTemplates->Next) {
-<OPTION VALUE=<%$Template->Id%>
-<% ($Template->Id == $Default)  && 'SELECTED'%>
->Global template: <%$Template->Name%>
-</OPTION>
-%}
-</SELECT>
-
-<%INIT>
-
-
-my $PrimaryTemplates = RT::Templates->new($session{'CurrentUser'});
-if ($DefaultQueue != 0) {
-$PrimaryTemplates->LimitToQueue($DefaultQueue);
-}
-
-my $OtherTemplates = RT::Templates->new($session{'CurrentUser'});
-$OtherTemplates->LimitToGlobal($DefaultQueue);
-
-</%INIT>
-<%ARGS>
-
-$Default => 'none'
-$DefaultQueue => undef
-$Name => 'Template'
-
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SelectUsers b/rt/webrt/Admin/Elements/SelectUsers
deleted file mode 100644
index af51c60f9..000000000
--- a/rt/webrt/Admin/Elements/SelectUsers
+++ /dev/null
@@ -1,17 +0,0 @@
-<SELECT MULTIPLE NAME="<%$Name%>"  SIZE=10>
-%while (my $user = $users->Next) {
-<OPTION VALUE="<%$user->id%>"><%$user->Name%>
-%}
-</SELECT>
-
-<%INIT>
-my $users = new RT::Users($session{'CurrentUser'});
-
-$users->Limit(FIELD => 'id', VALUE => $RT::SystemUser->id, OPERATOR => '!=' );
-$users->Limit(FIELD => 'id', VALUE => $RT::Nobody->id, OPERATOR => '!=' );
-$users->LimitToPrivileged();
-
-</%INIT>
-<%ARGS>
-$Name => 'Users'
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/SystemTabs b/rt/webrt/Admin/Elements/SystemTabs
deleted file mode 100755
index f8b23128b..000000000
--- a/rt/webrt/Admin/Elements/SystemTabs
+++ /dev/null
@@ -1,31 +0,0 @@
-<& /Admin/Elements/Tabs, subtabs => $subtabs, current_tab => 'Admin/Global/', current_subtab => $current_subtab &>
-<hr>
-<%INIT>
-  my $subtabs = {
-		
-	       A => { title => 'Scrips',
-			   path => 'Admin/Global/Scrips.html',
-			 },
-	       Ba => { title => 'Keyword Selections',		
-			        path => 'Admin/Global/Keywords.html',
-		      },
-
-	       B => { title => 'Templates',
-			path => 'Admin/Global/Templates.html',
-		      },
-	        C => { title => 'Group Rights',
-			        path => 'Admin/Global/GroupRights.html',
-		      },
-	        D => { title => 'User Rights',
-			        path => 'Admin/Global/UserRights.html',
-		      }
-
-
-};
-</%INIT>
-
-  
-<%ARGS>
-$id => undef
-$current_subtab => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/Tabs b/rt/webrt/Admin/Elements/Tabs
deleted file mode 100755
index ee6d82b58..000000000
--- a/rt/webrt/Admin/Elements/Tabs
+++ /dev/null
@@ -1,31 +0,0 @@
-<& /Elements/Tabs, tabs => $tabs, subtabs => $subtabs, current_toptab => 'Admin/', current_tab => $current_tab, current_subtab => $current_subtab&>
-
-<hr>
-  
-<%INIT>
-  my $tabs = { Users => { title => 'Users',
-			  path => 'Admin/Users/',
-			},
-	       Groups => { title => 'Groups',
-			   path => 'Admin/Groups/',
-			 },
-	       Queues => { title => 'Queues',
-			   path => 'Admin/Queues/',
-			 },
-	       System => { 'title' => 'Global',
-			   path => 'Admin/Global/',
-			 },
-               Keywords => { title => 'Keywords',
-                                   path => 'Admin/Keywords/',
-                                 },
-
-	       
-	     };
-</%INIT>
-
-
-<%ARGS>
-$subtabs => undef
-$current_tab => undef
-$current_subtab => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Elements/UserTabs b/rt/webrt/Admin/Elements/UserTabs
deleted file mode 100755
index bbf17314d..000000000
--- a/rt/webrt/Admin/Elements/UserTabs
+++ /dev/null
@@ -1,21 +0,0 @@
-<& /Admin/Elements/Tabs, subtabs => $subtabs,
-			 current_tab => 'Admin/Users/', 
-                         current_subtab => $current_subtab &>
-<hr>
-<%INIT>
-my $subtabs = {
-	       Queues => { title => 'Basics',
-			   path => "Admin/Users/Modify.html?id=".$id
-			 },
-#	       Scrips => { title => 'Rights',
-#			   path => "Admin/Users/Rights.html?id=".$id
-#			 }
-	       
-	      };
-</%INIT>
-  
-  
-<%ARGS>
-$id => undef
-$current_subtab => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Global/GroupRights.html b/rt/webrt/Admin/Global/GroupRights.html
deleted file mode 100755
index 26b7e1fe2..000000000
--- a/rt/webrt/Admin/Global/GroupRights.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Modify System ACLS' &>
-<& /Admin/Elements/SystemTabs &>
-  
-<& /Elements/ListActions, actions => \@results &>
-  <FORM METHOD=POST action="GroupRights.html">
-      
-
-
-<h2>Modify global rights for groups</h2>
-
-<TABLE>
-<TR><TD>Pseudogroups</TD></TR>
-% while (my $GroupObj = $PseudoGroups->Next()) {
-	      
-	      <TR ALIGN=RIGHT> 
-		<TD VALIGN=TOP>
-		  <% $GroupObj->Name %>
-		</TD>
-		<TD>
-	    <& /Admin/Elements/SelectRights, PrincipalObj => $GroupObj, 
-                                   PrincipalType => 'Group',
-                                   Scope => 'System' &>
-		</TD>
-	      </TR>
-	
-% }
-
-<TR><TD>Groups</TD></TR>
-
-% while (my $GroupObj = $Groups->Next()) {
-	      
-	      <TR ALIGN=RIGHT> 
-		<TD VALIGN=TOP>
-		  <% $GroupObj->Name %>
-		</TD>
-		<TD>
-	    <& /Admin/Elements/SelectRights, PrincipalObj => $GroupObj, 
-                                   PrincipalType => 'Group',
-                                   Scope => 'System' &>
-		</TD>
-	      </TR>
-	
-% }
-	
-      </TABLE>
-    <& /Elements/Submit, Caption => "Be sure to save your changes", Reset => 1 &>
-  </FORM>
-  
-  <%INIT>
- 
-   #Update the acls.
- my @results =  ProcessACLChanges(\@CheckACL, \%ARGS);
-
-        
-    # {{{ do basic initialization.
-    
-  
-  
-  # Find out which groups we want to display ACL selects for.
-  my $Groups = new RT::Groups($session{'CurrentUser'});
-  #TODO: limit this to non-pseudogroups
-  $Groups->LimitToReal();
-
-
-  my $PseudoGroups = new RT::Groups($session{'CurrentUser'});
-  #TODO: limit this to non-pseudogroups
-  $PseudoGroups->LimitToPseudo;
-
-  # }}}
-    
-  
-
-  
-  </%INIT>
-
-<%ARGS>
-@CheckACL => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Global/Keywords.html b/rt/webrt/Admin/Global/Keywords.html
deleted file mode 100644
index bf7bbd266..000000000
--- a/rt/webrt/Admin/Global/Keywords.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Edit keywords' &>
-<& /Admin/Elements/SystemTabs &>
-<& /Elements/ListActions, actions => \@actions &>
-
-<& /Elements/TitleBoxStart, title => $description &>
-  
-  <FORM METHOD=POST ACTION="Keywords.html">
-
-% if ($KeywordSelects->Count > 0 ) {
-<TABLE>
-<TR><TD>Delete</TD></TR>
-%  while (my $keywordselect = $KeywordSelects->Next ) {
-<TR>
-  <TD><INPUT TYPE="CHECKBOX" NAME="KeywordSelect-<%$keywordselect->Id%>-Delete"></TD>
-  <TD><& /Admin/Elements/SelectKeywordSelect, KeywordSelect => $keywordselect &></TD>
-</TR>
-%  }
-</TABLE>
-% }
-
-Add a global keyword selection:
-%my $ks = new RT::KeywordSelect($session{'CurrentUser'});
-<ul>
-<li><& /Admin/Elements/SelectKeywordSelect, KeywordSelect => $ks, NamePrefix => 'new' &></li>
-</ul>
-
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit &>
-</FORM>
-
-
-
-<%init>
-my (@actions);
-
-my $description = "Modify global Keyword selections";
-
-my $KeywordSelects = new RT::KeywordSelects ($session{'CurrentUser'});
-
-unless ($KeywordSelects->LimitToGlobals()) {
-    Abort("Couldn't load KeywordSelects.");
-}
-
-
-# {{{ if we're trying to create a new keyword select
-
-if ($ARGS{'KeywordSelect-new-Name'}) {
-    my $NewKeywordSelect = new RT::KeywordSelect($session{'CurrentUser'});
-    
-    my ($retval, $msg) = $NewKeywordSelect->Create ( Keyword => $ARGS{'KeywordSelect-new-Keyword'},
-					     ObjectField => 'Queue',
-					     ObjectType => 'Ticket',
-					     ObjectValue => 0,
-					     Name => $ARGS{'KeywordSelect-new-Name'},
-					     Single => $ARGS{'KeywordSelect-new-Single'},
-					     Depth => $ARGS{'KeywordSelect-new-Depth'}
-					   );
-	push (@actions, $msg);
-}
-# }}}
-
-# {{{ if we're trying to delete the keywordselect
-foreach my $key (keys %ARGS) {
-    if ($key =~ /^KeywordSelect-(\d+)-Delete$/) {
-	my $id = $1;
-	my $keywordselect = new RT::KeywordSelect($session{'CurrentUser'});
-	$keywordselect->Load($id) || push @actions, "Couldn't load keywordSelect";
-	my ($val, $msg) = $keywordselect->SetDisabled(1);
-	if ($val) {
-	    push @actions, 'KeywordSelect disabled.';
-	}	
-	else {
-	    push @actions, $msg;
-	}	
-    }
-}
-# }}}
-# {{{ if we're modifying keyword selects
-my @fields = qw(Name Keyword Single Depth);
-
-while (my $ks = $KeywordSelects->Next) {
-    foreach my $field (@fields) {
-	if (defined ($ARGS{"KeywordSelect-".$ks->Id."-".$field}) &&
-	    ($ARGS{"KeywordSelect-".$ks->Id."-".$field} ne $ks->$field())) {
-	    
-	    my $method = "Set$field";
-	    my ($val, $msg) = $ks->$method($ARGS{"KeywordSelect-".$ks->Id."-".$field});
-	    push @actions, "Keyword Select ". $ks->Name."/$field:".$msg;
-	}	
-    }
-}
-# }}}
-
-</%init>
-
-<%ARGS>
-</%ARGS>
diff --git a/rt/webrt/Admin/Global/Scrips.html b/rt/webrt/Admin/Global/Scrips.html
deleted file mode 100755
index e55f8b3de..000000000
--- a/rt/webrt/Admin/Global/Scrips.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Edit scrips' &>
-<& /Admin/Elements/SystemTabs &>
-
-<& /Elements/ListActions, actions => \@actions &>
-
-<& /Elements/TitleBoxStart, title => "Modify global scrips" &>
-  
-  <FORM METHOD=POST ACTION="Scrips.html">
-
-% if ($Scrips->Count > 0 ) {
-<TABLE>
-<TR>
-<TD>Delete
-</TD>
-<TD>
-</TR>
-
-%   while (my $scrip = $Scrips->Next ) {
-<TR>
-<TD>
-<INPUT TYPE="CHECKBOX" NAME="DeleteScrip-<%$scrip->Id%>">
-</TD>
-<TD>
-<% $scrip->ConditionObj->Name %> 
-<% $scrip->ActionObj->Name %> 
-with template <% $scrip->TemplateObj->Name %>
-</TD>
-</TR>
-%   }
-
-</TABLE>
-
-% }
-Add a scrip which will apply to all queues:
-<ul>
-<li>Condition: <& /Admin/Elements/SelectScripCondition, Name => 'NewScripCondition' &>
-	  Action: <& /Admin/Elements/SelectScripAction, Name => 'NewScripAction' &>
-	  Template: <& /Admin/Elements/SelectTemplate, Name => 'NewScripTemplate' &>
-
-</ul>
-
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit &>
-</FORM>
-<%init>
-my (@actions, $description);
-
-my $Scrips = new RT::Scrips ($session{'CurrentUser'});
-$Scrips->LimitToGlobal();
-
-
-
-
-if ($NewScripAction and $NewScripCondition) {
-    my $NewScrip = new RT::Scrip($session{'CurrentUser'});
-    
-    my ($retval, $msg) = $NewScrip->Create ( ScripAction => $NewScripAction,
-				     ScripCondition => $NewScripCondition,
-				     Stage => 'TransactionCreate',
-				     Queue => 0,
-				     Template => $NewScripTemplate);
-    if (defined $retval) {
-        push @actions, $msg;
-    }
-    else {
-        push @actions, $msg;
-    }
-}
-
-# {{{ deal with modifying and deleting existing scrips
-my ($key );
-foreach $key (keys %ARGS) {
-  # {{{ if we're trying to delete the scrip
-  if ($key =~ /^DeleteScrip-(\d+)/) {
-    my $id = $1;
-    my $scrip = new RT::Scrip($session{'CurrentUser'});
-    $scrip->Load($id);
-    my ($retval, $msg) = $scrip->Delete;
-    if ($retval) {
-      push @actions, "Scrip deleted";
-    }
-    else {
-      push @actions, $msg;
-    }
-  }
-  # }}}
-}
-# }}}
-</%init>
-
-<%ARGS>
-$NewScripCondition => undef
-$NewScripAction => undef
-$NewScripTemplate => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Global/Template.html b/rt/webrt/Admin/Global/Template.html
deleted file mode 100755
index 856d2ee8f..000000000
--- a/rt/webrt/Admin/Global/Template.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<& /Admin/Elements/Header, title => "Modify template ".$TemplateObj->id&>
-<& /Admin/Elements/SystemTabs &>
-<& /Elements/ListActions, actions => \@results &>
-
-<& /Elements/TitleBoxStart, title => $title &>
-
-<FORM METHOD=POST ACTION="Template.html">
-%if ($create ) {
-<INPUT TYPE=HIDDEN NAME=template VALUE="new">
-% } else {
-<INPUT TYPE=HIDDEN NAME=template VALUE="<%$TemplateObj->Id%>">
-% }
-
-%# hang onto the queue id
-<INPUT TYPE=HIDDEN name="Queue" value="<%$Queue%>">
-
-
-Name: <input name="Name" VALUE="<%$TemplateObj->Name%>" SIZE=20><BR>
-Description: <input name="Description" VALUE="<%$TemplateObj->Description%>" SIZE=80><BR>
-
-<TEXTAREA NAME=Content ROWS=25 COLS=80 WRAP=SOFT>
-<%$TemplateObj->Content%></TEXTAREA>
-
-<& /Elements/TitleBoxEnd&>
-<&/Elements/Submit&>
-</FORM>
-
-
-
-<%INIT>
-
-my $TemplateObj = new RT::Template($session{'CurrentUser'});
-my  ($title, @results);
-
-if ($create) {
-  $title = "Create a template";
-}
-
-else {
-  if ($template eq 'new') {
-      my ($val, $msg) =  $TemplateObj->Create(Queue => $Queue, Name => $Name);
-      Abort("Could not create template: $msg") unless ($val);
-     push @results, $msg;
-     $title = 'Created template ' . $TemplateObj->Name(); 
-    }
-    else {
-       $TemplateObj->Load($template) || Abort('No Template');
-      $title = 'Editing template ' . $TemplateObj->Name(); 
-    }
-  
-    
-}
-if ($TemplateObj->Id()) {
-  my @attribs = qw( Description Content Queue Name);
-  my @aresults = UpdateRecordObject( AttributesRef => \@attribs, 
-				     Object => $TemplateObj, 
-				     ARGSRef => \%ARGS);
-  push @results, @aresults;
-}
-</%INIT>
-<%ARGS>
-$Queue => undef
-$template => undef
-$create => undef
-$Name => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Global/Templates.html b/rt/webrt/Admin/Global/Templates.html
deleted file mode 100755
index cf388e521..000000000
--- a/rt/webrt/Admin/Global/Templates.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Edit system templates' &>
-<& /Admin/Elements/SystemTabs &>
-
-<& /Elements/TitleBoxStart, title => 'Edit system templates' &>
-<UL>
-<LI><A href="Template.html?create=1&Queue=0">Create a new template</A><BR><BR>
-
-
-%while  (my $TemplateObj = $Templates->Next) { 
-
-<LI><A HREF="Template.html?template=<%$TemplateObj->id()%>"><%$TemplateObj->id()%>/<%$TemplateObj->Name%>: <%$TemplateObj->Description%></a><BR>
-
-%}
-
-<& /Elements/TitleBoxEnd &>
-<%INIT>
-
-my $Templates = RT::Templates->new($session{'CurrentUser'});
-$Templates->LimitToGlobal();
-
-</%INIT>
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Global/UserRights.html b/rt/webrt/Admin/Global/UserRights.html
deleted file mode 100755
index 351f4b8c6..000000000
--- a/rt/webrt/Admin/Global/UserRights.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Modify System ACLS' &>
-<& /Admin/Elements/SystemTabs &>
-  
-<& /Elements/ListActions, actions => \@results &>
-  <FORM METHOD=POST action="UserRights.html">
-      
-
-<h2>Modify global rights for users</h2>
-<TABLE>
-%	while (my $UserObj = $Users->Next()) {
-  <TR ALIGN=RIGHT> 
-	<TD VALIGN=TOP>
-	  <A HREF="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$UserObj->id%>"><% $UserObj->Name %></A>
-	</TD>
-	<TD>
-	  <& /Admin/Elements/SelectRights, PrincipalObj => $UserObj, 
-	      PrincipalType => 'User',
-	      Scope => 'System' &>
-	  
-	</TD>
-      </TR>
-	
-% }
-    </TABLE>
-    
-    <& /Elements/Submit, Caption => "Be sure to save your changes", Reset => 1 &>
-  </FORM>
-  
-<%INIT>
- 
- my @results =  ProcessACLChanges(\@CheckACL, \%ARGS);
-
- # Find out which users we want to display ACL selects for
- my $Users = new RT::Users($session{'CurrentUser'});
-
- $Users->LimitToPrivileged();
-  
-</%INIT>
-
-<%ARGS>
-@CheckACL => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Global/index.html b/rt/webrt/Admin/Global/index.html
deleted file mode 100755
index 5907ed1e8..000000000
--- a/rt/webrt/Admin/Global/index.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Admin/Global configuration' &>
-<& /Admin/Elements/SystemTabs &>
diff --git a/rt/webrt/Admin/Groups/Members.html b/rt/webrt/Admin/Groups/Members.html
deleted file mode 100644
index 4b0e0d04f..000000000
--- a/rt/webrt/Admin/Groups/Members.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<& /Admin/Elements/Header, Title => "RT/Admin/Edit the group ". $Group->Name &>
-<& /Admin/Elements/GroupTabs, GroupObj => $Group &>
-<& /Elements/ListActions, actions => \@results &>
-
-
-<& /Elements/TitleBoxStart, title => 'Editing membership for group '.$Group->Name &>
-
-<FORM ACTION="<%$RT::WebPath%>/Admin/Groups/Members.html" METHOD=POST>
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Group->Id%>">
-<TABLE WIDTH="100%">
-<TR>
-<TD>
-Add members
-</TD>
-<TD>
-Current members
-</TD>
-</TR>
-
-<TR>
-<TD VALIGN=TOP>
-<& /Admin/Elements/SelectUsers, Name => "AddMembers" &>
-</TD>
-<TD VALIGN=TOP>
-% if ($Group->MembersObj->Count == 0 ) {
-<i>(No members)</i>
-% } else {
-(Check box to delete group member)
-<UL>
-% while (my $member = $Group->MembersObj->Next()) {
-<LI><INPUT TYPE=CHECKBOX Name="DeleteMember-<%$member->UserObj->id%>">
-<%$member->UserObj->Name%> (<%$member->UserObj->RealName%>)
-% }
-% }
-</UL>
-</TD>
-</TR>
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit &>
-</form>
-
-
-<%INIT>
-
-my $Group = new RT::Group($session{'CurrentUser'});
-$Group->Load($id) || Abort('Could not load group');
-
-my (@results);
-
-my $key;
-foreach $key (keys %ARGS) {
-
-if ($key =~ /^DeleteMember-(\d+)$/) {
-    my $id = $1; 
-    my ($val,$msg) = $Group->DeleteMember($id);
-    push (@results, $msg);
-}
-}
-
-# Make sure AddMembers is always an array
-my @AddMembers = (ref $AddMembers eq 'ARRAY') ? @{$AddMembers} : ($AddMembers);
-
-foreach my $member (@AddMembers) {
-    next unless ($member);
-    my ($val, $msg) = $Group->AddMember($member);
-    push (@results, $msg);
-}
-
-
-</%INIT>
-
-<%ARGS>
-$AddMembers => undef
-$id => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Groups/Modify.html b/rt/webrt/Admin/Groups/Modify.html
deleted file mode 100644
index 7104a6937..000000000
--- a/rt/webrt/Admin/Groups/Modify.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<& /Admin/Elements/Header, Title => $title &>
-
-<& /Admin/Elements/GroupTabs, GroupObj => $Group &>
-<& /Elements/ListActions, actions => \@results &>
-
-
-<& /Elements/TitleBoxStart, title => $title &>
-
-<FORM ACTION="<%$RT::WebPath%>/Admin/Groups/Modify.html" METHOD=POST>
-
-%unless ($Group->Id) {
-<INPUT TYPE=HIDDEN NAME=id VALUE="new">
-% } else {
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Group->Id%>">
-% }
-<TABLE>
-<TR><TD ALIGN=RIGHT>
-Name: 
-</TD>
-<TD><INPUT name="Name" value="<%$Group->Name%>"></TD>
-</TR><TR>
-<TD ALIGN=RIGHT>
-Description:</TD><TD COLSPAN=3><INPUT name="Description" value="<%$Group->Description%>" size=60></TD></TR>
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-
-<& /Elements/Submit &>
-</form>
-<%INIT>
-
-my ($title);
-my (@results);
-
-my $Group = new RT::Group($session{'CurrentUser'});
-
-if ($Create) {
-    $title = "Create a new group";
-} 
-
-else {
-    
-    if ($id eq 'new' ) {
-	
-	$Group->Create(Name => "$Name") || Abort ("Group could not be created.");
-	$id = $Group->Id;
-    }
-    else {
-	$Group->Load($id) || Abort('Could not load group');
-    }
-
-
-    if ($id) {
-	$title = "Modify the group ". $Group->Name;
-
-    }	
-
-    # If the create failed
-    else {
-	$title = "Create a new group";
-	$Create = 1;
-    }    
-    
-}
-
-if ($id) {
-    
-    my @fields = qw(Description Name );
-    my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
-					    Object => $Group,
-					    ARGSRef => \%ARGS );
-    push (@results,@fieldresults);
-}
-
-
-</%INIT>
-
-
-<%ARGS>
-$Create => undef
-$Name => undef
-$Description => undef
-$id => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Groups/Rights.html b/rt/webrt/Admin/Groups/Rights.html
deleted file mode 100644
index 5c842a301..000000000
--- a/rt/webrt/Admin/Groups/Rights.html
+++ /dev/null
@@ -1 +0,0 @@
-Not yet implemented....
diff --git a/rt/webrt/Admin/Groups/index.html b/rt/webrt/Admin/Groups/index.html
deleted file mode 100644
index d419e7f73..000000000
--- a/rt/webrt/Admin/Groups/index.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<& /Admin/Elements/Header, Title => 'Admin/Groups' &>
-<& /Admin/Elements/Tabs, current_tab => 'Admin/Groups/' &>
-
-<& /Elements/TitleBoxStart, title => 'Select a group' &>
-
-Pseudogroups:<BR>
-<UL>
-%while ( $Group = $PseudoGroups->Next) {
-<LI><A HREF="Modify.html?id=<%$Group->id%>"><%$Group->Name%></a><BR>
-%}
-
-</UL>
-
-Groups:<BR>
-<UL>
-<LI><A HREF="Modify.html?Create=1">Create a new group</A><BR><BR></LI>
-%while ( $Group = $Groups->Next) {
-<LI><A HREF="Modify.html?id=<%$Group->id%>"><%$Group->Name%></a><BR>
-%}
-</UL>
-
-<& /Elements/TitleBoxEnd &>
-<%INIT>
-my ($Group);
-my $PseudoGroups = new RT::Groups($session{'CurrentUser'});
-$PseudoGroups->LimitToPseudo;
-my $Groups = new RT::Groups($session{'CurrentUser'});
-$Groups->LimitToReal;
-
-</%INIT>
-<%ARGS>
-</%ARGS>
diff --git a/rt/webrt/Admin/KeywordSelects/Modify.html b/rt/webrt/Admin/KeywordSelects/Modify.html
deleted file mode 100644
index e753c6622..000000000
--- a/rt/webrt/Admin/KeywordSelects/Modify.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Admin KeywordSelects' &>
-<& /Admin/Elements/Tabs &>
-
-<& /Admin/Elements/ModifyKeywordSelect, Create=>$Create, id=>$id, Parent=>$Parent, ObjectType=>$ObjectType, ObjectField=>$ObjectField, ObjectValue=>$ObjectValue, Single=>$Single, SingleMagic=>$SingleMagic, Generations=>$Generations &>
-
-<%ARGS>
-$Create => undef
-$id => undef
-$Parent => undef
-$ObjectType => undef
-$ObjectField => undef
-$ObjectValue => undef
-$Single => undef
-$SingleMagic => undef
-$Generations => undef
-</%ARGS>
- 
diff --git a/rt/webrt/Admin/KeywordSelects/index.html b/rt/webrt/Admin/KeywordSelects/index.html
deleted file mode 100644
index ba3da9f0c..000000000
--- a/rt/webrt/Admin/KeywordSelects/index.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Admin KeywordSelects' &>
-<& /Admin/Elements/Tabs, current_tab => 'Admin/KeywordSelects/' &>
-
-A <B>KeywordSelect</B> is a link between a <B>Keyword</B> and a object
-(currently just <B>Tickets</B>), titled by the <I>Name</I> field of the Keyword such that:
-<ul>
-<li>Object display will contain a field, titled with the <I>Name</I> field of
-the <B>Keyword</B> and showing any descendent keywords.
-<li>Object creation for this field will contain a field, titled with the
-<I>Name</I> field of the <B>Keyword</B> and containing the descendents of
-the <B>Keyword</B> as choices.
-<li>Searches for this object type will contain a selection field titled with
-the <I>Name</I> field of the <B>Keyword</B> and containing the descendents
-of the <B>Keyword</B> as choices.
-<TABLE WIDTH=100%>
-
-
-
-  <TD VALIGN=TOP>
-    <h2>Create KeywordSelect</h2>
-  <FORM NAME="ModifyKeywordSelect" METHOD="POST" ACTION="<%$RT::WebPath%>/Admin/KeywordSelects/Modify.html">
-    [<%$title |n %>]
-    <BR>
-      
-      <INPUT TYPE="hidden" NAME="id" VALUE="<% $id %>">
-	Keyword 
-	<SELECT NAME="Parent">
-	  
-%while ( $parent = $parents->Next ) {
-	  
-	  <OPTION VALUE="<% $parent->id %>" <% defined($KeywordSelect->Parent) && $parent->id == $KeywordSelect->Parent ? ' SELECTED' : '' %>><% $parent->Name %></OPTION>
-	  
-% }
-	  
-	</SELECT>
-	<BR>
-	  Object 
-	  <SELECT NAME="ObjectType">
-	    <OPTION SELECTED>Ticket</OPTION>
-	  </SELECT>
-	  <BR>
-	    
-%foreach $queue ( keys %queues ) {
-    addOption("<% $queues{$queue} %>", "<% $queue %>", false, <% $queue == $KeywordSelect->ObjectValue ? 'true' : 'false' %> )
-%}
-  }
-}
-</SCRIPT>
-	    
-	    Limit to <SELECT NAME="ObjectField" onChange="ChangeObjectValue(this)">
-	      <OPTION VALUE="" <% $KeywordSelect->ObjectField ? '' : ' SELECTED' %>>(none)</OPTION>
-	      <OPTION VALUE="Queue" <% $KeywordSelect->ObjectField eq 'Queue' ? ' SELECTED' : '' %>>Queue</OPTION>
-	    </SELECT> 
-	    <SELECT NAME="ObjectValue">
-	      <OPTION VALUE="<% $KeywordSelect->ObjectValue %>">
-		<% $KeywordSelect->ObjectField ? $queues{$KeywordSelect->ObjectValue} : "(n/a)" %></OPTION>
-	    </SELECT><BR>
-	      <INPUT TYPE="hidden" NAME="SingleMagic" VALUE="1">
-		<INPUT TYPE="checkbox" NAME="Single" VALUE="1" <% $KeywordSelect->Single ? ' CHECKED' : '' %>>Allow single selection only<BR>
-		    Limit to <INPUT TYPE="text" NAME="Generations" SIZE="2" VALUE="<% $KeywordSelect->Generations %>"> generations (0 = no limit)<BR>
-			<& /Elements/Submit, Label => $submit &>
-
-</FORM>
-
-<%INIT>
-
-
-my $KeywordSelect = new RT::KeywordSelect($session{CurrentUser});
-  
-my($title, $submit);
-  
-if ( $Create ) {
-      $title = "Create a new KeywordSelect";
-      $submit = "Create";
-      $id = "new";
-} else {
-    if  ( $id eq 'new' ) {
-	$id = $KeywordSelect->Create (
-				      Parent      => $Parent,
-				      ObjectType  => $ObjectType,
-				      ObjectField => $ObjectField,
-				      ObjectValue => $ObjectValue,
-				      Single      => $Single,
-				      Generations => $Generations,
-				     ) or Abort "can't create KeywordSelect";
-    } else {
-	$KeywordSelect->Load($id) || Abort("Can't load keyword id $id");
-	#false laziness
-	$KeywordSelect->SetParent($Parent) if defined($Parent);
-	$KeywordSelect->SetObjectType($ObjectType) if defined($ObjectType);
-	$KeywordSelect->SetObjectField($ObjectField) if defined($ObjectField);
-	$KeywordSelect->SetObjectValue($ObjectValue) if defined($ObjectValue);
-	$KeywordSelect->SetSingle($Single) if defined($SingleMagic);
-	$KeywordSelect->SetGenerations($Generations) if defined($Generations);
-    }
-    $title = "Modify the KeywordSelect <B>". $KeywordSelect->KeywordObj->Name. "</B>";
-    $submit = "Modify";
-    
-}
-  
-  my $parents = new RT::Keywords($session{CurrentUser});
-  $parents->UnLimit;
-  my $parent;
-
-my $queues = new RT::Queues($session{CurrentUser});
-$queues->UnLimit;
-
-my %queues;
-my $queue;
-$queues{$queue->id} = $queue->Name while $queue = $queues->Next;
-
-</%INIT>
-
-<%ARGS>
-$id => undef
-$Create => undef
-$Parent => undef
-$ObjectType => undef
-$ObjectField => undef
-$ObjectValue => undef
-$Single => undef
-$SingleMagic => undef
-$Generations => undef
-</%ARGS>
-
-
-    <& /Admin/Elements/ModifyKeywordSelect, 'Create'=>'1' &>
-  </TD>
-
-  <TD VALIGN=TOP>
-    <H2>Modify KeywordSelect</H2>
-
-    <& /Admin/Elements/SelectModifyKeywordSelect &>
-  </TD>
-</TR>
-
-</TABLE>
diff --git a/rt/webrt/Admin/Keywords/Modify.html b/rt/webrt/Admin/Keywords/Modify.html
deleted file mode 100644
index bb7e2db8c..000000000
--- a/rt/webrt/Admin/Keywords/Modify.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/Tabs &>
-
-
-<& /Elements/TitleBoxStart, title => %$title  &>
-<FORM METHOD="POST" ACTION="<%$RT::WebPath%>/Admin/Keywords/Modify.html">
-<INPUT TYPE="hidden" NAME="id" VALUE="<% $id %>">
-Keyword <INPUT NAME="Name" VALUE="<% $Keyword->Name %>"><BR>
-
-Parent <SELECT NAME="Parent">
-	      <OPTION VALUE=""<% defined($Keyword->Parent) ? '' : ' SELECTED' %>>-</OPTION>
-%while ( $parent = $parents->Next ) {
-	      <OPTION VALUE="<% $parent->id %>"<% defined($Keyword->Parent) && $parent->id == $Keyword->Parent ? ' SELECTED' : '' %>><% $parent->Name %></OPTION>
-%}
-</SELECT>
-
-
-New children of this keyword. one per line.
-<TEXTAREA NAME="Kids" ROWS=4><% $kidstring %></TEXTAREA>
-<BR>
-
-<& /Elements/Submit, Label => $submit &>
-</FORM>
-<& /Elements/TitleBoxEnd &>
-
-<%INIT>
-
-my $Keyword = new RT::Keyword($session{CurrentUser});
-my ($title, $submit, %kids, $kid);
-
-if ( $Create ) {
-    $title = "Create a new Keyword";
-    $submit = "Create";
-    $id = "new";
-    %kids = ();
-    $Parent = ''; #silence 
-} 
-else {
-    if ( $id eq 'new' ) {
-	$id = $Keyword->Create( Name => $Name, Parent => $Parent )
-	  or Abort("can't create keyword Name=>$Name, Parent=>$Parent");
-    } else {
-	$Keyword->Load($id) || Abort("Can't load keyword id $id");
-	
-	#foreach my $field ( grep eval "defined(\$$_)", qw( Name Parent )) {
-	#  eval "\$Keyword->Set(\$field=>\$$field); #sigh
-	#}
-	
-	$Keyword->SetName($Name) if defined($Name);
-	$Keyword->SetParent($Parent) if defined($Parent);
-    }
-
-    $title = "Modify the Keyword <B>". $Keyword->Name. "</B>";
-    $submit = "Modify";
-}
-
-
-my $kids = $Keyword->Children(new RT::Keywords($session{CurrentUser}));
-
-$kids{$kid->Name} = $kid while $kid = $kids->Next;
-
-if ( defined($Kids) ) {
-    my %newkids;
-
-	%newkids = map { $_=>1 } split(/\r/, $Kids);
-
-    }
-    foreach ( grep { ! defined($newkids{$_}) } keys %kids ) {
-	$kids{$_}->Delete;
-	delete $kids{$_};
-    }
-    foreach ( grep { ! defined($kids{$_}) } keys %newkids ) {
-	$kids{$_} = new RT::Keyword($session{CurrentUser});
-	$kids{$_}->Create( Name => $_, Parent => $id )
-	  or Abort("can't create keyword Name=>$_, Parent=>$id");
-    }
-
-}
-
-
-my $parent;
-my $parents = new RT::Keywords($session{CurrentUser});
-$parents->UnLimit;
-
-my $kidstring = join("\r", keys %kids);
-
-</%INIT>
-
-<%ARGS>
-$id => undef
-$Create => undef
-$Name => undef
-$Parent => undef
-$Kids => undef
-
-</%ARGS>
diff --git a/rt/webrt/Admin/Keywords/index.html b/rt/webrt/Admin/Keywords/index.html
deleted file mode 100644
index 12814ec03..000000000
--- a/rt/webrt/Admin/Keywords/index.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<& /Elements/Header, Title => 'Admin/Keywords' &>
-<& /Admin/Elements/Tabs, current_tab => 'Admin/Keywords/' &>
-
-<& /Elements/ListActions, actions => \@Actions &>
-
-<& /Elements/TitleBoxStart, title => 'Keywords' &>
-<a href="<%$RT::WebPath%>/Admin/Keywords/?RootId=<%$Root->Parent%>"><%$Root->Path%></a>
-<UL>
-<FORM METHOD=POST ACTION="index.html">
-<input type=hidden name=RootId value="<%$RootId%>">
-
-
-% while (my $key = $Keywords->Next) {
-    <LI>
-% if ($Edit == $key->id) {
-      <input name="KeyName-<%$key->id%>" value="<%$key->Name%>">
-	  <input type=submit value="Update">
-	    <input type=submit name="Disable-<%$key->id%>" value="Disable">
-% } else {
-	      <A HREF="?RootId=<%$key->id%>"><%$key->Name%></A>
-% if ($key->Disabled) {
-	<input type=submit name="Enable-<%$key->id%>" value="Enable">
-% } else {
-      [<a href="?Edit=<%$key->id%>&RootId=<%$Root->Id%>">edit</a>]
-% }
-% }
-
-
-	  </LI>
-% }
-	  <LI>
-	    <input name="KeyName-New"> <input type=submit value="Add">
-</UL>
-<BR>
-	  <input type="checkbox" name="ShowDisabled"> Include disabled items in listing.
-	<input type=submit value="Go!">
-
-</FORM>
-
-<& /Elements/TitleBoxEnd &>
-<%INIT>
-my (@Actions);
-  
-if ($ARGS{'KeyName-New'}) {
-    my $NewKey = new RT::Keyword($session{'CurrentUser'});
-    my ($val, $msg) = $NewKey->Create( Parent => $RootId, Name => $ARGS{'KeyName-New'});
-    push (@Actions, $msg);
-}
-
-my $arg;
-foreach $arg (keys %ARGS) {
-    if ($arg =~ /^Disable-(\d*)$/) {
-	my $id = $1;
-	my $keyword = new RT::Keyword($session{'CurrentUser'});
-	$keyword->Load($id);
-	my ($val, $msg) = $keyword->SetDisabled(1);
-	push (@Actions, $msg);
-
-
-    }	
-    elsif ($arg =~ /^Enable-(\d*)$/) {
-	my $id = $1;
-	my $keyword = new RT::Keyword($session{'CurrentUser'});
-	$keyword->Load($id);
-	my ($val, $msg) = $keyword->SetDisabled(0);
-	push (@Actions, $msg);
-    }
-    elsif ($arg =~ /^KeyName-(\d*)$/) {
-	my $id = $1;
-	my $keyword = new RT::Keyword ($session{'CurrentUser'});
-	$keyword->Load($id);
-	if ($keyword->Name() ne $ARGS{"$arg"}) {
-	    my ($val, $msg) = $keyword->SetName($ARGS{"$arg"});
-	    push (@Actions, $msg);
-	}	
-	if (($ARGS{"KeyParent-$id"}) && 
-	    ($keyword->Parent ne $ARGS{"KeyParent-$id"})) {
-	    my ($val, $msg) = $keyword->SetParent($ARGS{"KeyParent-$id"});
-	    push (@Actions, $msg);
-	}	
-    }	
-}
-
-
-my $Root = new RT::Keyword($session{'CurrentUser'});
-my $Keywords;
-#If we have a root load it.
-if ($RootId != 0) {
-    $Root->Load($RootId);
-    $Keywords = $Root->Children();
-    
-}
-else {
-    $Keywords = new RT::Keywords($session{'CurrentUser'});
-    $Keywords->LimitToParent(0);
-}
-
-if ($ShowDisabled) {
-    $Keywords->{'find_disabled_rows'} = 1;
-}
-
-
-
-
-</%INIT>
-<%ARGS>
-$RootId => 0
-$Edit => undef
-$ShowDisabled => 0
-</%ARGS>
diff --git a/rt/webrt/Admin/Queues/Create.html b/rt/webrt/Admin/Queues/Create.html
deleted file mode 100755
index b39d6590c..000000000
--- a/rt/webrt/Admin/Queues/Create.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Create a queue' &>
-    <h1>Create a queue</h1>
-
-<& /Admin/Elements/ModifyQueue, QueueObj => $QueueObj &>
-
-<%INIT>
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-$QueueObj->Create(Name => "$Name");
-</%INIT>
-
-<%ARGS>
-$Name => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Queues/GroupRights.html b/rt/webrt/Admin/Queues/GroupRights.html
deleted file mode 100755
index a2c669083..000000000
--- a/rt/webrt/Admin/Queues/GroupRights.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Modify group rights for queue '. $QueueObj->Name &>
-<& /Admin/Elements/QueueTabs, id => $id &>  
-<& /Elements/ListActions, actions => \@results &>
-
-  <FORM METHOD=POST ACTION="GroupRights.html">
-    <INPUT TYPE=HIDDEN NAME=id VALUE="<% $QueueObj->id %>">
-      
-
-
-<& /Elements/TitleBoxStart, title => 'Modify group rights for queue '.$QueueObj->Name &>
-
-<TABLE>
-<TR><TD>Pseudogroups</TD></TR>
-% while (my $GroupObj = $PseudoGroups->Next()) {
-	      
-	      <TR ALIGN=RIGHT> 
-		<TD VALIGN=TOP>
-		  <% $GroupObj->Name %>
-		</TD>
-		<TD>
-	    <& /Admin/Elements/SelectRights, PrincipalObj => $GroupObj, 
-                                   PrincipalType => 'Group',
-	                           QueueObj => $QueueObj,
-                                   Scope => 'Queue' &>
-
-		</TD>
-	      </TR>
-	
-% }
-
-<TR><TD>Groups</TD></TR>
-
-% while (my $GroupObj = $Groups->Next()) {
-	      
-	      <TR ALIGN=RIGHT> 
-		<TD VALIGN=TOP>
-		  <% $GroupObj->Name %>
-		</TD>
-		<TD>
-	    <& /Admin/Elements/SelectRights, PrincipalObj => $GroupObj, 
-                                   PrincipalType => 'Group',
-	                           QueueObj => $QueueObj,
-                                   Scope => 'Queue' &>
-
-		</TD>
-	      </TR>
-	
-% }
-	
-      </TABLE>
-
-      <& /Elements/TitleBoxEnd &>
-      <& /Elements/Submit, Caption => "Be sure to save your changes", Reset => 1 &>
-  </FORM>
-  
-<%INIT>
- 
-#Update the acls.
-my @results =  ProcessACLChanges(\@CheckACL, \%ARGS);
-
-# {{{ Deal with setting up the display of current rights.
-
-# {{{ do basic initialization.
-
-#Define vars used in html above
-my ($GroupObj);
-
-my ($right);
-
-
-if (!defined $id) {
-    Abort("No Queue defined");
-}
-
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-$QueueObj->Load($id) ||
-  Abort("Couldn't load queue $id");
-  
-  # Find out which groups we want to display ACL selects for.
-  my $Groups = new RT::Groups($session{'CurrentUser'});
-  #TODO: limit this to non-pseudogroups
-  $Groups->LimitToReal();
-
-
-  my $PseudoGroups = new RT::Groups($session{'CurrentUser'});
-  #TODO: limit this to non-pseudogroups
-  $PseudoGroups->LimitToPseudo;
-
-
-# }}}
-    
-  
-  # }}}
-
-</%INIT>
-
-<%ARGS>
-$id => undef
-$UserString => undef
-$UserOp => undef
-$UserField => undef
-@CheckACL => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Queues/Keywords.html b/rt/webrt/Admin/Queues/Keywords.html
deleted file mode 100644
index 7809805c5..000000000
--- a/rt/webrt/Admin/Queues/Keywords.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Edit keywords' &>
-<& /Admin/Elements/QueueTabs, id => $QueueObj->Id &>
-
-<& /Elements/ListActions, actions => \@actions &>
-
-<& /Elements/TitleBoxStart, title => $description &>
-
-<h2>Global Keyword Selections</h2>
-<& /Admin/Elements/ListGlobalKeywordSelects &>
-<BR>
-  
-  <FORM METHOD=POST ACTION="Keywords.html">
-    <INPUT TYPE=HIDDEN NAME=id VALUE="<%$id%>">
-
-% if ($KeywordSelects->Count > 0 ) {
-
-
-<h2>Queue Keyword Selections</h2>
-<TABLE>
-<TR><TD>Delete</TD></TR>
-%  while (my $keywordselect = $KeywordSelects->Next ) {
-<TR>
-  <TD><INPUT TYPE="CHECKBOX" NAME="KeywordSelect-<%$keywordselect->Id%>-Delete"></TD>
-  <TD><& /Admin/Elements/SelectKeywordSelect, KeywordSelect => $keywordselect &></TD>
-</TR>
-%  }
-</TABLE>
-% }
-
-Add a keyword selection to this queue:
-%my $ks = new RT::KeywordSelect($session{'CurrentUser'});
-<ul>
-<li><& /Admin/Elements/SelectKeywordSelect, KeywordSelect => $ks, NamePrefix => 'new' &></li>
-</ul>
-
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit &>
-
-</FORM>
-<%init>
-my (@actions);
-
-
-
-my $KeywordSelects = new RT::KeywordSelects ($session{'CurrentUser'});
-unless ($id =~ /^\d+$/) {
-    Abort("$id isn't a valid Queue id.");
-}
-
-unless ($KeywordSelects->LimitToQueue($id)) {
-    Abort("Couldn't load KeywordSelects.");
-}
-
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-$QueueObj->Load($id);
-
-my $description = "Modify Keyword selections for queue '". $QueueObj->Name ."'";
-
-
-
-# {{{ if we're trying to create a new keyword select
-
-if ($ARGS{'KeywordSelect-new-Name'}) {
-    my $NewKeywordSelect = new RT::KeywordSelect($session{'CurrentUser'});
-    
-    my ($retval, $msg) = $NewKeywordSelect->Create ( Keyword => $ARGS{'KeywordSelect-new-Keyword'},
-					     ObjectField => 'Queue',
-					     ObjectType => 'Ticket',
-					     ObjectValue => $QueueObj->Id,
-					     Name => $ARGS{'KeywordSelect-new-Name'},
-					     Single => $ARGS{'KeywordSelect-new-Single'},
-					     Depth => $ARGS{'KeywordSelect-new-Depth'}
-					   );
-	push (@actions, $msg);
-}
-# }}}
-# {{{ if we're trying to delete the keywordselect
-foreach my $key (keys %ARGS) {
-    if ($key =~ /^KeywordSelect-(\d+)-Delete$/) {
-	my $id = $1;
-	my $keywordselect = new RT::KeywordSelect($session{'CurrentUser'});
-	$keywordselect->Load($id) || push @actions, "Couldn't load keywordSelect";
-	my ($val, $msg) = $keywordselect->SetDisabled(1);
-	if ($val) {
-	    push @actions, 'KeywordSelect disabled.';
-	}	
-	else {
-	    push @actions, $msg;
-	}	
-    }
-}
-# }}}
-# {{{ if we're modifying keyword selects
-my @fields = qw(Name Keyword Single Depth);
-
-while (my $ks = $KeywordSelects->Next) {
-    foreach my $field (@fields) {
-	if (defined ($ARGS{"KeywordSelect-".$ks->Id."-".$field}) &&
-	    ($ARGS{"KeywordSelect-".$ks->Id."-".$field} ne $ks->$field())) {
-	    
-	    my $method = "Set$field";
-	    my ($val, $msg) = $ks->$method($ARGS{"KeywordSelect-".$ks->Id."-".$field});
-	    push @actions, "Keyword Select ". $ks->Name."/$field:".$msg;
-	}	
-    }
-}
-# }}}
-
-</%init>
-
-<%ARGS>
-$id => undef         #some identifier that a Queue could 
-
-</%ARGS>
diff --git a/rt/webrt/Admin/Queues/Modify.html b/rt/webrt/Admin/Queues/Modify.html
deleted file mode 100755
index 7a200df92..000000000
--- a/rt/webrt/Admin/Queues/Modify.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Admin/Queue/Basics' &>
-<& /Admin/Elements/QueueTabs, id => $QueueObj->id &>
-<& /Elements/ListActions, actions => \@results &>
-
-
-
-<& /Elements/TitleBoxStart, title => $title &>
-
-
-<FORM ACTION="<%$RT::WebPath%>/Admin/Queues/Modify.html" METHOD=POST>
-%if ($Create ) {
-<INPUT TYPE=HIDDEN NAME=id VALUE="new">
-% } else {
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$QueueObj->Id%>">
-% }
-
-<TABLE>
-<TR><TD ALIGN=RIGHT>
-Queue Name: 
-</TD>
-<TD><INPUT name="Name" value="<%$QueueObj->Name%>"></TD>
-</TR><TR>
-<TD ALIGN=RIGHT>
-Description:</TD><TD COLSPAN=3><INPUT name="Description" value="<%$QueueObj->Description%>" size=60></TD></TR>
-<TR>
-<TD ALIGN=RIGHT>
-Correspondence Address:
-</TD><TD>
-<INPUT name="CorrespondAddress" value="<%$QueueObj->CorrespondAddress%>">
-<BR><font size="-1"><i>(If left blank, will default to <%$RT::CorrespondAddress%></i></font>
-</TD>
-<TD ALIGN=RIGHT>
-
-Comment Address: </TD><TD>
-<INPUT NAME="CommentAddress" value="<%$QueueObj->CommentAddress%>">
-<BR><font size="-1"><i>(If left blank, will default to <%$RT::CommentAddress%></i></font>
-</TD>
-</TR><TR>
-
-<TD ALIGN=RIGHT>
-Priority starts at: 
-</TD><TD><INPUT NAME="InitialPriority" value="<%$QueueObj->InitialPriority %>">
-</TD>
-<TD ALIGN=RIGHT>
-Over time, priority moves toward:
-</TD><TD><INPUT NAME="FinalPriority" value="<%$QueueObj->FinalPriority %>">
-</TD>
-</TR>
-<TR>
-<TD ALIGN=RIGHT>
-Requests should be due in:
-</TD><TD>
-<INPUT NAME="DefaultDueIn" VALUE="<%$QueueObj->DefaultDueIn%>"> days.
-</TD>
-</TR>
-<TR>
-<TD>
-</TD>
-<TD COLSPAN=4><INPUT TYPE=HIDDEN NAME="SetEnabled" VALUE="1">
-<INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>> Enabled (Unchecking this box disables this queue)<BR>
-</TD>
-</TR>
-
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit &>
-</form>
-
-
-
-<%INIT>
-
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-my  ($title, @results, $Disabled, $EnabledChecked);
-
-if ($Create) {
-    $title = "Create a queue";
-}
-
-else {
-    if ($id eq 'new') {
-       my ($val, $msg) =  $QueueObj->Create(Name => $Name);
-       if ($val == 0 ) {
-           Abort("Could not create queue: $msg");
-	}
-	else {
-		push @results, $msg;
-	}    
-     }
-     else {
-        $QueueObj->Load($id) || $QueueObj->Load($Name) || Abort("Couldn't load queue '$Name'");
-    }
-        $title = 'Editing Configuration for queue '.$QueueObj->Name;
-    
-}
-if ($QueueObj->Id()) {
-my @attribs= qw(Description CorrespondAddress CommentAddress Name 
-                InitialPriority FinalPriority DefaultDueIn);
-
-  @results = UpdateRecordObject( AttributesRef => \@attribs, 
-				    Object => $QueueObj, 
-				    ARGSRef => \%ARGS);
-
-}
-
-#we're asking about enabled on the web page but really care about disabled.
-if ($Enabled == 1) {
-    $Disabled = 0;
-}	
-else {
-    $Disabled = 1;
-}
-if  ( ($SetEnabled) and ( $Disabled != $QueueObj->Disabled) ) { 
-    my  ($code, $msg) = $QueueObj->SetDisabled($Disabled);
-    push @results, 'Enabled status '. $msg;
-}
-
-unless ($QueueObj->Disabled()) {
-    $EnabledChecked ="CHECKED";
-}
-</%INIT>
-
-
-<%ARGS>
-$id => undef
-$result => undef
-$Name => undef
-$Create => undef
-$Description => undef
-$CorrespondAddress => undef
-$CommentAddress => undef
-$InitialPriority => undef
-$FinalPriority => undef
-$DefaultDueIn => undef
-$SetEnabled => undef
-$Enabled => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Queues/People.html b/rt/webrt/Admin/Queues/People.html
deleted file mode 100755
index b495400ed..000000000
--- a/rt/webrt/Admin/Queues/People.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<& /Elements/Header, Title => 'Modify people related to queue ' . $QueueObj->Name &>
-<& /Admin/Elements/QueueTabs, id => $id  &>
-
-<& /Elements/ListActions, actions => \@results &>
-
- 
-<FORM METHOD=POST ACTION="People.html">
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$QueueObj->Id%>">
-<& /Elements/TitleBoxStart, title => 'Modify watchers for queue \''.$QueueObj->Name ."'",   width => "100%" &>
-
-<TABLE WIDTH=100%>
-<TR>
-<TD VALIGN=TOP >
-
-<h3>Current watchers</h3>
-<i>(Check box to delete)</i><br><BR>
-
-
-Cc:
-
-<ul>
-
-%# Print out a placeholder if there are none.
-%if ($cc->Count == 0 ) {
-<li><i>none</i>
-% }
-
-%while (my $watcher=$cc->Next) {
-<li>
-<INPUT TYPE=CHECKBOX NAME="DelWatcher<%$watcher->id%>" UNCHECKED>
-%# account
-%if ($watcher->IsUser) { 
-<a href="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$watcher->OwnerObj->id%>">
-<%$watcher->OwnerObj->RealName%></a>:
-%} else {
-Email address:
-%}
-<i><%$watcher->Email%></i>
-%}
-</ul>
-
-
-Administrative Cc:
-<UL>
-%# Print out a placeholder if there are none.
-%if ($admincc->Count == 0 ) {
-<li><i>none</i>
-% }
-
-%while (my $watcher=$admincc->Next) {
-<li><INPUT TYPE=CHECKBOX NAME="DelWatcher<%$watcher->id%>" UNCHECKED>
-%# account
-%if ($watcher->IsUser) { 
-<a href="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$watcher->OwnerObj->id%>">
-<%$watcher->OwnerObj->RealName%></a>:
-%} else {
-Email address:
-%}
-<i><%$watcher->Email%></i>
-%}
-</UL>
-</TD>
-
-<TD VALIGN=TOP>
-<h3>New watchers</h3>
-Find people whose<BR>
-<& /Elements/SelectUsers &>
-
-<BR>
-Add new watchers:<br>
-
-% if ($msg) {
-<i><%$msg%></i>
-% } elsif ($Users) {
-<ul>
-% while (my $u = $Users->Next ) {
-<li><&/Elements/SelectWatcherType, Scope=>'queue', Name => "WatcherTypeUser".$u->Id &> <%$u->Name%>
-(<%$u->RealName%>)
-% }
-</ul>
-% }
-
-</TD>
-</TR>
-</TABLE>
-
-
-
-
-
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit, Label => 'Save Changes', Caption => "If you've updated anything above, be sure to" &>
-</form>
-
-<%INIT>
-
-my ($field, @results, $User, $Users, $watcher, $key, $msg);
-# {{{ Load the queue
-#If we get handed two ids, mason will make them an array. bleck.
-# We want teh first one. Just because there's no other sensible way
-# to deal
-
-
-
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-$QueueObj->Load($id) || Abort("Couldn't load queue '$id'");
-# }}}
-
-# {{{ Delete deletable watchers
-
-foreach $key (keys %ARGS) {
-    if (($key =~ /^DelWatcher(\d*)$/) and
-	($ARGS{$key})) {
-	$RT::Logger->debug("Deleting watcher $1\n");
-	my ($code, $msg) = $QueueObj->DeleteWatcher($1);
-	
-	push @results, $msg;
-    }
-}
-# }}}
-
-# {{{ Add new watchers
-foreach $key (keys %ARGS) {
-    #They're in this order because otherwise $1 gets clobbered :/
-    if ( ($ARGS{$key} =~ /^(AdminCc|Cc)$/) and
-	 ($key =~ /^WatcherTypeUser(\d*)$/) ) {
-	$RT::Logger->debug("Adding a watcher $1 to ".$ARGS{$key}."\n");
-	my ($code, $msg) = 
-	  $QueueObj->AddWatcher(Type => $ARGS{$key},
-				 Owner => $1);
-	push @results, $msg;
-    }
-}
-
-# }}}
-
-
-
-my $admincc = $QueueObj->AdminCc;
-my $cc = $QueueObj->Cc;
- 
-
-if (!$ARGS{'UserString'}) {
-$msg = "No users selected.";
- }
-else {
-    $Users = new RT::Users($session{'CurrentUser'});
-    $Users->Limit(FIELD => $ARGS{'UserField'},
-                 VALUE => $ARGS{'UserString'},
-                 OPERATOR => $ARGS{'UserOp'});
-     }
-</%INIT>
-
-<%ARGS>
-$UserField => 'Name'
-$UserOp => '='
-$UserString => undef
-$Type => undef
-$id => undef
-</%ARGS>
-
diff --git a/rt/webrt/Admin/Queues/Scrips.html b/rt/webrt/Admin/Queues/Scrips.html
deleted file mode 100755
index 95b8c4378..000000000
--- a/rt/webrt/Admin/Queues/Scrips.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Edit scrips' &>
-<& /Admin/Elements/QueueTabs, id => $QueueObj->Id &>
-
-<& /Elements/ListActions, actions => \@actions &>
-
-<& /Elements/TitleBoxStart, title => $description &>
- 
-<h2>Global Scrips</h2>
-<& /Admin/Elements/ListGlobalScrips &>
-<BR> 
-  <FORM METHOD=POST ACTION="Scrips.html">
-    <INPUT TYPE=HIDDEN NAME=id VALUE=<%$id%>>
-<h2>Queue Scrips</h2>
-% if ($Scrips->Count > 0 ) {
-<TABLE>
-<TR>
-<TD>Delete
-</TD>
-<TD>
-</TR>
-% while (my $scrip = $Scrips->Next ) {
-<TR>
-<TD>
-<INPUT TYPE="CHECKBOX" NAME="DeleteScrip-<%$scrip->Id%>">
-</TD>
-<TD>
-<% $scrip->ConditionObj->Name %> 
-<% $scrip->ActionObj->Name %> with template
-<% $scrip->TemplateObj->Name %>
-</TD>
-</TR>
-% }
-</TABLE>
-% }
-<BR>
-<h2>Add a scrip to this queue</h2>
-Condition: <& /Admin/Elements/SelectScripCondition, Name => 'NewScripCondition' &>
-	  Action: <& /Admin/Elements/SelectScripAction, Name => 'NewScripAction' &>
-	  Template: <& /Admin/Elements/SelectTemplate, Name => 'NewScripTemplate', DefaultQueue => $id &>
-
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit &>
-</FORM>
-<%init>
-my (@actions, $description);
-
-my $Scrips = new RT::Scrips ($session{'CurrentUser'});
-unless ($id =~ /^\d+$/) {
-    Abort("$id isn't a valid Queue id.");
-}
-
-unless ($Scrips->LimitToQueue($id)) {
-    Abort("Couldn't load Scrips.");
-        }
-
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-$QueueObj->Load($id);
-
-if ($QueueObj->id) {
-    $description = "Modify scrips for queue '". $QueueObj->Name ."'";
-}
-else {
-    $description = "Modify global scrips";
-}
-
-
-if ($NewScripAction and $NewScripCondition) {
-    my $NewScrip = new RT::Scrip($session{'CurrentUser'});
-    
-    my ($retval, $msg) = $NewScrip->Create ( ScripAction => $NewScripAction,
-				     ScripCondition => $NewScripCondition,
-				     Stage => 'TransactionCreate',
-				     Queue => $id,
-				     Template => $NewScripTemplate);
-    if (defined $retval) {
-        push @actions, $msg;
-    }
-    else {
-        push @actions, $msg;
-    }
-}
-
-# {{{ deal with modifying and deleting existing scrips
-my ($key );
-foreach $key (keys %ARGS) {
-	# {{{ if we're trying to delete the scrip
-    if ($key =~ /^DeleteScrip-(\d+)/) {
-            my $id = $1;
-	        my $scrip = new RT::Scrip($session{'CurrentUser'});
-	        $scrip->Load($id);
-    	    my ($retval, $msg) = $scrip->Delete;
-	    if ($retval) {
-	        push @actions, 'Scrip deleted';
-	    }
-	    else {
-		push @actions, $msg;
-	    }
-	}
-	# }}}
-
-    
-}
-# }}}
-</%init>
-
-<%ARGS>
-$NewScripCondition => undef
-$NewScripAction => undef
-$NewScripTemplate => undef
-$id => undef         #some identifier that a Queue could 
-</%ARGS>
diff --git a/rt/webrt/Admin/Queues/Template.html b/rt/webrt/Admin/Queues/Template.html
deleted file mode 100755
index 61ee418a6..000000000
--- a/rt/webrt/Admin/Queues/Template.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<& /Admin/Elements/Header, title => "Modify template ".$TemplateObj->id&>
-<& /Admin/Elements/QueueTabs, id => $Queue &>
-<& /Elements/ListActions, actions => \@results &>
-
-<& /Elements/TitleBoxStart, title => $title &>
-
-<FORM METHOD=POST ACTION="Template.html">
-%if ($create ) {
-<INPUT TYPE=HIDDEN NAME=template VALUE="new">
-% } else {
-<INPUT TYPE=HIDDEN NAME=template VALUE="<%$TemplateObj->Id%>">
-% }
-
-%# hang onto the queue id
-<INPUT TYPE=HIDDEN name="Queue" value="<%$Queue%>">
-
-
-Name: <input name="Name" VALUE="<%$TemplateObj->Name%>" SIZE=20><BR>
-Description: <input name="Description" VALUE="<%$TemplateObj->Description%>" SIZE=80><BR>
-
-<TEXTAREA NAME=Content ROWS=25 COLS=80 WRAP=SOFT>
-<%$TemplateObj->Content%></TEXTAREA>
-
-<& /Elements/TitleBoxEnd&>
-<&/Elements/Submit&>
-</FORM>
-
-
-
-<%INIT>
-
-my $TemplateObj = new RT::Template($session{'CurrentUser'});
-my  ($title, @results);
-
-if ($create) {
-  $title = "Create a template";
-}
-
-else {
-  if ($template eq 'new') {
-      my ($val, $msg) =  $TemplateObj->Create(Queue => $Queue, Name => $Name);
-      Abort("Could not create template: $msg") unless ($val);
-     push @results, $msg;
-     $title = 'Created template ' . $TemplateObj->Name(); 
-    }
-    else {
-       $TemplateObj->Load($template) || Abort('No Template');
-      $title = 'Editing template ' . $TemplateObj->Name(); 
-    }
-  
-    
-}
-if ($TemplateObj->Id()) {
-  $Queue = $TemplateObj->Queue;
-
-  my @attribs = qw( Description Content Queue Name);
-  my @aresults = UpdateRecordObject( AttributesRef => \@attribs, 
-				     Object => $TemplateObj, 
-				     ARGSRef => \%ARGS);
-  push @results, @aresults;
-}
-</%INIT>
-<%ARGS>
-$Queue => undef
-$template => undef
-$create => undef
-$Name => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Queues/Templates.html b/rt/webrt/Admin/Queues/Templates.html
deleted file mode 100755
index 218d41dc9..000000000
--- a/rt/webrt/Admin/Queues/Templates.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Edit templates for '.$Queue->Name &>
-<& /Admin/Elements/QueueTabs, id => $Queue->id &>
-
-<& /Elements/TitleBoxStart, title => 'Edit templates for '.$Queue->Name &>
-<UL>
-<LI><A href="Template.html?create=1&Queue=<%$Queue->id%>">Create a new template</A><BR><BR>
-
-%while  (my $TemplateObj = $Templates->Next) { 
-
-<LI><A HREF="Template.html?Queue=<%$id%>&template=<%$TemplateObj->id()%>"><%$TemplateObj->id()%>/<%$TemplateObj->Name%>: <%$TemplateObj->Description%></a><BR>
-
-%}
-
-<& /Elements/TitleBoxEnd &>
-<%INIT>
-
-my $Queue = new RT::Queue($session{'CurrentUser'});
-$Queue->Load($id);
-my $Templates = $Queue->Templates;
-
-</%INIT>
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Queues/UserRights.html b/rt/webrt/Admin/Queues/UserRights.html
deleted file mode 100755
index 75d9cb282..000000000
--- a/rt/webrt/Admin/Queues/UserRights.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Modify user rights for queue '. $QueueObj->Name &>
-<& /Admin/Elements/QueueTabs, id => $id &>  
-<& /Elements/ListActions, actions => \@results &>
-
-  <FORM METHOD=POST ACTION="UserRights.html">
-    <INPUT TYPE=HIDDEN NAME=id VALUE="<% $QueueObj->id %>">
-      
-<& /Elements/TitleBoxStart, title => 'Modify user rights for queue '.$QueueObj->Name &>
-      
-<TABLE>
-        
-%	while (my $UserObj = $Users->Next()) {
-  <TR ALIGN=RIGHT> 
-	<TD VALIGN=TOP>
-	    <% $UserObj->Name %>
-		  </TD>
-	  <TD>
-	    <& /Admin/Elements/SelectRights, PrincipalObj => $UserObj,
-		    PrincipalType => 'User',
-		      Scope => 'Queue',
-			QueueObj => $QueueObj &>
-	  </TD>
-	</TR>
-% }
-      </TABLE>
-            
-      <& /Elements/TitleBoxEnd &>
-      <& /Elements/Submit, Caption => "Be sure to save your changes", Reset => 1 &>
-      
-  </FORM>
-  
-<%INIT>
- 
-  #Update the acls.
-  my @results =  ProcessACLChanges(\@CheckACL, \%ARGS);
-
-# {{{ Deal with setting up the display of current rights.
-
-# {{{ do basic initialization.
-
-#Define vars used in html above
-my ($GroupObj);
-
-my ($right);
-
-
-if (!defined $id) {
-    Abort("No Queue defined");
-}
-
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-$QueueObj->Load($id) ||
-  Abort("Couldn't load queue $id");
-
-# Find out which users we want to display ACL selects for
-my $Users = new RT::Users($session{'CurrentUser'});
-$Users->LimitToPrivileged();
-
-# }}}
-    
-  
-# }}}
-    
-</%INIT>
-
-<%ARGS>
-$id => undef
-$UserString => undef
-$UserOp => undef
-$UserField => undef
-@CheckACL => undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Queues/index.html b/rt/webrt/Admin/Queues/index.html
deleted file mode 100755
index 52dfb73c8..000000000
--- a/rt/webrt/Admin/Queues/index.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Admin queues' &>
-<& /Admin/Elements/Tabs, current_tab => 'Admin/Queues/' &>
-
-
-<& /Elements/TitleBoxStart, title => 'Select a queue' &>
-
-<TABLE>
-<TR>
-<TD VALIGN=TOP>
-
-<FORM METHOD=POST ACTION="<% $RT::WebPath %>/Admin/Queues/">
-
-<input type="checkbox" name="FindDisabledQueues"> Include disabled queues in listing.
-<BR>
-<div align=right><input type=submit value="Go!"></div> 
-</FORM>
-</TD>
-<TD VALIGN=TOP>
-<UL>
-% if ($session{'CurrentUser'}->HasSystemRight('AdminQueue')) {
-<LI><A HREF="<%$RT::WebPath%>/Admin/Queues/Modify.html?Create=1">Create a new queue</A><BR><BR></LI>
-</UL>
-% }
-
-<%$caption%><BR>
-<UL>
-%if ($queues->Count == 0) {
-<LI> <i>No queues matching search criteria found.</i>
-% }
-%while ( $queue = $queues->Next) {
-<LI><A HREF="Modify.html?id=<%$queue->id%>"><%$queue->Name%></a></LI>
-%}
-
-</UL>
-</TD>
-</TR>
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-
-<%INIT>
-my ($queue, $caption);
-my $queues = new RT::Queues($session{'CurrentUser'});
-$queues->UnLimit();
-
-if ($FindDisabledQueues) {
-	$queues->{'find_disabled_rows'} = 1;
-}
-
-</%INIT>
-<%ARGS>
-$FindDisabledQueues => 0
-</%ARGS>
diff --git a/rt/webrt/Admin/Users/Modify.html b/rt/webrt/Admin/Users/Modify.html
deleted file mode 100755
index b6daed49b..000000000
--- a/rt/webrt/Admin/Users/Modify.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/UserTabs, id => $id, current_subtab => '/Admin/Elements/Modify.html?id='.$id &>
-
-<& /Elements/ListActions, actions => \@results &>
-
-<FORM ACTION="<%$RT::WebPath%>/Admin/Users/Modify.html" METHOD=POST>
-%if ($Create) {
-<INPUT TYPE=HIDDEN NAME=id VALUE="new">
-% } else {
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$UserObj->Id%>">
-% }
-
-<TABLE WIDTH=100% BORDER=0>
-<TR>
-
-<TD VALIGN=TOP ROWSPAN=2>
-<& /Elements/TitleBoxStart, title => 'Identity' &>
-
-Username: <input name="Name" value="<%$UserObj->Name%>"> <b>(required)</b> <BR>
-Email: <input name="EmailAddress" value="<%$UserObj->EmailAddress%>"><BR>
-Real Name: <input name="RealName" value="<%$UserObj->RealName%>"> <BR>
-Nickname: <input name="NickName" value="<%$UserObj->NickName%>">
-<BR>
-Unix login: <input name="Gecos" value="<%$UserObj->Gecos%>">
-<BR>
-Extra info: <textarea name="FreeformContactInfo" cols=20 rows=5><%$UserObj->FreeformContactInfo%></TEXTAREA>
-<& /Elements/TitleBoxEnd &>
-</TD>
-<TD VALIGN=TOP>
-<& /Elements/TitleBoxStart, title => 'Access control' &>
-<INPUT TYPE=HIDDEN NAME="SetEnabled" VALUE="1">
-<INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>>
-Let this user access RT<BR>
-
-
-<INPUT TYPE=HIDDEN NAME="SetPrivileged" VALUE="1">
-<INPUT TYPE=CHECKBOX NAME="Privileged" VALUE="1" <%$PrivilegedChecked%>> Let this user be granted rights<BR>
-		    
-% unless ($RT::WebExternalAuth) {
-<TABLE>
-<TR>
-<TD ALIGN=RIGHT>
-New Password:
-</TD>
-<TD ALIGN=LEFT>
-<input type=password name="Pass1">
-</TD>
-</TR>
-<TR><TD ALIGN=RIGHT>
-Retype Password:
-</TD>
-<TD>
-<input type=password name="Pass2">
-</TD>
-</TR>
-</TABLE>
-% }
-<& /Elements/TitleBoxEnd &>
-</TD>
-<TR>
-
-<TD VALIGN=TOP>
-<& /Elements/TitleBoxStart, title => 'Location' &>
-Organization: <input name="Organization" value="<%$UserObj->Organization%>">
-<BR>
-Address1: <input name="Address1" value="<%$UserObj->Address1%>">
-<BR>
-Address2: <input name="Address2" value="<%$UserObj->Address2%>">
-<BR>
-City: <input name="City" value="<%$UserObj->City%>" size=14>
-
-State: <input name="State" value="<%$UserObj->State%>" size=3>
-
-Zip: <input name="Zip" value="<%$UserObj->Zip%>" size=9>
-<BR>
-Country: <input name="Country" value="<%$UserObj->Country%>">
-<BR>
-
-
-<& /Elements/TitleBoxEnd &>
-</TD>
-</TR>
-<TR>
-<TD COLSPAN=2 VALIGN=TOP>
-
-
-<& /Elements/TitleBoxStart, title => 'Phone numbers' &>
-Home: <input name="HomePhone" value="<%$UserObj->HomePhone%>" size=13>
-
-Work: <input name="WorkPhone" value="<%$UserObj->WorkPhone%>" size=13>
-
-Mobile: <input name="MobilePhone" value="<%$UserObj->MobilePhone%>" size=13>
-
-Pager: <input name="PagerPhone" value="<%$UserObj->PagerPhone%>" size=13>
-<& /Elements/TitleBoxEnd &>
-<BR>
-<& /Elements/TitleBoxStart, title => 'Comments about this user' &>
-<TEXTAREA name="Comments" COLS=80 ROWS=5 WRAP=VIRTUAL><%$UserObj->Comments%></TEXTAREA>
-<& /Elements/TitleBoxEnd &>
-
-
-%if ($UserObj->Privileged) {
-<BR>
-<& /Elements/TitleBoxStart, title => 'Signature' &>
-<TEXTAREA COLS=80 ROWS=5 name="Signature" WRAP=HARD>
-<%$UserObj->Signature%></TEXTAREA>
-<& /Elements/TitleBoxEnd &>
-% }
-
-</TD>
-
-</TR>
-</TABLE>
-
-
-<& /Elements/Submit &>
-</form>
-
-
-<%INIT>
-
-my $UserObj = new RT::User($session{'CurrentUser'});
-my ($title, $PrivilegedChecked, $EnabledChecked, $Disabled, $result, @results);
-
-my ($val, $msg);
-
-if ($Create) {
-    $title = "Create a new user";
-} 
-else {
-
-    if ($id eq 'new') {
-	($val, $msg) = $UserObj->Create( Name => $Name,
-					 EmailAddress => $ARGS{'EmailAddress'}
-				       );
-	if ($val) {
-		push @results, $msg;
-	} else {
-		push @results, 'User could not be created: '. $msg;
-	}	
-	
-    }
-    else {
-	$UserObj->Load($id) || $UserObj->Load($Name) || Abort("Couldn't load user '$Name'");
-	$val = $UserObj->Id();
-    }
-
-    if ($val) {
-	$title = "Modify the user ". $UserObj->Name;
-    }	
-
-    # If the create failed
-    else {
-	$title = "Create a new user";
-	$Create = 1;
-    }    
-
-    
-
-}
-
-
-
-
-# If we have a user to modify, lets try. 
-if ($UserObj->Id) {
-    
-    my @fields = qw(Name Comments Signature EmailAddress FreeformContactInfo 
-		    Organization RealName NickName Lang EmailEncoding WebEncoding 
-		    ExternalContactInfoId ContactInfoSystem Gecos ExternalAuthId 
-		    AuthSystem HomePhone WorkPhone MobilePhone PagerPhone Address1
-		Address2 City State Zip Country 
-		   );
-    
-    my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
-					    Object => $UserObj,
-					    ARGSRef => \%ARGS );
-    push (@results,@fieldresults);
-
-
-# {{{ Deal with special fields: Privileged, Enabled and Password
-if  ( ($SetPrivileged) and ( $Privileged != $UserObj->Privileged) ) {
-my  ($code, $msg) = $UserObj->SetPrivileged($Privileged);
-     push @results, 'Privileged status: '. $msg;
-}
-
-#we're asking about enabled on the web page but really care about disabled.
-if ($Enabled == 1) {
-    $Disabled = 0;
-}	
-else {
-    $Disabled = 1;
-}
-if  ( ($SetEnabled) and ( $Disabled != $UserObj->Disabled) ) { 
-    my  ($code, $msg) = $UserObj->SetDisabled($Disabled);
-    push @results, 'Enabled status '. $msg;
-}
-
-
-#TODO: make this report errors properly
-if ((defined $Pass1) and ($Pass1 ne '') and ($Pass1 eq $Pass2) and (!$UserObj->IsPassword($Pass1))) {
-    my ($code, $msg);
-    ($code, $msg) = $UserObj->SetPassword($Pass1);
-    push @results, 'Password: '. $msg;
-}
-
-# }}}
-}
-
-
-# {{{ Do some setup for the ui
-unless ($UserObj->Disabled()) {
-    $EnabledChecked ="CHECKED";
-}
-
-if ($UserObj->Privileged()) {  
-    $PrivilegedChecked = "CHECKED";
-}
-
-# }}}
-</%INIT>
-
-
-<%ARGS>
-$id => undef
-$Name  => undef
-$Comments  => undef
-$Signature  => undef
-$EmailAddress  => undef
-$FreeformContactInfo => undef
-$Organization  => undef
-$RealName  => undef
-$NickName  => undef
-$Privileged => undef
-$SetPrivileged => undef
-$Enabled => undef
-$SetEnabled => undef
-$Lang  => undef
-$EmailEncoding  => undef
-$WebEncoding => undef
-$ExternalContactInfoId  => undef
-$ContactInfoSystem  => undef
-$Gecos => undef
-$ExternalAuthId  => undef
-$AuthSystem  => undef
-$HomePhone => undef
-$WorkPhone  => undef
-$MobilePhone  => undef
-$PagerPhone  => undef
-$Address1 => undef
-$Address2  => undef
-$City  => undef
-$State  => undef
-$Zip  => undef
-$Country => undef
-$Pass1 => undef
-$Pass2=> undef
-$Create=> undef
-</%ARGS>
diff --git a/rt/webrt/Admin/Users/Prefs.html b/rt/webrt/Admin/Users/Prefs.html
deleted file mode 100755
index 4a9fc5cdf..000000000
--- a/rt/webrt/Admin/Users/Prefs.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<& /Elements/Header, Title=>"User view" &>
-
-<& /Elements/ViewUser, User=>$u &>
-
-%if ($session{CurrentUser} && ($session{CurrentUser}->Id == $id)) {
-	<& /Elements/TitleBoxStart, title => 'Signature'  &>
-<form method=post>
-<input type="hidden" name="id" value=<%$id%>>
-<TEXTAREA COLS=72 ROWS=4 WRAP=HARD NAME="Signature"><% $u->Signature %></TEXTAREA><br><br>
-<input type="submit" value="Update signature">
-</form>
-	  <& /Elements/TitleBoxEnd &>
-	  <form method=post>
-	  Open tickets (from listing) in another window: <input type="checkbox" name="NewWindowOption" <%exists $session{NewWindowOption} && "CHECKED"%>><br>
-	  Open tickets (from listing) in a new window: <input type="checkbox" name="AlwaysNewWindowOption" <%exists $session{AlwaysNewWindowOption} && "CHECKED"%>><br>
-	  <input type="submit" name="NewWindowSetting" value="New window setting">
-	  </form>
-%}
-
-	<& /Elements/TitleBoxStart, title => 'Email'  &>
-<form method=post>
-<input type="hidden" name="id" value="<%$id%>">
-<input name="Email" value="<% $u->EmailAddress %>"><input type="submit" value="Update email">
-</form>
-	  <& /Elements/TitleBoxEnd &>
-	<& /Elements/TitleBoxStart, title => 'Real Name'  &>
-<form method=post>
-<input type="hidden" name="id" value="<%$id%>">
-<input name="RealName" value="<% $u->RealName %>"><input type="submit" value="Update name">
-</form>
-	  <& /Elements/TitleBoxEnd &>
-
-	<& /Elements/TitleBoxStart, title => 'User ID'  &>
-<form method=post>
-<input type="hidden" name="id" value="<%$id%>">
-<input name="Name" value="<% $u->Name %>"><input type="submit" value="Update ID">
-</form>
-	  <& /Elements/TitleBoxEnd &>
-
-%# TODO: alternative email addresses + merging users
-
-<%ARGS>
-$id => $session{CurrentUser} ? $session{CurrentUser}->Id : 0
-$Signature => undef
-$Email => undef
-$RealName => undef
-$Name => undef
-</%ARGS>
-
-<%INIT>
-require RT::User;
-my $u=RT::User->new($session{CurrentUser});
-$u->Load($id) || die "Couldn't load that user ($id)";
-if ($Signature) {
-my ($val, $msg)=$u->SetSignature($Signature);
-$RT::Logger->log(level=>($val ? 'info' : 'error'), message=>$msg);
-}
-
-if ($Email) {
-my ($val, $msg)=$u->SetEmailAddress($Email);
-$RT::Logger->log(level=>($val ? 'info' : 'error'), message=>$msg);
-}
-
-if ($RealName) {
-my ($val, $msg)=$u->SetRealName($RealName);
-$RT::Logger->log(level=>($val ? 'info' : 'error'), message=>$msg);
-}
-
-if ($Name) {
-my ($val, $msg)=$u->SetName($Name);
-$RT::Logger->log(level=>($val ? 'info' : 'error'), message=>$msg);
-}
-
-if ($ARGS{NewWindowSetting}) {
-if ($ARGS{NewWindowOption}) {
-$session{NewWindowOption}=1;
-} else {
-delete $session{NewWindowOption};
-}
-if ($ARGS{AlwaysNewWindowOption}) {
-$session{NewWindowOption}=1;
-$session{AlwaysNewWindowOption}=1;
-} else {
-delete $session{AlwaysNewWindowOption};
-}
-}
-
-</%INIT>
-
-
-
-
-
-
-
-
-
diff --git a/rt/webrt/Admin/Users/Rights.html b/rt/webrt/Admin/Users/Rights.html
deleted file mode 100644
index 3b94f9157..000000000
--- a/rt/webrt/Admin/Users/Rights.html
+++ /dev/null
@@ -1 +0,0 @@
-Placeholder
diff --git a/rt/webrt/Admin/Users/index.html b/rt/webrt/Admin/Users/index.html
deleted file mode 100755
index 383513710..000000000
--- a/rt/webrt/Admin/Users/index.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<& /Admin/Elements/Header, Title => 'Admin users' &>
-<& /Admin/Elements/Tabs, current_tab => 'Admin/Users/' &>
-
-
-<& /Elements/TitleBoxStart, title => 'Select a user' &>
-
-<TABLE>
-<TR>
-<TD VALIGN=TOP>
-
-<FORM METHOD=POST ACTION="<% $RT::WebPath %>/Admin/Users/">
-
-Find people whose <& /Elements/SelectUsers &><BR>
-<input type="checkbox" name="FindDisabledUsers"> Include disabled users in search.
-<BR>
-<div align=right><input type=submit value="Go!"></div> 
-</FORM>
-</TD>
-<TD VALIGN=TOP>
-<UL>
-% if ($session{'CurrentUser'}->HasSystemRight('AdminUsers')) {
-<LI><A HREF="<%$RT::WebPath%>/Admin/Users/Modify.html?Create=1">Create a new user</A><BR><BR></LI>
-</UL>
-% }
-
-<%$caption%><BR>
-<UL>
-%if ($users->Count == 0) {
-<LI> <i>No users matching search criteria found.</i>
-% }
-%while ( $user = $users->Next) {
-<LI><A HREF="Modify.html?id=<%$user->id%>"><%$user->Name || '(no name listed)'%></a></LI>
-%}
-
-</UL>
-</TD>
-</TR>
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-
-<%INIT>
-my ($user, $caption);
-my $users = new RT::Users($session{'CurrentUser'});
-
-if ($FindDisabledUsers) {
-	$users->{'find_disabled_rows'} = 1;
-}
-
-unless (defined $UserString) {
-    $users->LimitToPrivileged();
-    $caption = "Privileged users";
-}
-else {
-    $caption = "Users matching search criteria";
-
-  if ($UserString) {
-	$users->Limit( FIELD => $UserField,
-		        OPERATOR => $UserOp,
-		       VALUE => $UserString); 
-
-}
-}
-</%INIT>
-<%ARGS>
-$UserString => undef
-$UserOp => '='
-$UserField => 'Name'
-$IdLike => undef
-$EmailLike => undef
-$FindDisabledUsers => 0
-</%ARGS>
diff --git a/rt/webrt/Admin/index.html b/rt/webrt/Admin/index.html
deleted file mode 100755
index 1ed973f7e..000000000
--- a/rt/webrt/Admin/index.html
+++ /dev/null
@@ -1,4 +0,0 @@
-  <& /Admin/Elements/Header, Title => 'RT Administration' &>
-<& /Admin/Elements/Tabs &>
-
-
diff --git a/rt/webrt/Elements/Checkbox b/rt/webrt/Elements/Checkbox
deleted file mode 100755
index 964c482ba..000000000
--- a/rt/webrt/Elements/Checkbox
+++ /dev/null
@@ -1,17 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/Checkbox,v 1.1 2002-08-12 06:17:08 ivan Exp $
-<INPUT TYPE="Checkbox" NAME ="<%$Name%>" <%$IsChecked%>>
-
-<%ARGS>
-$Name => undef
-$Default => undef
-$True => undef
-$False => undef
-$IsChecked => undef
-</%ARGS>
-
-<%INIT>
-$IsChecked = 
-  ($Default && $Default =~ /checked/i)
-    ? " CHECKED " : "";
-1;
-</%INIT>
diff --git a/rt/webrt/Elements/CreateTicket b/rt/webrt/Elements/CreateTicket
deleted file mode 100644
index 1270f6ebe..000000000
--- a/rt/webrt/Elements/CreateTicket
+++ /dev/null
@@ -1 +0,0 @@
-<FORM ACTION="<% $RT::WebPath%>/Ticket/Create.html"><input type=submit value="New ticket in">&nbsp;<& /Elements/SelectNewTicketQueue &></FORM>
diff --git a/rt/webrt/Elements/CustomHomepageHeader b/rt/webrt/Elements/CustomHomepageHeader
deleted file mode 100644
index e69de29bb..000000000
diff --git a/rt/webrt/Elements/Error b/rt/webrt/Elements/Error
deleted file mode 100755
index ec2cf511f..000000000
--- a/rt/webrt/Elements/Error
+++ /dev/null
@@ -1,23 +0,0 @@
-<& /Elements/Header, Code => $Code, Why => $Why &>
-<& /Elements/Tabs &>
-<& /Elements/TitleBoxStart, title => $Title &>
-<%$Why%>
-<br>
-<font size=-1>
-<%$Details%>
-</font>
-<& /Elements/TitleBoxEnd &>
-</body>
-</HTML>
-
-
-<%args>
-$Code => undef
-$Details => undef
-$Title => "RT Error"
-$Why => "the calling component did not specify why"
-</%args>
-
-<%INIT>
-$RT::Logger->error("WebRT: $Why ($Details)");
-</%INIT>
diff --git a/rt/webrt/Elements/Footer b/rt/webrt/Elements/Footer
deleted file mode 100755
index 776c219bb..000000000
--- a/rt/webrt/Elements/Footer
+++ /dev/null
@@ -1,10 +0,0 @@
-% if ($Debug) {
-<HR>
-<b>Time to display: <%time - $m->{'rt_base_time'} %></b>
-% }
-</BODY>
-</HTML>
-
-<%ARGS>
-$Debug => 0
-</%ARGS>
diff --git a/rt/webrt/Elements/GotoTicket b/rt/webrt/Elements/GotoTicket
deleted file mode 100644
index 21d2bcdf8..000000000
--- a/rt/webrt/Elements/GotoTicket
+++ /dev/null
@@ -1 +0,0 @@
-<FORM ACTION="<%$RT::WebPath%>/Ticket/Display.html"><input type=submit value="Goto ticket">&nbsp;<input size=5 name=id></FORM>
diff --git a/rt/webrt/Elements/Header b/rt/webrt/Elements/Header
deleted file mode 100755
index 471331be2..000000000
--- a/rt/webrt/Elements/Header
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<HEAD>
-<TITLE><%$Title%></TITLE>
-<META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
-
-%# TODO this gets called from error. but I have no idea what it might
-%# be used for. can we whack it?  -jesse
-% if ($Code) {
-<META HTTP-EQUIV VALUE="<%$Code%> <%$Why%>">
-% }
-% if ($Refresh > 0) {
-<META HTTP-EQUIV="REFRESH" CONTENT="<%$Refresh%>">
-% }
-
-<link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/webrt.css" type="text/css">
-</HEAD>
-<BODY BGCOLOR="<%$BgColor%>">
-% if ($ShowBar) {
-<TABLE BORDER=0 WIDTH=100% CELLSPACING=0 BGCOLOR="#993333">
-<TR VALIGN=TOP>
-<TD><IMG SRC="<%$RT::LogoURL%>" alt="RT"></TD>
-<TD VALIGN=CENTER ALIGN=LEFT>
-<font size=+2 color="#ffffff">
-<B>
-<%$Title%>
-</B>
-</font>
-</TD>
-<TD ALIGN=RIGHT>
-<font color="#ffffff">
-% if ($session{'CurrentUser'}) {
-Signed in as <b><%$session{'CurrentUser'}->Name%></b>.<BR>
-% if ($session{'CurrentUser'}->HasSystemRight('ModifySelf')) {
-[<A class='inverse' HREF="<%$RT::WebPath%>/User/Prefs.html" >Preferences</A>] 
-% }
-% unless ($RT::WebExternalAuth) { 
-[<A class='inverse' HREF="<%$RT::WebPath%>/NoAuth/Logout.html">Logout</a>]
-% }
-% } else {
-Not logged in.
-% }
-</font>
-</TD>
-</TR>
-</TABLE>
-
-<BR>
-% }
-<%ARGS>
-$Title => 'WebRT'
-$Code => undef
-$Refresh => undef
-$Why => undef
-$BgColor => '#ffffff'
-$ShowBar => 1
-</%ARGS>
-<%INIT>
-$Title = "RT/$RT::rtname: ".$Title;
-</%INIT>
-
diff --git a/rt/webrt/Elements/ListActions b/rt/webrt/Elements/ListActions
deleted file mode 100755
index 3fc9b0ba5..000000000
--- a/rt/webrt/Elements/ListActions
+++ /dev/null
@@ -1,14 +0,0 @@
-% if (@actions ) {
-<& /Elements/TitleBoxStart, title => 'Results' &>
-<UL>
-% foreach my $action (@actions) {
-% next unless ($action);
-<LI><%$action%></LI>
-% }
-</UL>
-<& /Elements/TitleBoxEnd &>
-<BR>
-% }
-<%ARGS>
-@actions => undef
-</%ARGS>
diff --git a/rt/webrt/Elements/Login b/rt/webrt/Elements/Login
deleted file mode 100755
index 27ec98281..000000000
--- a/rt/webrt/Elements/Login
+++ /dev/null
@@ -1,69 +0,0 @@
-<& /Elements/Header, Title=>"Login" , &>
-
-<DIV ALIGN=CENTER>
-% if ($Error) {
-<& /Elements/TitleBoxStart, title => 'Error' &>
-<% $Error %>
-<& /Elements/TitleBoxEnd &>
-% }
-<BR>
-<& /Elements/TitleBoxStart, width=> "40%", titleright => "RT $RT::VERSION for $RT::rtname", title => 'Login' ,
-contentbg=>"#cccccc" &>
-
-
-% unless ($RT::WebExternalAuth) {
-<FORM METHOD=POST >
-<TABLE BORDER=0 WIDTH=100%>
-<TR ALIGN=RIGHT>
-<TD ALIGN=RIGHT>Username:</TD><TD ALIGN=LEFT><input name=user value="<%$user%>"></TD></TR>
-<TR><TD ALIGN=RIGHT>Password:</TD><TD ALIGN=LEFT><input type=password name=pass></TD></TR>
-<TR><TD colspan=2 align=right>
-<input type=submit Value="Login">
-</TD></TR>
-</TABLE>
-<&/Elements/TitleBoxEnd&>
-% # From mason 1.0.1 forward, this doesn't work. in fact, it breaks things.
-% if (0) {
-% # The code below iterates through everything in the passed in arguments
-% # Preserving all the old parameters
-% # This would be easier, except mason is 'smart' and calls multiple values
-% # arrays rather than multiple hash keys
-% my $key; my $val;
-% foreach $key (keys %ARGS) {
-%  if (($key ne 'user') and ($key ne 'pass')) {
-% 	if (ref($ARGS{$key}) =~ /ARRAY/) {
-% 		foreach $val (@{$ARGS{$key}}) {
-<input type=hidden name="<%$key %>" value="<% $val %>">
-% 		}
-% 	}
-%	else {
-<input type="hidden" name="<% $key %>" value="<% $ARGS{$key} %>">
-% 	}
-% }
-%}
-% }
-</FORM>
-% }
-</DIV>
-
-<BR>
-<!-- TODO: not yet implemented
-If you've forgotten your username or password, RT can <A
-href="/NoAuth/Reminder.html">send you a reminder</a>.
--->
-<BR>
-<HR>
-RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is
-distributed under <a href="http://www.gnu.org/copyleft/gpl.html">Version 2 of the GNU General Public License.</a>
-
-
-<%ARGS>
-$user => ""
-$pass => undef
-$goto => undef
-$Error => undef
-</%ARGS>
-
-<%INIT>
-SetContentType('text/html');
-</%INIT>
diff --git a/rt/webrt/Elements/MessageBox b/rt/webrt/Elements/MessageBox
deleted file mode 100644
index aa081a380..000000000
--- a/rt/webrt/Elements/MessageBox
+++ /dev/null
@@ -1,30 +0,0 @@
-<TEXTAREA COLS=<%$Width%> ROWS=15 WRAP=HARD NAME="<%$Name%>"><% $Default %><%$message%><%$signature%></TEXTAREA>
-<%INIT>
-
-my ($message);
-
-if ($MessageURI) {
-	my $code;
-	($code, $Default)=RT::Link->GetContent($MessageURI);
-}
-if ($QuoteTransaction) {
-    my $transaction=RT::Transaction->new($session{'CurrentUser'});
-    $transaction->Load($QuoteTransaction);
-    $message=$transaction->Content(Quote => 1);
-}
-
-my $signature = '';
-if ($session{'CurrentUser'}->UserObj->Signature) {
-	$signature = "-- \n".$session{'CurrentUser'}->UserObj->Signature;
-}
-
-</%INIT>
-<%ARGS>
-$QuoteTransaction => undef
-$Name => 'Content'
-$Default => ''
-$DefaultURI => undef
-$Width => 72
-$MessageURI => undef
-</%ARGS>
-
diff --git a/rt/webrt/Elements/MyRequests b/rt/webrt/Elements/MyRequests
deleted file mode 100644
index 67817296c..000000000
--- a/rt/webrt/Elements/MyRequests
+++ /dev/null
@@ -1,45 +0,0 @@
-<& /Elements/TitleBoxStart, title => "25 highest priority tickets I requested..." &>
-<TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>
-<TR>
-<TH align=right>#</TH>
-<TH align=left>Subject</TH>
-<TH align=left>Queue</TH>
-<TH align=left>Status</TH>
-<TH align=left>Owner</TH>
-<TH>&nbsp;</TH>
-</TR>
-% while (my $Ticket = $MyTickets->Next) {
-<TR>
-<TD ALIGN=RIGHT>
-<%$Ticket->Id%>
-</TD>
-<TD>
-<A HREF="<% $RT::WebPath %>/Ticket/Display.html?id=<%$Ticket->Id%>">
-<%$Ticket->Subject || '[no subject]'%>
-</A>
-</TD>
-<TD>
-<%$Ticket->QueueObj->Name%>
-</TD><TD>
-<%$Ticket->Status%>
-</TD><TD>
-<%$Ticket->OwnerObj->Name%>
-</TD><TD ALIGN=RIGHT>
-[<A HREF="<% $RT::WebPath %>/Ticket/Display.html?id=<%$Ticket->Id%>">Display</A>]
-</TD>
-</TR>
-% }
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-
-
-<%INIT>
-my $MyTickets;
-$MyTickets = new RT::Tickets ($session{'CurrentUser'});
-$MyTickets->LimitRequestor(VALUE => $session{'CurrentUser'}->EmailAddress);
-$MyTickets->LimitStatus(VALUE => "open");
-$MyTickets->LimitStatus(VALUE => "new");
-$MyTickets->OrderBy(FIELD => 'Priority', ORDER => 'DESC');
-$MyTickets->RowsPerPage(25);
-
-</%INIT>
diff --git a/rt/webrt/Elements/MyTickets b/rt/webrt/Elements/MyTickets
deleted file mode 100644
index 64a2ba7cc..000000000
--- a/rt/webrt/Elements/MyTickets
+++ /dev/null
@@ -1,43 +0,0 @@
-<& /Elements/TitleBoxStart, title => "25 highest priority tickets I own..." &>
-<TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>
-<TR>
-<TH ALIGN=RIGHT>#</TH>
-<TH ALIGN=LEFT>Subject</TH>
-<TH ALIGN=LEFT>Queue</TH>
-<TH ALIGN=LEFT>Status</TH>
-<TH ALIGN=LEFT>&nbsp;</TH>
-</TR>
-% while (my $Ticket = $MyTickets->Next) {
-<TR>
-<TD ALIGN=RIGHT>
-<%$Ticket->Id%>
-</TD>
-<TD>
-<A HREF="<% $RT::WebPath %>/Ticket/Display.html?id=<%$Ticket->Id%>">
-<%$Ticket->Subject || '[no subject]'%>
-</A>
-</TD>
-<TD>
-<%$Ticket->QueueObj->Name%>
-</TD><TD>
-<%$Ticket->Status%>
-</TD>
-<TD ALIGN=RIGHT>
-[<A HREF="<% $RT::WebPath %>/Ticket/Update.html?id=<%$Ticket->Id%>">Update</A>]
-</TD>
-</TR>
-% }
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-
-
-<%INIT>
-my $MyTickets;
-$MyTickets = new RT::Tickets ($session{'CurrentUser'});
-$MyTickets->LimitOwner(VALUE => $session{'CurrentUser'}->Id);
-$MyTickets->LimitStatus(VALUE => "open");
-$MyTickets->LimitStatus(VALUE => "new");
-$MyTickets->OrderBy(FIELD => 'Priority', ORDER => 'DESC');
-$MyTickets->RowsPerPage(25);
-
-</%INIT>
diff --git a/rt/webrt/Elements/Quicksearch b/rt/webrt/Elements/Quicksearch
deleted file mode 100644
index d44c996fa..000000000
--- a/rt/webrt/Elements/Quicksearch
+++ /dev/null
@@ -1,41 +0,0 @@
-<& /Elements/TitleBoxStart, title => "Find new/open tickets", titleright => "<A class='inverse' href=\"$RT::WebPath/Search/Listing.html?NewSearch=1\">Advanced Search</A>" &>
-
-<TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>                       
-<tr>                                                                          
-       <th align=left>Queue</th>                                         
-       <th align=left><font size=-1>New</font></th>
-       <th align=left><font size=-1>Open</font></th>          
-       <th align=left><font size=-1>Stalled</font></th>          
-</tr>
-
-<%PERL>
-while (my $queue = $Queues->Next) {
-     $Tickets->ClearRestrictions;                                           
-     $Tickets->LimitStatus(VALUE => "open");                                
-     $Tickets->LimitQueue(VALUE => $queue->id, OPERATOR => '=');            
-     my $open = $Tickets->Count();
-
-     $Tickets->ClearRestrictions;                                           
-     $Tickets->LimitStatus(VALUE => "new");
-     $Tickets->LimitQueue(VALUE => $queue->id, OPERATOR => '=');            
-     my $new = $Tickets->Count();
-
-     $Tickets->ClearRestrictions; 
-     $Tickets->LimitStatus(VALUE => "stalled");
-     $Tickets->LimitQueue(VALUE => $queue->id, OPERATOR => '=');            
-     my $stalled = $Tickets->Count();
-</%PERL>
-<TR><TD><A HREF="<% $RT::WebPath%>/Search/Listing.html?ValueOfStatus=open&ValueOfStatus=new&StatusOp=%3D&QueueOp=%3D&ValueOfQueue=<%$queue->Id%>&RowsPerPage=50&NewSearch=1"><%$queue->Name%></a></TD>
-<TD><%$new%></TD>
-<TD><%$open%></TD>
-<TD><%$stalled%></TD>
-</TR>
-% }
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-
-<%INIT>
-my $Queues = new RT::Queues($session{'CurrentUser'}); 
-$Queues->UnLimit();
-my $Tickets = new RT::Tickets ($session{'CurrentUser'});
-</%INIT>
diff --git a/rt/webrt/Elements/Refresh b/rt/webrt/Elements/Refresh
deleted file mode 100644
index 6949d8c24..000000000
--- a/rt/webrt/Elements/Refresh
+++ /dev/null
@@ -1,22 +0,0 @@
-<SELECT NAME="<%$Name%>">
-<OPTION VALUE="-1"
-%unless ($Default) {
- SELECTED
-%}
->Don't refresh this page.</OPTION>
-%foreach my $value (@refreshevery) {
-<OPTION VALUE="<%$value%>"
-% if ($value == $Default) {
-SELECTED 
-% }
->Refresh this page every <%$value/60%> minutes.
-%}
-</SELECT>
-
-<%INIT>
-my @refreshevery = qw(120 300 600 1200 3600 7200);
-</%INIT>
-<%ARGS>
-$Name => undef
-$Default => undef
-</%ARGS>
diff --git a/rt/webrt/Elements/Section b/rt/webrt/Elements/Section
deleted file mode 100755
index 067311d9e..000000000
--- a/rt/webrt/Elements/Section
+++ /dev/null
@@ -1,11 +0,0 @@
-<TABLE WIDTH=100%>
-<TR>
-<TD>
-<font size=+4><%$title%></font>
-</TD>
-</TR>
-</TABLE>
-
-<%ARGS>
-$title => undef
-</%ARGS>
\ No newline at end of file
diff --git a/rt/webrt/Elements/SelectBoolean b/rt/webrt/Elements/SelectBoolean
deleted file mode 100755
index 93b78ce76..000000000
--- a/rt/webrt/Elements/SelectBoolean
+++ /dev/null
@@ -1,24 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectBoolean,v 1.1 2002-08-12 06:17:08 ivan Exp $
-<SELECT NAME ="<%$Name%>">
-<OPTION VALUE="<%$TrueVal%>" <%$TrueDefault%>><%$True%></OPTION>
-<OPTION VALUE="<%$FalseVal%>" <%$FalseDefault%>><%$False%></OPTION>
-</SELECT>
-
-<%ARGS>
-$Name => undef
-$True => "is"
-$Default => 'true'
-$TrueVal => 1
-$FalseVal => 0
-$False => "isn't"
-</%ARGS>
-
-<%INIT>
-my ($TrueDefault, $FalseDefault);
-if ($Default && $Default !~ /true/i) {
-	$FalseDefault = "SELECTED";
-}
-else {
-	$TrueDefault = "SELECTED";
-}
-</%INIT>
diff --git a/rt/webrt/Elements/SelectDate b/rt/webrt/Elements/SelectDate
deleted file mode 100755
index 6fafbf170..000000000
--- a/rt/webrt/Elements/SelectDate
+++ /dev/null
@@ -1,25 +0,0 @@
-<INPUT NAME="<%$Name%>" VALUE="<%$Default%>" size=16> 
-
-<%init>
-unless ((defined $Default) or 
-	($current <= 0)) {
-	my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
-                                            localtime($current);
-        $Default = sprintf("%04d-%02d-%02d %02d:%02d",                         
-                           $year+1900,$mon+1,$mday,                            
-                           $hour,$min);   
-}
-
-unless ($Name) {
-	$Name = $menu_prefix. "_Date";
-}
-</%init>
-
-<%args>
-
-$ShowTime => undef
-$menu_prefix=>''
-$current=>time
-$Default => undef
-$Name => undef
-</%args>
diff --git a/rt/webrt/Elements/SelectDateRelation b/rt/webrt/Elements/SelectDateRelation
deleted file mode 100755
index c5849c8e2..000000000
--- a/rt/webrt/Elements/SelectDateRelation
+++ /dev/null
@@ -1,14 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectDateRelation,v 1.1 2002-08-12 06:17:08 ivan Exp $
-<SELECT NAME ="<%$Name%>">
-<OPTION VALUE="&lt;"><%$Before%></OPTION>
-<OPTION VALUE="="><%$On%></OPTION>
-<OPTION VALUE="&gt;"><%$After%></OPTION>
-</SELECT>
-
-<%ARGS>
-$Name => undef
-$Default => undef
-$Before => 'Before'
-$On => 	'On'
-$After => 'After'
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectDateType b/rt/webrt/Elements/SelectDateType
deleted file mode 100755
index 65c0e9b4b..000000000
--- a/rt/webrt/Elements/SelectDateType
+++ /dev/null
@@ -1,12 +0,0 @@
-<SELECT NAME="<%$Name%>">
-<OPTION VALUE="Created">Created</OPTION>
-<OPTION VALUE="Started">Started</OPTION>
-<OPTION VALUE="Resolved">Resolved</OPTION>
-<OPTION VALUE="Told">Last Contacted</OPTION>
-<OPTION VALUE="LastUpdated">Last Updated</OPTION>
-<OPTION VALUE="StartsBy">Starts By</OPTION>
-<OPTION VALUE="Due">Due</OPTION>
-</SELECT>
-<%ARGS>
-$Name => 'DateType'
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectEqualityOperator b/rt/webrt/Elements/SelectEqualityOperator
deleted file mode 100755
index f93dc1af2..000000000
--- a/rt/webrt/Elements/SelectEqualityOperator
+++ /dev/null
@@ -1,18 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectEqualityOperator,v 1.1 2002-08-12 06:17:08 ivan Exp $
-<SELECT NAME ="<%$Name%>">
-% while (my $option = shift @Options) {
-% my $value = shift @Values;
-<OPTION VALUE="<%$value%>"
-% if ($Default eq '$value') {
-SELECTED
-% }
-><%$option%></OPTION>
-% }
-</SELECT>
-
-<%ARGS>
-$Name => undef
-@Options => ('less than', 'equal to', 'greater than', 'not equal to')
-@Values => qw(< = > !=)
-$Default => undef
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectKeyword b/rt/webrt/Elements/SelectKeyword
deleted file mode 100644
index c4bd9e1aa..000000000
--- a/rt/webrt/Elements/SelectKeyword
+++ /dev/null
@@ -1,38 +0,0 @@
-<SELECT NAME=<%$Name%> <%$Size%> <%$Multiple%>>
-<OPTION VALUE="">-</OPTION>
-<OPTION VALUE="NULL">(empty)</OPTION>
-%   foreach my $kid ( keys %{$Descendents} ) {
-<OPTION VALUE="<% $kid %>" 
-%if ($kid == $Default) {
-SELECTED
-%}
-><% $Descendents->{$kid} %></OPTION>
-% }
-</SELECT>
-
-
-<%INIT>
-
-unless (defined $KeywordObj) {
-    $KeywordObj = new RT::Keyword($session{'CurrentUser'});
-    $KeywordObj->Load($Root);
-}
-my $Descendents = $KeywordObj->Descendents();
-
-if ($Multiple) {
-	$Multiple = "MULTIPLE";
-}
-if ($Size) {
-	$Size="SIZE=$Size";
-}	
-
-
-</%INIT>
-<%ARGS>
-$Multiple => undef
-$Size => undef
-$Name => 'Keyword'
-$KeywordObj => undef
-$Root => 0
-$Default => undef
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectKeywordOptions b/rt/webrt/Elements/SelectKeywordOptions
deleted file mode 100644
index f56dfe52c..000000000
--- a/rt/webrt/Elements/SelectKeywordOptions
+++ /dev/null
@@ -1,18 +0,0 @@
-<PERL>
-while (my $keyword = $keywords->Next()) {
-    my ($selected);
-    if $keyword->Id == $default
-</PERL>
-<OPTION VALUE="<%$keyword->id%>"><% '-' x $depth %><%$keyword->Name%></OPTION>
-<& SelectKeywordOptions, depth => ($depth+1), root => $keyword->id &>
-%}
-<%INIT>
-
-my $keywords = new RT::Keywords($session{'CurrentUser'});
-$keywords->LimitToParent($root);
-
-</%INIT>
-<%ARGS>
-$root => undef
-$depth => 0
-</%ARGS>
\ No newline at end of file
diff --git a/rt/webrt/Elements/SelectLinkType b/rt/webrt/Elements/SelectLinkType
deleted file mode 100644
index 22cde3dff..000000000
--- a/rt/webrt/Elements/SelectLinkType
+++ /dev/null
@@ -1,16 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectLinkType,v 1.1 2002-08-12 06:17:08 ivan Exp $
-
-<SELECT NAME ="<%$Name%>">
-% foreach ('MemberOf', 'DependsOn', 'RefersTo') { # TODO: Merging!
-<OPTION VALUE="<%$_%>"><%$_%></OPTION>
-% }
-</SELECT>
-
-<%ARGS>
-$Name => "LinkType"
-$Default => undef
-</%ARGS>
-
-<%INIT>
-# TODO handle Default
-</%INIT>
diff --git a/rt/webrt/Elements/SelectMatch b/rt/webrt/Elements/SelectMatch
deleted file mode 100644
index 7f3a94fae..000000000
--- a/rt/webrt/Elements/SelectMatch
+++ /dev/null
@@ -1,31 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectMatch,v 1.1 2002-08-12 06:17:08 ivan Exp $
-<SELECT NAME ="<%$Name%>">
-<OPTION VALUE="LIKE" <%$LikeDefault%>><%$Like%></OPTION>
-<OPTION VALUE="NOT LIKE" <%$NotLikeDefault%>><%$NotLike%></OPTION>
-<OPTION VALUE="=" <%$TrueDefault%>><%$True%></OPTION>
-<OPTION VALUE="!=" <%$FalseDefault%>><%$False%></OPTION>
-</SELECT>
-
-<%ARGS>
-$Name => undef
-$Like => 'contains'
-$NotLike => "doesn't contain"
-$True => 'is'
-$False => "isn't"
-$Default => undef
-</%ARGS>
-<%INIT>
-my ($TrueDefault, $FalseDefault, $LikeDefault, $NotLikeDefault);
-if ($Default && $Default !~ /true/i) {
-	$FalseDefault = "SELECTED";
-}
-elsif ($Default && $Default !~ /false/i) {
-	$TrueDefault = "SELECTED";
-} 
-elsif ($Default && $Default !~ /notlike/i) {
-	$NotLikeDefault = "SELECTED";
-}
-else {
-	$LikeDefault = "SELECTED";
-}
-</%INIT>
diff --git a/rt/webrt/Elements/SelectNewTicketQueue b/rt/webrt/Elements/SelectNewTicketQueue
deleted file mode 100755
index 9f5cd2871..000000000
--- a/rt/webrt/Elements/SelectNewTicketQueue
+++ /dev/null
@@ -1,9 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectNewTicketQueue,v 1.1 2002-08-12 06:17:08 ivan Exp $
-<& SelectQueue, Name => $Name, Verbose => $Verbose, Default => $Default,
-	ShowAllQueues => 0, ShowNullOption => 0 &>
-
-<%ARGS>
-$Name => 'Queue'
-$Verbose => undef
-$Default => undef
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectOwner b/rt/webrt/Elements/SelectOwner
deleted file mode 100755
index 59ebf3631..000000000
--- a/rt/webrt/Elements/SelectOwner
+++ /dev/null
@@ -1,22 +0,0 @@
-<SELECT NAME="<%$Name%>">
-<OPTION VALUE="">-</OPTION>
-<OPTION <% ($RT::Nobody->Id() == $Default) && "SELECTED" %> VALUE="<%$RT::Nobody->Id%>"><%$RT::Nobody->Name%></OPTION>
-%while ( my $User = $Users->Next())  {
-% if ((!defined $QueueObj) || ($User->HasQueueRight(Right => 'OwnTicket', QueueObj => $QueueObj, TicketObj => $TicketObj))){
-<OPTION VALUE="<%$User->Id()%>" <% ($User->Id() == $Default) && "SELECTED" %>><%$User->Name()%></OPTION>
-% }
-%}
-</SELECT>
-
-<%INIT>
-my $Users = RT::Users->new($session{CurrentUser});
-$Users->LimitToPrivileged;
-</%INIT>
-
-<%ARGS>
-$QueueObj => undef
-$Name => undef
-$Default => undef
-$User => undef
-$TicketObj => undef
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectQueue b/rt/webrt/Elements/SelectQueue
deleted file mode 100755
index d63b17b4e..000000000
--- a/rt/webrt/Elements/SelectQueue
+++ /dev/null
@@ -1,38 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectQueue,v 1.1 2002-08-12 06:17:08 ivan Exp $
-
-% if ($Lite) {
-<INPUT NAME="<%$Name%>" size=25 DEFAULT="<%$d->Name%>">
-% } else {
-<SELECT NAME ="<%$Name%>">
-% if ($ShowNullOption) {
-<OPTION VALUE="">-</OPTION>
-% }
-% while (my $queue=$q->Next) {
-% if ($ShowAllQueues || $queue->CurrentUserHasRight('CreateTicket')) {
-<OPTION VALUE="<%$queue->Id%>" <%($queue->Id == $Default) && 'SELECTED'%>><%$queue->Name%>
-%   if (($Verbose) and ($queue->Description) ){
-(<%$queue->Description%>)
-%  }
-</OPTION>
-% }
-% }
-</SELECT>
-% }
-<%ARGS>
-$ShowNullOption => 1
-$ShowAllQueues => 1
-$Name => undef
-$Verbose => undef
-$Default => undef
-$Lite => 0
-</%ARGS>
-
-<%INIT>
-
-my $q=new RT::Queues($session{'CurrentUser'});
-$q->UnLimit;
-
-my $d = new RT::Queue($session{'CurrentUser'});
-$d->Load($Default);
-
-</%INIT>
diff --git a/rt/webrt/Elements/SelectResultsPerPage b/rt/webrt/Elements/SelectResultsPerPage
deleted file mode 100644
index 0699c6868..000000000
--- a/rt/webrt/Elements/SelectResultsPerPage
+++ /dev/null
@@ -1,22 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectResultsPerPage,v 1.1 2002-08-12 06:17:08 ivan Exp $
-
-%# TODO: Better default handling
-
-<SELECT NAME ="<%$Name%>">
-% foreach my $value (@values) {
-<OPTION VALUE="<%$value%>" <% $value == $Default && 'SELECTED' %>>
-<% shift @labels %>
-</OPTION>
-% }
-</SELECT>
-
-<%INIT>
-my @values = qw(0 10 25 50 100);
-my @labels = qw(Unlimited 10 25 50 100);
-</%INIT>
-<%ARGS>
-
-$Name => undef
-$Default => 50
-
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectSortOrder b/rt/webrt/Elements/SelectSortOrder
deleted file mode 100644
index 6dc900631..000000000
--- a/rt/webrt/Elements/SelectSortOrder
+++ /dev/null
@@ -1,18 +0,0 @@
-<SELECT NAME="<%$Name%>">
-%foreach my $order (@orders) {
-<OPTION VALUE="<%$order%>" <%$order eq $Default && 'SELECTED' %>>
-<% shift @order_names %>
-</OPTION>
-% }
-</SELECT>
-
-<%INIT>
-my @orders = qw (ASC DESC);
-my @order_names = qw (Ascending Descending);
-
-</%INIT>
-
-<%ARGS>
-$Name => 'SortOrder'
-$Default => 'ASC'
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectStatus b/rt/webrt/Elements/SelectStatus
deleted file mode 100755
index 92df7c619..000000000
--- a/rt/webrt/Elements/SelectStatus
+++ /dev/null
@@ -1,17 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectStatus,v 1.1 2002-08-12 06:17:08 ivan Exp $
-
-<SELECT NAME ="<%$Name%>">
-<OPTION VALUE="">-</OPTION>
-%foreach my $status (@status) {
-<OPTION VALUE="<%$status%>" <%($Default eq $status) && 'SELECTED'%>><%$status%></OPTION>
-% }
-</SELECT>
-<%ONCE>
-my $queue = new RT::Queue($session{'CurrentUser'});
-my @status = $queue->StatusArray();
-</%ONCE>
-<%ARGS>
-$Name => undef
-$Default => undef
- 
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectTicketSortBy b/rt/webrt/Elements/SelectTicketSortBy
deleted file mode 100644
index 02021decc..000000000
--- a/rt/webrt/Elements/SelectTicketSortBy
+++ /dev/null
@@ -1,15 +0,0 @@
-<SELECT NAME="<%$Name%>">
-% foreach my $field (@sortfields) {
-<OPTION VALUE="<%$field%>" <%$field eq $Default && 'SELECTED'%>><%$field%></OPTION>
-% }
-</SELECT>
-
-<%INIT>
-my $tickets = new RT::Tickets($session{'CurrentUser'});
-my @sortfields = $tickets->SortFields();
-
-</%INIT>
-<%ARGS>
-$Name => 'SortTicketsBy'
-$Default => 'id'
-</%ARGS>
diff --git a/rt/webrt/Elements/SelectUsers b/rt/webrt/Elements/SelectUsers
deleted file mode 100755
index f517d3510..000000000
--- a/rt/webrt/Elements/SelectUsers
+++ /dev/null
@@ -1,8 +0,0 @@
-<select name="UserField">
-<option value="Name">User Id
-<option value="EmailAddress">Email
-<option value="RealName">Name
-<option value="Organization">Organization
-</select>
-<& /Elements/SelectMatch, Name=> 'UserOp' &>
-<input size=8 name="UserString">
diff --git a/rt/webrt/Elements/SelectWatcherType b/rt/webrt/Elements/SelectWatcherType
deleted file mode 100644
index 5a855192c..000000000
--- a/rt/webrt/Elements/SelectWatcherType
+++ /dev/null
@@ -1,26 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Elements/Attic/SelectWatcherType,v 1.1 2002-08-12 06:17:08 ivan Exp $
-%# portions Copyright 2000 Tobias Brox <tobix@fsck.com>
-%# Request Tracker is Copyright 1996-2000 Jesse Vincent <jesse@fsck.com>
-
-<SELECT NAME ="<%$Name%>">
-<OPTION VALUE="none">-</OPTION>
-%# Make nice options:
-%for my $option (@types) {
-<OPTION VALUE="<%$option%>" <%$option eq $Default && "SELECTED"%>><%$option%></OPTION>
-%}
-</SELECT>
-
-<%INIT>
-my @types;
-if ($Scope =~ 'queue') {
-   @types = qw(Cc AdminCc);
-}
-else { 
-   @types = qw(Requestor Cc AdminCc);
-}
-</%INIT>
-<%ARGS>
-$Default=>undef
-$Scope => 'ticket'
-$Name => 'WatcherType'
-</%ARGS>
diff --git a/rt/webrt/Elements/ShadedBox b/rt/webrt/Elements/ShadedBox
deleted file mode 100755
index 334b57975..000000000
--- a/rt/webrt/Elements/ShadedBox
+++ /dev/null
@@ -1,5 +0,0 @@
-<div align="left"><span class=label><%$title |n %></span><br><b><%$content |n %></b></div>
-<%ARGS>
-$title => undef
-$content => "&nbsp;"
-</%ARGS>
diff --git a/rt/webrt/Elements/Submit b/rt/webrt/Elements/Submit
deleted file mode 100755
index 7b75e9e98..000000000
--- a/rt/webrt/Elements/Submit
+++ /dev/null
@@ -1,44 +0,0 @@
-<TABLE WIDTH=100% BGCOLOR="<%$color%>" CELLSPACING=0 BORDER=0 CELLPADDING=0 >
-<TR>
-% if ($Reset) {
-<TD>
-<FONT COLOR=#ffd800 >
-<INPUT TYPE=RESET VALUE="<%$ResetLabel%>">
-</FONT>
-</TD>
-%}
-<TD>
-&nbsp;
-</TD>
-<TD ALIGN=RIGHT VALIGN=CENTER>
-
-<FONT COLOR=#ffd800>
-
-% if ($AlternateLabel) {
-<B><%$AlternateCaption%>
-<INPUT TYPE=SUBMIT
-%if ($Name) {
-NAME="<%$Name%>"
-%}
-VALUE='<%$AlternateLabel%>'></B>
-% }
-
-<B><%$Caption%>
-<INPUT TYPE=SUBMIT
-%if ($Name) {
-NAME="<%$Name%>"
-% }
- VALUE='<%$Label%>'></B></FONT>
-</TD>
-</TR>
-</TABLE>
-<%ARGS>
-$color => "#336699"
-$Caption => undef
-$AlternateCaption => undef
-$AlternateLabel => undef
-$Label => 'Submit'
-$Name => undef
-$Reset => undef
-$ResetLabel => 'Reset'
-</%ARGS>
diff --git a/rt/webrt/Elements/Tabs b/rt/webrt/Elements/Tabs
deleted file mode 100755
index 6eacf391a..000000000
--- a/rt/webrt/Elements/Tabs
+++ /dev/null
@@ -1,133 +0,0 @@
-<TABLE WIDTH=100%>
-    <TR>
-      <TD VALIGN=TOP>
-	<TABLE cellspacing=1>
-	  <TR>
-% foreach $tab (sort keys %{$toptabs}) {
-	    <TD ALIGN=CENTER>
-	      <font size=+1>
-		[<A 
-% if ($current_toptab eq $toptabs->{$tab}->{'path'}) {
-class='currenttab'
-% } 
-	HREF="<%$RT::WebPath%>/<% $toptabs->{$tab}->{'path'}%>"><% $toptabs->{$tab}->{'title'}%></A>]
-
-
-	      </font>
-	    </TD>
-% }
-	  </TR>
-	</TABLE>
-<BR>
-% if ($tabs_scalar) {
-<% $tabs_scalar |n%>
-% }
-% if ($tabs) {
-	
-	<TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0>	
-	  <TR>
-% foreach $tab (sort keys %{$tabs}) {
-	    <TD ALIGN=CENTER VALIGN=TOP>
-[<A 
-% if ($current_tab eq $tabs->{$tab}->{'path'}) {
-class='currenttab' 
-% } 
-HREF="<%$RT::WebPath%>/<% $tabs->{$tab}->{'path'}%>"><% $tabs->{$tab}->{'title'}%></A>]</TD>
-%}
-	  </TR>
-	</TABLE>
-%}
-
-<BR>
-% if ($subtabs_scalar) {
-<% $subtabs_scalar |n%>
-% }
-% if ($subtabs) {
-	<TABLE>	
-	  <TR>
-% foreach $tab (sort keys %{$subtabs}) {
-	    <TD ALIGN=CENTER>
-	      [<A HREF="<%$RT::WebPath%>/<% $subtabs->{$tab}->{'path'}%>"><% $subtabs->{$tab}->{'title'}%></A>]
-	    </TD>
-%}
-	  </TR>
-	</TABLE>
-%}
-      </TD>
-      <TD VALIGN=TOP ALIGN=RIGHT>
-<TABLE>
-<TR>
-
-% foreach $action (sort keys %{$topactions}) {
-<TD><font size=-1><%$topactions->{"$action"}->{'html'} |n %></font></TD>
-% }
-</TR>
-</TABLE>
-	
-
-	
-% if ($actions) {
-<TABLE><TR>
-%  foreach $action (sort keys %{$actions}) {
-<TD>
-<FONT SIZE=-1>
-% if ($actions->{"$action"}->{'html'}) {
-<%$actions->{"$action"}->{'html'} |n%>
-% } else {
-<A HREF="<%$RT::WebPath%>/<% $actions->{$action}->{'path'}%>"><% $actions->{$action}->{'title'}%></A>
-% }
-</FONT>
-</TD>
-%  }
-</TR></TABLE>
-% }
-	
-% if ($subactions_scalar) {
-<% $subactions_scalar |n%>
-% }
-% if ($subactions) {
-<BR>|&nbsp;
-%  foreach $action (sort keys %{$subactions}) {
-<%$subactions->{"$action"}->{'html'} |n%>&nbsp;|
-%  }
-% }
-      </TD>
-    </TR>
-  </TABLE>
-
-
-<%INIT>
-my ($tab, $action);
-my $toptabs = {    A => { title => 'Home',
-                           path => '',
-                         },
-                    B => { title => 'Search',
-                        path => 'Search/Listing.html'
-                      },
-
-                    D => { title => 'Configuration',
-                           path => 'Admin/'
-                         }
-                 };
-                    
-
-my $topactions = {
-	A => { html => $m->scomp('/Elements/CreateTicket')	
-		},
-	B => { html => $m->scomp('/Elements/GotoTicket') 
-		}
-	};
-</%INIT>
-<%ARGS>
-$current_toptab =>  "none"
-$current_tab => "none"
-$current_subtab => "none"
-$tabs => undef
-$tabs_scalar => undef
-$subtabs => undef
-$actions => undef
-$subactions => undef
-$subtabs_scalar => undef
-$subactions_scalar => undef
-</%ARGS>
-
diff --git a/rt/webrt/Elements/TitleBoxEnd b/rt/webrt/Elements/TitleBoxEnd
deleted file mode 100755
index bdd41065a..000000000
--- a/rt/webrt/Elements/TitleBoxEnd
+++ /dev/null
@@ -1,10 +0,0 @@
-</TD></TR></TABLE>
-</TD>
-</TR>
-<TR><TD COLSPAN=4><IMG SRC="<%$RT::WebImagesURL%>spacer.gif" height=1 ALT="&nbsp;"width=1></TD>
-</TABLE>
-<%ARGS>
-$title => undef
-$content => undef
-</%ARGS>
-
diff --git a/rt/webrt/Elements/TitleBoxStart b/rt/webrt/Elements/TitleBoxStart
deleted file mode 100755
index 6d0f1f91a..000000000
--- a/rt/webrt/Elements/TitleBoxStart
+++ /dev/null
@@ -1,20 +0,0 @@
-<TABLE CLASS="<%$class%>" BGCOLOR="<%$color%>" CELLSPACING=0 BORDER=0 CELLPADDING=0 WIDTH="<%$width%>">
-<TR><TD ROWSPAN=2><IMG SRC="<%$RT::WebImagesURL%>spacer.gif" width=1 height=1 ALT=""></TD>
-<TD valign=middle align=left bgcolor="<%$color%>">&nbsp;<font size=-1 color="#ffffff"><b><% $title_href && "<A CLASS=\"$title_class\" HREF=\"$title_href\">"|n%><%$title |n %><%  $title_href && "</A>" |n%></b></font></TD>
-<TD  ALIGN="right" valign=middle bgcolor="<%$color%>"><FONT color="#ffffff" SIZE=-1><%$titleright |n %></FONT>&nbsp;</TD>
-<TD ROWSPAN=2><IMG SRC="<%$RT::WebImagesURL%>spacer.gif" width=1 height=1 ALT=""></TD></TR>
-<TR><TD COLSPAN=2 bgcolor="<%$contentbg%>" valign=top align=left WIDTH=100%>
-<TABLE CELLPADDING=2 WIDTH=100%><TR><TD>
-<%ARGS>
-$width => "100%"
-$class => undef
-
-$title_href => undef
-$title => undef
-$title_class => undef
-
-$titleright_href => undef
-$titleright => undef
-$contentbg => "#dddddd"
-$color => "#336699"
-</%ARGS>
diff --git a/rt/webrt/Elements/ViewUser b/rt/webrt/Elements/ViewUser
deleted file mode 100644
index 92446e6ef..000000000
--- a/rt/webrt/Elements/ViewUser
+++ /dev/null
@@ -1,29 +0,0 @@
-
-<& /Elements/TitleBoxStart, 
-	title => "<a class='inverse' href=\"$RT::WebPath/Search/Listing.html?LimitRequestorById=1&IdOfRequestor=".$User->id."\">Tickets from $name</a>",
-	titleright=> "<a class='inverse' href=\"$RT::WebPath/EditUserComments.html?id=".$User->id."\">Comments about $name</a>" &>
-<TABLE WIDTH="100%">
-<tr>
-<td halign=left valign=top>
-%while (my $w=$tickets->Next) {
-<%$w->Id%>: <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$w->id%>"><%$w->Subject%></a> (<%$w->Status%>)<BR>
-%}
-</td>
-<td align=right valign=top>
-	<% ($User->Comments || "No comment entered about this user") %>
-</tr>
-</table>
-<& /Elements/TitleBoxEnd &>
-
-<%ARGS>
-$User=>undef
-</%ARGS>
-
-<%INIT>
-my $name=$User->RealName || $User->EmailAddress;	
-
-my $tickets = new RT::Tickets($session{'CurrentUser'});
-$tickets->LimitRequestor(VALUE => $User->EmailAddress);
-
-
-</%INIT>
diff --git a/rt/webrt/Elements/dayMenu b/rt/webrt/Elements/dayMenu
deleted file mode 100755
index 6591b05d2..000000000
--- a/rt/webrt/Elements/dayMenu
+++ /dev/null
@@ -1,19 +0,0 @@
-<%doc>-------------------------------------------------------------------
-dayMenu: Display a pulldown menu of days of the month (1 to 31)
-
-Optional arguments:
-$menu_name - Name of menu, defaults to 'day'
-$current - Selected day value (1 to 31)
--------------------------------------------------------------------</%doc>
-
-<select name="<% $menu_name %>">
-<option value="-1">-
-% foreach my $day (1..31) {
-<option value="<% $day %>" <% $day==$current ? "selected" : "" %>><% sprintf("%02d",$day) %>
-% }
-</select>
-
-<%args>
-$menu_name=>'day'
-$current=>undef
-</%args>
diff --git a/rt/webrt/Elements/monthMenu b/rt/webrt/Elements/monthMenu
deleted file mode 100755
index b9a71d3f9..000000000
--- a/rt/webrt/Elements/monthMenu
+++ /dev/null
@@ -1,37 +0,0 @@
-<%doc>-------------------------------------------------------------------
-monthMenu: Display a pulldown menu of months
-
-Optional arguments:
-$menu_name - Name of menu, defaults to 'month'
-$current - Selected month value (1 to 12)
-$format - Choice of month labels:
-   'full'    (January, February, ...)
-   'short'   (Jan, Feb, ...)
-   'numeric' (1, 2, ...)
-  Defaults to 'full'. The format only affects appearance; the menu
-  values are always numeric.
--------------------------------------------------------------------</%doc>
-
-<select name="<% $menu_name %>">
-<option value="-1">-
-% foreach my $month (1..12) {
-<option value="<% $month %>" <% $month==$current ? "selected" : "" %>>
-%   if ($format eq 'full') {
-<% $month_names[$month-1] %>
-%   } elsif ($format eq 'short') {
-<% substr($month_names[$month-1],0,3) %>
-%   } elsif ($format eq 'numeric') {
-<% sprintf("%02d",$month) %>
-%   }
-% }
-</select>
-
-<%init>
-my @month_names = qw(January February March April May June July August September October November December);
-</%init>
-
-<%args>
-$menu_name=>'month'
-$current=>undef
-$format=>'full'
-</%args>
diff --git a/rt/webrt/Elements/yearMenu b/rt/webrt/Elements/yearMenu
deleted file mode 100755
index 4a0e7a772..000000000
--- a/rt/webrt/Elements/yearMenu
+++ /dev/null
@@ -1,24 +0,0 @@
-<%doc>-------------------------------------------------------------------
-yearMenu: Display a pulldown menu of years.
-
-Optional arguments:
-$menu_name - Name of menu, defaults to 'year'
-$current - Selected year value
-$min - Minimum year appearing in menu; defaults to current year
-$max - Maximum year appearing in menus; defaults to $min plus 10.
--------------------------------------------------------------------</%doc>
-
-<select name="<% $menu_name %>">
-<option value="-1">-
-% foreach my $year ($min..$max) {
-<option value="<% $year %>" <% $year==$current ? "selected" : "" %>>
-<% $year %>
-% }
-</select>
-
-<%args>
-$menu_name=>'year'
-$current=>(localtime)[5]+1900
-$min=>(localtime)[5]+1900-1
-$max=>$min+10
-</%args>
diff --git a/rt/webrt/NoAuth/Logout.html b/rt/webrt/NoAuth/Logout.html
deleted file mode 100755
index a00ae9675..000000000
--- a/rt/webrt/NoAuth/Logout.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>RT: Logout</TITLE>
- <META HTTP-EQUIV="Refresh" CONTENT="0;URL=<%$RT::WebPath%>/">
-</HEAD>
-<BODY>
-<p>You have been logged out of RT.
-
-
-<br>
-<br>
-<A HREF="<%$RT::WebPath%>/">You're welcome to login again</a>
-
-
-<%PERL>
-if (defined %session) {
-	%session = undef;
-}
-$m->abort();
-</%PERL>
-
-
diff --git a/rt/webrt/NoAuth/Reminder.html b/rt/webrt/NoAuth/Reminder.html
deleted file mode 100755
index a814a912f..000000000
--- a/rt/webrt/NoAuth/Reminder.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<& /Elements/Header, title => 'Password Reminder' &>
-
-Not yet implemented.
diff --git a/rt/webrt/NoAuth/images/rt.jpg b/rt/webrt/NoAuth/images/rt.jpg
deleted file mode 100644
index a137a932b..000000000
Binary files a/rt/webrt/NoAuth/images/rt.jpg and /dev/null differ
diff --git a/rt/webrt/NoAuth/images/spacer.gif b/rt/webrt/NoAuth/images/spacer.gif
deleted file mode 100644
index 5bfd67a2d..000000000
Binary files a/rt/webrt/NoAuth/images/spacer.gif and /dev/null differ
diff --git a/rt/webrt/NoAuth/webrt.css b/rt/webrt/NoAuth/webrt.css
deleted file mode 100755
index a71d05720..000000000
--- a/rt/webrt/NoAuth/webrt.css
+++ /dev/null
@@ -1,102 +0,0 @@
-BODY, TD {font-family: Helvetica, Arial, sans-serif}
-TD {border-color: #cccccc }
-
-BLOCKQUOTE.message {
-	font-size: 80%;
-	font-family: "Helvetica", sans-serif;
-}
-
-
-BODY {
-  color: #000;
-  background: #FFFFFF;
-  font-family: "Helvetica", sans-serif;
-
-
-}
-
-TD, TH { /* ns workaround */
-  font-family: "Helvetica", sans-serif;
-}
-
-TR.oddline { 
-    background-color : #eeeeee;
-}
-
-H1, H2, H3 { 
-  margin-top: 0.2em;
-  color: #336699;
-  font-family: "Helvetica", sans-serif;
-
-  clear: both;
-}
-
-
-DIV.endmatter { margin-left: -7% }
-
-
-
-A { font-weight: bold; 
-      		color: #000000;
-	    /* border: none -- breaks NS 4.x */ }
-
-.currenttab { background-color: #cccccc; }
-
-.inverse { color: #ffffff; }
-
-
-
-A:link IMG, A:visited IMG { border-style: none }
-
-A IMG { color: white } /* The only way to hide the border in NS 4.x */
-
-.hide {
-  display: none;
-  color: white;
-}
-
-SPAN.date { font-size: 0.8em }
-
-SPAN.attribution {
-  font-weight: bold
-}
-
-SPAN.label { font-size: 0.8em; 
-}
-
-BLOCKQUOTE {
-  font-style: italic;
-  /* color: #990; */
-}
-
-ADDRESS { 
-  text-align: right;
-  font-weight: bold;
-  font-style: italic 
-}
-
-BLOCKQUOTE P {			/* Try to avoid space above the attribution */
-  margin-bottom: 0;
-}
-BLOCKQUOTE ADDRESS {
-  margin: 0;
-}
-
-.motto, .motto A {font: italic 120%/1.3 Georgia, serif; color: #990}
-
-.emphasized {
-  font-weight: bold
-}
-
-/* Why o why does this break Netscape 4.x?
-IMG { 
-  border: none
-}
-*/
-
-P.map-also { font-style: italic; margin-left: 15%; text-align: right }
-
-.oddline { 
-background-color : #eeeeee;
-
-}
diff --git a/rt/webrt/Search/Bulk.html b/rt/webrt/Search/Bulk.html
deleted file mode 100755
index ac688d7cd..000000000
--- a/rt/webrt/Search/Bulk.html
+++ /dev/null
@@ -1,186 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Search/Attic/Bulk.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2001 Jesse Vincent <jesse@fsck.com>
-<& /Elements/Header, Title => "Bulk ticket update" &>
-<& /Elements/Tabs &>
-
-<& /Elements/ListActions, actions => \@results &>
-
-<FORM METHOD=POST>
-<TABLE WIDTH=100% border=0 cellpadding=3 CELLSPACING=0>
-<TR>
-<TH>Update</TH>
-%foreach my $col (@cols) {
-% my $colalias = $col;
-% $colalias =~ s/(Obj\-\>|)(Name|AsString)//;
-
-<TH ><% $colalias %>&nbsp;</TH>
-%}
-</TR>
-
-<%PERL>
-
-my $i;
-
-
-      
-$session{'tickets'}->RedoSearch();
-while (my $Ticket = $session{'tickets'}->Next) {
- $i++;
- if ($i % 2) {
-     $bgcolor = "#dddddd";
- }
- else {
-     $bgcolor = "#ffffff";
- }
-      </%PERL>
-<TR bgcolor="<%$bgcolor%>">
-<TD><input type=checkbox name="UpdateTicket<%$Ticket->Id%>" CHECKED></TD>
-%# The ticket view is controlled by config.pm, WebOptions
-%foreach my $col (@cols) {
-<TD>
-% if ($col eq 'id') {
-<A HREF="<% $RT::WebPath%>/Ticket/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id()%></A>
-% }
-%else {
-<% eval "\$Ticket->$col()" %>&nbsp;
-%}
-</TD>
-%}
-</TR>
-%}
-
-
-
-</TABLE>
-
-<HR>
-
-
-<& /Elements/TitleBoxStart, title => 'Update selected tickets' &>
-<TABLE>
-<TR>
-<TD VALIGN=TOP>
-<UL>
-<li> Make Owner <& /Elements/SelectOwner, Name => "Owner" &>
-(<input type=checkbox name="ForceOwnerChange"> Force change)
-<li> Add Requestor <INPUT Name="AddRequestor" SIZE=20>
-<li> Remove Requestor <INPUT Name="DeleteRequestor" SIZE=20>
-<li> Add Cc <INPUT Name="AddCc" SIZE=20>
-<li> Remove Cc <INPUT Name="DeleteCc" SIZE=20>
-<li> Add AdminCc <INPUT Name="AddAdminCc" SIZE=20>
-<li> Remove AdminCc <INPUT Name="DeleteAdminCc" SIZE=20>
-</UL>
-</TD>
-<TD VALIGN=TOP>
-<UL>
-<li> Make subject <INPUT Name="Subject" SIZE=20>
-<li> Make priority <INPUT Name="Priority" SIZE=4>
-<li> Make queue <& /Elements/SelectQueue, Name => "Queue" &>
-
-<li>Make Status <& /Elements/SelectStatus, Name => "Status" &>
-
-
-
-<li> Make date Starts <& /Elements/SelectDate, Name => "Starts_Date", ShowTime => 0, Default => '' &>
-<li> Make date Started <& /Elements/SelectDate, Name => "Started_Date", ShowTime => 0, Default => '' &>
-<li> Make date Told <& /Elements/SelectDate, Name => "Told_Date", ShowTime => 0, Default => '' &>
-<li> Make date Due <& /Elements/SelectDate, Name => "Due_Date", ShowTime => 0, Default => '' &>
-<li> Make date Resolved <& /Elements/SelectDate, Name => "Resolved_Date", ShowTime => 0, Default => '' &>
-
-
-% while ( my $KeywordSelect = $KeywordSelects->Next ) {
-
-<li> Add <% $KeywordSelect->Name %> <& /Elements/SelectKeyword, Name => "AddToKeywordSelect".$KeywordSelect->id, KeywordObj => $KeywordSelect->KeywordObj &>
-<li> Remove <% $KeywordSelect->Name %> <& /Elements/SelectKeyword, Name => "DeleteFromKeywordSelect".$KeywordSelect->id, KeywordObj => $KeywordSelect->KeywordObj &>
-% }
-
-</UL>
-
-
-</TD>
-</TR>
-</table>
-<& /Elements/TitleBoxEnd&>
-<& /Elements/TitleBoxStart, title => 'Add comments or replies to selected tickets' &>
-<table>
-<tr><td align=right>Update Type:</td>
-<td><select name="UpdateType">
-  <option value="private" >Comments (not sent to requestors)</option>
-<option value="response" >Response to requestors</option>
-</select> 
-</td></tr>
-<tr><td align=right>Subject:</td><td> <input name="UpdateSubject" size=60 value=""></td></tr>
- <tr><td align=right>Attach:</td><td><input name="UpdateAttachment" type="file"></td></tr>
- <tr><td colspan="2">
- <& /Elements/MessageBox, Name=>"UpdateContent"&>
- </td></tr>
- </table>
-<& /Elements/TitleBoxEnd &>
-
-
-
-
-<& /Elements/Submit &>
-
-
-</FORM>
-<%INIT>
-
-# Iterate through the ARGS hash and remove anything with a null value.
-map ($ARGS{$_} =~ /^$/ && (delete $ARGS{$_}), keys %ARGS);
-
-my ($bgcolor, @results);
-my @cols = qw(id Status Priority Subject QueueObj->Name OwnerObj->Name RequestorsAsString DueAsString );
-
-Abort("No search to operate on.") unless ($session{'tickets'});
-
-
-my $do_comment_reply=0;
-# Prepare for ticket updates
-$ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
-chomp ($ARGS{'UpdateContent'}) ;
-
-if ($ARGS{'UpdateContent'} &&
-    $ARGS{'UpdateContent'} ne '' &&
-    $ARGS{'UpdateContent'} ne  "-- \n" .
-    $session{'CurrentUser'}->UserObj->Signature) {
-            $do_comment_reply=1;
-}
-
-my $KeywordSelects = new RT::KeywordSelects $session{'CurrentUser'};
-foreach ( $session{'tickets'}->RestrictionValues('Queue') ) {
-    $KeywordSelects->LimitToQueue($_);
-}
-
-$KeywordSelects->IncludeGlobals;
-
-
-#Iterate through each ticket we've been handed
-
-while (my $Ticket = $session{'tickets'}->Next) {
-    $RT::Logger->debug( "Checking Ticket ".$Ticket->Id ."\n");
-    next unless ($ARGS{"UpdateTicket".$Ticket->Id});
-    $RT::Logger->debug ("Matched\n");
-    #Update the basics.
-    my @basicresults = ProcessTicketBasics(TicketObj => $Ticket, ARGSRef => \%ARGS);
-    my @dateresults = ProcessTicketDates(TicketObj => $Ticket, ARGSRef => \%ARGS);
-    my @watchresults = ProcessTicketWatchers(TicketObj => $Ticket, ARGSRef => \%ARGS);    
-    my @selectresults = ProcessTicketObjectKeywords(TicketObj => $Ticket, ARGSRef => \%ARGS);
-    
-   
-     my @updateresults; 
-     if ($do_comment_reply) {
-     ProcessUpdateMessage(TicketObj => $Ticket, ARGSRef => \%ARGS, Actions => \
-@updateresults); 
-    } 
-    my @tempresults = (@watchresults, @basicresults, @dateresults, @updateresults);
-    @tempresults = map { "Ticket ".$Ticket->Id. ": ".$_ } @tempresults;
-
-    
-    #Update the keyword selects
-    #Update the watchers
-    $RT::Logger->debug(join("\n",@tempresults));
-    @results = (@results, @tempresults);
-}
-
-</%INIT>
diff --git a/rt/webrt/Search/Listing.html b/rt/webrt/Search/Listing.html
deleted file mode 100755
index da927fec7..000000000
--- a/rt/webrt/Search/Listing.html
+++ /dev/null
@@ -1,134 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Search/Attic/Listing.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2001 Jesse Vincent <jesse@fsck.com>
-<& /Elements/Header, Title => "Search", Refresh => $session{'tickets_refresh_interval'} &>
-<& /Elements/Tabs, current_toptab => 'Search/Listing.html' &>
-
-
-% unless ($ARGS{'Action'} eq 'Refine') {
-<TABLE WIDTH=100% border=0 cellpadding=3 CELLSPACING=1>
-<TR>
-%foreach my $col (@{Config(\%ARGS, 'QueueListingCols')}) {
-<TH>
-
-<%PERL>	
-my ($order);
- my $attr = $col->{'TicketAttribute'};
- $attr =~ s/Obj->(Name|AsString|AgeAsString)//g;
-  if ($session{'tickets_sort_order'} =~ /^asc$/i) {
-   $order = 'DESC';
- } else {
-   $order = 'ASC';
- }
-</%PERL>
-
-% if (grep (/^$attr$/i, $session{'tickets'}->SortFields)) {
-<A 
-% if ($attr eq $session{'tickets_sort_by'}) {
-class="currenttab"
-% }
-HREF="<% $RT::WebPath%>/Search/Listing.html?Bookmark=<%$session{'tickets'}->FreezeLimits()|u%>&TicketsSortBy=<%$attr%>&TicketsSortOrder=<%$order%>&RowsPerPage=<%$session{'tickets_rows_per_page'}%>">
-<%$col->{Header}%>
-</A>
-% } else {
-<% $col->{Header} %>
-% }
-</TH>
-%}
-</TR>
-
-<%PERL>
-
-my $i;
-      
-$session{'tickets'}->RedoSearch();
-while (my $Ticket = $session{'tickets'}->Next) {
- $i++;
- if ($i % 2) {
-     $bgcolor = "#dddddd";
- }
- else {
-     $bgcolor = "#ffffff";
- }
-      </%PERL>
-<TR bgcolor="<%$bgcolor%>" >
-%# The ticket view is controlled by config.pm, WebOptions
-%foreach my $col (@{Config(\%ARGS,'QueueListingCols')}) {
-<TD><& TicketCell , Ticket=>$Ticket,  Column=>$col &></TD>
-%}
-</TR>
-%}
-
-
-
-</TABLE>
-
-<div align=center>
-<font size=2>
-<a href="Listing.html?GotoPage=1">First page</a>
-&nbsp;&nbsp;
-<a href="Listing.html?GotoPage=Prev">&lt;Previous page</a>
-&nbsp;&nbsp;
-<a href="Listing.html?GotoPage=Next">Next page&gt;</a>
-%#&nbsp;&nbsp;<form method=get action="Listing.html">Goto page <input name=GotoPage size=2></form>
-</font>
-</div>
-% if ($session{'tickets'}->Count()) { 
-<div align=right>
-<a href="Bulk.html">Update all these tickets at once</a>
-</div>
-% }
-<HR>
-
-% } #endif {$ARGS{'Action'} eq 'Refine')
-<TABLE WIDTH="100%">
-<TR>
-<TD VALIGN="TOP">
-<& /Elements/TitleBoxStart, title => 'Search Criteria'&>
-
-<A HREF="<% $RT::WebPath%>/Search/Listing.html?ClearRestrictions=1">New search</a><br>
-<A HREF="<% $RT::WebPath%>/Search/Listing.html?Bookmark=<%$session{'tickets'}->FreezeLimits()|u%>&TicketsSortBy=<%$session{'tickets_sort_by'}%>&TicketsSortOrder=<%$session{'tickets_sort_order'}%>&RowsPerPage=<%$session{'tickets_rows_per_page'}%>">Bookmarkable URL for this search</a>
-<BR>
-<BR>
-% my %restrictions=$session{'tickets'}->DescribeRestrictions();
-% my %seen_restrictions=();
-% foreach $row (keys %restrictions){
-%  my $tmp=$restrictions{"$row"};
-%  if( ! defined( $seen_restrictions{"$tmp"} ) ){
-<%$restrictions{"$row"}%> <A HREF="<% $RT::WebPath%>/Search/Listing.html?DeleteRestriction=<%$row%>">[delete]</a><br>
-%   } else {
-%     $session{'tickets'}->DeleteRestriction($row);
-<b>Deleted Duplicate Restriction <i><%$tmp%></i></b><br>
-% }
-% $seen_restrictions{"$tmp"}++;
-%}
-<& /Elements/TitleBoxEnd&>
-</TD>
-<TD>
-
-<& PickRestriction &>
-
-</TD>
-</TR>
-</TABLE>
-
-<%INIT>
-
-my $bgcolor;
-require RT::Interface::Web;
-
-$session{'i'}++;
-if ($session{'tickets'}) {
-    if ( ($ARGS{'ClearRestrictions'}) ||
-	 ($ARGS{'NewSearch'}) ) {
-	$session{'tickets'}->ClearRestrictions;
-    }
-    
-    if ($ARGS{'DeleteRestriction'}) {
-	$session{'tickets'}->DeleteRestriction($ARGS{'DeleteRestriction'});
-    }
-}
-&ProcessSearchQuery(ARGS=>\%ARGS);
-
-my $row;
-
-</%INIT>
diff --git a/rt/webrt/Search/PickRestriction b/rt/webrt/Search/PickRestriction
deleted file mode 100755
index 82f576c1f..000000000
--- a/rt/webrt/Search/PickRestriction
+++ /dev/null
@@ -1,112 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Search/Attic/PickRestriction,v 1.1 2002-08-12 06:17:09 ivan Exp $
-<FORM ACTION="Listing.html" METHOD="GET">
-<INPUT TYPE=HIDDEN NAME="Bookmark" VALUE="<% $session{'tickets'}->FreezeLimits()|u %>">
-<& /Elements/TitleBoxStart, title => 'Refine Search'&>
-<INPUT TYPE=HIDDEN NAME="CompileRestriction" VALUE=1>
-
-<ul>
-<li>Owner is  <& /Elements/SelectBoolean, Name => "OwnerOp", 
-					  TrueVal=> '=', 
-					  FalseVal => '!=' 
-&> 
-<& /Elements/SelectOwner, Name => "ValueOfOwner" &>
-
-<li>
-Requestor email address 
-<& /Elements/SelectMatch, Name => "RequestorOp" &>
-<INPUT Name="ValueOfRequestor" SIZE=20>
-
-<li>
-Subject <& /Elements/SelectMatch, Name => "SubjectOp" &> 
-<INPUT Name="ValueOfSubject" SIZE=20>
-
-<li>Queue  <& /Elements/SelectBoolean,  Name => "QueueOp" , 
-					True => "is", 
-					False => "isn't", 
-					TrueVal=> '=', 
-					FalseVal => '!=' &>
-<& /Elements/SelectQueue, Name => "ValueOfQueue" &>
-
-
-<li>Priority  <& /Elements/SelectEqualityOperator,  Name => "PriorityOp" &>
-
-<INPUT Name="ValueOfPriority" SIZE=5>
-
-
-<li>
-<& /Elements/SelectDateType, Name => 'DateType' &>
-<& /Elements/SelectDateRelation, Name=>"DateOp" &>
-<& /Elements/SelectDate, Name => "ValueOfDate", ShowTime => 0, Default => '' &>
-
-<li>Ticket content 
-<& /Elements/SelectBoolean, Name => "ContentOp", 
-			    True => "matches", 
-			    False => "does not match", 
-			    TrueVal => 'LIKE', 
-			    FalseVal => 'NOT LIKE' 
-&> 
-<Input Name="ValueOfContent" Size=20>
-
-<li>Status 
-<& /Elements/SelectBoolean, Name => "StatusOp", 
-			    True => "is", 
-  			    False => "isn't", 
-			    TrueVal=> '=', 
-			    FalseVal => '!=' 
-&>  
-<& /Elements/SelectStatus, Name => "ValueOfStatus" &>
-
-% while ( my $KeywordSelect = $KeywordSelects->Next ) {
-
-<li><% $KeywordSelect->Name %> 
-	<& /Elements/SelectBoolean, Name => "KeywordSelectOp". $KeywordSelect->id, 
-				    True => "is", False => "isn't", 
-  				    TrueVal=> '=', FalseVal => '!=' &>
-
-<& /Elements/SelectKeyword, Name => "KeywordSelect".$KeywordSelect->id,
-			    KeywordObj => $KeywordSelect->KeywordObj
-			    &>
-% }
-
-</UL>
-
-<& /Elements/TitleBoxEnd &>
-
-<& /Elements/TitleBoxStart, title => 'Ordering and sorting'&>
-
-<UL>
-
-<li>Results per page <& /Elements/SelectResultsPerPage, Name => "RowsPerPage", 
-							Default => $session{'tickets_rows_per_page'} || '50'
-&>
-
-<li>Sort results by <& /Elements/SelectTicketSortBy, Name => "TicketsSortBy", 
-						     Default => $session{'tickets_sort_by'} 
-&> 
-<& /Elements/SelectSortOrder, Name => 'TicketsSortOrder', Default => $session{'tickets_sort_order'} &>
-
-<li> <& /Elements/Refresh, Name => 'RefreshSearchInterval' , Default => $session{'tickets_refresh_interval'} &>
-
-
-</UL>
-
-
-</DIV>
-
-
-
-<& /Elements/TitleBoxEnd &>
-
-<& /Elements/Submit, Label => 'Show Results', AlternateLabel => 'Refine', Name => 'Action'&>
-
-</FORM>
-
-
- <%INIT>
- my $KeywordSelects = new RT::KeywordSelects $session{'CurrentUser'};
- foreach ( $session{'tickets'}->RestrictionValues('Queue') ) {
-        $KeywordSelects->LimitToQueue($_);
- }
-
- $KeywordSelects->IncludeGlobals;
-</%INIT>
diff --git a/rt/webrt/Search/RestrictSearch.html b/rt/webrt/Search/RestrictSearch.html
deleted file mode 100755
index 977308e3b..000000000
--- a/rt/webrt/Search/RestrictSearch.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<& /Elements/Header, Title=>"Compile Restrictions" &>
-<& /Elements/Tabs &>
-<& PickRestriction &>
diff --git a/rt/webrt/Search/TicketCell b/rt/webrt/Search/TicketCell
deleted file mode 100644
index aaded88e9..000000000
--- a/rt/webrt/Search/TicketCell
+++ /dev/null
@@ -1,28 +0,0 @@
-%#$Header: /home/cvs/cvsroot/freeside/rt/webrt/Search/Attic/TicketCell,v 1.1 2002-08-12 06:17:09 ivan Exp $
-<% $link |n%><%$Column->{Constant} || eval("\$Ticket->$Column->{TicketAttribute}") || "-" %><% $endlink|n %>
-<%INIT>
-
-my $link = "";
-my $endlink = "";
-if ($Column->{TicketLink}) {
-	$link = "<A HREF=\"";
-	if ($Column->{TicketLink} == 1 ) {
-		$link .= "../Ticket/Display.html?";
-	}
-	else {
-		$link .= $Column->{TicketLink};
-	}
-
-	$link .= "id=".$Ticket->Id . $Column->{ExtraLinks};
-
-	if ($session{NewWindowOption}) {
-		$link .= "TARGET=\"TicketDisplay".$session{AlwaysNewWindowOption} && (time() . rand(1024))."\" ";
-	}
-	$link .= "\">";
-	$endlink = "</a>";
-}
-</%INIT>
-<%ARGS>
-$Ticket => undef
-$Column => undef
-</%ARGS>
diff --git a/rt/webrt/SelfService/Attachment/dhandler b/rt/webrt/SelfService/Attachment/dhandler
deleted file mode 100644
index 0d646cc0b..000000000
--- a/rt/webrt/SelfService/Attachment/dhandler
+++ /dev/null
@@ -1,27 +0,0 @@
-<%perl>
-     my ($ticket, $trans,$attach, $filename);
-     my $arg = $m->dhandler_arg;                # get rest of path
-     if ($arg =~ '^(\d+)/(\d+)') {
-        $trans = $1;
-        $attach = $2;
-     }
-    else {
-        Abort("Corrupted attachment URL.");
-        }
-     my $AttachmentObj = new RT::Attachment($session{'CurrentUser'});
-     $AttachmentObj->Load($attach) || Abort("Attachment '$attach' could not be loaded");
-
-
-     unless ($AttachmentObj->id) {
-        Abort("Bad attachment id. Couldn't find attachment '$attach'\n");
-    }
-     unless ($AttachmentObj->TransactionId() == $trans ) {
-        Abort("Bad transaction number for attachment. $trans should be".$AttachmentObj->TransactionId() ."\n");
-
-     }
-     my $content_type = $AttachmentObj->ContentType || 'text/plain';
-     SetContentType($content_type);
-     $m->out($AttachmentObj->Content); 
-     $m->abort; 
-</%perl>
-
diff --git a/rt/webrt/SelfService/Closed.html b/rt/webrt/SelfService/Closed.html
deleted file mode 100644
index a35936092..000000000
--- a/rt/webrt/SelfService/Closed.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<& /SelfService/Elements/Header, title => 'RT Self Service / Closed Tickets' &>
-
-<& /SelfService/Elements/MyRequests, status => ['resolved'], friendly_status =>
-'closed' &>
diff --git a/rt/webrt/SelfService/Create.html b/rt/webrt/SelfService/Create.html
deleted file mode 100755
index 60110cb5a..000000000
--- a/rt/webrt/SelfService/Create.html
+++ /dev/null
@@ -1,63 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/SelfService/Attic/Create.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2001 Jesse Vincent <jesse@fsck.com>
-
-<& Elements/Header, Title => "Create a request" &>
-
-
-<FORM ACTION="Display.html" METHOD="POST" ENCTYPE="multipart/form-data">
-<INPUT TYPE=HIDDEN Name="id" VALUE="new">
-<& /Elements/TitleBoxStart, contentbg => "#cccccc", title => "Create a new ticket" &>
-
-<TABLE>
-<TR>
-<TD>
-Queue:
-</TD>
-<TD>
-<& /Elements/SelectNewTicketQueue, Verbose => 'True' &>
-</TD>
-</TR>
-<TR>
-<TD>
-Requestors: 
-</TD>
-<TD>
-<INPUT Name="Requestors" Value="<%$session{CurrentUser}->EmailAddress%>" SIZE=20>
-</TD>
-</TR>
-<TR>
-<TD>
-Cc:
-</TD>
-<TD>
- <INPUT NAME="Cc" SIZE=20>
-</TD>
-</TR>
-<TR>
-<TD>
-Subject:
-</TD>
-<TD>
-<INPUT Name="Subject" SIZE=60 MAXSIZE=100 value="">
-</TD>
-</TR>
-<TR>
-<TD>
-Attach file:
-</TD>
-<TD>
-<INPUT Name="Attach" type=file>
-</TD>
-</TR>
-<TR>
-<TD COLSPAN=2>
-Describe the issue below:<br>
-<& /Elements/MessageBox &>
-</TD>
-</TR>
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit, Label => "Create ticket"&>
-
-
-</FORM>
diff --git a/rt/webrt/SelfService/Display.html b/rt/webrt/SelfService/Display.html
deleted file mode 100755
index 2d44f148e..000000000
--- a/rt/webrt/SelfService/Display.html
+++ /dev/null
@@ -1,190 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/SelfService/Attic/Display.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2001 Jesse Vincent <jesse@fsck.com>
-
-<& /SelfService/Elements/Header, Title => 'Display ticket #'.$Ticket->id &>
-
-
-<& /Elements/ListActions, actions => \@results &>
-
-<TABLE>
-    <TR>
-	<TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
-	Ticket Id
-	</TD>
-      <TD>
-	<%$Ticket->Id%>
-	</TD>
-      </TR>
-    <TR>	
-      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
-	Requestors
-	</TD>
-      <TD>
-	<%$Ticket->RequestorsAsString%>
-      </TD>
-      </TR>
-    <TR>	
-      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
-	Cc
-	</TD>
-      <TD>
-	<%$Ticket->CcAsString%>
-      </TD>
-    </TR>
-
-  <TR>	
-      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
-	Status
-	</TD>
-      <TD>
-	<%$Ticket->Status%>
-      </TD>
-    </TR>
-
-    <TR>	
-      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
-	Queue
-	</TD>
-      <TD>
-	<%$Ticket->QueueObj->Name%> (<%$Ticket->QueueObj->Description%>)
-      </TD>
-    </TR>
-    <TR>	
-      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
-	Priority
-      </TD>
-      <TD>
-	<%$Ticket->Priority %>
-      </TD>
-    </TR>
- 
-%  if ($Ticket->TimeWorked) {
-   <TR>	
-      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
-	Worked
-      </TD>
-      <TD>
-	<%$Ticket->TimeWorked %> minutes
-      </TD>
-    </TR>
-% }
-    
-% my $selects = $Ticket->QueueObj->KeywordSelects;
-% while (my $select = $selects->Next) {
-    <TR>
-      <TD VALIGN=TOP WIDTH="20%" ALIGN=RIGHT>
-	<%$select->Name%>
-      </TD>
-      <TD>
-% my $object_keywords = $Ticket->KeywordsObj($select->id);	
-% while (my $keyword = $object_keywords->Next) {
-	<%$keyword->KeywordObj->RelativePath($select->KeywordObj)%>
-% }
-%}
-	</TD>
-      </TR>
-
-
-
-
-	</TABLE>
-<TABLE BORDER=0 CELLSPACING=0>
-% my ($i);
-%while (my $Transaction = $Transactions->Next) {
-% $i++;
-%	if ($Transactions->IsLast) {
-	<a name="lasttrans"></a>
-% 	}
-	<& /Ticket/Elements/ShowTransaction, Transaction => $Transaction, 
-					     RowNum => $i,
-					     Ticket => $Ticket &>
-
-%}
-</TABLE>
-
-
-<%INIT>
-
-my ($field, @results);
-
-# {{{ Load the ticket
-#If we get handed two ids, mason will make them an array. bleck.
-# We want teh first one. Just because there's no other sensible way
-# to deal
-my @id = (ref $id eq 'ARRAY') ? @{$id} : ($id);                
-
-
-my $Ticket = new RT::Ticket($session{'CurrentUser'});
-if ($id[0] eq 'new') {
-    # {{{ Create a new ticket
-    
-    my $Queue = new RT::Queue($session{'CurrentUser'});	
-    unless ($Queue->Load($ARGS{'Queue'})) {
-	$m->comp('Error.html', Why => 'Queue not found');
-	$m->abort;
-    }
-    
-    unless ($Queue->CurrentUserHasRight('CreateTicket')) {
-	$m->comp('Error.html', Why => 'You have no permission to create tickets in that queue.');
-  	$m->abort; 
-    }
-    
-    my @Requestors = split(/,/,$ARGS{'Requestors'});
-    my @Cc = split(/,/,$ARGS{'Cc'});
-    
-
-    my $MIMEObj = MakeMIMEEntity ( Subject => $ARGS{'Subject'},
-				   From => $ARGS{'From'},
-				   Cc => $ARGS{'Cc'},
-				   Body => $ARGS{'Content'},
-				   AttachmentFieldName => 'Attach');
-
-    #TODO in Create_Details.html: priorities and due-date      
-    my ($id, $Trans, $ErrMsg)= $Ticket->Create(Queue=>$ARGS{Queue},
-					       Requestor=> \@Requestors,
-					       Cc => \@Cc,
-					       Subject=>$ARGS{Subject},
-					       MIMEObj => $MIMEObj	  
-					      );         
-    unless ($id && $Trans) {
-	$m->comp('Error.html', Why => $ErrMsg);
-   	$m->abort(); 
-    }
-
-    push(@results, $ErrMsg);
-
-    # }}}
-}
-else {
-    unless ($Ticket->Load($id[0])) {
-	$m->comp('Error.html', Why =>"Couldn't load ticket '$id'");
-	$m->abort();
-    }
-}
-# }}}
-
-unless ($session{'CurrentUser'}->HasQueueRight ( TicketObj => $Ticket,
-						 Right => 'ShowTicket')) {
-    $m->comp('Error.html', Why => "No permission to display that ticket");
-    $m->abort();
-}
-
-my ($code, $msg);
-
-#Update the status
-if ((defined $ARGS{'Status'}) and 
-    ($ARGS{'Status'} ne $Ticket->Status)) {
-    ($code, $msg) = $Ticket->SetStatus($ARGS{'Status'});
-    push @results, "$msg";
-}
-
-ProcessUpdateMessage(ARGSRef=>\%ARGS, Actions=>\@results, TicketObj=>$Ticket);
-
-my $Transactions = $Ticket->Transactions;
-
-</%INIT>
-
-
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/webrt/SelfService/Elements/GotoTicket b/rt/webrt/SelfService/Elements/GotoTicket
deleted file mode 100755
index 0c0c8b67a..000000000
--- a/rt/webrt/SelfService/Elements/GotoTicket
+++ /dev/null
@@ -1 +0,0 @@
-<FORM ACTION="<%$RT::WebPath%>/SelfService/Display.html"><input type=submit value="Goto ticket">&nbsp;<input size=4 name=id></FORM>
diff --git a/rt/webrt/SelfService/Elements/Header b/rt/webrt/SelfService/Elements/Header
deleted file mode 100755
index ecf58f461..000000000
--- a/rt/webrt/SelfService/Elements/Header
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-     "http://www.w3.org/TR/REC-html40/loose.dtd"> 
-<HTML>
-<HEAD>
-<TITLE><%$Title%></TITLE>
-% if ($Code) {
-<META NAME="HTTP-EQUIV" VALUE="<%$Code%> <%$Why%>">
-% }
-
-<link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/webrt.css" type="text/css">
-</HEAD>
-<BODY BGCOLOR="<%$BgColor%>">
-<TABLE BORDER=0 WIDTH=100% CELLSPACING=0 BGCOLOR="#993333">
-<TR VALIGN=TOP>
-<TD WIDTH=32>
-        <IMG SRC="<%$RT::LogoURL%>" alt="RT">
-</TD>
-<TD VALIGN=CENTER ALIGN=LEFT>
-<font size=+2 color=#ffffff>
-<B>
-<%$Title%>
-</B>
-</font>
-</TD>
-<TD ALIGN=RIGHT>
-<font color="#ffffff">
-% if ($session{'CurrentUser'} ) {
-Signed in as <b><%$session{'CurrentUser'}->Name%></b>.<BR>
-% if ($session{'CurrentUser'}->HasSystemRight('ModifySelf')) {
-[<A class='inverse' HREF="<%$RT::WebPath%>/SelfService/Prefs.html" >Preferences</A>]
-% }
-% unless ($RT::WebExternalAuth) { 
- [<A class='inverse' HREF="<%$RT::WebPath%>/NoAuth/Logout.html">Logout</a>]
-% }
-% } else {
-Not logged in.
-% }
-</font>
-</TD>
-</TR>
-</TABLE>
-
-<BR>
-<& /SelfService/Elements/Tabs &>
-
-<%ARGS>
-$Title => ''
-$Code => undef
-$Why => undef
-$BgColor => '#ffffff'
-</%ARGS>
-<%INIT>
-$Title = "RT/$RT::rtname: ".$Title;
-</%INIT>
-
diff --git a/rt/webrt/SelfService/Elements/MyRequests b/rt/webrt/SelfService/Elements/MyRequests
deleted file mode 100644
index ce268d58d..000000000
--- a/rt/webrt/SelfService/Elements/MyRequests
+++ /dev/null
@@ -1,41 +0,0 @@
-<& /Elements/TitleBoxStart, title => "Your $friendly_status requests" &>
-<TABLE BORDER=0 cellspacing=1 cellpadding=1 BGCOLOR="#eeeeee" WIDTH=100%>
-<TR>
-<TH>Subject</TH>
-<TH>Status</TH>
-<TH>Owner</TH>
-<TH>&nbsp;</TH>
-</TR>
-<TR>
-% while (my $Ticket = $MyTickets->Next) {
-<TR>
-<TD>
-<%$Ticket->Id%>: <%$Ticket->Subject%>
-</TD>
-<TD>
-<%$Ticket->Status%>
-</TD><TD>
-<%$Ticket->OwnerObj->Name%>
-</TD><TD ALIGN=RIGHT>
-[<A HREF="<% $RT::WebPath %>/SelfService/Display.html?id=<%$Ticket->Id%>">Details</A>]
-</TD>
-</TR>
-% }
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-
-
-<%INIT>
-my $MyTickets;
-$MyTickets = new RT::Tickets ($session{'CurrentUser'});
-$MyTickets->LimitRequestor(VALUE => $session{'CurrentUser'}->EmailAddress);
-
-foreach my $status (@status) {
-
-        $MyTickets->LimitStatus(VALUE => $status);
-}
-</%INIT>
-<%ARGS>
-$friendly_status => 'open'
-@status => ('open', 'new', 'stalled')
-</%ARGS>
diff --git a/rt/webrt/SelfService/Elements/Tabs b/rt/webrt/SelfService/Elements/Tabs
deleted file mode 100644
index d689d8a72..000000000
--- a/rt/webrt/SelfService/Elements/Tabs
+++ /dev/null
@@ -1,49 +0,0 @@
-<TABLE WIDTH=100%>
-<TR>
-% foreach $tab (sort keys %{$tabs}) {
-<TD ALIGN=CENTER>
-[<A HREF="<%$RT::WebPath%>/<% $tabs->{"$tab"}->{'path'}%>"><% $tabs->{"$tab"}->{'title'}%></A>]
-</TD>
-%}
-
-% if ($actions) {
-
-<TD ALIGN=RIGHT>
-<TABLE><TR>
-%  foreach my $action (sort keys %{$actions}) {
-<TD>
-<FONT SIZE=-1>
-% if ($actions->{"$action"}->{'html'}) {
-<%$actions->{"$action"}->{'html'} |n%>
-% } else {
-<A HREF="<%$RT::WebPath%>/<% $actions->{$action}->{'path'}%>"><% $actions->{$action}->{'title'}%></A>
-% }
-</FONT>
-</TD>
-%  }
-</TR>
-</TABLE>
-</TD>
-%}
-</TR>
-</TABLE>
-<hr>
-<%INIT>
-my ($tab);
-my $tabs = { A  => { title => 'Open requests',
-                        path => 'SelfService/',
-                      },
-             B => { title => 'Closed requests',
-                         path => 'SelfService/Closed.html',
-                       },
-             C => { title => 'New request',
-                    path => 'SelfService/Create.html'
-                    }
-           };
-my $actions = {
-	B => { html => $m->scomp('GotoTicket') 
-		}
-	};
-</%INIT>
-
-
diff --git a/rt/webrt/SelfService/Error.html b/rt/webrt/SelfService/Error.html
deleted file mode 100755
index 19b79e68b..000000000
--- a/rt/webrt/SelfService/Error.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<& /SelfService/Elements/Header, Title => 'Error' &>
-<& /Elements/TitleBoxStart, title => $Title &>
-<%$Why%>
-<br>
-<font size=-1>
-<%$Details%>
-</font>
-<& /Elements/TitleBoxEnd &>
-</body>
-</HTML>
-
-
-<%args>
-$Code => undef
-$Details => undef
-$Title => "RT Error"
-$Why => "the calling component did not specify why"
-</%args>
-
-<%INIT>
-$RT::Logger->error("WebRT: $Why ($Details)");
-</%INIT>
diff --git a/rt/webrt/SelfService/Prefs.html b/rt/webrt/SelfService/Prefs.html
deleted file mode 100755
index 9c614e9fd..000000000
--- a/rt/webrt/SelfService/Prefs.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<& /SelfService/Elements/Header, title => 'Preferences' &>
-
-<& /Elements/ListActions, actions => \@results &>
-<form method=post>
-
-% unless ($RT::WebExternalAuth) {
-<& /Elements/TitleBoxStart, title => 'Change password'  &>
-New password: <input type=password name="NewPass1" size=16>
-Confirm: <input type=password name="NewPass2" size=16>
-<& /Elements/TitleBoxEnd &>
-<BR>
-% }
-<& /Elements/TitleBoxStart, title => 'Signature'  &>
-
-<TEXTAREA COLS=72 ROWS=4 WRAP=HARD NAME="Signature"><% $session{'CurrentUser'}->UserObj->Signature %></TEXTAREA>
-<br>
-<BR>
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit &>
-	  </form>
-
-
-<%INIT>
-my @results;
-
-if ($NewPass1) {
-    if ($NewPass1 ne $NewPass2) {
-	push (@results, "Passwords did not match.");
-    }	
-    else {
-	my ($val, $msg)=$session{'CurrentUser'}->UserObj->SetPassword($NewPass1);
-	push (@results, "Password: ".$msg);
-    }	
-}
-if ($Signature) {
-    $Signature =~ s/(\r\n|\r)/\n/g;
-    if ($Signature ne $session{'CurrentUser'}->UserObj->Signature) {
-	my ($val, $msg)=$session{'CurrentUser'}->UserObj->SetSignature($Signature);
-	push (@results, "Signature: ".$msg);
-    }
-}
-#A hack to make sure that session gets rewritten.
-
-$session{'i'}++;
-</%INIT>
-
-<%ARGS>
-$Signature => undef
-$NewPass1 => undef
-$NewPass2 => undef
-</%ARGS>
diff --git a/rt/webrt/SelfService/Update.html b/rt/webrt/SelfService/Update.html
deleted file mode 100755
index 17f1618a3..000000000
--- a/rt/webrt/SelfService/Update.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<& /SelfService/Elements/Header, Title => 'Update ticket #'.$Ticket->id &>
-
-
-<FORM ACTION="Display.html" METHOD=POST ENCTYPE="multipart/form-data">
-
-Status:
-<& /Elements/SelectStatus, Name=>"Status", Default => $DefaultStatus &> 
-<input type=hidden name="UpdateType" value="response">
-
-Subject: <input name="UpdateSubject" size=60 value="Re: <% $Ticket->Subject %>"> <br>
-Attach: <input name="UpdateAttachment" type=file><br>
-<& /Elements/MessageBox, Name=>"UpdateContent", QuoteTransaction=>$ARGS{QuoteTransaction} &>
-		<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>"><br>
-
-
-<& /Elements/Submit &>
-  </FORM>
-
-
-
-<%INIT>
-
-my $Ticket = LoadTicket($id);
-
-my $title = "Update ticket #" . $Ticket->id;
-
-$DefaultStatus = $Ticket->Status() unless ($DefaultStatus);
-
-
-Abort("No permission to view update ticket") 
-	unless ( $Ticket->CurrentUserHasRight('ReplyToTicket') or
-                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
-
-</%INIT>
-
-<%ARGS>
-$id => undef
-$Action => undef
-$DefaultStatus => undef
-</%ARGS>
diff --git a/rt/webrt/SelfService/index.html b/rt/webrt/SelfService/index.html
deleted file mode 100644
index a377d8cff..000000000
--- a/rt/webrt/SelfService/index.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<& /SelfService/Elements/Header, title => 'Self Service' &>
-
-<& /SelfService/Elements/MyRequests &>
diff --git a/rt/webrt/Ticket/Attachment/dhandler b/rt/webrt/Ticket/Attachment/dhandler
deleted file mode 100644
index 0d646cc0b..000000000
--- a/rt/webrt/Ticket/Attachment/dhandler
+++ /dev/null
@@ -1,27 +0,0 @@
-<%perl>
-     my ($ticket, $trans,$attach, $filename);
-     my $arg = $m->dhandler_arg;                # get rest of path
-     if ($arg =~ '^(\d+)/(\d+)') {
-        $trans = $1;
-        $attach = $2;
-     }
-    else {
-        Abort("Corrupted attachment URL.");
-        }
-     my $AttachmentObj = new RT::Attachment($session{'CurrentUser'});
-     $AttachmentObj->Load($attach) || Abort("Attachment '$attach' could not be loaded");
-
-
-     unless ($AttachmentObj->id) {
-        Abort("Bad attachment id. Couldn't find attachment '$attach'\n");
-    }
-     unless ($AttachmentObj->TransactionId() == $trans ) {
-        Abort("Bad transaction number for attachment. $trans should be".$AttachmentObj->TransactionId() ."\n");
-
-     }
-     my $content_type = $AttachmentObj->ContentType || 'text/plain';
-     SetContentType($content_type);
-     $m->out($AttachmentObj->Content); 
-     $m->abort; 
-</%perl>
-
diff --git a/rt/webrt/Ticket/Create.html b/rt/webrt/Ticket/Create.html
deleted file mode 100755
index 2c61de03a..000000000
--- a/rt/webrt/Ticket/Create.html
+++ /dev/null
@@ -1,199 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Ticket/Attic/Create.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2000 Jesse Vincent <jesse@fsck.com> 
-
-<& /Elements/Header, Title => "Create a new ticket" &>
-<& /Elements/Tabs, current_toptab => "Ticket/Create.html" &>
-<FORM ACTION="Display.html" METHOD="POST" ENCTYPE="multipart/form-data">
-<INPUT TYPE=HIDDEN Name="id" VALUE="new">
-<A NAME="top">
-	
-	
-[<a class="currenttab">Show basics</a>] [<A HREF="#detail">Show details</a>]
-<BR>
-<& /Elements/TitleBoxStart, contentbg => "#cccccc", title => "Create a new ticket"&>
-<div align=right><input type=submit value="Create"></div>
-<TABLE border=0 cellpadding=0 cellspacing=0>
-<TR><TD>Queue</TD>
-<TD><% $QueueObj->Name %>
-<INPUT TYPE=HIDDEN NAME=Queue Value="<%$QueueObj->Name%>">
-</TD>
-<TD>Status:
-</TD>
-<TD>
-<& /Elements/SelectStatus, Name => "Status", Default=> 'new' &>
-</TD>
-<TD>
-Owner: 
-</TD>
-<TD>
-<& /Elements/SelectOwner, Name => "ValueOfOwner", QueueObj => $QueueObj &>
-</TD>
-</TR>
-<TR>
-<TD>
-Requestors: 
-</TD>
-<TD COLSPAN=5>
-<INPUT Name="Requestors" Value="<%$session{CurrentUser}->EmailAddress%>" SIZE=40>
-</TD>
-</TR>
-<TR>
-<TD>
-Cc:
-</TD>
-<TD COLSPAN=5>
- <INPUT NAME="Cc" SIZE=40>
-</TD>
-</TR>
-<TR>
-<TD>
-Admin Cc:
-</TD>
-<TD COLSPAN=5>
- <INPUT NAME="AdminCc" SIZE=40>
-</TD>
-</TR>
-<TR>
-<TD>
-Subject:
-</TD>
-<TD COLSPAN=5>
-<INPUT Name="Subject" SIZE=60 MAXSIZE=100 value="">
-</TD>
-</TR>
-<TR>
-<TD>
-Attach file:
-</TD>
-<TD COLSPAN=5>
-<INPUT TYPE=FILE NAME="Attach">
-</TD>
-</TR>
-<TR>
-<TD COLSPAN=6>
-Describe the issue below:<br>
-<& /Elements/MessageBox, QuoteTransaction => $QuoteTransaction &>
-
-<BR>
-</TD>
-</TR>
-<TR>
-<TD ALIGN=RIGHT COLSPAN=2>
-</TD>
-</TR>
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit, Label => "Create"&>
-
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-
-<A NAME="detail">
-	[<A HREF="#top">Show basics</a>] [<a class="currenttab">Show details</a>]
-<BR>
-<TABLE WIDTH="100%" BORDER=0>
-<TR>
-<TD WIDTH="50%" VALIGN=TOP>
-
-	  <& /Elements/TitleBoxStart, title => 'The Basics', 
-		title_class=> 'inverse',  
-		color => "#993333" &>
-<TABLE BORDER=0>
-<TR><TD ALIGN=RIGHT>Priority:</TD><TD><input size=3 name="InitialPriority" value="<%$QueueObj->InitialPriority%>"></TD></TR>
-<TR><TD ALIGN=RIGHT>Final Priority:</TD><TD><input size=3 name="FinalPriority" value="<%$QueueObj->FinalPriority%>"></TD></TR>
-<TR><TD ALIGN=RIGHT>Time Worked:</TD><TD><input size=3 name="TimeWorked"></TD></TR>
-<TR><TD ALIGN=RIGHT>Time Left:</TD><TD><input size=3 name="TimeLeft"></TD></TR>
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-<BR>
-<BR>
-
-
- <& /Elements/TitleBoxStart, 
-		title_class=> 'inverse',  
-		title => "Keyword Selections", color => "#993300"
-  &>
-<TABLE BORDER=0>
-% while ( my $KeywordSelect = $KeywordSelects->Next ) {
-%   my $Descendents = $KeywordSelect->KeywordObj->Descendents;
-     <TR><TD ALIGN=RIGHT>
-	<% $KeywordSelect->Name %></TD><TD>
-	  <INPUT TYPE="hidden" NAME="KeywordSelectMagic<% $KeywordSelect->id %>" VALUE="1">
-	    <SELECT NAME="KeywordSelect-<% $KeywordSelect->id %>"
-	      <% $KeywordSelect->Single ? "" : " MULTIPLE " %> SIZE=5>
-%#
-%#  All of this cruft is so we have a 'no keyword' selector for single
-%#  keywords that's only selected when there's no value.
-%
-% foreach my $kid ( keys %{$Descendents} ) {
-	      <OPTION VALUE="<% $kid %>"><% $Descendents->{$kid} %></OPTION>
-%   }
-%   if ( $KeywordSelect->Single) {
-<OPTION VALUE="" SELECTED>(empty)</OPTION>
-% }
-	    </SELECT>
-      </TD></TR>
-% }
-  
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-
-</TD>
-
-<TD VALIGN="TOP">
-<& /Elements/TitleBoxStart, title => "Dates",
-		title_class=> 'inverse',  
-		 color => "#663366" &>
-
-<TABLE BORDER=0>
-<TR><TD ALIGN=RIGHT>Starts:</TD><TD><input size=10 name="Starts"></TD></TR>
-<TR><TD ALIGN=RIGHT>Due:</TD><TD><input size=10 name="Due"></TD></TR>
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-<BR>
-<& /Elements/TitleBoxStart, title => 'Relationships', 
-	title_class=> 'inverse',  
-	titleright => '', color=> "#336633" &>
-
-<i>(Enter ticket ids or URLs, seperated with spaces)</i>
-<TABLE BORDER=0>
-<TR><TD ALIGN=RIGHT>Depends on</TD><TD><input size=10 name="new-DependsOn"></TD></TR>
-<TR><TD ALIGN=RIGHT>Depended on by</TD><TD><input size=10 name="DependsOn-new"></TD></TR>
-<TR><TD ALIGN=RIGHT>Parents</TD><TD><input size=10 name="new-MemberOf"></TD></TR>
-<TR><TD ALIGN=RIGHT>Children</TD><TD><input size=10 name="MemberOf-new"></TD></TR>
-<TR><TD ALIGN=RIGHT>Refers to</TD><TD><input size=10 name="new-RefersTo"></TD></TR>
-<TR><TD ALIGN=RIGHT>Referred to by</TD><TD><input size=10 name="RefersTo-new"></TD></TR>
-
-
-</TABLE>
-<& /Elements/TitleBoxEnd &>
-<BR>
-
-</TD>
-</TR>
-</TABLE>
-<& /Elements/Submit, Label => "Create"&>
-</FORM>
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-
-<%INIT>
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-$QueueObj->Load($Queue) || Abort("Queue could not be loaded.");
-my $KeywordSelects = $QueueObj->KeywordSelects;
-
-</%INIT>
-
-<%ARGS>
-$DependsOn => undef
-$DependedOnBy => undef
-$MemberOf => undef
-$QuoteTransaction => undef
-$Queue => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Display.html b/rt/webrt/Ticket/Display.html
deleted file mode 100755
index cb0dc2501..000000000
--- a/rt/webrt/Ticket/Display.html
+++ /dev/null
@@ -1,152 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Ticket/Attic/Display.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2000 Jesse Vincent <jesse@fsck.com>
-
-<& /Elements/Header, Title => "Ticket #".$Ticket->Id ." ".$Ticket->Subject &>
-<& /Ticket/Elements/Tabs, Ticket => $Ticket, current_tab => 'Ticket/Display.html?id='.$Ticket->id &>
-
-<& /Elements/ListActions, actions => \@Actions &>
-
-<& /Ticket/Elements/ShowSummary,  Ticket => $Ticket &>
-
-
-<BR>
-<& /Ticket/Elements/ShowHistory , 
-      Ticket => $Ticket, 
-      Collapsed => $ARGS{'Collapsed'}, 
-      ShowHeaders => $ARGS{'ShowHeaders'} &> 
-
-  
-<%ARGS>
-$id => undef
-$Create => undef
-$ShowHeaders => undef
-$Collapsed => undef
-</%ARGS>
-
-<%INIT>
-
-  
-  my ($linkid, $message, $tid, $Ticket, @Actions);  
-
-$Ticket = new RT::Ticket($session{'CurrentUser'});
-
-unless ($id) {
-    Abort('No ticket specified');
-}
-
-if ($ARGS{'id'} eq 'new') {
-    # {{{ Create a new ticket
-    
-    my $Queue = new RT::Queue($session{'CurrentUser'});	
-    unless ($Queue->Load($ARGS{'Queue'})) {
-	Abort('Queue not found');
-    }
-    
-    unless ($Queue->CurrentUserHasRight('CreateTicket')) {
-	Abort('You have no permission to create tickets in that queue.');
-    }
-   
-    my $due = new RT::Date($session{'CurrentUser'});
-    $due->Set(Format => 'unknown', Value => $ARGS{'Due'});
-    my $starts = new RT::Date($session{'CurrentUser'});
-    $starts->Set(Format => 'unknown', Value => $ARGS{'Starts'});
-    
- 
-    my @Requestors = split(/,/,$ARGS{'Requestors'});
-    my @Cc = split(/,/,$ARGS{'Cc'});
-    my @AdminCc = split(/,/,$ARGS{'AdminCc'});
-    
-    my $MIMEObj = MakeMIMEEntity( Subject => $ARGS{'Subject'},
-				  From => $ARGS{'From'},
-				  Cc => $ARGS{'Cc'},
-				  Body => $ARGS{'Content'},
-				  AttachmentFieldName => 'Attach');
- 
-				  
-    my %create_args = ( 
-		       Queue=>$ARGS{Queue},
-		       Owner=>$ARGS{ValueOfOwner},
-		       InitialPriority=> $ARGS{InitialPriority},
-		       FinalPriority=> $ARGS{FinalPriority},
-		       TimeLeft => $ARGS{TimeLeft},
-		       TimeWorked => $ARGS{TimeWorked},
-		       Requestor=> \@Requestors,
-		       Cc => \@Cc,
-		       AdminCc => \@AdminCc,
-		       Subject=>$ARGS{Subject},
-		       Status=>$ARGS{Status},
-		       Due => $due->ISO,
-		       Starts => $starts->ISO,
-		       MIMEObj => $MIMEObj	  
-		      );         
-
-    
-    # we need to get any KeywordSelect-<integer> fields into %create_args..
-    grep { $_ =~ /^KeywordSelect-/ && {$create_args{$_} = $ARGS{$_}}} %ARGS;
-
-    my ($id, $Trans, $ErrMsg)= $Ticket->Create(%create_args);
-    unless ($id && $Trans) {
-	Abort($ErrMsg);
-    }
-    my @linktypes = qw( DependsOn MemberOf RefersTo );
-    
-    foreach my $linktype (@linktypes) {
-      foreach my $luri (split (/ /,$ARGS{"new-$linktype"})) {
-	$luri =~ s/\s*$//; # Strip trailing whitespace
-	my ($val, $msg) = $Ticket->AddLink( Target => $luri,
-					    Type => $linktype);
-	push @Actions, $msg;
-      }
-      
-      foreach my $luri (split (/ /,$ARGS{"$linktype-new"})) {
-	my ($val, $msg) = $Ticket->AddLink( Base => $luri,
-					    Type => $linktype);
-	
-	push @Actions, $msg;
-      }
-    }
-    # don't try to change queue to the current queue
-    delete $ARGS{'Queue'};
-
-    push(@Actions, $ErrMsg);
-    unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
-      Abort("No permission to view newly created ticket #".$Ticket->id.".");
-    }
-    # }}}
-}
-
-else { 
-    $Ticket = LoadTicket($ARGS{'id'});
-    unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
-	Abort("No permission to view ticket");
-    }
-
-
-if (defined $ARGS{'Action'}) {
-  if ($ARGS{'Action'} =~ /^(Steal|Kill|Take|SetTold)$/) {
-    my $action = $1;
-    my ($res, $msg)=$Ticket->$action();
-    push(@Actions, $msg);
-  }
-}
-    $ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
-
-    if ($ARGS{'UpdateContent'} &&
-        $ARGS{'UpdateContent'} ne '' &&
-        $ARGS{'UpdateContent'} ne  "-- \n" .
-                                $session{'CurrentUser'}->UserObj->Signature
-       ) {
-	    ProcessUpdateMessage(ARGSRef=>\%ARGS, 
-				 Actions=>\@Actions, 
-				 TicketObj=>$Ticket);
-	}
-#Process status updates
-my @BasicActions = ProcessTicketBasics(ARGSRef => \%ARGS, TicketObj=>$Ticket);
-
-push (@Actions, @BasicActions);
-}
-</%INIT>
-
-
-
-
diff --git a/rt/webrt/Ticket/Elements/AddWatchers b/rt/webrt/Ticket/Elements/AddWatchers
deleted file mode 100755
index 053cff122..000000000
--- a/rt/webrt/Ticket/Elements/AddWatchers
+++ /dev/null
@@ -1,54 +0,0 @@
-<BR>
-<%$msg%><br>
-
-Add new watchers:<br>
-
-<table>
-% if ($Users) {
-<tr><td>
-Type
-</td><td>
-Username
-</td></tr>
-% while (my $u = $Users->Next ) {
-<tr><td><&/Elements/SelectWatcherType, Name => "WatcherTypeUser".$u->Id &></td><td><%$u->Name%> (<%$u->RealName%>)</td></tr>
-% }
-% }
-
-<tr><td>
-Type
-</td><td>
-Email
-</td></tr>
-<tr><td>
-<&/Elements/SelectWatcherType, Name => "WatcherTypeEmail1" &>
-</td><td>
-<input name="WatcherAddressEmail1" size=15>
-</td></tr>
-<tr><td>
-<&/Elements/SelectWatcherType, Name => "WatcherTypeEmail2" &> 
-</td><td>
-<input name="WatcherAddressEmail2" size=15>
-</td></tr>
-<tr><td>
-<&/Elements/SelectWatcherType, Name => "WatcherTypeEmail3" &>
-</td><td>
-<input name="WatcherAddressEmail3" size=15>
-</td></tr>
-</table>
-
-<%INIT>
-my ($msg, $Users);
-if ($UserString) {
-    $Users = new RT::Users($session{'CurrentUser'});
-    $Users->Limit(FIELD => $UserField,
-                 VALUE => $UserString,
-                 OPERATOR => $UserOp);
-     }
-</%INIT>
-
-<%ARGS>
-$UserField => 'Name'
-$UserOp => '='
-$UserString => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/EditBasics b/rt/webrt/Ticket/Elements/EditBasics
deleted file mode 100755
index 12142879e..000000000
--- a/rt/webrt/Ticket/Elements/EditBasics
+++ /dev/null
@@ -1,62 +0,0 @@
-<TABLE>
-<TR>
-<TD COLSPAN=6>
-        Subject<BR>
-        <input name=Subject value="<%$TicketObj->Subject|h%>"  SIZE=50>
-</TD>
-</TR>
-<TR>
-<TD>
-<& /Elements/ShadedBox, 
-        title => 'Status',
-        content => $SelectStatus
-&>
-</TD>
-<TD>
-
-<& /Elements/ShadedBox,
-	title => 'Time Worked',
-	content => "<input name=TimeWorked value=\"".$TicketObj->TimeWorked."\" SIZE=5>" 
-&>
-
-</TD>
-<TD>
-<& /Elements/ShadedBox,
-	title => 'Time Left',
-	content => "<input name=TimeLeft value=\"".$TicketObj->TimeLeft."\" SIZE=5>" 
-&>
-</TD>
-<TD>
-<& /Elements/ShadedBox,
-	title => 'Priority',
-	content => "<input name=Priority value=\"".$TicketObj->Priority."\" SIZE=3>"
-&>
-
-</TD>
-<TD>
-<& /Elements/ShadedBox,
-	title => 'Final Priority',
-	content => "<input name=FinalPriority value=\"".$TicketObj->FinalPriority."\" SIZE=3>"
-&>
-
-
-</TD>
-<TD>
-<& /Elements/ShadedBox,
-        title => 'Queue',
-        content => "$SelectQueue"
- &>
-</TD>
-</TR>
-</TABLE>
-
-<%INIT>
-#It's hard to do this inline, so we'll preload the html of the selectstatus in here.
-my $SelectStatus = $m->scomp("/Elements/SelectStatus", Name => 'Status', Default=> $TicketObj->Status);
-my $SelectQueue = $m->scomp("/Elements/SelectQueue", Name => 'Queue', Default =>$TicketObj->QueueObj->Id);
-
-</%INIT>
-<%ARGS>
-
-$TicketObj => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/EditDates b/rt/webrt/Ticket/Elements/EditDates
deleted file mode 100755
index f04130bde..000000000
--- a/rt/webrt/Ticket/Elements/EditDates
+++ /dev/null
@@ -1,46 +0,0 @@
-<TABLE>
-<TR>
-<TD>
-Starts: 
-</TD>
-<TD>
-<& /Elements/SelectDate, menu_prefix => 'Starts', current => 0 &> 
-        (<% $TicketObj->StartsObj->AsString %>)
-</TD>
-</TR>
-<TR>
-<TD>
-Started:
-</TD>
-<TD>
-<& /Elements/SelectDate, menu_prefix => 'Started', current => 0 &> (<%$TicketObj->StartedObj->AsString %>)
-
-
-
-</TD>
-</TR>
-
-<TR>
-<TD>
-Last Contact:
-</TD>
-<TD>
-<& /Elements/SelectDate, menu_prefix => 'Told', current => 0 &> (<% $TicketObj->ToldObj->AsString %>)
-
-</TD>
-</TR>
-<TR>
-<TD>
-Due:
-</TD>
-<TD>
-
-<& /Elements/SelectDate, menu_prefix => 'Due', current => 0 &> (<% $TicketObj->DueObj->AsString %>)
-</TD>
-</TR>
-
-</TABLE>
-<%ARGS>
-$TicketObj => undef
-</%ARGS>
-
diff --git a/rt/webrt/Ticket/Elements/EditKeywordSelects b/rt/webrt/Ticket/Elements/EditKeywordSelects
deleted file mode 100644
index 34ade9f25..000000000
--- a/rt/webrt/Ticket/Elements/EditKeywordSelects
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<TABLE>
-    <TR>
-% while ( my $KeywordSelect = $KeywordSelects->Next ) {
-% my $CurrentKeywords = $TicketObj->KeywordsObj($KeywordSelect->id);	
-%   my $Descendents = $KeywordSelect->KeywordObj->Descendents;
-      <TD VALIGN=TOP>
-	<% $KeywordSelect->Name %>
-	<BR>
-	  <INPUT TYPE="hidden" NAME="KeywordSelectMagic<% $KeywordSelect->id %>" VALUE="1">
-	    <SELECT NAME="KeywordSelect<% $KeywordSelect->id %>"
-	      <% $KeywordSelect->Single ? "" : " MULTIPLE " %> SIZE=5>
-%#
-%#
-%#  All of this cruft is so we have a 'no keyword' selector for single
-%#  keywords that's only selected when there's no value.
-%
-% my $selected_keywords = 0;
-% foreach my $kid ( keys %{$Descendents} ) {
-% my $selected = 0;
-% if ($CurrentKeywords->HasEntry($kid)) { $selected_keywords++; $selected=1;}
-	      <OPTION VALUE="<% $kid %>" 
-		<% $selected && 'SELECTED'%>>
-		<% $Descendents->{$kid} %>
-	      </OPTION>
-%   }
-%   if ( $KeywordSelect->Single) {
-<OPTION VALUE="" <% ($selected_keywords == 0) && 'SELECTED' %> >(empty)</OPTION>
-% }
-	    </SELECT>
-      </TD>
-% }
-    </TR>
-  
-</TABLE>
-
-
-<%INIT>
-my $KeywordSelects = $TicketObj->QueueObj->KeywordSelects;
-</%INIT>
-
-<%ARGS>
-$TicketObj => undef
-</%ARGS>
-
diff --git a/rt/webrt/Ticket/Elements/EditLinks b/rt/webrt/Ticket/Elements/EditLinks
deleted file mode 100755
index b0296fce1..000000000
--- a/rt/webrt/Ticket/Elements/EditLinks
+++ /dev/null
@@ -1,109 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Ticket/Elements/Attic/EditLinks,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2000 Jesse Vincent <jesse@fsck.com>
-
-
-<TABLE>
-<TR>
-<TD VALIGN=TOP>
-<h3>New Relationships</h3>
-<i>Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces.</i><br>
-<TABLE>
-<TR><TD>Merge into:</TD><TD><input name="<%$Ticket->Id%>-MergeInto"> <i>(only one ticket)</i></TD></TR>
-<TR><TD>Depends on:</TD><TD><input name="<%$Ticket->Id%>-DependsOn"></TD></TR>
-<TR><TD>Depended on by:</TD><TD><input name="DependsOn-<%$Ticket->Id%>"></TD></TR>
-<TR><TD>Parents:</TD><TD><input name="<%$Ticket->Id%>-MemberOf"></TD></TR>
-<TR><TD>Children:</TD><TD> <input name="MemberOf-<%$Ticket->Id%>"></TD></TR>
-<TR><TD>Refers to:</TD><TD><input name="<%$Ticket->Id%>-RefersTo"></TD></TR>
-<TR><TD>Referred to by:</TD><TD> <input name="RefersTo-<%$Ticket->Id%>"></TD></TR>
-</TABLE>
-</TD>
-<TD VALIGN=TOP WIDTH=50%>
-<h3>Current Relationships</h3>
-<i>(Check boxes to delete)</i><br>
-
-Depends on:<BR>
-<UL>
-% while (my $link = $Ticket->DependsOn->Next) {
-% my $member = $link->TargetObj;
-<LI>
-<INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
-[<%$member->Status%>]
-
-% }
-</UL>
-
-Depended on by:<BR>
-<UL>
-% while (my $link = $Ticket->DependedOnBy->Next) {
-% my $member = $link->BaseObj;
-<LI>
-<INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-">
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> 
-[<%$member->Status%>]
-% }
-</UL>
-
-Parents:<BR>
-<UL>
-% while (my $link = $Ticket->MemberOf->Next) {
-% my $member = $link->TargetObj;
-<LI>
-<INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
-[<%$member->Status%>]
-
-% }
-</UL>
-
-Children:<BR>
-<UL>
-% while (my $link = $Ticket->Members->Next) {
-<LI>
-<INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-">
-% my $member = $link->BaseObj;
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> 
-[<%$member->Status%>]
-% }
-</UL>
-
-
-Refers to:<BR>
-<UL>
-% while (my $link = $Ticket->RefersTo->Next) {
-<LI>
-<INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
-% if ($link->TargetIsLocal) {
-% my $member = $link->TargetObj;
-
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
-% } else {
-<A HREF="<%$link->TargetAsHREF%>"><%$link->Target%></A>
-% }
-%}
-</UL>
-
-Referred to by:<BR>
-<UL>
-% while (my $link = $Ticket->ReferredToBy->Next) {
-<LI>
-<INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-">
-% if ($link->BaseIsLocal) {
-% my $member = $link->BaseObj;
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
-% } else {
-<A HREF="<%$link->BaseAsHREF%>"><%$link->Base%></A>
-%}
-% }
-</UL>
-
-			    
-</TD>
-</TR>
-</TABLE>
-
-
-      
-<%ARGS>
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/EditPeople b/rt/webrt/Ticket/Elements/EditPeople
deleted file mode 100755
index 4f69af970..000000000
--- a/rt/webrt/Ticket/Elements/EditPeople
+++ /dev/null
@@ -1,37 +0,0 @@
-
-<TABLE>
-<TR>
-<TD VALIGN=TOP>
-
-<h3>New watchers</h3>
-Find people whose<BR>
-<& /Elements/SelectUsers &>
-<input type=submit name="OnlySearchForPeople" value="Go!">
-
-<& AddWatchers, Ticket => $Ticket, UserString => $UserString,
-        UserOp => $UserOp, UserField => $UserField &> 
-</TD><TD VALIGN=TOP>
-<h3>Owner</h3>
-Owner: <& /Elements/SelectOwner, Name => 'Owner', QueueObj => $Ticket->QueueObj, TicketObj => $Ticket, Default => $Ticket->OwnerObj->Id &>
-<h3>Current watchers</h3>
-(Check box to delete)<br>
-
-Requestors:
-<& EditWatchers, TicketObj => $Ticket, Type => 'requestors' &>
-
-Cc:
-<& EditWatchers, TicketObj => $Ticket, Type => 'cc' &>
-
-Administrative Cc:
-<& EditWatchers, TicketObj => $Ticket, Type => 'admincc' &>
-
-</TD>
-</TR>
-</TABLE>
-
-<%ARGS>
-$UserField => undef
-$UserOp => undef
-$UserString => undef
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/EditWatchers b/rt/webrt/Ticket/Elements/EditWatchers
deleted file mode 100755
index 00185e8f9..000000000
--- a/rt/webrt/Ticket/Elements/EditWatchers
+++ /dev/null
@@ -1,46 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Ticket/Elements/Attic/EditWatchers,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2000 Jesse Vincent <jesse@fsck.com>
-
-<ul>
-
-%# Print out a placeholder if there are none.
-%if ($watchers->Count == 0 ) {
-<li><i>none</i>
-% }
-
-
-%while (my $watcher=$watchers->Next) {
-<li>
-<INPUT TYPE=CHECKBOX NAME="DelWatcher<%$watcher->id%>" UNCHECKED>
-%#If there's a principal backing this user, lets give a link to their
-%# account
-%if ($watcher->IsUser) { 
-<a href="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$watcher->OwnerObj->id%>">
-<%$watcher->OwnerObj->RealName%></a>:
-%} else {
-Email address:
-%}
-<i><%$watcher->Email%></i>
-%}
-</ul>
-<%INIT>
-my ($watchers, $watcher, $set);
-if ($Type  =~ /^request/i) {
-       $watchers = $TicketObj->Requestors;
-       }
-elsif ($Type =~ /^admin/i) {
-        $watchers = $TicketObj->AdminCc;
-        }
-elsif ($Type =~ /^cc/i) {
-        $watchers = $TicketObj->Cc;
-      }
-else { $watchers = $TicketObj->Watchers;
-       }
-</%INIT>
-<%ARGS>
-$TicketObj => undef
-$Type => undef
-</%ARGS>
-
-
-
diff --git a/rt/webrt/Ticket/Elements/ShowBasics b/rt/webrt/Ticket/Elements/ShowBasics
deleted file mode 100755
index 97c84c9d0..000000000
--- a/rt/webrt/Ticket/Elements/ShowBasics
+++ /dev/null
@@ -1,29 +0,0 @@
- <TABLE WIDTH="100%">
-      <TR>
-	<TD VALIGN=TOP WIDTH="20%">
-	  <& /Elements/ShadedBox, title => 'Id' , content => $Ticket->Id &>
-	</TD>
-	<TD VALIGN=TOP WIDTH="20%"> <& /Elements/ShadedBox, title => 'Status' , content => $Ticket->Status &>
-	</TD>
-	<TD VALIGN=TOP WIDTH="20%">
-        <& /Elements/ShadedBox, title => 'Worked' , content => $TimeWorked ." min" &>
-	</TD>
-	<TD VALIGN=TOP WIDTH="20%">
-	  <& /Elements/ShadedBox, title => 'Priority', content=> $Ticket->Priority."/".$Ticket->FinalPriority &>
-	</TD>
-	<TD VALIGN=TOP WIDTH="20%">
-	  <& /Elements/ShadedBox, title => 'Queue', content=> $Ticket->QueueObj->Name &>
-	</TD>	
-
-
-      </TR>
-    </TABLE>
-<%INIT>
-my $TimeWorked = $Ticket->TimeWorked;
-if ($Ticket->TimeLeft > 0 ) {
-        $TimeWorked = $Ticket->TimeWorked."/".$Ticket->TimeLeft;
-}
-</%INIT>
-<%ARGS>
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowDates b/rt/webrt/Ticket/Elements/ShowDates
deleted file mode 100755
index e17e31355..000000000
--- a/rt/webrt/Ticket/Elements/ShowDates
+++ /dev/null
@@ -1,54 +0,0 @@
-<TABLE>
-<TR>
-<TD>
-Created:
-</TD>
-<TD>
-<% $Ticket->CreatedObj->AsString %>
-</TD>
-</TR>
-<TR>
-<TD>
-Starts: 
-</TD>
-<TD>
-<% $Ticket->StartsObj->AsString %> <BR>
-</TD>
-</TR>
-<TR>
-<TD>
-Started:
-</TD>
-<TD>
-<% $Ticket->StartedObj->AsString %>
-</TD>
-</TR>
-
-<TR>
-<TD>
-<a href="Display.html?id=<%$Ticket->id%>&Action=SetTold">Last Contact</a>:
-</TD>
-<TD>
-<% $Ticket->ToldObj->AsString %>
-</TD>
-</TR>
-<TR>
-<TD>
-Due:
-</TD>
-<TD><% $Ticket->DueObj->AsString  %>
-</TD>
-</TR>
-<TR>
-<TD>
-Updated:
-</TD>
-<TD>
-<A HREF="#lasttrans">
-<% $Ticket->LastUpdated ? ($Ticket->LastUpdatedAsString ." by ".$Ticket->LastUpdatedByObj->Name) : "Never" | h %></a>
-</TD>
-</TR>
-</TABLE>
-<%ARGS>
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowDependencies b/rt/webrt/Ticket/Elements/ShowDependencies
deleted file mode 100755
index 488652f83..000000000
--- a/rt/webrt/Ticket/Elements/ShowDependencies
+++ /dev/null
@@ -1,18 +0,0 @@
-Depends on:<BR>
-% while (my $Link = $Ticket->DependsOn->Next) {
-% my $member = $Link->TargetObj;
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
-[<%$member->Status%>]
- <br>
-% }
-Depended on by:<BR>
-% while (my $Link = $Ticket->DependedOnBy->Next) {
-% my $member = $Link->TargetObj;
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> 
-[<%$member->Status%>]
- <br>
-% }
-
-<%ARGS>
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowHistory b/rt/webrt/Ticket/Elements/ShowHistory
deleted file mode 100755
index 155eaaabd..000000000
--- a/rt/webrt/Ticket/Elements/ShowHistory
+++ /dev/null
@@ -1,43 +0,0 @@
-<TABLE BORDER=0 width="100%">
-<TR>
-<TD ALIGN=LEFT>
-% if ($ShowTitle) {
-<font size=+3>History</font>
-% }
-&nbsp;</TD>
-<TD align=right><font size=-1>Display mode: 
-%  if ($ShowHeaders == $Ticket->Id) {
-[<A HREF="<%$URIFile%>?id=<%$Ticket->id%>">Brief headers</a>]
-<b>[Full headers]</b>
-% } else {
-<b>[Brief headers]</b>
-[<A HREF="<%$URIFile%>?ShowHeaders=<%$Ticket->Id%>&id=<%$Ticket->id%>">Full headers</a>]
-%  }
-</font>
-</TD>
-</TR>
-</TABLE>
-
-<TABLE WIDTH=100% CELLSPACING=0 CELLPADDING=2 BORDER=0>
-% while (my $Transaction = $Transactions->Next) {
-% $i++;
-%	if ($Transactions->IsLast) {
-	<a name="lasttrans"></a>
-% 	}
-	    <& ShowTransaction, Ticket => $Ticket, Transaction => $Transaction, ShowHeaders => $ShowHeaders, Collapsed => $Collapsed, RowNum => $i  &>
-% }
-</TABLE>
-<%INIT>
-
-my $Transactions = $Ticket->Transactions;
-my $i;
-
-
-</%INIT>
-<%ARGS>
-$URIFile => 'Display.html'
-$Ticket => undef
-$ShowHeaders => undef
-$Collapsed => undef
-$ShowTitle => 1
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowKeywordSelects b/rt/webrt/Ticket/Elements/ShowKeywordSelects
deleted file mode 100644
index 4f8a1786b..000000000
--- a/rt/webrt/Ticket/Elements/ShowKeywordSelects
+++ /dev/null
@@ -1,26 +0,0 @@
-<TABLE>
-% while ( my $KeywordSelect = $KeywordSelects->Next ) {
-    <TR>
-      <TD VALIGN=TOP>
-	<% $KeywordSelect->Name %><BR>
-      </TD>
-      <TD VALIGN=TOP>
-	<UL>
-% my $Keywords = $Ticket->KeywordsObj($KeywordSelect->Id);
-% while (my $Keyword = $Keywords->Next) { 
-	<li><% $Keyword->KeywordObj->RelativePath($KeywordSelect->KeywordObj) |n %></li>
-
-%   }
-	</ul>
-      </TD>
-    </TR>
-% }
-</TABLE>
-
-<%INIT>
-my $KeywordSelects = $Ticket->QueueObj->KeywordSelects;
-</%INIT>
-
-<%ARGS>
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowLinks b/rt/webrt/Ticket/Elements/ShowLinks
deleted file mode 100755
index 49795959e..000000000
--- a/rt/webrt/Ticket/Elements/ShowLinks
+++ /dev/null
@@ -1,61 +0,0 @@
-Depends on:<BR>
-<UL>
-% while (my $Link = $Ticket->DependsOn->Next) {
-% my $member = $Link->TargetObj;
-<LI><a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
-[<%$member->Status%>]
-
-% }
-</UL>
-
-Depended on by:<BR>
-<UL>
-% while (my $Link = $Ticket->DependedOnBy->Next) {
-% my $member = $Link->BaseObj;
-<LI><a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> 
-[<%$member->Status%>]
-% }
-</UL>
-Parents:<BR>	
-<UL>
-% while (my $Link = $Ticket->MemberOf->Next) {
-% my $member = $Link->TargetObj;
-<LI><a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
-[<%$member->Status%>]
-
-% }
-</UL>
-
-Children:<BR>
-<& /Ticket/Elements/ShowMembers, Ticket => $Ticket &>
-<BR>
-Refers to:<BR>
-<UL>
-% while (my $Link = $Ticket->RefersTo->Next) {
-<LI>
-% if ($Link->TargetIsLocal) {
-% my $member = $Link->TargetObj;
-
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
-% } else {
-<A HREF="<%$Link->TargetAsHREF%>"><%$Link->Target%></A>
-% }
-%}
-</UL>
-
-Referred to by:<BR>
-<UL>
-% while (my $Link = $Ticket->ReferredToBy->Next) {
-<LI>
-% if ($Link->BaseIsLocal) {
-% my $member = $Link->BaseObj;
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
-% } else {
-<A HREF="<%$Link->BaseAsHREF%>"><%$Link->Base%></A>
-%}
-% }
-</UL>
-
-<%ARGS>
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowMemberOf b/rt/webrt/Ticket/Elements/ShowMemberOf
deleted file mode 100755
index df5dc92b0..000000000
--- a/rt/webrt/Ticket/Elements/ShowMemberOf
+++ /dev/null
@@ -1,12 +0,0 @@
-<UL>
-% my $memberof = $Ticket->MemberOf;
-% while (my $member_of = $memberof->Next) {
-<LI><a href="/Ticket/Display.html?id=<%$member_of->Id%>"><%$member_of->Id%></a>: <%$member_of->Subject%> [<%$member_of->Status%>]
-% }
-</UL>
-
-<%INIT>
-</%INIT>
-<%ARGS>
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowMembers b/rt/webrt/Ticket/Elements/ShowMembers
deleted file mode 100755
index 0a6f12377..000000000
--- a/rt/webrt/Ticket/Elements/ShowMembers
+++ /dev/null
@@ -1,22 +0,0 @@
-% if ($members->Count) {
-<UL>
-% while (my $link = $members->Next) {
-% my $member= $link->BaseObj;
-<LI><a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: <%$member->Subject%> [<%$member->Status%>]<br>
-% if ($depth < 8) {
-<&/Ticket/Elements/ShowMembers, Ticket => $member, depth => ($depth+1) &> 
-% }
-% }
-</UL>
-% }
-
-<%INIT>
-
-my $members = $Ticket->Members;
-
-</%INIT>
-
-<%ARGS>
-$Ticket => undef
-$depth => 1
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowPeople b/rt/webrt/Ticket/Elements/ShowPeople
deleted file mode 100755
index ff35f484d..000000000
--- a/rt/webrt/Ticket/Elements/ShowPeople
+++ /dev/null
@@ -1,12 +0,0 @@
-Owner<BR>
-&nbsp;<B><%$Ticket->OwnerObj->Name%></B><BR>
-Requestors<BR>
-&nbsp;<B><%$Ticket->RequestorsAsString%></B><BR>
-Cc<BR>
-&nbsp;<B><%$Ticket->CcAsString%></B><BR>
-AdminCc<BR>
-&nbsp;<B><%$Ticket->AdminCcAsString%></B>
-<%ARGS>
-$Ticket => undef
-</%ARGS>
-
diff --git a/rt/webrt/Ticket/Elements/ShowReferences b/rt/webrt/Ticket/Elements/ShowReferences
deleted file mode 100755
index 37e2fdece..000000000
--- a/rt/webrt/Ticket/Elements/ShowReferences
+++ /dev/null
@@ -1,27 +0,0 @@
-<UL>
-% while (my $Link = $Ticket->RefersTo->Next) {
-<LI>
-% if ($Link->TargetIsLocal) {
-% my $member = $Link->TargetObj;
-
-<a href="/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
-% } else {
-<A HREF="<%$Link->TargetAsHREF%>"><%$Link->Target%></A>
-% }
-%}
-
-
-
-% while (my $Link = $Ticket->ReferredToBy->Next) {
-<LI>
-% if ($Link->BaseIsLocal) {
-% my $member = $Link->BaseObj;
-<a href="/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
-% } else {
-<A HREF="<%$Link->BaseAsHREF%>"><%$Link->Base%></A>
-%}
-% }
-</UL>
-<%ARGS>
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowRequestor b/rt/webrt/Ticket/Elements/ShowRequestor
deleted file mode 100644
index fcbe71df1..000000000
--- a/rt/webrt/Ticket/Elements/ShowRequestor
+++ /dev/null
@@ -1,35 +0,0 @@
-<%PERL>
-my $people = $Ticket->Requestors;
-while (my $requestor=$people->Next) {
-if (($requestor->Owner ) && (my $user=$requestor->OwnerObj)) {
-my $name=$user->RealName || $user->EmailAddress;	
-my $tickets = new RT::Tickets($session{'CurrentUser'});
-$tickets->LimitRequestor(VALUE => $user->EmailAddress);
-$tickets->LimitStatus( VALUE => 'open');
-$tickets->LimitStatus( VALUE => 'new');
-$tickets->RowsPerPage(25);
-$tickets->OrderBy(FIELD => 'Priority',
-		  ORDER => 'DESC');
-</%PERL>
-
-% unless ($user->Privileged) {
-<& /Elements/TitleBoxStart, 
-	title => "<a class='inverse' href=\"$RT::WebPath/Admin/Users/Modify.html?id=".$user->id."\">More about $name</a>" &>
-
-Comments about this user:<BR>
-<B><% ($user->Comments || "No comment entered about this user") %></B><BR>
-
-This user's 25 highest priority tickets:<BR>
-<UL>
-%while (my $w=$tickets->Next) {
-<LI><%$w->Id%>: <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$w->id%>"><%$w->Subject%></a> (<%$w->Status%>)
-%}
-</UL>
-<& /Elements/TitleBoxEnd &>
-
-% }
-% }
-%}
-<%ARGS>
-$Ticket=>undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ShowSummary b/rt/webrt/Ticket/Elements/ShowSummary
deleted file mode 100755
index b80ceb4fd..000000000
--- a/rt/webrt/Ticket/Elements/ShowSummary
+++ /dev/null
@@ -1,61 +0,0 @@
-      <TABLE WIDTH="100%" >
-      <TR>
-	<TD VALIGN=TOP >
-	  <& /Elements/TitleBoxStart, title => 'The Basics', 
-		title_href =>"$RT::WebPath/Ticket/Modify.html?id=".$Ticket->Id, 
-		title_class=> 'inverse',  
-		color => "#993333" &>
-	  <& /Ticket/Elements/ShowBasics, Ticket => $Ticket &>
-	  <& /Elements/TitleBoxEnd &>
-
-	<BR>
-
-	  <& /Elements/TitleBoxStart, 
-		title_href =>"$RT::WebPath/Ticket/Modify.html?id=".$Ticket->Id, 
-		title_class=> 'inverse',  
-		title => "Keyword Selections", color => "#993300"
-	  &>
-	  <& /Ticket/Elements/ShowKeywordSelects, Ticket => $Ticket &>
-	  <& /Elements/TitleBoxEnd &>
-
-	
-
-	<BR>
-	  <& /Elements/TitleBoxStart, title => 'Relationships', 
-		title_href => "$RT::WebPath/Ticket/ModifyLinks.html?id=".$Ticket->Id, 
-		title_class=> 'inverse',  
-		titleright => '', color=> "#336633" &>
-	  <& /Ticket/Elements/ShowLinks, Ticket => $Ticket &>
-	<& /Elements/TitleBoxEnd &>
-	</TD>
-	<BR>
-	<TD VALIGN=TOP >
-
-	  <& /Elements/TitleBoxStart, title => "Dates",
-		title_href =>"$RT::WebPath/Ticket/ModifyDates.html?id=".$Ticket->Id, 
-		title_class=> 'inverse',  
-		 color => "#663366" &>
-	  <& /Ticket/Elements/ShowDates, Ticket => $Ticket &>
-	  <& /Elements/TitleBoxEnd &>
-	<BR>  
-	  <& /Elements/TitleBoxStart, title => 'People', 
-		title_href =>"$RT::WebPath/Ticket/ModifyPeople.html?id=".$Ticket->Id, 
-		title_class=> 'inverse',  
-		color => "#333399" &>
-	  <& /Ticket/Elements/ShowPeople, Ticket => $Ticket &>
-	  <& /Elements/TitleBoxEnd &>
-	<BR>
-
-	  <& /Ticket/Elements/ShowRequestor, Ticket => $Ticket &>
-
-
-	</TD>
-      </TR>
-    </TABLE>
-<%ARGS>
-$Ticket => undef
-</%ARGS>
-
-
-
-
diff --git a/rt/webrt/Ticket/Elements/ShowTransaction b/rt/webrt/Ticket/Elements/ShowTransaction
deleted file mode 100755
index a0da008b3..000000000
--- a/rt/webrt/Ticket/Elements/ShowTransaction
+++ /dev/null
@@ -1,162 +0,0 @@
-<TR bgcolor="<%$rowbgcolor%>">
-<TD bgcolor="<%$bgcolor%>"><A NAME="#<%$Transaction->Id%>"></A>&nbsp&nbsp;</TD>
-<TD>&nbsp&nbsp;</TD>
-<TD><font size=-2><% $transdate|n %></font>&nbsp;</TD>
-<TD ALIGN="LEFT"><b><%$Transaction->CreatorObj->Name%> - <%$TicketString%> <%$Transaction->BriefDescription%>
-
-</b></TD>
-<TD><%$TimeTaken%>&nbsp;</TD>
-<TD ALIGN="RIGHT"><font size=-1><%$titlebar_commands|n%></font></TD>
-</TR>
-<%PERL>
-
-unless ($Collapsed) {
- $attachments->GotoFirstItem;
- while (my $message=$attachments->Next) {
-     #we don't want to show any empty transactions, unless they have kids
-     next unless (length $message->Content || $message->Children->Count);
-     my ($headers, $content);
-     
-    </%PERL>
-
-
-<%PERL>
-  if ($message->Parent == 0) {
-      if ($ShowHeaders == $Ticket->Id) {
-	  $headers = $message->Headers;
-      } else {
-	  $headers = $message->NiceHeaders;
-      }
-      chomp $headers;
-      $headers .= "\n\n" if ($headers);
-  }
-     # 13456 is a random # of about the biggest size we want to see inline text
-     my $MAX_INLINE_BODY = 13456;
-     if ($message->ContentType =~ m{^(text/plain|message|text$)}i && 
-				    length($message->Content)< $MAX_INLINE_BODY ) {
-
-	 $content = $message->Content;
-
-	 my $wrapper = new Text::Wrapper (columns=>85);
-	 $content = $wrapper->wrap($content);
-         $content =~ s/&/&amp;/g;
-	 $content =~ s/</&lt;/g;
-	 $content =~ s/>/&gt;/g;
-         $content =~ s!((?:http|https|ftp|mailto):\S*?)([\s"']|&gt;|\.[\n])!<A HREF=\"$1\" TARGET=new>$1</A>$2!g;
-
-
-     }
-     else {
-	 $content = "&nbsp;";
-     }
-        
-</%PERL>
-<TR BGCOLOR="<%$rowbgcolor%>">
-      <TD BGCOLOR="<%$bgcolor%>">&nbsp;&nbsp;</TD>
-      <TD>&nbsp&nbsp;</TD>
-      <TD COLSPAN=3 VALIGN=TOP>
-	<PRE>
-<%$headers%><%$content|n%>
-</PRE>
-      </TD>
-      <TD VALIGN=TOP ALIGN=RIGHT>
-	
-% if ($message->Parent == 0  ) {
-<BR>
-% }
-<%PERL>
-my $size = length($message->Content());
-
-if ($size) {
-    if ($size > 1024) {
-	$size = int($size/102.4)/10 . "k";
-    }
-    else {
-	$size = $size ."b";
-    }
-</%PERL>
-<font size=-1><A HREF="Attachment/<%$Transaction->Id%>/<%$message->Id%>/<%$message->Filename%>">Download <%$message->Filename|| '(untitled)'%></a> <% $size %></font>
-% }
-</TD>
-</TR>
-% }
-% }
-
-
-
-<%ARGS>
-$Ticket => undef
-$Transaction => undef
-$ShowHeaders => undef
-$Collapsed => undef
-$ShowTitleBarCommands => 1
-$RowNum => 1
-</%ARGS>
-
-<%INIT>
-
-
-my ($TimeTaken, $TicketString, $bgcolor, $rowbgcolor);
-
-my $transdate = $Transaction->CreatedAsString();
-$transdate =~ s/\s/&nbsp;/g;
-
-if ($RowNum % 2) {
-	$rowbgcolor="#cccccc";
-} else {
-	$rowbgcolor="#ffffff";
-}
-
-if ($Transaction->Type =~ /^(Create|Correspond|Comment$)/) {
-	if ($Transaction->IsInbound) {
-		$bgcolor="#336699";
-	}
-	else {
-		$bgcolor="#339999";
-	}
-} elsif (($Transaction->Field =~ /^Owner$/) or 
-	 ($Transaction->Type =~ /^(AddWatcher|DelWatcher)$/)) {
-	$bgcolor="#333399";
-
-} elsif ($Transaction->Type =~ /^(AddLink|DeleteLink)$/) {
-	$bgcolor="#336633";
-} elsif ($Transaction->Type =~ /^(Status|Set|Keyword|Told)$/) {
-	if ($Transaction->Field =~ /^(Told|Starts|Started|Due)$/) {
-		$bgcolor="#663366";	
-	}
-	else {
-		$bgcolor="#993333";
-	}
-}
-else {
-	$bgcolor="#cccccc";
-}
-
-if ($Ticket->Id != $Transaction->Ticket) {
-	$TicketString = "Ticket ".$Transaction->Ticket .": ";
-}
-
-if ($Transaction->TimeTaken > 0) {
-	$TimeTaken = $Transaction->TimeTaken." min"
-}
-my $attachments = $Transaction->Attachments;
-
-my $titlebar_commands='&nbsp;';
-
-# If the transaction has anything attached to it at all
-if ($Transaction->Message->First && $ShowTitleBarCommands) {
-	if ($Transaction->TicketObj->CurrentUserHasRight('ReplyToTicket')) {
-		$titlebar_commands .= 
-	  	  "[<a href=\"Update.html?id=".
-		  $Transaction->Ticket . "&QuoteTransaction=".$Transaction->Id.
-		  "&Action=Respond\">Reply</a>]&nbsp;";
-	}
-	if ($Transaction->TicketObj->CurrentUserHasRight('CommentOnTicket')) {
-	     $titlebar_commands .= 
-	     "[<a href=\"Update.html?id=".$Transaction->Ticket. 
-	     "&QuoteTransaction=".$Transaction->Id.
-	     "&Action=Comment\">Comment</a>]";
-	}
-}
-
-</%INIT>
diff --git a/rt/webrt/Ticket/Elements/Tabs b/rt/webrt/Ticket/Elements/Tabs
deleted file mode 100755
index 8cce197de..000000000
--- a/rt/webrt/Ticket/Elements/Tabs
+++ /dev/null
@@ -1,126 +0,0 @@
-<& /Elements/Tabs, tabs => $tabs, actions => $actions, current_tab => $current_tab, tabs_scalar => $tabs_scalar &>
-<%INIT>
-	
-  my $id = $Ticket->id();
-  my $tabs_scalar = '';
-  my $tabs = {
-		 A => { title => 'Display',
-			path => "Ticket/Display.html?id=".$id,
-		      },
-	      
-	      Ab => { title => 'History',
-		      path => "Ticket/History.html?id=".$id,
-		       },
-	      B => { title => 'Basics',
-		     path => "Ticket/Modify.html?id=".$id,
-		   },
-	      
-	      C => { title => 'Dates',
-		     path => "Ticket/ModifyDates.html?id=".$id,
-		   },
-	      
-	      D => { title => 'People',
-		     path => "Ticket/ModifyPeople.html?id=".$id,
-		   },
-	      E => { title => 'Links',
-		     path => "Ticket/ModifyLinks.html?id=".$id,
-		   },
-	      F => { title => 'Jumbo',
-		     path => "Ticket/ModifyAll.html?id=".$id,
-		   },
-	      
-	     };
-
-my $actions;
-if ($Ticket->CurrentUserHasRight('ModifyTicket') or 
-    $Ticket->CurrentUserHasRight('CommentOnTicket')) {
-    $actions->{'Comment'} = 
-      { 
-       title => 'Comment',
-	path => "Ticket/Update.html?Action=Comment&id=".$id,
-      }
-  };
-
-if ($Ticket->CurrentUserHasRight('ModifyTicket') or 
-    $Ticket->CurrentUserHasRight('ReplyToTicket')) {
-    $actions->{'Reply'} = 
-      { 
-       title => 'Reply',
-       path => "Ticket/Update.html?Action=Respond&id=".$id,
-      }
-  };
-
-if ($Ticket->CurrentUserHasRight('OwnTicket')) {
-    if ($Ticket->OwnerObj->id == $RT::Nobody->id)  {
-	$actions->{'Take'} = 	
-	  { 
-	   path => "Ticket/Display.html?Action=Take&id=".$id,
-	   title => 'Take'
-	  };
-    }
-    elsif ( $Ticket->OwnerObj->id != $session{CurrentUser}->id) {
-	$actions->{'Steal'} = 	
-	  { 
-	   path => "Ticket/Display.html?Action=Steal&id=".$id,
-	   title => 'Steal' 
-	  };
-    }
-}
-
-if ($Ticket->CurrentUserHasRight('ModifyTicket')) {
-    if ($Ticket->Status ne 'resolved') {
-	$actions->{'Resolve'} = 
-	  { 
-
-           path => "Ticket/Update.html?Action=Comment&DefaultStatus=resolved&id=".$id,
-	   title => 'Resolve'
-	  };
-    }	
-    if ($Ticket->Status ne 'open') {	
-	$actions->{'Open'} = 
-	  { 
-	   path => "Ticket/Display.html?Status=open&id=". $id,
-	   title => 'Open'
-	  };
-    }
-}
-
-
-
-
-if (defined $session{'tickets'}) {
-    my $items = $session{'tickets'}->ItemsArrayRef();
-    my @indexs = grep(($items->[$_]->id == $Ticket->Id), 0 .. $#{$items});
-
-    if ($items->[0]) {
-
-    if ($items->[$indexs[0]]->id == $Ticket->Id) {
-	# Don't display prev links if we're on the first ticket
- 	if ( $items->[0]->id != $Ticket->id ) {
-	    $tabs_scalar .= '[<A HREF="Display.html?id='.
-	      $items->[0]->id.
-		'">&lt;&lt; First</a>] ';
-	    $tabs_scalar .= '[<A HREF="Display.html?id='.
-	      $items->[$indexs[0]-1]->id.
-		'">&lt; Prev</a>] ';
-	}
-	# Don't display next links if we're on the last ticket
-	if ( $Ticket->id != $items->[-1]->id ) {
-	    $tabs_scalar .= '[<A HREF="Display.html?id='.
-	      $items->[$indexs[0]+1]->id.
-		'">Next &gt;</a>] ';
-	    $tabs_scalar .= '[<A HREF="Display.html?id='.
-	      $items->[-1]->id.
-		'">Last &gt;&gt</a>]';
-	}
-	$tabs_scalar .= "<BR><BR>";
-    }
-    }
-}
-</%INIT>
-
-  
-<%ARGS>
-$Ticket => undef
-$current_tab => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/Elements/ToolBar b/rt/webrt/Ticket/Elements/ToolBar
deleted file mode 100755
index 108e2f784..000000000
--- a/rt/webrt/Ticket/Elements/ToolBar
+++ /dev/null
@@ -1,3 +0,0 @@
-<%ARGS>
-$Ticket => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/History.html b/rt/webrt/Ticket/History.html
deleted file mode 100755
index e0a5fe15a..000000000
--- a/rt/webrt/Ticket/History.html
+++ /dev/null
@@ -1,30 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Ticket/Attic/History.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2000 Jesse Vincent <jesse@fsck.com>
-
-<& /Elements/Header, Title => "Ticket History #".$Ticket->Id ." ".$Ticket->Subject &>
-<& /Ticket/Elements/Tabs, Ticket => $Ticket, current_tab => 'Ticket/History.html?id='.$Ticket->id  &>
-
-<BR>
-      
-<& /Ticket/Elements/ShowHistory , Ticket => $Ticket, ShowHeaders => $ARGS{'ShowHeaders'}, URIFile => 'History.html' &> 
-
-
-<%ARGS>
-$id => undef
-</%ARGS>
-
-<%INIT>
-
-  
-
-my $Ticket = LoadTicket ($id);
-
-unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
-	Abort("No permission to view ticket");
-}
-
-</%INIT>
-
-
-
-
diff --git a/rt/webrt/Ticket/Modify.html b/rt/webrt/Ticket/Modify.html
deleted file mode 100755
index 7a8a79216..000000000
--- a/rt/webrt/Ticket/Modify.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<& /Elements/Header, Title => 'Modify ticket #'.$TicketObj->Id &>
-<& /Ticket/Elements/Tabs, Ticket => $TicketObj, current_tab => "Ticket/Modify.html?id=".$TicketObj->Id  &>
-
-<& /Elements/ListActions, actions => \@results &>
-<FORM METHOD=POST ACTION="Modify.html">
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$TicketObj->Id%>">
-
-<& /Elements/TitleBoxStart, title => 'Modify ticket #'.$TicketObj->Id, 
-  color=> "#993333", width => "100%" &>
-<& Elements/EditBasics, TicketObj => $TicketObj &>
-<& /Elements/TitleBoxEnd &>
-
-<& /Elements/TitleBoxStart, title => 'Keywords', color =>"#993333"&>
-<& Elements/EditKeywordSelects, TicketObj=>$TicketObj &>
-<& /Elements/TitleBoxEnd &>
-
-<& /Elements/Submit, Label => 'Save Changes', Caption => "If you've updated anything above, be sure to", color => "#993333" &>
-</form>
-<%INIT>
-  
-my $TicketObj = LoadTicket($id);
-
-my @results = ProcessTicketBasics(TicketObj => $TicketObj, ARGSRef => \%ARGS);
-my @okresults = ProcessTicketObjectKeywords(TicketObj => $TicketObj, ARGSRef => \%ARGS);
-
-push (@results, @okresults);
-
-# TODO: display the results, even if we can't display the ticket
-
-unless ($TicketObj->CurrentUserHasRight('ShowTicket')) {
-     Abort("No permission to view ticket");
-} 
-
-</%INIT>
-
-
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/ModifyAll.html b/rt/webrt/Ticket/ModifyAll.html
deleted file mode 100755
index ad913739d..000000000
--- a/rt/webrt/Ticket/ModifyAll.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<& /Elements/Header, Title => "Ticket #".$Ticket->Id ." Jumbo update: ".$Ticket->Subject &>
-<& /Ticket/Elements/Tabs, Ticket => $Ticket , current_tab => "Ticket/ModifyAll.html?id=".$Ticket->Id &>
-
-<& /Elements/ListActions, actions => \@results &>
-
-<FORM METHOD=POST ACTION="ModifyAll.html" ENCTYPE="multipart/form-data">
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>">
-
-
-<& /Elements/TitleBoxStart, title => 'Modify ticket #'.$Ticket->Id,   color=> "#993333", width => "100%" &>
-<& Elements/EditBasics, TicketObj => $Ticket &>
-<& /Elements/TitleBoxEnd &>
-
-<BR>
-
-<& /Elements/TitleBoxStart, title => 'Dates',  width => "100%", color => "#663366"  &>
-<& Elements/EditDates, TicketObj => $Ticket &>
-<& /Elements/TitleBoxEnd &>
-
-<BR>
-
-<& /Elements/TitleBoxStart, title => 'Keywords', color =>"#993333"&>
-<& Elements/EditKeywordSelects, TicketObj=>$Ticket &>
-<& /Elements/TitleBoxEnd &>
-
-<BR>
-
-<& /Elements/TitleBoxStart, title => 'People',width => "100%", color=> "#333399" &>
-<& Elements/EditPeople, Ticket => $Ticket, UserField => $UserField, UserString => $UserString, UserOp => $UserOp &>
-<& /Elements/TitleBoxEnd &>
-
-<BR>
-
-<& /Elements/TitleBoxStart, title => 'Relationships', color => "#336633"&>
-<& Elements/EditLinks, Ticket => $Ticket &>
-<& /Elements/TitleBoxEnd &>
-
-<BR>
-
-<& /Elements/TitleBoxStart, title => 'Update ticket' &>
-<hr>
-Update Type: <select name="UpdateType">
-% if ($CanComment) {
-  <option value="private" >Comments (Not sent to requestors)</option>
-% }
-% if ($CanRespond) {
-   <option value="response">Response to requestors</option>
-% }
-</select> 
-<br>
-
-Subject: <input name="UpdateSubject" size=60 value=""> <br>
-Attach: <input name="UpdateAttachment" type=file> <br>
-<& /Elements/MessageBox, Name=>"UpdateContent", QuoteTransaction=>$ARGS{QuoteTransaction} &>
-<& /Elements/TitleBoxEnd &>
-
-
-<& /Elements/Submit, Label => 'Save Changes', Caption => "If you've updated anything above, be sure to", color => "#333399" &>
-</form>
-
-<%INIT>
-
-
-
-my $Ticket = LoadTicket($id);
-
-my $CanRespond = 0;
-my $CanComment = 0;
-
-
-$CanRespond = 1 if ( $Ticket->CurrentUserHasRight('ReplyToTicket') or
-                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
-
-$CanComment = 1 if ( $Ticket->CurrentUserHasRight('CommentOnTicket') or
-                     $Ticket->CurrentUserHasRight('ModifyTicket') );
-
-
-my (@wresults, @results, @okresults, @dresults, @lresults);
-
-unless ($OnlySearchForPeople) {
-    @wresults = ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS);
-    @results = ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS);
-    @okresults = ProcessTicketObjectKeywords(TicketObj => $Ticket, ARGSRef => \%ARGS);
-
-    @dresults = ProcessTicketDates( TicketObj => $Ticket, ARGSRef => \%ARGS);
-    @lresults = ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);
-
-    $ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
-
-    if ($ARGS{'UpdateContent'} && 
-	$ARGS{'UpdateContent'} ne '' && 
-	$ARGS{'UpdateContent'} ne  "-- \n" . 
-				$session{'CurrentUser'}->UserObj->Signature
-       ) {
-   	 ProcessUpdateMessage(TicketObj => $Ticket, 
-			      ARGSRef=>\%ARGS, 
-                              Actions=>\@results);
-	}
-}
-push @results, @wresults;
-push @results, @dresults;
-push @results, @lresults;
-push @results, @okresults;
-
-# If they've gone and moved the ticket to somewhere they can't see, etc...
-# TODO: display the results, even if we can't display the ticket.
-
-unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
-   Abort("No permission to view ticket");
-}
-
-
-</%INIT>
-
-
-
-<%ARGS>
-$OnlySearchForPeople => undef
-$UserField => undef
-$UserOp => undef
-$UserString => undef
-$id => undef
-</%ARGS>
-
diff --git a/rt/webrt/Ticket/ModifyDates.html b/rt/webrt/Ticket/ModifyDates.html
deleted file mode 100755
index b2ecb68fb..000000000
--- a/rt/webrt/Ticket/ModifyDates.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<& /Elements/Header, Title => 'Modify dates for #'. $TicketObj->Id &>
-<& /Ticket/Elements/Tabs, Ticket => $TicketObj, current_tab => "Ticket/ModifyDates.html?id=".$TicketObj->Id  &> 
-
-<& /Elements/ListActions, actions => \@results &>
-
-<FORM METHOD=POST ACTION="ModifyDates.html">
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$TicketObj->Id%>">
-<& /Elements/TitleBoxStart, title => 'Modify dates for ticket #'.$TicketObj->Id,  width => "100%", color => "#663366"  &>
-
-<& Elements/EditDates, TicketObj => $TicketObj &>
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit, color => "#663366" &>
-</form>
-
-
-<%INIT>
-
-my $TicketObj = LoadTicket($id);
-my @results = ProcessTicketDates( TicketObj => $TicketObj, ARGSRef => \%ARGS);
-
-</%INIT>
-
-
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/ModifyLinks.html b/rt/webrt/Ticket/ModifyLinks.html
deleted file mode 100755
index 14c939d43..000000000
--- a/rt/webrt/Ticket/ModifyLinks.html
+++ /dev/null
@@ -1,31 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Ticket/Attic/ModifyLinks.html,v 1.1 2002-08-12 06:17:09 ivan Exp $
-%# Copyright 1996-2000 Jesse Vincent <jesse@fsck.com>
-
-<& /Elements/Header, Title => "Link ticket ".$Ticket->Id &>
-<& /Ticket/Elements/Tabs, Ticket => $Ticket, current_tab => "Ticket/ModifyLinks.html?id=".$Ticket->Id &>
-
-<& /Elements/ListActions, actions => \@results &>
-
-<form action="ModifyLinks.html" method="post">
-<input type="hidden" name="id" value="<%$Ticket->id%>">
-
-<& /Elements/TitleBoxStart, title => 'Edit Relationships', color => "#336633"&>
-<& Elements/EditLinks, Ticket => $Ticket &>
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit, color => "#336633", Caption=> 'Save changes' &>
-</form>
-
-
-
-
-<%INIT>
-  
-my $Ticket = LoadTicket($id);
-my @results = ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);
-    
-</%INIT>
-      
-      
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/webrt/Ticket/ModifyPeople.html b/rt/webrt/Ticket/ModifyPeople.html
deleted file mode 100755
index fecf09192..000000000
--- a/rt/webrt/Ticket/ModifyPeople.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<& /Elements/Header, Title => 'Modify people related to ticket # ' . $Ticket->id &>
-<& /Ticket/Elements/Tabs, Ticket => $Ticket , current_tab => "Ticket/ModifyPeople.html?id=".$Ticket->Id &>
-
-<& /Elements/ListActions, actions => \@results &>
-
-<FORM METHOD=POST ACTION="ModifyPeople.html">
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>">
-<& /Elements/TitleBoxStart, title => 'Modify people related to ticket #'.$Ticket->Id,   width => "100%", color=> "#333399" &>
-<& Elements/EditPeople, Ticket => $Ticket, UserField => $UserField, UserString => $UserString, UserOp => $UserOp &>
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit, Label => 'Save Changes', Caption => "If you've updated anything above, be sure to", color => "#333399" &>
-</form>
-
-<%INIT>
-
-my (@results, @wresults);
-
-my $Ticket = LoadTicket($id);
-
-# if we're trying to search for watchers and nothing else
-unless ($OnlySearchForPeople) {
-    @results = ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS);
-    @wresults = ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS);
-}
-
-push @results, @wresults;
-</%INIT>
-
-
-
-<%ARGS>
-$OnlySearchForPeople => undef
-$UserField => undef
-$UserOp => undef
-$UserString => undef
-$id => undef
-</%ARGS>
-
diff --git a/rt/webrt/Ticket/Update.html b/rt/webrt/Ticket/Update.html
deleted file mode 100755
index be2266663..000000000
--- a/rt/webrt/Ticket/Update.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<& /Elements/Header, Title=> $title  &>
-<& /Ticket/Elements/Tabs, Ticket => $Ticket &>
-<& /Elements/TitleBoxStart, title => "Update ticket" &>
-
-<FORM ACTION="Display.html" NAME="TicketUpdate" 
-	METHOD=POST enctype="multipart/form-data">
-
-<TABLE>
-<TR><TD>
-<a href="ModifyPeople.html?id=<%$Ticket->Id%>">Ticket watchers</A></TD><TD align=right>
-Requestor:
-</TD><TD>
-<b><% $Ticket->RequestorsAsString %></b>
-</TD></TR>
-<TR><TD>&nbsp;</TD><TD align=right>
-Cc:
-</TD><TD>
-<b><% $Ticket->CcAsString %></b>
-</TD></TR>
-<TR><TD>&nbsp;</TD><TD align=right>
-AdminCc:
-</TD><TD>
-<b><% $Ticket->AdminCcAsString %></b>
-</TD></TR>
-</TR>
-</TABLE>
-<hr>
-
-<TABLE BORDER=0>
-
-<tr><td align=right>Status:</td>
-<td>
-<& /Elements/SelectStatus, Name=>"Status", Default => $DefaultStatus &>
-Owner:  
-<& /Elements/SelectOwner, Name=>"Owner", Default => $Ticket->OwnerObj->Id(), QueueObj => $Ticket->QueueObj, TicketObj => $Ticket &>
-Worked: <input size=4 name="UpdateTimeWorked"> minutes</td></tr>
-<tr><td align=right>Update Type:</td>
-<td><select name="UpdateType">
-% if ($CanComment) {
-  <option value="private" <%$CommentDefault%>>Comments (Not sent to requestors)</option>
-% }
-% if ($CanRespond) {
-   <option value="response" <%$ResponseDefault%>>Response to requestors</option>
-% }
-</select> 
-</td></tr>
-<tr><td align=right>Subject:</td><td> <input name="UpdateSubject" size=60 value="<%$Ticket->Subject()%>"></td></tr>
-<tr><td align=right>Cc:</td><td> <input name="UpdateCc" size=60><BR>
-<i><font size=-2>(Sends a carbon-copy of this update to a comma-delimited list
-of email addresses. Does <b>not</b> change who will receive future updates.)</font></i>
-</td></tr>
-<tr><td align=right>Bcc:</td><td> <input name="UpdateBcc" size=60><BR>
-<i><font size=-2>(Sends a blind carbon-copy of this update to a comma-delimited list
-of email addresses. Does <b>not</b> change who will receive future updates.)</font></i>
-</td></tr>
-<tr><td align=right>Attach:</td><td><input name="UpdateAttachment" type="file"></td></tr>
-</table>
-<& /Elements/MessageBox, Name=>"UpdateContent", QuoteTransaction=>$ARGS{QuoteTransaction} &>
-		<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>"><br>
-
-
-
-
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit &>
-  </FORM>
-
-
-
-<%INIT>
-
-my $CanRespond = 0;
-my $CanComment = 0;
-my $title;
-
-my $Ticket = LoadTicket($id);
-
-
-if ($DefaultStatus eq 'resolved') {
-	$title = "Resolve";
-} else {
-	$title = "Update";
-}
-
-$title .= " ticket #" . $Ticket->id . " (" .$Ticket->Subject.")";
-
-# Things needed in the template - we'll do the processing here, just
-# for the convinience:
-my $CommentDefault=$Action eq "Comment" ? "SELECTED" : "";
-my $ResponseDefault=$Action eq "Respond" ? "SELECTED" : "";
-
-$DefaultStatus = $Ticket->Status() unless ($DefaultStatus);
-
-$CanRespond = 1 if ( $Ticket->CurrentUserHasRight('ReplyToTicket') or
-                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
-
-$CanComment = 1 if ( $Ticket->CurrentUserHasRight('CommentOnTicket') or
-                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
-	
-
-     
-     
-
-</%INIT>
-
-<%ARGS>
-$id => undef
-$Action => undef
-$DefaultStatus => undef
-</%ARGS>
diff --git a/rt/webrt/User/Prefs.html b/rt/webrt/User/Prefs.html
deleted file mode 100755
index d769977f9..000000000
--- a/rt/webrt/User/Prefs.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<& /Elements/Header, Title=>"Preferences" &>
-<& /Elements/Tabs &>
-
-<& /Elements/ListActions, actions => \@results &>
-<form method=post>
-
-% unless ($RT::WebExternalAuth) {
-<& /Elements/TitleBoxStart, title => 'Change password'  &>
-New password: <input type=password name="NewPass1" size=16>
-Confirm: <input type=password name="NewPass2" size=16>
-<& /Elements/TitleBoxEnd &>
-<BR>
-% }
-<& /Elements/TitleBoxStart, title => 'Signature'  &>
-<INPUT TYPE=HIDDEN NAME="SignatureMagic" VALUE=1>
-<TEXTAREA COLS=72 ROWS=4 WRAP=HARD NAME="Signature"><% $session{'CurrentUser'}->UserObj->Signature %></TEXTAREA>
-<br>
-<BR>
-<& /Elements/TitleBoxEnd &>
-<& /Elements/Submit &>
-	  </form>
-
-
-<%INIT>
-my @results;
-
-if ($NewPass1) {
-    if ($NewPass1 ne $NewPass2) {
-	push (@results, "Passwords did not match.");
-    }	
-    else {
-	my ($val, $msg)=$session{'CurrentUser'}->UserObj->SetPassword($NewPass1);
-	push (@results, "Password: ".$msg);
-    }	
-}
-if ($Signature || $SignatureMagic) {
-    $Signature =~ s/(\r\n|\r)/\n/g;
-    if ($Signature ne $session{'CurrentUser'}->UserObj->Signature) {
-	my ($val, $msg)=$session{'CurrentUser'}->UserObj->SetSignature($Signature);
-	push (@results, "Signature: ".$msg);
-    }
-}
-#A hack to make sure that session gets rewritten.
-
-$session{'i'}++;
-</%INIT>
-
-<%ARGS>
-$Signature => undef
-$SignatureMagic => undef
-$NewPass1 => undef
-$NewPass2 => undef
-</%ARGS>
diff --git a/rt/webrt/autohandler b/rt/webrt/autohandler
deleted file mode 100755
index 16cdbc79b..000000000
--- a/rt/webrt/autohandler
+++ /dev/null
@@ -1,73 +0,0 @@
-%# $Header: /home/cvs/cvsroot/freeside/rt/webrt/Attic/autohandler,v 1.1 2002-08-12 06:17:08 ivan Exp $
-<& /Elements/Footer, %ARGS &>
-
-<%INIT>
-
-$m->{'rt_base_time'} = time;
-
-#if it's a noauth file, don't ask for auth.
-if ($m->base_comp->path =~ '^/+NoAuth/') {
-        $m->call_next();
-	$m->abort();
-}
-
-# If RT is configured for external auth, let's get REMOTE_USER
-# We intentionally don't test for REMOTE_USER to meet our policy
-elsif ($RT::WebExternalAuth){
-
-    $user = $ENV{'REMOTE_USER'};
-    $session{'CurrentUser'} = RT::CurrentUser->new();
-    $session{'CurrentUser'}->Load($user);
-    unless ($session{'CurrentUser'}->id() ) {
-        delete $session{'CurrentUser'};
-        $m->comp('/Elements/Login', %ARGS, Error=> 'You are not an authorized user');
-        $m->abort();
-    }
-}
- 
-# If the user is loging in, let's authenticate
-elsif (defined ($user) && defined ($pass)){
-    
-    $session{'CurrentUser'} = RT::CurrentUser->new();
-    $session{'CurrentUser'}->Load($user);
-    unless ($session{'CurrentUser'}->id() ) {
-	delete $session{'CurrentUser'};
-	$m->comp('/Elements/Login', %ARGS, Error=> 'Your username or password is incorrect');
-        $m->abort();
-    };
-    unless ($session{'CurrentUser'}->IsPassword($pass)) {
-	delete $session{'CurrentUser'};
-	
-	$m->comp('/Elements/Login', Error => 'Your username or password is incorrect', %ARGS);
-	$m->abort();
-    }
-}
-  
-
-#If we've got credentials, lets serve the file up.
-if ( (defined $session{'CurrentUser'}) and 
-     ( $session{'CurrentUser'}->Id) ) {
-    
-    # If the user isn\'t privileged, they can only see SelfService
-    if ((! $session{'CurrentUser'}->Privileged) and
-	($m->base_comp->path !~ '^/+SelfService/') ) {
-	$m->comp('/SelfService/index.html');
-	$m->abort();
-    }
-    else {
-	$m->call_next;
-    }
-}
-
-#If we have no credentials
-else {
-    $m->comp('/Elements/Login', %ARGS);
-    $m->abort();
-}
-
-</%INIT>
-
-<%ARGS>
-$user => undef
-$pass => undef
-</%ARGS>
diff --git a/rt/webrt/index.html b/rt/webrt/index.html
deleted file mode 100644
index 0c1091abb..000000000
--- a/rt/webrt/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<& /Elements/Header, Title=>"Start page", Refresh => $session{'home_refresh_interval'} &>
-<& /Elements/Tabs, current_toptab => '' &>
-<TABLE BORDER=0 WIDTH=100%>
-<TR VALIGN=TOP>
-<TD WIDTH=70%>
-<& /Elements/CustomHomepageHeader, %ARGS &>
-<& /Elements/MyTickets &>
-<BR>
-<& /Elements/MyRequests &>
-</TD>
-<TD>
-<& /Elements/Quicksearch &>
-<BR>
-<form method=get action="index.html">
-<& /Elements/Refresh, Name => 'HomeRefreshInterval', Default => $session {'home_refresh_interval'} &>
-<div align=right><input type=submit value="Go!"></div>
-</form>
-</TD>
-</TR>
-</TABLE>
-<%init>
-if ($ARGS{'HomeRefreshInterval'}) {
-	$session{'home_refresh_interval'} = $ARGS{'HomeRefreshInterval'};
-}
-</%init>
-- 
cgit v1.2.1


From b541a7851e891c8fb8150ba930c90600a4c68465 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Jul 2003 16:01:39 +0000
Subject: show totals in payment report

---
 httemplate/search/cust_pay.cgi | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi
index 7a983703f..0f7b7b791 100755
--- a/httemplate/search/cust_pay.cgi
+++ b/httemplate/search/cust_pay.cgi
@@ -72,6 +72,7 @@ if (0) {
 END
 
   my(%saw, $cust_pay);
+  my $tot_amount = 0;
   foreach my $cust_pay (
     sort $sortby grep(!$saw{$_->paynum}++, @cust_pay)
   ) {
@@ -83,6 +84,7 @@ END
       sprintf("%.2f", $cust_pay->paid),
       $cust_pay->_date,
     );
+    $tot_amount += $amount;
     my $pdate = time2str("%b&nbsp;%d&nbsp;%Y", $date);
 
     my $rowspan = 1;
@@ -127,7 +129,11 @@ END
 
     print "</TR>";
   }
-  print <<END;
+
+  $tot_amount = sprintf("%.2f", $tot_amount);
+  print '</TABLE><BR>'. table(). <<END;
+      <TR><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TH>Total<BR>Amount</TH></TR>
+      <TR><TD><TD ALIGN="right">\$$tot_amount</TD></TR>
     </TABLE>
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From e6af26844ebc727340f92cf6ecfe94d6a1110afe Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Jul 2003 16:05:43 +0000
Subject: UI

---
 httemplate/search/cust_pay.cgi | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi
index 0f7b7b791..e4dba01e9 100755
--- a/httemplate/search/cust_pay.cgi
+++ b/httemplate/search/cust_pay.cgi
@@ -132,8 +132,10 @@ END
 
   $tot_amount = sprintf("%.2f", $tot_amount);
   print '</TABLE><BR>'. table(). <<END;
-      <TR><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TH>Total<BR>Amount</TH></TR>
-      <TR><TD><TD ALIGN="right">\$$tot_amount</TD></TR>
+      <TR>
+        <TH>Total&nbsp;Amount</TH>
+        <TD ALIGN="right">\$$tot_amount</TD>
+      </TR>
     </TABLE>
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From b93199089f74afa80138b16c5ede6e4b4fe91442 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Jul 2003 16:02:02 +0000
Subject: one last tiny bugfix for the retry_realtime functionality

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 4302c504a..51037ef97 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1447,7 +1447,7 @@ sub retry_realtime {
         grep {
                #$_->part_bill_event->plan eq 'realtime-card'
                $_->part_bill_event->eventcode =~
-                   /\$cust_bill\->realtime_(card|ach|lec)$/
+                   /\$cust_bill\->realtime_(card|ach|lec)/
                  && $_->status eq 'done'
                  && $_->statustext
              }
-- 
cgit v1.2.1


From 1dd6907483dae3aab9dc7b112d1b38af9f4a7060 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Jul 2003 15:36:54 +0000
Subject: fix spurious "can't purchase pkgpart" errors

---
 httemplate/edit/cust_main.cgi         | 2 +-
 httemplate/edit/process/cust_main.cgi | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 2b7d8d0dc..eeceed889 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -485,7 +485,7 @@ unless ( $custnum ) {
     foreach my $part_pkg ( @part_pkg ) {
       print qq!<OPTION VALUE="!,
 #              $part_pkg->pkgpart. "_". $pkgpart{ $part_pkg->pkgpart }, '"';
-              $part_pkg->pkgpart. "_". $part_pkg->svcpart, '"';
+              $part_pkg->pkgpart. "_". $part_pkg->svcpart('svc_acct'), '"';
       print " SELECTED" if $saved_pkgpart && ( $part_pkg->pkgpart == $saved_pkgpart );
       print ">", $part_pkg->pkg, " - ", $part_pkg->comment;
     }
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 3700d9b96..818382856 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -52,7 +52,7 @@ if ( $new->custnum eq '' ) {
 
   if ( $cgi->param('pkgpart_svcpart') ) {
     my $x = $cgi->param('pkgpart_svcpart');
-    $x =~ /^(\d+)_(\d+)$/;
+    $x =~ /^(\d+)_(\d+)$/ or die "illegal pkgpart_svcpart $x\n";
     my($pkgpart, $svcpart) = ($1, $2);
     #false laziness: copied from FS::cust_pkg::order (which should become a
     #FS::cust_main method)
@@ -70,7 +70,7 @@ if ( $new->custnum eq '' ) {
     #eslaf
 
     # this should wind up in FS::cust_pkg!
-    $error ||= "Agent ". $new->agentnum. " (type ". $agent->typenum. ") can't".
+    $error ||= "Agent ". $new->agentnum. " (type ". $agent->typenum. ") can't ".
                "purchase pkgpart ". $pkgpart
       #unless $part_pkg{ $pkgpart };
       unless $pkgpart_href->{ $pkgpart };
-- 
cgit v1.2.1


From ebc86db916baf888acf7472c6ec781a678608481 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Jul 2003 17:05:58 +0000
Subject: bugfix for non-catchall domains

---
 FS/FS/part_export/domain_shellcommands.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/FS/part_export/domain_shellcommands.pm b/FS/FS/part_export/domain_shellcommands.pm
index 0edbab0dd..cf5603394 100644
--- a/FS/FS/part_export/domain_shellcommands.pm
+++ b/FS/FS/part_export/domain_shellcommands.pm
@@ -35,6 +35,7 @@ sub _export_command {
     my $svc_acct = $svc_domain->catchall_svc_acct;
     ${$_} = $svc_acct->getfield($_) foreach qw(uid gid dir);
   } else {
+    no strict 'refs';
     ${$_} = '' foreach qw(uid gid dir);
   }
 
-- 
cgit v1.2.1


From 9b9d80ef01f33dc1552ca10f1d0a439243cf3548 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 25 Jul 2003 13:13:46 +0000
Subject: doc

---
 FS/FS/Conf.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 706ebe720..d185f8d41 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -278,7 +278,7 @@ httemplate/docs/config.html
   {
     'key'         => 'business-onlinepayment-description',
     'section'     => 'billing',
-    'description' => 'String passed as the description field to <a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a>.  Evaluated as a double-quoted perl string, with the following variables available: <code>$agent</code> (the agent name), and <code>$pkgs</code> (a comma-separated list of packages to which the invoiced being charged applies)',
+    'description' => 'String passed as the description field to <a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a>.  Evaluated as a double-quoted perl string, with the following variables available: <code>$agent</code> (the agent name), and <code>$pkgs</code> (a comma-separated list of packages for which these charges apply)',
     'type'        => 'text',
   },
 
-- 
cgit v1.2.1


From 6785c0711956ce72345476d71613a5e650f54ce9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 25 Jul 2003 16:26:35 +0000
Subject: typo

---
 FS/FS/svc_acct.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 5b8107fc8..8a6f2c403 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -971,7 +971,7 @@ external SQL radacct table, specified via sqlradius export.  Sessions which
 started in the specified range but are still open are counted from session
 start to the end of the range (unless they are over 1 day old, in which case
 they are presumed missing their stop record and not counted).  Also, sessions
-which end in therange but started earlier are counted from the start of the
+which end in the range but started earlier are counted from the start of the
 range to session end.  Finally, sessions which start before the range but end
 after are counted for the entire range.
 
-- 
cgit v1.2.1


From f2ffe6fc096fa59b1931da531b7a40b78cd6b747 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Tue, 5 Aug 2003 00:00:18 +0000
Subject: Virtual field merge

---
 FS/FS/part_router_field.pm            | 134 -----------------
 FS/FS/part_sb_field.pm                | 267 ----------------------------------
 FS/FS/router_field.pm                 | 146 -------------------
 FS/FS/sb_field.pm                     | 148 -------------------
 httemplate/browse/part_sb_field.cgi   |  31 ----
 httemplate/edit/part_router_field.cgi |  71 ---------
 httemplate/edit/part_sb_field.cgi     |  79 ----------
 7 files changed, 876 deletions(-)
 delete mode 100755 FS/FS/part_router_field.pm
 delete mode 100755 FS/FS/part_sb_field.pm
 delete mode 100755 FS/FS/router_field.pm
 delete mode 100755 FS/FS/sb_field.pm
 delete mode 100644 httemplate/browse/part_sb_field.cgi
 delete mode 100644 httemplate/edit/part_router_field.cgi
 delete mode 100644 httemplate/edit/part_sb_field.cgi

diff --git a/FS/FS/part_router_field.pm b/FS/FS/part_router_field.pm
deleted file mode 100755
index 73ca50fb6..000000000
--- a/FS/FS/part_router_field.pm
+++ /dev/null
@@ -1,134 +0,0 @@
-package FS::part_router_field;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs );
-use FS::router_field;
-use FS::router;
-
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::part_router_field - Object methods for part_router_field records
-
-=head1 SYNOPSIS
-
-  use FS::part_router_field;
-
-  $record = new FS::part_router_field \%hash;
-  $record = new FS::part_router_field { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-A part_router_field represents an xfield definition for routers.  For more
-information on xfields, see L<FS::part_sb_field>.
-
-The following fields are supported:
-
-=over 4
-
-=item routerfieldpart - primary key (assigned automatically)
-
-=item name - name of field
-
-=item length
-
-=item check_block
-
-=item list_source
-
-(See L<FS::part_sb_field> for details on these fields.)
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Create a new record.  To add the record to the database, see "insert".
-
-=cut
-
-sub table { 'part_router_field'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-  my $error = '';
-
-  $self->name =~ /^([a-z0-9_\-\.]{1,15})$/i
-    or return "Invalid field name for part_router_field";
-
-  ''; #no error
-}
-
-=item list_values
-
-Equivalent to "eval($part_router_field->list_source)".
-
-=cut
-
-sub list_values {
-  my $self = shift;
-  return () unless $self->list_source;
-  my @opts = eval($self->list_source);
-  if($@) { 
-    warn $@;
-    return ();
-  } else { 
-    return @opts;
-  }
-}
-
-=back
-
-=head1 VERSION
-
-$Id: 
-
-=head1 BUGS
-
-Needless duplication of much of FS::part_sb_field, with the result that most of
-the warnings about it apply here also.
-
-=head1 SEE ALSO
-
-FS::svc_broadband, FS::router, FS::router_field,  schema.html
-from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/part_sb_field.pm b/FS/FS/part_sb_field.pm
deleted file mode 100755
index 8dca946b5..000000000
--- a/FS/FS/part_sb_field.pm
+++ /dev/null
@@ -1,267 +0,0 @@
-package FS::part_sb_field;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs );
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::part_sb_field - Object methods for part_sb_field records
-
-=head1 SYNOPSIS
-
-  use FS::part_sb_field;
-
-  $record = new FS::part_sb_field \%hash;
-  $record = new FS::part_sb_field { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::part_sb_field object represents an extended field (xfield) definition 
-for svc_broadband's sb_field mechanism (see L<FS::svc_broadband>).  
-FS::part_sb_field inherits from FS::Record.  The following fields are 
-currently supported:
-
-=over 2
-
-=item sbfieldpart - primary key (assigned automatically)
-
-=item name - name of the field
-
-=item svcpart - service type for which this field is available (see L<FS::part_svc>)
-
-=item length - length of the contents of the field (see note #1)
-
-=item check_block - validation routine (see note #2)
-
-=item list_source - enumeration routine (see note #3)
-
-=back
-
-=head1 BACKGROUND
-
-Broadband services, unlike dialup services, are provided over a wide 
-variety of physical media (DSL, wireless, cable modems, digital circuits) 
-and network architectures (Ethernet, PPP, ATM).  For many of these access 
-mechanisms, adding a new customer requires knowledge of some properties 
-of the physical connection (circuit number, the type of CPE in use, etc.).
-It is unreasonable to expect ISPs to alter Freeside's schema (and the 
-associated library and UI code) to make each of these parameters a field in 
-svc_broadband.
-
-Hence sb_field and part_sb_field.  They allow the Freeside administrator to
-define 'extended fields' ('xfields') associated with svc_broadband records.
-These are I<not> processed in any way by Freeside itself; they exist solely for
-use by exports (see L<FS::part_export>) and technical support staff.
-
-For a parallel mechanism (at the per-router level rather than per-service), 
-see L<FS::part_router_field>.
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Create a new record.  To add the record to the database, see "insert".
-
-=cut
-
-sub table { 'part_sb_field'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-  my $error = '';
-
-  $error = $self->ut_numbern('svcpart');
-  return $error if $error;
-
-  unless (qsearchs('part_svc', { svcpart => $self->svcpart }))
-    { return "Unknown svcpart: " . $self->svcpart;}
-
-  $self->name =~ /^([a-z0-9_\-\.]{1,15})$/i
-    or return "Invalid field name for part_sb_field";
-
-  #How to check input_block, display_block, and check_block?
-
-  ''; #no error
-}
-
-=item list_values
-
-If the I<list_source> field is set, this method eval()s it and 
-returns its output.  If the field is empty, list_values returns 
-an empty list.
-
-Any arguments passed to this method will be received by the list_source 
-code, but this behavior is a fortuitous accident and may be removed in 
-the future.
-
-=cut
-
-sub list_values {
-  my $self = shift;
-  return () unless $self->list_source;
-
-  my @opts = eval($self->list_source);
-  if($@) {
-    warn $@;
-    return ();
-  } else {
-    return @opts;
-  }
-}
-
-=item part_svc
-
-Returns the FS::part_svc object associated with this field definition.
-
-=cut
-
-sub part_svc {
-  my $self = shift;
-  return qsearchs('part_svc', { svcpart => $self->svcpart });
-}
-
-=back
-
-=head1 VERSION
-
-$Id: 
-
-=head1 NOTES
-
-=over
-
-=item 1.
-
-The I<length> field is not enforced.  It provides a hint to UI
-code about how to display the field on a form.  If you want to enforce a
-minimum or maximum length for a field, use a I<check_block>.
-
-=item 2.
-
-The check_block mechanism used here as well as in
-FS::part_router_field allows the user to define validation rules.
-
-When FS::sb_field::check is called, the proposed value of the xfield is
-assigned to $_.  The check_block is then eval()'d and its return value
-captured.  If the return value is false (empty/zero/undef), $_ is then assigned
-back into the field and stored in the database.
-
-Therefore a check_block can do three different things with the value: allow
-it, allow it with a modification, or reject it.  This is very flexible, but
-somewhat dangerous.  Some warnings:
-
-=over 2
-
-=item *
-
-Assume that $_ has had I<no> error checking prior to the
-check_block.  That's what the check_block is for, after all.  It could
-contain I<anything>: evil shell commands in backquotes, 100kb JPEG images,
-the Klez virus, whatever.
-
-=item *
-
-If your check_block modifies the input value, it should probably
-produce a value that wouldn't be modified by going through the same
-check_block again.  (That is, it should map input values into its own
-eigenspace.)  The reason is that if someone calls $new->replace($old),
-where $new and $old contain the same value for the field, they probably
-want the field to keep its old value, not to get transformed by the
-check_block again.  So don't do silly things like '$_++' or
-'tr/A-Za-z/a-zA-Z/'.
-
-=item *
-
-Don't alter the contents of the database.  I<Reading> the database
-is perfectly reasonable, but writing to it is a bad idea.  Remember that
-check() might get called more than once, as described above.
-
-=item *
-
-The check_block probably won't even get called if the user submits
-an I<empty> sb_field.  So at present, you can't set up a default value with
-something like 's/^$/foo/'.  Conversely, don't replace the submitted value
-with an empty string.  It probably will get stored, but might be deleted at
-any time.
-
-=back
-
-=item 3.
-
-The list_source mechanism is a UI hint (like length) to generate
-drop-down or list boxes.  If list_source contains a value, the UI code can
-eval() it and use the results as the options on the list.
-
-Note 'can'.  This is not a substitute for check_block.  The HTML interface
-currently requires that the user pick one of the options on the list
-because that's the way HTML drop-down boxes work, but in the future the UI
-code might add an 'Other (please specify)' option and a text box so that
-the user can enter something else.  Or it might ignore list_source and just
-generate a text box.  Or the interface might be rewritten in MS Access,
-where drop-down boxes have text boxes built in.  Data validation is the job
-of check(), not the front end.
-
-Note also that a list of literals evaluates to itself, so a list_source
-like
-
-C<('Windows', 'MacOS', 'Linux')>
-
-or
-
-C<qw(Windows MacOS Linux)>
-
-means exactly what you'd think.
-
-=head1 BUGS
-
-The lack of any way to do default values.  We might add this as another UI
-hint (since, for the most part, it's the UI's job to figure out which fields
-have had values entered into them).  In fact, there are lots of things we
-should add as UI hints.
-
-Oh, and the documentation is probably full of lies.
-
-=head1 SEE ALSO
-
-FS::svc_broadband, FS::sb_field, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/router_field.pm b/FS/FS/router_field.pm
deleted file mode 100755
index eee21ab89..000000000
--- a/FS/FS/router_field.pm
+++ /dev/null
@@ -1,146 +0,0 @@
-package FS::router_field;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs );
-use FS::part_router_field;
-use FS::router;
-
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::router_field - Object methods for router_field records
-
-=head1 SYNOPSIS
-
-  use FS::router_field;
-
-  $record = new FS::router_field \%hash;
-  $record = new FS::router_field { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-FS::router_field contains values of router xfields.  See FS::part_sb_field 
-for details on the xfield mechanism.
-
-=over 4
-
-=item routerfieldpart - Type of router_field as defined by 
-FS::part_router_field
-
-=item routernum - The FS::router to which this value belongs.
-
-=item value - The contents of the field.
-
-=back
-
-=head1 METHODS
-
-
-=over 4
-
-=item new HASHREF
-
-Create a new record.  To add the record to the database, see "insert".
-
-=cut
-
-sub table { 'router_field'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and replace
-methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  return "routernum must be defined" unless $self->routernum;
-  return "routerfieldpart must be defined" unless $self->routerfieldpart;
-
-  my $part_router_field = $self->part_router_field;
-  $_ = $self->value;
-
-  my $check_block = $part_router_field->check_block;
-  if ($check_block) {
-    $@ = '';
-    my $error = (eval($check_block) or $@);
-    return $error if $error;
-    $self->setfield('value' => $_);
-  }
-
-  ''; #no error
-}
-
-=item part_router_field
-
-Returns a reference to the FS:part_router_field that defines this 
-FS::router_field
-
-=cut
-
-sub part_router_field {
-  my $self = shift;
-
-  return qsearchs('part_router_field', 
-    { routerfieldpart => $self->routerfieldpart });
-}
-
-=item router
-
-Returns a reference to the FS::router to which this FS::router_field 
-belongs.
-
-=cut
-
-sub router {
-  my $self = shift;
-
-  return qsearchs('router', { routernum => $self->routernum });
-}
-
-=back
-
-=head1 VERSION
-
-$Id: 
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-FS::svc_broadband, FS::router, FS::router_block, FS::router_field,  
-schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/sb_field.pm b/FS/FS/sb_field.pm
deleted file mode 100755
index d4eb37844..000000000
--- a/FS/FS/sb_field.pm
+++ /dev/null
@@ -1,148 +0,0 @@
-package FS::sb_field;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs );
-use FS::part_sb_field;
-
-use UNIVERSAL qw( can );
-
-@ISA = qw( FS::Record );
-
-=head1 NAME
-
-FS::sb_field - Object methods for sb_field records
-
-=head1 SYNOPSIS
-
-  use FS::sb_field;
-
-  $record = new FS::sb_field \%hash;
-  $record = new FS::sb_field { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-See L<FS::part_sb_field> for details on this table's mission in life.
-FS::sb_field contains the actual values of the xfields defined in
-part_sb_field.
-
-The following fields are supported:
-
-=over 4
-
-=item sbfieldpart - Type of sb_field as defined by FS::part_sb_field
-
-=item svcnum - The svc_broadband to which this value belongs.
-
-=item value - The contents of the field.
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Create a new record.  To add the record to the database, see L<"insert">.
-
-=cut
-
-sub table { 'sb_field'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Deletes this record from the database.  If there is an error, returns the
-error, otherwise returns false.
-
-=item replace OLD_RECORD
-
-Replaces OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks the value against the check_block of the corresponding part_sb_field.
-Returns whatever the check_block returned (unless the check_block dies, in 
-which case check returns the die message).  Therefore, if the check_block 
-wants to allow the value to be stored, it must return false.  See 
-L<FS::part_sb_field> for details.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  return "svcnum must be defined" unless $self->svcnum;
-  return "sbfieldpart must be defined" unless $self->sbfieldpart;
-
-  my $part_sb_field = $self->part_sb_field;
-
-  $_ = $self->value;
-
-  my $check_block = $self->part_sb_field->check_block;
-  if ($check_block) {
-    $@ = '';
-    my $error = (eval($check_block) or $@); # treat fatal errors as errors
-    return $error if $error;
-    $self->setfield('value' => $_);
-  }
-
-  ''; #no error
-}
-
-=item part_sb_field
-
-Returns a reference to the FS::part_sb_field that defines this FS::sb_field.
-
-=cut
-
-sub part_sb_field {
-  my $self = shift;
-
-  return qsearchs('part_sb_field', { sbfieldpart => $self->sbfieldpart });
-}
-
-=back
-
-=item svc_broadband
-
-Returns a reference to the FS::svc_broadband to which this value is attached.
-Nobody's ever going to use this function, but here it is anyway.
-
-=cut
-
-sub svc_broadband {
-  my $self = shift;
-
-  return qsearchs('svc_broadband', { svcnum => $self->svcnum });
-}
-
-=head1 VERSION
-
-$Id: 
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::svc_broadband>, schema.html
-from the base documentation.
-
-=cut
-
-1;
-
diff --git a/httemplate/browse/part_sb_field.cgi b/httemplate/browse/part_sb_field.cgi
deleted file mode 100644
index 4c9641e86..000000000
--- a/httemplate/browse/part_sb_field.cgi
+++ /dev/null
@@ -1,31 +0,0 @@
-<%= header('svc_broadband extended fields', menubar('Main Menu'   => $p)) %>
-<%
-
-my @psf = qsearch('part_sb_field', {});
-my $block;
-my $p2 = popurl(2);
-
-%>
-
-<% if ($cgi->param('error')) { %>
-   <FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT>
-   <BR><BR>
-<% } %>
-
-<A HREF="<%=$p2%>edit/part_sb_field.cgi"><I>Add a new field</I></A><BR><BR>
-
-<%=table()%>
-<TH><TD>Field name</TD><TD>Service type</TD></TH>
-<% foreach $psf (sort {$a->name cmp $b->name} @psf) { %>
-  <TR>
-    <TD></TD>
-    <TD>
-      <A HREF="<%=$p2%>edit/part_sb_field.cgi?<%=$psf->sbfieldpart%>">
-        <%=$psf->name%></A></TD>
-    <TD><%=$psf->part_svc->svc%></TD>
-  </TR>
-<% } %>
-</TABLE>
-</BODY>
-</HTML>
-
diff --git a/httemplate/edit/part_router_field.cgi b/httemplate/edit/part_router_field.cgi
deleted file mode 100644
index 02962b1c0..000000000
--- a/httemplate/edit/part_router_field.cgi
+++ /dev/null
@@ -1,71 +0,0 @@
-<!-- mason kludge -->
-<%
-my ($routerfieldpart, $part_router_field);
-
-if ( $cgi->param('error') ) {
-  $part_router_field = new FS::part_router_field ( {
-    map { $_, scalar($cgi->param($_)) } fields('part_router_field')});
-  $routerfieldpart = $part_router_field->routerfieldpart;
-} else {
-  my($query) = $cgi->keywords;
-  if ( $query =~ /^(\d+)$/ ) { #editing
-    $routerfieldpart=$1;
-    $part_router_field=qsearchs('part_router_field',
-        {'routerfieldpart' => $routerfieldpart})
-      or die "Unknown routerfieldpart!";
-  
-  } else { #adding
-    $part_router_field = new FS::part_router_field({});
-  }
-}
-my $action = $part_router_field->routerfieldpart ? 'Edit' : 'Add';
-
-my $p1 = popurl(1);
-print header("$action Router Extended Field Definition",
-             menubar('Main Menu' => $p,
-                     'View all Extended Fields' => $p. 'browse/generic.cgi?part_router_field')
-            );
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-%>
-<FORM ACTION="<%=$p1%>process/generic.cgi" METHOD=POST>
-
-<INPUT TYPE="hidden" NAME="table" VALUE="part_router_field">
-<INPUT TYPE="hidden" NAME="routerfieldpart" VALUE="<%=
-  $routerfieldpart%>">
-Field #<B><%=$routerfieldpart or "(NEW)"%></B><BR><BR>
-
-<%=ntable("#cccccc",2)%>
-  <TR>
-    <TD ALIGN="right">Name</TD>
-    <TD><INPUT TYPE="text" NAME="name" MAXLENGTH=15 VALUE="<%=
-    $part_router_field->name%>"></TD>
-  </TR>
-  <TR>
-    <TD ALIGN="right">Length</TD>
-    <TD><INPUT TYPE="text" NAME="length" MAXLENGTH=4 VALUE="<%=
-    $part_router_field->length%>"></TD>
-  </TR>
-  <TR>
-    <TD ALIGN="right">check_block</TD>
-    <TD><TEXTAREA COLS="20" ROWS="4" NAME="check_block"><%=
-    $part_router_field->check_block%></TEXTAREA></TD>
-  </TR>
-  <TR>
-    <TD ALIGN="right">list_source</TD>
-    <TD><TEXTAREA COLS="20" ROWS="4" NAME="list_source"><%=
-    $part_router_field->list_source%></TEXTAREA></TD>
-  </TR>
-</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">
-
-</FORM>
-
-<BR><BR>
-<FONT SIZE=-2>If you don't understand what <I>check_block</I> and 
-<I>list_source</I> mean, <B>LEAVE THEM BLANK</B>.  We mean it.</FONT>
-
-
-</BODY>
-</HTML>
diff --git a/httemplate/edit/part_sb_field.cgi b/httemplate/edit/part_sb_field.cgi
deleted file mode 100644
index 9e0cc9e4f..000000000
--- a/httemplate/edit/part_sb_field.cgi
+++ /dev/null
@@ -1,79 +0,0 @@
-<!-- mason kludge -->
-<%
-my ($sbfieldpart, $part_sb_field);
-
-if ( $cgi->param('error') ) {
-  $part_sb_field = new FS::part_sb_field ( {
-    map { $_, scalar($cgi->param($_)) } fields('part_sb_field')});
-  $sbfieldpart = $part_sb_field->sbfieldpart;
-} else {
-  my($query) = $cgi->keywords;
-  if ( $query =~ /^(\d+)$/ ) { #editing
-    $sbfieldpart=$1;
-    $part_sb_field=qsearchs('part_sb_field',
-        {'sbfieldpart' => $sbfieldpart})
-      or die "Unknown sbfieldpart!";
-  
-  } else { #adding
-    $part_sb_field = new FS::part_sb_field({});
-  }
-}
-my $action = $part_sb_field->sbfieldpart ? 'Edit' : 'Add';
-
-my $p1 = popurl(1);
-print header("$action svc_broadband Extended Field Definition", '');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-%>
-<FORM ACTION="<%=$p1%>process/generic.cgi" METHOD="POST">
-
-<INPUT TYPE="hidden" NAME="table" VALUE="part_sb_field">
-<INPUT TYPE="hidden" NAME="redirect_ok" 
-    VALUE="<%=popurl(2)%>browse/part_sb_field.cgi">
-<INPUT TYPE="hidden" NAME="sbfieldpart" VALUE="<%=
-  $sbfieldpart%>">
-Field #<B><%=$sbfieldpart or "(NEW)"%></B><BR><BR>
-
-<%=ntable("#cccccc",2)%>
-  <TR>
-    <TD ALIGN="right">Name</TD>
-    <TD><INPUT TYPE="text" NAME="name" MAXLENGTH=15 VALUE="<%=
-    $part_sb_field->name%>"></TD>
-  </TR>
-  <TR>
-    <TD ALIGN="right">Length</TD>
-    <TD><INPUT TYPE="text" NAME="length" MAXLENGTH=4 VALUE="<%=
-    $part_sb_field->length%>"></TD>
-  </TR>
-  <TR>
-    <TD ALIGN="right">Service</TD>
-    <TD><SELECT SIZE=1 NAME="svcpart"><%
-      foreach my $part_svc (qsearch('part_svc', {svcdb => 'svc_broadband'})) {
-        %><OPTION VALUE="<%=$part_svc->svcpart%>"<%=
-	  ($part_svc->svcpart == $part_sb_field->svcpart) ? ' SELECTED' : ''%>">
-	  <%=$part_svc->svc%>
-      <% } %>
-      </SELECT></TD>
-  <TR>
-    <TD ALIGN="right">check_block</TD>
-    <TD><TEXTAREA COLS="20" ROWS="4" NAME="check_block"><%=
-    $part_sb_field->check_block%></TEXTAREA></TD>
-  </TR>
-  <TR>
-    <TD ALIGN="right">list_source</TD>
-    <TD><TEXTAREA COLS="20" ROWS="4" NAME="list_source"><%=
-    $part_sb_field->list_source%></TEXTAREA></TD>
-  </TR>
-</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">
-
-</FORM>
-
-<BR><BR>
-<FONT SIZE=-2>If you don't understand what <I>check_block</I> and 
-<I>list_source</I> mean, <B>LEAVE THEM BLANK</B>.  We mean it.</FONT>
-
-
-</BODY>
-</HTML>
-- 
cgit v1.2.1


From 58d44fbe5eb9ab32e6d87063a4a3b22ddba9a828 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Tue, 5 Aug 2003 00:20:51 +0000
Subject: Virtual field merge

---
 FS/FS/Record.pm                           | 340 +++++++++++++++++++++++++++---
 FS/FS/addr_block.pm                       |   2 +-
 FS/FS/agent.pm                            |   5 +-
 FS/FS/agent_type.pm                       |   5 +-
 FS/FS/cust_bill.pm                        |   2 +-
 FS/FS/cust_bill_event.pm                  |   2 +-
 FS/FS/cust_bill_pay.pm                    |   4 +-
 FS/FS/cust_bill_pkg.pm                    |   2 +-
 FS/FS/cust_bill_pkg_detail.pm             |   3 +-
 FS/FS/cust_credit.pm                      |   4 +-
 FS/FS/cust_credit_bill.pm                 |   4 +-
 FS/FS/cust_credit_refund.pm               |   4 +-
 FS/FS/cust_main.pm                        |   2 +-
 FS/FS/cust_main_county.pm                 |   4 +-
 FS/FS/cust_main_invoice.pm                |   4 +-
 FS/FS/cust_pay.pm                         |   5 +-
 FS/FS/cust_pay_batch.pm                   |   4 +-
 FS/FS/cust_pkg.pm                         |   2 +-
 FS/FS/cust_refund.pm                      |   4 +-
 FS/FS/cust_svc.pm                         |   2 +-
 FS/FS/cust_tax_exempt.pm                  |   1 +
 FS/FS/domain_record.pm                    |   4 +-
 FS/FS/export_svc.pm                       |   1 +
 FS/FS/msgcat.pm                           |   2 +-
 FS/FS/nas.pm                              |   6 +-
 FS/FS/part_bill_event.pm                  |   3 +-
 FS/FS/part_export.pm                      |  21 +-
 FS/FS/part_export_option.pm               |   2 +-
 FS/FS/part_pkg.pm                         |   1 +
 FS/FS/part_pop_local.pm                   |   3 +-
 FS/FS/part_referral.pm                    |   1 +
 FS/FS/part_svc.pm                         |   8 +-
 FS/FS/part_svc_column.pm                  |   8 +-
 FS/FS/part_virtual_field.pm               | 303 ++++++++++++++++++++++++++
 FS/FS/pkg_svc.pm                          |   4 +-
 FS/FS/port.pm                             |   4 +-
 FS/FS/prepay_credit.pm                    |   1 +
 FS/FS/queue.pm                            |   4 +-
 FS/FS/queue_arg.pm                        |   4 +-
 FS/FS/queue_depend.pm                     |   1 +
 FS/FS/radius_usergroup.pm                 |   1 +
 FS/FS/router.pm                           |  16 +-
 FS/FS/session.pm                          |   4 +-
 FS/FS/svc_Common.pm                       |  58 ++++-
 FS/FS/svc_acct.pm                         |   2 +-
 FS/FS/svc_acct_pop.pm                     |   3 +-
 FS/FS/svc_broadband.pm                    |  59 +-----
 FS/FS/svc_domain.pm                       |   4 +-
 FS/FS/svc_forward.pm                      |   2 +-
 FS/FS/svc_www.pm                          |   3 +-
 FS/FS/type_pkgs.pm                        |   4 +-
 FS/MANIFEST                               |   5 +-
 FS/bin/freeside-setup                     |  77 +++----
 htetc/global.asa                          |   5 +-
 htetc/handler.pl                          |   5 +-
 htetc/handler.pl-1.0x                     |   5 +-
 httemplate/browse/part_svc.cgi            |  10 +-
 httemplate/browse/part_virtual_field.cgi  |  39 ++++
 httemplate/browse/router.cgi              |  25 +--
 httemplate/docs/upgrade10.html            |  54 ++---
 httemplate/edit/part_svc.cgi              |  72 +++++--
 httemplate/edit/part_virtual_field.cgi    |  92 ++++++++
 httemplate/edit/process/router.cgi        |  41 +---
 httemplate/edit/process/svc_broadband.cgi |  36 +---
 httemplate/edit/router.cgi                |  42 +---
 httemplate/edit/svc_acct.cgi              |  12 +-
 httemplate/edit/svc_broadband.cgi         |  34 +--
 httemplate/edit/svc_www.cgi               |  12 +-
 httemplate/index.html                     |   8 +-
 httemplate/view/svc_acct.cgi              |  18 +-
 httemplate/view/svc_broadband.cgi         |  24 +--
 httemplate/view/svc_forward.cgi           |   9 +-
 httemplate/view/svc_www.cgi               |  11 +-
 73 files changed, 1102 insertions(+), 476 deletions(-)
 create mode 100755 FS/FS/part_virtual_field.pm
 create mode 100644 httemplate/browse/part_virtual_field.cgi
 create mode 100644 httemplate/edit/part_virtual_field.cgi

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 02fd4e390..9d82d949b 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -14,10 +14,14 @@ use FS::UID qw(dbh getotaker datasrc driver_name);
 use FS::SearchCache;
 use FS::Msgcat qw(gettext);
 
+use FS::part_virtual_field;
+
+use Tie::IxHash;
+
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(dbh fields hfields qsearch qsearchs dbdef jsearch);
 
-$DEBUG = 0;
+$DEBUG = 2;
 $me = '[FS::Record]';
 
 #ask FS::UID to run this stuff for us later
@@ -200,12 +204,15 @@ sub qsearch {
   my $dbh = dbh;
 
   my $table = $cache ? $cache->table : $stable;
+  my $pkey = $dbdef->table($table)->primary_key;
 
-  my @fields = grep exists($record->{$_}), fields($table);
+  my @real_fields = grep exists($record->{$_}), real_fields($table);
+  my @virtual_fields = grep exists($record->{$_}), "FS::$table"->virtual_fields;
 
   my $statement = "SELECT $select FROM $stable";
-  if ( @fields ) {
-    $statement .= ' WHERE '. join(' AND ', map {
+  if ( @real_fields or @virtual_fields ) {
+    $statement .= ' WHERE '. join(' AND ',
+      ( map {
 
       my $op = '=';
       my $column = $_;
@@ -251,8 +258,45 @@ sub qsearch {
       } else {
         "$column $op ?";
       }
-    } @fields );
+    } @real_fields ), 
+    ( map {
+      my $op = '=';
+      my $column = $_;
+      if ( ref($record->{$_}) ) {
+        $op = $record->{$_}{'op'} if $record->{$_}{'op'};
+	if ( uc($op) eq 'ILIKE' ) {
+	  $op = 'LIKE';
+	  $record->{$_}{'value'} = lc($record->{$_}{'value'});
+	  $column = "LOWER($_)";
+	}
+	$record->{$_} = $record->{$_}{'value'};
+      }
+
+      # ... EXISTS ( SELECT name, value FROM part_virtual_field
+      #              JOIN virtual_field
+      #              ON part_virtual_field.vfieldpart = virtual_field.vfieldpart
+      #              WHERE recnum = svc_acct.svcnum
+      #              AND (name, value) = ('egad', 'brain') )
+
+      my $value = $record->{$_};
+
+      my $subq;
+
+      $subq = ($value ? 'EXISTS ' : 'NOT EXISTS ') .
+      "( SELECT part_virtual_field.name, virtual_field.value ".
+      "FROM part_virtual_field JOIN virtual_field ".
+      "ON part_virtual_field.vfieldpart = virtual_field.vfieldpart ".
+      "WHERE virtual_field.recnum = ${table}.${pkey} ".
+      "AND part_virtual_field.name = '${column}'".
+      ($value ? 
+        " AND virtual_field.value ${op} '${value}'"
+      : "") . ")";
+      $subq;
+
+    } @virtual_fields ) );
+
   }
+
   $statement .= " $extra_sql" if defined($extra_sql);
 
   warn "[debug]$me $statement\n" if $DEBUG > 1;
@@ -262,7 +306,7 @@ sub qsearch {
   my $bind = 1;
 
   foreach my $field (
-    grep defined( $record->{$_} ) && $record->{$_} ne '', @fields
+    grep defined( $record->{$_} ) && $record->{$_} ne '', @real_fields
   ) {
     if ( $record->{$field} =~ /^\d+(\.\d+)?$/
          && $dbdef->table($table)->column($field)->type =~ /(int)/i
@@ -279,31 +323,64 @@ sub qsearch {
 
   $sth->execute or croak "Error executing \"$statement\": ". $sth->errstr;
 
-  $dbh->commit or croak $dbh->errstr if $FS::UID::AutoCommit;
+  my %result;
+  tie %result, "Tie::IxHash";
+  @virtual_fields = "FS::$table"->virtual_fields;
+
+  my @stuff = @{ $sth->fetchall_arrayref( {} ) };
+  if($pkey) {
+    %result = map { $_->{$pkey}, $_ } @stuff;
+  } else {
+    @result{@stuff} = @stuff;
+  }
 
+  $sth->finish;
+  if ( keys(%result) and @virtual_fields ) {
+    $statement =
+      "SELECT virtual_field.recnum, part_virtual_field.name, ".
+             "virtual_field.value ".
+      "FROM part_virtual_field JOIN virtual_field USING (vfieldpart) ".
+      "WHERE part_virtual_field.dbtable = '$table' AND ".
+      "virtual_field.recnum IN (".
+      join(',', keys(%result)). ") AND part_virtual_field.name IN ('".
+      join(q!', '!, @virtual_fields) . "')";
+    warn "[debug]$me $statement\n" if $DEBUG > 1;
+    $sth = $dbh->prepare($statement) or croak "$dbh->errstr doing $statement";
+    $sth->execute or croak "Error executing \"$statement\": ". $sth->errstr;
+
+    foreach (@{ $sth->fetchall_arrayref({}) }) {
+      my $recnum = $_->{recnum};
+      my $name = $_->{name};
+      my $value = $_->{value};
+      if (exists($result{$recnum})) {
+        $result{$recnum}->{$name} = $value;
+      }
+    }
+  }
+  
   if ( eval 'scalar(@FS::'. $table. '::ISA);' ) {
     if ( eval 'FS::'. $table. '->can(\'new\')' eq \&new ) {
       #derivied class didn't override new method, so this optimization is safe
       if ( $cache ) {
         map {
           new_or_cached( "FS::$table", { %{$_} }, $cache )
-        } @{$sth->fetchall_arrayref( {} )};
+        } values(%result);
       } else {
         map {
           new( "FS::$table", { %{$_} } )
-        } @{$sth->fetchall_arrayref( {} )};
+        } values(%result);
       }
     } else {
       warn "untested code (class FS::$table uses custom new method)";
       map {
         eval 'FS::'. $table. '->new( { %{$_} } )';
-      } @{$sth->fetchall_arrayref( {} )};
+      } values(%result);
     }
   } else {
     cluck "warning: FS::$table not loaded; returning FS::Record objects";
     map {
       FS::Record->new( $table, { %{$_} } );
-    } @{$sth->fetchall_arrayref( {} )};
+    } values(%result);
   }
 
 }
@@ -512,15 +589,15 @@ sub insert {
 
   my $table = $self->table;
   #false laziness w/delete
-  my @fields =
+  my @real_fields =
     grep defined($self->getfield($_)) && $self->getfield($_) ne "",
-    $self->fields
+    real_fields($table)
   ;
-  my @values = map { _quote( $self->getfield($_), $table, $_) } @fields;
+  my @values = map { _quote( $self->getfield($_), $table, $_) } @real_fields;
   #eslaf
 
   my $statement = "INSERT INTO $table ( ".
-      join( ', ', @fields ).
+      join( ', ', @real_fields ).
     ") VALUES (".
       join( ', ', @values ).
     ")"
@@ -537,9 +614,9 @@ sub insert {
 
   $sth->execute or return $sth->errstr;
 
+  my $insertid = '';
   if ( $db_seq ) { # get inserted id from the database, if applicable
     warn "[debug]$me retreiving sequence from database\n" if $DEBUG;
-    my $insertid = '';
     if ( driver_name eq 'Pg' ) {
 
       my $oid = $sth->{'pg_oid_status'};
@@ -581,6 +658,34 @@ sub insert {
     $self->setfield($primary_key, $insertid);
   }
 
+  my @virtual_fields = 
+      grep defined($self->getfield($_)) && $self->getfield($_) ne "",
+          $self->virtual_fields;
+  if (@virtual_fields) {
+    my %v_values = map { $_, $self->getfield($_) } @virtual_fields;
+
+    my $vfieldpart = vfieldpart_hashref($table);
+
+    my $v_statement = "INSERT INTO virtual_field(recnum, vfieldpart, value) ".
+                    "VALUES (?, ?, ?)";
+
+    my $v_sth = dbh->prepare($v_statement) or do {
+      dbh->rollback if $FS::UID::AutoCommit;
+      return dbh->errstr;
+    };
+
+    foreach (keys(%v_values)) {
+      $v_sth->execute($self->getfield($primary_key),
+                      $vfieldpart->{$_},
+                      $v_values{$_})
+      or do {
+        dbh->rollback if $FS::UID::AutoCommit;
+        return $v_sth->errstr;
+      };
+    }
+  }
+
+
   my $h_sth;
   if ( defined $dbdef->table('h_'. $table) ) {
     my $h_statement = $self->_h_statement('insert');
@@ -631,7 +736,7 @@ sub delete {
         : "$_ = ". _quote($self->getfield($_),$self->table,$_)
     } ( $self->dbdef_table->primary_key )
           ? ( $self->dbdef_table->primary_key)
-          : $self->fields
+          : real_fields($self->table)
   );
   warn "[debug]$me $statement\n" if $DEBUG > 1;
   my $sth = dbh->prepare($statement) or return dbh->errstr;
@@ -645,6 +750,19 @@ sub delete {
     $h_sth = '';
   }
 
+  my $primary_key = $self->dbdef_table->primary_key;
+  my $v_sth;
+  my @del_vfields;
+  my $vfp = vfieldpart_hashref($self->table);
+  foreach($self->virtual_fields) {
+    next if $self->getfield($_) eq '';
+    unless(@del_vfields) {
+      my $st = "DELETE FROM virtual_field WHERE recnum = ? AND vfieldpart = ?";
+      $v_sth = dbh->prepare($st) or return dbh->errstr;
+    }
+    push @del_vfields, $_;
+  }
+
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE'; 
@@ -655,6 +773,10 @@ sub delete {
   my $rc = $sth->execute or return $sth->errstr;
   #not portable #return "Record not found, statement:\n$statement" if $rc eq "0E0";
   $h_sth->execute or return $h_sth->errstr if $h_sth;
+  $v_sth->execute($self->getfield($primary_key), $vfp->{$_}) 
+    or return $v_sth->errstr 
+        foreach (@del_vfields);
+  
   dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
 
   #no need to needlessly destoy the data either (causes problems actually)
@@ -695,8 +817,11 @@ sub replace {
   my $error = $new->check;
   return $error if $error;
 
-  my @diff = grep $new->getfield($_) ne $old->getfield($_), $old->fields;
-  unless ( @diff ) {
+  #my @diff = grep $new->getfield($_) ne $old->getfield($_), $old->fields;
+  my %diff = map { ($new->getfield($_) ne $old->getfield($_))
+                   ? ($_, $new->getfield($_)) : () } $old->fields;
+                   
+  unless ( keys(%diff) ) {
     carp "[warning]$me $new -> replace $old: records identical";
     return '';
   }
@@ -704,7 +829,7 @@ sub replace {
   my $statement = "UPDATE ". $old->table. " SET ". join(', ',
     map {
       "$_ = ". _quote($new->getfield($_),$old->table,$_) 
-    } @diff
+    } real_fields($old->table)
   ). ' WHERE '.
     join(' AND ',
       map {
@@ -715,7 +840,7 @@ sub replace {
                 : "( $_ IS NULL OR $_ = \"\" )"
             )
           : "$_ = ". _quote($old->getfield($_),$old->table,$_)
-      } ( $primary_key ? ( $primary_key ) : $old->fields )
+      } ( $primary_key ? ( $primary_key ) : real_fields($old->table) )
     )
   ;
   warn "[debug]$me $statement\n" if $DEBUG > 1;
@@ -739,6 +864,44 @@ sub replace {
     $h_new_sth = '';
   }
 
+  # For virtual fields we have three cases with different SQL 
+  # statements: add, replace, delete
+  my $v_add_sth;
+  my $v_rep_sth;
+  my $v_del_sth;
+  my (@add_vfields, @rep_vfields, @del_vfields);
+  my $vfp = vfieldpart_hashref($old->table);
+  foreach(grep { exists($diff{$_}) } $new->virtual_fields) {
+    if($diff{$_} eq '') {
+      # Delete
+      unless(@del_vfields) {
+        my $st = "DELETE FROM virtual_field WHERE recnum = ? ".
+                 "AND vfieldpart = ?";
+        warn "[debug]$me $st\n" if $DEBUG > 2;
+        $v_del_sth = dbh->prepare($st) or return dbh->errstr;
+      }
+      push @del_vfields, $_;
+    } elsif($old->getfield($_) eq '') {
+      # Add
+      unless(@add_vfields) {
+        my $st = "INSERT INTO virtual_field (value, recnum, vfieldpart) ".
+	         "VALUES (?, ?, ?)";
+        warn "[debug]$me $st\n" if $DEBUG > 2;
+        $v_add_sth = dbh->prepare($st) or return dbh->errstr;
+      }
+      push @add_vfields, $_;
+    } else {
+      # Replace
+      unless(@rep_vfields) {
+        my $st = "UPDATE virtual_field SET value = ? ".
+                 "WHERE recnum = ? AND vfieldpart = ?";
+        warn "[debug]$me $st\n" if $DEBUG > 2;
+        $v_rep_sth = dbh->prepare($st) or return dbh->errstr;
+      }
+      push @rep_vfields, $_;
+    }
+  }
+
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE'; 
@@ -750,6 +913,24 @@ sub replace {
   #not portable #return "Record not found (or records identical)." if $rc eq "0E0";
   $h_old_sth->execute or return $h_old_sth->errstr if $h_old_sth;
   $h_new_sth->execute or return $h_new_sth->errstr if $h_new_sth;
+
+  $v_del_sth->execute($old->getfield($primary_key),
+                      $vfp->{$_})
+        or return $v_del_sth->errstr
+      foreach(@del_vfields);
+
+  $v_add_sth->execute($new->getfield($_),
+                      $old->getfield($primary_key),
+                      $vfp->{$_})
+        or return $v_add_sth->errstr
+      foreach(@add_vfields);
+
+  $v_rep_sth->execute($new->getfield($_),
+                      $old->getfield($primary_key),
+                      $vfp->{$_})
+        or return $v_rep_sth->errstr
+      foreach(@rep_vfields);
+
   dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
 
   '';
@@ -769,12 +950,28 @@ sub rep {
 
 =item check
 
-Not yet implemented, croaks.  Derived classes should provide a check method.
+Checks virtual fields (using check_blocks).  Subclasses should still provide 
+a check method to validate real fields, foreign keys, etc., and call this 
+method via $self->SUPER::check.
+
+(FIXME: Should this method try to make sure that it I<is> being called from 
+a subclass's check method, to keep the current semantics as far as possible?)
 
 =cut
 
 sub check {
-  confess "FS::Record::check not implemented; supply one in subclass!";
+  #confess "FS::Record::check not implemented; supply one in subclass!";
+  my $self = shift;
+
+  foreach my $field ($self->virtual_fields) {
+    for ($self->getfield($field)) {
+      # See notes on check_block in FS::part_virtual_field.
+      eval $self->pvf($field)->check_block;
+      return $@ if $@;
+      $self->setfield($field, $_);
+    }
+  }
+  '';
 }
 
 sub _h_statement {
@@ -782,7 +979,7 @@ sub _h_statement {
 
   my @fields =
     grep defined($self->getfield($_)) && $self->getfield($_) ne "",
-    $self->fields
+    real_fields($self->table);
   ;
   my @values = map { _quote( $self->getfield($_), $self->table, $_) } @fields;
 
@@ -1163,36 +1360,89 @@ sub ut_foreign_keyn {
     : '';
 }
 
+
+=item virtual_fields [ TABLE ]
+
+Returns a list of virtual fields defined for the table.  This should not 
+be exported, and should only be called as an instance or class method.
+
+=cut
+
+sub virtual_fields {
+  my $something = shift;
+  my $table;
+  $table = $something->table or confess "virtual_fields called on non-table";
+
+  confess "Unknown table $table" unless $dbdef->table($table);
+
+  # This should be smart enough to cache results.
+
+  my $query = 'SELECT name from part_virtual_field ' .
+              "WHERE dbtable = '$table'";
+  my $dbh = dbh;
+  my $result = $dbh->selectcol_arrayref($query);
+  confess $dbh->errstr if $dbh->err;
+  return @$result;
+}
+
+
 =item fields [ TABLE ]
 
-This can be used as both a subroutine and a method call.  It returns a list
-of the columns in this record's table, or an explicitly specified table.
-(See L<DBIx::DBSchema::Table>).
+This is a wrapper for real_fields and virtual_fields.  Code that called
+fields before should probably continue to call fields.
 
 =cut
 
-# Usage: @fields = fields($table);
-#        @fields = $record->fields;
 sub fields {
   my $something = shift;
   my $table;
-  if ( ref($something) ) {
+  if($something->isa('FS::Record')) {
     $table = $something->table;
   } else {
     $table = $something;
+    $something = "FS::$table";
   }
-  #croak "Usage: \@fields = fields(\$table)\n   or: \@fields = \$record->fields" unless $table;
-  my($table_obj) = $dbdef->table($table);
-  confess "Unknown table $table" unless $table_obj;
-  $table_obj->columns;
+  return (real_fields($table), $something->virtual_fields());
 }
 
 =back
 
+=item pvf FIELD_NAME
+
+Returns the FS::part_virtual_field object corresponding to a field in the 
+record (specified by FIELD_NAME).
+
+=cut
+
+sub pvf {
+  my ($self, $name) = (shift, shift);
+
+  if(grep /^$name$/, $self->virtual_fields) {
+    return qsearchs('part_virtual_field', { dbtable => $self->table,
+                                            name    => $name } );
+  }
+  ''
+}
+
 =head1 SUBROUTINES
 
 =over 4
 
+=item real_fields [ TABLE ]
+
+Returns a list of the real columns in the specified table.  Called only by 
+fields() and other subroutines elsewhere in FS::Record.
+
+=cut
+
+sub real_fields {
+  my $table = shift;
+
+  my($table_obj) = $dbdef->table($table);
+  confess "Unknown table $table" unless $table_obj;
+  $table_obj->columns;
+}
+
 =item reload_dbdef([FILENAME])
 
 Load a database definition (see L<DBIx::DBSchema>), optionally from a
@@ -1251,6 +1501,28 @@ sub _quote {
   }
 }
 
+=item vfieldpart_hashref TABLE
+
+Returns a hashref of virtual field names and vfieldparts applicable to the given
+TABLE.
+
+=cut
+
+sub vfieldpart_hashref {
+  my ($table) = @_;
+
+  return () unless $table;
+  my $dbh = dbh;
+  my $statement = "SELECT vfieldpart, name FROM part_virtual_field WHERE ".
+                  "dbtable = '$table'";
+  my $sth = $dbh->prepare($statement);
+  $sth->execute or croak "Execution of '$statement' failed: ".$dbh->errstr;
+  return { map { $_->{name}, $_->{vfieldpart} } 
+    @{$sth->fetchall_arrayref({})} };
+
+}
+
+
 =item hfields TABLE
 
 This is deprecated.  Don't use it.
diff --git a/FS/FS/addr_block.pm b/FS/FS/addr_block.pm
index c5ddca7d0..4b034ef0c 100755
--- a/FS/FS/addr_block.pm
+++ b/FS/FS/addr_block.pm
@@ -122,7 +122,7 @@ sub check {
     }
   }
 
-  '';
+  $self->SUPER::check;
 }
 
 
diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
index f11a28db9..6de15ae6f 100644
--- a/FS/FS/agent.pm
+++ b/FS/FS/agent.pm
@@ -113,8 +113,7 @@ sub check {
   return "Unknown typenum!"
     unless $self->agent_type;
 
-  '';
-
+  $self->SUPER::check;
 }
 
 =item agent_type
@@ -145,7 +144,7 @@ sub pkgpart_hashref {
 
 =head1 VERSION
 
-$Id: agent.pm,v 1.3 2002-03-24 18:23:47 ivan Exp $
+$Id: agent.pm,v 1.4 2003-08-05 00:20:40 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/agent_type.pm b/FS/FS/agent_type.pm
index 988533ae3..5ba5ef291 100644
--- a/FS/FS/agent_type.pm
+++ b/FS/FS/agent_type.pm
@@ -102,7 +102,8 @@ sub check {
   my $self = shift;
 
   $self->ut_numbern('typenum')
-  or $self->ut_text('atype');
+  or $self->ut_text('atype')
+  or $self->SUPER::check;
 
 }
 
@@ -150,7 +151,7 @@ sub pkgpart {
 
 =head1 VERSION
 
-$Id: agent_type.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: agent_type.pm,v 1.2 2003-08-05 00:20:40 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index a22f44b24..4793608c0 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -161,7 +161,7 @@ sub check {
 
   $self->printed(0) if $self->printed eq '';
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item previous
diff --git a/FS/FS/cust_bill_event.pm b/FS/FS/cust_bill_event.pm
index c97734780..ddd676281 100644
--- a/FS/FS/cust_bill_event.pm
+++ b/FS/FS/cust_bill_event.pm
@@ -122,7 +122,7 @@ sub check {
   return "Unknown eventpart ". $self->eventpart
     unless qsearchs( 'part_bill_event' ,{ 'eventpart' => $self->eventpart } );
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item part_bill_event
diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index 913704bef..5f4a49144 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -170,7 +170,7 @@ sub check {
 
   $self->_date(time) unless $self->_date;
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item cust_pay 
@@ -199,7 +199,7 @@ sub cust_bill {
 
 =head1 VERSION
 
-$Id: cust_bill_pay.pm,v 1.12 2002-02-07 22:29:34 ivan Exp $
+$Id: cust_bill_pay.pm,v 1.13 2003-08-05 00:20:41 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index a6615d05d..6800707fe 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -171,7 +171,7 @@ sub check {
   return "Unknown invnum"
     unless qsearchs( 'cust_bill' ,{ 'invnum' => $self->invnum } );
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item cust_pkg
diff --git a/FS/FS/cust_bill_pkg_detail.pm b/FS/FS/cust_bill_pkg_detail.pm
index 199de439b..261aa80ea 100644
--- a/FS/FS/cust_bill_pkg_detail.pm
+++ b/FS/FS/cust_bill_pkg_detail.pm
@@ -105,7 +105,8 @@ sub check {
     || $self->ut_foreign_key('pkgnum', 'cust_pkg', 'pkgnum')
     || $self->ut_foreign_key('invnum', 'cust_pkg', 'invnum')
     || $self->ut_text('detail')
-  ;
+    || $self->SUPER::check
+    ;
 
 }
 
diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 284d59de2..e668abd73 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -174,7 +174,7 @@ sub check {
 
   $self->otaker(getotaker);
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item cust_refund
@@ -242,7 +242,7 @@ sub credited {
 
 =head1 VERSION
 
-$Id: cust_credit.pm,v 1.16 2002-06-04 14:35:52 ivan Exp $
+$Id: cust_credit.pm,v 1.17 2003-08-05 00:20:41 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_credit_bill.pm b/FS/FS/cust_credit_bill.pm
index 62215419c..a54acb683 100644
--- a/FS/FS/cust_credit_bill.pm
+++ b/FS/FS/cust_credit_bill.pm
@@ -127,7 +127,7 @@ sub check {
   return "Cannot apply more than remaining value of invoice"
     unless $self->amount <= $cust_bill->owed;
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item sub cust_credit
@@ -145,7 +145,7 @@ sub cust_credit {
 
 =head1 VERSION
 
-$Id: cust_credit_bill.pm,v 1.7 2002-01-24 16:58:47 ivan Exp $
+$Id: cust_credit_bill.pm,v 1.8 2003-08-05 00:20:41 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_credit_refund.pm b/FS/FS/cust_credit_refund.pm
index cc3b32cdb..d0deae2f3 100644
--- a/FS/FS/cust_credit_refund.pm
+++ b/FS/FS/cust_credit_refund.pm
@@ -156,7 +156,7 @@ sub check {
   return "unknown cust_credit.crednum: ". $self->crednum
     unless qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item cust_refund
@@ -185,7 +185,7 @@ sub cust_credit {
 
 =head1 VERSION
 
-$Id: cust_credit_refund.pm,v 1.9 2002-01-26 01:52:31 ivan Exp $
+$Id: cust_credit_refund.pm,v 1.10 2003-08-05 00:20:41 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 51037ef97..2af2e98ce 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -798,7 +798,7 @@ sub check {
 
   #warn "AFTER: \n". $self->_dump;
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item all_pkgs
diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index d8796e451..f631d8cae 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -113,7 +113,9 @@ sub check {
     || $self->ut_textn('taxclass') # ...
     || $self->ut_money('exempt_amount')
     || $self->ut_textn('taxname')
-  ;
+    || $self->SUPER::check
+    ;
+
 
 }
 
diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm
index bcb1437af..add0ccab1 100644
--- a/FS/FS/cust_main_invoice.pm
+++ b/FS/FS/cust_main_invoice.pm
@@ -107,7 +107,7 @@ sub check {
   return "Unknown customer"
     unless qsearchs('cust_main',{ 'custnum' => $self->custnum });
 
-  ''; #noerror
+  $self->SUPER::check;
 }
 
 =item checkdest
@@ -163,7 +163,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.13 2002-09-18 22:50:44 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.14 2003-08-05 00:20:42 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 55f2fc4a3..7be115356 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -354,8 +354,7 @@ sub check {
     return $error if $error;
   }
 
-  ''; #no error
-
+  $self->SUPER::check;
 }
 
 =item cust_bill_pay
@@ -390,7 +389,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.24 2003-05-19 12:00:44 ivan Exp $
+$Id: cust_pay.pm,v 1.25 2003-08-05 00:20:42 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
index c4427c387..1a530467c 100644
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -185,14 +185,14 @@ sub check {
 
   #check invnum, custnum, ?
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =back
 
 =head1 VERSION
 
-$Id: cust_pay_batch.pm,v 1.6 2002-02-22 23:08:11 ivan Exp $
+$Id: cust_pay_batch.pm,v 1.7 2003-08-05 00:20:42 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index a423c5518..f59b45ab1 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -249,7 +249,7 @@ sub check {
     $self->manual_flag($1);
   }
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item cancel
diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 763671736..250bd20e0 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -260,14 +260,14 @@ sub check {
 
   $self->otaker(getotaker);
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =back
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.20 2002-11-19 09:51:58 ivan Exp $
+$Id: cust_refund.pm,v 1.21 2003-08-05 00:20:42 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index c0cb6f4e9..7aa311ba5 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -234,7 +234,7 @@ sub check {
       if scalar(@cust_svc) >= $quantity && (!$ignore_quantity || !$quantity);
   }
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item part_svc
diff --git a/FS/FS/cust_tax_exempt.pm b/FS/FS/cust_tax_exempt.pm
index ab873c0a7..da0de000a 100644
--- a/FS/FS/cust_tax_exempt.pm
+++ b/FS/FS/cust_tax_exempt.pm
@@ -111,6 +111,7 @@ sub check {
     || $self->ut_number('year') #check better
     || $self->ut_number('month') #check better
     || $self->ut_money('amount')
+    || $self->SUPER::check
   ;
 }
 
diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 77b955088..ea0c48d4f 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -271,7 +271,7 @@ sub check {
     die "ack!";
   }
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item increment_serial
@@ -332,7 +332,7 @@ sub zone {
 
 =head1 VERSION
 
-$Id: domain_record.pm,v 1.15 2003-04-29 18:28:50 khoff Exp $
+$Id: domain_record.pm,v 1.16 2003-08-05 00:20:43 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/export_svc.pm b/FS/FS/export_svc.pm
index da9ac698a..c104e4538 100644
--- a/FS/FS/export_svc.pm
+++ b/FS/FS/export_svc.pm
@@ -105,6 +105,7 @@ sub check {
     || $self->ut_foreign_key('exportnum', 'part_export', 'exportnum')
     || $self->ut_number('svcpart')
     || $self->ut_foreign_key('svcpart', 'part_svc', 'svcpart')
+    || $self->SUPER::check
   ;
 }
 
diff --git a/FS/FS/msgcat.pm b/FS/FS/msgcat.pm
index fa10d34fa..855b8b291 100644
--- a/FS/FS/msgcat.pm
+++ b/FS/FS/msgcat.pm
@@ -113,7 +113,7 @@ sub check {
   $self->locale =~ /^([\w\@]+)$/ or return "illegal locale: ". $self->locale;
   $self->locale($1);
 
-  ''; #no error
+  $self->SUPER::check
 }
 
 =back
diff --git a/FS/FS/nas.pm b/FS/FS/nas.pm
index 58c6827ea..2d17df899 100644
--- a/FS/FS/nas.pm
+++ b/FS/FS/nas.pm
@@ -114,7 +114,9 @@ sub check {
     || $self->ut_text('nas')
     || $self->ut_ip('nasip')
     || $self->ut_domain('nasfqdn')
-    || $self->ut_numbern('last');
+    || $self->ut_numbern('last')
+    || $self->SUPER::check
+    ;
 }
 
 =item heartbeat TIMESTAMP
@@ -136,7 +138,7 @@ sub heartbeat {
 
 =head1 VERSION
 
-$Id: nas.pm,v 1.6 2002-03-04 12:48:49 ivan Exp $
+$Id: nas.pm,v 1.7 2003-08-05 00:20:43 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
index e0e4f3f19..9e5d82161 100644
--- a/FS/FS/part_bill_event.pm
+++ b/FS/FS/part_bill_event.pm
@@ -162,8 +162,7 @@ sub check {
     }
   }
 
-  '';
-
+  $self->SUPER::check;
 }
 
 =back
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index ff519969d..ab0a4b566 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -285,7 +285,7 @@ sub check {
 
   #check exporttype?
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 #=item part_svc
@@ -667,6 +667,19 @@ END
   },
 ;
 
+tie my %router_options, 'Tie::IxHash',
+  'protocol' => {
+	  label=>'Protocol',
+	  type =>'select',
+	  options => [qw(telnet ssh)],
+	  default => 'telnet'},
+  'insert' => {label=>'Insert command', default=>'' },
+  'delete' => {label=>'Delete command', default=>'' },
+  'replace' => {label=>'Replace command', default=>'' },
+  'Timeout' => {label=>'Time to wait for prompt', default=>'20' },
+  'Prompt' => {label=>'Prompt string', default=>'#' }
+;
+
 tie my %domain_shellcommands_options, 'Tie::IxHash',
   'user' => { lable=>'Remote username', default=>'root' },
   'useradd' => { label=>'Insert command',
@@ -1013,8 +1026,12 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
   },
 
   'svc_broadband' => {
+    'router' => {
+      'desc' => 'Send a command to a router.',
+      'options' => \%router_options,
+      'notes' => '',
+    },
   },
-
 );
 
 =back
diff --git a/FS/FS/part_export_option.pm b/FS/FS/part_export_option.pm
index a0b19fde1..33b5e5a67 100644
--- a/FS/FS/part_export_option.pm
+++ b/FS/FS/part_export_option.pm
@@ -115,7 +115,7 @@ sub check {
 
   #check options & values?
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =back
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 6525864c4..12ee804ff 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -241,6 +241,7 @@ sub check {
       || $self->ut_enum('recurtax', [ '', 'Y' ] )
       || $self->ut_textn('taxclass')
       || $self->ut_enum('disabled', [ '', 'Y' ] )
+      || $self->SUPER::check
     ;
 }
 
diff --git a/FS/FS/part_pop_local.pm b/FS/FS/part_pop_local.pm
index 0b7cdf6c9..f7d5eac9a 100644
--- a/FS/FS/part_pop_local.pm
+++ b/FS/FS/part_pop_local.pm
@@ -92,6 +92,7 @@ sub check {
       or $self->ut_text('state')
       or $self->ut_number('npa')
       or $self->ut_number('nxx')
+      or $self->SUPER::check
   ;
 
 }
@@ -100,7 +101,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: part_pop_local.pm,v 1.1 2001-09-26 09:17:06 ivan Exp $
+$Id: part_pop_local.pm,v 1.2 2003-08-05 00:20:44 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_referral.pm b/FS/FS/part_referral.pm
index 23885dffd..f30ddad01 100644
--- a/FS/FS/part_referral.pm
+++ b/FS/FS/part_referral.pm
@@ -93,6 +93,7 @@ sub check {
 
   $self->ut_numbern('refnum')
     || $self->ut_text('referral')
+    || $self->SUPER::check
   ;
 }
 
diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 63bc2ad1c..aacc3ab48 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -68,7 +68,7 @@ TODOC:
 
 =item I<svcdb>__I<field> - Default or fixed value for I<field> in I<svcdb>.
 
-=item I<svcdb>__I<field>_flag - defines I<svcdb>__I<field> action: null, `D' for default, or `F' for fixed
+=item I<svcdb>__I<field>_flag - defines I<svcdb>__I<field> action: null, `D' for default, or `F' for fixed.  For virtual fields, can also be 'X' for excluded.
 
 TODOC: EXTRA_FIELDS_ARRAYREF
 
@@ -113,7 +113,7 @@ sub insert {
     } );
 
     my $flag = $self->getfield($svcdb.'__'.$field.'_flag');
-    if ( uc($flag) =~ /^([DF])$/ ) {
+    if ( uc($flag) =~ /^([DFX])$/ ) {
       $part_svc_column->setfield('columnflag', $1);
       $part_svc_column->setfield('columnvalue',
         $self->getfield($svcdb.'__'.$field)
@@ -201,7 +201,7 @@ sub replace {
       } );
 
       my $flag = $new->getfield($svcdb.'__'.$field.'_flag');
-      if ( uc($flag) =~ /^([DF])$/ ) {
+      if ( uc($flag) =~ /^([DFX])$/ ) {
         $part_svc_column->setfield('columnflag', $1);
         $part_svc_column->setfield('columnvalue',
           $new->getfield($svcdb.'__'.$field)
@@ -254,7 +254,7 @@ sub check {
   my @fields = eval { fields( $recref->{svcdb} ) }; #might die
   return "Unknown svcdb!" unless @fields;
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item part_svc_column COLUMNNAME
diff --git a/FS/FS/part_svc_column.pm b/FS/FS/part_svc_column.pm
index 37e841e87..885155be3 100644
--- a/FS/FS/part_svc_column.pm
+++ b/FS/FS/part_svc_column.pm
@@ -41,7 +41,7 @@ fields are currently supported:
 
 =item columnvalue - default or fixed value for the column
 
-=item columnflag - null, D or F
+=item columnflag - null, D, F, X (virtual fields)
 
 =back
 
@@ -91,18 +91,18 @@ sub check {
   ;
   return $error if $error;
 
-  $self->columnflag =~ /^([DF])$/
+  $self->columnflag =~ /^([DFX])$/
     or return "illegal columnflag ". $self->columnflag;
   $self->columnflag(uc($1));
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =back
 
 =head1 VERSION
 
-$Id: part_svc_column.pm,v 1.1 2001-09-07 20:49:15 ivan Exp $
+$Id: part_svc_column.pm,v 1.2 2003-08-05 00:20:44 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_virtual_field.pm b/FS/FS/part_virtual_field.pm
new file mode 100755
index 000000000..03c34cca5
--- /dev/null
+++ b/FS/FS/part_virtual_field.pm
@@ -0,0 +1,303 @@
+package FS::part_virtual_field;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearchs qsearch dbdef );
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::part_virtual_field - Object methods for part_virtual_field records
+
+=head1 SYNOPSIS
+
+  use FS::part_virtual_field;
+
+  $record = new FS::part_virtual_field \%hash;
+  $record = new FS::part_virtual_field { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::part_virtual_field object represents the definition of a virtual field 
+(see the BACKGROUND section).  FS::part_virtual_field contains the name and 
+base table of the field, as well as validation rules and UI hints about the 
+display of the field.  The actual data is stored in FS::virtual_field; see 
+its manpage for details.
+
+FS::part_virtual_field inherits from FS::Record.  The following fields are 
+currently supported:
+
+=over 2
+
+=item vfieldpart - primary key (assigned automatically)
+
+=item name - name of the field
+
+=item dbtable - table for which this virtual field is defined
+
+=item check_block - Perl code to validate/normalize data
+
+=item list_source - Perl code to generate a list of values (UI hint)
+
+=item length - expected length of the value (UI hint)
+
+=item label - descriptive label for the field (UI hint)
+
+=item sequence - sort key (UI hint; unimplemented)
+
+=back
+
+=head1 BACKGROUND
+
+"Form is none other than emptiness,
+ and emptiness is none other than form."
+-- Heart Sutra
+
+The virtual field mechanism allows site admins to make trivial changes to 
+the Freeside database schema without modifying the code.  Specifically, the 
+user can add custom-defined 'fields' to the set of data tracked by Freeside 
+about objects such as customers and services.  These fields are not associated 
+with any logic in the core Freeside system, but may be referenced in peripheral 
+code such as exports, price calculations, or alternate interfaces, or may just 
+be stored in the database for future reference.
+
+This system was originally devised for svc_broadband, which (by necessity) 
+comprises such a wide range of access technologies that no static set of fields 
+could contain all the information needed by the exports.  In an appalling 
+display of False Laziness, a parallel mechanism was implemented for the 
+router table, to store properties such as passwords to configure routers.
+
+The original system treated svc_broadband custom fields (sb_fields) as records 
+in a completely separate table.  Any code that accessed or manipulated these 
+fields had to be aware that they were I<not> fields in svc_broadband, but 
+records in sb_field.  For example, code that inserted a svc_broadband with 
+several custom fields had to create an FS::svc_broadband object, call its 
+insert() method, and then create several FS::sb_field objects and call I<their>
+insert() methods.
+
+This created a problem for exports.  The insert method on any FS::svc_Common 
+object (including svc_broadband) automatically triggers exports after the 
+record has been inserted.  However, at this point, the sb_fields had not yet 
+been inserted, so the export could not rely on their presence, which was the 
+original purpose of sb_fields.
+
+Hence the new system.  Virtual fields are appended to the field list of every 
+record at the FS::Record level, whether the object is created ex nihilo with 
+new() or fetched with qsearch().  The fields() method now returns a list of 
+both real and virtual fields.  The insert(), replace(), and delete() methods 
+now update both the base table and the virtual fields, in a single transaction.
+
+A new method is provided, virtual_fields(), which gives only the virtual 
+fields.  UI code that dynamically generates form widgets to edit virtual field
+data should use this to figure out what fields are defined.  (See below.)
+
+Subclasses may override virtual_fields() to restrict the set of virtual 
+fields available.  Some discipline and sanity on the part of the programmer 
+are required; in particular, this function should probably not depend on any 
+fields in the record other than the primary key, since the others may change 
+after the object is instantiated.  (Making it depend on I<virtual> fields is 
+just asking for pain.)  One use of this is seen in FS::svc_Common; another 
+possibility is field-level access control based on FS::UID::getotaker().
+
+As a trivial case, a subclass may opt out of supporting virtual fields with 
+the following code:
+
+sub virtual_fields { () }
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Create a new record.  To add the record to the database, see "insert".
+
+=cut
+
+sub table { 'part_virtual_field'; }
+sub virtual_fields { () }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+If there is an error, returns the error, otherwise returns false.
+Called by the insert and replace methods.
+
+=back
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error = $self->ut_text('name') ||
+              $self->ut_text('dbtable') ||
+              $self->ut_number('length')
+              ;
+  return $error if $error;
+
+  # Make sure it's a real table with a numeric primary key
+  my ($table, $pkey);
+  if($table = $FS::Record::dbdef->table($self->dbtable)) {
+    if($pkey = $table->primary_key) {
+      if($table->column($pkey)->type =~ /int/i) {
+        # this is what it should be
+      } else {
+        $error = "$table.$pkey is not an integer";
+      }
+    } else {
+      $error = "$table does not have a single-field primary key";
+    }
+  } else {
+    $error = "$table does not exist in the schema";
+  }
+  return $error if $error;
+
+  # Possibly some sanity checks for check_block and list_source?
+
+  $self->SUPER::check;  
+}
+
+=item list
+
+Evaluates list_source.
+
+=cut
+
+sub list {
+  my $self = shift;
+  return () unless $self->list_source;
+
+  my @opts = eval($self->list_source);
+  if($@) {
+    warn $@;
+    return ();
+  } else {
+    return @opts;
+  }
+}
+
+=item widget UI_TYPE MODE [ VALUE ]
+
+Generates UI code for a widget suitable for editing/viewing the field, based on 
+list_source and length.  
+
+The only UI_TYPE currently supported is 'HTML', and the only MODE is 'view'.
+Others will be added later.
+
+In HTML, all widgets are assumed to be table rows.  View widgets look like
+<TR><TD ALIGN="right">Label</TD><TD BGCOLOR="#ffffff">Value</TD></TR>
+
+(Most of the display style stuff, such as the colors, should probably go into 
+a separate module specific to the UI.  That can wait, though.  The API for 
+this function won't change.)
+
+VALUE (optional) is the current value of the field.
+
+=cut
+
+sub widget {
+  my $self = shift;
+  my ($ui_type, $mode, $value) = @_;
+  my $text;
+  my $label = $self->label || $self->name;
+
+  if ($ui_type eq 'HTML') {
+    if ($mode eq 'view') {
+      $text = q!<TR><TD ALIGN="right">! . $label . 
+              q!</TD><TD BGCOLOR="#ffffff">! . $value .
+              q!</TD></TR>! . "\n";
+    } elsif ($mode eq 'edit') {
+      $text = q!<TR><TD ALIGN="right">! . $label .
+              q!</TD><TD>!;
+      if ($self->list_source) {
+        $text .= q!<SELECT NAME="! . $self->name . 
+                q!" SIZE=1>! . "\n";
+        foreach ($self->list) {
+          $text .= q!<OPTION VALUE="! . $_ . q!"!;
+          $text .= ' SELECTED' if ($_ eq $value);
+          $text .= '>' . $_ . '</OPTION>' . "\n";
+        }
+      } else {
+        $text .= q!<INPUT NAME="! . $self->name .
+                q!" VALUE="! . $value . q!"!;
+        if ($self->length) {
+          $text .= q! SIZE="! . $self->length . q!"!;
+        }
+        $text .= '>';
+      }
+      $text .= q!</TD></TR>! . "\n";
+    } else {
+      return '';
+    }
+  } else {
+    return '';
+  }
+  return $text;
+}
+
+=head1 VERSION
+
+$Id: part_virtual_field.pm,v 1.2 2003-08-05 00:20:45 khoff Exp $
+
+=head1 NOTES
+
+=head2 Semantics of check_block:
+
+This has been changed from the sb_field implementation to make check_blocks 
+simpler and more natural to Perl programmers who work on things other than 
+Freeside.
+
+The check_block is eval'd with the (proposed) new value of the field in $_, 
+and the object to be updated in $self.  Its return value is ignored.  The 
+check_block may change the value of $_ to override the proposed value, or 
+call die() (with an appropriate error message) to reject the update entirely;
+the error string will be returned as the output of the check() method.
+
+This makes check_blocks like
+
+C<s/foo/bar/>
+
+do what you expect.
+
+The check_block is expected NOT to do anything freaky to $self, like modifying 
+other fields or calling $self->check().  You have been warned.
+
+(FIXME: Rewrite some of the warnings from part_sb_field and insert here.)
+
+=head1 BUGS
+
+None.  It's absolutely falwless.
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::virtual_field>
+
+=cut
+
+1;
+
+
diff --git a/FS/FS/pkg_svc.pm b/FS/FS/pkg_svc.pm
index 3c544ffd8..2ac1a558c 100644
--- a/FS/FS/pkg_svc.pm
+++ b/FS/FS/pkg_svc.pm
@@ -108,7 +108,7 @@ sub check {
   return "Unknown pkgpart!" unless $self->part_pkg;
   return "Unknown svcpart!" unless $self->part_svc;
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item part_pkg
@@ -137,7 +137,7 @@ sub part_svc {
 
 =head1 VERSION
 
-$Id: pkg_svc.pm,v 1.3 2002-06-10 01:39:50 khoff Exp $
+$Id: pkg_svc.pm,v 1.4 2003-08-05 00:20:45 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/port.pm b/FS/FS/port.pm
index 13455ca89..620030afc 100644
--- a/FS/FS/port.pm
+++ b/FS/FS/port.pm
@@ -113,7 +113,7 @@ sub check {
     unless $self->ip || $self->nasport;
   return "Unknown nasnum"
     unless qsearchs('nas', { 'nasnum' => $self->nasnum } );
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item session
@@ -133,7 +133,7 @@ sub session {
 
 =head1 VERSION
 
-$Id: port.pm,v 1.5 2001-02-14 04:33:06 ivan Exp $
+$Id: port.pm,v 1.6 2003-08-05 00:20:45 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/prepay_credit.pm b/FS/FS/prepay_credit.pm
index 7ed9b8344..a9d26d151 100644
--- a/FS/FS/prepay_credit.pm
+++ b/FS/FS/prepay_credit.pm
@@ -108,6 +108,7 @@ sub check {
   || $self->ut_alpha('identifier')
   || $self->ut_money('amount')
   || $self->utnumbern('seconds')
+  || $self->SUPER::check
   ;
 
 }
diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index d35dc883f..634f7f4bd 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -207,7 +207,7 @@ sub check {
   $self->status('new') unless $self->status;
   $self->_date(time) unless $self->_date;
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item args
@@ -385,7 +385,7 @@ END
 
 =head1 VERSION
 
-$Id: queue.pm,v 1.15 2002-07-02 06:48:59 ivan Exp $
+$Id: queue.pm,v 1.16 2003-08-05 00:20:46 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/queue_arg.pm b/FS/FS/queue_arg.pm
index 08fe47341..d23ee2afd 100644
--- a/FS/FS/queue_arg.pm
+++ b/FS/FS/queue_arg.pm
@@ -100,14 +100,14 @@ sub check {
   ;
   return $error if $error;
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =back
 
 =head1 VERSION
 
-$Id: queue_arg.pm,v 1.1 2001-09-11 00:08:18 ivan Exp $
+$Id: queue_arg.pm,v 1.2 2003-08-05 00:20:46 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/queue_depend.pm b/FS/FS/queue_depend.pm
index 4a4e3c55c..bc910d8e9 100644
--- a/FS/FS/queue_depend.pm
+++ b/FS/FS/queue_depend.pm
@@ -103,6 +103,7 @@ sub check {
   $self->ut_numbern('dependnum')
     || $self->ut_foreign_key('jobnum',        'queue', 'jobnum')
     || $self->ut_foreign_key('depend_jobnum', 'queue', 'jobnum')
+    || $self->SUPER::check
   ;
 }
 
diff --git a/FS/FS/radius_usergroup.pm b/FS/FS/radius_usergroup.pm
index 647621d28..9bba057c9 100644
--- a/FS/FS/radius_usergroup.pm
+++ b/FS/FS/radius_usergroup.pm
@@ -100,6 +100,7 @@ sub check {
     || $self->ut_number('svcnum')
     || $self->ut_foreign_key('svcnum','svc_acct','svcnum')
     || $self->ut_text('groupname')
+    || $self->SUPER::check
   ;
 }
 
diff --git a/FS/FS/router.pm b/FS/FS/router.pm
index 3f9459a01..2554ce86b 100755
--- a/FS/FS/router.pm
+++ b/FS/FS/router.pm
@@ -85,7 +85,7 @@ sub check {
     || $self->ut_text('routername');
   return $error if $error;
 
-  '';
+  $self->SUPER::check;
 }
 
 =item addr_block
@@ -100,18 +100,6 @@ sub addr_block {
   return qsearch('addr_block', { routernum => $self->routernum });
 }
 
-=item router_field
-
-Returns a list of FS::router_field objects assigned to this object.
-
-=cut
-
-sub router_field {
-  my $self = shift;
-
-  return qsearch('router_field', { routernum => $self->routernum });
-}
-
 =item part_svc_router
 
 Returns a list of FS::part_svc_router objects associated with this 
@@ -147,7 +135,7 @@ $Id:
 
 =head1 SEE ALSO
 
-FS::svc_broadband, FS::router, FS::addr_block, FS::router_field, FS::part_svc,
+FS::svc_broadband, FS::router, FS::addr_block, FS::part_svc,
 schema.html from the base documentation.
 
 =cut
diff --git a/FS/FS/session.pm b/FS/FS/session.pm
index de0f2a76a..2ad594cf2 100644
--- a/FS/FS/session.pm
+++ b/FS/FS/session.pm
@@ -216,7 +216,7 @@ sub check {
   return $error if $error;
   return "Unknown svcnum"
     unless qsearchs('svc_acct', { 'svcnum' => $self->svcnum } );
-  '';
+  $self->SUPER::check;
 }
 
 =item nas_heartbeat
@@ -247,7 +247,7 @@ sub svc_acct {
 
 =head1 VERSION
 
-$Id: session.pm,v 1.7 2001-04-15 13:35:12 ivan Exp $
+$Id: session.pm,v 1.8 2003-08-05 00:20:46 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 87b6097aa..524e55086 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -2,7 +2,7 @@ package FS::svc_Common;
 
 use strict;
 use vars qw( @ISA $noexport_hack );
-use FS::Record qw( qsearchs fields dbh );
+use FS::Record qw( qsearch qsearchs fields dbh );
 use FS::cust_svc;
 use FS::part_svc;
 use FS::queue;
@@ -28,6 +28,58 @@ inherit from, i.e. FS::svc_acct.  FS::svc_Common inherits from FS::Record.
 
 =over 4
 
+=cut
+
+sub virtual_fields {
+
+  # This restricts the fields based on part_svc_column and the svcpart of 
+  # the service.  There are four possible cases:
+  # 1.  svcpart passed as part of the svc_x hash.
+  # 2.  svcpart fetched via cust_svc based on svcnum.
+  # 3.  No svcnum or svcpart.  In this case, return ALL the fields with 
+  #     dbtable eq $self->table.
+  # 4.  Called via "fields('svc_acct')" or something similar.  In this case
+  #     there is no $self object.
+
+  my $self = shift;
+  my $svcpart;
+  my @vfields = $self->SUPER::virtual_fields;
+
+  return @vfields unless (ref $self); # Case 4
+
+  if ($self->svcpart) { # Case 1
+    $svcpart = $self->svcpart;
+  } elsif (my $cust_svc = $self->cust_svc) { # Case 2
+    $svcpart = $cust_svc->svcpart;
+  } else { # Case 3
+    $svcpart = '';
+  }
+
+  if ($svcpart) { #Cases 1 and 2
+    my %flags = map { $_->columnname, $_->columnflag } (
+        qsearch ('part_svc_column', { svcpart => $svcpart } )
+      );
+    return grep { not ($flags{$_} eq 'X') } @vfields;
+  } else { # Case 3
+    return @vfields;
+  } 
+  return ();
+}
+
+=item check
+
+Checks the validity of fields in this record.
+
+At present, this does nothing but call FS::Record::check (which, in turn, 
+does nothing but run virtual field checks).
+
+=cut
+
+sub check {
+  my $self = shift;
+  $self->SUPER::check;
+}
+
 =item insert [ JOBNUM_ARRAYREF ]
 
 Adds this record to the database.  If there is an error, returns the error,
@@ -254,7 +306,7 @@ sub setx {
 
   #set default/fixed/whatever fields from part_svc
   my $table = $self->table;
-  foreach my $field ( grep { $_ ne 'svcnum' } fields($table) ) {
+  foreach my $field ( grep { $_ ne 'svcnum' } $self->fields ) {
     my $part_svc_column = $part_svc->part_svc_column($field);
     if ( $part_svc_column->columnflag eq $x ) {
       $self->setfield( $field, $part_svc_column->columnvalue );
@@ -364,7 +416,7 @@ sub cancel { ''; }
 
 =head1 VERSION
 
-$Id: svc_Common.pm,v 1.12 2002-06-14 11:22:53 ivan Exp $
+$Id: svc_Common.pm,v 1.13 2003-08-05 00:20:47 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 8a6f2c403..0ee7a7286 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -832,7 +832,7 @@ sub check {
            ": ". $recref->{_password};
   }
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item radius
diff --git a/FS/FS/svc_acct_pop.pm b/FS/FS/svc_acct_pop.pm
index 196ab7ebb..f98f91a4f 100644
--- a/FS/FS/svc_acct_pop.pm
+++ b/FS/FS/svc_acct_pop.pm
@@ -93,6 +93,7 @@ sub check {
       or $self->ut_number('ac')
       or $self->ut_number('exch')
       or $self->ut_numbern('loc')
+      or $self->SUPER::check
   ;
 
 }
@@ -187,7 +188,7 @@ END
 
 =head1 VERSION
 
-$Id: svc_acct_pop.pm,v 1.9 2003-07-04 01:37:46 ivan Exp $
+$Id: svc_acct_pop.pm,v 1.10 2003-08-05 00:20:47 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index 45f6c3601..ec915327b 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -116,50 +116,6 @@ returns the error, otherwise returns false.
 
 # Standard FS::svc_Common::replace
 
-=item sb_field
-
-Returns a list of FS::sb_field objects assigned to this object.
-
-=cut
-
-sub sb_field {
-  my $self = shift;
-
-  return qsearch( 'sb_field', { svcnum => $self->svcnum } );
-}
-
-=item sb_field_hashref
-
-Returns a hashref of the FS::sb_field key/value pairs for this object.
-
-Deprecated.  Please don't use it.
-
-=cut
-
-# Kristian wrote this, but don't hold it against him.  He was under a powerful
-# distracting influence whom he evidently found much more interesting than
-# svc_broadband.pm.  I can't say I blame him.
-
-sub sb_field_hashref {
-  my $self = shift;
-  my $svcpart = shift;
-
-  if ((not $svcpart) && ($self->cust_svc)) {
-    $svcpart = $self->cust_svc->svcpart;
-  }
-
-  my $hashref = {};
-
-  map {
-    my $sb_field = qsearchs('sb_field', { sbfieldpart => $_->sbfieldpart,
-                                          svcnum => $self->svcnum });
-    $hashref->{$_->getfield('name')} = $sb_field ? $sb_field->getfield('value') : '';
-  } qsearch('part_sb_field', { svcpart => $svcpart });
-
-  return $hashref;
-
-}
-
 =item suspend
 
 Called by the suspend method of FS::cust_pkg (see FS::cust_pkg).
@@ -223,8 +179,7 @@ sub check {
     return 'Router '.$router->routernum.' cannot provide svcpart '.$self->svcpart;
   }
 
-
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item NetAddr
@@ -267,19 +222,11 @@ sub allowed_routers {
 
 =head1 BUGS
 
-I think there's one place in the code where we actually use sb_field_hashref.
-That's a bug in itself.
-
-The real problem with it is that we're still grappling with the question of how
-tightly xfields should be integrated with real fields.  There are a few
-different directions we could go with it--we I<could> override several
-functions in Record so that xfields behave almost exactly like real fields (can
-be set with setfield(), appear in fields() and hash(), used as criteria in
-qsearch(), etc.).
+The business with sb_field has been 'fixed', in a manner of speaking.
 
 =head1 SEE ALSO
 
-FS::svc_Common, FS::Record, FS::addr_block, FS::sb_field,
+FS::svc_Common, FS::Record, FS::addr_block,
 FS::part_svc, schema.html from the base documentation.
 
 =cut
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 32b94563d..ff0fa2f61 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -342,7 +342,9 @@ sub check {
     return "Unknown catchall" unless $svc_acct;
   }
 
-  $self->ut_textn('purpose');
+  my $error = $self->ut_textn('purpose')
+           or $self->SUPER::check;
+  return $error if $error;
 
 }
 
diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index 2b1fb9225..7a121b835 100644
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -241,7 +241,7 @@ sub check {
     $self->dst('');
   }
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item srcsvc_acct
diff --git a/FS/FS/svc_www.pm b/FS/FS/svc_www.pm
index d7a42c8ae..7e8908346 100644
--- a/FS/FS/svc_www.pm
+++ b/FS/FS/svc_www.pm
@@ -234,7 +234,8 @@ sub check {
   return "Unknown usersvc (svc_acct.svcnum): ". $self->usersvc
     unless qsearchs('svc_acct', { 'svcnum' => $self->usersvc } );
 
-  ''; #no error
+  $self->SUPER::check;
+
 }
 
 =item domain_record
diff --git a/FS/FS/type_pkgs.pm b/FS/FS/type_pkgs.pm
index efba60dbd..5b3b11c09 100644
--- a/FS/FS/type_pkgs.pm
+++ b/FS/FS/type_pkgs.pm
@@ -91,7 +91,7 @@ sub check {
   return "Unknown pkgpart"
     unless qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item part_pkg
@@ -111,7 +111,7 @@ sub part_pkg {
 
 =head1 VERSION
 
-$Id: type_pkgs.pm,v 1.2 2002-10-04 12:57:06 ivan Exp $
+$Id: type_pkgs.pm,v 1.3 2003-08-05 00:20:48 khoff Exp $
 
 =head1 BUGS
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 846f37310..0fbbf5cb5 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -92,9 +92,8 @@ FS/part_pop_local.pm
 FS/part_referral.pm
 FS/part_svc.pm
 FS/part_svc_column.pm
-FS/part_router_field.pm
-FS/part_sb_field.pm
 FS/part_svc_router.pm
+FS/part_virtual_field.pm
 FS/pkg_svc.pm
 FS/svc_Common.pm
 FS/svc_acct.pm
@@ -102,7 +101,6 @@ FS/svc_acct_pop.pm
 FS/svc_broadband.pm
 FS/svc_domain.pm
 FS/router.pm
-FS/router_field.pm
 FS/type_pkgs.pm
 FS/nas.pm
 FS/port.pm
@@ -111,7 +109,6 @@ FS/domain_record.pm
 FS/prepay_credit.pm
 FS/svc_www.pm
 FS/svc_forward.pm
-FS/sb_field.pm
 FS/raddb.pm
 FS/radius_usergroup.pm
 FS/queue.pm
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 734744efe..2cb555e18 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -1031,7 +1031,7 @@ sub tables_hash_hack {
       'columns' => [
         'routernum', 'serial', '', '',
         'routername', 'varchar', '', $char_d,
-        'svcnum', 'int', '0', '',
+        'svcnum', 'int', 'NULL', '',
       ],
       'primary_key' => 'routernum',
       'unique'      => [],
@@ -1048,30 +1048,6 @@ sub tables_hash_hack {
       'index'       => [],
     },
 
-    'part_router_field' => {
-      'columns' => [
-        'routerfieldpart', 'serial', '', '',
-        'name', 'varchar', '', $char_d,
-	'length', 'int', '', '',
-	'check_block', 'text', 'NULL', '',
-	'list_source', 'text', 'NULL', '',
-      ],
-      'primary_key' => 'routerfieldpart',
-      'unique'      => [],
-      'index'       => [],
-    },
-
-    'router_field' => {
-      'columns' => [
-        'routerfieldpart', 'int', '', '',
-        'routernum', 'int', '', '',
-        'value', 'varchar', '', 128,
-      ],
-      'primary_key' => '',
-      'unique'      => [ [ 'routerfieldpart', 'routernum' ] ],
-      'index'       => [],
-    },
-
     'addr_block' => {
       'columns' => [
         'blocknum', 'serial', '', '',
@@ -1084,31 +1060,6 @@ sub tables_hash_hack {
       'index'       => [],
     },
 
-    'part_sb_field' => {
-      'columns' => [
-        'sbfieldpart', 'serial', '', '',
-	'svcpart', 'int', '', '',
-	'name', 'varchar', '', $char_d,
-	'length', 'int', '', '',
-	'check_block', 'text', 'NULL', '',
-	'list_source', 'text', 'NULL', '',
-      ],
-      'primary_key' => 'sbfieldpart',
-      'unique'      => [ [ 'sbfieldpart', 'svcpart' ] ],
-      'index'       => [],
-    },
-
-    'sb_field' => {
-      'columns' => [
-        'sbfieldpart', 'int', '', '',
-	'svcnum', 'int', '', '',
-	'value', 'varchar', '', 128,
-      ],
-      'primary_key' => '',
-      'unique'      => [ [ 'sbfieldpart', 'svcnum' ] ],
-      'index'       => [],
-    },
-
     'svc_broadband' => {
       'columns' => [
         'svcnum', 'int', '', '',
@@ -1122,6 +1073,32 @@ sub tables_hash_hack {
       'index'       => [],
     },
 
+    'part_virtual_field' => {
+      'columns' => [
+        'vfieldpart', 'int', '', '',
+        'dbtable', 'varchar', '', 32,
+        'name', 'varchar', '', 32,
+        'check_block', 'text', 'NULL', '',
+        'length', 'int', 'NULL', '',
+        'list_source', 'text', 'NULL', '',
+        'label', 'varchar', 'NULL', 80,
+      ],
+      'primary_key' => 'vfieldpart',
+      'unique' => [],
+      'index' => [],
+    },
+
+    'virtual_field' => {
+      'columns' => [
+        'recnum', 'int', '', '',
+        'vfieldpart', 'int', '', '',
+        'value', 'varchar', '', 128,
+      ],
+      'primary_key' => '',
+      'unique' => [ [ 'vfieldpart', 'recnum' ] ],
+      'index' => [],
+    },
+
   );
 
   %tables;
diff --git a/htetc/global.asa b/htetc/global.asa
index d87f1eac6..6f76fd256 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -42,6 +42,7 @@ use FS::part_pkg;
 use FS::part_referral;
 use FS::part_svc;
 use FS::part_svc_router;
+use FS::part_virtual_field;
 use FS::pkg_svc;
 use FS::port;
 use FS::queue qw(joblisting);
@@ -53,11 +54,7 @@ use FS::svc_domain;
 use FS::svc_forward;
 use FS::svc_www;
 use FS::router;
-use FS::part_router_field;
-use FS::router_field;
 use FS::addr_block;
-use FS::part_sb_field;
-use FS::sb_field;
 use FS::svc_broadband;
 use FS::type_pkgs;
 use FS::part_export;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 481d5a2d9..c81db8664 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -100,6 +100,7 @@ sub handler
       use FS::part_referral;
       use FS::part_svc;
       use FS::part_svc_router;
+      use FS::part_virtual_field;
       use FS::pkg_svc;
       use FS::port;
       use FS::queue qw(joblisting);
@@ -112,11 +113,7 @@ sub handler
       use FS::svc_forward;
       use FS::svc_www;
       use FS::router;
-      use FS::part_router_field;
-      use FS::router_field;
       use FS::addr_block;
-      use FS::part_sb_field;
-      use FS::sb_field;
       use FS::svc_broadband;
       use FS::type_pkgs;
       use FS::part_export;
diff --git a/htetc/handler.pl-1.0x b/htetc/handler.pl-1.0x
index 8840b0816..def579f49 100644
--- a/htetc/handler.pl-1.0x
+++ b/htetc/handler.pl-1.0x
@@ -95,6 +95,7 @@ sub handler
       use FS::part_referral;
       use FS::part_svc;
       use FS::part_svc_router;
+      use FS::part_virtual_field;
       use FS::pkg_svc;
       use FS::port;
       use FS::queue qw(joblisting);
@@ -107,11 +108,7 @@ sub handler
       use FS::svc_forward;
       use FS::svc_www;
       use FS::router;
-      use FS::part_router_field;
-      use FS::router_field;
       use FS::addr_block;
-      use FS::part_sb_field;
-      use FS::sb_field;
       use FS::svc_broadband;
       use FS::type_pkgs;
       use FS::part_export;
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 7c83924a2..3fece2925 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -53,12 +53,13 @@ function part_export_areyousure(href) {
 <% foreach my $part_svc ( @part_svc ) {
      my $hashref = $part_svc->hashref;
      my $svcdb = $hashref->{svcdb};
-     my @dfields = fields($svcdb);
+     my $svc_x = "FS::$svcdb"->new( { svcpart => $part_svc->svcpart } );
+     my @dfields = $svc_x->fields;
      push @dfields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
      my @fields =
-       grep { $_ ne 'svcnum' && $part_svc->part_svc_column($_)->columnflag }
-            @dfields;
-
+       grep { $svc_x->pvf($_)
+           or $_ ne 'svcnum' && $part_svc->part_svc_column($_)->columnflag }
+            @dfields ;
      my $rowspan = scalar(@fields) || 1;
      my $url = "${p}edit/part_svc.cgi?$hashref->{svcpart}";
 %>
@@ -96,6 +97,7 @@ map { qsearchs('part_export', { exportnum => $_->exportnum } ) } qsearch('export
 
 <%     if ( $flag eq "D" ) { print "Default"; }
          elsif ( $flag eq "F" ) { print "Fixed"; }
+         elsif ( not $flag ) { }
          else { print "(Unknown!)"; }
 %>
        </TD><TD><%= $part_svc->part_svc_column($field)->columnvalue%></TD>
diff --git a/httemplate/browse/part_virtual_field.cgi b/httemplate/browse/part_virtual_field.cgi
new file mode 100644
index 000000000..9bb5c1373
--- /dev/null
+++ b/httemplate/browse/part_virtual_field.cgi
@@ -0,0 +1,39 @@
+<%= header('Virtual field definitions', menubar('Main Menu'   => $p)) %>
+<%
+
+my %pvfs;
+my $block;
+my $p2 = popurl(2);
+my $dbtable;
+
+foreach (qsearch('part_virtual_field', {})) {
+  push @{ $pvfs{$_->dbtable} }, $_;
+}
+%>
+
+<% if ($cgi->param('error')) { %>
+   <FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT>
+   <BR><BR>
+<% } %>
+
+<A HREF="<%=$p2%>edit/part_virtual_field.cgi"><I>Add a new field</I></A><BR><BR>
+
+<% foreach $dbtable (sort { $a cmp $b } keys (%pvfs)) { %>
+<H3><%=$dbtable%></H3>
+
+<%=table()%>
+<TH><TD>Field name</TD><TD>Description</TD></TH>
+<% foreach $pvf (sort {$a->name cmp $b->name} @{ $pvfs{$dbtable} }) { %>
+  <TR>
+    <TD></TD>
+    <TD>
+      <A HREF="<%=$p2%>edit/part_virtual_field.cgi?<%=$pvf->vfieldpart%>">
+        <%=$pvf->name%></A></TD>
+    <TD><%=$pvf->label%></TD>
+  </TR>
+<%   } %>
+</TABLE>
+<% } %>
+</BODY>
+</HTML>
+
diff --git a/httemplate/browse/router.cgi b/httemplate/browse/router.cgi
index 8864936d9..a9ec6fd61 100644
--- a/httemplate/browse/router.cgi
+++ b/httemplate/browse/router.cgi
@@ -14,21 +14,22 @@ my $p2 = popurl(2);
 <A HREF="<%=$p2%>edit/router.cgi"><I>Add a new router</I></A><BR><BR>
 
 <%=table()%>
-<!-- <TH><TD>Field name</TD><TD>Field value</TD></TH> -->
-<% foreach $router (sort {$a->routernum <=> $b->routernum} @router) { %>
   <TR>
-<!--    <TD ROWSPAN="<%=scalar($router->router_field) + 2%>"> -->
-    <TD>
+    <TD><B>Router name</B></TD>
+    <TD><B>Address block(s)</B></TD>
+  </TR>
+<% foreach $router (sort {$a->routernum <=> $b->routernum} @router) {
+     my @addr_block = $router->addr_block;
+%>
+  <TR>
+    <TD ROWSPAN="<%=scalar(@addr_block)%>">
       <A HREF="<%=$p2%>edit/router.cgi?<%=$router->routernum%>"><%=$router->routername%></A>
     </TD>
-  <!-- 
-  <% foreach (sort { $a->part_router_field->name cmp $b->part_router_field->name } $router->router_field )  { %>
-  <TR>
-    <TD BGCOLOR="#cccccc" ALIGN="right"><%=$_->part_router_field->name%></TD>
-    <TD BGCOLOR="#ffffff"><%=$_->value%></TD>
-  </TR>
-  <% } %>
-  -->
+    <TD>
+    <% foreach my $block ( @addr_block ) { %>
+      <%=$block->NetAddr%></BR>
+    <% } %>
+    </TD>
   </TR>
 <% } %>
 </TABLE>
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 1035510db..4c2c17b85 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -14,6 +14,24 @@ CREATE TABLE cust_bill_pkg_detail (
 );
 CREATE INDEX cust_bill_pkg_detail1 ON cust_bill_pkg_detail ( pkgnum, invnum );
 
+CREATE TABLE part_virtual_field (
+  vfieldpart int NOT NULL,
+  dbtable varchar(32) NOT NULL,
+  name varchar(32) NOT NULL,
+  check_block text,
+  list_source text,
+  length integer,
+  label varchar(80),
+  PRIMARY KEY (vfieldpart)
+);
+
+CREATE TABLE virtual_field (
+  recnum integer NOT NULL,
+  vfieldpart integer NOT NULL,
+  value varchar(128) NOT NULL,
+  PRIMARY KEY (vfieldpart, recnum)
+);
+
 CREATE TABLE router (
   routernum serial,
   routername varchar(80),
@@ -26,22 +44,6 @@ CREATE TABLE part_svc_router (
   routernum int NOT NULL
 );
 
-CREATE TABLE part_router_field (
-  routerfieldpart serial,
-  name varchar(80),
-  length int NOT NULL,
-  check_block text,
-  list_source text,
-  PRIMARY KEY (routerfieldpart)
-);
-
-CREATE TABLE router_field (
-  routerfieldpart int NOT NULL,
-  routernum int NOT NULL,
-  value varchar(128)
-);
-CREATE UNIQUE INDEX router_field1 ON router_field ( routerfieldpart, routernum );
-
 CREATE TABLE addr_block (
   blocknum serial,
   routernum int NOT NULL,
@@ -51,24 +53,6 @@ CREATE TABLE addr_block (
 );
 CREATE UNIQUE INDEX addr_block1 ON addr_block ( blocknum, routernum );
 
-CREATE TABLE part_sb_field (
-  sbfieldpart serial,
-  svcpart int NOT NULL,
-  name varchar(80) NOT NULL,
-  length int NOT NULL,
-  check_block text NULL,
-  list_source text NULL,
-  PRIMARY key (sbfieldpart)
-);
-CREATE UNIQUE INDEX part_sb_field1 ON part_sb_field ( sbfieldpart, svcpart );
-
-CREATE TABLE sb_field (
-  sbfieldpart int NOT NULL,
-  svcnum int NOT NULL,
-  value varchar(128)
-);
-CREATE UNIQUE INDEX sb_field1 ON sb_field ( sbfieldpart, svcnum );
-
 CREATE TABLE svc_broadband (
   svcnum int NOT NULL,
   blocknum int NOT NULL,
@@ -112,7 +96,7 @@ optionally:
 mandatory again:
 
 dbdef-create username
-create-history-tables username cust_bill_pkg_detail router part_svc_router part_router_field router_field addr_block part_sb_field sb_field svc_broadband
+create-history-tables username cust_bill_pkg_detail router part_svc_router addr_block svc_broadband
 dbdef-create username
 
 
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index d4bb4704c..45e0b6ffe 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -65,6 +65,9 @@ blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
 <BR><BR>
 
 <%
+
+my %vfields;
+
 #these might belong somewhere else for other user interfaces 
 #pry need to eventually create stuff that's shared amount UIs
 my %defs = (
@@ -109,29 +112,43 @@ my %defs = (
     'dstsvc'    => 'service to which mail is to be forwarded',
     'dst'       => 'someone@another.domain.com to use when dstsvc is 0',
   },
-  'svc_charge' => {
-    'amount'    => 'amount',
-  },
-  'svc_wo' => {
-    'worker'    => 'Worker',
-    '_date'      => 'Date',
-  },
+#  'svc_charge' => {
+#    'amount'    => 'amount',
+#  },
+#  'svc_wo' => {
+#    'worker'    => 'Worker',
+#    '_date'      => 'Date',
+#  },
   'svc_www' => {
     #'recnum' => '',
     #'usersvc' => '',
   },
   'svc_broadband' => {
-    'actypenum' => 'This is the actypenum that refers to the type of AC that can be provisioned for this service.  This field must be set fixed.',
     'speed_down' => 'Maximum download speed for this service in Kbps.  0 denotes unlimited.',
     'speed_up' => 'Maximum upload speed for this service in Kbps.  0 denotes unlimited.',
-    'acnum' => 'acnum of a specific AC that this service is restricted to.  Not required',
     'ip_addr' => 'IP address.  Leave blank for automatic assignment.',
-    'ip_netmask' => 'Mask length, aka. netmask bits.  (Eg. 255.255.255.0 == 24)',
-    'mac_addr' => 'MAC address which is used by some ACs for access control.  Specified by 6 colon seperated hex octets. (Eg. 00:00:0a:bc:1a:2b)',
-    'location' => 'Defines the physically location at which this service was installed.  This is not necessarily the billing address',
+    'blocknum' => 'Address block.',
   },
 );
 
+  foreach $svcdb (keys(%defs)) {
+    my $self = "FS::$svcdb"->new;
+    $vfields{$svcdb} = {};
+    foreach my $field ($self->virtual_fields) { # svc_Common::virtual_fields with a null svcpart returns all of them
+      my $pvf = $self->pvf($field);
+      my @list = $pvf->list;
+      if (scalar @list) {
+        $defs{$svcdb}->{$field} = { desc        => $pvf->label,
+                                    type        => 'select',
+                                    select_list => \@list };
+      } else {
+        $defs{$svcdb}->{$field} = $pvf->label;
+      } #endif
+      $vfields{$svcdb}->{$field} = $pvf;
+      warn "\$vfields{$svcdb}->{$field} = $pvf";
+    } #next $field
+  } #next $svcdb
+  
   my @dbs = $hashref->{svcdb}
              ? ( $hashref->{svcdb} )
              : qw( svc_acct svc_domain svc_forward svc_www svc_broadband );
@@ -157,7 +174,7 @@ my %defs = (
       $html .= '<BR><BR>'. table().
                table(). "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
       foreach my $part_export ( @part_export ) {
-        $html .= '<TD><INPUT TYPE="checkbox"'.
+        $html .= '<TD><INPUT TYPE="checbox"'.
                  ' NAME="exportnum'. $part_export->exportnum. '"  VALUE="1" ';
         $html .= 'CHECKED'
           if ( $clone || $part_svc->svcpart ) #null svcpart search causing error
@@ -202,19 +219,27 @@ my %defs = (
             qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="D"!.
             ' CHECKED'x($flag eq 'D'). ">Default ".
             qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="F"!.
-            ' CHECKED'x($flag eq 'F'). ">Fixed ".
-            '<BR>';
+            ' CHECKED'x($flag eq 'F'). ">Fixed ";
+          $html .= '<BR>';
         }
         if ( ref($def) ) {
           if ( $def->{type} eq 'select' ) {
             $html .= qq!<SELECT NAME="${layer}__${field}">!;
             $html .= '<OPTION> </OPTION>' unless $value;
-            foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
-              my $rvalue = $record->getfield($def->{select_key});
-              $html .= qq!<OPTION VALUE="$rvalue"!.
-                       ( $rvalue==$value ? ' SELECTED>' : '>' ).
-                       $record->getfield($def->{select_label}). '</OPTION>';
-            }
+            if ( $def->{select_table} ) {
+              foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
+                my $rvalue = $record->getfield($def->{select_key});
+                $html .= qq!<OPTION VALUE="$rvalue"!.
+                         ( $rvalue==$value ? ' SELECTED>' : '>' ).
+                         $record->getfield($def->{select_label}). '</OPTION>';
+              } #next $record
+            } else { # select_list
+              foreach my $item ( @{$def->{select_list}} ) {
+                $html .= qq!<OPTION VALUE="$item"!.
+                         ( $item eq $value ? ' SELECTED>' : '>' ).
+                         $item. '</OPTION>';
+              } #next $item
+            } #endif
             $html .= '</SELECT>';
           } elsif ( $def->{type} eq 'radius_usergroup_selector' ) {
             $html .= FS::svc_acct::radius_usergroup_selector(
@@ -229,6 +254,11 @@ my %defs = (
           $html .=
             qq!<INPUT TYPE="text" NAME="${layer}__${field}" VALUE="$value">!;
         }
+
+        if($vfields{$layer}->{$field}) {
+          $html .= qq!<BR><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="X"!.
+          ' CHECKED'x($flag eq 'X'). ">Excluded ";
+        }
         $html .= "</TD></TR>\n";
       }
       $part_svc->svcpart('') if $clone; #undone
diff --git a/httemplate/edit/part_virtual_field.cgi b/httemplate/edit/part_virtual_field.cgi
new file mode 100644
index 000000000..8bc84387f
--- /dev/null
+++ b/httemplate/edit/part_virtual_field.cgi
@@ -0,0 +1,92 @@
+<!-- mason kludge -->
+<%
+my ($vfieldpart, $part_virtual_field);
+
+if ( $cgi->param('error') ) {
+  $part_virtual_field = new FS::part_virtual_field ( {
+    map { $_, scalar($cgi->param($_)) } fields('part_virtual_field')});
+  $vfieldpart = $part_virtual_field->vfieldpart;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $vfieldpart=$1;
+    $part_virtual_field=qsearchs('part_virtual_field',
+        {'vfieldpart' => $vfieldpart})
+      or die "Unknown vfieldpart!";
+  
+  } else { #adding
+    $part_virtual_field = new FS::part_virtual_field({});
+  }
+}
+my $action = $part_virtual_field->vfieldpart ? 'Edit' : 'Add';
+
+my $p1 = popurl(1);
+print header("$action Virtual Field Definition", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+%>
+<FORM ACTION="<%=$p1%>process/generic.cgi" METHOD="POST">
+
+<INPUT TYPE="hidden" NAME="table" VALUE="part_virtual_field">
+<INPUT TYPE="hidden" NAME="redirect_ok" 
+    VALUE="<%=popurl(2)%>browse/part_virtual_field.cgi">
+<INPUT TYPE="hidden" NAME="vfieldpart" VALUE="<%=
+  $vfieldpart%>">
+Field #<B><%=$vfieldpart or "(NEW)"%></B><BR><BR>
+
+<%=ntable("#cccccc",2)%>
+  <TR>
+    <TD ALIGN="right">Name</TD>
+    <TD><INPUT TYPE="text" NAME="name" MAXLENGTH=15 VALUE="<%=
+    $part_virtual_field->name%>"></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Table</TD>
+    <TD><% if ($action eq 'Add') { %>
+      <SELECT SIZE=1 NAME="dbtable"><%
+        my $dbdef = dbdef;  # ick
+        foreach my $dbtable ($dbdef->tables) {
+          if ($dbtable !~ /^h_/
+          and $dbdef->table($dbtable)->primary_key) { %>
+            <OPTION VALUE="<%=$dbtable%>"><%=$dbtable%></OPTION><%
+          }
+        }
+      %></SELECT><%
+    } else { # Edit
+    %><%=$part_virtual_field->dbtable%>
+    <INPUT TYPE="hidden" NAME="dbtable" VALUE="<%=$part_virtual_field->dbtable%>">
+ <% } %>
+    </TD>
+  <TR>
+    <TD ALIGN="right">Label</TD>
+    <TD><INPUT TYPE="text" NAME="label" MAXLENGTH="20" VALUE="<%=
+    $part_virtual_field->label%>"></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Length</TD>
+    <TD><INPUT TYPE="text" NAME="length" MAXLENGTH=4 VALUE="<%=
+    $part_virtual_field->length%>"></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Check</TD>
+    <TD><TEXTAREA COLS="20" ROWS="4" NAME="check_block"><%=
+    $part_virtual_field->check_block%></TEXTAREA></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">List source</TD>
+    <TD><TEXTAREA COLS="20" ROWS="4" NAME="list_source"><%=
+    $part_virtual_field->list_source%></TEXTAREA></TD>
+  </TR>
+</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">
+
+</FORM>
+
+<BR><BR>
+<FONT SIZE=-2>If you don't understand what <I>check_block</I> and 
+<I>list_source</I> mean, <B>LEAVE THEM BLANK</B>.  We mean it.</FONT>
+
+
+</BODY>
+</HTML>
diff --git a/httemplate/edit/process/router.cgi b/httemplate/edit/process/router.cgi
index 1b7fc3805..7e40c48a7 100644
--- a/httemplate/edit/process/router.cgi
+++ b/httemplate/edit/process/router.cgi
@@ -19,19 +19,16 @@ my $error = '';
 my $routernum  = $cgi->param('routernum');
 my $routername = $cgi->param('routername');
 my $old = qsearchs('router', { routernum => $routernum });
-my @old_rf;
 my @old_psr;
 
 my $new = new FS::router {
-    routernum  => $routernum,
-    routername => $routername,
-    svcnum     => 0
-    };
+  map {
+    ($_, scalar($cgi->param($_)));
+  } fields('router')
+};
 
 if($old) {
-  if($old->routername ne $new->routername) {
-    $error = $new->replace($old);
-  } #else do nothing
+  $error = $new->replace($old);
 } else {
   $error = $new->insert;
   $routernum = $new->routernum;
@@ -49,21 +46,6 @@ if ($old) {
     }
   }
   check($error);
-  @old_rf = $old->router_field;
-  foreach $rf (@old_rf) {
-    if(my $new_val = $cgi->param('rf_'.$rf->routerfieldpart)) {
-      if($new_val ne $rf->value) {
-        my $new_rf = new FS::router_field 
-	  { routernum       => $routernum,
-	    value           => $new_val,
-	    routerfieldpart => $rf->routerfieldpart };
-	$error = $new_rf->replace($rf);
-      } #else do nothing
-    } else {
-      $error = $rf->delete;
-    }
-    check($error);
-  }
 }
 
 foreach($cgi->param) {
@@ -77,23 +59,10 @@ foreach($cgi->param) {
       $error = $new_psr->insert;
     }
     check($error);
-  } elsif($cgi->param($_) ne '' and /^rf_(\d+)$/) {
-    my $part = $1;
-    if(my @x = grep {$_->routerfieldpart == $part} @old_rf) {
-      # already handled all of these
-    } else {
-      my $new_rf = new FS::router_field
-        { routernum       => $routernum,
-	  value           => $cgi->param('rf_'.$part),
-	  routerfieldpart => $part };
-      $error = $new_rf->insert;
-      check($error);
-    }
   }
 }
 
 
-
 # Yay, everything worked!
 $dbh->commit or die $dbh->errstr;
 print $cgi->redirect(popurl(3). "browse/router.cgi");
diff --git a/httemplate/edit/process/svc_broadband.cgi b/httemplate/edit/process/svc_broadband.cgi
index ab8b9f9d8..4912a3a9f 100644
--- a/httemplate/edit/process/svc_broadband.cgi
+++ b/httemplate/edit/process/svc_broadband.cgi
@@ -9,11 +9,10 @@ my $dbh = FS::UID::dbh;
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 my $svcnum = $1;
 
-my $old; my @old_sbf;
+my $old;
 if ( $svcnum ) {
   $old = qsearchs('svc_broadband', { 'svcnum' => $svcnum } )
     or die "fatal: can't find broadband service (svcnum $svcnum)!";
-  @old_sbf = $old->sb_field;
 } else {
   $old = '';
 }
@@ -32,39 +31,6 @@ if ( $svcnum ) {
   $svcnum = $new->svcnum;
 }
 
-unless ($error) {
-  my $sb_field;
-
-  foreach ($cgi->param) {
-    #warn "\$cgi->param $_: " . $cgi->param($_);
-    if(/^sbf_(\d+)/) {
-      my $part = $1;
-      #warn "\$part $part";
-      $sb_field = new FS::sb_field 
-        { svcnum      => $svcnum,
-          value       => $cgi->param($_),
-          sbfieldpart => $part };
-      if (my @x = grep { $_->sbfieldpart eq $part } @old_sbf) {
-      #if (my $old_sb_field = (grep { $_->sbfieldpart eq $part} @old_Sbf)[0]) {
-        #warn "array: " . scalar(@x);
-        if (length($sb_field->value) && ($sb_field->value ne $x[0]->value)) { 
-          #warn "replacing " . $x[0]->value . " with " . $sb_field->value;
-          $error = $sb_field->replace($x[0]);
-          #$error = $sb_field->replace($old_sb_field);
-        } elsif (length($sb_field->value) == 0) { 
-          #warn "delete";
-          $error = $x[0]->delete;
-        }
-      } else {
-        if (length($sb_field->value) > 0) { 
-          #warn "insert";
-          $error = $sb_field->insert;
-        }
-        # else do nothing
-      }
-    }
-  }
-}
 
 if ( $error ) {
   $cgi->param('error', $error);
diff --git a/httemplate/edit/router.cgi b/httemplate/edit/router.cgi
index b524c6494..5c365a21e 100755
--- a/httemplate/edit/router.cgi
+++ b/httemplate/edit/router.cgi
@@ -16,7 +16,6 @@ if ( $cgi->keywords ) {
 
 my $routernum = $router->routernum;
 my $action = $routernum ? 'Edit' : 'Add';
-my $hashref = $router->hashref;
 
 print header("$action Router", menubar(
   'Main Menu' => "$p",
@@ -28,10 +27,13 @@ if($cgi->param('error')) {
 <% } %>
 
 <FORM ACTION="<%=popurl(1)%>process/router.cgi" METHOD=POST>
+  <INPUT TYPE="hidden" NAME="table" VALUE="router">
+  <INPUT TYPE="hidden" NAME="redirect_ok" VALUE="<%=$p3%>/browse/router.cgi">
+  <INPUT TYPE="hidden" NAME="redirect_error" VALUE="<%=$p3%>/edit/router.cgi">
   <INPUT TYPE="hidden" NAME="routernum" VALUE="<%=$routernum%>">
     Router #<%=$routernum or "(NEW)"%>
 
-<BR><BR>Name <INPUT TYPE="text" NAME="routername" SIZE=32 VALUE="<%=$hashref->{routername}%>">
+<BR><BR>Name <INPUT TYPE="text" NAME="routername" SIZE=32 VALUE="<%=$router->routername%>">
 
 <BR><BR>
 Custom fields:
@@ -39,35 +41,11 @@ Custom fields:
 <%=table() %>
 
 <%
-# I know, I know.  Massive false laziness with edit/svc_broadband.cgi.  But 
-# Kristian won't let me generalize the custom field mechanism to every table in 
-# the database, so this is what we get.  <snarl>
-# -- MW
-
-my @part_router_field = qsearch('part_router_field', { });
-my %rf = map { $_->part_router_field->name, $_->value } $router->router_field;
-foreach (sort { $a->name cmp $b->name } @part_router_field) {
-  %>
-  <TR>
-    <TD ALIGN="right"><%=$_->name%></TD>
-    <TD><%
-  if(my @opts = $_->list_values) {
-    %>  <SELECT NAME="rf_<%=$_->routerfieldpart%>" SIZE="1">
-          <%
-    foreach $opt (@opts) {
-      %>  <OPTION VALUE="<%=$opt%>"<%=($opt eq $rf{$_->name}) 
-              ? ' SELECTED' : ''%>>
-            <%=$opt%>
-	  </OPTION>
-   <% } %>
-	</SELECT>
- <% } else { %>
-        <INPUT NAME="rf_<%=$_->routerfieldpart%>"
-        VALUE="<%=$rf{$_->name}%>"
-        <%=$_->length ? 'SIZE="'.$_->length.'"' : ''%>>
-  <% } %></TD>
-  </TR>
-<% } %>
+foreach my $field ($router->virtual_fields) {
+  print $router->pvf($field)->widget('HTML', 'edit', 
+        $router->getfield($field));
+}
+%>
 </TABLE>
 
 
@@ -81,7 +59,7 @@ foreach my $part_svc ( qsearch('part_svc', { svcdb    => 'svc_broadband',
   <BR>
   <INPUT TYPE="checkbox" NAME="svcpart_<%=$part_svc->svcpart%>"<%=
       qsearchs('part_svc_router', { svcpart   => $part_svc->svcpart, 
-                                    routernum => $routernum } ) ? 'CHECKED' : ''%> VALUE="ON">
+                                    routernum => $routernum } ) ? ' CHECKED' : ''%> VALUE="ON">
   <A HREF="<%=${p}%>edit/part_svc.cgi?<%=$part_svc->svcpart%>">
     <%=$part_svc->svcpart%>: <%=$part_svc->svc%></A>
   <% } %>
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 4420bb609..44606d9a0 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -35,8 +35,6 @@ if ( $cgi->param('error') ) {
 
   } else { #adding
 
-    $svc_acct = new FS::svc_acct({}); 
-
     foreach $_ (split(/-/,$query)) {
       $pkgnum=$1 if /^pkgnum(\d+)$/;
       $svcpart=$1 if /^svcpart(\d+)$/;
@@ -44,6 +42,8 @@ if ( $cgi->param('error') ) {
     $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
     die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
 
+    $svc_acct = new FS::svc_acct({svcpart => $svcpart}); 
+
     $svcnum='';
 
     #set gecos
@@ -281,6 +281,14 @@ if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) {
 }
 print '</TD></TR>';
 
+foreach $field ($svc_acct->virtual_fields) {
+  if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
+    # If the flag is X, it won't even show up in $svc_acct->virtual_fields.
+    print $svc_acct->pvf($field)->widget('HTML', 'edit', 
+        $svc_acct->getfield($field));
+  }
+}
+  
 #submit
 print qq!</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">!; 
 
diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index ee7f8becf..6828791c0 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -36,8 +36,6 @@ if ( $cgi->param('error') ) {
 
   } else { #adding
 
-    $svc_broadband = new FS::svc_broadband({});
-
     foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
       $pkgnum=$1 if /^pkgnum(\d+)$/;
       $svcpart=$1 if /^svcpart(\d+)$/;
@@ -45,7 +43,7 @@ if ( $cgi->param('error') ) {
     $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
     die "No part_svc entry!" unless $part_svc;
 
-    $svc_broadband->setfield('svcpart', $svcpart);
+    $svc_broadband = new FS::svc_broadband({ svcpart => $svcpart });
 
     $svcnum='';
 
@@ -159,30 +157,12 @@ Service #<B><%=$svcnum ? $svcnum : "(NEW)"%></B><BR><BR>
 <% } %>
 
 <%
-
-  my @part_sb_field = qsearch('part_sb_field', { svcpart => $svcpart });
-  my $sbf_hashref = $svc_broadband->sb_field_hashref($svcpart);
-  foreach (sort { $a->name cmp $b->name } @part_sb_field) {
-    %>
-    <TR>
-      <TD ALIGN="right"><%=$_->name%></TD>
-      <TD><%
-      if(my @opts = $_->list_values) {
-        %>
-	<SELECT NAME="sbf_<%=$_->sbfieldpart%>" SIZE=1> <%
-        foreach $opt (@opts) { %>
-          <OPTION VALUE="<%=$opt%>"<%=
-	    ($opt eq $sbf_hashref->{$_->name}) ? ' SELECTED' : ''%>>
-	    <%=$opt%></OPTION><%
-        } %></SELECT>
-   <% } else { %>
-        <INPUT NAME="sbf_<%=$_->sbfieldpart%>"
-	    VALUE="<%=$sbf_hashref->{$_->name}%>"
-     <%=$_->length ? 'SIZE="'.$_->length.'"' : ''%>>
-   <% } %>
-      </TD>
-    </TR>
-<% } %>
+foreach $field ($svc_broadband->virtual_fields) {
+  if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
+    print $svc_broadband->pvf($field)->widget('HTML', 'edit',
+        $svc_broadband->getfield($field));
+  }
+} %>
   </TABLE>
   <BR>
   <INPUT TYPE="submit" NAME="submit" VALUE="Submit">
diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index d2c9ade5c..043af610b 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -29,12 +29,12 @@ if ( $cgi->param('error') ) {
 
   } else { #adding
 
-    $svc_www = new FS::svc_www({});
-
     foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
       $pkgnum=$1 if /^pkgnum(\d+)$/;
       $svcpart=$1 if /^svcpart(\d+)$/;
     }
+    $svc_www = new FS::svc_www { svcpart => $svcpart };
+
     $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
     die "No part_svc entry!" unless $part_svc;
 
@@ -167,6 +167,14 @@ foreach $_ (keys %username) {
 }
 print "</SELECT></TD></TR>";
 
+foreach $field ($svc_www->virtual_fields) {
+  if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
+    # If the flag is X, it won't even show up in $svc_acct->virtual_fields.
+    print $svc_www->pvf($field)->widget('HTML', 'edit', 
+        $svc_www->getfield($field));
+  }
+}
+
 print '</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">';
 
 print <<END;
diff --git a/httemplate/index.html b/httemplate/index.html
index 017ffcd88..1895f2912 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -11,7 +11,7 @@
     </td><td>
       <font color="#ff0000" size=7>freeside main menu</font>
     </td><td align=right valign=bottom>
-      version %%%VERSION%%%
+      version 1.5.0pre2
       <BR><A HREF="http://www.sisd.com/freeside">Freeside home page</A>
       <BR><A HREF="docs/">Documentation</A>
     </td></tr>
@@ -199,10 +199,8 @@
             - Points of Presence 
           <LI><A HREF="browse/part_bill_event.cgi">View/Edit invoice events</A> - Actions for overdue invoices
 	  <LI><A HREF="browse/msgcat.cgi">View/Edit message catalog</A> - Change error messages and other customizable labels.
-	  <LI><A HREF="browse/part_sb_field.cgi">View/Edit custom svc_broadband fields</A>
-	  - Custom broadband service fields for site-specific export/informational data.
-	  <LI><A HREF="browse/generic.cgi?part_router_field">View/Edit custom router fields</A>
-	  - Custom router fields for site-specific export data.
+    <LI><A HREF="browse/part_virtual_field.cgi">View/Edit virtual fields</A>
+	  - Locally defined fields
 	  <LI><A HREF="browse/router.cgi">View/Edit routers</A>
 	  - Broadband access routers
 	  <LI><A HREF="browse/addr_block.cgi">View/Edit address blocks</A>
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 599c1d8b9..4e01db341 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -172,7 +172,7 @@ if ($svc_acct->slipip) {
           : $svc_acct->slipip
         ). "</TD>";
   my($attribute);
-  foreach $attribute ( grep /^radius_/, fields('svc_acct') ) {
+  foreach $attribute ( grep /^radius_/, $svc_acct->fields ) {
     #warn $attribute;
     $attribute =~ /^radius_(.*)$/;
     my $pattribute = $FS::raddb::attrib{$1};
@@ -180,7 +180,7 @@ if ($svc_acct->slipip) {
           "<TD BGCOLOR=\"#ffffff\">". $svc_acct->getfield($attribute).
           "</TD></TR>";
   }
-  foreach $attribute ( grep /^rc_/, fields('svc_acct') ) {
+  foreach $attribute ( grep /^rc_/, $svc_acct->fields ) {
     #warn $attribute;
     $attribute =~ /^rc_(.*)$/;
     my $pattribute = $FS::raddb::attrib{$1};
@@ -195,7 +195,19 @@ if ($svc_acct->slipip) {
 print '<TR><TD ALIGN="right">RADIUS groups</TD><TD BGCOLOR="#ffffff">'.
       join('<BR>', $svc_acct->radius_groups). '</TD></TR>';
 
-print '</TABLE></TD></TR></TABLE><BR><BR>';
+# Can this be abstracted further?  Maybe a library function like
+# widget('HTML', 'view', $svc_acct) ?  It would definitely make UI 
+# style management easier.
+
+foreach (sort { $a cmp $b } $svc_acct->virtual_fields) {
+  print $svc_acct->pvf($_)->widget('HTML', 'view', $svc_acct->getfield($_)),
+      "\n";
+}
+%>
+</TABLE></TD></TR></TABLE>
+<%
+
+print '<BR><BR>';
 
 print join("\n", $conf->config('svc_acct-notes') ). '<BR><BR>'.
       joblisting({'svcnum'=>$svcnum}, 1). '</BODY></HTML>';
diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index 164b5b22c..677a4b058 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -64,26 +64,12 @@ print header('Broadband Service View', menubar(
         qq!<TD BGCOLOR="#ffffff">$ip_addr</TD></TR>!.
       '</TD></TR><TR ROWSPAN="1"><TD></TD></TR>';
 
+foreach (sort { $a cmp $b } $svc_broadband->virtual_fields) {
+  print $svc_broadband->pvf($_)->widget('HTML', 'view', 
+      $svc_broadband->getfield($_)), "\n";
+}
 
-#  foreach my $sb_field 
-#      ( qsearch('sb_field', { svcnum => $svcnum }) ) {
-#    my $part_sb_field = qsearchs('part_sb_field',
-#                         { sbfieldpart => $sb_field->sbfieldpart });
-#    print q!<TR><TD ALIGN="right">! . $part_sb_field->name . 
-#          q!</TD><TD BGCOLOR="#ffffff">! . $sb_field->value . 
-#          q!</TD></TR>!;
-#  }
-#  print '</TABLE>';
-
-
-  my $sb_field = $svc_broadband->sb_field_hashref;
-  foreach (sort { $a cmp $b } keys(%{$sb_field})) {
-    print q!<TR><TD ALIGN="right">! . $_ . 
-          q!</TD><TD BGCOLOR="#ffffff">! . $sb_field->{$_} .
-          q!</TD></TR>!;
-  }
-  print '</TABLE>';
-
+print '</TABLE>';
 
 print '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
       '</BODY></HTML>'
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index c8d1d6213..5d619de54 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -61,7 +61,14 @@ print qq!<A HREF="${p}edit/svc_forward.cgi?$svcnum">Edit this information</A>!.
       qq!<TR><TD ALIGN="right">Email to</TD>!.
         qq!<TD BGCOLOR="#ffffff">$source</TD></TR>!.
       qq!<TR><TD ALIGN="right">Forwards to </TD>!.
-        qq!<TD BGCOLOR="#ffffff">$destination</TD></TR></TABLE>!.
+        qq!<TD BGCOLOR="#ffffff">$destination</TD></TR>!;
+
+foreach (sort { $a cmp $b } $svc_forward->virtual_fields) {
+  print $svc_forward->pvf($_)->widget('HTML', 'view', $svc_forward->getfield($_)),
+      "\n";
+}
+
+print qq!  </TABLE>!.
       '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
       '</BODY></HTML>'
 ;
diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index 442614491..7a716b4b8 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -47,8 +47,15 @@ print header('Website View', menubar(
       qq!<TR><TD ALIGN="right">Website name</TD>!.
         qq!<TD BGCOLOR="#ffffff"><A HREF="http://$www">$www<A></TD></TR>!.
       qq!<TR><TD ALIGN="right">Account</TD>!.
-        qq!<TD BGCOLOR="#ffffff"><A HREF="${p}view/svc_acct.cgi?$usersvc">$email</A></TD></TR>!.
-      '</TABLE></TD></TR></TABLE>'.
+        qq!<TD BGCOLOR="#ffffff"><A HREF="${p}view/svc_acct.cgi?$usersvc">$email</A></TD></TR>!;
+
+foreach (sort { $a cmp $b } $svc_www->virtual_fields) {
+  print $svc_www->pvf($_)->widget('HTML', 'view', $svc_www->getfield($_)),
+      "\n";
+}
+
+
+print '</TABLE></TD></TR></TABLE>'.
       '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
       '</BODY></HTML>'
 ;
-- 
cgit v1.2.1


From d38d8201fb8d7f18b199cf8805c17c0121dd1288 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Tue, 5 Aug 2003 00:32:35 +0000
Subject: Fixed %%%VERSION%%% tag

---
 httemplate/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index 1895f2912..3e87af716 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -11,7 +11,7 @@
     </td><td>
       <font color="#ff0000" size=7>freeside main menu</font>
     </td><td align=right valign=bottom>
-      version 1.5.0pre2
+       version %%%VERSION%%%
       <BR><A HREF="http://www.sisd.com/freeside">Freeside home page</A>
       <BR><A HREF="docs/">Documentation</A>
     </td></tr>
-- 
cgit v1.2.1


From 49ba3cd359748f5fa3e1b0087840a23c5838d1ab Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Aug 2003 18:45:11 +0000
Subject: backwards compatibility if the schema hasn't been updated

---
 FS/FS/Record.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 9d82d949b..1fe51e065 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1369,12 +1369,14 @@ be exported, and should only be called as an instance or class method.
 =cut
 
 sub virtual_fields {
-  my $something = shift;
+  my $self = shift;
   my $table;
-  $table = $something->table or confess "virtual_fields called on non-table";
+  $table = $self->table or confess "virtual_fields called on non-table";
 
   confess "Unknown table $table" unless $dbdef->table($table);
 
+  return () unless $self->dbdef->table('part_virtual_field');
+
   # This should be smart enough to cache results.
 
   my $query = 'SELECT name from part_virtual_field ' .
-- 
cgit v1.2.1


From aab3b1fcf812e2ba28834faf558203c88e66fa48 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Aug 2003 18:52:39 +0000
Subject: remove spurious re-use of $error

---
 FS/FS/svc_domain.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index ff0fa2f61..10d5d8f5c 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -342,9 +342,8 @@ sub check {
     return "Unknown catchall" unless $svc_acct;
   }
 
-  my $error = $self->ut_textn('purpose')
-           or $self->SUPER::check;
-  return $error if $error;
+  $self->ut_textn('purpose')
+    or $self->SUPER::check;
 
 }
 
-- 
cgit v1.2.1


From 2f23a1347c69ebe9a36efcd67f506fe253fefac1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Aug 2003 19:07:18 +0000
Subject: update sqlradius{_withdomain} documentation

---
 FS/FS/part_export.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index ab0a4b566..1374672b7 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -912,17 +912,17 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
     },
 
     'sqlradius' => {
-      'desc' => 'Real-time export to SQL-backed RADIUS (ICRADIUS, FreeRADIUS)',
+      'desc' => 'Real-time export to SQL-backed RADIUS (FreeRADIUS, ICRADIUS, Radiator)',
       'options' => \%sqlradius_options,
       'nodomain' => 'Y',
-      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  This export does not export RADIUS realms (see also sqlradius_withdomain).  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.',
+      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a>, <a href="http://radius.innercite.com/">ICRADIUS</a> or <a href="http://www.open.com.au/radiator/">Radiator</a>.  This export does not export RADIUS realms (see also sqlradius_withdomain).  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.<ul><li>Using FreeRADIUS 0.9.0 with the PostgreSQL backend, the db_postgresql.sql schema and postgresql.conf queries contain incompatible changes.  This will be fixed in 0.9.1 - until then, use the schema and queries from 0.8.1 or CVS.  Only new installs with 0.9.0 and PostgreSQL are affected - upgrades and other database backends and versions are unaffected.<li>Using ICRADIUS, add a dummy "op" column to your database: <blockquote><code>ALTER&nbsp;TABLE&nbsp;radcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'</code></blockquote><li>Using Radiator, see the <a href="http://www.open.com.au/radiator/faq.html#38">Radiator FAQ</a> for configuration information.</ul>',
     },
 
     'sqlradius_withdomain' => {
-      'desc' => 'Real-time export to SQL-backed RADIUS (ICRADIUS, FreeRADIUS) with realms',
+      'desc' => 'Real-time export to SQL-backed RADIUS (FreeRADIUS, ICRADIUS, Radiator) with realms',
       'options' => \%sqlradius_withdomain_options,
       'nodomain' => '',
-      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a> or <a href="http://radius.innercite.com/">ICRADIUS</a>.  This export exports domains to RADIUS realms (see also sqlradius).  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.',
+      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a>, <a href="http://radius.innercite.com/">ICRADIUS</a> or <a href="http://www.open.com.au/radiator/">Radiator</a>.  This export exports domains to RADIUS realms (see also sqlradius).  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.<ul><li>Using FreeRADIUS 0.9.0 with the PostgreSQL backend, the db_postgresql.sql schema and postgresql.conf queries contain incompatible changes.  This will be fixed in 0.9.1 - until then, use the schema and queries from 0.8.1 or CVS.  Only new installs with 0.9.0 and PostgreSQL are affected - upgrades and other database backends and versions are unaffected.<li>Using ICRADIUS, add a dummy "op" column to your database: <blockquote><code>ALTER&nbsp;TABLE&nbsp;radcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'</code></blockquote><li>Using Radiator, see the <a href="http://www.open.com.au/radiator/faq.html#38">Radiator FAQ</a> for configuration information.</ul>',
     },
 
     'sqlmail' => {
-- 
cgit v1.2.1


From aba697b7bf6a38c51d43612051ba7f7b5740f30f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Aug 2003 20:06:53 +0000
Subject: no svc_acct_sm in 1.5

---
 htetc/handler.pl      | 1 -
 htetc/handler.pl-1.0x | 1 -
 2 files changed, 2 deletions(-)

diff --git a/htetc/handler.pl b/htetc/handler.pl
index c81db8664..2b645cef4 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -108,7 +108,6 @@ sub handler
       use FS::session;
       use FS::svc_acct;
       use FS::svc_acct_pop qw(popselector);
-      use FS::svc_acct_sm;
       use FS::svc_domain;
       use FS::svc_forward;
       use FS::svc_www;
diff --git a/htetc/handler.pl-1.0x b/htetc/handler.pl-1.0x
index def579f49..cae53231d 100644
--- a/htetc/handler.pl-1.0x
+++ b/htetc/handler.pl-1.0x
@@ -103,7 +103,6 @@ sub handler
       use FS::session;
       use FS::svc_acct;
       use FS::svc_acct_pop qw(popselector);
-      use FS::svc_acct_sm;
       use FS::svc_domain;
       use FS::svc_forward;
       use FS::svc_www;
-- 
cgit v1.2.1


From 117a674a7e37ff2f4f90fcf34710dfad288ac8a9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Aug 2003 21:00:43 +0000
Subject: doh, revert stuff that shouldn't have been checked in

---
 httemplate/browse/part_pkg.cgi | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 7b9436cee..2a167e8d6 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -24,7 +24,9 @@ if ( $cgi->param('active') ) {
     $num_active_cust_pkg{$part_pkg->pkgpart} =
       $active_sth->fetchrow_arrayref->[0];
   }
-  $sortby = \*active_cust_pkg_sort;
+  $sortby = sub {
+    $num_active_cust_pkg{$b->pkgpart} <=> $num_active_cust_pkg{$a->pkgpart};
+  };
 } else {
   $sortby = \*pkgpart_sort;
 }
@@ -132,13 +134,8 @@ print <<END;
 </HTML>
 END
 
-
 sub pkgpart_sort {
   $a->pkgpart <=> $b->pkgpart;
 }
 
-sub active_cust_pkg_sort {
-  $num_active_cust_pkg{$b->pkgpart} <=> $num_active_cust_pkg{$a->pkgpart};
-}
-
 %>
-- 
cgit v1.2.1


From abf5c5442afce5198f6289840791c96f58254e85 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 7 Aug 2003 12:47:27 +0000
Subject: - switch to mason by default - minimum mason version 1.1 (and doc) -
 evaluate .html files with mason/asp - turn on profiling with mason like with
 Apache::ASP (redirects not working) - (start of) includes

---
 Makefile                       |   4 +-
 htetc/global.asa               |  11 ++-
 htetc/handler.pl               |  50 ++++++++-----
 htetc/handler.pl-1.0x          | 157 -----------------------------------------
 httemplate/autohandler         |  23 ++++++
 httemplate/docs/install.html   |  10 +--
 httemplate/docs/upgrade10.html |   2 +-
 httemplate/index.html          |   2 +-
 8 files changed, 74 insertions(+), 185 deletions(-)
 delete mode 100644 htetc/handler.pl-1.0x
 create mode 100644 httemplate/autohandler

diff --git a/Makefile b/Makefile
index 6256ccc3e..13e8cf095 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ DATASOURCE = DBI:Pg:dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-TEMPLATE = asp
-#TEMPLATE = mason
+#TEMPLATE = asp
+TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 MASON_HANDLER = /usr/local/etc/freeside/handler.pl
diff --git a/htetc/global.asa b/htetc/global.asa
index 6f76fd256..21e112e6b 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -72,7 +72,8 @@ sub Script_OnStart {
   &cgisuidsetup($cgi);
   $p = popurl(2);
   #print $cgi->header( '-expires' => 'now' );
-  dbh->{'private_profile'} = {} if dbh->can('sprintProfile');
+  #dbh->{'private_profile'} = {} if dbh->can('sprintProfile');
+  dbh->{'private_profile'} = {} if UNIVERSAL::can(dbh, 'sprintProfile') );
 
   #really should check for FS::Profiler or something
     # Devel::AutoProfiler _our_ VERSION?  thanks a fucking lot
@@ -109,7 +110,7 @@ sub Script_OnFlush {
   #$$ref = $cgi->header() . $$ref;
   #warn "Script_OnFlush called with dbh ". dbh. "\n";
   #if ( dbh->can('sprintProfile') ) {
-  if ( UNIVERSAL::can(dbh,'sprintProfile') ) {
+  if ( UNIVERSAL::can(dbh, 'sprintProfile') ) {
     #warn "dbh can sprintProfile\n";
     if ( lc($Response->{ContentType}) eq 'text/html' ) { #con
       #warn "contenttype is sprintProfile\n";
@@ -137,7 +138,11 @@ if ( defined(@DBIx::Profile::ISA) ) {
     my $page =
       $cgi->header.
       qq!<HTML><BODY>Redirect to <A HREF="$location">$location</A><BR><BR>!.
-      '<PRE>'. encode_entities(dbh->sprintProfile()).
+      '<PRE>'.
+        ( UNIVERSAL::can(dbh, 'sprintProfile')
+            ? encode_entities(dbh->sprintProfile())
+            : 'DBIx::Profile missing sprintProfile method;'.
+              'unpatched or too old?'                        ).
       "\n\n". &sprintAutoProfile().  '</PRE>'.
       '</BODY></HTML>';
     dbh->{'private_profile'} = {};
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 2b645cef4..b28cfe9e2 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -7,7 +7,7 @@
 package HTML::Mason;
 
 # Bring in main Mason package.
-use HTML::Mason;
+use HTML::Mason 1.1;
 
 # Bring in ApacheHandler, necessary for mod_perl integration.
 # Uncomment the second line (and comment the first) to use
@@ -120,29 +120,47 @@ sub handler
       use FS::export_svc;
       use FS::msgcat;
 
-      *CGI::redirect = sub {
+      *notCGI::redirect = sub {
         my( $self, $location ) = @_;
         use vars qw($m);
-        #http://www.masonhq.com/docs/faq/#how_do_i_do_an_external_redirect
-        $m->clear_buffer;
-        # The next two lines are necessary to stop Apache from re-reading
-        # POSTed data.
-        $r->method('GET');
-        $r->headers_in->unset('Content-length');
-        $r->content_type('text/html');
-        #$r->err_header_out('Location' => $location);
-        $r->header_out('Location' => $location);
-         $r->header_out('Content-Type' => 'text/html');
-         $m->abort(302);
-
-        '';
+
+        if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect
+
+       #   my $page =
+
+
+       #   return $page;
+
+        } else { #normal redirect
+
+          #http://www.masonhq.com/docs/faq/#how_do_i_do_an_external_redirect
+          $m->clear_buffer;
+          # The next two lines are necessary to stop Apache from re-reading
+          # POSTed data.
+          $r->method('GET');
+          $r->headers_in->unset('Content-length');
+          $r->content_type('text/html');
+          #$r->err_header_out('Location' => $location);
+          $r->header_out('Location' => $location);
+          $r->header_out('Content-Type' => 'text/html');
+          $m->abort(302);
+
+          '';
+         }
+
       };
 
       $cgi = new CGI;
       &cgisuidsetup($cgi);
       #&cgisuidsetup($r);
       $p = popurl(2);
-    }
+
+      sub include {
+        use vars qw($m);
+        $m->scomp(@_);
+      }
+
+    } # end package HTML::Mason::Commands;
 
     $r->content_type('text/html');
     #eorar
diff --git a/htetc/handler.pl-1.0x b/htetc/handler.pl-1.0x
deleted file mode 100644
index cae53231d..000000000
--- a/htetc/handler.pl-1.0x
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/usr/bin/perl
-#
-# This is a basic, fairly fuctional Mason handler.pl.
-#
-# For something a little more involved, check out session_handler.pl
-
-package HTML::Mason;
-
-# Bring in main Mason package.
-use HTML::Mason;
-
-# Bring in ApacheHandler, necessary for mod_perl integration.
-# Uncomment the second line (and comment the first) to use
-# Apache::Request instead of CGI.pm to parse arguments.
-use HTML::Mason::ApacheHandler;
-# use HTML::Mason::ApacheHandler (args_method=>'mod_perl');
-
-# Uncomment the next line if you plan to use the Mason previewer.
-#use HTML::Mason::Preview;
-
-use strict;
-
-# List of modules that you want to use from components (see Admin
-# manual for details)
-#{  package HTML::Mason::Commands;
-#   use CGI;
-#}
-
-# Create Mason objects
-#
-my $parser = new HTML::Mason::Parser;
-my $interp = new HTML::Mason::Interp (parser=>$parser,
-                                      comp_root=>'/var/www/freeside',
-                                      data_dir=>'/usr/local/etc/freeside/masondata',
-                                      out_mode=>'stream',
-                                     );
-my $ah = new HTML::Mason::ApacheHandler ( interp => $interp,
-                                          #auto_send_headers => 0,
-                                        );
-
-# Activate the following if running httpd as root (the normal case).
-# Resets ownership of all files created by Mason at startup.
-#
-chown (Apache->server->uid, Apache->server->gid, $interp->files_written);
-
-sub handler
-{
-    my ($r) = @_;
-
-    # If you plan to intermix images in the same directory as
-    # components, activate the following to prevent Mason from
-    # evaluating image files as components.
-    #
-    #return -1 if $r->content_type && $r->content_type !~ m|^text/|i;
-
-    #rar
-    { package HTML::Mason::Commands;
-      use strict;
-      use vars qw( $cgi $p );
-      use CGI;
-      #use CGI::Carp qw(fatalsToBrowser);
-      use Date::Format;
-      use Date::Parse;
-      use Time::Local;
-      use Tie::IxHash;
-      use HTML::Entities;
-      use IO::Handle;
-      use IO::File;
-      use String::Approx qw(amatch);
-      use Chart::LinesPoints;
-      use HTML::Widgets::SelectLayers 0.02;
-      use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
-      use FS::Record qw(qsearch qsearchs fields dbdef);
-      use FS::Conf;
-      use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
-                     small_custview myexit http_header);
-      use FS::Msgcat qw(gettext geterror);
-
-      use FS::agent;
-      use FS::agent_type;
-      use FS::domain_record;
-      use FS::cust_bill;
-      use FS::cust_bill_pay;
-      use FS::cust_credit;
-      use FS::cust_credit_bill;
-      use FS::cust_main;
-      use FS::cust_main_county;
-      use FS::cust_pay;
-      use FS::cust_pkg;
-      use FS::cust_refund;
-      use FS::cust_svc;
-      use FS::nas;
-      use FS::part_bill_event;
-      use FS::part_pkg;
-      use FS::part_referral;
-      use FS::part_svc;
-      use FS::part_svc_router;
-      use FS::part_virtual_field;
-      use FS::pkg_svc;
-      use FS::port;
-      use FS::queue qw(joblisting);
-      use FS::raddb;
-      use FS::session;
-      use FS::svc_acct;
-      use FS::svc_acct_pop qw(popselector);
-      use FS::svc_domain;
-      use FS::svc_forward;
-      use FS::svc_www;
-      use FS::router;
-      use FS::addr_block;
-      use FS::svc_broadband;
-      use FS::type_pkgs;
-      use FS::part_export;
-      use FS::part_export_option;
-      use FS::export_svc;
-      use FS::msgcat;
-
-      *CGI::redirect = sub {
-        my( $self, $location ) = @_;
-
-        #http://www.masonhq.com/docs/faq/#how_do_i_do_an_external_redirect
-        $m->clear_buffer;
-        # The next two lines are necessary to stop Apache from re-reading
-        # POSTed data.
-        $r->method('GET');
-        $r->headers_in->unset('Content-length');
-        $r->content_type('text/html');
-        #$r->err_header_out('Location' => $location);
-        $r->header_out('Location' => $location);
-         $r->header_out('Content-Type' => 'text/html');
-         $m->abort(302);
-
-        '';
-      };
-
-      $cgi = new CGI;
-      &cgisuidsetup($cgi);
-      #&cgisuidsetup($r);
-      $p = popurl(2);
-    }
-
-    $r->content_type('text/html');
-    #eorar
-
-    my $headers = $r->headers_out;
-    $headers->{'Pragma'} = $headers->{'Cache-control'} = 'no-cache';
-    #$r->no_cache(1);
-    $headers->{'Expires'} = '0';
-
-#    $r->send_http_header;
-
-    my $status = $ah->handle_request($r);
-
-    $status;
-}
-
-1;
diff --git a/httemplate/autohandler b/httemplate/autohandler
new file mode 100644
index 000000000..e6e50d5bd
--- /dev/null
+++ b/httemplate/autohandler
@@ -0,0 +1,23 @@
+% $m->call_next;
+
+<%init>
+  dbh->{'private_profile'} = {} if UNIVERSAL::can(dbh, 'sprintProfile');
+</%init>
+
+<%filter>
+
+my $profile = '';
+if ( UNIVERSAL::can(dbh, 'sprintProfile') ) {
+
+  #if contenttype is text/html!!  **FIXME**
+
+    $profile = '<PRE>'. ("\n"x4096). encode_entities(dbh->sprintProfile()).
+               #"\n\n". &sprintAutoProfile(). '</PRE>';
+               "\n\n".                        '</PRE>';
+  #endif
+
+  dbh->{'private_profile'} = {};
+}
+
+s/(<\/BODY>[\s\n]*<\/HTML>[\s\n]*)$/$profile$1/i;
+</%filter>
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 54614ccb3..463575c53 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -130,8 +130,8 @@ cp&nbsp;htetc/global.asa&nbsp;/usr/local/etc/freeside/asp-global/global.asa
 <font size="-1"><pre>
 PerlModule Apache::ASP
 &lt;Directory&nbsp;/usr/local/apache/htdocs/freeside-asp&gt;
-&lt;Files ~ (\.cgi)&gt;
-AddHandler perl-script .cgi
+&lt;Files ~ (\.cgi|\.html)&gt;
+SetHandler perl-script
 PerlHandler Apache::ASP
 &lt;/Files&gt;
 &lt;Perl&gt;
@@ -145,7 +145,7 @@ PerlSetVar Debug 2
     <td><ul>
       <li>Run <tt>make masondocs</tt>
       <li>Copy <tt>masondocs/</tt> to your web server's document space. (For example: <tt>/usr/local/apache/htdocs/freeside-mason</tt>)
-      <li>Copy <tt>htetc/handler.pl</tt> to <tt>/usr/local/etc/freeside</tt> (use htetc/handler.pl-1.0x for Mason versions before 1.10).
+      <li>Copy <tt>htetc/handler.pl</tt> to <tt>/usr/local/etc/freeside</tt>
       <li>Edit <tt>handler.pl</tt> and:
       <ul>
         <li> set an appropriate <tt>comp_root</tt>, such as <tt>/usr/local/apache/htdocs/freeside-mason</tt>
@@ -156,8 +156,8 @@ PerlSetVar Debug 2
 <font size="-1"><pre>
 PerlModule HTML::Mason
 &lt;Directory&nbsp;/usr/local/apache/htdocs/freeside-mason&gt;
-&lt;Files ~ (\.cgi)&gt;
-AddHandler perl-script .cgi
+&lt;Files ~ (\.cgi|.html)&gt;
+SetHandler perl-script
 PerlHandler HTML::Mason
 &lt;/Files&gt;
 &lt;Perl&gt;
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 4c2c17b85..d7a8c7468 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -99,6 +99,6 @@ dbdef-create username
 create-history-tables username cust_bill_pkg_detail router part_svc_router addr_block svc_broadband
 dbdef-create username
 
-
+apache - fix <Files> sections to include .html also
 
 </pre>
diff --git a/httemplate/index.html b/httemplate/index.html
index 3e87af716..99b321f30 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -12,7 +12,7 @@
       <font color="#ff0000" size=7>freeside main menu</font>
     </td><td align=right valign=bottom>
        version %%%VERSION%%%
-      <BR><A HREF="http://www.sisd.com/freeside">Freeside home page</A>
+      <BR><A HREF="http://www.sisd.com/freeside">Freeside&nbsp;home&nbsp;page</A>
       <BR><A HREF="docs/">Documentation</A>
     </td></tr>
   </table>
-- 
cgit v1.2.1


From 69ecd0e15d3de36b56ad133d5ae57dcddc53c63e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 7 Aug 2003 13:08:00 +0000
Subject: - turn on profiling with mason like with Apache::ASP (redirects now
 working) - fix mason error with new view/cust_main.cgi UI

---
 htetc/global.asa              |   4 +-
 htetc/handler.pl              |  18 ++--
 httemplate/view/cust_main.cgi | 195 ++++++++++++++++++++++--------------------
 3 files changed, 118 insertions(+), 99 deletions(-)

diff --git a/htetc/global.asa b/htetc/global.asa
index 21e112e6b..c7056fc03 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -137,8 +137,8 @@ if ( defined(@DBIx::Profile::ISA) ) {
     my( $self, $location) = @_;
     my $page =
       $cgi->header.
-      qq!<HTML><BODY>Redirect to <A HREF="$location">$location</A><BR><BR>!.
-      '<PRE>'.
+      qq!<HTML><BODY>Redirect to <A HREF="$location">$location</A>!.
+      '<BR><BR><PRE>'.
         ( UNIVERSAL::can(dbh, 'sprintProfile')
             ? encode_entities(dbh->sprintProfile())
             : 'DBIx::Profile missing sprintProfile method;'.
diff --git a/htetc/handler.pl b/htetc/handler.pl
index b28cfe9e2..8f079af33 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -120,16 +120,24 @@ sub handler
       use FS::export_svc;
       use FS::msgcat;
 
-      *notCGI::redirect = sub {
+      *CGI::redirect = sub {
         my( $self, $location ) = @_;
         use vars qw($m);
 
         if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect
 
-       #   my $page =
-
-
-       #   return $page;
+          my $page =
+            qq!<HTML><BODY>Redirect to <A HREF="$location">$location</A>!.
+            '<BR><BR><PRE>'.
+              ( UNIVERSAL::can(dbh, 'sprintProfile')
+                  ? encode_entities(dbh->sprintProfile())
+                  : 'DBIx::Profile missing sprintProfile method;'.
+                    'unpatched or too old?'                        ).
+            #"\n\n". &sprintAutoProfile().  '</PRE>'.
+            "\n\n".                         '</PRE>'.
+            '</BODY></HTML>';
+          dbh->{'private_profile'} = {};
+          return $page;
 
         } else { #normal redirect
 
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index c36c9e265..f1afdb570 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -370,7 +370,7 @@ print qq!<BR><A NAME="cust_pkg">Packages</A> !,
 
 #get package info
 
-my $packages = get_packages($cust_main);
+my $packages = get_packages($cust_main, $conf);
 
 if ( @$packages ) {
 %>
@@ -401,27 +401,27 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
     <%=$pkg->{pkg}%> - <%=$pkg->{comment}%> (&nbsp;<%=pkg_details_link($pkg)%>&nbsp;)<BR>
 <% unless ($pkg->{cancel}) { %>
     (&nbsp;<%=pkg_change_link($pkg)%>&nbsp;)
-    (&nbsp;<%=pkg_dates_link($pkg)%>&nbsp;|&nbsp;<%=pkg_customize_link($pkg)%>&nbsp;)
+    (&nbsp;<%=pkg_dates_link($pkg)%>&nbsp;|&nbsp;<%=pkg_customize_link($pkg,$custnum)%>&nbsp;)
 <% } %>
   </TD>
 <%
   #foreach (qw(setup last_bill next_bill susp expire cancel)) {
-  #  print qq!  <TD ROWSPAN=$rowspan>! . pkg_datestr($pkg,$_) . qq!</TD>\n!;
+  #  print qq!  <TD ROWSPAN=$rowspan>! . pkg_datestr($pkg,$_,$conf) . qq!</TD>\n!;
   #}
   print "<TD ROWSPAN=$rowspan>". &itable('');
 
-  #move
-  my %freq = (
-    1 => 'monthly',
-    2 => 'bi-monthly',
-    3 => 'quarterly',
-    6 => 'semi-annually',
-    12 => 'annually',
-    24 => 'bi-annually',
-    36 => 'tri-annually',
-  );
-
   sub freq {
+
+    my %freq = ( #move this
+      1 => 'monthly',
+      2 => 'bi-monthly',
+      3 => 'quarterly',
+      6 => 'semi-annually',
+      12 => 'annually',
+      24 => 'bi-annually',
+      36 => 'tri-annually',
+    );
+
     my $freq = shift;
     exists $freq{$freq} ? $freq{$freq} : "every&nbsp;$freq&nbsp;months";
   }
@@ -431,17 +431,17 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
   if ( $pkg->{cancel} ) { #status: cancelled
 
     print '<TR><TD><FONT COLOR="#ff0000"><B>Cancelled&nbsp;</B></FONT></TD>'.
-          '<TD>'. pkg_datestr($pkg,'cancel'). '</TD></TR>';
+          '<TD>'. pkg_datestr($pkg,'cancel',$conf). '</TD></TR>';
     unless ( $pkg->{setup} ) {
       print '<TR><TD COLSPAN=2>Never billed</TD></TR>';
     } else {
       print "<TR><TD>Setup&nbsp;</TD><TD>".
-            pkg_datestr($pkg, 'setup'). '</TD></TR>';
+            pkg_datestr($pkg, 'setup',$conf). '</TD></TR>';
       print "<TR><TD>Last&nbsp;bill&nbsp;</TD><TD>".
-            pkg_datestr($pkg, 'last_bill'). '</TD></TR>'
+            pkg_datestr($pkg, 'last_bill',$conf). '</TD></TR>'
         if $pkg->{'last_bill'};
       print "<TR><TD>Suspended&nbsp;</TD><TD>".
-            pkg_datestr($pkg, 'susp'). '</TD></TR>'
+            pkg_datestr($pkg, 'susp',$conf). '</TD></TR>'
         if $pkg->{'susp'};
     }
 
@@ -449,19 +449,19 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
 
     if ( $pkg->{susp} ) { #status: suspended
       print '<TR><TD><FONT COLOR="#FF9900"><B>Suspended</B>&nbsp;</FONT></TD>'.
-            '<TD>'. pkg_datestr($pkg,'susp'). '</TD></TR>';
+            '<TD>'. pkg_datestr($pkg,'susp',$conf). '</TD></TR>';
       unless ( $pkg->{setup} ) {
         print '<TR><TD COLSPAN=2>Never billed</TD></TR>';
       } else {
         print "<TR><TD>Setup&nbsp;</TD><TD>". 
-              pkg_datestr($pkg, 'setup'). '</TD></TR>';
+              pkg_datestr($pkg, 'setup',$conf). '</TD></TR>';
       }
       print "<TR><TD>Last&nbsp;bill&nbsp;</TD><TD>".
-            pkg_datestr($pkg, 'last_bill'). '</TD></TR>'
+            pkg_datestr($pkg, 'last_bill',$conf). '</TD></TR>'
         if $pkg->{'last_bill'};
       # next bill ??
       print "<TR><TD>Expires&nbsp;</TD><TD>".
-            pkg_datestr($pkg, 'expire'). '</TD></TR>'
+            pkg_datestr($pkg, 'expire',$conf). '</TD></TR>'
         if $pkg->{'expire'};
       print '<TR><TD COLSPAN=2>(&nbsp;'. pkg_unsuspend_link($pkg).
             '&nbsp;|&nbsp;'. pkg_cancel_link($pkg). '&nbsp;)</TD></TR>';
@@ -484,24 +484,24 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
         unless ( $pkg->{freq} ) {
           print "<TR><TD COLSPAN=2>One-time&nbsp;charge</TD></TR>".
                 '<TR><TD>Billed&nbsp;</TD><TD>'.
-                pkg_datestr($pkg,'setup'). '</TD></TR>';
+                pkg_datestr($pkg,'setup',$conf). '</TD></TR>';
         } else {
           print '<TR><TD COLSPAN=2><FONT COLOR="#00CC00"><B>Active</B></FONT>'.
                 ',&nbsp;billed&nbsp;'. freq($pkg->{freq}). '</TD></TR>'.
                 '<TR><TD>Setup&nbsp;</TD><TD>'.
-                pkg_datestr($pkg, 'setup'). '</TD></TR>';
+                pkg_datestr($pkg, 'setup',$conf). '</TD></TR>';
         }
 
       }
 
       print "<TR><TD>Last&nbsp;bill&nbsp;</TD><TD>".
-            pkg_datestr($pkg, 'last_bill'). '</TD></TR>'
+            pkg_datestr($pkg, 'last_bill',$conf). '</TD></TR>'
         if $pkg->{'last_bill'};
       print "<TR><TD>Next&nbsp;bill&nbsp;</TD><TD>".
-            pkg_datestr($pkg, 'next_bill'). '</TD></TR>'
+            pkg_datestr($pkg, 'next_bill',$conf). '</TD></TR>'
         if $pkg->{'next_bill'};
       print "<TR><TD>Expires&nbsp;</TD><TD>".
-            pkg_datestr($pkg, 'expire'). '</TD></TR>'
+            pkg_datestr($pkg, 'expire',$conf). '</TD></TR>'
         if $pkg->{'expire'};
       if ( $pkg->{freq} ) {
         print '<TR><TD COLSPAN=2>(&nbsp;'. pkg_suspend_link($pkg).
@@ -767,82 +767,92 @@ sub keyfield_numerically { (split(/\t/,$a))[0] <=> (split(/\t/,$b))[0]; }
 
 
 sub get_packages {
-
-my $cust_main = shift or return undef;
-
-my @packages = ();
-
-foreach my $cust_pkg (($conf->exists('hidecancelledpackages') ? ($cust_main->ncancelled_pkgs)
-                                                              : ($cust_main->all_pkgs))) { 
-
-  my $part_pkg = $cust_pkg->part_pkg;
-
-  my %pkg = ();
-  $pkg{pkgnum} = $cust_pkg->pkgnum;
-  $pkg{pkg} = $part_pkg->pkg;
-  $pkg{pkgpart} = $part_pkg->pkgpart;
-  $pkg{comment} = $part_pkg->getfield('comment');
-  $pkg{freq} = $part_pkg->freq;
-  $pkg{setup} = $cust_pkg->getfield('setup');
-  $pkg{last_bill} = $cust_pkg->getfield('last_bill');
-  $pkg{next_bill} = $cust_pkg->getfield('bill');
-  $pkg{susp} = $cust_pkg->getfield('susp');
-  $pkg{expire} = $cust_pkg->getfield('expire');
-  $pkg{cancel} = $cust_pkg->getfield('cancel');
-
-  $pkg{svcparts} = []; 
-
-  foreach my $pkg_svc (qsearch('pkg_svc', { 'pkgpart' => $part_pkg->pkgpart })) {
-
-    next if ($pkg_svc->quantity == 0);
-
-    my $part_svc = qsearchs('part_svc', { 'svcpart' => $pkg_svc->svcpart });
-
-    my $svcpart = {};
-    $svcpart->{svcpart} = $part_svc->svcpart;
-    $svcpart->{svc} = $part_svc->svc;
-    $svcpart->{svcdb} = $part_svc->svcdb;
-    $svcpart->{quantity} = $pkg_svc->quantity;
-    $svcpart->{count} = 0;
-
-    $svcpart->{services} = [];
-
-    foreach my $cust_svc (qsearch('cust_svc', { 'pkgnum' => $cust_pkg->pkgnum,
-                                                'svcpart' => $part_svc->svcpart } )) {
-
-      my $svc = {};
-      $svc->{svcnum} = $cust_svc->svcnum;
-      $svc->{label} = ($cust_svc->label)[1];
-
-      push @{$svcpart->{services}}, $svc;
-
-      $svcpart->{count}++;
-
+  my $cust_main = shift or return undef;
+  my $conf = shift;
+  
+  my @packages = ();
+  
+  foreach my $cust_pkg (
+    $conf->exists('hidecancelledpackages')
+      ? $cust_main->ncancelled_pkgs
+      : $cust_main->all_pkgs
+  ) { 
+  
+    my $part_pkg = $cust_pkg->part_pkg;
+  
+    my %pkg = ();
+    $pkg{pkgnum} = $cust_pkg->pkgnum;
+    $pkg{pkg} = $part_pkg->pkg;
+    $pkg{pkgpart} = $part_pkg->pkgpart;
+    $pkg{comment} = $part_pkg->getfield('comment');
+    $pkg{freq} = $part_pkg->freq;
+    $pkg{setup} = $cust_pkg->getfield('setup');
+    $pkg{last_bill} = $cust_pkg->getfield('last_bill');
+    $pkg{next_bill} = $cust_pkg->getfield('bill');
+    $pkg{susp} = $cust_pkg->getfield('susp');
+    $pkg{expire} = $cust_pkg->getfield('expire');
+    $pkg{cancel} = $cust_pkg->getfield('cancel');
+  
+    $pkg{svcparts} = []; 
+  
+    foreach my $pkg_svc (
+      qsearch('pkg_svc', { 'pkgpart' => $part_pkg->pkgpart })
+    ) {
+  
+      next if ($pkg_svc->quantity == 0);
+  
+      my $part_svc = qsearchs('part_svc', { 'svcpart' => $pkg_svc->svcpart });
+  
+      my $svcpart = {};
+      $svcpart->{svcpart} = $part_svc->svcpart;
+      $svcpart->{svc} = $part_svc->svc;
+      $svcpart->{svcdb} = $part_svc->svcdb;
+      $svcpart->{quantity} = $pkg_svc->quantity;
+      $svcpart->{count} = 0;
+  
+      $svcpart->{services} = [];
+  
+      foreach my $cust_svc (
+        qsearch( 'cust_svc', {
+                               'pkgnum' => $cust_pkg->pkgnum,
+                               'svcpart' => $part_svc->svcpart,
+                             }
+        )
+      ) {
+  
+        my $svc = {};
+        $svc->{svcnum} = $cust_svc->svcnum;
+        $svc->{label} = ($cust_svc->label)[1];
+  
+        push @{$svcpart->{services}}, $svc;
+  
+        $svcpart->{count}++;
+  
+      }
+  
+      push @{$pkg{svcparts}}, $svcpart;
+  
     }
-
-    push @{$pkg{svcparts}}, $svcpart;
-
+  
+    push @packages, \%pkg;
+  
   }
-
-  push @packages, \%pkg;
-
-}
-
-return \@packages;
+  
+  return \@packages;
 
 }
 
 sub svc_link {
 
- my ($svcpart, $svc) = (shift,shift) or return '';
- return qq!<A HREF="${p}view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svcpart->{svc}</A>!;
+  my ($svcpart, $svc) = (shift,shift) or return '';
+  return qq!<A HREF="${p}view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svcpart->{svc}</A>!;
 
 }
 
 sub svc_label_link {
 
- my ($svcpart, $svc) = (shift,shift) or return '';
- return qq!<A HREF="${p}view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svc->{label}</A>!;
+  my ($svcpart, $svc) = (shift,shift) or return '';
+  return qq!<A HREF="${p}view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svc->{label}</A>!;
 
 }
 
@@ -875,7 +885,7 @@ sub pkgsort_pkgnum_cancel {
 }
 
 sub pkg_datestr {
-  my($pkg, $field) = @_ or return '';
+  my($pkg, $field, $conf) = @_ or return '';
   return '&nbsp;' unless $pkg->{$field};
   my $format = $conf->exists('pkg_showtimes')
                ? '<B>%D</B>&nbsp;<FONT SIZE=-3>%l:%M:%S%P&nbsp;%z</FONT>'
@@ -916,6 +926,7 @@ sub pkg_dates_link {
 
 sub pkg_customize_link {
   my $pkg = shift or return '';
+  my $custnum = shift;
   return qq!<A HREF="${p}edit/part_pkg.cgi?keywords=$custnum;clone=$pkg->{pkgpart};pkgnum=$pkg->{pkgnum}">Customize</A>!;
 }
 
-- 
cgit v1.2.1


From ef7bb336cc67f127fb1d77532ad3da1369c0ae36 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 8 Aug 2003 02:02:41 +0000
Subject: - fix Mason profiling to pass-through images (for graph/) - fix
 graph/money-time.cgi use of $m interfering with Mason - fix
 graph/money-time-graph.cgi to set content-type in a Mason/ASP-independant  
 fashion - (beginning of) includes! - (beginning of) moving SQL search to
 including generic elements/search.html - fix global.asa typo - fix masonize
 to not prepend an extraneous blank line (breaking  
 graph/money-time-graph.cgi)

---
 bin/masonize                           |  3 ++-
 htetc/global.asa                       |  6 +++++-
 httemplate/autohandler                 |  6 ++----
 httemplate/graph/money_time-graph.cgi  | 14 +++++++-------
 httemplate/graph/money_time.cgi        | 12 ++++++------
 httemplate/search/elements/search.html |  8 ++++++++
 httemplate/search/sql.html             |  8 ++++++++
 7 files changed, 38 insertions(+), 19 deletions(-)
 create mode 100644 httemplate/search/elements/search.html
 create mode 100644 httemplate/search/sql.html

diff --git a/bin/masonize b/bin/masonize
index 475c9a6bf..def0115b7 100755
--- a/bin/masonize
+++ b/bin/masonize
@@ -8,6 +8,7 @@ foreach $file ( split(/\n/, `find . -depth -print | grep cgi\$`) ) {
   system("chmod u+w $file");
   open(W,">$file") or die "can't open $file for writing: $!";
   select W; $| = 1; select STDOUT;
+  $newline = ''; #avoid prepending extraneous newlines
   $all = join('',@file);
 
   $mode = 'html';
@@ -26,7 +27,7 @@ foreach $file ( split(/\n/, `find . -depth -print | grep cgi\$`) ) {
         #die;
         next;
       } elsif ( $all =~ /^<%(.*)$/s ) {
-        print W "\n";
+        print W $newline; $newline = "\n";
         $all = $1;
         $mode = 'perlc';
         next;
diff --git a/htetc/global.asa b/htetc/global.asa
index c7056fc03..5b0ac4991 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -73,7 +73,7 @@ sub Script_OnStart {
   $p = popurl(2);
   #print $cgi->header( '-expires' => 'now' );
   #dbh->{'private_profile'} = {} if dbh->can('sprintProfile');
-  dbh->{'private_profile'} = {} if UNIVERSAL::can(dbh, 'sprintProfile') );
+  dbh->{'private_profile'} = {} if UNIVERSAL::can(dbh, 'sprintProfile');
 
   #really should check for FS::Profiler or something
     # Devel::AutoProfiler _our_ VERSION?  thanks a fucking lot
@@ -191,5 +191,9 @@ sub sprintAutoProfile {
 
 }
 
+sub include {
+  $Response->Include(@_);
+}
+
 1;
 
diff --git a/httemplate/autohandler b/httemplate/autohandler
index e6e50d5bd..2bd3adffd 100644
--- a/httemplate/autohandler
+++ b/httemplate/autohandler
@@ -1,20 +1,18 @@
 % $m->call_next;
-
 <%init>
   dbh->{'private_profile'} = {} if UNIVERSAL::can(dbh, 'sprintProfile');
 </%init>
-
 <%filter>
 
 my $profile = '';
 if ( UNIVERSAL::can(dbh, 'sprintProfile') ) {
 
-  #if contenttype is text/html!!  **FIXME**
+  if ( lc($r->content_type) eq 'text/html' ) {
 
     $profile = '<PRE>'. ("\n"x4096). encode_entities(dbh->sprintProfile()).
                #"\n\n". &sprintAutoProfile(). '</PRE>';
                "\n\n".                        '</PRE>';
-  #endif
+  } 
 
   dbh->{'private_profile'} = {};
 }
diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi
index 944019a7a..76f1bd7bd 100755
--- a/httemplate/graph/money_time-graph.cgi
+++ b/httemplate/graph/money_time-graph.cgi
@@ -62,14 +62,14 @@ while ( $syear < $eyear || ( $syear == $eyear && $smonth < $emonth ) ) {
   my $refunded = $refunded_sth->fetchrow_arrayref->[0] || 0;
 
     #horrible local kludge that doesn't even really work right
-    my $expenses_sql = "SELECT SUM(cust_bill_pay.amount) FROM cust_bill_pay, cust_bill WHERE cust_bill_pay.invnum = cust_bill.invnum AND cust_bill_pay._date >= $speriod AND cust_bill_pay._date < $eperiod AND 0 < ( select count(*) from cust_bill_pkg, cust_pkg, part_pkg WHERE cust_bill.invnum = cust_bill_pkg.invnum AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum AND cust_pkg.pkgpart = part_pkg.pkgpart AND LOWER(part_pkg.pkg) LIKE 'expense _%' )";
+    my $expenses_sql2 = "SELECT SUM(cust_bill_pay.amount) FROM cust_bill_pay, cust_bill WHERE cust_bill_pay.invnum = cust_bill.invnum AND cust_bill_pay._date >= $speriod AND cust_bill_pay._date < $eperiod AND 0 < ( select count(*) from cust_bill_pkg, cust_pkg, part_pkg WHERE cust_bill.invnum = cust_bill_pkg.invnum AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum AND cust_pkg.pkgpart = part_pkg.pkgpart AND LOWER(part_pkg.pkg) LIKE 'expense _%' )";
 
-#    my $expenses_sql = "SELECT SUM(cust_bill_pay.amount) FROM cust_bill_pay, cust_bill_pkg, cust_bill, cust_pkg, part_pkg WHERE cust_bill_pay.invnum = cust_bill.invnum AND cust_bill.invnum = cust_bill_pkg.invnum AND cust_bill_pay._date >= $speriod AND cust_bill_pay._date < $eperiod AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum AND cust_pkg.pkgpart = part_pkg.pkgpart AND LOWER(part_pkg.pkg) LIKE 'expense _%'";
-    my $expenses_sth = dbh->prepare($expenses_sql) or die dbh->errstr;
-    $expenses_sth->execute or die $expenses_sth->errstr;
-    my $expenses = $expenses_sth->fetchrow_arrayref->[0] || 0;
+#    my $expenses_sql2 = "SELECT SUM(cust_bill_pay.amount) FROM cust_bill_pay, cust_bill_pkg, cust_bill, cust_pkg, part_pkg WHERE cust_bill_pay.invnum = cust_bill.invnum AND cust_bill.invnum = cust_bill_pkg.invnum AND cust_bill_pay._date >= $speriod AND cust_bill_pay._date < $eperiod AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum AND cust_pkg.pkgpart = part_pkg.pkgpart AND LOWER(part_pkg.pkg) LIKE 'expense _%'";
+    my $expenses_sth2 = dbh->prepare($expenses_sql2) or die dbh->errstr;
+    $expenses_sth2->execute or die $expenses_sth2->errstr;
+    my $expenses2 = $expenses_sth2->fetchrow_arrayref->[0] || 0;
 
-  push @{$data{cash}}, $paid-$refunded-$expenses;
+  push @{$data{cash}}, $paid-$refunded-$expenses2;
 
 }
 
@@ -101,7 +101,7 @@ my @data = ( \@labels,
 #$chart->cgi_png(\@data);
 
 http_header('Content-Type' => 'image/png' );
-$Response->{ContentType} = 'image/png';
+#$Response->{ContentType} = 'image/png';
 
 $chart->_set_colors();
 
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index e24157ccb..de8f6ee0c 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -1,4 +1,4 @@
-<!-- mason kludge %>
+<!-- mason kludge -->
 <%
 
 #my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
@@ -32,9 +32,9 @@ my $emonth = $cgi->param('emonth') || $curmon+1;
   Cashflow (payments - refunds)<BR>
 <BR>
 From <SELECT NAME="smonth">
-<% my @m = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
-   foreach my $m ( 1..12 ) { %>
-<OPTION VALUE="<%= $m %>"<%= $m == $smonth ? ' SELECTED' : '' %>><%= $m[$m-1] %>
+<% my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec); %>
+<% foreach my $mon ( 1..12 ) { %>
+<OPTION VALUE="<%= $mon %>"<%= $mon == $smonth ? ' SELECTED' : '' %>><%= $mon[$mon-1] %>
 <% } %>
 </SELECT>
 <SELECT NAME="syear">
@@ -43,8 +43,8 @@ From <SELECT NAME="smonth">
 <% } %>
 </SELECT>
  to <SELECT NAME="emonth">
-<% foreach my $m ( 1..12 ) { %>
-<OPTION VALUE="<%= $m %>"<%= $m == $emonth ? ' SELECTED' : '' %>><%= $m[$m-1] %>
+<% foreach my $mon ( 1..12 ) { %>
+<OPTION VALUE="<%= $mon %>"<%= $mon == $emonth ? ' SELECTED' : '' %>><%= $mon[$mon-1] %>
 <% } %>
 </SELECT>
 <SELECT NAME="eyear">
diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
new file mode 100644
index 000000000..fba8ee815
--- /dev/null
+++ b/httemplate/search/elements/search.html
@@ -0,0 +1,8 @@
+<%
+
+my $conf = new FS::Conf;
+my $maxrecords = $conf->config('maxsearchrecordsperpage');
+
+my $limit = $maxrecords ? "LIMIT $maxrecords" : '';
+
+%>
diff --git a/httemplate/search/sql.html b/httemplate/search/sql.html
new file mode 100644
index 000000000..e61ce1538
--- /dev/null
+++ b/httemplate/search/sql.html
@@ -0,0 +1,8 @@
+<%= include( '/elements/header', 'Query Results',
+               include( '/elements/menubar', 'Main Menu' => $p )
+%>
+<%= include( 'elements/search.html',
+               'name' => 'rows',
+             
+%>
+
-- 
cgit v1.2.1


From e283ab567e6890727e4d8e35c1d8097398678753 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 8 Aug 2003 05:42:13 +0000
Subject: - (finish) includes!  (closes: Bug#551) - (finish) moving SQL search
 to including generic elements/search.html - new elements: menubar.html,
 header.html, pager.html and table.html - have masonize process .html files
 also

---
 FS/FS/CGI.pm                           | 10 ++++-
 bin/masonize                           |  3 +-
 httemplate/elements/header.html        | 19 +++++++++
 httemplate/elements/menubar.html       |  8 ++++
 httemplate/elements/pager.html         | 42 +++++++++++++++++++
 httemplate/elements/table.html         |  8 ++++
 httemplate/index.html                  |  2 +-
 httemplate/search/elements/search.html | 57 +++++++++++++++++++++++--
 httemplate/search/sql.cgi              | 76 ----------------------------------
 httemplate/search/sql.html             | 12 ++++--
 10 files changed, 151 insertions(+), 86 deletions(-)
 create mode 100644 httemplate/elements/header.html
 create mode 100644 httemplate/elements/menubar.html
 create mode 100644 httemplate/elements/pager.html
 create mode 100644 httemplate/elements/table.html
 delete mode 100755 httemplate/search/sql.cgi

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 86d20f6cb..f6153761b 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -44,8 +44,10 @@ Returns an HTML header.
 =cut
 
 sub header {
+  use Carp;
+  carp 'FS::CGI::header deprecated; include /elements/header.html instead';
+
   my($title,$menubar,$etc)=@_; #$etc is for things like onLoad= etc.
-  #use Carp;
   $etc = '' unless defined $etc;
 
   my $x =  <<END;
@@ -107,6 +109,9 @@ Returns an HTML menubar.
 =cut
 
 sub menubar { #$menubar=menubar('Main Menu', '../', 'Item', 'url', ... );
+  use Carp;
+  carp 'FS::CGI::menubar deprecated; include /elements/menubar.html instead';
+
   my($item,$url,@html);
   while (@_) {
     ($item,$url)=splice(@_,0,2);
@@ -225,6 +230,9 @@ Returns HTML tag for beginning a table.
 =cut
 
 sub table {
+  use Carp;
+  carp 'FS::CGI::table deprecated; include /elements/table.html instead';
+
   my $col = shift;
   if ( $col ) {
     qq!<TABLE BGCOLOR="$col" BORDER=1 WIDTH="100%" CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">!;
diff --git a/bin/masonize b/bin/masonize
index def0115b7..3139e0af5 100755
--- a/bin/masonize
+++ b/bin/masonize
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
-foreach $file ( split(/\n/, `find . -depth -print | grep cgi\$`) ) {
+foreach $file ( split(/\n/, `find . -depth -print`) ) {
+  next unless $file =~ /(cgi|html)$/;
   open(F,$file) or die "can't open $file for reading: $!";
   @file = <F>;
   #print "$file ". scalar(@file). "\n";
diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
new file mode 100644
index 000000000..581bbabc7
--- /dev/null
+++ b/httemplate/elements/header.html
@@ -0,0 +1,19 @@
+<%
+  my($title, $menubar) = @_;
+  my $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc.
+%>
+    <HTML>
+      <HEAD>
+        <TITLE>
+          <%= $title %>
+        </TITLE>
+        <META HTTP-Equiv="Cache-Control" Content="no-cache">
+        <META HTTP-Equiv="Pragma" Content="no-cache">
+        <META HTTP-Equiv="Expires" Content="0"> 
+      </HEAD>
+      <BODY BGCOLOR="#e8e8e8"<%= $etc %>>
+          <FONT SIZE=7>
+            <%= $title %>
+          </FONT>
+          <BR><BR>
+          <%= $menubar ? "$menubar<BR><BR>" : '' %>
diff --git a/httemplate/elements/menubar.html b/httemplate/elements/menubar.html
new file mode 100644
index 000000000..87a50312c
--- /dev/null
+++ b/httemplate/elements/menubar.html
@@ -0,0 +1,8 @@
+<%
+  my($item, $url, @html);
+  while (@_) {
+    ($item, $url) = splice(@_,0,2);
+    push @html, qq!<A HREF="$url">$item</A>!;
+  }
+%>
+<%= join(' | ', @html) %>
diff --git a/httemplate/elements/pager.html b/httemplate/elements/pager.html
new file mode 100644
index 000000000..db9ff83bf
--- /dev/null
+++ b/httemplate/elements/pager.html
@@ -0,0 +1,42 @@
+<%
+
+  my %opt = @_;
+
+  my $pager = '';
+  if ( $opt{'total'} != $opt{'num_rows'} && $opt{'maxrecords'} ) {
+    unless ( $opt{'offset'} == 0 ) {
+      $cgi->param('offset', $opt{'offset'} - $opt{'maxrecords'});
+%>
+
+      <A HREF="<%= $cgi->self_url %>"><B><FONT SIZE="+1">Previous</FONT></B></A>
+
+<%
+    }
+    my $page = 0;
+    for ( my $poff = 0; $poff < $opt{'total'}; $poff += $opt{'maxrecords'} ) {
+      $page++;
+      if ( $opt{'offset'} == $poff ) {
+%>
+
+        <FONT SIZE="+2"><%= $page %></FONT>
+
+<%
+      } else {
+        $cgi->param('offset', $poff);
+%>
+
+        <A HREF="<%= $cgi->self_url %>">$page</A>
+
+<%
+      }
+    }
+    unless ( $opt{'offset'} + $opt{'maxrecords'} > $opt{'total'} ) {
+      $cgi->param('offset', $opt{'offset'} + $opt{'maxrecords'});
+%>
+
+      <A HREF="<%= $cgi->self_url %>"><B><FONT SIZE="+1">Next</FONT></B></A>
+
+<%
+    }
+  }
+%>
diff --git a/httemplate/elements/table.html b/httemplate/elements/table.html
new file mode 100644
index 000000000..3b6108719
--- /dev/null
+++ b/httemplate/elements/table.html
@@ -0,0 +1,8 @@
+<%
+   my $color = shift;
+   if ( $color ) {
+%>
+    <TABLE BGCOLOR="<%= $color %>" BORDER=1 WIDTH="100%" CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">
+<% } else { %>
+    <TABLE BORDER=1 CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">
+<% } %>
diff --git a/httemplate/index.html b/httemplate/index.html
index 99b321f30..a898d9134 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -148,7 +148,7 @@
       <UL>
         <LI><A HREF="search/cust_main-otaker.cgi">Search customers by order-taker</A>
       </UL>
-    <FORM ACTION="search/sql.cgi" METHOD="POST">SQL query: <TT>SELECT </TT><INPUT TYPE="text" NAME="sql" SIZE=32><INPUT TYPE="submit" VALUE="Query"></FORM>
+    <FORM ACTION="search/sql.html" METHOD="POST">SQL query: <TT>SELECT </TT><INPUT TYPE="text" NAME="sql" SIZE=32><INPUT TYPE="submit" VALUE="Query"></FORM>
 
     <BR>
     </TD></TR>
diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index fba8ee815..fbedcaa26 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -1,8 +1,59 @@
 <%
 
-my $conf = new FS::Conf;
-my $maxrecords = $conf->config('maxsearchrecordsperpage');
+  my %opt = @_;
+  unless (exists($opt{'count_query'}) && length($opt{'count_query'})) {
+    ( $opt{'count_query'} = $opt{'query'} ) =~
+      s/^\s*SELECT\s*(.*)\s+FROM\s/SELECT COUNT(*) FROM /i;
+  }
 
-my $limit = $maxrecords ? "LIMIT $maxrecords" : '';
+  my $conf = new FS::Conf;
+  my $maxrecords = $conf->config('maxsearchrecordsperpage');
 
+  my $limit = $maxrecords ? "LIMIT $maxrecords" : '';
+
+  my $offset = $cgi->param('offset') || 0;
+  $limit .= " OFFSET $offset" if $offset;
+
+  my $count_sth = dbh->prepare($opt{'count_query'})
+    or die "Error preparing $opt{'count_query'}: ". dbh->errstr;
+  $count_sth->execute
+    or die "Error executing $opt{'count_query'}: ". $count_sth->errstr;
+  my $total = $count_sth->fetchrow_arrayref->[0];
+
+  my $sth = dbh->prepare("$opt{'query'} $limit")
+    or die "Error preparing $opt{'query'}: ". dbh->errstr;
+  $sth->execute
+    or die "Error executing $opt{'query'}: ". $sth->errstr;
+
+  #can get # of rows without fetching them all?
+  my $rows = $sth->fetchall_arrayref;
+
+%>
+<!-- mason kludge -->
+<% my $pager = include ( '/elements/pager.html',
+                           'offset'     => $offset,
+                           'num_rows'   => scalar(@$rows),
+                           'total'      => $total,
+                           'maxrecords' => $maxrecords,
+                       );
 %>
+
+<%= $total %> total <%= $opt{'name'} %><BR><BR><%= $pager %>
+<%= include( '/elements/table.html' ) %>
+  <TR>
+  <% foreach ( @{$sth->{NAME}} ) { %>
+       <TH><%= $_ %></TH>
+  <% } %>
+  </TR>
+  <% foreach my $row ( @$rows ) { %>
+       <TR>
+       <% foreach ( @$row ) { %>
+            <TD><%= $_ %></TD>
+       <% } %>
+       </TR>
+  <% } %>
+
+</TABLE>
+<%= $pager %>
+</BODY>
+</HTML>
diff --git a/httemplate/search/sql.cgi b/httemplate/search/sql.cgi
deleted file mode 100755
index b83ef039f..000000000
--- a/httemplate/search/sql.cgi
+++ /dev/null
@@ -1,76 +0,0 @@
-<%
-
-my $conf = new FS::Conf;
-my $maxrecords = $conf->config('maxsearchrecordsperpage');
-
-my $limit = '';
-$limit .= "LIMIT $maxrecords" if $maxrecords;
-
-my $offset = $cgi->param('offset') || 0;
-$limit .= " OFFSET $offset" if $offset;
-
-my $total;
-
-my $sql = $cgi->param('sql');
-$sql =~ s/^\s*SELECT//i;
-
-my $count_sql = $sql;
-$count_sql =~ s/^(.*)\s+FROM\s/COUNT(*) FROM /i;
-
-my $sth = dbh->prepare("SELECT $count_sql")
-  or eidiot dbh->errstr. " doing $count_sql\n";
-$sth->execute or eidiot "Error executing \"$count_sql\": ". $sth->errstr;
-
-$total = $sth->fetchrow_arrayref->[0];
-
-my $sth = dbh->prepare("SELECT $sql $limit")
-  or eidiot dbh->errstr. " doing $sql\n";
-$sth->execute or eidiot "Error executing \"$sql\": ". $sth->errstr;
-my $rows = $sth->fetchall_arrayref;
-
-%>
-<!-- mason kludge -->
-<%
-
-  #begin pager
-  my $pager = '';
-  if ( $total != scalar(@$rows) && $maxrecords ) {
-    unless ( $offset == 0 ) {
-      $cgi->param('offset', $offset - $maxrecords);
-      $pager .= '<A HREF="'. $cgi->self_url.
-                '"><B><FONT SIZE="+1">Previous</FONT></B></A> ';
-    }
-    my $poff;
-    my $page;
-    for ( $poff = 0; $poff < $total; $poff += $maxrecords ) {
-      $page++;
-      if ( $offset == $poff ) {
-        $pager .= qq!<FONT SIZE="+2">$page</FONT> !;
-      } else {
-        $cgi->param('offset', $poff);
-        $pager .= qq!<A HREF="!. $cgi->self_url. qq!">$page</A> !;
-      }
-    }
-    unless ( $offset + $maxrecords > $total ) {
-      $cgi->param('offset', $offset + $maxrecords);
-      $pager .= '<A HREF="'. $cgi->self_url.
-                '"><B><FONT SIZE="+1">Next</FONT></B></A> ';
-    }
-  }
-  #end pager
-
-  print header('Query Results', menubar('Main Menu'=>$p) ).
-        "$total total rows<BR><BR>$pager". table().
-        "<TR>";
-  print "<TH>$_</TH>" foreach @{$sth->{NAME}};
-  print "</TR>";
-
-  foreach $row ( @$rows ) {
-    print "<TR>";
-    print "<TD>$_</TD>" foreach @$row;
-    print "</TR>";
-  }
-
-  print "</TABLE>$pager</BODY></HTML>";
-
-%>
diff --git a/httemplate/search/sql.html b/httemplate/search/sql.html
index e61ce1538..7d7fc0890 100644
--- a/httemplate/search/sql.html
+++ b/httemplate/search/sql.html
@@ -1,8 +1,12 @@
-<%= include( '/elements/header', 'Query Results',
-               include( '/elements/menubar', 'Main Menu' => $p )
+<%= include( '/elements/header.html', 'Query Results',
+               include( '/elements/menubar.html', 'Main Menu' => $p )
+    )
 %>
+
 <%= include( 'elements/search.html',
-               'name' => 'rows',
-             
+               'name'  => 'rows',
+               'query' => 'SELECT '. ( $cgi->param('sql')
+                                       || eidiot('Empty query') ),
+    )
 %>
 
-- 
cgit v1.2.1


From cf8b6e93f3e4e024be25e19abae9f8819fc86435 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 8 Aug 2003 05:54:57 +0000
Subject: - fix possible glitch with Mason on account view screen

---
 httemplate/view/svc_acct.cgi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 4e01db341..78c3a3809 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -74,9 +74,9 @@ if ( $part_svc->part_export('sqlradius') ) {
   }
 
   my $seconds = $svc_acct->seconds_since_sqlradacct( $last_bill, time );
-  my $h = int($seconds/3600);
-  my $m = int( ($seconds%3600) / 60 );
-  my $s = $seconds%60;
+  my $hour = int($seconds/3600);
+  my $min = int( ($seconds%3600) / 60 );
+  my $sec = $seconds%60;
 
   my $input = $svc_acct->attribute_since_sqlradacct(
     $last_bill, time, 'AcctInputOctets'
@@ -86,7 +86,7 @@ if ( $part_svc->part_export('sqlradius') ) {
   ) / 1048576;
 
   if ( $seconds ) {
-    print "Online <B>$h</B>h <B>$m</B>m <B>$s</B>s";
+    print "Online <B>$hour</B>h <B>$min</B>m <B>$sec</B>s";
   } else {
     print 'Has not logged on';
   }
-- 
cgit v1.2.1


From 934b1165a4dfabee78ace78f0723d85e6e6f5892 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 21 Aug 2003 06:42:29 +0000
Subject: woody

---
 install/debian/3.0/INSTALL | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 install/debian/3.0/INSTALL

diff --git a/install/debian/3.0/INSTALL b/install/debian/3.0/INSTALL
new file mode 100644
index 000000000..eb84c90f6
--- /dev/null
+++ b/install/debian/3.0/INSTALL
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+apt-get update
+apt-get install screen zsh libapache-mod-ssl libapache-mod-perl rsync \
+        postgresql cvs fsh \
+        liburi-perl libhtml-tagset-perl libnet-perl liblocale-codes-perl \
+        libnet-whois-perl libwww-perl libbusiness-creditcard-perl \
+        libmailtools-perl libtimedate-perl libdate-manip-perl \
+        libfile-counterfile-perl libfreezethaw-perl libstring-approx-perl \
+        libtext-template-perl libdbi-perl libdbd-pg-perl \
+        libdbix-datasource-perl libdbix-dbschema-perl libnet-ssh-perl \
+        libstring-shellquote-perl libnet-scp-perl libapache-asp-perl \
+        libtie-ixhash-perl libtime-duration-perl \
+        libhtml-widgets-selectlayers-perl libstorable-perl \
+        libapache-dbi-perl libdbd-mysql-perl
+
+useradd freeside
+su postgres -c "createuser -P freeside"
+
+su freeside -c "createdb freeside"
+
-- 
cgit v1.2.1


From f6c87db622e157ec3da638a284960685bdee4c6f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 21 Aug 2003 06:46:04 +0000
Subject: iffy

---
 install/debian/3.0/INSTALL | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/install/debian/3.0/INSTALL b/install/debian/3.0/INSTALL
index eb84c90f6..eff5ebe27 100644
--- a/install/debian/3.0/INSTALL
+++ b/install/debian/3.0/INSTALL
@@ -19,3 +19,11 @@ su postgres -c "createuser -P freeside"
 
 su freeside -c "createdb freeside"
 
+#?
+cd ../..
+make install-perl-modules
+make create-config
+freeside-adduser -c -h /usr/local/etc/freeside/htpasswd ivan
+su freeside -c 'freeside-setup ivan'
+su freeside -c '/home/ivan/freeside/bin/populate-msgcat ivan'
+make deploy
-- 
cgit v1.2.1


From 2e1317e0e1883b1019bc6448055bb45241aa8663 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 21 Aug 2003 07:42:08 +0000
Subject: woody backports

---
 install/debian/3.0/INSTALL | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/install/debian/3.0/INSTALL b/install/debian/3.0/INSTALL
index eff5ebe27..ad3ad4f2b 100644
--- a/install/debian/3.0/INSTALL
+++ b/install/debian/3.0/INSTALL
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+echo "deb http://cleanwhisker.420.am/~ivan/freeside-woody/ ./" >>/etc/apt/sources.list
+
 apt-get update
 apt-get install screen zsh libapache-mod-ssl libapache-mod-perl rsync \
         postgresql cvs fsh \
-- 
cgit v1.2.1


From 63ebc29032de5a750b4f9eae8c0cf3d5a13530ba Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Sep 2003 12:35:40 +0000
Subject: makefile trivia for openbsd

---
 Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 13e8cf095..bf5b73efc 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,8 @@ MASONDATA = /usr/local/etc/freeside/masondata
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 #freebsd
 #FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
+#openbsd
+#FREESIDE_DOCUMENT_ROOT = /var/www/htdocs/freeside
 
 #deb, others?
 INIT_FILE = /etc/init.d/freeside
@@ -27,12 +29,14 @@ INIT_FILE = /etc/init.d/freeside
 HTTPD_RESTART = /etc/init.d/apache restart
 #freebsd
 #HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
+#openbsd
+#HTTPD_RESTART = kill -TERM `cat /var/www/logs/httpd.pid`; sleep 1; /usr/sbin/httpd -u -DSSL
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
 #deb, others?
 INSTALLGROUP = root
-#freebsd
+#freebsd,openbsd
 #INSTALLGROUP = wheel
 
 #edit the stuff below to have the daemons start
@@ -58,8 +62,8 @@ SELFSERVICE_MACHINE = localhost
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.5.0pre3
-TAG=freeside_1_5_0pre3
+VERSION=1.5.0pre4
+TAG=freeside_1_5_0pre4
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
-- 
cgit v1.2.1


From e8360117a2ddb3920b6765d091fd1ca25a2274b6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Sep 2003 13:18:56 +0000
Subject: openbsd also uses sane useradd/mod/del commands

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 1374672b7..234dfa535 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -896,7 +896,7 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
       'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
       'options' => \%shellcommands_options,
       'nodomain' => 'Y',
-      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = "";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "pw userdel $username -r"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0"; this.form.usermod_stdin.value = "$new__password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $new_uid.$new_gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>The following variables are available for interpolation (prefixed with new_ or old_ for replace operations): <UL><LI><code>$username</code><LI><code>$_password</code><LI><code>$quoted_password</code> - unencrypted password quoted for the shell<LI><code>$crypt_password</code> - encrypted password<LI><code>$uid</code><LI><code>$gid</code><LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)<LI><code>$dir</code> - home directory<LI><code>$shell</code><LI><code>$quota</code><LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.</UL>',
+      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD/OpenBSD" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = "";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "pw userdel $username -r"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0"; this.form.usermod_stdin.value = "$new__password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $new_uid.$new_gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>The following variables are available for interpolation (prefixed with new_ or old_ for replace operations): <UL><LI><code>$username</code><LI><code>$_password</code><LI><code>$quoted_password</code> - unencrypted password quoted for the shell<LI><code>$crypt_password</code> - encrypted password<LI><code>$uid</code><LI><code>$gid</code><LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)<LI><code>$dir</code> - home directory<LI><code>$shell</code><LI><code>$quota</code><LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.</UL>',
     },
 
     'shellcommands_withdomain' => {
-- 
cgit v1.2.1


From 16d3d97fb10e7067cd9a7e82a37f384703207bed Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Sep 2003 18:46:57 +0000
Subject: turn vfieldpart_hashref into a method, not a subroutine another fix
 to support running 1.5.0 virtual field code on 1.4.x databases

---
 FS/FS/Record.pm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 1fe51e065..07554481b 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -664,7 +664,7 @@ sub insert {
   if (@virtual_fields) {
     my %v_values = map { $_, $self->getfield($_) } @virtual_fields;
 
-    my $vfieldpart = vfieldpart_hashref($table);
+    my $vfieldpart = $self->vfieldpart_hashref;
 
     my $v_statement = "INSERT INTO virtual_field(recnum, vfieldpart, value) ".
                     "VALUES (?, ?, ?)";
@@ -753,7 +753,7 @@ sub delete {
   my $primary_key = $self->dbdef_table->primary_key;
   my $v_sth;
   my @del_vfields;
-  my $vfp = vfieldpart_hashref($self->table);
+  my $vfp = $self->vfieldpart_hashref;
   foreach($self->virtual_fields) {
     next if $self->getfield($_) eq '';
     unless(@del_vfields) {
@@ -870,7 +870,7 @@ sub replace {
   my $v_rep_sth;
   my $v_del_sth;
   my (@add_vfields, @rep_vfields, @del_vfields);
-  my $vfp = vfieldpart_hashref($old->table);
+  my $vfp = $old->vfieldpart_hashref;
   foreach(grep { exists($diff{$_}) } $new->virtual_fields) {
     if($diff{$_} eq '') {
       # Delete
@@ -1511,9 +1511,11 @@ TABLE.
 =cut
 
 sub vfieldpart_hashref {
-  my ($table) = @_;
+  my $self = shift;
+  my $table = $self->table;
+
+  return {} unless $self->dbdef->table('part_virtual_field');
 
-  return () unless $table;
   my $dbh = dbh;
   my $statement = "SELECT vfieldpart, name FROM part_virtual_field WHERE ".
                   "dbtable = '$table'";
-- 
cgit v1.2.1


From 1d714ed99c023b376e8c1315c46760a783fcaff0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Sep 2003 20:22:20 +0000
Subject: turn off query debugging

---
 FS/FS/Record.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 07554481b..60b25edcf 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -21,7 +21,7 @@ use Tie::IxHash;
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(dbh fields hfields qsearch qsearchs dbdef jsearch);
 
-$DEBUG = 2;
+$DEBUG = 0;
 $me = '[FS::Record]';
 
 #ask FS::UID to run this stuff for us later
-- 
cgit v1.2.1


From c0e55cc3cd861b082b1318829cdd0780fe8b934c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Sep 2003 23:06:45 +0000
Subject: list extraneous services, closes: #213

---
 httemplate/view/cust_main.cgi | 63 ++++++++++++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 24 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index f1afdb570..fb3f0f111 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -793,8 +793,8 @@ sub get_packages {
     $pkg{expire} = $cust_pkg->getfield('expire');
     $pkg{cancel} = $cust_pkg->getfield('cancel');
   
-    $pkg{svcparts} = []; 
-  
+    my %svcparts = ();
+
     foreach my $pkg_svc (
       qsearch('pkg_svc', { 'pkgpart' => $part_pkg->pkgpart })
     ) {
@@ -811,29 +811,44 @@ sub get_packages {
       $svcpart->{count} = 0;
   
       $svcpart->{services} = [];
-  
-      foreach my $cust_svc (
-        qsearch( 'cust_svc', {
-                               'pkgnum' => $cust_pkg->pkgnum,
-                               'svcpart' => $part_svc->svcpart,
-                             }
-        )
-      ) {
-  
-        my $svc = {};
-        $svc->{svcnum} = $cust_svc->svcnum;
-        $svc->{label} = ($cust_svc->label)[1];
-  
-        push @{$svcpart->{services}}, $svc;
-  
-        $svcpart->{count}++;
-  
-      }
-  
-      push @{$pkg{svcparts}}, $svcpart;
-  
+
+      $svcparts{$svcpart->{svcpart}} = $svcpart;
+
     }
-  
+
+    foreach my $cust_svc (
+      qsearch( 'cust_svc', {
+                             'pkgnum' => $cust_pkg->pkgnum,
+                             #'svcpart' => $part_svc->svcpart,
+                           }
+      )
+    ) {
+
+      warn "svcnum ". $cust_svc->svcnum. " / svcpart ". $cust_svc->svcpart. "\n";
+      my $svc = {
+        'svcnum' => $cust_svc->svcnum,
+        'label'  => ($cust_svc->label)[1],
+      };
+
+      #false laziness with above, to catch extraneous services.  whole
+      #damn thing should be OO...
+      my $svcpart = ( $svcparts{$cust_svc->svcpart} ||= {
+        'svcpart'  => $cust_svc->svcpart,
+        'svc'      => $cust_svc->part_svc->svc,
+        'svcdb'    => $cust_svc->part_svc->svcdb,
+        'quantity' => 0,
+        'count'    => 0,
+        'services' => [],
+      } );
+
+      push @{$svcpart->{services}}, $svc;
+
+      $svcpart->{count}++;
+
+    }
+
+    $pkg{svcparts} = [ values %svcparts ];
+
     push @packages, \%pkg;
   
   }
-- 
cgit v1.2.1


From 032f01f95762edfb8dac47c95309f0f98ced223c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Sep 2003 02:31:24 +0000
Subject: -w-safe and run under a 1.4 schema too

---
 httemplate/edit/part_svc.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 45e0b6ffe..18319b341 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -131,7 +131,7 @@ my %defs = (
   },
 );
 
-  foreach $svcdb (keys(%defs)) {
+  foreach my $svcdb (grep dbdef->table($_), keys %defs ) {
     my $self = "FS::$svcdb"->new;
     $vfields{$svcdb} = {};
     foreach my $field ($self->virtual_fields) { # svc_Common::virtual_fields with a null svcpart returns all of them
@@ -153,7 +153,7 @@ my %defs = (
              ? ( $hashref->{svcdb} )
              : qw( svc_acct svc_domain svc_forward svc_www svc_broadband );
 
-  tie my %svcdb, 'Tie::IxHash', map { $_=>$_ } @dbs;
+  tie my %svcdb, 'Tie::IxHash', map { $_=>$_ } grep dbdef->table($_), @dbs;
   my $widget = new HTML::Widgets::SelectLayers(
     #'selected_layer' => $p_svcdb,
     'selected_layer' => $hashref->{svcdb} || 'svc_acct',
-- 
cgit v1.2.1


From 28a9780a3b11b544ee6d854a4847d3e65a9aeb4e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Sep 2003 04:09:21 +0000
Subject: users-allow_comp config value to control creation of complimentary
 accounts and minor pod updates

---
 FS/FS/Conf.pm      |  7 +++++++
 FS/FS/cust_main.pm | 15 +++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index d185f8d41..86f59c411 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1053,6 +1053,13 @@ httemplate/docs/config.html
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'users-allow_comp',
+    'section'     => '',
+    'description' => 'Usernames which can create complimentary customers, one per line.  If no usernames are entered, all users can create complimentary accounts.'
+    'type'        => 'textarea',
+  },
+
 );
 
 1;
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 2af2e98ce..997f096fc 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -372,7 +372,7 @@ returns false.
 
 This will completely remove all traces of the customer record.  This is not
 what you want when a customer cancels service; for that, cancel all of the
-customer's packages (see L<FS::cust_pkg/cancel>).
+customer's packages (see L</cancel>).
 
 If the customer has any uncancelled packages, you need to pass a new (valid)
 customer number for those packages to be transferred to.  Cancelled packages
@@ -490,6 +490,12 @@ sub replace {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
+  if ( $self->payby eq 'COMP' && $self->payby ne $old->payby
+       && $conf->config('users-allow_comp')                  ) {
+    return "You are not permitted to create complimentary accounts."
+      unless grep { $_ eq getotaker } $conf->config('users-allow_comp');
+  }
+
   my $oldAutoCommit = $FS::UID::AutoCommit;
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
@@ -603,7 +609,7 @@ sub check {
     || $self->ut_numbern('referral_custnum')
   ;
   #barf.  need message catalogs.  i18n.  etc.
-  $error .= "Please select a advertising source."
+  $error .= "Please select an advertising source."
     if $error =~ /^Illegal or empty \(numeric\) refnum: /;
   return $error if $error;
 
@@ -746,6 +752,11 @@ sub check {
 
   } elsif ( $self->payby eq 'COMP' ) {
 
+    if ( !$self->custnum && $conf->config('users-allow_comp') ) {
+      return "You are not permitted to create complimentary accounts."
+        unless grep { $_ eq getotaker } $conf->config('users-allow_comp');
+    }
+
     $error = $self->ut_textn('payinfo');
     return "Illegal comp account issuer: ". $self->payinfo if $error;
 
-- 
cgit v1.2.1


From 26ff2b45ce893fa83baffc60dea898df887e7b1d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Sep 2003 07:55:38 +0000
Subject: svc_acct._password from 50 to 72 for blowfish passwords

---
 FS/bin/freeside-setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 2cb555e18..197542086 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -776,7 +776,7 @@ sub tables_hash_hack {
       'columns' => [
         'svcnum',    'int',    '',   '',
         'username',  'varchar',   '',   $username_len, #unique (& remove dup code)
-        '_password', 'varchar',   '',   50, #13 for encryped pw's plus ' *SUSPENDED* (mp5 passwords can be 34)
+        '_password', 'varchar',   '',   72, #13 for encryped pw's plus ' *SUSPENDED* (md5 passwords can be 34, blowfish 60)
         'sec_phrase', 'varchar',  'NULL',   $char_d,
         'popnum',    'int',    'NULL',   '',
         'uid',       'int', 'NULL',   '',
-- 
cgit v1.2.1


From fde47ced3934644dc4722d9547e9c4b34a2a2ea0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Sep 2003 08:01:29 +0000
Subject: allow up to 60 char encrypted passwords for blowfish

---
 FS/FS/svc_acct.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 0ee7a7286..f8495569e 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -819,7 +819,7 @@ sub check {
     #$recref->{password} = $1.
     #  crypt($3,$saltset[int(rand(64))].$saltset[int(rand(64))]
     #;
-  } elsif ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([\w\.\/\$\;\+]{13,34})$/ ) {
+  } elsif ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([\w\.\/\$\;\+]{13,60})$/ ) {
     $recref->{_password} = $1.$3;
   } elsif ( $recref->{_password} eq '*' ) {
     $recref->{_password} = '*';
-- 
cgit v1.2.1


From 87cd3014deb10bba24a5b33177b472e3f3c964e8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Sep 2003 08:02:48 +0000
Subject: fix typo

---
 FS/FS/Conf.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 86f59c411..eb0687eaa 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1056,7 +1056,7 @@ httemplate/docs/config.html
   {
     'key'         => 'users-allow_comp',
     'section'     => '',
-    'description' => 'Usernames which can create complimentary customers, one per line.  If no usernames are entered, all users can create complimentary accounts.'
+    'description' => 'Usernames which can create complimentary customers, one per line.  If no usernames are entered, all users can create complimentary accounts.',
     'type'        => 'textarea',
   },
 
-- 
cgit v1.2.1


From 0b94d5a17b0bf54f8543bdaee397f05e647dfe7c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Sep 2003 08:17:34 +0000
Subject: fix reference to obsolete shellcommands-useradd conf value (refer to
 exports instead)

---
 FS/FS/Conf.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index eb0687eaa..b69f47aa0 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -760,7 +760,7 @@ httemplate/docs/config.html
   {
     'key'         => 'username-ampersand',
     'section'     => 'username',
-    'description' => 'Allow the ampersand character (&amp;) in usernames.  Be careful when using this option in conjunction with <a href="#shellmachine-useradd">shellmachine-useradd</a> and other configuration options which execute shell commands, as the ampersand will be interpreted by the shell if not quoted.',
+    'description' => 'Allow the ampersand character (&amp;) in usernames.  Be careful when using this option in conjunction with <a href="../browse/part_export.cgi">exports</a> which execute shell commands, as the ampersand will be interpreted by the shell if not quoted.',
     'type'        => 'checkbox',
   },
 
-- 
cgit v1.2.1


From 0bf7a1bacd8cb032d11f74798ca3c562ac76f1ec Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Sep 2003 09:13:48 +0000
Subject: allow ! password like !!

---
 FS/FS/svc_acct.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index f8495569e..1cf8a798b 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -823,6 +823,8 @@ sub check {
     $recref->{_password} = $1.$3;
   } elsif ( $recref->{_password} eq '*' ) {
     $recref->{_password} = '*';
+  } elsif ( $recref->{_password} eq '!' ) {
+    $recref->{_password} = '!';
   } elsif ( $recref->{_password} eq '!!' ) {
     $recref->{_password} = '!!';
   } else {
-- 
cgit v1.2.1


From 0313fb7cc6033f2e740f846797db373df2c5bc49 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Sep 2003 13:16:25 +0000
Subject: doc

---
 FS/FS/Conf.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index b69f47aa0..36d55e4a8 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1056,7 +1056,7 @@ httemplate/docs/config.html
   {
     'key'         => 'users-allow_comp',
     'section'     => '',
-    'description' => 'Usernames which can create complimentary customers, one per line.  If no usernames are entered, all users can create complimentary accounts.',
+    'description' => 'Usernames (Freeside users, created with <a href="../docs/man/bin/freeside-adduser.html">freeside-adduser</a>) which can create complimentary customers, one per line.  If no usernames are entered, all users can create complimentary accounts.',
     'type'        => 'textarea',
   },
 
-- 
cgit v1.2.1


From 1db61c35afc546c51de4931ced48330c19af21eb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Sep 2003 13:18:29 +0000
Subject: add communigate pro export

---
 FS/FS/part_export.pm                 |  23 +++++++
 FS/FS/part_export/communigate_pro.pm | 113 +++++++++++++++++++++++++++++++++++
 2 files changed, 136 insertions(+)
 create mode 100644 FS/FS/part_export/communigate_pro.pm

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 234dfa535..d6422fe16 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -741,6 +741,23 @@ tie my %vpopmail_options, 'Tie::IxHash',
                },
 ;
 
+tie my %communigate_pro_options, 'Tie::IxHash',
+  'port'     => { label=>'Port number', default=>'106', },
+  'login'    => { label=>'The administrator account name.  The name can contain a domain part.', },
+  'password' => { label=>'The administrator account password.', },
+  'accountType' => { label=>'Type for newly-created accounts',
+                     type=>'select',
+                     options=>[qw( MultiMailbox TextMailbox MailDirMailbox )],
+                     default=>'MultiMailbox',
+                   },
+  'externalFlag' => { label=> 'Create accounts with an external (visible for legacy mailers) INBOX.',
+                      type=>'checkbox',
+                    },
+  'AccessModes' => { label=>'Access modes',
+                     default=>'Mail POP IMAP PWD WebMail WebSite',
+                   },
+;
+
 tie my %bind_options, 'Tie::IxHash',
   #'machine'     => { label=>'named machine' },
   'named_conf'   => { label  => 'named.conf location',
@@ -958,6 +975,12 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
       'notes' => 'Real time export to <a href="http://inter7.com/vpopmail/">vpopmail</a> text files.  <a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a> must be installed, and you will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a> to <b>vpopmail</b>@<i>export.host</i>.',
     },
 
+    'communigate_pro' => {
+      'desc' => 'Real-time export to a CommuniGate Pro mail server',
+      'options' => \%communigate_pro_options,
+      'notes' => 'Real time export to a <a href="http://www.stalker.com/CommuniGatePro/"> mail server.  The <a href="http://www.stalker.com/CGPerl/">CommuniGate Pro Perl Interface</a> must be installed as CGP::CLI.',
+    },
+
   },
 
   'svc_domain' => {
diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
new file mode 100644
index 000000000..bce7f301f
--- /dev/null
+++ b/FS/FS/part_export/communigate_pro.pm
@@ -0,0 +1,113 @@
+package FS::part_export::communigate_pro;
+
+use vars qw(@ISA);
+use FS::part_export;
+use FS::queue;
+
+@ISA = qw(FS::part_export);
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->communigate_pro_queue( $svc_acct->svcnum, 'CreateAccount',
+    'accountName'    => $svc_acct->email,
+    'accountType'    => $self->option('accountType'),
+    'externalFlag'   => $self->option('externalFlag'),
+    'AccessModes'    => $self->option('AccessModes'),
+    'RealName'       => $svc_acct->finger,
+    'MaxAccountSize' => $svc_acct->quota,
+  );
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = (shift, shift, shift);
+  return "can't (yet) change domain with CommuniGate Pro"
+    if $old->domain ne $new->domain;
+  return "can't (yet) change username with CommuniGate Pro"
+    if $old->username ne $new->username;
+  return "can't (yet) change GECOS with CommuniGate Pro"
+    if $old->finger ne $new->finger;
+  return "can't (yet) change quota with CommuniGate Pro"
+    if $old->quota ne $new->quota;
+  return '' unless $old->username ne $new->username
+                || $old->_password ne $new->_password
+                || $old->finger ne $new->finger
+                || $old->quota ne $new->quota;
+
+  #my $err_or_queue = $self->communigate_pro_queue( $new->svcnum,'RenameAccount',
+  #  $old->email, $new->email );
+  #return $err_or_queue unless ref($err_or_queue);
+  #my $jobnum = $err_or_queue->jobnum;
+
+  $self->communigate_pro_queue( $new->svcnum, 'SetAccountPassword',
+                                $new->email, $new->_password        )
+    if $new->_password ne $old->_password;
+
+}
+
+sub _export_delete {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->communigate_pro_queue( $svc_acct->svcnum, 'DeleteAccount',
+    $svc_acct->email,
+  );
+}
+
+#sub _export_suspend {
+#}
+
+#sub _export_unsuspend {
+#}
+
+sub communigate_pro_queue {
+  my( $self, $svcnum, $method ) = (shift, shift, shift);
+  my $sub = $method eq 'CreateAccount'
+              ? 'CreateAccount'
+              : 'communigate_pro_command';
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => "FS::part_export::communigate_pro::$sub",
+  };
+  $queue->insert(
+    $self->machine,
+    $self->option('port'),
+    $self->option('login'),
+    $self->option('password'),
+    $method,
+    @_,
+  );
+
+}
+
+sub CreateAccount {
+  my( $machine, $port, $login, $password, $method, @args ) = @_;
+
+  my %args = @args;
+  my $accountName  = delete $args{'accountName'};
+  my $accountType  = delete $args{'accountType'};
+  my $externalFlag = delete $args{'externalFlag'};
+  $args{'AccessModes'} = [ split(' ', $args{'AccessModes'}) ];
+  @args = ( accountName => $accountName, [ settings => \%args ],
+            accountType => $accountType, externalFlag => $externalFlag, );
+
+  communigate_pro_command( $machine, $port, $login, $password, $method, @args );
+
+}
+
+sub communigate_pro_command { #subroutine, not method
+  my( $machine, $port, $login, $password, $method, @args ) = @_;
+
+  eval "use CGP::CLI";
+
+  my $cli = new CGP::CLI( {
+    'PeerAddr' => $machine,
+    'PeerPort' => $port,
+    'login'    => $login,
+    'password' => $password,
+  } ) or die "Can't login to CGPro: $CGP::ERR_STRING\n";
+
+  $cli->$method(@args) or die "CGPro error: ". $cli->getErrMessage;
+
+  $cli->Logout or die "Can't logout of CGPro: $CGP:ERR_STRING\n";
+
+}
-- 
cgit v1.2.1


From c8b1222a15094d7b26f97798904c982616ca4c6f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Sep 2003 13:19:03 +0000
Subject: typo

---
 FS/FS/part_export/communigate_pro.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
index bce7f301f..97c946ac2 100644
--- a/FS/FS/part_export/communigate_pro.pm
+++ b/FS/FS/part_export/communigate_pro.pm
@@ -108,6 +108,6 @@ sub communigate_pro_command { #subroutine, not method
 
   $cli->$method(@args) or die "CGPro error: ". $cli->getErrMessage;
 
-  $cli->Logout or die "Can't logout of CGPro: $CGP:ERR_STRING\n";
+  $cli->Logout or die "Can't logout of CGPro: $CGP::ERR_STRING\n";
 
 }
-- 
cgit v1.2.1


From 31596791eb870db59a8861afd77ce868eae12c92 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Sep 2003 01:44:43 +0000
Subject: add get_session_history_sqlradacct have $ignore_quantity also ignore
 0 quantities

---
 FS/FS/cust_svc.pm | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 FS/FS/svc_acct.pm | 12 ++++++++++++
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 7aa311ba5..6adb571d3 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -231,7 +231,7 @@ sub check {
     });
     return "Already ". scalar(@cust_svc). " ". $part_svc->svc.
            " services for pkgnum ". $self->pkgnum
-      if scalar(@cust_svc) >= $quantity && (!$ignore_quantity || !$quantity);
+      if scalar(@cust_svc) >= $quantity && !$ignore_quantity;
   }
 
   $self->SUPER::check;
@@ -499,6 +499,62 @@ sub attribute_since_sqlradacct {
 
 }
 
+=item get_session_history_sqlradacct TIMESTAMP_START TIMESTAMP_END
+
+See L<FS::svc_acct/get_session_history_sqlradacct>.  Equivalent to
+$cust_svc->svc_x->get_session_history_sqlradacct, but more efficient.
+Meaningless for records where B<svcdb> is not "svc_acct".
+
+=cut
+
+sub get_session_history {
+  my($self, $start, $end, $attrib) = @_;
+
+  my $username = $self->svc_x->username;
+
+  my @part_export = $self->part_svc->part_export('sqlradius')
+    or die "no sqlradius export configured for this service type";
+    #or return undef;
+                     
+  my @sessions = ();
+
+  foreach my $part_export ( @part_export ) {
+                                            
+    my $dbh = DBI->connect( map { $part_export->option($_) }
+                            qw(datasrc username password)    )
+      or die "can't connect to sqlradius database: ". $DBI::errstr;
+
+    #select a unix time conversion function based on database type
+    my $str2time;                                                 
+    if ( $dbh->{Driver}->{Name} eq 'mysql' ) {
+      $str2time = 'UNIX_TIMESTAMP(';          
+    } elsif ( $dbh->{Driver}->{Name} eq 'Pg' ) {
+      $str2time = 'EXTRACT( EPOCH FROM ';       
+    } else {
+      warn "warning: unknown database type ". $dbh->{Driver}->{Name}.
+           "; guessing how to convert to UNIX timestamps";
+      $str2time = 'extract(epoch from ';                  
+    }
+
+    my @fields = qw( acctstarttime acctstoptime acctsessiontime
+                     acctinputoctets acctoutputoctets framedipaddress );
+     
+    my $sth = $dbh->prepare('SELECT '. join(', ', @fields).
+                            "  FROM radacct
+                               WHERE UserName = ?
+                                 AND $str2time AcctStopTime ) >= ?
+                                 AND $str2time AcctStopTime ) <=  ?
+                                 ORDER BY AcctStartTime DESC
+    ") or die $dbh->errstr;                                 
+    $sth->execute($username, $start, $end) or die $sth->errstr;
+
+    push @sessions, map { { %$_ } } @{ $sth->fetchall_arrayref({}) };
+
+  }
+  \@sessions
+
+}
+
 =back
 
 =head1 BUGS
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 1cf8a798b..6f0b558b9 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1007,6 +1007,18 @@ sub attribute_since_sqlradacct {
   $self->cust_svc->attribute_since_sqlradacct(@_);
 }
 
+=item get_session_history TIMESTAMP_START TIMESTAMP_END
+
+Returns an array of hash references of this customers login history for the
+given time range.  (document this better)
+
+=cut
+
+sub get_session_history {
+  my $self = shift;
+  $self->cust_svc->get_session_history(@_);
+}
+
 =item radius_groups
 
 Returns all RADIUS groups for this account (see L<FS::radius_usergroup>).
-- 
cgit v1.2.1


From 3774237846391a76d2d5c57ac2638f64fef40cd0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Sep 2003 01:45:33 +0000
Subject: fix method name

---
 FS/FS/svc_acct.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 6f0b558b9..7e8cb0710 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1007,16 +1007,16 @@ sub attribute_since_sqlradacct {
   $self->cust_svc->attribute_since_sqlradacct(@_);
 }
 
-=item get_session_history TIMESTAMP_START TIMESTAMP_END
+=item get_session_history_sqlradacct TIMESTAMP_START TIMESTAMP_END
 
 Returns an array of hash references of this customers login history for the
 given time range.  (document this better)
 
 =cut
 
-sub get_session_history {
+sub get_session_history_sqlradacct {
   my $self = shift;
-  $self->cust_svc->get_session_history(@_);
+  $self->cust_svc->get_session_history_sqlradacct(@_);
 }
 
 =item radius_groups
-- 
cgit v1.2.1


From d36be121c808c07d9d4924d94294029c0c840088 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Sep 2003 06:45:52 +0000
Subject: updated DBI link in sqlradius export notes

---
 FS/FS/part_export.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index d6422fe16..845e687c7 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -932,14 +932,14 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
       'desc' => 'Real-time export to SQL-backed RADIUS (FreeRADIUS, ICRADIUS, Radiator)',
       'options' => \%sqlradius_options,
       'nodomain' => 'Y',
-      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a>, <a href="http://radius.innercite.com/">ICRADIUS</a> or <a href="http://www.open.com.au/radiator/">Radiator</a>.  This export does not export RADIUS realms (see also sqlradius_withdomain).  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.<ul><li>Using FreeRADIUS 0.9.0 with the PostgreSQL backend, the db_postgresql.sql schema and postgresql.conf queries contain incompatible changes.  This will be fixed in 0.9.1 - until then, use the schema and queries from 0.8.1 or CVS.  Only new installs with 0.9.0 and PostgreSQL are affected - upgrades and other database backends and versions are unaffected.<li>Using ICRADIUS, add a dummy "op" column to your database: <blockquote><code>ALTER&nbsp;TABLE&nbsp;radcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'</code></blockquote><li>Using Radiator, see the <a href="http://www.open.com.au/radiator/faq.html#38">Radiator FAQ</a> for configuration information.</ul>',
+      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a>, <a href="http://radius.innercite.com/">ICRADIUS</a> or <a href="http://www.open.com.au/radiator/">Radiator</a>.  This export does not export RADIUS realms (see also sqlradius_withdomain).  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI/DBI.pm#connect">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.<ul><li>Using FreeRADIUS 0.9.0 with the PostgreSQL backend, the db_postgresql.sql schema and postgresql.conf queries contain incompatible changes.  This will be fixed in 0.9.1 - until then, use the schema and queries from 0.8.1 or CVS.  Only new installs with 0.9.0 and PostgreSQL are affected - upgrades and other database backends and versions are unaffected.<li>Using ICRADIUS, add a dummy "op" column to your database: <blockquote><code>ALTER&nbsp;TABLE&nbsp;radcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'</code></blockquote><li>Using Radiator, see the <a href="http://www.open.com.au/radiator/faq.html#38">Radiator FAQ</a> for configuration information.</ul>',
     },
 
     'sqlradius_withdomain' => {
       'desc' => 'Real-time export to SQL-backed RADIUS (FreeRADIUS, ICRADIUS, Radiator) with realms',
       'options' => \%sqlradius_withdomain_options,
       'nodomain' => '',
-      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a>, <a href="http://radius.innercite.com/">ICRADIUS</a> or <a href="http://www.open.com.au/radiator/">Radiator</a>.  This export exports domains to RADIUS realms (see also sqlradius).  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI/DBI.pm">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.<ul><li>Using FreeRADIUS 0.9.0 with the PostgreSQL backend, the db_postgresql.sql schema and postgresql.conf queries contain incompatible changes.  This will be fixed in 0.9.1 - until then, use the schema and queries from 0.8.1 or CVS.  Only new installs with 0.9.0 and PostgreSQL are affected - upgrades and other database backends and versions are unaffected.<li>Using ICRADIUS, add a dummy "op" column to your database: <blockquote><code>ALTER&nbsp;TABLE&nbsp;radcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'</code></blockquote><li>Using Radiator, see the <a href="http://www.open.com.au/radiator/faq.html#38">Radiator FAQ</a> for configuration information.</ul>',
+      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a>, <a href="http://radius.innercite.com/">ICRADIUS</a> or <a href="http://www.open.com.au/radiator/">Radiator</a>.  This export exports domains to RADIUS realms (see also sqlradius).  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI/DBI.pm#connect">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.<ul><li>Using FreeRADIUS 0.9.0 with the PostgreSQL backend, the db_postgresql.sql schema and postgresql.conf queries contain incompatible changes.  This will be fixed in 0.9.1 - until then, use the schema and queries from 0.8.1 or CVS.  Only new installs with 0.9.0 and PostgreSQL are affected - upgrades and other database backends and versions are unaffected.<li>Using ICRADIUS, add a dummy "op" column to your database: <blockquote><code>ALTER&nbsp;TABLE&nbsp;radcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'</code></blockquote><li>Using Radiator, see the <a href="http://www.open.com.au/radiator/faq.html#38">Radiator FAQ</a> for configuration information.</ul>',
     },
 
     'sqlmail' => {
-- 
cgit v1.2.1


From b487a58e0f36136dbd714916f98a4eaed2373bb0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Sep 2003 07:20:59 +0000
Subject: hide display of disabled packages from agent type browse

---
 httemplate/browse/agent_type.cgi | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index 5a8438589..c61208c83 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -17,9 +17,11 @@ agents.<BR><BR>
 foreach my $agent_type ( sort { 
   $a->getfield('typenum') <=> $b->getfield('typenum')
 } qsearch('agent_type',{}) ) {
-  my($hashref)=$agent_type->hashref;
-  my(@type_pkgs)=qsearch('type_pkgs',{'typenum'=> $hashref->{typenum} });
-  my($rowspan)=scalar(@type_pkgs);
+  my $hashref = $agent_type->hashref;
+  #more efficient to do this with SQL...
+  my @type_pkgs = grep { ! $_->part_pkg->disabled }
+                       qsearch('type_pkgs',{'typenum'=> $hashref->{typenum} });
+  my $rowspan = scalar(@type_pkgs);
   $rowspan = int($rowspan/2+0.5) ;
   print <<END;
       <TR>
-- 
cgit v1.2.1


From 585a29a929576d27a02d04f17a0b8a48a181aed0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 9 Sep 2003 04:16:08 +0000
Subject: typo hiding remote username labels

---
 FS/FS/part_export.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 845e687c7..944a72c6b 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -681,7 +681,7 @@ tie my %router_options, 'Tie::IxHash',
 ;
 
 tie my %domain_shellcommands_options, 'Tie::IxHash',
-  'user' => { lable=>'Remote username', default=>'root' },
+  'user' => { label=>'Remote username', default=>'root' },
   'useradd' => { label=>'Insert command',
                  default=>'',
                },
@@ -869,7 +869,7 @@ tie my %ldap_options, 'Tie::IxHash',
 ;
 
 tie my %forward_shellcommands_options, 'Tie::IxHash',
-  'user' => { lable=>'Remote username', default=>'root' },
+  'user' => { label=>'Remote username', default=>'root' },
   'useradd' => { label=>'Insert command',
                  default=>'',
                },
-- 
cgit v1.2.1


From 6bc212a7fda75de769f1e1f656313e7e7874e0ab Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 9 Sep 2003 22:36:57 +0000
Subject: adding communigate_pro export

---
 FS/MANIFEST | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 0fbbf5cb5..ad013c848 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -71,6 +71,7 @@ FS/part_export/apache.pm
 FS/part_export/bind.pm
 FS/part_export/bind_slave.pm
 FS/part_export/bsdshell.pm
+FS/part_export/communigate_pro.pm
 FS/part_export/cp.pm
 FS/part_export/cyrus.pm
 FS/part_export/domain_shellcommands.pm
-- 
cgit v1.2.1


From 3b10b02bee99de0ca2a2d260227b315ae227976a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Sep 2003 10:54:46 +0000
Subject: adding cust_main method

---
 FS/FS/cust_pay.pm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 7be115356..e1943ae2d 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -385,11 +385,23 @@ sub unapplied {
   sprintf("%.2f", $amount );
 }
 
+=item cust_main
+
+Returns the parent customer object (see L<FS::cust_main>).
+
+=cut
+
+sub cust_main {
+  my $self = shift;
+  qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+}
+
+
 =back
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.25 2003-08-05 00:20:42 khoff Exp $
+$Id: cust_pay.pm,v 1.26 2003-09-10 10:54:46 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 2cafaa2750d80a3d2d71fdc98dfffde56941426b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Sep 2003 21:01:03 +0000
Subject: set initial password for new accounts

---
 FS/FS/part_export/communigate_pro.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
index 97c946ac2..4068881e4 100644
--- a/FS/FS/part_export/communigate_pro.pm
+++ b/FS/FS/part_export/communigate_pro.pm
@@ -17,6 +17,7 @@ sub _export_insert {
     'AccessModes'    => $self->option('AccessModes'),
     'RealName'       => $svc_acct->finger,
     'MaxAccountSize' => $svc_acct->quota,
+    'Password'       => $svc_acct->_password,
   );
 }
 
-- 
cgit v1.2.1


From c3544763d301a8f1bc2c1b5f4ea4c9b3543332d2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Sep 2003 21:39:20 +0000
Subject: fix for communigate pro weird data structure on create

---
 FS/FS/part_export/communigate_pro.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
index 4068881e4..2370e3179 100644
--- a/FS/FS/part_export/communigate_pro.pm
+++ b/FS/FS/part_export/communigate_pro.pm
@@ -88,8 +88,10 @@ sub CreateAccount {
   my $accountType  = delete $args{'accountType'};
   my $externalFlag = delete $args{'externalFlag'};
   $args{'AccessModes'} = [ split(' ', $args{'AccessModes'}) ];
-  @args = ( accountName => $accountName, [ settings => \%args ],
-            accountType => $accountType, externalFlag => $externalFlag, );
+  @args = ( accountName => $accountName, [
+                                           settings     => \%args,
+                                           accountType  => $accountType,
+                                           externalFlag => $externalFlag, ] );
 
   communigate_pro_command( $machine, $port, $login, $password, $method, @args );
 
-- 
cgit v1.2.1


From 67578fdbc842e9d4a14724c90e70a4f777ec2e03 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Sep 2003 21:45:36 +0000
Subject: communitgate pro CreateAccount examples are on crack

---
 FS/FS/part_export/communigate_pro.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
index 2370e3179..6c1f2aca2 100644
--- a/FS/FS/part_export/communigate_pro.pm
+++ b/FS/FS/part_export/communigate_pro.pm
@@ -88,10 +88,11 @@ sub CreateAccount {
   my $accountType  = delete $args{'accountType'};
   my $externalFlag = delete $args{'externalFlag'};
   $args{'AccessModes'} = [ split(' ', $args{'AccessModes'}) ];
-  @args = ( accountName => $accountName, [
-                                           settings     => \%args,
-                                           accountType  => $accountType,
-                                           externalFlag => $externalFlag, ] );
+  @args = ( accountName => $accountName,
+            accountType  => $accountType,
+            externalFlag => $externalFlag,
+            settings     => \%args,
+          );
 
   communigate_pro_command( $machine, $port, $login, $password, $method, @args );
 
-- 
cgit v1.2.1


From 73af3bb80cd59d1bed31697a97024ec764fad73c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Sep 2003 21:56:25 +0000
Subject: don't set an empty externalFlag

---
 FS/FS/part_export/communigate_pro.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
index 6c1f2aca2..54a8277cb 100644
--- a/FS/FS/part_export/communigate_pro.pm
+++ b/FS/FS/part_export/communigate_pro.pm
@@ -90,9 +90,10 @@ sub CreateAccount {
   $args{'AccessModes'} = [ split(' ', $args{'AccessModes'}) ];
   @args = ( accountName => $accountName,
             accountType  => $accountType,
-            externalFlag => $externalFlag,
             settings     => \%args,
           );
+            #externalFlag => $externalFlag,
+  push @args, externalFlag => $externalFlag if $externalFlag;
 
   communigate_pro_command( $machine, $port, $login, $password, $method, @args );
 
-- 
cgit v1.2.1


From a5a6b0caa63e8d44640986667c9abf6dfd67fcee Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Sep 2003 22:10:17 +0000
Subject: communigate pro quota bs

---
 FS/FS/part_export/communigate_pro.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
index 54a8277cb..ae20e2423 100644
--- a/FS/FS/part_export/communigate_pro.pm
+++ b/FS/FS/part_export/communigate_pro.pm
@@ -10,15 +10,18 @@ sub rebless { shift; }
 
 sub _export_insert {
   my( $self, $svc_acct ) = (shift, shift);
-  $self->communigate_pro_queue( $svc_acct->svcnum, 'CreateAccount',
+  my @options = ( $svc_acct->svcnum, 'CreateAccount',
     'accountName'    => $svc_acct->email,
     'accountType'    => $self->option('accountType'),
-    'externalFlag'   => $self->option('externalFlag'),
     'AccessModes'    => $self->option('AccessModes'),
     'RealName'       => $svc_acct->finger,
-    'MaxAccountSize' => $svc_acct->quota,
     'Password'       => $svc_acct->_password,
   );
+  push @options, 'MaxAccountSize' => $svc_acct->quota if $svc_acct->quota;
+  push @options, 'externalFlag'   => $self->option('externalFlag')
+    if $self->option('externalFlag');
+
+  $self->communigate_pro_queue( @options );
 }
 
 sub _export_replace {
-- 
cgit v1.2.1


From 746fa18657226956f5df45921d9f343ff6836e9f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Sep 2003 21:54:17 +0000
Subject: update doc note for freeradius 0.9.1

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 944a72c6b..69dd78a87 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -932,7 +932,7 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
       'desc' => 'Real-time export to SQL-backed RADIUS (FreeRADIUS, ICRADIUS, Radiator)',
       'options' => \%sqlradius_options,
       'nodomain' => 'Y',
-      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a>, <a href="http://radius.innercite.com/">ICRADIUS</a> or <a href="http://www.open.com.au/radiator/">Radiator</a>.  This export does not export RADIUS realms (see also sqlradius_withdomain).  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI/DBI.pm#connect">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.<ul><li>Using FreeRADIUS 0.9.0 with the PostgreSQL backend, the db_postgresql.sql schema and postgresql.conf queries contain incompatible changes.  This will be fixed in 0.9.1 - until then, use the schema and queries from 0.8.1 or CVS.  Only new installs with 0.9.0 and PostgreSQL are affected - upgrades and other database backends and versions are unaffected.<li>Using ICRADIUS, add a dummy "op" column to your database: <blockquote><code>ALTER&nbsp;TABLE&nbsp;radcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'</code></blockquote><li>Using Radiator, see the <a href="http://www.open.com.au/radiator/faq.html#38">Radiator FAQ</a> for configuration information.</ul>',
+      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a>, <a href="http://radius.innercite.com/">ICRADIUS</a> or <a href="http://www.open.com.au/radiator/">Radiator</a>.  This export does not export RADIUS realms (see also sqlradius_withdomain).  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI/DBI.pm#connect">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.<ul><li>Using FreeRADIUS 0.9.0 with the PostgreSQL backend, the db_postgresql.sql schema and postgresql.conf queries contain incompatible changes.  This is fixed in 0.9.1.  Only new installs with 0.9.0 and PostgreSQL are affected - upgrades and other database backends and versions are unaffected.<li>Using ICRADIUS, add a dummy "op" column to your database: <blockquote><code>ALTER&nbsp;TABLE&nbsp;radcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'</code></blockquote><li>Using Radiator, see the <a href="http://www.open.com.au/radiator/faq.html#38">Radiator FAQ</a> for configuration information.</ul>',
     },
 
     'sqlradius_withdomain' => {
-- 
cgit v1.2.1


From dc77b9285fd9bd9a9594b5d6abf82a5a69e1097c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Sep 2003 21:57:56 +0000
Subject: also update sqlradius_withdomaind description for freeradius 0.9.1

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 69dd78a87..01e71c0ed 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -939,7 +939,7 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
       'desc' => 'Real-time export to SQL-backed RADIUS (FreeRADIUS, ICRADIUS, Radiator) with realms',
       'options' => \%sqlradius_withdomain_options,
       'nodomain' => '',
-      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a>, <a href="http://radius.innercite.com/">ICRADIUS</a> or <a href="http://www.open.com.au/radiator/">Radiator</a>.  This export exports domains to RADIUS realms (see also sqlradius).  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI/DBI.pm#connect">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.<ul><li>Using FreeRADIUS 0.9.0 with the PostgreSQL backend, the db_postgresql.sql schema and postgresql.conf queries contain incompatible changes.  This will be fixed in 0.9.1 - until then, use the schema and queries from 0.8.1 or CVS.  Only new installs with 0.9.0 and PostgreSQL are affected - upgrades and other database backends and versions are unaffected.<li>Using ICRADIUS, add a dummy "op" column to your database: <blockquote><code>ALTER&nbsp;TABLE&nbsp;radcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'</code></blockquote><li>Using Radiator, see the <a href="http://www.open.com.au/radiator/faq.html#38">Radiator FAQ</a> for configuration information.</ul>',
+      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a>, <a href="http://radius.innercite.com/">ICRADIUS</a> or <a href="http://www.open.com.au/radiator/">Radiator</a>.  This export exports domains to RADIUS realms (see also sqlradius).  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI/DBI.pm#connect">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.<ul><li>Using FreeRADIUS 0.9.0 with the PostgreSQL backend, the db_postgresql.sql schema and postgresql.conf queries contain incompatible changes.  This is fixed in 0.9.1.  Only new installs with 0.9.0 and PostgreSQL are affected - upgrades and other database backends and versions are unaffected.<li>Using ICRADIUS, add a dummy "op" column to your database: <blockquote><code>ALTER&nbsp;TABLE&nbsp;radcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'</code></blockquote><li>Using Radiator, see the <a href="http://www.open.com.au/radiator/faq.html#38">Radiator FAQ</a> for configuration information.</ul>',
     },
 
     'sqlmail' => {
-- 
cgit v1.2.1


From 85e1e6cd17d746818ad898bdac7c48de91398b2b Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Fri, 12 Sep 2003 00:14:48 +0000
Subject: @excludeaddr is a list of addresses, not NetAddrs, so it shouldn't be
 map'd

---
 FS/FS/addr_block.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/FS/FS/addr_block.pm b/FS/FS/addr_block.pm
index 4b034ef0c..1fb60606d 100755
--- a/FS/FS/addr_block.pm
+++ b/FS/FS/addr_block.pm
@@ -176,11 +176,12 @@ sub next_free_addr {
   my $conf = new FS::Conf;
   my @excludeaddr = $conf->config('exclude_ip_addr');
   
-  my @used = (
-    map { $_->NetAddr->addr } 
-      ($self, 
-       qsearch('svc_broadband', { blocknum => $self->blocknum }) ),
-     @excludeaddr );
+my @used =
+( (map { $_->NetAddr->addr }
+    ($self,
+     qsearch('svc_broadband', { blocknum => $self->blocknum }))
+  ), @excludeaddr
+);
 
   my @free = $self->NetAddr->hostenum;
   while (my $ip = shift @free) {
-- 
cgit v1.2.1


From 32ba5c8d264479a302c1524165d708ce11243d69 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 Sep 2003 21:33:03 +0000
Subject: package search skips cancelled packages when searching by date range

---
 httemplate/search/cust_pkg.cgi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 8b2fd0ca0..f735fbf42 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -33,6 +33,8 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
     $range .= ( $range ? ' AND ' : ' WHERE ' ). " bill <= $ending ";
   }
 
+  $range .= ( $range ? 'AND ' : ' WHERE ' ). '( cancel IS NULL OR cancel = 0 )';
+
   #false laziness with below
   my $statement = "SELECT COUNT(*) FROM cust_pkg $range";
   warn $statement;
-- 
cgit v1.2.1


From a68758a95e760e50ad99a2a2e0885d2aa9cf907a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 18 Sep 2003 10:46:35 +0000
Subject: include info on number of active/cancelled customers in agent browse

---
 httemplate/browse/agent.cgi | 75 +++++++++++++++++++++++++++++----------------
 1 file changed, 49 insertions(+), 26 deletions(-)

diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index cff111ca4..adeb78dbd 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -1,15 +1,30 @@
 <!-- mason kludge -->
+
 <%
-#Begin silliness
-#
-#use FS::UI::CGI;
-#use FS::UI::agent;
-#
-#$ui = new FS::UI::agent;
-#$ui->browse;
-#exit;
-#__END__
-#End silliness
+
+  #bad false laziness with search/cust_main.cgi (also needs fixing up for
+  #old mysql)
+  my $ncancelled = "
+     0 < ( SELECT COUNT(*) FROM cust_pkg
+                  WHERE cust_pkg.custnum = cust_main.custnum
+                    AND ( cust_pkg.cancel IS NULL
+                          OR cust_pkg.cancel = 0
+                        )
+              )
+       OR 0 = ( SELECT COUNT(*) FROM cust_pkg
+                  WHERE cust_pkg.custnum = cust_main.custnum
+              )
+  ";
+
+  my $ncancelled_sth = dbh->prepare("SELECT COUNT(*) FROM cust_main
+                                       WHERE agentnum = ?
+                                         AND $ncancelled             ")
+    or die dbh->errstr;
+
+  my $total_sth = dbh->prepare("SELECT COUNT(*) FROM cust_main
+                                  WHERE agentnum = ?           ")
+    or die dbh->errstr;
+
 %>
 
 <%= header('Agent Listing', menubar(
@@ -25,6 +40,7 @@ full offerings (via their type).<BR><BR>
 <TR>
   <TH COLSPAN=2>Agent</TH>
   <TH>Type</TH>
+  <TH>Customers</TH>
   <TH><FONT SIZE=-1>Freq.</FONT></TH>
   <TH><FONT SIZE=-1>Prog.</FONT></TH>
 </TR>
@@ -36,28 +52,35 @@ foreach my $agent ( sort {
   #$a->getfield('agentnum') <=> $b->getfield('agentnum')
   $a->getfield('agent') cmp $b->getfield('agent')
 } qsearch('agent',{}) ) {
-  my($hashref)=$agent->hashref;
-  my($typenum)=$hashref->{typenum};
-  my($agent_type)=qsearchs('agent_type',{'typenum'=>$typenum});
-  my($atype)=$agent_type->getfield('atype');
-  print <<END;
+
+  $ncancelled_sth->execute($agent->agentnum) or die $ncancelled_sth->errstr;
+  my $num_ncancelled = $ncancelled_sth->fetchrow_arrayref->[0];
+
+  $total_sth->execute($agent->agentnum) or die $total_sth->errstr;
+  my $num_total = $total_sth->fetchrow_arrayref->[0];
+
+  my $num_cancelled = $num_total - $num_ncancelled;
+
+%>
+
       <TR>
-        <TD><A HREF="${p}edit/agent.cgi?$hashref->{agentnum}">
-          $hashref->{agentnum}</A></TD>
-        <TD><A HREF="${p}edit/agent.cgi?$hashref->{agentnum}">
-          $hashref->{agent}</A></TD>
-        <TD><A HREF="${p}edit/agent_type.cgi?$typenum">$atype</A></TD>
+        <TD><A HREF="<%=$p%>edit/agent.cgi?<%= $agent->agentnum %>">
+          <%= $agent->agentnum %></A></TD>
+        <TD><A HREF="<%=$p%>edit/agent.cgi?<%= $agent->agentnum %>">
+          <%= $agent->agent %></A></TD>
+        <TD><A HREF="<%=$p%>edit/agent_type.cgi?<%= $agent->typenum %>"><%= $agent->agent_type->atype %></A></TD>
+        <TD>
+          <FONT COLOR="#00CC00"><B><%= $num_ncancelled %></B></FONT>
+            active
+          <BR><FONT COLOR="#FF0000"><B><%= $num_cancelled %></B></FONT>
+            cancelled
+        </TD>
         <TD>$hashref->{freq}</TD>
         <TD>$hashref->{prog}</TD>
       </TR>
-END
 
-}
+<% } %>
 
-print <<END;
     </TABLE>
   </BODY>
 </HTML>
-END
-
-%>
-- 
cgit v1.2.1


From ea1e0de8c51ea562308c20416e1f3fcb719a8847 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 18 Sep 2003 10:52:28 +0000
Subject: oops

---
 httemplate/browse/agent.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index adeb78dbd..79f6c3dcf 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -75,8 +75,8 @@ foreach my $agent ( sort {
           <BR><FONT COLOR="#FF0000"><B><%= $num_cancelled %></B></FONT>
             cancelled
         </TD>
-        <TD>$hashref->{freq}</TD>
-        <TD>$hashref->{prog}</TD>
+        <TD><%= $agent->freq %></TD>
+        <TD><%= $agent->prog %></TD>
       </TR>
 
 <% } %>
-- 
cgit v1.2.1


From a39d4a1fccda8c95157c6667c66b22b75b4f1e03 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Sep 2003 04:13:33 +0000
Subject: deprecate signup_server-quiet config option

---
 FS/FS/Conf.pm      |  4 ++--
 FS/FS/cust_main.pm |  2 ++
 FS/FS/cust_pkg.pm  | 11 +++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 36d55e4a8..5ad109942 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -895,8 +895,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'signup_server-quiet',
-    'section'     => '',
-    'description' => 'Disable decline and cancel emails generated by transactions initiated by the signup server. Not recommended, unless the customer will get instant feedback from a customer service UI, and receiving an email would be confusing/overkill. Does not disable welcome emails.',
+    'section'     => 'deprecated',
+    'description' => ''<b>DEPRECATED</b>, the signup server is now part of the self-service server and no longer sends superfluous decline and cancel emails.  Used to disable decline and cancel emails generated by transactions initiated by the signup server.  Does not disable welcome emails.',
     'type'        => 'checkbox',
   },
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 997f096fc..a92f1a3ed 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1299,6 +1299,8 @@ report_badcard - This option is deprecated.
 
 force_print - This option is deprecated; see the invoice events web interface.
 
+quiet - set true to surpress email card/ACH decline notices.
+
 =cut
 
 sub collect {
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index f59b45ab1..9a54b95c9 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2,7 +2,6 @@ package FS::cust_pkg;
 
 use strict;
 use vars qw(@ISA $disable_agentcheck);
-use vars qw( $quiet );
 use FS::UID qw( getotaker dbh );
 use FS::Record qw( qsearch qsearchs );
 use FS::Misc qw( send_email );
@@ -252,18 +251,22 @@ sub check {
   $self->SUPER::check;
 }
 
-=item cancel
+=item cancel [ OPTION => VALUE ... ]
 
 Cancels and removes all services (see L<FS::cust_svc> and L<FS::part_svc>)
 in this package, then cancels the package itself (sets the cancel field to
 now).
 
+Available options are: I<quiet>
+
+I<quiet> can be set true to supress email cancellation notices.
+
 If there is an error, returns the error, otherwise returns false.
 
 =cut
 
 sub cancel {
-  my $self = shift;
+  my( $self, %options ) = @_;
   my $error;
 
   local $SIG{HUP} = 'IGNORE';
@@ -304,7 +307,7 @@ sub cancel {
 
   my $conf = new FS::Conf;
   my @invoicing_list = grep { $_ ne 'POST' } $self->cust_main->invoicing_list;
-  if ( !$quiet && $conf->exists('emailcancel') && @invoicing_list ) {
+  if ( !$options{'quiet'} && $conf->exists('emailcancel') && @invoicing_list ) {
     my $conf = new FS::Conf;
     my $error = send_email(
       'from'    => $conf->config('invoice_from'),
-- 
cgit v1.2.1


From 840121c8e483108d435744ae684502c558972644 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Sep 2003 04:25:31 +0000
Subject: finish cleaning up the quiet stuff

---
 FS/FS/cust_main.pm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index a92f1a3ed..997eceacc 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2,6 +2,7 @@ package FS::cust_main;
 
 use strict;
 use vars qw( @ISA $conf $Debug $import );
+use vars qw( $realtime_bop_decline_quiet ); #ugh
 use Safe;
 use Carp;
 BEGIN {
@@ -38,6 +39,8 @@ use FS::Msgcat qw(gettext);
 
 @ISA = qw( FS::Record );
 
+$realtime_bop_decline_quiet = 0;
+
 $Debug = 1;
 #$Debug = 1;
 
@@ -1377,7 +1380,12 @@ sub collect {
       warn "calling invoice event (". $part_bill_event->eventcode. ")\n"
         if $Debug;
       my $cust_main = $self; #for callback
-      my $error = eval $part_bill_event->eventcode;
+
+      my $error;
+      {
+        local $realtime_bop_decline_quiet = 1 if $options{'quiet'};
+        $error = eval $part_bill_event->eventcode;
+      }
 
       my $status = '';
       my $statustext = '';
@@ -1682,7 +1690,8 @@ sub realtime_bop {
 
     my $perror = "$processor error: ". $transaction->error_message;
 
-    if ( !$options{'quiet'} && $conf->exists('emaildecline')
+    if ( !$options{'quiet'} && !$realtime_bop_decline_quiet
+         && $conf->exists('emaildecline')
          && grep { $_ ne 'POST' } $self->invoicing_list
     ) {
       my @templ = $conf->config('declinetemplate');
-- 
cgit v1.2.1


From 84350d6e85711cb4ba6fbf6ef40a58d6cf0e52da Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Sep 2003 09:59:30 +0000
Subject: removing signup and passwd servers

---
 init.d/freeside-init | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/init.d/freeside-init b/init.d/freeside-init
index 68cba8da3..7b9461e51 100644
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -7,14 +7,6 @@ QUEUED_USER=%%%QUEUED_USER%%%
 
 FREESIDE_PATH="%%%FREESIDE_PATH%%%"
 
-PASSWD_USER=%%%PASSWD_USER%%%
-PASSWD_MACHINE=%%%PASSWD_MACHINE%%%
-
-SIGNUP_USER=%%%SIGNUP_USER%%%
-SIGNUP_MACHINE=%%%SIGNUP_MACHINE%%%
-SIGNUP_AGENTNUM=%%%SIGNUP_AGENTNUM%%%
-SIGNUP_REFNUM=%%%SIGNUP_REFNUM%%%
-
 SELFSERVICE_USER=%%%SELFSERVICE_USER%%%
 SELFSERVICE_MACHINE=%%%SELFSERVICE_MACHINE%%%
 
@@ -25,14 +17,6 @@ case "$1" in
         freeside-queued $QUEUED_USER
         echo "done."
 
-        echo -n "Starting fs_passwd_server: "
-        su freeside -c "$FREESIDE_PATH/fs_passwd/fs_passwd_server $PASSWD_USER $PASSWD_MACHINE" &
-        echo "done."
-
-        echo -n "Starting fs_signup_server: "
-        su freeside -c "$FREESIDE_PATH/fs_signup/fs_signup_server $SIGNUP_USER $SIGNUP_MACHINE $SIGNUP_AGENTNUM $SIGNUP_REFNUM" &
-        echo "done."
-
         echo -n "Starting freeside-selfservice-server: "
         freeside-selfservice-server $SELFSERVICE_USER $SELFSERVICE_MACHINE
         echo "done."
@@ -44,14 +28,6 @@ case "$1" in
         kill `cat /var/run/freeside-queued.pid`
         echo "done."
 
-        echo -n "Stopping fs_passwd_server: "
-        killall fs_passwd_server
-        echo "done."
-
-        echo -n "Stopping fs_signup_server: "
-        killall fs_signup_server
-        echo "done."
-
         echo -n "Stopping freeside-selfservice-server: "
         kill `cat /var/run/freeside-selfservice-server.pid`
         echo "done."
-- 
cgit v1.2.1


From 86c14f830b8d7e996bb84a0ad6a89f26816ea5b7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Sep 2003 10:07:18 +0000
Subject: move signup server functions to self-service server.  fix
 provisioning & immediate suspension of declined signups.

---
 FS/FS/ClientAPI/Signup.pm                 | 183 ++++++++++++++++++++++++++++++
 FS/FS/Conf.pm                             |  17 ++-
 FS/FS/cust_main.pm                        |  46 +++++++-
 FS/FS/cust_pkg.pm                         |  35 ++++++
 Makefile                                  |  14 ---
 fs_signup/FS-SignupClient/SignupClient.pm |  61 ++--------
 httemplate/docs/index.html                |   1 +
 7 files changed, 290 insertions(+), 67 deletions(-)
 create mode 100644 FS/FS/ClientAPI/Signup.pm

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
new file mode 100644
index 000000000..0bb9f7b6a
--- /dev/null
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -0,0 +1,183 @@
+package FS::ClientAPI::Signup;
+
+use strict;
+use Tie::RefHash;
+use FS::Conf;
+use FS::Record qw(qsearch qsearchs);
+use FS::agent;
+use FS::cust_main_county;
+use FS::part_pkg;
+use FS::svc_acct_pop;
+use FS::cust_main;
+use FS::cust_pkg;
+use FS::Msgcat qw(gettext);
+
+use FS::ClientAPI; #hmm
+FS::ClientAPI->register_handlers(
+  'Signup/signup_info'  => \&signup_info,
+  'Signup/new_customer' => \&new_customer,
+);
+
+sub signup_info {
+  #my $packet = shift;
+
+  my $conf = new FS::Conf;
+
+  my $signup_info = {
+
+    'cust_main_county' =>
+      [ map { $_->hashref } qsearch('cust_main_county', {}) ],
+
+    'agentnum2part_pkg' =>
+      {
+        map {
+          my $href = $_->pkgpart_hashref;
+          $_->agentnum =>
+            [
+              map { { 'payby' => [ $_->payby ], %{$_->hashref} } }
+                grep { $_->svcpart('svc_acct') && $href->{ $_->pkgpart } }
+                  qsearch( 'part_pkg', { 'disabled' => '' } )
+            ];
+        } qsearch('agent', {} )
+      },
+
+    'svc_acct_pop' => [ map { $_->hashref } qsearch('svc_acct_pop',{} ) ],
+
+    'security_phrase' => $conf->exists('security_phrase'),
+
+    'payby' => [ $conf->config('signup_server-payby') ],
+
+    'msgcat' => { map { $_=>gettext($_) } qw(
+      passwords_dont_match invalid_card unknown_card_type not_a
+    ) },
+
+    'statedefault' => $conf->config('statedefault') || 'CA',
+
+    'countrydefault' => $conf->config('countrydefault') || 'US',
+
+  };
+
+  if ( $conf->config('signup_server-default_agentnum') ) {
+    my $agentnum = $conf->config('signup_server-default_agentnum');
+    my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } )
+      or die "fatal: signup_server-default_agentnum $agentnum not found\n";
+    my $pkgpart_href = $agent->pkgpart_hashref;
+
+    $signup_info->{'part_pkg'} = [
+      #map { $_->hashref }
+      map { { 'payby' => [ $_->payby ], %{$_->hashref} } }
+        grep { $_->svcpart('svc_acct') && $pkgpart_href->{ $_->pkgpart } }
+          qsearch( 'part_pkg', { 'disabled' => '' } )
+    ];
+  }
+
+  $signup_info;
+
+}
+
+sub new_customer {
+  my $packet = shift;
+
+  my $conf = new FS::Conf;
+  my $error = '';
+  
+  #things that aren't necessary in base class, but are for signup server
+    #return "Passwords don't match"
+    #  if $hashref->{'_password'} ne $hashref->{'_password2'}
+  $error ||= gettext('empty_password') unless $packet->{'_password'};
+  # a bit inefficient for large numbers of pops
+  $error ||= gettext('no_access_number_selected')
+    unless $packet->{'popnum'} || !scalar(qsearch('svc_acct_pop',{} ));
+
+  #shares some stuff with htdocs/edit/process/cust_main.cgi... take any
+  # common that are still here and library them.
+  my $cust_main = new FS::cust_main ( {
+    #'custnum'          => '',
+    'agentnum'      => $packet->{agentnum}
+                       || $conf->config('signup_server-default_agentnum'),
+    'refnum'        => $packet->{refnum}
+                       || $conf->config('signup_server-default_refnum'),
+
+    map { $_ => $packet->{$_} } qw(
+      last first ss company address1 address2 city county state zip country
+      daytime night fax payby payinfo paydate payname referral_custnum comments
+    ),
+
+  } );
+
+  $error ||= "Illegal payment type"
+    unless grep { $_ eq $packet->{'payby'} }
+                $conf->config('signup_server-payby');
+
+  $cust_main->payinfo($cust_main->daytime)
+    if $cust_main->payby eq 'LECB' && ! $cust_main->payinfo;
+
+  my @invoicing_list = split( /\s*\,\s*/, $packet->{'invoicing_list'} );
+
+  $packet->{'pkgpart'} =~ /^(\d+)$/ or '' =~ /^()$/;
+  my $pkgpart = $1;
+
+  my $part_pkg =
+    qsearchs( 'part_pkg', { 'pkgpart' => $pkgpart } )
+      or $error ||= "WARNING: unknown pkgpart: $pkgpart";
+  my $svcpart = $part_pkg->svcpart('svc_acct') unless $error;
+
+  my $cust_pkg = new FS::cust_pkg ( {
+    #later#'custnum' => $custnum,
+    'pkgpart' => $packet->{'pkgpart'},
+  } );
+  $error ||= $cust_pkg->check;
+
+  my $svc_acct = new FS::svc_acct ( {
+    'svcpart'   => $svcpart,
+    map { $_ => $packet->{$_} }
+      qw( username _password sec_phrase popnum ),
+  } );
+
+  my $y = $svc_acct->setdefault; # arguably should be in new method
+  $error ||= $y unless ref($y);
+
+  $error ||= $svc_acct->check;
+
+  use Tie::RefHash;
+  tie my %hash, 'Tie::RefHash';
+  %hash = ( $cust_pkg => [ $svc_acct ] );
+  #msgcat
+  $error ||= $cust_main->insert( \%hash, \@invoicing_list, 'noexport' => 1 );
+
+  if ( ! $error && $conf->exists('signup_server-realtime') ) {
+
+    #warn "[fs_signup_server] Billing customer...\n" if $Debug;
+
+    my $bill_error = $cust_main->bill;
+    #warn "[fs_signup_server] error billing new customer: $bill_error"
+    #  if $bill_error;
+
+    $cust_main->apply_payments;
+    $cust_main->apply_credits;
+
+    $bill_error = $cust_main->collect;
+    #warn "[fs_signup_server] error collecting from new customer: $bill_error"
+    #  if $bill_error;
+
+    if ( $cust_main->balance > 0 ) {
+
+      #this makes sense.  credit is "un-doing" the invoice
+      $cust_main->credit( $cust_main->balance, 'signup server decline' );
+      $cust_main->apply_credits;
+
+      #should check list for errors...
+      #$cust_main->suspend;
+      local $FS::svc_Common::noexport_hack = 1;
+      $cust_main->cancel;
+
+      $error = '_decline';
+    }
+
+  }
+  $cust_main->reexport unless $error;
+
+  return { error => $error };
+
+}
+
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 5ad109942..6fa47b6bd 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -896,7 +896,7 @@ httemplate/docs/config.html
   {
     'key'         => 'signup_server-quiet',
     'section'     => 'deprecated',
-    'description' => ''<b>DEPRECATED</b>, the signup server is now part of the self-service server and no longer sends superfluous decline and cancel emails.  Used to disable decline and cancel emails generated by transactions initiated by the signup server.  Does not disable welcome emails.',
+    'description' => '<b>DEPRECATED</b>, the signup server is now part of the self-service server and no longer sends superfluous decline and cancel emails.  Used to disable decline and cancel emails generated by transactions initiated by the signup server.  Does not disable welcome emails.',
     'type'        => 'checkbox',
   },
 
@@ -910,11 +910,24 @@ httemplate/docs/config.html
 
   {
     'key'         => 'signup_server-email',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, this feature is no longer available.  See the ***fill me in*** report instead.  Used to contain a comma-separated list of email addresses to receive notification of signups via the signup server.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'signup_server-default_agentnum',
     'section'     => '',
-    'description' => 'Comma-separated list of email addresses to receive notification of signups via the signup server.',
+    'description' => 'Default agentnum for the signup server',
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'signup_server-default_refnum',
+    'section'     => '',
+    'description' => 'Default advertising source number for the signup server',
+    'type'        => 'text',
+  },
 
   {
     'key'         => 'show-msgcat-codes',
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 997eceacc..e4d440600 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -7,7 +7,7 @@ use Safe;
 use Carp;
 BEGIN {
   eval "use Time::Local;";
-  die "Time::Local version 1.05 required with Perl versions before 5.6"
+  die "Time::Local minimum version 1.05 required with Perl versions before 5.6"
     if $] < 5.006 && !defined($Time::Local::VERSION);
   eval "use Time::Local qw(timelocal timelocal_nocheck);";
 }
@@ -201,7 +201,7 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 sub table { 'cust_main'; }
 
-=item insert [ CUST_PKG_HASHREF [ , INVOICING_LIST_ARYREF ] ]
+=item insert [ CUST_PKG_HASHREF [ , INVOICING_LIST_ARYREF ] [ , OPTION => VALUE ... ] ]
 
 Adds this customer to the database.  If there is an error, returns the error,
 otherwise returns false.
@@ -229,12 +229,18 @@ invoicing_list destination to the newly-created svc_acct.  Here's an example:
 
   $cust_main->insert( {}, [ $email, 'POST' ] );
 
+Currently available options are: I<noexport>
+
+If I<noexport> is set true, no provisioning jobs (exports) are scheduled.
+(You can schedule them later with the B<reexport> method.)
+
 =cut
 
 sub insert {
   my $self = shift;
   my $cust_pkgs = @_ ? shift : {};
   my $invoicing_list = @_ ? shift : '';
+  my %options = @_;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -286,6 +292,7 @@ sub insert {
   }
 
   # packages
+  local $FS::svc_Common::noexport_hack = 1 if $options{'noexport'};
   $error = $self->order_pkgs($cust_pkgs, \$seconds);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
@@ -368,6 +375,41 @@ sub order_pkgs {
   ''; #no error
 }
 
+=item reexport
+
+document me.  Re-schedules all exports by calling the B<reexport> method
+of all associated packages (see L<FS::cust_pkg>).  If there is an error,
+returns the error; otherwise returns false.
+
+=cut
+
+sub reexport {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  foreach my $cust_pkg ( $self->ncancelled_pkgs ) {
+    my $error = $cust_pkg->reexport;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+
+}
+
 =item delete NEW_CUSTNUM
 
 This deletes the customer.  If there is an error, returns the error, otherwise
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 9a54b95c9..1bf56e128 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -663,6 +663,41 @@ sub transfer {
   return $remaining;
 }
 
+=item reexport
+
+=cut
+
+sub reexport {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  foreach my $cust_svc ( $self->cust_svc ) {
+    #false laziness w/svc_Common::insert
+    my $svc_x = $cust_svc->svc_x;
+    foreach my $part_export ( $cust_svc->part_svc->part_export ) {
+      my $error = $part_export->export_insert($svc_x);
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+
+}
+
 =back
 
 =head1 SUBROUTINES
diff --git a/Makefile b/Makefile
index bf5b73efc..d4d753d6d 100644
--- a/Makefile
+++ b/Makefile
@@ -46,14 +46,6 @@ QUEUED_USER=fs_queue
 #eventually this shouldn't be needed
 FREESIDE_PATH = `pwd`
 
-PASSWD_USER = nostart
-PASSWD_MACHINE = localhost
-
-SIGNUP_USER = nostart
-SIGNUP_MACHINE = localhost
-SIGNUP_AGENTNUM = 2
-SIGNUP_REFNUM = 2
-
 SELFSERVICE_USER = fs_selfservice
 SELFSERVICE_MACHINE = localhost
 
@@ -140,12 +132,6 @@ install-init:
 	perl -p -i -e "\
 	  s/%%%QUEUED_USER%%%/${QUEUED_USER}/g;\
 	  s'%%%FREESIDE_PATH%%%'${FREESIDE_PATH}'g;\
-	  s/%%%PASSWD_USER%%%/${PASSWD_USER}/g;\
-	  s/%%%PASSWD_MACHINE%%%/${PASSWD_MACHINE}/g;\
-	  s/%%%SIGNUP_USER%%%/${SIGNUP_USER}/g;\
-	  s/%%%SIGNUP_MACHINE%%%/${SIGNUP_MACHINE}/g;\
-	  s/%%%SIGNUP_AGENTNUM%%%/${SIGNUP_AGENTNUM}/g;\
-	  s/%%%SIGNUP_REFNUM%%%/${SIGNUP_REFNUM}/g;\
 	  s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
 	  s/%%%SELFSERVICE_MACHINE%%%/${SELFSERVICE_MACHINE}/g;\
 	" ${INIT_FILE}
diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm
index 842064de6..e17c46181 100644
--- a/fs_signup/FS-SignupClient/SignupClient.pm
+++ b/fs_signup/FS-SignupClient/SignupClient.pm
@@ -1,30 +1,19 @@
 package FS::SignupClient;
 
 use strict;
-use vars qw($VERSION @ISA @EXPORT_OK $fs_signupd_socket);
+use vars qw($VERSION @ISA @EXPORT_OK); # $fs_signupd_socket);
 use Exporter;
-use Socket;
-use FileHandle;
-use IO::Handle;
-use Storable qw(nstore_fd fd_retrieve);
+#use Socket;
+#use FileHandle;
+#use IO::Handle;
+#use Storable qw(nstore_fd fd_retrieve);
+use FS::SelfService qw( new_customer ); #qw( signup_info );
 
-$VERSION = '0.03';
+$VERSION = '0.04';
 
 @ISA = qw( Exporter );
 @EXPORT_OK = qw( signup_info new_customer );
 
-$fs_signupd_socket = "/usr/local/freeside/fs_signupd_socket";
-
-$ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin';
-$ENV{'SHELL'} = '/bin/sh';
-$ENV{'IFS'} = " \t\n";
-$ENV{'CDPATH'} = '';
-$ENV{'ENV'} = '';
-$ENV{'BASH_ENV'} = '';
-
-my $freeside_uid = scalar(getpwnam('freeside'));
-die "not running as the freeside user\n" if $> != $freeside_uid;
-
 =head1 NAME
 
 FS::SignupClient - Freeside signup client API
@@ -33,8 +22,10 @@ FS::SignupClient - Freeside signup client API
 
   use FS::SignupClient qw( signup_info new_customer );
 
-  ( $locales, $packages, $pops ) = signup_info;
+  #this is the backwards-compatibility bit
+  ( $locales, $packages, $pops, $real_signup_info ) = signup_info;
 
+  #this is compatible with FS::SelfService::new_customer
   $error = new_customer ( {
     'first'            => $first,
     'last'             => $last,
@@ -104,14 +95,10 @@ Each hash reference has the following keys:
 
 =cut
 
+#compatibility bit
 sub signup_info {
-  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($fs_signupd_socket)) or die "connect: $!";
-  print SOCK "signup_info\n";
-  SOCK->flush;
 
-  my $init_data = fd_retrieve(\*SOCK);
-  close SOCK;
+  my $init_data = FS::SelfService::signup_info();
 
   (map { $init_data->{$_} } qw( cust_main_county part_pkg svc_acct_pop ) ),
   $init_data;
@@ -151,30 +138,6 @@ a paramater with the following keys:
 
 Returns a scalar error message, or the empty string for success.
 
-=cut
-
-sub new_customer {
-  my $hashref = shift;
-
-  socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($fs_signupd_socket)) or die "connect: $!";
-  print SOCK "new_customer\n";
-
-  my $signup_data = { map { $_ => $hashref->{$_} } qw(
-    first last ss company address1 address2 city county state zip country
-    daytime night fax payby payinfo paydate payname invoicing_list
-    referral_custnum comments pkgpart username _password sec_phrase popnum
-  ) };
-
-  $signup_data->{agentnum} = $hashref->{agentnum} if $hashref->{agentnum};
-
-  nstore_fd($signup_data, \*SOCK) or die "can't send customer signup: $!";
-  SOCK->flush;
-
-  chop( my $error = <SOCK> );
-  $error;
-}
-
 =back
 
 =head1 BUGS
diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html
index b57b06feb..648cb985b 100644
--- a/httemplate/docs/index.html
+++ b/httemplate/docs/index.html
@@ -9,6 +9,7 @@
   <li><a href="upgrade7.html">Upgrading from 1.3.0 to 1.3.1</a>
   <li><a href="upgrade8.html">Upgrading from 1.3.1 to 1.4.0</a>
   <li><a href="upgrade9.html">Upgrading from 1.4.0 to 1.4.1</a>
+  <li><a href="upgrade-1.4.2.html">Upgrading from 1.4.1 to 1.4.2</a>
   <li><a href="upgrade10.html">Upgrading from 1.4.1 (or 1.4.2?) to 1.5.0</a>
 <!--
   <li><a href="config.html">Configuration files</a>
-- 
cgit v1.2.1


From decc019bce51f72bb44ab44cfeec4321c5c760b1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Sep 2003 10:08:06 +0000
Subject: make sure signup cancels are quiet

---
 FS/FS/ClientAPI/Signup.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 0bb9f7b6a..0272909be 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -169,7 +169,7 @@ sub new_customer {
       #should check list for errors...
       #$cust_main->suspend;
       local $FS::svc_Common::noexport_hack = 1;
-      $cust_main->cancel;
+      $cust_main->cancel('quiet'=>1);
 
       $error = '_decline';
     }
-- 
cgit v1.2.1


From b4b6a40f6a659ec7ef24ff2930d82e89fb4bb4dc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Sep 2003 11:00:11 +0000
Subject: module needs to return true

---
 FS/FS/ClientAPI/Signup.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 0272909be..da51f49e2 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -181,3 +181,4 @@ sub new_customer {
 
 }
 
+1;
-- 
cgit v1.2.1


From 7c5ac7082001b4aee97e0cdde41e492869b9fbaa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Sep 2003 11:35:57 +0000
Subject: finish moving signup server functions to self-service interace

---
 fs_selfservice/FS-SelfService/SelfService.pm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 5849b28d1..5d3f50b10 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -15,6 +15,7 @@ $VERSION = '0.03';
 
 $socket =  "/usr/local/freeside/selfservice_socket";
 
+#maybe should ask ClientAPI for this list
 %autoload = (
   'passwd'          => 'passwd/passwd',
   'chfn'            => 'passwd/passwd',
@@ -25,6 +26,8 @@ $socket =  "/usr/local/freeside/selfservice_socket";
   'cancel'          => 'MyAccount/cancel',
   'payment_info'    => 'MyAccount/payment_info',
   'process_payment' => 'MyAccount/process_payment',
+  'signup_info'     => 'Signup/signup_info',
+  'new_customer'    => 'Signup/new_customer',
 );
 @EXPORT_OK = keys %autoload;
 
-- 
cgit v1.2.1


From 6f4d31e1da55067773b7ddde7349d6079917bb9a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Sep 2003 11:50:30 +0000
Subject: correct pid filename for stopping self-service server

---
 init.d/freeside-init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/freeside-init b/init.d/freeside-init
index 7b9461e51..b9c95ae53 100644
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -29,7 +29,7 @@ case "$1" in
         echo "done."
 
         echo -n "Stopping freeside-selfservice-server: "
-        kill `cat /var/run/freeside-selfservice-server.pid`
+        kill `cat /var/run/freeside-selfservice-server.$SELFSERVICE_USER.pid`
         echo "done."
         ;;
 
-- 
cgit v1.2.1


From 8141f1dde4994789cbc6298e6cfdf3050d2fbfdc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Sep 2003 11:56:29 +0000
Subject: better error message when you don't select a package

---
 FS/FS/ClientAPI/Signup.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index da51f49e2..710c16c7a 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -116,6 +116,7 @@ sub new_customer {
 
   $packet->{'pkgpart'} =~ /^(\d+)$/ or '' =~ /^()$/;
   my $pkgpart = $1;
+  $error ||= 'Please select a package' unless $pkgpart; #msgcat
 
   my $part_pkg =
     qsearchs( 'part_pkg', { 'pkgpart' => $pkgpart } )
-- 
cgit v1.2.1


From 5a9cfe0333e442472880b26398930e4160071949 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Sep 2003 12:02:45 +0000
Subject: cache initial signup_info for performance

---
 FS/FS/ClientAPI/Signup.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 710c16c7a..8f6dc2949 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -23,7 +23,8 @@ sub signup_info {
 
   my $conf = new FS::Conf;
 
-  my $signup_info = {
+  use vars qw($signup_info); #cache for performance;
+  $signup_info ||= {
 
     'cust_main_county' =>
       [ map { $_->hashref } qsearch('cust_main_county', {}) ],
@@ -57,7 +58,10 @@ sub signup_info {
 
   };
 
-  if ( $conf->config('signup_server-default_agentnum') ) {
+  if (
+    $conf->config('signup_server-default_agentnum')
+    || !exists $signup_info->{'part_pkg'} #cache for performance
+  ) {
     my $agentnum = $conf->config('signup_server-default_agentnum');
     my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } )
       or die "fatal: signup_server-default_agentnum $agentnum not found\n";
-- 
cgit v1.2.1


From 26ae12d61653a5673359fb0b995a70a4a76d7675 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Sep 2003 12:04:05 +0000
Subject: oops, flipped an or to an and

---
 FS/FS/ClientAPI/Signup.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 8f6dc2949..f3dcfa3b2 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -60,7 +60,7 @@ sub signup_info {
 
   if (
     $conf->config('signup_server-default_agentnum')
-    || !exists $signup_info->{'part_pkg'} #cache for performance
+    && !exists $signup_info->{'part_pkg'} #cache for performance
   ) {
     my $agentnum = $conf->config('signup_server-default_agentnum');
     my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } )
-- 
cgit v1.2.1


From b3a9e3fb3497230b2c752fb888f1234cde90c785 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Sep 2003 12:13:35 +0000
Subject: remove klunky $error ||= usage

---
 FS/FS/ClientAPI/Signup.pm | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index f3dcfa3b2..36045d9e2 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -83,14 +83,14 @@ sub new_customer {
   my $packet = shift;
 
   my $conf = new FS::Conf;
-  my $error = '';
   
   #things that aren't necessary in base class, but are for signup server
     #return "Passwords don't match"
     #  if $hashref->{'_password'} ne $hashref->{'_password2'}
-  $error ||= gettext('empty_password') unless $packet->{'_password'};
+  return { 'error' => gettext('empty_password') }
+    unless $packet->{'_password'};
   # a bit inefficient for large numbers of pops
-  $error ||= gettext('no_access_number_selected')
+  return { 'error' => gettext('no_access_number_selected') }
     unless $packet->{'popnum'} || !scalar(qsearch('svc_acct_pop',{} ));
 
   #shares some stuff with htdocs/edit/process/cust_main.cgi... take any
@@ -109,7 +109,7 @@ sub new_customer {
 
   } );
 
-  $error ||= "Illegal payment type"
+  return { 'error' => "Illegal payment type" }
     unless grep { $_ eq $packet->{'payby'} }
                 $conf->config('signup_server-payby');
 
@@ -120,18 +120,19 @@ sub new_customer {
 
   $packet->{'pkgpart'} =~ /^(\d+)$/ or '' =~ /^()$/;
   my $pkgpart = $1;
-  $error ||= 'Please select a package' unless $pkgpart; #msgcat
+  return { 'error' => 'Please select a package' } unless $pkgpart; #msgcat
 
   my $part_pkg =
     qsearchs( 'part_pkg', { 'pkgpart' => $pkgpart } )
-      or $error ||= "WARNING: unknown pkgpart: $pkgpart";
-  my $svcpart = $part_pkg->svcpart('svc_acct') unless $error;
+      or return { 'error' => "WARNING: unknown pkgpart: $pkgpart" };
+  my $svcpart = $part_pkg->svcpart('svc_acct');
 
   my $cust_pkg = new FS::cust_pkg ( {
     #later#'custnum' => $custnum,
     'pkgpart' => $packet->{'pkgpart'},
   } );
-  $error ||= $cust_pkg->check;
+  my $error = $cust_pkg->check;
+  return { 'error' => $error } if $error;
 
   my $svc_acct = new FS::svc_acct ( {
     'svcpart'   => $svcpart,
@@ -140,17 +141,19 @@ sub new_customer {
   } );
 
   my $y = $svc_acct->setdefault; # arguably should be in new method
-  $error ||= $y unless ref($y);
+  return { 'error' => $y } if $y && !ref($y);
 
-  $error ||= $svc_acct->check;
+  $error = $svc_acct->check;
+  return { 'error' => $error } if $error;
 
   use Tie::RefHash;
   tie my %hash, 'Tie::RefHash';
   %hash = ( $cust_pkg => [ $svc_acct ] );
   #msgcat
-  $error ||= $cust_main->insert( \%hash, \@invoicing_list, 'noexport' => 1 );
+  $error = $cust_main->insert( \%hash, \@invoicing_list, 'noexport' => 1 );
+  return { 'error' => $error } if $error;
 
-  if ( ! $error && $conf->exists('signup_server-realtime') ) {
+  if ( $conf->exists('signup_server-realtime') ) {
 
     #warn "[fs_signup_server] Billing customer...\n" if $Debug;
 
@@ -176,13 +179,13 @@ sub new_customer {
       local $FS::svc_Common::noexport_hack = 1;
       $cust_main->cancel('quiet'=>1);
 
-      $error = '_decline';
+      return { 'error' => '_decline' };
     }
 
   }
-  $cust_main->reexport unless $error;
+  $cust_main->reexport;
 
-  return { error => $error };
+  return { error => '' };
 
 }
 
-- 
cgit v1.2.1


From b7bd75e83a0a63015579464541dba5b995ae6ee4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Sep 2003 12:19:23 +0000
Subject: fix backwards-compatibility for signup server

---
 fs_signup/FS-SignupClient/SignupClient.pm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm
index e17c46181..1d91a418f 100644
--- a/fs_signup/FS-SignupClient/SignupClient.pm
+++ b/fs_signup/FS-SignupClient/SignupClient.pm
@@ -7,7 +7,7 @@ use Exporter;
 #use FileHandle;
 #use IO::Handle;
 #use Storable qw(nstore_fd fd_retrieve);
-use FS::SelfService qw( new_customer ); #qw( signup_info );
+use FS::SelfService; # qw( new_customer signup_info );
 
 $VERSION = '0.04';
 
@@ -138,6 +138,14 @@ a paramater with the following keys:
 
 Returns a scalar error message, or the empty string for success.
 
+=cut
+
+#compatibility bit
+sub new_customer { 
+  my $hash = FS::SelfService::new_customer(@_);
+  $hash->{'error'};
+}
+
 =back
 
 =head1 BUGS
-- 
cgit v1.2.1


From 516dd846062f114ef7b77d08d530cf7327423049 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Sep 2003 12:40:59 +0000
Subject: quiet option to cancel method

---
 FS/FS/cust_main.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index e4d440600..700b100fb 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -958,16 +958,21 @@ sub suspend {
   grep { $_->suspend } $self->unsuspended_pkgs;
 }
 
-=item cancel
+=item cancel [ OPTION => VALUE ... ]
 
 Cancels all uncancelled packages (see L<FS::cust_pkg>) for this customer.
+
+Available options are: I<quiet>
+
+I<quiet> can be set true to supress email cancellation notices.
+
 Always returns a list: an empty list on success or a list of errors.
 
 =cut
 
 sub cancel {
   my $self = shift;
-  grep { $_->cancel } $self->ncancelled_pkgs;
+  grep { $_->cancel(@_) } $self->ncancelled_pkgs;
 }
 
 =item agent
-- 
cgit v1.2.1


From aac3f675b2bb9d6a90cb2c6b9c85951961475376 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 21 Sep 2003 01:22:20 +0000
Subject: add link to preliminary batch download

---
 httemplate/browse/cust_pay_batch.cgi | 69 ++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/httemplate/browse/cust_pay_batch.cgi b/httemplate/browse/cust_pay_batch.cgi
index 608a58d0d..f9d0921a1 100755
--- a/httemplate/browse/cust_pay_batch.cgi
+++ b/httemplate/browse/cust_pay_batch.cgi
@@ -1,10 +1,15 @@
 <!-- mason kludge -->
-<%
+<%= header("Pending credit card batch", menubar( 'Main Menu' => $p,)) %>
+
+<FORM ACTION="<%=$p%>misc/download-batch.cgi" METHOD="POST">
+
+Download batch in format <SELECT NAME="format">
+<OPTION VALUE="csv">Generic CSV (comma-separated value)</OPTION>
+<OPTION VALUE="csv-td_canada_trust-merchant_pc_batch">CSV file for TD Canada Trust Merchant PC Batch</OPTION>
+</SELECT><INPUT TYPE="submit" VALUE="Download">
+<BR><BR>
 
-print header("Pending credit card batch", menubar(
-  'Main Menu' => $p,
-#  'Add new referral' => "../edit/part_referral.cgi",
-)), &table(), <<END;
+<%= &table() %>
       <TR>
         <TH>#</TH>
         <TH><font size=-1>inv#</font></TH>
@@ -14,39 +19,35 @@ print header("Pending credit card batch", menubar(
         <TH>Exp</TH>
         <TH>Amount</TH>
       </TR>
-END
-
-foreach my $cust_pay_batch ( sort { 
-  $a->getfield('paybatchnum') <=> $b->getfield('paybatchnum')
-} qsearch('cust_pay_batch',{}) ) {
-#  my $date = time2str( "%a %b %e %T %Y", $queue->_date );
-#  my $status = $hashref->{status};
-#  if ( $status eq 'failed' || $status eq 'locked' ) {
-#    $status .=
-#      qq! ( <A HREF="$p/edit/cust_pay_batch.cgi?jobnum=$jobnum&action=new">retry</A> |!.
-#      qq! <A HREF="$p/edit/cust_pay_batch.cgi?jobnum$jobnum&action=del">remove </A> )!;
-#  }
-  my $cardnum = $cust_pay_batch->{cardnum};
-  $cardnum =~ s/.{4}$/xxxx/;
-  print <<END;
+
+<%
+foreach my $cust_pay_batch ( sort { $a->paybatchnum <=> $b->paybatchnum }
+                             qsearch('cust_pay_batch', {} )
+) {
+  my $cardnum = $cust_pay_batch->cardnum;
+  #$cardnum =~ s/.{4}$/xxxx/;
+  $cardnum = 'x'x(length($cardnum)-4). substr($cardnum,(length($cardnum)-4));
+
+  $cust_pay_batch->exp =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
+  my( $mon, $year ) = ( $2, $1 );
+  $mon = "0$mon" if $mon < 10;
+  my $exp = "$mon/$year";
+
+%>
+
       <TR>
-        <TD>$cust_pay_batch->{paybatchnum}</TD>
-        <TD><A HREF="../view/cust_bill.cgi?$cust_pay_batch->{invnum}">$cust_pay_batch->{invnum}</TD>
-        <TD><A HREF="../view/cust_main.cgi?$cust_pay_batch->{custnum}">$cust_pay_batch->{custnum}</TD>
-        <TD>$cust_pay_batch->{last}, $cust_pay_batch->{last}</TD>
-        <TD>$cust_pay_batch->{payname}</TD>
-        <TD>$cardnum</TD>
-        <TD>$cust_pay_batch->{exp}</TD>
-        <TD align="right">\$$cust_pay_batch->{amount}</TD>
+        <TD><%= $cust_pay_batch->paybatchnum %></TD>
+        <TD><A HREF="../view/cust_bill.cgi?<%= $cust_pay_batch->invnum %>"><%= $cust_pay_batch->invnum %></TD>
+        <TD><A HREF="../view/cust_main.cgi?<%= $cust_pay_batch->custnum %>"><%= $cust_pay_batch->custnum %></TD>
+        <TD><%= $cust_pay_batch->get('last'). ', '. $cust_pay_batch->first %></TD>
+        <TD><%= $cust_pay_batch->payname %></TD>
+        <TD><%= $cardnum %></TD>
+        <TD><%= $exp %></TD>
+        <TD align="right">$<%= $cust_pay_batch->amount %></TD>
       </TR>
-END
 
-}
+<% } %>
 
-print <<END;
     </TABLE>
   </BODY>
 </HTML>
-END
-
-%>
-- 
cgit v1.2.1


From cd6707b49e29d62397c1e4107803965282ee0115 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 21 Sep 2003 01:22:48 +0000
Subject: preliminary batch download

---
 httemplate/misc/download-batch.cgi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 httemplate/misc/download-batch.cgi

diff --git a/httemplate/misc/download-batch.cgi b/httemplate/misc/download-batch.cgi
new file mode 100644
index 000000000..3803c8464
--- /dev/null
+++ b/httemplate/misc/download-batch.cgi
@@ -0,0 +1,16 @@
+<%
+
+http_header('Content-Type' => 'text/comma-separated-values');
+
+for my $cust_pay_batch ( sort { $a->paybatchnum <=> $b->paybatchnum }
+                              qsearch('cust_pay_batch', {} )
+) {
+
+$cust_pay_batch->exp =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
+my( $mon, $y ) = ( $2, $1 );
+$mon = "0$mon" if $mon < 10;
+my $exp = "$mon$y";
+
+%>
+,,,,<%= $cust_pay_batch->cardnum %>,<%= $exp %>,<%= $cust_pay_batch->amount %>,<%= $cust_pay_batch->paybatchnum %>
+<% } %>
-- 
cgit v1.2.1


From 95b6fff06bd55cfc97647b056cb321b1b57c2d78 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 21 Sep 2003 06:52:30 +0000
Subject: eliminate extraneous newlines

---
 httemplate/misc/download-batch.cgi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/httemplate/misc/download-batch.cgi b/httemplate/misc/download-batch.cgi
index 3803c8464..5ee12f174 100644
--- a/httemplate/misc/download-batch.cgi
+++ b/httemplate/misc/download-batch.cgi
@@ -11,6 +11,5 @@ my( $mon, $y ) = ( $2, $1 );
 $mon = "0$mon" if $mon < 10;
 my $exp = "$mon$y";
 
-%>
-,,,,<%= $cust_pay_batch->cardnum %>,<%= $exp %>,<%= $cust_pay_batch->amount %>,<%= $cust_pay_batch->paybatchnum %>
+%>,,,,<%= $cust_pay_batch->cardnum %>,<%= $exp %>,<%= $cust_pay_batch->amount %>,<%= $cust_pay_batch->paybatchnum %>
 <% } %>
-- 
cgit v1.2.1


From 8ba4df7e0fab1faa2032b8311a195d297502e4b2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 21 Sep 2003 07:31:27 +0000
Subject: remove trancode from batching

---
 FS/FS/cust_bill.pm                 | 1 -
 httemplate/misc/download-batch.cgi | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 4793608c0..c15dad433 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -636,7 +636,6 @@ sub batch_card {
     'state'    => $cust_main->getfield('state'),
     'zip'      => $cust_main->getfield('zip'),
     'country'  => $cust_main->getfield('country'),
-    'trancode' => 77,
     'cardnum'  => $cust_main->getfield('payinfo'),
     'exp'      => $cust_main->getfield('paydate'),
     'payname'  => $cust_main->getfield('payname'),
diff --git a/httemplate/misc/download-batch.cgi b/httemplate/misc/download-batch.cgi
index 5ee12f174..ecb80d256 100644
--- a/httemplate/misc/download-batch.cgi
+++ b/httemplate/misc/download-batch.cgi
@@ -1,6 +1,6 @@
 <%
 
-http_header('Content-Type' => 'text/comma-separated-values');
+http_header('Content-Type' => 'text/comma-separated-values' );
 
 for my $cust_pay_batch ( sort { $a->paybatchnum <=> $b->paybatchnum }
                               qsearch('cust_pay_batch', {} )
-- 
cgit v1.2.1


From 50ae1571b51626d2dd1cb878b94dff6fec747408 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Sep 2003 01:30:37 +0000
Subject: fix boolean precedence error leading to inaccurate results on the new
 customer status list

---
 httemplate/browse/agent.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 79f6c3dcf..0d808cd0d 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -18,7 +18,7 @@
 
   my $ncancelled_sth = dbh->prepare("SELECT COUNT(*) FROM cust_main
                                        WHERE agentnum = ?
-                                         AND $ncancelled             ")
+                                         AND ( $ncancelled )         ")
     or die dbh->errstr;
 
   my $total_sth = dbh->prepare("SELECT COUNT(*) FROM cust_main
-- 
cgit v1.2.1


From d1d1fcff1564e12eb76a1a3e7bf5fbe7c3f2fe1e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Sep 2003 02:37:59 +0000
Subject: need Cache::Cache in 1.4.2+

---
 install/freebsd/ports | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/freebsd/ports b/install/freebsd/ports
index 1e04a424d..019c5e194 100644
--- a/install/freebsd/ports
+++ b/install/freebsd/ports
@@ -41,3 +41,4 @@ devel/p5-Tie-IxHash
     #www/p5-HTML-Widgets-SelectLayers
 devel/p5-Storable
 www/p5-Apache-DBI
+devel/p5-Cache-Cache
-- 
cgit v1.2.1


From 5d670a64ca3f41f2dde8899507bf1544abb1b041 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Sep 2003 17:06:39 +0000
Subject: don't allow uid changes when usermod_pwonly set

---
 FS/FS/part_export/shellcommands.pm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index edc944009..8d9795a7d 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -90,6 +90,9 @@ sub _export_replace {
     if ( $old_domain ne $new_domain ) {
       $error ||= "can't change domain";
     }
+    if ( $old_uid != $new_uid ) {
+      $error ||= "can't change uid";
+    }
     return $error. ' ('. $self->exporttype. ' to '. $self->machine. ')'
       if $error;
   }
-- 
cgit v1.2.1


From f4f77f82129f972d17d95a1e1f7bda9d1f1c4325 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Sep 2003 17:20:33 +0000
Subject: don't change dir either when username_pwonly is set

---
 FS/FS/part_export/shellcommands.pm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 8d9795a7d..da24e5ca7 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -93,6 +93,9 @@ sub _export_replace {
     if ( $old_uid != $new_uid ) {
       $error ||= "can't change uid";
     }
+    if ( $old_dir ne $new_dir ) {
+      $error ||= "can't change dir";
+    }
     return $error. ' ('. $self->exporttype. ' to '. $self->machine. ')'
       if $error;
   }
-- 
cgit v1.2.1


From ead5b6fc593ed0d9777a2e390a761110f5731a28 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Sep 2003 09:39:46 +0000
Subject: update upgrade docs for bind exports

---
 httemplate/docs/upgrade9.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/httemplate/docs/upgrade9.html b/httemplate/docs/upgrade9.html
index 24d1cce42..6a8fd965d 100644
--- a/httemplate/docs/upgrade9.html
+++ b/httemplate/docs/upgrade9.html
@@ -21,6 +21,8 @@ CREATE INDEX part_pkg1 ON part_pkg ( disabled );
 CREATE INDEX part_svc1 ON part_svc ( disabled );
 CREATE INDEX cust_bill2 ON cust_bill ( _date );
 </pre>
-  <li>If you want to use ACH (electronic checks), you will need to make changes to your database.  The easiest way to make these changes is to dump your database (with pg_dump), change the payinfo field in the cust_pay, cust_refund, h_cust_pay and h_cust_refund tables from varchar(16) to varchar(80), reload the database from the dump, and run dbdef-create
+  <li>If you want to use ACH (electronic checks), you will need to make changes to your database.  The easiest way to make these changes is to dump your database (with pg_dump), change the payinfo field in the cust_pay, cust_refund, h_cust_pay and h_cust_refund tables from varchar(16) to varchar(80), reload the database from the dump.
+  <li>If you will be doing bind exports you should make additional changes to your database. Follow the directions above to dump the database and change the reczone and recdata fields in the domain_record and h_domain_record tables from varchar(80) to varchar(255).
+  <li>If you made changes to your db schema from a dump as listed above run dbdef-create.
   <li>Restart Apache and freeside-queued.
 </body>
-- 
cgit v1.2.1


From f5ea7f4cc190dcb399bb19615ac8f48e19b9fa3d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Sep 2003 09:40:05 +0000
Subject: 1.4.2 upgrade

---
 httemplate/docs/upgrade-1.4.2.html | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 httemplate/docs/upgrade-1.4.2.html

diff --git a/httemplate/docs/upgrade-1.4.2.html b/httemplate/docs/upgrade-1.4.2.html
new file mode 100644
index 000000000..cf3d0de39
--- /dev/null
+++ b/httemplate/docs/upgrade-1.4.2.html
@@ -0,0 +1,15 @@
+<head>
+  <title>Upgrading to 1.4.2</title>
+</head>
+<body>
+<h1>Upgrading to 1.4.2 from 1.4.1</h1>
+<ul>
+  <li>If migrating from less than 1.4.1, see these <a href="upgrade9.html">instructions</a> first.
+  <li>Back  up your data and current Freeside installation.
+  <li>Install <a href="http://search.cpan.org/search?dist=Locale-SubCountry">Locale::SubCountry</a>
+  <li>Run <code>make aspdocs</code> or <code>make masondocs</code>.
+  <li>Copy <code>aspdocs/</code> or <code>masondocs/</code> to your web server's document space.
+  <li>Run <code>make install-perl-modules</code>.
+  <li>The signup server and password server are deprecated in 1.4.2.  Their functionality has been incorperated into the self-service server.  Edit or reinstall your init script appropriately, and set the "signup_server-default_agentnum" and "signup_server-default_refnum" configuration options appropriately.  The FS::SignupClient interface is still available as a compatibility wrapper.  You should be able to continue to use your current signup.cgi.
+  <li>Restart Apache and freeside-queued.
+</body>
-- 
cgit v1.2.1


From d1154acfa526fa01d308be5d47a071643cfda5ea Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Sep 2003 10:26:32 +0000
Subject: quiet self-service server cancels

---
 FS/FS/ClientAPI/MyAccount.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index e12e93b12..8d6f6e55a 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -245,7 +245,7 @@ sub cancel {
   my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
     or return { 'error' => "unknown custnum $custnum" };
 
-  my @errors = $cust_main->cancel;
+  my @errors = $cust_main->cancel( 'quiet'=>1 );
 
   my $error = scalar(@errors) ? join(' / ', @errors) : '';
 
-- 
cgit v1.2.1


From daeb70ea28f8a3e0db500f8a0e107221f4542d30 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Sep 2003 10:27:11 +0000
Subject: freebsd portability fixes

---
 FS/bin/freeside-selfservice-server | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/FS/bin/freeside-selfservice-server b/FS/bin/freeside-selfservice-server
index 264cbc56d..6cfafda58 100644
--- a/FS/bin/freeside-selfservice-server
+++ b/FS/bin/freeside-selfservice-server
@@ -9,6 +9,7 @@
 
 use strict;
 use vars qw( $Debug %kids $kids $max_kids $shutdown $log_file $ssh_pid );
+use subs qw( lock_write unlock_write );
 use Fcntl qw(:flock);
 use POSIX qw(:sys_wait_h setsid);
 use IO::Handle;
@@ -35,6 +36,9 @@ my $machine = shift or die &usage;
 my $pid_file = "/var/run/freeside-selfservice-server.$user.pid";
 #my $pid_file = "/var/run/freeside-selfservice-server.$user.pid"; $FS::UID::datasrc not posible, but should include machine name at least, hmm
 
+my $lock_file = "/usr/local/etc/freeside/selfservice.$machine.writelock";
+open(LOCKFILE,">$lock_file") or die "can't open $lock_file: $!";
+
 &init($user);
 
 my $conf = new FS::Conf;
@@ -109,10 +113,10 @@ while (1) {
       $rv->{_token} = $packet->{_token}; #identifier
 
       warn "sending response\n" if $Debug;
-      flock($writer, LOCK_EX) or die "FATAL: can't lock write stream: $!";
+      lock_write;
       nstore_fd($rv, $writer) or die "FATAL: can't send response: $!";
       $writer->flush or die "FATAL: can't flush: $!";
-      flock($writer, LOCK_UN) or die "WARNING: can't release write lock: $!";
+      unlock_write;
 
       warn "child exiting\n" if $Debug;
       exit; #end-of-kid
@@ -229,7 +233,23 @@ sub _do_logmsg {
   close $log;
 }
 
+sub lock_write {
+  #broken on freebsd?
+  #flock($writer, LOCK_EX) or die "FATAL: can't lock write stream: $!";
+
+  flock(LOCKFILE, LOCK_EX) or die "FATAL: can't lock $lock_file: $!";
+
+}
+
+sub unlock_write {
+  #broken on freebsd?
+  #flock($writer, LOCK_UN) or die "WARNING: can't release write lock: $!";
+
+  flock(LOCKFILE, LOCK_UN) or die "FATAL: can't unlock $lock_file: $!";
+
+}
+
 sub usage {
-  die "Usage:\n\n  fs_signup_server user machine\n";
+  die "Usage:\n\n  freeside-selfservice-server user machine\n";
 }
 
-- 
cgit v1.2.1


From 9679b64218a5bb0b148d07582589dd8ef0de7567 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Sep 2003 10:28:13 +0000
Subject: freebsd portability fix

---
 .../FS-SelfService/freeside-selfservice-clientd    | 33 ++++++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
index f13dd42d7..438d472c9 100644
--- a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
+++ b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
@@ -5,7 +5,7 @@
 # This is run REMOTELY over ssh by freeside-selfservice-server
 
 use strict;
-use subs qw(spawn logmsg);
+use subs qw(spawn logmsg lock_write unlock_write);
 use Fcntl qw(:flock);
 use POSIX qw(:sys_wait_h);
 use Socket;
@@ -25,6 +25,8 @@ my $pid_file = "$socket.pid";
 
 my $log_file = "/usr/local/freeside/selfservice.log";
 
+my $lock_file = "/usr/local/freeside/selfservice.writelock";
+
 #my $me = '[client]';
 
 $|=1;
@@ -35,6 +37,9 @@ $SIG{__WARN__} = \&_logmsg;
 #warn "$me Reading init data\n" if $Debug;
 #my $signup_init = 
 
+warn "Creating $lock_file\n" if $Debug;
+open(LOCKFILE,">$lock_file") or die "can't open $lock_file: $!";
+
 warn "Creating $socket\n" if $Debug;
 my $uaddr = sockaddr_un($socket);
 my $proto = getprotobyname('tcp');
@@ -138,11 +143,19 @@ while (1) {
         #handle some commands weirdly?
         $packet->{_token}=$$;
 
+        warn "[child-$$] locking write stream" if $Debug > 1;
+        lock_write;
+
         warn "[child-$$] sending packet to remote server" if $Debug > 1;
-        flock(STDOUT, LOCK_EX) or die "FATAL: can't lock write stream: $!";
         nstore_fd($packet, \*STDOUT) or die "FATAL: can't send response: $!";
+        
+        warn "[child-$$] flushing write stream" if $Debug > 1;
         STDOUT->flush or die "FATAL: can't flush: $!";
-        flock(STDOUT, LOCK_UN) or die "FATAL: can't release write lock: $!";
+        
+        warn "[child-$$] releasing write lock" if $Debug > 1;
+        unlock_write;
+
+        warn "[child-$$] closing write stream" if $Debug > 1;
         close STDOUT or die "FATAL: can't close write stream: $!"; #??!
 
         warn "[child-$$] waiting for response from parent" if $Debug > 1;
@@ -224,3 +237,17 @@ sub _logmsg {
   flock($log, LOCK_UN);
   close $log;
 }
+
+sub lock_write {
+  #broken on freebsd?
+  #flock(STDOUT, LOCK_EX) or die "FATAL: can't lock write stream: $!";
+
+  flock(LOCKFILE, LOCK_EX) or die "FATAL: can't lock $lock_file: $!";
+}
+
+sub unlock_write {
+  #broken on freebsd?
+  #flock(STDOUT, LOCK_UN) or die "FATAL: can't release write lock: $!";
+
+  flock(LOCKFILE, LOCK_UN) or die "FATAL: can't unlock $lock_file: $!";
+}
-- 
cgit v1.2.1


From d6436c7251a94c9597c7b2195d63bd7c86f956e9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Sep 2003 10:42:28 +0000
Subject: add setuptax and recurtax fields to cust_main_county

---
 FS/bin/freeside-setup       | 2 ++
 httemplate/docs/schema.html | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 197542086..27d02529c 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -539,6 +539,8 @@ sub tables_hash_hack {
         'exempt_amount', @money_type,
         'tax',      'real',  '',    '', #tax %
         'taxname',  'varchar',  'NULL',    $char_d,
+        'setuptax',  'char', 'NULL', 1, # Y = setup tax exempt
+        'recurtax',  'char', 'NULL', 1, # Y = recur tax exempt
       ],
       'primary_key' => 'taxnum',
       'unique' => [],
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index a59755e76..9204bdc8f 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -142,6 +142,8 @@
         <li>taxclass
         <li>exempt_amount
         <li>taxname - if defined, printed on invoices instead of "Tax"
+        <li>setuptax - if 'Y', this tax does not apply to setup fees
+        <li>recurtax - if 'Y', this tax does not apply to recurring fees
       </ul>
     <li><a name="cust_tax_exempt" href="man/FS/cust_tax_exempt.html">cust_tax_exempt</a> - Tax exemption record
       <ul>
-- 
cgit v1.2.1


From 694627660388e33e0bab01a5571e660c930cb140 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Sep 2003 11:17:06 +0000
Subject: multiple, named taxes for a single region 1.4 backport auto-adjusts
 based on schema

---
 FS/FS/cust_main.pm        | 204 ++++++++++++++++++++++++++--------------------
 FS/FS/cust_main_county.pm |  32 ++++++++
 2 files changed, 148 insertions(+), 88 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 700b100fb..385899387 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1134,7 +1134,6 @@ sub bill {
     warn "\$recur is undefined" unless defined($recur);
     warn "\$cust_pkg->bill is undefined" unless defined($cust_pkg->bill);
 
-    my $taxable_charged = 0;
     if ( $cust_pkg_mod_flag ) {
       $error=$cust_pkg->replace($old_cust_pkg);
       if ( $error ) { #just in case
@@ -1163,86 +1162,94 @@ sub bill {
         push @cust_bill_pkg, $cust_bill_pkg;
         $total_setup += $setup;
         $total_recur += $recur;
-        $taxable_charged += $setup
-          unless $part_pkg->setuptax =~ /^Y$/i;
-        $taxable_charged += $recur
-          unless $part_pkg->recurtax =~ /^Y$/i;
-          
-        unless ( $self->tax =~ /Y/i
-                 || $self->payby eq 'COMP'
-                 || $taxable_charged == 0 ) {
-
-          my $cust_main_county = qsearchs('cust_main_county',{
-              'state'    => $self->state,
-              'county'   => $self->county,
-              'country'  => $self->country,
-              'taxclass' => $part_pkg->taxclass,
-          } );
-          $cust_main_county ||= qsearchs('cust_main_county',{
-              'state'    => $self->state,
-              'county'   => $self->county,
-              'country'  => $self->country,
-              'taxclass' => '',
-          } );
-          unless ( $cust_main_county ) {
+
+        unless ( $self->tax =~ /Y/i || $self->payby eq 'COMP' ) {
+
+          my @taxes =  qsearch( 'cust_main_county', {
+                                  'state'    => $self->state,
+                                  'county'   => $self->county,
+                                  'country'  => $self->country,
+                                  'taxclass' => $part_pkg->taxclass,
+                                                                      } )
+                    || qsearch( 'cust_main_county', {
+                                  'state'    => $self->state,
+                                  'county'   => $self->county,
+                                  'country'  => $self->country,
+                                  'taxclass' => '',
+                                                                      } );
+
+          # maybe eliminate this entirely, along with all the 0% records
+          unless ( @taxes ) {
             $dbh->rollback if $oldAutoCommit;
             return
               "fatal: can't find tax rate for state/county/country/taxclass ".
               join('/', ( map $self->$_(), qw(state county country) ),
                         $part_pkg->taxclass ).  "\n";
           }
+  
+          foreach my $tax ( @taxes ) {
+
+            my $taxable_charged = 0;
+            $taxable_charged += $setup
+              unless $part_pkg->setuptax =~ /^Y$/i
+                  || $tax->setuptax =~ /^Y$/i;
+            $taxable_charged += $recur
+              unless $part_pkg->recurtax =~ /^Y$/i
+                  || $tax->recurtax =~ /^Y$/i;
+            next unless $taxable_charged;
+
+            if ( $tax->exempt_amount ) {
+              my ($mon,$year) = (localtime($sdate) )[4,5];
+              $mon++;
+              my $freq = $part_pkg->freq || 1;
+              my $taxable_per_month = sprintf("%.2f", $taxable_charged / $freq );
+              foreach my $which_month ( 1 .. $freq ) {
+                my %hash = (
+                  'custnum' => $self->custnum,
+                  'taxnum'  => $tax->taxnum,
+                  'year'    => 1900+$year,
+                  'month'   => $mon++,
+                );
+                #until ( $mon < 12 ) { $mon -= 12; $year++; }
+                until ( $mon < 13 ) { $mon -= 12; $year++; }
+                my $cust_tax_exempt =
+                  qsearchs('cust_tax_exempt', \%hash)
+                  || new FS::cust_tax_exempt( { %hash, 'amount' => 0 } );
+                my $remaining_exemption = sprintf("%.2f",
+                  $tax->exempt_amount - $cust_tax_exempt->amount );
+                if ( $remaining_exemption > 0 ) {
+                  my $addl = $remaining_exemption > $taxable_per_month
+                    ? $taxable_per_month
+                    : $remaining_exemption;
+                  $taxable_charged -= $addl;
+                  my $new_cust_tax_exempt = new FS::cust_tax_exempt ( {
+                    $cust_tax_exempt->hash,
+                    'amount' =>
+                      sprintf("%.2f", $cust_tax_exempt->amount + $addl),
+                  } );
+                  $error = $new_cust_tax_exempt->exemptnum
+                    ? $new_cust_tax_exempt->replace($cust_tax_exempt)
+                    : $new_cust_tax_exempt->insert;
+                  if ( $error ) {
+                    $dbh->rollback if $oldAutoCommit;
+                    return "fatal: can't update cust_tax_exempt: $error";
+                  }
+  
+                } # if $remaining_exemption > 0
+  
+              } #foreach $which_month
+  
+            } #if $tax->exempt_amount
+
+            $taxable_charged = sprintf( "%.2f", $taxable_charged);
+
+            #$tax += $taxable_charged * $cust_main_county->tax / 100
+            $tax{ $tax->taxname || 'Tax' } +=
+              $taxable_charged * $tax->tax / 100
 
-          if ( $cust_main_county->exempt_amount ) {
-            my ($mon,$year) = (localtime($sdate) )[4,5];
-            $mon++;
-            my $freq = $part_pkg->freq || 1;
-            my $taxable_per_month = sprintf("%.2f", $taxable_charged / $freq );
-            foreach my $which_month ( 1 .. $freq ) {
-              my %hash = (
-                'custnum' => $self->custnum,
-                'taxnum'  => $cust_main_county->taxnum,
-                'year'    => 1900+$year,
-                'month'   => $mon++,
-              );
-              #until ( $mon < 12 ) { $mon -= 12; $year++; }
-              until ( $mon < 13 ) { $mon -= 12; $year++; }
-              my $cust_tax_exempt =
-                qsearchs('cust_tax_exempt', \%hash)
-                || new FS::cust_tax_exempt( { %hash, 'amount' => 0 } );
-              my $remaining_exemption = sprintf("%.2f",
-                $cust_main_county->exempt_amount - $cust_tax_exempt->amount );
-              if ( $remaining_exemption > 0 ) {
-                my $addl = $remaining_exemption > $taxable_per_month
-                  ? $taxable_per_month
-                  : $remaining_exemption;
-                $taxable_charged -= $addl;
-                my $new_cust_tax_exempt = new FS::cust_tax_exempt ( {
-                  $cust_tax_exempt->hash,
-                  'amount' => sprintf("%.2f", $cust_tax_exempt->amount + $addl),
-                } );
-                $error = $new_cust_tax_exempt->exemptnum
-                  ? $new_cust_tax_exempt->replace($cust_tax_exempt)
-                  : $new_cust_tax_exempt->insert;
-                if ( $error ) {
-                  $dbh->rollback if $oldAutoCommit;
-                  return "fatal: can't update cust_tax_exempt: $error";
-                }
-
-              } # if $remaining_exemption > 0
-
-            } #foreach $which_month
-
-          } #if $cust_main_county->exempt_amount
-
-          $taxable_charged = sprintf( "%.2f", $taxable_charged);
-
-          #$tax += $taxable_charged * $cust_main_county->tax / 100
-          $tax{ $cust_main_county->taxname || 'Tax' } +=
-            $taxable_charged * $cust_main_county->tax / 100
-
-        } #unless $self->tax =~ /Y/i
-          #       || $self->payby eq 'COMP'
-          #       || $taxable_charged == 0
+          } #foreach my $tax ( @taxes )
+
+        } #unless $self->tax =~ /Y/i || $self->payby eq 'COMP'
 
       } #if $setup > 0 || $recur > 0
       
@@ -1271,21 +1278,42 @@ sub bill {
 #      $taxable_charged * ( $cust_main_county->getfield('tax') / 100 )
 #    );
 
-  foreach my $taxname ( grep { $tax{$_} > 0 } keys %tax ) {
-    my $tax = sprintf("%.2f", $tax{$taxname} );
-    $charged = sprintf( "%.2f", $charged+$tax );
-
-    my $cust_bill_pkg = new FS::cust_bill_pkg ({
-      'pkgnum'   => 0,
-      'setup'    => $tax,
-      'recur'    => 0,
-      'sdate'    => '',
-      'edate'    => '',
-      'itemdesc' => $taxname,
-    });
-    push @cust_bill_pkg, $cust_bill_pkg;
+  if ( dbdef->table('cust_bill_pkg')->column('itemdesc') ) { #1.5 schema
+
+    foreach my $taxname ( grep { $tax{$_} > 0 } keys %tax ) {
+      my $tax = sprintf("%.2f", $tax{$taxname} );
+      $charged = sprintf( "%.2f", $charged+$tax );
+  
+      my $cust_bill_pkg = new FS::cust_bill_pkg ({
+        'pkgnum'   => 0,
+        'setup'    => $tax,
+        'recur'    => 0,
+        'sdate'    => '',
+        'edate'    => '',
+        'itemdesc' => $taxname,
+      });
+      push @cust_bill_pkg, $cust_bill_pkg;
+    }
+  
+  } else { #1.4 schema
+
+    my $tax = 0;
+    foreach ( values %tax ) { $tax += $_ };
+    $tax = sprintf("%.2f", $tax);
+    if ( $tax > 0 ) {
+      $charged = sprintf( "%.2f", $charged+$tax );
+
+      my $cust_bill_pkg = new FS::cust_bill_pkg ({
+        'pkgnum' => 0,
+        'setup'  => $tax,
+        'recur'  => 0,
+        'sdate'  => '',
+        'edate'  => '',
+      });
+      push @cust_bill_pkg, $cust_bill_pkg;
+    }
+
   }
-#  }
 
   my $cust_bill = new FS::cust_bill ( {
     'custnum' => $self->custnum,
diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index f631d8cae..76c982ae8 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -63,6 +63,10 @@ currently supported:
 
 =item taxname - if defined, printed on invoices instead of "Tax"
 
+=item setuptax - if 'Y', this tax does not apply to setup fees
+
+=item recurtax - if 'Y', this tax does not apply to recurring fees
+
 =back
 
 =head1 METHODS
@@ -113,10 +117,38 @@ sub check {
     || $self->ut_textn('taxclass') # ...
     || $self->ut_money('exempt_amount')
     || $self->ut_textn('taxname')
+    || $self->ut_enum('setuptax', [ '', 'Y' ] )
+    || $self->ut_enum('recurtax', [ '', 'Y' ] )
     || $self->SUPER::check
     ;
 
+}
+
+sub taxname {
+  my $self = shift;
+  if ( $self->dbdef_table->column('taxname') ) {
+    return $self->setfield('taxname', $_[0]) if @_;
+    return $self->getfield('taxname');
+  }  
+  return '';
+}
+
+sub setuptax {
+  my $self = shift;
+  if ( $self->dbdef_table->column('setuptax') ) {
+    return $self->setfield('setuptax', $_[0]) if @_;
+    return $self->getfield('setuptax');
+  }  
+  return '';
+}
 
+sub recurtax {
+  my $self = shift;
+  if ( $self->dbdef_table->column('recurtax') ) {
+    return $self->setfield('recurtax', $_[0]) if @_;
+    return $self->getfield('recurtax');
+  }  
+  return '';
 }
 
 =back
-- 
cgit v1.2.1


From 4f253eb015531465e049c858a7520e8c7a71d227 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Sep 2003 11:49:44 +0000
Subject: UI for multiple named taxes w/setup & recur exemptions 1.4
 schema-auto-adjusting backport

---
 httemplate/browse/cust_main_county.cgi | 16 +++++++++++-----
 httemplate/edit/cust_main_county.cgi   | 35 +++++++++++++++++++++++++++++++---
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index c2473c4c8..e5827211c 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -24,7 +24,7 @@ print '<BR><BR>'. &table(). <<END;
         <TH>Taxclass<BR><FONT SIZE=-1>(per-package classification)</FONT></TH>
         <TH>Tax name<BR><FONT SIZE=-1>(printed on invoices)</FONT></TH>
         <TH><FONT SIZE=-1>Tax</FONT></TH>
-        <TH><FONT SIZE=-1>Exempt<BR>per<BR>month</TH>
+        <TH><FONT SIZE=-1>Exemption</TH>
       </TR>
 END
 
@@ -54,7 +54,9 @@ END
       last if $hashref->{country} ne $regions[$i+$j]->country
            || $hashref->{state} ne $regions[$i+$j]->state
            || $hashref->{tax} != $regions[$i+$j]->tax
-           || $hashref->{exempt_amount} != $regions[$i+$j]->exempt_amount;
+           || $hashref->{exempt_amount} != $regions[$i+$j]->exempt_amount
+           || $hashref->{setuptax} ne $regions[$i+$j]->setuptax
+           || $hashref->{recurtax} ne $regions[$i+$j]->recurtax;
     }
 
     my $newsup=0;
@@ -121,9 +123,13 @@ END
   print "</TD>";
 
   print "<TD BGCOLOR=\"#ffffff\">$hashref->{tax}%</TD>".
-        '<TD BGCOLOR="#ffffff">$'.
-          sprintf("%.2f", $hashref->{exempt_amount} || 0). '</TD>'.
-        '</TR>';
+        '<TD BGCOLOR="#ffffff">';
+  print '$'. sprintf("%.2f", $hashref->{exempt_amount} ).
+        '&nbsp;per&nbsp;month<BR>'
+    if $hashref->{exempt_amount};
+  print 'Setup&nbsp;fee<BR>' if $hashref->{setuptax} =~ /^Y$/i;
+  print 'Recurring&nbsp;fee<BR>' if $hashref->{recurtax} =~ /^Y$/i;
+  print '</TD></TR>';
 
 }
 
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index f3d28825a..efc12f3e0 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -16,12 +16,26 @@ print qq!<FORM ACTION="!, popurl(1),
         <TH><FONT SIZE=-1>State</FONT></TH>
         <TH><FONT SIZE=-1>County</FONT></TH>
         <TH><FONT SIZE=-1>Taxclass</FONT><BR><FONT SIZE=-2>(per-package classification)</FONT></TH>
-        <TH><FONT SIZE=-1>Tax name</FONT><BR><FONT SIZE=-2>(printed on invoices)</FONT></TH>
+END
+
+if ( dbdef->table('cust_main_county')->column('taxname') ) {
+  print '<TH><FONT SIZE=-1>Tax name</FONT><BR><FONT SIZE=-2>(printed on invoices)</FONT></TH>';
+}
+
+print <<END;
         <TH><FONT SIZE=-1>Tax</FONT></TH>
         <TH><FONT SIZE=-1>Exempt<BR>per<BR>month</TH>
-      </TR>
 END
 
+if ( dbdef->table('cust_main_county')->column('setuptax') ) {
+  print '<TH><FONT SIZE=-1>Setup<BR>fee<BR>exempt</TH>';
+}
+if ( dbdef->table('cust_main_county')->column('recurtax') ) {
+  print '<TH><FONT SIZE=-1>Recurring<BR>fee<BR>exempt</TH>';
+}
+
+print '</TR>';
+
 foreach my $cust_main_county ( sort {    $a->country cmp $b->country
                                       or $a->state   cmp $b->state
                                       or $a->county  cmp $b->county
@@ -48,11 +62,26 @@ END
     , "</TD>";
 
   print qq!<TD><INPUT TYPE="text" NAME="taxname!, $hashref->{taxnum},
-        qq!" VALUE="!, $hashref->{taxname}, qq!"></TD>!;
+        qq!" VALUE="!, $hashref->{taxname}, qq!"></TD>!
+    if dbdef->table('cust_main_county')->column('taxname');
+
   print qq!<TD><INPUT TYPE="text" NAME="tax!, $hashref->{taxnum},
         qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6>%</TD>!;
   print qq!<TD>\$<INPUT TYPE="text" NAME="exempt_amount!, $hashref->{taxnum},
         qq!" VALUE="!, $hashref->{exempt_amount}||0, qq!" SIZE=6></TD>!;
+
+  print qq!<TD><INPUT TYPE="checkbox" NAME="setuptax!. $hashref->{taxnum}.
+        '" VALUE="Y"'.
+        ( $hashref->{setuptax} =~ /^Y$/i ? ' CHECKED' : '' ).
+        '"></TD>'
+    if dbdef->table('cust_main_county')->column('setuptax');
+
+  print qq!<TD><INPUT TYPE="checkbox" NAME="recurtax!. $hashref->{taxnum}.
+        '" VALUE="Y"'.
+        ( $hashref->{recurtax} =~ /^Y$/i ? ' CHECKED' : '' ).
+        '"></TD>'
+    if dbdef->table('cust_main_county')->column('recurtax');
+
   print '</TR>';
 
 }
-- 
cgit v1.2.1


From 32508fdce66413a5f26c5d5f755121451fb734d6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Sep 2003 11:56:47 +0000
Subject: new per-tax setuptax and recurtax fields

---
 httemplate/docs/upgrade10.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index d7a8c7468..253ea891d 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -68,6 +68,10 @@ ALTER TABLE cust_bill_pkg ADD itemdesc varchar(80) NULL;
 ALTER TABLE h_cust_bill_pkg ADD itemdesc varchar(80) NULL;
 ALTER TABLE cust_main_county ADD taxname varchar(80) NULL;
 ALTER TABLE h_cust_main_county ADD taxname varchar(80) NULL;
+ALTER TABLE cust_main_county ADD setuptax char(1) NULL;
+ALTER TABLE h_cust_main_county ADD setuptax char(1) NULL;
+ALTER TABLE cust_main_county ADD recurtax char(1) NULL;
+ALTER TABLE h_cust_main_county ADD recurtax char(1) NULL;
 ALTER TABLE cust_pkg ADD last_bill int NULL;
 ALTER TABLE h_cust_pkg ADD last_bill int NULL;
 
-- 
cgit v1.2.1


From bfe2b53779bd76e03aa8deaca07ba916da6b3f5b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Sep 2003 08:11:12 +0000
Subject: fix tax edit UI

---
 httemplate/browse/cust_main_county.cgi |  2 +-
 httemplate/edit/cust_main_county.cgi   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index e5827211c..1e0e0880c 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -126,7 +126,7 @@ END
         '<TD BGCOLOR="#ffffff">';
   print '$'. sprintf("%.2f", $hashref->{exempt_amount} ).
         '&nbsp;per&nbsp;month<BR>'
-    if $hashref->{exempt_amount};
+    if $hashref->{exempt_amount} > 0;
   print 'Setup&nbsp;fee<BR>' if $hashref->{setuptax} =~ /^Y$/i;
   print 'Recurring&nbsp;fee<BR>' if $hashref->{recurtax} =~ /^Y$/i;
   print '</TD></TR>';
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index efc12f3e0..4bcfcbe9b 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -65,21 +65,21 @@ END
         qq!" VALUE="!, $hashref->{taxname}, qq!"></TD>!
     if dbdef->table('cust_main_county')->column('taxname');
 
-  print qq!<TD><INPUT TYPE="text" NAME="tax!, $hashref->{taxnum},
-        qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6>%</TD>!;
-  print qq!<TD>\$<INPUT TYPE="text" NAME="exempt_amount!, $hashref->{taxnum},
-        qq!" VALUE="!, $hashref->{exempt_amount}||0, qq!" SIZE=6></TD>!;
+  print qq!<TD><TABLE><TR><TD><INPUT TYPE="text" NAME="tax!, $hashref->{taxnum},
+        qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6></TD><TD>%</TD></TR></TABLE></TD>!;
+  print qq!<TD><TABLE><TR><TD>\$</TD><TD><INPUT TYPE="text" NAME="exempt_amount!, $hashref->{taxnum},
+        qq!" VALUE="!, $hashref->{exempt_amount}||0, qq!" SIZE=6></TD></TR></TABLE></TD>!;
 
   print qq!<TD><INPUT TYPE="checkbox" NAME="setuptax!. $hashref->{taxnum}.
         '" VALUE="Y"'.
         ( $hashref->{setuptax} =~ /^Y$/i ? ' CHECKED' : '' ).
-        '"></TD>'
+        '></TD>'
     if dbdef->table('cust_main_county')->column('setuptax');
 
   print qq!<TD><INPUT TYPE="checkbox" NAME="recurtax!. $hashref->{taxnum}.
         '" VALUE="Y"'.
         ( $hashref->{recurtax} =~ /^Y$/i ? ' CHECKED' : '' ).
-        '"></TD>'
+        '></TD>'
     if dbdef->table('cust_main_county')->column('recurtax');
 
   print '</TR>';
-- 
cgit v1.2.1


From 2d82b5b713c7c11d2d54a018d121b80fd6485c60 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Sep 2003 09:09:08 +0000
Subject: fix manual_flag problem preventing cust_pkg editing

---
 FS/FS/cust_pkg.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 1bf56e128..d9a6385e2 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -244,7 +244,9 @@ sub check {
   $self->otaker($1);
 
   if ( $self->dbdef_table->column('manual_flag') ) {
-    $self->manual_flag =~ /^([01]?)$/ or return "Illegal manual_flag";
+    $self->manual_flag('') if $self->manual_flag eq ' ';
+    $self->manual_flag =~ /^([01]?)$/
+      or return "Illegal manual_flag ". $self->manual_flag;
     $self->manual_flag($1);
   }
 
-- 
cgit v1.2.1


From 6621bcd8966b784ff930c51548432a15e8094e94 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Sep 2003 09:15:33 +0000
Subject: re-enable ChopBlanks for now

---
 FS/FS/UID.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index f67005151..8271f89f2 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -87,7 +87,7 @@ sub forksuidsetup {
   getsecrets;
   $dbh = DBI->connect($datasrc,$db_user,$db_pass, {
                           'AutoCommit' => 0,
-                          #'ChopBlanks' => 1,
+                          'ChopBlanks' => 1,
   } ) or die "DBI->connect error: $DBI::errstr\n";
 
   foreach ( keys %callback ) {
-- 
cgit v1.2.1


From b0fb4547e39f3ad26bedb95d8cc8b5a10f66a4eb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Sep 2003 09:31:11 +0000
Subject: scalar/array scope fix... new, multiple (i.e. canadian GST/PST) taxes
 work now!

---
 FS/FS/cust_main.pm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 385899387..90cf18e8f 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1165,18 +1165,20 @@ sub bill {
 
         unless ( $self->tax =~ /Y/i || $self->payby eq 'COMP' ) {
 
-          my @taxes =  qsearch( 'cust_main_county', {
-                                  'state'    => $self->state,
-                                  'county'   => $self->county,
-                                  'country'  => $self->country,
-                                  'taxclass' => $part_pkg->taxclass,
-                                                                      } )
-                    || qsearch( 'cust_main_county', {
+          my @taxes = qsearch( 'cust_main_county', {
+                                 'state'    => $self->state,
+                                 'county'   => $self->county,
+                                 'country'  => $self->country,
+                                 'taxclass' => $part_pkg->taxclass,
+                                                                      } );
+          unless ( @taxes ) {
+            @taxes =  qsearch( 'cust_main_county', {
                                   'state'    => $self->state,
                                   'county'   => $self->county,
                                   'country'  => $self->country,
                                   'taxclass' => '',
                                                                       } );
+          }
 
           # maybe eliminate this entirely, along with all the 0% records
           unless ( @taxes ) {
-- 
cgit v1.2.1


From 74e6f7cb1f048778a417e0124143f6c447c9f87c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Sep 2003 13:04:26 +0000
Subject: re-setup option to re-charge setup fee

---
 FS/FS/cust_main.pm    | 16 ++++++++++------
 FS/bin/freeside-daily | 11 +++++++----
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 90cf18e8f..de22ab5c5 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -993,15 +993,19 @@ conjunction with the collect method.
 
 Options are passed as name-value pairs.
 
-The only currently available option is `time', which bills the customer as if
-it were that time.  It is specified as a UNIX timestamp; see
-L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse> for conversion
-functions.  For example:
+Currently available options are:
+
+resetup - if set true, re-charges setup fees.
+
+time - bills the customer as if it were that time.  Specified as a UNIX
+timestamp; see L<perlfunc/"time">).  Also see L<Time::Local> and
+L<Date::Parse> for conversion functions.  For example:
 
  use Date::Parse;
  ...
  $cust_main->bill( 'time' => str2time('April 20th, 2001') );
 
+
 If there is an error, returns the error, otherwise returns false.
 
 =cut
@@ -1058,7 +1062,7 @@ sub bill {
 
     # bill setup
     my $setup = 0;
-    unless ( $cust_pkg->setup ) {
+    if ( !$cust_pkg->setup || $options{'resetup'} ) {
       my $setup_prog = $part_pkg->getfield('setup');
       $setup_prog =~ /^(.*)$/ or do {
         $dbh->rollback if $oldAutoCommit;
@@ -1078,7 +1082,7 @@ sub bill {
         return "Error eval-ing part_pkg->setup pkgpart ". $part_pkg->pkgpart.
                "(expression $setup_prog): $@";
       }
-      $cust_pkg->setfield('setup',$time);
+      $cust_pkg->setfield('setup', $time) unless $cust_pkg->setup;
       $cust_pkg_mod_flag=1; 
     }
 
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 63e621b57..80b8edf82 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -10,8 +10,8 @@ use FS::Conf;
 use FS::cust_main;
 
 &untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_d $opt_v $opt_p);
-getopts("p:d:v");
+use vars qw($opt_d $opt_v $opt_p $opt_s);
+getopts("p:d:vs");
 my $user = shift or die &usage;
 
 adminsuidsetup $user;
@@ -42,7 +42,8 @@ foreach $cust_main ( @cust_main ) {
       if $error;
   }
 
-  my $error = $cust_main->bill( 'time' => $time );
+  my $error = $cust_main->bill( 'time'    => $time,
+                                'resetup' => $opt_s, );
   warn "Error billing, custnum ". $cust_main->custnum. ": $error" if $error;
 
   $cust_main->apply_payments;
@@ -98,7 +99,7 @@ freeside-daily - Run daily billing and invoice collection events.
 
 =head1 SYNOPSIS
 
-  freeside-daily [ -d 'date' ] [ -p 'payby' ] [ -v ] user [ custnum custnum ... ]
+  freeside-daily [ -d 'date' ] [ -p 'payby' ] [ -s ] [ -v ] user [ custnum custnum ... ]
 
 =head1 DESCRIPTION
 
@@ -115,6 +116,8 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
   -p: Only process customers with the specified payby (I<CARD>, I<DCRD>, I<CHEK>, I<DCHK>, I<BILL>, I<COMP>, I<LECB>)
 
+  -s: re-charge setup fees
+
   -v: enable debugging
 
 user: From the mapsecrets file - see config.html from the base documentation
-- 
cgit v1.2.1


From 056a0e2da67602762263e66b30d3226007355318 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Sep 2003 13:37:24 +0000
Subject: sql

---
 httemplate/docs/upgrade10.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 253ea891d..2f7f4d89a 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -62,7 +62,7 @@ CREATE TABLE svc_broadband (
   PRIMARY KEY (svcnum)
 );
 
-DELETE INDEX cust_bill_pkg1;
+DROP INDEX cust_bill_pkg1;
 
 ALTER TABLE cust_bill_pkg ADD itemdesc varchar(80) NULL;
 ALTER TABLE h_cust_bill_pkg ADD itemdesc varchar(80) NULL;
-- 
cgit v1.2.1


From 8bf17cd5daed65822e577b60794a4398e5e3dd2d Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Fri, 26 Sep 2003 21:02:13 +0000
Subject: $field isn't a global.

---
 httemplate/edit/svc_acct.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 44606d9a0..f1b8b800b 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -281,7 +281,7 @@ if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) {
 }
 print '</TD></TR>';
 
-foreach $field ($svc_acct->virtual_fields) {
+foreach my $field ($svc_acct->virtual_fields) {
   if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
     # If the flag is X, it won't even show up in $svc_acct->virtual_fields.
     print $svc_acct->pvf($field)->widget('HTML', 'edit', 
-- 
cgit v1.2.1


From c2a0b1b8e9d437434e326a3b573d7134c5697213 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Fri, 26 Sep 2003 23:33:09 +0000
Subject: $field is not a global.

---
 httemplate/edit/svc_www.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index 043af610b..ec5169e05 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -167,7 +167,7 @@ foreach $_ (keys %username) {
 }
 print "</SELECT></TD></TR>";
 
-foreach $field ($svc_www->virtual_fields) {
+foreach my $field ($svc_www->virtual_fields) {
   if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
     # If the flag is X, it won't even show up in $svc_acct->virtual_fields.
     print $svc_www->pvf($field)->widget('HTML', 'edit', 
-- 
cgit v1.2.1


From c8f80bd5aaeb0f3844a7cece4bfe250d4f89f745 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 28 Sep 2003 02:36:18 +0000
Subject: add upload of batch result from TD Canada Trust some global.asa /
 handler.pl enhancements

---
 FS/FS/cust_pay_batch.pm              | 138 ++++++++++++++++++++++++++++++++++-
 htetc/global.asa                     |  32 ++++++++
 htetc/handler.pl                     |  47 ++++++++----
 httemplate/browse/cust_pay_batch.cgi |  13 +++-
 httemplate/misc/upload-batch.cgi     |  28 +++++++
 5 files changed, 239 insertions(+), 19 deletions(-)
 create mode 100644 httemplate/misc/upload-batch.cgi

diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
index 1a530467c..97c168159 100644
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -2,7 +2,7 @@ package FS::cust_pay_batch;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record;
+use FS::Record qw(dbh qsearchs);
 use Business::CreditCard;
 
 @ISA = qw( FS::Record );
@@ -190,9 +190,141 @@ sub check {
 
 =back
 
-=head1 VERSION
+=head1 SUBROUTINES
 
-$Id: cust_pay_batch.pm,v 1.7 2003-08-05 00:20:42 khoff Exp $
+=over 4
+
+=item import_results
+
+=cut
+
+sub import_results {
+  use Time::Local;
+  use FS::cust_pay;
+  eval "use Text::CSV_XS;";
+  die $@ if $@;
+#
+  my $param = shift;
+  my $fh = $param->{'filehandle'};
+  my $format = $param->{'format'};
+  my $paybatch = $param->{'paybatch'};
+
+  my @fields;
+  my $condition;
+  my $hook;
+
+  if ( $format eq 'csv-td_canada_trust-merchant_pc_batch' ) {
+
+    @fields = (
+      'paybatchnum', # Reference#:  Invoice number of the transaction
+      'paid',        # Amount:  Amount of the transaction.  Dollars and cents
+                     #          with no decimal entered.
+      '',            # Card Type:  0 - MCrd, 1 - Visa, 2 - AMEX, 3 - Discover,
+                     #             4 - Insignia, 5 - Diners/EnRoute, 6 - JCB
+      '_date',       # Transaction Date:  Date the Transaction was processed
+      'time',        # Transaction Time:  Time the transaction was processed
+      'payinfo',     # Card Number:  Card number for the transaction
+      '',            # Expiry Date:  Expiry date of the card
+      '',            # Auth#:  Authorization number entered for force post
+                     #         transaction
+      'type',        # Transaction Type:  0 - purchase, 40 - refund,
+                     #                    20 - force post
+      'result',      # Processing Result: 3 - Approval,
+                     #                    4 - Declined/Amount over limit,
+                     #                    5 - Invalid/Expired/stolen card,
+                     #                    6 - Comm Error
+      '',            # Terminal ID: Terminal ID used to process the transaction
+    );
+
+    $condition = sub {
+      my $hash = shift;
+      $hash->{'result'} == 3 && $hash->{'type'} == 0;
+    };
+
+    $hook = sub {
+      my $hash = shift;
+      $hash->{'paid'} = sprintf("%.2f", $hash->{'paid'} / 100 );
+      $hash->{'_date'} = timelocal( substr($hash->{'time'},  4, 2),
+                                    substr($hash->{'time'},  2, 2),
+                                    substr($hash->{'time'},  0, 2),
+                                    substr($hash->{'_date'}, 6, 2),
+                                    substr($hash->{'_date'}, 4, 2)-1,
+                                    substr($hash->{'_date'}, 0, 4)-1900, );
+    };
+
+  } else {
+    return "Unknown format $format";
+  }
+
+  my $csv = new Text::CSV_XS;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $line;
+  while ( defined($line=<$fh>) ) {
+
+    $csv->parse($line) or do {
+      $dbh->rollback if $oldAutoCommit;
+      return "can't parse: ". $csv->error_input();
+    };
+
+    my @values = $csv->fields();
+    my %hash;
+    foreach my $field ( @fields ) {
+      my $value = shift @values;
+      next unless $field;
+      $hash{$field} = $value;
+    }
+
+    my $cust_pay_batch =
+      qsearchs('cust_pay_batch', { 'paybatchnum' => $hash{'paybatchnum'} } );
+    unless ( $cust_pay_batch ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "unknown paybatchnum $hash{'paybatchnum'}\n";
+    }
+    my $custnum = $cust_pay_batch->custnum,
+
+    my $error = $cust_pay_batch->delete;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "error removing paybatchnum $hash{'paybatchnum'}: $error\n";
+    }
+
+    next unless &{$condition}(\%hash);
+
+    &{$hook}(\%hash);
+
+    my $cust_pay = new FS::cust_pay ( {
+      'custnum'  => $custnum,
+      'payby'    => 'CARD',
+      'paybatch' => $paybatch,
+      map { $_ => $hash{$_} } (qw( paid _date payinfo )),
+    } );
+    $error = $cust_pay->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "error adding payment paybatchnum $hash{'paybatchnum'}: $error\n";
+    }
+
+    $cust_pay->cust_main->apply_payments;
+
+  }
+  
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+
+}
+
+=back
 
 =head1 BUGS
 
diff --git a/htetc/global.asa b/htetc/global.asa
index 5b0ac4991..f00ae57f5 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -9,6 +9,7 @@ use CGI;
 use Date::Format;
 use Date::Parse;
 use Time::Local;
+use File::Basename;
 use Tie::IxHash;
 use HTML::Entities;
 use IO::Handle;
@@ -195,5 +196,36 @@ sub include {
   $Response->Include(@_);
 }
 
+if ( defined(@DBIx::Profile::ISA) ) {
+
+  #false laziness w/above
+  *redirect = sub {
+    my($location) = @_;
+
+    ${$Response->{BinaryRef}} = 
+      $cgi->header.
+      qq!<HTML><BODY>Redirect to <A HREF="$location">$location</A>!.
+      '<BR><BR><PRE>'.
+        ( UNIVERSAL::can(dbh, 'sprintProfile')
+            ? encode_entities(dbh->sprintProfile())
+            : 'DBIx::Profile missing sprintProfile method;'.
+              'unpatched or too old?'                        ).
+      "\n\n". &sprintAutoProfile().  '</PRE>'.
+      '</BODY></HTML>';
+
+    dbh->{'private_profile'} = {};
+
+    $Response->End;
+
+  };
+
+} else {
+
+  *redirect = sub {
+    $Response->Redirect(@_);
+  }
+
+}
+
 1;
 
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 8f079af33..1660cb3fa 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -67,6 +67,7 @@ sub handler
       use Date::Format;
       use Date::Parse;
       use Time::Local;
+      use File::Basename;
       use Tie::IxHash;
       use HTML::Entities;
       use IO::Handle;
@@ -141,20 +142,10 @@ sub handler
 
         } else { #normal redirect
 
-          #http://www.masonhq.com/docs/faq/#how_do_i_do_an_external_redirect
-          $m->clear_buffer;
-          # The next two lines are necessary to stop Apache from re-reading
-          # POSTed data.
-          $r->method('GET');
-          $r->headers_in->unset('Content-length');
-          $r->content_type('text/html');
-          #$r->err_header_out('Location' => $location);
-          $r->header_out('Location' => $location);
-          $r->header_out('Content-Type' => 'text/html');
-          $m->abort(302);
-
+          $m->redirect($location);
           '';
-         }
+
+        }
 
       };
 
@@ -168,6 +159,36 @@ sub handler
         $m->scomp(@_);
       }
 
+      sub redirect {
+        my( $location ) = @_;
+        use vars qw($m);
+        $m->clear_buffer;
+        #false laziness w/above
+        if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect
+
+          $m->print(
+            qq!<HTML><BODY>Redirect to <A HREF="$location">$location</A>!.
+            '<BR><BR><PRE>'.
+              ( UNIVERSAL::can(dbh, 'sprintProfile')
+                  ? encode_entities(dbh->sprintProfile())
+                  : 'DBIx::Profile missing sprintProfile method;'.
+                    'unpatched or too old?'                        ).
+            #"\n\n". &sprintAutoProfile().  '</PRE>'.
+            "\n\n".                         '</PRE>'.
+            '</BODY></HTML>'
+          );
+          dbh->{'private_profile'} = {};
+
+          $m->abort(200);
+
+        } else { #normal redirect
+
+          $m->redirect($location);
+
+        }
+
+      }
+
     } # end package HTML::Mason::Commands;
 
     $r->content_type('text/html');
diff --git a/httemplate/browse/cust_pay_batch.cgi b/httemplate/browse/cust_pay_batch.cgi
index f9d0921a1..d90a03313 100755
--- a/httemplate/browse/cust_pay_batch.cgi
+++ b/httemplate/browse/cust_pay_batch.cgi
@@ -2,11 +2,18 @@
 <%= header("Pending credit card batch", menubar( 'Main Menu' => $p,)) %>
 
 <FORM ACTION="<%=$p%>misc/download-batch.cgi" METHOD="POST">
-
 Download batch in format <SELECT NAME="format">
-<OPTION VALUE="csv">Generic CSV (comma-separated value)</OPTION>
 <OPTION VALUE="csv-td_canada_trust-merchant_pc_batch">CSV file for TD Canada Trust Merchant PC Batch</OPTION>
-</SELECT><INPUT TYPE="submit" VALUE="Download">
+</SELECT><INPUT TYPE="submit" VALUE="Download"></FORM>
+<BR><BR>
+
+<FORM ACTION="<%=$p%>misc/upload-batch.cgi" METHOD="POST" ENCTYPE="multipart/form-data">
+Upload results<BR>
+Filename <INPUT TYPE="file" NAME="batch_results"><BR>
+Format <SELECT NAME="format">
+<OPTION VALUE="csv-td_canada_trust-merchant_pc_batch">CSV results from TD Canada Trust Merchant PC Batch</OPTION>
+</SELECT><BR>
+<INPUT TYPE="submit" VALUE="Upload"></FORM>
 <BR><BR>
 
 <%= &table() %>
diff --git a/httemplate/misc/upload-batch.cgi b/httemplate/misc/upload-batch.cgi
new file mode 100644
index 000000000..565a6da5c
--- /dev/null
+++ b/httemplate/misc/upload-batch.cgi
@@ -0,0 +1,28 @@
+<%
+
+  my $fh = $cgi->upload('batch_results');
+  my $filename = $cgi->param('batch_results');
+  my $paybatch = basename($filename);
+
+  my $error = defined($fh)
+    ? FS::cust_pay_batch::import_results( {
+        'filehandle' => $fh,
+        'format'     => $cgi->param('format'),
+        'paybatch'   => $paybatch,
+      } )
+    : 'No file';
+
+  if ( $error ) {
+    %>
+    <!-- mason kludge -->
+    <%
+    eidiot($error);
+#    $cgi->param('error', $error);
+#    print $cgi->redirect( "${p}cust_main-import.cgi
+  } else {
+    %>
+    <!-- mason kludge -->
+    <%= header('Batch results upload sucessful') %> <%
+  }
+%>
+
-- 
cgit v1.2.1


From 4196bc59e8cceb04c6f76fab46ce249ff0178c43 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Sep 2003 02:17:51 +0000
Subject: finish removing quiet config options

---
 FS/FS/Conf.pm                      | 4 ++--
 FS/bin/freeside-selfservice-server | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 6fa47b6bd..400de69d6 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -888,8 +888,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'selfservice_server-quiet',
-    'section'     => '',
-    'description' => 'Disable decline and cancel emails generated by transactions initiated by the selfservice server. Not recommended, unless the customer will get instant feedback from a customer service UI, and receiving an email would be confusing/overkill.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, the self-service server no longer sends superfluous decline and cancel emails.  Used to disable decline and cancel emails generated by transactions initiated by the selfservice server.',
     'type'        => 'checkbox',
   },
 
diff --git a/FS/bin/freeside-selfservice-server b/FS/bin/freeside-selfservice-server
index 6cfafda58..107103973 100644
--- a/FS/bin/freeside-selfservice-server
+++ b/FS/bin/freeside-selfservice-server
@@ -43,11 +43,6 @@ open(LOCKFILE,">$lock_file") or die "can't open $lock_file: $!";
 
 my $conf = new FS::Conf;
 
-if ($conf->exists('selfservice_server-quiet')) {
-    $FS::cust_bill::quiet = 1;
-    $FS::cust_pkg::quiet = 1;
-}
-
 my $clientd = "/usr/local/sbin/freeside-selfservice-clientd"; #better name?
 
 my $warnkids=0;
-- 
cgit v1.2.1


From e17e58178d528e16d45c333996f763afda55e054 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Sep 2003 05:51:20 +0000
Subject: added agent.disabled       agent.username       agent._password

---
 FS/bin/freeside-setup       | 3 +++
 httemplate/docs/schema.html | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 27d02529c..bb122700a 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -336,6 +336,9 @@ sub tables_hash_hack {
         'typenum',  'int',            '',     '',
         'freq',     'int',       'NULL', '',
         'prog',     @perl_type,
+        'disabled',     'char', 'NULL', 1,
+        'username', 'varchar',           '',     $char_d,
+        '_password','varchar',           '',     $char_d,
       ],
       'primary_key' => 'agentnum',
       'unique' => [],
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 9204bdc8f..bef567186 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -12,6 +12,9 @@
         <li>typenum - <a href="#agent_type">agent type</a>
         <li>prog - (unimplemented)
         <li>freq - (unimplemented)
+        <li>disabled - Disabled flag, empty or 'Y'
+        <li>username - Username for the Agent interface
+        <li>_password - Password for the Agent interface
       </ul>
     <li><a name="agent_type" href="man/FS/agent_type.html">agent_type</a> - Agent types define groups of packages that you can then assign to particular agents.
       <ul>
-- 
cgit v1.2.1


From b59a412755582d30b4f7be2147b6ad32037e6f59 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Sep 2003 05:51:50 +0000
Subject: agents can be disabled (auto-sensing based on schema)

---
 FS/FS/agent.pm                | 23 ++++++++++++++-
 httemplate/browse/agent.cgi   | 26 +++++++++++++++--
 httemplate/edit/agent.cgi     | 65 +++++++++++++++++++++++--------------------
 httemplate/edit/cust_main.cgi |  6 ++--
 4 files changed, 85 insertions(+), 35 deletions(-)

diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
index 6de15ae6f..bcba602cc 100644
--- a/FS/FS/agent.pm
+++ b/FS/FS/agent.pm
@@ -50,6 +50,12 @@ from FS::Record.  The following fields are currently supported:
 
 =item freq - For future use.
 
+=item disabled - Disabled flag, empty or 'Y'
+
+=item username - Username for the Agent interface
+
+=item _password - Password for the Agent interface
+
 =back
 
 =head1 METHODS
@@ -110,6 +116,21 @@ sub check {
   ;
   return $error if $error;
 
+  if ( $self->dbdef_table->column('disabled') ) {
+    $error = $self->ut_enum('disabled', [ '', 'Y' ] );
+    return $error if $error;
+  }
+
+  if ( $self->dbdef_table->column('username') ) {
+    $error = $self->ut_alphan('username');
+    return $error if $error;
+    if ( length($self->username) ) {
+      $error = $self->ut_text('password'); # ut_text... arbitrary choice
+    } else {
+      $self->_password('');
+    }
+  }
+
   return "Unknown typenum!"
     unless $self->agent_type;
 
@@ -144,7 +165,7 @@ sub pkgpart_hashref {
 
 =head1 VERSION
 
-$Id: agent.pm,v 1.4 2003-08-05 00:20:40 khoff Exp $
+$Id: agent.pm,v 1.5 2003-09-29 05:51:50 ivan Exp $
 
 =head1 BUGS
 
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 0d808cd0d..ece01724e 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -2,6 +2,14 @@
 
 <%
 
+  my %search;
+  if ( $cgi->param('showdisabled')
+       || !dbdef->table('agent')->column('disabled') ) {
+    %search = ();
+  } else {
+    %search = ( 'disabled' => '' );
+  }
+
   #bad false laziness with search/cust_main.cgi (also needs fixing up for
   #old mysql)
   my $ncancelled = "
@@ -36,9 +44,18 @@ Agents are resellers of your service. Agents may be limited to a subset of your
 full offerings (via their type).<BR><BR>
 <A HREF="<%= $p %>edit/agent.cgi"><I>Add a new agent</I></A><BR><BR>
 
+<% if ( dbdef->table('agent')->column('disabled') ) { %>
+  <%= $cgi->param('showdisabled')
+      ? do { $cgi->param('showdisabled', 0);
+             '( <a href="'. $cgi->self_url. '">hide disabled agents</a> )'; }
+      : do { $cgi->param('showdisabled', 1);
+             '( <a href="'. $cgi->self_url. '">show disabled agents</a> )'; }
+  %>
+<% } %>
+
 <%= table() %>
 <TR>
-  <TH COLSPAN=2>Agent</TH>
+  <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Agent</TH>
   <TH>Type</TH>
   <TH>Customers</TH>
   <TH><FONT SIZE=-1>Freq.</FONT></TH>
@@ -51,7 +68,7 @@ full offerings (via their type).<BR><BR>
 foreach my $agent ( sort { 
   #$a->getfield('agentnum') <=> $b->getfield('agentnum')
   $a->getfield('agent') cmp $b->getfield('agent')
-} qsearch('agent',{}) ) {
+} qsearch('agent', \%search ) ) {
 
   $ncancelled_sth->execute($agent->agentnum) or die $ncancelled_sth->errstr;
   my $num_ncancelled = $ncancelled_sth->fetchrow_arrayref->[0];
@@ -66,6 +83,11 @@ foreach my $agent ( sort {
       <TR>
         <TD><A HREF="<%=$p%>edit/agent.cgi?<%= $agent->agentnum %>">
           <%= $agent->agentnum %></A></TD>
+<% if ( dbdef->table('agent')->column('disabled')
+        && !$cgi->param('showdisabled')           ) { %>
+        <TD><%= $agent->disabled ? 'DISABLED' : '' %></TD>
+<% } %>
+
         <TD><A HREF="<%=$p%>edit/agent.cgi?<%= $agent->agentnum %>">
           <%= $agent->agent %></A></TD>
         <TD><A HREF="<%=$p%>edit/agent_type.cgi?<%= $agent->typenum %>"><%= $agent->agent_type->atype %></A></TD>
diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index 449456cdd..8a1cb2ae1 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -16,59 +16,64 @@ if ( $cgi->param('error') ) {
 my $action = $agent->agentnum ? 'Edit' : 'Add';
 my $hashref = $agent->hashref;
 
-print header("$action Agent", menubar(
+%>
+
+<%= header("$action Agent", menubar(
   'Main Menu' => $p,
   'View all agents' => $p. 'browse/agent.cgi',
-));
+)) %>
 
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
+<% if ( $cgi->param('error') ) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+<% } %>
 
-print '<FORM ACTION="', popurl(1), 'process/agent.cgi" METHOD=POST>',
-      qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$hashref->{agentnum}">!,
-      "Agent #", $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)";
+<FORM ACTION="<%=popurl(1)%>process/agent.cgi" METHOD=POST>
+<INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $hashref->{agentnum} %>">
+Agent #<%= $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)" %>
 
-print &ntable("#cccccc", 2, ''), <<END;
+<%= &ntable("#cccccc", 2, '') %>
 <TR>
   <TH ALIGN="right">Agent</TH>
-  <TD><INPUT TYPE="text" NAME="agent" SIZE=32 VALUE="$hashref->{agent}"></TD>
+  <TD><INPUT TYPE="text" NAME="agent" SIZE=32 VALUE="<%= $hashref->{agent} %>"></TD>
 </TR>
 <TR>
   <TH ALIGN="right">Agent type</TH>
   <TD><SELECT NAME="typenum" SIZE=1>
-END
 
-foreach my $agent_type (qsearch('agent_type',{})) {
-  print "<OPTION VALUE=". $agent_type->typenum;
-  print " SELECTED"
-    if $hashref->{typenum} && ( $hashref->{typenum} == $agent_type->typenum );
-  print ">", $agent_type->getfield('typenum'), ": ",
-        $agent_type->getfield('atype'),"\n";
-}
+<% foreach my $agent_type (qsearch('agent_type',{})) { %>
+  <OPTION VALUE="<%= $agent_type->typenum %>"<%= ( $hashref->{typenum} && ( $hashref->{typenum} == $agent_type->typenum ) ) ? ' SELECTED' : '' %>>
+  <%= $agent_type->getfield('typenum') %>: <%= $agent_type->getfield('atype') %>
+<% } %>
 
-print <<END;
 </SELECT></TD>
 </TR>
+<% if ( dbdef->table('agent')->column('disabled') ) { %>
+  <TR>
+    <TD ALIGN="right">Disable</TD>
+    <TD><INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref->{disabled} eq 'Y' ? ' CHECKED' : '' %>></TD>
+  </TR>
+<% } %>
 <TR>
   <TD ALIGN="right"><!--Frequency--></TD>
-  <TD><INPUT TYPE="hidden" NAME="freq" VALUE="$hashref->{freq}"></TD>
+  <TD><INPUT TYPE="hidden" NAME="freq" VALUE="<%= $hashref->{freq} %>"></TD>
 </TR>
 <TR>
   <TD ALIGN="right"><!--Program--></TD>
-  <TD><INPUT TYPE="hidden" NAME="prog" VALUE="$hashref->{prog}"></TD>
+  <TD><INPUT TYPE="hidden" NAME="prog" VALUE="<%= $hashref->{prog} %>"></TD>
 </TR>
+<% if ( dbdef->table('agent')->column('username') ) { %>
+  <TR>
+    <TD ALIGN="right">Agent interface username</TD>
+    <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $hashref->{username} %>"></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Agent interface password</TD>
+    <TD><INPUT TYPE="text" NAME="_password" VALUE="<%= $hashref->{_password} %>"></TD>
+  </TR>
+<% } %>
 </TABLE>
-END
 
-print qq!<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{agentnum} ? "Apply changes" : "Add agent",
-      qq!">!;
-
-print <<END;
+<BR><INPUT TYPE="submit" VALUE="<%= $hashref->{agentnum} ? "Apply changes" : "Add agent" %>">
     </FORM>
   </BODY>
 </HTML>
-END
-
-%>
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index eeceed889..73a0eef49 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -75,9 +75,11 @@ print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST NAME="form1">!,
 
 my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
-my @agents = qsearch( 'agent', {} );
+my %agent_search = dbdef->table('agent')->column('disabled')
+                     ? ( 'disabled' => '' ) : ();
+my @agents = qsearch( 'agent', \%agent_search );
 #die "No agents created!" unless @agents;
-eidiot "You have not created any agents.  You must create at least one agent before adding a customer.  Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents;
+eidiot "You have not created any agents (or all agents are disabled).  You must create at least one agent before adding a customer.  Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents;
 my $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
 if ( scalar(@agents) == 1 ) {
   print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!;
-- 
cgit v1.2.1


From 292610eafc745b94f4d9d2d784b02669bd297fc6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Sep 2003 06:22:18 +0000
Subject: eliminate warning

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 57b93d4f0..78f31aa28 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.43 2003-07-04 03:21:42 ivan Exp $
+# $Id: signup.cgi,v 1.44 2003-09-29 06:22:18 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages
@@ -524,7 +524,7 @@ sub regionselector {
   my ( $selected_county, $selected_state, $selected_country,
        $prefix, $onchange ) = @_;
 
-  my $prefix = '' unless defined $prefix;
+  $prefix = '' unless defined $prefix;
 
   my $countyflag = 0;
 
-- 
cgit v1.2.1


From d68a2fa2e5d615ba978fcb97e600b3d4f067f880 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Sep 2003 06:35:34 +0000
Subject: remove Gratuitous Capitalization

---
 httemplate/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index a898d9134..e3556c2d7 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -195,7 +195,7 @@
           <LI><A HREF="browse/cust_main_county.cgi">View/Edit locales and tax rates</A>
             - Change tax rates, or break down a country into states, or a state
               into counties and assign different tax rates to each.
-          <LI><A HREF="browse/svc_acct_pop.cgi">View/Edit Access Numbers</A>
+          <LI><A HREF="browse/svc_acct_pop.cgi">View/Edit access numbers</A>
             - Points of Presence 
           <LI><A HREF="browse/part_bill_event.cgi">View/Edit invoice events</A> - Actions for overdue invoices
 	  <LI><A HREF="browse/msgcat.cgi">View/Edit message catalog</A> - Change error messages and other customizable labels.
-- 
cgit v1.2.1


From ce0cb6c1b8d51cc9bb27fe9685bcccab5d8e25fb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Sep 2003 06:51:24 +0000
Subject: signup with agent selection

---
 FS/FS/ClientAPI/Signup.pm                          |  16 +-
 .../FS-SignupClient/cgi/signup-agentselect.html    | 195 +++++++++++++++++++++
 fs_signup/FS-SignupClient/cgi/signup.cgi           |   3 +-
 3 files changed, 211 insertions(+), 3 deletions(-)
 create mode 100755 fs_signup/FS-SignupClient/cgi/signup-agentselect.html

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 36045d9e2..5ca1f93ed 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -3,7 +3,7 @@ package FS::ClientAPI::Signup;
 use strict;
 use Tie::RefHash;
 use FS::Conf;
-use FS::Record qw(qsearch qsearchs);
+use FS::Record qw(qsearch qsearchs dbdef);
 use FS::agent;
 use FS::cust_main_county;
 use FS::part_pkg;
@@ -29,6 +29,15 @@ sub signup_info {
     'cust_main_county' =>
       [ map { $_->hashref } qsearch('cust_main_county', {}) ],
 
+    'agent' =>
+      [
+        map { $_->hashref }
+          qsearch('agent', dbdef->table('agent')->column('disabled')
+                             ? { 'disabled' => '' }
+                             : {}
+                 )
+      ],
+
     'agentnum2part_pkg' =>
       {
         map {
@@ -39,7 +48,10 @@ sub signup_info {
                 grep { $_->svcpart('svc_acct') && $href->{ $_->pkgpart } }
                   qsearch( 'part_pkg', { 'disabled' => '' } )
             ];
-        } qsearch('agent', {} )
+        } qsearch('agent', dbdef->table('agent')->column('disabled')
+                             ? { 'disabled' => '' }
+                             : {}
+                 )
       },
 
     'svc_acct_pop' => [ map { $_->hashref } qsearch('svc_acct_pop',{} ) ],
diff --git a/fs_signup/FS-SignupClient/cgi/signup-agentselect.html b/fs_signup/FS-SignupClient/cgi/signup-agentselect.html
new file mode 100755
index 000000000..24513611f
--- /dev/null
+++ b/fs_signup/FS-SignupClient/cgi/signup-agentselect.html
@@ -0,0 +1,195 @@
+<HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
+<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>ISP Signup form</FONT><BR><BR>
+<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
+<FORM ACTION="<%= $self_url %>" METHOD=POST>
+<INPUT TYPE="hidden" NAME="magic" VALUE="process">
+<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
+<INPUT TYPE="hidden" NAME="ss" VALUE="">
+Agent <SELECT NAME="agentnum">
+<%=
+  warn $init_data;
+  warn $init_data->{'agent'};
+  foreach my $agent ( @{$init_data->{'agent'}} ) {
+    $OUT .= '<OPTION VALUE="'. $agent->{'agentnum'}. '"';
+    $OUT .= ' SELECTED' if $agent->{'agentnum'} eq $agentnum;
+    $OUT .= '>'. $agent->{'agent'};
+  }
+%>
+</SELECT><BR><BR>
+Contact Information
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Contact name<BR>(last, first)</TH>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="last" VALUE="<%= $last %>">,
+                <INPUT TYPE="text" NAME="first" VALUE="<%= $first %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Company</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="<%= $company %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Address</TH>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="<%= $address1 %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">&nbsp;</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="<%= $address2 %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
+  <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
+  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
+  <TD>
+    <%=
+        ($county_html, $state_html, $country_html) =
+          regionselector( $county, $state, $country );
+ 
+        "$county_html $state_html";
+    %>
+  </TD>
+  <TH><font color="#ff0000">*</font>Zip</TH>
+  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Country</TH>
+  <TD><%= $country_html %></TD>
+<TR>
+  <TD ALIGN="right">Day Phone</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="<%= $daytime %>" SIZE=18></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Night Phone</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="<%= $night %>" SIZE=18></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Fax</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="<%= $fax %>" SIZE=12></TD>
+</TR>
+</TABLE><font color="#ff0000">*</font> required fields<BR>
+<BR>Billing information<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR><TD>
+
+  <%=
+    $OUT .= '<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"';
+    my @invoicing_list = split(', ', $invoicing_list );
+    $OUT .= ' CHECKED'
+      if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
+    $OUT .= '>';
+  %>
+
+  Postal mail invoice
+</TD></TR>
+<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="<%= join(', ', grep { $_ ne 'POST' } split(', ', $invoicing_list ) ) %>">
+</TD></TR>
+<%= scalar(@payby) > 1 ? '<TR><TD>Billing type</TD></TR>' : '' %>
+</TABLE>
+<TABLE BGCOLOR="#c0c0c0" BORDER=1 WIDTH="100%">
+<TR>
+
+  <%=
+
+    my $cardselect = '<SELECT NAME="CARD_type"><OPTION></OPTION>';
+    my %types = (
+                  'VISA' => 'VISA card',
+                  'MasterCard' => 'MasterCard',
+                  'Discover' => 'Discover card',
+                  'American Express' => 'American Express card',
+                );
+    foreach ( keys %types ) {
+      $selected = $cgi->param('CARD_type') eq $types{$_} ? 'SELECTED' : '';
+      $cardselect .= qq!<OPTION $selected VALUE="$types{$_}">$_</OPTION>!;
+    }
+    $cardselect .= '</SELECT>';
+  
+    my %payby = (
+      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="">!,
+      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
+      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
+      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", "12-2037"). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
+      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
+      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
+    );
+
+    my( $account, $aba ) = split('@', $payinfo);
+    my %paybychecked = (
+      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="$payname">!,
+      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
+      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
+      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", $paydate). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
+      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
+    );
+
+    for (@payby) {
+      if ( scalar(@payby) == 1) {
+        $OUT .= '<TD VALIGN=TOP>'.
+                qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$_">!.
+                "$paybychecked{$_}</TD>";
+      } else {
+        $OUT .= qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
+        if ($payby eq $_) {
+          $OUT .= qq! CHECKED> $paybychecked{$_}</TD>!;
+        } else {
+          $OUT .= qq!> $payby{$_}</TD>!;
+        }
+
+      }
+    }
+  %>
+
+</TR></TABLE><font color="#ff0000">*</font> required fields for each billing type
+<BR><BR>First package
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR>
+  <TD COLSPAN=2><SELECT NAME="pkgpart"><OPTION VALUE="">(none)
+
+  <%=
+    foreach my $package ( @{$packages} ) {
+      $OUT .= '<OPTION VALUE="'. $package->{'pkgpart'}. '"';
+      $OUT .= ' SELECTED' if $pkgpart && $package->{'pkgpart'} == $pkgpart;
+      $OUT .= '>'. $package->{'pkg'};
+    }
+  %>
+
+  </SELECT></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Username</TD>
+  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Password</TD>
+  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Re-enter Password</TD>
+  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>"></TD>
+</TR>
+<%=
+  if ( $init_data->{'security_phrase'} ) {
+    $OUT .= <<ENDOUT;
+<TR>
+  <TD ALIGN="right">Security Phrase</TD>
+  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
+  </TD>
+</TR>
+ENDOUT
+  } else {
+    $OUT .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
+  }
+%>
+<%=
+  if ( scalar(@$pops) ) {
+    $OUT .= '<TR><TD ALIGN="right">Access number</TD><TD>'.
+            popselector($popnum). '</TD></TR>';
+  } else {
+    $OUT .= popselector($popnum);
+  }
+%>
+</TABLE>
+<BR><BR><INPUT TYPE="submit" VALUE="Signup">
+</FORM></BODY></HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 78f31aa28..6fa01deaf 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.44 2003-09-29 06:22:18 ivan Exp $
+# $Id: signup.cgi,v 1.45 2003-09-29 06:51:24 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages
@@ -213,6 +213,7 @@ if ( defined $cgi->param('magic') ) {
     $password         = $cgi->param('_password');
     $popnum           = $cgi->param('popnum');
     #$agentnum, #         = $cgi->param('agentnum'),
+    $agentnum         ||= $cgi->param('agentnum');
     $init_popstate    = $cgi->param('init_popstate');
 
     if ( $cgi->param('_password') ne $cgi->param('_password2') ) {
-- 
cgit v1.2.1


From c3e5b694f98b424f9fe68b76450d1464ba7a0fec Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Sep 2003 10:10:47 +0000
Subject: agent browse now links to active/cancelled customers

---
 httemplate/browse/agent.cgi     |  7 ++--
 httemplate/search/cust_main.cgi | 77 ++++++++++++++++++++++++++++-------------
 2 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index ece01724e..44343e15c 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -78,6 +78,9 @@ foreach my $agent ( sort {
 
   my $num_cancelled = $num_total - $num_ncancelled;
 
+  my $cust_main_link = $p. 'search/cust_main.cgi?agentnum_on=1&'.
+                       'agentnum='. $agent->agentnum;
+
 %>
 
       <TR>
@@ -93,9 +96,9 @@ foreach my $agent ( sort {
         <TD><A HREF="<%=$p%>edit/agent_type.cgi?<%= $agent->typenum %>"><%= $agent->agent_type->atype %></A></TD>
         <TD>
           <FONT COLOR="#00CC00"><B><%= $num_ncancelled %></B></FONT>
-            active
+            <A HREF="<%= $cust_main_link %>&showcancelledcustomers=0">active</A>
           <BR><FONT COLOR="#FF0000"><B><%= $num_cancelled %></B></FONT>
-            cancelled
+            <A HREF="<%= $cust_main_link %>&showcancelledcustomers=1&cancelled=1">cancelled</A>
         </TD>
         <TD><%= $agent->freq %></TD>
         <TD><%= $agent->prog %></TD>
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 5b39a09f2..50d367e1e 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -50,6 +50,7 @@ my $total = 0;
 my(@cust_main, $sortby, $orderby);
 if ( $cgi->param('browse')
      || $cgi->param('otaker_on')
+     || $cgi->param('agentnum_on')
 ) {
 
   my %search = ();
@@ -73,6 +74,9 @@ if ( $cgi->param('browse')
     if ( $cgi->param('otaker_on') ) {
       $cgi->param('otaker') =~ /^(\w{1,32})$/ or eidiot "Illegal otaker\n";
       $search{otaker} = $1;
+    } elsif ( $cgi->param('agentnum_on') ) {
+      $cgi->param('agentnum') =~ /^(\d+)$/ or eidiot "Illegal agentnum\n";
+      $search{agentnum} = $1;
     } else {
       die "unknown query...";
     }
@@ -112,6 +116,7 @@ if ( $cgi->param('browse')
                AND (temp1_$$.count > 0
                        OR temp2_$$.count = 0 )
        ";
+
     } else {
        $ncancelled = "
           0 < ( SELECT COUNT(*) FROM cust_pkg
@@ -124,15 +129,32 @@ if ( $cgi->param('browse')
                        WHERE cust_pkg.custnum = cust_main.custnum
                    )
        ";
-    }
-
+     }
+   }
+
+  my $cancelled = '';
+  if ( $cgi->param('cancelled') ) {
+    $cancelled = "
+      0 = ( SELECT COUNT(*) FROM cust_pkg
+                   WHERE cust_pkg.custnum = cust_main.custnum
+                      AND ( cust_pkg.cancel IS NULL
+                            OR cust_pkg.cancel = 0
+                          )
+          )
+        AND 0 < ( SELECT COUNT(*) FROM cust_pkg
+                    WHERE cust_pkg.custnum = cust_main.custnum
+                )
+    ";
   }
 
   #EWWWWWW
   my $qual = join(' AND ',
             map { "$_ = ". dbh->quote($search{$_}) } keys %search );
 
-  if ( $ncancelled ) {
+  if ( $cancelled ) {
+    $qual .= ' AND ' if $qual;
+    $qual .= $cancelled;
+  } elsif ( $ncancelled ) {
     $qual .= ' AND ' if $qual;
     $qual .= $ncancelled;
   }
@@ -150,21 +172,22 @@ if ( $cgi->param('browse')
 
   $total = $sth->fetchrow_arrayref->[0];
 
-  if ( $ncancelled ) {
+  my $rqual = $cancelled || $ncancelled;
+  if ( $rqual ) {
     if ( %search ) {
-      $ncancelled = " AND $ncancelled";
+      $rqual = " AND $rqual";
     } else {
-      $ncancelled = " WHERE $ncancelled";
+      $rqual = " WHERE $rqual";
     }
   }
 
   my @just_cust_main;
   if ( driver_name eq 'mysql' ) {
     @just_cust_main = qsearch('cust_main', \%search, 'cust_main.*',
-                              ",temp1_$$,temp2_$$ $ncancelled $orderby $limit");
+                              ",temp1_$$,temp2_$$ $rqual $orderby $limit");
   } else {
     @just_cust_main = qsearch('cust_main', \%search, '',   
-                              "$ncancelled $orderby $limit" );
+                              "$rqual $orderby $limit" );
   }
   if ( driver_name eq 'mysql' ) {
     my $sql = "DROP TABLE temp1_$$,temp2_$$;";
@@ -213,9 +236,12 @@ if ( $cgi->param('browse')
   }
 
   @cust_main = grep { $_->ncancelled_pkgs || ! $_->all_pkgs } @cust_main
-    if $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
-       || ( $conf->exists('hidecancelledcustomers')
-             && ! $cgi->param('showcancelledcustomers') );
+    if ! $cgi->param('cancelled')
+       && (
+         $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
+         || ( $conf->exists('hidecancelledcustomers')
+               && ! $cgi->param('showcancelledcustomers') )
+       );
 
   my %saw = ();
   @cust_main = grep { !$saw{$_->custnum}++ } @cust_main;
@@ -277,19 +303,22 @@ if ( scalar(@cust_main) == 1 && ! $cgi->param('referral_custnum') ) {
     }
   }
   #end pager
-  
-  if ( $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
-       || ( $conf->exists('hidecancelledcustomers')
-            && ! $cgi->param('showcancelledcustomers')
-          )
-     ) {
-    $cgi->param('showcancelledcustomers', 1);
-    $cgi->param('offset', 0);
-    print qq!( <a href="!. $cgi->self_url. qq!">show cancelled customers</a> )!;
-  } else {
-    $cgi->param('showcancelledcustomers', 0);
-    $cgi->param('offset', 0);
-    print qq!( <a href="!. $cgi->self_url. qq!">hide cancelled customers</a> )!;
+
+  unless ( $cgi->param('cancelled') ) {
+    if ( $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
+         || ( $conf->exists('hidecancelledcustomers')
+              && ! $cgi->param('showcancelledcustomers')
+            )
+       ) {
+      $cgi->param('showcancelledcustomers', 1);
+      $cgi->param('offset', 0);
+      print qq!( <a href="!. $cgi->self_url. qq!">show!;
+    } else {
+      $cgi->param('showcancelledcustomers', 0);
+      $cgi->param('offset', 0);
+      print qq!( <a href="!. $cgi->self_url. qq!">hide!;
+    }
+    print ' cancelled customers</a> )';
   }
   if ( $cgi->param('referral_custnum') ) {
     $cgi->param('referral_custnum') =~ /^(\d+)$/
-- 
cgit v1.2.1


From 5993bc956415cf285d630e0657d4a6e0642ebead Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Sep 2003 07:04:54 +0000
Subject: CGI.pm 2.47 required for ->upload() method

---
 htetc/global.asa                   | 2 +-
 htetc/handler.pl                   | 2 +-
 httemplate/docs/upgrade-1.4.2.html | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htetc/global.asa b/htetc/global.asa
index f00ae57f5..ee5cfcb3c 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -4,7 +4,7 @@ BEGIN { eval "use Devel::AutoProfiler;"; } #only if installed...
 
 use strict;
 use vars qw( $cgi $p );
-use CGI;
+use CGI 2.47;
 #use CGI::Carp qw(fatalsToBrowser);
 use Date::Format;
 use Date::Parse;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 1660cb3fa..b007353e3 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -62,7 +62,7 @@ sub handler
     { package HTML::Mason::Commands;
       use strict;
       use vars qw( $cgi $p );
-      use CGI;
+      use CGI 2.47;
       #use CGI::Carp qw(fatalsToBrowser);
       use Date::Format;
       use Date::Parse;
diff --git a/httemplate/docs/upgrade-1.4.2.html b/httemplate/docs/upgrade-1.4.2.html
index cf3d0de39..c5606b284 100644
--- a/httemplate/docs/upgrade-1.4.2.html
+++ b/httemplate/docs/upgrade-1.4.2.html
@@ -7,6 +7,7 @@
   <li>If migrating from less than 1.4.1, see these <a href="upgrade9.html">instructions</a> first.
   <li>Back  up your data and current Freeside installation.
   <li>Install <a href="http://search.cpan.org/search?dist=Locale-SubCountry">Locale::SubCountry</a>
+  <li>CGI.pm minimum version 2.47 is required.  You will probably need to install a current CGI.pm from CPAN if you are using Perl 5.005 or earlier.
   <li>Run <code>make aspdocs</code> or <code>make masondocs</code>.
   <li>Copy <code>aspdocs/</code> or <code>masondocs/</code> to your web server's document space.
   <li>Run <code>make install-perl-modules</code>.
-- 
cgit v1.2.1


From 56c771abafb2cad3430fee10deacba6e561933de Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Sep 2003 08:23:16 +0000
Subject: calendar popups!

---
 CREDITS                                  |    3 +
 httemplate/edit/REAL_cust_pkg.cgi        |   58 +-
 httemplate/elements/calendar-en.js       |   45 +
 httemplate/elements/calendar-setup.js    |  135 +++
 httemplate/elements/calendar-win2k-2.css |  217 +++++
 httemplate/elements/calendar.js          | 1379 ++++++++++++++++++++++++++++++
 httemplate/elements/calendar_stripped.js |   12 +
 httemplate/images/calendar.png           |  Bin 0 -> 426 bytes
 httemplate/search/cust_pkg.html          |   46 +-
 httemplate/search/report_cc.html         |   44 +-
 httemplate/search/report_credit.html     |   44 +-
 httemplate/search/report_cust_pay.html   |   57 +-
 httemplate/search/report_tax.html        |   46 +-
 13 files changed, 2010 insertions(+), 76 deletions(-)
 create mode 100644 httemplate/elements/calendar-en.js
 create mode 100644 httemplate/elements/calendar-setup.js
 create mode 100644 httemplate/elements/calendar-win2k-2.css
 create mode 100644 httemplate/elements/calendar.js
 create mode 100644 httemplate/elements/calendar_stripped.js
 create mode 100644 httemplate/images/calendar.png

diff --git a/CREDITS b/CREDITS
index 0b4e2d9c9..9bc917acc 100644
--- a/CREDITS
+++ b/CREDITS
@@ -113,5 +113,8 @@ Infostreet export.
 Richard Siddall <richard.siddall@elirion.net> sent in Mason fixes and other
 things I'm probably forgetting.
 
+Contains "JS Calendar" v0.9.3 <http://dynarch.com/mishoo/calendar.epl>
+by Mihai Bazon <mishoo@infoiasi.ro> licensed under the terms of the GNU LGPL.
+
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index e44acba3c..4156b850b 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -1,6 +1,6 @@
 <!-- mason kludge -->
 <%
-# <!-- $Id: REAL_cust_pkg.cgi,v 1.5 2003-04-01 01:22:24 ivan Exp $ -->
+# <!-- $Id: REAL_cust_pkg.cgi,v 1.6 2003-09-30 08:21:56 ivan Exp $ -->
 
 my $error ='';
 my $pkgnum = '';
@@ -30,6 +30,15 @@ print header('Package Edit'); #, menubar(
 #  'Main Menu' => popurl(2)
 #));
 
+%>
+
+    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
+
+<%
+
 #print info
 my($susp,$cancel,$expire)=(
   $cust_pkg->getfield('susp'),
@@ -45,6 +54,9 @@ print '<FORM NAME="formname" ACTION="process/REAL_cust_pkg.cgi" METHOD="POST">',
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT>!
   if $error;
 
+#my $format = "%c %z (%Z)";
+my $format = "%m/%d/%Y %T %z (%Z)";
+
 print ntable("#cccccc",2),
       '<TR><TD ALIGN="right">Package number</TD><TD BGCOLOR="#ffffff">',
       $pkgnum, '</TD></TR>',
@@ -55,23 +67,29 @@ print ntable("#cccccc",2),
       '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
       $otaker,  '</TD></TR>',
       '<TR><TD ALIGN="right">Setup date</TD><TD>'.
-      '<INPUT TYPE="text" NAME="setup" SIZE=32 VALUE="',
-      ( $setup ? time2str("%c %z (%Z)",$setup) : "" ), '"></TD></TR>';
+      '<INPUT TYPE="text" NAME="setup" SIZE=32 ID="setup_text" VALUE="',
+      ( $setup ? time2str($format, $setup) : "" ), '">'.
+      ' <IMG SRC="../images/calendar.png" ID="setup_button" STYLE="cursor: pointer" TITLE="Select date">'.
+      '</TD></TR>';
 
 print '<TR><TD ALIGN="right">Last bill date</TD><TD>',
-      '<INPUT TYPE="text" NAME="last_bill" SIZE=32 VALUE="',
+      '<INPUT TYPE="text" NAME="last_bill" SIZE=32 ID="last_bill_text" VALUE="',
       ( $cust_pkg->last_bill
-        ? time2str("%c %z (%Z)", $cust_pkg->last_bill)
+        ? time2str($format, $cust_pkg->last_bill)
         : ""                                          ),
-      '"></TD></TR>'
+      '">'.
+      ' <IMG SRC="../images/calendar.png" ID="last_bill_button" STYLE="cursor: pointer" TITLE="Select date">'.
+      '</TD></TR>'
   if $cust_pkg->dbdef_table->column('last_bill');
 
 print '<TR><TD ALIGN="right">Next bill date</TD><TD>',
-      '<INPUT TYPE="text" NAME="bill" SIZE=32 VALUE="',
-      ( $bill ? time2str("%c %z (%Z)",$bill) : "" ), '"></TD></TR>';
+      '<INPUT TYPE="text" NAME="bill" SIZE=32 ID="bill_text" VALUE="',
+      ( $bill ? time2str($format, $bill) : "" ), '">'.
+      ' <IMG SRC="../images/calendar.png" ID="bill_button" STYLE="cursor: pointer" TITLE="Select date">'.
+      '</TD></TR>';
 
 print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
-       time2str("%D",$susp), '</TD></TR>'
+       time2str($format, $susp), '</TD></TR>'
   if $susp;
 
 #print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
@@ -79,18 +97,34 @@ print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
 #  if $expire;
 print '<TR><TD ALIGN="right">Expiration date'.
       '</TD><TD>',
-      '<INPUT TYPE="text" NAME="expire" SIZE=32 VALUE="',
-      ( $expire ? time2str("%c %z (%Z)",$expire) : "" ), '">'.
+      '<INPUT TYPE="text" NAME="expire" SIZE=32 ID="expire_text" VALUE="',
+      ( $expire ? time2str($format, $expire) : "" ), '">'.
+      ' <IMG SRC="../images/calendar.png" ID="expire_button" STYLE="cursor: pointer" TITLE="Select date">'.
       '<BR><FONT SIZE=-1>(will <b>cancel</b> this package'.
       ' when the date is reached)</FONT>'.
       '</TD></TR>';
 
 print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
-       time2str("%D",$cancel), '</TD></TR>'
+       time2str($format, $cancel), '</TD></TR>'
   if $cancel;
 
 %>
 </TABLE>
+<SCRIPT TYPE="text/javascript">
+<%
+  my @cal = qw( setup bill expire );
+  push @cal, 'last_bill'
+    if $cust_pkg->dbdef_table->column('last_bill');
+  foreach my $cal (@cal) {
+%>
+  Calendar.setup({
+    inputField: "<%= $cal %>_text",
+    ifFormat:   "mm/dd/y",
+    button:     "<%= $cal %>_button",
+    align:      "BR"
+  });
+<% } %>
+</SCRIPT>
 <BR><INPUT TYPE="submit" VALUE="Apply Changes">
 </FORM>
 </BODY>
diff --git a/httemplate/elements/calendar-en.js b/httemplate/elements/calendar-en.js
new file mode 100644
index 000000000..bc075bb74
--- /dev/null
+++ b/httemplate/elements/calendar-en.js
@@ -0,0 +1,45 @@
+// ** I18N
+Calendar._DN = new Array
+("Sunday",
+ "Monday",
+ "Tuesday",
+ "Wednesday",
+ "Thursday",
+ "Friday",
+ "Saturday",
+ "Sunday");
+Calendar._MN = new Array
+("January",
+ "February",
+ "March",
+ "April",
+ "May",
+ "June",
+ "July",
+ "August",
+ "September",
+ "October",
+ "November",
+ "December");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["TOGGLE"] = "Toggle first day of week";
+Calendar._TT["PREV_YEAR"] = "Prev. year (hold for menu)";
+Calendar._TT["PREV_MONTH"] = "Prev. month (hold for menu)";
+Calendar._TT["GO_TODAY"] = "Go Today";
+Calendar._TT["NEXT_MONTH"] = "Next month (hold for menu)";
+Calendar._TT["NEXT_YEAR"] = "Next year (hold for menu)";
+Calendar._TT["SEL_DATE"] = "Select date";
+Calendar._TT["DRAG_TO_MOVE"] = "Drag to move";
+Calendar._TT["PART_TODAY"] = " (today)";
+Calendar._TT["MON_FIRST"] = "Display Monday first";
+Calendar._TT["SUN_FIRST"] = "Display Sunday first";
+Calendar._TT["CLOSE"] = "Close";
+Calendar._TT["TODAY"] = "Today";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "y-mm-dd";
+Calendar._TT["TT_DATE_FORMAT"] = "D, M d";
+
+Calendar._TT["WK"] = "wk";
diff --git a/httemplate/elements/calendar-setup.js b/httemplate/elements/calendar-setup.js
new file mode 100644
index 000000000..de6ff591f
--- /dev/null
+++ b/httemplate/elements/calendar-setup.js
@@ -0,0 +1,135 @@
+/*  Copyright Mihai Bazon, 2002, 2003  |  http://students.infoiasi.ro/~mishoo
+ * ---------------------------------------------------------------------------
+ *
+ * The DHTML Calendar
+ *
+ * Details and latest version at:
+ * http://students.infoiasi.ro/~mishoo/site/calendar.epl
+ *
+ * Feel free to use this script under the terms of the GNU Lesser General
+ * Public License, as long as you do not remove or alter this notice.
+ *
+ * This file defines helper functions for setting up the calendar.  They are
+ * intended to help non-programmers get a working calendar on their site
+ * quickly.
+ */
+
+// $Id: calendar-setup.js,v 1.2 2003-09-30 08:23:15 ivan Exp $
+
+/**
+ *  This function "patches" an input field (or other element) to use a calendar
+ *  widget for date selection.
+ *
+ *  The "params" is a single object that can have the following properties:
+ *
+ *    prop. name   | description
+ *  -------------------------------------------------------------------------------------------------
+ *   inputField    | the ID of an input field to store the date
+ *   displayArea   | the ID of a DIV or other element to show the date
+ *   button        | ID of a button or other element that will trigger the calendar
+ *   eventName     | event that will trigger the calendar, without the "on" prefix (default: "click")
+ *   ifFormat      | date format that will be stored in the input field
+ *   daFormat      | the date format that will be used to display the date in displayArea
+ *   singleClick   | (true/false) wether the calendar is in single click mode or not (default: true)
+ *   mondayFirst   | (true/false) if true Monday is the first day of week, Sunday otherwise (default: false)
+ *   align         | alignment (default: "Bl"); if you don't know what's this see the calendar documentation
+ *   range         | array with 2 elements.  Default: [1900, 2999] -- the range of years available
+ *   weekNumbers   | (true/false) if it's true (default) the calendar will display week numbers
+ *   flat          | null or element ID; if not null the calendar will be a flat calendar having the parent with the given ID
+ *   flatCallback  | function that receives a JS Date object and returns an URL to point the browser to (for flat calendar)
+ *   disableFunc   | function that receives a JS Date object and should return true if that date has to be disabled in the calendar
+ *
+ *  None of them is required, they all have default values.  However, if you
+ *  pass none of "inputField", "displayArea" or "button" you'll get a warning
+ *  saying "nothing to setup".
+ */
+Calendar.setup = function (params) {
+	function param_default(pname, def) { if (typeof params[pname] == "undefined") { params[pname] = def; } };
+
+	param_default("inputField",    null);
+	param_default("displayArea",   null);
+	param_default("button",        null);
+	param_default("eventName",     "click");
+	param_default("ifFormat",      "y/mm/dd");
+	param_default("daFormat",      "y/mm/dd");
+	param_default("singleClick",   true);
+	param_default("disableFunc",   null);
+	param_default("mondayFirst",   false);
+	param_default("align",         "Bl");
+	param_default("range",         [1900, 2999]);
+	param_default("weekNumbers",   true);
+	param_default("flat",          null);
+	param_default("flatCallback",  null);
+
+	var tmp = ["inputField", "displayArea", "button"];
+	for (var i in tmp) {
+		if (typeof params[tmp[i]] == "string") {
+			params[tmp[i]] = document.getElementById(params[tmp[i]]);
+		}
+	}
+	if (!(params.flat || params.inputField || params.displayArea || params.button)) {
+		alert("Calendar.setup:\n  Nothing to setup (no fields found).  Please check your code");
+		return false;
+	}
+
+	function onSelect(cal) {
+		if (cal.params.flat) {
+			if (typeof cal.params.flatCallback == "function") {
+				cal.params.flatCallback(cal);
+			} else {
+				alert("No flatCallback given -- doing nothing.");
+			}
+			return false;
+		}
+		if (cal.params.inputField) {
+			cal.params.inputField.value = cal.date.print(cal.params.ifFormat);
+		}
+		if (cal.params.displayArea) {
+			cal.params.displayArea.innerHTML = cal.date.print(cal.params.daFormat);
+		}
+		if (cal.params.singleClick && cal.dateClicked) {
+			cal.callCloseHandler();
+		}
+	};
+
+	if (params.flat != null) {
+		params.flat = document.getElementById(params.flat);
+		if (!params.flat) {
+			alert("Calendar.setup:\n  Flat specified but can't find parent.");
+			return false;
+		}
+		var cal = new Calendar(params.mondayFirst, null, onSelect);
+		cal.params = params;
+		cal.weekNumbers = params.weekNumbers;
+		cal.setRange(params.range[0], params.range[1]);
+		cal.setDisabledHandler(params.disableFunc);
+		cal.create(params.flat);
+		cal.show();
+		return false;
+	}
+
+	var triggerEl = params.button || params.displayArea || params.inputField;
+	triggerEl["on" + params.eventName] = function() {
+		var dateEl = params.inputField || params.displayArea;
+		var dateFmt = params.inputField ? params.ifFormat : params.daFormat;
+		var mustCreate = false;
+		if (!window.calendar) {
+			window.calendar = new Calendar(params.mondayFirst, null, onSelect, function(cal) { cal.hide(); });
+			window.calendar.weekNumbers = params.weekNumbers;
+			mustCreate = true;
+		} else {
+			window.calendar.hide();
+		}
+		window.calendar.setRange(params.range[0], params.range[1]);
+		window.calendar.params = params;
+		window.calendar.setDisabledHandler(params.disableFunc);
+		window.calendar.setDateFormat(dateFmt);
+		if (mustCreate) {
+			window.calendar.create();
+		}
+		window.calendar.parseDate(dateEl.value || dateEl.innerHTML);
+		window.calendar.refresh();
+		window.calendar.showAtElement(params.displayArea || params.inputField, params.align);
+		return false;
+	};
+};
diff --git a/httemplate/elements/calendar-win2k-2.css b/httemplate/elements/calendar-win2k-2.css
new file mode 100644
index 000000000..398e78efe
--- /dev/null
+++ b/httemplate/elements/calendar-win2k-2.css
@@ -0,0 +1,217 @@
+/* The main calendar widget.  DIV containing a table. */
+
+.calendar {
+  position: relative;
+  display: none;
+  border-top: 2px solid #fff;
+  border-right: 2px solid #000;
+  border-bottom: 2px solid #000;
+  border-left: 2px solid #fff;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #d4c8d0;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+.calendar table {
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #d4c8d0;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;
+  padding: 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;
+  padding: 1px;
+  border: 1px solid #000;
+  background: #847880;
+  color: #fff;
+  text-align: center;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #000;
+  padding: 2px;
+  text-align: center;
+  background: #f4e8f0;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #f00;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  border-top: 2px solid #fff;
+  border-right: 2px solid #000;
+  border-bottom: 2px solid #000;
+  border-left: 2px solid #fff;
+  padding: 0px;
+  background: #e4d8e0;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  background: #c4b8c0;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #000;
+  background: #f4e8f0;
+}
+
+.calendar tbody .rowhilite td {
+  background: #e4d8e0;
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #d4c8d0;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  padding: 1px 3px 1px 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  padding: 2px 2px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+.calendar tbody td.selected { /* Cell showing selected date */
+  font-weight: bold;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  padding: 2px 2px 0px 2px;
+  background: #e4d8e0;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #f00;
+}
+
+.calendar tbody td.today { /* Cell showing today date */
+  font-weight: bold;
+  color: #00f;
+}
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  background: #f4e8f0;
+  padding: 1px;
+  border: 1px solid #000;
+  background: #847880;
+  color: #fff;
+  text-align: center;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  padding: 1px;
+  background: #e4d8e0;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.combo {
+  position: absolute;
+  display: none;
+  width: 4em;
+  top: 0px;
+  left: 0px;
+  cursor: default;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  background: #e4d8e0;
+  font-size: smaller;
+  padding: 1px;
+}
+
+.combo .label {
+  text-align: center;
+  padding: 1px;
+}
+
+.combo .active {
+  background: #d4c8d0;
+  padding: 0px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+.combo .hilite {
+  background: #408;
+  color: #fea;
+}
diff --git a/httemplate/elements/calendar.js b/httemplate/elements/calendar.js
new file mode 100644
index 000000000..772931b30
--- /dev/null
+++ b/httemplate/elements/calendar.js
@@ -0,0 +1,1379 @@
+/*  Copyright Mihai Bazon, 2002, 2003  |  http://students.infoiasi.ro/~mishoo
+ * ---------------------------------------------------------------------------
+ *
+ * The DHTML Calendar, version 0.9.3 "It's still alive & keeps rocking"
+ *
+ * Details and latest version at:
+ * http://students.infoiasi.ro/~mishoo/site/calendar.epl
+ *
+ * Feel free to use this script under the terms of the GNU Lesser General
+ * Public License, as long as you do not remove or alter this notice.
+ */
+
+// $Id: calendar.js,v 1.2 2003-09-30 08:23:15 ivan Exp $
+
+/** The Calendar object constructor. */
+Calendar = function (mondayFirst, dateStr, onSelected, onClose) {
+	// member variables
+	this.activeDiv = null;
+	this.currentDateEl = null;
+	this.checkDisabled = null;
+	this.timeout = null;
+	this.onSelected = onSelected || null;
+	this.onClose = onClose || null;
+	this.dragging = false;
+	this.hidden = false;
+	this.minYear = 1970;
+	this.maxYear = 2050;
+	this.dateFormat = Calendar._TT["DEF_DATE_FORMAT"];
+	this.ttDateFormat = Calendar._TT["TT_DATE_FORMAT"];
+	this.isPopup = true;
+	this.weekNumbers = true;
+	this.mondayFirst = mondayFirst;
+	this.dateStr = dateStr;
+	this.ar_days = null;
+	// HTML elements
+	this.table = null;
+	this.element = null;
+	this.tbody = null;
+	this.firstdayname = null;
+	// Combo boxes
+	this.monthsCombo = null;
+	this.yearsCombo = null;
+	this.hilitedMonth = null;
+	this.activeMonth = null;
+	this.hilitedYear = null;
+	this.activeYear = null;
+	// Information
+	this.dateClicked = false;
+
+	// one-time initializations
+	if (!Calendar._DN3) {
+		// table of short day names
+		var ar = new Array();
+		for (var i = 8; i > 0;) {
+			ar[--i] = Calendar._DN[i].substr(0, 3);
+		}
+		Calendar._DN3 = ar;
+		// table of short month names
+		ar = new Array();
+		for (var i = 12; i > 0;) {
+			ar[--i] = Calendar._MN[i].substr(0, 3);
+		}
+		Calendar._MN3 = ar;
+	}
+};
+
+// ** constants
+
+/// "static", needed for event handlers.
+Calendar._C = null;
+
+/// detect a special case of "web browser"
+Calendar.is_ie = ( /msie/i.test(navigator.userAgent) &&
+		   !/opera/i.test(navigator.userAgent) );
+
+// short day names array (initialized at first constructor call)
+Calendar._DN3 = null;
+
+// short month names array (initialized at first constructor call)
+Calendar._MN3 = null;
+
+// BEGIN: UTILITY FUNCTIONS; beware that these might be moved into a separate
+//        library, at some point.
+
+Calendar.getAbsolutePos = function(el) {
+	var r = { x: el.offsetLeft, y: el.offsetTop };
+	if (el.offsetParent) {
+		var tmp = Calendar.getAbsolutePos(el.offsetParent);
+		r.x += tmp.x;
+		r.y += tmp.y;
+	}
+	return r;
+};
+
+Calendar.isRelated = function (el, evt) {
+	var related = evt.relatedTarget;
+	if (!related) {
+		var type = evt.type;
+		if (type == "mouseover") {
+			related = evt.fromElement;
+		} else if (type == "mouseout") {
+			related = evt.toElement;
+		}
+	}
+	while (related) {
+		if (related == el) {
+			return true;
+		}
+		related = related.parentNode;
+	}
+	return false;
+};
+
+Calendar.removeClass = function(el, className) {
+	if (!(el && el.className)) {
+		return;
+	}
+	var cls = el.className.split(" ");
+	var ar = new Array();
+	for (var i = cls.length; i > 0;) {
+		if (cls[--i] != className) {
+			ar[ar.length] = cls[i];
+		}
+	}
+	el.className = ar.join(" ");
+};
+
+Calendar.addClass = function(el, className) {
+	Calendar.removeClass(el, className);
+	el.className += " " + className;
+};
+
+Calendar.getElement = function(ev) {
+	if (Calendar.is_ie) {
+		return window.event.srcElement;
+	} else {
+		return ev.currentTarget;
+	}
+};
+
+Calendar.getTargetElement = function(ev) {
+	if (Calendar.is_ie) {
+		return window.event.srcElement;
+	} else {
+		return ev.target;
+	}
+};
+
+Calendar.stopEvent = function(ev) {
+	if (Calendar.is_ie) {
+		window.event.cancelBubble = true;
+		window.event.returnValue = false;
+	} else {
+		ev.preventDefault();
+		ev.stopPropagation();
+	}
+	return false;
+};
+
+Calendar.addEvent = function(el, evname, func) {
+	if (el.attachEvent) { // IE
+		el.attachEvent("on" + evname, func);
+	} else if (el.addEventListener) { // Gecko / W3C
+		el.addEventListener(evname, func, true);
+	} else { // Opera (or old browsers)
+		el["on" + evname] = func;
+	}
+};
+
+Calendar.removeEvent = function(el, evname, func) {
+	if (el.detachEvent) { // IE
+		el.detachEvent("on" + evname, func);
+	} else if (el.removeEventListener) { // Gecko / W3C
+		el.removeEventListener(evname, func, true);
+	} else { // Opera (or old browsers)
+		el["on" + evname] = null;
+	}
+};
+
+Calendar.createElement = function(type, parent) {
+	var el = null;
+	if (document.createElementNS) {
+		// use the XHTML namespace; IE won't normally get here unless
+		// _they_ "fix" the DOM2 implementation.
+		el = document.createElementNS("http://www.w3.org/1999/xhtml", type);
+	} else {
+		el = document.createElement(type);
+	}
+	if (typeof parent != "undefined") {
+		parent.appendChild(el);
+	}
+	return el;
+};
+
+// END: UTILITY FUNCTIONS
+
+// BEGIN: CALENDAR STATIC FUNCTIONS
+
+/** Internal -- adds a set of events to make some element behave like a button. */
+Calendar._add_evs = function(el) {
+	with (Calendar) {
+		addEvent(el, "mouseover", dayMouseOver);
+		addEvent(el, "mousedown", dayMouseDown);
+		addEvent(el, "mouseout", dayMouseOut);
+		if (is_ie) {
+			addEvent(el, "dblclick", dayMouseDblClick);
+			el.setAttribute("unselectable", true);
+		}
+	}
+};
+
+Calendar.findMonth = function(el) {
+	if (typeof el.month != "undefined") {
+		return el;
+	} else if (typeof el.parentNode.month != "undefined") {
+		return el.parentNode;
+	}
+	return null;
+};
+
+Calendar.findYear = function(el) {
+	if (typeof el.year != "undefined") {
+		return el;
+	} else if (typeof el.parentNode.year != "undefined") {
+		return el.parentNode;
+	}
+	return null;
+};
+
+Calendar.showMonthsCombo = function () {
+	var cal = Calendar._C;
+	if (!cal) {
+		return false;
+	}
+	var cal = cal;
+	var cd = cal.activeDiv;
+	var mc = cal.monthsCombo;
+	if (cal.hilitedMonth) {
+		Calendar.removeClass(cal.hilitedMonth, "hilite");
+	}
+	if (cal.activeMonth) {
+		Calendar.removeClass(cal.activeMonth, "active");
+	}
+	var mon = cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];
+	Calendar.addClass(mon, "active");
+	cal.activeMonth = mon;
+	mc.style.left = cd.offsetLeft + "px";
+	mc.style.top = (cd.offsetTop + cd.offsetHeight) + "px";
+	mc.style.display = "block";
+};
+
+Calendar.showYearsCombo = function (fwd) {
+	var cal = Calendar._C;
+	if (!cal) {
+		return false;
+	}
+	var cal = cal;
+	var cd = cal.activeDiv;
+	var yc = cal.yearsCombo;
+	if (cal.hilitedYear) {
+		Calendar.removeClass(cal.hilitedYear, "hilite");
+	}
+	if (cal.activeYear) {
+		Calendar.removeClass(cal.activeYear, "active");
+	}
+	cal.activeYear = null;
+	var Y = cal.date.getFullYear() + (fwd ? 1 : -1);
+	var yr = yc.firstChild;
+	var show = false;
+	for (var i = 12; i > 0; --i) {
+		if (Y >= cal.minYear && Y <= cal.maxYear) {
+			yr.firstChild.data = Y;
+			yr.year = Y;
+			yr.style.display = "block";
+			show = true;
+		} else {
+			yr.style.display = "none";
+		}
+		yr = yr.nextSibling;
+		Y += fwd ? 2 : -2;
+	}
+	if (show) {
+		yc.style.left = cd.offsetLeft + "px";
+		yc.style.top = (cd.offsetTop + cd.offsetHeight) + "px";
+		yc.style.display = "block";
+	}
+};
+
+// event handlers
+
+Calendar.tableMouseUp = function(ev) {
+	var cal = Calendar._C;
+	if (!cal) {
+		return false;
+	}
+	if (cal.timeout) {
+		clearTimeout(cal.timeout);
+	}
+	var el = cal.activeDiv;
+	if (!el) {
+		return false;
+	}
+	var target = Calendar.getTargetElement(ev);
+	Calendar.removeClass(el, "active");
+	if (target == el || target.parentNode == el) {
+		Calendar.cellClick(el);
+	}
+	var mon = Calendar.findMonth(target);
+	var date = null;
+	if (mon) {
+		date = new Date(cal.date);
+		if (mon.month != date.getMonth()) {
+			date.setMonth(mon.month);
+			cal.setDate(date);
+			cal.dateClicked = false;
+			cal.callHandler();
+		}
+	} else {
+		var year = Calendar.findYear(target);
+		if (year) {
+			date = new Date(cal.date);
+			if (year.year != date.getFullYear()) {
+				date.setFullYear(year.year);
+				cal.setDate(date);
+				cal.dateClicked = false;
+				cal.callHandler();
+			}
+		}
+	}
+	with (Calendar) {
+		removeEvent(document, "mouseup", tableMouseUp);
+		removeEvent(document, "mouseover", tableMouseOver);
+		removeEvent(document, "mousemove", tableMouseOver);
+		cal._hideCombos();
+		_C = null;
+		return stopEvent(ev);
+	}
+};
+
+Calendar.tableMouseOver = function (ev) {
+	var cal = Calendar._C;
+	if (!cal) {
+		return;
+	}
+	var el = cal.activeDiv;
+	var target = Calendar.getTargetElement(ev);
+	if (target == el || target.parentNode == el) {
+		Calendar.addClass(el, "hilite active");
+		Calendar.addClass(el.parentNode, "rowhilite");
+	} else {
+		Calendar.removeClass(el, "active");
+		Calendar.removeClass(el, "hilite");
+		Calendar.removeClass(el.parentNode, "rowhilite");
+	}
+	var mon = Calendar.findMonth(target);
+	if (mon) {
+		if (mon.month != cal.date.getMonth()) {
+			if (cal.hilitedMonth) {
+				Calendar.removeClass(cal.hilitedMonth, "hilite");
+			}
+			Calendar.addClass(mon, "hilite");
+			cal.hilitedMonth = mon;
+		} else if (cal.hilitedMonth) {
+			Calendar.removeClass(cal.hilitedMonth, "hilite");
+		}
+	} else {
+		var year = Calendar.findYear(target);
+		if (year) {
+			if (year.year != cal.date.getFullYear()) {
+				if (cal.hilitedYear) {
+					Calendar.removeClass(cal.hilitedYear, "hilite");
+				}
+				Calendar.addClass(year, "hilite");
+				cal.hilitedYear = year;
+			} else if (cal.hilitedYear) {
+				Calendar.removeClass(cal.hilitedYear, "hilite");
+			}
+		}
+	}
+	return Calendar.stopEvent(ev);
+};
+
+Calendar.tableMouseDown = function (ev) {
+	if (Calendar.getTargetElement(ev) == Calendar.getElement(ev)) {
+		return Calendar.stopEvent(ev);
+	}
+};
+
+Calendar.calDragIt = function (ev) {
+	var cal = Calendar._C;
+	if (!(cal && cal.dragging)) {
+		return false;
+	}
+	var posX;
+	var posY;
+	if (Calendar.is_ie) {
+		posY = window.event.clientY + document.body.scrollTop;
+		posX = window.event.clientX + document.body.scrollLeft;
+	} else {
+		posX = ev.pageX;
+		posY = ev.pageY;
+	}
+	cal.hideShowCovered();
+	var st = cal.element.style;
+	st.left = (posX - cal.xOffs) + "px";
+	st.top = (posY - cal.yOffs) + "px";
+	return Calendar.stopEvent(ev);
+};
+
+Calendar.calDragEnd = function (ev) {
+	var cal = Calendar._C;
+	if (!cal) {
+		return false;
+	}
+	cal.dragging = false;
+	with (Calendar) {
+		removeEvent(document, "mousemove", calDragIt);
+		removeEvent(document, "mouseover", stopEvent);
+		removeEvent(document, "mouseup", calDragEnd);
+		tableMouseUp(ev);
+	}
+	cal.hideShowCovered();
+};
+
+Calendar.dayMouseDown = function(ev) {
+	var el = Calendar.getElement(ev);
+	if (el.disabled) {
+		return false;
+	}
+	var cal = el.calendar;
+	cal.activeDiv = el;
+	Calendar._C = cal;
+	if (el.navtype != 300) with (Calendar) {
+		addClass(el, "hilite active");
+		addEvent(document, "mouseover", tableMouseOver);
+		addEvent(document, "mousemove", tableMouseOver);
+		addEvent(document, "mouseup", tableMouseUp);
+	} else if (cal.isPopup) {
+		cal._dragStart(ev);
+	}
+	if (el.navtype == -1 || el.navtype == 1) {
+		cal.timeout = setTimeout("Calendar.showMonthsCombo()", 250);
+	} else if (el.navtype == -2 || el.navtype == 2) {
+		cal.timeout = setTimeout((el.navtype > 0) ? "Calendar.showYearsCombo(true)" : "Calendar.showYearsCombo(false)", 250);
+	} else {
+		cal.timeout = null;
+	}
+	return Calendar.stopEvent(ev);
+};
+
+Calendar.dayMouseDblClick = function(ev) {
+	Calendar.cellClick(Calendar.getElement(ev));
+	if (Calendar.is_ie) {
+		document.selection.empty();
+	}
+};
+
+Calendar.dayMouseOver = function(ev) {
+	var el = Calendar.getElement(ev);
+	if (Calendar.isRelated(el, ev) || Calendar._C || el.disabled) {
+		return false;
+	}
+	if (el.ttip) {
+		if (el.ttip.substr(0, 1) == "_") {
+			var date = null;
+			with (el.calendar.date) {
+				date = new Date(getFullYear(), getMonth(), el.caldate);
+			}
+			el.ttip = date.print(el.calendar.ttDateFormat) + el.ttip.substr(1);
+		}
+		el.calendar.tooltips.firstChild.data = el.ttip;
+	}
+	if (el.navtype != 300) {
+		Calendar.addClass(el, "hilite");
+		if (el.caldate) {
+			Calendar.addClass(el.parentNode, "rowhilite");
+		}
+	}
+	return Calendar.stopEvent(ev);
+};
+
+Calendar.dayMouseOut = function(ev) {
+	with (Calendar) {
+		var el = getElement(ev);
+		if (isRelated(el, ev) || _C || el.disabled) {
+			return false;
+		}
+		removeClass(el, "hilite");
+		if (el.caldate) {
+			removeClass(el.parentNode, "rowhilite");
+		}
+		el.calendar.tooltips.firstChild.data = _TT["SEL_DATE"];
+		return stopEvent(ev);
+	}
+};
+
+/**
+ *  A generic "click" handler :) handles all types of buttons defined in this
+ *  calendar.
+ */
+Calendar.cellClick = function(el) {
+	var cal = el.calendar;
+	var closing = false;
+	var newdate = false;
+	var date = null;
+	if (typeof el.navtype == "undefined") {
+		Calendar.removeClass(cal.currentDateEl, "selected");
+		Calendar.addClass(el, "selected");
+		closing = (cal.currentDateEl == el);
+		if (!closing) {
+			cal.currentDateEl = el;
+		}
+		cal.date.setDate(el.caldate);
+		date = cal.date;
+		newdate = true;
+		// a date was clicked
+		cal.dateClicked = true;
+	} else {
+		if (el.navtype == 200) {
+			Calendar.removeClass(el, "hilite");
+			cal.callCloseHandler();
+			return;
+		}
+		date = (el.navtype == 0) ? new Date() : new Date(cal.date);
+		// unless "today" was clicked, we assume no date was clicked so
+		// the selected handler will know not to close the calenar when
+		// in single-click mode.
+		cal.dateClicked = (el.navtype == 0);
+		var year = date.getFullYear();
+		var mon = date.getMonth();
+		function setMonth(m) {
+			var day = date.getDate();
+			var max = date.getMonthDays(m);
+			if (day > max) {
+				date.setDate(max);
+			}
+			date.setMonth(m);
+		};
+		switch (el.navtype) {
+		    case -2:
+			if (year > cal.minYear) {
+				date.setFullYear(year - 1);
+			}
+			break;
+		    case -1:
+			if (mon > 0) {
+				setMonth(mon - 1);
+			} else if (year-- > cal.minYear) {
+				date.setFullYear(year);
+				setMonth(11);
+			}
+			break;
+		    case 1:
+			if (mon < 11) {
+				setMonth(mon + 1);
+			} else if (year < cal.maxYear) {
+				date.setFullYear(year + 1);
+				setMonth(0);
+			}
+			break;
+		    case 2:
+			if (year < cal.maxYear) {
+				date.setFullYear(year + 1);
+			}
+			break;
+		    case 100:
+			cal.setMondayFirst(!cal.mondayFirst);
+			return;
+		    case 0:
+			// TODAY will bring us here
+			if ((typeof cal.checkDisabled == "function") && cal.checkDisabled(date)) {
+				// remember, "date" was previously set to new
+				// Date() if TODAY was clicked; thus, it
+				// contains today date.
+				return false;
+			}
+			break;
+		}
+		if (!date.equalsTo(cal.date)) {
+			cal.setDate(date);
+			newdate = true;
+		}
+	}
+	if (newdate) {
+		cal.callHandler();
+	}
+	if (closing) {
+		Calendar.removeClass(el, "hilite");
+		cal.callCloseHandler();
+	}
+};
+
+// END: CALENDAR STATIC FUNCTIONS
+
+// BEGIN: CALENDAR OBJECT FUNCTIONS
+
+/**
+ *  This function creates the calendar inside the given parent.  If _par is
+ *  null than it creates a popup calendar inside the BODY element.  If _par is
+ *  an element, be it BODY, then it creates a non-popup calendar (still
+ *  hidden).  Some properties need to be set before calling this function.
+ */
+Calendar.prototype.create = function (_par) {
+	var parent = null;
+	if (! _par) {
+		// default parent is the document body, in which case we create
+		// a popup calendar.
+		parent = document.getElementsByTagName("body")[0];
+		this.isPopup = true;
+	} else {
+		parent = _par;
+		this.isPopup = false;
+	}
+	this.date = this.dateStr ? new Date(this.dateStr) : new Date();
+
+	var table = Calendar.createElement("table");
+	this.table = table;
+	table.cellSpacing = 0;
+	table.cellPadding = 0;
+	table.calendar = this;
+	Calendar.addEvent(table, "mousedown", Calendar.tableMouseDown);
+
+	var div = Calendar.createElement("div");
+	this.element = div;
+	div.className = "calendar";
+	if (this.isPopup) {
+		div.style.position = "absolute";
+		div.style.display = "none";
+	}
+	div.appendChild(table);
+
+	var thead = Calendar.createElement("thead", table);
+	var cell = null;
+	var row = null;
+
+	var cal = this;
+	var hh = function (text, cs, navtype) {
+		cell = Calendar.createElement("td", row);
+		cell.colSpan = cs;
+		cell.className = "button";
+		Calendar._add_evs(cell);
+		cell.calendar = cal;
+		cell.navtype = navtype;
+		if (text.substr(0, 1) != "&") {
+			cell.appendChild(document.createTextNode(text));
+		}
+		else {
+			// FIXME: dirty hack for entities
+			cell.innerHTML = text;
+		}
+		return cell;
+	};
+
+	row = Calendar.createElement("tr", thead);
+	var title_length = 6;
+	(this.isPopup) && --title_length;
+	(this.weekNumbers) && ++title_length;
+
+	hh("-", 1, 100).ttip = Calendar._TT["TOGGLE"];
+	this.title = hh("", title_length, 300);
+	this.title.className = "title";
+	if (this.isPopup) {
+		this.title.ttip = Calendar._TT["DRAG_TO_MOVE"];
+		this.title.style.cursor = "move";
+		hh("&#x00d7;", 1, 200).ttip = Calendar._TT["CLOSE"];
+	}
+
+	row = Calendar.createElement("tr", thead);
+	row.className = "headrow";
+
+	this._nav_py = hh("&#x00ab;", 1, -2);
+	this._nav_py.ttip = Calendar._TT["PREV_YEAR"];
+
+	this._nav_pm = hh("&#x2039;", 1, -1);
+	this._nav_pm.ttip = Calendar._TT["PREV_MONTH"];
+
+	this._nav_now = hh(Calendar._TT["TODAY"], this.weekNumbers ? 4 : 3, 0);
+	this._nav_now.ttip = Calendar._TT["GO_TODAY"];
+
+	this._nav_nm = hh("&#x203a;", 1, 1);
+	this._nav_nm.ttip = Calendar._TT["NEXT_MONTH"];
+
+	this._nav_ny = hh("&#x00bb;", 1, 2);
+	this._nav_ny.ttip = Calendar._TT["NEXT_YEAR"];
+
+	// day names
+	row = Calendar.createElement("tr", thead);
+	row.className = "daynames";
+	if (this.weekNumbers) {
+		cell = Calendar.createElement("td", row);
+		cell.className = "name wn";
+		cell.appendChild(document.createTextNode(Calendar._TT["WK"]));
+	}
+	for (var i = 7; i > 0; --i) {
+		cell = Calendar.createElement("td", row);
+		cell.appendChild(document.createTextNode(""));
+		if (!i) {
+			cell.navtype = 100;
+			cell.calendar = this;
+			Calendar._add_evs(cell);
+		}
+	}
+	this.firstdayname = (this.weekNumbers) ? row.firstChild.nextSibling : row.firstChild;
+	this._displayWeekdays();
+
+	var tbody = Calendar.createElement("tbody", table);
+	this.tbody = tbody;
+
+	for (i = 6; i > 0; --i) {
+		row = Calendar.createElement("tr", tbody);
+		if (this.weekNumbers) {
+			cell = Calendar.createElement("td", row);
+			cell.appendChild(document.createTextNode(""));
+		}
+		for (var j = 7; j > 0; --j) {
+			cell = Calendar.createElement("td", row);
+			cell.appendChild(document.createTextNode(""));
+			cell.calendar = this;
+			Calendar._add_evs(cell);
+		}
+	}
+
+	var tfoot = Calendar.createElement("tfoot", table);
+
+	row = Calendar.createElement("tr", tfoot);
+	row.className = "footrow";
+
+	cell = hh(Calendar._TT["SEL_DATE"], this.weekNumbers ? 8 : 7, 300);
+	cell.className = "ttip";
+	if (this.isPopup) {
+		cell.ttip = Calendar._TT["DRAG_TO_MOVE"];
+		cell.style.cursor = "move";
+	}
+	this.tooltips = cell;
+
+	div = Calendar.createElement("div", this.element);
+	this.monthsCombo = div;
+	div.className = "combo";
+	for (i = 0; i < Calendar._MN.length; ++i) {
+		var mn = Calendar.createElement("div");
+		mn.className = "label";
+		mn.month = i;
+		mn.appendChild(document.createTextNode(Calendar._MN3[i]));
+		div.appendChild(mn);
+	}
+
+	div = Calendar.createElement("div", this.element);
+	this.yearsCombo = div;
+	div.className = "combo";
+	for (i = 12; i > 0; --i) {
+		var yr = Calendar.createElement("div");
+		yr.className = "label";
+		yr.appendChild(document.createTextNode(""));
+		div.appendChild(yr);
+	}
+
+	this._init(this.mondayFirst, this.date);
+	parent.appendChild(this.element);
+};
+
+/** keyboard navigation, only for popup calendars */
+Calendar._keyEvent = function(ev) {
+	if (!window.calendar) {
+		return false;
+	}
+	(Calendar.is_ie) && (ev = window.event);
+	var cal = window.calendar;
+	var act = (Calendar.is_ie || ev.type == "keypress");
+	if (ev.ctrlKey) {
+		switch (ev.keyCode) {
+		    case 37: // KEY left
+			act && Calendar.cellClick(cal._nav_pm);
+			break;
+		    case 38: // KEY up
+			act && Calendar.cellClick(cal._nav_py);
+			break;
+		    case 39: // KEY right
+			act && Calendar.cellClick(cal._nav_nm);
+			break;
+		    case 40: // KEY down
+			act && Calendar.cellClick(cal._nav_ny);
+			break;
+		    default:
+			return false;
+		}
+	} else switch (ev.keyCode) {
+	    case 32: // KEY space (now)
+		Calendar.cellClick(cal._nav_now);
+		break;
+	    case 27: // KEY esc
+		act && cal.hide();
+		break;
+	    case 37: // KEY left
+	    case 38: // KEY up
+	    case 39: // KEY right
+	    case 40: // KEY down
+		if (act) {
+			var date = cal.date.getDate() - 1;
+			var el = cal.currentDateEl;
+			var ne = null;
+			var prev = (ev.keyCode == 37) || (ev.keyCode == 38);
+			switch (ev.keyCode) {
+			    case 37: // KEY left
+				(--date >= 0) && (ne = cal.ar_days[date]);
+				break;
+			    case 38: // KEY up
+				date -= 7;
+				(date >= 0) && (ne = cal.ar_days[date]);
+				break;
+			    case 39: // KEY right
+				(++date < cal.ar_days.length) && (ne = cal.ar_days[date]);
+				break;
+			    case 40: // KEY down
+				date += 7;
+				(date < cal.ar_days.length) && (ne = cal.ar_days[date]);
+				break;
+			}
+			if (!ne) {
+				if (prev) {
+					Calendar.cellClick(cal._nav_pm);
+				} else {
+					Calendar.cellClick(cal._nav_nm);
+				}
+				date = (prev) ? cal.date.getMonthDays() : 1;
+				el = cal.currentDateEl;
+				ne = cal.ar_days[date - 1];
+			}
+			Calendar.removeClass(el, "selected");
+			Calendar.addClass(ne, "selected");
+			cal.date.setDate(ne.caldate);
+			cal.callHandler();
+			cal.currentDateEl = ne;
+		}
+		break;
+	    case 13: // KEY enter
+		if (act) {
+			cal.callHandler();
+			cal.hide();
+		}
+		break;
+	    default:
+		return false;
+	}
+	return Calendar.stopEvent(ev);
+};
+
+/**
+ *  (RE)Initializes the calendar to the given date and style (if mondayFirst is
+ *  true it makes Monday the first day of week, otherwise the weeks start on
+ *  Sunday.
+ */
+Calendar.prototype._init = function (mondayFirst, date) {
+	var today = new Date();
+	var year = date.getFullYear();
+	if (year < this.minYear) {
+		year = this.minYear;
+		date.setFullYear(year);
+	} else if (year > this.maxYear) {
+		year = this.maxYear;
+		date.setFullYear(year);
+	}
+	this.mondayFirst = mondayFirst;
+	this.date = new Date(date);
+	var month = date.getMonth();
+	var mday = date.getDate();
+	var no_days = date.getMonthDays();
+	date.setDate(1);
+	var wday = date.getDay();
+	var MON = mondayFirst ? 1 : 0;
+	var SAT = mondayFirst ? 5 : 6;
+	var SUN = mondayFirst ? 6 : 0;
+	if (mondayFirst) {
+		wday = (wday > 0) ? (wday - 1) : 6;
+	}
+	var iday = 1;
+	var row = this.tbody.firstChild;
+	var MN = Calendar._MN3[month];
+	var hasToday = ((today.getFullYear() == year) && (today.getMonth() == month));
+	var todayDate = today.getDate();
+	var week_number = date.getWeekNumber();
+	var ar_days = new Array();
+	for (var i = 0; i < 6; ++i) {
+		if (iday > no_days) {
+			row.className = "emptyrow";
+			row = row.nextSibling;
+			continue;
+		}
+		var cell = row.firstChild;
+		if (this.weekNumbers) {
+			cell.className = "day wn";
+			cell.firstChild.data = week_number;
+			cell = cell.nextSibling;
+		}
+		++week_number;
+		row.className = "daysrow";
+		for (var j = 0; j < 7; ++j) {
+			cell.className = "day";
+			if ((!i && j < wday) || iday > no_days) {
+				// cell.className = "emptycell";
+				cell.innerHTML = "&nbsp;";
+				cell.disabled = true;
+				cell = cell.nextSibling;
+				continue;
+			}
+			cell.disabled = false;
+			cell.firstChild.data = iday;
+			if (typeof this.checkDisabled == "function") {
+				date.setDate(iday);
+				if (this.checkDisabled(date)) {
+					cell.className += " disabled";
+					cell.disabled = true;
+				}
+			}
+			if (!cell.disabled) {
+				ar_days[ar_days.length] = cell;
+				cell.caldate = iday;
+				cell.ttip = "_";
+				if (iday == mday) {
+					cell.className += " selected";
+					this.currentDateEl = cell;
+				}
+				if (hasToday && (iday == todayDate)) {
+					cell.className += " today";
+					cell.ttip += Calendar._TT["PART_TODAY"];
+				}
+				if (wday == SAT || wday == SUN) {
+					cell.className += " weekend";
+				}
+			}
+			++iday;
+			((++wday) ^ 7) || (wday = 0);
+			cell = cell.nextSibling;
+		}
+		row = row.nextSibling;
+	}
+	this.ar_days = ar_days;
+	this.title.firstChild.data = Calendar._MN[month] + ", " + year;
+	// PROFILE
+	// this.tooltips.firstChild.data = "Generated in " + ((new Date()) - today) + " ms";
+};
+
+/**
+ *  Calls _init function above for going to a certain date (but only if the
+ *  date is different than the currently selected one).
+ */
+Calendar.prototype.setDate = function (date) {
+	if (!date.equalsTo(this.date)) {
+		this._init(this.mondayFirst, date);
+	}
+};
+
+/**
+ *  Refreshes the calendar.  Useful if the "disabledHandler" function is
+ *  dynamic, meaning that the list of disabled date can change at runtime.
+ *  Just * call this function if you think that the list of disabled dates
+ *  should * change.
+ */
+Calendar.prototype.refresh = function () {
+	this._init(this.mondayFirst, this.date);
+};
+
+/** Modifies the "mondayFirst" parameter (EU/US style). */
+Calendar.prototype.setMondayFirst = function (mondayFirst) {
+	this._init(mondayFirst, this.date);
+	this._displayWeekdays();
+};
+
+/**
+ *  Allows customization of what dates are enabled.  The "unaryFunction"
+ *  parameter must be a function object that receives the date (as a JS Date
+ *  object) and returns a boolean value.  If the returned value is true then
+ *  the passed date will be marked as disabled.
+ */
+Calendar.prototype.setDisabledHandler = function (unaryFunction) {
+	this.checkDisabled = unaryFunction;
+};
+
+/** Customization of allowed year range for the calendar. */
+Calendar.prototype.setRange = function (a, z) {
+	this.minYear = a;
+	this.maxYear = z;
+};
+
+/** Calls the first user handler (selectedHandler). */
+Calendar.prototype.callHandler = function () {
+	if (this.onSelected) {
+		this.onSelected(this, this.date.print(this.dateFormat));
+	}
+};
+
+/** Calls the second user handler (closeHandler). */
+Calendar.prototype.callCloseHandler = function () {
+	if (this.onClose) {
+		this.onClose(this);
+	}
+	this.hideShowCovered();
+};
+
+/** Removes the calendar object from the DOM tree and destroys it. */
+Calendar.prototype.destroy = function () {
+	var el = this.element.parentNode;
+	el.removeChild(this.element);
+	Calendar._C = null;
+};
+
+/**
+ *  Moves the calendar element to a different section in the DOM tree (changes
+ *  its parent).
+ */
+Calendar.prototype.reparent = function (new_parent) {
+	var el = this.element;
+	el.parentNode.removeChild(el);
+	new_parent.appendChild(el);
+};
+
+// This gets called when the user presses a mouse button anywhere in the
+// document, if the calendar is shown.  If the click was outside the open
+// calendar this function closes it.
+Calendar._checkCalendar = function(ev) {
+	if (!window.calendar) {
+		return false;
+	}
+	var el = Calendar.is_ie ? Calendar.getElement(ev) : Calendar.getTargetElement(ev);
+	for (; el != null && el != calendar.element; el = el.parentNode);
+	if (el == null) {
+		// calls closeHandler which should hide the calendar.
+		window.calendar.callCloseHandler();
+		return Calendar.stopEvent(ev);
+	}
+};
+
+/** Shows the calendar. */
+Calendar.prototype.show = function () {
+	var rows = this.table.getElementsByTagName("tr");
+	for (var i = rows.length; i > 0;) {
+		var row = rows[--i];
+		Calendar.removeClass(row, "rowhilite");
+		var cells = row.getElementsByTagName("td");
+		for (var j = cells.length; j > 0;) {
+			var cell = cells[--j];
+			Calendar.removeClass(cell, "hilite");
+			Calendar.removeClass(cell, "active");
+		}
+	}
+	this.element.style.display = "block";
+	this.hidden = false;
+	if (this.isPopup) {
+		window.calendar = this;
+		Calendar.addEvent(document, "keydown", Calendar._keyEvent);
+		Calendar.addEvent(document, "keypress", Calendar._keyEvent);
+		Calendar.addEvent(document, "mousedown", Calendar._checkCalendar);
+	}
+	this.hideShowCovered();
+};
+
+/**
+ *  Hides the calendar.  Also removes any "hilite" from the class of any TD
+ *  element.
+ */
+Calendar.prototype.hide = function () {
+	if (this.isPopup) {
+		Calendar.removeEvent(document, "keydown", Calendar._keyEvent);
+		Calendar.removeEvent(document, "keypress", Calendar._keyEvent);
+		Calendar.removeEvent(document, "mousedown", Calendar._checkCalendar);
+	}
+	this.element.style.display = "none";
+	this.hidden = true;
+	this.hideShowCovered();
+};
+
+/**
+ *  Shows the calendar at a given absolute position (beware that, depending on
+ *  the calendar element style -- position property -- this might be relative
+ *  to the parent's containing rectangle).
+ */
+Calendar.prototype.showAt = function (x, y) {
+	var s = this.element.style;
+	s.left = x + "px";
+	s.top = y + "px";
+	this.show();
+};
+
+/** Shows the calendar near a given element. */
+Calendar.prototype.showAtElement = function (el, opts) {
+	var p = Calendar.getAbsolutePos(el);
+	if (!opts || typeof opts != "string") {
+		this.showAt(p.x, p.y + el.offsetHeight);
+		return true;
+	}
+	this.show();
+	var w = this.element.offsetWidth;
+	var h = this.element.offsetHeight;
+	this.hide();
+	var valign = opts.substr(0, 1);
+	var halign = "l";
+	if (opts.length > 1) {
+		halign = opts.substr(1, 1);
+	}
+	// vertical alignment
+        switch (valign) {
+	    case "T": p.y -= h; break;
+	    case "B": p.y += el.offsetHeight; break;
+	    case "C": p.y += (el.offsetHeight - h) / 2; break;
+	    case "t": p.y += el.offsetHeight - h; break;
+	    case "b": break; // already there
+        }
+	// horizontal alignment
+	switch (halign) {
+	    case "L": p.x -= w; break;
+	    case "R": p.x += el.offsetWidth; break;
+	    case "C": p.x += (el.offsetWidth - w) / 2; break;
+	    case "r": p.x += el.offsetWidth - w; break;
+	    case "l": break; // already there
+	}
+	this.showAt(p.x, p.y);
+};
+
+/** Customizes the date format. */
+Calendar.prototype.setDateFormat = function (str) {
+	this.dateFormat = str;
+};
+
+/** Customizes the tooltip date format. */
+Calendar.prototype.setTtDateFormat = function (str) {
+	this.ttDateFormat = str;
+};
+
+/**
+ *  Tries to identify the date represented in a string.  If successful it also
+ *  calls this.setDate which moves the calendar to the given date.
+ */
+Calendar.prototype.parseDate = function (str, fmt) {
+	var y = 0;
+	var m = -1;
+	var d = 0;
+	var a = str.split(/\W+/);
+	if (!fmt) {
+		fmt = this.dateFormat;
+	}
+	var b = fmt.split(/\W+/);
+	var i = 0, j = 0;
+	for (i = 0; i < a.length; ++i) {
+		if (b[i] == "D" || b[i] == "DD") {
+			continue;
+		}
+		if (b[i] == "d" || b[i] == "dd") {
+			d = parseInt(a[i], 10);
+		}
+		if (b[i] == "m" || b[i] == "mm") {
+			m = parseInt(a[i], 10) - 1;
+		}
+		if ((b[i] == "y") || (b[i] == "yy")) {
+			y = parseInt(a[i], 10);
+			(y < 100) && (y += (y > 29) ? 1900 : 2000);
+		}
+		if (b[i] == "M" || b[i] == "MM") {
+			for (j = 0; j < 12; ++j) {
+				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
+			}
+		}
+	}
+	if (y != 0 && m != -1 && d != 0) {
+		this.setDate(new Date(y, m, d));
+		return;
+	}
+	y = 0; m = -1; d = 0;
+	for (i = 0; i < a.length; ++i) {
+		if (a[i].search(/[a-zA-Z]+/) != -1) {
+			var t = -1;
+			for (j = 0; j < 12; ++j) {
+				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; }
+			}
+			if (t != -1) {
+				if (m != -1) {
+					d = m+1;
+				}
+				m = t;
+			}
+		} else if (parseInt(a[i], 10) <= 12 && m == -1) {
+			m = a[i]-1;
+		} else if (parseInt(a[i], 10) > 31 && y == 0) {
+			y = parseInt(a[i], 10);
+			(y < 100) && (y += (y > 29) ? 1900 : 2000);
+		} else if (d == 0) {
+			d = a[i];
+		}
+	}
+	if (y == 0) {
+		var today = new Date();
+		y = today.getFullYear();
+	}
+	if (m != -1 && d != 0) {
+		this.setDate(new Date(y, m, d));
+	}
+};
+
+Calendar.prototype.hideShowCovered = function () {
+	function getStyleProp(obj, style){
+		var value = obj.style[style];
+		if (!value) {
+			if (document.defaultView && typeof (document.defaultView.getComputedStyle) == "function") { // Gecko, W3C
+				value = document.defaultView.
+					getComputedStyle(obj, "").getPropertyValue(style);
+			} else if (obj.currentStyle) { // IE
+				value = obj.currentStyle[style];
+			} else {
+				value = obj.style[style];
+			}
+		}
+		return value;
+	};
+
+	var tags = new Array("applet", "iframe", "select");
+	var el = this.element;
+
+	var p = Calendar.getAbsolutePos(el);
+	var EX1 = p.x;
+	var EX2 = el.offsetWidth + EX1;
+	var EY1 = p.y;
+	var EY2 = el.offsetHeight + EY1;
+
+	for (var k = tags.length; k > 0; ) {
+		var ar = document.getElementsByTagName(tags[--k]);
+		var cc = null;
+
+		for (var i = ar.length; i > 0;) {
+			cc = ar[--i];
+
+			p = Calendar.getAbsolutePos(cc);
+			var CX1 = p.x;
+			var CX2 = cc.offsetWidth + CX1;
+			var CY1 = p.y;
+			var CY2 = cc.offsetHeight + CY1;
+
+			if (this.hidden || (CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
+				if (!cc.__msh_save_visibility) {
+					cc.__msh_save_visibility = getStyleProp(cc, "visibility");
+				}
+				cc.style.visibility = cc.__msh_save_visibility;
+			} else {
+				if (!cc.__msh_save_visibility) {
+					cc.__msh_save_visibility = getStyleProp(cc, "visibility");
+				}
+				cc.style.visibility = "hidden";
+			}
+		}
+	}
+};
+
+/** Internal function; it displays the bar with the names of the weekday. */
+Calendar.prototype._displayWeekdays = function () {
+	var MON = this.mondayFirst ? 0 : 1;
+	var SUN = this.mondayFirst ? 6 : 0;
+	var SAT = this.mondayFirst ? 5 : 6;
+	var cell = this.firstdayname;
+	for (var i = 0; i < 7; ++i) {
+		cell.className = "day name";
+		if (!i) {
+			cell.ttip = this.mondayFirst ? Calendar._TT["SUN_FIRST"] : Calendar._TT["MON_FIRST"];
+			cell.navtype = 100;
+			cell.calendar = this;
+			Calendar._add_evs(cell);
+		}
+		if (i == SUN || i == SAT) {
+			Calendar.addClass(cell, "weekend");
+		}
+		cell.firstChild.data = Calendar._DN3[i + 1 - MON];
+		cell = cell.nextSibling;
+	}
+};
+
+/** Internal function.  Hides all combo boxes that might be displayed. */
+Calendar.prototype._hideCombos = function () {
+	this.monthsCombo.style.display = "none";
+	this.yearsCombo.style.display = "none";
+};
+
+/** Internal function.  Starts dragging the element. */
+Calendar.prototype._dragStart = function (ev) {
+	if (this.dragging) {
+		return;
+	}
+	this.dragging = true;
+	var posX;
+	var posY;
+	if (Calendar.is_ie) {
+		posY = window.event.clientY + document.body.scrollTop;
+		posX = window.event.clientX + document.body.scrollLeft;
+	} else {
+		posY = ev.clientY + window.scrollY;
+		posX = ev.clientX + window.scrollX;
+	}
+	var st = this.element.style;
+	this.xOffs = posX - parseInt(st.left);
+	this.yOffs = posY - parseInt(st.top);
+	with (Calendar) {
+		addEvent(document, "mousemove", calDragIt);
+		addEvent(document, "mouseover", stopEvent);
+		addEvent(document, "mouseup", calDragEnd);
+	}
+};
+
+// BEGIN: DATE OBJECT PATCHES
+
+/** Adds the number of days array to the Date object. */
+Date._MD = new Array(31,28,31,30,31,30,31,31,30,31,30,31);
+
+/** Constants used for time computations */
+Date.SECOND = 1000 /* milliseconds */;
+Date.MINUTE = 60 * Date.SECOND;
+Date.HOUR   = 60 * Date.MINUTE;
+Date.DAY    = 24 * Date.HOUR;
+Date.WEEK   =  7 * Date.DAY;
+
+/** Returns the number of days in the current month */
+Date.prototype.getMonthDays = function(month) {
+	var year = this.getFullYear();
+	if (typeof month == "undefined") {
+		month = this.getMonth();
+	}
+	if (((0 == (year%4)) && ( (0 != (year%100)) || (0 == (year%400)))) && month == 1) {
+		return 29;
+	} else {
+		return Date._MD[month];
+	}
+};
+
+/** Returns the number of the week.  The algorithm was "stolen" from PPK's
+ * website, hope it's correct :) http://www.xs4all.nl/~ppk/js/week.html */
+Date.prototype.getWeekNumber = function() {
+	var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+	var then = new Date(this.getFullYear(), 0, 1, 0, 0, 0);
+	var time = now - then;
+	var day = then.getDay();
+	(day > 3) && (day -= 4) || (day += 3);
+	return Math.round(((time / Date.DAY) + day) / 7);
+};
+
+/** Checks dates equality (ignores time) */
+Date.prototype.equalsTo = function(date) {
+	return ((this.getFullYear() == date.getFullYear()) &&
+		(this.getMonth() == date.getMonth()) &&
+		(this.getDate() == date.getDate()));
+};
+
+/** Prints the date in a string according to the given format. */
+Date.prototype.print = function (frm) {
+	var str = new String(frm);
+	var m = this.getMonth();
+	var d = this.getDate();
+	var y = this.getFullYear();
+	var wn = this.getWeekNumber();
+	var w = this.getDay();
+	var s = new Array();
+	s["d"] = d;
+	s["dd"] = (d < 10) ? ("0" + d) : d;
+	s["m"] = 1+m;
+	s["mm"] = (m < 9) ? ("0" + (1+m)) : (1+m);
+	s["y"] = y;
+	s["yy"] = new String(y).substr(2, 2);
+	s["w"] = wn;
+	s["ww"] = (wn < 10) ? ("0" + wn) : wn;
+	with (Calendar) {
+		s["D"] = _DN3[w];
+		s["DD"] = _DN[w];
+		s["M"] = _MN3[m];
+		s["MM"] = _MN[m];
+	}
+	var re = /(.*)(\W|^)(d|dd|m|mm|y|yy|MM|M|DD|D|w|ww)(\W|$)(.*)/;
+	while (re.exec(str) != null) {
+		str = RegExp.$1 + RegExp.$2 + s[RegExp.$3] + RegExp.$4 + RegExp.$5;
+	}
+	return str;
+};
+
+// END: DATE OBJECT PATCHES
+
+// global object that remembers the calendar
+window.calendar = null;
diff --git a/httemplate/elements/calendar_stripped.js b/httemplate/elements/calendar_stripped.js
new file mode 100644
index 000000000..38b9b9aad
--- /dev/null
+++ b/httemplate/elements/calendar_stripped.js
@@ -0,0 +1,12 @@
+/*  Copyright Mihai Bazon, 2002, 2003  |  http://students.infoiasi.ro/~mishoo
+ * ---------------------------------------------------------------------------
+ *
+ * The DHTML Calendar, version 0.9.3 "It's still alive & keeps rocking"
+ *
+ * Details and latest version at:
+ * http://students.infoiasi.ro/~mishoo/site/calendar.epl
+ *
+ * Feel free to use this script under the terms of the GNU Lesser General
+ * Public License, as long as you do not remove or alter this notice.
+ */
+Calendar=function(mondayFirst,dateStr,onSelected,onClose){this.activeDiv=null;this.currentDateEl=null;this.checkDisabled=null;this.timeout=null;this.onSelected=onSelected||null;this.onClose=onClose||null;this.dragging=false;this.hidden=false;this.minYear=1970;this.maxYear=2050;this.dateFormat=Calendar._TT["DEF_DATE_FORMAT"];this.ttDateFormat=Calendar._TT["TT_DATE_FORMAT"];this.isPopup=true;this.weekNumbers=true;this.mondayFirst=mondayFirst;this.dateStr=dateStr;this.ar_days=null;this.table=null;this.element=null;this.tbody=null;this.firstdayname=null;this.monthsCombo=null;this.yearsCombo=null;this.hilitedMonth=null;this.activeMonth=null;this.hilitedYear=null;this.activeYear=null;this.dateClicked=false;if(!Calendar._DN3){var ar=new Array();for(var i=8;i>0;){ar[--i]=Calendar._DN[i].substr(0,3);}Calendar._DN3=ar;ar=new Array();for(var i=12;i>0;){ar[--i]=Calendar._MN[i].substr(0,3);}Calendar._MN3=ar;}};Calendar._C=null;Calendar.is_ie=(/msie/i.test(navigator.userAgent)&&!/opera/i.test(navigator.userAgent));Calendar._DN3=null;Calendar._MN3=null;Calendar.getAbsolutePos=function(el){var r={x:el.offsetLeft,y:el.offsetTop};if(el.offsetParent){var tmp=Calendar.getAbsolutePos(el.offsetParent);r.x+=tmp.x;r.y+=tmp.y;}return r;};Calendar.isRelated=function(el,evt){var related=evt.relatedTarget;if(!related){var type=evt.type;if(type=="mouseover"){related=evt.fromElement;}else if(type=="mouseout"){related=evt.toElement;}}while(related){if(related==el){return true;}related=related.parentNode;}return false;};Calendar.removeClass=function(el,className){if(!(el&&el.className)){return;}var cls=el.className.split(" ");var ar=new Array();for(var i=cls.length;i>0;){if(cls[--i]!=className){ar[ar.length]=cls[i];}}el.className=ar.join(" ");};Calendar.addClass=function(el,className){Calendar.removeClass(el,className);el.className+=" "+className;};Calendar.getElement=function(ev){if(Calendar.is_ie){return window.event.srcElement;}else{return ev.currentTarget;}};Calendar.getTargetElement=function(ev){if(Calendar.is_ie){return window.event.srcElement;}else{return ev.target;}};Calendar.stopEvent=function(ev){if(Calendar.is_ie){window.event.cancelBubble=true;window.event.returnValue=false;}else{ev.preventDefault();ev.stopPropagation();}return false;};Calendar.addEvent=function(el,evname,func){if(el.attachEvent){el.attachEvent("on"+evname,func);}else if(el.addEventListener){el.addEventListener(evname,func,true);}else{el["on"+evname]=func;}};Calendar.removeEvent=function(el,evname,func){if(el.detachEvent){el.detachEvent("on"+evname,func);}else if(el.removeEventListener){el.removeEventListener(evname,func,true);}else{el["on"+evname]=null;}};Calendar.createElement=function(type,parent){var el=null;if(document.createElementNS){el=document.createElementNS("http://www.w3.org/1999/xhtml",type);}else{el=document.createElement(type);}if(typeof parent!="undefined"){parent.appendChild(el);}return el;};Calendar._add_evs=function(el){with(Calendar){addEvent(el,"mouseover",dayMouseOver);addEvent(el,"mousedown",dayMouseDown);addEvent(el,"mouseout",dayMouseOut);if(is_ie){addEvent(el,"dblclick",dayMouseDblClick);el.setAttribute("unselectable",true);}}};Calendar.findMonth=function(el){if(typeof el.month!="undefined"){return el;}else if(typeof el.parentNode.month!="undefined"){return el.parentNode;}return null;};Calendar.findYear=function(el){if(typeof el.year!="undefined"){return el;}else if(typeof el.parentNode.year!="undefined"){return el.parentNode;}return null;};Calendar.showMonthsCombo=function(){var cal=Calendar._C;if(!cal){return false;}var cal=cal;var cd=cal.activeDiv;var mc=cal.monthsCombo;if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}if(cal.activeMonth){Calendar.removeClass(cal.activeMonth,"active");}var mon=cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];Calendar.addClass(mon,"active");cal.activeMonth=mon;mc.style.left=cd.offsetLeft+"px";mc.style.top=(cd.offsetTop+cd.offsetHeight)+"px";mc.style.display="block";};Calendar.showYearsCombo=function(fwd){var cal=Calendar._C;if(!cal){return false;}var cal=cal;var cd=cal.activeDiv;var yc=cal.yearsCombo;if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}if(cal.activeYear){Calendar.removeClass(cal.activeYear,"active");}cal.activeYear=null;var Y=cal.date.getFullYear()+(fwd?1:-1);var yr=yc.firstChild;var show=false;for(var i=12;i>0;--i){if(Y>=cal.minYear&&Y<=cal.maxYear){yr.firstChild.data=Y;yr.year=Y;yr.style.display="block";show=true;}else{yr.style.display="none";}yr=yr.nextSibling;Y+=fwd?2:-2;}if(show){yc.style.left=cd.offsetLeft+"px";yc.style.top=(cd.offsetTop+cd.offsetHeight)+"px";yc.style.display="block";}};Calendar.tableMouseUp=function(ev){var cal=Calendar._C;if(!cal){return false;}if(cal.timeout){clearTimeout(cal.timeout);}var el=cal.activeDiv;if(!el){return false;}var target=Calendar.getTargetElement(ev);Calendar.removeClass(el,"active");if(target==el||target.parentNode==el){Calendar.cellClick(el);}var mon=Calendar.findMonth(target);var date=null;if(mon){date=new Date(cal.date);if(mon.month!=date.getMonth()){date.setMonth(mon.month);cal.setDate(date);cal.dateClicked=false;cal.callHandler();}}else{var year=Calendar.findYear(target);if(year){date=new Date(cal.date);if(year.year!=date.getFullYear()){date.setFullYear(year.year);cal.setDate(date);cal.dateClicked=false;cal.callHandler();}}}with(Calendar){removeEvent(document,"mouseup",tableMouseUp);removeEvent(document,"mouseover",tableMouseOver);removeEvent(document,"mousemove",tableMouseOver);cal._hideCombos();_C=null;return stopEvent(ev);}};Calendar.tableMouseOver=function(ev){var cal=Calendar._C;if(!cal){return;}var el=cal.activeDiv;var target=Calendar.getTargetElement(ev);if(target==el||target.parentNode==el){Calendar.addClass(el,"hilite active");Calendar.addClass(el.parentNode,"rowhilite");}else{Calendar.removeClass(el,"active");Calendar.removeClass(el,"hilite");Calendar.removeClass(el.parentNode,"rowhilite");}var mon=Calendar.findMonth(target);if(mon){if(mon.month!=cal.date.getMonth()){if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}Calendar.addClass(mon,"hilite");cal.hilitedMonth=mon;}else if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}}else{var year=Calendar.findYear(target);if(year){if(year.year!=cal.date.getFullYear()){if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}Calendar.addClass(year,"hilite");cal.hilitedYear=year;}else if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}}}return Calendar.stopEvent(ev);};Calendar.tableMouseDown=function(ev){if(Calendar.getTargetElement(ev)==Calendar.getElement(ev)){return Calendar.stopEvent(ev);}};Calendar.calDragIt=function(ev){var cal=Calendar._C;if(!(cal&&cal.dragging)){return false;}var posX;var posY;if(Calendar.is_ie){posY=window.event.clientY+document.body.scrollTop;posX=window.event.clientX+document.body.scrollLeft;}else{posX=ev.pageX;posY=ev.pageY;}cal.hideShowCovered();var st=cal.element.style;st.left=(posX-cal.xOffs)+"px";st.top=(posY-cal.yOffs)+"px";return Calendar.stopEvent(ev);};Calendar.calDragEnd=function(ev){var cal=Calendar._C;if(!cal){return false;}cal.dragging=false;with(Calendar){removeEvent(document,"mousemove",calDragIt);removeEvent(document,"mouseover",stopEvent);removeEvent(document,"mouseup",calDragEnd);tableMouseUp(ev);}cal.hideShowCovered();};Calendar.dayMouseDown=function(ev){var el=Calendar.getElement(ev);if(el.disabled){return false;}var cal=el.calendar;cal.activeDiv=el;Calendar._C=cal;if(el.navtype!=300)with(Calendar){addClass(el,"hilite active");addEvent(document,"mouseover",tableMouseOver);addEvent(document,"mousemove",tableMouseOver);addEvent(document,"mouseup",tableMouseUp);}else if(cal.isPopup){cal._dragStart(ev);}if(el.navtype==-1||el.navtype==1){cal.timeout=setTimeout("Calendar.showMonthsCombo()",250);}else if(el.navtype==-2||el.navtype==2){cal.timeout=setTimeout((el.navtype>0)?"Calendar.showYearsCombo(true)":"Calendar.showYearsCombo(false)",250);}else{cal.timeout=null;}return Calendar.stopEvent(ev);};Calendar.dayMouseDblClick=function(ev){Calendar.cellClick(Calendar.getElement(ev));if(Calendar.is_ie){document.selection.empty();}};Calendar.dayMouseOver=function(ev){var el=Calendar.getElement(ev);if(Calendar.isRelated(el,ev)||Calendar._C||el.disabled){return false;}if(el.ttip){if(el.ttip.substr(0,1)=="_"){var date=null;with(el.calendar.date){date=new Date(getFullYear(),getMonth(),el.caldate);}el.ttip=date.print(el.calendar.ttDateFormat)+el.ttip.substr(1);}el.calendar.tooltips.firstChild.data=el.ttip;}if(el.navtype!=300){Calendar.addClass(el,"hilite");if(el.caldate){Calendar.addClass(el.parentNode,"rowhilite");}}return Calendar.stopEvent(ev);};Calendar.dayMouseOut=function(ev){with(Calendar){var el=getElement(ev);if(isRelated(el,ev)||_C||el.disabled){return false;}removeClass(el,"hilite");if(el.caldate){removeClass(el.parentNode,"rowhilite");}el.calendar.tooltips.firstChild.data=_TT["SEL_DATE"];return stopEvent(ev);}};Calendar.cellClick=function(el){var cal=el.calendar;var closing=false;var newdate=false;var date=null;if(typeof el.navtype=="undefined"){Calendar.removeClass(cal.currentDateEl,"selected");Calendar.addClass(el,"selected");closing=(cal.currentDateEl==el);if(!closing){cal.currentDateEl=el;}cal.date.setDate(el.caldate);date=cal.date;newdate=true;cal.dateClicked=true;}else{if(el.navtype==200){Calendar.removeClass(el,"hilite");cal.callCloseHandler();return;}date=(el.navtype==0)?new Date():new Date(cal.date);cal.dateClicked=(el.navtype==0);var year=date.getFullYear();var mon=date.getMonth();function setMonth(m){var day=date.getDate();var max=date.getMonthDays(m);if(day>max){date.setDate(max);}date.setMonth(m);};switch(el.navtype){case-2:if(year>cal.minYear){date.setFullYear(year-1);}break;case-1:if(mon>0){setMonth(mon-1);}else if(year-->cal.minYear){date.setFullYear(year);setMonth(11);}break;case 1:if(mon<11){setMonth(mon+1);}else if(year<cal.maxYear){date.setFullYear(year+1);setMonth(0);}break;case 2:if(year<cal.maxYear){date.setFullYear(year+1);}break;case 100:cal.setMondayFirst(!cal.mondayFirst);return;case 0:if((typeof cal.checkDisabled=="function")&&cal.checkDisabled(date)){return false;}break;}if(!date.equalsTo(cal.date)){cal.setDate(date);newdate=true;}}if(newdate){cal.callHandler();}if(closing){Calendar.removeClass(el,"hilite");cal.callCloseHandler();}};Calendar.prototype.create=function(_par){var parent=null;if(!_par){parent=document.getElementsByTagName("body")[0];this.isPopup=true;}else{parent=_par;this.isPopup=false;}this.date=this.dateStr?new Date(this.dateStr):new Date();var table=Calendar.createElement("table");this.table=table;table.cellSpacing=0;table.cellPadding=0;table.calendar=this;Calendar.addEvent(table,"mousedown",Calendar.tableMouseDown);var div=Calendar.createElement("div");this.element=div;div.className="calendar";if(this.isPopup){div.style.position="absolute";div.style.display="none";}div.appendChild(table);var thead=Calendar.createElement("thead",table);var cell=null;var row=null;var cal=this;var hh=function(text,cs,navtype){cell=Calendar.createElement("td",row);cell.colSpan=cs;cell.className="button";Calendar._add_evs(cell);cell.calendar=cal;cell.navtype=navtype;if(text.substr(0,1)!="&"){cell.appendChild(document.createTextNode(text));}else{cell.innerHTML=text;}return cell;};row=Calendar.createElement("tr",thead);var title_length=6;(this.isPopup)&&--title_length;(this.weekNumbers)&&++title_length;hh("-",1,100).ttip=Calendar._TT["TOGGLE"];this.title=hh("",title_length,300);this.title.className="title";if(this.isPopup){this.title.ttip=Calendar._TT["DRAG_TO_MOVE"];this.title.style.cursor="move";hh("&#x00d7;",1,200).ttip=Calendar._TT["CLOSE"];}row=Calendar.createElement("tr",thead);row.className="headrow";this._nav_py=hh("&#x00ab;",1,-2);this._nav_py.ttip=Calendar._TT["PREV_YEAR"];this._nav_pm=hh("&#x2039;",1,-1);this._nav_pm.ttip=Calendar._TT["PREV_MONTH"];this._nav_now=hh(Calendar._TT["TODAY"],this.weekNumbers?4:3,0);this._nav_now.ttip=Calendar._TT["GO_TODAY"];this._nav_nm=hh("&#x203a;",1,1);this._nav_nm.ttip=Calendar._TT["NEXT_MONTH"];this._nav_ny=hh("&#x00bb;",1,2);this._nav_ny.ttip=Calendar._TT["NEXT_YEAR"];row=Calendar.createElement("tr",thead);row.className="daynames";if(this.weekNumbers){cell=Calendar.createElement("td",row);cell.className="name wn";cell.appendChild(document.createTextNode(Calendar._TT["WK"]));}for(var i=7;i>0;--i){cell=Calendar.createElement("td",row);cell.appendChild(document.createTextNode(""));if(!i){cell.navtype=100;cell.calendar=this;Calendar._add_evs(cell);}}this.firstdayname=(this.weekNumbers)?row.firstChild.nextSibling:row.firstChild;this._displayWeekdays();var tbody=Calendar.createElement("tbody",table);this.tbody=tbody;for(i=6;i>0;--i){row=Calendar.createElement("tr",tbody);if(this.weekNumbers){cell=Calendar.createElement("td",row);cell.appendChild(document.createTextNode(""));}for(var j=7;j>0;--j){cell=Calendar.createElement("td",row);cell.appendChild(document.createTextNode(""));cell.calendar=this;Calendar._add_evs(cell);}}var tfoot=Calendar.createElement("tfoot",table);row=Calendar.createElement("tr",tfoot);row.className="footrow";cell=hh(Calendar._TT["SEL_DATE"],this.weekNumbers?8:7,300);cell.className="ttip";if(this.isPopup){cell.ttip=Calendar._TT["DRAG_TO_MOVE"];cell.style.cursor="move";}this.tooltips=cell;div=Calendar.createElement("div",this.element);this.monthsCombo=div;div.className="combo";for(i=0;i<Calendar._MN.length;++i){var mn=Calendar.createElement("div");mn.className="label";mn.month=i;mn.appendChild(document.createTextNode(Calendar._MN3[i]));div.appendChild(mn);}div=Calendar.createElement("div",this.element);this.yearsCombo=div;div.className="combo";for(i=12;i>0;--i){var yr=Calendar.createElement("div");yr.className="label";yr.appendChild(document.createTextNode(""));div.appendChild(yr);}this._init(this.mondayFirst,this.date);parent.appendChild(this.element);};Calendar._keyEvent=function(ev){if(!window.calendar){return false;}(Calendar.is_ie)&&(ev=window.event);var cal=window.calendar;var act=(Calendar.is_ie||ev.type=="keypress");if(ev.ctrlKey){switch(ev.keyCode){case 37:act&&Calendar.cellClick(cal._nav_pm);break;case 38:act&&Calendar.cellClick(cal._nav_py);break;case 39:act&&Calendar.cellClick(cal._nav_nm);break;case 40:act&&Calendar.cellClick(cal._nav_ny);break;default:return false;}}else switch(ev.keyCode){case 32:Calendar.cellClick(cal._nav_now);break;case 27:act&&cal.hide();break;case 37:case 38:case 39:case 40:if(act){var date=cal.date.getDate()-1;var el=cal.currentDateEl;var ne=null;var prev=(ev.keyCode==37)||(ev.keyCode==38);switch(ev.keyCode){case 37:(--date>=0)&&(ne=cal.ar_days[date]);break;case 38:date-=7;(date>=0)&&(ne=cal.ar_days[date]);break;case 39:(++date<cal.ar_days.length)&&(ne=cal.ar_days[date]);break;case 40:date+=7;(date<cal.ar_days.length)&&(ne=cal.ar_days[date]);break;}if(!ne){if(prev){Calendar.cellClick(cal._nav_pm);}else{Calendar.cellClick(cal._nav_nm);}date=(prev)?cal.date.getMonthDays():1;el=cal.currentDateEl;ne=cal.ar_days[date-1];}Calendar.removeClass(el,"selected");Calendar.addClass(ne,"selected");cal.date.setDate(ne.caldate);cal.callHandler();cal.currentDateEl=ne;}break;case 13:if(act){cal.callHandler();cal.hide();}break;default:return false;}return Calendar.stopEvent(ev);};Calendar.prototype._init=function(mondayFirst,date){var today=new Date();var year=date.getFullYear();if(year<this.minYear){year=this.minYear;date.setFullYear(year);}else if(year>this.maxYear){year=this.maxYear;date.setFullYear(year);}this.mondayFirst=mondayFirst;this.date=new Date(date);var month=date.getMonth();var mday=date.getDate();var no_days=date.getMonthDays();date.setDate(1);var wday=date.getDay();var MON=mondayFirst?1:0;var SAT=mondayFirst?5:6;var SUN=mondayFirst?6:0;if(mondayFirst){wday=(wday>0)?(wday-1):6;}var iday=1;var row=this.tbody.firstChild;var MN=Calendar._MN3[month];var hasToday=((today.getFullYear()==year)&&(today.getMonth()==month));var todayDate=today.getDate();var week_number=date.getWeekNumber();var ar_days=new Array();for(var i=0;i<6;++i){if(iday>no_days){row.className="emptyrow";row=row.nextSibling;continue;}var cell=row.firstChild;if(this.weekNumbers){cell.className="day wn";cell.firstChild.data=week_number;cell=cell.nextSibling;}++week_number;row.className="daysrow";for(var j=0;j<7;++j){cell.className="day";if((!i&&j<wday)||iday>no_days){cell.innerHTML="&nbsp;";cell.disabled=true;cell=cell.nextSibling;continue;}cell.disabled=false;cell.firstChild.data=iday;if(typeof this.checkDisabled=="function"){date.setDate(iday);if(this.checkDisabled(date)){cell.className+=" disabled";cell.disabled=true;}}if(!cell.disabled){ar_days[ar_days.length]=cell;cell.caldate=iday;cell.ttip="_";if(iday==mday){cell.className+=" selected";this.currentDateEl=cell;}if(hasToday&&(iday==todayDate)){cell.className+=" today";cell.ttip+=Calendar._TT["PART_TODAY"];}if(wday==SAT||wday==SUN){cell.className+=" weekend";}}++iday;((++wday)^ 7)||(wday=0);cell=cell.nextSibling;}row=row.nextSibling;}this.ar_days=ar_days;this.title.firstChild.data=Calendar._MN[month]+", "+year;};Calendar.prototype.setDate=function(date){if(!date.equalsTo(this.date)){this._init(this.mondayFirst,date);}};Calendar.prototype.refresh=function(){this._init(this.mondayFirst,this.date);};Calendar.prototype.setMondayFirst=function(mondayFirst){this._init(mondayFirst,this.date);this._displayWeekdays();};Calendar.prototype.setDisabledHandler=function(unaryFunction){this.checkDisabled=unaryFunction;};Calendar.prototype.setRange=function(a,z){this.minYear=a;this.maxYear=z;};Calendar.prototype.callHandler=function(){if(this.onSelected){this.onSelected(this,this.date.print(this.dateFormat));}};Calendar.prototype.callCloseHandler=function(){if(this.onClose){this.onClose(this);}this.hideShowCovered();};Calendar.prototype.destroy=function(){var el=this.element.parentNode;el.removeChild(this.element);Calendar._C=null;};Calendar.prototype.reparent=function(new_parent){var el=this.element;el.parentNode.removeChild(el);new_parent.appendChild(el);};Calendar._checkCalendar=function(ev){if(!window.calendar){return false;}var el=Calendar.is_ie?Calendar.getElement(ev):Calendar.getTargetElement(ev);for(;el!=null&&el!=calendar.element;el=el.parentNode);if(el==null){window.calendar.callCloseHandler();return Calendar.stopEvent(ev);}};Calendar.prototype.show=function(){var rows=this.table.getElementsByTagName("tr");for(var i=rows.length;i>0;){var row=rows[--i];Calendar.removeClass(row,"rowhilite");var cells=row.getElementsByTagName("td");for(var j=cells.length;j>0;){var cell=cells[--j];Calendar.removeClass(cell,"hilite");Calendar.removeClass(cell,"active");}}this.element.style.display="block";this.hidden=false;if(this.isPopup){window.calendar=this;Calendar.addEvent(document,"keydown",Calendar._keyEvent);Calendar.addEvent(document,"keypress",Calendar._keyEvent);Calendar.addEvent(document,"mousedown",Calendar._checkCalendar);}this.hideShowCovered();};Calendar.prototype.hide=function(){if(this.isPopup){Calendar.removeEvent(document,"keydown",Calendar._keyEvent);Calendar.removeEvent(document,"keypress",Calendar._keyEvent);Calendar.removeEvent(document,"mousedown",Calendar._checkCalendar);}this.element.style.display="none";this.hidden=true;this.hideShowCovered();};Calendar.prototype.showAt=function(x,y){var s=this.element.style;s.left=x+"px";s.top=y+"px";this.show();};Calendar.prototype.showAtElement=function(el,opts){var p=Calendar.getAbsolutePos(el);if(!opts||typeof opts!="string"){this.showAt(p.x,p.y+el.offsetHeight);return true;}this.show();var w=this.element.offsetWidth;var h=this.element.offsetHeight;this.hide();var valign=opts.substr(0,1);var halign="l";if(opts.length>1){halign=opts.substr(1,1);}switch(valign){case "T":p.y-=h;break;case "B":p.y+=el.offsetHeight;break;case "C":p.y+=(el.offsetHeight-h)/2;break;case "t":p.y+=el.offsetHeight-h;break;case "b":break;}switch(halign){case "L":p.x-=w;break;case "R":p.x+=el.offsetWidth;break;case "C":p.x+=(el.offsetWidth-w)/2;break;case "r":p.x+=el.offsetWidth-w;break;case "l":break;}this.showAt(p.x,p.y);};Calendar.prototype.setDateFormat=function(str){this.dateFormat=str;};Calendar.prototype.setTtDateFormat=function(str){this.ttDateFormat=str;};Calendar.prototype.parseDate=function(str,fmt){var y=0;var m=-1;var d=0;var a=str.split(/\W+/);if(!fmt){fmt=this.dateFormat;}var b=fmt.split(/\W+/);var i=0,j=0;for(i=0;i<a.length;++i){if(b[i]=="D"||b[i]=="DD"){continue;}if(b[i]=="d"||b[i]=="dd"){d=parseInt(a[i],10);}if(b[i]=="m"||b[i]=="mm"){m=parseInt(a[i],10)-1;}if((b[i]=="y")||(b[i]=="yy")){y=parseInt(a[i],10);(y<100)&&(y+=(y>29)?1900:2000);}if(b[i]=="M"||b[i]=="MM"){for(j=0;j<12;++j){if(Calendar._MN[j].substr(0,a[i].length).toLowerCase()==a[i].toLowerCase()){m=j;break;}}}}if(y!=0&&m!=-1&&d!=0){this.setDate(new Date(y,m,d));return;}y=0;m=-1;d=0;for(i=0;i<a.length;++i){if(a[i].search(/[a-zA-Z]+/)!=-1){var t=-1;for(j=0;j<12;++j){if(Calendar._MN[j].substr(0,a[i].length).toLowerCase()==a[i].toLowerCase()){t=j;break;}}if(t!=-1){if(m!=-1){d=m+1;}m=t;}}else if(parseInt(a[i],10)<=12&&m==-1){m=a[i]-1;}else if(parseInt(a[i],10)>31&&y==0){y=parseInt(a[i],10);(y<100)&&(y+=(y>29)?1900:2000);}else if(d==0){d=a[i];}}if(y==0){var today=new Date();y=today.getFullYear();}if(m!=-1&&d!=0){this.setDate(new Date(y,m,d));}};Calendar.prototype.hideShowCovered=function(){function getStyleProp(obj,style){var value=obj.style[style];if(!value){if(document.defaultView&&typeof(document.defaultView.getComputedStyle)=="function"){value=document.defaultView.getComputedStyle(obj,"").getPropertyValue(style);}else if(obj.currentStyle){value=obj.currentStyle[style];}else{value=obj.style[style];}}return value;};var tags=new Array("applet","iframe","select");var el=this.element;var p=Calendar.getAbsolutePos(el);var EX1=p.x;var EX2=el.offsetWidth+EX1;var EY1=p.y;var EY2=el.offsetHeight+EY1;for(var k=tags.length;k>0;){var ar=document.getElementsByTagName(tags[--k]);var cc=null;for(var i=ar.length;i>0;){cc=ar[--i];p=Calendar.getAbsolutePos(cc);var CX1=p.x;var CX2=cc.offsetWidth+CX1;var CY1=p.y;var CY2=cc.offsetHeight+CY1;if(this.hidden||(CX1>EX2)||(CX2<EX1)||(CY1>EY2)||(CY2<EY1)){if(!cc.__msh_save_visibility){cc.__msh_save_visibility=getStyleProp(cc,"visibility");}cc.style.visibility=cc.__msh_save_visibility;}else{if(!cc.__msh_save_visibility){cc.__msh_save_visibility=getStyleProp(cc,"visibility");}cc.style.visibility="hidden";}}}};Calendar.prototype._displayWeekdays=function(){var MON=this.mondayFirst?0:1;var SUN=this.mondayFirst?6:0;var SAT=this.mondayFirst?5:6;var cell=this.firstdayname;for(var i=0;i<7;++i){cell.className="day name";if(!i){cell.ttip=this.mondayFirst?Calendar._TT["SUN_FIRST"]:Calendar._TT["MON_FIRST"];cell.navtype=100;cell.calendar=this;Calendar._add_evs(cell);}if(i==SUN||i==SAT){Calendar.addClass(cell,"weekend");}cell.firstChild.data=Calendar._DN3[i+1-MON];cell=cell.nextSibling;}};Calendar.prototype._hideCombos=function(){this.monthsCombo.style.display="none";this.yearsCombo.style.display="none";};Calendar.prototype._dragStart=function(ev){if(this.dragging){return;}this.dragging=true;var posX;var posY;if(Calendar.is_ie){posY=window.event.clientY+document.body.scrollTop;posX=window.event.clientX+document.body.scrollLeft;}else{posY=ev.clientY+window.scrollY;posX=ev.clientX+window.scrollX;}var st=this.element.style;this.xOffs=posX-parseInt(st.left);this.yOffs=posY-parseInt(st.top);with(Calendar){addEvent(document,"mousemove",calDragIt);addEvent(document,"mouseover",stopEvent);addEvent(document,"mouseup",calDragEnd);}};Date._MD=new Array(31,28,31,30,31,30,31,31,30,31,30,31);Date.SECOND=1000;Date.MINUTE=60*Date.SECOND;Date.HOUR=60*Date.MINUTE;Date.DAY=24*Date.HOUR;Date.WEEK=7*Date.DAY;Date.prototype.getMonthDays=function(month){var year=this.getFullYear();if(typeof month=="undefined"){month=this.getMonth();}if(((0==(year%4))&&((0!=(year%100))||(0==(year%400))))&&month==1){return 29;}else{return Date._MD[month];}};Date.prototype.getWeekNumber=function(){var now=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0);var then=new Date(this.getFullYear(),0,1,0,0,0);var time=now-then;var day=then.getDay();(day>3)&&(day-=4)||(day+=3);return Math.round(((time/Date.DAY)+day)/7);};Date.prototype.equalsTo=function(date){return((this.getFullYear()==date.getFullYear())&&(this.getMonth()==date.getMonth())&&(this.getDate()==date.getDate()));};Date.prototype.print=function(frm){var str=new String(frm);var m=this.getMonth();var d=this.getDate();var y=this.getFullYear();var wn=this.getWeekNumber();var w=this.getDay();var s=new Array();s["d"]=d;s["dd"]=(d<10)?("0"+d):d;s["m"]=1+m;s["mm"]=(m<9)?("0"+(1+m)):(1+m);s["y"]=y;s["yy"]=new String(y).substr(2,2);s["w"]=wn;s["ww"]=(wn<10)?("0"+wn):wn;with(Calendar){s["D"]=_DN3[w];s["DD"]=_DN[w];s["M"]=_MN3[m];s["MM"]=_MN[m];}var re=/(.*)(\W|^)(d|dd|m|mm|y|yy|MM|M|DD|D|w|ww)(\W|$)(.*)/;while(re.exec(str)!=null){str=RegExp.$1+RegExp.$2+s[RegExp.$3]+RegExp.$4+RegExp.$5;}return str;};window.calendar=null;
\ No newline at end of file
diff --git a/httemplate/images/calendar.png b/httemplate/images/calendar.png
new file mode 100644
index 000000000..163266174
Binary files /dev/null and b/httemplate/images/calendar.png differ
diff --git a/httemplate/search/cust_pkg.html b/httemplate/search/cust_pkg.html
index bb0a5407c..3d80d51a9 100755
--- a/httemplate/search/cust_pkg.html
+++ b/httemplate/search/cust_pkg.html
@@ -1,24 +1,46 @@
 <HTML>
   <HEAD>
     <TITLE>Packages</TITLE>
+    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
   </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Packages</H1>
-    </CENTER>
-    <HR>
+  <BODY BGCOLOR="#e8e8e8">
+    <H1>Packages</H1>
     <FORM ACTION="cust_pkg.cgi" METHOD="post">
     <INPUT TYPE="hidden" NAME="magic" VALUE="bill">
-      Return <B>packages</B> with next bill date: 
-      from <INPUT TYPE="text" NAME="beginning"> <i>m/d/y</i>
-      to <INPUT TYPE="text" NAME="ending"> <i>m/d/y</i>
-
-      <P><INPUT TYPE="submit" VALUE="Get Report">
+      Return packages with next bill date:<BR><BR>
+      <TABLE>
+        <TR>
+          <TD ALIGN="right">From: </TD>
+          <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><I>m/d/y</I></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "beginning_text",
+    ifFormat:   "mm/dd/y",
+    button:     "beginning_button",
+    align:      "BR"
+  });
+</SCRIPT>
+        </TR>
+        <TR>
+          <TD ALIGN="right">To: </TD>
+          <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><I>m/d/y</I></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "ending_text",
+    ifFormat:   "mm/dd/y",
+    button:     "ending_button",
+    align:      "BR"
+  });
+</SCRIPT>
+        </TR>
+      </TABLE>
+      <BR><INPUT TYPE="submit" VALUE="Get Report">
 
     </FORM>
 
-  <HR>
-
   </BODY>
 </HTML>
 
diff --git a/httemplate/search/report_cc.html b/httemplate/search/report_cc.html
index 8653dcc69..7bbfa40ce 100755
--- a/httemplate/search/report_cc.html
+++ b/httemplate/search/report_cc.html
@@ -1,23 +1,43 @@
 <HTML>
   <HEAD>
     <TITLE>Credit Card Receipt Report Criteria</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Credit Card Receipt Report Criteria</H1>
-    </CENTER>
-    <HR>
+    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>  </HEAD>
+  <BODY BGCOLOR="#e8e8e8">
+    <H1>Credit Card Receipt Report Criteria</H1>
     <FORM ACTION="report_cc.cgi" METHOD="post">
       Return <B>credit card receipt report</B> for period: 
-      from <INPUT TYPE="text" NAME="beginning"> <i>m/d/y</i>
-      to <INPUT TYPE="text" NAME="ending"> <i>m/d/y</i>
+    <TABLE>
+      <TR>
+        <TD ALIGN="right">From: </TD>
+        <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "beginning_text",
+    ifFormat:   "mm/dd/y",
+    button:     "beginning_button",
+    align:      "BR"
+  });
+</SCRIPT>
+      </TR>
+        <TD ALIGN="right">To: </TD>
+        <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "ending_text",
+    ifFormat:   "mm/dd/y",
+    button:     "ending_button",
+    align:      "BR"
+  });
+</SCRIPT>
+      </TR>
+    </TABLE>
 
-      <P><INPUT TYPE="submit" VALUE="Get Report">
+      <BR><INPUT TYPE="submit" VALUE="Get Report">
 
     </FORM>
-
-  <HR>
-
   </BODY>
 </HTML>
 
diff --git a/httemplate/search/report_credit.html b/httemplate/search/report_credit.html
index df9b9581f..310b9cb59 100755
--- a/httemplate/search/report_credit.html
+++ b/httemplate/search/report_credit.html
@@ -1,23 +1,43 @@
 <HTML>
   <HEAD>
     <TITLE>In House Credit Report Criteria</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>In House Credit Report Criteria</H1>
-    </CENTER>
-    <HR>
+    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>  </HEAD>
+  <BODY BGCOLOR="#e8e8e8">
+    <H1>In House Credit Report Criteria</H1>
     <FORM ACTION="report_credit.cgi" METHOD="post">
       Return <B>in house credit report</B> for period: 
-      from <INPUT TYPE="text" NAME="beginning"> <i>m/d/y</i>
-      to <INPUT TYPE="text" NAME="ending"> <i>m/d/y</i>
+    <TABLE>
+      <TR>
+        <TD ALIGN="right">From: </TD>
+        <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "beginning_text",
+    ifFormat:   "mm/dd/y",
+    button:     "beginning_button",
+    align:      "BR"
+  });
+</SCRIPT>
+      </TR>
+        <TD ALIGN="right">To: </TD>
+        <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "ending_text",
+    ifFormat:   "mm/dd/y",
+    button:     "ending_button",
+    align:      "BR"
+  });
+</SCRIPT>
+      </TR>
+    </TABLE>
 
-      <P><INPUT TYPE="submit" VALUE="Get Report">
+    <BR><INPUT TYPE="submit" VALUE="Get Report">
 
     </FORM>
-
-  <HR>
-
   </BODY>
 </HTML>
 
diff --git a/httemplate/search/report_cust_pay.html b/httemplate/search/report_cust_pay.html
index 93053e1ee..9d9fffb16 100644
--- a/httemplate/search/report_cust_pay.html
+++ b/httemplate/search/report_cust_pay.html
@@ -1,24 +1,51 @@
 <HTML>
   <HEAD>
     <TITLE>Payment report criteria</TITLE>
+    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
   </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Payment report criteria</H1>
-    </CENTER>
-    <HR>
+  <BODY BGCOLOR="#e8e8e8">
+    <H1>Payment report criteria</H1>
     <FORM ACTION="cust_pay.cgi" METHOD="post">
     <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
-      Return <SELECT NAME="payby">
-        <OPTION VALUE="">all</OPTION>
-        <OPTION VALUE="CARD">credit card</OPTION>
-        <OPTION VALUE="CHEK">electronic check (ACH)</OPTION>
-        <OPTION VALUE="BILL">check/cash</OPTION>
-      </SELECT> payments for period<BR>
-      from <INPUT TYPE="text" NAME="beginning"> <i>m/d/y</i>
-      to <INPUT TYPE="text" NAME="ending"> <i>m/d/y</i>
-      <P><INPUT TYPE="submit" VALUE="Get Report">
+    <TABLE>
+      <TR>
+        <TD ALIGN="right">Payments of type: </TD>
+        <TD><SELECT NAME="payby">
+              <OPTION VALUE="">all</OPTION>
+              <OPTION VALUE="CARD">credit card</OPTION>
+              <OPTION VALUE="CHEK">electronic check (ACH)</OPTION>
+              <OPTION VALUE="BILL">check/cash</OPTION>
+            </SELECT>
+        </TD>
+      </TR>
+      <TR>
+        <TD ALIGN="right">From: </TD>
+        <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "beginning_text",
+    ifFormat:   "mm/dd/y",
+    button:     "beginning_button",
+    align:      "BR"
+  });
+</SCRIPT>
+      </TR>
+        <TD ALIGN="right">To: </TD>
+        <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "ending_text",
+    ifFormat:   "mm/dd/y",
+    button:     "ending_button",
+    align:      "BR"
+  });
+</SCRIPT>
+      </TR>
+    </TABLE>
+    <BR><INPUT TYPE="submit" VALUE="Get Report">
     </FORM>
-  <HR>
   </BODY>
 </HTML>
diff --git a/httemplate/search/report_tax.html b/httemplate/search/report_tax.html
index 7bf681b42..55b9e097b 100755
--- a/httemplate/search/report_tax.html
+++ b/httemplate/search/report_tax.html
@@ -1,23 +1,43 @@
 <HTML>
   <HEAD>
     <TITLE>Tax Report Criteria</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-      <H1>Tax Report Criteria</H1>
-    </CENTER>
-    <HR>
+    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>  </HEAD>
+  <BODY BGCOLOR="#e8e8e8">
+    <H1>Tax Report Criteria</H1>
     <FORM ACTION="report_tax.cgi" METHOD="post">
-      Return <B>tax report</B> for period: 
-      from <INPUT TYPE="text" NAME="beginning"> <i>m/d/y</i>
-      to <INPUT TYPE="text" NAME="ending"> <i>m/d/y</i>
+      Return <B>tax report</B> for period:
+    <TABLE>
+      <TR>
+        <TD ALIGN="right">From: </TD>
+        <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "beginning_text",
+    ifFormat:   "mm/dd/y",
+    button:     "beginning_button",
+    align:      "BR"
+  });
+</SCRIPT>
+      </TR>
+        <TD ALIGN="right">To: </TD>
+        <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "ending_text",
+    ifFormat:   "mm/dd/y",
+    button:     "ending_button",
+    align:      "BR"
+  });
+</SCRIPT>
+      </TR>
+    </TABLE>
 
-      <P><INPUT TYPE="submit" VALUE="Get Report">
+      <BR><INPUT TYPE="submit" VALUE="Get Report">
 
     </FORM>
-
-  <HR>
-
   </BODY>
 </HTML>
 
-- 
cgit v1.2.1


From d993eaef639b1abd95973b26e7c336fc5e588041 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Sep 2003 12:48:11 +0000
Subject: IE doesn't like downloading MIME type text/comma-separated-values

---
 httemplate/misc/download-batch.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/httemplate/misc/download-batch.cgi b/httemplate/misc/download-batch.cgi
index ecb80d256..306ef5d63 100644
--- a/httemplate/misc/download-batch.cgi
+++ b/httemplate/misc/download-batch.cgi
@@ -1,6 +1,7 @@
 <%
 
-http_header('Content-Type' => 'text/comma-separated-values' );
+#http_header('Content-Type' => 'text/comma-separated-values' ); #IE chokes
+http_header('Content-Type' => 'text/plain' );
 
 for my $cust_pay_batch ( sort { $a->paybatchnum <=> $b->paybatchnum }
                               qsearch('cust_pay_batch', {} )
-- 
cgit v1.2.1


From 021e1ac77366fb0765cb364af0c09f5f2df92266 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Sep 2003 14:58:19 +0000
Subject: agent schema changes

---
 httemplate/docs/upgrade10.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 2f7f4d89a..4a6baa59b 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -74,6 +74,12 @@ ALTER TABLE cust_main_county ADD recurtax char(1) NULL;
 ALTER TABLE h_cust_main_county ADD recurtax char(1) NULL;
 ALTER TABLE cust_pkg ADD last_bill int NULL;
 ALTER TABLE h_cust_pkg ADD last_bill int NULL;
+ALTER TABLE agent ADD disabled char(1) NULL;
+ALTER TABLE h_agent ADD disabled char(1) NULL;
+ALTER TABLE agent ADD username varchar(80) NULL;
+ALTER TABLE h_agent ADD username varchar(80) NULL;
+ALTER TABLE agent ADD _password varchar(80) NULL;
+ALTER TABLE h_agent ADD _password varchar(80) NULL;
 
 dump database, edit:
 - cust_main: increase otaker from 8 to 32
-- 
cgit v1.2.1


From c1dfeada58be61ec33bb1cfb80a2cff73f7c9a3c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Sep 2003 15:01:46 +0000
Subject: no duplicate usernames

---
 FS/FS/agent.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
index bcba602cc..2f70d654d 100644
--- a/FS/FS/agent.pm
+++ b/FS/FS/agent.pm
@@ -125,6 +125,9 @@ sub check {
     $error = $self->ut_alphan('username');
     return $error if $error;
     if ( length($self->username) ) {
+      my $conflict = qsearchs('agent', { 'username' => $self->username } );
+      return 'duplicate agent username (with '. $conflict->agent. ')'
+        if $conflict;
       $error = $self->ut_text('password'); # ut_text... arbitrary choice
     } else {
       $self->_password('');
@@ -165,7 +168,7 @@ sub pkgpart_hashref {
 
 =head1 VERSION
 
-$Id: agent.pm,v 1.5 2003-09-29 05:51:50 ivan Exp $
+$Id: agent.pm,v 1.6 2003-09-30 15:01:46 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 3a24db8efd975633e5c4146fe1e90e6eda7c0d5f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 2 Oct 2003 08:56:54 +0000
Subject: update with dictionaries from freeradius 0.9.1, and fix
 generate-raddb to avoid duplicates

---
 FS/FS/raddb.pm     | 1119 +++++++++++++++++++++++++++++++++++++---------------
 bin/generate-raddb |   18 +-
 2 files changed, 820 insertions(+), 317 deletions(-)

diff --git a/FS/FS/raddb.pm b/FS/FS/raddb.pm
index a35a757f5..efeb739bb 100644
--- a/FS/FS/raddb.pm
+++ b/FS/FS/raddb.pm
@@ -4,1099 +4,1592 @@ use vars qw(%attrib);
 %attrib = (
   'usr_at_zip_output_filter' => 'USR-AT-Zip-Output-Filter',
   'ms_filter' => 'MS-Filter',
+  'annex_compression_protoc' => 'Annex-Compression-Protocol',
+  'xedia_ssh_privileges' => 'Xedia-SSH-Privileges',
   'usr_blocks_received' => 'USR-Blocks-Received',
   'shiva_called_number' => 'Shiva-Called-Number',
   'annex_filter' => 'Annex-Filter',
   'usr_channel_expansion' => 'USR-Channel-Expansion',
+  'erx_tunnel_tos' => 'ERX-Tunnel-Tos',
   'session_timeout' => 'Session-Timeout',
-  'usr_simplified_mnp_level' => 'USR-Simplified-MNP-Levels',
   'ascend_route_ipx' => 'Ascend-Route-IPX',
-  'annex_user_server_locati' => 'Annex-User-Server-Location',
+  'annex_error_correction_p' => 'Annex-Error-Correction-Prot',
   'acc_callback_mode' => 'Acc-Callback-Mode',
   'usr_filter_zones' => 'USR-Filter-Zones',
+  'erx_input_gigapkts' => 'ERX-Input-Gigapkts',
   'ascend_session_svr_key' => 'Ascend-Session-Svr-Key',
-  'le_nat_tcp_session_timeo' => 'LE-NAT-TCP-Session-Timeout',
+  'bind_l2tp_tunnel_namf' => 'Bind_L2TP_Tunnel_Name',
+  'ascend_dsl_cir_recv_limi' => 'Ascend-Dsl-CIR-Recv-Limit',
+  'altiga_secondary_wins_g' => 'Altiga-Secondary-WINS-G',
   'ascend_ts_idle_limit' => 'Ascend-TS-Idle-Limit',
   'usr_port_tap_priority' => 'USR-Port-Tap-Priority',
+  'cvpn3000_ipsec_client_fw' => 'CVPN3000-IPSec-Client-Fw-Filter-Name',
+  'ascend_private_route_req' => 'Ascend-Private-Route-Required',
   'ascend_private_route' => 'Ascend-Private-Route',
   'prompt' => 'Prompt',
   'acct_link_count' => 'Acct-Link-Count',
+  'bind_auth_service_grq' => 'Bind_Auth_Service_Grp',
+  'itk_tunnel_ip' => 'ITK-Tunnel-IP',
   'login_lat_node' => 'Login-LAT-Node',
   'usr_mbi_ct_pri_card_slot' => 'USR-Mbi_Ct_PRI_Card_Slot',
+  'lac_real_poru' => 'LAC_Real_Port',
   'erx_ingress_statistics' => 'ERX-Ingress-Statistics',
+  'digest_nonce' => 'Digest-Nonce',
   'annex_system_disc_reason' => 'Annex-System-Disc-Reason',
+  'pool_name' => 'Pool-Name',
+  'altiga_use_client_addres' => 'Altiga-Use-Client-Address-G/U',
+  'police_bursu' => 'Police_Burst',
   'usr_call_arrival_time' => 'USR-Call-Arrival-Time',
   'ascend_disconnect_cause' => 'Ascend-Disconnect-Cause',
   'ascend_user_acct_time' => 'Ascend-User-Acct-Time',
-  'ascend_appletalk_peer_mo' => 'Ascend-Appletalk-Peer-Mode',
   'chap_challenge' => 'CHAP-Challenge',
   'ascend_mpp_idle_percent' => 'Ascend-MPP-Idle-Percent',
   'ascend_user_acct_port' => 'Ascend-User-Acct-Port',
+  'ldap_group' => 'Ldap-Group',
   'ascend_numbering_plan_id' => 'Ascend-Numbering-Plan-ID',
-  'ascend_access_intercept_' => 'Ascend-Access-Intercept-LEA',
-  'pvc_encapsulation_type' => 'PVC_Encapsulation_Type',
+  'usr_last_number_dialed_o' => 'USR-Last-Number-Dialed-Out',
+  'pvc_encapsulation_type' => 'PVC-Encapsulation-Type',
   'ascend_bir_bridge_group' => 'Ascend-BIR-Bridge-Group',
   'ascend_atm_group' => 'Ascend-ATM-Group',
   'ascend_fr_svc_addr' => 'Ascend-FR-SVC-Addr',
   'x_ascend_send_auth' => 'X-Ascend-Send-Auth',
   'le_ip_pool' => 'LE-IP-Pool',
-  'annex_addr_resolution_se' => 'Annex-Addr-Resolution-Servers',
-  'usr_last_callers_number_' => 'USR-Last-Callers-Number-ANI',
+  'post_proxy_type' => 'Post-Proxy-Type',
+  'wispr_session_terminate_' => 'WISPr-Session-Terminate-Time',
+  'bintec_pppextiftable' => 'BinTec-pppExtIfTable',
+  'nomadix_subnet' => 'Nomadix-Subnet',
   'login_port' => 'Login-Port',
   'ms_chap2_response' => 'MS-CHAP2-Response',
-  'annex_secondary_dns_serv' => 'Annex-Secondary-DNS-Server',
   'ascend_ipsec_profile' => 'Ascend-IPSEC-Profile',
+  'usr_compression_algorith' => 'USR-Compression-Algorithm',
   'usr_accm_type' => 'USR-ACCM-Type',
   'simultaneous_use' => 'Simultaneous-Use',
+  'cisco_account_info' => 'Cisco-Account-Info',
   'framed_protocol' => 'Framed-Protocol',
+  'erx_tunnel_maximum_sessi' => 'ERX-Tunnel-Maximum-Sessions',
+  'redcreek_tunneled_wins_t' => 'RedCreek-Tunneled-WINS-Server2',
   'ascend_recv_name' => 'Ascend-Recv-Name',
   'usr_call_connecting_time' => 'USR-Call-Connecting-Time',
-  'tunnel_remote_name' => 'Tunnel_Remote_Name',
+  'quintum_h323_gw_id' => 'Quintum-h323-gw-id',
+  'acct_dyn_ac_ent' => 'Acct-Dyn-Ac-Ent',
+  'tunnel_remote_name' => 'Tunnel-Remote-Name',
+  'annex_ppp_trace_level' => 'Annex-PPP-Trace-Level',
+  'cisco_call_type' => 'Cisco-Call-Type',
+  'cisco_fax_recipient_coun' => 'Cisco-Fax-Recipient-Count',
+  'altiga_ipsec_authenticat' => 'Altiga-IPSec-Authentication-G',
+  'wispr_location_id' => 'WISPr-Location-ID',
+  'itk_start_delay' => 'ITK-Start-Delay',
+  'ascend_pre_output_packet' => 'Ascend-Pre-Output-Packets',
+  'usr_rmmie_firmware_versi' => 'USR-RMMIE-Firmware-Version',
   'usr_vts_session_key' => 'USR-VTS-Session-Key',
   'ascend_fr_dce_n393' => 'Ascend-FR-DCE-N393',
   'login_host' => 'Login-Host',
   'usr_reply_script3' => 'USR-Reply-Script3',
+  'cvpn3000_ipsec_split_tuo' => 'CVPN3000-IPSec-Split-Tunneling-Policy',
   'ascend_pppoe_enable' => 'Ascend-PPPoE-Enable',
   'annex_primary_dns_server' => 'Annex-Primary-DNS-Server',
   'x_ascend_bridge_address' => 'X-Ascend-Bridge-Address',
   'usr_number_of_link_naks' => 'USR-Number-of-Link-NAKs',
+  'altiga_priority_on_sep_g' => 'Altiga-Priority-on-SEP-G/U',
   'annex_cli_command' => 'Annex-CLI-Command',
   'usr_pw_framed_routing_v2' => 'USR-PW_Framed_Routing_V2',
-  'usr_tunnel_switch_endpoi' => 'USR-Tunnel-Switch-Endpoint',
+  'session_error_codf' => 'Session_Error_Code',
+  'annex_user_server_locati' => 'Annex-User-Server-Location',
+  'cisco_fax_mdn_address' => 'Cisco-Fax-Mdn-Address',
+  'ascend_calling_subaddres' => 'Ascend-Calling-Subaddress',
   'ascend_call_by_call' => 'Ascend-Call-By-Call',
   'ascend_first_dest' => 'Ascend-First-Dest',
-  'usr_appletalk_network_ra' => 'USR-Appletalk-Network-Range',
   'annex_tunnel_authen_type' => 'Annex-Tunnel-Authen-Type',
+  'acct_type' => 'Acct-Type',
   'sql_user_name' => 'SQL-User-Name',
   'erx_secondary_dns' => 'ERX-Secondary-Dns',
+  'bridge_grouq' => 'Bridge_Group',
   'h323_return_code' => 'h323-return-code',
   'annex_host_allow' => 'Annex-Host-Allow',
+  'cvx_modem_end_recv_line_' => 'CVX-Modem-End-Recv-Line-Lvl',
+  'sip_method' => 'Sip-Method',
   'x_ascend_require_auth' => 'X-Ascend-Require-Auth',
+  'cvpn3000_sep_card_assign' => 'CVPN3000-SEP-Card-Assignment',
   'le_ipsec_deny_action' => 'LE-IPSec-Deny-Action',
   'annex_edo' => 'Annex-EDO',
   'acct_delay_time' => 'Acct-Delay-Time',
-  'ascend_call_block_durati' => 'Ascend-Call-Block-Duration',
   'login_tcp_port' => 'Login-TCP-Port',
   'ascend_temporary_rtes' => 'Ascend-Temporary-Rtes',
+  'versanet_termination_cau' => 'Versanet-Termination-Cause',
   'ascend_dialed_number' => 'Ascend-Dialed-Number',
-  'x_ascend_dec_channel_cou' => 'X-Ascend-Dec-Channel-Count',
+  'cvpn3000_ipsec_authentic' => 'CVPN3000-IPSec-Authentication',
   'ascend_fr_dlci' => 'Ascend-FR-DLCI',
   'annex_modem_disc_reason' => 'Annex-Modem-Disc-Reason',
   'x_ascend_receive_secret' => 'X-Ascend-Receive-Secret',
+  'usr_ospf_addressless_ind' => 'USR-OSPF-Addressless-Index',
+  'usr_ip_default_route_opt' => 'USR-IP-Default-Route-Option',
   'char_noecho' => 'Char-Noecho',
+  'redcreek_tunneled_search' => 'RedCreek-Tunneled-Search-List',
   'ascend_pri_number_type' => 'Ascend-PRI-Number-Type',
-  'ascend_dsl_upstream_limi' => 'Ascend-Dsl-Upstream-Limit',
+  'aat_ip_tos_apply_to' => 'AAT-IP-TOS-Apply-To',
   'x_ascend_modem_shelfno' => 'X-Ascend-Modem-ShelfNo',
   'prefix' => 'Prefix',
   'usr_rad_dvmrp_metric' => 'USR-Rad-Dvmrp-Metric',
+  'x_ascend_call_attempt_li' => 'X-Ascend-Call-Attempt-Limit',
   'usr_ip_saa_filter' => 'USR-IP-SAA-Filter',
-  'ms_link_utilization_thre' => 'MS-Link-Utilization-Threshold',
+  'itk_prompt' => 'ITK-Prompt',
+  'ascend_port_redir_protoc' => 'Ascend-Port-Redir-Protocol',
+  'cvx_modem_tx_packets' => 'CVX-Modem-Tx-Packets',
+  'usr_tunnel_switch_endpoi' => 'USR-Tunnel-Switch-Endpoint',
   'ascend_home_network_name' => 'Ascend-Home-Network-Name',
   'acc_customer_id' => 'Acc-Customer-Id',
   'message_authenticator' => 'Message-Authenticator',
-  'ascend_secondary_home_ag' => 'Ascend-Secondary-Home-Agent',
-  'x_ascend_pre_output_octe' => 'X-Ascend-Pre-Output-Octets',
+  'cisco_fax_coverpage_flag' => 'Cisco-Fax-Coverpage-Flag',
   'usr_multicast_forwarding' => 'USR-Multicast-Forwarding',
+  'cvpn3000_allow_network_e' => 'CVPN3000-Allow-Network-Extension-Mode',
   'ascend_call_direction' => 'Ascend-Call-Direction',
   'acc_connect_rx_speed' => 'Acc-Connect-Rx-Speed',
   'ascend_force_56' => 'Ascend-Force-56',
+  'st_service_domain' => 'ST-Service-Domain',
   'usr_harc_disconnect_code' => 'USR-HARC-Disconnect-Code',
   'shasta_service_profile' => 'Shasta-Service-Profile',
   'cisco_maximum_time' => 'Cisco-Maximum-Time',
   'usr_tunnel_auth_hostname' => 'USR-Tunnel-Auth-Hostname',
-  'ascend_client_assign_win' => 'Ascend-Client-Assign-WINS',
-  'acc_modem_modulation_typ' => 'Acc-Modem-Modulation-Type',
   'acc_ip_gateway_pri' => 'Acc-Ip-Gateway-Pri',
   'ascend_bridge_address' => 'Ascend-Bridge-Address',
+  'altiga_pptp_min_authenti' => 'Altiga-PPTP-Min-Authentication-G/U',
+  'ns_secondary_wins' => 'NS-Secondary-WINS',
+  'cbbsm_bandwidth' => 'CBBSM-Bandwidth',
   'x_ascend_fr_link_mgt' => 'X-Ascend-FR-Link-Mgt',
+  'altiga_ipsec_banner_g' => 'Altiga-IPSec-Banner-G',
   'ascend_handle_ipx' => 'Ascend-Handle-IPX',
   'ascend_x25_pad_alias_2' => 'Ascend-X25-Pad-Alias-2',
+  'st_policy_name' => 'ST-Policy-Name',
   'ascend_group' => 'Ascend-Group',
   'ascend_dsl_rate_type' => 'Ascend-Dsl-Rate-Type',
+  'tunnel_contexu' => 'Tunnel_Context',
   'ascend_require_auth' => 'Ascend-Require-Auth',
+  'cvx_modem_local_retrains' => 'CVX-Modem-Local-Retrains',
+  'cvpn5000_echo' => 'CVPN5000-Echo',
+  'cvx_secondary_dns' => 'CVX-Secondary-DNS',
   'x_ascend_billing_number' => 'X-Ascend-Billing-Number',
   'usr_orig_nas_type' => 'USR-Orig-NAS-Type',
   'ascend_remote_fw' => 'Ascend-Remote-FW',
   'acct_output_packets' => 'Acct-Output-Packets',
   'lm_password' => 'LM-Password',
-  'tunnel_window' => 'Tunnel_Window',
-  'x_ascend_link_compressio' => 'X-Ascend-Link-Compression',
-  'x_ascend_base_channel_co' => 'X-Ascend-Base-Channel-Count',
+  'tunnel_window' => 'Tunnel-Window',
   'cisco_avpair' => 'Cisco-AVPair',
+  'st_service_name' => 'ST-Service-Name',
   'shiva_event_flags' => 'Shiva-Event-Flags',
-  'usr_number_of_rings_limi' => 'USR-Number-of-Rings-Limit',
+  'annex_retrain_requests_s' => 'Annex-Retrain-Requests-Sent',
   'ascend_ts_idle_mode' => 'Ascend-TS-Idle-Mode',
-  'ascend_bi_directional_au' => 'Ascend-Bi-Directional-Auth',
+  'usr_ip_rip_simple_auth_p' => 'USR-IP-RIP-Simple-Auth-Password',
+  'tunnel_deadtimf' => 'Tunnel_Deadtime',
   'state' => 'State',
   'usr_keypress_timeout' => 'USR-Keypress-Timeout',
   'usr_pw_vpn_neighbor' => 'USR-PW_VPN_Neighbor',
+  'erx_pppoe_description' => 'ERX-Pppoe-Description',
   'ldap_userdn' => 'Ldap-UserDn',
   'x_ascend_fr_n391' => 'X-Ascend-FR-N391',
-  'ascend_tunneling_protoco' => 'Ascend-Tunneling-Protocol',
+  'ascend_calling_id_presen' => 'Ascend-Calling-Id-Presentatn',
+  'erx_local_loopback_inter' => 'ERX-Local-Loopback-Interface',
   'x_ascend_fr_direct' => 'X-Ascend-FR-Direct',
   'nas_ip_address' => 'NAS-IP-Address',
   'usr_call_end_time' => 'USR-Call-End-Time',
-  'tunnel_algorithm' => 'Tunnel_Algorithm',
+  'acct_mcast_out_packett' => 'Acct_Mcast_Out_Packets',
+  'tunnel_algorithm' => 'Tunnel-Algorithm',
   'usr_vpn_encrypter' => 'USR-VPN-Encrypter',
+  'tunnel_grouq' => 'Tunnel_Group',
   'ascend_atm_connect_group' => 'Ascend-ATM-Connect-Group',
   'x_ascend_ft1_caller' => 'X-Ascend-FT1-Caller',
+  'usr_dnis_reauthenticatio' => 'USR-DNIS-ReAuthentication',
   'login_callback_number' => 'Login-Callback-Number',
   'usr_ip_rip_input_filter' => 'USR-IP-RIP-Input-Filter',
-  'usr_rmmie_last_update_ev' => 'USR-RMMIE-Last-Update-Event',
+  'usr_rmmie_rcv_pwrlvl_330' => 'USR-RMMIE-Rcv-PwrLvl-3300Hz',
   'h323_disconnect_cause' => 'h323-disconnect-cause',
   'x_ascend_handle_ipx' => 'X-Ascend-Handle-IPX',
   'usr_igmp_version' => 'USR-IGMP-Version',
   'usr_imsi' => 'USR-IMSI',
   'group_name' => 'Group-Name',
   'usr_nas_type' => 'USR-NAS-Type',
+  'context_namf' => 'Context-Name',
   'ascend_ip_tos' => 'Ascend-IP-TOS',
   'x_ascend_token_immediate' => 'X-Ascend-Token-Immediate',
-  'ascend_private_route_tab' => 'Ascend-Private-Route-Table-ID',
+  'tunnel_session_auth_serw' => 'Tunnel_Session_Auth_Service_Grp',
   'ms_chap2_cpw' => 'MS-CHAP2-CPW',
-  'tunnel_session_auth_ctx' => 'Tunnel_Session_Auth_Ctx',
+  'tunnel_session_auth_ctx' => 'Tunnel-Session-Auth-Ctx',
   'usr_mobile_numbytes_rxed' => 'USR-Mobile-NumBytes-Rxed',
   'usr_mbi_ct_tdm_time_slot' => 'USR-Mbi_Ct_TDM_Time_Slot',
   'ascend_x25_nui' => 'Ascend-X25-Nui',
   'x_ascend_first_dest' => 'X-Ascend-First-Dest',
-  'x_ascend_num_in_multilin' => 'X-Ascend-Num-In-Multilink',
   'usr_send_password' => 'USR-Send-Password',
+  'x_ascend_fr_direct_profi' => 'X-Ascend-FR-Direct-Profile',
   'x_ascend_fr_t391' => 'X-Ascend-FR-T391',
+  'altiga_ipsec_sec_associa' => 'Altiga-IPSec-Sec-Association-G/U',
+  'ip_address_pool_namf' => 'Ip_Address_Pool_Name',
   'acct_input_octets' => 'Acct-Input-Octets',
-  'bridge_group' => 'Bridge_Group',
+  'cvx_modem_begin_modulati' => 'CVX-Modem-Begin-Modulation',
+  'wispr_session_terminatea' => 'WISPr-Session-Terminate-End-Of-Day',
+  'cvpn3000_use_client_addr' => 'CVPN3000-Use-Client-Address',
+  'bridge_group' => 'Bridge-Group',
   'annex_sec_profile_index' => 'Annex-Sec-Profile-Index',
   'acc_dns_server_pri' => 'Acc-Dns-Server-Pri',
   'ms_acct_auth_type' => 'MS-Acct-Auth-Type',
+  'x_ascend_maximum_call_du' => 'X-Ascend-Maximum-Call-Duration',
   'tunnel_password' => 'Tunnel-Password',
+  'framed_ipv6_prefix' => 'Framed-IPv6-Prefix',
   'usr_reply_script5' => 'USR-Reply-Script5',
   'shiva_links_in_bundle' => 'Shiva-Links-In-Bundle',
   'ascend_fr_profile_name' => 'Ascend-FR-Profile-Name',
   'ascend_mtu' => 'Ascend-MTU',
+  'nokia_charging_id' => 'Nokia-Charging-Id',
+  'cvpn3000_ms_client_subne' => 'CVPN3000-MS-Client-Subnet-Mask',
+  'cvpn3000_ipsec_sec_assoc' => 'CVPN3000-IPSec-Sec-Association',
   'cisco_ppp_async_map' => 'Cisco-PPP-Async-Map',
+  'cvpn3000_user_auth_servf' => 'CVPN3000-User-Auth-Server-Port',
   'cisco_num_in_multilink' => 'Cisco-Num-In-Multilink',
+  'wispr_logoff_url' => 'WISPr-Logoff-URL',
   'usr_mobile_ip_address' => 'USR-Mobile-IP-Address',
+  'usr_final_tx_link_data_r' => 'USR-Final-Tx-Link-Data-Rate',
+  'itk_ppp_compression_prot' => 'ITK-PPP-Compression-Prot',
   'ascend_bridge' => 'Ascend-Bridge',
   'x_ascend_presession_time' => 'X-Ascend-PreSession-Time',
-  'tunnel_cmd_timeout' => 'Tunnel_Cmd_Timeout',
+  'aat_client_primary_dns' => 'AAT-Client-Primary-DNS',
+  'cvpn3000_strip_realm' => 'CVPN3000-Strip-Realm',
+  'tunnel_cmd_timeout' => 'Tunnel-Cmd-Timeout',
   'ascend_multicast_client' => 'Ascend-Multicast-Client',
+  'cvx_modem_remote_rate_ne' => 'CVX-Modem-Remote-Rate-Negs',
   'tunnel_private_group_id' => 'Tunnel-Private-Group-Id',
   'usr_rmmie_rcv_tot_pwrlvl' => 'USR-RMMIE-Rcv-Tot-PwrLvl',
   'calling_station_id' => 'Calling-Station-Id',
-  'tunnel_rate_limit_burst' => 'Tunnel_Rate_Limit_Burst',
+  'tunnel_rate_limit_burst' => 'Tunnel-Rate-Limit-Burst',
   'usr_device_connected_to' => 'USR-Device-Connected-To',
+  'aat_source_ip_check' => 'AAT-Source-IP-Check',
   'login_lat_service' => 'Login-LAT-Service',
-  'x_ascend_home_network_na' => 'X-Ascend-Home-Network-Name',
   'ascend_h323_fegw_address' => 'Ascend-H323-Fegw-Address',
   'usr_called_party_number' => 'USR-Called-Party-Number',
+  'bintec_ipnatpresettable' => 'BinTec-ipNatPresetTable',
   'ascend_remove_seconds' => 'Ascend-Remove-Seconds',
   'shiva_user_attributes' => 'Shiva-User-Attributes',
+  'cisco_fax_dsn_flag' => 'Cisco-Fax-Dsn-Flag',
   'x_ascend_route_ipx' => 'X-Ascend-Route-IPX',
   'acc_route_policy' => 'Acc-Route-Policy',
+  'bind_l2tp_flow_controm' => 'Bind_L2TP_Flow_Control',
+  'erx_qos_profile_name' => 'ERX-Qos-Profile-Name',
   'x_ascend_client_gateway' => 'X-Ascend-Client-Gateway',
-  'ms_mppe_encryption_polic' => 'MS-MPPE-Encryption-Policy',
+  'pre_proxy_type' => 'Pre-Proxy-Type',
+  'smb_account_ctrl_text' => 'SMB-Account-CTRL-TEXT',
   'x_ascend_data_filter' => 'X-Ascend-Data-Filter',
+  'usr_rmmie_last_update_ti' => 'USR-RMMIE-Last-Update-Time',
   'ascend_atm_direct' => 'Ascend-ATM-Direct',
   'ascend_session_type' => 'Ascend-Session-Type',
   'x_ascend_fr_linkup' => 'X-Ascend-FR-LinkUp',
   'ascend_metric' => 'Ascend-Metric',
+  'x_ascend_assign_ip_clien' => 'X-Ascend-Assign-IP-Client',
   'usr_speed_of_connection' => 'USR-Speed-Of-Connection',
+  'cvpn3000_require_hw_clie' => 'CVPN3000-Require-HW-Client-Auth',
+  'session_type' => 'Session-Type',
+  'acct_input_octets_65' => 'Acct_Input_Octets_64',
   'le_nat_outsource_outmap' => 'LE-NAT-Outsource-Outmap',
-  'pppoe_url' => 'PPPOE_URL',
-  'acct_mcast_out_octets' => 'Acct_Mcast_Out_Octets',
+  'cvx_modem_local_rate_neg' => 'CVX-Modem-Local-Rate-Negs',
+  'mcast_sene' => 'Mcast_Send',
+  'pppoe_url' => 'PPPOE-URL',
+  'erx_service_bundle' => 'ERX-Service-Bundle',
+  'altiga_secondary_dns_g' => 'Altiga-Secondary-DNS-G',
+  'bg_trans_bpdv' => 'BG_Trans_BPDU',
+  'cvx_data_filter' => 'CVX-Data-Filter',
+  'acct_mcast_out_octets' => 'Acct-Mcast-Out-Octets',
   'ascend_callback' => 'Ascend-Callback',
   'tunnel_client_auth_id' => 'Tunnel-Client-Auth-Id',
   'acct_unique_session_id' => 'Acct-Unique-Session-Id',
   'usr_port_tap_format' => 'USR-Port-Tap-Format',
   'ascend_ckt_type' => 'Ascend-Ckt-Type',
   'ascend_ppp_async_map' => 'Ascend-PPP-Async-Map',
+  'usr_rmmie_rcv_pwrlvl_375' => 'USR-RMMIE-Rcv-PwrLvl-3750Hz',
   'usr_acct_reason_code' => 'USR-Acct-Reason-Code',
   'ascend_filter' => 'Ascend-Filter',
   'h323_redirect_number' => 'h323-redirect-number',
   'port_limit' => 'Port-Limit',
-  'x_ascend_shared_profile_' => 'X-Ascend-Shared-Profile-Enable',
-  'tunnel_police_rate' => 'Tunnel_Police_Rate',
-  'ascend_calling_id_screen' => 'Ascend-Calling-Id-Screening',
+  'rewrite_rule' => 'Rewrite-Rule',
+  'tunnel_police_rate' => 'Tunnel-Police-Rate',
   'usr_multicast_proxy' => 'USR-Multicast-Proxy',
+  'ascend_max_shared_users' => 'Ascend-Max-Shared-Users',
   'usr_bridging' => 'USR-Bridging',
-  'usr_originate_answer_mod' => 'USR-Originate-Answer-Mode',
+  'cvx_presession_time' => 'CVX-PreSession-Time',
+  'cvpn5000_vpn_groupinfo' => 'CVPN5000-VPN-GroupInfo',
+  'autz_type' => 'Autz-Type',
   'x_ascend_fr_dlci' => 'X-Ascend-FR-DLCI',
   'usr_request_type' => 'USR-Request-Type',
-  'acc_dialout_auth_usernam' => 'Acc-Dialout-Auth-Username',
+  'acc_igmp_admin_state' => 'Acc-Igmp-Admin-State',
   'ascend_host_info' => 'Ascend-Host-Info',
+  'ascend_dhcp_maximum_leas' => 'Ascend-DHCP-Maximum-Leases',
   'usr_rmmie_num_of_updates' => 'USR-RMMIE-Num-Of-Updates',
   'x_ascend_fr_profile_name' => 'X-Ascend-FR-Profile-Name',
   'ascend_fr_direct_profile' => 'Ascend-FR-Direct-Profile',
   'x_ascend_bridge' => 'X-Ascend-Bridge',
-  'tunnel_deadtime' => 'Tunnel_Deadtime',
+  'tunnel_deadtime' => 'Tunnel-Deadtime',
   'ms_chap_error' => 'MS-CHAP-Error',
   'framed_route' => 'Framed-Route',
+  'sip_from' => 'Sip-From',
   'expiration' => 'Expiration',
   'ascend_backup' => 'Ascend-Backup',
   'ascend_pre_output_octets' => 'Ascend-Pre-Output-Octets',
+  'ascend_calling_id_number' => 'Ascend-Calling-Id-Number-Plan',
   'framed_appletalk_zone' => 'Framed-AppleTalk-Zone',
   'annex_audit_level' => 'Annex-Audit-Level',
-  'bind_auth_context' => 'Bind_Auth_Context',
-  'cisco_asing_ip_pool' => 'Cisco-Asing-IP-Pool',
+  'digest_algorithm' => 'Digest-Algorithm',
+  'bind_auth_context' => 'Bind-Auth-Context',
   'ascend_user_acct_base' => 'Ascend-User-Acct-Base',
-  'mcast_receive' => 'Mcast_Receive',
+  'st_secondary_dns_server' => 'ST-Secondary-DNS-Server',
+  'mcast_receive' => 'Mcast-Receive',
   'usr_ds0' => 'USR-DS0',
+  'aat_atm_traffic_profile' => 'AAT-ATM-Traffic-Profile',
   'ms_ras_vendor' => 'MS-RAS-Vendor',
-  'tunnel_domain' => 'Tunnel_Domain',
-  'usr_secondary_nbns_serve' => 'USR-Secondary_NBNS_Server',
-  'tunnel_max_sessions' => 'Tunnel_Max_Sessions',
+  'tunnel_domain' => 'Tunnel-Domain',
+  'tunnel_max_sessions' => 'Tunnel-Max-Sessions',
   'ascend_ip_direct' => 'Ascend-IP-Direct',
+  'xedia_address_pool' => 'Xedia-Address-Pool',
   'idle_timeout' => 'Idle-Timeout',
+  'tunnel_rate_limit_ratf' => 'Tunnel_Rate_Limit_Rate',
+  'annex_rate_reneg_req_sen' => 'Annex-Rate-Reneg-Req-Sent',
+  'usr_initial_tx_link_data' => 'USR-Initial-Tx-Link-Data-Rate',
   'tunnel_server_auth_id' => 'Tunnel-Server-Auth-Id',
+  'cvpn3000_ipsec_banner1' => 'CVPN3000-IPSec-Banner1',
   'usr_start_time' => 'USR-Start-Time',
   'usr_ip' => 'USR-IP',
+  'cvpn3000_reqrd_client_fw' => 'CVPN3000-Reqrd-Client-Fw-Vendor-Code',
+  'altiga_ipsec_secondary_d' => 'Altiga-IPSec-Secondary-Domains-G',
   'usr_gateway_ip_address' => 'USR-Gateway-IP-Address',
-  'usr_number_of_characters' => 'USR-Number-Of-Characters-Lost',
   'ascend_dba_monitor' => 'Ascend-DBA-Monitor',
+  'ms_link_utilization_thre' => 'MS-Link-Utilization-Threshold',
+  'st_primary_dns_server' => 'ST-Primary-DNS-Server',
+  'acc_ace_token_ttl' => 'Acc-Ace-Token-Ttl',
   'ms_chap_domain' => 'MS-CHAP-Domain',
   'cisco_pre_input_octets' => 'Cisco-Pre-Input-Octets',
+  'ascend_primary_home_agen' => 'Ascend-Primary-Home-Agent',
   'acct_session_time' => 'Acct-Session-Time',
   'framed_ip_address' => 'Framed-IP-Address',
-  'x_ascend_ip_pool_definit' => 'X-Ascend-IP-Pool-Definition',
-  'erx_alternate_cli_access' => 'ERX-Alternate-Cli-Access-Level',
-  'medium_type' => 'Medium_Type',
-  'acct_output_octets_64' => 'Acct_Output_Octets_64',
+  'ns_admin_privilege' => 'NS-Admin-Privilege',
+  'medium_type' => 'Medium-Type',
+  'acct_output_octets_64' => 'Acct-Output-Octets-64',
   'ascend_cir_timer' => 'Ascend-CIR-Timer',
-  'police_rate' => 'Police_Rate',
+  'police_rate' => 'Police-Rate',
+  'tunnel_functioo' => 'Tunnel_Function',
+  'quintum_h323_time_and_da' => 'Quintum-h323-time-and-day',
+  'ip_tos_fiele' => 'IP_TOS_Field',
+  'erx_framed_ip_route_tag' => 'ERX-Framed-Ip-Route-Tag',
   'ms_mppe_send_key' => 'MS-MPPE-Send-Key',
-  'ascend_multicast_gleave_' => 'Ascend-Multicast-GLeave-Delay',
+  'ascend_maximum_call_dura' => 'Ascend-Maximum-Call-Duration',
+  'pppoe_motn' => 'PPPOE_MOTM',
+  'lac_poru' => 'LAC_Port',
+  'bind_dot1q_slou' => 'Bind_Dot1q_Slot',
+  'ascend_secondary_home_ag' => 'Ascend-Secondary-Home-Agent',
+  'usr_ip_call_output_filte' => 'USR-IP-Call-Output-Filter',
   'x_ascend_host_info' => 'X-Ascend-Host-Info',
   'erx_egress_policy_name' => 'ERX-Egress-Policy-Name',
+  'erx_ppp_password' => 'ERX-PPP-Password',
   'user_name' => 'User-Name',
-  'bind_bypass_bypass' => 'Bind_Bypass_Bypass',
+  'usr_number_of_characters' => 'USR-Number-Of-Characters-Lost',
+  'bind_bypass_bypass' => 'Bind-Bypass-Bypass',
+  'usr_rad_multicast_routip' => 'USR-Rad-Multicast-Routing-Proto',
   'annex_acct_servers' => 'Annex-Acct-Servers',
+  'cvpn5000_tunnel_throughp' => 'CVPN5000-Tunnel-Throughput',
   'usr_chassis_call_channel' => 'USR-Chassis-Call-Channel',
   'annex_input_filter' => 'Annex-Input-Filter',
-  'ascend_home_agent_passwo' => 'Ascend-Home-Agent-Password',
+  'wispr_billing_class_of_s' => 'WISPr-Billing-Class-Of-Service',
   'nas_port_type' => 'NAS-Port-Type',
+  'cvx_client_assign_dns' => 'CVX-Client-Assign-DNS',
+  'nomadix_maxbytesdown' => 'Nomadix-MaxBytesDown',
   'ascend_endpoint_disc' => 'Ascend-Endpoint-Disc',
-  'tunnel_police_burst' => 'Tunnel_Police_Burst',
-  'bind_auth_max_sessions' => 'Bind_Auth_Max_Sessions',
+  'tunnel_police_burst' => 'Tunnel-Police-Burst',
+  'bind_auth_max_sessions' => 'Bind-Auth-Max-Sessions',
+  'cvx_identification' => 'CVX-Identification',
+  'cvpn3000_ipsec_allow_pas' => 'CVPN3000-IPSec-Allow-Passwd-Store',
+  'ascend_calling_id_type_o' => 'Ascend-Calling-Id-Type-Of-Num',
   'x_ascend_fr_dce_n392' => 'X-Ascend-FR-DCE-N392',
   'usr_connect_term_reason' => 'USR-Connect-Term-Reason',
-  'usr_mbi_ct_pri_card_span' => 'USR-Mbi_Ct_PRI_Card_Span_Line',
   'erx_egress_statistics' => 'ERX-Egress-Statistics',
   'ascend_fr_dte_n392' => 'Ascend-FR-DTE-N392',
   'usr_esn' => 'USR-ESN',
   'x_ascend_fr_dte_n392' => 'X-Ascend-FR-DTE-N392',
+  'itk_modem_init_string' => 'ITK-Modem-Init-String',
   'x_ascend_fr_nailed_grp' => 'X-Ascend-FR-Nailed-Grp',
   'ascend_bridge_non_pppoe' => 'Ascend-Bridge-Non-PPPoE',
+  'cvpn3000_ipsec_reqrd_cli' => 'CVPN3000-IPSec-Reqrd-Client-Fw-Cap',
   'ascend_ipx_alias' => 'Ascend-IPX-Alias',
   'acc_tunnel_port' => 'Acc-Tunnel-Port',
+  'quintum_h323_return_code' => 'Quintum-h323-return-code',
+  'cvpn3000_l2tp_encryption' => 'CVPN3000-L2TP-Encryption',
   'acct_input_gigawords' => 'Acct-Input-Gigawords',
+  'bind_dot1q_poru' => 'Bind_Dot1q_Port',
+  'altiga_primary_wins_g' => 'Altiga-Primary-WINS-G',
   'ascend_maximum_channels' => 'Ascend-Maximum-Channels',
+  'x_ascend_home_agent_pass' => 'X-Ascend-Home-Agent-Password',
   'x_ascend_ppp_async_map' => 'X-Ascend-PPP-Async-Map',
+  'usr_rmmie_manufacturer_i' => 'USR-RMMIE-Manufacturer-ID',
   'usr_retrains_requested' => 'USR-Retrains-Requested',
   'x_ascend_metric' => 'X-Ascend-Metric',
   'acc_apsm_oversubscribed' => 'Acc-Apsm-Oversubscribed',
+  'usr_originate_answer_mod' => 'USR-Originate-Answer-Mode',
   'erx_atm_pcr' => 'ERX-Atm-PCR',
+  'itk_nas_name' => 'ITK-NAS-Name',
   'usr_ipx_routing' => 'USR-IPX-Routing',
   'usr_tunneled_mlpp' => 'USR-Tunneled-MLPP',
   'usr_send_script5' => 'USR-Send-Script5',
   'ascend_traffic_shaper' => 'Ascend-Traffic-Shaper',
+  'ascend_client_secondarya' => 'Ascend-Client-Secondary-DNS',
   'ascend_bacp_enable' => 'Ascend-BACP-Enable',
+  'usr_call_terminate_in_gm' => 'USR-Call-Terminate-in-GMT',
   'login_time' => 'Login-Time',
+  'bg_path_cosu' => 'BG_Path_Cost',
+  'aat_require_auth' => 'AAT-Require-Auth',
+  'cvpn3000_reqrd_client_fy' => 'CVPN3000-Reqrd-Client-Fw-Description',
   'ascend_call_type' => 'Ascend-Call-Type',
   'erx_address_pool_name' => 'ERX-Address-Pool-Name',
+  'cvpn3000_ipsec_backup_sf' => 'CVPN3000-IPSec-Backup-Server-List',
   'h323_incoming_conf_id' => 'h323-incoming-conf-id',
+  'user_profile' => 'User-Profile',
+  'ip_host_adds' => 'Ip_Host_Addr',
+  'ns_primary_wins' => 'NS-Primary-WINS',
   'packet_type' => 'Packet-Type',
+  'bind_auth_max_sessiont' => 'Bind_Auth_Max_Sessions',
+  'altiga_allow_alpha_only_' => 'Altiga-Allow-Alpha-Only-Passwords-G',
   'usr_security_resp_limit' => 'USR-Security-Resp-Limit',
-  'ip_address_pool_name' => 'Ip_Address_Pool_Name',
-  'ascend_cbcp_trunk_group' => 'Ascend-CBCP-Trunk-Group',
+  'ip_address_pool_name' => 'Ip-Address-Pool-Name',
   'ascend_ipx_node_addr' => 'Ascend-IPX-Node-Addr',
+  'ascend_cbcp_trunk_group' => 'Ascend-CBCP-Trunk-Group',
   'ascend_menu_selector' => 'Ascend-Menu-Selector',
+  'ascend_assign_ip_global_' => 'Ascend-Assign-IP-Global-Pool',
   'usr_ds0s' => 'USR-DS0s',
   'usr_actual_voltage' => 'USR-Actual-Voltage',
+  'quintum_h323_call_type' => 'Quintum-h323-call-type',
   'annex_sw_version' => 'Annex-SW-Version',
-  'ascend_history_weigh_typ' => 'Ascend-History-Weigh-Type',
   'ascend_receive_secret' => 'Ascend-Receive-Secret',
+  'bintec_qospolicytable' => 'BinTec-qosPolicyTable',
   'usr_ip_rip_policies' => 'USR-IP-RIP-Policies',
+  'redcreek_tunneled_ip_add' => 'RedCreek-Tunneled-IP-Addr',
   'ascend_pw_warntime' => 'Ascend-PW-Warntime',
-  'x_ascend_assign_ip_serve' => 'X-Ascend-Assign-IP-Server',
-  'tunnel_session_auth_serv' => 'Tunnel_Session_Auth_Service_Grp',
+  'x_ascend_inc_channel_cou' => 'X-Ascend-Inc-Channel-Count',
   'usr_blocks_resent' => 'USR-Blocks-Resent',
   'usr_fallback_enabled' => 'USR-Fallback-Enabled',
   'arap_challenge_response' => 'ARAP-Challenge-Response',
-  'tunnel_session_auth' => 'Tunnel_Session_Auth',
+  'tunnel_session_auth' => 'Tunnel-Session-Auth',
   'usr_sync_async_mode' => 'USR-Sync-Async-Mode',
+  'itk_dialout_type' => 'ITK-Dialout-Type',
+  'extreme_netlogin_url' => 'Extreme-Netlogin-Url',
   'client_port_dnis' => 'Client-Port-DNIS',
+  'digest_realm' => 'Digest-Realm',
   'ascend_ppp_vj_1172' => 'Ascend-PPP-VJ-1172',
-  'ascend_remote_addr' => 'Ascend-Remote-Addr',
   'ascend_fr_n391' => 'Ascend-FR-N391',
+  'ascend_remote_addr' => 'Ascend-Remote-Addr',
   'client_port_id' => 'Client-Port-Id',
-  'usr_num_fax_pages_proces' => 'USR-Num-Fax-Pages-Processed',
+  'digest_body_digest' => 'Digest-Body-Digest',
   'le_ipsec_active_profile' => 'LE-IPSec-Active-Profile',
+  'digest_cnonce' => 'Digest-CNonce',
   'usr_port_tap_facility' => 'USR-Port-Tap-Facility',
   'usr_callback_type' => 'USR-Callback-Type',
+  'client_dns_prj' => 'Client_DNS_Pri',
+  'digest_response' => 'Digest-Response',
   'login_lat_group' => 'Login-LAT-Group',
   'x_ascend_call_type' => 'X-Ascend-Call-Type',
   'ascend_route_ip' => 'Ascend-Route-IP',
+  'usr_rad_multicast_routio' => 'USR-Rad-Multicast-Routing-RtLim',
   'usr_pw_vpn_id' => 'USR-PW_VPN_ID',
-  'le_nat_sess_dir_fail_act' => 'LE-NAT-Sess-Dir-Fail-Action',
+  'cvx_modem_end_modulation' => 'CVX-Modem-End-Modulation',
+  'cvpn3000_pptp_mppc_compr' => 'CVPN3000-PPTP-MPPC-Compression',
   'cisco_pre_output_octets' => 'Cisco-Pre-Output-Octets',
   'h323_billing_model' => 'h323-billing-model',
   'usr_equalization_type' => 'USR-Equalization-Type',
   'acc_clearing_cause' => 'Acc-Clearing-Cause',
+  'altiga_access_hours_g_u' => 'Altiga-Access-Hours-G/U',
+  'cvpn3000_ipsec_user_grou' => 'CVPN3000-IPSec-User-Group-Lock',
   'x_ascend_menu_selector' => 'X-Ascend-Menu-Selector',
   'x_ascend_netware_timeout' => 'X-Ascend-Netware-timeout',
   'ascend_fr_linkup' => 'Ascend-FR-LinkUp',
-  'police_burst' => 'Police_Burst',
+  'annex_num_in_multilink' => 'Annex-Num-In-Multilink',
+  'police_burst' => 'Police-Burst',
+  'altiga_l2tp_min_authenti' => 'Altiga-L2TP-Min-Authentication-G/U',
   'ascend_filter_required' => 'Ascend-Filter-Required',
-  'usr_compression_algorith' => 'USR-Compression-Algorithm',
-  'le_ipsec_outsource_profi' => 'LE-IPSec-Outsource-Profile',
   'x_ascend_idle_limit' => 'X-Ascend-Idle-Limit',
-  'usr_call_terminate_in_gm' => 'USR-Call-Terminate-in-GMT',
-  'usr_ipx_call_output_filt' => 'USR-IPX-Call-Output-Filter',
-  'ip_tos_field' => 'IP_TOS_Field',
+  'nomadix_logoff_url' => 'Nomadix-Logoff-URL',
+  'cvpn3000_ms_client_icpt_' => 'CVPN3000-MS-Client-Icpt-DHCP-Conf-Msg',
+  'ip_tos_field' => 'IP-TOS-Field',
   'ascend_ip_tos_apply_to' => 'Ascend-IP-TOS-Apply-To',
-  'tunnel_l2f_second_passwo' => 'Tunnel_L2F_Second_Password',
   'usr_call_event_code' => 'USR-Call-Event-Code',
+  'usr_et_bridge_output_fil' => 'USR-ET-Bridge-Output-Filter',
+  'le_nat_sess_dir_fail_act' => 'LE-NAT-Sess-Dir-Fail-Action',
   'usr_rmmie_product_code' => 'USR-RMMIE-Product-Code',
   'usr_host_type' => 'USR-Host-Type',
+  'erx_tunnel_interface_id' => 'ERX-Tunnel-Interface-Id',
   'ascend_send_auth' => 'Ascend-Send-Auth',
   'shiva_compression_type' => 'Shiva-Compression-Type',
-  'filter_id' => 'Filter-Id',
+  'itk_banner' => 'ITK-Banner',
   'ascend_ft1_caller' => 'Ascend-FT1-Caller',
-  'erx_cli_initial_access_l' => 'ERX-Cli-Initial-Access-Level',
+  'filter_id' => 'Filter-Id',
+  'annex_pre_output_octets' => 'Annex-Pre-Output-Octets',
+  'acct_mcast_in_octett' => 'Acct_Mcast_In_Octets',
   'usr_log_filter_packets' => 'USR-Log-Filter-Packets',
   'ascend_fr_nailed_grp' => 'Ascend-FR-Nailed-Grp',
-  'usr_initial_tx_link_data' => 'USR-Initial-Tx-Link-Data-Rate',
+  'ascend_atm_loopback_cell' => 'Ascend-ATM-Loopback-Cell-Loss',
+  'usr_at_rtmp_output_filte' => 'USR-AT-RTMP-Output-Filter',
   'acc_input_errors' => 'Acc-Input-Errors',
   'x_ascend_user_acct_port' => 'X-Ascend-User-Acct-Port',
   'erx_secondary_wins' => 'ERX-Secondary-Wins',
   'usr_rmmie_serial_number' => 'USR-RMMIE-Serial-Number',
-  'ascend_client_primary_dn' => 'Ascend-Client-Primary-DNS',
+  'usr_et_bridge_input_filt' => 'USR-ET-Bridge-Input-Filter',
+  'ns_primary_dns' => 'NS-Primary-DNS',
   'usr_slot_connected_to' => 'USR-Slot-Connected-To',
   'shiva_disconnect_reason' => 'Shiva-Disconnect-Reason',
+  'cvpn5000_client_assignee' => 'CVPN5000-Client-Assigned-IPX',
+  'cvx_radius_redirect' => 'CVX-Radius-Redirect',
   'usr_receive_acc_map' => 'USR-Receive-Acc-Map',
-  'usr_compression_reset_mo' => 'USR-Compression-Reset-Mode',
-  'usr_rmmie_planned_discon' => 'USR-RMMIE-Planned-Disconnect',
-  'ascend_client_assign_dns' => 'Ascend-Client-Assign-DNS',
+  'x_ascend_tunneling_proto' => 'X-Ascend-Tunneling-Protocol',
+  'itk_acct_serv_ip' => 'ITK-Acct-Serv-IP',
   'ascend_fr_type' => 'Ascend-FR-Type',
+  'ascend_client_assign_dns' => 'Ascend-Client-Assign-DNS',
+  'annex_retrain_requests_r' => 'Annex-Retrain-Requests-Rcvd',
+  'x_ascend_assign_ip_globa' => 'X-Ascend-Assign-IP-Global-Pool',
   'tunnel_client_endpoint' => 'Tunnel-Client-Endpoint',
+  'alteon_service_type' => 'Alteon-Service-Type',
   'x_ascend_send_secret' => 'X-Ascend-Send-Secret',
   'x_ascend_call_filter' => 'X-Ascend-Call-Filter',
   'usr_ipx_rip_input_filter' => 'USR-IPX-RIP-Input-Filter',
   'x_ascend_maximum_time' => 'X-Ascend-Maximum-Time',
-  'ascend_x25_pad_x3_profil' => 'Ascend-X25-Pad-X3-Profile',
-  'pvc_profile_name' => 'PVC_Profile_Name',
+  'pvc_profile_name' => 'PVC-Profile-Name',
+  'usr_framed_ip_address_po' => 'USR-Framed_IP_Address_Pool_Name',
+  'cvpn3000_ipsec_split_dns' => 'CVPN3000-IPSec-Split-DNS-Names',
   'ascend_global_call_id' => 'Ascend-Global-Call-Id',
-  'tunnel_local_name' => 'Tunnel_Local_Name',
+  'usr_initial_rx_link_data' => 'USR-Initial-Rx-Link-Data-Rate',
+  'st_primary_nbns_server' => 'ST-Primary-NBNS-Server',
+  'usr_number_of_rings_limi' => 'USR-Number-of-Rings-Limit',
+  'tunnel_local_name' => 'Tunnel-Local-Name',
   'ascend_fr_t392' => 'Ascend-FR-T392',
-  'usr_dnis_reauthenticatio' => 'USR-DNIS-ReAuthentication',
-  'ascend_pre_output_packet' => 'Ascend-Pre-Output-Packets',
+  'annex_pool_id' => 'Annex-Pool-Id',
   'ascend_token_immediate' => 'Ascend-Token-Immediate',
+  'usr_rmmie_firmware_build' => 'USR-RMMIE-Firmware-Build-Date',
+  'wispr_bandwidth_min_down' => 'WISPr-Bandwidth-Min-Down',
   'usr_chassis_call_slot' => 'USR-Chassis-Call-Slot',
-  'rate_limit_burst' => 'Rate_Limit_Burst',
+  'rate_limit_burst' => 'Rate-Limit-Burst',
   'cisco_route_ip' => 'Cisco-Route-IP',
-  'dhcp_max_leases' => 'DHCP_Max_Leases',
+  'xedia_netbios_server' => 'Xedia-NetBios-Server',
+  'session_error_msg' => 'Session-Error-Msg',
+  'dhcp_max_leases' => 'DHCP-Max-Leases',
+  'acc_vpsm_reject_cause' => 'Acc-Vpsm-Reject-Cause',
   'user_category' => 'User-Category',
-  'x_ascend_maximum_call_du' => 'X-Ascend-Maximum-Call-Duration',
-  'bind_type' => 'Bind_Type',
+  'x_ascend_multicast_rate_' => 'X-Ascend-Multicast-Rate-Limit',
+  'cvpn3000_ipsec_auth_on_r' => 'CVPN3000-IPSec-Auth-On-Rekey',
+  'altiga_min_password_leng' => 'Altiga-Min-Password-Length-G',
+  'bind_type' => 'Bind-Type',
+  'ascend_tunneling_protoco' => 'Ascend-Tunneling-Protocol',
+  'cvx_modem_retx_packets' => 'CVX-Modem-ReTx-Packets',
   'usr_framed_ipx_route' => 'USR-Framed-IPX-Route',
-  'rate_limit_rate' => 'Rate_Limit_Rate',
+  'rate_limit_rate' => 'Rate-Limit-Rate',
   'ascend_atm_connect_vpi' => 'Ascend-ATM-Connect-Vpi',
-  'x_ascend_inc_channel_cou' => 'X-Ascend-Inc-Channel-Count',
   'connect_info' => 'Connect-Info',
-  'x_ascend_pre_input_packe' => 'X-Ascend-Pre-Input-Packets',
   'usr_port_tap_address' => 'USR-Port-Tap-Address',
-  'ascend_home_agent_udp_po' => 'Ascend-Home-Agent-UDP-Port',
-  'usr_final_rx_link_data_r' => 'USR-Final-Rx-Link-Data-Rate',
+  'usr_simplified_mnp_level' => 'USR-Simplified-MNP-Levels',
+  'mcast_receivf' => 'Mcast_Receive',
+  'annex_begin_modulation' => 'Annex-Begin-Modulation',
   'usr_pw_usr_ifilter_ip' => 'USR-PW_USR_IFilter_IP',
   'ascend_route_appletalk' => 'Ascend-Route-Appletalk',
   'ms_chap_lm_enc_pw' => 'MS-CHAP-LM-Enc-PW',
+  'altiga_ipsec_over_nat_po' => 'Altiga-IPSec-Over-NAT-Port-Num-G',
+  'itk_isdn_prot' => 'ITK-ISDN-Prot',
   'ascend_callback_delay' => 'Ascend-Callback-Delay',
+  'session_error_code' => 'Session-Error-Code',
+  'nomadix_endofsession' => 'Nomadix-EndofSession',
   'x_ascend_bacp_enable' => 'X-Ascend-BACP-Enable',
-  'bg_trans_bpdu' => 'BG_Trans_BPDU',
+  'bg_trans_bpdu' => 'BG-Trans-BPDU',
+  'bind_int_interface_namf' => 'Bind_Int_Interface_Name',
+  'foundry_privilege_level' => 'Foundry-Privilege-Level',
   'huntgroup_name' => 'Huntgroup-Name',
   'x_ascend_ipx_alias' => 'X-Ascend-IPX-Alias',
-  'x_ascend_secondary_home_' => 'X-Ascend-Secondary-Home-Agent',
+  'tunnel_l2f_second_passwp' => 'Tunnel_L2F_Second_Password',
+  'xedia_dns_server' => 'Xedia-DNS-Server',
   'usr_ipx_wan' => 'USR-IPX-WAN',
+  'annex_addr_resolution_se' => 'Annex-Addr-Resolution-Servers',
+  'acct_output_octets_65' => 'Acct_Output_Octets_64',
   'menu' => 'Menu',
+  'erx_tunnel_nas_port_meth' => 'ERX-Tunnel-Nas-Port-Method',
+  'aat_output_octets_diff' => 'AAT-Output-Octets-Diff',
   'x_ascend_fr_direct_dlci' => 'X-Ascend-FR-Direct-DLCI',
   'acct_status_type' => 'Acct-Status-Type',
   'ascend_port_redir_server' => 'Ascend-Port-Redir-Server',
+  'telebit_port_name' => 'Telebit-Port-Name',
   'acc_dns_server_sec' => 'Acc-Dns-Server-Sec',
+  'cvx_modem_remote_retrain' => 'CVX-Modem-Remote-Retrains',
   'ascend_minimum_channels' => 'Ascend-Minimum-Channels',
-  'ascend_telnet_profile' => 'Ascend-Telnet-Profile',
   'ascend_ipx_route' => 'Ascend-IPX-Route',
+  'ascend_telnet_profile' => 'Ascend-Telnet-Profile',
   'usr_call_connect_in_gmt' => 'USR-Call-Connect-in-GMT',
+  'usr_cusr_hat_script_rule' => 'USR-CUSR-hat-Script-Rules',
   'x_ascend_dba_monitor' => 'X-Ascend-DBA-Monitor',
+  'response_packet_type' => 'Response-Packet-Type',
   'usr_event_id' => 'USR-Event-Id',
+  'cvpn3000_ipsec_over_udp_' => 'CVPN3000-IPSec-Over-UDP-Port',
   'ascend_inc_channel_count' => 'Ascend-Inc-Channel-Count',
   'usr_send_script3' => 'USR-Send-Script3',
+  'annex_pre_input_packets' => 'Annex-Pre-Input-Packets',
   'framed_callback_id' => 'Framed-Callback-Id',
+  'xedia_client_access_netw' => 'Xedia-Client-Access-Network',
   'arap_zone_access' => 'ARAP-Zone-Access',
+  'ascend_port_redir_portnu' => 'Ascend-Port-Redir-Portnum',
   'service_type' => 'Service-Type',
   'usr_nfas_id' => 'USR-NFAS-ID',
   'shiva_calling_number' => 'Shiva-Calling-Number',
   'ascend_user_acct_host' => 'Ascend-User-Acct-Host',
+  'tunnel_session_auth_serv' => 'Tunnel-Session-Auth-Service-Grp',
+  'juniper_deny_commands' => 'Juniper-Deny-Commands',
   'ascend_fr_link_mgt' => 'Ascend-FR-Link-Mgt',
+  'nokia_imsi' => 'Nokia-IMSI',
+  'quintum_h323_prompt_id' => 'Quintum-h323-prompt-id',
+  'cvpn3000_require_individ' => 'CVPN3000-Require-Individual-User-Auth',
+  'tunnel_retransmiu' => 'Tunnel_Retransmit',
+  'source_validatioo' => 'Source_Validation',
+  'sip_to' => 'Sip-To',
   'ms_primary_nbns_server' => 'MS-Primary-NBNS-Server',
   'quintum_avpair' => 'Quintum-AVPair',
-  'x_ascend_home_agent_pass' => 'X-Ascend-Home-Agent-Password',
   'ascend_transit_number' => 'Ascend-Transit-Number',
   'ascend_cache_refresh' => 'Ascend-Cache-Refresh',
-  'versanet_termination_cau' => 'Versanet-Termination-Cause',
   'ascend_user_acct_type' => 'Ascend-User-Acct-Type',
+  'usr_num_fax_pages_proces' => 'USR-Num-Fax-Pages-Processed',
   'usr_mic' => 'USR-MIC',
-  'ascend_base_channel_coun' => 'Ascend-Base-Channel-Count',
-  'x_ascend_dhcp_pool_numbe' => 'X-Ascend-DHCP-Pool-Number',
+  'usr_failure_to_connect_r' => 'USR-Failure-to-Connect-Reason',
+  'cisco_fax_auth_status' => 'Cisco-Fax-Auth-Status',
+  'bind_dot1q_vlan_tag_ie' => 'Bind_Dot1q_Vlan_Tag_Id',
   'ms_chap2_success' => 'MS-CHAP2-Success',
+  'erx_tunnel_virtual_route' => 'ERX-Tunnel-Virtual-Router',
   'cisco_idle_limit' => 'Cisco-Idle-Limit',
   'ascend_pw_lifetime' => 'Ascend-PW-Lifetime',
+  'cvpn3000_access_hours' => 'CVPN3000-Access-Hours',
+  'bintec_sapcirctable' => 'BinTec-sapCircTable',
   'usr_packet_bus_session' => 'USR-Packet-Bus-Session',
-  'ascend_atm_loopback_cell' => 'Ascend-ATM-Loopback-Cell-Loss',
-  'acct_input_packets_64' => 'Acct_Input_Packets_64',
+  'acct_input_packets_64' => 'Acct-Input-Packets-64',
+  'ascend_x25_pad_x3_parame' => 'Ascend-X25-Pad-X3-Parameters',
+  'usr_secondary_nbns_serve' => 'USR-Secondary_NBNS_Server',
   'ascend_modem_slotno' => 'Ascend-Modem-SlotNo',
+  'digest_qop' => 'Digest-QOP',
   'usr_characters_received' => 'USR-Characters-Received',
+  'rate_limit_ratf' => 'Rate_Limit_Rate',
   'ms_bap_usage' => 'MS-BAP-Usage',
   'cisco_data_filter' => 'Cisco-Data-Filter',
-  'ascend_seconds_of_histor' => 'Ascend-Seconds-Of-History',
+  'usr_simplified_v42bis_us' => 'USR-Simplified-V42bis-Usage',
   'h323_setup_time' => 'h323-setup-time',
-  'acc_dialout_auth_passwor' => 'Acc-Dialout-Auth-Password',
+  'annex_wan_number' => 'Annex-Wan-Number',
+  'cvx_vpop_id' => 'CVX-VPOP-ID',
+  'usr_pw_tunnel_authentica' => 'USR-PW_Tunnel_Authentication',
   'le_nat_outsource_inmap' => 'LE-NAT-Outsource-Inmap',
+  'cvx_modem_begin_recv_lin' => 'CVX-Modem-Begin-Recv-Line-Lvl',
+  'telebit_login_command' => 'Telebit-Login-Command',
+  'cisco_command_code' => 'Cisco-Command-Code',
+  'itk_ppp_auth_type' => 'ITK-PPP-Auth-Type',
+  'bintec_qosiftable' => 'BinTec-qosIfTable',
+  'x_ascend_mpp_idle_percen' => 'X-Ascend-MPP-Idle-Percent',
   'usr_sap_filter_in' => 'USR-SAP-Filter-In',
   'framed_appletalk_link' => 'Framed-AppleTalk-Link',
-  'usr_initial_rx_link_data' => 'USR-Initial-Rx-Link-Data-Rate',
-  'usr_ospf_addressless_ind' => 'USR-OSPF-Addressless-Index',
+  'tunnel_domaio' => 'Tunnel_Domain',
   'usr_ipx' => 'USR-IPX',
+  'nas_real_poru' => 'NAS_Real_Port',
   'shiva_connect_reason' => 'Shiva-Connect-Reason',
+  'x_ascend_pre_output_octe' => 'X-Ascend-Pre-Output-Octets',
   'cisco_ppp_vj_slot_comp' => 'Cisco-PPP-VJ-Slot-Comp',
+  'freeradius_proxied_to' => 'Freeradius-Proxied-To',
   'ascend_atm_vpi' => 'Ascend-ATM-Vpi',
   'acc_ml_mlx_admin_state' => 'Acc-ML-MLX-Admin-State',
+  'cvx_modem_snr' => 'CVX-Modem-SNR',
   'usr_igmp_robustness' => 'USR-IGMP-Robustness',
+  'annex_rate_reneg_req_rcv' => 'Annex-Rate-Reneg-Req-Rcvd',
   'add_prefix' => 'Add-Prefix',
   'x_ascend_call_by_call' => 'X-Ascend-Call-By-Call',
-  'x_ascend_connect_progres' => 'X-Ascend-Connect-Progress',
+  'usr_last_callers_number_' => 'USR-Last-Callers-Number-ANI',
+  'postauth_type' => 'PostAuth-Type',
+  'pvc_circuit_paddinh' => 'PVC_Circuit_Padding',
   'usr_at_rtmp_input_filter' => 'USR-AT-RTMP-Input-Filter',
   'erx_igmp_enable' => 'ERX-Igmp-Enable',
-  'usr_rmmie_rcv_pwrlvl_375' => 'USR-RMMIE-Rcv-PwrLvl-3750Hz',
+  'bind_bypass_contexu' => 'Bind_Bypass_Context',
+  'x_ascend_num_in_multilin' => 'X-Ascend-Num-In-Multilink',
   'usr_pw_packet' => 'USR-PW_Packet',
   'dialback_no' => 'Dialback-No',
   'ascend_ip_tos_precedence' => 'Ascend-IP-TOS-Precedence',
+  'cvpn5000_vpn_password' => 'CVPN5000-VPN-Password',
   'annex_cli_filter' => 'Annex-CLI-Filter',
   'x_ascend_dial_number' => 'X-Ascend-Dial-Number',
   'usr_iwf_call_identifier' => 'USR-IWF-Call-Identifier',
   'ms_secondary_dns_server' => 'MS-Secondary-DNS-Server',
-  'ascend_client_secondary_' => 'Ascend-Client-Secondary-WINS',
   'shiva_type_of_service' => 'Shiva-Type-Of-Service',
-  'usr_framed_ip_address_po' => 'USR-Framed_IP_Address_Pool_Name',
-  'bind_ses_context' => 'Bind_Ses_Context',
+  'bind_ses_context' => 'Bind-Ses-Context',
   'acc_reason_code' => 'Acc-Reason-Code',
   'ms_chap_cpw_1' => 'MS-CHAP-CPW-1',
+  'wispr_bandwidth_max_down' => 'WISPr-Bandwidth-Max-Down',
   'h323_call_type' => 'h323-call-type',
+  'bind_bypass_bypast' => 'Bind_Bypass_Bypass',
+  'usr_number_of_link_timeo' => 'USR-Number-of-Link-Timeouts',
   'ascend_fr_08_mode' => 'Ascend-FR-08-Mode',
   'usr_calling_party_number' => 'USR-Calling-Party-Number',
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-RtLim',
   'usr_reply_script2' => 'USR-Reply-Script2',
   'usr_security_login_limit' => 'USR-Security-Login-Limit',
   'cisco_link_compression' => 'Cisco-Link-Compression',
-  'usr_et_bridge_output_fil' => 'USR-ET-Bridge-Output-Filter',
   'ascend_vrouter_name' => 'Ascend-VRouter-Name',
+  'erx_ppp_auth_protocol' => 'ERX-PPP-Auth-Protocol',
+  'x_ascend_call_block_dura' => 'X-Ascend-Call-Block-Duration',
   'usr_modem_setup_time' => 'USR-Modem-Setup-Time',
+  'pppoe_urm' => 'PPPOE_URL',
   'cisco_ip_direct' => 'Cisco-IP-Direct',
   'x_ascend_temporary_rtes' => 'X-Ascend-Temporary-Rtes',
   'ascend_x25_pad_alias_3' => 'Ascend-X25-Pad-Alias-3',
-  'usr_rmmie_pwrlvl_xmit_lv' => 'USR-RMMIE-PwrLvl-Xmit-Lvl',
+  'annex_multilink_id' => 'Annex-Multilink-Id',
+  'mcast_maxgroupt' => 'Mcast_MaxGroups',
   'configuration_token' => 'Configuration-Token',
-  'usr_at_rtmp_output_filte' => 'USR-AT-RTMP-Output-Filter',
-  'usr_ip_default_route_opt' => 'USR-IP-Default-Route-Option',
-  'ascend_calling_subaddres' => 'Ascend-Calling-Subaddress',
+  'ascend_h323_conference_i' => 'Ascend-H323-Conference-Id',
+  'ascend_ipx_header_compre' => 'Ascend-IPX-Header-Compression',
   'stripped_user_name' => 'Stripped-User-Name',
+  'usr_ipx_rip_output_filte' => 'USR-IPX-RIP-Output-Filter',
   'cisco_call_filter' => 'Cisco-Call-Filter',
+  'nas_ipv6_address' => 'NAS-IPv6-Address',
   'termination_menu' => 'Termination-Menu',
+  'ascend_shared_profile_en' => 'Ascend-Shared-Profile-Enable',
   'port_message' => 'Port-Message',
-  'usr_igmp_maximum_respons' => 'USR-IGMP-Maximum-Response-Time',
   'erx_ingress_policy_name' => 'ERX-Ingress-Policy-Name',
-  'ascend_call_attempt_limi' => 'Ascend-Call-Attempt-Limit',
   'acc_service_profile' => 'Acc-Service-Profile',
   'ascend_bir_proxy' => 'Ascend-BIR-Proxy',
+  'aat_ppp_address' => 'AAT-PPP-Address',
+  'usr_mbi_ct_pri_card_span' => 'USR-Mbi_Ct_PRI_Card_Span_Line',
   'ascend_x25_nui_prompt' => 'Ascend-X25-Nui-Prompt',
-  'usr_rmmie_pwrlvl_noise_l' => 'USR-RMMIE-PwrLvl-Noise-Lvl',
-  'usr_rmmie_pwrlvl_nearech' => 'USR-RMMIE-PwrLvl-NearEcho-Canc',
-  'x_ascend_multicast_clien' => 'X-Ascend-Multicast-Client',
+  'itk_modem_pool_id' => 'ITK-Modem-Pool-Id',
+  'usr_compression_reset_mo' => 'USR-Compression-Reset-Mode',
   'usr_unauthenticated_time' => 'USR-Unauthenticated-Time',
+  'ascend_multicast_gleave_' => 'Ascend-Multicast-GLeave-Delay',
   'acc_callback_cbcp_type' => 'Acc-Callback-CBCP-Type',
+  'medium_typf' => 'Medium_Type',
   'login_service' => 'Login-Service',
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Bound',
+  'itk_username_prompt' => 'ITK-Username-Prompt',
   'ascend_dial_number' => 'Ascend-Dial-Number',
+  'framed_ipv6_route' => 'Framed-IPv6-Route',
   'x_ascend_remote_addr' => 'X-Ascend-Remote-Addr',
-  'usr_rmmie_rcv_pwrlvl_330' => 'USR-RMMIE-Rcv-PwrLvl-3300Hz',
   'usr_call_end_date_time' => 'USR-Call-End-Date-Time',
-  'bind_dot1q_slot' => 'Bind_Dot1q_Slot',
+  'bind_dot1q_slot' => 'Bind-Dot1q-Slot',
   'le_connect_detail' => 'LE-Connect-Detail',
   'annex_user_level' => 'Annex-User-Level',
-  'tunnel_dnis' => 'Tunnel_DNIS',
-  'assigned_ip_address' => 'Assigned_IP_Address',
+  'tunnel_dnis' => 'Tunnel-DNIS',
+  'assigned_ip_address' => 'Assigned-IP-Address',
   'acc_bridging_support' => 'Acc-Bridging-Support',
   'usr_channel' => 'USR-Channel',
   'arap_security_data' => 'ARAP-Security-Data',
-  'bind_auth_service_grp' => 'Bind_Auth_Service_Grp',
-  'x_ascend_pre_output_pack' => 'X-Ascend-Pre-Output-Packets',
-  'x_ascend_seconds_of_hist' => 'X-Ascend-Seconds-Of-History',
+  'bind_auth_service_grp' => 'Bind-Auth-Service-Grp',
+  'cisco_abort_cause' => 'Cisco-Abort-Cause',
+  'bg_span_dit' => 'BG_Span_Dis',
   'h323_voice_quality' => 'h323-voice-quality',
-  'usr_rmmie_last_update_ti' => 'USR-RMMIE-Last-Update-Time',
-  'usr_disconnect_cause_ind' => 'USR-Disconnect-Cause-Indicator',
+  'lac_real_port_typf' => 'LAC_Real_Port_Type',
   'usr_channel_connected_to' => 'USR-Channel-Connected-To',
-  'ascend_calling_id_number' => 'Ascend-Calling-Id-Number-Plan',
+  'ascend_client_assign_win' => 'Ascend-Client-Assign-WINS',
+  'redcreek_tunneled_gatewa' => 'RedCreek-Tunneled-Gateway',
   'usr_number_of_fallbacks' => 'USR-Number-of-Fallbacks',
-  'usr_ip_call_output_filte' => 'USR-IP-Call-Output-Filter',
+  'nokia_prepaid_ind' => 'Nokia-Prepaid-Ind',
+  'nomadix_maxbytesup' => 'Nomadix-MaxBytesUp',
+  'login_hosu' => 'Login-Host',
   'ascend_bir_enable' => 'Ascend-BIR-Enable',
   'usr_connect_time_limit' => 'USR-Connect-Time-Limit',
   'ascend_presession_time' => 'Ascend-PreSession-Time',
-  'ascend_private_route_req' => 'Ascend-Private-Route-Required',
-  'ascend_dsl_cir_xmit_limi' => 'Ascend-Dsl-CIR-Xmit-Limit',
+  'altiga_simultaneous_logi' => 'Altiga-Simultaneous-Logins-G/U',
+  'cvpn3000_ipsec_default_d' => 'CVPN3000-IPSec-Default-Domain',
+  'aat_atm_vci' => 'AAT-ATM-VCI',
+  'extreme_netlogin_url_des' => 'Extreme-Netlogin-Url-Desc',
+  'itk_auth_serv_ip' => 'ITK-Auth-Serv-IP',
+  'erx_alternate_cli_vroute' => 'ERX-Alternate-Cli-Vrouter-Name',
   'framed_compression' => 'Framed-Compression',
   'ascend_svc_enabled' => 'Ascend-SVC-Enabled',
   'proxy_state' => 'Proxy-State',
-  'ascend_tunnel_vrouter_na' => 'Ascend-Tunnel-VRouter-Name',
-  'usr_ipx_call_input_filte' => 'USR-IPX-Call-Input-Filter',
-  'x_ascend_assign_ip_globa' => 'X-Ascend-Assign-IP-Global-Pool',
-  'erx_alternate_cli_vroute' => 'ERX-Alternate-Cli-Vrouter-Name',
-  'ascend_dhcp_maximum_leas' => 'Ascend-DHCP-Maximum-Leases',
+  'aat_vrouter_name' => 'AAT-Vrouter-Name',
+  'usr_rmmie_pwrlvl_farecho' => 'USR-RMMIE-PwrLvl-FarEcho-Canc',
+  'nas_poru' => 'NAS-Port',
+  'wispr_location_name' => 'WISPr-Location-Name',
+  'digest_user_name' => 'Digest-User-Name',
   'ascend_modem_shelfno' => 'Ascend-Modem-ShelfNo',
-  'bind_auth_protocol' => 'Bind_Auth_Protocol',
   'shasta_user_privilege' => 'Shasta-User-Privilege',
+  'bind_auth_protocol' => 'Bind-Auth-Protocol',
+  'ascend_home_agent_passwo' => 'Ascend-Home-Agent-Password',
   'acct_interim_interval' => 'Acct-Interim-Interval',
+  'ascend_history_weigh_typ' => 'Ascend-History-Weigh-Type',
+  'ms_link_drop_time_limit' => 'MS-Link-Drop-Time-Limit',
   'hint' => 'Hint',
   'x_ascend_target_util' => 'X-Ascend-Target-Util',
-  'ms_link_drop_time_limit' => 'MS-Link-Drop-Time-Limit',
   'acc_access_partition' => 'Acc-Access-Partition',
-  'x_ascend_multilink_id' => 'X-Ascend-Multilink-ID',
   'usr_power_supply_number' => 'USR-Power-Supply-Number',
-  'acc_ipx_compression' => 'Acc-Ipx-Compression',
+  'x_ascend_multilink_id' => 'X-Ascend-Multilink-ID',
+  'redcreek_tunneled_domain' => 'RedCreek-Tunneled-DomainName',
   'nomadix_bw_down' => 'Nomadix-Bw-Down',
-  'usr_call_reference_numbe' => 'USR-Call-Reference-Number',
+  'acc_ipx_compression' => 'Acc-Ipx-Compression',
+  'quintum_h323_setup_time' => 'Quintum-h323-setup-time',
   'cisco_target_util' => 'Cisco-Target-Util',
-  'usr_back_channel_data_ra' => 'USR-Back-Channel-Data-Rate',
   'acc_ip_gateway_sec' => 'Acc-Ip-Gateway-Sec',
-  'usr_dte_ring_no_answer_l' => 'USR-DTE-Ring-No-Answer-Limit',
-  'usr_connect_time' => 'USR-Connect-Time',
+  'ascend_dsl_cir_xmit_limi' => 'Ascend-Dsl-CIR-Xmit-Limit',
   'ascend_ip_pool_definitio' => 'Ascend-IP-Pool-Definition',
+  'bind_sub_user_at_contexu' => 'Bind_Sub_User_At_Context',
+  'itk_dest_no' => 'ITK-Dest-No',
+  'usr_connect_time' => 'USR-Connect-Time',
   'usr_call_start_date_time' => 'USR-Call-Start-Date-Time',
+  'altiga_l2tp_encryption_g' => 'Altiga-L2TP-Encryption-G',
+  'ascend_auth_delay' => 'Ascend-Auth-Delay',
+  'ascend_x25_pad_x3_profil' => 'Ascend-X25-Pad-X3-Profile',
+  'ascend_access_intercepta' => 'Ascend-Access-Intercept-Log',
+  'ascend_home_agent_udp_po' => 'Ascend-Home-Agent-UDP-Port',
+  'bind_tun_context' => 'Bind-Tun-Context',
   'dialback_name' => 'Dialback-Name',
-  'bind_tun_context' => 'Bind_Tun_Context',
   'h323_redirect_ip_address' => 'h323-redirect-ip-address',
   'annex_keypress_timeout' => 'Annex-Keypress-Timeout',
+  'x_ascend_home_network_na' => 'X-Ascend-Home-Network-Name',
   'ascend_x25_pad_alias_1' => 'Ascend-X25-Pad-Alias-1',
+  'ascend_call_attempt_limi' => 'Ascend-Call-Attempt-Limit',
+  'quintum_h323_currency_ty' => 'Quintum-h323-currency-type',
   'ms_chap_response' => 'MS-CHAP-Response',
+  'st_secondary_nbns_server' => 'ST-Secondary-NBNS-Server',
+  'x_ascend_history_weigh_t' => 'X-Ascend-History-Weigh-Type',
   'usr_max_channels' => 'USR-Max-Channels',
   'ascend_fr_dte_n393' => 'Ascend-FR-DTE-N393',
   'ascend_pre_input_octets' => 'Ascend-Pre-Input-Octets',
   'erx_atm_mbs' => 'ERX-Atm-MBS',
+  'cvpn3000_simultaneous_lo' => 'CVPN3000-Simultaneous-Logins',
+  'juniper_allow_commands' => 'Juniper-Allow-Commands',
   'usr_line_reversals' => 'USR-Line-Reversals',
+  'itk_users_default_pw' => 'ITK-Users-Default-Pw',
   'x_ascend_third_prompt' => 'X-Ascend-Third-Prompt',
+  'cisco_fax_msg_id' => 'Cisco-Fax-Msg-Id',
   'x_ascend_pw_warntime' => 'X-Ascend-PW-Warntime',
   'ascend_data_filter' => 'Ascend-Data-Filter',
   'framed_address' => 'Framed-Address',
   'context_name' => 'Context-Name',
   'usr_send_script2' => 'USR-Send-Script2',
   'ms_arap_pw_change_reason' => 'MS-ARAP-PW-Change-Reason',
+  'tunnel_session_auth_cty' => 'Tunnel_Session_Auth_Ctx',
   'acct_session_id' => 'Acct-Session-Id',
+  'annex_port' => 'Annex-Port',
+  'quintum_h323_call_origin' => 'Quintum-h323-call-origin',
+  'erx_cli_initial_access_l' => 'ERX-Cli-Initial-Access-Level',
+  'x_ascend_shared_profile_' => 'X-Ascend-Shared-Profile-Enable',
+  'tunnel_cmd_timeouu' => 'Tunnel_Cmd_Timeout',
   'initial_modulation_type' => 'Initial-Modulation-Type',
   'ascend_h323_gatekeeper' => 'Ascend-H323-Gatekeeper',
   'x_ascend_fcp_parameter' => 'X-Ascend-FCP-Parameter',
-  'tunnel_type' => 'Tunnel-Type',
   'multi_link_flag' => 'Multi-Link-Flag',
+  'tunnel_type' => 'Tunnel-Type',
+  'erx_output_gigapkts' => 'ERX-Output-Gigapkts',
   'ascend_idle_limit' => 'Ascend-Idle-Limit',
+  'ns_user_group' => 'NS-User-Group',
   'password_retry' => 'Password-Retry',
   'h323_remote_address' => 'h323-remote-address',
   'erx_atm_service_category' => 'ERX-Atm-Service-Category',
   'acct_input_packets' => 'Acct-Input-Packets',
   'h323_disconnect_time' => 'h323-disconnect-time',
-  'ascend_billing_number' => 'Ascend-Billing-Number',
   'usr_syslog_tap' => 'USR-Syslog-Tap',
+  'telebit_accounting_info' => 'Telebit-Accounting-Info',
+  'ascend_billing_number' => 'Ascend-Billing-Number',
+  'ascend_tunnel_vrouter_na' => 'Ascend-Tunnel-VRouter-Name',
   'ms_mppe_encryption_type' => 'MS-MPPE-Encryption-Type',
+  'quintum_h323_credit_amou' => 'Quintum-h323-credit-amount',
+  'acc_ace_token' => 'Acc-Ace-Token',
   'ascend_assign_ip_pool' => 'Ascend-Assign-IP-Pool',
+  'annex_end_modulation' => 'Annex-End-Modulation',
   'usr_routing_protocol' => 'USR-Routing-Protocol',
+  'cvx_assign_ip_pool' => 'CVX-Assign-IP-Pool',
   'usr_rad_location_type' => 'USR-Rad-Location-Type',
+  'usr_rmmie_pwrlvl_noise_l' => 'USR-RMMIE-PwrLvl-Noise-Lvl',
   'usr_characters_sent' => 'USR-Characters-Sent',
   'usr_mp_edo_hiper' => 'USR-MP-EDO-HIPER',
+  'ascend_x25_nui_password_' => 'Ascend-X25-Nui-Password-Prompt',
   'annex_host_restrict' => 'Annex-Host-Restrict',
   'user_service_type' => 'User-Service-Type',
   'acct_multi_session_id' => 'Acct-Multi-Session-Id',
   'ms_chap_cpw_2' => 'MS-CHAP-CPW-2',
-  'x_ascend_primary_home_ag' => 'X-Ascend-Primary-Home-Agent',
+  'x_ascend_secondary_home_' => 'X-Ascend-Secondary-Home-Agent',
   'x_ascend_dialout_allowed' => 'X-Ascend-Dialout-Allowed',
   'ascend_connect_progress' => 'Ascend-Connect-Progress',
   'x_ascend_ara_pw' => 'X-Ascend-Ara-PW',
+  'cisco_fax_modem_time' => 'Cisco-Fax-Modem-Time',
+  'sql_group' => 'Sql-Group',
+  'annex_multicast_rate_lim' => 'Annex-Multicast-Rate-Limit',
+  'cvpn3000_user_auth_servg' => 'CVPN3000-User-Auth-Server-Secret',
   'ns_mta_md5_password' => 'NS-MTA-MD5-Password',
+  'annex_addr_resolution_pr' => 'Annex-Addr-Resolution-Protocol',
   'callback_number' => 'Callback-Number',
-  'acct_output_packets_64' => 'Acct_Output_Packets_64',
+  'cvx_multilink_match_info' => 'CVX-Multilink-Match-Info',
+  'tunnel_max_tunnelt' => 'Tunnel_Max_Tunnels',
+  'tunnel_local_namf' => 'Tunnel_Local_Name',
+  'quintum_h323_conf_id' => 'Quintum-h323-conf-id',
+  'acct_output_packets_64' => 'Acct-Output-Packets-64',
+  'annex_signal_to_noise_ra' => 'Annex-Signal-to-Noise-Ratio',
+  'acct_output_packets_65' => 'Acct_Output_Packets_64',
   'x_ascend_user_acct_key' => 'X-Ascend-User-Acct-Key',
+  'erx_dial_out_number' => 'ERX-Dial-Out-Number',
   'ascend_modem_portno' => 'Ascend-Modem-PortNo',
   'ascend_assign_ip_server' => 'Ascend-Assign-IP-Server',
   'ascend_fcp_parameter' => 'Ascend-FCP-Parameter',
-  'ascend_inter_arrival_jit' => 'Ascend-Inter-Arrival-Jitter',
+  'usr_chassis_temp_thresho' => 'USR-Chassis-Temp-Threshold',
+  'usr_mpip_tunnel_originat' => 'USR-MPIP-Tunnel-Originator',
+  'tunnel_rate_limit_bursu' => 'Tunnel_Rate_Limit_Burst',
   'client_ip_address' => 'Client-IP-Address',
-  'usr_number_of_link_timeo' => 'USR-Number-of-Link-Timeouts',
-  'ascend_dsl_cir_recv_limi' => 'Ascend-Dsl-CIR-Recv-Limit',
+  'le_nat_tcp_session_timeo' => 'LE-NAT-TCP-Session-Timeout',
+  'quintum_h323_redirect_ip' => 'Quintum-h323-redirect-ip-address',
   'ms_acct_eap_type' => 'MS-Acct-EAP-Type',
-  'x_ascend_user_acct_type' => 'X-Ascend-User-Acct-Type',
   'usr_rmmie_x2_status' => 'USR-RMMIE-x2-Status',
-  'ascend_dsl_downstream_li' => 'Ascend-Dsl-Downstream-Limit',
+  'x_ascend_user_acct_type' => 'X-Ascend-User-Acct-Type',
   'shiva_customer_id' => 'Shiva-Customer-Id',
-  'lac_real_port' => 'LAC_Real_Port',
+  'pvc_encapsulation_typf' => 'PVC_Encapsulation_Type',
+  'st_acct_vc_connection_id' => 'ST-Acct-VC-Connection-Id',
+  'lac_real_port' => 'LAC-Real-Port',
   'h323_connect_time' => 'h323-connect-time',
-  'old_password' => 'Old-Password',
   'usr_vpn_gw_location_id' => 'USR-VPN-GW-Location-Id',
+  'old_password' => 'Old-Password',
   'x_ascend_if_netmask' => 'X-Ascend-IF-Netmask',
   'add_suffix' => 'Add-Suffix',
-  'x_ascend_client_assign_d' => 'X-Ascend-Client-Assign-DNS',
-  'usr_q931_call_reference_' => 'USR-Q931-Call-Reference-Value',
+  'lac_port_typf' => 'LAC_Port_Type',
+  'acc_ip_pool_name' => 'Acc-Ip-Pool-Name',
   'usr_terminal_type' => 'USR-Terminal-Type',
   'usr_spoofing' => 'USR-Spoofing',
   'erx_tunnel_password' => 'ERX-Tunnel-Password',
-  'ascend_assign_ip_client' => 'Ascend-Assign-IP-Client',
+  'ascend_inter_arrival_jit' => 'Ascend-Inter-Arrival-Jitter',
+  'ascend_call_block_durati' => 'Ascend-Call-Block-Duration',
+  'itk_channel_binding' => 'ITK-Channel-Binding',
   'usr_server_time' => 'USR-Server-Time',
+  'ascend_assign_ip_client' => 'Ascend-Assign-IP-Client',
+  'erx_pppoe_max_sessions' => 'ERX-Pppoe-Max-Sessions',
+  'cvx_multilink_group_numb' => 'CVX-Multilink-Group-Number',
+  'x_ascend_client_assign_d' => 'X-Ascend-Client-Assign-DNS',
+  'erx_pppoe_url' => 'ERX-Pppoe-Url',
+  'police_ratf' => 'Police_Rate',
   'ascend_data_svc' => 'Ascend-Data-Svc',
   'annex_authen_servers' => 'Annex-Authen-Servers',
   'nomadix_bw_up' => 'Nomadix-Bw-Up',
+  'cvx_modem_data_compressi' => 'CVX-Modem-Data-Compression',
   'shiva_link_speed' => 'Shiva-Link-Speed',
   'usr_reply_script6' => 'USR-Reply-Script6',
   'usr_expansion_algorithm' => 'USR-Expansion-Algorithm',
-  'x_ascend_mpp_idle_percen' => 'X-Ascend-MPP-Idle-Percent',
+  'cabletron_protocol_calla' => 'Cabletron-Protocol-Callable',
   'cisco_data_rate' => 'Cisco-Data-Rate',
   'usr_primary_dns_server' => 'USR-Primary_DNS_Server',
-  'erx_local_loopback_inter' => 'ERX-Local-Loopback-Interface',
+  'juniper_deny_configurati' => 'Juniper-Deny-Configuration',
   'ascend_target_util' => 'Ascend-Target-Util',
-  'usr_default_dte_data_rat' => 'USR-Default-DTE-Data-Rate',
+  'digest_method' => 'Digest-Method',
+  'altiga_ipsec_split_tunne' => 'Altiga-IPSec-Split-Tunnel-List-G',
+  'erx_alternate_cli_access' => 'ERX-Alternate-Cli-Access-Level',
   'x_ascend_event_type' => 'X-Ascend-Event-Type',
+  'usr_q931_call_reference_' => 'USR-Q931-Call-Reference-Value',
   'usr_mp_mrru' => 'USR-MP-MRRU',
-  'bind_bypass_context' => 'Bind_Bypass_Context',
+  'cvx_ipsvc_mask' => 'CVX-IPSVC-Mask',
+  'bind_bypass_context' => 'Bind-Bypass-Context',
+  'usr_rmmie_last_update_ev' => 'USR-RMMIE-Last-Update-Event',
   'no_such_attribute' => 'No-Such-Attribute',
-  'acct_mcast_out_packets' => 'Acct_Mcast_Out_Packets',
+  'acct_mcast_out_packets' => 'Acct-Mcast-Out-Packets',
   'tunnel_medium_type' => 'Tunnel-Medium-Type',
+  'quintum_h323_remote_addr' => 'Quintum-h323-remote-address',
   'acc_callback_delay' => 'Acc-Callback-Delay',
-  'x_ascend_home_agent_udp_' => 'X-Ascend-Home-Agent-UDP-Port',
-  'acct_input_octets_64' => 'Acct_Input_Octets_64',
+  'acct_input_octets_64' => 'Acct-Input-Octets-64',
+  'ascend_base_channel_coun' => 'Ascend-Base-Channel-Count',
   'ascend_atm_connect_vci' => 'Ascend-ATM-Connect-Vci',
   'erx_primary_dns' => 'ERX-Primary-Dns',
+  'altiga_ipsec_over_nat_g' => 'Altiga-IPSec-Over-NAT-G',
+  'cvx_multicast_rate_limit' => 'CVX-Multicast-Rate-Limit',
   'ascend_xmit_rate' => 'Ascend-Xmit-Rate',
   'ms_new_arap_password' => 'MS-New-ARAP-Password',
   'usr_call_error_code' => 'USR-Call-Error-Code',
   'acct_output_octets' => 'Acct-Output-Octets',
-  'usr_failure_to_connect_r' => 'USR-Failure-to-Connect-Reason',
+  'ascend_client_primary_wi' => 'Ascend-Client-Primary-WINS',
+  'cvpn3000_primary_wins' => 'CVPN3000-Primary-WINS',
+  'bintec_ipextrttable' => 'BinTec-ipExtRtTable',
+  'cisco_fax_mdn_flag' => 'Cisco-Fax-Mdn-Flag',
+  'ascend_destination_nas_p' => 'Ascend-Destination-Nas-Port',
   'ascend_num_in_multilink' => 'Ascend-Num-In-Multilink',
+  'digest_attributes' => 'Digest-Attributes',
+  'cvpn3000_ipsec_tunnel_ty' => 'CVPN3000-IPSec-Tunnel-Type',
   'x_ascend_number_sessions' => 'X-Ascend-Number-Sessions',
   'usr_ip_rip_output_filter' => 'USR-IP-RIP-Output-Filter',
-  'usr_chassis_temp_thresho' => 'USR-Chassis-Temp-Threshold',
+  'tunnel_police_bursu' => 'Tunnel_Police_Burst',
+  'redcreek_tunneled_wins_s' => 'RedCreek-Tunneled-WINS-Server1',
   'usr_blocks_sent' => 'USR-Blocks-Sent',
+  'erx_cli_allow_all_vr_acc' => 'ERX-Cli-Allow-All-VR-Access',
+  'tunnel_police_ratf' => 'Tunnel_Police_Rate',
   'usr_ids0_call_type' => 'USR-IDS0-Call-Type',
   'acc_ccp_option' => 'Acc-Ccp-Option',
   'ascend_client_gateway' => 'Ascend-Client-Gateway',
-  'x_ascend_multicast_rate_' => 'X-Ascend-Multicast-Rate-Limit',
+  'cvx_maximum_channels' => 'CVX-Maximum-Channels',
+  'bg_aging_timf' => 'BG_Aging_Time',
+  'annex_secondary_dns_serv' => 'Annex-Secondary-DNS-Server',
   'le_ipsec_passive_profile' => 'LE-IPSec-Passive-Profile',
   'usr_chassis_call_span' => 'USR-Chassis-Call-Span',
-  'usr_mobileip_home_agent_' => 'USR-MobileIP-Home-Agent-Address',
+  'aat_client_primary_wins_' => 'AAT-Client-Primary-WINS-NBNS',
+  'h323_currency' => 'h323-currency',
   'password' => 'Password',
   'le_nat_log_options' => 'LE-NAT-Log-Options',
-  'x_ascend_ppp_address' => 'X-Ascend-PPP-Address',
   'usr_fallback_limit' => 'USR-Fallback-Limit',
+  'x_ascend_ppp_address' => 'X-Ascend-PPP-Address',
   'suffix' => 'Suffix',
   'usr_multicast_receive' => 'USR-Multicast-Receive',
-  'client_dns_sec' => 'Client_DNS_Sec',
+  'client_dns_sec' => 'Client-DNS-Sec',
   'annex_product_name' => 'Annex-Product-Name',
   'cisco_pw_lifetime' => 'Cisco-PW-Lifetime',
   'x_ascend_fr_dce_n393' => 'X-Ascend-FR-DCE-N393',
   'x_ascend_ts_idle_limit' => 'X-Ascend-TS-Idle-Limit',
-  'usr_last_number_dialed_o' => 'USR-Last-Number-Dialed-Out',
-  'mcast_send' => 'Mcast_Send',
-  'pppoe_motm' => 'PPPOE_MOTM',
+  'mcast_send' => 'Mcast-Send',
+  'x_ascend_primary_home_ag' => 'X-Ascend-Primary-Home-Agent',
+  'tunnel_max_sessiont' => 'Tunnel_Max_Sessions',
+  'pppoe_motm' => 'PPPOE-MOTM',
   'usr_pw_usr_ifilter_ipx' => 'USR-PW_USR_IFilter_IPX',
-  'usr_pw_tunnel_authentica' => 'USR-PW_Tunnel_Authentication',
-  'ascend_source_ip_check' => 'Ascend-Source-IP-Check',
-  'ascend_assign_ip_global_' => 'Ascend-Assign-IP-Global-Pool',
   'ms_ras_version' => 'MS-RAS-Version',
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Ttl',
-  'x_ascend_modem_slotno' => 'X-Ascend-Modem-SlotNo',
+  'ascend_source_ip_check' => 'Ascend-Source-IP-Check',
+  'bintec_ospfiftable' => 'BinTec-ospfIfTable',
   'acc_ml_call_threshold' => 'Acc-ML-Call-Threshold',
+  'x_ascend_modem_slotno' => 'X-Ascend-Modem-SlotNo',
   'ascend_menu_item' => 'Ascend-Menu-Item',
-  'usr_cdma_call_reference_' => 'USR-CDMA-Call-Reference-Number',
   'callback_id' => 'Callback-Id',
   'framed_ipx_network' => 'Framed-IPX-Network',
-  'x_ascend_disconnect_caus' => 'X-Ascend-Disconnect-Cause',
+  'altiga_pptp_encryption_g' => 'Altiga-PPTP-Encryption-G',
+  'ascend_x25_reverse_charg' => 'Ascend-X25-Reverse-Charging',
   'ascend_user_acct_key' => 'Ascend-User-Acct-Key',
   'x_ascend_pw_lifetime' => 'X-Ascend-PW-Lifetime',
   'user_name_is_star' => 'User-Name-Is-Star',
-  'x_ascend_authen_alias' => 'X-Ascend-Authen-Alias',
+  'nomadix_url_redirection' => 'Nomadix-URL-Redirection',
   'framed_pool' => 'Framed-Pool',
+  'x_ascend_authen_alias' => 'X-Ascend-Authen-Alias',
+  'cisco_fax_dsn_address' => 'Cisco-Fax-Dsn-Address',
   'ms_primary_dns_server' => 'MS-Primary-DNS-Server',
+  'acc_dialout_auth_usernam' => 'Acc-Dialout-Auth-Username',
   'realm' => 'Realm',
   'arap_features' => 'ARAP-Features',
+  'bind_auth_protocom' => 'Bind_Auth_Protocol',
   'acc_connect_tx_speed' => 'Acc-Connect-Tx-Speed',
-  'usr_last_number_dialed_i' => 'USR-Last-Number-Dialed-In-DNIS',
   'usr_chassis_temperature' => 'USR-Chassis-Temperature',
+  'altiga_ipsec_mode_config' => 'Altiga-IPSec-Mode-Config-G',
+  'ascend_home_agent_ip_add' => 'Ascend-Home-Agent-IP-Addr',
   'x_ascend_xmit_rate' => 'X-Ascend-Xmit-Rate',
+  'cvpn3000_secondary_dns' => 'CVPN3000-Secondary-DNS',
   'x_ascend_send_passwd' => 'X-Ascend-Send-Passwd',
+  'bind_int_contexu' => 'Bind_Int_Context',
+  'cisco_fax_account_id_ori' => 'Cisco-Fax-Account-Id-Origin',
   'le_modem_info' => 'LE-Modem-Info',
   'ascend_ipx_peer_mode' => 'Ascend-IPX-Peer-Mode',
-  'le_nat_other_session_tim' => 'LE-NAT-Other-Session-Timeout',
-  'tunnel_rate_limit_rate' => 'Tunnel_Rate_Limit_Rate',
-  'ascend_maximum_call_dura' => 'Ascend-Maximum-Call-Duration',
+  'juniper_local_user_name' => 'Juniper-Local-User-Name',
+  'tunnel_rate_limit_rate' => 'Tunnel-Rate-Limit-Rate',
+  'quintum_h323_credit_time' => 'Quintum-h323-credit-time',
+  'acc_modem_modulation_typ' => 'Acc-Modem-Modulation-Type',
+  'x_ascend_seconds_of_hist' => 'X-Ascend-Seconds-Of-History',
   'ascend_dhcp_pool_number' => 'Ascend-DHCP-Pool-Number',
+  'redcreek_tunneled_ip_net' => 'RedCreek-Tunneled-IP-Netmask',
   'x_ascend_callback' => 'X-Ascend-Callback',
-  'ascend_access_intercept_' => 'Ascend-Access-Intercept-Log',
   'usr_iwf_ip_address' => 'USR-IWF-IP-Address',
+  'aat_input_octets_diff' => 'AAT-Input-Octets-Diff',
   'nas_port_id' => 'NAS-Port-Id',
   'le_advice_of_charge' => 'LE-Advice-of-Charge',
+  'x_ascend_dhcp_pool_numbe' => 'X-Ascend-DHCP-Pool-Number',
   'ascend_add_seconds' => 'Ascend-Add-Seconds',
   'annex_transmit_speed' => 'Annex-Transmit-Speed',
   'usr_port_tap' => 'USR-Port-Tap',
   'usr_at_call_input_filter' => 'USR-AT-Call-Input-Filter',
+  'framed_ipv6_pool' => 'Framed-IPv6-Pool',
   'ascend_qos_downstream' => 'Ascend-QOS-Downstream',
-  'ascend_x25_reverse_charg' => 'Ascend-X25-Reverse-Charging',
-  'lac_port' => 'LAC_Port',
+  'lac_port' => 'LAC-Port',
   'tunnel_assignment_id' => 'Tunnel-Assignment-Id',
+  'acct_mcast_out_octett' => 'Acct_Mcast_Out_Octets',
+  'ascend_bi_directional_au' => 'Ascend-Bi-Directional-Auth',
   'fall_through' => 'Fall-Through',
+  'cvpn3000_ipsec_ip_compre' => 'CVPN3000-IPSec-IP-Compression',
   'cisco_disconnect_cause' => 'Cisco-Disconnect-Cause',
-  'module_message' => 'Module-Message',
+  'usr_rad_multicast_routiq' => 'USR-Rad-Multicast-Routing-Bound',
+  'altiga_tunneling_protoco' => 'Altiga-Tunneling-Protocols-G/U',
+  'itk_tunnel_prot' => 'ITK-Tunnel-Prot',
+  'client_dns_sed' => 'Client_DNS_Sec',
   'framed_ip_netmask' => 'Framed-IP-Netmask',
+  'usr_call_reference_numbe' => 'USR-Call-Reference-Number',
   'ascend_egress_enabled' => 'Ascend-Egress-Enabled',
   'ascend_dsl_rate_mode' => 'Ascend-Dsl-Rate-Mode',
-  'x_ascend_client_primary_' => 'X-Ascend-Client-Primary-DNS',
   'usr_pw_usr_ofilter_sap' => 'USR-PW_USR_OFilter_SAP',
+  'bintec_iproutetable' => 'BinTec-ipRouteTable',
   'acct_terminate_cause' => 'Acct-Terminate-Cause',
   'x_ascend_fr_dte_n393' => 'X-Ascend-FR-DTE-N393',
-  'x_ascend_call_block_dura' => 'X-Ascend-Call-Block-Duration',
   'ascend_ppp_address' => 'Ascend-PPP-Address',
+  'erx_maximum_bps' => 'ERX-Maximum-BPS',
   'caller_id' => 'Caller-ID',
-  'bind_int_interface_name' => 'Bind_Int_Interface_Name',
-  'x_ascend_ppp_vj_slot_com' => 'X-Ascend-PPP-VJ-Slot-Comp',
+  'bintec_ipfiltertable' => 'BinTec-ipFilterTable',
+  'x_ascend_base_channel_co' => 'X-Ascend-Base-Channel-Count',
+  'bind_int_interface_name' => 'Bind-Int-Interface-Name',
   'usr_modem_group' => 'USR-Modem-Group',
   'cisco_maximum_channels' => 'Cisco-Maximum-Channels',
+  'erx_ppp_username' => 'ERX-PPP-Username',
   'ascend_link_compression' => 'Ascend-Link-Compression',
+  'annex_retransmitted_pack' => 'Annex-Retransmitted-Packets',
   'usr_retrains_granted' => 'USR-Retrains-Granted',
   'ascend_dropped_packets' => 'Ascend-Dropped-Packets',
+  'erx_bearer_type' => 'ERX-Bearer-Type',
   'usr_pw_usr_ofilter_ip' => 'USR-PW_USR_OFilter_IP',
   'quintum_nas_port' => 'Quintum-NAS-Port',
+  'x_ascend_pre_output_pack' => 'X-Ascend-Pre-Output-Packets',
+  'usr_cdma_call_reference_' => 'USR-CDMA-Call-Reference-Number',
+  'tunnel_function' => 'Tunnel-Function',
   'annex_tunnel_authen_mode' => 'Annex-Tunnel-Authen-Mode',
-  'tunnel_function' => 'Tunnel_Function',
   'usr_mp_edo' => 'USR-MP-EDO',
   'le_nat_outmap' => 'LE-NAT-Outmap',
+  'cvpn3000_primary_dns' => 'CVPN3000-Primary-DNS',
   'usr_modulation_type' => 'USR-Modulation-Type',
+  'ascend_calling_id_screen' => 'Ascend-Calling-Id-Screening',
   'ascend_maximum_time' => 'Ascend-Maximum-Time',
+  'user_password' => 'User-Password',
   'annex_callback_portlist' => 'Annex-Callback-Portlist',
-  'x_ascend_remove_seconds' => 'X-Ascend-Remove-Seconds',
+  'cvpn3000_ipsec_split_tun' => 'CVPN3000-IPSec-Split-Tunnel-List',
+  'annex_pre_output_packets' => 'Annex-Pre-Output-Packets',
+  'usr_at_call_output_filte' => 'USR-AT-Call-Output-Filter',
+  'x_ascend_client_primary_' => 'X-Ascend-Client-Primary-DNS',
   'tunnel_server_endpoint' => 'Tunnel-Server-Endpoint',
+  'x_ascend_remove_seconds' => 'X-Ascend-Remove-Seconds',
+  'cvpn3000_user_auth_serve' => 'CVPN3000-User-Auth-Server-Name',
   'arap_password' => 'ARAP-Password',
+  'x_ascend_assign_ip_serve' => 'X-Ascend-Assign-IP-Server',
+  'cisco_fax_pages' => 'Cisco-Fax-Pages',
   'ms_chap_mppe_keys' => 'MS-CHAP-MPPE-Keys',
   'ascend_source_auth' => 'Ascend-Source-Auth',
   'group' => 'Group',
   'usr_send_script6' => 'USR-Send-Script6',
   'le_nat_inmap' => 'LE-NAT-Inmap',
   'chap_password' => 'CHAP-Password',
-  'annex_primary_nbns_serve' => 'Annex-Primary-NBNS-Server',
   'annex_receive_speed' => 'Annex-Receive-Speed',
-  'usr_rmmie_manufacturer_i' => 'USR-RMMIE-Manufacturer-ID',
-  'bind_l2tp_flow_control' => 'Bind_L2TP_Flow_Control',
+  'usr_mobileip_home_agent_' => 'USR-MobileIP-Home-Agent-Address',
+  'bind_l2tp_flow_control' => 'Bind-L2TP-Flow-Control',
   'smb_account_ctrl' => 'SMB-Account-CTRL',
-  'ascend_calling_id_presen' => 'Ascend-Calling-Id-Presentatn',
   'ascend_ip_pool_chaining' => 'Ascend-IP-Pool-Chaining',
   'le_admin_group' => 'LE-Admin-Group',
-  'nas_identifier' => 'NAS-Identifier',
-  'x_ascend_history_weigh_t' => 'X-Ascend-History-Weigh-Type',
   'tunnel_connection_id' => 'Tunnel-Connection-Id',
-  'nas_real_port' => 'NAS_Real_Port',
+  'tunnel_windox' => 'Tunnel_Window',
+  'nas_identifier' => 'NAS-Identifier',
+  'dhcp_max_leaset' => 'DHCP_Max_Leases',
+  'digest_nonce_count' => 'Digest-Nonce-Count',
+  'nas_real_port' => 'NAS-Real-Port',
   'ms_old_arap_password' => 'MS-Old-ARAP-Password',
-  'usr_ip_rip_simple_auth_p' => 'USR-IP-RIP-Simple-Auth-Password',
-  'erx_primary_wins' => 'ERX-Primary-Wins',
   'usr_pw_index' => 'USR-PW_Index',
-  'erx_cli_allow_all_vr_acc' => 'ERX-Cli-Allow-All-VR-Access',
+  'erx_primary_wins' => 'ERX-Primary-Wins',
+  'ascend_appletalk_peer_mo' => 'Ascend-Appletalk-Peer-Mode',
   'le_ipsec_log_options' => 'LE-IPSec-Log-Options',
-  'ascend_home_agent_ip_add' => 'Ascend-Home-Agent-IP-Addr',
+  'x_ascend_maximum_channel' => 'X-Ascend-Maximum-Channels',
+  'cvx_ipsvc_aznlvl' => 'CVX-IPSVC-AZNLVL',
+  'x_ascend_client_secondar' => 'X-Ascend-Client-Secondary-DNS',
   'annex_re_chap_timeout' => 'Annex-Re-CHAP-Timeout',
-  'usr_final_tx_link_data_r' => 'USR-Final-Tx-Link-Data-Rate',
-  'client_dns_pri' => 'Client_DNS_Pri',
+  'aat_ip_pool_definition' => 'AAT-IP-Pool-Definition',
+  'client_dns_pri' => 'Client-DNS-Pri',
+  'cisco_service_info' => 'Cisco-Service-Info',
   'usr_primary_nbns_server' => 'USR-Primary_NBNS_Server',
-  'usr_cusr_hat_script_rule' => 'USR-CUSR-hat-Script-Rules',
-  'ascend_multicast_rate_li' => 'Ascend-Multicast-Rate-Limit',
-  'usr_rmmie_pwrlvl_farecho' => 'USR-RMMIE-PwrLvl-FarEcho-Canc',
+  'aat_atm_direct' => 'AAT-ATM-Direct',
+  'bind_ses_contexu' => 'Bind_Ses_Context',
+  'sip_translated_request_u' => 'Sip-Translated-Request-URI',
   'acc_acct_on_off_reason' => 'Acc-Acct-On-Off-Reason',
   'le_multicast_client' => 'LE-Multicast-Client',
+  'bind_sub_passwore' => 'Bind_Sub_Password',
+  'cvpn3000_cisco_ip_phone_' => 'CVPN3000-Cisco-IP-Phone-Bypass',
   'ascend_send_passwd' => 'Ascend-Send-Passwd',
-  'annex_unauthenticated_ti' => 'Annex-Unauthenticated-Time',
-  'tunnel_context' => 'Tunnel_Context',
-  'acc_nbns_server_sec' => 'Acc-Nbns-Server-Sec',
+  'tunnel_remote_namf' => 'Tunnel_Remote_Name',
+  'cvx_disconnect_cause' => 'CVX-Disconnect-Cause',
+  'itk_auth_serv_prot' => 'ITK-Auth-Serv-Prot',
+  'tunnel_context' => 'Tunnel-Context',
+  'digest_uri' => 'Digest-URI',
   'usr_channel_decrement' => 'USR-Channel-Decrement',
-  'usr_rmmie_firmware_versi' => 'USR-RMMIE-Firmware-Version',
+  'acc_nbns_server_sec' => 'Acc-Nbns-Server-Sec',
   'ms_chap_challenge' => 'MS-CHAP-Challenge',
-  'x_ascend_client_secondar' => 'X-Ascend-Client-Secondary-DNS',
+  'cisco_assign_ip_pool' => 'Cisco-Assign-IP-Pool',
   'ascend_cbcp_mode' => 'Ascend-CBCP-Mode',
   'ascend_x25_rpoa' => 'Ascend-X25-Rpoa',
   'usr_dtr_false_timeout' => 'USR-DTR-False-Timeout',
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Proto',
-  'ascend_x25_pad_x3_parame' => 'Ascend-X25-Pad-X3-Parameters',
+  'acct_dyn_ac_enu' => 'Acct_Dyn_Ac_Ent',
   'usr_physical_state' => 'USR-Physical-State',
+  'x_ascend_ppp_vj_slot_com' => 'X-Ascend-PPP-VJ-Slot-Comp',
+  'x_ascend_link_compressio' => 'X-Ascend-Link-Compression',
   'ascend_fr_t391' => 'Ascend-FR-T391',
-  'bind_dot1q_port' => 'Bind_Dot1q_Port',
-  'lac_port_type' => 'LAC_Port_Type',
-  'bg_aging_time' => 'BG_Aging_Time',
+  'bind_dot1q_port' => 'Bind-Dot1q-Port',
+  'ns_secondary_dns' => 'NS-Secondary-DNS',
+  'altiga_ipsec_tunnel_type' => 'Altiga-IPSec-Tunnel-Type-G',
+  'lac_port_type' => 'LAC-Port-Type',
+  'bg_aging_time' => 'BG-Aging-Time',
   'erx_atm_scr' => 'ERX-Atm-SCR',
+  'x_ascend_pre_input_octet' => 'X-Ascend-Pre-Input-Octets',
+  'cisco_fax_connect_speed' => 'Cisco-Fax-Connect-Speed',
   'x_ascend_menu_item' => 'X-Ascend-Menu-Item',
+  'quintum_h323_voice_quali' => 'Quintum-h323-voice-quality',
   'ascend_x25_pad_banner' => 'Ascend-X25-Pad-Banner',
+  'module_failure_message' => 'Module-Failure-Message',
   'h323_gw_id' => 'h323-gw-id',
   'h323_preferred_lang' => 'h323-preferred-lang',
   'usr_min_compression_size' => 'USR-Min-Compression-Size',
   'usr_compression_type' => 'USR-Compression-Type',
-  'x_ascend_call_attempt_li' => 'X-Ascend-Call-Attempt-Limit',
+  'bintec_ipxstaticroutetab' => 'BinTec-ipxStaticRouteTable',
   'ascend_dialout_allowed' => 'Ascend-Dialout-Allowed',
   'annex_local_username' => 'Annex-Local-Username',
   'cisco_pre_input_packets' => 'Cisco-Pre-Input-Packets',
-  'ascend_send_secret' => 'Ascend-Send-Secret',
   'shiva_function' => 'Shiva-Function',
-  'usr_dte_data_idle_timout' => 'USR-DTE-Data-Idle-Timout',
+  'ascend_send_secret' => 'Ascend-Send-Secret',
   'usr_number_of_blers' => 'USR-Number-of-Blers',
+  'usr_dte_data_idle_timout' => 'USR-DTE-Data-Idle-Timout',
   'usr_card_type' => 'USR-Card-Type',
-  'ascend_token_idle' => 'Ascend-Token-Idle',
+  'x_ascend_connect_progres' => 'X-Ascend-Connect-Progress',
   'x_ascend_group' => 'X-Ascend-Group',
+  'ascend_token_idle' => 'Ascend-Token-Idle',
+  'erx_qos_profile_interfac' => 'ERX-Qos-Profile-Interface-Type',
+  'ascend_private_route_tab' => 'Ascend-Private-Route-Table-ID',
   'nt_password' => 'NT-Password',
-  'acct_mcast_in_packets' => 'Acct_Mcast_In_Packets',
+  'acct_mcast_in_packets' => 'Acct-Mcast-In-Packets',
+  'x_ascend_multicast_clien' => 'X-Ascend-Multicast-Client',
   'usr_supports_tags' => 'USR-Supports-Tags',
+  'cvpn3000_authd_user_idle' => 'CVPN3000-Authd-User-Idle-Timeout',
   'ascend_number_sessions' => 'Ascend-Number-Sessions',
   'x_ascend_add_seconds' => 'X-Ascend-Add-Seconds',
   'usr_number_of_upshifts' => 'USR-Number-of-Upshifts',
   'proxy_to_realm' => 'Proxy-To-Realm',
+  'aat_client_secondary_win' => 'AAT-Client-Secondary-WINS-NBNS',
+  'aat_ip_tos_precedence' => 'AAT-IP-TOS-Precedence',
   'acc_callback_num_valid' => 'Acc-Callback-Num-Valid',
-  'x_ascend_maximum_channel' => 'X-Ascend-Maximum-Channels',
+  'nokia_ggsn_ip_address' => 'Nokia-GGSN-IP-Address',
   'acc_access_community' => 'Acc-Access-Community',
-  'x_ascend_fr_direct_profi' => 'X-Ascend-FR-Direct-Profile',
+  'ascend_multicast_rate_li' => 'Ascend-Multicast-Rate-Limit',
+  'usr_default_dte_data_rat' => 'USR-Default-DTE-Data-Rate',
+  'usr_rmmie_pwrlvl_nearech' => 'USR-RMMIE-PwrLvl-NearEcho-Canc',
   'usr_send_name' => 'USR-Send-Name',
   'usr_chassis_slot' => 'USR-Chassis-Slot',
   'login_ip_host' => 'Login-IP-Host',
   'ascend_netware_timeout' => 'Ascend-Netware-timeout',
+  'bind_sub_user_at_context' => 'Bind-Sub-User-At-Context',
   'vendor_specific' => 'Vendor-Specific',
-  'bind_sub_user_at_context' => 'Bind_Sub_User_At_Context',
   'ascend_fr_direct_dlci' => 'Ascend-FR-Direct-DLCI',
-  'ascend_atm_fault_managem' => 'Ascend-ATM-Fault-Management',
   'ascend_qos_upstream' => 'Ascend-QOS-Upstream',
-  'source_validation' => 'Source_Validation',
+  'aat_user_mac_address' => 'AAT-User-MAC-Address',
+  'source_validation' => 'Source-Validation',
   'x_ascend_token_expiry' => 'X-Ascend-Token-Expiry',
+  'altiga_ipsec_user_group_' => 'Altiga-IPSec-User-Group-Lock-G',
   'ascend_dec_channel_count' => 'Ascend-Dec-Channel-Count',
+  'assigned_ip_addrest' => 'Assigned_IP_Address',
   'usr_local_framed_ip_addr' => 'USR-Local-Framed-IP-Addr',
   'usr_service_option' => 'USR-Service-Option',
   'usr_transmit_acc_map' => 'USR-Transmit-Acc-Map',
   'ascend_fr_direct' => 'Ascend-FR-Direct',
+  'usr_final_rx_link_data_r' => 'USR-Final-Rx-Link-Data-Rate',
   'x_ascend_expect_callback' => 'X-Ascend-Expect-Callback',
+  'x_ascend_disconnect_caus' => 'X-Ascend-Disconnect-Cause',
   'acc_ml_damping_factor' => 'Acc-ML-Damping-Factor',
   'framed_netmask' => 'Framed-Netmask',
   'usr_connect_speed' => 'USR-Connect-Speed',
-  'ascend_client_primary_wi' => 'Ascend-Client-Primary-WINS',
+  'x_ascend_home_agent_ip_a' => 'X-Ascend-Home-Agent-IP-Addr',
+  'usr_disconnect_cause_ind' => 'USR-Disconnect-Cause-Indicator',
+  'bg_span_dis' => 'BG-Span-Dis',
   'cisco_multilink_id' => 'Cisco-Multilink-ID',
-  'bg_span_dis' => 'BG_Span_Dis',
+  'tunnel_max_tunnels' => 'Tunnel-Max-Tunnels',
+  'ascend_dsl_downstream_li' => 'Ascend-Dsl-Downstream-Limit',
   'ascend_multilink_id' => 'Ascend-Multilink-ID',
-  'tunnel_max_tunnels' => 'Tunnel_Max_Tunnels',
+  'altiga_ipsec_default_dom' => 'Altiga-IPSec-Default-Domain-G',
   'ascend_dhcp_reply' => 'Ascend-DHCP-Reply',
+  'login_ipv6_host' => 'Login-IPv6-Host',
   'ascend_x25_cug' => 'Ascend-X25-Cug',
   'shiva_network_protocols' => 'Shiva-Network-Protocols',
+  'cvpn3000_ipsec_mode_conf' => 'CVPN3000-IPSec-Mode-Config',
+  'extreme_netlogin_vlan' => 'Extreme-Netlogin-Vlan',
   'ascend_ara_pw' => 'Ascend-Ara-PW',
-  'ip_host_addr' => 'Ip_Host_Addr',
+  'tunnel_l2f_second_passwo' => 'Tunnel-L2F-Second-Password',
+  'altiga_sep_card_assignme' => 'Altiga-SEP-Card-Assignment-G/U',
+  'ip_host_addr' => 'Ip-Host-Addr',
   'le_ip_gateway' => 'LE-IP-Gateway',
   'usr_mobile_numbytes_txed' => 'USR-Mobile-NumBytes-Txed',
+  'altiga_ipsec_allow_passw' => 'Altiga-IPSec-Allow-Passwd-Store-G/U',
+  'itk_users_default_entry' => 'ITK-Users-Default-Entry',
+  'quintum_h323_redirect_nu' => 'Quintum-h323-redirect-number',
   'x_ascend_fr_t392' => 'X-Ascend-FR-T392',
+  'acc_igmp_version' => 'Acc-Igmp-Version',
   'cisco_pre_output_packets' => 'Cisco-Pre-Output-Packets',
-  'tunnel_group' => 'Tunnel_Group',
-  'bind_sub_password' => 'Bind_Sub_Password',
+  'tunnel_group' => 'Tunnel-Group',
+  'x_ascend_home_agent_udp_' => 'X-Ascend-Home-Agent-UDP-Port',
+  'cvpn3000_tunneling_proto' => 'CVPN3000-Tunneling-Protocols',
+  'usr_igmp_maximum_respons' => 'USR-IGMP-Maximum-Response-Time',
+  'bind_sub_password' => 'Bind-Sub-Password',
   'eap_message' => 'EAP-Message',
   'exec_program' => 'Exec-Program',
-  'bg_path_cost' => 'BG_Path_Cost',
-  'auth_type' => 'Auth-Type',
+  'cvpn3000_reqrd_client_fx' => 'CVPN3000-Reqrd-Client-Fw-Product-Code',
+  'bg_path_cost' => 'BG-Path-Cost',
   'usr_modem_training_time' => 'USR-Modem-Training-Time',
-  'ascend_cbcp_enable' => 'Ascend-CBCP-Enable',
+  'auth_type' => 'Auth-Type',
+  'itk_acct_serv_prot' => 'ITK-Acct-Serv-Prot',
   'x_ascend_ipx_route' => 'X-Ascend-IPX-Route',
+  'altiga_primary_dns_g' => 'Altiga-Primary-DNS-G',
+  'ascend_cbcp_enable' => 'Ascend-CBCP-Enable',
+  'ms_mppe_encryption_polic' => 'MS-MPPE-Encryption-Policy',
+  'annex_unauthenticated_ti' => 'Annex-Unauthenticated-Time',
+  'annex_begin_receive_line' => 'Annex-Begin-Receive-Line-Level',
+  'ascend_atm_direct_profil' => 'Ascend-ATM-Direct-Profile',
+  'redcreek_tunneled_dns_se' => 'RedCreek-Tunneled-DNS-Server',
   'ascend_redirect_number' => 'Ascend-Redirect-Number',
   'h323_credit_time' => 'h323-credit-time',
+  'cvx_idle_limit' => 'CVX-Idle-Limit',
   'ascend_appletalk_route' => 'Ascend-Appletalk-Route',
+  'aat_ip_tos' => 'AAT-IP-TOS',
+  'cvx_ppp_address' => 'CVX-PPP-Address',
+  'aat_data_filter' => 'AAT-Data-Filter',
+  'cvx_primary_dns' => 'CVX-Primary-DNS',
   'shiva_link_protocol' => 'Shiva-Link-Protocol',
   'x_ascend_fr_circuit_name' => 'X-Ascend-FR-Circuit-Name',
-  'client_id' => 'Client-Id',
   'usr_appletalk' => 'USR-Appletalk',
-  'usr_mpip_tunnel_originat' => 'USR-MPIP-Tunnel-Originator',
+  'client_id' => 'Client-Id',
+  'tunnel_algorithn' => 'Tunnel_Algorithm',
+  'aat_assign_ip_pool' => 'AAT-Assign-IP-Pool',
+  'quintum_h323_incoming_co' => 'Quintum-h323-incoming-conf-id',
+  'aat_atm_vpi' => 'AAT-ATM-VPI',
   'annex_output_filter' => 'Annex-Output-Filter',
-  'pvc_circuit_padding' => 'PVC_Circuit_Padding',
-  'x_ascend_minimum_channel' => 'X-Ascend-Minimum-Channels',
+  'pvc_circuit_padding' => 'PVC-Circuit-Padding',
+  'usr_ipx_call_output_filt' => 'USR-IPX-Call-Output-Filter',
+  'usr_rmmie_planned_discon' => 'USR-RMMIE-Planned-Disconnect',
+  'session_error_msh' => 'Session_Error_Msg',
+  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Ttl',
   'h323_time_and_day' => 'h323-time-and-day',
-  'ascend_ipx_header_compre' => 'Ascend-IPX-Header-Compression',
+  'cvpn3000_ipsec_backup_se' => 'CVPN3000-IPSec-Backup-Servers',
   'termination_action' => 'Termination-Action',
-  'x_ascend_modem_portno' => 'X-Ascend-Modem-PortNo',
+  'cvpn3000_ipsec_client_fx' => 'CVPN3000-IPSec-Client-Fw-Filter-Opt',
+  'aat_client_primary_dnt' => 'AAT-Client-Primary-DNS',
   'acct_tunnel_packets_lost' => 'Acct-Tunnel-Packets-Lost',
+  'x_ascend_modem_portno' => 'X-Ascend-Modem-PortNo',
   'framed_filter_id' => 'Framed-Filter-Id',
   'usr_ccp_algorithm' => 'USR-CCP-Algorithm',
+  'quintum_h323_preferred_l' => 'Quintum-h323-preferred-lang',
+  'ascend_fr_link_status_dl' => 'Ascend-FR-Link-Status-DLCI',
   'ascend_token_expiry' => 'Ascend-Token-Expiry',
-  'annex_secondary_nbns_ser' => 'Annex-Secondary-NBNS-Server',
-  'usr_et_bridge_call_outpu' => 'USR-ET-Bridge-Call-Output-Filte',
+  'itk_auth_req_type' => 'ITK-Auth-Req-Type',
   'acc_modem_error_protocol' => 'Acc-Modem-Error-Protocol',
   'acc_request_type' => 'Acc-Request-Type',
+  'usr_last_number_dialed_i' => 'USR-Last-Number-Dialed-In-DNIS',
   'x_ascend_ipx_peer_mode' => 'X-Ascend-IPX-Peer-Mode',
   'ascend_ppp_vj_slot_comp' => 'Ascend-PPP-VJ-Slot-Comp',
   'cisco_presession_time' => 'Cisco-PreSession-Time',
   'usr_chat_script_name' => 'USR-Chat-Script-Name',
+  'tunnel_session_auti' => 'Tunnel_Session_Auth',
   'ascend_fr_circuit_name' => 'Ascend-FR-Circuit-Name',
   'ascend_expect_callback' => 'Ascend-Expect-Callback',
   'framed_mtu' => 'Framed-MTU',
-  'ascend_port_redir_protoc' => 'Ascend-Port-Redir-Protocol',
   'usr_pw_vpn_name' => 'USR-PW_VPN_Name',
+  'nomadix_ip_upsell' => 'Nomadix-IP-Upsell',
   'ascend_nas_port_format' => 'Ascend-NAS-Port-Format',
-  'shasta_vpn_name' => 'Shasta-VPN-Name',
   'usr_dtr_true_timeout' => 'USR-DTR-True-Timeout',
-  'ascend_third_prompt' => 'Ascend-Third-Prompt',
+  'shasta_vpn_name' => 'Shasta-VPN-Name',
   'connect_rate' => 'Connect-Rate',
-  'usr_block_error_count_li' => 'USR-Block-Error-Count-Limit',
+  'ascend_third_prompt' => 'Ascend-Third-Prompt',
+  'cabletron_protocol_enabl' => 'Cabletron-Protocol-Enable',
+  'annex_pre_input_octets' => 'Annex-Pre-Input-Octets',
+  'cvx_modem_error_correcti' => 'CVX-Modem-Error-Correction',
+  'cvx_ss7_session_id_type' => 'CVX-SS7-Session-ID-Type',
   'called_station_id' => 'Called-Station-Id',
+  'itk_ddi' => 'ITK-DDI',
   'usr_pw_cutoff' => 'USR-PW_Cutoff',
   'ascend_data_rate' => 'Ascend-Data-Rate',
+  'acct_input_packets_65' => 'Acct_Input_Packets_64',
   'x_ascend_ts_idle_mode' => 'X-Ascend-TS-Idle-Mode',
   'ascend_x25_pad_prompt' => 'Ascend-X25-Pad-Prompt',
   'x_ascend_dhcp_reply' => 'X-Ascend-DHCP-Reply',
   'acc_nbns_server_pri' => 'Acc-Nbns-Server-Pri',
+  'post_auth_type' => 'Post-Auth-Type',
   'ascend_call_filter' => 'Ascend-Call-Filter',
   'acc_tunnel_secret' => 'Acc-Tunnel-Secret',
-  'usr_simplified_v42bis_us' => 'USR-Simplified-V42bis-Usage',
-  'bind_int_context' => 'Bind_Int_Context',
+  'colubris_avpair' => 'Colubris-AVPair',
+  'bind_int_context' => 'Bind-Int-Context',
+  'annex_logical_channel_nu' => 'Annex-Logical-Channel-Number',
   'erx_virtual_router_name' => 'ERX-Virtual-Router-Name',
+  'wispr_redirection_url' => 'WISPr-Redirection-URL',
+  'bintec_ipextiftable' => 'BinTec-ipExtIfTable',
   'crypt_password' => 'Crypt-Password',
   'challenge_state' => 'Challenge-State',
-  'ascend_client_secondary_' => 'Ascend-Client-Secondary-DNS',
-  'strip_user_name' => 'Strip-User-Name',
+  'x_ascend_pre_input_packe' => 'X-Ascend-Pre-Input-Packets',
+  'altiga_ipsec_l2l_keepali' => 'Altiga-IPSec-L2L-Keepalives-G',
+  'x_ascend_dhcp_maximum_le' => 'X-Ascend-DHCP-Maximum-Leases',
+  'acc_dialout_auth_passwor' => 'Acc-Dialout-Auth-Password',
+  'itk_ip_pool' => 'ITK-IP-Pool',
+  'pvc_profile_namf' => 'PVC_Profile_Name',
   'x_ascend_user_acct_host' => 'X-Ascend-User-Acct-Host',
-  'x_ascend_route_ip' => 'X-Ascend-Route-IP',
-  'x_ascend_assign_ip_clien' => 'X-Ascend-Assign-IP-Client',
+  'strip_user_name' => 'Strip-User-Name',
+  'itk_ppp_client_server_mo' => 'ITK-PPP-Client-Server-Mode',
   'usr_mbi_ct_bchannel_used' => 'USR-Mbi_Ct_BChannel_Used',
+  'x_ascend_route_ip' => 'X-Ascend-Route-IP',
+  'ascend_seconds_of_histor' => 'Ascend-Seconds-Of-History',
+  'cvx_data_rate' => 'CVX-Data-Rate',
   'ascend_x25_profile_name' => 'Ascend-X25-Profile-Name',
+  'itk_ftp_auth_ip' => 'ITK-Ftp-Auth-IP',
+  'cisco_control_info' => 'Cisco-Control-Info',
+  'cvpn3000_secondary_wins' => 'CVPN3000-Secondary-WINS',
   'usr_call_type' => 'USR-Call-Type',
   'x_ascend_user_acct_base' => 'X-Ascend-User-Acct-Base',
+  'acct_mcast_in_packett' => 'Acct_Mcast_In_Packets',
+  'ns_vsys_name' => 'NS-VSYS-Name',
   'acct_output_gigawords' => 'Acct-Output-Gigawords',
-  'usr_rmmie_firmware_build' => 'USR-RMMIE-Firmware-Build-Date',
-  'ascend_fr_link_status_dl' => 'Ascend-FR-Link-Status-DLCI',
+  'bind_typf' => 'Bind_Type',
+  'bintec_ipqostable' => 'BinTec-ipQoSTable',
+  'bintec_ipxstaticservtabl' => 'BinTec-ipxStaticServTable',
+  'cvpn3000_l2tp_mppc_compr' => 'CVPN3000-L2TP-MPPC-Compression',
   'login_lat_port' => 'Login-LAT-Port',
   'usr_call_arrival_in_gmt' => 'USR-Call-Arrival-in-GMT',
-  'acct_mcast_in_octets' => 'Acct_Mcast_In_Octets',
+  'acct_mcast_in_octets' => 'Acct-Mcast-In-Octets',
   'erx_sa_validate' => 'ERX-Sa-Validate',
   'ascend_service_type' => 'Ascend-Service-Type',
-  'ascend_x25_nui_password_' => 'Ascend-X25-Nui-Password-Prompt',
   'usr_pw_vpn_gateway' => 'USR-PW_VPN_Gateway',
-  'ascend_fr_dce_n392' => 'Ascend-FR-DCE-N392',
   'acc_ip_compression' => 'Acc-Ip-Compression',
-  'lac_real_port_type' => 'LAC_Real_Port_Type',
-  'ascend_if_netmask' => 'Ascend-IF-Netmask',
+  'ascend_fr_dce_n392' => 'Ascend-FR-DCE-N392',
+  'bintec_ipxcirctable' => 'BinTec-ipxCircTable',
+  'lac_real_port_type' => 'LAC-Real-Port-Type',
+  'ascend_client_primary_dn' => 'Ascend-Client-Primary-DNS',
   'acct_session_start_time' => 'Acct-Session-Start-Time',
+  'ascend_if_netmask' => 'Ascend-IF-Netmask',
   'ms_chap_nt_enc_pw' => 'MS-CHAP-NT-Enc-PW',
-  'ascend_port_redir_portnu' => 'Ascend-Port-Redir-Portnum',
-  'mcast_maxgroups' => 'Mcast_MaxGroups',
-  'x_ascend_home_agent_ip_a' => 'X-Ascend-Home-Agent-IP-Addr',
+  'ms_mppe_encryption_types' => 'MS-MPPE-Encryption-Types',
+  'cisco_fax_process_abort_' => 'Cisco-Fax-Process-Abort-Flag',
+  'mcast_maxgroups' => 'Mcast-MaxGroups',
+  'annex_end_receive_line_l' => 'Annex-End-Receive-Line-Level',
+  'usr_ipx_call_input_filte' => 'USR-IPX-Call-Input-Filter',
+  'usr_back_channel_data_ra' => 'USR-Back-Channel-Data-Rate',
   'ascend_cache_time' => 'Ascend-Cache-Time',
   'x_ascend_data_svc' => 'X-Ascend-Data-Svc',
-  'erx_tunnel_virtual_route' => 'ERX-Tunnel-Virtual-Router',
   'usr_re_chap_timeout' => 'USR-Re-Chap-Timeout',
+  'bintec_bibodialtable' => 'BinTec-biboDialTable',
+  'annex_connect_progress' => 'Annex-Connect-Progress',
   'x_ascend_ppp_vj_1172' => 'X-Ascend-PPP-VJ-1172',
   'usr_igmp_routing' => 'USR-IGMP-Routing',
+  'x_ascend_ip_pool_definit' => 'X-Ascend-IP-Pool-Definition',
   'h323_prompt_id' => 'h323-prompt-id',
+  'foundry_command_string' => 'Foundry-Command-String',
   'le_terminate_detail' => 'LE-Terminate-Detail',
+  'cvpn3000_pptp_encryption' => 'CVPN3000-PPTP-Encryption',
+  'quintum_h323_disconnect_' => 'Quintum-h323-disconnect-time',
   'acc_ml_clear_threshold' => 'Acc-ML-Clear-Threshold',
   'x_ascend_ip_direct' => 'X-Ascend-IP-Direct',
-  'nas_port' => 'NAS-Port',
-  'x_ascend_data_rate' => 'X-Ascend-Data-Rate',
   'usr_ip_call_input_filter' => 'USR-IP-Call-Input-Filter',
+  'x_ascend_data_rate' => 'X-Ascend-Data-Rate',
+  'nas_port' => 'NAS-Port',
+  'ascend_client_secondary_' => 'Ascend-Client-Secondary-WINS',
   'ascend_auth_type' => 'Ascend-Auth-Type',
   'x_ascend_preempt_limit' => 'X-Ascend-Preempt-Limit',
+  'cvx_xmit_rate' => 'CVX-Xmit-Rate',
+  'annex_transmitted_packet' => 'Annex-Transmitted-Packets',
   'h323_credit_amount' => 'h323-credit-amount',
   'usr_reply_script1' => 'USR-Reply-Script1',
-  'usr_et_bridge_input_filt' => 'USR-ET-Bridge-Input-Filter',
   'current_time' => 'Current-Time',
   'cisco_xmit_rate' => 'Cisco-Xmit-Rate',
-  'ascend_authen_alias' => 'Ascend-Authen-Alias',
   'x_ascend_session_svr_key' => 'X-Ascend-Session-Svr-Key',
+  'ascend_authen_alias' => 'Ascend-Authen-Alias',
+  'erx_redirect_vr_name' => 'ERX-Redirect-VR-Name',
+  'module_success_message' => 'Module-Success-Message',
   'acc_dialout_auth_mode' => 'Acc-Dialout-Auth-Mode',
+  'bind_auth_contexu' => 'Bind_Auth_Context',
+  'x_ascend_minimum_channel' => 'X-Ascend-Minimum-Channels',
   'usr_event_date_time' => 'USR-Event-Date-Time',
   'x_ascend_ipx_node_addr' => 'X-Ascend-IPX-Node-Addr',
-  'ascend_primary_home_agen' => 'Ascend-Primary-Home-Agent',
+  'cvpn3000_ipsec_over_udp' => 'CVPN3000-IPSec-Over-UDP',
   'x_ascend_user_acct_time' => 'X-Ascend-User-Acct-Time',
-  'usr_at_call_output_filte' => 'USR-AT-Call-Output-Filter',
+  'cisco_email_server_ack_f' => 'Cisco-Email-Server-Ack-Flag',
+  'telebit_activate_command' => 'Telebit-Activate-Command',
   'acc_output_errors' => 'Acc-Output-Errors',
-  'usr_ipx_rip_output_filte' => 'USR-IPX-RIP-Output-Filter',
+  'juniper_allow_configurat' => 'Juniper-Allow-Configuration',
+  'bind_l2tp_tunnel_name' => 'Bind-L2TP-Tunnel-Name',
   'x_ascend_pri_number_type' => 'X-Ascend-PRI-Number-Type',
-  'bind_l2tp_tunnel_name' => 'Bind_L2TP_Tunnel_Name',
-  'replicate_to_realm' => 'Replicate-To-Realm',
+  'bintec_biboppptable' => 'BinTec-biboPPPTable',
+  'le_ipsec_outsource_profi' => 'LE-IPSec-Outsource-Profile',
   'usr_at_zip_input_filter' => 'USR-AT-Zip-Input-Filter',
+  'replicate_to_realm' => 'Replicate-To-Realm',
   'annex_mrru' => 'Annex-MRRU',
   'event_timestamp' => 'Event-Timestamp',
+  'nokia_sgsn_ip_address' => 'Nokia-SGSN-IP-Address',
   'ascend_pre_input_packets' => 'Ascend-Pre-Input-Packets',
+  'cvpn5000_client_assigned' => 'CVPN5000-Client-Assigned-IP',
+  'tunnel_dnit' => 'Tunnel_DNIS',
   'h323_call_origin' => 'h323-call-origin',
   'x_ascend_fr_type' => 'X-Ascend-FR-Type',
+  'itk_provider_id' => 'ITK-Provider-Id',
+  'cvx_ppp_log_mask' => 'CVX-PPP-Log-Mask',
   'x_ascend_token_idle' => 'X-Ascend-Token-Idle',
+  'usr_rmmie_pwrlvl_xmit_lv' => 'USR-RMMIE-PwrLvl-Xmit-Lvl',
   'usr_igmp_query_interval' => 'USR-IGMP-Query-Interval',
+  'quintum_h323_billing_mod' => 'Quintum-h323-billing-model',
   'ascend_atm_vci' => 'Ascend-ATM-Vci',
   'usr_port_tap_output' => 'USR-Port-Tap-Output',
   'session' => 'Session',
+  'itk_welcome_message' => 'ITK-Welcome-Message',
+  'cvpn3000_ike_keep_alives' => 'CVPN3000-IKE-Keep-Alives',
   'ascend_uu_info' => 'Ascend-UU-Info',
-  'ms_mppe_recv_key' => 'MS-MPPE-Recv-Key',
+  'usr_et_bridge_call_outpu' => 'USR-ET-Bridge-Call-Output-Filte',
   'usr_secondary_dns_server' => 'USR-Secondary_DNS_Server',
-  'x_ascend_tunneling_proto' => 'X-Ascend-Tunneling-Protocol',
+  'ms_mppe_recv_key' => 'MS-MPPE-Recv-Key',
+  'bintec_ripcirctable' => 'BinTec-ripCircTable',
   'acc_dial_port_index' => 'Acc-Dial-Port-Index',
   'cisco_nas_port' => 'Cisco-NAS-Port',
+  'itk_username' => 'ITK-Username',
   'usr_send_script1' => 'USR-Send-Script1',
+  'cvpn3000_ipsec_ike_peer_' => 'CVPN3000-IPSec-IKE-Peer-ID-Check',
+  'ascend_dsl_upstream_limi' => 'Ascend-Dsl-Upstream-Limit',
+  'x_ascend_dec_channel_cou' => 'X-Ascend-Dec-Channel-Count',
   'usr_tunnel_security' => 'USR-Tunnel-Security',
   'arap_security' => 'ARAP-Security',
   'tunnel_preference' => 'Tunnel-Preference',
+  'cisco_port_used' => 'Cisco-Port-Used',
   'usr_reply_script4' => 'USR-Reply-Script4',
-  'h323_currency_type' => 'h323-currency-type',
+  'cvpn5000_client_real_ip' => 'CVPN5000-Client-Real-IP',
   'usr_rmmie_status' => 'USR-RMMIE-Status',
-  'ascend_shared_profile_en' => 'Ascend-Shared-Profile-Enable',
-  'annex_syslog_tap' => 'Annex-Syslog-Tap',
   'usr_send_script4' => 'USR-Send-Script4',
+  'quintum_h323_connect_tim' => 'Quintum-h323-connect-time',
+  'annex_syslog_tap' => 'Annex-Syslog-Tap',
+  'redcreek_tunneled_hostna' => 'RedCreek-Tunneled-HostName',
   'acc_clearing_location' => 'Acc-Clearing-Location',
+  'ascend_access_intercept_' => 'Ascend-Access-Intercept-LEA',
   'annex_disconnect_reason' => 'Annex-Disconnect-Reason',
-  'x_ascend_dhcp_maximum_le' => 'X-Ascend-DHCP-Maximum-Leases',
   'usr_at_input_filter' => 'USR-AT-Input-Filter',
   'usr_auth_mode' => 'USR-Auth-Mode',
-  'shiva_session_id' => 'Shiva-Session-Id',
   'usr_expected_voltage' => 'USR-Expected-Voltage',
+  'shiva_session_id' => 'Shiva-Session-Id',
+  'annex_maximum_call_durat' => 'Annex-Maximum-Call-Duration',
+  'usr_block_error_count_li' => 'USR-Block-Error-Count-Limit',
   'ascend_owner_ip_addr' => 'Ascend-Owner-IP-Addr',
-  'ascend_atm_direct_profil' => 'Ascend-ATM-Direct-Profile',
+  'bind_tun_contexu' => 'Bind_Tun_Context',
   'usr_pw_usr_ofilter_ipx' => 'USR-PW_USR_OFilter_IPX',
   'framed_routing' => 'Framed-Routing',
-  'pam_auth' => 'Pam-Auth',
+  'annex_primary_nbns_serve' => 'Annex-Primary-NBNS-Server',
   'usr_interface_index' => 'USR-Interface-Index',
-  'x_ascend_transit_number' => 'X-Ascend-Transit-Number',
+  'pam_auth' => 'Pam-Auth',
   'usr_end_time' => 'USR-End-Time',
+  'rate_limit_bursu' => 'Rate_Limit_Burst',
+  'nomadix_expiration' => 'Nomadix-Expiration',
+  'x_ascend_transit_number' => 'X-Ascend-Transit-Number',
+  'itk_usergroup' => 'ITK-Usergroup',
   'x_ascend_assign_ip_pool' => 'X-Ascend-Assign-IP-Pool',
+  'annex_secondary_nbns_ser' => 'Annex-Secondary-NBNS-Server',
+  'bind_dot1q_vlan_tag_id' => 'Bind-Dot1q-Vlan-Tag-Id',
   'ms_secondary_nbns_server' => 'MS-Secondary-NBNS-Server',
-  'bind_dot1q_vlan_tag_id' => 'Bind_Dot1q_Vlan_Tag_Id',
+  'tunnel_retransmit' => 'Tunnel-Retransmit',
   'acct_tunnel_connection' => 'Acct-Tunnel-Connection',
-  'tunnel_retransmit' => 'Tunnel_Retransmit',
   'x_ascend_backup' => 'X-Ascend-Backup',
+  'xedia_ppp_echo_interval' => 'Xedia-PPP-Echo-Interval',
   'usr_bearer_capabilities' => 'USR-Bearer-Capabilities',
-  'ascend_calling_id_type_o' => 'Ascend-Calling-Id-Type-Of-Num',
   'shiva_acct_serv_switch' => 'Shiva-Acct-Serv-Switch',
-  'ascend_h323_conference_i' => 'Ascend-H323-Conference-Id',
   'acct_authentic' => 'Acct-Authentic',
+  'le_nat_other_session_tim' => 'LE-NAT-Other-Session-Timeout',
+  'cvpn3000_ipsec_banner2' => 'CVPN3000-IPSec-Banner2',
   'x_ascend_force_56' => 'X-Ascend-Force-56',
   'framed_appletalk_network' => 'Framed-AppleTalk-Network',
   'reply_message' => 'Reply-Message',
-  'annex_addr_resolution_pr' => 'Annex-Addr-Resolution-Protocol',
   'class' => 'Class',
   'h323_conf_id' => 'h323-conf-id',
+  'quintum_h323_disconnecta' => 'Quintum-h323-disconnect-cause',
+  'itk_filter_rule' => 'ITK-Filter-Rule',
+  'wispr_bandwidth_max_up' => 'WISPr-Bandwidth-Max-Up',
+  'usr_appletalk_network_ra' => 'USR-Appletalk-Network-Range',
   'ascend_cbcp_delay' => 'Ascend-CBCP-Delay',
+  'usr_dte_ring_no_answer_l' => 'USR-DTE-Ring-No-Answer-Limit',
+  'pre_acct_type' => 'Pre-Acct-Type',
+  'usr_local_ip_address' => 'USR-Local-IP-Address',
   'ascend_dropped_octets' => 'Ascend-Dropped-Octets',
   'ascend_h323_dialed_time' => 'Ascend-H323-Dialed-Time',
-  'usr_local_ip_address' => 'USR-Local-IP-Address',
+  'cisco_email_server_addre' => 'Cisco-Email-Server-Address',
   'ascend_x25_x121_address' => 'Ascend-X25-X121-Address',
-  'ascend_destination_nas_p' => 'Ascend-Destination-Nas-Port',
-  'annex_local_ip_address' => 'Annex-Local-IP-Address',
+  'cvx_multicast_client' => 'CVX-Multicast-Client',
+  'wispr_bandwidth_min_up' => 'WISPr-Bandwidth-Min-Up',
   'usr_at_output_filter' => 'USR-AT-Output-Filter',
+  'annex_local_ip_address' => 'Annex-Local-IP-Address',
   'cisco_ip_pool_definition' => 'Cisco-IP-Pool-Definition',
+  'cisco_gateway_id' => 'Cisco-Gateway-Id',
+  'itk_password_prompt' => 'ITK-Password-Prompt',
   'annex_domain_name' => 'Annex-Domain-Name',
+  'foundry_command_exceptio' => 'Foundry-Command-Exception-Flag',
   'ascend_preempt_limit' => 'Ascend-Preempt-Limit',
+  'erx_minimum_bps' => 'ERX-Minimum-BPS',
+  'aat_mcast_client' => 'AAT-MCast-Client',
+  'ascend_atm_fault_managem' => 'Ascend-ATM-Fault-Management',
   'ascend_event_type' => 'Ascend-Event-Type',
-  'x_ascend_pre_input_octet' => 'X-Ascend-Pre-Input-Octets',
   'exec_program_wait' => 'Exec-Program-Wait',
-
-  #NOMENT
-  'nomadix_ip_upsell' => 'Nomadix-IP-Upsell',
+  'framed_interface_id' => 'Framed-Interface-Id',
 
   #NETC.NET.AU (RADIATOR?)
   'authentication_type' => 'Authentication-Type',
diff --git a/bin/generate-raddb b/bin/generate-raddb
index 1d0053a2b..f946b05b3 100755
--- a/bin/generate-raddb
+++ b/bin/generate-raddb
@@ -13,10 +13,18 @@ END
 while (<>) {
   next if /^(#|\s*$|\$INCLUDE\s+)/;
   next if /^(VALUE|VENDOR|BEGIN\-VENDOR|END\-VENDOR)\s+/;
-  /^(ATTRIBUTE|ATTRIB_NMC)\s+([\w\-]+)\s+/ or die $_;
+  /^(ATTRIBUTE|ATTRIB_NMC)\s+([\w\-\/]+)\s+/ or die $_;
   $attrib = $2;
   $dbname = lc($2);
-  $dbname =~ s/\-/_/g;
+  $dbname =~ s/[\-\/]/_/g;
+  $dbname = substr($dbname,0,24);
+  while ( exists $hash{$dbname} ) {
+    #warn $dbname;
+    $dbname =~ s/(.)$//;
+    my $w = $1;
+    $w =~ tr/_a-z0-9/a-z0-9_/;
+    $dbname = "$dbname$w";
+  }
   $hash{$dbname} = $attrib;
   #print "$2\n";
 }
@@ -25,8 +33,10 @@ foreach ( keys %hash ) {
 #  print "$_\n" if length($_)>24;
 #  print substr($_,0,24),"\n" if length($_)>24; 
 #  $max = length($_) if length($_)>$max;
-#everything >24 is still unique, at least with freeradius comprehensive dataset
-  print "  '". substr($_,0,24). "' => '$hash{$_}',\n";
+# have to fudge things since everything >24 is *not* unique
+
+  #print "  '". substr($_,0,24). "' => '$hash{$_}',\n";
+  print "  '$_' => '$hash{$_}',\n";
 }
 
 print <<END;
-- 
cgit v1.2.1


From 9d7f2b5a7bd69a3f968277df8e5fb8491a66a1e5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 2 Oct 2003 10:18:24 +0000
Subject: added -y switch to freeside-daily to specify an offset in days

---
 FS/bin/freeside-daily | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 80b8edf82..5fb966665 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -10,8 +10,8 @@ use FS::Conf;
 use FS::cust_main;
 
 &untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_d $opt_v $opt_p $opt_s);
-getopts("p:d:vs");
+use vars qw($opt_d $opt_v $opt_p $opt_s $opt_y);
+getopts("p:d:vsy:");
 my $user = shift or die &usage;
 
 adminsuidsetup $user;
@@ -28,6 +28,7 @@ my @cust_main = @ARGV
 
 #we're at now now (and later).
 my($time)= $opt_d ? str2time($opt_d) : $^T;
+$time += $opt_y * 86400 if $opt_y;
 
 my($cust_main,%saw);
 foreach $cust_main ( @cust_main ) {
@@ -99,7 +100,7 @@ freeside-daily - Run daily billing and invoice collection events.
 
 =head1 SYNOPSIS
 
-  freeside-daily [ -d 'date' ] [ -p 'payby' ] [ -s ] [ -v ] user [ custnum custnum ... ]
+  freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -s ] [ -v ] user [ custnum custnum ... ]
 
 =head1 DESCRIPTION
 
@@ -114,6 +115,11 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
   -d: Pretend it's 'date'.  Date is in any format Date::Parse is happy with,
       but be careful.
 
+  -y: In addition to -d, which specifies an absolute date, the -y switch
+      specifies an offset, in days.  For example, "-y 15" would increment the
+      "pretend date" 15 days from whatever was specified by the -d switch
+      (or now, if no -d switch was given).
+
   -p: Only process customers with the specified payby (I<CARD>, I<DCRD>, I<CHEK>, I<DCHK>, I<BILL>, I<COMP>, I<LECB>)
 
   -s: re-charge setup fees
-- 
cgit v1.2.1


From d8ea8ef98411f56069ff4036bd5a2403b456655b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 2 Oct 2003 11:23:04 +0000
Subject: removing testing info

---
 fs_selfservice/FS-SelfService/cgi/login.html | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/fs_selfservice/FS-SelfService/cgi/login.html b/fs_selfservice/FS-SelfService/cgi/login.html
index ca6251eb1..5607de783 100644
--- a/fs_selfservice/FS-SelfService/cgi/login.html
+++ b/fs_selfservice/FS-SelfService/cgi/login.html
@@ -7,23 +7,20 @@
 <TR>
   <TH ALIGN="right">Username </TH>
   <TD>
-    <!-- <INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"> -->
-    <INPUT TYPE="text" NAME="username" VALUE="hslink">
+    <INPUT TYPE="text" NAME="username" VALUE="<%= $username %>">
   </TD>
 </TR>
 <TR>
   <TH ALIGN="right">Domain </TH>
   <TD>
-    <!-- <INPUT TYPE="text" NAME="domain" VALUE="<%= $domain %>"> -->
-    <INPUT TYPE="text" NAME="domain" VALUE="pobox.com">
+    <INPUT TYPE="text" NAME="domain" VALUE="<%= $domain %>">
   </TD>
 </TR>
 <!--<INPUT TYPE="hidden" NAME="domain" VALUE="myisp.com">-->
 <TR>
   <TH ALIGN="right">Password </TH>
   <TD>
-    <!-- <INPUT TYPE="password" NAME="password"> -->
-    <INPUT TYPE="password" NAME="password" VALUE="UwjM5zdb">
+    <INPUT TYPE="password" NAME="password">
   </TD>
 </TR>
 </TABLE>
-- 
cgit v1.2.1


From 98527623b1fea1107b2c0422a0838b4602c21fa9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 2 Oct 2003 12:42:23 +0000
Subject: update Makefile.PL dependancies (PREREQ_PM) for self-service module
 and signup wrapper

---
 fs_selfservice/FS-SelfService/Makefile.PL | 4 +++-
 fs_signup/FS-SignupClient/Makefile.PL     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs_selfservice/FS-SelfService/Makefile.PL b/fs_selfservice/FS-SelfService/Makefile.PL
index da0a0aa24..e5cbd1aef 100644
--- a/fs_selfservice/FS-SelfService/Makefile.PL
+++ b/fs_selfservice/FS-SelfService/Makefile.PL
@@ -8,7 +8,9 @@ WriteMakefile(
     'INSTALLSCRIPT'     => '/usr/local/sbin',
     'INSTALLSITEBIN'    => '/usr/local/sbin',
     'PERM_RWX'          => '750',
-    'PREREQ_PM'		=> {}, # e.g., Module::Name => 1.1
+    'PREREQ_PM'		=> {
+                             'Storable' => 0,
+                           }, # e.g., Module::Name => 1.1
     ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
       (ABSTRACT_FROM => 'SelfService.pm', # retrieve abstract from module
        AUTHOR     => 'Ivan Kohler <ivan-freeside-selfservice@420.am>') : ()),
diff --git a/fs_signup/FS-SignupClient/Makefile.PL b/fs_signup/FS-SignupClient/Makefile.PL
index e74051947..c3c213fb6 100644
--- a/fs_signup/FS-SignupClient/Makefile.PL
+++ b/fs_signup/FS-SignupClient/Makefile.PL
@@ -12,7 +12,7 @@ WriteMakefile(
                          'Business::CreditCard' => 0,
                          'HTTP::BrowserDetect' => 0,
                          'HTTP::Headers::UserAgent' => 3,
-                         'Storable' => 0,
                          'Text::Template' => 0,
+                         'FS::SelfService' => 0,
                        },
 );
-- 
cgit v1.2.1


From 2563e2d621c76a1fe9987e99e68fbe33e3f7aa7e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 2 Oct 2003 13:08:58 +0000
Subject: turn off super-verbose logging

---
 fs_selfservice/FS-SelfService/freeside-selfservice-clientd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
index 438d472c9..45d9da9c7 100644
--- a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
+++ b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
@@ -17,7 +17,7 @@ use IO::File;
 #STDOUT->setbuf('');
 
 use vars qw( $Debug );
-$Debug = 3; #2 will turn on child logging, 3 will log packet contents,
+$Debug = 2; #2 will turn on child logging, 3 will log packet contents,
             #including potentially compromising information
 
 my $socket = "/usr/local/freeside/selfservice_socket";
-- 
cgit v1.2.1


From 1e9ae4ab4387c8d646476df989e2e92c15ce468d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 2 Oct 2003 14:20:29 +0000
Subject: add emaildecline-exclude config option

---
 FS/FS/Conf.pm      | 7 +++++++
 FS/FS/cust_main.pm | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 400de69d6..51feb3847 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -957,6 +957,13 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'emaildecline-exclude',
+    'section'     => 'billing',
+    'description' => 'List of error messages that should not trigger email decline notices, one per line.',
+    'type'        => 'textarea',
+  },
+
   {
     'key'         => 'cancelmessage',
     'section'     => 'billing',
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index de22ab5c5..2ee8a42f0 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1774,6 +1774,8 @@ sub realtime_bop {
     if ( !$options{'quiet'} && !$realtime_bop_decline_quiet
          && $conf->exists('emaildecline')
          && grep { $_ ne 'POST' } $self->invoicing_list
+         && ! grep { $_ eq $transaction->error_message }
+                   $conf->config('emaildecline-exclude')
     ) {
       my @templ = $conf->config('declinetemplate');
       my $template = new Text::Template (
-- 
cgit v1.2.1


From f5a81134be779b26688d3d4703840f3b038ca2f7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 2 Oct 2003 14:26:48 +0000
Subject: minor Makefile updates

---
 Makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d4d753d6d..4a2afd000 100644
--- a/Makefile
+++ b/Makefile
@@ -13,20 +13,24 @@ ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 MASON_HANDLER = /usr/local/etc/freeside/handler.pl
 MASONDATA = /usr/local/etc/freeside/masondata
 
-#deb, others?
+#deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
+#redhat
+#FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside
 #freebsd
 #FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
 #openbsd
 #FREESIDE_DOCUMENT_ROOT = /var/www/htdocs/freeside
 
-#deb, others?
+#deb, redhat, others?
 INIT_FILE = /etc/init.d/freeside
 #freebsd
 #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
 
-#deb, others?
+#deb
 HTTPD_RESTART = /etc/init.d/apache restart
+#redhat
+#HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
 #HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
 #openbsd
@@ -34,7 +38,7 @@ HTTPD_RESTART = /etc/init.d/apache restart
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
-#deb, others?
+#deb, redhat, others?
 INSTALLGROUP = root
 #freebsd,openbsd
 #INSTALLGROUP = wheel
-- 
cgit v1.2.1


From 2b6242f9d8fe2d9afb3937e3eea03cd0ece1e5f8 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Thu, 2 Oct 2003 21:51:27 +0000
Subject: $field isn't a global.

---
 httemplate/edit/svc_broadband.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index 6828791c0..db27b3241 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -157,7 +157,7 @@ Service #<B><%=$svcnum ? $svcnum : "(NEW)"%></B><BR><BR>
 <% } %>
 
 <%
-foreach $field ($svc_broadband->virtual_fields) {
+foreach my $field ($svc_broadband->virtual_fields) {
   if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
     print $svc_broadband->pvf($field)->widget('HTML', 'edit',
         $svc_broadband->getfield($field));
-- 
cgit v1.2.1


From 71eb3c33da045ffdc963b5ad8111af8a8bef878d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 6 Oct 2003 11:14:30 +0000
Subject: agent browse shows # of active accounts & links to appropriate
 account search

---
 httemplate/browse/svc_acct_pop.cgi | 52 +++++++++++++++++++++++---------------
 httemplate/search/svc_acct.cgi     | 13 +++++++++-
 2 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index 8d35cb56a..80168728c 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -1,4 +1,9 @@
 <!-- mason kludge -->
+<%
+  my $accounts_sth = dbh->prepare("SELECT COUNT(*) FROM svc_acct
+                                     WHERE popnum = ?           ")
+    or die dbh->errstr;
+%>
 <%= header('Access Number Listing', menubar( 'Main Menu' => $p )) %>
 Points of Presence<BR><BR>
 <A HREF="<%= $p %>edit/svc_acct_pop.cgi"><I>Add new Access Number</I></A><BR><BR>
@@ -10,6 +15,7 @@ Points of Presence<BR><BR>
         <TH>Area code</TH>
         <TH>Exchange</TH>
         <TH>Local</TH>
+        <TH>Accounts</TH>
       </TR>
 
 <%
@@ -18,32 +24,38 @@ foreach my $svc_acct_pop ( sort {
   $a->state cmp $b->state || $a->city cmp $b->city
     || $a->ac <=> $b->ac || $a->exch <=> $b->exch || $a->loc <=> $b->loc
 } qsearch('svc_acct_pop',{}) ) {
-  my($hashref)=$svc_acct_pop->hashref;
-  print <<END;
+
+  my $svc_acct_pop_link = $p . 'edit/svc_acct_pop.cgi?'. $svc_acct_pop->popnum;
+
+  $accounts_sth->execute($svc_acct_pop->popnum) or die $accounts_sth->errstr;
+  my $num_accounts = $accounts_sth->fetchrow_arrayref->[0];
+
+  my $svc_acct_link = $p. 'search/svc_acct.cgi?popnum='. $svc_acct_pop->popnum;
+
+%>
       <TR>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{popnum}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{city}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{state}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{ac}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{exch}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{loc}</A></TD>
+        <TD><A HREF="<%= $svc_acct_pop_link %>">
+          <%= $svc_acct_pop->popnum %></A></TD>
+        <TD><A HREF="<%= $svc_acct_pop_link %>">
+          <%= $svc_acct_pop->city %></A></TD>
+        <TD><A HREF="<%= $svc_acct_pop_link %>">
+          <%= $svc_acct_pop->state %></A></TD>
+        <TD><A HREF="<%= $svc_acct_pop_link %>">
+          <%= $svc_acct_pop->ac %></A></TD>
+        <TD><A HREF="<%= $svc_acct_pop_link %>">
+          <%= $svc_acct_pop->exch %></A></TD>
+        <TD><A HREF="<%= $svc_acct_pop_link %>">
+          <%= $svc_acct_pop->loc %></A></TD>
+        <TD>
+          <FONT COLOR="#00CC00"><B><%= $num_accounts %></B></FONT>
+            <A HREF="<%= $svc_acct_link %>&showcancelledcustomers=0">active</A>
+        </TD>
       </TR>
-END
+<% } %>
 
-}
-
-print <<END;
       <TR>
       </TR>
     </TABLE>
   </BODY>
 </HTML>
-END
 
-%>
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index e43f4f79b..0954bf652 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -48,12 +48,23 @@ if ( $query eq 'svcnum' ) {
   $sortby=\*uid_sort;
   $orderby = ( $unlinked ? 'AND' : 'WHERE' ).
              " ${tblname}uid IS NOT NULL ORDER BY ${tblname}uid";
+} elsif ( $query =~ /popnum=(\d+)/ ) {
+  my $popnum = $1;
+  $unlinked .= ( $unlinked ? 'AND' : 'WHERE' ).
+               " popnum = $popnum";
+  $sortby=\*username_sort;
+  $orderby = "ORDER BY ${tblname}username";
 } else {
   $sortby=\*uid_sort;
   @svc_acct = @{&usernamesearch};
 }
 
-if ( $query eq 'svcnum' || $query eq 'username' || $query eq 'uid' ) {
+
+if (    $query eq 'svcnum'
+     || $query eq 'username'
+     || $query eq 'uid'
+     || $query eq 'popnum'
+   ) {
 
   my $statement = "SELECT COUNT(*) FROM svc_acct $unlinked";
   my $sth = dbh->prepare($statement)
-- 
cgit v1.2.1


From 83178acdc79de25f98c3e7eee9a4de1a17eaf9f4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 6 Oct 2003 11:20:58 +0000
Subject: fix linking to account list per access number

---
 httemplate/browse/svc_acct_pop.cgi | 2 +-
 httemplate/search/svc_acct.cgi     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index 80168728c..f77fe820b 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -48,7 +48,7 @@ foreach my $svc_acct_pop ( sort {
           <%= $svc_acct_pop->loc %></A></TD>
         <TD>
           <FONT COLOR="#00CC00"><B><%= $num_accounts %></B></FONT>
-            <A HREF="<%= $svc_acct_link %>&showcancelledcustomers=0">active</A>
+            <A HREF="<%= $svc_acct_link %>">active</A>
         </TD>
       </TR>
 <% } %>
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 0954bf652..bbcac30b5 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -48,7 +48,7 @@ if ( $query eq 'svcnum' ) {
   $sortby=\*uid_sort;
   $orderby = ( $unlinked ? 'AND' : 'WHERE' ).
              " ${tblname}uid IS NOT NULL ORDER BY ${tblname}uid";
-} elsif ( $query =~ /popnum=(\d+)/ ) {
+} elsif ( $query =~ /^popnum=(\d+)$/ ) {
   my $popnum = $1;
   $unlinked .= ( $unlinked ? 'AND' : 'WHERE' ).
                " popnum = $popnum";
@@ -63,7 +63,7 @@ if ( $query eq 'svcnum' ) {
 if (    $query eq 'svcnum'
      || $query eq 'username'
      || $query eq 'uid'
-     || $query eq 'popnum'
+     || $query =~ /^popnum=(\d+)$/ ) {
    ) {
 
   my $statement = "SELECT COUNT(*) FROM svc_acct $unlinked";
-- 
cgit v1.2.1


From 3ca42bd26b6724fa389c9a3e08d091e65954b616 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 6 Oct 2003 11:22:26 +0000
Subject: typo

---
 httemplate/search/svc_acct.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index bbcac30b5..cd86031c5 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -63,7 +63,7 @@ if ( $query eq 'svcnum' ) {
 if (    $query eq 'svcnum'
      || $query eq 'username'
      || $query eq 'uid'
-     || $query =~ /^popnum=(\d+)$/ ) {
+     || $query =~ /^popnum=(\d+)$/
    ) {
 
   my $statement = "SELECT COUNT(*) FROM svc_acct $unlinked";
-- 
cgit v1.2.1


From b144cab922a4c09462f0335e4835a72c985bb56a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 6 Oct 2003 11:39:19 +0000
Subject: fix URL argument processing for account searches by popnum

---
 httemplate/search/svc_acct.cgi | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index cd86031c5..e20649cd9 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -48,10 +48,9 @@ if ( $query eq 'svcnum' ) {
   $sortby=\*uid_sort;
   $orderby = ( $unlinked ? 'AND' : 'WHERE' ).
              " ${tblname}uid IS NOT NULL ORDER BY ${tblname}uid";
-} elsif ( $query =~ /^popnum=(\d+)$/ ) {
-  my $popnum = $1;
+} elsif ( $cgi->param('popnum') =~ /^(\d+)$/ ) {
   $unlinked .= ( $unlinked ? 'AND' : 'WHERE' ).
-               " popnum = $popnum";
+               " popnum = $1";
   $sortby=\*username_sort;
   $orderby = "ORDER BY ${tblname}username";
 } else {
@@ -63,7 +62,7 @@ if ( $query eq 'svcnum' ) {
 if (    $query eq 'svcnum'
      || $query eq 'username'
      || $query eq 'uid'
-     || $query =~ /^popnum=(\d+)$/
+     || $cgi->param('popnum') =~ /^(\d+)$/
    ) {
 
   my $statement = "SELECT COUNT(*) FROM svc_acct $unlinked";
-- 
cgit v1.2.1


From e4cb834b6ae70167fd95b2c2048d6c2082a07aed Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 6 Oct 2003 12:05:47 +0000
Subject: - put link to main menu on quick payment search page

---
 httemplate/search/cust_main-quickpay.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/httemplate/search/cust_main-quickpay.html b/httemplate/search/cust_main-quickpay.html
index 9f39db914..25d9db36b 100755
--- a/httemplate/search/cust_main-quickpay.html
+++ b/httemplate/search/cust_main-quickpay.html
@@ -7,6 +7,7 @@
       Quick payment entry
     </FONT>
     <BR><BR>
+    <A HREF="../">Main Menu</A><BR><BR>
     <FORM ACTION="cust_main.cgi" METHOD="post">
       <INPUT TYPE="hidden" NAME="quickpay" VALUE="yes">
       <INPUT TYPE="checkbox" NAME="last_on" CHECKED> Search for <B>last name</B>: 
-- 
cgit v1.2.1


From 449875d3a1e67ab4d2f8ee1c5d57309ffc18c6ad Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 7 Oct 2003 02:27:11 +0000
Subject: add suspension / unsuspension export to communigate

---
 FS/FS/part_export/communigate_pro.pm | 45 +++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
index ae20e2423..35c7fbf41 100644
--- a/FS/FS/part_export/communigate_pro.pm
+++ b/FS/FS/part_export/communigate_pro.pm
@@ -57,16 +57,27 @@ sub _export_delete {
   );
 }
 
-#sub _export_suspend {
-#}
+sub _export_suspend {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->communigate_pro_queue( $svc_acct->svcnum, 'UpdateAccountSettings',
+    'accountName' => $svc_acct->email,
+    'AccessModes' => 'Mail',
+  );
+}
 
-#sub _export_unsuspend {
-#}
+sub _export_unsuspend {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->communigate_pro_queue( $svc_acct->svcnum, 'UpdateAccountSettings',
+    'accountName' => $svc_acct->email,
+    'AccessModes' => $self->option('AccessModes'),
+  );
+}
 
 sub communigate_pro_queue {
   my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my $sub = $method eq 'CreateAccount'
-              ? 'CreateAccount'
+  my @kludge_methods = qw(CreateAccount UpdateAccountSettings);
+  my $sub = grep { $method eq $_ } @kludge_methods
+              ? $method
               : 'communigate_pro_command';
   my $queue = new FS::queue {
     'svcnum' => $svcnum,
@@ -84,24 +95,30 @@ sub communigate_pro_queue {
 }
 
 sub CreateAccount {
-  my( $machine, $port, $login, $password, $method, @args ) = @_;
-
-  my %args = @args;
+  my( $machine, $port, $login, $password, $method, %args ) = @_;
   my $accountName  = delete $args{'accountName'};
   my $accountType  = delete $args{'accountType'};
   my $externalFlag = delete $args{'externalFlag'};
   $args{'AccessModes'} = [ split(' ', $args{'AccessModes'}) ];
-  @args = ( accountName => $accountName,
-            accountType  => $accountType,
-            settings     => \%args,
-          );
-            #externalFlag => $externalFlag,
+  my @args = ( accountName => $accountName,
+               accountType  => $accountType,
+               settings     => \%args,
+             );
+               #externalFlag => $externalFlag,
   push @args, externalFlag => $externalFlag if $externalFlag;
 
   communigate_pro_command( $machine, $port, $login, $password, $method, @args );
 
 }
 
+sub UpdateAccountSettings {
+  my( $machine, $port, $login, $password, $method, %args ) = @_;
+  my $accountName  = delete $args{'accountName'};
+  $args{'AccessModes'} = [ split(' ', $args{'AccessModes'}) ];
+  @args = ( $accountName, \%args );
+  communigate_pro_command( $machine, $port, $login, $password, $method, @args );
+}
+
 sub communigate_pro_command { #subroutine, not method
   my( $machine, $port, $login, $password, $method, @args ) = @_;
 
-- 
cgit v1.2.1


From 4a22a31cd586fc6cff704294b4de39841b0bc86b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 7 Oct 2003 05:49:21 +0000
Subject: doc

---
 FS/FS/svc_acct.pm | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 7e8cb0710..3fb28c054 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -599,13 +599,11 @@ sub replace {
 
 =item suspend
 
-Suspends this account by prefixing *SUSPENDED* to the password.  If there is an
-error, returns the error, otherwise returns false.
+Suspends this account by calling export-specific suspend hooks.  If there is
+an error, returns the error, otherwise returns false.
 
 Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
 
-Calls any export-specific suspend hooks.
-
 =cut
 
 sub suspend {
@@ -625,13 +623,11 @@ sub suspend {
 
 =item unsuspend
 
-Unsuspends this account by removing *SUSPENDED* from the password.  If there is
-an error, returns the error, otherwise returns false.
+Unsuspends this account by by calling export-specific suspend hooks.  If there
+is an error, returns the error, otherwise returns false.
 
 Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
 
-Calls any export-specific unsuspend hooks.
-
 =cut
 
 sub unsuspend {
-- 
cgit v1.2.1


From 972ef71fa13cf9a76cb6453a98ece950e1776f1a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 7 Oct 2003 05:50:04 +0000
Subject: add suspend and unsuspend hooks, don't try and set '*SUSPENDED*'
 passwords

---
 FS/FS/part_export/communigate_pro.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
index 35c7fbf41..a9d9591ca 100644
--- a/FS/FS/part_export/communigate_pro.pm
+++ b/FS/FS/part_export/communigate_pro.pm
@@ -39,6 +39,8 @@ sub _export_replace {
                 || $old->finger ne $new->finger
                 || $old->quota ne $new->quota;
 
+  return '' if '*SUSPENDED* '. $old->_password eq $new->_password;
+
   #my $err_or_queue = $self->communigate_pro_queue( $new->svcnum,'RenameAccount',
   #  $old->email, $new->email );
   #return $err_or_queue unless ref($err_or_queue);
-- 
cgit v1.2.1


From 79dcffa66be02e3ddb342d36dcded01888c3d841 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 7 Oct 2003 06:03:17 +0000
Subject: fix subroutine call from UpdateAccountSettings sub

---
 FS/FS/part_export/communigate_pro.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
index a9d9591ca..4240618ac 100644
--- a/FS/FS/part_export/communigate_pro.pm
+++ b/FS/FS/part_export/communigate_pro.pm
@@ -109,7 +109,7 @@ sub CreateAccount {
                #externalFlag => $externalFlag,
   push @args, externalFlag => $externalFlag if $externalFlag;
 
-  communigate_pro_command( $machine, $port, $login, $password, $method, @args );
+  &communigate_pro_command( $machine, $port, $login, $password, $method, @args);
 
 }
 
@@ -118,7 +118,7 @@ sub UpdateAccountSettings {
   my $accountName  = delete $args{'accountName'};
   $args{'AccessModes'} = [ split(' ', $args{'AccessModes'}) ];
   @args = ( $accountName, \%args );
-  communigate_pro_command( $machine, $port, $login, $password, $method, @args );
+  &communigate_pro_command( $machine, $port, $login, $password, $method, @args);
 }
 
 sub communigate_pro_command { #subroutine, not method
-- 
cgit v1.2.1


From 069c216ff8e61e002535b099cab0cb67fc1defd9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 7 Oct 2003 06:06:50 +0000
Subject: problem was scalar context propogating to the wrong place in the grep

---
 FS/FS/part_export/communigate_pro.pm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
index 4240618ac..9a4539a4a 100644
--- a/FS/FS/part_export/communigate_pro.pm
+++ b/FS/FS/part_export/communigate_pro.pm
@@ -78,9 +78,8 @@ sub _export_unsuspend {
 sub communigate_pro_queue {
   my( $self, $svcnum, $method ) = (shift, shift, shift);
   my @kludge_methods = qw(CreateAccount UpdateAccountSettings);
-  my $sub = grep { $method eq $_ } @kludge_methods
-              ? $method
-              : 'communigate_pro_command';
+  my $sub = 'communigate_pro_command';
+  $sub = $method if grep { $method eq $_ } @kludge_methods;
   my $queue = new FS::queue {
     'svcnum' => $svcnum,
     'job'    => "FS::part_export::communigate_pro::$sub",
@@ -109,7 +108,7 @@ sub CreateAccount {
                #externalFlag => $externalFlag,
   push @args, externalFlag => $externalFlag if $externalFlag;
 
-  &communigate_pro_command( $machine, $port, $login, $password, $method, @args);
+  communigate_pro_command( $machine, $port, $login, $password, $method, @args );
 
 }
 
@@ -118,7 +117,7 @@ sub UpdateAccountSettings {
   my $accountName  = delete $args{'accountName'};
   $args{'AccessModes'} = [ split(' ', $args{'AccessModes'}) ];
   @args = ( $accountName, \%args );
-  &communigate_pro_command( $machine, $port, $login, $password, $method, @args);
+  communigate_pro_command( $machine, $port, $login, $password, $method, @args );
 }
 
 sub communigate_pro_command { #subroutine, not method
-- 
cgit v1.2.1


From 5bdc87ecf59cfab3f9c6ca0ea1b97a41ed5561c8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 7 Oct 2003 08:06:11 +0000
Subject: adding acct_snarf

---
 FS/FS.pm             |   2 +
 FS/FS/acct_snarf.pm  | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++
 FS/FS/part_export.pm |   4 --
 3 files changed, 130 insertions(+), 4 deletions(-)
 create mode 100644 FS/FS/acct_snarf.pm

diff --git a/FS/FS.pm b/FS/FS.pm
index e4a32082c..a299e659d 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -54,6 +54,8 @@ L<FS::svc_Common> - Service base class
 
 L<FS::svc_acct> - Account (shell, RADIUS, POP3) class
 
+L<FS::acct_snarf> - External mail account class
+
 L<FS::radius_usergroup> - RADIUS groups
 
 L<FS::svc_domain> - Domain class
diff --git a/FS/FS/acct_snarf.pm b/FS/FS/acct_snarf.pm
new file mode 100644
index 000000000..7c51d6945
--- /dev/null
+++ b/FS/FS/acct_snarf.pm
@@ -0,0 +1,128 @@
+package FS::acct_snarf;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::acct_snarf - Object methods for acct_snarf records
+
+=head1 SYNOPSIS
+
+  use FS::acct_snarf;
+
+  $record = new FS::acct_snarf \%hash;
+  $record = new FS::acct_snarf { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::svc_acct object represents an external mail account, typically for
+download of mail.  FS::acct_snarf inherits from FS::Record.  The following
+fields are currently supported:
+
+=over 4
+
+=item snarfnum - primary key
+
+=item svcnum - Account (see L<FS::svc_acct>)
+
+=item machine - external machine to download mail from
+
+=item protocol - protocol (pop3, imap, etc.)
+
+=item username - external login username
+
+=item _password - external login password
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new record.  To add the record to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub table { 'acct_snarf'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+  my $error =
+       $self->ut_numbern('snarfnum')
+    || $self->ut_number('svcnum')
+    || $self->ut_foreign_key('svcnum', 'svc_acct', 'svcnum')
+    || $self->ut_domain('machine')
+    || $self->alphan('protocol')
+    || $self->ut_textn('username')
+  ;
+  return $error if $error;
+
+  $self->_password =~ /^[^\t\n]*$/ or return "illegal password";
+  $self->_password($1);
+
+  ''; #no error
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 01e71c0ed..3dfaaee9b 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -274,10 +274,6 @@ sub check {
   ;
   return $error if $error;
 
-  $self->machine =~ /^([\w\-\.]*)$/
-    or return "Illegal machine: ". $self->machine;
-  $self->machine($1);
-
   $self->nodomain =~ /^(Y?)$/ or return "Illegal nodomain: ". $self->nodomain;
   $self->nodomain($1);
 
-- 
cgit v1.2.1


From a5d29a11e284cbe0283e5a104b1c87189edc85c0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 7 Oct 2003 13:50:13 +0000
Subject: mandrake

---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 4a2afd000..42dba360f 100644
--- a/Makefile
+++ b/Makefile
@@ -15,21 +15,21 @@ MASONDATA = /usr/local/etc/freeside/masondata
 
 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
-#redhat
+#redhat, mandrake
 #FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside
 #freebsd
 #FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
 #openbsd
 #FREESIDE_DOCUMENT_ROOT = /var/www/htdocs/freeside
 
-#deb, redhat, others?
+#deb, redhat, mandrake, others?
 INIT_FILE = /etc/init.d/freeside
 #freebsd
 #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
 
 #deb
 HTTPD_RESTART = /etc/init.d/apache restart
-#redhat
+#redhat, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
 #HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
@@ -38,9 +38,9 @@ HTTPD_RESTART = /etc/init.d/apache restart
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
-#deb, redhat, others?
+#deb, redhat, mandrake, others?
 INSTALLGROUP = root
-#freebsd,openbsd
+#freebsd, openbsd
 #INSTALLGROUP = wheel
 
 #edit the stuff below to have the daemons start
-- 
cgit v1.2.1


From 8950be198d09bf5e9e0959fe2b55726be63a2397 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 8 Oct 2003 04:09:05 +0000
Subject: can't use File::Basename::basename for windows filenames!  use a
 regex instead

---
 htetc/global.asa                 | 1 -
 htetc/handler.pl                 | 1 -
 httemplate/misc/upload-batch.cgi | 3 ++-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/htetc/global.asa b/htetc/global.asa
index ee5cfcb3c..2e31be394 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -9,7 +9,6 @@ use CGI 2.47;
 use Date::Format;
 use Date::Parse;
 use Time::Local;
-use File::Basename;
 use Tie::IxHash;
 use HTML::Entities;
 use IO::Handle;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index b007353e3..ba73bcfaf 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -67,7 +67,6 @@ sub handler
       use Date::Format;
       use Date::Parse;
       use Time::Local;
-      use File::Basename;
       use Tie::IxHash;
       use HTML::Entities;
       use IO::Handle;
diff --git a/httemplate/misc/upload-batch.cgi b/httemplate/misc/upload-batch.cgi
index 565a6da5c..cc5346606 100644
--- a/httemplate/misc/upload-batch.cgi
+++ b/httemplate/misc/upload-batch.cgi
@@ -2,7 +2,8 @@
 
   my $fh = $cgi->upload('batch_results');
   my $filename = $cgi->param('batch_results');
-  my $paybatch = basename($filename);
+  $filename =~ /^.*[\/\\]([^\/\\]+)$/ or die;
+  my $paybatch = $1;
 
   my $error = defined($fh)
     ? FS::cust_pay_batch::import_results( {
-- 
cgit v1.2.1


From 04980f381a8de1e935193102b0e924bf7a3f944d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 Oct 2003 11:05:21 +0000
Subject: don't install on a public server!

---
 httemplate/docs/install.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 463575c53..4d3a63958 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -3,6 +3,7 @@
 </head>
 <body>
 <h1>Installation</h1>
+<i>Note: Install Freeside on a firewalled, private server, not a public (web, RADIUS, etc.) server.</i><br><br>
 Before installing, you need:
 <ul>
   <li><a href="http://www.perl.com/">Perl</a>  Don't enable experimental features like threads or the PerlIO abstraction layer.
-- 
cgit v1.2.1


From beac873f6d82cf787ccb32760a6ffac78dfe1851 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 Oct 2003 17:40:02 +0000
Subject: parse last line from TD Canada Trust

---
 FS/FS/cust_pay_batch.pm | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
index 97c168159..f53e55b94 100644
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -210,6 +210,8 @@ sub import_results {
   my $paybatch = $param->{'paybatch'};
 
   my @fields;
+  my $end_condition;
+  my $end_hook;
   my $condition;
   my $hook;
 
@@ -236,9 +238,23 @@ sub import_results {
       '',            # Terminal ID: Terminal ID used to process the transaction
     );
 
+    $end_condition = sub {
+      my $hash = shift;
+      $hash->{'type'} eq '0BC';
+    };
+
+    $end_hook = sub {
+      my( $hash, $total) = @_;
+      $total = sprintf("%.2f", $total);
+      my $batch_total = sprintf("%.2f", $hash->{'paybatchnum'} / 100 );
+      return "Our total $total does not match bank total $batch_total!"
+        if $total != $batch_total;
+      '';
+    };
+
     $condition = sub {
       my $hash = shift;
-      $hash->{'result'} == 3 && $hash->{'type'} == 0;
+      $hash->{'result'} == 3 && $hash->{'type'} eq '0';
     };
 
     $hook = sub {
@@ -269,9 +285,12 @@ sub import_results {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
+  my $total = 0;
   my $line;
   while ( defined($line=<$fh>) ) {
 
+    next if $line =~ /^\s*$/; #skip blank lines
+
     $csv->parse($line) or do {
       $dbh->rollback if $oldAutoCommit;
       return "can't parse: ". $csv->error_input();
@@ -285,6 +304,15 @@ sub import_results {
       $hash{$field} = $value;
     }
 
+    if ( &{$end_condition}(\%hash) ) {
+      my $error = &{$end_hook}(\%hash, $total);
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
+      last;
+    }
+
     my $cust_pay_batch =
       qsearchs('cust_pay_batch', { 'paybatchnum' => $hash{'paybatchnum'} } );
     unless ( $cust_pay_batch ) {
@@ -314,6 +342,7 @@ sub import_results {
       $dbh->rollback if $oldAutoCommit;
       return "error adding payment paybatchnum $hash{'paybatchnum'}: $error\n";
     }
+    $total += $hash{'paid'};
 
     $cust_pay->cust_main->apply_payments;
 
-- 
cgit v1.2.1


From 948043dcd53db87a686707469416e6709948e721 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 14 Oct 2003 17:00:00 +0000
Subject: fix the default success template

---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 6fa01deaf..2458bcf19 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.45 2003-09-29 06:51:24 ivan Exp $
+# $Id: signup.cgi,v 1.46 2003-10-14 17:00:00 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages
@@ -647,7 +647,7 @@ Signup information for <%= $email_name %>:
 <BR><BR>
 Username: <%= $username %><BR>
 Password: <%= $password %><BR>
-Access number: (<%= $ac %>) / $exch - $local<BR>
+Access number: (<%= $ac %>) / <%= $exch %> - <%= $local %><BR>
 Package: <%= $pkg %><BR>
 </BODY></HTML>
 END
-- 
cgit v1.2.1


From 94eb1849a28630ef039eb644f961dae8b19f58fc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 15 Oct 2003 09:41:43 +0000
Subject: - Business::OnlinePayment "recurring_billing" flag is set for
 subsequent   credit card transactions; some processors (AuthorozeNet,
 others?) use this   to waive the CVV2 requirement.

---
 FS/FS/cust_main.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 2ee8a42f0..58cfc0c76 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1653,6 +1653,12 @@ sub realtime_bop {
     $content{card_number} = $self->payinfo;
     $self->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
     $content{expiration} = "$2/$1";
+    if ( qsearch('cust_pay', { 'custnum' => $self->custnum,
+                               'payby'   => 'CARD',
+                               'payinfo' => $self->payinfo, } )
+    ) { 
+      $content{recurring_billing} = 'YES';
+    }
   } elsif ( $method eq 'ECHECK' ) {
     my($account_number,$routing_code) = $self->payinfo;
     ( $content{account_number}, $content{routing_code} ) =
-- 
cgit v1.2.1


From 7598ece6cac31548505dd610ef418ca001adf5b2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 15 Oct 2003 12:08:47 +0000
Subject: fix agent username and password nullability

---
 FS/bin/freeside-setup | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index bb122700a..b7b45dc63 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -337,8 +337,8 @@ sub tables_hash_hack {
         'freq',     'int',       'NULL', '',
         'prog',     @perl_type,
         'disabled',     'char', 'NULL', 1,
-        'username', 'varchar',           '',     $char_d,
-        '_password','varchar',           '',     $char_d,
+        'username', 'varchar',       'NULL',     $char_d,
+        '_password','varchar',       'NULL',     $char_d,
       ],
       'primary_key' => 'agentnum',
       'unique' => [],
@@ -1104,6 +1104,20 @@ sub tables_hash_hack {
       'index' => [],
     },
 
+    'acct_snarf' => {
+      'columns' => [
+        'snarfnum',  'int', '', '',
+        'svcnum',    'int', '', '',
+        'machine',   'varchar', '', 255,
+        'protocol',  'varchar', '', $char_d,
+        'username',  'varchar', '', $char_d,
+        '_password', 'varchar', '', $char_d,
+      ],
+      'primary_key' => 'snarfnum',
+      'unique' => [],
+      'index'  => [ [ 'svcnum' ] ],
+    },
+
   );
 
   %tables;
-- 
cgit v1.2.1


From bacea004a735c7a9c30a35e9184a63897a200e6e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 15 Oct 2003 15:03:56 +0000
Subject: add tagging ability so we can run multiple self-service clients on
 one machine

---
 FS/bin/freeside-selfservice-server                         | 3 ++-
 fs_selfservice/FS-SelfService/SelfService.pm               | 3 ++-
 fs_selfservice/FS-SelfService/freeside-selfservice-clientd | 8 +++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/FS/bin/freeside-selfservice-server b/FS/bin/freeside-selfservice-server
index 107103973..05fa72b43 100644
--- a/FS/bin/freeside-selfservice-server
+++ b/FS/bin/freeside-selfservice-server
@@ -33,6 +33,7 @@ $kids = 0;
 
 my $user = shift or die &usage;
 my $machine = shift or die &usage;
+my $tag = scalar(@ARGV) ? shift : '';
 my $pid_file = "/var/run/freeside-selfservice-server.$user.pid";
 #my $pid_file = "/var/run/freeside-selfservice-server.$user.pid"; $FS::UID::datasrc not posible, but should include machine name at least, hmm
 
@@ -50,7 +51,7 @@ while (1) {
   my($writer,$reader,$error) = (new IO::Handle, new IO::Handle, new IO::Handle);
   warn "connecting to $machine\n" if $Debug;
 
-  $ssh_pid = sshopen2($machine,$reader,$writer,$clientd);
+  $ssh_pid = sshopen2($machine,$reader,$writer,$clientd,$tag);
 
 #  nstore_fd(\*writer, {'hi'=>'there'});
 
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 5d3f50b10..b2532be71 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -1,7 +1,7 @@
 package FS::SelfService;
 
 use strict;
-use vars qw($VERSION @ISA @EXPORT_OK $socket %autoload );
+use vars qw($VERSION @ISA @EXPORT_OK $socket %autoload $tag);
 use Exporter;
 use Socket;
 use FileHandle;
@@ -14,6 +14,7 @@ $VERSION = '0.03';
 @ISA = qw( Exporter );
 
 $socket =  "/usr/local/freeside/selfservice_socket";
+$socket .= '.'.$tag if defined $tag && length($tag);
 
 #maybe should ask ClientAPI for this list
 %autoload = (
diff --git a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
index 45d9da9c7..a8b1e713b 100644
--- a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
+++ b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
@@ -16,16 +16,18 @@ use IO::File;
 
 #STDOUT->setbuf('');
 
+my $tag = scalar(@ARGV) ? '.'.shift : '';
+
 use vars qw( $Debug );
 $Debug = 2; #2 will turn on child logging, 3 will log packet contents,
             #including potentially compromising information
 
-my $socket = "/usr/local/freeside/selfservice_socket";
+my $socket = "/usr/local/freeside/selfservice_socket$tag";
 my $pid_file = "$socket.pid";
 
-my $log_file = "/usr/local/freeside/selfservice.log";
+my $log_file = "/usr/local/freeside/selfservice$tag.log";
 
-my $lock_file = "/usr/local/freeside/selfservice.writelock";
+my $lock_file = "/usr/local/freeside/selfservice$tag.writelock";
 
 #my $me = '[client]';
 
-- 
cgit v1.2.1


From ac1c39dff69b630907bb75cb87accfe67e484128 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 15 Oct 2003 22:48:41 +0000
Subject: File got munged during svc_broadband merge. Added ability to create a
 'customer router'.

---
 httemplate/view/svc_broadband.cgi | 112 ++++++++++++++++++++++++++++++--------
 1 file changed, 89 insertions(+), 23 deletions(-)

diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index 677a4b058..a4ec7569e 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -37,10 +37,9 @@ my (
      $svc_broadband->getfield('speed_up'),
      $svc_broadband->getfield('ip_addr')
    );
+%>
 
-
-
-print header('Broadband Service View', menubar(
+<%=header('Broadband Service View', menubar(
   ( ( $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
         "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
@@ -49,29 +48,96 @@ print header('Broadband Service View', menubar(
           "${p}misc/cancel-unaudited.cgi?$svcnum" )
   ),
   "Main menu" => $p,
-)).
-      qq!<A HREF="${p}edit/svc_broadband.cgi?$svcnum">Edit this information</A><BR>!.
-      ntable("#cccccc"). '<TR><TD>'. ntable("#cccccc",2).
-      qq!<TR><TD ALIGN="right">Service number</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$svcnum</TD></TR>!.
-      qq!<TR><TD ALIGN="right">Router</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$routernum: $routername</TD></TR>!.
-      qq!<TR><TD ALIGN="right">Download Speed</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$speed_down</TD></TR>!.
-      qq!<TR><TD ALIGN="right">Upload Speed</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$speed_up</TD></TR>!.
-      qq!<TR><TD ALIGN="right">IP Address</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$ip_addr</TD></TR>!.
-      '</TD></TR><TR ROWSPAN="1"><TD></TD></TR>';
+))
+%>
 
+<A HREF="<%=${p}%>edit/svc_broadband.cgi?<%=$svcnum%>">Edit this information</A>
+<BR>
+<%=ntable("#cccccc")%>
+  <TR>
+    <TD>
+      <%=ntable("#cccccc",2)%>
+        <TR>
+          <TD ALIGN="right">Service number</TD>
+          <TD BGCOLOR="#ffffff"><%=$svcnum%></TD>
+        </TR>
+        <TR>
+          <TD ALIGN="right">Router</TD>
+          <TD BGCOLOR="#ffffff"><%=$routernum%>: <%=$routername%></TD>
+        </TR>
+        <TR>
+          <TD ALIGN="right">Download Speed</TD>
+          <TD BGCOLOR="#ffffff"><%=$speed_down%></TD>
+        </TR>
+        <TR>
+          <TD ALIGN="right">Upload Speed</TD>
+          <TD BGCOLOR="#ffffff"><%=$speed_up%></TD>
+        </TR>
+        <TR>
+          <TD ALIGN="right">IP Address</TD>
+          <TD BGCOLOR="#ffffff"><%=$ip_addr%></TD>
+        </TR>
+        <TR COLSPAN="2"><TD></TD></TR>
+
+<%
 foreach (sort { $a cmp $b } $svc_broadband->virtual_fields) {
-  print $svc_broadband->pvf($_)->widget('HTML', 'view', 
-      $svc_broadband->getfield($_)), "\n";
+  print $svc_broadband->pvf($_)->widget('HTML', 'view',
+                                        $svc_broadband->getfield($_)), "\n";
 }
 
-print '</TABLE>';
+%>
+      </TABLE>
+    </TD>
+  </TR>
+</TABLE>
 
-print '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
-      '</BODY></HTML>'
-;
+<BR>
+<%=ntable("#cccccc", 2)%>
+<%
+  my $sb_router = qsearchs('router', { svcnum => $svcnum });
+  if ($sb_router) {
+  %>
+  <B>Router associated: <%=$sb_router->routername%> </B>
+  <A HREF="<%=popurl(2)%>edit/router.cgi?<%=$sb_router->routernum%>">
+    (details)
+  </A>
+  <BR>
+  <% my @addr_block;
+     if (@addr_block = $sb_router->addr_block) {
+     %>
+  <B>Address space </B>
+  <A HREF="<%=popurl(2)%>browse/addr_block.cgi">
+    (edit)
+  </A>
+  <BR>
+  <%   print ntable("#cccccc", 1);
+       foreach (@addr_block) { %>
+    <TR>
+      <TD><%=$_->ip_gateway%>/<%=$_->ip_netmask%></TD>
+    </TR>
+    <% } %>
+  </TABLE>
+  <% } else { %>
+  <B>No address space allocated.</B>
+    <% } %>
+  <BR>
+  <%
+  } else {
 %>
+
+<FORM METHOD="GET" ACTION="<%=popurl(2)%>edit/router.cgi">
+  <INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$svcnum%>">
+Add router named 
+  <INPUT TYPE="text" NAME="routername" SIZE="32" VALUE="Broadband router (<%=$svcnum%>)">
+  <INPUT TYPE="submit" VALUE="Add router">
+</FORM>
+
+<%
+}
+%>
+
+<BR>
+<%=joblisting({'svcnum'=>$svcnum}, 1)%>
+  </BODY>
+</HTML>
+
-- 
cgit v1.2.1


From 9d0dd4b0c9017b18b634e3b6c62cfd0eda549f5c Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 15 Oct 2003 22:59:31 +0000
Subject: More changes that got lost in the merge somehow.

---
 httemplate/edit/router.cgi | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/httemplate/edit/router.cgi b/httemplate/edit/router.cgi
index 5c365a21e..a573c6504 100755
--- a/httemplate/edit/router.cgi
+++ b/httemplate/edit/router.cgi
@@ -22,6 +22,8 @@ print header("$action Router", menubar(
   'View all routers' => "${p}browse/router.cgi",
 ));
 
+my $p3 = popurl(3);
+
 if($cgi->param('error')) {
 %> <FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT>
 <% } %>
@@ -31,6 +33,7 @@ if($cgi->param('error')) {
   <INPUT TYPE="hidden" NAME="redirect_ok" VALUE="<%=$p3%>/browse/router.cgi">
   <INPUT TYPE="hidden" NAME="redirect_error" VALUE="<%=$p3%>/edit/router.cgi">
   <INPUT TYPE="hidden" NAME="routernum" VALUE="<%=$routernum%>">
+  <INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$router->svcnum%>">
     Router #<%=$routernum or "(NEW)"%>
 
 <BR><BR>Name <INPUT TYPE="text" NAME="routername" SIZE=32 VALUE="<%=$router->routername%>">
@@ -49,12 +52,14 @@ foreach my $field ($router->virtual_fields) {
 </TABLE>
 
 
-
+<%
+unless ($router->svcnum) {
+%>
 <BR><BR>Select the service types available on this router<BR>
 <%
 
-foreach my $part_svc ( qsearch('part_svc', { svcdb    => 'svc_broadband',
-                                             disabled => '' }) ) {
+  foreach my $part_svc ( qsearch('part_svc', { svcdb    => 'svc_broadband',
+                                               disabled => '' }) ) {
   %>
   <BR>
   <INPUT TYPE="checkbox" NAME="svcpart_<%=$part_svc->svcpart%>"<%=
@@ -64,6 +69,8 @@ foreach my $part_svc ( qsearch('part_svc', { svcdb    => 'svc_broadband',
     <%=$part_svc->svcpart%>: <%=$part_svc->svc%></A>
   <% } %>
 
+<% } %>
+
   <BR><BR><INPUT TYPE="submit" VALUE="Apply changes">
   </FORM>
 </BODY></HTML>
-- 
cgit v1.2.1


From 526a7b2f5b8675b086745cf3fa5cfa6366fd67cf Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 15 Oct 2003 23:17:19 +0000
Subject: $router isn't a global.

---
 httemplate/browse/router.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/browse/router.cgi b/httemplate/browse/router.cgi
index a9ec6fd61..feee4ecaa 100644
--- a/httemplate/browse/router.cgi
+++ b/httemplate/browse/router.cgi
@@ -18,7 +18,7 @@ my $p2 = popurl(2);
     <TD><B>Router name</B></TD>
     <TD><B>Address block(s)</B></TD>
   </TR>
-<% foreach $router (sort {$a->routernum <=> $b->routernum} @router) {
+<% foreach my $router (sort {$a->routernum <=> $b->routernum} @router) {
      my @addr_block = $router->addr_block;
 %>
   <TR>
-- 
cgit v1.2.1


From 03ea266c86cbaa01900755f754db791a866bf951 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 16 Oct 2003 13:48:31 +0000
Subject: fix Text::Template link

---
 httemplate/docs/billing.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/billing.html b/httemplate/docs/billing.html
index c78a87f04..1d6f8c4fc 100644
--- a/httemplate/docs/billing.html
+++ b/httemplate/docs/billing.html
@@ -11,7 +11,7 @@
     <li>Credit card decline alerts: Customize the <a href="../config/config.cgi#declinetemplate">declinetemplate</a> configuration option and set the <a href="../config/config.cgi#emaildecline">emaildecline</a> configuration option.
     <li>Optional: Invoice template customization
       <ul>
-        <li>See the <a href="http://search.cpan.org/doc/MJD/Text-Template-1.42/Template.pm">Text::Template</a> documentation for details on the substitution language.
+        <li>See the <a href="http://search.cpan.org/~mjd/Text-Template/lib/Text/Template.pm">Text::Template</a> documentation for details on the substitution language.
         <li>You <b>must</b> call the invoice_lines() function at least once - pass it a number of lines, and it returns a list of array references, each of two elements: a service description column, and a price column.  Alternatively, call invoice_lines() with no arguments, and pagination will be disabled - all invoice line items will print on one page, with no padding (recommended for email invoices).
         <li>In addition, the following variables are available:
           <ul>
-- 
cgit v1.2.1


From 2696b950330fd4fd232b62262b7b47256a2e2a04 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Thu, 16 Oct 2003 22:57:30 +0000
Subject: Telnet/SSH router export for svc_broadband.

---
 FS/FS/part_export/router.pm | 166 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 166 insertions(+)
 create mode 100644 FS/FS/part_export/router.pm

diff --git a/FS/FS/part_export/router.pm b/FS/FS/part_export/router.pm
new file mode 100644
index 000000000..1d1f907e2
--- /dev/null
+++ b/FS/FS/part_export/router.pm
@@ -0,0 +1,166 @@
+package FS::part_export::router;
+
+=head1 FS::part_export::router
+
+This export connects to a router and transmits commands via telnet or SSH.
+It requires the following custom router fields:
+
+=over 4
+
+=item admin_address - IP address (or hostname) to connect
+
+=item admin_user - username for admin access
+
+=item admin_password - password for admin access
+
+=back
+
+The export itself needs the following options:
+
+=over 4
+
+=item insert, replace, delete - command strings (to be interpolated)
+
+=item Prompt - prompt string to expect from router after successful login
+
+=item Timeout - time to wait for prompt string
+
+=back
+
+(Prompt and Timeout are required only for telnet connections.)
+
+=cut
+
+use vars qw(@ISA @saltset);
+use String::ShellQuote;
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my($self) = shift;
+  $self->_export_command('insert', @_);
+}
+
+sub _export_delete {
+  my($self) = shift;
+  $self->_export_command('delete', @_);
+}
+
+sub _export_suspend {
+  my($self) = shift;
+  $self->_export_command('suspend', @_);
+}
+
+sub _export_unsuspend {
+  my($self) = shift;
+  $self->_export_command('unsuspend', @_);
+}
+
+sub _export_command {
+  my ( $self, $action, $svc_broadband) = (shift, shift, shift);
+  my $command = $self->option($action);
+  return '' if $command =~ /^\s*$/;
+
+  no strict 'vars';
+  {
+    no strict 'refs';
+    ${$_} = $svc_broadband->getfield($_) foreach $svc_broadband->fields;
+  }
+  # fetch router info
+  my $router = $svc_broadband->addr_block->router;
+  my %r;
+  $r{$_} = $router->getfield($_) foreach $router->virtual_fields;
+  #warn qq("$command");
+  #warn eval(qq("$command"));
+
+  warn "admin_address: '$r{admin_address}'";
+
+  if ($r{admin_address} ne '') {
+    $self->router_queue( $svc_broadband->svcnum, $self->option('protocol'),
+      user         => $r{admin_user},
+      password     => $r{admin_password},
+      host         => $r{admin_address},
+      Timeout      => $self->option('Timeout'),
+      Prompt       => $self->option('Prompt'),
+      command      => eval(qq("$command")),
+    );
+  } else {
+    return '';
+  }
+}
+
+sub _export_replace {
+
+  # We don't handle the case of a svc_broadband moving between routers.
+  # If you want to do that, reprovision the service.
+
+  my($self, $new, $old ) = (shift, shift, shift);
+  my $command = $self->option('replace');
+  no strict 'vars';
+  {
+    no strict 'refs';
+    ${"old_$_"} = $old->getfield($_) foreach $old->fields;
+    ${"new_$_"} = $new->getfield($_) foreach $new->fields;
+  }
+
+  my $router = $new->addr_block->router;
+  my %r;
+  $r{$_} = $router->getfield($_) foreach $router->virtual_fields;
+
+  if ($r{admin_address} ne '') {
+    $self->router_queue( $new->svcnum, $self->option('protocol'),
+      user         => $r{admin_user},
+      password     => $r{admin_password},
+      host         => $r{admin_address},
+      Timeout      => $self->option('Timeout'),
+      Prompt       => $self->option('Prompt'),
+      command      => eval(qq("$command")),
+    );
+  } else {
+    return '';
+  }
+}
+
+#a good idea to queue anything that could fail or take any time
+sub router_queue {
+  #warn join ':', @_;
+  my( $self, $svcnum, $protocol ) = (shift, shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+  };
+  $queue->job ("FS::part_export::router::".$protocol."_cmd");
+  $queue->insert( @_ );
+}
+
+sub ssh_cmd { #subroutine, not method
+  use Net::SSH '0.07';
+  &Net::SSH::ssh_cmd( { @_ } );
+}
+
+sub telnet_cmd {
+  use Net::Telnet;
+
+  warn join(', ', @_);
+
+  my %arg = @_;
+
+  my $t = new Net::Telnet (Timeout => $arg{Timeout},
+                           Prompt  => $arg{Prompt});
+  $t->open($arg{host});
+  $t->login($arg{user}, $arg{password});
+  my @error = $t->cmd($arg{command});
+  die @error if (grep /^ERROR/, @error);
+}
+
+#sub router_insert { #subroutine, not method
+#}
+#sub router_replace { #subroutine, not method
+#}
+#sub router_delete { #subroutine, not method
+#}
+
-- 
cgit v1.2.1


From 23e2dbc925c01f035984b3a7f3dccfa5ff7c4ccf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 19 Oct 2003 18:08:36 +0000
Subject: fix CPAN link

---
 httemplate/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 4d3a63958..1355a113c 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -18,7 +18,7 @@ Before installing, you need:
 <!--       <li>MySQL has been reported to work. -->
          <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you want to use MySQL, you <b>must</b> use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a> or <a href="http://www.mysql.com/doc/I/n/InnoDB.html">InnoDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> or <code>--default-table-type=InnoDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> or <code>default-table-type=InnoDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
     </ul>
-  <li>Perl modules (<a href="http://theoryx5.uwinnipeg.ca/CPAN/perl/CPAN.html">CPAN</a> will query, download and build perl modules automatically)
+  <li>Perl modules (<a href="http://search.cpan.org/~andk/CPAN/lib/CPAN.pm">CPAN</a> will query, download and build perl modules automatically)
     <ul>
 <!--      <li><a href="http://search.cpan.org/search?dist=Array-PrintCols">Array-PrintCols</a>
       <li><a href="http://search.cpan.org/search?dist=Term-Query">Term-Query</a> (make test broken; install manually) -->
-- 
cgit v1.2.1


From db8213a6e1f89a0ff5f6e8a4ee40ce3db59d1c09 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Oct 2003 02:28:44 +0000
Subject: adding openbsd and red hat installs

---
 install/openbsd/INSTALL       | 54 +++++++++++++++++++++++++++++++++++++++++++
 install/openbsd/cpan          | 15 ++++++++++++
 install/openbsd/ports         | 24 +++++++++++++++++++
 install/redhat/9/INSTALL      | 14 +++++++++++
 install/redhat/9/sources.list |  2 ++
 5 files changed, 109 insertions(+)
 create mode 100644 install/openbsd/INSTALL
 create mode 100644 install/openbsd/cpan
 create mode 100644 install/openbsd/ports
 create mode 100644 install/redhat/9/INSTALL
 create mode 100644 install/redhat/9/sources.list

diff --git a/install/openbsd/INSTALL b/install/openbsd/INSTALL
new file mode 100644
index 000000000..1beef9208
--- /dev/null
+++ b/install/openbsd/INSTALL
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+DIR=`pwd`
+
+#cd /usr/ports
+#cvs -q -d anoncvs@anoncvs6.usa.openbsd.org:/cvs up -r OPENBSD_`uname -r | perl -pe 's/\./_/g;'` -Pd
+
+for a in `grep -v '^ *#' $DIR/ports`
+do cd /usr/ports/$a
+  make install
+done
+
+for a in `grep -v '^ *#' $DIR/cpan`
+do perl -MCPAN -e "install $a"
+done
+
+#from /usr/local/share/doc/postgresql/README.OpenBSD
+useradd -c "PostgreSQL Admin User" -g =uid -m -d /var/postgresql -s /bin/sh postgresql
+
+su -l postgresql -c 'mkdir /var/postgresql/data'
+su -l postgresql -c 'initdb -D /var/postgresql/data'
+
+cat <<END >>/etc/rc.local
+if [ -x /usr/local/bin/pg_ctl ]; then
+        su -l postgresql -c "/usr/local/bin/pg_ctl start \
+                -D /var/postgresql/data -l /var/postgresql/logfile \
+                -o '-D /var/postgresql/data'"
+        echo -n ' postgresql'
+fi
+END
+
+cat <<END >>/etc/rc.shutdown
+if [ -f /var/postgresql/data/postmaster.pid ]; then
+        su -l postgresql -c "/usr/local/bin/pg_ctl stop -m fast \
+                -D /var/postgresql/data"
+        rm -f /var/postgresql/data/postmaster.pid
+fi
+
+su -l postgresql -c "/usr/local/bin/pg_ctl start \
+        -D /var/postgresql/data -l /var/postgresql/logfile \
+        -o '-D /var/postgresql/data'"
+
+useradd -c "Freeside" -g =uid -m freeside
+su -l postgresql -c 'createuser -P freeside'
+su -l freeside -c 'createdb freeside'
+
+#?
+cd ../..
+make install-perl-modules
+make create-config
+make deploy
+
+#edit apache config, etc.
+
diff --git a/install/openbsd/cpan b/install/openbsd/cpan
new file mode 100644
index 000000000..4304b726c
--- /dev/null
+++ b/install/openbsd/cpan
@@ -0,0 +1,15 @@
+DBIx::DBSchema
+Time::Duration
+Business::CreditCard
+String::ShellQuote
+Net::SSH
+HTML::Mason
+HTML::Widgets::SelectLayers
+DBIx::DataSource
+Date::Manip
+String::Approx
+Tie::IxHash
+Date::Parse
+File::CounterFile
+Net::SCP
+Mail::Internet
diff --git a/install/openbsd/ports b/install/openbsd/ports
new file mode 100644
index 000000000..3e17d8272
--- /dev/null
+++ b/install/openbsd/ports
@@ -0,0 +1,24 @@
+shells/zsh
+misc/screen
+#www/apache13-modssl
+www/mod_perl
+net/rsync
+databases/postgresql
+converters/p5-MIME-Base64
+security/p5-Digest-MD5
+security/p5-MD5
+www/p5-HTML-Tagset
+www/p5-HTML-Parser
+net/p5-libnet
+misc/p5-Locale-Codes
+net/p5-Net-Whois
+www/p5-libwww
+#mail/p5-Mail-Tools
+devel/p5-FreezeThaw
+textproc/p5-Text-Template
+databases/p5-DBI
+databases/p5-DBD-Pg
+#databases/p5-DBD-Msql-Mysql
+www/p5-Apache-ASP
+devel/p5-Storable
+www/p5-Apache-DBI
diff --git a/install/redhat/9/INSTALL b/install/redhat/9/INSTALL
new file mode 100644
index 000000000..4c07f88e8
--- /dev/null
+++ b/install/redhat/9/INSTALL
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+wget ftp://apt-rpm.tuxfamily.org/apt/redhat/7.3/en/i386/RPMS.extra/apt-*i386.rpm
+rpm -i apt*i386.rpm
+cp sources.list /etc/apt/
+apt-get update; apt-get update
+apt-get install apache mod_ssl mod_perl perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-Digest-MD5 perl-HTML-Parser perl-HTML-Tagset perl-MIME-Base64 perl-Storable perl-TimeDate perl-URI perl-libnet perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs #openssh
+
+perl -MCPAN -e"install Locale::Country, Net::Whois, Business::CreditCard, \
+                       Mail::Internet, File::CounterFile, FreezeThaw, \
+                       String::Approx, Text::Template, DBIx::DataSource, \
+                       DBIx::DBSchema, Net::SSH, String::ShellQuote, \
+                       Net::SCP, Apache::ASP, Tie::IxHash, Time::Duration, \
+                       HTML::Widgets::SelectLayers,  Apache::DBI"
diff --git a/install/redhat/9/sources.list b/install/redhat/9/sources.list
new file mode 100644
index 000000000..9a9ad5cdf
--- /dev/null
+++ b/install/redhat/9/sources.list
@@ -0,0 +1,2 @@
+rpm ftp://apt-rpm.tuxfamily.org/apt redhat/7.3/en/i386 os updates extra
+rpm-src ftp://apt-rpm.tuxfamily.org/apt redhat/7.3/en/i386 os updates extra
-- 
cgit v1.2.1


From 56c3927f50ecd1ee957a52d76871557bd8813670 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Oct 2003 02:35:48 +0000
Subject: update for rh9

---
 install/redhat/9/INSTALL      | 5 +++--
 install/redhat/9/sources.list | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/install/redhat/9/INSTALL b/install/redhat/9/INSTALL
index 4c07f88e8..78c718dd7 100644
--- a/install/redhat/9/INSTALL
+++ b/install/redhat/9/INSTALL
@@ -1,10 +1,11 @@
 #!/bin/sh
 
-wget ftp://apt-rpm.tuxfamily.org/apt/redhat/7.3/en/i386/RPMS.extra/apt-*i386.rpm
+wget ftp://apt-rpm.tuxfamily.org/apt/redhat/9/en/i386/RPMS.extra/apt-*i386.rpm
 rpm -i apt*i386.rpm
 cp sources.list /etc/apt/
 apt-get update; apt-get update
-apt-get install apache mod_ssl mod_perl perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-Digest-MD5 perl-HTML-Parser perl-HTML-Tagset perl-MIME-Base64 perl-Storable perl-TimeDate perl-URI perl-libnet perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs #openssh
+#apt-get install apache mod_ssl mod_perl perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-Digest-MD5 perl-HTML-Parser perl-HTML-Tagset perl-MIME-Base64 perl-Storable perl-TimeDate perl-URI perl-libnet perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs #openssh
+apt-get install perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-Digest-MD5 perl-HTML-Parser perl-HTML-Tagset perl-MIME-Base64 perl-Storable perl-TimeDate perl-URI perl-libnet perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs #openssh
 
 perl -MCPAN -e"install Locale::Country, Net::Whois, Business::CreditCard, \
                        Mail::Internet, File::CounterFile, FreezeThaw, \
diff --git a/install/redhat/9/sources.list b/install/redhat/9/sources.list
index 9a9ad5cdf..f6f21f4c9 100644
--- a/install/redhat/9/sources.list
+++ b/install/redhat/9/sources.list
@@ -1,2 +1,2 @@
-rpm ftp://apt-rpm.tuxfamily.org/apt redhat/7.3/en/i386 os updates extra
-rpm-src ftp://apt-rpm.tuxfamily.org/apt redhat/7.3/en/i386 os updates extra
+rpm ftp://apt-rpm.tuxfamily.org/apt redhat/9/en/i386 os updates extra
+rpm-src ftp://apt-rpm.tuxfamily.org/apt redhat/9/en/i386 os updates extra
-- 
cgit v1.2.1


From ea1d9968a9439272b58593e6b2ccbb3869002b20 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Oct 2003 04:25:18 +0000
Subject: daily/weekly billing

---
 FS/FS/cust_main.pm             | 22 +++++++++++++--
 FS/FS/part_pkg.pm              | 10 ++++++-
 FS/bin/freeside-setup          |  2 +-
 httemplate/docs/upgrade10.html | 64 +++++++++++++++++++++++++++++++++++++++++-
 httemplate/edit/part_pkg.cgi   | 51 +++++++++++++++++++++++++++++----
 5 files changed, 137 insertions(+), 12 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 58cfc0c76..0283e3d04 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1089,7 +1089,7 @@ sub bill {
     #bill recurring fee
     my $recur = 0;
     my $sdate;
-    if ( $part_pkg->getfield('freq') > 0 &&
+    if ( $part_pkg->getfield('freq') ne '0' &&
          ! $cust_pkg->getfield('susp') &&
          ( $cust_pkg->getfield('bill') || 0 ) <= $time
     ) {
@@ -1127,8 +1127,19 @@ sub bill {
       $cust_pkg->last_bill($sdate)
         if $cust_pkg->dbdef_table->column('last_bill');
 
-      $mon += $part_pkg->freq;
-      until ( $mon < 12 ) { $mon -= 12; $year++; }
+      if ( $part_pkg->freq =~ /^\d+$/ ) {
+        $mon += $part_pkg->freq;
+        until ( $mon < 12 ) { $mon -= 12; $year++; }
+      } elsif ( $part_pkg->freq =~ /^(\d+)w$/ ) {
+        my $weeks = $1;
+        $mday += $weeks * 7;
+      } elsif ( $part_pkg->freq =~ /^(\d+)d$/ ) {
+        my $days = $1;
+        $mday += $days;
+      } else {
+        $dbh->rollback if $oldAutoCommit;
+        return "unparsable frequency: ". $part_pkg->freq;
+      }
       $cust_pkg->setfield('bill',
         timelocal_nocheck($sec,$min,$hour,$mday,$mon,$year));
       $cust_pkg_mod_flag = 1; 
@@ -1208,6 +1219,11 @@ sub bill {
               my ($mon,$year) = (localtime($sdate) )[4,5];
               $mon++;
               my $freq = $part_pkg->freq || 1;
+              if ( $freq !~ /(\d+)$/ ) {
+                $dbh->rollback if $oldAutoCommit;
+                return "daily/weekly package definitions not (yet?)".
+                       " compatible with monthly tax exemptions";
+              }
               my $taxable_per_month = sprintf("%.2f", $taxable_charged / $freq );
               foreach my $which_month ( 1 .. $freq ) {
                 my %hash = (
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 12ee804ff..695d48ceb 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -229,11 +229,19 @@ sub check {
 
   }
 
+  if ( $self->dbdef_table->column('freq')->type =~ /(int)/i ) {
+    my $error = $self->ut_number('freq');
+    return $error if $error;
+  } else {
+    $self->freq =~ /^(\d+[dw]?)$/
+      or return "Illegal or empty freq: ". $self->freq;
+    $self->freq($1);
+  }
+
     $self->ut_numbern('pkgpart')
       || $self->ut_text('pkg')
       || $self->ut_text('comment')
       || $self->ut_anything('setup')
-      || $self->ut_number('freq')
       || $self->ut_anything('recur')
       || $self->ut_alphan('plan')
       || $self->ut_anything('plandata')
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index b7b45dc63..375a63c2f 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -678,7 +678,7 @@ sub tables_hash_hack {
         'pkg',        'varchar',   '',   $char_d,
         'comment',    'varchar',   '',   $char_d,
         'setup',      @perl_type,
-        'freq',       'int', '', '',  #billing frequency (months)
+        'freq',       'varchar',   '',   $char_d,  #billing frequency
         'recur',      @perl_type,
         'setuptax',  'char', 'NULL', 1,
         'recurtax',  'char', 'NULL', 1,
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 4a6baa59b..446090503 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -62,6 +62,68 @@ CREATE TABLE svc_broadband (
   PRIMARY KEY (svcnum)
 );
 
+CREATE TABLE acct_snarf (
+  snarfnum serial,
+  svcnum int NOT NULL,
+  machine varchar(255) NULL,
+  protocol varchar(80) NULL,
+  username varchar(80) NULL,
+  _password varchar(80) NULL,
+  PRIMARY KEY (snarfnum)
+);
+CREATE INDEX acct_snarf1 ON acct_snarf ( svcnum );
+
+CREATE TABLE part_pkg_temp (
+    pkgpart serial NOT NULL,
+    pkg varchar(80) NOT NULL,
+    "comment" varchar(80) NOT NULL,
+    setup text NULL,
+    freq varchar(80) NOT NULL,
+    recur text NULL,
+    setuptax char(1) NULL,
+    recurtax char(1) NULL,
+    plan varchar(80) NULL,
+    plandata text NULL,
+    disabled char(1) NULL,
+    taxclass varchar(80) NULL,
+    PRIMARY KEY (pkgpart),
+);
+INSERT INTO part_pkg_temp SELECT * from part_pkg;
+DROP TABLE part_pkg;
+ALTER TABLE part_pkg_temp RENAME TO part_pkg;
+ALTER TABLE part_pkg DROP CONSTRAINT part_pkg_temp_pkey;
+ALTER TABLE part_pkg ADD PRIMARY KEY (pkgpart);
+CREATE INDEX part_pkg1 ON part_pkg(disabled);
+select setval('public.part_pkg_temp_pkgpart_seq', ( select max(pkgpart) from part_pkg) ); #?
+
+CREATE TABLE h_part_pkg_temp (
+    historynum serial NOT NULL,
+    history_date int,
+    history_user varchar(80) NOT NULL,
+    history_action varchar(80) NOT NULL,
+    pkgpart int NOT NULL,
+    pkg varchar(80) NOT NULL,
+    "comment" varchar(80) NOT NULL,
+    setup text NULL,
+    freq varchar(80) NOT NULL,
+    recur text NULL,
+    setuptax char(1) NULL,
+    recurtax char(1) NULL,
+    plan varchar(80) NULL,
+    plandata text NULL,
+    disabled char(1) NULL,
+    taxclass varchar(80) NULL,
+    PRIMARY KEY (historynum)
+);
+INSERT INTO h_part_pkg_temp SELECT * from h_part_pkg;
+DROP TABLE h_part_pkg;
+ALTER TABLE h_part_pkg_temp RENAME TO h_part_pkg;
+ALTER TABLE h_part_pkg DROP CONSTRAINT h_part_pkg_temp_pkey;
+ALTER TABLE h_part_pkg ADD PRIMARY KEY (historynum);
+CREATE INDEX h_part_pkg1 ON h_part_pkg(disabled);
+select setval('public.h_part_pkg_temp_historynum_seq', ( select max(historynum) from h_part_pkg) );
+
+
 DROP INDEX cust_bill_pkg1;
 
 ALTER TABLE cust_bill_pkg ADD itemdesc varchar(80) NULL;
@@ -106,7 +168,7 @@ optionally:
 mandatory again:
 
 dbdef-create username
-create-history-tables username cust_bill_pkg_detail router part_svc_router addr_block svc_broadband
+create-history-tables username cust_bill_pkg_detail router part_svc_router addr_block svc_broadband acct_snarf
 dbdef-create username
 
 apache - fix <Files> sections to include .html also
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index dee356250..daa5b7483 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -66,12 +66,51 @@ print '<FORM NAME="dummy">';
 #print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
 print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
 
-print ntable("#cccccc",2), <<END;
-<TR><TD ALIGN="right">Package (customer-visible)</TD><TD><INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}"></TD></TR>
-<TR><TD ALIGN="right">Comment (customer-hidden)</TD><TD><INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}"></TD></TR>
-<TR><TD ALIGN="right">Frequency (months) of recurring fee</TD><TD><INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}" SIZE=3>&nbsp;&nbsp;<I>0=no recurring fee, 1=monthly, 3=quarterly, 12=yearly</TD></TR>
-<TR><TD ALIGN="right">Setup fee tax exempt</TD><TD>
-END
+my %freq;
+tie %freq, 'Tie::IxHash', 
+  '0'  => '(no recurring fee)',
+  '1d' => 'daily',
+  '1w' => 'weekly',
+  '2w' => 'biweekly (every 2 weeks)',
+  '1'  => 'monthly',
+  '2'  => 'bimonthly (every 2 months)',
+  '3'  => 'quarterly (every 3 months)',
+  '6'  => 'semiannually (every 6 months)',
+  '12' => 'annually',
+  '24' => 'biannually (every 2 years)',
+;
+if ( $part_pkg->dbdef_table->column('freq')->type =~ /(int)/i ) {
+  delete $freq{$_} foreach grep { ! /^\d+$/ } keys %freq;
+}
+
+%>
+<%= ntable("#cccccc",2) %>
+  <TR>
+    <TD ALIGN="right">Package (customer-visible)</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="<%= $part_pkg->pkg %>">
+    </TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Comment (customer-hidden)</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="<%=$part_pkg->comment%>">
+    </TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Recurring fee frequency </TD>
+    <TD>
+      <SELECT NAME="freq">
+        <% foreach my $freq ( keys %freq ) { %>
+          <OPTION VALUE="<%= $freq %>"<%= $freq eq $part_pkg->freq ? ' SELECTED' : '' %>><%= $freq{$freq} %>
+        <% } %>
+      </SELECT>
+    </TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Setup fee tax exempt</TD>
+    <TD>
+<%
 
 print '<INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y"';
 print ' CHECKED' if $hashref->{setuptax} eq "Y";
-- 
cgit v1.2.1


From f6c14a1aa55d317747e56d4c0d669b4c902018c4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Oct 2003 05:01:51 +0000
Subject: finish up weekly billing

---
 FS/FS/cust_main.pm            |  2 +-
 httemplate/edit/part_pkg.cgi  |  1 +
 httemplate/view/cust_main.cgi | 17 ++++++++++-------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 0283e3d04..2ba0ff046 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1215,7 +1215,7 @@ sub bill {
                   || $tax->recurtax =~ /^Y$/i;
             next unless $taxable_charged;
 
-            if ( $tax->exempt_amount ) {
+            if ( $tax->exempt_amount > 0 ) {
               my ($mon,$year) = (localtime($sdate) )[4,5];
               $mon++;
               my $freq = $part_pkg->freq || 1;
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index daa5b7483..862e98ecf 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -66,6 +66,7 @@ print '<FORM NAME="dummy">';
 #print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
 print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
 
+#false laziness w/view/cust_main.cgi
 my %freq;
 tie %freq, 'Tie::IxHash', 
   '0'  => '(no recurring fee)',
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index fb3f0f111..83f114ef9 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -412,14 +412,17 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
 
   sub freq {
 
+    #false laziness w/edit/part_pkg.cgi
     my %freq = ( #move this
-      1 => 'monthly',
-      2 => 'bi-monthly',
-      3 => 'quarterly',
-      6 => 'semi-annually',
-      12 => 'annually',
-      24 => 'bi-annually',
-      36 => 'tri-annually',
+      '1d' => 'daily',
+      '1w' => 'weekly',
+      '2w' => 'biweekly (every 2 weeks)',
+      '1'  => 'monthly',
+      '2'  => 'bimonthly (every 2 months)',
+      '3'  => 'quarterly (every 3 months)',
+      '6'  => 'semiannually (every 6 months)',
+      '12' => 'annually',
+      '24' => 'biannually (every 2 years)',
     );
 
     my $freq = shift;
-- 
cgit v1.2.1


From 991b6184840504c5869fd75af5da4097c4993163 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Oct 2003 18:59:22 +0000
Subject: add passive flag to wget

---
 install/redhat/7.3/INSTALL | 2 +-
 install/redhat/9/INSTALL   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/redhat/7.3/INSTALL b/install/redhat/7.3/INSTALL
index 4c07f88e8..8eff42bfc 100644
--- a/install/redhat/7.3/INSTALL
+++ b/install/redhat/7.3/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-wget ftp://apt-rpm.tuxfamily.org/apt/redhat/7.3/en/i386/RPMS.extra/apt-*i386.rpm
+wget --passive-ftp ftp://apt-rpm.tuxfamily.org/apt/redhat/7.3/en/i386/RPMS.extra/apt-*i386.rpm
 rpm -i apt*i386.rpm
 cp sources.list /etc/apt/
 apt-get update; apt-get update
diff --git a/install/redhat/9/INSTALL b/install/redhat/9/INSTALL
index 78c718dd7..b66086894 100644
--- a/install/redhat/9/INSTALL
+++ b/install/redhat/9/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-wget ftp://apt-rpm.tuxfamily.org/apt/redhat/9/en/i386/RPMS.extra/apt-*i386.rpm
+wget --passive-ftp ftp://apt-rpm.tuxfamily.org/apt/redhat/9/en/i386/RPMS.extra/apt-*i386.rpm
 rpm -i apt*i386.rpm
 cp sources.list /etc/apt/
 apt-get update; apt-get update
-- 
cgit v1.2.1


From 752fb0dc07d9a67f0edffeae646b518393d45872 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Oct 2003 00:07:49 +0000
Subject: update rh9 install foo

---
 install/redhat/9/INSTALL | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/install/redhat/9/INSTALL b/install/redhat/9/INSTALL
index b66086894..0e24fbbad 100644
--- a/install/redhat/9/INSTALL
+++ b/install/redhat/9/INSTALL
@@ -1,15 +1,22 @@
 #!/bin/sh
 
+
 wget --passive-ftp ftp://apt-rpm.tuxfamily.org/apt/redhat/9/en/i386/RPMS.extra/apt-*i386.rpm
 rpm -i apt*i386.rpm
 cp sources.list /etc/apt/
 apt-get update; apt-get update
 #apt-get install apache mod_ssl mod_perl perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-Digest-MD5 perl-HTML-Parser perl-HTML-Tagset perl-MIME-Base64 perl-Storable perl-TimeDate perl-URI perl-libnet perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs #openssh
-apt-get install perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-Digest-MD5 perl-HTML-Parser perl-HTML-Tagset perl-MIME-Base64 perl-Storable perl-TimeDate perl-URI perl-libnet perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs #openssh
+
+apt-get install perl-Devel-Symdump perl-BSD-Resource
+
+wget --passive-ftp http://reb00t.com/linux/RPMS/redhat-9/apache/apache-1.3.28-0.n0i.i686.rpm http://reb00t.com/linux/RPMS/redhat-9/mm/mm-1.2.1-0.n0i.i686.rpm ftp://at.rpmfind.net/linux/redhat.com/dist/linux/beta/severn/en/os/i386/RedHat/RPMS/db4-4.1.25-10.i386.rpm
+rpm -i db4-4.1.25-10.i386.rpm mm-1.2.1-0.n0i.i686.rpm apache-1.3.28-0.n0i.i686.rpm
+
+apt-get install perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-HTML-Parser perl-HTML-Tagset perl-TimeDate perl-URI perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs #openssh
 
 perl -MCPAN -e"install Locale::Country, Net::Whois, Business::CreditCard, \
                        Mail::Internet, File::CounterFile, FreezeThaw, \
                        String::Approx, Text::Template, DBIx::DataSource, \
                        DBIx::DBSchema, Net::SSH, String::ShellQuote, \
                        Net::SCP, Apache::ASP, Tie::IxHash, Time::Duration, \
-                       HTML::Widgets::SelectLayers,  Apache::DBI"
+                       HTML::Widgets::SelectLayers, Apache::DBI, Cache::Cache"
-- 
cgit v1.2.1


From 6a82984a55a00f5f127db1ac3bd5b79b4a277d13 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Oct 2003 01:28:51 +0000
Subject: more rh9 install foo

---
 install/redhat/9/INSTALL | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/install/redhat/9/INSTALL b/install/redhat/9/INSTALL
index 0e24fbbad..2fecd1164 100644
--- a/install/redhat/9/INSTALL
+++ b/install/redhat/9/INSTALL
@@ -9,8 +9,14 @@ apt-get update; apt-get update
 
 apt-get install perl-Devel-Symdump perl-BSD-Resource
 
-wget --passive-ftp http://reb00t.com/linux/RPMS/redhat-9/apache/apache-1.3.28-0.n0i.i686.rpm http://reb00t.com/linux/RPMS/redhat-9/mm/mm-1.2.1-0.n0i.i686.rpm ftp://at.rpmfind.net/linux/redhat.com/dist/linux/beta/severn/en/os/i386/RedHat/RPMS/db4-4.1.25-10.i386.rpm
-rpm -i db4-4.1.25-10.i386.rpm mm-1.2.1-0.n0i.i686.rpm apache-1.3.28-0.n0i.i686.rpm
+wget --passive-ftp http://reb00t.com/linux/RPMS/redhat-9/apache/apache-1.3.28-0.n0i.src.rpm http://reb00t.com/linux/RPMS/redhat-9/mm/mm-1.2.1-0.n0i.i686.rpm http://reb00t.com/linux/RPMS/redhat-9/mm/mm-devel-1.2.1-0.n0i.i686.rpm
+rpm -i mm-1.2.1-0.n0i.i686.rpm mm-devel-1.2.1-0.n0i.i686.rpm apache-1.3.28-0.n0i.src.rpm
+
+cd /usr/src/redhat/SPECS  
+rpmbuild -ba apache.spec
+
+cd /usr/src/redhat/RPMS/i386
+rpm -i apache-1.3.28-0.n0i.i386.rpm
 
 apt-get install perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-HTML-Parser perl-HTML-Tagset perl-TimeDate perl-URI perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs #openssh
 
@@ -20,3 +26,25 @@ perl -MCPAN -e"install Locale::Country, Net::Whois, Business::CreditCard, \
                        DBIx::DBSchema, Net::SSH, String::ShellQuote, \
                        Net::SCP, Apache::ASP, Tie::IxHash, Time::Duration, \
                        HTML::Widgets::SelectLayers, Apache::DBI, Cache::Cache"
+
+#edit /etc/init.d/httpd, add -DHAVE_PERL -DHAVE_SSL, then remove perl & ssl
+# module load bits from /etc/httpd/conf/httpd.conf
+
+useradd freeside
+
+chkconfig postgresql on
+/etc/init.d/postgresql start
+
+su postgres -c "createuser -P freeside"
+
+su freeside -c "createdb freeside"
+
+#?
+cd ../..
+make install-perl-modules
+make create-config
+freeside-adduser -c -h /usr/local/etc/freeside/htpasswd ivan
+su freeside -c 'freeside-setup ivan'
+su freeside -c '/home/ivan/freeside/bin/populate-msgcat ivan'
+make deploy
+
-- 
cgit v1.2.1


From e5b08c9a31a68826e00b90b62249a57a24ebb9e3 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 22 Oct 2003 19:10:13 +0000
Subject: dbh is a global.

---
 httemplate/edit/process/router.cgi | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/httemplate/edit/process/router.cgi b/httemplate/edit/process/router.cgi
index 7e40c48a7..a2fa46dd9 100644
--- a/httemplate/edit/process/router.cgi
+++ b/httemplate/edit/process/router.cgi
@@ -1,8 +1,5 @@
 <%
 
-use FS::UID qw(dbh);
-
-my $dbh = dbh;
 local $FS::UID::AutoCommit=0;
 
 sub check {
@@ -10,7 +7,7 @@ sub check {
   if($error) {
     $cgi->param('error', $error);
     print $cgi->redirect(popurl(3) . "edit/router.cgi?". $cgi->query_string);
-    $dbh->rollback;
+    dbh->rollback;
     exit;
   }
 }
@@ -38,7 +35,7 @@ check($error);
 
 if ($old) {
   @old_psr = $old->part_svc_router;
-  foreach $psr (@old_psr) {
+  foreach my $psr (@old_psr) {
     if($cgi->param('svcpart_'.$psr->svcpart) eq 'ON') {
       # do nothing
     } else {
@@ -64,7 +61,7 @@ foreach($cgi->param) {
 
 
 # Yay, everything worked!
-$dbh->commit or die $dbh->errstr;
+dbh->commit or die dbh->errstr;
 print $cgi->redirect(popurl(3). "browse/router.cgi");
 
 %>
-- 
cgit v1.2.1


From aa71df24486955d494c30ccc14fbe5917029ddec Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 23 Oct 2003 07:49:56 +0000
Subject: Declined results from batches should now suspend the relevant
 customer.

---
 FS/FS/cust_pay_batch.pm | 69 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 48 insertions(+), 21 deletions(-)

diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
index f53e55b94..8059f1ca2 100644
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -188,6 +188,18 @@ sub check {
   $self->SUPER::check;
 }
 
+=item cust_main
+
+Returns the customer (see L<FS::cust_main>) for this batched credit card
+payment.
+
+=cut
+
+sub cust_main {
+  my $self = shift;
+  qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+}
+
 =back
 
 =head1 SUBROUTINES
@@ -212,8 +224,9 @@ sub import_results {
   my @fields;
   my $end_condition;
   my $end_hook;
-  my $condition;
   my $hook;
+  my $approved_condition;
+  my $declined_condition;
 
   if ( $format eq 'csv-td_canada_trust-merchant_pc_batch' ) {
 
@@ -252,11 +265,6 @@ sub import_results {
       '';
     };
 
-    $condition = sub {
-      my $hash = shift;
-      $hash->{'result'} == 3 && $hash->{'type'} eq '0';
-    };
-
     $hook = sub {
       my $hash = shift;
       $hash->{'paid'} = sprintf("%.2f", $hash->{'paid'} / 100 );
@@ -268,6 +276,18 @@ sub import_results {
                                     substr($hash->{'_date'}, 0, 4)-1900, );
     };
 
+    $approved_condition = sub {
+      my $hash = shift;
+      $hash->{'type'} eq '0' && $hash->{'result'} == 3;
+    };
+
+    $declined_condition = sub {
+      my $hash = shift;
+      $hash->{'type'} eq '0' && (    $hash->{'result'} == 4
+                                  || $hash->{'result'} == 5 );
+    };
+
+
   } else {
     return "Unknown format $format";
   }
@@ -327,24 +347,31 @@ sub import_results {
       return "error removing paybatchnum $hash{'paybatchnum'}: $error\n";
     }
 
-    next unless &{$condition}(\%hash);
-
     &{$hook}(\%hash);
 
-    my $cust_pay = new FS::cust_pay ( {
-      'custnum'  => $custnum,
-      'payby'    => 'CARD',
-      'paybatch' => $paybatch,
-      map { $_ => $hash{$_} } (qw( paid _date payinfo )),
-    } );
-    $error = $cust_pay->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "error adding payment paybatchnum $hash{'paybatchnum'}: $error\n";
-    }
-    $total += $hash{'paid'};
+    if ( &{$approved_condition}(\%hash) ) {
+
+      my $cust_pay = new FS::cust_pay ( {
+        'custnum'  => $custnum,
+        'payby'    => 'CARD',
+        'paybatch' => $paybatch,
+        map { $_ => $hash{$_} } (qw( paid _date payinfo )),
+      } );
+      $error = $cust_pay->insert;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "error adding payment paybatchnum $hash{'paybatchnum'}: $error\n";
+      }
+      $total += $hash{'paid'};
+  
+      $cust_pay->cust_main->apply_payments;
 
-    $cust_pay->cust_main->apply_payments;
+    } elsif ( &{$declined_condition}(\%hash) ) {
+
+      #this should be configurable... if anybody else ever uses batches
+      $cust_pay_batch->cust_main->suspend;
+
+    }
 
   }
   
-- 
cgit v1.2.1


From 324a43d9fbc5cd64353229c63289bdb394407ae3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 23 Oct 2003 09:02:24 +0000
Subject: fix cranky verbitage at the top

---
 httemplate/docs/legacy.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/legacy.html b/httemplate/docs/legacy.html
index 678780962..94efe53af 100755
--- a/httemplate/docs/legacy.html
+++ b/httemplate/docs/legacy.html
@@ -3,7 +3,7 @@
 </head>
 <body>
   <h1>Importing legacy data</h1>
-<font size="+2">In most cases, legacy data import all cases will require writing custom code to deal with your particular legacy data.  The example scripts here will not work "out-of-the-box".  Importing your legacy data will most probably involve some hacking on the example scripts noted below.  Contributions to the import process are welcome.</font>
+<font size="+2">In almost all cases, legacy data import will require writing custom code to deal with your particular legacy data.  The example scripts here will probably <b>not</b> work "out-of-the-box", and are provided <b>as a starting point only</b>.</font>
 <br><br><i>Some import scripts may require installation of the <a href="http://search.cpan.org/search?dist=Array-PrintCols">Array-PrintCols</a> and <a href="http://search.cpan.org/search?dist=Term-Query">Term-Query</a> (make test broken; install manually) modules.</i><br>
 <ul>
   <li><a name="bind">bin/bind.import</a> - Import domain information from BIND named
-- 
cgit v1.2.1


From 952ce66262265a57634240373c18ddb6d8dd57bd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 23 Oct 2003 22:37:03 +0000
Subject: require DBIx::DBSchema 0.22 to deal with Pg version problems

---
 bin/dbdef-create | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bin/dbdef-create b/bin/dbdef-create
index c977f876e..a449d67cc 100755
--- a/bin/dbdef-create
+++ b/bin/dbdef-create
@@ -1,10 +1,8 @@
 #!/usr/bin/perl -Tw
-#
-# $Id: dbdef-create,v 1.6 2002-09-19 13:34:52 ivan Exp $
 
 use strict;
 use DBI;
-use DBIx::DBSchema 0.21;
+use DBIx::DBSchema 0.22;
 use FS::UID qw(adminsuidsetup datasrc driver_name);
 
 my $user = shift or die &usage;
-- 
cgit v1.2.1


From 368bc5c098a47c32db7c575f912683ebe8662f59 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 24 Oct 2003 00:39:50 +0000
Subject: referral listing now shows customer signups today and past
 week/30/60/90/6months/year/total

---
 httemplate/browse/part_referral.cgi | 49 ++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index 084c21bd0..1a57a5b24 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -8,31 +8,56 @@ Where a customer heard about your service. Tracked for informational purposes.
 <A HREF="<%= $p %>edit/part_referral.cgi"><I>Add a new advertising source</I></A>
 <BR><BR>
 
+<%
+  my $today = timelocal(0, 0, 0, (localtime(time))[3..5] );
+  my %past;
+  tie %past, 'Tie::IxHash',
+    'Today'         =>        0,
+    'Past week'     =>   518400, # 60sec * 60min * 24hrs * 6days
+    'Past 30 days'  =>  2505600, # 60sec * 60min * 24hrs * 29days 
+    'Past 60 days'  =>  5097600, # 60sec * 60min * 24hrs * 29days 
+    'Past 90 days'  =>  7689600, # 60sec * 60min * 24hrs * 29days 
+    'Past 6 months' => 15724800, # 60sec * 60min * 24hrs * 182days 
+    'Past year'     => 31486000, # 60sec * 60min * 24hrs * 364days 
+    'Total'         => $today,
+  ;
+
+  my $sth = dbh->prepare("SELECT COUNT(*) FROM h_cust_main
+                            WHERE refnum = ?
+                              AND history_date > ?         ")
+    or die dbh->errstr;
+%>
+
 <%= table() %>
 <TR>
-  <TH COLSPAN=2>Advertising source</TH>
+  <TH COLSPAN=2 ROWSPAN=2>Advertising source</TH>
+  <TH COLSPAN=<%= scalar(keys %past) %>>Customers</TH>
+</TR>
+<% for my $period ( keys %past ) { %>
+  <TH><FONT SIZE=-1><%= $period %></FONT></TH>
+<% } %>
 </TR>
 
 <%
 foreach my $part_referral ( sort { 
   $a->getfield('refnum') <=> $b->getfield('refnum')
 } qsearch('part_referral',{}) ) {
-  my($hashref)=$part_referral->hashref;
-  print <<END;
+%>
       <TR>
         <TD><A HREF="${p}edit/part_referral.cgi?$hashref->{refnum}">
-          $hashref->{refnum}</A></TD>
+          <%= $part_referral->refnum %></A></TD>
         <TD><A HREF="${p}edit/part_referral.cgi?$hashref->{refnum}">
-          $hashref->{referral}</A></TD>
+          <%= $part_referral->referral %></A></TD>
+        <% for my $period ( values %past ) {
+          $sth->execute($part_referral->refnum, $today-$period)
+            or die $sth->errstr;
+          my $number = $sth->fetchrow_arrayref->[0];
+        %>
+          <TD><%= $number %></TD>
+        <% } %>
       </TR>
-END
-
-}
+<% } %>
 
-print <<END;
     </TABLE>
   </BODY>
 </HTML>
-END
-
-%>
-- 
cgit v1.2.1


From f69fa5bd9f1f7a51285c167a0a17d0a4f78b72a7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 24 Oct 2003 00:50:50 +0000
Subject: UI: adjust alignment of stats

---
 httemplate/browse/part_referral.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index 1a57a5b24..37eb32991 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -53,7 +53,7 @@ foreach my $part_referral ( sort {
             or die $sth->errstr;
           my $number = $sth->fetchrow_arrayref->[0];
         %>
-          <TD><%= $number %></TD>
+          <TD ALIGN="right"><%= $number %></TD>
         <% } %>
       </TR>
 <% } %>
-- 
cgit v1.2.1


From 07b53cca107614acdb9a8d66737f37fe2565d4ee Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 24 Oct 2003 05:52:01 +0000
Subject: adding cvv2 images

---
 httemplate/images/cvv2.png      | Bin 0 -> 3854 bytes
 httemplate/images/cvv2_amex.png | Bin 0 -> 4573 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 httemplate/images/cvv2.png
 create mode 100644 httemplate/images/cvv2_amex.png

diff --git a/httemplate/images/cvv2.png b/httemplate/images/cvv2.png
new file mode 100644
index 000000000..4610dcbe6
Binary files /dev/null and b/httemplate/images/cvv2.png differ
diff --git a/httemplate/images/cvv2_amex.png b/httemplate/images/cvv2_amex.png
new file mode 100644
index 000000000..21c36a0ab
Binary files /dev/null and b/httemplate/images/cvv2_amex.png differ
-- 
cgit v1.2.1


From f63c0e821610c885f9f49d301eeccf804e1ca6d3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 24 Oct 2003 19:30:44 +0000
Subject: cvv!

---
 FS/FS/ClientAPI/Signup.pm                   |   5 ++-
 FS/FS/cust_main.pm                          |  51 +++++++++++++++++++++++++---
 FS/bin/freeside-setup                       |   1 +
 fs_signup/FS-SignupClient/SignupClient.pm   |   2 ++
 fs_signup/FS-SignupClient/cgi/cvv2.html     |  25 ++++++++++++++
 fs_signup/FS-SignupClient/cgi/cvv2.png      | Bin 0 -> 3854 bytes
 fs_signup/FS-SignupClient/cgi/cvv2_amex.png | Bin 0 -> 4573 bytes
 fs_signup/FS-SignupClient/cgi/signup.cgi    |   8 +++--
 fs_signup/FS-SignupClient/cgi/signup.html   |  27 ++++++++++++++-
 httemplate/docs/cvv2.html                   |  25 ++++++++++++++
 httemplate/docs/schema.html                 |   1 +
 httemplate/docs/upgrade10.html              |   4 ++-
 httemplate/edit/cust_main.cgi               |  37 ++++++++++++++++++--
 httemplate/edit/process/cust_main.cgi       |   8 +++++
 14 files changed, 182 insertions(+), 12 deletions(-)
 create mode 100644 fs_signup/FS-SignupClient/cgi/cvv2.html
 create mode 100644 fs_signup/FS-SignupClient/cgi/cvv2.png
 create mode 100644 fs_signup/FS-SignupClient/cgi/cvv2_amex.png
 create mode 100644 httemplate/docs/cvv2.html

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 5ca1f93ed..92fc6361d 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -60,6 +60,8 @@ sub signup_info {
 
     'payby' => [ $conf->config('signup_server-payby') ],
 
+    'cvv_enabled' => defined dbdef->table('cust_main')->column('paycvv'),
+
     'msgcat' => { map { $_=>gettext($_) } qw(
       passwords_dont_match invalid_card unknown_card_type not_a
     ) },
@@ -116,7 +118,8 @@ sub new_customer {
 
     map { $_ => $packet->{$_} } qw(
       last first ss company address1 address2 city county state zip country
-      daytime night fax payby payinfo paydate payname referral_custnum comments
+      daytime night fax payby payinfo paycvv paydate payname referral_custnum
+      comments
     ),
 
   } );
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 2ba0ff046..0ab2aa50d 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -172,6 +172,8 @@ FS::Record.  The following fields are currently supported:
 
 =item payinfo - card number, P.O., comp issuer (4-8 lowercase alphanumerics; think username) or prepayment identifier (see L<FS::prepay_credit>)
 
+=item paycvv - Card Verification Value, "CVV2" (also known as CVC2 or CID), the 3 or 4 digit number on the back (or front, for American Express) of the credit card
+
 =item paydate - expiration date, mm/yyyy, m/yyyy, mm/yy or m/yy
 
 =item payname - name on card or billing name
@@ -773,6 +775,21 @@ sub check {
       or return gettext('invalid_card'); # . ": ". $self->payinfo;
     return gettext('unknown_card_type')
       if cardtype($self->payinfo) eq "Unknown";
+    if ( defined $self->dbdef_table->column('paycvv') ) {
+      if ( length($self->paycvv) ) {
+        if ( cardtype($self->payinfo) eq 'American Express card' ) {
+          $self->paycvv =~ /^(\d{4})$/
+            or return "CVV2 (CID) for American Express cards is four digits.";
+          $self->paycvv($1);
+        } else {
+          $self->paycvv =~ /^(\d{3})$/
+            or return "CVV2 (CVC2/CID) is three digits.";
+          $self->paycvv($1);
+        }
+      } else {
+        $self->paycvv('');
+      }
+    }
 
   } elsif ( $self->payby eq 'CHEK' || $self->payby eq 'DCHK' ) {
 
@@ -781,6 +798,7 @@ sub check {
     $payinfo =~ /^(\d+)\@(\d{9})$/ or return 'invalid echeck account@aba';
     $payinfo = "$1\@$2";
     $self->payinfo($payinfo);
+    $self->paycvv('') if $self->dbdef_table->column('paycvv');
 
   } elsif ( $self->payby eq 'LECB' ) {
 
@@ -789,11 +807,13 @@ sub check {
     $payinfo =~ /^1?(\d{10})$/ or return 'invalid btn billing telephone number';
     $payinfo = $1;
     $self->payinfo($payinfo);
+    $self->paycvv('') if $self->dbdef_table->column('paycvv');
 
   } elsif ( $self->payby eq 'BILL' ) {
 
     $error = $self->ut_textn('payinfo');
     return "Illegal P.O. number: ". $self->payinfo if $error;
+    $self->paycvv('') if $self->dbdef_table->column('paycvv');
 
   } elsif ( $self->payby eq 'COMP' ) {
 
@@ -804,6 +824,7 @@ sub check {
 
     $error = $self->ut_textn('payinfo');
     return "Illegal comp account issuer: ". $self->payinfo if $error;
+    $self->paycvv('') if $self->dbdef_table->column('paycvv');
 
   } elsif ( $self->payby eq 'PREPAY' ) {
 
@@ -814,6 +835,7 @@ sub check {
     return "Illegal prepayment identifier: ". $self->payinfo if $error;
     return "Unknown prepayment identifier"
       unless qsearchs('prepay_credit', { 'identifier' => $self->payinfo } );
+    $self->paycvv('') if $self->dbdef_table->column('paycvv');
 
   }
 
@@ -1666,15 +1688,20 @@ sub realtime_bop {
 
   my %content;
   if ( $method eq 'CC' ) { 
+
     $content{card_number} = $self->payinfo;
     $self->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
     $content{expiration} = "$2/$1";
-    if ( qsearch('cust_pay', { 'custnum' => $self->custnum,
+
+    $content{cvv2} = $self->paycvv
+      if defined $self->dbdef_table->column('paycvv')
+         && length($self->paycvv);
+
+    $content{recurring_billing} = 'YES'
+      if qsearch('cust_pay', { 'custnum' => $self->custnum,
                                'payby'   => 'CARD',
-                               'payinfo' => $self->payinfo, } )
-    ) { 
-      $content{recurring_billing} = 'YES';
-    }
+                               'payinfo' => $self->payinfo, } );
+
   } elsif ( $method eq 'ECHECK' ) {
     my($account_number,$routing_code) = $self->payinfo;
     ( $content{account_number}, $content{routing_code} ) =
@@ -1759,6 +1786,20 @@ sub realtime_bop {
 
   }
 
+  #remove paycvv after initial transaction
+  #make this disable-able via a config option if anyone insists?  
+  # (though that probably violates cardholder agreements)
+  if ( defined $self->dbdef_table->column('paycvv')
+       && length($self->paycvv)
+  ) {
+    my $new = new FS::cust_main { $self->hash };
+    $new->paycvv('');
+    my $error = $new->replace($self);
+    if ( $error ) {
+      warn "error removing cvv: $error\n";
+    }
+  }
+
   #result handling
   if ( $transaction->is_success() ) {
 
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 375a63c2f..80b74c1f1 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -502,6 +502,7 @@ sub tables_hash_hack {
         'ship_fax',      'varchar', 'NULL', 12,
         'payby',    'char', '',     4,
         'payinfo',  'varchar', 'NULL', $char_d,
+        'paycvv',   'varchar', 'NULL', 4,
         #'paydate',  @date_type,
         'paydate',  'varchar', 'NULL', 10,
         'payname',  'varchar', 'NULL', $char_d,
diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm
index 1d91a418f..fb2b12fb0 100644
--- a/fs_signup/FS-SignupClient/SignupClient.pm
+++ b/fs_signup/FS-SignupClient/SignupClient.pm
@@ -43,6 +43,7 @@ FS::SignupClient - Freeside signup client API
     'fax'              => $fax,
     'payby'            => $payby,
     'payinfo'          => $payinfo,
+    'paycvv'           => $paycvv,
     'paydate'          => $paydate,
     'payname'          => $payname,
     'invoicing_list'   => $invoicing_list,
@@ -125,6 +126,7 @@ a paramater with the following keys:
   fax
   payby
   payinfo
+  paycvv
   paydate
   payname
   invoicing_list
diff --git a/fs_signup/FS-SignupClient/cgi/cvv2.html b/fs_signup/FS-SignupClient/cgi/cvv2.html
new file mode 100644
index 000000000..b178c8513
--- /dev/null
+++ b/fs_signup/FS-SignupClient/cgi/cvv2.html
@@ -0,0 +1,25 @@
+<HTML>
+  <HEAD>
+    <TITLE>
+      CVV2 information
+    </TITLE>
+  </HEAD>
+  <BODY BGCOLOR="#e8e8e8">
+  The CVV2 number (also called CVC2 or CID) is a three- or four-digit
+  security code used to reduce credit card fraud.<BR><BR>
+  <TABLE BORDER=0 CELLSPACING=4>
+    <TR>
+      <TH>Visa / MasterCard / Discover</TH>
+      <TH>American Express</TH>
+    </TR>
+    <TR>
+      <TD>
+        <IMG BORDER=0 ALT="Visa/MasterCard/Discover" SRC="cvv2.png">
+      </TD>
+      <TD>
+        <IMG BORDER=0 ALT="American Express" SRC="cvv2_amex.png">
+      </TD>
+  </TABLE>
+    <CENTER><A HREF="javascript:close()">(close window)</A></CENTER>
+  </BODY>
+</HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/cvv2.png b/fs_signup/FS-SignupClient/cgi/cvv2.png
new file mode 100644
index 000000000..4610dcbe6
Binary files /dev/null and b/fs_signup/FS-SignupClient/cgi/cvv2.png differ
diff --git a/fs_signup/FS-SignupClient/cgi/cvv2_amex.png b/fs_signup/FS-SignupClient/cgi/cvv2_amex.png
new file mode 100644
index 000000000..21c36a0ab
Binary files /dev/null and b/fs_signup/FS-SignupClient/cgi/cvv2_amex.png differ
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 2458bcf19..70facb570 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.46 2003-10-14 17:00:00 ivan Exp $
+# $Id: signup.cgi,v 1.47 2003-10-24 19:28:49 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages
@@ -8,7 +8,7 @@ use vars qw( @payby $cgi $locales $packages
              $init_data $error
              $last $first $ss $company $address1 $address2 $city $state $county
              $country $zip $daytime $night $fax $invoicing_list $payby $payinfo
-             $paydate $payname $referral_custnum $init_popstate
+             $paycvv $paydate $payname $referral_custnum $init_popstate
              $pkgpart $username $password $password2 $sec_phrase $popnum
              $agentnum
              $ieak_file $ieak_template $cck_file $cck_template
@@ -178,6 +178,9 @@ if ( defined $cgi->param('magic') ) {
     $paydate =
       $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' );
     $payname = $cgi->param( $payby. '_payname' );
+    $paycvv = defined $cgi->param( $payby. '_paycvv' )
+                ? $cgi->param( $payby. '_paycvv' )
+                : '';
 
     if ( $invoicing_list = $cgi->param('invoicing_list') ) {
       $invoicing_list .= ', POST' if $cgi->param('invoicing_list_POST');
@@ -252,6 +255,7 @@ if ( defined $cgi->param('magic') ) {
         'fax'              => $fax,
         'payby'            => $payby,
         'payinfo'          => $payinfo,
+        'paycvv'           => $paycvv,
         'paydate'          => $paydate,
         'payname'          => $payname,
         'invoicing_list'   => $invoicing_list,
diff --git a/fs_signup/FS-SignupClient/cgi/signup.html b/fs_signup/FS-SignupClient/cgi/signup.html
index 80774099c..dc4252c73 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.html
+++ b/fs_signup/FS-SignupClient/cgi/signup.html
@@ -1,5 +1,18 @@
 <HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>ISP Signup form</FONT><BR><BR>
+<BODY BGCOLOR="#e8e8e8" onUnload="myclose()">
+<script language="JavaScript"><!--
+  var mywindow = -1;
+  function myopen(filename,windowname,properties) {
+    myclose();
+    mywindow = window.open(filename,windowname,properties);
+  }
+  function myclose() {
+    if ( mywindow != -1 )
+      mywindow.close();
+    mywindow = -1
+  }
+//--></script>
+<FONT SIZE=7>ISP Signup form</FONT><BR><BR>
 <FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
 <FORM ACTION="<%= $self_url %>" METHOD=POST>
 <INPUT TYPE="hidden" NAME="magic" VALUE="process">
@@ -101,6 +114,12 @@ Contact Information
       'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
     );
 
+    if ( $init_data->{'cvv_enabled'} ) {
+      foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5
+        $payby{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="" SIZE=4 MAXLENGTH=4>!;
+      }
+    }
+
     my( $account, $aba ) = split('@', $payinfo);
     my %paybychecked = (
       'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
@@ -113,6 +132,12 @@ Contact Information
       'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
     );
 
+    if ( $init_data->{'cvv_enabled'} ) {
+      foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5
+        $paybychecked{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="$paycvv" SIZE=4 MAXLENGTH=4>!;
+      }
+    }
+
     for (@payby) {
       if ( scalar(@payby) == 1) {
         $OUT .= '<TD VALIGN=TOP>'.
diff --git a/httemplate/docs/cvv2.html b/httemplate/docs/cvv2.html
new file mode 100644
index 000000000..fe8a17f6f
--- /dev/null
+++ b/httemplate/docs/cvv2.html
@@ -0,0 +1,25 @@
+<HTML>
+  <HEAD>
+    <TITLE>
+      CVV2 information
+    </TITLE>
+  </HEAD>
+  <BODY BGCOLOR="#e8e8e8">
+  The CVV2 number (also called CVC2 or CID) is a three- or four-digit
+  security code used to reduce credit card fraud.<BR><BR>
+  <TABLE BORDER=0 CELLSPACING=4>
+    <TR>
+      <TH>Visa / MasterCard / Discover</TH>
+      <TH>American Express</TH>
+    </TR>
+    <TR>
+      <TD>
+        <IMG BORDER=0 ALT="Visa/MasterCard/Discover" SRC="../images/cvv2.png">
+      </TD>
+      <TD>
+        <IMG BORDER=0 ALT="American Express" SRC="../images/cvv2_amex.png">
+      </TD>
+  </TABLE>
+    <CENTER><A HREF="javascript:close()">(close window)</A></CENTER>
+  </BODY>
+</HTML>
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index bef567186..06be8960d 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -121,6 +121,7 @@
         <li><i>ship_fax</i>
         <li>payby - CARD, DCHK, CHEK, DCHK, LECB, BILL, or COMP
         <li>payinfo - card number, P.O.#, or comp issuer
+        <li>paycvv - Card Verification Value, "CVV2" (also known as CVC2 or CID), the 3 or 4 digit number on the back (or front, for American Express) of the credit card
         <li>paydate - expiration date
         <li>payname - billing name (name on card)
         <li>tax - tax exempt, Y or null
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 446090503..080528bac 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -1,7 +1,7 @@
 <pre>
 this is incomplete
 
-install DBIx::DBSchema 0.21
+install DBIx::DBSchema 0.22
 
 install NetAddr::IP and Chart::Base
 
@@ -142,6 +142,8 @@ ALTER TABLE agent ADD username varchar(80) NULL;
 ALTER TABLE h_agent ADD username varchar(80) NULL;
 ALTER TABLE agent ADD _password varchar(80) NULL;
 ALTER TABLE h_agent ADD _password varchar(80) NULL;
+ALTER TABLE cust_main ADD paycvv varchar(4) NULL;
+ALTER TABLE h_cust_main ADD paycvv varchar(4) NULL;
 
 dump database, edit:
 - cust_main: increase otaker from 8 to 32
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 73a0eef49..1909b5438 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -39,6 +39,12 @@ if ( $cgi->param('error') ) {
   $query =~ /^(\d+)$/;
   $custnum=$1;
   $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
+  if ( $cust_main->dbdef_table->column('paycvv')
+       && length($cust_main->paycvv)             ) {
+    my $paycvv = $cust_main->paycvv;
+    $paycvv =~ s/./*/g;
+    $cust_main->paycvv($paycvv);
+  }
   $saved_pkgpart = 0;
   $username = '';
   $password = '';
@@ -61,7 +67,7 @@ my $action = $custnum ? 'Edit' : 'Add';
 # top
 
 my $p1 = popurl(1);
-print header("Customer $action", '');
+print header("Customer $action", '', ' onUnload="myclose()"');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $error, "</FONT>"
   if $error;
 
@@ -400,7 +406,19 @@ if ( $payby_default eq 'HIDE' ) {
   print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
 
   print "<TR><TD>Billing type</TD></TR>",
-        "</TABLE>",
+        "</TABLE>", '<script language="JavaScript"><!--
+                       var mywindow = -1;
+                       function myopen(filename,windowname,properties) {
+                         myclose();
+                         mywindow = window.open(filename,windowname,properties);
+                       }
+                       function myclose() {
+                         if ( mywindow != -1 )
+                           mywindow.close();
+                         mywindow = -1;
+                       }
+
+                     //--></script>',
         &table("#cccccc"), "<TR>";
 
   my($payinfo, $payname)=(
@@ -418,6 +436,12 @@ if ( $payby_default eq 'HIDE' ) {
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
 );
 
+  if ( $cust_main->dbdef_table->column('paycvv') ) {
+    foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 bs
+      $payby{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('../docs/cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="" SIZE=4 MAXLENGTH=4>!;
+    }
+  }
+
   my( $account, $aba ) = split('@', $payinfo);
 
   my %paybychecked = (
@@ -430,6 +454,15 @@ if ( $payby_default eq 'HIDE' ) {
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
 );
 
+  if ( $cust_main->dbdef_table->column('paycvv') ) {
+    my $paycvv = $cust_main->paycvv;
+
+    foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 bs
+      $paybychecked{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('../docs/cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="$paycvv" SIZE=4 MAXLENGTH=4>!;
+    }
+  }
+
+
   $cust_main->payby($payby_default) unless $cust_main->payby;
   for (qw(CARD DCRD CHEK DCHK LECB BILL COMP)) {
     print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 818382856..25c346e46 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -19,6 +19,8 @@ if ( $payby ) {
   $cgi->param('paydate',
     $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
   $cgi->param('payname', $cgi->param( $payby. '_payname' ) );
+  $cgi->param('paycvv', $cgi->param( $payby. '_paycvv' ) )
+    if defined $cgi->param( $payby. '_paycvv' );
 }
 
 $cgi->param('otaker', &getotaker );
@@ -27,6 +29,7 @@ my @invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
 push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
 $cgi->param('invoicing_list', join(',', @invoicing_list) );
 
+
 #create new record object
 
 my $new = new FS::cust_main ( {
@@ -113,6 +116,11 @@ if ( $new->custnum eq '' ) {
 } else { #create old record object
   my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } ); 
   $error ||= "Old record not found!" unless $old;
+  if ( defined dbdef->table('cust_main')->column('paycvv')
+       && length($old->paycvv)
+       && $new->paycvv =~ /^\s*\*+\s*$/ ) {
+    $new->paycvv($old->paycvv);
+  }
   $error ||= $new->replace($old, \@invoicing_list);
 }
 
-- 
cgit v1.2.1


From 3da1a075bdfba74af39b52a468241bc2e12d2692 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 24 Oct 2003 20:38:10 +0000
Subject: add cvv-save configuration value to save the cvv data for specific
 card types

---
 FS/FS/Conf.pm      | 16 ++++++++++++++++
 FS/FS/cust_main.pm |  1 +
 2 files changed, 17 insertions(+)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 51feb3847..ea32b2c23 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1080,6 +1080,22 @@ httemplate/docs/config.html
     'type'        => 'textarea',
   },
 
+  {
+    'key'         => 'cvv-save',
+    'section'     => 'billing',
+    'description' => 'Save CVV2 information after the initial transaction for the selected credit card types.  Enabling this option may be in violation of your merchant agreement(s), so please check them carefully before enabling this option for any credit card types.',
+    'type'        => 'selectmultiple',
+    'select_enum' => [ "VISA card",
+                       "MasterCard",
+                       "Discover card",
+                       "American Express card",
+                       "Diner's Club/Carte Blanche",
+                       "enRoute",
+                       "JCB",
+                       "BankCard",
+                     ],
+  },
+
 );
 
 1;
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 0ab2aa50d..1d2e9edcd 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1791,6 +1791,7 @@ sub realtime_bop {
   # (though that probably violates cardholder agreements)
   if ( defined $self->dbdef_table->column('paycvv')
        && length($self->paycvv)
+       && ! grep { $_ eq cardtype($self->payinfo) } $conf->config('cvv-save')
   ) {
     my $new = new FS::cust_main { $self->hash };
     $new->paycvv('');
-- 
cgit v1.2.1


From c97b6a00f150f5e7a4aa58b71389d5c504817cf2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 25 Oct 2003 01:06:37 +0000
Subject: better link to .INS files documentation

---
 httemplate/docs/signup.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/signup.html b/httemplate/docs/signup.html
index 5168f47d6..684521dc0 100644
--- a/httemplate/docs/signup.html
+++ b/httemplate/docs/signup.html
@@ -36,7 +36,7 @@ Then:
 Optional:
 <ul>
   <li>If you create a <b>/usr/local/freeside/ieak.template</b> file on the external machine, it will be sent to IE users with MIME type <i>application/x-Internet-signup</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the variables listed below available.
-  (an example file is included as <b>fs_signup/ieak.template</b>)  See the <a href="http://www.microsoft.com/windows/ieak/techinfo/deploy/60/en/toc.asp">IEAK documentation</a> for more information.
+  (an example file is included as <b>fs_signup/ieak.template</b>)  See the section on <a href="http://www.microsoft.com/windows/ieak/techinfo/deploy/60/en/INS.HTM">internet settings files</a> in the <a href="http://www.microsoft.com/windows/ieak/techinfo/deploy/60/en/toc.asp">IEAK documentation</a> for more information.
   <li>If you create a <b>/usr/local/freeside/cck.template</b> file on the external machine, the variables defined will be sent to Netscape users with MIME type <i>application/x-netscape-autoconfigure-dialer-v2</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the variables listed below available.
   (an example file is included as <b>fs_signup/cck.template</b>).  See the <a href="http://help.netscape.com/products/client/mc/acctproc4.html">Netscape documentation</a> for more information.
   <li>If you create a <b>/usr/local/freeside/success.html</b> file on the external machine, it will be used as the success HTML page.  Although template substiutions are available, a regular HTML file will work fine here, unlike signup.html.  An example file is included as <b>fs_signup/FS-SignupClient/cgi/success.html</b>
-- 
cgit v1.2.1


From 42ea96aceed291c4cb92cf475cb715b6ad7832c3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 25 Oct 2003 02:05:05 +0000
Subject: adding signup with snarf input

---
 fs_signup/FS-SignupClient/cgi/signup-snarf.html | 228 ++++++++++++++++++++++++
 1 file changed, 228 insertions(+)
 create mode 100755 fs_signup/FS-SignupClient/cgi/signup-snarf.html

diff --git a/fs_signup/FS-SignupClient/cgi/signup-snarf.html b/fs_signup/FS-SignupClient/cgi/signup-snarf.html
new file mode 100755
index 000000000..d167efbf9
--- /dev/null
+++ b/fs_signup/FS-SignupClient/cgi/signup-snarf.html
@@ -0,0 +1,228 @@
+<HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
+<BODY BGCOLOR="#e8e8e8" onUnload="myclose()">
+<script language="JavaScript"><!--
+  var mywindow = -1;
+  function myopen(filename,windowname,properties) {
+    myclose();
+    mywindow = window.open(filename,windowname,properties);
+  }
+  function myclose() {
+    if ( mywindow != -1 )
+      mywindow.close();
+    mywindow = -1
+  }
+//--></script>
+<FONT SIZE=7>ISP Signup form</FONT><BR><BR>
+<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
+<FORM ACTION="<%= $self_url %>" METHOD=POST>
+<INPUT TYPE="hidden" NAME="magic" VALUE="process">
+<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
+<INPUT TYPE="hidden" NAME="ss" VALUE="">
+Contact Information
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Contact name<BR>(last, first)</TH>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="last" VALUE="<%= $last %>">,
+                <INPUT TYPE="text" NAME="first" VALUE="<%= $first %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Company</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="<%= $company %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Address</TH>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="<%= $address1 %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">&nbsp;</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="<%= $address2 %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
+  <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
+  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
+  <TD>
+    <%=
+        ($county_html, $state_html, $country_html) =
+          regionselector( $county, $state, $country );
+ 
+        "$county_html $state_html";
+    %>
+  </TD>
+  <TH><font color="#ff0000">*</font>Zip</TH>
+  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Country</TH>
+  <TD><%= $country_html %></TD>
+<TR>
+  <TD ALIGN="right">Day Phone</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="<%= $daytime %>" SIZE=18></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Night Phone</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="<%= $night %>" SIZE=18></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Fax</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="<%= $fax %>" SIZE=12></TD>
+</TR>
+</TABLE><font color="#ff0000">*</font> required fields<BR>
+<BR>Billing information<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR><TD>
+
+  <%=
+    $OUT .= '<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"';
+    my @invoicing_list = split(', ', $invoicing_list );
+    $OUT .= ' CHECKED'
+      if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
+    $OUT .= '>';
+  %>
+
+  Postal mail invoice
+</TD></TR>
+<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="<%= join(', ', grep { $_ ne 'POST' } split(', ', $invoicing_list ) ) %>">
+</TD></TR>
+<%= scalar(@payby) > 1 ? '<TR><TD>Billing type</TD></TR>' : '' %>
+</TABLE>
+<TABLE BGCOLOR="#c0c0c0" BORDER=1 WIDTH="100%">
+<TR>
+
+  <%=
+
+    my $cardselect = '<SELECT NAME="CARD_type"><OPTION></OPTION>';
+    my %types = (
+                  'VISA' => 'VISA card',
+                  'MasterCard' => 'MasterCard',
+                  'Discover' => 'Discover card',
+                  'American Express' => 'American Express card',
+                );
+    foreach ( keys %types ) {
+      $selected = $cgi->param('CARD_type') eq $types{$_} ? 'SELECTED' : '';
+      $cardselect .= qq!<OPTION $selected VALUE="$types{$_}">$_</OPTION>!;
+    }
+    $cardselect .= '</SELECT>';
+  
+    my %payby = (
+      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="">!,
+      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
+      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
+      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", "12-2037"). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
+      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
+      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
+    );
+
+    if ( $init_data->{'cvv_enabled'} ) {
+      foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5
+        $payby{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="" SIZE=4 MAXLENGTH=4>!;
+      }
+    }
+
+    my( $account, $aba ) = split('@', $payinfo);
+    my %paybychecked = (
+      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="$payname">!,
+      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
+      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
+      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", $paydate). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
+      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
+    );
+
+    if ( $init_data->{'cvv_enabled'} ) {
+      foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5
+        $paybychecked{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="$paycvv" SIZE=4 MAXLENGTH=4>!;
+      }
+    }
+
+    for (@payby) {
+      if ( scalar(@payby) == 1) {
+        $OUT .= '<TD VALIGN=TOP>'.
+                qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$_">!.
+                "$paybychecked{$_}</TD>";
+      } else {
+        $OUT .= qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
+        if ($payby eq $_) {
+          $OUT .= qq! CHECKED> $paybychecked{$_}</TD>!;
+        } else {
+          $OUT .= qq!> $payby{$_}</TD>!;
+        }
+
+      }
+    }
+  %>
+
+</TR></TABLE><font color="#ff0000">*</font> required fields for each billing type
+<BR><BR>First package
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR>
+  <TD COLSPAN=2><SELECT NAME="pkgpart"><OPTION VALUE="">(none)
+
+  <%=
+    foreach my $package ( @{$packages} ) {
+      $OUT .= '<OPTION VALUE="'. $package->{'pkgpart'}. '"';
+      $OUT .= ' SELECTED' if $pkgpart && $package->{'pkgpart'} == $pkgpart;
+      $OUT .= '>'. $package->{'pkg'};
+    }
+  %>
+
+  </SELECT></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Username</TD>
+  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Password</TD>
+  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Re-enter Password</TD>
+  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>"></TD>
+</TR>
+<%=
+  if ( $init_data->{'security_phrase'} ) {
+    $OUT .= <<ENDOUT;
+<TR>
+  <TD ALIGN="right">Security Phrase</TD>
+  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
+  </TD>
+</TR>
+ENDOUT
+  } else {
+    $OUT .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
+  }
+%>
+<%=
+  if ( scalar(@$pops) ) {
+    $OUT .= '<TR><TD ALIGN="right">Access number</TD><TD>'.
+            popselector($popnum). '</TD></TR>';
+  } else {
+    $OUT .= popselector($popnum);
+  }
+%>
+</TABLE>
+<BR><BR>Enter up to ten external accounts from which to retrieve email
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR>
+  <TH ALIGN="left">Mail server</TH>
+  <TH ALIGN="left">Username</TH>
+  <TH ALIGN="left">Password</TH>
+</TR>
+<%=
+  for my $num ( 1..10 ) {
+    no strict 'vars';
+    $OUT .= qq!<TR><TD><INPUT TYPE="text" NAME="snarf_machine$num" VALUE="${"snarf_machine$num"}"></TD>!.
+            qq!<INPUT TYPE="hidden" NAME="snarf_protocol$num" VALUE="pop3">!.
+            qq!<TD><INPUT TYPE="text" NAME="snarf_username$num" VALUE="${"snarf_username$num"}"></TD>!.
+            qq!<TD><INPUT TYPE="password" NAME="snarf_password$num" VALUE="${"snarf_password$num"}"></TD>!.
+            qq!</TR>!;
+  }
+%>
+</TABLE>
+
+<BR><BR><INPUT TYPE="submit" VALUE="Signup">
+</FORM></BODY></HTML>
-- 
cgit v1.2.1


From 9ae101389f2fe652575c6ab314a5e95c2283b72e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 25 Oct 2003 02:05:44 +0000
Subject: signups with snarf info!

---
 FS/FS/ClientAPI/Signup.pm                | 16 ++++++++++++++++
 FS/FS/acct_snarf.pm                      |  8 ++++----
 FS/FS/svc_Common.pm                      | 18 ++++++++++++++++--
 FS/FS/svc_acct.pm                        |  8 +++++++-
 fs_signup/FS-SignupClient/cgi/signup.cgi |  6 +++++-
 5 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 92fc6361d..60639b132 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -10,6 +10,8 @@ use FS::part_pkg;
 use FS::svc_acct_pop;
 use FS::cust_main;
 use FS::cust_pkg;
+use FS::svc_acct;
+use FS::acct_snarf;
 use FS::Msgcat qw(gettext);
 
 use FS::ClientAPI; #hmm
@@ -155,6 +157,20 @@ sub new_customer {
       qw( username _password sec_phrase popnum ),
   } );
 
+  my @acct_snarf;
+  my $snarfnum = 1;
+  while ( length($packet->{"snarf_machine$snarfnum"}) ) {
+    my $acct_snarf = new FS::acct_snarf ( {
+      'machine'   => $packet->{"snarf_machine$snarfnum"},
+      'protocol'  => $packet->{"snarf_protocol$snarfnum"},
+      'username'  => $packet->{"snarf_username$snarfnum"},
+      '_password' => $packet->{"snarf_password$snarfnum"},
+    } );
+    $snarfnum++;
+    push @acct_snarf, $acct_snarf;
+  }
+  $svc_acct->child_objects( \@acct_snarf );
+
   my $y = $svc_acct->setdefault; # arguably should be in new method
   return { 'error' => $y } if $y && !ref($y);
 
diff --git a/FS/FS/acct_snarf.pm b/FS/FS/acct_snarf.pm
index 7c51d6945..b4e88bfc9 100644
--- a/FS/FS/acct_snarf.pm
+++ b/FS/FS/acct_snarf.pm
@@ -90,9 +90,9 @@ returns the error, otherwise returns false.
 
 =item check
 
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
+Checks all fields to make sure this is a valid external mail account.  If
+there is an error, returns the error, otherwise returns false.  Called by the
+insert and replace methods.
 
 =cut
 
@@ -103,7 +103,7 @@ sub check {
     || $self->ut_number('svcnum')
     || $self->ut_foreign_key('svcnum', 'svc_acct', 'svcnum')
     || $self->ut_domain('machine')
-    || $self->alphan('protocol')
+    || $self->ut_alphan('protocol')
     || $self->ut_textn('username')
   ;
   return $error if $error;
diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 524e55086..2fed5dd8a 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -80,7 +80,7 @@ sub check {
   $self->SUPER::check;
 }
 
-=item insert [ JOBNUM_ARRAYREF ]
+=item insert [ JOBNUM_ARRAYREF [ OBJECTS_ARRAYREF ] ]
 
 Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
@@ -91,11 +91,16 @@ defined.  An FS::cust_svc record will be created and inserted.
 If an arrayref is passed as parameter, the B<jobnum>s of any export jobs will
 be added to the array.
 
+If an arrayref of FS::tablename objects (for example, FS::acct_snarf objects)
+is passed as the optional second parameter, they will have their svcnum fields
+set and will be inserted after this record, but before any exports are run.
+
 =cut
 
 sub insert {
   my $self = shift;
   local $FS::queue::jobnums = shift if @_;
+  my $objects = scalar(@_) ? shift : [];
   my $error;
 
   local $SIG{HUP} = 'IGNORE';
@@ -142,6 +147,15 @@ sub insert {
     return $error;
   }
 
+  foreach my $object ( @$objects ) {
+    $object->svcnum($self->svcnum);
+    $error = $object->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
   #new-style exports!
   unless ( $noexport_hack ) {
     foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
@@ -416,7 +430,7 @@ sub cancel { ''; }
 
 =head1 VERSION
 
-$Id: svc_Common.pm,v 1.13 2003-08-05 00:20:47 khoff Exp $
+$Id: svc_Common.pm,v 1.14 2003-10-25 02:05:44 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 3fb28c054..4ea7734d4 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -188,10 +188,16 @@ The additional field I<usergroup> can optionally be defined; if so it should
 contain an arrayref of group names.  See L<FS::radius_usergroup>.  (used in
 sqlradius export only)
 
+The additional field I<child_objects> can optionally be defined; if so it
+should contain an arrayref of FS::tablename objects.  They will have their
+svcnum fields set and will be inserted after this record, but before any
+exports are run.
+
 (TODOC: L<FS::queue> and L<freeside-queued>)
 
 (TODOC: new exports!)
 
+
 =cut
 
 sub insert {
@@ -319,7 +325,7 @@ sub insert {
   #see?  i told you it was more complicated
 
   my @jobnums;
-  $error = $self->SUPER::insert(\@jobnums);
+  $error = $self->SUPER::insert(\@jobnums, $self->child_objects || [] );
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 70facb570..5ca93d289 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.47 2003-10-24 19:28:49 ivan Exp $
+# $Id: signup.cgi,v 1.48 2003-10-25 02:05:44 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages
@@ -266,6 +266,7 @@ if ( defined $cgi->param('magic') ) {
         '_password'        => $password,
         'popnum'           => $popnum,
         'agentnum'         => $agentnum,
+        map { $_ => $cgi->param($_) } grep { /^snarf_/ } $cgi->param
       } );
 
     }
@@ -273,6 +274,9 @@ if ( defined $cgi->param('magic') ) {
     if ( $error eq '_decline' ) {
       print_decline();
     } elsif ( $error ) {
+      #fudge the snarf info
+      no strict 'refs';
+      ${$_} = $cgi->param($_) foreach grep { /^snarf_/ } $cgi->param;
       print_form();
     } else {
       print_okay();
-- 
cgit v1.2.1


From 2f38a129b2eab044dce82ff4391f7c1779bdab2f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 26 Oct 2003 00:39:13 +0000
Subject: payment reports broken down by Visa/MC / Amex / Discover

---
 httemplate/search/cust_pay.cgi         | 38 ++++++++++++++++++++++++++++------
 httemplate/search/report_cust_pay.html |  9 +++++---
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi
index e4dba01e9..9eab5f82e 100755
--- a/httemplate/search/cust_pay.cgi
+++ b/httemplate/search/cust_pay.cgi
@@ -5,27 +5,53 @@ my @cust_pay;
 if ( $cgi->param('magic') && $cgi->param('magic') eq '_date' ) {
 
   my %search;
+  my @search;
+
   if ( $cgi->param('payby') ) {
-    $cgi->param('payby') =~ /^(CARD|CHEK|BILL)$/
+    $cgi->param('payby') =~ /^(CARD|CHEK|BILL)(-(VisaMC|Amex|Discover))?$/
       or die "illegal payby ". $cgi->param('payby');
     $search{'payby'} = $1;
+    if ( $3 ) {
+      if ( $3 eq 'VisaMC' ) {
+        #avoid posix regexes for portability
+        push @search, " (    substring(payinfo from 1 for 1) = '4'  ".
+                      "   OR substring(payinfo from 1 for 2) = '51' ".
+                      "   OR substring(payinfo from 1 for 2) = '52' ".
+                      "   OR substring(payinfo from 1 for 2) = '53' ".
+                      "   OR substring(payinfo from 1 for 2) = '54' ".
+                      "   OR substring(payinfo from 1 for 2) = '54' ".
+                      "   OR substring(payinfo from 1 for 2) = '55' ".
+                      " ) ";
+      } elsif ( $3 eq 'Amex' ) {
+        push @search, " (    substring(payinfo from 1 for 2 ) = '34' ".
+                      "   OR substring(payinfo from 1 for 2 ) = '37' ".
+                      " ) ";
+      } elsif ( $3 eq 'Discover' ) {
+        push @search, " substring(payinfo from 1 for 4 ) = '6011' ";
+      } else {
+        die "unknown card type $3";
+      }
+    }
   }
 
   #false laziness with cust_pkg.cgi
-  my $range = '';
   if ( $cgi->param('beginning')
        && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
     my $beginning = str2time($1);
-    $range = " WHERE _date >= $beginning ";
+    push @search, "_date >= $beginning ";
   }
   if ( $cgi->param('ending')
             && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
     my $ending = str2time($1) + 86400;
-    $range .= ( $range ? ' AND ' : ' WHERE ' ). " _date <= $ending ";
+    push @search, " _date <= $ending ";
+  }
+  my $search;
+  if ( @search ) {
+    $search = ( scalar(keys %search) ? ' AND ' : ' WHERE ' ).
+              join(' AND ', @search);
   }
-  $range =~ s/^\s*WHERE/ AND/ if scalar(keys %search) ;
 
-  @cust_pay = qsearch('cust_pay', \%search, '', $range );
+  @cust_pay = qsearch('cust_pay', \%search, '', $search );
 
   $sortby = \*date_sort;
 
diff --git a/httemplate/search/report_cust_pay.html b/httemplate/search/report_cust_pay.html
index 9d9fffb16..b8581ba4b 100644
--- a/httemplate/search/report_cust_pay.html
+++ b/httemplate/search/report_cust_pay.html
@@ -15,9 +15,12 @@
         <TD ALIGN="right">Payments of type: </TD>
         <TD><SELECT NAME="payby">
               <OPTION VALUE="">all</OPTION>
-              <OPTION VALUE="CARD">credit card</OPTION>
-              <OPTION VALUE="CHEK">electronic check (ACH)</OPTION>
-              <OPTION VALUE="BILL">check/cash</OPTION>
+              <OPTION VALUE="CARD">credit card (all)</OPTION>
+              <OPTION VALUE="CARD-VisaMC">credit card (Visa/MasterCard)</OPTION>
+              <OPTION VALUE="CARD-Amex">credit card (American Express)</OPTION>
+              <OPTION VALUE="CARD-Discover">credit card (Discover)</OPTION>
+              <OPTION VALUE="CHEK">electronic check / ACH</OPTION>
+              <OPTION VALUE="BILL">check / cash</OPTION>
             </SELECT>
         </TD>
       </TR>
-- 
cgit v1.2.1


From c81ce77af66d49a2aafb4bc6361844748fa00d7e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 26 Oct 2003 17:30:13 +0000
Subject: default quickpay to exact search

---
 httemplate/search/cust_main-quickpay.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/httemplate/search/cust_main-quickpay.html b/httemplate/search/cust_main-quickpay.html
index 25d9db36b..d48f1d08f 100755
--- a/httemplate/search/cust_main-quickpay.html
+++ b/httemplate/search/cust_main-quickpay.html
@@ -13,22 +13,22 @@
       <INPUT TYPE="checkbox" NAME="last_on" CHECKED> Search for <B>last name</B>: 
       <INPUT TYPE="text" NAME="last_text">
       using search method: <SELECT NAME="last_type">
-        <OPTION SELECTED>All
+        <OPTION>All
         <OPTION>Fuzzy
         <OPTION>Substring
-        <OPTION>Exact
+        <OPTION SELECTED>Exact
       </SELECT>
 
       <P><INPUT TYPE="checkbox" NAME="company_on" CHECKED> Search for <B>company</B>: 
       <INPUT TYPE="text" NAME="company_text">
       using search methods: <SELECT NAME="company_type">
-        <OPTION SELECTED>All
+        <OPTION>All
         <OPTION>Fuzzy
         <OPTION>Substring
-        <OPTION>Exact
+        <OPTION SELECTED>Exact
       </SELECT>
 
-      <P><INPUT TYPE="submit" VALUE="Search"> Note: Fuzzy searching can take a while.  Please be patient.
+      <P><INPUT TYPE="submit" VALUE="Search">
 
     </FORM>
 
-- 
cgit v1.2.1


From e8b6246f82305ee4e315ef4920ea5c356e77fd96 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Nov 2003 05:21:54 +0000
Subject: also show suspended and canceled counts on active package browse

---
 httemplate/browse/part_pkg.cgi | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 2a167e8d6..044ba462e 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -12,7 +12,8 @@ my @part_pkg = qsearch('part_pkg', \%search );
 my $total = scalar(@part_pkg);
 
 my $sortby;
-my %num_active_cust_pkg;
+my %num_active_cust_pkg = ();
+my( $suspended_sth, $canceled_sth ) = ( '', '' );
 if ( $cgi->param('active') ) {
   my $active_sth = dbh->prepare(
     'SELECT COUNT(*) FROM cust_pkg WHERE pkgpart = ?'.
@@ -27,6 +28,18 @@ if ( $cgi->param('active') ) {
   $sortby = sub {
     $num_active_cust_pkg{$b->pkgpart} <=> $num_active_cust_pkg{$a->pkgpart};
   };
+
+  $suspended_sth = dbh->prepare(
+    'SELECT COUNT(*) FROM cust_pkg WHERE pkgpart = ?'.
+    ' AND ( cancel IS NULL OR cancel = 0 )'.
+    ' AND susp IS NOT NULL AND susp > 0'
+  ) or die dbh->errstr;
+
+  $canceled_sth = dbh->prepare(
+    'SELECT COUNT(*) FROM cust_pkg WHERE pkgpart = ?'.
+    ' AND cancel IS NOT NULL AND cancel > 0'
+  ) or die dbh->errstr;
+
 } else {
   $sortby = \*pkgpart_sort;
 }
@@ -102,8 +115,19 @@ END
     print "        <TD ROWSPAN=$rowspan>";
     print '<FONT COLOR="#00CC00"><B>'.
           $num_active_cust_pkg{$hashref->{'pkgpart'}}.
-          qq!</B></FONT>&nbsp;<A HREF="${p}search/cust_pkg.cgi?magic=active;pkgpart=$hashref->{pkgpart}">active</A>!;
-    # suspended/cancelled
+          qq!</B></FONT>&nbsp;<A HREF="${p}search/cust_pkg.cgi?magic=active;pkgpart=$hashref->{pkgpart}">active</A><BR>!;
+
+    $suspended_sth->execute( $part_pkg->pkgpart ) or die $suspended_sth->errstr;
+    my $num_suspended = $suspended_sth->fetchrow_arrayref->[0];
+    print '<FONT COLOR="#FF9900"<B>'. $num_suspended.
+          qq!</B></FONT>&nbsp;<A HREF="${p}search/cust_pkg.cgi?magic=suspended;pkgpart=$hashref->{pkgpart}">suspended</A><BR>!;
+
+    $canceled_sth->execute( $part_pkg->pkgpart ) or die $canceled_sth->errstr;
+    my $num_canceled = $canceled_sth->fetchrow_arrayref->[0];
+    print '<FONT COLOR="#FF0000"<B>'. $num_canceled.
+          qq!</B></FONT>&nbsp;<A HREF="${p}search/cust_pkg.cgi?magic=canceled;pkgpart=$hashref->{pkgpart}">canceled</A>!;
+
+
     print '</TD>';
   }
   print <<END;
-- 
cgit v1.2.1


From 199702fd247cbfb9157ba2f84385c914c32cc07e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Nov 2003 05:25:29 +0000
Subject: tyops

---
 httemplate/browse/part_pkg.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 044ba462e..9dc8860fb 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -119,12 +119,12 @@ END
 
     $suspended_sth->execute( $part_pkg->pkgpart ) or die $suspended_sth->errstr;
     my $num_suspended = $suspended_sth->fetchrow_arrayref->[0];
-    print '<FONT COLOR="#FF9900"<B>'. $num_suspended.
+    print '<FONT COLOR="#FF9900"><B>'. $num_suspended.
           qq!</B></FONT>&nbsp;<A HREF="${p}search/cust_pkg.cgi?magic=suspended;pkgpart=$hashref->{pkgpart}">suspended</A><BR>!;
 
     $canceled_sth->execute( $part_pkg->pkgpart ) or die $canceled_sth->errstr;
     my $num_canceled = $canceled_sth->fetchrow_arrayref->[0];
-    print '<FONT COLOR="#FF0000"<B>'. $num_canceled.
+    print '<FONT COLOR="#FF0000"><B>'. $num_canceled.
           qq!</B></FONT>&nbsp;<A HREF="${p}search/cust_pkg.cgi?magic=canceled;pkgpart=$hashref->{pkgpart}">canceled</A>!;
 
 
-- 
cgit v1.2.1


From 08d2adef1c4b4fff43184d763e1d369ece975573 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Nov 2003 05:34:15 +0000
Subject: remove duplicate items from "Reports" section

---
 httemplate/index.html | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index e3556c2d7..c03fd79d2 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -126,24 +126,6 @@
         <LI><A HREF="search/cust_pkg.html">packages (by next bill date range)</A>
       </UL>
       <A HREF="browse/part_pkg.cgi?active=1">Package definitions (by number of active packages)</A>
-      <BR><BR>Invoices
-      <UL>
-        <LI><a href="search/cust_bill_event.html">Invoice event errors (failed credit cards)</a>
-        <LI>open invoices (<A HREF="search/cust_bill.cgi?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN_custnum">by customer number</A>)
-        <LI>30 day open invoices (<A HREF="search/cust_bill.cgi?OPEN30_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN30_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN30_custnum">by customer number</A>)
-        <LI>60 day open invoices (<A HREF="search/cust_bill.cgi?OPEN60_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN60_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN60_custnum">by customer number</A>)
-        <LI>90 day open invoices (<A HREF="search/cust_bill.cgi?OPEN90_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN90_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN90_custnum">by customer number</A>)
-        <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
-        <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
-      </UL>
-    <A HREF="search/report_cust_pay.html">Payment Report (by type and/or date range)</A>
-    <BR><BR>Financial reports
-            <UL>
-              <LI> <A HREF="search/report_receivables.cgi">current receivables</A>
-              <LI> <A HREF="search/report_tax.html">tax reports</A>
-              <LI> <A HREF="search/report_cc.html">credit card receipts</A>
-              <LI> <A HREF="search/report_credit.html">credit memos</A>
-            </UL>
     Customers
       <UL>
         <LI><A HREF="search/cust_main-otaker.cgi">Search customers by order-taker</A>
-- 
cgit v1.2.1


From 3a167673061380c0d98d5d5d5af040b31a9c6252 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Nov 2003 05:40:34 +0000
Subject: formatting

---
 httemplate/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index c03fd79d2..cefbc4072 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -125,7 +125,7 @@
         <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
         <LI><A HREF="search/cust_pkg.html">packages (by next bill date range)</A>
       </UL>
-      <A HREF="browse/part_pkg.cgi?active=1">Package definitions (by number of active packages)</A>
+      <A HREF="browse/part_pkg.cgi?active=1">Package definitions (by number of active packages)</A><BR><BR>
     Customers
       <UL>
         <LI><A HREF="search/cust_main-otaker.cgi">Search customers by order-taker</A>
-- 
cgit v1.2.1


From de38e11cb5a40c78ef5543f59f6ce968e7fd613b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Nov 2003 05:48:14 +0000
Subject: add suspended/canceled package browse

---
 httemplate/search/cust_pkg.cgi | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index f735fbf42..1d54a53f6 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -48,10 +48,21 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
 } else {
 
   my $qual = '';
-  if ( $cgi->param('magic') && $cgi->param('magic') eq 'active' ) {
+  if ( $cgi->param('magic') &&
+       $cgi->param('magic') =~ /^(active|suspended|canceled)$/
+  ) {
 
-    $qual = 'WHERE ( susp IS NULL OR susp = 0 )'.
-            ' AND ( cancel IS NULL OR cancel = 0)';
+    if ( $cgi->param('magic') eq 'active' ) {
+      $qual = 'WHERE ( susp IS NULL OR susp = 0 )'.
+              ' AND ( cancel IS NULL OR cancel = 0)';
+    } elsif ( $cgi->param('magic') eq 'suspended' ) {
+      $qual = 'WHERE susp IS NOT NULL AND susp > 0'.
+              ' AND ( cancel IS NULL OR cancel = 0)';
+    } elsif ( $cgi->param('magic') eq 'canceled' ) {
+      $qual = 'WHERE cancel IS NOT NULL AND cancel > 0';
+    } else {
+      die "guru meditation #420";
+    }
 
     $sortby = \*pkgnum_sort;
 
-- 
cgit v1.2.1


From d9c51bdc266798d01247e0ff72f6d64aefb91a2e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Nov 2003 05:57:28 +0000
Subject: add suspended/canceled browse, fix the old suspended browse

---
 httemplate/browse/part_pkg.cgi |  4 ++--
 httemplate/index.html          |  2 +-
 httemplate/search/cust_pkg.cgi | 10 ++--------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 9dc8860fb..efaa59e00 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -32,12 +32,12 @@ if ( $cgi->param('active') ) {
   $suspended_sth = dbh->prepare(
     'SELECT COUNT(*) FROM cust_pkg WHERE pkgpart = ?'.
     ' AND ( cancel IS NULL OR cancel = 0 )'.
-    ' AND susp IS NOT NULL AND susp > 0'
+    ' AND susp IS NOT NULL AND susp != 0'
   ) or die dbh->errstr;
 
   $canceled_sth = dbh->prepare(
     'SELECT COUNT(*) FROM cust_pkg WHERE pkgpart = ?'.
-    ' AND cancel IS NOT NULL AND cancel > 0'
+    ' AND cancel IS NOT NULL AND cancel != 0'
   ) or die dbh->errstr;
 
 } else {
diff --git a/httemplate/index.html b/httemplate/index.html
index cefbc4072..b95d2ac73 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -121,7 +121,7 @@
       Packages
       <UL>
         <LI><A HREF="search/cust_pkg.cgi?pkgnum">all packages (by package number)</A>
-        <LI><A HREF="search/cust_pkg.cgi?SUSP_pkgnum">suspended packages (by package number)</A>
+        <LI><A HREF="search/cust_pkg.cgi?magic=suspended">suspended packages (by package number)</A>
         <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
         <LI><A HREF="search/cust_pkg.html">packages (by next bill date range)</A>
       </UL>
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 1d54a53f6..3c3e17864 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -56,10 +56,10 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
       $qual = 'WHERE ( susp IS NULL OR susp = 0 )'.
               ' AND ( cancel IS NULL OR cancel = 0)';
     } elsif ( $cgi->param('magic') eq 'suspended' ) {
-      $qual = 'WHERE susp IS NOT NULL AND susp > 0'.
+      $qual = 'WHERE susp IS NOT NULL AND susp != 0'.
               ' AND ( cancel IS NULL OR cancel = 0)';
     } elsif ( $cgi->param('magic') eq 'canceled' ) {
-      $qual = 'WHERE cancel IS NOT NULL AND cancel > 0';
+      $qual = 'WHERE cancel IS NOT NULL AND cancel != 0';
     } else {
       die "guru meditation #420";
     }
@@ -74,12 +74,6 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
 
     $sortby=\*pkgnum_sort;
 
-  } elsif ( $query eq 'SUSP_pkgnum' ) {
-
-    $sortby=\*pkgnum_sort;
-
-    $qual = 'WHERE susp IS NOT NULL AND susp != 0';
-
   } elsif ( $query eq 'APKG_pkgnum' ) {
   
     $sortby=\*pkgnum_sort;
-- 
cgit v1.2.1


From 36f038b92a2cc9c8f7bc52a2e11c00dbb7ed6ce0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Nov 2003 11:30:42 +0000
Subject: kludge around this so i can add service definitions for now

---
 httemplate/edit/part_svc.cgi | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 18319b341..e033a7b09 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -131,23 +131,25 @@ my %defs = (
   },
 );
 
-  foreach my $svcdb (grep dbdef->table($_), keys %defs ) {
-    my $self = "FS::$svcdb"->new;
-    $vfields{$svcdb} = {};
-    foreach my $field ($self->virtual_fields) { # svc_Common::virtual_fields with a null svcpart returns all of them
-      my $pvf = $self->pvf($field);
-      my @list = $pvf->list;
-      if (scalar @list) {
-        $defs{$svcdb}->{$field} = { desc        => $pvf->label,
-                                    type        => 'select',
-                                    select_list => \@list };
-      } else {
-        $defs{$svcdb}->{$field} = $pvf->label;
-      } #endif
-      $vfields{$svcdb}->{$field} = $pvf;
-      warn "\$vfields{$svcdb}->{$field} = $pvf";
-    } #next $field
-  } #next $svcdb
+  #comment this out until it can be fixed, see bug#590
+  #
+  #foreach my $svcdb (grep dbdef->table($_), keys %defs ) {
+  #  my $self = "FS::$svcdb"->new;
+  #  $vfields{$svcdb} = {};
+  #  foreach my $field ($self->virtual_fields) { # svc_Common::virtual_fields with a null svcpart returns all of them
+  #    my $pvf = $self->pvf($field);
+  #    my @list = $pvf->list;
+  #    if (scalar @list) {
+  #      $defs{$svcdb}->{$field} = { desc        => $pvf->label,
+  #                                  type        => 'select',
+  #                                  select_list => \@list };
+  #    } else {
+  #      $defs{$svcdb}->{$field} = $pvf->label;
+  #    } #endif
+  #    $vfields{$svcdb}->{$field} = $pvf;
+  #    warn "\$vfields{$svcdb}->{$field} = $pvf";
+  #  } #next $field
+  #} #next $svcdb
   
   my @dbs = $hashref->{svcdb}
              ? ( $hashref->{svcdb} )
-- 
cgit v1.2.1


From 47c39af359fc93c777714a5c50a6183747b66da9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Nov 2003 11:42:32 +0000
Subject: does this fix Bug#590??

---
 FS/FS/svc_Common.pm          |  8 ++------
 httemplate/edit/part_svc.cgi | 36 +++++++++++++++++-------------------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 2fed5dd8a..7bc155d9d 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -49,8 +49,8 @@ sub virtual_fields {
 
   if ($self->svcpart) { # Case 1
     $svcpart = $self->svcpart;
-  } elsif (my $cust_svc = $self->cust_svc) { # Case 2
-    $svcpart = $cust_svc->svcpart;
+  } elsif ( $self->svcnum ) { #Case 2
+    $svcpart = $self->cust_svc->svcpart;
   } else { # Case 3
     $svcpart = '';
   }
@@ -428,10 +428,6 @@ sub cancel { ''; }
 
 =back
 
-=head1 VERSION
-
-$Id: svc_Common.pm,v 1.14 2003-10-25 02:05:44 ivan Exp $
-
 =head1 BUGS
 
 The setfixed method return value.
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index e033a7b09..18319b341 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -131,25 +131,23 @@ my %defs = (
   },
 );
 
-  #comment this out until it can be fixed, see bug#590
-  #
-  #foreach my $svcdb (grep dbdef->table($_), keys %defs ) {
-  #  my $self = "FS::$svcdb"->new;
-  #  $vfields{$svcdb} = {};
-  #  foreach my $field ($self->virtual_fields) { # svc_Common::virtual_fields with a null svcpart returns all of them
-  #    my $pvf = $self->pvf($field);
-  #    my @list = $pvf->list;
-  #    if (scalar @list) {
-  #      $defs{$svcdb}->{$field} = { desc        => $pvf->label,
-  #                                  type        => 'select',
-  #                                  select_list => \@list };
-  #    } else {
-  #      $defs{$svcdb}->{$field} = $pvf->label;
-  #    } #endif
-  #    $vfields{$svcdb}->{$field} = $pvf;
-  #    warn "\$vfields{$svcdb}->{$field} = $pvf";
-  #  } #next $field
-  #} #next $svcdb
+  foreach my $svcdb (grep dbdef->table($_), keys %defs ) {
+    my $self = "FS::$svcdb"->new;
+    $vfields{$svcdb} = {};
+    foreach my $field ($self->virtual_fields) { # svc_Common::virtual_fields with a null svcpart returns all of them
+      my $pvf = $self->pvf($field);
+      my @list = $pvf->list;
+      if (scalar @list) {
+        $defs{$svcdb}->{$field} = { desc        => $pvf->label,
+                                    type        => 'select',
+                                    select_list => \@list };
+      } else {
+        $defs{$svcdb}->{$field} = $pvf->label;
+      } #endif
+      $vfields{$svcdb}->{$field} = $pvf;
+      warn "\$vfields{$svcdb}->{$field} = $pvf";
+    } #next $field
+  } #next $svcdb
   
   my @dbs = $hashref->{svcdb}
              ? ( $hashref->{svcdb} )
-- 
cgit v1.2.1


From 39e40f004fb217f825f695276d7a1b5a29a821d8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Nov 2003 10:55:42 +0000
Subject: treat serial columns as ints too!

---
 FS/FS/Record.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 60b25edcf..437264112 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -240,7 +240,8 @@ sub qsearch {
           }
         } elsif ( $op eq '!=' ) {
           if ( driver_name eq 'Pg' ) {
-            if ( $dbdef->table($table)->column($column)->type =~ /(int)/i ) {
+            my $type = $dbdef->table($table)->column($column)->type;
+            if ( $type =~ /(int|serial)/i ) {
               qq-( $column IS NOT NULL )-;
             } else {
               qq-( $column IS NOT NULL AND $column != '' )-;
-- 
cgit v1.2.1


From 3f0c721ee27ead3504df80addd947057e4fc4c14 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Nov 2003 10:57:05 +0000
Subject: finish treating serials as ints!

---
 FS/FS/Record.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 437264112..14dfca2cb 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -230,7 +230,8 @@ sub qsearch {
       if ( ! defined( $record->{$_} ) || $record->{$_} eq '' ) {
         if ( $op eq '=' ) {
           if ( driver_name eq 'Pg' ) {
-            if ( $dbdef->table($table)->column($column)->type =~ /(int)/i ) {
+            my $type = $dbdef->table($table)->column($column)->type;
+            if ( $type =~ /(int|serial)/i ) {
               qq-( $column IS NULL )-;
             } else {
               qq-( $column IS NULL OR $column = '' )-;
@@ -310,7 +311,7 @@ sub qsearch {
     grep defined( $record->{$_} ) && $record->{$_} ne '', @real_fields
   ) {
     if ( $record->{$field} =~ /^\d+(\.\d+)?$/
-         && $dbdef->table($table)->column($field)->type =~ /(int)/i
+         && $dbdef->table($table)->column($field)->type =~ /(int|serial)/i
     ) {
       $sth->bind_param($bind++, $record->{$field}, { TYPE => SQL_INTEGER } );
     } else {
-- 
cgit v1.2.1


From 8e70e767b1fc7384d11d38246868d17ea0ec560e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Nov 2003 17:30:15 +0000
Subject: make snarf info available to exports

---
 FS/FS/part_export/shellcommands.pm |  7 +++++++
 FS/FS/svc_acct.pm                  | 18 +++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index da24e5ca7..f65638984 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -40,6 +40,13 @@ sub _export_command {
   {
     no strict 'refs';
     ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
+
+    my $count = 1;
+    foreach my $acct_snarf ( $svc_acct->acct_snarf ) {
+      ${"snarf_$_$count"} = shell_quote( $acct_snarf->get($_) )
+        foreach qw( machine username _password );
+      $count++;
+    }
   }
 
   my $cust_pkg = $svc_acct->cust_svc->cust_pkg;
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 4ea7734d4..e4acf7459 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -16,7 +16,7 @@ use Carp;
 use Fcntl qw(:flock);
 use FS::UID qw( datasrc );
 use FS::Conf;
-use FS::Record qw( qsearch qsearchs fields dbh );
+use FS::Record qw( qsearch qsearchs fields dbh dbdef );
 use FS::svc_Common;
 use FS::cust_svc;
 use FS::part_svc;
@@ -951,6 +951,22 @@ sub email {
   $self->username. '@'. $self->domain;
 }
 
+=item acct_snarf
+
+Returns an array of FS::acct_snarf records associated with the account.
+If the acct_snarf table does not exist or there are no associated records,
+an empty list is returned
+
+=cut
+
+sub acct_snarf {
+  my $self = shift;
+  return () unless dbdef->table('acct_snarf');
+  eval "use FS::acct_snarf;";
+  die $@ if $@;
+  qsearch('acct_snarf', { 'svcnum' => $self->svcnum } );
+}
+
 =item seconds_since TIMESTAMP
 
 Returns the number of seconds this account has been online since TIMESTAMP,
-- 
cgit v1.2.1


From b375da4f34a65409d2e657c12e434c279c3199dc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Nov 2003 17:57:04 +0000
Subject: adding

---
 bin/create-fetchmailrc | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 bin/create-fetchmailrc

diff --git a/bin/create-fetchmailrc b/bin/create-fetchmailrc
new file mode 100644
index 000000000..7b28bfbc0
--- /dev/null
+++ b/bin/create-fetchmailrc
@@ -0,0 +1,46 @@
+#!/usr/bin/perl -w
+# this quick hack helps you generate/maintain .fetchmailrc files from
+# FS::acct_snarf data.  it is run from a shellcommands export as:
+# create-fetchmailrc $username $dir $snarf_machine1 $snarf_username1 $snarf__password1 $snarf_machine2 $snarf_username2 $snarf__password2 $snarf_machine3 $snarf_username3 $snarf__password3 $snarf_machine4 $snarf_username4 $snarf__password4 $snarf_machine5 $snarf_username5 $snarf__password5 $snarf_machine6 $snarf_username6 $snarf__password6 $snarf_machine7 $snarf_username7 $snarf__password7 $snarf_machine8 $snarf_username8 $snarf__password8 $snarf_machine9 $snarf_username9 $snarf__password9 $snarf_machine10 $snarf_username10 $snarf__password10
+
+use strict;
+use POSIX qw( setuid setsid );
+
+my $header = <<END;
+# Configuration created by create-fetchmailrc
+set postmaster "postmaster"
+set bouncemail
+set no spambounce
+set properties ""
+set daemon 240
+END
+
+my $username = shift @ARGV or die "no username specified\n";
+my $homedir  = shift @ARGV or die "no homedir specified\n";
+my $filename = "$homedir/.fetchmailrc";
+
+open(FETCHMAILRC, ">$filename") or die "can't open $filename: $!\n";
+chown 0600, $filename           or die "can't chown 600 $filename: $!\n";
+print FETCHMAILRC $header;
+
+while ($ARGV[0]) {
+  my( $s_machine, $s_username, $s_password ) = splice( @ARGV, 0, 3 );
+  print FETCHMAILRC <<END;
+poll $s_machine
+	user '$s_username' there with password '$s_password' is '$username' here
+END
+}
+
+close FETCHMAILRC;
+
+my $gid = scalar(getgrnam($username)) or die "can't find $username's gid\n";
+my $uid = scalar(getpwnam($username)) or die "can't find $username's uid\n";
+
+setgid($gid) or die "can't setgid $gid\n";
+setuid($uid) or die "can't setuid $uid\n";
+
+exec(qw( fetchmail -a -K --antispam "550,451" -d 180 -f ), $filename);
+die "can't execute fetchmail: $!";
+
+
+
-- 
cgit v1.2.1


From c44e20f5c73abae61a15a415b4393ecd38297c65 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Nov 2003 18:01:18 +0000
Subject: don't overwrite otaker on cust_main!

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 1d2e9edcd..2c89bb065 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -872,7 +872,7 @@ sub check {
   $self->tax =~ /^(Y?)$/ or return "Illegal tax: ". $self->tax;
   $self->tax($1);
 
-  $self->otaker(getotaker);
+  $self->otaker(getotaker) unless $self->otaker;
 
   #warn "AFTER: \n". $self->_dump;
 
-- 
cgit v1.2.1


From 36034232a364770860d6ac531d12e66bbbb70046 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 5 Nov 2003 10:26:46 +0000
Subject: allow letters in quota for use with edquota -p

---
 FS/FS/svc_acct.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index e4acf7459..4c943a710 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -786,7 +786,7 @@ sub check {
       or return "Illegal finger: ". $self->getfield('finger');
   $self->setfield('finger', $1);
 
-  $recref->{quota} =~ /^(\d*)$/ or return "Illegal quota";
+  $recref->{quota} =~ /^(\w*)$/ or return "Illegal quota";
   $recref->{quota} = $1;
 
   unless ( $part_svc->part_svc_column('slipip')->columnflag eq 'F' ) {
-- 
cgit v1.2.1


From 261b727c65d8a6cfb81ceaf8e1eb95878ce75fcf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 5 Nov 2003 11:13:40 +0000
Subject: fixup

---
 bin/create-fetchmailrc | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/bin/create-fetchmailrc b/bin/create-fetchmailrc
index 7b28bfbc0..e92971140 100644
--- a/bin/create-fetchmailrc
+++ b/bin/create-fetchmailrc
@@ -1,10 +1,10 @@
 #!/usr/bin/perl -w
 # this quick hack helps you generate/maintain .fetchmailrc files from
 # FS::acct_snarf data.  it is run from a shellcommands export as:
-# create-fetchmailrc $username $dir $snarf_machine1 $snarf_username1 $snarf__password1 $snarf_machine2 $snarf_username2 $snarf__password2 $snarf_machine3 $snarf_username3 $snarf__password3 $snarf_machine4 $snarf_username4 $snarf__password4 $snarf_machine5 $snarf_username5 $snarf__password5 $snarf_machine6 $snarf_username6 $snarf__password6 $snarf_machine7 $snarf_username7 $snarf__password7 $snarf_machine8 $snarf_username8 $snarf__password8 $snarf_machine9 $snarf_username9 $snarf__password9 $snarf_machine10 $snarf_username10 $snarf__password10
+# create-fetchmailrc $username $dir $snarf_machine1 $snarf_username1 $snarf__password1 $snarf_machine2 $snarf_username2 $snarf__password2 ...
 
 use strict;
-use POSIX qw( setuid setsid );
+use POSIX qw( setuid setgid );
 
 my $header = <<END;
 # Configuration created by create-fetchmailrc
@@ -19,8 +19,12 @@ my $username = shift @ARGV or die "no username specified\n";
 my $homedir  = shift @ARGV or die "no homedir specified\n";
 my $filename = "$homedir/.fetchmailrc";
 
+my $gid = scalar(getgrnam($username)) or die "can't find $username's gid\n";
+my $uid = scalar(getpwnam($username)) or die "can't find $username's uid\n";
+
 open(FETCHMAILRC, ">$filename") or die "can't open $filename: $!\n";
-chown 0600, $filename           or die "can't chown 600 $filename: $!\n";
+chown $uid, $gid, $filename     or die "can't chown $uid.$gid $filename: $!\n";
+chmod 0600, $filename           or die "can't chmod 600 $filename: $!\n";
 print FETCHMAILRC $header;
 
 while ($ARGV[0]) {
@@ -33,14 +37,9 @@ END
 
 close FETCHMAILRC;
 
-my $gid = scalar(getgrnam($username)) or die "can't find $username's gid\n";
-my $uid = scalar(getpwnam($username)) or die "can't find $username's uid\n";
-
 setgid($gid) or die "can't setgid $gid\n";
 setuid($uid) or die "can't setuid $uid\n";
+$ENV{HOME} = $homedir;
 
-exec(qw( fetchmail -a -K --antispam "550,451" -d 180 -f ), $filename);
-die "can't execute fetchmail: $!";
-
-
+system(qq(fetchmail -a -K --antispam "550,451" -d 180 -f $filename));
 
-- 
cgit v1.2.1


From ef27ba4362bc3ffac006237b5a73c496a5ee51a0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Nov 2003 13:37:21 +0000
Subject: removing (rewritten as a proper html report)

---
 FS/bin/freeside-receivables-report | 217 -------------------------------------
 1 file changed, 217 deletions(-)
 delete mode 100755 FS/bin/freeside-receivables-report

diff --git a/FS/bin/freeside-receivables-report b/FS/bin/freeside-receivables-report
deleted file mode 100755
index f3ad2a1a6..000000000
--- a/FS/bin/freeside-receivables-report
+++ /dev/null
@@ -1,217 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use Date::Parse;
-use Time::Local;
-use Getopt::Std;
-use Text::Template;
-use Net::SMTP;
-use Mail::Header;
-use Mail::Internet;
-use FS::Conf;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch);
-use FS::cust_main;
-
-
-&untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $report_lines $report_template @buf $header);
-getopts("vpmet:");	#switches
-
-#we're at now now (and later).
-my($_date)= $^T;
-
-# Get the current month
-my ($sec,$min,$hour,$mday,$mon,$year) =
-	(localtime($_date) )[0,1,2,3,4,5]; 
-$mon++;
-$year += 1900;
-
-# Login to the database
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-# Get the needed configuration files
-my $conf = new FS::Conf;
-my $lpr = $conf->config('lpr');
-my $email = $conf->config('email');
-my $smtpmachine = $conf->config('smtpmachine');
-my $mail_sender = $conf->exists('invoice_from') ? $conf->config('invoice_from') :
-  'postmaster';
-my @report_template = $conf->config('report_template')
-  or die "cannot load config file report_template";
-$report_lines = 0;
-  foreach ( grep /report_lines\(\d+\)/, @report_template ) { #kludgy :/
-  /report_lines\((\d+)\)/;
-  $report_lines += $1;
-}
-die "no report_lines() functions in template?" unless $report_lines;
-$report_template = new Text::Template (
-  TYPE   => 'ARRAY',
-  SOURCE => [ map "$_\n", @report_template ],
-) or die "can't create new Text::Template object: $Text::Template::ERROR";
-
-
-my(@customers)=qsearch('cust_main',{});
-if (scalar(@customers) == 0)
-{
-	exit 1;
-}
-
-# Open print and email pipes
-# $lpr and opt_p for printing
-# $email and opt_m for email
-
-if ($lpr && $opt_p)
-{
-        open(LPR, "|$lpr");
-}
-
-if ($email && $opt_m)
-{
-  $ENV{MAILADDRESS} = $mail_sender;
-  $header = new Mail::Header ( [
-    "From: Account Processor",
-    "To: $email",
-    "Sender: $mail_sender",
-    "Reply-To: $mail_sender",
-    "Subject: Receivables",
-  ] );
-}
-
-my $total = 0;
-
-
-# Now I can start looping
-foreach my $customer (@customers)
-{
-  my $custnum = $customer->getfield('custnum');
-  my $first = $customer->getfield('first');
-  my $last = $customer->getfield('last');
-  my $company = $customer->getfield('company');
-  my $daytime = $customer->getfield('daytime');
-  my $balance = $customer->balance;
-
-
-  if ($balance != 0) {
-    $total += $balance;
-    push @buf, sprintf(qq{%8d %-32.32s %12s %9.2f},
-      $custnum,
-      $first . " " . $last . "   " . $company,
-      $daytime,
-      $balance);
-
-  }
-
-}
-
-push @buf, ('', sprintf(qq{%61s}, "========="), sprintf(qq{%61.2f}, $total));
-
-sub FS::receivables_report::_template::report_lines {
-  my $lines = shift;
-  map {
-    scalar(@buf) ? shift @buf : '' ;
-  }
-  ( 1 .. $lines );
-}
-
-$FS::receivables_report::_template::title = " R E C E I V A B L E S ";
-$FS::receivables_report::_template::title = $opt_t if $opt_t;
-$FS::receivables_report::_template::page = 1;
-$FS::receivables_report::_template::date = $_date;
-$FS::receivables_report::_template::date = $_date;
-$FS::receivables_report::_template::total_pages = 
-  int( scalar(@buf) / $report_lines);
-$FS::receivables_report::_template::total_pages++ if scalar(@buf) % $report_lines;
-
-my @report;
-while (@buf) {
-  push @report, split("\n", 
-    $report_template->fill_in( PACKAGE => 'FS::receivables_report::_template' )
-  );
-  $FS::receivables_report::_template::page++;
-}
-
-if ($opt_v) {
-  print map "$_\n", @report;
-}
-if($lpr && $opt_p)
-{
-  print LPR map "$_\n", @report;
-  print LPR "\f" if $opt_e;
-  close LPR || die "Could not close printer: $lpr\n";
-}
-if($email && $opt_m)
-{
-  my $message = new Mail::Internet (
-    'Header' => $header,
-    'Body' => [ (@report) ],
-  );
-  $!=0;
-  $message->smtpsend( Host => "$smtpmachine" )
-    or die "can't send report to $email via $smtpmachine: $!";
-}
-
-
-# subroutines
-
-sub untaint_argv {
-  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    $ARGV[$_] =~ /^([\w\-\/ \.]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
-    $ARGV[$_]=$1;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n  freeside-receivables-report [-v] [-p] [-e] user\n";
-}
-
-=head1 NAME
-
-freeside-receivables-report - Prints or emails outstanding receivables.
-
-=head1 SYNOPSIS
-
-  freeside-receivables-report [-v] [-p] [-m] [-e] [-t "title"] user
-
-=head1 DESCRIPTION
-
-Prints or emails outstanding receivables
-
-B<-v>: Verbose - Prints records to STDOUT.
-
-B<-p>: Print to printer lpr as found in the conf directory.
-
-B<-m>: Mail output to user found in the Conf email file.
-
-B<-e>: Print a final form feed to the printer.
-
-B<-t>: supply a title for the top of each page.
-
-user: From the mapsecrets file - see config.html from the base documentation
-
-=head1 VERSION
-
-$Id: freeside-receivables-report,v 1.6 2002-09-09 22:57:34 ivan Exp $
-
-=head1 BUGS
-
-Yes..... Use at your own risk. No guarantees or warrantees of any
-kind apply to this program. Parts of this program are hacked from
-other GNU licensed software created mainly by Ivan Kohler.
-
-This is released under the GNU Public License. See www.gnu.org
-for more information regarding this license.
-
-=head1 SEE ALSO
-
-L<FS::cust_main>, config.html from the base documentation
-
-=head1 AUTHOR
-
-Jeff Finucane <jeff@cmh.net>
-
-based on print-batch by Joel Griffiths <griff@aver-computer.com>
-
-=cut
-
-- 
cgit v1.2.1


From 3a4b4ab1673766048a33c970f5926b2bf07b535c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Nov 2003 13:39:29 +0000
Subject: "current receivables" -> A/R Aging summary

---
 httemplate/index.html                    |   4 +-
 httemplate/search/report_receivables.cgi | 191 +++++++++++++++++++++++++++++--
 2 files changed, 183 insertions(+), 12 deletions(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index b95d2ac73..d863f3f3e 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -68,9 +68,9 @@
               <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
             </UL>
       <A HREF="search/report_cust_pay.html">Payment report (by type and/or date range)</A>
-      <BR><BR>Financial reports
+      <BR><BR><A HREF="search/report_receivables.cgi">Accounts Receivable Aging Summary</A>
+      <BR><BR>(old) Financial reports (being rewritten)
             <UL>
-              <LI> <A HREF="search/report_receivables.cgi">current receivables</A>
               <LI> <A HREF="search/report_tax.html">tax reports</A>
               <LI> <A HREF="search/report_cc.html">credit card receipts</A>
               <LI> <A HREF="search/report_credit.html">credit memos</A>
diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index fdd3779a9..241ca581c 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -1,19 +1,190 @@
 <!-- mason kludge -->
 <%
+  my $sql = <<END;
 
-my $user = getotaker;
+select *,
 
-print header('Current Receivables Report Results');
+       coalesce(
+         ( select sum( charged
+                       - coalesce(
+                           ( select sum(amount) from cust_bill_pay
+                             where cust_bill.invnum = cust_bill_pay.invnum )
+                           ,0
+                         )
+                       - coalesce(
+                           ( select sum(amount) from cust_bill_pay
+                             where cust_bill.invnum = cust_bill_pay.invnum )
+                           ,0
+                         )
 
-open (REPORT, "freeside-receivables-report -v $user |");
+                     )
+           from cust_bill
+           where cust_bill._date > extract(epoch from now())-2592000
+             and cust_main.custnum = cust_bill.custnum
+         )
+         ,0
+       ) as owed_0_30,
 
-print '<PRE>';
-while(<REPORT>) {
-  print $_;
-}
-print '</PRE>';
+       coalesce(
+         ( select sum( charged
+                       - coalesce(
+                           ( select sum(amount) from cust_bill_pay
+                             where cust_bill.invnum = cust_bill_pay.invnum )
+                           ,0
+                         )
+                       - coalesce(
+                           ( select sum(amount) from cust_bill_pay
+                             where cust_bill.invnum = cust_bill_pay.invnum )
+                           ,0
+                         )
 
-print '</BODY></HTML>';
+                     )
+           from cust_bill
+           where cust_bill._date >  extract(epoch from now())-5184000
+             and cust_bill._date <= extract(epoch from now())-2592000
+             and cust_main.custnum = cust_bill.custnum
+         )
+         ,0
+       ) as owed_30_60,
 
-%>
+       coalesce(
+         ( select sum( charged
+                       - coalesce(
+                           ( select sum(amount) from cust_bill_pay
+                             where cust_bill.invnum = cust_bill_pay.invnum )
+                           ,0
+                         )
+                       - coalesce(
+                           ( select sum(amount) from cust_bill_pay
+                             where cust_bill.invnum = cust_bill_pay.invnum )
+                           ,0
+                         )
+
+                     )
+           from cust_bill
+           where cust_bill._date >  extract(epoch from now())-7776000
+             and cust_bill._date <= extract(epoch from now())-5184000
+             and cust_main.custnum = cust_bill.custnum
+         )
+         ,0
+       ) as owed_60_90,
+
+       coalesce(
+         ( select sum( charged
+                       - coalesce(
+                           ( select sum(amount) from cust_bill_pay
+                             where cust_bill.invnum = cust_bill_pay.invnum )
+                           ,0
+                         )
+                       - coalesce(
+                           ( select sum(amount) from cust_bill_pay
+                             where cust_bill.invnum = cust_bill_pay.invnum )
+                           ,0
+                         )
+
+                     )
+           from cust_bill
+           where cust_bill._date <= extract(epoch from now())-7776000
+             and cust_main.custnum = cust_bill.custnum
+         )
+         ,0
+       ) as owed_90_plus,
+
+       coalesce(
+         ( select sum( charged
+                       - coalesce(
+                           ( select sum(amount) from cust_bill_pay
+                             where cust_bill.invnum = cust_bill_pay.invnum )
+                           ,0
+                         )
+                       - coalesce(
+                           ( select sum(amount) from cust_bill_pay
+                             where cust_bill.invnum = cust_bill_pay.invnum )
+                           ,0
+                         )
+
+                     )
+           from cust_bill
+           where cust_main.custnum = cust_bill.custnum
+         )
+         ,0
+       ) as owed_total
+
+from cust_main
+
+where 0 <
+  coalesce(
+           ( select sum( charged
+                         - coalesce(
+                             ( select sum(amount) from cust_bill_pay
+                               where cust_bill.invnum = cust_bill_pay.invnum )
+                             ,0
+                           )
+                         - coalesce(
+                             ( select sum(amount) from cust_bill_pay
+                               where cust_bill.invnum = cust_bill_pay.invnum )
+                             ,0
+                           )
+  
+                       )
+             from cust_bill
+             where cust_main.custnum = cust_bill.custnum
+           )
+           ,0
+         )
 
+order by company, last
+
+END
+
+
+  #order by!
+
+  #the grep (and the sort ) should be pushed down to SQL
+  #my @cust_main = sort {    $a->company cmp $b->company 
+  #                       || $a->last    cmp $b->last    }
+  #                grep { $_->balance }
+  #                qsearch('cust_main', {} );
+
+  my $totals_table = table(). '<TR><TH>Total</TH>'.
+                             '<TD><i>0-30</i></TD>'.
+                             '<TD><i>30-60</i></TD>'.
+                             '<TD><i>60-90</i></TD>'.
+                             '<TD><i>90+</i></TD>'.
+                             '<TD><i>total</i></TD>'.
+                             '</TABLE>';
+  $totals_table = '';
+
+  my $sth = dbh->prepare($sql) or die dbh->errstr;
+  $sth->execute or die $sth->errstr;
+
+%>
+<%= header('Accounts Receivable Aging Summary', menubar( 'Main Menu'=>$p, ) ) %>
+<%= $totals_table %>
+<%= table() %>
+  <TR>
+    <TH>Customer</TH>
+    <TH>0-30</TH>
+    <TH>30-60</TH>
+    <TH>60-90</TH>
+    <TH>90+</TH>
+    <TH>Total</TH>
+  </TR>
+<% while ( my $row = $sth->fetchrow_hashref() ) { %>
+  <TR>
+    <TD><%= $row->{'custnum'} %>:
+        <%= $row->{'company'} ? $row->{'company'}. ' (' : '' %>
+        <%= $row->{'last'}. ', '. $row->{'first'} %>
+        <%= $row->{'company'} ? ')' : '' %>
+    </TD>
+    <TD ALIGN="right">$<%= sprintf("%.2f", $row->{'owed_0_30'} ) %></TD>
+    <TD ALIGN="right">$<%= sprintf("%.2f", $row->{'owed_30_60'} ) %></TD>
+    <TD ALIGN="right">$<%= sprintf("%.2f", $row->{'owed_60_90'} ) %></TD>
+    <TD ALIGN="right">$<%= sprintf("%.2f", $row->{'owed_90_plus'} ) %></TD>
+    <TD ALIGN="right"><B>$<%= sprintf("%.2f", $row->{'owed_total'} ) %></B></TD>
+  </TR>
+<% } %>
+</TABLE>
+<%= $totals_table %>
+</BODY>
+</HTML>
-- 
cgit v1.2.1


From 4d88d3dc9debe254dddf996a9df936c482681844 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Nov 2003 13:40:31 +0000
Subject: removing bin/freeside-receivables-report

---
 FS/MANIFEST | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/MANIFEST b/FS/MANIFEST
index ad013c848..934100af5 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -19,7 +19,6 @@ bin/freeside-email
 bin/freeside-expiration-alerter
 bin/freeside-queued
 bin/freeside-radgroup
-bin/freeside-receivables-report
 bin/freeside-reexport
 bin/freeside-selfservice-server
 bin/freeside-setinvoice
@@ -45,6 +44,7 @@ FS/UI/Gtk.pm
 FS/UI/agent.pm
 FS/UID.pm
 FS/Msgcat.pm
+FS/acct_snarf.pm
 FS/agent.pm
 FS/agent_type.pm
 FS/cust_bill.pm
-- 
cgit v1.2.1


From 0d83329036f8768c2bc974c3d8713a6089479610 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Nov 2003 13:56:50 +0000
Subject: link to customer, don't show custnum

---
 httemplate/search/report_receivables.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index 241ca581c..9938abdc6 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -172,10 +172,10 @@ END
   </TR>
 <% while ( my $row = $sth->fetchrow_hashref() ) { %>
   <TR>
-    <TD><%= $row->{'custnum'} %>:
+    <TD><A HREF="<% $p %>view/cust_main.cgi?<%= $row->{'custnum'} %>">
         <%= $row->{'company'} ? $row->{'company'}. ' (' : '' %>
         <%= $row->{'last'}. ', '. $row->{'first'} %>
-        <%= $row->{'company'} ? ')' : '' %>
+        <%= $row->{'company'} ? ')' : '' %></A>
     </TD>
     <TD ALIGN="right">$<%= sprintf("%.2f", $row->{'owed_0_30'} ) %></TD>
     <TD ALIGN="right">$<%= sprintf("%.2f", $row->{'owed_30_60'} ) %></TD>
-- 
cgit v1.2.1


From 1203c14b5b34bc848c3176899767a4fbc13f914a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Nov 2003 14:00:27 +0000
Subject: typo

---
 httemplate/search/report_receivables.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index 9938abdc6..f0274d026 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -172,7 +172,7 @@ END
   </TR>
 <% while ( my $row = $sth->fetchrow_hashref() ) { %>
   <TR>
-    <TD><A HREF="<% $p %>view/cust_main.cgi?<%= $row->{'custnum'} %>">
+    <TD><A HREF="<%= $p %>view/cust_main.cgi?<%= $row->{'custnum'} %>">
         <%= $row->{'company'} ? $row->{'company'}. ' (' : '' %>
         <%= $row->{'last'}. ', '. $row->{'first'} %>
         <%= $row->{'company'} ? ')' : '' %></A>
-- 
cgit v1.2.1


From 5a77da3b812de3d218edc3faba3aefc777e5ca71 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Nov 2003 14:08:14 +0000
Subject: ack!  count credits, not payments twice

---
 httemplate/search/report_receivables.cgi | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index f0274d026..1fd7d03c7 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -12,8 +12,8 @@ select *,
                            ,0
                          )
                        - coalesce(
-                           ( select sum(amount) from cust_bill_pay
-                             where cust_bill.invnum = cust_bill_pay.invnum )
+                           ( select sum(amount) from cust_credit_bill
+                             where cust_bill.invnum = cust_credit_bill.invnum )
                            ,0
                          )
 
@@ -33,8 +33,8 @@ select *,
                            ,0
                          )
                        - coalesce(
-                           ( select sum(amount) from cust_bill_pay
-                             where cust_bill.invnum = cust_bill_pay.invnum )
+                           ( select sum(amount) from cust_credit_bill
+                             where cust_bill.invnum = cust_credit_bill.invnum )
                            ,0
                          )
 
@@ -55,8 +55,8 @@ select *,
                            ,0
                          )
                        - coalesce(
-                           ( select sum(amount) from cust_bill_pay
-                             where cust_bill.invnum = cust_bill_pay.invnum )
+                           ( select sum(amount) from cust_credit_bill
+                             where cust_bill.invnum = cust_credit_bill.invnum )
                            ,0
                          )
 
@@ -77,8 +77,8 @@ select *,
                            ,0
                          )
                        - coalesce(
-                           ( select sum(amount) from cust_bill_pay
-                             where cust_bill.invnum = cust_bill_pay.invnum )
+                           ( select sum(amount) from cust_credit_bill
+                             where cust_bill.invnum = cust_credit_bill.invnum )
                            ,0
                          )
 
@@ -98,8 +98,8 @@ select *,
                            ,0
                          )
                        - coalesce(
-                           ( select sum(amount) from cust_bill_pay
-                             where cust_bill.invnum = cust_bill_pay.invnum )
+                           ( select sum(amount) from cust_credit_bill
+                             where cust_bill.invnum = cust_credit_bill.invnum )
                            ,0
                          )
 
@@ -121,8 +121,8 @@ where 0 <
                              ,0
                            )
                          - coalesce(
-                             ( select sum(amount) from cust_bill_pay
-                               where cust_bill.invnum = cust_bill_pay.invnum )
+                             ( select sum(amount) from cust_credit_bill
+                               where cust_bill.invnum = cust_credit_bill.invnum)
                              ,0
                            )
   
-- 
cgit v1.2.1


From 9d3055def8da004cc1b7c7f9b1ce88da3eca3bba Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Nov 2003 14:45:59 +0000
Subject: add totals & simplify expressions

---
 httemplate/search/report_receivables.cgi | 147 +++++++++----------------------
 1 file changed, 41 insertions(+), 106 deletions(-)

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index 1fd7d03c7..d0665164c 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -1,24 +1,25 @@
 <!-- mason kludge -->
 <%
-  my $sql = <<END;
 
-select *,
+  my $charged = <<END;
+  sum( charged
+       - coalesce(
+           ( select sum(amount) from cust_bill_pay
+             where cust_bill.invnum = cust_bill_pay.invnum )
+           ,0
+         )
+       - coalesce(
+           ( select sum(amount) from cust_credit_bill
+             where cust_bill.invnum = cust_credit_bill.invnum )
+           ,0
+         )
 
-       coalesce(
-         ( select sum( charged
-                       - coalesce(
-                           ( select sum(amount) from cust_bill_pay
-                             where cust_bill.invnum = cust_bill_pay.invnum )
-                           ,0
-                         )
-                       - coalesce(
-                           ( select sum(amount) from cust_credit_bill
-                             where cust_bill.invnum = cust_credit_bill.invnum )
-                           ,0
-                         )
+     )
+END
 
-                     )
-           from cust_bill
+  my $owed_cols = <<END;
+       coalesce(
+         ( select $charged from cust_bill
            where cust_bill._date > extract(epoch from now())-2592000
              and cust_main.custnum = cust_bill.custnum
          )
@@ -26,20 +27,7 @@ select *,
        ) as owed_0_30,
 
        coalesce(
-         ( select sum( charged
-                       - coalesce(
-                           ( select sum(amount) from cust_bill_pay
-                             where cust_bill.invnum = cust_bill_pay.invnum )
-                           ,0
-                         )
-                       - coalesce(
-                           ( select sum(amount) from cust_credit_bill
-                             where cust_bill.invnum = cust_credit_bill.invnum )
-                           ,0
-                         )
-
-                     )
-           from cust_bill
+         ( select $charged from cust_bill
            where cust_bill._date >  extract(epoch from now())-5184000
              and cust_bill._date <= extract(epoch from now())-2592000
              and cust_main.custnum = cust_bill.custnum
@@ -48,20 +36,7 @@ select *,
        ) as owed_30_60,
 
        coalesce(
-         ( select sum( charged
-                       - coalesce(
-                           ( select sum(amount) from cust_bill_pay
-                             where cust_bill.invnum = cust_bill_pay.invnum )
-                           ,0
-                         )
-                       - coalesce(
-                           ( select sum(amount) from cust_credit_bill
-                             where cust_bill.invnum = cust_credit_bill.invnum )
-                           ,0
-                         )
-
-                     )
-           from cust_bill
+         ( select $charged from cust_bill
            where cust_bill._date >  extract(epoch from now())-7776000
              and cust_bill._date <= extract(epoch from now())-5184000
              and cust_main.custnum = cust_bill.custnum
@@ -70,20 +45,7 @@ select *,
        ) as owed_60_90,
 
        coalesce(
-         ( select sum( charged
-                       - coalesce(
-                           ( select sum(amount) from cust_bill_pay
-                             where cust_bill.invnum = cust_bill_pay.invnum )
-                           ,0
-                         )
-                       - coalesce(
-                           ( select sum(amount) from cust_credit_bill
-                             where cust_bill.invnum = cust_credit_bill.invnum )
-                           ,0
-                         )
-
-                     )
-           from cust_bill
+         ( select $charged from cust_bill
            where cust_bill._date <= extract(epoch from now())-7776000
              and cust_main.custnum = cust_bill.custnum
          )
@@ -91,43 +53,19 @@ select *,
        ) as owed_90_plus,
 
        coalesce(
-         ( select sum( charged
-                       - coalesce(
-                           ( select sum(amount) from cust_bill_pay
-                             where cust_bill.invnum = cust_bill_pay.invnum )
-                           ,0
-                         )
-                       - coalesce(
-                           ( select sum(amount) from cust_credit_bill
-                             where cust_bill.invnum = cust_credit_bill.invnum )
-                           ,0
-                         )
-
-                     )
-           from cust_bill
+         ( select $charged from cust_bill
            where cust_main.custnum = cust_bill.custnum
          )
          ,0
        ) as owed_total
+END
 
-from cust_main
+  my $sql = <<END;
 
+select *, $owed_cols from cust_main
 where 0 <
   coalesce(
-           ( select sum( charged
-                         - coalesce(
-                             ( select sum(amount) from cust_bill_pay
-                               where cust_bill.invnum = cust_bill_pay.invnum )
-                             ,0
-                           )
-                         - coalesce(
-                             ( select sum(amount) from cust_credit_bill
-                               where cust_bill.invnum = cust_credit_bill.invnum)
-                             ,0
-                           )
-  
-                       )
-             from cust_bill
+           ( select $charged from cust_bill
              where cust_main.custnum = cust_bill.custnum
            )
            ,0
@@ -137,30 +75,16 @@ order by company, last
 
 END
 
-
-  #order by!
-
-  #the grep (and the sort ) should be pushed down to SQL
-  #my @cust_main = sort {    $a->company cmp $b->company 
-  #                       || $a->last    cmp $b->last    }
-  #                grep { $_->balance }
-  #                qsearch('cust_main', {} );
-
-  my $totals_table = table(). '<TR><TH>Total</TH>'.
-                             '<TD><i>0-30</i></TD>'.
-                             '<TD><i>30-60</i></TD>'.
-                             '<TD><i>60-90</i></TD>'.
-                             '<TD><i>90+</i></TD>'.
-                             '<TD><i>total</i></TD>'.
-                             '</TABLE>';
-  $totals_table = '';
+  my $total_sql = "select $owed_cols";
 
   my $sth = dbh->prepare($sql) or die dbh->errstr;
   $sth->execute or die $sth->errstr;
 
+  my $total_sth = dbh->prepare($total_sql) or die dbh->errstr;
+  $total_sth->execute or die $total_sth->errstr;
+
 %>
 <%= header('Accounts Receivable Aging Summary', menubar( 'Main Menu'=>$p, ) ) %>
-<%= $totals_table %>
 <%= table() %>
   <TR>
     <TH>Customer</TH>
@@ -184,7 +108,18 @@ END
     <TD ALIGN="right"><B>$<%= sprintf("%.2f", $row->{'owed_total'} ) %></B></TD>
   </TR>
 <% } %>
+<% my $row = $total_sth->fetchrow_hashref(); %>
+  <TR>
+    <TD COLSPAN=6>&nbsp;</TD>
+  </TR>
+  <TR>
+    <TD><I>Total</I></TD>
+    <TD ALIGN="right"><I>$<%= sprintf("%.2f", $row->{'owed_0_30'} ) %></TD>
+    <TD ALIGN="right"><I>$<%= sprintf("%.2f", $row->{'owed_30_60'} ) %></TD>
+    <TD ALIGN="right"><I>$<%= sprintf("%.2f", $row->{'owed_60_90'} ) %></TD>
+    <TD ALIGN="right"><I>$<%= sprintf("%.2f", $row->{'owed_90_plus'} ) %></TD>
+    <TD ALIGN="right"><I><B>$<%= sprintf("%.2f", $row->{'owed_total'} ) %></B></I></TD>
+  </TR>
 </TABLE>
-<%= $totals_table %>
 </BODY>
 </HTML>
-- 
cgit v1.2.1


From 99d11ad690b5a0e35e9c5388fc1ae5935df3f12b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 7 Nov 2003 07:56:23 +0000
Subject: also show RADIUS usage information for sqlradius_withdomain exports

---
 httemplate/view/svc_acct.cgi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 78c3a3809..58591fcb5 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -57,7 +57,9 @@ function areyousure(href) {
 <%
 
 #if ( $cust_pkg && $cust_pkg->part_pkg->plan eq 'sqlradacct_hour' ) {
-if ( $part_svc->part_export('sqlradius') ) {
+if (    $part_svc->part_export('sqlradius')
+     || $part_svc->part_export('sqlradius_withdomain')
+) {
 
   my $last_bill;
   my %plandata;
-- 
cgit v1.2.1


From 26c21ea9dbbca328c91ab578c7c7c0c21927244e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 7 Nov 2003 08:36:31 +0000
Subject: finish fixing sqlradius_withdomain time calculations

---
 FS/FS/cust_svc.pm | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 6adb571d3..139dd9db6 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -353,10 +353,13 @@ for records where B<svcdb> is not "svc_acct".
 sub seconds_since_sqlradacct {
   my($self, $start, $end) = @_;
 
-  my $username = $self->svc_x->username;
+  my $svc_x = $self->svc_x;
 
-  my @part_export = $self->part_svc->part_export('sqlradius')
-    or die "no sqlradius export configured for this service type";
+  my @part_export = $self->part_svc->part_export('sqlradius');
+  push @part_export, $self->part_svc->part_export('sqlradius_withdomain');
+  die "no sqlradius or sqlradius_withdomain export configured for this".
+      "service type"
+    unless @part_export;
     #or return undef;
 
   my $seconds = 0;
@@ -378,6 +381,15 @@ sub seconds_since_sqlradacct {
       $str2time = 'extract(epoch from ';
     }
 
+    my $username;
+    if ( $part_export->exporttype eq 'sqlradius' ) {
+      $username = $svc_x->username;
+    } elsif ( $part_export->exporttype eq 'sqlradius_withdomain' ) {
+      $username = $svc_x->email;
+    } else {
+      die 'unknown exporttype '. $part_export->exporttype;
+    }
+
     my $query;
   
     #find closed sessions completely within the given range
-- 
cgit v1.2.1


From 1943cb7bba003c921cd4bfa3e108524b697e1fb5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 7 Nov 2003 08:39:04 +0000
Subject: also fix attribute_since_sqlradacct for data charging

---
 FS/FS/cust_svc.pm | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 139dd9db6..af0abf7f1 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -468,10 +468,13 @@ for records where B<svcdb> is not "svc_acct".
 sub attribute_since_sqlradacct {
   my($self, $start, $end, $attrib) = @_;
 
-  my $username = $self->svc_x->username;
+  my $svc_x = $self->svc_x;
 
-  my @part_export = $self->part_svc->part_export('sqlradius')
-    or die "no sqlradius export configured for this service type";
+  my @part_export = $self->part_svc->part_export('sqlradius');
+  push @part_export, $self->part_svc->part_export('sqlradius_withdomain');
+  die "no sqlradius or sqlradius_withdomain export configured for this".
+      "service type"
+    unless @part_export;
     #or return undef;
 
   my $sum = 0;
@@ -494,6 +497,15 @@ sub attribute_since_sqlradacct {
       $str2time = 'extract(epoch from ';
     }
 
+    my $username;
+    if ( $part_export->exporttype eq 'sqlradius' ) {
+      $username = $svc_x->username;
+    } elsif ( $part_export->exporttype eq 'sqlradius_withdomain' ) {
+      $username = $svc_x->email;
+    } else {
+      die 'unknown exporttype '. $part_export->exporttype;
+    }
+
     my $sth = $dbh->prepare("SELECT SUM($attrib)
                                FROM radacct
                                WHERE UserName = ?
-- 
cgit v1.2.1


From 8bd4923ffb0661febc36ff84f3e9b3e825e16973 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 7 Nov 2003 10:53:35 +0000
Subject: update jscalendar

---
 httemplate/elements/calendar-en.js       |  75 ++++-
 httemplate/elements/calendar-setup.js    | 100 ++++--
 httemplate/elements/calendar-win2k-2.css |  52 ++-
 httemplate/elements/calendar.js          | 562 ++++++++++++++++++++++---------
 httemplate/elements/calendar_stripped.js |  14 +-
 5 files changed, 604 insertions(+), 199 deletions(-)

diff --git a/httemplate/elements/calendar-en.js b/httemplate/elements/calendar-en.js
index bc075bb74..e9291e1b7 100644
--- a/httemplate/elements/calendar-en.js
+++ b/httemplate/elements/calendar-en.js
@@ -1,4 +1,15 @@
 // ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mishoo@infoiasi.ro>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
 Calendar._DN = new Array
 ("Sunday",
  "Monday",
@@ -8,6 +19,31 @@ Calendar._DN = new Array
  "Friday",
  "Saturday",
  "Sunday");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Sun",
+ "Mon",
+ "Tue",
+ "Wed",
+ "Thu",
+ "Fri",
+ "Sat",
+ "Sun");
+
+// full month names
 Calendar._MN = new Array
 ("January",
  "February",
@@ -22,9 +58,41 @@ Calendar._MN = new Array
  "November",
  "December");
 
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "May",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Oct",
+ "Nov",
+ "Dec");
+
 // tooltips
 Calendar._TT = {};
-Calendar._TT["TOGGLE"] = "Toggle first day of week";
+Calendar._TT["INFO"] = "About the calendar";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2003\n" + // don't translate this this ;-)
+"For latest version visit: http://dynarch.com/mishoo/calendar.epl\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Date selection:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
+"- Hold mouse button on any of the above buttons for faster selection.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Time selection:\n" +
+"- Click on any of the time parts to increase it\n" +
+"- or Shift-click to decrease it\n" +
+"- or click and drag for faster selection.";
+
 Calendar._TT["PREV_YEAR"] = "Prev. year (hold for menu)";
 Calendar._TT["PREV_MONTH"] = "Prev. month (hold for menu)";
 Calendar._TT["GO_TODAY"] = "Go Today";
@@ -37,9 +105,10 @@ Calendar._TT["MON_FIRST"] = "Display Monday first";
 Calendar._TT["SUN_FIRST"] = "Display Sunday first";
 Calendar._TT["CLOSE"] = "Close";
 Calendar._TT["TODAY"] = "Today";
+Calendar._TT["TIME_PART"] = "(Shift-)Click or drag to change value";
 
 // date formats
-Calendar._TT["DEF_DATE_FORMAT"] = "y-mm-dd";
-Calendar._TT["TT_DATE_FORMAT"] = "D, M d";
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
 
 Calendar._TT["WK"] = "wk";
diff --git a/httemplate/elements/calendar-setup.js b/httemplate/elements/calendar-setup.js
index de6ff591f..0dc3caa00 100644
--- a/httemplate/elements/calendar-setup.js
+++ b/httemplate/elements/calendar-setup.js
@@ -1,20 +1,25 @@
-/*  Copyright Mihai Bazon, 2002, 2003  |  http://students.infoiasi.ro/~mishoo
+/*  Copyright Mihai Bazon, 2002, 2003  |  http://dynarch.com/mishoo/
  * ---------------------------------------------------------------------------
  *
  * The DHTML Calendar
  *
  * Details and latest version at:
- * http://students.infoiasi.ro/~mishoo/site/calendar.epl
+ * http://dynarch.com/mishoo/calendar.epl
  *
- * Feel free to use this script under the terms of the GNU Lesser General
- * Public License, as long as you do not remove or alter this notice.
+ * This script is distributed under the GNU Lesser General Public License.
+ * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
  *
  * This file defines helper functions for setting up the calendar.  They are
  * intended to help non-programmers get a working calendar on their site
- * quickly.
+ * quickly.  This script should not be seen as part of the calendar.  It just
+ * shows you what one can do with the calendar, while in the same time
+ * providing a quick and simple method for setting it up.  If you need
+ * exhaustive customization of the calendar creation process feel free to
+ * modify this code to suit your needs (this is recommended and much better
+ * than modifying calendar.js itself).
  */
 
-// $Id: calendar-setup.js,v 1.2 2003-09-30 08:23:15 ivan Exp $
+// $Id: calendar-setup.js,v 1.3 2003-11-07 10:53:35 ivan Exp $
 
 /**
  *  This function "patches" an input field (or other element) to use a calendar
@@ -31,13 +36,19 @@
  *   ifFormat      | date format that will be stored in the input field
  *   daFormat      | the date format that will be used to display the date in displayArea
  *   singleClick   | (true/false) wether the calendar is in single click mode or not (default: true)
- *   mondayFirst   | (true/false) if true Monday is the first day of week, Sunday otherwise (default: false)
+ *   mondayFirst   | (true/false) if true Monday is the first day of week, Sunday otherwise (default: true)
  *   align         | alignment (default: "Bl"); if you don't know what's this see the calendar documentation
  *   range         | array with 2 elements.  Default: [1900, 2999] -- the range of years available
  *   weekNumbers   | (true/false) if it's true (default) the calendar will display week numbers
  *   flat          | null or element ID; if not null the calendar will be a flat calendar having the parent with the given ID
  *   flatCallback  | function that receives a JS Date object and returns an URL to point the browser to (for flat calendar)
  *   disableFunc   | function that receives a JS Date object and should return true if that date has to be disabled in the calendar
+ *   onSelect      | function that gets called when a date is selected.  You don't _have_ to supply this (the default is generally okay)
+ *   onClose       | function that gets called when the calendar is closed.  [default]
+ *   onUpdate      | function that gets called after the date is updated in the input field.  Receives a reference to the calendar.
+ *   date          | the date that the calendar will be initially displayed to
+ *   showsTime     | default: false; if true the calendar will include a time selector
+ *   timeFormat    | the time format; can be "12" or "24", default is "12"
  *
  *  None of them is required, they all have default values.  However, if you
  *  pass none of "inputField", "displayArea" or "button" you'll get a warning
@@ -46,20 +57,27 @@
 Calendar.setup = function (params) {
 	function param_default(pname, def) { if (typeof params[pname] == "undefined") { params[pname] = def; } };
 
-	param_default("inputField",    null);
-	param_default("displayArea",   null);
-	param_default("button",        null);
-	param_default("eventName",     "click");
-	param_default("ifFormat",      "y/mm/dd");
-	param_default("daFormat",      "y/mm/dd");
-	param_default("singleClick",   true);
-	param_default("disableFunc",   null);
-	param_default("mondayFirst",   false);
-	param_default("align",         "Bl");
-	param_default("range",         [1900, 2999]);
-	param_default("weekNumbers",   true);
-	param_default("flat",          null);
-	param_default("flatCallback",  null);
+	param_default("inputField",     null);
+	param_default("displayArea",    null);
+	param_default("button",         null);
+	param_default("eventName",      "click");
+	param_default("ifFormat",       "%Y/%m/%d");
+	param_default("daFormat",       "%Y/%m/%d");
+	param_default("singleClick",    true);
+	param_default("disableFunc",    null);
+	param_default("dateStatusFunc", params["disableFunc"]);	// takes precedence if both are defined
+	param_default("mondayFirst",    true);
+	param_default("align",          "Bl");
+	param_default("range",          [1900, 2999]);
+	param_default("weekNumbers",    true);
+	param_default("flat",           null);
+	param_default("flatCallback",   null);
+	param_default("onSelect",       null);
+	param_default("onClose",        null);
+	param_default("onUpdate",       null);
+	param_default("date",           null);
+	param_default("showsTime",      false);
+	param_default("timeFormat",     "24");
 
 	var tmp = ["inputField", "displayArea", "button"];
 	for (var i in tmp) {
@@ -90,6 +108,9 @@ Calendar.setup = function (params) {
 		if (cal.params.singleClick && cal.dateClicked) {
 			cal.callCloseHandler();
 		}
+		if (typeof cal.params.onUpdate == "function") {
+			cal.params.onUpdate(cal);
+		}
 	};
 
 	if (params.flat != null) {
@@ -98,11 +119,13 @@ Calendar.setup = function (params) {
 			alert("Calendar.setup:\n  Flat specified but can't find parent.");
 			return false;
 		}
-		var cal = new Calendar(params.mondayFirst, null, onSelect);
+		var cal = new Calendar(params.mondayFirst, params.date, params.onSelect || onSelect);
+		cal.showsTime = params.showsTime;
+		cal.time24 = (params.timeFormat == "24");
 		cal.params = params;
 		cal.weekNumbers = params.weekNumbers;
 		cal.setRange(params.range[0], params.range[1]);
-		cal.setDisabledHandler(params.disableFunc);
+		cal.setDateStatusHandler(params.dateStatusFunc);
 		cal.create(params.flat);
 		cal.show();
 		return false;
@@ -113,23 +136,28 @@ Calendar.setup = function (params) {
 		var dateEl = params.inputField || params.displayArea;
 		var dateFmt = params.inputField ? params.ifFormat : params.daFormat;
 		var mustCreate = false;
+		var cal = window.calendar;
 		if (!window.calendar) {
-			window.calendar = new Calendar(params.mondayFirst, null, onSelect, function(cal) { cal.hide(); });
-			window.calendar.weekNumbers = params.weekNumbers;
+			window.calendar = cal = new Calendar(params.mondayFirst,
+							     params.date,
+							     params.onSelect || onSelect,
+							     params.onClose || function(cal) { cal.hide(); });
+			cal.showsTime = params.showsTime;
+			cal.time24 = (params.timeFormat == "24");
+			cal.weekNumbers = params.weekNumbers;
 			mustCreate = true;
 		} else {
-			window.calendar.hide();
-		}
-		window.calendar.setRange(params.range[0], params.range[1]);
-		window.calendar.params = params;
-		window.calendar.setDisabledHandler(params.disableFunc);
-		window.calendar.setDateFormat(dateFmt);
-		if (mustCreate) {
-			window.calendar.create();
+			cal.hide();
 		}
-		window.calendar.parseDate(dateEl.value || dateEl.innerHTML);
-		window.calendar.refresh();
-		window.calendar.showAtElement(params.displayArea || params.inputField, params.align);
+		cal.setRange(params.range[0], params.range[1]);
+		cal.params = params;
+		cal.setDateStatusHandler(params.dateStatusFunc);
+		cal.setDateFormat(dateFmt);
+		if (mustCreate)
+			cal.create();
+		cal.parseDate(dateEl.value || dateEl.innerHTML);
+		cal.refresh();
+		cal.showAtElement(params.displayArea || params.inputField, params.align);
 		return false;
 	};
 };
diff --git a/httemplate/elements/calendar-win2k-2.css b/httemplate/elements/calendar-win2k-2.css
index 398e78efe..9727d1b9a 100644
--- a/httemplate/elements/calendar-win2k-2.css
+++ b/httemplate/elements/calendar-win2k-2.css
@@ -37,6 +37,10 @@
   border-left: 1px solid #fff;
 }
 
+.calendar .nav {
+  background: transparent url(menuarrow.gif) no-repeat 100% 100%;
+}
+
 .calendar thead .title { /* This holds the current "month, year" */
   font-weight: bold;
   padding: 1px;
@@ -69,7 +73,7 @@
   border-bottom: 2px solid #000;
   border-left: 2px solid #fff;
   padding: 0px;
-  background: #e4d8e0;
+  background-color: #e4d8e0;
 }
 
 .calendar thead .active { /* Active (pressed) buttons in header */
@@ -78,7 +82,7 @@
   border-right: 1px solid #fff;
   border-bottom: 1px solid #fff;
   border-left: 1px solid #000;
-  background: #c4b8c0;
+  background-color: #c4b8c0;
 }
 
 /* The body part -- contains all the days in month. */
@@ -197,11 +201,16 @@
   padding: 1px;
 }
 
-.combo .label {
+.combo .label,
+.combo .label-IEfix {
   text-align: center;
   padding: 1px;
 }
 
+.combo .label-IEfix {
+  width: 4em;
+}
+
 .combo .active {
   background: #d4c8d0;
   padding: 0px;
@@ -215,3 +224,40 @@
   background: #408;
   color: #fea;
 }
+
+.calendar td.time {
+  border-top: 1px solid #000;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #f4f0e8;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #889;
+  font-weight: bold;
+  background-color: #fff;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #766;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/httemplate/elements/calendar.js b/httemplate/elements/calendar.js
index 772931b30..3c028cc76 100644
--- a/httemplate/elements/calendar.js
+++ b/httemplate/elements/calendar.js
@@ -1,23 +1,23 @@
-/*  Copyright Mihai Bazon, 2002, 2003  |  http://students.infoiasi.ro/~mishoo
- * ---------------------------------------------------------------------------
+/*  Copyright Mihai Bazon, 2002, 2003  |  http://dynarch.com/mishoo/
+ * ------------------------------------------------------------------
  *
- * The DHTML Calendar, version 0.9.3 "It's still alive & keeps rocking"
+ * The DHTML Calendar, version 0.9.5 "Your favorite time, bis"
  *
  * Details and latest version at:
- * http://students.infoiasi.ro/~mishoo/site/calendar.epl
+ * http://dynarch.com/mishoo/calendar.epl
  *
- * Feel free to use this script under the terms of the GNU Lesser General
- * Public License, as long as you do not remove or alter this notice.
+ * This script is distributed under the GNU Lesser General Public License.
+ * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
  */
 
-// $Id: calendar.js,v 1.2 2003-09-30 08:23:15 ivan Exp $
+// $Id: calendar.js,v 1.3 2003-11-07 10:53:35 ivan Exp $
 
 /** The Calendar object constructor. */
 Calendar = function (mondayFirst, dateStr, onSelected, onClose) {
 	// member variables
 	this.activeDiv = null;
 	this.currentDateEl = null;
-	this.checkDisabled = null;
+	this.getDateStatus = null;
 	this.timeout = null;
 	this.onSelected = onSelected || null;
 	this.onClose = onClose || null;
@@ -32,6 +32,8 @@ Calendar = function (mondayFirst, dateStr, onSelected, onClose) {
 	this.mondayFirst = mondayFirst;
 	this.dateStr = dateStr;
 	this.ar_days = null;
+	this.showsTime = false;
+	this.time24 = true;
 	// HTML elements
 	this.table = null;
 	this.element = null;
@@ -48,19 +50,23 @@ Calendar = function (mondayFirst, dateStr, onSelected, onClose) {
 	this.dateClicked = false;
 
 	// one-time initializations
-	if (!Calendar._DN3) {
+	if (typeof Calendar._SDN == "undefined") {
 		// table of short day names
+		if (typeof Calendar._SDN_len == "undefined")
+			Calendar._SDN_len = 3;
 		var ar = new Array();
 		for (var i = 8; i > 0;) {
-			ar[--i] = Calendar._DN[i].substr(0, 3);
+			ar[--i] = Calendar._DN[i].substr(0, Calendar._SDN_len);
 		}
-		Calendar._DN3 = ar;
+		Calendar._SDN = ar;
 		// table of short month names
+		if (typeof Calendar._SMN_len == "undefined")
+			Calendar._SMN_len = 3;
 		ar = new Array();
 		for (var i = 12; i > 0;) {
-			ar[--i] = Calendar._MN[i].substr(0, 3);
+			ar[--i] = Calendar._MN[i].substr(0, Calendar._SMN_len);
 		}
-		Calendar._MN3 = ar;
+		Calendar._SMN = ar;
 	}
 };
 
@@ -73,17 +79,23 @@ Calendar._C = null;
 Calendar.is_ie = ( /msie/i.test(navigator.userAgent) &&
 		   !/opera/i.test(navigator.userAgent) );
 
-// short day names array (initialized at first constructor call)
-Calendar._DN3 = null;
+/// detect Opera browser
+Calendar.is_opera = /opera/i.test(navigator.userAgent);
 
-// short month names array (initialized at first constructor call)
-Calendar._MN3 = null;
+/// detect KHTML-based browsers
+Calendar.is_khtml = /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
 
 // BEGIN: UTILITY FUNCTIONS; beware that these might be moved into a separate
 //        library, at some point.
 
 Calendar.getAbsolutePos = function(el) {
-	var r = { x: el.offsetLeft, y: el.offsetTop };
+	var SL = 0, ST = 0;
+	var is_div = /^div$/i.test(el.tagName);
+	if (is_div && el.scrollLeft)
+		SL = el.scrollLeft;
+	if (is_div && el.scrollTop)
+		ST = el.scrollTop;
+	var r = { x: el.offsetLeft - SL, y: el.offsetTop - ST };
 	if (el.offsetParent) {
 		var tmp = Calendar.getAbsolutePos(el.offsetParent);
 		r.x += tmp.x;
@@ -147,9 +159,10 @@ Calendar.getTargetElement = function(ev) {
 };
 
 Calendar.stopEvent = function(ev) {
+	ev || (ev = window.event);
 	if (Calendar.is_ie) {
-		window.event.cancelBubble = true;
-		window.event.returnValue = false;
+		ev.cancelBubble = true;
+		ev.returnValue = false;
 	} else {
 		ev.preventDefault();
 		ev.stopPropagation();
@@ -162,7 +175,7 @@ Calendar.addEvent = function(el, evname, func) {
 		el.attachEvent("on" + evname, func);
 	} else if (el.addEventListener) { // Gecko / W3C
 		el.addEventListener(evname, func, true);
-	} else { // Opera (or old browsers)
+	} else {
 		el["on" + evname] = func;
 	}
 };
@@ -172,7 +185,7 @@ Calendar.removeEvent = function(el, evname, func) {
 		el.detachEvent("on" + evname, func);
 	} else if (el.removeEventListener) { // Gecko / W3C
 		el.removeEventListener(evname, func, true);
-	} else { // Opera (or old browsers)
+	} else {
 		el["on" + evname] = null;
 	}
 };
@@ -244,9 +257,13 @@ Calendar.showMonthsCombo = function () {
 	var mon = cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];
 	Calendar.addClass(mon, "active");
 	cal.activeMonth = mon;
-	mc.style.left = cd.offsetLeft + "px";
-	mc.style.top = (cd.offsetTop + cd.offsetHeight) + "px";
-	mc.style.display = "block";
+	var s = mc.style;
+	s.display = "block";
+	if (cd.navtype < 0)
+		s.left = cd.offsetLeft + "px";
+	else
+		s.left = (cd.offsetLeft + cd.offsetWidth - mc.offsetWidth) + "px";
+	s.top = (cd.offsetTop + cd.offsetHeight) + "px";
 };
 
 Calendar.showYearsCombo = function (fwd) {
@@ -280,9 +297,13 @@ Calendar.showYearsCombo = function (fwd) {
 		Y += fwd ? 2 : -2;
 	}
 	if (show) {
-		yc.style.left = cd.offsetLeft + "px";
-		yc.style.top = (cd.offsetTop + cd.offsetHeight) + "px";
-		yc.style.display = "block";
+		var s = yc.style;
+		s.display = "block";
+		if (cd.navtype < 0)
+			s.left = cd.offsetLeft + "px";
+		else
+			s.left = (cd.offsetLeft + cd.offsetWidth - yc.offsetWidth) + "px";
+		s.top = (cd.offsetTop + cd.offsetHeight) + "px";
 	}
 };
 
@@ -301,9 +322,10 @@ Calendar.tableMouseUp = function(ev) {
 		return false;
 	}
 	var target = Calendar.getTargetElement(ev);
+	ev || (ev = window.event);
 	Calendar.removeClass(el, "active");
 	if (target == el || target.parentNode == el) {
-		Calendar.cellClick(el);
+		Calendar.cellClick(el, ev);
 	}
 	var mon = Calendar.findMonth(target);
 	var date = null;
@@ -348,10 +370,42 @@ Calendar.tableMouseOver = function (ev) {
 		Calendar.addClass(el, "hilite active");
 		Calendar.addClass(el.parentNode, "rowhilite");
 	} else {
-		Calendar.removeClass(el, "active");
+		if (typeof el.navtype == "undefined" || (el.navtype != 50 && (el.navtype == 0 || Math.abs(el.navtype) > 2)))
+			Calendar.removeClass(el, "active");
 		Calendar.removeClass(el, "hilite");
 		Calendar.removeClass(el.parentNode, "rowhilite");
 	}
+	ev || (ev = window.event);
+	if (el.navtype == 50 && target != el) {
+		var pos = Calendar.getAbsolutePos(el);
+		var w = el.offsetWidth;
+		var x = ev.clientX;
+		var dx;
+		var decrease = true;
+		if (x > pos.x + w) {
+			dx = x - pos.x - w;
+			decrease = false;
+		} else
+			dx = pos.x - x;
+
+		if (dx < 0) dx = 0;
+		var range = el._range;
+		var current = el._current;
+		var count = Math.floor(dx / 10) % range.length;
+		for (var i = range.length; --i >= 0;)
+			if (range[i] == current)
+				break;
+		while (count-- > 0)
+			if (decrease) {
+				if (!(--i in range))
+					i = range.length - 1;
+			} else if (!(++i in range))
+				i = 0;
+		var newval = range[i];
+		el.firstChild.data = newval;
+
+		cal.onUpdateTime();
+	}
 	var mon = Calendar.findMonth(target);
 	if (mon) {
 		if (mon.month != cal.date.getMonth()) {
@@ -364,6 +418,9 @@ Calendar.tableMouseOver = function (ev) {
 			Calendar.removeClass(cal.hilitedMonth, "hilite");
 		}
 	} else {
+		if (cal.hilitedMonth) {
+			Calendar.removeClass(cal.hilitedMonth, "hilite");
+		}
 		var year = Calendar.findYear(target);
 		if (year) {
 			if (year.year != cal.date.getFullYear()) {
@@ -375,6 +432,8 @@ Calendar.tableMouseOver = function (ev) {
 			} else if (cal.hilitedYear) {
 				Calendar.removeClass(cal.hilitedYear, "hilite");
 			}
+		} else if (cal.hilitedYear) {
+			Calendar.removeClass(cal.hilitedYear, "hilite");
 		}
 	}
 	return Calendar.stopEvent(ev);
@@ -431,6 +490,8 @@ Calendar.dayMouseDown = function(ev) {
 	cal.activeDiv = el;
 	Calendar._C = cal;
 	if (el.navtype != 300) with (Calendar) {
+		if (el.navtype == 50)
+			el._current = el.firstChild.data;
 		addClass(el, "hilite active");
 		addEvent(document, "mouseover", tableMouseOver);
 		addEvent(document, "mousemove", tableMouseOver);
@@ -439,8 +500,10 @@ Calendar.dayMouseDown = function(ev) {
 		cal._dragStart(ev);
 	}
 	if (el.navtype == -1 || el.navtype == 1) {
+		if (cal.timeout) clearTimeout(cal.timeout);
 		cal.timeout = setTimeout("Calendar.showMonthsCombo()", 250);
 	} else if (el.navtype == -2 || el.navtype == 2) {
+		if (cal.timeout) clearTimeout(cal.timeout);
 		cal.timeout = setTimeout((el.navtype > 0) ? "Calendar.showYearsCombo(true)" : "Calendar.showYearsCombo(false)", 250);
 	} else {
 		cal.timeout = null;
@@ -449,7 +512,7 @@ Calendar.dayMouseDown = function(ev) {
 };
 
 Calendar.dayMouseDblClick = function(ev) {
-	Calendar.cellClick(Calendar.getElement(ev));
+	Calendar.cellClick(Calendar.getElement(ev), ev || window.event);
 	if (Calendar.is_ie) {
 		document.selection.empty();
 	}
@@ -498,7 +561,7 @@ Calendar.dayMouseOut = function(ev) {
  *  A generic "click" handler :) handles all types of buttons defined in this
  *  calendar.
  */
-Calendar.cellClick = function(el) {
+Calendar.cellClick = function(el, ev) {
 	var cal = el.calendar;
 	var closing = false;
 	var newdate = false;
@@ -525,7 +588,8 @@ Calendar.cellClick = function(el) {
 		// unless "today" was clicked, we assume no date was clicked so
 		// the selected handler will know not to close the calenar when
 		// in single-click mode.
-		cal.dateClicked = (el.navtype == 0);
+		// cal.dateClicked = (el.navtype == 0);
+		cal.dateClicked = false;
 		var year = date.getFullYear();
 		var mon = date.getMonth();
 		function setMonth(m) {
@@ -537,6 +601,22 @@ Calendar.cellClick = function(el) {
 			date.setMonth(m);
 		};
 		switch (el.navtype) {
+		    case 400:
+			Calendar.removeClass(el, "hilite");
+			var text = Calendar._TT["ABOUT"];
+			if (typeof text != "undefined") {
+				text += cal.showsTime ? Calendar._TT["ABOUT_TIME"] : "";
+			} else {
+				// FIXME: this should be removed as soon as lang files get updated!
+				text = "Help and about box text is not translated into this language.\n" +
+					"If you know this language and you feel generous please update\n" +
+					"the corresponding file in \"lang\" subdir to match calendar-en.js\n" +
+					"and send it back to <mishoo@infoiasi.ro> to get it into the distribution  ;-)\n\n" +
+					"Thank you!\n" +
+					"http://dynarch.com/mishoo/calendar.epl\n";
+			}
+			alert(text);
+			return;
 		    case -2:
 			if (year > cal.minYear) {
 				date.setFullYear(year - 1);
@@ -566,9 +646,24 @@ Calendar.cellClick = function(el) {
 		    case 100:
 			cal.setMondayFirst(!cal.mondayFirst);
 			return;
+		    case 50:
+			var range = el._range;
+			var current = el.firstChild.data;
+			for (var i = range.length; --i >= 0;)
+				if (range[i] == current)
+					break;
+			if (ev && ev.shiftKey) {
+				if (!(--i in range))
+					i = range.length - 1;
+			} else if (!(++i in range))
+				i = 0;
+			var newval = range[i];
+			el.firstChild.data = newval;
+			cal.onUpdateTime();
+			return;
 		    case 0:
 			// TODAY will bring us here
-			if ((typeof cal.checkDisabled == "function") && cal.checkDisabled(date)) {
+			if ((typeof cal.getDateStatus == "function") && cal.getDateStatus(date, date.getFullYear(), date.getMonth(), date.getDate())) {
 				// remember, "date" was previously set to new
 				// Date() if TODAY was clicked; thus, it
 				// contains today date.
@@ -638,6 +733,8 @@ Calendar.prototype.create = function (_par) {
 		cell = Calendar.createElement("td", row);
 		cell.colSpan = cs;
 		cell.className = "button";
+		if (navtype != 0 && Math.abs(navtype) <= 2)
+			cell.className += " nav";
 		Calendar._add_evs(cell);
 		cell.calendar = cal;
 		cell.navtype = navtype;
@@ -656,7 +753,7 @@ Calendar.prototype.create = function (_par) {
 	(this.isPopup) && --title_length;
 	(this.weekNumbers) && ++title_length;
 
-	hh("-", 1, 100).ttip = Calendar._TT["TOGGLE"];
+	hh("?", 1, 400).ttip = Calendar._TT["INFO"];
 	this.title = hh("", title_length, 300);
 	this.title.className = "title";
 	if (this.isPopup) {
@@ -720,6 +817,96 @@ Calendar.prototype.create = function (_par) {
 		}
 	}
 
+	if (this.showsTime) {
+		row = Calendar.createElement("tr", tbody);
+		row.className = "time";
+
+		cell = Calendar.createElement("td", row);
+		cell.className = "time";
+		cell.colSpan = 2;
+		cell.innerHTML = "&nbsp;";
+
+		cell = Calendar.createElement("td", row);
+		cell.className = "time";
+		cell.colSpan = this.weekNumbers ? 4 : 3;
+
+		(function(){
+			function makeTimePart(className, init, range_start, range_end) {
+				var part = Calendar.createElement("span", cell);
+				part.className = className;
+				part.appendChild(document.createTextNode(init));
+				part.calendar = cal;
+				part.ttip = Calendar._TT["TIME_PART"];
+				part.navtype = 50;
+				part._range = [];
+				if (typeof range_start != "number")
+					part._range = range_start;
+				else {
+					for (var i = range_start; i <= range_end; ++i) {
+						var txt;
+						if (i < 10 && range_end >= 10) txt = '0' + i;
+						else txt = '' + i;
+						part._range[part._range.length] = txt;
+					}
+				}
+				Calendar._add_evs(part);
+				return part;
+			};
+			var hrs = cal.date.getHours();
+			var mins = cal.date.getMinutes();
+			var t12 = !cal.time24;
+			var pm = (hrs > 12);
+			if (t12 && pm) hrs -= 12;
+			var H = makeTimePart("hour", hrs, t12 ? 1 : 0, t12 ? 12 : 23);
+			var span = Calendar.createElement("span", cell);
+			span.appendChild(document.createTextNode(":"));
+			span.className = "colon";
+			var M = makeTimePart("minute", mins, 0, 59);
+			var AP = null;
+			cell = Calendar.createElement("td", row);
+			cell.className = "time";
+			cell.colSpan = 2;
+			if (t12)
+				AP = makeTimePart("ampm", pm ? "pm" : "am", ["am", "pm"]);
+			else
+				cell.innerHTML = "&nbsp;";
+
+			cal.onSetTime = function() {
+				var hrs = this.date.getHours();
+				var mins = this.date.getMinutes();
+				var pm = (hrs > 12);
+				if (pm && t12) hrs -= 12;
+				H.firstChild.data = (hrs < 10) ? ("0" + hrs) : hrs;
+				M.firstChild.data = (mins < 10) ? ("0" + mins) : mins;
+				if (t12)
+					AP.firstChild.data = pm ? "pm" : "am";
+			};
+
+			cal.onUpdateTime = function() {
+				var date = this.date;
+				var h = parseInt(H.firstChild.data, 10);
+				if (t12) {
+					if (/pm/i.test(AP.firstChild.data) && h < 12)
+						h += 12;
+					else if (/am/i.test(AP.firstChild.data) && h == 12)
+						h = 0;
+				}
+				var d = date.getDate();
+				var m = date.getMonth();
+				var y = date.getFullYear();
+				date.setHours(h);
+				date.setMinutes(parseInt(M.firstChild.data, 10));
+				date.setFullYear(y);
+				date.setMonth(m);
+				date.setDate(d);
+				this.dateClicked = false;
+				this.callHandler();
+			};
+		})();
+	} else {
+		this.onSetTime = this.onUpdateTime = function() {};
+	}
+
 	var tfoot = Calendar.createElement("tfoot", table);
 
 	row = Calendar.createElement("tr", tfoot);
@@ -738,9 +925,9 @@ Calendar.prototype.create = function (_par) {
 	div.className = "combo";
 	for (i = 0; i < Calendar._MN.length; ++i) {
 		var mn = Calendar.createElement("div");
-		mn.className = "label";
+		mn.className = Calendar.is_ie ? "label-IEfix" : "label";
 		mn.month = i;
-		mn.appendChild(document.createTextNode(Calendar._MN3[i]));
+		mn.appendChild(document.createTextNode(Calendar._SMN[i]));
 		div.appendChild(mn);
 	}
 
@@ -749,7 +936,7 @@ Calendar.prototype.create = function (_par) {
 	div.className = "combo";
 	for (i = 12; i > 0; --i) {
 		var yr = Calendar.createElement("div");
-		yr.className = "label";
+		yr.className = Calendar.is_ie ? "label-IEfix" : "label";
 		yr.appendChild(document.createTextNode(""));
 		div.appendChild(yr);
 	}
@@ -874,7 +1061,7 @@ Calendar.prototype._init = function (mondayFirst, date) {
 	}
 	var iday = 1;
 	var row = this.tbody.firstChild;
-	var MN = Calendar._MN3[month];
+	var MN = Calendar._SMN[month];
 	var hasToday = ((today.getFullYear() == year) && (today.getMonth() == month));
 	var todayDate = today.getDate();
 	var week_number = date.getWeekNumber();
@@ -904,11 +1091,16 @@ Calendar.prototype._init = function (mondayFirst, date) {
 			}
 			cell.disabled = false;
 			cell.firstChild.data = iday;
-			if (typeof this.checkDisabled == "function") {
+			if (typeof this.getDateStatus == "function") {
 				date.setDate(iday);
-				if (this.checkDisabled(date)) {
+				var status = this.getDateStatus(date, year, month, iday);
+				if (status === true) {
 					cell.className += " disabled";
 					cell.disabled = true;
+				} else {
+					if (/disabled/i.test(status))
+						cell.disabled = true;
+					cell.className += " " + status;
 				}
 			}
 			if (!cell.disabled) {
@@ -935,6 +1127,7 @@ Calendar.prototype._init = function (mondayFirst, date) {
 	}
 	this.ar_days = ar_days;
 	this.title.firstChild.data = Calendar._MN[month] + ", " + year;
+	this.onSetTime();
 	// PROFILE
 	// this.tooltips.firstChild.data = "Generated in " + ((new Date()) - today) + " ms";
 };
@@ -971,8 +1164,8 @@ Calendar.prototype.setMondayFirst = function (mondayFirst) {
  *  object) and returns a boolean value.  If the returned value is true then
  *  the passed date will be marked as disabled.
  */
-Calendar.prototype.setDisabledHandler = function (unaryFunction) {
-	this.checkDisabled = unaryFunction;
+Calendar.prototype.setDateStatusHandler = Calendar.prototype.setDisabledHandler = function (unaryFunction) {
+	this.getDateStatus = unaryFunction;
 };
 
 /** Customization of allowed year range for the calendar. */
@@ -1001,6 +1194,7 @@ Calendar.prototype.destroy = function () {
 	var el = this.element.parentNode;
 	el.removeChild(this.element);
 	Calendar._C = null;
+	window.calendar = null;
 };
 
 /**
@@ -1082,37 +1276,44 @@ Calendar.prototype.showAt = function (x, y) {
 
 /** Shows the calendar near a given element. */
 Calendar.prototype.showAtElement = function (el, opts) {
+	var self = this;
 	var p = Calendar.getAbsolutePos(el);
 	if (!opts || typeof opts != "string") {
 		this.showAt(p.x, p.y + el.offsetHeight);
 		return true;
 	}
-	this.show();
-	var w = this.element.offsetWidth;
-	var h = this.element.offsetHeight;
-	this.hide();
-	var valign = opts.substr(0, 1);
-	var halign = "l";
-	if (opts.length > 1) {
-		halign = opts.substr(1, 1);
-	}
-	// vertical alignment
-        switch (valign) {
-	    case "T": p.y -= h; break;
-	    case "B": p.y += el.offsetHeight; break;
-	    case "C": p.y += (el.offsetHeight - h) / 2; break;
-	    case "t": p.y += el.offsetHeight - h; break;
-	    case "b": break; // already there
-        }
-	// horizontal alignment
-	switch (halign) {
-	    case "L": p.x -= w; break;
-	    case "R": p.x += el.offsetWidth; break;
-	    case "C": p.x += (el.offsetWidth - w) / 2; break;
-	    case "r": p.x += el.offsetWidth - w; break;
-	    case "l": break; // already there
-	}
-	this.showAt(p.x, p.y);
+	this.element.style.display = "block";
+	Calendar.continuation_for_the_fucking_khtml_browser = function() {
+		var w = self.element.offsetWidth;
+		var h = self.element.offsetHeight;
+		self.element.style.display = "none";
+		var valign = opts.substr(0, 1);
+		var halign = "l";
+		if (opts.length > 1) {
+			halign = opts.substr(1, 1);
+		}
+		// vertical alignment
+		switch (valign) {
+		    case "T": p.y -= h; break;
+		    case "B": p.y += el.offsetHeight; break;
+		    case "C": p.y += (el.offsetHeight - h) / 2; break;
+		    case "t": p.y += el.offsetHeight - h; break;
+		    case "b": break; // already there
+		}
+		// horizontal alignment
+		switch (halign) {
+		    case "L": p.x -= w; break;
+		    case "R": p.x += el.offsetWidth; break;
+		    case "C": p.x += (el.offsetWidth - w) / 2; break;
+		    case "r": p.x += el.offsetWidth - w; break;
+		    case "l": break; // already there
+		}
+		self.showAt(p.x, p.y);
+	};
+	if (Calendar.is_khtml)
+		setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()", 10);
+	else
+		Calendar.continuation_for_the_fucking_khtml_browser();
 };
 
 /** Customizes the date format. */
@@ -1137,30 +1338,42 @@ Calendar.prototype.parseDate = function (str, fmt) {
 	if (!fmt) {
 		fmt = this.dateFormat;
 	}
-	var b = fmt.split(/\W+/);
+	var b = [];
+	fmt.replace(/(%.)/g, function(str, par) {
+		return b[b.length] = par;
+	});
 	var i = 0, j = 0;
+	var hr = 0;
+	var min = 0;
 	for (i = 0; i < a.length; ++i) {
-		if (b[i] == "D" || b[i] == "DD") {
+		if (b[i] == "%a" || b[i] == "%A") {
 			continue;
 		}
-		if (b[i] == "d" || b[i] == "dd") {
+		if (b[i] == "%d" || b[i] == "%e") {
 			d = parseInt(a[i], 10);
 		}
-		if (b[i] == "m" || b[i] == "mm") {
+		if (b[i] == "%m") {
 			m = parseInt(a[i], 10) - 1;
 		}
-		if ((b[i] == "y") || (b[i] == "yy")) {
+		if (b[i] == "%Y" || b[i] == "%y") {
 			y = parseInt(a[i], 10);
 			(y < 100) && (y += (y > 29) ? 1900 : 2000);
 		}
-		if (b[i] == "M" || b[i] == "MM") {
+		if (b[i] == "%b" || b[i] == "%B") {
 			for (j = 0; j < 12; ++j) {
 				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
 			}
+		} else if (/%[HIkl]/.test(b[i])) {
+			hr = parseInt(a[i], 10);
+		} else if (/%[pP]/.test(b[i])) {
+			if (/pm/i.test(a[i]) && hr < 12)
+				hr += 12;
+		} else if (b[i] == "%M") {
+			min = parseInt(a[i], 10);
 		}
 	}
 	if (y != 0 && m != -1 && d != 0) {
-		this.setDate(new Date(y, m, d));
+		this.setDate(new Date(y, m, d, hr, min, 0));
 		return;
 	}
 	y = 0; m = -1; d = 0;
@@ -1190,61 +1403,70 @@ Calendar.prototype.parseDate = function (str, fmt) {
 		y = today.getFullYear();
 	}
 	if (m != -1 && d != 0) {
-		this.setDate(new Date(y, m, d));
+		this.setDate(new Date(y, m, d, hr, min, 0));
 	}
 };
 
 Calendar.prototype.hideShowCovered = function () {
-	function getStyleProp(obj, style){
-		var value = obj.style[style];
-		if (!value) {
-			if (document.defaultView && typeof (document.defaultView.getComputedStyle) == "function") { // Gecko, W3C
-				value = document.defaultView.
-					getComputedStyle(obj, "").getPropertyValue(style);
-			} else if (obj.currentStyle) { // IE
-				value = obj.currentStyle[style];
-			} else {
-				value = obj.style[style];
+	var self = this;
+	Calendar.continuation_for_the_fucking_khtml_browser = function() {
+		function getVisib(obj){
+			var value = obj.style.visibility;
+			if (!value) {
+				if (document.defaultView && typeof (document.defaultView.getComputedStyle) == "function") { // Gecko, W3C
+					if (!Calendar.is_khtml)
+						value = document.defaultView.
+							getComputedStyle(obj, "").getPropertyValue("visibility");
+					else
+						value = '';
+				} else if (obj.currentStyle) { // IE
+					value = obj.currentStyle.visibility;
+				} else
+					value = '';
 			}
-		}
-		return value;
-	};
-
-	var tags = new Array("applet", "iframe", "select");
-	var el = this.element;
+			return value;
+		};
 
-	var p = Calendar.getAbsolutePos(el);
-	var EX1 = p.x;
-	var EX2 = el.offsetWidth + EX1;
-	var EY1 = p.y;
-	var EY2 = el.offsetHeight + EY1;
-
-	for (var k = tags.length; k > 0; ) {
-		var ar = document.getElementsByTagName(tags[--k]);
-		var cc = null;
-
-		for (var i = ar.length; i > 0;) {
-			cc = ar[--i];
-
-			p = Calendar.getAbsolutePos(cc);
-			var CX1 = p.x;
-			var CX2 = cc.offsetWidth + CX1;
-			var CY1 = p.y;
-			var CY2 = cc.offsetHeight + CY1;
-
-			if (this.hidden || (CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
-				if (!cc.__msh_save_visibility) {
-					cc.__msh_save_visibility = getStyleProp(cc, "visibility");
-				}
-				cc.style.visibility = cc.__msh_save_visibility;
-			} else {
-				if (!cc.__msh_save_visibility) {
-					cc.__msh_save_visibility = getStyleProp(cc, "visibility");
+		var tags = new Array("applet", "iframe", "select");
+		var el = self.element;
+
+		var p = Calendar.getAbsolutePos(el);
+		var EX1 = p.x;
+		var EX2 = el.offsetWidth + EX1;
+		var EY1 = p.y;
+		var EY2 = el.offsetHeight + EY1;
+
+		for (var k = tags.length; k > 0; ) {
+			var ar = document.getElementsByTagName(tags[--k]);
+			var cc = null;
+
+			for (var i = ar.length; i > 0;) {
+				cc = ar[--i];
+
+				p = Calendar.getAbsolutePos(cc);
+				var CX1 = p.x;
+				var CX2 = cc.offsetWidth + CX1;
+				var CY1 = p.y;
+				var CY2 = cc.offsetHeight + CY1;
+
+				if (self.hidden || (CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
+					if (!cc.__msh_save_visibility) {
+						cc.__msh_save_visibility = getVisib(cc);
+					}
+					cc.style.visibility = cc.__msh_save_visibility;
+				} else {
+					if (!cc.__msh_save_visibility) {
+						cc.__msh_save_visibility = getVisib(cc);
+					}
+					cc.style.visibility = "hidden";
 				}
-				cc.style.visibility = "hidden";
 			}
 		}
-	}
+	};
+	if (Calendar.is_khtml)
+		setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()", 10);
+	else
+		Calendar.continuation_for_the_fucking_khtml_browser();
 };
 
 /** Internal function; it displays the bar with the names of the weekday. */
@@ -1264,7 +1486,7 @@ Calendar.prototype._displayWeekdays = function () {
 		if (i == SUN || i == SAT) {
 			Calendar.addClass(cell, "weekend");
 		}
-		cell.firstChild.data = Calendar._DN3[i + 1 - MON];
+		cell.firstChild.data = Calendar._SDN[i + 1 - MON];
 		cell = cell.nextSibling;
 	}
 };
@@ -1325,14 +1547,22 @@ Date.prototype.getMonthDays = function(month) {
 	}
 };
 
-/** Returns the number of the week.  The algorithm was "stolen" from PPK's
- * website, hope it's correct :) http://www.xs4all.nl/~ppk/js/week.html */
+/** Returns the number of day in the year. */
+Date.prototype.getDayOfYear = function() {
+	var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+	var then = new Date(this.getFullYear(), 0, 1, 0, 0, 0);
+	var time = now - then;
+	return Math.floor(time / Date.DAY);
+};
+
+/** Returns the number of the week in year, as defined in ISO 8601. */
 Date.prototype.getWeekNumber = function() {
 	var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
 	var then = new Date(this.getFullYear(), 0, 1, 0, 0, 0);
 	var time = now - then;
-	var day = then.getDay();
-	(day > 3) && (day -= 4) || (day += 3);
+	var day = then.getDay(); // 0 means Sunday
+	if (day == 0) day = 7;
+	(day > 4) && (day -= 4) || (day += 3);
 	return Math.round(((time / Date.DAY) + day) / 7);
 };
 
@@ -1340,37 +1570,69 @@ Date.prototype.getWeekNumber = function() {
 Date.prototype.equalsTo = function(date) {
 	return ((this.getFullYear() == date.getFullYear()) &&
 		(this.getMonth() == date.getMonth()) &&
-		(this.getDate() == date.getDate()));
+		(this.getDate() == date.getDate()) &&
+		(this.getHours() == date.getHours()) &&
+		(this.getMinutes() == date.getMinutes()));
 };
 
 /** Prints the date in a string according to the given format. */
-Date.prototype.print = function (frm) {
-	var str = new String(frm);
+Date.prototype.print = function (str) {
 	var m = this.getMonth();
 	var d = this.getDate();
 	var y = this.getFullYear();
 	var wn = this.getWeekNumber();
 	var w = this.getDay();
-	var s = new Array();
-	s["d"] = d;
-	s["dd"] = (d < 10) ? ("0" + d) : d;
-	s["m"] = 1+m;
-	s["mm"] = (m < 9) ? ("0" + (1+m)) : (1+m);
-	s["y"] = y;
-	s["yy"] = new String(y).substr(2, 2);
-	s["w"] = wn;
-	s["ww"] = (wn < 10) ? ("0" + wn) : wn;
-	with (Calendar) {
-		s["D"] = _DN3[w];
-		s["DD"] = _DN[w];
-		s["M"] = _MN3[m];
-		s["MM"] = _MN[m];
-	}
-	var re = /(.*)(\W|^)(d|dd|m|mm|y|yy|MM|M|DD|D|w|ww)(\W|$)(.*)/;
-	while (re.exec(str) != null) {
-		str = RegExp.$1 + RegExp.$2 + s[RegExp.$3] + RegExp.$4 + RegExp.$5;
-	}
-	return str;
+	var s = {};
+	var hr = this.getHours();
+	var pm = (hr >= 12);
+	var ir = (pm) ? (hr - 12) : hr;
+	var dy = this.getDayOfYear();
+	if (ir == 0)
+		ir = 12;
+	var min = this.getMinutes();
+	var sec = this.getSeconds();
+	s["%a"] = Calendar._SDN[w]; // abbreviated weekday name [FIXME: I18N]
+	s["%A"] = Calendar._DN[w]; // full weekday name
+	s["%b"] = Calendar._SMN[m]; // abbreviated month name [FIXME: I18N]
+	s["%B"] = Calendar._MN[m]; // full month name
+	// FIXME: %c : preferred date and time representation for the current locale
+	s["%C"] = 1 + Math.floor(y / 100); // the century number
+	s["%d"] = (d < 10) ? ("0" + d) : d; // the day of the month (range 01 to 31)
+	s["%e"] = d; // the day of the month (range 1 to 31)
+	// FIXME: %D : american date style: %m/%d/%y
+	// FIXME: %E, %F, %G, %g, %h (man strftime)
+	s["%H"] = (hr < 10) ? ("0" + hr) : hr; // hour, range 00 to 23 (24h format)
+	s["%I"] = (ir < 10) ? ("0" + ir) : ir; // hour, range 01 to 12 (12h format)
+	s["%j"] = (dy < 100) ? ((dy < 10) ? ("00" + dy) : ("0" + dy)) : dy; // day of the year (range 001 to 366)
+	s["%k"] = hr;		// hour, range 0 to 23 (24h format)
+	s["%l"] = ir;		// hour, range 1 to 12 (12h format)
+	s["%m"] = (m < 9) ? ("0" + (1+m)) : (1+m); // month, range 01 to 12
+	s["%M"] = (min < 10) ? ("0" + min) : min; // minute, range 00 to 59
+	s["%n"] = "\n";		// a newline character
+	s["%p"] = pm ? "PM" : "AM";
+	s["%P"] = pm ? "pm" : "am";
+	// FIXME: %r : the time in am/pm notation %I:%M:%S %p
+	// FIXME: %R : the time in 24-hour notation %H:%M
+	s["%s"] = Math.floor(this.getTime() / 1000);
+	s["%S"] = (sec < 10) ? ("0" + sec) : sec; // seconds, range 00 to 59
+	s["%t"] = "\t";		// a tab character
+	// FIXME: %T : the time in 24-hour notation (%H:%M:%S)
+	s["%U"] = s["%W"] = s["%V"] = (wn < 10) ? ("0" + wn) : wn;
+	s["%u"] = w + 1;	// the day of the week (range 1 to 7, 1 = MON)
+	s["%w"] = w;		// the day of the week (range 0 to 6, 0 = SUN)
+	// FIXME: %x : preferred date representation for the current locale without the time
+	// FIXME: %X : preferred time representation for the current locale without the date
+	s["%y"] = ('' + y).substr(2, 2); // year without the century (range 00 to 99)
+	s["%Y"] = y;		// year with the century
+	s["%%"] = "%";		// a literal '%' character
+	var re = Date._msh_formatRegexp;
+	if (typeof re == "undefined") {
+		var tmp = "";
+		for (var i in s)
+			tmp += tmp ? ("|" + i) : i;
+		Date._msh_formatRegexp = re = new RegExp("(" + tmp + ")", 'g');
+	}
+	return str.replace(re, function(match, par) { return s[par]; });
 };
 
 // END: DATE OBJECT PATCHES
diff --git a/httemplate/elements/calendar_stripped.js b/httemplate/elements/calendar_stripped.js
index 38b9b9aad..029496a74 100644
--- a/httemplate/elements/calendar_stripped.js
+++ b/httemplate/elements/calendar_stripped.js
@@ -1,12 +1,12 @@
-/*  Copyright Mihai Bazon, 2002, 2003  |  http://students.infoiasi.ro/~mishoo
- * ---------------------------------------------------------------------------
+/*  Copyright Mihai Bazon, 2002, 2003  |  http://dynarch.com/mishoo/
+ * ------------------------------------------------------------------
  *
- * The DHTML Calendar, version 0.9.3 "It's still alive & keeps rocking"
+ * The DHTML Calendar, version 0.9.5 "Your favorite time, bis"
  *
  * Details and latest version at:
- * http://students.infoiasi.ro/~mishoo/site/calendar.epl
+ * http://dynarch.com/mishoo/calendar.epl
  *
- * Feel free to use this script under the terms of the GNU Lesser General
- * Public License, as long as you do not remove or alter this notice.
+ * This script is distributed under the GNU Lesser General Public License.
+ * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
  */
-Calendar=function(mondayFirst,dateStr,onSelected,onClose){this.activeDiv=null;this.currentDateEl=null;this.checkDisabled=null;this.timeout=null;this.onSelected=onSelected||null;this.onClose=onClose||null;this.dragging=false;this.hidden=false;this.minYear=1970;this.maxYear=2050;this.dateFormat=Calendar._TT["DEF_DATE_FORMAT"];this.ttDateFormat=Calendar._TT["TT_DATE_FORMAT"];this.isPopup=true;this.weekNumbers=true;this.mondayFirst=mondayFirst;this.dateStr=dateStr;this.ar_days=null;this.table=null;this.element=null;this.tbody=null;this.firstdayname=null;this.monthsCombo=null;this.yearsCombo=null;this.hilitedMonth=null;this.activeMonth=null;this.hilitedYear=null;this.activeYear=null;this.dateClicked=false;if(!Calendar._DN3){var ar=new Array();for(var i=8;i>0;){ar[--i]=Calendar._DN[i].substr(0,3);}Calendar._DN3=ar;ar=new Array();for(var i=12;i>0;){ar[--i]=Calendar._MN[i].substr(0,3);}Calendar._MN3=ar;}};Calendar._C=null;Calendar.is_ie=(/msie/i.test(navigator.userAgent)&&!/opera/i.test(navigator.userAgent));Calendar._DN3=null;Calendar._MN3=null;Calendar.getAbsolutePos=function(el){var r={x:el.offsetLeft,y:el.offsetTop};if(el.offsetParent){var tmp=Calendar.getAbsolutePos(el.offsetParent);r.x+=tmp.x;r.y+=tmp.y;}return r;};Calendar.isRelated=function(el,evt){var related=evt.relatedTarget;if(!related){var type=evt.type;if(type=="mouseover"){related=evt.fromElement;}else if(type=="mouseout"){related=evt.toElement;}}while(related){if(related==el){return true;}related=related.parentNode;}return false;};Calendar.removeClass=function(el,className){if(!(el&&el.className)){return;}var cls=el.className.split(" ");var ar=new Array();for(var i=cls.length;i>0;){if(cls[--i]!=className){ar[ar.length]=cls[i];}}el.className=ar.join(" ");};Calendar.addClass=function(el,className){Calendar.removeClass(el,className);el.className+=" "+className;};Calendar.getElement=function(ev){if(Calendar.is_ie){return window.event.srcElement;}else{return ev.currentTarget;}};Calendar.getTargetElement=function(ev){if(Calendar.is_ie){return window.event.srcElement;}else{return ev.target;}};Calendar.stopEvent=function(ev){if(Calendar.is_ie){window.event.cancelBubble=true;window.event.returnValue=false;}else{ev.preventDefault();ev.stopPropagation();}return false;};Calendar.addEvent=function(el,evname,func){if(el.attachEvent){el.attachEvent("on"+evname,func);}else if(el.addEventListener){el.addEventListener(evname,func,true);}else{el["on"+evname]=func;}};Calendar.removeEvent=function(el,evname,func){if(el.detachEvent){el.detachEvent("on"+evname,func);}else if(el.removeEventListener){el.removeEventListener(evname,func,true);}else{el["on"+evname]=null;}};Calendar.createElement=function(type,parent){var el=null;if(document.createElementNS){el=document.createElementNS("http://www.w3.org/1999/xhtml",type);}else{el=document.createElement(type);}if(typeof parent!="undefined"){parent.appendChild(el);}return el;};Calendar._add_evs=function(el){with(Calendar){addEvent(el,"mouseover",dayMouseOver);addEvent(el,"mousedown",dayMouseDown);addEvent(el,"mouseout",dayMouseOut);if(is_ie){addEvent(el,"dblclick",dayMouseDblClick);el.setAttribute("unselectable",true);}}};Calendar.findMonth=function(el){if(typeof el.month!="undefined"){return el;}else if(typeof el.parentNode.month!="undefined"){return el.parentNode;}return null;};Calendar.findYear=function(el){if(typeof el.year!="undefined"){return el;}else if(typeof el.parentNode.year!="undefined"){return el.parentNode;}return null;};Calendar.showMonthsCombo=function(){var cal=Calendar._C;if(!cal){return false;}var cal=cal;var cd=cal.activeDiv;var mc=cal.monthsCombo;if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}if(cal.activeMonth){Calendar.removeClass(cal.activeMonth,"active");}var mon=cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];Calendar.addClass(mon,"active");cal.activeMonth=mon;mc.style.left=cd.offsetLeft+"px";mc.style.top=(cd.offsetTop+cd.offsetHeight)+"px";mc.style.display="block";};Calendar.showYearsCombo=function(fwd){var cal=Calendar._C;if(!cal){return false;}var cal=cal;var cd=cal.activeDiv;var yc=cal.yearsCombo;if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}if(cal.activeYear){Calendar.removeClass(cal.activeYear,"active");}cal.activeYear=null;var Y=cal.date.getFullYear()+(fwd?1:-1);var yr=yc.firstChild;var show=false;for(var i=12;i>0;--i){if(Y>=cal.minYear&&Y<=cal.maxYear){yr.firstChild.data=Y;yr.year=Y;yr.style.display="block";show=true;}else{yr.style.display="none";}yr=yr.nextSibling;Y+=fwd?2:-2;}if(show){yc.style.left=cd.offsetLeft+"px";yc.style.top=(cd.offsetTop+cd.offsetHeight)+"px";yc.style.display="block";}};Calendar.tableMouseUp=function(ev){var cal=Calendar._C;if(!cal){return false;}if(cal.timeout){clearTimeout(cal.timeout);}var el=cal.activeDiv;if(!el){return false;}var target=Calendar.getTargetElement(ev);Calendar.removeClass(el,"active");if(target==el||target.parentNode==el){Calendar.cellClick(el);}var mon=Calendar.findMonth(target);var date=null;if(mon){date=new Date(cal.date);if(mon.month!=date.getMonth()){date.setMonth(mon.month);cal.setDate(date);cal.dateClicked=false;cal.callHandler();}}else{var year=Calendar.findYear(target);if(year){date=new Date(cal.date);if(year.year!=date.getFullYear()){date.setFullYear(year.year);cal.setDate(date);cal.dateClicked=false;cal.callHandler();}}}with(Calendar){removeEvent(document,"mouseup",tableMouseUp);removeEvent(document,"mouseover",tableMouseOver);removeEvent(document,"mousemove",tableMouseOver);cal._hideCombos();_C=null;return stopEvent(ev);}};Calendar.tableMouseOver=function(ev){var cal=Calendar._C;if(!cal){return;}var el=cal.activeDiv;var target=Calendar.getTargetElement(ev);if(target==el||target.parentNode==el){Calendar.addClass(el,"hilite active");Calendar.addClass(el.parentNode,"rowhilite");}else{Calendar.removeClass(el,"active");Calendar.removeClass(el,"hilite");Calendar.removeClass(el.parentNode,"rowhilite");}var mon=Calendar.findMonth(target);if(mon){if(mon.month!=cal.date.getMonth()){if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}Calendar.addClass(mon,"hilite");cal.hilitedMonth=mon;}else if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}}else{var year=Calendar.findYear(target);if(year){if(year.year!=cal.date.getFullYear()){if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}Calendar.addClass(year,"hilite");cal.hilitedYear=year;}else if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}}}return Calendar.stopEvent(ev);};Calendar.tableMouseDown=function(ev){if(Calendar.getTargetElement(ev)==Calendar.getElement(ev)){return Calendar.stopEvent(ev);}};Calendar.calDragIt=function(ev){var cal=Calendar._C;if(!(cal&&cal.dragging)){return false;}var posX;var posY;if(Calendar.is_ie){posY=window.event.clientY+document.body.scrollTop;posX=window.event.clientX+document.body.scrollLeft;}else{posX=ev.pageX;posY=ev.pageY;}cal.hideShowCovered();var st=cal.element.style;st.left=(posX-cal.xOffs)+"px";st.top=(posY-cal.yOffs)+"px";return Calendar.stopEvent(ev);};Calendar.calDragEnd=function(ev){var cal=Calendar._C;if(!cal){return false;}cal.dragging=false;with(Calendar){removeEvent(document,"mousemove",calDragIt);removeEvent(document,"mouseover",stopEvent);removeEvent(document,"mouseup",calDragEnd);tableMouseUp(ev);}cal.hideShowCovered();};Calendar.dayMouseDown=function(ev){var el=Calendar.getElement(ev);if(el.disabled){return false;}var cal=el.calendar;cal.activeDiv=el;Calendar._C=cal;if(el.navtype!=300)with(Calendar){addClass(el,"hilite active");addEvent(document,"mouseover",tableMouseOver);addEvent(document,"mousemove",tableMouseOver);addEvent(document,"mouseup",tableMouseUp);}else if(cal.isPopup){cal._dragStart(ev);}if(el.navtype==-1||el.navtype==1){cal.timeout=setTimeout("Calendar.showMonthsCombo()",250);}else if(el.navtype==-2||el.navtype==2){cal.timeout=setTimeout((el.navtype>0)?"Calendar.showYearsCombo(true)":"Calendar.showYearsCombo(false)",250);}else{cal.timeout=null;}return Calendar.stopEvent(ev);};Calendar.dayMouseDblClick=function(ev){Calendar.cellClick(Calendar.getElement(ev));if(Calendar.is_ie){document.selection.empty();}};Calendar.dayMouseOver=function(ev){var el=Calendar.getElement(ev);if(Calendar.isRelated(el,ev)||Calendar._C||el.disabled){return false;}if(el.ttip){if(el.ttip.substr(0,1)=="_"){var date=null;with(el.calendar.date){date=new Date(getFullYear(),getMonth(),el.caldate);}el.ttip=date.print(el.calendar.ttDateFormat)+el.ttip.substr(1);}el.calendar.tooltips.firstChild.data=el.ttip;}if(el.navtype!=300){Calendar.addClass(el,"hilite");if(el.caldate){Calendar.addClass(el.parentNode,"rowhilite");}}return Calendar.stopEvent(ev);};Calendar.dayMouseOut=function(ev){with(Calendar){var el=getElement(ev);if(isRelated(el,ev)||_C||el.disabled){return false;}removeClass(el,"hilite");if(el.caldate){removeClass(el.parentNode,"rowhilite");}el.calendar.tooltips.firstChild.data=_TT["SEL_DATE"];return stopEvent(ev);}};Calendar.cellClick=function(el){var cal=el.calendar;var closing=false;var newdate=false;var date=null;if(typeof el.navtype=="undefined"){Calendar.removeClass(cal.currentDateEl,"selected");Calendar.addClass(el,"selected");closing=(cal.currentDateEl==el);if(!closing){cal.currentDateEl=el;}cal.date.setDate(el.caldate);date=cal.date;newdate=true;cal.dateClicked=true;}else{if(el.navtype==200){Calendar.removeClass(el,"hilite");cal.callCloseHandler();return;}date=(el.navtype==0)?new Date():new Date(cal.date);cal.dateClicked=(el.navtype==0);var year=date.getFullYear();var mon=date.getMonth();function setMonth(m){var day=date.getDate();var max=date.getMonthDays(m);if(day>max){date.setDate(max);}date.setMonth(m);};switch(el.navtype){case-2:if(year>cal.minYear){date.setFullYear(year-1);}break;case-1:if(mon>0){setMonth(mon-1);}else if(year-->cal.minYear){date.setFullYear(year);setMonth(11);}break;case 1:if(mon<11){setMonth(mon+1);}else if(year<cal.maxYear){date.setFullYear(year+1);setMonth(0);}break;case 2:if(year<cal.maxYear){date.setFullYear(year+1);}break;case 100:cal.setMondayFirst(!cal.mondayFirst);return;case 0:if((typeof cal.checkDisabled=="function")&&cal.checkDisabled(date)){return false;}break;}if(!date.equalsTo(cal.date)){cal.setDate(date);newdate=true;}}if(newdate){cal.callHandler();}if(closing){Calendar.removeClass(el,"hilite");cal.callCloseHandler();}};Calendar.prototype.create=function(_par){var parent=null;if(!_par){parent=document.getElementsByTagName("body")[0];this.isPopup=true;}else{parent=_par;this.isPopup=false;}this.date=this.dateStr?new Date(this.dateStr):new Date();var table=Calendar.createElement("table");this.table=table;table.cellSpacing=0;table.cellPadding=0;table.calendar=this;Calendar.addEvent(table,"mousedown",Calendar.tableMouseDown);var div=Calendar.createElement("div");this.element=div;div.className="calendar";if(this.isPopup){div.style.position="absolute";div.style.display="none";}div.appendChild(table);var thead=Calendar.createElement("thead",table);var cell=null;var row=null;var cal=this;var hh=function(text,cs,navtype){cell=Calendar.createElement("td",row);cell.colSpan=cs;cell.className="button";Calendar._add_evs(cell);cell.calendar=cal;cell.navtype=navtype;if(text.substr(0,1)!="&"){cell.appendChild(document.createTextNode(text));}else{cell.innerHTML=text;}return cell;};row=Calendar.createElement("tr",thead);var title_length=6;(this.isPopup)&&--title_length;(this.weekNumbers)&&++title_length;hh("-",1,100).ttip=Calendar._TT["TOGGLE"];this.title=hh("",title_length,300);this.title.className="title";if(this.isPopup){this.title.ttip=Calendar._TT["DRAG_TO_MOVE"];this.title.style.cursor="move";hh("&#x00d7;",1,200).ttip=Calendar._TT["CLOSE"];}row=Calendar.createElement("tr",thead);row.className="headrow";this._nav_py=hh("&#x00ab;",1,-2);this._nav_py.ttip=Calendar._TT["PREV_YEAR"];this._nav_pm=hh("&#x2039;",1,-1);this._nav_pm.ttip=Calendar._TT["PREV_MONTH"];this._nav_now=hh(Calendar._TT["TODAY"],this.weekNumbers?4:3,0);this._nav_now.ttip=Calendar._TT["GO_TODAY"];this._nav_nm=hh("&#x203a;",1,1);this._nav_nm.ttip=Calendar._TT["NEXT_MONTH"];this._nav_ny=hh("&#x00bb;",1,2);this._nav_ny.ttip=Calendar._TT["NEXT_YEAR"];row=Calendar.createElement("tr",thead);row.className="daynames";if(this.weekNumbers){cell=Calendar.createElement("td",row);cell.className="name wn";cell.appendChild(document.createTextNode(Calendar._TT["WK"]));}for(var i=7;i>0;--i){cell=Calendar.createElement("td",row);cell.appendChild(document.createTextNode(""));if(!i){cell.navtype=100;cell.calendar=this;Calendar._add_evs(cell);}}this.firstdayname=(this.weekNumbers)?row.firstChild.nextSibling:row.firstChild;this._displayWeekdays();var tbody=Calendar.createElement("tbody",table);this.tbody=tbody;for(i=6;i>0;--i){row=Calendar.createElement("tr",tbody);if(this.weekNumbers){cell=Calendar.createElement("td",row);cell.appendChild(document.createTextNode(""));}for(var j=7;j>0;--j){cell=Calendar.createElement("td",row);cell.appendChild(document.createTextNode(""));cell.calendar=this;Calendar._add_evs(cell);}}var tfoot=Calendar.createElement("tfoot",table);row=Calendar.createElement("tr",tfoot);row.className="footrow";cell=hh(Calendar._TT["SEL_DATE"],this.weekNumbers?8:7,300);cell.className="ttip";if(this.isPopup){cell.ttip=Calendar._TT["DRAG_TO_MOVE"];cell.style.cursor="move";}this.tooltips=cell;div=Calendar.createElement("div",this.element);this.monthsCombo=div;div.className="combo";for(i=0;i<Calendar._MN.length;++i){var mn=Calendar.createElement("div");mn.className="label";mn.month=i;mn.appendChild(document.createTextNode(Calendar._MN3[i]));div.appendChild(mn);}div=Calendar.createElement("div",this.element);this.yearsCombo=div;div.className="combo";for(i=12;i>0;--i){var yr=Calendar.createElement("div");yr.className="label";yr.appendChild(document.createTextNode(""));div.appendChild(yr);}this._init(this.mondayFirst,this.date);parent.appendChild(this.element);};Calendar._keyEvent=function(ev){if(!window.calendar){return false;}(Calendar.is_ie)&&(ev=window.event);var cal=window.calendar;var act=(Calendar.is_ie||ev.type=="keypress");if(ev.ctrlKey){switch(ev.keyCode){case 37:act&&Calendar.cellClick(cal._nav_pm);break;case 38:act&&Calendar.cellClick(cal._nav_py);break;case 39:act&&Calendar.cellClick(cal._nav_nm);break;case 40:act&&Calendar.cellClick(cal._nav_ny);break;default:return false;}}else switch(ev.keyCode){case 32:Calendar.cellClick(cal._nav_now);break;case 27:act&&cal.hide();break;case 37:case 38:case 39:case 40:if(act){var date=cal.date.getDate()-1;var el=cal.currentDateEl;var ne=null;var prev=(ev.keyCode==37)||(ev.keyCode==38);switch(ev.keyCode){case 37:(--date>=0)&&(ne=cal.ar_days[date]);break;case 38:date-=7;(date>=0)&&(ne=cal.ar_days[date]);break;case 39:(++date<cal.ar_days.length)&&(ne=cal.ar_days[date]);break;case 40:date+=7;(date<cal.ar_days.length)&&(ne=cal.ar_days[date]);break;}if(!ne){if(prev){Calendar.cellClick(cal._nav_pm);}else{Calendar.cellClick(cal._nav_nm);}date=(prev)?cal.date.getMonthDays():1;el=cal.currentDateEl;ne=cal.ar_days[date-1];}Calendar.removeClass(el,"selected");Calendar.addClass(ne,"selected");cal.date.setDate(ne.caldate);cal.callHandler();cal.currentDateEl=ne;}break;case 13:if(act){cal.callHandler();cal.hide();}break;default:return false;}return Calendar.stopEvent(ev);};Calendar.prototype._init=function(mondayFirst,date){var today=new Date();var year=date.getFullYear();if(year<this.minYear){year=this.minYear;date.setFullYear(year);}else if(year>this.maxYear){year=this.maxYear;date.setFullYear(year);}this.mondayFirst=mondayFirst;this.date=new Date(date);var month=date.getMonth();var mday=date.getDate();var no_days=date.getMonthDays();date.setDate(1);var wday=date.getDay();var MON=mondayFirst?1:0;var SAT=mondayFirst?5:6;var SUN=mondayFirst?6:0;if(mondayFirst){wday=(wday>0)?(wday-1):6;}var iday=1;var row=this.tbody.firstChild;var MN=Calendar._MN3[month];var hasToday=((today.getFullYear()==year)&&(today.getMonth()==month));var todayDate=today.getDate();var week_number=date.getWeekNumber();var ar_days=new Array();for(var i=0;i<6;++i){if(iday>no_days){row.className="emptyrow";row=row.nextSibling;continue;}var cell=row.firstChild;if(this.weekNumbers){cell.className="day wn";cell.firstChild.data=week_number;cell=cell.nextSibling;}++week_number;row.className="daysrow";for(var j=0;j<7;++j){cell.className="day";if((!i&&j<wday)||iday>no_days){cell.innerHTML="&nbsp;";cell.disabled=true;cell=cell.nextSibling;continue;}cell.disabled=false;cell.firstChild.data=iday;if(typeof this.checkDisabled=="function"){date.setDate(iday);if(this.checkDisabled(date)){cell.className+=" disabled";cell.disabled=true;}}if(!cell.disabled){ar_days[ar_days.length]=cell;cell.caldate=iday;cell.ttip="_";if(iday==mday){cell.className+=" selected";this.currentDateEl=cell;}if(hasToday&&(iday==todayDate)){cell.className+=" today";cell.ttip+=Calendar._TT["PART_TODAY"];}if(wday==SAT||wday==SUN){cell.className+=" weekend";}}++iday;((++wday)^ 7)||(wday=0);cell=cell.nextSibling;}row=row.nextSibling;}this.ar_days=ar_days;this.title.firstChild.data=Calendar._MN[month]+", "+year;};Calendar.prototype.setDate=function(date){if(!date.equalsTo(this.date)){this._init(this.mondayFirst,date);}};Calendar.prototype.refresh=function(){this._init(this.mondayFirst,this.date);};Calendar.prototype.setMondayFirst=function(mondayFirst){this._init(mondayFirst,this.date);this._displayWeekdays();};Calendar.prototype.setDisabledHandler=function(unaryFunction){this.checkDisabled=unaryFunction;};Calendar.prototype.setRange=function(a,z){this.minYear=a;this.maxYear=z;};Calendar.prototype.callHandler=function(){if(this.onSelected){this.onSelected(this,this.date.print(this.dateFormat));}};Calendar.prototype.callCloseHandler=function(){if(this.onClose){this.onClose(this);}this.hideShowCovered();};Calendar.prototype.destroy=function(){var el=this.element.parentNode;el.removeChild(this.element);Calendar._C=null;};Calendar.prototype.reparent=function(new_parent){var el=this.element;el.parentNode.removeChild(el);new_parent.appendChild(el);};Calendar._checkCalendar=function(ev){if(!window.calendar){return false;}var el=Calendar.is_ie?Calendar.getElement(ev):Calendar.getTargetElement(ev);for(;el!=null&&el!=calendar.element;el=el.parentNode);if(el==null){window.calendar.callCloseHandler();return Calendar.stopEvent(ev);}};Calendar.prototype.show=function(){var rows=this.table.getElementsByTagName("tr");for(var i=rows.length;i>0;){var row=rows[--i];Calendar.removeClass(row,"rowhilite");var cells=row.getElementsByTagName("td");for(var j=cells.length;j>0;){var cell=cells[--j];Calendar.removeClass(cell,"hilite");Calendar.removeClass(cell,"active");}}this.element.style.display="block";this.hidden=false;if(this.isPopup){window.calendar=this;Calendar.addEvent(document,"keydown",Calendar._keyEvent);Calendar.addEvent(document,"keypress",Calendar._keyEvent);Calendar.addEvent(document,"mousedown",Calendar._checkCalendar);}this.hideShowCovered();};Calendar.prototype.hide=function(){if(this.isPopup){Calendar.removeEvent(document,"keydown",Calendar._keyEvent);Calendar.removeEvent(document,"keypress",Calendar._keyEvent);Calendar.removeEvent(document,"mousedown",Calendar._checkCalendar);}this.element.style.display="none";this.hidden=true;this.hideShowCovered();};Calendar.prototype.showAt=function(x,y){var s=this.element.style;s.left=x+"px";s.top=y+"px";this.show();};Calendar.prototype.showAtElement=function(el,opts){var p=Calendar.getAbsolutePos(el);if(!opts||typeof opts!="string"){this.showAt(p.x,p.y+el.offsetHeight);return true;}this.show();var w=this.element.offsetWidth;var h=this.element.offsetHeight;this.hide();var valign=opts.substr(0,1);var halign="l";if(opts.length>1){halign=opts.substr(1,1);}switch(valign){case "T":p.y-=h;break;case "B":p.y+=el.offsetHeight;break;case "C":p.y+=(el.offsetHeight-h)/2;break;case "t":p.y+=el.offsetHeight-h;break;case "b":break;}switch(halign){case "L":p.x-=w;break;case "R":p.x+=el.offsetWidth;break;case "C":p.x+=(el.offsetWidth-w)/2;break;case "r":p.x+=el.offsetWidth-w;break;case "l":break;}this.showAt(p.x,p.y);};Calendar.prototype.setDateFormat=function(str){this.dateFormat=str;};Calendar.prototype.setTtDateFormat=function(str){this.ttDateFormat=str;};Calendar.prototype.parseDate=function(str,fmt){var y=0;var m=-1;var d=0;var a=str.split(/\W+/);if(!fmt){fmt=this.dateFormat;}var b=fmt.split(/\W+/);var i=0,j=0;for(i=0;i<a.length;++i){if(b[i]=="D"||b[i]=="DD"){continue;}if(b[i]=="d"||b[i]=="dd"){d=parseInt(a[i],10);}if(b[i]=="m"||b[i]=="mm"){m=parseInt(a[i],10)-1;}if((b[i]=="y")||(b[i]=="yy")){y=parseInt(a[i],10);(y<100)&&(y+=(y>29)?1900:2000);}if(b[i]=="M"||b[i]=="MM"){for(j=0;j<12;++j){if(Calendar._MN[j].substr(0,a[i].length).toLowerCase()==a[i].toLowerCase()){m=j;break;}}}}if(y!=0&&m!=-1&&d!=0){this.setDate(new Date(y,m,d));return;}y=0;m=-1;d=0;for(i=0;i<a.length;++i){if(a[i].search(/[a-zA-Z]+/)!=-1){var t=-1;for(j=0;j<12;++j){if(Calendar._MN[j].substr(0,a[i].length).toLowerCase()==a[i].toLowerCase()){t=j;break;}}if(t!=-1){if(m!=-1){d=m+1;}m=t;}}else if(parseInt(a[i],10)<=12&&m==-1){m=a[i]-1;}else if(parseInt(a[i],10)>31&&y==0){y=parseInt(a[i],10);(y<100)&&(y+=(y>29)?1900:2000);}else if(d==0){d=a[i];}}if(y==0){var today=new Date();y=today.getFullYear();}if(m!=-1&&d!=0){this.setDate(new Date(y,m,d));}};Calendar.prototype.hideShowCovered=function(){function getStyleProp(obj,style){var value=obj.style[style];if(!value){if(document.defaultView&&typeof(document.defaultView.getComputedStyle)=="function"){value=document.defaultView.getComputedStyle(obj,"").getPropertyValue(style);}else if(obj.currentStyle){value=obj.currentStyle[style];}else{value=obj.style[style];}}return value;};var tags=new Array("applet","iframe","select");var el=this.element;var p=Calendar.getAbsolutePos(el);var EX1=p.x;var EX2=el.offsetWidth+EX1;var EY1=p.y;var EY2=el.offsetHeight+EY1;for(var k=tags.length;k>0;){var ar=document.getElementsByTagName(tags[--k]);var cc=null;for(var i=ar.length;i>0;){cc=ar[--i];p=Calendar.getAbsolutePos(cc);var CX1=p.x;var CX2=cc.offsetWidth+CX1;var CY1=p.y;var CY2=cc.offsetHeight+CY1;if(this.hidden||(CX1>EX2)||(CX2<EX1)||(CY1>EY2)||(CY2<EY1)){if(!cc.__msh_save_visibility){cc.__msh_save_visibility=getStyleProp(cc,"visibility");}cc.style.visibility=cc.__msh_save_visibility;}else{if(!cc.__msh_save_visibility){cc.__msh_save_visibility=getStyleProp(cc,"visibility");}cc.style.visibility="hidden";}}}};Calendar.prototype._displayWeekdays=function(){var MON=this.mondayFirst?0:1;var SUN=this.mondayFirst?6:0;var SAT=this.mondayFirst?5:6;var cell=this.firstdayname;for(var i=0;i<7;++i){cell.className="day name";if(!i){cell.ttip=this.mondayFirst?Calendar._TT["SUN_FIRST"]:Calendar._TT["MON_FIRST"];cell.navtype=100;cell.calendar=this;Calendar._add_evs(cell);}if(i==SUN||i==SAT){Calendar.addClass(cell,"weekend");}cell.firstChild.data=Calendar._DN3[i+1-MON];cell=cell.nextSibling;}};Calendar.prototype._hideCombos=function(){this.monthsCombo.style.display="none";this.yearsCombo.style.display="none";};Calendar.prototype._dragStart=function(ev){if(this.dragging){return;}this.dragging=true;var posX;var posY;if(Calendar.is_ie){posY=window.event.clientY+document.body.scrollTop;posX=window.event.clientX+document.body.scrollLeft;}else{posY=ev.clientY+window.scrollY;posX=ev.clientX+window.scrollX;}var st=this.element.style;this.xOffs=posX-parseInt(st.left);this.yOffs=posY-parseInt(st.top);with(Calendar){addEvent(document,"mousemove",calDragIt);addEvent(document,"mouseover",stopEvent);addEvent(document,"mouseup",calDragEnd);}};Date._MD=new Array(31,28,31,30,31,30,31,31,30,31,30,31);Date.SECOND=1000;Date.MINUTE=60*Date.SECOND;Date.HOUR=60*Date.MINUTE;Date.DAY=24*Date.HOUR;Date.WEEK=7*Date.DAY;Date.prototype.getMonthDays=function(month){var year=this.getFullYear();if(typeof month=="undefined"){month=this.getMonth();}if(((0==(year%4))&&((0!=(year%100))||(0==(year%400))))&&month==1){return 29;}else{return Date._MD[month];}};Date.prototype.getWeekNumber=function(){var now=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0);var then=new Date(this.getFullYear(),0,1,0,0,0);var time=now-then;var day=then.getDay();(day>3)&&(day-=4)||(day+=3);return Math.round(((time/Date.DAY)+day)/7);};Date.prototype.equalsTo=function(date){return((this.getFullYear()==date.getFullYear())&&(this.getMonth()==date.getMonth())&&(this.getDate()==date.getDate()));};Date.prototype.print=function(frm){var str=new String(frm);var m=this.getMonth();var d=this.getDate();var y=this.getFullYear();var wn=this.getWeekNumber();var w=this.getDay();var s=new Array();s["d"]=d;s["dd"]=(d<10)?("0"+d):d;s["m"]=1+m;s["mm"]=(m<9)?("0"+(1+m)):(1+m);s["y"]=y;s["yy"]=new String(y).substr(2,2);s["w"]=wn;s["ww"]=(wn<10)?("0"+wn):wn;with(Calendar){s["D"]=_DN3[w];s["DD"]=_DN[w];s["M"]=_MN3[m];s["MM"]=_MN[m];}var re=/(.*)(\W|^)(d|dd|m|mm|y|yy|MM|M|DD|D|w|ww)(\W|$)(.*)/;while(re.exec(str)!=null){str=RegExp.$1+RegExp.$2+s[RegExp.$3]+RegExp.$4+RegExp.$5;}return str;};window.calendar=null;
\ No newline at end of file
+ Calendar=function(mondayFirst,dateStr,onSelected,onClose){this.activeDiv=null;this.currentDateEl=null;this.getDateStatus=null;this.timeout=null;this.onSelected=onSelected||null;this.onClose=onClose||null;this.dragging=false;this.hidden=false;this.minYear=1970;this.maxYear=2050;this.dateFormat=Calendar._TT["DEF_DATE_FORMAT"];this.ttDateFormat=Calendar._TT["TT_DATE_FORMAT"];this.isPopup=true;this.weekNumbers=true;this.mondayFirst=mondayFirst;this.dateStr=dateStr;this.ar_days=null;this.showsTime=false;this.time24=true;this.table=null;this.element=null;this.tbody=null;this.firstdayname=null;this.monthsCombo=null;this.yearsCombo=null;this.hilitedMonth=null;this.activeMonth=null;this.hilitedYear=null;this.activeYear=null;this.dateClicked=false;if(typeof Calendar._SDN=="undefined"){if(typeof Calendar._SDN_len=="undefined")Calendar._SDN_len=3;var ar=new Array();for(var i=8;i>0;){ar[--i]=Calendar._DN[i].substr(0,Calendar._SDN_len);}Calendar._SDN=ar;if(typeof Calendar._SMN_len=="undefined")Calendar._SMN_len=3;ar=new Array();for(var i=12;i>0;){ar[--i]=Calendar._MN[i].substr(0,Calendar._SMN_len);}Calendar._SMN=ar;}};Calendar._C=null;Calendar.is_ie=(/msie/i.test(navigator.userAgent)&&!/opera/i.test(navigator.userAgent));Calendar.is_opera=/opera/i.test(navigator.userAgent);Calendar.is_khtml=/Konqueror|Safari|KHTML/i.test(navigator.userAgent);Calendar.getAbsolutePos=function(el){var SL=0,ST=0;var is_div=/^div$/i.test(el.tagName);if(is_div&&el.scrollLeft)SL=el.scrollLeft;if(is_div&&el.scrollTop)ST=el.scrollTop;var r={x:el.offsetLeft-SL,y:el.offsetTop-ST};if(el.offsetParent){var tmp=Calendar.getAbsolutePos(el.offsetParent);r.x+=tmp.x;r.y+=tmp.y;}return r;};Calendar.isRelated=function(el,evt){var related=evt.relatedTarget;if(!related){var type=evt.type;if(type=="mouseover"){related=evt.fromElement;}else if(type=="mouseout"){related=evt.toElement;}}while(related){if(related==el){return true;}related=related.parentNode;}return false;};Calendar.removeClass=function(el,className){if(!(el&&el.className)){return;}var cls=el.className.split(" ");var ar=new Array();for(var i=cls.length;i>0;){if(cls[--i]!=className){ar[ar.length]=cls[i];}}el.className=ar.join(" ");};Calendar.addClass=function(el,className){Calendar.removeClass(el,className);el.className+=" "+className;};Calendar.getElement=function(ev){if(Calendar.is_ie){return window.event.srcElement;}else{return ev.currentTarget;}};Calendar.getTargetElement=function(ev){if(Calendar.is_ie){return window.event.srcElement;}else{return ev.target;}};Calendar.stopEvent=function(ev){ev||(ev=window.event);if(Calendar.is_ie){ev.cancelBubble=true;ev.returnValue=false;}else{ev.preventDefault();ev.stopPropagation();}return false;};Calendar.addEvent=function(el,evname,func){if(el.attachEvent){el.attachEvent("on"+evname,func);}else if(el.addEventListener){el.addEventListener(evname,func,true);}else{el["on"+evname]=func;}};Calendar.removeEvent=function(el,evname,func){if(el.detachEvent){el.detachEvent("on"+evname,func);}else if(el.removeEventListener){el.removeEventListener(evname,func,true);}else{el["on"+evname]=null;}};Calendar.createElement=function(type,parent){var el=null;if(document.createElementNS){el=document.createElementNS("http://www.w3.org/1999/xhtml",type);}else{el=document.createElement(type);}if(typeof parent!="undefined"){parent.appendChild(el);}return el;};Calendar._add_evs=function(el){with(Calendar){addEvent(el,"mouseover",dayMouseOver);addEvent(el,"mousedown",dayMouseDown);addEvent(el,"mouseout",dayMouseOut);if(is_ie){addEvent(el,"dblclick",dayMouseDblClick);el.setAttribute("unselectable",true);}}};Calendar.findMonth=function(el){if(typeof el.month!="undefined"){return el;}else if(typeof el.parentNode.month!="undefined"){return el.parentNode;}return null;};Calendar.findYear=function(el){if(typeof el.year!="undefined"){return el;}else if(typeof el.parentNode.year!="undefined"){return el.parentNode;}return null;};Calendar.showMonthsCombo=function(){var cal=Calendar._C;if(!cal){return false;}var cal=cal;var cd=cal.activeDiv;var mc=cal.monthsCombo;if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}if(cal.activeMonth){Calendar.removeClass(cal.activeMonth,"active");}var mon=cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];Calendar.addClass(mon,"active");cal.activeMonth=mon;var s=mc.style;s.display="block";if(cd.navtype<0)s.left=cd.offsetLeft+"px";else s.left=(cd.offsetLeft+cd.offsetWidth-mc.offsetWidth)+"px";s.top=(cd.offsetTop+cd.offsetHeight)+"px";};Calendar.showYearsCombo=function(fwd){var cal=Calendar._C;if(!cal){return false;}var cal=cal;var cd=cal.activeDiv;var yc=cal.yearsCombo;if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}if(cal.activeYear){Calendar.removeClass(cal.activeYear,"active");}cal.activeYear=null;var Y=cal.date.getFullYear()+(fwd?1:-1);var yr=yc.firstChild;var show=false;for(var i=12;i>0;--i){if(Y>=cal.minYear&&Y<=cal.maxYear){yr.firstChild.data=Y;yr.year=Y;yr.style.display="block";show=true;}else{yr.style.display="none";}yr=yr.nextSibling;Y+=fwd?2:-2;}if(show){var s=yc.style;s.display="block";if(cd.navtype<0)s.left=cd.offsetLeft+"px";else s.left=(cd.offsetLeft+cd.offsetWidth-yc.offsetWidth)+"px";s.top=(cd.offsetTop+cd.offsetHeight)+"px";}};Calendar.tableMouseUp=function(ev){var cal=Calendar._C;if(!cal){return false;}if(cal.timeout){clearTimeout(cal.timeout);}var el=cal.activeDiv;if(!el){return false;}var target=Calendar.getTargetElement(ev);ev||(ev=window.event);Calendar.removeClass(el,"active");if(target==el||target.parentNode==el){Calendar.cellClick(el,ev);}var mon=Calendar.findMonth(target);var date=null;if(mon){date=new Date(cal.date);if(mon.month!=date.getMonth()){date.setMonth(mon.month);cal.setDate(date);cal.dateClicked=false;cal.callHandler();}}else{var year=Calendar.findYear(target);if(year){date=new Date(cal.date);if(year.year!=date.getFullYear()){date.setFullYear(year.year);cal.setDate(date);cal.dateClicked=false;cal.callHandler();}}}with(Calendar){removeEvent(document,"mouseup",tableMouseUp);removeEvent(document,"mouseover",tableMouseOver);removeEvent(document,"mousemove",tableMouseOver);cal._hideCombos();_C=null;return stopEvent(ev);}};Calendar.tableMouseOver=function(ev){var cal=Calendar._C;if(!cal){return;}var el=cal.activeDiv;var target=Calendar.getTargetElement(ev);if(target==el||target.parentNode==el){Calendar.addClass(el,"hilite active");Calendar.addClass(el.parentNode,"rowhilite");}else{if(typeof el.navtype=="undefined"||(el.navtype!=50&&(el.navtype==0||Math.abs(el.navtype)>2)))Calendar.removeClass(el,"active");Calendar.removeClass(el,"hilite");Calendar.removeClass(el.parentNode,"rowhilite");}ev||(ev=window.event);if(el.navtype==50&&target!=el){var pos=Calendar.getAbsolutePos(el);var w=el.offsetWidth;var x=ev.clientX;var dx;var decrease=true;if(x>pos.x+w){dx=x-pos.x-w;decrease=false;}else dx=pos.x-x;if(dx<0)dx=0;var range=el._range;var current=el._current;var count=Math.floor(dx/10)%range.length;for(var i=range.length;--i>=0;)if(range[i]==current)break;while(count-->0)if(decrease){if(!(--i in range))i=range.length-1;}else if(!(++i in range))i=0;var newval=range[i];el.firstChild.data=newval;cal.onUpdateTime();}var mon=Calendar.findMonth(target);if(mon){if(mon.month!=cal.date.getMonth()){if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}Calendar.addClass(mon,"hilite");cal.hilitedMonth=mon;}else if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}}else{if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}var year=Calendar.findYear(target);if(year){if(year.year!=cal.date.getFullYear()){if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}Calendar.addClass(year,"hilite");cal.hilitedYear=year;}else if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}}else if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}}return Calendar.stopEvent(ev);};Calendar.tableMouseDown=function(ev){if(Calendar.getTargetElement(ev)==Calendar.getElement(ev)){return Calendar.stopEvent(ev);}};Calendar.calDragIt=function(ev){var cal=Calendar._C;if(!(cal&&cal.dragging)){return false;}var posX;var posY;if(Calendar.is_ie){posY=window.event.clientY+document.body.scrollTop;posX=window.event.clientX+document.body.scrollLeft;}else{posX=ev.pageX;posY=ev.pageY;}cal.hideShowCovered();var st=cal.element.style;st.left=(posX-cal.xOffs)+"px";st.top=(posY-cal.yOffs)+"px";return Calendar.stopEvent(ev);};Calendar.calDragEnd=function(ev){var cal=Calendar._C;if(!cal){return false;}cal.dragging=false;with(Calendar){removeEvent(document,"mousemove",calDragIt);removeEvent(document,"mouseover",stopEvent);removeEvent(document,"mouseup",calDragEnd);tableMouseUp(ev);}cal.hideShowCovered();};Calendar.dayMouseDown=function(ev){var el=Calendar.getElement(ev);if(el.disabled){return false;}var cal=el.calendar;cal.activeDiv=el;Calendar._C=cal;if(el.navtype!=300)with(Calendar){if(el.navtype==50)el._current=el.firstChild.data;addClass(el,"hilite active");addEvent(document,"mouseover",tableMouseOver);addEvent(document,"mousemove",tableMouseOver);addEvent(document,"mouseup",tableMouseUp);}else if(cal.isPopup){cal._dragStart(ev);}if(el.navtype==-1||el.navtype==1){if(cal.timeout)clearTimeout(cal.timeout);cal.timeout=setTimeout("Calendar.showMonthsCombo()",250);}else if(el.navtype==-2||el.navtype==2){if(cal.timeout)clearTimeout(cal.timeout);cal.timeout=setTimeout((el.navtype>0)?"Calendar.showYearsCombo(true)":"Calendar.showYearsCombo(false)",250);}else{cal.timeout=null;}return Calendar.stopEvent(ev);};Calendar.dayMouseDblClick=function(ev){Calendar.cellClick(Calendar.getElement(ev),ev||window.event);if(Calendar.is_ie){document.selection.empty();}};Calendar.dayMouseOver=function(ev){var el=Calendar.getElement(ev);if(Calendar.isRelated(el,ev)||Calendar._C||el.disabled){return false;}if(el.ttip){if(el.ttip.substr(0,1)=="_"){var date=null;with(el.calendar.date){date=new Date(getFullYear(),getMonth(),el.caldate);}el.ttip=date.print(el.calendar.ttDateFormat)+el.ttip.substr(1);}el.calendar.tooltips.firstChild.data=el.ttip;}if(el.navtype!=300){Calendar.addClass(el,"hilite");if(el.caldate){Calendar.addClass(el.parentNode,"rowhilite");}}return Calendar.stopEvent(ev);};Calendar.dayMouseOut=function(ev){with(Calendar){var el=getElement(ev);if(isRelated(el,ev)||_C||el.disabled){return false;}removeClass(el,"hilite");if(el.caldate){removeClass(el.parentNode,"rowhilite");}el.calendar.tooltips.firstChild.data=_TT["SEL_DATE"];return stopEvent(ev);}};Calendar.cellClick=function(el,ev){var cal=el.calendar;var closing=false;var newdate=false;var date=null;if(typeof el.navtype=="undefined"){Calendar.removeClass(cal.currentDateEl,"selected");Calendar.addClass(el,"selected");closing=(cal.currentDateEl==el);if(!closing){cal.currentDateEl=el;}cal.date.setDate(el.caldate);date=cal.date;newdate=true;cal.dateClicked=true;}else{if(el.navtype==200){Calendar.removeClass(el,"hilite");cal.callCloseHandler();return;}date=(el.navtype==0)?new Date():new Date(cal.date);cal.dateClicked=false;var year=date.getFullYear();var mon=date.getMonth();function setMonth(m){var day=date.getDate();var max=date.getMonthDays(m);if(day>max){date.setDate(max);}date.setMonth(m);};switch(el.navtype){case 400:Calendar.removeClass(el,"hilite");var text=Calendar._TT["ABOUT"];if(typeof text!="undefined"){text+=cal.showsTime?Calendar._TT["ABOUT_TIME"]:"";}else{text="Help and about box text is not translated into this language.\n"+"If you know this language and you feel generous please update\n"+"the corresponding file in \"lang\" subdir to match calendar-en.js\n"+"and send it back to <mishoo@infoiasi.ro> to get it into the distribution  ;-)\n\n"+"Thank you!\n"+"http://dynarch.com/mishoo/calendar.epl\n";}alert(text);return;case-2:if(year>cal.minYear){date.setFullYear(year-1);}break;case-1:if(mon>0){setMonth(mon-1);}else if(year-->cal.minYear){date.setFullYear(year);setMonth(11);}break;case 1:if(mon<11){setMonth(mon+1);}else if(year<cal.maxYear){date.setFullYear(year+1);setMonth(0);}break;case 2:if(year<cal.maxYear){date.setFullYear(year+1);}break;case 100:cal.setMondayFirst(!cal.mondayFirst);return;case 50:var range=el._range;var current=el.firstChild.data;for(var i=range.length;--i>=0;)if(range[i]==current)break;if(ev&&ev.shiftKey){if(!(--i in range))i=range.length-1;}else if(!(++i in range))i=0;var newval=range[i];el.firstChild.data=newval;cal.onUpdateTime();return;case 0:if((typeof cal.getDateStatus=="function")&&cal.getDateStatus(date,date.getFullYear(),date.getMonth(),date.getDate())){return false;}break;}if(!date.equalsTo(cal.date)){cal.setDate(date);newdate=true;}}if(newdate){cal.callHandler();}if(closing){Calendar.removeClass(el,"hilite");cal.callCloseHandler();}};Calendar.prototype.create=function(_par){var parent=null;if(!_par){parent=document.getElementsByTagName("body")[0];this.isPopup=true;}else{parent=_par;this.isPopup=false;}this.date=this.dateStr?new Date(this.dateStr):new Date();var table=Calendar.createElement("table");this.table=table;table.cellSpacing=0;table.cellPadding=0;table.calendar=this;Calendar.addEvent(table,"mousedown",Calendar.tableMouseDown);var div=Calendar.createElement("div");this.element=div;div.className="calendar";if(this.isPopup){div.style.position="absolute";div.style.display="none";}div.appendChild(table);var thead=Calendar.createElement("thead",table);var cell=null;var row=null;var cal=this;var hh=function(text,cs,navtype){cell=Calendar.createElement("td",row);cell.colSpan=cs;cell.className="button";if(navtype!=0&&Math.abs(navtype)<=2)cell.className+=" nav";Calendar._add_evs(cell);cell.calendar=cal;cell.navtype=navtype;if(text.substr(0,1)!="&"){cell.appendChild(document.createTextNode(text));}else{cell.innerHTML=text;}return cell;};row=Calendar.createElement("tr",thead);var title_length=6;(this.isPopup)&&--title_length;(this.weekNumbers)&&++title_length;hh("?",1,400).ttip=Calendar._TT["INFO"];this.title=hh("",title_length,300);this.title.className="title";if(this.isPopup){this.title.ttip=Calendar._TT["DRAG_TO_MOVE"];this.title.style.cursor="move";hh("&#x00d7;",1,200).ttip=Calendar._TT["CLOSE"];}row=Calendar.createElement("tr",thead);row.className="headrow";this._nav_py=hh("&#x00ab;",1,-2);this._nav_py.ttip=Calendar._TT["PREV_YEAR"];this._nav_pm=hh("&#x2039;",1,-1);this._nav_pm.ttip=Calendar._TT["PREV_MONTH"];this._nav_now=hh(Calendar._TT["TODAY"],this.weekNumbers?4:3,0);this._nav_now.ttip=Calendar._TT["GO_TODAY"];this._nav_nm=hh("&#x203a;",1,1);this._nav_nm.ttip=Calendar._TT["NEXT_MONTH"];this._nav_ny=hh("&#x00bb;",1,2);this._nav_ny.ttip=Calendar._TT["NEXT_YEAR"];row=Calendar.createElement("tr",thead);row.className="daynames";if(this.weekNumbers){cell=Calendar.createElement("td",row);cell.className="name wn";cell.appendChild(document.createTextNode(Calendar._TT["WK"]));}for(var i=7;i>0;--i){cell=Calendar.createElement("td",row);cell.appendChild(document.createTextNode(""));if(!i){cell.navtype=100;cell.calendar=this;Calendar._add_evs(cell);}}this.firstdayname=(this.weekNumbers)?row.firstChild.nextSibling:row.firstChild;this._displayWeekdays();var tbody=Calendar.createElement("tbody",table);this.tbody=tbody;for(i=6;i>0;--i){row=Calendar.createElement("tr",tbody);if(this.weekNumbers){cell=Calendar.createElement("td",row);cell.appendChild(document.createTextNode(""));}for(var j=7;j>0;--j){cell=Calendar.createElement("td",row);cell.appendChild(document.createTextNode(""));cell.calendar=this;Calendar._add_evs(cell);}}if(this.showsTime){row=Calendar.createElement("tr",tbody);row.className="time";cell=Calendar.createElement("td",row);cell.className="time";cell.colSpan=2;cell.innerHTML="&nbsp;";cell=Calendar.createElement("td",row);cell.className="time";cell.colSpan=this.weekNumbers?4:3;(function(){function makeTimePart(className,init,range_start,range_end){var part=Calendar.createElement("span",cell);part.className=className;part.appendChild(document.createTextNode(init));part.calendar=cal;part.ttip=Calendar._TT["TIME_PART"];part.navtype=50;part._range=[];if(typeof range_start!="number")part._range=range_start;else{for(var i=range_start;i<=range_end;++i){var txt;if(i<10&&range_end>=10)txt='0'+i;else txt=''+i;part._range[part._range.length]=txt;}}Calendar._add_evs(part);return part;};var hrs=cal.date.getHours();var mins=cal.date.getMinutes();var t12=!cal.time24;var pm=(hrs>12);if(t12&&pm)hrs-=12;var H=makeTimePart("hour",hrs,t12?1:0,t12?12:23);var span=Calendar.createElement("span",cell);span.appendChild(document.createTextNode(":"));span.className="colon";var M=makeTimePart("minute",mins,0,59);var AP=null;cell=Calendar.createElement("td",row);cell.className="time";cell.colSpan=2;if(t12)AP=makeTimePart("ampm",pm?"pm":"am",["am","pm"]);else cell.innerHTML="&nbsp;";cal.onSetTime=function(){var hrs=this.date.getHours();var mins=this.date.getMinutes();var pm=(hrs>12);if(pm&&t12)hrs-=12;H.firstChild.data=(hrs<10)?("0"+hrs):hrs;M.firstChild.data=(mins<10)?("0"+mins):mins;if(t12)AP.firstChild.data=pm?"pm":"am";};cal.onUpdateTime=function(){var date=this.date;var h=parseInt(H.firstChild.data,10);if(t12){if(/pm/i.test(AP.firstChild.data)&&h<12)h+=12;else if(/am/i.test(AP.firstChild.data)&&h==12)h=0;}var d=date.getDate();var m=date.getMonth();var y=date.getFullYear();date.setHours(h);date.setMinutes(parseInt(M.firstChild.data,10));date.setFullYear(y);date.setMonth(m);date.setDate(d);this.dateClicked=false;this.callHandler();};})();}else{this.onSetTime=this.onUpdateTime=function(){};}var tfoot=Calendar.createElement("tfoot",table);row=Calendar.createElement("tr",tfoot);row.className="footrow";cell=hh(Calendar._TT["SEL_DATE"],this.weekNumbers?8:7,300);cell.className="ttip";if(this.isPopup){cell.ttip=Calendar._TT["DRAG_TO_MOVE"];cell.style.cursor="move";}this.tooltips=cell;div=Calendar.createElement("div",this.element);this.monthsCombo=div;div.className="combo";for(i=0;i<Calendar._MN.length;++i){var mn=Calendar.createElement("div");mn.className=Calendar.is_ie?"label-IEfix":"label";mn.month=i;mn.appendChild(document.createTextNode(Calendar._SMN[i]));div.appendChild(mn);}div=Calendar.createElement("div",this.element);this.yearsCombo=div;div.className="combo";for(i=12;i>0;--i){var yr=Calendar.createElement("div");yr.className=Calendar.is_ie?"label-IEfix":"label";yr.appendChild(document.createTextNode(""));div.appendChild(yr);}this._init(this.mondayFirst,this.date);parent.appendChild(this.element);};Calendar._keyEvent=function(ev){if(!window.calendar){return false;}(Calendar.is_ie)&&(ev=window.event);var cal=window.calendar;var act=(Calendar.is_ie||ev.type=="keypress");if(ev.ctrlKey){switch(ev.keyCode){case 37:act&&Calendar.cellClick(cal._nav_pm);break;case 38:act&&Calendar.cellClick(cal._nav_py);break;case 39:act&&Calendar.cellClick(cal._nav_nm);break;case 40:act&&Calendar.cellClick(cal._nav_ny);break;default:return false;}}else switch(ev.keyCode){case 32:Calendar.cellClick(cal._nav_now);break;case 27:act&&cal.hide();break;case 37:case 38:case 39:case 40:if(act){var date=cal.date.getDate()-1;var el=cal.currentDateEl;var ne=null;var prev=(ev.keyCode==37)||(ev.keyCode==38);switch(ev.keyCode){case 37:(--date>=0)&&(ne=cal.ar_days[date]);break;case 38:date-=7;(date>=0)&&(ne=cal.ar_days[date]);break;case 39:(++date<cal.ar_days.length)&&(ne=cal.ar_days[date]);break;case 40:date+=7;(date<cal.ar_days.length)&&(ne=cal.ar_days[date]);break;}if(!ne){if(prev){Calendar.cellClick(cal._nav_pm);}else{Calendar.cellClick(cal._nav_nm);}date=(prev)?cal.date.getMonthDays():1;el=cal.currentDateEl;ne=cal.ar_days[date-1];}Calendar.removeClass(el,"selected");Calendar.addClass(ne,"selected");cal.date.setDate(ne.caldate);cal.callHandler();cal.currentDateEl=ne;}break;case 13:if(act){cal.callHandler();cal.hide();}break;default:return false;}return Calendar.stopEvent(ev);};Calendar.prototype._init=function(mondayFirst,date){var today=new Date();var year=date.getFullYear();if(year<this.minYear){year=this.minYear;date.setFullYear(year);}else if(year>this.maxYear){year=this.maxYear;date.setFullYear(year);}this.mondayFirst=mondayFirst;this.date=new Date(date);var month=date.getMonth();var mday=date.getDate();var no_days=date.getMonthDays();date.setDate(1);var wday=date.getDay();var MON=mondayFirst?1:0;var SAT=mondayFirst?5:6;var SUN=mondayFirst?6:0;if(mondayFirst){wday=(wday>0)?(wday-1):6;}var iday=1;var row=this.tbody.firstChild;var MN=Calendar._SMN[month];var hasToday=((today.getFullYear()==year)&&(today.getMonth()==month));var todayDate=today.getDate();var week_number=date.getWeekNumber();var ar_days=new Array();for(var i=0;i<6;++i){if(iday>no_days){row.className="emptyrow";row=row.nextSibling;continue;}var cell=row.firstChild;if(this.weekNumbers){cell.className="day wn";cell.firstChild.data=week_number;cell=cell.nextSibling;}++week_number;row.className="daysrow";for(var j=0;j<7;++j){cell.className="day";if((!i&&j<wday)||iday>no_days){cell.innerHTML="&nbsp;";cell.disabled=true;cell=cell.nextSibling;continue;}cell.disabled=false;cell.firstChild.data=iday;if(typeof this.getDateStatus=="function"){date.setDate(iday);var status=this.getDateStatus(date,year,month,iday);if(status===true){cell.className+=" disabled";cell.disabled=true;}else{if(/disabled/i.test(status))cell.disabled=true;cell.className+=" "+status;}}if(!cell.disabled){ar_days[ar_days.length]=cell;cell.caldate=iday;cell.ttip="_";if(iday==mday){cell.className+=" selected";this.currentDateEl=cell;}if(hasToday&&(iday==todayDate)){cell.className+=" today";cell.ttip+=Calendar._TT["PART_TODAY"];}if(wday==SAT||wday==SUN){cell.className+=" weekend";}}++iday;((++wday)^ 7)||(wday=0);cell=cell.nextSibling;}row=row.nextSibling;}this.ar_days=ar_days;this.title.firstChild.data=Calendar._MN[month]+", "+year;this.onSetTime();};Calendar.prototype.setDate=function(date){if(!date.equalsTo(this.date)){this._init(this.mondayFirst,date);}};Calendar.prototype.refresh=function(){this._init(this.mondayFirst,this.date);};Calendar.prototype.setMondayFirst=function(mondayFirst){this._init(mondayFirst,this.date);this._displayWeekdays();};Calendar.prototype.setDateStatusHandler=Calendar.prototype.setDisabledHandler=function(unaryFunction){this.getDateStatus=unaryFunction;};Calendar.prototype.setRange=function(a,z){this.minYear=a;this.maxYear=z;};Calendar.prototype.callHandler=function(){if(this.onSelected){this.onSelected(this,this.date.print(this.dateFormat));}};Calendar.prototype.callCloseHandler=function(){if(this.onClose){this.onClose(this);}this.hideShowCovered();};Calendar.prototype.destroy=function(){var el=this.element.parentNode;el.removeChild(this.element);Calendar._C=null;window.calendar=null;};Calendar.prototype.reparent=function(new_parent){var el=this.element;el.parentNode.removeChild(el);new_parent.appendChild(el);};Calendar._checkCalendar=function(ev){if(!window.calendar){return false;}var el=Calendar.is_ie?Calendar.getElement(ev):Calendar.getTargetElement(ev);for(;el!=null&&el!=calendar.element;el=el.parentNode);if(el==null){window.calendar.callCloseHandler();return Calendar.stopEvent(ev);}};Calendar.prototype.show=function(){var rows=this.table.getElementsByTagName("tr");for(var i=rows.length;i>0;){var row=rows[--i];Calendar.removeClass(row,"rowhilite");var cells=row.getElementsByTagName("td");for(var j=cells.length;j>0;){var cell=cells[--j];Calendar.removeClass(cell,"hilite");Calendar.removeClass(cell,"active");}}this.element.style.display="block";this.hidden=false;if(this.isPopup){window.calendar=this;Calendar.addEvent(document,"keydown",Calendar._keyEvent);Calendar.addEvent(document,"keypress",Calendar._keyEvent);Calendar.addEvent(document,"mousedown",Calendar._checkCalendar);}this.hideShowCovered();};Calendar.prototype.hide=function(){if(this.isPopup){Calendar.removeEvent(document,"keydown",Calendar._keyEvent);Calendar.removeEvent(document,"keypress",Calendar._keyEvent);Calendar.removeEvent(document,"mousedown",Calendar._checkCalendar);}this.element.style.display="none";this.hidden=true;this.hideShowCovered();};Calendar.prototype.showAt=function(x,y){var s=this.element.style;s.left=x+"px";s.top=y+"px";this.show();};Calendar.prototype.showAtElement=function(el,opts){var self=this;var p=Calendar.getAbsolutePos(el);if(!opts||typeof opts!="string"){this.showAt(p.x,p.y+el.offsetHeight);return true;}this.element.style.display="block";Calendar.continuation_for_the_fucking_khtml_browser=function(){var w=self.element.offsetWidth;var h=self.element.offsetHeight;self.element.style.display="none";var valign=opts.substr(0,1);var halign="l";if(opts.length>1){halign=opts.substr(1,1);}switch(valign){case "T":p.y-=h;break;case "B":p.y+=el.offsetHeight;break;case "C":p.y+=(el.offsetHeight-h)/2;break;case "t":p.y+=el.offsetHeight-h;break;case "b":break;}switch(halign){case "L":p.x-=w;break;case "R":p.x+=el.offsetWidth;break;case "C":p.x+=(el.offsetWidth-w)/2;break;case "r":p.x+=el.offsetWidth-w;break;case "l":break;}self.showAt(p.x,p.y);};if(Calendar.is_khtml)setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()",10);else Calendar.continuation_for_the_fucking_khtml_browser();};Calendar.prototype.setDateFormat=function(str){this.dateFormat=str;};Calendar.prototype.setTtDateFormat=function(str){this.ttDateFormat=str;};Calendar.prototype.parseDate=function(str,fmt){var y=0;var m=-1;var d=0;var a=str.split(/\W+/);if(!fmt){fmt=this.dateFormat;}var b=[];fmt.replace(/(%.)/g,function(str,par){return b[b.length]=par;});var i=0,j=0;var hr=0;var min=0;for(i=0;i<a.length;++i){if(b[i]=="%a"||b[i]=="%A"){continue;}if(b[i]=="%d"||b[i]=="%e"){d=parseInt(a[i],10);}if(b[i]=="%m"){m=parseInt(a[i],10)-1;}if(b[i]=="%Y"||b[i]=="%y"){y=parseInt(a[i],10);(y<100)&&(y+=(y>29)?1900:2000);}if(b[i]=="%b"||b[i]=="%B"){for(j=0;j<12;++j){if(Calendar._MN[j].substr(0,a[i].length).toLowerCase()==a[i].toLowerCase()){m=j;break;}}}else if(/%[HIkl]/.test(b[i])){hr=parseInt(a[i],10);}else if(/%[pP]/.test(b[i])){if(/pm/i.test(a[i])&&hr<12)hr+=12;}else if(b[i]=="%M"){min=parseInt(a[i],10);}}if(y!=0&&m!=-1&&d!=0){this.setDate(new Date(y,m,d,hr,min,0));return;}y=0;m=-1;d=0;for(i=0;i<a.length;++i){if(a[i].search(/[a-zA-Z]+/)!=-1){var t=-1;for(j=0;j<12;++j){if(Calendar._MN[j].substr(0,a[i].length).toLowerCase()==a[i].toLowerCase()){t=j;break;}}if(t!=-1){if(m!=-1){d=m+1;}m=t;}}else if(parseInt(a[i],10)<=12&&m==-1){m=a[i]-1;}else if(parseInt(a[i],10)>31&&y==0){y=parseInt(a[i],10);(y<100)&&(y+=(y>29)?1900:2000);}else if(d==0){d=a[i];}}if(y==0){var today=new Date();y=today.getFullYear();}if(m!=-1&&d!=0){this.setDate(new Date(y,m,d,hr,min,0));}};Calendar.prototype.hideShowCovered=function(){var self=this;Calendar.continuation_for_the_fucking_khtml_browser=function(){function getVisib(obj){var value=obj.style.visibility;if(!value){if(document.defaultView&&typeof(document.defaultView.getComputedStyle)=="function"){if(!Calendar.is_khtml)value=document.defaultView. getComputedStyle(obj,"").getPropertyValue("visibility");else value='';}else if(obj.currentStyle){value=obj.currentStyle.visibility;}else value='';}return value;};var tags=new Array("applet","iframe","select");var el=self.element;var p=Calendar.getAbsolutePos(el);var EX1=p.x;var EX2=el.offsetWidth+EX1;var EY1=p.y;var EY2=el.offsetHeight+EY1;for(var k=tags.length;k>0;){var ar=document.getElementsByTagName(tags[--k]);var cc=null;for(var i=ar.length;i>0;){cc=ar[--i];p=Calendar.getAbsolutePos(cc);var CX1=p.x;var CX2=cc.offsetWidth+CX1;var CY1=p.y;var CY2=cc.offsetHeight+CY1;if(self.hidden||(CX1>EX2)||(CX2<EX1)||(CY1>EY2)||(CY2<EY1)){if(!cc.__msh_save_visibility){cc.__msh_save_visibility=getVisib(cc);}cc.style.visibility=cc.__msh_save_visibility;}else{if(!cc.__msh_save_visibility){cc.__msh_save_visibility=getVisib(cc);}cc.style.visibility="hidden";}}}};if(Calendar.is_khtml)setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()",10);else Calendar.continuation_for_the_fucking_khtml_browser();};Calendar.prototype._displayWeekdays=function(){var MON=this.mondayFirst?0:1;var SUN=this.mondayFirst?6:0;var SAT=this.mondayFirst?5:6;var cell=this.firstdayname;for(var i=0;i<7;++i){cell.className="day name";if(!i){cell.ttip=this.mondayFirst?Calendar._TT["SUN_FIRST"]:Calendar._TT["MON_FIRST"];cell.navtype=100;cell.calendar=this;Calendar._add_evs(cell);}if(i==SUN||i==SAT){Calendar.addClass(cell,"weekend");}cell.firstChild.data=Calendar._SDN[i+1-MON];cell=cell.nextSibling;}};Calendar.prototype._hideCombos=function(){this.monthsCombo.style.display="none";this.yearsCombo.style.display="none";};Calendar.prototype._dragStart=function(ev){if(this.dragging){return;}this.dragging=true;var posX;var posY;if(Calendar.is_ie){posY=window.event.clientY+document.body.scrollTop;posX=window.event.clientX+document.body.scrollLeft;}else{posY=ev.clientY+window.scrollY;posX=ev.clientX+window.scrollX;}var st=this.element.style;this.xOffs=posX-parseInt(st.left);this.yOffs=posY-parseInt(st.top);with(Calendar){addEvent(document,"mousemove",calDragIt);addEvent(document,"mouseover",stopEvent);addEvent(document,"mouseup",calDragEnd);}};Date._MD=new Array(31,28,31,30,31,30,31,31,30,31,30,31);Date.SECOND=1000;Date.MINUTE=60*Date.SECOND;Date.HOUR=60*Date.MINUTE;Date.DAY=24*Date.HOUR;Date.WEEK=7*Date.DAY;Date.prototype.getMonthDays=function(month){var year=this.getFullYear();if(typeof month=="undefined"){month=this.getMonth();}if(((0==(year%4))&&((0!=(year%100))||(0==(year%400))))&&month==1){return 29;}else{return Date._MD[month];}};Date.prototype.getDayOfYear=function(){var now=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0);var then=new Date(this.getFullYear(),0,1,0,0,0);var time=now-then;return Math.floor(time/Date.DAY);};Date.prototype.getWeekNumber=function(){var now=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0);var then=new Date(this.getFullYear(),0,1,0,0,0);var time=now-then;var day=then.getDay();if(day==0)day=7;(day>4)&&(day-=4)||(day+=3);return Math.round(((time/Date.DAY)+day)/7);};Date.prototype.equalsTo=function(date){return((this.getFullYear()==date.getFullYear())&&(this.getMonth()==date.getMonth())&&(this.getDate()==date.getDate())&&(this.getHours()==date.getHours())&&(this.getMinutes()==date.getMinutes()));};Date.prototype.print=function(str){var m=this.getMonth();var d=this.getDate();var y=this.getFullYear();var wn=this.getWeekNumber();var w=this.getDay();var s={};var hr=this.getHours();var pm=(hr>=12);var ir=(pm)?(hr-12):hr;var dy=this.getDayOfYear();if(ir==0)ir=12;var min=this.getMinutes();var sec=this.getSeconds();s["%a"]=Calendar._SDN[w];s["%A"]=Calendar._DN[w];s["%b"]=Calendar._SMN[m];s["%B"]=Calendar._MN[m];s["%C"]=1+Math.floor(y/100);s["%d"]=(d<10)?("0"+d):d;s["%e"]=d;s["%H"]=(hr<10)?("0"+hr):hr;s["%I"]=(ir<10)?("0"+ir):ir;s["%j"]=(dy<100)?((dy<10)?("00"+dy):("0"+dy)):dy;s["%k"]=hr;s["%l"]=ir;s["%m"]=(m<9)?("0"+(1+m)):(1+m);s["%M"]=(min<10)?("0"+min):min;s["%n"]="\n";s["%p"]=pm?"PM":"AM";s["%P"]=pm?"pm":"am";s["%s"]=Math.floor(this.getTime()/1000);s["%S"]=(sec<10)?("0"+sec):sec;s["%t"]="\t";s["%U"]=s["%W"]=s["%V"]=(wn<10)?("0"+wn):wn;s["%u"]=w+1;s["%w"]=w;s["%y"]=(''+y).substr(2,2);s["%Y"]=y;s["%%"]="%";var re=Date._msh_formatRegexp;if(typeof re=="undefined"){var tmp="";for(var i in s)tmp+=tmp?("|"+i):i;Date._msh_formatRegexp=re=new RegExp("("+tmp+")",'g');}return str.replace(re,function(match,par){return s[par];});};window.calendar=null;
\ No newline at end of file
-- 
cgit v1.2.1


From 4800ea73170e55c621ab9b6c1625c429799cafbf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 8 Nov 2003 12:59:17 +0000
Subject: pass paybatch field to realtime_bop so we can prevent double-charges

---
 FS/FS/ClientAPI/MyAccount.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 8d6f6e55a..6bb664dfe 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -203,7 +203,7 @@ sub process_payment {
   my $error = $cust_main->realtime_bop( 'CC', $p->{'amount'}, quiet=>1,
     'paydate' => $p->{'year'}. '-'. $p->{'month'}. '-01',
     map { $_ => $p->{$_} }
-      qw( payname address1 address2 city state zip payinfo )
+      qw( payname address1 address2 city state zip payinfo paybatch )
   );
   return { 'error' => $error } if $error;
 
-- 
cgit v1.2.1


From 8bf0686b09cde9eb2aa453420e3a7bcc4ada9f88 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 8 Nov 2003 16:31:49 +0000
Subject: documentation for self-service functions!

---
 fs_selfservice/FS-SelfService/SelfService.pm | 559 +++++++++++++++++++++++++--
 1 file changed, 536 insertions(+), 23 deletions(-)

diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index b2532be71..be6dd3a8a 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -27,6 +27,9 @@ $socket .= '.'.$tag if defined $tag && length($tag);
   'cancel'          => 'MyAccount/cancel',
   'payment_info'    => 'MyAccount/payment_info',
   'process_payment' => 'MyAccount/process_payment',
+  'list_pkgs'       => 'MyAccount/list_pkgs',
+  'order_pkg'       => 'MyAccount/order_pkg',
+  'cancel_pkg'      => 'MyAccount/cancel_pkg',
   'signup_info'     => 'Signup/signup_info',
   'new_customer'    => 'Signup/new_customer',
 );
@@ -42,29 +45,6 @@ $ENV{'BASH_ENV'} = '';
 my $freeside_uid = scalar(getpwnam('freeside'));
 die "not running as the freeside user\n" if $> != $freeside_uid;
 
-=head1 NAME
-
-FS::SelfService - Freeside self-service API
-
-=head1 SYNOPSIS
-
-=head1 DESCRIPTION
-
-Use this API to implement your own client "self-service" module.
-
-If you just want to customize the look of the existing "self-service" module,
-see XXXX instead.
-
-=head1 FUNCTIONS
-
-=over 4
-
-=item passwd
-
-Returns the empty value on success, or an error message on errors.
-
-=cut
-
 foreach my $autoload ( keys %autoload ) {
 
   my $eval =
@@ -105,6 +85,539 @@ sub simple_packet {
   $return;
 }
 
+=head1 NAME
+
+FS::SelfService - Freeside self-service API
+
+=head1 SYNOPSIS
+
+  # password and shell account changes
+  use FS::SelfService qw(passwd chfn chsh);
+
+  # "my account" functionality
+  use FS::SelfService qw( login customer_info invoice cancel payment_info process_payment );
+
+  my $rv = login( { 'username' => $username,
+                    'domain'   => $domain,
+                    'password' => $password,
+                  }
+                );
+
+  if ( $rv->{'error'} ) {
+    #handle login error...
+  } else {
+    #successful login
+    my $session_id = $rv->{'session_id'};
+  }
+
+  my $customer_info = customer_info( { 'session_id' => $session_id } );
+
+  #payment_info and process_payment are available in 1.5+ only
+  my $payment_info = payment_info) { 'session_id' => $session_id } );
+
+  #!!! process_payment example
+
+  #!!! list_pkgs example
+
+  #!!! order_pkg example
+
+  #!!! cancel_pkg example
+
+  # signup functionality
+  use FS::SelfService qw( signup_info new_customer );
+
+  my $signup_info = signup_info;
+
+  $rv = new_customer( {
+                        'first'            => $first,
+                        'last'             => $last,
+                        'company'          => $company,
+                        'address1'         => $address1,
+                        'address2'         => $address2,
+                        'city'             => $city,
+                        'state'            => $state,
+                        'zip'              => $zip,
+                        'country'          => $country,
+                        'daytime'          => $daytime,
+                        'night'            => $night,
+                        'fax'              => $fax,
+                        'payby'            => $payby,
+                        'payinfo'          => $payinfo,
+                        'paycvv'           => $paycvv,
+                        'paydate'          => $paydate,
+                        'payname'          => $payname,
+                        'invoicing_list'   => $invoicing_list,
+                        'referral_custnum' => $referral_custnum,
+                        'pkgpart'          => $pkgpart,
+                        'username'         => $username,
+                        '_password'        => $password,
+                        'popnum'           => $popnum,
+                        'agentnum'         => $agentnum,
+                      }
+                    );
+  
+  my $error = $rv->{'error'};
+  if ( $error eq '_decline' ) {
+    print_decline();
+  } elsif ( $error ) {
+    reprint_signup();
+  } else {
+    print_success();
+  }
+
+=head1 DESCRIPTION
+
+Use this API to implement your own client "self-service" module.
+
+If you just want to customize the look of the existing "self-service" module,
+see XXXX instead.
+
+=head1 PASSWORD, GECOS, SHELL CHANGING FUNCTIONS
+
+=over 4
+
+=item passwd
+
+=item chfn
+
+=item chsh
+
+=back
+
+=head1 "MY ACCOUNT" FUNCTIONS
+
+=over 4
+
+=item login HASHREF
+
+Creates a user session.  Takes a hash reference as parameter with the
+following keys:
+
+=over 4
+
+=item username
+
+=item domain
+
+=item password
+
+=back
+
+Returns a hash reference with the following keys:
+
+=over 4
+
+=item error
+
+Empty on success, or an error message on errors.
+
+=item session_id
+
+Session identifier for successful logins
+
+=back
+
+=item customer_info HASHREF
+
+Returns general customer information.
+
+Takes a hash reference as parameter with a single key: B<session_id>
+
+Returns a hash reference with the following keys:
+
+=over 4
+
+=item name
+
+Customer name
+
+=item balance
+
+Balance owed
+
+=item open
+
+Array reference of hash references of open inoices.  Each hash reference has
+the following keys: invnum, date, owed
+
+=item small_custview
+
+An HTML fragment containing shipping and billing addresses.
+
+=back
+
+=item invoice HASHREF
+
+Returns an invoice.  Takes a hash reference as parameter with two keys:
+session_id and invnum
+
+Returns a hash reference with the following keys:
+
+=over 4
+
+=item error
+
+Empty on success, or an error message on errors
+
+=item invnum
+
+Invoice number
+
+=item invoice_text
+
+Invoice text
+
+=back
+
+=item cancel HASHREF
+
+Cancels this customer.
+
+Takes a hash reference as parameter with a single key: B<session_id>
+
+Returns a hash reference with a single key, B<error>, which is empty on
+success or an error message on errors.
+
+=item payment_info HASHREF
+
+Returns information that may be useful in displaying a payment page.
+
+Takes a hash reference as parameter with a single key: B<session_id>.
+
+Returns a hash reference with the following keys:
+
+=over 4
+
+=item error
+
+Empty on success, or an error message on errors
+
+=item balance
+
+Balance owed
+
+=item payname
+
+Exact name on credit card (CARD/DCRD)
+
+=item address1
+
+=item address2
+
+=item city
+
+=item state
+
+=item zip
+
+=item payby
+
+Customer's current default payment type.
+
+=item card_type
+
+For CARD/DCRD payment types, the card type (Visa card, MasterCard, Discover card, American Express card, etc.)
+
+=item payinfo
+
+For CARD/DCRD payment types, the card number
+
+=item month
+
+For CARD/DCRD payment types, expiration month
+
+=item year
+
+For CARD/DCRD payment types, expiration year
+
+=item cust_main_county
+
+County/state/country data - array reference of hash references, each of which has the fields of a cust_main_county record (see L<FS::cust_main_county>).  Note these are not FS::cust_main_county objects, but hash references of columns and values.
+
+=item states
+
+Array reference of all states in the current default country.
+
+=item card_types
+
+Hash reference of card types; keys are card types, values are the exact strings
+passed to the process_payment function
+
+=item paybatch
+
+Unique transaction identifier (prevents multiple charges), passed to the
+process_payment function
+
+=back
+
+=item process_payment HASHREF
+
+Processes a payment and possible change of address or payment type.  Takes a
+hash reference as parameter with the following keys:
+
+=over 4
+
+=item session_id
+
+=item save
+
+If true, address and card information entered will be saved for subsequent
+transactions.
+
+=item auto
+
+If true, future credit card payments will be done automatically (sets payby to
+CARD).  If false, future credit card payments will be done on-demand (sets
+payby to DCRD).  This option only has meaning if B<save> is set true.  
+
+=item payname
+
+=item address1
+
+=item address2
+
+=item city
+
+=item state
+
+=item zip
+
+=item payinfo
+
+Card number
+
+=item month
+
+Card expiration month
+
+=item year
+
+Card expiration year
+
+=item paybatch
+
+Unique transaction identifier, returned from the payment_info function.
+Prevents multiple charges.
+
+=back
+
+Returns a hash reference with a single key, B<error>, empty on success, or an
+error message on errors
+
+=item list_pkgs
+
+Returns package information for this customer.
+
+Takes a hash reference as parameter with a single key: B<session_id>
+
+Returns a hash reference containing customer package information.  The hash reference contains the following keys:
+
+=over 4
+
+=item cust_pkg HASHREF
+
+Array reference of hash references, each of which has the fields of a cust_pkg record (see L<FS::cust_pkg>).  Note these are not FS::cust_pkg objects, but hash references of columns and values.
+
+=back
+
+=item order_pkg
+
+Orders a package for this customer.
+
+Takes a hash reference as parameter with the following keys:
+
+=over 4
+
+=item session_id
+
+=item pkgpart
+
+=item svcpart
+
+optional svcpart, required only if the package definition does not contain
+one svc_acct service definition with quantity 1 (it may contain others with
+quantity >1)
+
+=item username
+
+=item _password
+
+=item sec_phrase
+
+=item popnum
+
+=back
+
+Returns a hash reference with a single key, B<error>, empty on success, or an
+error message on errors.  The special error '_decline' is returned for
+declined transactions.
+
+=item cancel_pkg
+
+Cancels a package for this customer.
+
+Takes a hash reference as parameter with the following keys:
+
+=over 4
+
+=item session_id
+
+=item pkgpart
+
+=back
+
+Returns a hash reference with a single key, B<error>, empty on success, or an
+error message on errors.
+
+=back
+
+=head1 SIGNUP FUNCTIONS
+
+=over 4
+
+=item signup_info
+
+Returns a hash reference containing information that may be useful in
+displaying a signup page.  The hash reference contains the following keys:
+
+=over 4
+
+=item cust_main_county
+
+County/state/country data - array reference of hash references, each of which has the fields of a cust_main_county record (see L<FS::cust_main_county>).  Note these are not FS::cust_main_county objects, but hash references of columns and values.
+
+=item part_pkg
+
+Available packages - array reference of hash references, each of which has the fields of a part_pkg record (see L<FS::part_pkg>).  Each hash reference also has an additional 'payby' field containing an array reference of acceptable payment types specific to this package (see below and L<FS::part_pkg/payby>).  Note these are not FS::part_pkg objects, but hash references of columns and values.  Requires the 'signup_server-default_agentnum' configuration value to be set.
+
+=item agent
+
+Array reference of hash references, each of which has the fields of an agent record (see L<FS::agent>).  Note these are not FS::agent objects, but hash references of columns and values.
+
+=item agentnum2part_pkg
+
+Hash reference; keys are agentnums, values are array references of available packages for that agent, in the same format as the part_pkg arrayref above.
+
+=item svc_acct_pop
+
+Access numbers - array reference of hash references, each of which has the fields of an svc_acct_pop record (see L<FS::svc_acct_pop>).  Note these are not FS::svc_acct_pop objects, but hash references of columns and values.
+
+=item security_phrase
+
+True if the "security_phrase" feature is enabled
+
+=item payby
+
+Array reference of acceptable payment types for signup
+
+=over 4
+
+=item CARD (credit card - automatic)
+
+=item DCRD (credit card - on-demand - version 1.5+ only)
+
+=item CHEK (electronic check - automatic)
+
+=item DCHK (electronic check - on-demand - version 1.5+ only)
+
+=item LECB (Phone bill billing)
+
+=item BILL (billing, not recommended for signups)
+
+=item COMP (free, definately not recommended for signups)
+
+=item PREPAY (special billing type: applies a credit (see FS::prepay_credit) and sets billing type to BILL)
+
+=back
+
+=item cvv_enabled
+
+True if CVV features are available (1.5+ or 1.4.2 with CVV schema patch)
+
+=item msgcat
+
+Hash reference of message catalog values, to support error message customization.  Currently available keys are: passwords_dont_match, invalid_card, unknown_card_type, and not_a (as in "Not a Discover card").  Values are configured in the web interface under "View/Edit message catalog".
+
+=item statedefault
+
+Default state
+
+=item countrydefault
+
+Default country
+
+=back
+
+=item new_customer HASHREF
+
+Creates a new customer.  Takes a hash reference as parameter with the
+following keys:
+
+=over 4
+
+=item first - first name (required)
+
+=item last - last name (required)
+
+=item ss (not typically collected; mostly used for ACH transactions)
+
+=item company
+
+=item address1 (required)
+
+=item address2
+
+=item city (required)
+
+=item county
+
+=item state (required)
+
+=item zip (required)
+
+=item daytime - phone
+
+=item night - phone
+
+=item fax - phone
+
+=item payby - CARD, DCRD, CHEK, DCHK, LECB, BILL, COMP or PREPAY (see L</signup_info> (required)
+
+=item payinfo - Card number for CARD/DCRD, account_number@aba_number for CHEK/DCHK, prepaid "pin" for PREPAY, purchase order number for BILL
+
+=item paycvv - Credit card CVV2 number (1.5+ or 1.4.2 with CVV schema patch)
+
+=item paydate - Expiration date for CARD/DCRD
+
+=item payname - Exact name on credit card for CARD/DCRD, bank name for CHEK/DCHK
+
+=item invoicing_list - comma-separated list of email addresses for email invoices.  The special value 'POST' is used to designate postal invoicing (it may be specified alone or in addition to email addresses),
+
+=item referral_custnum - referring customer number
+
+=item pkgpart - pkgpart of initial package
+
+=item username
+
+=item _password
+
+=item sec_phrase - security phrase
+
+=item popnum - access number (index, not the literal number)
+
+=item agentnum - agent number
+
+=back
+
+Returns a hash reference with the following keys:
+
+=over 4
+
+=item error Empty on success, or an error message on errors.  The special error '_decline' is returned for declined transactions; other error messages should be suitable for display to the user (and are customizable in under Sysadmin | View/Edit message catalog)
+
+=back
+
+
 =back
 
 =head1 BUGS
-- 
cgit v1.2.1


From 7d64a6acdc011b65b495e9ee4288c86be28d6897 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 8 Nov 2003 16:36:48 +0000
Subject: add order_pkg and cancel_pkg functions to self-service

---
 FS/FS/ClientAPI/MyAccount.pm | 116 +++++++++++++++++++++++++++++++++++++++++++
 FS/FS/cust_main.pm           |  35 ++++++++++---
 2 files changed, 144 insertions(+), 7 deletions(-)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 6bb664dfe..c9a749424 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -14,6 +14,7 @@ use FS::svc_domain;
 use FS::cust_main;
 use FS::cust_bill;
 use FS::cust_main_county;
+use FS::cust_pkg;
 
 use FS::ClientAPI; #hmm
 FS::ClientAPI->register_handlers(
@@ -23,6 +24,9 @@ FS::ClientAPI->register_handlers(
   'MyAccount/cancel'           => \&cancel,
   'MyAccount/payment_info'     => \&payment_info,
   'MyAccount/process_payment'  => \&process_payment,
+  'MyAccount/list_pkgs'        => \&list_pkgs,
+  'MyAccount/order_pkg'        => \&order_pkg,
+  'MyAccount/cancel_pkg'       => \&cancel_pkg,
 );
 
 #store in db?
@@ -253,5 +257,117 @@ sub cancel {
 
 }
 
+sub list_pkgs {
+  my $p = shift;
+  my $session = $cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  my $custnum = $session->{'custnum'};
+
+  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+    or return { 'error' => "unknown custnum $custnum" };
+
+  return { 'cust_pkg' => [ map { $_->hashref } $cust_main->ncancelled_pkgs ] };
+
+}
+
+sub order_pkg {
+  my $p = shift;
+  my $session = $cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  my $custnum = $session->{'custnum'};
+
+  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+    or return { 'error' => "unknown custnum $custnum" };
+
+  #false laziness w/ClientAPI/Signup.pm
+
+  my $cust_pkg = new FS::cust_pkg ( {
+    'custnum' => $custnum,
+    'pkgpart' => $p->{'pkgpart'},
+  } );
+  my $error = $cust_pkg->check;
+  return { 'error' => $error } if $error;
+
+  my $svc_acct = new FS::svc_acct ( {
+    'svcpart'   => $p->{'svcpart'} || $cust_pkg->part_pkg->svcpart('svc_acct'),
+    map { $_ => $p->{$_} }
+      qw( username _password sec_phrase popnum ),
+  } );
+
+  my @acct_snarf;
+  my $snarfnum = 1;
+  while ( length($p->{"snarf_machine$snarfnum"}) ) {
+    my $acct_snarf = new FS::acct_snarf ( {
+      'machine'   => $p->{"snarf_machine$snarfnum"},
+      'protocol'  => $p->{"snarf_protocol$snarfnum"},
+      'username'  => $p->{"snarf_username$snarfnum"},
+      '_password' => $p->{"snarf_password$snarfnum"},
+    } );
+    $snarfnum++;
+    push @acct_snarf, $acct_snarf;
+  }
+  $svc_acct->child_objects( \@acct_snarf );
+
+  my $y = $svc_acct->setdefault; # arguably should be in new method
+  return { 'error' => $y } if $y && !ref($y);
+
+  $error = $svc_acct->check;
+  return { 'error' => $error } if $error;
+
+  use Tie::RefHash;
+  tie my %hash, 'Tie::RefHash';
+  %hash = ( $cust_pkg => [ $svc_acct ] );
+  #msgcat
+  $error = $cust_main->order_pkgs( \%hash, '', 'noexport' => 1 );
+  return { 'error' => $error } if $error;
+
+  my $conf = new FS::Conf;
+  if ( $conf->exists('signup_server-realtime') ) {
+
+    my $old_balance = $cust_main->balance;
+
+    my $bill_error = $cust_main->bill;
+    $cust_main->apply_payments;
+    $cust_main->apply_credits;
+    $bill_error = $cust_main->collect;
+
+    if ( $cust_main->balance > $old_balance ) {
+      $cust_pkg->cancel('quiet'=>1);
+      return { 'error' => '_decline' };
+    } else {
+      $cust_pkg->reexport;
+    }
+
+  } else {
+    $cust_pkg->reexport;
+  }
+
+  return { error => '' };
+
+}
+
+sub cancel_pkg {
+  my $p = shift;
+  my $session = $cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  my $custnum = $session->{'custnum'};
+
+  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+    or return { 'error' => "unknown custnum $custnum" };
+
+  my $pkgnum = $session->{'pkgnum'};
+
+  my $cust_pkg = qsearchs('cust_pkg', { 'custnum' => $custnum,
+                                        'pkgnum'  => $pkgnum,   } )
+    or return { 'error' => "unknown pkgnum $pkgnum" };
+
+  my $error = $cust_main->cancel( 'quiet'=>1 );
+  return { 'error' => $error };
+
+}
+
 1;
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 2c89bb065..8511e1a45 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -294,8 +294,8 @@ sub insert {
   }
 
   # packages
-  local $FS::svc_Common::noexport_hack = 1 if $options{'noexport'};
-  $error = $self->order_pkgs($cust_pkgs, \$seconds);
+  #local $FS::svc_Common::noexport_hack = 1 if $options{'noexport'};
+  $error = $self->order_pkgs($cust_pkgs, \$seconds, %options);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
@@ -329,9 +329,27 @@ sub insert {
 
 }
 
-=item order_pkgs
+=item order_pkgs HASHREF, [ , OPTION => VALUE ... ] ]
+
+Like the insert method on an existing record, this method orders a package
+and included services atomicaly.  Pass a Tie::RefHash data structure to this
+method containing FS::cust_pkg and FS::svc_I<tablename> objects.  There should
+be a better explanation of this, but until then, here's an example:
+
+  use Tie::RefHash;
+  tie %hash, 'Tie::RefHash'; #this part is important
+  %hash = (
+    $cust_pkg => [ $svc_acct ],
+    ...
+  );
+  $cust_main->order_pkgs( \%hash, 'noexport'=>1 );
+
+Currently available options are: I<noexport>
 
-document me.  like ->insert(%cust_pkg) on an existing record
+If I<noexport> is set true, no provisioning jobs (exports) are scheduled.
+(You can schedule them later with the B<reexport> method for each
+cust_pkg object.  Using the B<reexport> method on the cust_main object is not
+recommended, as existing services will also be reexported.)
 
 =cut
 
@@ -339,6 +357,7 @@ sub order_pkgs {
   my $self = shift;
   my $cust_pkgs = shift;
   my $seconds = shift;
+  my %options = @_;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -351,6 +370,8 @@ sub order_pkgs {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
+  local $FS::svc_Common::noexport_hack = 1 if $options{'noexport'};
+
   foreach my $cust_pkg ( keys %$cust_pkgs ) {
     $cust_pkg->custnum( $self->custnum );
     my $error = $cust_pkg->insert;
@@ -379,9 +400,9 @@ sub order_pkgs {
 
 =item reexport
 
-document me.  Re-schedules all exports by calling the B<reexport> method
-of all associated packages (see L<FS::cust_pkg>).  If there is an error,
-returns the error; otherwise returns false.
+Re-schedules all exports by calling the B<reexport> method of all associated
+packages (see L<FS::cust_pkg>).  If there is an error, returns the error;
+otherwise returns false.
 
 =cut
 
-- 
cgit v1.2.1


From 066c1665efce43307446207a33f876b0baefe1d6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 Nov 2003 13:54:21 +0000
Subject: hmm forgot to check this in?

---
 httemplate/misc/process/meta-import.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/misc/process/meta-import.cgi b/httemplate/misc/process/meta-import.cgi
index 2939c8fb2..59d236f64 100644
--- a/httemplate/misc/process/meta-import.cgi
+++ b/httemplate/misc/process/meta-import.cgi
@@ -116,8 +116,8 @@ function SafeOnsubmit() {
   #hashmaker widget
   sub hashmaker {
     my($name, $from, $to, $labelfrom, $labelto) = @_;
-    $fromsize = scalar(@$from);
-    $tosize = scalar(@$to);
+    my $fromsize = scalar(@$from);
+    my $tosize = scalar(@$to);
     "<TABLE><TR><TH>$labelfrom</TH><TH>$labelto</TH></TR><TR><TD>".
         qq!<SELECT NAME="${name}_from" SIZE=$fromsize>\n!.
         join("\n", map { qq!<OPTION VALUE="$_">$_</OPTION>! } sort { $a cmp $b } @$from ).
-- 
cgit v1.2.1


From 18356e277113c2237f296d3619b870b6879a2b6d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Nov 2003 07:51:17 +0000
Subject: part_referral.cgi

---
 httemplate/browse/part_referral.cgi | 4 ++--
 httemplate/browse/svc_acct_pop.cgi  | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index 37eb32991..270740cb8 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -44,9 +44,9 @@ foreach my $part_referral ( sort {
 } qsearch('part_referral',{}) ) {
 %>
       <TR>
-        <TD><A HREF="${p}edit/part_referral.cgi?$hashref->{refnum}">
+        <TD><A HREF="<%= $p %>edit/part_referral.cgi?<%= $hashref->{refnum} %>">
           <%= $part_referral->refnum %></A></TD>
-        <TD><A HREF="${p}edit/part_referral.cgi?$hashref->{refnum}">
+        <TD><A HREF="<%= $p %>edit/part_referral.cgi?<%= $hashref->{refnum} %>">
           <%= $part_referral->referral %></A></TD>
         <% for my $period ( values %past ) {
           $sth->execute($part_referral->refnum, $today-$period)
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index f77fe820b..44cda81ad 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -48,7 +48,9 @@ foreach my $svc_acct_pop ( sort {
           <%= $svc_acct_pop->loc %></A></TD>
         <TD>
           <FONT COLOR="#00CC00"><B><%= $num_accounts %></B></FONT>
-            <A HREF="<%= $svc_acct_link %>">active</A>
+            <% if ( $num_accounts ) { %><A HREF="<%= $svc_acct_link %>"><% } %>
+            active
+            <% if ( $num_accounts ) { %></A><% } %>
         </TD>
       </TR>
 <% } %>
-- 
cgit v1.2.1


From b82db29351ceec512b527f415d91b7b462172a85 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Nov 2003 08:01:23 +0000
Subject: remove spaces between parens and contact name

---
 httemplate/search/report_receivables.cgi | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index d0665164c..60abb12ab 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -97,9 +97,7 @@ END
 <% while ( my $row = $sth->fetchrow_hashref() ) { %>
   <TR>
     <TD><A HREF="<%= $p %>view/cust_main.cgi?<%= $row->{'custnum'} %>">
-        <%= $row->{'company'} ? $row->{'company'}. ' (' : '' %>
-        <%= $row->{'last'}. ', '. $row->{'first'} %>
-        <%= $row->{'company'} ? ')' : '' %></A>
+        <%= $row->{'company'} ? $row->{'company'}. ' (' : '' %><%= $row->{'last'}. ', '. $row->{'first'} %><%= $row->{'company'} ? ')' : '' %></A>
     </TD>
     <TD ALIGN="right">$<%= sprintf("%.2f", $row->{'owed_0_30'} ) %></TD>
     <TD ALIGN="right">$<%= sprintf("%.2f", $row->{'owed_30_60'} ) %></TD>
-- 
cgit v1.2.1


From 8cb3d9ff1a0d7e82b603e0ce15e4a62c182537c4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Nov 2003 08:35:43 +0000
Subject: really fix advertising source edit links

---
 httemplate/browse/part_referral.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index 270740cb8..69bb95aa5 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -44,9 +44,9 @@ foreach my $part_referral ( sort {
 } qsearch('part_referral',{}) ) {
 %>
       <TR>
-        <TD><A HREF="<%= $p %>edit/part_referral.cgi?<%= $hashref->{refnum} %>">
+        <TD><A HREF="<%= $p %>edit/part_referral.cgi?<%= $part_referral->refnum %>">
           <%= $part_referral->refnum %></A></TD>
-        <TD><A HREF="<%= $p %>edit/part_referral.cgi?<%= $hashref->{refnum} %>">
+        <TD><A HREF="<%= $p %>edit/part_referral.cgi?<%= $part_referral->refnum %>">
           <%= $part_referral->referral %></A></TD>
         <% for my $period ( values %past ) {
           $sth->execute($part_referral->refnum, $today-$period)
-- 
cgit v1.2.1


From 024ff792bac5bff12b02f08dbdba8134f82fe1dc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Nov 2003 14:21:02 +0000
Subject: simple change to cust_svc creation to help imports with svcnums

---
 FS/FS/svc_Common.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 7bc155d9d..73e08f239 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -119,9 +119,11 @@ sub insert {
 
   my $svcnum = $self->svcnum;
   my $cust_svc;
-  unless ( $svcnum ) {
+  #unless ( $svcnum ) {
+  if ( ! $svcnum || ! qsearchs('cust_svc',{'svcnum'=>$self->svcnum} ) ) {
     $cust_svc = new FS::cust_svc ( {
       #hua?# 'svcnum'  => $svcnum,
+      'svcnum'  => $self->svcnum,
       'pkgnum'  => $self->pkgnum,
       'svcpart' => $self->svcpart,
     } );
-- 
cgit v1.2.1


From 267aa3cd085d1563915207b5bb31df8dc3ab2fb8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Nov 2003 14:39:08 +0000
Subject: fix up virtual field reprucussions

---
 FS/FS/svc_Common.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 73e08f239..fa7996d70 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -49,7 +49,9 @@ sub virtual_fields {
 
   if ($self->svcpart) { # Case 1
     $svcpart = $self->svcpart;
-  } elsif ( $self->svcnum ) { #Case 2
+  } elsif ( $self->svcnum
+            && qsearchs('cust_svc',{'svcnum'=>$self->svcnum} )
+          ) { #Case 2
     $svcpart = $self->cust_svc->svcpart;
   } else { # Case 3
     $svcpart = '';
-- 
cgit v1.2.1


From 868b7d4ab4af175617ce656a95ebc82b3fd1576f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Nov 2003 15:03:54 +0000
Subject: also make setx behave when setting svcnum during an import

---
 FS/FS/svc_Common.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index fa7996d70..89da604ef 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -312,7 +312,7 @@ sub setx {
 
   #get part_svc
   my $svcpart;
-  if ( $self->svcnum ) {
+  if ( $self->svcnum && qsearchs('cust_svc', {'svcnum'=>$self->svcnum}) ) {
     my $cust_svc = $self->cust_svc;
     return "Unknown svcnum" unless $cust_svc; 
     $svcpart = $cust_svc->svcpart;
-- 
cgit v1.2.1


From b16fc4133f24d3844755fe45243e437c9c35769d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 Nov 2003 11:22:53 +0000
Subject: better error msg

---
 FS/FS/cust_pkg.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index d9a6385e2..5700b654e 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -148,7 +148,7 @@ sub insert {
   return $error if $error;
 
   my $cust_main = $self->cust_main;
-  return "Unknown customer ". $self->custnum unless $cust_main;
+  return "Unknown custnum: ". $self->custnum unless $cust_main;
 
   unless ( $disable_agentcheck ) {
     my $agent = qsearchs( 'agent', { 'agentnum' => $cust_main->agentnum } );
-- 
cgit v1.2.1


From 9a6f36bb2cb5cd349be52874868553491de78f05 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 Nov 2003 12:30:25 +0000
Subject: allow provisioning of unaudited services with a svcnum for imports

---
 FS/FS/svc_Common.pm | 6 +++---
 FS/FS/svc_acct.pm   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 89da604ef..cadb997da 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -120,9 +120,9 @@ sub insert {
   return $error if $error;
 
   my $svcnum = $self->svcnum;
-  my $cust_svc;
+  my $cust_svc = $svcnum ? qsearchs('cust_svc',{'svcnum'=>$self->svcnum}) : '';
   #unless ( $svcnum ) {
-  if ( ! $svcnum || ! qsearchs('cust_svc',{'svcnum'=>$self->svcnum} ) ) {
+  if ( !$svcnum or !$cust_svc ) {
     $cust_svc = new FS::cust_svc ( {
       #hua?# 'svcnum'  => $svcnum,
       'svcnum'  => $self->svcnum,
@@ -136,7 +136,7 @@ sub insert {
     }
     $svcnum = $self->svcnum($cust_svc->svcnum);
   } else {
-    $cust_svc = qsearchs('cust_svc',{'svcnum'=>$self->svcnum});
+    #$cust_svc = qsearchs('cust_svc',{'svcnum'=>$self->svcnum});
     unless ( $cust_svc ) {
       $dbh->rollback if $oldAutoCommit;
       return "no cust_svc record found for svcnum ". $self->svcnum;
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 4c943a710..fce443634 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -226,7 +226,7 @@ sub insert {
   #                             'domsvc'   => $self->domsvc,
   #                           } );
 
-  if ( $self->svcnum ) {
+  if ( $self->svcnum && qsearchs('cust_svc',{'svcnum'=>$self->svcnum}) ) {
     my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$self->svcnum});
     unless ( $cust_svc ) {
       $dbh->rollback if $oldAutoCommit;
-- 
cgit v1.2.1


From b793203b33ec10b058b82a56fe89fe760b9a42c2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 13 Nov 2003 11:23:00 +0000
Subject: fix path in questionable section

---
 install/debian/3.0/INSTALL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/debian/3.0/INSTALL b/install/debian/3.0/INSTALL
index ad3ad4f2b..ef28a91fc 100644
--- a/install/debian/3.0/INSTALL
+++ b/install/debian/3.0/INSTALL
@@ -22,7 +22,7 @@ su postgres -c "createuser -P freeside"
 su freeside -c "createdb freeside"
 
 #?
-cd ../..
+cd ../../..
 make install-perl-modules
 make create-config
 freeside-adduser -c -h /usr/local/etc/freeside/htpasswd ivan
-- 
cgit v1.2.1


From 948d16c8038c5976c71a32b00a1ff3f46f97262e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Nov 2003 02:52:13 +0000
Subject: sort these case-insensitive

---
 httemplate/search/report_receivables.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index 60abb12ab..587108e33 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -71,7 +71,7 @@ where 0 <
            ,0
          )
 
-order by company, last
+order by lower(company), lower(last)
 
 END
 
-- 
cgit v1.2.1


From 17b3560111539da506f7f6bb575dd3776375466f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Nov 2003 08:43:24 +0000
Subject: hopefully recover better from lost ssh connections

---
 FS/bin/freeside-selfservice-server | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/FS/bin/freeside-selfservice-server b/FS/bin/freeside-selfservice-server
index 05fa72b43..d2358e33c 100644
--- a/FS/bin/freeside-selfservice-server
+++ b/FS/bin/freeside-selfservice-server
@@ -74,7 +74,13 @@ while (1) {
 
     warn "receiving packet from client\n" if $Debug;
 
-    my $packet = fd_retrieve($reader);
+    my $packet = eval { fd_retrieve($reader); };
+    if ( $@ ) {
+      warn "Storable error receiving packet from client".
+           " (assuming lost connection): $@\n"
+        if $Debug;
+      last;
+    }
     warn "packet received\n".
          join('', map { " $_=>$packet->{$_}\n" } keys %$packet )
       if $Debug > 1;
@@ -120,6 +126,9 @@ while (1) {
 
   }
 
+  warn "connection lost, reconnecting\n" if $Debug;
+  sleep 3;
+
 }
 
 ###
-- 
cgit v1.2.1


From 3631b278f61e0dd08026f7a21ac2d24964f1ea99 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Nov 2003 07:18:39 +0000
Subject: add trailing newline to supress useless error messages in log

---
 fs_selfservice/FS-SelfService/freeside-selfservice-clientd | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
index a8b1e713b..925bce6d2 100644
--- a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
+++ b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
@@ -145,22 +145,22 @@ while (1) {
         #handle some commands weirdly?
         $packet->{_token}=$$;
 
-        warn "[child-$$] locking write stream" if $Debug > 1;
+        warn "[child-$$] locking write stream\n" if $Debug > 1;
         lock_write;
 
-        warn "[child-$$] sending packet to remote server" if $Debug > 1;
+        warn "[child-$$] sending packet to remote server\n" if $Debug > 1;
         nstore_fd($packet, \*STDOUT) or die "FATAL: can't send response: $!";
         
-        warn "[child-$$] flushing write stream" if $Debug > 1;
+        warn "[child-$$] flushing write stream\n" if $Debug > 1;
         STDOUT->flush or die "FATAL: can't flush: $!";
         
-        warn "[child-$$] releasing write lock" if $Debug > 1;
+        warn "[child-$$] releasing write lock\n" if $Debug > 1;
         unlock_write;
 
-        warn "[child-$$] closing write stream" if $Debug > 1;
+        warn "[child-$$] closing write stream\n" if $Debug > 1;
         close STDOUT or die "FATAL: can't close write stream: $!"; #??!
 
-        warn "[child-$$] waiting for response from parent" if $Debug > 1;
+        warn "[child-$$] waiting for response from parent\n" if $Debug > 1;
         my $w = new IO::Select;
         $w->add(\*STDIN);
         until ( $w->can_read ) {
-- 
cgit v1.2.1


From ded62e3a3ab9b930593d36be3f2b32bda2433f07 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Nov 2003 07:28:26 +0000
Subject: kill off ssh process when re-opening connection

---
 FS/bin/freeside-selfservice-server | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/FS/bin/freeside-selfservice-server b/FS/bin/freeside-selfservice-server
index d2358e33c..f9571fa1e 100644
--- a/FS/bin/freeside-selfservice-server
+++ b/FS/bin/freeside-selfservice-server
@@ -79,6 +79,11 @@ while (1) {
       warn "Storable error receiving packet from client".
            " (assuming lost connection): $@\n"
         if $Debug;
+      if ( $ssh_pid ) {
+        warn "sending TERM signal to ssh process $ssh_pid\n" if $Debug;
+        kill 'TERM', $ssh_pid;
+        $ssh_pid = 0;
+      }
       last;
     }
     warn "packet received\n".
-- 
cgit v1.2.1


From f628692253d949e00918e0d4ebc0fab89b657055 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Nov 2003 11:17:12 +0000
Subject: remove thread/PerlIO warning - standard in 5.8.x and working fine

---
 httemplate/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 1355a113c..266708b1e 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -6,7 +6,7 @@
 <i>Note: Install Freeside on a firewalled, private server, not a public (web, RADIUS, etc.) server.</i><br><br>
 Before installing, you need:
 <ul>
-  <li><a href="http://www.perl.com/">Perl</a>  Don't enable experimental features like threads or the PerlIO abstraction layer.
+  <li><a href="http://www.perl.com/">Perl</a>
   <li><a href="http://www.apache.org">Apache</a> (<a href="http://www.modssl.org/">mod_ssl</a> or <a href="http://www.apache-ssl.org">Apache-SSL</a> highly recommended)
   <li><a href="http://perl.apache.org/">mod_perl</a> (if compiling your own mod_perl, make sure you set the <a href="http://perl.apache.org/guide/install.html#EVERYTHING">EVERYTHING</a>=1 compile-time option)
   <li><a href="http://www.openssh.com/">SSH</a> (<a href="http://www.openssh.com//">OpenSSH</a> is recommended.  SSH Communications Security <a href="http://www.ssh.com/products/ssh/download.cfm">commercial SSH version 3</a> has been reported incompatible with Freeside.)
-- 
cgit v1.2.1


From 6569ee0ceffd720ca55594dc0f5a454187ee3b75 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Nov 2003 15:05:17 +0000
Subject: add communigate_pro_singledomain export

---
 FS/FS/part_export.pm                              | 25 +++++++++++++++++++++++
 FS/FS/part_export/communigate_pro.pm              | 15 +++++++++-----
 FS/FS/part_export/communigate_pro_singledomain.pm | 11 ++++++++++
 FS/MANIFEST                                       |  1 +
 4 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 FS/FS/part_export/communigate_pro_singledomain.pm

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 3dfaaee9b..8d058842e 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -754,6 +754,24 @@ tie my %communigate_pro_options, 'Tie::IxHash',
                    },
 ;
 
+tie my %communigate_pro_singledomain_options, 'Tie::IxHash',
+  'port'     => { label=>'Port number', default=>'106', },
+  'login'    => { label=>'The administrator account name.  The name can contain a domain part.', },
+  'password' => { label=>'The administrator account password.', },
+  'domain'   => { label=>'Domain', },
+  'accountType' => { label=>'Type for newly-created accounts',
+                     type=>'select',
+                     options=>[qw( MultiMailbox TextMailbox MailDirMailbox )],
+                     default=>'MultiMailbox',
+                   },
+  'externalFlag' => { label=> 'Create accounts with an external (visible for legacy mailers) INBOX.',
+                      type=>'checkbox',
+                    },
+  'AccessModes' => { label=>'Access modes',
+                     default=>'Mail POP IMAP PWD WebMail WebSite',
+                   },
+;
+
 tie my %bind_options, 'Tie::IxHash',
   #'machine'     => { label=>'named machine' },
   'named_conf'   => { label  => 'named.conf location',
@@ -977,6 +995,13 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
       'notes' => 'Real time export to a <a href="http://www.stalker.com/CommuniGatePro/"> mail server.  The <a href="http://www.stalker.com/CGPerl/">CommuniGate Pro Perl Interface</a> must be installed as CGP::CLI.',
     },
 
+    'communigate_pro_singledomain' => {
+      'desc' => 'Real-time export to a CommuniGate Pro mail server, one domain only',
+      'options' => \%communigate_pro_singledomain_options,
+      'nodomain' => 'Y',
+      'notes' => 'Real time export to a <a href="http://www.stalker.com/CommuniGatePro/"> mail server.  This is an unusual export to CommuniGate Pro that forces all accounts into a single domain.  As CommuniGate Pro supports multiple domains, unless you have a specific reason for using this export, you probably want to use the communigate_pro export instead.  The <a href="http://www.stalker.com/CGPerl/">CommuniGate Pro Perl Interface</a> must be installed as CGP::CLI.',
+    },
+
   },
 
   'svc_domain' => {
diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
index 9a4539a4a..aa038f08e 100644
--- a/FS/FS/part_export/communigate_pro.pm
+++ b/FS/FS/part_export/communigate_pro.pm
@@ -8,10 +8,15 @@ use FS::queue;
 
 sub rebless { shift; }
 
+sub export_username {
+  my($self, $svc_acct) = (shift, shift);
+  $svc_acct->email;
+}
+
 sub _export_insert {
   my( $self, $svc_acct ) = (shift, shift);
   my @options = ( $svc_acct->svcnum, 'CreateAccount',
-    'accountName'    => $svc_acct->email,
+    'accountName'    => $self->export_username($svc_acct),
     'accountType'    => $self->option('accountType'),
     'AccessModes'    => $self->option('AccessModes'),
     'RealName'       => $svc_acct->finger,
@@ -47,7 +52,7 @@ sub _export_replace {
   #my $jobnum = $err_or_queue->jobnum;
 
   $self->communigate_pro_queue( $new->svcnum, 'SetAccountPassword',
-                                $new->email, $new->_password        )
+                                $self->export_username($new), $new->_password        )
     if $new->_password ne $old->_password;
 
 }
@@ -55,14 +60,14 @@ sub _export_replace {
 sub _export_delete {
   my( $self, $svc_acct ) = (shift, shift);
   $self->communigate_pro_queue( $svc_acct->svcnum, 'DeleteAccount',
-    $svc_acct->email,
+    $self->export_username($svc_acct),
   );
 }
 
 sub _export_suspend {
   my( $self, $svc_acct ) = (shift, shift);
   $self->communigate_pro_queue( $svc_acct->svcnum, 'UpdateAccountSettings',
-    'accountName' => $svc_acct->email,
+    'accountName' => $self->export_username($svc_acct),
     'AccessModes' => 'Mail',
   );
 }
@@ -70,7 +75,7 @@ sub _export_suspend {
 sub _export_unsuspend {
   my( $self, $svc_acct ) = (shift, shift);
   $self->communigate_pro_queue( $svc_acct->svcnum, 'UpdateAccountSettings',
-    'accountName' => $svc_acct->email,
+    'accountName' => $self->export_username($svc_acct),
     'AccessModes' => $self->option('AccessModes'),
   );
 }
diff --git a/FS/FS/part_export/communigate_pro_singledomain.pm b/FS/FS/part_export/communigate_pro_singledomain.pm
new file mode 100644
index 000000000..11574af9b
--- /dev/null
+++ b/FS/FS/part_export/communigate_pro_singledomain.pm
@@ -0,0 +1,11 @@
+package FS::part_export::communigate_pro_singledomain;
+
+use vars qw(@ISA);
+use FS::part_export::communigate_pro;
+
+@ISA = qw(FS::part_export::communigate_pro);
+
+sub export_username {
+  my($self, $svc_acct) = (shift, shift);
+  $svc_acct->username. '@'. $self->option('domain');
+}
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 934100af5..877f3ce0d 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -72,6 +72,7 @@ FS/part_export/bind.pm
 FS/part_export/bind_slave.pm
 FS/part_export/bsdshell.pm
 FS/part_export/communigate_pro.pm
+FS/part_export/communigate_pro_singledomain.pm
 FS/part_export/cp.pm
 FS/part_export/cyrus.pm
 FS/part_export/domain_shellcommands.pm
-- 
cgit v1.2.1


From bbbcc4f26d9205fda6bdf735d1c3d7451acbc575 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Nov 2003 15:14:30 +0000
Subject: fix communigate pro export descriptions

---
 FS/FS/part_export.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 8d058842e..17e5cf908 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -992,14 +992,14 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
     'communigate_pro' => {
       'desc' => 'Real-time export to a CommuniGate Pro mail server',
       'options' => \%communigate_pro_options,
-      'notes' => 'Real time export to a <a href="http://www.stalker.com/CommuniGatePro/"> mail server.  The <a href="http://www.stalker.com/CGPerl/">CommuniGate Pro Perl Interface</a> must be installed as CGP::CLI.',
+      'notes' => 'Real time export to a <a href="http://www.stalker.com/CommuniGatePro/">CommuniGate Pro</a> mail server.  The <a href="http://www.stalker.com/CGPerl/">CommuniGate Pro Perl Interface</a> must be installed as CGP::CLI.',
     },
 
     'communigate_pro_singledomain' => {
       'desc' => 'Real-time export to a CommuniGate Pro mail server, one domain only',
       'options' => \%communigate_pro_singledomain_options,
       'nodomain' => 'Y',
-      'notes' => 'Real time export to a <a href="http://www.stalker.com/CommuniGatePro/"> mail server.  This is an unusual export to CommuniGate Pro that forces all accounts into a single domain.  As CommuniGate Pro supports multiple domains, unless you have a specific reason for using this export, you probably want to use the communigate_pro export instead.  The <a href="http://www.stalker.com/CGPerl/">CommuniGate Pro Perl Interface</a> must be installed as CGP::CLI.',
+      'notes' => 'Real time export to a <a href="http://www.stalker.com/CommuniGatePro/">CommuniGate Pro</a> mail server.  This is an unusual export to CommuniGate Pro that forces all accounts into a single domain.  As CommuniGate Pro supports multiple domains, unless you have a specific reason for using this export, you probably want to use the communigate_pro export instead.  The <a href="http://www.stalker.com/CGPerl/">CommuniGate Pro Perl Interface</a> must be installed as CGP::CLI.',
     },
 
   },
-- 
cgit v1.2.1


From b9513f54e2be0c35a52848feef2aedd2c2fd2e3a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Nov 2003 01:29:58 +0000
Subject: disable debugging by default

---
 FS/FS/cust_bill.pm | 367 +++++++++++++++++++++++++++++++++++++++++++++++++----
 FS/FS/cust_main.pm |   2 +-
 2 files changed, 345 insertions(+), 24 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index c15dad433..b49dac31c 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -647,7 +647,7 @@ sub batch_card {
   '';
 }
 
-=item print_text [TIME];
+=item print_text [ TIME [ , TEMPLATE ] ]
 
 Returns an text invoice, as a list of lines.
 
@@ -667,6 +667,7 @@ sub print_text {
   $cust_main->payname( $cust_main->first. ' '. $cust_main->getfield('last') )
     unless $cust_main->payname && $cust_main->payby ne 'CHEK';
 
+
   my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
 #  my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
   #my $balance_due = $self->owed + $pr_total - $cr_total;
@@ -749,28 +750,6 @@ sub print_text {
              $money_char. sprintf("%10.2f",$self->charged + $pr_total) ];
   push @buf,['',''];
 
-  #credits
-  foreach ( $self->cust_credited ) {
-
-    #something more elaborate if $_->amount ne $_->cust_credit->credited ?
-
-    my $reason = substr($_->cust_credit->reason,0,32);
-    $reason .= '...' if length($reason) < length($_->cust_credit->reason);
-    $reason = " ($reason) " if $reason;
-    push @buf,[
-      "Credit #". $_->crednum. " (". time2str("%x",$_->cust_credit->_date) .")".
-        $reason,
-      $money_char. sprintf("%10.2f",$_->amount)
-    ];
-  }
-  #foreach ( @cr_cust_credit ) {
-  #  push @buf,[
-  #    "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
-  #    $money_char. sprintf("%10.2f",$_->credited)
-  #  ];
-  #}
-
-  #get & print payments
   foreach ( $self->cust_bill_pay ) {
 
     #something more elaborate if $_->amount ne ->cust_pay->paid ?
@@ -877,6 +856,348 @@ sub print_text {
 
 }
 
+=item print_ps [ TIME [ , TEMPLATE ] ]
+
+Returns an postscript invoice, as a scalar.
+
+TIME an optional value used to control the printing of overdue messages.  The
+default is now.  It isn't the date of the invoice; that's the `_date' field.
+It is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=cut
+
+#still some false laziness w/print_text
+sub print_ps {
+
+  my( $self, $today, $template ) = @_;
+  $today ||= time;
+
+#  my $invnum = $self->invnum;
+  my $cust_main = $self->cust_main;
+  $cust_main->payname( $cust_main->first. ' '. $cust_main->getfield('last') )
+    unless $cust_main->payname && $cust_main->payby ne 'CHEK';
+
+  my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
+#  my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
+  #my $balance_due = $self->owed + $pr_total - $cr_total;
+  my $balance_due = $self->owed + $pr_total;
+
+  #my @collect = ();
+  #my($description,$amount);
+  @buf = ();
+
+  #create the template
+  my $templatefile = 'invoice_template_latex';
+  $templatefile .= "_$template" if $template;
+  my @invoice_template = $conf->config($templatefile)
+    or die "cannot load config file $templatefile";
+
+  my %invoice_data = (
+    'invnum'   => $self->invnum,
+    'date'     => time2str('%b %o, %Y', $self->_date),
+    'agent'    => $cust_main->agent->agent,
+    'payname'  => $cust_main->payname,
+    'company'  => $cust_main->company,
+    'address1' => $cust_main->address1,
+    'address2' => $cust_main->address2,
+    'city'     => $cust_main->city,
+    'state'    => $cust_main->state,
+    'zip'      => $cust_main->zip,
+    'country'  => $cust_main->country,
+    'footer'   => <<'END', #should come from config value
+Ivan Kohler\\
+1339 Hayes St.\\
+San Francisco, CA~~94117\\
+ivan@sisd.com~~~~+1 415 462 1624\\
+Freeside - open-source billing - http://www.sisd.com/freeside\\
+END
+
+    'quantity'     => 1,
+
+  );
+
+  #$invoice_data{'footer'} =~ s/\n+$//;
+
+  my $countrydefault = $conf->config('countrydefault') || 'US';
+  $invoice_data{'country'} = '' if $invoice_data{'country'} eq $countrydefault;
+
+  $invoice_data{'po_line'} =
+    (  $cust_main->payby eq 'BILL' && $cust_main->payinfo )
+      ? "Purchase Order #". $cust_main->payinfo
+      : '~';
+
+  my @line_item = ();
+  my @total_item = ();
+  my @filled_in = ();
+  while ( @invoice_template ) {
+    my $line = shift @invoice_template;
+
+    if ( $line =~ /^%%Detail\s*$/ ) {
+
+      while ( ( my $line_item_line = shift @invoice_template )
+              !~ /^%%EndDetail\s*$/                            ) {
+        push @line_item, $line_item_line;
+      }
+      #foreach my $line_item ( $self->_items ) {
+      foreach my $line_item ( $self->_items_pkg ) {
+        $invoice_data{'ref'} = $line_item->{'pkgnum'};
+        $invoice_data{'description'} = $line_item->{'description'};
+        if ( exists $line_item->{'ext_description'} ) {
+          $invoice_data{'description'} .=
+            "\\tabularnewline\n~~".
+            join("\\tabularnewline\n~~", @{$line_item->{'ext_description'}} );
+        }
+        $invoice_data{'amount'} = $line_item->{'amount'};
+        $invoice_data{'product_code'} = $line_item->{'pkgpart'} || 'N/A';
+        push @filled_in,
+          map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b } @line_item;
+      }
+
+    } elsif ( $line =~ /^%%TotalDetails\s*$/ ) {
+
+      while ( ( my $total_item_line = shift @invoice_template )
+              !~ /^%%EndTotalDetails\s*$/                      ) {
+        push @total_item, $total_item_line;
+      }
+
+      my @total_fill = ();
+
+      my $taxtotal = 0;
+      foreach my $tax ( $self->_items_tax ) {
+        $invoice_data{'total_item'} = $tax->{'description'};
+        $taxtotal += ( $invoice_data{'total_amount'} = $tax->{'amount'} );
+        push @total_fill,
+          map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+              @total_item;
+      }
+
+      $invoice_data{'total_item'} = '\textbf{Total}';
+      $invoice_data{'total_amount'} =
+        '\textbf{\dollar '. sprintf('%.2f', $self->owed ). '}';
+      push @total_fill,
+        map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+            @total_item;
+
+      if ( $taxtotal ) {
+        $invoice_data{'total_item'} = 'Sub-total';
+        $invoice_data{'total_amount'} =
+          '\dollar '. sprintf('%.2f', $self->owed - $taxtotal );
+        unshift @total_fill,
+          map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+              @total_item;
+      }
+
+      push @filled_in, @total_fill;
+
+    } else {
+      #$line =~ s/\$(\w+)/$invoice_data{$1}/eg;
+      $line =~ s/\$(\w+)/exists($invoice_data{$1}) ? $invoice_data{$1} : nounder($1)/eg;
+      push @filled_in, $line;
+    }
+
+  }
+
+  sub nounder {
+    my $var = $1;
+    $var =~ s/_/\-/g;
+    $var;
+  }
+
+  my $dir = '/tmp'; #! /usr/local/etc/freeside/invoices.datasrc/
+  my $unique = int(rand(2**31)); #UGH... use File::Temp or something
+
+  chdir($dir);
+  my $file = $self->invnum. ".$unique";
+
+  open(TEX,">$file.tex") or die "can't open $file.tex: $!\n";
+  print TEX join("\n", @filled_in ), "\n";
+  close TEX;
+
+  #error checking!!
+  system('pslatex', "$file.tex");
+  system('pslatex', "$file.tex");
+  #system('dvips', '-t', 'letter', "$file.dvi", "$file.ps");
+  system('dvips', '-t', 'letter', "$file.dvi" );
+
+  open(POSTSCRIPT, "<$file.ps") or die "can't open $file.ps: $!\n";
+
+  #rm $file.dvi $file.log $file.aux
+  #unlink("$file.dvi", "$file.log", "$file.aux", "$file.ps");
+  unlink("$file.dvi", "$file.log", "$file.aux");
+
+  my $ps = '';
+  while (<POSTSCRIPT>) {
+    $ps .= $_;
+  }
+
+  close POSTSCRIPT;
+
+  return $ps;
+
+}
+
+#utility methods for print_*
+
+sub _items {
+  my $self = shift;
+  my @display = scalar(@_)
+                ? @_
+                : qw( _items_pkg );
+                #: qw( _items_previous _items_pkg _items_tax _items_credits _items_payments );
+  my @b = ();
+  foreach my $display ( @display ) {
+    push @b, $self->$display(@_);
+  }
+  @b;
+}
+
+sub _items_previous {
+  my $self = shift;
+  my $cust_main = $self->cust_main;
+  my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
+  my @b = ();
+  foreach ( @pr_cust_bill ) {
+    push @b, [
+      "Previous Balance, Invoice #". $_->invnum. 
+                 " (". time2str("%x",$_->_date). ")",
+      $money_char. sprintf("%10.2f",$_->owed)
+    ];
+  }
+  @b;
+}
+
+sub _items_pkg {
+  my $self = shift;
+  my @cust_bill_pkg = grep { $_->pkgnum } $self->cust_bill_pkg;
+  $self->_items_cust_bill_pkg(\@cust_bill_pkg, @_);
+}
+
+sub _items_tax {
+  my $self = shift;
+  my @cust_bill_pkg = grep { ! $_->pkgnum } $self->cust_bill_pkg;
+  $self->_items_cust_bill_pkg(\@cust_bill_pkg, @_);
+}
+
+sub _items_cust_bill_pkg {
+  my $self = shift;
+  my $cust_bill_pkg = shift;
+
+  my @b = ();
+  foreach my $cust_bill_pkg ( @$cust_bill_pkg ) {
+
+    if ( $cust_bill_pkg->pkgnum ) {
+
+      my $cust_pkg = qsearchs('cust_pkg', { pkgnum =>$cust_bill_pkg->pkgnum } );
+      my $part_pkg = qsearchs('part_pkg', { pkgpart=>$cust_pkg->pkgpart } );
+      my $pkg = $part_pkg->pkg;
+
+      if ( $cust_bill_pkg->setup != 0 ) {
+        my @d = ();
+        @d = $cust_bill_pkg->details if $cust_bill_pkg->recur == 0;
+        push @b, {
+          'description'     => "$pkg Setup",
+          'pkgpart'         => $part_pkg->pkgpart,
+          'pkgnum'          => $cust_pkg->pkgnum,
+          'amount'          => sprintf("%10.2f", $cust_bill_pkg->setup),
+          'ext_description' => [ ( map { $_->[0]. ": ". $_->[1] }
+                                         $cust_pkg->labels        ),
+                                 @d,
+                               ],
+        };
+      }
+
+      if ( $cust_bill_pkg->recur != 0 ) {
+        push @b, {
+          'description'     => "$pkg (" .
+                               time2str('%x', $cust_bill_pkg->sdate). ' - '.
+                               time2str('%x', $cust_bill_pkg->edate). ')',
+          'pkgpart'         => $part_pkg->pkgpart,
+          'pkgnum'          => $cust_pkg->pkgnum,
+          'amount'          => sprintf("%10.2f", $cust_bill_pkg->recur),
+          'ext_description' => [ ( map { $_->[0]. ": ". $_->[1] }
+                                       $cust_pkg->labels          ),
+                                 $cust_bill_pkg->details,
+                               ],
+        };
+      }
+
+    } else { #pkgnum tax or one-shot line item (??)
+
+      my $itemdesc = defined $cust_bill_pkg->dbdef_table->column('itemdesc')
+                     ? ( $cust_bill_pkg->itemdesc || 'Tax' )
+                     : 'Tax';
+      if ( $cust_bill_pkg->setup != 0 ) {
+        push @b, {
+          'description' => $itemdesc,
+          'amount'      => sprintf("%10.2f", $cust_bill_pkg->setup),
+        };
+      }
+      if ( $cust_bill_pkg->recur != 0 ) {
+        push @b, {
+          'description' => "$itemdesc (".
+                           time2str("%x", $cust_bill_pkg->sdate). ' - '.
+                           time2str("%x", $cust_bill_pkg->edate). ')',
+          'amount'      => sprintf("%10.2f", $cust_bill_pkg->recur),
+        };
+      }
+
+    }
+
+  }
+
+  @b;
+
+}
+
+sub _items_credits {
+  my $self = shift;
+
+  my @b;
+  #credits
+  foreach ( $self->cust_credited ) {
+
+    #something more elaborate if $_->amount ne $_->cust_credit->credited ?
+
+    my $reason = substr($_->cust_credit->reason,0,32);
+    $reason .= '...' if length($reason) < length($_->cust_credit->reason);
+    $reason = " ($reason) " if $reason;
+    push @b,[
+      "Credit #". $_->crednum. " (". time2str("%x",$_->cust_credit->_date) .")".
+        $reason,
+      $money_char. sprintf("%10.2f",$_->amount)
+    ];
+  }
+  #foreach ( @cr_cust_credit ) {
+  #  push @buf,[
+  #    "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
+  #    $money_char. sprintf("%10.2f",$_->credited)
+  #  ];
+  #}
+
+  @b;
+
+}
+
+sub _items_payments {
+  my $self = shift;
+
+  my @b;
+  #get & print payments
+  foreach ( $self->cust_bill_pay ) {
+
+    #something more elaborate if $_->amount ne ->cust_pay->paid ?
+
+    push @b,[
+      "Payment received ". time2str("%x",$_->cust_pay->_date ),
+      $money_char. sprintf("%10.2f",$_->amount )
+    ];
+  }
+
+  @b;
+
+}
+
 =back
 
 =head1 BUGS
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 8511e1a45..df7bf1abb 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -41,7 +41,7 @@ use FS::Msgcat qw(gettext);
 
 $realtime_bop_decline_quiet = 0;
 
-$Debug = 1;
+$Debug = 0;
 #$Debug = 1;
 
 $import = 0;
-- 
cgit v1.2.1


From d0bc83c16f5c9b38dda97671de8a49894fb08b4d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Nov 2003 01:37:14 +0000
Subject: reversing accidental commit of work-in-progress

---
 FS/FS/cust_bill.pm | 367 ++++-------------------------------------------------
 1 file changed, 23 insertions(+), 344 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index b49dac31c..c15dad433 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -647,7 +647,7 @@ sub batch_card {
   '';
 }
 
-=item print_text [ TIME [ , TEMPLATE ] ]
+=item print_text [TIME];
 
 Returns an text invoice, as a list of lines.
 
@@ -667,7 +667,6 @@ sub print_text {
   $cust_main->payname( $cust_main->first. ' '. $cust_main->getfield('last') )
     unless $cust_main->payname && $cust_main->payby ne 'CHEK';
 
-
   my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
 #  my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
   #my $balance_due = $self->owed + $pr_total - $cr_total;
@@ -750,6 +749,28 @@ sub print_text {
              $money_char. sprintf("%10.2f",$self->charged + $pr_total) ];
   push @buf,['',''];
 
+  #credits
+  foreach ( $self->cust_credited ) {
+
+    #something more elaborate if $_->amount ne $_->cust_credit->credited ?
+
+    my $reason = substr($_->cust_credit->reason,0,32);
+    $reason .= '...' if length($reason) < length($_->cust_credit->reason);
+    $reason = " ($reason) " if $reason;
+    push @buf,[
+      "Credit #". $_->crednum. " (". time2str("%x",$_->cust_credit->_date) .")".
+        $reason,
+      $money_char. sprintf("%10.2f",$_->amount)
+    ];
+  }
+  #foreach ( @cr_cust_credit ) {
+  #  push @buf,[
+  #    "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
+  #    $money_char. sprintf("%10.2f",$_->credited)
+  #  ];
+  #}
+
+  #get & print payments
   foreach ( $self->cust_bill_pay ) {
 
     #something more elaborate if $_->amount ne ->cust_pay->paid ?
@@ -856,348 +877,6 @@ sub print_text {
 
 }
 
-=item print_ps [ TIME [ , TEMPLATE ] ]
-
-Returns an postscript invoice, as a scalar.
-
-TIME an optional value used to control the printing of overdue messages.  The
-default is now.  It isn't the date of the invoice; that's the `_date' field.
-It is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=cut
-
-#still some false laziness w/print_text
-sub print_ps {
-
-  my( $self, $today, $template ) = @_;
-  $today ||= time;
-
-#  my $invnum = $self->invnum;
-  my $cust_main = $self->cust_main;
-  $cust_main->payname( $cust_main->first. ' '. $cust_main->getfield('last') )
-    unless $cust_main->payname && $cust_main->payby ne 'CHEK';
-
-  my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
-#  my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
-  #my $balance_due = $self->owed + $pr_total - $cr_total;
-  my $balance_due = $self->owed + $pr_total;
-
-  #my @collect = ();
-  #my($description,$amount);
-  @buf = ();
-
-  #create the template
-  my $templatefile = 'invoice_template_latex';
-  $templatefile .= "_$template" if $template;
-  my @invoice_template = $conf->config($templatefile)
-    or die "cannot load config file $templatefile";
-
-  my %invoice_data = (
-    'invnum'   => $self->invnum,
-    'date'     => time2str('%b %o, %Y', $self->_date),
-    'agent'    => $cust_main->agent->agent,
-    'payname'  => $cust_main->payname,
-    'company'  => $cust_main->company,
-    'address1' => $cust_main->address1,
-    'address2' => $cust_main->address2,
-    'city'     => $cust_main->city,
-    'state'    => $cust_main->state,
-    'zip'      => $cust_main->zip,
-    'country'  => $cust_main->country,
-    'footer'   => <<'END', #should come from config value
-Ivan Kohler\\
-1339 Hayes St.\\
-San Francisco, CA~~94117\\
-ivan@sisd.com~~~~+1 415 462 1624\\
-Freeside - open-source billing - http://www.sisd.com/freeside\\
-END
-
-    'quantity'     => 1,
-
-  );
-
-  #$invoice_data{'footer'} =~ s/\n+$//;
-
-  my $countrydefault = $conf->config('countrydefault') || 'US';
-  $invoice_data{'country'} = '' if $invoice_data{'country'} eq $countrydefault;
-
-  $invoice_data{'po_line'} =
-    (  $cust_main->payby eq 'BILL' && $cust_main->payinfo )
-      ? "Purchase Order #". $cust_main->payinfo
-      : '~';
-
-  my @line_item = ();
-  my @total_item = ();
-  my @filled_in = ();
-  while ( @invoice_template ) {
-    my $line = shift @invoice_template;
-
-    if ( $line =~ /^%%Detail\s*$/ ) {
-
-      while ( ( my $line_item_line = shift @invoice_template )
-              !~ /^%%EndDetail\s*$/                            ) {
-        push @line_item, $line_item_line;
-      }
-      #foreach my $line_item ( $self->_items ) {
-      foreach my $line_item ( $self->_items_pkg ) {
-        $invoice_data{'ref'} = $line_item->{'pkgnum'};
-        $invoice_data{'description'} = $line_item->{'description'};
-        if ( exists $line_item->{'ext_description'} ) {
-          $invoice_data{'description'} .=
-            "\\tabularnewline\n~~".
-            join("\\tabularnewline\n~~", @{$line_item->{'ext_description'}} );
-        }
-        $invoice_data{'amount'} = $line_item->{'amount'};
-        $invoice_data{'product_code'} = $line_item->{'pkgpart'} || 'N/A';
-        push @filled_in,
-          map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b } @line_item;
-      }
-
-    } elsif ( $line =~ /^%%TotalDetails\s*$/ ) {
-
-      while ( ( my $total_item_line = shift @invoice_template )
-              !~ /^%%EndTotalDetails\s*$/                      ) {
-        push @total_item, $total_item_line;
-      }
-
-      my @total_fill = ();
-
-      my $taxtotal = 0;
-      foreach my $tax ( $self->_items_tax ) {
-        $invoice_data{'total_item'} = $tax->{'description'};
-        $taxtotal += ( $invoice_data{'total_amount'} = $tax->{'amount'} );
-        push @total_fill,
-          map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
-              @total_item;
-      }
-
-      $invoice_data{'total_item'} = '\textbf{Total}';
-      $invoice_data{'total_amount'} =
-        '\textbf{\dollar '. sprintf('%.2f', $self->owed ). '}';
-      push @total_fill,
-        map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
-            @total_item;
-
-      if ( $taxtotal ) {
-        $invoice_data{'total_item'} = 'Sub-total';
-        $invoice_data{'total_amount'} =
-          '\dollar '. sprintf('%.2f', $self->owed - $taxtotal );
-        unshift @total_fill,
-          map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
-              @total_item;
-      }
-
-      push @filled_in, @total_fill;
-
-    } else {
-      #$line =~ s/\$(\w+)/$invoice_data{$1}/eg;
-      $line =~ s/\$(\w+)/exists($invoice_data{$1}) ? $invoice_data{$1} : nounder($1)/eg;
-      push @filled_in, $line;
-    }
-
-  }
-
-  sub nounder {
-    my $var = $1;
-    $var =~ s/_/\-/g;
-    $var;
-  }
-
-  my $dir = '/tmp'; #! /usr/local/etc/freeside/invoices.datasrc/
-  my $unique = int(rand(2**31)); #UGH... use File::Temp or something
-
-  chdir($dir);
-  my $file = $self->invnum. ".$unique";
-
-  open(TEX,">$file.tex") or die "can't open $file.tex: $!\n";
-  print TEX join("\n", @filled_in ), "\n";
-  close TEX;
-
-  #error checking!!
-  system('pslatex', "$file.tex");
-  system('pslatex', "$file.tex");
-  #system('dvips', '-t', 'letter', "$file.dvi", "$file.ps");
-  system('dvips', '-t', 'letter', "$file.dvi" );
-
-  open(POSTSCRIPT, "<$file.ps") or die "can't open $file.ps: $!\n";
-
-  #rm $file.dvi $file.log $file.aux
-  #unlink("$file.dvi", "$file.log", "$file.aux", "$file.ps");
-  unlink("$file.dvi", "$file.log", "$file.aux");
-
-  my $ps = '';
-  while (<POSTSCRIPT>) {
-    $ps .= $_;
-  }
-
-  close POSTSCRIPT;
-
-  return $ps;
-
-}
-
-#utility methods for print_*
-
-sub _items {
-  my $self = shift;
-  my @display = scalar(@_)
-                ? @_
-                : qw( _items_pkg );
-                #: qw( _items_previous _items_pkg _items_tax _items_credits _items_payments );
-  my @b = ();
-  foreach my $display ( @display ) {
-    push @b, $self->$display(@_);
-  }
-  @b;
-}
-
-sub _items_previous {
-  my $self = shift;
-  my $cust_main = $self->cust_main;
-  my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
-  my @b = ();
-  foreach ( @pr_cust_bill ) {
-    push @b, [
-      "Previous Balance, Invoice #". $_->invnum. 
-                 " (". time2str("%x",$_->_date). ")",
-      $money_char. sprintf("%10.2f",$_->owed)
-    ];
-  }
-  @b;
-}
-
-sub _items_pkg {
-  my $self = shift;
-  my @cust_bill_pkg = grep { $_->pkgnum } $self->cust_bill_pkg;
-  $self->_items_cust_bill_pkg(\@cust_bill_pkg, @_);
-}
-
-sub _items_tax {
-  my $self = shift;
-  my @cust_bill_pkg = grep { ! $_->pkgnum } $self->cust_bill_pkg;
-  $self->_items_cust_bill_pkg(\@cust_bill_pkg, @_);
-}
-
-sub _items_cust_bill_pkg {
-  my $self = shift;
-  my $cust_bill_pkg = shift;
-
-  my @b = ();
-  foreach my $cust_bill_pkg ( @$cust_bill_pkg ) {
-
-    if ( $cust_bill_pkg->pkgnum ) {
-
-      my $cust_pkg = qsearchs('cust_pkg', { pkgnum =>$cust_bill_pkg->pkgnum } );
-      my $part_pkg = qsearchs('part_pkg', { pkgpart=>$cust_pkg->pkgpart } );
-      my $pkg = $part_pkg->pkg;
-
-      if ( $cust_bill_pkg->setup != 0 ) {
-        my @d = ();
-        @d = $cust_bill_pkg->details if $cust_bill_pkg->recur == 0;
-        push @b, {
-          'description'     => "$pkg Setup",
-          'pkgpart'         => $part_pkg->pkgpart,
-          'pkgnum'          => $cust_pkg->pkgnum,
-          'amount'          => sprintf("%10.2f", $cust_bill_pkg->setup),
-          'ext_description' => [ ( map { $_->[0]. ": ". $_->[1] }
-                                         $cust_pkg->labels        ),
-                                 @d,
-                               ],
-        };
-      }
-
-      if ( $cust_bill_pkg->recur != 0 ) {
-        push @b, {
-          'description'     => "$pkg (" .
-                               time2str('%x', $cust_bill_pkg->sdate). ' - '.
-                               time2str('%x', $cust_bill_pkg->edate). ')',
-          'pkgpart'         => $part_pkg->pkgpart,
-          'pkgnum'          => $cust_pkg->pkgnum,
-          'amount'          => sprintf("%10.2f", $cust_bill_pkg->recur),
-          'ext_description' => [ ( map { $_->[0]. ": ". $_->[1] }
-                                       $cust_pkg->labels          ),
-                                 $cust_bill_pkg->details,
-                               ],
-        };
-      }
-
-    } else { #pkgnum tax or one-shot line item (??)
-
-      my $itemdesc = defined $cust_bill_pkg->dbdef_table->column('itemdesc')
-                     ? ( $cust_bill_pkg->itemdesc || 'Tax' )
-                     : 'Tax';
-      if ( $cust_bill_pkg->setup != 0 ) {
-        push @b, {
-          'description' => $itemdesc,
-          'amount'      => sprintf("%10.2f", $cust_bill_pkg->setup),
-        };
-      }
-      if ( $cust_bill_pkg->recur != 0 ) {
-        push @b, {
-          'description' => "$itemdesc (".
-                           time2str("%x", $cust_bill_pkg->sdate). ' - '.
-                           time2str("%x", $cust_bill_pkg->edate). ')',
-          'amount'      => sprintf("%10.2f", $cust_bill_pkg->recur),
-        };
-      }
-
-    }
-
-  }
-
-  @b;
-
-}
-
-sub _items_credits {
-  my $self = shift;
-
-  my @b;
-  #credits
-  foreach ( $self->cust_credited ) {
-
-    #something more elaborate if $_->amount ne $_->cust_credit->credited ?
-
-    my $reason = substr($_->cust_credit->reason,0,32);
-    $reason .= '...' if length($reason) < length($_->cust_credit->reason);
-    $reason = " ($reason) " if $reason;
-    push @b,[
-      "Credit #". $_->crednum. " (". time2str("%x",$_->cust_credit->_date) .")".
-        $reason,
-      $money_char. sprintf("%10.2f",$_->amount)
-    ];
-  }
-  #foreach ( @cr_cust_credit ) {
-  #  push @buf,[
-  #    "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
-  #    $money_char. sprintf("%10.2f",$_->credited)
-  #  ];
-  #}
-
-  @b;
-
-}
-
-sub _items_payments {
-  my $self = shift;
-
-  my @b;
-  #get & print payments
-  foreach ( $self->cust_bill_pay ) {
-
-    #something more elaborate if $_->amount ne ->cust_pay->paid ?
-
-    push @b,[
-      "Payment received ". time2str("%x",$_->cust_pay->_date ),
-      $money_char. sprintf("%10.2f",$_->amount )
-    ];
-  }
-
-  @b;
-
-}
-
 =back
 
 =head1 BUGS
-- 
cgit v1.2.1


From 4eec09b9bb69dea116c0f8b5fa81862125aa587c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Nov 2003 12:21:09 +0000
Subject: fix jscalendar date ifFormat

---
 httemplate/edit/REAL_cust_pkg.cgi      | 4 ++--
 httemplate/search/cust_pkg.html        | 4 ++--
 httemplate/search/report_cc.html       | 4 ++--
 httemplate/search/report_credit.html   | 4 ++--
 httemplate/search/report_cust_pay.html | 4 ++--
 httemplate/search/report_tax.html      | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index 4156b850b..d9b7579f6 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -1,6 +1,6 @@
 <!-- mason kludge -->
 <%
-# <!-- $Id: REAL_cust_pkg.cgi,v 1.6 2003-09-30 08:21:56 ivan Exp $ -->
+# <!-- $Id: REAL_cust_pkg.cgi,v 1.7 2003-11-19 12:21:09 ivan Exp $ -->
 
 my $error ='';
 my $pkgnum = '';
@@ -119,7 +119,7 @@ print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
 %>
   Calendar.setup({
     inputField: "<%= $cal %>_text",
-    ifFormat:   "mm/dd/y",
+    ifFormat:   "%m/%d/%Y",
     button:     "<%= $cal %>_button",
     align:      "BR"
   });
diff --git a/httemplate/search/cust_pkg.html b/httemplate/search/cust_pkg.html
index 3d80d51a9..0dad83a2a 100755
--- a/httemplate/search/cust_pkg.html
+++ b/httemplate/search/cust_pkg.html
@@ -18,7 +18,7 @@
 <SCRIPT TYPE="text/javascript">
   Calendar.setup({
     inputField: "beginning_text",
-    ifFormat:   "mm/dd/y",
+    ifFormat:   "%m/%d/%Y",
     button:     "beginning_button",
     align:      "BR"
   });
@@ -30,7 +30,7 @@
 <SCRIPT TYPE="text/javascript">
   Calendar.setup({
     inputField: "ending_text",
-    ifFormat:   "mm/dd/y",
+    ifFormat:   "%m/%d/%Y",
     button:     "ending_button",
     align:      "BR"
   });
diff --git a/httemplate/search/report_cc.html b/httemplate/search/report_cc.html
index 7bbfa40ce..595a7b150 100755
--- a/httemplate/search/report_cc.html
+++ b/httemplate/search/report_cc.html
@@ -16,7 +16,7 @@
 <SCRIPT TYPE="text/javascript">
   Calendar.setup({
     inputField: "beginning_text",
-    ifFormat:   "mm/dd/y",
+    ifFormat:   "%m/%d/%Y",
     button:     "beginning_button",
     align:      "BR"
   });
@@ -27,7 +27,7 @@
 <SCRIPT TYPE="text/javascript">
   Calendar.setup({
     inputField: "ending_text",
-    ifFormat:   "mm/dd/y",
+    ifFormat:   "%m/%d/%Y",
     button:     "ending_button",
     align:      "BR"
   });
diff --git a/httemplate/search/report_credit.html b/httemplate/search/report_credit.html
index 310b9cb59..11cb32ed8 100755
--- a/httemplate/search/report_credit.html
+++ b/httemplate/search/report_credit.html
@@ -16,7 +16,7 @@
 <SCRIPT TYPE="text/javascript">
   Calendar.setup({
     inputField: "beginning_text",
-    ifFormat:   "mm/dd/y",
+    ifFormat:   "%m/%d/%Y",
     button:     "beginning_button",
     align:      "BR"
   });
@@ -27,7 +27,7 @@
 <SCRIPT TYPE="text/javascript">
   Calendar.setup({
     inputField: "ending_text",
-    ifFormat:   "mm/dd/y",
+    ifFormat:   "%m/%d/%Y",
     button:     "ending_button",
     align:      "BR"
   });
diff --git a/httemplate/search/report_cust_pay.html b/httemplate/search/report_cust_pay.html
index b8581ba4b..1b30685dc 100644
--- a/httemplate/search/report_cust_pay.html
+++ b/httemplate/search/report_cust_pay.html
@@ -30,7 +30,7 @@
 <SCRIPT TYPE="text/javascript">
   Calendar.setup({
     inputField: "beginning_text",
-    ifFormat:   "mm/dd/y",
+    ifFormat:   "%m/%d/%Y",
     button:     "beginning_button",
     align:      "BR"
   });
@@ -41,7 +41,7 @@
 <SCRIPT TYPE="text/javascript">
   Calendar.setup({
     inputField: "ending_text",
-    ifFormat:   "mm/dd/y",
+    ifFormat:   "%m/%d/%Y",
     button:     "ending_button",
     align:      "BR"
   });
diff --git a/httemplate/search/report_tax.html b/httemplate/search/report_tax.html
index 55b9e097b..7bc35e3ed 100755
--- a/httemplate/search/report_tax.html
+++ b/httemplate/search/report_tax.html
@@ -16,7 +16,7 @@
 <SCRIPT TYPE="text/javascript">
   Calendar.setup({
     inputField: "beginning_text",
-    ifFormat:   "mm/dd/y",
+    ifFormat:   "%m/%d/%Y",
     button:     "beginning_button",
     align:      "BR"
   });
@@ -27,7 +27,7 @@
 <SCRIPT TYPE="text/javascript">
   Calendar.setup({
     inputField: "ending_text",
-    ifFormat:   "mm/dd/y",
+    ifFormat:   "%m/%d/%Y",
     button:     "ending_button",
     align:      "BR"
   });
-- 
cgit v1.2.1


From a3b660670b6c553563cd6095fe2d14754af56341 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Nov 2003 18:13:35 +0000
Subject: work around DBD::Pg problems with bind_param

---
 FS/FS/Record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 14dfca2cb..63128d1b1 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -313,9 +313,9 @@ sub qsearch {
     if ( $record->{$field} =~ /^\d+(\.\d+)?$/
          && $dbdef->table($table)->column($field)->type =~ /(int|serial)/i
     ) {
-      $sth->bind_param($bind++, $record->{$field}, { TYPE => SQL_INTEGER } );
+      $sth->bind_param($bind++, $record->{$field}, SQL_INTEGER );
     } else {
-      $sth->bind_param($bind++, $record->{$field}, { TYPE => SQL_VARCHAR } );
+      $sth->bind_param($bind++, $record->{$field}, SQL_VARCHAR );
     }
   }
 
-- 
cgit v1.2.1


From 34869715ef86c3cfbb808c051746988e2ec76490 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Nov 2003 12:48:11 +0000
Subject: don't error out when not actually changing domain

---
 FS/FS/part_export/communigate_pro.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
index aa038f08e..557aad91d 100644
--- a/FS/FS/part_export/communigate_pro.pm
+++ b/FS/FS/part_export/communigate_pro.pm
@@ -31,10 +31,10 @@ sub _export_insert {
 
 sub _export_replace {
   my( $self, $new, $old ) = (shift, shift, shift);
-  return "can't (yet) change domain with CommuniGate Pro"
-    if $old->domain ne $new->domain;
   return "can't (yet) change username with CommuniGate Pro"
     if $old->username ne $new->username;
+  return "can't (yet) change domain with CommuniGate Pro"
+    if $self->export_username($old) ne $self->export_username($new);
   return "can't (yet) change GECOS with CommuniGate Pro"
     if $old->finger ne $new->finger;
   return "can't (yet) change quota with CommuniGate Pro"
-- 
cgit v1.2.1


From 8ded47043e6d1f002a57c392fa95f481e697ab45 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Nov 2003 15:20:05 +0000
Subject: show customer status on receivables report

---
 httemplate/search/report_receivables.cgi | 41 +++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index 587108e33..108453d43 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -58,11 +58,33 @@ END
          )
          ,0
        ) as owed_total
+END
+
+  my $recurring = <<END;
+        0 < ( select freq from part_pkg
+                where cust_pkg.pkgpart = part_pkg.pkgpart )
+END
+
+  my $packages_cols = <<END;
+
+       ( select count(*) from cust_pkg
+           where cust_main.custnum = cust_pkg.custnum
+             and $recurring
+             and cancel = 0 or cancel is null
+       ) as uncancelled_pkgs,
+
+       ( select count(*) from cust_pkg
+           where cust_main.custnum = cust_pkg.custnum
+             and $recurring
+             and cancel = 0 or cancel is null
+             and susp = 0 or susp is null
+       ) as active_pkgs
+
 END
 
   my $sql = <<END;
 
-select *, $owed_cols from cust_main
+select *, $owed_cols, $packages_cols from cust_main
 where 0 <
   coalesce(
            ( select $charged from cust_bill
@@ -88,17 +110,30 @@ END
 <%= table() %>
   <TR>
     <TH>Customer</TH>
+    <TH>Status</TH>
     <TH>0-30</TH>
     <TH>30-60</TH>
     <TH>60-90</TH>
     <TH>90+</TH>
     <TH>Total</TH>
   </TR>
-<% while ( my $row = $sth->fetchrow_hashref() ) { %>
+<% while ( my $row = $sth->fetchrow_hashref() ) {
+     my $status = 'Cancelled';
+     my $statuscol = 'FF0000';
+     if ( $row->{uncancelled_pkgs} ) {
+       $status = 'Suspended';
+       $statuscol = 'FF9900';
+       if ( $row->{active_pkgs} > $row->{uncancelled_pkgs} ) {
+         $status = 'Active';
+         $statuscol = '00CC00';
+       }
+     }
+%>
   <TR>
     <TD><A HREF="<%= $p %>view/cust_main.cgi?<%= $row->{'custnum'} %>">
         <%= $row->{'company'} ? $row->{'company'}. ' (' : '' %><%= $row->{'last'}. ', '. $row->{'first'} %><%= $row->{'company'} ? ')' : '' %></A>
     </TD>
+    <TD><B><FONT SIZE=-1 COLOR="#<%= $statuscol %>"><%= $status %></FONT></B></TD>
     <TD ALIGN="right">$<%= sprintf("%.2f", $row->{'owed_0_30'} ) %></TD>
     <TD ALIGN="right">$<%= sprintf("%.2f", $row->{'owed_30_60'} ) %></TD>
     <TD ALIGN="right">$<%= sprintf("%.2f", $row->{'owed_60_90'} ) %></TD>
@@ -111,7 +146,7 @@ END
     <TD COLSPAN=6>&nbsp;</TD>
   </TR>
   <TR>
-    <TD><I>Total</I></TD>
+    <TD COLSPAN=2><I>Total</I></TD>
     <TD ALIGN="right"><I>$<%= sprintf("%.2f", $row->{'owed_0_30'} ) %></TD>
     <TD ALIGN="right"><I>$<%= sprintf("%.2f", $row->{'owed_30_60'} ) %></TD>
     <TD ALIGN="right"><I>$<%= sprintf("%.2f", $row->{'owed_60_90'} ) %></TD>
-- 
cgit v1.2.1


From 8fd8fc66ed88d20b34bcbd267a77f70eaa354f48 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Nov 2003 15:25:51 +0000
Subject: precedence helps alot

---
 httemplate/search/report_receivables.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index 108453d43..f42269f65 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -70,14 +70,14 @@ END
        ( select count(*) from cust_pkg
            where cust_main.custnum = cust_pkg.custnum
              and $recurring
-             and cancel = 0 or cancel is null
+             and ( cancel = 0 or cancel is null )
        ) as uncancelled_pkgs,
 
        ( select count(*) from cust_pkg
            where cust_main.custnum = cust_pkg.custnum
              and $recurring
-             and cancel = 0 or cancel is null
-             and susp = 0 or susp is null
+             and ( cancel = 0 or cancel is null )
+             and ( susp = 0 or susp is null )
        ) as active_pkgs
 
 END
-- 
cgit v1.2.1


From 554cacf4a21ac293280424bf6b09669642426277 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Nov 2003 15:32:45 +0000
Subject: precedence helps alot

---
 httemplate/search/report_receivables.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index f42269f65..66928ebbb 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -123,7 +123,7 @@ END
      if ( $row->{uncancelled_pkgs} ) {
        $status = 'Suspended';
        $statuscol = 'FF9900';
-       if ( $row->{active_pkgs} > $row->{uncancelled_pkgs} ) {
+       if ( $row->{active_pkgs} ) {
          $status = 'Active';
          $statuscol = '00CC00';
        }
-- 
cgit v1.2.1


From 522679c46b8938dbbd9bffe6e0e9724719dbf65d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Nov 2003 18:55:05 +0000
Subject: revert bind_param change!

---
 FS/FS/Record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 63128d1b1..14dfca2cb 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -313,9 +313,9 @@ sub qsearch {
     if ( $record->{$field} =~ /^\d+(\.\d+)?$/
          && $dbdef->table($table)->column($field)->type =~ /(int|serial)/i
     ) {
-      $sth->bind_param($bind++, $record->{$field}, SQL_INTEGER );
+      $sth->bind_param($bind++, $record->{$field}, { TYPE => SQL_INTEGER } );
     } else {
-      $sth->bind_param($bind++, $record->{$field}, SQL_VARCHAR );
+      $sth->bind_param($bind++, $record->{$field}, { TYPE => SQL_VARCHAR } );
     }
   }
 
-- 
cgit v1.2.1


From e10493f669a9bd15b66ee49d639fca08760862c4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 24 Nov 2003 13:01:22 +0000
Subject: fix html quoting of export options

---
 httemplate/browse/part_export.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/browse/part_export.cgi b/httemplate/browse/part_export.cgi
index 76662e0c9..79c57aefc 100755
--- a/httemplate/browse/part_export.cgi
+++ b/httemplate/browse/part_export.cgi
@@ -26,7 +26,7 @@ function part_export_areyousure(href) {
       <%= itable() %>
       <% my %opt = $part_export->options;
          foreach my $opt ( keys %opt ) { %>
-           <TR><TD><%= $opt %></TD><TD><%= $opt{$opt} %></TD></TR>
+           <TR><TD><%= $opt %></TD><TD><%= encode_entities($opt{$opt}) %></TD></TR>
       <% } %>
       </TABLE>
     </TD>
-- 
cgit v1.2.1


From 24d7a586d33a5561b44ae0cfef07afb649b6fcbc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 24 Nov 2003 14:29:01 +0000
Subject: fix html quoting problems

---
 httemplate/edit/part_export.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index cc60f1aeb..4d0c7391f 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -68,9 +68,10 @@ my $widget = new HTML::Widgets::SelectLayers(
         $html .= '</SELECT>';
       } elsif ( $type eq 'textarea' ) {
         $html .= qq!<TEXTAREA NAME="$option" COLS=80 ROWS=8 WRAP="virtual">!.
-                 qq!$value</TEXTAREA>!;
+                 encode_entities($value). '</TEXTAREA>';
       } elsif ( $type eq 'text' ) {
-        $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
+        $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="!.
+                 encode_entities($value). '" SIZE=64>';
       } elsif ( $type eq 'checkbox' ) {
         $html .= qq!<INPUT TYPE="checkbox" NAME="$option" VALUE="1"!;
         $html .= ' CHECKED' if $value;
-- 
cgit v1.2.1


From 1dd8d47eedcd31384b510ad69c122d9d6e56ec5d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Nov 2003 14:26:00 +0000
Subject: add invoice_default_terms config value to control explicit due date
 printing on invoices

---
 FS/FS/Conf.pm      |   8 ++
 FS/FS/cust_bill.pm | 355 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 361 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index ea32b2c23..c69817d49 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -450,6 +450,14 @@ httemplate/docs/config.html
     'type'        => 'textarea',
   },
 
+  { 
+    'key'         => 'invoice_default_terms',
+    'section'     => 'billing',
+    'description' => 'Optional default invoice term, used to calculate a due date printed on invoices.',
+    'type'        => 'select',
+    'select_enum' => [ '', 'Payable upon receipt', 'Net 10', 'Net 15', 'Net 30', 'Net 45', 'Net 60' ],
+  },
+
   {
     'key'         => 'lpr',
     'section'     => 'required',
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index c15dad433..d6e4ab655 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -647,7 +647,7 @@ sub batch_card {
   '';
 }
 
-=item print_text [TIME];
+=item print_text [ TIME [ , TEMPLATE ] ]
 
 Returns an text invoice, as a list of lines.
 
@@ -782,8 +782,17 @@ sub print_text {
   }
 
   #balance due
+  my $balance_due_msg = 'Balance Due';
+
+  if ( $conf->config('invoice_default_terms') =~ /^\s*Net\s*(\d+)\s*$/ ) {
+    $balance_due_msg .=
+      ' - Please pay by '. time2str("%x", $self->_date + ($1*86400) );
+  } elsif ( $conf->config('invoice_default_terms') ) {
+    $balance_due_msg .= ' - '. $conf->config('invoice_default_terms');
+  }
+
   push @buf,['','-----------'];
-  push @buf,['Balance Due', $money_char. 
+  push @buf,[$balance_due_msg, $money_char. 
     sprintf("%10.2f", $balance_due ) ];
 
   #create the template
@@ -877,6 +886,348 @@ sub print_text {
 
 }
 
+=item print_ps [ TIME [ , TEMPLATE ] ]
+
+Returns an postscript invoice, as a scalar.
+
+TIME an optional value used to control the printing of overdue messages.  The
+default is now.  It isn't the date of the invoice; that's the `_date' field.
+It is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=cut
+
+#still some false laziness w/print_text
+sub print_ps {
+
+  my( $self, $today, $template ) = @_;
+  $today ||= time;
+
+#  my $invnum = $self->invnum;
+  my $cust_main = $self->cust_main;
+  $cust_main->payname( $cust_main->first. ' '. $cust_main->getfield('last') )
+    unless $cust_main->payname && $cust_main->payby ne 'CHEK';
+
+  my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
+#  my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
+  #my $balance_due = $self->owed + $pr_total - $cr_total;
+  my $balance_due = $self->owed + $pr_total;
+
+  #my @collect = ();
+  #my($description,$amount);
+  @buf = ();
+
+  #create the template
+  my $templatefile = 'invoice_template_latex';
+  $templatefile .= "_$template" if $template;
+  my @invoice_template = $conf->config($templatefile)
+    or die "cannot load config file $templatefile";
+
+  my %invoice_data = (
+    'invnum'   => $self->invnum,
+    'date'     => time2str('%b %o, %Y', $self->_date),
+    'agent'    => $cust_main->agent->agent,
+    'payname'  => $cust_main->payname,
+    'company'  => $cust_main->company,
+    'address1' => $cust_main->address1,
+    'address2' => $cust_main->address2,
+    'city'     => $cust_main->city,
+    'state'    => $cust_main->state,
+    'zip'      => $cust_main->zip,
+    'country'  => $cust_main->country,
+    'footer'   => <<'END', #should come from config value
+Ivan Kohler\\
+1339 Hayes St.\\
+San Francisco, CA~~94117\\
+ivan@sisd.com~~~~+1 415 462 1624\\
+Freeside - open-source billing - http://www.sisd.com/freeside\\
+END
+
+    'quantity'     => 1,
+
+  );
+
+  #$invoice_data{'footer'} =~ s/\n+$//;
+
+  my $countrydefault = $conf->config('countrydefault') || 'US';
+  $invoice_data{'country'} = '' if $invoice_data{'country'} eq $countrydefault;
+
+  $invoice_data{'po_line'} =
+    (  $cust_main->payby eq 'BILL' && $cust_main->payinfo )
+      ? "Purchase Order #". $cust_main->payinfo
+      : '~';
+
+  my @line_item = ();
+  my @total_item = ();
+  my @filled_in = ();
+  while ( @invoice_template ) {
+    my $line = shift @invoice_template;
+
+    if ( $line =~ /^%%Detail\s*$/ ) {
+
+      while ( ( my $line_item_line = shift @invoice_template )
+              !~ /^%%EndDetail\s*$/                            ) {
+        push @line_item, $line_item_line;
+      }
+      #foreach my $line_item ( $self->_items ) {
+      foreach my $line_item ( $self->_items_pkg ) {
+        $invoice_data{'ref'} = $line_item->{'pkgnum'};
+        $invoice_data{'description'} = $line_item->{'description'};
+        if ( exists $line_item->{'ext_description'} ) {
+          $invoice_data{'description'} .=
+            "\\tabularnewline\n~~".
+            join("\\tabularnewline\n~~", @{$line_item->{'ext_description'}} );
+        }
+        $invoice_data{'amount'} = $line_item->{'amount'};
+        $invoice_data{'product_code'} = $line_item->{'pkgpart'} || 'N/A';
+        push @filled_in,
+          map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b } @line_item;
+      }
+
+    } elsif ( $line =~ /^%%TotalDetails\s*$/ ) {
+
+      while ( ( my $total_item_line = shift @invoice_template )
+              !~ /^%%EndTotalDetails\s*$/                      ) {
+        push @total_item, $total_item_line;
+      }
+
+      my @total_fill = ();
+
+      my $taxtotal = 0;
+      foreach my $tax ( $self->_items_tax ) {
+        $invoice_data{'total_item'} = $tax->{'description'};
+        $taxtotal += ( $invoice_data{'total_amount'} = $tax->{'amount'} );
+        push @total_fill,
+          map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+              @total_item;
+      }
+
+      $invoice_data{'total_item'} = '\textbf{Total}';
+      $invoice_data{'total_amount'} =
+        '\textbf{\dollar '. sprintf('%.2f', $self->owed ). '}';
+      push @total_fill,
+        map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+            @total_item;
+
+      if ( $taxtotal ) {
+        $invoice_data{'total_item'} = 'Sub-total';
+        $invoice_data{'total_amount'} =
+          '\dollar '. sprintf('%.2f', $self->owed - $taxtotal );
+        unshift @total_fill,
+          map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+              @total_item;
+      }
+
+      push @filled_in, @total_fill;
+
+    } else {
+      #$line =~ s/\$(\w+)/$invoice_data{$1}/eg;
+      $line =~ s/\$(\w+)/exists($invoice_data{$1}) ? $invoice_data{$1} : nounder($1)/eg;
+      push @filled_in, $line;
+    }
+
+  }
+
+  sub nounder {
+    my $var = $1;
+    $var =~ s/_/\-/g;
+    $var;
+  }
+
+  my $dir = '/tmp'; #! /usr/local/etc/freeside/invoices.datasrc/
+  my $unique = int(rand(2**31)); #UGH... use File::Temp or something
+
+  chdir($dir);
+  my $file = $self->invnum. ".$unique";
+
+  open(TEX,">$file.tex") or die "can't open $file.tex: $!\n";
+  print TEX join("\n", @filled_in ), "\n";
+  close TEX;
+
+  #error checking!!
+  system('pslatex', "$file.tex");
+  system('pslatex', "$file.tex");
+  #system('dvips', '-t', 'letter', "$file.dvi", "$file.ps");
+  system('dvips', '-t', 'letter', "$file.dvi" );
+
+  open(POSTSCRIPT, "<$file.ps") or die "can't open $file.ps: $!\n";
+
+  #rm $file.dvi $file.log $file.aux
+  #unlink("$file.dvi", "$file.log", "$file.aux", "$file.ps");
+  unlink("$file.dvi", "$file.log", "$file.aux");
+
+  my $ps = '';
+  while (<POSTSCRIPT>) {
+    $ps .= $_;
+  }
+
+  close POSTSCRIPT;
+
+  return $ps;
+
+}
+
+#utility methods for print_*
+
+sub _items {
+  my $self = shift;
+  my @display = scalar(@_)
+                ? @_
+                : qw( _items_pkg );
+                #: qw( _items_previous _items_pkg _items_tax _items_credits _items_payments );
+  my @b = ();
+  foreach my $display ( @display ) {
+    push @b, $self->$display(@_);
+  }
+  @b;
+}
+
+sub _items_previous {
+  my $self = shift;
+  my $cust_main = $self->cust_main;
+  my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
+  my @b = ();
+  foreach ( @pr_cust_bill ) {
+    push @b, [
+      "Previous Balance, Invoice #". $_->invnum. 
+                 " (". time2str("%x",$_->_date). ")",
+      $money_char. sprintf("%10.2f",$_->owed)
+    ];
+  }
+  @b;
+}
+
+sub _items_pkg {
+  my $self = shift;
+  my @cust_bill_pkg = grep { $_->pkgnum } $self->cust_bill_pkg;
+  $self->_items_cust_bill_pkg(\@cust_bill_pkg, @_);
+}
+
+sub _items_tax {
+  my $self = shift;
+  my @cust_bill_pkg = grep { ! $_->pkgnum } $self->cust_bill_pkg;
+  $self->_items_cust_bill_pkg(\@cust_bill_pkg, @_);
+}
+
+sub _items_cust_bill_pkg {
+  my $self = shift;
+  my $cust_bill_pkg = shift;
+
+  my @b = ();
+  foreach my $cust_bill_pkg ( @$cust_bill_pkg ) {
+
+    if ( $cust_bill_pkg->pkgnum ) {
+
+      my $cust_pkg = qsearchs('cust_pkg', { pkgnum =>$cust_bill_pkg->pkgnum } );
+      my $part_pkg = qsearchs('part_pkg', { pkgpart=>$cust_pkg->pkgpart } );
+      my $pkg = $part_pkg->pkg;
+
+      if ( $cust_bill_pkg->setup != 0 ) {
+        my @d = ();
+        @d = $cust_bill_pkg->details if $cust_bill_pkg->recur == 0;
+        push @b, {
+          'description'     => "$pkg Setup",
+          'pkgpart'         => $part_pkg->pkgpart,
+          'pkgnum'          => $cust_pkg->pkgnum,
+          'amount'          => sprintf("%10.2f", $cust_bill_pkg->setup),
+          'ext_description' => [ ( map { $_->[0]. ": ". $_->[1] }
+                                         $cust_pkg->labels        ),
+                                 @d,
+                               ],
+        };
+      }
+
+      if ( $cust_bill_pkg->recur != 0 ) {
+        push @b, {
+          'description'     => "$pkg (" .
+                               time2str('%x', $cust_bill_pkg->sdate). ' - '.
+                               time2str('%x', $cust_bill_pkg->edate). ')',
+          'pkgpart'         => $part_pkg->pkgpart,
+          'pkgnum'          => $cust_pkg->pkgnum,
+          'amount'          => sprintf("%10.2f", $cust_bill_pkg->recur),
+          'ext_description' => [ ( map { $_->[0]. ": ". $_->[1] }
+                                       $cust_pkg->labels          ),
+                                 $cust_bill_pkg->details,
+                               ],
+        };
+      }
+
+    } else { #pkgnum tax or one-shot line item (??)
+
+      my $itemdesc = defined $cust_bill_pkg->dbdef_table->column('itemdesc')
+                     ? ( $cust_bill_pkg->itemdesc || 'Tax' )
+                     : 'Tax';
+      if ( $cust_bill_pkg->setup != 0 ) {
+        push @b, {
+          'description' => $itemdesc,
+          'amount'      => sprintf("%10.2f", $cust_bill_pkg->setup),
+        };
+      }
+      if ( $cust_bill_pkg->recur != 0 ) {
+        push @b, {
+          'description' => "$itemdesc (".
+                           time2str("%x", $cust_bill_pkg->sdate). ' - '.
+                           time2str("%x", $cust_bill_pkg->edate). ')',
+          'amount'      => sprintf("%10.2f", $cust_bill_pkg->recur),
+        };
+      }
+
+    }
+
+  }
+
+  @b;
+
+}
+
+sub _items_credits {
+  my $self = shift;
+
+  my @b;
+  #credits
+  foreach ( $self->cust_credited ) {
+
+    #something more elaborate if $_->amount ne $_->cust_credit->credited ?
+
+    my $reason = substr($_->cust_credit->reason,0,32);
+    $reason .= '...' if length($reason) < length($_->cust_credit->reason);
+    $reason = " ($reason) " if $reason;
+    push @b,[
+      "Credit #". $_->crednum. " (". time2str("%x",$_->cust_credit->_date) .")".
+        $reason,
+      $money_char. sprintf("%10.2f",$_->amount)
+    ];
+  }
+  #foreach ( @cr_cust_credit ) {
+  #  push @buf,[
+  #    "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
+  #    $money_char. sprintf("%10.2f",$_->credited)
+  #  ];
+  #}
+
+  @b;
+
+}
+
+sub _items_payments {
+  my $self = shift;
+
+  my @b;
+  #get & print payments
+  foreach ( $self->cust_bill_pay ) {
+
+    #something more elaborate if $_->amount ne ->cust_pay->paid ?
+
+    push @b,[
+      "Payment received ". time2str("%x",$_->cust_pay->_date ),
+      $money_char. sprintf("%10.2f",$_->amount )
+    ];
+  }
+
+  @b;
+
+}
+
 =back
 
 =head1 BUGS
-- 
cgit v1.2.1


From e6c8cca8d3daec590f248e9ca16384dc8c94e21e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Nov 2003 15:37:14 +0000
Subject: remove spurious Setup on one-time package charges

---
 FS/FS/cust_bill.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index d6e4ab655..aacb50425 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -704,7 +704,9 @@ sub print_text {
       my $pkg = $part_pkg->pkg;
 
       if ( $cust_bill_pkg->setup != 0 ) {
-        push @buf, [ "$pkg Setup",
+        my $description = $pkg;
+        $description .= ' Setup' if $cust_bill_pkg->recur != 0;
+        push @buf, [ $description,
                      $money_char. sprintf("%10.2f", $cust_bill_pkg->setup) ];
         push @buf,
           map { [ "  ". $_->[0]. ": ". $_->[1], '' ] } $cust_pkg->labels;
@@ -1123,10 +1125,12 @@ sub _items_cust_bill_pkg {
       my $pkg = $part_pkg->pkg;
 
       if ( $cust_bill_pkg->setup != 0 ) {
+        my $description = $pkg;
+        $description .= ' Setup' if $cust_bill_pkg->recur != 0;
         my @d = ();
         @d = $cust_bill_pkg->details if $cust_bill_pkg->recur == 0;
         push @b, {
-          'description'     => "$pkg Setup",
+          'description'     => $description,
           'pkgpart'         => $part_pkg->pkgpart,
           'pkgnum'          => $cust_pkg->pkgnum,
           'amount'          => sprintf("%10.2f", $cust_bill_pkg->setup),
-- 
cgit v1.2.1


From 23ec9b00410224868d6be1e47a0d72a6c8b3f6f5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 29 Nov 2003 08:08:36 +0000
Subject: postscript invoice redux

---
 FS/FS/Conf.pm                     |  37 ++++++++-
 FS/FS/cust_bill.pm                | 165 ++++++++++++++++++++++++--------------
 conf/invoice_latex                | 155 +++++++++++++++++++++++++++++++++++
 conf/invoice_latexfooter          |   5 ++
 conf/invoice_latexnotes           |   9 +++
 httemplate/misc/print-invoice.cgi |   9 ++-
 httemplate/view/cust_bill-ps.cgi  |  13 +++
 7 files changed, 332 insertions(+), 61 deletions(-)
 create mode 100644 conf/invoice_latex
 create mode 100644 conf/invoice_latexfooter
 create mode 100644 conf/invoice_latexnotes
 create mode 100755 httemplate/view/cust_bill-ps.cgi

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index c69817d49..b30beafaf 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -174,7 +174,7 @@ sub config_items {
   my $self = shift; 
   #quelle kludge
   @config_items,
-  map { 
+  ( map { 
         my $basename = basename($_);
         $basename =~ /^(.*)$/;
         $basename = $1;
@@ -185,7 +185,19 @@ sub config_items {
                            'type'        => 'textarea',
                          }
       } glob($self->dir. '/invoice_template_*')
-  ;
+  ),
+  ( map { 
+        my $basename = basename($_);
+        $basename =~ /^(.*)$/;
+        $basename = $1;
+        new FS::ConfItem {
+                           'key'         => $basename,
+                           'section'     => 'billing',
+                           'description' => 'Alternate LaTeX template for invoices.  See the <a href="../docs/billing.html">billing documentation</a> for details.',
+                           'type'        => 'textarea',
+                         }
+      } glob($self->dir. '/invoice_latex_*')
+  );
 }
 
 =back
@@ -450,6 +462,27 @@ httemplate/docs/config.html
     'type'        => 'textarea',
   },
 
+  {
+    'key'         => 'invoice_latex',
+    'section'     => 'billing',
+    'description' => 'Optional LaTeX template for typeset PostScript invoices.',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'invoice_latexnotes',
+    'section'     => 'billing',
+    'description' => 'Notes section for LaTeX typeset PostScript invoices.',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'invoice_latexfooter',
+    'section'     => 'billing',
+    'description' => 'Footer for LaTeX typeset PostScript invoices.',
+    'type'        => 'textarea',
+  },
+
   { 
     'key'         => 'invoice_default_terms',
     'section'     => 'billing',
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index aacb50425..9409bc5f6 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -784,14 +784,7 @@ sub print_text {
   }
 
   #balance due
-  my $balance_due_msg = 'Balance Due';
-
-  if ( $conf->config('invoice_default_terms') =~ /^\s*Net\s*(\d+)\s*$/ ) {
-    $balance_due_msg .=
-      ' - Please pay by '. time2str("%x", $self->_date + ($1*86400) );
-  } elsif ( $conf->config('invoice_default_terms') ) {
-    $balance_due_msg .= ' - '. $conf->config('invoice_default_terms');
-  }
+  my $balance_due_msg = $self->balance_due_msg;
 
   push @buf,['','-----------'];
   push @buf,[$balance_due_msg, $money_char. 
@@ -920,36 +913,31 @@ sub print_ps {
   @buf = ();
 
   #create the template
-  my $templatefile = 'invoice_template_latex';
+  my $templatefile = 'invoice_latex';
   $templatefile .= "_$template" if $template;
   my @invoice_template = $conf->config($templatefile)
     or die "cannot load config file $templatefile";
 
   my %invoice_data = (
-    'invnum'   => $self->invnum,
-    'date'     => time2str('%b %o, %Y', $self->_date),
-    'agent'    => $cust_main->agent->agent,
-    'payname'  => $cust_main->payname,
-    'company'  => $cust_main->company,
-    'address1' => $cust_main->address1,
-    'address2' => $cust_main->address2,
-    'city'     => $cust_main->city,
-    'state'    => $cust_main->state,
-    'zip'      => $cust_main->zip,
-    'country'  => $cust_main->country,
-    'footer'   => <<'END', #should come from config value
-Ivan Kohler\\
-1339 Hayes St.\\
-San Francisco, CA~~94117\\
-ivan@sisd.com~~~~+1 415 462 1624\\
-Freeside - open-source billing - http://www.sisd.com/freeside\\
-END
-
+    'invnum'       => $self->invnum,
+    'date'         => time2str('%b %o, %Y', $self->_date),
+    'agent'        => $cust_main->agent->agent,
+    'payname'      => $cust_main->payname,
+    'company'      => $cust_main->company,
+    'address1'     => $cust_main->address1,
+    'address2'     => $cust_main->address2,
+    'city'         => $cust_main->city,
+    'state'        => $cust_main->state,
+    'zip'          => $cust_main->zip,
+    'country'      => $cust_main->country,
+    'footer'       => join("\n", $conf->config('invoice_latexfooter') ),
     'quantity'     => 1,
-
+    'terms'        => $conf->config('invoice_default_terms') || 'Payable upon receipt',
+    'notes'        => join("\n", $conf->config('invoice_latexnotes') ),
   );
 
-  #$invoice_data{'footer'} =~ s/\n+$//;
+  $invoice_data{'footer'} =~ s/\n+$//;
+  $invoice_data{'notes'} =~ s/\n+$//;
 
   my $countrydefault = $conf->config('countrydefault') || 'US';
   $invoice_data{'country'} = '' if $invoice_data{'country'} eq $countrydefault;
@@ -971,8 +959,8 @@ END
               !~ /^%%EndDetail\s*$/                            ) {
         push @line_item, $line_item_line;
       }
-      #foreach my $line_item ( $self->_items ) {
-      foreach my $line_item ( $self->_items_pkg ) {
+      foreach my $line_item ( $self->_items ) {
+      #foreach my $line_item ( $self->_items_pkg ) {
         $invoice_data{'ref'} = $line_item->{'pkgnum'};
         $invoice_data{'description'} = $line_item->{'description'};
         if ( exists $line_item->{'ext_description'} ) {
@@ -1004,22 +992,51 @@ END
               @total_item;
       }
 
+      if ( $taxtotal ) {
+        $invoice_data{'total_item'} = 'Sub-total';
+        $invoice_data{'total_amount'} =
+          '\dollar '. sprintf('%.2f', $self->charged - $taxtotal );
+        unshift @total_fill,
+          map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+              @total_item;
+      }
+
       $invoice_data{'total_item'} = '\textbf{Total}';
       $invoice_data{'total_amount'} =
-        '\textbf{\dollar '. sprintf('%.2f', $self->owed ). '}';
+        '\textbf{\dollar '. sprintf('%.2f', $self->charged + $pr_total ). '}';
       push @total_fill,
         map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
             @total_item;
 
-      if ( $taxtotal ) {
-        $invoice_data{'total_item'} = 'Sub-total';
-        $invoice_data{'total_amount'} =
-          '\dollar '. sprintf('%.2f', $self->owed - $taxtotal );
-        unshift @total_fill,
+      #foreach my $thing ( sort { $a->_date <=> $b->_date } $self->_items_credits, $self->_items_payments
+
+      # credits
+      foreach my $credit ( $self->_items_credits ) {
+        $invoice_data{'total_item'} = $credit->{'description'};
+        #$credittotal
+        $invoice_data{'total_amount'} = '-\dollar '. $credit->{'amount'};
+        push @total_fill, 
+          map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+              @total_item;
+      }
+
+      # payments
+      foreach my $payment ( $self->_items_payments ) {
+        $invoice_data{'total_item'} = $payment->{'description'};
+        #$paymenttotal
+        $invoice_data{'total_amount'} = '-\dollar '. $payment->{'amount'};
+        push @total_fill, 
           map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
               @total_item;
       }
 
+      $invoice_data{'total_item'} = '\textbf{'. $self->balance_due_msg. '}';
+      $invoice_data{'total_amount'} =
+        '\textbf{\dollar '. sprintf('%.2f', $self->owed + $pr_total ). '}';
+      push @total_fill,
+        map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+            @total_item;
+
       push @filled_in, @total_fill;
 
     } else {
@@ -1052,7 +1069,7 @@ END
   #system('dvips', '-t', 'letter', "$file.dvi", "$file.ps");
   system('dvips', '-t', 'letter', "$file.dvi" );
 
-  open(POSTSCRIPT, "<$file.ps") or die "can't open $file.ps: $!\n";
+  open(POSTSCRIPT, "<$file.ps") or die "can't open $file.ps (probable error in LaTeX template): $!\n";
 
   #rm $file.dvi $file.log $file.aux
   #unlink("$file.dvi", "$file.log", "$file.aux", "$file.ps");
@@ -1071,11 +1088,23 @@ END
 
 #utility methods for print_*
 
+sub balance_due_msg {
+  my $self = shift;
+  my $msg = 'Balance Due';
+  if ( $conf->config('invoice_default_terms') =~ /^\s*Net\s*(\d+)\s*$/ ) {
+    $msg .= ' - Please pay by '. time2str("%x", $self->_date + ($1*86400) );
+  } elsif ( $conf->config('invoice_default_terms') ) {
+    $msg .= ' - '. $conf->config('invoice_default_terms');
+  }
+  $msg;
+}
+
 sub _items {
   my $self = shift;
   my @display = scalar(@_)
                 ? @_
-                : qw( _items_pkg );
+                : qw( _items_previous _items_pkg );
+                #: qw( _items_pkg );
                 #: qw( _items_previous _items_pkg _items_tax _items_credits _items_payments );
   my @b = ();
   foreach my $display ( @display ) {
@@ -1090,13 +1119,28 @@ sub _items_previous {
   my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
   my @b = ();
   foreach ( @pr_cust_bill ) {
-    push @b, [
-      "Previous Balance, Invoice #". $_->invnum. 
-                 " (". time2str("%x",$_->_date). ")",
-      $money_char. sprintf("%10.2f",$_->owed)
-    ];
+    push @b, {
+      'description' => 'Previous Balance, Invoice \#'. $_->invnum. 
+                       ' ('. time2str('%x',$_->_date). ')',
+      #'pkgpart'     => 'N/A',
+      'pkgnum'      => 'N/A',
+      'amount'      => sprintf("%10.2f", $_->owed),
+    };
   }
   @b;
+
+  #{
+  #    'description'     => 'Previous Balance',
+  #    #'pkgpart'         => 'N/A',
+  #    'pkgnum'          => 'N/A',
+  #    'amount'          => sprintf("%10.2f", $pr_total ),
+  #    'ext_description' => [ map {
+  #                                 "Invoice ". $_->invnum.
+  #                                 " (". time2str("%x",$_->_date). ") ".
+  #                                 sprintf("%10.2f", $_->owed)
+  #                         } @pr_cust_bill ],
+
+  #};
 }
 
 sub _items_pkg {
@@ -1131,7 +1175,7 @@ sub _items_cust_bill_pkg {
         @d = $cust_bill_pkg->details if $cust_bill_pkg->recur == 0;
         push @b, {
           'description'     => $description,
-          'pkgpart'         => $part_pkg->pkgpart,
+          #'pkgpart'         => $part_pkg->pkgpart,
           'pkgnum'          => $cust_pkg->pkgnum,
           'amount'          => sprintf("%10.2f", $cust_bill_pkg->setup),
           'ext_description' => [ ( map { $_->[0]. ": ". $_->[1] }
@@ -1146,7 +1190,7 @@ sub _items_cust_bill_pkg {
           'description'     => "$pkg (" .
                                time2str('%x', $cust_bill_pkg->sdate). ' - '.
                                time2str('%x', $cust_bill_pkg->edate). ')',
-          'pkgpart'         => $part_pkg->pkgpart,
+          #'pkgpart'         => $part_pkg->pkgpart,
           'pkgnum'          => $cust_pkg->pkgnum,
           'amount'          => sprintf("%10.2f", $cust_bill_pkg->recur),
           'ext_description' => [ ( map { $_->[0]. ": ". $_->[1] }
@@ -1193,14 +1237,18 @@ sub _items_credits {
 
     #something more elaborate if $_->amount ne $_->cust_credit->credited ?
 
-    my $reason = substr($_->cust_credit->reason,0,32);
-    $reason .= '...' if length($reason) < length($_->cust_credit->reason);
+    my $reason = $_->cust_credit->reason;
+    #my $reason = substr($_->cust_credit->reason,0,32);
+    #$reason .= '...' if length($reason) < length($_->cust_credit->reason);
     $reason = " ($reason) " if $reason;
-    push @b,[
-      "Credit #". $_->crednum. " (". time2str("%x",$_->cust_credit->_date) .")".
-        $reason,
-      $money_char. sprintf("%10.2f",$_->amount)
-    ];
+    push @b, {
+      #'description' => 'Credit ref\#'. $_->crednum.
+      #                 " (". time2str("%x",$_->cust_credit->_date) .")".
+      #                 $reason,
+      'description' => 'Credit applied'.
+                       time2str("%x",$_->cust_credit->_date). $reason,
+      'amount'      => sprintf("%10.2f",$_->amount),
+    };
   }
   #foreach ( @cr_cust_credit ) {
   #  push @buf,[
@@ -1222,10 +1270,11 @@ sub _items_payments {
 
     #something more elaborate if $_->amount ne ->cust_pay->paid ?
 
-    push @b,[
-      "Payment received ". time2str("%x",$_->cust_pay->_date ),
-      $money_char. sprintf("%10.2f",$_->amount )
-    ];
+    push @b, {
+      'description' => "Payment received ".
+                       time2str("%x",$_->cust_pay->_date ),
+      'amount'      => sprintf("%10.2f", $_->amount )
+    };
   }
 
   @b;
diff --git a/conf/invoice_latex b/conf/invoice_latex
new file mode 100644
index 000000000..a89b9a33a
--- /dev/null
+++ b/conf/invoice_latex
@@ -0,0 +1,155 @@
+%% file: Standard Multipage.tex
+%% Purpose: Multipage bill template for e-Bills
+%% 
+%% Created by Mark Asplen-Taylor
+%% Asplen Management Ltd
+%% www.asplen.co.uk
+%%
+%% Modified for Freeside by Ivan Kohler
+%%
+%% Changes
+%% 	0.1	4/12/00	Created
+%%	0.2	18/10/01	More fields added
+%%	1.0	16/11/01	RELEASED
+%%	1.2	16/10/02	Invoice number added
+%%	1.3	2/12/02	Logo graphic added
+%%	1.4	7/2/03	Multipage headers/footers added
+%%      n/a     10/12/03 forked for Freeside; checked into CVS
+%%
+
+\documentclass[letterpaper]{article}
+
+\usepackage{fancyhdr,lastpage,ifthen,longtable,afterpage}
+\usepackage{graphicx}			% required for logo graphic
+
+\addtolength{\voffset}{-0.0in}	% top margin to top of header
+\addtolength{\hoffset}{-0.25in}	%left margin on page
+\addtolength{\topmargin}{-0.6in}	% top margin to top of header
+\setlength{\headheight}{1in} 		% height of header
+\setlength{\headsep}{0.5in}    	% between header and text
+\addtolength{\textheight}{-0.4in} 	% height of main text
+
+\addtolength{\textheight}{-0.5in} 	% height of main text
+\setlength{\footskip}{0.5in}		% bottom of footer from bottom of text
+
+\addtolength{\textwidth}{2.1in}    	% width of text
+\setlength{\oddsidemargin}{0in} 	% odd page left margin
+\setlength{\evensidemargin}{0in} 	% even page left margin
+
+\renewcommand{\headrulewidth}{0pt}
+\renewcommand{\footrulewidth}{1pt}
+
+						% New command for address lines i.e. skip them if blank
+
+\newcommand{\addressline}[1]{\ifthenelse{\equal{#1}{}}{}{#1\newline}}
+\newcommand{\dollar}[1][]{\symbol{36}} % Inserts dollar symbol
+
+\pagestyle{fancy}
+
+%% Font options are:
+%%	bch	Bitsream Charter
+%% 	put	Utopia
+%%	phv	Adobe Helvetica
+%%	pnc	New Century Schoolbook
+%%	ptm	Times
+%%	pcr	Courier
+
+\renewcommand{\familydefault}{phv}		
+
+\begin{document}
+%
+%%	Headers and footers defined for the first page
+\fancyfoot[CO,CE]{\small{
+\begin{tabular}{c}
+$footer
+\end{tabular}}}
+%
+%%	The LH Heading comprising logo
+%%	UNCOMMENT the following FOUR lines and change the path if necssary to provide a logo
+\fancyhead[LO,LE]{
+\begin{tabular}{l}
+\includegraphics{/usr/local/etc/freeside/logo.eps}
+\end{tabular}}
+%
+%%	The Heading comprising isue date, customer ref & INVOICE name
+\fancyhead[RO,RE]{
+\begin{tabular}{rcl}
+Invoice date & & Invoice number \\
+\vspace{0.2cm}
+\textbf{$date} & & \textbf{$invnum} \\\hline
+\rule{0pt}{5ex} &~~ \huge{\textsc{Invoice}}& \\
+\vspace{-0.2cm}
+ & & \\\hline
+\end{tabular}}
+%
+%%	Header & footer changes for subsequent pages
+%
+\afterpage{ \fancyfoot[RO,RE]{\small{\thepage\ of \pageref{LastPage}}} }
+\afterpage{ \fancyfoot[CO,CE]{\small{$org_company}} }
+\afterpage{ \fancyhead[LO,LE]{\small{}} }
+\afterpage{ \fancyhead[RO,RE]{\small{
+\begin{tabular}{ll}
+Date & Account number\\
+\textbf{ $date_of_bill} & \textbf{ $customer_ref}\\
+\end{tabular}}} }
+%
+%
+\makebox{
+\begin{minipage}[t]{2.9in}
+\vspace{0.20in}
+\textbf{$payname}\\
+\addressline{$company}
+\addressline{$address1}
+\addressline{$address2}
+\addressline{$city, $state  $zip}
+\addressline{$country}
+\end{minipage}}
+\hfill
+\makebox{
+\begin{minipage}[t]{2.5in}
+\begin{flushright}
+Terms: $terms\\
+$po_line\\
+\end{flushright}
+\end{minipage}}
+\vspace{0.5cm}
+%
+\section*{\textsc{Charges}}
+\begin{longtable}{|c|l|c|r|r|}
+\hline
+\rule{0pt}{2.5ex}
+\makebox[1.4cm]{\textbf{Ref}} & 
+\makebox[7.9cm][l]{\textbf{Description}} & 
+\makebox[1.3cm][c]{\textbf{Quantity}} & 
+\makebox[2.5cm][r]{\textbf{Unit Price}} & 
+\makebox[2.5cm][r]{\textbf{Amount}} \\
+\hline
+\endfirsthead
+\multicolumn{5}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\
+\hline
+\rule{0pt}{2.5ex}
+\makebox[1.4cm]{\textbf{Ref}} & 
+\makebox[7.9cm][l]{\textbf{Description}} & 
+\makebox[1.3cm][c]{\textbf{Quantity}} & 
+\makebox[2.5cm][r]{\textbf{Unit Price}} & 
+\makebox[2.5cm][r]{\textbf{Amount}} \\
+\hline
+\endhead
+\multicolumn{5}{r}{\rule{0pt}{2.5ex}/cont...}\\
+\endfoot
+%%TotalDetails
+ & \multicolumn{3}{l}{$total_item}    & $total_amount\\
+%%EndTotalDetails
+\hline
+\endlastfoot
+%%Detail
+\rule{0pt}{2.5ex}$ref & 
+\begin{tabular}{l}
+$description\tabularnewline
+\end{tabular}
+& $quantity & \dollar $amount & \dollar $amount\\\hline
+%%EndDetail
+\end{longtable}
+\vfill
+$notes
+\end{document}
diff --git a/conf/invoice_latexfooter b/conf/invoice_latexfooter
new file mode 100644
index 000000000..110b1e6fe
--- /dev/null
+++ b/conf/invoice_latexfooter
@@ -0,0 +1,5 @@
+Ivan Kohler\\
+P.O. Box 1272\\
+Carnelian Bay, CA~~96140\\
+ivan@sisd.com~~~~+1 415 462 1624\\
+Freeside - open-source billing - http://www.sisd.com/freeside\\
diff --git a/conf/invoice_latexnotes b/conf/invoice_latexnotes
new file mode 100644
index 000000000..29e173103
--- /dev/null
+++ b/conf/invoice_latexnotes
@@ -0,0 +1,9 @@
+%%
+%%	Add any customer specific notes in here
+%%
+\section*{\textsc{Notes}}
+\begin{enumerate}
+\item PLEASE NOTE NEW ADDRESS BELOW!
+\item Please make your check payable to \textbf{Ivan Kohler}.
+\item If you have any questions please email or telephone.
+\end{enumerate}
diff --git a/httemplate/misc/print-invoice.cgi b/httemplate/misc/print-invoice.cgi
index a5500bff2..8c1240c05 100755
--- a/httemplate/misc/print-invoice.cgi
+++ b/httemplate/misc/print-invoice.cgi
@@ -11,7 +11,14 @@ my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Can't find invoice!\n" unless $cust_bill;
 
         open(LPR,"|$lpr") or die "Can't open $lpr: $!";
-        print LPR $cust_bill->print_text; #( date )
+
+        if ( $conf->exists('invoice_latex') ) {
+          $cust_bill->print_ps;
+          #print LPR $cust_bill->print_ps; #( date )
+        } else {
+          print LPR $cust_bill->print_text; #( date )
+        }
+
         close LPR
           or die $! ? "Error closing $lpr: $!"
                        : "Exit status $? from $lpr";
diff --git a/httemplate/view/cust_bill-ps.cgi b/httemplate/view/cust_bill-ps.cgi
new file mode 100755
index 000000000..03340a16f
--- /dev/null
+++ b/httemplate/view/cust_bill-ps.cgi
@@ -0,0 +1,13 @@
+<%
+
+#untaint invnum
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+my $invnum = $1;
+
+my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
+die "Invoice #$invnum not found!" unless $cust_bill;
+
+http_header('Content-Type' => 'application/postscript' );
+%>
+<%= $cust_bill->print_ps %>
-- 
cgit v1.2.1


From 98fc23b80dbc4935ff7a6efeb49fd3876b96f029 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 29 Nov 2003 08:18:23 +0000
Subject: also set default latex template for late bill templates

---
 FS/FS/part_bill_event.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
index 9e5d82161..86f929424 100644
--- a/FS/FS/part_bill_event.pm
+++ b/FS/FS/part_bill_event.pm
@@ -160,6 +160,12 @@ sub check {
           join("\n", $conf->config('invoice_template') )
       );
     }
+    unless ( $conf->exists("invoice_latex_$name") ) {
+      $conf->set(
+        "invoice_latex_$name" =>
+          join("\n", $conf->config('invoice_latex') )
+      );
+    }
   }
 
   $self->SUPER::check;
-- 
cgit v1.2.1


From 281d9b3d2f0f955c159275cafe405f73c88733ba Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 29 Nov 2003 08:32:40 +0000
Subject: option to send statements when a payment or credit is applied

---
 FS/FS/Conf.pm             |  7 +++++++
 FS/FS/cust_bill_pay.pm    | 19 +++++++++++++------
 FS/FS/cust_credit_bill.pm | 33 +++++++++++++++++++++++++++++----
 3 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index b30beafaf..d911480df 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -491,6 +491,13 @@ httemplate/docs/config.html
     'select_enum' => [ '', 'Payable upon receipt', 'Net 10', 'Net 15', 'Net 30', 'Net 45', 'Net 60' ],
   },
 
+  {
+    'key'         => 'invoice_send_receipts',
+    'section'     => 'billing',
+    'description' => 'Send receipts for payments and credits.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'lpr',
     'section'     => 'required',
diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index 5f4a49144..c8b5525ea 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -1,13 +1,18 @@
 package FS::cust_bill_pay;
 
 use strict;
-use vars qw( @ISA );
+use vars qw( @ISA $conf );
 use FS::Record qw( qsearch qsearchs dbh );
 use FS::cust_bill;
 use FS::cust_pay;
 
 @ISA = qw( FS::Record );
 
+#ask FS::UID to run this stuff for us later
+FS::UID->install_callback( sub { 
+  $conf = new FS::Conf;
+} );
+
 =head1 NAME
 
 FS::cust_bill_pay - Object methods for cust_bill_pay records
@@ -101,7 +106,8 @@ sub insert {
            " greater than cust_pay.paid ". $cust_pay->paid;
   }
 
-  my $cust_bill = qsearchs('cust_bill', { 'invnum' => $self->invnum } ) or do {
+  my $cust_bill = $self->cust_bill;
+  unless ( $cust_bill ) {
     $dbh->rollback if $oldAutoCommit;
     return "unknown cust_bill.invnum: ". $self->invnum;
   };
@@ -120,6 +126,11 @@ sub insert {
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
+  if ( $conf->exists('invoice_send_receipts') ) {
+    my $send_error = $cust_bill->send;
+    warn "Error sending receipt: $send_error\n" if $send_error;
+  }
+
   '';
 }
 
@@ -197,10 +208,6 @@ sub cust_bill {
 
 =back
 
-=head1 VERSION
-
-$Id: cust_bill_pay.pm,v 1.13 2003-08-05 00:20:41 khoff Exp $
-
 =head1 BUGS
 
 Delete and replace methods.
diff --git a/FS/FS/cust_credit_bill.pm b/FS/FS/cust_credit_bill.pm
index a54acb683..0bbc656ea 100644
--- a/FS/FS/cust_credit_bill.pm
+++ b/FS/FS/cust_credit_bill.pm
@@ -1,7 +1,7 @@
 package FS::cust_credit_bill;
 
 use strict;
-use vars qw( @ISA );
+use vars qw( @ISA $conf );
 use FS::UID qw( getotaker );
 use FS::Record qw( qsearch qsearchs );
 use FS::cust_main;
@@ -11,6 +11,11 @@ use FS::cust_bill;
 
 @ISA = qw( FS::Record );
 
+#ask FS::UID to run this stuff for us later
+FS::UID->install_callback( sub { 
+  $conf = new FS::Conf;
+} );
+
 =head1 NAME
 
 FS::cust_credit_bill - Object methods for cust_credit_bill records
@@ -69,6 +74,19 @@ sub table { 'cust_credit_bill'; }
 Adds this cust_credit_bill to the database ("Posts" all or part of a credit).
 If there is an error, returns the error, otherwise returns false.
 
+sub insert {
+  my $self = shift;
+  my $error = $self->SUPER::insert(@_);
+  return $error if $error;
+
+  if ( $conf->exists('invoice_send_receipts') ) {
+    my $send_error = $self->cust_bill->send;
+    warn "Error sending receipt: $send_error\n" if $send_error;
+  }
+
+  '';
+}
+
 =item delete
 
 Currently unimplemented.
@@ -141,11 +159,18 @@ sub cust_credit {
   qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
 }
 
-=back
+=item cust_bill 
+
+Returns the invoice (see L<FS::cust_bill>)
 
-=head1 VERSION
+=cut
 
-$Id: cust_credit_bill.pm,v 1.8 2003-08-05 00:20:41 khoff Exp $
+sub cust_bill {
+  my $self = shift;
+  qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
+}
+
+=back
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From e294302d8bf2b12eec690d8c9f517fa81825c79a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 29 Nov 2003 10:39:58 +0000
Subject: adding sql_generic price plan

---
 httemplate/edit/part_pkg.cgi | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 862e98ecf..b697a76b2 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -439,6 +439,41 @@ tie my %plans, 'Tie::IxHash',
     'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); push @details, \"Last month\\\'s excess data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\", \"Last month\\\'s excess time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; \' + what.recur_flat.value + \' + $hourscharge + \' + what.recur_input_charge.value + \' * $input + \' + what.recur_output_charge.value + \' * $output + $totalcharge ;\'',
   },
 
+  'sql_generic' => {
+    'name' => 'Base charge plus a metered rate from a configurable SQL query',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'recur_included' => { 'name' => 'Units included',
+                            'default' => 0,
+                          },
+      'recur_unit_charge' => { 'name' => 'Additional charge per unit',
+                               'default' => 0,
+                             },
+      'datasrc' => { 'name' => 'DBI data source',
+                     'default' => '',
+                   },
+      'db_username' => { 'name' => 'Database username',
+                         'default' => '',
+                       },
+      'db_password' => { 'name' => 'Database username',
+                         'default' => '',
+                       },
+      'query' => { 'name' => 'SQL query',
+                   'default' => '',
+                 },
+    },
+    'fieldorder' => [qw( setup_fee recur_flat recur_included recur_unit_charge datasrc db_username db_password query )],
+    'setup' => 'what.setup_fee.value',
+   # 'recur' => '\'my $dbh = DBI->connect(\"\' + what.datasrc.value + \'\", \"\' + what.db_username.value + \'\") or die $DBI::errstr; \'',
+   'recur' => '\'my $dbh = DBI->connect(\"\' + what.datasrc.value + \'\", \"\' + what.db_username.value + \'\", \"\' + what.db_password.value + \'\" ) or die $DBI::errstr; my $sth = $dbh->prepare(\"\' + what.query.value + \'\") or die $dbh->errstr; my $units = 0; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq \"svc_domain\" } $cust_pkg->cust_svc ) { my $domain = $cust_svc->svc_x->domain; $sth->execute($domain) or die $sth->errstr; $units += $sth->fetchrow_arrayref->[0]; } $units -= \' + what.recur_included.value + \'; $units = 0 if $units < 0; \' + what.recur_flat.value + \' + $units * \' + what.recur_unit_charge.value + \';\'',
+    #'recur' => '\'my $dbh = DBI->connect("\' + what.datasrc.value + \'", "\' + what.db_username.value + \'", "\' what.db_password.value + \'" ) or die $DBI::errstr; my $sth = $dbh->prepare("\' + what.query.value + \'") or die $dbh->errstr; my $units = 0; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq "svc_domain" } $cust_pkg->cust_svc ) { my $domain = $cust_svc->svc_x->domain; $sth->execute($domain) or die $sth->errstr; $units += $sth->fetchrow_arrayref->[0]; } $units -= \' + what.recur_included.value + \'; $units = 0 if $units < 0; \' + what.recur_flat.value + \' + $units * \' + what.recur_unit_charge + \';\'',
+  },
+
 ;
 
 my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
-- 
cgit v1.2.1


From d6297be89acbef3cdf9fce4925f797063583b066 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 29 Nov 2003 10:48:57 +0000
Subject: use the latex template for normal printing when available

---
 FS/FS/cust_bill.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 9409bc5f6..64759f9bf 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -343,6 +343,10 @@ sub send {
 
   }
 
+  if ( $conf->config('invoice_latex') ) {
+    @print_text = $self->print_ps('', $template);
+  }
+
   if ( grep { $_ eq 'POST' } @invoicing_list ) { #postal
     my $lpr = $conf->config('lpr');
     open(LPR, "|$lpr")
-- 
cgit v1.2.1


From 9c6cd7a1ee5f65e3a608b3d3119005d90ecbf4a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 29 Nov 2003 10:50:47 +0000
Subject: missing cut

---
 FS/FS/cust_credit_bill.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/FS/FS/cust_credit_bill.pm b/FS/FS/cust_credit_bill.pm
index 0bbc656ea..88a732bc6 100644
--- a/FS/FS/cust_credit_bill.pm
+++ b/FS/FS/cust_credit_bill.pm
@@ -74,6 +74,8 @@ sub table { 'cust_credit_bill'; }
 Adds this cust_credit_bill to the database ("Posts" all or part of a credit).
 If there is an error, returns the error, otherwise returns false.
 
+=cut
+
 sub insert {
   my $self = shift;
   my $error = $self->SUPER::insert(@_);
-- 
cgit v1.2.1


From 333281ca2d026e7b02bc53edbda15d88c0285dcb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 30 Nov 2003 07:41:26 +0000
Subject: move to the left to line up with window envelopes

---
 conf/invoice_latex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/invoice_latex b/conf/invoice_latex
index a89b9a33a..02d865626 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -23,7 +23,7 @@
 \usepackage{graphicx}			% required for logo graphic
 
 \addtolength{\voffset}{-0.0in}	% top margin to top of header
-\addtolength{\hoffset}{-0.25in}	%left margin on page
+\addtolength{\hoffset}{-0.55in}	%left margin on page
 \addtolength{\topmargin}{-0.6in}	% top margin to top of header
 \setlength{\headheight}{1in} 		% height of header
 \setlength{\headsep}{0.5in}    	% between header and text
-- 
cgit v1.2.1


From 7f300c1a420b3a95bb7e99c0161059718fb21932 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 30 Nov 2003 07:52:17 +0000
Subject: add link to view typeset invoice

---
 httemplate/view/cust_bill.cgi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 53d7bc051..ddc92748d 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -22,6 +22,10 @@ print qq!<A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) aga
 
 print qq!<A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>!.      '<BR><BR>';
 
+print menubar(
+  'View typeset invoice' => "${p}view/cust_bill-ps.cgi?$invnum",
+), '<BR><BR>';
+
 #false laziness with search/cust_bill_event.cgi
 
 print table(). '<TR><TH>Event</TH><TH>Date</TH><TH>Status</TH></TR>';
-- 
cgit v1.2.1


From 9748a639549536ad0fc29445c8ea500ded22547d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 30 Nov 2003 08:06:56 +0000
Subject: explicitly tell dvips to write output to a file

---
 FS/FS/cust_bill.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 64759f9bf..868771109 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1071,7 +1071,7 @@ sub print_ps {
   system('pslatex', "$file.tex");
   system('pslatex', "$file.tex");
   #system('dvips', '-t', 'letter', "$file.dvi", "$file.ps");
-  system('dvips', '-t', 'letter', "$file.dvi" );
+  system('dvips', '-t', 'letter', "$file.dvi", '-o', "$file.ps" );
 
   open(POSTSCRIPT, "<$file.ps") or die "can't open $file.ps (probable error in LaTeX template): $!\n";
 
-- 
cgit v1.2.1


From 10632b11a7222299b19c5949acc983d7eeefbeee Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Dec 2003 22:50:44 +0000
Subject: add part_referral.disabled

---
 FS/FS/part_referral.pm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_referral.pm b/FS/FS/part_referral.pm
index f30ddad01..c0858c0ed 100644
--- a/FS/FS/part_referral.pm
+++ b/FS/FS/part_referral.pm
@@ -38,6 +38,8 @@ The following fields are currently supported:
 
 =item referral - Text name of this advertising source
 
+=item disabled - Disabled flag, empty or 'Y'
+
 =back
 
 =head1 NOTE
@@ -91,10 +93,17 @@ replace methods.
 sub check {
   my $self = shift;
 
-  $self->ut_numbern('refnum')
+  my $error = $self->ut_numbern('refnum')
     || $self->ut_text('referral')
-    || $self->SUPER::check
   ;
+  return $error if $error;
+
+  if ( $self->dbdef_table->column('disabled') ) {
+    $error = $self->ut_enum('disabled', [ '', 'Y' ] );
+    return $error if $error;
+  }
+
+  $self->SUPER::check;
 }
 
 =back
-- 
cgit v1.2.1


From a5bc5bcbadafe55b31d9e97fccb6122477e390fb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Dec 2003 22:51:06 +0000
Subject: add part_referral.disabled, add disabled indices to agent and
 part_bill_event

---
 FS/bin/freeside-setup          | 9 +++++----
 httemplate/docs/upgrade10.html | 5 +++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 80b74c1f1..4e3a09aad 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -342,7 +342,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'agentnum',
       'unique' => [],
-      'index' => [ ['typenum'] ],
+      'index' => [ ['typenum'], ['diabled'] ],
     },
 
     'agent_type' => {
@@ -408,7 +408,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'eventpart',
       'unique' => [],
-      'index' => [ ['payby'] ],
+      'index' => [ ['payby'], ['disabled'], ],
     },
 
     'cust_bill_pkg' => {
@@ -567,7 +567,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'paynum',
       'unique' => [],
-      'index' => [ [ 'custnum' ], [ 'paybatch' ] ],
+      'index' => [ [ 'custnum' ], [ 'paybatch' ], [ 'payby' ], [ '_date' ] ],
     },
 
     'cust_bill_pay' => {
@@ -718,10 +718,11 @@ sub tables_hash_hack {
       'columns' => [
         'refnum',   'serial',    '',   '',
         'referral', 'varchar',   '',   $char_d,
+        'disabled',     'char', 'NULL', 1,
       ],
       'primary_key' => 'refnum',
       'unique' => [],
-      'index' => [],
+      'index' => [ ['disabled'] ],
     },
 
     'part_svc' => {
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 080528bac..3c6519a61 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -144,6 +144,9 @@ ALTER TABLE agent ADD _password varchar(80) NULL;
 ALTER TABLE h_agent ADD _password varchar(80) NULL;
 ALTER TABLE cust_main ADD paycvv varchar(4) NULL;
 ALTER TABLE h_cust_main ADD paycvv varchar(4) NULL;
+ALTER TABLE part_referral ADD disabled char(1) NULL;
+ALTER TABLE h_part_referral ADD disabled char(1) NULL;
+CREATE INDEX part_referral1 ON part_referral ( disabled );
 
 dump database, edit:
 - cust_main: increase otaker from 8 to 32
@@ -164,6 +167,8 @@ optionally:
   CREATE INDEX cust_main9 ON cust_main ( ship_daytime );
   CREATE INDEX cust_main10 ON cust_main ( ship_night );
   CREATE INDEX cust_main11 ON cust_main ( ship_fax );
+  CREATE INDEX agent2 ON agent ( disabled );
+  CREATE INDEX part_bill_event2 ON part_bill_event ( disabled );
 
   serial columns
 
-- 
cgit v1.2.1


From e58b9fa1cdf0693f29d0d3db9c861cf4ecd7a77c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Dec 2003 23:53:34 +0000
Subject: signup page w/advertising source dropdown

---
 FS/FS/ClientAPI/Signup.pm                 | 12 ++++++++++++
 fs_signup/FS-SignupClient/cgi/signup.cgi  |  7 +++++--
 fs_signup/FS-SignupClient/cgi/signup.html | 10 ++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 60639b132..375958b9c 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -40,6 +40,16 @@ sub signup_info {
                  )
       ],
 
+    'part_referral' =>
+      [
+        map { $_->hashref }
+          qsearch('part_referral',
+                    dbdef->table('part_referral')->column('disabled')
+                      ? { 'disabled' => '' }
+                      : {}
+                 )
+      ],
+
     'agentnum2part_pkg' =>
       {
         map {
@@ -72,6 +82,8 @@ sub signup_info {
 
     'countrydefault' => $conf->config('countrydefault') || 'US',
 
+    'refnum' => $conf->config('signup_server-default_refnum'),
+
   };
 
   if (
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 5ca93d289..8dae9dd12 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.48 2003-10-25 02:05:44 ivan Exp $
+# $Id: signup.cgi,v 1.49 2003-12-10 23:53:34 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages
@@ -10,7 +10,7 @@ use vars qw( @payby $cgi $locales $packages
              $country $zip $daytime $night $fax $invoicing_list $payby $payinfo
              $paycvv $paydate $payname $referral_custnum $init_popstate
              $pkgpart $username $password $password2 $sec_phrase $popnum
-             $agentnum
+             $agentnum $refnum
              $ieak_file $ieak_template $cck_file $cck_template
              $signup_html $signup_template
              $success_html $success_template
@@ -218,6 +218,7 @@ if ( defined $cgi->param('magic') ) {
     #$agentnum, #         = $cgi->param('agentnum'),
     $agentnum         ||= $cgi->param('agentnum');
     $init_popstate    = $cgi->param('init_popstate');
+    $refnum           = $cgi->param('refnum');
 
     if ( $cgi->param('_password') ne $cgi->param('_password2') ) {
       $error = $init_data->{msgcat}{passwords_dont_match}; #msgcat
@@ -266,6 +267,7 @@ if ( defined $cgi->param('magic') ) {
         '_password'        => $password,
         'popnum'           => $popnum,
         'agentnum'         => $agentnum,
+        'refnum'           => $refnum,
         map { $_ => $cgi->param($_) } grep { /^snarf_/ } $cgi->param
       } );
 
@@ -314,6 +316,7 @@ if ( defined $cgi->param('magic') ) {
   $popnum = '';
   $referral_custnum = $cgi->param('ref') || '';
   $init_popstate = $cgi->param('init_popstate') || '';
+  $refnum = $init_data->{'refnum'};
   print_form;
 }
 
diff --git a/fs_signup/FS-SignupClient/cgi/signup.html b/fs_signup/FS-SignupClient/cgi/signup.html
index dc4252c73..96bdac666 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.html
+++ b/fs_signup/FS-SignupClient/cgi/signup.html
@@ -18,6 +18,16 @@
 <INPUT TYPE="hidden" NAME="magic" VALUE="process">
 <INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
 <INPUT TYPE="hidden" NAME="ss" VALUE="">
+Where did you hear about our service? <SELECT NAME="refnum">
+<%=
+  $OUT .= '<OPTION VALUE="">' unless $refnum;
+  foreach my $part_referral ( @{$init_data->{'part_referral'}} ) {
+    $OUT .= '<OPTION VALUE="'. $part_referral->{'refnum'}. '"';
+    $OUT .= ' SELECTED' if $part_referral->{'refnum'} eq $refnum;
+    $OUT .= '>'. $part_referral->{'referral'};
+  }
+%>
+</SELECT><BR><BR>
 Contact Information
 <TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
 <TR>
-- 
cgit v1.2.1


From cc19608aa931a3f57e3f4a899e0ef49b2590877e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 14 Dec 2003 17:53:28 +0000
Subject: non-breaking spaces in custoemr view field names

---
 httemplate/view/cust_main.cgi | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 83f114ef9..fb015671f 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -76,7 +76,7 @@ print '<TD VALIGN="top">';
 
   print "Billing address", &ntable("#cccccc"), "<TR><TD>",
         &ntable("#cccccc",2),
-    '<TR><TD ALIGN="right">Contact name</TD>',
+    '<TR><TD ALIGN="right">Contact&nbsp;name</TD>',
       '<TD COLSPAN=3 BGCOLOR="#ffffff">',
       $cust_main->last, ', ', $cust_main->first,
       '</TD>';
@@ -105,8 +105,8 @@ print '</TR>',
           $cust_main->country,
           '</TD></TR>',
   ;
-  my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day Phone';
-  my $night_label = FS::Msgcat::_gettext('night') || 'Night Phone';
+  my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day&nbsp;Phone';
+  my $night_label = FS::Msgcat::_gettext('night') || 'Night&nbsp;Phone';
   print '<TR><TD ALIGN="right">'. $daytime_label.
           '</TD><TD COLSPAN=5 BGCOLOR="#ffffff">',
           $cust_main->daytime || '&nbsp', '</TD></TR>',
@@ -166,7 +166,7 @@ print '</TD>';
 print '<TD VALIGN="top">';
 
   print &ntable("#cccccc"), "<TR><TD>", &ntable("#cccccc",2),
-        '<TR><TD ALIGN="right">Customer number</TD><TD BGCOLOR="#ffffff">',
+        '<TR><TD ALIGN="right">Customer&nbsp;number</TD><TD BGCOLOR="#ffffff">',
         $custnum, '</TD></TR>',
   ;
 
@@ -184,13 +184,13 @@ print '<TD VALIGN="top">';
     my $referral = qsearchs('part_referral', {
       'refnum' => $cust_main->refnum
     } );
-    print '<TR><TD ALIGN="right">Advertising source</TD><TD BGCOLOR="#ffffff">',
+    print '<TR><TD ALIGN="right">Advertising&nbsp;source</TD><TD BGCOLOR="#ffffff">',
           $referral->refnum, ": ", $referral->referral, '</TD></TR>';
   }
   print '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
     $cust_main->otaker, '</TD></TR>';
 
-  print '<TR><TD ALIGN="right">Referring Customer</TD><TD BGCOLOR="#ffffff">';
+  print '<TR><TD ALIGN="right">Referring&nbsp;Customer</TD><TD BGCOLOR="#ffffff">';
   my $referring_cust_main = '';
   if ( $cust_main->referral_custnum
        && ( $referring_cust_main =
@@ -220,22 +220,22 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
   print "Billing information (",
        qq!<A HREF="!, popurl(2), qq!misc/bill.cgi?$custnum">!, "Bill now</A>)",
         &ntable("#cccccc"), "<TR><TD>", &ntable("#cccccc",2),
-        '<TR><TD ALIGN="right">Tax exempt</TD><TD BGCOLOR="#ffffff">',
+        '<TR><TD ALIGN="right">Tax&nbsp;exempt</TD><TD BGCOLOR="#ffffff">',
         $cust_main->tax ? 'yes' : 'no',
         '</TD></TR>',
-        '<TR><TD ALIGN="right">Postal invoices</TD><TD BGCOLOR="#ffffff">',
+        '<TR><TD ALIGN="right">Postal&nbsp;invoices</TD><TD BGCOLOR="#ffffff">',
         ( grep { $_ eq 'POST' } @invoicing_list ) ? 'yes' : 'no',
         '</TD></TR>',
-        '<TR><TD ALIGN="right">Email invoices</TD><TD BGCOLOR="#ffffff">',
+        '<TR><TD ALIGN="right">Email&nbsp;invoices</TD><TD BGCOLOR="#ffffff">',
         join(', ', grep { $_ ne 'POST' } @invoicing_list ) || 'no',
         '</TD></TR>',
-        '<TR><TD ALIGN="right">Billing type</TD><TD BGCOLOR="#ffffff">',
+        '<TR><TD ALIGN="right">Billing&nbsp;type</TD><TD BGCOLOR="#ffffff">',
   ;
 
   if ( $cust_main->payby eq 'CARD' || $cust_main->payby eq 'DCRD' ) {
     my $payinfo = $cust_main->payinfo;
     $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
-    print 'Credit card ',
+    print 'Credit&nbsp;card&nbsp;',
           ( $cust_main->payby eq 'CARD' ? '(automatic)' : '(on-demand)' ),
           '</TD></TR>',
           '<TR><TD ALIGN="right">Card number</TD><TD BGCOLOR="#ffffff">',
@@ -247,7 +247,7 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
     ;
   } elsif ( $cust_main->payby eq 'CHEK' || $cust_main->payby eq 'DCHK') {
     my( $account, $aba ) = split('@', $cust_main->payinfo );
-    print 'Electronic check',
+    print 'Electronic&nbsp;check&nbsp;',
           ( $cust_main->payby eq 'CHEK' ? '(automatic)' : '(on-demand)' ),
           '</TD></TR>',
           '<TR><TD ALIGN="right">Account number</TD><TD BGCOLOR="#ffffff">',
@@ -260,7 +260,7 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
   } elsif ( $cust_main->payby eq 'LECB' ) {
     $cust_main->payinfo =~ /^(\d{3})(\d{3})(\d{4})$/;
     my $payinfo = "$1-$2-$3";
-    print 'Phone bill billing</TD></TR>',
+    print 'Phone&nbsp;bill&nbsp;billing</TD></TR>',
           '<TR><TD ALIGN="right">Phone number</TD><TD BGCOLOR="#ffffff">',
           $payinfo, '</TD></TR>',
     ;
@@ -276,7 +276,7 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
     ;
   } elsif ( $cust_main->payby eq 'COMP' ) {
     print 'Complimentary</TD></TR>',
-          '<TR><TD ALIGN="right">Authorized by</TD><TD BGCOLOR="#ffffff">',
+          '<TR><TD ALIGN="right">Authorized&nbsp;by</TD><TD BGCOLOR="#ffffff">',
           $cust_main->payinfo, '</TD></TR>',
           '<TR><TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">',
           $cust_main->paydate, '</TD></TR>',
-- 
cgit v1.2.1


From 4a46507233cdd366306562f97730eadaa09ae400 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 Dec 2003 03:41:10 +0000
Subject: add _latex_escape sub

---
 FS/FS/cust_bill.pm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 868771109..353ab49ea 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1090,6 +1090,21 @@ sub print_ps {
 
 }
 
+# quick subroutine for print_ps
+#
+# There are ten characters that LaTeX treats as special characters, which
+# means that they do not simply typeset themselves: 
+#      # $ % & ~ _ ^ \ { }
+#
+# TeX ignores blanks following an escaped character; if you want a blank (as
+# in "10% of ..."), you have to "escape" the blank as well ("10\%\ of ..."). 
+
+sub _latex_escape {
+  my $value = shift;
+  $value =~ s/([#\$%&~_\^{}])( )?/"\\$1". ( length($2) ? "\\$2" : '' )/ge;
+  $value;
+}
+
 #utility methods for print_*
 
 sub balance_due_msg {
-- 
cgit v1.2.1


From 60d630b2052d208f9f8adb8a28706c731f366bc2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 Dec 2003 06:42:32 +0000
Subject: fix bug that charged full amounts of all open invoices as soon as
 balance went positive (only manifests when any cust_bill->owed somehow got to
 be negative)

---
 FS/FS/cust_bill.pm |  5 ++++-
 FS/FS/cust_main.pm | 20 ++++++--------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 353ab49ea..88f40da3c 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -594,7 +594,10 @@ sub realtime_bop {
   my( $self, $method ) = @_;
 
   my $cust_main = $self->cust_main;
-  my $amount = $self->owed;
+  my $balance = $cust_main->balance;
+  my $amount = ( $balance < $self->owed ) ? $balance : $self->owed;
+  $amount = sprintf("%.2f", $amount);
+  return "not run (balance $balance)" unless $amount > 0;
 
   my $description = 'Internet Services';
   if ( $conf->exists('business-onlinepayment-description') ) {
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index df7bf1abb..41bfa5818 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1481,24 +1481,15 @@ sub collect {
     }
   }
 
-  foreach my $cust_bill ( $self->cust_bill ) {
-
-    #this has to be before next's
-    my $amount = sprintf( "%.2f", $balance < $cust_bill->owed
-                                  ? $balance
-                                  : $cust_bill->owed
-    );
-    $balance = sprintf( "%.2f", $balance - $amount );
-
-    next unless $cust_bill->owed > 0;
+  foreach my $cust_bill ( $self->open_cust_bill ) {
 
     # don't try to charge for the same invoice if it's already in a batch
     #next if qsearchs( 'cust_pay_batch', { 'invnum' => $cust_bill->invnum } );
 
-    warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ", amount $amount, balance $balance)" if $Debug;
-
-    next unless $amount > 0;
+    last if $self->balance <= 0;
 
+    warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ")"
+      if $Debug;
 
     foreach my $part_bill_event (
       sort {    $a->seconds   <=> $b->seconds
@@ -1515,7 +1506,8 @@ sub collect {
                                        'disabled' => '',           } )
     ) {
 
-      last unless $cust_bill->owed > 0; #don't run subsequent events if owed=0
+      last if $cust_bill->owed <= 0  # don't run subsequent events if owed<=0
+           || $self->balance   <= 0; # or if balance<=0
 
       warn "calling invoice event (". $part_bill_event->eventcode. ")\n"
         if $Debug;
-- 
cgit v1.2.1


From b3808f960c0351710f7005e7a2729925f57c7f4a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 Dec 2003 08:07:06 +0000
Subject: print_ps returns ths invoice now, do not count on latex printing it,
 oops

---
 httemplate/misc/print-invoice.cgi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/httemplate/misc/print-invoice.cgi b/httemplate/misc/print-invoice.cgi
index 8c1240c05..0dda68a4e 100755
--- a/httemplate/misc/print-invoice.cgi
+++ b/httemplate/misc/print-invoice.cgi
@@ -13,8 +13,7 @@ die "Can't find invoice!\n" unless $cust_bill;
         open(LPR,"|$lpr") or die "Can't open $lpr: $!";
 
         if ( $conf->exists('invoice_latex') ) {
-          $cust_bill->print_ps;
-          #print LPR $cust_bill->print_ps; #( date )
+          print LPR $cust_bill->print_ps; #( date )
         } else {
           print LPR $cust_bill->print_text; #( date )
         }
-- 
cgit v1.2.1


From 50a3c53a35c705795cea89a2af17c5197351fce4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 Dec 2003 08:08:38 +0000
Subject: line up w/window envelopes

---
 conf/invoice_latex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 02d865626..b28679344 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -23,7 +23,7 @@
 \usepackage{graphicx}			% required for logo graphic
 
 \addtolength{\voffset}{-0.0in}	% top margin to top of header
-\addtolength{\hoffset}{-0.55in}	%left margin on page
+\addtolength{\hoffset}{-0.60in}	%left margin on page
 \addtolength{\topmargin}{-0.6in}	% top margin to top of header
 \setlength{\headheight}{1in} 		% height of header
 \setlength{\headsep}{0.5in}    	% between header and text
-- 
cgit v1.2.1


From 7c67ed5982f05a562c30e45938a9fa164cbeb7cb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 20 Dec 2003 03:47:09 +0000
Subject: fix inflated advertising source numbers

---
 httemplate/browse/part_referral.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index 69bb95aa5..3f59abcf5 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -23,7 +23,8 @@ Where a customer heard about your service. Tracked for informational purposes.
   ;
 
   my $sth = dbh->prepare("SELECT COUNT(*) FROM h_cust_main
-                            WHERE refnum = ?
+                            WHERE history_action = 'insert'
+                              AND refnum = ?
                               AND history_date > ?         ")
     or die dbh->errstr;
 %>
-- 
cgit v1.2.1


From cfebba4f8a73501b86d7a14037de88c0c87c758e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 21 Dec 2003 21:12:43 +0000
Subject: add outsourced databases with both addresses by default

---
 FS/bin/freeside-addoutsourceuser | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/bin/freeside-addoutsourceuser b/FS/bin/freeside-addoutsourceuser
index 180cd9399..abb515b6f 100644
--- a/FS/bin/freeside-addoutsourceuser
+++ b/FS/bin/freeside-addoutsourceuser
@@ -10,6 +10,6 @@ freeside-adduser -h /usr/local/etc/freeside/htpasswd \
                  $username $password 2>/dev/null
 
 [ -e /usr/local/etc/freeside/dbdef.DBI:Pg:host=localhost\;dbname=$domain ] \
- || ( freeside-setup $username 2>/dev/null; \
-      /home/ivan/freeside/bin/populate-msgcat $username )
+ || ( freeside-setup -s $username 2>/dev/null; \
+      /home/ivan/freeside/bin/populate-msgcat $username 2>/dev/null )
 
-- 
cgit v1.2.1


From 3dc9375300fa2b9706e2b5707694022962f65b4d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 21 Dec 2003 23:13:41 +0000
Subject: cache virtual_fields method results to help performance

---
 FS/FS/Record.pm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 14dfca2cb..2517d1841 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -2,7 +2,7 @@ package FS::Record;
 
 use strict;
 use vars qw( $dbdef_file $dbdef $setup_hack $AUTOLOAD @ISA @EXPORT_OK $DEBUG
-             $me %dbdef_cache );
+             $me %dbdef_cache %virtual_fields_cache );
 use subs qw(reload_dbdef);
 use Exporter;
 use Carp qw(carp cluck croak confess);
@@ -1379,14 +1379,17 @@ sub virtual_fields {
 
   return () unless $self->dbdef->table('part_virtual_field');
 
-  # This should be smart enough to cache results.
+  unless ( $virtual_fields_cache{$table} ) {
+    my $query = 'SELECT name from part_virtual_field ' .
+                "WHERE dbtable = '$table'";
+    my $dbh = dbh;
+    my $result = $dbh->selectcol_arrayref($query);
+    confess $dbh->errstr if $dbh->err;
+    $virtual_fields_cache{$table} = $result;
+  }
+
+  @{$virtual_fields_cache{$table}};
 
-  my $query = 'SELECT name from part_virtual_field ' .
-              "WHERE dbtable = '$table'";
-  my $dbh = dbh;
-  my $result = $dbh->selectcol_arrayref($query);
-  confess $dbh->errstr if $dbh->err;
-  return @$result;
 }
 
 
-- 
cgit v1.2.1


From 6a751696054face897088706d222d5c9383d40fe Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 21 Dec 2003 23:16:45 +0000
Subject: work even if there are stray type_pkgs records around

---
 httemplate/browse/agent_type.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index c61208c83..5473804e8 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -19,7 +19,7 @@ foreach my $agent_type ( sort {
 } qsearch('agent_type',{}) ) {
   my $hashref = $agent_type->hashref;
   #more efficient to do this with SQL...
-  my @type_pkgs = grep { ! $_->part_pkg->disabled }
+  my @type_pkgs = grep { $_->part_pkg and ! $_->part_pkg->disabled }
                        qsearch('type_pkgs',{'typenum'=> $hashref->{typenum} });
   my $rowspan = scalar(@type_pkgs);
   $rowspan = int($rowspan/2+0.5) ;
-- 
cgit v1.2.1


From 0cfa5f6462513d0bf3ed5f2d3a5efc008f180ebc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Dec 2003 17:50:20 +0000
Subject: add cust_credit, cust_pay and cust_refund subs

---
 FS/FS/cust_main.pm | 45 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 41bfa5818..0046f0287 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -22,6 +22,7 @@ use FS::cust_bill;
 use FS::cust_bill_pkg;
 use FS::cust_pay;
 use FS::cust_credit;
+use FS::cust_refund;
 use FS::part_referral;
 use FS::cust_main_county;
 use FS::agent;
@@ -467,19 +468,19 @@ sub delete {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  if ( qsearch( 'cust_bill', { 'custnum' => $self->custnum } ) ) {
+  if ( $self->cust_bill ) {
     $dbh->rollback if $oldAutoCommit;
     return "Can't delete a customer with invoices";
   }
-  if ( qsearch( 'cust_credit', { 'custnum' => $self->custnum } ) ) {
+  if ( $self->cust_credit ) {
     $dbh->rollback if $oldAutoCommit;
     return "Can't delete a customer with credits";
   }
-  if ( qsearch( 'cust_pay', { 'custnum' => $self->custnum } ) ) {
+  if ( $self->cust_pay ) {
     $dbh->rollback if $oldAutoCommit;
     return "Can't delete a customer with payments";
   }
-  if ( qsearch( 'cust_refund', { 'custnum' => $self->custnum } ) ) {
+  if ( $self->cust_refund ) {
     $dbh->rollback if $oldAutoCommit;
     return "Can't delete a customer with refunds";
   }
@@ -2378,6 +2379,42 @@ sub open_cust_bill {
   grep { $_->owed > 0 } $self->cust_bill;
 }
 
+=item cust_credit
+
+Returns all the credits (see L<FS::cust_credit>) for this customer.
+
+=cut
+
+sub cust_credit {
+  my $self = shift;
+  sort { $a->_date <=> $b->_date }
+    qsearch( 'cust_credit', { 'custnum' => $self->custnum } )
+}
+
+=item cust_pay
+
+Returns all the payments (see L<FS::cust_pay>) for this customer.
+
+=cut
+
+sub cust_pay {
+  my $self = shift;
+  sort { $a->_date <=> $b->_date }
+    qsearch( 'cust_pay', { 'custnum' => $self->custnum } )
+}
+
+=item cust_refund
+
+Returns all the refunds (see L<FS::cust_refund>) for this customer.
+
+=cut
+
+sub cust_refund {
+  my $self = shift;
+  sort { $a->_date <=> $b->_date }
+    qsearch( 'cust_refund', { 'custnum' => $self->custnum } )
+}
+
 =back
 
 =head1 SUBROUTINES
-- 
cgit v1.2.1


From 6092bc23dc3e17a45d75c8cac30cb8ad9efba89f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Dec 2003 21:01:10 +0000
Subject: allow credits to be modified at API level

---
 FS/FS/cust_credit.pm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index e668abd73..18ab1c361 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -141,7 +141,10 @@ posted.
 =cut
 
 sub replace {
-  return "Can't modify credit!"
+  #return "Can't modify credit!"
+  my $self = shift;
+  return "Can't modify closed credit" if $self->closed =~ /^Y/i;
+  $self->SUPER::replace(@_);
 }
 
 =item check
@@ -240,13 +243,9 @@ sub credited {
 
 =back
 
-=head1 VERSION
-
-$Id: cust_credit.pm,v 1.17 2003-08-05 00:20:41 khoff Exp $
-
 =head1 BUGS
 
-The delete method.
+The delete method.  The replace method.
 
 =head1 SEE ALSO
 
-- 
cgit v1.2.1


From 1f044cfca0e3573db5dae7d7d6dc92933ffd2f8e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Dec 2003 21:18:16 +0000
Subject: quiet warning

---
 FS/FS/cust_bill.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 88f40da3c..e5c19668d 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1113,6 +1113,7 @@ sub _latex_escape {
 sub balance_due_msg {
   my $self = shift;
   my $msg = 'Balance Due';
+  return $msg unless $conf->exists('invoice_default_terms');
   if ( $conf->config('invoice_default_terms') =~ /^\s*Net\s*(\d+)\s*$/ ) {
     $msg .= ' - Please pay by '. time2str("%x", $self->_date + ($1*86400) );
   } elsif ( $conf->config('invoice_default_terms') ) {
-- 
cgit v1.2.1


From c2671089005c4f4f1fb886b9936aa8d5eea5eb59 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Dec 2003 21:22:19 +0000
Subject: default to the whole-country tax rate if states aren't defined

---
 FS/FS/cust_main.pm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 0046f0287..8695ae09c 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1239,6 +1239,16 @@ sub bill {
                                                                       } );
           }
 
+          #one more try at a whole-country tax rate
+          unless ( @taxes ) {
+            @taxes =  qsearch( 'cust_main_county', {
+                                  'state'    => '',
+                                  'county'   => '',
+                                  'country'  => $self->country,
+                                  'taxclass' => '',
+                                                                      } );
+          }
+
           # maybe eliminate this entirely, along with all the 0% records
           unless ( @taxes ) {
             $dbh->rollback if $oldAutoCommit;
-- 
cgit v1.2.1


From 2c0d7675caacd5891b7f699c92260d321b4d03b5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Dec 2003 21:37:04 +0000
Subject: add total cards & amount to pending batch screen

---
 httemplate/browse/cust_pay_batch.cgi | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/httemplate/browse/cust_pay_batch.cgi b/httemplate/browse/cust_pay_batch.cgi
index d90a03313..3420e97b6 100755
--- a/httemplate/browse/cust_pay_batch.cgi
+++ b/httemplate/browse/cust_pay_batch.cgi
@@ -14,8 +14,24 @@ Format <SELECT NAME="format">
 <OPTION VALUE="csv-td_canada_trust-merchant_pc_batch">CSV results from TD Canada Trust Merchant PC Batch</OPTION>
 </SELECT><BR>
 <INPUT TYPE="submit" VALUE="Upload"></FORM>
-<BR><BR>
+<BR>
+
+<%
+  my $statement = "SELECT SUM(amount) from cust_pay_batch";
+  my $sth = dbh->prepare($statement) or die dbh->errstr. "doing $statement";
+  $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
+  my $total = $sth->fetchrow_arrayref->[0];
+
+  my $c_statement = "SELECT COUNT(*) from cust_pay_batch";
+  my $c_sth = dbh->prepare($c_statement)
+    or die dbh->errstr. "doing $c_statement";
+  $c_sth->execute or die "Error executing \"$c_statement\": ". $c_sth->errstr;
+  my $cards = $c_sth->fetchrow_arrayref->[0];
+%>
+<%= $cards %> credit card payments batched<BR>
+$<%= sprintf("%.2f", $total) %> total in pending batch<BR>
 
+<BR>
 <%= &table() %>
       <TR>
         <TH>#</TH>
-- 
cgit v1.2.1


From 3c0d5d77527f46e59c68fb6f92de2391e779f07b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Dec 2003 00:41:15 +0000
Subject: allow_negative_charges config option

---
 FS/FS/Conf.pm      | 7 +++++++
 FS/FS/cust_main.pm | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index d911480df..b391fe44b 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1144,6 +1144,13 @@ httemplate/docs/config.html
                      ],
   },
 
+  {
+    'key'         => 'allow_negative_charges',
+    'section'     => 'billing',
+    'description' => 'Allow negative charges.  Normally not used unless importing data from a legacy system that requires this.',
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 8695ae09c..3e40cc127 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1201,15 +1201,15 @@ sub bill {
       }
       $setup = sprintf( "%.2f", $setup );
       $recur = sprintf( "%.2f", $recur );
-      if ( $setup < 0 ) {
+      if ( $setup < 0 && ! $conf->exists('allow_negative_charges') ) {
         $dbh->rollback if $oldAutoCommit;
         return "negative setup $setup for pkgnum ". $cust_pkg->pkgnum;
       }
-      if ( $recur < 0 ) {
+      if ( $recur < 0 && ! $conf->exists('allow_negative_charges') ) {
         $dbh->rollback if $oldAutoCommit;
         return "negative recur $recur for pkgnum ". $cust_pkg->pkgnum;
       }
-      if ( $setup > 0 || $recur > 0 ) {
+      if ( $setup != 0 || $recur != 0 ) {
         my $cust_bill_pkg = new FS::cust_bill_pkg ({
           'pkgnum'  => $cust_pkg->pkgnum,
           'setup'   => $setup,
@@ -1327,7 +1327,7 @@ sub bill {
 
         } #unless $self->tax =~ /Y/i || $self->payby eq 'COMP'
 
-      } #if $setup > 0 || $recur > 0
+      } #if $setup != 0 || $recur != 0
       
     } #if $cust_pkg_mod_flag
 
-- 
cgit v1.2.1


From 38d7ed9d33840a59bbbf6895e3c7a6d191094c03 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Dec 2003 00:51:37 +0000
Subject: add edit_info to selfservice API

---
 FS/FS/ClientAPI/MyAccount.pm                 | 34 ++++++++++++++++++++++++++++
 fs_selfservice/FS-SelfService/SelfService.pm | 18 ++++++++++++++-
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index c9a749424..290022148 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -20,6 +20,7 @@ use FS::ClientAPI; #hmm
 FS::ClientAPI->register_handlers(
   'MyAccount/login'            => \&login,
   'MyAccount/customer_info'    => \&customer_info,
+  'MyAccount/edit_info'        => \&edit_info,
   'MyAccount/invoice'          => \&invoice,
   'MyAccount/cancel'           => \&cancel,
   'MyAccount/payment_info'     => \&payment_info,
@@ -29,6 +30,14 @@ FS::ClientAPI->register_handlers(
   'MyAccount/cancel_pkg'       => \&cancel_pkg,
 );
 
+use vars qw( @cust_main_editable_fields );
+@cust_main_editable_fields = qw(
+  first last company address1 address2 city
+    county state zip country daytime night fax
+  ship_first ship_last ship_company ship_address1 ship_address2 ship_city
+    ship_state ship_zip ship_country ship_daytime ship_night ship_fax
+);
+
 #store in db?
 my $cache = new Cache::SharedMemoryCache();
 
@@ -104,6 +113,10 @@ sub customer_info {
 
     $return{name} = $cust_main->first. ' '. $cust_main->get('last');
 
+    for (@cust_main_editable_fields) {
+      $return{$_} = $cust_main->get($_);
+    }
+
   } else { #no customer record
 
     my $svc_acct = qsearchs('svc_acct', { 'svcnum' => $session->{'svcnum'} } )
@@ -119,6 +132,27 @@ sub customer_info {
 
 }
 
+sub edit_info {
+  my $p = shift;
+  my $session = $cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  my $custnum = $session->{'custnum'}
+    or return { 'error' => "no customer record" };
+
+  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+    or return { 'error' => "unknown custnum $custnum" };
+
+  my $new = new FS::cust_main { $cust_main->hash };
+  $new->set( $_ => $p->{$_} )
+    foreach grep { exists $p->{$_} } @cust_main_editable_fields;
+  my $error = $new->replace($cust_main);
+  return { 'error' => $error } if $error;
+  #$cust_main = $new;
+  
+  return { 'error' => '' };
+}
+
 sub payment_info {
   my $p = shift;
   my $session = $cache->get($p->{'session_id'})
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index be6dd3a8a..715f935f3 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -23,6 +23,7 @@ $socket .= '.'.$tag if defined $tag && length($tag);
   'chsh'            => 'passwd/passwd',
   'login'           => 'MyAccount/login',
   'customer_info'   => 'MyAccount/customer_info',
+  'edit_info'       => 'MyAccount/edit_info',
   'invoice'         => 'MyAccount/invoice',
   'cancel'          => 'MyAccount/cancel',
   'payment_info'    => 'MyAccount/payment_info',
@@ -113,7 +114,7 @@ FS::SelfService - Freeside self-service API
   my $customer_info = customer_info( { 'session_id' => $session_id } );
 
   #payment_info and process_payment are available in 1.5+ only
-  my $payment_info = payment_info) { 'session_id' => $session_id } );
+  my $payment_info = payment_info( { 'session_id' => $session_id } );
 
   #!!! process_payment example
 
@@ -244,8 +245,23 @@ the following keys: invnum, date, owed
 
 An HTML fragment containing shipping and billing addresses.
 
+=item The following fields are also returned: first last company address1 address2 city county state zip country daytime night fax ship_first ship_last ship_company ship_address1 ship_address2 ship_city ship_state ship_zip ship_country ship_daytime ship_night ship_fax
+
 =back
 
+=item edit_info HASHREF
+
+Takes a hash reference as parameter with any of the following keys:
+
+first last company address1 address2 city county state zip country daytime night fax ship_first ship_last ship_company ship_address1 ship_address2 ship_city ship_state ship_zip ship_country ship_daytime ship_night ship_fax
+
+If a field exists, the customer record is updated with the new value of that
+field.  If a field does not exist, that field is not changed on the customer
+record.
+
+Returns a hash reference with a single key, B<error>, empty on success, or an
+error message on errors
+
 =item invoice HASHREF
 
 Returns an invoice.  Takes a hash reference as parameter with two keys:
-- 
cgit v1.2.1


From 8db0e6f5d34786bfd93ce21f43126a5fab441ade Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Dec 2003 01:06:10 +0000
Subject: fix path to svc_Common in example table

---
 eg/table_template-svc.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eg/table_template-svc.pm b/eg/table_template-svc.pm
index ebf7299d2..66d17e34a 100644
--- a/eg/table_template-svc.pm
+++ b/eg/table_template-svc.pm
@@ -6,7 +6,7 @@ use vars qw(@ISA);
 use FS::svc_Common;
 use FS::cust_svc;
 
-@ISA = qw(svc_Common);
+@ISA = qw(FS::svc_Common);
 
 =head1 NAME
 
-- 
cgit v1.2.1


From 869a43742a9bcba4d2dd117b76e759ff6c81d371 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Dec 2003 01:10:50 +0000
Subject: update svc template for 1.5

---
 eg/table_template-svc.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eg/table_template-svc.pm b/eg/table_template-svc.pm
index 66d17e34a..7f7ef4b68 100644
--- a/eg/table_template-svc.pm
+++ b/eg/table_template-svc.pm
@@ -141,7 +141,7 @@ sub check {
   my $part_svc = $x;
 
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =back
-- 
cgit v1.2.1


From d20581bcbf2809d5c2969d773b16a0c8714a6dec Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Dec 2003 01:49:32 +0000
Subject: add svc_external

---
 FS/FS.pm                       |   4 +
 FS/FS/cust_svc.pm              |   2 +
 FS/FS/svc_external.pm          | 174 +++++++++++++++++++++++++++++++++++++++++
 FS/bin/freeside-setup          |  11 +++
 httemplate/docs/upgrade10.html |   9 ++-
 5 files changed, 199 insertions(+), 1 deletion(-)
 create mode 100644 FS/FS/svc_external.pm

diff --git a/FS/FS.pm b/FS/FS.pm
index a299e659d..36c3a1777 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -66,6 +66,10 @@ L<FS::svc_forward> - Mail forwarding class
 
 L<FS::svc_www> - Web virtual host class.
 
+L<FS::svc_broadband> - DSL, wireless and other broadband class.
+
+L<FS::svc_external> - Externally tracked service class.
+
 L<FS::part_svc> - Service definition class
 
 L<FS::part_svc_column> - Column constraint class
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index af0abf7f1..ce2b969f9 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -296,6 +296,8 @@ sub label {
     $tag = $domain->zone;
   } elsif ( $svcdb eq 'svc_broadband' ) {
     $tag = $svc_x->ip_addr;
+  } elsif ( $svcdb eq 'svc_external' ) {
+    $tag = $svc_x->id. ': '. $svc_x->title;
   } else {
     cluck "warning: asked for label of unsupported svcdb; using svcnum";
     $tag = $svc_x->getfield('svcnum');
diff --git a/FS/FS/svc_external.pm b/FS/FS/svc_external.pm
new file mode 100644
index 000000000..fe4ea1d67
--- /dev/null
+++ b/FS/FS/svc_external.pm
@@ -0,0 +1,174 @@
+package FS::svc_external;
+
+use strict;
+use vars qw(@ISA); # $conf
+use FS::UID;
+#use FS::Record qw( qsearch qsearchs dbh);
+use FS::svc_Common;
+
+@ISA = qw( FS::svc_Common );
+
+#FS::UID::install_callback( sub {
+#  $conf = new FS::Conf;
+#};
+
+=head1 NAME
+
+FS::svc_external - Object methods for svc_external records
+
+=head1 SYNOPSIS
+
+  use FS::svc_external;
+
+  $record = new FS::svc_external \%hash;
+  $record = new FS::svc_external { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $error = $record->suspend;
+
+  $error = $record->unsuspend;
+
+  $error = $record->cancel;
+
+=head1 DESCRIPTION
+
+An FS::svc_external object represents a externally tracked service.
+FS::svc_external inherits from FS::svc_Common.  The following fields are
+currently supported:
+
+=over 4
+
+=item svcnum - primary key
+
+=item id - unique number of external record
+
+=item title - for invoice line items
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new external service.  To add the external service to the database,
+see L<"insert">.  
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub table { 'svc_external'; }
+
+=item insert
+
+Adds this external service to the database.  If there is an error, returns the
+error, otherwise returns false.
+
+The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
+defined.  An FS::cust_svc record will be created and inserted.
+
+=cut
+
+sub insert {
+  my $self = shift;
+  my $error;
+
+  $error = $self->SUPER::insert;
+  return $error if $error;
+
+  '';
+}
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+sub delete {
+  my $self = shift;
+  my $error;
+
+  $error = $self->SUPER::delete;
+  return $error if $error;
+
+  '';
+}
+
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my ( $new, $old ) = ( shift, shift );
+  my $error;
+
+  $error = $new->SUPER::replace($old);
+  return $error if $error;
+
+  '';
+}
+
+=item suspend
+
+Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item unsuspend
+
+Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item cancel
+
+Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item check
+
+Checks all fields to make sure this is a valid external service.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $x = $self->setfixed;
+  return $x unless ref($x);
+  my $part_svc = $x;
+
+  my $error = 
+    $self->ut_numbern('svcnum')
+    || $self->ut_number('id')
+    || $self->ut_textn('title')
+  ;
+
+  $self->SUPER::check;
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::svc_Common>, L<FS::Record>, L<FS::cust_svc>, L<FS::part_svc>,
+L<FS::cust_pkg>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 4e3a09aad..fce8bc750 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -1120,6 +1120,17 @@ sub tables_hash_hack {
       'index'  => [ [ 'svcnum' ] ],
     },
 
+    'svc_external' => {
+      'columns' => [
+        'svcnum', 'int', '', '',
+        'id',     'int', '', '',
+        'title',  'varchar', 'NULL', $char_d,
+      ],
+      'primary_key' => 'svcnum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
   );
 
   %tables;
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 3c6519a61..275b821a3 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -73,6 +73,13 @@ CREATE TABLE acct_snarf (
 );
 CREATE INDEX acct_snarf1 ON acct_snarf ( svcnum );
 
+CREATE TABLE svc_external (
+  svcnum int NOT NULL,
+  id int NOT NULL,
+  title varchar(80),
+  PRIMARY KEY (svcnum)
+);
+
 CREATE TABLE part_pkg_temp (
     pkgpart serial NOT NULL,
     pkg varchar(80) NOT NULL,
@@ -175,7 +182,7 @@ optionally:
 mandatory again:
 
 dbdef-create username
-create-history-tables username cust_bill_pkg_detail router part_svc_router addr_block svc_broadband acct_snarf
+create-history-tables username cust_bill_pkg_detail router part_svc_router addr_block svc_broadband acct_snarf svc_external
 dbdef-create username
 
 apache - fix <Files> sections to include .html also
-- 
cgit v1.2.1


From 31d6d0e8d0d624cd051440acf322cd8893c1026e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Dec 2003 02:36:38 +0000
Subject: add svc_external

---
 FS/FS/part_export.pm                     |   4 ++
 FS/MANIFEST                              |   3 +
 FS/t/svc_broadband.t                     |   5 ++
 FS/t/svc_external.t                      |   5 ++
 htetc/global.asa                         |   1 +
 htetc/handler.pl                         |   1 +
 httemplate/edit/part_svc.cgi             |   7 ++-
 httemplate/edit/process/svc_external.cgi |  29 +++++++++
 httemplate/edit/svc_external.cgi         | 105 +++++++++++++++++++++++++++++++
 httemplate/view/svc_external.cgi         |  52 +++++++++++++++
 10 files changed, 211 insertions(+), 1 deletion(-)
 create mode 100644 FS/t/svc_broadband.t
 create mode 100644 FS/t/svc_external.t
 create mode 100755 httemplate/edit/process/svc_external.cgi
 create mode 100644 httemplate/edit/svc_external.cgi
 create mode 100644 httemplate/view/svc_external.cgi

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 17e5cf908..1b46841ec 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -1076,6 +1076,10 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
       'notes' => '',
     },
   },
+
+  'svc_external' => {
+  },
+
 );
 
 =back
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 877f3ce0d..3cbf0e91f 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -102,6 +102,7 @@ FS/svc_acct.pm
 FS/svc_acct_pop.pm
 FS/svc_broadband.pm
 FS/svc_domain.pm
+FS/svc_external.pm
 FS/router.pm
 FS/type_pkgs.pm
 FS/nas.pm
@@ -184,8 +185,10 @@ t/radius_usergroup.t
 t/session.t
 t/svc_acct.t
 t/svc_acct_pop.t
+t/svc_broadband.t
 t/svc_Common.t
 t/svc_domain.t
+t/svc_external.t
 t/svc_forward.t
 t/svc_www.t
 t/type_pkgs.t
diff --git a/FS/t/svc_broadband.t b/FS/t/svc_broadband.t
new file mode 100644
index 000000000..02dc1124a
--- /dev/null
+++ b/FS/t/svc_broadband.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::svc_broadband;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/svc_external.t b/FS/t/svc_external.t
new file mode 100644
index 000000000..20a676784
--- /dev/null
+++ b/FS/t/svc_external.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::svc_external;
+$loaded=1;
+print "ok 1\n";
diff --git a/htetc/global.asa b/htetc/global.asa
index 2e31be394..f550560ee 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -56,6 +56,7 @@ use FS::svc_www;
 use FS::router;
 use FS::addr_block;
 use FS::svc_broadband;
+use FS::svc_external;
 use FS::type_pkgs;
 use FS::part_export;
 use FS::part_export_option;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index ba73bcfaf..c5f685f85 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -114,6 +114,7 @@ sub handler
       use FS::router;
       use FS::addr_block;
       use FS::svc_broadband;
+      use FS::svc_external;
       use FS::type_pkgs;
       use FS::part_export;
       use FS::part_export_option;
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 18319b341..10e89288f 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -53,6 +53,7 @@ Services are items you offer to your customers.
     <LI>svc_forward - mail forwarding
     <LI>svc_www - Virtual domain website
     <LI>svc_broadband - Broadband/High-speed Internet service
+    <LI>svc_external - Externally-tracked service
 <!--   <LI>svc_charge - One-time charges (Partially unimplemented)
        <LI>svc_wo - Work orders (Partially unimplemented)
 -->
@@ -129,6 +130,10 @@ my %defs = (
     'ip_addr' => 'IP address.  Leave blank for automatic assignment.',
     'blocknum' => 'Address block.',
   },
+  'svc_external' => {
+    #'id' => '',
+    #'title' => '',
+  },
 );
 
   foreach my $svcdb (grep dbdef->table($_), keys %defs ) {
@@ -151,7 +156,7 @@ my %defs = (
   
   my @dbs = $hashref->{svcdb}
              ? ( $hashref->{svcdb} )
-             : qw( svc_acct svc_domain svc_forward svc_www svc_broadband );
+             : qw( svc_acct svc_domain svc_forward svc_www svc_broadband svc_external );
 
   tie my %svcdb, 'Tie::IxHash', map { $_=>$_ } grep dbdef->table($_), @dbs;
   my $widget = new HTML::Widgets::SelectLayers(
diff --git a/httemplate/edit/process/svc_external.cgi b/httemplate/edit/process/svc_external.cgi
new file mode 100755
index 000000000..728cd2189
--- /dev/null
+++ b/httemplate/edit/process/svc_external.cgi
@@ -0,0 +1,29 @@
+<%
+
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+my $svcnum =$1;
+
+my $old = qsearchs('svc_external',{'svcnum'=>$svcnum}) if $svcnum;
+
+my $new = new FS::svc_external ( {
+  map {
+    ($_, scalar($cgi->param($_)));
+  } ( fields('svc_external'), qw( pkgnum svcpart ) )
+} );
+
+my $error = '';
+if ( $svcnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $svcnum = $new->getfield('svcnum');
+} 
+
+if ($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_external.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/svc_external.cgi?$svcnum");
+}
+
+%>
diff --git a/httemplate/edit/svc_external.cgi b/httemplate/edit/svc_external.cgi
new file mode 100644
index 000000000..bcfc85e3f
--- /dev/null
+++ b/httemplate/edit/svc_external.cgi
@@ -0,0 +1,105 @@
+<!-- mason kludge -->
+<%
+
+my( $svcnum,  $pkgnum, $svcpart, $part_svc, $svc_external );
+if ( $cgi->param('error') ) {
+  $svc_external = new FS::svc_external ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_external')
+  } );
+  $svcnum = $svc_external->svcnum;
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $svcnum=$1;
+    $svc_external=qsearchs('svc_external',{'svcnum'=>$svcnum})
+      or die "Unknown (svc_external) svcnum!";
+
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+      or die "Unknown (cust_svc) svcnum!";
+
+    $pkgnum=$cust_svc->pkgnum;
+    $svcpart=$cust_svc->svcpart;
+  
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+  } else { #adding
+
+    foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
+      $pkgnum=$1 if /^pkgnum(\d+)$/;
+      $svcpart=$1 if /^svcpart(\d+)$/;
+    }
+    $svc_external = new FS::svc_external { svcpart => $svcpart };
+
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+    $svcnum='';
+
+    #set fixed and default fields from part_svc
+    foreach my $part_svc_column (
+      grep { $_->columnflag } $part_svc->all_part_svc_column
+    ) {
+      $svc_external->setfield( $part_svc_column->columnname,
+                               $part_svc_column->columnvalue,
+                             );
+    }
+
+  }
+}
+my $action = $svc_external->svcnum ? 'Edit' : 'Add';
+
+my $p1 = popurl(1);
+print header("External service $action", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/svc_external.cgi" METHOD=POST>!;
+
+#display
+ 
+
+#svcnum
+print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
+print qq!Service #<B>!, $svcnum ? $svcnum : "(NEW)", "</B><BR><BR>";
+
+#pkgnum
+print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
+ 
+#svcpart
+print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
+
+my($id,$title)=(
+  $svc_external->id,
+  $svc_external->title,
+);
+
+print &ntable("#cccccc",2),
+      '<TR><TD ALIGN="right">External ID</TD><TD>'.
+      qq!<INPUT TYPE="text" NAME="id" VALUE="$id">!.
+      '</TD></TR>'.
+      '<TR><TD ALIGN="right">Title</TD><TD>'.
+      qq!<INPUT TYPE="text" NAME="title" VALUE="$title">!.
+      '</TD></TR>';
+
+foreach my $field ($svc_external->virtual_fields) {
+  if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
+    # If the flag is X, it won't even show up in $svc_acct->virtual_fields.
+    print $svc_external->pvf($field)->widget('HTML', 'edit', 
+        $svc_external->getfield($field));
+  }
+}
+
+%>
+
+</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">
+    </FORM>
+  </BODY>
+</HTML>
+
diff --git a/httemplate/view/svc_external.cgi b/httemplate/view/svc_external.cgi
new file mode 100644
index 000000000..e5c977f13
--- /dev/null
+++ b/httemplate/view/svc_external.cgi
@@ -0,0 +1,52 @@
+<!-- mason kludge -->
+<%
+
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+my $svcnum = $1;
+my $svc_external = qsearchs( 'svc_external', { 'svcnum' => $svcnum } )
+  or die "svc_external: Unknown svcnum $svcnum";
+
+#false laziness w/all svc_*.cgi
+my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } );
+my $pkgnum = $cust_svc->getfield('pkgnum');
+my($cust_pkg, $custnum);
+if ($pkgnum) {
+  $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
+  $custnum = $cust_pkg->custnum;
+} else {
+  $cust_pkg = '';
+  $custnum = '';
+}
+#eofalse
+
+%>
+
+<%= header('External Service View', menubar(
+  ( ( $custnum )
+    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
+        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+      )                                                                       
+    : ( "Cancel this (unaudited) external service" =>
+          "${p}misc/cancel-unaudited.cgi?$svcnum" )
+  ),
+  "Main menu" => $p,
+)) %>
+
+<A HREF="<%=$p%>edit/svc_external.cgi?<%=$svcnum%>">Edit this information</A><BR>
+<%= ntable("#cccccc") %><TR><TD><%= ntable("#cccccc",2) %>
+
+<TR><TD ALIGN="right">Service number</TD>
+  <TD BGCOLOR="#ffffff"><%= $svcnum %></TD></TR>
+<TR><TD ALIGN="right">External ID</TD>
+  <TD BGCOLOR="#ffffff"><%= $svc_external->id %></TD></TR>
+<TR><TD ALIGN="right">Title</TD>
+  <TD BGCOLOR="#ffffff"><%= $svc_external->title %></TD></TR>
+
+<% foreach (sort { $a cmp $b } $svc_external->virtual_fields) { %>
+  <%= $svc_external->pvf($_)->widget('HTML', 'view', $svc_external->getfield($_)) %>
+<% } %>
+
+</TABLE></TD></TR></TABLE>
+<BR><%= joblisting({'svcnum'=>$svcnum}, 1) %>
+</BODY></HTML>
-- 
cgit v1.2.1


From 9617ce4b230c7dc56b4fa4a50d805ddaef87d090 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 24 Dec 2003 18:18:21 +0000
Subject: tyop

---
 FS/bin/freeside-setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index fce8bc750..b7a414ae2 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -342,7 +342,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'agentnum',
       'unique' => [],
-      'index' => [ ['typenum'], ['diabled'] ],
+      'index' => [ ['typenum'], ['disabled'] ],
     },
 
     'agent_type' => {
-- 
cgit v1.2.1


From abc64a997eeacdc95988296889754d708aa97cad Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 27 Dec 2003 08:23:38 +0000
Subject: package reports by agent

---
 httemplate/index.html                 |  2 +-
 httemplate/search/cust_pkg.cgi        |  6 ++++
 httemplate/search/cust_pkg.html       | 46 -------------------------
 httemplate/search/cust_pkg_report.cgi | 63 +++++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 47 deletions(-)
 delete mode 100755 httemplate/search/cust_pkg.html
 create mode 100755 httemplate/search/cust_pkg_report.cgi

diff --git a/httemplate/index.html b/httemplate/index.html
index d863f3f3e..d024de0bf 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -56,7 +56,7 @@
       <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST">Credit card # <INPUT TYPE="hidden" NAME="card_on" VALUE="1"><INPUT TYPE="text" NAME="card"><INPUT TYPE="submit" VALUE="Search"></FORM>
       <FORM ACTION="search/cust_bill.cgi" METHOD="POST">Invoice # <INPUT TYPE="text" NAME="invnum" SIZE="8"><INPUT TYPE="submit" VALUE="Search"></FORM>
       <FORM ACTION="search/cust_pay.cgi" METHOD="POST">Check # <INPUT TYPE="text" NAME="payinfo" SIZE="8"><INPUT TYPE="hidden" NAME="payby" VALUE="BILL"><INPUT TYPE="submit" VALUE="Search"></FORM>
-      <BR><A HREF="browse/cust_pay_batch.cgi">View pending credit card batch</A>      <BR><BR><A HREF="search/cust_pkg.html">Packages (by next bill date range)</A>
+      <BR><A HREF="browse/cust_pay_batch.cgi">View pending credit card batch</A>      <BR><BR><A HREF="search/cust_pkg_report.cgi">Packages (by next bill date range)</A>
       <BR><BR>Invoice reports
             <UL>
               <LI><a href="search/cust_bill_event.html">Invoice event errors (failed credit cards)</a>
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 3c3e17864..c2f6272c4 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -35,6 +35,12 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
 
   $range .= ( $range ? 'AND ' : ' WHERE ' ). '( cancel IS NULL OR cancel = 0 )';
 
+  if ( $cgi->param('agentnum') =~ /^(\d+)$/ and $1 ) {
+    $range .= ( $range ? 'AND ' : ' WHERE ' ). 
+              "$1 = ( SELECT agentnum FROM cust_main".
+                    " WHERE cust_main.custnum = cust_pkg.custnum )";
+  }
+
   #false laziness with below
   my $statement = "SELECT COUNT(*) FROM cust_pkg $range";
   warn $statement;
diff --git a/httemplate/search/cust_pkg.html b/httemplate/search/cust_pkg.html
deleted file mode 100755
index 0dad83a2a..000000000
--- a/httemplate/search/cust_pkg.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Packages</TITLE>
-    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <H1>Packages</H1>
-    <FORM ACTION="cust_pkg.cgi" METHOD="post">
-    <INPUT TYPE="hidden" NAME="magic" VALUE="bill">
-      Return packages with next bill date:<BR><BR>
-      <TABLE>
-        <TR>
-          <TD ALIGN="right">From: </TD>
-          <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><I>m/d/y</I></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "beginning_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "beginning_button",
-    align:      "BR"
-  });
-</SCRIPT>
-        </TR>
-        <TR>
-          <TD ALIGN="right">To: </TD>
-          <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><I>m/d/y</I></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "ending_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "ending_button",
-    align:      "BR"
-  });
-</SCRIPT>
-        </TR>
-      </TABLE>
-      <BR><INPUT TYPE="submit" VALUE="Get Report">
-
-    </FORM>
-
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/cust_pkg_report.cgi b/httemplate/search/cust_pkg_report.cgi
new file mode 100755
index 000000000..b31674540
--- /dev/null
+++ b/httemplate/search/cust_pkg_report.cgi
@@ -0,0 +1,63 @@
+<HTML>
+  <HEAD>
+    <TITLE>Packages</TITLE>
+    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
+  </HEAD>
+  <BODY BGCOLOR="#e8e8e8">
+    <H1>Packages</H1>
+    <FORM ACTION="cust_pkg.cgi" METHOD="post">
+    <INPUT TYPE="hidden" NAME="magic" VALUE="bill">
+      Return packages with next bill date:<BR><BR>
+      <TABLE>
+        <TR>
+          <TD ALIGN="right">From: </TD>
+          <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><I>m/d/y</I></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "beginning_text",
+    ifFormat:   "%m/%d/%Y",
+    button:     "beginning_button",
+    align:      "BR"
+  });
+</SCRIPT>
+        </TR>
+        <TR>
+          <TD ALIGN="right">To: </TD>
+          <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><I>m/d/y</I></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "ending_text",
+    ifFormat:   "%m/%d/%Y",
+    button:     "ending_button",
+    align:      "BR"
+  });
+</SCRIPT>
+        </TR>
+<% my %agent_search = dbdef->table('agent')->column('disabled')
+                        ? ( 'disabled' => '' ) : ();
+   my @agents = qsearch( 'agent', \%agent_search );
+   if ( scalar(@agents) == 1 ) {
+%>
+     <INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agents[0]->agentnum %>">
+<% } else { %>
+
+        <TR>
+          <TD ALIGN="right">Agent: </TD>
+          <TD><SELECT NAME="agentnum"><OPTION VALUE="">(all)
+          <% foreach my $agent ( sort { $a->agent cmp $b->agent; } @agents) { %>
+            <OPTION VALUE="<%= $agent->agentnum %>"><%= $agent->agent %>
+          <% } %>
+          </TD>
+        </TR>
+<% } %>
+      </TABLE>
+      <BR><INPUT TYPE="submit" VALUE="Get Report">
+
+    </FORM>
+
+  </BODY>
+</HTML>
+
-- 
cgit v1.2.1


From 1d2cbbff7fe3600eef0abfb3c0fc0712b3b0506b Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Tue, 30 Dec 2003 06:02:17 +0000
Subject: Pass type as scalar instead of a hashref to work around a bug in
 DBD::Pg version 1.31.

---
 FS/FS/Record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 2517d1841..191eee5f0 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -313,9 +313,9 @@ sub qsearch {
     if ( $record->{$field} =~ /^\d+(\.\d+)?$/
          && $dbdef->table($table)->column($field)->type =~ /(int|serial)/i
     ) {
-      $sth->bind_param($bind++, $record->{$field}, { TYPE => SQL_INTEGER } );
+      $sth->bind_param($bind++, $record->{$field}, SQL_INTEGER);
     } else {
-      $sth->bind_param($bind++, $record->{$field}, { TYPE => SQL_VARCHAR } );
+      $sth->bind_param($bind++, $record->{$field}, SQL_VARCHAR);
     }
   }
 
-- 
cgit v1.2.1


From e728f9664160d943e02657dd9d83aa1bb7d8e5f4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 1 Jan 2004 20:40:39 +0000
Subject: escape stuff from latex

---
 FS/FS/cust_bill.pm | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index e5c19668d..8adbb6c1d 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -928,15 +928,15 @@ sub print_ps {
   my %invoice_data = (
     'invnum'       => $self->invnum,
     'date'         => time2str('%b %o, %Y', $self->_date),
-    'agent'        => $cust_main->agent->agent,
-    'payname'      => $cust_main->payname,
-    'company'      => $cust_main->company,
-    'address1'     => $cust_main->address1,
-    'address2'     => $cust_main->address2,
-    'city'         => $cust_main->city,
-    'state'        => $cust_main->state,
-    'zip'          => $cust_main->zip,
-    'country'      => $cust_main->country,
+    'agent'        => _latex_escape($cust_main->agent->agent),
+    'payname'      => _latex_escape($cust_main->payname),
+    'company'      => _latex_escape($cust_main->company),
+    'address1'     => _latex_escape($cust_main->address1),
+    'address2'     => _latex_escape($cust_main->address2),
+    'city'         => _latex_escape($cust_main->city),
+    'state'        => _latex_escape($cust_main->state),
+    'zip'          => _latex_escape($cust_main->zip),
+    'country'      => _latex_escape($cust_main->country),
     'footer'       => join("\n", $conf->config('invoice_latexfooter') ),
     'quantity'     => 1,
     'terms'        => $conf->config('invoice_default_terms') || 'Payable upon receipt',
@@ -951,7 +951,7 @@ sub print_ps {
 
   $invoice_data{'po_line'} =
     (  $cust_main->payby eq 'BILL' && $cust_main->payinfo )
-      ? "Purchase Order #". $cust_main->payinfo
+      ? _latex_escape("Purchase Order #". $cust_main->payinfo)
       : '~';
 
   my @line_item = ();
@@ -969,11 +969,11 @@ sub print_ps {
       foreach my $line_item ( $self->_items ) {
       #foreach my $line_item ( $self->_items_pkg ) {
         $invoice_data{'ref'} = $line_item->{'pkgnum'};
-        $invoice_data{'description'} = $line_item->{'description'};
+        $invoice_data{'description'} = _latex_escape($line_item->{'description'});
         if ( exists $line_item->{'ext_description'} ) {
           $invoice_data{'description'} .=
             "\\tabularnewline\n~~".
-            join("\\tabularnewline\n~~", @{$line_item->{'ext_description'}} );
+            join("\\tabularnewline\n~~", map { _latex_escape($_) } @{$line_item->{'ext_description'}} );
         }
         $invoice_data{'amount'} = $line_item->{'amount'};
         $invoice_data{'product_code'} = $line_item->{'pkgpart'} || 'N/A';
@@ -992,7 +992,7 @@ sub print_ps {
 
       my $taxtotal = 0;
       foreach my $tax ( $self->_items_tax ) {
-        $invoice_data{'total_item'} = $tax->{'description'};
+        $invoice_data{'total_item'} = _latex_escape($tax->{'description'});
         $taxtotal += ( $invoice_data{'total_amount'} = $tax->{'amount'} );
         push @total_fill,
           map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
@@ -1019,7 +1019,7 @@ sub print_ps {
 
       # credits
       foreach my $credit ( $self->_items_credits ) {
-        $invoice_data{'total_item'} = $credit->{'description'};
+        $invoice_data{'total_item'} = _latex_escape($credit->{'description'});
         #$credittotal
         $invoice_data{'total_amount'} = '-\dollar '. $credit->{'amount'};
         push @total_fill, 
@@ -1029,7 +1029,7 @@ sub print_ps {
 
       # payments
       foreach my $payment ( $self->_items_payments ) {
-        $invoice_data{'total_item'} = $payment->{'description'};
+        $invoice_data{'total_item'} = _latex_escape($payment->{'description'});
         #$paymenttotal
         $invoice_data{'total_amount'} = '-\dollar '. $payment->{'amount'};
         push @total_fill, 
@@ -1143,7 +1143,7 @@ sub _items_previous {
   my @b = ();
   foreach ( @pr_cust_bill ) {
     push @b, {
-      'description' => 'Previous Balance, Invoice \#'. $_->invnum. 
+      'description' => 'Previous Balance, Invoice #'. $_->invnum. 
                        ' ('. time2str('%x',$_->_date). ')',
       #'pkgpart'     => 'N/A',
       'pkgnum'      => 'N/A',
-- 
cgit v1.2.1


From c58132f6a26349d09744ef2b3b235dfb7c3757f6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 3 Jan 2004 08:42:10 +0000
Subject: fix heading colspan when there is no agent.disabled column

---
 httemplate/browse/agent.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 44343e15c..2eef5bb91 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -55,7 +55,7 @@ full offerings (via their type).<BR><BR>
 
 <%= table() %>
 <TR>
-  <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Agent</TH>
+  <TH COLSPAN=<%= ( $cgi->param('showdisabled') || !dbdef->table('agent')->column('disabled') ) ? 2 : 3 %>>Agent</TH>
   <TH>Type</TH>
   <TH>Customers</TH>
   <TH><FONT SIZE=-1>Freq.</FONT></TH>
-- 
cgit v1.2.1


From c57a4fc790d9ba9eaec58021ef9ee56b8649b6f1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 4 Jan 2004 03:52:54 +0000
Subject: remove obsolete netscape CCK support

depend on HTTP::BrowserDetect directly instead of via deprecated HTTP::Headers::UserAgent (closes: Bug#578)
---
 fs_signup/FS-SignupClient/cgi/signup.cgi | 41 +++++---------------------------
 1 file changed, 6 insertions(+), 35 deletions(-)

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 8dae9dd12..0a9a51008 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.49 2003-12-10 23:53:34 ivan Exp $
+# $Id: signup.cgi,v 1.50 2004-01-04 03:52:54 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages
@@ -11,7 +11,7 @@ use vars qw( @payby $cgi $locales $packages
              $paycvv $paydate $payname $referral_custnum $init_popstate
              $pkgpart $username $password $password2 $sec_phrase $popnum
              $agentnum $refnum
-             $ieak_file $ieak_template $cck_file $cck_template
+             $ieak_file $ieak_template
              $signup_html $signup_template
              $success_html $success_template
              $decline_html $decline_template
@@ -26,7 +26,7 @@ use CGI;
 #use CGI::Carp qw(fatalsToBrowser);
 use Text::Template;
 use Business::CreditCard;
-use HTTP::Headers::UserAgent 2.00;
+use HTTP::BrowserDetect;
 use FS::SignupClient 0.03 qw( signup_info new_customer );
 
 #acceptable payment methods
@@ -37,7 +37,6 @@ use FS::SignupClient 0.03 qw( signup_info new_customer );
 @payby = qw( CARD PREPAY );
 
 $ieak_file = '/usr/local/freeside/ieak.template';
-$cck_file = '/usr/local/freeside/cck.template';
 $signup_html = -e 'signup.html'
                  ? 'signup.html'
                  : '/usr/local/freeside/signup.html';
@@ -62,17 +61,6 @@ if ( -e $ieak_file ) {
   $ieak_template = '';
 }
 
-if ( -e $cck_file ) {
-  my $cck_txt = Text::Template::_load_text($cck_file)
-    or die $Text::Template::ERROR;
-  $cck_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
-  $cck_txt = $1;
-  $cck_template = new Text::Template ( TYPE => 'STRING', SOURCE => $cck_txt )
-    or die $Text::Template::ERROR;
-} else {
-  $cck_template = '';
-}
-
 $agentnum = '';
 if ( -e $signup_html ) {
   my $signup_txt = Text::Template::_load_text($signup_html)
@@ -339,7 +327,7 @@ sub print_decline {
 }
 
 sub print_okay {
-  my $user_agent = new HTTP::Headers::UserAgent $ENV{HTTP_USER_AGENT};
+  my $user_agent = new HTTP::BrowserDetect $ENV{HTTP_USER_AGENT};
 
   $cgi->param('username') =~ /^(.+)$/
     or die "fatal: invalid username got past FS::SignupClient::new_customer";
@@ -362,27 +350,10 @@ sub print_okay {
   #global for template
   $pkg = ( grep { $_->{'pkgpart'} eq $pkgpart } @$packages )[0]->{'pkg'};
 
-  if ( $ieak_template
-       && $user_agent->platform eq 'ia32'
-       && $user_agent->os =~ /^win/
-       && ($user_agent->browser)[0] eq 'IE'
-     )
-  { #send an IEAK config
+  if ( $ieak_template && $user_agent->windows && $user_agent->ie ) {
+    #send an IEAK config
     print $cgi->header('application/x-Internet-signup'),
           $ieak_template->fill_in();
-  } elsif ( $cck_template
-            && $user_agent->platform eq 'ia32'
-            && $user_agent->os =~ /^win/
-            && ($user_agent->browser)[0] eq 'Netscape'
-          )
-  { #send a Netscape config
-    my $cck_data = $cck_template->fill_in();
-    print $cgi->header('application/x-netscape-autoconfigure-dialer-v2'),
-          map {
-            m/(.*)\s+(.*)$/;
-            pack("N", length($1)). $1. pack("N", length($2)). $2;
-          } split(/\n/, $cck_data);
-
   } else { #send a simple confirmation
     print $cgi->header( '-expires' => 'now' ),
           $success_template->fill_in();
-- 
cgit v1.2.1


From f75be857e668201b46c88cf8ba718c1f64ec645e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 4 Jan 2004 03:54:52 +0000
Subject: remove obsolete netscape CCK supportsignup.cgi

depend on HTTP::BrowserDetect directly instead of via deprecated HTTP::Headers::UserAgent (closes: Bug#578)
---
 httemplate/docs/signup.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/httemplate/docs/signup.html b/httemplate/docs/signup.html
index 684521dc0..97d7aa794 100644
--- a/httemplate/docs/signup.html
+++ b/httemplate/docs/signup.html
@@ -12,7 +12,7 @@ webserver.  On this machine, install:
   <li><a href="http://search.cpan.org/search?dist=Text-Template">Text::Template</a>
   <li><a href="http://search.cpan.org/search?dist=Storable">Storable</a>
   <li><a href="http://search.cpan.org/search?dist=Business-CreditCard">Business-CreditCard</a>
-  <li><a href="http://www.sisd.com/useragent">HTTP::Headers::UserAgent</a> (version 2.0 or higher; not yet indexed correctly on CPAN)
+  <li><a href="http://search.cpan.org/search?dist=HTTP-BrowserDetect">HTTP::BrowserDetect</a>
 
   <li><a href="man/FS/SignupClient.html">FS::SignupClient</a> (copy the fs_signup/FS-SignupClient directory to the external machine, then: perl Makefile.PL; make; make install)
 </ul>
@@ -37,8 +37,6 @@ Optional:
 <ul>
   <li>If you create a <b>/usr/local/freeside/ieak.template</b> file on the external machine, it will be sent to IE users with MIME type <i>application/x-Internet-signup</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the variables listed below available.
   (an example file is included as <b>fs_signup/ieak.template</b>)  See the section on <a href="http://www.microsoft.com/windows/ieak/techinfo/deploy/60/en/INS.HTM">internet settings files</a> in the <a href="http://www.microsoft.com/windows/ieak/techinfo/deploy/60/en/toc.asp">IEAK documentation</a> for more information.
-  <li>If you create a <b>/usr/local/freeside/cck.template</b> file on the external machine, the variables defined will be sent to Netscape users with MIME type <i>application/x-netscape-autoconfigure-dialer-v2</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the variables listed below available.
-  (an example file is included as <b>fs_signup/cck.template</b>).  See the <a href="http://help.netscape.com/products/client/mc/acctproc4.html">Netscape documentation</a> for more information.
   <li>If you create a <b>/usr/local/freeside/success.html</b> file on the external machine, it will be used as the success HTML page.  Although template substiutions are available, a regular HTML file will work fine here, unlike signup.html.  An example file is included as <b>fs_signup/FS-SignupClient/cgi/success.html</b>
   <li>Variable substitutions available in <b>ieak.template</b>, <b>cck.template</b> and <b>success.html</b>:
     <ul>
-- 
cgit v1.2.1


From 92917c8a5ad3566460e4107e2f23febaa8353fe2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 4 Jan 2004 04:44:07 +0000
Subject: no more HTTP::Headers::UserAgent!

---
 fs_signup/FS-SignupClient/Makefile.PL | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fs_signup/FS-SignupClient/Makefile.PL b/fs_signup/FS-SignupClient/Makefile.PL
index c3c213fb6..310200b57 100644
--- a/fs_signup/FS-SignupClient/Makefile.PL
+++ b/fs_signup/FS-SignupClient/Makefile.PL
@@ -11,7 +11,6 @@ WriteMakefile(
     'PREREQ_PM'     => {
                          'Business::CreditCard' => 0,
                          'HTTP::BrowserDetect' => 0,
-                         'HTTP::Headers::UserAgent' => 3,
                          'Text::Template' => 0,
                          'FS::SelfService' => 0,
                        },
-- 
cgit v1.2.1


From 430f200a2b7d1862b3923648d3c85168a8e45046 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Jan 2004 20:24:48 +0000
Subject: fix other packages by next bill date link

---
 httemplate/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index d024de0bf..d4284fa4a 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -123,7 +123,7 @@
         <LI><A HREF="search/cust_pkg.cgi?pkgnum">all packages (by package number)</A>
         <LI><A HREF="search/cust_pkg.cgi?magic=suspended">suspended packages (by package number)</A>
         <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
-        <LI><A HREF="search/cust_pkg.html">packages (by next bill date range)</A>
+        <LI><A HREF="search/cust_pkg_report.cgi">packages (by next bill date range)</A>
       </UL>
       <A HREF="browse/part_pkg.cgi?active=1">Package definitions (by number of active packages)</A><BR><BR>
     Customers
-- 
cgit v1.2.1


From 89e8639b36b1b0fd474143c53d1664842405c29c Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 7 Jan 2004 06:10:01 +0000
Subject: Added billing plan sql_external for billing services in an external
 sql database.

---
 httemplate/edit/part_pkg.cgi | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index b697a76b2..f2f99b757 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -474,6 +474,36 @@ tie my %plans, 'Tie::IxHash',
     #'recur' => '\'my $dbh = DBI->connect("\' + what.datasrc.value + \'", "\' + what.db_username.value + \'", "\' what.db_password.value + \'" ) or die $DBI::errstr; my $sth = $dbh->prepare("\' + what.query.value + \'") or die $dbh->errstr; my $units = 0; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq "svc_domain" } $cust_pkg->cust_svc ) { my $domain = $cust_svc->svc_x->domain; $sth->execute($domain) or die $sth->errstr; $units += $sth->fetchrow_arrayref->[0]; } $units -= \' + what.recur_included.value + \'; $units = 0 if $units < 0; \' + what.recur_flat.value + \' + $units * \' + what.recur_unit_charge + \';\'',
   },
 
+
+
+  'sql_external' => {
+    'name' => 'Base charge plus additional fees for external services from a configurable SQL query',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'datasrc' => { 'name' => 'DBI data source',
+                     'default' => '',
+                   },
+      'db_username' => { 'name' => 'Database username',
+                         'default' => '',
+                       },
+      'db_password' => { 'name' => 'Database password',
+                         'default' => '',
+                       },
+      'query' => { 'name' => 'SQL query',
+                   'default' => '',
+                 },
+    },
+    'fieldorder' => [qw( setup_fee recur_flat datasrc db_username db_password query )],
+    'setup' => 'what.setup_fee.value',
+    'recur' => q!'my $dbh = DBI->connect("' + what.datasrc.value + '", "' + what.db_username.value + '", "' + what.db_password.value + '" ) or die $DBI::errstr; my $sth = $dbh->prepare("' + what.query.value + '") or die $dbh->errstr; my $price = ' + what.recur_flat.value + '; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq "svc_external" } $cust_pkg->cust_svc ){ my $id = $cust_svc->svc_x->id; $sth->execute($id) or die $sth->errstr; $price += $sth->fetchrow_arrayref->[0]; } $price;'!,
+
+  },
+
 ;
 
 my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
-- 
cgit v1.2.1


From e68e85f88922d6678a9c6fc1a7624065e38b7361 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 Jan 2004 21:10:56 +0000
Subject: adding system_usernames config value

---
 FS/FS/Conf.pm     |  6 ++++++
 FS/FS/svc_acct.pm | 16 ++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index b391fe44b..2404e5902 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1151,6 +1151,12 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'system_usernames'
+    'section'     => 'username',
+    'description' => 'A list of system usernames that cannot be edited or removed, one per line.  Use a bare username to prohibit modification/deletion of the username in any domain, or username@domain to prohibit modification/deletetion of a specific username and domain.',
+    'type'        => 'textarea',
+  },
 );
 
 1;
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index fce443634..3ddd70a93 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -427,6 +427,8 @@ The corresponding FS::cust_svc record will be deleted as well.
 sub delete {
   my $self = shift;
 
+  return "can't delete system account" if $self->_check_system;
+
   return "Can't delete an account which is a (svc_forward) source!"
     if qsearch( 'svc_forward', { 'srcsvc' => $self->svcnum } );
 
@@ -515,6 +517,8 @@ sub replace {
   my $error;
   warn "$me replacing $old with $new\n" if $DEBUG;
 
+  return "can't modify system account" if $old->_check_system;
+
   return "Username in use"
     if $old->username ne $new->username &&
       qsearchs( 'svc_acct', { 'username' => $new->username,
@@ -614,6 +618,7 @@ Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
 
 sub suspend {
   my $self = shift;
+  return "can't suspend system account" if $self->_check_system;
   my %hash = $self->hash;
   unless ( $hash{_password} =~ /^\*SUSPENDED\* /
            || $hash{_password} eq '*'
@@ -839,6 +844,17 @@ sub check {
   $self->SUPER::check;
 }
 
+=item _check_system
+
+=cut
+
+sub _check_system {
+  my $self = shift;
+  scalar( grep { $self->username eq $_ || $self->email eq $_ }
+               $conf->config('system_usernames')
+        );
+}
+
 =item radius
 
 Depriciated, use radius_reply instead.
-- 
cgit v1.2.1


From f3212b82d6d54500bbe31c02c8ffa456f018a067 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 Jan 2004 22:11:54 +0000
Subject: add deletecredits config value to enable deletion of credits

---
 FS/FS/Conf.pm                          |  9 +++++-
 FS/FS/cust_credit.pm                   | 59 +++++++++++++++++++++++++++++++++-
 FS/FS/cust_credit_bill.pm              |  5 ++-
 httemplate/misc/delete-cust_credit.cgi | 16 +++++++++
 httemplate/view/cust_main.cgi          | 11 ++++++-
 5 files changed, 96 insertions(+), 4 deletions(-)
 create mode 100755 httemplate/misc/delete-cust_credit.cgi

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 2404e5902..11243a91b 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -332,7 +332,14 @@ httemplate/docs/config.html
   {
     'key'         => 'deletepayments',
     'section'     => 'UI',
-    'description' => 'Enable deletion of unclosed payments.  Be very careful!  Only delete payments that were data-entry errors, not adjustments. Optionally specify one or more comma-separated email addresses to be notified when a payment is deleted.',
+    'description' => 'Enable deletion of unclosed payments.  Be very careful!  Only delete payments that were data-entry errors, not adjustments.  Optionally specify one or more comma-separated email addresses to be notified when a payment is deleted.',
+    'type'        => [qw( checkbox text )],
+  },
+
+  {
+    'key'         => 'deletecredits',
+    'section'     => 'UI',
+    'description' => 'Enable deletion of unclosed credits.  Be very careful!  Only delete credits that were data-entry errors, not adjustments.  Optionally specify one or more comma-separated email addresses to be notified when a credit is deleted.',
     'type'        => [qw( checkbox text )],
   },
 
diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 18ab1c361..90f9b59ed 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -130,7 +130,64 @@ Currently unimplemented.
 sub delete {
   my $self = shift;
   return "Can't delete closed credit" if $self->closed =~ /^Y/i;
-  $self->SUPER::delete(@_);
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  foreach my $cust_credit_bill ( $self->cust_credit_bill ) {
+    my $error = $cust_credit_bill->delete;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  my $error = $self->SUPER::delete(@_);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  if ( $conf->config('deletecredits') ne '' ) {
+
+    my $cust_main = qsearchs('cust_main',{ 'custnum' => $self->custnum });
+
+    my $error = send_email(
+      'from'    => $conf->config('invoice_from'), #??? well as good as any
+      'to'      => $conf->config('deletecredits'),
+      'subject' => 'FREESIDE NOTIFICATION: Credit deleted',
+      'body'    => [
+        "This is an automatic message from your Freeside installation\n",
+        "informing you that the following credit has been deleted:\n",
+        "\n",
+        'crednum: '. $self->crednum. "\n",
+        'custnum: '. $self->custnum.
+          " (". $cust_main->last. ", ". $cust_main->first. ")\n",
+        'amount: $'. sprintf("%.2f", $self->amount). "\n",
+        'date: '. time2str("%a %b %e %T %Y", $self->_date). "\n",
+        'reason: '. $self->reason. "\n",
+      ],
+    );
+
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "can't send credit deletion notification: $error";
+    }
+
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+
 }
 
 =item replace OLD_RECORD
diff --git a/FS/FS/cust_credit_bill.pm b/FS/FS/cust_credit_bill.pm
index 88a732bc6..bd76c2e1a 100644
--- a/FS/FS/cust_credit_bill.pm
+++ b/FS/FS/cust_credit_bill.pm
@@ -96,7 +96,10 @@ Currently unimplemented.
 =cut
 
 sub delete {
-  return "Can't unapply credit!"
+  my $self = shift;
+  return "Can't delete application for closed credit"
+    if $self->cust_credit->closed =~ /^Y/i;
+  $self->SUPER::delete(@_);
 }
 
 =item replace OLD_RECORD
diff --git a/httemplate/misc/delete-cust_credit.cgi b/httemplate/misc/delete-cust_credit.cgi
new file mode 100755
index 000000000..30de04d27
--- /dev/null
+++ b/httemplate/misc/delete-cust_credit.cgi
@@ -0,0 +1,16 @@
+<%
+
+#untaint crednum
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ || die "Illegal crednum";
+my $crednum = $1;
+
+my $cust_credit = qsearchs('cust_credit',{'crednum'=>$crednum});
+my $custnum = $cust_credit->custnum;
+
+my $error = $cust_credit->delete;
+eidiot($error) if $error;
+
+print $cgi->redirect($p. "view/cust_main.cgi?". $custnum);
+
+%>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index fb015671f..8123b2f82 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -554,6 +554,11 @@ function cust_pay_unapply_areyousure(href) {
  == true)
         window.location.href = href;
 }
+function cust_credit_areyousure(href) {
+    if (confirm("Are you sure you want to delete this credit?")
+ == true)
+        window.location.href = href;
+}
 </SCRIPT>
 END
 
@@ -628,9 +633,13 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
         $cust_credit->reason,
         time2str("%D", $cust_credit_bill->_date),
       );
+      my $delete =
+        $cust_credit->closed !~ /^Y/i && $conf->exists('deletecredits')
+          ? qq! (<A HREF="javascript:cust_credit_areyousure('${p}misc/delete-cust_credit.cgi?!. $cust_credit->crednum. qq!')">delete</A>)!
+          : '';
       push @history,
         "$date\tCredit #$crednum: $reason<BR>".
-        "(applied to invoice #$invnum on $app_date)\t\t\t$amount\t";
+        "(applied to invoice #$invnum on $app_date)$delete\t\t\t$amount\t";
     }
   }
   
-- 
cgit v1.2.1


From c8d3cff6e3026ac4f5dc59930220489ebe3d542f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 Jan 2004 22:15:36 +0000
Subject: correct tyop

---
 FS/FS/Conf.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 11243a91b..467a856c1 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1159,7 +1159,7 @@ httemplate/docs/config.html
   },
 
   {
-    'key'         => 'system_usernames'
+    'key'         => 'system_usernames',
     'section'     => 'username',
     'description' => 'A list of system usernames that cannot be edited or removed, one per line.  Use a bare username to prohibit modification/deletion of the username in any domain, or username@domain to prohibit modification/deletetion of a specific username and domain.',
     'type'        => 'textarea',
-- 
cgit v1.2.1


From c085c3ba3bd0677719407ce613dd24466f05abe2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 Jan 2004 22:39:22 +0000
Subject: credit deletions: need to use Date::Format and FS::Misc
 qw(send_email) in cust_credit.pm, need a link to delete unapplied credits too

---
 FS/FS/cust_credit.pm          | 2 ++
 httemplate/view/cust_main.cgi | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 90f9b59ed..19a54534f 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -2,8 +2,10 @@ package FS::cust_credit;
 
 use strict;
 use vars qw( @ISA $conf $unsuspendauto );
+use Date::Format;
 use FS::UID qw( dbh getotaker );
 use FS::Record qw( qsearch qsearchs );
+use FS::Misc qw(send_email);
 use FS::cust_main;
 use FS::cust_refund;
 use FS::cust_credit_bill;
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 8123b2f82..ee5f86973 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -668,12 +668,16 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
              qsearch('cust_credit',{'custnum'=>$custnum});
   foreach my $credit (@credits) {
     my($cref)=$credit->hashref;
+    my $delete =
+      $credit->closed !~ /^Y/i && $conf->exists('deletecredits')
+        ? qq! (<A HREF="javascript:cust_credit_areyousure('${p}misc/delete-cust_credit.cgi?!. $credit->crednum. qq!')">delete</A>)!
+        : '';
     push @history,
       $cref->{_date} . "\t" .
       qq!<A HREF="! . popurl(2). qq!edit/cust_credit_bill.cgi?!. $cref->{crednum} . qq!">!.
       '<b><font size="+1" color="#ff0000">Unapplied credit #' .
       $cref->{crednum} . "</font></b></A>: ".
-      $cref->{reason} . "\t\t\t" . $credit->credited . "\t";
+      $cref->{reason} . "$delete\t\t\t" . $credit->credited . "\t";
   }
   
   my(@refunds)=qsearch('cust_refund',{'custnum'=> $custnum } );
-- 
cgit v1.2.1


From 86794f71a5fec8cbb6ab3a49d9bfe7fdaf21d183 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 Jan 2004 22:46:48 +0000
Subject: add customer number

---
 httemplate/search/report_receivables.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index 66928ebbb..ad353a1b3 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -130,7 +130,7 @@ END
      }
 %>
   <TR>
-    <TD><A HREF="<%= $p %>view/cust_main.cgi?<%= $row->{'custnum'} %>">
+    <TD><A HREF="<%= $p %>view/cust_main.cgi?<%= $row->{'custnum'} %>"><%= $row->{'custnum'} %>:
         <%= $row->{'company'} ? $row->{'company'}. ' (' : '' %><%= $row->{'last'}. ', '. $row->{'first'} %><%= $row->{'company'} ? ')' : '' %></A>
     </TD>
     <TD><B><FONT SIZE=-1 COLOR="#<%= $statuscol %>"><%= $status %></FONT></B></TD>
-- 
cgit v1.2.1


From f0bcdae0719f2634df3c51bd3f21906de14817d4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 10 Jan 2004 03:50:59 +0000
Subject: fix UI: displaying "Add" on invoice event edits

---
 httemplate/edit/part_bill_event.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 6426eed93..48ed7916b 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -20,7 +20,7 @@ if ( $query && $query =~ /^(\d+)$/ ) {
 } else {
   $part_bill_event ||= new FS::part_bill_event {};
 }
-$action ||= $part_bill_event->pkgpart ? 'Edit' : 'Add';
+$action ||= $part_bill_event->eventpart ? 'Edit' : 'Add';
 my $hashref = $part_bill_event->hashref;
 
 print header("$action Invoice Event Definition", menubar(
-- 
cgit v1.2.1


From 4b5d23a37ae4d83695c79ca02718250f317b7f74 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 10 Jan 2004 04:19:06 +0000
Subject: don't require payname for DCHK either

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 3e40cc127..86962ce61 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -880,7 +880,7 @@ sub check {
       if !$import && ( $y<$nowy || ( $y==$nowy && $1<$nowm ) );
   }
 
-  if ( $self->payname eq '' && $self->payby ne 'CHEK' &&
+  if ( $self->payname eq '' && $self->payby !~ /^(CHEK|DCHK)$/ &&
        ( ! $conf->exists('require_cardname')
          || $self->payby !~ /^(CARD|DCRD)$/  ) 
   ) {
-- 
cgit v1.2.1


From 2ee78e49dd604c6269463fd0431bb7bf361a170a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 10 Jan 2004 11:17:45 +0000
Subject: workaround stubborn shells globbing [a-z] to include CVS/

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 42dba360f..2c2b7a5be 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,8 @@ create-config: install-perl-modules
 
 	mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
 	rm -rf conf/registries #old dirs just won't go away
-	cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
+	#cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
+	cp `ls -d conf/[a-z]* | grep -v CVS` "${FREESIDE_CONF}/conf.${DATASOURCE}"
 	chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
 
 	mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"
-- 
cgit v1.2.1


From e09c90ae3aa34e1e5a98bf024d99fbd07a50c3e4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 10 Jan 2004 11:32:24 +0000
Subject: update paths

---
 install/redhat/9/INSTALL | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/redhat/9/INSTALL b/install/redhat/9/INSTALL
index 2fecd1164..813f6947b 100644
--- a/install/redhat/9/INSTALL
+++ b/install/redhat/9/INSTALL
@@ -30,9 +30,9 @@ perl -MCPAN -e"install Locale::Country, Net::Whois, Business::CreditCard, \
 #edit /etc/init.d/httpd, add -DHAVE_PERL -DHAVE_SSL, then remove perl & ssl
 # module load bits from /etc/httpd/conf/httpd.conf
 
-useradd freeside
+/usr/sbin/useradd freeside
 
-chkconfig postgresql on
+/sbin/chkconfig postgresql on
 /etc/init.d/postgresql start
 
 su postgres -c "createuser -P freeside"
@@ -40,7 +40,7 @@ su postgres -c "createuser -P freeside"
 su freeside -c "createdb freeside"
 
 #?
-cd ../..
+cd ../../..
 make install-perl-modules
 make create-config
 freeside-adduser -c -h /usr/local/etc/freeside/htpasswd ivan
-- 
cgit v1.2.1


From 01c33bcdfa27576bee4ab922095749794a6b9f57 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 11 Jan 2004 23:37:08 +0000
Subject: adding

---
 httemplate/view/cust_bill-pdf.cgi | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100755 httemplate/view/cust_bill-pdf.cgi

diff --git a/httemplate/view/cust_bill-pdf.cgi b/httemplate/view/cust_bill-pdf.cgi
new file mode 100755
index 000000000..03340a16f
--- /dev/null
+++ b/httemplate/view/cust_bill-pdf.cgi
@@ -0,0 +1,13 @@
+<%
+
+#untaint invnum
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+my $invnum = $1;
+
+my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
+die "Invoice #$invnum not found!" unless $cust_bill;
+
+http_header('Content-Type' => 'application/postscript' );
+%>
+<%= $cust_bill->print_ps %>
-- 
cgit v1.2.1


From da068326c1f0df0cc574caf86745847ebf855b39 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 11 Jan 2004 23:38:17 +0000
Subject: fix for pdf

---
 httemplate/view/cust_bill-pdf.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/view/cust_bill-pdf.cgi b/httemplate/view/cust_bill-pdf.cgi
index 03340a16f..7aa69100d 100755
--- a/httemplate/view/cust_bill-pdf.cgi
+++ b/httemplate/view/cust_bill-pdf.cgi
@@ -8,6 +8,6 @@ my $invnum = $1;
 my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Invoice #$invnum not found!" unless $cust_bill;
 
-http_header('Content-Type' => 'application/postscript' );
+http_header('Content-Type' => 'application/pdf' );
 %>
-<%= $cust_bill->print_ps %>
+<%= $cust_bill->print_pdf %>
-- 
cgit v1.2.1


From 0fd894c50eaa84169115ccbb682a53f5148a8c9c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 11 Jan 2004 23:59:20 +0000
Subject: typeset invoice view in web UI uses pdf instead of postscript, closes
 Bug#614

---
 FS/FS/cust_bill.pm            | 84 ++++++++++++++++++++++++++++++++++++++-----
 httemplate/view/cust_bill.cgi |  2 +-
 2 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 8adbb6c1d..a5602a708 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -888,9 +888,12 @@ sub print_text {
 
 }
 
-=item print_ps [ TIME [ , TEMPLATE ] ]
+=item print_latex [ TIME [ , TEMPLATE ] ]
 
-Returns an postscript invoice, as a scalar.
+Internal method - returns a filename of a filled-in LaTeX template for this
+invoice (Note: add ".tex" to get the actual filename).
+
+See print_ps and print_pdf for methods that return PostScript and PDF output.
 
 TIME an optional value used to control the printing of overdue messages.  The
 default is now.  It isn't the date of the invoice; that's the `_date' field.
@@ -900,7 +903,7 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 =cut
 
 #still some false laziness w/print_text
-sub print_ps {
+sub print_latex {
 
   my( $self, $today, $template ) = @_;
   $today ||= time;
@@ -1070,17 +1073,37 @@ sub print_ps {
   print TEX join("\n", @filled_in ), "\n";
   close TEX;
 
+  return $file;
+
+}
+
+=item print_ps [ TIME [ , TEMPLATE ] ]
+
+Returns an postscript invoice, as a scalar.
+
+TIME an optional value used to control the printing of overdue messages.  The
+default is now.  It isn't the date of the invoice; that's the `_date' field.
+It is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=cut
+
+sub print_ps {
+  my $self = shift;
+
+  my $file = $self->print_latex(@_);
+
   #error checking!!
   system('pslatex', "$file.tex");
   system('pslatex', "$file.tex");
-  #system('dvips', '-t', 'letter', "$file.dvi", "$file.ps");
-  system('dvips', '-t', 'letter', "$file.dvi", '-o', "$file.ps" );
+  system('dvips', '-q', '-t', 'letter', "$file.dvi", '-o', "$file.ps" );
 
-  open(POSTSCRIPT, "<$file.ps") or die "can't open $file.ps (probable error in LaTeX template): $!\n";
+  open(POSTSCRIPT, "<$file.ps")
+    or die "can't open $file.ps (probable error in LaTeX template): $!\n";
 
   #rm $file.dvi $file.log $file.aux
-  #unlink("$file.dvi", "$file.log", "$file.aux", "$file.ps");
-  unlink("$file.dvi", "$file.log", "$file.aux");
+  unlink("$file.dvi", "$file.log", "$file.aux", "$file.ps");
+  #unlink("$file.dvi", "$file.log", "$file.aux");
 
   my $ps = '';
   while (<POSTSCRIPT>) {
@@ -1093,7 +1116,50 @@ sub print_ps {
 
 }
 
-# quick subroutine for print_ps
+=item print_pdf [ TIME [ , TEMPLATE ] ]
+
+Returns an PDF invoice, as a scalar.
+
+TIME an optional value used to control the printing of overdue messages.  The
+default is now.  It isn't the date of the invoice; that's the `_date' field.
+It is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=cut
+
+sub print_pdf {
+  my $self = shift;
+
+  my $file = $self->print_latex(@_);
+
+  #system('pdflatex', "$file.tex");
+  #system('pdflatex', "$file.tex");
+  #! LaTeX Error: Unknown graphics extension: .eps.
+
+  #error checking!!
+  system('pslatex', "$file.tex");
+  system('pslatex', "$file.tex");
+
+  #system('dvipdf', "$file.dvi", "$file.pdf" );
+  system("dvips -q -t letter -f $file.dvi | gs -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$file.pdf -c save pop -");
+
+  open(PDF, "<$file.pdf")
+    or die "can't open $file.pdf (probably error in LaTeX tempalte: $!\n";
+
+  unlink("$file.dvi", "$file.log", "$file.aux", "$file.pdf");
+
+  my $pdf = '';
+  while (<PDF>) {
+    $pdf .= $_;
+  }
+
+  close PDF;
+
+  return $pdf;
+
+}
+
+# quick subroutine for print_latex
 #
 # There are ten characters that LaTeX treats as special characters, which
 # means that they do not simply typeset themselves: 
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index ddc92748d..4e0c4383b 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -23,7 +23,7 @@ print qq!<A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) aga
 print qq!<A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>!.      '<BR><BR>';
 
 print menubar(
-  'View typeset invoice' => "${p}view/cust_bill-ps.cgi?$invnum",
+  'View typeset invoice' => "${p}view/cust_bill-pdf.cgi?$invnum",
 ), '<BR><BR>';
 
 #false laziness with search/cust_bill_event.cgi
-- 
cgit v1.2.1


From 13481802b29a511fa0aa1d10e2ad463e362bf8ed Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Jan 2004 00:03:45 +0000
Subject: only display "view typeset invoice" when there is an invoice_latex
 template

---
 httemplate/view/cust_bill.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 4e0c4383b..4d98f3ebc 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -22,9 +22,12 @@ print qq!<A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) aga
 
 print qq!<A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>!.      '<BR><BR>';
 
-print menubar(
-  'View typeset invoice' => "${p}view/cust_bill-pdf.cgi?$invnum",
-), '<BR><BR>';
+my $conf = new FS::Conf;
+if ( $conf->exists('invoice_latex') ) {
+  print menubar(
+    'View typeset invoice' => "${p}view/cust_bill-pdf.cgi?$invnum",
+  ), '<BR><BR>';
+}
 
 #false laziness with search/cust_bill_event.cgi
 
-- 
cgit v1.2.1


From eb54e94a13683132c91bfb33ab90339e88e465c2 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 12 Jan 2004 20:34:02 +0000
Subject: $pvf isn't a global.

---
 httemplate/browse/part_virtual_field.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/browse/part_virtual_field.cgi b/httemplate/browse/part_virtual_field.cgi
index 9bb5c1373..a0009dabd 100644
--- a/httemplate/browse/part_virtual_field.cgi
+++ b/httemplate/browse/part_virtual_field.cgi
@@ -23,7 +23,7 @@ foreach (qsearch('part_virtual_field', {})) {
 
 <%=table()%>
 <TH><TD>Field name</TD><TD>Description</TD></TH>
-<% foreach $pvf (sort {$a->name cmp $b->name} @{ $pvfs{$dbtable} }) { %>
+<% foreach my $pvf (sort {$a->name cmp $b->name} @{ $pvfs{$dbtable} }) { %>
   <TR>
     <TD></TD>
     <TD>
-- 
cgit v1.2.1


From bceb76982c9a2516122d7996f2a4c2a30cd79a45 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 12 Jan 2004 20:40:28 +0000
Subject: Lists are just better sorted.

---
 httemplate/edit/part_virtual_field.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_virtual_field.cgi b/httemplate/edit/part_virtual_field.cgi
index 8bc84387f..fb10321e8 100644
--- a/httemplate/edit/part_virtual_field.cgi
+++ b/httemplate/edit/part_virtual_field.cgi
@@ -47,7 +47,7 @@ Field #<B><%=$vfieldpart or "(NEW)"%></B><BR><BR>
     <TD><% if ($action eq 'Add') { %>
       <SELECT SIZE=1 NAME="dbtable"><%
         my $dbdef = dbdef;  # ick
-        foreach my $dbtable ($dbdef->tables) {
+        foreach my $dbtable (sort { $a cmp $b } $dbdef->tables) {
           if ($dbtable !~ /^h_/
           and $dbdef->table($dbtable)->primary_key) { %>
             <OPTION VALUE="<%=$dbtable%>"><%=$dbtable%></OPTION><%
-- 
cgit v1.2.1


From 4992785a9ee19e318d4f4ac144675da97abbfb3d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Jan 2004 20:52:42 +0000
Subject: add IPC::ShareLite

---
 httemplate/docs/upgrade-1.4.2.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/httemplate/docs/upgrade-1.4.2.html b/httemplate/docs/upgrade-1.4.2.html
index c5606b284..ba8c87a3c 100644
--- a/httemplate/docs/upgrade-1.4.2.html
+++ b/httemplate/docs/upgrade-1.4.2.html
@@ -7,6 +7,7 @@
   <li>If migrating from less than 1.4.1, see these <a href="upgrade9.html">instructions</a> first.
   <li>Back  up your data and current Freeside installation.
   <li>Install <a href="http://search.cpan.org/search?dist=Locale-SubCountry">Locale::SubCountry</a>
+  <li>Install <a href="http://search.cpan.org/search?dist=IPC-ShareLite">IPC::ShareLite</a>
   <li>CGI.pm minimum version 2.47 is required.  You will probably need to install a current CGI.pm from CPAN if you are using Perl 5.005 or earlier.
   <li>Run <code>make aspdocs</code> or <code>make masondocs</code>.
   <li>Copy <code>aspdocs/</code> or <code>masondocs/</code> to your web server's document space.
-- 
cgit v1.2.1


From 35561e0c77644baee2be00bffe70991c4f912d4d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Jan 2004 20:52:58 +0000
Subject: add IPC::ShareLite and Locale::SubCountry

---
 httemplate/docs/upgrade10.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 275b821a3..9dc4f3dfa 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -3,7 +3,7 @@ this is incomplete
 
 install DBIx::DBSchema 0.22
 
-install NetAddr::IP and Chart::Base
+install NetAddr::IP, Chart::Base, IPC::ShareLite and Locale::SubCountry
 
 CREATE TABLE cust_bill_pkg_detail (
   detailnum serial,
-- 
cgit v1.2.1


From 5edf279b260fd952457af1ab8489eaec7952204a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 16 Jan 2004 21:45:37 +0000
Subject: apply variable substitutions in latex notes also

---
 FS/FS/cust_bill.pm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index a5602a708..3c941ca6f 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -943,15 +943,22 @@ sub print_latex {
     'footer'       => join("\n", $conf->config('invoice_latexfooter') ),
     'quantity'     => 1,
     'terms'        => $conf->config('invoice_default_terms') || 'Payable upon receipt',
-    'notes'        => join("\n", $conf->config('invoice_latexnotes') ),
+    #'notes'        => join("\n", $conf->config('invoice_latexnotes') ),
   );
 
-  $invoice_data{'footer'} =~ s/\n+$//;
-  $invoice_data{'notes'} =~ s/\n+$//;
-
   my $countrydefault = $conf->config('countrydefault') || 'US';
   $invoice_data{'country'} = '' if $invoice_data{'country'} eq $countrydefault;
 
+  #do variable substitutions in notes
+  $invoice_data{'notes'} =
+    join("\n",
+      map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+        $conf->config('invoice_latexnotes')
+    );
+
+  $invoice_data{'footer'} =~ s/\n+$//;
+  $invoice_data{'notes'} =~ s/\n+$//;
+
   $invoice_data{'po_line'} =
     (  $cust_main->payby eq 'BILL' && $cust_main->payinfo )
       ? _latex_escape("Purchase Order #". $cust_main->payinfo)
-- 
cgit v1.2.1


From 0acc33b64b123f11ac1040629507619d3988bbae Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 18 Jan 2004 21:03:54 +0000
Subject: revert bind_param change _again_.  passing not as a hashref causes
 too many other problems.  please leave as is.  DBD::Pg needs to be fixed. 
 1.31 is a lost cause.

---
 FS/FS/Record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 191eee5f0..2517d1841 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -313,9 +313,9 @@ sub qsearch {
     if ( $record->{$field} =~ /^\d+(\.\d+)?$/
          && $dbdef->table($table)->column($field)->type =~ /(int|serial)/i
     ) {
-      $sth->bind_param($bind++, $record->{$field}, SQL_INTEGER);
+      $sth->bind_param($bind++, $record->{$field}, { TYPE => SQL_INTEGER } );
     } else {
-      $sth->bind_param($bind++, $record->{$field}, SQL_VARCHAR);
+      $sth->bind_param($bind++, $record->{$field}, { TYPE => SQL_VARCHAR } );
     }
   }
 
-- 
cgit v1.2.1


From 7bf662bf7b1bdbddb43052600efeaefd62ea0002 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 19 Jan 2004 23:21:03 +0000
Subject: typeset invoice doc update

---
 httemplate/docs/upgrade-1.4.2.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/httemplate/docs/upgrade-1.4.2.html b/httemplate/docs/upgrade-1.4.2.html
index ba8c87a3c..1b58565e9 100644
--- a/httemplate/docs/upgrade-1.4.2.html
+++ b/httemplate/docs/upgrade-1.4.2.html
@@ -13,5 +13,6 @@
   <li>Copy <code>aspdocs/</code> or <code>masondocs/</code> to your web server's document space.
   <li>Run <code>make install-perl-modules</code>.
   <li>The signup server and password server are deprecated in 1.4.2.  Their functionality has been incorperated into the self-service server.  Edit or reinstall your init script appropriately, and set the "signup_server-default_agentnum" and "signup_server-default_refnum" configuration options appropriately.  The FS::SignupClient interface is still available as a compatibility wrapper.  You should be able to continue to use your current signup.cgi.
+  <li>Optional: To use typeset invoices, install tetex and ghostscript, and copy conf/invoice_latex, conf/invoice_latexnotes, and conf/invoice_latexfooter to /usr/local/etc/freeside/conf.<datasrc>/
   <li>Restart Apache and freeside-queued.
 </body>
-- 
cgit v1.2.1


From 790f80663a0ddcb4f2496bad4b2e0bfa80bc3210 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 20 Jan 2004 20:30:03 +0000
Subject: add database dump from web interface

---
 httemplate/index.html    |  1 +
 httemplate/misc/dump.cgi | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 httemplate/misc/dump.cgi

diff --git a/httemplate/index.html b/httemplate/index.html
index d4284fa4a..548c25ceb 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -153,6 +153,7 @@
       <BR><A HREF="browse/queue.cgi">View pending job queue</A>
       <BR><A HREF="misc/cust_main-import.cgi">Batch import customers from CSV file</A>
       <BR><A HREF="misc/cust_main-import_charges.cgi">Batch import charges from CSV file</A>
+      <BR><A HREF="misc/dump.cgi">Download database dump</A>
       <BR><BR><CENTER><HR WIDTH="94%" NOSHADE></CENTER><BR>
       <A NAME="config" HREF="config/config-view.cgi">Configuration</a><!-- - <font size="+2" color="#ff0000">start here</font> -->
       <BR><BR><A NAME="admin">Administration</a>
diff --git a/httemplate/misc/dump.cgi b/httemplate/misc/dump.cgi
new file mode 100644
index 000000000..2c7dfc455
--- /dev/null
+++ b/httemplate/misc/dump.cgi
@@ -0,0 +1,19 @@
+<%
+  if ( driver_name =~ /^Pg$/ ) {
+    my $dbname = (split(':', datasrc))[2];
+    if ( $dbname =~ /[;=]/ ) {
+      my %elements = map { /^(\w+)=(.*)$/; $1=>$2 } split(';', $dbname);
+      $dbname = $elements{'dbname'};
+    }
+    open(DUMP,"pg_dump $dbname |");
+  } else {
+    eidiot "don't (yet) know how to dump ". driver_name. " databases\n";
+  }
+
+  http_header('Content-Type' => 'text/plain' );
+
+  while (<DUMP>) {
+    chomp;
+%><%= $_ %><% }
+   close DUMP;
+%>
-- 
cgit v1.2.1


From 0c0cb89fbf23c575cab2cac5519b6051288a7d3f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Jan 2004 00:04:07 +0000
Subject: don't include the _next_ day, just the full ending day

---
 httemplate/search/cust_bill_event.cgi | 2 +-
 httemplate/search/cust_pay.cgi        | 2 +-
 httemplate/search/cust_pkg.cgi        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/httemplate/search/cust_bill_event.cgi b/httemplate/search/cust_bill_event.cgi
index b76f66b76..ec952ea5b 100644
--- a/httemplate/search/cust_bill_event.cgi
+++ b/httemplate/search/cust_bill_event.cgi
@@ -7,7 +7,7 @@ $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
 my $beginning = str2time($1) || 0;
 
 $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
-my $ending = str2time($1) + 86400;
+my $ending = str2time($1) + 86399;
 
 my @cust_bill_event =
   sort { $a->_date <=> $b->_date }
diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi
index 9eab5f82e..51dd3b340 100755
--- a/httemplate/search/cust_pay.cgi
+++ b/httemplate/search/cust_pay.cgi
@@ -42,7 +42,7 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq '_date' ) {
   }
   if ( $cgi->param('ending')
             && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
-    my $ending = str2time($1) + 86400;
+    my $ending = str2time($1) + 86399;
     push @search, " _date <= $ending ";
   }
   my $search;
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index c2f6272c4..45420f4c4 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -29,7 +29,7 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
   }
   if ( $cgi->param('ending')
             && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
-    my $ending = str2time($1) + 86400;
+    my $ending = str2time($1) + 86399;
     $range .= ( $range ? ' AND ' : ' WHERE ' ). " bill <= $ending ";
   }
 
-- 
cgit v1.2.1


From e202198ab2a701ac6f6bfcfb67171b97801ab976 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Jan 2004 22:00:34 +0000
Subject: fix multi-page typeset invoices

---
 FS/FS/Conf.pm                 | 7 +++++++
 FS/FS/cust_bill.pm            | 1 +
 conf/invoice_latex            | 6 +++---
 conf/invoice_latexsmallfooter | 1 +
 4 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 conf/invoice_latexsmallfooter

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 467a856c1..ec1bf5574 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -490,6 +490,13 @@ httemplate/docs/config.html
     'type'        => 'textarea',
   },
 
+  {
+    'key'         => 'invoice_latexsmallfooter',
+    'section'     => 'billing',
+    'description' => 'Optional small footer for multi-page LaTeX typeset PostScript invoices.',
+    'type'        => 'textarea',
+  },
+
   { 
     'key'         => 'invoice_default_terms',
     'section'     => 'billing',
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 3c941ca6f..9f1d7a6fc 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -941,6 +941,7 @@ sub print_latex {
     'zip'          => _latex_escape($cust_main->zip),
     'country'      => _latex_escape($cust_main->country),
     'footer'       => join("\n", $conf->config('invoice_latexfooter') ),
+    'smallfooter'  => $conf->config('invoice_latexsmallfooter'),
     'quantity'     => 1,
     'terms'        => $conf->config('invoice_default_terms') || 'Payable upon receipt',
     #'notes'        => join("\n", $conf->config('invoice_latexnotes') ),
diff --git a/conf/invoice_latex b/conf/invoice_latex
index b28679344..f63ab324f 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -85,12 +85,12 @@ Invoice date & & Invoice number \\
 %%	Header & footer changes for subsequent pages
 %
 \afterpage{ \fancyfoot[RO,RE]{\small{\thepage\ of \pageref{LastPage}}} }
-\afterpage{ \fancyfoot[CO,CE]{\small{$org_company}} }
+\afterpage{ \fancyfoot[CO,CE]{\small{$smallfooter}} }
 \afterpage{ \fancyhead[LO,LE]{\small{}} }
 \afterpage{ \fancyhead[RO,RE]{\small{
 \begin{tabular}{ll}
-Date & Account number\\
-\textbf{ $date_of_bill} & \textbf{ $customer_ref}\\
+Invoice date & Invoice number\\
+\textbf{$date} & \textbf{$invnum}\\
 \end{tabular}}} }
 %
 %
diff --git a/conf/invoice_latexsmallfooter b/conf/invoice_latexsmallfooter
new file mode 100644
index 000000000..527c356f5
--- /dev/null
+++ b/conf/invoice_latexsmallfooter
@@ -0,0 +1 @@
+Ivan Kohler~~~Freeside - open-source billing
-- 
cgit v1.2.1


From 833547365c4418946c1c270f43928164d51cf531 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Jan 2004 22:10:05 +0000
Subject: clean up all temp files!

---
 FS/FS/cust_bill.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 9f1d7a6fc..60eaac6d9 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1109,9 +1109,7 @@ sub print_ps {
   open(POSTSCRIPT, "<$file.ps")
     or die "can't open $file.ps (probable error in LaTeX template): $!\n";
 
-  #rm $file.dvi $file.log $file.aux
-  unlink("$file.dvi", "$file.log", "$file.aux", "$file.ps");
-  #unlink("$file.dvi", "$file.log", "$file.aux");
+  unlink("$file.dvi", "$file.log", "$file.aux", "$file.ps", "$file.tex");
 
   my $ps = '';
   while (<POSTSCRIPT>) {
@@ -1154,7 +1152,7 @@ sub print_pdf {
   open(PDF, "<$file.pdf")
     or die "can't open $file.pdf (probably error in LaTeX tempalte: $!\n";
 
-  unlink("$file.dvi", "$file.log", "$file.aux", "$file.pdf");
+  unlink("$file.dvi", "$file.log", "$file.aux", "$file.pdf", "$file.tex");
 
   my $pdf = '';
   while (<PDF>) {
-- 
cgit v1.2.1


From eef42f43c02b386ed7a0b1ce9911964bb94d3e96 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Jan 2004 23:45:03 +0000
Subject: fix newline problem in dump

---
 httemplate/misc/dump.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/httemplate/misc/dump.cgi b/httemplate/misc/dump.cgi
index 2c7dfc455..dc1323bb3 100644
--- a/httemplate/misc/dump.cgi
+++ b/httemplate/misc/dump.cgi
@@ -13,7 +13,7 @@
   http_header('Content-Type' => 'text/plain' );
 
   while (<DUMP>) {
-    chomp;
-%><%= $_ %><% }
-   close DUMP;
+    print $_;
+  }
+  close DUMP;
 %>
-- 
cgit v1.2.1


From 9163d831264988af6065139c7531d59a1bb29c10 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 22 Jan 2004 00:11:01 +0000
Subject: report cancellation errors properly

---
 httemplate/misc/cust_main-cancel.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/misc/cust_main-cancel.cgi b/httemplate/misc/cust_main-cancel.cgi
index 526e128a4..257c3384f 100755
--- a/httemplate/misc/cust_main-cancel.cgi
+++ b/httemplate/misc/cust_main-cancel.cgi
@@ -7,8 +7,8 @@ my $custnum = $1;
 
 my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
 
-my $error = $cust_main->cancel;
-eidiot($error) if $error;
+my @errors = $cust_main->cancel;
+eidiot(join(' / ', @errors)) if scalar(@errors);
 
 #print $cgi->redirect($p. "view/cust_main.cgi?". $cust_main->custnum);
 print $cgi->redirect($p);
-- 
cgit v1.2.1


From 30a64bab3009967a4c530c44c49df2ab4681fef1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 22 Jan 2004 00:21:25 +0000
Subject: fix cancel method

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 86962ce61..6ca32871d 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1016,7 +1016,7 @@ Always returns a list: an empty list on success or a list of errors.
 
 sub cancel {
   my $self = shift;
-  grep { $_->cancel(@_) } $self->ncancelled_pkgs;
+  grep { $_ } map { $_->cancel(@_) } $self->ncancelled_pkgs;
 }
 
 =item agent
-- 
cgit v1.2.1


From c6d6af63486146b83095818513c3c11bdb21360d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Jan 2004 00:49:36 +0000
Subject: update ideas about package splitup

---
 debian/control | 61 ++++++++++++++--------------------------------------------
 1 file changed, 14 insertions(+), 47 deletions(-)

diff --git a/debian/control b/debian/control
index de2820d83..d7873b228 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.5.2
 Package: freeside
 Architecture: any
 Depends: freeside-lib
-Recommends: freeside-doc, freeside-ui-web, libterm-query-perl
-Suggests: freeside-passwd-server, freeside-signup-server, freeside-session-server, freeside-selfservice-server
+Recommends: freeside-doc, freeside-ui-web
+Suggests: freeside-selfservice-server
 Description: Billing and administration package for ISPs.
  Freeside is a billing and account administration package for ISPs.  It stores
  customer information in an SQL database, and will update UNIX passwd and
@@ -30,63 +30,30 @@ Description: Freeside libraries and extension API
  This package contains the libraries which implement the business logic and
  backend functions of Freeside, a billing and account administration package
  for ISPs.  This package also contains the manual pages for the library API.
+ (? like a libmodule-perl package)
 
 Package: freeside-ui-web
 Architecture: all
-Depends: libstring-approx-perl, freeside-lib, libapache-mod-perl|apache-perl
+Depends: libhtml-mason-perl, libstring-approx-perl, freeside-lib, libapache-mod-perl|apache-perl
 Suggests: libapache-mod-ssl|apache-ssl
 Description: Easy-to-use web interface for Freeside
  This package contains the web interface for Freeside, a billing and account
  administration package for ISPs.  This is what sales or support folks will
  typically use to add new accounts, edit exiting accounts and so on.
 
-Package: freeside-passwd-server
-Architecture: all
-Depends: freeside-lib
-Description: Freeside password server 
- This component of Freeside, a billing and account administration package for
- ISPs, 
-
-Package: freeside-passwd-client
-Architecture: all
-Depends: 
-Description: 
- <rar>
-
-Package: freeside-signup-server
-Architecture: all
-Depends: freeside-lib
-Description:
- <rar>
-
-Package: freeside-signup-client
-Architecture: all
-Depends: 
-Description:
- <rar>
-
-Package: freeside-signup-client-webui
-Architecture: all
-Depends: freeside-signup-client-lib, httpd
-Description: 
- <rar>
-
-Package: freeside-session-server
+Package: freeside-selfservice-server
 Architecture: all
-Depends: freeside-lib
+Depends: freeside-lib, libnet-ssh-perl, ssh
 Description:
- <rar>
+ This package contains the server side of the customer self-service interface.
+ It is installed on a private backend machine, and opens an outgoing ssh
+ connection to one or more public web server(s).
 
-Package: freeside-session-client
+Package: freeside-selfservice-client
 Architecture: all
-Depends: ssh
-Description: 
- <rar>
-
-Package: freeside-selfservice-server
-Architecture: all
-Depends:
+Depends: libstorable-perl, libhttp-browserdetect-perl, libbusiness-creditcard-perl, ssh
 Description:
- <rar>
-
+ This package contains the client side of the customer self-service interface.
+ It is typically installed on a public webserver and interfaces with
+ freeside-selfservice-server installed on a private backend machine.
 
-- 
cgit v1.2.1


From 85be0d954dbe4a2c86841a37dc6a4df690dd5142 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Jan 2004 02:53:12 +0000
Subject: fix state default and set min year to this year, patch from
 <matthewd>, thanks!

---
 httemplate/edit/cust_main.cgi | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 1909b5438..bfe4a2d4f 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -191,8 +191,10 @@ END
 my $countrydefault = $conf->config('countrydefault') || 'US';
 $cust_main->country( $countrydefault ) unless $cust_main->country;
 
-$cust_main->state( $conf->config('statedefault') || 'CA' )
-  unless $cust_main->state || $cust_main->country ne 'US';
+my $statedefault = $conf->config('statedefault')
+                   || ($countrydefault eq 'US' ? 'CA' : '');
+$cust_main->state( $statedefault )
+  unless $cust_main->state || $cust_main->country ne $countrydefault;
 
 my($county_html, $state_html, $country_html) =
   FS::cust_main_county::regionselector( $cust_main->county,
@@ -343,7 +345,9 @@ sub expselect {
     $return .= ">$_";
   }
   $return .= qq!</SELECT>/<SELECT NAME="$prefix!. qq!_year" SIZE="1">!;
-  for ( 2001 .. 2037 ) {
+  my @t = localtime;
+  my $thisYear = $t[5] + 1900;
+  for ( ($thisYear > $y && $y > 0 ? $y : $thisYear) .. 2037 ) {
     $return .= "<OPTION";
     $return .= " SELECTED" if $_ == $y;
     $return .= ">$_";
-- 
cgit v1.2.1


From 24eb823f02d7681b052261dd321b3505ac970e61 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Jan 2004 03:01:22 +0000
Subject: and the same for ship_

---
 httemplate/edit/cust_main.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index bfe4a2d4f..857e769a3 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -291,8 +291,9 @@ END
   #false laziness with regular state
   $cust_main->ship_country( $countrydefault ) unless $cust_main->ship_country;
 
-  $cust_main->ship_state( $conf->config('statedefault') || 'CA' )
-    unless $cust_main->ship_state || $cust_main->ship_country ne 'US';
+  $cust_main->ship_state( $statedefault )
+    unless $cust_main->ship_state
+           || $cust_main->ship_country ne $countrydefault;
 
   my($ship_county_html, $ship_state_html, $ship_country_html) =
     FS::cust_main_county::regionselector( $cust_main->ship_county,
-- 
cgit v1.2.1


From 03cf0e09e1dfa75fd320ddcbad958301a6546675 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Jan 2004 03:21:28 +0000
Subject: consolidate large numbers of accounts to avoid gigantic line items

---
 FS/FS/cust_bill.pm | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 60eaac6d9..a6b4e1e5e 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -941,7 +941,7 @@ sub print_latex {
     'zip'          => _latex_escape($cust_main->zip),
     'country'      => _latex_escape($cust_main->country),
     'footer'       => join("\n", $conf->config('invoice_latexfooter') ),
-    'smallfooter'  => $conf->config('invoice_latexsmallfooter'),
+    'smallfooter'  => join("\n", $conf->config('invoice_latexsmallfooter') ),
     'quantity'     => 1,
     'terms'        => $conf->config('invoice_default_terms') || 'Payable upon receipt',
     #'notes'        => join("\n", $conf->config('invoice_latexnotes') ),
@@ -958,6 +958,7 @@ sub print_latex {
     );
 
   $invoice_data{'footer'} =~ s/\n+$//;
+  $invoice_data{'smallfooter'} =~ s/\n+$//;
   $invoice_data{'notes'} =~ s/\n+$//;
 
   $invoice_data{'po_line'} =
@@ -1152,7 +1153,7 @@ sub print_pdf {
   open(PDF, "<$file.pdf")
     or die "can't open $file.pdf (probably error in LaTeX tempalte: $!\n";
 
-  unlink("$file.dvi", "$file.log", "$file.aux", "$file.pdf", "$file.tex");
+#  unlink("$file.dvi", "$file.log", "$file.aux", "$file.pdf", "$file.tex");
 
   my $pdf = '';
   while (<PDF>) {
@@ -1263,20 +1264,31 @@ sub _items_cust_bill_pkg {
       my $part_pkg = qsearchs('part_pkg', { pkgpart=>$cust_pkg->pkgpart } );
       my $pkg = $part_pkg->pkg;
 
+      my %labels;
+      #tie %labels, 'Tie::IxHash';
+      push @{ $labels{$_->[0]} }, $_->[1] foreach $cust_pkg->labels;
+      my @ext_description;
+      foreach my $label ( keys %labels ) {
+        my @values = @{ $labels{$label} };
+        my $num = scalar(@values);
+        if ( $num > 5 ) {
+          push @ext_description, "$label ($num)";
+        } else {
+          push @ext_description, map { "$label: $_" } @values;
+        }
+      }
+
       if ( $cust_bill_pkg->setup != 0 ) {
         my $description = $pkg;
         $description .= ' Setup' if $cust_bill_pkg->recur != 0;
-        my @d = ();
-        @d = $cust_bill_pkg->details if $cust_bill_pkg->recur == 0;
+        my @d = @ext_description;
+        push @d, $cust_bill_pkg->details if $cust_bill_pkg->recur == 0;
         push @b, {
           'description'     => $description,
           #'pkgpart'         => $part_pkg->pkgpart,
           'pkgnum'          => $cust_pkg->pkgnum,
           'amount'          => sprintf("%10.2f", $cust_bill_pkg->setup),
-          'ext_description' => [ ( map { $_->[0]. ": ". $_->[1] }
-                                         $cust_pkg->labels        ),
-                                 @d,
-                               ],
+          'ext_description' => \@d,
         };
       }
 
@@ -1288,8 +1300,7 @@ sub _items_cust_bill_pkg {
           #'pkgpart'         => $part_pkg->pkgpart,
           'pkgnum'          => $cust_pkg->pkgnum,
           'amount'          => sprintf("%10.2f", $cust_bill_pkg->recur),
-          'ext_description' => [ ( map { $_->[0]. ": ". $_->[1] }
-                                       $cust_pkg->labels          ),
+          'ext_description' => [ @ext_description,
                                  $cust_bill_pkg->details,
                                ],
         };
-- 
cgit v1.2.1


From 57be672860c23f6c856328941fb37f2a9038620a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Jan 2004 03:22:59 +0000
Subject: undo debugging change

---
 FS/FS/cust_bill.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index a6b4e1e5e..a3e76620e 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1153,7 +1153,7 @@ sub print_pdf {
   open(PDF, "<$file.pdf")
     or die "can't open $file.pdf (probably error in LaTeX tempalte: $!\n";
 
-#  unlink("$file.dvi", "$file.log", "$file.aux", "$file.pdf", "$file.tex");
+  unlink("$file.dvi", "$file.log", "$file.aux", "$file.pdf", "$file.tex");
 
   my $pdf = '';
   while (<PDF>) {
-- 
cgit v1.2.1


From 0cb82fbbb68d51ea51cdc321c6322ab22508373c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Jan 2004 08:55:10 +0000
Subject: first try at prepaid income report

---
 httemplate/search/report_prepaid_income.cgi | 67 +++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 httemplate/search/report_prepaid_income.cgi

diff --git a/httemplate/search/report_prepaid_income.cgi b/httemplate/search/report_prepaid_income.cgi
new file mode 100644
index 000000000..f1d284b1a
--- /dev/null
+++ b/httemplate/search/report_prepaid_income.cgi
@@ -0,0 +1,67 @@
+<!-- mason kludge -->
+<%
+
+  #doesn't yet deal with daily/weekly packages
+
+  #needs to be re-written in sql for efficiency
+
+  my $now = time;
+
+  my %prepaid;
+
+  my @cust_bill_pkg =
+    grep { $_->cust_pkg && $_->cust_pkg->part_pkg->freq !~ /^([01]|\d+[dw])$/ }
+      qsearch( 'cust_bill_pkg', {
+                                  'recur' => { op=>'!=', value=>0 },
+                                  'edate' => { op=>'>', value=>$now },
+                                }, );
+
+  foreach my $cust_bill_pkg ( @cust_bill_pkg ) {
+
+    #conceptual false laziness w/texas tax exempt_amount stuff in
+    #FS::cust_main::bill
+
+    my $freq = $cust_bill_pkg->cust_pkg->part_pkg->freq;
+    my $per_month = sprintf("%.2f", $cust_bill_pkg->recur / $freq);
+
+    my($mon, $year) = (localtime($cust_bill_pkg->sdate) )[4,5];
+    $mon+=2; $year+=1900;
+
+    foreach my $which_month ( 2 .. $freq ) {
+      until ( $mon < 13 ) { $mon -= 12; $year++; }
+      $prepaid{"$year-$mon"} += $per_month;
+    }
+
+  }
+
+%>
+
+<%= header('Prepaid Income Report', menubar( 'Main Menu'=>$p, ) ) %>
+<%= table() %>
+<%
+
+  my $total = 0;
+
+  my ($now_mon, $now_year) = (localtime($now))[4,5];
+  $now_mon+=2; $now_year+=1900;
+  until ( $now_mon < 13 ) { $now_mon -= 12; $now_year++; }
+
+  my $subseq = 0;
+  for my $year ( $now_year .. 2037 ) {
+    for my $mon ( ( $subseq++ ? 1 : $now_mon ) .. 12 ) {
+      if ( $prepaid{"$year-$mon"} ) {
+        $total += $prepaid{"$year-$mon"};
+        %> <TR><TD><%= "$year-$mon" %></TD>
+               <TD><%= sprintf("%.2f", $prepaid{"$year-$mon"} ) %></TD>
+           </TR>
+        <%
+      }
+    }
+
+  }
+
+%>
+<TR><TH>Total</TH><TD><%= sprintf("%.2f", $total) %></TD></TR>
+</TABLE>
+</BODY>
+</HTML>
-- 
cgit v1.2.1


From 55de0fac57f2a71bd05aa5ce583601fb2edeacdf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Jan 2004 08:58:35 +0000
Subject: oops

---
 httemplate/search/report_prepaid_income.cgi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/httemplate/search/report_prepaid_income.cgi b/httemplate/search/report_prepaid_income.cgi
index f1d284b1a..bcad93325 100644
--- a/httemplate/search/report_prepaid_income.cgi
+++ b/httemplate/search/report_prepaid_income.cgi
@@ -30,6 +30,7 @@
     foreach my $which_month ( 2 .. $freq ) {
       until ( $mon < 13 ) { $mon -= 12; $year++; }
       $prepaid{"$year-$mon"} += $per_month;
+      $mon++;
     }
 
   }
-- 
cgit v1.2.1


From c9544281f45155587a54aa435500887d74e5c9f5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Jan 2004 09:04:00 +0000
Subject: tidy up look

---
 httemplate/search/report_prepaid_income.cgi | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/httemplate/search/report_prepaid_income.cgi b/httemplate/search/report_prepaid_income.cgi
index bcad93325..9f045738a 100644
--- a/httemplate/search/report_prepaid_income.cgi
+++ b/httemplate/search/report_prepaid_income.cgi
@@ -35,6 +35,8 @@
 
   }
 
+  my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
+
 %>
 
 <%= header('Prepaid Income Report', menubar( 'Main Menu'=>$p, ) ) %>
@@ -52,8 +54,10 @@
     for my $mon ( ( $subseq++ ? 1 : $now_mon ) .. 12 ) {
       if ( $prepaid{"$year-$mon"} ) {
         $total += $prepaid{"$year-$mon"};
-        %> <TR><TD><%= "$year-$mon" %></TD>
-               <TD><%= sprintf("%.2f", $prepaid{"$year-$mon"} ) %></TD>
+        %> <TR><TD><%= $mon[$mon-1]. ' '. $year %></TD>
+               <TD ALIGN="right">
+                 <%= sprintf("%.2f", $prepaid{"$year-$mon"} ) %>
+               </TD>
            </TR>
         <%
       }
@@ -62,7 +66,7 @@
   }
 
 %>
-<TR><TH>Total</TH><TD><%= sprintf("%.2f", $total) %></TD></TR>
+<TR><TH>Total</TH><TD ALIGN="right"><%= sprintf("%.2f", $total) %></TD></TR>
 </TABLE>
 </BODY>
 </HTML>
-- 
cgit v1.2.1


From ff15db0f2fa18e67498d0097797b667a81b51f71 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Jan 2004 11:20:43 +0000
Subject: add prepaid income to main menu and allow arbitrary dates

---
 httemplate/index.html                        |  1 +
 httemplate/search/report_prepaid_income.cgi  |  9 ++++++---
 httemplate/search/report_prepaid_income.html | 17 +++++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 httemplate/search/report_prepaid_income.html

diff --git a/httemplate/index.html b/httemplate/index.html
index 548c25ceb..2d4f6b51c 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -69,6 +69,7 @@
             </UL>
       <A HREF="search/report_cust_pay.html">Payment report (by type and/or date range)</A>
       <BR><BR><A HREF="search/report_receivables.cgi">Accounts Receivable Aging Summary</A>
+      <BR><BR><A HREF="search/report_prepaid_income.html">Prepaid Income (Unearned Revenue) Report</A>
       <BR><BR>(old) Financial reports (being rewritten)
             <UL>
               <LI> <A HREF="search/report_tax.html">tax reports</A>
diff --git a/httemplate/search/report_prepaid_income.cgi b/httemplate/search/report_prepaid_income.cgi
index 9f045738a..eb8bbb55e 100644
--- a/httemplate/search/report_prepaid_income.cgi
+++ b/httemplate/search/report_prepaid_income.cgi
@@ -5,7 +5,9 @@
 
   #needs to be re-written in sql for efficiency
 
-  my $now = time;
+  my $now = $cgi->param('date') && str2time($cgi->param('date')) || time;
+  $now =~ /^(\d+)$/ or die "unparsable date?";
+  $now = $1;
 
   my %prepaid;
 
@@ -39,7 +41,8 @@
 
 %>
 
-<%= header('Prepaid Income Report', menubar( 'Main Menu'=>$p, ) ) %>
+<%= header( 'Prepaid Income (Unearned Revenue) Report',
+            menubar( 'Main Menu'=>$p, ) )               %>
 <%= table() %>
 <%
 
@@ -54,7 +57,7 @@
     for my $mon ( ( $subseq++ ? 1 : $now_mon ) .. 12 ) {
       if ( $prepaid{"$year-$mon"} ) {
         $total += $prepaid{"$year-$mon"};
-        %> <TR><TD><%= $mon[$mon-1]. ' '. $year %></TD>
+        %> <TR><TD ALIGN="right"><%= $mon[$mon-1]. ' '. $year %></TD>
                <TD ALIGN="right">
                  <%= sprintf("%.2f", $prepaid{"$year-$mon"} ) %>
                </TD>
diff --git a/httemplate/search/report_prepaid_income.html b/httemplate/search/report_prepaid_income.html
new file mode 100644
index 000000000..b85a481be
--- /dev/null
+++ b/httemplate/search/report_prepaid_income.html
@@ -0,0 +1,17 @@
+<HTML>
+  <HEAD>
+    <TITLE>Prepaid Income (Unearned Revenue) Report</TITLE>
+    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
+  </HEAD>
+  <BODY BGCOLOR="#e8e8e8">
+    <H1>Prepaid Income (Unearned Revenue) Report</H1>
+    <FORM ACTION="report_prepaid_income.cgi" METHOD="post">
+    Prepaid income (unearned revenue) as of <INPUT TYPE="text" NAME="date" VALUE="now">
+    <INPUT TYPE="submit" VALUE="Generate report">
+  </BODY>
+</HTML>
+    <TABLE>
+
-- 
cgit v1.2.1


From bb6dfc07af5c7fee85f2c76ee22a833b41e13c36 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 28 Jan 2004 01:39:07 +0000
Subject: add service definition browse by number of active services

---
 httemplate/browse/part_svc.cgi   | 22 ++++++++++++++++++++++
 httemplate/index.html            |  1 +
 httemplate/search/svc_acct.cgi   |  8 +++++++-
 httemplate/search/svc_domain.cgi |  7 +++++++
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 3fece2925..ef0de13cc 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -13,6 +13,20 @@ my @part_svc =
     qsearch('part_svc', \%search );
 my $total = scalar(@part_svc);
 
+my %num_active_cust_svc = ();
+if ( $cgi->param('active') ) {
+  my $active_sth = dbh->prepare(
+    'SELECT COUNT(*) FROM cust_svc WHERE svcpart = ?'
+  ) or die dbh->errstr;
+  foreach my $part_svc ( @part_svc ) {
+    $active_sth->execute($part_svc->svcpart) or die $active_sth->errstr;
+    $num_active_cust_svc{$part_svc->svcpart} =
+      $active_sth->fetchrow_arrayref->[0];
+  }
+  @part_svc = sort { $num_active_cust_svc{$b->svcpart} <=>
+                     $num_active_cust_svc{$a->svcpart}     } @part_svc;
+}
+
 %>
 <%= header('Service Definition Listing', menubar( 'Main Menu' => $p) ) %>
 
@@ -45,6 +59,9 @@ function part_export_areyousure(href) {
   <TR>
     <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Service</TH>
     <TH>Table</TH>
+<% if ( $cgi->param('active') ) { %>
+    <TH><FONT SIZE=-1>Customer<BR>Services</FONT></TH>
+<% } %>
     <TH>Export</TH>
     <TH>Field</TH>
     <TH COLSPAN=2>Modifier</TH>
@@ -75,6 +92,11 @@ function part_export_areyousure(href) {
       <%= $hashref->{svc} %></A></TD>
     <TD ROWSPAN=<%= $rowspan %>>
       <%= $hashref->{svcdb} %></TD>
+<% if ( $cgi->param('active') ) { %>
+    <TD ROWSPAN=<%= $rowspan %>>
+      <FONT COLOR="#00CC00"><B><%= $num_active_cust_svc{$hashref->{svcpart}} %></B></FONT>&nbsp;<A HREF="<%=$p%>search/<%= $hashref->{svcdb} %>.cgi?svcpart=<%= $hashref->{svcpart} %>">active</A>
+    </TD>
+<% } %>
     <TD ROWSPAN=<%= $rowspan %>><%= itable() %>
 <%
 #  my @part_export =
diff --git a/httemplate/index.html b/httemplate/index.html
index 2d4f6b51c..7d90efc71 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -127,6 +127,7 @@
         <LI><A HREF="search/cust_pkg_report.cgi">packages (by next bill date range)</A>
       </UL>
       <A HREF="browse/part_pkg.cgi?active=1">Package definitions (by number of active packages)</A><BR><BR>
+      <A HREF="browse/part_svc.cgi?active=1">Service definitions (by number of active services)</A><BR><BR>
     Customers
       <UL>
         <LI><A HREF="search/cust_main-otaker.cgi">Search customers by order-taker</A>
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index e20649cd9..671575b55 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -46,13 +46,19 @@ if ( $query eq 'svcnum' ) {
   $orderby = "ORDER BY ${tblname}username";
 } elsif ( $query eq 'uid' ) {
   $sortby=\*uid_sort;
-  $orderby = ( $unlinked ? 'AND' : 'WHERE' ).
+  $orderby = ( $unlinked ? ' AND' : ' WHERE' ).
              " ${tblname}uid IS NOT NULL ORDER BY ${tblname}uid";
 } elsif ( $cgi->param('popnum') =~ /^(\d+)$/ ) {
   $unlinked .= ( $unlinked ? 'AND' : 'WHERE' ).
                " popnum = $1";
   $sortby=\*username_sort;
   $orderby = "ORDER BY ${tblname}username";
+} elsif ( $cgi->param('svcpart') =~ /^(\d+)$/ ) {
+  $unlinked .= ( $unlinked ? ' AND' : ' WHERE' ).
+               " $1 = ( SELECT svcpart FROM cust_svc ".
+               "        WHERE cust_svc.svcnum = svc_acct.svcnum ) ";
+  $sortby=\*uid_sort;
+  #$sortby=\*svcnum_sort;
 } else {
   $sortby=\*uid_sort;
   @svc_acct = @{&usernamesearch};
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index c0acf1143..948b1d9ae 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -23,6 +23,13 @@ if ( $query eq 'svcnum' ) {
       'svcnum' => $_->svcnum,
       'pkgnum' => '',
     }), qsearch('svc_domain',{});
+} elsif ( $cgi->param('svcpart') =~ /^(\d+)$/ ) {
+  @svc_domain =
+    qsearch( 'svc_domain', {}, '',
+               " WHERE $1 = ( SELECT svcpart FROM cust_svc ".
+               "              WHERE cust_svc.svcnum = svc_domain.svcnum ) "
+    );
+  $sortby=\*svcnum_sort;
 } else {
   $cgi->param('domain') =~ /^([\w\-\.]+)$/; 
   my($domain)=$1;
-- 
cgit v1.2.1


From c4ff840a85e33c86ecad9223d074d57cba50e0f9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 28 Jan 2004 01:45:31 +0000
Subject: fix link from service definition browse to services

---
 httemplate/search/svc_acct.cgi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 671575b55..1e4a03d84 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -69,6 +69,7 @@ if (    $query eq 'svcnum'
      || $query eq 'username'
      || $query eq 'uid'
      || $cgi->param('popnum') =~ /^(\d+)$/
+     || $cgi->param('svcpart') =~ /^(\d+)$/
    ) {
 
   my $statement = "SELECT COUNT(*) FROM svc_acct $unlinked";
-- 
cgit v1.2.1


From 95558fc7bcc98138db7f2d54cd5e6724bac3beea Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Jan 2004 01:10:28 +0000
Subject: add support for running selfservice server against multiple machines

---
 FS/FS/ClientAPI/MyAccount.pm       |  5 ++++-
 FS/bin/freeside-selfservice-server |  5 +++--
 Makefile                           |  5 +++--
 init.d/freeside-init               | 26 +++++++++++++++++++-------
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 290022148..445f0ece8 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -28,6 +28,7 @@ FS::ClientAPI->register_handlers(
   'MyAccount/list_pkgs'        => \&list_pkgs,
   'MyAccount/order_pkg'        => \&order_pkg,
   'MyAccount/cancel_pkg'       => \&cancel_pkg,
+  'MyAccount/charge'           => \&charge,
 );
 
 use vars qw( @cust_main_editable_fields );
@@ -39,7 +40,9 @@ use vars qw( @cust_main_editable_fields );
 );
 
 #store in db?
-my $cache = new Cache::SharedMemoryCache();
+my $cache = new Cache::SharedMemoryCache( {
+   'namespace' => 'FS::ClientAPI::MyAccount',
+} );
 
 #false laziness w/FS::ClientAPI::passwd::passwd (needs to handle encrypted pw)
 sub login {
diff --git a/FS/bin/freeside-selfservice-server b/FS/bin/freeside-selfservice-server
index f9571fa1e..371a646b4 100644
--- a/FS/bin/freeside-selfservice-server
+++ b/FS/bin/freeside-selfservice-server
@@ -34,8 +34,9 @@ $kids = 0;
 my $user = shift or die &usage;
 my $machine = shift or die &usage;
 my $tag = scalar(@ARGV) ? shift : '';
-my $pid_file = "/var/run/freeside-selfservice-server.$user.pid";
-#my $pid_file = "/var/run/freeside-selfservice-server.$user.pid"; $FS::UID::datasrc not posible, but should include machine name at least, hmm
+
+# $FS::UID::datasrc not posible
+my $pid_file = "/var/run/freeside-selfservice-server.$user.$machine.pid";
 
 my $lock_file = "/usr/local/etc/freeside/selfservice.$machine.writelock";
 open(LOCKFILE,">$lock_file") or die "can't open $lock_file: $!";
diff --git a/Makefile b/Makefile
index 2c2b7a5be..0d99e1361 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,8 @@ QUEUED_USER=fs_queue
 FREESIDE_PATH = `pwd`
 
 SELFSERVICE_USER = fs_selfservice
-SELFSERVICE_MACHINE = localhost
+SELFSERVICE_MACHINES = localhost
+# SELFSERVICE_MACHINES = "web1.example.com web2.example.com"
 
 #---
 
@@ -137,7 +138,7 @@ install-init:
 	  s/%%%QUEUED_USER%%%/${QUEUED_USER}/g;\
 	  s'%%%FREESIDE_PATH%%%'${FREESIDE_PATH}'g;\
 	  s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
-	  s/%%%SELFSERVICE_MACHINE%%%/${SELFSERVICE_MACHINE}/g;\
+	  s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\
 	" ${INIT_FILE}
 
 install: install-perl-modules install-docs install-init
diff --git a/init.d/freeside-init b/init.d/freeside-init
index b9c95ae53..1ca7dff0e 100644
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -8,7 +8,7 @@ QUEUED_USER=%%%QUEUED_USER%%%
 FREESIDE_PATH="%%%FREESIDE_PATH%%%"
 
 SELFSERVICE_USER=%%%SELFSERVICE_USER%%%
-SELFSERVICE_MACHINE=%%%SELFSERVICE_MACHINE%%%
+SELFSERVICE_MACHINES="%%%SELFSERVICE_MACHINES%%%"
 
 case "$1" in
   start)
@@ -17,9 +17,11 @@ case "$1" in
         freeside-queued $QUEUED_USER
         echo "done."
 
-        echo -n "Starting freeside-selfservice-server: "
-        freeside-selfservice-server $SELFSERVICE_USER $SELFSERVICE_MACHINE
-        echo "done."
+        for MACHINE in $SELFSERVICE_MACHINES; do
+          echo -n "Starting freeside-selfservice-server to $MACHINE: "
+          freeside-selfservice-server $SELFSERVICE_USER $MACHINE
+          echo "done."
+        done
 
         ;;
   stop)
@@ -28,9 +30,19 @@ case "$1" in
         kill `cat /var/run/freeside-queued.pid`
         echo "done."
 
-        echo -n "Stopping freeside-selfservice-server: "
-        kill `cat /var/run/freeside-selfservice-server.$SELFSERVICE_USER.pid`
-        echo "done."
+        if [ -e /var/run/freeside-selfservice-server.$SELFSERVICE_USER.pid ]
+        then
+          echo -n "Stopping (old) freeside-selfservice-server: "
+          kill `cat /var/run/freeside-selfservice-server.$SELFSERVICE_USER.pid`
+          rm /var/run/freeside-selfservice-server.$SELFSERVICE_USER.pid
+        fi
+
+        for MACHINE in $SELFSERVICE_MACHINES; do
+          echo -n "Stopping freeside-selfservice-server to $MACHINE: "
+          kill `cat /var/run/freeside-selfservice-server.$SELFSERVICE_USER.$MACHINE.pid`
+          echo "done."
+        done
+
         ;;
 
   restart)
-- 
cgit v1.2.1


From 22744fc3e34aaa5436723c419c91e29fb9ffc304 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Jan 2004 01:27:39 +0000
Subject: multiple self-service machines aren't enclosed in quotes

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0d99e1361..1ac431cca 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ FREESIDE_PATH = `pwd`
 
 SELFSERVICE_USER = fs_selfservice
 SELFSERVICE_MACHINES = localhost
-# SELFSERVICE_MACHINES = "web1.example.com web2.example.com"
+# SELFSERVICE_MACHINES = web1.example.com web2.example.com
 
 #---
 
-- 
cgit v1.2.1


From 77d3558bd525d7372d2c94213ba8848ed36631aa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Jan 2004 03:05:59 +0000
Subject: don't prepend *SUSPENDED* to passwords to suspend an account

---
 FS/FS/svc_acct.pm | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 3ddd70a93..9d8566d77 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -619,16 +619,6 @@ Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
 sub suspend {
   my $self = shift;
   return "can't suspend system account" if $self->_check_system;
-  my %hash = $self->hash;
-  unless ( $hash{_password} =~ /^\*SUSPENDED\* /
-           || $hash{_password} eq '*'
-         ) {
-    $hash{_password} = '*SUSPENDED* '.$hash{_password};
-    my $new = new FS::svc_acct ( \%hash );
-    my $error = $new->replace($self);
-    return $error if $error;
-  }
-
   $self->SUPER::suspend;
 }
 
-- 
cgit v1.2.1


From 7bd42d6a73d2f21cffb9f0e3071e2527237c9e25 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Jan 2004 03:58:23 +0000
Subject: add default freebsd and linux suspension/unsuspension commands, work
 around FreeBSD pw(1) lack of locking, and don't prepend "*SUSPENDED* " to
 suspend an account anymore

---
 FS/FS/part_export.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 1b46841ec..a27213773 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -576,13 +576,13 @@ tie my %shellcommands_options, 'Tie::IxHash',
                         type =>'checkbox',
                       },
   'suspend' => { label=>'Suspension command',
-                 default=>'',
+                 default=>'usermod -L $username',
                },
   'suspend_stdin' => { label=>'Suspension command STDIN',
                        default=>'',
                      },
   'unsuspend' => { label=>'Unsuspension command',
-                   default=>'',
+                   default=>'usermod -U $username',
                  },
   'unsuspend_stdin' => { label=>'Unsuspension command STDIN',
                          default=>'',
@@ -927,7 +927,7 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
       'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
       'options' => \%shellcommands_options,
       'nodomain' => 'Y',
-      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux/NetBSD/OpenBSD" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = "";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "pw userdel $username -r"; this.form.userdel_stdin.value=""; this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0"; this.form.usermod_stdin.value = "$new__password\n";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $new_uid.$new_gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value="";\'></UL>The following variables are available for interpolation (prefixed with new_ or old_ for replace operations): <UL><LI><code>$username</code><LI><code>$_password</code><LI><code>$quoted_password</code> - unencrypted password quoted for the shell<LI><code>$crypt_password</code> - encrypted password<LI><code>$uid</code><LI><code>$gid</code><LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)<LI><code>$dir</code> - home directory<LI><code>$shell</code><LI><code>$quota</code><LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.</UL>',
+      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = ""; this.form.suspend.value = "usermod -L $username"; this.form.suspend_stdin.value=""; this.form.unsuspend.value = "usermod -U $username"; this.form.unsuspend_stdin.value="";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "lockf /etc/passwd.lock pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "lockf /etc/passwd.lock pw userdel $username -r"; this.form.userdel_stdin.value=""; this.form.usermod.value = "lockf /etc/passwd.lock pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0"; this.form.usermod_stdin.value = "$new__password\n"; this.form.suspend.value = "lockf /etc/passwd.lock pw lock $username"; this.form.suspend_stdin.value=""; this.form.unsuspend.value = "lockf /etc/passwd.lock pw unlock $username"; this.form.unsuspend_stdin.value="";\'> Note: On FreeBSD, due to deficient locking in pw(1), you must disable the chpass(1), chsh(1), chfn(1), passwd(1), and vipw(1) commands, or replace them with wrappers that prepend "lockf /etc/passwd.lock".<LI><INPUT TYPE="button" VALUE="NetBSD/OpenBSD" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = ""; this.form.suspend.value = ""; this.form.suspend_stdin.value=""; this.form.unsuspend.value = ""; this.form.unsuspend_stdin.value="";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $new_uid.$new_gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value=""; this.form.suspend.value = ""; this.form.suspend_stdin.value=""; this.form.unsuspend.value = ""; this.form.unsuspend_stdin.value="";\'></UL>The following variables are available for interpolation (prefixed with new_ or old_ for replace operations): <UL><LI><code>$username</code><LI><code>$_password</code><LI><code>$quoted_password</code> - unencrypted password quoted for the shell<LI><code>$crypt_password</code> - encrypted password<LI><code>$uid</code><LI><code>$gid</code><LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)<LI><code>$dir</code> - home directory<LI><code>$shell</code><LI><code>$quota</code><LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.</UL>',
     },
 
     'shellcommands_withdomain' => {
-- 
cgit v1.2.1


From 68ab51f16999645557a071bc4e54e7a359bcb0e7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Jan 2004 20:40:41 +0000
Subject: not appropriate

---
 httemplate/docs/upgrade-1.4.2.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/upgrade-1.4.2.html b/httemplate/docs/upgrade-1.4.2.html
index 1b58565e9..022916768 100644
--- a/httemplate/docs/upgrade-1.4.2.html
+++ b/httemplate/docs/upgrade-1.4.2.html
@@ -12,7 +12,7 @@
   <li>Run <code>make aspdocs</code> or <code>make masondocs</code>.
   <li>Copy <code>aspdocs/</code> or <code>masondocs/</code> to your web server's document space.
   <li>Run <code>make install-perl-modules</code>.
-  <li>The signup server and password server are deprecated in 1.4.2.  Their functionality has been incorperated into the self-service server.  Edit or reinstall your init script appropriately, and set the "signup_server-default_agentnum" and "signup_server-default_refnum" configuration options appropriately.  The FS::SignupClient interface is still available as a compatibility wrapper.  You should be able to continue to use your current signup.cgi.
+  <li>The signup server and password server are deprecated in 1.4.2.  Their functionality has been incorperated into the self-service server.  Edit or reinstall your init script, and set the "signup_server-default_agentnum" and "signup_server-default_refnum" configuration options.  The FS::SignupClient interface is still available as a compatibility wrapper, so you should be able to continue to use your current signup.cgi.
   <li>Optional: To use typeset invoices, install tetex and ghostscript, and copy conf/invoice_latex, conf/invoice_latexnotes, and conf/invoice_latexfooter to /usr/local/etc/freeside/conf.<datasrc>/
   <li>Restart Apache and freeside-queued.
 </body>
-- 
cgit v1.2.1


From 729eaf2e7c8e110432a8f4953cba1e4b78e45db5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 31 Jan 2004 06:20:32 +0000
Subject: add ut_snumber, fix replacement of records with empty values in
 non-primary-keyed tables

---
 FS/FS/Record.pm | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 2517d1841..b950e306b 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -838,7 +838,7 @@ sub replace {
         $old->getfield($_) eq ''
           #? "( $_ IS NULL OR $_ = \"\" )"
           ? ( driver_name eq 'Pg'
-                ? "$_ IS NULL"
+                ? "( $_ IS NULL OR $_ = '' )"
                 : "( $_ IS NULL OR $_ = \"\" )"
             )
           : "$_ = ". _quote($old->getfield($_),$old->table,$_)
@@ -1053,6 +1053,21 @@ sub ut_float {
   '';
 }
 
+=item ut_snumber COLUMN
+
+Check/untaint signed numeric data (whole numbers).  May not be null.  If there
+is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub ut_snumber {
+  my($self, $field) = @_;
+  $self->getfield($field) =~ /^(-?)\s*(\d+)$/
+    or return "Illegal or empty (numeric) $field: ". $self->getfield($field);
+  $self->setfield($field, "$1$2");
+  '';
+}
+
 =item ut_number COLUMN
 
 Check/untaint simple numeric data (whole numbers).  May not be null.  If there
-- 
cgit v1.2.1


From c7e637f35948396ca2bf760160f2a1a3081e0484 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 31 Jan 2004 06:33:40 +0000
Subject: add pkg_svc.primary_svc flag to enable an explicit first package flag

---
 FS/FS/part_pkg.pm                    | 20 ++++++++++++--------
 FS/FS/pkg_svc.pm                     | 11 +++++++----
 FS/bin/freeside-setup                |  1 +
 htetc/global.asa                     |  2 +-
 htetc/handler.pl                     |  2 +-
 httemplate/browse/part_pkg.cgi       | 12 ++++++++++--
 httemplate/docs/schema.html          |  1 +
 httemplate/docs/upgrade-1.4.2.html   |  1 +
 httemplate/docs/upgrade10.html       |  2 ++
 httemplate/edit/part_pkg.cgi         | 30 ++++++++++++++++++++++--------
 httemplate/edit/process/part_pkg.cgi | 16 ++++++++++++----
 11 files changed, 70 insertions(+), 28 deletions(-)

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 695d48ceb..dcce66b38 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -2,7 +2,7 @@ package FS::part_pkg;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw( qsearch dbh );
+use FS::Record qw( qsearch dbh dbdef );
 use FS::pkg_svc;
 use FS::agent_type;
 use FS::type_pkgs;
@@ -267,20 +267,24 @@ sub pkg_svc {
 
 =item svcpart [ SVCDB ]
 
-Returns the svcpart of a single service definition (see L<FS::part_svc>)
+Returns the svcpart of the primary service definition (see L<FS::part_svc>)
 associated with this billing item definition (see L<FS::pkg_svc>).  Returns
-false if there not exactly one service definition with quantity 1, or if 
-SVCDB is specified and does not match the svcdb of the service definition, 
+false if there not a primary service definition or exactly one service
+definition with quantity 1, or if SVCDB is specified and does not match the
+svcdb of the service definition, 
 
 =cut
 
 sub svcpart {
   my $self = shift;
   my $svcdb = scalar(@_) ? shift : '';
-  my @pkg_svc = grep {
-    $_->quantity == 1
-    && ( $svcdb eq $_->part_svc->svcdb || !$svcdb )
-  } $self->pkg_svc;
+  my @svcdb_pkg_svc =
+    grep { ( $svcdb eq $_->part_svc->svcdb || !$svcdb ) } $self->pkg_svc;
+  my @pkg_svc = ();
+  @pkg_svc = grep { $_->primary_svc =~ /^Y/i } @svcdb_pkg_svc
+    if dbdef->table('pkg_svc')->column('primary_svc');
+  @pkg_svc = grep {$_->quantity == 1 } @svcdb_pkg_svc
+    unless @pkg_svc;
   return '' if scalar(@pkg_svc) != 1;
   $pkg_svc[0]->svcpart;
 }
diff --git a/FS/FS/pkg_svc.pm b/FS/FS/pkg_svc.pm
index 2ac1a558c..ea52176cb 100644
--- a/FS/FS/pkg_svc.pm
+++ b/FS/FS/pkg_svc.pm
@@ -46,6 +46,8 @@ FS::Record.  The following fields are currently supported:
 =item quantity - Quantity of this service definition that this billing item
 definition includes
 
+=item primary_svc - primary flag, empty or 'Y'
+
 =back
 
 =head1 METHODS
@@ -108,6 +110,11 @@ sub check {
   return "Unknown pkgpart!" unless $self->part_pkg;
   return "Unknown svcpart!" unless $self->part_svc;
 
+  if ( $self->dbdef_table->column('primary_svc') ) {
+    $error = $self->ut_enum('primary_svc', [ '', 'Y' ] );
+    return $error if $error;
+  }
+
   $self->SUPER::check;
 }
 
@@ -135,10 +142,6 @@ sub part_svc {
 
 =back
 
-=head1 VERSION
-
-$Id: pkg_svc.pm,v 1.4 2003-08-05 00:20:45 khoff Exp $
-
 =head1 BUGS
 
 =head1 SEE ALSO
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index b7a414ae2..72780e363 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -708,6 +708,7 @@ sub tables_hash_hack {
         'pkgpart',    'int',    '',   '',
         'svcpart',    'int',    '',   '',
         'quantity',   'int',    '',   '',
+        'primary_svc','char', 'NULL',  1,
       ],
       'primary_key' => '',
       'unique' => [ ['pkgpart', 'svcpart'] ],
diff --git a/htetc/global.asa b/htetc/global.asa
index f550560ee..e05701d56 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -15,7 +15,7 @@ use IO::Handle;
 use IO::File;
 use String::Approx qw(amatch);
 use Chart::LinesPoints;
-use HTML::Widgets::SelectLayers 0.02;
+use HTML::Widgets::SelectLayers 0.03;
 use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
 use FS::Record qw(qsearch qsearchs fields dbdef);
 use FS::Conf;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index c5f685f85..584d930b1 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -73,7 +73,7 @@ sub handler
       use IO::File;
       use String::Approx qw(amatch);
       use Chart::LinesPoints;
-      use HTML::Widgets::SelectLayers 0.02;
+      use HTML::Widgets::SelectLayers 0.03;
       use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
       use FS::Record qw(qsearch qsearchs fields dbdef);
       use FS::Conf;
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index efaa59e00..180f18263 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -78,8 +78,10 @@ print <<END;
         <TH><FONT SIZE=-1>Data</FONT></TH>
         <TH>Service</TH>
         <TH><FONT SIZE=-1>Quan.</FONT></TH>
-      </TR>
 END
+print '<TH><FONT SIZE=-1>Primary</FONT></TH>'
+   if dbdef->table('pkg_svc')->column('primary_svc');
+print '</TR>';
 
 foreach my $part_pkg ( sort $sortby @part_pkg ) {
   my($hashref)=$part_pkg->hashref;
@@ -143,7 +145,13 @@ END
     my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart });
     print $n,qq!<TD><A HREF="${p}edit/part_svc.cgi?$svcpart">!,
           $part_svc->getfield('svc'),"</A></TD><TD>",
-          $pkg_svc->getfield('quantity'),"</TD></TR>\n";
+          $pkg_svc->getfield('quantity'),"</TD>";
+    if ( dbdef->table('pkg_svc')->column('primary_svc') ) {
+      print '<TD>';
+      print 'PRIMARY' if $pkg_svc->primary_svc =~ /^Y/i;
+      print '</TD>';
+    }
+    print "</TR>\n";
     $n="<TR>";
   }
 
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 06be8960d..40b211cf9 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -283,6 +283,7 @@
         <li>pkgpart - <a href="#part_pkg">Package definition</a>
         <li>svcpart - <a href="#part_svc">Service definition</a>
         <li>quantity - quantity of this service that this package includes
+        <li>primary_svc - blank or Y: primary service
       </ul>
     <li><a name="export_svc" href="man/FS/export_svc.html">export_svc</a>
       <ul>
diff --git a/httemplate/docs/upgrade-1.4.2.html b/httemplate/docs/upgrade-1.4.2.html
index 022916768..ea6ebe92b 100644
--- a/httemplate/docs/upgrade-1.4.2.html
+++ b/httemplate/docs/upgrade-1.4.2.html
@@ -8,6 +8,7 @@
   <li>Back  up your data and current Freeside installation.
   <li>Install <a href="http://search.cpan.org/search?dist=Locale-SubCountry">Locale::SubCountry</a>
   <li>Install <a href="http://search.cpan.org/search?dist=IPC-ShareLite">IPC::ShareLite</a>
+  <li>Install <a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML::Widgets::SelectLayers</a> 0.03.
   <li>CGI.pm minimum version 2.47 is required.  You will probably need to install a current CGI.pm from CPAN if you are using Perl 5.005 or earlier.
   <li>Run <code>make aspdocs</code> or <code>make masondocs</code>.
   <li>Copy <code>aspdocs/</code> or <code>masondocs/</code> to your web server's document space.
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 9dc4f3dfa..e98407351 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -154,6 +154,8 @@ ALTER TABLE h_cust_main ADD paycvv varchar(4) NULL;
 ALTER TABLE part_referral ADD disabled char(1) NULL;
 ALTER TABLE h_part_referral ADD disabled char(1) NULL;
 CREATE INDEX part_referral1 ON part_referral ( disabled );
+ALTER TABLE pkg_svc ADD primary_svc char(1) NULL;
+ALTER TABLE h_pkg_svc ADD primary_svc char(1) NULL;
 
 dump database, edit:
 - cust_main: increase otaker from 8 to 32
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index f2f99b757..8416b3546 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -152,9 +152,11 @@ print ' CHECKED' if $hashref->{disabled} eq "Y";
 print '>';
 print '</TD></TR></TABLE>';
 
-my $thead =  "\n\n". ntable('#cccccc', 2). <<END;
-<TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH><TH BGCOLOR="#dcdcdc">Service</TH></TR>
-END
+my $thead =  "\n\n". ntable('#cccccc', 2).
+             '<TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH>';
+$thead .=  '<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Primary</FONT></TH>'
+  if dbdef->table('pkg_svc')->column('primary_svc');
+$thead .= '<TH BGCOLOR="#dcdcdc">Service</TH></TR>';
 
 #unless ( $cgi->param('clone') ) {
 #dunno why...
@@ -176,9 +178,10 @@ foreach my $part_svc ( @part_svc ) {
     'pkgpart'  => $pkgpart,
     'svcpart'  => $svcpart,
   } ) || new FS::pkg_svc ( {
-    'pkgpart'  => $pkgpart,
-    'svcpart'  => $svcpart,
-    'quantity' => 0,
+    'pkgpart'     => $pkgpart,
+    'svcpart'     => $svcpart,
+    'quantity'    => 0,
+    'primary_svc' => '',
   });
   #? #next unless $pkg_svc;
 
@@ -190,7 +193,13 @@ foreach my $part_svc ( @part_svc ) {
     print '<TR>'; # if $count == 0 ;
     print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=4 MAXLENGTH=3 VALUE="!,
           $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0,
-          qq!"></TD><TD><A HREF="part_svc.cgi?!,$part_svc->svcpart,
+          qq!"></TD>!;
+    if ( dbdef->table('pkg_svc')->column('primary_svc') ) {
+      print qq!<TD><INPUT TYPE="radio" NAME="pkg_svc_primary" VALUE="$svcpart"!;
+      print ' CHECKED' if $pkg_svc->primary_svc =~ /^Y/i;
+      print '></TD>';
+    }
+    print qq!<TD><A HREF="part_svc.cgi?!,$part_svc->svcpart,
           qq!">!, $part_svc->getfield('svc'), "</A></TD></TR>";
 #    print "</TABLE></TD><TD>$thead" if ++$count == int(scalar(@part_svc) / 2);
     $count+=1;
@@ -518,6 +527,10 @@ if ( $conf->exists('enable_taxclasses') ) {
   push @fixups, 'taxclass'; #hidden
 }
 
+my @form_radio = ();
+if ( dbdef->table('pkg_svc')->column('primary_svc') ) {
+  push @form_radio, 'pkg_svc_primary';
+}
 
 my $widget = new HTML::Widgets::SelectLayers(
   'selected_layer' => $part_pkg->plan,
@@ -526,7 +539,8 @@ my $widget = new HTML::Widgets::SelectLayers(
   'form_action'    => 'process/part_pkg.cgi',
   'form_text'      => [ qw(pkg comment freq clone pkgnum pkgpart), @fixups ],
   'form_checkbox'  => [ qw(setuptax recurtax disabled) ],
-  'form_select'    => [ @form_select ],
+  'form_radio'     => \@form_radio,
+  'form_select'    => \@form_select,
   'fixup_callback' => sub {
                         #my $ = @_;
                         my $html = '';
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index d489426f9..7eada7bc8 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -62,16 +62,24 @@ if ( $error ) {
 
 foreach my $part_svc (qsearch('part_svc',{})) {
   my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
+  my $primary_svc =
+    $cgi->param('pkg_svc_primary') == $part_svc->svcpart ? 'Y' : '';
   my $old_pkg_svc = qsearchs('pkg_svc', {
     'pkgpart' => $pkgpart,
     'svcpart' => $part_svc->svcpart,
   } );
   my $old_quantity = $old_pkg_svc ? $old_pkg_svc->quantity : 0;
-  next unless $old_quantity != $quantity; #!here
+  my $old_primary_svc =
+    ( $old_pkg_svc && $old_pkg_svc->dbdef_table->column('primary_svc') )
+      ? $old_pkg_svc->primary_svc
+      : '';
+  next unless $old_quantity != $quantity || $old_primary_svc ne $primary_svc;
+
   my $new_pkg_svc = new FS::pkg_svc( {
-    'pkgpart'  => $pkgpart,
-    'svcpart'  => $part_svc->svcpart,
-    'quantity' => $quantity, 
+    'pkgpart'     => $pkgpart,
+    'svcpart'     => $part_svc->svcpart,
+    'quantity'    => $quantity, 
+    'primary_svc' => $primary_svc,
   } );
   if ( $old_pkg_svc ) {
     my $myerror = $new_pkg_svc->replace($old_pkg_svc);
-- 
cgit v1.2.1


From b8f1178763630f924dc3bac6ff9d4f6f81c343e7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 1 Feb 2004 09:23:06 +0000
Subject: s/cleanwhisker/pouncequick/

---
 install/debian/3.0/INSTALL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/debian/3.0/INSTALL b/install/debian/3.0/INSTALL
index ef28a91fc..ff328daf0 100644
--- a/install/debian/3.0/INSTALL
+++ b/install/debian/3.0/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-echo "deb http://cleanwhisker.420.am/~ivan/freeside-woody/ ./" >>/etc/apt/sources.list
+echo "deb http://pouncequick.420.am/~ivan/freeside-woody/ ./" >>/etc/apt/sources.list
 
 apt-get update
 apt-get install screen zsh libapache-mod-ssl libapache-mod-perl rsync \
-- 
cgit v1.2.1


From bcfb7ea59538fb255ed672e9597164812cc8a996 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 1 Feb 2004 09:29:00 +0000
Subject: use install to make all components of FREESIDE_CONF dir

---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1ac431cca..a37c7e4c9 100644
--- a/Makefile
+++ b/Makefile
@@ -152,8 +152,7 @@ create-database:
 
 create-config: install-perl-modules
 	[ -e ${FREESIDE_CONF} ] && mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S` || true
-	mkdir ${FREESIDE_CONF}
-	chown freeside ${FREESIDE_CONF}
+	install -d -o freeside ${FREESIDE_CONF}
 
 	touch ${FREESIDE_CONF}/secrets
 	chown freeside ${FREESIDE_CONF}/secrets
-- 
cgit v1.2.1


From 7728ee24e3204ac418470a175135e608900effd9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 1 Feb 2004 09:43:29 +0000
Subject: add libcache-cache-perl

---
 install/debian/3.0/INSTALL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/debian/3.0/INSTALL b/install/debian/3.0/INSTALL
index ff328daf0..96991e81d 100644
--- a/install/debian/3.0/INSTALL
+++ b/install/debian/3.0/INSTALL
@@ -14,7 +14,7 @@ apt-get install screen zsh libapache-mod-ssl libapache-mod-perl rsync \
         libstring-shellquote-perl libnet-scp-perl libapache-asp-perl \
         libtie-ixhash-perl libtime-duration-perl \
         libhtml-widgets-selectlayers-perl libstorable-perl \
-        libapache-dbi-perl libdbd-mysql-perl
+        libapache-dbi-perl libcache-cache-perl libdbd-mysql-perl
 
 useradd freeside
 su postgres -c "createuser -P freeside"
-- 
cgit v1.2.1


From e7f710ddb61d308bf6b7d6f5a918924f24f9bf66 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 1 Feb 2004 21:00:22 +0000
Subject: rar

---
 install/redhat/9/INSTALL | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/install/redhat/9/INSTALL b/install/redhat/9/INSTALL
index 813f6947b..aff8406be 100644
--- a/install/redhat/9/INSTALL
+++ b/install/redhat/9/INSTALL
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 
-wget --passive-ftp ftp://apt-rpm.tuxfamily.org/apt/redhat/9/en/i386/RPMS.extra/apt-*i386.rpm
+wget --passive-ftp --continue ftp://apt-rpm.tuxfamily.org/apt/redhat/9/en/i386/RPMS.extra/apt-*i386.rpm
 rpm -i apt*i386.rpm
 cp sources.list /etc/apt/
 apt-get update; apt-get update
@@ -9,9 +9,12 @@ apt-get update; apt-get update
 
 apt-get install perl-Devel-Symdump perl-BSD-Resource
 
-wget --passive-ftp http://reb00t.com/linux/RPMS/redhat-9/apache/apache-1.3.28-0.n0i.src.rpm http://reb00t.com/linux/RPMS/redhat-9/mm/mm-1.2.1-0.n0i.i686.rpm http://reb00t.com/linux/RPMS/redhat-9/mm/mm-devel-1.2.1-0.n0i.i686.rpm
+wget --passive-ftp --continue http://reb00t.com/linux/RPMS/redhat-9/apache/apache-1.3.28-0.n0i.src.rpm http://reb00t.com/linux/RPMS/redhat-9/mm/mm-1.2.1-0.n0i.i686.rpm http://reb00t.com/linux/RPMS/redhat-9/mm/mm-devel-1.2.1-0.n0i.i686.rpm
 rpm -i mm-1.2.1-0.n0i.i686.rpm mm-devel-1.2.1-0.n0i.i686.rpm apache-1.3.28-0.n0i.src.rpm
 
+install -d /usr/src/redhat
+for a in BUILD RPMS SOURCES SPECS SRPMS; do mkdir /usr/src/redhat/$a; done
+
 cd /usr/src/redhat/SPECS  
 rpmbuild -ba apache.spec
 
-- 
cgit v1.2.1


From 3bb7b31c2d4e82f629979aa08a880dbf5a858bd8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 1 Feb 2004 21:05:15 +0000
Subject: rar rar

---
 install/redhat/9/INSTALL | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/install/redhat/9/INSTALL b/install/redhat/9/INSTALL
index aff8406be..145fa4078 100644
--- a/install/redhat/9/INSTALL
+++ b/install/redhat/9/INSTALL
@@ -7,13 +7,14 @@ cp sources.list /etc/apt/
 apt-get update; apt-get update
 #apt-get install apache mod_ssl mod_perl perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-Digest-MD5 perl-HTML-Parser perl-HTML-Tagset perl-MIME-Base64 perl-Storable perl-TimeDate perl-URI perl-libnet perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs #openssh
 
-apt-get install perl-Devel-Symdump perl-BSD-Resource
+apt-get install perl-Devel-Symdump perl-BSD-Resource rpm-build
 
 wget --passive-ftp --continue http://reb00t.com/linux/RPMS/redhat-9/apache/apache-1.3.28-0.n0i.src.rpm http://reb00t.com/linux/RPMS/redhat-9/mm/mm-1.2.1-0.n0i.i686.rpm http://reb00t.com/linux/RPMS/redhat-9/mm/mm-devel-1.2.1-0.n0i.i686.rpm
 rpm -i mm-1.2.1-0.n0i.i686.rpm mm-devel-1.2.1-0.n0i.i686.rpm apache-1.3.28-0.n0i.src.rpm
 
 install -d /usr/src/redhat
 for a in BUILD RPMS SOURCES SPECS SRPMS; do mkdir /usr/src/redhat/$a; done
+for a in athlon i386 i486 i586 i686 noarch; do mkdir /usr/src/redhat/RPMS/$a; done
 
 cd /usr/src/redhat/SPECS  
 rpmbuild -ba apache.spec
-- 
cgit v1.2.1


From 0b86c151ec4f4216741f2900dc530f2daf452305 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 1 Feb 2004 21:07:51 +0000
Subject: add addl dependancies, should work now?

---
 install/redhat/9/INSTALL | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/redhat/9/INSTALL b/install/redhat/9/INSTALL
index 145fa4078..00e990cba 100644
--- a/install/redhat/9/INSTALL
+++ b/install/redhat/9/INSTALL
@@ -7,14 +7,14 @@ cp sources.list /etc/apt/
 apt-get update; apt-get update
 #apt-get install apache mod_ssl mod_perl perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-Digest-MD5 perl-HTML-Parser perl-HTML-Tagset perl-MIME-Base64 perl-Storable perl-TimeDate perl-URI perl-libnet perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs #openssh
 
-apt-get install perl-Devel-Symdump perl-BSD-Resource rpm-build
+apt-get install perl-Devel-Symdump perl-BSD-Resource rpm-build gdbm-devel expat-devel openssl-devel krb5-devel
 
 wget --passive-ftp --continue http://reb00t.com/linux/RPMS/redhat-9/apache/apache-1.3.28-0.n0i.src.rpm http://reb00t.com/linux/RPMS/redhat-9/mm/mm-1.2.1-0.n0i.i686.rpm http://reb00t.com/linux/RPMS/redhat-9/mm/mm-devel-1.2.1-0.n0i.i686.rpm
 rpm -i mm-1.2.1-0.n0i.i686.rpm mm-devel-1.2.1-0.n0i.i686.rpm apache-1.3.28-0.n0i.src.rpm
 
 install -d /usr/src/redhat
-for a in BUILD RPMS SOURCES SPECS SRPMS; do mkdir /usr/src/redhat/$a; done
-for a in athlon i386 i486 i586 i686 noarch; do mkdir /usr/src/redhat/RPMS/$a; done
+for a in BUILD RPMS SOURCES SPECS SRPMS; do install -d /usr/src/redhat/$a; done
+for a in athlon i386 i486 i586 i686 noarch; do install -d /usr/src/redhat/RPMS/$a; done
 
 cd /usr/src/redhat/SPECS  
 rpmbuild -ba apache.spec
-- 
cgit v1.2.1


From 10d4e1fde9cb3fb0a80e5207a74eda1fc5f93df3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 2 Feb 2004 00:23:04 +0000
Subject: add 1.5 dependancies

---
 install/redhat/9/INSTALL | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/install/redhat/9/INSTALL b/install/redhat/9/INSTALL
index 00e990cba..f8280dac5 100644
--- a/install/redhat/9/INSTALL
+++ b/install/redhat/9/INSTALL
@@ -7,7 +7,7 @@ cp sources.list /etc/apt/
 apt-get update; apt-get update
 #apt-get install apache mod_ssl mod_perl perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-Digest-MD5 perl-HTML-Parser perl-HTML-Tagset perl-MIME-Base64 perl-Storable perl-TimeDate perl-URI perl-libnet perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs #openssh
 
-apt-get install perl-Devel-Symdump perl-BSD-Resource rpm-build gdbm-devel expat-devel openssl-devel krb5-devel
+apt-get install perl-Devel-Symdump perl-BSD-Resource rpm-build gdbm-devel expat-devel openssl-devel krb5-devel db4-devel
 
 wget --passive-ftp --continue http://reb00t.com/linux/RPMS/redhat-9/apache/apache-1.3.28-0.n0i.src.rpm http://reb00t.com/linux/RPMS/redhat-9/mm/mm-1.2.1-0.n0i.i686.rpm http://reb00t.com/linux/RPMS/redhat-9/mm/mm-devel-1.2.1-0.n0i.i686.rpm
 rpm -i mm-1.2.1-0.n0i.i686.rpm mm-devel-1.2.1-0.n0i.i686.rpm apache-1.3.28-0.n0i.src.rpm
@@ -22,17 +22,27 @@ rpmbuild -ba apache.spec
 cd /usr/src/redhat/RPMS/i386
 rpm -i apache-1.3.28-0.n0i.i386.rpm
 
-apt-get install perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-HTML-Parser perl-HTML-Tagset perl-TimeDate perl-URI perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs #openssh
+apt-get install perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-HTML-Parser perl-HTML-Tagset perl-TimeDate perl-URI perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs gcc gd #openssh
+
+wget --passive-ftp --continue http://atrpms.physik.fu-berlin.de/dist/rh9/perl-GD/perl-GD-2.11-7.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-45-1.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/yum/yum-2.0.4-28.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/gd/gd-2.0.15-1_6.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-package-config-45-1.rh9.at.noarch.rpm
+
+cp /etc/apt/apt.conf /etc/apt/apt.conf.real
+
+rpm -i --replacefiles atrpms-package-config-45-1.rh9.at.noarch.rpm yum-2.0.4-28.rh9.at.noarch.rpm atrpms-45-1.rh9.at.noarch.rpm gd-2.0.15-1_6.rh9.at.i386.rpm perl-GD-2.11-7.rh9.at.i386.rpm
+
+mv /etc/apt/apt.conf.real /etc/apt/apt.conf
 
 perl -MCPAN -e"install Locale::Country, Net::Whois, Business::CreditCard, \
                        Mail::Internet, File::CounterFile, FreezeThaw, \
                        String::Approx, Text::Template, DBIx::DataSource, \
                        DBIx::DBSchema, Net::SSH, String::ShellQuote, \
                        Net::SCP, Apache::ASP, Tie::IxHash, Time::Duration, \
-                       HTML::Widgets::SelectLayers, Apache::DBI, Cache::Cache"
+                       HTML::Widgets::SelectLayers, Apache::DBI, Cache::Cache \
+                       Test::Pod NetAddr::IP IPC::ShareLite Chart::LinesPoints"
+
+echo 'OPTIONS="-DHAVE_PERL -DHAVE_SSL"' >>/etc/sysconfig/apache
 
-#edit /etc/init.d/httpd, add -DHAVE_PERL -DHAVE_SSL, then remove perl & ssl
-# module load bits from /etc/httpd/conf/httpd.conf
+#remove perl & ssl module load bits from /etc/httpd/conf/httpd.conf
 
 /usr/sbin/useradd freeside
 
-- 
cgit v1.2.1


From aa1656803c5742ed54ce983bdf656045e9c49b87 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 3 Feb 2004 00:19:45 +0000
Subject: adding shadow.reimport

---
 bin/shadow.reimport | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100755 bin/shadow.reimport

diff --git a/bin/shadow.reimport b/bin/shadow.reimport
new file mode 100755
index 000000000..2c0ad1fea
--- /dev/null
+++ b/bin/shadow.reimport
@@ -0,0 +1,98 @@
+#!/usr/bin/perl -Tw
+# $Id: shadow.reimport,v 1.1 2004-02-03 00:19:45 ivan Exp $
+
+use strict;
+use vars qw(%part_svc);
+use Term::Query qw(query);
+use Net::SCP qw(iscp);
+use FS::UID qw(adminsuidsetup datasrc);
+use FS::Record qw(qsearch qsearchs);
+use FS::svc_acct;
+use FS::part_svc;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+push @FS::svc_acct::shells, qw(/bin/sync /sbin/shutdown /bin/halt /sbin/halt); #others?
+
+my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
+
+#$FS::svc_acct::nossh_hack = 1;
+$FS::svc_Common::noexport_hack = 1;
+
+###
+
+%part_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_acct'});
+
+die "No services with svcdb svc_acct!\n" unless %part_svc;
+
+print "\n\n", &menu_svc, "\n", <<END;
+Enter part number to import.
+END
+my($shell_svcpart)=&getpart;
+
+print "\n\n", <<END;
+Enter the location and name of your _user_ shadow file, for example
+"mail.isp.com:/etc/shadow" or "bsd.isp.com:/etc/master.passwd"
+END
+my($loc_shadow)=&getvalue(":");
+iscp("root\@$loc_shadow", "$spooldir/shadow.import");
+
+sub menu_svc {
+  ( join "\n", map "$_: ".$part_svc{$_}->svc, sort keys %part_svc ). "\n";
+}
+sub getpart {
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query "Enter part number:", 'irk', [ keys %part_svc ];
+  $^W=1;
+  $return;
+}
+sub getvalue {
+  my $prompt = shift;
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query $prompt, '';
+  $^W=1;
+  $return;
+}
+
+print "\n\n";
+
+###
+
+open(SHADOW,"<$spooldir/shadow.import");
+
+my($line, $updated);
+while (<SHADOW>) {
+  $line++;
+  chop;
+  my($username,$password)=split(/:/);
+
+  my @svc_acct = grep { $_->cust_svc->svcpart == $shell_svcpart } 
+                 qsearch('svc_acct', { 'username' => $username } );
+
+  next unless @svc_acct;
+
+  if ( scalar(@svc_acct) > 1 ) {
+    warn "more than one $username found!\n";
+    next;
+  }
+
+  my $svc_acct = shift @svc_acct;
+
+  next if $svc_acct->_password eq $password;
+
+  my $new_svc_acct = new FS::svc_acct( { $svc_acct->hash } );
+  $new_svc_acct->_password($password);
+  #my $error = $new_svc_acct->replace($svc_acct);
+  #die "$username: $error" if $error;
+
+  $updated++;
+
+}
+
+warn "$updated of $line passwords changed\n";
+
+sub usage {
+  die "Usage:\n\n  shadow.reimport user\n";
+}
+
-- 
cgit v1.2.1


From d5005d2e29391ef9f5498626ccec4281f6a850c3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 6 Feb 2004 01:00:45 +0000
Subject: add "Net 0" invoice_default_terms

---
 FS/FS/Conf.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index ec1bf5574..99eee18ea 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -502,7 +502,7 @@ httemplate/docs/config.html
     'section'     => 'billing',
     'description' => 'Optional default invoice term, used to calculate a due date printed on invoices.',
     'type'        => 'select',
-    'select_enum' => [ '', 'Payable upon receipt', 'Net 10', 'Net 15', 'Net 30', 'Net 45', 'Net 60' ],
+    'select_enum' => [ '', 'Payable upon receipt', 'Net 0', 'Net 10', 'Net 15', 'Net 30', 'Net 45', 'Net 60' ],
   },
 
   {
-- 
cgit v1.2.1


From aecf44ec9118946eebe551fc7144a1d0dcff8de5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 7 Feb 2004 08:24:03 +0000
Subject: add ignore_accounting flag to sqlradius and sqlradius_withdomain
 exports

---
 FS/FS/cust_svc.pm    | 4 ++++
 FS/FS/part_export.pm | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index ce2b969f9..b74cfd685 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -367,6 +367,8 @@ sub seconds_since_sqlradacct {
   my $seconds = 0;
   foreach my $part_export ( @part_export ) {
 
+    next if $part_export->option('ignore_accounting');
+
     my $dbh = DBI->connect( map { $part_export->option($_) }
                             qw(datasrc username password)    )
       or die "can't connect to sqlradius database: ". $DBI::errstr;
@@ -483,6 +485,8 @@ sub attribute_since_sqlradacct {
 
   foreach my $part_export ( @part_export ) {
 
+    next if $part_export->option('ignore_accounting');
+
     my $dbh = DBI->connect( map { $part_export->option($_) }
                             qw(datasrc username password)    )
       or die "can't connect to sqlradius database: ". $DBI::errstr;
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index a27213773..16f91eb6e 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -698,12 +698,20 @@ tie my %sqlradius_options, 'Tie::IxHash',
   'datasrc'  => { label=>'DBI data source ' },
   'username' => { label=>'Database username' },
   'password' => { label=>'Database password' },
+  'ignore_accounting' => {
+     type => 'checkbox',
+     label=>'Ignore accounting records from this database'
+  },
 ;
 
 tie my %sqlradius_withdomain_options, 'Tie::IxHash',
   'datasrc'  => { label=>'DBI data source ' },
   'username' => { label=>'Database username' },
   'password' => { label=>'Database password' },
+  'ignore_accounting' => {
+     type => 'checkbox',
+     label=>'Ignore accounting records from this database'
+  },
 ;
 
 tie my %cyrus_options, 'Tie::IxHash',
-- 
cgit v1.2.1


From 69b7034bf2f9605c394c4ee22aaed4d7873c1a84 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 7 Feb 2004 22:13:19 +0000
Subject: add link to FreeBSD patch for pw(1) problem

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 16f91eb6e..033840aeb 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -935,7 +935,7 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
       'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
       'options' => \%shellcommands_options,
       'nodomain' => 'Y',
-      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = ""; this.form.suspend.value = "usermod -L $username"; this.form.suspend_stdin.value=""; this.form.unsuspend.value = "usermod -U $username"; this.form.unsuspend_stdin.value="";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "lockf /etc/passwd.lock pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "lockf /etc/passwd.lock pw userdel $username -r"; this.form.userdel_stdin.value=""; this.form.usermod.value = "lockf /etc/passwd.lock pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0"; this.form.usermod_stdin.value = "$new__password\n"; this.form.suspend.value = "lockf /etc/passwd.lock pw lock $username"; this.form.suspend_stdin.value=""; this.form.unsuspend.value = "lockf /etc/passwd.lock pw unlock $username"; this.form.unsuspend_stdin.value="";\'> Note: On FreeBSD, due to deficient locking in pw(1), you must disable the chpass(1), chsh(1), chfn(1), passwd(1), and vipw(1) commands, or replace them with wrappers that prepend "lockf /etc/passwd.lock".<LI><INPUT TYPE="button" VALUE="NetBSD/OpenBSD" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = ""; this.form.suspend.value = ""; this.form.suspend_stdin.value=""; this.form.unsuspend.value = ""; this.form.unsuspend_stdin.value="";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $new_uid.$new_gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value=""; this.form.suspend.value = ""; this.form.suspend_stdin.value=""; this.form.unsuspend.value = ""; this.form.unsuspend_stdin.value="";\'></UL>The following variables are available for interpolation (prefixed with new_ or old_ for replace operations): <UL><LI><code>$username</code><LI><code>$_password</code><LI><code>$quoted_password</code> - unencrypted password quoted for the shell<LI><code>$crypt_password</code> - encrypted password<LI><code>$uid</code><LI><code>$gid</code><LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)<LI><code>$dir</code> - home directory<LI><code>$shell</code><LI><code>$quota</code><LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.</UL>',
+      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = ""; this.form.suspend.value = "usermod -L $username"; this.form.suspend_stdin.value=""; this.form.unsuspend.value = "usermod -U $username"; this.form.unsuspend_stdin.value="";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "lockf /etc/passwd.lock pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "lockf /etc/passwd.lock pw userdel $username -r"; this.form.userdel_stdin.value=""; this.form.usermod.value = "lockf /etc/passwd.lock pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0"; this.form.usermod_stdin.value = "$new__password\n"; this.form.suspend.value = "lockf /etc/passwd.lock pw lock $username"; this.form.suspend_stdin.value=""; this.form.unsuspend.value = "lockf /etc/passwd.lock pw unlock $username"; this.form.unsuspend_stdin.value="";\'> Note: On FreeBSD, due to deficient locking in pw(1), you must disable the chpass(1), chsh(1), chfn(1), passwd(1), and vipw(1) commands, or replace them with wrappers that prepend "lockf /etc/passwd.lock".  Alternatively, apply the patch in <A HREF="http://www.freebsd.org/cgi/query-pr.cgi?pr=23501">FreeBSD PR#23501</A> and remove the "lockf /etc/passwd.lock" from these default commands.<LI><INPUT TYPE="button" VALUE="NetBSD/OpenBSD" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = ""; this.form.suspend.value = ""; this.form.suspend_stdin.value=""; this.form.unsuspend.value = ""; this.form.unsuspend_stdin.value="";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $new_uid.$new_gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value=""; this.form.suspend.value = ""; this.form.suspend_stdin.value=""; this.form.unsuspend.value = ""; this.form.unsuspend_stdin.value="";\'></UL>The following variables are available for interpolation (prefixed with new_ or old_ for replace operations): <UL><LI><code>$username</code><LI><code>$_password</code><LI><code>$quoted_password</code> - unencrypted password quoted for the shell<LI><code>$crypt_password</code> - encrypted password<LI><code>$uid</code><LI><code>$gid</code><LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)<LI><code>$dir</code> - home directory<LI><code>$shell</code><LI><code>$quota</code><LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.</UL>',
     },
 
     'shellcommands_withdomain' => {
-- 
cgit v1.2.1


From f4ffa3596c3b8bfc9e862c2a7e8efc68f86207ab Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Feb 2004 06:31:37 +0000
Subject: re-email invoice, closes: bug#526 and have print and email invoice
 links redirect back to top of customer view page instead of #history tag

---
 htetc/global.asa                  |  1 +
 htetc/handler.pl                  |  1 +
 httemplate/misc/email-invoice.cgi | 23 +++++++++++++++++++++++
 httemplate/misc/print-invoice.cgi |  2 +-
 httemplate/view/cust_bill.cgi     |  8 +++++++-
 5 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100755 httemplate/misc/email-invoice.cgi

diff --git a/htetc/global.asa b/htetc/global.asa
index e05701d56..e4661c3cb 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -22,6 +22,7 @@ use FS::Conf;
 use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
                small_custview myexit http_header);
 use FS::Msgcat qw(gettext geterror);
+use FS::Misc qw( send_email );
 
 use FS::agent;
 use FS::agent_type;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 584d930b1..618c5856f 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -80,6 +80,7 @@ sub handler
       use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
                      small_custview myexit http_header);
       use FS::Msgcat qw(gettext geterror);
+      use FS::Misc qw( send_email );
 
       use FS::agent;
       use FS::agent_type;
diff --git a/httemplate/misc/email-invoice.cgi b/httemplate/misc/email-invoice.cgi
new file mode 100755
index 000000000..7ab1613ee
--- /dev/null
+++ b/httemplate/misc/email-invoice.cgi
@@ -0,0 +1,23 @@
+<%
+
+my $conf = new FS::Conf;
+
+#untaint invnum
+my($query) = $cgi->keywords;
+$query =~ /^(\d*)$/;
+my $invnum = $1;
+my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
+die "Can't find invoice!\n" unless $cust_bill;
+
+my $error = send_email(
+  'from'    => $conf->config('invoice_from'),
+  'to'      => [ grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ],
+  'subject' => 'Invoice',
+  'body'    => [ $cust_bill->print_text ],
+);
+eidiot($error) if $error;
+
+my $custnum = $cust_bill->getfield('custnum');
+print $cgi->redirect("${p}view/cust_main.cgi?$custnum");
+
+%>
diff --git a/httemplate/misc/print-invoice.cgi b/httemplate/misc/print-invoice.cgi
index 0dda68a4e..144f6156a 100755
--- a/httemplate/misc/print-invoice.cgi
+++ b/httemplate/misc/print-invoice.cgi
@@ -24,6 +24,6 @@ die "Can't find invoice!\n" unless $cust_bill;
 
 my $custnum = $cust_bill->getfield('custnum');
 
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum#history");
+print $cgi->redirect("${p}view/cust_main.cgi?$custnum");
 
 %>
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 4d98f3ebc..50ee8b36c 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -20,7 +20,13 @@ print header('Invoice View', menubar(
 print qq!<A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) against this invoice</A> | !
   if $cust_bill->owed > 0;
 
-print qq!<A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>!.      '<BR><BR>';
+print qq!<A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>!;
+if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) {
+  print qq! | <A HREF="${p}misc/email-invoice.cgi?$invnum">!.
+        qq!Re-email this invoice</A>!;
+}
+
+print '<BR><BR>';
 
 my $conf = new FS::Conf;
 if ( $conf->exists('invoice_latex') ) {
-- 
cgit v1.2.1


From 2c78d867d1fc1495c537e7bb7fb0a9d445e92c69 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Feb 2004 10:44:11 +0000
Subject: fix usage msg

---
 bin/bind.import | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/bind.import b/bin/bind.import
index 57eca2b63..3287b0183 100755
--- a/bin/bind.import
+++ b/bin/bind.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: bind.import,v 1.3 2002-07-15 01:44:23 ivan Exp $
+# $Id: bind.import,v 1.4 2004-02-12 10:44:11 ivan Exp $
 
 #need to manually put header in /usr/local/etc/freeside/export.<datasrc./bind/<machine>/named.conf.HEADER
 
@@ -79,7 +79,7 @@ print "\nBIND import completed.\n";
 ##
 
 sub usage {
-  die "Usage:\n\n  svc_domain.import user\n";
+  die "Usage:\n\n  bind.import user\n";
 }
 
 ########
-- 
cgit v1.2.1


From b0ab97d8a770c35cc41c05e8136ca6580c2b418e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Feb 2004 22:40:45 +0000
Subject: doc

---
 install/redhat/9/INSTALL | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/install/redhat/9/INSTALL b/install/redhat/9/INSTALL
index f8280dac5..ee3cba9ee 100644
--- a/install/redhat/9/INSTALL
+++ b/install/redhat/9/INSTALL
@@ -42,7 +42,8 @@ perl -MCPAN -e"install Locale::Country, Net::Whois, Business::CreditCard, \
 
 echo 'OPTIONS="-DHAVE_PERL -DHAVE_SSL"' >>/etc/sysconfig/apache
 
-#remove perl & ssl module load bits from /etc/httpd/conf/httpd.conf
+#remove perl & ssl LoadModule lines from /etc/httpd/conf/httpd.conf
+#as they're statically linked
 
 /usr/sbin/useradd freeside
 
-- 
cgit v1.2.1


From 193118008312797e8188145138c6875ba506ff33 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Feb 2004 04:03:59 +0000
Subject: depend on Net::SSH 0.08 for non-blocking STDERR read

---
 FS/FS/part_export/domain_shellcommands.pm  | 2 +-
 FS/FS/part_export/forward_shellcommands.pm | 2 +-
 FS/FS/part_export/router.pm                | 2 +-
 FS/FS/part_export/shellcommands.pm         | 2 +-
 FS/FS/part_export/www_shellcommands.pm     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/FS/FS/part_export/domain_shellcommands.pm b/FS/FS/part_export/domain_shellcommands.pm
index cf5603394..d295eece0 100644
--- a/FS/FS/part_export/domain_shellcommands.pm
+++ b/FS/FS/part_export/domain_shellcommands.pm
@@ -97,7 +97,7 @@ sub shellcommands_queue {
 }
 
 sub ssh_cmd { #subroutine, not method
-  use Net::SSH '0.07';
+  use Net::SSH '0.08';
   &Net::SSH::ssh_cmd( { @_ } );
 }
 
diff --git a/FS/FS/part_export/forward_shellcommands.pm b/FS/FS/part_export/forward_shellcommands.pm
index f6fcb6062..5d3145715 100644
--- a/FS/FS/part_export/forward_shellcommands.pm
+++ b/FS/FS/part_export/forward_shellcommands.pm
@@ -97,7 +97,7 @@ sub shellcommands_queue {
 }
 
 sub ssh_cmd { #subroutine, not method
-  use Net::SSH '0.07';
+  use Net::SSH '0.08';
   &Net::SSH::ssh_cmd( { @_ } );
 }
 
diff --git a/FS/FS/part_export/router.pm b/FS/FS/part_export/router.pm
index 1d1f907e2..07b5b9edb 100644
--- a/FS/FS/part_export/router.pm
+++ b/FS/FS/part_export/router.pm
@@ -138,7 +138,7 @@ sub router_queue {
 }
 
 sub ssh_cmd { #subroutine, not method
-  use Net::SSH '0.07';
+  use Net::SSH '0.08';
   &Net::SSH::ssh_cmd( { @_ } );
 }
 
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index f65638984..db2e7aaf9 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -125,7 +125,7 @@ sub shellcommands_queue {
 }
 
 sub ssh_cmd { #subroutine, not method
-  use Net::SSH '0.07';
+  use Net::SSH '0.08';
   &Net::SSH::ssh_cmd( { @_ } );
 }
 
diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index 20658c7a2..3e0087446 100644
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -96,7 +96,7 @@ sub shellcommands_queue {
 }
 
 sub ssh_cmd { #subroutine, not method
-  use Net::SSH '0.07';
+  use Net::SSH '0.08';
   &Net::SSH::ssh_cmd( { @_ } );
 }
 
-- 
cgit v1.2.1


From 0a15826f1acf5a8258ac183518d55ca6e961b162 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Feb 2004 08:02:53 +0000
Subject: initial import

---
 bin/sendmail.import | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 161 insertions(+)
 create mode 100644 bin/sendmail.import

diff --git a/bin/sendmail.import b/bin/sendmail.import
new file mode 100644
index 000000000..03b54e6f9
--- /dev/null
+++ b/bin/sendmail.import
@@ -0,0 +1,161 @@
+#!/usr/bin/perl -w
+
+use strict;
+use Term::Query qw(query);
+use Net::SCP qw(iscp);
+use FS::UID qw(adminsuidsetup datasrc);
+use FS::Record qw(qsearch); #qsearchs);
+##use FS::svc_acct_sm;
+#use FS::svc_domain;
+#use FS::domain_record;
+use FS::svc_acct;
+##use FS::part_svc;
+use FS::svc_forward;
+use FS::svc_domain;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+#$FS::svc_Common::noexport_hack = 1;
+#$FS::domain_record::noserial_hack = 1;
+
+use vars qw($defaultdomain);
+$defaultdomain = 'surferz.net';
+
+use vars qw($svcpart $domain_svcpart);
+$svcpart = 2;
+$domain_svcpart = 1;
+
+use vars qw($spooldir);
+$spooldir = "/usr/local/etc/freeside/export.". datasrc. "/sendmail";
+mkdir $spooldir unless -d $spooldir;
+
+print "\n\n", <<END;
+Enter the location and name of your Sendmail aliases file, for example
+"mail.isp.com:/etc/mail/aliases"
+END
+my($aliases)=&getvalue(":");
+
+use vars qw($aliases_machine $aliases_prefix);
+$alises_machine = (split(/:/, $aliases))[0];
+$aliases_prefix = "$spooldir/$aliases_machine";
+mkdir $aliases_prefix unless -d $aliases_prefix;
+
+iscp("root\@$aliases","$aliases_prefix/aliases.import");
+
+print "\n\n", <<END;
+Enter the location and name of your Sendmail virtusertable directory, for example
+"mail.isp.com:/etc/mail/virtusertable"
+END
+my($virtusertable)=&getvalue(":");
+
+use vars qw($virtusertable_machine $virtusertable_prefix);
+$virtusertable_machine = (split(/:/, $virtusertable))[0];
+$prefix = "$spooldir/$aliases_machine";
+mkdir $prefix unless -d $prefix;
+mkdir "$prefix/virtusertable.import" unless -d "$prefix/virtusertable.import";
+
+iscp("root\@$virtusertable/*","$aliases_prefix/virtusertable.import/");
+
+sub getvalue {
+  my $prompt = shift;
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query $prompt, '';
+  $^W=1;
+  $return;
+}
+
+print "\n\n";
+
+##
+
+#!! handle all files
+
+open(ALIASES,"<$aliases_prefix/aliases.import") or die $!;
+while (<ALIASES>) {
+  next if /^\s*#/ || /^\s*$/; #skip comments & blank lines
+
+  #!! handle catchalls!!!
+
+  unless ( /^([\w\@\.]+):\s*()\s*$/ ) {
+    warn "Unparsable line: $_";
+    next;
+  }
+  my($rawusername, $rawdest) = ($1, $2)
+
+  my($username, $domain);
+  if ( $rawusername =~ /^(\w+)\@([\w\.]+)$/ ) {
+    $username = $1;
+    $domain = $2;
+  } elsif ( $rawusername =~ /\@/ ) {
+    die "Unparsable username: $rawusername\n";
+  } else {
+    $username = $rawusername;
+    $domain = $defaultdomain;
+  }
+
+  #find or create svc_acct record
+
+  my @svc_acct = grep { $_->cust_svc->svcpart == $svcpart }
+                   qsearch('svc_acct', {
+                     'username' => $username,
+                     'domain'   => $domain,
+                   });
+
+  if ( scalar(@svc_acct) > 1 ) {
+    die "multiple sources found for $username\@$domain !\n";
+  }
+
+  my $svc_acct;
+  if ( @svc_acct ) {
+    $svc_acct = $svc_acct[0];
+  } else {
+
+    my $svc_domain = qsearchs('svc_domain', { 'domain' => $domain } );
+    $svc_domain ||= new FS::svc_domain ({
+      'svcpart' => $domain_svcpart,
+      'domain'  => $domain,
+    });
+    unless ( $svc_domain->svcnum ) {
+      my $error = $svc_domain->insert;
+      if ( $error ) {
+        die "can't insert domain: $domain\n";
+      }
+    }
+
+    $svc_acct = new FS::svc_acct ({
+      svcpart => $svcpart,
+      username => $username,
+      domsvc   => $svc_domain->svcnum,
+    });
+    my $error = $svc_acct->insert;
+    if ( $error ) {
+      die "can't insert account: $username\@$domain\n";
+    }
+
+  }
+
+  #!!handle multiple destinations!
+
+  my $svc_forward = new FS::svc_forward ({
+    srcsvc => $svc_acct->srcsvc,
+    dstsvc => 
+    dst    =>
+  });
+  my $error = $svc_forward->insert;
+  if ( $error ) {
+    die "$rawusername: $rawdest: $error\n";
+  }
+
+}
+
+##
+
+sub usage {
+  die "Usage:\n\n  sendmail.import user\n";
+}
+
+
+
+
+
-- 
cgit v1.2.1


From 07930a9141f823787a7e9c1e88fef453eb850fc7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Feb 2004 10:35:42 +0000
Subject: add svc_forward.src

---
 FS/FS/svc_forward.pm           | 40 +++++++++++++++++++++++++++++-----------
 FS/bin/freeside-setup          |  3 ++-
 httemplate/docs/schema.html    |  3 ++-
 httemplate/docs/upgrade10.html |  2 ++
 4 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index 7a121b835..b9e8ff8f7 100644
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -47,9 +47,11 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item srcsvc - svcnum of the source of the forward (see L<FS::svc_acct>)
 
+=item src - literal source (username or full email address)
+
 =item dstsvc - svcnum of the destination of the forward (see L<FS::svc_acct>)
 
-=item dst - foreign destination (email address) - forward not local to freeside
+=item dst - literal destination (username or full email address)
 
 =back
 
@@ -214,12 +216,19 @@ sub check {
   #my $part_svc = $x;
 
   my $error = $self->ut_numbern('svcnum')
-              || $self->ut_number('srcsvc')
+              || $self->ut_numbern('srcsvc')
               || $self->ut_numbern('dstsvc')
   ;
   return $error if $error;
 
-  return "Unknown srcsvc" unless $self->srcsvc_acct;
+  return "Both srcsvc and src were defined; only one can be specified"
+    if $self->srcsvc && $self->src;
+
+  return "one of srcsvc or src is required"
+    unless $self->srcsvc || $self->src;
+
+  return "Unknown srcsvc: ". $self->srcsvc
+    unless ! $self->srcsvc || $self->srcsvc_acct;
 
   return "Both dstsvc and dst were defined; only one can be specified"
     if $self->dstsvc && $self->dst;
@@ -227,16 +236,24 @@ sub check {
   return "one of dstsvc or dst is required"
     unless $self->dstsvc || $self->dst;
 
-  #return "Unknown dstsvc: $dstsvc" unless $self->dstsvc_acct || ! $self->dstsvc;
-  return "Unknown dstsvc"
-    unless qsearchs('svc_acct', { 'svcnum' => $self->dstsvc } )
-           || ! $self->dstsvc;
+  return "Unknown dstsvc: ". $self->dstsvc
+    unless ! $self->dstsvc || $self->dstsvc_acct;
+  #return "Unknown dstsvc"
+  #  unless qsearchs('svc_acct', { 'svcnum' => $self->dstsvc } )
+  #         || ! $self->dstsvc;
 
+  if ( $self->src ) {
+    $self->src =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)?$/
+       or return "Illegal src: ". $self->dst;
+    $self->src("$1$2");
+  } else {
+    $self->src('');
+  }
 
   if ( $self->dst ) {
-    $self->dst =~ /^([\w\.\-]+)\@(([\w\-]+\.)+\w+)$/
+    $self->dst =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)?$/
        or return "Illegal dst: ". $self->dst;
-    $self->dst("$1\@$2");
+    $self->dst("$1$2");
   } else {
     $self->dst('');
   }
@@ -246,7 +263,8 @@ sub check {
 
 =item srcsvc_acct
 
-Returns the FS::svc_acct object referenced by the srcsvc column.
+Returns the FS::svc_acct object referenced by the srcsvc column, or false for
+literally specified forwards.
 
 =cut
 
@@ -258,7 +276,7 @@ sub srcsvc_acct {
 =item dstsvc_acct
 
 Returns the FS::svc_acct object referenced by the srcsvc column, or false for
-forwards not local to freeside.
+literally specified forwards.
 
 =cut
 
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 72780e363..feebcf9f7 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -844,8 +844,9 @@ sub tables_hash_hack {
       'columns' => [
         'svcnum',   'int',    '',  '',
         'srcsvc',   'int',    '',  '',
+        'src',      'varchar',    'NULL',  255,
         'dstsvc',   'int',    '',  '',
-        'dst',      'varchar',    'NULL',  $char_d,
+        'dst',      'varchar',    'NULL',  255,
       ],
       'primary_key' => 'svcnum',
       'unique'      => [],
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 40b211cf9..b38031777 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -373,8 +373,9 @@
       <ul>
         <li>svcnum - <a href="#cust_svc">primary key</a>
         <li>srcsvc - <a href="#svc_acct">svcnum of the source of this forward</a>
+        <li>src - literal source (username or full email address)
         <li>dstsvc - <a href="#svc_acct">svcnum of the destination of this forward</a>
-        <li>dst - foreign destination (email address) - forward not local to freeside
+        <li>dst - literal destination (username or full email address)
       </ul>
     <li><a name="domain_record" href="man/FS/domain_record.html">domain_record</a> - Domain zone detail
       <ul>
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index e98407351..a878495d4 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -156,6 +156,8 @@ ALTER TABLE h_part_referral ADD disabled char(1) NULL;
 CREATE INDEX part_referral1 ON part_referral ( disabled );
 ALTER TABLE pkg_svc ADD primary_svc char(1) NULL;
 ALTER TABLE h_pkg_svc ADD primary_svc char(1) NULL;
+ALTER TABLE svc_forward ADD src varchar(255) NULL;
+ALTER TABLE h_svc_forward ADD src varchar(255) NULL;
 
 dump database, edit:
 - cust_main: increase otaker from 8 to 32
-- 
cgit v1.2.1


From 1e2a5c920840e046e4e28ca35681cb0912322666 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Feb 2004 10:57:55 +0000
Subject: continue adding svc_forward.src: make svc_forward.srcsvc nullable

---
 FS/bin/freeside-setup          | 6 +++---
 httemplate/docs/upgrade10.html | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index feebcf9f7..7512cc18c 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -842,10 +842,10 @@ sub tables_hash_hack {
 
     'svc_forward' => {
       'columns' => [
-        'svcnum',   'int',    '',  '',
-        'srcsvc',   'int',    '',  '',
+        'svcnum',   'int',            '',   '',
+        'srcsvc',   'int',        'NULL',   '',
         'src',      'varchar',    'NULL',  255,
-        'dstsvc',   'int',    '',  '',
+        'dstsvc',   'int',        'NULL',   '',
         'dst',      'varchar',    'NULL',  255,
       ],
       'primary_key' => 'svcnum',
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index a878495d4..c3f23b371 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -158,6 +158,12 @@ ALTER TABLE pkg_svc ADD primary_svc char(1) NULL;
 ALTER TABLE h_pkg_svc ADD primary_svc char(1) NULL;
 ALTER TABLE svc_forward ADD src varchar(255) NULL;
 ALTER TABLE h_svc_forward ADD src varchar(255) NULL;
+ALTER TABLE svc_forward ALTER COLUMN srcsvc DROP NOT NULL;
+ALTER TABLE h_svc_forward ALTER COLUMN srcsvc DROP NOT NULL;
+ALTER TABLE svc_forward ALTER COLUMN dstsvc DROP NOT NULL;
+ALTER TABLE h_svc_forward ALTER COLUMN dstsvc DROP NOT NULL;
+
+
 
 dump database, edit:
 - cust_main: increase otaker from 8 to 32
-- 
cgit v1.2.1


From ecf57b84d7a29c9bebac62eb5ebf178332163fd9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Feb 2004 11:28:07 +0000
Subject: add mail alias browse to main menu and fix mail alias view to
 recognize new schema also

---
 httemplate/index.html             |  3 +-
 httemplate/search/svc_forward.cgi | 79 +++++++++++++++++++++++++++++++++++++++
 httemplate/view/svc_forward.cgi   | 17 +++++++--
 3 files changed, 94 insertions(+), 5 deletions(-)
 create mode 100755 httemplate/search/svc_forward.cgi

diff --git a/httemplate/index.html b/httemplate/index.html
index 7d90efc71..d39f8b04d 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -34,7 +34,8 @@
         <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="phone_on" VALUE="1">Phone # <INPUT TYPE="text" NAME="phone_text"><INPUT TYPE="submit" VALUE="Search"></FORM>
         <BR><FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><SELECT NAME="username_type"><OPTION VALUE="All">(all)</OPTION><OPTION>Fuzzy</OPTION><OPTION>Substring</OPTION><OPTION SELECTED>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A> or <A HREF="search/svc_acct.cgi?uid">uid</A></FORM>
         <BR><FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
-<!--        <LI><A HREF="search/svc_forward.html">mail forwards (by ?)</A>-->
+        <BR><A HREF="search/svc_forward.cgi?svcnum">all mail forwards by svcnum</A><BR>
+
       <BR>
     </TD></TR>
     </TABLE>
diff --git a/httemplate/search/svc_forward.cgi b/httemplate/search/svc_forward.cgi
new file mode 100755
index 000000000..10094bc99
--- /dev/null
+++ b/httemplate/search/svc_forward.cgi
@@ -0,0 +1,79 @@
+<%
+
+my $conf = new FS::Conf;
+
+my($query)=$cgi->keywords;
+$query ||= ''; #to avoid use of unitialized value errors
+my(@svc_forward,$sortby);
+if ( $query eq 'svcnum' ) {
+  $sortby=\*svcnum_sort;
+  @svc_forward=qsearch('svc_forward',{});
+} else {
+  eidiot('unimplemented');
+}
+
+if ( scalar(@svc_forward) == 1 ) {
+  print $cgi->redirect(popurl(2). "view/svc_forward.cgi?". $svc_forward[0]->svcnum);
+  #exit;
+} elsif ( scalar(@svc_forward) == 0 ) {
+%>
+<!-- mason kludge -->
+<%
+  eidiot "No matching forwards found!\n";
+} else {
+%>
+<!-- mason kludge -->
+<%
+  my $total = scalar(@svc_forward);
+  print header("Mail forward Search Results",''), <<END;
+
+    $total matching mail forwards found
+    <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
+      <TR>
+        <TH>Service #<BR><FONT SIZE=-1>(click to view forward)</FONT></TH>
+        <TH>Mail to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
+        <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
+      </TR>
+END
+
+  foreach my $svc_forward (
+    sort $sortby (@svc_forward)
+  ) {
+    my $svcnum = $svc_forward->svcnum;
+
+    my $src = $svc_forward->src;
+    $src = "<I>(anything)</I>$src" if $src =~ /^@/;
+    if ( $svc_forward->srcsvc_acct ) {
+      $src = qq!<A HREF="${p}view/svc_acct.cgi?!. $svc_forward->srcsvc. '">'.
+             $svc_forward->srcsvc_acct->email. '</A>';
+    }
+
+    my $dst = $svc_forward->dst;
+    if ( $svc_forward->dstsvc_acct ) {
+      $dst = qq!<A HREF="${p}view/svc_acct.cgi?!. $svc_forward->dstsvc. '">'.
+             $svc_forward->dstsvc_acct->email. '</A>';
+    }
+
+    print <<END;
+      <TR>
+        <TD><A HREF="${p}view/svc_forward.cgi?$svcnum">$svcnum</A></TD>
+        <TD>$src</TD>
+        <TD>$dst</TD>
+      </TR>
+END
+
+  }
+ 
+  print <<END;
+    </TABLE>
+  </BODY>
+</HTML>
+END
+
+}
+
+sub svcnum_sort {
+  $a->getfield('svcnum') <=> $b->getfield('svcnum');
+}
+
+%>
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index 5d619de54..c2ce164d1 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -39,16 +39,25 @@ my($srcsvc,$dstsvc,$dst) = (
   $svc_forward->dstsvc,
   $svc_forward->dst,
 );
+my $src = $svc_forward->dbdef_table->column('src') ? $svc_forward->src : '';
+
 my $svc = $part_svc->svc;
-my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc})
-  or die "Corrupted database: no svc_acct.svcnum matching srcsvc $srcsvc";
-my $source = $svc_acct->email;
+
+my $source;
+if ($srcsvc) {
+  my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc})
+    or die "Corrupted database: no svc_acct.svcnum matching srcsvc $srcsvc";
+  $source = $svc_acct->email;
+} else {
+  $source = $src;
+}
+
 my $destination;
 if ($dstsvc) {
   my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$dstsvc})
     or die "Corrupted database: no svc_acct.svcnum matching dstsvc $dstsvc";
   $destination = $svc_acct->email;
-}else{
+} else {
   $destination = $dst;
 }
 
-- 
cgit v1.2.1


From f6dc0290b99dd949c42e2a92c2cc01353731db04 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Feb 2004 11:44:19 +0000
Subject: workaround for older Pg

---
 httemplate/docs/upgrade10.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index c3f23b371..774babb9e 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -158,12 +158,16 @@ ALTER TABLE pkg_svc ADD primary_svc char(1) NULL;
 ALTER TABLE h_pkg_svc ADD primary_svc char(1) NULL;
 ALTER TABLE svc_forward ADD src varchar(255) NULL;
 ALTER TABLE h_svc_forward ADD src varchar(255) NULL;
+
+On recent Pg versions:
+
 ALTER TABLE svc_forward ALTER COLUMN srcsvc DROP NOT NULL;
 ALTER TABLE h_svc_forward ALTER COLUMN srcsvc DROP NOT NULL;
 ALTER TABLE svc_forward ALTER COLUMN dstsvc DROP NOT NULL;
 ALTER TABLE h_svc_forward ALTER COLUMN dstsvc DROP NOT NULL;
 
-
+Or on Pg versions that don't support DROP NOT NULL (tested only on 7.2 so far):
+UPDATE pg_attribute SET attnotnull = FALSE WHERE ( attname = 'srcsvc' OR attname = 'dstsvc' ) AND ( attrelid = ( SELECT oid FROM pg_class WHERE relname = 'svc_forward' ) OR attrelid = ( SELECT oid FROM pg_class WHERE relname = 'h_svc_forward' ) );
 
 dump database, edit:
 - cust_main: increase otaker from 8 to 32
-- 
cgit v1.2.1


From da5339ccbdc3a42e536124524ce6c484c320ffc9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Feb 2004 11:47:29 +0000
Subject: it lives!

---
 bin/sendmail.import | 155 ++++++++++++++++++++++++++++------------------------
 1 file changed, 85 insertions(+), 70 deletions(-)

diff --git a/bin/sendmail.import b/bin/sendmail.import
index 03b54e6f9..8a9de9fd3 100644
--- a/bin/sendmail.import
+++ b/bin/sendmail.import
@@ -4,7 +4,7 @@ use strict;
 use Term::Query qw(query);
 use Net::SCP qw(iscp);
 use FS::UID qw(adminsuidsetup datasrc);
-use FS::Record qw(qsearch); #qsearchs);
+use FS::Record qw(qsearch qsearchs);
 ##use FS::svc_acct_sm;
 #use FS::svc_domain;
 #use FS::domain_record;
@@ -22,9 +22,9 @@ adminsuidsetup $user;
 use vars qw($defaultdomain);
 $defaultdomain = 'surferz.net';
 
-use vars qw($svcpart $domain_svcpart);
+use vars qw($svcpart $forward_svcpart);
 $svcpart = 2;
-$domain_svcpart = 1;
+$forward_svcpart = 4;
 
 use vars qw($spooldir);
 $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/sendmail";
@@ -37,11 +37,12 @@ END
 my($aliases)=&getvalue(":");
 
 use vars qw($aliases_machine $aliases_prefix);
-$alises_machine = (split(/:/, $aliases))[0];
+$aliases_machine = (split(/:/, $aliases))[0];
 $aliases_prefix = "$spooldir/$aliases_machine";
 mkdir $aliases_prefix unless -d $aliases_prefix;
 
-iscp("root\@$aliases","$aliases_prefix/aliases.import");
+#iscp("root\@$aliases","$aliases_prefix/aliases.import");
+iscp("ivan\@$aliases","$aliases_prefix/aliases.import");
 
 print "\n\n", <<END;
 Enter the location and name of your Sendmail virtusertable directory, for example
@@ -51,11 +52,13 @@ my($virtusertable)=&getvalue(":");
 
 use vars qw($virtusertable_machine $virtusertable_prefix);
 $virtusertable_machine = (split(/:/, $virtusertable))[0];
-$prefix = "$spooldir/$aliases_machine";
-mkdir $prefix unless -d $prefix;
-mkdir "$prefix/virtusertable.import" unless -d "$prefix/virtusertable.import";
+$virtusertable_prefix = "$spooldir/$virtusertable_machine";
+mkdir $virtusertable_prefix unless -d $virtusertable_prefix;
+mkdir "$virtusertable_prefix/virtusertable.import"
+  unless -d "$virtusertable_prefix/virtusertable.import";
 
-iscp("root\@$virtusertable/*","$aliases_prefix/virtusertable.import/");
+#iscp("root\@$virtusertable/*","$aliases_prefix/virtusertable.import/");
+iscp("ivan\@$virtusertable/*","$aliases_prefix/virtusertable.import/");
 
 sub getvalue {
   my $prompt = shift;
@@ -69,88 +72,100 @@ print "\n\n";
 
 ##
 
-#!! handle all files
+foreach my $file ( 
+  "$aliases_prefix/aliases.import",
+  glob("$aliases_prefix/virtusertable.import/*"),
+) {
+
+  warn "importing $file\n";
+  
+  open(FILE,"<$file") or die $!;
+  while (<FILE>) {
+    next if /^\s*#/ || /^\s*$/; #skip comments & blank lines
+  
+    unless ( /^([\w\@\.\-]+)[:\s]\s*(.*\S)\s*$/ ) {
+      warn "Unparsable line: $_";
+      next;
+    }
+    my($rawusername, $rawdest) = ($1, $2);
+  
+    my($username, $domain);
+    if ( $rawusername =~ /^([\w\-\.\&]*)\@([\w\.\-]+)$/ ) {
+      $username = $1;
+      $domain = $2;
+    } elsif ( $rawusername =~ /\@/ ) {
+      die "Unparsable username: $rawusername\n";
+    } else {
+      $username = $rawusername;
+      $domain = $defaultdomain;
+    }
+  
+    #find svc_acct record or set $src
+    my($srcsvc, $src) = &svcnum_or_literal($username, $domain);
+
+    foreach my $dest ( split(/,/, $rawdest) ) {
+
+      my($dusername, $ddomain);
+      if ( $dest =~ /^([\w\-\.\&]+)\@([\w\.\-]+)$/ ) {
+        $dusername = $1;
+        $ddomain = $2;          
+      } elsif ( $dest =~ /\@/ ) {
+        die "Unparsable username: $dest\n";
+      } else {                 
+        $dusername = $dest;
+        $ddomain = $defaultdomain;
+      }
+      my($dstsvc, $dst) = &svcnum_or_literal($dusername, $ddomain);
+
+      my $svc_forward = new FS::svc_forward ({
+        svcpart => $forward_svcpart,
+        srcsvc => $srcsvc,
+        src    => $src,
+        dstsvc => $dstsvc,
+        dst    => $dst,
+      });
+      my $error = $svc_forward->insert;
+      #my $error = $svc_forward->check;
+      if ( $error ) {
+        die "$rawusername: $rawdest: $error\n";
+      }
+    }
 
-open(ALIASES,"<$aliases_prefix/aliases.import") or die $!;
-while (<ALIASES>) {
-  next if /^\s*#/ || /^\s*$/; #skip comments & blank lines
 
-  #!! handle catchalls!!!
+  } #next entry
 
-  unless ( /^([\w\@\.]+):\s*()\s*$/ ) {
-    warn "Unparsable line: $_";
-    next;
-  }
-  my($rawusername, $rawdest) = ($1, $2)
-
-  my($username, $domain);
-  if ( $rawusername =~ /^(\w+)\@([\w\.]+)$/ ) {
-    $username = $1;
-    $domain = $2;
-  } elsif ( $rawusername =~ /\@/ ) {
-    die "Unparsable username: $rawusername\n";
-  } else {
-    $username = $rawusername;
-    $domain = $defaultdomain;
-  }
+} #next file
+  
+##
+
+sub svcnum_or_literal {
+  my($username, $domain) = @_;
 
-  #find or create svc_acct record
+  my $svc_domain = qsearchs('svc_domain', { 'domain' => $domain } );
+  my $domsvc = $svc_domain ? $svc_domain->svcnum : '';
 
   my @svc_acct = grep { $_->cust_svc->svcpart == $svcpart }
                    qsearch('svc_acct', {
                      'username' => $username,
-                     'domain'   => $domain,
+                     'domsvc'   => $domsvc,
                    });
 
   if ( scalar(@svc_acct) > 1 ) {
     die "multiple sources found for $username\@$domain !\n";
   }
 
-  my $svc_acct;
+  my( $svcnum, $literal ) = ('', '');
   if ( @svc_acct ) {
-    $svc_acct = $svc_acct[0];
+    my $svc_acct = $svc_acct[0];
+    $svcnum = $svc_acct->svcnum;
   } else {
-
-    my $svc_domain = qsearchs('svc_domain', { 'domain' => $domain } );
-    $svc_domain ||= new FS::svc_domain ({
-      'svcpart' => $domain_svcpart,
-      'domain'  => $domain,
-    });
-    unless ( $svc_domain->svcnum ) {
-      my $error = $svc_domain->insert;
-      if ( $error ) {
-        die "can't insert domain: $domain\n";
-      }
-    }
-
-    $svc_acct = new FS::svc_acct ({
-      svcpart => $svcpart,
-      username => $username,
-      domsvc   => $svc_domain->svcnum,
-    });
-    my $error = $svc_acct->insert;
-    if ( $error ) {
-      die "can't insert account: $username\@$domain\n";
-    }
-
+    $literal = "$username\@$domain";
   }
 
-  #!!handle multiple destinations!
-
-  my $svc_forward = new FS::svc_forward ({
-    srcsvc => $svc_acct->srcsvc,
-    dstsvc => 
-    dst    =>
-  });
-  my $error = $svc_forward->insert;
-  if ( $error ) {
-    die "$rawusername: $rawdest: $error\n";
-  }
+  return( $svcnum, $literal );
 
 }
 
-##
-
 sub usage {
   die "Usage:\n\n  sendmail.import user\n";
 }
-- 
cgit v1.2.1


From ab9f512842cf99736a92d8f3c1031e45bacc26fb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Feb 2004 12:27:35 +0000
Subject: adding postfix export

---
 FS/FS/part_export/postfix.pm | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 FS/FS/part_export/postfix.pm

diff --git a/FS/FS/part_export/postfix.pm b/FS/FS/part_export/postfix.pm
new file mode 100644
index 000000000..6d5e449ca
--- /dev/null
+++ b/FS/FS/part_export/postfix.pm
@@ -0,0 +1,7 @@
+package FS::part_export::postfix;
+
+use vars qw(@ISA);
+use FS::part_export::null;
+
+@ISA = qw(FS::part_export::null);
+
-- 
cgit v1.2.1


From f4347a8f8e96f32125575704146bb23b422f9e6b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Feb 2004 13:53:24 +0000
Subject: typo

---
 httemplate/edit/part_svc.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 10e89288f..6868ffd65 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -179,7 +179,7 @@ my %defs = (
       $html .= '<BR><BR>'. table().
                table(). "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
       foreach my $part_export ( @part_export ) {
-        $html .= '<TD><INPUT TYPE="checbox"'.
+        $html .= '<TD><INPUT TYPE="checkbox"'.
                  ' NAME="exportnum'. $part_export->exportnum. '"  VALUE="1" ';
         $html .= 'CHECKED'
           if ( $clone || $part_svc->svcpart ) #null svcpart search causing error
-- 
cgit v1.2.1


From 8c7c167c5287758a16c6e9e57c3bc1c3dc3a1e2b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Feb 2004 14:04:22 +0000
Subject: add postfix export

---
 FS/FS/part_export.pm |  17 +++++++-
 bin/postfix.export   | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100755 bin/postfix.export

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 033840aeb..0d9196171 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -903,6 +903,13 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
                 },
 ;
 
+tie my %postfix_options, 'Tie::IxHash',
+  'user' => { label=>'Remote username', default=>'root' },
+  'aliases' => { label=>'aliases file location', default=>'/etc/aliases' },
+  'virtual' => { label=>'virtual file location', default=>'/etc/postfix/virtual' },
+  'mydomain' => { label=>'local domain', default=>'' },
+;
+
 #export names cannot have dashes...
 %exports = (
   'svc_acct' => {
@@ -1053,7 +1060,7 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
       'desc' => 'Real-time export to SQL-backed mail server',
       'options' => \%sqlmail_options,
       #'nodomain' => 'Y',
-      'notes' => 'Database schema can be made to work with Courier IMAP and Exim.  Others could work but are untested. (...extended description from pc-intouch?...)',
+      'notes' => 'Database schema can be made to work with Courier IMAP and Exim.  Others could work but are untested. (...extended description from fire2wire?...)',
     },
 
     'forward_shellcommands' => {
@@ -1061,6 +1068,14 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
       'options' => \%forward_shellcommands_options,
       'notes' => 'Run remote commands via SSH, for forwards.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="text vpopmail maintenance" onClick=\'this.form.useradd.value = "[ -d /home/vpopmail/domains/$domain/$username ] && { echo \"$destination\" > /home/vpopmail/domains/$domain/$username/.qmail; chown vpopmail:vchkpw /home/vpopmail/domains/$domain/$username/.qmail; }"; this.form.userdel.value = "rm /home/vpopmail/domains/$domain/$username/.qmail"; this.form.usermod.value = "mv /home/vpopmail/domains/$old_domain/$old_username/.qmail /home/vpopmail/domains/$new_domain/$new_username; [ \"$old_destination\" != \"$new_destination\" ] && { echo \"$new_destination\" > /home/vpopmail/domains/$new_domain/$new_username/.qmail; chown vpopmail:vchkpw /home/vpopmail/domains/$new_domain/$new_username/.qmail; }";\'></UL>The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations): <UL><LI><code>$username</code><LI><code>$domain</code><LI><code>$destination</code> - forward destination<LI>All other fields in <a href="../docs/schema.html#svc_forward">svc_forward</a> are also available.</UL>',
     },
+
+    'postfix' => {
+      'desc' => 'Real-time export to Postfix text files',
+      'options' => \%postfix_options,
+      #'nodomain' => 'Y',
+      'notes' => 'Batch export of Postfix aliases and virtual files.  <a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a> must be installed.  Run bin/postfix.export to export the files.',
+    },
+
   },
 
   'svc_www' => {
diff --git a/bin/postfix.export b/bin/postfix.export
new file mode 100755
index 000000000..7894a3ad7
--- /dev/null
+++ b/bin/postfix.export
@@ -0,0 +1,121 @@
+#!/usr/bin/perl -w
+
+use strict;
+#use File::Path;
+use File::Rsync;
+use Net::SSH qw(ssh);
+use FS::UID qw(adminsuidsetup datasrc);
+use FS::Record qw(qsearch); # qsearchs);
+use FS::part_export;
+#use FS::cust_pkg;
+use FS::cust_svc;
+#use FS::svc_domain;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+my $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/postfix";
+mkdir $spooldir, 0700 unless -d $spooldir;
+
+my @exports = qsearch('part_export', { 'exporttype' => 'postfix' } );
+
+my $rsync = File::Rsync->new({
+  rsh     => 'ssh',
+#  dry_run => 1,
+});
+
+foreach my $export ( @exports ) {
+
+  my $machine = $export->machine;
+  my $prefix = "$spooldir/$machine";
+  mkdir $prefix, 0700 unless -d $prefix;
+
+  #construct %domain hash
+
+  my $mydomain = $export->option('mydomain');
+  my %domain;
+  foreach my $svc_forward ( $export->svc_x ) {
+
+    my( $username, $domain );
+    my $srcsvc_acct = $svc_forward->srcsvc_acct;
+    if ( $srcsvc_acct ) {
+      ( $username, $domain ) = ( $srcsvc_acct->username, $srcsvc_acct->domain );
+    } elsif ( $svc_forward->src =~ /([^@]*)\@([^@]+)$/ ) {
+      ( $username, $domain ) = ( $1, $2 );
+    } else {
+      die "bad svc_forward record?  svcnum ". $svc_forward->svcnum. "\n";
+    }
+
+    my( $dusername, $ddomain );
+    my $dstsvc_acct = $svc_forward->dstsvc_acct;
+    if ( $dstsvc_acct ) {
+      $dusername = $dstsvc_acct->username;
+      $ddomain = $dstsvc_acct->domain;
+    } elsif ( $svc_forward->dst =~ /([^@]+)\@([^@]+)$/ ) {
+      ( $dusername, $ddomain ) = ( $1, $2 );
+    } else {
+      die "bad svc_forward record?  svcnum ". $svc_forward->svcnum. "\n";
+    }
+    my $dest;
+    if ( $ddomain eq $mydomain ) {
+      $dest = $dusername;
+    } else {
+      $dest = "$dusername\@$ddomain";
+    }
+
+    push @{$domain{$domain}{$username}}, $dest;
+
+  }
+
+  #write aliases
+
+  my $aliases = delete $domain{$mydomain};
+  open(ALIASES, ">$prefix/aliases") or die "can't open $prefix/aliases: $!";
+  foreach my $alias ( keys %$aliases ) {
+    print ALIASES "$alias: ". join(',', @{ $aliases->{$alias} } ). "\n";
+  }
+  close ALIASES;
+
+  #write virtual
+
+  open(VIRTUAL, ">$prefix/virtual") or die "can't open $prefix/virtual: $!";
+  foreach my $domain ( keys %domain ) {
+    print VIRTUAL "$domain DOMAIN\n";
+    #foreach my $virtual ( sort { $a ne '' <=> $b ne '' } keys %{$domain{$domain}} ) {
+    foreach my $virtual ( sort { ( ($b ne '') <=> ($a ne '') ) || $a cmp $b } keys %{$domain{$domain}} ) {
+      print VIRTUAL "$virtual\@$domain ".
+                    join(',', @{ $domain{$domain}{$virtual} } ). "\n";
+    }
+    print VIRTUAL "\n";
+  }
+  close VIRTUAL;
+
+  #rsync
+
+  my $user = $export->option('user');
+  $rsync->exec( {
+    src     => "$prefix/aliases",
+    dest    => "$user\@$machine:". $export->option('aliases'),
+  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
+#  warn $rsync->out;
+
+  ssh("$user\@$machine", "newaliases");
+#  ssh("$user\@$machine", "postfix reload");
+
+  $rsync->exec( {
+    src     => "$prefix/virtual",
+    dest    => "$user\@$machine:". $export->option('virtual'),
+  } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
+#  warn $rsync->out;
+
+  ssh("$user\@$machine", "postfix reload");
+
+}
+
+# -----
+
+sub usage {
+  die "Usage:\n  postfix.export user\n"; 
+}
+
+
-- 
cgit v1.2.1


From ed9253ea9ea732fa3c827b10bbadf0ff7784c0b2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Feb 2004 18:58:47 +0000
Subject: postfix export

---
 bin/postfix.export | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/postfix.export b/bin/postfix.export
index 7894a3ad7..64d973837 100755
--- a/bin/postfix.export
+++ b/bin/postfix.export
@@ -107,7 +107,7 @@ foreach my $export ( @exports ) {
     dest    => "$user\@$machine:". $export->option('virtual'),
   } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
 #  warn $rsync->out;
-
+  ssh("$user\@$machine", "postmap hash:/etc/postfix/virtual");
   ssh("$user\@$machine", "postfix reload");
 
 }
-- 
cgit v1.2.1


From b5fa7c0c1953139f1fbe0dabf3930871646016b8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Feb 2004 08:12:47 +0000
Subject: implement fallback suspension code

---
 FS/FS/part_export.pm | 10 +++++++---
 FS/FS/svc_Common.pm  | 24 ++++++++++++++++++++++++
 FS/FS/svc_acct.pm    | 28 ++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 0d9196171..8423da299 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -468,18 +468,22 @@ sub _export_delete {
   return "_export_delete: unknown export type ". $self->exporttype;
 }
 
-#fallbacks providing null operations
+#call svcdb-specific fallbacks
 
 sub _export_suspend {
   my $self = shift;
   #warn "warning: _export_suspened unimplemented for". ref($self);
-  '';
+  my $svc_x = shift;
+  my $new = $svc_x->clone_suspended;
+  $self->_export_replace( $new, $svc_x );
 }
 
 sub _export_unsuspend {
   my $self = shift;
   #warn "warning: _export_unsuspend unimplemented for ". ref($self);
-  '';
+  my $svc_x = shift;
+  my $old = $svc_x->clone_kludge_unsuspend;
+  $self->_export_replace( $svc_x, $old );
 }
 
 =back
diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index cadb997da..a154f3f85 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -430,6 +430,30 @@ methods.  Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
 
 sub cancel { ''; }
 
+=item clone_suspended
+
+Constructor used by FS::part_export::_export_suspend fallback.  Stub returning
+same object for svc_ classes which don't implement a suspension fallback
+(everything except svc_acct at the moment).  Document better.
+
+=cut
+
+sub clone_suspended {
+  shift;
+}
+
+=item clone_kludge_unsuspend 
+
+Constructor used by FS::part_export::_export_unsuspend fallback.  Stub returning
+same object for svc_ classes which don't implement a suspension fallback
+(everything except svc_acct at the moment).  Document better.
+
+=cut
+
+sub clone_kludge_unsuspend {
+  shift;
+}
+
 =back
 
 =head1 BUGS
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 9d8566d77..32d87202e 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1061,6 +1061,34 @@ sub radius_groups {
   }
 }
 
+=item clone_suspended
+
+Constructor used by FS::part_export::_export_suspend fallback.  Document
+better.
+
+=cut
+
+sub clone_suspended {
+  my $self = shift;
+  my %hash = $self->hash;
+  $hash{_password} = join('',map($pw_set[ int(rand $#pw_set) ], (0..7) ) );
+  new FS::svc_acct \%hash;
+}
+
+=item clone_kludge_unsuspend 
+
+Constructor used by FS::part_export::_export_unsuspend fallback.  Document
+better.
+
+=cut
+
+sub clone_kludge_unsuspend {
+  my $self = shift;
+  my %hash = $self->hash;
+  $hash{_password} = '';
+  new FS::svc_acct \%hash;
+}
+
 =back
 
 =head1 SUBROUTINES
-- 
cgit v1.2.1


From e386fc15be6edadc7068dcb3e48fc81e37b3774b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Feb 2004 03:50:08 +0000
Subject: formatting

---
 httemplate/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 266708b1e..c223394e9 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -139,7 +139,7 @@ PerlHandler Apache::ASP
 $MLDBM::RemoveTaint = 1;
 &lt;/Perl&gt;
 PerlSetVar&nbsp;Global&nbsp;/usr/local/etc/freeside/asp-global/
-PerlSetVar Debug 2
+PerlSetVar&nbsp;Debug&nbsp;2
 &lt;/Directory&gt;
 </pre></font>
     </ul></td>
-- 
cgit v1.2.1


From 0952f0a9264d575752393a0be1a3d3c6480f96ed Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Feb 2004 04:56:40 +0000
Subject: query strings get passed through sometimes?

---
 FS/FS/CGI.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index f6153761b..86121f02e 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -215,6 +215,7 @@ sub popurl {
   my($up)=@_;
   my $cgi = &FS::UID::cgi;
   my $url = new URI::URL ( $cgi->isa('Apache') ? $cgi->uri : $cgi->url );
+  $url->query('');
   my(@path)=$url->path_components;
   splice @path, 0-$up;
   $url->path_components(@path);
-- 
cgit v1.2.1


From 23c97b258b9b60d558af333166940f11c229f71c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Feb 2004 05:00:11 +0000
Subject: oops, not the right way to blank them

---
 FS/FS/CGI.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 86121f02e..6c7ab78c9 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -215,7 +215,7 @@ sub popurl {
   my($up)=@_;
   my $cgi = &FS::UID::cgi;
   my $url = new URI::URL ( $cgi->isa('Apache') ? $cgi->uri : $cgi->url );
-  $url->query('');
+  $url->query(undef);
   my(@path)=$url->path_components;
   splice @path, 0-$up;
   $url->path_components(@path);
-- 
cgit v1.2.1


From be4f8ca23c7d32350737887144796264b90c4e9d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Feb 2004 05:04:36 +0000
Subject: third time's the charm

---
 FS/FS/CGI.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 6c7ab78c9..8c9b3260a 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -215,7 +215,7 @@ sub popurl {
   my($up)=@_;
   my $cgi = &FS::UID::cgi;
   my $url = new URI::URL ( $cgi->isa('Apache') ? $cgi->uri : $cgi->url );
-  $url->query(undef);
+  $url->query();
   my(@path)=$url->path_components;
   splice @path, 0-$up;
   $url->path_components(@path);
-- 
cgit v1.2.1


From 91ae03f4b1254614ce089dc587cfd7620528384f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Feb 2004 05:11:09 +0000
Subject: kludge around it completely

---
 FS/FS/CGI.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 8c9b3260a..905189e2e 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -214,8 +214,9 @@ Returns current URL with LEVEL levels of path removed from the end (default 0).
 sub popurl {
   my($up)=@_;
   my $cgi = &FS::UID::cgi;
-  my $url = new URI::URL ( $cgi->isa('Apache') ? $cgi->uri : $cgi->url );
-  $url->query();
+  my $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url;
+  $url_string =~ s/\?.*//;
+  my $url = new URI::URL ( $url_string );
   my(@path)=$url->path_components;
   splice @path, 0-$up;
   $url->path_components(@path);
-- 
cgit v1.2.1


From 395e0a932b6728326f8f5242f7f0a82e2dac919d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Feb 2004 10:37:22 +0000
Subject: fix up forward editing for new svc_forward.src field

---
 FS/FS/cust_svc.pm               |  11 +++--
 httemplate/edit/svc_forward.cgi | 104 ++++++++++++++++++++--------------------
 2 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index b74cfd685..0d8a12114 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -281,10 +281,15 @@ sub label {
   if ( $svcdb eq 'svc_acct' ) {
     $tag = $svc_x->email;
   } elsif ( $svcdb eq 'svc_forward' ) {
-    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $svc_x->srcsvc } );
-    $tag = $svc_acct->email. '->';
+    if ( $svc_x->srcsvc ) {
+      my $svc_acct = $svc_x->srcsvc_acct;
+      $tag = $svc_acct->email;
+    } else {
+      $tag = $svc_x->src;
+    }
+    $tag .= '->';
     if ( $svc_x->dstsvc ) {
-      $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $svc_x->dstsvc } );
+      my $svc_acct = $svc_x->dstsvc_acct;
       $tag .= $svc_acct->email;
     } else {
       $tag .= $svc_x->dst;
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 0d815b9e5..c323fa29e 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -58,20 +58,17 @@ if ( $cgi->param('error') ) {
 my $action = $svc_forward->svcnum ? 'Edit' : 'Add';
 
 my %email;
+
+#starting with those currently attached
+foreach my $method (qw( srcsvc_acct dstsvc_acct )) {
+  my $svc_acct = $svc_forward->$method();
+  $email{$svc_acct->svcnum} = $svc_acct->email if $svc_acct;
+}
+
 if ($pkgnum) {
 
   #find all possible user svcnums (and emails)
 
-  #starting with those currently attached
-  if ( $svc_forward->srcsvc ) {
-    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $svc_forward->srcsvc } );
-    $email{$svc_forward->srcsvc} = $svc_acct->email;
-  }
-  if ( $svc_forward->dstsvc ) {
-    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $svc_forward->dstsvc } );
-    $email{$svc_forward->dstsvc} = $svc_acct->email;
-  }
-
   #and including the rest for this customer
   my($u_part_svc,@u_acct_svcparts);
   foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
@@ -98,15 +95,7 @@ if ($pkgnum) {
     }
   }
 
-} elsif ( $action eq 'Edit' ) {
-
-  my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svc_forward->srcsvc});
-  $email{$svc_forward->srcsvc} = $svc_acct->email;
-
-  $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svc_forward->dstsvc});
-  $email{$svc_forward->dstsvc} = $svc_acct->email;
-
-} else {
+} elsif ( $action eq 'Add' ) {
   die "\$action eq Add, but \$pkgnum is null!\n";
 }
 
@@ -115,6 +104,7 @@ my($srcsvc,$dstsvc,$dst)=(
   $svc_forward->dstsvc,
   $svc_forward->dst,
 );
+my $src = $svc_forward->dbdef_table->column('src') ? $svc_forward->src : '';
 
 #display
 
@@ -130,46 +120,54 @@ my($srcsvc,$dstsvc,$dst)=(
 Service #<%= $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
 Service: <B><%= $part_svc->svc %></B><BR><BR>
 
-<FORM NAME="dummy">
+<FORM ACTION="process/svc_forward.cgi" METHOD="POST">
+<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
+<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
+<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
+
+<SCRIPT TYPE="text/javascript">
+function srcchanged(what) {
+  if ( what.options[what.selectedIndex].value == 0 ) {
+    what.form.src.disabled = false;
+  } else {
+    what.form.src.disabled = true;
+  }
+}
+function dstchanged(what) {
+  if ( what.options[what.selectedIndex].value == 0 ) {
+    what.form.dst.disabled = false;
+  } else {
+    what.form.dst.disabled = true;
+  }
+}
+</SCRIPT>
 
 <%= ntable("#cccccc",2) %>
-<TR><TD ALIGN="right">Email to</TD><TD><SELECT NAME="srcsvc" SIZE=1>
+<TR><TD ALIGN="right">Email to</TD>
+<TD><SELECT NAME="srcsvc" SIZE=1 onChange="srcchanged(this)">
 <% foreach $_ (keys %email) { %>
   <OPTION<%= $_ eq $srcsvc ? " SELECTED" : "" %> VALUE="<%= $_ %>"><%= $email{$_} %></OPTION>
 <% } %>
-</SELECT></TD></TR>
-
-<%
-  tie my %tied_email, 'Tie::IxHash',
-    ''  => 'SELECT DESTINATION',
-    %email,
-    '0' => '(other email address)';
-  my $widget = new HTML::Widgets::SelectLayers(
-    'selected_layer' => $dstsvc,
-    'options'        => \%tied_email,
-    'form_name'      => 'dummy',
-    'form_action'    => 'process/svc_forward.cgi',
-    'form_select'    => ['srcsvc'],
-    'html_between'   => '</TD></TR></TABLE>',
-    'layer_callback' => sub {
-      my $layer = shift;
-      my $html = qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!.
-                 qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!.
-                 qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!.
-                 qq!<INPUT TYPE="hidden" NAME="dstsvc" VALUE="$layer">!;
-      if ( $layer eq '0' ) {
-        $html .= ntable("#cccccc",2).
-                 '<TR><TD ALIGN="right">Destination email</TD>'.
-                 qq!<TD><INPUT TYPE="text" NAME="dst" VALUE="$dst"></TD>!.
-                 '</TR></TABLE>';
-      }
-      $html .= '<BR><INPUT TYPE="submit" VALUE="Submit">';
-      $html;
-    },
-  );
-%>
+<% if ( $svc_forward->dbdef_table->column('src') ) { %>
+  <OPTION <%= $src ? 'SELECTED' : '' %> VALUE="0">(other email address)</OPTION>
+<% } %>
+</SELECT>
+<% if ( $svc_forward->dbdef_table->column('src') ) { %>
+<INPUT TYPE="text" NAME="src" VALUE="<%= $src %>" <%= ( $src || !scalar(%email) ) ? '' : 'DISABLED' %>>
+<% } %>
+</TD></TR>
 
 <TR><TD ALIGN="right">Forwards to</TD>
-<TD><%= $widget->html %>
+<TD><SELECT NAME="dstsvc" SIZE=1 onChange="dstchanged(this)">
+<% foreach $_ (keys %email) { %>
+  <OPTION<%= $_ eq $dstsvc ? " SELECTED" : "" %> VALUE="<%= $_ %>"><%= $email{$_} %></OPTION>
+<% } %>
+<OPTION <%= $dst ? 'SELECTED' : '' %> VALUE="0">(other email address)</OPTION>
+</SELECT>
+<INPUT TYPE="text" NAME="dst" VALUE="<%= $dst %>" <%= ( $dst || !scalar(%email) ) ? '' : 'DISABLED' %>>
+</TD></TR>
+    </TABLE>
+<BR><INPUT TYPE="submit" VALUE="Submit">
+</FORM>
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From 1fe4c2f04162ea5082ded078ee9c1b8b4a86c4af Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Feb 2004 03:32:16 +0000
Subject: allow replace with no arguments

---
 FS/FS/Record.pm | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index b950e306b..4a3cbe791 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -806,7 +806,24 @@ returns the error, otherwise returns false.
 =cut
 
 sub replace {
-  my ( $new, $old ) = ( shift, shift );
+  my $new = shift;
+
+  my $old;
+  if ( @_ ) { 
+    $old = shift;
+  } else {
+    warn "[debug]$me replace called with no arguments; autoloading old record\n"
+     if $DEBUG;
+    my $primary_key = $new->dbdef_table->primary_key;
+    if ( $primary_key ) {
+      $old = qsearchs($new->table, { $primary_key => $new->$primary_key() } )
+        or croak "can't find ". $new->table. ".$primary_key ".
+                 $new->$primary_key();
+    } else {
+      croak $new->table. " has no primary key; pass old record as argument";
+    }
+  }
+
   warn "[debug]$me $new ->replace $old\n" if $DEBUG;
 
   return "Records not in same table!" unless $new->table eq $old->table;
-- 
cgit v1.2.1


From 8d581f6199c27147f417f73cc9f58260efabf327 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Feb 2004 04:01:30 +0000
Subject: double quotes are not ASP

---
 httemplate/edit/svc_forward.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index c323fa29e..2e6c5f1a0 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -121,9 +121,9 @@ Service #<%= $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
 Service: <B><%= $part_svc->svc %></B><BR><BR>
 
 <FORM ACTION="process/svc_forward.cgi" METHOD="POST">
-<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
-<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
-<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
+<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%= $svcnum %>">
+<INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%= $pkgnum %>">
+<INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $svcpart %>">
 
 <SCRIPT TYPE="text/javascript">
 function srcchanged(what) {
-- 
cgit v1.2.1


From 68b54c10131ae55a6ac537673fa70ac103fed22b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Feb 2004 19:21:28 +0000
Subject: correct cancel link s/account/mail forward/

---
 httemplate/view/svc_forward.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index c2ce164d1..650972429 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -28,7 +28,7 @@ print header('Mail Forward View', menubar(
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
         "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )
-    : ( "Cancel this (unaudited) account" =>
+    : ( "Cancel this (unaudited) mail forward" =>
           "${p}misc/cancel-unaudited.cgi?$svcnum" )
   ),
   "Main menu" => $p,
-- 
cgit v1.2.1


From 63113ba6bc9324734fdc6bb5355476e6a49321cb Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Fri, 27 Feb 2004 21:21:51 +0000
Subject: When next_free_addr returned undef, we were trying to call addr on an
 undefined object.  That's not good.

---
 FS/FS/svc_broadband.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index ec915327b..77898066d 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -155,8 +155,10 @@ sub check {
   if($self->speed_down < 0) { return 'speed_down must be positive'; }
 
   if (not($self->ip_addr) or $self->ip_addr eq '0.0.0.0') {
-    $self->ip_addr($self->addr_block->next_free_addr->addr);
-    if (not $self->ip_addr) {
+    my $next_addr = $self->addr_block->next_free_addr;
+    if ($next_addr) {
+      $self->ip_addr($next_addr->addr);
+    } else {
       return "No free addresses in addr_block (blocknum: ".$self->blocknum.")";
     }
   }
-- 
cgit v1.2.1


From 916ed88ae0aa126941d4f6135a98298dac55eade Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 28 Feb 2004 22:26:35 +0000
Subject: depend on DBIx::DBSchema 0.23 and thus DBD::Pg 1.32, finally closes
 Bug#639

---
 FS/FS/Record.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 4a3cbe791..801b89daf 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -9,7 +9,7 @@ use Carp qw(carp cluck croak confess);
 use File::CounterFile;
 use Locale::Country;
 use DBI qw(:sql_types);
-use DBIx::DBSchema 0.21;
+use DBIx::DBSchema 0.23;
 use FS::UID qw(dbh getotaker datasrc driver_name);
 use FS::SearchCache;
 use FS::Msgcat qw(gettext);
-- 
cgit v1.2.1


From 0574d1e2d7144a597940edf7c37a2cdb30d2dcac Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 28 Feb 2004 22:36:53 +0000
Subject: update

---
 install/redhat/7.3/INSTALL | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/install/redhat/7.3/INSTALL b/install/redhat/7.3/INSTALL
index 8eff42bfc..6befc05f6 100644
--- a/install/redhat/7.3/INSTALL
+++ b/install/redhat/7.3/INSTALL
@@ -11,4 +11,23 @@ perl -MCPAN -e"install Locale::Country, Net::Whois, Business::CreditCard, \
                        String::Approx, Text::Template, DBIx::DataSource, \
                        DBIx::DBSchema, Net::SSH, String::ShellQuote, \
                        Net::SCP, Apache::ASP, Tie::IxHash, Time::Duration, \
-                       HTML::Widgets::SelectLayers,  Apache::DBI"
+                       HTML::Widgets::SelectLayers, Apache::DBI, Cache::Cache"
+
+useradd freeside
+
+chkconfig postgresql on
+/etc/init.d/postgresql start
+
+su postgres -c "createuser -P freeside"
+
+su freeside -c "createdb freeside"
+
+#?
+cd ../..
+make install-perl-modules
+make create-config
+freeside-adduser -c -h /usr/local/etc/freeside/htpasswd ivan
+su freeside -c 'freeside-setup ivan'
+su freeside -c '/home/ivan/freeside/bin/populate-msgcat ivan'
+make deploy
+
-- 
cgit v1.2.1


From 862e93b33e28428121a611ff5fda048cd9fbcd96 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 28 Feb 2004 22:40:17 +0000
Subject: new setuptax and recurtax fields

---
 httemplate/edit/process/cust_main_county.cgi | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
index 6d80ad512..9287ed150 100755
--- a/httemplate/edit/process/cust_main_county.cgi
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -7,11 +7,15 @@ foreach ( grep { /^tax\d+$/ } $cgi->param ) {
     or die "Couldn't find taxnum $taxnum!";
   next unless    $old->tax           != $cgi->param("tax$taxnum")
               || $old->exempt_amount != $cgi->param("exempt_amount$taxnum")
-              || $old->taxname       ne $cgi->param("taxname$taxnum");
+              || $old->taxname       ne $cgi->param("taxname$taxnum")
+              || $old->setuptax      ne $cgi->param("setuptax$taxnum")
+              || $old->recurtax      ne $cgi->param("recurtax$taxnum");
   my %hash = $old->hash;
   $hash{tax} = $cgi->param("tax$taxnum");
   $hash{exempt_amount} = $cgi->param("exempt_amount$taxnum");
   $hash{taxname} = $cgi->param("taxname$taxnum");
+  $hash{setuptax} = $cgi->param("setuptax$taxnum");
+  $hash{recurtax} = $cgi->param("recurtax$taxnum");
   my $new = new FS::cust_main_county \%hash;
   my $error = $new->replace($old);
   if ( $error ) {
-- 
cgit v1.2.1


From 33979d5fd9923e2378bc2239f6c4e6857834fa3f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 28 Feb 2004 22:40:41 +0000
Subject: style

---
 httemplate/edit/process/cust_main_county-collapse.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/process/cust_main_county-collapse.cgi b/httemplate/edit/process/cust_main_county-collapse.cgi
index 8e67140a8..5da9dea80 100755
--- a/httemplate/edit/process/cust_main_county-collapse.cgi
+++ b/httemplate/edit/process/cust_main_county-collapse.cgi
@@ -3,8 +3,8 @@
 my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/ or die "Illegal taxnum!";
 my $taxnum = $1;
-my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
-  or die ("Unknown taxnum!");
+my $cust_main_county = qsearchs('cust_main_county', { 'taxnum' => $taxnum } )
+  or die "Unknown taxnum $taxnum";
 
 #really should do this in a .pm & start transaction
 
-- 
cgit v1.2.1


From d384acea721092aebd4ffd972a2c3a80208e80ae Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 28 Feb 2004 22:43:18 +0000
Subject: Apache::ASP 2.55 required

---
 htetc/global.asa                   | 1 +
 httemplate/docs/install.html       | 1 +
 httemplate/docs/upgrade-1.4.2.html | 1 +
 3 files changed, 3 insertions(+)

diff --git a/htetc/global.asa b/htetc/global.asa
index e4661c3cb..8027ae3e5 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -4,6 +4,7 @@ BEGIN { eval "use Devel::AutoProfiler;"; } #only if installed...
 
 use strict;
 use vars qw( $cgi $p );
+use Apache::ASP 2.55;
 use CGI 2.47;
 #use CGI::Carp qw(fatalsToBrowser);
 use Date::Format;
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index c223394e9..ed306f2d3 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -140,6 +140,7 @@ $MLDBM::RemoveTaint = 1;
 &lt;/Perl&gt;
 PerlSetVar&nbsp;Global&nbsp;/usr/local/etc/freeside/asp-global/
 PerlSetVar&nbsp;Debug&nbsp;2
+PerlSetVar&nbsp;RequestBinaryRead&nbsp;Off
 &lt;/Directory&gt;
 </pre></font>
     </ul></td>
diff --git a/httemplate/docs/upgrade-1.4.2.html b/httemplate/docs/upgrade-1.4.2.html
index ea6ebe92b..1feaa803a 100644
--- a/httemplate/docs/upgrade-1.4.2.html
+++ b/httemplate/docs/upgrade-1.4.2.html
@@ -10,6 +10,7 @@
   <li>Install <a href="http://search.cpan.org/search?dist=IPC-ShareLite">IPC::ShareLite</a>
   <li>Install <a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML::Widgets::SelectLayers</a> 0.03.
   <li>CGI.pm minimum version 2.47 is required.  You will probably need to install a current CGI.pm from CPAN if you are using Perl 5.005 or earlier.
+  <li>If using Apache::ASP, add <code>PerlSetVar RequestBinaryRead Off</code> to your Apache configuration and make sure you are using Apache::ASP minimum version 2.55.
   <li>Run <code>make aspdocs</code> or <code>make masondocs</code>.
   <li>Copy <code>aspdocs/</code> or <code>masondocs/</code> to your web server's document space.
   <li>Run <code>make install-perl-modules</code>.
-- 
cgit v1.2.1


From df0031f3804d380f5c87113a72997e989c168f9a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 28 Feb 2004 22:47:33 +0000
Subject: credit where the typeset invoices came from!

---
 CREDITS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CREDITS b/CREDITS
index 9bc917acc..592be445a 100644
--- a/CREDITS
+++ b/CREDITS
@@ -116,5 +116,9 @@ things I'm probably forgetting.
 Contains "JS Calendar" v0.9.3 <http://dynarch.com/mishoo/calendar.epl>
 by Mihai Bazon <mishoo@infoiasi.ro> licensed under the terms of the GNU LGPL.
 
+Latex invoice template based on a template from eBills
+<http://ebills.sourceforge.net/> by Mark Asplen-Taylor <mark@asplen.co.uk>,
+licensed under the terms fo the GNU GPL.
+
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
-- 
cgit v1.2.1


From 0ef43f5dc2f3ccce6f4a4b236e87f23ba413c8a8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 28 Feb 2004 22:48:36 +0000
Subject: minor fixes

---
 FS/FS/cust_pkg.pm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 5700b654e..c2182118f 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1,7 +1,7 @@
 package FS::cust_pkg;
 
 use strict;
-use vars qw(@ISA $disable_agentcheck);
+use vars qw(@ISA $disable_agentcheck $DEBUG);
 use FS::UID qw( getotaker dbh );
 use FS::Record qw( qsearch qsearchs );
 use FS::Misc qw( send_email );
@@ -25,6 +25,8 @@ use FS::Conf;
 
 @ISA = qw( FS::Record );
 
+$DEBUG = 0;
+
 $disable_agentcheck = 0;
 
 sub _cache {
@@ -614,7 +616,7 @@ sub attribute_since_sqlradacct {
 
 Transfers as many services as possible from this package to another package.
 The destination package must already exist.  Services are moved only if 
-the destination allows services with the correct I<svcnum> (not svcdb).  
+the destination allows services with the correct I<svcpart> (not svcdb).  
 Any services that can't be moved remain in the original package.
 
 Returns an error, if there is one; otherwise, returns the number of services 
@@ -726,13 +728,16 @@ newly-created cust_pkg objects.
 =cut
 
 sub order {
-
-  # Rewritten to make use of the transfer() method, and in general 
-  # to not suck so badly.
-
   my ($custnum, $pkgparts, $remove_pkgnum, $return_cust_pkg) = @_;
 
   # Transactionize this whole mess
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE'; 
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE'; 
+  local $SIG{PIPE} = 'IGNORE'; 
+
   my $oldAutoCommit = $FS::UID::AutoCommit;
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
-- 
cgit v1.2.1


From 8590c9bef767a6eb95e9b8ba1f940d82d7193093 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 28 Feb 2004 22:49:14 +0000
Subject: adding

---
 FS/t/acct_snarf.t | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 FS/t/acct_snarf.t

diff --git a/FS/t/acct_snarf.t b/FS/t/acct_snarf.t
new file mode 100644
index 000000000..642760f20
--- /dev/null
+++ b/FS/t/acct_snarf.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::acct_snarf;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From 48f9101feea57bf75d85ea17e7cd3fb786bbd040 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 28 Feb 2004 22:57:37 +0000
Subject: s/cleanwhisker/pouncequick/

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index a37c7e4c9..72b3e58ff 100644
--- a/Makefile
+++ b/Makefile
@@ -185,8 +185,8 @@ clean:
 #these are probably only useful if you're me...
 
 upload-docs: forcehtmlman
-	ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
-	scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs
+	ssh pouncequick.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
+	scp -pr httemplate/docs pouncequick.420.am:/var/www/www.sisd.com/freeside/devdocs
 
 release: upload-docs
 	cd /home/ivan/freeside
@@ -197,7 +197,7 @@ release: upload-docs
 	cvs export -r ${TAG} -d freeside-${VERSION} freeside
 	tar czvf freeside-${VERSION}.tar.gz freeside-${VERSION}
 
-	scp freeside-${VERSION}.tar.gz ivan@cleanwhisker.420.am:/var/www/sisd.420.am/freeside/
+	scp freeside-${VERSION}.tar.gz ivan@pouncequick.420.am:/var/www/sisd.420.am/freeside/
 	mv freeside-${VERSION} freeside-${VERSION}.tar.gz ..
 
 update-webdemo:
-- 
cgit v1.2.1


From 4594b30617c2759dc38a51a1ea23a336abbeb24a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 28 Feb 2004 23:06:13 +0000
Subject: for now

---
 httemplate/docs/ieak.html | 75 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 httemplate/docs/ieak.html

diff --git a/httemplate/docs/ieak.html b/httemplate/docs/ieak.html
new file mode 100644
index 000000000..00c53423c
--- /dev/null
+++ b/httemplate/docs/ieak.html
@@ -0,0 +1,75 @@
+<pre>
+this is incomplete
+mostly it should be merged into signup.html and fs_signup/ieak.template
+
+- download and install the IEAK from
+  http://www.microsoft.com/windows/ieak/default.asp
+
+- Good examples may be found in 
+  C:\Program Files\IEAK\toolkit\isp\server\ICW\signup\perl\signup08.pl
+  C:\Program Files\IEAK\toolkit\isp\server\ICW\reconfig\perl\reconfig04.pl
+  C:\Program Files\IEAK6\toolkit\isp\servless\basic\sample.ins
+  C:\Program Files\IEAK6\toolkit\isp\servless\advanced\4567.ins
+  C:\Program Files\IEAK6\toolkit\isp\servless\advanced\4568.ins
+  C:\Program Files\IEAK6\toolkit\isp\servless\advanced\7890.ins
+  C:\Program Files\IEAK6\toolkit\isp\servless\advanced\7891.ins
+
+- Full documentation on all the settings available in .INS files is
+  avaialble under Program Files | Microsoft IEAK 6 | IEAK Help 
+                  | Reference | Internet Settings (.ins) Files
+
+- Freeside will make the following substitutions before sending the file
+  to the user:
+
+  { $ac }         - area code of selected POP
+  { $exch }       - exchange of selected POP
+  { $loc }        - local part of selected POP
+  { $username }
+  { $password }
+  { $email_name } - first and last name
+  { $pkg }        - package name
+
+- Simple example follows:
+
+[Entry]
+Entry Name = IEAK Sample
+[Phone]
+Dial_As_Is = No
+Phone_Number = { $exch }{ $loc }
+Area_Code = { $ac }
+Country_Code = 1
+Country_Id = 1
+[Server]
+Type = PPP
+SW_Compress = Yes
+PW_Encrypt = Yes
+Negotiate_TCP/IP = Yes
+Disable_LCP = No
+[TCP/IP]
+Specity_IP_Address = No
+Specity_Server_Address = No
+IP_Header_Compress = Yes
+Gateway_On_Remote = Yes
+[User]
+Name = { $username }
+Passowrd = { $password }
+Display_Password = Yes
+[Internet_Mail]
+Email_Name = { $email_name }
+Email_Address = { $username }@example.com
+POP_Server = mail.example.com
+POP_Server_Port_Number = 110
+POP_Logon_Password = { $password }
+SMTP_Server = mail.example.com
+SMTP_Server_Port_Number = 25
+Install_Mail = 1
+[URL]
+Help_Page = http://www.ieaksample.net/helpdesk
+Home_Page = http://www.ieaksample.net
+Search_Page = http://www.ieaksample,net/search
+[Favorites]
+IEAK Sample \\ IEAK Sample Home Page.url = http://acme.ieaksample.net/
+[Branding]
+Window_Title = Internet Explorer from Acme Internet Services
+
+</pre>
-- 
cgit v1.2.1


From f4247c22a77543afa76f4bc81281bdda71f776cf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Mar 2004 06:20:20 +0000
Subject: grey out inactive text boxes as well as disable them (IE doesn't grey
 out disabled text dialogs)

---
 httemplate/edit/svc_forward.cgi | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 2e6c5f1a0..2b9d35ad1 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -129,15 +129,19 @@ Service: <B><%= $part_svc->svc %></B><BR><BR>
 function srcchanged(what) {
   if ( what.options[what.selectedIndex].value == 0 ) {
     what.form.src.disabled = false;
+    what.form.src.style.backgroundColor = "white";
   } else {
     what.form.src.disabled = true;
+    what.form.src.style.backgroundColor = "lightgrey";
   }
 }
 function dstchanged(what) {
   if ( what.options[what.selectedIndex].value == 0 ) {
     what.form.dst.disabled = false;
+    what.form.dst.style.backgroundColor = "white";
   } else {
     what.form.dst.disabled = true;
+    what.form.dst.style.backgroundColor = "lightgrey";
   }
 }
 </SCRIPT>
@@ -153,7 +157,7 @@ function dstchanged(what) {
 <% } %>
 </SELECT>
 <% if ( $svc_forward->dbdef_table->column('src') ) { %>
-<INPUT TYPE="text" NAME="src" VALUE="<%= $src %>" <%= ( $src || !scalar(%email) ) ? '' : 'DISABLED' %>>
+<INPUT TYPE="text" NAME="src" VALUE="<%= $src %>" <%= ( $src || !scalar(%email) ) ? '' : 'DISABLED STYLE="background-color: lightgrey"' %>>
 <% } %>
 </TD></TR>
 
@@ -164,7 +168,7 @@ function dstchanged(what) {
 <% } %>
 <OPTION <%= $dst ? 'SELECTED' : '' %> VALUE="0">(other email address)</OPTION>
 </SELECT>
-<INPUT TYPE="text" NAME="dst" VALUE="<%= $dst %>" <%= ( $dst || !scalar(%email) ) ? '' : 'DISABLED' %>>
+<INPUT TYPE="text" NAME="dst" VALUE="<%= $dst %>" <%= ( $dst || !scalar(%email) ) ? '' : 'DISABLED STYLE="background-color: lightgrey"' %>>
 </TD></TR>
     </TABLE>
 <BR><INPUT TYPE="submit" VALUE="Submit">
-- 
cgit v1.2.1


From c65b166b6e2ebdac5c2eb2e8336ebd1a4087f77c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Mar 2004 13:42:08 +0000
Subject: fix welcome emails being sent to signup server declined accounts,
 closes: Bug#743

---
 FS/FS/ClientAPI/Signup.pm | 37 +++++++++++++++++++++++----
 FS/FS/cust_main.pm        | 64 +++++++++++++++++++++++++++++++++--------------
 FS/FS/cust_pkg.pm         |  3 +++
 FS/FS/queue.pm            | 47 +++++++++++++++++++++++++++++++---
 FS/FS/svc_Common.pm       | 62 ++++++++++++++++++++++++++++++++++++++-------
 FS/FS/svc_acct.pm         | 36 +++++++++++++++++++++++---
 FS/FS/svc_broadband.pm    |  8 +++++-
 FS/FS/svc_domain.pm       | 10 ++++++--
 FS/FS/svc_external.pm     | 60 ++++++++++++++++++++++++--------------------
 FS/FS/svc_forward.pm      | 10 ++++++--
 FS/FS/svc_www.pm          | 11 ++++++--
 11 files changed, 274 insertions(+), 74 deletions(-)

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 375958b9c..4655b0984 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -4,6 +4,7 @@ use strict;
 use Tie::RefHash;
 use FS::Conf;
 use FS::Record qw(qsearch qsearchs dbdef);
+use FS::Msgcat qw(gettext);
 use FS::agent;
 use FS::cust_main_county;
 use FS::part_pkg;
@@ -12,7 +13,7 @@ use FS::cust_main;
 use FS::cust_pkg;
 use FS::svc_acct;
 use FS::acct_snarf;
-use FS::Msgcat qw(gettext);
+use FS::queue;
 
 use FS::ClientAPI; #hmm
 FS::ClientAPI->register_handlers(
@@ -171,7 +172,8 @@ sub new_customer {
 
   my @acct_snarf;
   my $snarfnum = 1;
-  while ( length($packet->{"snarf_machine$snarfnum"}) ) {
+  while (    exists($packet->{"snarf_machine$snarfnum"})
+          && length($packet->{"snarf_machine$snarfnum"}) ) {
     my $acct_snarf = new FS::acct_snarf ( {
       'machine'   => $packet->{"snarf_machine$snarfnum"},
       'protocol'  => $packet->{"snarf_protocol$snarfnum"},
@@ -189,12 +191,28 @@ sub new_customer {
   $error = $svc_acct->check;
   return { 'error' => $error } if $error;
 
+  #setup a job dependancy to delay provisioning
+  my $placeholder = new FS::queue ( {
+    'job'    => 'FS::ClientAPI::Signup::__placeholder',
+    'status' => 'locked',
+  } );
+  $error = $placeholder->insert;
+  return { 'error' => $error } if $error;
+
   use Tie::RefHash;
   tie my %hash, 'Tie::RefHash';
   %hash = ( $cust_pkg => [ $svc_acct ] );
   #msgcat
-  $error = $cust_main->insert( \%hash, \@invoicing_list, 'noexport' => 1 );
-  return { 'error' => $error } if $error;
+  $error = $cust_main->insert(
+    \%hash,
+    \@invoicing_list,
+    'depend_jobnum' => $placeholder->jobnum,
+  );
+  if ( $error ) {
+    my $perror = $placeholder->delete;
+    $error .= " (Additionally, error removing placeholder: $perror)" if $perror;
+    return { 'error' => $error };
+  }
 
   if ( $conf->exists('signup_server-realtime') ) {
 
@@ -222,11 +240,20 @@ sub new_customer {
       local $FS::svc_Common::noexport_hack = 1;
       $cust_main->cancel('quiet'=>1);
 
+      my $perror = $placeholder->depended_delete;
+      warn "error removing provisioning jobs after decline: $perror" if $perror;
+      unless ( $perror ) {
+        $perror = $placeholder->delete;
+        warn "error removing placeholder after decline: $perror" if $perror;
+      }
+
       return { 'error' => '_decline' };
     }
 
   }
-  $cust_main->reexport;
+
+  $error = $placeholder->delete;
+  return { 'error' => $error } if $error;
 
   return { error => '' };
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 6ca32871d..a9fcb2b66 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1,7 +1,7 @@
 package FS::cust_main;
 
 use strict;
-use vars qw( @ISA $conf $Debug $import );
+use vars qw( @ISA $conf $DEBUG $import );
 use vars qw( $realtime_bop_decline_quiet ); #ugh
 use Safe;
 use Carp;
@@ -42,8 +42,8 @@ use FS::Msgcat qw(gettext);
 
 $realtime_bop_decline_quiet = 0;
 
-$Debug = 0;
-#$Debug = 1;
+$DEBUG = 0;
+#$DEBUG = 1;
 
 $import = 0;
 
@@ -232,10 +232,16 @@ invoicing_list destination to the newly-created svc_acct.  Here's an example:
 
   $cust_main->insert( {}, [ $email, 'POST' ] );
 
-Currently available options are: I<noexport>
+Currently available options are: I<depend_jobnum> and I<noexport>.
 
-If I<noexport> is set true, no provisioning jobs (exports) are scheduled.
-(You can schedule them later with the B<reexport> method.)
+If I<depend_jobnum> is set, all provisioning jobs will have a dependancy
+on the supplied jobnum (they will not run until the specific job completes).
+This can be used to defer provisioning until some action completes (such
+as running the customer's credit card sucessfully).
+
+The I<noexport> option is deprecated.  If I<noexport> is set true, no
+provisioning jobs (exports) are scheduled.  (You can schedule them later with
+the B<reexport> method.)
 
 =cut
 
@@ -244,6 +250,9 @@ sub insert {
   my $cust_pkgs = @_ ? shift : {};
   my $invoicing_list = @_ ? shift : '';
   my %options = @_;
+  warn "FS::cust_main::insert called with options ".
+       join(', ', map { "$_: $options{$_}" } keys %options ). "\n"
+    if $DEBUG;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -295,7 +304,6 @@ sub insert {
   }
 
   # packages
-  #local $FS::svc_Common::noexport_hack = 1 if $options{'noexport'};
   $error = $self->order_pkgs($cust_pkgs, \$seconds, %options);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
@@ -330,7 +338,7 @@ sub insert {
 
 }
 
-=item order_pkgs HASHREF, [ , OPTION => VALUE ... ] ]
+=item order_pkgs HASHREF, [ SECONDSREF, [ , OPTION => VALUE ... ] ]
 
 Like the insert method on an existing record, this method orders a package
 and included services atomicaly.  Pass a Tie::RefHash data structure to this
@@ -343,14 +351,20 @@ be a better explanation of this, but until then, here's an example:
     $cust_pkg => [ $svc_acct ],
     ...
   );
-  $cust_main->order_pkgs( \%hash, 'noexport'=>1 );
+  $cust_main->order_pkgs( \%hash, \'0', 'noexport'=>1 );
+
+Currently available options are: I<depend_jobnum> and I<noexport>.
 
-Currently available options are: I<noexport>
+If I<depend_jobnum> is set, all provisioning jobs will have a dependancy
+on the supplied jobnum (they will not run until the specific job completes).
+This can be used to defer provisioning until some action completes (such
+as running the customer's credit card sucessfully).
 
-If I<noexport> is set true, no provisioning jobs (exports) are scheduled.
-(You can schedule them later with the B<reexport> method for each
-cust_pkg object.  Using the B<reexport> method on the cust_main object is not
-recommended, as existing services will also be reexported.)
+The I<noexport> option is deprecated.  If I<noexport> is set true, no
+provisioning jobs (exports) are scheduled.  (You can schedule them later with
+the B<reexport> method for each cust_pkg object.  Using the B<reexport> method
+on the cust_main object is not recommended, as existing services will also be
+reexported.)
 
 =cut
 
@@ -359,6 +373,12 @@ sub order_pkgs {
   my $cust_pkgs = shift;
   my $seconds = shift;
   my %options = @_;
+  my %svc_options = ();
+  $svc_options{'depend_jobnum'} = $options{'depend_jobnum'}
+    if exists $options{'depend_jobnum'};
+  warn "FS::cust_main::order_pkgs called with options ".
+       join(', ', map { "$_: $options{$_}" } keys %options ). "\n"
+    if $DEBUG;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -386,7 +406,7 @@ sub order_pkgs {
         $svc_something->seconds( $svc_something->seconds + $$seconds );
         $$seconds = 0;
       }
-      $error = $svc_something->insert;
+      $error = $svc_something->insert(%svc_options);
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
         #return "inserting svc_ (transaction rolled back): $error";
@@ -401,6 +421,9 @@ sub order_pkgs {
 
 =item reexport
 
+This method is deprecated.  See the I<depend_jobnum> option to the insert and
+order_pkgs methods for a better way to defer provisioning.
+
 Re-schedules all exports by calling the B<reexport> method of all associated
 packages (see L<FS::cust_pkg>).  If there is an error, returns the error;
 otherwise returns false.
@@ -410,6 +433,9 @@ otherwise returns false.
 sub reexport {
   my $self = shift;
 
+  carp "warning: FS::cust_main::reexport is deprectated; ".
+       "use the depend_jobnum option to insert or order_pkgs to delay export";
+
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE';
@@ -1474,7 +1500,7 @@ sub collect {
   my $dbh = dbh;
 
   my $balance = $self->balance;
-  warn "collect customer". $self->custnum. ": balance $balance" if $Debug;
+  warn "collect customer". $self->custnum. ": balance $balance" if $DEBUG;
   unless ( $balance > 0 ) { #redundant?????
     $dbh->rollback if $oldAutoCommit; #hmm
     return '';
@@ -1500,7 +1526,7 @@ sub collect {
     last if $self->balance <= 0;
 
     warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ")"
-      if $Debug;
+      if $DEBUG;
 
     foreach my $part_bill_event (
       sort {    $a->seconds   <=> $b->seconds
@@ -1521,7 +1547,7 @@ sub collect {
            || $self->balance   <= 0; # or if balance<=0
 
       warn "calling invoice event (". $part_bill_event->eventcode. ")\n"
-        if $Debug;
+        if $DEBUG;
       my $cust_main = $self; #for callback
 
       my $error;
@@ -1659,7 +1685,7 @@ I<quiet> can be set true to surpress email decline notices.
 
 sub realtime_bop {
   my( $self, $method, $amount, %options ) = @_;
-  if ( $Debug ) {
+  if ( $DEBUG ) {
     warn "$self $method $amount\n";
     warn "  $_ => $options{$_}\n" foreach keys %options;
   }
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index c2182118f..d60e95b78 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -669,6 +669,9 @@ sub transfer {
 
 =item reexport
 
+This method is deprecated.  See the I<depend_jobnum> option to the insert and
+order_pkgs methods in FS::cust_main for a better way to defer provisioning.
+
 =cut
 
 sub reexport {
diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index 634f7f4bd..9dcb2e3be 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -1,7 +1,7 @@
 package FS::queue;
 
 use strict;
-use vars qw( @ISA @EXPORT_OK $conf $jobnums);
+use vars qw( @ISA @EXPORT_OK $DEBUG $conf $jobnums);
 use Exporter;
 use FS::UID;
 use FS::Conf;
@@ -14,6 +14,9 @@ use FS::cust_svc;
 @ISA = qw(FS::Record);
 @EXPORT_OK = qw( joblisting );
 
+$DEBUG = 0;
+#$DEBUG = 1;
+
 $FS::UID::callback{'FS::queue'} = sub {
   $conf = new FS::Conf;
 };
@@ -120,7 +123,10 @@ sub insert {
     }
   }
 
-  push @$jobnums, $self->jobnum if $jobnums;
+  if ( $jobnums ) {
+    warn "jobnums global is active: $jobnums\n" if $DEBUG;
+    push @$jobnums, $self->jobnum;
+  }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
@@ -239,6 +245,7 @@ sub cust_svc {
 =item queue_depend
 
 Returns the FS::queue_depend objects associated with this job, if any.
+(Dependancies that must complete before this job can be run).
 
 =cut
 
@@ -247,7 +254,6 @@ sub queue_depend {
   qsearch('queue_depend', { 'jobnum' => $self->jobnum } );
 }
 
-
 =item depend_insert OTHER_JOBNUM
 
 Inserts a dependancy for this job - it will not be run until the other job
@@ -268,6 +274,39 @@ sub depend_insert {
   $queue_depend->insert;
 }
 
+=item queue_depended
+
+Returns the FS::queue_depend objects that associate other jobs with this job,
+if any.  (The jobs that are waiting for this job to complete before they can
+run).
+
+=cut
+
+sub queue_depended {
+  my $self = shift;
+  qsearch('queue_depend', { 'depend_jobnum' => $self->jobnum } );
+}
+
+=item depended_delete
+
+Deletes the other queued jobs (FS::queue objects) that are waiting for this
+job, if any.  If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub depended_delete {
+  my $self = shift;
+  my $error;
+  foreach my $job (
+    map { qsearchs('queue', { 'jobnum' => $_->jobnum } ) } $self->queue_depended
+  ) {
+    $error = $job->depended_delete;
+    return $error if $error;
+    $error = $job->delete;
+    return $error if $error
+  }
+}
+
 =back
 
 =head1 SUBROUTINES
@@ -385,7 +424,7 @@ END
 
 =head1 VERSION
 
-$Id: queue.pm,v 1.16 2003-08-05 00:20:46 khoff Exp $
+$Id: queue.pm,v 1.17 2004-03-03 13:42:08 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index a154f3f85..a22326696 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -1,7 +1,7 @@
 package FS::svc_Common;
 
 use strict;
-use vars qw( @ISA $noexport_hack );
+use vars qw( @ISA $noexport_hack $DEBUG );
 use FS::Record qw( qsearch qsearchs fields dbh );
 use FS::cust_svc;
 use FS::part_svc;
@@ -9,6 +9,9 @@ use FS::queue;
 
 @ISA = qw( FS::Record );
 
+$DEBUG = 0;
+#$DEBUG = 1;
+
 =head1 NAME
 
 FS::svc_Common - Object method for all svc_ records
@@ -82,7 +85,7 @@ sub check {
   $self->SUPER::check;
 }
 
-=item insert [ JOBNUM_ARRAYREF [ OBJECTS_ARRAYREF ] ]
+=item insert [ , OPTION => VALUE ... ]
 
 Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
@@ -90,19 +93,36 @@ otherwise returns false.
 The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
 defined.  An FS::cust_svc record will be created and inserted.
 
-If an arrayref is passed as parameter, the B<jobnum>s of any export jobs will
-be added to the array.
+Currently available options are: I<jobnums>, I<child_objects> and
+I<depend_jobnum>.
+
+If I<jobnum> is set to an array reference, the jobnums of any export jobs will
+be added to the referenced array.
+
+If I<child_objects> is set to an array reference of FS::tablename objects (for
+example, FS::acct_snarf objects), they will have their svcnum fieldsset and
+will be inserted after this record, but before any exports are run.
 
-If an arrayref of FS::tablename objects (for example, FS::acct_snarf objects)
-is passed as the optional second parameter, they will have their svcnum fields
-set and will be inserted after this record, but before any exports are run.
+If I<depend_jobnum> is set (to a scalar jobnum or an array reference of
+jobnums), all provisioning jobs will have a dependancy on the supplied
+jobnum(s) (they will not run until the specific job(s) complete(s)).
 
 =cut
 
 sub insert {
   my $self = shift;
-  local $FS::queue::jobnums = shift if @_;
-  my $objects = scalar(@_) ? shift : [];
+  my %options = @_;
+  warn "FS::svc_Common::insert called with options ".
+     join(', ', map { "$_: $options{$_}" } keys %options ). "\n"
+  if $DEBUG;
+
+  my @jobnums = ();
+  local $FS::queue::jobnums = \@jobnums;
+  warn "FS::svc_Common::insert: set \$FS::queue::jobnums to $FS::queue::jobnums"
+    if $DEBUG;
+  my $objects = $options{'child_objects'} || [];
+  my $depend_jobnums = $options{'depend_jobnum'} || [];
+  $depend_jobnums = [ $depend_jobnums ] unless ref($depend_jobnums);
   my $error;
 
   local $SIG{HUP} = 'IGNORE';
@@ -162,6 +182,10 @@ sub insert {
 
   #new-style exports!
   unless ( $noexport_hack ) {
+
+    warn "FS::svc_Common::insert: \$FS::queue::jobnums is $FS::queue::jobnums"
+      if $DEBUG;
+
     foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
       my $error = $part_export->export_insert($self);
       if ( $error ) {
@@ -170,6 +194,26 @@ sub insert {
                " (transaction rolled back): $error";
       }
     }
+
+    foreach my $depend_jobnum ( @$depend_jobnums ) {
+      warn "inserting dependancies on supplied job $depend_jobnum\n"
+        if $DEBUG;
+      foreach my $jobnum ( @jobnums ) {
+        my $queue = qsearchs('queue', { 'jobnum' => $jobnum } );
+        warn "inserting dependancy for job $jobnum on $depend_jobnum\n"
+          if $DEBUG;
+        my $error = $queue->depend_insert($depend_jobnum);
+        if ( $error ) {
+          $dbh->rollback if $oldAutoCommit;
+          return "error queuing job dependancy: $error";
+        }
+      }
+    }
+
+  }
+
+  if ( exists $options{'jobnums'} ) {
+    push @{ $options{'jobnums'} }, @jobnums;
   }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 32d87202e..d84240f36 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -33,6 +33,7 @@ use FS::Msgcat qw(gettext);
 @ISA = qw( FS::svc_Common );
 
 $DEBUG = 0;
+#$DEBUG = 1;
 $me = '[FS::svc_acct]';
 
 #ask FS::UID to run this stuff for us later
@@ -176,7 +177,7 @@ Creates a new account.  To add the account to the database, see L<"insert">.
 
 sub table { 'svc_acct'; }
 
-=item insert
+=item insert [ , OPTION => VALUE ... ]
 
 Adds this account to the database.  If there is an error, returns the error,
 otherwise returns false.
@@ -193,15 +194,21 @@ should contain an arrayref of FS::tablename objects.  They will have their
 svcnum fields set and will be inserted after this record, but before any
 exports are run.
 
+Currently available options are: I<depend_jobnum>
+
+If I<depend_jobnum> is set (to a scalar jobnum or an array reference of
+jobnums), all provisioning jobs will have a dependancy on the supplied
+jobnum(s) (they will not run until the specific job(s) complete(s)).
+
 (TODOC: L<FS::queue> and L<freeside-queued>)
 
 (TODOC: new exports!)
 
-
 =cut
 
 sub insert {
   my $self = shift;
+  my %options = @_;
   my $error;
 
   local $SIG{HUP} = 'IGNORE';
@@ -325,7 +332,11 @@ sub insert {
   #see?  i told you it was more complicated
 
   my @jobnums;
-  $error = $self->SUPER::insert(\@jobnums, $self->child_objects || [] );
+  $error = $self->SUPER::insert(
+    'jobnums'       => \@jobnums,
+    'child_objects' => $self->child_objects,
+    %options,
+  );
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
@@ -395,6 +406,22 @@ sub insert {
           return "error queuing welcome email: $error";
         }
 
+        if ( $options{'depend_jobnum'} ) {
+          warn "$me depend_jobnum found; adding to welcome email dependancies"
+            if $DEBUG;
+          if ( ref($options{'depend_jobnum'}) ) {
+            warn "$me adding jobs ". join(', ', @{$options{'depend_jobnum'}} ).
+                 "to welcome email dependancies"
+              if $DEBUG;
+            push @jobnums, @{ $options{'depend_jobnum'} };
+          } else {
+            warn "$me adding job $options{'depend_jobnum'} ".
+                 "to welcome email dependancies"
+              if $DEBUG;
+            push @jobnums, $options{'depend_jobnum'};
+          }
+        }
+
         foreach my $jobnum ( @jobnums ) {
           my $error = $wqueue->depend_insert($jobnum);
           if ( $error ) {
@@ -1264,6 +1291,9 @@ counterintuitive.
 radius_usergroup_selector?  putting web ui components in here?  they should
 probably live somewhere else...
 
+insertion of RADIUS group stuff in insert could be done with child_objects now
+(would probably clean up export of them too)
+
 =head1 SEE ALSO
 
 L<FS::svc_Common>, edit/part_svc.cgi from an installed web interface,
diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index 77898066d..aaac891e6 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -87,7 +87,7 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 sub table { 'svc_broadband'; }
 
-=item insert
+=item insert [ , OPTION => VALUE ... ]
 
 Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
@@ -95,6 +95,12 @@ otherwise returns false.
 The additional fields pkgnum and svcpart (see FS::cust_svc) should be 
 defined.  An FS::cust_svc record will be created and inserted.
 
+Currently available options are: I<depend_jobnum>
+
+If I<depend_jobnum> is set (to a scalar jobnum or an array reference of
+jobnums), all provisioning jobs will have a dependancy on the supplied
+jobnum(s) (they will not run until the specific job(s) complete(s)).
+
 =cut
 
 # Standard FS::svc_Common::insert
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 10d5d8f5c..c88b3e668 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -86,7 +86,7 @@ Creates a new domain.  To add the domain to the database, see L<"insert">.
 
 sub table { 'svc_domain'; }
 
-=item insert
+=item insert [ , OPTION => VALUE ... ]
 
 Adds this domain to the database.  If there is an error, returns the error,
 otherwise returns false.
@@ -112,6 +112,12 @@ If any records are defined in the I<defaultrecords> configuration file,
 appropriate records are added to the domain_record table (see
 L<FS::domain_record>).
 
+Currently available options are: I<depend_jobnum>
+
+If I<depend_jobnum> is set (to a scalar jobnum or an array reference of
+jobnums), all provisioning jobs will have a dependancy on the supplied
+jobnum(s) (they will not run until the specific job(s) complete(s)).
+
 =cut
 
 sub insert {
@@ -145,7 +151,7 @@ sub insert {
     return "Domain not found (see whois)";
   }
 
-  $error = $self->SUPER::insert;
+  $error = $self->SUPER::insert(@_);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
diff --git a/FS/FS/svc_external.pm b/FS/FS/svc_external.pm
index fe4ea1d67..b97e12b47 100644
--- a/FS/FS/svc_external.pm
+++ b/FS/FS/svc_external.pm
@@ -69,7 +69,7 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 sub table { 'svc_external'; }
 
-=item insert
+=item insert [ , OPTION => VALUE ... ]
 
 Adds this external service to the database.  If there is an error, returns the
 error, otherwise returns false.
@@ -77,17 +77,23 @@ error, otherwise returns false.
 The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
 defined.  An FS::cust_svc record will be created and inserted.
 
-=cut
+Currently available options are: I<depend_jobnum>
 
-sub insert {
-  my $self = shift;
-  my $error;
+If I<depend_jobnum> is set (to a scalar jobnum or an array reference of
+jobnums), all provisioning jobs will have a dependancy on the supplied
+jobnum(s) (they will not run until the specific job(s) complete(s)).
 
-  $error = $self->SUPER::insert;
-  return $error if $error;
+=cut
 
-  '';
-}
+#sub insert {
+#  my $self = shift;
+#  my $error;
+#
+#  $error = $self->SUPER::insert(@_);
+#  return $error if $error;
+#
+#  '';
+#}
 
 =item delete
 
@@ -95,15 +101,15 @@ Delete this record from the database.
 
 =cut
 
-sub delete {
-  my $self = shift;
-  my $error;
-
-  $error = $self->SUPER::delete;
-  return $error if $error;
-
-  '';
-}
+#sub delete {
+#  my $self = shift;
+#  my $error;
+#
+#  $error = $self->SUPER::delete;
+#  return $error if $error;
+#
+#  '';
+#}
 
 
 =item replace OLD_RECORD
@@ -113,15 +119,15 @@ returns the error, otherwise returns false.
 
 =cut
 
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-  my $error;
-
-  $error = $new->SUPER::replace($old);
-  return $error if $error;
-
-  '';
-}
+#sub replace {
+#  my ( $new, $old ) = ( shift, shift );
+#  my $error;
+#
+#  $error = $new->SUPER::replace($old);
+#  return $error if $error;
+#
+#  '';
+#}
 
 =item suspend
 
diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index b9e8ff8f7..b8d55fecb 100644
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -68,7 +68,7 @@ database, see L<"insert">.
 
 sub table { 'svc_forward'; }
 
-=item insert
+=item insert [ , OPTION => VALUE ... ]
 
 Adds this mail forwarding alias to the database.  If there is an error, returns
 the error, otherwise returns false.
@@ -76,6 +76,12 @@ the error, otherwise returns false.
 The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
 defined.  An FS::cust_svc record will be created and inserted.
 
+Currently available options are: I<depend_jobnum>
+
+If I<depend_jobnum> is set (to a scalar jobnum or an array reference of
+jobnums), all provisioning jobs will have a dependancy on the supplied
+jobnum(s) (they will not run until the specific job(s) complete(s)).
+
 =cut
 
 sub insert {
@@ -96,7 +102,7 @@ sub insert {
   $error = $self->check;
   return $error if $error;
 
-  $error = $self->SUPER::insert;
+  $error = $self->SUPER::insert(@_);
   if ($error) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
diff --git a/FS/FS/svc_www.pm b/FS/FS/svc_www.pm
index 7e8908346..6c276a198 100644
--- a/FS/FS/svc_www.pm
+++ b/FS/FS/svc_www.pm
@@ -74,7 +74,7 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 sub table { 'svc_www'; }
 
-=item insert
+=item insert [ , OPTION => VALUE ... ]
 
 Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
@@ -82,6 +82,13 @@ otherwise returns false.
 The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
 defined.  An FS::cust_svc record will be created and inserted.
 
+Currently available options are: I<depend_jobnum>
+
+If I<depend_jobnum> is set (to a scalar jobnum or an array reference of
+jobnums), all provisioning jobs will have a dependancy on the supplied
+jobnum(s) (they will not run until the specific job(s) complete(s)).
+
+
 =cut
 
 sub insert {
@@ -124,7 +131,7 @@ sub insert {
     $self->recnum($domain_record->recnum);
   }
 
-  $error = $self->SUPER::insert;
+  $error = $self->SUPER::insert(@_);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
-- 
cgit v1.2.1


From 24b5d695250eb0e93d50f35d0fa46776223d2a68 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Mar 2004 16:32:08 +0000
Subject: fix for case where no .fetchmailrc should be create and fetchmail
 should not be run

---
 bin/create-fetchmailrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/create-fetchmailrc b/bin/create-fetchmailrc
index e92971140..11bde0ce3 100644
--- a/bin/create-fetchmailrc
+++ b/bin/create-fetchmailrc
@@ -22,6 +22,8 @@ my $filename = "$homedir/.fetchmailrc";
 my $gid = scalar(getgrnam($username)) or die "can't find $username's gid\n";
 my $uid = scalar(getpwnam($username)) or die "can't find $username's uid\n";
 
+exit unless $ARGV[0];
+
 open(FETCHMAILRC, ">$filename") or die "can't open $filename: $!\n";
 chown $uid, $gid, $filename     or die "can't chown $uid.$gid $filename: $!\n";
 chmod 0600, $filename           or die "can't chmod 600 $filename: $!\n";
-- 
cgit v1.2.1


From 1b15d4bbb47875129b8da15331b118a6ad6727f3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Mar 2004 05:59:16 +0000
Subject: fix -v

---
 FS/bin/freeside-daily | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 5fb966665..00de2987a 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -16,7 +16,7 @@ my $user = shift or die &usage;
 
 adminsuidsetup $user;
 
-$FS::cust_main::Debug = 1 if $opt_v;
+$FS::cust_main::DEBUG = 1 if $opt_v;
 
 my %search;
 $search{'payby'} = $opt_p if $opt_p;
-- 
cgit v1.2.1


From 654234a526b5447ec02970962cccb1cf879796c8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Mar 2004 14:34:24 +0000
Subject: beginning of OO reporting interface, create acadia-requested crosstab
 reports

---
 FS/FS/Report.pm                       |  46 ++++++++++
 FS/FS/Report/Table.pm                 |  27 ++++++
 FS/FS/Report/Table/Monthly.pm         | 166 ++++++++++++++++++++++++++++++++++
 FS/MANIFEST                           |   6 ++
 FS/t/Report-Table-Monthly.t           |   5 +
 FS/t/Report-Table.t                   |   5 +
 FS/t/Report.t                         |   5 +
 htetc/global.asa                      |   1 +
 htetc/handler.pl                      |   1 +
 httemplate/graph/money_time-graph.cgi | 116 ++++++++----------------
 httemplate/graph/money_time.cgi       |  60 +++++++++++-
 11 files changed, 356 insertions(+), 82 deletions(-)
 create mode 100644 FS/FS/Report.pm
 create mode 100644 FS/FS/Report/Table.pm
 create mode 100644 FS/FS/Report/Table/Monthly.pm
 create mode 100644 FS/t/Report-Table-Monthly.t
 create mode 100644 FS/t/Report-Table.t
 create mode 100644 FS/t/Report.t

diff --git a/FS/FS/Report.pm b/FS/FS/Report.pm
new file mode 100644
index 000000000..181fea2f6
--- /dev/null
+++ b/FS/FS/Report.pm
@@ -0,0 +1,46 @@
+package FS::Report;
+
+use strict;
+
+=head1 NAME
+
+FS::Report - Report data objects
+
+=head1 SYNOPSIS
+
+  #see the more speicific report objects, currently only FS::Report::Table
+
+=head1 DESCRIPTION
+
+See the more specific report objects, currently only FS::Report::Table
+
+=head1 METHODS
+
+=over 4
+
+=item new [ OPTION => VALUE ... ]
+
+Constructor.  Takes a list of options and their values.
+
+=cut
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = @_ ? ( ref($_[0]) ? shift : { @_ } ) : {};
+  bless( $self, $class );
+}
+
+=back
+
+=head1 BUGS
+
+Documentation.
+
+=head1 SEE ALSO
+
+L<FS::Report::Table>, reports in the web interface.
+
+=cut
+
+1;
diff --git a/FS/FS/Report/Table.pm b/FS/FS/Report/Table.pm
new file mode 100644
index 000000000..9f636fa43
--- /dev/null
+++ b/FS/FS/Report/Table.pm
@@ -0,0 +1,27 @@
+package FS::Report::Table;
+
+use strict;
+use vars qw( @ISA );
+use FS::Report;
+
+@ISA = qw( FS::Report );
+
+=head1 NAME
+
+FS::Report::Table - Tables of report data
+
+=head1 SYNOPSIS
+
+See the more specific report objects, currently only FS::Report::Table::Monthly
+
+=head1 BUGS
+
+Documentation.
+
+=head1 SEE ALSO
+
+L<FS::Report::Table::Monthly>, reports in the web interface.
+
+=cut
+
+1;
diff --git a/FS/FS/Report/Table/Monthly.pm b/FS/FS/Report/Table/Monthly.pm
new file mode 100644
index 000000000..9aebeee3d
--- /dev/null
+++ b/FS/FS/Report/Table/Monthly.pm
@@ -0,0 +1,166 @@
+package FS::Report::Table::Monthly;
+
+use strict;
+use vars qw( @ISA );
+use Time::Local;
+use FS::UID qw( dbh );
+use FS::Report::Table;
+
+@ISA = qw( FS::Report::Table );
+
+=head1 NAME
+
+FS::Report::Table::Monthly - Tables of report data, indexed monthly
+
+=head1 SYNOPSIS
+
+  use FS::Report::Table::Monthly;
+
+  my $report = new FS::Report::Table (
+    'items' => [ 'invoiced', 'netsales', 'credits', 'receipts', ],
+    'start_month' => 4,
+    'start_year'  => 2000,
+    'end_month'   => 4,
+    'end_year'    => 2020,
+  );
+
+  my $data = $report->data;
+
+=head1 METHODS
+
+=over 4
+
+=item data
+
+Returns a hashref of data (!! describe)
+
+=cut
+
+sub data {
+  my $self = shift;
+
+  my $smonth = $self->{'start_month'};
+  my $syear = $self->{'start_year'};
+  my $emonth = $self->{'end_month'};
+  my $eyear = $self->{'end_year'};
+
+  my %data;
+
+  while ( $syear < $eyear || ( $syear == $eyear && $smonth < $emonth+1 ) ) {
+
+    push @{$data{label}}, "$smonth/$syear";
+
+    my $speriod = timelocal(0,0,0,1,$smonth-1,$syear);
+    if ( ++$smonth == 13 ) { $syear++; $smonth=1; }
+    my $eperiod = timelocal(0,0,0,1,$smonth-1,$syear);
+  
+    foreach my $item ( @{$self->{'items'}} ) {
+      push @{$data{$item}}, $self->$item($speriod, $eperiod);
+    }
+
+  }
+
+  \%data;
+
+}
+
+sub invoiced { #invoiced
+  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
+  $self->scalar_sql("
+    SELECT SUM(charged) FROM cust_bill
+    WHERE ". $self->in_time_period($speriod, $eperiod)
+  );
+}
+
+sub netsales { #net sales
+  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
+
+  my $credited = $self->scalar_sql("
+    SELECT SUM(cust_credit_bill.amount)
+    FROM cust_credit_bill, cust_bill
+    WHERE cust_bill.invnum = cust_credit_bill.invnum
+      AND ".  $self->in_time_period($speriod, $eperiod, 'cust_bill')
+  );
+
+  #horrible local kludge
+  my $expenses = $self->scalar_sql("
+    SELECT SUM(cust_bill_pkg.setup)
+    FROM cust_bill_pkg, cust_bill, cust_pkg, part_pkg
+    WHERE cust_bill.invnum = cust_bill_pkg.invnum
+    AND ". $self->in_time_period($speriod, $eperiod, 'cust_bill'). "
+    AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum
+    AND cust_pkg.pkgpart = part_pkg.pkgpart
+    AND LOWER(part_pkg.pkg) LIKE 'expense _%'
+  ");
+
+  $self->invoiced($speriod,$eperiod)-$credited-$expenses;
+}
+
+#deferred revenue
+
+sub receipts { #cashflow
+  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
+
+  #cashflow
+  my $paid = $self->scalar_sql("
+    SELECT SUM(paid) FROM cust_pay
+    WHERE ". $self->in_time_period($speriod, $eperiod)
+  );
+
+  my $refunded = $self->scalar_sql("
+    SELECT SUM(refund) FROM cust_refund
+    WHERE ". $self->in_time_period($speriod, $eperiod)
+  );
+
+  #horrible local kludge that doesn't even really work right
+  my $expenses = $self->scalar_sql("
+    SELECT SUM(cust_bill_pay.amount)
+    FROM cust_bill_pay, cust_bill
+    WHERE cust_bill_pay.invnum = cust_bill.invnum
+    AND ". $self->in_time_period($speriod, $eperiod, 'cust_bill_pay'). "
+    AND 0 < ( SELECT COUNT(*) from cust_bill_pkg, cust_pkg, part_pkg
+              WHERE cust_bill.invnum = cust_bill_pkg.invnum
+              AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum
+              AND cust_pkg.pkgpart = part_pkg.pkgpart
+              AND LOWER(part_pkg.pkg) LIKE 'expense _%'
+            )
+  ");
+  #    my $expenses_sql2 = "SELECT SUM(cust_bill_pay.amount) FROM cust_bill_pay, cust_bill_pkg, cust_bill, cust_pkg, part_pkg WHERE cust_bill_pay.invnum = cust_bill.invnum AND cust_bill.invnum = cust_bill_pkg.invnum AND cust_bill_pay._date >= $speriod AND cust_bill_pay._date < $eperiod AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum AND cust_pkg.pkgpart = part_pkg.pkgpart AND LOWER(part_pkg.pkg) LIKE 'expense _%'";
+  
+  $paid-$refunded-$expenses;
+}
+
+sub credits {
+  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
+  $self->scalar_sql("
+    SELECT SUM(amount) FROM cust_credit
+    WHERE ". $self->in_time_period($speriod, $eperiod)
+  );
+}
+
+sub in_time_period {
+  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
+  my $table = @_ ? shift().'.' : '';
+  "${table}_date >= $speriod AND ${table}_date < $eperiod";
+}
+
+sub scalar_sql {
+  my( $self, $sql ) = ( shift, shift );
+  my $sth = dbh->prepare($sql) or die dbh->errstr;
+  $sth->execute
+    or die "Unexpected error executing statement $sql: ". $sth->errstr;
+  $sth->fetchrow_arrayref->[0] || 0;
+}
+
+=back
+
+=head1 BUGS
+
+Documentation.
+
+=head1 SEE ALSO
+
+=cut
+
+1;
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 3cbf0e91f..555509a41 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -37,6 +37,9 @@ FS/Conf.pm
 FS/ConfItem.pm
 FS/Misc.pm
 FS/Record.pm
+FS/Report.pm
+FS/Report/Table.pm
+FS/Report/Table/Monthly.pm
 FS/SearchCache.pm
 FS/UI/Base.pm
 FS/UI/CGI.pm
@@ -128,6 +131,9 @@ t/Conf.t
 t/ConfItem.t
 t/Misc.t
 t/Record.t
+t/Report.pm
+t/Report-Table.pm
+t/Report-Table-Monthly.pm
 t/UID.t
 t/Msgcat.t
 t/SearchCache.t
diff --git a/FS/t/Report-Table-Monthly.t b/FS/t/Report-Table-Monthly.t
new file mode 100644
index 000000000..6ff365d1c
--- /dev/null
+++ b/FS/t/Report-Table-Monthly.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::Report::Table::Monthly;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/Report-Table.t b/FS/t/Report-Table.t
new file mode 100644
index 000000000..866d4981e
--- /dev/null
+++ b/FS/t/Report-Table.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::Report::Table;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/Report.t b/FS/t/Report.t
new file mode 100644
index 000000000..76d6ea489
--- /dev/null
+++ b/FS/t/Report.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::Report;
+$loaded=1;
+print "ok 1\n";
diff --git a/htetc/global.asa b/htetc/global.asa
index 8027ae3e5..5652a6f4f 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -24,6 +24,7 @@ use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
                small_custview myexit http_header);
 use FS::Msgcat qw(gettext geterror);
 use FS::Misc qw( send_email );
+use FS::Report::Table::Monthly;
 
 use FS::agent;
 use FS::agent_type;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 618c5856f..0301d98d1 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -81,6 +81,7 @@ sub handler
                      small_custview myexit http_header);
       use FS::Msgcat qw(gettext geterror);
       use FS::Misc qw( send_email );
+      use FS::Report::Table::Monthly;
 
       use FS::agent;
       use FS::agent_type;
diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi
index 76f1bd7bd..55e8982b4 100755
--- a/httemplate/graph/money_time-graph.cgi
+++ b/httemplate/graph/money_time-graph.cgi
@@ -10,98 +10,56 @@ my $smonth = $cgi->param('smonth') || $curmon+1;
 #find last month
 my $eyear = $cgi->param('eyear') || 1900+$curyear;
 my $emonth = $cgi->param('emonth') || $curmon+1;
-if ( $emonth++>12 ) { $emonth-=12; $eyear++; }
+#if ( $emonth++>12 ) { $emonth-=12; $eyear++; }
 
-my @labels;
-my %data;
+#my @labels;
+#my %data;
 
-while ( $syear < $eyear || ( $syear == $eyear && $smonth < $emonth ) ) {
-  push @labels, "$smonth/$syear";
-
-  my $speriod = timelocal(0,0,0,1,$smonth-1,$syear);
-  if ( ++$smonth == 13 ) { $syear++; $smonth=1; }
-  my $eperiod = timelocal(0,0,0,1,$smonth-1,$syear);
-
-  my $where = "WHERE _date >= $speriod AND _date < $eperiod";
-
-  # Invoiced
-  my $charged_sql = "SELECT SUM(charged) FROM cust_bill $where";
-  my $charged_sth = dbh->prepare($charged_sql) or die dbh->errstr;
-  $charged_sth->execute or die $charged_sth->errstr;
-  my $charged = $charged_sth->fetchrow_arrayref->[0] || 0;
-
-  push @{$data{charged}}, $charged;
-
-  #accounts receivable
-#  my $ar_sql2 = "SELECT SUM(amount) FROM cust_credit $where";
-  my $credited_sql = "SELECT SUM(cust_credit_bill.amount) FROM cust_credit_bill, cust_bill WHERE cust_bill.invnum = cust_credit_bill.invnum AND cust_bill._date >= $speriod AND cust_bill._date < $eperiod";
-  my $credited_sth = dbh->prepare($credited_sql) or die dbh->errstr;
-  $credited_sth->execute or die $credited_sth->errstr;
-  my $credited = $credited_sth->fetchrow_arrayref->[0] || 0;
-
-    #horrible local kludge
-    my $expenses_sql = "SELECT SUM(cust_bill_pkg.setup) FROM cust_bill_pkg, cust_bill, cust_pkg, part_pkg WHERE cust_bill.invnum = cust_bill_pkg.invnum AND cust_bill._date >= $speriod AND cust_bill._date < $eperiod AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum AND cust_pkg.pkgpart = part_pkg.pkgpart AND LOWER(part_pkg.pkg) LIKE 'expense _%'";
-    my $expenses_sth = dbh->prepare($expenses_sql) or die dbh->errstr;
-    $expenses_sth->execute or die $expenses_sth->errstr;
-    my $expenses = $expenses_sth->fetchrow_arrayref->[0] || 0;
-
-  push @{$data{ar}}, $charged-$credited-$expenses;
-
-  #deferred revenue
-#  push @{$data{defer}}, '0';
-
-  #cashflow
-  my $paid_sql = "SELECT SUM(paid) FROM cust_pay $where";
-  my $paid_sth = dbh->prepare($paid_sql) or die dbh->errstr;
-  $paid_sth->execute or die $paid_sth->errstr;
-  my $paid = $paid_sth->fetchrow_arrayref->[0] || 0;
-
-  my $refunded_sql = "SELECT SUM(refund) FROM cust_refund $where";
-  my $refunded_sth = dbh->prepare($refunded_sql) or die dbh->errstr;
-  $refunded_sth->execute or die $refunded_sth->errstr;
-  my $refunded = $refunded_sth->fetchrow_arrayref->[0] || 0;
-
-    #horrible local kludge that doesn't even really work right
-    my $expenses_sql2 = "SELECT SUM(cust_bill_pay.amount) FROM cust_bill_pay, cust_bill WHERE cust_bill_pay.invnum = cust_bill.invnum AND cust_bill_pay._date >= $speriod AND cust_bill_pay._date < $eperiod AND 0 < ( select count(*) from cust_bill_pkg, cust_pkg, part_pkg WHERE cust_bill.invnum = cust_bill_pkg.invnum AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum AND cust_pkg.pkgpart = part_pkg.pkgpart AND LOWER(part_pkg.pkg) LIKE 'expense _%' )";
-
-#    my $expenses_sql2 = "SELECT SUM(cust_bill_pay.amount) FROM cust_bill_pay, cust_bill_pkg, cust_bill, cust_pkg, part_pkg WHERE cust_bill_pay.invnum = cust_bill.invnum AND cust_bill.invnum = cust_bill_pkg.invnum AND cust_bill_pay._date >= $speriod AND cust_bill_pay._date < $eperiod AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum AND cust_pkg.pkgpart = part_pkg.pkgpart AND LOWER(part_pkg.pkg) LIKE 'expense _%'";
-    my $expenses_sth2 = dbh->prepare($expenses_sql2) or die dbh->errstr;
-    $expenses_sth2->execute or die $expenses_sth2->errstr;
-    my $expenses2 = $expenses_sth2->fetchrow_arrayref->[0] || 0;
-
-  push @{$data{cash}}, $paid-$refunded-$expenses2;
+my @items = qw( invoiced netsales credits receipts );
+my %label = (
+ 'invoiced' => 'Gross Sales (invoiced)', 
+ 'netsales' => 'Net Sales (invoiced - applied credits)',
+ 'credits'  => 'Credits',
+ 'receipts' => 'Receipts/Cashflow (payments - refunds)',
+);
+my %color = (
+  'invoiced' => [ 153, 153, 255 ], #light blue
+  'netsales' => [   0,   0, 204 ], #blue
+  'credits'  => [ 204,   0,   0 ], #red
+  'receipts' => [   0, 204,   0 ], #green
+);
 
-}
+my $report = new FS::Report::Table::Monthly (
+  'items' => \@items,
+  'start_month' => $smonth,
+  'start_year'  => $syear,
+  'end_month'   => $emonth,
+  'end_year'    => $eyear,
+);
+my %data = %{$report->data};
 
 #my $chart = Chart::LinesPoints->new(1024,480);
-my $chart = Chart::LinesPoints->new(768,480);
+#my $chart = Chart::LinesPoints->new(768,480);
+my $chart = Chart::LinesPoints->new(976,384);
 
+my $d = 0;
 $chart->set(
   #'min_val' => 0,
   'legend' => 'bottom',
-  'legend_labels' => [ #'Invoiced (cust_bill)',
-                       'Accounts receivable (invoices - applied credits)',
-                       #'Deferred revenue',
-                       'Actual cashflow (payments - refunds)' ],
+  'colors' => { ( map { 'dataset'.$d++ => $color{$_} } @items ),
+                #'grey_background' => [ 211, 211, 211 ],
+                'grey_background' => 'white',
+                'background' => [ 0xe8, 0xe8, 0xe8 ], #grey
+              },
+  #'grey_background' => 'false',
+  'legend_labels' => [ map { $label{$_} } @items ],
+  'brush_size' => 4,
+  #'pt_size' => 12,
 );
 
-my @data = ( \@labels,
-             #map $data{$_}, qw( ar defer cash )
-             #map $data{$_}, qw( charged ar cash )
-             map $data{$_}, qw( ar cash )
-           );
-
-#my $gd = $chart->plot(\@data);
-#open (IMG, ">i_r_c.png");
-#print IMG $gd->png;
-#close IMG;
-
-#$chart->png("i_r_c.png", \@data);
-
-#$chart->cgi_png(\@data);
+my @data = map { $data{$_} } ( 'label', @items );
 
 http_header('Content-Type' => 'image/png' );
-#$Response->{ContentType} = 'image/png';
 
 $chart->_set_colors();
 
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index de8f6ee0c..14af0f246 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -19,9 +19,63 @@ my $emonth = $cgi->param('emonth') || $curmon+1;
     <TITLE>Graphing monetary values over time</TITLE>
   </HEAD>
 <BODY BGCOLOR="#e8e8e8">
-<IMG SRC="money_time-graph.cgi?<%= $cgi->query_string %>" WIDTH="768" HEIGHT="480">
+<IMG SRC="money_time-graph.cgi?<%= $cgi->query_string %>" WIDTH="976" HEIGHT="384">
+<BR>
+
+<%= table('e8e8e8') %>
+<%
+
+my @items = qw( invoiced netsales credits receipts );
+my %label = (
+  'invoiced' => 'Gross Sales',
+  'netsales' => 'Net Sales',
+  'credits'  => 'Credits',
+  'receipts' => 'Receipts',
+);
+my %color = (
+  'invoiced' => '9999ff', #light blue
+  'netsales' => '0000cc', #blue
+  'credits'  => 'cc0000', #red
+  'receipts' => '00cc00', #green
+);
+
+my $report = new FS::Report::Table::Monthly (
+  'items' => \@items,
+  'start_month' => $smonth,
+  'start_year'  => $syear,
+  'end_month'   => $emonth,
+  'end_year'    => $eyear,
+);
+my $data = $report->data;
+
+
+my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
+
+%>
+
+<TR><TD></TD>
+<% foreach my $column ( @{$data->{label}} ) {
+     #$column =~ s/^(\d+)\//$mon[$1-1]<BR>/e;
+     $column =~ s/^(\d+)\//$mon[$1-1]<BR>/;
+     %>
+     <TH><%= $column %></TH>
+<% } %>
+</TR>
+
+<% foreach my $row (@items) { %>
+  <TR><TH><FONT COLOR="#<%= $color{$row} %>"><%= $label{$row} %></FONT></TH>
+  <% foreach my $column ( @{$data->{$row}} ) { %>
+    <TD ALIGN="right" BGCOLOR="#ffffff">
+      <FONT COLOR="#<%= $color{$row} %>">$<%= sprintf("%.2f", $column) %></FONT>
+    </TD>
+  <% } %>
+  </TR>
+<% } %>
+</TABLE>
+
 <BR>
 <FORM METHOD="POST">
+<!--
 <INPUT TYPE="checkbox" NAME="ar">
   Accounts receivable (invoices - applied credits)<BR>
 <INPUT TYPE="checkbox" NAME="charged">
@@ -31,8 +85,8 @@ my $emonth = $cgi->param('emonth') || $curmon+1;
 <INPUT TYPE="checkbox" NAME="cash">
   Cashflow (payments - refunds)<BR>
 <BR>
+-->
 From <SELECT NAME="smonth">
-<% my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec); %>
 <% foreach my $mon ( 1..12 ) { %>
 <OPTION VALUE="<%= $mon %>"<%= $mon == $smonth ? ' SELECTED' : '' %>><%= $mon[$mon-1] %>
 <% } %>
@@ -53,7 +107,7 @@ From <SELECT NAME="smonth">
 <% } %>
 </SELECT>
 
-<INPUT TYPE="submit" VALUE="Graph">
+<INPUT TYPE="submit" VALUE="Redisplay">
 </FORM>
 </BODY>
 </HTML>
-- 
cgit v1.2.1


From ecf4288cc6d98a4916128c5e45d515e0fbea09fd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Mar 2004 00:57:40 +0000
Subject: doc

---
 httemplate/docs/upgrade10.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 774babb9e..45efbe23b 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -1,7 +1,9 @@
 <pre>
 this is incomplete
 
-install DBIx::DBSchema 0.22
+install DBIx::DBSchema 0.23
+install Net::SSH 0.08
+- If using Apache::ASP, add PerlSetVar RequestBinaryRead Off to your Apache configuration and make sure you are using Apache::ASP minimum version 2.55. 
 
 install NetAddr::IP, Chart::Base, IPC::ShareLite and Locale::SubCountry
 
-- 
cgit v1.2.1


From 6f2e2ea05362732731d08bc2fdeb26946fa4d3bc Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 10 Mar 2004 02:37:23 +0000
Subject: UI cleanup.

---
 httemplate/browse/router.cgi | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/httemplate/browse/router.cgi b/httemplate/browse/router.cgi
index feee4ecaa..4eee96167 100644
--- a/httemplate/browse/router.cgi
+++ b/httemplate/browse/router.cgi
@@ -20,16 +20,20 @@ my $p2 = popurl(2);
   </TR>
 <% foreach my $router (sort {$a->routernum <=> $b->routernum} @router) {
      my @addr_block = $router->addr_block;
+     if (scalar(@addr_block) == 0) {
+       push @addr_block, '&nbsp;';
+     }
 %>
   <TR>
-    <TD ROWSPAN="<%=scalar(@addr_block)%>">
+    <TD ROWSPAN="<%=scalar(@addr_block)+1%>">
       <A HREF="<%=$p2%>edit/router.cgi?<%=$router->routernum%>"><%=$router->routername%></A>
     </TD>
-    <TD>
-    <% foreach my $block ( @addr_block ) { %>
-      <%=$block->NetAddr%></BR>
-    <% } %>
-    </TD>
+  </TR>
+  <% foreach my $block ( @addr_block ) { %>
+  <TR>
+    <TD><%=UNIVERSAL::isa($block, 'FS::addr_block') ? $block->NetAddr : '&nbsp;'%></TD>
+  </TR>
+  <% } %>
   </TR>
 <% } %>
 </TABLE>
-- 
cgit v1.2.1


From 432a10eb5431f3ef973f6273539b2a685f665807 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 10 Mar 2004 19:06:21 +0000
Subject: Added hide/show customer router link.

---
 httemplate/browse/router.cgi | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/httemplate/browse/router.cgi b/httemplate/browse/router.cgi
index 4eee96167..149db4903 100644
--- a/httemplate/browse/router.cgi
+++ b/httemplate/browse/router.cgi
@@ -11,7 +11,21 @@ my $p2 = popurl(2);
    <BR><BR>
 <% } %>
 
-<A HREF="<%=$p2%>edit/router.cgi"><I>Add a new router</I></A><BR><BR>
+<%
+my $hidecustomerrouters = 0;
+my $hideurl = '';
+if ($cgi->param('hidecustomerrouters') eq '1') {
+  $hidecustomerrouters = 1;
+  $cgi->param('hidecustomerrouters', 0);
+  $hideurl = '<A HREF="' . $cgi->self_url() . '">Show customer routers</A>';
+} else {
+  $hidecustomerrouters = 0;
+  $cgi->param('hidecustomerrouters', 1);
+  $hideurl = '<A HREF="' . $cgi->self_url() . '">Hide customer routers</A>';
+}
+%>
+
+<A HREF="<%=$p2%>edit/router.cgi">Add a new router</A>&nbsp;|&nbsp;<%=$hideurl%>
 
 <%=table()%>
   <TR>
@@ -19,6 +33,7 @@ my $p2 = popurl(2);
     <TD><B>Address block(s)</B></TD>
   </TR>
 <% foreach my $router (sort {$a->routernum <=> $b->routernum} @router) {
+     next if $hidecustomerrouters && $router->svcnum;
      my @addr_block = $router->addr_block;
      if (scalar(@addr_block) == 0) {
        push @addr_block, '&nbsp;';
-- 
cgit v1.2.1


From 2c524f7421185a517faa561d8429c2a163abc2a9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Mar 2004 21:45:48 +0000
Subject: adding preliminary suse install script

---
 install/redhat/9/INSTALL |  6 ++++--
 install/suse/INSTALL     | 11 +++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 install/suse/INSTALL

diff --git a/install/redhat/9/INSTALL b/install/redhat/9/INSTALL
index ee3cba9ee..b9a345807 100644
--- a/install/redhat/9/INSTALL
+++ b/install/redhat/9/INSTALL
@@ -24,11 +24,13 @@ rpm -i apache-1.3.28-0.n0i.i386.rpm
 
 apt-get install perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-HTML-Parser perl-HTML-Tagset perl-TimeDate perl-URI perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs gcc gd #openssh
 
-wget --passive-ftp --continue http://atrpms.physik.fu-berlin.de/dist/rh9/perl-GD/perl-GD-2.11-7.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-45-1.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/yum/yum-2.0.4-28.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/gd/gd-2.0.15-1_6.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-package-config-45-1.rh9.at.noarch.rpm
+#wget --passive-ftp --continue http://atrpms.physik.fu-berlin.de/dist/rh9/perl-GD/perl-GD-2.11-7.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-45-1.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/yum/yum-2.0.4-28.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/gd/gd-2.0.15-1_6.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-package-config-45-1.rh9.at.noarch.rpm
+wget --passive-ftp --continue http://atrpms.physik.fu-berlin.de/dist/rh9/perl-GD/perl-GD-2.11-7.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-50-1.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/yum/yum-2.0.5-1_30.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/gd/gd-2.0.15-1_6.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-package-config-50-1.rh9.at.noarch.rpm
 
 cp /etc/apt/apt.conf /etc/apt/apt.conf.real
 
-rpm -i --replacefiles atrpms-package-config-45-1.rh9.at.noarch.rpm yum-2.0.4-28.rh9.at.noarch.rpm atrpms-45-1.rh9.at.noarch.rpm gd-2.0.15-1_6.rh9.at.i386.rpm perl-GD-2.11-7.rh9.at.i386.rpm
+#rpm -i --replacefiles atrpms-package-config-45-1.rh9.at.noarch.rpm yum-2.0.4-28.rh9.at.noarch.rpm atrpms-45-1.rh9.at.noarch.rpm gd-2.0.15-1_6.rh9.at.i386.rpm perl-GD-2.11-7.rh9.at.i386.rpm
+rpm -i --replacefiles atrpms-package-config-50-1.rh9.at.noarch.rpm yum-2.0.5-1_30.rh9.at.noarch.rpm atrpms-50-1.rh9.at.noarch.rpm gd-2.0.15-1_6.rh9.at.i386.rpm perl-GD-2.11-7.rh9.at.i386.rpm
 
 mv /etc/apt/apt.conf.real /etc/apt/apt.conf
 
diff --git a/install/suse/INSTALL b/install/suse/INSTALL
new file mode 100644
index 000000000..85e392461
--- /dev/null
+++ b/install/suse/INSTALL
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# based on install/redhat/9/INSTALL
+
+# apt for SuSE howto: http://linux01.gwdg.de/apt4rpm/
+
+for file in ftp://ftp.gwdg.de/pub/linux/suse/apt/SuSE/9.0-i386/RPMS.suser-rbos/apt-0.5.5cnc6-rb6.i586.rpm ftp://ftp.gwdg.de/pub/linux/suse/apt/SuSE/9.0-i386/RPMS.suser-rbos/apt-libs-0.5.5cnc6-rb6.i586.rpm ftp://ftp.gwdg.de/pub/linux/suse/apt/SuSE/9.0-i386/RPMS.suser-rbos/lua-5.0-rb3.i586.rpm; do
+  curl -C - $file
+done
+
+
-- 
cgit v1.2.1


From 659be703171be796aa1e38647a262385414e9933 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Mar 2004 21:47:13 +0000
Subject: move to versioned dir

---
 install/suse/9.0/INSTALL | 11 +++++++++++
 install/suse/INSTALL     | 11 -----------
 2 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 install/suse/9.0/INSTALL
 delete mode 100644 install/suse/INSTALL

diff --git a/install/suse/9.0/INSTALL b/install/suse/9.0/INSTALL
new file mode 100644
index 000000000..85e392461
--- /dev/null
+++ b/install/suse/9.0/INSTALL
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# based on install/redhat/9/INSTALL
+
+# apt for SuSE howto: http://linux01.gwdg.de/apt4rpm/
+
+for file in ftp://ftp.gwdg.de/pub/linux/suse/apt/SuSE/9.0-i386/RPMS.suser-rbos/apt-0.5.5cnc6-rb6.i586.rpm ftp://ftp.gwdg.de/pub/linux/suse/apt/SuSE/9.0-i386/RPMS.suser-rbos/apt-libs-0.5.5cnc6-rb6.i586.rpm ftp://ftp.gwdg.de/pub/linux/suse/apt/SuSE/9.0-i386/RPMS.suser-rbos/lua-5.0-rb3.i586.rpm; do
+  curl -C - $file
+done
+
+
diff --git a/install/suse/INSTALL b/install/suse/INSTALL
deleted file mode 100644
index 85e392461..000000000
--- a/install/suse/INSTALL
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# based on install/redhat/9/INSTALL
-
-# apt for SuSE howto: http://linux01.gwdg.de/apt4rpm/
-
-for file in ftp://ftp.gwdg.de/pub/linux/suse/apt/SuSE/9.0-i386/RPMS.suser-rbos/apt-0.5.5cnc6-rb6.i586.rpm ftp://ftp.gwdg.de/pub/linux/suse/apt/SuSE/9.0-i386/RPMS.suser-rbos/apt-libs-0.5.5cnc6-rb6.i586.rpm ftp://ftp.gwdg.de/pub/linux/suse/apt/SuSE/9.0-i386/RPMS.suser-rbos/lua-5.0-rb3.i586.rpm; do
-  curl -C - $file
-done
-
-
-- 
cgit v1.2.1


From 557b6397be9c5a92985b0cbac849e9dd72c54b43 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 10 Mar 2004 22:27:39 +0000
Subject: Excluded virtual fields weren't being properly masked on errors. The
 router/block select box wasn't being generated on errors.

---
 httemplate/edit/svc_broadband.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index db27b3241..9e064c5c8 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -11,11 +11,11 @@ use Tie::IxHash;
 my( $svcnum,  $pkgnum, $svcpart, $part_svc, $svc_broadband );
 if ( $cgi->param('error') ) {
   $svc_broadband = new FS::svc_broadband ( {
-    map { $_, scalar($cgi->param($_)) } fields('svc_broadband')
+    map { $_, scalar($cgi->param($_)) } fields('svc_broadband'), qw(svcpart)
   } );
   $svcnum = $svc_broadband->svcnum;
   $pkgnum = $cgi->param('pkgnum');
-  $svcpart = $cgi->param('svcpart');
+  $svcpart = $svc_broadband->svcpart;
   $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
   die "No part_svc entry!" unless $part_svc;
 } else {
@@ -132,7 +132,9 @@ Service #<B><%=$svcnum ? $svcnum : "(NEW)"%></B><BR><BR>
       <TD BGCOLOR="#ffffff">
         <SELECT NAME="blocknum">
 <%
+  warn $svc_broadband->svcpart;
   foreach my $router ($svc_broadband->allowed_routers) {
+    warn $router->routername;
     foreach my $addr_block ($router->addr_block) {
 %>
         <OPTION VALUE="<%=$addr_block->blocknum%>"<%=($addr_block->blocknum eq $blocknum) ? ' SELECTED' : ''%>>
@@ -158,7 +160,8 @@ Service #<B><%=$svcnum ? $svcnum : "(NEW)"%></B><BR><BR>
 
 <%
 foreach my $field ($svc_broadband->virtual_fields) {
-  if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
+  if ( $part_svc->part_svc_column($field)->columnflag ne 'F' &&
+       $part_svc->part_svc_column($field)->columnflag ne 'X') {
     print $svc_broadband->pvf($field)->widget('HTML', 'edit',
         $svc_broadband->getfield($field));
   }
-- 
cgit v1.2.1


From 25953817e61fd252c18241699c0b6cdc3fa54121 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Mar 2004 01:05:38 +0000
Subject: update for suse

---
 Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 72b3e58ff..bd6019bc8 100644
--- a/Makefile
+++ b/Makefile
@@ -21,13 +21,15 @@ FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 #FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
 #openbsd
 #FREESIDE_DOCUMENT_ROOT = /var/www/htdocs/freeside
+#suse
+#FREESIDE_DOCUMENT_ROOT = /srv/www/htdocs
 
-#deb, redhat, mandrake, others?
+#deb, redhat, mandrake, suse, others?
 INIT_FILE = /etc/init.d/freeside
 #freebsd
 #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
 
-#deb
+#deb, suse
 HTTPD_RESTART = /etc/init.d/apache restart
 #redhat, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
@@ -38,7 +40,7 @@ HTTPD_RESTART = /etc/init.d/apache restart
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
-#deb, redhat, mandrake, others?
+#deb, redhat, mandrake, suse, others?
 INSTALLGROUP = root
 #freebsd, openbsd
 #INSTALLGROUP = wheel
-- 
cgit v1.2.1


From 289340780927b5bac2c7604d7317c3063c6dd8cc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Mar 2004 02:05:38 +0000
Subject: import of rt 3.0.9

---
 rt/Changelog                                 | 1629 ++++++-
 rt/Makefile                                  |   31 +-
 rt/Makefile.in                               |   29 +-
 rt/README                                    |   46 +-
 rt/README.Oracle                             |   37 +
 rt/UPGRADING                                 |   64 +
 rt/autom4te.cache/output.0                   |   56 +-
 rt/autom4te.cache/traces.0                   |   68 +-
 rt/bin/mason_handler.fcgi                    |   24 +-
 rt/bin/mason_handler.fcgi.in                 |   24 +-
 rt/bin/mason_handler.scgi                    |    8 +-
 rt/bin/mason_handler.scgi.in                 |    8 +-
 rt/bin/mason_handler.svc                     |    2 +-
 rt/bin/mason_handler.svc.in                  |    2 +-
 rt/bin/rt                                    | 2901 ++++++------
 rt/bin/rt-crontool                           |   12 +-
 rt/bin/rt-crontool.in                        |   12 +-
 rt/bin/rt-mailgate                           |  109 +-
 rt/bin/rt-mailgate.in                        |  109 +-
 rt/bin/rt.in                                 | 1816 ++++++++
 rt/bin/webmux.pl                             |   29 +-
 rt/bin/webmux.pl.in                          |   29 +-
 rt/config.layout                             |   21 +
 rt/config.log                                |   59 +-
 rt/config.status                             |   18 +-
 rt/configure                                 |   56 +-
 rt/configure.ac                              |   30 +-
 rt/docs/rt3-schema-relationships.dot         |   81 +
 rt/etc/RT_Config.pm                          |   37 +-
 rt/etc/RT_Config.pm.in                       |   37 +-
 rt/etc/acl.Informix                          |    5 +
 rt/etc/acl.Oracle                            |   12 +-
 rt/etc/constraints.mysql                     |   14 +-
 rt/etc/drop.Informix                         |   19 +
 rt/etc/drop.Oracle                           |   37 +
 rt/etc/initialdata                           |    4 +-
 rt/etc/schema.Informix                       |  342 ++
 rt/etc/schema.Oracle                         |  377 +-
 rt/etc/schema.Pg                             |   16 +-
 rt/etc/schema.SQLite                         |   10 +-
 rt/etc/schema.mysql                          |   10 +-
 rt/html/Admin/Elements/EditCustomField       |    2 +-
 rt/html/Admin/Elements/EditCustomFieldValues |    2 +-
 rt/html/Admin/Elements/EditCustomFields      |   41 +-
 rt/html/Admin/Elements/EditScrip             |    9 +
 rt/html/Admin/Elements/EditScrips            |    4 +-
 rt/html/Admin/Elements/SelectGroups          |    3 +-
 rt/html/Admin/Elements/SelectRights          |    3 +-
 rt/html/Admin/Elements/SelectStage           |   39 +
 rt/html/Admin/Queues/CustomFields.html       |    3 +-
 rt/html/Admin/Queues/index.html              |    2 +-
 rt/html/Admin/Users/Modify.html              |    8 +-
 rt/html/Admin/Users/index.html               |    2 +-
 rt/html/Approvals/Display.html               |    2 +-
 rt/html/Elements/Callback                    |    7 +-
 rt/html/Elements/MessageBox                  |    6 +-
 rt/html/Elements/MyTickets                   |    2 +-
 rt/html/Elements/SelectLang                  |   56 +
 rt/html/Elements/SelectStatus                |    2 +
 rt/html/Elements/SelectWatcherType           |    3 +
 rt/html/Elements/SetupSessionCookie          |   18 +-
 rt/html/Elements/SimpleSearch                |    2 +-
 rt/html/NoAuth/webrt.css                     |    4 +-
 rt/html/REST/1.0/Forms/queue/default         |  123 +
 rt/html/REST/1.0/Forms/queue/ns              |   38 +
 rt/html/REST/1.0/Forms/ticket/attachments    |  107 +
 rt/html/REST/1.0/Forms/ticket/default        |  253 ++
 rt/html/REST/1.0/Forms/ticket/history        |  144 +
 rt/html/REST/1.0/Forms/ticket/links          |  148 +
 rt/html/REST/1.0/Forms/user/default          |  141 +
 rt/html/REST/1.0/Forms/user/ns               |   41 +
 rt/html/REST/1.0/NoAuth/mail-gateway         |    7 +-
 rt/html/REST/1.0/autohandler                 |   32 +
 rt/html/REST/1.0/dhandler                    |  287 ++
 rt/html/REST/1.0/logout                      |   27 +
 rt/html/REST/1.0/search/dhandler             |   32 +
 rt/html/REST/1.0/search/ticket               |  119 +
 rt/html/REST/1.0/ticket/comment              |  149 +
 rt/html/REST/1.0/ticket/link                 |   96 +
 rt/html/REST/1.0/ticket/merge                |   78 +
 rt/html/Search/Bulk.html                     |    1 +
 rt/html/Search/Elements/PickRestriction      |   11 +-
 rt/html/SelfService/Display.html             |   43 +-
 rt/html/SelfService/Elements/MyRequests      |    1 +
 rt/html/SelfService/Update.html              |   19 +-
 rt/html/Ticket/Attachment/dhandler           |    4 +-
 rt/html/Ticket/Create.html                   |   69 +-
 rt/html/Ticket/Display.html                  |   76 +-
 rt/html/Ticket/Elements/AddWatchers          |    2 +
 rt/html/Ticket/Elements/EditCustomField      |    4 +
 rt/html/Ticket/Elements/EditLinks            |   29 +-
 rt/html/Ticket/Elements/EditPeople           |    3 +-
 rt/html/Ticket/Elements/ShowAttachments      |    5 +-
 rt/html/Ticket/Elements/ShowDates            |   11 +-
 rt/html/Ticket/Elements/ShowHistory          |    2 +-
 rt/html/Ticket/Elements/ShowMessageStanza    |   12 +-
 rt/html/Ticket/Elements/ShowPeople           |    6 +-
 rt/html/Ticket/Elements/ShowTransaction      |   24 +-
 rt/html/Ticket/Elements/Tabs                 |   10 +-
 rt/html/Ticket/Modify.html                   |    2 +-
 rt/html/Ticket/ModifyAll.html                |    2 +-
 rt/html/Ticket/ModifyPeople.html             |    3 +-
 rt/html/Ticket/Update.html                   |   36 +-
 rt/html/User/Prefs.html                      |  106 +-
 rt/html/autohandler                          |  144 +-
 rt/html/index.html                           |    3 +-
 rt/lib/RT.pm                                 |   33 +-
 rt/lib/RT.pm.in                              |   31 +-
 rt/lib/RT/Action/AutoOpen.pm                 |    2 +-
 rt/lib/RT/Action/Autoreply.pm                |   16 +-
 rt/lib/RT/Action/CreateTickets.pm            |   20 +-
 rt/lib/RT/Action/SendEmail.pm                |    4 +-
 rt/lib/RT/Attachment_Overlay.pm              |   39 +-
 rt/lib/RT/Base.pm                            |   25 +-
 rt/lib/RT/CachedGroupMember_Overlay.pm       |    4 +-
 rt/lib/RT/CachedGroupMembers_Overlay.pm      |    4 +-
 rt/lib/RT/CurrentUser.pm                     |   34 +-
 rt/lib/RT/CustomField_Overlay.pm             |    6 +
 rt/lib/RT/EmailParser.pm                     |   84 +-
 rt/lib/RT/GroupMember_Overlay.pm             |    2 +-
 rt/lib/RT/Group_Overlay.pm                   |   23 +-
 rt/lib/RT/Groups_Overlay.pm                  |   82 +-
 rt/lib/RT/Handle.pm                          |    9 +-
 rt/lib/RT/I18N.pm                            |   22 +-
 rt/lib/RT/I18N/cs.pm                         |   23 +
 rt/lib/RT/I18N/de.po                         |  356 +-
 rt/lib/RT/I18N/it.po                         | 6175 ++++++++++++++++++++++++++
 rt/lib/RT/I18N/ru.po                         |  520 +--
 rt/lib/RT/I18N/zh_cn.po                      | 1401 +++---
 rt/lib/RT/I18N/zh_tw.po                      | 1315 +++---
 rt/lib/RT/Interface/Email.pm                 |  294 +-
 rt/lib/RT/Interface/REST.pm                  |  252 ++
 rt/lib/RT/Interface/Web.pm                   |  150 +-
 rt/lib/RT/Principal_Overlay.pm               |   25 +-
 rt/lib/RT/Queue_Overlay.pm                   |    7 +-
 rt/lib/RT/Record.pm                          |    5 +-
 rt/lib/RT/ScripAction_Overlay.pm             |   30 +-
 rt/lib/RT/Scrip_Overlay.pm                   |   28 +-
 rt/lib/RT/Scrips_Overlay.pm                  |   75 +
 rt/lib/RT/StyleGuide.pod                     |  891 ++++
 rt/lib/RT/Template_Overlay.pm                |   29 +-
 rt/lib/RT/Ticket_Overlay.pm                  |   89 +-
 rt/lib/RT/Tickets_Overlay.pm                 |  185 +-
 rt/lib/RT/Tickets_Overlay_SQL.pm             |   95 +-
 rt/lib/RT/Transaction_Overlay.pm             |  303 +-
 rt/lib/RT/URI.pm                             |    9 +-
 rt/lib/RT/URI/fsck_com_rt.pm                 |   13 +-
 rt/lib/RT/User_Overlay.pm                    |   17 +-
 rt/lib/RT/Users_Overlay.pm                   |   26 +-
 rt/lib/t/02regression.t                      |    4 +-
 rt/lib/t/02regression.t.in                   |    4 +-
 rt/lib/t/03web.pl                            |   34 +-
 rt/lib/t/03web.pl.in                         |   34 +-
 rt/lib/t/04_send_email.pl                    |  122 +-
 rt/lib/t/04_send_email.pl.in                 |  122 +-
 rt/lib/t/data/crashes-file-based-parser      |  193 +
 rt/lib/t/data/multipart-report               |   66 +
 rt/lib/t/data/notes-uuencoded                | 2368 ++++++++++
 rt/sbin/extract-message-catalog              |    2 +-
 rt/sbin/factory                              |    1 +
 rt/sbin/license_tag                          |    6 +-
 rt/sbin/rt-setup-database                    |   46 +-
 rt/sbin/rt-setup-database.in                 |   46 +-
 rt/sbin/rt-test-dependencies                 |   84 +-
 rt/sbin/rt-test-dependencies.in              |   84 +-
 165 files changed, 22771 insertions(+), 4098 deletions(-)
 create mode 100644 rt/README.Oracle
 create mode 100644 rt/UPGRADING
 create mode 100644 rt/bin/rt.in
 create mode 100644 rt/docs/rt3-schema-relationships.dot
 create mode 100644 rt/etc/acl.Informix
 create mode 100644 rt/etc/drop.Informix
 create mode 100644 rt/etc/drop.Oracle
 create mode 100644 rt/etc/schema.Informix
 create mode 100644 rt/html/Admin/Elements/SelectStage
 create mode 100644 rt/html/Elements/SelectLang
 create mode 100644 rt/html/REST/1.0/Forms/queue/default
 create mode 100644 rt/html/REST/1.0/Forms/queue/ns
 create mode 100644 rt/html/REST/1.0/Forms/ticket/attachments
 create mode 100644 rt/html/REST/1.0/Forms/ticket/default
 create mode 100644 rt/html/REST/1.0/Forms/ticket/history
 create mode 100644 rt/html/REST/1.0/Forms/ticket/links
 create mode 100644 rt/html/REST/1.0/Forms/user/default
 create mode 100644 rt/html/REST/1.0/Forms/user/ns
 create mode 100644 rt/html/REST/1.0/autohandler
 create mode 100644 rt/html/REST/1.0/dhandler
 create mode 100644 rt/html/REST/1.0/logout
 create mode 100644 rt/html/REST/1.0/search/dhandler
 create mode 100644 rt/html/REST/1.0/search/ticket
 create mode 100644 rt/html/REST/1.0/ticket/comment
 create mode 100644 rt/html/REST/1.0/ticket/link
 create mode 100644 rt/html/REST/1.0/ticket/merge
 create mode 100644 rt/lib/RT/I18N/it.po
 create mode 100644 rt/lib/RT/Interface/REST.pm
 create mode 100644 rt/lib/RT/StyleGuide.pod
 create mode 100644 rt/lib/t/data/crashes-file-based-parser
 create mode 100644 rt/lib/t/data/multipart-report
 create mode 100644 rt/lib/t/data/notes-uuencoded

diff --git a/rt/Changelog b/rt/Changelog
index d8d73fd6d..0f6bd10c3 100644
--- a/rt/Changelog
+++ b/rt/Changelog
@@ -2,7 +2,7 @@
 
 
 Project "rt.3", Branch 0						  Page 1
-Change Log						Sat Jul 12 04:24:41 2003
+Change Log						Fri Feb 13 12:31:27 2004
 
 rt.3.D000, C0, jesse, Thu Mar 13 20:43:23 2003, RT: Request Tracker, branch 3.0.
     RT: Request Tracker, branch 3.0.
@@ -207,6 +207,1633 @@ rt.3.D000, C0, jesse, Thu Mar 13 20:43:23 2003, RT: Request Tracker, branch 3.0.
      199    150	  README updates to indicate deprecated dependencies
      200    151	  Debugging framework cleanup
      201    152	  Bumping version to 3.0.4
+     195    153	  #3042: Make max inline body size configurable
+     196    154	  #3029 - better warning message on improper perms on mail in
+     202    155	  Initial commit of new commandline client support code
+     203    156	  More updates to the commandline client
+     205    157	  Removing ancient cli code that was accidentally added to the
+		  repository
+     206    158	  Extended ACL edit routines to make it easier to use generic
+		  routines in 3rd party apps
+      24    159	  Certain ACL checks could fail on postgres due to a marshalling
+		  bug
+     209    160	  #1751: update second page in Bulk update
+     208    161	  #1651: URIs not escaped in ticket display
+     210    162	  A couple of fixes to better deal with creation of 'blank'
+		  ticket requestors
+     207    163	  regression tests: use $RT::WebPath and RT_LIB_PATH
+     211    164	  Requestor searches had an extra join that they didn't need
+     212    165	  License tagger was tagging Makefile, not Makefile.in.
+		  Reconfigured.
+     213    166	  Bumping to 3.0.5pre1
+     215    167	  Merging internationalization fixes from ourinternet
+     216    168	  #2692: make $Domain an argument for SelectGroups
+     219    169	  #2855: User_Overlay and Template_Overlay fixes
+     220    170	  #2989: regexp changes for Subject and loop-detection
+     221    171	  3158: user can delete only with DeleteTicket right
+     222    172	  fixes for the importer
+     223    173	  Adding the RT coding style guide to the distribution
+     225    174	  One I18N 'fix' from ourinternet tainted attachment data,
+		  breaking tests
+     226    175	  Code to catch execution problems within RT's web app server
+		  was made more robust
+      34    176	  Failed user creation didn't always properly roll-back the
+		  database
+     227    177	  [fsck.com #2378] personal permissions for installation
+     228    178	  #3199: normalize custom fields searching syntax - Global CF's
+		  previously didn't allow the { }
+     229    179	  #3201: Perform more clever joining to enhance custom field
+		  search results
+      40    180	  #3200 - AND MultipleSelect CFs together -  OR all other CFs
+		  together.
+      42    181	  Bumping version to 3.0.5-pre2
+      41    182	  #3022: Update to German translation
+      43    183	  #3068: Better setting of Due dates via the web ui
+      44    184	  #3131: Preliminary support for Oracle from Brook Schonfield
+      45    185	  #3152: Updated russian .po file
+      46    186	  #2792: When finding out if someone is a queue watcher, check
+		  groups recursively
+      47    187	  Bumping to 3.0.5pre3
+      49    188	  Dependencies updated; performance and memory usage fixes for
+		  ticket creation memory usage
+     231    189	  #3237: Queue-specific templates with the same name as global
+		  templates will now override the globals for queue-related
+		  scrips
+      54    190	  #3279: Make fsck.com-rt: URIs case insensitive
+     230    191	  #3230: Parser patch to make watchers searches more efficient
+     218    192	  #2955: wrapping in messagebox
+     232    193	  Old relationship update transactions weren't properly
+		  displayed
+     237    194	  #2672: custom field values ordering
+     235    195	  #2653: Email.pm patch
+     238    196	  #3114: allow longer subject lines for postgres
+     233    197	  #3242: cannonicalize addresses in comments
+     236    198	  #3278: occasional internal server error in RT.pm
+     239    199	  #3309: switch lines in User/Prefs.html
+     250    200	  #3329: Email.pm patch
+     252    201	  #2687: add ticket subject to resolved template
+     255    202	  #2268: align fields in User/Prefs.html
+     256    203	  #2160: clarify that box deletes scrips
+     259    204	  #2773: don't allow searching for deleted tickets
+     257    205	  #2700: configurable home page ticket list length
+     258    206	  #2409: colons after labels in Create.html
+     261    207	  #3240: DeleteWatcher, not DelWatcher
+     262    208	  #3143: Italian translation
+     251    209	  #2617: custom field ordering
+     260    210	  #2558: allow access to CFs with no name
+     263    211	  #3281: form actions must not be paths
+     266    212	  #2693: show proper id in menu after creation
+     265    213	  #3118: change default unset mail address
+     267    214	  #3324: Apache::DBI must be 0.92 or newer
+     253    215	  Fixing improperly applied custom field editing patches
+     268    216	  Bumping version to 3.0.5pre4
+     269    217	  #3341: edit comments in SiteConfig
+     271    218	  #3012: vertical alignment in Ticket/Elements/ShowPeople
+     270    219	  #3349: umlauts aren't correct in subject
+     272    220	  #3236: allow attachments without other txn contents
+     273    221	  #3105: CreateTickets doesn't set ticket type
+     275    222	  #3384: recursive merge patches
+     276    223	  #3354: an additional fix for avoiding the morning bug
+     277    224	  #3114: increase subject length in non-Postgres dbs
+     278    225	  Fixes to attempt to stop mysql 'morning bugs' with mysql
+     280    226	  Post 3.0.5pre3 - sometimes silently losing mail. fixed a
+		  possible bug, improved testing
+     281    227	  More explicit warning about a lack of perl 5.8
+     282    228	  fixing the new testdeps thing
+     279    229	  #2651: localize die/warn handlers
+      64    230	  Bumping to 3.0.5pre5
+     283    231	  #3399: Message parsing fails for some types of report
+     285    232	  Better handling of apparently bogus email; rationalize mail
+		  gateway error codes
+     286    233	  Bumping to 3.0.5pre6
+     287    234	  Bumping to 3.0.5RC1
+     288    235	  Patches to the cli from ams
+     289    236	  Custom field values couldn't be set to '0'; README updated for
+		  apache2
+     290    237	  RT 3.0.5
+     291    238	  Fixing a couple bugs related to display of links
+     292    239	  fixing a multiple-signature-inclusion bug
+     293    240	  Bumping to 3.0.6RC1
+     295    241	  Updated documentation for RT CLI tool
+     296    242	  Bumping to RT 3.0.6
+     297    243	  Conditionalizing Text::Quoted display, so as to avoid utf8
+		  crashes
+     299    244	  Merging bugfixes from ourinternet
+     300    245	  A bunch of postgres correctness fixes
+     301    246	  #2346: Resolving a deprecation warning
+      84    247	  #3981: Ticket creation syntax fix
+     298    248	  bps #1032: SelfService fixes
+     302    249	  #3889: add/del fixes
+     303    250	  #3822: Fix for cli bug (Inapropriate use of arrayref)
+     305    251	  #3807: CLI example updates
+     306    252	  #3907: New default templates for user, ticket and queue
+     308    253	  More reference weakening
+     307    254	  User objects weren't always destroyed, due to a circular
+		  reference
+     310    255	  Slightly better debugging on failure to send mail
+      94    256	  Deep recursion issue on localization handle; missing language
+		  selector
+     313    257	  Adding back missing SelectLang
+     311    258	  #3566: EditCustomField supports Default for FreeformSingle
+     312    259	  Initial Informix port from akso.de
+     316    260	  #3765: TicketsSQL is case-sensitive
+     317    261	  #3613: searching on NOT LIKE
+     318    262	  #3877: don't strip multi-line headers
+     319    263	  #3551: Create values corrupted when adding new files
+     321    264	  #3993: warn when installing with mod_perl2
+     320    265	  #4087: allow non-ISO dates in transaction searches
+     322    266	  #3439: custom fields patch
+     323    267	  #3855: require Locale::Maketext::Lexicon 0.31
+     325    268	  #3856: /REST/1.0/search/tickets should work in UTC
+     326    269	  #3827: regression shouldn't drop db
+     327    270	  #3801: note when transaction content is ellided
+     328    271	  #3751: ParseNewMessageForTicketCcs
+     332    272	  #3776: new indices
+     329    273	  #3674: autohandler patch
+     336    274	  New schema relationships diagram in .dot format
+     337    275	  more work on the schema diagram
+     330    276	  #3601: SelectRights patch
+     331    277	  #3583: set Last Contacted date
+     333    278	  #4088: Postgres performance improvements
+     335    279	  fix attachment links in base RT
+     338    280	  Updating storable dependency, to keep redhat 9 users from
+		  hurting themselves
+     339    281	  Small fix to ticket searching to cut down on # of joins needed
+     104    282	  Merging ourinternet's changes relative to 3.0.7pre2; UPGRADING
+		  update; postgres installation fixes
+     350    283	  Bumping version to 3.0.7pre3
+     351    284	  CLI changes
+     352    285	  CLI usage updates
+     353    286	  Bumping to 3.0.7rc1
+     361    287	  Bumping to 3.0.7; Updated DBIx::SearchBuilder dependency
+     362    288	  Fixes to RT 3.0.7 upgrade instructions; Bumping to 3.0.7_01
+     355    289	  Minor cleanups to RT cli tool
+     356    290	  Fixup to rt-setup-database tool for local schema
+     357    291	  Display.html takes TicketObj; Update.html uses it
+     358    292	  localization for link text, not whole link
+     359    293	  ProcessTicketCustomFieldUpdates takes TicketObj
+     360    294	  Transaction batching
+     363    295	  protect against reentrancy in Ticket::DESTROY
+     365    296	  FastCGI fix to make the CLI work
+     366    297	  #4415: Fix for imporeting merged tickets
+     368    298	  Regression and upgrade cleanups
+     367    299	  Ticket creation and updates via the Web UI were sometimes
+		  encoded wrong
+     369    300	  CLI tool should pass through orderby arg
+     370    301	  Bumping to 3.0.8pre1
+     371    302	  none
+     372    303	  Decode uuencoded attachments
+     373    304	  Fixing next/prev ticket navigation (#4461) it sometimes
+		  disappeared.
+     375    305	  Ticket counts became inaccurate after repeated web searches
+     376    306	  Certain non-western From: headers were being mangled
+     377    307	  Numerous CLI improvements
+     378    308	  Bumping to 3.0.8pre2
+     379    309	  Switching to new I18NSafe lowercasing behaviour for Pg
+     380    310	  Adding a new index doubles my performance on /index.html
+     381    311	  Importing fixes from ourinternet
+     382    312	  Researching email corruption
+     197    313	  Fixing CreaetTickets documentation
+     383    314	  #4572: Fix searching on links
+     385    315	  #4554: callbacks should be ordered
+     386    316	  #4552 arguments for AddCustomFieldValues
+     387    317	  #4455: Better handling of bad link URIs
+     388    318	  #3725: Making CLI display newly created tickets ids
+     389    319	  #3736: Backport RT 3.1 'inplace' layout
+     390    320	  #3813: the CreateTickets scripaction couldn't handle
+		  customfields
+     391    321	  #3608: search by ccs and adminccs in addition to requestors
+     114    322	  #3066: crontool docs
+     393    323	  #4711: search ON Dates
+     392    324	  order SelfService tickets by numeric id
+     395    325	  Bumping to 3.0.8RC1
+     396    326	  AutoOpen should set correct type for Status transaction
+     397    327	  Fixing apparent SQL error on logout. Actually bug in
+		  localization
+      21    328	  #2587: turn off autocomplete in RT's search box
+     309    329	  #3660: add a 'timeout' flag to the rt-mailgate
+     315    330	  #3608: fixing quicksearch to work with new watcher search
+     398    331	  Allow RT::CurrentUser to load objects based on RT::User
+		  objects passed in; Backported a fix to the Language Selector
+		  for non-traditional languages; bumped to 3.0.8
+     399    332	  Searching for role groups generated queries that were way too
+		  complex
+      48    333	  First cut at new oracle code from Netzah
+     501    334	  Adding UTF8 support for oracle; Oracle install instructions;
+		  searchbuilder dep bumped; bumping to 3.0.9pre2
+     502    335	  Deleted tickets should never be found in searches
+     503    336	  #5212	 Unicode issues with incoming mail with a charset or
+		  encoding of UTF-8 (caps)
+     500    337	  Reversing our no-cache pragmas, since IE can't cope with them
+		  over SSL
+     506    338	  A couple of perf fixes from autrijus which _require_
+		  SearchBuilder 0.97. Reduces long ticket display by 30%
+     508    339	  Bumping to 3.0.9pre3
+     509    340	  RT now uses progressive rendering by default AND no longer
+		  blocks the load of the CSS sheet; 3.0.9pre4
+     511    341	  Optimizing column loads from autrijus' new column load patches
+     512    342	  Bumping to 3.0.9pre5
+     513    343	  More performance work listing ticket Attachments
+     515    344	  Turning off autoflush for ticket attachments so we can a
+		  content type
+     516    345	  #5178: Use less verbose html for ticket history
+     517    346	  Bumping to 3.0.9pre6
+     518    347	  Improved next/prev handling for merged tickets
+     519    348	  Bumping to 3.0.9 - Noting preference for perl 5.8.3
+
+  rt.3.0.D348, C519, jesse, Fri Feb 13 12:30:42 2004, Bumping to 3.0.9 - Noting
+  preference for perl 5.8.3
+      none
+
+  rt.3.0.D347, C518, jesse, Thu Feb 12 00:21:35 2004, Improved next/prev
+  handling for merged tickets
+      From: Jesse <jesse@bitsy>
+      Date: Thu Feb 12 00:20:40 2004
+
+      none
+
+  rt.3.0.D346, C517, jesse, Tue Feb 10 00:22:11 2004, Bumping to 3.0.9pre6
+      From: Jesse <jesse@bitsy>
+      Date: Tue Feb 10 00:21:24 2004
+      Warning: the original change was in the 'being_integrated' state
+
+      none
+
+  rt.3.0.D345, C516, jesse, Tue Feb 10 00:19:50 2004, #5178: Use less verbose
+  html for ticket history
+      From: Jesse <jesse@bitsy>
+      Date: Tue Feb 10 00:18:57 2004
+
+      none
+
+  rt.3.0.D344, C515, jesse, Tue Feb 10 00:07:41 2004, Turning off autoflush for
+  ticket attachments so we can a content type
+      From: Jesse <jesse@bitsy>
+      Date: Tue Feb 10 00:02:40 2004
+
+      none
+
+  rt.3.0.D343, C513, jesse, Mon Feb  9 23:48:40 2004, More performance work
+  listing ticket Attachments
+      From: Jesse <jesse@bitsy>
+      Date: Mon Feb  9 23:48:07 2004
+
+      none
+
+  rt.3.0.D342, C512, jesse, Fri Feb  6 02:05:13 2004, Bumping to 3.0.9pre5
+      none
+
+  rt.3.0.D341, C511, jesse, Thu Feb  5 23:11:20 2004, Optimizing column loads
+  from autrijus' new column load patches
+      none
+
+  rt.3.0.D340, C509, jesse, Wed Feb  4 17:56:57 2004, RT now uses progressive
+  rendering by default AND no longer blocks the load of the CSS sheet; 3.0.9pre4
+      none
+
+  rt.3.0.D339, C508, jesse, Wed Feb  4 16:42:08 2004, Bumping to 3.0.9pre3
+      none
+
+  rt.3.0.D338, C506, jesse, Wed Feb  4 15:06:36 2004, A couple of perf fixes
+  from autrijus which _require_ SearchBuilder 0.97. Reduces long ticket display
+  by 30%
+      none
+
+  rt.3.0.D337, C500, jesse, Sun Feb  1 15:01:39 2004, Reversing our no-cache
+  pragmas, since IE can't cope with them over SSL
+      none
+
+  rt.3.0.D336, C503, jesse, Wed Jan 28 19:56:55 2004, #5212  Unicode issues with
+  incoming mail with a charset or encoding of UTF-8 (caps)
+      none
+
+  rt.3.0.D335, C502, jesse, Wed Jan 28 19:24:48 2004, Deleted tickets should
+  never be found in searches
+      none
+
+  rt.3.0.D334, C501, jesse, Thu Jan  8 15:21:02 2004, Adding UTF8 support for
+  oracle; Oracle install instructions; searchbuilder dep bumped; bumping to
+  3.0.9pre2
+      none
+
+  rt.3.0.D333, C48, jesse, Sun Jan  4 23:18:16 2004, First cut at new oracle
+  code from Netzah
+      From: Jesse <jesse@bitsy>
+      Date: Sun Jan  4 23:17:21 2004
+
+      none
+
+  rt.3.0.D332, C399, jesse, Sat Jan  3 15:57:44 2004, Searching for role groups
+  generated queries that were way too complex
+      From: Jesse <jesse@bitsy>
+      Date: Sat Jan  3 15:57:50 2004
+
+      none
+
+  rt.3.0.D331, C398, jesse, Fri Jan  2 16:22:47 2004, Allow RT::CurrentUser to
+  load objects based on RT::User objects passed in; Backported a fix to the
+  Language Selector for non-traditional languages; bumped to 3.0.8
+      From: Jesse <jesse@bitsy>
+      Date: Fri Jan  2 16:22:55 2004
+
+      none
+
+  rt.3.0.D330, C315, jesse, Fri Jan  2 15:10:37 2004, #3608: fixing quicksearch
+  to work with new watcher search
+      From: Jesse Vincent <jesse@hostname>
+      Date: Sat Dec 13 15:31:06 2003
+
+      none
+
+  rt.3.0.D329, C309, jesse, Fri Jan  2 15:10:02 2004, #3660: add a 'timeout'
+  flag to the rt-mailgate
+      From: Jesse Vincent <jesse@hostname>
+      Date: Sat Dec 13 02:12:05 2003
+
+      none
+
+  rt.3.0.D328, C21, jesse, Fri Jan  2 15:09:18 2004, #2587: turn off
+  autocomplete in RT's search box
+      From: Jesse Vincent <jesse@hostname>
+      Date: Sat Dec 13 01:57:52 2003
+
+      none
+
+  rt.3.0.D327, C397, jesse, Tue Dec 30 16:19:24 2003, Fixing apparent SQL error
+  on logout. Actually bug in localization
+      none
+
+  rt.3.0.D326, C396, leira, Fri Dec 19 01:11:25 2003, AutoOpen should set
+  correct type for Status transaction
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Thu Dec 18 23:56:15 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D325, C395, jesse, Wed Dec 17 14:12:38 2003, Bumping to 3.0.8RC1
+      From: Jesse <jesse@bitsy>
+      Date: Thu Dec 18 15:00:12 2003
+
+      none
+
+  rt.3.0.D324, C392, leira, Wed Dec 17 14:09:47 2003, order SelfService tickets
+  by numeric id
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Mon Dec 15 04:21:15 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D323, C393, jesse, Mon Dec 15 19:28:46 2003, #4711: search ON Dates
+      From: Jesse <jesse@bitsy>
+      Date: Tue Dec 16 20:30:27 2003
+      Warning: the original change was in the 'being_developed' state
+
+      none
+
+  rt.3.0.D322, C114, jesse, Sat Dec 13 01:32:42 2003, #3066: crontool docs
+      From: Jesse Vincent <jesse@hostname>
+      Date: Sat Dec 13 00:38:04 2003
+
+      none
+
+  rt.3.0.D321, C391, jesse, Sat Dec 13 01:32:12 2003, #3608: search by ccs and
+  adminccs in addition to requestors
+      From: Jesse Vincent <jesse@hostname>
+      Date: Sat Dec 13 01:24:33 2003
+      Warning: the original change was in the 'being_developed' state
+
+      none
+
+  rt.3.0.D320, C390, jesse, Sat Dec 13 01:29:24 2003, #3813: the CreateTickets
+  scripaction couldn't handle customfields
+      From: Jesse Vincent <jesse@hostname>
+      Date: Sat Dec 13 01:22:56 2003
+
+      none
+
+  rt.3.0.D319, C389, jesse, Sat Dec 13 01:28:24 2003, #3736: Backport RT 3.1
+  'inplace' layout
+      From: Jesse Vincent <jesse@hostname>
+      Date: Sat Dec 13 01:15:39 2003
+
+      none
+
+  rt.3.0.D318, C388, jesse, Sat Dec 13 01:28:13 2003, #3725: Making CLI display
+  newly created tickets ids
+      From: Jesse Vincent <jesse@hostname>
+      Date: Sat Dec 13 01:12:20 2003
+
+      none
+
+  rt.3.0.D317, C387, jesse, Sat Dec 13 01:27:59 2003, #4455: Better handling of
+  bad link URIs
+      From: Jesse Vincent <jesse@hostname>
+      Date: Fri Dec 12 23:33:09 2003
+
+      none
+
+  rt.3.0.D316, C386, jesse, Sat Dec 13 01:27:41 2003, #4552 arguments for
+  AddCustomFieldValues
+      From: Jesse Vincent <jesse@hostname>
+      Date: Fri Dec 12 23:23:08 2003
+
+      none
+
+  rt.3.0.D315, C385, jesse, Sat Dec 13 01:27:17 2003, #4554: callbacks should be
+  ordered
+      From: Jesse Vincent <jesse@hostname>
+      Date: Fri Dec 12 23:14:57 2003
+
+      none
+
+  rt.3.0.D314, C383, jesse, Sat Dec 13 01:27:06 2003, #4572: Fix searching on
+  links
+      From: Jesse Vincent <jesse@hostname>
+      Date: Fri Dec 12 23:11:24 2003
+
+      none
+
+  rt.3.0.D313, C197, jesse, Fri Dec 12 23:18:59 2003, Fixing CreaetTickets
+  documentation
+      From: Jesse Vincent <jesse@localhost>
+      Date: Tue Jul  8 19:59:48 2003
+
+      none
+
+  rt.3.0.D312, C382, jesse, Thu Dec 11 12:58:27 2003, Researching email
+  corruption
+      From: Jesse <jesse@bitsy>
+      Date: Fri Dec 12 14:02:37 2003
+
+      none
+
+  rt.3.0.D311, C381, jesse, Mon Dec  8 03:06:53 2003, Importing fixes from
+  ourinternet
+      From: Jesse <jesse@bitsy>
+      Date: Tue Dec  9 04:10:35 2003
+
+      none
+
+  rt.3.0.D310, C380, jesse, Mon Dec  8 02:52:37 2003, Adding a new index doubles
+  my performance on /index.html
+      From: Jesse <jesse@bitsy>
+      Date: Tue Dec  9 03:53:40 2003
+
+      none
+
+  rt.3.0.D309, C379, jesse, Sat Dec  6 21:06:31 2003, Switching to new I18NSafe
+  lowercasing behaviour for Pg
+      From: Jesse <jesse@bitsy>
+      Date: Sun Dec  7 22:11:09 2003
+
+      none
+
+  rt.3.0.D308, C378, jesse, Fri Dec  5 16:51:11 2003, Bumping to 3.0.8pre2
+      From: Jesse <jesse@bitsy>
+      Date: Sat Dec  6 17:43:47 2003
+
+      none
+
+  rt.3.0.D307, C377, leira, Fri Dec  5 16:45:20 2003, Numerous CLI improvements
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Fri Dec  5 03:09:04 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D306, C376, jesse, Wed Dec  3 01:15:23 2003, Certain non-western From:
+  headers were being mangled
+      From: Jesse Vincent <jesse@hostname>
+      Date: Wed Dec  3 01:14:25 2003
+
+      none
+
+  rt.3.0.D305, C375, jesse, Tue Dec  2 19:05:41 2003, Ticket counts became
+  inaccurate after repeated web searches
+      From: Jesse Vincent <jesse@hostname>
+      Date: Tue Dec  2 19:03:18 2003
+
+      none
+
+  rt.3.0.D304, C373, jesse, Tue Dec  2 18:36:05 2003, Fixing next/prev ticket
+  navigation (#4461) it sometimes disappeared.
+      From: Jesse Vincent <jesse@hostname>
+      Date: Tue Dec  2 18:34:07 2003
+
+      none
+
+  rt.3.0.D303, C372, jesse, Thu Nov 27 12:28:56 2003, Decode uuencoded
+  attachments
+      From: Jesse <jesse@bitsy>
+      Date: Fri Nov 28 13:32:25 2003
+
+      none
+
+  rt.3.0.D302, C371, jesse, Thu Nov 27 02:00:59 2003, none
+      From: Jesse <jesse@bitsy>
+      Date: Fri Nov 28 03:05:10 2003
+
+      none
+
+  rt.3.0.D301, C370, jesse, Tue Nov 25 22:24:45 2003, Bumping to 3.0.8pre1
+      none
+
+  rt.3.0.D300, C369, leira, Fri Nov 21 12:30:08 2003, CLI tool should pass
+  through orderby arg
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Fri Nov 21 12:22:20 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D299, C367, jesse, Fri Nov 21 00:24:44 2003, Ticket creation and
+  updates via the Web UI were sometimes encoded wrong
+      From: Jesse <jesse@bitsy>
+      Date: Sat Nov 22 01:17:10 2003
+
+      none
+
+  rt.3.0.D298, C368, jesse, Fri Nov 21 00:21:32 2003, Regression and upgrade
+  cleanups
+      From: Jesse <jesse@bitsy>
+      Date: Sat Nov 22 01:20:08 2003
+
+      none
+
+  rt.3.0.D297, C366, jesse, Thu Nov 20 17:44:16 2003, #4415: Fix for imporeting
+  merged tickets
+      From: Jesse <jesse@bitsy>
+      Date: Fri Nov 21 18:47:53 2003
+
+      none
+
+  rt.3.0.D296, C365, jesse, Thu Nov 20 17:22:51 2003, FastCGI fix to make the
+  CLI work
+      From: Jesse <jesse@bitsy>
+      Date: Fri Nov 21 18:24:18 2003
+
+      none
+
+  rt.3.0.D295, C363, leira, Thu Nov 20 17:21:32 2003, protect against reentrancy
+  in Ticket::DESTROY
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Wed Nov 19 15:45:47 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D294, C360, leira, Mon Nov 17 23:28:48 2003, Transaction batching
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Mon Nov 17 18:52:37 2003
+      Warning: the original change was in the 'being_developed' state
+
+      From: Jesse <jesse@bitsy>
+      Date: Sun Nov 16 18:10:00 2003
+      Warning: the original change was in the 'being_developed' state
+
+      none
+
+  rt.3.0.D293, C359, leira, Mon Nov 17 23:24:21 2003,
+  ProcessTicketCustomFieldUpdates takes TicketObj
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Mon Nov 17 17:59:28 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D292, C358, leira, Mon Nov 17 23:21:05 2003, localization for link
+  text, not whole link
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Mon Nov 17 17:33:58 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D291, C357, leira, Mon Nov 17 23:20:32 2003, Display.html takes
+  TicketObj; Update.html uses it
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Mon Nov 17 17:19:05 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D290, C356, leira, Mon Nov 17 23:16:11 2003, Fixup to rt-setup-database
+  tool for local schema
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Mon Nov 17 15:30:46 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      From: Jesse <jesse@bitsy>
+      Date: Sun Nov 16 18:09:16 2003
+      Warning: the original change was in the 'being_developed' state
+
+      none
+
+  rt.3.0.D289, C355, leira, Mon Nov 17 23:14:05 2003, Minor cleanups to RT cli
+  tool
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Mon Nov 17 14:59:54 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      From: Jesse <jesse@bitsy>
+      Date: Sun Nov 16 18:09:22 2003
+      Warning: the original change was in the 'being_developed' state
+
+      none
+
+  rt.3.0.D288, C362, jesse, Mon Nov 17 22:53:56 2003, Fixes to RT 3.0.7 upgrade
+  instructions; Bumping to 3.0.7_01
+      From: Jesse <jesse@bitsy>
+      Date: Tue Nov 18 23:56:48 2003
+
+      none
+
+  rt.3.0.D287, C361, jesse, Mon Nov 17 19:30:11 2003, Bumping to 3.0.7; Updated
+  DBIx::SearchBuilder dependency
+      From: Jesse <jesse@bitsy>
+      Date: Tue Nov 18 20:25:24 2003
+      Warning: the original change was in the 'being_developed' state
+
+      none
+
+  rt.3.0.D286, C353, jesse, Thu Nov 13 03:11:35 2003, Bumping to 3.0.7rc1
+      From: Jesse <jesse@bitsy>
+      Date: Fri Nov 14 04:13:34 2003
+
+      none
+
+  rt.3.0.D285, C352, jesse, Thu Nov 13 02:59:36 2003, CLI usage updates
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Thu Nov 13 02:58:17 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D284, C351, leira, Thu Nov 13 02:41:21 2003, CLI changes
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Thu Nov 13 02:36:17 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D283, C350, jesse, Mon Nov 10 01:26:11 2003, Bumping version to
+  3.0.7pre3
+      From: Jesse Vincent <jesse@hostname>
+      Date: Mon Nov 10 01:24:27 2003
+
+      none
+
+  rt.3.0.D282, C104, jesse, Mon Nov 10 01:16:01 2003, Merging ourinternet's
+  changes relative to 3.0.7pre2; UPGRADING update; postgres installation fixes
+      From: Jesse Vincent <jesse@hostname>
+      Date: Mon Nov 10 01:10:08 2003
+
+      none
+
+  rt.3.0.D281, C339, jesse, Thu Nov  6 21:11:46 2003, Small fix to ticket
+  searching to cut down on # of joins needed
+      From: Jesse Vincent <jesse@hostname>
+      Date: Thu Nov  6 21:11:21 2003
+
+      none
+
+  rt.3.0.D280, C338, jesse, Thu Nov  6 21:05:17 2003, Updating storable
+  dependency, to keep redhat 9 users from hurting themselves
+      From: Jesse Vincent <jesse@hostname>
+      Date: Thu Nov  6 20:53:44 2003
+
+      none
+
+  rt.3.0.D279, C335, leira, Tue Nov  4 21:11:39 2003, fix attachment links in
+  base RT
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Tue Nov  4 16:42:55 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D278, C333, leira, Tue Nov  4 21:10:18 2003, #4088: Postgres
+  performance improvements
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Tue Nov  4 16:25:57 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D277, C331, leira, Tue Nov  4 21:08:27 2003, #3583: set Last Contacted
+  date
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Mon Nov  3 13:58:57 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D276, C330, leira, Tue Nov  4 21:06:14 2003, #3601: SelectRights patch
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Sun Nov  2 22:03:23 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D275, C337, jesse, Tue Nov  4 18:18:39 2003, more work on the schema
+  diagram
+      From: Jesse Vincent <jesse@hostname>
+      Date: Tue Nov  4 18:16:53 2003
+
+      none
+
+  rt.3.0.D274, C336, jesse, Tue Nov  4 18:18:24 2003, New schema relationships
+  diagram in .dot format
+      From: Jesse Vincent <jesse@hostname>
+      Date: Tue Nov  4 17:51:10 2003
+
+      none
+
+  rt.3.0.D273, C329, leira, Tue Nov  4 17:52:14 2003, #3674: autohandler patch
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Sun Nov  2 21:49:43 2003
+
+      none
+
+  rt.3.0.D272, C332, leira, Tue Nov  4 17:29:08 2003, #3776: new indices
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Tue Nov  4 15:25:39 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D271, C328, leira, Sun Nov  2 23:07:51 2003, #3751:
+  ParseNewMessageForTicketCcs
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Sun Nov  2 21:16:07 2003
+
+      none
+
+  rt.3.0.D270, C327, leira, Sun Nov  2 22:49:39 2003, #3801: note when
+  transaction content is ellided
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Sun Nov  2 20:44:58 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D269, C326, leira, Sun Nov  2 22:31:42 2003, #3827: regression
+  shouldn't drop db
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Sun Nov  2 20:17:48 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D268, C325, leira, Sun Nov  2 21:15:22 2003, #3856: /REST/1.0/search/
+  tickets should work in UTC
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Sun Nov  2 19:57:19 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D267, C323, leira, Sun Nov  2 21:14:48 2003, #3855: require
+  Locale::Maketext::Lexicon 0.31
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Sun Nov  2 19:36:37 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D266, C322, leira, Sun Nov  2 21:14:18 2003, #3439: custom fields patch
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Sun Nov  2 19:11:11 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D265, C320, leira, Sun Nov  2 20:00:45 2003, #4087: allow non-ISO dates
+  in transaction searches
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Sun Nov  2 18:28:45 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D264, C321, leira, Sun Nov  2 19:59:21 2003, #3993: warn when
+  installing with mod_perl2
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Sun Nov  2 18:47:57 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D263, C319, leira, Sun Nov  2 18:51:11 2003, #3551: Create values
+  corrupted when adding new files
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Sun Nov  2 17:36:44 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D262, C318, leira, Sun Nov  2 18:50:09 2003, #3877: don't strip multi-
+  line headers
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Sun Nov  2 16:32:21 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D261, C317, leira, Sun Nov  2 18:49:15 2003, #3613: searching on NOT
+  LIKE
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Fri Oct 31 01:39:10 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D260, C316, leira, Fri Oct 31 11:59:11 2003, #3765: TicketsSQL is case-
+  sensitive
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Thu Oct 30 16:46:33 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D259, C312, jesse, Fri Oct 31 11:58:43 2003, Initial Informix port from
+  akso.de
+      From: Jesse Vincent <jesse@hostname>
+      Date: Thu Oct 30 13:03:54 2003
+
+      none
+
+  rt.3.0.D258, C311, leira, Fri Oct 31 11:57:33 2003, #3566: EditCustomField
+  supports Default for FreeformSingle
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Fri Oct 24 16:48:36 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D257, C313, jesse, Thu Oct 30 15:33:45 2003, Adding back missing
+  SelectLang
+      From: Jesse Vincent <jesse@hostname>
+      Date: Thu Oct 30 15:31:35 2003
+      Warning: the original change was in the 'being_developed' state
+
+      none
+
+  rt.3.0.D256, C94, jesse, Tue Oct 28 16:02:50 2003, Deep recursion issue on
+  localization handle; missing language selector
+      From: Jesse Vincent <jesse@hostname>
+      Date: Tue Oct 28 16:01:40 2003
+
+      none
+
+  rt.3.0.D255, C310, jesse, Wed Oct 22 00:33:40 2003, Slightly better debugging
+  on failure to send mail
+      From: Jesse Vincent <jesse@hostname>
+      Date: Wed Oct 22 00:25:35 2003
+
+      none
+
+  rt.3.0.D254, C307, jesse, Tue Oct 21 23:43:39 2003, User objects weren't
+  always destroyed, due to a circular reference
+      From: Jesse Vincent <jesse@hostname>
+      Date: Mon Oct 20 19:02:08 2003
+
+      none
+
+  rt.3.0.D253, C308, jesse, Tue Oct 21 23:35:50 2003, More reference weakening
+      From: Jesse Vincent <jesse@hostname>
+      Date: Tue Oct 21 23:34:11 2003
+
+      none
+
+  rt.3.0.D252, C306, jesse, Sun Oct 19 21:06:33 2003, #3907: New default
+  templates for user, ticket and queue
+      From: Jesse Vincent <jesse@hostname>
+      Date: Sun Oct 19 21:05:48 2003
+
+      none
+
+  rt.3.0.D251, C305, jesse, Sun Oct 19 21:00:11 2003, #3807: CLI example updates
+      From: Jesse Vincent <jesse@hostname>
+      Date: Sun Oct 19 20:59:14 2003
+
+      none
+
+  rt.3.0.D250, C303, jesse, Sun Oct 19 20:55:45 2003, #3822: Fix for cli bug
+  (Inapropriate use of arrayref)
+      From: Jesse Vincent <jesse@hostname>
+      Date: Sun Oct 19 20:54:22 2003
+
+      none
+
+  rt.3.0.D249, C302, jesse, Sun Oct 19 20:55:16 2003, #3889: add/del fixes
+      From: Jesse Vincent <jesse@hostname>
+      Date: Sun Oct 19 20:25:21 2003
+
+      none
+
+  rt.3.0.D248, C298, leira, Sun Oct 19 20:23:35 2003, bps #1032: SelfService
+  fixes
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Wed Oct  8 18:39:07 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D247, C84, jesse, Sun Oct 19 20:23:21 2003, #3981: Ticket creation
+  syntax fix
+      From: Jesse Vincent <jesse@hostname>
+      Date: Sun Oct 19 20:20:46 2003
+
+      none
+
+  rt.3.0.D246, C301, jesse, Sun Oct 19 20:11:09 2003, #2346: Resolving a
+  deprecation warning
+      From: Jesse Vincent <jesse@hostname>
+      Date: Sun Oct 19 20:10:25 2003
+
+      none
+
+  rt.3.0.D245, C300, jesse, Thu Oct 16 20:03:36 2003, A bunch of postgres
+  correctness fixes
+      From: Jesse Vincent <jesse@hostname>
+      Date: Thu Oct 16 20:00:27 2003
+
+      none
+
+  rt.3.0.D244, C299, jesse, Thu Oct 16 20:02:08 2003, Merging bugfixes from
+  ourinternet
+      From: Jesse Vincent <jesse@Jesse-Vincents-Computer.local.>
+      Date: Tue Oct 14 12:29:53 2003
+
+      none
+
+  rt.3.0.D243, C297, jesse, Wed Oct  8 11:47:30 2003, Conditionalizing
+  Text::Quoted display, so as to avoid utf8 crashes
+      From: Jesse Vincent <jesse@hostname>
+      Date: Wed Oct  8 16:46:31 2003
+
+      none
+
+  rt.3.0.D242, C296, jesse, Thu Sep 25 16:28:46 2003, Bumping to RT 3.0.6
+      From: Jesse Vincent <jesse@Jesse-Vincents-Computer.local.>
+      Date: Thu Sep 25 16:27:53 2003
+
+      none
+
+  rt.3.0.D241, C295, jesse, Thu Sep 25 15:13:08 2003, Updated documentation for
+  RT CLI tool
+      From: Jesse Vincent <jesse@Jesse-Vincents-Computer.local.>
+      Date: Thu Sep 25 15:12:46 2003
+
+      none
+
+  rt.3.0.D240, C293, jesse, Mon Sep 22 16:21:10 2003, Bumping to 3.0.6RC1
+      From: Jesse Vincent <jesse@localhost>
+      Date: Mon Sep 22 16:20:02 2003
+
+      none
+
+  rt.3.0.D239, C292, jesse, Mon Sep 22 16:21:00 2003, fixing a multiple-
+  signature-inclusion bug
+      From: Jesse Vincent <jesse@localhost>
+      Date: Mon Sep 22 15:29:40 2003
+
+      none
+
+  rt.3.0.D238, C291, jesse, Mon Sep 22 14:46:52 2003, Fixing a couple bugs
+  related to display of links
+      From: Jesse Vincent <jesse@localhost>
+      Date: Mon Sep 22 14:44:12 2003
+
+      none
+
+  rt.3.0.D237, C290, jesse, Mon Sep  8 14:18:29 2003, RT 3.0.5
+      From: Jesse Vincent <jesse@localhost>
+      Date: Mon Sep  8 14:12:19 2003
+
+      none
+
+  rt.3.0.D236, C289, jesse, Mon Sep  8 13:47:05 2003, Custom field values
+  couldn't be set to '0'; README updated for apache2
+      From: Jesse Vincent <jesse@localhost>
+      Date: Mon Sep  8 13:45:41 2003
+
+      none
+
+  rt.3.0.D235, C288, jesse, Sat Sep  6 01:52:41 2003, Patches to the cli from
+  ams
+      From: Jesse Vincent <jesse@localhost>
+      Date: Sat Sep  6 01:50:41 2003
+
+      none
+
+  rt.3.0.D234, C287, jesse, Tue Sep  2 18:16:15 2003, Bumping to 3.0.5RC1
+      From: Jesse Vincent <jesse@localhost>
+      Date: Tue Sep  2 18:15:51 2003
+
+      none
+
+  rt.3.0.D233, C286, jesse, Fri Aug 29 21:10:44 2003, Bumping to 3.0.5pre6
+      From: Jesse Vincent <jesse@localhost>
+      Date: Fri Aug 29 18:01:40 2003
+
+      none
+
+  rt.3.0.D232, C285, jesse, Fri Aug 29 21:10:24 2003, Better handling of
+  apparently bogus email; rationalize mail gateway error codes
+      From: Jesse Vincent <jesse@localhost>
+      Date: Fri Aug 29 18:01:29 2003
+
+      none
+
+  rt.3.0.D231, C283, jesse, Fri Aug 29 16:26:30 2003, #3399: Message parsing
+  fails for some types of report
+      From: Jesse Vincent <jesse@localhost>
+      Date: Fri Aug 29 16:25:33 2003
+
+      none
+
+  rt.3.0.D230, C64, jesse, Thu Aug 28 17:40:29 2003, Bumping to 3.0.5pre5
+      From: Jesse Vincent <jesse@localhost>
+      Date: Thu Aug 28 17:32:38 2003
+
+      none
+
+  rt.3.0.D229, C279, leira, Thu Aug 28 17:39:37 2003, #2651: localize die/warn
+  handlers
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Tue Aug 26 15:38:12 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D228, C282, jesse, Thu Aug 28 17:38:28 2003, fixing the new testdeps
+  thing
+      From: Jesse Vincent <jesse@localhost>
+      Date: Thu Aug 28 17:38:07 2003
+
+      none
+
+  rt.3.0.D227, C281, jesse, Thu Aug 28 17:34:18 2003, More explicit warning
+  about a lack of perl 5.8
+      From: Jesse Vincent <jesse@localhost>
+      Date: Thu Aug 28 17:30:47 2003
+
+      none
+
+  rt.3.0.D226, C280, jesse, Thu Aug 28 17:33:15 2003, Post 3.0.5pre3 - sometimes
+  silently losing mail. fixed a possible bug, improved testing
+      From: Jesse Vincent <jesse@localhost>
+      Date: Thu Aug 28 17:09:51 2003
+
+      none
+
+  rt.3.0.D225, C278, jesse, Tue Aug 26 15:29:24 2003, Fixes to attempt to stop
+  mysql 'morning bugs' with mysql
+      From: Jesse Vincent <jesse@localhost>
+      Date: Tue Aug 26 15:28:20 2003
+
+      none
+
+  rt.3.0.D224, C277, leira, Tue Aug 26 15:04:20 2003, #3114: increase subject
+  length in non-Postgres dbs
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Tue Aug 26 14:51:25 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D223, C276, leira, Tue Aug 26 15:03:17 2003, #3354: an additional fix
+  for avoiding the morning bug
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Mon Aug 25 17:58:27 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D222, C275, leira, Tue Aug 26 15:02:16 2003, #3384: recursive merge
+  patches
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Mon Aug 25 17:02:00 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D221, C273, leira, Mon Aug 25 16:33:53 2003, #3105: CreateTickets
+  doesn't set ticket type
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Mon Aug 25 16:30:06 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D220, C272, leira, Mon Aug 25 15:53:13 2003, #3236: allow attachments
+  without other txn contents
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Mon Aug 25 15:47:52 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D219, C270, leira, Mon Aug 25 15:13:31 2003, #3349: umlauts aren't
+  correct in subject
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Mon Aug 25 13:55:52 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D218, C271, leira, Mon Aug 25 15:13:05 2003, #3012: vertical alignment
+  in Ticket/Elements/ShowPeople
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Mon Aug 25 14:08:04 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D217, C269, leira, Mon Aug 25 14:45:12 2003, #3341: edit comments in
+  SiteConfig
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Mon Aug 25 13:38:51 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D216, C268, jesse, Sun Aug 24 17:16:04 2003, Bumping version to
+  3.0.5pre4
+      From: Jesse Vincent <jesse@localhost>
+      Date: Sun Aug 24 17:15:36 2003
+
+      none
+
+  rt.3.0.D215, C253, jesse, Sun Aug 24 17:12:37 2003, Fixing improperly applied
+  custom field editing patches
+      From: Jesse Vincent <jesse@localhost>
+      Date: Sun Aug 24 17:11:40 2003
+
+      none
+
+  rt.3.0.D214, C267, leira, Sun Aug 24 14:57:37 2003, #3324: Apache::DBI must be
+  0.92 or newer
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Fri Aug 22 14:40:27 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D213, C265, leira, Fri Aug 22 13:30:09 2003, #3118: change default
+  unset mail address
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Fri Aug 22 12:13:22 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D212, C266, leira, Fri Aug 22 13:29:46 2003, #2693: show proper id in
+  menu after creation
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Fri Aug 22 12:39:53 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D211, C263, leira, Fri Aug 22 01:18:00 2003, #3281: form actions must
+  not be paths
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Fri Aug 22 01:12:07 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D210, C260, leira, Fri Aug 22 01:13:07 2003, #2558: allow access to CFs
+  with no name
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Thu Aug 21 22:36:35 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D209, C251, leira, Fri Aug 22 01:07:34 2003, #2617: custom field
+  ordering
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Wed Aug 20 17:33:22 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D208, C262, leira, Fri Aug 22 01:00:21 2003, #3143: Italian translation
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Fri Aug 22 00:52:11 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D207, C261, leira, Thu Aug 21 23:31:22 2003, #3240: DeleteWatcher, not
+  DelWatcher
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Thu Aug 21 23:22:40 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D206, C258, leira, Thu Aug 21 23:07:01 2003, #2409: colons after labels
+  in Create.html
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Thu Aug 21 17:23:04 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D205, C257, leira, Thu Aug 21 23:06:12 2003, #2700: configurable home
+  page ticket list length
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Thu Aug 21 15:08:27 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D204, C259, leira, Thu Aug 21 22:37:27 2003, #2773: don't allow
+  searching for deleted tickets
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Thu Aug 21 22:15:43 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D203, C256, leira, Thu Aug 21 14:09:59 2003, #2160: clarify that box
+  deletes scrips
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Thu Aug 21 13:53:00 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D202, C255, leira, Thu Aug 21 14:09:27 2003, #2268: align fields in
+  User/Prefs.html
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Thu Aug 21 13:21:00 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D201, C252, leira, Wed Aug 20 18:13:50 2003, #2687: add ticket subject
+  to resolved template
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Wed Aug 20 17:58:22 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D200, C250, leira, Wed Aug 20 13:33:40 2003, #3329: Email.pm patch
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Wed Aug 20 13:19:58 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D199, C239, leira, Tue Aug 19 23:05:34 2003, #3309: switch lines in
+  User/Prefs.html
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Tue Aug 19 22:59:28 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D198, C236, leira, Tue Aug 19 22:47:07 2003, #3278: occasional internal
+  server error in RT.pm
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Tue Aug 19 22:44:16 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D197, C233, leira, Tue Aug 19 22:28:05 2003, #3242: cannonicalize
+  addresses in comments
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Tue Aug 19 22:21:57 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D196, C238, leira, Tue Aug 19 22:07:37 2003, #3114: allow longer
+  subject lines for postgres
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Tue Aug 19 22:01:02 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D195, C235, leira, Tue Aug 19 21:54:16 2003, #2653: Email.pm patch
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Tue Aug 19 19:57:12 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D194, C237, leira, Tue Aug 19 21:51:11 2003, #2672: custom field values
+  ordering
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Tue Aug 19 21:19:44 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D193, C232, jesse, Mon Aug 18 22:16:09 2003, Old relationship update
+  transactions weren't properly displayed
+      From: Jesse Vincent <jesse@localhost>
+      Date: Mon Aug 18 22:14:33 2003
+
+      none
+
+  rt.3.0.D192, C218, leira, Thu Aug 14 13:37:04 2003, #2955: wrapping in
+  messagebox
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Wed Aug 13 17:28:03 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D191, C230, jesse, Tue Aug 12 02:54:11 2003, #3230: Parser patch to
+  make watchers searches more efficient
+      From: Jesse Vincent <jesse@localhost>
+      Date: Mon Aug 11 14:41:00 2003
+
+      none
+
+  rt.3.0.D190, C54, jesse, Tue Aug 12 02:49:27 2003, #3279: Make fsck.com-rt:
+  URIs case insensitive
+      From: Jesse Vincent <jesse@localhost>
+      Date: Mon Aug 11 15:25:07 2003
+
+      none
+
+  rt.3.0.D189, C231, jesse, Tue Aug 12 02:47:19 2003, #3237: Queue-specific
+  templates with the same name as global templates will now override the globals
+  for queue-related scrips
+      From: Jesse Vincent <jesse@localhost>
+      Date: Mon Aug 11 15:04:37 2003
+
+      none
+
+  rt.3.0.D188, C49, jesse, Fri Aug  8 01:57:57 2003, Dependencies updated;
+  performance and memory usage fixes for ticket creation memory usage
+      From: Jesse Vincent <jesse@localhost>
+      Date: Fri Aug  8 01:54:16 2003
+
+      none
+
+  rt.3.0.D187, C47, jesse, Mon Aug  4 23:20:33 2003, Bumping to 3.0.5pre3
+      From: Jesse Vincent <jesse@localhost>
+      Date: Mon Aug  4 23:20:16 2003
+
+      none
+
+  rt.3.0.D186, C46, jesse, Mon Aug  4 19:15:22 2003, #2792: When finding out if
+  someone is a queue watcher, check groups recursively
+      From: Jesse Vincent <jesse@localhost>
+      Date: Mon Aug  4 19:14:50 2003
+
+      none
+
+  rt.3.0.D185, C45, jesse, Mon Aug  4 18:55:13 2003, #3152: Updated russian .po
+  file
+      From: Jesse Vincent <jesse@localhost>
+      Date: Mon Aug  4 18:50:35 2003
+
+      none
+
+  rt.3.0.D184, C44, jesse, Mon Aug  4 18:27:40 2003, #3131: Preliminary support
+  for Oracle from Brook Schonfield
+      From: Jesse Vincent <jesse@localhost>
+      Date: Mon Aug  4 18:26:08 2003
+
+      none
+
+  rt.3.0.D183, C43, jesse, Mon Aug  4 16:19:07 2003, #3068: Better setting of
+  Due dates via the web ui
+      From: Jesse Vincent <jesse@localhost>
+      Date: Mon Aug  4 16:18:50 2003
+
+      none
+
+  rt.3.0.D182, C41, jesse, Mon Aug  4 16:02:01 2003, #3022: Update to German
+  translation
+      From: Jesse Vincent <jesse@localhost>
+      Date: Mon Aug  4 16:01:08 2003
+
+      none
+
+  rt.3.0.D181, C42, jesse, Thu Jul 31 13:34:50 2003, Bumping version to 3.0.5-
+  pre2
+      From: Jesse Vincent <jesse@localhost>
+      Date: Thu Jul 31 13:28:35 2003
+
+      none
+
+  rt.3.0.D180, C40, jesse, Tue Jul 29 02:24:22 2003, #3200 - AND MultipleSelect
+  CFs together -  OR all other CFs together.
+      From: Jesse Vincent <jesse@localhost>
+      Date: Tue Jul 29 02:21:50 2003
+
+      none
+
+  rt.3.0.D179, C229, jesse, Tue Jul 29 02:09:06 2003, #3201: Perform more clever
+  joining to enhance custom field search results
+      From: Jesse Vincent <jesse@localhost>
+      Date: Tue Jul 29 02:06:22 2003
+
+      none
+
+  rt.3.0.D178, C228, jesse, Tue Jul 29 01:17:12 2003, #3199: normalize custom
+  fields searching syntax - Global CF's previously didn't allow the { }
+      From: Jesse Vincent <jesse@localhost>
+      Date: Tue Jul 29 01:16:28 2003
+
+      none
+
+  rt.3.0.D177, C227, jesse, Mon Jul 28 01:39:28 2003, [fsck.com #2378] personal
+  permissions for installation
+      From: Robert <rspier@bear>
+      Date: Sun Jul 27 22:19:40 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      install as current user option for configure
+
+  rt.3.0.D176, C34, jesse, Mon Jul 28 00:00:12 2003, Failed user creation didn't
+  always properly roll-back the database
+      From: Jesse Vincent <jesse@localhost>
+      Date: Sun Jul 27 23:59:16 2003
+
+      none
+
+  rt.3.0.D175, C226, jesse, Sun Jul 27 23:52:28 2003, Code to catch execution
+  problems within RT's web app server was made more robust
+      From: Jesse Vincent <jesse@localhost>
+      Date: Sun Jul 27 23:51:50 2003
+
+      none
+
+  rt.3.0.D174, C225, jesse, Sun Jul 27 23:44:44 2003, One I18N 'fix' from
+  ourinternet tainted attachment data, breaking tests
+      From: Jesse Vincent <jesse@localhost>
+      Date: Sun Jul 27 23:44:17 2003
+
+      none
+
+  rt.3.0.D173, C223, jesse, Sun Jul 27 17:16:20 2003, Adding the RT coding style
+  guide to the distribution
+      From: Jesse Vincent <jesse@localhost>
+      Date: Sun Jul 27 17:15:32 2003
+
+      none
+
+  rt.3.0.D172, C222, jesse, Fri Jul 25 19:50:19 2003, fixes for the importer
+      From: Jesse Vincent <jesse@localhost>
+      Date: Fri Jul 25 19:49:06 2003
+
+      none
+
+  rt.3.0.D171, C221, leira, Fri Jul 25 14:02:49 2003, 3158: user can delete only
+  with DeleteTicket right
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Fri Jul 25 02:44:41 2003
+      Warning: the original change was in the 'being_developed' state
+
+      none
+
+  rt.3.0.D170, C220, leira, Fri Jul 25 14:01:38 2003, #2989: regexp changes for
+  Subject and loop-detection
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Fri Jul 25 02:02:18 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D169, C219, leira, Fri Jul 25 13:52:47 2003, #2855: User_Overlay and
+  Template_Overlay fixes
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Fri Jul 25 01:08:37 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D168, C216, leira, Fri Jul 25 13:45:37 2003, #2692: make $Domain an
+  argument for SelectGroups
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Thu Jul 24 23:31:35 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D167, C215, jesse, Thu Jul 24 23:25:01 2003, Merging
+  internationalization fixes from ourinternet
+      From: Jesse Vincent <jesse@localhost>
+      Date: Thu Jul 24 23:22:46 2003
+
+      none
+
+  rt.3.0.D166, C213, jesse, Thu Jul 24 18:39:57 2003, Bumping to 3.0.5pre1
+      From: Jesse Vincent <jesse@localhost>
+      Date: Thu Jul 24 18:38:14 2003
+
+      none
+
+  rt.3.0.D165, C212, jesse, Wed Jul 23 18:06:41 2003, License tagger was tagging
+  Makefile, not Makefile.in. Reconfigured.
+      From: Jesse Vincent <jesse@localhost>
+      Date: Wed Jul 23 18:03:14 2003
+
+      none
+
+  rt.3.0.D164, C211, jesse, Wed Jul 23 15:23:11 2003, Requestor searches had an
+  extra join that they didn't need
+      From: Jesse Vincent <jesse@localhost>
+      Date: Wed Jul 23 15:22:34 2003
+
+      none
+
+  rt.3.0.D163, C207, leira, Tue Jul 22 03:10:34 2003, regression tests: use
+  $RT::WebPath and RT_LIB_PATH
+      From: Linda L. Julien <leira@starsong.org>
+      Date: Mon Jul 21 18:12:56 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D162, C210, jesse, Tue Jul 22 02:52:01 2003, A couple of fixes to
+  better deal with creation of 'blank' ticket requestors
+      From: Jesse Vincent <jesse@localhost>
+      Date: Tue Jul 22 02:50:09 2003
+
+      none
+
+  rt.3.0.D161, C208, leira, Tue Jul 22 01:56:30 2003, #1651: URIs not escaped in
+  ticket display
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Mon Jul 21 18:33:24 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D160, C209, leira, Tue Jul 22 01:54:49 2003, #1751: update second page
+  in Bulk update
+      From: Linda Julien <leira@hawthorn.local.>
+      Date: Mon Jul 21 20:54:02 2003
+      Warning: the original change was in the 'awaiting_integration' state
+
+      none
+
+  rt.3.0.D159, C24, jesse, Fri Jul 18 18:59:13 2003, Certain ACL checks could
+  fail on postgres due to a marshalling bug
+      From: Jesse Vincent <jesse@localhost>
+      Date: Fri Jul 18 17:06:39 2003
+
+      none
+
+  rt.3.0.D158, C206, jesse, Fri Jul 18 18:58:22 2003, Extended ACL edit routines
+  to make it easier to use generic routines in 3rd party apps
+      From: Jesse Vincent <jesse@localhost>
+      Date: Fri Jul 18 17:04:15 2003
+
+      none
+
+  rt.3.0.D157, C205, jesse, Mon Jul 14 02:51:28 2003, Removing ancient cli code
+  that was accidentally added to the repository
+      From: Jesse Vincent <jesse@localhost>
+      Date: Sun Jul 13 23:47:51 2003
+
+      none
+
+  rt.3.0.D156, C203, jesse, Sun Jul 13 22:35:44 2003, More updates to the
+  commandline client
+      From: Jesse Vincent <jesse@localhost>
+      Date: Sun Jul 13 19:32:10 2003
+
+      none
+
+  rt.3.0.D155, C202, jesse, Sun Jul 13 21:33:58 2003, Initial commit of new
+  commandline client support code
+      From: Jesse Vincent <jesse@localhost>
+      Date: Sun Jul 13 18:33:29 2003
+
+      none
+
+  rt.3.0.D154, C196, jesse, Sun Jul 13 18:06:09 2003, #3029 - better warning
+  message on improper perms on mail in
+      From: Jesse Vincent <jesse@localhost>
+      Date: Tue Jul  8 16:59:59 2003
+
+      none
+
+  rt.3.0.D153, C195, jesse, Sun Jul 13 18:05:41 2003, #3042: Make max inline
+  body size configurable
+      From: Jesse Vincent <jesse@localhost>
+      Date: Tue Jul  8 16:55:28 2003
+
+      none
 
   rt.3.0.D152, C201, jesse, Sat Jul 12 02:41:34 2003, Bumping version to 3.0.4
       From: Jesse Vincent <jesse@localhost>
diff --git a/rt/Makefile b/rt/Makefile
index 644722109..0895874fb 100644
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -1,20 +1,19 @@
 # BEGIN LICENSE BLOCK
 # 
-# Copyright (c) 1996-2002 Jesse Vincent <jesse@bestpractical.com>
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
 # 
 # (Except where explictly superceded by other copyright notices)
 # 
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
 # been provided with this software, but in any event can be snarfed
-# from www.gnu.org
+# from www.gnu.org.
 # 
 # This work 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.
 # 
-# 
 # Unless otherwise specified, all modifications, corrections or
 # extensions to this work which alter its source code become the
 # property of Best Practical Solutions, LLC when submitted for
@@ -22,8 +21,6 @@
 # 
 # 
 # END LICENSE BLOCK
-
-
 #
 # DO NOT HAND-EDIT the file named 'Makefile'. This file is autogenerated.
 # Have a look at "configure" and "Makefile.in" instead
@@ -39,7 +36,7 @@ SITE_CONFIG_FILE		= 	$(CONFIG_FILE_PATH)/RT_SiteConfig.pm
 
 RT_VERSION_MAJOR	=	3
 RT_VERSION_MINOR	=	0
-RT_VERSION_PATCH	=	4
+RT_VERSION_PATCH	=	9
 
 RT_VERSION =	$(RT_VERSION_MAJOR).$(RT_VERSION_MINOR).$(RT_VERSION_PATCH)
 TAG 	   =	rt-$(RT_VERSION_MAJOR)-$(RT_VERSION_MINOR)-$(RT_VERSION_PATCH)
@@ -101,8 +98,8 @@ RT_MODPERL_HANDLER	=	$(RT_BIN_PATH)/webmux.pl
 RT_FASTCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.fcgi
 # RT_WIN32_FASTCGI_HANDLER is the mason handler script for FastCGI
 RT_WIN32_FASTCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.svc
-# RT's admin CLI
-RT_CLI_ADMIN_BIN	=	$(RT_BIN_PATH)/rtadmin
+# RT's CLI
+RT_CLI_BIN		=	$(RT_BIN_PATH)/rt
 # RT's mail gateway
 RT_MAILGATE_BIN		=	$(RT_BIN_PATH)/rt-mailgate
 # RT's cron tool
@@ -115,6 +112,7 @@ SETGID_BINARIES	 	= 	$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
 
 BINARIES		=	$(DESTDIR)/$(RT_MODPERL_HANDLER) \
 				$(DESTDIR)/$(RT_MAILGATE_BIN) \
+				$(DESTDIR)/$(RT_CLI_BIN) \
 				$(DESTDIR)/$(RT_CRON_BIN) \
 				$(SETGID_BINARIES)
 SYSTEM_BINARIES		=	$(DESTDIR)/$(RT_SBIN_PATH)/
@@ -128,6 +126,7 @@ SYSTEM_BINARIES		=	$(DESTDIR)/$(RT_SBIN_PATH)/
 # DB_TYPE defines what sort of database RT trys to talk to
 # "mysql" is known to work.
 # "Pg" is known to work
+# "Informix" is known to work
 
 DB_TYPE			=	mysql
 
@@ -138,7 +137,8 @@ DB_TYPE			=	mysql
 
 # For mysql, you probably want 'root'
 # For Pg, you probably want 'postgres' 
-# For oracle, you want 'system'
+# For Oracle, you want 'system'
+# For Informix, you want 'informix'
 
 DB_DBA			=	root
 
@@ -211,7 +211,7 @@ upgrade-instruct:
 	@echo "	   $(RT_SBIN_PATH)/rt-setup-database --action insert --datafile etc/upgrade/<version>"
 
 
-upgrade: dirs upgrade-noclobber upgrade-instruct
+upgrade: config-install dirs files-install fixperms upgrade-instruct
 
 upgrade-noclobber: config-install libs-install html-install bin-install local-install doc-install fixperms
 
@@ -312,13 +312,16 @@ config-install:
 test: 
 	$(PERL) -Ilib lib/t/00smoke.t
 
-regression-nosetgid-quiet: config-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms-nosetgid apachectl
+regression-install: config-install
+	$(PERL) -pi -e 's/Set\(\$$DatabaseName.*\);/Set\(\$$DatabaseName, "rt3regression"\);/' $(DESTDIR)/$(CONFIG_FILE)
+
+regression-nosetgid-quiet: regression-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms-nosetgid apachectl
 	$(PERL) sbin/regression_harness
 
-regression-nosetgid: config-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms-nosetgid apachectl
+regression-nosetgid: regression-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms-nosetgid apachectl
 	$(PERL) lib/t/02regression.t
 
-regression: config-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods apachectl
+regression: regression-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms apachectl
 	$(PERL) lib/t/02regression.t
 
 regression-quiet:
@@ -397,7 +400,9 @@ bin-install:
 	-cp -rp \
 		bin/rt-mailgate \
 		bin/mason_handler.fcgi \
+		bin/mason_handler.scgi \
 		bin/mason_handler.svc \
+		bin/rt \
 		bin/webmux.pl \
 		bin/rt-crontool \
 		$(DESTDIR)/$(RT_BIN_PATH)
diff --git a/rt/Makefile.in b/rt/Makefile.in
index 245ec5ed3..c3eabc634 100644
--- a/rt/Makefile.in
+++ b/rt/Makefile.in
@@ -1,20 +1,19 @@
 # BEGIN LICENSE BLOCK
 # 
-# Copyright (c) 1996-2002 Jesse Vincent <jesse@bestpractical.com>
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
 # 
 # (Except where explictly superceded by other copyright notices)
 # 
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
 # been provided with this software, but in any event can be snarfed
-# from www.gnu.org
+# from www.gnu.org.
 # 
 # This work 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.
 # 
-# 
 # Unless otherwise specified, all modifications, corrections or
 # extensions to this work which alter its source code become the
 # property of Best Practical Solutions, LLC when submitted for
@@ -22,8 +21,6 @@
 # 
 # 
 # END LICENSE BLOCK
-
-
 #
 # DO NOT HAND-EDIT the file named 'Makefile'. This file is autogenerated.
 # Have a look at "configure" and "Makefile.in" instead
@@ -101,8 +98,8 @@ RT_MODPERL_HANDLER	=	$(RT_BIN_PATH)/webmux.pl
 RT_FASTCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.fcgi
 # RT_WIN32_FASTCGI_HANDLER is the mason handler script for FastCGI
 RT_WIN32_FASTCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.svc
-# RT's admin CLI
-RT_CLI_ADMIN_BIN	=	$(RT_BIN_PATH)/rtadmin
+# RT's CLI
+RT_CLI_BIN		=	$(RT_BIN_PATH)/rt
 # RT's mail gateway
 RT_MAILGATE_BIN		=	$(RT_BIN_PATH)/rt-mailgate
 # RT's cron tool
@@ -115,6 +112,7 @@ SETGID_BINARIES	 	= 	$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
 
 BINARIES		=	$(DESTDIR)/$(RT_MODPERL_HANDLER) \
 				$(DESTDIR)/$(RT_MAILGATE_BIN) \
+				$(DESTDIR)/$(RT_CLI_BIN) \
 				$(DESTDIR)/$(RT_CRON_BIN) \
 				$(SETGID_BINARIES)
 SYSTEM_BINARIES		=	$(DESTDIR)/$(RT_SBIN_PATH)/
@@ -128,6 +126,7 @@ SYSTEM_BINARIES		=	$(DESTDIR)/$(RT_SBIN_PATH)/
 # DB_TYPE defines what sort of database RT trys to talk to
 # "mysql" is known to work.
 # "Pg" is known to work
+# "Informix" is known to work
 
 DB_TYPE			=	@DB_TYPE@
 
@@ -138,7 +137,8 @@ DB_TYPE			=	@DB_TYPE@
 
 # For mysql, you probably want 'root'
 # For Pg, you probably want 'postgres' 
-# For oracle, you want 'system'
+# For Oracle, you want 'system'
+# For Informix, you want 'informix'
 
 DB_DBA			=	@DB_DBA@
 
@@ -211,7 +211,7 @@ upgrade-instruct:
 	@echo "	   $(RT_SBIN_PATH)/rt-setup-database --action insert --datafile etc/upgrade/<version>"
 
 
-upgrade: dirs upgrade-noclobber upgrade-instruct
+upgrade: config-install dirs files-install fixperms upgrade-instruct
 
 upgrade-noclobber: config-install libs-install html-install bin-install local-install doc-install fixperms
 
@@ -312,13 +312,16 @@ config-install:
 test: 
 	$(PERL) -Ilib lib/t/00smoke.t
 
-regression-nosetgid-quiet: config-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms-nosetgid apachectl
+regression-install: config-install
+	$(PERL) -pi -e 's/Set\(\$$DatabaseName.*\);/Set\(\$$DatabaseName, "rt3regression"\);/' $(DESTDIR)/$(CONFIG_FILE)
+
+regression-nosetgid-quiet: regression-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms-nosetgid apachectl
 	$(PERL) sbin/regression_harness
 
-regression-nosetgid: config-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms-nosetgid apachectl
+regression-nosetgid: regression-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms-nosetgid apachectl
 	$(PERL) lib/t/02regression.t
 
-regression: config-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods apachectl
+regression: regression-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms apachectl
 	$(PERL) lib/t/02regression.t
 
 regression-quiet:
@@ -397,7 +400,9 @@ bin-install:
 	-cp -rp \
 		bin/rt-mailgate \
 		bin/mason_handler.fcgi \
+		bin/mason_handler.scgi \
 		bin/mason_handler.svc \
+		bin/rt \
 		bin/webmux.pl \
 		bin/rt-crontool \
 		$(DESTDIR)/$(RT_BIN_PATH)
diff --git a/rt/README b/rt/README
index 7c5e4d47a..7188f0938 100755
--- a/rt/README
+++ b/rt/README
@@ -21,6 +21,7 @@
 # 
 # 
 # END LICENSE BLOCK
+
 RT is an enterprise-grade issue tracking system. It allows
 organizations to keep track of their to-do lists, who is working
 on which tasks, what's already been done, and when tasks were
@@ -36,22 +37,22 @@ up and use.
 REQUIRED PACKAGES:
 ------------------
 
-o   Perl 5.8.0 or later (http://www.perl.com).
+o   Perl 5.8.3 or later (http://www.perl.com).
 
  	(If you intend to use the FastCGI or SpeedyCGI support, you 
 	 need to make sure that perl has been built with support for 
 	 setgid perl scripts.)`
 
+    Perl versions prior to 5.8.3 contain bugs that could result in data
+    corruption. We recommend strongly that you use 5.8.3 or newer.
+
     Perl 5.6.1 is currently deprecated and will be officially desupported
     in a future release
 
 o   A DB backend; MySQL is recommended ( http://www.mysql.com ) 
         Currently supported:  Mysql 4.0.13 or later. 
                               Postgres 7.2 or later.
-
-                              Mysql 3.23.46 or newer with support for InnoDB 
-			      is currently deprecated and will be officially
-			      desupported in a future release.
+                              Oracle 9iR2.
 
 o   Apache version 1.3.x or 2.x (http://httpd.apache.org) 
     with mod_perl -- (http://perl.apache.org ) 
@@ -119,7 +120,7 @@ http://www.bestpractical.com/rt
    perl sbin/rt-test-dependencies \ 
                 --with-<databasename> --with-<web-environment>
 
-        databasename is one of: mysql, postgres
+        databasename is one of: mysql, postgres, oracle
         web-environment is one of: fastcgi, modperl1, modperl2
 
 3.2   If there are unsatisfied dependencies, install them by hand or run:
@@ -151,6 +152,10 @@ http://www.bestpractical.com/rt
 
 5b  FOR UPGRADING: (Within the RT 3.0.x series)
 
+
+        Read through the UPGRADING document included in this distribution.
+        It may contain important instructions for updating your database
+
         As root, type: 
                 make upgrade     (replace "make" with the local name for 
                                   Make, if you need to)
@@ -160,6 +165,14 @@ http://www.bestpractical.com/rt
         
         It may then instruct you to update your RT system database objects 
 
+5c  FOR UPGRADING: (From RT 2.0.x)
+
+    Download the RT2 to RT3 migration tools from:
+
+    http://bestpractical.com/pub/rt/devel/rt2-to-rt3.tar.gz
+
+    Follow the included instructions.
+
 6   Edit etc/RT_SiteConfig.pm in your RT installation directory, by specifying
     any values you need to change from the defaults in etc/RT_Config.pm
 
@@ -192,31 +205,20 @@ Apache
     DocumentRoot /opt/rt3/share/html
     AddDefaultCharset UTF-8
 
-    # this line applies to Apache2+mod_perl2 only
+    # these four lines apply to Apache2+mod_perl2 only: {{{
+    PerlSetVar MasonArgsMethod CGI
     PerlModule Apache2 Apache::compat
+    RewriteEngine On
+    RewriteRule ^(.*)/$ $1/index.html
+    # }}}
 
     PerlModule Apache::DBI
     PerlRequire /opt/rt3/bin/webmux.pl
 
-    # this section applies to Apache 1 only
     <Location />
         SetHandler perl-script
         PerlHandler RT::Mason
     </Location>
-
-    # this section applies to Apache2+mod_perl2 only
-    <FilesMatch "\.html$">
-        SetHandler perl-script
-        PerlHandler RT::Mason
-    </FilesMatch>
-    <LocationMatch "/Attachment/">
-        SetHandler perl-script
-        PerlHandler RT::Mason
-    </LocationMatch>
-    <LocationMatch "/REST/">
-        SetHandler perl-script
-        PerlHandler RT::Mason
-    </LocationMatch>
 </VirtualHost>
 
 
diff --git a/rt/README.Oracle b/rt/README.Oracle
new file mode 100644
index 000000000..41bec822c
--- /dev/null
+++ b/rt/README.Oracle
@@ -0,0 +1,37 @@
+In order to install RT with Oracle, the database must first be
+prepared.  Ports of RT to other databases will automatically create
+the RT schema.  This is not done for Oracle because most sites wishing
+to deploy RT on Oracle will have choose to make specific configuration
+of the RT user, for example to select the appropriate tablespace or to
+set up a resource profile.  The RT user must have appropriate
+privileges similar to the resource and connect roles and must have the
+"query rewrite" system privilege.
+  Here is an example of commands to create an RT user called "RT" with
+a password of "rt".
+
+  create user rt identified by rt default tablespace users temporary
+    tablespace temp;
+  grant resource, connect, query rewrite to rt;
+
+
+RT should not run its schema creation as the Oracle DBA; instead the
+schema creation should be run as the RT user.  To accomplish this set
+the --with-rt-dba configuration parameter to the RT user, not to the
+Oracle DBA.  As an example, the following might be appropriate to
+configure RT for the example.com Oracle database.
+
+  ./configure --prefix /usr/local/rt --with-db-type=Oracle \
+        --with-db-dba=rt --with-db-database=example.com \
+    --with-db-rt-user=rt \
+        --with-db-rt-pass=rt 
+
+
+As with all databases it is important to analyze the Schema and get
+current statistics after any significant dataset change.  Oracle's
+cost-based optimizer can provide particularly bad performance when the
+schema statistics are significantly inaccurate.  To analyze the schema
+of a user called rt, execute the following from withing Sqlplus.
+
+  execute dbms_utility.analyze_schema( 'RT', 'estimate');
+
+
diff --git a/rt/UPGRADING b/rt/UPGRADING
new file mode 100644
index 000000000..4306eb6cb
--- /dev/null
+++ b/rt/UPGRADING
@@ -0,0 +1,64 @@
+UPGRADING
+
+
+*******
+WARNING
+*******
+
+
+Before making any changes to your database, always ensure that you have a 
+complete current backup. If you don't have a current backup, you could 
+accidentally damage your database and lose data or worse.
+
+
+
+Look for the 
+
+
+----------------------------------------------------------------------
+
+3.0.7
+=====
+
+All Databases
+-------------
+
+If you are upgrading from versions between 3.0.0 and 3.0.7, inclusive,
+you might find improved performance by adding the following index to
+your database:
+
+CREATE INDEX Links4 ON Links(Type,LocalBase);
+
+
+
+3.0.6
+=====
+
+
+All Databases
+-------------
+
+If you are upgrading from versions between 3.0.0 and 3.0.6, inclusive,
+you might find improved performance by adding the following indices to
+your database:
+
+   CREATE INDEX TicketCustomFieldValues1 ON TicketCustomFieldValues (CustomField,Ticket,Content); 
+   CREATE INDEX TicketCustomFieldValues2 ON TicketCustomFieldValues (CustomField,Ticket); 
+
+   CREATE INDEX CustomFieldValues1 ON CustomFieldValues (CustomField);
+
+
+
+Postgres
+--------
+
+If you have a Postgres database, the following changes to your
+database can improve performance:
+
+  ALTER TABLE groups rename instance to instance1;
+  ALTER TABLE groups add instance int;
+  UPDATE groups SET instance = instance1::text::int where btrim(instance1) <> '';
+  ALTER TABLE groups drop column instance1;
+
+
+
diff --git a/rt/autom4te.cache/output.0 b/rt/autom4te.cache/output.0
index 51a8aaf63..3d27db94f 100644
--- a/rt/autom4te.cache/output.0
+++ b/rt/autom4te.cache/output.0
@@ -1,7 +1,7 @@
 @%:@! /bin/sh
 @%:@ From configure.ac Revision: 1.1 .
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.53 for RT 3.0.4.
+@%:@ Generated by GNU Autoconf 2.53 for RT 3.0.9.
 @%:@
 @%:@ Report bugs to <rt-3.0-bugs@fsck.com>.
 @%:@ 
@@ -257,8 +257,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='RT'
 PACKAGE_TARNAME='rt'
-PACKAGE_VERSION='3.0.4'
-PACKAGE_STRING='RT 3.0.4'
+PACKAGE_VERSION='3.0.9'
+PACKAGE_STRING='RT 3.0.9'
 PACKAGE_BUGREPORT='rt-3.0-bugs@fsck.com'
 
 ac_unique_file="lib/RT.pm.in"
@@ -711,7 +711,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures RT 3.0.4 to adapt to many kinds of systems.
+\`configure' configures RT 3.0.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -768,7 +768,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of RT 3.0.4:";;
+     short | recursive ) echo "Configuration of RT 3.0.9:";;
    esac
   cat <<\_ACEOF
 
@@ -786,8 +786,8 @@ Optional Packages:
   --with-bin-owner=OWNER  user that will own rt binaries (default root)
   --with-libs-owner=OWNER user that will own RT libraries (default root)
   --with-libs-group=GROUP group that will own rt binaries (default bin)
-  --with-db-type=TYPE     sort of database RT will use (default: mysql) (mysql
-                          and Pg are valid)
+  --with-db-type=TYPE     sort of database RT will use (default: mysql)
+                          (mysql, Pg, Oracle and Informix are valid)
   --with-db-host=HOSTNAME FQDN of database server (default: localhost)
   --with-db-port=PORT     port on which the database listens on
   --with-db-rt-host=HOSTNAME 
@@ -802,6 +802,7 @@ Optional Packages:
                           password for database user (default: rt_pass)
   --with-web-user=USER    user the web server runs as (default: www)
   --with-web-group=GROUP  group the web server runs as (default: www)
+  --with-my-user-group    set all users and groups to current user/group
 
 Some influential environment variables:
   PERL        Perl interpreter command
@@ -872,7 +873,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-RT configure 3.0.4
+RT configure 3.0.9
 generated by GNU Autoconf 2.53
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -887,7 +888,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by RT $as_me 3.0.4, which was
+It was created by RT $as_me 3.0.9, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   $ $0 $@
@@ -1171,7 +1172,7 @@ rt_version_major=3
 
 rt_version_minor=0
 
-rt_version_patch=4
+rt_version_patch=9
 
 test "x$rt_version_major" = 'x' && rt_version_major=0
 test "x$rt_version_minor" = 'x' && rt_version_minor=0
@@ -1703,13 +1704,21 @@ if test "${with_db_type+set}" = set; then
 else
   DB_TYPE=mysql
 fi; 
-if test "$DB_TYPE" != 'mysql' -a "$DB_TYPE" != 'Pg' -a "$DB_TYPE" != 'SQLite'; then
-	{ { echo "$as_me:$LINENO: error: Only Pg and mysql are valid db types" >&5
-echo "$as_me: error: Only Pg and mysql are valid db types" >&2;}
+if test "$DB_TYPE" != 'mysql' -a "$DB_TYPE" != 'Pg' -a "$DB_TYPE" != 'SQLite' -a "$DB_TYPE" != 'Oracle' -a "$DB_TYPE" != 'Informix' ; then
+	{ { echo "$as_me:$LINENO: error: Only Oracle, Informix, Pg and mysql are valid db types" >&5
+echo "$as_me: error: Only Oracle, Informix, Pg and mysql are valid db types" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
+if test "$DB_TYPE" = 'Oracle'; then
+	test "x$ORACLE_HOME" = 'x' && { { echo "$as_me:$LINENO: error: Please declare the ORACLE_HOME environment variable" >&5
+echo "$as_me: error: Please declare the ORACLE_HOME environment variable" >&2;}
+   { (exit 1); exit 1; }; }
+	ORACLE_ENV_PREF="\$ENV{'ORACLE_HOME'} = '$ORACLE_HOME';"
+fi
+
+
 
 # Check whether --with-db-host or --without-db-host was given.
 if test "${with_db_host+set}" = set; then
@@ -1800,6 +1809,19 @@ else
 fi; 
 
 
+my_group=$(groups|cut -f1 -d' ')
+
+# Check whether --with-my-user-group or --without-my-user-group was given.
+if test "${with_my_user_group+set}" = set; then
+  withval="$with_my_user_group"
+  RTGROUP=$my_group
+            BIN_OWNER=$USER
+            LIBS_OWNER=$USER
+            LIBS_GROUP=$my_group
+            WEB_USER=$USER
+            WEB_GROUP=$my_group
+fi; 
+
 
 RT_VERSION_MAJOR=${rt_version_major}
 
@@ -1848,7 +1870,7 @@ RT_LOG_PATH=${exp_logfiledir}
 
 
 
-ac_config_files="$ac_config_files sbin/rt-setup-database sbin/rt-test-dependencies Makefile etc/RT_Config.pm lib/RT.pm lib/t/00smoke.t lib/t/01harness.t lib/t/02regression.t lib/t/03web.pl lib/t/04_send_email.pl bin/mason_handler.fcgi bin/mason_handler.scgi bin/mason_handler.svc bin/rt-commit-handler bin/rt-crontool bin/rt-mailgate bin/webmux.pl"
+ac_config_files="$ac_config_files sbin/rt-setup-database sbin/rt-test-dependencies Makefile etc/RT_Config.pm lib/RT.pm lib/t/00smoke.t lib/t/01harness.t lib/t/02regression.t lib/t/03web.pl lib/t/04_send_email.pl bin/mason_handler.fcgi bin/mason_handler.scgi bin/mason_handler.svc bin/rt-commit-handler bin/rt-crontool bin/rt-mailgate bin/rt bin/webmux.pl"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -2206,7 +2228,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by RT $as_me 3.0.4, which was
+This file was extended by RT $as_me 3.0.9, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2260,7 +2282,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-RT config.status 3.0.4
+RT config.status 3.0.9
 configured by $0, generated by GNU Autoconf 2.53,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -2363,6 +2385,7 @@ do
   "bin/rt-commit-handler" ) CONFIG_FILES="$CONFIG_FILES bin/rt-commit-handler" ;;
   "bin/rt-crontool" ) CONFIG_FILES="$CONFIG_FILES bin/rt-crontool" ;;
   "bin/rt-mailgate" ) CONFIG_FILES="$CONFIG_FILES bin/rt-mailgate" ;;
+  "bin/rt" ) CONFIG_FILES="$CONFIG_FILES bin/rt" ;;
   "bin/webmux.pl" ) CONFIG_FILES="$CONFIG_FILES bin/webmux.pl" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -2487,6 +2510,7 @@ s,@BIN_OWNER@,$BIN_OWNER,;t t
 s,@LIBS_OWNER@,$LIBS_OWNER,;t t
 s,@LIBS_GROUP@,$LIBS_GROUP,;t t
 s,@DB_TYPE@,$DB_TYPE,;t t
+s,@ORACLE_ENV_PREF@,$ORACLE_ENV_PREF,;t t
 s,@DB_HOST@,$DB_HOST,;t t
 s,@DB_PORT@,$DB_PORT,;t t
 s,@DB_RT_HOST@,$DB_RT_HOST,;t t
diff --git a/rt/autom4te.cache/traces.0 b/rt/autom4te.cache/traces.0
index 962f400e7..f13276211 100644
--- a/rt/autom4te.cache/traces.0
+++ b/rt/autom4te.cache/traces.0
@@ -52,7 +52,7 @@ m4trace:configure.ac:9: -1- AC_SUBST([ECHO_T])
 m4trace:configure.ac:9: -1- AC_SUBST([LIBS])
 m4trace:configure.ac:14: -1- AC_SUBST([rt_version_major], [3])
 m4trace:configure.ac:16: -1- AC_SUBST([rt_version_minor], [0])
-m4trace:configure.ac:18: -1- AC_SUBST([rt_version_patch], [4])
+m4trace:configure.ac:18: -1- AC_SUBST([rt_version_patch], [9])
 m4trace:configure.ac:24: -1- AC_PROG_INSTALL
 m4trace:configure.ac:24: -1- AC_SUBST([INSTALL_PROGRAM])
 m4trace:configure.ac:24: -1- AC_SUBST([INSTALL_SCRIPT])
@@ -104,38 +104,39 @@ m4trace:configure.ac:57: -1- AC_SUBST([BIN_OWNER])
 m4trace:configure.ac:65: -1- AC_SUBST([LIBS_OWNER])
 m4trace:configure.ac:73: -1- AC_SUBST([LIBS_GROUP])
 m4trace:configure.ac:84: -1- AC_SUBST([DB_TYPE])
-m4trace:configure.ac:92: -1- AC_SUBST([DB_HOST])
-m4trace:configure.ac:100: -1- AC_SUBST([DB_PORT])
-m4trace:configure.ac:108: -1- AC_SUBST([DB_RT_HOST])
-m4trace:configure.ac:116: -1- AC_SUBST([DB_DBA])
-m4trace:configure.ac:124: -1- AC_SUBST([DB_DATABASE])
-m4trace:configure.ac:132: -1- AC_SUBST([DB_RT_USER])
-m4trace:configure.ac:140: -1- AC_SUBST([DB_RT_PASS])
-m4trace:configure.ac:148: -1- AC_SUBST([WEB_USER])
-m4trace:configure.ac:156: -1- AC_SUBST([WEB_GROUP])
-m4trace:configure.ac:163: -1- AC_SUBST([RT_VERSION_MAJOR], [${rt_version_major}])
-m4trace:configure.ac:164: -1- AC_SUBST([RT_VERSION_MINOR], [${rt_version_minor}])
-m4trace:configure.ac:165: -1- AC_SUBST([RT_VERSION_PATCH], [${rt_version_patch}])
-m4trace:configure.ac:168: -1- AC_SUBST([RT_PATH], [${exp_prefix}])
-m4trace:configure.ac:169: -1- AC_SUBST([RT_DOC_PATH], [${exp_manualdir}])
-m4trace:configure.ac:170: -1- AC_SUBST([RT_LOCAL_PATH], [${exp_customdir}])
-m4trace:configure.ac:171: -1- AC_SUBST([RT_LIB_PATH], [${exp_libdir}])
-m4trace:configure.ac:172: -1- AC_SUBST([RT_ETC_PATH], [${exp_sysconfdir}])
-m4trace:configure.ac:173: -1- AC_SUBST([CONFIG_FILE_PATH], [${exp_sysconfdir}])
-m4trace:configure.ac:174: -1- AC_SUBST([RT_BIN_PATH], [${exp_bindir}])
-m4trace:configure.ac:175: -1- AC_SUBST([RT_SBIN_PATH], [${exp_sbindir}])
-m4trace:configure.ac:176: -1- AC_SUBST([RT_VAR_PATH], [${exp_localstatedir}])
-m4trace:configure.ac:177: -1- AC_SUBST([RT_MAN_PATH], [${exp_mandir}])
-m4trace:configure.ac:178: -1- AC_SUBST([MASON_DATA_PATH], [${exp_masonstatedir}])
-m4trace:configure.ac:179: -1- AC_SUBST([MASON_SESSION_PATH], [${exp_sessionstatedir}])
-m4trace:configure.ac:180: -1- AC_SUBST([MASON_HTML_PATH], [${exp_htmldir}])
-m4trace:configure.ac:181: -1- AC_SUBST([LOCAL_ETC_PATH], [${exp_custometcdir}])
-m4trace:configure.ac:182: -1- AC_SUBST([MASON_LOCAL_HTML_PATH], [${exp_customhtmldir}])
-m4trace:configure.ac:183: -1- AC_SUBST([LOCAL_LEXICON_PATH], [${exp_customlexdir}])
-m4trace:configure.ac:184: -1- AC_SUBST([LOCAL_LIB_PATH], [${exp_customlibdir}])
-m4trace:configure.ac:185: -1- AC_SUBST([DESTDIR], [${exp_prefix}])
-m4trace:configure.ac:186: -1- AC_SUBST([RT_LOG_PATH], [${exp_logfiledir}])
-m4trace:configure.ac:208: -1- AC_CONFIG_FILES([
+m4trace:configure.ac:91: -1- AC_SUBST([ORACLE_ENV_PREF])
+m4trace:configure.ac:99: -1- AC_SUBST([DB_HOST])
+m4trace:configure.ac:107: -1- AC_SUBST([DB_PORT])
+m4trace:configure.ac:115: -1- AC_SUBST([DB_RT_HOST])
+m4trace:configure.ac:123: -1- AC_SUBST([DB_DBA])
+m4trace:configure.ac:131: -1- AC_SUBST([DB_DATABASE])
+m4trace:configure.ac:139: -1- AC_SUBST([DB_RT_USER])
+m4trace:configure.ac:147: -1- AC_SUBST([DB_RT_PASS])
+m4trace:configure.ac:155: -1- AC_SUBST([WEB_USER])
+m4trace:configure.ac:163: -1- AC_SUBST([WEB_GROUP])
+m4trace:configure.ac:182: -1- AC_SUBST([RT_VERSION_MAJOR], [${rt_version_major}])
+m4trace:configure.ac:183: -1- AC_SUBST([RT_VERSION_MINOR], [${rt_version_minor}])
+m4trace:configure.ac:184: -1- AC_SUBST([RT_VERSION_PATCH], [${rt_version_patch}])
+m4trace:configure.ac:187: -1- AC_SUBST([RT_PATH], [${exp_prefix}])
+m4trace:configure.ac:188: -1- AC_SUBST([RT_DOC_PATH], [${exp_manualdir}])
+m4trace:configure.ac:189: -1- AC_SUBST([RT_LOCAL_PATH], [${exp_customdir}])
+m4trace:configure.ac:190: -1- AC_SUBST([RT_LIB_PATH], [${exp_libdir}])
+m4trace:configure.ac:191: -1- AC_SUBST([RT_ETC_PATH], [${exp_sysconfdir}])
+m4trace:configure.ac:192: -1- AC_SUBST([CONFIG_FILE_PATH], [${exp_sysconfdir}])
+m4trace:configure.ac:193: -1- AC_SUBST([RT_BIN_PATH], [${exp_bindir}])
+m4trace:configure.ac:194: -1- AC_SUBST([RT_SBIN_PATH], [${exp_sbindir}])
+m4trace:configure.ac:195: -1- AC_SUBST([RT_VAR_PATH], [${exp_localstatedir}])
+m4trace:configure.ac:196: -1- AC_SUBST([RT_MAN_PATH], [${exp_mandir}])
+m4trace:configure.ac:197: -1- AC_SUBST([MASON_DATA_PATH], [${exp_masonstatedir}])
+m4trace:configure.ac:198: -1- AC_SUBST([MASON_SESSION_PATH], [${exp_sessionstatedir}])
+m4trace:configure.ac:199: -1- AC_SUBST([MASON_HTML_PATH], [${exp_htmldir}])
+m4trace:configure.ac:200: -1- AC_SUBST([LOCAL_ETC_PATH], [${exp_custometcdir}])
+m4trace:configure.ac:201: -1- AC_SUBST([MASON_LOCAL_HTML_PATH], [${exp_customhtmldir}])
+m4trace:configure.ac:202: -1- AC_SUBST([LOCAL_LEXICON_PATH], [${exp_customlexdir}])
+m4trace:configure.ac:203: -1- AC_SUBST([LOCAL_LIB_PATH], [${exp_customlibdir}])
+m4trace:configure.ac:204: -1- AC_SUBST([DESTDIR], [${exp_prefix}])
+m4trace:configure.ac:205: -1- AC_SUBST([RT_LOG_PATH], [${exp_logfiledir}])
+m4trace:configure.ac:228: -1- AC_CONFIG_FILES([
 		 sbin/rt-setup-database
                  sbin/rt-test-dependencies
                  Makefile
@@ -152,5 +153,6 @@ m4trace:configure.ac:208: -1- AC_CONFIG_FILES([
  		 bin/rt-commit-handler
  		 bin/rt-crontool
  		 bin/rt-mailgate
+		 bin/rt
  		 bin/webmux.pl
                 ])
diff --git a/rt/bin/mason_handler.fcgi b/rt/bin/mason_handler.fcgi
index 431eccbd3..93d1f8855 100755
--- a/rt/bin/mason_handler.fcgi
+++ b/rt/bin/mason_handler.fcgi
@@ -27,7 +27,7 @@ use strict;
 use File::Basename;
 require ('/opt/rt3/bin/webmux.pl');
 
-my $h = &RT::Interface::Web::NewCGIHandler();
+my $h = &RT::Interface::Web::NewCGIHandler(@RT::MasonParameters);
 
 # Enter CGI::Fast mode, which should also work as a vanilla CGI script.
 require CGI::Fast;
@@ -44,11 +44,25 @@ while ( my $cgi = CGI::Fast->new ) {
     $ENV{'ENV'}    = '' if defined $ENV{'ENV'};
     $ENV{'IFS'}    = '' if defined $ENV{'IFS'};
 
-    unless ($h->interp->comp_exists($cgi->path_info)) {
-	$cgi->path_info($cgi->path_info . "/index.html");
+    RT::ConnectToDatabase();
+
+    if ( ( !$h->interp->comp_exists( $cgi->path_info ) )
+        && ( $h->interp->comp_exists( $cgi->path_info . "/index.html" ) ) ) {
+        $cgi->path_info( $cgi->path_info . "/index.html" );
+    }
+
+    eval { $h->handle_cgi_object($cgi); };
+    if ($@) {
+        $RT::Logger->crit($@);
+    }
+
+
+    if ($RT::Handle->TransactionDepth) {
+        $RT::Handle->ForceRollback;
+        $RT::Logger->crit("Transaction not committed. Usually indicates a software fault. Data loss may have occurred") ;
     }
-    $h->handle_cgi_object($cgi);
-    # _should_ always be tied
+
+
 }
 
 1;
diff --git a/rt/bin/mason_handler.fcgi.in b/rt/bin/mason_handler.fcgi.in
index e932bfc29..a009663b9 100644
--- a/rt/bin/mason_handler.fcgi.in
+++ b/rt/bin/mason_handler.fcgi.in
@@ -27,7 +27,7 @@ use strict;
 use File::Basename;
 require ('@RT_BIN_PATH@/webmux.pl');
 
-my $h = &RT::Interface::Web::NewCGIHandler();
+my $h = &RT::Interface::Web::NewCGIHandler(@RT::MasonParameters);
 
 # Enter CGI::Fast mode, which should also work as a vanilla CGI script.
 require CGI::Fast;
@@ -44,11 +44,25 @@ while ( my $cgi = CGI::Fast->new ) {
     $ENV{'ENV'}    = '' if defined $ENV{'ENV'};
     $ENV{'IFS'}    = '' if defined $ENV{'IFS'};
 
-    unless ($h->interp->comp_exists($cgi->path_info)) {
-	$cgi->path_info($cgi->path_info . "/index.html");
+    RT::ConnectToDatabase();
+
+    if ( ( !$h->interp->comp_exists( $cgi->path_info ) )
+        && ( $h->interp->comp_exists( $cgi->path_info . "/index.html" ) ) ) {
+        $cgi->path_info( $cgi->path_info . "/index.html" );
+    }
+
+    eval { $h->handle_cgi_object($cgi); };
+    if ($@) {
+        $RT::Logger->crit($@);
+    }
+
+
+    if ($RT::Handle->TransactionDepth) {
+        $RT::Handle->ForceRollback;
+        $RT::Logger->crit("Transaction not committed. Usually indicates a software fault. Data loss may have occurred") ;
     }
-    $h->handle_cgi_object($cgi);
-    # _should_ always be tied
+
+
 }
 
 1;
diff --git a/rt/bin/mason_handler.scgi b/rt/bin/mason_handler.scgi
index 8e1135c2f..7774189ee 100755
--- a/rt/bin/mason_handler.scgi
+++ b/rt/bin/mason_handler.scgi
@@ -26,16 +26,18 @@
 use strict;
 require ('/opt/rt3/bin/webmux.pl');
 
-my $h = &RT::Interface::Web::NewCGIHandler();
+my $h = &RT::Interface::Web::NewCGIHandler(@RT::MasonParameters);
 
 require CGI;
 
 RT::Init();
 
 my $cgi = CGI->new;
-unless ($h->interp->comp_exists($cgi->path_info)) {
-    $cgi->path_info($cgi->path_info . "/index.html");
+if ( ( !$h->interp->comp_exists( $cgi->path_info ) )
+    && ( $h->interp->comp_exists( $cgi->path_info . "/index.html" ) ) ) {
+    $cgi->path_info( $cgi->path_info . "/index.html" );
 }
+
 $h->handle_cgi_object($cgi);
 
 1;
diff --git a/rt/bin/mason_handler.scgi.in b/rt/bin/mason_handler.scgi.in
index 37d8380c2..614d4d47a 100644
--- a/rt/bin/mason_handler.scgi.in
+++ b/rt/bin/mason_handler.scgi.in
@@ -26,16 +26,18 @@
 use strict;
 require ('@RT_BIN_PATH@/webmux.pl');
 
-my $h = &RT::Interface::Web::NewCGIHandler();
+my $h = &RT::Interface::Web::NewCGIHandler(@RT::MasonParameters);
 
 require CGI;
 
 RT::Init();
 
 my $cgi = CGI->new;
-unless ($h->interp->comp_exists($cgi->path_info)) {
-    $cgi->path_info($cgi->path_info . "/index.html");
+if ( ( !$h->interp->comp_exists( $cgi->path_info ) )
+    && ( $h->interp->comp_exists( $cgi->path_info . "/index.html" ) ) ) {
+    $cgi->path_info( $cgi->path_info . "/index.html" );
 }
+
 $h->handle_cgi_object($cgi);
 
 1;
diff --git a/rt/bin/mason_handler.svc b/rt/bin/mason_handler.svc
index e6d83784c..c05d21e69 100644
--- a/rt/bin/mason_handler.svc
+++ b/rt/bin/mason_handler.svc
@@ -197,7 +197,7 @@ BEGIN {
 warn "Begin listening on $ENV{'FCGI_SOCKET_PATH'}\n";
 
 require CGI::Fast;
-my $h = &RT::Interface::Web::NewCGIHandler();
+my $h = &RT::Interface::Web::NewCGIHandler(@RT::MasonParameters);
 
 RT::Init();
 
diff --git a/rt/bin/mason_handler.svc.in b/rt/bin/mason_handler.svc.in
index cc12c0ef0..0ba1f51b5 100644
--- a/rt/bin/mason_handler.svc.in
+++ b/rt/bin/mason_handler.svc.in
@@ -197,7 +197,7 @@ BEGIN {
 warn "Begin listening on $ENV{'FCGI_SOCKET_PATH'}\n";
 
 require CGI::Fast;
-my $h = &RT::Interface::Web::NewCGIHandler();
+my $h = &RT::Interface::Web::NewCGIHandler(@RT::MasonParameters);
 
 RT::Init();
 
diff --git a/rt/bin/rt b/rt/bin/rt
index 41220bb56..d9f8a3f05 100755
--- a/rt/bin/rt
+++ b/rt/bin/rt
@@ -1,1391 +1,1816 @@
-#!!!PERL!! -w
-#
-# $Header: /home/cvs/cvsroot/freeside/rt/bin/Attic/rt,v 1.1 2002-08-12 06:17:07 ivan Exp $
-# RT is (c) 1996-2001 Jesse Vincent <jesse@bestpractical.com>
+#!/usr/bin/perl -w
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 
 use strict;
-use Carp;
-use Getopt::Long;
 
-use lib "!!RT_LIB_PATH!!";
-use lib "!!RT_ETC_PATH!!";
+# This program is intentionally written to have as few non-core module
+# dependencies as possible. It should stay that way.
+
+use Cwd;
+use LWP;
+use HTTP::Request::Common;
+
+# We derive configuration information from hardwired defaults, dotfiles,
+# and the RT* environment variables (in increasing order of precedence).
+# Session information is stored in ~/.rt_sessions.
+
+my $VERSION = 0.02;
+my $HOME = eval{(getpwuid($<))[7]}
+           || $ENV{HOME} || $ENV{LOGDIR} || $ENV{HOMEPATH}
+           || ".";
+my %config = (
+    (
+        debug   => 0,
+        user    => eval{(getpwuid($<))[0]} || $ENV{USER} || $ENV{USERNAME},
+        passwd  => undef,
+        server  => 'http://localhost/rt/',
+    ),
+    config_from_file($ENV{RTCONFIG} || ".rtrc"),
+    config_from_env()
+);
+my $session = new Session("$HOME/.rt_sessions");
+my $REST = "$config{server}/REST/1.0";
+
+sub whine;
+sub DEBUG { warn @_ if $config{debug} >= shift }
+
+# These regexes are used by command handlers to parse arguments.
+# (XXX: Ask Autrijus how i18n changes these definitions.)
+
+my $name   = '[\w.-]+';
+my $field  = '[a-zA-Z][a-zA-Z0-9_-]*';
+my $label  = '[a-zA-Z0-9@_.+-]+';
+my $labels = "(?:$label,)*$label";
+my $idlist = '(?:(?:\d+-)?\d+,)*(?:\d+-)?\d+';
+
+# Our command line looks like this:
+#
+#     rt <action> [options] [arguments]
+#
+# We'll parse just enough of it to decide upon an action to perform, and
+# leave the rest to per-action handlers to interpret appropriately.
+
+my %handlers = (
+#   handler     => [ ...aliases... ],
+    version     => ["version", "ver"],
+    logout      => ["logout"],
+    help        => ["help", "man"],
+    show        => ["show", "cat"],
+    edit        => ["create", "edit", "new", "ed"],
+    list        => ["search", "list", "ls"],
+    comment     => ["comment", "correspond"],
+    link        => ["link", "ln"],
+    merge       => ["merge"],
+    grant       => ["grant", "revoke"],
+);
+
+# Once we find and call an appropriate handler, we're done.
+
+my (%actions, $action);
+foreach my $fn (keys %handlers) {
+    foreach my $alias (@{ $handlers{$fn} }) {
+        $actions{$alias} = \&{"$fn"};
+    }
+}
+if (@ARGV && exists $actions{$ARGV[0]}) {
+    $action = shift @ARGV;
+}
+$actions{$action || "help"}->($action || ());
+exit;
 
-use RT::Interface::CLI  qw(CleanEnv LoadConfig DBConnect 
-			   GetCurrentUser GetMessageContent);
+# Handler functions.
+# ------------------
+#
+# The following subs are handlers for each entry in %actions.
 
-#Clean out all the nasties from the environment
-CleanEnv();
+sub version {
+    print "rt $VERSION\n";
+}
 
-#Load etc/config.pm and drop privs
-LoadConfig();
+sub logout {
+    submit("$REST/logout") if defined $session->cookie;
+}
 
-#Connect to the database and get RT::SystemUser and RT::Nobody loaded
-DBConnect();
+sub help {
+    my ($action, $type) = @_;
+    my (%help, $key);
 
-#Drop setgid permissions
-RT::DropSetGIDPermissions();
+    # What help topics do we know about?
+    local $/ = undef;
+    foreach my $item (@{ Form::parse(<DATA>) }) {
+        my $title = $item->[2]{Title};
+        my @titles = ref $title eq 'ARRAY' ? @$title : $title;
 
-#Get the current user all loaded
-my $CurrentUser = GetCurrentUser();
+        foreach $title (grep $_, @titles) {
+            $help{$title} = $item->[2]{Text};
+        }
+    }
 
-unless ($CurrentUser->Id) {
-	print "No RT user found. Please consult your RT administrator.\n";
-	exit(1);
+    # What does the user want help with?
+    undef $action if ($action && $actions{$action} eq \&help);
+    unless ($action || $type) {
+        # If we don't know, we'll look for clues in @ARGV.
+        foreach (@ARGV) {
+            if (exists $help{$_}) { $key = $_; last; }
+        }
+        unless ($key) {
+            # Tolerate possibly plural words.
+            foreach (@ARGV) {
+                if ($_ =~ s/s$// && exists $help{$_}) { $key = $_; last; }
+            }
+        }
+    }
+
+    if ($type && $action) {
+        $key = "$type.$action";
+    }
+    $key ||= $type || $action || "introduction";
+
+    # Find a suitable topic to display.
+    while (!exists $help{$key}) {
+        if ($type && $action) {
+            if ($key eq "$type.$action") { $key = $action;        }
+            elsif ($key eq $action)      { $key = $type;          }
+            else                         { $key = "introduction"; }
+        }
+        else {
+            $key = "introduction";
+        }
+    }
+
+    print STDERR $help{$key}, "\n\n";
 }
 
+# Displays a list of objects that match some specified condition.
 
-# {{{ commandline flags 
-
-my ( @id,
-     @limit_queue,
-     @limit_status,
-     @limit_owner,
-     @limit_priority,
-     @limit_final_priority,
-     @limit_requestor,
-     @limit_subject,
-     @limit_body,
-     @limit_created,
-     @limit_resolved,
-     @limit_lastupdated,
-     @limit_dependson,
-     @limit_dependedonby,
-     @limit_memberof,
-     @limit_hasmember,
-     @limit_refersto,
-     @limit_referredtoby,
-     @limit_keyword,
-     
-     @limit_due,
-     @limit_starts,
-     @limit_started,
-     $limit_first,
-     $limit_rows,
-     $history,
-     $summary,
-     $create,
-     @requestors,
-     @cc,
-     @admincc,
-     $status,
-     $subject,
-     $owner,
-     $steal,
-     $queue,
-     $time_left,
-     $priority,
-     $final_priority,
-     $due,
-     $starts,
-     $started,
-     $contacted,
-     $comment,
-     $reply,
-     $source,
-     $edit,
-     @dependson,
-     @memberof, 
-     @refersto,
-     $mergeinto,
-     @keywords,
-     $time_taken,
-     $verbose,
-     $debug,
-   $help,
-   $version);
-
-# }}}
-
-# Set defaults for cli args
-
-$edit = 1; # Assume the user wants to edit replies and comments 
-           # unless they specify --noedit
-
-# {{{    args
-
-my @args =("id=s" => \@id,
-	   "limit-queue=s" => \@limit_queue,
-	   "limit-status=s" => \@limit_status,
-	   "limit-owner=s" => \@limit_owner,
-	   "limit-priority=s" => \@limit_priority,
-	   "limit-final-priority=s" => \@limit_final_priority,
-	   "limit-requestor=s" => \@limit_requestor,
-	   "limit-subject=s" => \@limit_subject,
-	   "limit-body=s",	\@limit_body,
-	   "limit-created=s" => \@limit_created,
-	   "limit-due=s" =>	\@limit_due,
- 	   "limit-last-updated=s" => \@limit_lastupdated,
-	   "limit-keyword=s" => \@limit_keyword,
-
-	   "limit-member-of=s" => \@limit_memberof,
-	   "limit-has-member=s" => \@limit_hasmember,
-	   "limit-depended-on-by=s" => \@limit_dependedonby,
-	   "limit-depends-on=s" => \@limit_dependson,
-	   "limit-referred-to-by=s" => \@limit_referredtoby,
-	   "limit-refers-to=s" => \@limit_refersto,
-
-	   "limit-starts=s" => \@limit_starts,
-	   "limit-started=s" => \@limit_started,
-	   "limit-first=i" => \$limit_first,
-	   "limit-rows=i" => \$limit_rows,
-	   "history|show" => \$history,
-	   "summary:s" => \$summary,
-	   "create" => \$create,
-	   "keywords=s" => \@keywords,
-	   "requestor|requestors=s" => \@requestors,
-	   "cc=s" => \@cc,
-	   "admincc=s" => \@admincc,
-	   "status=s" => \$status,
-	   "subject=s" => \$subject,
-	   "owner=s" => \$owner,
-	   "steal" => \$steal,
-	   "queue=s" => \$queue,
-
-	   
-	   "priority=i" => \$priority,
-	   "final-priority=i" => \$final_priority,
-	   "due=s" => \$due,
-	   "starts=s" => \$starts,
-	   "started=s" => \$started,
-	   "contacted=s" => \$contacted,
-	   "comment", \$comment,
-	   "reply|respond", \$reply,
-	   "source=s" => \$source,
-	   "edit!" => \$edit,
-	   "depends-on=s" => \@dependson,
-	   "member-of=s" => \@memberof, 
-	   "merge-into=s" => \$mergeinto, 
-	   "refers-to=s" => \@refersto,
-	   "time-left=i" => \$time_left,
-	   "time-taken=i" => \$time_taken,
-	   "verbose+" => \$verbose,
-	   "debug" => \$debug,
-	   "version" => \$version,
-	   "help|h|usage" => \$help
-	  );
-
-# }}}
-
-
-
-GetOptions(@args);
-
-print join(':',@keywords);
-# {{{ If they want it, print a usage message and get out
-
-if ($help) {
-
-
-print <<EOUSAGE;
-
-Limit the set of records returned:
-
---id=[first][-][last]
-  Specify a single ticket, a range, or to start with (n-) or end with (-n)
-a specific ticket.
-  
-  --limit-queue=<queue>
-	  --limit-status=[!](new|open|stalled|resolved)
-
-	  --limit-owner=[!]<userid>
-	  --limit-priority=[starts][-][ends]
-	  --limit-final-priority=[starts][-][ends]
-	    starts is less than ends
-	  --limit-requestor=[!]<userid>|<email>
-	  --limit-subject=[!]<text>
-	  --limit-body=[!]<text>
-	  --limit-keyword=[!]<select>/<keyword>
-        
-       Links
-          --limit-member-of=<ticketid>
-          --limit-has-member=<ticketid>
-          --limit-refers-to=<ticketid>
-          --limit-referred-to-by=<ticketid>
-          --limit-depends-on=<ticketid>
-          --limit-depended-on-by=<ticketid>
+sub list {
+    my ($q, $type, %data, $orderby);
+    my $bad = 0;
 
+    while (@ARGV) {
+        $_ = shift @ARGV;
 
-       Dates
-	  --limit-created=[starts][-][ends]
-	  --limit-due=[starts][-][ends]
-	  --limit-starts=[starts][-][ends]
-	  --limit-started=[starts][-][ends]
-          --limit-resolved=[starts][-][ends]
-          --limit-last-updated=[starts][-][ends]
-	    starts and ends are dates.  starts can not be less than ends
+        if (/^-t$/) {
+            $bad = 1, last unless defined($type = get_type_argument());
+        }
+        elsif (/^-S$/) {
+            $bad = 1, last unless get_var_argument(\%data);
+        }
+        elsif (/^-o$/) {
+            $orderby = shift @ARGV;
+        }
+        elsif (/^-([isl])$/) {
+            $data{format} = $1;
+        }
+        elsif (/^-f$/) {
+            if ($ARGV[0] !~ /^(?:(?:$field,)*$field)$/) {
+                whine "No valid field list in '-f $ARGV[0]'.";
+                $bad = 1; last;
+            }
+            $data{fields} = shift @ARGV;
+        }
+        elsif (!defined $q && !/^-/) {
+            $q = $_;
+        }
+        else {
+            my $datum = /^-/ ? "option" : "argument";
+            whine "Unrecognised $datum '$_'.";
+            $bad = 1; last;
+        }
+    }
 
-	  --limit-first=<first row returned>
-	  --limit-rows=<row count>
+    $type ||= "ticket";
+    unless ($type && defined $q) {
+        my $item = $type ? "query string" : "object type";
+        whine "No $item specified.";
+        $bad = 1;
+    }
+    return help("list", $type) if $bad;
 
-	  --history | --show
-            show a history of the tickets found
- 
+    my $r = submit("$REST/search/$type", { query => $q, %data, orderby => $orderby || "" });
+    print $r->content;
+}
 
-	  --summary [format-string]
-             show a listing-style summary of the tickets found. If format string
-             is ommitted, uses \$RT_SUMMARY_FORMAT or an internal default
-            
+# Displays selected information about a single object.
 
-             #TODO: doc summary 
-             format: <atom>%<format>
-             atom:   <name><size>
-             size: <integer>
-             name:  (grep for # {{{ attribs for the array of ok values)
+sub show {
+    my ($type, @objects, %data);
+    my $slurped = 0;
+    my $bad = 0;
 
+    while (@ARGV) {
+        $_ = shift @ARGV;
 
-	  --create
-            create a new ticket. Any attributes that you can modify on an existing ticket
-            can also be used for ticket creation.
+        if (/^-t$/) {
+            $bad = 1, last unless defined($type = get_type_argument());
+        }
+        elsif (/^-S$/) {
+            $bad = 1, last unless get_var_argument(\%data);
+        }
+        elsif (/^-([isl])$/) {
+            $data{format} = $1;
+        }
+        elsif (/^-$/ && !$slurped) {
+            chomp(my @lines = <STDIN>);
+            foreach (@lines) {
+                unless (is_object_spec($_, $type)) {
+                    whine "Invalid object on STDIN: '$_'.";
+                    $bad = 1; last;
+                }
+                push @objects, $_;
+            }
+            $slurped = 1;
+        }
+        elsif (/^-f$/) {
+            if ($ARGV[0] !~ /^(?:(?:$field,)*$field)$/) {
+                whine "No valid field list in '-f $ARGV[0]'.";
+                $bad = 1; last;
+            }
+            $data{fields} = shift @ARGV;
+        }
+        elsif (my $spec = is_object_spec($_, $type)) {
+            push @objects, $spec;
+        }
+        else {
+            my $datum = /^-/ ? "option" : "argument";
+            whine "Unrecognised $datum '$_'.";
+            $bad = 1; last;
+        }
+    }
 
+    unless (@objects) {
+        whine "No objects specified.";
+        $bad = 1;
+    }
+    return help("show", $type) if $bad;
 
+    my $r = submit("$REST/show", { id => \@objects, %data });
+    print $r->content;
+}
 
-Attributes
-  Basics
-	  --status=<new|open|stalled|resolved|dead>
-           sets status
-	   --subject=<subject>
-           sets subject
-	   --owner=<userid>
-           set owner to 
-           --steal
-           Become the owner, even if someone else owns the ticket
-	   --queue=<queueid>
-           set queue to
-	   
-	   --priority=<int>
-	  
-           --final-priority=<int>
+# To create a new object, we ask the server for a form with the defaults
+# filled in, allow the user to edit it, and send the form back.
+#
+# To edit an object, we must ask the server for a form representing that
+# object, make changes requested by the user (either on the command line
+# or interactively via $EDITOR), and send the form back.
+
+sub edit {
+    my ($action) = @_;
+    my (%data, $type, @objects);
+    my ($cl, $text, $edit, $input, $output);
+
+    use vars qw(%set %add %del);
+    %set = %add = %del = ();
+    my $slurped = 0;
+    my $bad = 0;
+    
+    while (@ARGV) {
+        $_ = shift @ARGV;
+
+        if    (/^-e$/) { $edit = 1 }
+        elsif (/^-i$/) { $input = 1 }
+        elsif (/^-o$/) { $output = 1 }
+        elsif (/^-t$/) {
+            $bad = 1, last unless defined($type = get_type_argument());
+        }
+        elsif (/^-S$/) {
+            $bad = 1, last unless get_var_argument(\%data);
+        }
+        elsif (/^-$/ && !($slurped || $input)) {
+            chomp(my @lines = <STDIN>);
+            foreach (@lines) {
+                unless (is_object_spec($_, $type)) {
+                    whine "Invalid object on STDIN: '$_'.";
+                    $bad = 1; last;
+                }
+                push @objects, $_;
+            }
+            $slurped = 1;
+        }
+        elsif (/^set$/i) {
+            my $vars = 0;
+
+            while (@ARGV && $ARGV[0] =~ /^($field)([+-]?=)(.*)$/) {
+                my ($key, $op, $val) = ($1, $2, $3);
+                my $hash = ($op eq '=') ? \%set : ($op =~ /^\+/) ? \%add : \%del;
+
+                vpush($hash, lc $key, $val);
+                shift @ARGV;
+                $vars++;
+            }
+            unless ($vars) {
+                whine "No variables to set.";
+                $bad = 1; last;
+            }
+            $cl = $vars;
+        }
+        elsif (/^(?:add|del)$/i) {
+            my $vars = 0;
+            my $hash = ($_ eq "add") ? \%add : \%del;
+
+            while (@ARGV && $ARGV[0] =~ /^($field)=(.*)$/) {
+                my ($key, $val) = ($1, $2);
+
+                vpush($hash, lc $key, $val);
+                shift @ARGV;
+                $vars++;
+            }
+            unless ($vars) {
+                whine "No variables to set.";
+                $bad = 1; last;
+            }
+            $cl = $vars;
+        }
+        elsif (my $spec = is_object_spec($_, $type)) {
+            push @objects, $spec;
+        }
+        else {
+            my $datum = /^-/ ? "option" : "argument";
+            whine "Unrecognised $datum '$_'.";
+            $bad = 1; last;
+        }
+    }
 
-  Watchers
-	  --requestors=[+|-]<userid|email address>
-          add or remove this user as a ticket requestor 
-	  --cc=[+|-]<userid|email address>
-          add or remove this user as a ticket cc
-	  --admincc=[+|-]<userid|email address>
-          add or remove this user as a ticket admincc
+    if ($action =~ /^ed(?:it)?$/) {
+        unless (@objects) {
+            whine "No objects specified.";
+            $bad = 1;
+        }
+    }
+    else {
+        if (@objects) {
+            whine "You shouldn't specify objects as arguments to $action.";
+            $bad = 1;
+        }
+        unless ($type) {
+            whine "What type of object do you want to create?";
+            $bad = 1;
+        }
+        @objects = ("$type/new");
+    }
+    return help($action, $type) if $bad;
 
-	(When creating tickets, just leave off the + or - )
+    # We need a form to make changes to. We usually ask the server for
+    # one, but we can avoid that if we are fed one on STDIN, or if the
+    # user doesn't want to edit the form by hand, and the command line
+    # specifies only simple variable assignments.
 
-  Keywords
-	  --keywords[+|-]<keyword_select>/<keyword>
-          Add or remove a keyword.
+    if ($input) {
+        local $/ = undef;
+        $text = <STDIN>;
+    }
+    elsif ($edit || %add || %del || !$cl) {
+        my $r = submit("$REST/show", { id => \@objects, format => 'l' });
+        $text = $r->content;
+    }
 
+    # If any changes were specified on the command line, apply them.
+    if ($cl) {
+        if ($text) {
+            # We're updating forms from the server.
+            my $forms = Form::parse($text);
+
+            foreach my $form (@$forms) {
+                my ($c, $o, $k, $e) = @$form;
+                my ($key, $val);
+
+                next if ($e || !@$o);
+
+                local %add = %add;
+                local %del = %del;
+                local %set = %set;
+
+                # Make changes to existing fields.
+                foreach $key (@$o) {
+                    if (exists $add{lc $key}) {
+                        $val = delete $add{lc $key};
+                        vpush($k, $key, $val);
+                        $k->{$key} = vsplit($k->{$key}) if $val =~ /[,\n]/;
+                    }
+                    if (exists $del{lc $key}) {
+                        $val = delete $del{lc $key};
+                        my %val = map {$_=>1} @{ vsplit($val) };
+                        $k->{$key} = vsplit($k->{$key});
+                        @{$k->{$key}} = grep {!exists $val{$_}} @{$k->{$key}};
+                    }
+                    if (exists $set{lc $key}) {
+                        $k->{$key} = delete $set{lc $key};
+                    }
+                }
+                
+                # Then update the others.
+                foreach $key (keys %set) { vpush($k, $key, $set{$key}) }
+                foreach $key (keys %add) {
+                    vpush($k, $key, $add{$key});
+                    $k->{$key} = vsplit($k->{$key});
+                }
+                push @$o, (keys %add, keys %set);
+            }
+
+            $text = Form::compose($forms);
+        }
+        else {
+            # We're rolling our own set of forms.
+            my @forms;
+            foreach (@objects) {
+                my ($type, $ids, $args) =
+                    m{^($name)/($idlist|$labels)(?:(/.*))?$}o;
+
+                $args ||= "";
+                foreach my $obj (expand_list($ids)) {
+                    my %set = (%set, id => "$type/$obj$args");
+                    push @forms, ["", [keys %set], \%set];
+                }
+            }
+            $text = Form::compose(\@forms);
+        }
+    }
 
+    if ($output) {
+        print $text;
+        exit;
+    }
 
-  Dates
-	   --due=<date>
-	   --starts=<date>
-	   --started=<date>
-	   --contacted=<date>
+    my $synerr = 0;
 
-	   --time-left=<int>
-	     
-	   --time-taken=<int>
+EDIT:
+    # We'll let the user edit the form before sending it to the server,
+    # unless we have enough information to submit it non-interactively.
+    if ($edit || (!$input && !$cl)) {
+        my $newtext = vi($text);
+        # We won't resubmit a bad form unless it was changed.
+        $text = ($synerr && $newtext eq $text) ? undef : $newtext;
+    }
 
+    if ($text) {
+        my $r = submit("$REST/edit", {content => $text, %data});
+        if ($r->code == 409) {
+            # If we submitted a bad form, we'll give the user a chance
+            # to correct it and resubmit.
+            if ($edit || (!$input && !$cl)) {
+                $text = $r->content;
+                $synerr = 1;
+                goto EDIT;
+            }
+            else {
+                print $r->content;
+                exit -1;
+            }
+        }
+        print $r->content;
+    }
+}
 
-   Link related manipulation:
+# We roll "comment" and "correspond" into the same handler.
 
-	   --depends-on=[+|-]<ticketid>
-	   --member-of=[+|-]<ticketid>
-	   --refers-to=[+|-]<ticketid>
-           --merge-into=<ticketid>
+sub comment {
+    my ($action) = @_;
+    my (%data, $id, @files, @bcc, @cc, $msg, $wtime, $edit);
+    my $bad = 0;
 
-Comments and replies
+    while (@ARGV) {
+        $_ = shift @ARGV;
 
-	   --comment
-	   --reply|respond
-	     --source <path>
-                Specify the path to the source file for this ticket update
+        if (/^-e$/) {
+            $edit = 1;
+        }
+        elsif (/^-[abcmw]$/) {
+            unless (@ARGV) {
+                whine "No argument specified with $_.";
+                $bad = 1; last;
+            }
+
+            if (/-a/) {
+                unless (-f $ARGV[0] && -r $ARGV[0]) {
+                    whine "Cannot read attachment: '$ARGV[0]'.";
+                    exit -1;
+                }
+                push @files, shift @ARGV;
+            }
+            elsif (/-([bc])/) {
+                my $a = $_ eq "-b" ? \@bcc : \@cc;
+                @$a = split /\s*,\s*/, shift @ARGV;
+            }
+            elsif (/-m/) { $msg = shift @ARGV }
+            elsif (/-w/) { $wtime = shift @ARGV }
+        }
+        elsif (!$id && m|^(?:ticket/)?($idlist)$|) {
+            $id = $1;
+        }
+        else {
+            my $datum = /^-/ ? "option" : "argument";
+            whine "Unrecognised $datum '$_'.";
+            $bad = 1; last;
+        }
+    }
 
-	      --noedit
-                Don't invoke \$EDITOR to edit the content of this update
+    unless ($id) {
+        whine "No object specified.";
+        $bad = 1;
+    }
+    return help($action, "ticket") if $bad;
+
+    my $form = [
+        "",
+        [ "Ticket", "Action", "Cc", "Bcc", "Attachment", "TimeWorked", "Text" ],
+        {
+            Ticket     => $id,
+            Action     => $action,
+            Cc         => [ @cc ],
+            Bcc        => [ @bcc ],
+            Attachment => [ @files ],
+            TimeWorked => $wtime || '',
+            Text       => $msg || '',
+        }
+    ];
+
+    my $text = Form::compose([ $form ]);
+
+    if ($edit || !$msg) {
+        my $error = 0;
+        my ($c, $o, $k, $e);
+
+        do {
+            my $ntext = vi($text);
+            exit if ($error && $ntext eq $text);
+            $text = $ntext;
+            $form = Form::parse($text);
+            $error = 0;
+
+            ($c, $o, $k, $e) = @{ $form->[0] };
+            if ($e) {
+                $error = 1;
+                $c = "# Syntax error.";
+                goto NEXT;
+            }
+            elsif (!@$o) {
+                exit;
+            }
+            @files = @{ vsplit($k->{Attachment}) };
+
+        NEXT:
+            $text = Form::compose([[$c, $o, $k, $e]]);
+        } while ($error);
+    }
 
+    my $i = 1;
+    foreach my $file (@files) {
+        $data{"attachment_$i"} = bless([ $file ], "Attachment");
+        $i++;
+    }
+    $data{content} = $text;
 
+    my $r = submit("$REST/ticket/comment/$id", \%data);
+    print $r->content;
+}
 
+# Merge one ticket into another.
 
-   Condiments
+sub merge {
+    my @id;
+    my $bad = 0;
 
-	   --verbose
-	   --debug
-	   --version
-	   --help|h|usage
-             You're reading it.
+    while (@ARGV) {
+        $_ = shift @ARGV;
 
-EOUSAGE
+        if (/^\d+$/) {
+            push @id, $_;
+        }
+        else {
+            whine "Unrecognised argument: '$_'.";
+            $bad = 1; last;
+        }
+    }
 
-    exit(0);
-}
+    unless (@id == 2) {
+        my $evil = @id > 2 ? "many" : "few";
+        whine "Too $evil arguments specified.";
+        $bad = 1;
+    }
+    return help("merge", "ticket") if $bad;
 
-# Print version, and leave
-if ($version) {
-	print "RT $RT::VERSION for $RT::rtname. Copyright 1996-2001 Jesse Vincent <jesse\@fsck.com>\n";
-	exit(0);
+    my $r = submit("$REST/ticket/merge/$id[0]", {into => $id[1]});
+    print $r->content;
 }
 
-# }}}
-
-# {{{ Validate any options that were passed in. normalize them.
+# Link one ticket to another.
 
-#if a queue was specified
-if ($queue) {
-    # make sure that $queue is a valid queue and load it into $queue_obj
-}
+sub link {
+    my ($bad, $del, %data) = (0, 0, ());
+    my %ltypes = map { lc $_ => $_ } qw(DependsOn DependedOnBy RefersTo
+                                        ReferredToBy HasMember MemberOf);
 
-#For each date in: $due, $starts, $started
+    while (@ARGV && $ARGV[0] =~ /^-/) {
+        $_ = shift @ARGV;
 
-# load up an RT::Date object and parse it into a normalized form
-# if it can't parse it, log an error and null out the variable
+        if (/^-d$/) {
+            $del = 1;
+        }
+        else {
+            whine "Unrecognised option: '$_'.";
+            $bad = 1; last;
+        }
+    }
 
-# }}}
+    if (@ARGV == 3) {
+        my ($from, $rel, $to) = @ARGV;
+        if ($from !~ /^\d+$/ || $to !~ /^\d+$/) {
+            my $bad = $from =~ /^\d+$/ ? $to : $from;
+            whine "Invalid ticket ID '$bad' specified.";
+            $bad = 1;
+        }
+        unless (exists $ltypes{lc $rel}) {
+            whine "Invalid relationship '$rel' specified.";
+            $bad = 1;
+        }
+        %data = (id => $from, rel => $rel, to => $to, del => $del);
+    }
+    else {
+        my $bad = @ARGV < 3 ? "few" : "many";
+        whine "Too $bad arguments specified.";
+        $bad = 1;
+    }
+    return help("link", "ticket") if $bad;
 
-# {{{ Check if we're creating, if so, create the ticket and be done
+    my $r = submit("$REST/ticket/link", \%data);
+    print $r->content;
+}
 
-if ($create) {
-    $RT::Logger->debug("Creating a new ticket");
+# Grant/revoke a user's rights.
 
-    #Make sure the current user can create tickets in this queue
-    
-    #Make sure that the owner specified can own tickets in this queue
+sub grant {
+    my ($cmd) = @_;
 
+    my $revoke = 0;
+    while (@ARGV) {
+    }
 
-	    
-    my $linesref = GetMessageContent( Edit => $edit, Source => $source,
-				      CurrentUser => $CurrentUser
-				    );
-    
-    require MIME::Entity;
-    my $MIMEObj;
-    
-    if ($linesref) {
-	$MIMEObj = MIME::Entity->build(Data => $linesref);
-    }	
-    
-    use RT::Ticket;
-    my $Ticket=new RT::Ticket($CurrentUser);
-    my ($ticket, $trans, $msg) =
-      $Ticket->Create(Queue => $queue,
-		      Owner => $owner,
-		      Status => $status || 'new' ,
-		      Subject => $subject,
-		      Requestor => \@requestors,
-		      Cc => \@cc,
-		      AdminCc => \@admincc,
-		      Due => $due,
-		      Starts => $starts,
-		      Started => $started,
-		      TimeLeft => $time_left,
-		      InitialPriority => $priority,
-		      FinalPriority => $final_priority,
-		      MIMEObj => $MIMEObj
-		     );
-    print $msg . "\n";
+    $revoke = 1 if $cmd->{action} eq 'revoke';
 }
 
-# }}}
-
-else {
-    #Apply restrictions
-    use RT::Tickets;
-    my $Tickets = new RT::Tickets($CurrentUser);
-    
-    # {{{ Limit our search
-    my $value;			#to use when iterating through restrictions
-    my $queue_id;		#to use when limiting by keyword
-    
-    # {{{ limit on id
-
-    foreach $value (@id) {
-	if ($value =~ /^(\d+)$/) {
-	    $Tickets->LimitId ( VALUE => $1,
-				OPERATOR => '=');
-	}	
-	elsif ($value =~ /^(\d*)\D?(\d*)$/) {
-	    my $start = $1;
-	    my $end = $2;
-	    $Tickets->LimitId(
-			      VALUE => "$start",
-			      OPERATOR => '>=') if ($start);
-	    $Tickets->LimitId(
-			      VALUE => "$end",
-			      OPERATOR => '<=') if ($end);
-	}	
+# Client <-> Server communication.
+# --------------------------------
+#
+# This function composes and sends an HTTP request to the RT server, and
+# interprets the response. It takes a request URI, and optional request
+# data (a string, or a reference to a set of key-value pairs).
+
+sub submit {
+    my ($uri, $content) = @_;
+    my ($req, $data);
+    my $ua = new LWP::UserAgent(agent => "RT/3.0b", env_proxy => 1);
+
+    # Did the caller specify any data to send with the request?
+    $data = [];
+    if (defined $content) {
+        unless (ref $content) {
+            # If it's just a string, make sure LWP handles it properly.
+            # (By pretending that it's a file!)
+            $content = [ content => [undef, "", Content => $content] ];
+        }
+        elsif (ref $content eq 'HASH') {
+            my @data;
+            foreach my $k (keys %$content) {
+                if (ref $content->{$k} eq 'ARRAY') {
+                    foreach my $v (@{ $content->{$k} }) {
+                        push @data, $k, $v;
+                    }
+                }
+                else { push @data, $k, $content->{$k} }
+            }
+            $content = \@data;
+        }
+        $data = $content;
     }
 
+    # Should we send authentication information to start a new session?
+    if (!defined $session->cookie) {
+        push @$data, ( user => $config{user} );
+        push @$data, ( pass => $config{passwd} || read_passwd() );
+    }
 
-    # }}}
-    
-    # {{{ limit on status
-
-    foreach $value (@limit_status) {
-	if ($value =~ /^(=|!=|!|)(.*)$/) {
-	    my $op = $1;
-	    my $val = $2;
-	         
-
-	    $op = ParseBooleanOp($op);
-	    $Tickets->LimitStatus(VALUE => "$val",
-				  OPERATOR => "$op");
-	}	
+    # Now, we construct the request.
+    if (@$data) {
+        $req = POST($uri, $data, Content_Type => 'form-data');
     }
+    else {
+        $req = GET($uri);
+    }
+    $session->add_cookie_header($req);
+
+    # Then we send the request and parse the response.
+    DEBUG(3, $req->as_string);
+    my $res = $ua->request($req);
+    DEBUG(3, $res->as_string);
+
+    if ($res->is_success) {
+        # The content of the response we get from the RT server consists
+        # of an HTTP-like status line followed by optional header lines,
+        # a blank line, and arbitrary text.
+
+        my ($head, $text) = split /\n\n/, $res->content, 2;
+        my ($status, @headers) = split /\n/, $head;
+        $text =~ s/\n*$/\n/;
+
+        # "RT/3.0.1 401 Credentials required"
+        if ($status !~ m#^RT/\d+(?:\.\d+)+(?:-?\w+)? (\d+) ([\w\s]+)$#) {
+            warn "rt: Malformed RT response from $config{server}.\n";
+            warn "(Rerun with RTDEBUG=3 for details.)\n" if $config{debug} < 3;
+            exit -1;
+        }
 
-    # }}}
-
-
-
-    # {{{ limit on queue
-    foreach $value (@limit_queue) {
-	if ($value =~ /^(\W?)(.*?)$/i) {
-	    my $op = $1;
-	    my $val = $2;
-		
-	    $op = ParseBooleanOp($op);
-
-	    my $queue_obj = new RT::Queue($RT::SystemUser);
-		
-	    unless ($queue_obj->Load($val)) {
-		$RT::Logger->debug("Queue '$val' not found");
-		print STDERR "Queue '$val' not found\n";	
-		exit(-1);
-	    }
-	    $RT::Logger->debug ("Limiting queue to $op ".$queue_obj->Name);
-	    $Tickets->LimitQueue(VALUE => $queue_obj->Name,
-				 OPERATOR => $op);
-	    $queue_id=$queue_obj->id;
-	}	
-    }	
-
-    # {{{ limit on keyword
-    foreach $value (@limit_keyword) {
-	if ($value =~ /^(\W?)(.*?)\/(.*)$/i) {
-	    my $op = $1;
-	    my $select = $2;
-	    my $keyword = $3;
-
-	    $op = ParseBooleanOp($op);
-
-	    # load the keyword select
-	    my $keyselect = RT::KeywordSelect->new($RT::SystemUser);
-	    unless ($keyselect->LoadByName(Name=>$select, Queue=>$queue_id)) {
-		$RT::Logger->debug("KeywordSelect '$select' not found");
-		print STDERR "KeywordSelect '$select' not fount\n";
-		exit(-1);
-	    }
-
-	    # load the keyword
-	    my $k = RT::Keyword->new($RT::SystemUser);
-	    unless ($k->LoadByNameAndParentId($keyword, $keyselect->Keyword)) {
-		$RT::Logger->debug("Keyword '$keyword' not found");
-		print STDERR "Keyword '$keyword' not found\n";
-		exit(-1);
-	    }
-	    $Tickets->LimitKeyword(OPERATOR => $op,
-	                           KEYWORDSELECT => $keyselect->id,
-				   KEYWORD => $k->id);
-	    $RT::Logger->debug ("Limiting keyword to $op ".$k->Path);
-	}
+        # Our caller can pretend that the server returned a custom HTTP
+        # response code and message. (Doing that directly is apparently
+        # not sufficiently portable and uncomplicated.)
+        $res->code($1);
+        $res->message($2);
+        $res->content($text);
+        $session->update($res) if ($res->is_success || $res->code != 401);
+
+        if (!$res->is_success) {
+            # We can deal with authentication failures ourselves. Either
+            # we sent invalid credentials, or our session has expired.
+            if ($res->code == 401) {
+                my %d = @$data;
+                if (exists $d{user}) {
+                    warn "rt: Incorrect username or password.\n";
+                    exit -1;
+                }
+                elsif ($req->header("Cookie")) {
+                    # We'll retry the request with credentials, unless
+                    # we only wanted to logout in the first place.
+                    $session->delete;
+                    return submit(@_) unless $uri eq "$REST/logout";
+                }
+            }
+            # Conflicts should be dealt with by the handler and user.
+            # For anything else, we just die.
+            elsif ($res->code != 409) {
+                warn "rt: ", $res->content;
+                exit;
+            }
+        }
     }
-    # }}}
-    # {{{ limit on owner
-    foreach $value (@limit_owner) {
-	if ($value =~ /^(\W?)(.*?)$/i) {
-	    my $op = $1;
-	    my $val = $2;
-		
-	    $op = ParseBooleanOp($op);
-
-	    my $user_obj = new RT::User($RT::SystemUser);
-		
-	    unless ($user_obj->Load($val)) {
-		$RT::Logger->debug("User '$val' not found");
-		print STDERR "User '$val' not found\n";	
-		exit(-1);
-	    }
-	    $val = $user_obj->id();
-		
-	    $RT::Logger->debug ("Limiting owner to $op $val");
-	    $Tickets->LimitOwner(VALUE => "$val",
-				 OPERATOR => "$op");
-	}	
-    }	
-    # }}}
-    # {{{ limt on priority
-
-    foreach $value (@limit_priority) {
-	my ($start, $end) = ParseRange($value);
-	if ($start == $end) {
-	    $Tickets->LimitPriority( VALUE => $start,
-				     OPERATOR => '=');
-	} elsif ($start) {
-	    $Tickets->LimitPriority( VALUE => $start,
-				     OPERATOR => '>=');
-	} elsif ($end) {
-	    $Tickets->LimitPriority( VALUE => $end,
-				     OPERATOR => '<=');
-	}	
-	    
+    else {
+        warn "rt: Server error: ", $res->message, " (", $res->code, ")\n";
+        exit -1;
     }
-    foreach $value (@limit_final_priority) {
-	my ($start, $end) = ParseRange($value);
-	if ($start == $end) {
-	    $Tickets->LimitFinalPriority( VALUE => $start,
-					  OPERATOR => '=');
-	} elsif ($start) {
-	    $Tickets->LimitFinalPriority( VALUE => $start,
-					  OPERATOR => '>=');
-	} elsif ($end) {
-	    $Tickets->LimitFinalPriority( VALUE => $end,
-					  OPERATOR => '<=');
-	}	
+
+    return $res;
+}
+
+# Session management.
+# -------------------
+#
+# Maintains a list of active sessions in the ~/.rt_sessions file.
+{
+    package Session;
+    my ($s, $u);
+
+    # Initialises the session cache.
+    sub new {
+        my ($class, $file) = @_;
+        my $self = {
+            file => $file || "$HOME/.rt_sessions",
+            sids => { }
+        };
+       
+        # The current session is identified by the currently configured
+        # server and user.
+        ($s, $u) = @config{"server", "user"};
+
+        bless $self, $class;
+        $self->load();
+
+        return $self;
     }
-    # }}}
-
-    foreach $value (@limit_requestor) {
-	if ($value =~ /^(\W?)(.*?)$/i) {
-	    my $op = $1;
-	    my $val = $2;
-		
-	    $op = ParseBooleanOp($op);
-	    $Tickets->LimitRequestor(VALUE => $val,
-				     OPERATOR => $op );
-	}
-	    
+
+    # Returns the current session cookie.
+    sub cookie {
+        my ($self) = @_;
+        my $cookie = $self->{sids}{$s}{$u};
+        return defined $cookie ? "RT_SID=$cookie" : undef;
     }
-    foreach $value (@limit_subject) {
-	
-	if ($value =~ /^(\W?)(.*?)$/i) {
-	    my $op = $1;
-	    my $val = $2;
-	    
-	    $op = ParseLikeOp($op);
-	    
-	    $Tickets->LimitSubject(VALUE => $val,
-				   OPERATOR => $op );
-	    }
+
+    # Deletes the current session cookie.
+    sub delete {
+        my ($self) = @_;
+        delete $self->{sids}{$s}{$u};
     }
-    
-    foreach $value (@limit_body) {
-	if ($value =~ /^(\W?)(.*?)$/i) {
-	    my $op = $1;
-	    my $val = $2;
-	    
-	    $op = ParseLikeOp($op);
-	    
-		$Tickets->LimitBody(VALUE => $val,
-				    OPERATOR => $op );
-	}	
-	
+
+    # Adds a Cookie header to an outgoing HTTP request.
+    sub add_cookie_header {
+        my ($self, $request) = @_;
+        my $cookie = $self->cookie();
+
+        $request->header(Cookie => $cookie) if defined $cookie;
     }
-    
-    
-    
-    # Dates
-    foreach my $date (@limit_created) {
-	my ($start, $end) = ParseDateRange($date);
-	$Tickets->LimitCreated ( VALUE => $start,
-				 OPERATOR => '>=' ) if ($start);
-	$Tickets->LimitCreated ( VALUE => $end,
-				 OPERATOR => '<=' ) if ($end);
+
+    # Extracts the Set-Cookie header from an HTTP response, and updates
+    # session information accordingly.
+    sub update {
+        my ($self, $response) = @_;
+        my $cookie = $response->header("Set-Cookie");
+
+        if (defined $cookie && $cookie =~ /^RT_SID=([0-9A-Fa-f]+);/) {
+            $self->{sids}{$s}{$u} = $1;
+        }
     }
 
-    foreach my $date (@limit_due) {
-	my ($start, $end) = ParseDateRange($date);
-	$Tickets->LimitDue ( VALUE => $start,
-				 OPERATOR => '>=' ) if ($start);
-	$Tickets->LimitDue ( VALUE => $end,
-				 OPERATOR => '<=' ) if ($end);
+    # Loads the session cache from the specified file.
+    sub load {
+        my ($self, $file) = @_;
+        $file ||= $self->{file};
+        local *F;
+
+        open(F, $file) && do {
+            $self->{file} = $file;
+            my $sids = $self->{sids} = {};
+            while (<F>) {
+                chomp;
+                next if /^$/ || /^#/;
+                next unless m#^https?://[^ ]+ \w+ [0-9A-Fa-f]+$#;
+                my ($server, $user, $cookie) = split / /, $_;
+                $sids->{$server}{$user} = $cookie;
+            }
+            return 1;
+        };
+        return 0;
     }
 
-    foreach my $date (@limit_starts) {
-	my ($start, $end) = ParseDateRange($date);
-	$Tickets->LimitStarts ( VALUE => $start,
-				 OPERATOR => '>=' ) if ($start);
-	$Tickets->LimitStarts ( VALUE => $end,
-				 OPERATOR => '<=' ) if ($end);
+    # Writes the current session cache to the specified file.
+    sub save {
+        my ($self, $file) = shift;
+        $file ||= $self->{file};
+        local *F;
+
+        open(F, ">$file") && do {
+            my $sids = $self->{sids};
+            foreach my $server (keys %$sids) {
+                foreach my $user (keys %{ $sids->{$server} }) {
+                    my $sid = $sids->{$server}{$user};
+                    if (defined $sid) {
+                        print F "$server $user $sid\n";
+                    }
+                }
+            }
+            close(F);
+            chmod 0600, $file;
+            return 1;
+        };
+        return 0;
     }
 
-    foreach my $date (@limit_started) {
-	my ($start, $end) = ParseDateRange($date);
-	$Tickets->LimitStarted ( VALUE => $start,
-				 OPERATOR => '>=' ) if ($start);
-	$Tickets->LimitStarted ( VALUE => $end,
-				 OPERATOR => '<=' ) if ($end);
+    sub DESTROY {
+        my $self = shift;
+        $self->save;
     }
+}
 
-    foreach my $date (@limit_resolved) {
-	my ($start, $end) = ParseDateRange($date);
-	$Tickets->LimitResolved ( VALUE => $start,
-				 OPERATOR => '>=' ) if ($start);
-	$Tickets->LimitResolved ( VALUE => $end,
-				 OPERATOR => '<=' ) if ($end);
+# Form handling.
+# --------------
+#
+# Forms are RFC822-style sets of (field, value) specifications with some
+# initial comments and interspersed blank lines allowed for convenience.
+# Sets of forms are separated by --\n (in a cheap parody of MIME).
+#
+# Each form is parsed into an array with four elements: commented text
+# at the start of the form, an array with the order of keys, a hash with
+# key/value pairs, and optional error text if the form syntax was wrong.
+
+# Returns a reference to an array of parsed forms.
+sub Form::parse {
+    my $state = 0;
+    my @forms = ();
+    my @lines = split /\n/, $_[0];
+    my ($c, $o, $k, $e) = ("", [], {}, "");
+
+    LINE:
+    while (@lines) {
+        my $line = shift @lines;
+
+        next LINE if $line eq '';
+
+        if ($line eq '--') {
+            # We reached the end of one form. We'll ignore it if it was
+            # empty, and store it otherwise, errors and all.
+            if ($e || $c || @$o) {
+                push @forms, [ $c, $o, $k, $e ];
+                $c = ""; $o = []; $k = {}; $e = "";
+            }
+            $state = 0;
+        }
+        elsif ($state != -1) {
+            if ($state == 0 && $line =~ /^#/) {
+                # Read an optional block of comments (only) at the start
+                # of the form.
+                $state = 1;
+                $c = $line;
+                while (@lines && $lines[0] =~ /^#/) {
+                    $c .= "\n".shift @lines;
+                }
+                $c .= "\n";
+            }
+            elsif ($state <= 1 && $line =~ /^($field):(?:\s+(.*))?$/) {
+                # Read a field: value specification.
+                my $f  = $1;
+                my @v  = ($2 || ());
+
+                # Read continuation lines, if any.
+                while (@lines && ($lines[0] eq '' || $lines[0] =~ /^\s+/)) {
+                    push @v, shift @lines;
+                }
+                pop @v while (@v && $v[-1] eq '');
+
+                # Strip longest common leading indent from text.
+                my $ws = "";
+                foreach my $ls (map {/^(\s+)/} @v[1..$#v]) {
+                    $ws = $ls if (!$ws || length($ls) < length($ws));
+                }
+                s/^$ws// foreach @v;
+
+                push(@$o, $f) unless exists $k->{$f};
+                vpush($k, $f, join("\n", @v));
+
+                $state = 1;
+            }
+            elsif ($line !~ /^#/) {
+                # We've found a syntax error, so we'll reconstruct the
+                # form parsed thus far, and add an error marker. (>>)
+                $state = -1;
+                $e = Form::compose([[ "", $o, $k, "" ]]);
+                $e.= $line =~ /^>>/ ? "$line\n" : ">> $line\n";
+            }
+        }
+        else {
+            # We saw a syntax error earlier, so we'll accumulate the
+            # contents of this form until the end.
+            $e .= "$line\n";
+        }
     }
+    push(@forms, [ $c, $o, $k, $e ]) if ($e || $c || @$o);
 
-    foreach my $date (@limit_lastupdated) {
-	my ($start, $end) = ParseDateRange($date);
-	$Tickets->LimitLastUpdated( VALUE => $start,
-				 OPERATOR => '>=' ) if ($start);
-	$Tickets->LimitLastUpdated ( VALUE => $end,
-				 OPERATOR => '<=' ) if ($end);
+    foreach my $l (keys %$k) {
+        $k->{$l} = vsplit($k->{$l}) if (ref $k->{$l} eq 'ARRAY');
     }
 
-    foreach my $link (@limit_memberof) {
-	$Tickets->LimitMemberOf($link);
-    }	
+    return \@forms;
+}
 
-    foreach my $link (@limit_hasmember) {
-	$Tickets->LimitHasMember($link);
-    }	
+# Returns text representing a set of forms.
+sub Form::compose {
+    my ($forms) = @_;
+    my @text;
 
-    foreach my $link (@limit_dependson) {
-	$Tickets->LimitDependsOn($link);
-    }	
+    foreach my $form (@$forms) {
+        my ($c, $o, $k, $e) = @$form;
+        my $text = "";
 
-    foreach my $link (@limit_dependedonby) {
-	$Tickets->LimitDependedOnBy($link);
+        if ($c) {
+            $c =~ s/\n*$/\n/;
+            $text = "$c\n";
+        }
+        if ($e) {
+            $text .= $e;
+        }
+        elsif ($o) {
+            my @lines;
+
+            foreach my $key (@$o) {
+                my ($line, $sp);
+                my $v = $k->{$key};
+                my @values = ref $v eq 'ARRAY' ? @$v : $v;
+
+                $sp = " "x(length("$key: "));
+                $sp = " "x4 if length($sp) > 16;
+
+                foreach $v (@values) {
+                    if ($v =~ /\n/) {
+                        $v =~ s/^/$sp/gm;
+                        $v =~ s/^$sp//;
+
+                        if ($line) {
+                            push @lines, "$line\n\n";
+                            $line = "";
+                        }
+                        elsif (@lines && $lines[-1] !~ /\n\n$/) {
+                            $lines[-1] .= "\n";
+                        }
+                        push @lines, "$key: $v\n\n";
+                    }
+                    elsif ($line &&
+                           length($line)+length($v)-rindex($line, "\n") >= 70)
+                    {
+                        $line .= ",\n$sp$v";
+                    }
+                    else {
+                        $line = $line ? "$line, $v" : "$key: $v";
+                    }
+                }
+
+                $line = "$key:" unless @values;
+                if ($line) {
+                    if ($line =~ /\n/) {
+                        if (@lines && $lines[-1] !~ /\n\n$/) {
+                            $lines[-1] .= "\n";
+                        }
+                        $line .= "\n";
+                    }
+                    push @lines, "$line\n";
+                }
+            }
+
+            $text .= join "", @lines;
+        }
+        else {
+            chomp $text;
+        }
+        push @text, $text;
     }
-    foreach my $link (@limit_refersto) {
-	$Tickets->LimitRefersTo($link);
-    }	
-    
-    foreach my $link (@limit_referredtoby) {
-	$Tickets->LimitReferredToBy($link);
-    }	
 
-    
-    if ($limit_first){
-    }
-    if ($limit_rows){
-    }
+    return join "\n--\n\n", @text;
+}
 
-# }}}
-    
-    # {{{ Iterate through all tickets we found
+# Configuration.
+# --------------
 
+# Returns configuration information from the environment.
+sub config_from_env {
+    my %env;
 
-    my ($format, $titles, $code);
-    
-    #Set up the summary format if we need to
-    if (defined $summary) {
-	my $format_string = $summary || $ENV{'RT_SUMMARY_FORMAT'} || "%id4%status4%queue7%subject40%requestor16";
+    foreach my $k ("DEBUG", "USER", "PASSWD", "SERVER") {
+        if (exists $ENV{"RT$k"}) {
+            $env{lc $k} = $ENV{"RT$k"};
+        }
+    }
 
-	($format, $titles, $code) = BuildListingFormat($format_string);
-        printf "$format\n", eval "$titles";
-   }	
+    return %env;
+}
 
- 
+# Finds a suitable configuration file and returns information from it.
+sub config_from_file {
+    my ($rc) = @_;
 
-    while (my $Ticket = $Tickets->Next()) {
-	$RT::Logger->debug ("Now working on ticket ". $Ticket->id);
-    
-	#Run through all the ticket modifications we might want to do
-	#TODO: these are all insufficiently lazy and should be replaced with some 
-	# nice foreaches.
-
-
-	# {{{ deal with watchers
-	
-	# add / delete requestors
-	foreach $value (@requestors) {
-	    if ($value =~ /^(\W?)(.*)$/) {
-		my $op = $1;
-		my $addr = $2;
-		
-		$Ticket->AddRequestor(Email => $addr) if ($op eq '+');
-		$Ticket->DeleteRequestor( $addr) if ($op eq '-');
-	    }	
-	}
-	
-	# add / delete ccs
-	foreach $value (@cc) {
-	    if ($value =~ /^(\W?)(.*)$/) {
-		my $op = $1;
-		my $addr = $2;
-		$Ticket->AddCc(Email => $addr) if ($op eq '+');
-		$Ticket->DeleteCc($addr) if ($op eq '-');
-	    }	
-	}	
-	
-	# add / delete adminccs
-        $RT::Logger->debug("Looking at admin ccs");
-	foreach $value (@admincc) {
-	    if ($value =~ /^(\W?)(.*)$/) {
-		my $op = $1;
-		my $addr = $2;
-		$Ticket->AddAdminCc(Email => $addr) if ($op eq '+');
-		$Ticket->DeleteAdminCc($addr) if ($op eq '-');
-	    }	
-	}	
-
-	# }}}
-	
-	# {{{ Deal with ticket keywords
-
-	my $KeywordSelects = $Ticket->QueueObj->KeywordSelects();
-        $RT::Logger->debug ("Looking at keywords");
-	foreach $value (@keywords) {
-           $RT::Logger->debug("Looking at --keyword=$value");
-	    if ($value =~ /^(\W?)(.*?)\/(.*)$/) {
-		my $op = $1;
-		my $select = $2;
-		my $keyword = $3;
-		
-		$RT::Logger->debug("Going to $op Keyword $select / $keyword");	
-		while (my $ks = $KeywordSelects->Next) {
-                    $RT::Logger->debug("$select is select ".$ks->Name." is found");
-		    next unless ($ks->Name =~ /$select/i);
-		    $RT::Logger->debug ("Found a match for $select\n"); 
-		    my $kids = $ks->KeywordObj->Descendents;
-    
-                    my ($kid);
-		    foreach $kid (keys %{$kids}) {
-                        $RT::Logger->debug("Now comparing $keyword with ".$kids->{$kid}. "\n");
-			next unless ($kids->{$kid} =~ /^$keyword$/i);
-		        $RT::Logger->debug("Going to $op $select / $keyword (".$kids->{$kid} .")");	
-			$Ticket->DeleteKeyword(KeywordSelect => $ks->id,
-					    Keyword => $kid) if ($op eq '-');
-			
-			$Ticket->AddKeyword(KeywordSelect => $ks->id,
-					    Keyword => $kid) if ($op eq '+');
-		    }
-		    
-		}
-	    }
-	}
-	# }}}
-	
-	# {{{ deal with links
-
-	# Deal with merging {
-	if ($mergeinto) {
-		my ($trans, $msg) =$Ticket->MergeInto($mergeinto);
-		print $msg."\n";
-	}	
-	# add /delete depends-ons
-
-	foreach my $value (@dependson) {
-	    if ($value =~ /^(\W?)(.*)$/) {
-		my $op = $1;
-		my $ticket = $2;
-		if (!$op or ($op eq '+')) {
-		    my ($trans, $msg) =
-		      $Ticket->AddLink(Type => 'DependsOn', Target => $ticket);
-		    print $msg."\n";
-		}
-		elsif ($op eq '-') {
-		    my ($trans, $msg) = 
-		      $Ticket->DeleteLink(Type => 'DependsOn', Target => $ticket);
-		    print $msg."\n";
-		}
-
-	    }
-	}
-	# add /delete member-of
-	foreach my $value (@memberof) {
-	    if ($value =~ /^(\W?)(.*)$/) {
-		my $op = $1;
-		my $ticket = $2;
-		if ($op eq '+') {
-		    my ($trans, $msg) =
-		      $Ticket->AddLink(Type => 'MemberOf', Target => $ticket);
-		    print $msg;
-		}
-		elsif ($op eq '-') {
-		    my ($trans, $msg) = 
-		      $Ticket->DeleteLink(Type => 'MemberOf', Target => $ticket);
-		    print $msg;
-		}
-
-	    }
-	}	
-	# add / delete refers-to
-		foreach my $value (@refersto) {
-	    if ($value =~ /^(\W?)(.*)$/) {
-		my $op = $1;
-		my $ticket = $2;
-		if ($op eq '+') {
-		    my ($trans, $msg) =
-		      $Ticket->AddLink(Type => 'RefersTo', Target => $ticket);
-		    print $msg;
-		}
-		elsif ($op eq '-') {
-		    my ($trans, $msg) = 
-		      $Ticket->DeleteLink(Type => 'RefersTo', Target => $ticket);
-		    print $msg;
-		}
-
-	    }
-	}
-
-	# }}}
-	
-	# {{{ deal with dates
-	
-	#set due 
-	if ($due) {
-	    my $iso = ParseDateToISO($due);
-	    if ($iso) {
-		$RT::Logger->debug("Setting due date to $iso ($due)");
-		my ($trans, $msg) = 
-		  $Ticket->SetDue($iso);
-		print $msg;
-	    }
-	    else {
-		print "Due date '$due' could not be parsed";
-	    }
-	}
-
-	#set starts
-	if ($starts) {
-	    my $iso = ParseDateToISO($due);
-	    if ($iso) {
-		my ($trans, $msg) = 
-		  $Ticket->SetStarts($iso);
-		print $msg."\n";
-	    }
-	    else {
-		print "Starts date '$starts' could not be parsed";
-	    }
-	}
-	#set started
-		if ($started) {
-	    my $iso = ParseDateToISO($started);
-	    if ($iso) {
-		my ($trans, $msg) = 
-		  $Ticket->SetStarted($iso);
-		print $msg."\n";
-	    }
-	    else {
-		print "Started date '$started' could not be parsed";
-	    }
-	}
-	#set contacted
-		if ($contacted) {
-	    my $iso = ParseDateToISO($contacted);
-	    if ($iso) {
-		my ($trans, $msg) = 
-		  $Ticket->SetContacted($iso);
-		print $msg."\n";
-	    }
-	    else {
-		print "Contacted date '$contacted' could not be parsed";
-	    }
-	}
-
-    # }}}
-	
-	# {{{ set other attributes
-
-	#Set subject
-	if ($subject) {
-	    my ($trans, $msg) = $Ticket->SetSubject($subject);
-	    print $msg."\n";
-	}
-	
-	#Set priority
-	if ($priority) {
-	    my ($trans, $msg) = 
-	      $Ticket->SetPriority($priority);
-	    print $msg."\n";
-	}
-	
-	#Set final priority
-	if ($final_priority) {
-	    my ($trans, $msg) =
-	      $Ticket->SetFinalPriority($final_priority);
-	    print $msg."\n";
-	}
-
-	#Set status
-	if ($status) {
-	    my ($trans, $msg) = 
-	      $Ticket->SetStatus($status);
-	    print $msg."\n";
-	}
-	
-	#Set time left
-	if ($time_left) {
-	    my ($trans, $msg) = 
-	      $Ticket->SetTimeLeft($time_left);
-	    print $msg."\n";
-	}
-
-	#Set time_taken 
-	if ($time_taken) {
-	    my ($trans, $msg) = 
-	      $Ticket->SetTimeTaken($time_taken);
-	    print $msg."\n";
-	}
-	
-	#Set owner
-	if ($owner) {
-	    my ($trans, $msg) =
-	      $Ticket->SetOwner($owner);
-	    print $msg."\n";
-	}
-
-        # Steal
-        if ($steal) {
-                my ($trans, $msg) =
-                 $Ticket->Steal();
-                 print $msg . "\n";
+    if ($rc =~ m#^/#) {
+        # We'll use an absolute path if we were given one.
+        return parse_config_file($rc);
+    }
+    else {
+        # Otherwise we'll use the first file we can find in the current
+        # directory, or in one of its (increasingly distant) ancestors.
+
+        my @dirs = split /\//, cwd;
+        while (@dirs) {
+            my $file = join('/', @dirs, $rc);
+            if (-r $file) {
+                return parse_config_file($file);
+            }
+
+            # Remove the last directory component each time.
+            pop @dirs;
+        }
+
+        # Still nothing? We'll fall back to some likely defaults.
+        for ("$HOME/$rc", "/etc/rt.conf") {
+            return parse_config_file($_) if (-r $_);
         }
-	#Set queue 
-	if ($queue) {
-	    my ($trans, $msg) = 
-	      $Ticket->SetQueue($queue);
-	    print $msg."\n";
-	}
-
-    # }}}
-	
-
-
-	# {{{ Perform ticket comments/replies
-	if ($reply) {
-	    $RT::Logger->debug("Replying to ticket ".$Ticket->Id);
-	    
-	    my $linesref = GetMessageContent( Edit => $edit, Source => $source,
-					     CurrentUser => $CurrentUser
-					   );
-	    
-	    #TODO build this entity
-	    require MIME::Entity;
-	    my $MIMEObj = MIME::Entity->build(Data => $linesref);
-	    
-	    $Ticket->Correspond( MIMEObj => $MIMEObj ,
-				 TimeTaken => $time_taken);
-	}	
-	
-	elsif ($comment) {
-	    $RT::Logger->debug("Commenting on ticket ".$Ticket->Id);
-	
-	    my $linesref =GetMessageContent(Edit => $edit, Source => $source,
-					    CurrentUser => $CurrentUser);
-	    #TODO build this entity
-	    require MIME::Entity;
-	    my $MIMEObj = MIME::Entity->build(Data => $linesref);
-	    
-	    $Ticket->Comment( MIMEObj => $MIMEObj,
-			      TimeTaken => $time_taken);
-	}
-
-    # }}}
-	
-	# {{{ Display whatever we need to display
-
-	# {{{ Display a full ticket listing and history
-	if ($history) {
-	    #Display the history
-	    $RT::Logger->debug("Show history for ".$Ticket->id);
-	    
-	    if ($Ticket->CurrentUserHasRight("ShowTicket")) {
-		&ShowSummary($Ticket);
-		print "\n";
-		&ShowHistory($Ticket);
-	    }
-	    else {
-		print "You don't have permission to view that ticket.\n";
-	    }
-	}	
-
-	# }}}
-	
-	# {{{ Display a summary if we need to
-	if (defined $summary) {
-	    $RT::Logger->debug ("Show ticket summary with format $format");
-	    
-	    printf $format."\n", eval $code;
-	    
-	}	
-	# }}}
-
-	# }}}
-	
     }
 
-    # }}}
-    
+    return ();
 }
 
+# Makes a hash of the specified configuration file.
+sub parse_config_file {
+    my %cfg;
+    my ($file) = @_;
+
+    open(CFG, $file) && do {
+        while (<CFG>) {
+            chomp;
+            next if (/^#/ || /^\s*$/);
+
+            if (/^(user|passwd|server)\s+([^ ]+)$/) {
+                $cfg{$1} = $2;
+            }
+            else {
+                die "rt: $file:$.: unknown configuration directive.\n";
+            }
+        }
+    };
 
-$RT::Handle->Disconnect();
+    return %cfg;
+}
 
+# Helper functions.
+# -----------------
 
+sub whine {
+    my $sub = (caller(1))[3];
+    $sub =~ s/^main:://;
+    warn "rt: $sub: @_\n";
+    return;
+}
 
+sub read_passwd {
+    eval 'require Term::ReadKey';
+    if ($@) {
+        die "No password specified (and Term::ReadKey not installed).\n";
+    }
 
+    print "Password: ";
+    Term::ReadKey::ReadMode('noecho');
+    chomp(my $passwd = Term::ReadKey::ReadLine(0));
+    Term::ReadKey::ReadMode('restore');
+    print "\n";
 
+    return $passwd;
+}
 
+sub vi {
+    my ($text) = @_;
+    my $file = "/tmp/rt.form.$$";
+    my $editor = $ENV{EDITOR} || $ENV{VISUAL} || "vi";
 
-# {{{ sub ParseBooleanOp
+    local *F;
+    local $/ = undef;
 
-=head2 ParseBooleanOp
+    open(F, ">$file") || die "$file: $!\n"; print F $text; close(F);
+    system($editor, $file) && die "Couldn't run $editor.\n";
+    open(F, $file) || die "$file: $!\n"; $text = <F>; close(F);
+    unlink($file);
 
-  Takes an option modifier. returns the apropriate SQL operator.
-  If it's handed ! or -, returns !=.  Otherwise returns =.
+    return $text;
+}
 
-=cut
+# Add a value to a (possibly multi-valued) hash key.
+sub vpush {
+    my ($hash, $key, $val) = @_;
+    my @val = ref $val eq 'ARRAY' ? @$val : $val;
 
-sub ParseBooleanOp {
-    
-    my $op = shift;
-    
-    #so that !new limits to not new, etc
-    if ($op =~ /^(\!|-)/) {
-	$op = "!=";
+    if (exists $hash->{$key}) {
+        unless (ref $hash->{$key} eq 'ARRAY') {
+            my @v = $hash->{$key} ne '' ? $hash->{$key} : ();
+            $hash->{$key} = \@v;
+        }
+        push @{ $hash->{$key} }, @val;
     }
     else {
-	$op = "=";
+        $hash->{$key} = $val;
     }
-    
-    return($op);
 }
 
-# }}}
+# "Normalise" a hash key that's known to be multi-valued.
+sub vsplit {
+    my ($val) = @_;
+    my ($word, @words);
+    my @values = ref $val eq 'ARRAY' ? @$val : $val;
+
+    foreach my $line (map {split /\n/} @values) {
+        # XXX: This should become a real parser, à la Text::ParseWords.
+        $line =~ s/^\s+//;
+        $line =~ s/\s+$//;
+        push @words, split /\s*,\s*/, $line;
+    }
+
+    return \@words;
+}
+
+sub expand_list {
+    my ($list) = @_;
+    my ($elt, @elts, %elts);
 
-# {{{ sub ParseLikeOp
-=head2 ParseLikeOp
+    foreach $elt (split /,/, $list) {
+        if ($elt =~ /^(\d+)-(\d+)$/) { push @elts, ($1..$2) }
+        else                         { push @elts, $elt }
+    }
 
-  Takes an option modifier. returns the apropriate SQL operator.
-  If it's handed ! or -, returns NOT  LIKE.  Otherwise returns LIKE
+    @elts{@elts}=();
+    return sort {$a<=>$b} keys %elts;
+}
 
-=cut
+sub get_type_argument {
+    my $type;
 
-sub ParseLikeOp {
-    
-    my $op = shift;
-    
-    #so that !new limits to not new, etc
-    if ($op =~ /^(\!|-)/) {
-	$op = "NOT LIKE";
+    if (@ARGV) {
+        $type = shift @ARGV;
+        unless ($type =~ /^[A-Za-z0-9_.-]+$/) {
+            # We want whine to mention our caller, not us.
+            @_ = ("Invalid type '$type' specified.");
+            goto &whine;
+        }
     }
     else {
-	$op = "LIKE";
+        @_ = ("No type argument specified with -t.");
+        goto &whine;
     }
-    
-    return($op);
+
+    $type =~ s/s$//; # "Plural". Ugh.
+    return $type;
 }
-# }}}
 
-# {{{ sub ParseDateToISO
+sub get_var_argument {
+    my ($data) = @_;
 
-=head2 ParseDateToISO
+    if (@ARGV) {
+        my $kv = shift @ARGV;
+        if (my ($k, $v) = $kv =~ /^($field)=(.*)$/) {
+            push @{ $data->{$k} }, $v;
+        }
+        else {
+            @_ = ("Invalid variable specification: '$kv'.");
+            goto &whine;
+        }
+    }
+    else {
+        @_ = ("No variable argument specified with -S.");
+        goto &whine;
+    }
+}
 
-Takes a date in an arbitrary format.
-Returns an ISO date and time in GMT
+sub is_object_spec {
+    my ($spec, $type) = @_;
 
-=cut
+    $spec =~ s|^(?:$type/)?|$type/| if defined $type;
+    return $spec if ($spec =~ m{^$name/(?:$idlist|$labels)(?:/.*)?$}o);
+    return;
+}
 
-sub ParseDateToISO {
-    my $date = shift;
+__DATA__
 
-	my $date_obj = new RT::Date($CurrentUser);
-	$date_obj->Set( Format => 'unknown',
-			Value => $date
-		      );
-	return ($date_obj->ISO);
-}
+Title: intro
+Title: introduction
+Text:
 
-# }}}
+    ** THIS IS AN UNSUPPORTED PREVIEW RELEASE **
+    ** PLEASE REPORT BUGS TO rt-bugs@fsck.com **
 
-# {{{ sub ParseDateRange
+    This is a command-line interface to RT 3.
 
-=head2 ParseDateRange [RANGE]
+    It allows you to interact with an RT server over HTTP, and offers an
+    interface to RT's functionality that is better-suited to automation
+    and integration with other tools.
 
-Takes a range of dates of the form [<date>][-][<date>] and returns 
-starting and ending dates (as ISOs) If a date is specified as neither a starting nor ending 
-date, we parse it it as "midnight tonight to midnight tomorrow"
+    In general, each invocation of this program should specify an action
+    to perform on one or more objects, and any other arguments required
+    to complete the desired action.
 
-=cut
+    For more information:
 
-sub ParseDateRange {
-    my $in = shift;
-    my ($start, $end);
-    
-    
-    use RT::Date;
-    my $start_obj = new RT::Date($CurrentUser);
-    my $end_obj = new RT::Date($CurrentUser);
-    
-    if ($in =~ /^(.*?)-(.*?)$/) {
-	$start = $1;
-	$end = $2;
-
-	if ($start) {
-	    $start_obj->Set(Format => 'unknown', 
-			    Value => $start);
-	}
-	if ($end) {
-	    $end_obj->Set(Format => 'unknown', 
-			  Value => $end);
-	}
-    }
-    else {
-	$start = $in;
-	$end = $in;
-
-	$start_obj->Set(Format => 'unknown', 
-			Value => $start);
-	
-	$end_obj->Set(Format => 'unknown', 
-		      Value => $end);
-	
-	$start_obj->SetToMidnight();
-	$end_obj->SetToMidnight();
-	$end_obj->AddDay();
-    }	
-    
-    if ($start) {
-	$start = $start_obj->ISO;
-    }
-    if ($end) {
-	$end = $end_obj->ISO;
-    }
+        - rt help actions       (a list of possible actions)
+        - rt help objects       (how to specify objects)
+        - rt help usage         (syntax information)
 
-    return ($start, $end);
-}
+        - rt help config        (configuration details)
+        - rt help examples      (a few useful examples)
+        - rt help topics        (a list of help topics)
 
-# }}}
+--
 
-# {{{ ParseRange
-=head2 ParseRange [RANGE]
+Title: usage
+Title: syntax
+Text:
 
-Takes a range of the form [<int>][-][<int>] and returns 
-a first and a last value. If the - is omitted, both $start and $end are the same.
-=cut
+    Syntax:
 
-sub ParseRange {
-    my $in = shift;
-    my ($start, $end);
-    
-    if ($in =~ /(.*?)-(.*?)/) {
-	$start = $1;
-	$end = $2;
-    }
-    else {
-	$start = $in;
-	$end = $in;
-    }	
-    
-    return ($start, $end);
-    
+        rt <action> [options] [arguments]
 
-    
-}
+    Each invocation of this program must specify an action (e.g. "edit",
+    "create"), options to modify behaviour, and other arguments required
+    by the specified action. (For example, most actions expect a list of
+    numeric object IDs to act upon.)
 
-# }}}
-	  
-# {{{ sub ShowSummary 
-
-sub ShowSummary  {
-    my $Ticket = shift;
-
-
-    print <<EOFORM;
-Serial Number: @{[$Ticket->Id]}   Status:@{[$Ticket->Status]} Worked: @{[$Ticket->TimeWorked]} minutes  Queue:@{[$Ticket->QueueObj->Name]}
-      Subject: @{[$Ticket->Subject]}
-   Requestors: @{[$Ticket->RequestorsAsString]}
-           Cc: @{[$Ticket->CcAsString]}
-     Admin Cc: @{[$Ticket->AdminCcAsString]}
-        Owner: @{[$Ticket->OwnerObj->Name]}
-     Priority: @{[$Ticket->Priority]} / @{[$Ticket->FinalPriority]}
-          Due: @{[$Ticket->DueAsString]}
-      Created: @{[$Ticket->CreatedAsString]} (@{[$Ticket->AgeAsString]})
- Last Contact: @{[$Ticket->ToldAsString]} (@{[$Ticket->LongSinceToldAsString]})
-  Last Update: @{[$Ticket->LastUpdatedAsString]} by @{[$Ticket->LastUpdatedByObj->Name]}
-	         
-EOFORM
-
-my $selects = $Ticket->QueueObj->KeywordSelects();
-    #get the keyword selects
-    print "Keywords:\n";
-    while (my $select = $selects->Next) {
-	print "\t" .$select->Name .": ";
-	my $keys = $Ticket->KeywordsObj($select->id);	
-	while (my $key = $keys->Next) {
-	    print $key->KeywordObj->RelativePath($select->KeywordObj) . "  ";
-	    
-	}	
-	print "\n";
-    }
+    The details of the syntax and arguments for each action are given by
+    "rt help <action>". Some actions may be referred to by more than one
+    name ("create" is the same as "new", for example).  
+
+    Objects are identified by a type and an ID (which can be a name or a
+    number, depending on the type). For some actions, the object type is
+    implied (you can only comment on tickets); for others, the user must
+    specify it explicitly. See "rt help objects" for details.
+
+    In syntax descriptions, mandatory arguments that must be replaced by
+    appropriate value are enclosed in <>, and optional arguments are
+    indicated by [] (for example, <action> and [options] above).
+
+    For more information:
+
+        - rt help objects       (how to specify objects)
+        - rt help actions       (a list of actions)
+        - rt help types         (a list of object types)
+
+--
+
+Title: conf
+Title: config
+Title: configuration
+Text:
+
+    This program has two major sources of configuration information: its
+    configuration files, and the environment.
+
+    The program looks for configuration directives in a file named .rtrc
+    (or $RTCONFIG; see below) in the current directory, and then in more
+    distant ancestors, until it reaches /. If no suitable configuration
+    files are found, it will also check for ~/.rtrc and /etc/rt.conf.
+
+    Configuration directives:
+
+        The following directives may occur, one per line:
+
+        - server <URL>          URL to RT server.
+        - user <username>       RT username.
+        - passwd <passwd>       RT user's password.
+
+        Blank and #-commented lines are ignored.
+
+    Environment variables:
+
+        The following environment variables override any corresponding
+        values defined in configuration files:
+
+        - RTUSER
+        - RTPASSWD
+        - RTSERVER
+        - RTDEBUG       Numeric debug level. (Set to 3 for full logs.)
+        - RTCONFIG      Specifies a name other than ".rtrc" for the
+                        configuration file.
+
+--
+
+Title: objects
+Text:
+
+    Syntax:
+
+        <type>/<id>[/<attributes>]
+
+    Every object in RT has a type (e.g. "ticket", "queue") and a numeric
+    ID. Some types of objects can also be identified by name (like users
+    and queues). Furthermore, objects may have named attributes (such as
+    "ticket/1/history").
+
+    An object specification is like a path in a virtual filesystem, with
+    object types as top-level directories, object IDs as subdirectories,
+    and named attributes as further subdirectories.
+
+    A comma-separated list of names, numeric IDs, or numeric ranges can
+    be used to specify more than one object of the same type. Note that
+    the list must be a single argument (i.e., no spaces). For example,
+    "user/root,1-3,5,7-10,ams" is a list of ten users; the same list
+    can also be written as "user/ams,root,1,2,3,5,7,8-20".
     
-#iterate through the keyword selects.
-#print the keyword select and all the related keywords
+    Examples:
 
+        ticket/1
+        ticket/1/attachments
+        ticket/1/attachments/3
+        ticket/1/attachments/3/content
+        ticket/1-3/links
+        ticket/1-3,5-7/history
 
+        user/ams
+        user/ams/rights
+        user/ams,rai,1/rights
 
-#TODO: finish link  descriptions
-print "Dependencies: \n";
-   while (my $l=$Ticket->DependedOnBy->Next) {
-       print $l->BaseObj->id," (",$l->BaseObj->Subject,") ",$l->Type," this ticket\n";
-   }
-   while (my $l=$Ticket->DependsOn->Next) {
-       print "This ticket ",$l->Type," ",$l->TargetObj->Id," (",$l->TargetObj->Subject,")\n";
-   }
-}
+    For more information:
 
-# }}}
-
-# {{{ sub ShowHistory 
-sub ShowHistory  {
-    my $Ticket = shift;
-    my $Transaction;    
-    my $Transactions = $Ticket->Transactions;
-
-    while ($Transaction = $Transactions->Next) {
-      &ShowTransaction($Transaction);
-    }   
-  }
-# }}}
-
-# {{{ sub ShowTransaction 
-sub ShowTransaction  {
-  my $transaction = shift;
-  
-print <<EOFORM;
-==========================================================================
-Date: @{[$transaction->CreatedAsString]} (@{[$transaction->TimeTaken]} minutes)
-@{[$transaction->Description]}
-EOFORM
-    ;
-  my $attachments=$transaction->Attachments();
-  while (my $message=$attachments->Next) {
-    print <<EOFORM;
---------------------------------------------------------------------------
-@{[$message->Headers]}
-EOFORM
-
-    if ($message->ContentType =~ m{^(text/plain|message|text$)}) {
-	print $message->Content;
-    } else {
-	print $message->ContentType, " not shown";
-    }
-  }
-  print "\n";
-  return();
-}
-# }}}
-
-
-# {{{ sub BuildListingFormat
-
-sub BuildListingFormat {
-    my $format_string = shift;
-
-    my ($id, @format, @code, @titles);
-    my ($field,$titles,$length, $format);
-
-    my $code = "";
-
-    # {{{ attribs
-    my $attribs = { id => { chars => '4',
-			    justify => 'r',
-			    title => 'id',
-			    value => '$Ticket->id',
-			  },
-		    
-		    queue => { chars => '8',
-			       justify => 'l',
-			       title => 'Queue',
-			       value => '$Ticket->QueueObj->Name' 
-			     },
-		    subject => { chars => '30',
-				 justify => 'l',
-				 title => 'Subject',
-				 value => '$Ticket->Subject',
-			       },
-		    priority => { chars => '2',
-				  justify => 'r',
-				  title => 'Pri',
-				  value => '$Ticket->Priority',
-				},
-		    final_priority => {  chars => '2',
-					 justify => 'r',
-					 title => 'Fin',
-					 value => '$Ticket->FinalPriority',
-				      },
-		    time_worked => { chars => '6',
-				     justify => 'r',
-				     title => 'Worked',
-				     value => '$Ticket->TimeWorked',
-				   },
-		    time_left => { chars => '5',
-				   justify => 'r',
-				   title => 'Left',
-				   value => '$Ticket->TimeLeft',
-			       
-				 },
-		
-		    status => {  chars => '6',
-				 justify => 'r',
-				 title => 'Status',
-				 value => '$Ticket->Status',
-			      },
-		    owner => {  chars => '10',
-				justify => 'r',
-				title => 'Owner',
-				value => '$Ticket->OwnerObj->Name'
-			     },
-		    requestor => {  chars => '10',
-				    justify => 'r',
-				    title => 'Requestor',
-				    value => '$Ticket->RequestorsAsString'
-				 },
-		    created => {  chars => '12',
-				  justify => 'r',
-				  title => 'Created',
-				  value => '$Ticket->CreatedAsString'
-			       },
-		    updated => {  chars => '12',
-				  justify => 'r',
-				  title => 'Updated',
-				  value => '$Ticket->LastUpdatedAsString'
-			       },
-		    due => {  chars => '12',
-			      justify => 'r',
-			      title => 'Due',
-			      value => '$Ticket->DueAsString'
-			   },
-		    told => {  chars => '12',
-			       justify => 'r',
-			       title => 'Told',
-			       value => '$Ticket->ToldAsString'
-			    },
-		
-		
-		
-		  };
-
-    # }}}
+        - rt help <action>      (action-specific details)
+        - rt help <type>        (type-specific details)
+
+--
+
+Title: actions
+Title: commands
+Text:
+
+    You can currently perform the following actions on all objects:
+
+        - list          (list objects matching some condition)
+        - show          (display object details)
+        - edit          (edit object details)
+        - create        (create a new object)
+
+    Each type may define actions specific to itself; these are listed in
+    the help item about that type.
+
+    For more information:
+
+        - rt help <action>      (action-specific details)
+        - rt help types         (a list of possible types)
+
+--
+
+Title: types
+Text:
+
+    You can currently operate on the following types of objects:
+
+        - tickets
+        - users
+        - groups
+        - queues
+
+    For more information:
+
+        - rt help <type>        (type-specific details)
+        - rt help objects       (how to specify objects)
+        - rt help actions       (a list of possible actions)
+
+--
+
+Title: ticket
+Text:
+
+    Tickets are identified by a numeric ID.
+
+    The following generic operations may be performed upon tickets:
+
+        - list
+        - show
+        - edit
+        - create
+
+    In addition, the following ticket-specific actions exist:
+
+        - link
+        - merge
+        - comment
+        - correspond
+
+    Attributes:
+
+        The following attributes can be used with "rt show" or "rt edit"
+        to retrieve or edit other information associated with tickets:
+
+        links                      A ticket's relationships with others.
+        history                    All of a ticket's transactions.
+        history/type/<type>        Only a particular type of transaction.
+        history/id/<id>            Only the transaction of the specified id.
+        attachments                A list of attachments.
+        attachments/<id>           The metadata for an individual attachment.
+        attachments/<id>/content   The content of an individual attachment.
+
+--
+
+Title: user
+Title: group
+Text:
+
+    Users and groups are identified by name or numeric ID.
+
+    The following generic operations may be performed upon them:
+
+        - list
+        - show
+        - edit
+        - create
+
+    In addition, the following type-specific actions exist:
+
+        - grant
+        - revoke
+
+    Attributes:
+
+        The following attributes can be used with "rt show" or "rt edit"
+        to retrieve or edit other information associated with users and
+        groups:
+
+        rights                  Global rights granted to this user.
+        rights/<queue>          Queue rights for this user.
+
+--
+
+Title: queue
+Text:
+
+    Queues are identified by name or numeric ID.
+
+    Currently, they can be subjected to the following actions:
+
+        - show
+        - edit
+        - create
+
+--
+
+Title: logout
+Text:
+
+    Syntax:
+
+        rt logout
+
+    Terminates the currently established login session. You will need to
+    provide authentication credentials before you can continue using the
+    server. (See "rt help config" for details about authentication.)
+
+--
+
+Title: ls
+Title: list
+Title: search
+Text:
+
+    Syntax:
+
+        rt <ls|list|search> [options] "query string"
+
+    Displays a list of objects matching the specified conditions.
+    ("ls", "list", and "search" are synonyms.)
+
+    Conditions are expressed in the SQL-like syntax used internally by
+    RT3. (For more information, see "rt help query".) The query string
+    must be supplied as one argument.
+
+    (Right now, the server doesn't support listing anything but tickets.
+    Other types will be supported in future; this client will be able to
+    take advantage of that support without any changes.)
+
+    Options:
+
+        The following options control how much information is displayed
+        about each matching object:
+
+        -i      Numeric IDs only. (Useful for |rt edit -; see examples.)
+        -s      Short description.
+        -l      Longer description.
+
+        In addition,
+        
+        -o +/-<field>   Orders the returned list by the specified field.
+        -S var=val      Submits the specified variable with the request.
+        -t type         Specifies the type of object to look for. (The
+                        default is "ticket".)
+
+    Examples:
+
+        rt ls "Priority > 5 and Status='new'"
+        rt ls -o +Subject "Priority > 5 and Status='new'"
+        rt ls -o -Created "Priority > 5 and Status='new'"
+        rt ls -i "Priority > 5"|rt edit - set status=resolved
+        rt ls -t ticket "Subject like '[PATCH]%'"
+
+--
+
+Title: show
+Text:
+
+    Syntax:
+
+        rt show [options] <object-ids>
+
+    Displays details of the specified objects.
+
+    For some types, object information is further classified into named
+    attributes (for example, "1-3/links" is a valid ticket specification
+    that refers to the links for tickets 1-3). Consult "rt help <type>"
+    and "rt help objects" for further details.
+
+    This command writes a set of forms representing the requested object
+    data to STDOUT.
+
+    Options:
+
+        -               Read IDs from STDIN instead of the command-line.
+        -t type         Specifies object type.
+        -f a,b,c        Restrict the display to the specified fields.
+        -S var=val      Submits the specified variable with the request.
+
+    Examples:
+
+        rt show -t ticket -f id,subject,status 1-3
+        rt show ticket/3/attachments/29
+        rt show ticket/3/attachments/29/content
+        rt show ticket/1-3/links
+        rt show -t user 2
+
+--
+
+Title: new
+Title: edit
+Title: create
+Text:
+
+    Syntax:
+
+        rt edit [options] <object-ids> set field=value [field=value] ...
+                                       add field=value [field=value] ...
+                                       del field=value [field=value] ...
+
+    Edits information corresponding to the specified objects.
+
+    If, instead of "edit", an action of "new" or "create" is specified,
+    then a new object is created. In this case, no numeric object IDs
+    may be specified, but the syntax and behaviour remain otherwise
+    unchanged.
+
+    This command typically starts an editor to allow you to edit object
+    data in a form for submission. If you specified enough information
+    on the command-line, however, it will make the submission directly.
+
+    The command line may specify field-values in three different ways.
+    "set" sets the named field to the given value, "add" adds a value
+    to a multi-valued field, and "del" deletes the corresponding value.
+    Each "field=value" specification must be given as a single argument.
+
+    For some types, object information is further classified into named
+    attributes (for example, "1-3/links" is a valid ticket specification
+    that refers to the links for tickets 1-3). These attributes may also
+    be edited. Consult "rt help <type>" and "rt help object" for further
+    details.
+
+    Options:
+
+        -       Read numeric IDs from STDIN instead of the command-line.
+                (Useful with rt ls ... | rt edit -; see examples below.)
+        -i      Read a completed form from STDIN before submitting.
+        -o      Dump the completed form to STDOUT instead of submitting.
+        -e      Allows you to edit the form even if the command-line has
+                enough information to make a submission directly.
+        -S var=val
+                Submits the specified variable with the request.
+        -t type Specifies object type.
+
+    Examples:
+
+        # Interactive (starts $EDITOR with a form).
+        rt edit ticket/3
+        rt create -t ticket
+
+        # Non-interactive.
+        rt edit ticket/1-3 add cc=foo@example.com set priority=3
+        rt ls -t tickets -i 'Priority > 5' | rt edit - set status=resolved
+        rt edit ticket/4 set priority=3 owner=bar@example.com \
+                         add cc=foo@example.com bcc=quux@example.net
+        rt create -t ticket subject='new ticket' priority=10 \
+                            add cc=foo@example.com
+
+--
+
+Title: comment
+Title: correspond
+Text:
+
+    Syntax:
+
+        rt <comment|correspond> [options] <ticket-id>
+
+    Adds a comment (or correspondence) to the specified ticket (the only
+    difference being that comments aren't sent to the requestors.)
+
+    This command will typically start an editor and allow you to type a
+    comment into a form. If, however, you specified all the necessary
+    information on the command line, it submits the comment directly.
+
+    (See "rt help forms" for more information about forms.)
+
+    Options:
+
+        -m <text>       Specify comment text.
+        -a <file>       Attach a file to the comment. (May be used more
+                        than once to attach multiple files.)
+        -c <addrs>      A comma-separated list of Cc addresses.
+        -b <addrs>      A comma-separated list of Bcc addresses.
+        -w <time>       Specify the time spent working on this ticket.
+        -e              Starts an editor before the submission, even if
+                        arguments from the command line were sufficient.
+
+    Examples:
+
+        rt comment -t 'Not worth fixing.' -a stddisclaimer.h 23
+
+--
+
+Title: merge
+Text:
+
+    Syntax:
+
+        rt merge <from-id> <to-id>
+
+    Merges the two specified tickets.
+
+--
+
+Title: link
+Text:
+
+    Syntax:
+
+        rt link [-d] <id-A> <relationship> <id-B>
+
+    Creates (or, with -d, deletes) a link between the specified tickets.
+    The relationship can (irrespective of case) be any of:
+
+        DependsOn/DependedOnBy:     A depends upon B (or vice versa).
+        RefersTo/ReferredToBy:      A refers to B (or vice versa).
+        MemberOf/HasMember:         A is a member of B (or vice versa).
+
+    To view a ticket's relationships, use "rt show ticket/3/links". (See
+    "rt help ticket" and "rt help show".)
+
+    Options:
+
+        -d      Deletes the specified link.
+
+    Examples:
+
+        rt link 2 dependson 3
+        rt link -d 4 referredtoby 6     # 6 no longer refers to 4
+
+--
+
+Title: grant
+Title: revoke
+Text:
+
+--
+
+Title: query
+Text:
+
+    RT3 uses an SQL-like syntax to specify object selection constraints.
+    See the <RT:...> documentation for details.
     
+    (XXX: I'm going to have to write it, aren't I?)
 
-    foreach $field (split ('%',$format_string)) {
-	
-	if ($field =~ /^(\D*?)(\d*?)$/) {
-	    $id = $1;
-	    $length = $2;
-	}
-	else {	
-	    $RT::Logger->debug ("Error parsing $field\n");
-	}
-	if ($length) {
-	    push (@format, "%".$length.".".$length."s ");
-	    
-	    push (@code,  $attribs->{"$id"}->{'value'});
-		  
-	    push (@titles, "'". $attribs->{"$id"}->{title}. "'");
-	}
-	
-	
-    }
-     $code = join (',', @code);
-     $format = join (" ", @format);
-     $titles = join (', ', @titles);
+--
+
+Title: form
+Title: forms
+Text:
+
+    This program uses RFC822 header-style forms to represent object data
+    in a form that's suitable for processing both by humans and scripts.
+
+    A form is a set of (field, value) specifications, with some initial
+    commented text and interspersed blank lines allowed for convenience.
+    Field names may appear more than once in a form; a comma-separated
+    list of multiple field values may also be specified directly.
     
-  
-    return ($format, $titles, $code);
-}
+    Field values can be wrapped as in RFC822, with leading whitespace.
+    The longest sequence of leading whitespace common to all the lines
+    is removed (preserving further indentation). There is no limit on
+    the length of a value.
+
+    Multiple forms are separated by a line containing only "--\n".
+
+    (XXX: A more detailed specification will be provided soon. For now,
+    the server-side syntax checking will suffice.)
+
+--
+
+Title: topics
+Text:
+
+    Use "rt help <topic>" for help on any of the following subjects:
+
+        - tickets, users, groups, queues.
+        - show, edit, ls/list/search, new/create.
+
+        - query                                 (search query syntax)
+        - forms                                 (form specification)
+
+        - objects                               (how to specify objects)
+        - types                                 (a list of object types)
+        - actions/commands                      (a list of actions)
+        - usage/syntax                          (syntax details)
+        - conf/config/configuration             (configuration details)
+        - examples                              (a few useful examples)
+
+--
 
-# }}}
+Title: example
+Title: examples
+Text:
 
+    This section will be filled in with useful examples, once it becomes
+    more clear what examples may be useful.
 
+    For the moment, please consult examples provided with each action.
 
-1;
+--
diff --git a/rt/bin/rt-crontool b/rt/bin/rt-crontool
index ede874a0c..cdbc3cbc9 100644
--- a/rt/bin/rt-crontool
+++ b/rt/bin/rt-crontool
@@ -197,7 +197,7 @@ sub help {
       )
       . "\n\n";
 
-    print " sbin/cron_shim \\\n";
+    print " bin/rt-cron-tool \\\n";
     print
       "  --search RT::Search::ActiveTicketsInQueue  --search-arg general \\\n";
     print
@@ -205,6 +205,16 @@ sub help {
     print "  --action RT::Action::SetPriority --action-arg 99 \\\n";
     print "  --verbose\n";
 
+    print "\n";
+    print loc("Escalate tickets");
+    print "rt-crontool \\\n";
+    print " --search RT::Search::ActiveTicketsInQueue  --search-arg thequeuename \\\n";
+    print " --action RT::Action::EscalatePriority \\\n";
+ 
+ 
+ 
+
+
 
     exit(0);
 }
diff --git a/rt/bin/rt-crontool.in b/rt/bin/rt-crontool.in
index 73b80aa90..8ecc71826 100644
--- a/rt/bin/rt-crontool.in
+++ b/rt/bin/rt-crontool.in
@@ -197,7 +197,7 @@ sub help {
       )
       . "\n\n";
 
-    print " sbin/cron_shim \\\n";
+    print " bin/rt-cron-tool \\\n";
     print
       "  --search RT::Search::ActiveTicketsInQueue  --search-arg general \\\n";
     print
@@ -205,6 +205,16 @@ sub help {
     print "  --action RT::Action::SetPriority --action-arg 99 \\\n";
     print "  --verbose\n";
 
+    print "\n";
+    print loc("Escalate tickets");
+    print "rt-crontool \\\n";
+    print " --search RT::Search::ActiveTicketsInQueue  --search-arg thequeuename \\\n";
+    print " --action RT::Action::EscalatePriority \\\n";
+ 
+ 
+ 
+
+
 
     exit(0);
 }
diff --git a/rt/bin/rt-mailgate b/rt/bin/rt-mailgate
index b30443638..8af800227 100755
--- a/rt/bin/rt-mailgate
+++ b/rt/bin/rt-mailgate
@@ -1,26 +1,26 @@
 #!/usr/bin/perl -w
 # BEGIN LICENSE BLOCK
-#
+# 
 # Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
-#
+# 
 # (Except where explictly superceded by other copyright notices)
-#
+# 
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
 # been provided with this software, but in any event can be snarfed
 # from www.gnu.org.
-#
+# 
 # This work 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.
-#
+# 
 # Unless otherwise specified, all modifications, corrections or
 # extensions to this work which alter its source code become the
 # property of Best Practical Solutions, LLC when submitted for
 # inclusion in the work.
-#
-#
+# 
+# 
 # END LICENSE BLOCK
 
 =head1 NAME
@@ -31,10 +31,25 @@ rt-mailgate - Mail interface to RT3.
 
 use RT::I18N;
 
+# Make sure that when we call the mailgate wrong, it tempfails
+
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://bad.address"), "Opened the mailgate - The error below is expected - $@");
+print MAIL <<EOF;
+From: root\@localhost
+To: rt\@example.com
+Subject: This is a test of new ticket creation
+
+Foob!
+EOF
+close (MAIL);
+
+# Check the return value
+is ( $? >> 8, 75, "The error message above is expected The mail gateway exited with a failure. yay");
+
 
 # {{{ Test new ticket creation by root who is privileged and superuser
 
-ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
 print MAIL <<EOF;
 From: root\@localhost
 To: rt\@example.com
@@ -45,6 +60,9 @@ Foob!
 EOF
 close (MAIL);
 
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
 use RT::Tickets;
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
@@ -59,7 +77,7 @@ ok ($tick->Subject eq 'This is a test of new ticket creation', "Created the tick
 
 # {{{This is a test of new ticket creation as an unknown user
 
-ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
 print MAIL <<EOF;
 From: doesnotexist\@example.com
 To: rt\@example.com
@@ -69,6 +87,8 @@ Blah!
 Foob!
 EOF
 close (MAIL);
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
 
 $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
@@ -94,7 +114,7 @@ ok ($val, "Granted everybody the right to create tickets - $msg");
 
 sleep(60); # gotta sleep so the remote process' ACL cache times out
 
-ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
 print MAIL <<EOF;
 From: doesnotexist\@example.com
 To: rt\@example.com
@@ -104,6 +124,8 @@ Blah!
 Foob!
 EOF
 close (MAIL);
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
 
 
 $tickets = RT::Tickets->new($RT::SystemUser);
@@ -126,7 +148,7 @@ ok( $u->Id != 0, " user does not exist and was created by ticket submission");
 #ok ($val, "Granted everybody the right to create tickets - $msg");
 #sleep(60); # gotta sleep so the remote process' ACL cache times out
 
-ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
 print MAIL <<EOF;
 From: doesnotexist-2\@example.com
 To: rt\@example.com
@@ -136,6 +158,8 @@ Blah!
 Foob!
 EOF
 close (MAIL);
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
 
 $u = RT::User->new($RT::SystemUser);
 $u->Load('doesnotexist-2@example.com');
@@ -148,7 +172,7 @@ ok( $u->Id == 0, " user does not exist and was not created by ticket corresponde
 ok ($val, "Granted everybody the right to reply to  tickets - $msg");
 sleep(60); # gotta sleep so the remote process' ACL cache times out
 
-ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
 print MAIL <<EOF;
 From: doesnotexist-2\@example.com
 To: rt\@example.com
@@ -158,6 +182,8 @@ Blah!
 Foob!
 EOF
 close (MAIL);
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
 
 
 $u = RT::User->new($RT::SystemUser);
@@ -173,7 +199,7 @@ ok( $u->Id != 0, " user exists and was created by ticket correspondence submissi
 #ok ($val, "Granted everybody the right to create tickets - $msg");
 #sleep(60); # gotta sleep so the remote process' ACL cache times out
 
-ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action comment"), "Opened the mailgate - $@");
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action comment"), "Opened the mailgate - $@");
 print MAIL <<EOF;
 From: doesnotexist-3\@example.com
 To: rt\@example.com
@@ -184,6 +210,9 @@ Foob!
 EOF
 close (MAIL);
 
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
 $u = RT::User->new($RT::SystemUser);
 $u->Load('doesnotexist-3@example.com');
 ok( $u->Id == 0, " user does not exist and was not created by ticket comment submission");
@@ -196,7 +225,7 @@ ok( $u->Id == 0, " user does not exist and was not created by ticket comment sub
 ok ($val, "Granted everybody the right to reply to  tickets - $msg");
 sleep(60); # gotta sleep so the remote process' ACL cache times out
 
-ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action comment"), "Opened the mailgate - $@");
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action comment"), "Opened the mailgate - $@");
 print MAIL <<EOF;
 From: doesnotexist-3\@example.com
 To: rt\@example.com
@@ -207,6 +236,8 @@ Foob!
 EOF
 close (MAIL);
 
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
 
 $u = RT::User->new($RT::SystemUser);
 $u->Load('doesnotexist-3@example.com');
@@ -227,17 +258,20 @@ my $entity = MIME::Entity->build( From => 'root@localhost',
                                 Data => ['This is a test of a binary attachment']);
 
 # currently in lib/t/autogen
-$entity->attach(Path => '../../../html/NoAuth/images/spacer.gif', 
+$entity->attach(Path => '/opt/rt3/share/html/NoAuth/images/spacer.gif', 
                 Type => 'image/gif',
                 Encoding => 'base64');
 
 # Create a ticket with a binary attachment
-ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
 
 $entity->print(\*MAIL);
 
 close (MAIL);
 
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
@@ -273,7 +307,7 @@ use LWP::UserAgent;
 # Grab the binary attachment via the web ui
 my $ua      = LWP::UserAgent->new();
 
-my $full_url = "http://localhost/Ticket/Attachment/".$attachment->TransactionId."/".$attachment->id."/spacer.gif?&user=root&pass=password";
+my $full_url = "http://localhost".$RT::WebPath."/Ticket/Attachment/".$attachment->TransactionId."/".$attachment->id."/spacer.gif?&user=root&pass=password";
 my $r = $ua->get( $full_url);
 
 
@@ -286,7 +320,7 @@ is($file, $r->content, 'The attachment isn\'t screwed up in download');
 
 # {{{ Simple I18N testing
 
-ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
                                                                          
 print MAIL <<EOF;
 From: root\@localhost
@@ -301,6 +335,9 @@ bye
 EOF
 close (MAIL);
 
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
 my $unitickets = RT::Tickets->new($RT::SystemUser);
 $unitickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $unitickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
@@ -317,7 +354,7 @@ is ($unitick->Transactions->First->Content, $unitick->Transactions->First->Attac
 ok($unitick->Transactions->First->Attachments->First->Content =~ /$unistring/i, $unitick->Id." appears to be unicode ". $unitick->Transactions->First->Attachments->First->Id);
 # supposedly I18N fails on the second message sent in.
 
-ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+ok(open(MAIL, "|/opt/rt3/bin/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
                                                                          
 print MAIL <<EOF;
 From: root\@localhost
@@ -332,6 +369,9 @@ bye
 EOF
 close (MAIL);
 
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
 my $tickets2 = RT::Tickets->new($RT::SystemUser);
 $tickets2->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets2->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
@@ -367,7 +407,7 @@ use LWP::UserAgent;
 use constant EX_TEMPFAIL => 75;
 
 my %opts;
-GetOptions( \%opts, "queue=s", "action=s", "url=s", "jar=s", "help", "debug", "extension=s" );
+GetOptions( \%opts, "queue=s", "action=s", "url=s", "jar=s", "help", "debug", "extension=s", "timeout=i" );
 
 if ( $opts{help} ) {
     require Pod::Usage;
@@ -381,17 +421,18 @@ for (qw(url)) {
 }
 
 undef $/;
-my $message = <>;
 my $ua      = LWP::UserAgent->new();
 $ua->cookie_jar( { file => $opts{jar} } );
 
 my %args = (
     queue   => $opts{queue},
     action  => $opts{action},
-    message => $message,
     SessionType => 'REST',    # Surpress login box
 );
 
+# Read the message in from STDIN
+$args{'message'} = <>;
+
 
 if ($opts{'extension'}) {
         $args{$opts{'extension'}} = $ENV{'EXTENSION'};
@@ -404,6 +445,7 @@ warn "Connecting to $full_url" if $opts{'debug'};
 
 
 
+$ua->timeout(exists($opts{'timeout'}) ? $opts{'timeout'} : 180);
 my $r = $ua->post( $full_url, {%args} );
 check_failure($r);
 
@@ -414,7 +456,7 @@ if ( $content !~ /^(ok|not ok)/ ) {
 
     # It's not the server's fault if the mail is bogus. We just want to know that
     # *something* came out of the server.
-    die <<EOF
+    warn <<EOF;
 RT server error.
 
 The RT server which handled your email did not behave as expected. It
@@ -423,8 +465,13 @@ said:
 $content
 EOF
 
+exit EX_TEMPFAIL;
+
 }
 
+exit;
+
+
 sub check_failure {
     my $r = shift;
     return if $r->is_success();
@@ -455,7 +502,11 @@ Usual invocation (from MTA):
 
     rt-mailgate --action (correspond|comment) --queue queuename
                 --url http://your.rt.server/
-                [ --extension (queue|action|ticket)
+                [ --debug ]
+                [ --extension (queue|action|ticket) ]
+                [ --timeout seconds ]
+
+
 
 See C<man rt-mailgate> for more.
 
@@ -486,6 +537,16 @@ submitted to will be set to the value of $EXTENSION. By specifying
 is related to.  "action" will allow the user to specify either "comment" or
 "correspond" in the address extension.
 
+=item C<--debug> OPTIONAL
+
+Print debugging output to standard error
+
+
+=item C<--timeout> OPTIONAL
+
+Configure the timeout for posting the message to the web server.  The
+default timeout is 3 minutes (180 seconds).
+
 
 =head1 DESCRIPTION
 
diff --git a/rt/bin/rt-mailgate.in b/rt/bin/rt-mailgate.in
index 304fcbcd6..2ddb604ec 100644
--- a/rt/bin/rt-mailgate.in
+++ b/rt/bin/rt-mailgate.in
@@ -1,26 +1,26 @@
 #!@PERL@ -w
 # BEGIN LICENSE BLOCK
-#
+# 
 # Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
-#
+# 
 # (Except where explictly superceded by other copyright notices)
-#
+# 
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
 # been provided with this software, but in any event can be snarfed
 # from www.gnu.org.
-#
+# 
 # This work 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.
-#
+# 
 # Unless otherwise specified, all modifications, corrections or
 # extensions to this work which alter its source code become the
 # property of Best Practical Solutions, LLC when submitted for
 # inclusion in the work.
-#
-#
+# 
+# 
 # END LICENSE BLOCK
 
 =head1 NAME
@@ -31,10 +31,25 @@ rt-mailgate - Mail interface to RT3.
 
 use RT::I18N;
 
+# Make sure that when we call the mailgate wrong, it tempfails
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://bad.address"), "Opened the mailgate - The error below is expected - $@");
+print MAIL <<EOF;
+From: root\@localhost
+To: rt\@example.com
+Subject: This is a test of new ticket creation
+
+Foob!
+EOF
+close (MAIL);
+
+# Check the return value
+is ( $? >> 8, 75, "The error message above is expected The mail gateway exited with a failure. yay");
+
 
 # {{{ Test new ticket creation by root who is privileged and superuser
 
-ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
 print MAIL <<EOF;
 From: root\@localhost
 To: rt\@example.com
@@ -45,6 +60,9 @@ Foob!
 EOF
 close (MAIL);
 
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
 use RT::Tickets;
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
@@ -59,7 +77,7 @@ ok ($tick->Subject eq 'This is a test of new ticket creation', "Created the tick
 
 # {{{This is a test of new ticket creation as an unknown user
 
-ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
 print MAIL <<EOF;
 From: doesnotexist\@example.com
 To: rt\@example.com
@@ -69,6 +87,8 @@ Blah!
 Foob!
 EOF
 close (MAIL);
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
 
 $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
@@ -94,7 +114,7 @@ ok ($val, "Granted everybody the right to create tickets - $msg");
 
 sleep(60); # gotta sleep so the remote process' ACL cache times out
 
-ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
 print MAIL <<EOF;
 From: doesnotexist\@example.com
 To: rt\@example.com
@@ -104,6 +124,8 @@ Blah!
 Foob!
 EOF
 close (MAIL);
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
 
 
 $tickets = RT::Tickets->new($RT::SystemUser);
@@ -126,7 +148,7 @@ ok( $u->Id != 0, " user does not exist and was created by ticket submission");
 #ok ($val, "Granted everybody the right to create tickets - $msg");
 #sleep(60); # gotta sleep so the remote process' ACL cache times out
 
-ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
 print MAIL <<EOF;
 From: doesnotexist-2\@example.com
 To: rt\@example.com
@@ -136,6 +158,8 @@ Blah!
 Foob!
 EOF
 close (MAIL);
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
 
 $u = RT::User->new($RT::SystemUser);
 $u->Load('doesnotexist-2@example.com');
@@ -148,7 +172,7 @@ ok( $u->Id == 0, " user does not exist and was not created by ticket corresponde
 ok ($val, "Granted everybody the right to reply to  tickets - $msg");
 sleep(60); # gotta sleep so the remote process' ACL cache times out
 
-ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
 print MAIL <<EOF;
 From: doesnotexist-2\@example.com
 To: rt\@example.com
@@ -158,6 +182,8 @@ Blah!
 Foob!
 EOF
 close (MAIL);
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
 
 
 $u = RT::User->new($RT::SystemUser);
@@ -173,7 +199,7 @@ ok( $u->Id != 0, " user exists and was created by ticket correspondence submissi
 #ok ($val, "Granted everybody the right to create tickets - $msg");
 #sleep(60); # gotta sleep so the remote process' ACL cache times out
 
-ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action comment"), "Opened the mailgate - $@");
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action comment"), "Opened the mailgate - $@");
 print MAIL <<EOF;
 From: doesnotexist-3\@example.com
 To: rt\@example.com
@@ -184,6 +210,9 @@ Foob!
 EOF
 close (MAIL);
 
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
 $u = RT::User->new($RT::SystemUser);
 $u->Load('doesnotexist-3@example.com');
 ok( $u->Id == 0, " user does not exist and was not created by ticket comment submission");
@@ -196,7 +225,7 @@ ok( $u->Id == 0, " user does not exist and was not created by ticket comment sub
 ok ($val, "Granted everybody the right to reply to  tickets - $msg");
 sleep(60); # gotta sleep so the remote process' ACL cache times out
 
-ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action comment"), "Opened the mailgate - $@");
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action comment"), "Opened the mailgate - $@");
 print MAIL <<EOF;
 From: doesnotexist-3\@example.com
 To: rt\@example.com
@@ -207,6 +236,8 @@ Foob!
 EOF
 close (MAIL);
 
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
 
 $u = RT::User->new($RT::SystemUser);
 $u->Load('doesnotexist-3@example.com');
@@ -227,17 +258,20 @@ my $entity = MIME::Entity->build( From => 'root@localhost',
                                 Data => ['This is a test of a binary attachment']);
 
 # currently in lib/t/autogen
-$entity->attach(Path => '../../../html/NoAuth/images/spacer.gif', 
+$entity->attach(Path => '@MASON_HTML_PATH@/NoAuth/images/spacer.gif', 
                 Type => 'image/gif',
                 Encoding => 'base64');
 
 # Create a ticket with a binary attachment
-ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
 
 $entity->print(\*MAIL);
 
 close (MAIL);
 
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
@@ -273,7 +307,7 @@ use LWP::UserAgent;
 # Grab the binary attachment via the web ui
 my $ua      = LWP::UserAgent->new();
 
-my $full_url = "http://localhost/Ticket/Attachment/".$attachment->TransactionId."/".$attachment->id."/spacer.gif?&user=root&pass=password";
+my $full_url = "http://localhost".$RT::WebPath."/Ticket/Attachment/".$attachment->TransactionId."/".$attachment->id."/spacer.gif?&user=root&pass=password";
 my $r = $ua->get( $full_url);
 
 
@@ -286,7 +320,7 @@ is($file, $r->content, 'The attachment isn\'t screwed up in download');
 
 # {{{ Simple I18N testing
 
-ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
                                                                          
 print MAIL <<EOF;
 From: root\@localhost
@@ -301,6 +335,9 @@ bye
 EOF
 close (MAIL);
 
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
 my $unitickets = RT::Tickets->new($RT::SystemUser);
 $unitickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $unitickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
@@ -317,7 +354,7 @@ is ($unitick->Transactions->First->Content, $unitick->Transactions->First->Attac
 ok($unitick->Transactions->First->Attachments->First->Content =~ /$unistring/i, $unitick->Id." appears to be unicode ". $unitick->Transactions->First->Attachments->First->Id);
 # supposedly I18N fails on the second message sent in.
 
-ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost/ --queue general --action correspond"), "Opened the mailgate - $@");
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
                                                                          
 print MAIL <<EOF;
 From: root\@localhost
@@ -332,6 +369,9 @@ bye
 EOF
 close (MAIL);
 
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
 my $tickets2 = RT::Tickets->new($RT::SystemUser);
 $tickets2->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets2->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
@@ -367,7 +407,7 @@ use LWP::UserAgent;
 use constant EX_TEMPFAIL => 75;
 
 my %opts;
-GetOptions( \%opts, "queue=s", "action=s", "url=s", "jar=s", "help", "debug", "extension=s" );
+GetOptions( \%opts, "queue=s", "action=s", "url=s", "jar=s", "help", "debug", "extension=s", "timeout=i" );
 
 if ( $opts{help} ) {
     require Pod::Usage;
@@ -381,17 +421,18 @@ for (qw(url)) {
 }
 
 undef $/;
-my $message = <>;
 my $ua      = LWP::UserAgent->new();
 $ua->cookie_jar( { file => $opts{jar} } );
 
 my %args = (
     queue   => $opts{queue},
     action  => $opts{action},
-    message => $message,
     SessionType => 'REST',    # Surpress login box
 );
 
+# Read the message in from STDIN
+$args{'message'} = <>;
+
 
 if ($opts{'extension'}) {
         $args{$opts{'extension'}} = $ENV{'EXTENSION'};
@@ -404,6 +445,7 @@ warn "Connecting to $full_url" if $opts{'debug'};
 
 
 
+$ua->timeout(exists($opts{'timeout'}) ? $opts{'timeout'} : 180);
 my $r = $ua->post( $full_url, {%args} );
 check_failure($r);
 
@@ -414,7 +456,7 @@ if ( $content !~ /^(ok|not ok)/ ) {
 
     # It's not the server's fault if the mail is bogus. We just want to know that
     # *something* came out of the server.
-    die <<EOF
+    warn <<EOF;
 RT server error.
 
 The RT server which handled your email did not behave as expected. It
@@ -423,8 +465,13 @@ said:
 $content
 EOF
 
+exit EX_TEMPFAIL;
+
 }
 
+exit;
+
+
 sub check_failure {
     my $r = shift;
     return if $r->is_success();
@@ -455,7 +502,11 @@ Usual invocation (from MTA):
 
     rt-mailgate --action (correspond|comment) --queue queuename
                 --url http://your.rt.server/
-                [ --extension (queue|action|ticket)
+                [ --debug ]
+                [ --extension (queue|action|ticket) ]
+                [ --timeout seconds ]
+
+
 
 See C<man rt-mailgate> for more.
 
@@ -486,6 +537,16 @@ submitted to will be set to the value of $EXTENSION. By specifying
 is related to.  "action" will allow the user to specify either "comment" or
 "correspond" in the address extension.
 
+=item C<--debug> OPTIONAL
+
+Print debugging output to standard error
+
+
+=item C<--timeout> OPTIONAL
+
+Configure the timeout for posting the message to the web server.  The
+default timeout is 3 minutes (180 seconds).
+
 
 =head1 DESCRIPTION
 
diff --git a/rt/bin/rt.in b/rt/bin/rt.in
new file mode 100644
index 000000000..90369b5b3
--- /dev/null
+++ b/rt/bin/rt.in
@@ -0,0 +1,1816 @@
+#!@PERL@ -w
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+
+use strict;
+
+# This program is intentionally written to have as few non-core module
+# dependencies as possible. It should stay that way.
+
+use Cwd;
+use LWP;
+use HTTP::Request::Common;
+
+# We derive configuration information from hardwired defaults, dotfiles,
+# and the RT* environment variables (in increasing order of precedence).
+# Session information is stored in ~/.rt_sessions.
+
+my $VERSION = 0.02;
+my $HOME = eval{(getpwuid($<))[7]}
+           || $ENV{HOME} || $ENV{LOGDIR} || $ENV{HOMEPATH}
+           || ".";
+my %config = (
+    (
+        debug   => 0,
+        user    => eval{(getpwuid($<))[0]} || $ENV{USER} || $ENV{USERNAME},
+        passwd  => undef,
+        server  => 'http://localhost/rt/',
+    ),
+    config_from_file($ENV{RTCONFIG} || ".rtrc"),
+    config_from_env()
+);
+my $session = new Session("$HOME/.rt_sessions");
+my $REST = "$config{server}/REST/1.0";
+
+sub whine;
+sub DEBUG { warn @_ if $config{debug} >= shift }
+
+# These regexes are used by command handlers to parse arguments.
+# (XXX: Ask Autrijus how i18n changes these definitions.)
+
+my $name   = '[\w.-]+';
+my $field  = '[a-zA-Z][a-zA-Z0-9_-]*';
+my $label  = '[a-zA-Z0-9@_.+-]+';
+my $labels = "(?:$label,)*$label";
+my $idlist = '(?:(?:\d+-)?\d+,)*(?:\d+-)?\d+';
+
+# Our command line looks like this:
+#
+#     rt <action> [options] [arguments]
+#
+# We'll parse just enough of it to decide upon an action to perform, and
+# leave the rest to per-action handlers to interpret appropriately.
+
+my %handlers = (
+#   handler     => [ ...aliases... ],
+    version     => ["version", "ver"],
+    logout      => ["logout"],
+    help        => ["help", "man"],
+    show        => ["show", "cat"],
+    edit        => ["create", "edit", "new", "ed"],
+    list        => ["search", "list", "ls"],
+    comment     => ["comment", "correspond"],
+    link        => ["link", "ln"],
+    merge       => ["merge"],
+    grant       => ["grant", "revoke"],
+);
+
+# Once we find and call an appropriate handler, we're done.
+
+my (%actions, $action);
+foreach my $fn (keys %handlers) {
+    foreach my $alias (@{ $handlers{$fn} }) {
+        $actions{$alias} = \&{"$fn"};
+    }
+}
+if (@ARGV && exists $actions{$ARGV[0]}) {
+    $action = shift @ARGV;
+}
+$actions{$action || "help"}->($action || ());
+exit;
+
+# Handler functions.
+# ------------------
+#
+# The following subs are handlers for each entry in %actions.
+
+sub version {
+    print "rt $VERSION\n";
+}
+
+sub logout {
+    submit("$REST/logout") if defined $session->cookie;
+}
+
+sub help {
+    my ($action, $type) = @_;
+    my (%help, $key);
+
+    # What help topics do we know about?
+    local $/ = undef;
+    foreach my $item (@{ Form::parse(<DATA>) }) {
+        my $title = $item->[2]{Title};
+        my @titles = ref $title eq 'ARRAY' ? @$title : $title;
+
+        foreach $title (grep $_, @titles) {
+            $help{$title} = $item->[2]{Text};
+        }
+    }
+
+    # What does the user want help with?
+    undef $action if ($action && $actions{$action} eq \&help);
+    unless ($action || $type) {
+        # If we don't know, we'll look for clues in @ARGV.
+        foreach (@ARGV) {
+            if (exists $help{$_}) { $key = $_; last; }
+        }
+        unless ($key) {
+            # Tolerate possibly plural words.
+            foreach (@ARGV) {
+                if ($_ =~ s/s$// && exists $help{$_}) { $key = $_; last; }
+            }
+        }
+    }
+
+    if ($type && $action) {
+        $key = "$type.$action";
+    }
+    $key ||= $type || $action || "introduction";
+
+    # Find a suitable topic to display.
+    while (!exists $help{$key}) {
+        if ($type && $action) {
+            if ($key eq "$type.$action") { $key = $action;        }
+            elsif ($key eq $action)      { $key = $type;          }
+            else                         { $key = "introduction"; }
+        }
+        else {
+            $key = "introduction";
+        }
+    }
+
+    print STDERR $help{$key}, "\n\n";
+}
+
+# Displays a list of objects that match some specified condition.
+
+sub list {
+    my ($q, $type, %data, $orderby);
+    my $bad = 0;
+
+    while (@ARGV) {
+        $_ = shift @ARGV;
+
+        if (/^-t$/) {
+            $bad = 1, last unless defined($type = get_type_argument());
+        }
+        elsif (/^-S$/) {
+            $bad = 1, last unless get_var_argument(\%data);
+        }
+        elsif (/^-o$/) {
+            $orderby = shift @ARGV;
+        }
+        elsif (/^-([isl])$/) {
+            $data{format} = $1;
+        }
+        elsif (/^-f$/) {
+            if ($ARGV[0] !~ /^(?:(?:$field,)*$field)$/) {
+                whine "No valid field list in '-f $ARGV[0]'.";
+                $bad = 1; last;
+            }
+            $data{fields} = shift @ARGV;
+        }
+        elsif (!defined $q && !/^-/) {
+            $q = $_;
+        }
+        else {
+            my $datum = /^-/ ? "option" : "argument";
+            whine "Unrecognised $datum '$_'.";
+            $bad = 1; last;
+        }
+    }
+
+    $type ||= "ticket";
+    unless ($type && defined $q) {
+        my $item = $type ? "query string" : "object type";
+        whine "No $item specified.";
+        $bad = 1;
+    }
+    return help("list", $type) if $bad;
+
+    my $r = submit("$REST/search/$type", { query => $q, %data, orderby => $orderby || "" });
+    print $r->content;
+}
+
+# Displays selected information about a single object.
+
+sub show {
+    my ($type, @objects, %data);
+    my $slurped = 0;
+    my $bad = 0;
+
+    while (@ARGV) {
+        $_ = shift @ARGV;
+
+        if (/^-t$/) {
+            $bad = 1, last unless defined($type = get_type_argument());
+        }
+        elsif (/^-S$/) {
+            $bad = 1, last unless get_var_argument(\%data);
+        }
+        elsif (/^-([isl])$/) {
+            $data{format} = $1;
+        }
+        elsif (/^-$/ && !$slurped) {
+            chomp(my @lines = <STDIN>);
+            foreach (@lines) {
+                unless (is_object_spec($_, $type)) {
+                    whine "Invalid object on STDIN: '$_'.";
+                    $bad = 1; last;
+                }
+                push @objects, $_;
+            }
+            $slurped = 1;
+        }
+        elsif (/^-f$/) {
+            if ($ARGV[0] !~ /^(?:(?:$field,)*$field)$/) {
+                whine "No valid field list in '-f $ARGV[0]'.";
+                $bad = 1; last;
+            }
+            $data{fields} = shift @ARGV;
+        }
+        elsif (my $spec = is_object_spec($_, $type)) {
+            push @objects, $spec;
+        }
+        else {
+            my $datum = /^-/ ? "option" : "argument";
+            whine "Unrecognised $datum '$_'.";
+            $bad = 1; last;
+        }
+    }
+
+    unless (@objects) {
+        whine "No objects specified.";
+        $bad = 1;
+    }
+    return help("show", $type) if $bad;
+
+    my $r = submit("$REST/show", { id => \@objects, %data });
+    print $r->content;
+}
+
+# To create a new object, we ask the server for a form with the defaults
+# filled in, allow the user to edit it, and send the form back.
+#
+# To edit an object, we must ask the server for a form representing that
+# object, make changes requested by the user (either on the command line
+# or interactively via $EDITOR), and send the form back.
+
+sub edit {
+    my ($action) = @_;
+    my (%data, $type, @objects);
+    my ($cl, $text, $edit, $input, $output);
+
+    use vars qw(%set %add %del);
+    %set = %add = %del = ();
+    my $slurped = 0;
+    my $bad = 0;
+    
+    while (@ARGV) {
+        $_ = shift @ARGV;
+
+        if    (/^-e$/) { $edit = 1 }
+        elsif (/^-i$/) { $input = 1 }
+        elsif (/^-o$/) { $output = 1 }
+        elsif (/^-t$/) {
+            $bad = 1, last unless defined($type = get_type_argument());
+        }
+        elsif (/^-S$/) {
+            $bad = 1, last unless get_var_argument(\%data);
+        }
+        elsif (/^-$/ && !($slurped || $input)) {
+            chomp(my @lines = <STDIN>);
+            foreach (@lines) {
+                unless (is_object_spec($_, $type)) {
+                    whine "Invalid object on STDIN: '$_'.";
+                    $bad = 1; last;
+                }
+                push @objects, $_;
+            }
+            $slurped = 1;
+        }
+        elsif (/^set$/i) {
+            my $vars = 0;
+
+            while (@ARGV && $ARGV[0] =~ /^($field)([+-]?=)(.*)$/) {
+                my ($key, $op, $val) = ($1, $2, $3);
+                my $hash = ($op eq '=') ? \%set : ($op =~ /^\+/) ? \%add : \%del;
+
+                vpush($hash, lc $key, $val);
+                shift @ARGV;
+                $vars++;
+            }
+            unless ($vars) {
+                whine "No variables to set.";
+                $bad = 1; last;
+            }
+            $cl = $vars;
+        }
+        elsif (/^(?:add|del)$/i) {
+            my $vars = 0;
+            my $hash = ($_ eq "add") ? \%add : \%del;
+
+            while (@ARGV && $ARGV[0] =~ /^($field)=(.*)$/) {
+                my ($key, $val) = ($1, $2);
+
+                vpush($hash, lc $key, $val);
+                shift @ARGV;
+                $vars++;
+            }
+            unless ($vars) {
+                whine "No variables to set.";
+                $bad = 1; last;
+            }
+            $cl = $vars;
+        }
+        elsif (my $spec = is_object_spec($_, $type)) {
+            push @objects, $spec;
+        }
+        else {
+            my $datum = /^-/ ? "option" : "argument";
+            whine "Unrecognised $datum '$_'.";
+            $bad = 1; last;
+        }
+    }
+
+    if ($action =~ /^ed(?:it)?$/) {
+        unless (@objects) {
+            whine "No objects specified.";
+            $bad = 1;
+        }
+    }
+    else {
+        if (@objects) {
+            whine "You shouldn't specify objects as arguments to $action.";
+            $bad = 1;
+        }
+        unless ($type) {
+            whine "What type of object do you want to create?";
+            $bad = 1;
+        }
+        @objects = ("$type/new");
+    }
+    return help($action, $type) if $bad;
+
+    # We need a form to make changes to. We usually ask the server for
+    # one, but we can avoid that if we are fed one on STDIN, or if the
+    # user doesn't want to edit the form by hand, and the command line
+    # specifies only simple variable assignments.
+
+    if ($input) {
+        local $/ = undef;
+        $text = <STDIN>;
+    }
+    elsif ($edit || %add || %del || !$cl) {
+        my $r = submit("$REST/show", { id => \@objects, format => 'l' });
+        $text = $r->content;
+    }
+
+    # If any changes were specified on the command line, apply them.
+    if ($cl) {
+        if ($text) {
+            # We're updating forms from the server.
+            my $forms = Form::parse($text);
+
+            foreach my $form (@$forms) {
+                my ($c, $o, $k, $e) = @$form;
+                my ($key, $val);
+
+                next if ($e || !@$o);
+
+                local %add = %add;
+                local %del = %del;
+                local %set = %set;
+
+                # Make changes to existing fields.
+                foreach $key (@$o) {
+                    if (exists $add{lc $key}) {
+                        $val = delete $add{lc $key};
+                        vpush($k, $key, $val);
+                        $k->{$key} = vsplit($k->{$key}) if $val =~ /[,\n]/;
+                    }
+                    if (exists $del{lc $key}) {
+                        $val = delete $del{lc $key};
+                        my %val = map {$_=>1} @{ vsplit($val) };
+                        $k->{$key} = vsplit($k->{$key});
+                        @{$k->{$key}} = grep {!exists $val{$_}} @{$k->{$key}};
+                    }
+                    if (exists $set{lc $key}) {
+                        $k->{$key} = delete $set{lc $key};
+                    }
+                }
+                
+                # Then update the others.
+                foreach $key (keys %set) { vpush($k, $key, $set{$key}) }
+                foreach $key (keys %add) {
+                    vpush($k, $key, $add{$key});
+                    $k->{$key} = vsplit($k->{$key});
+                }
+                push @$o, (keys %add, keys %set);
+            }
+
+            $text = Form::compose($forms);
+        }
+        else {
+            # We're rolling our own set of forms.
+            my @forms;
+            foreach (@objects) {
+                my ($type, $ids, $args) =
+                    m{^($name)/($idlist|$labels)(?:(/.*))?$}o;
+
+                $args ||= "";
+                foreach my $obj (expand_list($ids)) {
+                    my %set = (%set, id => "$type/$obj$args");
+                    push @forms, ["", [keys %set], \%set];
+                }
+            }
+            $text = Form::compose(\@forms);
+        }
+    }
+
+    if ($output) {
+        print $text;
+        exit;
+    }
+
+    my $synerr = 0;
+
+EDIT:
+    # We'll let the user edit the form before sending it to the server,
+    # unless we have enough information to submit it non-interactively.
+    if ($edit || (!$input && !$cl)) {
+        my $newtext = vi($text);
+        # We won't resubmit a bad form unless it was changed.
+        $text = ($synerr && $newtext eq $text) ? undef : $newtext;
+    }
+
+    if ($text) {
+        my $r = submit("$REST/edit", {content => $text, %data});
+        if ($r->code == 409) {
+            # If we submitted a bad form, we'll give the user a chance
+            # to correct it and resubmit.
+            if ($edit || (!$input && !$cl)) {
+                $text = $r->content;
+                $synerr = 1;
+                goto EDIT;
+            }
+            else {
+                print $r->content;
+                exit -1;
+            }
+        }
+        print $r->content;
+    }
+}
+
+# We roll "comment" and "correspond" into the same handler.
+
+sub comment {
+    my ($action) = @_;
+    my (%data, $id, @files, @bcc, @cc, $msg, $wtime, $edit);
+    my $bad = 0;
+
+    while (@ARGV) {
+        $_ = shift @ARGV;
+
+        if (/^-e$/) {
+            $edit = 1;
+        }
+        elsif (/^-[abcmw]$/) {
+            unless (@ARGV) {
+                whine "No argument specified with $_.";
+                $bad = 1; last;
+            }
+
+            if (/-a/) {
+                unless (-f $ARGV[0] && -r $ARGV[0]) {
+                    whine "Cannot read attachment: '$ARGV[0]'.";
+                    exit -1;
+                }
+                push @files, shift @ARGV;
+            }
+            elsif (/-([bc])/) {
+                my $a = $_ eq "-b" ? \@bcc : \@cc;
+                @$a = split /\s*,\s*/, shift @ARGV;
+            }
+            elsif (/-m/) { $msg = shift @ARGV }
+            elsif (/-w/) { $wtime = shift @ARGV }
+        }
+        elsif (!$id && m|^(?:ticket/)?($idlist)$|) {
+            $id = $1;
+        }
+        else {
+            my $datum = /^-/ ? "option" : "argument";
+            whine "Unrecognised $datum '$_'.";
+            $bad = 1; last;
+        }
+    }
+
+    unless ($id) {
+        whine "No object specified.";
+        $bad = 1;
+    }
+    return help($action, "ticket") if $bad;
+
+    my $form = [
+        "",
+        [ "Ticket", "Action", "Cc", "Bcc", "Attachment", "TimeWorked", "Text" ],
+        {
+            Ticket     => $id,
+            Action     => $action,
+            Cc         => [ @cc ],
+            Bcc        => [ @bcc ],
+            Attachment => [ @files ],
+            TimeWorked => $wtime || '',
+            Text       => $msg || '',
+        }
+    ];
+
+    my $text = Form::compose([ $form ]);
+
+    if ($edit || !$msg) {
+        my $error = 0;
+        my ($c, $o, $k, $e);
+
+        do {
+            my $ntext = vi($text);
+            exit if ($error && $ntext eq $text);
+            $text = $ntext;
+            $form = Form::parse($text);
+            $error = 0;
+
+            ($c, $o, $k, $e) = @{ $form->[0] };
+            if ($e) {
+                $error = 1;
+                $c = "# Syntax error.";
+                goto NEXT;
+            }
+            elsif (!@$o) {
+                exit;
+            }
+            @files = @{ vsplit($k->{Attachment}) };
+
+        NEXT:
+            $text = Form::compose([[$c, $o, $k, $e]]);
+        } while ($error);
+    }
+
+    my $i = 1;
+    foreach my $file (@files) {
+        $data{"attachment_$i"} = bless([ $file ], "Attachment");
+        $i++;
+    }
+    $data{content} = $text;
+
+    my $r = submit("$REST/ticket/comment/$id", \%data);
+    print $r->content;
+}
+
+# Merge one ticket into another.
+
+sub merge {
+    my @id;
+    my $bad = 0;
+
+    while (@ARGV) {
+        $_ = shift @ARGV;
+
+        if (/^\d+$/) {
+            push @id, $_;
+        }
+        else {
+            whine "Unrecognised argument: '$_'.";
+            $bad = 1; last;
+        }
+    }
+
+    unless (@id == 2) {
+        my $evil = @id > 2 ? "many" : "few";
+        whine "Too $evil arguments specified.";
+        $bad = 1;
+    }
+    return help("merge", "ticket") if $bad;
+
+    my $r = submit("$REST/ticket/merge/$id[0]", {into => $id[1]});
+    print $r->content;
+}
+
+# Link one ticket to another.
+
+sub link {
+    my ($bad, $del, %data) = (0, 0, ());
+    my %ltypes = map { lc $_ => $_ } qw(DependsOn DependedOnBy RefersTo
+                                        ReferredToBy HasMember MemberOf);
+
+    while (@ARGV && $ARGV[0] =~ /^-/) {
+        $_ = shift @ARGV;
+
+        if (/^-d$/) {
+            $del = 1;
+        }
+        else {
+            whine "Unrecognised option: '$_'.";
+            $bad = 1; last;
+        }
+    }
+
+    if (@ARGV == 3) {
+        my ($from, $rel, $to) = @ARGV;
+        if ($from !~ /^\d+$/ || $to !~ /^\d+$/) {
+            my $bad = $from =~ /^\d+$/ ? $to : $from;
+            whine "Invalid ticket ID '$bad' specified.";
+            $bad = 1;
+        }
+        unless (exists $ltypes{lc $rel}) {
+            whine "Invalid relationship '$rel' specified.";
+            $bad = 1;
+        }
+        %data = (id => $from, rel => $rel, to => $to, del => $del);
+    }
+    else {
+        my $bad = @ARGV < 3 ? "few" : "many";
+        whine "Too $bad arguments specified.";
+        $bad = 1;
+    }
+    return help("link", "ticket") if $bad;
+
+    my $r = submit("$REST/ticket/link", \%data);
+    print $r->content;
+}
+
+# Grant/revoke a user's rights.
+
+sub grant {
+    my ($cmd) = @_;
+
+    my $revoke = 0;
+    while (@ARGV) {
+    }
+
+    $revoke = 1 if $cmd->{action} eq 'revoke';
+}
+
+# Client <-> Server communication.
+# --------------------------------
+#
+# This function composes and sends an HTTP request to the RT server, and
+# interprets the response. It takes a request URI, and optional request
+# data (a string, or a reference to a set of key-value pairs).
+
+sub submit {
+    my ($uri, $content) = @_;
+    my ($req, $data);
+    my $ua = new LWP::UserAgent(agent => "RT/3.0b", env_proxy => 1);
+
+    # Did the caller specify any data to send with the request?
+    $data = [];
+    if (defined $content) {
+        unless (ref $content) {
+            # If it's just a string, make sure LWP handles it properly.
+            # (By pretending that it's a file!)
+            $content = [ content => [undef, "", Content => $content] ];
+        }
+        elsif (ref $content eq 'HASH') {
+            my @data;
+            foreach my $k (keys %$content) {
+                if (ref $content->{$k} eq 'ARRAY') {
+                    foreach my $v (@{ $content->{$k} }) {
+                        push @data, $k, $v;
+                    }
+                }
+                else { push @data, $k, $content->{$k} }
+            }
+            $content = \@data;
+        }
+        $data = $content;
+    }
+
+    # Should we send authentication information to start a new session?
+    if (!defined $session->cookie) {
+        push @$data, ( user => $config{user} );
+        push @$data, ( pass => $config{passwd} || read_passwd() );
+    }
+
+    # Now, we construct the request.
+    if (@$data) {
+        $req = POST($uri, $data, Content_Type => 'form-data');
+    }
+    else {
+        $req = GET($uri);
+    }
+    $session->add_cookie_header($req);
+
+    # Then we send the request and parse the response.
+    DEBUG(3, $req->as_string);
+    my $res = $ua->request($req);
+    DEBUG(3, $res->as_string);
+
+    if ($res->is_success) {
+        # The content of the response we get from the RT server consists
+        # of an HTTP-like status line followed by optional header lines,
+        # a blank line, and arbitrary text.
+
+        my ($head, $text) = split /\n\n/, $res->content, 2;
+        my ($status, @headers) = split /\n/, $head;
+        $text =~ s/\n*$/\n/;
+
+        # "RT/3.0.1 401 Credentials required"
+        if ($status !~ m#^RT/\d+(?:\.\d+)+(?:-?\w+)? (\d+) ([\w\s]+)$#) {
+            warn "rt: Malformed RT response from $config{server}.\n";
+            warn "(Rerun with RTDEBUG=3 for details.)\n" if $config{debug} < 3;
+            exit -1;
+        }
+
+        # Our caller can pretend that the server returned a custom HTTP
+        # response code and message. (Doing that directly is apparently
+        # not sufficiently portable and uncomplicated.)
+        $res->code($1);
+        $res->message($2);
+        $res->content($text);
+        $session->update($res) if ($res->is_success || $res->code != 401);
+
+        if (!$res->is_success) {
+            # We can deal with authentication failures ourselves. Either
+            # we sent invalid credentials, or our session has expired.
+            if ($res->code == 401) {
+                my %d = @$data;
+                if (exists $d{user}) {
+                    warn "rt: Incorrect username or password.\n";
+                    exit -1;
+                }
+                elsif ($req->header("Cookie")) {
+                    # We'll retry the request with credentials, unless
+                    # we only wanted to logout in the first place.
+                    $session->delete;
+                    return submit(@_) unless $uri eq "$REST/logout";
+                }
+            }
+            # Conflicts should be dealt with by the handler and user.
+            # For anything else, we just die.
+            elsif ($res->code != 409) {
+                warn "rt: ", $res->content;
+                exit;
+            }
+        }
+    }
+    else {
+        warn "rt: Server error: ", $res->message, " (", $res->code, ")\n";
+        exit -1;
+    }
+
+    return $res;
+}
+
+# Session management.
+# -------------------
+#
+# Maintains a list of active sessions in the ~/.rt_sessions file.
+{
+    package Session;
+    my ($s, $u);
+
+    # Initialises the session cache.
+    sub new {
+        my ($class, $file) = @_;
+        my $self = {
+            file => $file || "$HOME/.rt_sessions",
+            sids => { }
+        };
+       
+        # The current session is identified by the currently configured
+        # server and user.
+        ($s, $u) = @config{"server", "user"};
+
+        bless $self, $class;
+        $self->load();
+
+        return $self;
+    }
+
+    # Returns the current session cookie.
+    sub cookie {
+        my ($self) = @_;
+        my $cookie = $self->{sids}{$s}{$u};
+        return defined $cookie ? "RT_SID=$cookie" : undef;
+    }
+
+    # Deletes the current session cookie.
+    sub delete {
+        my ($self) = @_;
+        delete $self->{sids}{$s}{$u};
+    }
+
+    # Adds a Cookie header to an outgoing HTTP request.
+    sub add_cookie_header {
+        my ($self, $request) = @_;
+        my $cookie = $self->cookie();
+
+        $request->header(Cookie => $cookie) if defined $cookie;
+    }
+
+    # Extracts the Set-Cookie header from an HTTP response, and updates
+    # session information accordingly.
+    sub update {
+        my ($self, $response) = @_;
+        my $cookie = $response->header("Set-Cookie");
+
+        if (defined $cookie && $cookie =~ /^RT_SID=([0-9A-Fa-f]+);/) {
+            $self->{sids}{$s}{$u} = $1;
+        }
+    }
+
+    # Loads the session cache from the specified file.
+    sub load {
+        my ($self, $file) = @_;
+        $file ||= $self->{file};
+        local *F;
+
+        open(F, $file) && do {
+            $self->{file} = $file;
+            my $sids = $self->{sids} = {};
+            while (<F>) {
+                chomp;
+                next if /^$/ || /^#/;
+                next unless m#^https?://[^ ]+ \w+ [0-9A-Fa-f]+$#;
+                my ($server, $user, $cookie) = split / /, $_;
+                $sids->{$server}{$user} = $cookie;
+            }
+            return 1;
+        };
+        return 0;
+    }
+
+    # Writes the current session cache to the specified file.
+    sub save {
+        my ($self, $file) = shift;
+        $file ||= $self->{file};
+        local *F;
+
+        open(F, ">$file") && do {
+            my $sids = $self->{sids};
+            foreach my $server (keys %$sids) {
+                foreach my $user (keys %{ $sids->{$server} }) {
+                    my $sid = $sids->{$server}{$user};
+                    if (defined $sid) {
+                        print F "$server $user $sid\n";
+                    }
+                }
+            }
+            close(F);
+            chmod 0600, $file;
+            return 1;
+        };
+        return 0;
+    }
+
+    sub DESTROY {
+        my $self = shift;
+        $self->save;
+    }
+}
+
+# Form handling.
+# --------------
+#
+# Forms are RFC822-style sets of (field, value) specifications with some
+# initial comments and interspersed blank lines allowed for convenience.
+# Sets of forms are separated by --\n (in a cheap parody of MIME).
+#
+# Each form is parsed into an array with four elements: commented text
+# at the start of the form, an array with the order of keys, a hash with
+# key/value pairs, and optional error text if the form syntax was wrong.
+
+# Returns a reference to an array of parsed forms.
+sub Form::parse {
+    my $state = 0;
+    my @forms = ();
+    my @lines = split /\n/, $_[0];
+    my ($c, $o, $k, $e) = ("", [], {}, "");
+
+    LINE:
+    while (@lines) {
+        my $line = shift @lines;
+
+        next LINE if $line eq '';
+
+        if ($line eq '--') {
+            # We reached the end of one form. We'll ignore it if it was
+            # empty, and store it otherwise, errors and all.
+            if ($e || $c || @$o) {
+                push @forms, [ $c, $o, $k, $e ];
+                $c = ""; $o = []; $k = {}; $e = "";
+            }
+            $state = 0;
+        }
+        elsif ($state != -1) {
+            if ($state == 0 && $line =~ /^#/) {
+                # Read an optional block of comments (only) at the start
+                # of the form.
+                $state = 1;
+                $c = $line;
+                while (@lines && $lines[0] =~ /^#/) {
+                    $c .= "\n".shift @lines;
+                }
+                $c .= "\n";
+            }
+            elsif ($state <= 1 && $line =~ /^($field):(?:\s+(.*))?$/) {
+                # Read a field: value specification.
+                my $f  = $1;
+                my @v  = ($2 || ());
+
+                # Read continuation lines, if any.
+                while (@lines && ($lines[0] eq '' || $lines[0] =~ /^\s+/)) {
+                    push @v, shift @lines;
+                }
+                pop @v while (@v && $v[-1] eq '');
+
+                # Strip longest common leading indent from text.
+                my $ws = "";
+                foreach my $ls (map {/^(\s+)/} @v[1..$#v]) {
+                    $ws = $ls if (!$ws || length($ls) < length($ws));
+                }
+                s/^$ws// foreach @v;
+
+                push(@$o, $f) unless exists $k->{$f};
+                vpush($k, $f, join("\n", @v));
+
+                $state = 1;
+            }
+            elsif ($line !~ /^#/) {
+                # We've found a syntax error, so we'll reconstruct the
+                # form parsed thus far, and add an error marker. (>>)
+                $state = -1;
+                $e = Form::compose([[ "", $o, $k, "" ]]);
+                $e.= $line =~ /^>>/ ? "$line\n" : ">> $line\n";
+            }
+        }
+        else {
+            # We saw a syntax error earlier, so we'll accumulate the
+            # contents of this form until the end.
+            $e .= "$line\n";
+        }
+    }
+    push(@forms, [ $c, $o, $k, $e ]) if ($e || $c || @$o);
+
+    foreach my $l (keys %$k) {
+        $k->{$l} = vsplit($k->{$l}) if (ref $k->{$l} eq 'ARRAY');
+    }
+
+    return \@forms;
+}
+
+# Returns text representing a set of forms.
+sub Form::compose {
+    my ($forms) = @_;
+    my @text;
+
+    foreach my $form (@$forms) {
+        my ($c, $o, $k, $e) = @$form;
+        my $text = "";
+
+        if ($c) {
+            $c =~ s/\n*$/\n/;
+            $text = "$c\n";
+        }
+        if ($e) {
+            $text .= $e;
+        }
+        elsif ($o) {
+            my @lines;
+
+            foreach my $key (@$o) {
+                my ($line, $sp);
+                my $v = $k->{$key};
+                my @values = ref $v eq 'ARRAY' ? @$v : $v;
+
+                $sp = " "x(length("$key: "));
+                $sp = " "x4 if length($sp) > 16;
+
+                foreach $v (@values) {
+                    if ($v =~ /\n/) {
+                        $v =~ s/^/$sp/gm;
+                        $v =~ s/^$sp//;
+
+                        if ($line) {
+                            push @lines, "$line\n\n";
+                            $line = "";
+                        }
+                        elsif (@lines && $lines[-1] !~ /\n\n$/) {
+                            $lines[-1] .= "\n";
+                        }
+                        push @lines, "$key: $v\n\n";
+                    }
+                    elsif ($line &&
+                           length($line)+length($v)-rindex($line, "\n") >= 70)
+                    {
+                        $line .= ",\n$sp$v";
+                    }
+                    else {
+                        $line = $line ? "$line, $v" : "$key: $v";
+                    }
+                }
+
+                $line = "$key:" unless @values;
+                if ($line) {
+                    if ($line =~ /\n/) {
+                        if (@lines && $lines[-1] !~ /\n\n$/) {
+                            $lines[-1] .= "\n";
+                        }
+                        $line .= "\n";
+                    }
+                    push @lines, "$line\n";
+                }
+            }
+
+            $text .= join "", @lines;
+        }
+        else {
+            chomp $text;
+        }
+        push @text, $text;
+    }
+
+    return join "\n--\n\n", @text;
+}
+
+# Configuration.
+# --------------
+
+# Returns configuration information from the environment.
+sub config_from_env {
+    my %env;
+
+    foreach my $k ("DEBUG", "USER", "PASSWD", "SERVER") {
+        if (exists $ENV{"RT$k"}) {
+            $env{lc $k} = $ENV{"RT$k"};
+        }
+    }
+
+    return %env;
+}
+
+# Finds a suitable configuration file and returns information from it.
+sub config_from_file {
+    my ($rc) = @_;
+
+    if ($rc =~ m#^/#) {
+        # We'll use an absolute path if we were given one.
+        return parse_config_file($rc);
+    }
+    else {
+        # Otherwise we'll use the first file we can find in the current
+        # directory, or in one of its (increasingly distant) ancestors.
+
+        my @dirs = split /\//, cwd;
+        while (@dirs) {
+            my $file = join('/', @dirs, $rc);
+            if (-r $file) {
+                return parse_config_file($file);
+            }
+
+            # Remove the last directory component each time.
+            pop @dirs;
+        }
+
+        # Still nothing? We'll fall back to some likely defaults.
+        for ("$HOME/$rc", "/etc/rt.conf") {
+            return parse_config_file($_) if (-r $_);
+        }
+    }
+
+    return ();
+}
+
+# Makes a hash of the specified configuration file.
+sub parse_config_file {
+    my %cfg;
+    my ($file) = @_;
+
+    open(CFG, $file) && do {
+        while (<CFG>) {
+            chomp;
+            next if (/^#/ || /^\s*$/);
+
+            if (/^(user|passwd|server)\s+([^ ]+)$/) {
+                $cfg{$1} = $2;
+            }
+            else {
+                die "rt: $file:$.: unknown configuration directive.\n";
+            }
+        }
+    };
+
+    return %cfg;
+}
+
+# Helper functions.
+# -----------------
+
+sub whine {
+    my $sub = (caller(1))[3];
+    $sub =~ s/^main:://;
+    warn "rt: $sub: @_\n";
+    return;
+}
+
+sub read_passwd {
+    eval 'require Term::ReadKey';
+    if ($@) {
+        die "No password specified (and Term::ReadKey not installed).\n";
+    }
+
+    print "Password: ";
+    Term::ReadKey::ReadMode('noecho');
+    chomp(my $passwd = Term::ReadKey::ReadLine(0));
+    Term::ReadKey::ReadMode('restore');
+    print "\n";
+
+    return $passwd;
+}
+
+sub vi {
+    my ($text) = @_;
+    my $file = "/tmp/rt.form.$$";
+    my $editor = $ENV{EDITOR} || $ENV{VISUAL} || "vi";
+
+    local *F;
+    local $/ = undef;
+
+    open(F, ">$file") || die "$file: $!\n"; print F $text; close(F);
+    system($editor, $file) && die "Couldn't run $editor.\n";
+    open(F, $file) || die "$file: $!\n"; $text = <F>; close(F);
+    unlink($file);
+
+    return $text;
+}
+
+# Add a value to a (possibly multi-valued) hash key.
+sub vpush {
+    my ($hash, $key, $val) = @_;
+    my @val = ref $val eq 'ARRAY' ? @$val : $val;
+
+    if (exists $hash->{$key}) {
+        unless (ref $hash->{$key} eq 'ARRAY') {
+            my @v = $hash->{$key} ne '' ? $hash->{$key} : ();
+            $hash->{$key} = \@v;
+        }
+        push @{ $hash->{$key} }, @val;
+    }
+    else {
+        $hash->{$key} = $val;
+    }
+}
+
+# "Normalise" a hash key that's known to be multi-valued.
+sub vsplit {
+    my ($val) = @_;
+    my ($word, @words);
+    my @values = ref $val eq 'ARRAY' ? @$val : $val;
+
+    foreach my $line (map {split /\n/} @values) {
+        # XXX: This should become a real parser, à la Text::ParseWords.
+        $line =~ s/^\s+//;
+        $line =~ s/\s+$//;
+        push @words, split /\s*,\s*/, $line;
+    }
+
+    return \@words;
+}
+
+sub expand_list {
+    my ($list) = @_;
+    my ($elt, @elts, %elts);
+
+    foreach $elt (split /,/, $list) {
+        if ($elt =~ /^(\d+)-(\d+)$/) { push @elts, ($1..$2) }
+        else                         { push @elts, $elt }
+    }
+
+    @elts{@elts}=();
+    return sort {$a<=>$b} keys %elts;
+}
+
+sub get_type_argument {
+    my $type;
+
+    if (@ARGV) {
+        $type = shift @ARGV;
+        unless ($type =~ /^[A-Za-z0-9_.-]+$/) {
+            # We want whine to mention our caller, not us.
+            @_ = ("Invalid type '$type' specified.");
+            goto &whine;
+        }
+    }
+    else {
+        @_ = ("No type argument specified with -t.");
+        goto &whine;
+    }
+
+    $type =~ s/s$//; # "Plural". Ugh.
+    return $type;
+}
+
+sub get_var_argument {
+    my ($data) = @_;
+
+    if (@ARGV) {
+        my $kv = shift @ARGV;
+        if (my ($k, $v) = $kv =~ /^($field)=(.*)$/) {
+            push @{ $data->{$k} }, $v;
+        }
+        else {
+            @_ = ("Invalid variable specification: '$kv'.");
+            goto &whine;
+        }
+    }
+    else {
+        @_ = ("No variable argument specified with -S.");
+        goto &whine;
+    }
+}
+
+sub is_object_spec {
+    my ($spec, $type) = @_;
+
+    $spec =~ s|^(?:$type/)?|$type/| if defined $type;
+    return $spec if ($spec =~ m{^$name/(?:$idlist|$labels)(?:/.*)?$}o);
+    return;
+}
+
+__DATA__
+
+Title: intro
+Title: introduction
+Text:
+
+    ** THIS IS AN UNSUPPORTED PREVIEW RELEASE **
+    ** PLEASE REPORT BUGS TO rt-bugs@fsck.com **
+
+    This is a command-line interface to RT 3.
+
+    It allows you to interact with an RT server over HTTP, and offers an
+    interface to RT's functionality that is better-suited to automation
+    and integration with other tools.
+
+    In general, each invocation of this program should specify an action
+    to perform on one or more objects, and any other arguments required
+    to complete the desired action.
+
+    For more information:
+
+        - rt help actions       (a list of possible actions)
+        - rt help objects       (how to specify objects)
+        - rt help usage         (syntax information)
+
+        - rt help config        (configuration details)
+        - rt help examples      (a few useful examples)
+        - rt help topics        (a list of help topics)
+
+--
+
+Title: usage
+Title: syntax
+Text:
+
+    Syntax:
+
+        rt <action> [options] [arguments]
+
+    Each invocation of this program must specify an action (e.g. "edit",
+    "create"), options to modify behaviour, and other arguments required
+    by the specified action. (For example, most actions expect a list of
+    numeric object IDs to act upon.)
+
+    The details of the syntax and arguments for each action are given by
+    "rt help <action>". Some actions may be referred to by more than one
+    name ("create" is the same as "new", for example).  
+
+    Objects are identified by a type and an ID (which can be a name or a
+    number, depending on the type). For some actions, the object type is
+    implied (you can only comment on tickets); for others, the user must
+    specify it explicitly. See "rt help objects" for details.
+
+    In syntax descriptions, mandatory arguments that must be replaced by
+    appropriate value are enclosed in <>, and optional arguments are
+    indicated by [] (for example, <action> and [options] above).
+
+    For more information:
+
+        - rt help objects       (how to specify objects)
+        - rt help actions       (a list of actions)
+        - rt help types         (a list of object types)
+
+--
+
+Title: conf
+Title: config
+Title: configuration
+Text:
+
+    This program has two major sources of configuration information: its
+    configuration files, and the environment.
+
+    The program looks for configuration directives in a file named .rtrc
+    (or $RTCONFIG; see below) in the current directory, and then in more
+    distant ancestors, until it reaches /. If no suitable configuration
+    files are found, it will also check for ~/.rtrc and /etc/rt.conf.
+
+    Configuration directives:
+
+        The following directives may occur, one per line:
+
+        - server <URL>          URL to RT server.
+        - user <username>       RT username.
+        - passwd <passwd>       RT user's password.
+
+        Blank and #-commented lines are ignored.
+
+    Environment variables:
+
+        The following environment variables override any corresponding
+        values defined in configuration files:
+
+        - RTUSER
+        - RTPASSWD
+        - RTSERVER
+        - RTDEBUG       Numeric debug level. (Set to 3 for full logs.)
+        - RTCONFIG      Specifies a name other than ".rtrc" for the
+                        configuration file.
+
+--
+
+Title: objects
+Text:
+
+    Syntax:
+
+        <type>/<id>[/<attributes>]
+
+    Every object in RT has a type (e.g. "ticket", "queue") and a numeric
+    ID. Some types of objects can also be identified by name (like users
+    and queues). Furthermore, objects may have named attributes (such as
+    "ticket/1/history").
+
+    An object specification is like a path in a virtual filesystem, with
+    object types as top-level directories, object IDs as subdirectories,
+    and named attributes as further subdirectories.
+
+    A comma-separated list of names, numeric IDs, or numeric ranges can
+    be used to specify more than one object of the same type. Note that
+    the list must be a single argument (i.e., no spaces). For example,
+    "user/root,1-3,5,7-10,ams" is a list of ten users; the same list
+    can also be written as "user/ams,root,1,2,3,5,7,8-20".
+    
+    Examples:
+
+        ticket/1
+        ticket/1/attachments
+        ticket/1/attachments/3
+        ticket/1/attachments/3/content
+        ticket/1-3/links
+        ticket/1-3,5-7/history
+
+        user/ams
+        user/ams/rights
+        user/ams,rai,1/rights
+
+    For more information:
+
+        - rt help <action>      (action-specific details)
+        - rt help <type>        (type-specific details)
+
+--
+
+Title: actions
+Title: commands
+Text:
+
+    You can currently perform the following actions on all objects:
+
+        - list          (list objects matching some condition)
+        - show          (display object details)
+        - edit          (edit object details)
+        - create        (create a new object)
+
+    Each type may define actions specific to itself; these are listed in
+    the help item about that type.
+
+    For more information:
+
+        - rt help <action>      (action-specific details)
+        - rt help types         (a list of possible types)
+
+--
+
+Title: types
+Text:
+
+    You can currently operate on the following types of objects:
+
+        - tickets
+        - users
+        - groups
+        - queues
+
+    For more information:
+
+        - rt help <type>        (type-specific details)
+        - rt help objects       (how to specify objects)
+        - rt help actions       (a list of possible actions)
+
+--
+
+Title: ticket
+Text:
+
+    Tickets are identified by a numeric ID.
+
+    The following generic operations may be performed upon tickets:
+
+        - list
+        - show
+        - edit
+        - create
+
+    In addition, the following ticket-specific actions exist:
+
+        - link
+        - merge
+        - comment
+        - correspond
+
+    Attributes:
+
+        The following attributes can be used with "rt show" or "rt edit"
+        to retrieve or edit other information associated with tickets:
+
+        links                      A ticket's relationships with others.
+        history                    All of a ticket's transactions.
+        history/type/<type>        Only a particular type of transaction.
+        history/id/<id>            Only the transaction of the specified id.
+        attachments                A list of attachments.
+        attachments/<id>           The metadata for an individual attachment.
+        attachments/<id>/content   The content of an individual attachment.
+
+--
+
+Title: user
+Title: group
+Text:
+
+    Users and groups are identified by name or numeric ID.
+
+    The following generic operations may be performed upon them:
+
+        - list
+        - show
+        - edit
+        - create
+
+    In addition, the following type-specific actions exist:
+
+        - grant
+        - revoke
+
+    Attributes:
+
+        The following attributes can be used with "rt show" or "rt edit"
+        to retrieve or edit other information associated with users and
+        groups:
+
+        rights                  Global rights granted to this user.
+        rights/<queue>          Queue rights for this user.
+
+--
+
+Title: queue
+Text:
+
+    Queues are identified by name or numeric ID.
+
+    Currently, they can be subjected to the following actions:
+
+        - show
+        - edit
+        - create
+
+--
+
+Title: logout
+Text:
+
+    Syntax:
+
+        rt logout
+
+    Terminates the currently established login session. You will need to
+    provide authentication credentials before you can continue using the
+    server. (See "rt help config" for details about authentication.)
+
+--
+
+Title: ls
+Title: list
+Title: search
+Text:
+
+    Syntax:
+
+        rt <ls|list|search> [options] "query string"
+
+    Displays a list of objects matching the specified conditions.
+    ("ls", "list", and "search" are synonyms.)
+
+    Conditions are expressed in the SQL-like syntax used internally by
+    RT3. (For more information, see "rt help query".) The query string
+    must be supplied as one argument.
+
+    (Right now, the server doesn't support listing anything but tickets.
+    Other types will be supported in future; this client will be able to
+    take advantage of that support without any changes.)
+
+    Options:
+
+        The following options control how much information is displayed
+        about each matching object:
+
+        -i      Numeric IDs only. (Useful for |rt edit -; see examples.)
+        -s      Short description.
+        -l      Longer description.
+
+        In addition,
+        
+        -o +/-<field>   Orders the returned list by the specified field.
+        -S var=val      Submits the specified variable with the request.
+        -t type         Specifies the type of object to look for. (The
+                        default is "ticket".)
+
+    Examples:
+
+        rt ls "Priority > 5 and Status='new'"
+        rt ls -o +Subject "Priority > 5 and Status='new'"
+        rt ls -o -Created "Priority > 5 and Status='new'"
+        rt ls -i "Priority > 5"|rt edit - set status=resolved
+        rt ls -t ticket "Subject like '[PATCH]%'"
+
+--
+
+Title: show
+Text:
+
+    Syntax:
+
+        rt show [options] <object-ids>
+
+    Displays details of the specified objects.
+
+    For some types, object information is further classified into named
+    attributes (for example, "1-3/links" is a valid ticket specification
+    that refers to the links for tickets 1-3). Consult "rt help <type>"
+    and "rt help objects" for further details.
+
+    This command writes a set of forms representing the requested object
+    data to STDOUT.
+
+    Options:
+
+        -               Read IDs from STDIN instead of the command-line.
+        -t type         Specifies object type.
+        -f a,b,c        Restrict the display to the specified fields.
+        -S var=val      Submits the specified variable with the request.
+
+    Examples:
+
+        rt show -t ticket -f id,subject,status 1-3
+        rt show ticket/3/attachments/29
+        rt show ticket/3/attachments/29/content
+        rt show ticket/1-3/links
+        rt show -t user 2
+
+--
+
+Title: new
+Title: edit
+Title: create
+Text:
+
+    Syntax:
+
+        rt edit [options] <object-ids> set field=value [field=value] ...
+                                       add field=value [field=value] ...
+                                       del field=value [field=value] ...
+
+    Edits information corresponding to the specified objects.
+
+    If, instead of "edit", an action of "new" or "create" is specified,
+    then a new object is created. In this case, no numeric object IDs
+    may be specified, but the syntax and behaviour remain otherwise
+    unchanged.
+
+    This command typically starts an editor to allow you to edit object
+    data in a form for submission. If you specified enough information
+    on the command-line, however, it will make the submission directly.
+
+    The command line may specify field-values in three different ways.
+    "set" sets the named field to the given value, "add" adds a value
+    to a multi-valued field, and "del" deletes the corresponding value.
+    Each "field=value" specification must be given as a single argument.
+
+    For some types, object information is further classified into named
+    attributes (for example, "1-3/links" is a valid ticket specification
+    that refers to the links for tickets 1-3). These attributes may also
+    be edited. Consult "rt help <type>" and "rt help object" for further
+    details.
+
+    Options:
+
+        -       Read numeric IDs from STDIN instead of the command-line.
+                (Useful with rt ls ... | rt edit -; see examples below.)
+        -i      Read a completed form from STDIN before submitting.
+        -o      Dump the completed form to STDOUT instead of submitting.
+        -e      Allows you to edit the form even if the command-line has
+                enough information to make a submission directly.
+        -S var=val
+                Submits the specified variable with the request.
+        -t type Specifies object type.
+
+    Examples:
+
+        # Interactive (starts $EDITOR with a form).
+        rt edit ticket/3
+        rt create -t ticket
+
+        # Non-interactive.
+        rt edit ticket/1-3 add cc=foo@example.com set priority=3
+        rt ls -t tickets -i 'Priority > 5' | rt edit - set status=resolved
+        rt edit ticket/4 set priority=3 owner=bar@example.com \
+                         add cc=foo@example.com bcc=quux@example.net
+        rt create -t ticket subject='new ticket' priority=10 \
+                            add cc=foo@example.com
+
+--
+
+Title: comment
+Title: correspond
+Text:
+
+    Syntax:
+
+        rt <comment|correspond> [options] <ticket-id>
+
+    Adds a comment (or correspondence) to the specified ticket (the only
+    difference being that comments aren't sent to the requestors.)
+
+    This command will typically start an editor and allow you to type a
+    comment into a form. If, however, you specified all the necessary
+    information on the command line, it submits the comment directly.
+
+    (See "rt help forms" for more information about forms.)
+
+    Options:
+
+        -m <text>       Specify comment text.
+        -a <file>       Attach a file to the comment. (May be used more
+                        than once to attach multiple files.)
+        -c <addrs>      A comma-separated list of Cc addresses.
+        -b <addrs>      A comma-separated list of Bcc addresses.
+        -w <time>       Specify the time spent working on this ticket.
+        -e              Starts an editor before the submission, even if
+                        arguments from the command line were sufficient.
+
+    Examples:
+
+        rt comment -t 'Not worth fixing.' -a stddisclaimer.h 23
+
+--
+
+Title: merge
+Text:
+
+    Syntax:
+
+        rt merge <from-id> <to-id>
+
+    Merges the two specified tickets.
+
+--
+
+Title: link
+Text:
+
+    Syntax:
+
+        rt link [-d] <id-A> <relationship> <id-B>
+
+    Creates (or, with -d, deletes) a link between the specified tickets.
+    The relationship can (irrespective of case) be any of:
+
+        DependsOn/DependedOnBy:     A depends upon B (or vice versa).
+        RefersTo/ReferredToBy:      A refers to B (or vice versa).
+        MemberOf/HasMember:         A is a member of B (or vice versa).
+
+    To view a ticket's relationships, use "rt show ticket/3/links". (See
+    "rt help ticket" and "rt help show".)
+
+    Options:
+
+        -d      Deletes the specified link.
+
+    Examples:
+
+        rt link 2 dependson 3
+        rt link -d 4 referredtoby 6     # 6 no longer refers to 4
+
+--
+
+Title: grant
+Title: revoke
+Text:
+
+--
+
+Title: query
+Text:
+
+    RT3 uses an SQL-like syntax to specify object selection constraints.
+    See the <RT:...> documentation for details.
+    
+    (XXX: I'm going to have to write it, aren't I?)
+
+--
+
+Title: form
+Title: forms
+Text:
+
+    This program uses RFC822 header-style forms to represent object data
+    in a form that's suitable for processing both by humans and scripts.
+
+    A form is a set of (field, value) specifications, with some initial
+    commented text and interspersed blank lines allowed for convenience.
+    Field names may appear more than once in a form; a comma-separated
+    list of multiple field values may also be specified directly.
+    
+    Field values can be wrapped as in RFC822, with leading whitespace.
+    The longest sequence of leading whitespace common to all the lines
+    is removed (preserving further indentation). There is no limit on
+    the length of a value.
+
+    Multiple forms are separated by a line containing only "--\n".
+
+    (XXX: A more detailed specification will be provided soon. For now,
+    the server-side syntax checking will suffice.)
+
+--
+
+Title: topics
+Text:
+
+    Use "rt help <topic>" for help on any of the following subjects:
+
+        - tickets, users, groups, queues.
+        - show, edit, ls/list/search, new/create.
+
+        - query                                 (search query syntax)
+        - forms                                 (form specification)
+
+        - objects                               (how to specify objects)
+        - types                                 (a list of object types)
+        - actions/commands                      (a list of actions)
+        - usage/syntax                          (syntax details)
+        - conf/config/configuration             (configuration details)
+        - examples                              (a few useful examples)
+
+--
+
+Title: example
+Title: examples
+Text:
+
+    This section will be filled in with useful examples, once it becomes
+    more clear what examples may be useful.
+
+    For the moment, please consult examples provided with each action.
+
+--
diff --git a/rt/bin/webmux.pl b/rt/bin/webmux.pl
index 21cb83f5e..96e7ebf8d 100755
--- a/rt/bin/webmux.pl
+++ b/rt/bin/webmux.pl
@@ -31,6 +31,7 @@ BEGIN {
     $ENV{'SHELL'}  = '/bin/sh' if defined $ENV{'SHELL'};
     $ENV{'ENV'}    = '' if defined $ENV{'ENV'};
     $ENV{'IFS'}    = '' if defined $ENV{'IFS'};
+    
 }
 
 use lib ("/opt/rt3/local/lib", "/opt/rt3/lib");
@@ -42,6 +43,17 @@ use CGI qw(-private_tempfiles);    #bring this in before mason, to make sure we
                                    #set private_tempfiles
 
 BEGIN {
+    if ($mod_perl::VERSION >= 1.9908) {
+	require Apache::RequestUtil;
+	no warnings 'redefine';
+	my $sub = *Apache::request{CODE};
+	*Apache::request = sub {
+	    my $r;
+	    eval { $r = $sub->('Apache'); };
+	    # warn $@ if $@;
+	    return $r;
+	};
+    }
     if ($CGI::MOD_PERL) {
 	require HTML::Mason::ApacheHandler;
     }
@@ -104,21 +116,32 @@ if ( $CGI::MOD_PERL)  {
 	unless ( ( -d _ ) and ( -r _ ) and ( -w _ ) );
 }
 
-my $ah = &RT::Interface::Web::NewApacheHandler() if $CGI::MOD_PERL;
+my $ah = &RT::Interface::Web::NewApacheHandler(@RT::MasonParameters) if $CGI::MOD_PERL;
 
 sub handler {
     ($r) = @_;
 
+    local $SIG{__WARN__};
+    local $SIG{__DIE__};
+
     RT::Init();
 
     # We don't need to handle non-text items
     return -1 if defined( $r->content_type ) && $r->content_type !~ m|^text/|io;
 
     my %session;
-    my $status = $ah->handle_request($r);
+    my $status;
+    eval { $status = $ah->handle_request($r) };
+    if ($@) {
+	$RT::Logger->crit($@);
+    }
+
     undef (%session);
 
-    $RT::Logger->crit("Transaction not committed. Usually indicates a software fault. Data loss may have occurred") if $RT::Handle->TransactionDepth;
+    if ($RT::Handle->TransactionDepth) {
+	$RT::Handle->ForceRollback;
+    	$RT::Logger->crit("Transaction not committed. Usually indicates a software fault. Data loss may have occurred") ;
+    }
     return $status;
 }
 
diff --git a/rt/bin/webmux.pl.in b/rt/bin/webmux.pl.in
index 12aad85b3..dca5705e9 100644
--- a/rt/bin/webmux.pl.in
+++ b/rt/bin/webmux.pl.in
@@ -31,6 +31,7 @@ BEGIN {
     $ENV{'SHELL'}  = '/bin/sh' if defined $ENV{'SHELL'};
     $ENV{'ENV'}    = '' if defined $ENV{'ENV'};
     $ENV{'IFS'}    = '' if defined $ENV{'IFS'};
+    @ORACLE_ENV_PREF@
 }
 
 use lib ("@LOCAL_LIB_PATH@", "@RT_LIB_PATH@");
@@ -42,6 +43,17 @@ use CGI qw(-private_tempfiles);    #bring this in before mason, to make sure we
                                    #set private_tempfiles
 
 BEGIN {
+    if ($mod_perl::VERSION >= 1.9908) {
+	require Apache::RequestUtil;
+	no warnings 'redefine';
+	my $sub = *Apache::request{CODE};
+	*Apache::request = sub {
+	    my $r;
+	    eval { $r = $sub->('Apache'); };
+	    # warn $@ if $@;
+	    return $r;
+	};
+    }
     if ($CGI::MOD_PERL) {
 	require HTML::Mason::ApacheHandler;
     }
@@ -104,21 +116,32 @@ if ( $CGI::MOD_PERL)  {
 	unless ( ( -d _ ) and ( -r _ ) and ( -w _ ) );
 }
 
-my $ah = &RT::Interface::Web::NewApacheHandler() if $CGI::MOD_PERL;
+my $ah = &RT::Interface::Web::NewApacheHandler(@RT::MasonParameters) if $CGI::MOD_PERL;
 
 sub handler {
     ($r) = @_;
 
+    local $SIG{__WARN__};
+    local $SIG{__DIE__};
+
     RT::Init();
 
     # We don't need to handle non-text items
     return -1 if defined( $r->content_type ) && $r->content_type !~ m|^text/|io;
 
     my %session;
-    my $status = $ah->handle_request($r);
+    my $status;
+    eval { $status = $ah->handle_request($r) };
+    if ($@) {
+	$RT::Logger->crit($@);
+    }
+
     undef (%session);
 
-    $RT::Logger->crit("Transaction not committed. Usually indicates a software fault. Data loss may have occurred") if $RT::Handle->TransactionDepth;
+    if ($RT::Handle->TransactionDepth) {
+	$RT::Handle->ForceRollback;
+    	$RT::Logger->crit("Transaction not committed. Usually indicates a software fault. Data loss may have occurred") ;
+    }
     return $status;
 }
 
diff --git a/rt/config.layout b/rt/config.layout
index 81917f18c..23a7775d6 100644
--- a/rt/config.layout
+++ b/rt/config.layout
@@ -37,6 +37,27 @@
   customlexdir:		${customdir}/po
   customlibdir:		${customdir}/lib
 </Layout>
+<Layout inplace>
+  prefix:		`pwd`
+  exec_prefix:		${prefix}
+  bindir:		${exec_prefix}/bin
+  sbindir:		${exec_prefix}/sbin
+  sysconfdir:		${prefix}/etc
+  mandir:		${prefix}/man
+  libdir:		${prefix}/lib
+  datadir:		${prefix}/share
+  htmldir:		${prefix}/html
+  manualdir:		${datadir}/doc
+  localstatedir:	${prefix}/var
+  logfiledir:		${localstatedir}/log
+  masonstatedir:	${localstatedir}/mason_data
+  sessionstatedir:	${localstatedir}/session_data
+  customdir:		${prefix}/local
+  custometcdir:		${customdir}/etc
+  customhtmldir:	${customdir}/html
+  customlexdir:		${customdir}/po
+  customlibdir:		${customdir}/lib
+</Layout>
 
 <Layout FreeBSD>
   prefix:		/usr/local
diff --git a/rt/config.log b/rt/config.log
index f8549485d..24e15e3cf 100644
--- a/rt/config.log
+++ b/rt/config.log
@@ -1,7 +1,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by RT configure 3.0.4, which was
+It was created by RT configure 3.0.9, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   $ ./configure 
@@ -47,20 +47,20 @@ PATH: .
 ## Core tests. ##
 ## ----------- ##
 
-configure:1217: checking for a BSD-compatible install
-configure:1271: result: /usr/bin/install -c
-configure:1285: checking for perl
-configure:1303: found /usr/bin/perl
-configure:1316: result: /usr/bin/perl
-configure:1638: checking for chosen layout
-configure:1653: result: RT3
-configure:1964: creating ./config.status
+configure:1218: checking for a BSD-compatible install
+configure:1272: result: /usr/bin/install -c
+configure:1286: checking for perl
+configure:1304: found /usr/bin/perl
+configure:1317: result: /usr/bin/perl
+configure:1639: checking for chosen layout
+configure:1654: result: RT3
+configure:1986: creating ./config.status
 
 ## ---------------------- ##
 ## Running config.status. ##
 ## ---------------------- ##
 
-This file was extended by RT config.status 3.0.4, which was
+This file was extended by RT config.status 3.0.9, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   CONFIG_FILES    = 
@@ -71,23 +71,24 @@ generated by GNU Autoconf 2.53.  Invocation command line was
 
 on pallas
 
-config.status:637: creating sbin/rt-setup-database
-config.status:637: creating sbin/rt-test-dependencies
-config.status:637: creating Makefile
-config.status:637: creating etc/RT_Config.pm
-config.status:637: creating lib/RT.pm
-config.status:637: creating lib/t/00smoke.t
-config.status:637: creating lib/t/01harness.t
-config.status:637: creating lib/t/02regression.t
-config.status:637: creating lib/t/03web.pl
-config.status:637: creating lib/t/04_send_email.pl
-config.status:637: creating bin/mason_handler.fcgi
-config.status:637: creating bin/mason_handler.scgi
-config.status:637: creating bin/mason_handler.svc
-config.status:637: creating bin/rt-commit-handler
-config.status:637: creating bin/rt-crontool
-config.status:637: creating bin/rt-mailgate
-config.status:637: creating bin/webmux.pl
+config.status:639: creating sbin/rt-setup-database
+config.status:639: creating sbin/rt-test-dependencies
+config.status:639: creating Makefile
+config.status:639: creating etc/RT_Config.pm
+config.status:639: creating lib/RT.pm
+config.status:639: creating lib/t/00smoke.t
+config.status:639: creating lib/t/01harness.t
+config.status:639: creating lib/t/02regression.t
+config.status:639: creating lib/t/03web.pl
+config.status:639: creating lib/t/04_send_email.pl
+config.status:639: creating bin/mason_handler.fcgi
+config.status:639: creating bin/mason_handler.scgi
+config.status:639: creating bin/mason_handler.svc
+config.status:639: creating bin/rt-commit-handler
+config.status:639: creating bin/rt-crontool
+config.status:639: creating bin/rt-mailgate
+config.status:639: creating bin/rt
+config.status:639: creating bin/webmux.pl
 
 ## ---------------- ##
 ## Cache variables. ##
@@ -110,8 +111,8 @@ ac_cv_path_install='/usr/bin/install -c'
 
 #define PACKAGE_NAME "RT"
 #define PACKAGE_TARNAME "rt"
-#define PACKAGE_VERSION "3.0.4"
-#define PACKAGE_STRING "RT 3.0.4"
+#define PACKAGE_VERSION "3.0.9"
+#define PACKAGE_STRING "RT 3.0.9"
 #define PACKAGE_BUGREPORT "rt-3.0-bugs@fsck.com"
 
 configure: exit 0
diff --git a/rt/config.status b/rt/config.status
index e7d835894..e7d81b358 100755
--- a/rt/config.status
+++ b/rt/config.status
@@ -237,7 +237,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by RT $as_me 3.0.4, which was
+This file was extended by RT $as_me 3.0.9, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -249,7 +249,7 @@ generated by GNU Autoconf 2.53.  Invocation command line was
 _CSEOF
 echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
 echo >&5
-config_files=" sbin/rt-setup-database sbin/rt-test-dependencies Makefile etc/RT_Config.pm lib/RT.pm lib/t/00smoke.t lib/t/01harness.t lib/t/02regression.t lib/t/03web.pl lib/t/04_send_email.pl bin/mason_handler.fcgi bin/mason_handler.scgi bin/mason_handler.svc bin/rt-commit-handler bin/rt-crontool bin/rt-mailgate bin/webmux.pl"
+config_files=" sbin/rt-setup-database sbin/rt-test-dependencies Makefile etc/RT_Config.pm lib/RT.pm lib/t/00smoke.t lib/t/01harness.t lib/t/02regression.t lib/t/03web.pl lib/t/04_send_email.pl bin/mason_handler.fcgi bin/mason_handler.scgi bin/mason_handler.svc bin/rt-commit-handler bin/rt-crontool bin/rt-mailgate bin/rt bin/webmux.pl"
 
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
@@ -269,7 +269,7 @@ $config_files
 
 Report bugs to <bug-autoconf@gnu.org>."
 ac_cs_version="\
-RT config.status 3.0.4
+RT config.status 3.0.9
 configured by ./configure, generated by GNU Autoconf 2.53,
   with options \"\"
 
@@ -358,6 +358,7 @@ do
   "bin/rt-commit-handler" ) CONFIG_FILES="$CONFIG_FILES bin/rt-commit-handler" ;;
   "bin/rt-crontool" ) CONFIG_FILES="$CONFIG_FILES bin/rt-crontool" ;;
   "bin/rt-mailgate" ) CONFIG_FILES="$CONFIG_FILES bin/rt-mailgate" ;;
+  "bin/rt" ) CONFIG_FILES="$CONFIG_FILES bin/rt" ;;
   "bin/webmux.pl" ) CONFIG_FILES="$CONFIG_FILES bin/webmux.pl" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -410,8 +411,8 @@ s,@SHELL@,/bin/sh,;t t
 s,@PATH_SEPARATOR@,:,;t t
 s,@PACKAGE_NAME@,RT,;t t
 s,@PACKAGE_TARNAME@,rt,;t t
-s,@PACKAGE_VERSION@,3.0.4,;t t
-s,@PACKAGE_STRING@,RT 3.0.4,;t t
+s,@PACKAGE_VERSION@,3.0.9,;t t
+s,@PACKAGE_STRING@,RT 3.0.9,;t t
 s,@PACKAGE_BUGREPORT@,rt-3.0-bugs@fsck.com,;t t
 s,@exec_prefix@,/opt/rt3,;t t
 s,@prefix@,/opt/rt3,;t t
@@ -431,14 +432,14 @@ s,@mandir@,/opt/rt3/man,;t t
 s,@build_alias@,,;t t
 s,@host_alias@,,;t t
 s,@target_alias@,,;t t
-s,@DEFS@,-DPACKAGE_NAME=\"RT\" -DPACKAGE_TARNAME=\"rt\" -DPACKAGE_VERSION=\"3.0.4\" -DPACKAGE_STRING=\"RT\ 3.0.4\" -DPACKAGE_BUGREPORT=\"rt-3.0-bugs@fsck.com\" ,;t t
+s,@DEFS@,-DPACKAGE_NAME=\"RT\" -DPACKAGE_TARNAME=\"rt\" -DPACKAGE_VERSION=\"3.0.9\" -DPACKAGE_STRING=\"RT\ 3.0.9\" -DPACKAGE_BUGREPORT=\"rt-3.0-bugs@fsck.com\" ,;t t
 s,@ECHO_C@,,;t t
 s,@ECHO_N@,-n,;t t
 s,@ECHO_T@,,;t t
 s,@LIBS@,,;t t
 s,@rt_version_major@,3,;t t
 s,@rt_version_minor@,0,;t t
-s,@rt_version_patch@,4,;t t
+s,@rt_version_patch@,9,;t t
 s,@INSTALL_PROGRAM@,${INSTALL},;t t
 s,@INSTALL_SCRIPT@,${INSTALL},;t t
 s,@INSTALL_DATA@,${INSTALL} -m 644,;t t
@@ -479,6 +480,7 @@ s,@BIN_OWNER@,root,;t t
 s,@LIBS_OWNER@,root,;t t
 s,@LIBS_GROUP@,bin,;t t
 s,@DB_TYPE@,mysql,;t t
+s,@ORACLE_ENV_PREF@,,;t t
 s,@DB_HOST@,localhost,;t t
 s,@DB_PORT@,,;t t
 s,@DB_RT_HOST@,localhost,;t t
@@ -490,7 +492,7 @@ s,@WEB_USER@,www,;t t
 s,@WEB_GROUP@,www,;t t
 s,@RT_VERSION_MAJOR@,3,;t t
 s,@RT_VERSION_MINOR@,0,;t t
-s,@RT_VERSION_PATCH@,4,;t t
+s,@RT_VERSION_PATCH@,9,;t t
 s,@RT_PATH@,/opt/rt3,;t t
 s,@RT_DOC_PATH@,/opt/rt3/share/doc,;t t
 s,@RT_LOCAL_PATH@,/opt/rt3/local,;t t
diff --git a/rt/configure b/rt/configure
index c89d759fd..a90675888 100755
--- a/rt/configure
+++ b/rt/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Revision: 1.1 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53 for RT 3.0.4.
+# Generated by GNU Autoconf 2.53 for RT 3.0.9.
 #
 # Report bugs to <rt-3.0-bugs@fsck.com>.
 #
@@ -257,8 +257,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='RT'
 PACKAGE_TARNAME='rt'
-PACKAGE_VERSION='3.0.4'
-PACKAGE_STRING='RT 3.0.4'
+PACKAGE_VERSION='3.0.9'
+PACKAGE_STRING='RT 3.0.9'
 PACKAGE_BUGREPORT='rt-3.0-bugs@fsck.com'
 
 ac_unique_file="lib/RT.pm.in"
@@ -711,7 +711,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures RT 3.0.4 to adapt to many kinds of systems.
+\`configure' configures RT 3.0.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -768,7 +768,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of RT 3.0.4:";;
+     short | recursive ) echo "Configuration of RT 3.0.9:";;
    esac
   cat <<\_ACEOF
 
@@ -786,8 +786,8 @@ Optional Packages:
   --with-bin-owner=OWNER  user that will own rt binaries (default root)
   --with-libs-owner=OWNER user that will own RT libraries (default root)
   --with-libs-group=GROUP group that will own rt binaries (default bin)
-  --with-db-type=TYPE     sort of database RT will use (default: mysql) (mysql
-                          and Pg are valid)
+  --with-db-type=TYPE     sort of database RT will use (default: mysql)
+                          (mysql, Pg, Oracle and Informix are valid)
   --with-db-host=HOSTNAME FQDN of database server (default: localhost)
   --with-db-port=PORT     port on which the database listens on
   --with-db-rt-host=HOSTNAME
@@ -802,6 +802,7 @@ Optional Packages:
                           password for database user (default: rt_pass)
   --with-web-user=USER    user the web server runs as (default: www)
   --with-web-group=GROUP  group the web server runs as (default: www)
+  --with-my-user-group    set all users and groups to current user/group
 
 Some influential environment variables:
   PERL        Perl interpreter command
@@ -872,7 +873,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-RT configure 3.0.4
+RT configure 3.0.9
 generated by GNU Autoconf 2.53
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -887,7 +888,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by RT $as_me 3.0.4, which was
+It was created by RT $as_me 3.0.9, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   $ $0 $@
@@ -1171,7 +1172,7 @@ rt_version_major=3
 
 rt_version_minor=0
 
-rt_version_patch=4
+rt_version_patch=9
 
 test "x$rt_version_major" = 'x' && rt_version_major=0
 test "x$rt_version_minor" = 'x' && rt_version_minor=0
@@ -1703,13 +1704,21 @@ if test "${with_db_type+set}" = set; then
 else
   DB_TYPE=mysql
 fi;
-if test "$DB_TYPE" != 'mysql' -a "$DB_TYPE" != 'Pg' -a "$DB_TYPE" != 'SQLite'; then
-	{ { echo "$as_me:$LINENO: error: Only Pg and mysql are valid db types" >&5
-echo "$as_me: error: Only Pg and mysql are valid db types" >&2;}
+if test "$DB_TYPE" != 'mysql' -a "$DB_TYPE" != 'Pg' -a "$DB_TYPE" != 'SQLite' -a "$DB_TYPE" != 'Oracle' -a "$DB_TYPE" != 'Informix' ; then
+	{ { echo "$as_me:$LINENO: error: Only Oracle, Informix, Pg and mysql are valid db types" >&5
+echo "$as_me: error: Only Oracle, Informix, Pg and mysql are valid db types" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
+if test "$DB_TYPE" = 'Oracle'; then
+	test "x$ORACLE_HOME" = 'x' && { { echo "$as_me:$LINENO: error: Please declare the ORACLE_HOME environment variable" >&5
+echo "$as_me: error: Please declare the ORACLE_HOME environment variable" >&2;}
+   { (exit 1); exit 1; }; }
+	ORACLE_ENV_PREF="\$ENV{'ORACLE_HOME'} = '$ORACLE_HOME';"
+fi
+
+
 
 # Check whether --with-db-host or --without-db-host was given.
 if test "${with_db_host+set}" = set; then
@@ -1800,6 +1809,19 @@ else
 fi;
 
 
+my_group=$(groups|cut -f1 -d' ')
+
+# Check whether --with-my-user-group or --without-my-user-group was given.
+if test "${with_my_user_group+set}" = set; then
+  withval="$with_my_user_group"
+  RTGROUP=$my_group
+            BIN_OWNER=$USER
+            LIBS_OWNER=$USER
+            LIBS_GROUP=$my_group
+            WEB_USER=$USER
+            WEB_GROUP=$my_group
+fi;
+
 
 RT_VERSION_MAJOR=${rt_version_major}
 
@@ -1848,7 +1870,7 @@ RT_LOG_PATH=${exp_logfiledir}
 
 
 
-ac_config_files="$ac_config_files sbin/rt-setup-database sbin/rt-test-dependencies Makefile etc/RT_Config.pm lib/RT.pm lib/t/00smoke.t lib/t/01harness.t lib/t/02regression.t lib/t/03web.pl lib/t/04_send_email.pl bin/mason_handler.fcgi bin/mason_handler.scgi bin/mason_handler.svc bin/rt-commit-handler bin/rt-crontool bin/rt-mailgate bin/webmux.pl"
+ac_config_files="$ac_config_files sbin/rt-setup-database sbin/rt-test-dependencies Makefile etc/RT_Config.pm lib/RT.pm lib/t/00smoke.t lib/t/01harness.t lib/t/02regression.t lib/t/03web.pl lib/t/04_send_email.pl bin/mason_handler.fcgi bin/mason_handler.scgi bin/mason_handler.svc bin/rt-commit-handler bin/rt-crontool bin/rt-mailgate bin/rt bin/webmux.pl"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -2206,7 +2228,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by RT $as_me 3.0.4, which was
+This file was extended by RT $as_me 3.0.9, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2260,7 +2282,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-RT config.status 3.0.4
+RT config.status 3.0.9
 configured by $0, generated by GNU Autoconf 2.53,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -2363,6 +2385,7 @@ do
   "bin/rt-commit-handler" ) CONFIG_FILES="$CONFIG_FILES bin/rt-commit-handler" ;;
   "bin/rt-crontool" ) CONFIG_FILES="$CONFIG_FILES bin/rt-crontool" ;;
   "bin/rt-mailgate" ) CONFIG_FILES="$CONFIG_FILES bin/rt-mailgate" ;;
+  "bin/rt" ) CONFIG_FILES="$CONFIG_FILES bin/rt" ;;
   "bin/webmux.pl" ) CONFIG_FILES="$CONFIG_FILES bin/webmux.pl" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -2487,6 +2510,7 @@ s,@BIN_OWNER@,$BIN_OWNER,;t t
 s,@LIBS_OWNER@,$LIBS_OWNER,;t t
 s,@LIBS_GROUP@,$LIBS_GROUP,;t t
 s,@DB_TYPE@,$DB_TYPE,;t t
+s,@ORACLE_ENV_PREF@,$ORACLE_ENV_PREF,;t t
 s,@DB_HOST@,$DB_HOST,;t t
 s,@DB_PORT@,$DB_PORT,;t t
 s,@DB_RT_HOST@,$DB_RT_HOST,;t t
diff --git a/rt/configure.ac b/rt/configure.ac
index cd82c4460..ea5de5e15 100644
--- a/rt/configure.ac
+++ b/rt/configure.ac
@@ -2,11 +2,11 @@ dnl
 dnl Process this file with autoconf to produce a configure script
 dnl
 dnl Embed in generated ./configure script the following CVS info:
-AC_REVISION($Revision: 1.1 $)dnl
+AC_REVISION($Revision: 1.1.1.2 $)dnl
 
 dnl Setup autoconf
 AC_PREREQ(2.53)
-AC_INIT(RT, [3.0.4], [rt-3.0-bugs@fsck.com])
+AC_INIT(RT, [3.0.9], [rt-3.0-bugs@fsck.com])
 AC_CONFIG_SRCDIR([lib/RT.pm.in])
 
 dnl Extract RT version number components
@@ -75,14 +75,21 @@ AC_SUBST(LIBS_GROUP)
 dnl DB_TYPE
 AC_ARG_WITH(db-type,
 	    AC_HELP_STRING([--with-db-type=TYPE],
-	    		   [sort of database RT will use (default: mysql) (mysql and Pg are valid)]), 
+	    		   [sort of database RT will use (default: mysql) (mysql, Pg, Oracle and Informix are valid)]), 
             DB_TYPE=$withval,
             DB_TYPE=mysql)
-if test "$DB_TYPE" != 'mysql' -a "$DB_TYPE" != 'Pg' -a "$DB_TYPE" != 'SQLite'; then
-	AC_MSG_ERROR([Only Pg and mysql are valid db types])
+if test "$DB_TYPE" != 'mysql' -a "$DB_TYPE" != 'Pg' -a "$DB_TYPE" != 'SQLite' -a "$DB_TYPE" != 'Oracle' -a "$DB_TYPE" != 'Informix' ; then
+	AC_MSG_ERROR([Only Oracle, Informix, Pg and mysql are valid db types])
 fi
 AC_SUBST(DB_TYPE)
 
+dnl ORACLE_ENV_PREF
+if test "$DB_TYPE" = 'Oracle'; then
+	test "x$ORACLE_HOME" = 'x' && AC_MSG_ERROR([Please declare the ORACLE_HOME environment variable])
+	ORACLE_ENV_PREF="\$ENV{'ORACLE_HOME'} = '$ORACLE_HOME';"
+fi
+AC_SUBST(ORACLE_ENV_PREF)
+
 dnl DB_HOST
 AC_ARG_WITH(db-host,
 	    AC_HELP_STRING([--with-db-host=HOSTNAME],
@@ -155,6 +162,18 @@ AC_ARG_WITH(web-group,
             WEB_GROUP=www)
 AC_SUBST(WEB_GROUP)
 
+dnl INSTALL AS ME
+my_group=$(groups|cut -f1 -d' ')
+AC_ARG_WITH(my-user-group,
+            AC_HELP_STRING([--with-my-user-group],
+                           [set all users and groups to current user/group]),
+            RTGROUP=$my_group
+            BIN_OWNER=$USER
+            LIBS_OWNER=$USER
+            LIBS_GROUP=$my_group
+            WEB_USER=$USER
+            WEB_GROUP=$my_group)
+
 dnl This section maps the variable names this script 'natively' generates
 dnl to their existing names. They should be removed from here as the .in
 dnl files are changed to use the new names.
@@ -204,6 +223,7 @@ AC_CONFIG_FILES([
  		 bin/rt-commit-handler
  		 bin/rt-crontool
  		 bin/rt-mailgate
+		 bin/rt
  		 bin/webmux.pl]
                 )
 AC_OUTPUT
diff --git a/rt/docs/rt3-schema-relationships.dot b/rt/docs/rt3-schema-relationships.dot
new file mode 100644
index 000000000..77ed35f01
--- /dev/null
+++ b/rt/docs/rt3-schema-relationships.dot
@@ -0,0 +1,81 @@
+digraph g {
+graph [
+rankdir = "LR",
+concentrate = true,
+ratio = auto
+];
+node [
+fontsize = "18",
+shape = record, fontsize = 18
+];
+edge [
+];
+
+"ACL" [shape = record, fontsize = 18, label = "<col0> \N " ];
+"ACL" -> "Principals" [label="PrincipalId -> Id"];
+"ACL" -> "Principals" [label="DelegatedBy -> Id"];
+"ACL" -> "ACL" [label="DelegatedFrom -> Id"];
+
+"Attachments" [shape = record, fontsize = 18, label = "<col0> \N " ];
+"Attachments" -> "Transactions" [label="TransactionId -> id"];
+"Attachments" -> "Attachments" [label="Parent -> id"];
+
+"CachedGroupMemers" [shape = record, fontsize = 18, label = "<col0> \N " ];
+"CachedGroupMemers" -> "Groups" [label="GroupId -> Groups.id"];
+"CachedGroupMemers" -> "Principals" [label="MemberId -> Id"];
+"CachedGroupMemers" -> "CachedGroupMemers" [label="Via -> id"];
+"CachedGroupMemers" -> "Groups" [label="ImmediateParentId -> Groups.id"];
+
+"CustomFields" [shape = record, fontsize = 18, label = "<col0> \N " ];
+"CustomFields" -> "Queues" [label="Queue -> id"];
+
+"CustomFieldValues" [shape = record, fontsize = 18, label = "<col0> \N " ];
+"CustomFieldValues" -> "CustomFields" [label="CustomField -> id"];
+
+"GroupMembers" [shape = record, fontsize = 18, label = "<col0> \N " ];
+"GroupMembers" -> "Groups" [label="GroupId => Groups.Id"];
+"GroupMembers" -> "Principals" [label="MemberId => Id"];
+
+"Groups" [shape = record, fontsize = 18, label = "<col0> \N " ];
+"Groups" -> "Principals" [label="Groups.id -> id"];
+
+"Links" [shape = record, fontsize = 18, label = "<col0> \N " ];
+"Links" -> "Tickets" [label="LocalBase => id (usually)"];
+"Links" -> "Tickets" [label="LocalTarget => id (usually)"];
+
+"Principals" [shape = record, fontsize = 18, label = "<col0> \N " ];
+
+
+"Queues" [shape = record, fontsize = 18, label = "<col0> \N " ];
+
+"ScripActions" [shape = record, fontsize = 18, label = "<col0> \N " ];
+
+"ScripConditions" [shape = record, fontsize = 18, label = "<col0> \N " ];
+
+"Scrips" [shape = record, fontsize = 18, label = "<col0> \N " ];
+"Scrips" -> "ScripConditions" [label="ScripCondition -> id"];
+"Scrips" -> "ScripActions" [label="ScripAction -> id"];
+"Scrips" -> "Templates" [label="Template -> id"];
+"Scrips" -> "Queues" [label="Queue -> id"];
+
+"Templates" [shape = record, fontsize = 18, label = "<col0> \N " ];
+"Templates" -> "Queues" [label ="Queue -> id" ];
+
+"TicketCustomFieldValues" [shape = record, fontsize = 18, label = "<col0> \N " ];
+"TicketCustomFieldValues" -> "Tickets" [label="Ticket -> id"];
+"TicketCustomFieldValues" -> "CustomFields" [label="CustomField -> id"];
+
+"Tickets" [shape = record, fontsize = 18, label = "<col0> \N " ];
+"Tickets" -> "Tickets" [label="EffectiveId -> id"];
+"Tickets" -> "Queues" [label="Queue -> id"];
+"Tickets" -> "Principals" [label="Owner -> id"];
+
+"Transactions" [shape = record, fontsize = 18, label = "<col0> \N " ];
+"Transactions" -> "Tickets" [label="Ticket -> Id"];
+
+"Users" [shape = record, fontsize = 18, label = "<col0> \N " ];
+
+"Users" -> "Principals" [label="id -> id"];
+
+
+}
diff --git a/rt/etc/RT_Config.pm b/rt/etc/RT_Config.pm
index 2b3f4f9fe..5386a8e05 100644
--- a/rt/etc/RT_Config.pm
+++ b/rt/etc/RT_Config.pm
@@ -47,7 +47,7 @@ Set($Timezone , 'US/Eastern');
 # {{{ Database Configuration
 
 # Database driver beeing used. Case matters
-# Valid types are "mysql" and "Pg"
+# Valid types are "mysql", "Oracle" and "Pg"
 
 Set($DatabaseType , 'mysql');
 
@@ -164,9 +164,9 @@ Set($SenderMustExistInExternalDatabase , undef);
 # and comment mail tracked by RT, unless overridden by a queue-specific
 # address.
 
-Set($CorrespondAddress , 'RT::CorrespondAddress.not.set');
+Set($CorrespondAddress , 'RT_CorrespondAddressNotSet');
 
-Set($CommentAddress , 'RT::CommentAddress.not.set');
+Set($CommentAddress , 'RT_CommentAddressNotSet');
 
 #Sendmail Configuration
 
@@ -268,9 +268,6 @@ Set($WebBaseURL , "http://RT::WebBaseURL.not.configured:80");
 Set($WebURL , $WebBaseURL . $WebPath . "/");
 
 # $WebImagesURL points to the base URL where RT can find its images.
-# If you're running the FastCGI version of the RT web interface,
-# you should make RT's WebRT/html/NoAuth/images directory available on
-# a static web server and supply that URL as $WebImagesURL.
 
 Set($WebImagesURL , $WebURL . "NoAuth/images/");
 
@@ -278,6 +275,15 @@ Set($WebImagesURL , $WebURL . "NoAuth/images/");
 
 Set($LogoURL , $WebImagesURL . "rt.jpg");
 
+# For message boxes, set the entry box width and what type of wrapping
+# to use.
+#
+# Default width: 72
+Set($MessageBoxWidth , 72);
+
+# Default wrapping: "HARD"  (choices "SOFT", "HARD")
+Set($MessageBoxWrap, "HARD");
+
 # if TrustHTMLAttachments is not defined, we will display them
 # as text. This prevents malicious HTML and javascript from being
 # sent in a request (although there is probably more to it than that)
@@ -310,6 +316,25 @@ Set($WebExternalAuto , undef);
 
 # Set($WebSessionClass , 'Apache::Session::File');
 
+# $MaxInlineBody is the maximum attachment size that we want to see
+# inline when viewing a transaction. 13456 is a random sane-sounding
+# default.
+
+Set($MaxInlineBody, 13456);
+
+# $MyTicketsLength is the length of the table on the front page.
+# For some people, the default of 10 isn't big enough to get a feel for
+# how much work needs to be done before you get some time off.
+
+Set($MyTicketsLength, 10);
+
+# @MasonParameters is the list of parameters for the constructor of
+# HTML::Mason's Apache or CGI Handler.  This is normally only useful
+# for debugging, eg. profiling individual components with
+#     (preamble => 'my $p = MasonX::Profiler->new($m, $r);');
+
+@MasonParameters = () unless (@MasonParameters);
+
 # }}}
 
 # {{{ RT UTF-8 Settings
diff --git a/rt/etc/RT_Config.pm.in b/rt/etc/RT_Config.pm.in
index 5f97eb0a0..8271a7760 100644
--- a/rt/etc/RT_Config.pm.in
+++ b/rt/etc/RT_Config.pm.in
@@ -47,7 +47,7 @@ Set($Timezone , 'US/Eastern');
 # {{{ Database Configuration
 
 # Database driver beeing used. Case matters
-# Valid types are "mysql" and "Pg"
+# Valid types are "mysql", "Oracle" and "Pg"
 
 Set($DatabaseType , '@DB_TYPE@');
 
@@ -164,9 +164,9 @@ Set($SenderMustExistInExternalDatabase , undef);
 # and comment mail tracked by RT, unless overridden by a queue-specific
 # address.
 
-Set($CorrespondAddress , 'RT::CorrespondAddress.not.set');
+Set($CorrespondAddress , 'RT_CorrespondAddressNotSet');
 
-Set($CommentAddress , 'RT::CommentAddress.not.set');
+Set($CommentAddress , 'RT_CommentAddressNotSet');
 
 #Sendmail Configuration
 
@@ -268,9 +268,6 @@ Set($WebBaseURL , "http://RT::WebBaseURL.not.configured:80");
 Set($WebURL , $WebBaseURL . $WebPath . "/");
 
 # $WebImagesURL points to the base URL where RT can find its images.
-# If you're running the FastCGI version of the RT web interface,
-# you should make RT's WebRT/html/NoAuth/images directory available on
-# a static web server and supply that URL as $WebImagesURL.
 
 Set($WebImagesURL , $WebURL . "NoAuth/images/");
 
@@ -278,6 +275,15 @@ Set($WebImagesURL , $WebURL . "NoAuth/images/");
 
 Set($LogoURL , $WebImagesURL . "rt.jpg");
 
+# For message boxes, set the entry box width and what type of wrapping
+# to use.
+#
+# Default width: 72
+Set($MessageBoxWidth , 72);
+
+# Default wrapping: "HARD"  (choices "SOFT", "HARD")
+Set($MessageBoxWrap, "HARD");
+
 # if TrustHTMLAttachments is not defined, we will display them
 # as text. This prevents malicious HTML and javascript from being
 # sent in a request (although there is probably more to it than that)
@@ -310,6 +316,25 @@ Set($WebExternalAuto , undef);
 
 # Set($WebSessionClass , 'Apache::Session::File');
 
+# $MaxInlineBody is the maximum attachment size that we want to see
+# inline when viewing a transaction. 13456 is a random sane-sounding
+# default.
+
+Set($MaxInlineBody, 13456);
+
+# $MyTicketsLength is the length of the table on the front page.
+# For some people, the default of 10 isn't big enough to get a feel for
+# how much work needs to be done before you get some time off.
+
+Set($MyTicketsLength, 10);
+
+# @MasonParameters is the list of parameters for the constructor of
+# HTML::Mason's Apache or CGI Handler.  This is normally only useful
+# for debugging, eg. profiling individual components with
+#     (preamble => 'my $p = MasonX::Profiler->new($m, $r);');
+
+@MasonParameters = () unless (@MasonParameters);
+
 # }}}
 
 # {{{ RT UTF-8 Settings
diff --git a/rt/etc/acl.Informix b/rt/etc/acl.Informix
new file mode 100644
index 000000000..bca0408dd
--- /dev/null
+++ b/rt/etc/acl.Informix
@@ -0,0 +1,5 @@
+sub acl {
+return  (
+"GRANT RESOURCE TO ${RT::DatabaseUser};");
+}
+1;
diff --git a/rt/etc/acl.Oracle b/rt/etc/acl.Oracle
index c8667c031..ac29215c2 100644
--- a/rt/etc/acl.Oracle
+++ b/rt/etc/acl.Oracle
@@ -1,10 +1,10 @@
 sub acl {
 return (
-"CREATE USER ${RT::DatabaseUser} identified by ${RT::DatabasePassword}".
-"temporary tablespace TEMP" .
-"default tablespace USERS" .
-"quota unlimited on USERS;" ,
-"grant connect, resource to ${RT::DatabaseUser};",
-"exit;");
+"CREATE USER ${RT::DatabaseUser} identified by ${RT::DatabasePassword} ".
+"default tablespace USERS " .
+"temporary tablespace TEMP " .
+"quota unlimited on USERS" ,
+"grant connect, resource to ${RT::DatabaseUser}"
+);
 }
 1;
diff --git a/rt/etc/constraints.mysql b/rt/etc/constraints.mysql
index 33a037673..fd557d5e4 100644
--- a/rt/etc/constraints.mysql
+++ b/rt/etc/constraints.mysql
@@ -1,8 +1,5 @@
-#ALTER TABLE Users ADD FOREIGN KEY (Creator) REFERENCES Users(id);
-#ALTER TABLE Users ADD FOREIGN KEY (LastUpdatedBy) REFERENCES Users(id);
   ALTER TABLE Links ADD FOREIGN KEY (LocalBase) REFERENCES Tickets(id) ;
   ALTER TABLE Links ADD FOREIGN KEY (LocalTarget) REFERENCES Tickets(id);
-        ObjectId integer, #  FOREIGN KEY to Users or Groups, depending
   ALTER TABLE Tickets ADD FOREIGN KEY (Queue) REFERENCES Queues(id);
   ALTER TABLE Tickets ADD FOREIGN KEY (EffectiveId) REFERENCES Tickets(id);
   ALTER TABLE Tickets ADD FOREIGN KEY (Owner) REFERENCES Principals(id);
@@ -19,18 +16,11 @@
   ALTER TABLE Scrips ADD FOREIGN KEY (Queue) REFERENCES Queues(id);
   ALTER TABLE Scrips ADD FOREIGN KEY (Creator) REFERENCES Users(id);
   ALTER TABLE Scrips ADD FOREIGN KEY (LastUpdatedBy) REFERENCES Users(id);
-  PrincipalId integer NOT NULL  , #ALTER TABLE ADD FOREIGN KEY to principals
-  DelegatedBy integer NOT NULL default 0, #ALTER TABLE ADD FOREIGN KEY to principals with a userid
-  DelegatedFrom integer NOT NULL default 0, #ALTER TABLE ADD FOREIGN KEY to ACL
   ALTER TABLE ACL ADD FOREIGN KEY (PrincipalId) REFERENCES Principals(id);
   ALTER TABLE ACL ADD FOREIGN KEY (DelegatedBy) REFERENCES Principals(id);
   ALTER TABLE ACL ADD FOREIGN KEY (DelegatedFrom) REFERENCES ACL(id);
-  ALTER TABLE GroupMembers ADD FOREIGN KEY (GroupId) REFERENCES Principals(id);
+  ALTER TABLE GroupMembers ADD FOREIGN KEY (GroupId) REFERENCES Groups(id);
   ALTER TABLE GroupMembers ADD FOREIGN KEY (MemberId) REFERENCES Principals(id);
-        GroupId int, # ALTER TABLE ADD FOREIGN KEY to Principals
-        MemberId int, # ALTER TABLE ADD FOREIGN KEY to Principals
-        Via int, #ALTER TABLE ADD FOREIGN KEY to CachedGroupMembers. (may point to $self->id)
-        ImmediateParentId int, #ALTER TABLE ADD FOREIGN KEY to prinicpals.         
   ALTER TABLE CachedGroupMembers ADD FOREIGN KEY (ImmediateParentId) REFERENCES Principals(id);
   ALTER TABLE CachedGroupMembers ADD FOREIGN KEY (GroupId) REFERENCES Principals(id);
   ALTER TABLE CachedGroupMembers ADD FOREIGN KEY (MemberId) REFERENCES Principals(id);
@@ -43,7 +33,7 @@
   ALTER TABLE CustomFields ADD FOREIGN KEY (Queue) REFERENCES Queues(id);
   ALTER TABLE CustomFields ADD FOREIGN KEY (Creator) REFERENCES Users(id);
   ALTER TABLE CustomFields ADD FOREIGN KEY (LastUpdatedBy) REFERENCES Users(id);
-  ALTER TABLE TicketCustomFieldValues ADD FOREIGN KEY (Ticket) REFERENCES Ticketss(id);
+  ALTER TABLE TicketCustomFieldValues ADD FOREIGN KEY (Ticket) REFERENCES Tickets(id);
   ALTER TABLE TicketCustomFieldValues ADD FOREIGN KEY (CustomField) REFERENCES CustomFields(id);
   ALTER TABLE TicketCustomFieldValues ADD FOREIGN KEY (Creator) REFERENCES Users(id);
   ALTER TABLE TicketCustomFieldValues ADD FOREIGN KEY (LastUpdatedBy) REFERENCES Users(id);
diff --git a/rt/etc/drop.Informix b/rt/etc/drop.Informix
new file mode 100644
index 000000000..ce7cc0181
--- /dev/null
+++ b/rt/etc/drop.Informix
@@ -0,0 +1,19 @@
+DROP TABLE ACL;
+DROP TABLE ATTACHMENTS;
+DROP TABLE CACHEDGROUPMEMBERS;
+DROP TABLE CUSTOMFIELDS;
+DROP TABLE CUSTOMFIELDVALUES;
+DROP TABLE GROUPMEMBERS;
+DROP TABLE GROUPS;
+DROP TABLE LINKS;
+DROP TABLE PRINCIPALS;
+DROP TABLE QUEUES;
+DROP TABLE SCRIPACTIONS;
+DROP TABLE SCRIPCONDITIONS;
+DROP TABLE SCRIPS;
+DROP TABLE SESSIONS;
+DROP TABLE TEMPLATES;
+DROP TABLE TICKETCUSTOMFIELDVALUES;
+DROP TABLE TICKETS;
+DROP TABLE TRANSACTIONS;
+DROP TABLE USERS;
diff --git a/rt/etc/drop.Oracle b/rt/etc/drop.Oracle
new file mode 100644
index 000000000..dd11376f2
--- /dev/null
+++ b/rt/etc/drop.Oracle
@@ -0,0 +1,37 @@
+DROP TABLE ACL;
+DROP TABLE ATTACHMENTS;
+DROP TABLE CACHEDGROUPMEMBERS;
+DROP TABLE CUSTOMFIELDS;
+DROP TABLE CUSTOMFIELDVALUES;
+DROP TABLE GROUPMEMBERS;
+DROP TABLE GROUPS;
+DROP TABLE LINKS;
+DROP TABLE PRINCIPALS;
+DROP TABLE QUEUES;
+DROP TABLE SCRIPACTIONS;
+DROP TABLE SCRIPCONDITIONS;
+DROP TABLE SCRIPS;
+DROP TABLE SESSIONS;
+DROP TABLE TEMPLATES;
+DROP TABLE TICKETCUSTOMFIELDVALUES;
+DROP TABLE TICKETS;
+DROP TABLE TRANSACTIONS;
+DROP TABLE USERS;
+DROP SEQUENCE ACL_seq;
+DROP SEQUENCE ATTACHMENTS_seq;
+DROP SEQUENCE CACHEDGROUPMEMBERS_seq;
+DROP SEQUENCE CUSTOMFIELDS_seq;
+DROP SEQUENCE CUSTOMFIELDVALUES_seq;
+DROP SEQUENCE GROUPMEMBERS_seq;
+DROP SEQUENCE GROUPS_seq;
+DROP SEQUENCE LINKS_seq;
+DROP SEQUENCE PRINCIPALS_seq;
+DROP SEQUENCE QUEUES_seq;
+DROP SEQUENCE SCRIPACTIONS_seq;
+DROP SEQUENCE SCRIPCONDITIONS_seq;
+DROP SEQUENCE SCRIPS_seq;
+DROP SEQUENCE TEMPLATES_seq;
+DROP SEQUENCE TICKETCUSTOMFIELDVALUES_seq;
+DROP SEQUENCE TICKETS_seq;
+DROP SEQUENCE TRANSACTIONS_seq;
+DROP SEQUENCE USERS_seq;
diff --git a/rt/etc/initialdata b/rt/etc/initialdata
index 62b35ace2..e360c5daf 100644
--- a/rt/etc/initialdata
+++ b/rt/etc/initialdata
@@ -307,7 +307,7 @@ This is a comment.  It is not sent to the Requestor(s):
       Queue       => '0',
       Name        => 'Resolved',                 # loc
       Description => 'Ticket Resolved',          # loc
-      Content     => 'Subject: Ticket Resolved
+      Content     => 'Subject: Resolved: {$Ticket->Subject}
 
 According to our records, your request has been resolved. If you have any
 further questions or concerns, please respond to this message.
@@ -551,7 +551,7 @@ while (my $link = $links->Next) {
 require RT::Action::Notify; bless($self, 'RT::Action::Notify');
 $self->{Argument} = 'Requestor'; $self->Prepare;
 
-return $passed;
+return 0; # ignore $passed;
 # ------------------------------------------------------------------- #
 	],
        CustomCommitCode => '"never needed"',
diff --git a/rt/etc/schema.Informix b/rt/etc/schema.Informix
new file mode 100644
index 000000000..ca6173f36
--- /dev/null
+++ b/rt/etc/schema.Informix
@@ -0,0 +1,342 @@
+-- This schema was adopted from the oracle schema by
+-- Andre Koppel. 
+-- Version 0.2 Date 2003.10.21
+-- The work is still in progress
+
+CREATE TABLE Attachments (
+  	id 		SERIAL,
+  	TransactionId	INTEGER NOT NULL,
+	Parent 		INTEGER DEFAULT 0 NOT NULL, 
+  	MessageId 	VARCHAR(160),
+  	Subject 	VARCHAR(255),
+  	Filename 	VARCHAR(255),
+  	ContentType 	VARCHAR(80),
+  	ContentEncoding VARCHAR(80),
+  	Content 	BYTE,
+  	Headers 	BYTE,
+	Creator 	INTEGER DEFAULT 0 NOT NULL,
+  	Created 	DATETIME YEAR TO SECOND,
+        PRIMARY KEY (id)
+); 
+CREATE INDEX Attachments1 ON Attachments (Parent);
+CREATE INDEX Attachments2 ON Attachments (TransactionId);
+CREATE INDEX Attachments3 ON Attachments (Parent, TransactionId);
+
+
+CREATE TABLE Queues (
+	id 			SERIAL,
+	Name 			VARCHAR(200) DEFAULT '' NOT NULL,
+	Description 		VARCHAR(255) DEFAULT NULL,
+	CorrespondAddress 	VARCHAR(120) DEFAULT NULL,
+	CommentAddress 		VARCHAR(120) DEFAULT NULL,
+	InitialPriority 	INTEGER DEFAULT 0 NOT NULL,
+	FinalPriority 		INTEGER DEFAULT 0 NOT NULL,
+	DefaultDueIn 		INTEGER DEFAULT 0 NOT NULL,
+	Creator 		INTEGER DEFAULT 0 NOT NULL,
+	Created 		DATETIME YEAR TO SECOND,
+	LastUpdatedBy 		INTEGER DEFAULT 0 NOT NULL,
+	LastUpdated		DATETIME YEAR TO SECOND,
+	Disabled 		INTEGER DEFAULT 0 NOT NULL,
+        PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX Queues1 ON Queues (Name);
+CREATE INDEX Queues2 ON Queues (Disabled);
+
+
+CREATE TABLE Links (
+  	id 		SERIAL,
+	Base 		VARCHAR(240) DEFAULT NULL,
+	Target 		VARCHAR(240) DEFAULT NULL,
+  	Type 		VARCHAR(20) DEFAULT '' NOT NULL,
+	LocalTarget	INTEGER DEFAULT 0 NOT NULL,
+	LocalBase	INTEGER DEFAULT 0 NOT NULL,
+	LastUpdatedBy 	INTEGER DEFAULT 0 NOT NULL,
+  	LastUpdated 	DATETIME YEAR TO SECOND,
+	Creator 	INTEGER DEFAULT 0 NOT NULL,
+  	Created 	DATETIME YEAR TO SECOND,
+        PRIMARY KEY (id)
+);
+-- CREATE UNIQUE INDEX Links1 ON Links (Base, Target, Type);
+CREATE INDEX Links2 ON Links (Base, Type);
+CREATE INDEX Links3 ON Links (Target, Type);
+CREATE INDEX Links4 ON Links(Type,LocalBase);
+
+
+CREATE TABLE Principals (
+	id		SERIAL,
+	PrincipalType	VARCHAR(16) DEFAULT '' NOT NULL,
+	ObjectId	INTEGER DEFAULT 0,
+	Disabled	INTEGER DEFAULT 0 NOT NULL,
+        PRIMARY KEY (id)
+);
+CREATE INDEX Principals2 ON Principals (ObjectId);
+
+
+CREATE TABLE Groups (
+	id 		SERIAL,
+	Name 		VARCHAR(200) DEFAULT NULL,
+	Description 	VARCHAR(255) DEFAULT NULL,
+	Domain		VARCHAR(64) DEFAULT '',
+	Type		VARCHAR(64) DEFAULT '',
+	Instance	INTEGER DEFAULT 0 NOT NULL,
+--	Instance	VARCHAR(64) DEFAULT '' NOT NULL,
+        PRIMARY KEY (id)
+);
+CREATE INDEX Groups1 ON Groups (Domain, Instance, Type, id);
+CREATE INDEX Groups2 ON Groups (Type, Instance, Domain);
+
+
+CREATE TABLE ScripConditions (
+ 	id			SERIAL,
+	Name 			VARCHAR(200),
+	Description 		VARCHAR(255),
+	ExecModule		VARCHAR(60),
+	Argument		VARCHAR(255),
+	ApplicableTransTypes	VARCHAR(60),
+  	Creator 		INTEGER DEFAULT 0 NOT NULL,
+  	Created 		DATETIME YEAR TO SECOND,
+  	LastUpdatedBy 		INTEGER DEFAULT 0 NOT NULL,
+  	LastUpdated		DATETIME YEAR TO SECOND,
+        PRIMARY KEY (id)
+);
+
+
+CREATE TABLE Transactions (
+  	id 			SERIAL,
+  	EffectiveTicket 	INTEGER DEFAULT 0 NOT NULL,
+  	Ticket 			INTEGER DEFAULT 0 NOT NULL,
+  	TimeTaken 		INTEGER DEFAULT 0 NOT NULL,
+  	Type 			VARCHAR(20),
+  	Field 			VARCHAR(40),
+  	OldValue 		VARCHAR(255),
+  	NewValue 		VARCHAR(255),
+  	Data 			VARCHAR(255),
+  	Creator 		INTEGER DEFAULT 0 NOT NULL,
+  	Created 		DATETIME YEAR TO SECOND,
+        PRIMARY KEY (id)
+);
+CREATE INDEX Transactions1 ON Transactions (Ticket);
+CREATE INDEX Transactions2 ON Transactions (EffectiveTicket);
+
+
+CREATE TABLE Scrips (
+  	id 		SERIAL,	
+	Description	VARCHAR(255) DEFAULT '',
+	ScripCondition 	INTEGER DEFAULT 0 NOT NULL,
+	ScripAction	INTEGER DEFAULT 0 NOT NULL,
+	ConditionRules	BYTE,
+	ActionRules	BYTE,
+	CustomIsApplicableCode	BYTE,
+	CustomPrepareCode	BYTE,
+	CustomCommitCode	BYTE,
+	Stage		VARCHAR(32),
+	Queue		INTEGER DEFAULT 0 NOT NULL,
+	Template	INTEGER DEFAULT 0 NOT NULL,
+  	Creator 	INTEGER DEFAULT 0 NOT NULL,
+  	Created 	DATETIME YEAR TO SECOND,
+  	LastUpdatedBy 	INTEGER DEFAULT 0 NOT NULL,
+  	LastUpdated 	DATETIME YEAR TO SECOND,
+        PRIMARY KEY (id)
+);
+
+
+CREATE TABLE ACL (
+	id 		SERIAL,
+	PrincipalType 	VARCHAR(25) NOT NULL,
+	PrincipalId 	INTEGER NOT NULL,
+	RightName	VARCHAR(25) NOT NULL,
+	ObjectType	VARCHAR(25) NOT NULL,
+	ObjectId	INTEGER DEFAULT 0 NOT NULL,
+	DelegatedBy	INTEGER DEFAULT 0 NOT NULL,
+	DelegatedFrom	INTEGER DEFAULT 0 NOT NULL,
+        PRIMARY KEY (id)
+);
+CREATE INDEX ACL1 ON ACL(RightName, ObjectType, ObjectId, PrincipalType, PrincipalId);
+
+
+CREATE TABLE GroupMembers (
+	id 		SERIAL,
+	GroupId 	INTEGER DEFAULT 0 NOT NULL,
+	MemberId 	INTEGER DEFAULT 0 NOT NULL,
+        PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX GroupMembers1 ON GroupMembers (GroupId, MemberId);
+
+
+CREATE TABLE CachedGroupMembers (
+	id		SERIAL,
+	GroupId		INTEGER DEFAULT 0,
+	MemberId	INTEGER DEFAULT 0,
+	Via		INTEGER DEFAULT 0,
+	ImmediateParentId	INTEGER DEFAULT 0,
+	Disabled	INTEGER DEFAULT 0 NOT NULL,
+        PRIMARY KEY (id)
+);
+CREATE INDEX DisGrouMem ON CachedGroupMembers (GroupId, MemberId, Disabled);
+CREATE INDEX GrouMem ON CachedGroupMembers (GroupId, MemberId);
+
+
+CREATE TABLE Users (
+  	id 			SERIAL,
+  	Name 			VARCHAR(200) NOT NULL,
+  	Password 		VARCHAR(40),
+  	Comments 		BYTE,
+  	Signature 		BYTE,
+  	EmailAddress 		VARCHAR(120),
+  	FreeFormContactInfo 	BYTE,
+	Organization		VARCHAR(200),
+  	RealName 		VARCHAR(120),
+  	NickName 		VARCHAR(16),
+  	Lang 			VARCHAR(16),
+	EmailEncoding		VARCHAR(16),
+	WebEncoding		VARCHAR(16),
+	ExternalContactInfoId	VARCHAR(100),
+	ContactInfoSystem	VARCHAR(30),
+	ExternalAuthId 		VARCHAR(100),
+	AuthSystem		VARCHAR(30),
+	Gecos			VARCHAR(16),
+  	HomePhone 		VARCHAR(30),
+  	WorkPhone 		VARCHAR(30),
+  	MobilePhone 		VARCHAR(30),
+  	PagerPhone 		VARCHAR(30),
+  	Address1	 	VARCHAR(200),
+  	Address2 		VARCHAR(200),
+  	City 			VARCHAR(100),
+  	State 			VARCHAR(100),
+  	Zip 			VARCHAR(16),
+  	Country 		VARCHAR(50),
+	Timezone		VARCHAR(50),
+	PGPKey			BYTE,
+  	Creator 		INTEGER DEFAULT 0 NOT NULL,
+  	Created 		DATETIME YEAR TO SECOND,
+  	LastUpdatedBy 		INTEGER DEFAULT 0 NOT NULL,
+  	LastUpdated 		DATETIME YEAR TO SECOND,
+        PRIMARY KEY (id)
+);
+-- CREATE UNIQUE INDEX Users1 ON Users (Name);
+CREATE INDEX Users2 ON Users (Name);
+CREATE INDEX Users3 ON Users (id, EmailAddress);
+CREATE INDEX Users4 ON Users (EmailAddress);
+
+
+CREATE TABLE Tickets (
+  	id			SERIAL,
+  	EffectiveId		INTEGER DEFAULT 0 NOT NULL,
+  	Queue 			INTEGER DEFAULT 0 NOT NULL,
+  	Type 			VARCHAR(16), 		
+  	IssueStatement 		INTEGER DEFAULT 0 NOT NULL,
+  	Resolution 		INTEGER DEFAULT 0 NOT NULL,
+  	Owner 			INTEGER DEFAULT 0 NOT NULL,
+  	Subject			VARCHAR(200) DEFAULT '[no subject]', 
+  	InitialPriority 	INTEGER DEFAULT 0 NOT NULL,
+  	FinalPriority 		INTEGER DEFAULT 0 NOT NULL,
+  	Priority 		INTEGER DEFAULT 0 NOT NULL,
+	TimeEstimated		INTEGER DEFAULT 0 NOT NULL,
+  	TimeWorked 		INTEGER DEFAULT 0 NOT NULL,
+  	Status 			VARCHAR(10), 		
+	TimeLeft 		INTEGER DEFAULT 0 NOT NULL,
+  	Told 			DATETIME YEAR TO SECOND,
+	Starts			DATETIME YEAR TO SECOND,
+	Started			DATETIME YEAR TO SECOND,
+  	Due 			DATETIME YEAR TO SECOND,
+	Resolved		DATETIME YEAR TO SECOND,
+  	LastUpdatedBy 		INTEGER DEFAULT 0 NOT NULL,
+  	LastUpdated 		DATETIME YEAR TO SECOND,
+	Creator 		INTEGER DEFAULT 0 NOT NULL,
+  	Created 		DATETIME YEAR TO SECOND,
+  	Disabled 		INTEGER DEFAULT 0 NOT NULL,
+        PRIMARY KEY (id)
+);
+CREATE INDEX Tickets1 ON Tickets (Queue, Status);
+CREATE INDEX Tickets2 ON Tickets (Owner);
+CREATE INDEX Tickets3 ON Tickets (EffectiveId);
+CREATE INDEX Tickets4 ON Tickets (id, Status);
+CREATE INDEX Tickets5 ON Tickets (id, EffectiveId);
+CREATE INDEX Tickets6 ON Tickets (EffectiveId, Type);
+
+
+CREATE TABLE ScripActions (
+  id		SERIAL,
+  Name		VARCHAR(200),
+  Description	VARCHAR(255),
+  ExecModule	VARCHAR(60),
+  Argument	VARCHAR(255),
+  Creator	INTEGER DEFAULT 0 NOT NULL,
+  Created	DATETIME YEAR TO SECOND,
+  LastUpdatedBy	INTEGER DEFAULT 0 NOT NULL,
+  LastUpdated	DATETIME YEAR TO SECOND,
+  PRIMARY KEY (id)
+);
+
+
+CREATE TABLE Templates (
+  	id 		SERIAL,
+	Queue 		INTEGER DEFAULT 0 NOT NULL,
+	Name		VARCHAR(200) NOT NULL,
+	Description	VARCHAR(255),
+	Type		VARCHAR(16),
+  	Language 	VARCHAR(16), 
+  	TranslationOf 	INTEGER DEFAULT 0 NOT NULL,
+  	Content 	BYTE,
+  	LastUpdated 	DATETIME YEAR TO SECOND,
+  	LastUpdatedBy 	INTEGER DEFAULT 0 NOT NULL,
+  	Creator 	INTEGER DEFAULT 0 NOT NULL,
+  	Created 	DATETIME YEAR TO SECOND,
+        PRIMARY KEY (id)
+);
+
+
+CREATE TABLE TicketCustomFieldValues (
+	id		SERIAL,
+	Ticket		INTEGER NOT NULL,
+	CustomField	INTEGER NOT NULL,
+	Content		VARCHAR(255),
+	Creator		INTEGER DEFAULT 0 NOT NULL,
+	Created		DATETIME YEAR TO SECOND,
+	LastUpdatedBy	INTEGER DEFAULT 0 NOT NULL,
+	LastUpdated	DATETIME YEAR TO SECOND,
+        PRIMARY KEY (id)
+);
+
+CREATE INDEX TicketCustomFieldValues1 ON TicketCustomFieldValues (CustomField,Ticket,Content); 
+CREATE INDEX TicketCustomFieldValues2 ON TicketCustomFieldValues (CustomField,Ticket); 
+
+CREATE TABLE CustomFields (
+	id		SERIAL,
+	Name		VARCHAR(200),
+	Type		VARCHAR(200),
+	Queue		INTEGER DEFAULT 0 NOT NULL,
+	Description	VARCHAR(255),
+	SortOrder	INTEGER DEFAULT 0 NOT NULL,
+	Creator		INTEGER DEFAULT 0 NOT NULL,
+	Created		DATETIME YEAR TO SECOND,
+	LastUpdatedBy	INTEGER DEFAULT 0 NOT NULL,
+	LastUpdated	DATETIME YEAR TO SECOND,
+	Disabled	SMALLINT DEFAULT 0 NOT NULL,
+        PRIMARY KEY (id)
+);
+CREATE INDEX CustomFields1 ON CustomFields (Disabled, Queue);
+
+
+CREATE TABLE CustomFieldValues (
+	id		SERIAL,
+	CustomField	INTEGER NOT NULL,
+	Name		VARCHAR(200),
+	Description	VARCHAR(255),
+	SortOrder	INTEGER DEFAULT 0 NOT NULL,
+	Creator		INTEGER DEFAULT 0 NOT NULL,
+	Created		DATETIME YEAR TO SECOND,
+	LastUpdatedBy	INTEGER DEFAULT 0 NOT NULL,
+	LastUpdated	DATETIME YEAR TO SECOND,
+        PRIMARY KEY (id)
+);
+
+CREATE INDEX CustomFieldValues1 ON CustomFieldValues (CustomField);
+
+CREATE TABLE sessions (
+	id		VARCHAR(32) NOT NULL,
+	a_session	BYTE,
+	LastUpdated	DATETIME YEAR TO SECOND,
+        PRIMARY KEY (id)
+);
+
diff --git a/rt/etc/schema.Oracle b/rt/etc/schema.Oracle
index 0c14cb39d..95cfda2fd 100644
--- a/rt/etc/schema.Oracle
+++ b/rt/etc/schema.Oracle
@@ -1,202 +1,198 @@
-CREATE SEQUENCE KEYWORDSELECTS_seq;
-CREATE TABLE KeywordSelects (
-	id		NUMBER(11, 0) PRIMARY KEY,
-	Name		VARCHAR2(255),
-	Keyword		NUMBER(11, 0),
-	Single		NUMBER(11, 0),
-	Depth		NUMBER(11, 0) DEFAULT 0,
-	ObjectType	VARCHAR2(32) NOT NULL,
-	ObjectField	VARCHAR2(32),
-	ObjectValue	VARCHAR2(255),
-	Disabled		NUMBER(11, 0) DEFAULT 0
-);
-
-CREATE INDEX KeywordSelects1 ON KeywordSelects (Keyword);
-CREATE INDEX KeywordSelects2 ON 
-	KeywordSelects(ObjectType, ObjectField, ObjectValue);
-
-
 CREATE SEQUENCE ATTACHMENTS_seq;
 CREATE TABLE Attachments (
-  	id 		NUMBER(11,0) PRIMARY KEY,
+  	id 		NUMBER(11,0) 
+			CONSTRAINT Attachments_Key PRIMARY KEY,
   	TransactionId	NUMBER(11,0) NOT NULL,
-  	Parent 		NUMBER(11,0), 		
+	Parent 		NUMBER(11,0) DEFAULT 0 NOT NULL, 
   	MessageId 	VARCHAR2(160),
   	Subject 	VARCHAR2(255),
   	Filename 	VARCHAR2(255),
   	ContentType 	VARCHAR2(80),
-  	ContentEncoding 	VARCHAR2(80),
+  	ContentEncoding VARCHAR2(80),
   	Content 	CLOB,
   	Headers 	CLOB,
-  	Creator 	NUMBER(11,0),
-  	Created 	DATE,
-  	Disabled 	NUMBER(11,0) DEFAULT 0
+	Creator 	NUMBER(11,0) DEFAULT 0 NOT NULL,
+  	Created 	DATE
 );
+CREATE INDEX Attachments2 ON Attachments (TransactionId);
+CREATE INDEX Attachments3 ON Attachments (Parent, TransactionId);
+
 
 CREATE SEQUENCE QUEUES_seq;
 CREATE TABLE Queues (
- 	id 			NUMBER(11, 0) PRIMARY KEY,
-	Name 			VARCHAR2(40) NOT NULL UNIQUE,
-	Description 		VARCHAR2(120),
- 	CorrespondAddress 	VARCHAR2(40),
- 	CommentAddress 		VARCHAR2(40),
- 	InitialPriority 	NUMBER(11, 0),		
- 	FinalPriority 		NUMBER(11, 0),
- 	DefaultDueIn 		NUMBER(11, 0),
-  	Creator 		NUMBER(11, 0),
-  	Created 		DATE,
-  	LastUpdatedBy 		NUMBER(11, 0),
-  	LastUpdated		DATE,
-  	Disabled 		NUMBER(11,0) DEFAULT 0
+	id 			NUMBER(11,0) 
+		CONSTRAINT Queues_Key PRIMARY KEY,
+	Name 			VARCHAR2(200) CONSTRAINT Queues_Name_Unique UNIQUE NOT NULL,
+	Description 		VARCHAR2(255),
+	CorrespondAddress 	VARCHAR2(120),
+	CommentAddress 		VARCHAR2(120),
+	InitialPriority 	NUMBER(11,0) DEFAULT 0 NOT NULL,
+	FinalPriority 		NUMBER(11,0) DEFAULT 0 NOT NULL,
+	DefaultDueIn 		NUMBER(11,0) DEFAULT 0 NOT NULL,
+	Creator 		NUMBER(11,0) DEFAULT 0 NOT NULL,
+	Created 		DATE,
+	LastUpdatedBy 		NUMBER(11,0) DEFAULT 0 NOT NULL,
+	LastUpdated		DATE,
+	Disabled 		NUMBER(11,0) DEFAULT 0 NOT NULL
 );
+ CREATE  INDEX Queues1 ON Queues (lower(Name));
+CREATE INDEX Queues2 ON Queues (Disabled);
+
 
 CREATE SEQUENCE LINKS_seq;
 CREATE TABLE Links (
-  	id 		NUMBER(11,0) PRIMARY KEY,
-  	Base 		VARCHAR2(255),
-  	Target 		VARCHAR2(255),
+  	id 		NUMBER(11,0) 
+		CONSTRAINT Links_Key PRIMARY KEY,
+	Base 		VARCHAR2(240),
+	Target 		VARCHAR2(240),
   	Type 		VARCHAR2(20) NOT NULL,
-	LocalTarget	NUMBER(11,0),
-	LocalBase	NUMBER(11,0),
-  	LastUpdatedBy 	NUMBER(11,0),
+	LocalTarget	NUMBER(11,0) DEFAULT 0 NOT NULL,
+	LocalBase	NUMBER(11,0) DEFAULT 0 NOT NULL,
+	LastUpdatedBy 	NUMBER(11,0) DEFAULT 0 NOT NULL,
   	LastUpdated 	DATE,
-  	Creator 	NUMBER(11,0),
+	Creator 	NUMBER(11,0) DEFAULT 0 NOT NULL,
   	Created 	DATE
 );
-
 CREATE UNIQUE INDEX Links1 ON Links (Base, Target, Type);
-
+CREATE INDEX Links2 ON Links (Base, Type);
+CREATE INDEX Links3 ON Links (Target, Type);
+CREATE INDEX Links4 ON Links(Type,LocalBase);
+
+
+CREATE SEQUENCE PRINCIPALS_seq;
+CREATE TABLE Principals (
+	id		NUMBER(11,0) 
+		CONSTRAINT Principals_Key PRIMARY KEY,
+	PrincipalType	VARCHAR2(16),
+	ObjectId	NUMBER(11,0),
+	Disabled	NUMBER(11,0) DEFAULT 0 NOT NULL
+);
+CREATE UNIQUE  INDEX Principals2 ON Principals (ObjectId);
 
 
 CREATE SEQUENCE GROUPS_seq;
 CREATE TABLE Groups (
-	id 		NUMBER(11,0) PRIMARY KEY,
-	Name 		VARCHAR2(16) UNIQUE,
-	Description 	VARCHAR(64),
-	Pseudo		NUMBER(11,0) DEFAULT 0
-);
-
-CREATE SEQUENCE WATCHERS_seq;
-CREATE TABLE Watchers (
-   	id 		NUMBER(11,0) PRIMARY KEY,
-   	Type 		VARCHAR2(16), 	
-   	Scope 		VARCHAR2(16),	
-   	Value 		NUMBER(11,0),	
-   	Email 		VARCHAR2(255),  
-   	Quiet 		NUMBER(11,0),	
-   	Owner 		NUMBER(11,0),	
-   	Creator 	NUMBER(11,0),
-   	Created 	DATE,
-   	LastUpdatedBy 	NUMBER(11,0),
-   	LastUpdated 	DATE
+	id 		NUMBER(11,0) 
+		CONSTRAINT Groups_Key PRIMARY KEY,
+	Name 		VARCHAR2(200),
+	Description 	VARCHAR2(255),
+	Domain		VARCHAR2(64),
+	Type		VARCHAR2(64),
+	Instance	NUMBER(11,0) DEFAULT 0 -- NOT NULL
+--	Instance	VARCHAR2(64)
 );
-
+CREATE INDEX Groups1 ON Groups (lower( Domain), Instance, lower(Type), id);
+CREATE INDEX Groups2 ON Groups (lower(Type), Instance, lower(Domain));
 
 
 CREATE SEQUENCE SCRIPCONDITIONS_seq;
 CREATE TABLE ScripConditions (
- 	id 			NUMBER(11, 0) PRIMARY KEY,
-	Name 			VARCHAR2(255),
+ 	id 			NUMBER(11, 0) 
+		CONSTRAINT ScripConditions_Key PRIMARY KEY,
+	Name 			VARCHAR2(200),
 	Description 		VARCHAR2(255),
 	ExecModule		VARCHAR2(60),
 	Argument		VARCHAR2(255),
 	ApplicableTransTypes	VARCHAR2(60),
-  	Creator 		NUMBER(11, 0),
+  	Creator 		NUMBER(11,0) DEFAULT 0 NOT NULL,
   	Created 		DATE,
-  	LastUpdatedBy 		NUMBER(11, 0),
+  	LastUpdatedBy 		NUMBER(11,0) DEFAULT 0 NOT NULL,
   	LastUpdated		DATE
 );
 
 
 CREATE SEQUENCE TRANSACTIONS_seq;
 CREATE TABLE Transactions (
-  	id 			NUMBER(11,0) PRIMARY KEY,
-  	EffectiveTicket 	NUMBER(11,0),
-  	Ticket 			NUMBER(11,0),
-  	TimeTaken 		NUMBER(11,0),
+  	id 			NUMBER(11,0) 
+		CONSTRAINT Transactions_Key PRIMARY KEY,
+  	EffectiveTicket 	NUMBER(11,0) DEFAULT 0 NOT NULL,
+  	Ticket 			NUMBER(11,0) DEFAULT 0 NOT NULL,
+  	TimeTaken 		NUMBER(11,0) DEFAULT 0 NOT NULL,
   	Type 			VARCHAR2(20),
   	Field 			VARCHAR2(40),
   	OldValue 		VARCHAR2(255),
   	NewValue 		VARCHAR2(255),
-  	Data 			VARCHAR2(100),
-  	Creator 		NUMBER(11,0),
-  	Created 		DATE,
-  	Disabled 		NUMBER(11,0) DEFAULT 0
+  	Data 			VARCHAR2(255),
+  	Creator 		NUMBER(11,0) DEFAULT 0 NOT NULL,
+  	Created 		DATE
 );
+CREATE INDEX Transactions1 ON Transactions (Ticket);
+CREATE INDEX Transactions2 ON Transactions (EffectiveTicket);
+
 
 CREATE SEQUENCE SCRIPS_seq;
 CREATE TABLE Scrips (
-  	id 		NUMBER(11,0) PRIMARY KEY,	
-	ScripCondition 	NUMBER(11,0),
-	ScripAction	NUMBER(11,0),
+  	id 		NUMBER(11,0) 
+		CONSTRAINT Scrips_Key PRIMARY KEY,	
+	Description	VARCHAR2(255),
+	ScripCondition 	NUMBER(11,0) DEFAULT 0 NOT NULL,
+	ScripAction	NUMBER(11,0) DEFAULT 0 NOT NULL,
+	ConditionRules	CLOB,
+	ActionRules	CLOB,
+	CustomIsApplicableCode	CLOB,
+	CustomPrepareCode	CLOB,
+	CustomCommitCode	CLOB,
 	Stage		VARCHAR2(32),
-	Queue		NUMBER(11,0),
-	Template	NUMBER(11,0),
-  	Creator 	NUMBER(11,0),
+	Queue		NUMBER(11,0) DEFAULT 0 NOT NULL,
+	Template	NUMBER(11,0) DEFAULT 0 NOT NULL,
+  	Creator 	NUMBER(11,0) DEFAULT 0 NOT NULL,
   	Created 	DATE,
-  	LastUpdatedBy 	NUMBER(11,0),
+  	LastUpdatedBy 	NUMBER(11,0) DEFAULT 0 NOT NULL,
   	LastUpdated 	DATE  
 );
 
 
-
-
 CREATE SEQUENCE ACL_seq;
 CREATE TABLE ACL (
-	id 		NUMBER(11,0) PRIMARY KEY,
-	PrincipalId 	NUMBER(11,0),
-	PrincipalType 	VARCHAR2(25),
-	RightName	VARCHAR2(25),
-	RightScope	VARCHAR2(25),
-	RightAppliesTo  NUMBER(11,0)
+	id 		NUMBER(11,0) 
+		CONSTRAINT ACL_Key PRIMARY KEY,
+	PrincipalType 	VARCHAR2(25) NOT NULL,
+	PrincipalId 	NUMBER(11,0) NOT NULL,
+	RightName	VARCHAR2(25) NOT NULL,
+	ObjectType	VARCHAR2(25) NOT NULL,
+	ObjectId	NUMBER(11,0) DEFAULT 0 NOT NULL,
+	DelegatedBy	NUMBER(11,0) DEFAULT 0 NOT NULL,
+	DelegatedFrom	NUMBER(11,0) DEFAULT 0 NOT NULL
 );
+CREATE INDEX ACL1 ON ACL(RightName, ObjectType, ObjectId, PrincipalType, PrincipalId);
+
 
 CREATE SEQUENCE GROUPMEMBERS_seq;
 CREATE TABLE GroupMembers (
-	id 		NUMBER(11,0) PRIMARY KEY,
-	GroupId 	NUMBER(11,0),
-	UserId 		NUMBER(11,0) 
+	id 		NUMBER(11,0) 
+		CONSTRAINT GroupMembers_Key PRIMARY KEY,
+	GroupId 	NUMBER(11,0) DEFAULT 0 NOT NULL,
+	MemberId 	NUMBER(11,0) DEFAULT 0 NOT NULL
 );
-
-CREATE UNIQUE INDEX GroupMembers1 ON GroupMembers (GroupId, UserId);
-
-
-CREATE SEQUENCE OBJECTKEYWORDS_seq;
-CREATE TABLE ObjectKeywords (
-  id 		NUMBER(11,0)  PRIMARY KEY,
-  Keyword	NUMBER(11,0) NOT NULL,
-  KeywordSelect NUMBER(11,0)  NOT NULL,
-  ObjectType	VARCHAR2(32) NOT NULL,
-  ObjectId	NUMBER(11,0) NOT NULL
-);
-
-CREATE UNIQUE INDEX ObjectKeywords1 ON ObjectKeywords
-	(ObjectId, ObjectType, KeywordSelect, Keyword);
-CREATE INDEX ObjectKeywords3 ON ObjectKeywords (Keyword);
-
-CREATE SEQUENCE KEYWORDS_seq;
-CREATE TABLE Keywords (
-	id		NUMBER(11, 0) PRIMARY KEY,
-	Name		VARCHAR2(255) NOT NULL,
-	Description	VARCHAR2(255),
-	Parent		NUMBER(11, 0),
-	Disabled		NUMBER(11, 0) DEFAULT 0
+CREATE UNIQUE INDEX GroupMembers1 ON GroupMembers (GroupId, MemberId);
+
+
+CREATE SEQUENCE CachedGroupMembers_seq;
+CREATE TABLE CachedGroupMembers (
+	id		NUMBER(11,0) 
+		CONSTRAINT CachedGroupMembers_Key PRIMARY KEY,
+	GroupId		NUMBER(11,0),
+	MemberId	NUMBER(11,0),
+	Via		NUMBER(11,0),
+	ImmediateParentId	NUMBER(11,0),
+	Disabled	NUMBER(11,0) DEFAULT 0 NOT NULL
 );
+CREATE INDEX DisGrouMem ON CachedGroupMembers (GroupId, MemberId, Disabled);
+CREATE INDEX GrouMem ON CachedGroupMembers (GroupId, MemberId);
 
-CREATE UNIQUE INDEX Keywords1 ON Keywords (Name, Parent);
-CREATE INDEX Keywords3 ON Keywords (Parent);
 
 CREATE SEQUENCE USERS_seq;
 CREATE TABLE Users (
-  	id 			NUMBER(11,0) PRIMARY KEY,
-  	Name 			VARCHAR2(120) NOT NULL UNIQUE,
+  	id 			NUMBER(11,0) 
+		CONSTRAINT Users_Key PRIMARY KEY,
+  	Name 			VARCHAR2(200) CONSTRAINT Users_Name_Unique 
+		unique  NOT NULL,
   	Password 		VARCHAR2(40),
   	Comments 		CLOB,
   	Signature 		CLOB,
   	EmailAddress 		VARCHAR2(120),
   	FreeFormContactInfo 	CLOB,
 	Organization		VARCHAR2(200),
-	Privileged		NUMBER(11,0),
   	RealName 		VARCHAR2(120),
   	NickName 		VARCHAR2(16),
   	Lang 			VARCHAR2(16),
@@ -217,71 +213,142 @@ CREATE TABLE Users (
   	State 			VARCHAR2(100),
   	Zip 			VARCHAR2(16),
   	Country 		VARCHAR2(50),
-  	Creator 		NUMBER(11,0),
+	Timezone		VARCHAR2(50),
+	PGPKey			CLOB,
+  	Creator 		NUMBER(11,0) DEFAULT 0 NOT NULL,
   	Created 		DATE,
-  	LastUpdatedBy 		NUMBER(11,0),
-  	LastUpdated 		DATE,
-	Disabled			NUMBER(11,0) DEFAULT 0
+  	LastUpdatedBy 		NUMBER(11,0) DEFAULT 0 NOT NULL,
+  	LastUpdated 		DATE
 );
+-- CREATE UNIQUE INDEX Users1 ON Users (Name);
 
-
+CREATE INDEX Users2 ON Users( LOWER(name));
+CREATE INDEX Users4 ON Users (lower(EmailAddress));
 
 
 CREATE SEQUENCE TICKETS_seq;
 CREATE TABLE Tickets (
-  	id			NUMBER(11, 0) PRIMARY KEY,
-  	EffectiveId		NUMBER(11, 0),
-  	Queue 			NUMBER(11,0),
+       id                      NUMBER(11, 0) 
+               CONSTRAINT Tickets_Key PRIMARY KEY,
+  	EffectiveId		NUMBER(11,0) DEFAULT 0 NOT NULL,
+  	Queue 			NUMBER(11,0) DEFAULT 0 NOT NULL,
   	Type 			VARCHAR2(16), 		
-  	IssueStatement 		NUMBER(11,0), 	
-  	Resolution 		NUMBER(11,0),		
-  	Owner 			NUMBER(11,0),		
-  	Subject			VARCHAR2(200) DEFAULT '', 
-  	InitialPriority 	NUMBER(11,0) DEFAULT 0,
-  	FinalPriority 		NUMBER(11,0) DEFAULT 0,
-  	Priority 		NUMBER(11,0) DEFAULT 0,
+  	IssueStatement 		NUMBER(11,0) DEFAULT 0 NOT NULL,
+  	Resolution 		NUMBER(11,0) DEFAULT 0 NOT NULL,
+  	Owner 			NUMBER(11,0) DEFAULT 0 NOT NULL,
+  	Subject			VARCHAR2(200) DEFAULT '[no subject]', 
+  	InitialPriority 	NUMBER(11,0) DEFAULT 0 NOT NULL,
+  	FinalPriority 		NUMBER(11,0) DEFAULT 0 NOT NULL,
+  	Priority 		NUMBER(11,0) DEFAULT 0 NOT NULL,
+	TimeEstimated		NUMBER(11,0) DEFAULT 0 NOT NULL,
+  	TimeWorked 		NUMBER(11,0) DEFAULT 0 NOT NULL,
   	Status 			VARCHAR2(10), 		
-  	TimeWorked 		NUMBER(11,0) DEFAULT 0,
-	TimeLeft 		NUMBER(11,0) DEFAULT 0,
+	TimeLeft 		NUMBER(11,0) DEFAULT 0 NOT NULL,
   	Told 			DATE,
 	Starts			DATE,
 	Started			DATE,
   	Due 			DATE,
 	Resolved		DATE,
-  	LastUpdatedBy 		NUMBER(11,0),
+  	LastUpdatedBy 		NUMBER(11,0) DEFAULT 0 NOT NULL,
   	LastUpdated 		DATE,
-	Creator 		NUMBER(11,0),
+	Creator 		NUMBER(11,0) DEFAULT 0 NOT NULL,
   	Created 		DATE,
-  	Disabled 		NUMBER(11,0) DEFAULT 0
+  	Disabled 		NUMBER(11,0) DEFAULT 0 NOT NULL
 );
+CREATE INDEX Tickets1 ON Tickets (Queue, Status);
+CREATE INDEX Tickets2 ON Tickets (Owner);
+CREATE INDEX Tickets4 ON Tickets (id, Status);
+CREATE INDEX Tickets5 ON Tickets (id, EffectiveId);
+CREATE INDEX Tickets6 ON Tickets (EffectiveId, Type);
+
 
 CREATE SEQUENCE SCRIPACTIONS_seq;
 CREATE TABLE ScripActions (
-  id		NUMBER(11,0) PRIMARY KEY,
-  Name		VARCHAR2(255),
+  id		NUMBER(11,0) 
+		CONSTRAINT ScripActions_Key PRIMARY KEY,
+  Name		VARCHAR2(200),
   Description	VARCHAR2(255),
   ExecModule	VARCHAR2(60),
   Argument	VARCHAR2(255),
-  Creator	NUMBER(11,0),
+  Creator	NUMBER(11,0) DEFAULT 0 NOT NULL,
   Created	DATE,
-  LastUpdatedBy	NUMBER(11,0),
+  LastUpdatedBy	NUMBER(11,0) DEFAULT 0 NOT NULL,
   LastUpdated	DATE
 );
 
 
 CREATE SEQUENCE TEMPLATES_seq;
 CREATE TABLE Templates (
-  	id 		NUMBER(11,0) PRIMARY KEY,
+  	id 		NUMBER(11,0) 
+		CONSTRAINT Templates_Key PRIMARY KEY,
 	Queue 		NUMBER(11,0) DEFAULT 0 NOT NULL,
-	Name		VARCHAR2(40) NOT NULL UNIQUE,
-	Description	VARCHAR2(120),
+	Name		VARCHAR2(200) NOT NULL,
+	Description	VARCHAR2(255),
 	Type		VARCHAR2(16),
   	Language 	VARCHAR2(16), 
-  	TranslationOf 	NUMBER(11,0),
+  	TranslationOf 	NUMBER(11,0) DEFAULT 0 NOT NULL,
   	Content 	CLOB,
   	LastUpdated 	DATE,
-  	LastUpdatedBy 	NUMBER(11,0),
-  	Creator 	NUMBER(11,0),
+  	LastUpdatedBy 	NUMBER(11,0) DEFAULT 0 NOT NULL,
+  	Creator 	NUMBER(11,0) DEFAULT 0 NOT NULL,
   	Created 	DATE
 );
 
+
+CREATE SEQUENCE TICKETCUSTOMFIELDVALUES_seq;
+CREATE TABLE TicketCustomFieldValues (
+	id		NUMBER(11,0) 
+		CONSTRAINT TicketCustomFieldValues_Key PRIMARY KEY,
+	Ticket		NUMBER(11,0),
+	CustomField	NUMBER(11,0) NOT NULL,
+	Content		VARCHAR2(255),
+	Creator		NUMBER(11,0) DEFAULT 0 NOT NULL,
+	Created		DATE,
+	LastUpdatedBy	NUMBER(11,0) DEFAULT 0 NOT NULL,
+	LastUpdated	DATE
+);
+
+CREATE INDEX TicketCustomFieldValues1 ON TicketCustomFieldValues (CustomField,Ticket,Content); 
+CREATE INDEX TicketCustomFieldValues2 ON TicketCustomFieldValues (CustomField,Ticket); 
+
+CREATE SEQUENCE CUSTOMFIELDS_seq;
+CREATE TABLE CustomFields (
+	id		NUMBER(11,0) 
+		CONSTRAINT CustomFields_Key PRIMARY KEY,
+	Name		VARCHAR2(200),
+	Type		VARCHAR2(200),
+	Queue		NUMBER(11,0) DEFAULT 0 NOT NULL,
+	Description	VARCHAR2(255),
+	SortOrder	NUMBER(11,0) DEFAULT 0 NOT NULL,
+	Creator		NUMBER(11,0) DEFAULT 0 NOT NULL,
+	Created		DATE,
+	LastUpdatedBy	NUMBER(11,0) DEFAULT 0 NOT NULL,
+	LastUpdated	DATE,
+	Disabled	NUMBER(11,0) DEFAULT 0 NOT NULL
+);
+CREATE INDEX CustomFields1 ON CustomFields (Disabled, Queue);
+
+
+CREATE SEQUENCE CUSTOMFIELDVALUES_seq;
+CREATE TABLE CustomFieldValues (
+	id		NUMBER(11,0) 
+		CONSTRAINT CustomFieldValues_Key PRIMARY KEY,
+	CustomField	NUMBER(11,0),
+	Name		VARCHAR2(200),
+	Description	VARCHAR2(255),
+	SortOrder	NUMBER(11,0) DEFAULT 0 NOT NULL,
+	Creator		NUMBER(11,0) DEFAULT 0 NOT NULL,
+	Created		DATE,
+	LastUpdatedBy	NUMBER(11,0) DEFAULT 0 NOT NULL,
+	LastUpdated	DATE
+);
+
+CREATE INDEX CustomFieldValues1 ON CustomFieldValues (CustomField);
+
+CREATE TABLE sessions (
+	id		VARCHAR2(32) 
+		CONSTRAINT Sessions_Key PRIMARY KEY,
+	a_session	CLOB,
+	LastUpdated	DATE
+);
+
diff --git a/rt/etc/schema.Pg b/rt/etc/schema.Pg
index ba0d6fc6c..085c61595 100755
--- a/rt/etc/schema.Pg
+++ b/rt/etc/schema.Pg
@@ -3,9 +3,6 @@
 --
 ------------------------------------------------------------------
 
-BEGIN;
-
-
 
 
 --
@@ -93,6 +90,7 @@ CREATE TABLE Links (
 
 );
 CREATE UNIQUE INDEX Links1 ON Links (Base, Target, Type) ;
+CREATE INDEX Links4 ON Links(Type,LocalBase);
 
 -- }}}
 
@@ -136,7 +134,7 @@ CREATE TABLE Groups (
   Description varchar(255) NULL  ,
   Domain varchar(64),
   Type varchar(64),
-  Instance varchar(64),
+  Instance integer,
   PRIMARY KEY (id)
 
 );
@@ -192,7 +190,7 @@ CREATE TABLE Transactions (
   Field varchar(40) NULL  ,
   OldValue varchar(255) NULL  ,
   NewValue varchar(255) NULL  ,
-  Data varchar(100) NULL  ,
+  Data varchar(255) NULL  ,
 
   Creator integer NOT NULL DEFAULT 0  ,
   Created TIMESTAMP NULL  ,
@@ -500,6 +498,9 @@ CREATE TABLE TicketCustomFieldValues (
 
 );
 
+CREATE INDEX TicketCustomFieldValues1 ON TicketCustomFieldValues (CustomField,Ticket,Content); 
+CREATE INDEX TicketCustomFieldValues2 ON TicketCustomFieldValues (CustomField,Ticket); 
+
 -- }}}
 
 -- {{{ CustomFields
@@ -556,6 +557,8 @@ CREATE TABLE CustomFieldValues (
 
 );
 
+CREATE INDEX CustomFieldValues1 ON CustomFieldValues (CustomField);
+
 -- }}}
 
 -- {{{ Sessions
@@ -573,6 +576,3 @@ CREATE TABLE sessions (
 
 -- }}}
 
-
-
-COMMIT;
diff --git a/rt/etc/schema.SQLite b/rt/etc/schema.SQLite
index f24bdbdc1..b10ff46d1 100644
--- a/rt/etc/schema.SQLite
+++ b/rt/etc/schema.SQLite
@@ -58,6 +58,7 @@ CREATE TABLE Links (
   
 ) ;
 CREATE UNIQUE INDEX Links1 ON Links (Base, Target, Type) ;
+CREATE INDEX Links4 ON Links(Type,LocalBase);
 
 --- }}}
 
@@ -81,7 +82,7 @@ CREATE TABLE Groups (
   Description varchar(255) NULL  ,
   Domain varchar(64),
   Type varchar(64),
-  Instance varchar(64)
+  Instance integer
   
 ) ;
 
@@ -118,7 +119,7 @@ CREATE TABLE Transactions (
   Field varchar(40) NULL  ,
   OldValue varchar(255) NULL  ,
   NewValue varchar(255) NULL  ,
-  Data varchar(100) NULL  ,
+  Data varchar(255) NULL  ,
 
   Creator integer NULL  ,
   Created DATETIME NULL  
@@ -343,6 +344,9 @@ CREATE TABLE TicketCustomFieldValues (
   
 ) ;
 
+CREATE INDEX TicketCustomFieldValues1 ON TicketCustomFieldValues (CustomField,Ticket,Content); 
+CREATE INDEX TicketCustomFieldValues2 ON TicketCustomFieldValues (CustomField,Ticket); 
+
 --- }}}
 
 --- {{{ CustomFields
@@ -381,4 +385,6 @@ CREATE TABLE CustomFieldValues (
   
 ) ;
 
+CREATE INDEX CustomFieldValues1 ON CustomFieldValues (CustomField);
+
 --- }}}
diff --git a/rt/etc/schema.mysql b/rt/etc/schema.mysql
index 46f8ec562..14e92238f 100755
--- a/rt/etc/schema.mysql
+++ b/rt/etc/schema.mysql
@@ -62,6 +62,7 @@ CREATE TABLE Links (
 CREATE UNIQUE INDEX Links1 ON Links (Base, Target, Type) ;
 CREATE INDEX Links2 ON Links (Base,  Type) ;
 CREATE INDEX Links3 ON Links (Target,  Type) ;
+CREATE INDEX Links4 ON Links(Type,LocalBase);
 
 # }}}
 
@@ -87,7 +88,7 @@ CREATE TABLE Groups (
   Description varchar(255) NULL  ,
   Domain varchar(64),
   Type varchar(64),
-  Instance varchar(64),
+  Instance integer,
   PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
@@ -125,7 +126,7 @@ CREATE TABLE Transactions (
   Field varchar(40) NULL  ,
   OldValue varchar(255) NULL  ,
   NewValue varchar(255) NULL  ,
-  Data varchar(100) NULL  ,
+  Data varchar(255) NULL  ,
 
   Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
@@ -358,6 +359,9 @@ CREATE TABLE TicketCustomFieldValues (
   PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
+CREATE INDEX TicketCustomFieldValues1 ON TicketCustomFieldValues (CustomField,Ticket,Content); 
+CREATE INDEX TicketCustomFieldValues2 ON TicketCustomFieldValues (CustomField,Ticket); 
+
 # }}}
 
 # {{{ CustomFields
@@ -399,6 +403,8 @@ CREATE TABLE CustomFieldValues (
   PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
+CREATE INDEX CustomFieldValues1 ON CustomFieldValues (CustomField);
+ 
 # }}}
 
 # {{{ Sessions
diff --git a/rt/html/Admin/Elements/EditCustomField b/rt/html/Admin/Elements/EditCustomField
index a09600ba7..7baed168b 100644
--- a/rt/html/Admin/Elements/EditCustomField
+++ b/rt/html/Admin/Elements/EditCustomField
@@ -24,7 +24,7 @@
 <& /Elements/ListActions, actions => \@results &>
 
 
-<FORM METHOD=GET ACTION="CustomField.html">
+<FORM METHOD=POST ACTION="CustomField.html">
 <INPUT TYPE=HIDDEN NAME="CustomField" VALUE="<%$id %>">
 <INPUT TYPE=HIDDEN name="Queue" value="<%$Queue%>">
 
diff --git a/rt/html/Admin/Elements/EditCustomFieldValues b/rt/html/Admin/Elements/EditCustomFieldValues
index 64564adfb..2c9e6d082 100644
--- a/rt/html/Admin/Elements/EditCustomFieldValues
+++ b/rt/html/Admin/Elements/EditCustomFieldValues
@@ -25,7 +25,7 @@
 <ul>
 % while (my $v = $values->Next) {
 <li>
-<font size=-1 color="#336699"><%$v->SortOrder%>:</font>
+<INPUT TYPE="text" SIZE="2" NAME="CustomField-<%$CustomField->Id%>-SortOrder<%$v->Id()%>" VALUE="<%$v->SortOrder()%>">
 <input type="checkbox" name="CustomField-<%$CustomField->Id%>-DeleteValue" value="<%$v->id%>">
 <%$v->Name%>
 % if ($v->Description) {
diff --git a/rt/html/Admin/Elements/EditCustomFields b/rt/html/Admin/Elements/EditCustomFields
index a86b051d0..81c984d29 100644
--- a/rt/html/Admin/Elements/EditCustomFields
+++ b/rt/html/Admin/Elements/EditCustomFields
@@ -26,44 +26,43 @@
 <TABLE>
 <TR>
 <TD VALIGN=TOP>
-<%$caption%>:<BR>
+<h2><%$caption%></h2>
 </TD></TR></TABLE>
 % if ($CustomFields->Count == 0 ) {
 <P><i><&|/l&>(No custom fields)</&></i></P>
 % } else {
-<TABLE>
-
-<TR>
-<TD ROWSPAN="<% $CustomFields->Count %>">
-<UL>
-% while (my $CustomFieldObj = $CustomFields->Next) { 
-<LI><A HREF="CustomField.html?Queue=<%$id%>&CustomField=<%$CustomFieldObj->id()%>"><b><%$CustomFieldObj->Name%></b></a> (<% $CustomFieldObj->FriendlyType %>)<br>
-<%$CustomFieldObj->Description%>
-</LI>
-% }
-</UL>
-</TD>
-
+<TABLE cellspacing=0 cellpadding=2>
 % my $count;
 % while (my $CustomFieldObj = $CustomFields->Next) { 
+<TR>
+  <TD valign="TOP">
+% if ($CustomFieldObj->Name) {
+    <A HREF="CustomField.html?Queue=<%$id%>&CustomField=<%$CustomFieldObj->id()%>"><b><%$CustomFieldObj->Name%></b></a><br>
+% } else {
+    <A HREF="CustomField.html?Queue=<%$id%>&CustomField=<%$CustomFieldObj->id()%>"><i>(<%loc("no name")%>)</i></a><br>
+% }
+    <%$CustomFieldObj->Description%>
+  </TD>
+  <TD valign="TOP">
+    <i><% $CustomFieldObj->FriendlyType %></i>
+  </TD>
 %  # show 'move up' unless it's the first item
 %  if ($count++) {
-<TR><TD>
-<a href="CustomFields.html?id=<%$id%>&CustomField=<%$CustomFieldObj->id%>&Move=-1"><&|/l&>Move up</&></a>
+  <TD valign="TOP">
+    <a href="CustomFields.html?id=<%$id%>&CustomField=<%$CustomFieldObj->id%>&Move=-1"><&|/l&>Move up</&></a>
 %  } else {
-<TD ALIGN=RIGHT>
+  <TD valign="TOP" ALIGN=RIGHT>
 %  }
 
 %  # show 'move down' unless it's the last item
 %  if (!$CustomFields->IsLast) {
 %  $m->print(' | ') if $count > 1;
-<a href="CustomFields.html?id=<%$id%>&CustomField=<%$CustomFieldObj->id%>&Move=1"><&|/l&>Move down</&></a>
+    <a href="CustomFields.html?id=<%$id%>&CustomField=<%$CustomFieldObj->id%>&Move=1"><&|/l&>Move down</&></a>
 %  }
-</TD></TR>
-% }
-
 </TD>
 </TR>
+% }
+
 </TABLE>
 % }
 <FORM METHOD=GET ACTION="CustomFields.html">
diff --git a/rt/html/Admin/Elements/EditScrip b/rt/html/Admin/Elements/EditScrip
index 5393ebfde..1f186c233 100644
--- a/rt/html/Admin/Elements/EditScrip
+++ b/rt/html/Admin/Elements/EditScrip
@@ -77,6 +77,14 @@
 </TR>
 <TR>
 <TD ALIGN=RIGHT>
+<&|/l&>Stage</&>: 
+</TD>
+<TD>
+<& /Admin/Elements/SelectStage, Name => "Scrip-$id-Stage", Default => $scrip->Stage &>
+</TD>
+</TR>
+<TR>
+<TD ALIGN=RIGHT>
 <&|/l&>Template</&>: 
 </TD>
 <TD>
@@ -123,6 +131,7 @@ elsif ($id) {
       ScripAction
       ScripCondition
       Template
+      Stage
       Description
       CustomPrepareCode
       CustomCommitCode
diff --git a/rt/html/Admin/Elements/EditScrips b/rt/html/Admin/Elements/EditScrips
index 24515d8c1..07a57f47b 100644
--- a/rt/html/Admin/Elements/EditScrips
+++ b/rt/html/Admin/Elements/EditScrips
@@ -48,7 +48,9 @@
 </TABLE>
 
 % }
-<& /Elements/Submit &>
+<& /Elements/Submit, 
+	Caption => loc("Delete selected scrips"), 
+	Label => loc("Delete") &>
 </form>
 <%init>
 my (@actions);
diff --git a/rt/html/Admin/Elements/SelectGroups b/rt/html/Admin/Elements/SelectGroups
index 5df49ad04..3cc909b29 100644
--- a/rt/html/Admin/Elements/SelectGroups
+++ b/rt/html/Admin/Elements/SelectGroups
@@ -29,9 +29,10 @@
 
 <%INIT>
 my $groups = new RT::Groups($session{'CurrentUser'});
-$groups->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => 'System');
+$groups->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => $Domain);
 
 </%INIT>
 <%ARGS>
 $Name => 'groups'
+$Domain => 'UserDefined';
 </%ARGS>
diff --git a/rt/html/Admin/Elements/SelectRights b/rt/html/Admin/Elements/SelectRights
index 37a06dc4d..8d87ac9a1 100644
--- a/rt/html/Admin/Elements/SelectRights
+++ b/rt/html/Admin/Elements/SelectRights
@@ -24,7 +24,7 @@
 <INPUT TYPE=HIDDEN NAME="CheckACL"  VALUE="<%$ACLDesc%>">
      <TABLE BORDER=0>
 <TR>
-<TD valign=top width="180"> 
+<TD valign=top width="180" align="left"> 
 <h3><&|/l&>Current rights</&></h3>
 % if ($ACLObj->Count() > 0) {
 <i>(<&|/l&>Check box to revoke right</&>)</i> <BR>
@@ -71,6 +71,7 @@
 
     $ACLObj->LimitToObject( $Object);
     $ACLObj->LimitToPrincipal( Id => $PrincipalId);
+    $ACLObj->OrderBy(FIELD=>'RightName'); 
 
     if (ref($Object) && UNIVERSAL::can($Object, 'AvailableRights')) { 
         %Rights = %{$Object->AvailableRights};
diff --git a/rt/html/Admin/Elements/SelectStage b/rt/html/Admin/Elements/SelectStage
new file mode 100644
index 000000000..b62964be4
--- /dev/null
+++ b/rt/html/Admin/Elements/SelectStage
@@ -0,0 +1,39 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME=<%$Name%>>
+% foreach my $stage (qw(TransactionCreate TransactionBatch)) {
+<OPTION VALUE=<%$stage%>
+<% ($stage eq $Default) && 'SELECTED' %>
+><% loc($stage) %>
+</OPTION>
+% }
+<%INIT>
+if ($Default eq '') {
+    $Default = 'TransactionCreate';
+}
+</%INIT>
+<%ARGS>
+$Default => 'TransactionCreate'
+$Name => 'Stage'
+</%ARGS>
diff --git a/rt/html/Admin/Queues/CustomFields.html b/rt/html/Admin/Queues/CustomFields.html
index 78c6c2790..ddf39d71a 100644
--- a/rt/html/Admin/Queues/CustomFields.html
+++ b/rt/html/Admin/Queues/CustomFields.html
@@ -32,7 +32,8 @@
 <& /Admin/Elements/EditCustomFields, title => $title, %ARGS &>
 <%INIT>
 my $Queue = new RT::Queue($session{'CurrentUser'});
-$Queue->Load($id);
+$Queue->Load($id) || Abort(loc("Couldn't load queue", $id));
+
 my $CustomFields = RT::CustomFields->new($RT::SystemUser);
 $CustomFields->LimitToQueue($Queue->Id);
 my $subtabs = {
diff --git a/rt/html/Admin/Queues/index.html b/rt/html/Admin/Queues/index.html
index f733c25d8..78a1d5d2d 100644
--- a/rt/html/Admin/Queues/index.html
+++ b/rt/html/Admin/Queues/index.html
@@ -38,7 +38,7 @@
 %}
 </UL>
 <BR>
-<FORM METHOD=POST ACTION="<% $RT::WebPath %>/Admin/Queues/">
+<FORM METHOD=POST ACTION="<% $RT::WebPath %>/Admin/Queues/index.html">
 <input type="checkbox" name="FindDisabledQueues"> <&|/l&>Include disabled queues in listing.</&>
 <div align=right><input type=submit value="<&|/l&>Go!</&>"></div> 
 </FORM>
diff --git a/rt/html/Admin/Users/Modify.html b/rt/html/Admin/Users/Modify.html
index 370c2e82d..b424ae961 100644
--- a/rt/html/Admin/Users/Modify.html
+++ b/rt/html/Admin/Users/Modify.html
@@ -224,9 +224,11 @@ else {
 	} else {
 		push @results, loc('User could not be created: [_1]', $msg);
 	}	
-	
-    }
-    else {
+
+	# set the id, so the the menu will have the right info
+	$id = $UserObj->Id;	
+
+    } else {
 	$UserObj->Load($id) || $UserObj->Load($Name) || Abort("Couldn't load user '$Name'");
 	$val = $UserObj->Id();
     }
diff --git a/rt/html/Admin/Users/index.html b/rt/html/Admin/Users/index.html
index a95d4117d..7dc9af6c3 100644
--- a/rt/html/Admin/Users/index.html
+++ b/rt/html/Admin/Users/index.html
@@ -40,7 +40,7 @@
 
 </UL>
 <br><br>
-<FORM METHOD=POST ACTION="<% $RT::WebPath %>/Admin/Users/">
+<FORM METHOD=POST ACTION="<% $RT::WebPath %>/Admin/Users/index.html">
 
 <&|/l&>Find people whose</&> <& /Elements/SelectUsers &><BR>
 <input type="checkbox" name="FindDisabledUsers"> <&|/l&>Include disabled users in search.</&>
diff --git a/rt/html/Approvals/Display.html b/rt/html/Approvals/Display.html
index 921c1e38f..6a265e242 100644
--- a/rt/html/Approvals/Display.html
+++ b/rt/html/Approvals/Display.html
@@ -26,7 +26,7 @@
 <& Elements/Tabs, 
     current_tab => "Approvals/Display.html", 
     Title =>  $title &>
-<form method=post action="<%$RT::WebPath%>/Approvals/">
+<form method=post action="<%$RT::WebPath%>/Approvals/index.html">
 
 <& /Elements/TitleBoxStart, title => $title &>
 <& /Ticket/Elements/ShowHistory , Ticket => $Ticket, Collapsed => 0, ShowTitle => 0, ShowHeaders => 0, ShowDisplayModes => 0, ShowTitleBarCommands => 0 &>
diff --git a/rt/html/Elements/Callback b/rt/html/Elements/Callback
index 93ac4c01b..79157e751 100644
--- a/rt/html/Elements/Callback
+++ b/rt/html/Elements/Callback
@@ -54,10 +54,11 @@ if (!$callbacks) {
     $cache{$Page,$_CallbackName} = $callbacks;
 }
 
-foreach my $comp (@$callbacks) {
-        $m->comp($comp, %ARGS) if $m->comp_exists($comp);
+my @rv;
+foreach my $comp (sort @$callbacks) {
+        push @rv, $m->comp($comp, %ARGS) if $m->comp_exists($comp);
 }
-return(1);
+return @rv;
 </%init>
 <%args>
 $_CallbackName => 'Default'
diff --git a/rt/html/Elements/MessageBox b/rt/html/Elements/MessageBox
index 64fdf38b7..32f422206 100644
--- a/rt/html/Elements/MessageBox
+++ b/rt/html/Elements/MessageBox
@@ -21,7 +21,7 @@
 %# 
 %# 
 %# END LICENSE BLOCK
-<TEXTAREA COLS=<%$Width%> ROWS=15 WRAP=HARD NAME="<%$Name%>"><& /Elements/Callback, %ARGS &><% $Default %><%$message%><%$signature%></TEXTAREA>
+<TEXTAREA COLS=<%$Width%> ROWS=15 WRAP=<%$Wrap%> NAME="<%$Name%>"><& /Elements/Callback, %ARGS &><% $Default %><%$message%><%$IncludeSignature ? $signature : ''%></TEXTAREA>
 <%INIT>
 
 my ($message);
@@ -42,6 +42,8 @@ if ($session{'CurrentUser'}->UserObj->Signature) {
 $QuoteTransaction => undef
 $Name => 'Content'
 $Default => ''
-$Width => 72
+$Width => $RT::MessageBoxWidth
+$Wrap => $RT::MessageBoxWrap
+$IncludeSignature => 1
 </%ARGS>
 
diff --git a/rt/html/Elements/MyTickets b/rt/html/Elements/MyTickets
index 6e2ddc6c3..52dae3b8d 100644
--- a/rt/html/Elements/MyTickets
+++ b/rt/html/Elements/MyTickets
@@ -69,7 +69,7 @@
 
 
 <%INIT>
-my $rows = 10;
+my $rows = $RT::MyTicketsLength;
 my $MyTickets;
 $MyTickets = new RT::Tickets ($session{'CurrentUser'});
 $MyTickets->LimitOwner(VALUE => $session{'CurrentUser'}->Id);
diff --git a/rt/html/Elements/SelectLang b/rt/html/Elements/SelectLang
new file mode 100644
index 000000000..cc2c357e0
--- /dev/null
+++ b/rt/html/Elements/SelectLang
@@ -0,0 +1,56 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<SELECT NAME ="<%$Name%>">
+% if ($ShowNullOption) {
+<OPTION VALUE="">-</OPTION>
+% }
+% foreach my $lang (@lang) {
+<OPTION VALUE="<%$lang%>" <%($Default && ($lang eq $Default)) && 'SELECTED'%>><% $lang_to_desc{$lang} %>
+%   if (($Verbose) and (my $description = I18N::LangTags::List::native_name($lang)) ){
+(<%$description%>)
+%  }
+</OPTION>
+% }
+</SELECT>
+<%ARGS>
+$ShowNullOption => 1
+$ShowAllQueues => 1
+$Name => undef
+$Verbose => undef
+$Default => 0
+$Lite => 0
+</%ARGS>
+
+<%ONCE>
+use I18N::LangTags::List;
+my (@lang, %lang_to_desc);
+foreach my $lang (map { s/:://; s/_/-/g; $_ } grep { /^\w+::$/ } keys %RT::I18N::) {
+    next if $lang =~ /i-default|en-us/;
+    my $desc = I18N::LangTags::List::name($lang);
+    next unless ($desc);
+    $desc =~ s/(.*) (.*)/$2 ($1)/;
+    $lang_to_desc{$lang} = $desc;
+}
+@lang = sort { $lang_to_desc{$a} cmp $lang_to_desc{$b} } keys %lang_to_desc;
+</%ONCE>
diff --git a/rt/html/Elements/SelectStatus b/rt/html/Elements/SelectStatus
index 2c1ffad39..16a5f2995 100644
--- a/rt/html/Elements/SelectStatus
+++ b/rt/html/Elements/SelectStatus
@@ -24,6 +24,7 @@
 <SELECT NAME ="<%$Name%>">
 <OPTION VALUE="">-</OPTION>
 %foreach my $status (@status) {
+%next if ($SkipDeleted && $status eq 'deleted');
 <OPTION VALUE="<%$status%>" <%($Default eq $status) && 'SELECTED'%>><%loc($status)%></OPTION>
 % }
 </SELECT>
@@ -34,4 +35,5 @@ my @status = $queue->StatusArray();
 <%ARGS>
 $Name => undef
 $Default => undef
+$SkipDeleted => 0
 </%ARGS>
diff --git a/rt/html/Elements/SelectWatcherType b/rt/html/Elements/SelectWatcherType
index 26de8f7b9..82aab2a85 100644
--- a/rt/html/Elements/SelectWatcherType
+++ b/rt/html/Elements/SelectWatcherType
@@ -22,7 +22,9 @@
 %# 
 %# END LICENSE BLOCK
 <SELECT NAME ="<%$Name%>">
+% if ($AllowNull) {
 <OPTION VALUE="">-</OPTION>
+% }
 %for my $option (@types) {
 <OPTION VALUE="<%$option%>" <%$option eq $Default && "SELECTED"%>><%loc($option)%></OPTION>
 %}
@@ -38,6 +40,7 @@ else {
 }
 </%INIT>
 <%ARGS>
+$AllowNull => 1
 $Default=>undef
 $Scope => 'ticket'
 $Name => 'WatcherType'
diff --git a/rt/html/Elements/SetupSessionCookie b/rt/html/Elements/SetupSessionCookie
index 4d728ce70..7a2ad9ff5 100644
--- a/rt/html/Elements/SetupSessionCookie
+++ b/rt/html/Elements/SetupSessionCookie
@@ -22,18 +22,25 @@
 %# 
 %# END LICENSE BLOCK
 <%init>
+return if $m->is_subrequest; # avoid reentrancy, as suggested by masonbook
+
 my %cookies = CGI::Cookie->fetch();
+my $cookiename = "RT_SID_".$RT::rtname.".".$ENV{'SERVER_PORT'};
 my %backends = (
     mysql	=> 'Apache::Session::MySQL',
     Pg		=> 'Apache::Session::Postgres',
-    Oracle	=> 'Apache::Session::Oracle',
+#    Oracle	=> 'Apache::Session::Oracle',
 ) unless $RT::WebSessionClass;
 my $session_class = $RT::WebSessionClass || $backends{$RT::DatabaseType} || 'Apache::Session::File';
 my $pm = "$session_class.pm"; $pm =~ s|::|/|g; require $pm;
 
+    # morning bug avoidance attempt -- pdh 20030815
+    unless ($RT::Handle->dbh && $RT::Handle->dbh->ping) {
+        $RT::Handle->Connect();
+    }
     eval {
         tie %session, $session_class,
-          $SessionCookie || ( $cookies{'RT_SID'} ? $cookies{'RT_SID'}->value() : undef ),
+          $SessionCookie || ( $cookies{$cookiename} ? $cookies{$cookiename}->value() : undef ),
           $backends{$RT::DatabaseType} ? {
             Handle     => $RT::Handle->dbh,
             LockHandle => $RT::Handle->dbh,
@@ -54,22 +61,23 @@ my $pm = "$session_class.pm"; $pm =~ s|::|/|g; require $pm;
                 Directory     => $RT::MasonSessionDir,
                 LockDirectory => $RT::MasonSessionDir,
               };
-            undef $cookies{'RT_SID'};
+            undef $cookies{$cookiename};
         }
         else {
             die "RT Couldn't write to session directory '$RT::MasonSessionDir': $@. Check that this dir ectory's permissions are correct.";
         }
     }
 
-    if ( !$cookies{'RT_SID'} ) {
+    if ( !$cookies{$cookiename} ) {
         my $cookie = new CGI::Cookie(
-            -name  => 'RT_SID',
+            -name  => $cookiename,
             -value => $session{_session_id},
             -path  => '/',
         );
         $r->header_out('Set-Cookie', $cookie->as_string);
 
     } 
+
     return();
 </%init>
 <%args>
diff --git a/rt/html/Elements/SimpleSearch b/rt/html/Elements/SimpleSearch
index 69541f801..4a0d10656 100644
--- a/rt/html/Elements/SimpleSearch
+++ b/rt/html/Elements/SimpleSearch
@@ -22,6 +22,6 @@
 %# 
 %# END LICENSE BLOCK
 <form action="<% $RT::WebPath %>/index.html">
-<input size="12" name="q" accesskey="0">
+<input size="12" name="q" autocomplete="off" accesskey="0">
 <input type="submit" value="<&|/l&>Search</&>">&nbsp;
 </form>
diff --git a/rt/html/NoAuth/webrt.css b/rt/html/NoAuth/webrt.css
index 62c6d66ba..159e79cd6 100644
--- a/rt/html/NoAuth/webrt.css
+++ b/rt/html/NoAuth/webrt.css
@@ -331,7 +331,9 @@ ul.topnav {
 	margin-bottom:0;
 }
 
-
+<%flags>
+inherit => undef
+</%flags>
 <%init>
 $r->content_type('text/css');
 $r->header_out('Expires' ,'+30m');
diff --git a/rt/html/REST/1.0/Forms/queue/default b/rt/html/REST/1.0/Forms/queue/default
new file mode 100644
index 000000000..ce5408846
--- /dev/null
+++ b/rt/html/REST/1.0/Forms/queue/default
@@ -0,0 +1,123 @@
+%# REST/1.0/Forms/queue/default
+%#
+<%ARGS>
+$id
+$format => 's'
+$changes => {}
+</%ARGS>
+<%perl>
+my @comments;
+my ($c, $o, $k, $e) = ("", [], {}, 0);
+my %data = %$changes;
+my $queue = new RT::Queue $session{CurrentUser};
+my @fields = qw(Name Description CorrespondAddress CommentAddress
+                InitialPriority FinalPriority DefaultDueIn);
+my %fields = map { lc $_ => $_ } @fields;
+
+if ($id ne 'new') {
+    $queue->Load($id);
+    if (!$queue->Id) {
+        return [ "# Queue $id does not exist.", [], {}, 1 ];
+    }
+}
+else {
+    if (%data == 0) {
+        return [
+            "# Required: Name",
+            [ "id", @fields ],
+            {
+                id => 'queue/new',
+                Name => '<queue name>',
+                Description => "",
+                CommentAddress => "",
+                CorrespondAddress => "",
+                InitialPriority => "",
+                FinalPriority => "",
+                DefaultDueIn => "",
+            },
+            0
+        ];
+    }
+    else {
+        my %v;
+        my %create = %fields;
+
+        foreach my $k (keys %data) {
+            if (exists $create{lc $k}) {
+                $v{$create{lc $k}} = delete $data{$k};
+            }
+        }
+
+        if ($v{Name} eq '<queue name>') {
+            my %o = keys %$changes;
+            delete @o{"id", @fields};
+            return [
+                "# Please set the queue name.",
+                [ "id", @fields, keys %o ], $changes, 1
+            ];
+        }
+
+        $queue->Create(%v);
+        unless ($queue->Id) {
+            return [ "# Could not create queue.", [], {}, 1 ];
+        }
+
+        delete $data{id};
+        $id = $queue->Id;
+        push(@comments, "# Queue $id created.");
+        goto DONE if %data == 0;
+    }
+}
+
+if (%data == 0) {
+    my @data;
+
+    push @data, [ id => "queue/".$queue->Id ];
+    foreach my $key (@fields) {
+        push @data, [ $key => $queue->$key ];
+    }
+
+    my %k = map {@$_} @data;
+    $o = [ map {$_->[0]} @data ];
+    $k = \%k;
+}
+else {
+    my ($get, $set, $key, $val, $n, $s);
+
+    foreach $key (keys %data) {
+        $val = $data{$key};
+        $key = lc $key;
+        $n = 1;
+
+        if (exists $fields{$key}) {
+            $key = $fields{$key};
+            $set = "Set$key";
+
+            next if $val eq $queue->$key;
+            ($n, $s) = $queue->$set($val);
+        }
+        elsif ($key ne 'id') {
+            $n = 0;
+            $s = "Unknown field.";
+        }
+
+    SET:
+        if ($n == 0) {
+            $e = 1;
+            push @comments, "# $key: $s";
+            unless (@$o) {
+                my %o = keys %$changes;
+                delete @o{"id", @fields};
+                @$o = ("id", @fields, keys %o);
+                $k = $changes;
+            }
+        }
+    }
+
+    push(@comments, "# Queue $id updated.") unless $n == 0;
+}
+
+DONE:
+$c ||= join("\n", @comments) if @comments;
+return [ $c, $o, $k, $e ];
+</%perl>
diff --git a/rt/html/REST/1.0/Forms/queue/ns b/rt/html/REST/1.0/Forms/queue/ns
new file mode 100644
index 000000000..360eea86b
--- /dev/null
+++ b/rt/html/REST/1.0/Forms/queue/ns
@@ -0,0 +1,38 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%# REST/1.0/Forms/queue/ns
+%#
+<%ARGS>
+$id
+</%ARGS>
+<%perl>
+use RT::Queues;
+
+my $queues = new RT::Queues $session{CurrentUser};
+$queues->Limit(FIELD => 'Name', OPERATOR => '=', VALUE => $id);
+if ($queues->Count == 0) {
+    return (0, "No queue named $id exists.");
+}
+return $queues->Next->Id;
+</%perl>
diff --git a/rt/html/REST/1.0/Forms/ticket/attachments b/rt/html/REST/1.0/Forms/ticket/attachments
new file mode 100644
index 000000000..bcb571a5a
--- /dev/null
+++ b/rt/html/REST/1.0/Forms/ticket/attachments
@@ -0,0 +1,107 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%# REST/1.0/Forms/ticket/attachments
+%#
+<%ARGS>
+$id
+$args => undef
+</%ARGS>
+<%perl>
+my @data;
+my ($c, $o, $k, $e) = ("", [], {}, "");
+my $ticket = new RT::Ticket $session{CurrentUser};
+
+$ticket->Load($id);
+unless ($ticket->Id) {
+    return [ "# Ticket $id does not exist.", [], {}, 1 ];
+}
+
+my @arglist = split('/', $args);
+my ($aid, $content);
+
+if ($arglist[1] eq 'content') {
+    $aid = $arglist[0];
+    $content = 1;
+} else {
+    $aid = $args;
+    $content = 0;
+}
+
+if ($aid) {
+    unless ($aid =~ /^\d+$/) {
+        return [ "# Invalid attachment id: $aid", [], {}, 1 ];
+    }
+    my $attachment = new RT::Attachment $session{CurrentUser};
+    $attachment->Load($aid);
+    unless ($attachment->Id eq $aid) {
+        return [ "# Invalid attachment id: $aid", [], {}, 1 ];
+    }
+    if ($content) {
+	$c = $attachment->Content;
+    } else {
+	my @data;
+	push @data, [ id    => $attachment->Id   ];
+	push @data, [ Subject    => $attachment->Subject   ];
+	push @data, [ Creator    => $attachment->Creator   ];
+	push @data, [ Created    => $attachment->Created   ];
+	push @data, [ Transaction    => $attachment->TransactionId   ];
+	push @data, [ Parent    => $attachment->Parent   ];
+	push @data, [ MessageId    => $attachment->MessageId   ];
+	push @data, [ Filename    => $attachment->Filename   ];
+	push @data, [ ContentType    => $attachment->ContentType   ];
+	push @data, [ ContentEncoding    => $attachment->ContentEncoding   ];
+	push @data, [ Headers    => $attachment->Headers   ];
+	push @data, [ Content    => $attachment->Content   ];
+
+	my %k = map {@$_} @data;
+	$o = [ map {$_->[0]} @data ];
+	$k = \%k;
+    }
+
+}
+else {
+    my @attachments;
+    my $transactions = $ticket->Transactions;
+    while (my $t = $transactions->Next) {
+        my $attachments = $t->Attachments;
+        while (my $a = $attachments->Next) {
+            next unless $a->Filename;
+            my $size = length($a->Content);
+            if ($size > 1024) { $size  = int($size/102.4)/10 . "k" }
+            else              { $size .= "b" }
+            push @attachments, $a->Id.": ".$a->Filename." (".$size.")";
+        }
+    }
+
+    if (@attachments) {
+        $o = [ "id", "Attachments" ];
+        $k = {
+            id => "ticket/".$ticket->Id."/attachments",
+            Attachments => \@attachments
+        };
+    }
+}
+
+return [ $c, $o, $k, $e ];
+</%perl>
diff --git a/rt/html/REST/1.0/Forms/ticket/default b/rt/html/REST/1.0/Forms/ticket/default
new file mode 100644
index 000000000..fec499b58
--- /dev/null
+++ b/rt/html/REST/1.0/Forms/ticket/default
@@ -0,0 +1,253 @@
+%# REST/1.0/Forms/ticket/default
+%#
+<%ARGS>
+$id
+$changes => {}
+$fields => undef
+</%ARGS>
+<%perl>
+use MIME::Entity;
+
+my @comments;
+my ($c, $o, $k, $e) = ("", [], {}, 0);
+my %data   = %$changes;
+my $ticket = new RT::Ticket $session{CurrentUser};
+my @dates  = qw(Created Starts Started Due Resolved Told);
+my @people = qw(Requestors Cc AdminCc);
+my @create = qw(Queue Requestor Subject Cc AdminCc Owner Status Priority
+                InitialPriority FinalPriority TimeEstimated TimeWorked
+                TimeLeft Starts Started Due Resolved);
+my @simple = qw(Subject Status Priority Disabled TimeEstimated TimeWorked
+                TimeLeft InitialPriority FinalPriority);
+my %dates  = map {lc $_ => $_} @dates;
+my %people = map {lc $_ => $_} @people;
+my %create = map {lc $_ => $_} @create;
+my %simple = map {lc $_ => $_} @simple;
+
+# Are we dealing with an existing ticket?
+if ($id ne 'new') {
+    $ticket->Load($id);
+    if (!$ticket->Id) {
+        return [ "# Ticket $id does not exist.", [], {}, 1 ];
+    }
+    elsif (!$ticket->CurrentUserHasRight('ShowTicket') ||
+           (%data && !$ticket->CurrentUserHasRight('ModifyTicket')))
+    {
+        my $act = %data ? "modify" : "display";
+        return [ "# You are not allowed to $act ticket $id.", [], {}, 1 ];
+    }
+}
+else {
+    if (%data == 0) {
+        # GET ticket/new: Return a suitable default form.
+        # We get defaults from queue/1 (XXX: What if it isn't there?).
+        my $due = new RT::Date $session{CurrentUser};
+        my $queue = new RT::Queue $session{CurrentUser};
+        my $starts = new RT::Date $session{CurrentUser};
+        $queue->Load(1);
+        $due->SetToNow;
+        $due->AddDays($queue->DefaultDueIn) if $queue->DefaultDueIn;
+        $starts->SetToNow;
+
+        return [
+            "# Required: Queue, Requestor, Subject",
+            [ qw(id Queue Requestor Subject Cc AdminCc Owner Status Priority
+                 InitialPriority FinalPriority TimeEstimated Starts Due Text) ],
+            {
+                id               => "ticket/new",
+                Queue            => $queue->Name,
+                Requestor        => $session{CurrentUser}->Name,
+                Subject          => "",
+                Cc               => [],
+                AdminCc          => [],
+                Owner            => "",
+                Status           => "new",
+                Priority         => $queue->InitialPriority,
+                InitialPriority  => $queue->InitialPriority,
+                FinalPriority    => $queue->FinalPriority,
+                TimeEstimated    => 0,
+                Starts           => $starts->ISO,
+                Due              => $due->ISO,
+                Text             => "",
+            },
+            0
+        ];
+    }
+    else {
+        # We'll create a new ticket, and fall through to set fields that
+        # can't be set in the call to Create().
+        my (%v, $text);
+
+        foreach my $k (keys %data) {
+            if (exists $create{lc $k}) {
+                $v{$create{lc $k}} = delete $data{$k};
+            }
+            elsif (lc $k eq 'text') {
+                $text = delete $data{$k};
+            }
+        }
+
+        if ($text) {
+            $v{MIMEObj} =
+                MIME::Entity->build(
+                    From => $session{CurrentUser}->EmailAddress,
+                    Subject => $v{Subject},
+                    Data => $text
+                );
+        }
+
+        $ticket->Create(%v);
+        unless ($ticket->Id) {
+            return [ "# Could not create ticket.", [], {}, 1 ];
+        }
+
+        delete $data{id};
+        $id = $ticket->Id;
+        push(@comments, "# Ticket $id created.");
+        goto DONE if %data == 0;
+    }
+}
+
+# Now we know we're dealing with an existing ticket.
+if (%data == 0) {
+    my ($time, $key, $val, @data);
+
+    push @data, [ id    => "ticket/".$ticket->Id   ];
+    push @data, [ Queue => $ticket->QueueObj->Name ] 
+	if (!%$fields || exists $fields->{lc 'Queue'});
+    push @data, [ Owner => $ticket->OwnerObj->Name ]
+	if (!%$fields || exists $fields->{lc 'Owner'});
+    push @data, [ Creator => $ticket->CreatorObj->Name ]
+	if (!%$fields || exists $fields->{lc 'Creator'});
+
+    foreach (qw(Subject Status Priority InitialPriority FinalPriority)) {
+	next unless (!%$fields || (exists $fields->{lc $_}));
+        push @data, [$_ => $ticket->$_ ];
+    }
+
+    foreach $key (@people) {
+	next unless (!%$fields || (exists $fields->{lc $key}));
+        push @data, [ $key => [ $ticket->$key->MemberEmailAddresses ] ];
+    }
+
+    $time = new RT::Date ($session{CurrentUser});
+    foreach $key (@dates) {
+	next unless (!%$fields || (exists $fields->{lc $key}));
+        $time->Set(Format => 'sql', Value => $ticket->$key);
+        push @data, [ $key => $time->AsString ];
+    }
+
+    $time = new RT::Date ($session{CurrentUser});
+    foreach $key (qw(TimeEstimated TimeWorked TimeLeft)) {
+	next unless (!%$fields || (exists $fields->{lc $key}));
+        $val = $ticket->$key || 0;
+        $val = $time->DurationAsString($val*60) if $val;
+        push @data, [ $key => $val ];
+    }
+
+    my %k = map {@$_} @data;
+    $o = [ map {$_->[0]} @data ];
+    $k = \%k;
+}
+else {
+    my ($get, $set, $key, $val, $n, $s);
+
+    foreach $key (keys %data) {
+        $val = $data{$key};
+        $key = lc $key;
+        $n = 1;
+
+        if (ref $val eq 'ARRAY') {
+            unless ($key =~ /^(?:Requestors|Cc|AdminCc)$/i) {
+                $n = 0;
+                $s = "$key may have only one value.";
+                goto SET;
+            }
+        }
+
+        if ($key =~ /^queue$/i) {
+            next if $val eq $ticket->QueueObj->Name;
+            ($n, $s) = $ticket->SetQueue($val);
+        }
+        elsif ($key =~ /^owner$/i) {
+            next if $val eq $ticket->OwnerObj->Name;
+            ($n, $s) = $ticket->SetOwner($val);
+        }
+        elsif (exists $simple{$key}) {
+            $key = $simple{$key};
+            $set = "Set$key";
+
+            next if $val eq $ticket->$key;
+            ($n, $s) = $ticket->$set($val);
+        }
+        elsif (exists $dates{$key}) {
+            $key = $dates{$key};
+            $set = "Set$key";
+
+            my $time = new RT::Date $session{CurrentUser};
+            $time->Set(Format => 'sql', Value => $ticket->$key);
+            next if ($val =~ /^not set$/i || $val eq $time->AsString);
+            ($n, $s) = $ticket->$set($val);
+        }
+        elsif (exists $people{$key}) {
+            $key = $people{$key};
+            my ($p, @msgs);
+
+            my %new  = map {$_=>1} @{ vsplit($val) };
+            my %old  = map {$_=>1} $ticket->$key->MemberEmailAddresses;
+            my $type = $key eq 'Requestors' ? 'Requestor' : $key;
+
+            foreach $p (keys %old) {
+                unless (exists $new{$p}) {
+                    ($s, $n) = $ticket->DeleteWatcher(Type => $type,
+                                                      Email => $p);
+                    push @msgs, [ $s, $n ];
+                }
+            }
+            foreach $p (keys %new) {
+                # XXX: This is a stupid test.
+                unless ($p =~ /^[\w.+-]+\@([\w.-]+\.)*\w+.?$/) {
+                    $s = 0;
+                    $n = "$p is not a valid email address.";
+                    push @msgs, [ $s, $n ];
+                    next;
+                }
+                unless ($ticket->IsWatcher(Type => $type, Email => $p)) {
+                    ($s, $n) = $ticket->AddWatcher(Type => $type,
+                                                   Email => $p);
+                    push @msgs, [ $s, $n ];
+                }
+            }
+
+            $n = 1;
+            if (@msgs = grep {$_->[0] == 0} @msgs) {
+                $n = 0;
+                $s = join "\n", map {"# ".$_->[1]} @msgs;
+                $s =~ s/^# //;
+            }
+        }
+        elsif ($key ne 'id' && $key ne 'type') {
+            $n = 0;
+            $s = "Unknown field.";
+        }
+
+    SET:
+        if ($n == 0) {
+            $e = 1;
+            push @comments, "# $key: $s";
+            unless (@$o) {
+                my %o = keys %$changes;
+                delete $o{id};
+                @$o = ("id", keys %o);
+                $k = $changes;
+            }
+        }
+    }
+    push(@comments, "# Ticket ".$ticket->id." updated.") unless $n == 0;
+}
+
+DONE:
+$c ||= join("\n", @comments) if @comments;
+return [$c, $o, $k, $e];
+
+</%perl>
diff --git a/rt/html/REST/1.0/Forms/ticket/history b/rt/html/REST/1.0/Forms/ticket/history
new file mode 100644
index 000000000..f5c1dc990
--- /dev/null
+++ b/rt/html/REST/1.0/Forms/ticket/history
@@ -0,0 +1,144 @@
+%# REST/1.0/Forms/ticket/history
+%#
+<%ARGS>
+$id
+$args => undef
+$format => undef
+$fields => undef
+</%ARGS>
+<%perl>
+my $ticket = new RT::Ticket $session{CurrentUser};
+my ($c, $o, $k, $e) = ("", [], {}, "");
+
+$ticket->Load($id);
+unless ($ticket->Id) {
+    return [ "# Ticket $id does not exist.", [], {}, 1 ];
+}
+
+my $trans = $ticket->Transactions();
+my $total = $trans->Count();
+
+chomp $args;
+my @arglist = split('/', $args);
+my ($type, $tid);
+
+if ($arglist[0] eq 'type') {
+    $type = $arglist[1];
+} elsif ($arglist[0] eq 'id') {
+    $tid = $arglist[1];
+} else {
+    $type = $args;
+}
+
+if ($type) {
+    # Create, Set, Status, Correspond, Comment, Give, Steal, Take, Told
+    # CustomField, AddLink, DeleteLink, AddWatcher, DelWatcher
+    if ($args =~ /^links?$/) {
+        $trans->Limit(FIELD => 'Type', OPERATOR => 'LIKE', VALUE => '%Link');
+    }
+    elsif ($args =~ /^watchers?$/) {
+        $trans->Limit(FIELD => 'Type', OPERATOR => 'LIKE', VALUE => '%Watcher');
+    }
+    else {
+        $trans->Limit(FIELD => 'Type', OPERATOR => '=', VALUE => $type);
+    }
+} elsif ($tid) {
+    $trans->Limit(FIELD => 'Id', OPERATOR => '=', VALUE => $tid);
+}
+
+if ($tid) {
+    my @data;
+    my $t = new RT::Transaction $session{CurrentUser};
+    $t->Load($tid);
+
+    push @data, [ id    => $t->Id   ];
+    push @data, [ EffectiveTicket    => $t->EffectiveTicket   ]
+	if (!%$fields || exists $fields->{lc 'EffectiveTicket'});
+    push @data, [ Ticket    => $t->Ticket   ]
+	if (!%$fields || exists $fields->{lc 'Ticket'});
+    push @data, [ TimeTaken    => $t->TimeTaken   ]
+	if (!%$fields || exists $fields->{lc 'TimeTaken'});
+    push @data, [ Type    => $t->Type   ]
+	if (!%$fields || exists $fields->{lc 'Type'});
+    push @data, [ Field    => $t->Field   ]
+	if (!%$fields || exists $fields->{lc 'Field'});
+    push @data, [ OldValue    => $t->OldValue   ]
+	if (!%$fields || exists $fields->{lc 'OldValue'});
+    push @data, [ NewValue    => $t->NewValue   ]
+	if (!%$fields || exists $fields->{lc 'NewValue'});
+    push @data, [ Data    => $t->Data   ]
+	if (!%$fields || exists $fields->{lc 'Data'});
+    push @data, [ Description    => $t->Description   ]
+	if (!%$fields || exists $fields->{lc 'Description'});
+    push @data, [ Content    => $t->Content   ]
+	if (!%$fields || exists $fields->{lc 'Content'});
+
+
+    if (!%$fields || exists $fields->{lc 'Content'}) {    
+	my $creator = new RT::User $session{CurrentUser};
+	$creator->Load($t->Creator);
+	push @data, [ Creator    => $creator->Name   ];
+    }
+    push @data, [ Created    => $t->Created   ]
+	if (!%$fields || exists $fields->{lc 'Created'});
+
+    if (!%$fields || exists $fields->{lc 'Attachments'}) {
+	my $attachlist;
+	my $attachments = $t->Attachments;
+	while (my $a = $attachments->Next) {
+	    my $size = length($a->Content);
+	    if ($size > 1024) { $size  = int($size/102.4)/10 . "k" }
+	    else              { $size .= "b" }
+	    $attachlist .= "\n" . $a->Id.": ".($a->Filename || "untitled")." (".$size.")";
+	}
+	
+	push @data, [Attachments => $attachlist];
+    }
+
+    my %k = map {@$_} @data;
+    $o = [ map {$_->[0]} @data ];
+    $k = \%k;
+
+} else {
+    my (@data, $tids);
+    $format ||= "s";
+    $format = "l" if (%$fields);
+
+    while (my $t = $trans->Next) {
+	my $tid = $t->Id;
+
+	if ($format eq "l") {
+	    $tids .= "," if $tids;
+	    $tids .= $tid;
+	} else {
+	    push @$o, $tid;
+	    $k->{$tid} = $t->Description;
+	}
+    }
+
+    if ($format eq "l") {
+	my @tid;
+	push @tid, "ticket/$id/history/id/$tids";
+	my $fieldstring;
+	foreach my $key (keys %$fields) {
+	    $fieldstring .= "," if $fieldstring;
+	    $fieldstring .= $key;
+	}
+	my ($content, $forms);
+
+	$m->subexec("$RT::WebPath/REST/1.0/show", 
+		    id => \@tid, 
+		    format => $format,
+                    fields => $fieldstring);
+	return [ $c, $o, $k, $e ];
+    }
+}
+
+if (!$c) {
+    my $sub = $trans->Count();
+    $c = "# $sub/$total ($args/total)";
+}
+
+return [ $c, $o, $k, $e ];
+
+</%perl>
diff --git a/rt/html/REST/1.0/Forms/ticket/links b/rt/html/REST/1.0/Forms/ticket/links
new file mode 100644
index 000000000..8ac9dc29d
--- /dev/null
+++ b/rt/html/REST/1.0/Forms/ticket/links
@@ -0,0 +1,148 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%# REST/1.0/Forms/ticket/links
+%#
+<%ARGS>
+$id
+$format => 's'
+$changes => undef
+</%ARGS>
+<%perl>
+my @data;
+my $ticket = new RT::Ticket $session{CurrentUser};
+
+$ticket->Load($id);
+if (!$ticket->Id) {
+    return [ "# Ticket $id does not exist.", [], {}, 1 ];
+}
+
+my ($c, $o, $k, $e) = ("", [], {}, 0);
+my @fields = qw(DependsOn DependedOnBy RefersTo ReferredToBy Members MemberOf);
+my %fields = map { lc $_ => $_ } @fields;
+
+my %lfields = (
+    Members      => { Type => 'MemberOf',  Mode => 'Base'   },
+    ReferredToBy => { Type => 'RefersTo',  Mode => 'Base'   },
+    DependedOnBy => { Type => 'DependsOn', Mode => 'Base'   },
+    MemberOf     => { Type => 'MemberOf',  Mode => 'Target' },
+    RefersTo     => { Type => 'RefersTo',  Mode => 'Target' },
+    DependsOn    => { Type => 'DependsOn', Mode => 'Target' },
+);
+
+if ($changes) {
+    my ($get, $set, $key, $val, $n, $s);
+    my %data = %$changes;
+    my @comments;
+
+    foreach $key (keys %data) {
+        $val = $data{$key};
+        $key = lc $key;
+        $n = 1;
+
+        if (exists $fields{$key}) {
+            $key = $fields{$key};
+
+            my %old;
+            my $field = $lfields{$key}->{Mode};
+            while (my $link = $ticket->$key->Next) {
+                $old{$link->$field} = 1;
+            }
+
+            my %new;
+            foreach my $nkey (@{vsplit($val)}) {
+                if ($nkey =~ /^\d+$/) {
+                    my $uri = new RT::URI $session{CurrentUser};
+                    my $tick = new RT::Ticket $session{CurrentUser};
+                    $tick->Load($nkey);
+                    if ($tick->Id) {
+                        $nkey = $uri->FromObject($tick);
+                    }
+                    else {
+                        $n = 0;
+                        $s = "Ticket $nkey does not exist.";
+                        goto SET;
+                    }
+                }
+                $new{$nkey} = 1;
+            }
+
+            foreach my $u (keys %old) {
+                if (exists $new{$u}) {
+                    delete $new{$u};
+                }
+                else {
+                    my $type = $lfields{$key}->{Type};
+                    my $mode = $lfields{$key}->{Mode};
+                    ($n, $s) = $ticket->DeleteLink(Type => $type, $mode => $u);
+                    goto SET;
+                }
+            }
+            foreach my $u (keys %new) {
+                my $type = $lfields{$key}->{Type};
+                my $mode = $lfields{$key}->{Mode};
+                ($n, $s) = $ticket->AddLink(Type => $type, $mode => $u);
+                goto SET;
+            }
+        }
+        elsif ($key ne 'id' && $key ne 'type') {
+            $n = 0;
+            $s = "Unknown field: $key";
+        }
+
+    SET:
+        if ($n == 0) {
+            $e = 1;
+            push @comments, "# $key: $s";
+            unless (@$o) {
+                @$o = ("id", @fields);
+                %$k = %data;
+            }
+        }
+    }
+
+    push(@comments, "# Links for ticket $id updated.") unless @comments;
+    $c = join("\n", @comments) if @comments;
+}
+else {
+    my @data;
+
+    push @data, [ id => "ticket/".$ticket->Id."/links" ];
+    foreach my $key (@fields) {
+        my @val;
+
+        my $field = $lfields{$key}->{Mode};
+        while (my $link = $ticket->$key->Next) {
+            push @val, $link->$field;
+        }
+        push(@val, "") if (@val == 0 && $format eq 'l');
+        push @data, [ $key => [ @val ] ] if @val;
+    }
+
+    my %k = map {@$_} @data;
+    $o = [ map {$_->[0]} @data ];
+    $k = \%k;
+}
+
+return [ $c, $o, $k, $e ];
+</%perl>
diff --git a/rt/html/REST/1.0/Forms/user/default b/rt/html/REST/1.0/Forms/user/default
new file mode 100644
index 000000000..6b216e072
--- /dev/null
+++ b/rt/html/REST/1.0/Forms/user/default
@@ -0,0 +1,141 @@
+%# REST/1.0/Forms/user/default
+%#
+<%ARGS>
+$id
+$format => 's'
+$changes => {}
+</%ARGS>
+<%perl>
+my @comments;
+my ($c, $o, $k, $e) = ("", [], {}, 0);
+my %data = %$changes;
+my $user = new RT::User $session{CurrentUser};
+my @fields = qw(RealName NickName Gecos Organization Address1 Address2 City
+                State Zip Country HomePhone WorkPhone MobilePhone PagerPhone
+                FreeformContactInfo Comments Signature Lang EmailEncoding
+                WebEncoding ExternalContactInfoId ContactInfoSystem
+                ExternalAuthId AuthSystem);
+my %fields = map { lc $_ => $_ } @fields;
+
+if ($id ne 'new') {
+    $user->Load($id);
+    if (!$user->Id) {
+        return [ "# User $id does not exist.", [], {}, 1 ];
+    }
+}
+else {
+    if (%data == 0) {
+        return [
+            "# Required: Name, EmailAddress",
+            [ qw(id Name EmailAddress Organization Password Comments) ],
+            {
+                id => "user/new",
+                Name => "",
+                EmailAddress => "",
+                Organization => "",
+                Password => "",
+                Comments => ""
+            },
+            0
+        ];
+    }
+    else {
+        my %v;
+        my %create = %fields;
+        $create{name}         = "Name";
+        $create{password}     = "Password";
+        $create{emailaddress} = "EmailAddress";
+        $create{contactinfo}  = "FreeformContactInfo";
+        # Do any fields need to be excluded here?
+
+        foreach my $k (keys %data) {
+            if (exists $create{lc $k}) {
+                $v{$create{lc $k}} = delete $data{$k};
+            }
+        }
+
+        $user->Create(%v);
+        unless ($user->Id) {
+            return [ "# Could not create user.", [], {}, 1 ];
+        }
+
+        $id = $user->Id;
+        delete $data{id};
+        push(@comments, "# User $id created.");
+        goto DONE if %data == 0;
+    }
+}
+
+if (%data == 0) {
+    my @data;
+
+    push @data, [ id => "user/".$user->Id ];
+    push @data, [ Name => $user->Name ];
+    push @data, [ Password => '********' ];
+    push @data, [ EmailAddress => $user->EmailAddress ];
+
+    foreach my $key (@fields) {
+        my $val = $user->$key;
+
+        if ($format eq 'l' || (defined $val && $val ne '')) {
+            $key = "ContactInfo" if $key eq 'FreeformContactInfo';
+            push @data, [ $key => $val ];
+        }
+    }
+
+    my %k = map {@$_} @data;
+    $o = [ map {$_->[0]} @data ];
+    $k = \%k;
+}
+else {
+    my ($get, $set, $key, $val, $n, $s);
+
+    foreach $key (keys %data) {
+        $val = $data{$key};
+        $key = lc $key;
+        $n = 1;
+
+        if ($key eq 'name' || $key eq 'emailaddress' ||
+            $key eq 'contactinfo' || exists $fields{$key})
+        {
+            if (exists $fields{$key}) {
+                $key = $fields{$key};
+            }
+            else {
+                $key = "FreeformContactInfo" if $key eq 'contactinfo';
+                $key = "EmailAddress" if $key eq 'emailaddress';
+                $key = "Name" if $key eq 'name';
+            }
+            $set = "Set$key";
+
+            next if $val eq $user->$key;
+            ($n, $s) = $user->$set($val);
+        }
+        elsif ($key eq 'password') {
+            ($n, $s) = $user->SetPassword($val) unless $val =~ /^\**$/;
+        }
+        elsif ($key ne 'id') {
+            $n = 0;
+            $s = "Unknown field.";
+        }
+
+    SET:
+        if ($n == 0) {
+            $e = 1;
+            push @comments, "# $key: $s";
+            unless (@$o) {
+                my %o = keys %$changes;
+                delete @o{"id", @fields};
+                @$o = ("id", @fields, keys %o);
+                $k = $changes;
+            }
+        }
+    }
+
+    push(@comments, "# User $id updated.") unless $n == 0;
+}
+
+DONE:
+$c ||= join("\n", @comments) if @comments;
+return [ $c, $o, $k, $e ];
+</%perl>
diff --git a/rt/html/REST/1.0/Forms/user/ns b/rt/html/REST/1.0/Forms/user/ns
new file mode 100644
index 000000000..36b323746
--- /dev/null
+++ b/rt/html/REST/1.0/Forms/user/ns
@@ -0,0 +1,41 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%# REST/1.0/Forms/user/ns
+%#
+<%ARGS>
+$id
+</%ARGS>
+<%perl>
+use RT::Users;
+
+my $field = "Name";
+$field = "EmailAddress" if $id =~ /\@/;
+
+my $users = new RT::Users $session{CurrentUser};
+$users->Limit(FIELD => $field, OPERATOR => '=', VALUE => $id);
+if ($users->Count == 0) {
+    return (0, "No user named $id exists.");
+}
+return $users->Next->Id;
+</%perl>
diff --git a/rt/html/REST/1.0/NoAuth/mail-gateway b/rt/html/REST/1.0/NoAuth/mail-gateway
index 8db80d5ff..359331f58 100644
--- a/rt/html/REST/1.0/NoAuth/mail-gateway
+++ b/rt/html/REST/1.0/NoAuth/mail-gateway
@@ -29,12 +29,15 @@ $ticket => undef
 </%ARGS>
 <%init>
 use RT::Interface::Email; 
-my ( $status, $error, $Ticket ) = RT::Interface::Email::Gateway( %ARGS);
+my ( $status, $error, $Ticket ) = RT::Interface::Email::Gateway(\%ARGS);
 </%init>
 <%flags>
 inherit => undef # inhibit UTF8 conversion done in /autohandler
 </%flags>
-%    if ($status) {
+% if ($status == -75 ) {
+temporary failure
+% }
+%    elsif ($status == 1) {
 ok
 %        if ( $Ticket->Id ) {
 Ticket: <% $Ticket->Id %>
diff --git a/rt/html/REST/1.0/autohandler b/rt/html/REST/1.0/autohandler
new file mode 100644
index 000000000..9084a1bef
--- /dev/null
+++ b/rt/html/REST/1.0/autohandler
@@ -0,0 +1,32 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%# REST/1.0/autohandler
+%#
+<%INIT>
+use RT::Interface::REST;
+$r->content_type('text/plain');
+$m->error_format('text');
+$m->call_next();
+$m->abort();
+</%INIT>
diff --git a/rt/html/REST/1.0/dhandler b/rt/html/REST/1.0/dhandler
new file mode 100644
index 000000000..ef5217fe0
--- /dev/null
+++ b/rt/html/REST/1.0/dhandler
@@ -0,0 +1,287 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%# REST/1.0/dhandler
+%#
+<%ARGS>
+@id => ()
+$fields => undef
+$format => undef
+$content => undef
+</%ARGS>
+<%INIT>
+use RT::Interface::REST;
+
+my $output = "";
+my $status = "200 Ok";
+my $object = $m->dhandler_arg;
+
+my $name   = qr{[\w.-]+};
+my $list   = '(?:(?:\d+-)?\d+,)*(?:\d+-)?\d+';
+my $label  = '[a-zA-Z0-9@_.+-]+';
+my $field  = '[a-zA-Z][a-zA-Z0-9_-]*';
+my $labels = "(?:$label,)*$label";
+
+# We must handle requests such as the following:
+#
+# 1. http://.../REST/1.0/show (with a list of object specifications).
+# 2. http://.../REST/1.0/edit (with a self-contained list of forms).
+# 3. http://.../REST/1.0/ticket/show (implicit type specification).
+#    http://.../REST/1.0/ticket/edit
+# 4. http://.../REST/1.0/ticket/nn (all possibly with a single form).
+#    http://.../REST/1.0/ticket/nn/history
+#    http://.../REST/1.0/ticket/nn/attachment/1
+#
+# Objects are specified by their type, and either a unique numeric ID,
+# or a unique name (e.g. ticket/1, queue/foo). Multiple objects of the
+# same type may be specified by a comma-separated list of identifiers
+# (e.g., user/ams,rai or ticket/1-3,5-7).
+#
+# Ultimately, we want a list of object specifications to operate upon.
+# The URLs in (4) provide enough information to identify an object. We
+# will assemble submitted information into that format in other cases.
+#
+my (@objects, $forms);
+my $utype;
+
+if ($object eq 'show' ||                                # $REST/show
+    (($utype) = ($object =~ m{^($name)/show$})))        # $REST/ticket/show
+{
+    # We'll convert type/range specifications ("ticket/1-3,7-9/history")
+    # into a list of singular object specifications ("ticket/1/history").
+    # If the URL specifies a type, we'll accept only that one.
+    foreach my $id (@id) {
+        $id =~ s|^(?:$utype/)?|$utype/| if $utype;
+        if (my ($type, $oids, $extra) =
+            ($id =~ m#^($name)/($list|$labels)(?:(/.*))?$#o))
+        {
+	    foreach my $oid (expand_list($oids)) {
+		if ($extra =~ m{^(?:/($name)(?:/(.*))?)?$}o) {
+		    my ($attr, $args) = ($1, $2);
+		    # expand transaction and attachment range specifications
+		    # (if applicable)
+		    my $tids;
+		    if ($attr eq 'history' && $args =~ m#id/(\d.*)#o) {
+			$tids = $1;
+		    }
+		    if ($tids) {
+			push(@objects, "$type/$oid/$attr/id/$_") for expand_list($tids);
+		    } else {
+			push(@objects, "$type/$oid$extra");
+		    }
+		}
+	    }
+	}
+        else {
+            $status = "400 Bad Request";
+            $output = "Invalid object ID specified: '$id'";
+            goto OUTPUT;
+        }
+    }
+}
+elsif ($object eq 'edit' ||                             # $REST/edit
+    (($utype) = ($object =~ m{^($name)/edit$})))        # $REST/ticket/edit
+{
+    # We'll make sure each of the submitted forms is syntactically valid
+    # and sufficiently identifies an object to operate upon, then add to
+    # the object list as above.
+    my @output;
+
+    $forms = form_parse($content);
+    foreach my $form (@$forms) {
+        my ($c, $o, $k, $e) = @$form;
+
+        if ($e) {
+            push @output, [ "# Syntax error.", $o, $k, $e ];
+        }
+        else {
+            my ($type, $id);
+
+            # Look for matching types in the ID, form, and URL.
+            $type = exists $k->{type} ? $k->{type} : $utype;
+            $type =~ s|^(?:$utype)?|$utype/| if $utype;
+            $type =~ s|/$||;
+
+            if (exists $k->{id}) {
+                $id = $k->{id};
+                $id =~ s|^(?:$type/)?|$type/| if $type;
+
+                if ($id =~ m#^$name/(?:$label|\d+)(?:/.*)?#o) {
+                    push @objects, $id;
+                }
+                else {
+                    push @output, [ "# Invalid object ID: '$id'", $o, $k, $e ];
+                }
+            }
+            else {
+                push @output, [ "# No object ID specified.", $o, $k, $e ];
+            }
+        }
+    }
+    # If we saw any errors at this stage, we won't process any part of
+    # the submitted data.
+    if (@output) {
+        unshift @output, [ "# Please resubmit with errors corrected." ];
+        $status = "409 Syntax Error";
+        $output = form_compose(\@output);
+        goto OUTPUT;
+    }
+}
+else {
+    # We'll assume that this is in the correct format already. Otherwise
+    # it will be caught by the loop below.
+    push @objects, $object;
+
+    if ($content) {
+        $forms = form_parse($content);
+
+        if (@$forms > 1) {
+            $status = "400 Bad Request";
+            $output = "You may submit only one form to this object.";
+            goto OUTPUT;
+        }
+
+        my ($c, $o, $k, $e) = @{ $forms->[0] };
+        if ($e) {
+            $status = "409 Syntax Error";
+            $output = form_compose([ ["# Syntax error.", $o, $k, $e] ]);
+            goto OUTPUT;
+        }
+    }
+}
+
+# Make sure we have something to do.
+unless (@objects) {
+    $status = "400 Bad Request";
+    $output = "No objects specified.";
+    goto OUTPUT;
+}
+
+# Parse and validate any field specifications.
+my (%fields, @fields);
+if ($fields) {
+    unless ($fields =~ /^(?:$field,)*$field$/) {
+        $status = "400 Bad Request";
+        $output = "Invalid field specification: $fields";
+        goto OUTPUT;
+    }
+    @fields = map lc, split /,/, $fields;
+    @fields{@fields} = ();
+    unless (exists $fields{id}) {
+        unshift @fields, "id";
+        $fields{id} = ();
+    }
+}
+
+my (@comments, @output);
+
+foreach $object (@objects) {
+    my ($handler, $type, $id, $attr, $args);
+    my ($c, $o, $k, $e) = ("", ["id"], {id => $object}, 0);
+
+    my $i = 0;
+    if ($object =~ m{^($name)/(\d+|$label)(?:/($name)(?:/(.*))?)?$}o ||
+        $object =~ m{^($name)/(new)$}o)
+    {
+        ($type, $id, $attr, $args) = ($1, $2, ($3 || 'default'), $4);
+        $handler = "Forms/$type/$attr";
+
+        unless ($m->comp_exists($handler)) {
+            $args = "$attr/$args";
+            $handler = "Forms/$type/default";
+
+            unless ($m->comp_exists($handler)) {
+                $i = 2;
+                $c = "# Unknown object type: $type";
+            }
+        }
+        elsif ($id ne 'new' && $id !~ /^\d+$/) {
+            my $ns = "Forms/$type/ns";
+
+            # Can we resolve named objects?
+            unless ($m->comp_exists($ns)) {
+                $i = 3;
+                $c = "# Objects of type $type must be specified by numeric id.";
+            }
+            else {
+                my ($n, $s) = $m->comp("Forms/$type/ns", id => $id);
+                if ($n <= 0) { $i = 4; $c = "# $s"; }
+                else         { $i = 0; $id = $n;    }
+            }
+        }
+        else {
+            $i = 0;
+        }
+    }
+    else {
+        $i = 1;
+        $c = "# Invalid object specification: '$object'";
+    }
+
+    if ($i != 0) {
+        if ($content) {
+            (undef, $o, $k, $e) = @{ shift @$forms };
+        }
+        push @output, [ $c, $o, $k ];
+        next;
+    }
+
+    unless ($content) {
+        my $d = $m->comp($handler, id => $id, args => $args, format => $format, fields => \%fields);
+        my ($c, $o, $k, $e) = @$d;
+
+        if (!$e && @$o && keys %fields) {
+            my %lk = map { lc $_ => $_ } keys %$k;
+            @$o = map { $lk{$_} } @fields;
+            foreach my $key (keys %$k) {
+                delete $k->{$key} unless exists $fields{lc $key};
+            }
+        }
+        push(@output, [ $c, $o, $k ]) if ($c || @$o || keys %$k);
+    }
+    else {
+        my ($c, $o, $k, $e) = @{ shift @$forms };
+        my $d = $m->comp($handler, id => $id, args => $args, format => $format,
+                         changes => $k);
+        ($c, $o, $k, $e) = @$d;
+
+        # We won't pass $e through to compose, trusting instead that the
+        # handler added suitable comments for the user.
+        if ($e) {
+            $status = "409 Syntax Error" if @$o;
+            push @output, [ $c, $o, $k ];
+        }
+        else {
+            push @comments, $c;
+        }
+    }
+}
+
+unshift(@output, [ join "\n", @comments ]) if @comments;
+$output = form_compose(\@output);
+
+OUTPUT:
+</%INIT>
+RT/<% $RT::VERSION %> <% $status %>
+
+<% $output |n %>
diff --git a/rt/html/REST/1.0/logout b/rt/html/REST/1.0/logout
new file mode 100644
index 000000000..b64938bc2
--- /dev/null
+++ b/rt/html/REST/1.0/logout
@@ -0,0 +1,27 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<%PERL>
+tied(%session)->delete if (defined %session);
+</%PERL>
+RT/<% $RT::VERSION %> 200 Ok
diff --git a/rt/html/REST/1.0/search/dhandler b/rt/html/REST/1.0/search/dhandler
new file mode 100644
index 000000000..90b4653e5
--- /dev/null
+++ b/rt/html/REST/1.0/search/dhandler
@@ -0,0 +1,32 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%# REST/1.0/search/dhandler
+%#
+<%INIT>
+my $status = "500 Server Error";
+my $output = "Unsupported object type.";
+</%INIT>
+RT/<% $RT::VERSION %> <% $status %>
+
+<% $output |n %>
diff --git a/rt/html/REST/1.0/search/ticket b/rt/html/REST/1.0/search/ticket
new file mode 100644
index 000000000..24435294e
--- /dev/null
+++ b/rt/html/REST/1.0/search/ticket
@@ -0,0 +1,119 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%# REST/1.0/search/ticket
+%#
+<%ARGS>
+$query
+$format => undef
+$orderby => undef
+$fields => undef
+</%ARGS>
+<%INIT>
+my $output = "";
+my $status = "200 Ok";
+my $tickets = new RT::Tickets $session{CurrentUser};
+
+# Parse and validate any field specifications.
+my $field  = '[a-zA-Z][a-zA-Z0-9_-]*';
+my (%fields, @fields);
+if ($fields) {
+    $format = "l";
+    unless ($fields =~ /^(?:$field,)*$field$/) {
+        $status = "400 Bad Request";
+        $output = "Invalid field specification: $fields";
+        goto OUTPUT;
+    }
+    @fields = map lc, split /,/, $fields;
+    @fields{@fields} = ();
+    unless (exists $fields{id}) {
+        unshift @fields, "id";
+        $fields{id} = ();
+    }
+}
+
+$format ||= "s";
+if ($format !~ /^[isl]$/) {
+    $status = "400 Bad request";
+    $output = "Unknown listing format: $format. (Use i, s, or l.)\n";
+    goto OUTPUT;
+}
+
+my ($n, $s);
+eval {
+    ($n, $s) = $tickets->FromSQL($query);
+};
+my $sortstring = "";
+if ($orderby) {
+    $sortstring = 'FIELD => ';
+    my $order = substr($orderby, 0, 1);
+    if ($order eq '+' || $order eq '-') {
+	$sortstring .= 'substr($orderby, 1)';
+	if ($order eq '+') {
+	    $sortstring .= ", ORDER => 'ASC'";
+	} elsif ($order eq '-') {
+	    $sortstring .= ", ORDER => 'DESC'";
+	}
+    } else {
+	$sortstring .= '$orderby';
+    }
+    my $foo = 'FIELD => ';
+    $foo .= '$orderby';
+    $tickets->OrderBy(eval $sortstring);
+}
+if ($@ || $n == 0) {
+    $s ||= $@;
+    $status = "400 Bad request";
+    $output = "Invalid query: '$s'.\n";
+    goto OUTPUT;
+}
+
+$n = 0;
+my @output;
+while (my $ticket = $tickets->Next) {
+    $n++;
+
+    if ($format eq "i") {
+        $output .= "ticket/" . $ticket->Id . "\n";
+    }
+    elsif ($format eq "s") {
+        $output .= $ticket->Id . ": ". $ticket->Subject . "\n";
+    }
+    else {
+	my $id = $ticket->Id;
+        my $d = $m->comp("$RT::WebPath/REST/1.0/Forms/ticket/default", id => $id, format => $format, fields => \%fields);
+        my ($c, $o, $k, $e) = @$d;
+	push @output, [ $c, $o, $k ];
+    }
+}
+if ($n == 0 && $format ne "i") {
+    $output = "No matching results.\n";
+}
+
+$output = form_compose(\@output) if @output;
+
+OUTPUT:
+</%INIT>
+RT/<% $RT::VERSION %> <% $status %>
+
+<% $output |n %>
diff --git a/rt/html/REST/1.0/ticket/comment b/rt/html/REST/1.0/ticket/comment
new file mode 100644
index 000000000..9d1b06246
--- /dev/null
+++ b/rt/html/REST/1.0/ticket/comment
@@ -0,0 +1,149 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%# REST/1.0/ticket/comment
+%#
+<%ARGS>
+$content
+</%ARGS>
+<%INIT>
+use MIME::Entity;
+use LWP::MediaTypes;
+use RT::Interface::REST;
+use File::Temp qw(tempfile);
+
+my $ticket = new RT::Ticket $session{CurrentUser};
+my $object = $r->path_info;
+my $status = "200 Ok";
+my $output;
+my $action;
+
+# http://.../REST/1.0/ticket/comment/1
+my ($c, $o, $k, $e) = @{ form_parse($content)->[0] };
+if ($e || !$o) {
+    if (!$o) {
+        $output = "Empty form submitted.\n";
+    }
+    else {
+        $c = "# Syntax error.";
+        $output = form_compose([[$c, $o, $k, $e]]);
+    }
+    $status = "400 Bad Request";
+    goto OUTPUT;
+}
+
+$object =~ s#^/##;
+$object ||= $k->{Ticket};
+unless ($object =~ /^\d+/) {
+    $output = "Invalid ticket id: `$object'.\n";
+    $status = "400 Bad Request";
+    goto OUTPUT;
+}
+if ($k->{Ticket} && $object ne $k->{Ticket}) {
+    $output = "The submitted form and URL specify different tickets.\n";
+    $status = "400 Bad Request";
+    goto OUTPUT;
+}
+
+($action = $k->{Action}) =~ s/^(.)(.*)$/\U$1\L$2\E/;
+unless ($action =~ /^(?:Comment|Correspond)$/) {
+    $output = "Invalid action: `$action'.\n";
+    $status = "400 Bad Request";
+    goto OUTPUT;
+}
+
+my $text = $k->{Text};
+my @atts = @{ vsplit($k->{Attachment}) };
+
+if (!$k->{Text} && @atts == 0) {
+        $status = "400 Bad Request";
+        $output = "Empty comment with no attachments submitted.\n";
+        goto OUTPUT;
+}
+
+my $cgi = $m->cgi_object;
+my $ent = MIME::Entity->build(Type => "multipart/mixed");
+$ent->attach(Data => $k->{Text}) if $k->{Text};
+
+my $i = 1;
+foreach my $att (@atts) {
+    local $/=undef;
+    my $file = $att;
+    $file =~ s#^.*[\\/]##;
+
+    my $fh = $cgi->upload("attachment_$i");
+    if ($fh) {
+        my $buf;
+        my ($w, $tmp) = tempfile();
+        my $info = $cgi->uploadInfo();
+
+        while (sysread($fh, $buf, 8192)) {
+            syswrite($w, $buf);
+        }
+
+        $ent->attach(
+            Path => $tmp,
+            Type => $info->{'Content-Type'} || guess_media_type($tmp),
+            Filename => $file,
+            Disposition => "attachment"
+        );
+    }
+    else {
+        $status = "400 Bad Request";
+        $output = "No attachment for $att.\n";
+        goto OUTPUT;
+    }
+
+    $i++;
+}
+
+$ticket->Load($object);
+unless ($ticket->Id) {
+    $output = "Couldn't load ticket id: `$object'.\n";
+    $status = "404 Ticket not found";
+    goto OUTPUT;
+}
+unless ($ticket->CurrentUserHasRight('ModifyTicket') ||
+        ($action eq "Comment" &&
+         $ticket->CurrentUserHasRight("CommentOnTicket")) ||
+        ($action eq "Correspond" &&
+         $ticket->CurrentUserHasRight("ReplyToTicket")))
+{
+    $output = "You are not allowed to $action on ticket $object.\n";
+    $status = "403 Permission denied";
+    goto OUTPUT;
+}
+
+my $cc = join ", ", @{ vsplit($k->{Cc}) };
+my $bcc = join ", ", @{ vsplit($k->{Bcc}) };
+my ($n, $s) = $ticket->$action(MIMEObj => $ent,
+                               CcMessageTo => $cc,
+                               BccMessageTo => $bcc,
+                               TimeTaken => $k->{TimeWorked} || 0);
+$output = $s;
+
+OUTPUT:
+</%INIT>
+RT/<% $RT::VERSION %> <% $status %>
+
+<% $output |n %>
diff --git a/rt/html/REST/1.0/ticket/link b/rt/html/REST/1.0/ticket/link
new file mode 100644
index 000000000..574762512
--- /dev/null
+++ b/rt/html/REST/1.0/ticket/link
@@ -0,0 +1,96 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%# REST/1.0/ticket/link
+%#
+<%ARGS>
+$id => undef
+$del => 0
+$rel
+$to
+</%ARGS>
+<%INIT>
+use RT::Interface::REST;
+
+my $output;
+my $status = "200 Ok";
+my $ticket = new RT::Ticket $session{CurrentUser};
+my $object = $r->path_info;
+
+my @fields = qw(DependsOn DependedOnBy RefersTo ReferredToBy HasMember MemberOf);
+my %fields = map { lc $_ => $_ } @fields;
+my %lfields = (
+    HasMember    => { Type => 'MemberOf',  Mode => 'Base'   },
+    ReferredToBy => { Type => 'RefersTo',  Mode => 'Base'   },
+    DependedOnBy => { Type => 'DependsOn', Mode => 'Base'   },
+    MemberOf     => { Type => 'MemberOf',  Mode => 'Target' },
+    RefersTo     => { Type => 'RefersTo',  Mode => 'Target' },
+    DependsOn    => { Type => 'DependsOn', Mode => 'Target' },
+);
+
+# http://.../REST/1.0/ticket/link/1
+
+$object =~ s#^/##;
+if ($id && $object && $id != $object) {
+    $output = "Different ids in URL (`$object') and submitted form (`$id').\n";
+    $status = "400 Bad Request";
+    goto OUTPUT;
+}
+$id ||= $object;
+unless ($id =~ /^\d+$/ && $to =~ /^\d+$/) {
+    my $bad = ($id !~ /^\d+$/) ? $id : $to;
+    $output = $r->path_info. "\n";
+    $output .= "Invalid ticket id: '$bad'.\n";
+    $status = "400 Bad Request";
+    goto OUTPUT;
+}
+unless (exists $fields{lc $rel}) {
+    $output = "Invalid relationship: '$rel'.\n";
+    $status = "400 Bad Request";
+    goto OUTPUT;
+}
+$rel = $fields{lc $rel};
+
+$ticket->Load($id);
+unless ($ticket->Id) {
+    $output = "Couldn't load ticket id: '$id'.\n";
+    $status = "404 Ticket not found";
+    goto OUTPUT;
+}
+
+my $type = $lfields{$rel}->{Type};
+my $mode = $lfields{$rel}->{Mode};
+
+my $n = 1;
+my $op = $del ? "DeleteLink" : "AddLink";
+
+($n, $output) = $ticket->$op(Type => $type, $mode => $to);
+if ($n == 0) {
+    $status = "500 Error";
+}
+
+OUTPUT:
+</%INIT>
+RT/<% $RT::VERSION %> <% $status %>
+
+<% $output |n %>
diff --git a/rt/html/REST/1.0/ticket/merge b/rt/html/REST/1.0/ticket/merge
new file mode 100644
index 000000000..9cd2a7cfa
--- /dev/null
+++ b/rt/html/REST/1.0/ticket/merge
@@ -0,0 +1,78 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work 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.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+%# REST/1.0/ticket/merge
+%#
+<%ARGS>
+$id => undef
+$into
+</%ARGS>
+<%INIT>
+use RT::Interface::REST;
+
+my $output;
+my $status = "200 Ok";
+my $ticket = new RT::Ticket $session{CurrentUser};
+my $object = $r->path_info;
+
+# http://.../REST/1.0/ticket/merge/1
+
+$object =~ s#^/##;
+if ($id && $object && $id != $object) {
+    $output = "Different ids in URL (`$object') and submitted form (`$id').\n";
+    $status = "400 Bad Request";
+    goto OUTPUT;
+}
+$id ||= $object;
+unless ($id =~ /^\d+$/ && $into =~ /^\d+$/) {
+    my $bad = ($id !~ /^\d+$/) ? $id : $into;
+    $output = $r->path_info. "\n";
+    $output .= "Invalid ticket id: `$bad'.\n";
+    $status = "400 Bad Request";
+    goto OUTPUT;
+}
+
+$ticket->Load($id);
+unless ($ticket->Id) {
+    $output = "Couldn't load ticket id: `$id'.\n";
+    $status = "404 Ticket not found";
+    goto OUTPUT;
+}
+unless ($ticket->CurrentUserHasRight('ModifyTicket')) {
+    $output = "You are not allowed to modify ticket $id.\n";
+    $status = "403 Permission denied";
+    goto OUTPUT;
+}
+
+my ($n, $s) = $ticket->MergeInto($into);
+
+if ($n == 0) {
+    $status = "500 Error";
+}
+$output = $s;
+
+OUTPUT:
+</%INIT>
+RT/<% $RT::VERSION %> <% $status %>
+
+<% $output |n %>
diff --git a/rt/html/Search/Bulk.html b/rt/html/Search/Bulk.html
index df43cfa50..de9143c8a 100644
--- a/rt/html/Search/Bulk.html
+++ b/rt/html/Search/Bulk.html
@@ -175,6 +175,7 @@ if ($ARGS{'UpdateContent'} &&
 #Iterate through each ticket we've been handed
 my @linkresults;
 
+$session{'tickets'}->RedoSearch();
 while (my $Ticket = $session{'tickets'}->Next) {
     $RT::Logger->debug( "Checking Ticket ".$Ticket->Id ."\n");
     next unless ($ARGS{"UpdateTicket".$Ticket->Id});
diff --git a/rt/html/Search/Elements/PickRestriction b/rt/html/Search/Elements/PickRestriction
index a6911df5a..0021ab2bc 100644
--- a/rt/html/Search/Elements/PickRestriction
+++ b/rt/html/Search/Elements/PickRestriction
@@ -34,9 +34,10 @@
 <& /Elements/SelectOwner, Name => "ValueOfOwner" &>
 
 <li>
-<&|/l&>Requestor email address</&> 
-<& /Elements/SelectMatch, Name => "RequestorOp" &>
-<INPUT Name="ValueOfRequestor" SIZE=20>
+<& /Elements/SelectWatcherType, Name => "WatcherRole", AllowNull => 0 &>
+<&|/l&>email address</&> 
+<& /Elements/SelectMatch, Name => "WatcherRoleOp" &>
+<INPUT Name="ValueOfWatcherRole" SIZE=20>
 
 <li>
 <&|/l&>Subject</&> <& /Elements/SelectMatch, Name => "SubjectOp" &> 
@@ -47,7 +48,7 @@
 					False => loc("isn't"), 
 					TrueVal=> '=', 
 					FalseVal => '!=' &>
-<& /Elements/SelectQueue, Name => loc("ValueOfQueue") &>
+<& /Elements/SelectQueue, Name => "ValueOfQueue" &>
 
 
 <li><&|/l&>Priority</&> <& /Elements/SelectEqualityOperator, Name => "PriorityOp" &>
@@ -77,7 +78,7 @@
 			    TrueVal=> '=', 
 			    FalseVal => '!=' 
 &>  
-<& /Elements/SelectStatus, Name => "ValueOfStatus" &>
+<& /Elements/SelectStatus, Name => "ValueOfStatus", SkipDeleted => 1 &>
 
 
 % while ( my $CustomField = $CustomFields->Next ) {
diff --git a/rt/html/SelfService/Display.html b/rt/html/SelfService/Display.html
index fc3fcb289..124ecf407 100644
--- a/rt/html/SelfService/Display.html
+++ b/rt/html/SelfService/Display.html
@@ -38,7 +38,7 @@
           <& /Elements/TitleBoxStart, title => loc("Dates"),
                 title_class=> 'inverse',
                  color => "#663366" &>
-          <& /Ticket/Elements/ShowDates, Ticket => $Ticket &>
+          <& /Ticket/Elements/ShowDates, Ticket => $Ticket, UpdatedLink => 0 &>
           <& /Elements/TitleBoxEnd &>
 </TD>
 </TR>
@@ -46,7 +46,7 @@
 
 
 
-<& /Ticket/Elements/ShowHistory, Ticket => $Ticket&>
+<& /Ticket/Elements/ShowHistory, Ticket => $Ticket, AttachPath => "Attachment" &>
 
 
 
@@ -101,6 +101,12 @@ if ( $id[0] eq 'new' ) {
     push ( @results, $ErrMsg );
 
     # }}}
+
+# delete temporary storage entry to make WebUI clean
+unless (keys %{$session{'Attachments'}} and $ARGS{'UpdateAttach'}) {
+    delete $session{'Attachments'};
+}
+# }}}
 }
 else {
     unless ( $Ticket->Load( $id[0] ) ) {
@@ -127,10 +133,43 @@ if (     ( defined $ARGS{'Status'} )
     push @results, "$msg";
 }
 
+# {{{ store the uploaded attachment in session
+if ($ARGS{'Attach'}) {			# attachment?
+    $session{'Attachments'} = {} unless defined $session{'Attachments'};
+
+    my $subject = "$ARGS{'Attach'}";
+    # since CGI.pm deutf8izes the magic field, we need to add it back.
+    Encode::_utf8_on($subject);
+    # strip leading directories
+    $subject =~ s#^.*[\\/]##;
+
+    my $attachment = MakeMIMEEntity(
+        Subject             => $subject,
+        Body                => "",
+        AttachmentFieldName => 'Attach'
+    );
+
+    $session{'Attachments'} = { %{$session{'Attachments'} || {}},
+				$ARGS{'Attach'} => $attachment };
+}
+# }}}
+
+if ( $session{'Attachments'} || 
+     (   $ARGS{'UpdateContent'} ne ''
+	 && $ARGS{'UpdateContent'} ne "-- \n"
+	 . $session{'CurrentUser'}->UserObj->Signature )) {
+    $ARGS{UpdateAttachments} = $session{'Attachments'};
+}
 ProcessUpdateMessage( ARGSRef   => \%ARGS,
                       Actions   => \@results,
                       TicketObj => $Ticket );
 
+# delete temporary storage entry to make WebUI clean
+unless (keys %{$session{'Attachments'}} and $ARGS{'UpdateAttach'}) {
+    delete $session{'Attachments'};
+}
+# }}}
+
 my $Transactions = $Ticket->Transactions;
 
 </%INIT>
diff --git a/rt/html/SelfService/Elements/MyRequests b/rt/html/SelfService/Elements/MyRequests
index 95ede0811..839359aed 100644
--- a/rt/html/SelfService/Elements/MyRequests
+++ b/rt/html/SelfService/Elements/MyRequests
@@ -49,6 +49,7 @@ $title ||= loc("My [_1] tickets", $friendly_status);
 my $MyTickets;
 $MyTickets = new RT::Tickets ($session{'CurrentUser'});
 $MyTickets->LimitWatcher(TYPE => 'Requestor', VALUE => $session{'CurrentUser'}->EmailAddress);
+$MyTickets->OrderBy(FIELD => 'id', ORDER => 'ASC');
 
 foreach my $status (@status) {
 
diff --git a/rt/html/SelfService/Update.html b/rt/html/SelfService/Update.html
index 9ff31775f..9444aa706 100644
--- a/rt/html/SelfService/Update.html
+++ b/rt/html/SelfService/Update.html
@@ -29,7 +29,24 @@
 
 <&|/l&>Status</&>: <& /Elements/SelectStatus, Name=>"Status", Default => $DefaultStatus &><br>
 <&|/l&>Subject</&>: <input name="UpdateSubject" size=60 value="Re: <% $Ticket->Subject %>"> <br>
-<&|/l&>Attach</&>: <input name="UpdateAttachment" type=file><br>
+<table>
+<tr>
+% if (exists $session{'Attachments'}) {
+<TD>
+<&|/l&>Attached file</&>:
+</TD>
+<TD COLSPAN=5>
+<&|/l&>Check box to delete</&><BR>
+% foreach my $attach_name (keys %{$session{'Attachments'}}) {
+<input type="checkbox" name="DeleteAttach-<%$attach_name%>"><%$attach_name%><BR>
+% } # end of foreach
+</TD>
+</TR>
+<TR>
+% } # end of if
+<tr><td align=right><&|/l&>Attach</&>:</td><td><input name="Attach" type="file"><input type="hidden" name="UpdateAttach" value="1">
+</td></tr>
+</table>
 <& /Elements/MessageBox, Name=>"UpdateContent", QuoteTransaction=>$ARGS{QuoteTransaction} &>
 		<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>"><br>
 
diff --git a/rt/html/Ticket/Attachment/dhandler b/rt/html/Ticket/Attachment/dhandler
index e0f00f57a..ba82b5f2e 100644
--- a/rt/html/Ticket/Attachment/dhandler
+++ b/rt/html/Ticket/Attachment/dhandler
@@ -65,4 +65,6 @@
      $m->out($AttachmentObj->OriginalContent);
      $m->abort; 
 </%perl>
-
+<%attr>
+AutoFlush => 0
+</%attr>
diff --git a/rt/html/Ticket/Create.html b/rt/html/Ticket/Create.html
index 5b8c908a1..435447a8f 100644
--- a/rt/html/Ticket/Create.html
+++ b/rt/html/Ticket/Create.html
@@ -34,55 +34,55 @@
 <BR>
 <& /Elements/TitleBoxStart, contentbg => "#cccccc", title => loc("Create a new ticket") &>
 <TABLE border=0 cellpadding=0 cellspacing=0>
-<TR><TD><&|/l&>Queue</&></TD>
-<TD><% $QueueObj->Name %>
+<TR><TD class=label><&|/l&>Queue</&>:</TD>
+<TD class=value><% $QueueObj->Name %>
 <INPUT TYPE=HIDDEN NAME=Queue Value="<%$QueueObj->Name%>">
 </TD>
-<TD><&|/l&>Status</&>:
+<TD class=label><&|/l&>Status</&>:
 </TD>
-<TD>
+<TD class=value>
 <& /Elements/SelectStatus, Name => "Status", Default => $ARGS{Status}||'new' &>
 </TD>
-<TD>
+<TD class=label>
 <&|/l&>Owner</&>:
 </TD>
-<TD>
+<TD class=value>
 <& /Elements/SelectOwner, Name => "Owner", QueueObj => $QueueObj, Default => $ARGS{Owner}||undef &>
 </TD>
 </TR>
 <TR>
-<TD>
+<TD class=label>
 <&|/l&>Requestors</&>:
 </TD>
-<TD COLSPAN=5>
+<TD class=value COLSPAN=5>
 <INPUT Name="Requestors" Value="<% ($ARGS{Requestors}) || $session{CurrentUser}->EmailAddress %>" SIZE=40>
 </TD>
 </TR>
 <TR>
-<TD>
+<TD class=labeltop>
 <&|/l&>Cc</&>:
 </TD>
-<TD COLSPAN=5>
-<INPUT NAME="Cc" SIZE=40<% $ARGS{Cc} && " VALUE=\"$ARGS{Cc}\""%>><BR>
+<TD class=value COLSPAN=5>
+<INPUT NAME="Cc" SIZE=40 VALUE="<% $ARGS{Cc} %>"><BR>
 <i><font size=-2>
 <&|/l&>(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)</&></font></i>
 </TD>
 </TR>
 <TR>
-<TD>
+<TD class=labeltop>
 <&|/l&>Admin Cc</&>:
 </TD>
-<TD COLSPAN=5>
-<INPUT NAME="AdminCc" SIZE=40<% $ARGS{AdminCc} && " VALUE=\"$ARGS{AdminCc}\""%>><BR>
+<TD class=value COLSPAN=5>
+<INPUT NAME="AdminCc" SIZE=40 VALUE="<% $ARGS{AdminCc} %>"><BR>
 <i><font size=-2>
 <&|/l&>(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)</&></font></i>
 </TD>
 </TR>
 <TR>
-<TD>
+<TD class=label>
 <&|/l&>Subject</&>:
 </TD>
-<TD COLSPAN=5>
+<TD class=value COLSPAN=5>
 <INPUT Name="Subject" SIZE=60 MAXSIZE=100 value="<%$ARGS{Subject} || ''%>">
 </TD>
 </TR>
@@ -93,7 +93,7 @@
 </TR>
 <TR>
 % if (exists $session{'Attachments'}) {
-<TD>
+<TD class=label>
 <&|/l&>Attached file</&>:
 </TD>
 <TD COLSPAN=5>
@@ -108,7 +108,7 @@
 <TD>
 <&|/l&>Attach file</&>:
 </TD>
-<TD COLSPAN=5>
+<TD class=value COLSPAN=5>
 <INPUT TYPE=FILE NAME="Attach">
 <INPUT TYPE=SUBMIT NAME="AddMoreAttach" VALUE="<&|/l&>Add More Files</&>">
 </TD>
@@ -152,8 +152,8 @@
 <TABLE BORDER=0>
 <TR><TD ALIGN=RIGHT><&|/l&>Priority</&>:</TD><TD><input size=3 name="InitialPriority" value="<% $ARGS{InitialPriority} ? $ARGS{InitialPriority} : $QueueObj->InitialPriority %>"></TD></TR>
 <TR><TD ALIGN=RIGHT><&|/l&>Final Priority</&>:</TD><TD><input size=3 name="FinalPriority" value="<% $ARGS{FinalPriority} ? $ARGS{FinalPriority} : $QueueObj->FinalPriority %>"></TD></TR>
-<TR><TD ALIGN=RIGHT><&|/l&>Time Worked</&>:</TD><TD><input size=3 name="TimeWorked"<% $ARGS{TimeWorked} && " VALUE=\"$ARGS{TimeWorked}\""  %>></TD></TR>
-<TR><TD ALIGN=RIGHT><&|/l&>Time Left</&>:</TD><TD><input size=3 name="TimeLeft"<% $ARGS{TimeLeft} && " VALUE=\"$ARGS{TimeLeft}\"" %>></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Time Worked</&>:</TD><TD><input size=3 name="TimeWorked" value="<% $ARGS{TimeWorked} %>"></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Time Left</&>:</TD><TD><input size=3 name="TimeLeft" value="<% $ARGS{TimeLeft} %>"></TD></TR>
 </TABLE>
 <& /Elements/TitleBoxEnd &>
 <br>
@@ -162,8 +162,9 @@
 		 color => "#663366" &>
 
 <TABLE BORDER=0>
-<TR><TD ALIGN=RIGHT><&|/l&>Starts</&>:</TD><TD><input size=10 name="Starts"<% $ARGS{Starts} && " VALUE=\"$ARGS{Starts}\"" %>></TD></TR>
-<TR><TD ALIGN=RIGHT><&|/l&>Due</&>:</TD><TD><input size=10 name="Due"<% $ARGS{Due} && " VALUE=\"$ARGS{Due}\"" %>></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Starts</&>:</TD><TD><input size=10 name="Starts" value="<% $ARGS{Starts} %>"></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Due</&>:</TD><TD><input size=10 name="Due" value="<%
+$ARGS{Due}%>"></TD></TR>
 </TABLE>
 <& /Elements/TitleBoxEnd &>
 <BR>
@@ -176,12 +177,12 @@
 
 <i><&|/l&>(Enter ticket ids or URLs, seperated with spaces)</&></i>
 <TABLE BORDER=0>
-<TR><TD ALIGN=RIGHT><&|/l&>Depends on</&></TD><TD><input size=10 name="new-DependsOn"<% $ARGS{'new-DependsOn'} && " VALUE=\"$ARGS{'new-DependsOn'}\""%>></TD></TR>
-<TR><TD ALIGN=RIGHT><&|/l&>Depended on by</&></TD><TD><input size=10 name="DependsOn-new"<% $ARGS{'DependsOn-new'} && " VALUE=\"$ARGS{'DependsOn-new'}\"" %>></TD></TR>
-<TR><TD ALIGN=RIGHT><&|/l&>Parents</&></TD><TD><input size=10 name="new-MemberOf"<% $ARGS{'new-MemberOf'} && " VALUE=\"$ARGS{'new-MemberOf'}\"" %>></TD></TR>
-<TR><TD ALIGN=RIGHT><&|/l&>Children</&></TD><TD><input size=10 name="MemberOf-new" <% $ARGS{'MemberOf-new'} && " VALUE=\"$ARGS{'MemberOf-new'}\"" %>></TD></TR>
-<TR><TD ALIGN=RIGHT><&|/l&>Refers to</&></TD><TD><input size=10 name="new-RefersTo"<% $ARGS{'new-RefersTo'} && " VALUE=\"$ARGS{'new-MemberOf'}\"" %>></TD></TR>
-<TR><TD ALIGN=RIGHT><&|/l&>Referred to by</&></TD><TD><input size=10 name="RefersTo-new"<% $ARGS{'RefersTo-new'} && " VALUE=\"$ARGS{'RefersTo-new'}\"" %>></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Depends on</&></TD><TD><input size=10 name="new-DependsOn" value="<% $ARGS{'new-DependsOn'} %>"></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Depended on by</&></TD><TD><input size=10 name="DependsOn-new" value="<% $ARGS{'DependsOn-new'} %>"></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Parents</&></TD><TD><input size=10 name="new-MemberOf" value="<% $ARGS{'new-MemberOf'} %>"></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Children</&></TD><TD><input size=10 name="MemberOf-new" value="<% $ARGS{'MemberOf-new'} %>"></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Refers to</&></TD><TD><input size=10 name="new-RefersTo" value="<% $ARGS{'new-RefersTo'} %>"></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Referred to by</&></TD><TD><input size=10 name="RefersTo-new" value="<% $ARGS{'RefersTo-new'} %>"></TD></TR>
 
 
 </TABLE>
@@ -200,10 +201,20 @@
 <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
 
 <%INIT>
+
+
+
 my $QueueObj = new RT::Queue($session{'CurrentUser'});
 $QueueObj->Load($Queue) || Abort(loc("Queue could not be loaded."));
 my $CFs = $QueueObj->CustomFields();
 
+if ($QueueObj->DefaultDueIn) {
+    my $default_due = RT::Date->new($session{'CurrentUser'});
+    $default_due->SetToNow();
+    $default_due->AddDays($QueueObj->DefaultDueIn);
+    $ARGS{'Due'} = $default_due->ISO();
+}
+
 # {{{ deal with deleting uploaded attachments
 foreach my $key (keys %ARGS) {
     if ($key =~ m/^DeleteAttach-(.+)$/) {
@@ -218,8 +229,6 @@ if ($ARGS{'Attach'}) {			# attachment?
 
     my $subject = "$ARGS{'Attach'}";
 
-    # since CGI.pm deutf8izes the magic field, we need to add it back.
-    Encode::_utf8_on($subject);
     # strip leading directories
     $subject =~ s#^.*[\\/]##;
 
diff --git a/rt/html/Ticket/Display.html b/rt/html/Ticket/Display.html
index cf32dce9d..276cee62a 100644
--- a/rt/html/Ticket/Display.html
+++ b/rt/html/Ticket/Display.html
@@ -22,20 +22,20 @@
 %# 
 %# END LICENSE BLOCK
 <& /Elements/Header, 
-    Title => loc("#[_1]: [_2]", $Ticket->Id, $Ticket->Subject) &>
+    Title => loc("#[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &>
 <& /Ticket/Elements/Tabs, 
-    Ticket => $Ticket, 
-    current_tab => 'Ticket/Display.html?id='.$Ticket->id,
-    Title => loc("#[_1]: [_2]", $Ticket->Id, $Ticket->Subject) &>
+    Ticket => $TicketObj, 
+    current_tab => 'Ticket/Display.html?id='.$TicketObj->id,
+    Title => loc("#[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &>
 
 <& /Elements/ListActions, actions => \@Actions &>
 
-<& /Ticket/Elements/ShowSummary,  Ticket => $Ticket &>
+<& /Ticket/Elements/ShowSummary,  Ticket => $TicketObj &>
 
 
 <BR>
 <& /Ticket/Elements/ShowHistory , 
-      Ticket => $Ticket, 
+      Ticket => $TicketObj, 
       Collapsed => $ARGS{'Collapsed'}, 
       ShowHeaders => $ARGS{'ShowHeaders'} &> 
 
@@ -45,14 +45,13 @@ $id => undef
 $Create => undef
 $ShowHeaders => undef
 $Collapsed => undef
+$TicketObj => undef
 </%ARGS>
 
 <%INIT>
-  my ($linkid, $message, $tid, $Ticket, @Actions);  
+  my ($linkid, $message, $tid, @Actions);  
 
-$Ticket = new RT::Ticket($session{'CurrentUser'});
-
-unless ($id) {
+unless ($id || $TicketObj) {
     Abort('No ticket specified');
 }
 
@@ -67,47 +66,50 @@ if ($ARGS{'id'} eq 'new') {
     unless ($Queue->CurrentUserHasRight('CreateTicket')) {
 	Abort('You have no permission to create tickets in that queue.');
     }
-    ($Ticket, @Actions) =
-       CreateTicket(Attachments => $session{'Attachments'}, %ARGS);
+    ($TicketObj, @Actions) =
+	CreateTicket(Attachments => $session{'Attachments'}, %ARGS);
     delete $session{'Attachments'};
-    unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
-      Abort("No permission to view newly created ticket #".$Ticket->id.".");
-    }
+    unless ($TicketObj->CurrentUserHasRight('ShowTicket')) {
+	Abort("No permission to view newly created ticket #".$TicketObj->id.".");
+	}
     # }}}
-}
+} else { 
+    if (!$TicketObj) {
 
-else { 
-    $Ticket = LoadTicket($ARGS{'id'});
-    unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
-	Abort("No permission to view ticket");
-    }
+	$TicketObj = RT::Ticket->new($session{'CurrentUser'});
 
+	$TicketObj = LoadTicket($ARGS{'id'});
+	unless ($TicketObj->CurrentUserHasRight('ShowTicket')) {
+	    Abort("No permission to view ticket");
+	}
+    }
 
-if (defined $ARGS{'Action'}) {
-  if ($ARGS{'Action'} =~ /^(Steal|Kill|Take|SetTold)$/) {
-    my $action = $1;
-    my ($res, $msg)=$Ticket->$action();
-    push(@Actions, $msg);
-  }
-}
+    if (defined $ARGS{'Action'}) {
+	if ($ARGS{'Action'} =~ /^(Steal|Kill|Take|SetTold)$/) {
+	    my $action = $1;
+	    my ($res, $msg)=$TicketObj->$action();
+	    push(@Actions, $msg);
+	}
+    }
 
-    if ( $ARGS{'UpdateContent'} ) {
+    if ( $ARGS{'UpdateContent'} || $session{'Attachments'}) {
         $ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
-        if (    $ARGS{'UpdateContent'} ne ''
-             && $ARGS{'UpdateContent'} ne "-- \n"
-             . $session{'CurrentUser'}->UserObj->Signature ) {
+        if ( $session{'Attachments'} || 
+	     (   $ARGS{'UpdateContent'} ne ''
+		 && $ARGS{'UpdateContent'} ne "-- \n"
+		 . $session{'CurrentUser'}->UserObj->Signature )) {
             $ARGS{UpdateAttachments} = $session{'Attachments'};
             ProcessUpdateMessage( ARGSRef   => \%ARGS,
                                   Actions   => \@Actions,
-                                  TicketObj => $Ticket );
+                                  TicketObj => $TicketObj );
             delete $session{'Attachments'};
         }
     }
-#Process status updates
-my @BasicActions = ProcessTicketBasics(ARGSRef => \%ARGS, TicketObj=>$Ticket);
-my @results = ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);                            
+    #Process status updates
+    my @BasicActions = ProcessTicketBasics(ARGSRef => \%ARGS, TicketObj=>$TicketObj);
+    my @results = ProcessTicketLinks( TicketObj => $TicketObj, ARGSRef => \%ARGS);                            
 
-push (@Actions, @BasicActions, @results);
+    push (@Actions, @BasicActions, @results);
 }
 </%INIT>
 
diff --git a/rt/html/Ticket/Elements/AddWatchers b/rt/html/Ticket/Elements/AddWatchers
index e9f651593..96dd38f08 100644
--- a/rt/html/Ticket/Elements/AddWatchers
+++ b/rt/html/Ticket/Elements/AddWatchers
@@ -77,6 +77,7 @@ my ($msg, $Users, $Groups);
 if ($UserString) {
     $Users = RT::Users->new($session{'CurrentUser'});
     $Users->Limit(FIELD => $UserField, VALUE => $UserString, OPERATOR => $UserOp);
+    $Users->LimitToPrivileged if $PrivilegedOnly;
      }
 
 if ($GroupString) {
@@ -94,4 +95,5 @@ $UserString => undef
 $GroupField => 'Name'
 $GroupOp => '='
 $GroupString => undef
+$PrivilegedOnly => undef
 </%ARGS>
diff --git a/rt/html/Ticket/Elements/EditCustomField b/rt/html/Ticket/Elements/EditCustomField
index 1fc7d4388..16348061e 100644
--- a/rt/html/Ticket/Elements/EditCustomField
+++ b/rt/html/Ticket/Elements/EditCustomField
@@ -30,6 +30,8 @@
         size="<%$Cols%>"
 % if ($TicketObj) {
           value="<%$Values->Count ? $Values->First->Content : ''%>"
+% } elsif ($Default) {
+          value="<%$Default ? $Default : ''%>"
 % }
 >
 % } elsif ($CustomField->Type eq 'FreeformMultiple') {
@@ -38,6 +40,8 @@
 %          while (my $value = $Values->Next ) {
 %                 $content .= $value->Content;
 %           }
+% } elsif ($Default) {
+          value="<%$Default ? $Default : ''%>"
 %  }
 <input type="hidden" name="<%$NamePrefix%><%$CustomField->Id%>-Values-Magic" value="1">
 <textarea cols=<%$Cols%> rows=<%$Rows%> name="<%$NamePrefix%><%$CustomField->Id%>-Values"><%$content%></textarea>
diff --git a/rt/html/Ticket/Elements/EditLinks b/rt/html/Ticket/Elements/EditLinks
index 7a522dda6..bdb8a6b7d 100644
--- a/rt/html/Ticket/Elements/EditLinks
+++ b/rt/html/Ticket/Elements/EditLinks
@@ -35,10 +35,8 @@
     <td class="labeltop"><&|/l&>Depends on</&>:</td>
     <td class="value">
 % while (my $link = $Ticket->DependsOn->Next) {
-% my $member = $link->TargetObj;
       <INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
-      <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
-      [<%$member->Status%>]<br>
+        <& ShowLink, URI => $link->TargetURI &><br>
 % }
     </td>
   </tr>
@@ -48,8 +46,7 @@
 % while (my $link = $Ticket->DependedOnBy->Next) {
 % my $member = $link->BaseObj;
       <INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-">
-      <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> 
-      [<%$member->Status%>]<br>
+        <& ShowLink, URI => $link->BaseURI &><br>
 % }
     </td>
   </tr>
@@ -57,10 +54,8 @@
     <td class="labeltop"><&|/l&>Parents</&>:</td>
     <td class="value">
 % while (my $link = $Ticket->MemberOf->Next) {
-% my $member = $link->TargetObj;
       <INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
-      <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%>
-      [<%$member->Status%>]<br>
+        <& ShowLink, URI => $link->TargetURI &><br>
 % }
     </td>
   </tr>
@@ -69,9 +64,7 @@
     <td class="value">
 % while (my $link = $Ticket->Members->Next) {
       <INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-">
-% my $member = $link->BaseObj;
-      <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> 
-      [<%$member->Status%>]<br>
+        <& ShowLink, URI => $link->BaseURI &><br>
 % }
     </td>
   </tr>
@@ -80,12 +73,7 @@
     <td class="value">
 % while (my $link = $Ticket->RefersTo->Next) {
       <INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
-% if ($link->TargetURI->IsLocal) {
-% my $member = $link->TargetObj;
-      <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
-% } else {
-      <A HREF="<%$link->TargetURI->Resolver->HREF%>"><%$link->TargetURI->Resolver->AsString%></A><br>
-% }
+        <& ShowLink, URI => $link->TargetURI &><br>
 %}
     </td>
   </tr>
@@ -94,12 +82,7 @@
     <td class="value">
 % while (my $link = $Ticket->ReferredToBy->Next) {
       <INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-">
-% if ($link->BaseURI->IsLocal) {
-% my $member = $link->BaseObj;
-      <a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
-% } else {
-      <A HREF="<%$link->BaseURI->Resolver->HREF%>"><%$link->BaseURI->Resolver->AsString%></A><br>
-%}
+        <& ShowLink, URI => $link->BaseURI &><br>
 % }
     </td>
   </tr>
diff --git a/rt/html/Ticket/Elements/EditPeople b/rt/html/Ticket/Elements/EditPeople
index 1ab8f4ace..a1fc0111a 100644
--- a/rt/html/Ticket/Elements/EditPeople
+++ b/rt/html/Ticket/Elements/EditPeople
@@ -37,7 +37,7 @@
 <& AddWatchers, Ticket => $Ticket, UserString => $UserString,
         UserOp => $UserOp, UserField => $UserField,
 	GroupString => $GroupString, GroupOp => $GroupOp,
-	GroupField => $GroupField &> 
+	GroupField => $GroupField, PrivilegedOnly => $PrivilegedOnly &> 
 </TD><TD VALIGN=TOP>
 <h3><&|/l&>Owner</&></h3>
 <&|/l&>Owner</&>: <& /Elements/SelectOwner, Name => 'Owner', QueueObj => $Ticket->QueueObj, TicketObj => $Ticket, Default => $Ticket->OwnerObj->Id &>
@@ -64,5 +64,6 @@ $UserString => undef
 $GroupField => undef
 $GroupOp => undef
 $GroupString => undef
+$PrivilegedOnly => undef
 $Ticket => undef
 </%ARGS>
diff --git a/rt/html/Ticket/Elements/ShowAttachments b/rt/html/Ticket/Elements/ShowAttachments
index 22b60d11b..590a011fb 100644
--- a/rt/html/Ticket/Elements/ShowAttachments
+++ b/rt/html/Ticket/Elements/ShowAttachments
@@ -47,7 +47,7 @@ if ($size) {
 </%PERL>
 
 <li><font <%$fontsize%>>
-        <A HREF="<%$RT::WebPath%>/Ticket/Attachment/<%$rev->TransactionObj->Id%>/<%$rev->Id%>/<%$rev->Filename%>"><%$rev->CreatedAsString%> (<% $size %>)</a></font></li>
+        <A HREF="<%$RT::WebPath%>/Ticket/Attachment/<%$rev->TransactionObj->Id%>/<%$rev->Id%>/<%$rev->Filename | u%>"><%$rev->CreatedAsString%> (<% $size %>)</a></font></li>
 % }
 % $fontsize='size="-2"';
 % }
@@ -63,6 +63,9 @@ my %documents;
 my $transactions = $Ticket->Transactions();
 while (my $trans = $transactions->Next()) {
         my $attachments = $trans->Attachments();
+	$attachments->Columns( qw( Id Filename ContentType Headers Subject Parent ContentEncoding ContentType TransactionId) );
+        $attachments->Limit(FIELD => 'Filename', OPERATOR => 'IS NOT', VALUE => 'NULL', QUOTEVALUE => 0, ENTRYAGGREGATOR => 'AND');
+        $attachments->Limit(FIELD => 'Filename', OPERATOR => '!=', VALUE => '', ENTRYAGGREGATOR => 'AND');
         while (my $attach = $attachments->Next()) {
               next unless ($attach->Filename());
               # most recent at the top
diff --git a/rt/html/Ticket/Elements/ShowDates b/rt/html/Ticket/Elements/ShowDates
index da7f75bb6..b09b4bf7b 100644
--- a/rt/html/Ticket/Elements/ShowDates
+++ b/rt/html/Ticket/Elements/ShowDates
@@ -21,6 +21,7 @@
 %# 
 %# 
 %# END LICENSE BLOCK
+
 <TABLE>
   <TR>
     <TD class="label"><&|/l&>Created</&>:</TD>
@@ -35,7 +36,7 @@
     <TD class="value"><% $Ticket->StartedObj->AsString %></TD>
   </TR>
   <TR>
-    <TD class="label"><&|/l&>Last Contact</&>:</TD>
+    <TD class="label"><a href="Display.html?id=<%$Ticket->id%>&Action=SetTold"><&|/l&>Last Contact</&></a>:</TD>
     <TD class="value"><% $Ticket->ToldObj->AsString %></TD>
   </TR>
   <TR>
@@ -48,9 +49,15 @@
   </TR>
   <TR>
     <TD class="label"><&|/l&>Updated</&>:</TD>
-    <TD class="value"><A HREF="#lasttrans"><% $Ticket->LastUpdated ? (loc("[_1] by [_2]", $Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)) : loc("Never") | h %></a></TD>
+% my $UpdatedString = $Ticket->LastUpdated ? (loc("[_1] by [_2]", $Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)) : loc("Never");
+% if ($UpdatedLink) {
+    <TD class="value"><A HREF="#lasttrans"><% $UpdatedString | h %></a></TD>
+% } else {
+    <TD class="value"><% $UpdatedString | h %></TD>
+% }
   </TR>
 </TABLE>
 <%ARGS>
 $Ticket => undef
+$UpdatedLink => 1
 </%ARGS>
diff --git a/rt/html/Ticket/Elements/ShowHistory b/rt/html/Ticket/Elements/ShowHistory
index 2958f8706..194be9b37 100644
--- a/rt/html/Ticket/Elements/ShowHistory
+++ b/rt/html/Ticket/Elements/ShowHistory
@@ -62,7 +62,7 @@ else {
 %	if ($Transactions->IsLast) {
 	<a name="lasttrans"></a>
 % 	}
-	    <& ShowTransaction, Ticket => $Ticket, Transaction => $Transaction, ShowHeaders => $ShowHeaders, Collapsed => $Collapsed, RowNum => $i, ShowTitleBarCommands => $ShowTitleBarCommands  &>
+	    <& ShowTransaction, Ticket => $Ticket, Transaction => $Transaction, ShowHeaders => $ShowHeaders, Collapsed => $Collapsed, RowNum => $i, ShowTitleBarCommands => $ShowTitleBarCommands, %ARGS &>
 % }
 </TABLE>
 % if ($ShowDisplayModes or $ShowTitle) {
diff --git a/rt/html/Ticket/Elements/ShowMessageStanza b/rt/html/Ticket/Elements/ShowMessageStanza
index b0998068f..8e3045a36 100644
--- a/rt/html/Ticket/Elements/ShowMessageStanza
+++ b/rt/html/Ticket/Elements/ShowMessageStanza
@@ -21,6 +21,8 @@
 %# 
 %# 
 %# END LICENSE BLOCK
+% if (ref($Message)) {
+<font color="<%$colors[$Depth]%>">
 <%perl>
 foreach my $stanza (@$Message) {
     if ( ref $stanza eq "ARRAY" ) {
@@ -36,8 +38,16 @@ foreach my $stanza (@$Message) {
                 $content =~ s/\n/<br>/gi;
 
 </%perl>
-<font color="<%$colors[$Depth]%>"><%$content |n%><br></font>
+<%$content |n%><br>
 %       }
+% } # end foreach
+</font>
+% } else {
+% my $content = $Message;
+%        RT::Interface::Web::EscapeUTF8(\$content);
+%        $m->comp('/Elements/Callback', content => \$content, %ARGS);
+%                $content =~ s/\n/<br>/gi;
+<%$content |n%><br>
 % }
 <%INIT>
 use URI::URL;
diff --git a/rt/html/Ticket/Elements/ShowPeople b/rt/html/Ticket/Elements/ShowPeople
index 0b8026949..160da70d9 100644
--- a/rt/html/Ticket/Elements/ShowPeople
+++ b/rt/html/Ticket/Elements/ShowPeople
@@ -27,15 +27,15 @@
     <td class="value"><%$Ticket->OwnerObj->Name%></td>
   </tr>
   <tr>
-    <td class="label"><&|/l&>Requestors</&>:</td>
+    <td class="labeltop"><&|/l&>Requestors</&>:</td>
     <td class="value"><%$Ticket->RequestorAddresses%></td>
   </tr>
   <tr>
-    <td class="label"><&|/l&>Cc</&>:</td>
+    <td class="labeltop"><&|/l&>Cc</&>:</td>
     <td class="value"><%$Ticket->CcAddresses%></td>
   </tr>
   <tr>
-    <td class="label"><&|/l&>AdminCc</&>:</td>
+    <td class="labeltop"><&|/l&>AdminCc</&>:</td>
     <td class="value"><%$Ticket->AdminCcAddresses%></td>
   </tr>
 </table>
diff --git a/rt/html/Ticket/Elements/ShowTransaction b/rt/html/Ticket/Elements/ShowTransaction
index f2f89d35c..2d710fcbc 100644
--- a/rt/html/Ticket/Elements/ShowTransaction
+++ b/rt/html/Ticket/Elements/ShowTransaction
@@ -38,8 +38,6 @@
 unless ($Collapsed) {
  $attachments->GotoFirstItem;
  while (my $message=$attachments->Next) {
-     #we don't want to show any empty transactions, unless they have kids
-     next unless ($message->ContentLength || $message->Children->Count);
 
   my ($headers, $quoted);
       if ($ShowHeaders && ($ShowHeaders == $Ticket->Id)) {
@@ -53,11 +51,18 @@ unless ($Collapsed) {
 	   eval {$headers =~ s/^([^:]+)(?=:)/loc($1)/em; } # we eval here to catch errors when 5.6 panics
       }
      # 13456 is a random # of about the biggest size we want to see inline text
-     my $MAX_INLINE_BODY = 13456;
+     # It's here to catch anyone who hasn't updated RT_Config.pm since this
+     # constant was moved out there.
+     my $MAX_INLINE_BODY = $RT::MaxInlineBody || 13456;
      if ($message->ContentType =~ m{^(text/plain|message|text$)}i && 
 				    $message->ContentLength < $MAX_INLINE_BODY ) {
+         eval {
          require Text::Quoted;
-	 $quoted = Text::Quoted::extract($message->Content); 
+	     $quoted = Text::Quoted::extract($message->Content); 
+        }; 
+        if ($@) {
+            $quoted = $message->Content;
+        }
      }
         
 </%PERL>
@@ -69,7 +74,12 @@ unless ($Collapsed) {
 	<PRE>
 <& ShowMessageHeaders, Headers => $headers, Transaction => $Transaction &>
 </PRE>
+% if (!length($quoted) && $message->ContentType =~ m#^text/#) {
+<blockquote><i><&|/l&>Message body not shown because it is too large or is not plain text.</&><br>
+<&|/l&>You can access it with the Download button on the right.</&></i></blockquote>
+% } else {
 <& ShowMessageStanza, Depth => 0, Message => $quoted, Transaction => $Transaction &>
+% }
 </span>
       </TD>
       <TD VALIGN=TOP ALIGN=RIGHT>
@@ -78,7 +88,7 @@ unless ($Collapsed) {
 <BR>
 % }
 <%PERL>
-my $size = $message->ContentLength;
+my $size = $message->ContentLength or next;
 
 if ($size) {
     if ($size > 1024) {
@@ -88,7 +98,7 @@ if ($size) {
 	$size = loc("[_1]b", $size);
     }
 </%PERL>
-<font size=-1><A HREF="<%$RT::WebPath%>/Ticket/Attachment/<%$Transaction->Id%>/<%$message->Id%>/<%$message->Filename%>"><&|/l&>Download</&> <% $message->Filename|| loc('(untitled)') %></a> <% $size %></font>
+<font size=-1><A HREF="<%$AttachPath%>/<%$Transaction->Id%>/<%$message->Id%>/<%$message->Filename | u%>"><&|/l&>Download</&> <% $message->Filename|| loc('(untitled)') %></a> <% $size %></font>
 % }
 </TD>
 </TR>
@@ -104,6 +114,7 @@ $ShowHeaders => 0
 $Collapsed => undef
 $ShowTitleBarCommands => 1
 $RowNum => 1
+$AttachPath => $RT::WebPath."/Ticket/Attachment"
 </%ARGS>
 
 <%INIT>
@@ -147,6 +158,7 @@ if ($Transaction->TimeTaken > 0) {
 	$TimeTaken = $Transaction->TimeTaken." min"
 }
 my $attachments = $Transaction->Attachments;
+$attachments->Columns( qw( Id Filename ContentType Headers Subject Parent ContentEncoding ContentType TransactionId) );
 
 my $titlebar_commands='&nbsp;';
 
diff --git a/rt/html/Ticket/Elements/Tabs b/rt/html/Ticket/Elements/Tabs
index 81c92e8c2..cba45df91 100644
--- a/rt/html/Ticket/Elements/Tabs
+++ b/rt/html/Ticket/Elements/Tabs
@@ -45,11 +45,17 @@ my $id   = $Ticket->id();
 
 if ( defined $session{'tickets'} ) {
 
+        # we have to update session data if we get new ItemMap
+        my $updatesession = 1 unless($session{'tickets'}->{'item_map'});
 
-my $item_map = $session{'tickets'}->ItemMap;
+        my $item_map = $session{'tickets'}->ItemMap;
 
-            # Don't $current_toptab = display prev links if we're on the first ticket
+        if ($updatesession) {
+                $session{'i'}++;
+		$session{'tickets'}->PrepForSerialization();
+        }
 
+        # Don't $current_toptab = display prev links if we're on the first ticket
         if ($item_map->{$Ticket->Id}->{prev}) {
                 $searchtabs->{'_a'} = {
                             class => "nav",
diff --git a/rt/html/Ticket/Modify.html b/rt/html/Ticket/Modify.html
index c97fd0994..e504a3cba 100644
--- a/rt/html/Ticket/Modify.html
+++ b/rt/html/Ticket/Modify.html
@@ -46,7 +46,7 @@ my $CustomFields = $TicketObj->QueueObj->CustomFields();
 $m->comp('/Elements/Callback', TicketObj => $TicketObj, CustomFields => $CustomFields, %ARGS);
 
 my @results = ProcessTicketBasics(TicketObj => $TicketObj, ARGSRef => \%ARGS);
-my @cf_results = ProcessTicketCustomFieldUpdates(ARGSRef => \%ARGS);
+my @cf_results = ProcessTicketCustomFieldUpdates(TicketObj => $TicketObj, ARGSRef => \%ARGS);
 push (@results, @cf_results);
 
 # TODO: display the results, even if we can't display the ticket
diff --git a/rt/html/Ticket/ModifyAll.html b/rt/html/Ticket/ModifyAll.html
index a50689398..1163f3fa5 100644
--- a/rt/html/Ticket/ModifyAll.html
+++ b/rt/html/Ticket/ModifyAll.html
@@ -115,7 +115,7 @@ my (@wresults, @results,  @dresults, @lresults, @cf_results);
 unless ($OnlySearchForPeople) {
     @wresults = ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS);
     @results = ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS);
- @cf_results = ProcessTicketCustomFieldUpdates(ARGSRef => \%ARGS);
+ @cf_results = ProcessTicketCustomFieldUpdates( TicketObj => $Ticket, ARGSRef => \%ARGS);
     @dresults = ProcessTicketDates( TicketObj => $Ticket, ARGSRef => \%ARGS);
     @lresults = ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);
 
diff --git a/rt/html/Ticket/ModifyPeople.html b/rt/html/Ticket/ModifyPeople.html
index 2e41664d9..debd27a97 100644
--- a/rt/html/Ticket/ModifyPeople.html
+++ b/rt/html/Ticket/ModifyPeople.html
@@ -44,7 +44,7 @@ my (@results, @wresults);
 my $Ticket = LoadTicket($id);
 
 # if we're trying to search for watchers and nothing else
-unless ($OnlySearchForPeople) {
+unless ($OnlySearchForPeople or $OnlySearchForGroup) {
     @results = ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS);
     @wresults = ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS);
 }
@@ -56,6 +56,7 @@ push @results, @wresults;
 
 <%ARGS>
 $OnlySearchForPeople => undef
+$OnlySearchForGroup => undef
 $UserField => undef
 $UserOp => undef
 $UserString => undef
diff --git a/rt/html/Ticket/Update.html b/rt/html/Ticket/Update.html
index e19aacf6a..ad3b21787 100644
--- a/rt/html/Ticket/Update.html
+++ b/rt/html/Ticket/Update.html
@@ -23,7 +23,7 @@
 %# END LICENSE BLOCK
 <& /Elements/Header, Title => $title &>
 <& /Ticket/Elements/Tabs, 
-    Ticket => $Ticket , 
+    Ticket => $TicketObj, 
     Title=> $title &>
 
 <FORM ACTION="Update.html" NAME="TicketUpdate" 
@@ -35,20 +35,20 @@
 
 <TABLE>
 <TR><TD>
-<a href="ModifyPeople.html?id=<%$Ticket->Id%>"><&|/l&>Ticket watchers</&></A></TD><TD align=right>
+<a href="ModifyPeople.html?id=<%$TicketObj->Id%>"><&|/l&>Ticket watchers</&></A></TD><TD align=right>
 <&|/l&>Requestor</&>:
 </TD><TD>
-<b><% $Ticket->RequestorAddresses %></b>
+<b><% $TicketObj->RequestorAddresses %></b>
 </TD></TR>
 <TR><TD>&nbsp;</TD><TD align=right>
 <&|/l&>Cc</&>:
 </TD><TD>
-<b><% $Ticket->CcAddresses %></b>
+<b><% $TicketObj->CcAddresses %></b>
 </TD></TR>
 <TR><TD>&nbsp;</TD><TD align=right>
 <&|/l&>AdminCc</&>:
 </TD><TD>
-<b><% $Ticket->AdminCcAddresses %></b>
+<b><% $TicketObj->AdminCcAddresses %></b>
 </TD></TR>
 </TR>
 </TABLE>
@@ -60,7 +60,7 @@
 <td>
 <& /Elements/SelectStatus, Name=>"Status", Default => $DefaultStatus &>
 <&|/l&>Owner</&>:  
-<& /Elements/SelectOwner, Name=>"Owner", Default => ($ARGS{'Owner'} || $Ticket->OwnerObj->Id()), QueueObj => $Ticket->QueueObj, TicketObj => $Ticket &>
+<& /Elements/SelectOwner, Name=>"Owner", Default => ($ARGS{'Owner'} || $TicketObj->OwnerObj->Id()), QueueObj => $TicketObj->QueueObj, TicketObj => $TicketObj &>
 <&|/l&>Worked</&>: <input size=4 name="UpdateTimeWorked" value="<% $ARGS{UpdateTimeWorked}%>"> <&|/l&>minutes</&></td></tr>
 <tr><td align=right><&|/l&>Update Type</&>:</td>
 <td><select name="UpdateType">
@@ -72,7 +72,7 @@
 % }
 </select> 
 </td></tr>
-<tr><td align=right><&|/l&>Subject</&>:</td><td> <input name="UpdateSubject" size=60 value="<% ($ARGS{UpdateSubject}) ? $ARGS{UpdateSubject} : $Ticket->Subject()%>"></td></tr>
+<tr><td align=right><&|/l&>Subject</&>:</td><td> <input name="UpdateSubject" size=60 value="<% ($ARGS{UpdateSubject}) ? $ARGS{UpdateSubject} : $TicketObj->Subject()%>"></td></tr>
 <tr><td align=right><&|/l&>Cc</&>:</td><td> <input name="UpdateCc" size=60
 value=<% $ARGS{UpdateCc} %>><BR>
 <i><font size=-2>
@@ -101,12 +101,12 @@ value=<% $ARGS{UpdateCc} %>><BR>
 <& /Elements/Callback, _CallbackName => 'BeforeMessageBox', %ARGS &>
 % if (exists $ARGS{UpdateContent}) {
 % delete $ARGS{'QuoteTransaction'};
-<& /Elements/MessageBox, Name=>"UpdateContent", Default=>$ARGS{UpdateContent}, %ARGS&>
+<& /Elements/MessageBox, Name=>"UpdateContent", Default=>$ARGS{UpdateContent}, IncludeSignature => 0, %ARGS&>
 % } else {
 <& /Elements/MessageBox, Name=>"UpdateContent", %ARGS &>
 % }
 </td></tr>
-		<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>"><br>
+		<INPUT TYPE=HIDDEN NAME=id VALUE="<%$TicketObj->Id%>"><br>
 </table>
 
 
@@ -123,10 +123,10 @@ my $CanRespond = 0;
 my $CanComment = 0;
 my $title;
 
-my $Ticket = LoadTicket($id);
+my $TicketObj = LoadTicket($id);
 
 unless($DefaultStatus){
-    $DefaultStatus=($ARGS{'Status'} ||$Ticket->Status());
+    $DefaultStatus=($ARGS{'Status'} ||$TicketObj->Status());
 }
 
 if ($DefaultStatus =~ '^new$'){
@@ -134,9 +134,9 @@ if ($DefaultStatus =~ '^new$'){
 }
 
 if ($DefaultStatus eq 'resolved') {
-    $title = loc("Resolve ticket #[_1] ([_2])", $Ticket->id, $Ticket->Subject);
+    $title = loc("Resolve ticket #[_1] ([_2])", $TicketObj->id, $TicketObj->Subject);
 } else {
-    $title = loc("Update ticket #[_1] ([_2])", $Ticket->id, $Ticket->Subject);
+    $title = loc("Update ticket #[_1] ([_2])", $TicketObj->id, $TicketObj->Subject);
 }
 
 # Things needed in the template - we'll do the processing here, just
@@ -150,11 +150,11 @@ if (($Action eq 'Comment') or ($ARGS{'UpdateType'} eq 'private')) {
 }
 
 
-$CanRespond = 1 if ( $Ticket->CurrentUserHasRight('ReplyToTicket') or
-                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
+$CanRespond = 1 if ( $TicketObj->CurrentUserHasRight('ReplyToTicket') or
+                     $TicketObj->CurrentUserHasRight('ModifyTicket') ); 
 
-$CanComment = 1 if ( $Ticket->CurrentUserHasRight('CommentOnTicket') or
-                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
+$CanComment = 1 if ( $TicketObj->CurrentUserHasRight('CommentOnTicket') or
+                     $TicketObj->CurrentUserHasRight('ModifyTicket') ); 
 
 
 # {{{ deal with deleting uploaded attachments
@@ -193,7 +193,7 @@ unless (keys %{$session{'Attachments'}} and $ARGS{'UpdateAttach'}) {
 # }}}
 
 if ( exists $ARGS{SubmitTicket} ) {
-    $m->comp('Display.html', %ARGS);
+    $m->comp('Display.html', TicketObj => $TicketObj, %ARGS);
     return;
 }
 </%INIT>
diff --git a/rt/html/User/Prefs.html b/rt/html/User/Prefs.html
index b89fc40ae..c2746a38c 100644
--- a/rt/html/User/Prefs.html
+++ b/rt/html/User/Prefs.html
@@ -38,21 +38,44 @@
 <& /Elements/TitleBoxStart, title => loc('Identity') &>
 
 <input type=hidden name="Name" value="<%$UserObj->Name%>">
-<&|/l&>Email</&>: <input name="EmailAddress" value="<%$UserObj->EmailAddress%>">
-<BR>
-<&|/l&>Real Name</&>: <input name="RealName" value="<%$UserObj->RealName%>"> 
-<BR>
-<&|/l&>Nickname</&>: <input name="NickName" value="<%$UserObj->NickName%>">
+<table callspacing=0 cellpadding=0>
+  <tr>
+    <td class=label><&|/l&>Email</&>: </td>
+    <td class=value><input name="EmailAddress" value="<%$UserObj->EmailAddress%>"></td>
+  </tr>
+  <tr>
+    <td class=label><&|/l&>Real Name</&>:</td>
+    <td class=value><input name="RealName" value="<%$UserObj->RealName%>"></td>  </tr>
+  <tr>
+    <td class=label><&|/l&>Nickname</&>:</td>
+    <td class=value><input name="NickName" value="<%$UserObj->NickName%>"></td>
+  </tr>
+  <tr>
+    <td class=label><&|/l&>Language</&>:</td>
+    <td class=value><& /Elements/SelectLang, Name => 'Lang', Default => $UserObj->Lang &></td>
+  </tr>
+</table>
 <& /Elements/TitleBoxEnd &>
 <br>
 <& /Elements/TitleBoxStart, title => loc('Phone numbers') &>
-<&|/l&>Residence</&>: <input name="HomePhone" value="<%$UserObj->HomePhone%>" size=13>
-<BR>
-<&|/l&>Work</&>: <input name="WorkPhone" value="<%$UserObj->WorkPhone%>" size=13>
-<BR>
-<&|/l&>Mobile</&>: <input name="MobilePhone" value="<%$UserObj->MobilePhone%>" size=13>
-<BR>
-<&|/l&>Pager</&>: <input name="PagerPhone" value="<%$UserObj->PagerPhone%>" size=13>
+<table callspacing=0 cellpadding=0>
+  <tr>
+    <td class=label><&|/l&>Residence</&>:</td>
+    <td class=value><input name="HomePhone" value="<%$UserObj->HomePhone%>" size=13></td>
+  </tr>
+  <tr>
+    <td class=label><&|/l&>Work</&>:</td>
+    <td class=value><input name="WorkPhone" value="<%$UserObj->WorkPhone%>" size=13></td>
+  </tr>
+  <tr>
+    <td class=label><&|/l&>Mobile</&>:</td>
+    <td class=value><input name="MobilePhone" value="<%$UserObj->MobilePhone%>" size=13></td>
+  </tr>
+  <tr>
+    <td class=label><&|/l&>Pager</&>:</td>
+    <td class=value><input name="PagerPhone" value="<%$UserObj->PagerPhone%>" size=13></td>
+  </tr>
+</table>
 <& /Elements/TitleBoxEnd &>
 </TD>
 <TD VALIGN=TOP>
@@ -60,44 +83,58 @@
 <& /Elements/TitleBoxStart, title => loc('Password') &>
 <TABLE>
 <TR>
-<TD ALIGN=RIGHT>
+<TD class=label>
 <&|/l&>New Password</&>:
 </TD>
-<TD ALIGN=LEFT>
+<TD class=value>
 <input type=password name="Pass1">
 </TD>
 </TR>
-<TR><TD ALIGN=RIGHT>
+<TR><TD class=label>
 <&|/l&>Retype Password</&>:
 </TD>
-<TD>
+<TD class=value>
 <input type=password name="Pass2">
 </TD>
 </TR>
 </TABLE>
-% }
 <& /Elements/TitleBoxEnd &>
+% }
 </TD>
 <TR>
 
 <TD VALIGN=TOP>
 <& /Elements/TitleBoxStart, title => loc('Location') &>
-<&|/l&>Organization</&>: <input name="Organization" value="<%$UserObj->Organization%>">
-<BR>
-<&|/l&>Address1</&>: <input name="Address1" value="<%$UserObj->Address1%>">
-<BR>
-<&|/l&>Address2</&>: <input name="Address2" value="<%$UserObj->Address2%>">
-<BR>
-<&|/l&>City</&>: <input name="City" value="<%$UserObj->City%>" size=14>
-
-<&|/l&>State</&>: <input name="State" value="<%$UserObj->State%>" size=3>
-
-<&|/l&>Zip</&>: <input name="Zip" value="<%$UserObj->Zip%>" size=9>
-<BR>
-<&|/l&>Country</&>: <input name="Country" value="<%$UserObj->Country%>">
-<BR>
-
-
+<table callspacing=0 cellpadding=0>
+  <tr>
+    <td class=label><&|/l&>Organization</&>:</td>
+    <td class=value><input name="Organization" value="<%$UserObj->Organization%>"></td>
+  </tr>
+  <tr>
+    <td class=label><&|/l&>Address1</&>:</td>
+    <td class=value><input name="Address1" value="<%$UserObj->Address1%>"></td>
+  </tr>
+  <tr>
+    <td class=label><&|/l&>Address2</&>:</td>
+    <td class=value><input name="Address2" value="<%$UserObj->Address2%>"></td>
+  </tr>
+  <tr>
+    <td class=label><&|/l&>City</&>:</td>
+    <td><input name="City" value="<%$UserObj->City%>" size=14></td>
+  </tr>
+  <tr>
+    <td class=label><&|/l&>State</&>:</td>
+    <td class=value><input name="State" value="<%$UserObj->State%>" size=3></td>
+  </tr>
+  <tr>
+    <td class=label><&|/l&>Zip</&>:</td>
+    <td class=value><input name="Zip" value="<%$UserObj->Zip%>" size=9></td>
+  </tr>
+  <tr>
+    <td class=label><&|/l&>Country</&>:</td>
+    <td class=value><input name="Country" value="<%$UserObj->Country%>"></td>
+  </tr>
+</table>
 <& /Elements/TitleBoxEnd &>
 </TD>
 </TR>
@@ -147,12 +184,13 @@ if ($UserObj->Id) {
 		    Organization RealName NickName Lang EmailEncoding WebEncoding 
 		    ExternalContactInfoId ContactInfoSystem Gecos ExternalAuthId 
 		    AuthSystem HomePhone WorkPhone MobilePhone PagerPhone Address1
-		Address2 City State Zip Country 
+		Address2 City State Zip Country Lang
 		   );
     
     my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
 					    Object => $UserObj,
 					    ARGSRef => \%ARGS );
+    $session{'CurrentUser'}->LanguageHandle($Lang) if $Lang;
     push (@results,@fieldresults);
 
 
diff --git a/rt/html/autohandler b/rt/html/autohandler
index ce8b7569e..b2a407add 100644
--- a/rt/html/autohandler
+++ b/rt/html/autohandler
@@ -27,18 +27,24 @@
 $RT::Handle->ForceRollback() if $RT::Handle->TransactionDepth;
 
 
-local *session;
+local *session unless $m->is_subrequest; # avoid reentrancy, as suggested by masonbook
+
+# Disable AutoFlush using an attribute
+if ($m->request_comp->attr_exists('AutoFlush')) {
+    $m->autoflush($m->request_comp->attr('AutoFlush'));
+}
+
 %ARGS = map {
-    # if they've passed multiple values, they'll be an array. if they've passed just one, a scalar
-    # whatever they are, mark them as utf8
+    # if they've passed multiple values, they'll be an array. if they've 
+    # passed just one, a scalar whatever they are, mark them as utf8
     my $type = ref($_);
     (!$type)
 	? Encode::decode(utf8 => $_, Encode::FB_PERLQQ) :
-    ($type eq 'ARRAY')
+	($type eq 'ARRAY')
 	? [ map { ref($_) ? $_ : Encode::decode(utf8 => $_, Encode::FB_PERLQQ) } @$_ ] :
-    ($type eq 'HASH')
+	($type eq 'HASH')
 	? { map { ref($_) ? $_ : Encode::decode(utf8 => $_, Encode::FB_PERLQQ) } %$_ } : $_
-} %ARGS;
+    } %ARGS;
 
 if ($ARGS{'Debug'}) {
         require Time::HiRes;
@@ -65,69 +71,95 @@ if ($m->base_comp->path =~ '^/+NoAuth/' ||
     $m->abort();
 }
 
-# If RT is configured for external auth, let's get REMOTE_USER
-elsif ($RT::WebExternalAuth and length($ENV{'REMOTE_USER'})) {
-    my $orig_user = $user;
-
-    $user = $ENV{'REMOTE_USER'};
-    $session{'CurrentUser'} = RT::CurrentUser->new();
-    my $load_method = $RT::WebExternalGecos ? 'LoadByGecos' : 'Load';
-    
-    if ($^O eq 'MSWin32' and $RT::WebExternalGecos) {
-    	my $NodeName = Win32::NodeName();
-    	$user =~ s/^\Q$NodeName\E\\//i;
-    }
-
-    $session{'CurrentUser'}->$load_method($user);
-
-    if ($RT::WebExternalAuto and !$session{'CurrentUser'}->Id() ) {
-	# Create users on-the-fly with default attributes
-
-	my $UserObj = RT::User->new(RT::CurrentUser->new('root'));
-
-	my ($val, $msg) = $UserObj->Create(
-	    %{ref($RT::AutoCreate) ? $RT::AutoCreate : {}},
-	    Name	 => $user,
-	    Gecos	 => $user,
-	);
-
-	if ($val) {
-	    $UserObj->SetPrivileged(1);
-
-	    if ($^O !~ /^(?:riscos|MacOS|MSWin32|dos|os2)$/) {
-		# Populate fields with information from Unix /etc/passwd
-
-		my ($comments, $realname) = (getpwnam($user))[5, 6];
-		$UserObj->SetComments($comments) if defined $comments;
-		$UserObj->SetRealName($realname) if defined $realname;
+# If RT is configured for external auth, let's go through and get REMOTE_USER
+elsif ( $RT::WebExternalAuth ) {
+
+    # do we actually have a REMOTE_USER equivlent?
+    if ( RT::Interface::Web::WebCanonicalizeInfo() ) {
+
+	my $orig_user = $user;
+	
+	$user = RT::Interface::Web::WebCanonicalizeInfo();
+	$session{'CurrentUser'} = RT::CurrentUser->new();
+	my $load_method = $RT::WebExternalGecos ? 'LoadByGecos' : 'Load';
+	
+	if ($^O eq 'MSWin32' and $RT::WebExternalGecos) {
+	    my $NodeName = Win32::NodeName();
+	    $user =~ s/^\Q$NodeName\E\\//i;
+	}
+	
+	$session{'CurrentUser'}->$load_method($user);
+	
+	if ($RT::WebExternalAuto and !$session{'CurrentUser'}->Id() ) {
+	    # Create users on-the-fly
+	    
+	    my $UserObj = RT::User->new(RT::CurrentUser->new('root'));
+	    
+	    my ($val, $msg) = $UserObj->Create(
+					       %{ref($RT::AutoCreate) ? $RT::AutoCreate : {}},
+					       Name   => $user,
+					       Gecos  => $user,
+					       );
+	    
+	    if ($val) {
+		
+		# now get user specific information, to better create our user.
+		my $new_user_info = RT::Interface::Web::WebExternalAutoInfo($user);
+		
+		# set the attributes that have been defined.
+		# FIXME: this is a horrible kludge. I'm sure there's something cleaner
+		foreach my $attribute ('Name', 'Comments', 'Signature', 'EmailAddress',
+				       'PagerEmailAddress', 'FreeformContactInfo',
+				       'Organization', 'Disabled', 'Privileged',
+				       'RealName', 'NickName', 'Lang', 'EmailEncoding',
+				       'WebEncoding', 'ExternalContactInfoId',
+				       'ContactInfoSystem', 'ExternalAuthId', 'Gecos',
+				       'HomePhone', 'WorkPhone', 'MobilePhone',
+				       'PagerPhone', 'Address1', 'Address2', 'City',
+				       'State', 'Zip', 'Country') {
+		    
+		    my $method = "Set$attribute";
+		    $UserObj->$method($new_user_info->{$attribute}) 
+			if( defined $new_user_info->{$attribute} );
+		}	    
+		$session{'CurrentUser'}->Load($user);
 	    }
-	    elsif ($^O eq 'MSWin32' and eval 'use Net::AdminMisc; 1') {
-		# Populate fields with information from NT domain controller
+	    else {
+		# we failed to successfully create the user. abort abort abort.
+		delete $session{'CurrentUser'};
+		$m->abort() unless $RT::WebFallbackToInternalAuth;
+		$m->comp('/Elements/Login', %ARGS, 
+			 Error=> loc('Cannot create user: [_1]', $msg));
 	    }
-
-	    $session{'CurrentUser'}->Load($user);
 	}
-	else {
+	
+	unless ( $session{'CurrentUser'}->Id() ) {
 	    delete $session{'CurrentUser'};
-	    $m->abort() unless $RT::WebFallbackToInternalAuth;
-	    $m->comp('/Elements/Login', %ARGS, Error=> loc('Cannot create user: [_1]', $msg));
+	    $user = $orig_user;
+	    
+	    if ( $RT::WebExternalOnly ) {	        
+		$m->comp('/Elements/Login', %ARGS, 
+			 Error=> loc('You are not an authorized user'));
+		$m->abort();
+	    }
 	}
     }
-
-    unless ( $session{'CurrentUser'}->Id() ) {
-        delete $session{'CurrentUser'};
-        $user = $orig_user;
-
-	if ( $RT::WebExternalOnly ) {	        
-	    $m->comp('/Elements/Login', %ARGS, Error=> loc('You are not an authorized user'));
-	    $m->abort();
+    elsif ($RT::WebFallbackToInternalAuth) {
+  	unless (defined($session{'CurrentUser'})) {
+	        $m->comp('/Elements/Login', %ARGS,
+                         Error=> loc('XXX CHANGEME You are not an authorized user'));
+                $m->abort();
 	}
+    } else {
+	# WebExternalAuth is set, but we don't have a REMOTE_USER. abort
+	delete $session{'CurrentUser'} if defined $session{'CurrentUser'};
     }
 }
 
 delete $session{'CurrentUser'}
     unless $session{'CurrentUser'} and defined $session{'CurrentUser'}->Id;
 
+
 # Process per-page authentication callbacks
 $m->comp('/Elements/Callback', %ARGS, _CallbackName => 'Auth');
 
diff --git a/rt/html/index.html b/rt/html/index.html
index 39eac8d61..798972d94 100644
--- a/rt/html/index.html
+++ b/rt/html/index.html
@@ -53,7 +53,8 @@ if ( $ARGS{'q'} ) {
     $session{'tickets'} = RT::Tickets->new( $session{'CurrentUser'} );
 
     if ( $query =~ m/\@/ ) {
-        $session{'tickets'}->LimitRequestor( VALUE    => $query,
+        $session{'tickets'}->LimitWatcher( VALUE    => $query,
+                                            TYPE => 'Requestor',
                                              OPERATOR => '=', );
         $m->redirect("$RT::WebPath/Search/Listing.html");
     }
diff --git a/rt/lib/RT.pm b/rt/lib/RT.pm
index 90c332bc0..7e941a2b2 100644
--- a/rt/lib/RT.pm
+++ b/rt/lib/RT.pm
@@ -47,7 +47,7 @@ use vars qw($VERSION $System $SystemUser $Nobody $Handle $Logger
         $MasonSessionDir
 );
 
-$VERSION = '3.0.4';
+$VERSION = '3.0.9';
 $CORE_CONFIG_FILE = "/opt/rt3/etc/RT_Config.pm";
 $SITE_CONFIG_FILE = "/opt/rt3/etc/RT_SiteConfig.pm";
 
@@ -117,13 +117,10 @@ sub LoadConfig {
 =cut
 
 sub Init {
-    require RT::Handle;
+
     #Get a database connection
-        unless ($Handle && $Handle->dbh->ping) {
-    $Handle = RT::Handle->new();
-        } 
-    $Handle->Connect();
-    
+    ConnectToDatabase();
+
     #RT's system user is a genuine database user. its id lives here
     $SystemUser = new RT::CurrentUser();
     $SystemUser->LoadByName('RT_System');
@@ -137,6 +134,21 @@ sub Init {
    InitLogging(); 
 }
 
+  
+=head2 ConnectToDatabase
+
+Get a database connection
+
+=cut
+ 
+sub ConnectToDatabase {
+    require RT::Handle;
+    unless ($Handle && $Handle->dbh && $Handle->dbh->ping) {
+        $Handle = RT::Handle->new();
+    } 
+    $Handle->Connect();
+}
+    
 =head2 InitLogging
 
 Create the RT::Logger object. 
@@ -282,8 +294,15 @@ sub DropSetGIDPermissions {
 
 =head1 BUGS
 
+Please report them to rt-3.0-bugs@fsck.com, if you know what's broken and have at least some idea of what needs to be fixed.
+If you're not sure what's going on, report them rt-devel@lists.fsck.com.
+
 =head1 SEE ALSO
 
+L<RT::StyleGuide>
+L<DBIx::SearchBuilder>
+
+
 
 =begin testing
 
diff --git a/rt/lib/RT.pm.in b/rt/lib/RT.pm.in
index 065734e2f..14c0d47ca 100644
--- a/rt/lib/RT.pm.in
+++ b/rt/lib/RT.pm.in
@@ -117,13 +117,10 @@ sub LoadConfig {
 =cut
 
 sub Init {
-    require RT::Handle;
+
     #Get a database connection
-        unless ($Handle && $Handle->dbh->ping) {
-    $Handle = RT::Handle->new();
-        } 
-    $Handle->Connect();
-    
+    ConnectToDatabase();
+
     #RT's system user is a genuine database user. its id lives here
     $SystemUser = new RT::CurrentUser();
     $SystemUser->LoadByName('RT_System');
@@ -137,6 +134,21 @@ sub Init {
    InitLogging(); 
 }
 
+  
+=head2 ConnectToDatabase
+
+Get a database connection
+
+=cut
+ 
+sub ConnectToDatabase {
+    require RT::Handle;
+    unless ($Handle && $Handle->dbh && $Handle->dbh->ping) {
+        $Handle = RT::Handle->new();
+    } 
+    $Handle->Connect();
+}
+    
 =head2 InitLogging
 
 Create the RT::Logger object. 
@@ -282,8 +294,15 @@ sub DropSetGIDPermissions {
 
 =head1 BUGS
 
+Please report them to rt-3.0-bugs@fsck.com, if you know what's broken and have at least some idea of what needs to be fixed.
+If you're not sure what's going on, report them rt-devel@lists.fsck.com.
+
 =head1 SEE ALSO
 
+L<RT::StyleGuide>
+L<DBIx::SearchBuilder>
+
+
 
 =begin testing
 
diff --git a/rt/lib/RT/Action/AutoOpen.pm b/rt/lib/RT/Action/AutoOpen.pm
index ea6da1952..7c8c2b89d 100644
--- a/rt/lib/RT/Action/AutoOpen.pm
+++ b/rt/lib/RT/Action/AutoOpen.pm
@@ -67,7 +67,7 @@ sub Commit {
       my $oldstatus = $self->TicketObj->Status();
         $self->TicketObj->__Set( Field => 'Status', Value => 'open' );
         $self->TicketObj->_NewTransaction(
-                         Type     => 'Set',
+                         Type     => 'Status',
                          Field    => 'Status',
                          OldValue => $oldstatus,
                          NewValue => 'open',
diff --git a/rt/lib/RT/Action/Autoreply.pm b/rt/lib/RT/Action/Autoreply.pm
index 81f7bddfa..f58b8f284 100755
--- a/rt/lib/RT/Action/Autoreply.pm
+++ b/rt/lib/RT/Action/Autoreply.pm
@@ -74,10 +74,18 @@ sub SetReturnAddress {
     }
     
     unless ($self->TemplateObj->MIMEObj->head->get('From')) {
-	my $friendly_name = $self->TicketObj->QueueObj->Description ||
-		$self->TicketObj->QueueObj->Name;
-	$friendly_name =~ s/"/\\"/g;
-	$self->SetHeader('From', "\"$friendly_name\" <$replyto>");
+	if ($RT::UseFriendlyFromLine) {
+	    my $friendly_name = $self->TicketObj->QueueObj->Description ||
+		    $self->TicketObj->QueueObj->Name;
+	    $friendly_name =~ s/"/\\"/g;
+	    $self->SetHeader( 'From',
+		        sprintf($RT::FriendlyFromLineFormat, 
+                $self->MIMEEncodeString( $friendly_name, $RT::EmailOutputEncoding ), $replyto),
+	    );
+	}
+	else {
+	    $self->SetHeader( 'From', $replyto );
+	}
     }
     
     unless ($self->TemplateObj->MIMEObj->head->get('Reply-To')) {
diff --git a/rt/lib/RT/Action/CreateTickets.pm b/rt/lib/RT/Action/CreateTickets.pm
index 0ab206771..e1c6f4a9b 100644
--- a/rt/lib/RT/Action/CreateTickets.pm
+++ b/rt/lib/RT/Action/CreateTickets.pm
@@ -41,7 +41,7 @@ Create one or more tickets according to an externally supplied template.
 
  ===Create-Ticket: codereview
  Subject: Code review for {$Tickets{'TOP'}->Subject}
- Depended-On-By: {$Tickets{'TOP'}->Id}
+ Depended-On-By: TOP
  Content: Someone has created a ticket. you should review and approve it,
  so they can finish their work
  ENDOFCONTENT
@@ -84,13 +84,13 @@ After each ticket is created, it's stuffed into a hash called %Tickets
 so as to be available during the creation of other tickets during the same 
 ScripAction.  The hash is prepopulated with the ticket which triggered the 
 ScripAction as $Tickets{'TOP'}; you can also access that ticket using the
-shorthand $TOP.
+shorthand TOP.
 
 A simple example:
 
  ===Create-Ticket: codereview
  Subject: Code review for {$Tickets{'TOP'}->Subject}
- Depended-On-By: {$Tickets{'TOP'}->Id}
+ Depended-On-By: TOP
  Content: Someone has created a ticket. you should review and approve it,
  so they can finish their work
  ENDOFCONTENT
@@ -128,8 +128,8 @@ A convoluted example
  Queue: Approvals
  Type: Approval
  AdminCc: {join ("\nAdminCc: ",@admins) }
- Depended-On-By: {$Tickets{"TOP"}->Id}
- Refers-To: {$Tickets{"TOP"}->Id}
+ Depended-On-By: TOP
+ Refers-To: TOP
  Subject: Approval for ticket: {$Tickets{"TOP"}->Id} - {$Tickets{"TOP"}->Subject}
  Due: {time + 86400}
  Content-Type: text/plain
@@ -139,7 +139,7 @@ A convoluted example
  ENDOFCONTENT
  ===Create-Ticket: two
  Subject: Manager approval
- Depended-On-By: {$Tickets{"TOP"}->Id}
+ Depended-On-By: TOP
  Refers-On: {$Tickets{"approval"}->Id}
  Queue: Approvals
  Content-Type: text/plain
@@ -239,8 +239,8 @@ my $approvals =
 Queue: Approvals
 Type: Approval
 AdminCc: {join ("\nAdminCc: ",@admins) }
-Depended-On-By: {$Tickets{"TOP"}->Id}
-Refers-To: {$Tickets{"TOP"}->Id}
+Depended-On-By: TOP
+Refers-To:  TOP 
 Subject: Approval for ticket: {$Tickets{"TOP"}->Id} - {$Tickets{"TOP"}->Subject}
 Due: {time + 86400}
 Content-Type: text/plain
@@ -431,6 +431,8 @@ sub Commit {
 
 	$args{'requestor'} ||= $self->TicketObj->Requestors->MemberEmailAddresses;
 
+	$args{'type'} ||= 'ticket';
+
 	my %ticketargs = ( Queue => $args{'queue'},
 		      Subject=> $args{'subject'},
 		    Status => 'new',
@@ -452,7 +454,7 @@ sub Commit {
 
 
 	foreach my $key (keys(%args)) {
-	    $key =~ /^customfield-(\d+)$/ or next;
+	    $key =~ /^customfield(\d+)$/ or next;
 	    $ticketargs{ "CustomField-" . $1 } = $args{$key};
 	}
 
diff --git a/rt/lib/RT/Action/SendEmail.pm b/rt/lib/RT/Action/SendEmail.pm
index dac8fc8e7..659238088 100755
--- a/rt/lib/RT/Action/SendEmail.pm
+++ b/rt/lib/RT/Action/SendEmail.pm
@@ -129,7 +129,7 @@ sub Commit {
     $self->SetHeader( 'Cc', join ( ',', @{ $self->{'Cc'} } ) )
       if ( $self->{'Cc'} && @{ $self->{'Cc'} } );
     $self->SetHeader( 'Bcc', join ( ',', @{ $self->{'Bcc'} } ) )
-      if ( $self->{'Cc'} && @{ $self->{'Bcc'} } );
+      if ( $self->{'Bcc'} && @{ $self->{'Bcc'} } );
 
 
     $self->SetHeader('MIME-Version', '1.0');
@@ -266,7 +266,7 @@ sub SendMessage {
            and ( !$MIMEObj->head->get('To') ) );
     if ( $RT::MailCommand eq 'sendmailpipe' ) {
         eval {
-            open( MAIL, "|$RT::SendmailPath $RT::SendmailArguments" );
+            open( MAIL, "|$RT::SendmailPath $RT::SendmailArguments" ) || die $!;
             print MAIL $MIMEObj->as_string;
             close(MAIL);
           };
diff --git a/rt/lib/RT/Attachment_Overlay.pm b/rt/lib/RT/Attachment_Overlay.pm
index d31aa75ad..9086c52f6 100644
--- a/rt/lib/RT/Attachment_Overlay.pm
+++ b/rt/lib/RT/Attachment_Overlay.pm
@@ -112,8 +112,8 @@ sub Create {
     #For ease of reference
     my $Attachment = $args{'Attachment'};
 
-    #if we didn't specify a ticket, we need to bail
-    if ( $args{'TransactionId'} == 0 ) {
+	    #if we didn't specify a ticket, we need to bail
+	    if ( $args{'TransactionId'} == 0 ) {
         $RT::Logger->crit( "RT::Attachment->Create couldn't, as you didn't specify a transaction\n" );
         return (0);
 
@@ -133,7 +133,9 @@ sub Create {
 	    =~ /^.*\bfilename="(.*)"$/ ? $1 : ''
     };
 
-    if ( $Attachment->parts ) {
+    # If a message has no bodyhandle, that means that it has subparts (or appears to)
+    # and we should act accordingly.  
+    unless ( defined $Attachment->bodyhandle ) {
         $id = $self->SUPER::Create(
             TransactionId => $args{'TransactionId'},
             Parent        => 0,
@@ -241,6 +243,9 @@ Create an attachment exactly as specified in the named parameters.
 
 sub Import {
     my $self = shift;
+    my %args = ( ContentEncoding => 'none',
+
+		 @_ );
     return($self->SUPER::Create(@_));
 }
 
@@ -309,11 +314,15 @@ sub OriginalContent {
   }
 
   # Encode::_utf8_on($content);
-  if (!$enc or $enc eq 'utf8' or $enc eq 'utf-8') {
+  if (!$enc || $enc eq '' ||  $enc eq 'utf8' || $enc eq 'utf-8') {
     # If we somehow fail to do the decode, at least push out the raw bits
     eval {return( Encode::decode_utf8($content))} || return ($content);
   }
-  Encode::from_to($content, 'utf8' => $enc);
+  
+  eval { Encode::from_to($content, 'utf8' => $enc);};
+  if ($@) {
+	$RT::Logger->error("Could not convert attachment from assumed utf8 to '$enc' :".$@);
+  }
   return $content;
 }
 
@@ -423,10 +432,13 @@ properly unfolded.
 =cut
 
 sub NiceHeaders {
-    my $self=shift;
-    my $hdrs="";
-    for (split(/\n/,$self->Headers)) {
-	    $hdrs.="$_\n" if /^(To|From|RT-Send-Cc|Cc|Date|Subject): /i
+    my $self = shift;
+    my $hdrs = "";
+    my @hdrs = split(/\n/,$self->Headers);
+    while (my $str = shift @hdrs) {
+	    next unless $str =~ /^(To|From|RT-Send-Cc|Cc|Date|Subject): /i;
+	    $hdrs .= $str . "\n";
+	    $hdrs .= shift( @hdrs ) . "\n" while ($hdrs[0] =~ /^[ \t]+/);
     }
     return $hdrs;
 }
@@ -568,4 +580,13 @@ sub ContentLength {
 
 # }}}
 
+# Transactions don't change. by adding this cache congif directiove, we don't lose pathalogically on long tickets.
+sub _CacheConfig {
+    {
+        'cache_p'         => 1,
+          'fast_update_p' => 1,
+          'cache_for_sec' => 180,
+    }
+}
+
 1;
diff --git a/rt/lib/RT/Base.pm b/rt/lib/RT/Base.pm
index 3b2dcfd3d..47742f8ac 100644
--- a/rt/lib/RT/Base.pm
+++ b/rt/lib/RT/Base.pm
@@ -23,6 +23,7 @@
 # END LICENSE BLOCK
 package RT::Base;
 use Carp;
+use Scalar::Util;
 
 use strict;
 use vars qw(@EXPORT);
@@ -47,12 +48,14 @@ sub CurrentUser {
     my $self = shift;
 
     if (@_) {
+        $self->{'original_user'} = $self->{'user'};
         $self->{'user'} = shift;
+        Scalar::Util::weaken($self->{'user'}) if (ref($self->{'user'}) &&
+                                                    $self->{'user'} == $self );
     }
 
-    unless ( $self->{'user'} ) {
-        $RT::Logger->err(
-                  "$self was created without a CurrentUser\n" . Carp::cluck() );
+    unless ( ref( $self->{'user'}) ) {
+        $RT::Logger->err( "$self was created without a CurrentUser\n" . Carp::cluck() );
         return (0);
         die;
     }
@@ -61,6 +64,16 @@ sub CurrentUser {
 
 # }}}
 
+sub OriginalUser {
+    my $self = shift;
+
+    if (@_) {
+        $self->{'original_user'} = shift;
+        Scalar::Util::weaken($self->{'original_user'})
+            if (ref($self->{'original_user'}) && $self->{'original_user'} == $self );
+    }
+    return ( $self->{'original_user'} || $self->{'user'} );
+}
 
 
 =item loc LOC_STRING
@@ -80,12 +93,14 @@ In english, this would return:
 
 sub loc {
     my $self = shift;
-    unless ($self->CurrentUser) {
+    if (my $user = $self->OriginalUser) {
+        return $user->loc(@_);
+    }
+    else {
         use Carp;
         Carp::confess("No currentuser");
         return ("Critical error:$self has no CurrentUser", $self);
     }
-    return($self->CurrentUser->loc(@_));
 }
 
 eval "require RT::Base_Vendor";
diff --git a/rt/lib/RT/CachedGroupMember_Overlay.pm b/rt/lib/RT/CachedGroupMember_Overlay.pm
index f2dc86f0d..8ba7913fa 100644
--- a/rt/lib/RT/CachedGroupMember_Overlay.pm
+++ b/rt/lib/RT/CachedGroupMember_Overlay.pm
@@ -88,7 +88,7 @@ sub Create {
                               Via               => $args{'Via'}, );
 
     unless ($id) {
-        $RT::Logger->warn( "Couldn't create "
+        $RT::Logger->warning( "Couldn't create "
                            . $args{'Member'}
                            . " as a cached member of "
                            . $args{'Group'}->Id . " via "
@@ -98,7 +98,7 @@ sub Create {
     if ( $self->__Value('Via') == 0 ) {
         my ( $vid, $vmsg ) = $self->__Set( Field => 'Via', Value => $id );
         unless ($vid) {
-            $RT::Logger->warn( "Due to a via error, couldn't create "
+            $RT::Logger->warning( "Due to a via error, couldn't create "
                                . $args{'Member'}
                                . " as a cached member of "
                                . $args{'Group'}->Id . " via "
diff --git a/rt/lib/RT/CachedGroupMembers_Overlay.pm b/rt/lib/RT/CachedGroupMembers_Overlay.pm
index fd0fd9055..500a54feb 100644
--- a/rt/lib/RT/CachedGroupMembers_Overlay.pm
+++ b/rt/lib/RT/CachedGroupMembers_Overlay.pm
@@ -136,8 +136,10 @@ sub LimitToGroupsWithMember {
     my $self = shift;
     my $member = shift;
 
+    
+
     return ($self->Limit( 
-                         VALUE => $member,
+                         VALUE => $member || '0',
                          FIELD => 'MemberId',
                          ENTRYAGGREGATOR => 'OR',
 			            QUOTEVALUE => 0
diff --git a/rt/lib/RT/CurrentUser.pm b/rt/lib/RT/CurrentUser.pm
index 4ca2f9891..7fcc65ce3 100755
--- a/rt/lib/RT/CurrentUser.pm
+++ b/rt/lib/RT/CurrentUser.pm
@@ -70,7 +70,7 @@ sub _Init  {
     $self->Load($Name);
   }
   
-  $self->CurrentUser($self);
+ # $self->CurrentUser($self);
 
 }
 # }}}
@@ -104,15 +104,13 @@ sub Delete {
 sub UserObj {
     my $self = shift;
     
-    unless ($self->{'UserObj'}) {
 	use RT::User;
-	$self->{'UserObj'} = RT::User->new($self);
-	unless ($self->{'UserObj'}->Load($self->Id)) {
+	my $user = RT::User->new($self);
+
+	unless ($user->Load($self->Id)) {
 	    $RT::Logger->err($self->loc("Couldn't load [_1] from the users database.\n", $self->Id));
 	}
-	
-    }
-    return ($self->{'UserObj'});
+    return ($user);
 }
 # }}}
 
@@ -160,6 +158,7 @@ sub _Accessible  {
 	      Gecos => 'read',
 	      RealName => 'read',
 	      Password => 'neither',
+          Lang => 'read',
 	      EmailAddress => 'read',
 	      Privileged => 'read',
 	      IsAdministrator => 'read'
@@ -241,6 +240,11 @@ sub Load  {
   if ($identifier !~ /\D/) {
     $self->SUPER::LoadById($identifier);
   }
+
+  elsif (UNIVERSAL::isa($identifier,"RT::User")) { 
+         # DWIM if they pass a user in 
+         $self->SUPER::LoadById($identifier->Id); 
+  } 
   else {
       # This is a bit dangerous, we might get false authen if somebody
       # uses ambigous userids or real names:
@@ -329,6 +333,9 @@ sub LanguageHandle {
     if  ((!defined $self->{'LangHandle'}) || 
          (!UNIVERSAL::can($self->{'LangHandle'}, 'maketext')) || 
          (@_))  {
+	if ( $self->Lang) {
+	    push @_, $self->Lang;
+	}
         $self->{'LangHandle'} = RT::I18N->get_handle(@_);
     }
     # Fall back to english.
@@ -365,6 +372,19 @@ sub loc_fuzzy {
 }
 # }}}
 
+
+=head2 CurrentUser
+
+Return  the current currentuser object
+
+=cut
+
+sub CurrentUser  {
+    my $self = shift;
+    return($self);
+
+}
+
 eval "require RT::CurrentUser_Vendor";
 die $@ if ($@ && $@ !~ qr{^Can't locate RT/CurrentUser_Vendor.pm});
 eval "require RT::CurrentUser_Local";
diff --git a/rt/lib/RT/CustomField_Overlay.pm b/rt/lib/RT/CustomField_Overlay.pm
index 89ef88987..84902a02f 100644
--- a/rt/lib/RT/CustomField_Overlay.pm
+++ b/rt/lib/RT/CustomField_Overlay.pm
@@ -132,6 +132,12 @@ sub LoadByNameAndQueue {
         @_,
     );
 
+    if ($args{'Queue'} =~ /\D/) {
+	my $QueueObj = RT::Queue->new($self->CurrentUser);
+	$QueueObj->Load($args{'Queue'});
+	$args{'Queue'} = $QueueObj->Id;
+    }
+
     return ( $self->LoadByCols( Name => $args{'Name'}, Queue => $args{'Queue'} ) );
 
 }
diff --git a/rt/lib/RT/EmailParser.pm b/rt/lib/RT/EmailParser.pm
index 49f3d5518..bba4d7ec7 100644
--- a/rt/lib/RT/EmailParser.pm
+++ b/rt/lib/RT/EmailParser.pm
@@ -95,7 +95,7 @@ sub CheckForLoops {
     #If this instance of RT sent it our, we don't want to take it in
     my $RTLoop = $head->get("X-RT-Loop-Prevention") || "";
     chomp($RTLoop);    #remove that newline
-    if ( $RTLoop =~ /^$RT::rtname/ ) {
+    if ( $RTLoop =~ /^\Q$RT::rtname\E/o ) {
         return (1);
     }
 
@@ -159,28 +159,23 @@ sub ParseMIMEEntityFromSTDIN {
 
 # }}}
 
+=head2 ParseMIMEEntityFromScalar  $message
+
+Takes either a scalar or a reference to a scalr which contains a stringified MIME message.
+Parses it.
+
+Returns true if it wins.
+Returns false if it loses.
+
+
+=cut
 
 sub ParseMIMEEntityFromScalar {
     my $self = shift;
     my $message = shift;
 
-    # Create a new parser object:
-
-    my $parser = MIME::Parser->new();
-    $self->_SetupMIMEParser($parser);
-
+    $self->_DoParse('parse_data', $message);
 
-    # TODO: XXX 3.0 we really need to wrap this in an eval { }
-    unless ( $self->{'entity'} = $parser->parse_data($message) ) {
-        # Try again, this time without extracting nested messages
-        $parser->extract_nested_messages(0);
-        unless ( $self->{'entity'} = $parser->parse_data($message) ) {
-            $RT::Logger->crit("couldn't parse MIME stream");
-            return ( undef);
-        }
-    }
-    $self->_PostProcessNewEntity();
-    return (1);
 }
 
 # {{{ ParseMIMEEntityFromFilehandle *FH
@@ -195,6 +190,43 @@ sub ParseMIMEEntityFromFileHandle {
     my $self = shift;
     my $filehandle = shift;
 
+    $self->_DoParse('parse', $filehandle);
+
+}
+
+# }}}
+
+# {{{ ParseMIMEEntityFromFile
+
+=head2 ParseMIMEEntityFromFile 
+
+Parses a mime entity from a filename passed in as an argument
+
+=cut
+
+sub ParseMIMEEntityFromFile {
+    my $self = shift;
+
+    my $file = shift;
+    $self->_DoParse('parse_open', $file);
+}
+
+# }}}
+
+# {{{ _DoParse 
+
+=head2 _DoParse PARSEMETHOD CONTENT
+
+
+A helper for the various parsers to turn around and do the dispatch to the actual parser
+
+=cut
+
+sub _DoParse {
+    my $self = shift;
+    my $method = shift;
+    my $file = shift;
+
     # Create a new parser object:
 
     my $parser = MIME::Parser->new();
@@ -203,11 +235,11 @@ sub ParseMIMEEntityFromFileHandle {
 
     # TODO: XXX 3.0 we really need to wrap this in an eval { }
 
-    unless ( $self->{'entity'} = $parser->parse($filehandle) ) {
+    unless ( $self->{'entity'} = $parser->$method($file) ) {
 
         # Try again, this time without extracting nested messages
         $parser->extract_nested_messages(0);
-        unless ( $self->{'entity'} = $parser->parse($filehandle) ) {
+        unless ( $self->{'entity'} = $parser->$method($file) ) {
             $RT::Logger->crit("couldn't parse MIME stream");
             return ( undef);
         }
@@ -218,6 +250,7 @@ sub ParseMIMEEntityFromFileHandle {
 
 # }}}
 
+
 # {{{ _PostProcessNewEntity 
 
 =head2 _PostProcessNewEntity
@@ -250,7 +283,7 @@ sub ParseTicketId {
 
     my $Subject = shift;
 
-    if ( $Subject =~ s/\[$RT::rtname \#(\d+)\s*\]//i ) {
+    if ( $Subject =~ s/\[\Q$RT::rtname\E\s+\#(\d+)\s*\]//i ) {
         my $id = $1;
         $RT::Logger->debug("Found a ticket ID. It's $id");
         return ($id);
@@ -762,17 +795,20 @@ sub _SetupMIMEParser {
 
     # Set up output directory for files:
     $parser->output_dir("$AttachmentDir");
+    $parser->filer->ignore_filename(1);
 
-    #If someone includes a message, don't extract it
+
+    #If someone includes a message, extract it
     $parser->extract_nested_messages(1);
 
+    $parser->extract_uuencode(1);           ### default is false
+
     # Set up the prefix for files with auto-generated names:
     $parser->output_prefix("part");
 
-    # If content length is <= 50000 bytes, store each msg as in-core scalar;
-    # Else, write to a disk file (the default action):
+    # do _not_ store each msg as in-core scalar;
 
-    $parser->output_to_core(50000);
+    $parser->output_to_core(0);
 }
 # }}}
 
diff --git a/rt/lib/RT/GroupMember_Overlay.pm b/rt/lib/RT/GroupMember_Overlay.pm
index 20949f017..9e5bf2189 100644
--- a/rt/lib/RT/GroupMember_Overlay.pm
+++ b/rt/lib/RT/GroupMember_Overlay.pm
@@ -322,7 +322,7 @@ sub MemberObj {
     my $self = shift;
     unless ( defined( $self->{'Member_obj'} ) ) {
         $self->{'Member_obj'} = RT::Principal->new( $self->CurrentUser );
-        $self->{'Member_obj'}->Load( $self->MemberId );
+        $self->{'Member_obj'}->Load( $self->MemberId ) if ($self->MemberId);
     }
     return ( $self->{'Member_obj'} );
 }
diff --git a/rt/lib/RT/Group_Overlay.pm b/rt/lib/RT/Group_Overlay.pm
index 92150255f..f71fe7f7e 100644
--- a/rt/lib/RT/Group_Overlay.pm
+++ b/rt/lib/RT/Group_Overlay.pm
@@ -1,3 +1,4 @@
+
 # BEGIN LICENSE BLOCK
 # 
 # Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
@@ -327,8 +328,6 @@ sub LoadSystemInternalGroup {
     my $identifier = shift;
 
         $self->LoadByCols( "Domain" => 'SystemInternal',
-                           "Instance" => '',
-                           "Name" => '',
                            "Type" => $identifier );
 }
 
@@ -350,7 +349,7 @@ Takes a param hash with 2 parameters:
 
 sub LoadTicketRoleGroup {
     my $self       = shift;
-    my %args = (Ticket => undef,
+    my %args = (Ticket => '0',
                 Type => undef,
                 @_);
         $self->LoadByCols( Domain => 'RT::Ticket-Role',
@@ -444,7 +443,7 @@ sub _Create {
         Description => undef,
         Domain      => undef,
         Type        => undef,
-        Instance    => undef,
+        Instance    => '0',
         InsideTransaction => undef,
         @_
     );
@@ -466,7 +465,7 @@ sub _Create {
         Description => $args{'Description'},
         Type        => $args{'Type'},
         Domain      => $args{'Domain'},
-        Instance    => $args{'Instance'}
+        Instance    => ($args{'Instance'} || '0')
     );
     my $id = $self->Id;
     unless ($id) {
@@ -798,22 +797,14 @@ sub UserMembersObj {
     #If we don't have rights, don't include any results
     # TODO XXX  WHY IS THERE NO ACL CHECK HERE?
 
-    my $principals = $users->NewAlias('Principals');
-
-    $users->Join(ALIAS1 => 'main', FIELD1 => 'id',
-                 ALIAS2 => $principals, FIELD2 => 'ObjectId');
-    $users->Limit(ALIAS =>$principals,
-                  FIELD => 'PrincipalType', OPERATOR => '=', VALUE => 'User');
-
     my $cached_members = $users->NewAlias('CachedGroupMembers');
     $users->Join(ALIAS1 => $cached_members, FIELD1 => 'MemberId',
-                 ALIAS2 => $principals, FIELD2 => 'id');
+                 ALIAS2 => $users->PrincipalsAlias, FIELD2 => 'id');
     $users->Limit(ALIAS => $cached_members, 
                   FIELD => 'GroupId',
                   OPERATOR => '=',
                   VALUE => $self->PrincipalId);
 
-
     return ( $users);
 
 }
@@ -1009,6 +1000,10 @@ sub HasMember {
         return(undef);
     }
 
+    unless ($principal->Id) {
+        return(undef);
+    }
+
     my $member_obj = RT::GroupMember->new( $self->CurrentUser );
     $member_obj->LoadByCols( MemberId => $principal->id, 
                              GroupId => $self->PrincipalId );
diff --git a/rt/lib/RT/Groups_Overlay.pm b/rt/lib/RT/Groups_Overlay.pm
index 3d2c660fe..a9ca44c7d 100644
--- a/rt/lib/RT/Groups_Overlay.pm
+++ b/rt/lib/RT/Groups_Overlay.pm
@@ -80,7 +80,8 @@ Return only SystemInternal Groups, such as "privileged" "unprivileged" and "ever
 sub LimitToSystemInternalGroups {
     my $self = shift;
     $self->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => 'SystemInternal');
-    $self->Limit(FIELD => 'Instance', OPERATOR => '=', VALUE => '');
+    # All system internal groups have the same instance. No reason to limit down further
+    #$self->Limit(FIELD => 'Instance', OPERATOR => '=', VALUE => '0');
 }
 
 
@@ -98,7 +99,8 @@ Return only UserDefined Groups
 sub LimitToUserDefinedGroups {
     my $self = shift;
     $self->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => 'UserDefined');
-    $self->Limit(FIELD => 'Instance', OPERATOR => '=', VALUE => '');
+    # All user-defined groups have the same instance. No reason to limit down further
+    #$self->Limit(FIELD => 'Instance', OPERATOR => '=', VALUE => '');
 }
 
 
@@ -231,7 +233,7 @@ sub WithRight {
     my $self = shift;
     my %args = ( Right                  => undef,
                  Object =>              => undef,
-                 IncludeSystemRights    => undef,
+                 IncludeSystemRights    => 1,
                  IncludeSuperusers      => undef,
                  @_ );
 
@@ -241,11 +243,11 @@ sub WithRight {
     # {{{ Find only rows where the right granted is the one we're looking up or _possibly_ superuser 
     $self->Limit( ALIAS           => $acl,
                   FIELD           => 'RightName',
-                  OPERATOR        => '=',
-                  VALUE           => $args{Right},
+                  OPERATOR        => ($args{Right} ? '=' : 'IS NOT'),
+                  VALUE           => $args{Right} || 'NULL',
                   ENTRYAGGREGATOR => 'OR' );
 
-    if ( $args{'IncludeSuperusers'} ) {
+    if ( $args{'IncludeSuperusers'} and $args{'Right'} ) {
         $self->Limit( ALIAS           => $acl,
                       FIELD           => 'RightName',
                       OPERATOR        => '=',
@@ -254,7 +256,8 @@ sub WithRight {
     }
     # }}}
 
-    my ($or_check_ticket_roles, $or_check_roles, $or_look_at_object);
+    my ($or_check_ticket_roles, $or_check_roles);
+    my $which_object = "$acl.ObjectType = 'RT::System'";
 
     if ( defined $args{'Object'} ) {
         if ( ref($args{'Object'}) eq 'RT::Ticket' ) {
@@ -274,12 +277,18 @@ sub WithRight {
                 " AND main.Type = $acl.PrincipalType AND main.id = $groupprinc.id) ";
         }
 
-        $or_look_at_object =
-            " OR ($acl.ObjectType = '" . ref($args{'Object'}) . "'" .
+	if ( $args{'IncludeSystemRights'} ) {
+	    $which_object .= ' OR ';
+	}
+	else {
+	    $which_object = '';
+	}
+        $which_object .=
+            " ($acl.ObjectType = '" . ref($args{'Object'}) . "'" .
             " AND $acl.ObjectId = " . $args{'Object'}->Id . ") ";
     }
 
-    $self->_AddSubClause( "WhichObject", "($acl.ObjectType = 'RT::System' $or_look_at_object)" );
+    $self->_AddSubClause( "WhichObject", "($which_object)" );
 
     $self->_AddSubClause( "WhichGroup",
         qq{
@@ -294,5 +303,58 @@ sub WithRight {
     );
 }
 
+# {{{ sub LimitToEnabled
+
+=head2 LimitToEnabled
+
+Only find items that haven\'t been disabled
+
+=cut
+
+sub LimitToEnabled {
+    my $self = shift;
+    
+    my $alias = $self->Join(
+	TYPE   => 'left',
+	ALIAS1 => 'main',
+	FIELD1 => 'id',
+	TABLE2 => 'Principals',
+	FIELD2 => 'ObjectId'
+    );
+
+    $self->Limit( ALIAS => $alias,
+		  FIELD => 'Disabled',
+		  VALUE => '0',
+		  OPERATOR => '=' );
+}
+# }}}
+
+# {{{ sub LimitToDisabled
+
+=head2 LimitToDeleted
+
+Only find items that have been deleted.
+
+=cut
+
+sub LimitToDeleted {
+    my $self = shift;
+    
+    my $alias = $self->Join(
+	TYPE   => 'left',
+	ALIAS1 => 'main',
+	FIELD1 => 'id',
+	TABLE2 => 'Principals',
+	FIELD2 => 'ObjectId'
+    );
+
+    $self->{'find_disabled_rows'} = 1;
+    $self->Limit( ALIAS => $alias,
+		  FIELD => 'Disabled',
+		  OPERATOR => '=',
+		  VALUE => '1'
+		);
+}
+# }}}
 1;
 
diff --git a/rt/lib/RT/Handle.pm b/rt/lib/RT/Handle.pm
index 5cdb65e5b..9b611b903 100644
--- a/rt/lib/RT/Handle.pm
+++ b/rt/lib/RT/Handle.pm
@@ -60,9 +60,12 @@ Takes nothing. Calls SUPER::Connect with the needed args
 sub Connect {
 my $self=shift;
 
-# Unless the database port is a positive integer, we really don't want to pass it.
 
-$self->SUPER::Connect(
+    if ($RT::DatabaseType eq 'Oracle') {
+        $ENV{'NLS_LANG'} = ".UTF8";
+    }
+
+    $self->SUPER::Connect(
 			 User => $RT::DatabaseUser,
 			 Password => $RT::DatabasePassword,
 			);
@@ -79,9 +82,11 @@ from the config file.
 
 sub BuildDSN {
     my $self = shift;
+# Unless the database port is a positive integer, we really don't want to pass it.
 $RT::DatabasePort = undef unless (defined $RT::DatabasePort && $RT::DatabasePort =~ /^(\d+)$/);
 $RT::DatabaseHost = undef unless (defined $RT::DatabaseHost && $RT::DatabaseHost ne '');
 
+
     $self->SUPER::BuildDSN(Host => $RT::DatabaseHost, 
 			 Database => $RT::DatabaseName, 
 			 Port => $RT::DatabasePort,
diff --git a/rt/lib/RT/I18N.pm b/rt/lib/RT/I18N.pm
index c013c219e..79c3e8a15 100644
--- a/rt/lib/RT/I18N.pm
+++ b/rt/lib/RT/I18N.pm
@@ -164,10 +164,14 @@ sub SetMIMEEntityToEncoding {
 
     my $charset = _FindOrGuessCharset($entity) or return;
     # one and only normalization
-    $charset = 'utf-8' if $charset eq 'utf8';
-    $enc     = 'utf-8' if $enc     eq 'utf8';
+    $charset = 'utf-8' if $charset =~ /^utf-?8$/i;
+    $enc     = 'utf-8' if $enc     =~ /^utf-?8$/i;
 
-    SetMIMEHeadToEncoding($entity->head, $charset => $enc, $preserve_words);
+    SetMIMEHeadToEncoding(
+	$entity->head,
+	_FindOrGuessCharset($entity, 1) => $enc,
+	$preserve_words
+    );
 
     my $head = $entity->head;
 
@@ -302,24 +306,26 @@ sub DecodeMIMEWordsToEncoding {
 
 # {{{ _FindOrGuessCharset
 
-=head2 _FindOrGuessCharset MIME::Entity
+=head2 _FindOrGuessCharset MIME::Entity, $head_only
+
+When handed a MIME::Entity will first attempt to read what charset the message is encoded in. Failing that, will use Encode::Guess to try to figure it out
 
-When handed a MIME::Entity will first attempt to read what charset the message is encoded in. Failing that, 
-will use Encode::Guess to try to figure it out
+If $head_only is true, only guesses charset for head parts.  This is because header's encoding (e.g. filename="...") may be different from that of body's.
 
 =cut
 
 sub _FindOrGuessCharset {
     my $entity = shift;
+    my $head_only = shift;
     my $head = $entity->head;
 
     if ($head->mime_attr("content-type.charset")) {
 	return $head->mime_attr("content-type.charset");
     }
 
-    if ( $head->mime_type =~ m{^text/}) {
+    if ( !$head_only and $head->mime_type =~ m{^text/}) {
 	my $body = $entity->bodyhandle or return;
-	return _GuessCharset( $head->as_string . $body->as_string );
+	return _GuessCharset( $body->as_string );
     }
     else {
 	# potentially binary data -- don't guess the body
diff --git a/rt/lib/RT/I18N/cs.pm b/rt/lib/RT/I18N/cs.pm
index 36e2bc6af..132c3c287 100644
--- a/rt/lib/RT/I18N/cs.pm
+++ b/rt/lib/RT/I18N/cs.pm
@@ -1,3 +1,26 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 package RT::I18N::cs;
 
 # # CZECH TRANSLATORS COMMENTS see Locale::Maketext::TPJ13
diff --git a/rt/lib/RT/I18N/de.po b/rt/lib/RT/I18N/de.po
index 3595aad47..3ffc8fbac 100644
--- a/rt/lib/RT/I18N/de.po
+++ b/rt/lib/RT/I18N/de.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: RT 2.1.54\n"
 "POT-Creation-Date: 2002-06-22 06:06+0200\n"
 "PO-Revision-Date: 2003-02-20 04:47+0200\n"
-"Last-Translator: Florian Bischof <flo@fxb.de>\n"
+"Last-Translator: Karsten Konrad <karsten.konrad@uni-graz.at>\n"
 "Language-Team: RT German <rt@fxb.de>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -183,7 +183,7 @@ msgstr "%1 ist kein %2 dieses Stapels mehr."
 #: lib/RT/Ticket_Overlay.pm:1570
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this ticket."
-msgstr "%1 ist nicht mehr  %2 dieser Anfrage."
+msgstr "%1 ist nicht mehr %2 dieser Anfrage."
 
 #: lib/RT/Ticket_Overlay.pm:3527
 #. ($args{'Value'}, $cf->Name)
@@ -194,11 +194,24 @@ msgstr "%1 ist kein Wert des benutzerdefinierten Feldes %2 mehr"
 msgid "%1 isn't a valid Queue id."
 msgstr "%1 ist keine gültige Stapel-Id."
 
+#: RTFM
+msgid "%1 matches"
+msgstr "%1 enthält"
+
+
 #: html/Ticket/Elements/ShowBasics:36
 #. ($TimeWorked)
 msgid "%1 min"
 msgstr "%1 Min"
 
+#: html/RTFM/UpdatedArticles:19
+msgid "%1 most recently updated articles"
+msgstr "%1 zuletzt überarbeitete Artikel"
+
+#: RTFM
+msgid "%1 newest articles"
+msgstr "%1 neueste Artikel"
+
 #: NOT FOUND IN SOURCE
 msgid "%1 not shown"
 msgstr ""
@@ -279,10 +292,18 @@ msgstr "(Keine benutzerdefinierten Felder)"
 msgid "(No members)"
 msgstr "(Keine Mitglieder)"
 
+#: html/RTFM/NewestArticles:35
+msgid "(no name)"
+msgstr "(kein Name)"
+
 #: html/Admin/Elements/EditScrips:32 html/Admin/Elements/ListGlobalScrips:32
 msgid "(No scrips)"
 msgstr "(Keine Scrips)"
 
+#: html/RTFM/UpdatedArticles.html:36
+msgid "(no Summary)"
+msgstr "keine Zusammenfassung"
+
 #: html/Admin/Elements/EditTemplates:31
 msgid "(No templates)"
 msgstr "(Keine Vorlagen)"
@@ -552,6 +573,10 @@ msgstr "Administrative CC"
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
+#: RTFM
+msgid "Advanced Search Criteria"
+msgstr "Erweiterte Suchkriterien"
+
 #: html/Elements/SelectDateRelation:36
 msgid "After"
 msgstr "Nach dem"
@@ -564,6 +589,10 @@ msgstr "Alter"
 msgid "All Custom Fields"
 msgstr "Alle benutzerdefinierten Felder"
 
+#: html/RTFM/Admin/Classes/index.html:57
+msgid "All Classes"
+msgstr "Alle Klassen"
+
 #: html/Admin/Queues/index.html:53
 msgid "All Queues"
 msgstr "Alle Stapel"
@@ -572,6 +601,14 @@ msgstr "Alle Stapel"
 msgid "Always sends a message to the requestors independent of message sender"
 msgstr ""
 
+#: RTFM
+msgid "and is not"
+msgstr "und ist nicht"
+
+#: RTFM
+msgid "and not"
+msgstr "und nicht"
+
 #: html/Elements/Tabs:58
 msgid "Approval"
 msgstr "Freigabe"
@@ -610,10 +647,42 @@ msgstr "Freigeben"
 msgid "Approver's notes: %1"
 msgstr "Notizen des Freigebenden: %1"
 
+#: html/RTFM/Admin/CustomFields/UserRights.html:117
+msgid "No Class defined"
+msgstr "Keine Klasse definiert"
+
+#: html/RTFM/Admin/CustomFields/Basics.html:69
+msgid "No CustomField"
+msgstr "Kein benutzerdef. Feld"
+
+#: html/RTFM/Admin/CustomFields/GroupRights.html:73
+msgid "No CustomField defined"
+msgstr "Kein benutzerdef. Feld definiert"
+
 #: lib/RT/Date.pm:414
 msgid "Apr."
 msgstr "Apr"
 
+#: RTFM
+msgid "Are you sure you want to delete this article?"
+msgstr "Sind Sie sicher, dass sie diesen Artikel löschen wollen?"
+
+#: html/RTFM/Article/delete.html:69
+msgid "Article #%1 deleted"
+msgstr "Artikel #%1 gelöscht"
+
+#: html/RTFM/Article/Display.html:46
+msgid "Article #%1: %2"
+msgstr "Artikel #%1: %2"
+
+#: html/RTFM/Article/Display.html:35
+msgid "Article not found"
+msgstr "Artikel wurde nicht gefunden"
+
+#: RTFM
+msgid "Articles"
+msgstr "Artikel"
+
 #: html/Elements/SelectSortOrder:35
 msgid "Ascending"
 msgstr "aufsteigend"
@@ -739,11 +808,11 @@ msgstr "Kann kein Ticket auf sich selbst verweisen lassen!"
 
 #: lib/RT/Ticket_Overlay.pm:2787
 msgid "Can't merge into a merged ticket. You should never get this error"
-msgstr "Konnte das Ticket nicht in ein vereinigtes Ticket vereinigen. Diesen Fehler solltest du niemals sehen"
+msgstr "Konnte das Ticket nicht in ein vereinigtes Ticket vereinigen. Diesen Fehler sollten Sie niemals sehen"
 
 #: lib/RT/Ticket_Overlay.pm:2605 lib/RT/Ticket_Overlay.pm:2674
 msgid "Can't specifiy both base and target"
-msgstr "Du kannst nicht Basis und Ziel gleichzeitig angeben"
+msgstr "Sie können Basis und Ziel nicht gleichzeitig angeben"
 
 #: html/autohandler:112
 #. ($msg)
@@ -774,13 +843,33 @@ msgstr "Kinder"
 msgid "City"
 msgstr "Stadt"
 
+#: RTFM
+msgid "Class"
+msgstr "Klasse"
+
+#: RTFM
+msgid "Class is"
+msgstr "Klasse ist"
+
+#: RTFM
+msgid "Class Name"
+msgstr "Klassenname"
+
+#: RTFM
+msgid "Classes"
+msgstr "Klassen"
+
+#: share/html/SelfService/Closed.html:27
+msgid "closed"
+msgstr "geschlossenen"
+
 #: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
 msgstr "Geschlossen"
 
 #: html/SelfService/Elements/Tabs:60
-msgid "Closed requests"
-msgstr "Geschossene Tickets"
+msgid "Closed tickets"
+msgstr "Geschlossene Anfragen"
 
 #: NOT FOUND IN SOURCE
 msgid "Command not understood!\\n"
@@ -999,6 +1088,14 @@ msgstr ""
 msgid "Couldn't load %1 from the users database.\\n"
 msgstr "Konnte %1 nicht aus der Benutzerdatenbank laden.\\n"
 
+#: html/RTFM/Admin/CustomFields/UserRights.html:121
+msgid "Couldn't load Class %1"
+msgstr "Konnte die Klasse %1 nicht laden"
+
+#: html/RTFM/Admin/CustomFields/GroupRights.html:77
+msgid "Couldn't load CustomField %1"
+msgstr "Konnte das benutzerdefinierte Feld %1 nicht laden"
+
 #: NOT FOUND IN SOURCE
 msgid "Couldn't load RT config file '%1' %2"
 msgstr ""
@@ -1056,6 +1153,10 @@ msgstr "Erstellen"
 msgid "Create Tickets"
 msgstr "Erstelle Tickets"
 
+#: RTFM
+msgid "Create a Class"
+msgstr "Erstelle eine Klasse"
+
 #: html/Admin/Elements/EditCustomField:58
 msgid "Create a CustomField"
 msgstr "Erstelle ein benutzerdefiniertes Feld"
@@ -1069,6 +1170,10 @@ msgstr "Erstelle ein benutzerdef. Feld für Stapel %1"
 msgid "Create a CustomField which applies to all queues"
 msgstr "Erstelle ein benutzerdef. Feld für alle Stapel"
 
+#: html/RTFM/Article/Create.html:19
+msgid "Create a new article"
+msgstr "Erstelle einen neuen Artikel"
+
 #: NOT FOUND IN SOURCE
 msgid "Create a new Custom Field"
 msgstr ""
@@ -1126,13 +1231,25 @@ msgstr "Erstelle ein Scrip für den Stapel %1"
 msgid "Create a template"
 msgstr "Erstelle eine Vorlage"
 
+#: html/SelfService/Create.html:24
+msgid "Create a ticket"
+msgstr "Neue Anfrage"
+
+#: RTFM
+msgid "Create an article"
+msgstr "Erstelle einen Artikel"
+
+#: RTFM
+msgid "Create an article in class..."
+msgstr "Erstelle einen Artikel in der Klasse..."
+
 #: etc/initialdata:130
 msgid "Create new tickets based on this scrip's template"
 msgstr "Erstelle neue Tickets basierend auf der Vorlage dieses Scrips"
 
 #: html/SelfService/Create.html:81
 msgid "Create ticket"
-msgstr "Ticket erstellen"
+msgstr "Ãœbermitteln"
 
 #: lib/RT/Queue_Overlay.pm:84
 msgid "Create tickets in this queue"
@@ -1166,11 +1283,19 @@ msgstr ""
 msgid "Created"
 msgstr "Angelegt"
 
+#: RTFM
+msgid "Created by"
+msgstr "Angelegt von"
+
 #: html/Admin/Elements/EditCustomField:71
 #. ($CustomFieldObj->Name())
 msgid "Created CustomField %1"
 msgstr "Erstelle ein benutzerdefiniertes Feld %1"
 
+#: RTFM
+msgid "Created during"
+msgstr "Erstellt zwischen"
+
 #: NOT FOUND IN SOURCE
 msgid "Created template %1"
 msgstr ""
@@ -1316,7 +1441,7 @@ msgstr "Rechte weitergeben"
 
 #: lib/RT/System.pm:63
 msgid "Delegate specific rights which have been granted to you."
-msgstr "Dir gewährte Rechte weitergeben"
+msgstr "Ihnen gewährte Rechte weitergeben"
 
 #: lib/RT/System.pm:63
 msgid "DelegateRights"
@@ -1326,9 +1451,13 @@ msgstr ""
 msgid "Delegation"
 msgstr "Rechteweitergabe"
 
-#: NOT FOUND IN SOURCE
+#: RTFM
 msgid "Delete"
-msgstr ""
+msgstr "Löschen"
+
+#: html/RTFM/Article/delete.html:73
+msgid "Delete article #%1"
+msgstr "Lösche Artikel #%1"
 
 #: lib/RT/Queue_Overlay.pm:90
 msgid "Delete tickets"
@@ -1445,6 +1574,10 @@ msgstr ""
 msgid "Edit Custom Fields for %1"
 msgstr "Bearbeite benutzerdefinierte Felder für %1"
 
+#: html/RTFM/Admin/Classes/CustomFields.html:73
+msgid "Edit Custom Fields for Class %1"
+msgstr "Bearbeite benutzerdefinierte Felder für Klasse %1"
+
 #: html/Ticket/ModifyLinks.html:36
 msgid "Edit Relationships"
 msgstr "Bearbeite Beziehungen"
@@ -1466,6 +1599,10 @@ msgstr "Bearbeite Systemvorlagen"
 msgid "Edit templates for %1"
 msgstr ""
 
+#: html/RTFM/Admin/Classes/Modify:79
+msgid "Editing Configuration for Class %1"
+msgstr "Bearbeite Konfiguration für die Klasse %1"
+
 #: html/Admin/Elements/ModifyQueue:25 html/Admin/Queues/Modify.html:117
 #. ($QueueObj->Name)
 #. ($QueueObj->Id)
@@ -1517,6 +1654,10 @@ msgstr "E-Mail-Adresse"
 msgid "EmailEncoding"
 msgstr "E-Mail-Kodierung"
 
+#: RTFM
+msgid "Enabled (Unchecking this box disables this Class)"
+msgstr "Aktiviert (Abwählen deaktiviert diese Klasse)"
+
 ### muss das überhaupt übersetzt werden???
 #: html/Admin/Elements/EditCustomField:36
 msgid "Enabled (Unchecking this box disables this custom field)"
@@ -1530,6 +1671,10 @@ msgstr "Aktiviert (Abwählen deaktiviert diese Gruppe)"
 msgid "Enabled (Unchecking this box disables this queue)"
 msgstr "Aktiviert (Abwählen deaktiviert diesen Stapel)"
 
+#: RTFM
+msgid "Enabled Classes"
+msgstr "Aktivierte Klassen"
+
 #: html/Admin/Elements/EditCustomFields:99
 msgid "Enabled Custom Fields"
 msgstr "Aktivierte benutzerdefinierte Felder"
@@ -1543,6 +1688,10 @@ msgstr "Aktivierte Stapel"
 msgid "Enabled status %1"
 msgstr "Status %1 aktiviert"
 
+#: RTFM
+msgid "Enter Articles or URIs to link Articles to. Seperate multiple entries with spaces."
+msgstr "Artikel oder URIs getrennt durch Leerzeichen eingeben."
+
 #: lib/RT/CustomField_Overlay.pm:361
 msgid "Enter multiple values"
 msgstr "Mehrere Werte eingeben"
@@ -1595,6 +1744,14 @@ msgstr "ExternalContactInfoId"
 msgid "Extra info"
 msgstr "Zusatzinformationen"
 
+#: html/RTFM/Article/ExtractIntoClass.html:19
+msgid "Extract article from ticket #%1"
+msgstr "Extrahiere Artikel aus Anfrage #%1"
+
+#: html/RTFM/Article/ExtractFromTicket.html:19
+msgid "Extract article from ticket #%1 into class %2"
+msgstr "Extrahiere Artikel aus Anfrage #%1 in die Klasse %2"
+
 #: lib/RT/User_Overlay.pm:302
 msgid "Failed to find 'Privileged' users pseudogroup."
 msgstr "Konnte die Pseudogruppe 'Privileged' nicht finden."
@@ -1729,7 +1886,7 @@ msgstr "Gehe zu Seite"
 
 #: html/Elements/GotoTicket:25 html/SelfService/Elements/GotoTicket:25
 msgid "Goto ticket"
-msgstr "Zeig' Ticket"
+msgstr "Zeige Anfrage"
 
 #: html/Ticket/Elements/AddWatchers:46 html/User/Elements/DelegateRights:78
 msgid "Group"
@@ -1793,6 +1950,10 @@ msgstr "Hallo %1"
 msgid "History"
 msgstr "Historie"
 
+#: html/RTFM/Article/History.html:22
+msgid "History for article #%1"
+msgstr "Historie für Artikel #%1"
+
 #: html/Admin/Elements/ModifyUser:68
 msgid "HomePhone"
 msgstr "TelefonZuhause"
@@ -1828,7 +1989,7 @@ msgstr "Wenn dieses Werkzeug 'setgid' wäre könnte ein feindlicher lokaler Benu
 
 #: html/Admin/Queues/People.html:105 html/Ticket/Modify.html:39 html/Ticket/ModifyAll.html:94 html/Ticket/ModifyPeople.html:38
 msgid "If you've updated anything above, be sure to"
-msgstr "Wenn du irgend etwas aktualisiert hast, denke daran hier zu klicken"
+msgstr "Wenn Sie irgend etwas aktualisiert haben, denken Sie daran hier zu klicken"
 
 #: lib/RT/Interface/Web.pm:860
 msgid "Illegal value for %1"
@@ -1838,6 +1999,14 @@ msgstr "Unerlaubter Wert für %1"
 msgid "Immutable field"
 msgstr "Unveränderbares Feld"
 
+#: RTFM
+msgid "in class %1"
+msgstr "%1"
+
+#: RTFM
+msgid "Include disabled classes in listing."
+msgstr "Zeige auch deaktivierte Klassen an."
+
 #: html/Admin/Elements/EditCustomFields:74
 msgid "Include disabled custom fields in listing."
 msgstr "Zeige auch deaktivierte benutzerdefinierte Felder an."
@@ -2157,6 +2326,19 @@ msgstr "Mobil"
 msgid "MobilePhone"
 msgstr "Mobiltelefon"
 
+#: RTFM
+msgid "Modified"
+msgstr "Geändert"
+
+#: RTFM
+msgid "Modify"
+msgstr "Ändern"
+
+#: RTFM
+msgid "Modify article #%1"
+msgstr "Ändere Artikel #%1"
+
+
 #: lib/RT/Queue_Overlay.pm:70
 msgid "Modify Access Control List"
 msgstr "Ändere Zugriffskontrollliste"
@@ -2169,6 +2351,10 @@ msgstr ""
 msgid "Modify Custom Fields which apply to all queues"
 msgstr "Ändere benutzdefinierte Felder für diesen Stapel"
 
+#: html/RTFM/Admin/CustomFields/GroupRights.html:21
+msgid "Modify group rights for custom field %1"
+msgstr "Ändere Gruppenrechte für das benutzerdefinierte Feld %1"
+
 #: lib/RT/Queue_Overlay.pm:73
 msgid "Modify Scrip templates for this queue"
 msgstr "Ändere Scrip-Vorlagen für diesen Stapel"
@@ -2374,7 +2560,11 @@ msgstr "Mehrere"
 
 #: lib/RT/User_Overlay.pm:179
 msgid "Must specify 'Name' attribute"
-msgstr "Du musst eine Angabe bei 'Name' machen"
+msgstr "Sie müssen eine Angabe bei 'Name' machen"
+
+#: share/html/SelfService/Elements/MyRequests:32
+msgid "My %1 tickets"
+msgstr "Meine %1 Anfragen"
 
 #: NOT FOUND IN SOURCE
 msgid "My Approvals"
@@ -2392,6 +2582,10 @@ msgstr "Name"
 msgid "Name in use"
 msgstr "Benutzername ist bereits in Gebrauch"
 
+#: RTFM
+msgid "Name matches"
+msgstr "Name enthält"
+
 #: NOT FOUND IN SOURCE
 msgid "Need approval from system administrator"
 msgstr ""
@@ -2404,6 +2598,15 @@ msgstr "Niemals"
 msgid "New"
 msgstr "Neu"
 
+#: RTFM
+msgid "New Article"
+msgstr "Neuer Artikel"
+
+#: RTFM
+msgid "New class"
+msgstr "Neue Klasse"
+
+
 #: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:93 html/User/Prefs.html:65
 msgid "New Password"
 msgstr "Neues Passwort"
@@ -2441,8 +2644,8 @@ msgid "New queue"
 msgstr "Neuer Stapel"
 
 #: html/SelfService/Elements/Tabs:63
-msgid "New request"
-msgstr "Neues Ticket"
+msgid "New ticket"
+msgstr "Neue Anfrage"
 
 #: html/Admin/Elements/SelectRights:42
 msgid "New rights"
@@ -2496,10 +2699,18 @@ msgstr "Spitzname"
 msgid "Nickname"
 msgstr "Spitzname"
 
+#: RTFM
+msgid "No"
+msgstr "Nein"
+
 #: html/Admin/Elements/EditCustomField:73 html/Admin/Elements/EditCustomFields:105
 msgid "No CustomField"
 msgstr "Kein benutzerdefiniertes Feld"
 
+#: html/RTFM/Admin/CustomFields/GrroupRights.html:73
+msgid "No CustomField defined"
+msgstr "Kein benutzerdefiniertes Feld definiert"
+
 #: html/Admin/Groups/GroupRights.html:84 html/Admin/Groups/UserRights.html:71
 msgid "No Group defined"
 msgstr "Keine Gruppe definiert"
@@ -2777,7 +2988,7 @@ msgid "Open it"
 msgstr "Öffnen"
 
 #: html/SelfService/Elements/Tabs:57
-msgid "Open requests"
+msgid "Open tickets"
 msgstr "Offene Anfragen"
 
 #: html/Admin/Users/Prefs.html:41
@@ -2809,6 +3020,10 @@ msgstr "Ursprüngliche Anfrage: #%1"
 msgid "Over time, priority moves toward"
 msgstr "Mit der Zeit steigt die Priorität auf"
 
+#: html/RTFM/index.html:19
+msgid "Overview"
+msgstr "Ãœbersicht"
+
 #: lib/RT/Queue_Overlay.pm:87
 msgid "Own tickets"
 msgstr "Eigene Anfrage"
@@ -3000,6 +3215,10 @@ msgstr "Stapel nicht gefunden"
 msgid "Queues"
 msgstr "Stapel"
 
+#: RTFM
+msgid "Quick search"
+msgstr "Schnellsuche"
+
 #: html/Elements/Login:34
 #. ($RT::VERSION)
 msgid "RT %1"
@@ -3047,9 +3266,13 @@ msgstr "RT Fehler"
 msgid "RT Received mail (%1) from itself."
 msgstr ""
 
+#: html/RTFM/Error:36
+msgid "RTFM Error"
+msgstr "RTFM Fehler"
+
 #: html/SelfService/Closed.html:25
-msgid "RT Self Service / Closed Tickets"
-msgstr "RT Selbstbedienung / Geschlossene Anfragen"
+msgid "Closed Tickets"
+msgstr "Geschlossene Anfragen"
 
 #: html/index.html:25 html/index.html:28
 msgid "RT at a glance"
@@ -3082,13 +3305,17 @@ msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "RT has proccessed your commands"
-msgstr "RT hat Deine Befehle verarbeitet"
+msgstr "RT hat Ihre Befehle verarbeitet"
 
 #: html/Elements/Login:83
 #. ('2003')
 msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
 msgstr "RT &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  Vertrieben unter der <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
 
+#: share/html/SelfService/Elements/Tabs:35
+msgid "RT Self Service"
+msgstr "RT Selbstbedienung"
+
 #: NOT FOUND IN SOURCE
 msgid "RT thinks this message may be a bounce"
 msgstr ""
@@ -3318,6 +3545,10 @@ msgstr ""
 msgid "Search for approvals"
 msgstr "Suche nach Freigaben"
 
+#: html/RTFM/Article/Search.html:19
+msgid "Search for articles"
+msgstr "Artikel suchen"
+
 #: bin/rt-crontool:188
 msgid "Security:"
 msgstr "Sicherheit:"
@@ -3326,6 +3557,14 @@ msgstr "Sicherheit:"
 msgid "SeeQueue"
 msgstr ""
 
+#: RTFM
+msgid "Select a Class"
+msgstr "Wähle eine Klasse aus"
+
+#: RTFM
+msgid "Select a Custom Fields"
+msgstr "Wähle ein benutzerdefiniertes Feld aus"
+
 #: html/Admin/Groups/index.html:40
 msgid "Select a group"
 msgstr "Wähle eine Gruppe aus"
@@ -3338,6 +3577,10 @@ msgstr ""
 msgid "Select a user"
 msgstr "Wähle einen Benutzer aus"
 
+#: RTFM
+msgid "Select class"
+msgstr "Wähle eine Klasse"
+
 #: html/Admin/Global/CustomField.html:38 html/Admin/Global/CustomFields.html:36
 msgid "Select custom field"
 msgstr "Wähle ein benutzerdef. Feld"
@@ -3364,7 +3607,7 @@ msgstr "Wähle ein Scrip"
 
 #: html/Admin/Global/Template.html:57 html/Admin/Global/Templates.html:36 html/Admin/Queues/Template.html:55
 msgid "Select template"
-msgstr "Wähle ein Template"
+msgstr "Wähle eine Vorlage"
 
 #: html/Admin/Elements/UserTabs:49
 msgid "Select user"
@@ -3422,10 +3665,18 @@ msgstr "Schicke eine Mail an den Inhaber"
 msgid "Sep."
 msgstr "Sep"
 
+#: RTFM
+msgid "Seperate multiple URLs with spaces"
+msgstr "Mehrere URLs getrennt durch Leerzeichen eingeben"
+
 #: NOT FOUND IN SOURCE
 msgid "Show Results"
 msgstr ""
 
+#: RTFM
+msgid "Show advanced search options..."
+msgstr "Zeige erweiterte Suchoptionen an..."
+
 #: html/Approvals/Elements/PendingMyApproval:44
 msgid "Show approved requests"
 msgstr "Zeige freigegebene Anfragen"
@@ -3511,10 +3762,23 @@ msgstr "Sortierschlüssel"
 msgid "Sort results by"
 msgstr "Sortiere Ergebnisse nach"
 
+#: RTFM
+msgid "Sort Order"
+msgstr "Sortierreihenfolge"
+
 #: html/Admin/Elements/AddCustomFieldValue:25
 msgid "SortOrder"
 msgstr "Sortierreihenfolge"
 
+#: RTFM
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+#: RTFM
+msgid "Summary matches"
+msgstr "Zusammenfassung enthält"
+
+
 #: NOT FOUND IN SOURCE
 msgid "Stalled"
 msgstr ""
@@ -3586,6 +3850,10 @@ msgstr "Betreff wurde auf %1 geändert"
 msgid "Submit"
 msgstr "Ãœbermitteln"
 
+#: NOT FOUND IN SOURCE
+msgid "Submit Query"
+msgstr "Suchen"
+
 #: NOT FOUND IN SOURCE
 msgid "Submit Workflow"
 msgstr ""
@@ -3933,6 +4201,10 @@ msgstr "Arbeitszeit"
 msgid "Time left"
 msgstr "Ãœbrige Zeit"
 
+#: RTFM
+msgid "till"
+msgstr "und"
+
 #: html/Elements/Footer:36
 msgid "Time to display"
 msgstr "Benötigte Zeit"
@@ -3990,6 +4262,10 @@ msgstr "Di"
 msgid "Type"
 msgstr "Typ"
 
+#: html/RTFM/Article/delete.html:59
+msgid "Unable to load article"
+msgstr "Artikel kann nicht geladen werden"
+
 #: lib/RT/ScripCondition_Overlay.pm:104
 msgid "Unimplemented"
 msgstr "Nicht implementiert"
@@ -4082,6 +4358,10 @@ msgstr "Aktualisierungstyp war weder Korrespondenz noch Kommentar."
 msgid "Updated"
 msgstr "Aktualisiert"
 
+#: html/RTFM/Article/ExtractFromTicket.html:26
+msgid "Use the dropdown menus to select which transactions you want to extract into a new RTFM article"
+msgstr "Ãœber die Auswahllisten kann bestimmt werden welche Transaktionen in den neuen RTFM Artikel extrahiert werden"
+
 #: NOT FOUND IN SOURCE
 msgid "User %1 %2: %3\\n"
 msgstr ""
@@ -4223,6 +4503,14 @@ msgstr "Immer wenn ein neuer Kommentar eingeht"
 msgid "Whenever correspondence comes in"
 msgstr "Immer wenn neue Korrespondenz eingeht"
 
+#: html/RTFM/Article/Elements/ShowSearchCriteria:64
+msgid "Which refer to"
+msgstr "Beziehen sich auf"
+
+#: html/RTFM/Article/Elements/ShowSearchCriteria:64
+msgid "Which are referred to by "
+msgstr "Bezogen von"
+
 #: html/Admin/Users/Modify.html:164 html/User/Prefs.html:52
 msgid "Work"
 msgstr "Arbeit"
@@ -4235,17 +4523,21 @@ msgstr "Arbeitstelefon"
 msgid "Worked"
 msgstr "Arbeitszeit"
 
+#: RTFM
+msgid "Yes"
+msgstr "Ja"
+
 #: lib/RT/Ticket_Overlay.pm:3056
 msgid "You already own this ticket"
-msgstr "Du besitzt diese Anfrage bereits"
+msgstr "Sie besitzen diese Anfrage bereits"
 
 #: html/autohandler:121
 msgid "You are not an authorized user"
-msgstr "Du bist kein authorisierter Benutzer"
+msgstr "Sie sind kein authorisierter Benutzer"
 
 #: lib/RT/Ticket_Overlay.pm:2930
 msgid "You can only reassign tickets that you own or that are unowned"
-msgstr "Du kannst nur Anfragen ohne Inhaber zuweisen"
+msgstr "Sie können nur Anfragen ohne Inhaber zuweisen"
 
 #: NOT FOUND IN SOURCE
 msgid "You don't have permission to view that ticket.\\n"
@@ -4254,23 +4546,23 @@ msgstr ""
 #: docs/design_docs/string-extraction-guide.txt:47
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
-msgstr "Du hast %1 Anfragen in Stapel %2 gefunden"
+msgstr "Sie haben %1 Anfragen in Stapel %2 gefunden"
 
 #: html/NoAuth/Logout.html:31 html/REST/1.0/logout:25
 msgid "You have been logged out of RT."
-msgstr "Du wurdest von RT abgemeldet."
+msgstr "Sie wurden von RT abgemeldet."
 
 #: html/SelfService/Display.html:134
 msgid "You have no permission to create tickets in that queue."
-msgstr "Du hast kein Recht, Anfragen in diesen Stapel anzulegen."
+msgstr "Sie haben kein Recht, Anfragen in diesen Stapel anzulegen."
 
 #: lib/RT/Ticket_Overlay.pm:1895
 msgid "You may not create requests in that queue."
-msgstr "Du darfst in diesem Stapel keine Anfragen erstellen"
+msgstr "Sie dürfen in diesem Stapel keine Anfragen erstellen"
 
 #: html/NoAuth/Logout.html:36
 msgid "You're welcome to login again"
-msgstr "Du kannst dich gerne wieder anmelden"
+msgstr "Sie können sich gerne wieder anmelden"
 
 #: html/SelfService/Elements/MyRequests:25
 #. ($friendly_status)
@@ -4283,11 +4575,11 @@ msgstr ""
 
 #: etc/initialdata:429 etc/upgrade/2.1.71:146
 msgid "Your request has been approved by %1. Other approvals may still be pending."
-msgstr "Deine Anfrage wurde von %1 freigegeben. Andere Freigaben können noch ausstehen."
+msgstr "Ihre Anfrage wurde von %1 freigegeben. Andere Freigaben können noch ausstehen."
 
 #: etc/initialdata:463 etc/upgrade/2.1.71:180
 msgid "Your request has been approved."
-msgstr "Deine Anfrage wurde freigegeben."
+msgstr "Ihre Anfrage wurde freigegeben."
 
 #: NOT FOUND IN SOURCE
 msgid "Your request was rejected"
@@ -4295,11 +4587,11 @@ msgstr ""
 
 #: etc/initialdata:384 etc/upgrade/2.1.71:101
 msgid "Your request was rejected."
-msgstr "Deine Anfrage wurde abgewiesen"
+msgstr "Ihre Anfrage wurde abgewiesen"
 
 #: html/autohandler:136 html/autohandler:142
 msgid "Your username or password is incorrect"
-msgstr "Dein Benutzername oder Passwort ist falsch"
+msgstr "Ihr Benutzername oder Passwort ist falsch"
 
 #: html/Admin/Elements/ModifyUser:84 html/Admin/Users/Modify.html:144 html/User/Prefs.html:96
 msgid "Zip"
diff --git a/rt/lib/RT/I18N/it.po b/rt/lib/RT/I18N/it.po
new file mode 100644
index 000000000..55a478ba2
--- /dev/null
+++ b/rt/lib/RT/I18N/it.po
@@ -0,0 +1,6175 @@
+# translation of it.po to 
+# translation of it.po to
+# translation of it.po to
+# translation of it.po to
+# translation of it.po to
+# translation of it.po to
+# Copyright (c) 2002 Jesse Vincent <jesse@bestpractical.com>
+# root <root@delpreterh>, 2003
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: it\n"
+"POT-Creation-Date: 2002-05-02 11:36+0800\n"
+"PO-Revision-Date: 2003-07-21 22:20+0200\n"
+"Last-Translator: root <root@delpreterh>\n"
+"Language-Team:  <en@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.0.1\n"
+
+#: html/Elements/MyRequests:27
+#: html/Elements/MyTickets:27
+msgid "#"
+msgstr "n°"
+
+#. ($QueueObj->id)
+#: html/Admin/Queues/Scrip.html:54
+msgid "#%1"
+msgstr "n°%1"
+
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($Ticket->id, $Ticket->Subject)
+#. ($ticket->Id, $ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+#: html/Approvals/Elements/Approve:26
+#: html/Approvals/Elements/ShowDependency:49
+#: html/SelfService/Display.html:24
+#: html/Ticket/Display.html:25
+#: html/Ticket/Display.html:29
+msgid "#%1: %2"
+msgstr "n°%1: %2"
+
+#. ($s, $time_unit)
+#: lib/RT/Date.pm:336
+msgid "%1 %2"
+msgstr "%1 %2"
+
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+#: lib/RT/Tickets_Overlay.pm:770
+msgid "%1 %2 %3"
+msgstr "%1 %2 %3"
+
+#. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
+#: lib/RT/Date.pm:372
+msgid "%1 %2 %3 %4:%5:%6 %7"
+msgstr "%1 %2 %3 %4:%5:%6 %7"
+
+#. ($cf->Name, $new_value->Content)
+#. ($field, $self->NewValue)
+#. ($self->Field, $principal->Object->Name)
+#: lib/RT/Ticket_Overlay.pm:3504
+#: lib/RT/Transaction_Overlay.pm:556
+#: lib/RT/Transaction_Overlay.pm:598
+msgid "%1 %2 added"
+msgstr "%1 %2 aggiunto"
+
+#. ($s, $time_unit)
+#: lib/RT/Date.pm:333
+msgid "%1 %2 ago"
+msgstr "%1 %2 fa"
+
+#. ($cf->Name, $old_value, $new_value->Content)
+#. ($field, $self->OldValue, $self->NewValue)
+#: lib/RT/Ticket_Overlay.pm:3510
+#: lib/RT/Transaction_Overlay.pm:563
+msgid "%1 %2 changed to %3"
+msgstr "%1 %2 cambiato in %3"
+
+#. ($cf->Name, $old_value)
+#. ($field, $self->OldValue)
+#. ($self->Field, $principal->Object->Name)
+#: lib/RT/Ticket_Overlay.pm:3507
+#: lib/RT/Transaction_Overlay.pm:559
+#: lib/RT/Transaction_Overlay.pm:604
+msgid "%1 %2 deleted"
+msgstr "%1 %2 eliminato"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "%1 %2 of group %3"
+msgstr "%1 %2 del gruppo %3"
+
+#. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
+#: html/Admin/Elements/EditScrips:43
+#: html/Admin/Elements/ListGlobalScrips:27
+msgid "%1 %2 with template %3"
+msgstr "%1 %2 con il modello %3"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "%1 (%2) %3 this ticket\\n"
+msgstr "%1 (%2) %3 questo ticket\\n"
+
+#. (($session{'tickets'}->FirstRow+1), ($session{'tickets'}->FirstRow() + $session{'tickets'}->RowsPerPage()  ))
+#: html/Search/Listing.html:56
+msgid "%1 - %2 shown"
+msgstr "Tickets da %1 a %2"
+
+#. ("--search-argument", "--search")
+#. ("--condition-argument", "--condition")
+#. ("--action-argument", "--action")
+#: bin/rt-crontool:168
+#: bin/rt-crontool:175
+#: bin/rt-crontool:181
+msgid "%1 - An argument to pass to %2"
+msgstr "%1 - Un parametro da passare a %2"
+
+#. ("--verbose")
+#: bin/rt-crontool:184
+msgid "%1 - Output status updates to STDOUT"
+msgstr "%1 - Lo stato dell'output è stato aggiornato su STDOUT"
+
+#. ("--action")
+#: bin/rt-crontool:178
+msgid "%1 - Specify the action module you want to use"
+msgstr "%1 - Specificare l'azione che si vuole eseguire"
+
+#. ("--condition")
+#: bin/rt-crontool:172
+msgid "%1 - Specify the condition module you want to use"
+msgstr "%1 - Specificare la condizione che si vuole utilizzare"
+
+#. ("--search")
+#: bin/rt-crontool:165
+msgid "%1 - Specify the search module you want to use"
+msgstr "%1 - Specificare la ricerca che si vuole utilizzare"
+
+#. ($self->Id)
+#: lib/RT/ScripAction_Overlay.pm:121
+msgid "%1 ScripAction loaded"
+msgstr "%1 ScripAction caricato"
+
+#. ($args{'Value'}, $cf->Name)
+#: lib/RT/Ticket_Overlay.pm:3537
+msgid "%1 added as a value for %2"
+msgstr "%1 aggiunto(i) come valore di %2"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "%1 aliases require a TicketId to work on"
+msgstr "gli alias %1 necessitano di un TicketId su cui lavorare"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "%1 aliases require a TicketId to work on "
+msgstr "gli alias %1 necessitano di un TicketId su cui lavorare"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "%1 aliases require a TicketId to work on (from %2) %3"
+msgstr "gli alias %1 necessitano di un TicketId per funzionare con (dopo %2) %3"
+
+#. ($args{'Base'})
+#. ($args{'Target'})
+#: lib/RT/Link_Overlay.pm:116
+#: lib/RT/Link_Overlay.pm:123
+msgid "%1 appears to be a local object, but can't be found in the database"
+msgstr "%1 sembra essere un oggetto locale, ma è introvabile nel database"
+
+#. ($self->BriefDescription , $self->CreatorObj->Name)
+#. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
+#: html/Ticket/Elements/ShowDates:51
+#: lib/RT/Transaction_Overlay.pm:480
+msgid "%1 by %2"
+msgstr "%1 per %2"
+
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
+#. ($self->Field , $q1->Name , $q2->Name)
+#. ($self->Field, $t2->AsString, $t1->AsString)
+#. ($self->Field, $self->OldValue, $self->NewValue)
+#: lib/RT/Transaction_Overlay.pm:534
+#: lib/RT/Transaction_Overlay.pm:623
+#: lib/RT/Transaction_Overlay.pm:632
+#: lib/RT/Transaction_Overlay.pm:635
+msgid "%1 changed from %2 to %3"
+msgstr "%1 cambiato(1) da %2 a %3"
+
+#: lib/RT/Interface/Web.pm:890
+msgid "%1 could not be set to %2."
+msgstr "%1 non può essere impostato a  %2"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "%1 couldn't init a transaction (%2)\\n"
+msgstr "%1 non ha potuto iniziare una transazione (%2)\\n"
+
+#. ($self)
+#: lib/RT/Ticket_Overlay.pm:2816
+msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
+msgstr "%1 non ho potuto mettere lo stato a risolto. Il database RT può essere inconsistente."
+
+#. ($rows)
+#: html/Elements/MyTickets:24
+msgid "%1 highest priority tickets I own..."
+msgstr "I miei %1 tickets a più alta priorità che possiedo..."
+
+#. ($rows)
+#: html/Elements/MyRequests:24
+msgid "%1 highest priority tickets I requested..."
+msgstr "I miei %1 tickets a più alta priorità che ho richiesto..."
+
+#. ($0)
+#: bin/rt-crontool:160
+msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
+msgstr "%1 è uno strumento per lavorare sui tickets da uno schedulatore esterno, come cron"
+
+#. ($principal->Object->Name, $args{'Type'})
+#: lib/RT/Queue_Overlay.pm:742
+msgid "%1 is no longer a %2 for this queue."
+msgstr "%1 non è più un %2 per questa coda."
+
+#. ($principal->Object->Name, $args{'Type'})
+#: lib/RT/Ticket_Overlay.pm:1569
+msgid "%1 is no longer a %2 for this ticket."
+msgstr "%1 non è più un %2 per questo ticket."
+
+#. ($args{'Value'}, $cf->Name)
+#: lib/RT/Ticket_Overlay.pm:3593
+msgid "%1 is no longer a value for custom field %2"
+msgstr "%1 non è più un valore per il campo personalizzato %2"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "%1 isn't a valid Queue id."
+msgstr "%1 non è un identificativo di coda valido"
+
+#. ($TimeWorked)
+#: html/Ticket/Elements/ShowBasics:35
+msgid "%1 min"
+msgstr "%1 min"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "%1 not shown"
+msgstr "%1 non mostrato"
+
+#. (loc($ObjectType =~ /^RT::(.*)$/))
+#: html/User/Elements/DelegateRights:75
+msgid "%1 rights"
+msgstr "Diritti di %1"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "%1 succeeded\\n"
+msgstr "%1 riuscito\\n"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "%1 type unknown for $MessageId"
+msgstr "Tipo %1 sconosciuto per $MessageId"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "%1 type unknown for %2"
+msgstr "Tipo %1 sconosciuto per %2"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "%1 was created without a CurrentUser\\n"
+msgstr "%1 è stato creato senza un CurrentUser\\n"
+
+#. (ref $self)
+#: lib/RT/Action/ResolveMembers.pm:41
+msgid "%1 will resolve all members of a resolved group ticket."
+msgstr "%1 risolverà tutti i membri di un gruppo di ticket risolto."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr "%1 bloccherà una BASE [locale] se dipende o è membro di una richeista linkata."
+
+#. ($self)
+#: lib/RT/Transaction_Overlay.pm:432
+msgid "%1: no attachment specified"
+msgstr "%1: nessun allegato specificato"
+
+#. ($size)
+#: html/Ticket/Elements/ShowTransaction:101
+msgid "%1b"
+msgstr "%1b"
+
+#. (int($size/102.4)/10)
+#: html/Ticket/Elements/ShowTransaction:98
+msgid "%1k"
+msgstr "%1k"
+
+#. ($args{'Status'})
+#: lib/RT/Ticket_Overlay.pm:1139
+msgid "'%1' is an invalid value for status"
+msgstr "'%1' è uno stato non valido"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "'%1' not a recognized action. "
+msgstr "'%1' non è un'azione conosciuta. "
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "(Check box to delete group member)"
+msgstr "(Spunta la casella per cancellare il membro di un gruppo)"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "(Check box to delete scrip)"
+msgstr "(Spunta la casella per cancellare uno scrip)"
+
+#: html/Admin/Elements/EditCustomFieldValues:24
+#: html/Admin/Elements/EditQueueWatchers:28
+#: html/Admin/Elements/EditScrips:34
+#: html/Admin/Elements/EditTemplates:35
+#: html/Admin/Groups/Members.html:51
+#: html/Ticket/Elements/EditLinks:32
+#: html/Ticket/Elements/EditPeople:45
+#: html/User/Groups/Members.html:54
+msgid "(Check box to delete)"
+msgstr "(Spunta la casella per cancellare)"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "(Check boxes to delete)"
+msgstr "(Spunta la casella per cancellare)"
+
+#: html/Ticket/Create.html:177
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr "(Inserire il numero di tickets o gli URL, separati da spazi)"
+
+#. ($RT::CorrespondAddress)
+#. ($RT::CommentAddress)
+#: html/Admin/Queues/Modify.html:53
+#: html/Admin/Queues/Modify.html:59
+msgid "(If left blank, will default to %1"
+msgstr "Se lasciato vuoto, valore di default : %1"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "(No Value)"
+msgstr "(Nessun Valore)"
+
+#: html/Admin/Elements/EditCustomFields:32
+#: html/Admin/Elements/ListGlobalCustomFields:31
+msgid "(No custom fields)"
+msgstr "Non ci sono campi personalizzati"
+
+#: html/Admin/Groups/Members.html:49
+#: html/User/Groups/Members.html:52
+msgid "(No members)"
+msgstr "(Nessun membro)"
+
+#: html/Admin/Elements/EditScrips:31
+#: html/Admin/Elements/ListGlobalScrips:31
+msgid "(No scrips)"
+msgstr "(Nessuno Scrip)"
+
+#: html/Admin/Elements/EditTemplates:30
+msgid "(No templates)"
+msgstr "Nessun modello"
+
+#: html/Ticket/Update.html:84
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(Invia per copia nascosta questo aggiornamento ad una lista di indirizzi email separati da virgole. Ciò <b>non cambierà</b> i destinatari dei successivi aggiornamenti.)"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(Invia per copia nascosta questo aggiornamento ad una lista di indirizzi email separati da virgole. Ciò <b>non cambierà</b> i destinatari dei successivi aggiornamenti.)"
+
+#: html/Ticket/Create.html:78
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(Invia una copia di questo aggiornamento ad una lista di indirizzi email amministrativi separati da virgole. Queste persone <b>riceveranno</b> i successivi aggiornamenti.)"
+
+#: html/Ticket/Update.html:80
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(Invia una copia di questo aggiornamento ad una lista di indirizzi email separati da virgole. Ciò <b>non cambierà</b> i destinatari dei successivi aggiornamenti.)"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(Invia una copia di questo aggiornamento ad una lista di indirizzi email separati da virgole. Ciò <b>non cambierà</b> i destinatari dei successivi aggiornamenti.)"
+
+#: html/Ticket/Create.html:68
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(Invia una copia di questo aggiornamento ad una lista di indirizzi email separati da virgole. Queste persone <b>riceveranno</b> i successivi aggiornamenti.)"
+
+#: html/Admin/Groups/index.html:32
+#: html/User/Groups/index.html:32
+msgid "(empty)"
+msgstr "(vuoto)"
+
+#: html/Admin/Users/index.html:38
+msgid "(no name listed)"
+msgstr "(nessun nome)"
+
+#: html/Elements/MyRequests:42
+#: html/Elements/MyTickets:44
+msgid "(no subject)"
+msgstr "(nessun oggetto)"
+
+#: html/Admin/Elements/SelectRights:47
+#: html/Elements/SelectCustomFieldValue:29
+#: html/Ticket/Elements/EditCustomField:58
+#: html/Ticket/Elements/ShowCustomFields:35
+#: lib/RT/Transaction_Overlay.pm:533
+msgid "(no value)"
+msgstr "(nessun valore)"
+
+#: html/Ticket/Elements/EditLinks:115
+msgid "(only one ticket)"
+msgstr "(solo un ticket)"
+
+#: html/Elements/MyRequests:51
+#: html/Elements/MyTickets:54
+msgid "(pending approval)"
+msgstr "(in attesa di approvazione)"
+
+#: html/Elements/MyRequests:53
+#: html/Elements/MyTickets:56
+msgid "(pending other tickets)"
+msgstr "(in attea di altri tickets)"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "(requestor's group)"
+msgstr "(gruppo del richiedente)"
+
+#: html/Admin/Users/Modify.html:49
+msgid "(required)"
+msgstr "(richiesto)"
+
+#: html/Ticket/Elements/ShowTransaction:104
+msgid "(untitled)"
+msgstr "(senza titolo)"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr "I miei 25 tickets che devo trattare con priorità più alta..."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr "I miei 25 tickets che hor ichiesto con priorità più alta..."
+
+#: html/Ticket/Elements/ShowBasics:31
+msgid "<% $Ticket->Status%>"
+msgstr "<% $Ticket->Status%>"
+
+#: html/Elements/SelectTicketTypes:26
+msgid "<% $_ %>"
+msgstr ""
+
+#. ($m->scomp('/Elements/SelectNewTicketQueue'))
+#: docs/design_docs/string-extraction-guide.txt:54
+#: html/Elements/CreateTicket:25
+msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
+msgstr "<input type=\"submit\" value=\"Crea un ticket in\">&nbsp;%1"
+
+#: etc/initialdata:203
+msgid "A blank template"
+msgstr "Un modello vuoto"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "ACE Deleted"
+msgstr "ACE Eliminata"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "ACE Loaded"
+msgstr "ACE Caricata"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "ACE could not be deleted"
+msgstr "l'ACE non è stato possibile elimanarla"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "ACE could not be found"
+msgstr "l'ACE non è stato possibile trovarla"
+
+#: lib/RT/ACE_Overlay.pm:156
+#: lib/RT/Principal_Overlay.pm:180
+msgid "ACE not found"
+msgstr "ACE non trovata"
+
+#: lib/RT/ACE_Overlay.pm:830
+msgid "ACEs can only be created and deleted."
+msgstr "Le ACE possono essere solo create e cancellate."
+
+#: bin/rt-commit-handler:754
+msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgstr "Interruzione per evitare modifiche di ticket involontarie.\\n"
+
+#: html/User/Elements/Tabs:31
+msgid "About me"
+msgstr "A proposito"
+
+#: html/Admin/Users/Modify.html:79
+msgid "Access control"
+msgstr "Controllo di Accesso"
+
+#: html/Admin/Elements/EditScrip:56
+msgid "Action"
+msgstr "Azione"
+
+#. ($args{'ScripAction'})
+#: lib/RT/Scrip_Overlay.pm:146
+msgid "Action %1 not found"
+msgstr "Azione %1 non trovata"
+
+#: bin/rt-crontool:122
+msgid "Action committed."
+msgstr "Azione eseguita."
+
+#: bin/rt-crontool:118
+msgid "Action prepared..."
+msgstr "Azione preparata..."
+
+#: html/Search/Bulk.html:91
+msgid "Add AdminCc"
+msgstr "Aggiungi AdminCC"
+
+#: html/Search/Bulk.html:89
+msgid "Add Cc"
+msgstr "Aggiungi CC"
+
+#: html/Ticket/Create.html:113
+#: html/Ticket/Update.html:99
+msgid "Add More Files"
+msgstr "Aggiungi Altri Files"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Add Next State"
+msgstr "Aggiungi lo Stato Sucessivo"
+
+#: html/Search/Bulk.html:87
+msgid "Add Requestor"
+msgstr "Aggiungi il Richiedente"
+
+#: html/Admin/Elements/AddCustomFieldValue:24
+msgid "Add Value"
+msgstr "Aggiungi un Valore"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr "Aggiungi una selezione di parole chiave a questa coda"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Add a new a global scrip"
+msgstr "Aggiungi un nuovo scrip globale"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Add a scrip to this queue"
+msgstr "Aggiungi uno scrip a questa coda"
+
+#: html/Admin/Global/Scrip.html:54
+msgid "Add a scrip which will apply to all queues"
+msgstr "Aggiungi uno scrip da applicare a tutte le code"
+
+#: html/Search/Bulk.html:117
+msgid "Add comments or replies to selected tickets"
+msgstr "Agiungere commenti o repliche ai tickets selezionati"
+
+#: html/Admin/Groups/Members.html:41
+#: html/User/Groups/Members.html:38
+msgid "Add members"
+msgstr "Aggiungi membri"
+
+#: html/Admin/Queues/People.html:65
+#: html/Ticket/Elements/AddWatchers:27
+msgid "Add new watchers"
+msgstr "Aggiungi nuovi osservatori"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "AddNextState"
+msgstr "AggiungereStatoSuccessivo"
+
+#. ($args{'Type'})
+#: lib/RT/Queue_Overlay.pm:642
+msgid "Added principal as a %1 for this queue"
+msgstr "Aggiunto gruppo/utente come %1 per questa coda"
+
+#. ($self->loc($args{'Type'}))
+#: lib/RT/Ticket_Overlay.pm:1453
+msgid "Added principal as a %1 for this ticket"
+msgstr "Aggiunto gruppo/utente come %1 per questo ticket"
+
+#: html/Admin/Elements/ModifyUser:75
+#: html/Admin/Users/Modify.html:121
+#: html/User/Prefs.html:87
+msgid "Address1"
+msgstr "Inidirizzo1"
+
+#: html/Admin/Elements/ModifyUser:77
+#: html/Admin/Users/Modify.html:126
+#: html/User/Prefs.html:89
+msgid "Address2"
+msgstr "Indirizzo2"
+
+#: html/Ticket/Create.html:73
+msgid "Admin Cc"
+msgstr "Admin Cc"
+
+#: etc/initialdata:280
+msgid "Admin Comment"
+msgstr "Commento Amministrativo"
+
+#: etc/initialdata:259
+msgid "Admin Correspondence"
+msgstr "Corrispondenza Amministrativa "
+
+#: html/Admin/Queues/index.html:24
+#: html/Admin/Queues/index.html:27
+msgid "Admin queues"
+msgstr "Amministra le code"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Admin users"
+msgstr "Amministra gli Utenti"
+
+#: html/Admin/Global/index.html:25
+#: html/Admin/Global/index.html:27
+msgid "Admin/Global configuration"
+msgstr "configurazione Amministratore/Globale"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Admin/Groups"
+msgstr "Amministra/Gruppi"
+
+#: html/Admin/Queues/Modify.html:24
+#: html/Admin/Queues/Modify.html:28
+msgid "Admin/Queue/Basics"
+msgstr "Amministra/Code/Base"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr "AmministraTuttiIGruppiPersonali"
+
+#: etc/initialdata:56
+#: html/Ticket/Elements/ShowPeople:38
+#: html/Ticket/Update.html:49
+#: lib/RT/ACE_Overlay.pm:88
+msgid "AdminCc"
+msgstr "AdminCc"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "AdminComment"
+msgstr "CommentoAmministratore"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "AdminCorrespondence"
+msgstr "CorrispondenzaAmministratore"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "AdminCustomFields"
+msgstr "AmministraCampiPersonalizzati"
+
+#: lib/RT/Group_Overlay.pm:145
+msgid "AdminGroup"
+msgstr "AmministraGruppi"
+
+#: lib/RT/Group_Overlay.pm:147
+msgid "AdminGroupMembership"
+msgstr "AmministraAppartenenzaGruppi"
+
+#: lib/RT/System.pm:58
+msgid "AdminOwnPersonalGroups"
+msgstr "AmministraPropriGruppiPersonali"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "AdminQueue"
+msgstr "AmministraCode"
+
+#: lib/RT/System.pm:59
+msgid "AdminUsers"
+msgstr "AmministraUtenti"
+
+#: html/Admin/Queues/People.html:47
+#: html/Ticket/Elements/EditPeople:53
+msgid "Administrative Cc"
+msgstr "Cc Amministrativa"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Admins"
+msgstr "Amministratori"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Advanced Search"
+msgstr "Ricerca avanzata"
+
+#: html/Elements/SelectDateRelation:35
+msgid "After"
+msgstr "Dopo"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Age"
+msgstr "Età"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Alias"
+msgstr ""
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Alias for"
+msgstr "Alias per"
+
+#: html/Admin/Elements/EditCustomFields:95
+msgid "All Custom Fields"
+msgstr "Tutti i campi personalizzati"
+
+#: html/Admin/Queues/index.html:52
+msgid "All Queues"
+msgstr "Tutte le code"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
+msgstr "Invia sempre un messaggio al richiedente inipendentemente dal mittente"
+
+#: html/Elements/Tabs:55
+msgid "Approval"
+msgstr "Approvazione"
+
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($ticket->id, $msg)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+#: html/Approvals/Display.html:45
+#: html/Approvals/Elements/ShowDependency:41
+#: html/Approvals/index.html:64
+msgid "Approval #%1: %2"
+msgstr "Approvazione n°%1: %2"
+
+#. ($ticket->Id)
+#: html/Approvals/index.html:53
+msgid "Approval #%1: Notes not recorded due to a system error"
+msgstr "Approvazione n°%1: Note non registrate a causa di un errore di sistema"
+
+#. ($ticket->Id)
+#: html/Approvals/index.html:51
+msgid "Approval #%1: Notes recorded"
+msgstr "Approvazione n°%1: Note registrate"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Approval Details"
+msgstr "Dettagli dell'approvazione"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Approval diagram"
+msgstr "Diagramma dell'approvazione"
+
+#: html/Approvals/Elements/Approve:43
+msgid "Approve"
+msgstr "Approvare"
+
+#: etc/initialdata:437
+#: etc/upgrade/2.1.71:148
+msgid "Approver's notes: %1"
+msgstr "Note dell'approvatore: %1"
+
+#: lib/RT/Date.pm:413
+msgid "Apr."
+msgstr "Apr."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "April"
+msgstr "Aprile"
+
+#: html/Elements/SelectSortOrder:34
+msgid "Ascending"
+msgstr "Ascendente"
+
+#: html/Search/Bulk.html:126
+#: html/SelfService/Update.html:32
+#: html/Ticket/ModifyAll.html:82
+#: html/Ticket/Update.html:99
+msgid "Attach"
+msgstr "Allegato"
+
+#: html/SelfService/Create.html:64
+#: html/Ticket/Create.html:109
+msgid "Attach file"
+msgstr "Allegare un file"
+
+#: html/Ticket/Create.html:97
+#: html/Ticket/Update.html:88
+msgid "Attached file"
+msgstr "File allegato"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Attachment '%1' could not be loaded"
+msgstr "L'allegato '%1' non può essere caricato"
+
+#: lib/RT/Transaction_Overlay.pm:440
+msgid "Attachment created"
+msgstr "Allegato creato"
+
+#: lib/RT/Tickets_Overlay.pm:1188
+msgid "Attachment filename"
+msgstr "Nome file dell'allegato"
+
+#: html/Ticket/Elements/ShowAttachments:25
+msgid "Attachments"
+msgstr "Allegati"
+
+#: lib/RT/Date.pm:417
+msgid "Aug."
+msgstr "Ago."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "August"
+msgstr "Agosto"
+
+#: html/Admin/Elements/ModifyUser:65
+msgid "AuthSystem"
+msgstr "AuthSystem"
+
+#: etc/initialdata:206
+msgid "Autoreply"
+msgstr "RispostaAutomatica"
+
+#: etc/initialdata:72
+msgid "Autoreply To Requestors"
+msgstr "Risposta automatica ai richiedenti"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "AutoreplyToRequestors"
+msgstr "RispostaAutomaticaAiRichiedenti"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Bad PGP Signature: %1\\n"
+msgstr "Firma PGP non valida: %1\\n"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
+msgstr "Id di allegato errato. Impossibile trovare l'allegato '%1'\\n"
+
+#. ($val)
+#: bin/rt-commit-handler:826
+msgid "Bad data in %1"
+msgstr "Dati incorretti in %1"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Bad transaction number for attachment. %1 should be %2\\n"
+msgstr "Numero di transazione incorretto per l'allegato. %1 dovrebbe essere %2\\n"
+
+#: html/Admin/Elements/GroupTabs:38
+#: html/Admin/Elements/QueueTabs:38
+#: html/Admin/Elements/UserTabs:37
+#: html/Ticket/Elements/Tabs:89
+#: html/User/Elements/GroupTabs:37
+msgid "Basics"
+msgstr "Essenziale"
+
+#: html/Ticket/Update.html:82
+msgid "Bcc"
+msgstr "Bcc"
+
+#: html/Admin/Elements/EditScrip:87
+#: html/Admin/Global/GroupRights.html:84
+#: html/Admin/Global/Template.html:45
+#: html/Admin/Global/UserRights.html:53
+#: html/Admin/Groups/GroupRights.html:72
+#: html/Admin/Groups/Members.html:80
+#: html/Admin/Groups/Modify.html:55
+#: html/Admin/Groups/UserRights.html:54
+#: html/Admin/Queues/GroupRights.html:84
+#: html/Admin/Queues/Template.html:44
+#: html/Admin/Queues/UserRights.html:53
+#: html/User/Groups/Modify.html:55
+msgid "Be sure to save your changes"
+msgstr "Assicurarsi di salvare le modifiche"
+
+#: html/Elements/SelectDateRelation:33
+#: lib/RT/CurrentUser.pm:319
+msgid "Before"
+msgstr "Prima"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Begin Approval"
+msgstr "Inizio dell'approvazione"
+
+#: etc/initialdata:202
+msgid "Blank"
+msgstr "Vuoto"
+
+#: html/Search/Listing.html:78
+msgid "Bookmarkable URL for this search"
+msgstr "URL predefinito per questa ricerca"
+
+#: html/Ticket/Elements/ShowHistory:38
+#: html/Ticket/Elements/ShowHistory:44
+msgid "Brief headers"
+msgstr "Intestazioni brevi"
+
+#: html/Search/Bulk.html:24
+#: html/Search/Bulk.html:25
+msgid "Bulk ticket update"
+msgstr "Modifica di massa dei tickets"
+
+#: lib/RT/User_Overlay.pm:1351
+msgid "Can not modify system users"
+msgstr "Gli utenti di sistema non possono essere modificati"
+
+#: lib/RT/Queue_Overlay.pm:66
+msgid "Can this principal see this queue"
+msgstr "Il gruppo/utente può vedere questa coda"
+
+#: lib/RT/CustomField_Overlay.pm:205
+msgid "Can't add a custom field value without a name"
+msgstr "Impossibile aggiungere un valore di campo personalizzato senza un nome"
+
+#: lib/RT/Link_Overlay.pm:131
+msgid "Can't link a ticket to itself"
+msgstr "Non è possibile collegare un ticket a se stesso"
+
+#: lib/RT/Ticket_Overlay.pm:2793
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr "Impossibile unire un ticket ad un ticket già unito. Non dovrebbe mai comparire questo errore"
+
+#: lib/RT/Ticket_Overlay.pm:2611
+#: lib/RT/Ticket_Overlay.pm:2680
+msgid "Can't specifiy both base and target"
+msgstr "Impossibile specificare sia la base che il target"
+
+#. ($msg)
+#: html/autohandler:98
+msgid "Cannot create user: %1"
+msgstr "Impossibile creare l'utente: %1"
+
+#: etc/initialdata:50
+#: html/Admin/Queues/People.html:43
+#: html/SelfService/Create.html:48
+#: html/Ticket/Create.html:63
+#: html/Ticket/Elements/EditPeople:50
+#: html/Ticket/Elements/ShowPeople:34
+#: html/Ticket/Update.html:44
+#: html/Ticket/Update.html:77
+#: lib/RT/ACE_Overlay.pm:87
+msgid "Cc"
+msgstr "Cc"
+
+#: html/SelfService/Prefs.html:30
+msgid "Change password"
+msgstr "Cambiare la passwrd"
+
+#: html/Ticket/Create.html:100
+#: html/Ticket/Update.html:91
+msgid "Check box to delete"
+msgstr "Spunta la casella per eliminare"
+
+#: html/Admin/Elements/SelectRights:30
+msgid "Check box to revoke right"
+msgstr "Spunta la casella per revocare i diritti"
+
+#: html/Ticket/Create.html:182
+#: html/Ticket/Elements/EditLinks:130
+#: html/Ticket/Elements/EditLinks:68
+#: html/Ticket/Elements/ShowLinks:56
+msgid "Children"
+msgstr "Figli"
+
+#: html/Admin/Elements/ModifyUser:79
+#: html/Admin/Users/Modify.html:131
+#: html/User/Prefs.html:91
+msgid "City"
+msgstr "Città"
+
+#: html/Ticket/Elements/ShowDates:46
+msgid "Closed"
+msgstr "Chiuso"
+
+#: html/SelfService/Closed.html:24
+msgid "Closed Tickets"
+msgstr "Tickets Chiusi"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Closed requests"
+msgstr "Richieste chiuse"
+
+#: html/SelfService/Elements/Tabs:44
+msgid "Closed tickets"
+msgstr "Tickets chiusi"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Code"
+msgstr ""
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Command not understood!\\n"
+msgstr "Comando non riconosciuto! \\n"
+
+#: html/Ticket/Elements/ShowTransaction:178
+#: html/Ticket/Elements/Tabs:152
+msgid "Comment"
+msgstr "Commento"
+
+#: html/Admin/Elements/ModifyQueue:44
+#: html/Admin/Queues/Modify.html:57
+msgid "Comment Address"
+msgstr "Inidirizzo di Commento"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Comment not recorded"
+msgstr "Commento non registrato"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "Comment on tickets"
+msgstr "Commento sui tickets"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "CommentOnTicket"
+msgstr "CommentoSuiTickets"
+
+#: html/Admin/Elements/ModifyUser:34
+msgid "Comments"
+msgstr "Commenti"
+
+#: html/Ticket/ModifyAll.html:69
+#: html/Ticket/Update.html:69
+msgid "Comments (Not sent to requestors)"
+msgstr "Commenti (Non inviati ai richiedenti)"
+
+#: html/Search/Bulk.html:121
+msgid "Comments (not sent to requestors)"
+msgstr "Commenti (non inviati ai richiedenti)"
+
+#. ($name)
+#: html/Elements/ViewUser:26
+msgid "Comments about %1"
+msgstr "Commenti su %1"
+
+#: html/Admin/Users/Modify.html:184
+#: html/Ticket/Elements/ShowRequestor:43
+msgid "Comments about this user"
+msgstr "Commenti su questo utente"
+
+#: lib/RT/Transaction_Overlay.pm:542
+msgid "Comments added"
+msgstr "Commenti aggiunti"
+
+#: lib/RT/Action/Generic.pm:139
+msgid "Commit Stubbed"
+msgstr "tr(Commit Stubbed)"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Compile Restrictions"
+msgstr "Restrizioni di compilazione"
+
+#: html/Admin/Elements/EditScrip:40
+msgid "Condition"
+msgstr "Condizione"
+
+#: bin/rt-crontool:108
+msgid "Condition matches..."
+msgstr "La condizione soddisfa..."
+
+#: lib/RT/Scrip_Overlay.pm:159
+msgid "Condition not found"
+msgstr "Condizione non trovata"
+
+#: html/Elements/Tabs:49
+msgid "Configuration"
+msgstr "Configurazione"
+
+#: html/SelfService/Prefs.html:32
+msgid "Confirm"
+msgstr "Confermare"
+
+#: html/Admin/Elements/ModifyUser:59
+msgid "ContactInfoSystem"
+msgstr "ContactInfoSystem"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Contacted date '%1' could not be parsed"
+msgstr "La data di contatto '%1' non può essere analizzata"
+
+#: html/Admin/Elements/ModifyTemplate:43
+#: html/Ticket/ModifyAll.html:86
+msgid "Content"
+msgstr "Contenuto"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Coould not create group"
+msgstr "Non è stato possibile creare il gruppo"
+
+#: etc/initialdata:271
+msgid "Correspondence"
+msgstr "Corrispondenza"
+
+#: html/Admin/Elements/ModifyQueue:38
+#: html/Admin/Queues/Modify.html:50
+msgid "Correspondence Address"
+msgstr "Inidirizzo di corrispondenza"
+
+#: lib/RT/Transaction_Overlay.pm:538
+msgid "Correspondence added"
+msgstr "Corrispondenza aggiunta"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Correspondence not recorded"
+msgstr "Corrispondenza non registrata"
+
+#: lib/RT/Ticket_Overlay.pm:3524
+msgid "Could not add new custom field value for ticket. "
+msgstr "Impossibile aggiungere un  nuovo valore di campo personalizzato a questo ticket. "
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Could not add new custom field value for ticket. %1 "
+msgstr "Il valore di campo personalizzato non è stato possibile aggiungerlo. %1"
+
+#: lib/RT/Ticket_Overlay.pm:3030
+#: lib/RT/Ticket_Overlay.pm:3038
+#: lib/RT/Ticket_Overlay.pm:3054
+msgid "Could not change owner. "
+msgstr "Impossibile cambiare il proprietario. "
+
+#. ($msg)
+#: html/Admin/Elements/EditCustomField:84
+#: html/Admin/Elements/EditCustomFields:165
+msgid "Could not create CustomField"
+msgstr "Impossibile creare il campo personalizzato"
+
+#: html/User/Groups/Modify.html:76
+#: lib/RT/Group_Overlay.pm:473
+#: lib/RT/Group_Overlay.pm:480
+msgid "Could not create group"
+msgstr "Impossibile creare il gruppo"
+
+#. ($msg)
+#: html/Admin/Global/Template.html:74
+#: html/Admin/Queues/Template.html:71
+msgid "Could not create template: %1"
+msgstr "Impossibile creare il modello : %1"
+
+#: lib/RT/Ticket_Overlay.pm:1072
+#: lib/RT/Ticket_Overlay.pm:333
+msgid "Could not create ticket. Queue not set"
+msgstr "Impossibile creare il ticket. Queue non impostata"
+
+#: lib/RT/User_Overlay.pm:207
+#: lib/RT/User_Overlay.pm:219
+#: lib/RT/User_Overlay.pm:237
+#: lib/RT/User_Overlay.pm:421
+msgid "Could not create user"
+msgstr "Impossibile creare l'utente"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Could not create watcher for requestor"
+msgstr "Impossibile creare l'osservatore per il richiedente"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Could not find a ticket with id %1"
+msgstr "Impossibile trovare il ticket numero %1"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Could not find group %1."
+msgstr "Impossibile trovare il gruppo %1."
+
+#: lib/RT/Queue_Overlay.pm:620
+#: lib/RT/Ticket_Overlay.pm:1421
+msgid "Could not find or create that user"
+msgstr "Impossibile trovare o creare questo utente"
+
+#: lib/RT/Queue_Overlay.pm:681
+#: lib/RT/Ticket_Overlay.pm:1500
+msgid "Could not find that principal"
+msgstr "Impossibile trovare questo gruppo/utente"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Could not find user %1."
+msgstr "Impossibile trovare l'utente %1."
+
+#: html/Admin/Groups/Members.html:87
+#: html/User/Groups/Members.html:89
+#: html/User/Groups/Modify.html:81
+msgid "Could not load group"
+msgstr "Impossibile caricare questo gruppo"
+
+#. ($args{'Type'})
+#: lib/RT/Queue_Overlay.pm:640
+msgid "Could not make that principal a %1 for this queue"
+msgstr "Impossibile rendere questo gruppo/utente un %1 per questa coda"
+
+#. ($self->loc($args{'Type'}))
+#: lib/RT/Ticket_Overlay.pm:1442
+msgid "Could not make that principal a %1 for this ticket"
+msgstr "Impossibile rendere questo gruppo/utente un %1 per questo ticket"
+
+#. ($args{'Type'})
+#: lib/RT/Queue_Overlay.pm:739
+msgid "Could not remove that principal as a %1 for this queue"
+msgstr "Impossibile eliminare questo gruppo/utente come un %1 per questa coda"
+
+#. ($args{'Type'})
+#: lib/RT/Ticket_Overlay.pm:1558
+msgid "Could not remove that principal as a %1 for this ticket"
+msgstr "Impossibile eliminare questo gruppo/utente come un %1 per questo ticket"
+
+#: lib/RT/Group_Overlay.pm:984
+msgid "Couldn't add member to group"
+msgstr "Impossibile aggiungere un membro a questo gruppo"
+
+#. ($Msg)
+#: lib/RT/Ticket_Overlay.pm:3534
+#: lib/RT/Ticket_Overlay.pm:3590
+msgid "Couldn't create a transaction: %1"
+msgstr "Impossibile creare una transazione : %1"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Couldn't figure out what to do from gpg's reply\\n"
+msgstr "Impossibile capire che cosa fare con questa risposta gpg\\n"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Couldn't find group\\n"
+msgstr "Gruppo introvabile\\n"
+
+#: lib/RT/Interface/Web.pm:899
+msgid "Couldn't find row"
+msgstr "Riga introvabile"
+
+#: lib/RT/Group_Overlay.pm:958
+msgid "Couldn't find that principal"
+msgstr "Gruppo/utente introvabile"
+
+#: lib/RT/CustomField_Overlay.pm:239
+msgid "Couldn't find that value"
+msgstr "Valore introvabile"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Couldn't find that watcher"
+msgstr "Osservatore introvabile"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Couldn't find user\\n"
+msgstr "Utente introvabile\\n"
+
+#. ($self->Id)
+#: lib/RT/CurrentUser.pm:111
+msgid "Couldn't load %1 from the users database.\\n"
+msgstr "Impossibile caricare %1 dal database degli utenti.\\n"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Couldn't load KeywordSelects."
+msgstr "KeywordSelects non è stato possibile caricarlo"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Couldn't load RT config file '%1' %2"
+msgstr "Impossibile caricare il file di configurazione RT '%1' %2"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Couldn't load Scrips."
+msgstr "Impossibile caricare gli Scrips"
+
+#. ($id)
+#: html/Admin/Groups/GroupRights.html:87
+#: html/Admin/Groups/UserRights.html:74
+msgid "Couldn't load group %1"
+msgstr "Impossibile caricare il gruppo %1"
+
+#: lib/RT/Link_Overlay.pm:174
+#: lib/RT/Link_Overlay.pm:183
+#: lib/RT/Link_Overlay.pm:210
+msgid "Couldn't load link"
+msgstr "Impossibile caricare il link"
+
+#. ($id)
+#: html/Admin/Elements/EditCustomFields:146
+#: html/Admin/Queues/People.html:120
+msgid "Couldn't load queue"
+msgstr "Impossibile caricare la coda"
+
+#. ($id)
+#: html/Admin/Queues/GroupRights.html:99
+#: html/Admin/Queues/UserRights.html:71
+msgid "Couldn't load queue %1"
+msgstr "Impossibile caricare la coda %1"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Couldn't load scrip"
+msgstr "Impossibile caricare lo Scrip"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Couldn't load template"
+msgstr "Impossibile caricare il modello"
+
+#. ($id)
+#: html/Admin/Users/Prefs.html:78
+msgid "Couldn't load that user (%1)"
+msgstr "Impossibile caricare questo utente (%1)"
+
+#. ($id)
+#: html/SelfService/Display.html:108
+msgid "Couldn't load ticket '%1'"
+msgstr "Impossibile caricare il ticket '%1'"
+
+#: html/Admin/Elements/ModifyUser:85
+#: html/Admin/Users/Modify.html:148
+#: html/User/Prefs.html:97
+msgid "Country"
+msgstr "Stato"
+
+#: html/Admin/Elements/CreateUserCalled:25
+#: html/Ticket/Create.html:134
+#: html/Ticket/Create.html:194
+msgid "Create"
+msgstr "Crea"
+
+#: etc/initialdata:128
+msgid "Create Tickets"
+msgstr "Crea tickets"
+
+#: html/Admin/Elements/EditCustomField:74
+msgid "Create a CustomField"
+msgstr "Crea un campo Personalizzato"
+
+#. ($QueueObj->Name())
+#: html/Admin/Queues/CustomField.html:47
+msgid "Create a CustomField for queue %1"
+msgstr "Crea un campo Custom per la coda %1"
+
+#: html/Admin/Global/CustomField.html:47
+msgid "Create a CustomField which applies to all queues"
+msgstr "Crea un campo Personalizzato valido per tutte le code"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Create a new Custom Field"
+msgstr "Crea un nuovo campo Personalizzato"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Create a new global scrip"
+msgstr "Crea un nuovo scrip globale"
+
+#: html/Admin/Groups/Modify.html:66
+#: html/Admin/Groups/Modify.html:92
+msgid "Create a new group"
+msgstr "Crea un nuovo gruppo"
+
+#: html/User/Groups/Modify.html:66
+#: html/User/Groups/Modify.html:91
+msgid "Create a new personal group"
+msgstr "Crea un nuovo gruppo personale"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Create a new queue"
+msgstr "Crea una nuova coda"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Create a new scrip"
+msgstr "Crea un nuovo scrip"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Create a new template"
+msgstr "Crea un nuovo modello"
+
+#: html/Ticket/Create.html:24
+#: html/Ticket/Create.html:27
+#: html/Ticket/Create.html:35
+msgid "Create a new ticket"
+msgstr "Crea un nuovo ticket"
+
+#: html/Admin/Users/Modify.html:213
+#: html/Admin/Users/Modify.html:240
+msgid "Create a new user"
+msgstr "Crea un nuovo utente"
+
+#: html/Admin/Queues/Modify.html:102
+msgid "Create a queue"
+msgstr "Crea una coda"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Create a queue called"
+msgstr "Crea una nuova coda chiamata"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Create a request"
+msgstr "Crea una richiesta"
+
+#. ($QueueObj->Name)
+#: html/Admin/Queues/Scrip.html:58
+msgid "Create a scrip for queue %1"
+msgstr "Crea uno scrip per la coda %1"
+
+#: html/Admin/Global/Template.html:68
+#: html/Admin/Queues/Template.html:64
+msgid "Create a template"
+msgstr "Crea un modello"
+
+#: html/SelfService/Create.html:24
+msgid "Create a ticket"
+msgstr "Crea un ticket"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Create failed: %1 / %2 / %3 "
+msgstr "Eccezione durante la creazione: %1 / %2 / %3"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Create failed: %1/%2/%3"
+msgstr "Eccezione durante la creazione: %1/%2/%3"
+
+#: etc/initialdata:130
+msgid "Create new tickets based on this scrip's template"
+msgstr "Creare nuovi tickets basati su questo modello di scrip"
+
+#: html/SelfService/Create.html:77
+msgid "Create ticket"
+msgstr "Crea un ticket"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "Create tickets in this queue"
+msgstr "Crea dei tickets in questa coda"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "Create, delete and modify custom fields"
+msgstr "Crea, elimina e modifica campi personalizzati"
+
+#: lib/RT/Queue_Overlay.pm:67
+msgid "Create, delete and modify queues"
+msgstr "Crea, elimina e modifica le code"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
+msgstr "Crea, elimina e modifica i membri dei gruppi personali di un qualunque utente"
+
+#: lib/RT/System.pm:58
+msgid "Create, delete and modify the members of personal groups"
+msgstr "Crea, elimina e modifica i membri dei gruppi personali "
+
+#: lib/RT/System.pm:59
+msgid "Create, delete and modify users"
+msgstr "Crea, elimina e modifica gli utenti"
+
+#: lib/RT/Queue_Overlay.pm:83
+msgid "CreateTicket"
+msgstr "CreaTicket"
+
+#: html/Elements/SelectDateType:25
+#: html/Ticket/Elements/ShowDates:26
+#: lib/RT/Ticket_Overlay.pm:1166
+msgid "Created"
+msgstr "Creato"
+
+#. ($CustomFieldObj->Name())
+#: html/Admin/Elements/EditCustomField:87
+msgid "Created CustomField %1"
+msgstr "Campo Personalizzato %1 creato"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Created template %1"
+msgstr "Modello %1 creato"
+
+#: html/Ticket/Elements/EditLinks:27
+msgid "Current Relationships"
+msgstr "Relazioni attuali"
+
+#: html/Admin/Elements/EditScrips:29
+msgid "Current Scrips"
+msgstr "Scrips attuali"
+
+#: html/Admin/Groups/Members.html:38
+#: html/User/Groups/Members.html:41
+msgid "Current members"
+msgstr "Membri attuali"
+
+#: html/Admin/Elements/SelectRights:28
+msgid "Current rights"
+msgstr "Diritti attuali"
+
+#: html/Search/Listing.html:70
+msgid "Current search criteria"
+msgstr "Criterio di ricerca corrente"
+
+#: html/Admin/Queues/People.html:40
+#: html/Ticket/Elements/EditPeople:44
+msgid "Current watchers"
+msgstr "Osservatori attuali"
+
+#. ($CustomField)
+#: html/Admin/Global/CustomField.html:54
+msgid "Custom Field #%1"
+msgstr "Campo Personalizzato n°%1"
+
+#: html/Admin/Elements/QueueTabs:52
+#: html/Admin/Elements/SystemTabs:39
+#: html/Admin/Global/index.html:49
+#: html/Ticket/Elements/ShowSummary:35
+msgid "Custom Fields"
+msgstr "Campi Personalizzati"
+
+#: html/Admin/Elements/EditScrip:72
+msgid "Custom action cleanup code"
+msgstr "Programma di pulizia dell'azione personalizzata"
+
+#: html/Admin/Elements/EditScrip:64
+msgid "Custom action preparation code"
+msgstr "Programma di preparazione dell'azione personalizzata"
+
+#: html/Admin/Elements/EditScrip:48
+msgid "Custom condition"
+msgstr "Condizione personalizzata"
+
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
+#: lib/RT/Tickets_Overlay.pm:1617
+msgid "Custom field %1 %2 %3"
+msgstr "Campi personalizzati %1 %2 %3"
+
+#. ($CF->Name)
+#: lib/RT/Tickets_Overlay.pm:1612
+msgid "Custom field %1 has a value."
+msgstr "Il campo personalizzato %1 ha un valore"
+
+#. ($CF->Name)
+#: lib/RT/Tickets_Overlay.pm:1609
+msgid "Custom field %1 has no value."
+msgstr "Il campo personalizzato %1 non ha valore"
+
+#. ($args{'Field'})
+#: lib/RT/Ticket_Overlay.pm:3426
+msgid "Custom field %1 not found"
+msgstr "Il campo personalizzato %1 è introvabile"
+
+#: html/Admin/Elements/EditCustomFields:196
+msgid "Custom field deleted"
+msgstr "Campo Personalizzato cancellato"
+
+#: lib/RT/Ticket_Overlay.pm:3576
+msgid "Custom field not found"
+msgstr "Il campo personalizzato è introvabile"
+
+#. ($args{'Content'}, $self->Name)
+#: lib/RT/CustomField_Overlay.pm:349
+msgid "Custom field value %1 could not be found for custom field %2"
+msgstr "Il valore del campo personalizzato %1 non è stato possibile trovarlo per il campo personalizzato %2"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Custom field value changed from %1 to %2"
+msgstr "Il valore del campo personalizzato è stato modificato da %1 à %2"
+
+#: lib/RT/CustomField_Overlay.pm:249
+msgid "Custom field value could not be deleted"
+msgstr "Il valore del campo personalizzato non è stato possibile eliminarlo"
+
+#: lib/RT/CustomField_Overlay.pm:355
+msgid "Custom field value could not be found"
+msgstr "Il valore del campo personalizzato non è stato possibile trovarlo"
+
+#: lib/RT/CustomField_Overlay.pm:247
+#: lib/RT/CustomField_Overlay.pm:357
+msgid "Custom field value deleted"
+msgstr "Il valore del vampo personalizzato è stato eliminato"
+
+#: lib/RT/Transaction_Overlay.pm:547
+msgid "CustomField"
+msgstr "CampoPersonalizzato"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Data error"
+msgstr "Errore nei dati"
+
+#: html/SelfService/Display.html:38
+#: html/Ticket/Create.html:160
+#: html/Ticket/Elements/ShowSummary:54
+#: html/Ticket/Elements/Tabs:92
+#: html/Ticket/ModifyAll.html:43
+msgid "Dates"
+msgstr "Date"
+
+#: lib/RT/Date.pm:421
+msgid "Dec."
+msgstr "Dic."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "December"
+msgstr "Dicembre"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Default Autoresponse Template"
+msgstr "Modello di default per la risposta automatica"
+
+#: etc/initialdata:207
+msgid "Default Autoresponse template"
+msgstr "Modello di default per la risposta automatica"
+
+#: etc/initialdata:281
+msgid "Default admin comment template"
+msgstr "Modello di default per il commento amministrativo"
+
+#: etc/initialdata:260
+msgid "Default admin correspondence template"
+msgstr "Modello di default per la corrispondenza amministrativa"
+
+#: etc/initialdata:272
+msgid "Default correspondence template"
+msgstr "Modello di default per la corrispondenza"
+
+#: etc/initialdata:238
+msgid "Default transaction template"
+msgstr "Modello di default per la transazione"
+
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+#: lib/RT/Transaction_Overlay.pm:642
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr "Defaut: %1/%2 modificato da %3 à %4"
+
+#: html/User/Delegation.html:24
+#: html/User/Delegation.html:27
+msgid "Delegate rights"
+msgstr "Delega i diritti"
+
+#: lib/RT/System.pm:62
+msgid "Delegate specific rights which have been granted to you."
+msgstr "Delega dei diritti specifici che ti sono stati accordati"
+
+#: lib/RT/System.pm:62
+msgid "DelegateRights"
+msgstr "DelegaDiritti"
+
+#: html/User/Elements/Tabs:37
+msgid "Delegation"
+msgstr "Delega"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Delete"
+msgstr "Elimina"
+
+#: lib/RT/Queue_Overlay.pm:89
+msgid "Delete tickets"
+msgstr "Elimina dei tickets"
+
+#: lib/RT/Queue_Overlay.pm:89
+msgid "DeleteTicket"
+msgstr "EliminaTicket"
+
+#: lib/RT/Transaction_Overlay.pm:186
+msgid "Deleting this object could break referential integrity"
+msgstr "Eliminare quest'oggetto può interrompere l'integrità referenziale"
+
+#: lib/RT/Queue_Overlay.pm:291
+msgid "Deleting this object would break referential integrity"
+msgstr "Eliminare quest'oggetto interomperà l'integrità referenziale"
+
+#: lib/RT/User_Overlay.pm:437
+msgid "Deleting this object would violate referential integrity"
+msgstr "Eliminare quest'oggetto violerà l'integrità referenziale"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Deleting this object would violate referential integrity."
+msgstr "Eliminare quest'oggetto violerà l'integrità referenziale"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Deleting this object would violate referential integrity. That's bad."
+msgstr "Eliminare quest'oggetto violerà l'integrità referenziale. Malissimo!"
+
+#: html/Approvals/Elements/Approve:44
+msgid "Deny"
+msgstr "Negare"
+
+#: html/Ticket/Create.html:180
+#: html/Ticket/Elements/EditLinks:122
+#: html/Ticket/Elements/EditLinks:46
+#: html/Ticket/Elements/ShowDependencies:31
+#: html/Ticket/Elements/ShowLinks:36
+msgid "Depended on by"
+msgstr "Usato come dipendenza da"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Dependencies: \\n"
+msgstr "Dipendenze : \\n"
+
+#: html/Elements/SelectLinkType:26
+#: html/Ticket/Create.html:179
+#: html/Ticket/Elements/EditLinks:118
+#: html/Ticket/Elements/EditLinks:35
+#: html/Ticket/Elements/ShowDependencies:24
+#: html/Ticket/Elements/ShowLinks:26
+msgid "Depends on"
+msgstr "Dipende da"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "DependsOn"
+msgstr "DipendeDa"
+
+#: html/Elements/SelectSortOrder:34
+msgid "Descending"
+msgstr "Discendente"
+
+#: html/SelfService/Create.html:72
+#: html/Ticket/Create.html:118
+msgid "Describe the issue below"
+msgstr "Descrivere il problema qui sotto"
+
+#: html/Admin/Elements/AddCustomFieldValue:35
+#: html/Admin/Elements/EditCustomField:38
+#: html/Admin/Elements/EditScrip:33
+#: html/Admin/Elements/ModifyQueue:35
+#: html/Admin/Elements/ModifyTemplate:35
+#: html/Admin/Groups/Modify.html:48
+#: html/Admin/Queues/Modify.html:47
+#: html/Elements/SelectGroups:26
+#: html/User/Groups/Modify.html:48
+msgid "Description"
+msgstr "Descrizione"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Details"
+msgstr "Dettagli"
+
+#: html/Ticket/Elements/Tabs:84
+msgid "Display"
+msgstr "Mostra"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "Display Access Control List"
+msgstr "Mostra la Lista Controllo Accessi"
+
+#: lib/RT/Queue_Overlay.pm:74
+msgid "Display Scrip templates for this queue"
+msgstr "Mostra i modelli di Scrips per questa coda"
+
+#: lib/RT/Queue_Overlay.pm:77
+msgid "Display Scrips for this queue"
+msgstr "Mostra gli Scrips per questa coda"
+
+#: html/Ticket/Elements/ShowHistory:34
+msgid "Display mode"
+msgstr "Modalità visualizzazione"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Display ticket #%1"
+msgstr "Mostra il ticket n°%1"
+
+#: lib/RT/System.pm:53
+msgid "Do anything and everything"
+msgstr "Fare di tutto e non importa cosa"
+
+#: html/Elements/Refresh:29
+msgid "Don't refresh this page."
+msgstr "Non aggiornare questa pagina."
+
+#: html/Search/Elements/PickRestriction:113
+msgid "Don't show search results"
+msgstr "Non mostrare i risultati della ricerca"
+
+#: html/Ticket/Elements/ShowTransaction:104
+msgid "Download"
+msgstr "Download"
+
+#: html/Elements/SelectDateType:31
+#: html/Ticket/Create.html:166
+#: html/Ticket/Elements/EditDates:44
+#: html/Ticket/Elements/ShowDates:42
+#: lib/RT/Ticket_Overlay.pm:1170
+msgid "Due"
+msgstr "Termine"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Due date '%1' could not be parsed"
+msgstr "La data termine '%1' non è stata interpretata"
+
+#. ($1, $msg)
+#: bin/rt-commit-handler:753
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
+msgstr "ERRORE: impossibile caricare il ticket '%1' : %2.\\n"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Edit"
+msgstr "Modifica"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Edit Conditions"
+msgstr "Modifica Condizioni"
+
+#. ($Queue->Name)
+#: html/Admin/Queues/CustomFields.html:44
+msgid "Edit Custom Fields for %1"
+msgstr "Modifica i Campi Personalizzati per %1"
+
+#: html/Ticket/ModifyLinks.html:35
+msgid "Edit Relationships"
+msgstr "Modifica Relazioni"
+
+#. ($QueueObj->Name)
+#: html/Admin/Queues/Templates.html:41
+msgid "Edit Templates for queue %1"
+msgstr "Modifica i modelli per la coda %1"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Edit keywords"
+msgstr "Modifica parole chiave"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Edit scrips"
+msgstr "Modifica scrips"
+
+#: html/Admin/Global/index.html:45
+msgid "Edit system templates"
+msgstr "Modifca i modelli di sistema"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Edit templates for %1"
+msgstr "Modifica i modelli per %1"
+
+#. ($QueueObj->Name)
+#. ($QueueObj->Id)
+#: html/Admin/Elements/ModifyQueue:24
+#: html/Admin/Queues/Modify.html:117
+msgid "Editing Configuration for queue %1"
+msgstr "Modifica la Configurazione per la coda %1"
+
+#. ($UserObj->Name)
+#: html/Admin/Elements/ModifyUser:24
+msgid "Editing Configuration for user %1"
+msgstr "Modifica la Configurazione per l'utente %1"
+
+#. ($CustomFieldObj->Name())
+#: html/Admin/Elements/EditCustomField:90
+msgid "Editing CustomField %1"
+msgstr "Modifica il CampoPersonalizzato %1"
+
+#. ($Group->Name)
+#: html/Admin/Groups/Members.html:31
+msgid "Editing membership for group %1"
+msgstr "Modifica i membri per il gruppo %1"
+
+#. ($Group->Name)
+#: html/User/Groups/Members.html:128
+msgid "Editing membership for personal group %1"
+msgstr "Modifica i membri per il gruppo personale %1"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Editing template %1"
+msgstr "Modifica il modello %1"
+
+#: lib/RT/Ticket_Overlay.pm:2621
+#: lib/RT/Ticket_Overlay.pm:2689
+msgid "Either base or target must be specified"
+msgstr "Uno almeno tra base e target deve essere specificato"
+
+#: html/Admin/Users/Modify.html:52
+#: html/Admin/Users/Prefs.html:45
+#: html/Elements/SelectUsers:26
+#: html/Ticket/Elements/AddWatchers:55
+#: html/User/Prefs.html:41
+msgid "Email"
+msgstr "Email"
+
+#: lib/RT/User_Overlay.pm:187
+msgid "Email address in use"
+msgstr "Inidirizzo email in uso"
+
+#: html/Admin/Elements/ModifyUser:41
+msgid "EmailAddress"
+msgstr "IndirizzoEmail"
+
+#: html/Admin/Elements/ModifyUser:53
+msgid "EmailEncoding"
+msgstr "EmailEncoding"
+
+#: html/Admin/Elements/EditCustomField:50
+msgid "Enabled (Unchecking this box disables this custom field)"
+msgstr "Abilitato (Togliere il segno di spunta disabilita questo campo personalizzato)"
+
+#: html/Admin/Groups/Modify.html:52
+#: html/User/Groups/Modify.html:52
+msgid "Enabled (Unchecking this box disables this group)"
+msgstr "Abilitato (Togliere il segno di spunta disabilita questo gruppo)"
+
+#: html/Admin/Queues/Modify.html:83
+msgid "Enabled (Unchecking this box disables this queue)"
+msgstr "Abilitato (Togliere il segno di spunta disabilita questa coda)"
+
+#: html/Admin/Elements/EditCustomFields:98
+msgid "Enabled Custom Fields"
+msgstr "Campi Personalizzati Abilitati"
+
+#: html/Admin/Queues/index.html:55
+msgid "Enabled Queues"
+msgstr "Code Abilitate"
+
+#. (loc_fuzzy($msg))
+#: html/Admin/Elements/EditCustomField:106
+#: html/Admin/Groups/Modify.html:116
+#: html/Admin/Queues/Modify.html:139
+#: html/Admin/Users/Modify.html:282
+#: html/User/Groups/Modify.html:116
+msgid "Enabled status %1"
+msgstr "Stato %1 abilitato"
+
+#: lib/RT/CustomField_Overlay.pm:427
+msgid "Enter multiple values"
+msgstr "Inserire valori multipli"
+
+#: lib/RT/CustomField_Overlay.pm:424
+msgid "Enter one value"
+msgstr "Inserire un valore"
+
+#: html/Ticket/Elements/EditLinks:111
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "Inserire tickets o URI di tickets da collegare. Separare più valori con spazi."
+
+#: html/Elements/Login:38
+#: html/SelfService/Error.html:24
+#: html/SelfService/Error.html:25
+msgid "Error"
+msgstr "Errore"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Error adding watcher"
+msgstr "Errore cercando di aggiungere un osservatore"
+
+#: lib/RT/Queue_Overlay.pm:554
+msgid "Error in parameters to Queue->AddWatcher"
+msgstr "Errore nei parametri di Queue->AddWatcher"
+
+#: lib/RT/Queue_Overlay.pm:712
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr "Errore nei parametri di Queue->DelWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1355
+msgid "Error in parameters to Ticket->AddWatcher"
+msgstr "Errore nei parametri di Ticket->AddWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1531
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr "Errore nei parametri di Ticket->DelWatcher"
+
+#: etc/initialdata:20
+msgid "Everyone"
+msgstr "Chiunque"
+
+#: bin/rt-crontool:193
+msgid "Example:"
+msgstr "Esempio:"
+
+#: html/Admin/Elements/ModifyUser:63
+msgid "ExternalAuthId"
+msgstr "ExternalAuthId"
+
+#: html/Admin/Elements/ModifyUser:57
+msgid "ExternalContactInfoId"
+msgstr "ExternalContactInfoId"
+
+#: html/Admin/Users/Modify.html:72
+msgid "Extra info"
+msgstr "Informazioni aggiuntive"
+
+#: lib/RT/User_Overlay.pm:301
+msgid "Failed to find 'Privileged' users pseudogroup."
+msgstr "Impossibile trovare il pseudogruppo 'Privilegiato' di utenti."
+
+#: lib/RT/User_Overlay.pm:308
+msgid "Failed to find 'Unprivileged' users pseudogroup"
+msgstr "Impossibile trovare il pseudogruppo 'Non Privilegiato' di utenti."
+
+#. ($modname, $@)
+#: bin/rt-crontool:137
+msgid "Failed to load module %1. (%2)"
+msgstr "Errore nel caricare il modulo %1. (%2)"
+
+#: lib/RT/Date.pm:411
+msgid "Feb."
+msgstr "Feb."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "February"
+msgstr "Febbraio"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Fin"
+msgstr "Fin"
+
+#: html/Ticket/Create.html:154
+#: html/Ticket/Elements/EditBasics:58
+#: lib/RT/Tickets_Overlay.pm:1090
+msgid "Final Priority"
+msgstr "Priorità Finale"
+
+#: lib/RT/Ticket_Overlay.pm:1161
+msgid "FinalPriority"
+msgstr "PrioritàFinale"
+
+#: html/Admin/Queues/People.html:60
+#: html/Ticket/Elements/EditPeople:33
+msgid "Find group whose"
+msgstr "Cerca il gruppo che"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Find new/open tickets"
+msgstr "Cerca tickets nuovi/aperti"
+
+#: html/Admin/Queues/People.html:56
+#: html/Admin/Users/index.html:45
+#: html/Ticket/Elements/EditPeople:29
+msgid "Find people whose"
+msgstr "Cerca le persone che"
+
+#: html/Search/Listing.html:107
+msgid "Find tickets"
+msgstr "Cerca tickets"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Finish Approval"
+msgstr "Approvazione Finale"
+
+#: html/Ticket/Elements/Tabs:57
+msgid "First"
+msgstr "Primo"
+
+#: html/Search/Listing.html:40
+msgid "First page"
+msgstr "Prima Pagina"
+
+#: docs/design_docs/string-extraction-guide.txt:33
+msgid "Foo Bar Baz"
+msgstr "Foo Bar Baz"
+
+#: docs/design_docs/string-extraction-guide.txt:24
+msgid "Foo!"
+msgstr "Foo!"
+
+#: html/Search/Bulk.html:86
+msgid "Force change"
+msgstr "Forza il cambiamento"
+
+#. ($ticketcount)
+#: html/Search/Listing.html:105
+msgid "Found %quant(%1,ticket)"
+msgstr "Trovati %quant(%1,ticket)"
+
+#: lib/RT/Interface/Web.pm:901
+msgid "Found Object"
+msgstr "Trovato Oggetto"
+
+#: html/Admin/Elements/ModifyUser:43
+msgid "FreeformContactInfo"
+msgstr "FreeformContactInfo"
+
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformMultiple"
+msgstr "FreeformMultiple"
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "FreeformSingle"
+msgstr "FreeformSingle"
+
+#: lib/RT/Date.pm:391
+msgid "Fri."
+msgstr "Gio."
+
+#: html/Ticket/Elements/ShowHistory:40
+#: html/Ticket/Elements/ShowHistory:50
+msgid "Full headers"
+msgstr "Intestazioni Estese"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr "Sto prendendo l'utente corrente da una firma pgp\\n"
+
+#. ($New->Name)
+#: lib/RT/Transaction_Overlay.pm:592
+msgid "Given to %1"
+msgstr "Assegnato a %1"
+
+#: html/Admin/Elements/Tabs:40
+#: html/Admin/index.html:37
+msgid "Global"
+msgstr "Globale"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Global Keyword Selections"
+msgstr "Selezione Globale delle Parole Chiave"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Global Scrips"
+msgstr "Scrips Globali"
+
+#. (loc($Template->Name))
+#: html/Admin/Elements/SelectTemplate:37
+msgid "Global template: %1"
+msgstr "Modello globale: %1"
+
+#: html/Admin/Elements/EditCustomFields:74
+#: html/Admin/Queues/People.html:58
+#: html/Admin/Queues/People.html:62
+#: html/Admin/Queues/index.html:43
+#: html/Admin/Users/index.html:48
+#: html/Ticket/Elements/EditPeople:31
+#: html/Ticket/Elements/EditPeople:35
+#: html/index.html:40
+msgid "Go!"
+msgstr "Vai!"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Good pgp sig from %1\\n"
+msgstr "Firma pgp valida da %1\\n"
+
+#: html/Search/Listing.html:49
+msgid "Goto page"
+msgstr "Vai a pagina"
+
+#: html/Elements/GotoTicket:24
+#: html/SelfService/Elements/GotoTicket:24
+msgid "Goto ticket"
+msgstr "Vai al ticket"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Grand"
+msgstr "Grand"
+
+#: html/Ticket/Elements/AddWatchers:45
+#: html/User/Elements/DelegateRights:77
+msgid "Group"
+msgstr "Gruppo"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Group %1 %2: %3"
+msgstr "Gruppo %1 %2: %3"
+
+#: html/Admin/Elements/GroupTabs:44
+#: html/Admin/Elements/QueueTabs:56
+#: html/Admin/Elements/SystemTabs:43
+#: html/Admin/Global/index.html:54
+msgid "Group Rights"
+msgstr "Diritti di Gruppo"
+
+#: lib/RT/Group_Overlay.pm:964
+msgid "Group already has member"
+msgstr "Il gruppo ha già il membro"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Group could not be created."
+msgstr "Il gruppo non può essere creato."
+
+#. ($create_msg)
+#: html/Admin/Groups/Modify.html:76
+msgid "Group could not be created: %1"
+msgstr "Il gruppo non può essere creato: %1"
+
+#: lib/RT/Group_Overlay.pm:496
+msgid "Group created"
+msgstr "Gruppo creato"
+
+#: lib/RT/Group_Overlay.pm:1132
+msgid "Group has no such member"
+msgstr "Il gruppo non ho questo membro"
+
+#: lib/RT/Group_Overlay.pm:944
+#: lib/RT/Queue_Overlay.pm:627
+#: lib/RT/Queue_Overlay.pm:687
+#: lib/RT/Ticket_Overlay.pm:1428
+#: lib/RT/Ticket_Overlay.pm:1506
+msgid "Group not found"
+msgstr "Gruppo non trovato"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Group not found.\\n"
+msgstr "Gruppo non trovato.\\n"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Group not specified.\\n"
+msgstr "Gruppo non specificato.\\n"
+
+#: html/Admin/Elements/SelectNewGroupMembers:34
+#: html/Admin/Elements/Tabs:34
+#: html/Admin/Groups/Members.html:63
+#: html/Admin/Queues/People.html:82
+#: html/Admin/index.html:31
+#: html/User/Groups/Members.html:66
+msgid "Groups"
+msgstr "Gruppi"
+
+#: lib/RT/Group_Overlay.pm:970
+msgid "Groups can't be members of their members"
+msgstr "I gruppi non possono essere membri dei loro membri"
+
+#: lib/RT/Interface/CLI.pm:72
+msgid "Hello!"
+msgstr "Ciao!"
+
+#. ($name)
+#: docs/design_docs/string-extraction-guide.txt:40
+msgid "Hello, %1"
+msgstr "Ciao, %1"
+
+#: html/Ticket/Elements/ShowHistory:29
+#: html/Ticket/Elements/Tabs:87
+msgid "History"
+msgstr "Storia"
+
+#: html/Admin/Elements/ModifyUser:67
+msgid "HomePhone"
+msgstr "TelefonoCasa"
+
+#: html/Elements/Tabs:43
+msgid "Homepage"
+msgstr "Homepage"
+
+#. (6)
+#: lib/RT/Base.pm:73
+msgid "I have %quant(%1,concrete mixer)."
+msgstr "Ho %quant(%1,concrete mixer)."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "I have [quant,_1,concrete mixer]."
+msgstr "Ho [quant,_1,concrete mixer]."
+
+#: html/Ticket/Elements/ShowBasics:26
+#: lib/RT/Tickets_Overlay.pm:1017
+msgid "Id"
+msgstr "Id"
+
+#: html/Admin/Users/Modify.html:43
+#: html/User/Prefs.html:38
+msgid "Identity"
+msgstr "Identità"
+
+#: etc/upgrade/2.1.71:86
+msgid "If an approval is rejected, reject the original and delete pending approvals"
+msgstr "Se una richiesta di approvazione è rifiutata, rifiuta l'originale e elimina le richieste di approvazione pendenti"
+
+#: bin/rt-crontool:189
+msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
+msgstr "Se questo strumento viene utilizzato con setgid, un utente locale mlintenzionato può usrae questo strumento per ottenere accesso amministrativo su RT."
+
+#: html/Admin/Queues/People.html:104
+#: html/Ticket/Modify.html:38
+#: html/Ticket/ModifyAll.html:93
+#: html/Ticket/ModifyPeople.html:37
+msgid "If you've updated anything above, be sure to"
+msgstr "Se hai aggiornato qualchecosa qui sopra, assicurati di"
+
+#: lib/RT/Interface/Web.pm:893
+msgid "Illegal value for %1"
+msgstr "Valore non valido per %1"
+
+#: lib/RT/Interface/Web.pm:896
+msgid "Immutable field"
+msgstr "Campo immutabile"
+
+#: html/Admin/Elements/EditCustomFields:73
+msgid "Include disabled custom fields in listing."
+msgstr "Includi nella lista i campi personalizzati disabilitati."
+
+#: html/Admin/Queues/index.html:42
+msgid "Include disabled queues in listing."
+msgstr "Includi nella lista le code disabilitate."
+
+#: html/Admin/Users/index.html:46
+msgid "Include disabled users in search."
+msgstr "Includi nella ricerca gli utenti disabilitati."
+
+#: lib/RT/Tickets_Overlay.pm:1066
+msgid "Initial Priority"
+msgstr "Priorità Iniziale"
+
+#: lib/RT/Ticket_Overlay.pm:1160
+#: lib/RT/Ticket_Overlay.pm:1162
+msgid "InitialPriority"
+msgstr "PrioritàIniziale"
+
+#: lib/RT/ScripAction_Overlay.pm:104
+msgid "Input error"
+msgstr "Errore in Input"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Interest noted"
+msgstr "Interesse annotato"
+
+#: lib/RT/Ticket_Overlay.pm:3795
+msgid "Internal Error"
+msgstr "Errore Interno"
+
+#. ($id->{error_message})
+#: lib/RT/Record.pm:142
+msgid "Internal Error: %1"
+msgstr "Errore Interno: %1"
+
+#: lib/RT/Group_Overlay.pm:643
+msgid "Invalid Group Type"
+msgstr "Tipo di Gruppo non valido"
+
+#: lib/RT/Principal_Overlay.pm:127
+msgid "Invalid Right"
+msgstr "Diritto non valido"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Invalid Type"
+msgstr "Tipo non valido"
+
+#: lib/RT/Interface/Web.pm:898
+msgid "Invalid data"
+msgstr "Dati non validi"
+
+#: lib/RT/Ticket_Overlay.pm:438
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr "Proprietraio non valido. Verrà usato il default 'nobody'."
+
+#: lib/RT/Scrip_Overlay.pm:133
+#: lib/RT/Template_Overlay.pm:250
+msgid "Invalid queue"
+msgstr "Coda non valida"
+
+#: lib/RT/ACE_Overlay.pm:243
+#: lib/RT/ACE_Overlay.pm:252
+#: lib/RT/ACE_Overlay.pm:258
+#: lib/RT/ACE_Overlay.pm:269
+#: lib/RT/ACE_Overlay.pm:274
+msgid "Invalid right"
+msgstr "Diritto non valido"
+
+#. ($key)
+#: lib/RT/Record.pm:117
+msgid "Invalid value for %1"
+msgstr "Valore non valido per %1"
+
+#: lib/RT/Ticket_Overlay.pm:3433
+msgid "Invalid value for custom field"
+msgstr "Valore non valido per il campo personalizzato"
+
+#: lib/RT/Ticket_Overlay.pm:345
+msgid "Invalid value for status"
+msgstr "Valore non valido per lo stato"
+
+#: bin/rt-crontool:190
+msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
+msgstr "E' estremamente importante che agli utenti non previlegiati non sia consentito eseguire questo strumento."
+
+#: bin/rt-crontool:191
+msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
+msgstr "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
+
+#: bin/rt-crontool:162
+msgid "It takes several arguments:"
+msgstr "Richide molteplici argomenti:"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Items pending my approval"
+msgstr "Oggetti in attesa della mia approvazione"
+
+#: lib/RT/Date.pm:410
+msgid "Jan."
+msgstr "Gen."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "January"
+msgstr "Gennaio"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "Join or leave this group"
+msgstr "Unisciti o lascia questo gruppo"
+
+#: lib/RT/Date.pm:416
+msgid "Jul."
+msgstr "Lug."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "July"
+msgstr "Luglio"
+
+#: html/Ticket/Elements/Tabs:98
+msgid "Jumbo"
+msgstr "Jumbo"
+
+#: lib/RT/Date.pm:415
+msgid "Jun."
+msgstr "Giu."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "June"
+msgstr "Giugno"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Keyword"
+msgstr "Parola chiave"
+
+#: html/Admin/Elements/ModifyUser:51
+msgid "Lang"
+msgstr "Linguaggio"
+
+#: html/Ticket/Elements/Tabs:72
+msgid "Last"
+msgstr "Ultimo"
+
+#: html/Ticket/Elements/EditDates:37
+#: html/Ticket/Elements/ShowDates:38
+msgid "Last Contact"
+msgstr "Ultimo Contatto"
+
+#: html/Elements/SelectDateType:28
+msgid "Last Contacted"
+msgstr "Ultimo Contatto"
+
+#: html/Search/Elements/TicketHeader:40
+msgid "Last Notified"
+msgstr "Ultima Notifica"
+
+#: html/Elements/SelectDateType:29
+msgid "Last Updated"
+msgstr "Ultimo Aggiornamento"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "LastUpdated"
+msgstr "UltimoAggiornamento"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Left"
+msgstr "Rimasti"
+
+#: html/Admin/Users/Modify.html:82
+msgid "Let this user access RT"
+msgstr "Consenti a questo utente di accedere a RT"
+
+#: html/Admin/Users/Modify.html:86
+msgid "Let this user be granted rights"
+msgstr "Concedi a questo utente che gli vengano assegnati i diritti"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Limiting owner to %1 %2"
+msgstr "Limitare il proprietario %1 %2"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Limiting queue to %1 %2"
+msgstr "Limitare la coda a %1 %2"
+
+#: lib/RT/Ticket_Overlay.pm:2703
+msgid "Link already exists"
+msgstr "Il collegamento già esiste"
+
+#: lib/RT/Ticket_Overlay.pm:2715
+msgid "Link could not be created"
+msgstr "Il collegamento non può essere creato"
+
+#. ($TransString)
+#: lib/RT/Ticket_Overlay.pm:2723
+#: lib/RT/Ticket_Overlay.pm:2733
+msgid "Link created (%1)"
+msgstr "Collegamento creato (%1)"
+
+#. ($TransString)
+#: lib/RT/Ticket_Overlay.pm:2644
+msgid "Link deleted (%1)"
+msgstr "Collegamento eliminato (%1)"
+
+#: lib/RT/Ticket_Overlay.pm:2650
+msgid "Link not found"
+msgstr "Collegamento non trovato"
+
+#. ($Ticket->Id)
+#: html/Ticket/ModifyLinks.html:24
+#: html/Ticket/ModifyLinks.html:28
+msgid "Link ticket #%1"
+msgstr "Collega ticket n°%1"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Link ticket %1"
+msgstr "Collega ticket  %1"
+
+#: html/Ticket/Elements/Tabs:96
+msgid "Links"
+msgstr "Collegamenti"
+
+#: html/Admin/Users/Modify.html:113
+#: html/User/Prefs.html:84
+msgid "Location"
+msgstr "Località"
+
+#. ($RT::LogDir)
+#: lib/RT.pm:159
+msgid ""
+"Log directory %1 not found or couldn't be written.\\n"
+" RT can't run."
+msgstr ""
+"Directory di log %1 non trovata o non scrivibile.\\n"
+" RT non può essere eseguito."
+
+#. ("<b>".$session{'CurrentUser'}->Name."</b>")
+#: html/Elements/Header:56
+msgid "Logged in as %1"
+msgstr "Collegato come %1"
+
+#: docs/design_docs/string-extraction-guide.txt:71
+#: html/Elements/Login:34
+#: html/Elements/Login:43
+#: html/Elements/Login:53
+msgid "Login"
+msgstr "Collegamento"
+
+#: html/Elements/Header:53
+msgid "Logout"
+msgstr "Scollegati"
+
+#: html/Search/Bulk.html:85
+msgid "Make Owner"
+msgstr "Crea Proprietario"
+
+#: html/Search/Bulk.html:101
+msgid "Make Status"
+msgstr "Crea Stato"
+
+#: html/Search/Bulk.html:108
+msgid "Make date Due"
+msgstr "Crea data Scadenza"
+
+#: html/Search/Bulk.html:109
+msgid "Make date Resolved"
+msgstr "Crea data Risolto"
+
+#: html/Search/Bulk.html:106
+msgid "Make date Started"
+msgstr "Crea data Iniziato"
+
+#: html/Search/Bulk.html:105
+msgid "Make date Starts"
+msgstr "Crea data Inizia"
+
+#: html/Search/Bulk.html:107
+msgid "Make date Told"
+msgstr "Crea data Detto"
+
+#: html/Search/Bulk.html:98
+msgid "Make priority"
+msgstr "Crea priorità"
+
+#: html/Search/Bulk.html:99
+msgid "Make queue"
+msgstr "Crea coda"
+
+#: html/Search/Bulk.html:97
+msgid "Make subject"
+msgstr "Crea oggetto"
+
+#: html/Admin/index.html:32
+msgid "Manage groups and group membership"
+msgstr "Gestisci i gruppi e le appartenenze"
+
+#: html/Admin/index.html:38
+msgid "Manage properties and configuration which apply to all queues"
+msgstr "Gestisci le proprietà e le configurazioni che si applicano a tutte le code"
+
+#: html/Admin/index.html:35
+msgid "Manage queues and queue-specific properties"
+msgstr "Gestisci le code e le propietà specifiche delle code"
+
+#: html/Admin/index.html:29
+msgid "Manage users and passwords"
+msgstr "Gestisci gli utenti e le password"
+
+#: lib/RT/Date.pm:412
+msgid "Mar."
+msgstr "Mar."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "March"
+msgstr "Marzo"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "May"
+msgstr "Maggio"
+
+#: lib/RT/Date.pm:414
+msgid "May."
+msgstr "Mag."
+
+#: lib/RT/Group_Overlay.pm:981
+msgid "Member added"
+msgstr "Aggiunto membro"
+
+#: lib/RT/Group_Overlay.pm:1139
+msgid "Member deleted"
+msgstr "Eliminato membro"
+
+#: lib/RT/Group_Overlay.pm:1143
+msgid "Member not deleted"
+msgstr "Membro non eliminato"
+
+#: html/Elements/SelectLinkType:25
+msgid "Member of"
+msgstr "Membro di"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "MemberOf"
+msgstr "MembroDi"
+
+#: html/Admin/Elements/GroupTabs:41
+#: html/User/Elements/GroupTabs:41
+msgid "Members"
+msgstr "Membri"
+
+#: lib/RT/Ticket_Overlay.pm:2890
+msgid "Merge Successful"
+msgstr "Unione avvenuta con Successo"
+
+#: lib/RT/Ticket_Overlay.pm:2810
+msgid "Merge failed. Couldn't set EffectiveId"
+msgstr "Unione fallita. Impossibile impostare EffectiveId"
+
+#: html/Ticket/Elements/EditLinks:114
+msgid "Merge into"
+msgstr "Unisci in"
+
+#: html/Ticket/Update.html:101
+msgid "Message"
+msgstr "Messaggio"
+
+#: lib/RT/Interface/Web.pm:900
+msgid "Missing a primary key?: %1"
+msgstr "Manca una chiave primaria?: %1"
+
+#: html/Admin/Users/Modify.html:168
+#: html/User/Prefs.html:53
+msgid "Mobile"
+msgstr "Cellulare"
+
+#: html/Admin/Elements/ModifyUser:71
+msgid "MobilePhone"
+msgstr "TelefonoCellulare"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "Modify Access Control List"
+msgstr "Modifca la Lista Controllo Accessi"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Modify Custom Field %1"
+msgstr "Modifica il Campo Personalizzato %1"
+
+#: html/Admin/Global/CustomFields.html:43
+#: html/Admin/Global/index.html:50
+msgid "Modify Custom Fields which apply to all queues"
+msgstr "Modifica i Campi Personalizzati validi per tutte le code"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "Modify Scrip templates for this queue"
+msgstr "Modifica i modelli di Scips per questa coda"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "Modify Scrips for this queue"
+msgstr "Modifica gli Scrips per questa coda"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Modify System ACLS"
+msgstr "Modifica le LCA di Sistema"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Modify Template %1"
+msgstr "Modifica il Modello %1"
+
+#. ($QueueObj->Name())
+#: html/Admin/Queues/CustomField.html:44
+msgid "Modify a CustomField for queue %1"
+msgstr "Modifica un CampoPersonalizzato per la coda %1"
+
+#: html/Admin/Global/CustomField.html:52
+msgid "Modify a CustomField which applies to all queues"
+msgstr "Modifica un CampoPersonalizzato valido per tutte le code"
+
+#. ($QueueObj->Name)
+#: html/Admin/Queues/Scrip.html:53
+msgid "Modify a scrip for queue %1"
+msgstr "Modifica uno scrip per la coda %1"
+
+#: html/Admin/Global/Scrip.html:47
+msgid "Modify a scrip which applies to all queues"
+msgstr "Modifica uno scrip valido per tutte le code"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Modify dates for # %1"
+msgstr "Modifica le date per n° %1"
+
+#. ($TicketObj->Id)
+#: html/Ticket/ModifyDates.html:24
+#: html/Ticket/ModifyDates.html:28
+msgid "Modify dates for #%1"
+msgstr "Modifica le date per n°%1"
+
+#. ($TicketObj->Id)
+#: html/Ticket/ModifyDates.html:34
+msgid "Modify dates for ticket # %1"
+msgstr "Modifica le date per il ticket n° %1"
+
+#: html/Admin/Global/GroupRights.html:24
+#: html/Admin/Global/GroupRights.html:27
+#: html/Admin/Global/index.html:55
+msgid "Modify global group rights"
+msgstr "Modifica i diritti di gruppo globali"
+
+#: html/Admin/Global/GroupRights.html:32
+msgid "Modify global group rights."
+msgstr "Modifica i diritti di gruppo globali."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Modify global rights for groups"
+msgstr "Modifica i diritti di gruppo globali"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Modify global rights for users"
+msgstr "Modifica i diritti globali per gli utenti"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Modify global scrips"
+msgstr "Modifica gli scrips globali"
+
+#: html/Admin/Global/UserRights.html:24
+#: html/Admin/Global/UserRights.html:27
+#: html/Admin/Global/index.html:59
+msgid "Modify global user rights"
+msgstr "Modifica i diritti globali per gli utenti"
+
+#: html/Admin/Global/UserRights.html:32
+msgid "Modify global user rights."
+msgstr "Modifica i diritti globali per gli utenti."
+
+#: lib/RT/Group_Overlay.pm:145
+msgid "Modify group metadata or delete group"
+msgstr "Modifica i metadati di gruppo o elimina un gruppo"
+
+#. ($GroupObj->Name)
+#: html/Admin/Groups/GroupRights.html:24
+#: html/Admin/Groups/GroupRights.html:28
+#: html/Admin/Groups/GroupRights.html:34
+msgid "Modify group rights for group %1"
+msgstr "Modifica i diritti di gruppo per il gruppo %1"
+
+#. ($QueueObj->Name)
+#: html/Admin/Queues/GroupRights.html:24
+#: html/Admin/Queues/GroupRights.html:28
+msgid "Modify group rights for queue %1"
+msgstr "Modifica i diritti di gruppo per la coda %1"
+
+#: lib/RT/Group_Overlay.pm:147
+msgid "Modify membership roster for this group"
+msgstr "Modofica i membri di questo gruppo"
+
+#: lib/RT/System.pm:60
+msgid "Modify one's own RT account"
+msgstr "Modifica il proprio account RT"
+
+#. ($QueueObj->Name)
+#: html/Admin/Queues/People.html:24
+#: html/Admin/Queues/People.html:28
+msgid "Modify people related to queue %1"
+msgstr "Modifica le persone relative alla coda %1"
+
+#. ($Ticket->id)
+#. ($Ticket->Id)
+#: html/Ticket/ModifyPeople.html:24
+#: html/Ticket/ModifyPeople.html:28
+#: html/Ticket/ModifyPeople.html:34
+msgid "Modify people related to ticket #%1"
+msgstr "Modifica le persone relative al ticket n°%1"
+
+#. ($QueueObj->Name)
+#: html/Admin/Queues/Scrips.html:43
+msgid "Modify scrips for queue %1"
+msgstr "Modifica gli scrips per la coda %1"
+
+#: html/Admin/Global/Scrips.html:43
+#: html/Admin/Global/index.html:41
+msgid "Modify scrips which apply to all queues"
+msgstr "Modifica gli scrips validi per tutte le code"
+
+#. (loc($TemplateObj->Name()))
+#. ($TemplateObj->id)
+#: html/Admin/Global/Template.html:24
+#: html/Admin/Global/Template.html:29
+#: html/Admin/Global/Template.html:80
+#: html/Admin/Queues/Template.html:77
+msgid "Modify template %1"
+msgstr "Modifica modello %1"
+
+#: html/Admin/Global/Templates.html:43
+msgid "Modify templates which apply to all queues"
+msgstr "Modifica i modelli validi per tutte le code"
+
+#. ($Group->Name)
+#: html/Admin/Groups/Modify.html:86
+#: html/User/Groups/Modify.html:85
+msgid "Modify the group %1"
+msgstr "Modifica il gruppo %1"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "Modify the queue watchers"
+msgstr "Modifica gli osservatori della coda"
+
+#. ($UserObj->Name)
+#: html/Admin/Users/Modify.html:235
+msgid "Modify the user %1"
+msgstr "Modifica l'utente %1"
+
+#. ($Ticket->Id)
+#: html/Ticket/ModifyAll.html:36
+msgid "Modify ticket # %1"
+msgstr "Modifica il ticket n° %1"
+
+#. ($TicketObj->Id)
+#: html/Ticket/Modify.html:24
+#: html/Ticket/Modify.html:27
+#: html/Ticket/Modify.html:33
+msgid "Modify ticket #%1"
+msgstr "Modifica il ticket n°%1"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "Modify tickets"
+msgstr "Modifica i tickets"
+
+#. ($GroupObj->Name)
+#: html/Admin/Groups/UserRights.html:24
+#: html/Admin/Groups/UserRights.html:28
+#: html/Admin/Groups/UserRights.html:34
+msgid "Modify user rights for group %1"
+msgstr "Modifica i diritti utente per il gruppo %1"
+
+#. ($QueueObj->Name)
+#: html/Admin/Queues/UserRights.html:24
+#: html/Admin/Queues/UserRights.html:28
+msgid "Modify user rights for queue %1"
+msgstr "Modifica i diritti dell'utente per la coda %1"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Modify watchers for queue '%1'"
+msgstr "Modifica gli osservatori per la coda '%1'"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "ModifyACL"
+msgstr "ModificaLCA"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "ModifyOwnMembership"
+msgstr "ModificaPropriaAppartenenza"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ModifyQueueWatchers"
+msgstr "ModificaOsservatoriCoda"
+
+#: lib/RT/Queue_Overlay.pm:75
+msgid "ModifyScrips"
+msgstr "ModificaScrips"
+
+#: lib/RT/System.pm:60
+msgid "ModifySelf"
+msgstr "ModificaSeStesso"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "ModifyTemplate"
+msgstr "ModificaModello"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "ModifyTicket"
+msgstr "ModificaTicket"
+
+#: lib/RT/Date.pm:387
+msgid "Mon."
+msgstr "Lun."
+
+#. ($name)
+#: html/Ticket/Elements/ShowRequestor:41
+msgid "More about %1"
+msgstr "Altre info su %1"
+
+#: html/Admin/Elements/EditCustomFields:60
+msgid "Move down"
+msgstr "Move down"
+
+#: html/Admin/Elements/EditCustomFields:52
+msgid "Move up"
+msgstr "Move up"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:26
+msgid "Multiple"
+msgstr "Multiple"
+
+#: lib/RT/User_Overlay.pm:178
+msgid "Must specify 'Name' attribute"
+msgstr "Must specify 'Name' attribute"
+
+#. ($friendly_status)
+#: html/SelfService/Elements/MyRequests:48
+msgid "My %1 tickets"
+msgstr "I miei%1 tickets"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "My Approvals"
+msgstr "Le mie richieste di Approvazione"
+
+#: html/Approvals/index.html:24
+#: html/Approvals/index.html:25
+msgid "My approvals"
+msgstr "Le mie richieste di approvazione"
+
+#: html/Admin/Elements/AddCustomFieldValue:31
+#: html/Admin/Elements/EditCustomField:33
+#: html/Admin/Elements/ModifyTemplate:27
+#: html/Admin/Elements/ModifyUser:29
+#: html/Admin/Groups/Modify.html:43
+#: html/Elements/SelectGroups:25
+#: html/Elements/SelectUsers:27
+#: html/User/Groups/Modify.html:43
+msgid "Name"
+msgstr "Nome"
+
+#: lib/RT/User_Overlay.pm:185
+msgid "Name in use"
+msgstr "Name in use"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Need approval from system administrator"
+msgstr "Need approval from system administrator"
+
+#: html/Ticket/Elements/ShowDates:51
+msgid "Never"
+msgstr "Never"
+
+#: html/Elements/Quicksearch:29
+msgid "New"
+msgstr "Nuovo"
+
+#: html/Admin/Elements/ModifyUser:31
+#: html/Admin/Users/Modify.html:92
+#: html/User/Prefs.html:64
+msgid "New Password"
+msgstr "Nuova Password"
+
+#: etc/initialdata:317
+#: etc/upgrade/2.1.71:16
+msgid "New Pending Approval"
+msgstr "New Pending Approval"
+
+#: html/Ticket/Elements/EditLinks:110
+msgid "New Relationships"
+msgstr "New Relationships"
+
+#: html/Ticket/Elements/Tabs:35
+msgid "New Search"
+msgstr "Nuova Ricerca"
+
+#: html/Admin/Global/CustomField.html:40
+#: html/Admin/Global/CustomFields.html:38
+#: html/Admin/Queues/CustomField.html:51
+#: html/Admin/Queues/CustomFields.html:39
+msgid "New custom field"
+msgstr "Nuovo campo Personalizzato"
+
+#: html/Admin/Elements/GroupTabs:53
+#: html/User/Elements/GroupTabs:51
+msgid "New group"
+msgstr "Nuovo gruppo"
+
+#: html/SelfService/Prefs.html:31
+msgid "New password"
+msgstr "Nuova password"
+
+#: lib/RT/User_Overlay.pm:646
+msgid "New password notification sent"
+msgstr "New password notification sent"
+
+#: html/Admin/Elements/QueueTabs:69
+msgid "New queue"
+msgstr "Nuova coda"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "New request"
+msgstr "Nuova richiesta"
+
+#: html/Admin/Elements/SelectRights:41
+msgid "New rights"
+msgstr "Nuovi diritti"
+
+#: html/Admin/Global/Scrip.html:39
+#: html/Admin/Global/Scrips.html:38
+#: html/Admin/Queues/Scrip.html:42
+#: html/Admin/Queues/Scrips.html:52
+msgid "New scrip"
+msgstr "Nuovo scrip"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "New search"
+msgstr "Nuova ricerca"
+
+#: html/Admin/Global/Template.html:59
+#: html/Admin/Global/Templates.html:38
+#: html/Admin/Queues/Template.html:57
+#: html/Admin/Queues/Templates.html:49
+msgid "New template"
+msgstr "Nuovo modello"
+
+#: html/SelfService/Elements/Tabs:47
+msgid "New ticket"
+msgstr "Nuovo ticket"
+
+#: lib/RT/Ticket_Overlay.pm:2777
+msgid "New ticket doesn't exist"
+msgstr "Il nuovo ticket non esiste"
+
+#: html/Admin/Elements/UserTabs:51
+msgid "New user"
+msgstr "Nuovo utente"
+
+#: html/Admin/Elements/CreateUserCalled:25
+msgid "New user called"
+msgstr "New user called"
+
+#: html/Admin/Queues/People.html:54
+#: html/Ticket/Elements/EditPeople:28
+msgid "New watchers"
+msgstr "Nuovo osservatore"
+
+#: html/Admin/Users/Prefs.html:41
+msgid "New window setting"
+msgstr "New window setting"
+
+#: html/Ticket/Elements/Tabs:68
+msgid "Next"
+msgstr "Succesivo"
+
+#: html/Search/Listing.html:47
+msgid "Next page"
+msgstr "Pagina succesiva"
+
+#: html/Admin/Elements/ModifyUser:49
+msgid "NickName"
+msgstr "NickName"
+
+#: html/Admin/Users/Modify.html:62
+#: html/User/Prefs.html:45
+msgid "Nickname"
+msgstr "Soprannome"
+
+#: html/Admin/Elements/EditCustomField:89
+#: html/Admin/Elements/EditCustomFields:104
+msgid "No CustomField"
+msgstr "No CustomField"
+
+#: html/Admin/Groups/GroupRights.html:83
+#: html/Admin/Groups/UserRights.html:70
+msgid "No Group defined"
+msgstr "No Group defined"
+
+#: html/Admin/Queues/GroupRights.html:95
+#: html/Admin/Queues/UserRights.html:67
+msgid "No Queue defined"
+msgstr "No Queue defined"
+
+#: bin/rt-crontool:55
+msgid "No RT user found. Please consult your RT administrator.\\n"
+msgstr "No RT user found. Please consult your RT administrator.\\n"
+
+#: html/Admin/Global/Template.html:78
+#: html/Admin/Queues/Template.html:75
+msgid "No Template"
+msgstr "Nessun Modello"
+
+#: bin/rt-commit-handler:763
+msgid "No Ticket specified. Aborting ticket "
+msgstr "No Ticket specified. Aborting ticket "
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid ""
+"No Ticket specified. Aborting ticket modifications\\n"
+"\\n"
+msgstr ""
+"No Ticket specified. Aborting ticket modifications\\n"
+"\\n"
+
+#: html/Approvals/Elements/Approve:45
+msgid "No action"
+msgstr "No action"
+
+#: lib/RT/Interface/Web.pm:895
+msgid "No column specified"
+msgstr "No column specified"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "No command found\\n"
+msgstr "No command found\\n"
+
+#: html/Elements/ViewUser:35
+#: html/Ticket/Elements/ShowRequestor:44
+msgid "No comment entered about this user"
+msgstr "No comment entered about this user"
+
+#: lib/RT/Ticket_Overlay.pm:2188
+#: lib/RT/Ticket_Overlay.pm:2256
+msgid "No correspondence attached"
+msgstr "No correspondence attached"
+
+#. (ref $self)
+#: lib/RT/Action/Generic.pm:149
+#: lib/RT/Condition/Generic.pm:175
+#: lib/RT/Search/ActiveTicketsInQueue.pm:55
+#: lib/RT/Search/Generic.pm:112
+msgid "No description for %1"
+msgstr "Nessuna descrizione per %1"
+
+#: lib/RT/Users_Overlay.pm:151
+msgid "No group specified"
+msgstr "No group specified"
+
+#: lib/RT/User_Overlay.pm:864
+msgid "No password set"
+msgstr "No password set"
+
+#: lib/RT/Queue_Overlay.pm:258
+msgid "No permission to create queues"
+msgstr "No permission to create code"
+
+#. ($QueueObj->Name)
+#: lib/RT/Ticket_Overlay.pm:341
+msgid "No permission to create tickets in the queue '%1'"
+msgstr "No permission to create tickets in the coda '%1'"
+
+#: lib/RT/User_Overlay.pm:151
+msgid "No permission to create users"
+msgstr "No permission to create users"
+
+#: html/SelfService/Display.html:117
+msgid "No permission to display that ticket"
+msgstr "No permission to display that ticket"
+
+#: html/SelfService/Update.html:51
+msgid "No permission to view update ticket"
+msgstr "No permission to view update ticket"
+
+#: lib/RT/Queue_Overlay.pm:674
+#: lib/RT/Ticket_Overlay.pm:1487
+msgid "No principal specified"
+msgstr "No principal specified"
+
+#: html/Admin/Queues/People.html:153
+#: html/Admin/Queues/People.html:163
+msgid "No principals selected."
+msgstr "No principals selected."
+
+#: html/Admin/Queues/index.html:34
+msgid "No queues matching search criteria found."
+msgstr "No code matching search criteria found."
+
+#: html/Admin/Elements/SelectRights:80
+msgid "No rights found"
+msgstr "Nessun diritto trovato"
+
+#: html/Admin/Elements/SelectRights:32
+msgid "No rights granted."
+msgstr "Nessun diritto concesso."
+
+#: html/Search/Bulk.html:148
+msgid "No search to operate on."
+msgstr "No search to operate on."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "No ticket id specified"
+msgstr "No ticket id specified"
+
+#: lib/RT/Transaction_Overlay.pm:477
+#: lib/RT/Transaction_Overlay.pm:515
+msgid "No transaction type specified"
+msgstr "No transaction type specified"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "No user or email address specified"
+msgstr "No user or email address specified"
+
+#: html/Admin/Users/index.html:35
+msgid "No users matching search criteria found."
+msgstr "No users matching search criteria found."
+
+#: bin/rt-commit-handler:643
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+
+#: lib/RT/Interface/Web.pm:892
+msgid "No value sent to _Set!\\n"
+msgstr "No value sent to _Set!\\n"
+
+#: html/Search/Elements/TicketRow:36
+msgid "Nobody"
+msgstr "Nessuno"
+
+#: lib/RT/Interface/Web.pm:897
+msgid "Nonexistant field?"
+msgstr "Nonexistant field?"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Not logged in"
+msgstr "Not logged in"
+
+#: html/Elements/Header:58
+msgid "Not logged in."
+msgstr "Non collegato."
+
+#: lib/RT/Date.pm:368
+msgid "Not set"
+msgstr "Non valorizzato"
+
+#: html/NoAuth/Reminder.html:26
+msgid "Not yet implemented."
+msgstr "Not yet implemented."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Not yet implemented...."
+msgstr "Not yet implemented...."
+
+#: html/Approvals/Elements/Approve:48
+msgid "Notes"
+msgstr "Notes"
+
+#: lib/RT/User_Overlay.pm:649
+msgid "Notification could not be sent"
+msgstr "Notification could not be sent"
+
+#: etc/initialdata:94
+msgid "Notify AdminCcs"
+msgstr "Notify AdminCcs"
+
+#: etc/initialdata:90
+msgid "Notify AdminCcs as Comment"
+msgstr "Notify AdminCcs as Comment"
+
+#: etc/initialdata:121
+msgid "Notify Other Recipients"
+msgstr "Notify Other Recipients"
+
+#: etc/initialdata:117
+msgid "Notify Other Recipients as Comment"
+msgstr "Notify Other Recipients as Comment"
+
+#: etc/initialdata:86
+msgid "Notify Owner"
+msgstr "Notify Proprietario"
+
+#: etc/initialdata:82
+msgid "Notify Owner as Comment"
+msgstr "Notify Proprietario as Comment"
+
+#: etc/initialdata:319
+#: etc/upgrade/2.1.71:17
+msgid "Notify Owners and AdminCcs of new items pending their approval"
+msgstr "Notify Proprietari and AdminCcs of new items pending their approval"
+
+#: etc/initialdata:78
+msgid "Notify Requestors"
+msgstr "Notifica al Richiedente"
+
+#: etc/initialdata:104
+msgid "Notify Requestors and Ccs"
+msgstr "Notifica ai Richiedenti e ai Ccs"
+
+#: etc/initialdata:99
+msgid "Notify Requestors and Ccs as Comment"
+msgstr "Notifica ai Richiedenti e ai Ccs come Commento"
+
+#: etc/initialdata:113
+msgid "Notify Requestors, Ccs and AdminCcs"
+msgstr "Notifica ai Richiedenti, Ccs e AdminCcs"
+
+#: etc/initialdata:109
+msgid "Notify Requestors, Ccs and AdminCcs as Comment"
+msgstr "Notifica ai Richiedenti, Ccs a AdminCcs come Commento"
+
+#: lib/RT/Date.pm:420
+msgid "Nov."
+msgstr "Nov."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "November"
+msgstr "November"
+
+#: lib/RT/Record.pm:156
+msgid "Object could not be created"
+msgstr "Object could not be created"
+
+#: lib/RT/Record.pm:175
+msgid "Object created"
+msgstr "Object created"
+
+#: lib/RT/Date.pm:419
+msgid "Oct."
+msgstr "Oct."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "October"
+msgstr "October"
+
+#: html/Elements/SelectDateRelation:34
+msgid "On"
+msgstr "On"
+
+#: etc/initialdata:155
+msgid "On Comment"
+msgstr "On Comment"
+
+#: etc/initialdata:148
+msgid "On Correspond"
+msgstr "On Correspond"
+
+#: etc/initialdata:137
+msgid "On Create"
+msgstr "On Create"
+
+#: etc/initialdata:169
+msgid "On Owner Change"
+msgstr "On Owner Change"
+
+#: etc/initialdata:177
+msgid "On Queue Change"
+msgstr "On Queue Change"
+
+#: etc/initialdata:183
+msgid "On Resolve"
+msgstr "On Resolve"
+
+#: etc/initialdata:161
+msgid "On Status Change"
+msgstr "On Status Change"
+
+#: etc/initialdata:142
+msgid "On Transaction"
+msgstr "On Transaction"
+
+#. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
+#: html/Approvals/Elements/PendingMyApproval:49
+msgid "Only show approvals for requests created after %1"
+msgstr "Mostra le approvazioni solo per le richieste create dopo %1"
+
+#. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
+#: html/Approvals/Elements/PendingMyApproval:47
+msgid "Only show approvals for requests created before %1"
+msgstr "Mostra le approvazioni solo per le richieste create prima %1"
+
+#: html/Elements/Quicksearch:30
+msgid "Open"
+msgstr "Aperto"
+
+#: html/Ticket/Elements/Tabs:135
+msgid "Open it"
+msgstr "Aprilo"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Open requests"
+msgstr "Richieste aperte"
+
+#: html/SelfService/Elements/Tabs:41
+msgid "Open tickets"
+msgstr "Open tickets"
+
+#: html/Admin/Users/Prefs.html:40
+msgid "Open tickets (from listing) in a new window"
+msgstr "Open tickets (from listing) in a new window"
+
+#: html/Admin/Users/Prefs.html:39
+msgid "Open tickets (from listing) in another window"
+msgstr "Open tickets (from listing) in another window"
+
+#: etc/initialdata:133
+msgid "Open tickets on correspondence"
+msgstr "Open tickets on correspondence"
+
+#: html/Search/Elements/PickRestriction:100
+msgid "Ordering and sorting"
+msgstr "Visualizzazione e Ordinamento"
+
+#: html/Admin/Elements/ModifyUser:45
+#: html/Admin/Users/Modify.html:116
+#: html/Elements/SelectUsers:28
+#: html/User/Prefs.html:85
+msgid "Organization"
+msgstr "Azienda"
+
+#. ($approving->Id, $approving->Subject)
+#: html/Approvals/Elements/Approve:32
+msgid "Originating ticket: #%1"
+msgstr "Originating ticket: n°%1"
+
+#: html/Admin/Elements/ModifyQueue:54
+#: html/Admin/Queues/Modify.html:68
+msgid "Over time, priority moves toward"
+msgstr "Se scade il tempo, la priorità sale di"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "Own tickets"
+msgstr "Own tickets"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "OwnTicket"
+msgstr "PossiediTicket"
+
+#: etc/initialdata:38
+#: html/Elements/MyRequests:31
+#: html/SelfService/Elements/MyRequests:29
+#: html/Ticket/Create.html:47
+#: html/Ticket/Elements/EditPeople:42
+#: html/Ticket/Elements/EditPeople:43
+#: html/Ticket/Elements/ShowPeople:26
+#: html/Ticket/Update.html:62
+#: lib/RT/ACE_Overlay.pm:85
+#: lib/RT/Tickets_Overlay.pm:1243
+msgid "Owner"
+msgstr "Proprietario"
+
+#. ($OldOwnerObj->Name,  $NewOwnerObj->Name)
+#: lib/RT/Ticket_Overlay.pm:3070
+msgid "Owner changed from %1 to %2"
+msgstr "Proprietario changed from %1 to %2"
+
+#. ($Old->Name , $New->Name)
+#: lib/RT/Transaction_Overlay.pm:581
+msgid "Owner forcibly changed from %1 to %2"
+msgstr "Owner forcibly changed from %1 to %2"
+
+#: html/Search/Elements/PickRestriction:30
+msgid "Owner is"
+msgstr "Il Proprietario è"
+
+#: html/Admin/Users/Modify.html:173
+#: html/User/Prefs.html:55
+msgid "Pager"
+msgstr "Pager"
+
+#: html/Admin/Elements/ModifyUser:73
+msgid "PagerPhone"
+msgstr "PagerPhone"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Parent"
+msgstr ""
+
+#: html/Ticket/Create.html:181
+#: html/Ticket/Elements/EditLinks:126
+#: html/Ticket/Elements/EditLinks:57
+#: html/Ticket/Elements/ShowLinks:46
+msgid "Parents"
+msgstr "Genitori"
+
+#: html/Elements/Login:51
+#: html/User/Prefs.html:60
+msgid "Password"
+msgstr "Password"
+
+#: html/NoAuth/Reminder.html:24
+msgid "Password Reminder"
+msgstr "Password Reminder"
+
+#: lib/RT/User_Overlay.pm:168
+#: lib/RT/User_Overlay.pm:867
+msgid "Password too short"
+msgstr "Password too short"
+
+#. (loc_fuzzy($msg))
+#: html/Admin/Users/Modify.html:290
+#: html/User/Prefs.html:171
+msgid "Password: %1"
+msgstr "Password: %1"
+
+#: html/Admin/Users/Modify.html:292
+msgid "Passwords do not match."
+msgstr "Passwords do not match."
+
+#: html/User/Prefs.html:173
+msgid "Passwords do not match. Your password has not been changed"
+msgstr "Passwords do not match. Your password has not been changed"
+
+#: html/Ticket/Elements/ShowSummary:44
+#: html/Ticket/Elements/Tabs:95
+#: html/Ticket/ModifyAll.html:50
+msgid "People"
+msgstr "Persone"
+
+#: etc/initialdata:126
+msgid "Perform a user-defined action"
+msgstr "Perform a user-defined action"
+
+#: lib/RT/ACE_Overlay.pm:230
+#: lib/RT/ACE_Overlay.pm:236
+#: lib/RT/ACE_Overlay.pm:562
+#: lib/RT/ACE_Overlay.pm:572
+#: lib/RT/ACE_Overlay.pm:582
+#: lib/RT/ACE_Overlay.pm:647
+#: lib/RT/CurrentUser.pm:82
+#: lib/RT/CurrentUser.pm:91
+#: lib/RT/CustomField_Overlay.pm:100
+#: lib/RT/CustomField_Overlay.pm:201
+#: lib/RT/CustomField_Overlay.pm:233
+#: lib/RT/CustomField_Overlay.pm:510
+#: lib/RT/CustomField_Overlay.pm:90
+#: lib/RT/Group_Overlay.pm:1094
+#: lib/RT/Group_Overlay.pm:1098
+#: lib/RT/Group_Overlay.pm:1107
+#: lib/RT/Group_Overlay.pm:1158
+#: lib/RT/Group_Overlay.pm:1162
+#: lib/RT/Group_Overlay.pm:1168
+#: lib/RT/Group_Overlay.pm:425
+#: lib/RT/Group_Overlay.pm:517
+#: lib/RT/Group_Overlay.pm:595
+#: lib/RT/Group_Overlay.pm:603
+#: lib/RT/Group_Overlay.pm:700
+#: lib/RT/Group_Overlay.pm:704
+#: lib/RT/Group_Overlay.pm:710
+#: lib/RT/Group_Overlay.pm:903
+#: lib/RT/Group_Overlay.pm:907
+#: lib/RT/Group_Overlay.pm:920
+#: lib/RT/Queue_Overlay.pm:539
+#: lib/RT/Queue_Overlay.pm:549
+#: lib/RT/Queue_Overlay.pm:563
+#: lib/RT/Queue_Overlay.pm:698
+#: lib/RT/Queue_Overlay.pm:707
+#: lib/RT/Queue_Overlay.pm:720
+#: lib/RT/Queue_Overlay.pm:930
+#: lib/RT/Scrip_Overlay.pm:125
+#: lib/RT/Scrip_Overlay.pm:136
+#: lib/RT/Scrip_Overlay.pm:196
+#: lib/RT/Scrip_Overlay.pm:429
+#: lib/RT/Template_Overlay.pm:283
+#: lib/RT/Template_Overlay.pm:87
+#: lib/RT/Template_Overlay.pm:93
+#: lib/RT/Ticket_Overlay.pm:1340
+#: lib/RT/Ticket_Overlay.pm:1350
+#: lib/RT/Ticket_Overlay.pm:1364
+#: lib/RT/Ticket_Overlay.pm:1517
+#: lib/RT/Ticket_Overlay.pm:1526
+#: lib/RT/Ticket_Overlay.pm:1539
+#: lib/RT/Ticket_Overlay.pm:1874
+#: lib/RT/Ticket_Overlay.pm:2012
+#: lib/RT/Ticket_Overlay.pm:2176
+#: lib/RT/Ticket_Overlay.pm:2243
+#: lib/RT/Ticket_Overlay.pm:2602
+#: lib/RT/Ticket_Overlay.pm:2674
+#: lib/RT/Ticket_Overlay.pm:2768
+#: lib/RT/Ticket_Overlay.pm:2783
+#: lib/RT/Ticket_Overlay.pm:2977
+#: lib/RT/Ticket_Overlay.pm:3205
+#: lib/RT/Ticket_Overlay.pm:3403
+#: lib/RT/Ticket_Overlay.pm:3565
+#: lib/RT/Ticket_Overlay.pm:3617
+#: lib/RT/Ticket_Overlay.pm:3782
+#: lib/RT/Transaction_Overlay.pm:465
+#: lib/RT/Transaction_Overlay.pm:472
+#: lib/RT/Transaction_Overlay.pm:501
+#: lib/RT/Transaction_Overlay.pm:508
+#: lib/RT/User_Overlay.pm:1354
+#: lib/RT/User_Overlay.pm:569
+#: lib/RT/User_Overlay.pm:604
+#: lib/RT/User_Overlay.pm:860
+#: lib/RT/User_Overlay.pm:961
+msgid "Permission Denied"
+msgstr "Permission Denied"
+
+#: html/User/Elements/Tabs:34
+msgid "Personal Groups"
+msgstr "Gruppi Personali"
+
+#: html/User/Groups/index.html:29
+#: html/User/Groups/index.html:39
+msgid "Personal groups"
+msgstr "Gruppi personali"
+
+#: html/User/Elements/DelegateRights:36
+msgid "Personal groups:"
+msgstr "Gruppi personali:"
+
+#: html/Admin/Users/Modify.html:155
+#: html/User/Prefs.html:48
+msgid "Phone numbers"
+msgstr "Numeri Telefonici"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Placeholder"
+msgstr "Placeholder"
+
+#: html/Elements/Header:51
+#: html/Elements/Tabs:52
+#: html/SelfService/Elements/Tabs:50
+#: html/SelfService/Prefs.html:24
+#: html/User/Prefs.html:24
+#: html/User/Prefs.html:27
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Prefs"
+msgstr "Prefs"
+
+#: lib/RT/Action/Generic.pm:159
+msgid "Prepare Stubbed"
+msgstr "Prepare Stubbed"
+
+#: html/Ticket/Elements/Tabs:60
+msgid "Prev"
+msgstr "Precedente"
+
+#: html/Search/Listing.html:43
+msgid "Previous page"
+msgstr "Previous page"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Pri"
+msgstr "Pri"
+
+#. ($args{'PrincipalId'})
+#: lib/RT/ACE_Overlay.pm:132
+#: lib/RT/ACE_Overlay.pm:207
+#: lib/RT/ACE_Overlay.pm:551
+msgid "Principal %1 not found."
+msgstr "Principal %1 not found."
+
+#: html/Search/Elements/PickRestriction:53
+#: html/Ticket/Create.html:153
+#: html/Ticket/Elements/EditBasics:53
+#: html/Ticket/Elements/ShowBasics:38
+#: lib/RT/Tickets_Overlay.pm:1041
+msgid "Priority"
+msgstr "Priorità"
+
+#: html/Admin/Elements/ModifyQueue:50
+#: html/Admin/Queues/Modify.html:64
+msgid "Priority starts at"
+msgstr "La priorità inizia da"
+
+#: etc/initialdata:25
+msgid "Privileged"
+msgstr "Privilegiato"
+
+#. (loc_fuzzy($msg))
+#: html/Admin/Users/Modify.html:270
+#: html/User/Prefs.html:162
+msgid "Privileged status: %1"
+msgstr "Stato previlegiato: %1"
+
+#: html/Admin/Users/index.html:61
+msgid "Privileged users"
+msgstr "Utenti privilegiati"
+
+#: etc/initialdata:23
+#: etc/initialdata:29
+#: etc/initialdata:35
+#: etc/initialdata:59
+msgid "Pseudogroup for internal use"
+msgstr "Pseudogroup for internal use"
+
+#: html/Elements/MyRequests:29
+#: html/Elements/MyTickets:29
+#: html/Elements/Quicksearch:28
+#: html/Search/Elements/PickRestriction:45
+#: html/SelfService/Create.html:32
+#: html/Ticket/Create.html:37
+#: html/Ticket/Elements/EditBasics:63
+#: html/Ticket/Elements/ShowBasics:42
+#: html/User/Elements/DelegateRights:79
+#: lib/RT/Tickets_Overlay.pm:882
+msgid "Queue"
+msgstr "Coda"
+
+#. ($Queue)
+#. ($id)
+#: html/Admin/Queues/CustomField.html:41
+#: html/Admin/Queues/Scrip.html:49
+#: html/Admin/Queues/Scrips.html:45
+#: html/Admin/Queues/Templates.html:43
+msgid "Queue %1 not found"
+msgstr "Queue %1 not found"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Queue '%1' not found\\n"
+msgstr "Queue '%1' not found\\n"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Queue Keyword Selections"
+msgstr "Queue Keyword Selections"
+
+#: html/Admin/Elements/ModifyQueue:30
+#: html/Admin/Queues/Modify.html:42
+msgid "Queue Name"
+msgstr "Nome della coda"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Queue Scrips"
+msgstr "Queue Scrips"
+
+#: lib/RT/Queue_Overlay.pm:262
+msgid "Queue already exists"
+msgstr "Queue already exists"
+
+#: lib/RT/Queue_Overlay.pm:271
+#: lib/RT/Queue_Overlay.pm:277
+msgid "Queue could not be created"
+msgstr "Queue could not be created"
+
+#: html/Ticket/Create.html:204
+msgid "Queue could not be loaded."
+msgstr "Queue could not be loaded."
+
+#: docs/design_docs/string-extraction-guide.txt:83
+#: lib/RT/Queue_Overlay.pm:281
+msgid "Queue created"
+msgstr "Queue created"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Queue is not specified."
+msgstr "Queue is not specified."
+
+#: html/SelfService/Display.html:70
+#: lib/RT/CustomField_Overlay.pm:97
+msgid "Queue not found"
+msgstr "Queue not found"
+
+#: html/Admin/Elements/Tabs:37
+#: html/Admin/index.html:34
+msgid "Queues"
+msgstr "Code"
+
+#: html/Elements/Quicksearch:24
+msgid "Quick search"
+msgstr "Ricerca veloce"
+
+#. ($RT::VERSION)
+#: html/Elements/Login:43
+msgid "RT %1"
+msgstr "RT %1"
+
+#. ($RT::VERSION, $RT::rtname)
+#: docs/design_docs/string-extraction-guide.txt:70
+msgid "RT %1 for %2"
+msgstr "RT %1 per %2"
+
+#. ($RT::VERSION)
+#: html/Elements/Footer:31
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr "RT %1 da <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: html/Admin/index.html:24
+#: html/Admin/index.html:25
+msgid "RT Administration"
+msgstr "RT Administration"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT Authentication error."
+msgstr "RT Authentication error."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT Bounce: %1"
+msgstr "RT Bounce: %1"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT Configuration error"
+msgstr "RT Configuration error"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT Critical error. Message not recorded!"
+msgstr "RT Critical error. Message not recorded!"
+
+#: html/Elements/Error:40
+#: html/SelfService/Error.html:40
+msgid "RT Error"
+msgstr "RT Error"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT Received mail (%1) from itself."
+msgstr "RT Received mail (%1) from itself."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT Recieved mail (%1) from itself."
+msgstr "RT Recieved mail (%1) from itself."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT Self Service / Closed Tickets"
+msgstr "RT Self Service / Closed Tickets"
+
+#: html/index.html:24
+#: html/index.html:27
+msgid "RT at a glance"
+msgstr "Colpo d'occhio di RT"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT couldn't authenticate you"
+msgstr "RT couldn't authenticate you"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT couldn't find requestor via its external database lookup"
+msgstr "RT couldn't find requestor via its external database lookup"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT couldn't find the queue: %1"
+msgstr "RT couldn't find the coda: %1"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT couldn't validate this PGP signature. \\n"
+msgstr "RT couldn't validate this PGP signature. \\n"
+
+#. ($RT::rtname)
+#: html/Elements/PageLayout:25
+msgid "RT for %1"
+msgstr "RT per %1"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT for %1: %2"
+msgstr "RT per %1: %2"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT has proccessed your commands"
+msgstr "RT has proccessed your commands"
+
+#. ('2003')
+#: html/Elements/Login:91
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  RT viene distribuito con la <a href=\"http://www.gnu.org/copyleft/gpl.html\">Versione 2 della GNU General Public License.</a>"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  RT viene distribuito con la <a href=\"http://www.gnu.org/copyleft/gpl.html\">Versione 2 della GNU General Public License.</a>"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT thinks this message may be a bounce"
+msgstr "RT thinks this message may be a bounce"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT will process this message as if it were unsigned.\\n"
+msgstr "RT will process this message as if it were unsigned.\\n"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+msgstr "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+
+#: html/Admin/Users/Modify.html:57
+#: html/Admin/Users/Prefs.html:51
+#: html/User/Prefs.html:43
+msgid "Real Name"
+msgstr "Nome Reale"
+
+#: html/Admin/Elements/ModifyUser:47
+msgid "RealName"
+msgstr "RealName"
+
+#: html/Ticket/Create.html:184
+#: html/Ticket/Elements/EditLinks:138
+#: html/Ticket/Elements/EditLinks:93
+#: html/Ticket/Elements/ShowLinks:70
+msgid "Referred to by"
+msgstr "Riferito da"
+
+#: html/Elements/SelectLinkType:27
+#: html/Ticket/Create.html:183
+#: html/Ticket/Elements/EditLinks:134
+#: html/Ticket/Elements/EditLinks:79
+#: html/Ticket/Elements/ShowLinks:60
+msgid "Refers to"
+msgstr "Fa riferimento a"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RefersTo"
+msgstr "RefersTo"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Refine"
+msgstr "Refine"
+
+#: html/Search/Elements/PickRestriction:26
+msgid "Refine search"
+msgstr "Rifinisci la ricerca"
+
+#. ($value/60)
+#: html/Elements/Refresh:35
+msgid "Refresh this page every %1 minutes."
+msgstr "Aggiorna questa pagina ogni %1 minuti."
+
+#: html/Ticket/Create.html:173
+#: html/Ticket/Elements/ShowSummary:61
+#: html/Ticket/ModifyAll.html:56
+msgid "Relationships"
+msgstr "Relazioni"
+
+#: html/Search/Bulk.html:92
+msgid "Remove AdminCc"
+msgstr "Remove AdminCc"
+
+#: html/Search/Bulk.html:90
+msgid "Remove Cc"
+msgstr "Remove Cc"
+
+#: html/Search/Bulk.html:88
+msgid "Remove Requestor"
+msgstr "Rimuovi il RIchiedente"
+
+#: html/Ticket/Elements/ShowTransaction:172
+#: html/Ticket/Elements/Tabs:121
+msgid "Reply"
+msgstr "Risposta"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "Reply to tickets"
+msgstr "Rispondi ai tickets"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "ReplyToTicket"
+msgstr "RispondiAlTicket"
+
+#: etc/initialdata:44
+#: html/Ticket/Update.html:39
+#: lib/RT/ACE_Overlay.pm:86
+msgid "Requestor"
+msgstr "Richiedente"
+
+#: html/Search/Elements/PickRestriction:37
+msgid "Requestor email address"
+msgstr "Indirizzo emaildel richiedente"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Requestor(s)"
+msgstr "Richiedente(i)"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RequestorAddresses"
+msgstr "IndirizzoRichiedente"
+
+#: html/SelfService/Create.html:40
+#: html/Ticket/Create.html:55
+#: html/Ticket/Elements/EditPeople:47
+#: html/Ticket/Elements/ShowPeople:30
+msgid "Requestors"
+msgstr "Richiedenti"
+
+#: html/Admin/Elements/ModifyQueue:60
+#: html/Admin/Queues/Modify.html:74
+msgid "Requests should be due in"
+msgstr "Le richieste devono essere soddisfatte in"
+
+#: html/Elements/Submit:61
+msgid "Reset"
+msgstr "Azzera"
+
+#: html/Admin/Users/Modify.html:158
+#: html/User/Prefs.html:49
+msgid "Residence"
+msgstr "Casa"
+
+#: html/Ticket/Elements/Tabs:131
+msgid "Resolve"
+msgstr "Risolvi"
+
+#. ($Ticket->id, $Ticket->Subject)
+#: html/Ticket/Update.html:132
+msgid "Resolve ticket #%1 (%2)"
+msgstr "Risolvi il ticket n°%1 (%2)"
+
+#: etc/initialdata:308
+#: html/Elements/SelectDateType:27
+#: lib/RT/Ticket_Overlay.pm:1169
+msgid "Resolved"
+msgstr "Risolto"
+
+#: html/Search/Bulk.html:122
+#: html/Ticket/ModifyAll.html:72
+#: html/Ticket/Update.html:72
+msgid "Response to requestors"
+msgstr "Risposta ai richiedenti"
+
+#: html/Elements/ListActions:25
+msgid "Results"
+msgstr "Risultati"
+
+#: html/Search/Elements/PickRestriction:104
+msgid "Results per page"
+msgstr "Risultati per pagina"
+
+#: html/Admin/Elements/ModifyUser:32
+#: html/Admin/Users/Modify.html:99
+#: html/User/Prefs.html:71
+msgid "Retype Password"
+msgstr "Ridigita Password"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+msgstr "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+
+#: lib/RT/ACE_Overlay.pm:612
+msgid "Right Delegated"
+msgstr "Right Delegated"
+
+#: lib/RT/ACE_Overlay.pm:302
+msgid "Right Granted"
+msgstr "Right Granted"
+
+#: lib/RT/ACE_Overlay.pm:160
+msgid "Right Loaded"
+msgstr "Right Loaded"
+
+#: lib/RT/ACE_Overlay.pm:677
+#: lib/RT/ACE_Overlay.pm:692
+msgid "Right could not be revoked"
+msgstr "Right could not be revoked"
+
+#: html/User/Delegation.html:63
+msgid "Right not found"
+msgstr "Right not found"
+
+#: lib/RT/ACE_Overlay.pm:542
+#: lib/RT/ACE_Overlay.pm:637
+msgid "Right not loaded."
+msgstr "Right not loaded."
+
+#: lib/RT/ACE_Overlay.pm:688
+msgid "Right revoked"
+msgstr "Right revoked"
+
+#: html/Admin/Elements/UserTabs:40
+msgid "Rights"
+msgstr "Diritti"
+
+#. ($object_type)
+#: lib/RT/Interface/Web.pm:791
+msgid "Rights could not be granted for %1"
+msgstr "I diritti non possono essere concessi per %1"
+
+#. ($object_type)
+#: lib/RT/Interface/Web.pm:824
+msgid "Rights could not be revoked for %1"
+msgstr "I diritti non possono essere revocaqti per %1"
+
+#: html/Admin/Global/GroupRights.html:50
+#: html/Admin/Queues/GroupRights.html:51
+msgid "Roles"
+msgstr "Ruoli"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "RootApproval"
+msgstr "RootApproval"
+
+#: lib/RT/Date.pm:392
+msgid "Sat."
+msgstr "Sab."
+
+#: html/Admin/Queues/People.html:104
+#: html/Ticket/Modify.html:38
+#: html/Ticket/ModifyAll.html:93
+#: html/Ticket/ModifyLinks.html:38
+#: html/Ticket/ModifyPeople.html:37
+msgid "Save Changes"
+msgstr "Salva i Cambiamenti"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Save changes"
+msgstr "Salva i cambiamenti"
+
+#. ($ARGS{'id'})
+#: html/Admin/Global/Scrip.html:48
+msgid "Scrip #%1"
+msgstr "Scrip n°%1"
+
+#: lib/RT/Scrip_Overlay.pm:175
+msgid "Scrip Created"
+msgstr "Scrip Created"
+
+#: html/Admin/Elements/EditScrips:83
+msgid "Scrip deleted"
+msgstr "Scrip eliminato"
+
+#: html/Admin/Elements/QueueTabs:45
+#: html/Admin/Elements/SystemTabs:32
+#: html/Admin/Global/index.html:40
+msgid "Scrips"
+msgstr "Scrips"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Scrips for %1\\n"
+msgstr "Scrips per %1\\n"
+
+#: html/Admin/Queues/Scrips.html:32
+msgid "Scrips which apply to all queues"
+msgstr "Scrips which apply to all code"
+
+#: html/Elements/SimpleSearch:26
+#: html/Search/Elements/PickRestriction:125
+#: html/Ticket/Elements/Tabs:158
+msgid "Search"
+msgstr "Cerca"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Search Criteria"
+msgstr "Crieri di Ricerca"
+
+#: html/Approvals/Elements/PendingMyApproval:38
+msgid "Search for approvals"
+msgstr "Ricerca le richieste di approvazione"
+
+#: bin/rt-crontool:187
+msgid "Security:"
+msgstr "Security:"
+
+#: lib/RT/Queue_Overlay.pm:66
+msgid "SeeQueue"
+msgstr "VediCoda"
+
+#: html/Admin/Groups/index.html:39
+msgid "Select a group"
+msgstr "Seleziona un gruppo"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Select a queue"
+msgstr "Seleziona una coda"
+
+#: html/Admin/Users/index.html:24
+#: html/Admin/Users/index.html:27
+msgid "Select a user"
+msgstr "Seleziona un utente"
+
+#: html/Admin/Global/CustomField.html:37
+#: html/Admin/Global/CustomFields.html:35
+msgid "Select custom field"
+msgstr "Seleziona un campo personalizzato"
+
+#: html/Admin/Elements/GroupTabs:51
+#: html/User/Elements/GroupTabs:49
+msgid "Select group"
+msgstr "Seleziona gruppo"
+
+#: lib/RT/CustomField_Overlay.pm:421
+msgid "Select multiple values"
+msgstr "Seleziona valori multipli"
+
+#: lib/RT/CustomField_Overlay.pm:418
+msgid "Select one value"
+msgstr "Seleziona un volore solo"
+
+#: html/Admin/Elements/QueueTabs:66
+msgid "Select queue"
+msgstr "Seleziona una coda"
+
+#: html/Admin/Global/Scrip.html:36
+#: html/Admin/Global/Scrips.html:35
+#: html/Admin/Queues/Scrip.html:39
+#: html/Admin/Queues/Scrips.html:49
+msgid "Select scrip"
+msgstr "Seleziona uno scrip"
+
+#: html/Admin/Global/Template.html:56
+#: html/Admin/Global/Templates.html:35
+#: html/Admin/Queues/Template.html:54
+#: html/Admin/Queues/Templates.html:46
+msgid "Select template"
+msgstr "Seleziona un modello"
+
+#: html/Admin/Elements/UserTabs:48
+msgid "Select user"
+msgstr "Seleziona utente"
+
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectMultiple"
+msgstr "SelectMultiple"
+
+#: lib/RT/CustomField_Overlay.pm:34
+msgid "SelectSingle"
+msgstr "SelectSingle"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Self Service"
+msgstr "Self Service"
+
+#: etc/initialdata:114
+msgid "Send mail to all watchers"
+msgstr "Invia una mail a tutti gli osservatori"
+
+#: etc/initialdata:110
+msgid "Send mail to all watchers as a \"comment\""
+msgstr "Invia una mail atutti gli osservatori come un \"commento\""
+
+#: etc/initialdata:105
+msgid "Send mail to requestors and Ccs"
+msgstr "Invia mail ai richiedenti e Ccs"
+
+#: etc/initialdata:100
+msgid "Send mail to requestors and Ccs as a comment"
+msgstr "Invia mail ai richiedenti e Ccs come commento"
+
+#: etc/initialdata:79
+msgid "Sends a message to the requestors"
+msgstr "Invia un messaggio ai richiedenti"
+
+#: etc/initialdata:118
+#: etc/initialdata:122
+msgid "Sends mail to explicitly listed Ccs and Bccs"
+msgstr "Sends mail to explicitly listed Ccs and Bccs"
+
+#: etc/initialdata:95
+msgid "Sends mail to the administrative Ccs"
+msgstr "Sends mail to the administrative Ccs"
+
+#: etc/initialdata:91
+msgid "Sends mail to the administrative Ccs as a comment"
+msgstr "Sends mail to the administrative Ccs as a comment"
+
+#: etc/initialdata:83
+#: etc/initialdata:87
+msgid "Sends mail to the owner"
+msgstr "Sends mail to the owner"
+
+#: lib/RT/Date.pm:418
+msgid "Sep."
+msgstr "Sep."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "September"
+msgstr "September"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Show Results"
+msgstr "Mostra i Risultati"
+
+#: html/Approvals/Elements/PendingMyApproval:43
+msgid "Show approved requests"
+msgstr "Mostra le richieste approvate"
+
+#: html/Ticket/Create.html:143
+#: html/Ticket/Create.html:33
+msgid "Show basics"
+msgstr "Mostra info di base"
+
+#: html/Approvals/Elements/PendingMyApproval:44
+msgid "Show denied requests"
+msgstr "Mostra le richieste negate"
+
+#: html/Ticket/Create.html:143
+#: html/Ticket/Create.html:33
+msgid "Show details"
+msgstr "Mostra i dettagli"
+
+#: html/Approvals/Elements/PendingMyApproval:42
+msgid "Show pending requests"
+msgstr "Mostra le richieste in attesa"
+
+#: html/Approvals/Elements/PendingMyApproval:45
+msgid "Show requests awaiting other approvals"
+msgstr "Mostra le richieste in attesa di altre approvazioni"
+
+#: lib/RT/Queue_Overlay.pm:80
+msgid "Show ticket private commentary"
+msgstr "Show ticket private commentary"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "Show ticket summaries"
+msgstr "Show ticket summaries"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "ShowACL"
+msgstr "MostraLCA"
+
+#: lib/RT/Queue_Overlay.pm:77
+msgid "ShowScrips"
+msgstr "MostraScrips"
+
+#: lib/RT/Queue_Overlay.pm:74
+msgid "ShowTemplate"
+msgstr "MostraModello"
+
+#: lib/RT/Queue_Overlay.pm:78
+msgid "ShowTicket"
+msgstr "MostraTicket"
+
+#: lib/RT/Queue_Overlay.pm:80
+msgid "ShowTicketComments"
+msgstr "MostraICommentiAlTicket"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "Sign up as a ticket Requestor or ticket or queue Cc"
+msgstr "Sign up as a ticket Requestor or ticket or coda Cc"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "Sign up as a ticket or queue AdminCc"
+msgstr "Sign up as a ticket or coda AdminCc"
+
+#: html/Admin/Elements/ModifyUser:38
+#: html/Admin/Users/Modify.html:190
+#: html/Admin/Users/Prefs.html:31
+#: html/User/Prefs.html:111
+msgid "Signature"
+msgstr "Firma"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Signed in as %1"
+msgstr "Signed in as %1"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:25
+msgid "Single"
+msgstr "Single"
+
+#: html/Elements/Header:50
+msgid "Skip Menu"
+msgstr "Skip Menu"
+
+#: html/Admin/Elements/AddCustomFieldValue:27
+msgid "Sort"
+msgstr "Ordina"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Sort key"
+msgstr "Sort key"
+
+#: html/Search/Elements/PickRestriction:108
+msgid "Sort results by"
+msgstr "Ordina i risultati per"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "SortOrder"
+msgstr "SortOrder"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Stalled"
+msgstr "In stallo"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Start page"
+msgstr "Pagina iniziale"
+
+#: html/Elements/SelectDateType:26
+#: html/Ticket/Elements/EditDates:31
+#: html/Ticket/Elements/ShowDates:34
+msgid "Started"
+msgstr "Iniziato"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Started date '%1' could not be parsed"
+msgstr "Started date '%1' could not be parsed"
+
+#: html/Elements/SelectDateType:30
+#: html/Ticket/Create.html:165
+#: html/Ticket/Elements/EditDates:26
+#: html/Ticket/Elements/ShowDates:30
+msgid "Starts"
+msgstr "Inizia"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Starts By"
+msgstr "Inizia Da"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Starts date '%1' could not be parsed"
+msgstr "Starts date '%1' could not be parsed"
+
+#: html/Admin/Elements/ModifyUser:81
+#: html/Admin/Users/Modify.html:137
+#: html/User/Prefs.html:93
+msgid "State"
+msgstr "Provincia"
+
+#: html/Elements/MyRequests:30
+#: html/Elements/MyTickets:30
+#: html/Search/Elements/PickRestriction:73
+#: html/SelfService/Elements/MyRequests:28
+#: html/SelfService/Update.html:30
+#: html/Ticket/Create.html:41
+#: html/Ticket/Elements/EditBasics:37
+#: html/Ticket/Elements/ShowBasics:30
+#: html/Ticket/Update.html:59
+#: lib/RT/Ticket_Overlay.pm:1163
+#: lib/RT/Tickets_Overlay.pm:907
+msgid "Status"
+msgstr "Stato"
+
+#: etc/initialdata:294
+msgid "Status Change"
+msgstr "Cambiamento di Stato"
+
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
+#: lib/RT/Transaction_Overlay.pm:527
+msgid "Status changed from %1 to %2"
+msgstr "Cambiato lo Stato da %1 a %2"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "StatusChange"
+msgstr "StatusChange"
+
+#: html/Ticket/Elements/Tabs:146
+msgid "Steal"
+msgstr "Ruba"
+
+#. ($Old->Name)
+#: lib/RT/Transaction_Overlay.pm:586
+msgid "Stolen from %1 "
+msgstr "Rubato da %1 "
+
+#: html/Elements/MyRequests:28
+#: html/Elements/MyTickets:28
+#: html/Search/Bulk.html:125
+#: html/Search/Elements/PickRestriction:42
+#: html/SelfService/Create.html:56
+#: html/SelfService/Elements/MyRequests:27
+#: html/SelfService/Update.html:31
+#: html/Ticket/Create.html:83
+#: html/Ticket/Elements/EditBasics:27
+#: html/Ticket/ModifyAll.html:78
+#: html/Ticket/Update.html:76
+#: lib/RT/Ticket_Overlay.pm:1159
+#: lib/RT/Tickets_Overlay.pm:986
+msgid "Subject"
+msgstr "Oggetto"
+
+#. ($self->Data)
+#: docs/design_docs/string-extraction-guide.txt:89
+#: lib/RT/Transaction_Overlay.pm:608
+msgid "Subject changed to %1"
+msgstr "Subject changed to %1"
+
+#: html/Elements/Submit:58
+msgid "Submit"
+msgstr "Invia"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Submit Workflow"
+msgstr "Submit Workflow"
+
+#: lib/RT/Group_Overlay.pm:748
+msgid "Succeeded"
+msgstr "Succeeded"
+
+#: lib/RT/Date.pm:393
+msgid "Sun."
+msgstr "Dom."
+
+#: lib/RT/System.pm:53
+msgid "SuperUser"
+msgstr "SuperUtente"
+
+#: html/User/Elements/DelegateRights:76
+msgid "System"
+msgstr "Sistema"
+
+#: html/Admin/Elements/SelectRights:80
+#: lib/RT/ACE_Overlay.pm:566
+#: lib/RT/Interface/Web.pm:790
+#: lib/RT/Interface/Web.pm:823
+msgid "System Error"
+msgstr "Errore di Sistema"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "System Error. Right not granted."
+msgstr "Errore di Sistema. Diritto non concesso."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "System Error. right not granted"
+msgstr "Errore di Sistema. Diritto non concesso"
+
+#: lib/RT/ACE_Overlay.pm:615
+msgid "System error. Right not delegated."
+msgstr "Errore di Sistema. Diritto non delegato."
+
+#: lib/RT/ACE_Overlay.pm:145
+#: lib/RT/ACE_Overlay.pm:222
+#: lib/RT/ACE_Overlay.pm:305
+#: lib/RT/ACE_Overlay.pm:897
+msgid "System error. Right not granted."
+msgstr "Errore di Sistema. Diritto non concesso."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "System error. Unable to grant rights."
+msgstr "Errore di sistema. Impossibile concedere i diritti."
+
+#: html/Admin/Global/GroupRights.html:34
+#: html/Admin/Groups/GroupRights.html:36
+#: html/Admin/Queues/GroupRights.html:35
+msgid "System groups"
+msgstr "Gruppi di sistema"
+
+#: etc/initialdata:41
+#: etc/initialdata:47
+#: etc/initialdata:53
+msgid "SystemRolegroup for internal use"
+msgstr "SystemRolegroup for internal use"
+
+#: lib/RT/CurrentUser.pm:317
+msgid "TEST_STRING"
+msgstr "TEST_STRING"
+
+#: html/Ticket/Elements/Tabs:142
+msgid "Take"
+msgstr "Prendi"
+
+#: lib/RT/Transaction_Overlay.pm:572
+msgid "Taken"
+msgstr "Preso"
+
+#: html/Admin/Elements/EditScrip:80
+msgid "Template"
+msgstr "Modello"
+
+#. ($TemplateObj->Id())
+#: html/Admin/Global/Template.html:90
+#: html/Admin/Queues/Template.html:89
+msgid "Template #%1"
+msgstr "Modello n°%1"
+
+#: html/Admin/Elements/EditTemplates:88
+msgid "Template deleted"
+msgstr "Modello eliminato"
+
+#: lib/RT/Scrip_Overlay.pm:152
+msgid "Template not found"
+msgstr "Modello non trovato"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Template not found\\n"
+msgstr "Modello non trovato\\n"
+
+#: lib/RT/Template_Overlay.pm:346
+msgid "Template parsed"
+msgstr "Modello elaborato"
+
+#: html/Admin/Elements/QueueTabs:48
+#: html/Admin/Elements/SystemTabs:35
+#: html/Admin/Global/index.html:44
+msgid "Templates"
+msgstr "Modelli"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Templates for %1\\n"
+msgstr "Modelli per %1\\n"
+
+#: lib/RT/Interface/Web.pm:891
+msgid "That is already the current value"
+msgstr "That is already the current value"
+
+#: lib/RT/CustomField_Overlay.pm:242
+msgid "That is not a value for this custom field"
+msgstr "That is not a value for this custom field"
+
+#: lib/RT/Ticket_Overlay.pm:1885
+msgid "That is the same value"
+msgstr "That is the same value"
+
+#: lib/RT/ACE_Overlay.pm:287
+#: lib/RT/ACE_Overlay.pm:596
+msgid "That principal already has that right"
+msgstr "That principal already has that right"
+
+#. ($args{'Type'})
+#: lib/RT/Queue_Overlay.pm:632
+msgid "That principal is already a %1 for this queue"
+msgstr "That principal is already a %1 for this coda"
+
+#. ($self->loc($args{'Type'}))
+#: lib/RT/Ticket_Overlay.pm:1433
+msgid "That principal is already a %1 for this ticket"
+msgstr "That principal is already a %1 for this ticket"
+
+#. ($args{'Type'})
+#: lib/RT/Queue_Overlay.pm:731
+msgid "That principal is not a %1 for this queue"
+msgstr "That principal is not a %1 for this coda"
+
+#. ($args{'Type'})
+#: lib/RT/Ticket_Overlay.pm:1550
+msgid "That principal is not a %1 for this ticket"
+msgstr "That principal is not a %1 for this ticket"
+
+#: lib/RT/Ticket_Overlay.pm:1881
+msgid "That queue does not exist"
+msgstr "That coda does not exist"
+
+#: lib/RT/Ticket_Overlay.pm:3209
+msgid "That ticket has unresolved dependencies"
+msgstr "That ticket has unresolved dependencies"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "That user already has that right"
+msgstr "That user already has that right"
+
+#: lib/RT/Ticket_Overlay.pm:3019
+msgid "That user already owns that ticket"
+msgstr "That user already owns that ticket"
+
+#: lib/RT/Ticket_Overlay.pm:2985
+msgid "That user does not exist"
+msgstr "That user does not exist"
+
+#: lib/RT/User_Overlay.pm:314
+msgid "That user is already privileged"
+msgstr "Questo utente è già previlegiato"
+
+#: lib/RT/User_Overlay.pm:335
+msgid "That user is already unprivileged"
+msgstr "Questo utente è già non previlegiato"
+
+#: lib/RT/User_Overlay.pm:327
+msgid "That user is now privileged"
+msgstr "Ora questo utente è previlegiato"
+
+#: lib/RT/User_Overlay.pm:348
+msgid "That user is now unprivileged"
+msgstr "Ora questo utente è non previlegiato"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "That user is now unprivilegedileged"
+msgstr "Questo utente ora è non previlegiato"
+
+#: lib/RT/Ticket_Overlay.pm:3011
+msgid "That user may not own tickets in that queue"
+msgstr "That user may not own tickets in that coda"
+
+#: lib/RT/Link_Overlay.pm:205
+msgid "That's not a numerical id"
+msgstr "That's not a numerical id"
+
+#: html/SelfService/Display.html:31
+#: html/Ticket/Create.html:149
+#: html/Ticket/Elements/ShowSummary:27
+msgid "The Basics"
+msgstr "Dati di base"
+
+#: lib/RT/ACE_Overlay.pm:87
+msgid "The CC of a ticket"
+msgstr "The CC of a ticket"
+
+#: lib/RT/ACE_Overlay.pm:88
+msgid "The administrative CC of a ticket"
+msgstr "The administrative CC of a ticket"
+
+#: lib/RT/Ticket_Overlay.pm:2212
+msgid "The comment has been recorded"
+msgstr "The comment has been recorded"
+
+#: bin/rt-crontool:197
+msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
+msgstr "The following command will find all active tickets in the coda 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
+
+#: bin/rt-commit-handler:755
+#: bin/rt-commit-handler:765
+msgid ""
+"The following commands were not proccessed:\\n"
+"\\n"
+msgstr ""
+"The following commands were not proccessed:\\n"
+"\\n"
+
+#: lib/RT/Interface/Web.pm:894
+msgid "The new value has been set."
+msgstr "The new value has been set."
+
+#: lib/RT/ACE_Overlay.pm:85
+msgid "The owner of a ticket"
+msgstr "The owner of a ticket"
+
+#: lib/RT/ACE_Overlay.pm:86
+msgid "The requestor of a ticket"
+msgstr "Il richiedente di un ticket"
+
+#: html/Admin/Elements/EditUserComments:25
+msgid "These comments aren't generally visible to the user"
+msgstr "These comments aren't generally visible to the user"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "This ticket %1 %2 (%3)\\n"
+msgstr "This ticket %1 %2 (%3)\\n"
+
+#: bin/rt-crontool:188
+msgid "This tool allows the user to run arbitrary perl modules from within RT."
+msgstr "This tool allows the user to run arbitrary perl modules from within RT."
+
+#: lib/RT/Transaction_Overlay.pm:250
+msgid "This transaction appears to have no content"
+msgstr "This transaction appears to have no content"
+
+#. ($rows)
+#: html/Ticket/Elements/ShowRequestor:46
+msgid "This user's %1 highest priority tickets"
+msgstr "I %1 tickets di questo utente a più alta priorità"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "This user's 25 highest priority tickets"
+msgstr "I 25 tickets a più alta priorità di questo utente"
+
+#: lib/RT/Date.pm:390
+msgid "Thu."
+msgstr "Gio."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Ticket"
+msgstr ""
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Ticket # %1  %2"
+msgstr "Ticket n° %1  %2"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Ticket # %1 Jumbo update: %2"
+msgstr "Ticket n° %1 aggiornamento Jumbo: %2"
+
+#. ($Ticket->Id, $Ticket->Subject)
+#: html/Ticket/ModifyAll.html:24
+#: html/Ticket/ModifyAll.html:28
+msgid "Ticket #%1 Jumbo update: %2"
+msgstr "Ticket n° %1 Jumbo update: %2"
+
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+#: html/Approvals/Elements/ShowDependency:45
+msgid "Ticket #%1: %2"
+msgstr "Ticket n°%1: %2"
+
+#. ($self->Id, $QueueObj->Name)
+#: lib/RT/Ticket_Overlay.pm:586
+#: lib/RT/Ticket_Overlay.pm:607
+msgid "Ticket %1 created in queue '%2'"
+msgstr "Ticket %1 created in coda '%2'"
+
+#. ($Ticket->Id)
+#: bin/rt-commit-handler:759
+msgid "Ticket %1 loaded\\n"
+msgstr "Ticket %1 loaded\\n"
+
+#. ($Ticket->Id,$_)
+#: html/Search/Bulk.html:180
+msgid "Ticket %1: %2"
+msgstr "Ticket %1: %2"
+
+#. ($Ticket->Id, $Ticket->Subject)
+#: html/Ticket/History.html:24
+#: html/Ticket/History.html:27
+msgid "Ticket History # %1 %2"
+msgstr "Ticket History n° %1 %2"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Ticket Id"
+msgstr "Ticket Id"
+
+#: etc/initialdata:309
+msgid "Ticket Resolved"
+msgstr "Ticket Risolto"
+
+#: html/Search/Elements/PickRestriction:62
+msgid "Ticket attachment"
+msgstr "Allegato al ticket: il "
+
+#: lib/RT/Tickets_Overlay.pm:1165
+msgid "Ticket content"
+msgstr "Contenuto del ticket"
+
+#: lib/RT/Tickets_Overlay.pm:1211
+msgid "Ticket content type"
+msgstr "Ticket content type"
+
+#: lib/RT/Ticket_Overlay.pm:495
+#: lib/RT/Ticket_Overlay.pm:596
+msgid "Ticket could not be created due to an internal error"
+msgstr "Ticket could not be created due to an internal error"
+
+#: lib/RT/Transaction_Overlay.pm:519
+msgid "Ticket created"
+msgstr "Ticket creato"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Ticket creation failed"
+msgstr "Ticket creation failed"
+
+#: lib/RT/Transaction_Overlay.pm:524
+msgid "Ticket deleted"
+msgstr "Ticket eliminato"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Ticket id not found"
+msgstr "Ticket id not found"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Ticket killed"
+msgstr "Ticket killed"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Ticket not found"
+msgstr "Ticket not found"
+
+#: etc/initialdata:295
+msgid "Ticket status changed"
+msgstr "Ticket status changed"
+
+#: html/Ticket/Update.html:38
+msgid "Ticket watchers"
+msgstr "Osservatori del ticket"
+
+#: html/Elements/Tabs:46
+msgid "Tickets"
+msgstr ""
+
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+#: lib/RT/Tickets_Overlay.pm:1382
+msgid "Tickets %1 %2"
+msgstr ""
+
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+#: lib/RT/Tickets_Overlay.pm:1347
+msgid "Tickets %1 by %2"
+msgstr "Tickets %1 by %2"
+
+#. ($name)
+#: html/Elements/ViewUser:25
+msgid "Tickets from %1"
+msgstr "Tickets from %1"
+
+#: html/Approvals/Elements/ShowDependency:26
+msgid "Tickets which depend on this approval:"
+msgstr "Tickets which depend on this approval:"
+
+#: html/Ticket/Create.html:156
+#: html/Ticket/Elements/EditBasics:47
+msgid "Time Left"
+msgstr "Tempo RImasto"
+
+#: html/Ticket/Create.html:155
+#: html/Ticket/Elements/EditBasics:42
+msgid "Time Worked"
+msgstr "Tempo Lavorato"
+
+#: lib/RT/Tickets_Overlay.pm:1138
+msgid "Time left"
+msgstr "Tempo rimasto"
+
+#: html/Elements/Footer:35
+msgid "Time to display"
+msgstr "Time to display"
+
+#: lib/RT/Tickets_Overlay.pm:1114
+msgid "Time worked"
+msgstr "Tempo lavorato"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "TimeLeft"
+msgstr "TempoRimasto"
+
+#: lib/RT/Ticket_Overlay.pm:1164
+msgid "TimeWorked"
+msgstr "TempoLavorato"
+
+#: bin/rt-commit-handler:401
+msgid "To generate a diff of this commit:"
+msgstr "To generate a diff of this commit:"
+
+#: bin/rt-commit-handler:390
+msgid "To generate a diff of this commit:\\n"
+msgstr "To generate a diff of this commit:\\n"
+
+#: lib/RT/Ticket_Overlay.pm:1167
+msgid "Told"
+msgstr "Told"
+
+#: etc/initialdata:237
+msgid "Transaction"
+msgstr "Transaction"
+
+#. ($self->Data)
+#: lib/RT/Transaction_Overlay.pm:639
+msgid "Transaction %1 purged"
+msgstr "Transaction %1 purged"
+
+#: lib/RT/Transaction_Overlay.pm:176
+msgid "Transaction Created"
+msgstr "Transaction Created"
+
+#: lib/RT/Transaction_Overlay.pm:88
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr "Transaction->Create couldn't, as you didn't specify a ticket id"
+
+#: lib/RT/Transaction_Overlay.pm:698
+msgid "Transactions are immutable"
+msgstr "Transactions are immutable"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Trying to delete a right: %1"
+msgstr "Sto cercando di eliminare un diritto: %1"
+
+#: lib/RT/Date.pm:388
+msgid "Tue."
+msgstr "Mar."
+
+#: html/Admin/Elements/EditCustomField:43
+#: html/Ticket/Elements/AddWatchers:32
+#: html/Ticket/Elements/AddWatchers:43
+#: html/Ticket/Elements/AddWatchers:53
+#: lib/RT/Ticket_Overlay.pm:1165
+#: lib/RT/Tickets_Overlay.pm:958
+msgid "Type"
+msgstr "Type"
+
+#: lib/RT/ScripCondition_Overlay.pm:103
+msgid "Unimplemented"
+msgstr "Unimplemented"
+
+#: html/Admin/Users/Modify.html:67
+msgid "Unix login"
+msgstr "Unix login"
+
+#: html/Admin/Elements/ModifyUser:61
+msgid "UnixUsername"
+msgstr "UnixUsername"
+
+#. ($self->ContentEncoding)
+#: lib/RT/Attachment_Overlay.pm:264
+msgid "Unknown ContentEncoding %1"
+msgstr "Unknown ContentEncoding %1"
+
+#: html/Elements/SelectResultsPerPage:36
+msgid "Unlimited"
+msgstr "Unlimited"
+
+#: etc/initialdata:32
+msgid "Unprivileged"
+msgstr "Non previlegiato"
+
+#: lib/RT/Transaction_Overlay.pm:568
+msgid "Untaken"
+msgstr "Untaken"
+
+#: html/Elements/MyTickets:63
+#: html/Search/Bulk.html:32
+msgid "Update"
+msgstr "Aggiornamento"
+
+#: html/Admin/Users/Prefs.html:61
+msgid "Update ID"
+msgstr "ID Aggiornamento"
+
+#: html/Search/Bulk.html:119
+#: html/Ticket/ModifyAll.html:65
+#: html/Ticket/Update.html:66
+msgid "Update Type"
+msgstr "Tipo Aggiornamento"
+
+#: html/Search/Listing.html:60
+msgid "Update all these tickets at once"
+msgstr "Aggiorna tutti questi tickets in una sola volta"
+
+#: html/Admin/Users/Prefs.html:48
+msgid "Update email"
+msgstr "Email aggiornamento"
+
+#: html/Admin/Users/Prefs.html:54
+msgid "Update name"
+msgstr "Nome aggiornamento"
+
+#: lib/RT/Interface/Web.pm:408
+msgid "Update not recorded."
+msgstr "Aggiornamento non registrato."
+
+#: html/Search/Bulk.html:80
+msgid "Update selected tickets"
+msgstr "Aggiorna i tickets selezionati"
+
+#: html/Admin/Users/Prefs.html:35
+msgid "Update signature"
+msgstr "Aggiorna la firma"
+
+#: html/Ticket/ModifyAll.html:62
+msgid "Update ticket"
+msgstr "Aggiorna il ticket"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Update ticket # %1"
+msgstr "Aggiorna il ticket n° %1"
+
+#. ($Ticket->id)
+#: html/SelfService/Update.html:24
+#: html/SelfService/Update.html:46
+msgid "Update ticket #%1"
+msgstr "Aggiorna il ticket n°%1"
+
+#. ($Ticket->id, $Ticket->Subject)
+#: html/Ticket/Update.html:134
+msgid "Update ticket #%1 (%2)"
+msgstr "Aggiorna il ticket n°%1 (%2)"
+
+#: lib/RT/Interface/Web.pm:406
+msgid "Update type was neither correspondence nor comment."
+msgstr "Update type was neither correspondence nor comment."
+
+#: html/Elements/SelectDateType:32
+#: html/Ticket/Elements/ShowDates:50
+#: lib/RT/Ticket_Overlay.pm:1168
+msgid "Updated"
+msgstr "Aggiornato"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "User %1 %2: %3\\n"
+msgstr "User %1 %2: %3\\n"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "User %1 Password: %2\\n"
+msgstr "User %1 Password: %2\\n"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "User '%1' not found"
+msgstr "User '%1' not found"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "User '%1' not found\\n"
+msgstr "User '%1' not found\\n"
+
+#: etc/initialdata:125
+#: etc/initialdata:191
+msgid "User Defined"
+msgstr "Definito da Utente"
+
+#: html/Admin/Users/Prefs.html:58
+msgid "User ID"
+msgstr "User ID"
+
+#: html/Elements/SelectUsers:25
+msgid "User Id"
+msgstr "User Id"
+
+#: html/Admin/Elements/GroupTabs:46
+#: html/Admin/Elements/QueueTabs:59
+#: html/Admin/Elements/SystemTabs:46
+#: html/Admin/Global/index.html:58
+msgid "User Rights"
+msgstr "Diritti Utente"
+
+#. ($msg)
+#: html/Admin/Users/Modify.html:225
+msgid "User could not be created: %1"
+msgstr "User could not be created: %1"
+
+#: lib/RT/User_Overlay.pm:261
+msgid "User created"
+msgstr "User created"
+
+#: html/Admin/Global/GroupRights.html:66
+#: html/Admin/Groups/GroupRights.html:53
+#: html/Admin/Queues/GroupRights.html:67
+msgid "User defined groups"
+msgstr "Gruppi definiti dall'utente"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "User notified"
+msgstr "User notified"
+
+#: html/Admin/Users/Prefs.html:24
+#: html/Admin/Users/Prefs.html:28
+msgid "User view"
+msgstr "User view"
+
+#: html/Admin/Users/Modify.html:47
+#: html/Elements/Login:50
+#: html/Ticket/Elements/AddWatchers:34
+msgid "Username"
+msgstr "Username"
+
+#: html/Admin/Elements/SelectNewGroupMembers:25
+#: html/Admin/Elements/Tabs:31
+#: html/Admin/Groups/Members.html:54
+#: html/Admin/Queues/People.html:67
+#: html/Admin/index.html:28
+#: html/User/Groups/Members.html:57
+msgid "Users"
+msgstr "Utenti"
+
+#: html/Admin/Users/index.html:64
+msgid "Users matching search criteria"
+msgstr "Utenti che soddisfano il criterio di ricerca"
+
+#: html/Search/Elements/PickRestriction:50
+msgid "ValueOfQueue"
+msgstr "ValueOfQueue"
+
+#: html/Admin/Elements/EditCustomField:56
+msgid "Values"
+msgstr "Valori"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "Watch"
+msgstr "Osserva"
+
+#: lib/RT/Queue_Overlay.pm:82
+msgid "WatchAsAdminCc"
+msgstr "OsservaComeAdminCc"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Watcher loaded"
+msgstr "Osservatore caricato"
+
+#: html/Admin/Elements/QueueTabs:41
+msgid "Watchers"
+msgstr "Osservatori"
+
+#: html/Admin/Elements/ModifyUser:55
+msgid "WebEncoding"
+msgstr "WebEncoding"
+
+#: lib/RT/Date.pm:389
+msgid "Wed."
+msgstr "Mer."
+
+#: etc/upgrade/2.1.71:161
+msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
+msgstr "When a ticket has been approved by all approvers, add correspondence to the original ticket"
+
+#: etc/upgrade/2.1.71:135
+msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
+msgstr "When a ticket has been approved by any approver, add correspondence to the original ticket"
+
+#: etc/initialdata:138
+msgid "When a ticket is created"
+msgstr "When a ticket is created"
+
+#: etc/upgrade/2.1.71:79
+msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
+msgstr "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
+
+#: etc/initialdata:143
+msgid "When anything happens"
+msgstr "When anything happens"
+
+#: etc/initialdata:184
+msgid "Whenever a ticket is resolved"
+msgstr "Whenever a ticket is resolved"
+
+#: etc/initialdata:170
+msgid "Whenever a ticket's owner changes"
+msgstr "Whenever a ticket's owner changes"
+
+#: etc/initialdata:178
+msgid "Whenever a ticket's queue changes"
+msgstr "Whenever a ticket's coda changes"
+
+#: etc/initialdata:162
+msgid "Whenever a ticket's status changes"
+msgstr "Whenever a ticket's status changes"
+
+#: etc/initialdata:192
+msgid "Whenever a user-defined condition occurs"
+msgstr "Whenever a user-defined condition occurs"
+
+#: etc/initialdata:156
+msgid "Whenever comments come in"
+msgstr "Whenever comments come in"
+
+#: etc/initialdata:149
+msgid "Whenever correspondence comes in"
+msgstr "Whenever correspondence comes in"
+
+#: html/Admin/Users/Modify.html:163
+#: html/User/Prefs.html:51
+msgid "Work"
+msgstr "Lavoro"
+
+#: html/Admin/Elements/ModifyUser:69
+msgid "WorkPhone"
+msgstr "TelefonoLavoro"
+
+#: html/Ticket/Elements/ShowBasics:34
+#: html/Ticket/Update.html:64
+msgid "Worked"
+msgstr "Lavoro"
+
+#: lib/RT/Ticket_Overlay.pm:3122
+msgid "You already own this ticket"
+msgstr "You already own this ticket"
+
+#: html/autohandler:107
+msgid "You are not an authorized user"
+msgstr "You are not an authorized user"
+
+#: lib/RT/Ticket_Overlay.pm:2997
+msgid "You can only reassign tickets that you own or that are unowned"
+msgstr "You can only reassign tickets that you own or that are unowned"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "You don't have permission to view that ticket.\\n"
+msgstr "Non hai i permessi per visualizzare questo ticket.\\n"
+
+#. ($num, $queue)
+#: docs/design_docs/string-extraction-guide.txt:47
+msgid "You found %1 tickets in queue %2"
+msgstr "Hai trovato %1 tickets nella coda %2"
+
+#: html/NoAuth/Logout.html:30
+msgid "You have been logged out of RT."
+msgstr "Ti sei scollegato da RT."
+
+#: html/SelfService/Display.html:77
+msgid "You have no permission to create tickets in that queue."
+msgstr "Non hai permessi per creare tickets in questa coda."
+
+#: lib/RT/Ticket_Overlay.pm:1894
+msgid "You may not create requests in that queue."
+msgstr "Non puoi creare richieste in questa coda."
+
+#: html/NoAuth/Logout.html:35
+msgid "You're welcome to login again"
+msgstr "Collegati di nuovo"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Your %1 requests"
+msgstr "Le tue %1 richieste"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
+msgstr "Your RT administrator has misconfigured the mail aliases which invoke RT"
+
+#: etc/initialdata:435
+#: etc/upgrade/2.1.71:146
+msgid "Your request has been approved by %1. Other approvals may still be pending."
+msgstr "Your request has been approved by %1. Other approvals may still be pending."
+
+#: etc/initialdata:469
+#: etc/upgrade/2.1.71:180
+msgid "Your request has been approved."
+msgstr "Your request has been approved."
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "Your request was rejected"
+msgstr "Your request was rejected"
+
+#: etc/initialdata:390
+#: etc/upgrade/2.1.71:101
+msgid "Your request was rejected."
+msgstr "Your request was rejected."
+
+#: html/autohandler:126
+msgid "Your username or password is incorrect"
+msgstr "Il tuo username o la tua password non sono corretti"
+
+#: html/Admin/Elements/ModifyUser:83
+#: html/Admin/Users/Modify.html:143
+#: html/User/Prefs.html:95
+msgid "Zip"
+msgstr "CAP"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "[no subject]"
+msgstr "[nessun oggetto]"
+
+#. ($right->PrincipalObj->Object->SelfDescription)
+#: html/User/Elements/DelegateRights:58
+msgid "as granted to %1"
+msgstr "come concesso a %1"
+
+#: html/SelfService/Closed.html:27
+msgid "closed"
+msgstr "chiuso"
+
+#: html/Elements/SelectCustomFieldOperator:37
+#: html/Elements/SelectMatch:33
+msgid "contains"
+msgstr "contiene"
+
+#: html/Elements/SelectAttachmentField:25
+msgid "content"
+msgstr "contenuto"
+
+#: html/Elements/SelectAttachmentField:26
+msgid "content-type"
+msgstr "content-type"
+
+#: lib/RT/Ticket_Overlay.pm:2281
+msgid "correspondence (probably) not sent"
+msgstr "corrispondenza (probabilmente) non inviata"
+
+#: lib/RT/Ticket_Overlay.pm:2291
+msgid "correspondence sent"
+msgstr "corrispondenza inviata"
+
+#: html/Admin/Elements/ModifyQueue:62
+#: html/Admin/Queues/Modify.html:76
+#: lib/RT/Date.pm:318
+msgid "days"
+msgstr "giorni"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "dead"
+msgstr "morto"
+
+#: html/Search/Listing.html:74
+msgid "delete"
+msgstr "elimina"
+
+#: lib/RT/Queue_Overlay.pm:62
+msgid "deleted"
+msgstr "eliminato"
+
+#: html/Search/Elements/PickRestriction:67
+msgid "does not match"
+msgstr "non corrisponde a"
+
+#: html/Elements/SelectCustomFieldOperator:37
+#: html/Elements/SelectMatch:34
+msgid "doesn't contain"
+msgstr "non contiene"
+
+#: html/Elements/SelectEqualityOperator:37
+msgid "equal to"
+msgstr "uguale a"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "false"
+msgstr "falso"
+
+#: html/Elements/SelectAttachmentField:27
+msgid "filename"
+msgstr "nome file"
+
+#: html/Elements/SelectCustomFieldOperator:37
+#: html/Elements/SelectEqualityOperator:37
+msgid "greater than"
+msgstr "più grande di"
+
+#. ($self->Name)
+#: lib/RT/Group_Overlay.pm:193
+msgid "group '%1'"
+msgstr "gruppo '%1'"
+
+#: lib/RT/Date.pm:314
+msgid "hours"
+msgstr "ore"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "id"
+msgstr "id"
+
+#: html/Elements/SelectBoolean:31
+#: html/Elements/SelectCustomFieldOperator:37
+#: html/Elements/SelectMatch:35
+#: html/Search/Elements/PickRestriction:46
+#: html/Search/Elements/PickRestriction:75
+#: html/Search/Elements/PickRestriction:87
+msgid "is"
+msgstr "è"
+
+#: html/Elements/SelectBoolean:35
+#: html/Elements/SelectCustomFieldOperator:37
+#: html/Elements/SelectMatch:36
+#: html/Search/Elements/PickRestriction:47
+#: html/Search/Elements/PickRestriction:76
+#: html/Search/Elements/PickRestriction:88
+msgid "isn't"
+msgstr "non è"
+
+#: html/Elements/SelectCustomFieldOperator:37
+#: html/Elements/SelectEqualityOperator:37
+msgid "less than"
+msgstr "minore di"
+
+#: html/Search/Elements/PickRestriction:66
+msgid "matches"
+msgstr "corrisponde a"
+
+#: lib/RT/Date.pm:310
+msgid "min"
+msgstr "min"
+
+#: html/Ticket/Update.html:65
+msgid "minutes"
+msgstr "minuti"
+
+#: bin/rt-commit-handler:764
+msgid ""
+"modifications\\n"
+"\\n"
+msgstr ""
+"modifiche\\n"
+"\\n"
+
+#: lib/RT/Date.pm:326
+msgid "months"
+msgstr "mesi"
+
+#: lib/RT/Queue_Overlay.pm:57
+msgid "new"
+msgstr "nuovo"
+
+#: html/Admin/Elements/EditScrips:42
+msgid "no value"
+msgstr "nessun valore"
+
+#: html/Ticket/Elements/EditWatchers:27
+msgid "none"
+msgstr "nessuno"
+
+#: html/Elements/SelectEqualityOperator:37
+msgid "not equal to"
+msgstr "diverso da"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "notlike"
+msgstr "diverso da"
+
+#: html/SelfService/Elements/MyRequests:60
+#: lib/RT/Queue_Overlay.pm:58
+msgid "open"
+msgstr "aperto"
+
+#. ($self->Name, $user->Name)
+#: lib/RT/Group_Overlay.pm:198
+msgid "personal group '%1' for user '%2'"
+msgstr "Gruppo personale '%1' per l'utente '%2'"
+
+#. ($queue->Name, $self->Type)
+#: lib/RT/Group_Overlay.pm:206
+msgid "queue %1 %2"
+msgstr "coda %1 %2"
+
+#: lib/RT/Queue_Overlay.pm:61
+msgid "rejected"
+msgstr "rifiutato"
+
+#: lib/RT/Queue_Overlay.pm:60
+msgid "resolved"
+msgstr "risolto"
+
+#: lib/RT/Date.pm:306
+msgid "sec"
+msgstr "sec"
+
+#: lib/RT/Queue_Overlay.pm:59
+msgid "stalled"
+msgstr "in stallo"
+
+#. ($self->Type)
+#: lib/RT/Group_Overlay.pm:201
+msgid "system %1"
+msgstr "sistema %1"
+
+#. ($self->Type)
+#: lib/RT/Group_Overlay.pm:212
+msgid "system group '%1'"
+msgstr "gruppo di sistema '%1'"
+
+#: html/Elements/Error:41
+#: html/SelfService/Error.html:41
+msgid "the calling component did not specify why"
+msgstr "the calling component did not specify why"
+
+#. ($self->Instance, $self->Type)
+#: lib/RT/Group_Overlay.pm:209
+msgid "ticket #%1 %2"
+msgstr "ticket n°%1 %2"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "true"
+msgstr "vero"
+
+#. ($self->Id)
+#: lib/RT/Group_Overlay.pm:215
+msgid "undescribed group %1"
+msgstr "undescribed group %1"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "undescripbed group %1"
+msgstr "undescripbed group %1"
+
+#. ($user->Object->Name)
+#: lib/RT/Group_Overlay.pm:190
+msgid "user %1"
+msgstr "utente %1"
+
+#: lib/RT/Date.pm:322
+msgid "weeks"
+msgstr "settimane"
+
+#: NOT
+#: FOUND
+#: IN
+#: SOURCE
+msgid "with template %1"
+msgstr "con il modello %1"
+
+#: lib/RT/Date.pm:330
+msgid "years"
+msgstr "anni"
+
diff --git a/rt/lib/RT/I18N/ru.po b/rt/lib/RT/I18N/ru.po
index eb1434606..d5ef7fd0c 100644
--- a/rt/lib/RT/I18N/ru.po
+++ b/rt/lib/RT/I18N/ru.po
@@ -62,10 +62,6 @@ msgstr "%1 %2 изменено на %3"
 msgid "%1 %2 deleted"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
-msgid "%1 %2 of group %3"
-msgstr ""
-
 #: html/Admin/Elements/EditScrips:44 html/Admin/Elements/ListGlobalScrips:28
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
 msgid "%1 %2 with template %3"
@@ -151,11 +147,7 @@ msgstr "%1 изменило�ь � %2 на %3"
 
 #: lib/RT/Interface/Web.pm:857
 msgid "%1 could not be set to %2."
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "%1 couldn't init a transaction (%2)\\n"
-msgstr ""
+msgstr "�ельз� у�тановить %1 в %2."
 
 #: lib/RT/Ticket_Overlay.pm:2813
 #. ($self)
@@ -165,12 +157,12 @@ msgstr "%1 не могу закрыть тикет. Возможно, база 
 #: html/Elements/MyTickets:25
 #. ($rows)
 msgid "%1 highest priority tickets I own..."
-msgstr ""
+msgstr "%1 �амых приоритетных моих тикетов..."
 
 #: html/Elements/MyRequests:25
 #. ($rows)
 msgid "%1 highest priority tickets I requested..."
-msgstr ""
+msgstr "%1 �амых приоритетных тикетов, запрошенных мной..."
 
 #: bin/rt-crontool:161
 #. ($0)
@@ -192,10 +184,6 @@ msgstr "%1 больше не �вл�ет�� %2 дл� �того тикета.
 msgid "%1 is no longer a value for custom field %2"
 msgstr "%1 больше не �вл�ет�� значением дл� не�тандартного пол� %2"
 
-#: NOT FOUND IN SOURCE
-msgid "%1 isn't a valid Queue id."
-msgstr ""
-
 #: html/Ticket/Elements/ShowBasics:36
 #. ($TimeWorked)
 msgid "%1 min"
@@ -208,7 +196,7 @@ msgstr "%1 не отображает��"
 #: html/User/Elements/DelegateRights:76
 #. (loc($ObjectType =~ /^RT::(.*)$/))
 msgid "%1 rights"
-msgstr ""
+msgstr "%1 права"
 
 #: NOT FOUND IN SOURCE
 msgid "%1 succeeded\\n"
@@ -222,10 +210,6 @@ msgstr "%1 тип не изве�тен дл� $MessageId"
 msgid "%1 type unknown for %2"
 msgstr "%1 тип не изве�тен дл� %2"
 
-#: NOT FOUND IN SOURCE
-msgid "%1 was created without a CurrentUser\\n"
-msgstr ""
-
 #: lib/RT/Action/ResolveMembers.pm:42
 #. (ref $self)
 msgid "%1 will resolve all members of a resolved group ticket."
@@ -259,22 +243,11 @@ msgstr "'%1' �вл�ет�� неверным значением �тату�а
 msgid "'%1' not a recognized action. "
 msgstr "Что делать ? : '%1'"
 
-#: NOT FOUND IN SOURCE
-msgid "(Check box to delete group member)"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "(Check box to delete scrip)"
-msgstr ""
 
 #: html/Admin/Elements/EditQueueWatchers:29 html/Admin/Elements/EditScrips:35 html/Admin/Elements/EditTemplates:36 html/Admin/Groups/Members.html:52 html/Ticket/Elements/EditLinks:33 html/Ticket/Elements/EditPeople:46 html/User/Groups/Members.html:55
 msgid "(Check box to delete)"
 msgstr "(Пометьте то, что хотите удалить)"
 
-#: NOT FOUND IN SOURCE
-msgid "(Check boxes to delete)"
-msgstr ""
-
 #: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, seperated with spaces)"
 msgstr "(Введите номера или ��ылки на тикеты. �е�колько тикетов раздел�ют�� пробелами.)"
@@ -283,15 +256,11 @@ msgstr "(Введите номера или ��ылки на тикеты. �е
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
 msgid "(If left blank, will default to %1"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "(No Value)"
-msgstr ""
+msgstr "(Е�ли пу�тое, то по умолчанию равно %1"
 
 #: html/Admin/Elements/EditCustomFields:33 html/Admin/Elements/ListGlobalCustomFields:32
 msgid "(No custom fields)"
-msgstr ""
+msgstr "(�ет дополнительных полей)"
 
 #: html/Admin/Groups/Members.html:50 html/User/Groups/Members.html:53
 msgid "(No members)"
@@ -303,11 +272,11 @@ msgstr "(�ет �криптов)"
 
 #: html/Admin/Elements/EditTemplates:31
 msgid "(No templates)"
-msgstr ""
+msgstr "(�ет шаблонов)"
 
 #: html/Ticket/Update.html:85
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
-msgstr ""
+msgstr "(�а �ти адре�а [разделенные зап�той] отправл�ют�� копии �ообщени�. �дре�а <b>не</b> �охран�ют�� дл� по�ледующих уведомлений.)"
 
 #: NOT FOUND IN SOURCE
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
@@ -315,11 +284,11 @@ msgstr "(�а �ти адре�а [разделенные зап�той] отп
 
 #: html/Ticket/Create.html:79
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
-msgstr ""
+msgstr "(�а �ти адре�а [разделенные зап�той] отправл�ют�� копии �ообщени�. �дре�а <b>�охран�ют��</b> дл� по�ледующих уведомлений.)"
 
 #: html/Ticket/Update.html:81
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
-msgstr ""
+msgstr "(�а �ти адре�а [разделенные зап�той] отправл�ют�� копии �ообщени�. �дре�а <b>не</b> �охран�ют�� дл� по�ледующих уведомлений.)"
 
 #: NOT FOUND IN SOURCE
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
@@ -327,7 +296,7 @@ msgstr "(�а �ти адре�а [разделенные зап�той] отп
 
 #: html/Ticket/Create.html:69
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
-msgstr ""
+msgstr "(�а �ти адре�а [разделенные зап�той] отправл�ют�� копии �ообщени�. �дре�а <b>�охран�ют��</b> дл� по�ледующих уведомлений.)"
 
 #: html/Admin/Groups/index.html:33 html/User/Groups/index.html:33
 msgid "(empty)"
@@ -335,7 +304,7 @@ msgstr "(пу�то)"
 
 #: html/Admin/Users/index.html:39
 msgid "(no name listed)"
-msgstr ""
+msgstr "(не указано имен)"
 
 #: html/Elements/MyRequests:43 html/Elements/MyTickets:45
 msgid "(no subject)"
@@ -351,15 +320,11 @@ msgstr "(только один тикет)"
 
 #: html/Elements/MyRequests:52 html/Elements/MyTickets:55
 msgid "(pending approval)"
-msgstr ""
+msgstr "(в ожидании визы)"
 
 #: html/Elements/MyRequests:54 html/Elements/MyTickets:57
 msgid "(pending other tickets)"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "(requestor's group)"
-msgstr ""
+msgstr "(в ожидании других тикетов)"
 
 #: html/Admin/Users/Modify.html:50
 msgid "(required)"
@@ -367,7 +332,7 @@ msgstr "(требует��)"
 
 #: html/Ticket/Elements/ShowTransaction:105
 msgid "(untitled)"
-msgstr ""
+msgstr "(без названи�)"
 
 #: NOT FOUND IN SOURCE
 msgid "25 highest priority tickets I own..."
@@ -390,29 +355,9 @@ msgstr ""
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
 msgstr "<input type=\"submit\" value=\"Создать тикет в очереди\">&nbsp;%1"
 
-#: NOT FOUND IN SOURCE
-msgid "??????"
-msgstr ""
-
 #: etc/initialdata:203
 msgid "A blank template"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "ACE Deleted"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "ACE Loaded"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "ACE could not be deleted"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "ACE could not be found"
-msgstr ""
+msgstr "Пу�той шаблон"
 
 #: lib/RT/ACE_Overlay.pm:157 lib/RT/Principal_Overlay.pm:181
 msgid "ACE not found"
@@ -428,7 +373,7 @@ msgstr "Прекращаем работу во избежание нежелат
 
 #: html/User/Elements/Tabs:32
 msgid "About me"
-msgstr ""
+msgstr "Обо мне"
 
 #: html/Admin/Users/Modify.html:80
 msgid "Access control"
@@ -441,7 +386,7 @@ msgstr "Дей�твие"
 #: lib/RT/Scrip_Overlay.pm:147
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
-msgstr ""
+msgstr "дей�твие %1 не найдено"
 
 #: bin/rt-crontool:123
 msgid "Action committed."
@@ -461,35 +406,12 @@ msgstr "Добавить копию"
 
 #: html/Ticket/Create.html:114 html/Ticket/Update.html:100
 msgid "Add More Files"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Add Next State"
-msgstr ""
+msgstr "Добавить еще файлы"
 
 #: html/Search/Bulk.html:88
 msgid "Add Requestor"
 msgstr "Добавить про�ител�"
 
-#: NOT FOUND IN SOURCE
-msgid "Add a Scrip to this queue"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Add a Scrip which will apply to all queues"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Add a keyword selection to this queue"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Add a new a global scrip"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Add a scrip to this queue"
-msgstr ""
 
 #: html/Admin/Global/Scrip.html:55
 msgid "Add a scrip which will apply to all queues"
@@ -507,10 +429,6 @@ msgstr "Добавить пользователей"
 msgid "Add new watchers"
 msgstr "Добавить наблюдателей"
 
-#: NOT FOUND IN SOURCE
-msgid "AddNextState"
-msgstr ""
-
 #: lib/RT/Queue_Overlay.pm:643
 #. ($args{'Type'})
 msgid "Added principal as a %1 for this queue"
@@ -535,7 +453,7 @@ msgstr "�дмини�тративна� копи�"
 
 #: etc/initialdata:274
 msgid "Admin Comment"
-msgstr ""
+msgstr "Комментарий админа"
 
 #: etc/initialdata:256
 msgid "Admin Correspondence"
@@ -561,22 +479,10 @@ msgstr "Группы"
 msgid "Admin/Queue/Basics"
 msgstr "Параметры очереди"
 
-#: NOT FOUND IN SOURCE
-msgid "AdminAllPersonalGroups"
-msgstr ""
-
 #: etc/initialdata:56 html/Ticket/Elements/ShowPeople:39 html/Ticket/Update.html:50 lib/RT/ACE_Overlay.pm:89
 msgid "AdminCc"
 msgstr "�дмини�тративна� копи�"
 
-#: NOT FOUND IN SOURCE
-msgid "AdminComment"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "AdminCorrespondence"
-msgstr ""
-
 #: lib/RT/Queue_Overlay.pm:72
 msgid "AdminCustomFields"
 msgstr ""
@@ -605,45 +511,21 @@ msgstr ""
 msgid "Administrative Cc"
 msgstr "�дмини�тративна� копи�"
 
-#: NOT FOUND IN SOURCE
-msgid "Admins"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Advanced Search"
-msgstr ""
-
 #: html/Elements/SelectDateRelation:36
 msgid "After"
 msgstr "По�ле"
 
-#: NOT FOUND IN SOURCE
-msgid "Age"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Alias"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Alias for"
-msgstr ""
-
 #: html/Admin/Elements/EditCustomFields:96
 msgid "All Custom Fields"
-msgstr ""
+msgstr "В�е дополнительные пол�"
 
 #: html/Admin/Queues/index.html:53
 msgid "All Queues"
 msgstr "В�е очереди"
 
-#: NOT FOUND IN SOURCE
-msgid "Always sends a message to the requestors independent of message sender"
-msgstr ""
-
 #: html/Elements/Tabs:58
 msgid "Approval"
-msgstr ""
+msgstr "Виза"
 
 #: html/Approvals/Display.html:46 html/Approvals/Elements/Approve:27 html/Approvals/Elements/ShowDependency:42 html/Approvals/index.html:65
 #. ($Ticket->Id, $Ticket->Subject)
@@ -663,14 +545,6 @@ msgstr "Виза #%1: Примечани� не �охранены из-за о
 msgid "Approval #%1: Notes recorded"
 msgstr "Виза #%1: Примечани� запи�аны"
 
-#: NOT FOUND IN SOURCE
-msgid "Approval Details"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Approval diagram"
-msgstr ""
-
 #: html/Approvals/Elements/Approve:45
 msgid "Approve"
 msgstr "Завизировать"
@@ -701,7 +575,7 @@ msgstr "Вложить файл"
 
 #: html/Ticket/Create.html:98 html/Ticket/Update.html:89
 msgid "Attached file"
-msgstr ""
+msgstr "Вложенный файл"
 
 #: html/SelfService/Attachment/dhandler:36
 msgid "Attachment '%1' could not be loaded"
@@ -723,25 +597,17 @@ msgstr "Вложени�"
 msgid "Aug."
 msgstr "�вг."
 
-#: NOT FOUND IN SOURCE
-msgid "August"
-msgstr ""
-
 #: html/Admin/Elements/ModifyUser:66
 msgid "AuthSystem"
 msgstr "Тип реги�трации"
 
 #: etc/initialdata:206
 msgid "Autoreply"
-msgstr ""
+msgstr "�втоответ"
 
 #: etc/initialdata:72
 msgid "Autoreply To Requestors"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "AutoreplyToRequestors"
-msgstr ""
+msgstr "�втоответ инициатору запро�а"
 
 #: NOT FOUND IN SOURCE
 msgid "Bad PGP Signature: %1\\n"
@@ -1007,9 +873,9 @@ msgstr "�е могу �оздать пользовател�"
 
 #: NOT FOUND IN SOURCE
 msgid "Could not create watcher for requestor"
-msgstr ""
+msgstr "�е могу �оздать наблюдател� дл� инициатора запро�а"
 
-#: NOT FOUND IN SOURCE
+#: NOT FOUND IN SOURC�е могу �оздать наблюдател� дл� инициатора запро�аE
 msgid "Could not find a ticket with id %1"
 msgstr "�е могу найти тикет по идентификатору %1"
 
@@ -1084,7 +950,7 @@ msgstr "�е найти �того значени�"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't find that watcher"
-msgstr ""
+msgstr "�е могу найти данного наблюдател�"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't find user\\n"
@@ -1163,11 +1029,11 @@ msgstr "Добавить поле"
 #: html/Admin/Queues/CustomField.html:48
 #. ($QueueObj->Name())
 msgid "Create a CustomField for queue %1"
-msgstr ""
+msgstr "Создать дополнительное поле дл� очереди 1"
 
 #: html/Admin/Global/CustomField.html:48
 msgid "Create a CustomField which applies to all queues"
-msgstr ""
+msgstr "Создать дополнительное поле дл� в�ех очередей"
 
 #: NOT FOUND IN SOURCE
 msgid "Create a new Custom Field"
@@ -1272,7 +1138,7 @@ msgstr ""
 
 #: lib/RT/Queue_Overlay.pm:84
 msgid "CreateTicket"
-msgstr ""
+msgstr "Создать тикет"
 
 #: html/Elements/SelectDateType:26 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1167
 msgid "Created"
@@ -1305,7 +1171,7 @@ msgstr "Текущие права"
 
 #: html/Search/Listing.html:71
 msgid "Current search criteria"
-msgstr ""
+msgstr "Текущие критерии пои�ка"
 
 #: html/Admin/Queues/People.html:41 html/Ticket/Elements/EditPeople:45
 msgid "Current watchers"
@@ -1314,7 +1180,7 @@ msgstr "Текущие наблюдатели"
 #: html/Admin/Global/CustomField.html:55
 #. ($CustomField)
 msgid "Custom Field #%1"
-msgstr ""
+msgstr "Дополнительное поле #%1"
 
 #: html/Admin/Elements/QueueTabs:53 html/Admin/Elements/SystemTabs:40 html/Admin/Global/index.html:50 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
@@ -1397,21 +1263,13 @@ msgstr "Даты"
 msgid "Dec."
 msgstr "Дек."
 
-#: NOT FOUND IN SOURCE
-msgid "December"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Default Autoresponse Template"
-msgstr ""
-
 #: etc/initialdata:207
 msgid "Default Autoresponse template"
-msgstr ""
+msgstr "Шаблон автоответа по умолчанию"
 
 #: etc/initialdata:275
 msgid "Default admin comment template"
-msgstr ""
+msgstr "Шаблон ответа админа по умолчанию"
 
 #: etc/initialdata:257
 msgid "Default admin correspondence template"
@@ -1423,7 +1281,7 @@ msgstr ""
 
 #: etc/initialdata:238
 msgid "Default transaction template"
-msgstr ""
+msgstr "Шаблон транзакции по умолчанию"
 
 #: lib/RT/Transaction_Overlay.pm:645
 #. ($type, $self->Field, $self->OldValue, $self->NewValue)
@@ -1436,7 +1294,7 @@ msgstr "Передача прав"
 
 #: lib/RT/System.pm:63
 msgid "Delegate specific rights which have been granted to you."
-msgstr ""
+msgstr "Делегирование отдельных прав, которые вам даны."
 
 #: lib/RT/System.pm:63
 msgid "DelegateRights"
@@ -1444,15 +1302,11 @@ msgstr ""
 
 #: html/User/Elements/Tabs:38
 msgid "Delegation"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Delete"
-msgstr ""
+msgstr "Делегирование прав"
 
 #: lib/RT/Queue_Overlay.pm:90
 msgid "Delete tickets"
-msgstr ""
+msgstr "Удаление тикетов"
 
 #: lib/RT/Queue_Overlay.pm:90
 msgid "DeleteTicket"
@@ -1470,14 +1324,6 @@ msgstr "Удаление �того объекта нарушит ��ылочн
 msgid "Deleting this object would violate referential integrity"
 msgstr "Удаление �того объекта нарушит ��ылочную цело�тно�ть"
 
-#: NOT FOUND IN SOURCE
-msgid "Deleting this object would violate referential integrity."
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Deleting this object would violate referential integrity. That's bad."
-msgstr ""
-
 #: html/Approvals/Elements/Approve:46
 msgid "Deny"
 msgstr "Отказать"
@@ -1549,7 +1395,7 @@ msgstr "�е обновл�ть �ту �траницу"
 
 #: html/Search/Elements/PickRestriction:114
 msgid "Don't show search results"
-msgstr ""
+msgstr "�е показывать результаты пои�ка"
 
 #: html/Ticket/Elements/ShowTransaction:105
 msgid "Download"
@@ -1588,7 +1434,7 @@ msgstr "Изменение �в�зей"
 #: html/Admin/Queues/Templates.html:41
 #. ($QueueObj->Name)
 msgid "Edit Templates for queue %1"
-msgstr ""
+msgstr "Редактировать шаблоны дл� очереди %1"
 
 #: NOT FOUND IN SOURCE
 msgid "Edit keywords"
@@ -1658,11 +1504,11 @@ msgstr "EmailEncoding"
 
 #: html/Admin/Elements/EditCustomField:36
 msgid "Enabled (Unchecking this box disables this custom field)"
-msgstr ""
+msgstr "Разрешено (�н�тие отметки запрещает данное дополнительное поле)"
 
 #: html/Admin/Groups/Modify.html:53 html/User/Groups/Modify.html:53
 msgid "Enabled (Unchecking this box disables this group)"
-msgstr ""
+msgstr "Разрешено (�н�тие отметки запрещает данную группу)"
 
 #: html/Admin/Queues/Modify.html:84
 msgid "Enabled (Unchecking this box disables this queue)"
@@ -1670,7 +1516,7 @@ msgstr "Включена (Сн�та� галочка означает откл
 
 #: html/Admin/Elements/EditCustomFields:99
 msgid "Enabled Custom Fields"
-msgstr ""
+msgstr "Разрешенные дополнительные пол�"
 
 #: html/Admin/Queues/index.html:56
 msgid "Enabled Queues"
@@ -1683,11 +1529,11 @@ msgstr "Включен �тату� %1"
 
 #: lib/RT/CustomField_Overlay.pm:361
 msgid "Enter multiple values"
-msgstr ""
+msgstr "Введите не�колько значений"
 
 #: lib/RT/CustomField_Overlay.pm:358
 msgid "Enter one value"
-msgstr ""
+msgstr "Введите одно значение"
 
 #: html/Ticket/Elements/EditLinks:112
 msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
@@ -1697,10 +1543,6 @@ msgstr "Введите номера или ��ылки на тикеты. �е
 msgid "Error"
 msgstr "Ошибка"
 
-#: NOT FOUND IN SOURCE
-msgid "Error adding watcher"
-msgstr ""
-
 #: lib/RT/Queue_Overlay.pm:555
 msgid "Error in parameters to Queue->AddWatcher"
 msgstr "Ошибка в параметрах Queue->AddWatcher"
@@ -1772,7 +1614,7 @@ msgstr ""
 
 #: html/Admin/Queues/People.html:61 html/Ticket/Elements/EditPeople:34
 msgid "Find group whose"
-msgstr ""
+msgstr "�айти группы, у которых"
 
 #: html/Elements/Quicksearch:25
 msgid "Find new/open tickets"
@@ -1784,11 +1626,7 @@ msgstr "�айти людей, у которых"
 
 #: html/Search/Listing.html:108
 msgid "Find tickets"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Finish Approval"
-msgstr ""
+msgstr "Пои�к тикетов"
 
 #: html/Ticket/Elements/Tabs:58
 msgid "First"
@@ -1887,7 +1725,7 @@ msgstr ""
 
 #: html/Ticket/Elements/AddWatchers:46 html/User/Elements/DelegateRights:78
 msgid "Group"
-msgstr ""
+msgstr "Групповые"
 
 #: NOT FOUND IN SOURCE
 msgid "Group %1 %2: %3"
@@ -1901,10 +1739,6 @@ msgstr "Права группы"
 msgid "Group already has member"
 msgstr "Пользователь уже входит в группу"
 
-#: NOT FOUND IN SOURCE
-msgid "Group could not be created."
-msgstr ""
-
 #: html/Admin/Groups/Modify.html:77
 #. ($create_msg)
 msgid "Group could not be created: %1"
@@ -1998,7 +1832,7 @@ msgstr ""
 
 #: html/Admin/Elements/EditCustomFields:74
 msgid "Include disabled custom fields in listing."
-msgstr ""
+msgstr "Включать отключенные дополнительные пол� в �пи�ок."
 
 #: html/Admin/Queues/index.html:43
 msgid "Include disabled queues in listing."
@@ -2357,7 +2191,7 @@ msgstr "MobilePhone"
 
 #: lib/RT/Queue_Overlay.pm:70
 msgid "Modify Access Control List"
-msgstr ""
+msgstr "Изменить �пи�ок контрол� до�тупа"
 
 #: NOT FOUND IN SOURCE
 msgid "Modify Custom Field %1"
@@ -2365,23 +2199,15 @@ msgstr "Изменение дополнительного пол� %1"
 
 #: html/Admin/Global/CustomFields.html:44 html/Admin/Global/index.html:51
 msgid "Modify Custom Fields which apply to all queues"
-msgstr ""
+msgstr "Изменить дополнительные пол�, примен�емые кл в�ем очеред�м"
 
 #: lib/RT/Queue_Overlay.pm:73
 msgid "Modify Scrip templates for this queue"
-msgstr ""
+msgstr "Изменить шаблоны �криплетов дл� данной очереди"
 
 #: lib/RT/Queue_Overlay.pm:76
 msgid "Modify Scrips for this queue"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Modify System ACLS"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Modify Template %1"
-msgstr ""
+msgstr "Изменить �криплеты дл� данной очереди"
 
 #: html/Admin/Queues/CustomField.html:45
 #. ($QueueObj->Name())
@@ -2401,10 +2227,6 @@ msgstr "Изменить �крипт дл� очереди %1"
 msgid "Modify a scrip which applies to all queues"
 msgstr "Изменение �крипта, который дей�твует дл� в�ех очередей"
 
-#: NOT FOUND IN SOURCE
-msgid "Modify dates for # %1"
-msgstr ""
-
 #: html/Ticket/ModifyDates.html:25 html/Ticket/ModifyDates.html:29
 #. ($TicketObj->Id)
 msgid "Modify dates for #%1"
@@ -2423,29 +2245,18 @@ msgstr "Изменение глобальных прав группы"
 msgid "Modify global group rights."
 msgstr "Изменение глобальных прав группы"
 
-#: NOT FOUND IN SOURCE
-msgid "Modify global rights for groups"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Modify global rights for users"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Modify global scrips"
-msgstr ""
 
 #: html/Admin/Global/UserRights.html:25 html/Admin/Global/UserRights.html:28 html/Admin/Global/index.html:60
 msgid "Modify global user rights"
-msgstr ""
+msgstr "Изменение глобальных прав пользовател�"
 
 #: html/Admin/Global/UserRights.html:33
 msgid "Modify global user rights."
-msgstr "Изменение глобальных прав пользовател�"
+msgstr "Изменение глобальных прав пользовател�."
 
 #: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
-msgstr ""
+msgstr "Изменение метаданных группы или ее удаление"
 
 #: html/Admin/Groups/GroupRights.html:25 html/Admin/Groups/GroupRights.html:29 html/Admin/Groups/GroupRights.html:35
 #. ($GroupObj->Name)
@@ -2493,7 +2304,7 @@ msgstr "Изменение шаблона %1"
 
 #: html/Admin/Global/Templates.html:44
 msgid "Modify templates which apply to all queues"
-msgstr ""
+msgstr "Изменить шаблоны, которые примен�ют�� ко в�ем очеред�м"
 
 #: html/Admin/Groups/Modify.html:87 html/User/Groups/Modify.html:86
 #. ($Group->Name)
@@ -2502,7 +2313,7 @@ msgstr "�а�тройки дл� группы %1"
 
 #: lib/RT/Queue_Overlay.pm:71
 msgid "Modify the queue watchers"
-msgstr ""
+msgstr "Изменить очередь наблюдателей"
 
 #: html/Admin/Users/Modify.html:236
 #. ($UserObj->Name)
@@ -2521,7 +2332,7 @@ msgstr "Изменение тикета # %1"
 
 #: lib/RT/Queue_Overlay.pm:88
 msgid "Modify tickets"
-msgstr ""
+msgstr "Изменить тикеты"
 
 #: html/Admin/Groups/UserRights.html:25 html/Admin/Groups/UserRights.html:29 html/Admin/Groups/UserRights.html:35
 #. ($GroupObj->Name)
@@ -2596,7 +2407,7 @@ msgstr "Мои визы"
 
 #: html/Approvals/index.html:25 html/Approvals/index.html:26
 msgid "My approvals"
-msgstr ""
+msgstr "Мои визы"
 
 #: html/Admin/Elements/AddCustomFieldValue:26 html/Admin/Elements/EditCustomField:32 html/Admin/Elements/ModifyTemplate:28 html/Admin/Elements/ModifyUser:30 html/Admin/Groups/Modify.html:44 html/Elements/SelectGroups:26 html/Elements/SelectUsers:28 html/User/Groups/Modify.html:44
 msgid "Name"
@@ -2606,10 +2417,6 @@ msgstr "Им�"
 msgid "Name in use"
 msgstr "Им� уже и�пользует��"
 
-#: NOT FOUND IN SOURCE
-msgid "Need approval from system administrator"
-msgstr ""
-
 #: html/Ticket/Elements/ShowDates:52
 msgid "Never"
 msgstr ""
@@ -2632,15 +2439,15 @@ msgstr "�овые �в�зи"
 
 #: html/Ticket/Elements/Tabs:36
 msgid "New Search"
-msgstr ""
+msgstr "�овый пои�к"
 
 #: html/Admin/Global/CustomField.html:41 html/Admin/Global/CustomFields.html:39 html/Admin/Queues/CustomField.html:52 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
-msgstr ""
+msgstr "�овое дополнительное поле"
 
 #: html/Admin/Elements/GroupTabs:54 html/User/Elements/GroupTabs:52
 msgid "New group"
-msgstr ""
+msgstr "�ова� группа"
 
 #: html/SelfService/Prefs.html:32
 msgid "New password"
@@ -2652,7 +2459,7 @@ msgstr "Отправлено �ообщение � новым паролем"
 
 #: html/Admin/Elements/QueueTabs:70
 msgid "New queue"
-msgstr ""
+msgstr "�ова� очередь"
 
 #: html/SelfService/Elements/Tabs:63
 msgid "New request"
@@ -2664,7 +2471,7 @@ msgstr "�овые права"
 
 #: html/Admin/Global/Scrip.html:40 html/Admin/Global/Scrips.html:39 html/Admin/Queues/Scrip.html:43 html/Admin/Queues/Scrips.html:53
 msgid "New scrip"
-msgstr ""
+msgstr "�овый �криплет"
 
 #: NOT FOUND IN SOURCE
 msgid "New search"
@@ -2672,7 +2479,7 @@ msgstr "�овый пои�к"
 
 #: html/Admin/Global/Template.html:60 html/Admin/Global/Templates.html:39 html/Admin/Queues/Template.html:58 html/Admin/Queues/Templates.html:46
 msgid "New template"
-msgstr ""
+msgstr "�овый шаблон"
 
 #: lib/RT/Ticket_Overlay.pm:2771
 msgid "New ticket doesn't exist"
@@ -2680,7 +2487,7 @@ msgstr "�овый тикет не �уще�твует"
 
 #: html/Admin/Elements/UserTabs:52
 msgid "New user"
-msgstr ""
+msgstr "�овый пользователь"
 
 #: html/Admin/Elements/CreateUserCalled:26
 msgid "New user called"
@@ -2954,7 +2761,7 @@ msgstr "�а"
 
 #: etc/initialdata:155
 msgid "On Comment"
-msgstr ""
+msgstr "�а комментарий"
 
 #: etc/initialdata:148
 msgid "On Correspond"
@@ -2962,15 +2769,15 @@ msgstr ""
 
 #: etc/initialdata:137
 msgid "On Create"
-msgstr ""
+msgstr "�а �оздание"
 
 #: etc/initialdata:169
 msgid "On Owner Change"
-msgstr ""
+msgstr "�а изменение владельца"
 
 #: etc/initialdata:177
 msgid "On Queue Change"
-msgstr ""
+msgstr "�а изменение очереди"
 
 #: etc/initialdata:183
 msgid "On Resolve"
@@ -2978,11 +2785,11 @@ msgstr ""
 
 #: etc/initialdata:161
 msgid "On Status Change"
-msgstr ""
+msgstr "на изменение �тату�а"
 
 #: etc/initialdata:142
 msgid "On Transaction"
-msgstr ""
+msgstr "�а транзакцию"
 
 #: html/Approvals/Elements/PendingMyApproval:50
 #. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
@@ -3108,7 +2915,7 @@ msgstr "В до�тупе отказано"
 
 #: html/User/Elements/Tabs:35
 msgid "Personal Groups"
-msgstr ""
+msgstr "Личные группы"
 
 #: html/User/Groups/index.html:30 html/User/Groups/index.html:40
 msgid "Personal groups"
@@ -3169,7 +2976,7 @@ msgstr "Приоритет начинает�� �"
 
 #: etc/initialdata:25
 msgid "Privileged"
-msgstr ""
+msgstr "Привилегированные"
 
 #: html/Admin/Users/Modify.html:271 html/User/Prefs.html:163
 #. (loc_fuzzy($msg))
@@ -3299,7 +3106,7 @@ msgstr "Самооб�луживание RT / Закрытые тикеты"
 
 #: html/index.html:25 html/index.html:28
 msgid "RT at a glance"
-msgstr ""
+msgstr "Обзор RT"
 
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't authenticate you"
@@ -3320,11 +3127,7 @@ msgstr "RT не �мог проверить �ту подпи�ь PGP. \\n"
 #: html/Elements/PageLayout:26
 #. ($RT::rtname)
 msgid "RT for %1"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "RT for %1: %2"
-msgstr ""
+msgstr "RT дл� %1"
 
 #: NOT FOUND IN SOURCE
 msgid "RT has proccessed your commands"
@@ -3602,39 +3405,39 @@ msgstr ""
 
 #: html/Admin/Elements/GroupTabs:52 html/User/Elements/GroupTabs:50
 msgid "Select group"
-msgstr ""
+msgstr "Выбрать группу"
 
 #: lib/RT/CustomField_Overlay.pm:355
 msgid "Select multiple values"
-msgstr ""
+msgstr "Выбрать не�колько значений"
 
 #: lib/RT/CustomField_Overlay.pm:352
 msgid "Select one value"
-msgstr ""
+msgstr "Выбрать одно значение"
 
 #: html/Admin/Elements/QueueTabs:67
 msgid "Select queue"
-msgstr ""
+msgstr "Выбрать очередь"
 
 #: html/Admin/Global/Scrip.html:37 html/Admin/Global/Scrips.html:36 html/Admin/Queues/Scrip.html:40 html/Admin/Queues/Scrips.html:50
 msgid "Select scrip"
-msgstr ""
+msgstr "Выбрать �криплет"
 
 #: html/Admin/Global/Template.html:57 html/Admin/Global/Templates.html:36 html/Admin/Queues/Template.html:55
 msgid "Select template"
-msgstr ""
+msgstr "Выбрать шаблон"
 
 #: html/Admin/Elements/UserTabs:49
 msgid "Select user"
-msgstr ""
+msgstr "Выбрать пользовател�"
 
 #: lib/RT/CustomField_Overlay.pm:36
 msgid "SelectMultiple"
-msgstr ""
+msgstr "Выбрать не�колько"
 
 #: lib/RT/CustomField_Overlay.pm:35
 msgid "SelectSingle"
-msgstr ""
+msgstr "Выбрать одно"
 
 #: html/SelfService/index.html:25
 msgid "Self Service"
@@ -3642,15 +3445,15 @@ msgstr "Самооб�луживание"
 
 #: etc/initialdata:114
 msgid "Send mail to all watchers"
-msgstr ""
+msgstr "Отправить �ообщение в�ем наблюдател�м"
 
 #: etc/initialdata:110
 msgid "Send mail to all watchers as a \"comment\""
-msgstr ""
+msgstr "Отправить �ообщение в�ем наблюдател�м как \"комментарий\""
 
 #: etc/initialdata:105
 msgid "Send mail to requestors and Ccs"
-msgstr ""
+msgstr "Отправить �ообщение в�ем инициаторам запро�а и CCs"
 
 #: etc/initialdata:100
 msgid "Send mail to requestors and Ccs as a comment"
@@ -3680,14 +3483,6 @@ msgstr ""
 msgid "Sep."
 msgstr "Сен."
 
-#: NOT FOUND IN SOURCE
-msgid "September"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Show Results"
-msgstr "И�кать"
-
 #: html/Approvals/Elements/PendingMyApproval:44
 msgid "Show approved requests"
 msgstr "Показать завизированные запро�ы"
@@ -3710,15 +3505,15 @@ msgstr "Показать ожидающие запро�ы"
 
 #: html/Approvals/Elements/PendingMyApproval:46
 msgid "Show requests awaiting other approvals"
-msgstr ""
+msgstr "Показать запро�ы, ждущие других виз"
 
 #: lib/RT/Queue_Overlay.pm:81
 msgid "Show ticket private commentary"
-msgstr ""
+msgstr "Показать приватные комментарии по тикету"
 
 #: lib/RT/Queue_Overlay.pm:79
 msgid "Show ticket summaries"
-msgstr ""
+msgstr "Показать общую информацию по запро�у"
 
 #: lib/RT/Queue_Overlay.pm:69
 msgid "ShowACL"
@@ -3822,10 +3617,6 @@ msgstr ""
 msgid "Status changed from %1 to %2"
 msgstr "Стату� изменен � %1 на %2"
 
-#: NOT FOUND IN SOURCE
-msgid "StatusChange"
-msgstr ""
-
 #: html/Ticket/Elements/Tabs:147
 msgid "Steal"
 msgstr "Отобрать"
@@ -3842,16 +3633,12 @@ msgstr "Тема"
 #: docs/design_docs/string-extraction-guide.txt:89 lib/RT/Transaction_Overlay.pm:611
 #. ($self->Data)
 msgid "Subject changed to %1"
-msgstr ""
+msgstr "Тема изменена на %1"
 
 #: html/Elements/Submit:59
 msgid "Submit"
 msgstr "Готово"
 
-#: NOT FOUND IN SOURCE
-msgid "Submit Workflow"
-msgstr ""
-
 #: lib/RT/Group_Overlay.pm:749
 msgid "Succeeded"
 msgstr ""
@@ -3862,24 +3649,16 @@ msgstr "В�к."
 
 #: lib/RT/System.pm:54
 msgid "SuperUser"
-msgstr ""
+msgstr "�дмини�тратор"
 
 #: html/User/Elements/DelegateRights:77
 msgid "System"
-msgstr ""
+msgstr "Си�темные"
 
 #: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:567 lib/RT/Interface/Web.pm:757 lib/RT/Interface/Web.pm:790
 msgid "System Error"
 msgstr "Ошибка �и�темы"
 
-#: NOT FOUND IN SOURCE
-msgid "System Error. Right not granted."
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "System Error. right not granted"
-msgstr ""
-
 #: lib/RT/ACE_Overlay.pm:616
 msgid "System error. Right not delegated."
 msgstr "Ошибка �и�темы. Право не было делегировано."
@@ -3888,17 +3667,13 @@ msgstr "Ошибка �и�темы. Право не было делегиров
 msgid "System error. Right not granted."
 msgstr "Ошибка �и�темы. Право не было выдано."
 
-#: NOT FOUND IN SOURCE
-msgid "System error. Unable to grant rights."
-msgstr ""
-
 #: html/Admin/Global/GroupRights.html:35 html/Admin/Groups/GroupRights.html:37 html/Admin/Queues/GroupRights.html:36
 msgid "System groups"
 msgstr "Си�темные группы"
 
 #: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
 msgid "SystemRolegroup for internal use"
-msgstr ""
+msgstr "Си�темна� группа дл� внутреннего и�пользовани�"
 
 #: lib/RT/CurrentUser.pm:320
 msgid "TEST_STRING"
@@ -3919,11 +3694,11 @@ msgstr "Шаблон"
 #: html/Admin/Global/Template.html:91 html/Admin/Queues/Template.html:90
 #. ($TemplateObj->Id())
 msgid "Template #%1"
-msgstr ""
+msgstr "Шаблон #%1"
 
 #: html/Admin/Elements/EditTemplates:89
 msgid "Template deleted"
-msgstr ""
+msgstr "Шаблон удален"
 
 #: lib/RT/Scrip_Overlay.pm:153
 msgid "Template not found"
@@ -3947,7 +3722,7 @@ msgstr "Шаблоны дл� %1\\n"
 
 #: lib/RT/Interface/Web.pm:858
 msgid "That is already the current value"
-msgstr ""
+msgstr "Это уже текущее значение"
 
 #: lib/RT/CustomField_Overlay.pm:178
 msgid "That is not a value for this custom field"
@@ -4013,10 +3788,6 @@ msgstr "Этот пользователь теперь имеет в�е пол
 msgid "That user is now unprivileged"
 msgstr "Этот пользователь теперь не имеет полномочий"
 
-#: NOT FOUND IN SOURCE
-msgid "That user is now unprivilegedileged"
-msgstr ""
-
 #: lib/RT/Ticket_Overlay.pm:2944
 msgid "That user may not own tickets in that queue"
 msgstr "Этот пользователь не может владеть тикетами из �той очереди"
@@ -4051,15 +3822,15 @@ msgstr "Эти команды не были и�полнены:\\n\\n"
 
 #: lib/RT/Interface/Web.pm:861
 msgid "The new value has been set."
-msgstr ""
+msgstr "�овое значение у�тановлено"
 
 #: lib/RT/ACE_Overlay.pm:86
 msgid "The owner of a ticket"
-msgstr ""
+msgstr "Владелец тикета"
 
 #: lib/RT/ACE_Overlay.pm:87
 msgid "The requestor of a ticket"
-msgstr ""
+msgstr "Кто отправил тикет"
 
 #: html/Admin/Elements/EditUserComments:26
 msgid "These comments aren't generally visible to the user"
@@ -4080,7 +3851,7 @@ msgstr "Похоже, что �та транзакци� не имеет инф
 #: html/Ticket/Elements/ShowRequestor:47
 #. ($rows)
 msgid "This user's %1 highest priority tickets"
-msgstr ""
+msgstr "%1 тикетов мак�имального приоритета �того пользовател�"
 
 #: NOT FOUND IN SOURCE
 msgid "This user's 25 highest priority tickets"
@@ -4090,18 +3861,6 @@ msgstr "25 важнейших тикетов пользовател�..."
 msgid "Thu."
 msgstr "Чтв."
 
-#: NOT FOUND IN SOURCE
-msgid "Ticket"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Ticket # %1  %2"
-msgstr "Тикет # %1  %2"
-
-#: NOT FOUND IN SOURCE
-msgid "Ticket # %1 Jumbo update: %2"
-msgstr ""
-
 #: html/Ticket/ModifyAll.html:25 html/Ticket/ModifyAll.html:29
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket #%1 Jumbo update: %2"
@@ -4154,7 +3913,7 @@ msgstr "Тип данных тикета"
 
 #: lib/RT/Ticket_Overlay.pm:495 lib/RT/Ticket_Overlay.pm:597
 msgid "Ticket could not be created due to an internal error"
-msgstr ""
+msgstr "Тикет не может быть �оздан из-за внутренней ошибки"
 
 #: lib/RT/Transaction_Overlay.pm:522
 msgid "Ticket created"
@@ -4172,17 +3931,13 @@ msgstr "Тикет удален"
 msgid "Ticket id not found"
 msgstr "Идентификатор тикета не найден"
 
-#: NOT FOUND IN SOURCE
-msgid "Ticket killed"
-msgstr ""
-
 #: html/REST/1.0/modify:36 html/REST/1.0/update:41
 msgid "Ticket not found"
 msgstr "Тикет не найден"
 
 #: etc/initialdata:289
 msgid "Ticket status changed"
-msgstr ""
+msgstr "Стату� тикета изменен"
 
 #: html/Ticket/Update.html:39
 msgid "Ticket watchers"
@@ -4190,7 +3945,7 @@ msgstr "�аблюдатели дл� тикета"
 
 #: html/Elements/Tabs:49
 msgid "Tickets"
-msgstr ""
+msgstr "Тикеты"
 
 #: lib/RT/Tickets_Overlay.pm:1383
 #. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
@@ -4231,21 +3986,17 @@ msgstr "Врем� дл� показа"
 msgid "Time worked"
 msgstr "В работе"
 
-#: NOT FOUND IN SOURCE
-msgid "TimeLeft"
-msgstr ""
-
 #: lib/RT/Ticket_Overlay.pm:1165
 msgid "TimeWorked"
-msgstr ""
+msgstr "В работе"
 
 #: bin/rt-commit-handler:402
 msgid "To generate a diff of this commit:"
-msgstr "Дл� генерации дифа �того коммита:"
+msgstr "Дл� генерации изменений �того коммита:"
 
 #: bin/rt-commit-handler:391
 msgid "To generate a diff of this commit:\\n"
-msgstr "Дл� генерации дифа �того коммита:\\n"
+msgstr "Дл� генерации изменений �того коммита:\\n"
 
 #: lib/RT/Ticket_Overlay.pm:1168
 msgid "Told"
@@ -4253,7 +4004,7 @@ msgstr "Контакт"
 
 #: etc/initialdata:237
 msgid "Transaction"
-msgstr ""
+msgstr "Транзакци�"
 
 #: lib/RT/Transaction_Overlay.pm:642
 #. ($self->Data)
@@ -4307,7 +4058,7 @@ msgstr "�е ограничено"
 
 #: etc/initialdata:32
 msgid "Unprivileged"
-msgstr ""
+msgstr "�епривилегированный"
 
 #: lib/RT/Transaction_Overlay.pm:571
 msgid "Untaken"
@@ -4361,12 +4112,12 @@ msgstr "Обновить тикет # %1"
 #: html/SelfService/Update.html:50
 #. ($Ticket->id)
 msgid "Update ticket #%1"
-msgstr "Обновить тикет # %1"
+msgstr "Обновить тикет #%1"
 
 #: html/Ticket/Update.html:135
 #. ($Ticket->id, $Ticket->Subject)
 msgid "Update ticket #%1 (%2)"
-msgstr ""
+msgstr "Обновить тикет #%1 (%2)"
 
 #: lib/RT/Interface/Web.pm:373
 msgid "Update type was neither correspondence nor comment."
@@ -4461,10 +4212,6 @@ msgstr ""
 msgid "WatchAsAdminCc"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
-msgid "Watcher loaded"
-msgstr ""
-
 #: html/Admin/Elements/QueueTabs:42
 msgid "Watchers"
 msgstr "�аблюдатели"
@@ -4585,19 +4332,15 @@ msgstr "�дмини�тратор RT неправильно на�троил п
 
 #: etc/initialdata:429 etc/upgrade/2.1.71:146
 msgid "Your request has been approved by %1. Other approvals may still be pending."
-msgstr ""
+msgstr "Ваш запро� подтвердил %1. Другие подтверждени� могут продолжать находить�� в ожидании."
 
 #: etc/initialdata:463 etc/upgrade/2.1.71:180
 msgid "Your request has been approved."
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Your request was rejected"
-msgstr ""
+msgstr "Ваш запро� подтвержден."
 
 #: etc/initialdata:384 etc/upgrade/2.1.71:101
 msgid "Your request was rejected."
-msgstr ""
+msgstr "Ваш запро� был отвергнут."
 
 #: html/autohandler:136 html/autohandler:142
 msgid "Your username or password is incorrect"
@@ -4607,10 +4350,6 @@ msgstr "Вы ввели неверное им� или пароль"
 msgid "Zip"
 msgstr "Индек�"
 
-#: NOT FOUND IN SOURCE
-msgid "[no subject]"
-msgstr ""
-
 #: html/User/Elements/DelegateRights:59
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
@@ -4640,10 +4379,6 @@ msgstr "отправлено �ообщение"
 msgid "days"
 msgstr "дней"
 
-#: NOT FOUND IN SOURCE
-msgid "dead"
-msgstr ""
-
 #: html/Search/Listing.html:75
 msgid "delete"
 msgstr "удалить"
@@ -4664,10 +4399,6 @@ msgstr "не �одержит"
 msgid "equal to"
 msgstr "равн�ет��"
 
-#: NOT FOUND IN SOURCE
-msgid "false"
-msgstr ""
-
 #: html/Elements/SelectAttachmentField:28
 msgid "filename"
 msgstr "им� файла"
@@ -4737,10 +4468,6 @@ msgstr "нет"
 msgid "not equal to"
 msgstr "не равен"
 
-#: NOT FOUND IN SOURCE
-msgid "notlike"
-msgstr ""
-
 #: lib/RT/Queue_Overlay.pm:59
 msgid "open"
 msgstr "открыт"
@@ -4790,17 +4517,9 @@ msgstr "вызывающий компонент не указал причину
 msgid "ticket #%1 %2"
 msgstr "тикет #%1 %2"
 
-#: NOT FOUND IN SOURCE
-msgid "true"
-msgstr ""
-
 #: lib/RT/Group_Overlay.pm:216
 #. ($self->Id)
 msgid "undescribed group %1"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "undescripbed group %1"
 msgstr "неопи�анна� группа %1"
 
 #: lib/RT/Group_Overlay.pm:191
@@ -4819,8 +4538,3 @@ msgstr "� шаблоном %1"
 #: lib/RT/Date.pm:331
 msgid "years"
 msgstr "лет"
-
-#: NOT FOUND IN SOURCE
-msgid "ニック�ーム"
-msgstr ""
-
diff --git a/rt/lib/RT/I18N/zh_cn.po b/rt/lib/RT/I18N/zh_cn.po
index ededc1ac3..0f0b8da60 100644
--- a/rt/lib/RT/I18N/zh_cn.po
+++ b/rt/lib/RT/I18N/zh_cn.po
@@ -1,4 +1,4 @@
-# Traditional Chinese localization catalog for Request Tracker (RT)
+# Chinese localization catalog for Request Tracker (RT)
 msgid ""
 msgstr ""
 "Last-Translator: Autrijus Tang <autrijus@autrijus.org>\n"
@@ -7,7 +7,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: html/Elements/MyRequests:27 html/Elements/MyTickets:27 html/Work/Elements/MyApprovals:8 html/Work/Elements/MyRequests:9 html/Work/Elements/MyTickets:9
+#: html/Elements/MyRequests:27 html/Elements/MyTickets:27 html/Work/Elements/MyApprovals:8 html/Work/Elements/MyRequests:15 html/Work/Elements/MyTickets:15
 msgid "#"
 msgstr "#"
 
@@ -40,7 +40,7 @@ msgstr "%*(%1) 件尚未解决的申请�"
 msgid "%1 %2"
 msgstr "%1 %2"
 
-#: lib/RT/Tickets_Overlay.pm:771
+#: lib/RT/Tickets_Overlay.pm:790
 #. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
 msgid "%1 %2 %3"
 msgstr "%1 %2 %3"
@@ -50,10 +50,11 @@ msgstr "%1 %2 %3"
 msgid "%1 %2 %3 %4:%5:%6 %7"
 msgstr "%7-%2-%3 %4:%5:%6 %1"
 
-#: lib/RT/Ticket_Overlay.pm:3541 lib/RT/Transaction_Overlay.pm:557 lib/RT/Transaction_Overlay.pm:599
+#: lib/RT/Ticket_Overlay.pm:3588 lib/RT/Transaction_Overlay.pm:514 lib/RT/Transaction_Overlay.pm:557 lib/RT/Transaction_Vendor.pm:19
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
+#. ($field, $new_value)
 msgid "%1 %2 added"
 msgstr "%2 已新增为 %1"
 
@@ -62,16 +63,18 @@ msgstr "%2 已新增为 %1"
 msgid "%1 %2 ago"
 msgstr "%1 %2 之�"
 
-#: lib/RT/Ticket_Overlay.pm:3547 lib/RT/Transaction_Overlay.pm:564
+#: lib/RT/Ticket_Overlay.pm:3594 lib/RT/Transaction_Overlay.pm:521 lib/RT/Transaction_Vendor.pm:25
 #. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
+#. ($field, $old_value, $new_value)
 msgid "%1 %2 changed to %3"
 msgstr "%1 已从 %2 改为 %3"
 
-#: lib/RT/Ticket_Overlay.pm:3544 lib/RT/Transaction_Overlay.pm:560 lib/RT/Transaction_Overlay.pm:605
+#: lib/RT/Ticket_Overlay.pm:3591 lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:563 lib/RT/Transaction_Vendor.pm:22
 #. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
+#. ($field, $old_value)
 msgid "%1 %2 deleted"
 msgstr "%2 已自 %1 删除"
 
@@ -121,17 +124,17 @@ msgstr "%1 - 指定欲使用的�件模�"
 msgid "%1 - Specify the search module you want to use"
 msgstr "%1 - 指定欲使用的查询模�"
 
-#: lib/RT/ScripAction_Overlay.pm:121
+#: lib/RT/ScripAction_Overlay.pm:122
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
 msgstr "加载手续 %1"
 
-#: html/Edit/Elements/Page:48
+#: html/Edit/Elements/Page:49
 #. (scalar $count)
 msgid "%1 Total"
 msgstr "共 %1 笔"
 
-#: lib/RT/Ticket_Overlay.pm:3574
+#: lib/RT/Ticket_Overlay.pm:3621
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
 msgstr "新增 %1 作为 %2 的值"
@@ -154,13 +157,13 @@ msgstr "别� %1 需��用的申请�编�以处� %3(出自 %2)"
 msgid "%1 appears to be a local object, but can't be found in the database"
 msgstr "%1 看�是个本地对象，��在数�库里"
 
-#: html/Ticket/Elements/ShowDates:51 lib/RT/Transaction_Overlay.pm:481
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:430
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
 msgstr "%1 (%2)"
 
-#: lib/RT/Transaction_Overlay.pm:535 lib/RT/Transaction_Overlay.pm:624 lib/RT/Transaction_Overlay.pm:633 lib/RT/Transaction_Overlay.pm:636
+#: lib/RT/Transaction_Overlay.pm:484 lib/RT/Transaction_Overlay.pm:649 lib/RT/Transaction_Overlay.pm:658 lib/RT/Transaction_Overlay.pm:661
 #. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
@@ -168,7 +171,7 @@ msgstr "%1 (%2)"
 msgid "%1 changed from %2 to %3"
 msgstr "%1 的值从 %2 改为 %3"
 
-#: lib/RT/Interface/Web.pm:893
+#: lib/RT/Interface/Web.pm:953
 msgid "%1 could not be set to %2."
 msgstr "无法将 %1 设定为 %2。"
 
@@ -176,17 +179,17 @@ msgstr "无法将 %1 设定为 %2。"
 msgid "%1 couldn't init a transaction (%2)\\n"
 msgstr "%1 无法�始更新 (%2)\\n"
 
-#: lib/RT/Ticket_Overlay.pm:2839
+#: lib/RT/Ticket_Overlay.pm:2880
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
 msgstr "%1 无法将现况设�已解决。RT 数�库内容�能�一致。"
 
-#: html/Elements/MyTickets:24 html/Work/Elements/MyTickets:6
+#: html/Elements/MyTickets:24 html/Work/Elements/MyTickets:9
 #. ($rows)
 msgid "%1 highest priority tickets I own..."
 msgstr "� %1 份待处�申请�..."
 
-#: html/Elements/MyRequests:24 html/Work/Elements/MyRequests:6
+#: html/Elements/MyRequests:24 html/Work/Elements/MyRequests:9
 #. ($rows)
 msgid "%1 highest priority tickets I requested..."
 msgstr "� %1 份�出的申请�..."
@@ -206,12 +209,12 @@ msgstr "%1 是从外部排程程�(如 cron)�对申请�进行�作的工
 msgid "%1 is no longer a %2 for this queue."
 msgstr "%1 已��是此表�的 %2。"
 
-#: lib/RT/Ticket_Overlay.pm:1578
+#: lib/RT/Ticket_Overlay.pm:1596
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this ticket."
 msgstr "%1 已��是此申请�的 %2。"
 
-#: lib/RT/Ticket_Overlay.pm:3630
+#: lib/RT/Ticket_Overlay.pm:3677
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 is no longer a value for custom field %2"
 msgstr "%1 已��是自订字段 %2 的值。"
@@ -264,17 +267,17 @@ msgstr "%1 会解决在已解决群组里�员的申请�。"
 msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
 msgstr "如果 %1 起始申请��赖于�个链接，或是�个链接的�员，它将会被延宕。"
 
-#: lib/RT/Transaction_Overlay.pm:433
+#: lib/RT/Transaction_Overlay.pm:382 lib/RT/Transaction_Vendor.pm:37
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr "%1：未指定附件"
 
-#: html/Ticket/Elements/ShowTransaction:89 html/Work/Tickets/Elements/ShowTransaction:152
+#: html/Ticket/Elements/ShowTransaction:100 html/Work/Tickets/Elements/ShowTransaction:158
 #. ($size)
 msgid "%1b"
 msgstr "%1 字节"
 
-#: html/Ticket/Elements/ShowTransaction:86 html/Work/Tickets/Elements/ShowTransaction:149
+#: html/Ticket/Elements/ShowTransaction:97 html/Work/Tickets/Elements/ShowTransaction:155
 #. (int($size/102.4)/10)
 msgid "%1k"
 msgstr "%1k 字节"
@@ -283,7 +286,7 @@ msgstr "%1k 字节"
 msgid "%quant(%1,result) found"
 msgstr "找到 %1 项结果"
 
-#: lib/RT/Ticket_Overlay.pm:1148
+#: lib/RT/Ticket_Overlay.pm:1185
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
 msgstr "'%1' �是一个�法的状�值"
@@ -300,7 +303,7 @@ msgstr "(点选欲删除的�员)"
 msgid "(Check box to delete scrip)"
 msgstr "(点选欲删除的手续)"
 
-#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Elements/EditWorkflows:36 html/Admin/Groups/Members.html:51 html/Ticket/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Elements/EditWorkflows:36 html/Admin/Groups/Members.html:51 html/Ticket/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54 html/Work/Tickets/Elements/EditLinks:20 html/Work/Tickets/Elements/EditPeople:36
 msgid "(Check box to delete)"
 msgstr "(点选欲删除的项目)"
 
@@ -308,7 +311,7 @@ msgstr "(点选欲删除的项目)"
 msgid "(Check boxes to delete)"
 msgstr "(点选欲删除的项目)"
 
-#: html/Ticket/Create.html:177
+#: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, seperated with spaces)"
 msgstr "(键入申请�编�或网�，以空白分隔)"
 
@@ -342,7 +345,7 @@ msgstr "没有模�"
 msgid "(No workflows)"
 msgstr "没有�程"
 
-#: html/Ticket/Update.html:83 html/Work/Tickets/Update.html:52
+#: html/Ticket/Update.html:83 html/Work/Tickets/Update.html:56
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr "(�出本份更新的密件副本给��上以逗�隔开的电�邮件地�。这<b>�会</b>更改�续的收件者��。)"
 
@@ -366,7 +369,7 @@ msgstr "(�出本份更新的副本给��上以逗�隔开的电�邮件
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
 msgstr "(�出本份更新的副本给��上以逗�隔开的电�邮件地�。这<b>将会</b>更改�续的收件者��。)"
 
-#: html/Ticket/Elements/EditCustomFieldEntries:35 html/Work/Tickets/Elements/EditCustomFieldEntries:33 html/Work/Tickets/Elements/ShowCustomFieldEntries:13
+#: html/Ticket/Elements/EditCustomFieldEntries:35 html/Work/Tickets/Elements/EditCustomFieldEntries:43 html/Work/Tickets/Elements/ShowCustomFieldEntries:14
 msgid "(delete)"
 msgstr "(删除)"
 
@@ -374,7 +377,7 @@ msgstr "(删除)"
 msgid "(empty)"
 msgstr "(空白)"
 
-#: html/Edit/Global/CustomField/index.html:113 html/Edit/Global/Scrip/index.html:111 html/Edit/Global/Template/index.html:106
+#: html/Edit/Elements/Index:87 html/Edit/Global/CustomField/index.html:116 html/Edit/Global/Scrip/index.html:111 html/Edit/Global/Template/index.html:106
 msgid "(new)"
 msgstr "(新增)"
 
@@ -382,23 +385,23 @@ msgstr "(新增)"
 msgid "(no name listed)"
 msgstr "(没有列出姓�)"
 
-#: html/Elements/MyRequests:42 html/Elements/MyTickets:44 html/Work/Elements/MyApprovals:37 html/Work/Elements/MyRequests:36 html/Work/Elements/MyTickets:41
+#: html/Elements/MyRequests:42 html/Elements/MyTickets:44 html/Work/Elements/MyApprovals:37 html/Work/Elements/MyRequests:43 html/Work/Elements/MyTickets:52
 msgid "(no subject)"
 msgstr "(没有主题)"
 
-#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:60 html/Ticket/Elements/EditCustomFieldValues:52 html/Ticket/Elements/ShowCustomFields:35 html/Work/Elements/EditCustomFieldValues:50 html/Work/Elements/EditCustomFields:32 html/Work/Tickets/Elements/EditCustomFieldValues:33 lib/RT/Transaction_Overlay.pm:534
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/EditCustomFieldValues:52 html/Ticket/Elements/ShowCustomFields:35 html/Work/Elements/EditCustomFieldValues:50 html/Work/Elements/EditCustomFields:32 html/Work/Tickets/Elements/EditCustomFieldValues:33 lib/RT/Transaction_Overlay.pm:483
 msgid "(no value)"
 msgstr "(æ— )"
 
-#: html/Ticket/Elements/BulkLinks:27 html/Ticket/Elements/EditLinks:115 html/Work/Search/BulkLinks:3
+#: html/Ticket/Elements/BulkLinks:27 html/Ticket/Elements/EditLinks:98 html/Work/Search/BulkLinks:3 html/Work/Tickets/Elements/EditLinks:102
 msgid "(only one ticket)"
 msgstr "(仅能指定一份申请�)"
 
-#: html/Elements/MyRequests:51 html/Elements/MyTickets:54 html/Work/Elements/List:17 html/Work/Elements/MyRequests:46 html/Work/Elements/MyTickets:56 html/Work/Tickets/Elements/ShowBasics:44
+#: html/Elements/MyRequests:51 html/Elements/MyTickets:54 html/Work/Elements/List:17 html/Work/Elements/MyRequests:53 html/Work/Elements/MyTickets:67 html/Work/Tickets/Elements/ShowBasics:52
 msgid "(pending approval)"
 msgstr "(等待签核)"
 
-#: html/Elements/MyRequests:53 html/Elements/MyTickets:56 html/Work/Elements/MyRequests:48 html/Work/Elements/MyTickets:58
+#: html/Elements/MyRequests:53 html/Elements/MyTickets:56 html/Work/Elements/MyRequests:55 html/Work/Elements/MyTickets:69
 msgid "(pending other tickets)"
 msgstr "(等待其它申请�)"
 
@@ -406,22 +409,14 @@ msgstr "(等待其它申请�)"
 msgid "(requestor's group)"
 msgstr "(申请人所属)"
 
-#: html/Admin/Users/Modify.html:49
+#: html/Admin/Users/Modify.html:49 html/Edit/Users/Info:26
 msgid "(required)"
 msgstr "(å¿…å¡«)"
 
-#: html/Ticket/Elements/ShowTransaction:92 html/Work/Tickets/Elements/ShowTransaction:37
+#: html/Ticket/Elements/ShowTransaction:103 html/Work/Tickets/Elements/ShowTransaction:44
 msgid "(untitled)"
 msgstr "(未命�)"
 
-#: NOT FOUND IN SOURCE
-msgid "25 highest priority tickets I own..."
-msgstr "� 25 份待处�申请�..."
-
-#: NOT FOUND IN SOURCE
-msgid "25 highest priority tickets I requested..."
-msgstr "� 25 份�出的申请�..."
-
 #: NOT FOUND IN SOURCE
 msgid ":"
 msgstr "："
@@ -434,12 +429,12 @@ msgstr "<% $Ticket->Status%>"
 msgid "<% $_ %>"
 msgstr "<% $_ %>"
 
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 html/Work/Elements/104Header:43
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 html/Work/Elements/104Header:43 lib/RT/StyleGuide.pod:767
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
 msgstr "<input type=\"submit\" value=\"�出申请�\">&nbsp;%1"
 
-#: etc/initialdata:221
+#: etc/initialdata:203
 msgid "A blank template"
 msgstr "空白模�"
 
@@ -459,7 +454,7 @@ msgstr "无法删除 ACE"
 msgid "ACE could not be found"
 msgstr "找�到 ACE"
 
-#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:179
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
 msgid "ACE not found"
 msgstr "找�到 ACE 设定"
 
@@ -487,11 +482,11 @@ msgstr "系统使用登录��"
 msgid "Access control"
 msgstr "存���"
 
-#: html/Admin/Elements/EditScrip:56 html/Work/Tickets/Elements/ShowTransaction:18
+#: html/Admin/Elements/EditScrip:56 html/Work/Tickets/Elements/ShowTransaction:21
 msgid "Action"
 msgstr "动作"
 
-#: lib/RT/Scrip_Overlay.pm:146
+#: lib/RT/Scrip_Overlay.pm:148
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
 msgstr "动作 %1 找�到"
@@ -504,11 +499,11 @@ msgstr "动作执行完毕"
 msgid "Action prepared..."
 msgstr "动作准备完毕..."
 
-#: html/Work/Elements/List:13 html/Work/Elements/SelectSearch:24 html/Work/Tickets/Create.html:26 html/Work/Tickets/Elements/ShowBasics:12
+#: html/Work/Elements/List:13 html/Work/Elements/SelectSearch:25 html/Work/Tickets/Create.html:27 html/Work/Tickets/Elements/ShowBasics:12
 msgid "Activated Date"
 msgstr "申请激活时间"
 
-#: html/Edit/Elements/104Buttons:71 html/Edit/Elements/ListButtons:7
+#: html/Edit/Elements/104Buttons:82 html/Edit/Elements/ListButtons:7
 msgid "Add"
 msgstr "新增"
 
@@ -520,11 +515,11 @@ msgstr "新增管�员副本收件人"
 msgid "Add Cc"
 msgstr "新增副本收件人"
 
-#: html/Ticket/Elements/EditCustomFieldEntries:71 html/Work/Tickets/Elements/ShowCustomFieldEntries:49
+#: html/Ticket/Elements/EditCustomFieldEntries:71 html/Work/Tickets/Elements/ShowCustomFieldEntries:50
 msgid "Add Entry"
 msgstr "新增列"
 
-#: html/Ticket/Create.html:113 html/Ticket/Update.html:98 html/Work/Tickets/Elements/AddAttachments:18
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:98 html/Work/Tickets/Elements/AddAttachments:23
 msgid "Add More Files"
 msgstr "新增更多附件"
 
@@ -585,16 +580,20 @@ msgstr "新增下一项关�"
 msgid "Added principal as a %1 for this queue"
 msgstr "��已新增为此表�的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1462
+#: lib/RT/Ticket_Overlay.pm:1480
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
 msgstr "��已新增为此申请�的 %1"
 
-#: html/Admin/Elements/ModifyUser:75 html/Admin/Users/Modify.html:121 html/User/Prefs.html:87 html/Work/Preferences/Info:76
+#: html/Edit/Global/CustomField/Top:52
+msgid "Additional Hints"
+msgstr "�外�示"
+
+#: html/Admin/Elements/ModifyUser:75 html/Admin/Users/Modify.html:121 html/User/Prefs.html:114 html/Work/Preferences/Info:79
 msgid "Address1"
 msgstr "��"
 
-#: html/Admin/Elements/ModifyUser:77 html/Admin/Users/Modify.html:126 html/User/Prefs.html:89 html/Work/Preferences/Info:78
+#: html/Admin/Elements/ModifyUser:77 html/Admin/Users/Modify.html:126 html/User/Prefs.html:118 html/Work/Preferences/Info:81
 msgid "Address2"
 msgstr "��(续)"
 
@@ -602,7 +601,7 @@ msgstr "��(续)"
 msgid "Adjust Blinking Rate"
 msgstr "调整闪�速度快慢"
 
-#: html/Edit/Groups/Admin:9
+#: html/Edit/Queues/List:12
 msgid "Admin"
 msgstr "管�员"
 
@@ -610,11 +609,11 @@ msgstr "管�员"
 msgid "Admin Cc"
 msgstr "管�员副本"
 
-#: etc/initialdata:303
+#: etc/initialdata:280
 msgid "Admin Comment"
 msgstr "管�员评论"
 
-#: etc/initialdata:261
+#: etc/initialdata:259
 msgid "Admin Correspondence"
 msgstr "管�员回�"
 
@@ -642,7 +641,7 @@ msgstr "管�/群组"
 msgid "Admin/Queue/Basics"
 msgstr "管�/表�/基本信�"
 
-#: html/Edit/Global/Basic/Top:60
+#: html/Edit/Global/Basic/Top:65
 msgid "AdminAddress"
 msgstr "管�员 Email"
 
@@ -650,7 +649,7 @@ msgstr "管�员 Email"
 msgid "AdminAllPersonalGroups"
 msgstr "管�所有代�人群组"
 
-#: etc/initialdata:74 html/Admin/Elements/ModifyTemplateAsWorkflow:155 html/Ticket/Elements/ShowPeople:38 html/Ticket/Update.html:49 lib/RT/ACE_Overlay.pm:88
+#: etc/initialdata:56 html/Admin/Elements/ModifyTemplateAsWorkflow:155 html/Ticket/Elements/ShowPeople:38 html/Ticket/Update.html:49 html/Work/Tickets/Elements/ShowLinks:11 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
 msgstr "管�员副本"
 
@@ -666,7 +665,7 @@ msgstr "管�员回�"
 msgid "AdminCustomFields"
 msgstr "管�自订字段"
 
-#: html/Edit/Groups/Admin:12 lib/RT/Group_Overlay.pm:145
+#: lib/RT/Group_Overlay.pm:145
 msgid "AdminGroup"
 msgstr "管�群组"
 
@@ -706,7 +705,7 @@ msgstr "管�使用者"
 msgid "Administrative"
 msgstr "行政类"
 
-#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53 html/Work/Tickets/Elements/EditPeople:44
 msgid "Administrative Cc"
 msgstr "管�员副本"
 
@@ -726,7 +725,7 @@ msgstr "晚于"
 msgid "Age"
 msgstr "�历时间"
 
-#: html/Admin/Elements/ModifyTemplateAsWorkflow:172 html/Edit/Global/Workflow/Action:39
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:172 html/Edit/Global/Workflow/Action:35
 msgid "Alias"
 msgstr "执行其它�程"
 
@@ -734,11 +733,11 @@ msgstr "执行其它�程"
 msgid "Alias for"
 msgstr "相当于"
 
-#: html/Edit/Queues/index.html:33 html/Work/Delegates/index.html:13 html/Work/Elements/SelectSearch:11 html/Work/Queues/Select.html:14 html/Work/Queues/index.html:13
+#: html/Work/Delegates/index.html:13 html/Work/Elements/SelectSearch:11 html/Work/Queues/Select.html:14 html/Work/Queues/index.html:13
 msgid "All"
 msgstr "全部"
 
-#: etc/initialdata:372
+#: etc/initialdata:348
 msgid "All Approvals Passed"
 msgstr "完�全部签核"
 
@@ -746,7 +745,7 @@ msgstr "完�全部签核"
 msgid "All Condition"
 msgstr "所有�件"
 
-#: html/Admin/Elements/EditCustomFields:95
+#: html/Admin/Elements/EditCustomFields:94
 msgid "All Custom Fields"
 msgstr "所有自订字段"
 
@@ -758,6 +757,10 @@ msgstr "所有表�"
 msgid "All Users"
 msgstr "全体员工"
 
+#: NOT FOUND IN SOURCE
+msgid "All done!  Now you can proceed to %1."
+msgstr "处�完毕�您现在�以继续进行 %1。"
+
 #: NOT FOUND IN SOURCE
 msgid "Allowance Request"
 msgstr "�利补助申请"
@@ -774,7 +777,7 @@ msgstr "数�"
 msgid "Any Condition"
 msgstr "任��件"
 
-#: html/Edit/Global/Scrip/List:10 html/Edit/Global/Scrip/Top:74
+#: html/Edit/Global/Scrip/List:10 html/Edit/Global/Scrip/Top:86
 msgid "Apply Template"
 msgstr "引用模�"
 
@@ -811,11 +814,11 @@ msgstr "签核时�"
 msgid "Approval Notes"
 msgstr "签核��"
 
-#: etc/initialdata:357
+#: etc/initialdata:336
 msgid "Approval Passed"
 msgstr "完��项签核"
 
-#: etc/initialdata:383
+#: etc/initialdata:359
 msgid "Approval Rejected"
 msgstr "驳回�项签核"
 
@@ -843,11 +846,11 @@ msgstr "核准"
 msgid "Approver"
 msgstr "签核人"
 
-#: html/Edit/Global/Workflow/Action:29 html/Edit/Global/Workflow/Owner.html:10
+#: html/Edit/Global/Workflow/Action:25 html/Edit/Global/Workflow/Owner.html:10
 msgid "Approver Setting"
 msgstr "执行签核人设定"
 
-#: etc/initialdata:516 etc/upgrade/2.1.71:148 html/Edit/Elements/CreateApprovalsQueue:122
+#: etc/initialdata:486 etc/upgrade/2.1.71:148 html/Edit/Elements/CreateApprovalsQueue:122
 msgid "Approver's notes: %1"
 msgstr "签核备注：%1"
 
@@ -871,15 +874,15 @@ msgstr "您确定�删除？"
 msgid "Ascending"
 msgstr "递增"
 
-#: html/Search/Bulk.html:136 html/SelfService/Update.html:32 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:98 html/Work/Search/Bulk.html:88
+#: html/Search/Bulk.html:136 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:98 html/Work/Search/Bulk.html:88
 msgid "Attach"
 msgstr "附件"
 
-#: html/SelfService/Create.html:64 html/Ticket/Create.html:109 html/Work/Tickets/Elements/AddAttachments:15
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109 html/Work/Tickets/Elements/AddAttachments:19
 msgid "Attach file"
 msgstr "附加档案"
 
-#: html/Ticket/Create.html:97 html/Ticket/Update.html:87 html/Work/Tickets/Elements/AddAttachments:6
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:87 html/Work/Tickets/Elements/AddAttachments:7 html/Work/Tickets/Elements/ShowAttachments:9
 msgid "Attached file"
 msgstr "现有附件"
 
@@ -887,15 +890,15 @@ msgstr "现有附件"
 msgid "Attachment '%1' could not be loaded"
 msgstr "无法加载附件 '%1'"
 
-#: lib/RT/Transaction_Overlay.pm:441
+#: lib/RT/Transaction_Overlay.pm:390 lib/RT/Transaction_Vendor.pm:50
 msgid "Attachment created"
 msgstr "附件新增完毕"
 
-#: lib/RT/Tickets_Overlay.pm:1189
+#: lib/RT/Tickets_Overlay.pm:1208
 msgid "Attachment filename"
 msgstr "附件档�"
 
-#: html/Ticket/Elements/ShowAttachments:25 html/Work/Tickets/Elements/ShowTransaction:32
+#: html/Ticket/Elements/ShowAttachments:25 html/Work/Tickets/Elements/ShowTransaction:37
 msgid "Attachments"
 msgstr "附件"
 
@@ -923,11 +926,11 @@ msgstr "自动驳回表�"
 msgid "AutoResolve"
 msgstr "自动完�表�处�"
 
-#: etc/initialdata:224
+#: etc/initialdata:206
 msgid "Autoreply"
 msgstr "自动回�"
 
-#: etc/initialdata:90
+#: etc/initialdata:72
 msgid "Autoreply To Requestors"
 msgstr "自动对申请人回�"
 
@@ -935,7 +938,7 @@ msgstr "自动对申请人回�"
 msgid "AutoreplyToRequestors"
 msgstr "自动对申请人回�"
 
-#: html/Edit/Rights/index.html:16
+#: html/Edit/Rights/index.html:17
 msgid "Available Rights:"
 msgstr "��项目列表："
 
@@ -964,19 +967,19 @@ msgstr "%1 的数�错误"
 msgid "Bad transaction number for attachment. %1 should be %2\\n"
 msgstr "附件的处���错误。%1 应为 %2\\n"
 
-#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Edit/Global/autohandler:6 html/Edit/Queues/autohandler:17 html/Edit/Users/index.html:121 html/Ticket/Elements/Tabs:89 html/User/Elements/GroupTabs:37
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Edit/Global/autohandler:6 html/Edit/Queues/autohandler:21 html/Edit/Users/index.html:94 html/Ticket/Elements/Tabs:89 html/User/Elements/GroupTabs:37
 msgid "Basics"
 msgstr "基本信�"
 
-#: html/Ticket/Update.html:81 html/Work/Tickets/Update.html:49
+#: html/Ticket/Update.html:81 html/Work/Tickets/Update.html:53
 msgid "Bcc"
 msgstr "密件副本"
 
-#: html/Admin/Elements/EditScrip:87 html/Admin/Global/GroupRights.html:84 html/Admin/Global/Template.html:45 html/Admin/Global/UserRights.html:53 html/Admin/Global/Workflow.html:46 html/Admin/Groups/GroupRights.html:72 html/Admin/Groups/Members.html:80 html/Admin/Groups/Modify.html:55 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:44 html/Admin/Queues/UserRights.html:53 html/Admin/Queues/Workflow.html:44 html/User/Groups/Modify.html:55
+#: html/Admin/Elements/EditScrip:95 html/Admin/Global/GroupRights.html:84 html/Admin/Global/Template.html:45 html/Admin/Global/UserRights.html:53 html/Admin/Global/Workflow.html:46 html/Admin/Groups/GroupRights.html:72 html/Admin/Groups/Members.html:80 html/Admin/Groups/Modify.html:55 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:44 html/Admin/Queues/UserRights.html:53 html/Admin/Queues/Workflow.html:44 html/User/Groups/Modify.html:55
 msgid "Be sure to save your changes"
 msgstr "请别忘了储存修改。"
 
-#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:321
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:320
 msgid "Before"
 msgstr "早于"
 
@@ -988,11 +991,11 @@ msgstr "开始签核"
 msgid "Begin From "
 msgstr "起始日"
 
-#: html/Edit/Users/Info:25
+#: NOT FOUND IN SOURCE
 msgid "Birthday"
 msgstr "生日"
 
-#: etc/initialdata:220
+#: etc/initialdata:202
 msgid "Blank"
 msgstr "空白模�"
 
@@ -1016,7 +1019,7 @@ msgstr "事业部"
 msgid "Business Unit:"
 msgstr "事业部："
 
-#: lib/RT/User_Overlay.pm:1411
+#: lib/RT/User_Overlay.pm:1529
 msgid "Can not modify system users"
 msgstr "无法更改系统使用者"
 
@@ -1032,11 +1035,11 @@ msgstr "�能新增没有�称的自订字段值"
 msgid "Can't link a ticket to itself"
 msgstr "申请��能链接自己。"
 
-#: lib/RT/Ticket_Overlay.pm:2816
+#: lib/RT/Ticket_Overlay.pm:2857
 msgid "Can't merge into a merged ticket. You should never get this error"
 msgstr "�能整�进已整�过的申请�。这个错误�该�生。"
 
-#: lib/RT/Ticket_Overlay.pm:2634 lib/RT/Ticket_Overlay.pm:2703
+#: lib/RT/Ticket_Overlay.pm:2659 lib/RT/Ticket_Overlay.pm:2738
 msgid "Can't specifiy both base and target"
 msgstr "�能�时指定起始申请�与目的申请�"
 
@@ -1044,7 +1047,7 @@ msgstr "�能�时指定起始申请�与目的申请�"
 msgid "Cancel"
 msgstr "�消"
 
-#: html/autohandler:113
+#: html/autohandler:126
 #. ($msg)
 msgid "Cannot create user: %1"
 msgstr "无法新增使用者：%1"
@@ -1061,7 +1064,7 @@ msgstr "分类管�"
 msgid "Category"
 msgstr "分类"
 
-#: etc/initialdata:68 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:44 html/Ticket/Update.html:76 html/Work/Tickets/Update.html:43 lib/RT/ACE_Overlay.pm:87
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:44 html/Ticket/Update.html:76 html/Work/Tickets/Elements/EditPeople:41 html/Work/Tickets/Elements/ShowLinks:6 html/Work/Tickets/Update.html:43 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
 msgstr "副本"
 
@@ -1081,11 +1084,11 @@ msgstr "修改申请�"
 msgid "Change password"
 msgstr "更改�令"
 
-#: html/Edit/Global/Basic/Top:70
+#: html/Edit/Global/Basic/Top:79
 msgid "ChangeOwnerUI"
 msgstr "��选择表�承办人"
 
-#: html/Ticket/Create.html:100 html/Ticket/Elements/EditCustomFieldEntries:35 html/Ticket/Update.html:90 html/Work/Tickets/Elements/ShowCustomFieldEntries:13
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Elements/EditCustomFieldEntries:35 html/Ticket/Update.html:90 html/Work/Tickets/Elements/ShowCustomFieldEntries:14
 msgid "Check box to delete"
 msgstr "选择欲删除的项目"
 
@@ -1093,11 +1096,11 @@ msgstr "选择欲删除的项目"
 msgid "Check box to revoke right"
 msgstr "选择欲撤消的�利"
 
-#: html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:42 html/Ticket/Elements/EditLinks:130 html/Ticket/Elements/EditLinks:68 html/Ticket/Elements/ShowLinks:56 html/Work/Search/BulkLinks:18
+#: html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42 html/Ticket/Elements/EditLinks:113 html/Ticket/Elements/EditLinks:63 html/Ticket/Elements/ShowLinks:56 html/Work/Search/BulkLinks:18 html/Work/Tickets/Elements/EditLinks:117 html/Work/Tickets/Elements/EditLinks:56 html/Work/Tickets/Elements/ShowMembers:4
 msgid "Children"
 msgstr "�申请�"
 
-#: html/Edit/Elements/PickUsers:21 html/Edit/Global/UserRight/List:8 html/Edit/Global/UserRight/Top:19 html/Edit/Users/List:6 html/Edit/Users/Top:18
+#: html/Edit/Elements/PickUsers:21 html/Edit/Global/UserRight/List:8 html/Edit/Global/UserRight/Top:19
 msgid "Chinese Name"
 msgstr "中文姓�"
 
@@ -1105,11 +1108,15 @@ msgstr "中文姓�"
 msgid "Chinese/English"
 msgstr "中英文"
 
-#: html/Admin/Elements/ModifyUser:79 html/Admin/Users/Modify.html:131 html/User/Prefs.html:91 html/Work/Preferences/Info:80
+#: html/Admin/Elements/ModifyUser:79 html/Admin/Users/Modify.html:131 html/User/Prefs.html:122 html/Work/Preferences/Info:83
 msgid "City"
 msgstr "所在城市"
 
-#: html/Ticket/Elements/ShowDates:46
+#: html/Edit/Elements/104Top:30
+msgid "ClassicUI"
+msgstr "传统接�"
+
+#: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
 msgstr "已解决"
 
@@ -1121,7 +1128,7 @@ msgstr "已解决的申请�"
 msgid "Closed tickets"
 msgstr "已解决的申请�"
 
-#: html/Admin/Elements/ModifyTemplateAsWorkflow:181 html/Edit/Global/Workflow/Action:58 html/Edit/Global/Workflow/Condition:51
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:181 html/Edit/Global/Workflow/Action:54 html/Edit/Global/Workflow/Condition:52
 msgid "Code"
 msgstr "执行程��"
 
@@ -1129,7 +1136,7 @@ msgstr "执行程��"
 msgid "Command not understood!\\n"
 msgstr "指令无法辨识�\\n"
 
-#: html/Ticket/Elements/ShowTransaction:166 html/Ticket/Elements/Tabs:152 html/Work/Search/Bulk.html:89 html/Work/Tickets/Display.html:37 html/Work/Tickets/Elements/ShowTransaction:112 html/Work/Tickets/Elements/ShowTransaction:27
+#: html/Ticket/Elements/ShowTransaction:178 html/Ticket/Elements/Tabs:152 html/Work/Search/Bulk.html:89 html/Work/Tickets/Display.html:60 html/Work/Tickets/Elements/ShowTransaction:118 html/Work/Tickets/Elements/ShowTransaction:32
 msgid "Comment"
 msgstr "评论"
 
@@ -1149,7 +1156,7 @@ msgstr "对申请��出评论"
 msgid "CommentOnTicket"
 msgstr "评论申请�"
 
-#: html/Admin/Elements/ModifyUser:34 html/Work/Tickets/Update.html:59
+#: html/Admin/Elements/ModifyUser:34 html/Work/Tickets/Elements/AddContent:7
 msgid "Comments"
 msgstr "评论"
 
@@ -1166,11 +1173,11 @@ msgstr "评论(��给申请人)"
 msgid "Comments about %1"
 msgstr "对 %1 的评论"
 
-#: html/Admin/Users/Modify.html:184 html/Ticket/Elements/ShowRequestor:43
+#: html/Admin/Users/Modify.html:184 html/Edit/Users/Info:46 html/Ticket/Elements/ShowRequestor:43
 msgid "Comments about this user"
 msgstr "使用者�述"
 
-#: lib/RT/Transaction_Overlay.pm:543
+#: lib/RT/Transaction_Overlay.pm:501
 msgid "Comments added"
 msgstr "新增评论完毕"
 
@@ -1182,10 +1189,14 @@ msgstr "确认"
 msgid "Commit Stubbed"
 msgstr "消除更动完毕"
 
-#: html/Edit/Users/Info:42
+#: NOT FOUND IN SOURCE
 msgid "Company Name"
 msgstr "公��称"
 
+#: html/Edit/Global/Basic/Top:85
+msgid "CompanySpecific"
+msgstr "�公�独立显示"
+
 #: NOT FOUND IN SOURCE
 msgid "Compile Restrictions"
 msgstr "设定查询�件"
@@ -1198,11 +1209,11 @@ msgstr "�件"
 msgid "Condition matches..."
 msgstr "符��件..."
 
-#: lib/RT/Scrip_Overlay.pm:159
+#: lib/RT/Scrip_Overlay.pm:164
 msgid "Condition not found"
 msgstr "未找到符�的现况"
 
-#: html/Edit/Global/GroupRight/Top:26 html/Edit/Global/UserRight/Top:45 html/Edit/Groups/Member:57 html/Elements/Tabs:49
+#: html/Edit/Global/GroupRight/Top:26 html/Edit/Global/UserRight/Top:45 html/Edit/Groups/Member:56 html/Elements/Tabs:49
 msgid "Configuration"
 msgstr "设定"
 
@@ -1214,7 +1225,7 @@ msgstr "确认�令"
 msgid "Confirm Password"
 msgstr "�令确认"
 
-#: html/Work/Approvals/Display.html:25 html/Work/Tickets/Create.html:153 html/Work/Tickets/Create.html:165 html/Work/Tickets/Update.html:81
+#: html/Work/Approvals/Display.html:25 html/Work/Tickets/Create.html:154 html/Work/Tickets/Create.html:168 html/Work/Tickets/Update.html:77
 msgid "Confirm Submit"
 msgstr "确定�出"
 
@@ -1238,7 +1249,7 @@ msgstr "内容"
 msgid "Coould not create group"
 msgstr "无法新增群组"
 
-#: html/Edit/Elements/104Buttons:74
+#: html/Edit/Elements/104Buttons:85
 msgid "Copy"
 msgstr "�制"
 
@@ -1246,7 +1257,7 @@ msgstr "�制"
 msgid "Copy Field From:"
 msgstr "欲�制字段："
 
-#: etc/initialdata:282
+#: etc/initialdata:271
 msgid "Correspondence"
 msgstr "回�"
 
@@ -1254,7 +1265,7 @@ msgstr "回�"
 msgid "Correspondence Address"
 msgstr "申请�回�地�"
 
-#: lib/RT/Transaction_Overlay.pm:539
+#: lib/RT/Transaction_Overlay.pm:497
 msgid "Correspondence added"
 msgstr "新增申请�回�"
 
@@ -1262,7 +1273,7 @@ msgstr "新增申请�回�"
 msgid "Correspondence not recorded"
 msgstr "未纪录申请�回�"
 
-#: lib/RT/Ticket_Overlay.pm:3561
+#: lib/RT/Ticket_Overlay.pm:3608
 msgid "Could not add new custom field value for ticket. "
 msgstr "�能新增自订字段的值 "
 
@@ -1270,11 +1281,11 @@ msgstr "�能新增自订字段的值 "
 msgid "Could not add new custom field value for ticket. %1 "
 msgstr "�能新增自订字段的值。%1 "
 
-#: lib/RT/Ticket_Overlay.pm:3067 lib/RT/Ticket_Overlay.pm:3075 lib/RT/Ticket_Overlay.pm:3092
+#: lib/RT/Ticket_Overlay.pm:3108 lib/RT/Ticket_Overlay.pm:3116 lib/RT/Ticket_Overlay.pm:3133
 msgid "Could not change owner. "
 msgstr "�能更改承办人。 "
 
-#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:165 html/Edit/Global/CustomField/index.html:117
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164 html/Edit/Global/CustomField/index.html:120
 #. ($msg)
 msgid "Could not create CustomField"
 msgstr "无法新增自订字段"
@@ -1289,20 +1300,25 @@ msgstr "无法建立讯�通知"
 msgid "Could not create Template"
 msgstr "无法建立通知模�"
 
-#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:473 lib/RT/Group_Overlay.pm:480
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:471 lib/RT/Group_Overlay.pm:478
 msgid "Could not create group"
 msgstr "无法新增群组"
 
+#: html/Edit/Elements/Index:89
+#. ($msg)
+msgid "Could not create item"
+msgstr "无法新增项目"
+
 #: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
 #. ($msg)
 msgid "Could not create template: %1"
 msgstr "无法新增模�：%1"
 
-#: lib/RT/Ticket_Overlay.pm:1081 lib/RT/Ticket_Overlay.pm:334
+#: lib/RT/Ticket_Overlay.pm:1118 lib/RT/Ticket_Overlay.pm:353
 msgid "Could not create ticket. Queue not set"
 msgstr "无法新增申请�。尚未指定表�。"
 
-#: lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:481
+#: lib/RT/User_Overlay.pm:271 lib/RT/User_Overlay.pm:284 lib/RT/User_Overlay.pm:302 lib/RT/User_Overlay.pm:488
 msgid "Could not create user"
 msgstr "无法新增使用者"
 
@@ -1323,11 +1339,11 @@ msgstr "找�到编� %1 的申请�"
 msgid "Could not find group %1."
 msgstr "找�到群组 %1。"
 
-#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1430
+#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1448
 msgid "Could not find or create that user"
 msgstr "找�到或无法新增该�使用者"
 
-#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1509
+#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1527
 msgid "Could not find that principal"
 msgstr "找�到该��"
 
@@ -1335,8 +1351,7 @@ msgstr "找�到该��"
 msgid "Could not find user %1."
 msgstr "找�到使用者 %1。"
 
-#: html/Admin/Groups/Members.html:87 html/Edit/Users/index.html:83 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
-#. ( . $GroupId)
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
 msgid "Could not load group"
 msgstr "无法加载群组"
 
@@ -1345,7 +1360,7 @@ msgstr "无法加载群组"
 msgid "Could not make that principal a %1 for this queue"
 msgstr "无法将该��设为此表�的 %1。"
 
-#: lib/RT/Ticket_Overlay.pm:1451
+#: lib/RT/Ticket_Overlay.pm:1469
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
 msgstr "无法将该��设为此申请�的 %1。"
@@ -1355,16 +1370,16 @@ msgstr "无法将该��设为此申请�的 %1。"
 msgid "Could not remove that principal as a %1 for this queue"
 msgstr "无法将�� %1 从表�移除。"
 
-#: lib/RT/Ticket_Overlay.pm:1567
+#: lib/RT/Ticket_Overlay.pm:1585
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this ticket"
 msgstr "无法将�� %1 从申请�移除。"
 
-#: lib/RT/Group_Overlay.pm:984
+#: lib/RT/Group_Overlay.pm:982
 msgid "Couldn't add member to group"
 msgstr "无法新增�员至群组"
 
-#: lib/RT/Ticket_Overlay.pm:3571 lib/RT/Ticket_Overlay.pm:3627
+#: lib/RT/Ticket_Overlay.pm:3618 lib/RT/Ticket_Overlay.pm:3674
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
 msgstr "无法新增更动报告"
@@ -1377,11 +1392,11 @@ msgstr "无法从 gpg 回函辨识出该采�的行动\\n"
 msgid "Couldn't find group\\n"
 msgstr "找�到群组\\n"
 
-#: lib/RT/Interface/Web.pm:902
+#: lib/RT/Interface/Web.pm:962
 msgid "Couldn't find row"
 msgstr "找�到此列数�"
 
-#: lib/RT/Group_Overlay.pm:958
+#: lib/RT/Group_Overlay.pm:956
 msgid "Couldn't find that principal"
 msgstr "找�到该��"
 
@@ -1414,9 +1429,10 @@ msgstr "无法加载 RT 设定档 '%1' %2"
 msgid "Couldn't load Scrips."
 msgstr "无法加载手续。"
 
-#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74 html/Edit/Global/GroupRight/Add.html:54 html/Edit/Global/UserRight/Add.html:23 html/Edit/Groups/Member:121 html/Edit/Groups/Members/Add.html:44 html/Edit/Rights/index.html:57
-#. ($Group)
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74 html/Edit/Global/GroupRight/Add.html:55 html/Edit/Global/GroupRight/Add.html:60 html/Edit/Global/UserRight/Add.html:25 html/Edit/Global/UserRight/Add.html:30 html/Edit/Groups/Member:120 html/Edit/Groups/Members/Add.html:43 html/Edit/Rights/index.html:58 html/Edit/Rights/index.html:63
 #. ($ObjectGroup)
+#. ($Report)
+#. ($Group)
 #. ($id)
 msgid "Couldn't load group %1"
 msgstr "无法加载手续 %1"
@@ -1425,12 +1441,12 @@ msgstr "无法加载手续 %1"
 msgid "Couldn't load link"
 msgstr "无法加载链接。"
 
-#: html/Admin/Elements/EditCustomFields:146 html/Admin/Queues/People.html:120
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
 #. ($id)
 msgid "Couldn't load queue"
 msgstr "无法加载表�"
 
-#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71 html/Edit/Global/GroupRight/Add.html:50 html/Edit/Global/GroupRight/index.html:81 html/Edit/Global/UserRight/Add.html:19 html/Edit/Global/UserRight/index.html:83 html/Edit/Rights/index.html:53
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71 html/Edit/Global/GroupRight/Add.html:51 html/Edit/Global/GroupRight/index.html:82 html/Edit/Global/GroupRight/index.html:87 html/Edit/Global/UserRight/Add.html:21 html/Edit/Global/UserRight/index.html:83 html/Edit/Global/UserRight/index.html:88 html/Edit/Rights/index.html:54
 #. ($Queue)
 #. ($id)
 msgid "Couldn't load queue %1"
@@ -1449,16 +1465,16 @@ msgstr "无法加载模�"
 msgid "Couldn't load that user (%1)"
 msgstr "无法加载该�使用者(%1)"
 
-#: html/SelfService/Display.html:108
+#: html/SelfService/Display.html:114
 #. ($id)
 msgid "Couldn't load ticket '%1'"
 msgstr "无法加载申请� '%1'"
 
-#: html/Admin/Elements/ModifyUser:85 html/Admin/Users/Modify.html:148 html/User/Prefs.html:97 html/Work/Preferences/Info:86
+#: html/Admin/Elements/ModifyUser:85 html/Admin/Users/Modify.html:148 html/User/Prefs.html:134 html/Work/Preferences/Info:89
 msgid "Country"
 msgstr "国家"
 
-#: html/Admin/Elements/CreateUserCalled:25 html/Edit/Elements/PopHeader:29 html/Edit/Global/GroupRight/Add.html:18 html/Ticket/Create.html:134 html/Ticket/Create.html:194
+#: html/Admin/Elements/CreateUserCalled:25 html/Edit/Elements/PopHeader:33 html/Edit/Global/GroupRight/Add.html:19 html/Ticket/Create.html:134 html/Ticket/Create.html:195
 msgid "Create"
 msgstr "新增"
 
@@ -1466,7 +1482,7 @@ msgstr "新增"
 msgid "Create Subgroup:"
 msgstr "新增�群组："
 
-#: etc/initialdata:145
+#: etc/initialdata:127
 msgid "Create Tickets"
 msgstr "新增申请�"
 
@@ -1523,7 +1539,7 @@ msgstr "新增模�"
 msgid "Create a new ticket"
 msgstr "新增申请�"
 
-#: html/Admin/Users/Modify.html:213 html/Admin/Users/Modify.html:240
+#: html/Admin/Users/Modify.html:213 html/Admin/Users/Modify.html:242
 msgid "Create a new user"
 msgstr "新增使用者"
 
@@ -1572,7 +1588,7 @@ msgstr "新增失败：%1/%2/%3"
 msgid "Create new item"
 msgstr "建立新项目"
 
-#: etc/initialdata:147
+#: etc/initialdata:129
 msgid "Create new tickets based on this scrip's template"
 msgstr "��此项手续内的模版，新增申请�"
 
@@ -1608,7 +1624,7 @@ msgstr "新增�删除�更改使用者"
 msgid "CreateTicket"
 msgstr "新增申请�"
 
-#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:26 lib/RT/Ticket_Overlay.pm:1175
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1212
 msgid "Created"
 msgstr "新增日"
 
@@ -1642,11 +1658,11 @@ msgstr "现有自订字段"
 msgid "Current Groups:"
 msgstr "现有群组列表："
 
-#: html/Ticket/Elements/EditLinks:27
+#: html/Ticket/Elements/EditLinks:27 html/Work/Tickets/Elements/EditLinks:10
 msgid "Current Relationships"
 msgstr "现有关系"
 
-#: html/Edit/Rights/index.html:19
+#: html/Edit/Rights/index.html:20
 msgid "Current Rights:"
 msgstr "现有��："
 
@@ -1654,7 +1670,7 @@ msgstr "现有��："
 msgid "Current Scrips"
 msgstr "现有手续"
 
-#: html/Work/Tickets/Create.html:48 html/Work/Tickets/Elements/ShowBasics:39
+#: html/Work/Tickets/Create.html:49 html/Work/Tickets/Elements/ShowBasics:47
 msgid "Current Status"
 msgstr "目�状�"
 
@@ -1662,6 +1678,10 @@ msgstr "目�状�"
 msgid "Current Templates"
 msgstr "现有模�"
 
+#: html/Work/Tickets/Elements/EditPeople:9
+msgid "Current Watchers"
+msgstr "现有视察员"
+
 #: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
 msgid "Current members"
 msgstr "现有�员"
@@ -1674,7 +1694,7 @@ msgstr "现有��"
 msgid "Current search criteria"
 msgstr "现有查询�件"
 
-#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44 html/Work/Tickets/Elements/EditPeople:32
 msgid "Current watchers"
 msgstr "现有视察员"
 
@@ -1683,7 +1703,7 @@ msgstr "现有视察员"
 msgid "Custom Field #%1"
 msgstr "自订字段 #%1"
 
-#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Edit/Global/autohandler:7 html/Edit/Queues/autohandler:18 html/Ticket/Elements/ShowSummary:35
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Edit/Global/autohandler:7 html/Edit/Queues/autohandler:22 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
 msgstr "自订字段"
 
@@ -1703,31 +1723,31 @@ msgstr "动作�执行程�"
 msgid "Custom condition"
 msgstr "自订�件"
 
-#: lib/RT/Tickets_Overlay.pm:1618
+#: lib/RT/Tickets_Overlay.pm:1637
 #. ($CF->Name , $args{OPERATOR} , $args{VALUE})
 msgid "Custom field %1 %2 %3"
 msgstr "自订字段 %1 %2 %3"
 
-#: lib/RT/Tickets_Overlay.pm:1613
+#: lib/RT/Tickets_Overlay.pm:1632
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
 msgstr "自订字段 %1 已有值"
 
-#: lib/RT/Tickets_Overlay.pm:1610
+#: lib/RT/Tickets_Overlay.pm:1629
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
 msgstr "自订字段 %1 没有值"
 
-#: lib/RT/Ticket_Overlay.pm:3463
+#: lib/RT/Ticket_Overlay.pm:3510
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
 msgstr "找�到自订字段 %1"
 
-#: html/Admin/Elements/EditCustomFields:196
+#: html/Admin/Elements/EditCustomFields:195
 msgid "Custom field deleted"
 msgstr "自订字段已删除"
 
-#: lib/RT/Ticket_Overlay.pm:3613
+#: lib/RT/Ticket_Overlay.pm:3660
 msgid "Custom field not found"
 msgstr "找�到自订字段"
 
@@ -1752,7 +1772,7 @@ msgstr "找�到自订字段值"
 msgid "Custom field value deleted"
 msgstr "自订字段值删除�功"
 
-#: html/Admin/Elements/ModifyTemplateAsWorkflow:145 html/Edit/Global/Workflow/Owner.html:90 lib/RT/Transaction_Overlay.pm:548
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:145 html/Edit/Global/Workflow/Owner.html:90 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Vendor.pm:5
 msgid "CustomField"
 msgstr "自订字段"
 
@@ -1760,11 +1780,19 @@ msgstr "自订字段"
 msgid "Data error"
 msgstr "数�错误"
 
+#: html/Edit/Global/Basic/Top:77
+msgid "DatabaseBindRemote"
+msgstr "容许外部�机"
+
+#: html/Edit/Global/Basic/Top:75
+msgid "DatabaseName"
+msgstr "MySQL数�库"
+
 #: NOT FOUND IN SOURCE
 msgid "Date of Departure"
 msgstr "出�日期"
 
-#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:92 html/Ticket/ModifyAll.html:43 html/Work/Tickets/Elements/ShowTransaction:14
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:92 html/Ticket/ModifyAll.html:43 html/Work/Tickets/Elements/ShowTransaction:17
 msgid "Dates"
 msgstr "日期"
 
@@ -1780,35 +1808,47 @@ msgstr "12"
 msgid "December"
 msgstr "�二月"
 
+#: NOT FOUND IN SOURCE
+msgid "Default Approval"
+msgstr "预设签核"
+
 #: NOT FOUND IN SOURCE
 msgid "Default Autoresponse Template"
 msgstr "预设自动�应模�"
 
-#: etc/initialdata:225
+#: etc/initialdata:207
 msgid "Default Autoresponse template"
 msgstr "预设自动�应模�"
 
-#: etc/initialdata:304
+#: html/Edit/Global/CustomField/Top:46
+msgid "Default Value"
+msgstr "预设值"
+
+#: etc/initialdata:281
 msgid "Default admin comment template"
 msgstr "预设管�员评论模�"
 
-#: etc/initialdata:262
+#: etc/initialdata:260
 msgid "Default admin correspondence template"
 msgstr "预设管�员回�模�"
 
-#: etc/initialdata:283
+#: etc/initialdata:272
 msgid "Default correspondence template"
 msgstr "预设回�模�"
 
-#: etc/initialdata:240
+#: etc/initialdata:238
 msgid "Default transaction template"
 msgstr "预设更动模�"
 
-#: lib/RT/Transaction_Overlay.pm:643
+#: lib/RT/Transaction_Overlay.pm:491
 #. ($type, $self->Field, $self->OldValue, $self->NewValue)
 msgid "Default: %1/%2 changed from %3 to %4"
 msgstr "预设：%1/%2 已自 %3 改为 %4"
 
+#: NOT FOUND IN SOURCE
+msgid "DefaultApproval"
+msgstr "预设签核"
+
 #: html/User/Delegation.html:24 html/User/Delegation.html:27
 msgid "Delegate rights"
 msgstr "代表团��"
@@ -1837,7 +1877,7 @@ msgstr "代�表�："
 msgid "Delegated Type"
 msgstr "代�表��类"
 
-#: html/Edit/Users/index.html:125 html/Work/Delegates/Info:31 html/Work/Delegates/List:8 html/Work/Elements/Tab:39 html/Work/Overview/Info:28
+#: html/Edit/Users/index.html:98 html/Work/Delegates/Info:31 html/Work/Delegates/List:8 html/Work/Elements/Tab:41 html/Work/Overview/Info:28
 msgid "Delegates"
 msgstr "代�人"
 
@@ -1881,10 +1921,14 @@ msgstr "代�人群组"
 msgid "Delegation Rights"
 msgstr "代�人��"
 
-#: html/Admin/Elements/ModifyTemplateAsWorkflow:113 html/Edit/Elements/104Buttons:73 html/Work/Search/index.html:48 html/Work/Search/index.html:48
+#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ModifyTemplateAsWorkflow:113 html/Edit/Elements/104Buttons:84 html/Work/Search/index.html:48 html/Work/Search/index.html:48
 msgid "Delete"
 msgstr "删除"
 
+#: html/Admin/Elements/EditScrips:52
+msgid "Delete selected scrips"
+msgstr "删除指定的手续"
+
 #: lib/RT/Queue_Overlay.pm:88
 msgid "Delete tickets"
 msgstr "删除申请�"
@@ -1893,7 +1937,7 @@ msgstr "删除申请�"
 msgid "DeleteTicket"
 msgstr "删除申请�"
 
-#: lib/RT/Transaction_Overlay.pm:187
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Deleting this object could break referential integrity"
 msgstr "删除此对象�能破��考完整性"
 
@@ -1901,7 +1945,7 @@ msgstr "删除此对象�能破��考完整性"
 msgid "Deleting this object would break referential integrity"
 msgstr "删除此对象�能破��考完整性"
 
-#: lib/RT/User_Overlay.pm:497
+#: lib/RT/User_Overlay.pm:504
 msgid "Deleting this object would violate referential integrity"
 msgstr "删除此对象会���考完整性"
 
@@ -1921,11 +1965,11 @@ msgstr "驳回"
 msgid "Department"
 msgstr "部门"
 
-#: html/Edit/Global/UserRight/List:12 html/Edit/Global/UserRight/Top:13 html/Edit/Users/List:10 html/Edit/Users/Top:12
+#: html/Edit/Global/UserRight/List:12 html/Edit/Global/UserRight/Top:13
 msgid "Department ID"
 msgstr "部门代�"
 
-#: html/Edit/Global/UserRight/List:11 html/Edit/Global/UserRight/Top:49 html/Edit/Users/List:9 html/Edit/Users/Top:48 html/Work/Delegates/Info:78 html/Work/Overview/Info:60
+#: html/Edit/Global/UserRight/List:11 html/Edit/Global/UserRight/Top:49 html/Work/Delegates/Info:78 html/Work/Overview/Info:60
 msgid "Department Name"
 msgstr "部门�称"
 
@@ -1949,7 +1993,7 @@ msgstr "请��"
 msgid "Departure Until"
 msgstr "差旅截止日"
 
-#: html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/EditLinks:122 html/Ticket/Elements/EditLinks:46 html/Ticket/Elements/ShowDependencies:31 html/Ticket/Elements/ShowLinks:36 html/Work/Search/BulkLinks:10
+#: html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/EditLinks:105 html/Ticket/Elements/EditLinks:44 html/Ticket/Elements/ShowDependencies:31 html/Ticket/Elements/ShowLinks:36 html/Work/Search/BulkLinks:10 html/Work/Tickets/Elements/EditLinks:109 html/Work/Tickets/Elements/EditLinks:34 html/Work/Tickets/Elements/ShowLinks:21
 msgid "Depended on by"
 msgstr "�接续处�的申请�"
 
@@ -1957,7 +2001,27 @@ msgstr "�接续处�的申请�"
 msgid "Dependencies: \\n"
 msgstr "附属性：\\n"
 
-#: html/Elements/SelectLinkType:26 html/Ticket/Create.html:179 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/EditLinks:118 html/Ticket/Elements/EditLinks:35 html/Ticket/Elements/ShowDependencies:24 html/Ticket/Elements/ShowLinks:26 html/Work/Search/BulkLinks:6
+#: lib/RT/Transaction_Overlay.pm:585
+#. ($value)
+msgid "Dependency by %1 added"
+msgstr "已加入�接续处�的申请� %1"
+
+#: lib/RT/Transaction_Overlay.pm:622
+#. ($value)
+msgid "Dependency by %1 deleted"
+msgstr "已移除�接续处�的申请� %1"
+
+#: lib/RT/Transaction_Overlay.pm:582
+#. ($value)
+msgid "Dependency on %1 added"
+msgstr "已加入需先处�的申请� %1"
+
+#: lib/RT/Transaction_Overlay.pm:619
+#. ($value)
+msgid "Dependency on %1 deleted"
+msgstr "已移除需先处�的申请� %1"
+
+#: html/Elements/SelectLinkType:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/EditLinks:101 html/Ticket/Elements/EditLinks:35 html/Ticket/Elements/ShowDependencies:24 html/Ticket/Elements/ShowLinks:26 html/Work/Search/BulkLinks:6 html/Work/Tickets/Elements/EditLinks:105 html/Work/Tickets/Elements/EditLinks:23 html/Work/Tickets/Elements/ShowLinks:16
 msgid "Depends on"
 msgstr "需先处�"
 
@@ -1973,7 +2037,7 @@ msgstr "递�"
 msgid "Describe the issue below"
 msgstr "在以下字段�述主题"
 
-#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:33 html/Admin/Elements/ModifyQueue:35 html/Admin/Elements/ModifyTemplate:35 html/Admin/Elements/ModifyTemplateAsWorkflow:192 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Edit/Global/Workflow/Action:14 html/Elements/SelectGroups:26 html/User/Groups/Modify.html:48 html/Work/Preferences/Info:98
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:33 html/Admin/Elements/ModifyQueue:35 html/Admin/Elements/ModifyTemplate:35 html/Admin/Elements/ModifyTemplateAsWorkflow:192 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Edit/Elements/SelectQueues:4 html/Edit/Global/Workflow/Action:13 html/Elements/SelectGroups:26 html/User/Groups/Modify.html:48
 msgid "Description"
 msgstr "�述"
 
@@ -1985,7 +2049,7 @@ msgstr "�办业务说明"
 msgid "Description:"
 msgstr "�述："
 
-#: html/Work/Tickets/Create.html:108 html/Work/Tickets/Elements/EditCustomFields:39 html/Work/Tickets/Elements/ShowCustomFields:41
+#: html/Work/Tickets/Create.html:132 html/Work/Tickets/Create.html:84 html/Work/Tickets/Elements/EditCustomFields:13 html/Work/Tickets/Elements/EditCustomFields:61 html/Work/Tickets/Elements/ShowCustomFields:14 html/Work/Tickets/Elements/ShowCustomFields:53
 msgid "Details"
 msgstr "细节"
 
@@ -1993,15 +2057,15 @@ msgstr "细节"
 msgid "Direct"
 msgstr "直接"
 
-#: html/Edit/Users/Info:31
+#: NOT FOUND IN SOURCE
 msgid "Disability"
 msgstr "残障身分"
 
-#: html/Edit/Users/Info:29
+#: NOT FOUND IN SOURCE
 msgid "Disability Type"
 msgstr "残障类别"
 
-#: html/Edit/Global/GroupRight/List:9 html/Edit/Global/GroupRight/Top:16 html/Edit/Groups/List:11 html/Edit/Groups/Top:19 html/Edit/Queues/Basic/Top:70 html/Edit/Queues/List:13 html/Work/Delegates/Info:48 html/Work/Delegates/Info:53 html/Work/Delegates/List:12 html/Work/Overview/Info:42
+#: html/Edit/Global/GroupRight/List:9 html/Edit/Global/GroupRight/Top:16 html/Edit/Groups/List:11 html/Edit/Groups/Top:19 html/Edit/Queues/Basic/Top:69 html/Edit/Queues/List:15 html/Edit/Queues/List:27 html/Work/Delegates/Info:48 html/Work/Delegates/Info:53 html/Work/Delegates/List:12 html/Work/Overview/Info:42
 msgid "Disabled"
 msgstr "�用"
 
@@ -2037,7 +2101,7 @@ msgstr "�许一切�作"
 msgid "Don't refresh this page."
 msgstr "�更新此页�。"
 
-#: html/Search/Elements/PickRestriction:113 html/Work/Search/PickRestriction:95
+#: html/Search/Elements/PickRestriction:113 html/Work/Search/PickRestriction:101
 msgid "Don't show search results"
 msgstr "�显示查询结果"
 
@@ -2045,7 +2109,7 @@ msgstr "�显示查询结果"
 msgid "Down"
 msgstr "下一页"
 
-#: html/Ticket/Elements/ShowTransaction:92
+#: html/Ticket/Elements/ShowTransaction:103
 msgid "Download"
 msgstr "下载"
 
@@ -2053,7 +2117,7 @@ msgstr "下载"
 msgid "Dr."
 msgstr "�士"
 
-#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:42 lib/RT/Ticket_Overlay.pm:1179
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 html/Work/Tickets/Elements/EditBasics:54 lib/RT/Ticket_Overlay.pm:1216
 msgid "Due"
 msgstr "到期日"
 
@@ -2070,7 +2134,7 @@ msgstr "无法解读日期 '%1'"
 msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
 msgstr "无法加载申请� '%1'：%2.\\n"
 
-#: html/Work/Tickets/Update.html:46
+#: html/Work/Tickets/Update.html:47
 msgid "Edit"
 msgstr "编辑"
 
@@ -2078,7 +2142,7 @@ msgstr "编辑"
 msgid "Edit Conditions"
 msgstr "编辑�置�件"
 
-#: html/Admin/Queues/CustomFields.html:44
+#: html/Admin/Queues/CustomFields.html:45
 #. ($Queue->Name)
 msgid "Edit Custom Fields for %1"
 msgstr "编辑 %1 的自订字段"
@@ -2172,15 +2236,19 @@ msgstr "最高学历"
 msgid "EffectiveId"
 msgstr "有效编�"
 
-#: lib/RT/Ticket_Overlay.pm:2644 lib/RT/Ticket_Overlay.pm:2712
+#: lib/RT/Ticket_Overlay.pm:2673 lib/RT/Ticket_Overlay.pm:2751
 msgid "Either base or target must be specified"
 msgstr "需�指定起始申请�或目的申请�"
 
-#: html/Admin/Users/Modify.html:52 html/Admin/Users/Prefs.html:45 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:41 html/Work/Delegates/Info:96 html/Work/Overview/Info:78 html/Work/Preferences/Info:16
+#: html/Admin/Users/Modify.html:52 html/Admin/Users/Prefs.html:45 html/Edit/Elements/SelectUsers:4 html/Edit/Users/List:7 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43 html/Work/Delegates/Info:96 html/Work/Overview/Info:78
 msgid "Email"
 msgstr "电�邮件信箱"
 
-#: lib/RT/User_Overlay.pm:247
+#: html/Work/Preferences/Info:16
+msgid "Email Address"
+msgstr "电�邮件信箱"
+
+#: lib/RT/User_Overlay.pm:251
 msgid "Email address in use"
 msgstr "此电�邮件信箱已被使用"
 
@@ -2220,11 +2288,11 @@ msgstr "�用(�消勾选将�用此群组)"
 msgid "Enabled (Unchecking this box disables this queue)"
 msgstr "�用(�消勾选将�用此表�)"
 
-#: html/Admin/Elements/EditCustomFields:98
+#: html/Admin/Elements/EditCustomFields:97
 msgid "Enabled Custom Fields"
 msgstr "已�用的自订字段"
 
-#: html/Edit/Queues/Basic/Top:75 html/Edit/Queues/List:15
+#: html/Edit/Queues/Basic/Top:74 html/Edit/Queues/List:17 html/Edit/Queues/List:29
 msgid "Enabled Date"
 msgstr "�用日期"
 
@@ -2236,16 +2304,16 @@ msgstr "激活日期："
 msgid "Enabled Queues"
 msgstr "已�用的表�"
 
-#: html/Edit/Queues/Basic/Top:66 html/Edit/Queues/List:11
+#: html/Edit/Queues/Basic/Top:65 html/Edit/Queues/List:13 html/Edit/Queues/List:25
 msgid "Enabled Status"
 msgstr "�用状�"
 
-#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:282 html/User/Groups/Modify.html:116
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:284 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
 msgstr "�用状� %1"
 
-#: html/Edit/Users/Info:35
+#: NOT FOUND IN SOURCE
 msgid "End of Trial"
 msgstr "试用期满日"
 
@@ -2265,7 +2333,7 @@ msgstr "输入下列�一或���件，查询用户数�"
 msgid "Enter one value"
 msgstr "键入�一项目"
 
-#: html/Search/Bulk.html:144 html/Ticket/Elements/EditLinks:111 html/Work/Search/Bulk.html:95
+#: html/Search/Bulk.html:144 html/Ticket/Elements/EditLinks:94 html/Work/Search/Bulk.html:95 html/Work/Tickets/Elements/EditLinks:98
 msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
 msgstr "输入申请��链接到的申请�编�或网�。以空白隔开。"
 
@@ -2317,15 +2385,15 @@ msgstr "表�->新增视察员的�数有误"
 msgid "Error in parameters to Queue->DelWatcher"
 msgstr "表�->删除视察员的�数有误"
 
-#: lib/RT/Ticket_Overlay.pm:1364
+#: lib/RT/Ticket_Overlay.pm:1401
 msgid "Error in parameters to Ticket->AddWatcher"
 msgstr "申请�->新增视察员的�数有误"
 
-#: lib/RT/Ticket_Overlay.pm:1540
+#: lib/RT/Ticket_Overlay.pm:1558
 msgid "Error in parameters to Ticket->DelWatcher"
 msgstr "申请�->删除视察员的�数有误"
 
-#: etc/initialdata:38
+#: etc/initialdata:20
 msgid "Everyone"
 msgstr "所有人"
 
@@ -2333,7 +2401,11 @@ msgstr "所有人"
 msgid "Example:"
 msgstr "范例："
 
-#: html/Edit/Elements/104Buttons:77
+#: NOT FOUND IN SOURCE
+msgid "Existing user renamed from %1 to %2"
+msgstr "现有使用者 %1 已改�为 %2"
+
+#: html/Edit/Elements/104Buttons:88
 msgid "Export"
 msgstr "汇出"
 
@@ -2345,31 +2417,31 @@ msgstr "外部认���"
 msgid "ExternalContactInfoId"
 msgstr "外部�络方���"
 
-#: html/Edit/Global/Basic/Top:64
+#: html/Edit/Global/Basic/Top:69
 msgid "ExternalDatabaseDSN"
 msgstr "外部数�库连结字符串"
 
-#: html/Edit/Global/Basic/Top:68
+#: html/Edit/Global/Basic/Top:73
 msgid "ExternalDatabasePass"
 msgstr "外部数�库�令"
 
-#: html/Edit/Global/Basic/Top:66
+#: html/Edit/Global/Basic/Top:71
 msgid "ExternalDatabaseUser"
 msgstr "外部数�库用户"
 
-#: html/Edit/Global/Basic/Top:62
+#: html/Edit/Global/Basic/Top:67
 msgid "ExternalURL"
 msgstr "外部接�网�"
 
-#: html/Admin/Users/Modify.html:72
+#: html/Admin/Users/Modify.html:72 html/Edit/Users/Info:41
 msgid "Extra info"
 msgstr "备注"
 
-#: lib/RT/User_Overlay.pm:361
+#: lib/RT/User_Overlay.pm:368
 msgid "Failed to find 'Privileged' users pseudogroup."
 msgstr "找�到「内部�员�虚拟群组的使用者。"
 
-#: lib/RT/User_Overlay.pm:368
+#: lib/RT/User_Overlay.pm:375
 msgid "Failed to find 'Unprivileged' users pseudogroup"
 msgstr "找�到「�内部�员�虚拟群组的使用者。"
 
@@ -2394,22 +2466,22 @@ msgstr "二月"
 msgid "Female"
 msgstr "女"
 
-#: html/Edit/Global/CustomField/List:5 html/Edit/Global/CustomField/Top:9
-msgid "Field Attribute"
-msgstr "字段属性"
-
 #: html/Edit/Global/CustomField/Info:14
 msgid "Field Content:"
 msgstr "字段内容："
 
-#: html/Edit/Global/CustomField/List:7 html/Edit/Global/CustomField/Top:21
+#: html/Edit/Global/CustomField/List:7 html/Edit/Global/CustomField/Top:20
 msgid "Field Description"
 msgstr "字段�述"
 
-#: html/Edit/Global/CustomField/List:6 html/Edit/Global/CustomField/Top:15
+#: html/Edit/Global/CustomField/List:6 html/Edit/Global/CustomField/Top:14
 msgid "Field Name"
 msgstr "字段�称"
 
+#: html/Edit/Global/CustomField/List:5 html/Edit/Global/CustomField/Top:9
+msgid "Field Type"
+msgstr "字段属性"
+
 #: html/Edit/Elements/PickUsers:52 html/Edit/Users/Add.html:47
 msgid "Filter"
 msgstr "筛选"
@@ -2426,19 +2498,19 @@ msgstr "筛选列表："
 msgid "Fin"
 msgstr "最终"
 
-#: html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:58 lib/RT/Tickets_Overlay.pm:1091
+#: html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:58 html/Work/Tickets/Elements/EditBasics:52 lib/RT/Tickets_Overlay.pm:1110
 msgid "Final Priority"
-msgstr "最低顺�"
+msgstr "最终顺�"
 
-#: lib/RT/Ticket_Overlay.pm:1170
+#: lib/RT/Ticket_Overlay.pm:1207
 msgid "FinalPriority"
-msgstr "最低顺�"
+msgstr "最终顺�"
 
 #: NOT FOUND IN SOURCE
 msgid "Financial Department:"
 msgstr "财务部："
 
-#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33 html/Work/Tickets/Elements/EditPeople:18
 msgid "Find group whose"
 msgstr "寻找群组的"
 
@@ -2446,10 +2518,14 @@ msgstr "寻找群组的"
 msgid "Find new/open tickets"
 msgstr "寻找/开�申请�"
 
-#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Edit/Users/Top:6 html/Ticket/Elements/EditPeople:29 html/Work/Tickets/Elements/EditPeople:14
 msgid "Find people whose"
 msgstr "寻找人员的"
 
+#: html/Edit/Queues/Top:6
+msgid "Find queues whose"
+msgstr "寻找表�的"
+
 #: html/Search/Listing.html:107 html/Work/Search/index.html:88
 msgid "Find tickets"
 msgstr "寻找申请�"
@@ -2474,7 +2550,7 @@ msgstr "一"
 msgid "First-level Admins"
 msgstr "一阶主管"
 
-#: html/Edit/Users/Info:40
+#: NOT FOUND IN SOURCE
 msgid "First-level Users"
 msgstr "一阶主管员工"
 
@@ -2482,17 +2558,17 @@ msgstr "一阶主管员工"
 msgid "Fixed shift"
 msgstr "固定�"
 
-#: docs/design_docs/string-extraction-guide.txt:33
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
 msgid "Foo Bar Baz"
 msgstr "甲 乙 丙"
 
-#: docs/design_docs/string-extraction-guide.txt:24
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
 msgid "Foo!"
 msgstr "甲�"
 
 #: html/Search/Bulk.html:86 html/Work/Search/Bulk.html:55
 msgid "Force change"
-msgstr "强制更新"
+msgstr "强制更�"
 
 #: html/Work/Elements/104Header:89
 msgid "Form Processing"
@@ -2503,7 +2579,7 @@ msgstr "电�表�作业区"
 msgid "Found %quant(%1,ticket)"
 msgstr "找到 %1 张申请�"
 
-#: lib/RT/Interface/Web.pm:904
+#: lib/RT/Interface/Web.pm:964
 msgid "Found Object"
 msgstr "已找到对象"
 
@@ -2559,7 +2635,7 @@ msgstr "完整标头档"
 msgid "Gecos"
 msgstr "登入��"
 
-#: html/Edit/Users/Info:26
+#: NOT FOUND IN SOURCE
 msgid "Gender"
 msgstr "性别"
 
@@ -2567,7 +2643,7 @@ msgstr "性别"
 msgid "Getting the current user from a pgp sig\\n"
 msgstr "�得目�使用者的 pgp 签章\\n"
 
-#: lib/RT/Transaction_Overlay.pm:593
+#: lib/RT/Transaction_Overlay.pm:551
 #. ($New->Name)
 msgid "Given to %1"
 msgstr "交予 %1"
@@ -2576,6 +2652,10 @@ msgstr "交予 %1"
 msgid "Global"
 msgstr "全域设定"
 
+#: NOT FOUND IN SOURCE
+msgid "Global Approval"
+msgstr "全域签核"
+
 #: NOT FOUND IN SOURCE
 msgid "Global Keyword Selections"
 msgstr "全域关键�选�"
@@ -2588,7 +2668,7 @@ msgstr "拥有全域��列表："
 msgid "Global Scrips"
 msgstr "全域手续"
 
-#: html/Edit/Elements/Tab:38
+#: html/Edit/Elements/Tab:40
 msgid "Global Setup"
 msgstr "全域设定"
 
@@ -2597,7 +2677,11 @@ msgstr "全域设定"
 msgid "Global template: %1"
 msgstr "全域模�：%1"
 
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:40
+#: NOT FOUND IN SOURCE
+msgid "GlobalApproval"
+msgstr "全域签核"
+
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/Work/Tickets/Elements/EditPeople:16 html/Work/Tickets/Elements/EditPeople:20 html/index.html:40
 msgid "Go!"
 msgstr "执行"
 
@@ -2625,6 +2709,10 @@ msgstr "群组"
 msgid "Group %1 %2: %3"
 msgstr "群组 %1 %2：%3"
 
+#: NOT FOUND IN SOURCE
+msgid "Group Admin"
+msgstr "群组管�员"
+
 #: html/Edit/Global/GroupRight/List:5 html/Edit/Global/GroupRight/Top:20 html/Edit/Groups/List:7
 msgid "Group Description"
 msgstr "群组�述"
@@ -2637,7 +2725,7 @@ msgstr "群组管�"
 msgid "Group Members"
 msgstr "群组�员"
 
-#: html/Edit/Elements/PickUsers:28 html/Edit/Global/GroupRight/List:4 html/Edit/Global/GroupRight/Top:10 html/Edit/Groups/List:6 html/Edit/Groups/Top:7 html/Edit/Users/Add.html:29 html/Edit/Users/Group:10 html/Edit/Users/Search.html:43 html/Work/Delegates/Add.html:15 html/Work/Tickets/Cc:24
+#: html/Edit/Elements/PickUsers:28 html/Edit/Global/GroupRight/List:4 html/Edit/Global/GroupRight/Top:10 html/Edit/Groups/List:6 html/Edit/Groups/Top:7 html/Edit/Queues/Basic/Add.html:15 html/Edit/Users/Add.html:29 html/Edit/Users/Group:10 html/Edit/Users/Search.html:43 html/Work/Delegates/Add.html:15 html/Work/Tickets/Cc:24
 msgid "Group Name"
 msgstr "群组�称"
 
@@ -2645,7 +2733,7 @@ msgstr "群组�称"
 msgid "Group Name:"
 msgstr "群组�称："
 
-#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54 html/Edit/Global/autohandler:12 html/Edit/Queues/autohandler:23 html/Edit/Users/Group:11 html/Edit/Users/index.html:123
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54 html/Edit/Global/autohandler:12 html/Edit/Queues/autohandler:27 html/Edit/Users/Group:11 html/Edit/Users/index.html:96
 msgid "Group Rights"
 msgstr "群组��"
 
@@ -2653,7 +2741,7 @@ msgstr "群组��"
 msgid "Group Rights:"
 msgstr "拥有群组��列表："
 
-#: html/Edit/Elements/Tab:34
+#: html/Edit/Elements/Tab:36
 msgid "Group Setup"
 msgstr "群组设定"
 
@@ -2661,7 +2749,7 @@ msgstr "群组设定"
 msgid "Group Status"
 msgstr "群组状�"
 
-#: lib/RT/Group_Overlay.pm:964
+#: lib/RT/Group_Overlay.pm:962
 msgid "Group already has member"
 msgstr "群组内已有此�员"
 
@@ -2674,15 +2762,19 @@ msgstr "无法新增群组"
 msgid "Group could not be created: %1"
 msgstr "无法新增群组：%1"
 
-#: lib/RT/Group_Overlay.pm:496
+#: lib/RT/Group_Overlay.pm:494
 msgid "Group created"
 msgstr "群组新增完毕"
 
-#: lib/RT/Group_Overlay.pm:1132
+#: NOT FOUND IN SOURCE
+msgid "Group created: %1"
+msgstr "群组 %1 新增完毕"
+
+#: lib/RT/Group_Overlay.pm:1134
 msgid "Group has no such member"
 msgstr "群组没有这个�员"
 
-#: lib/RT/Group_Overlay.pm:944 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1437 lib/RT/Ticket_Overlay.pm:1515
+#: lib/RT/Group_Overlay.pm:942 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1455 lib/RT/Ticket_Overlay.pm:1533
 msgid "Group not found"
 msgstr "找�到群组"
 
@@ -2694,6 +2786,14 @@ msgstr "找�到群组。\\n"
 msgid "Group not specified.\\n"
 msgstr "未指定群组。\\n"
 
+#: NOT FOUND IN SOURCE
+msgid "Group redescribed from %1 to %2"
+msgstr "群组�述 %1 已改为 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Group renamed from %1 to %2"
+msgstr "群组 %1 已改�为 %2"
+
 #: NOT FOUND IN SOURCE
 msgid "Group with Queue Rights"
 msgstr "拥有表���群组"
@@ -2706,11 +2806,11 @@ msgstr "群组之"
 msgid "Group:"
 msgstr "群组："
 
-#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/Edit/Global/GroupRight/Add.html:15 html/User/Groups/Members.html:66
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/Edit/Global/GroupRight/Add.html:16 html/Edit/Groups/Admin:12 html/User/Groups/Members.html:66
 msgid "Groups"
 msgstr "群组"
 
-#: lib/RT/Group_Overlay.pm:970
+#: lib/RT/Group_Overlay.pm:968
 msgid "Groups can't be members of their members"
 msgstr "�能将群组设为群组内�员"
 
@@ -2722,7 +2822,7 @@ msgstr "拥有全域��群组"
 msgid "HRMSDefined"
 msgstr "组织架构"
 
-#: html/Edit/Users/Info:32
+#: NOT FOUND IN SOURCE
 msgid "Health Insurance"
 msgstr "��补助身份"
 
@@ -2730,19 +2830,23 @@ msgstr "��补助身份"
 msgid "Hello!"
 msgstr "嗨�"
 
-#: docs/design_docs/string-extraction-guide.txt:40
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
 #. ($name)
 msgid "Hello, %1"
 msgstr "嗨，%1"
 
-#: html/Edit/Elements/104Top:27
+#: html/Edit/Elements/104Top:28
 msgid "Help"
-msgstr "辅助说明"
+msgstr "说明"
 
 #: NOT FOUND IN SOURCE
 msgid "Help Desks"
 msgstr "�项业务窗�"
 
+#: html/Edit/Global/CustomField/SelectWritable:9 html/Edit/Queues/Basic/Top:80
+msgid "Hidden"
+msgstr "��"
+
 #: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:87 html/Work/Tickets/Elements/ShowHistory:8
 msgid "History"
 msgstr "纪录"
@@ -2751,7 +2855,7 @@ msgstr "纪录"
 msgid "HomePhone"
 msgstr "�处电�"
 
-#: html/Edit/Elements/104Top:15 html/Edit/Elements/104Top:23 html/Edit/Elements/EDOMHeader:9 html/Elements/Tabs:43
+#: html/Edit/Elements/104Top:15 html/Edit/Elements/104Top:24 html/Edit/Elements/EDOMHeader:9 html/Elements/Tabs:43
 msgid "Homepage"
 msgstr "主页"
 
@@ -2759,7 +2863,7 @@ msgstr "主页"
 msgid "Hotel Expense"
 msgstr "�宿费"
 
-#: lib/RT/Base.pm:73
+#: lib/RT/Base.pm:75
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
 msgstr "我有 %quant(%1,份固体�拌器)。"
@@ -2772,7 +2876,7 @@ msgstr "身分��"
 msgid "ID Type"
 msgstr "身分类别"
 
-#: html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1018
+#: html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1037
 msgid "Id"
 msgstr "编�"
 
@@ -2780,7 +2884,7 @@ msgstr "编�"
 msgid "Identity"
 msgstr "身份"
 
-#: etc/initialdata:439 etc/upgrade/2.1.71:86 html/Edit/Elements/CreateApprovalsQueue:58
+#: etc/initialdata:411 etc/upgrade/2.1.71:86 html/Edit/Elements/CreateApprovalsQueue:58
 msgid "If an approval is rejected, reject the original and delete pending approvals"
 msgstr "若签核��到驳回，则连带驳回原申请�，并删除其它相关的待签核事项"
 
@@ -2792,43 +2896,43 @@ msgstr "如果此工具程�为 setgid，��的本地端用户�能由此
 msgid "If you've updated anything above, be sure to"
 msgstr "若您已更新以上数�，请记得按一下"
 
-#: lib/RT/Interface/Web.pm:896
+#: lib/RT/Interface/Web.pm:956
 msgid "Illegal value for %1"
 msgstr "%1 的值错误"
 
-#: lib/RT/Interface/Web.pm:899
+#: lib/RT/Interface/Web.pm:959
 msgid "Immutable field"
 msgstr "此字段值��更动"
 
-#: html/Edit/Elements/104Buttons:76 html/Edit/Global/Workflow/Import.html:2
+#: html/Edit/Elements/104Buttons:87 html/Edit/Global/Workflow/Import.html:2
 msgid "Import"
 msgstr "汇入"
 
-#: html/Admin/Elements/EditCustomFields:73
+#: html/Admin/Elements/EditCustomFields:72
 msgid "Include disabled custom fields in listing."
 msgstr "列出�用的自订字段"
 
-#: html/Admin/Queues/index.html:42 html/Edit/Queues/index.html:38
+#: html/Admin/Queues/index.html:42 html/Edit/Queues/Top:9
 msgid "Include disabled queues in listing."
 msgstr "列出�用的表�"
 
-#: html/Admin/Users/index.html:46 html/Edit/Users/Search.html:62
+#: html/Admin/Users/index.html:46 html/Edit/Users/Search.html:62 html/Edit/Users/Top:9
 msgid "Include disabled users in search."
 msgstr "列出�用的使用者"
 
-#: html/Edit/Users/Info:37
+#: NOT FOUND IN SOURCE
 msgid "Indirect Employee"
 msgstr "直接/间接员工"
 
-#: lib/RT/Tickets_Overlay.pm:1067
+#: lib/RT/Tickets_Overlay.pm:1086
 msgid "Initial Priority"
-msgstr "�始优先�"
+msgstr "�始优先顺�"
 
-#: lib/RT/Ticket_Overlay.pm:1169 lib/RT/Ticket_Overlay.pm:1171
+#: lib/RT/Ticket_Overlay.pm:1206 lib/RT/Ticket_Overlay.pm:1208
 msgid "InitialPriority"
-msgstr "�始优先�"
+msgstr "�始优先顺�"
 
-#: lib/RT/ScripAction_Overlay.pm:104
+#: lib/RT/ScripAction_Overlay.pm:105
 msgid "Input error"
 msgstr "输入错误"
 
@@ -2836,7 +2940,7 @@ msgstr "输入错误"
 msgid "Interest noted"
 msgstr "登记�功"
 
-#: lib/RT/Ticket_Overlay.pm:3835
+#: lib/RT/Ticket_Overlay.pm:3913
 msgid "Internal Error"
 msgstr "内部错误"
 
@@ -2845,11 +2949,11 @@ msgstr "内部错误"
 msgid "Internal Error: %1"
 msgstr "内部错误：%1"
 
-#: lib/RT/Group_Overlay.pm:643
+#: lib/RT/Group_Overlay.pm:641
 msgid "Invalid Group Type"
 msgstr "错误的群组类别"
 
-#: lib/RT/Principal_Overlay.pm:126
+#: lib/RT/Principal_Overlay.pm:127
 msgid "Invalid Right"
 msgstr "错误的��"
 
@@ -2857,15 +2961,15 @@ msgstr "错误的��"
 msgid "Invalid Type"
 msgstr "错误的类型"
 
-#: lib/RT/Interface/Web.pm:901
+#: lib/RT/Interface/Web.pm:961
 msgid "Invalid data"
 msgstr "错误的数�"
 
-#: lib/RT/Ticket_Overlay.pm:439
+#: lib/RT/Ticket_Overlay.pm:463
 msgid "Invalid owner. Defaulting to 'nobody'."
 msgstr "错误的承办人。改为预设承办人「nobody�。"
 
-#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:250
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
 msgstr "错误的表�"
 
@@ -2878,11 +2982,11 @@ msgstr "错误的��"
 msgid "Invalid value for %1"
 msgstr "%1 的值错误"
 
-#: lib/RT/Ticket_Overlay.pm:3470
+#: lib/RT/Ticket_Overlay.pm:3517
 msgid "Invalid value for custom field"
 msgstr "错误的自订字段值"
 
-#: lib/RT/Ticket_Overlay.pm:346
+#: lib/RT/Ticket_Overlay.pm:365
 msgid "Invalid value for status"
 msgstr "错误的状�值"
 
@@ -2940,7 +3044,7 @@ msgstr "七月"
 
 #: lib/RT/Date.pm:417
 msgid "Jul."
-msgstr "01"
+msgstr "07"
 
 #: NOT FOUND IN SOURCE
 msgid "July"
@@ -2956,7 +3060,7 @@ msgstr "六月"
 
 #: lib/RT/Date.pm:416
 msgid "Jun."
-msgstr "06."
+msgstr "06"
 
 #: NOT FOUND IN SOURCE
 msgid "June"
@@ -2966,6 +3070,18 @@ msgstr "六月"
 msgid "Keyword"
 msgstr "关键�"
 
+#: lib/RT/CustomField_Vendor.pm:23
+msgid "LabelAttachments"
+msgstr "附件�标"
+
+#: lib/RT/CustomField_Vendor.pm:24
+msgid "LabelContent"
+msgstr "内容�标"
+
+#: lib/RT/CustomField_Vendor.pm:22
+msgid "LabelSubject"
+msgstr "主题�标"
+
 #: lib/RT/CustomField_Vendor.pm:21
 msgid "LabelURL"
 msgstr "链接�标"
@@ -2974,11 +3090,15 @@ msgstr "链接�标"
 msgid "Lang"
 msgstr "使用语言"
 
+#: html/User/Prefs.html:54 html/Work/Preferences/Info:29
+msgid "Language"
+msgstr "语言"
+
 #: html/Ticket/Elements/Tabs:72
 msgid "Last"
 msgstr "上次更新"
 
-#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:38
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39 html/Work/Tickets/Elements/EditBasics:44
 msgid "Last Contact"
 msgstr "上次�络"
 
@@ -3002,11 +3122,11 @@ msgstr "上次更新"
 msgid "Left"
 msgstr "剩馀时间"
 
-#: html/Admin/Users/Modify.html:82
+#: html/Admin/Users/Modify.html:82 html/Edit/Users/Info:62
 msgid "Let this user access RT"
 msgstr "�许这�使用者登入"
 
-#: html/Admin/Users/Modify.html:86
+#: html/Admin/Users/Modify.html:86 html/Edit/Users/Info:68
 msgid "Let this user be granted rights"
 msgstr "内部�员（具有个人��）"
 
@@ -3022,25 +3142,25 @@ msgstr "�制表�为 %1 到 %2"
 msgid "Link a Queue"
 msgstr "申请表�连结"
 
-#: lib/RT/Ticket_Overlay.pm:2726
+#: lib/RT/Ticket_Overlay.pm:2765
 msgid "Link already exists"
 msgstr "此链接已存在"
 
-#: lib/RT/Ticket_Overlay.pm:2738
+#: lib/RT/Ticket_Overlay.pm:2777
 msgid "Link could not be created"
 msgstr "无法新增链接"
 
-#: lib/RT/Ticket_Overlay.pm:2746 lib/RT/Ticket_Overlay.pm:2756
+#: lib/RT/Ticket_Overlay.pm:2785 lib/RT/Ticket_Overlay.pm:2797
 #. ($TransString)
 msgid "Link created (%1)"
 msgstr "链接(%1)新增完毕"
 
-#: lib/RT/Ticket_Overlay.pm:2667
+#: lib/RT/Ticket_Overlay.pm:2698
 #. ($TransString)
 msgid "Link deleted (%1)"
 msgstr "链接(%1)删除完毕"
 
-#: lib/RT/Ticket_Overlay.pm:2673
+#: lib/RT/Ticket_Overlay.pm:2704
 msgid "Link not found"
 msgstr "找�到链接"
 
@@ -3061,33 +3181,33 @@ msgstr "链接"
 msgid "List All Users"
 msgstr "列出所有用户数�"
 
-#: html/Admin/Users/Modify.html:113 html/User/Prefs.html:84 html/Work/Preferences/Info:72
+#: html/Admin/Users/Modify.html:113 html/User/Prefs.html:107 html/Work/Preferences/Info:75
 msgid "Location"
 msgstr "�置"
 
-#: lib/RT.pm:162
+#: lib/RT.pm:174
 #. ($RT::LogDir)
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
 msgstr "登入目录 %1 找�到或无法写入\\n。无法执行 RT。"
 
-#: html/Edit/Global/Basic/Top:52
+#: html/Edit/Global/Basic/Top:57
 msgid "LogToFile"
 msgstr "纪录等级"
 
-#: html/Edit/Global/Basic/Top:54
+#: html/Edit/Global/Basic/Top:59
 msgid "LogToFileNamed"
 msgstr "纪录档�"
 
-#: html/Elements/Header:56
+#: html/Elements/Header:57
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
 msgstr "使用者：%1"
 
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
 msgid "Login"
 msgstr "登入"
 
-#: html/Edit/Elements/104Top:17 html/Edit/Elements/104Top:17 html/Edit/Elements/104Top:29 html/Elements/Header:53
+#: html/Edit/Elements/104Top:17 html/Edit/Elements/104Top:17 html/Edit/Elements/104Top:32 html/Elements/Header:54
 msgid "Logout"
 msgstr "注销"
 
@@ -3175,6 +3295,10 @@ msgstr "三月"
 msgid "Marketing Department"
 msgstr "行销部"
 
+#: html/Edit/Global/CustomField/Top:63
+msgid "Match Pattern"
+msgstr "符�样�"
+
 #: NOT FOUND IN SOURCE
 msgid "May"
 msgstr "五月"
@@ -3183,23 +3307,33 @@ msgstr "五月"
 msgid "May."
 msgstr "05"
 
-#: lib/RT/Group_Overlay.pm:981
+#: lib/RT/Transaction_Overlay.pm:598
+#. ($value)
+msgid "Member %1 added"
+msgstr "�员 %1 新增完毕"
+
+#: lib/RT/Transaction_Overlay.pm:635
+#. ($value)
+msgid "Member %1 deleted"
+msgstr "�员 %1 删除完毕"
+
+#: lib/RT/Group_Overlay.pm:979
 msgid "Member added"
 msgstr "新增�员完毕"
 
-#: lib/RT/Group_Overlay.pm:1139
+#: lib/RT/Group_Overlay.pm:1141
 msgid "Member deleted"
 msgstr "�员已删除"
 
-#: lib/RT/Group_Overlay.pm:1143
+#: lib/RT/Group_Overlay.pm:1145
 msgid "Member not deleted"
-msgstr "�员未被删除"
+msgstr "�员未删除"
 
 #: html/Elements/SelectLinkType:25
 msgid "Member of"
 msgstr "隶属于"
 
-#: html/Work/Preferences/index.html:20
+#: html/Work/Preferences/index.html:19
 msgid "Member since"
 msgstr "注册日期"
 
@@ -3211,15 +3345,25 @@ msgstr "隶属于"
 msgid "Members"
 msgstr "�员"
 
-#: lib/RT/Ticket_Overlay.pm:2913
+#: lib/RT/Transaction_Overlay.pm:595
+#. ($value)
+msgid "Membership in %1 added"
+msgstr "所属群组 %1 加入完毕"
+
+#: lib/RT/Transaction_Overlay.pm:632
+#. ($value)
+msgid "Membership in %1 deleted"
+msgstr "所属群组 %1 移除完毕"
+
+#: lib/RT/Ticket_Overlay.pm:2954
 msgid "Merge Successful"
 msgstr "整�完毕"
 
-#: lib/RT/Ticket_Overlay.pm:2833
+#: lib/RT/Ticket_Overlay.pm:2874
 msgid "Merge failed. Couldn't set EffectiveId"
 msgstr "整�失败。无法设定 EffectiveId"
 
-#: html/Ticket/Elements/BulkLinks:26 html/Ticket/Elements/EditLinks:114 html/Work/Search/BulkLinks:2
+#: html/Ticket/Elements/BulkLinks:26 html/Ticket/Elements/EditLinks:97 html/Work/Search/BulkLinks:2 html/Work/Tickets/Elements/EditLinks:101
 msgid "Merge into"
 msgstr "整�进"
 
@@ -3227,15 +3371,19 @@ msgstr "整�进"
 msgid "Message"
 msgstr "讯�"
 
+#: html/Ticket/Elements/ShowTransaction:80
+msgid "Message body not shown because it is too large or is not plain text."
+msgstr "信件内文�是纯文字，因此无法显示。"
+
 #: NOT FOUND IN SOURCE
 msgid "Misc. Expense"
 msgstr "�费"
 
-#: lib/RT/Interface/Web.pm:903
+#: lib/RT/Interface/Web.pm:963
 msgid "Missing a primary key?: %1"
 msgstr "缺少主键值？(%1)"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:53 html/Work/Preferences/Info:33
+#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:71 html/Work/Preferences/Info:38
 msgid "Mobile"
 msgstr "行动电�"
 
@@ -3392,7 +3540,7 @@ msgstr "更改群组 %1"
 msgid "Modify the queue watchers"
 msgstr "更改表�视察员"
 
-#: html/Admin/Users/Modify.html:235
+#: html/Admin/Users/Modify.html:237
 #. ($UserObj->Name)
 msgid "Modify the user %1"
 msgstr "更改使用者 %1"
@@ -3471,6 +3619,10 @@ msgstr "星期一"
 msgid "Mon."
 msgstr "星期一"
 
+#: html/Work/Elements/MyRequests:11 html/Work/Elements/MyTickets:11
+msgid "More"
+msgstr "更多"
+
 #: html/Ticket/Elements/ShowRequestor:41
 #. ($name)
 msgid "More about %1"
@@ -3496,7 +3648,7 @@ msgstr "上移"
 msgid "Multiple"
 msgstr "多�"
 
-#: lib/RT/User_Overlay.pm:238
+#: lib/RT/User_Overlay.pm:242
 msgid "Must specify 'Name' attribute"
 msgstr "必须指定 'Name' 的属性"
 
@@ -3505,15 +3657,15 @@ msgstr "必须指定 'Name' 的属性"
 msgid "My %1 tickets"
 msgstr "我的 %1 申请�"
 
-#: html/Work/Elements/Tab:35
+#: html/Work/Elements/Tab:37
 msgid "My Approvals"
 msgstr "表�签核"
 
-#: html/Work/Elements/Tab:33
+#: html/Work/Elements/Tab:35
 msgid "My Requests"
 msgstr "表�申请追踪"
 
-#: html/Work/Elements/Tab:37
+#: html/Work/Elements/Tab:39
 msgid "My Tickets"
 msgstr "表�处�"
 
@@ -3521,15 +3673,15 @@ msgstr "表�处�"
 msgid "My approvals"
 msgstr "表�签核"
 
-#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Elements/ModifyTemplateAsWorkflow:185 html/Admin/Elements/ModifyUser:29 html/Admin/Groups/Modify.html:43 html/Edit/Users/Add.html:22 html/Edit/Users/Search.html:31 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43 html/Work/Tickets/Cc:18
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Elements/ModifyTemplateAsWorkflow:185 html/Admin/Elements/ModifyUser:29 html/Admin/Groups/Modify.html:43 html/Edit/Elements/SelectQueues:3 html/Edit/Queues/List:8 html/Edit/Users/Add.html:22 html/Edit/Users/List:5 html/Edit/Users/Search.html:31 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43 html/Work/Tickets/Cc:18
 msgid "Name"
 msgstr "�称"
 
-#: lib/RT/User_Overlay.pm:245
+#: lib/RT/User_Overlay.pm:249
 msgid "Name in use"
 msgstr "��已有人使用"
 
-#: html/Edit/Users/Info:27
+#: NOT FOUND IN SOURCE
 msgid "Nationality"
 msgstr "国�"
 
@@ -3537,27 +3689,27 @@ msgstr "国�"
 msgid "Need approval from system administrator"
 msgstr "需先由系统管�员进行批准"
 
-#: html/Ticket/Elements/ShowDates:51
+#: html/Ticket/Elements/ShowDates:52
 msgid "Never"
 msgstr "从未更动"
 
-#: html/Elements/Quicksearch:29 html/Work/Elements/Quicksearch:15 html/Work/Tickets/Create.html:52
+#: html/Elements/Quicksearch:29 html/Work/Elements/Quicksearch:15 html/Work/Tickets/Create.html:53
 msgid "New"
 msgstr "新建立"
 
-#: html/Admin/Elements/ModifyUser:31 html/Admin/Users/Modify.html:92 html/User/Prefs.html:64 html/Work/Preferences/Info:44
+#: html/Admin/Elements/ModifyUser:31 html/Admin/Users/Modify.html:92 html/Edit/Users/Info:33 html/User/Prefs.html:87 html/Work/Preferences/Info:49
 msgid "New Password"
 msgstr "新的�令"
 
-#: etc/initialdata:341 etc/upgrade/2.1.71:16 html/Edit/Elements/CreateApprovalsQueue:21
+#: etc/initialdata:317 etc/upgrade/2.1.71:16 html/Edit/Elements/CreateApprovalsQueue:21
 msgid "New Pending Approval"
 msgstr "新的待签核事项"
 
-#: html/Ticket/Elements/EditLinks:110
+#: html/Ticket/Elements/EditLinks:93 html/Work/Tickets/Elements/EditLinks:12
 msgid "New Relationships"
 msgstr "新增关系"
 
-#: html/Work/Elements/Tab:31
+#: html/Work/Elements/Tab:33
 msgid "New Request"
 msgstr "表�申请"
 
@@ -3565,7 +3717,11 @@ msgstr "表�申请"
 msgid "New Search"
 msgstr "新增查询"
 
-#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:39
+#: html/Work/Tickets/Elements/EditPeople:7
+msgid "New Watchers"
+msgstr "新增视察员"
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
 msgstr "新增自订字段"
 
@@ -3577,7 +3733,7 @@ msgstr "新增群组"
 msgid "New password"
 msgstr "新的�令"
 
-#: lib/RT/User_Overlay.pm:706
+#: lib/RT/User_Overlay.pm:769
 msgid "New password notification sent"
 msgstr "�出新�令通知"
 
@@ -3609,7 +3765,7 @@ msgstr "新增模�"
 msgid "New ticket"
 msgstr "�出申请�"
 
-#: lib/RT/Ticket_Overlay.pm:2800
+#: lib/RT/Ticket_Overlay.pm:2841
 msgid "New ticket doesn't exist"
 msgstr "没有新申请�"
 
@@ -3645,7 +3801,7 @@ msgstr "下一页"
 msgid "NickName"
 msgstr "昵称"
 
-#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:45 html/Work/Preferences/Info:23
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50 html/Work/Preferences/Info:26
 msgid "Nickname"
 msgstr "昵称"
 
@@ -3653,11 +3809,11 @@ msgstr "昵称"
 msgid "Night Shift"
 msgstr "�夜�"
 
-#: html/Edit/Global/Basic/Top:27
+#: html/Edit/Global/Basic/Top:27 html/Edit/Queues/Basic/Top:83
 msgid "No"
 msgstr "�"
 
-#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:104
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
 msgstr "无自订字段"
 
@@ -3693,7 +3849,7 @@ msgstr "没有�程"
 msgid "No action"
 msgstr "暂�处�"
 
-#: lib/RT/Interface/Web.pm:898
+#: lib/RT/Interface/Web.pm:958
 msgid "No column specified"
 msgstr "未指定字段"
 
@@ -3705,7 +3861,7 @@ msgstr "找�到命令"
 msgid "No comment entered about this user"
 msgstr "没有对这�使用者的评论"
 
-#: lib/RT/Ticket_Overlay.pm:2211 lib/RT/Ticket_Overlay.pm:2279
+#: lib/RT/Ticket_Overlay.pm:2229 lib/RT/Ticket_Overlay.pm:2299
 msgid "No correspondence attached"
 msgstr "没有附上申请�回�"
 
@@ -3714,11 +3870,11 @@ msgstr "没有附上申请�回�"
 msgid "No description for %1"
 msgstr "没有对 %1 的�述"
 
-#: lib/RT/Users_Overlay.pm:150
+#: lib/RT/Users_Overlay.pm:149
 msgid "No group specified"
 msgstr "未指定群组"
 
-#: lib/RT/User_Overlay.pm:924
+#: lib/RT/User_Overlay.pm:987
 msgid "No password set"
 msgstr "没有设定�令"
 
@@ -3726,24 +3882,24 @@ msgstr "没有设定�令"
 msgid "No permission to create queues"
 msgstr "没有新增表�的��"
 
-#: lib/RT/Ticket_Overlay.pm:342
+#: lib/RT/Ticket_Overlay.pm:361
 #. ($QueueObj->Name)
 msgid "No permission to create tickets in the queue '%1'"
 msgstr "没有在表� '%1' 新增申请�的��"
 
-#: lib/RT/User_Overlay.pm:211
+#: lib/RT/User_Overlay.pm:208
 msgid "No permission to create users"
 msgstr "没有新增使用者的��"
 
-#: html/SelfService/Display.html:117
+#: html/SelfService/Display.html:123
 msgid "No permission to display that ticket"
 msgstr "没有显示该申请�的��"
 
-#: html/SelfService/Update.html:51
+#: html/SelfService/Update.html:68
 msgid "No permission to view update ticket"
 msgstr "没有检视申请�更新的��"
 
-#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1496
+#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1514
 msgid "No principal specified"
 msgstr "未指定��"
 
@@ -3759,7 +3915,7 @@ msgstr "%1 内未指定�议"
 msgid "No queues matching search criteria found."
 msgstr "找�到符�查询�件的表�。"
 
-#: html/Admin/Elements/SelectRights:80
+#: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
 msgstr "找�到��"
 
@@ -3775,7 +3931,7 @@ msgstr "没有�进行的查询"
 msgid "No ticket id specified"
 msgstr "未指定申请�编�"
 
-#: lib/RT/Transaction_Overlay.pm:478 lib/RT/Transaction_Overlay.pm:516
+#: lib/RT/Transaction_Overlay.pm:427 lib/RT/Transaction_Overlay.pm:465
 msgid "No transaction type specified"
 msgstr "未指定更动报告类别"
 
@@ -3791,7 +3947,7 @@ msgstr "找�到符�查询�件的使用者。"
 msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
 msgstr "找�到�格的 RT 使用者。RT cvs 处�器已�用。请� RT 管�者询问。\\n"
 
-#: lib/RT/Interface/Web.pm:895
+#: lib/RT/Interface/Web.pm:955
 msgid "No value sent to _Set!\\n"
 msgstr "_Set 没有收到任何值!\\n"
 
@@ -3799,7 +3955,7 @@ msgstr "_Set 没有收到任何值!\\n"
 msgid "Nobody"
 msgstr "没有人"
 
-#: lib/RT/Interface/Web.pm:900
+#: lib/RT/Interface/Web.pm:960
 msgid "Nonexistant field?"
 msgstr "字段�存在？"
 
@@ -3815,7 +3971,7 @@ msgstr "未设定�从 %2 内撷� %1"
 msgid "Not logged in"
 msgstr "尚未登入"
 
-#: html/Elements/Header:58
+#: html/Elements/Header:59
 msgid "Not logged in."
 msgstr "尚未登入"
 
@@ -3831,7 +3987,7 @@ msgstr "尚未完工。"
 msgid "Not yet implemented...."
 msgstr "尚未完工..."
 
-#: html/Approvals/Elements/Approve:48 html/Work/Tickets/Create.html:134
+#: html/Approvals/Elements/Approve:48 html/Work/Tickets/Elements/AddContent:9
 msgid "Notes"
 msgstr "备注"
 
@@ -3839,67 +3995,67 @@ msgstr "备注"
 msgid "Notes:"
 msgstr "备注："
 
-#: lib/RT/User_Overlay.pm:709
+#: lib/RT/User_Overlay.pm:772
 msgid "Notification could not be sent"
 msgstr "无法�出通知"
 
-#: etc/initialdata:111
+#: etc/initialdata:93
 msgid "Notify AdminCcs"
 msgstr "通知管�员副本收件人"
 
-#: etc/initialdata:107
+#: etc/initialdata:89
 msgid "Notify AdminCcs as Comment"
 msgstr "以评论方�通知管�员副本收件人"
 
-#: etc/initialdata:138
+#: etc/initialdata:120
 msgid "Notify Other Recipients"
 msgstr "通知其它收件人"
 
-#: etc/initialdata:134
+#: etc/initialdata:116
 msgid "Notify Other Recipients as Comment"
 msgstr "以评论方�通知其它收件人"
 
-#: etc/initialdata:103
+#: etc/initialdata:85
 msgid "Notify Owner"
 msgstr "通知承办人"
 
-#: etc/initialdata:99
+#: etc/initialdata:81
 msgid "Notify Owner as Comment"
 msgstr "以评论方�通知承办人"
 
-#: etc/initialdata:385
+#: etc/initialdata:361
 msgid "Notify Owner of their rejected ticket"
 msgstr "通知承办人申请�已驳回"
 
-#: etc/initialdata:374
+#: etc/initialdata:350
 msgid "Notify Owner of their ticket has been approved by all approvers"
 msgstr "通知承办人申请�已完�全部签核"
 
-#: etc/initialdata:359
+#: etc/initialdata:338
 msgid "Notify Owner of their ticket has been approved by some approver"
 msgstr "通知承办人申请�已完��项签核"
 
-#: etc/initialdata:343 etc/upgrade/2.1.71:17 html/Edit/Elements/CreateApprovalsQueue:22
+#: etc/initialdata:319 etc/upgrade/2.1.71:17 html/Edit/Elements/CreateApprovalsQueue:22
 msgid "Notify Owners and AdminCcs of new items pending their approval"
 msgstr "整�待签核事项，通知承办人�管�员副本收件人"
 
-#: etc/initialdata:95
+#: etc/initialdata:77
 msgid "Notify Requestors"
 msgstr "通知申请人"
 
-#: etc/initialdata:121
+#: etc/initialdata:103
 msgid "Notify Requestors and Ccs"
 msgstr "通知申请人�副本收件人"
 
-#: etc/initialdata:116
+#: etc/initialdata:98
 msgid "Notify Requestors and Ccs as Comment"
 msgstr "以评论方�通知申请人�副本收件人"
 
-#: etc/initialdata:130
+#: etc/initialdata:112
 msgid "Notify Requestors, Ccs and AdminCcs"
 msgstr "通知申请人�副本�管�员副本收件人"
 
-#: etc/initialdata:126
+#: etc/initialdata:108
 msgid "Notify Requestors, Ccs and AdminCcs as Comment"
 msgstr "以评论方�通知申请人�副本�管�员副本收件人"
 
@@ -3919,9 +4075,9 @@ msgstr "11"
 msgid "November"
 msgstr "�一月"
 
-#: html/Edit/Global/Basic/Top:74
+#: html/Edit/Global/Basic/Top:83
 msgid "OIN104"
-msgstr "�� 104eHRMS 接�"
+msgstr "104eHRMS 接�"
 
 #: html/Edit/Global/Workflow/Export.html:30 html/Work/Copyright.html:23
 msgid "OK"
@@ -3935,7 +4091,7 @@ msgstr "无法新增对象"
 msgid "Object created"
 msgstr "对象新增完毕"
 
-#: html/Edit/Users/Info:36
+#: NOT FOUND IN SOURCE
 msgid "Occupation Status"
 msgstr "在�状�"
 
@@ -3951,7 +4107,7 @@ msgstr "10"
 msgid "October"
 msgstr "�月"
 
-#: html/Edit/Users/Info:33
+#: NOT FOUND IN SOURCE
 msgid "Office Phone"
 msgstr "办公室电�"
 
@@ -3959,35 +4115,39 @@ msgstr "办公室电�"
 msgid "On"
 msgstr "等于"
 
-#: etc/initialdata:173
+#: html/Edit/Global/CustomField/Top:68
+msgid "On Change"
+msgstr "更改申请�时"
+
+#: etc/initialdata:155
 msgid "On Comment"
 msgstr "评论时"
 
-#: etc/initialdata:166
+#: etc/initialdata:148
 msgid "On Correspond"
 msgstr "回�申请�时"
 
-#: etc/initialdata:155
+#: etc/initialdata:137 html/Edit/Global/CustomField/Top:57
 msgid "On Create"
 msgstr "新增申请�时"
 
-#: etc/initialdata:187
+#: etc/initialdata:169
 msgid "On Owner Change"
 msgstr "承办人改�时"
 
-#: etc/initialdata:195
+#: etc/initialdata:177
 msgid "On Queue Change"
 msgstr "表�改�时"
 
-#: etc/initialdata:201
+#: etc/initialdata:183
 msgid "On Resolve"
 msgstr "解决申请�时"
 
-#: etc/initialdata:179
+#: etc/initialdata:161
 msgid "On Status Change"
 msgstr "现况改�时"
 
-#: etc/initialdata:160
+#: etc/initialdata:142
 msgid "On Transaction"
 msgstr "�生更动时"
 
@@ -4001,7 +4161,7 @@ msgstr "仅显示 %1 之�新增的申请�"
 msgid "Only show approvals for requests created before %1"
 msgstr "仅显示 %1 之�新增的申请�"
 
-#: html/Edit/Global/GroupRight/List:9 html/Edit/Global/GroupRight/Top:16 html/Edit/Groups/List:11 html/Edit/Groups/Top:18 html/Edit/Queues/Basic/Top:69 html/Edit/Queues/List:13 html/Elements/Quicksearch:30 html/Work/Delegates/Info:48 html/Work/Delegates/Info:51 html/Work/Delegates/List:12 html/Work/Elements/Quicksearch:16 html/Work/Overview/Info:41 html/Work/Tickets/Display.html:28
+#: html/Edit/Global/GroupRight/List:9 html/Edit/Global/GroupRight/Top:16 html/Edit/Groups/List:11 html/Edit/Groups/Top:18 html/Edit/Queues/Basic/Top:68 html/Edit/Queues/List:15 html/Edit/Queues/List:27 html/Elements/Quicksearch:30 html/Work/Delegates/Info:48 html/Work/Delegates/Info:51 html/Work/Delegates/List:12 html/Work/Elements/Quicksearch:16 html/Work/Overview/Info:41 html/Work/Tickets/Display.html:51
 msgid "Open"
 msgstr "开�"
 
@@ -4021,7 +4181,7 @@ msgstr "在新窗�开�(列表的)申请�"
 msgid "Open tickets (from listing) in another window"
 msgstr "在�一个窗�开�(列表的)申请�"
 
-#: etc/initialdata:150
+#: etc/initialdata:132
 msgid "Open tickets on correspondence"
 msgstr "收到回�时�开�申请�"
 
@@ -4041,11 +4201,11 @@ msgstr "选项�述"
 msgid "Option Name"
 msgstr "选项�称"
 
-#: html/Search/Elements/PickRestriction:100 html/Work/Search/PickRestriction:81
+#: html/Search/Elements/PickRestriction:100 html/Work/Search/PickRestriction:87
 msgid "Ordering and sorting"
 msgstr "顺�与排�方�"
 
-#: html/Admin/Elements/ModifyUser:45 html/Admin/Users/Modify.html:116 html/Edit/Global/Basic/Top:50 html/Elements/SelectUsers:28 html/User/Prefs.html:85 html/Work/Preferences/Info:74
+#: html/Admin/Elements/ModifyUser:45 html/Admin/Users/Modify.html:116 html/Edit/Elements/SelectUsers:7 html/Edit/Global/Basic/Top:55 html/Elements/SelectUsers:28 html/User/Prefs.html:110 html/Work/Preferences/Info:77
 msgid "Organization"
 msgstr "组织�称"
 
@@ -4058,11 +4218,11 @@ msgstr "组织："
 msgid "Originating ticket: #%1"
 msgstr "原申请�：#%1"
 
-#: html/Edit/Elements/PickUsers:109 html/Edit/Users/Add.html:106 html/Work/Tickets/Cc:80
+#: html/Edit/Elements/PickUsers:111 html/Edit/Users/Add.html:106 html/Work/Tickets/Cc:80
 msgid "Other comma-delimited email addresses"
 msgstr "其它e-mail�� (仅e-mail通知;多笔��请用逗�','区隔)"
 
-#: html/Admin/Elements/ModifyQueue:54 html/Admin/Queues/Modify.html:68 html/Edit/Queues/Basic/Top:41
+#: html/Admin/Elements/ModifyQueue:54 html/Admin/Queues/Modify.html:68 html/Edit/Queues/Basic/Top:44
 msgid "Over time, priority moves toward"
 msgstr "优先顺��时间增加调整为"
 
@@ -4074,12 +4234,12 @@ msgstr "以 %1 表�的自订字段�代现有字段"
 msgid "Override global rights"
 msgstr "�代全域��"
 
-#: html/Admin/Elements/CheckOverrideGlobalACL:34
+#: html/Admin/Elements/CheckOverrideGlobalACL:36
 #. (loc_fuzzy($msg))
 msgid "OverrideGlobalACL status %1"
 msgstr "�代全域�� %1"
 
-#: html/Work/Elements/Tab:29
+#: html/Work/Elements/Tab:31
 msgid "Overview"
 msgstr "总览"
 
@@ -4091,7 +4251,7 @@ msgstr "承办申请�"
 msgid "OwnTicket"
 msgstr "承办申请�"
 
-#: etc/initialdata:56 html/Admin/Elements/ModifyTemplateAsWorkflow:141 html/Edit/Global/Workflow/Owner.html:19 html/Edit/Queues/Basic/Top:47 html/Edit/Queues/Basic/Top:58 html/Elements/MyRequests:31 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:62 html/Work/Elements/MyRequests:13 html/Work/Elements/Quicksearch:18 html/Work/Tickets/Elements/ShowBasics:21 html/Work/Tickets/Update.html:27 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1244
+#: etc/initialdata:38 html/Admin/Elements/ModifyTemplateAsWorkflow:141 html/Edit/Global/Workflow/Owner.html:19 html/Edit/Queues/Basic/Top:51 html/Edit/Queues/Basic/Top:59 html/Elements/MyRequests:31 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:62 html/Work/Elements/MyRequests:19 html/Work/Elements/Quicksearch:18 html/Work/Tickets/Elements/EditPeople:28 html/Work/Tickets/Elements/ShowBasics:21 html/Work/Tickets/Update.html:27 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1263
 msgid "Owner"
 msgstr "承办人"
 
@@ -4099,7 +4259,7 @@ msgstr "承办人"
 msgid "Owner changed from %1 to %2"
 msgstr "承办人已从 %1 改为 %2"
 
-#: lib/RT/Transaction_Overlay.pm:582
+#: lib/RT/Transaction_Overlay.pm:539
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
 msgstr "强制将承办人从 %1 改为 %2"
@@ -4108,15 +4268,15 @@ msgstr "强制将承办人从 %1 改为 %2"
 msgid "Owner is"
 msgstr "承办人"
 
-#: html/Work/Elements/List:27 html/Work/Queues/List:8 html/Work/Tickets/Create.html:54 html/Work/Tickets/Elements/ShowBasics:52
+#: html/Work/Elements/List:27 html/Work/Queues/List:8 html/Work/Tickets/Create.html:55 html/Work/Tickets/Elements/ShowBasics:60
 msgid "Owner's Phone"
 msgstr "承办人电�"
 
-#: html/Edit/Elements/Page:39
-msgid "Page"
+#: html/Edit/Elements/Page:40
+msgid "Page #"
 msgstr " "
 
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:55 html/Work/Preferences/Info:35
+#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:75 html/Work/Preferences/Info:40
 msgid "Pager"
 msgstr "呼�器"
 
@@ -4124,7 +4284,7 @@ msgstr "呼�器"
 msgid "PagerPhone"
 msgstr "呼�器��"
 
-#: html/Edit/Global/Workflow/Action:81 html/Edit/Global/Workflow/Condition:66
+#: html/Edit/Global/Workflow/Action:75 html/Edit/Global/Workflow/Condition:65
 msgid "Parameter"
 msgstr "呼��数"
 
@@ -4132,7 +4292,7 @@ msgstr "呼��数"
 msgid "Parent"
 msgstr "上级"
 
-#: html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:38 html/Ticket/Elements/EditLinks:126 html/Ticket/Elements/EditLinks:57 html/Ticket/Elements/ShowLinks:46 html/Work/Search/BulkLinks:14
+#: html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38 html/Ticket/Elements/EditLinks:109 html/Ticket/Elements/EditLinks:54 html/Ticket/Elements/ShowLinks:46 html/Work/Search/BulkLinks:14 html/Work/Tickets/Elements/EditLinks:113 html/Work/Tickets/Elements/EditLinks:45 html/Work/Tickets/Elements/ShowLinks:26
 msgid "Parents"
 msgstr "�申请�"
 
@@ -4140,7 +4300,7 @@ msgstr "�申请�"
 msgid "Park Space"
 msgstr "�车�申请"
 
-#: html/Elements/Login:52 html/User/Prefs.html:60 html/Work/Preferences/Info:41
+#: html/Elements/Login:52 html/User/Prefs.html:83 html/Work/Preferences/Info:46
 msgid "Password"
 msgstr "�令"
 
@@ -4148,20 +4308,20 @@ msgstr "�令"
 msgid "Password Reminder"
 msgstr "�令�示"
 
-#: lib/RT/User_Overlay.pm:228 lib/RT/User_Overlay.pm:927
+#: lib/RT/User_Overlay.pm:230 lib/RT/User_Overlay.pm:990
 msgid "Password too short"
 msgstr "�令太短"
 
-#: html/Admin/Users/Modify.html:290 html/User/Prefs.html:171 html/Work/Preferences/Info:162
+#: html/Admin/Users/Modify.html:292 html/User/Prefs.html:209 html/Work/Preferences/Info:173
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
 msgstr "�令：%1"
 
-#: html/Admin/Users/Modify.html:292
+#: html/Admin/Users/Modify.html:294
 msgid "Passwords do not match."
 msgstr "�令确认失败。"
 
-#: html/User/Prefs.html:173 html/Work/Preferences/Info:164
+#: html/User/Prefs.html:211 html/Work/Preferences/Info:175
 msgid "Passwords do not match. Your password has not been changed"
 msgstr "�令确认失败。您的�令并未改�。"
 
@@ -4181,11 +4341,11 @@ msgstr "人员"
 msgid "People with Queue Rights"
 msgstr "拥有表���人员"
 
-#: etc/initialdata:143
+#: etc/initialdata:125
 msgid "Perform a user-defined action"
 msgstr "执行使用者自订的动作"
 
-#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/CurrentUser.pm:82 lib/RT/CurrentUser.pm:91 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:201 lib/RT/CustomField_Overlay.pm:233 lib/RT/CustomField_Overlay.pm:510 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1094 lib/RT/Group_Overlay.pm:1098 lib/RT/Group_Overlay.pm:1107 lib/RT/Group_Overlay.pm:1158 lib/RT/Group_Overlay.pm:1162 lib/RT/Group_Overlay.pm:1168 lib/RT/Group_Overlay.pm:425 lib/RT/Group_Overlay.pm:517 lib/RT/Group_Overlay.pm:595 lib/RT/Group_Overlay.pm:603 lib/RT/Group_Overlay.pm:700 lib/RT/Group_Overlay.pm:704 lib/RT/Group_Overlay.pm:710 lib/RT/Group_Overlay.pm:903 lib/RT/Group_Overlay.pm:907 lib/RT/Group_Overlay.pm:920 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:931 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:196 lib/RT/Scrip_Overlay.pm:429 lib/RT/Template_Overlay.pm:283 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1349 lib/RT/Ticket_Overlay.pm:1359 lib/RT/Ticket_Overlay.pm:1373 lib/RT/Ticket_Overlay.pm:1526 lib/RT/Ticket_Overlay.pm:1535 lib/RT/Ticket_Overlay.pm:1548 lib/RT/Ticket_Overlay.pm:1897 lib/RT/Ticket_Overlay.pm:2035 lib/RT/Ticket_Overlay.pm:2199 lib/RT/Ticket_Overlay.pm:2266 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2697 lib/RT/Ticket_Overlay.pm:2791 lib/RT/Ticket_Overlay.pm:2806 lib/RT/Ticket_Overlay.pm:3005 lib/RT/Ticket_Overlay.pm:3015 lib/RT/Ticket_Overlay.pm:3020 lib/RT/Ticket_Overlay.pm:3242 lib/RT/Ticket_Overlay.pm:3440 lib/RT/Ticket_Overlay.pm:3602 lib/RT/Ticket_Overlay.pm:3654 lib/RT/Ticket_Overlay.pm:3829 lib/RT/Transaction_Overlay.pm:466 lib/RT/Transaction_Overlay.pm:473 lib/RT/Transaction_Overlay.pm:502 lib/RT/Transaction_Overlay.pm:509 lib/RT/User_Overlay.pm:1021 lib/RT/User_Overlay.pm:1414 lib/RT/User_Overlay.pm:629 lib/RT/User_Overlay.pm:664 lib/RT/User_Overlay.pm:920
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/CurrentUser.pm:82 lib/RT/CurrentUser.pm:91 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:201 lib/RT/CustomField_Overlay.pm:233 lib/RT/CustomField_Overlay.pm:511 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1096 lib/RT/Group_Overlay.pm:1100 lib/RT/Group_Overlay.pm:1109 lib/RT/Group_Overlay.pm:1160 lib/RT/Group_Overlay.pm:1164 lib/RT/Group_Overlay.pm:1170 lib/RT/Group_Overlay.pm:423 lib/RT/Group_Overlay.pm:515 lib/RT/Group_Overlay.pm:593 lib/RT/Group_Overlay.pm:601 lib/RT/Group_Overlay.pm:698 lib/RT/Group_Overlay.pm:702 lib/RT/Group_Overlay.pm:708 lib/RT/Group_Overlay.pm:901 lib/RT/Group_Overlay.pm:905 lib/RT/Group_Overlay.pm:918 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:934 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:441 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1386 lib/RT/Ticket_Overlay.pm:1396 lib/RT/Ticket_Overlay.pm:1410 lib/RT/Ticket_Overlay.pm:1544 lib/RT/Ticket_Overlay.pm:1553 lib/RT/Ticket_Overlay.pm:1566 lib/RT/Ticket_Overlay.pm:1915 lib/RT/Ticket_Overlay.pm:2053 lib/RT/Ticket_Overlay.pm:2217 lib/RT/Ticket_Overlay.pm:2286 lib/RT/Ticket_Overlay.pm:2647 lib/RT/Ticket_Overlay.pm:2728 lib/RT/Ticket_Overlay.pm:2832 lib/RT/Ticket_Overlay.pm:2847 lib/RT/Ticket_Overlay.pm:3046 lib/RT/Ticket_Overlay.pm:3056 lib/RT/Ticket_Overlay.pm:3061 lib/RT/Ticket_Overlay.pm:3284 lib/RT/Ticket_Overlay.pm:3288 lib/RT/Ticket_Overlay.pm:3487 lib/RT/Ticket_Overlay.pm:3649 lib/RT/Ticket_Overlay.pm:3701 lib/RT/Ticket_Overlay.pm:3907 lib/RT/Transaction_Overlay.pm:415 lib/RT/Transaction_Overlay.pm:422 lib/RT/Transaction_Overlay.pm:451 lib/RT/Transaction_Overlay.pm:458 lib/RT/User_Overlay.pm:1084 lib/RT/User_Overlay.pm:1532 lib/RT/User_Overlay.pm:692 lib/RT/User_Overlay.pm:727 lib/RT/User_Overlay.pm:983
 msgid "Permission Denied"
 msgstr "���足"
 
@@ -4217,10 +4377,26 @@ msgstr "代�人群组"
 msgid "Personal groups:"
 msgstr "代�人群组："
 
-#: html/Work/Preferences/Info:21
+#: html/Work/Preferences/Info:24
 msgid "PersonalHomepage"
 msgstr "个人首页"
 
+#: NOT FOUND IN SOURCE
+msgid "Phase 1: Create/Rename Groups (%1)"
+msgstr "第一阶段：群组建立�改� (%1)"
+
+#: NOT FOUND IN SOURCE
+msgid "Phase 2: Disable/Enable Groups (%1)"
+msgstr "第二阶段：群组�用��用 (%1)"
+
+#: NOT FOUND IN SOURCE
+msgid "Phase 3: Create/Rename Users (%1)"
+msgstr "第三阶段：使用者建立�改� (%1)"
+
+#: NOT FOUND IN SOURCE
+msgid "Phase 4: Disable/Enable Users (%1)"
+msgstr "第四阶段：使用者�用��用 (%1)"
+
 #: NOT FOUND IN SOURCE
 msgid "Phone"
 msgstr "电�"
@@ -4229,11 +4405,11 @@ msgstr "电�"
 msgid "Phone number"
 msgstr "电���"
 
-#: html/Admin/Users/Modify.html:155 html/User/Prefs.html:48 html/Work/Preferences/Info:27
+#: html/Admin/Users/Modify.html:155 html/User/Prefs.html:60 html/Work/Preferences/Info:32
 msgid "Phone numbers"
 msgstr "电���"
 
-#: html/Edit/Users/Add.html:3 html/Work/Delegates/Add.html:3 html/Work/Delegates/Info:34 html/Work/Tickets/ModifyPeople.html:2
+#: html/Edit/Queues/Basic/Add.html:3 html/Edit/Queues/Basic/Top:55 html/Edit/Users/Add.html:3 html/Work/Delegates/Add.html:3 html/Work/Delegates/Info:34 html/Work/Tickets/ModifyPeople.html:2
 msgid "Pick"
 msgstr "挑选"
 
@@ -4245,7 +4421,7 @@ msgstr "出�地点"
 msgid "Placeholder"
 msgstr "尚未完工"
 
-#: html/Edit/Elements/PickUsers:31 html/Edit/Elements/PickUsers:44 html/Edit/Elements/SelectCustomFieldType:3 html/Work/Elements/SelectOwner:3 html/Work/Tickets/Elements/EditCustomField:104 html/Work/Tickets/Elements/EditCustomField:185 html/Work/Tickets/Elements/EditCustomField:75 html/Work/Tickets/Elements/EditCustomFieldEntries:66 html/Work/Tickets/Elements/EditCustomFieldEntries:73
+#: html/Edit/Elements/PickUsers:31 html/Edit/Elements/PickUsers:44 html/Edit/Elements/SelectCustomFieldType:3 html/Work/Elements/SelectOwner:3 html/Work/Tickets/Elements/EditCustomField:187 html/Work/Tickets/Elements/EditCustomFieldEntry:24 html/Work/Tickets/Elements/EditCustomFieldEntry:35
 msgid "Please Select"
 msgstr "请选择"
 
@@ -4261,6 +4437,10 @@ msgstr "请选择群组"
 msgid "Please select a queue's workflow"
 msgstr "请选择表��程"
 
+#: NOT FOUND IN SOURCE
+msgid "Please select one of the category types above."
+msgstr "请从上�选择一项分类。"
+
 #: NOT FOUND IN SOURCE
 msgid "Please select role"
 msgstr "请选择角色"
@@ -4273,19 +4453,19 @@ msgstr "��规章"
 msgid "Position"
 msgstr "�务"
 
-#: html/Edit/Users/Info:43
+#: NOT FOUND IN SOURCE
 msgid "Position Level"
 msgstr "�等"
 
-#: html/Edit/Elements/PickUsers:41 html/Edit/Global/UserRight/List:13 html/Edit/Global/UserRight/Top:23 html/Edit/Users/Add.html:41 html/Edit/Users/List:11 html/Edit/Users/Top:22 html/Work/Delegates/Add.html:26 html/Work/Delegates/Info:84 html/Work/Overview/Info:66
+#: html/Edit/Elements/PickUsers:41 html/Edit/Global/UserRight/List:13 html/Edit/Global/UserRight/Top:23 html/Edit/Queues/Basic/Add.html:26 html/Edit/Users/Add.html:41 html/Work/Delegates/Add.html:26 html/Work/Delegates/Info:84 html/Work/Overview/Info:66
 msgid "Position Name"
 msgstr "�务�称"
 
-#: html/Edit/Global/UserRight/List:14 html/Edit/Global/UserRight/Top:33 html/Edit/Users/List:12 html/Edit/Users/Top:32
+#: html/Edit/Global/UserRight/List:14 html/Edit/Global/UserRight/Top:33
 msgid "Position Number"
 msgstr "�务代�"
 
-#: html/Edit/Users/Info:44
+#: NOT FOUND IN SOURCE
 msgid "Position Rank"
 msgstr "�级"
 
@@ -4293,7 +4473,7 @@ msgstr "�级"
 msgid "Pref"
 msgstr "�好"
 
-#: html/Edit/Elements/104Top:25 html/Elements/Header:51 html/Elements/Tabs:52 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27 html/Work/Elements/Tab:41
+#: html/Edit/Elements/104Top:26 html/Elements/Header:51 html/Elements/Tabs:52 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27 html/Work/Elements/Tab:43
 msgid "Preferences"
 msgstr "�好"
 
@@ -4322,7 +4502,7 @@ msgstr "优先顺�"
 msgid "Principal %1 not found."
 msgstr "找�到�� %1。"
 
-#: html/Search/Elements/PickRestriction:53 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:38 html/Work/Search/PickRestriction:34 lib/RT/Tickets_Overlay.pm:1042
+#: html/Search/Elements/PickRestriction:53 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:38 html/Work/Search/PickRestriction:34 html/Work/Tickets/Elements/EditBasics:41 lib/RT/Tickets_Overlay.pm:1061
 msgid "Priority"
 msgstr "优先顺�"
 
@@ -4330,11 +4510,11 @@ msgstr "优先顺�"
 msgid "Priority starts at"
 msgstr "优先顺�起始值"
 
-#: etc/initialdata:43
+#: etc/initialdata:25
 msgid "Privileged"
 msgstr "内部�员"
 
-#: html/Admin/Users/Modify.html:270 html/User/Prefs.html:162 html/Work/Preferences/Info:153
+#: html/Admin/Users/Modify.html:272 html/User/Prefs.html:200 html/Work/Preferences/Info:164
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
 msgstr "内部�员状�：%1"
@@ -4347,11 +4527,19 @@ msgstr "内部�员"
 msgid "Process Status"
 msgstr "处�状�"
 
-#: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53 etc/initialdata:77
+#: html/Edit/Queues/List:10
+msgid "Project Name"
+msgstr "项目�称"
+
+#: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
 msgid "Pseudogroup for internal use"
 msgstr "内部用的虚拟群组"
 
-#: html/Work/Preferences/Info:64
+#: html/Edit/Queues/List:11
+msgid "Public Description"
+msgstr "公开说明"
+
+#: html/Work/Preferences/Info:70
 msgid "Public Info"
 msgstr "公开信�"
 
@@ -4359,11 +4547,15 @@ msgstr "公开信�"
 msgid "Public Service"
 msgstr "公共事务区"
 
+#: NOT FOUND IN SOURCE
+msgid "Purging stale data: %1"
+msgstr "移除过期数�: %1"
+
 #: html/Edit/Users/Search.html:4
 msgid "Query"
 msgstr "查询"
 
-#: html/Admin/Elements/ModifyTemplateAsWorkflow:166 html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Elements/Quicksearch:28 html/Search/Elements/PickRestriction:45 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:63 html/Ticket/Elements/ShowBasics:42 html/User/Elements/DelegateRights:79 html/Work/Elements/MyApprovals:10 html/Work/Elements/MyRequests:11 html/Work/Elements/MyTickets:11 html/Work/Elements/Quicksearch:14 html/Work/Search/PickRestriction:26 lib/RT/Tickets_Overlay.pm:883
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:166 html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Elements/Quicksearch:28 html/Search/Elements/PickRestriction:45 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:63 html/Ticket/Elements/ShowBasics:42 html/User/Elements/DelegateRights:79 html/Work/Elements/MyApprovals:10 html/Work/Elements/MyRequests:17 html/Work/Elements/MyTickets:17 html/Work/Elements/Quicksearch:14 html/Work/Search/PickRestriction:26 html/Work/Tickets/Elements/EditBasics:16 lib/RT/Tickets_Overlay.pm:902
 msgid "Queue"
 msgstr "表�"
 
@@ -4381,19 +4573,19 @@ msgstr "找�到表� '%1'\\n"
 msgid "Queue Keyword Selections"
 msgstr "表�关键�选�"
 
-#: html/Admin/Elements/ModifyQueue:30 html/Admin/Queues/Modify.html:42 html/Edit/Queues/Basic/Top:12 html/Edit/Queues/Basic/index.html:36 html/Edit/Queues/Global:21 html/Edit/Queues/List:6 html/Edit/Users/Queue:10 html/Work/Delegates/List:6 html/Work/Elements/List:11 html/Work/Queues/List:5 html/Work/Tickets/Create.html:20 html/Work/Tickets/Elements/ShowBasics:6
+#: html/Admin/Elements/ModifyQueue:30 html/Admin/Queues/Modify.html:42 html/Edit/Queues/Basic/Top:13 html/Edit/Queues/Basic/index.html:36 html/Edit/Queues/Global:21 html/Edit/Queues/List:20 html/Edit/Users/Queue:10 html/Work/Delegates/List:6 html/Work/Elements/List:11 html/Work/Queues/List:5 html/Work/Tickets/Create.html:21 html/Work/Tickets/Elements/ShowBasics:6
 msgid "Queue Name"
 msgstr "表��称"
 
-#: html/Edit/Queues/List:8 html/Work/Elements/List:25 html/Work/Queues/List:7 html/Work/Tickets/Create.html:33 html/Work/Tickets/Elements/ShowBasics:19
+#: html/Edit/Queues/List:22 html/Work/Elements/List:25 html/Work/Queues/List:7 html/Work/Tickets/Create.html:34 html/Work/Tickets/Elements/ShowBasics:19
 msgid "Queue Owner"
 msgstr "业务承办人"
 
-#: html/Edit/Queues/Basic/Top:35
+#: html/Edit/Queues/Basic/Top:38
 msgid "Queue Priority"
 msgstr "优先等级"
 
-#: html/Edit/Global/GroupRight/Top:24 html/Edit/Global/UserRight/Top:43 html/Edit/Users/Queue:11 html/Edit/Users/index.html:124
+#: html/Edit/Global/GroupRight/Top:24 html/Edit/Global/UserRight/Top:43 html/Edit/Users/Queue:11 html/Edit/Users/index.html:97
 msgid "Queue Rights"
 msgstr "表���"
 
@@ -4401,7 +4593,7 @@ msgstr "表���"
 msgid "Queue Scrips"
 msgstr "表�手续"
 
-#: html/Edit/Elements/Tab:36
+#: html/Edit/Elements/Tab:38
 msgid "Queue Setup"
 msgstr "表�设定"
 
@@ -4413,11 +4605,11 @@ msgstr "表�已存在"
 msgid "Queue could not be created"
 msgstr "无法新增表�"
 
-#: html/Edit/Queues/autohandler:8 html/Ticket/Create.html:204 html/Work/Tickets/Create.html:176
+#: html/Edit/Queues/autohandler:8 html/Ticket/Create.html:208 html/Work/Tickets/Create.html:180
 msgid "Queue could not be loaded."
 msgstr "无法加载表�"
 
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:283
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:283 lib/RT/StyleGuide.pod:789
 msgid "Queue created"
 msgstr "表�新增完毕"
 
@@ -4446,7 +4638,7 @@ msgstr "表�一览"
 msgid "RT %1"
 msgstr "RT %1"
 
-#: docs/design_docs/string-extraction-guide.txt:70
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
 #. ($RT::VERSION, $RT::rtname)
 msgid "RT %1 for %2"
 msgstr "%2：RT %1 版"
@@ -4562,11 +4754,15 @@ msgstr "系统�行角色"
 msgid "RT::Ticket-Role"
 msgstr "申请��行角色"
 
-#: html/Work/Tickets/Elements/ShowTransaction:11
+#: html/Work/Tickets/Elements/ShowTransaction:14
 msgid "RT_System"
 msgstr "系统讯�"
 
-#: html/Admin/Users/Modify.html:57 html/Admin/Users/Prefs.html:51 html/User/Prefs.html:43 html/Work/Preferences/Info:18
+#: html/Edit/Global/CustomField/SelectWritable:7
+msgid "Read Only"
+msgstr "�读"
+
+#: html/Admin/Users/Modify.html:57 html/Admin/Users/Prefs.html:51 html/Edit/Elements/SelectUsers:5 html/Edit/Users/List:6 html/User/Prefs.html:47 html/Work/Preferences/Info:18
 msgid "Real Name"
 msgstr "真实姓�"
 
@@ -4574,15 +4770,35 @@ msgstr "真实姓�"
 msgid "RealName"
 msgstr "真实姓�"
 
-#: html/Work/Approvals/Display.html:27 html/Work/Tickets/Update.html:85
+#: html/Work/Approvals/Display.html:30 html/Work/Tickets/Update.html:81
 msgid "Really reject this ticket?"
 msgstr "您确定�驳回这张申请��？"
 
-#: html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:50 html/Ticket/Elements/EditLinks:138 html/Ticket/Elements/EditLinks:93 html/Ticket/Elements/ShowLinks:70 html/Work/Search/BulkLinks:26
+#: lib/RT/Transaction_Overlay.pm:592
+#. ($value)
+msgid "Reference by %1 added"
+msgstr "已加入 %1 为�考本申请�"
+
+#: lib/RT/Transaction_Overlay.pm:629
+#. ($value)
+msgid "Reference by %1 deleted"
+msgstr "已移除 %1 为�考本申请�"
+
+#: lib/RT/Transaction_Overlay.pm:589
+#. ($value)
+msgid "Reference to %1 added"
+msgstr "已加入�考申请� %1"
+
+#: lib/RT/Transaction_Overlay.pm:626
+#. ($value)
+msgid "Reference to %1 deleted"
+msgstr "已移除�考申请� %1"
+
+#: html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50 html/Ticket/Elements/EditLinks:121 html/Ticket/Elements/EditLinks:81 html/Ticket/Elements/ShowLinks:70 html/Work/Search/BulkLinks:26 html/Work/Tickets/Elements/EditLinks:125 html/Work/Tickets/Elements/EditLinks:81 html/Work/Tickets/Elements/ShowLinks:38
 msgid "Referred to by"
 msgstr "被�考"
 
-#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:46 html/Ticket/Elements/EditLinks:134 html/Ticket/Elements/EditLinks:79 html/Ticket/Elements/ShowLinks:60 html/Work/Search/BulkLinks:22
+#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46 html/Ticket/Elements/EditLinks:117 html/Ticket/Elements/EditLinks:72 html/Ticket/Elements/ShowLinks:60 html/Work/Search/BulkLinks:22 html/Work/Tickets/Elements/EditLinks:121 html/Work/Tickets/Elements/EditLinks:67 html/Work/Tickets/Elements/ShowLinks:33
 msgid "Refers to"
 msgstr "�考"
 
@@ -4607,7 +4823,7 @@ msgstr "æ›´æ–°"
 msgid "Refresh this page every %1 minutes."
 msgstr "� %1 分钟更新页�"
 
-#: html/Ticket/Create.html:173 html/Ticket/Elements/ShowSummary:61 html/Ticket/ModifyAll.html:56
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/ModifyAll.html:56
 msgid "Relationships"
 msgstr "关系"
 
@@ -4627,7 +4843,7 @@ msgstr "移除副本"
 msgid "Remove Requestor"
 msgstr "移除申请人"
 
-#: html/Ticket/Elements/ShowTransaction:160 html/Ticket/Elements/Tabs:121 html/Work/Tickets/Display.html:31 html/Work/Tickets/Elements/ShowTransaction:106
+#: html/Ticket/Elements/ShowTransaction:172 html/Ticket/Elements/Tabs:121 html/Work/Tickets/Display.html:54 html/Work/Tickets/Elements/ShowTransaction:115
 msgid "Reply"
 msgstr "回�"
 
@@ -4639,15 +4855,15 @@ msgstr "对申请�进行回�"
 msgid "ReplyToTicket"
 msgstr "回�申请�"
 
-#: html/Edit/Users/Info:46
+#: NOT FOUND IN SOURCE
 msgid "Report to Duty"
 msgstr "上下�刷�"
 
-#: html/Edit/Users/Info:34
+#: NOT FOUND IN SOURCE
 msgid "Reported on"
 msgstr "到�日期"
 
-#: etc/initialdata:62 html/Ticket/Update.html:39 html/Work/Elements/List:21 html/Work/Elements/MyApprovals:12 html/Work/Elements/SelectSearch:30 html/Work/Tickets/Elements/ShowBasics:54 lib/RT/ACE_Overlay.pm:86
+#: etc/initialdata:44 html/Ticket/Update.html:39 html/Work/Elements/List:21 html/Work/Elements/MyApprovals:12 html/Work/Elements/MyTickets:20 html/Work/Elements/SelectSearch:31 html/Work/Tickets/Elements/ShowBasics:62 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
 msgstr "申请人"
 
@@ -4675,7 +4891,7 @@ msgstr "申请人"
 msgid "RequestorAddresses"
 msgstr "申请人地�"
 
-#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30 html/Work/Tickets/Elements/EditPeople:38
 msgid "Requestors"
 msgstr "申请人"
 
@@ -4687,7 +4903,7 @@ msgstr "申请�处�期�"
 msgid "Reset"
 msgstr "�设"
 
-#: html/Admin/Users/Modify.html:158 html/User/Prefs.html:49 html/Work/Preferences/Info:29
+#: html/Admin/Users/Modify.html:158 html/User/Prefs.html:63 html/Work/Preferences/Info:34
 msgid "Residence"
 msgstr "�处"
 
@@ -4695,16 +4911,16 @@ msgstr "�处"
 msgid "Resolution"
 msgstr "解决状�"
 
-#: html/Ticket/Elements/Tabs:131 html/Work/Tickets/Display.html:34
+#: html/Ticket/Elements/Tabs:131 html/Work/Tickets/Display.html:57
 msgid "Resolve"
 msgstr "解决"
 
-#: html/Ticket/Update.html:136 html/Work/Tickets/Update.html:120
+#: html/Ticket/Update.html:137
 #. ($Ticket->id, $Ticket->Subject)
 msgid "Resolve ticket #%1 (%2)"
 msgstr "解决申请� #%1 (%2)"
 
-#: etc/initialdata:331 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1178
+#: etc/initialdata:308 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1215
 msgid "Resolved"
 msgstr "已解决"
 
@@ -4712,7 +4928,7 @@ msgstr "已解决"
 msgid "Response to requestors"
 msgstr "回�申请人"
 
-#: html/Edit/Users/Info:45
+#: NOT FOUND IN SOURCE
 msgid "Responsibility Type"
 msgstr "责任区分"
 
@@ -4720,11 +4936,11 @@ msgstr "责任区分"
 msgid "Results"
 msgstr "结果"
 
-#: html/Search/Elements/PickRestriction:104 html/Work/Search/PickRestriction:84
+#: html/Search/Elements/PickRestriction:104 html/Work/Search/PickRestriction:90
 msgid "Results per page"
 msgstr "�页列出几笔结果"
 
-#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:99 html/User/Prefs.html:71 html/Work/Preferences/Info:51
+#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:99 html/User/Prefs.html:94 html/Work/Preferences/Info:56
 msgid "Retype Password"
 msgstr "�次输入�令"
 
@@ -4764,17 +4980,17 @@ msgstr "��撤消完毕"
 msgid "Rights"
 msgstr "���代�人"
 
-#: lib/RT/Interface/Web.pm:794
+#: lib/RT/Interface/Web.pm:857
 #. ($object_type)
 msgid "Rights could not be granted for %1"
 msgstr "无法将��赋予 %1"
 
-#: lib/RT/Interface/Web.pm:827
+#: lib/RT/Interface/Web.pm:887
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
 msgstr "无法撤消 %1 的��"
 
-#: html/Edit/Groups/Member:55 html/Edit/Groups/Members/List:10
+#: html/Edit/Groups/Member:54 html/Edit/Groups/Members/List:10
 msgid "Role Members"
 msgstr "角色�员"
 
@@ -4790,19 +5006,19 @@ msgstr "角色"
 msgid "RootApproval"
 msgstr "交由系统管�员签核"
 
-#: html/Edit/Global/Workflow/Action:27
+#: html/Edit/Global/Workflow/Action:23
 msgid "Run Approval"
 msgstr "签核执行"
 
-#: html/Edit/Global/Basic/Top:72
+#: html/Edit/Global/Basic/Top:81
 msgid "SMTPDebug"
 msgstr "SMTP 侦错纪录"
 
-#: html/Edit/Global/Basic/Top:58
+#: html/Edit/Global/Basic/Top:63
 msgid "SMTPFrom"
 msgstr "SMTP 寄件地�"
 
-#: html/Edit/Global/Basic/Top:56
+#: html/Edit/Global/Basic/Top:61
 msgid "SMTPServer"
 msgstr "SMTP �务器"
 
@@ -4814,7 +5030,7 @@ msgstr "星期六"
 msgid "Sat."
 msgstr "星期六"
 
-#: html/Edit/Elements/104Buttons:72 html/Work/Preferences/index.html:35
+#: html/Edit/Elements/104Buttons:83 html/Work/Preferences/index.html:33 html/Work/Tickets/Elements/EditBasics:63 html/Work/Tickets/Elements/EditLinks:133 html/Work/Tickets/Elements/EditPeople:51
 msgid "Save"
 msgstr "储存"
 
@@ -4840,7 +5056,7 @@ msgstr "讯�通知动作"
 msgid "Scrip Condition"
 msgstr "讯�通知�件"
 
-#: lib/RT/Scrip_Overlay.pm:175
+#: lib/RT/Scrip_Overlay.pm:180
 msgid "Scrip Created"
 msgstr "手续新增完毕"
 
@@ -4848,7 +5064,7 @@ msgstr "手续新增完毕"
 msgid "Scrip Name"
 msgstr "讯��称"
 
-#: html/Admin/Elements/EditScrips:83
+#: html/Admin/Elements/EditScrips:85
 msgid "Scrip deleted"
 msgstr "手续删除完毕"
 
@@ -4856,7 +5072,7 @@ msgstr "手续删除完毕"
 msgid "Scrips"
 msgstr "手续"
 
-#: html/Edit/Global/autohandler:9 html/Edit/Queues/autohandler:20
+#: html/Edit/Global/autohandler:9 html/Edit/Queues/autohandler:24
 msgid "Scrips "
 msgstr "讯�通知"
 
@@ -4868,7 +5084,7 @@ msgstr "%1 的手续\\n"
 msgid "Scrips which apply to all queues"
 msgstr "适用于所有表�的手续"
 
-#: html/Edit/Elements/104Buttons:75 html/Elements/SimpleSearch:26 html/Search/Elements/PickRestriction:125 html/Ticket/Elements/Tabs:158 html/Work/Elements/Tab:43 html/Work/Search/PickRestriction:102
+#: html/Edit/Elements/104Buttons:86 html/Elements/SimpleSearch:26 html/Search/Elements/PickRestriction:125 html/Ticket/Elements/Tabs:158 html/Work/Elements/Tab:45 html/Work/Search/PickRestriction:108
 msgid "Search"
 msgstr "查询"
 
@@ -4884,7 +5100,7 @@ msgstr "签核�查询"
 msgid "Second-"
 msgstr "二"
 
-#: html/Edit/Users/Info:41
+#: NOT FOUND IN SOURCE
 msgid "Second-level Users"
 msgstr "二阶主管员工"
 
@@ -4964,7 +5180,7 @@ msgstr "多�选项"
 msgid "SelectSingle"
 msgstr "�一选项"
 
-#: html/Edit/Elements/PickUsers:85 html/Edit/Users/Add.html:78
+#: html/Edit/Elements/PickUsers:87 html/Edit/Users/Add.html:78
 msgid "Selected users:"
 msgstr "新增对象："
 
@@ -4972,39 +5188,39 @@ msgstr "新增对象："
 msgid "Self Service"
 msgstr "自助�务"
 
-#: etc/initialdata:131
+#: etc/initialdata:113
 msgid "Send mail to all watchers"
 msgstr "寄信给所有视察员"
 
-#: etc/initialdata:127
+#: etc/initialdata:109
 msgid "Send mail to all watchers as a \"comment\""
 msgstr "以评论方�寄信给所有视察员"
 
-#: etc/initialdata:122
+#: etc/initialdata:104
 msgid "Send mail to requestors and Ccs"
 msgstr "寄信给申请人�副本收件人"
 
-#: etc/initialdata:117
+#: etc/initialdata:99
 msgid "Send mail to requestors and Ccs as a comment"
 msgstr "以评论方�寄信给申请人�副本收件人"
 
-#: etc/initialdata:96
+#: etc/initialdata:78
 msgid "Sends a message to the requestors"
 msgstr "寄信给申请人"
 
-#: etc/initialdata:135 etc/initialdata:139
+#: etc/initialdata:117 etc/initialdata:121
 msgid "Sends mail to explicitly listed Ccs and Bccs"
 msgstr "寄信给特定的副本�密件副本收件人"
 
-#: etc/initialdata:112
+#: etc/initialdata:94
 msgid "Sends mail to the administrative Ccs"
 msgstr "寄信给管�员副本收件人"
 
-#: etc/initialdata:108
+#: etc/initialdata:90
 msgid "Sends mail to the administrative Ccs as a comment"
 msgstr "以评论寄信给管�员副本收件人"
 
-#: etc/initialdata:100 etc/initialdata:104
+#: etc/initialdata:82 etc/initialdata:86
 msgid "Sends mail to the owner"
 msgstr "寄信给申请人"
 
@@ -5020,7 +5236,11 @@ msgstr "09"
 msgid "September"
 msgstr "�月"
 
-#: html/Edit/Users/Info:39
+#: NOT FOUND IN SOURCE
+msgid "Setting %1's 'Disabled' property to %2"
+msgstr "%1 的「�用�属性已设为 %2"
+
+#: NOT FOUND IN SOURCE
 msgid "Shift Type"
 msgstr "�别属性"
 
@@ -5088,7 +5308,7 @@ msgstr "登记�为申请人或副本收件人"
 msgid "Sign up as a ticket or queue AdminCc"
 msgstr "登记�为管�员副本收件人"
 
-#: html/Admin/Elements/ModifyUser:38 html/Admin/Users/Modify.html:190 html/Admin/Users/Prefs.html:31 html/User/Prefs.html:111 html/Work/Preferences/Info:106
+#: html/Admin/Elements/ModifyUser:38 html/Admin/Users/Modify.html:190 html/Admin/Users/Prefs.html:31 html/Edit/Users/Info:52 html/User/Prefs.html:148 html/Work/Preferences/Info:113
 msgid "Signature"
 msgstr "签�档"
 
@@ -5100,7 +5320,7 @@ msgstr "使用者：%1"
 msgid "Single"
 msgstr "�一"
 
-#: html/Elements/Header:50
+#: html/Edit/Elements/104Top:21 html/Elements/Header:50
 msgid "Skip Menu"
 msgstr "略过选�"
 
@@ -5112,7 +5332,7 @@ msgstr "顺�"
 msgid "Sort key"
 msgstr "排�方�"
 
-#: html/Search/Elements/PickRestriction:108 html/Work/Search/PickRestriction:89
+#: html/Search/Elements/PickRestriction:108 html/Work/Search/PickRestriction:95
 msgid "Sort results by"
 msgstr "结果排�方�"
 
@@ -5120,7 +5340,7 @@ msgstr "结果排�方�"
 msgid "SortOrder"
 msgstr "排�顺�"
 
-#: html/Work/Elements/List:8 html/Work/Elements/MyApprovals:11
+#: html/Admin/Elements/EditScrip:80 html/Edit/Global/Scrip/Top:75 html/Work/Elements/List:8 html/Work/Elements/MyApprovals:11
 msgid "Stage"
 msgstr "关�"
 
@@ -5140,7 +5360,7 @@ msgstr "延宕"
 msgid "Start page"
 msgstr "首页"
 
-#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:34
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35 html/Work/Tickets/Elements/EditBasics:35
 msgid "Started"
 msgstr "实际起始日"
 
@@ -5148,7 +5368,7 @@ msgstr "实际起始日"
 msgid "Started date '%1' could not be parsed"
 msgstr "无法解读起始日期 '%1"
 
-#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:30
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31 html/Work/Tickets/Elements/EditBasics:26
 msgid "Starts"
 msgstr "应起始日"
 
@@ -5160,19 +5380,19 @@ msgstr "应起始日"
 msgid "Starts date '%1' could not be parsed"
 msgstr "无法解读起始日期 '%1"
 
-#: html/Admin/Elements/ModifyUser:81 html/Admin/Users/Modify.html:137 html/User/Prefs.html:93 html/Work/Preferences/Info:82
+#: html/Admin/Elements/ModifyUser:81 html/Admin/Users/Modify.html:137 html/User/Prefs.html:126 html/Work/Preferences/Info:85
 msgid "State"
 msgstr "å·ž"
 
-#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Search/Elements/PickRestriction:73 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:37 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:59 html/Work/Elements/List:15 html/Work/Elements/MyRequests:12 html/Work/Elements/MyTickets:12 html/Work/Search/PickRestriction:54 html/Work/Tickets/Update.html:22 lib/RT/Ticket_Overlay.pm:1172 lib/RT/Tickets_Overlay.pm:908
+#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Search/Elements/PickRestriction:73 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:37 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:59 html/Work/Elements/List:15 html/Work/Elements/MyRequests:18 html/Work/Elements/MyTickets:18 html/Work/Search/PickRestriction:54 html/Work/Tickets/Elements/EditBasics:19 html/Work/Tickets/Update.html:22 lib/RT/Ticket_Overlay.pm:1209 lib/RT/Tickets_Overlay.pm:927
 msgid "Status"
 msgstr "现况"
 
-#: etc/initialdata:317
+#: etc/initialdata:294
 msgid "Status Change"
 msgstr "现况改�时"
 
-#: lib/RT/Transaction_Overlay.pm:528
+#: lib/RT/Transaction_Overlay.pm:477
 #. ($self->loc($self->OldValue), $self->loc($self->NewValue))
 msgid "Status changed from %1 to %2"
 msgstr "现况从 %1 改为 %2"
@@ -5193,25 +5413,25 @@ msgstr "强制承办申请�"
 msgid "StealTicket"
 msgstr "强制承办申请�"
 
-#: lib/RT/Transaction_Overlay.pm:587
+#: lib/RT/Transaction_Overlay.pm:545
 #. ($Old->Name)
 msgid "Stolen from %1 "
-msgstr "被 %1 强制更� "
+msgstr "承办人从 %1 强制更�"
 
-#: html/Edit/Groups/Member:69
+#: html/Edit/Groups/Member:68
 msgid "Subgroup"
 msgstr "�群组"
 
-#: html/Elements/MyRequests:28 html/Elements/MyTickets:28 html/Search/Bulk.html:135 html/Search/Elements/PickRestriction:42 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:27 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:75 html/Work/Elements/MyApprovals:9 html/Work/Elements/MyRequests:10 html/Work/Elements/MyTickets:10 html/Work/Search/Bulk.html:87 html/Work/Search/PickRestriction:22 html/Work/Tickets/Create.html:122 lib/RT/Ticket_Overlay.pm:1168 lib/RT/Tickets_Overlay.pm:987
+#: html/Elements/MyRequests:28 html/Elements/MyTickets:28 html/Search/Bulk.html:135 html/Search/Elements/PickRestriction:42 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:27 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:75 html/Work/Elements/MyApprovals:9 html/Work/Elements/MyRequests:16 html/Work/Elements/MyTickets:16 html/Work/Search/Bulk.html:87 html/Work/Search/PickRestriction:22 html/Work/Tickets/Elements/AddSubject:8 html/Work/Tickets/Elements/EditBasics:8 html/Work/Tickets/Elements/ShowBasics:36 html/Work/Tickets/Elements/ShowSubject:8 lib/RT/Ticket_Overlay.pm:1205 lib/RT/Tickets_Overlay.pm:1006
 msgid "Subject"
 msgstr "主题"
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/Transaction_Overlay.pm:609
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:567
 #. ($self->Data)
 msgid "Subject changed to %1"
 msgstr "标题已改为 %1"
 
-#: html/Elements/Submit:58 html/Work/Search/Bulk.html:103
+#: html/Edit/Users/Info:71 html/Elements/Submit:58 html/Work/Search/Bulk.html:103
 msgid "Submit"
 msgstr "�出"
 
@@ -5219,7 +5439,7 @@ msgstr "�出"
 msgid "Submit Workflow"
 msgstr "�出�程"
 
-#: lib/RT/Group_Overlay.pm:748
+#: lib/RT/Group_Overlay.pm:746
 msgid "Succeeded"
 msgstr "设定�功"
 
@@ -5235,6 +5455,18 @@ msgstr "星期日"
 msgid "SuperUser"
 msgstr "系统管�员"
 
+#: html/Edit/Global/Basic/Top:29
+msgid "Sync now"
+msgstr "执行�步"
+
+#: html/Edit/Global/Basic/Top:87
+msgid "Sync104HRMS"
+msgstr "自动�步104HRMS"
+
+#: NOT FOUND IN SOURCE
+msgid "Synchronizing HRMS data.  This may take a while..."
+msgstr "正在�步化 HRMS 人事系统数�。请�待..."
+
 #: html/User/Elements/DelegateRights:76
 msgid "System"
 msgstr "系统"
@@ -5243,7 +5475,7 @@ msgstr "系统"
 msgid "System Defined"
 msgstr "系统定义"
 
-#: html/Admin/Elements/SelectRights:80 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:793 lib/RT/Interface/Web.pm:826
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:856 lib/RT/Interface/Web.pm:886
 msgid "System Error"
 msgstr "系统错误"
 
@@ -5255,7 +5487,7 @@ msgstr "系统错误。设定��失败。"
 msgid "System Error. right not granted"
 msgstr "系统错误。设定��失败。"
 
-#: html/Edit/Users/index.html:122
+#: html/Edit/Users/index.html:95
 msgid "System Rights"
 msgstr "系统��"
 
@@ -5279,14 +5511,18 @@ msgstr "系统群组"
 msgid "SystemInternal"
 msgstr "系统内部用"
 
-#: etc/initialdata:59 etc/initialdata:65 etc/initialdata:71
+#: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
 msgid "SystemRolegroup for internal use"
 msgstr "内部使用的系统角色群组"
 
-#: lib/RT/CurrentUser.pm:319
+#: lib/RT/CurrentUser.pm:318
 msgid "TEST_STRING"
 msgstr "TEST_STRING"
 
+#: NOT FOUND IN SOURCE
+msgid "TabbedUI"
+msgstr "页签接�"
+
 #: html/Ticket/Elements/Tabs:142
 msgid "Take"
 msgstr "��"
@@ -5299,11 +5535,11 @@ msgstr "自行承办申请�"
 msgid "TakeTicket"
 msgstr "自行承办申请�"
 
-#: lib/RT/Transaction_Overlay.pm:573
+#: lib/RT/Transaction_Overlay.pm:530
 msgid "Taken"
 msgstr "已��"
 
-#: html/Admin/Elements/EditScrip:80
+#: html/Admin/Elements/EditScrip:88
 msgid "Template"
 msgstr "模�"
 
@@ -5328,7 +5564,7 @@ msgstr "通知模��称"
 msgid "Template deleted"
 msgstr "模�已删除"
 
-#: lib/RT/Scrip_Overlay.pm:152
+#: lib/RT/Scrip_Overlay.pm:156
 msgid "Template not found"
 msgstr "找�到模�"
 
@@ -5336,7 +5572,7 @@ msgstr "找�到模�"
 msgid "Template not found\\n"
 msgstr "找�到模�\\n"
 
-#: lib/RT/Template_Overlay.pm:352
+#: lib/RT/Template_Overlay.pm:359
 msgid "Template parsed"
 msgstr "模�剖�完毕"
 
@@ -5344,7 +5580,7 @@ msgstr "模�剖�完毕"
 msgid "Templates"
 msgstr "模�"
 
-#: html/Edit/Global/autohandler:8 html/Edit/Queues/autohandler:19
+#: html/Edit/Global/autohandler:8 html/Edit/Queues/autohandler:23
 msgid "Templates "
 msgstr "通知模�"
 
@@ -5352,7 +5588,7 @@ msgstr "通知模�"
 msgid "Templates for %1\\n"
 msgstr "找�到 %1 的模�\\n"
 
-#: lib/RT/Interface/Web.pm:894
+#: lib/RT/Interface/Web.pm:954
 msgid "That is already the current value"
 msgstr "已�是目�字段的值"
 
@@ -5360,7 +5596,7 @@ msgstr "已�是目�字段的值"
 msgid "That is not a value for this custom field"
 msgstr "这�是该自订字段的值"
 
-#: lib/RT/Ticket_Overlay.pm:1908
+#: lib/RT/Ticket_Overlay.pm:1926
 msgid "That is the same value"
 msgstr "�样的值"
 
@@ -5373,7 +5609,7 @@ msgstr "这项��已�拥有该��"
 msgid "That principal is already a %1 for this queue"
 msgstr "这项��已�是这个表�的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1442
+#: lib/RT/Ticket_Overlay.pm:1460
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
 msgstr "这项��已�是这份申请�的 %1"
@@ -5383,16 +5619,16 @@ msgstr "这项��已�是这份申请�的 %1"
 msgid "That principal is not a %1 for this queue"
 msgstr "这项���是这个表�的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1559
+#: lib/RT/Ticket_Overlay.pm:1577
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this ticket"
 msgstr "这项���是这份申请�的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1904
+#: lib/RT/Ticket_Overlay.pm:1922
 msgid "That queue does not exist"
 msgstr "此表��存在"
 
-#: lib/RT/Ticket_Overlay.pm:3246
+#: lib/RT/Ticket_Overlay.pm:3293
 msgid "That ticket has unresolved dependencies"
 msgstr "这份申请�有尚未解决的附属申请�"
 
@@ -5400,27 +5636,27 @@ msgstr "这份申请�有尚未解决的附属申请�"
 msgid "That user already has that right"
 msgstr "使用者已具有该项��"
 
-#: lib/RT/Ticket_Overlay.pm:3056
+#: lib/RT/Ticket_Overlay.pm:3097
 msgid "That user already owns that ticket"
 msgstr "该使用者已�承办这份申请�"
 
-#: lib/RT/Ticket_Overlay.pm:3028
+#: lib/RT/Ticket_Overlay.pm:3069
 msgid "That user does not exist"
 msgstr "使用者�存在"
 
-#: lib/RT/User_Overlay.pm:374
+#: lib/RT/User_Overlay.pm:381
 msgid "That user is already privileged"
 msgstr "这�使用者已�是内部�员"
 
-#: lib/RT/User_Overlay.pm:395
+#: lib/RT/User_Overlay.pm:402
 msgid "That user is already unprivileged"
 msgstr "这�使用者属于�内部�员群组"
 
-#: lib/RT/User_Overlay.pm:387
+#: lib/RT/User_Overlay.pm:394
 msgid "That user is now privileged"
 msgstr "使用者加入内部�员群组完毕"
 
-#: lib/RT/User_Overlay.pm:408
+#: lib/RT/User_Overlay.pm:415
 msgid "That user is now unprivileged"
 msgstr "这�使用者已加入�内部�员群组"
 
@@ -5428,7 +5664,7 @@ msgstr "这�使用者已加入�内部�员群组"
 msgid "That user is now unprivilegedileged"
 msgstr "这�使用者已加入�内部�员群组"
 
-#: lib/RT/Ticket_Overlay.pm:3049
+#: lib/RT/Ticket_Overlay.pm:3090
 msgid "That user may not own tickets in that queue"
 msgstr "使用者�能没有承办表�里的申请�"
 
@@ -5448,7 +5684,7 @@ msgstr "申请�的副本收件人"
 msgid "The administrative CC of a ticket"
 msgstr "申请�的管�员副本收件人"
 
-#: lib/RT/Ticket_Overlay.pm:2235
+#: lib/RT/Ticket_Overlay.pm:2255
 msgid "The comment has been recorded"
 msgstr "评论已被纪录"
 
@@ -5460,7 +5696,7 @@ msgstr "下列命令会找到 'general' 表�内所有�作中的申请�，
 msgid "The following commands were not proccessed:\\n\\n"
 msgstr "以下命令未被执行：\\n\\n"
 
-#: lib/RT/Interface/Web.pm:897
+#: lib/RT/Interface/Web.pm:957
 msgid "The new value has been set."
 msgstr "新的字段值设定完�。"
 
@@ -5488,7 +5724,7 @@ msgstr "申请� %1 %2 (%3)\\n"
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
 msgstr "此工具程�会让使用者�由 RT 执行任�命令。"
 
-#: lib/RT/Transaction_Overlay.pm:251
+#: lib/RT/Transaction_Overlay.pm:200
 msgid "This transaction appears to have no content"
 msgstr "此项更动报告没有内容"
 
@@ -5509,7 +5745,7 @@ msgstr "星期四"
 msgid "Thu."
 msgstr "星期四"
 
-#: html/Admin/Elements/ModifyTemplateAsWorkflow:163
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:163 html/Edit/Global/Workflow/Condition:24
 msgid "Ticket"
 msgstr "申请�"
 
@@ -5531,7 +5767,7 @@ msgstr "更新申请� #%1 的全部信�：%2"
 msgid "Ticket #%1: %2"
 msgstr "申请� #%1: %2"
 
-#: lib/RT/Ticket_Overlay.pm:595 lib/RT/Ticket_Overlay.pm:616
+#: lib/RT/Ticket_Overlay.pm:632 lib/RT/Ticket_Overlay.pm:653
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
 msgstr "申请� #%1 �功新增于 '%2' 表�"
@@ -5541,12 +5777,12 @@ msgstr "申请� #%1 �功新增于 '%2' 表�"
 msgid "Ticket %1 loaded\\n"
 msgstr "加载申请� %1\\n"
 
-#: html/Search/Bulk.html:212 html/Work/Search/Bulk.html:169
+#: html/Search/Bulk.html:213 html/Work/Search/Bulk.html:169
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
 msgstr "申请� %1：%2"
 
-#: html/Edit/Queues/Basic/Top:28 html/Edit/Queues/List:16 html/Work/Queues/List:9
+#: html/Edit/Queues/Basic/Top:30 html/Edit/Queues/List:30 html/Work/Queues/List:9
 msgid "Ticket Due"
 msgstr "表�处�期�"
 
@@ -5567,11 +5803,11 @@ msgstr "申请�编�"
 msgid "Ticket Processing Due"
 msgstr "表��行期�"
 
-#: etc/initialdata:332
+#: etc/initialdata:309
 msgid "Ticket Resolved"
 msgstr "申请�已解决"
 
-#: html/Edit/Queues/Basic/Top:18 html/Edit/Queues/Category/List:6 html/Edit/Queues/Category/Top:7 html/Edit/Queues/List:7 html/Edit/Queues/index.html:31 html/Work/Delegates/List:7 html/Work/Delegates/index.html:11 html/Work/Elements/List:12 html/Work/Elements/SelectSearch:9 html/Work/Queues/List:6 html/Work/Queues/Select.html:12 html/Work/Queues/index.html:11 html/Work/Tickets/Create.html:42 html/Work/Tickets/Elements/ShowBasics:33
+#: html/Edit/Queues/Basic/Top:20 html/Edit/Queues/Category/List:6 html/Edit/Queues/Category/Top:7 html/Edit/Queues/List:21 html/Work/Delegates/List:7 html/Work/Delegates/index.html:11 html/Work/Elements/List:12 html/Work/Elements/SelectSearch:9 html/Work/Queues/List:6 html/Work/Queues/Select.html:12 html/Work/Queues/index.html:11 html/Work/Tickets/Create.html:43 html/Work/Tickets/Elements/ShowBasics:34
 msgid "Ticket Type"
 msgstr "表��类"
 
@@ -5579,19 +5815,19 @@ msgstr "表��类"
 msgid "Ticket attachment"
 msgstr "申请�附件"
 
-#: lib/RT/Tickets_Overlay.pm:1166
+#: lib/RT/Tickets_Overlay.pm:1185
 msgid "Ticket content"
 msgstr "申请�内容"
 
-#: lib/RT/Tickets_Overlay.pm:1212
+#: lib/RT/Tickets_Overlay.pm:1231
 msgid "Ticket content type"
 msgstr "申请�内容类别"
 
-#: lib/RT/Ticket_Overlay.pm:485 lib/RT/Ticket_Overlay.pm:494 lib/RT/Ticket_Overlay.pm:504 lib/RT/Ticket_Overlay.pm:605
+#: lib/RT/Ticket_Overlay.pm:520 lib/RT/Ticket_Overlay.pm:529 lib/RT/Ticket_Overlay.pm:539 lib/RT/Ticket_Overlay.pm:642
 msgid "Ticket could not be created due to an internal error"
 msgstr "内部错误，无法新增申请�"
 
-#: lib/RT/Transaction_Overlay.pm:520
+#: lib/RT/Transaction_Overlay.pm:469
 msgid "Ticket created"
 msgstr "申请�新增完毕"
 
@@ -5599,7 +5835,7 @@ msgstr "申请�新增完毕"
 msgid "Ticket creation failed"
 msgstr "申请�新增失败"
 
-#: lib/RT/Transaction_Overlay.pm:525
+#: lib/RT/Transaction_Overlay.pm:474
 msgid "Ticket deleted"
 msgstr "申请�删除完毕"
 
@@ -5615,7 +5851,7 @@ msgstr "申请�删除完毕"
 msgid "Ticket not found"
 msgstr "找�到申请�"
 
-#: etc/initialdata:318
+#: etc/initialdata:295
 msgid "Ticket status changed"
 msgstr "申请�现况已改�"
 
@@ -5627,16 +5863,24 @@ msgstr "申请�视察员"
 msgid "Tickets"
 msgstr "申请�"
 
-#: lib/RT/Tickets_Overlay.pm:1383
+#: lib/RT/Tickets_Overlay.pm:1402
 #. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
 msgid "Tickets %1 %2"
 msgstr "申请� %1 %2"
 
-#: lib/RT/Tickets_Overlay.pm:1348
+#: lib/RT/Tickets_Overlay.pm:1367
 #. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
 msgid "Tickets %1 by %2"
 msgstr "申请� %1 (%2)"
 
+#: NOT FOUND IN SOURCE
+msgid "Tickets I own"
+msgstr "待处�的申请�"
+
+#: NOT FOUND IN SOURCE
+msgid "Tickets I requested"
+msgstr "�出的申请�"
+
 #: html/Elements/ViewUser:25
 #. ($name)
 msgid "Tickets from %1"
@@ -5646,15 +5890,15 @@ msgstr "%1 的申请�"
 msgid "Tickets which depend on this approval:"
 msgstr "批准之�，�接续处�："
 
-#: html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
+#: html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47 html/Work/Tickets/Elements/EditBasics:32
 msgid "Time Left"
 msgstr "剩馀时间"
 
-#: html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:42
+#: html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:42 html/Work/Tickets/Elements/EditBasics:24
 msgid "Time Worked"
 msgstr "处�时间"
 
-#: lib/RT/Tickets_Overlay.pm:1139
+#: lib/RT/Tickets_Overlay.pm:1158
 msgid "Time left"
 msgstr "剩馀时间"
 
@@ -5662,7 +5906,7 @@ msgstr "剩馀时间"
 msgid "Time to display"
 msgstr "显示时间"
 
-#: lib/RT/Tickets_Overlay.pm:1115
+#: lib/RT/Tickets_Overlay.pm:1134
 msgid "Time worked"
 msgstr "已处�时间"
 
@@ -5670,7 +5914,7 @@ msgstr "已处�时间"
 msgid "TimeLeft"
 msgstr "剩馀时间"
 
-#: lib/RT/Ticket_Overlay.pm:1173
+#: lib/RT/Ticket_Overlay.pm:1210
 msgid "TimeWorked"
 msgstr "已处�时间"
 
@@ -5682,32 +5926,40 @@ msgstr "产生这次更动的差异档："
 msgid "To generate a diff of this commit:\\n"
 msgstr "产生这次更动的差异档：\\n"
 
-#: lib/RT/Ticket_Overlay.pm:1176
+#: lib/RT/Ticket_Overlay.pm:1213
 msgid "Told"
 msgstr "告知日期"
 
-#: html/Edit/Elements/Page:46
+#: html/Edit/Elements/Page:47
 msgid "Total"
 msgstr "页"
 
-#: etc/initialdata:239
+#: etc/initialdata:237
 msgid "Transaction"
 msgstr "更动"
 
-#: lib/RT/Transaction_Overlay.pm:640
+#: lib/RT/Transaction_Overlay.pm:666
 #. ($self->Data)
 msgid "Transaction %1 purged"
 msgstr "清除更动报告 %1"
 
-#: lib/RT/Transaction_Overlay.pm:177
+#: lib/RT/Transaction_Overlay.pm:126
 msgid "Transaction Created"
 msgstr "更动报告已新增"
 
-#: lib/RT/Transaction_Overlay.pm:88
+#: lib/RT/Transaction_Overlay.pm:90
 msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
 msgstr "未指定申请�编�，无法新增更动"
 
-#: lib/RT/Transaction_Overlay.pm:699
+#: NOT FOUND IN SOURCE
+msgid "TransactionBatch"
+msgstr "批次更动时"
+
+#: NOT FOUND IN SOURCE
+msgid "TransactionCreate"
+msgstr "新增更动时"
+
+#: lib/RT/Transaction_Overlay.pm:721
 msgid "Transactions are immutable"
 msgstr "��更改更动报告"
 
@@ -5723,7 +5975,7 @@ msgstr "星期二"
 msgid "Tue."
 msgstr "星期二"
 
-#: html/Admin/Elements/EditCustomField:43 html/Admin/Elements/ModifyTemplateAsWorkflow:135 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1174 lib/RT/Tickets_Overlay.pm:959
+#: html/Admin/Elements/EditCustomField:43 html/Admin/Elements/ModifyTemplateAsWorkflow:135 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1211 lib/RT/Tickets_Overlay.pm:978
 msgid "Type"
 msgstr "类别"
 
@@ -5739,7 +5991,7 @@ msgstr "外部系统登入��"
 msgid "UnixUsername"
 msgstr "外部系统登入��"
 
-#: lib/RT/Attachment_Overlay.pm:273 lib/RT/Attachment_Overlay.pm:303
+#: lib/RT/Attachment_Overlay.pm:281 lib/RT/Attachment_Overlay.pm:313
 #. ($self->ContentEncoding)
 msgid "Unknown ContentEncoding %1"
 msgstr "��解的内容文字编�方� %1"
@@ -5748,11 +6000,11 @@ msgstr "��解的内容文字编�方� %1"
 msgid "Unlimited"
 msgstr "全数显示"
 
-#: etc/initialdata:50
+#: etc/initialdata:32
 msgid "Unprivileged"
 msgstr "�内部�员"
 
-#: lib/RT/Transaction_Overlay.pm:569
+#: lib/RT/Transaction_Overlay.pm:526
 msgid "Untaken"
 msgstr "未被��"
 
@@ -5760,7 +6012,7 @@ msgstr "未被��"
 msgid "Up"
 msgstr "上一页"
 
-#: html/Elements/MyTickets:63 html/Search/Bulk.html:32 html/Work/Elements/MyTickets:72 html/Work/Search/Bulk.html:10 html/Work/Tickets/Elements/EditCustomFieldEntries:82
+#: html/Elements/MyTickets:63 html/Search/Bulk.html:32 html/Work/Elements/MyTickets:83 html/Work/Search/Bulk.html:10 html/Work/Tickets/Elements/EditCustomFieldEntries:63
 msgid "Update"
 msgstr "处�"
 
@@ -5784,7 +6036,7 @@ msgstr "更新电�邮件信箱"
 msgid "Update name"
 msgstr "更新��"
 
-#: lib/RT/Interface/Web.pm:409
+#: lib/RT/Interface/Web.pm:467
 msgid "Update not recorded."
 msgstr "更新未被记录"
 
@@ -5804,21 +6056,21 @@ msgstr "更新申请�"
 msgid "Update ticket # %1"
 msgstr "更新申请� # %1"
 
-#: html/SelfService/Update.html:24 html/SelfService/Update.html:46
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
 #. ($Ticket->id)
 msgid "Update ticket #%1"
 msgstr "更新申请� #%1"
 
-#: html/Ticket/Update.html:138 html/Work/Tickets/Update.html:122
+#: html/Ticket/Update.html:139
 #. ($Ticket->id, $Ticket->Subject)
 msgid "Update ticket #%1 (%2)"
 msgstr "更新申请� #%1 (%2)"
 
-#: lib/RT/Interface/Web.pm:407
+#: lib/RT/Interface/Web.pm:465
 msgid "Update type was neither correspondence nor comment."
 msgstr "更新的内容并�申请�回�也�是评论"
 
-#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:50 lib/RT/Ticket_Overlay.pm:1177
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1214
 msgid "Updated"
 msgstr "�次更新"
 
@@ -5842,31 +6094,31 @@ msgstr "找�到使用者 '%1'"
 msgid "User '%1' not found\\n"
 msgstr "找�到使用者 '%1'\\n"
 
-#: etc/initialdata:142 etc/initialdata:209
+#: etc/initialdata:124 etc/initialdata:191
 msgid "User Defined"
 msgstr "使用者自订"
 
-#: html/Admin/Users/Prefs.html:58 html/Edit/Users/List:13 html/Edit/Users/Top:42
+#: html/Admin/Users/Prefs.html:58
 msgid "User ID"
 msgstr "使用者 ID"
 
-#: html/Elements/SelectUsers:25
+#: html/Edit/Elements/SelectUsers:3 html/Elements/SelectUsers:25
 msgid "User Id"
 msgstr "使用者 ID"
 
-#: html/Edit/Elements/PickUsers:12 html/Edit/Global/UserRight/List:7 html/Edit/Global/UserRight/Top:9 html/Edit/Users/Add.html:13 html/Edit/Users/List:5 html/Edit/Users/Search.html:23 html/Edit/Users/Top:8 html/Work/Delegates/Info:60 html/Work/Tickets/Cc:10
+#: html/Edit/Elements/PickUsers:12 html/Edit/Global/UserRight/List:7 html/Edit/Global/UserRight/Top:9 html/Edit/Users/Add.html:13 html/Edit/Users/Search.html:23 html/Work/Delegates/Info:60 html/Work/Tickets/Cc:10
 msgid "User Number"
 msgstr "员工编�"
 
-#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58 html/Edit/Global/autohandler:11 html/Edit/Queues/autohandler:22
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58 html/Edit/Global/autohandler:11 html/Edit/Queues/autohandler:26
 msgid "User Rights"
 msgstr "使用者��"
 
-#: html/Edit/Elements/Tab:32
+#: html/Edit/Elements/Tab:34
 msgid "User Setup"
 msgstr "使用者设定"
 
-#: html/Edit/Users/Info:38
+#: NOT FOUND IN SOURCE
 msgid "User Shift"
 msgstr "员工�别"
 
@@ -5875,18 +6127,34 @@ msgstr "员工�别"
 msgid "User could not be created: %1"
 msgstr "无法新增使用者：%1"
 
-#: lib/RT/User_Overlay.pm:321
+#: lib/RT/User_Overlay.pm:326
 msgid "User created"
 msgstr "使用者新增完毕"
 
+#: NOT FOUND IN SOURCE
+msgid "User created: %1"
+msgstr "使用者 %1 新增完毕"
+
+#: NOT FOUND IN SOURCE
+msgid "User created: %1 (%2)"
+msgstr "使用者 %1 (%2) 新增完毕"
+
 #: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
 msgid "User defined groups"
 msgstr "使用者定义的群组"
 
+#: lib/RT/User_Overlay.pm:580 lib/RT/User_Overlay.pm:597
+msgid "User loaded"
+msgstr "已加载使用者"
+
 #: NOT FOUND IN SOURCE
 msgid "User notified"
 msgstr "已通知使用者"
 
+#: NOT FOUND IN SOURCE
+msgid "User renamed from %1 to %2"
+msgstr "使用者 %1 已改�为 %2"
+
 #: html/Admin/Users/Prefs.html:24 html/Admin/Users/Prefs.html:28
 msgid "User view"
 msgstr "使用者�人数�"
@@ -5899,7 +6167,7 @@ msgstr "使用者自定"
 msgid "Username"
 msgstr "��"
 
-#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57 html/Work/Tickets/Elements/ShowTransaction:8
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/Edit/Groups/Admin:9 html/User/Groups/Members.html:57 html/Work/Tickets/Elements/ShowTransaction:11
 msgid "Users"
 msgstr "使用者"
 
@@ -5907,7 +6175,7 @@ msgstr "使用者"
 msgid "Users matching search criteria"
 msgstr "符�查询�件的使用者"
 
-#: html/Search/Elements/PickRestriction:50 html/Work/Search/PickRestriction:31
+#: NOT FOUND IN SOURCE
 msgid "ValueOfQueue"
 msgstr "选择表�"
 
@@ -5927,7 +6195,7 @@ msgstr "以管�员副本收件人身份视察"
 msgid "Watcher loaded"
 msgstr "�功加载视察员信�"
 
-#: html/Admin/Elements/QueueTabs:41
+#: html/Admin/Elements/QueueTabs:41 html/Edit/Elements/SelectQueues:5
 msgid "Watchers"
 msgstr "视察员"
 
@@ -5943,55 +6211,55 @@ msgstr "星期三"
 msgid "Wed."
 msgstr "星期三"
 
-#: etc/initialdata:533 etc/upgrade/2.1.71:161 html/Edit/Elements/CreateApprovalsQueue:135
+#: etc/initialdata:503 etc/upgrade/2.1.71:161 html/Edit/Elements/CreateApprovalsQueue:135
 msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
 msgstr "当申请�通过所有签核�，将此讯�回�到原申请�"
 
-#: etc/initialdata:497 etc/upgrade/2.1.71:135 html/Edit/Elements/CreateApprovalsQueue:107
+#: etc/initialdata:467 etc/upgrade/2.1.71:135 html/Edit/Elements/CreateApprovalsQueue:107
 msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
 msgstr "当申请�通过�项签核�，将此讯�回�到原申请�"
 
-#: etc/initialdata:156
+#: etc/initialdata:138
 msgid "When a ticket is created"
 msgstr "新增申请�时"
 
-#: etc/initialdata:428 etc/upgrade/2.1.71:79 html/Edit/Elements/CreateApprovalsQueue:51
+#: etc/initialdata:400 etc/upgrade/2.1.71:79 html/Edit/Elements/CreateApprovalsQueue:51
 msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
 msgstr "签核�新增之�，通知应��的承办人�管�员副本收件人"
 
-#: etc/initialdata:161
+#: etc/initialdata:143
 msgid "When anything happens"
 msgstr "当任何事情�生时"
 
-#: etc/initialdata:202
+#: etc/initialdata:184
 msgid "Whenever a ticket is resolved"
 msgstr "当申请�解决时"
 
-#: etc/initialdata:188
+#: etc/initialdata:170
 msgid "Whenever a ticket's owner changes"
 msgstr "当申请�更�承办人时"
 
-#: etc/initialdata:196
+#: etc/initialdata:178
 msgid "Whenever a ticket's queue changes"
 msgstr "当申请�更�表�时"
 
-#: etc/initialdata:180
+#: etc/initialdata:162
 msgid "Whenever a ticket's status changes"
 msgstr "当申请�更新现况时"
 
-#: etc/initialdata:210
+#: etc/initialdata:192
 msgid "Whenever a user-defined condition occurs"
 msgstr "当使用者自订的情况�生时"
 
-#: etc/initialdata:174
+#: etc/initialdata:156
 msgid "Whenever comments come in"
 msgstr "当评论�达时"
 
-#: etc/initialdata:167
+#: etc/initialdata:149
 msgid "Whenever correspondence comes in"
 msgstr "当回��达时"
 
-#: html/Admin/Users/Modify.html:163 html/User/Prefs.html:51 html/Work/Preferences/Info:31
+#: html/Admin/Users/Modify.html:163 html/User/Prefs.html:67 html/Work/Preferences/Info:36
 msgid "Work"
 msgstr "公�"
 
@@ -6020,23 +6288,35 @@ msgstr "�程结�"
 msgid "Workflow deleted"
 msgstr "�程已删除"
 
-#: html/Edit/Global/autohandler:10 html/Edit/Queues/autohandler:21
+#: html/Edit/Global/autohandler:10 html/Edit/Queues/autohandler:25
 msgid "Workflows"
 msgstr "�程"
 
-#: html/Edit/Global/Basic/Top:25
+#: html/Edit/Global/CustomField/SelectWritable:5
+msgid "Writable"
+msgstr "�读写"
+
+#: html/autohandler:144
+msgid "XXX CHANGEME You are not an authorized user"
+msgstr "XXX CHANGEME 您是未�授�的使用者"
+
+#: html/Edit/Global/Basic/Top:25 html/Edit/Queues/Basic/Top:82
 msgid "Yes"
 msgstr "是"
 
-#: lib/RT/Ticket_Overlay.pm:3159
+#: lib/RT/Ticket_Overlay.pm:3200
 msgid "You already own this ticket"
 msgstr "您已是这份申请�的承办人"
 
-#: html/autohandler:122
+#: html/autohandler:136
 msgid "You are not an authorized user"
 msgstr "您�是被授�的使用者"
 
-#: lib/RT/Ticket_Overlay.pm:3041
+#: html/Ticket/Elements/ShowTransaction:81
+msgid "You can access it with the Download button on the right."
+msgstr "您�以按�方的「下载�键��得。"
+
+#: lib/RT/Ticket_Overlay.pm:3082
 msgid "You can only reassign tickets that you own or that are unowned"
 msgstr "祇能�新指派您所承办或是没有承办人的申请�"
 
@@ -6044,7 +6324,7 @@ msgstr "祇能�新指派您所承办或是没有承办人的申请�"
 msgid "You don't have permission to view that ticket.\\n"
 msgstr "您没有看那份申请�的��。\\n"
 
-#: docs/design_docs/string-extraction-guide.txt:47
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
 msgstr "您会在表� %2 找到 %1 的申请�"
@@ -6057,11 +6337,11 @@ msgstr "您已注销 RT。"
 msgid "You have no permission to create tickets in that queue."
 msgstr "您没有在该表�新增申请�的��。"
 
-#: lib/RT/Ticket_Overlay.pm:1917
+#: lib/RT/Ticket_Overlay.pm:1935
 msgid "You may not create requests in that queue."
 msgstr "您�能在该表�中�出申请。"
 
-#: html/Edit/Global/Basic/Top:38
+#: html/Edit/Global/Basic/Top:42
 msgid "You need to restart the Request Tracker service for saved changes to take effect."
 msgstr "您必须�新激活 Request Tracker �务，储存的更动�会生效。"
 
@@ -6077,11 +6357,11 @@ msgstr "您�出的 %1 申请�"
 msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
 msgstr "RT 管�员�能设错了由 RT 寄出的邮件收件人标头档"
 
-#: etc/initialdata:514 etc/upgrade/2.1.71:146 html/Edit/Elements/CreateApprovalsQueue:119
+#: etc/initialdata:484 etc/upgrade/2.1.71:146 html/Edit/Elements/CreateApprovalsQueue:119
 msgid "Your request has been approved by %1. Other approvals may still be pending."
 msgstr "申请�已由 %1 批准。�能还有其它待签核的步骤。"
 
-#: etc/initialdata:552 etc/upgrade/2.1.71:180 html/Edit/Elements/CreateApprovalsQueue:154
+#: etc/initialdata:522 etc/upgrade/2.1.71:180 html/Edit/Elements/CreateApprovalsQueue:154
 msgid "Your request has been approved."
 msgstr "您的申请�已完�签核程�。"
 
@@ -6089,19 +6369,19 @@ msgstr "您的申请�已完�签核程�。"
 msgid "Your request was rejected"
 msgstr "您的申请�已被驳回"
 
-#: etc/initialdata:455
+#: NOT FOUND IN SOURCE
 msgid "Your request was rejected by %1."
 msgstr "您的申请�已被 %1 驳回。"
 
-#: etc/upgrade/2.1.71:101 html/Edit/Elements/CreateApprovalsQueue:73
+#: etc/initialdata:427 etc/upgrade/2.1.71:101 html/Edit/Elements/CreateApprovalsQueue:73
 msgid "Your request was rejected."
 msgstr "您的申请�已被驳回。"
 
-#: html/autohandler:144
+#: html/autohandler:170
 msgid "Your username or password is incorrect"
 msgstr "您的��或�令有误"
 
-#: html/Admin/Elements/ModifyUser:83 html/Admin/Users/Modify.html:143 html/User/Prefs.html:95 html/Work/Preferences/Info:84
+#: html/Admin/Elements/ModifyUser:83 html/Admin/Users/Modify.html:143 html/User/Prefs.html:130 html/Work/Preferences/Info:87
 msgid "Zip"
 msgstr "邮政编�"
 
@@ -6117,6 +6397,10 @@ msgstr "过期"
 msgid "alert"
 msgstr "急讯"
 
+#: NOT FOUND IN SOURCE
+msgid "approving"
+msgstr "待签核"
+
 #: html/User/Elements/DelegateRights:58
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
@@ -6138,11 +6422,11 @@ msgstr "内容"
 msgid "content-type"
 msgstr "类型"
 
-#: lib/RT/Ticket_Overlay.pm:2304
+#: lib/RT/Ticket_Overlay.pm:2326
 msgid "correspondence (probably) not sent"
 msgstr "申请�回�(�能)未�出"
 
-#: lib/RT/Ticket_Overlay.pm:2314
+#: lib/RT/Ticket_Overlay.pm:2336
 msgid "correspondence sent"
 msgstr "申请�回�已�出"
 
@@ -6150,7 +6434,7 @@ msgstr "申请�回�已�出"
 msgid "critical"
 msgstr "严�"
 
-#: html/Admin/Elements/ModifyQueue:62 html/Admin/Queues/Modify.html:76 html/Edit/Queues/Basic/Top:31 html/Edit/Queues/List:18 html/Work/Queues/List:11 lib/RT/Date.pm:319
+#: html/Admin/Elements/ModifyQueue:62 html/Admin/Queues/Modify.html:76 html/Edit/Queues/Basic/Top:34 html/Edit/Queues/List:32 html/Work/Queues/List:11 lib/RT/Date.pm:319
 msgid "days"
 msgstr "天"
 
@@ -6219,11 +6503,11 @@ msgstr "编�"
 msgid "info"
 msgstr "信�"
 
-#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickRestriction:46 html/Search/Elements/PickRestriction:75 html/Search/Elements/PickRestriction:87 html/Work/Search/PickRestriction:27 html/Work/Search/PickRestriction:56 html/Work/Search/PickRestriction:69
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickRestriction:46 html/Search/Elements/PickRestriction:75 html/Search/Elements/PickRestriction:87 html/Work/Search/PickRestriction:27 html/Work/Search/PickRestriction:56 html/Work/Search/PickRestriction:75
 msgid "is"
 msgstr "是"
 
-#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88 html/Work/Search/PickRestriction:28 html/Work/Search/PickRestriction:57 html/Work/Search/PickRestriction:70
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88 html/Work/Search/PickRestriction:28 html/Work/Search/PickRestriction:57 html/Work/Search/PickRestriction:76
 msgid "isn't"
 msgstr "�是"
 
@@ -6259,11 +6543,15 @@ msgstr "月"
 msgid "new"
 msgstr "新建立"
 
+#: html/Admin/Elements/EditCustomFields:42
+msgid "no name"
+msgstr "没有�称"
+
 #: html/Admin/Elements/EditScrips:42
 msgid "no value"
 msgstr "没有值"
 
-#: html/Admin/Elements/EditQueueWatchers:26 html/Edit/Groups/Member:40 html/Edit/Groups/Members/Add.html:17 html/Edit/Groups/Members/List:8 html/Edit/Queues/Basic/Top:50 html/Edit/Queues/List:18 html/Ticket/Elements/EditWatchers:27 html/Work/Delegates/Info:37 html/Work/Delegates/Info:48 html/Work/Overview/Info:31 html/Work/Queues/List:11 html/Work/Tickets/Elements/ShowBasics:27
+#: html/Admin/Elements/EditQueueWatchers:26 html/Edit/Groups/Member:40 html/Edit/Groups/Members/Add.html:17 html/Edit/Groups/Members/List:8 html/Edit/Queues/List:32 html/Ticket/Elements/EditWatchers:27 html/Work/Delegates/Info:37 html/Work/Delegates/Info:48 html/Work/Overview/Info:31 html/Work/Queues/List:11 html/Work/Tickets/Elements/EditWatchers:5 html/Work/Tickets/Elements/ShowAttachments:30 html/Work/Tickets/Elements/ShowBasics:27
 msgid "none"
 msgstr "æ— "
 
@@ -6305,11 +6593,11 @@ msgstr "表� %1 %2"
 msgid "rejected"
 msgstr "已驳回"
 
-#: html/Work/Elements/SelectSearch:21 lib/RT/Queue_Overlay.pm:60
+#: lib/RT/Queue_Overlay.pm:60
 msgid "resolved"
 msgstr "已处�"
 
-#: html/Edit/Global/Basic/Top:48
+#: html/Edit/Global/Basic/Top:53
 msgid "rtname"
 msgstr "�务器�称"
 
@@ -6335,16 +6623,21 @@ msgstr "系统群组 '%1'"
 msgid "the calling component did not specify why"
 msgstr "呼�组件未指明原因"
 
+#: lib/RT/URI/fsck_com_rt.pm:234
+#. ($self->Object->Id)
+msgid "ticket #%1"
+msgstr "申请� #%1"
+
 #: lib/RT/Group_Overlay.pm:209
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
 msgstr "申请� #%1 %2"
 
-#: html/Work/Elements/SelectSearch:27
+#: html/Work/Elements/SelectSearch:28
 msgid "till"
 msgstr "至"
 
-#: html/Edit/Elements/PickUsers:15 html/Edit/Global/Workflow/Condition:30 html/Edit/Users/Add.html:16 html/Edit/Users/Search.html:26 html/Work/Tickets/Cc:13
+#: html/Edit/Elements/PickUsers:15 html/Edit/Global/Workflow/Condition:31 html/Edit/Users/Add.html:16 html/Edit/Users/Search.html:26 html/Work/Tickets/Cc:13
 msgid "to"
 msgstr "到"
 
@@ -6357,7 +6650,7 @@ msgstr "真"
 msgid "undescribed group %1"
 msgstr "没有�述的群组 %1"
 
-#: html/Work/Elements/SelectSearch:19
+#: NOT FOUND IN SOURCE
 msgid "unresolved"
 msgstr "未处�"
 
diff --git a/rt/lib/RT/I18N/zh_tw.po b/rt/lib/RT/I18N/zh_tw.po
index 8c8c86e1f..6688b6a89 100644
--- a/rt/lib/RT/I18N/zh_tw.po
+++ b/rt/lib/RT/I18N/zh_tw.po
@@ -1,4 +1,4 @@
-# Traditional Chinese localization catalog for Request Tracker (RT)
+# Chinese localization catalog for Request Tracker (RT)
 msgid ""
 msgstr ""
 "Last-Translator: Autrijus Tang <autrijus@autrijus.org>\n"
@@ -40,7 +40,7 @@ msgstr "%*(%1) 件尚未解決的申請單"
 msgid "%1 %2"
 msgstr "%1 %2"
 
-#: lib/RT/Tickets_Overlay.pm:771
+#: lib/RT/Tickets_Overlay.pm:790
 #. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
 msgid "%1 %2 %3"
 msgstr "%1 %2 %3"
@@ -50,10 +50,11 @@ msgstr "%1 %2 %3"
 msgid "%1 %2 %3 %4:%5:%6 %7"
 msgstr "%7-%2-%3 %4:%5:%6 %1"
 
-#: lib/RT/Ticket_Overlay.pm:3532 lib/RT/Transaction_Overlay.pm:557 lib/RT/Transaction_Overlay.pm:599
+#: lib/RT/Ticket_Overlay.pm:3588 lib/RT/Transaction_Overlay.pm:514 lib/RT/Transaction_Overlay.pm:557 lib/RT/Transaction_Vendor.pm:19
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
+#. ($field, $new_value)
 msgid "%1 %2 added"
 msgstr "%2 已新增為 %1"
 
@@ -62,16 +63,18 @@ msgstr "%2 已新增為 %1"
 msgid "%1 %2 ago"
 msgstr "%1 %2 之�"
 
-#: lib/RT/Ticket_Overlay.pm:3538 lib/RT/Transaction_Overlay.pm:564
+#: lib/RT/Ticket_Overlay.pm:3594 lib/RT/Transaction_Overlay.pm:521 lib/RT/Transaction_Vendor.pm:25
 #. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
+#. ($field, $old_value, $new_value)
 msgid "%1 %2 changed to %3"
 msgstr "%1 已從 %2 改為 %3"
 
-#: lib/RT/Ticket_Overlay.pm:3535 lib/RT/Transaction_Overlay.pm:560 lib/RT/Transaction_Overlay.pm:605
+#: lib/RT/Ticket_Overlay.pm:3591 lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:563 lib/RT/Transaction_Vendor.pm:22
 #. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
+#. ($field, $old_value)
 msgid "%1 %2 deleted"
 msgstr "%2 已自 %1 刪除"
 
@@ -121,17 +124,17 @@ msgstr "%1 - 指定欲使用的�件模組"
 msgid "%1 - Specify the search module you want to use"
 msgstr "%1 - 指定欲使用的查詢模組"
 
-#: lib/RT/ScripAction_Overlay.pm:121
+#: lib/RT/ScripAction_Overlay.pm:122
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
 msgstr "載入手續 %1"
 
-#: html/Edit/Elements/Page:48
+#: html/Edit/Elements/Page:49
 #. (scalar $count)
 msgid "%1 Total"
 msgstr "å…± %1 ç­†"
 
-#: lib/RT/Ticket_Overlay.pm:3565
+#: lib/RT/Ticket_Overlay.pm:3621
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
 msgstr "新增 %1 作為 %2 的值"
@@ -154,13 +157,13 @@ msgstr "別� %1 需��用的申請單編號以處� %3(出自 %2)"
 msgid "%1 appears to be a local object, but can't be found in the database"
 msgstr "%1 看來是個本地物件，��在資料庫裡"
 
-#: html/Ticket/Elements/ShowDates:51 lib/RT/Transaction_Overlay.pm:481
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:430
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
 msgstr "%1 (%2)"
 
-#: lib/RT/Transaction_Overlay.pm:535 lib/RT/Transaction_Overlay.pm:624 lib/RT/Transaction_Overlay.pm:633 lib/RT/Transaction_Overlay.pm:636
+#: lib/RT/Transaction_Overlay.pm:484 lib/RT/Transaction_Overlay.pm:649 lib/RT/Transaction_Overlay.pm:658 lib/RT/Transaction_Overlay.pm:661
 #. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
@@ -168,7 +171,7 @@ msgstr "%1 (%2)"
 msgid "%1 changed from %2 to %3"
 msgstr "%1 的值從 %2 改為 %3"
 
-#: lib/RT/Interface/Web.pm:893 x:896
+#: lib/RT/Interface/Web.pm:953
 msgid "%1 could not be set to %2."
 msgstr "無法將 %1 設定為 %2。"
 
@@ -176,7 +179,7 @@ msgstr "無法將 %1 設定為 %2。"
 msgid "%1 couldn't init a transaction (%2)\\n"
 msgstr "%1 無法�始更新 (%2)\\n"
 
-#: lib/RT/Ticket_Overlay.pm:2830
+#: lib/RT/Ticket_Overlay.pm:2880
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
 msgstr "%1 無法將��設�已解決。RT 資料庫內容�能�一致。"
@@ -206,12 +209,12 @@ msgstr "%1 是從外部排程程�(如 cron)來�申請單進行�作的工
 msgid "%1 is no longer a %2 for this queue."
 msgstr "%1 已��是此表單的 %2。"
 
-#: lib/RT/Ticket_Overlay.pm:1569
+#: lib/RT/Ticket_Overlay.pm:1596
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this ticket."
 msgstr "%1 已��是此申請單的 %2。"
 
-#: lib/RT/Ticket_Overlay.pm:3621
+#: lib/RT/Ticket_Overlay.pm:3677
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 is no longer a value for custom field %2"
 msgstr "%1 已��是自訂欄� %2 的值。"
@@ -264,17 +267,17 @@ msgstr "%1 會解決在已解決群組裡�員的申請單。"
 msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
 msgstr "如果 %1 起始申請單�賴於�個��，或是�個��的�員，它將會被延宕。"
 
-#: lib/RT/Transaction_Overlay.pm:433
+#: lib/RT/Transaction_Overlay.pm:382 lib/RT/Transaction_Vendor.pm:37
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr "%1：未指定附件"
 
-#: html/Ticket/Elements/ShowTransaction:89 html/Work/Tickets/Elements/ShowTransaction:154
+#: html/Ticket/Elements/ShowTransaction:100 html/Work/Tickets/Elements/ShowTransaction:158
 #. ($size)
 msgid "%1b"
 msgstr "%1 �元組"
 
-#: html/Ticket/Elements/ShowTransaction:86 html/Work/Tickets/Elements/ShowTransaction:151
+#: html/Ticket/Elements/ShowTransaction:97 html/Work/Tickets/Elements/ShowTransaction:155
 #. (int($size/102.4)/10)
 msgid "%1k"
 msgstr "%1k �元組"
@@ -283,7 +286,7 @@ msgstr "%1k �元組"
 msgid "%quant(%1,result) found"
 msgstr "找到 %1 項�果"
 
-#: lib/RT/Ticket_Overlay.pm:1158
+#: lib/RT/Ticket_Overlay.pm:1185
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
 msgstr "'%1' �是一個�法的狀態值"
@@ -300,7 +303,7 @@ msgstr "(點�欲刪除的�員)"
 msgid "(Check box to delete scrip)"
 msgstr "(點�欲刪除的手續)"
 
-#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Elements/EditWorkflows:36 html/Admin/Groups/Members.html:51 html/Ticket/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Elements/EditWorkflows:36 html/Admin/Groups/Members.html:51 html/Ticket/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54 html/Work/Tickets/Elements/EditLinks:20 html/Work/Tickets/Elements/EditPeople:36
 msgid "(Check box to delete)"
 msgstr "(點�欲刪除的項目)"
 
@@ -308,7 +311,7 @@ msgstr "(點�欲刪除的項目)"
 msgid "(Check boxes to delete)"
 msgstr "(點�欲刪除的項目)"
 
-#: html/Ticket/Create.html:177
+#: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, seperated with spaces)"
 msgstr "(�入申請單編號或網�，以空白分隔)"
 
@@ -342,7 +345,7 @@ msgstr "沒有範本"
 msgid "(No workflows)"
 msgstr "沒有�程"
 
-#: html/Ticket/Update.html:83 html/Work/Tickets/Update.html:52
+#: html/Ticket/Update.html:83 html/Work/Tickets/Update.html:56
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr "(�出本份更新的密件副本給�單上以逗號隔開的電�郵件��。這<b>�會</b>更改後續的收件者�單。)"
 
@@ -366,7 +369,7 @@ msgstr "(�出本份更新的副本給�單上以逗號隔開的電�郵件
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
 msgstr "(�出本份更新的副本給�單上以逗號隔開的電�郵件��。這<b>將會</b>更改後續的收件者�單。)"
 
-#: html/Ticket/Elements/EditCustomFieldEntries:35 html/Work/Tickets/Elements/EditCustomFieldEntries:48 html/Work/Tickets/Elements/ShowCustomFieldEntries:13
+#: html/Ticket/Elements/EditCustomFieldEntries:35 html/Work/Tickets/Elements/EditCustomFieldEntries:43 html/Work/Tickets/Elements/ShowCustomFieldEntries:14
 msgid "(delete)"
 msgstr "(刪除)"
 
@@ -374,7 +377,7 @@ msgstr "(刪除)"
 msgid "(empty)"
 msgstr "(空白)"
 
-#: html/Edit/Global/CustomField/index.html:113 html/Edit/Global/Scrip/index.html:111 html/Edit/Global/Template/index.html:106
+#: html/Edit/Elements/Index:87 html/Edit/Global/CustomField/index.html:116 html/Edit/Global/Scrip/index.html:111 html/Edit/Global/Template/index.html:106
 msgid "(new)"
 msgstr "(新增)"
 
@@ -382,23 +385,23 @@ msgstr "(新增)"
 msgid "(no name listed)"
 msgstr "(沒有列出姓�)"
 
-#: html/Elements/MyRequests:42 html/Elements/MyTickets:44 html/Work/Elements/MyApprovals:37 html/Work/Elements/MyRequests:42 html/Work/Elements/MyTickets:51
+#: html/Elements/MyRequests:42 html/Elements/MyTickets:44 html/Work/Elements/MyApprovals:37 html/Work/Elements/MyRequests:43 html/Work/Elements/MyTickets:52
 msgid "(no subject)"
 msgstr "(沒有主題)"
 
-#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:60 html/Ticket/Elements/EditCustomFieldValues:52 html/Ticket/Elements/ShowCustomFields:35 html/Work/Elements/EditCustomFieldValues:50 html/Work/Elements/EditCustomFields:32 html/Work/Tickets/Elements/EditCustomFieldValues:33 lib/RT/Transaction_Overlay.pm:534
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/EditCustomFieldValues:52 html/Ticket/Elements/ShowCustomFields:35 html/Work/Elements/EditCustomFieldValues:50 html/Work/Elements/EditCustomFields:32 html/Work/Tickets/Elements/EditCustomFieldValues:33 lib/RT/Transaction_Overlay.pm:483
 msgid "(no value)"
 msgstr "(ç„¡)"
 
-#: html/Ticket/Elements/BulkLinks:27 html/Ticket/Elements/EditLinks:115 html/Work/Search/BulkLinks:3
+#: html/Ticket/Elements/BulkLinks:27 html/Ticket/Elements/EditLinks:98 html/Work/Search/BulkLinks:3 html/Work/Tickets/Elements/EditLinks:102
 msgid "(only one ticket)"
 msgstr "(僅能指定一份申請單)"
 
-#: html/Elements/MyRequests:51 html/Elements/MyTickets:54 html/Work/Elements/List:17 html/Work/Elements/MyRequests:52 html/Work/Elements/MyTickets:66 html/Work/Tickets/Elements/ShowBasics:52
+#: html/Elements/MyRequests:51 html/Elements/MyTickets:54 html/Work/Elements/List:17 html/Work/Elements/MyRequests:53 html/Work/Elements/MyTickets:67 html/Work/Tickets/Elements/ShowBasics:52
 msgid "(pending approval)"
 msgstr "(等待簽核)"
 
-#: html/Elements/MyRequests:53 html/Elements/MyTickets:56 html/Work/Elements/MyRequests:54 html/Work/Elements/MyTickets:68
+#: html/Elements/MyRequests:53 html/Elements/MyTickets:56 html/Work/Elements/MyRequests:55 html/Work/Elements/MyTickets:69
 msgid "(pending other tickets)"
 msgstr "(等待其他申請單)"
 
@@ -406,11 +409,11 @@ msgstr "(等待其他申請單)"
 msgid "(requestor's group)"
 msgstr "(申請人所屬)"
 
-#: html/Admin/Users/Modify.html:49
+#: html/Admin/Users/Modify.html:49 html/Edit/Users/Info:26
 msgid "(required)"
 msgstr "(å¿…å¡«)"
 
-#: html/Ticket/Elements/ShowTransaction:92 html/Work/Tickets/Elements/ShowTransaction:39
+#: html/Ticket/Elements/ShowTransaction:103 html/Work/Tickets/Elements/ShowTransaction:44
 msgid "(untitled)"
 msgstr "(未命�)"
 
@@ -426,12 +429,12 @@ msgstr "<% $Ticket->Status%>"
 msgid "<% $_ %>"
 msgstr "<% $_ %>"
 
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 html/Work/Elements/104Header:43
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 html/Work/Elements/104Header:43 lib/RT/StyleGuide.pod:767
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
 msgstr "<input type=\"submit\" value=\"�出申請單\">&nbsp;%1"
 
-#: etc/initialdata.zh:221 etc/initialdata:203
+#: etc/initialdata:203
 msgid "A blank template"
 msgstr "空白範本"
 
@@ -479,11 +482,11 @@ msgstr "系統使用登錄權�"
 msgid "Access control"
 msgstr "存�權�"
 
-#: html/Admin/Elements/EditScrip:56 html/Work/Tickets/Elements/ShowTransaction:18
+#: html/Admin/Elements/EditScrip:56 html/Work/Tickets/Elements/ShowTransaction:21
 msgid "Action"
 msgstr "動作"
 
-#: lib/RT/Scrip_Overlay.pm:146
+#: lib/RT/Scrip_Overlay.pm:148
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
 msgstr "動作 %1 找�到"
@@ -496,11 +499,11 @@ msgstr "動作執行完畢"
 msgid "Action prepared..."
 msgstr "動作準備完畢..."
 
-#: html/Work/Elements/List:13 html/Work/Elements/SelectSearch:24 html/Work/Tickets/Create.html:28 html/Work/Tickets/Elements/ShowBasics:12
+#: html/Work/Elements/List:13 html/Work/Elements/SelectSearch:25 html/Work/Tickets/Create.html:27 html/Work/Tickets/Elements/ShowBasics:12
 msgid "Activated Date"
 msgstr "申請啟動時間"
 
-#: html/Edit/Elements/104Buttons:71 html/Edit/Elements/ListButtons:7
+#: html/Edit/Elements/104Buttons:82 html/Edit/Elements/ListButtons:7
 msgid "Add"
 msgstr "新增"
 
@@ -512,11 +515,11 @@ msgstr "新增管�員副本收件人"
 msgid "Add Cc"
 msgstr "新增副本收件人"
 
-#: html/Ticket/Elements/EditCustomFieldEntries:71 html/Work/Tickets/Elements/ShowCustomFieldEntries:49
+#: html/Ticket/Elements/EditCustomFieldEntries:71 html/Work/Tickets/Elements/ShowCustomFieldEntries:50
 msgid "Add Entry"
 msgstr "新增列"
 
-#: html/Ticket/Create.html:113 html/Ticket/Update.html:98 html/Work/Tickets/Elements/AddAttachments:18
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:98 html/Work/Tickets/Elements/AddAttachments:23
 msgid "Add More Files"
 msgstr "新增更多附件"
 
@@ -577,16 +580,20 @@ msgstr "新增下一項關�"
 msgid "Added principal as a %1 for this queue"
 msgstr "單�已新增為此表單的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1453
+#: lib/RT/Ticket_Overlay.pm:1480
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
 msgstr "單�已新增為此申請單的 %1"
 
-#: html/Admin/Elements/ModifyUser:75 html/Admin/Users/Modify.html:121 html/User/Prefs.html:87 html/Work/Preferences/Info:77
+#: html/Edit/Global/CustomField/Top:52
+msgid "Additional Hints"
+msgstr "�外�示"
+
+#: html/Admin/Elements/ModifyUser:75 html/Admin/Users/Modify.html:121 html/User/Prefs.html:114 html/Work/Preferences/Info:79
 msgid "Address1"
 msgstr "��"
 
-#: html/Admin/Elements/ModifyUser:77 html/Admin/Users/Modify.html:126 html/User/Prefs.html:89 html/Work/Preferences/Info:79
+#: html/Admin/Elements/ModifyUser:77 html/Admin/Users/Modify.html:126 html/User/Prefs.html:118 html/Work/Preferences/Info:81
 msgid "Address2"
 msgstr "��(續)"
 
@@ -594,7 +601,7 @@ msgstr "��(續)"
 msgid "Adjust Blinking Rate"
 msgstr "調整閃�速度快慢"
 
-#: html/Edit/Groups/Admin:9
+#: html/Edit/Queues/List:12
 msgid "Admin"
 msgstr "管�員"
 
@@ -602,11 +609,11 @@ msgstr "管�員"
 msgid "Admin Cc"
 msgstr "管�員副本"
 
-#: etc/initialdata.zh:303 etc/initialdata:280
+#: etc/initialdata:280
 msgid "Admin Comment"
 msgstr "管�員評論"
 
-#: etc/initialdata.zh:261 etc/initialdata:259
+#: etc/initialdata:259
 msgid "Admin Correspondence"
 msgstr "管�員回覆"
 
@@ -634,7 +641,7 @@ msgstr "管�/群組"
 msgid "Admin/Queue/Basics"
 msgstr "管�/表單/基本資訊"
 
-#: html/Edit/Global/Basic/Top:60
+#: html/Edit/Global/Basic/Top:65
 msgid "AdminAddress"
 msgstr "管�員 Email"
 
@@ -642,7 +649,7 @@ msgstr "管�員 Email"
 msgid "AdminAllPersonalGroups"
 msgstr "管�所有代�人群組"
 
-#: etc/initialdata.zh:74 etc/initialdata:56 html/Admin/Elements/ModifyTemplateAsWorkflow:155 html/Ticket/Elements/ShowPeople:38 html/Ticket/Update.html:49 lib/RT/ACE_Overlay.pm:88
+#: etc/initialdata:56 html/Admin/Elements/ModifyTemplateAsWorkflow:155 html/Ticket/Elements/ShowPeople:38 html/Ticket/Update.html:49 html/Work/Tickets/Elements/ShowLinks:11 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
 msgstr "管�員副本"
 
@@ -658,7 +665,7 @@ msgstr "管�員回覆"
 msgid "AdminCustomFields"
 msgstr "管�自訂欄�"
 
-#: html/Edit/Groups/Admin:12 lib/RT/Group_Overlay.pm:145
+#: lib/RT/Group_Overlay.pm:145
 msgid "AdminGroup"
 msgstr "管�群組"
 
@@ -698,7 +705,7 @@ msgstr "管�使用者"
 msgid "Administrative"
 msgstr "行政類"
 
-#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53 html/Work/Tickets/Elements/EditPeople:44
 msgid "Administrative Cc"
 msgstr "管�員副本"
 
@@ -718,7 +725,7 @@ msgstr "晚於"
 msgid "Age"
 msgstr "經歷時間"
 
-#: html/Admin/Elements/ModifyTemplateAsWorkflow:172 html/Edit/Global/Workflow/Action:39
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:172 html/Edit/Global/Workflow/Action:35
 msgid "Alias"
 msgstr "執行其他�程"
 
@@ -726,11 +733,11 @@ msgstr "執行其他�程"
 msgid "Alias for"
 msgstr "相當於"
 
-#: html/Edit/Queues/index.html:33 html/Work/Delegates/index.html:13 html/Work/Elements/SelectSearch:11 html/Work/Queues/Select.html:14 html/Work/Queues/index.html:13
+#: html/Work/Delegates/index.html:13 html/Work/Elements/SelectSearch:11 html/Work/Queues/Select.html:14 html/Work/Queues/index.html:13
 msgid "All"
 msgstr "全部"
 
-#: etc/initialdata.zh:372 etc/initialdata:348
+#: etc/initialdata:348
 msgid "All Approvals Passed"
 msgstr "完�全部簽核"
 
@@ -738,7 +745,7 @@ msgstr "完�全部簽核"
 msgid "All Condition"
 msgstr "所有�件"
 
-#: html/Admin/Elements/EditCustomFields:95
+#: html/Admin/Elements/EditCustomFields:94
 msgid "All Custom Fields"
 msgstr "所有自訂欄�"
 
@@ -750,6 +757,10 @@ msgstr "所有表單"
 msgid "All Users"
 msgstr "全體員工"
 
+#: NOT FOUND IN SOURCE
+msgid "All done!  Now you can proceed to %1."
+msgstr "處�完畢�您�在�以繼續進行 %1。"
+
 #: NOT FOUND IN SOURCE
 msgid "Allowance Request"
 msgstr "�利補助申請"
@@ -766,7 +777,7 @@ msgstr "數�"
 msgid "Any Condition"
 msgstr "任��件"
 
-#: html/Edit/Global/Scrip/List:10 html/Edit/Global/Scrip/Top:74
+#: html/Edit/Global/Scrip/List:10 html/Edit/Global/Scrip/Top:86
 msgid "Apply Template"
 msgstr "引用範本"
 
@@ -803,11 +814,11 @@ msgstr "簽核時�"
 msgid "Approval Notes"
 msgstr "簽核�見"
 
-#: etc/initialdata.zh:357 etc/initialdata:336
+#: etc/initialdata:336
 msgid "Approval Passed"
 msgstr "完��項簽核"
 
-#: etc/initialdata.zh:383 etc/initialdata:359
+#: etc/initialdata:359
 msgid "Approval Rejected"
 msgstr "�回�項簽核"
 
@@ -835,11 +846,11 @@ msgstr "核准"
 msgid "Approver"
 msgstr "簽核人"
 
-#: html/Edit/Global/Workflow/Action:29 html/Edit/Global/Workflow/Owner.html:10
+#: html/Edit/Global/Workflow/Action:25 html/Edit/Global/Workflow/Owner.html:10
 msgid "Approver Setting"
 msgstr "執行簽核人設定"
 
-#: etc/initialdata.zh:516 etc/initialdata:486 etc/upgrade/2.1.71:148 html/Edit/Elements/CreateApprovalsQueue:122
+#: etc/initialdata:486 etc/upgrade/2.1.71:148 html/Edit/Elements/CreateApprovalsQueue:122
 msgid "Approver's notes: %1"
 msgstr "簽核備註：%1"
 
@@ -863,15 +874,15 @@ msgstr "您確定�刪除？"
 msgid "Ascending"
 msgstr "�增"
 
-#: html/Search/Bulk.html:136 html/SelfService/Update.html:32 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:98 html/Work/Search/Bulk.html:88
+#: html/Search/Bulk.html:136 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:98 html/Work/Search/Bulk.html:88
 msgid "Attach"
 msgstr "附件"
 
-#: html/SelfService/Create.html:64 html/Ticket/Create.html:109 html/Work/Tickets/Elements/AddAttachments:15
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109 html/Work/Tickets/Elements/AddAttachments:19
 msgid "Attach file"
 msgstr "附加檔案"
 
-#: html/Ticket/Create.html:97 html/Ticket/Update.html:87 html/Work/Tickets/Elements/AddAttachments:6
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:87 html/Work/Tickets/Elements/AddAttachments:7 html/Work/Tickets/Elements/ShowAttachments:9
 msgid "Attached file"
 msgstr "�有附件"
 
@@ -879,15 +890,15 @@ msgstr "�有附件"
 msgid "Attachment '%1' could not be loaded"
 msgstr "無法載入附件 '%1'"
 
-#: lib/RT/Transaction_Overlay.pm:441
+#: lib/RT/Transaction_Overlay.pm:390 lib/RT/Transaction_Vendor.pm:50
 msgid "Attachment created"
 msgstr "附件新增完畢"
 
-#: lib/RT/Tickets_Overlay.pm:1189
+#: lib/RT/Tickets_Overlay.pm:1208
 msgid "Attachment filename"
 msgstr "附件檔�"
 
-#: html/Ticket/Elements/ShowAttachments:25 html/Work/Tickets/Elements/ShowTransaction:32
+#: html/Ticket/Elements/ShowAttachments:25 html/Work/Tickets/Elements/ShowTransaction:37
 msgid "Attachments"
 msgstr "附件"
 
@@ -915,11 +926,11 @@ msgstr "自動�回表單"
 msgid "AutoResolve"
 msgstr "自動完�表單處�"
 
-#: etc/initialdata.zh:224 etc/initialdata:206
+#: etc/initialdata:206
 msgid "Autoreply"
 msgstr "自動回覆"
 
-#: etc/initialdata.zh:90 etc/initialdata:72
+#: etc/initialdata:72
 msgid "Autoreply To Requestors"
 msgstr "自動�申請人回覆"
 
@@ -927,7 +938,7 @@ msgstr "自動�申請人回覆"
 msgid "AutoreplyToRequestors"
 msgstr "自動�申請人回覆"
 
-#: html/Edit/Rights/index.html:16
+#: html/Edit/Rights/index.html:17
 msgid "Available Rights:"
 msgstr "權�項目列表："
 
@@ -956,19 +967,19 @@ msgstr "%1 的資料錯誤"
 msgid "Bad transaction number for attachment. %1 should be %2\\n"
 msgstr "附件的處�號碼錯誤。%1 應為 %2\\n"
 
-#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Edit/Global/autohandler:6 html/Edit/Queues/autohandler:17 html/Edit/Users/index.html:121 html/Ticket/Elements/Tabs:89 html/User/Elements/GroupTabs:37
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Edit/Global/autohandler:6 html/Edit/Queues/autohandler:21 html/Edit/Users/index.html:94 html/Ticket/Elements/Tabs:89 html/User/Elements/GroupTabs:37
 msgid "Basics"
 msgstr "基本資訊"
 
-#: html/Ticket/Update.html:81 html/Work/Tickets/Update.html:49
+#: html/Ticket/Update.html:81 html/Work/Tickets/Update.html:53
 msgid "Bcc"
 msgstr "密件副本"
 
-#: html/Admin/Elements/EditScrip:87 html/Admin/Global/GroupRights.html:84 html/Admin/Global/Template.html:45 html/Admin/Global/UserRights.html:53 html/Admin/Global/Workflow.html:46 html/Admin/Groups/GroupRights.html:72 html/Admin/Groups/Members.html:80 html/Admin/Groups/Modify.html:55 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:44 html/Admin/Queues/UserRights.html:53 html/Admin/Queues/Workflow.html:44 html/User/Groups/Modify.html:55
+#: html/Admin/Elements/EditScrip:95 html/Admin/Global/GroupRights.html:84 html/Admin/Global/Template.html:45 html/Admin/Global/UserRights.html:53 html/Admin/Global/Workflow.html:46 html/Admin/Groups/GroupRights.html:72 html/Admin/Groups/Members.html:80 html/Admin/Groups/Modify.html:55 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:44 html/Admin/Queues/UserRights.html:53 html/Admin/Queues/Workflow.html:44 html/User/Groups/Modify.html:55
 msgid "Be sure to save your changes"
 msgstr "請別忘了儲存修改。"
 
-#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:321
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:320
 msgid "Before"
 msgstr "æ—©æ–¼"
 
@@ -980,11 +991,11 @@ msgstr "開始簽核"
 msgid "Begin From "
 msgstr "起始日"
 
-#: html/Edit/Users/Info:25
+#: NOT FOUND IN SOURCE
 msgid "Birthday"
 msgstr "生日"
 
-#: etc/initialdata.zh:220 etc/initialdata:202
+#: etc/initialdata:202
 msgid "Blank"
 msgstr "空白範本"
 
@@ -1008,7 +1019,7 @@ msgstr "事業部"
 msgid "Business Unit:"
 msgstr "事業部："
 
-#: lib/RT/User_Overlay.pm:1524
+#: lib/RT/User_Overlay.pm:1529
 msgid "Can not modify system users"
 msgstr "無法更改系統使用者"
 
@@ -1024,11 +1035,11 @@ msgstr "�能新增沒有�稱的自訂欄�值"
 msgid "Can't link a ticket to itself"
 msgstr "申請單�能��自己。"
 
-#: lib/RT/Ticket_Overlay.pm:2807
+#: lib/RT/Ticket_Overlay.pm:2857
 msgid "Can't merge into a merged ticket. You should never get this error"
 msgstr "�能整�進已整��的申請單。這個錯誤�該發生。"
 
-#: lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2694
+#: lib/RT/Ticket_Overlay.pm:2659 lib/RT/Ticket_Overlay.pm:2738
 msgid "Can't specifiy both base and target"
 msgstr "�能�時指定起始申請單與目的申請單"
 
@@ -1036,7 +1047,7 @@ msgstr "�能�時指定起始申請單與目的申請單"
 msgid "Cancel"
 msgstr "�消"
 
-#: html/autohandler:113
+#: html/autohandler:126
 #. ($msg)
 msgid "Cannot create user: %1"
 msgstr "無法新增使用者：%1"
@@ -1053,7 +1064,7 @@ msgstr "分類管�"
 msgid "Category"
 msgstr "分類"
 
-#: etc/initialdata.zh:68 etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:44 html/Ticket/Update.html:76 html/Work/Tickets/Update.html:43 lib/RT/ACE_Overlay.pm:87
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:44 html/Ticket/Update.html:76 html/Work/Tickets/Elements/EditPeople:41 html/Work/Tickets/Elements/ShowLinks:6 html/Work/Tickets/Update.html:43 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
 msgstr "副本"
 
@@ -1073,11 +1084,11 @@ msgstr "修改申請單"
 msgid "Change password"
 msgstr "更改密碼"
 
-#: html/Edit/Global/Basic/Top:70
+#: html/Edit/Global/Basic/Top:79
 msgid "ChangeOwnerUI"
 msgstr "���擇表單承辦人"
 
-#: html/Ticket/Create.html:100 html/Ticket/Elements/EditCustomFieldEntries:35 html/Ticket/Update.html:90 html/Work/Tickets/Elements/ShowCustomFieldEntries:13
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Elements/EditCustomFieldEntries:35 html/Ticket/Update.html:90 html/Work/Tickets/Elements/ShowCustomFieldEntries:14
 msgid "Check box to delete"
 msgstr "�擇欲刪除的項目"
 
@@ -1085,11 +1096,11 @@ msgstr "�擇欲刪除的項目"
 msgid "Check box to revoke right"
 msgstr "�擇欲撤消的權利"
 
-#: html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:42 html/Ticket/Elements/EditLinks:130 html/Ticket/Elements/EditLinks:68 html/Ticket/Elements/ShowLinks:56 html/Work/Search/BulkLinks:18
+#: html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42 html/Ticket/Elements/EditLinks:113 html/Ticket/Elements/EditLinks:63 html/Ticket/Elements/ShowLinks:56 html/Work/Search/BulkLinks:18 html/Work/Tickets/Elements/EditLinks:117 html/Work/Tickets/Elements/EditLinks:56 html/Work/Tickets/Elements/ShowMembers:4
 msgid "Children"
 msgstr "�申請單"
 
-#: html/Edit/Elements/PickUsers:21 html/Edit/Global/UserRight/List:8 html/Edit/Global/UserRight/Top:19 html/Edit/Users/List:6 html/Edit/Users/Top:18
+#: html/Edit/Elements/PickUsers:21 html/Edit/Global/UserRight/List:8 html/Edit/Global/UserRight/Top:19
 msgid "Chinese Name"
 msgstr "中文姓�"
 
@@ -1097,7 +1108,7 @@ msgstr "中文姓�"
 msgid "Chinese/English"
 msgstr "中英文"
 
-#: html/Admin/Elements/ModifyUser:79 html/Admin/Users/Modify.html:131 html/User/Prefs.html:91 html/Work/Preferences/Info:81
+#: html/Admin/Elements/ModifyUser:79 html/Admin/Users/Modify.html:131 html/User/Prefs.html:122 html/Work/Preferences/Info:83
 msgid "City"
 msgstr "所在城市"
 
@@ -1105,7 +1116,7 @@ msgstr "所在城市"
 msgid "ClassicUI"
 msgstr "傳統介�"
 
-#: html/Ticket/Elements/ShowDates:46
+#: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
 msgstr "已解決"
 
@@ -1117,7 +1128,7 @@ msgstr "已解決的申請單"
 msgid "Closed tickets"
 msgstr "已解決的申請單"
 
-#: html/Admin/Elements/ModifyTemplateAsWorkflow:181 html/Edit/Global/Workflow/Action:58 html/Edit/Global/Workflow/Condition:51
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:181 html/Edit/Global/Workflow/Action:54 html/Edit/Global/Workflow/Condition:52
 msgid "Code"
 msgstr "執行程�碼"
 
@@ -1125,7 +1136,7 @@ msgstr "執行程�碼"
 msgid "Command not understood!\\n"
 msgstr "指令無法辨識�\\n"
 
-#: html/Ticket/Elements/ShowTransaction:166 html/Ticket/Elements/Tabs:152 html/Work/Search/Bulk.html:89 html/Work/Tickets/Display.html:37 html/Work/Tickets/Elements/ShowTransaction:114 html/Work/Tickets/Elements/ShowTransaction:27
+#: html/Ticket/Elements/ShowTransaction:178 html/Ticket/Elements/Tabs:152 html/Work/Search/Bulk.html:89 html/Work/Tickets/Display.html:60 html/Work/Tickets/Elements/ShowTransaction:118 html/Work/Tickets/Elements/ShowTransaction:32
 msgid "Comment"
 msgstr "è©•è«–"
 
@@ -1145,7 +1156,7 @@ msgstr "�申請單�出評論"
 msgid "CommentOnTicket"
 msgstr "評論申請單"
 
-#: html/Admin/Elements/ModifyUser:34 html/Work/Tickets/Update.html:59
+#: html/Admin/Elements/ModifyUser:34 html/Work/Tickets/Elements/AddContent:7
 msgid "Comments"
 msgstr "è©•è«–"
 
@@ -1162,11 +1173,11 @@ msgstr "評論(��給申請人)"
 msgid "Comments about %1"
 msgstr "å°� %1 çš„è©•è«–"
 
-#: html/Admin/Users/Modify.html:184 html/Ticket/Elements/ShowRequestor:43
+#: html/Admin/Users/Modify.html:184 html/Edit/Users/Info:46 html/Ticket/Elements/ShowRequestor:43
 msgid "Comments about this user"
 msgstr "使用者�述"
 
-#: lib/RT/Transaction_Overlay.pm:543
+#: lib/RT/Transaction_Overlay.pm:501
 msgid "Comments added"
 msgstr "新增評論完畢"
 
@@ -1178,10 +1189,14 @@ msgstr "確�"
 msgid "Commit Stubbed"
 msgstr "消除更動完畢"
 
-#: html/Edit/Users/Info:41
+#: NOT FOUND IN SOURCE
 msgid "Company Name"
 msgstr "公��稱"
 
+#: html/Edit/Global/Basic/Top:85
+msgid "CompanySpecific"
+msgstr "�公��立顯示"
+
 #: NOT FOUND IN SOURCE
 msgid "Compile Restrictions"
 msgstr "設定查詢�件"
@@ -1194,11 +1209,11 @@ msgstr "�件"
 msgid "Condition matches..."
 msgstr "符��件..."
 
-#: lib/RT/Scrip_Overlay.pm:159
+#: lib/RT/Scrip_Overlay.pm:164
 msgid "Condition not found"
 msgstr "未找到符�的��"
 
-#: html/Edit/Global/GroupRight/Top:26 html/Edit/Global/UserRight/Top:45 html/Edit/Groups/Member:57 html/Elements/Tabs:49
+#: html/Edit/Global/GroupRight/Top:26 html/Edit/Global/UserRight/Top:45 html/Edit/Groups/Member:56 html/Elements/Tabs:49
 msgid "Configuration"
 msgstr "設定"
 
@@ -1210,7 +1225,7 @@ msgstr "確�密碼"
 msgid "Confirm Password"
 msgstr "密碼確�"
 
-#: html/Work/Approvals/Display.html:25 html/Work/Tickets/Create.html:161 html/Work/Tickets/Create.html:174 html/Work/Tickets/Update.html:81
+#: html/Work/Approvals/Display.html:25 html/Work/Tickets/Create.html:154 html/Work/Tickets/Create.html:168 html/Work/Tickets/Update.html:77
 msgid "Confirm Submit"
 msgstr "確定�出"
 
@@ -1234,7 +1249,7 @@ msgstr "內容"
 msgid "Coould not create group"
 msgstr "無法新增群組"
 
-#: html/Edit/Elements/104Buttons:74
+#: html/Edit/Elements/104Buttons:85
 msgid "Copy"
 msgstr "複製"
 
@@ -1242,7 +1257,7 @@ msgstr "複製"
 msgid "Copy Field From:"
 msgstr "欲複製欄�："
 
-#: etc/initialdata.zh:282 etc/initialdata:271
+#: etc/initialdata:271
 msgid "Correspondence"
 msgstr "回覆"
 
@@ -1250,7 +1265,7 @@ msgstr "回覆"
 msgid "Correspondence Address"
 msgstr "申請單回覆地�"
 
-#: lib/RT/Transaction_Overlay.pm:539
+#: lib/RT/Transaction_Overlay.pm:497
 msgid "Correspondence added"
 msgstr "新增申請單回覆"
 
@@ -1258,7 +1273,7 @@ msgstr "新增申請單回覆"
 msgid "Correspondence not recorded"
 msgstr "未紀錄申請單回覆"
 
-#: lib/RT/Ticket_Overlay.pm:3552
+#: lib/RT/Ticket_Overlay.pm:3608
 msgid "Could not add new custom field value for ticket. "
 msgstr "�能新增自訂欄�的值 "
 
@@ -1266,11 +1281,11 @@ msgstr "�能新增自訂欄�的值 "
 msgid "Could not add new custom field value for ticket. %1 "
 msgstr "�能新增自訂欄�的值。%1 "
 
-#: lib/RT/Ticket_Overlay.pm:3058 lib/RT/Ticket_Overlay.pm:3066 lib/RT/Ticket_Overlay.pm:3083
+#: lib/RT/Ticket_Overlay.pm:3108 lib/RT/Ticket_Overlay.pm:3116 lib/RT/Ticket_Overlay.pm:3133
 msgid "Could not change owner. "
 msgstr "�能更改承辦人。 "
 
-#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:165 html/Edit/Global/CustomField/index.html:117
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164 html/Edit/Global/CustomField/index.html:120
 #. ($msg)
 msgid "Could not create CustomField"
 msgstr "無法新增自訂欄�"
@@ -1285,20 +1300,25 @@ msgstr "無法建立訊�通知"
 msgid "Could not create Template"
 msgstr "無法建立通知範本"
 
-#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:473 lib/RT/Group_Overlay.pm:480
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:471 lib/RT/Group_Overlay.pm:478
 msgid "Could not create group"
 msgstr "無法新增群組"
 
+#: html/Edit/Elements/Index:89
+#. ($msg)
+msgid "Could not create item"
+msgstr "無法新增項目"
+
 #: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
 #. ($msg)
 msgid "Could not create template: %1"
 msgstr "無法新增範本：%1"
 
-#: lib/RT/Ticket_Overlay.pm:1091 lib/RT/Ticket_Overlay.pm:334
+#: lib/RT/Ticket_Overlay.pm:1118 lib/RT/Ticket_Overlay.pm:353
 msgid "Could not create ticket. Queue not set"
 msgstr "無法新增申請單。尚未指定表單。"
 
-#: lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:483
+#: lib/RT/User_Overlay.pm:271 lib/RT/User_Overlay.pm:284 lib/RT/User_Overlay.pm:302 lib/RT/User_Overlay.pm:488
 msgid "Could not create user"
 msgstr "無法新增使用者"
 
@@ -1319,11 +1339,11 @@ msgstr "找�到編號 %1 的申請單"
 msgid "Could not find group %1."
 msgstr "找�到群組 %1。"
 
-#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1421
+#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1448
 msgid "Could not find or create that user"
 msgstr "找�到或無法新增該�使用者"
 
-#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1500
+#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1527
 msgid "Could not find that principal"
 msgstr "找�到該單�"
 
@@ -1331,8 +1351,7 @@ msgstr "找�到該單�"
 msgid "Could not find user %1."
 msgstr "找�到使用者 %1。"
 
-#: html/Admin/Groups/Members.html:87 html/Edit/Users/index.html:83 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
-#. ( . $GroupId)
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
 msgid "Could not load group"
 msgstr "無法載入群組"
 
@@ -1341,7 +1360,7 @@ msgstr "無法載入群組"
 msgid "Could not make that principal a %1 for this queue"
 msgstr "無法將該單�設為此表單的 %1。"
 
-#: lib/RT/Ticket_Overlay.pm:1442
+#: lib/RT/Ticket_Overlay.pm:1469
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
 msgstr "無法將該單�設為此申請單的 %1。"
@@ -1351,16 +1370,16 @@ msgstr "無法將該單�設為此申請單的 %1。"
 msgid "Could not remove that principal as a %1 for this queue"
 msgstr "無法將單� %1 從表單移除。"
 
-#: lib/RT/Ticket_Overlay.pm:1558
+#: lib/RT/Ticket_Overlay.pm:1585
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this ticket"
 msgstr "無法將單� %1 從申請單移除。"
 
-#: lib/RT/Group_Overlay.pm:984
+#: lib/RT/Group_Overlay.pm:982
 msgid "Couldn't add member to group"
 msgstr "無法新增�員至群組"
 
-#: lib/RT/Ticket_Overlay.pm:3562 lib/RT/Ticket_Overlay.pm:3618
+#: lib/RT/Ticket_Overlay.pm:3618 lib/RT/Ticket_Overlay.pm:3674
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
 msgstr "無法新增更動報告"
@@ -1373,11 +1392,11 @@ msgstr "無法從 gpg 回函辨識出該採�的行動\\n"
 msgid "Couldn't find group\\n"
 msgstr "找�到群組\\n"
 
-#: lib/RT/Interface/Web.pm:902 x:905
+#: lib/RT/Interface/Web.pm:962
 msgid "Couldn't find row"
 msgstr "找�到此列資料"
 
-#: lib/RT/Group_Overlay.pm:958
+#: lib/RT/Group_Overlay.pm:956
 msgid "Couldn't find that principal"
 msgstr "找�到該單�"
 
@@ -1410,9 +1429,10 @@ msgstr "無法載入 RT 設定檔 '%1' %2"
 msgid "Couldn't load Scrips."
 msgstr "無法載入手續。"
 
-#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74 html/Edit/Global/GroupRight/Add.html:54 html/Edit/Global/UserRight/Add.html:23 html/Edit/Groups/Member:121 html/Edit/Groups/Members/Add.html:44 html/Edit/Rights/index.html:57
-#. ($Group)
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74 html/Edit/Global/GroupRight/Add.html:55 html/Edit/Global/GroupRight/Add.html:60 html/Edit/Global/UserRight/Add.html:25 html/Edit/Global/UserRight/Add.html:30 html/Edit/Groups/Member:120 html/Edit/Groups/Members/Add.html:43 html/Edit/Rights/index.html:58 html/Edit/Rights/index.html:63
 #. ($ObjectGroup)
+#. ($Report)
+#. ($Group)
 #. ($id)
 msgid "Couldn't load group %1"
 msgstr "無法載入手續 %1"
@@ -1421,12 +1441,12 @@ msgstr "無法載入手續 %1"
 msgid "Couldn't load link"
 msgstr "無法載入��。"
 
-#: html/Admin/Elements/EditCustomFields:146 html/Admin/Queues/People.html:120
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
 #. ($id)
 msgid "Couldn't load queue"
 msgstr "無法載入表單"
 
-#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71 html/Edit/Global/GroupRight/Add.html:50 html/Edit/Global/GroupRight/index.html:81 html/Edit/Global/UserRight/Add.html:19 html/Edit/Global/UserRight/index.html:83 html/Edit/Rights/index.html:53
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71 html/Edit/Global/GroupRight/Add.html:51 html/Edit/Global/GroupRight/index.html:82 html/Edit/Global/GroupRight/index.html:87 html/Edit/Global/UserRight/Add.html:21 html/Edit/Global/UserRight/index.html:83 html/Edit/Global/UserRight/index.html:88 html/Edit/Rights/index.html:54
 #. ($Queue)
 #. ($id)
 msgid "Couldn't load queue %1"
@@ -1445,16 +1465,16 @@ msgstr "無法載入範本"
 msgid "Couldn't load that user (%1)"
 msgstr "無法載入該�使用者(%1)"
 
-#: html/SelfService/Display.html:108
+#: html/SelfService/Display.html:114
 #. ($id)
 msgid "Couldn't load ticket '%1'"
 msgstr "無法載入申請單 '%1'"
 
-#: html/Admin/Elements/ModifyUser:85 html/Admin/Users/Modify.html:148 html/User/Prefs.html:97 html/Work/Preferences/Info:87
+#: html/Admin/Elements/ModifyUser:85 html/Admin/Users/Modify.html:148 html/User/Prefs.html:134 html/Work/Preferences/Info:89
 msgid "Country"
 msgstr "國家"
 
-#: html/Admin/Elements/CreateUserCalled:25 html/Edit/Elements/PopHeader:29 html/Edit/Global/GroupRight/Add.html:18 html/Ticket/Create.html:134 html/Ticket/Create.html:194
+#: html/Admin/Elements/CreateUserCalled:25 html/Edit/Elements/PopHeader:33 html/Edit/Global/GroupRight/Add.html:19 html/Ticket/Create.html:134 html/Ticket/Create.html:195
 msgid "Create"
 msgstr "新增"
 
@@ -1462,7 +1482,7 @@ msgstr "新增"
 msgid "Create Subgroup:"
 msgstr "新增�群組："
 
-#: etc/initialdata.zh:145 etc/initialdata:127
+#: etc/initialdata:127
 msgid "Create Tickets"
 msgstr "新增申請單"
 
@@ -1519,7 +1539,7 @@ msgstr "新增範本"
 msgid "Create a new ticket"
 msgstr "新增申請單"
 
-#: html/Admin/Users/Modify.html:213 html/Admin/Users/Modify.html:240
+#: html/Admin/Users/Modify.html:213 html/Admin/Users/Modify.html:242
 msgid "Create a new user"
 msgstr "新增使用者"
 
@@ -1568,7 +1588,7 @@ msgstr "新增失敗：%1/%2/%3"
 msgid "Create new item"
 msgstr "建立新項目"
 
-#: etc/initialdata.zh:147 etc/initialdata:129
+#: etc/initialdata:129
 msgid "Create new tickets based on this scrip's template"
 msgstr "�據此項手續內的模版，新增申請單"
 
@@ -1604,7 +1624,7 @@ msgstr "新增�刪除�更改使用者"
 msgid "CreateTicket"
 msgstr "新增申請單"
 
-#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:26 lib/RT/Ticket_Overlay.pm:1185
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1212
 msgid "Created"
 msgstr "新增日"
 
@@ -1638,11 +1658,11 @@ msgstr "�有自訂欄�"
 msgid "Current Groups:"
 msgstr "�有群組列表："
 
-#: html/Ticket/Elements/EditLinks:27
+#: html/Ticket/Elements/EditLinks:27 html/Work/Tickets/Elements/EditLinks:10
 msgid "Current Relationships"
 msgstr "�有關係"
 
-#: html/Edit/Rights/index.html:19
+#: html/Edit/Rights/index.html:20
 msgid "Current Rights:"
 msgstr "�有權�："
 
@@ -1650,7 +1670,7 @@ msgstr "�有權�："
 msgid "Current Scrips"
 msgstr "�有手續"
 
-#: html/Work/Tickets/Create.html:50 html/Work/Tickets/Elements/ShowBasics:47
+#: html/Work/Tickets/Create.html:49 html/Work/Tickets/Elements/ShowBasics:47
 msgid "Current Status"
 msgstr "目�狀態"
 
@@ -1658,6 +1678,10 @@ msgstr "目�狀態"
 msgid "Current Templates"
 msgstr "�有範本"
 
+#: html/Work/Tickets/Elements/EditPeople:9
+msgid "Current Watchers"
+msgstr "�有視察員"
+
 #: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
 msgid "Current members"
 msgstr "�有�員"
@@ -1670,7 +1694,7 @@ msgstr "�有權�"
 msgid "Current search criteria"
 msgstr "�有查詢�件"
 
-#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44 html/Work/Tickets/Elements/EditPeople:32
 msgid "Current watchers"
 msgstr "�有視察員"
 
@@ -1679,7 +1703,7 @@ msgstr "�有視察員"
 msgid "Custom Field #%1"
 msgstr "自訂欄� #%1"
 
-#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Edit/Global/autohandler:7 html/Edit/Queues/autohandler:18 html/Ticket/Elements/ShowSummary:35
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Edit/Global/autohandler:7 html/Edit/Queues/autohandler:22 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
 msgstr "自訂欄�"
 
@@ -1699,31 +1723,31 @@ msgstr "動作�執行程�"
 msgid "Custom condition"
 msgstr "自訂�件"
 
-#: lib/RT/Tickets_Overlay.pm:1618
+#: lib/RT/Tickets_Overlay.pm:1637
 #. ($CF->Name , $args{OPERATOR} , $args{VALUE})
 msgid "Custom field %1 %2 %3"
 msgstr "自訂欄� %1 %2 %3"
 
-#: lib/RT/Tickets_Overlay.pm:1613
+#: lib/RT/Tickets_Overlay.pm:1632
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
 msgstr "自訂欄� %1 已有值"
 
-#: lib/RT/Tickets_Overlay.pm:1610
+#: lib/RT/Tickets_Overlay.pm:1629
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
 msgstr "自訂欄� %1 沒有值"
 
-#: lib/RT/Ticket_Overlay.pm:3454
+#: lib/RT/Ticket_Overlay.pm:3510
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
 msgstr "找�到自訂欄� %1"
 
-#: html/Admin/Elements/EditCustomFields:196
+#: html/Admin/Elements/EditCustomFields:195
 msgid "Custom field deleted"
 msgstr "自訂欄�已刪除"
 
-#: lib/RT/Ticket_Overlay.pm:3604
+#: lib/RT/Ticket_Overlay.pm:3660
 msgid "Custom field not found"
 msgstr "找�到自訂欄�"
 
@@ -1748,7 +1772,7 @@ msgstr "找�到自訂欄�值"
 msgid "Custom field value deleted"
 msgstr "自訂欄�值刪除�功"
 
-#: html/Admin/Elements/ModifyTemplateAsWorkflow:145 html/Edit/Global/Workflow/Owner.html:90 lib/RT/Transaction_Overlay.pm:548
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:145 html/Edit/Global/Workflow/Owner.html:90 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Vendor.pm:5
 msgid "CustomField"
 msgstr "自訂欄�"
 
@@ -1756,11 +1780,19 @@ msgstr "自訂欄�"
 msgid "Data error"
 msgstr "資料錯誤"
 
+#: html/Edit/Global/Basic/Top:77
+msgid "DatabaseBindRemote"
+msgstr "容許外部連線"
+
+#: html/Edit/Global/Basic/Top:75
+msgid "DatabaseName"
+msgstr "MySQL資料庫"
+
 #: NOT FOUND IN SOURCE
 msgid "Date of Departure"
 msgstr "出發日期"
 
-#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:92 html/Ticket/ModifyAll.html:43 html/Work/Tickets/Elements/ShowTransaction:14
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:92 html/Ticket/ModifyAll.html:43 html/Work/Tickets/Elements/ShowTransaction:17
 msgid "Dates"
 msgstr "日期"
 
@@ -1776,35 +1808,47 @@ msgstr "12"
 msgid "December"
 msgstr "�二月"
 
+#: NOT FOUND IN SOURCE
+msgid "Default Approval"
+msgstr "�設簽核"
+
 #: NOT FOUND IN SOURCE
 msgid "Default Autoresponse Template"
 msgstr "�設自動回應範本"
 
-#: etc/initialdata.zh:225 etc/initialdata:207
+#: etc/initialdata:207
 msgid "Default Autoresponse template"
 msgstr "�設自動回應範本"
 
-#: etc/initialdata.zh:304 etc/initialdata:281
+#: html/Edit/Global/CustomField/Top:46
+msgid "Default Value"
+msgstr "�設值"
+
+#: etc/initialdata:281
 msgid "Default admin comment template"
 msgstr "�設管�員評論範本"
 
-#: etc/initialdata.zh:262 etc/initialdata:260
+#: etc/initialdata:260
 msgid "Default admin correspondence template"
 msgstr "�設管�員回覆範本"
 
-#: etc/initialdata.zh:283 etc/initialdata:272
+#: etc/initialdata:272
 msgid "Default correspondence template"
 msgstr "�設回覆範本"
 
-#: etc/initialdata.zh:240 etc/initialdata:238
+#: etc/initialdata:238
 msgid "Default transaction template"
 msgstr "�設更動範本"
 
-#: lib/RT/Transaction_Overlay.pm:643
+#: lib/RT/Transaction_Overlay.pm:491
 #. ($type, $self->Field, $self->OldValue, $self->NewValue)
 msgid "Default: %1/%2 changed from %3 to %4"
 msgstr "�設：%1/%2 已自 %3 改為 %4"
 
+#: NOT FOUND IN SOURCE
+msgid "DefaultApproval"
+msgstr "�設簽核"
+
 #: html/User/Delegation.html:24 html/User/Delegation.html:27
 msgid "Delegate rights"
 msgstr "代表團權�"
@@ -1833,7 +1877,7 @@ msgstr "代�表單："
 msgid "Delegated Type"
 msgstr "代�表單種類"
 
-#: html/Edit/Users/index.html:125 html/Work/Delegates/Info:31 html/Work/Delegates/List:8 html/Work/Elements/Tab:41 html/Work/Overview/Info:28
+#: html/Edit/Users/index.html:98 html/Work/Delegates/Info:31 html/Work/Delegates/List:8 html/Work/Elements/Tab:41 html/Work/Overview/Info:28
 msgid "Delegates"
 msgstr "代�人"
 
@@ -1877,10 +1921,14 @@ msgstr "代�人群組"
 msgid "Delegation Rights"
 msgstr "代�人權�"
 
-#: html/Admin/Elements/ModifyTemplateAsWorkflow:113 html/Edit/Elements/104Buttons:73 html/Work/Search/index.html:48 html/Work/Search/index.html:48
+#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ModifyTemplateAsWorkflow:113 html/Edit/Elements/104Buttons:84 html/Work/Search/index.html:48 html/Work/Search/index.html:48
 msgid "Delete"
 msgstr "刪除"
 
+#: html/Admin/Elements/EditScrips:52
+msgid "Delete selected scrips"
+msgstr "刪除指定的手續"
+
 #: lib/RT/Queue_Overlay.pm:88
 msgid "Delete tickets"
 msgstr "刪除申請單"
@@ -1889,7 +1937,7 @@ msgstr "刪除申請單"
 msgid "DeleteTicket"
 msgstr "刪除申請單"
 
-#: lib/RT/Transaction_Overlay.pm:187
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Deleting this object could break referential integrity"
 msgstr "刪除此物件�能破壞�考完整性"
 
@@ -1897,7 +1945,7 @@ msgstr "刪除此物件�能破壞�考完整性"
 msgid "Deleting this object would break referential integrity"
 msgstr "刪除此物件�能破壞�考完整性"
 
-#: lib/RT/User_Overlay.pm:499
+#: lib/RT/User_Overlay.pm:504
 msgid "Deleting this object would violate referential integrity"
 msgstr "刪除此物件會���考完整性"
 
@@ -1917,11 +1965,11 @@ msgstr "�回"
 msgid "Department"
 msgstr "部門"
 
-#: html/Edit/Global/UserRight/List:12 html/Edit/Global/UserRight/Top:13 html/Edit/Users/List:10 html/Edit/Users/Top:12
+#: html/Edit/Global/UserRight/List:12 html/Edit/Global/UserRight/Top:13
 msgid "Department ID"
 msgstr "部門代碼"
 
-#: html/Edit/Global/UserRight/List:11 html/Edit/Global/UserRight/Top:49 html/Edit/Users/List:9 html/Edit/Users/Top:48 html/Work/Delegates/Info:78 html/Work/Overview/Info:60
+#: html/Edit/Global/UserRight/List:11 html/Edit/Global/UserRight/Top:49 html/Work/Delegates/Info:78 html/Work/Overview/Info:60
 msgid "Department Name"
 msgstr "部門�稱"
 
@@ -1945,7 +1993,7 @@ msgstr "請�單"
 msgid "Departure Until"
 msgstr "差旅截止日"
 
-#: html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/EditLinks:122 html/Ticket/Elements/EditLinks:46 html/Ticket/Elements/ShowDependencies:31 html/Ticket/Elements/ShowLinks:36 html/Work/Search/BulkLinks:10
+#: html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/EditLinks:105 html/Ticket/Elements/EditLinks:44 html/Ticket/Elements/ShowDependencies:31 html/Ticket/Elements/ShowLinks:36 html/Work/Search/BulkLinks:10 html/Work/Tickets/Elements/EditLinks:109 html/Work/Tickets/Elements/EditLinks:34 html/Work/Tickets/Elements/ShowLinks:21
 msgid "Depended on by"
 msgstr "�接續處�的申請單"
 
@@ -1953,7 +2001,27 @@ msgstr "�接續處�的申請單"
 msgid "Dependencies: \\n"
 msgstr "附屬性：\\n"
 
-#: html/Elements/SelectLinkType:26 html/Ticket/Create.html:179 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/EditLinks:118 html/Ticket/Elements/EditLinks:35 html/Ticket/Elements/ShowDependencies:24 html/Ticket/Elements/ShowLinks:26 html/Work/Search/BulkLinks:6
+#: lib/RT/Transaction_Overlay.pm:585
+#. ($value)
+msgid "Dependency by %1 added"
+msgstr "已加入�接續處�的申請單 %1"
+
+#: lib/RT/Transaction_Overlay.pm:622
+#. ($value)
+msgid "Dependency by %1 deleted"
+msgstr "已移除�接續處�的申請單 %1"
+
+#: lib/RT/Transaction_Overlay.pm:582
+#. ($value)
+msgid "Dependency on %1 added"
+msgstr "已加入需先處�的申請單 %1"
+
+#: lib/RT/Transaction_Overlay.pm:619
+#. ($value)
+msgid "Dependency on %1 deleted"
+msgstr "已移除需先處�的申請單 %1"
+
+#: html/Elements/SelectLinkType:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/EditLinks:101 html/Ticket/Elements/EditLinks:35 html/Ticket/Elements/ShowDependencies:24 html/Ticket/Elements/ShowLinks:26 html/Work/Search/BulkLinks:6 html/Work/Tickets/Elements/EditLinks:105 html/Work/Tickets/Elements/EditLinks:23 html/Work/Tickets/Elements/ShowLinks:16
 msgid "Depends on"
 msgstr "需先處�"
 
@@ -1969,7 +2037,7 @@ msgstr "�減"
 msgid "Describe the issue below"
 msgstr "在以下欄��述主題"
 
-#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:33 html/Admin/Elements/ModifyQueue:35 html/Admin/Elements/ModifyTemplate:35 html/Admin/Elements/ModifyTemplateAsWorkflow:192 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Edit/Global/Workflow/Action:14 html/Elements/SelectGroups:26 html/User/Groups/Modify.html:48 html/Work/Preferences/Info:103
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:33 html/Admin/Elements/ModifyQueue:35 html/Admin/Elements/ModifyTemplate:35 html/Admin/Elements/ModifyTemplateAsWorkflow:192 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Edit/Elements/SelectQueues:4 html/Edit/Global/Workflow/Action:13 html/Elements/SelectGroups:26 html/User/Groups/Modify.html:48
 msgid "Description"
 msgstr "�述"
 
@@ -1981,7 +2049,7 @@ msgstr "經辦業務說明"
 msgid "Description:"
 msgstr "�述："
 
-#: html/Work/Tickets/Create.html:117 html/Work/Tickets/Create.html:85 html/Work/Tickets/Elements/EditCustomFields:13 html/Work/Tickets/Elements/EditCustomFields:47 html/Work/Tickets/Elements/ShowCustomFields:15 html/Work/Tickets/Elements/ShowCustomFields:50
+#: html/Work/Tickets/Create.html:132 html/Work/Tickets/Create.html:84 html/Work/Tickets/Elements/EditCustomFields:13 html/Work/Tickets/Elements/EditCustomFields:61 html/Work/Tickets/Elements/ShowCustomFields:14 html/Work/Tickets/Elements/ShowCustomFields:53
 msgid "Details"
 msgstr "細節"
 
@@ -1989,15 +2057,15 @@ msgstr "細節"
 msgid "Direct"
 msgstr "直接"
 
-#: html/Edit/Users/Info:31
+#: NOT FOUND IN SOURCE
 msgid "Disability"
 msgstr "殘障身分"
 
-#: html/Edit/Users/Info:29
+#: NOT FOUND IN SOURCE
 msgid "Disability Type"
 msgstr "殘障類別"
 
-#: html/Edit/Global/GroupRight/List:9 html/Edit/Global/GroupRight/Top:16 html/Edit/Groups/List:11 html/Edit/Groups/Top:19 html/Edit/Queues/Basic/Top:70 html/Edit/Queues/List:13 html/Work/Delegates/Info:48 html/Work/Delegates/Info:53 html/Work/Delegates/List:12 html/Work/Overview/Info:42
+#: html/Edit/Global/GroupRight/List:9 html/Edit/Global/GroupRight/Top:16 html/Edit/Groups/List:11 html/Edit/Groups/Top:19 html/Edit/Queues/Basic/Top:69 html/Edit/Queues/List:15 html/Edit/Queues/List:27 html/Work/Delegates/Info:48 html/Work/Delegates/Info:53 html/Work/Delegates/List:12 html/Work/Overview/Info:42
 msgid "Disabled"
 msgstr "�用"
 
@@ -2033,7 +2101,7 @@ msgstr "�許一切�作"
 msgid "Don't refresh this page."
 msgstr "�更新此��。"
 
-#: html/Search/Elements/PickRestriction:113 html/Work/Search/PickRestriction:95
+#: html/Search/Elements/PickRestriction:113 html/Work/Search/PickRestriction:101
 msgid "Don't show search results"
 msgstr "�顯示查詢�果"
 
@@ -2041,7 +2109,7 @@ msgstr "�顯示查詢�果"
 msgid "Down"
 msgstr "下一�"
 
-#: html/Ticket/Elements/ShowTransaction:92
+#: html/Ticket/Elements/ShowTransaction:103
 msgid "Download"
 msgstr "下載"
 
@@ -2049,7 +2117,7 @@ msgstr "下載"
 msgid "Dr."
 msgstr "�士"
 
-#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:42 lib/RT/Ticket_Overlay.pm:1189
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 html/Work/Tickets/Elements/EditBasics:54 lib/RT/Ticket_Overlay.pm:1216
 msgid "Due"
 msgstr "到期日"
 
@@ -2066,7 +2134,7 @@ msgstr "無法解讀日期 '%1'"
 msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
 msgstr "無法載入申請單 '%1'：%2.\\n"
 
-#: html/Work/Tickets/Update.html:46
+#: html/Work/Tickets/Update.html:47
 msgid "Edit"
 msgstr "編輯"
 
@@ -2074,7 +2142,7 @@ msgstr "編輯"
 msgid "Edit Conditions"
 msgstr "編輯�置�件"
 
-#: html/Admin/Queues/CustomFields.html:44
+#: html/Admin/Queues/CustomFields.html:45
 #. ($Queue->Name)
 msgid "Edit Custom Fields for %1"
 msgstr "編輯 %1 的自訂欄�"
@@ -2168,15 +2236,19 @@ msgstr "最高學歷"
 msgid "EffectiveId"
 msgstr "有效編號"
 
-#: lib/RT/Ticket_Overlay.pm:2635 lib/RT/Ticket_Overlay.pm:2703
+#: lib/RT/Ticket_Overlay.pm:2673 lib/RT/Ticket_Overlay.pm:2751
 msgid "Either base or target must be specified"
 msgstr "需�指定起始申請單或目的申請單"
 
-#: html/Admin/Users/Modify.html:52 html/Admin/Users/Prefs.html:45 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:41 html/Work/Delegates/Info:96 html/Work/Overview/Info:78 html/Work/Preferences/Info:16
+#: html/Admin/Users/Modify.html:52 html/Admin/Users/Prefs.html:45 html/Edit/Elements/SelectUsers:4 html/Edit/Users/List:7 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43 html/Work/Delegates/Info:96 html/Work/Overview/Info:78
 msgid "Email"
 msgstr "電�郵件信箱"
 
-#: lib/RT/User_Overlay.pm:247
+#: html/Work/Preferences/Info:16
+msgid "Email Address"
+msgstr "電�郵件信箱"
+
+#: lib/RT/User_Overlay.pm:251
 msgid "Email address in use"
 msgstr "此電�郵件信箱已被使用"
 
@@ -2216,11 +2288,11 @@ msgstr "啟用(�消勾�將�用此群組)"
 msgid "Enabled (Unchecking this box disables this queue)"
 msgstr "啟用(�消勾�將�用此表單)"
 
-#: html/Admin/Elements/EditCustomFields:98
+#: html/Admin/Elements/EditCustomFields:97
 msgid "Enabled Custom Fields"
 msgstr "已啟用的自訂欄�"
 
-#: html/Edit/Queues/Basic/Top:75 html/Edit/Queues/List:15
+#: html/Edit/Queues/Basic/Top:74 html/Edit/Queues/List:17 html/Edit/Queues/List:29
 msgid "Enabled Date"
 msgstr "啟用日期"
 
@@ -2232,16 +2304,16 @@ msgstr "啟動日期："
 msgid "Enabled Queues"
 msgstr "已啟用的表單"
 
-#: html/Edit/Queues/Basic/Top:66 html/Edit/Queues/List:11
+#: html/Edit/Queues/Basic/Top:65 html/Edit/Queues/List:13 html/Edit/Queues/List:25
 msgid "Enabled Status"
 msgstr "啟用狀態"
 
-#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:282 html/User/Groups/Modify.html:116
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:284 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
 msgstr "啟用狀態 %1"
 
-#: html/Edit/Users/Info:34
+#: NOT FOUND IN SOURCE
 msgid "End of Trial"
 msgstr "試用期滿日"
 
@@ -2261,7 +2333,7 @@ msgstr "輸入下列單一或複��件，查詢用戶資料"
 msgid "Enter one value"
 msgstr "�入單一項目"
 
-#: html/Search/Bulk.html:144 html/Ticket/Elements/EditLinks:111 html/Work/Search/Bulk.html:95
+#: html/Search/Bulk.html:144 html/Ticket/Elements/EditLinks:94 html/Work/Search/Bulk.html:95 html/Work/Tickets/Elements/EditLinks:98
 msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
 msgstr "輸入申請單���到的申請單編號或網�。以空白隔開。"
 
@@ -2313,15 +2385,15 @@ msgstr "表單->新增視察員的�數有誤"
 msgid "Error in parameters to Queue->DelWatcher"
 msgstr "表單->刪除視察員的�數有誤"
 
-#: lib/RT/Ticket_Overlay.pm:1374
+#: lib/RT/Ticket_Overlay.pm:1401
 msgid "Error in parameters to Ticket->AddWatcher"
 msgstr "申請單->新增視察員的�數有誤"
 
-#: lib/RT/Ticket_Overlay.pm:1531
+#: lib/RT/Ticket_Overlay.pm:1558
 msgid "Error in parameters to Ticket->DelWatcher"
 msgstr "申請單->刪除視察員的�數有誤"
 
-#: etc/initialdata.zh:38 etc/initialdata:20
+#: etc/initialdata:20
 msgid "Everyone"
 msgstr "所有人"
 
@@ -2329,7 +2401,11 @@ msgstr "所有人"
 msgid "Example:"
 msgstr "範例："
 
-#: html/Edit/Elements/104Buttons:77
+#: NOT FOUND IN SOURCE
+msgid "Existing user renamed from %1 to %2"
+msgstr "�有使用者 %1 已改�為 %2"
+
+#: html/Edit/Elements/104Buttons:88
 msgid "Export"
 msgstr "匯出"
 
@@ -2341,31 +2417,31 @@ msgstr "外部�證帳號"
 msgid "ExternalContactInfoId"
 msgstr "外部�絡方�帳號"
 
-#: html/Edit/Global/Basic/Top:64
+#: html/Edit/Global/Basic/Top:69
 msgid "ExternalDatabaseDSN"
 msgstr "外部資料庫連�字串"
 
-#: html/Edit/Global/Basic/Top:68
+#: html/Edit/Global/Basic/Top:73
 msgid "ExternalDatabasePass"
 msgstr "外部資料庫密碼"
 
-#: html/Edit/Global/Basic/Top:66
+#: html/Edit/Global/Basic/Top:71
 msgid "ExternalDatabaseUser"
 msgstr "外部資料庫用戶"
 
-#: html/Edit/Global/Basic/Top:62
+#: html/Edit/Global/Basic/Top:67
 msgid "ExternalURL"
 msgstr "外部介�網�"
 
-#: html/Admin/Users/Modify.html:72
+#: html/Admin/Users/Modify.html:72 html/Edit/Users/Info:41
 msgid "Extra info"
 msgstr "備註"
 
-#: lib/RT/User_Overlay.pm:363
+#: lib/RT/User_Overlay.pm:368
 msgid "Failed to find 'Privileged' users pseudogroup."
 msgstr "找�到「內部�員�虛擬群組的使用者。"
 
-#: lib/RT/User_Overlay.pm:370
+#: lib/RT/User_Overlay.pm:375
 msgid "Failed to find 'Unprivileged' users pseudogroup"
 msgstr "找�到「�內部�員�虛擬群組的使用者。"
 
@@ -2390,22 +2466,22 @@ msgstr "二月"
 msgid "Female"
 msgstr "女"
 
-#: html/Edit/Global/CustomField/List:5 html/Edit/Global/CustomField/Top:9
-msgid "Field Attribute"
-msgstr "欄�屬性"
-
 #: html/Edit/Global/CustomField/Info:14
 msgid "Field Content:"
 msgstr "欄�內容："
 
-#: html/Edit/Global/CustomField/List:7 html/Edit/Global/CustomField/Top:21
+#: html/Edit/Global/CustomField/List:7 html/Edit/Global/CustomField/Top:20
 msgid "Field Description"
 msgstr "欄��述"
 
-#: html/Edit/Global/CustomField/List:6 html/Edit/Global/CustomField/Top:15
+#: html/Edit/Global/CustomField/List:6 html/Edit/Global/CustomField/Top:14
 msgid "Field Name"
 msgstr "欄��稱"
 
+#: html/Edit/Global/CustomField/List:5 html/Edit/Global/CustomField/Top:9
+msgid "Field Type"
+msgstr "欄�屬性"
+
 #: html/Edit/Elements/PickUsers:52 html/Edit/Users/Add.html:47
 msgid "Filter"
 msgstr "篩�"
@@ -2422,19 +2498,19 @@ msgstr "篩�列表："
 msgid "Fin"
 msgstr "最終"
 
-#: html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:58 lib/RT/Tickets_Overlay.pm:1091
+#: html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:58 html/Work/Tickets/Elements/EditBasics:52 lib/RT/Tickets_Overlay.pm:1110
 msgid "Final Priority"
-msgstr "最低順�"
+msgstr "最終順�"
 
-#: lib/RT/Ticket_Overlay.pm:1180
+#: lib/RT/Ticket_Overlay.pm:1207
 msgid "FinalPriority"
-msgstr "最低順�"
+msgstr "最終順�"
 
 #: NOT FOUND IN SOURCE
 msgid "Financial Department:"
 msgstr "財務部："
 
-#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33 html/Work/Tickets/Elements/EditPeople:18
 msgid "Find group whose"
 msgstr "尋找群組的"
 
@@ -2442,10 +2518,14 @@ msgstr "尋找群組的"
 msgid "Find new/open tickets"
 msgstr "尋找/開啟申請單"
 
-#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Edit/Users/Top:6 html/Ticket/Elements/EditPeople:29 html/Work/Tickets/Elements/EditPeople:14
 msgid "Find people whose"
 msgstr "尋找人員的"
 
+#: html/Edit/Queues/Top:6
+msgid "Find queues whose"
+msgstr "尋找表單的"
+
 #: html/Search/Listing.html:107 html/Work/Search/index.html:88
 msgid "Find tickets"
 msgstr "尋找申請單"
@@ -2470,7 +2550,7 @@ msgstr "一"
 msgid "First-level Admins"
 msgstr "一階主管"
 
-#: html/Edit/Users/Info:39
+#: NOT FOUND IN SOURCE
 msgid "First-level Users"
 msgstr "一階主管員工"
 
@@ -2478,17 +2558,17 @@ msgstr "一階主管員工"
 msgid "Fixed shift"
 msgstr "固定�"
 
-#: docs/design_docs/string-extraction-guide.txt:33
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
 msgid "Foo Bar Baz"
 msgstr "甲 乙 丙"
 
-#: docs/design_docs/string-extraction-guide.txt:24
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
 msgid "Foo!"
 msgstr "甲�"
 
 #: html/Search/Bulk.html:86 html/Work/Search/Bulk.html:55
 msgid "Force change"
-msgstr "強制更新"
+msgstr "強制更�"
 
 #: html/Work/Elements/104Header:89
 msgid "Form Processing"
@@ -2499,7 +2579,7 @@ msgstr "電�表單作業�"
 msgid "Found %quant(%1,ticket)"
 msgstr "找到 %1 張申請單"
 
-#: lib/RT/Interface/Web.pm:904 x:907
+#: lib/RT/Interface/Web.pm:964
 msgid "Found Object"
 msgstr "已找到物件"
 
@@ -2555,7 +2635,7 @@ msgstr "完整標頭檔"
 msgid "Gecos"
 msgstr "登入帳號"
 
-#: html/Edit/Users/Info:26
+#: NOT FOUND IN SOURCE
 msgid "Gender"
 msgstr "性別"
 
@@ -2563,7 +2643,7 @@ msgstr "性別"
 msgid "Getting the current user from a pgp sig\\n"
 msgstr "�得目�使用者的 pgp 簽章\\n"
 
-#: lib/RT/Transaction_Overlay.pm:593
+#: lib/RT/Transaction_Overlay.pm:551
 #. ($New->Name)
 msgid "Given to %1"
 msgstr "交予 %1"
@@ -2572,6 +2652,10 @@ msgstr "交予 %1"
 msgid "Global"
 msgstr "全域設定"
 
+#: NOT FOUND IN SOURCE
+msgid "Global Approval"
+msgstr "全域簽核"
+
 #: NOT FOUND IN SOURCE
 msgid "Global Keyword Selections"
 msgstr "全域關�字��"
@@ -2593,7 +2677,11 @@ msgstr "全域設定"
 msgid "Global template: %1"
 msgstr "全域範本：%1"
 
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:40
+#: NOT FOUND IN SOURCE
+msgid "GlobalApproval"
+msgstr "全域簽核"
+
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/Work/Tickets/Elements/EditPeople:16 html/Work/Tickets/Elements/EditPeople:20 html/index.html:40
 msgid "Go!"
 msgstr "執行"
 
@@ -2621,6 +2709,10 @@ msgstr "群組"
 msgid "Group %1 %2: %3"
 msgstr "群組 %1 %2：%3"
 
+#: NOT FOUND IN SOURCE
+msgid "Group Admin"
+msgstr "群組管�員"
+
 #: html/Edit/Global/GroupRight/List:5 html/Edit/Global/GroupRight/Top:20 html/Edit/Groups/List:7
 msgid "Group Description"
 msgstr "群組�述"
@@ -2633,7 +2725,7 @@ msgstr "群組管�"
 msgid "Group Members"
 msgstr "群組�員"
 
-#: html/Edit/Elements/PickUsers:28 html/Edit/Global/GroupRight/List:4 html/Edit/Global/GroupRight/Top:10 html/Edit/Groups/List:6 html/Edit/Groups/Top:7 html/Edit/Users/Add.html:29 html/Edit/Users/Group:10 html/Edit/Users/Search.html:43 html/Work/Delegates/Add.html:15 html/Work/Tickets/Cc:24
+#: html/Edit/Elements/PickUsers:28 html/Edit/Global/GroupRight/List:4 html/Edit/Global/GroupRight/Top:10 html/Edit/Groups/List:6 html/Edit/Groups/Top:7 html/Edit/Queues/Basic/Add.html:15 html/Edit/Users/Add.html:29 html/Edit/Users/Group:10 html/Edit/Users/Search.html:43 html/Work/Delegates/Add.html:15 html/Work/Tickets/Cc:24
 msgid "Group Name"
 msgstr "群組�稱"
 
@@ -2641,7 +2733,7 @@ msgstr "群組�稱"
 msgid "Group Name:"
 msgstr "群組�稱："
 
-#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54 html/Edit/Global/autohandler:12 html/Edit/Queues/autohandler:23 html/Edit/Users/Group:11 html/Edit/Users/index.html:123
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54 html/Edit/Global/autohandler:12 html/Edit/Queues/autohandler:27 html/Edit/Users/Group:11 html/Edit/Users/index.html:96
 msgid "Group Rights"
 msgstr "群組權�"
 
@@ -2657,7 +2749,7 @@ msgstr "群組設定"
 msgid "Group Status"
 msgstr "群組狀態"
 
-#: lib/RT/Group_Overlay.pm:964
+#: lib/RT/Group_Overlay.pm:962
 msgid "Group already has member"
 msgstr "群組內已有此�員"
 
@@ -2670,15 +2762,19 @@ msgstr "無法新增群組"
 msgid "Group could not be created: %1"
 msgstr "無法新增群組：%1"
 
-#: lib/RT/Group_Overlay.pm:496
+#: lib/RT/Group_Overlay.pm:494
 msgid "Group created"
 msgstr "群組新增完畢"
 
-#: lib/RT/Group_Overlay.pm:1132
+#: NOT FOUND IN SOURCE
+msgid "Group created: %1"
+msgstr "群組 %1 新增完畢"
+
+#: lib/RT/Group_Overlay.pm:1134
 msgid "Group has no such member"
 msgstr "群組沒有這個�員"
 
-#: lib/RT/Group_Overlay.pm:944 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1428 lib/RT/Ticket_Overlay.pm:1506
+#: lib/RT/Group_Overlay.pm:942 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1455 lib/RT/Ticket_Overlay.pm:1533
 msgid "Group not found"
 msgstr "找�到群組"
 
@@ -2690,6 +2786,14 @@ msgstr "找�到群組。\\n"
 msgid "Group not specified.\\n"
 msgstr "未指定群組。\\n"
 
+#: NOT FOUND IN SOURCE
+msgid "Group redescribed from %1 to %2"
+msgstr "群組�述 %1 已改為 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Group renamed from %1 to %2"
+msgstr "群組 %1 已改�為 %2"
+
 #: NOT FOUND IN SOURCE
 msgid "Group with Queue Rights"
 msgstr "�有表單權�群組"
@@ -2702,11 +2806,11 @@ msgstr "群組之"
 msgid "Group:"
 msgstr "群組："
 
-#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/Edit/Global/GroupRight/Add.html:15 html/User/Groups/Members.html:66
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/Edit/Global/GroupRight/Add.html:16 html/Edit/Groups/Admin:12 html/User/Groups/Members.html:66
 msgid "Groups"
 msgstr "群組"
 
-#: lib/RT/Group_Overlay.pm:970
+#: lib/RT/Group_Overlay.pm:968
 msgid "Groups can't be members of their members"
 msgstr "�能將群組設為群組內�員"
 
@@ -2726,19 +2830,23 @@ msgstr "��補助身份"
 msgid "Hello!"
 msgstr "嗨�"
 
-#: docs/design_docs/string-extraction-guide.txt:40
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
 #. ($name)
 msgid "Hello, %1"
 msgstr "嗨，%1"
 
 #: html/Edit/Elements/104Top:28
 msgid "Help"
-msgstr "輔助說明"
+msgstr "說明"
 
 #: NOT FOUND IN SOURCE
 msgid "Help Desks"
 msgstr "�項業務窗�"
 
+#: html/Edit/Global/CustomField/SelectWritable:9 html/Edit/Queues/Basic/Top:80
+msgid "Hidden"
+msgstr "隱�"
+
 #: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:87 html/Work/Tickets/Elements/ShowHistory:8
 msgid "History"
 msgstr "紀錄"
@@ -2755,7 +2863,7 @@ msgstr "主�"
 msgid "Hotel Expense"
 msgstr "�宿費"
 
-#: lib/RT/Base.pm:73
+#: lib/RT/Base.pm:75
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
 msgstr "我有 %quant(%1,份固體攪拌器)。"
@@ -2768,7 +2876,7 @@ msgstr "身分證號"
 msgid "ID Type"
 msgstr "身分類別"
 
-#: html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1018
+#: html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1037
 msgid "Id"
 msgstr "編號"
 
@@ -2776,7 +2884,7 @@ msgstr "編號"
 msgid "Identity"
 msgstr "身份"
 
-#: etc/initialdata.zh:439 etc/initialdata:411 etc/upgrade/2.1.71:86 html/Edit/Elements/CreateApprovalsQueue:58
+#: etc/initialdata:411 etc/upgrade/2.1.71:86 html/Edit/Elements/CreateApprovalsQueue:58
 msgid "If an approval is rejected, reject the original and delete pending approvals"
 msgstr "若簽核單�到�回，則連帶�回原申請單，並刪除其他相關的待簽核事項"
 
@@ -2788,43 +2896,43 @@ msgstr "如果此工具程�為 setgid，惡�的本地端用戶�能由此
 msgid "If you've updated anything above, be sure to"
 msgstr "若您已更新以上資料，請記得按一下"
 
-#: lib/RT/Interface/Web.pm:896 x:899
+#: lib/RT/Interface/Web.pm:956
 msgid "Illegal value for %1"
 msgstr "%1 的值錯誤"
 
-#: lib/RT/Interface/Web.pm:899 x:902
+#: lib/RT/Interface/Web.pm:959
 msgid "Immutable field"
 msgstr "此欄�值��更動"
 
-#: html/Edit/Elements/104Buttons:76 html/Edit/Global/Workflow/Import.html:2
+#: html/Edit/Elements/104Buttons:87 html/Edit/Global/Workflow/Import.html:2
 msgid "Import"
 msgstr "匯入"
 
-#: html/Admin/Elements/EditCustomFields:73
+#: html/Admin/Elements/EditCustomFields:72
 msgid "Include disabled custom fields in listing."
 msgstr "列出�用的自訂欄�"
 
-#: html/Admin/Queues/index.html:42 html/Edit/Queues/index.html:38
+#: html/Admin/Queues/index.html:42 html/Edit/Queues/Top:9
 msgid "Include disabled queues in listing."
 msgstr "列出�用的表單"
 
-#: html/Admin/Users/index.html:46 html/Edit/Users/Search.html:62
+#: html/Admin/Users/index.html:46 html/Edit/Users/Search.html:62 html/Edit/Users/Top:9
 msgid "Include disabled users in search."
 msgstr "列出�用的使用者"
 
-#: html/Edit/Users/Info:36
+#: NOT FOUND IN SOURCE
 msgid "Indirect Employee"
 msgstr "直接/間接員工"
 
-#: lib/RT/Tickets_Overlay.pm:1067
+#: lib/RT/Tickets_Overlay.pm:1086
 msgid "Initial Priority"
-msgstr "�始優先權"
+msgstr "�始優先順�"
 
-#: lib/RT/Ticket_Overlay.pm:1179 lib/RT/Ticket_Overlay.pm:1181
+#: lib/RT/Ticket_Overlay.pm:1206 lib/RT/Ticket_Overlay.pm:1208
 msgid "InitialPriority"
-msgstr "�始優先權"
+msgstr "�始優先順�"
 
-#: lib/RT/ScripAction_Overlay.pm:104
+#: lib/RT/ScripAction_Overlay.pm:105
 msgid "Input error"
 msgstr "輸入錯誤"
 
@@ -2832,7 +2940,7 @@ msgstr "輸入錯誤"
 msgid "Interest noted"
 msgstr "登記�功"
 
-#: lib/RT/Ticket_Overlay.pm:3829
+#: lib/RT/Ticket_Overlay.pm:3913
 msgid "Internal Error"
 msgstr "內部錯誤"
 
@@ -2841,7 +2949,7 @@ msgstr "內部錯誤"
 msgid "Internal Error: %1"
 msgstr "內部錯誤：%1"
 
-#: lib/RT/Group_Overlay.pm:643
+#: lib/RT/Group_Overlay.pm:641
 msgid "Invalid Group Type"
 msgstr "錯誤的群組類別"
 
@@ -2853,15 +2961,15 @@ msgstr "錯誤的權�"
 msgid "Invalid Type"
 msgstr "錯誤的類型"
 
-#: lib/RT/Interface/Web.pm:901 x:904
+#: lib/RT/Interface/Web.pm:961
 msgid "Invalid data"
 msgstr "錯誤的資料"
 
-#: lib/RT/Ticket_Overlay.pm:439
+#: lib/RT/Ticket_Overlay.pm:463
 msgid "Invalid owner. Defaulting to 'nobody'."
 msgstr "錯誤的承辦人。改為�設承辦人「nobody�。"
 
-#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:250
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
 msgstr "錯誤的表單"
 
@@ -2874,11 +2982,11 @@ msgstr "錯誤的權�"
 msgid "Invalid value for %1"
 msgstr "%1 的值錯誤"
 
-#: lib/RT/Ticket_Overlay.pm:3461
+#: lib/RT/Ticket_Overlay.pm:3517
 msgid "Invalid value for custom field"
 msgstr "錯誤的自訂欄�值"
 
-#: lib/RT/Ticket_Overlay.pm:346
+#: lib/RT/Ticket_Overlay.pm:365
 msgid "Invalid value for status"
 msgstr "錯誤的狀態值"
 
@@ -2936,7 +3044,7 @@ msgstr "七月"
 
 #: lib/RT/Date.pm:417
 msgid "Jul."
-msgstr "01"
+msgstr "07"
 
 #: NOT FOUND IN SOURCE
 msgid "July"
@@ -2952,7 +3060,7 @@ msgstr "六月"
 
 #: lib/RT/Date.pm:416
 msgid "Jun."
-msgstr "06."
+msgstr "06"
 
 #: NOT FOUND IN SOURCE
 msgid "June"
@@ -2982,11 +3090,15 @@ msgstr "��標籤"
 msgid "Lang"
 msgstr "使用語言"
 
+#: html/User/Prefs.html:54 html/Work/Preferences/Info:29
+msgid "Language"
+msgstr "語言"
+
 #: html/Ticket/Elements/Tabs:72
 msgid "Last"
 msgstr "上次更新"
 
-#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:38
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39 html/Work/Tickets/Elements/EditBasics:44
 msgid "Last Contact"
 msgstr "上次�絡"
 
@@ -3010,11 +3122,11 @@ msgstr "上次更新"
 msgid "Left"
 msgstr "剩餘時間"
 
-#: html/Admin/Users/Modify.html:82
+#: html/Admin/Users/Modify.html:82 html/Edit/Users/Info:62
 msgid "Let this user access RT"
 msgstr "�許這�使用者登入"
 
-#: html/Admin/Users/Modify.html:86
+#: html/Admin/Users/Modify.html:86 html/Edit/Users/Info:68
 msgid "Let this user be granted rights"
 msgstr "內部�員（具有個人權�）"
 
@@ -3030,25 +3142,25 @@ msgstr "�制表單為 %1 到 %2"
 msgid "Link a Queue"
 msgstr "申請表單連�"
 
-#: lib/RT/Ticket_Overlay.pm:2717
+#: lib/RT/Ticket_Overlay.pm:2765
 msgid "Link already exists"
 msgstr "此��已存在"
 
-#: lib/RT/Ticket_Overlay.pm:2729
+#: lib/RT/Ticket_Overlay.pm:2777
 msgid "Link could not be created"
 msgstr "無法新增��"
 
-#: lib/RT/Ticket_Overlay.pm:2737 lib/RT/Ticket_Overlay.pm:2747
+#: lib/RT/Ticket_Overlay.pm:2785 lib/RT/Ticket_Overlay.pm:2797
 #. ($TransString)
 msgid "Link created (%1)"
 msgstr "��(%1)新增完畢"
 
-#: lib/RT/Ticket_Overlay.pm:2658
+#: lib/RT/Ticket_Overlay.pm:2698
 #. ($TransString)
 msgid "Link deleted (%1)"
 msgstr "��(%1)刪除完畢"
 
-#: lib/RT/Ticket_Overlay.pm:2664
+#: lib/RT/Ticket_Overlay.pm:2704
 msgid "Link not found"
 msgstr "找�到��"
 
@@ -3069,20 +3181,20 @@ msgstr "��"
 msgid "List All Users"
 msgstr "列出所有用戶資料"
 
-#: html/Admin/Users/Modify.html:113 html/User/Prefs.html:84 html/Work/Preferences/Info:73
+#: html/Admin/Users/Modify.html:113 html/User/Prefs.html:107 html/Work/Preferences/Info:75
 msgid "Location"
 msgstr "�置"
 
-#: lib/RT.pm:162
+#: lib/RT.pm:174
 #. ($RT::LogDir)
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
 msgstr "登入目錄 %1 找�到或無法寫入\\n。無法執行 RT。"
 
-#: html/Edit/Global/Basic/Top:52
+#: html/Edit/Global/Basic/Top:57
 msgid "LogToFile"
 msgstr "紀錄等級"
 
-#: html/Edit/Global/Basic/Top:54
+#: html/Edit/Global/Basic/Top:59
 msgid "LogToFileNamed"
 msgstr "紀錄檔�"
 
@@ -3091,7 +3203,7 @@ msgstr "紀錄檔�"
 msgid "Logged in as %1"
 msgstr "使用者：%1"
 
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
 msgid "Login"
 msgstr "登入"
 
@@ -3183,6 +3295,10 @@ msgstr "三月"
 msgid "Marketing Department"
 msgstr "行銷部"
 
+#: html/Edit/Global/CustomField/Top:63
+msgid "Match Pattern"
+msgstr "符�樣�"
+
 #: NOT FOUND IN SOURCE
 msgid "May"
 msgstr "五月"
@@ -3191,23 +3307,33 @@ msgstr "五月"
 msgid "May."
 msgstr "05"
 
-#: lib/RT/Group_Overlay.pm:981
+#: lib/RT/Transaction_Overlay.pm:598
+#. ($value)
+msgid "Member %1 added"
+msgstr "�員 %1 新增完畢"
+
+#: lib/RT/Transaction_Overlay.pm:635
+#. ($value)
+msgid "Member %1 deleted"
+msgstr "�員 %1 刪除完畢"
+
+#: lib/RT/Group_Overlay.pm:979
 msgid "Member added"
 msgstr "新增�員完畢"
 
-#: lib/RT/Group_Overlay.pm:1139
+#: lib/RT/Group_Overlay.pm:1141
 msgid "Member deleted"
 msgstr "�員已刪除"
 
-#: lib/RT/Group_Overlay.pm:1143
+#: lib/RT/Group_Overlay.pm:1145
 msgid "Member not deleted"
-msgstr "�員未被刪除"
+msgstr "�員未刪除"
 
 #: html/Elements/SelectLinkType:25
 msgid "Member of"
 msgstr "隸屬於"
 
-#: html/Work/Preferences/index.html:20
+#: html/Work/Preferences/index.html:19
 msgid "Member since"
 msgstr "註冊日期"
 
@@ -3219,15 +3345,25 @@ msgstr "隸屬於"
 msgid "Members"
 msgstr "�員"
 
-#: lib/RT/Ticket_Overlay.pm:2904
+#: lib/RT/Transaction_Overlay.pm:595
+#. ($value)
+msgid "Membership in %1 added"
+msgstr "所屬群組 %1 加入完畢"
+
+#: lib/RT/Transaction_Overlay.pm:632
+#. ($value)
+msgid "Membership in %1 deleted"
+msgstr "所屬群組 %1 移除完畢"
+
+#: lib/RT/Ticket_Overlay.pm:2954
 msgid "Merge Successful"
 msgstr "整�完畢"
 
-#: lib/RT/Ticket_Overlay.pm:2824
+#: lib/RT/Ticket_Overlay.pm:2874
 msgid "Merge failed. Couldn't set EffectiveId"
 msgstr "整�失敗。無法設定 EffectiveId"
 
-#: html/Ticket/Elements/BulkLinks:26 html/Ticket/Elements/EditLinks:114 html/Work/Search/BulkLinks:2
+#: html/Ticket/Elements/BulkLinks:26 html/Ticket/Elements/EditLinks:97 html/Work/Search/BulkLinks:2 html/Work/Tickets/Elements/EditLinks:101
 msgid "Merge into"
 msgstr "整�進"
 
@@ -3235,15 +3371,19 @@ msgstr "整�進"
 msgid "Message"
 msgstr "訊�"
 
+#: html/Ticket/Elements/ShowTransaction:80
+msgid "Message body not shown because it is too large or is not plain text."
+msgstr "信件內文�是純文字，因此無法顯示。"
+
 #: NOT FOUND IN SOURCE
 msgid "Misc. Expense"
 msgstr "雜費"
 
-#: lib/RT/Interface/Web.pm:903 x:906
+#: lib/RT/Interface/Web.pm:963
 msgid "Missing a primary key?: %1"
 msgstr "缺少主�值？(%1)"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:53 html/Work/Preferences/Info:36
+#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:71 html/Work/Preferences/Info:38
 msgid "Mobile"
 msgstr "行動電話"
 
@@ -3400,7 +3540,7 @@ msgstr "更改群組 %1"
 msgid "Modify the queue watchers"
 msgstr "更改表單視察員"
 
-#: html/Admin/Users/Modify.html:235
+#: html/Admin/Users/Modify.html:237
 #. ($UserObj->Name)
 msgid "Modify the user %1"
 msgstr "更改使用者 %1"
@@ -3508,7 +3648,7 @@ msgstr "上移"
 msgid "Multiple"
 msgstr "多�"
 
-#: lib/RT/User_Overlay.pm:238
+#: lib/RT/User_Overlay.pm:242
 msgid "Must specify 'Name' attribute"
 msgstr "必須指定 'Name' 的屬性"
 
@@ -3533,15 +3673,15 @@ msgstr "表單處�"
 msgid "My approvals"
 msgstr "表單簽核"
 
-#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Elements/ModifyTemplateAsWorkflow:185 html/Admin/Elements/ModifyUser:29 html/Admin/Groups/Modify.html:43 html/Edit/Users/Add.html:22 html/Edit/Users/Search.html:31 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43 html/Work/Tickets/Cc:18
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Elements/ModifyTemplateAsWorkflow:185 html/Admin/Elements/ModifyUser:29 html/Admin/Groups/Modify.html:43 html/Edit/Elements/SelectQueues:3 html/Edit/Queues/List:8 html/Edit/Users/Add.html:22 html/Edit/Users/List:5 html/Edit/Users/Search.html:31 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43 html/Work/Tickets/Cc:18
 msgid "Name"
 msgstr "�稱"
 
-#: lib/RT/User_Overlay.pm:245
+#: lib/RT/User_Overlay.pm:249
 msgid "Name in use"
 msgstr "帳號已有人使用"
 
-#: html/Edit/Users/Info:27
+#: NOT FOUND IN SOURCE
 msgid "Nationality"
 msgstr "國�"
 
@@ -3549,23 +3689,23 @@ msgstr "國�"
 msgid "Need approval from system administrator"
 msgstr "需先由系統管�員進行批准"
 
-#: html/Ticket/Elements/ShowDates:51
+#: html/Ticket/Elements/ShowDates:52
 msgid "Never"
 msgstr "從未更動"
 
-#: html/Elements/Quicksearch:29 html/Work/Elements/Quicksearch:15 html/Work/Tickets/Create.html:54
+#: html/Elements/Quicksearch:29 html/Work/Elements/Quicksearch:15 html/Work/Tickets/Create.html:53
 msgid "New"
 msgstr "新建立"
 
-#: html/Admin/Elements/ModifyUser:31 html/Admin/Users/Modify.html:92 html/User/Prefs.html:64 html/Work/Preferences/Info:47
+#: html/Admin/Elements/ModifyUser:31 html/Admin/Users/Modify.html:92 html/Edit/Users/Info:33 html/User/Prefs.html:87 html/Work/Preferences/Info:49
 msgid "New Password"
 msgstr "新的密碼"
 
-#: etc/initialdata.zh:341 etc/initialdata:317 etc/upgrade/2.1.71:16 html/Edit/Elements/CreateApprovalsQueue:21
+#: etc/initialdata:317 etc/upgrade/2.1.71:16 html/Edit/Elements/CreateApprovalsQueue:21
 msgid "New Pending Approval"
 msgstr "新的待簽核事項"
 
-#: html/Ticket/Elements/EditLinks:110
+#: html/Ticket/Elements/EditLinks:93 html/Work/Tickets/Elements/EditLinks:12
 msgid "New Relationships"
 msgstr "新增關係"
 
@@ -3577,7 +3717,11 @@ msgstr "表單申請"
 msgid "New Search"
 msgstr "新增查詢"
 
-#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:39
+#: html/Work/Tickets/Elements/EditPeople:7
+msgid "New Watchers"
+msgstr "新增視察員"
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
 msgstr "新增自訂欄�"
 
@@ -3589,7 +3733,7 @@ msgstr "新增群組"
 msgid "New password"
 msgstr "新的密碼"
 
-#: lib/RT/User_Overlay.pm:764
+#: lib/RT/User_Overlay.pm:769
 msgid "New password notification sent"
 msgstr "�出新密碼通知"
 
@@ -3621,7 +3765,7 @@ msgstr "新增範本"
 msgid "New ticket"
 msgstr "�出申請單"
 
-#: lib/RT/Ticket_Overlay.pm:2791
+#: lib/RT/Ticket_Overlay.pm:2841
 msgid "New ticket doesn't exist"
 msgstr "沒有新申請單"
 
@@ -3657,7 +3801,7 @@ msgstr "下一�"
 msgid "NickName"
 msgstr "暱稱"
 
-#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:45 html/Work/Preferences/Info:26
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50 html/Work/Preferences/Info:26
 msgid "Nickname"
 msgstr "暱稱"
 
@@ -3665,11 +3809,11 @@ msgstr "暱稱"
 msgid "Night Shift"
 msgstr "�夜�"
 
-#: html/Edit/Global/Basic/Top:27
+#: html/Edit/Global/Basic/Top:27 html/Edit/Queues/Basic/Top:83
 msgid "No"
 msgstr "�"
 
-#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:104
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
 msgstr "無自訂欄�"
 
@@ -3705,7 +3849,7 @@ msgstr "沒有�程"
 msgid "No action"
 msgstr "暫�處�"
 
-#: lib/RT/Interface/Web.pm:898 x:901
+#: lib/RT/Interface/Web.pm:958
 msgid "No column specified"
 msgstr "未指定欄�"
 
@@ -3717,7 +3861,7 @@ msgstr "找�到命令"
 msgid "No comment entered about this user"
 msgstr "沒有�這�使用者的評論"
 
-#: lib/RT/Ticket_Overlay.pm:2202 lib/RT/Ticket_Overlay.pm:2270
+#: lib/RT/Ticket_Overlay.pm:2229 lib/RT/Ticket_Overlay.pm:2299
 msgid "No correspondence attached"
 msgstr "沒有附上申請單回覆"
 
@@ -3726,11 +3870,11 @@ msgstr "沒有附上申請單回覆"
 msgid "No description for %1"
 msgstr "沒有� %1 的�述"
 
-#: lib/RT/Users_Overlay.pm:150
+#: lib/RT/Users_Overlay.pm:149
 msgid "No group specified"
 msgstr "未指定群組"
 
-#: lib/RT/User_Overlay.pm:982
+#: lib/RT/User_Overlay.pm:987
 msgid "No password set"
 msgstr "沒有設定密碼"
 
@@ -3738,24 +3882,24 @@ msgstr "沒有設定密碼"
 msgid "No permission to create queues"
 msgstr "沒有新增表單的權�"
 
-#: lib/RT/Ticket_Overlay.pm:342
+#: lib/RT/Ticket_Overlay.pm:361
 #. ($QueueObj->Name)
 msgid "No permission to create tickets in the queue '%1'"
 msgstr "沒有在表單 '%1' 新增申請單的權�"
 
-#: lib/RT/User_Overlay.pm:211
+#: lib/RT/User_Overlay.pm:208
 msgid "No permission to create users"
 msgstr "沒有新增使用者的權�"
 
-#: html/SelfService/Display.html:117
+#: html/SelfService/Display.html:123
 msgid "No permission to display that ticket"
 msgstr "沒有顯示該申請單的權�"
 
-#: html/SelfService/Update.html:51
+#: html/SelfService/Update.html:68
 msgid "No permission to view update ticket"
 msgstr "沒有檢視申請單更新的權�"
 
-#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1487
+#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1514
 msgid "No principal specified"
 msgstr "未指定單�"
 
@@ -3771,7 +3915,7 @@ msgstr "%1 內未指定�定"
 msgid "No queues matching search criteria found."
 msgstr "找�到符�查詢�件的表單。"
 
-#: html/Admin/Elements/SelectRights:80
+#: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
 msgstr "找�到權�"
 
@@ -3787,7 +3931,7 @@ msgstr "沒有�進行的查詢"
 msgid "No ticket id specified"
 msgstr "未指定申請單編號"
 
-#: lib/RT/Transaction_Overlay.pm:478 lib/RT/Transaction_Overlay.pm:516
+#: lib/RT/Transaction_Overlay.pm:427 lib/RT/Transaction_Overlay.pm:465
 msgid "No transaction type specified"
 msgstr "未指定更動報告類別"
 
@@ -3803,7 +3947,7 @@ msgstr "找�到符�查詢�件的使用者。"
 msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
 msgstr "找�到�格的 RT 使用者。RT cvs 處�器已�用。請� RT 管�者詢�。\\n"
 
-#: lib/RT/Interface/Web.pm:895 x:898
+#: lib/RT/Interface/Web.pm:955
 msgid "No value sent to _Set!\\n"
 msgstr "_Set 沒有收到任何值!\\n"
 
@@ -3811,7 +3955,7 @@ msgstr "_Set 沒有收到任何值!\\n"
 msgid "Nobody"
 msgstr "沒有人"
 
-#: lib/RT/Interface/Web.pm:900 x:903
+#: lib/RT/Interface/Web.pm:960
 msgid "Nonexistant field?"
 msgstr "欄��存在？"
 
@@ -3843,7 +3987,7 @@ msgstr "尚未完工。"
 msgid "Not yet implemented...."
 msgstr "尚未完工..."
 
-#: html/Approvals/Elements/Approve:48 html/Work/Tickets/Create.html:143
+#: html/Approvals/Elements/Approve:48 html/Work/Tickets/Elements/AddContent:9
 msgid "Notes"
 msgstr "備註"
 
@@ -3851,67 +3995,67 @@ msgstr "備註"
 msgid "Notes:"
 msgstr "備註："
 
-#: lib/RT/User_Overlay.pm:767
+#: lib/RT/User_Overlay.pm:772
 msgid "Notification could not be sent"
 msgstr "無法�出通知"
 
-#: etc/initialdata.zh:111 etc/initialdata:93
+#: etc/initialdata:93
 msgid "Notify AdminCcs"
 msgstr "通知管�員副本收件人"
 
-#: etc/initialdata.zh:107 etc/initialdata:89
+#: etc/initialdata:89
 msgid "Notify AdminCcs as Comment"
 msgstr "以評論方�通知管�員副本收件人"
 
-#: etc/initialdata.zh:138 etc/initialdata:120
+#: etc/initialdata:120
 msgid "Notify Other Recipients"
 msgstr "通知其他收件人"
 
-#: etc/initialdata.zh:134 etc/initialdata:116
+#: etc/initialdata:116
 msgid "Notify Other Recipients as Comment"
 msgstr "以評論方�通知其他收件人"
 
-#: etc/initialdata.zh:103 etc/initialdata:85
+#: etc/initialdata:85
 msgid "Notify Owner"
 msgstr "通知承辦人"
 
-#: etc/initialdata.zh:99 etc/initialdata:81
+#: etc/initialdata:81
 msgid "Notify Owner as Comment"
 msgstr "以評論方�通知承辦人"
 
-#: etc/initialdata.zh:385 etc/initialdata:361
+#: etc/initialdata:361
 msgid "Notify Owner of their rejected ticket"
 msgstr "通知承辦人申請單已�回"
 
-#: etc/initialdata.zh:374 etc/initialdata:350
+#: etc/initialdata:350
 msgid "Notify Owner of their ticket has been approved by all approvers"
 msgstr "通知承辦人申請單已完�全部簽核"
 
-#: etc/initialdata.zh:359 etc/initialdata:338
+#: etc/initialdata:338
 msgid "Notify Owner of their ticket has been approved by some approver"
 msgstr "通知承辦人申請單已完��項簽核"
 
-#: etc/initialdata.zh:343 etc/initialdata:319 etc/upgrade/2.1.71:17 html/Edit/Elements/CreateApprovalsQueue:22
+#: etc/initialdata:319 etc/upgrade/2.1.71:17 html/Edit/Elements/CreateApprovalsQueue:22
 msgid "Notify Owners and AdminCcs of new items pending their approval"
 msgstr "整�待簽核事項，通知承辦人�管�員副本收件人"
 
-#: etc/initialdata.zh:95 etc/initialdata:77
+#: etc/initialdata:77
 msgid "Notify Requestors"
 msgstr "通知申請人"
 
-#: etc/initialdata.zh:121 etc/initialdata:103
+#: etc/initialdata:103
 msgid "Notify Requestors and Ccs"
 msgstr "通知申請人�副本收件人"
 
-#: etc/initialdata.zh:116 etc/initialdata:98
+#: etc/initialdata:98
 msgid "Notify Requestors and Ccs as Comment"
 msgstr "以評論方�通知申請人�副本收件人"
 
-#: etc/initialdata.zh:130 etc/initialdata:112
+#: etc/initialdata:112
 msgid "Notify Requestors, Ccs and AdminCcs"
 msgstr "通知申請人�副本�管�員副本收件人"
 
-#: etc/initialdata.zh:126 etc/initialdata:108
+#: etc/initialdata:108
 msgid "Notify Requestors, Ccs and AdminCcs as Comment"
 msgstr "以評論方�通知申請人�副本�管�員副本收件人"
 
@@ -3931,9 +4075,9 @@ msgstr "11"
 msgid "November"
 msgstr "�一月"
 
-#: html/Edit/Global/Basic/Top:74
+#: html/Edit/Global/Basic/Top:83
 msgid "OIN104"
-msgstr "�� 104eHRMS 介�"
+msgstr "104eHRMS 介�"
 
 #: html/Edit/Global/Workflow/Export.html:30 html/Work/Copyright.html:23
 msgid "OK"
@@ -3947,7 +4091,7 @@ msgstr "無法新增物件"
 msgid "Object created"
 msgstr "物件新增完畢"
 
-#: html/Edit/Users/Info:35
+#: NOT FOUND IN SOURCE
 msgid "Occupation Status"
 msgstr "在�狀態"
 
@@ -3963,7 +4107,7 @@ msgstr "10"
 msgid "October"
 msgstr "�月"
 
-#: html/Edit/Users/Info:32
+#: NOT FOUND IN SOURCE
 msgid "Office Phone"
 msgstr "辦公室電話"
 
@@ -3971,35 +4115,39 @@ msgstr "辦公室電話"
 msgid "On"
 msgstr "等於"
 
-#: etc/initialdata.zh:173 etc/initialdata:155
+#: html/Edit/Global/CustomField/Top:68
+msgid "On Change"
+msgstr "更改申請單時"
+
+#: etc/initialdata:155
 msgid "On Comment"
 msgstr "評論時"
 
-#: etc/initialdata.zh:166 etc/initialdata:148
+#: etc/initialdata:148
 msgid "On Correspond"
 msgstr "回覆申請單時"
 
-#: etc/initialdata.zh:155 etc/initialdata:137
+#: etc/initialdata:137 html/Edit/Global/CustomField/Top:57
 msgid "On Create"
 msgstr "新增申請單時"
 
-#: etc/initialdata.zh:187 etc/initialdata:169
+#: etc/initialdata:169
 msgid "On Owner Change"
 msgstr "承辦人改變時"
 
-#: etc/initialdata.zh:195 etc/initialdata:177
+#: etc/initialdata:177
 msgid "On Queue Change"
 msgstr "表單改變時"
 
-#: etc/initialdata.zh:201 etc/initialdata:183
+#: etc/initialdata:183
 msgid "On Resolve"
 msgstr "解決申請單時"
 
-#: etc/initialdata.zh:179 etc/initialdata:161
+#: etc/initialdata:161
 msgid "On Status Change"
 msgstr "��改變時"
 
-#: etc/initialdata.zh:160 etc/initialdata:142
+#: etc/initialdata:142
 msgid "On Transaction"
 msgstr "發生更動時"
 
@@ -4013,7 +4161,7 @@ msgstr "僅顯示 %1 之後新增的申請單"
 msgid "Only show approvals for requests created before %1"
 msgstr "僅顯示 %1 之�新增的申請單"
 
-#: html/Edit/Global/GroupRight/List:9 html/Edit/Global/GroupRight/Top:16 html/Edit/Groups/List:11 html/Edit/Groups/Top:18 html/Edit/Queues/Basic/Top:69 html/Edit/Queues/List:13 html/Elements/Quicksearch:30 html/Work/Delegates/Info:48 html/Work/Delegates/Info:51 html/Work/Delegates/List:12 html/Work/Elements/Quicksearch:16 html/Work/Overview/Info:41 html/Work/Tickets/Display.html:28
+#: html/Edit/Global/GroupRight/List:9 html/Edit/Global/GroupRight/Top:16 html/Edit/Groups/List:11 html/Edit/Groups/Top:18 html/Edit/Queues/Basic/Top:68 html/Edit/Queues/List:15 html/Edit/Queues/List:27 html/Elements/Quicksearch:30 html/Work/Delegates/Info:48 html/Work/Delegates/Info:51 html/Work/Delegates/List:12 html/Work/Elements/Quicksearch:16 html/Work/Overview/Info:41 html/Work/Tickets/Display.html:51
 msgid "Open"
 msgstr "é–‹å•Ÿ"
 
@@ -4033,7 +4181,7 @@ msgstr "在新視窗開啟(列表的)申請單"
 msgid "Open tickets (from listing) in another window"
 msgstr "在�一個視窗開啟(列表的)申請單"
 
-#: etc/initialdata.zh:150 etc/initialdata:132
+#: etc/initialdata:132
 msgid "Open tickets on correspondence"
 msgstr "收到回覆時�開啟申請單"
 
@@ -4053,11 +4201,11 @@ msgstr "�項�述"
 msgid "Option Name"
 msgstr "�項�稱"
 
-#: html/Search/Elements/PickRestriction:100 html/Work/Search/PickRestriction:81
+#: html/Search/Elements/PickRestriction:100 html/Work/Search/PickRestriction:87
 msgid "Ordering and sorting"
 msgstr "順�與排�方�"
 
-#: html/Admin/Elements/ModifyUser:45 html/Admin/Users/Modify.html:116 html/Edit/Global/Basic/Top:50 html/Elements/SelectUsers:28 html/User/Prefs.html:85 html/Work/Preferences/Info:75
+#: html/Admin/Elements/ModifyUser:45 html/Admin/Users/Modify.html:116 html/Edit/Elements/SelectUsers:7 html/Edit/Global/Basic/Top:55 html/Elements/SelectUsers:28 html/User/Prefs.html:110 html/Work/Preferences/Info:77
 msgid "Organization"
 msgstr "組織�稱"
 
@@ -4070,11 +4218,11 @@ msgstr "組織："
 msgid "Originating ticket: #%1"
 msgstr "原申請單：#%1"
 
-#: html/Edit/Elements/PickUsers:109 html/Edit/Users/Add.html:106 html/Work/Tickets/Cc:80
+#: html/Edit/Elements/PickUsers:111 html/Edit/Users/Add.html:106 html/Work/Tickets/Cc:80
 msgid "Other comma-delimited email addresses"
 msgstr "其他e-mail帳號 (僅e-mail通知;多筆帳號請用逗號','�隔)"
 
-#: html/Admin/Elements/ModifyQueue:54 html/Admin/Queues/Modify.html:68 html/Edit/Queues/Basic/Top:41
+#: html/Admin/Elements/ModifyQueue:54 html/Admin/Queues/Modify.html:68 html/Edit/Queues/Basic/Top:44
 msgid "Over time, priority moves toward"
 msgstr "優先順�隨時間增加調整為"
 
@@ -4086,7 +4234,7 @@ msgstr "以 %1 表單的自訂欄��代�有欄�"
 msgid "Override global rights"
 msgstr "�代全域權�"
 
-#: html/Admin/Elements/CheckOverrideGlobalACL:34
+#: html/Admin/Elements/CheckOverrideGlobalACL:36
 #. (loc_fuzzy($msg))
 msgid "OverrideGlobalACL status %1"
 msgstr "�代全域權� %1"
@@ -4103,7 +4251,7 @@ msgstr "承辦申請單"
 msgid "OwnTicket"
 msgstr "承辦申請單"
 
-#: etc/initialdata.zh:56 etc/initialdata:38 html/Admin/Elements/ModifyTemplateAsWorkflow:141 html/Edit/Global/Workflow/Owner.html:19 html/Edit/Queues/Basic/Top:47 html/Edit/Queues/Basic/Top:58 html/Elements/MyRequests:31 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:62 html/Work/Elements/MyRequests:19 html/Work/Elements/Quicksearch:18 html/Work/Tickets/Elements/ShowBasics:21 html/Work/Tickets/Update.html:27 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1244
+#: etc/initialdata:38 html/Admin/Elements/ModifyTemplateAsWorkflow:141 html/Edit/Global/Workflow/Owner.html:19 html/Edit/Queues/Basic/Top:51 html/Edit/Queues/Basic/Top:59 html/Elements/MyRequests:31 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:62 html/Work/Elements/MyRequests:19 html/Work/Elements/Quicksearch:18 html/Work/Tickets/Elements/EditPeople:28 html/Work/Tickets/Elements/ShowBasics:21 html/Work/Tickets/Update.html:27 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1263
 msgid "Owner"
 msgstr "承辦人"
 
@@ -4111,7 +4259,7 @@ msgstr "承辦人"
 msgid "Owner changed from %1 to %2"
 msgstr "承辦人已從 %1 改為 %2"
 
-#: lib/RT/Transaction_Overlay.pm:582
+#: lib/RT/Transaction_Overlay.pm:539
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
 msgstr "強制將承辦人從 %1 改為 %2"
@@ -4120,15 +4268,15 @@ msgstr "強制將承辦人從 %1 改為 %2"
 msgid "Owner is"
 msgstr "承辦人"
 
-#: html/Work/Elements/List:27 html/Work/Queues/List:8 html/Work/Tickets/Create.html:56 html/Work/Tickets/Elements/ShowBasics:60
+#: html/Work/Elements/List:27 html/Work/Queues/List:8 html/Work/Tickets/Create.html:55 html/Work/Tickets/Elements/ShowBasics:60
 msgid "Owner's Phone"
 msgstr "承辦人電話"
 
-#: html/Edit/Elements/Page:39
-msgid "Page"
+#: html/Edit/Elements/Page:40
+msgid "Page #"
 msgstr " "
 
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:55 html/Work/Preferences/Info:38
+#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:75 html/Work/Preferences/Info:40
 msgid "Pager"
 msgstr "呼�器"
 
@@ -4136,7 +4284,7 @@ msgstr "呼�器"
 msgid "PagerPhone"
 msgstr "呼�器號碼"
 
-#: html/Edit/Global/Workflow/Action:81 html/Edit/Global/Workflow/Condition:66
+#: html/Edit/Global/Workflow/Action:75 html/Edit/Global/Workflow/Condition:65
 msgid "Parameter"
 msgstr "呼��數"
 
@@ -4144,7 +4292,7 @@ msgstr "呼��數"
 msgid "Parent"
 msgstr "上級"
 
-#: html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:38 html/Ticket/Elements/EditLinks:126 html/Ticket/Elements/EditLinks:57 html/Ticket/Elements/ShowLinks:46 html/Work/Search/BulkLinks:14
+#: html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38 html/Ticket/Elements/EditLinks:109 html/Ticket/Elements/EditLinks:54 html/Ticket/Elements/ShowLinks:46 html/Work/Search/BulkLinks:14 html/Work/Tickets/Elements/EditLinks:113 html/Work/Tickets/Elements/EditLinks:45 html/Work/Tickets/Elements/ShowLinks:26
 msgid "Parents"
 msgstr "�申請單"
 
@@ -4152,7 +4300,7 @@ msgstr "�申請單"
 msgid "Park Space"
 msgstr "�車�申請"
 
-#: html/Elements/Login:52 html/User/Prefs.html:60 html/Work/Preferences/Info:44
+#: html/Elements/Login:52 html/User/Prefs.html:83 html/Work/Preferences/Info:46
 msgid "Password"
 msgstr "密碼"
 
@@ -4160,20 +4308,20 @@ msgstr "密碼"
 msgid "Password Reminder"
 msgstr "密碼�示"
 
-#: lib/RT/User_Overlay.pm:228 lib/RT/User_Overlay.pm:985
+#: lib/RT/User_Overlay.pm:230 lib/RT/User_Overlay.pm:990
 msgid "Password too short"
 msgstr "密碼太短"
 
-#: html/Admin/Users/Modify.html:290 html/User/Prefs.html:171 html/Work/Preferences/Info:167
+#: html/Admin/Users/Modify.html:292 html/User/Prefs.html:209 html/Work/Preferences/Info:173
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
 msgstr "密碼：%1"
 
-#: html/Admin/Users/Modify.html:292
+#: html/Admin/Users/Modify.html:294
 msgid "Passwords do not match."
 msgstr "密碼確�失敗。"
 
-#: html/User/Prefs.html:173 html/Work/Preferences/Info:169
+#: html/User/Prefs.html:211 html/Work/Preferences/Info:175
 msgid "Passwords do not match. Your password has not been changed"
 msgstr "密碼確�失敗。您的密碼並未改變。"
 
@@ -4193,11 +4341,11 @@ msgstr "人員"
 msgid "People with Queue Rights"
 msgstr "�有表單權�人員"
 
-#: etc/initialdata.zh:143 etc/initialdata:125
+#: etc/initialdata:125
 msgid "Perform a user-defined action"
 msgstr "執行使用者自訂的動作"
 
-#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/CurrentUser.pm:82 lib/RT/CurrentUser.pm:91 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:201 lib/RT/CustomField_Overlay.pm:233 lib/RT/CustomField_Overlay.pm:510 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1094 lib/RT/Group_Overlay.pm:1098 lib/RT/Group_Overlay.pm:1107 lib/RT/Group_Overlay.pm:1158 lib/RT/Group_Overlay.pm:1162 lib/RT/Group_Overlay.pm:1168 lib/RT/Group_Overlay.pm:425 lib/RT/Group_Overlay.pm:517 lib/RT/Group_Overlay.pm:595 lib/RT/Group_Overlay.pm:603 lib/RT/Group_Overlay.pm:700 lib/RT/Group_Overlay.pm:704 lib/RT/Group_Overlay.pm:710 lib/RT/Group_Overlay.pm:903 lib/RT/Group_Overlay.pm:907 lib/RT/Group_Overlay.pm:920 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:931 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:196 lib/RT/Scrip_Overlay.pm:433 lib/RT/Template_Overlay.pm:283 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1359 lib/RT/Ticket_Overlay.pm:1369 lib/RT/Ticket_Overlay.pm:1383 lib/RT/Ticket_Overlay.pm:1517 lib/RT/Ticket_Overlay.pm:1526 lib/RT/Ticket_Overlay.pm:1539 lib/RT/Ticket_Overlay.pm:1888 lib/RT/Ticket_Overlay.pm:2026 lib/RT/Ticket_Overlay.pm:2190 lib/RT/Ticket_Overlay.pm:2257 lib/RT/Ticket_Overlay.pm:2616 lib/RT/Ticket_Overlay.pm:2688 lib/RT/Ticket_Overlay.pm:2782 lib/RT/Ticket_Overlay.pm:2797 lib/RT/Ticket_Overlay.pm:2996 lib/RT/Ticket_Overlay.pm:3006 lib/RT/Ticket_Overlay.pm:3011 lib/RT/Ticket_Overlay.pm:3233 lib/RT/Ticket_Overlay.pm:3431 lib/RT/Ticket_Overlay.pm:3593 lib/RT/Ticket_Overlay.pm:3645 lib/RT/Ticket_Overlay.pm:3823 lib/RT/Transaction_Overlay.pm:466 lib/RT/Transaction_Overlay.pm:473 lib/RT/Transaction_Overlay.pm:502 lib/RT/Transaction_Overlay.pm:509 lib/RT/User_Overlay.pm:1079 lib/RT/User_Overlay.pm:1527 lib/RT/User_Overlay.pm:687 lib/RT/User_Overlay.pm:722 lib/RT/User_Overlay.pm:978
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/CurrentUser.pm:82 lib/RT/CurrentUser.pm:91 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:201 lib/RT/CustomField_Overlay.pm:233 lib/RT/CustomField_Overlay.pm:511 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1096 lib/RT/Group_Overlay.pm:1100 lib/RT/Group_Overlay.pm:1109 lib/RT/Group_Overlay.pm:1160 lib/RT/Group_Overlay.pm:1164 lib/RT/Group_Overlay.pm:1170 lib/RT/Group_Overlay.pm:423 lib/RT/Group_Overlay.pm:515 lib/RT/Group_Overlay.pm:593 lib/RT/Group_Overlay.pm:601 lib/RT/Group_Overlay.pm:698 lib/RT/Group_Overlay.pm:702 lib/RT/Group_Overlay.pm:708 lib/RT/Group_Overlay.pm:901 lib/RT/Group_Overlay.pm:905 lib/RT/Group_Overlay.pm:918 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:934 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:441 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1386 lib/RT/Ticket_Overlay.pm:1396 lib/RT/Ticket_Overlay.pm:1410 lib/RT/Ticket_Overlay.pm:1544 lib/RT/Ticket_Overlay.pm:1553 lib/RT/Ticket_Overlay.pm:1566 lib/RT/Ticket_Overlay.pm:1915 lib/RT/Ticket_Overlay.pm:2053 lib/RT/Ticket_Overlay.pm:2217 lib/RT/Ticket_Overlay.pm:2286 lib/RT/Ticket_Overlay.pm:2647 lib/RT/Ticket_Overlay.pm:2728 lib/RT/Ticket_Overlay.pm:2832 lib/RT/Ticket_Overlay.pm:2847 lib/RT/Ticket_Overlay.pm:3046 lib/RT/Ticket_Overlay.pm:3056 lib/RT/Ticket_Overlay.pm:3061 lib/RT/Ticket_Overlay.pm:3284 lib/RT/Ticket_Overlay.pm:3288 lib/RT/Ticket_Overlay.pm:3487 lib/RT/Ticket_Overlay.pm:3649 lib/RT/Ticket_Overlay.pm:3701 lib/RT/Ticket_Overlay.pm:3907 lib/RT/Transaction_Overlay.pm:415 lib/RT/Transaction_Overlay.pm:422 lib/RT/Transaction_Overlay.pm:451 lib/RT/Transaction_Overlay.pm:458 lib/RT/User_Overlay.pm:1084 lib/RT/User_Overlay.pm:1532 lib/RT/User_Overlay.pm:692 lib/RT/User_Overlay.pm:727 lib/RT/User_Overlay.pm:983
 msgid "Permission Denied"
 msgstr "權��足"
 
@@ -4233,6 +4381,22 @@ msgstr "代�人群組："
 msgid "PersonalHomepage"
 msgstr "個人首�"
 
+#: NOT FOUND IN SOURCE
+msgid "Phase 1: Create/Rename Groups (%1)"
+msgstr "第一階段：群組建立�改� (%1)"
+
+#: NOT FOUND IN SOURCE
+msgid "Phase 2: Disable/Enable Groups (%1)"
+msgstr "第二階段：群組�用�啟用 (%1)"
+
+#: NOT FOUND IN SOURCE
+msgid "Phase 3: Create/Rename Users (%1)"
+msgstr "第三階段：使用者建立�改� (%1)"
+
+#: NOT FOUND IN SOURCE
+msgid "Phase 4: Disable/Enable Users (%1)"
+msgstr "第四階段：使用者�用�啟用 (%1)"
+
 #: NOT FOUND IN SOURCE
 msgid "Phone"
 msgstr "電話"
@@ -4241,11 +4405,11 @@ msgstr "電話"
 msgid "Phone number"
 msgstr "電話號碼"
 
-#: html/Admin/Users/Modify.html:155 html/User/Prefs.html:48 html/Work/Preferences/Info:30
+#: html/Admin/Users/Modify.html:155 html/User/Prefs.html:60 html/Work/Preferences/Info:32
 msgid "Phone numbers"
 msgstr "電話號碼"
 
-#: html/Edit/Users/Add.html:3 html/Work/Delegates/Add.html:3 html/Work/Delegates/Info:34 html/Work/Tickets/ModifyPeople.html:2
+#: html/Edit/Queues/Basic/Add.html:3 html/Edit/Queues/Basic/Top:55 html/Edit/Users/Add.html:3 html/Work/Delegates/Add.html:3 html/Work/Delegates/Info:34 html/Work/Tickets/ModifyPeople.html:2
 msgid "Pick"
 msgstr "挑�"
 
@@ -4257,7 +4421,7 @@ msgstr "出發地點"
 msgid "Placeholder"
 msgstr "尚未完工"
 
-#: html/Edit/Elements/PickUsers:31 html/Edit/Elements/PickUsers:44 html/Edit/Elements/SelectCustomFieldType:3 html/Work/Elements/SelectOwner:3 html/Work/Tickets/Elements/EditCustomField:183 html/Work/Tickets/Elements/EditCustomField:75 html/Work/Tickets/Elements/EditCustomFieldEntries:81 html/Work/Tickets/Elements/EditCustomFieldEntries:88
+#: html/Edit/Elements/PickUsers:31 html/Edit/Elements/PickUsers:44 html/Edit/Elements/SelectCustomFieldType:3 html/Work/Elements/SelectOwner:3 html/Work/Tickets/Elements/EditCustomField:187 html/Work/Tickets/Elements/EditCustomFieldEntry:24 html/Work/Tickets/Elements/EditCustomFieldEntry:35
 msgid "Please Select"
 msgstr "請�擇"
 
@@ -4273,6 +4437,10 @@ msgstr "請�擇群組"
 msgid "Please select a queue's workflow"
 msgstr "請�擇表單�程"
 
+#: NOT FOUND IN SOURCE
+msgid "Please select one of the category types above."
+msgstr "請從上��擇一項分類。"
+
 #: NOT FOUND IN SOURCE
 msgid "Please select role"
 msgstr "請�擇角色"
@@ -4285,19 +4453,19 @@ msgstr "經營�章"
 msgid "Position"
 msgstr "�務"
 
-#: html/Edit/Users/Info:42
+#: NOT FOUND IN SOURCE
 msgid "Position Level"
 msgstr "�等"
 
-#: html/Edit/Elements/PickUsers:41 html/Edit/Global/UserRight/List:13 html/Edit/Global/UserRight/Top:23 html/Edit/Users/Add.html:41 html/Edit/Users/List:11 html/Edit/Users/Top:22 html/Work/Delegates/Add.html:26 html/Work/Delegates/Info:84 html/Work/Overview/Info:66
+#: html/Edit/Elements/PickUsers:41 html/Edit/Global/UserRight/List:13 html/Edit/Global/UserRight/Top:23 html/Edit/Queues/Basic/Add.html:26 html/Edit/Users/Add.html:41 html/Work/Delegates/Add.html:26 html/Work/Delegates/Info:84 html/Work/Overview/Info:66
 msgid "Position Name"
 msgstr "�務�稱"
 
-#: html/Edit/Global/UserRight/List:14 html/Edit/Global/UserRight/Top:33 html/Edit/Users/List:12 html/Edit/Users/Top:32
+#: html/Edit/Global/UserRight/List:14 html/Edit/Global/UserRight/Top:33
 msgid "Position Number"
 msgstr "�務代碼"
 
-#: html/Edit/Users/Info:43
+#: NOT FOUND IN SOURCE
 msgid "Position Rank"
 msgstr "�級"
 
@@ -4334,7 +4502,7 @@ msgstr "優先順�"
 msgid "Principal %1 not found."
 msgstr "找�到單� %1。"
 
-#: html/Search/Elements/PickRestriction:53 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:38 html/Work/Search/PickRestriction:34 lib/RT/Tickets_Overlay.pm:1042
+#: html/Search/Elements/PickRestriction:53 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:38 html/Work/Search/PickRestriction:34 html/Work/Tickets/Elements/EditBasics:41 lib/RT/Tickets_Overlay.pm:1061
 msgid "Priority"
 msgstr "優先順�"
 
@@ -4342,11 +4510,11 @@ msgstr "優先順�"
 msgid "Priority starts at"
 msgstr "優先順�起始值"
 
-#: etc/initialdata.zh:43 etc/initialdata:25
+#: etc/initialdata:25
 msgid "Privileged"
 msgstr "內部�員"
 
-#: html/Admin/Users/Modify.html:270 html/User/Prefs.html:162 html/Work/Preferences/Info:158
+#: html/Admin/Users/Modify.html:272 html/User/Prefs.html:200 html/Work/Preferences/Info:164
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
 msgstr "內部�員狀態：%1"
@@ -4359,11 +4527,19 @@ msgstr "內部�員"
 msgid "Process Status"
 msgstr "處�狀態"
 
-#: etc/initialdata.zh:41 etc/initialdata.zh:47 etc/initialdata.zh:53 etc/initialdata.zh:77 etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
+#: html/Edit/Queues/List:10
+msgid "Project Name"
+msgstr "專案�稱"
+
+#: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
 msgid "Pseudogroup for internal use"
 msgstr "內部用的虛擬群組"
 
-#: html/Work/Preferences/Info:68
+#: html/Edit/Queues/List:11
+msgid "Public Description"
+msgstr "公開說明"
+
+#: html/Work/Preferences/Info:70
 msgid "Public Info"
 msgstr "公開資訊"
 
@@ -4371,11 +4547,15 @@ msgstr "公開資訊"
 msgid "Public Service"
 msgstr "公共事務�"
 
+#: NOT FOUND IN SOURCE
+msgid "Purging stale data: %1"
+msgstr "移除�期資料: %1"
+
 #: html/Edit/Users/Search.html:4
 msgid "Query"
 msgstr "查詢"
 
-#: html/Admin/Elements/ModifyTemplateAsWorkflow:166 html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Elements/Quicksearch:28 html/Search/Elements/PickRestriction:45 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:63 html/Ticket/Elements/ShowBasics:42 html/User/Elements/DelegateRights:79 html/Work/Elements/MyApprovals:10 html/Work/Elements/MyRequests:17 html/Work/Elements/MyTickets:17 html/Work/Elements/Quicksearch:14 html/Work/Search/PickRestriction:26 lib/RT/Tickets_Overlay.pm:883
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:166 html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Elements/Quicksearch:28 html/Search/Elements/PickRestriction:45 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:63 html/Ticket/Elements/ShowBasics:42 html/User/Elements/DelegateRights:79 html/Work/Elements/MyApprovals:10 html/Work/Elements/MyRequests:17 html/Work/Elements/MyTickets:17 html/Work/Elements/Quicksearch:14 html/Work/Search/PickRestriction:26 html/Work/Tickets/Elements/EditBasics:16 lib/RT/Tickets_Overlay.pm:902
 msgid "Queue"
 msgstr "表單"
 
@@ -4393,19 +4573,19 @@ msgstr "找�到表單 '%1'\\n"
 msgid "Queue Keyword Selections"
 msgstr "表單關�字��"
 
-#: html/Admin/Elements/ModifyQueue:30 html/Admin/Queues/Modify.html:42 html/Edit/Queues/Basic/Top:12 html/Edit/Queues/Basic/index.html:36 html/Edit/Queues/Global:21 html/Edit/Queues/List:6 html/Edit/Users/Queue:10 html/Work/Delegates/List:6 html/Work/Elements/List:11 html/Work/Queues/List:5 html/Work/Tickets/Create.html:22 html/Work/Tickets/Elements/ShowBasics:6
+#: html/Admin/Elements/ModifyQueue:30 html/Admin/Queues/Modify.html:42 html/Edit/Queues/Basic/Top:13 html/Edit/Queues/Basic/index.html:36 html/Edit/Queues/Global:21 html/Edit/Queues/List:20 html/Edit/Users/Queue:10 html/Work/Delegates/List:6 html/Work/Elements/List:11 html/Work/Queues/List:5 html/Work/Tickets/Create.html:21 html/Work/Tickets/Elements/ShowBasics:6
 msgid "Queue Name"
 msgstr "表單�稱"
 
-#: html/Edit/Queues/List:8 html/Work/Elements/List:25 html/Work/Queues/List:7 html/Work/Tickets/Create.html:35 html/Work/Tickets/Elements/ShowBasics:19
+#: html/Edit/Queues/List:22 html/Work/Elements/List:25 html/Work/Queues/List:7 html/Work/Tickets/Create.html:34 html/Work/Tickets/Elements/ShowBasics:19
 msgid "Queue Owner"
 msgstr "業務承辦人"
 
-#: html/Edit/Queues/Basic/Top:35
+#: html/Edit/Queues/Basic/Top:38
 msgid "Queue Priority"
 msgstr "優先等級"
 
-#: html/Edit/Global/GroupRight/Top:24 html/Edit/Global/UserRight/Top:43 html/Edit/Users/Queue:11 html/Edit/Users/index.html:124
+#: html/Edit/Global/GroupRight/Top:24 html/Edit/Global/UserRight/Top:43 html/Edit/Users/Queue:11 html/Edit/Users/index.html:97
 msgid "Queue Rights"
 msgstr "表單權�"
 
@@ -4425,11 +4605,11 @@ msgstr "表單已存在"
 msgid "Queue could not be created"
 msgstr "無法新增表單"
 
-#: html/Edit/Queues/autohandler:8 html/Ticket/Create.html:204 html/Work/Tickets/Create.html:185
+#: html/Edit/Queues/autohandler:8 html/Ticket/Create.html:208 html/Work/Tickets/Create.html:180
 msgid "Queue could not be loaded."
 msgstr "無法載入表單"
 
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:283
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:283 lib/RT/StyleGuide.pod:789
 msgid "Queue created"
 msgstr "表單新增完畢"
 
@@ -4458,7 +4638,7 @@ msgstr "表單一覽"
 msgid "RT %1"
 msgstr "RT %1"
 
-#: docs/design_docs/string-extraction-guide.txt:70
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
 #. ($RT::VERSION, $RT::rtname)
 msgid "RT %1 for %2"
 msgstr "%2：RT %1 版"
@@ -4574,11 +4754,15 @@ msgstr "系統�行角色"
 msgid "RT::Ticket-Role"
 msgstr "申請單�行角色"
 
-#: html/Work/Tickets/Elements/ShowTransaction:11
+#: html/Work/Tickets/Elements/ShowTransaction:14
 msgid "RT_System"
 msgstr "系統訊�"
 
-#: html/Admin/Users/Modify.html:57 html/Admin/Users/Prefs.html:51 html/User/Prefs.html:43 html/Work/Preferences/Info:18
+#: html/Edit/Global/CustomField/SelectWritable:7
+msgid "Read Only"
+msgstr "唯讀"
+
+#: html/Admin/Users/Modify.html:57 html/Admin/Users/Prefs.html:51 html/Edit/Elements/SelectUsers:5 html/Edit/Users/List:6 html/User/Prefs.html:47 html/Work/Preferences/Info:18
 msgid "Real Name"
 msgstr "真實姓�"
 
@@ -4586,15 +4770,35 @@ msgstr "真實姓�"
 msgid "RealName"
 msgstr "真實姓�"
 
-#: html/Work/Approvals/Display.html:27 html/Work/Tickets/Update.html:85
+#: html/Work/Approvals/Display.html:30 html/Work/Tickets/Update.html:81
 msgid "Really reject this ticket?"
 msgstr "您確定��回這張申請單嗎？"
 
-#: html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:50 html/Ticket/Elements/EditLinks:138 html/Ticket/Elements/EditLinks:93 html/Ticket/Elements/ShowLinks:70 html/Work/Search/BulkLinks:26
+#: lib/RT/Transaction_Overlay.pm:592
+#. ($value)
+msgid "Reference by %1 added"
+msgstr "已加入 %1 為�考本申請單"
+
+#: lib/RT/Transaction_Overlay.pm:629
+#. ($value)
+msgid "Reference by %1 deleted"
+msgstr "已移除 %1 為�考本申請單"
+
+#: lib/RT/Transaction_Overlay.pm:589
+#. ($value)
+msgid "Reference to %1 added"
+msgstr "已加入�考申請單 %1"
+
+#: lib/RT/Transaction_Overlay.pm:626
+#. ($value)
+msgid "Reference to %1 deleted"
+msgstr "已移除�考申請單 %1"
+
+#: html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50 html/Ticket/Elements/EditLinks:121 html/Ticket/Elements/EditLinks:81 html/Ticket/Elements/ShowLinks:70 html/Work/Search/BulkLinks:26 html/Work/Tickets/Elements/EditLinks:125 html/Work/Tickets/Elements/EditLinks:81 html/Work/Tickets/Elements/ShowLinks:38
 msgid "Referred to by"
 msgstr "被�考"
 
-#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:46 html/Ticket/Elements/EditLinks:134 html/Ticket/Elements/EditLinks:79 html/Ticket/Elements/ShowLinks:60 html/Work/Search/BulkLinks:22
+#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46 html/Ticket/Elements/EditLinks:117 html/Ticket/Elements/EditLinks:72 html/Ticket/Elements/ShowLinks:60 html/Work/Search/BulkLinks:22 html/Work/Tickets/Elements/EditLinks:121 html/Work/Tickets/Elements/EditLinks:67 html/Work/Tickets/Elements/ShowLinks:33
 msgid "Refers to"
 msgstr "�考"
 
@@ -4619,7 +4823,7 @@ msgstr "æ›´æ–°"
 msgid "Refresh this page every %1 minutes."
 msgstr "� %1 分�更新��"
 
-#: html/Ticket/Create.html:173 html/Ticket/Elements/ShowSummary:61 html/Ticket/ModifyAll.html:56
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/ModifyAll.html:56
 msgid "Relationships"
 msgstr "關係"
 
@@ -4639,7 +4843,7 @@ msgstr "移除副本"
 msgid "Remove Requestor"
 msgstr "移除申請人"
 
-#: html/Ticket/Elements/ShowTransaction:160 html/Ticket/Elements/Tabs:121 html/Work/Tickets/Display.html:31 html/Work/Tickets/Elements/ShowTransaction:108
+#: html/Ticket/Elements/ShowTransaction:172 html/Ticket/Elements/Tabs:121 html/Work/Tickets/Display.html:54 html/Work/Tickets/Elements/ShowTransaction:115
 msgid "Reply"
 msgstr "回覆"
 
@@ -4651,15 +4855,15 @@ msgstr "�申請單進行回覆"
 msgid "ReplyToTicket"
 msgstr "回覆申請單"
 
-#: html/Edit/Users/Info:45
+#: NOT FOUND IN SOURCE
 msgid "Report to Duty"
 msgstr "上下�刷�"
 
-#: html/Edit/Users/Info:33
+#: NOT FOUND IN SOURCE
 msgid "Reported on"
 msgstr "到�日期"
 
-#: etc/initialdata.zh:62 etc/initialdata:44 html/Ticket/Update.html:39 html/Work/Elements/List:21 html/Work/Elements/MyApprovals:12 html/Work/Elements/MyTickets:20 html/Work/Elements/SelectSearch:30 html/Work/Tickets/Elements/ShowBasics:62 lib/RT/ACE_Overlay.pm:86
+#: etc/initialdata:44 html/Ticket/Update.html:39 html/Work/Elements/List:21 html/Work/Elements/MyApprovals:12 html/Work/Elements/MyTickets:20 html/Work/Elements/SelectSearch:31 html/Work/Tickets/Elements/ShowBasics:62 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
 msgstr "申請人"
 
@@ -4687,7 +4891,7 @@ msgstr "申請人"
 msgid "RequestorAddresses"
 msgstr "申請人地�"
 
-#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30 html/Work/Tickets/Elements/EditPeople:38
 msgid "Requestors"
 msgstr "申請人"
 
@@ -4699,7 +4903,7 @@ msgstr "申請單處�期�"
 msgid "Reset"
 msgstr "�設"
 
-#: html/Admin/Users/Modify.html:158 html/User/Prefs.html:49 html/Work/Preferences/Info:32
+#: html/Admin/Users/Modify.html:158 html/User/Prefs.html:63 html/Work/Preferences/Info:34
 msgid "Residence"
 msgstr "�處"
 
@@ -4707,16 +4911,16 @@ msgstr "�處"
 msgid "Resolution"
 msgstr "解決狀態"
 
-#: html/Ticket/Elements/Tabs:131 html/Work/Tickets/Display.html:34
+#: html/Ticket/Elements/Tabs:131 html/Work/Tickets/Display.html:57
 msgid "Resolve"
 msgstr "解決"
 
-#: html/Ticket/Update.html:136 html/Work/Tickets/Update.html:120
+#: html/Ticket/Update.html:137
 #. ($Ticket->id, $Ticket->Subject)
 msgid "Resolve ticket #%1 (%2)"
 msgstr "解決申請單 #%1 (%2)"
 
-#: etc/initialdata.zh:331 etc/initialdata:308 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1188
+#: etc/initialdata:308 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1215
 msgid "Resolved"
 msgstr "已解決"
 
@@ -4724,7 +4928,7 @@ msgstr "已解決"
 msgid "Response to requestors"
 msgstr "回覆申請人"
 
-#: html/Edit/Users/Info:44
+#: NOT FOUND IN SOURCE
 msgid "Responsibility Type"
 msgstr "責任�分"
 
@@ -4732,11 +4936,11 @@ msgstr "責任�分"
 msgid "Results"
 msgstr "�果"
 
-#: html/Search/Elements/PickRestriction:104 html/Work/Search/PickRestriction:84
+#: html/Search/Elements/PickRestriction:104 html/Work/Search/PickRestriction:90
 msgid "Results per page"
 msgstr "��列出幾筆�果"
 
-#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:99 html/User/Prefs.html:71 html/Work/Preferences/Info:54
+#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:99 html/User/Prefs.html:94 html/Work/Preferences/Info:56
 msgid "Retype Password"
 msgstr "�次輸入密碼"
 
@@ -4776,17 +4980,17 @@ msgstr "權�撤消完畢"
 msgid "Rights"
 msgstr "權��代�人"
 
-#: lib/RT/Interface/Web.pm:794 x:797
+#: lib/RT/Interface/Web.pm:857
 #. ($object_type)
 msgid "Rights could not be granted for %1"
 msgstr "無法將權�賦予 %1"
 
-#: lib/RT/Interface/Web.pm:827 x:830
+#: lib/RT/Interface/Web.pm:887
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
 msgstr "無法撤消 %1 的權�"
 
-#: html/Edit/Groups/Member:55 html/Edit/Groups/Members/List:10
+#: html/Edit/Groups/Member:54 html/Edit/Groups/Members/List:10
 msgid "Role Members"
 msgstr "角色�員"
 
@@ -4802,19 +5006,19 @@ msgstr "角色"
 msgid "RootApproval"
 msgstr "交由系統管�員簽核"
 
-#: html/Edit/Global/Workflow/Action:27
+#: html/Edit/Global/Workflow/Action:23
 msgid "Run Approval"
 msgstr "簽核執行"
 
-#: html/Edit/Global/Basic/Top:72
+#: html/Edit/Global/Basic/Top:81
 msgid "SMTPDebug"
 msgstr "SMTP �錯紀錄"
 
-#: html/Edit/Global/Basic/Top:58
+#: html/Edit/Global/Basic/Top:63
 msgid "SMTPFrom"
 msgstr "SMTP 寄件��"
 
-#: html/Edit/Global/Basic/Top:56
+#: html/Edit/Global/Basic/Top:61
 msgid "SMTPServer"
 msgstr "SMTP 伺�器"
 
@@ -4826,7 +5030,7 @@ msgstr "星期六"
 msgid "Sat."
 msgstr "星期六"
 
-#: html/Edit/Elements/104Buttons:72 html/Work/Preferences/index.html:35
+#: html/Edit/Elements/104Buttons:83 html/Work/Preferences/index.html:33 html/Work/Tickets/Elements/EditBasics:63 html/Work/Tickets/Elements/EditLinks:133 html/Work/Tickets/Elements/EditPeople:51
 msgid "Save"
 msgstr "儲存"
 
@@ -4852,7 +5056,7 @@ msgstr "訊�通知動作"
 msgid "Scrip Condition"
 msgstr "訊�通知�件"
 
-#: lib/RT/Scrip_Overlay.pm:175
+#: lib/RT/Scrip_Overlay.pm:180
 msgid "Scrip Created"
 msgstr "手續新增完畢"
 
@@ -4860,7 +5064,7 @@ msgstr "手續新增完畢"
 msgid "Scrip Name"
 msgstr "訊��稱"
 
-#: html/Admin/Elements/EditScrips:83
+#: html/Admin/Elements/EditScrips:85
 msgid "Scrip deleted"
 msgstr "手續刪除完畢"
 
@@ -4868,7 +5072,7 @@ msgstr "手續刪除完畢"
 msgid "Scrips"
 msgstr "手續"
 
-#: html/Edit/Global/autohandler:9 html/Edit/Queues/autohandler:20
+#: html/Edit/Global/autohandler:9 html/Edit/Queues/autohandler:24
 msgid "Scrips "
 msgstr "訊�通知"
 
@@ -4880,7 +5084,7 @@ msgstr "%1 的手續\\n"
 msgid "Scrips which apply to all queues"
 msgstr "�用於所有表單的手續"
 
-#: html/Edit/Elements/104Buttons:75 html/Elements/SimpleSearch:26 html/Search/Elements/PickRestriction:125 html/Ticket/Elements/Tabs:158 html/Work/Elements/Tab:45 html/Work/Search/PickRestriction:102
+#: html/Edit/Elements/104Buttons:86 html/Elements/SimpleSearch:26 html/Search/Elements/PickRestriction:125 html/Ticket/Elements/Tabs:158 html/Work/Elements/Tab:45 html/Work/Search/PickRestriction:108
 msgid "Search"
 msgstr "查詢"
 
@@ -4896,7 +5100,7 @@ msgstr "簽核單查詢"
 msgid "Second-"
 msgstr "二"
 
-#: html/Edit/Users/Info:40
+#: NOT FOUND IN SOURCE
 msgid "Second-level Users"
 msgstr "二階主管員工"
 
@@ -4976,7 +5180,7 @@ msgstr "多��項"
 msgid "SelectSingle"
 msgstr "單一�項"
 
-#: html/Edit/Elements/PickUsers:85 html/Edit/Users/Add.html:78
+#: html/Edit/Elements/PickUsers:87 html/Edit/Users/Add.html:78
 msgid "Selected users:"
 msgstr "新增�象："
 
@@ -4984,39 +5188,39 @@ msgstr "新增�象："
 msgid "Self Service"
 msgstr "自助�務"
 
-#: etc/initialdata.zh:131 etc/initialdata:113
+#: etc/initialdata:113
 msgid "Send mail to all watchers"
 msgstr "寄信給所有視察員"
 
-#: etc/initialdata.zh:127 etc/initialdata:109
+#: etc/initialdata:109
 msgid "Send mail to all watchers as a \"comment\""
 msgstr "以評論方�寄信給所有視察員"
 
-#: etc/initialdata.zh:122 etc/initialdata:104
+#: etc/initialdata:104
 msgid "Send mail to requestors and Ccs"
 msgstr "寄信給申請人�副本收件人"
 
-#: etc/initialdata.zh:117 etc/initialdata:99
+#: etc/initialdata:99
 msgid "Send mail to requestors and Ccs as a comment"
 msgstr "以評論方�寄信給申請人�副本收件人"
 
-#: etc/initialdata.zh:96 etc/initialdata:78
+#: etc/initialdata:78
 msgid "Sends a message to the requestors"
 msgstr "寄信給申請人"
 
-#: etc/initialdata.zh:135 etc/initialdata.zh:139 etc/initialdata:117 etc/initialdata:121
+#: etc/initialdata:117 etc/initialdata:121
 msgid "Sends mail to explicitly listed Ccs and Bccs"
 msgstr "寄信給特定的副本�密件副本收件人"
 
-#: etc/initialdata.zh:112 etc/initialdata:94
+#: etc/initialdata:94
 msgid "Sends mail to the administrative Ccs"
 msgstr "寄信給管�員副本收件人"
 
-#: etc/initialdata.zh:108 etc/initialdata:90
+#: etc/initialdata:90
 msgid "Sends mail to the administrative Ccs as a comment"
 msgstr "以評論寄信給管�員副本收件人"
 
-#: etc/initialdata.zh:100 etc/initialdata.zh:104 etc/initialdata:82 etc/initialdata:86
+#: etc/initialdata:82 etc/initialdata:86
 msgid "Sends mail to the owner"
 msgstr "寄信給申請人"
 
@@ -5032,7 +5236,11 @@ msgstr "09"
 msgid "September"
 msgstr "�月"
 
-#: html/Edit/Users/Info:38
+#: NOT FOUND IN SOURCE
+msgid "Setting %1's 'Disabled' property to %2"
+msgstr "%1 的「�用�屬性已設為 %2"
+
+#: NOT FOUND IN SOURCE
 msgid "Shift Type"
 msgstr "�別屬性"
 
@@ -5100,7 +5308,7 @@ msgstr "登記�為申請人或副本收件人"
 msgid "Sign up as a ticket or queue AdminCc"
 msgstr "登記�為管�員副本收件人"
 
-#: html/Admin/Elements/ModifyUser:38 html/Admin/Users/Modify.html:190 html/Admin/Users/Prefs.html:31 html/User/Prefs.html:111 html/Work/Preferences/Info:111
+#: html/Admin/Elements/ModifyUser:38 html/Admin/Users/Modify.html:190 html/Admin/Users/Prefs.html:31 html/Edit/Users/Info:52 html/User/Prefs.html:148 html/Work/Preferences/Info:113
 msgid "Signature"
 msgstr "簽�檔"
 
@@ -5124,7 +5332,7 @@ msgstr "順�"
 msgid "Sort key"
 msgstr "排�方�"
 
-#: html/Search/Elements/PickRestriction:108 html/Work/Search/PickRestriction:89
+#: html/Search/Elements/PickRestriction:108 html/Work/Search/PickRestriction:95
 msgid "Sort results by"
 msgstr "�果排�方�"
 
@@ -5132,7 +5340,7 @@ msgstr "�果排�方�"
 msgid "SortOrder"
 msgstr "排�順�"
 
-#: html/Work/Elements/List:8 html/Work/Elements/MyApprovals:11
+#: html/Admin/Elements/EditScrip:80 html/Edit/Global/Scrip/Top:75 html/Work/Elements/List:8 html/Work/Elements/MyApprovals:11
 msgid "Stage"
 msgstr "關�"
 
@@ -5152,7 +5360,7 @@ msgstr "延宕"
 msgid "Start page"
 msgstr "首�"
 
-#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:34
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35 html/Work/Tickets/Elements/EditBasics:35
 msgid "Started"
 msgstr "實際起始日"
 
@@ -5160,7 +5368,7 @@ msgstr "實際起始日"
 msgid "Started date '%1' could not be parsed"
 msgstr "無法解讀起始日期 '%1"
 
-#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:30
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31 html/Work/Tickets/Elements/EditBasics:26
 msgid "Starts"
 msgstr "應起始日"
 
@@ -5172,19 +5380,19 @@ msgstr "應起始日"
 msgid "Starts date '%1' could not be parsed"
 msgstr "無法解讀起始日期 '%1"
 
-#: html/Admin/Elements/ModifyUser:81 html/Admin/Users/Modify.html:137 html/User/Prefs.html:93 html/Work/Preferences/Info:83
+#: html/Admin/Elements/ModifyUser:81 html/Admin/Users/Modify.html:137 html/User/Prefs.html:126 html/Work/Preferences/Info:85
 msgid "State"
 msgstr "å·ž"
 
-#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Search/Elements/PickRestriction:73 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:37 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:59 html/Work/Elements/List:15 html/Work/Elements/MyRequests:18 html/Work/Elements/MyTickets:18 html/Work/Search/PickRestriction:54 html/Work/Tickets/Update.html:22 lib/RT/Ticket_Overlay.pm:1182 lib/RT/Tickets_Overlay.pm:908
+#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Search/Elements/PickRestriction:73 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:37 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:59 html/Work/Elements/List:15 html/Work/Elements/MyRequests:18 html/Work/Elements/MyTickets:18 html/Work/Search/PickRestriction:54 html/Work/Tickets/Elements/EditBasics:19 html/Work/Tickets/Update.html:22 lib/RT/Ticket_Overlay.pm:1209 lib/RT/Tickets_Overlay.pm:927
 msgid "Status"
 msgstr "��"
 
-#: etc/initialdata.zh:317 etc/initialdata:294
+#: etc/initialdata:294
 msgid "Status Change"
 msgstr "��改變時"
 
-#: lib/RT/Transaction_Overlay.pm:528
+#: lib/RT/Transaction_Overlay.pm:477
 #. ($self->loc($self->OldValue), $self->loc($self->NewValue))
 msgid "Status changed from %1 to %2"
 msgstr "��從 %1 改為 %2"
@@ -5205,25 +5413,25 @@ msgstr "強制承辦申請單"
 msgid "StealTicket"
 msgstr "強制承辦申請單"
 
-#: lib/RT/Transaction_Overlay.pm:587
+#: lib/RT/Transaction_Overlay.pm:545
 #. ($Old->Name)
 msgid "Stolen from %1 "
-msgstr "被 %1 強制更� "
+msgstr "承辦人從 %1 強制更�"
 
-#: html/Edit/Groups/Member:69
+#: html/Edit/Groups/Member:68
 msgid "Subgroup"
 msgstr "�群組"
 
-#: html/Elements/MyRequests:28 html/Elements/MyTickets:28 html/Search/Bulk.html:135 html/Search/Elements/PickRestriction:42 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:27 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:75 html/Work/Elements/MyApprovals:9 html/Work/Elements/MyRequests:16 html/Work/Elements/MyTickets:16 html/Work/Search/Bulk.html:87 html/Work/Search/PickRestriction:22 html/Work/Tickets/Create.html:131 html/Work/Tickets/Elements/ShowBasics:36 lib/RT/Ticket_Overlay.pm:1178 lib/RT/Tickets_Overlay.pm:987
+#: html/Elements/MyRequests:28 html/Elements/MyTickets:28 html/Search/Bulk.html:135 html/Search/Elements/PickRestriction:42 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:27 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:75 html/Work/Elements/MyApprovals:9 html/Work/Elements/MyRequests:16 html/Work/Elements/MyTickets:16 html/Work/Search/Bulk.html:87 html/Work/Search/PickRestriction:22 html/Work/Tickets/Elements/AddSubject:8 html/Work/Tickets/Elements/EditBasics:8 html/Work/Tickets/Elements/ShowBasics:36 html/Work/Tickets/Elements/ShowSubject:8 lib/RT/Ticket_Overlay.pm:1205 lib/RT/Tickets_Overlay.pm:1006
 msgid "Subject"
 msgstr "主題"
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/Transaction_Overlay.pm:609
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:567
 #. ($self->Data)
 msgid "Subject changed to %1"
 msgstr "標題已改為 %1"
 
-#: html/Elements/Submit:58 html/Work/Search/Bulk.html:103
+#: html/Edit/Users/Info:71 html/Elements/Submit:58 html/Work/Search/Bulk.html:103
 msgid "Submit"
 msgstr "�出"
 
@@ -5231,7 +5439,7 @@ msgstr "�出"
 msgid "Submit Workflow"
 msgstr "�出�程"
 
-#: lib/RT/Group_Overlay.pm:748
+#: lib/RT/Group_Overlay.pm:746
 msgid "Succeeded"
 msgstr "設定�功"
 
@@ -5247,6 +5455,18 @@ msgstr "星期日"
 msgid "SuperUser"
 msgstr "系統管�員"
 
+#: html/Edit/Global/Basic/Top:29
+msgid "Sync now"
+msgstr "執行�步"
+
+#: html/Edit/Global/Basic/Top:87
+msgid "Sync104HRMS"
+msgstr "自動�步104HRMS"
+
+#: NOT FOUND IN SOURCE
+msgid "Synchronizing HRMS data.  This may take a while..."
+msgstr "正在�步化 HRMS 人事系統資料。請�待..."
+
 #: html/User/Elements/DelegateRights:76
 msgid "System"
 msgstr "系統"
@@ -5255,7 +5475,7 @@ msgstr "系統"
 msgid "System Defined"
 msgstr "系統定義"
 
-#: html/Admin/Elements/SelectRights:80 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:793 lib/RT/Interface/Web.pm:826 x:796 x:829
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:856 lib/RT/Interface/Web.pm:886
 msgid "System Error"
 msgstr "系統錯誤"
 
@@ -5267,7 +5487,7 @@ msgstr "系統錯誤。設定權�失敗。"
 msgid "System Error. right not granted"
 msgstr "系統錯誤。設定權�失敗。"
 
-#: html/Edit/Users/index.html:122
+#: html/Edit/Users/index.html:95
 msgid "System Rights"
 msgstr "系統權�"
 
@@ -5291,11 +5511,11 @@ msgstr "系統群組"
 msgid "SystemInternal"
 msgstr "系統內部用"
 
-#: etc/initialdata.zh:59 etc/initialdata.zh:65 etc/initialdata.zh:71 etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
+#: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
 msgid "SystemRolegroup for internal use"
 msgstr "內部使用的系統角色群組"
 
-#: lib/RT/CurrentUser.pm:319
+#: lib/RT/CurrentUser.pm:318
 msgid "TEST_STRING"
 msgstr "TEST_STRING"
 
@@ -5315,11 +5535,11 @@ msgstr "自行承辦申請單"
 msgid "TakeTicket"
 msgstr "自行承辦申請單"
 
-#: lib/RT/Transaction_Overlay.pm:573
+#: lib/RT/Transaction_Overlay.pm:530
 msgid "Taken"
 msgstr "已��"
 
-#: html/Admin/Elements/EditScrip:80
+#: html/Admin/Elements/EditScrip:88
 msgid "Template"
 msgstr "範本"
 
@@ -5344,7 +5564,7 @@ msgstr "通知範本�稱"
 msgid "Template deleted"
 msgstr "範本已刪除"
 
-#: lib/RT/Scrip_Overlay.pm:152
+#: lib/RT/Scrip_Overlay.pm:156
 msgid "Template not found"
 msgstr "找�到範本"
 
@@ -5352,7 +5572,7 @@ msgstr "找�到範本"
 msgid "Template not found\\n"
 msgstr "找�到範本\\n"
 
-#: lib/RT/Template_Overlay.pm:352
+#: lib/RT/Template_Overlay.pm:359
 msgid "Template parsed"
 msgstr "範本剖�完畢"
 
@@ -5360,7 +5580,7 @@ msgstr "範本剖�完畢"
 msgid "Templates"
 msgstr "範本"
 
-#: html/Edit/Global/autohandler:8 html/Edit/Queues/autohandler:19
+#: html/Edit/Global/autohandler:8 html/Edit/Queues/autohandler:23
 msgid "Templates "
 msgstr "通知範本"
 
@@ -5368,7 +5588,7 @@ msgstr "通知範本"
 msgid "Templates for %1\\n"
 msgstr "找�到 %1 的範本\\n"
 
-#: lib/RT/Interface/Web.pm:894 x:897
+#: lib/RT/Interface/Web.pm:954
 msgid "That is already the current value"
 msgstr "已經是目�欄�的值"
 
@@ -5376,7 +5596,7 @@ msgstr "已經是目�欄�的值"
 msgid "That is not a value for this custom field"
 msgstr "這�是該自訂欄�的值"
 
-#: lib/RT/Ticket_Overlay.pm:1899
+#: lib/RT/Ticket_Overlay.pm:1926
 msgid "That is the same value"
 msgstr "�樣的值"
 
@@ -5389,7 +5609,7 @@ msgstr "這項單�已經�有該權�"
 msgid "That principal is already a %1 for this queue"
 msgstr "這項單�已經是這個表單的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1433
+#: lib/RT/Ticket_Overlay.pm:1460
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
 msgstr "這項單�已經是這份申請單的 %1"
@@ -5399,16 +5619,16 @@ msgstr "這項單�已經是這份申請單的 %1"
 msgid "That principal is not a %1 for this queue"
 msgstr "這項單��是這個表單的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1550
+#: lib/RT/Ticket_Overlay.pm:1577
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this ticket"
 msgstr "這項單��是這份申請單的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1895
+#: lib/RT/Ticket_Overlay.pm:1922
 msgid "That queue does not exist"
 msgstr "此表單�存在"
 
-#: lib/RT/Ticket_Overlay.pm:3237
+#: lib/RT/Ticket_Overlay.pm:3293
 msgid "That ticket has unresolved dependencies"
 msgstr "這份申請單有尚未解決的附屬申請單"
 
@@ -5416,27 +5636,27 @@ msgstr "這份申請單有尚未解決的附屬申請單"
 msgid "That user already has that right"
 msgstr "使用者已具有該項權�"
 
-#: lib/RT/Ticket_Overlay.pm:3047
+#: lib/RT/Ticket_Overlay.pm:3097
 msgid "That user already owns that ticket"
 msgstr "該使用者已經承辦這份申請單"
 
-#: lib/RT/Ticket_Overlay.pm:3019
+#: lib/RT/Ticket_Overlay.pm:3069
 msgid "That user does not exist"
 msgstr "使用者�存在"
 
-#: lib/RT/User_Overlay.pm:376
+#: lib/RT/User_Overlay.pm:381
 msgid "That user is already privileged"
 msgstr "這�使用者已經是內部�員"
 
-#: lib/RT/User_Overlay.pm:397
+#: lib/RT/User_Overlay.pm:402
 msgid "That user is already unprivileged"
 msgstr "這�使用者屬於�內部�員群組"
 
-#: lib/RT/User_Overlay.pm:389
+#: lib/RT/User_Overlay.pm:394
 msgid "That user is now privileged"
 msgstr "使用者加入內部�員群組完畢"
 
-#: lib/RT/User_Overlay.pm:410
+#: lib/RT/User_Overlay.pm:415
 msgid "That user is now unprivileged"
 msgstr "這�使用者已加入�內部�員群組"
 
@@ -5444,7 +5664,7 @@ msgstr "這�使用者已加入�內部�員群組"
 msgid "That user is now unprivilegedileged"
 msgstr "這�使用者已加入�內部�員群組"
 
-#: lib/RT/Ticket_Overlay.pm:3040
+#: lib/RT/Ticket_Overlay.pm:3090
 msgid "That user may not own tickets in that queue"
 msgstr "使用者�能沒有承辦表單裡的申請單"
 
@@ -5464,7 +5684,7 @@ msgstr "申請單的副本收件人"
 msgid "The administrative CC of a ticket"
 msgstr "申請單的管�員副本收件人"
 
-#: lib/RT/Ticket_Overlay.pm:2226
+#: lib/RT/Ticket_Overlay.pm:2255
 msgid "The comment has been recorded"
 msgstr "評論已被紀錄"
 
@@ -5476,7 +5696,7 @@ msgstr "下列命令會找到 'general' 表單內所有�作中的申請單，
 msgid "The following commands were not proccessed:\\n\\n"
 msgstr "以下命令未被執行：\\n\\n"
 
-#: lib/RT/Interface/Web.pm:897 x:900
+#: lib/RT/Interface/Web.pm:957
 msgid "The new value has been set."
 msgstr "新的欄�值設定完�。"
 
@@ -5504,7 +5724,7 @@ msgstr "申請單 %1 %2 (%3)\\n"
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
 msgstr "此工具程�會讓使用者經由 RT 執行任�命令。"
 
-#: lib/RT/Transaction_Overlay.pm:251
+#: lib/RT/Transaction_Overlay.pm:200
 msgid "This transaction appears to have no content"
 msgstr "此項更動報告沒有內容"
 
@@ -5525,7 +5745,7 @@ msgstr "星期四"
 msgid "Thu."
 msgstr "星期四"
 
-#: html/Admin/Elements/ModifyTemplateAsWorkflow:163
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:163 html/Edit/Global/Workflow/Condition:24
 msgid "Ticket"
 msgstr "申請單"
 
@@ -5547,7 +5767,7 @@ msgstr "更新申請單 #%1 的全部資訊：%2"
 msgid "Ticket #%1: %2"
 msgstr "申請單 #%1: %2"
 
-#: lib/RT/Ticket_Overlay.pm:605 lib/RT/Ticket_Overlay.pm:626
+#: lib/RT/Ticket_Overlay.pm:632 lib/RT/Ticket_Overlay.pm:653
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
 msgstr "申請單 #%1 �功新增於 '%2' 表單"
@@ -5557,12 +5777,12 @@ msgstr "申請單 #%1 �功新增於 '%2' 表單"
 msgid "Ticket %1 loaded\\n"
 msgstr "載入申請單 %1\\n"
 
-#: html/Search/Bulk.html:212 html/Work/Search/Bulk.html:169
+#: html/Search/Bulk.html:213 html/Work/Search/Bulk.html:169
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
 msgstr "申請單 %1：%2"
 
-#: html/Edit/Queues/Basic/Top:28 html/Edit/Queues/List:16 html/Work/Queues/List:9
+#: html/Edit/Queues/Basic/Top:30 html/Edit/Queues/List:30 html/Work/Queues/List:9
 msgid "Ticket Due"
 msgstr "表單處�期�"
 
@@ -5583,11 +5803,11 @@ msgstr "申請單編號"
 msgid "Ticket Processing Due"
 msgstr "表單�行期�"
 
-#: etc/initialdata.zh:332 etc/initialdata:309
+#: etc/initialdata:309
 msgid "Ticket Resolved"
 msgstr "申請單已解決"
 
-#: html/Edit/Queues/Basic/Top:18 html/Edit/Queues/Category/List:6 html/Edit/Queues/Category/Top:7 html/Edit/Queues/List:7 html/Edit/Queues/index.html:31 html/Work/Delegates/List:7 html/Work/Delegates/index.html:11 html/Work/Elements/List:12 html/Work/Elements/SelectSearch:9 html/Work/Queues/List:6 html/Work/Queues/Select.html:12 html/Work/Queues/index.html:11 html/Work/Tickets/Create.html:44 html/Work/Tickets/Elements/ShowBasics:34
+#: html/Edit/Queues/Basic/Top:20 html/Edit/Queues/Category/List:6 html/Edit/Queues/Category/Top:7 html/Edit/Queues/List:21 html/Work/Delegates/List:7 html/Work/Delegates/index.html:11 html/Work/Elements/List:12 html/Work/Elements/SelectSearch:9 html/Work/Queues/List:6 html/Work/Queues/Select.html:12 html/Work/Queues/index.html:11 html/Work/Tickets/Create.html:43 html/Work/Tickets/Elements/ShowBasics:34
 msgid "Ticket Type"
 msgstr "表單種類"
 
@@ -5595,19 +5815,19 @@ msgstr "表單種類"
 msgid "Ticket attachment"
 msgstr "申請單附件"
 
-#: lib/RT/Tickets_Overlay.pm:1166
+#: lib/RT/Tickets_Overlay.pm:1185
 msgid "Ticket content"
 msgstr "申請單內容"
 
-#: lib/RT/Tickets_Overlay.pm:1212
+#: lib/RT/Tickets_Overlay.pm:1231
 msgid "Ticket content type"
 msgstr "申請單內容類別"
 
-#: lib/RT/Ticket_Overlay.pm:496 lib/RT/Ticket_Overlay.pm:505 lib/RT/Ticket_Overlay.pm:515 lib/RT/Ticket_Overlay.pm:615
+#: lib/RT/Ticket_Overlay.pm:520 lib/RT/Ticket_Overlay.pm:529 lib/RT/Ticket_Overlay.pm:539 lib/RT/Ticket_Overlay.pm:642
 msgid "Ticket could not be created due to an internal error"
 msgstr "內部錯誤，無法新增申請單"
 
-#: lib/RT/Transaction_Overlay.pm:520
+#: lib/RT/Transaction_Overlay.pm:469
 msgid "Ticket created"
 msgstr "申請單新增完畢"
 
@@ -5615,7 +5835,7 @@ msgstr "申請單新增完畢"
 msgid "Ticket creation failed"
 msgstr "申請單新增失敗"
 
-#: lib/RT/Transaction_Overlay.pm:525
+#: lib/RT/Transaction_Overlay.pm:474
 msgid "Ticket deleted"
 msgstr "申請單刪除完畢"
 
@@ -5631,7 +5851,7 @@ msgstr "申請單刪除完畢"
 msgid "Ticket not found"
 msgstr "找�到申請單"
 
-#: etc/initialdata.zh:318 etc/initialdata:295
+#: etc/initialdata:295
 msgid "Ticket status changed"
 msgstr "申請單��已改變"
 
@@ -5643,12 +5863,12 @@ msgstr "申請單視察員"
 msgid "Tickets"
 msgstr "申請單"
 
-#: lib/RT/Tickets_Overlay.pm:1383
+#: lib/RT/Tickets_Overlay.pm:1402
 #. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
 msgid "Tickets %1 %2"
 msgstr "申請單 %1 %2"
 
-#: lib/RT/Tickets_Overlay.pm:1348
+#: lib/RT/Tickets_Overlay.pm:1367
 #. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
 msgid "Tickets %1 by %2"
 msgstr "申請單 %1 (%2)"
@@ -5670,15 +5890,15 @@ msgstr "%1 的申請單"
 msgid "Tickets which depend on this approval:"
 msgstr "批准之後，�接續處�："
 
-#: html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
+#: html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47 html/Work/Tickets/Elements/EditBasics:32
 msgid "Time Left"
 msgstr "剩餘時間"
 
-#: html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:42
+#: html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:42 html/Work/Tickets/Elements/EditBasics:24
 msgid "Time Worked"
 msgstr "處�時間"
 
-#: lib/RT/Tickets_Overlay.pm:1139
+#: lib/RT/Tickets_Overlay.pm:1158
 msgid "Time left"
 msgstr "剩餘時間"
 
@@ -5686,7 +5906,7 @@ msgstr "剩餘時間"
 msgid "Time to display"
 msgstr "顯示時間"
 
-#: lib/RT/Tickets_Overlay.pm:1115
+#: lib/RT/Tickets_Overlay.pm:1134
 msgid "Time worked"
 msgstr "已處�時間"
 
@@ -5694,7 +5914,7 @@ msgstr "已處�時間"
 msgid "TimeLeft"
 msgstr "剩餘時間"
 
-#: lib/RT/Ticket_Overlay.pm:1183
+#: lib/RT/Ticket_Overlay.pm:1210
 msgid "TimeWorked"
 msgstr "已處�時間"
 
@@ -5706,32 +5926,40 @@ msgstr "產生這次更動的差異檔："
 msgid "To generate a diff of this commit:\\n"
 msgstr "產生這次更動的差異檔：\\n"
 
-#: lib/RT/Ticket_Overlay.pm:1186
+#: lib/RT/Ticket_Overlay.pm:1213
 msgid "Told"
 msgstr "告知日期"
 
-#: html/Edit/Elements/Page:46
+#: html/Edit/Elements/Page:47
 msgid "Total"
 msgstr "é �"
 
-#: etc/initialdata.zh:239 etc/initialdata:237
+#: etc/initialdata:237
 msgid "Transaction"
 msgstr "æ›´å‹•"
 
-#: lib/RT/Transaction_Overlay.pm:640
+#: lib/RT/Transaction_Overlay.pm:666
 #. ($self->Data)
 msgid "Transaction %1 purged"
 msgstr "清除更動報告 %1"
 
-#: lib/RT/Transaction_Overlay.pm:177
+#: lib/RT/Transaction_Overlay.pm:126
 msgid "Transaction Created"
 msgstr "更動報告已新增"
 
-#: lib/RT/Transaction_Overlay.pm:88
+#: lib/RT/Transaction_Overlay.pm:90
 msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
 msgstr "未指定申請單編號，無法新增更動"
 
-#: lib/RT/Transaction_Overlay.pm:699
+#: NOT FOUND IN SOURCE
+msgid "TransactionBatch"
+msgstr "批次更動時"
+
+#: NOT FOUND IN SOURCE
+msgid "TransactionCreate"
+msgstr "新增更動時"
+
+#: lib/RT/Transaction_Overlay.pm:721
 msgid "Transactions are immutable"
 msgstr "��更改更動報告"
 
@@ -5747,7 +5975,7 @@ msgstr "星期二"
 msgid "Tue."
 msgstr "星期二"
 
-#: html/Admin/Elements/EditCustomField:43 html/Admin/Elements/ModifyTemplateAsWorkflow:135 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1184 lib/RT/Tickets_Overlay.pm:959
+#: html/Admin/Elements/EditCustomField:43 html/Admin/Elements/ModifyTemplateAsWorkflow:135 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1211 lib/RT/Tickets_Overlay.pm:978
 msgid "Type"
 msgstr "類別"
 
@@ -5763,7 +5991,7 @@ msgstr "外部系統登入帳號"
 msgid "UnixUsername"
 msgstr "外部系統登入帳號"
 
-#: lib/RT/Attachment_Overlay.pm:266 lib/RT/Attachment_Overlay.pm:298
+#: lib/RT/Attachment_Overlay.pm:281 lib/RT/Attachment_Overlay.pm:313
 #. ($self->ContentEncoding)
 msgid "Unknown ContentEncoding %1"
 msgstr "��解的內容文字編碼方� %1"
@@ -5772,11 +6000,11 @@ msgstr "��解的內容文字編碼方� %1"
 msgid "Unlimited"
 msgstr "全數顯示"
 
-#: etc/initialdata.zh:50 etc/initialdata:32
+#: etc/initialdata:32
 msgid "Unprivileged"
 msgstr "�內部�員"
 
-#: lib/RT/Transaction_Overlay.pm:569
+#: lib/RT/Transaction_Overlay.pm:526
 msgid "Untaken"
 msgstr "未被��"
 
@@ -5784,7 +6012,7 @@ msgstr "未被��"
 msgid "Up"
 msgstr "上一�"
 
-#: html/Elements/MyTickets:63 html/Search/Bulk.html:32 html/Work/Elements/MyTickets:82 html/Work/Search/Bulk.html:10 html/Work/Tickets/Elements/EditCustomFieldEntries:97
+#: html/Elements/MyTickets:63 html/Search/Bulk.html:32 html/Work/Elements/MyTickets:83 html/Work/Search/Bulk.html:10 html/Work/Tickets/Elements/EditCustomFieldEntries:63
 msgid "Update"
 msgstr "處�"
 
@@ -5808,7 +6036,7 @@ msgstr "更新電�郵件信箱"
 msgid "Update name"
 msgstr "更新帳號"
 
-#: lib/RT/Interface/Web.pm:409 x:412
+#: lib/RT/Interface/Web.pm:467
 msgid "Update not recorded."
 msgstr "更新未被記錄"
 
@@ -5828,21 +6056,21 @@ msgstr "更新申請單"
 msgid "Update ticket # %1"
 msgstr "更新申請單 # %1"
 
-#: html/SelfService/Update.html:24 html/SelfService/Update.html:46
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
 #. ($Ticket->id)
 msgid "Update ticket #%1"
 msgstr "更新申請單 #%1"
 
-#: html/Ticket/Update.html:138 html/Work/Tickets/Update.html:122
+#: html/Ticket/Update.html:139
 #. ($Ticket->id, $Ticket->Subject)
 msgid "Update ticket #%1 (%2)"
 msgstr "更新申請單 #%1 (%2)"
 
-#: lib/RT/Interface/Web.pm:407 x:410
+#: lib/RT/Interface/Web.pm:465
 msgid "Update type was neither correspondence nor comment."
 msgstr "更新的內容並�申請單回覆也�是評論"
 
-#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:50 lib/RT/Ticket_Overlay.pm:1187
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1214
 msgid "Updated"
 msgstr "�次更新"
 
@@ -5866,23 +6094,23 @@ msgstr "找�到使用者 '%1'"
 msgid "User '%1' not found\\n"
 msgstr "找�到使用者 '%1'\\n"
 
-#: etc/initialdata.zh:142 etc/initialdata.zh:209 etc/initialdata:124 etc/initialdata:191
+#: etc/initialdata:124 etc/initialdata:191
 msgid "User Defined"
 msgstr "使用者自訂"
 
-#: html/Admin/Users/Prefs.html:58 html/Edit/Users/List:13 html/Edit/Users/Top:42
+#: html/Admin/Users/Prefs.html:58
 msgid "User ID"
 msgstr "使用者 ID"
 
-#: html/Elements/SelectUsers:25
+#: html/Edit/Elements/SelectUsers:3 html/Elements/SelectUsers:25
 msgid "User Id"
 msgstr "使用者 ID"
 
-#: html/Edit/Elements/PickUsers:12 html/Edit/Global/UserRight/List:7 html/Edit/Global/UserRight/Top:9 html/Edit/Users/Add.html:13 html/Edit/Users/List:5 html/Edit/Users/Search.html:23 html/Edit/Users/Top:8 html/Work/Delegates/Info:60 html/Work/Tickets/Cc:10
+#: html/Edit/Elements/PickUsers:12 html/Edit/Global/UserRight/List:7 html/Edit/Global/UserRight/Top:9 html/Edit/Users/Add.html:13 html/Edit/Users/Search.html:23 html/Work/Delegates/Info:60 html/Work/Tickets/Cc:10
 msgid "User Number"
 msgstr "員工編號"
 
-#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58 html/Edit/Global/autohandler:11 html/Edit/Queues/autohandler:22
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58 html/Edit/Global/autohandler:11 html/Edit/Queues/autohandler:26
 msgid "User Rights"
 msgstr "使用者權�"
 
@@ -5890,7 +6118,7 @@ msgstr "使用者權�"
 msgid "User Setup"
 msgstr "使用者設定"
 
-#: html/Edit/Users/Info:37
+#: NOT FOUND IN SOURCE
 msgid "User Shift"
 msgstr "員工�別"
 
@@ -5899,15 +6127,23 @@ msgstr "員工�別"
 msgid "User could not be created: %1"
 msgstr "無法新增使用者：%1"
 
-#: lib/RT/User_Overlay.pm:321
+#: lib/RT/User_Overlay.pm:326
 msgid "User created"
 msgstr "使用者新增完畢"
 
+#: NOT FOUND IN SOURCE
+msgid "User created: %1"
+msgstr "使用者 %1 新增完畢"
+
+#: NOT FOUND IN SOURCE
+msgid "User created: %1 (%2)"
+msgstr "使用者 %1 (%2) 新增完畢"
+
 #: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
 msgid "User defined groups"
 msgstr "使用者定義的群組"
 
-#: lib/RT/User_Overlay.pm:575 lib/RT/User_Overlay.pm:592
+#: lib/RT/User_Overlay.pm:580 lib/RT/User_Overlay.pm:597
 msgid "User loaded"
 msgstr "已載入使用者"
 
@@ -5915,6 +6151,10 @@ msgstr "已載入使用者"
 msgid "User notified"
 msgstr "已通知使用者"
 
+#: NOT FOUND IN SOURCE
+msgid "User renamed from %1 to %2"
+msgstr "使用者 %1 已改�為 %2"
+
 #: html/Admin/Users/Prefs.html:24 html/Admin/Users/Prefs.html:28
 msgid "User view"
 msgstr "使用者�人資料"
@@ -5927,7 +6167,7 @@ msgstr "使用者自定"
 msgid "Username"
 msgstr "帳號"
 
-#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57 html/Work/Tickets/Elements/ShowTransaction:8
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/Edit/Groups/Admin:9 html/User/Groups/Members.html:57 html/Work/Tickets/Elements/ShowTransaction:11
 msgid "Users"
 msgstr "使用者"
 
@@ -5935,7 +6175,7 @@ msgstr "使用者"
 msgid "Users matching search criteria"
 msgstr "符�查詢�件的使用者"
 
-#: html/Search/Elements/PickRestriction:50 html/Work/Search/PickRestriction:31
+#: NOT FOUND IN SOURCE
 msgid "ValueOfQueue"
 msgstr "�擇表單"
 
@@ -5955,7 +6195,7 @@ msgstr "以管�員副本收件人身份視察"
 msgid "Watcher loaded"
 msgstr "�功載入視察員資訊"
 
-#: html/Admin/Elements/QueueTabs:41
+#: html/Admin/Elements/QueueTabs:41 html/Edit/Elements/SelectQueues:5
 msgid "Watchers"
 msgstr "視察員"
 
@@ -5971,55 +6211,55 @@ msgstr "星期三"
 msgid "Wed."
 msgstr "星期三"
 
-#: etc/initialdata.zh:533 etc/initialdata:503 etc/upgrade/2.1.71:161 html/Edit/Elements/CreateApprovalsQueue:135
+#: etc/initialdata:503 etc/upgrade/2.1.71:161 html/Edit/Elements/CreateApprovalsQueue:135
 msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
 msgstr "當申請單通�所有簽核後，將此訊�回覆到原申請單"
 
-#: etc/initialdata.zh:497 etc/initialdata:467 etc/upgrade/2.1.71:135 html/Edit/Elements/CreateApprovalsQueue:107
+#: etc/initialdata:467 etc/upgrade/2.1.71:135 html/Edit/Elements/CreateApprovalsQueue:107
 msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
 msgstr "當申請單通��項簽核後，將此訊�回覆到原申請單"
 
-#: etc/initialdata.zh:156 etc/initialdata:138
+#: etc/initialdata:138
 msgid "When a ticket is created"
 msgstr "新增申請單時"
 
-#: etc/initialdata.zh:428 etc/initialdata:400 etc/upgrade/2.1.71:79 html/Edit/Elements/CreateApprovalsQueue:51
+#: etc/initialdata:400 etc/upgrade/2.1.71:79 html/Edit/Elements/CreateApprovalsQueue:51
 msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
 msgstr "簽核單新增之後，通知應��的承辦人�管�員副本收件人"
 
-#: etc/initialdata.zh:161 etc/initialdata:143
+#: etc/initialdata:143
 msgid "When anything happens"
 msgstr "當任何事情發生時"
 
-#: etc/initialdata.zh:202 etc/initialdata:184
+#: etc/initialdata:184
 msgid "Whenever a ticket is resolved"
 msgstr "當申請單解決時"
 
-#: etc/initialdata.zh:188 etc/initialdata:170
+#: etc/initialdata:170
 msgid "Whenever a ticket's owner changes"
 msgstr "當申請單更�承辦人時"
 
-#: etc/initialdata.zh:196 etc/initialdata:178
+#: etc/initialdata:178
 msgid "Whenever a ticket's queue changes"
 msgstr "當申請單更�表單時"
 
-#: etc/initialdata.zh:180 etc/initialdata:162
+#: etc/initialdata:162
 msgid "Whenever a ticket's status changes"
 msgstr "當申請單更新��時"
 
-#: etc/initialdata.zh:210 etc/initialdata:192
+#: etc/initialdata:192
 msgid "Whenever a user-defined condition occurs"
 msgstr "當使用者自訂的情�發生時"
 
-#: etc/initialdata.zh:174 etc/initialdata:156
+#: etc/initialdata:156
 msgid "Whenever comments come in"
 msgstr "當評論��時"
 
-#: etc/initialdata.zh:167 etc/initialdata:149
+#: etc/initialdata:149
 msgid "Whenever correspondence comes in"
 msgstr "當回覆��時"
 
-#: html/Admin/Users/Modify.html:163 html/User/Prefs.html:51 html/Work/Preferences/Info:34
+#: html/Admin/Users/Modify.html:163 html/User/Prefs.html:67 html/Work/Preferences/Info:36
 msgid "Work"
 msgstr "公�"
 
@@ -6048,23 +6288,35 @@ msgstr "�程��"
 msgid "Workflow deleted"
 msgstr "�程已刪除"
 
-#: html/Edit/Global/autohandler:10 html/Edit/Queues/autohandler:21
+#: html/Edit/Global/autohandler:10 html/Edit/Queues/autohandler:25
 msgid "Workflows"
 msgstr "�程"
 
-#: html/Edit/Global/Basic/Top:25
+#: html/Edit/Global/CustomField/SelectWritable:5
+msgid "Writable"
+msgstr "�讀寫"
+
+#: html/autohandler:144
+msgid "XXX CHANGEME You are not an authorized user"
+msgstr "XXX CHANGEME 您是未經授權的使用者"
+
+#: html/Edit/Global/Basic/Top:25 html/Edit/Queues/Basic/Top:82
 msgid "Yes"
 msgstr "是"
 
-#: lib/RT/Ticket_Overlay.pm:3150
+#: lib/RT/Ticket_Overlay.pm:3200
 msgid "You already own this ticket"
 msgstr "您已是這份申請單的承辦人"
 
-#: html/autohandler:122
+#: html/autohandler:136
 msgid "You are not an authorized user"
 msgstr "您�是被授權的使用者"
 
-#: lib/RT/Ticket_Overlay.pm:3032
+#: html/Ticket/Elements/ShowTransaction:81
+msgid "You can access it with the Download button on the right."
+msgstr "您�以按�方的「下載��來�得。"
+
+#: lib/RT/Ticket_Overlay.pm:3082
 msgid "You can only reassign tickets that you own or that are unowned"
 msgstr "祇能�新指派您所承辦或是沒有承辦人的申請單"
 
@@ -6072,7 +6324,7 @@ msgstr "祇能�新指派您所承辦或是沒有承辦人的申請單"
 msgid "You don't have permission to view that ticket.\\n"
 msgstr "您沒有看那份申請單的權�。\\n"
 
-#: docs/design_docs/string-extraction-guide.txt:47
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
 msgstr "您會在表單 %2 找到 %1 的申請單"
@@ -6085,11 +6337,11 @@ msgstr "您已登出 RT。"
 msgid "You have no permission to create tickets in that queue."
 msgstr "您沒有在該表單新增申請單的權�。"
 
-#: lib/RT/Ticket_Overlay.pm:1908
+#: lib/RT/Ticket_Overlay.pm:1935
 msgid "You may not create requests in that queue."
 msgstr "您�能在該表單中�出申請。"
 
-#: html/Edit/Global/Basic/Top:38
+#: html/Edit/Global/Basic/Top:42
 msgid "You need to restart the Request Tracker service for saved changes to take effect."
 msgstr "您必須�新啟動 Request Tracker �務，儲存的更動纔會生效。"
 
@@ -6105,11 +6357,11 @@ msgstr "您�出的 %1 申請單"
 msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
 msgstr "RT 管�員�能設錯了由 RT 寄出的郵件收件人標頭檔"
 
-#: etc/initialdata.zh:514 etc/initialdata:484 etc/upgrade/2.1.71:146 html/Edit/Elements/CreateApprovalsQueue:119
+#: etc/initialdata:484 etc/upgrade/2.1.71:146 html/Edit/Elements/CreateApprovalsQueue:119
 msgid "Your request has been approved by %1. Other approvals may still be pending."
 msgstr "申請單已由 %1 批准。�能還有其他待簽核的步驟。"
 
-#: etc/initialdata.zh:552 etc/initialdata:522 etc/upgrade/2.1.71:180 html/Edit/Elements/CreateApprovalsQueue:154
+#: etc/initialdata:522 etc/upgrade/2.1.71:180 html/Edit/Elements/CreateApprovalsQueue:154
 msgid "Your request has been approved."
 msgstr "您的申請單已完�簽核程�。"
 
@@ -6117,7 +6369,7 @@ msgstr "您的申請單已完�簽核程�。"
 msgid "Your request was rejected"
 msgstr "您的申請單已被�回"
 
-#: etc/initialdata.zh:455
+#: NOT FOUND IN SOURCE
 msgid "Your request was rejected by %1."
 msgstr "您的申請單已被 %1 �回。"
 
@@ -6125,11 +6377,11 @@ msgstr "您的申請單已被 %1 �回。"
 msgid "Your request was rejected."
 msgstr "您的申請單已被�回。"
 
-#: html/autohandler:144
+#: html/autohandler:170
 msgid "Your username or password is incorrect"
 msgstr "您的帳號或密碼有誤"
 
-#: html/Admin/Elements/ModifyUser:83 html/Admin/Users/Modify.html:143 html/User/Prefs.html:95 html/Work/Preferences/Info:85
+#: html/Admin/Elements/ModifyUser:83 html/Admin/Users/Modify.html:143 html/User/Prefs.html:130 html/Work/Preferences/Info:87
 msgid "Zip"
 msgstr "郵��號"
 
@@ -6145,6 +6397,10 @@ msgstr "�期"
 msgid "alert"
 msgstr "急訊"
 
+#: NOT FOUND IN SOURCE
+msgid "approving"
+msgstr "待簽核"
+
 #: html/User/Elements/DelegateRights:58
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
@@ -6166,11 +6422,11 @@ msgstr "內容"
 msgid "content-type"
 msgstr "é¡žåž‹"
 
-#: lib/RT/Ticket_Overlay.pm:2295
+#: lib/RT/Ticket_Overlay.pm:2326
 msgid "correspondence (probably) not sent"
 msgstr "申請單回覆(�能)未�出"
 
-#: lib/RT/Ticket_Overlay.pm:2305
+#: lib/RT/Ticket_Overlay.pm:2336
 msgid "correspondence sent"
 msgstr "申請單回覆已�出"
 
@@ -6178,7 +6434,7 @@ msgstr "申請單回覆已�出"
 msgid "critical"
 msgstr "嚴�"
 
-#: html/Admin/Elements/ModifyQueue:62 html/Admin/Queues/Modify.html:76 html/Edit/Queues/Basic/Top:31 html/Edit/Queues/List:18 html/Work/Queues/List:11 lib/RT/Date.pm:319
+#: html/Admin/Elements/ModifyQueue:62 html/Admin/Queues/Modify.html:76 html/Edit/Queues/Basic/Top:34 html/Edit/Queues/List:32 html/Work/Queues/List:11 lib/RT/Date.pm:319
 msgid "days"
 msgstr "天"
 
@@ -6247,11 +6503,11 @@ msgstr "編號"
 msgid "info"
 msgstr "資訊"
 
-#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickRestriction:46 html/Search/Elements/PickRestriction:75 html/Search/Elements/PickRestriction:87 html/Work/Search/PickRestriction:27 html/Work/Search/PickRestriction:56 html/Work/Search/PickRestriction:69
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickRestriction:46 html/Search/Elements/PickRestriction:75 html/Search/Elements/PickRestriction:87 html/Work/Search/PickRestriction:27 html/Work/Search/PickRestriction:56 html/Work/Search/PickRestriction:75
 msgid "is"
 msgstr "是"
 
-#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88 html/Work/Search/PickRestriction:28 html/Work/Search/PickRestriction:57 html/Work/Search/PickRestriction:70
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88 html/Work/Search/PickRestriction:28 html/Work/Search/PickRestriction:57 html/Work/Search/PickRestriction:76
 msgid "isn't"
 msgstr "�是"
 
@@ -6287,11 +6543,15 @@ msgstr "月"
 msgid "new"
 msgstr "新建立"
 
+#: html/Admin/Elements/EditCustomFields:42
+msgid "no name"
+msgstr "沒有�稱"
+
 #: html/Admin/Elements/EditScrips:42
 msgid "no value"
 msgstr "沒有值"
 
-#: html/Admin/Elements/EditQueueWatchers:26 html/Edit/Groups/Member:40 html/Edit/Groups/Members/Add.html:17 html/Edit/Groups/Members/List:8 html/Edit/Queues/Basic/Top:50 html/Edit/Queues/List:18 html/Ticket/Elements/EditWatchers:27 html/Work/Delegates/Info:37 html/Work/Delegates/Info:48 html/Work/Overview/Info:31 html/Work/Queues/List:11 html/Work/Tickets/Elements/ShowBasics:27
+#: html/Admin/Elements/EditQueueWatchers:26 html/Edit/Groups/Member:40 html/Edit/Groups/Members/Add.html:17 html/Edit/Groups/Members/List:8 html/Edit/Queues/List:32 html/Ticket/Elements/EditWatchers:27 html/Work/Delegates/Info:37 html/Work/Delegates/Info:48 html/Work/Overview/Info:31 html/Work/Queues/List:11 html/Work/Tickets/Elements/EditWatchers:5 html/Work/Tickets/Elements/ShowAttachments:30 html/Work/Tickets/Elements/ShowBasics:27
 msgid "none"
 msgstr "ç„¡"
 
@@ -6333,11 +6593,11 @@ msgstr "表單 %1 %2"
 msgid "rejected"
 msgstr "已�回"
 
-#: html/Work/Elements/SelectSearch:21 lib/RT/Queue_Overlay.pm:60
+#: lib/RT/Queue_Overlay.pm:60
 msgid "resolved"
 msgstr "已處�"
 
-#: html/Edit/Global/Basic/Top:48
+#: html/Edit/Global/Basic/Top:53
 msgid "rtname"
 msgstr "伺�器�稱"
 
@@ -6363,16 +6623,21 @@ msgstr "系統群組 '%1'"
 msgid "the calling component did not specify why"
 msgstr "呼�元件未指明原因"
 
+#: lib/RT/URI/fsck_com_rt.pm:234
+#. ($self->Object->Id)
+msgid "ticket #%1"
+msgstr "申請單 #%1"
+
 #: lib/RT/Group_Overlay.pm:209
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
 msgstr "申請單 #%1 %2"
 
-#: html/Work/Elements/SelectSearch:27
+#: html/Work/Elements/SelectSearch:28
 msgid "till"
 msgstr "至"
 
-#: html/Edit/Elements/PickUsers:15 html/Edit/Global/Workflow/Condition:30 html/Edit/Users/Add.html:16 html/Edit/Users/Search.html:26 html/Work/Tickets/Cc:13
+#: html/Edit/Elements/PickUsers:15 html/Edit/Global/Workflow/Condition:31 html/Edit/Users/Add.html:16 html/Edit/Users/Search.html:26 html/Work/Tickets/Cc:13
 msgid "to"
 msgstr "到"
 
@@ -6385,7 +6650,7 @@ msgstr "真"
 msgid "undescribed group %1"
 msgstr "沒有�述的群組 %1"
 
-#: html/Work/Elements/SelectSearch:19
+#: NOT FOUND IN SOURCE
 msgid "unresolved"
 msgstr "未處�"
 
@@ -6410,7 +6675,3 @@ msgstr "範本：%1"
 msgid "years"
 msgstr "å¹´"
 
-#: lib/RT/Date.pm:331
-msgid "approving"
-msgstr "待簽核"
-
diff --git a/rt/lib/RT/Interface/Email.pm b/rt/lib/RT/Interface/Email.pm
index bc1a55da2..241f5f35c 100755
--- a/rt/lib/RT/Interface/Email.pm
+++ b/rt/lib/RT/Interface/Email.pm
@@ -27,14 +27,14 @@ use strict;
 use Mail::Address;
 use MIME::Entity;
 use RT::EmailParser;
-
+use File::Temp;
 
 BEGIN {
     use Exporter ();
     use vars qw ($VERSION  @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
     
     # set the version for version checking
-    $VERSION = do { my @r = (q$Revision: 1.1.1.1 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
+    $VERSION = do { my @r = (q$Revision: 1.1.1.2 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
     
     @ISA         = qw(Exporter);
     
@@ -153,6 +153,7 @@ sub MailError {
 		Subject => 'There has been an error',
 		Explanation => 'Unexplained error',
 		MIMEObj => undef,
+        Attach => undef,
 		LogLevel => 'crit',
 		@_);
 
@@ -175,7 +176,13 @@ sub MailError {
         $mimeobj->sync_headers();
         $entity->add_part($mimeobj);
     }
-    
+   
+    if ($args{'Attach'}) {
+        $entity->attach(Data => $args{'Attach'}, Type => 'message/rfc822');
+
+    }
+
+ 
     if ($RT::MailCommand eq 'sendmailpipe') {
         open (MAIL, "|$RT::SendmailPath $RT::SendmailArguments") || return(0);
         print MAIL $entity->as_string;
@@ -194,12 +201,6 @@ sub CreateUser {
     my ($Username, $Address, $Name, $ErrorsTo, $entity) = @_;
     my $NewUser = RT::User->new($RT::SystemUser);
 
-    # This data is tainted by some Very Broken mailers.
-    # (Sometimes they send raw ISO 8859-1 data here. fear that.
-    require Encode;
-    $Username = Encode::encode(utf8 => $Username, Encode::FB_PERLQQ()) if defined $Username;
-    $Name = Encode::encode(utf8 => $Name, Encode::FB_PERLQQ()) if defined $Name;
-    
     my ($Val, $Message) = 
       $NewUser->Create(Name => ($Username || $Address),
                        EmailAddress => $Address,
@@ -361,36 +362,108 @@ sub ParseAddressFromHeader{
 
 
 
-=head2 Gateway
+=head2 Gateway ARGSREF
+
+
+Takes parameters:
+
+    action
+    queue
+    message
+
 
 This performs all the "guts" of the mail rt-mailgate program, and is
 designed to be called from the web interface with a message, user
 object, and so on.
 
+Returns:
+
+    An array of:
+    
+    (status code, message, optional ticket object)
+
+    status code is a numeric value.
+
+    for temporary failures, status code should be -75
+
+    for permanent failures which are handled by RT, status code should be 0
+    
+    for succces, the status code should be 1
+
+
+
 =cut
 
 sub Gateway {
-    my %args = ( message => undef,
-                 queue   => 1,
-                 action  => 'correspond',
-                 ticket  => undef,
-                 @_ );
+    my $argsref = shift;
+
+    my %args = %$argsref;
+
+    # Set some reasonable defaults
+    $args{'action'} = 'correspond' unless ( $args{'action'} );
+    $args{'queue'}  = '1'          unless ( $args{'queue'} );
 
     # Validate the action
     unless ( $args{'action'} =~ /^(comment|correspond|action)$/ ) {
 
         # Can't safely loc this. What object do we loc around?
-        return ( 0, "Invalid 'action' parameter", undef );
+        $RT::Logger->crit("Mail gateway called with an invalid action paramenter '".$args{'action'}."' for queue '".$args{'queue'}."'");
+
+        return ( -75, "Invalid 'action' parameter", undef );
     }
 
     my $parser = RT::EmailParser->new();
-    $parser->ParseMIMEEntityFromScalar( $args{'message'} );
+    my ( $fh, $temp_file );
+    for ( 1 .. 10 ) {
+
+        # on NFS and NTFS, it is possible that tempfile() conflicts
+        # with other processes, causing a race condition. we try to
+        # accommodate this by pausing and retrying.
+        last if ( $fh, $temp_file ) = eval { File::Temp::tempfile(undef, UNLINK => 0) };
+        sleep 1;
+    }
+    if ($fh) {
+        binmode $fh;    #thank you, windows
+        $fh->autoflush(1);
+        print $fh $args{'message'};
+        close($fh);
+
+        if ( -f $temp_file ) {
+            $parser->ParseMIMEEntityFromFile($temp_file);
+            File::Temp::unlink0( $fh, $temp_file );
+            if ($parser->Entity) {
+                delete $args{'message'};
+            }
+        }
+
+    }
+
+    #If for some reason we weren't able to parse the message using a temp file 
+    # try it with a scalar
+    if ($args{'message'}) {
+        $parser->ParseMIMEEntityFromScalar($args{'message'});
+
+    } 
+
+    if (!$parser->Entity()) {
+        MailError(
+            To          => $RT::OwnerEmail,
+            Subject     => "RT Bounce: Unparseable message",
+            Explanation => "RT couldn't process the message below",
+            Attach     => $args{'message'}
+        );
+
+        return(0,"Failed to parse this message. Something is likely badly wrong with the message");
+    }
 
     my $Message = $parser->Entity();
-    my $head = $Message->head;
+    my $head    = $Message->head;
 
     my ( $CurrentUser, $AuthStat, $status, $error );
 
+    # Initalize AuthStat so comparisons work correctly
+    $AuthStat = -9999999;
+
     my $ErrorsTo = ParseErrorsToAddressFromHead($head);
 
     my $MessageId = $head->get('Message-Id')
@@ -400,37 +473,31 @@ sub Gateway {
     my $Subject = $head->get('Subject') || '';
     chomp $Subject;
 
-
     $args{'ticket'} ||= $parser->ParseTicketId($Subject);
 
     my $SystemTicket;
-    if ($args{'ticket'} ) {
+    if ( $args{'ticket'} ) {
         $SystemTicket = RT::Ticket->new($RT::SystemUser);
-        $SystemTicket->Load($args{'ticket'});
+        $SystemTicket->Load( $args{'ticket'} );
     }
 
     #Set up a queue object
     my $SystemQueueObj = RT::Queue->new($RT::SystemUser);
     $SystemQueueObj->Load( $args{'queue'} );
 
-
     # We can safely have no queue of we have a known-good ticket
     unless ( $args{'ticket'} || $SystemQueueObj->id ) {
-        MailError(
-                 To          => $RT::OwnerEmail,
-                 Subject     => "RT Bounce: $Subject",
-                 Explanation => "RT couldn't find the queue: " . $args{'queue'},
-                 MIMEObj     => $Message );
-        return ( 0, "RT couldn't find the queue: " . $args{'queue'}, undef );
+        return ( -75, "RT couldn't find the queue: " . $args{'queue'}, undef );
     }
 
     # Authentication Level
-    # -1 - Get out.  this user has been explicitly declined 
+    # -1 - Get out.  this user has been explicitly declined
     # 0 - User may not do anything (Not used at the moment)
     # 1 - Normal user
     # 2 - User is allowed to specify status updates etc. a la enhanced-mailgate
 
-    push @RT::MailPlugins, "Auth::MailFrom"   unless @RT::MailPlugins;
+    push @RT::MailPlugins, "Auth::MailFrom" unless @RT::MailPlugins;
+
     # Since this needs loading, no matter what
 
     for (@RT::MailPlugins) {
@@ -453,35 +520,59 @@ sub Gateway {
             }
         }
 
-        ( $CurrentUser, $NewAuthStat ) = $Code->( Message     => $Message,
-                                                  CurrentUser => $CurrentUser,
-                                                  AuthLevel   => $AuthStat,
-                                                  Action => $args{'action'},
-                                                  Ticket => $SystemTicket,
-                                                  Queue  => $SystemQueueObj );
+        ( $CurrentUser, $NewAuthStat ) = $Code->(
+            Message     => $Message,
+            CurrentUser => $CurrentUser,
+            AuthLevel   => $AuthStat,
+            Action      => $args{'action'},
+            Ticket      => $SystemTicket,
+            Queue       => $SystemQueueObj
+        );
+
+        # If a module returns a "-1" then we discard the ticket, so.
+        $AuthStat = -1 if $NewAuthStat == -1;
 
         # You get the highest level of authentication you were assigned.
-        last if $AuthStat == -1;
         $AuthStat = $NewAuthStat if $NewAuthStat > $AuthStat;
+        last if $AuthStat == -1;
     }
 
     # {{{ If authentication fails and no new user was created, get out.
     if ( !$CurrentUser or !$CurrentUser->Id or $AuthStat == -1 ) {
 
         # If the plugins refused to create one, they lose.
-        MailError(
-            Subject     => "Could not load a valid user",
-            Explanation => <<EOT,
+        unless ( $AuthStat == -1 ) {
+
+            # Notify the RT Admin of the failure.
+            # XXX Should this be configurable?
+            MailError(
+                To          => $RT::OwnerEmail,
+                Subject     => "Could not load a valid user",
+                Explanation => <<EOT,
 RT could not load a valid user, and RT's configuration does not allow
-for the creation of a new user for your email.
+for the creation of a new user for this email ($ErrorsTo).
 
-Your RT administrator needs to grant 'Everyone' the right 'CreateTicket'
-for this queue.
+You might need to grant 'Everyone' the right 'CreateTicket' for the
+queue @{[$args{'queue'}]}.
 
 EOT
-            MIMEObj  => $Message,
-            LogLevel => 'error' )
-          unless $AuthStat == -1;
+                MIMEObj  => $Message,
+                LogLevel => 'error'
+            );
+
+            # Also notify the requestor that his request has been dropped.
+            MailError(
+                To          => $ErrorsTo,
+                Subject     => "Could not load a valid user",
+                Explanation => <<EOT,
+RT could not load a valid user, and RT's configuration does not allow
+for the creation of a new user for your email.
+
+EOT
+                MIMEObj  => $Message,
+                LogLevel => 'error'
+            );
+        }
         return ( 0, "Could not load a valid user", undef );
     }
 
@@ -508,10 +599,11 @@ EOT
     # {{{ Drop it if it's disallowed
     if ( $AuthStat == 0 ) {
         MailError(
-             To          => $ErrorsTo,
-             Subject     => "Permission Denied",
-             Explanation => "You do not have permission to communicate with RT",
-             MIMEObj     => $Message );
+            To          => $ErrorsTo,
+            Subject     => "Permission Denied",
+            Explanation => "You do not have permission to communicate with RT",
+            MIMEObj     => $Message
+        );
     }
 
     # }}}
@@ -523,10 +615,12 @@ EOT
 
         #Should we mail it to RTOwner?
         if ($RT::LoopsToRTOwner) {
-            MailError( To          => $RT::OwnerEmail,
-                       Subject     => "RT Bounce: $Subject",
-                       Explanation => "RT thinks this message may be a bounce",
-                       MIMEObj     => $Message );
+            MailError(
+                To          => $RT::OwnerEmail,
+                Subject     => "RT Bounce: $Subject",
+                Explanation => "RT thinks this message may be a bounce",
+                MIMEObj     => $Message
+            );
 
             #Do we actually want to store it?
             return ( 0, "Message Bounced", undef ) unless ($RT::StoreLoops);
@@ -538,8 +632,10 @@ EOT
     # {{{ Squelch replies if necessary
     # Don't let the user stuff the RT-Squelch-Replies-To header.
     if ( $head->get('RT-Squelch-Replies-To') ) {
-        $head->add( 'RT-Relocated-Squelch-Replies-To',
-                    $head->get('RT-Squelch-Replies-To') );
+        $head->add(
+            'RT-Relocated-Squelch-Replies-To',
+            $head->get('RT-Squelch-Replies-To')
+        );
         $head->delete('RT-Squelch-Replies-To');
     }
 
@@ -564,22 +660,27 @@ EOT
         my @Requestors = ( $CurrentUser->id );
 
         if ($RT::ParseNewMessageForTicketCcs) {
-            @Cc = ParseCcAddressesFromHead( Head        => $head,
-                                            CurrentUser => $CurrentUser,
-                                            QueueObj    => $SystemQueueObj );
+            @Cc = ParseCcAddressesFromHead(
+                Head        => $head,
+                CurrentUser => $CurrentUser,
+                QueueObj    => $SystemQueueObj
+            );
         }
 
         my ( $id, $Transaction, $ErrStr ) = $Ticket->Create(
-                                                      Queue     => $SystemQueueObj->Id,
-                                                      Subject   => $Subject,
-                                                      Requestor => \@Requestors,
-                                                      Cc        => \@Cc,
-                                                      MIMEObj   => $Message );
+            Queue     => $SystemQueueObj->Id,
+            Subject   => $Subject,
+            Requestor => \@Requestors,
+            Cc        => \@Cc,
+            MIMEObj   => $Message
+        );
         if ( $id == 0 ) {
-            MailError( To          => $ErrorsTo,
-                       Subject     => "Ticket creation failed",
-                       Explanation => $ErrStr,
-                       MIMEObj     => $Message );
+            MailError(
+                To          => $ErrorsTo,
+                Subject     => "Ticket creation failed",
+                Explanation => $ErrStr,
+                MIMEObj     => $Message
+            );
             $RT::Logger->error("Create failed: $id / $Transaction / $ErrStr ");
             return ( 0, "Ticket creation failed", $Ticket );
         }
@@ -591,15 +692,17 @@ EOT
 
     #   If the action is comment, add a comment.
     elsif ( $args{'action'} =~ /^(comment|correspond)$/i ) {
-        $Ticket->Load($args{'ticket'});
+        $Ticket->Load( $args{'ticket'} );
         unless ( $Ticket->Id ) {
-            my $message = "Could not find a ticket with id ".$args{'ticket'};
-            MailError( To          => $ErrorsTo,
-                     Subject     => "Message not recorded",
-                     Explanation => $message,
-                     MIMEObj     => $Message );
-
-            return ( 0, $message);
+            my $message = "Could not find a ticket with id " . $args{'ticket'};
+            MailError(
+                To          => $ErrorsTo,
+                Subject     => "Message not recorded",
+                Explanation => $message,
+                MIMEObj     => $Message
+            );
+
+            return ( 0, $message );
         }
 
         my ( $status, $msg );
@@ -612,10 +715,12 @@ EOT
         unless ($status) {
 
             #Warn the sender that we couldn't actually submit the comment.
-            MailError( To          => $ErrorsTo,
-                       Subject     => "Message not recorded",
-                       Explanation => $msg,
-                       MIMEObj     => $Message );
+            MailError(
+                To          => $ErrorsTo,
+                Subject     => "Message not recorded",
+                Explanation => $msg,
+                MIMEObj     => $Message
+            );
             return ( 0, "Message not recorded", $Ticket );
         }
     }
@@ -623,21 +728,28 @@ EOT
     else {
 
         #Return mail to the sender with an error
-        MailError( To          => $ErrorsTo,
-                   Subject     => "RT Configuration error",
-                   Explanation => "'"
-                     . $args{'action'}
-                     . "' not a recognized action."
-                     . " Your RT administrator has misconfigured "
-                     . "the mail aliases which invoke RT",
-                   MIMEObj => $Message );
+        MailError(
+            To          => $ErrorsTo,
+            Subject     => "RT Configuration error",
+            Explanation => "'"
+              . $args{'action'}
+              . "' not a recognized action."
+              . " Your RT administrator has misconfigured "
+              . "the mail aliases which invoke RT",
+            MIMEObj => $Message
+        );
         $RT::Logger->crit( $args{'action'} . " type unknown for $MessageId" );
-        return ( 0, "Configuration error: " . $args{'action'} . " not a recognized action", $Ticket );
+        return (
+            -75,
+            "Configuration error: "
+              . $args{'action'}
+              . " not a recognized action",
+            $Ticket
+        );
 
     }
 
-
-return ( 1, "Success", $Ticket );
+    return ( 1, "Success", $Ticket );
 }
 
 eval "require RT::Interface::Email_Vendor";
diff --git a/rt/lib/RT/Interface/REST.pm b/rt/lib/RT/Interface/REST.pm
new file mode 100644
index 000000000..1ec4f21f9
--- /dev/null
+++ b/rt/lib/RT/Interface/REST.pm
@@ -0,0 +1,252 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+# lib/RT/Interface/REST.pm
+#
+
+package RT::Interface::REST;
+use strict;
+use RT;
+
+BEGIN {
+    use Exporter ();
+    use vars qw($VERSION @ISA @EXPORT);
+
+    $VERSION = do { my @r = (q$Revision: 1.1 $ =~ /\d+/g); sprintf "%d."."%02d"x$#r, @r };
+
+    @ISA = qw(Exporter);
+    @EXPORT = qw(expand_list form_parse form_compose vpush vsplit);
+}
+
+my $field = '[a-zA-Z][a-zA-Z0-9_-]*';
+
+sub expand_list {
+    my ($list) = @_;
+    my ($elt, @elts, %elts);
+
+    foreach $elt (split /,/, $list) {
+        if ($elt =~ /^(\d+)-(\d+)$/) { push @elts, ($1..$2) }
+        else                         { push @elts, $elt }
+    }
+
+    @elts{@elts}=();
+    return sort {$a<=>$b} keys %elts;
+}
+
+# Returns a reference to an array of parsed forms.
+sub form_parse {
+    my $state = 0;
+    my @forms = ();
+    my @lines = split /\n/, $_[0];
+    my ($c, $o, $k, $e) = ("", [], {}, "");
+
+    LINE:
+    while (@lines) {
+        my $line = shift @lines;
+
+        next LINE if $line eq '';
+
+        if ($line eq '--') {
+            # We reached the end of one form. We'll ignore it if it was
+            # empty, and store it otherwise, errors and all.
+            if ($e || $c || @$o) {
+                push @forms, [ $c, $o, $k, $e ];
+                $c = ""; $o = []; $k = {}; $e = "";
+            }
+            $state = 0;
+        }
+        elsif ($state != -1) {
+            if ($state == 0 && $line =~ /^#/) {
+                # Read an optional block of comments (only) at the start
+                # of the form.
+                $state = 1;
+                $c = $line;
+                while (@lines && $lines[0] =~ /^#/) {
+                    $c .= "\n".shift @lines;
+                }
+                $c .= "\n";
+            }
+            elsif ($state <= 1 && $line =~ /^($field):(?:\s+(.*))?$/) {
+                # Read a field: value specification.
+                my $f  = $1;
+                my @v  = ($2 || ());
+
+                # Read continuation lines, if any.
+                while (@lines && ($lines[0] eq '' || $lines[0] =~ /^\s+/)) {
+                    push @v, shift @lines;
+                }
+                pop @v while (@v && $v[-1] eq '');
+
+                # Strip longest common leading indent from text.
+                my ($ws, $ls) = ("");
+                foreach $ls (map {/^(\s+)/} @v[1..$#v]) {
+                    $ws = $ls if (!$ws || length($ls) < length($ws));
+                }
+                s/^$ws// foreach @v;
+
+                push(@$o, $f) unless exists $k->{$f};
+                vpush($k, $f, join("\n", @v));
+
+                $state = 1;
+            }
+            elsif ($line !~ /^#/) {
+                # We've found a syntax error, so we'll reconstruct the
+                # form parsed thus far, and add an error marker. (>>)
+                $state = -1;
+                $e = form_compose([[ "", $o, $k, "" ]]);
+                $e.= $line =~ /^>>/ ? "$line\n" : ">> $line\n";
+            }
+        }
+        else {
+            # We saw a syntax error earlier, so we'll accumulate the
+            # contents of this form until the end.
+            $e .= "$line\n";
+        }
+    }
+    push(@forms, [ $c, $o, $k, $e ]) if ($e || $c || @$o);
+
+    my $l;
+    foreach $l (keys %$k) {
+        $k->{$l} = vsplit($k->{$l}) if (ref $k->{$l} eq 'ARRAY');
+    }
+
+    return \@forms;
+}
+
+# Returns text representing a set of forms.
+sub form_compose {
+    my ($forms) = @_;
+    my (@text, $form);
+
+    foreach $form (@$forms) {
+        my ($c, $o, $k, $e) = @$form;
+        my $text = "";
+
+        if ($c) {
+            $c =~ s/\n*$/\n/;
+            $text = "$c\n";
+        }
+        if ($e) {
+            $text .= $e;
+        }
+        elsif ($o) {
+            my (@lines, $key);
+
+            foreach $key (@$o) {
+                my ($line, $sp, $v);
+                my @values = (ref $k->{$key} eq 'ARRAY') ?
+                               @{ $k->{$key} } :
+                                  $k->{$key};
+
+                $sp = " "x(length("$key: "));
+                $sp = " "x4 if length($sp) > 16;
+
+                foreach $v (@values) {
+                    if ($v =~ /\n/) {
+                        $v =~ s/^/$sp/gm;
+                        $v =~ s/^$sp//;
+
+                        if ($line) {
+                            push @lines, "$line\n\n";
+                            $line = "";
+                        }
+                        elsif (@lines && $lines[-1] !~ /\n\n$/) {
+                            $lines[-1] .= "\n";
+                        }
+                        push @lines, "$key: $v\n\n";
+                    }
+                    elsif ($line &&
+                           length($line)+length($v)-rindex($line, "\n") >= 70)
+                    {
+                        $line .= ",\n$sp$v";
+                    }
+                    else {
+                        $line = $line ? "$line, $v" : "$key: $v";
+                    }
+                }
+
+                $line = "$key:" unless @values;
+                if ($line) {
+                    if ($line =~ /\n/) {
+                        if (@lines && $lines[-1] !~ /\n\n$/) {
+                            $lines[-1] .= "\n";
+                        }
+                        $line .= "\n";
+                    }
+                    push @lines, "$line\n";
+                }
+            }
+
+            $text .= join "", @lines;
+        }
+        else {
+            chomp $text;
+        }
+        push @text, $text;
+    }
+
+    return join "\n--\n\n", @text;
+}
+
+# Add a value to a (possibly multi-valued) hash key.
+sub vpush {
+    my ($hash, $key, $val) = @_;
+    my @val = ref $val eq 'ARRAY' ? @$val : $val;
+
+    if (exists $hash->{$key}) {
+        unless (ref $hash->{$key} eq 'ARRAY') {
+            my @v = $hash->{$key} ne '' ? $hash->{$key} : ();
+            $hash->{$key} = \@v;
+        }
+        push @{ $hash->{$key} }, @val;
+    }
+    else {
+        $hash->{$key} = $val;
+    }
+}
+
+# "Normalise" a hash key that's known to be multi-valued.
+sub vsplit {
+    my ($val) = @_;
+    my ($line, $word, @words);
+
+    foreach $line (map {split /\n/} (ref $val eq 'ARRAY') ? @$val : $val)
+    {
+        # XXX: This should become a real parser, à la Text::ParseWords.
+        $line =~ s/^\s+//;
+        $line =~ s/\s+$//;
+        push @words, split /\s*,\s*/, $line;
+    }
+
+    return \@words;
+}
+
+1;
+
+=head1 NAME
+
+  RT::Interface::REST - helper functions for the REST interface.
+
+=head1 SYNOPSIS
+
+  Only the REST should use this module.
diff --git a/rt/lib/RT/Interface/Web.pm b/rt/lib/RT/Interface/Web.pm
index 5097f54a4..8d66239be 100644
--- a/rt/lib/RT/Interface/Web.pm
+++ b/rt/lib/RT/Interface/Web.pm
@@ -68,6 +68,7 @@ sub NewApacheHandler {
         default_escape_flags => 'h',
         allow_globals        => [qw(%session)],
         data_dir => "$RT::MasonDataDir",
+        autoflush => 1,
         @_
     );
 
@@ -98,7 +99,8 @@ sub NewCGIHandler {
         ],
         data_dir => "$RT::MasonDataDir",
         default_escape_flags => 'h',
-        allow_globals        => [qw(%session)]
+        allow_globals        => [qw(%session)],
+        autoflush => 1,
     );
   
 
@@ -137,6 +139,60 @@ sub EscapeUTF8  {
 
 # }}}
 
+# {{{ WebCanonicalizeInfo
+
+=head2 WebCanonicalizeInfo();
+
+Different web servers set different environmental varibles. This
+function must return something suitable for REMOTE_USER. By default,
+just downcase $ENV{'REMOTE_USER'}
+
+=cut
+
+sub WebCanonicalizeInfo {
+    my $user;
+
+    if ( defined $ENV{'REMOTE_USER'} ) {
+	$user = lc ( $ENV{'REMOTE_USER'} ) if( length($ENV{'REMOTE_USER'}) );
+    }
+
+    return $user;
+}
+
+# }}}
+
+# {{{ WebExternalAutoInfo
+
+=head2 WebExternalAutoInfo($user);
+
+Returns a hash of user attributes, used when WebExternalAuto is set.
+
+=cut
+
+sub WebExternalAutoInfo {
+    my $user = shift;
+
+    my %user_info;
+
+    $user_info{'Privileged'} = 1;
+
+    if ($^O !~ /^(?:riscos|MacOS|MSWin32|dos|os2)$/) {
+	# Populate fields with information from Unix /etc/passwd
+
+	my ($comments, $realname) = (getpwnam($user))[5, 6];
+	$user_info{'Comments'} = $comments if defined $comments;
+	$user_info{'RealName'} = $realname if defined $realname;
+    }
+    elsif ($^O eq 'MSWin32' and eval 'use Net::AdminMisc; 1') {
+	# Populate fields with information from NT domain controller
+    }
+
+    # and return the wad of stuff
+    return {%user_info};
+}
+
+# }}}
+
 
 package HTML::Mason::Commands;
 use strict;
@@ -160,10 +216,13 @@ sub loc {
         UNIVERSAL::can($session{'CurrentUser'}, 'loc')){
         return($session{'CurrentUser'}->loc(@_));
     }
-    else  {
-        my $u = RT::CurrentUser->new($RT::SystemUser);
+    elsif ( my $u = eval { RT::CurrentUser->new($RT::SystemUser->Id) } ) {
         return ($u->loc(@_));
     }
+    else {
+	# pathetic case -- SystemUser is gone.
+	return $_[0];
+    }
 }
 
 # }}}
@@ -189,7 +248,7 @@ sub loc_fuzzy {
         return($session{'CurrentUser'}->loc_fuzzy($msg));
     }
     else  {
-        my $u = RT::CurrentUser->new($RT::SystemUser);
+        my $u = RT::CurrentUser->new($RT::SystemUser->Id);
         return ($u->loc_fuzzy($msg));
     }
 }
@@ -365,7 +424,8 @@ sub ProcessUpdateMessage {
     );
 
     #Make the update content have no 'weird' newlines in it
-    if ( $args{ARGSRef}->{'UpdateContent'} ) {
+    if ( $args{ARGSRef}->{'UpdateContent'} ||
+	 $args{ARGSRef}->{'UpdateAttachments'}) {
 
         if (
             $args{ARGSRef}->{'UpdateSubject'} eq $args{'TicketObj'}->Subject() )
@@ -433,7 +493,8 @@ sub MakeMIMEEntity {
         Cc                  => undef,
         Body                => undef,
         AttachmentFieldName => undef,
-        map Encode::encode_utf8($_), @_,
+#        map Encode::encode_utf8($_), @_,
+        @_,
     );
 
     #Make the update content have no 'weird' newlines in it
@@ -449,6 +510,7 @@ sub MakeMIMEEntity {
             Subject => $args{'Subject'} || "",
             From    => $args{'From'},
             Cc      => $args{'Cc'},
+            Charset => 'utf8',
             Data    => [ $args{'Body'} ]
         );
     }
@@ -463,7 +525,14 @@ sub MakeMIMEEntity {
 
     #foreach my $filehandle (@filenames) {
 
-    my ( $fh, $temp_file ) = tempfile();
+    my ( $fh, $temp_file );
+    for ( 1 .. 10 ) {
+        # on NFS and NTFS, it is possible that tempfile() conflicts
+        # with other processes, causing a race condition. we try to
+        # accommodate this by pausing and retrying.
+        last if ($fh, $temp_file) = eval { tempfile() };
+        sleep 1;
+    }
 
     binmode $fh;    #thank you, windows
     my ($buffer);
@@ -481,7 +550,7 @@ sub MakeMIMEEntity {
 
     $Message->attach(
         Path     => $temp_file,
-        Filename => $filename,
+        Filename => Encode::decode_utf8($filename),
         Type     => $uploadinfo->{'Content-Type'},
     );
     close($fh);
@@ -594,13 +663,13 @@ sub ProcessSearchQuery {
 
     # }}}
     # {{{ Limit requestor email
+     if ( $args{ARGS}->{'ValueOfWatcherRole'} ne '' ) {
+         $session{'tickets'}->LimitWatcher(
+             TYPE     => $args{ARGS}->{'WatcherRole'},
+             VALUE    => $args{ARGS}->{'ValueOfWatcherRole'},
+             OPERATOR => $args{ARGS}->{'WatcherRoleOp'},
 
-    if ( $args{ARGS}->{'ValueOfRequestor'} ne '' ) {
-        my $alias = $session{'tickets'}->LimitRequestor(
-            VALUE    => $args{ARGS}->{'ValueOfRequestor'},
-            OPERATOR => $args{ARGS}->{'RequestorOp'},
         );
-
     }
 
     # }}}
@@ -780,17 +849,13 @@ sub ProcessACLChanges {
 
             my $obj;
 
-            if ($object_type eq 'RT::Queue') {
-                $obj = RT::Queue->new($session{'CurrentUser'});
-                $obj->Load($object_id);      
-            } elsif ($object_type eq 'RT::Group') {
-                $obj = RT::Group->new($session{'CurrentUser'});
-                $obj->Load($object_id);      
-
-            } elsif ($object_type eq 'RT::System') {
+             if ($object_type eq 'RT::System') {
                 $obj = $RT::System;
+	    } elsif ($RT::ACE::OBJECT_TYPES{$object_type}) {
+                $obj = $object_type->new($session{'CurrentUser'});
+                $obj->Load($object_id);      
             } else {
-                push (@results, loc("System Error").
+                push (@results, loc("System Error"). ': '.
                                 loc("Rights could not be granted for [_1]", $object_type));
                 next;
             }
@@ -813,17 +878,14 @@ sub ProcessACLChanges {
             next unless ($right);
             my $obj;
 
-            if ($object_type eq 'RT::Queue') {
-                $obj = RT::Queue->new($session{'CurrentUser'});
-                $obj->Load($object_id);      
-            } elsif ($object_type eq 'RT::Group') {
-                $obj = RT::Group->new($session{'CurrentUser'});
-                $obj->Load($object_id);      
-
-            } elsif ($object_type eq 'RT::System') {
+             if ($object_type eq 'RT::System') {
                 $obj = $RT::System;
+	    } elsif ($RT::ACE::OBJECT_TYPES{$object_type}) {
+                $obj = $object_type->new($session{'CurrentUser'});
+                $obj->Load($object_id);      
             } else {
-                push (@results, loc("System Error").
+		die;
+                push (@results, loc("System Error"). ': '.
                                 loc("Rights could not be revoked for [_1]", $object_type));
                 next;
             }
@@ -953,6 +1015,17 @@ sub ProcessCustomFieldUpdates {
         my ( $err, $msg ) = $Object->DeleteValue($id);
         push ( @results, $msg );
     }
+
+    my $vals = $Object->Values();
+    while (my $cfv = $vals->Next()) {
+        if (my $so = $ARGSRef->{ 'CustomField-' . $Object->Id . '-SortOrder' . $cfv->Id }) {
+            if ($cfv->SortOrder != $so) {
+                my ( $err, $msg ) = $cfv->SetSortOrder($so);
+                push ( @results, $msg );
+            }
+        }
+    }
+
     return (@results);
 }
 
@@ -1050,8 +1123,11 @@ sub ProcessTicketCustomFieldUpdates {
 
     # For each of those tickets
     foreach my $tick ( keys %custom_fields_to_mod ) {
-        my $Ticket = RT::Ticket->new( $session{'CurrentUser'} );
-        $Ticket->Load($tick);
+        my $Ticket = $args{'TicketObj'};
+	if (!$Ticket or $Ticket->id != $tick) {
+	    $Ticket = RT::Ticket->new( $session{'CurrentUser'} );
+	    $Ticket->Load($tick);
+	}
 
         # For each custom field  
         foreach my $cf ( keys %{ $custom_fields_to_mod{$tick} } ) {
@@ -1074,10 +1150,10 @@ sub ProcessTicketCustomFieldUpdates {
                 my @values =
                   ( ref( $ARGSRef->{$arg} ) eq 'ARRAY' ) 
                   ? @{ $ARGSRef->{$arg} }
-                  : ( $ARGSRef->{$arg} );
+                  : split /\n/, $ARGSRef->{$arg} ;
                 if ( ( $arg =~ /-AddValue$/ ) || ( $arg =~ /-Value$/ ) ) {
                     foreach my $value (@values) {
-                        next unless ($value);
+                        next unless length($value);
                         my ( $val, $msg ) = $Ticket->AddCustomFieldValue(
                             Field => $cf,
                             Value => $value
@@ -1087,7 +1163,7 @@ sub ProcessTicketCustomFieldUpdates {
                 }
                 elsif ( $arg =~ /-DeleteValues$/ ) {
                     foreach my $value (@values) {
-                        next unless ($value);
+                        next unless length($value);
                         my ( $val, $msg ) = $Ticket->DeleteCustomFieldValue(
                             Field => $cf,
                             Value => $value
@@ -1100,7 +1176,7 @@ sub ProcessTicketCustomFieldUpdates {
 
                     my %values_hash;
                     foreach my $value (@values) {
-                        next unless ($value);
+                        next unless length($value);
 
                         # build up a hash of values that the new set has
                         $values_hash{$value} = 1;
diff --git a/rt/lib/RT/Principal_Overlay.pm b/rt/lib/RT/Principal_Overlay.pm
index d2782b730..b788e36c4 100644
--- a/rt/lib/RT/Principal_Overlay.pm
+++ b/rt/lib/RT/Principal_Overlay.pm
@@ -348,6 +348,12 @@ sub HasRight {
             next unless (UNIVERSAL::can($obj, 'id'));
             my $type = ref($obj);
             my $id = $obj->id;
+
+            unless ($id) {
+                use Carp;
+		Carp::cluck("Trying to check $type rights for an unspecified $type");
+                $RT::Logger->crit("Trying to check $type rights for an unspecified $type");
+            }
             push @look_at_objects, "(ACL.ObjectType = '$type' AND ACL.ObjectId = '$id')"; 
             }
 
@@ -385,7 +391,8 @@ sub HasRight {
     "AND ( (  ACL.PrincipalId = Principals.id AND ACL.PrincipalType = 'Group' AND ".
         "(Groups.Domain = 'SystemInternal' OR Groups.Domain = 'UserDefined' OR Groups.Domain = 'ACLEquivalence' OR Groups.Domain = 'Personal'))".
 
-        " ) LIMIT 1";
+        " ) ";
+        $self->_Handle->ApplyLimits(\$groups_query, 1); #only return one result
         
     my @roles;
     foreach my $object (@{$args{'EquivObjects'}}) { 
@@ -397,7 +404,8 @@ sub HasRight {
     if (@roles) {
 	 $roles_query = $query_base . "AND ".
             " ( (".join (' OR ', @roles)." ) ".  
-        " AND Groups.Type = ACL.PrincipalType AND Groups.Id = Principals.id AND Principals.PrincipalType = 'Group') LIMIT 1";
+        " AND Groups.Type = ACL.PrincipalType AND Groups.Id = Principals.id AND Principals.PrincipalType = 'Group') "; 
+        $self->_Handle->ApplyLimits(\$roles_query, 1); #only return one result
 
    }
 
@@ -461,7 +469,18 @@ sub _RolesForObject {
     my $self = shift;
     my $type = shift;
     my $id = shift;
-    my $clause = "(Groups.Domain = '".$type."-Role' AND Groups.Instance = '" . $id. "') ";
+
+    unless ($id) {
+	$id = '0';
+   }
+
+   # This should never be true.
+   unless ($id =~ /^\d+$/) {
+	$RT::Logger->crit("RT::Prinicipal::_RolesForObject called with type $type and a non-integer id: '$id'");
+	$id = "'$id'";
+   }
+
+    my $clause = "(Groups.Domain = '".$type."-Role' AND Groups.Instance = $id) ";
 
     return($clause);
 }
diff --git a/rt/lib/RT/Queue_Overlay.pm b/rt/lib/RT/Queue_Overlay.pm
index 4eb265f2a..fcc185b10 100644
--- a/rt/lib/RT/Queue_Overlay.pm
+++ b/rt/lib/RT/Queue_Overlay.pm
@@ -327,7 +327,7 @@ sub Load {
         $self->SUPER::LoadById($identifier);
     }
     else {
-        $self->LoadByCol( "Name", $identifier );
+        $self->LoadByCols( Name => $identifier );
     }
 
     return ( $self->Id );
@@ -866,8 +866,11 @@ sub IsWatcher {
 
     my $principal = RT::Principal->new($self->CurrentUser);
     $principal->Load($args{'PrincipalId'});
+    unless ($principal->Id) {
+        return (undef);
+    }
 
-    return ($group->HasMember($principal));
+    return ($group->HasMemberRecursively($principal));
 }
 
 # }}}
diff --git a/rt/lib/RT/Record.pm b/rt/lib/RT/Record.pm
index 6962221ea..7a8690618 100755
--- a/rt/lib/RT/Record.pm
+++ b/rt/lib/RT/Record.pm
@@ -211,7 +211,10 @@ sub LoadByCols {
                 $newhash{$key} = $hash{$key};
             }
             else {
-                $newhash{ "lower(" . $key . ")" } = lc( $hash{$key} );
+                my ($op, $val);
+                ($key, $op, $val) = $self->_Handle->_MakeClauseCaseInsensitive($key, '=', $hash{$key});
+                $newhash{$key}->{operator} = $op;
+                $newhash{$key}->{value} = $val;
             }
         }
 
diff --git a/rt/lib/RT/ScripAction_Overlay.pm b/rt/lib/RT/ScripAction_Overlay.pm
index e2b018aaf..e75987135 100644
--- a/rt/lib/RT/ScripAction_Overlay.pm
+++ b/rt/lib/RT/ScripAction_Overlay.pm
@@ -48,6 +48,7 @@ ok (require RT::ScripAction);
 
 use strict;
 no warnings qw(redefine);
+use RT::Template;
 
 # {{{  sub _Init 
 sub _Init  {
@@ -135,6 +136,8 @@ sub LoadAction  {
     my %args = ( TransactionObj => undef,
 		 TicketObj => undef,
 		 @_ );
+
+    $self->{_TicketObj} = $args{TicketObj};
     
     #TODO: Put this in an eval  
     $self->ExecModule =~ /^(\w+)$/;
@@ -164,14 +167,26 @@ Return this action\'s template object
 sub TemplateObj {
     my $self = shift;
     return undef unless $self->{Template};
-    if (!$self->{'TemplateObj'})  {
-	require RT::Template;
-	$self->{'TemplateObj'} = RT::Template->new($self->CurrentUser);
-	$self->{'TemplateObj'}->LoadById($self->{'Template'});
-	
+    if ( !$self->{'TemplateObj'} ) {
+        $self->{'TemplateObj'} = RT::Template->new( $self->CurrentUser );
+        $self->{'TemplateObj'}->LoadById( $self->{'Template'} );
+
+        if ( ( $self->{'TemplateObj'}->__Value('Queue') == 0 )
+            && $self->{'_TicketObj'} ) {
+            my $tmptemplate = RT::Template->new( $self->CurrentUser );
+            my ( $ok, $err ) = $tmptemplate->LoadQueueTemplate(
+                Queue => $self->{'_TicketObj'}->QueueObj->id,
+                Name  => $self->{'TemplateObj'}->Name);
+
+            if ( $tmptemplate->id ) {
+                # found the queue-specific template with the same name
+                $self->{'TemplateObj'} = $tmptemplate;
+            }
+        }
+
     }
-    
-    return ($self->{'TemplateObj'});
+
+    return ( $self->{'TemplateObj'} );
 }
 # }}}
 
@@ -206,6 +221,7 @@ sub Describe  {
 # {{{ sub DESTROY
 sub DESTROY {
     my $self=shift;
+    $self->{'_TicketObj'} = undef;
     $self->{'Action'} = undef;
     $self->{'TemplateObj'} = undef;
 }
diff --git a/rt/lib/RT/Scrip_Overlay.pm b/rt/lib/RT/Scrip_Overlay.pm
index 06462a9ac..4f6c735cc 100644
--- a/rt/lib/RT/Scrip_Overlay.pm
+++ b/rt/lib/RT/Scrip_Overlay.pm
@@ -142,19 +142,24 @@ sub Create {
 
     require RT::ScripAction;
     my $action = new RT::ScripAction( $self->CurrentUser );
-    $action->Load( $args{'ScripAction'} || '0' );
+    if ($args{'ScripAction'}) {
+        $action->Load( $args{'ScripAction'});
+    }
     return ( 0, $self->loc( "Action [_1] not found", $args{'ScripAction'} ) )
       unless $action->Id;
 
     require RT::Template;
     my $template = new RT::Template( $self->CurrentUser );
-    $template->Load( $args{'Template'}||'0' );
+    if ($args{'Template'} ) {
+        $template->Load( $args{'Template'});
+    }
     return ( 0, $self->loc('Template not found') ) unless $template->Id;
 
     require RT::ScripCondition;
     my $condition = new RT::ScripCondition( $self->CurrentUser );
-    $condition->Load( $args{'ScripCondition'}||'0' );
-
+    if ($args{'ScripCondition'} ) {
+        $condition->Load( $args{'ScripCondition'} );
+    }
     unless ( $condition->Id ) {
         return ( 0, $self->loc('Condition not found') );
     }
@@ -256,13 +261,16 @@ Retuns an RT::ScripCondition object with this Scrip's IsApplicable
 
 sub ConditionObj {
     my $self = shift;
-    
-    unless (defined $self->{'ScripConditionObj'})  {
-	require RT::ScripCondition;
-	$self->{'ScripConditionObj'} = RT::ScripCondition->new($self->CurrentUser);
-	$self->{'ScripConditionObj'}->Load($self->ScripCondition);
+
+    unless ( defined $self->{'ScripConditionObj'} ) {
+        require RT::ScripCondition;
+        $self->{'ScripConditionObj'} =
+          RT::ScripCondition->new( $self->CurrentUser );
+        if ( $self->ScripCondition ) {
+            $self->{'ScripConditionObj'}->Load( $self->ScripCondition );
+        }
     }
-    return ($self->{'ScripConditionObj'});
+    return ( $self->{'ScripConditionObj'} );
 }
 
 # }}}
diff --git a/rt/lib/RT/Scrips_Overlay.pm b/rt/lib/RT/Scrips_Overlay.pm
index 46e31c2a8..d20148084 100644
--- a/rt/lib/RT/Scrips_Overlay.pm
+++ b/rt/lib/RT/Scrips_Overlay.pm
@@ -129,5 +129,80 @@ sub Next {
 }
 # }}}
 
+sub Apply {
+    my ($self, %args) = @_;
+
+    #We're really going to need a non-acled ticket for the scrips to work
+    my ($TicketObj, $TransactionObj);
+
+    if ( ($TicketObj = $args{'TicketObj'}) ) {
+        $TicketObj->CurrentUser($self->CurrentUser);
+    }
+    else {
+        $TicketObj = RT::Ticket->new($self->CurrentUser);
+        $TicketObj->Load( $args{'Ticket'} )
+            || $RT::Logger->err("$self couldn't load ticket $args{'Ticket'}\n");
+    }
+
+    if ( ($TransactionObj = $args{'TransactionObj'}) ) {
+        $TransactionObj->CurrentUser($self->CurrentUser);
+    }
+    else {
+        $TransactionObj = RT::Transaction->new($self->CurrentUser);
+        $TransactionObj->Load( $args{'Transaction'} )
+            || $RT::Logger->err("$self couldn't load transaction $args{'Transaction'}\n");
+    }
+
+    # {{{ Deal with Scrips
+
+    $self->LimitToQueue( $TicketObj->QueueObj->Id )
+        ;                                  #Limit it to  $Ticket->QueueObj->Id
+    $self->LimitToGlobal()
+        unless $TicketObj->QueueObj->Disabled;    # or to "global"
+
+
+    $self->Limit(FIELD => "Stage", VALUE => $args{'Stage'});
+
+
+    my $ConditionsAlias = $self->NewAlias('ScripConditions');
+
+    $self->Join(
+        ALIAS1 => 'main',
+        FIELD1 => 'ScripCondition',
+        ALIAS2 => $ConditionsAlias,
+        FIELD2 => 'id'
+    );
+
+    #We only want things where the scrip applies to this sort of transaction
+    $self->Limit(
+        ALIAS           => $ConditionsAlias,
+        FIELD           => 'ApplicableTransTypes',
+        OPERATOR        => 'LIKE',
+        VALUE           => $args{'Type'},
+        ENTRYAGGREGATOR => 'OR',
+    ) if $args{'Type'};
+
+    # Or where the scrip applies to any transaction
+    $self->Limit(
+        ALIAS           => $ConditionsAlias,
+        FIELD           => 'ApplicableTransTypes',
+        OPERATOR        => 'LIKE',
+        VALUE           => "Any",
+        ENTRYAGGREGATOR => 'OR',
+    );
+
+    #Iterate through each script and check it's applicability.
+    while ( my $Scrip = $self->Next() ) {
+        $Scrip->Apply (TicketObj => $TicketObj,
+                        TransactionObj => $TransactionObj);
+    }
+
+    $TicketObj->CurrentUser( $TicketObj->OriginalUser );
+    $TransactionObj->CurrentUser( $TransactionObj->OriginalUser );
+
+    # }}}
+}
+
+
 1;
 
diff --git a/rt/lib/RT/StyleGuide.pod b/rt/lib/RT/StyleGuide.pod
new file mode 100644
index 000000000..95b2e3a15
--- /dev/null
+++ b/rt/lib/RT/StyleGuide.pod
@@ -0,0 +1,891 @@
+=head1 NAME
+
+RT::StyleGuide - RT Style Guide
+
+=head1 INTRODUCTION
+
+All code and documentation that is submitted to be included in the RT
+distribution should follow the style in this document.  This is not to
+try to stifle your creativity, but to make life easier for everybody who
+has to work with your code, and to aid those who are not quite sure how
+to do something.
+
+These conventions below apply to perl modules, web programs, and
+command-line programs, specifically, but also might apply to some
+degree to any Perl code written for use in RT.
+
+Note that these are all guidelines, not unbreakable rules.  If you have
+a really good need to break one of the rules herein, however, then it is
+best to ask on the B<rt-devel> mailing list first.
+
+Note that with much of this document, it is not so much the Right Way as
+it is Our Way.  We need to have conventions in order to make life easier
+for everyone.  So don't gripe, and just follow it, because you didn't
+get a good grade in "Plays Well With Others" in kindergarten and you
+want to make up for it now.
+
+If you have any questions, please ask us on the B<rt-devel> mailing list:
+
+	http://www.bestpractical.com/rt/lists.html
+
+We don't always follow this guide.  We are making changes throughout
+our code to be in line with it.  But just because we didn't do
+it yet, that is no excuse.  Do it anyway.  :-)
+
+This document is subject to change at the whims of the core RT team.
+We hope to add any significant changes at the bottom of the document.
+
+
+=head1 CODING PRINCIPLES
+
+=head2 Perl Version
+
+We code everything to perl 5.6.1. Some features require advanced unicode
+features in perl 5.8.0. It is acceptable that unicode features work only for 
+US-ASCII on perl 5.6.1. 
+
+
+=head2 Documentation
+
+All modules will be documented using the POD examples in the module
+boilerplate.  The function, purpose, use of the module will be
+explained, and each public API will be documented with name,
+description, inputs, outputs, side effects, etc.
+
+If an array or hash reference is returned, document the size of the
+array (including what each element is, as appropriate) and name each key
+in the hash.  For complex data structures, map out the structure as
+appropriate (e.g., name each field returned for each column from a DB
+call; yes, this means you shouldn't use "SELECT *", which you shouldn't
+use anyway).
+
+Also document what kind of data returned values are.  Is it an integer,
+a block of HTML, a boolean?
+
+All command-line program options will be documented using the
+boilerplate code for command-line programs, which doesn't yet exist.
+Each available function, switch, etc. should be documented, along
+with a statement of function, purpose, use of the program.  Do not
+use the same options as another program, for a different purpose.
+
+All web templates should be documented with a statement of function,
+purpose, and use in a mason comment block.
+
+Any external documents, and documentation for command-line programs and
+modules, should be written in POD, where appropriate. From there, they
+can be translated to many formats with the various pod2* translators. 
+Read the perlpod manpage before writing any POD, because although POD is
+not difficult, it is not what most people are used to.  It is not a
+regular markup language; it is just a way to make easy documentation
+for translating to other formats.  Read, and understand, the perlpod
+manpage, and ask us or someone else who knows if you have any questions.
+
+
+=head2 Version
+
+Our distribution versions use tuples, where the first number is the
+major revision, the second number is the version, and third
+number is the subversion.  Odd-numbered versions are development
+versions.  Examples:
+
+	1.0.0		First release of RT 1
+	1.0.1		Second release of RT 1.0
+	1.0.10		etc.
+	1.1.0		First development release of RT 1.2 (or 2.0)
+	2.0.0		First release of RT 2
+
+Versions can be modified with a hyphen followed by some text, for
+special versions, or to give extra information.  Examples:
+
+	2.0.0-pre1	Notes that this is not final, but preview
+
+In perl 5.6.0, you can have versions like C<v2.0.0>, but this is not
+allowed in previous versions of perl.  So to convert a tuple version
+string to a string to use with $VERSION, use a regular integer for
+the revision, and three digits for version and subversion.  Examples:
+
+	1.1.6	->	1.001006
+	2.0.0	->	2.000000
+
+This way, perl can use the version strings in greater-than and
+less-than comparisons.
+
+
+=head2 Comments
+
+All code should be self-documenting as much as possible.  Only include
+necessary comments.  Use names like "$ticket_count", so you don't need to
+do something like:
+
+	# ticket count
+	my $tc = 0;
+
+Include any comments that are, or might be, necessary in order for
+someone else to understand the code.  Sometimes a simple one-line
+comment is good to explain what the purpose of the following code is
+for.  Sometimes each line needs to be commented because of a complex
+algorithm.  Read Kernighan & Pike's I<Practice of Programming> about
+commenting.  Good stuff, Maynard.
+
+
+=head2 Warnings and Strict
+
+All code must compile and run cleanly with "use strict" enabled and the
+perl "-w" (warnings) option on.  If you must do something that -w or
+strict complains about, there are workarounds, but the chances that you
+really need to do it that way are remote.
+
+=head2 Lexical Variables
+
+Use only lexical variables, except for special global variables
+($VERSION, %ENV, @ISA, $!, etc.) or very special circumstances (see
+%HTML::Mason::Commands::session ).  Global variables
+for regular use are never appropriate.  When necessary, "declare"
+globals with "use vars" or "our()".
+
+A lexical variable is created with my().  A global variable is
+pre-existing (if it is a special variable), or it pops into existence
+when it is used.  local() is used to tell perl to assign a temporary
+value to a variable.  This should only be used with special variables,
+like $/, or in special circumstances.  If you must assign to any global
+variable, consider whether or not you should use local().
+
+local() may also be used on elements of arrays and hashes, though there
+is seldom a need to do it, and you shouldn't.
+
+
+=head2 Exporting
+
+Do not export anything from a module by default.  Feel free to put
+anything you want to in @EXPORT_OK, so users of your modules can
+explicitly ask for symbols (e.g., "use Something::Something qw(getFoo
+setFoo)"), but do not export them by default.
+
+
+=head2 Pass by Reference
+
+Arrays and hashes should be passed to and from functions by reference
+only.  Note that a list and an array are NOT the same thing.  This
+is perfectly fine:
+
+	return($user, $form, $constants);
+
+An exception might be a temporary array of discrete arguments:
+
+	my @return = ($user, $form);
+	push @return, $constants if $flag;
+	return @return;
+
+Although, usually, this is better (faster, easier to read, etc.):
+
+	if ($flag) {
+		return($user, $form, $constants);
+	} else {
+		return($user, $form);
+	}
+
+We need to talk about Class::ReturnValue here.
+
+
+=head2 Garbage Collection
+
+Perl does pretty good garbage collection for you.  It will automatically
+clean up lexical variables that have gone out of scope and objects whose
+references have gone away.  Normally you don't need to worry about
+cleaning up after yourself, if using lexicals.
+
+However, some glue code, code compiled in C and linked to Perl, might
+not automatically clean up for you.  In such cases, clean up for
+yourself.  If there is a method in that glue to dispose or destruct,
+then use it as appropriate.
+
+Also, if you have a long-running function that has a large data
+structure in it, it is polite to free up the memory as soon as you are
+done with it, if possible.
+
+	my $huge_data_structure = get_huge_data_structure();
+	do_something_with($huge_data_structure);
+	undef $huge_data_structure;
+
+=head2 DESTROY
+
+All object classes must provide a DESTROY method.  If it won't do
+anything, provide it anyway:
+
+	sub DESTROY { }
+
+
+
+=head2 die() and exit()
+
+Don't do it.  Do not die() or exit() from a web template or module.  Do
+not call C<kill 9, $$>.  Don't do it.
+
+In command-line programs, do as you please.
+
+
+=head2 shift and @_
+
+Do not use @_.  Use shift.  shift may take more lines, but Jesse thinks it 
+leads to cleaner code.
+
+	my $var = shift;			# right
+	my($var) = @_;				# ick. no
+	sub foo { uc $_[0] }			# icky. sometimes ok.
+
+
+	my($var1, $var2) = (shift, shift);	# Um, no.
+
+        my $var1 = shift;                       # right
+        my $var2 = shift;                       
+
+
+
+=head2 Tests
+
+Modules should provide test code, with documentation on how to use
+it. Test::Inline allows tests to be embedded in code. Test::More makes it 
+easy to create tests. Any code you write should have a testsuite.
+Any code you alter should have a test suite. If a patch comes in without
+tests, there is something wrong.
+
+When altering code, you must run the test harness before submitting a patch
+or committing code to the repository. 
+
+"make regression" will extract inline tests, blow away the system database
+and run the test suite.
+
+"make regression-quiet" will do all that and not print the "ok" lines.
+
+
+
+=head2 STDIN/STDOUT
+
+Always report errors using $RT::Logger. It's a Log::Dispatch object.
+Unlike message meant for the user, log messages are not to be
+internationalized.
+
+There are several different levels ($RT::Logger methods) of logging:
+
+=over 4
+
+=item debug
+
+Used for messages only needed during system debugging.
+
+=item info
+
+Should be used to describe "system-critical" events which aren't errors.
+Examples: creating users, deleting users, creating tickets, creating queues,
+sending email (message id, time, recipients), recieving mail, changing
+passwords, changing access control, superuser logins)
+
+=item error
+
+Used for RT-generated failures during execution.
+
+=item crit
+
+Should be used for messages when an action can not be completed due to some
+error condition beyond our control.
+
+=back
+
+In the web UI and modules, never print directly to STDERR.  Do not print
+directly to STDOUT, unless you need to print directly to the user's console.
+
+In command-line programs, feel free to print to STDERR and STDOUT as
+needed for direct console communication. But for actual error reporting,
+use the logging API.
+
+
+=head2 System Calls
+
+Always check return values from system calls, including open(),
+close(), mkdir(), or anything else that talks directly to the system. 
+Perl built-in system calls return the error in $!; some functions in
+modules might return an error in $@ or some other way, so read the module's
+documentation if you don't know.  Always do something, even if it is
+just calling $RT::Logger->warning(), when the return value is not what you'd expect.
+
+
+
+=head1 STYLE
+
+Much of the style section is taken from the perlsyle manpage.  We make
+some changes to it here, but it wouldn't be a bad idea to read that
+document, too.
+
+=head2 Terminology
+
+=over 4
+
+=item RT the name
+
+"RT" is the name of the project.  "RT" is, optionally, the
+specific name for the actual file distribution.  That's it. 
+
+While we sometimes use "RT2" or "RT3", that's shortand that's really
+not recommended. The name of the project is "RT".
+
+To specify a major version, use "RT 3.0".
+To specify a specific release, use "RT 3.0.12"
+
+=item function vs. sub(routine) vs. method
+
+Just because it is the Perl Way (not necessarily right for all
+languages, but the documented terminology in the perl documentation),
+"method" should be used only to refer to a subroutine that are object
+methods or class methods; that is, these are functions that are used
+with OOP that always take either an object or a class as the first
+argument. Regular subroutines, ones that are not object or class
+methods, are functions.  Class methods that create and return an object
+are optionally called constructors.
+
+=item Users
+
+"users" are normally users of RT, the ones hitting the site; if using
+it in any other context, specify.  
+"system users" are user
+names on the operating system.  "database users" are the user names in
+the database server.  None of these needs to be capitalized.
+
+=back
+
+
+=head2 Names
+
+Don't use single-character variables, except as iterator variables.
+
+Don't use two-character variables just to spite us over the above rule.
+
+Constants are in all caps; these are variables whose value will I<never>
+change during the course of the program.
+
+	$Minimum = 10;		# wrong
+	$MAXIMUM = 50;		# right
+
+Other variables are lowercase, with underscores separating the words. 
+They words used should, in general, form a noun (usually singular),
+unless the variable is a flag used to denote some action that should be
+taken, in which case they should be verbs (or gerunds, as appropriate)
+describing that action.
+
+	$thisVar      = 'foo';	# wrong
+	$this_var     = 'foo';	# right
+	$work_hard    = 1;	# right, verb, boolean flag
+	$running_fast = 0;	# right, gerund, boolean flag
+
+Arrays and hashes should be plural nouns, whether as regular arrays and
+hashes or array and hash references.  Do not name references with "ref"
+or the data type in the name.
+
+	@stories     = (1, 2, 3);      # right
+	$comment_ref = [4, 5, 6];      # wrong
+	$comments    = [4, 5, 6];      # right
+	$comment     = $comments->[0]; # right
+
+Make the name descriptive.  Don't use variables like "$sc" when you
+could call it "$story_count".  See L<"Comments">.
+
+There are several variables in RT that are used throughout the code,
+that you should use in your code.  Do not use these variable names for
+anything other than how they are normally used, and do not use any
+other variable names in their place.  Some of these are:
+
+	$self		# first named argument in object method
+
+Subroutines (except for special cases, like AUTOLOAD and simple accessors)
+begin with a verb, with words following to complete the action.  Accessors
+don't start with "Get" if they're just the name of the attribute.
+
+Accessors which return an object should end with the suffix Obj.
+
+This section needs clarification for RT.
+
+Words begin with a capital letter.  They
+should as clearly as possible describe the activity to be peformed, and
+the data to be returned. 
+
+
+
+	Load();		# good
+	LoadByName();	# good
+	LoadById();		# good
+
+Subroutines beginning with C<_> are special: they are not to be used
+outside the current object.  There is not to be enforced by the code
+itself, but by someone very big and very scary.
+
+For large for() loops, do not use $_, but name the variable.
+Do not use $_ (or assume it) except for when it is absolutely
+clear what is going on, or when it is required (such as with
+map() and grep()).
+
+	for (@list) {
+		print;			# OK; everyone knows this one
+		print uc;		# wrong; few people know this
+		print uc $_;		# better
+	}
+
+Note that the special variable C<_> I<should> be used when possible.
+It is a placeholder that can be passed to stat() and the file test
+operators, that saves perl a trip to re-stat the file.  In the
+example below, using C<$file> over for each file test, instead of
+C<_> for subsequent uses, is a performance hit.  You should be
+careful that the last-tested file is what you think it is, though.
+
+	if (-d $file) {		# $file is a directory
+		# ...
+	} elsif (-l _) {	# $file is a symlink
+		# ...
+	}
+
+Package names begin with a capital letter in each word, followed by
+lower case letters (for the most part).  Multiple words should be StudlyCapped.
+
+	RT::User			# good
+	RT::Database::MySQL		# proper name
+	RT::Display::Provider	        # good
+	RT::CustomField			# not so good, but OK
+
+Plugin modules should begin with "RTx::", followed by the name
+of the plugin.  
+
+=head1 Code formatting
+
+Use perltidy. Anything we say here is wrong if it conflicts with what
+perltidy does. Your perltidyrc should read:
+
+-lp -vt=2 -vtc=2 -nsfs -bar                                                                                             
+
+=head2 Indents and Blank Space
+
+All indents should be tabs.  Set your tab stops whatever you want them
+to be; I use 8 spaces per tabs.
+
+No space before a semicolon that closes a statement.
+
+	foo(@bar) ;	# wrong
+	foo(@bar);	# right
+
+Line up corresponding items vertically.
+
+	my $foo   = 1;
+	my $bar   = 2;
+	my $xyzzy = 3;
+
+	open(FILE, $fh)	  or die $!;
+	open(FILE2, $fh2) or die $!;
+
+	$rot13 =~ tr[abcedfghijklmnopqrstuvwxyz]
+	            [nopqrstuvwxyzabcdefghijklm];
+
+	# note we use a-mn-z instead of a-z,
+	# for readability
+	$rot13 =~ tr[a-mn-z]
+	            [n-za-m];
+
+Put blank lines between groups of code that do different things.  Put
+blank lines after your variable declarations.  Put a blank line before a
+final return() statement.  Put a blank line following a block (and
+before, with the exception of comment lines).
+
+An example:
+
+	# this is my function!
+	sub foo {
+                my $val = shift;
+		my $obj = new Constructor;
+		my($var1, $var2);
+
+		$obj->SetFoo($val);
+		$var1 = $obj->Foo();
+
+
+		return($val);
+	}
+
+	print 1;
+
+
+=head2 Parentheses
+
+For control structures, there is a space between the keyword and opening
+parenthesis.  For functions, there is not.
+
+	for(@list)	# wrong
+	for (@list)	# right
+
+	my ($ref)	# wrong
+	my($ref)	# right
+
+Be careful about list vs. scalar context with parentheses!
+
+	my @array = ('a', 'b', 'c');
+	my($first_element) = @array;		# a
+	my($first_element) = ('a', 'b', 'c');	# a
+	my $element_count  = @array;		# 3
+	my $last_element   = ('a', 'b', 'c');	# c
+
+Always include parentheses after functions, even if there are no arguments.
+There are some exceptions, such as list operators (like print) and unary
+operators (like undef, delete, uc).
+
+There is no space inside the parentheses, unless it is needed for
+readability.
+
+	for ( map { [ $_, 1 ] } @list )	# OK
+	for ( @list )			# not really OK, not horrible
+
+On multi-line expressions, match up the closing parenthesis with either
+the opening statement, or the opening parenthesis, whichever works best.
+Examples:
+
+	@list = qw(
+		bar
+		baz
+	);			# right
+
+	if ($foo && $bar && $baz
+		 && $buz && $xyzzy
+	) {
+		print $foo;
+	}
+
+Whether or not there is space following a closing parenthesis is
+dependent on what it is that follows.
+
+	print foo(@bar), baz(@buz) if $xyzzy;
+
+Note also that parentheses around single-statement control expressions,
+as in C<if $xyzzy>, are optional (and discouraged) C<if> it is I<absolutely>
+clear -- to a programmer -- what is going on.  There is absolutely no
+need for parentheses around C<$xyzzy> above, so leaving them out enhances
+readability.  Use your best discretion.  Better to include them, if
+there is any question.
+
+The same essentially goes for perl's built-in functions, when there is
+nothing confusing about what is going on (for example, there is only one
+function call in the statement, or the function call is separated by a
+flow control operator).  User-supplied functions must always include
+parentheses.
+
+	print 1, 2, 3;				# good
+	delete $hash{key} if isAnon($uid);	# good
+
+
+However, if there is any possible confusion at all, then include the
+parentheses.  Remember the words of Larry Wall in the perlstyle manpage:
+
+	When in doubt, parenthesize.  At the very least it will
+	let some poor schmuck bounce on the % key in vi.
+
+	Even if you aren't in doubt, consider the mental welfare
+	of the person who has to maintain the code after you, and
+	who will probably put parens in the wrong place.
+
+So leave them out when it is absoutely clear to a programmer, but if
+there is any question, leave them in.
+
+
+=head2 Braces
+
+(This is about control braces, not hash/data structure braces.)
+
+There is always a space befor the opening brace.
+
+	while (<$fh>){	# wrong
+	while (<$fh>) {	# right
+
+A one-line block may be put on one line, and the semicolon may be
+omitted.
+
+	for (@list) { print }
+
+Otherwise, finish each statement with a semicolon, put the keyword and
+opening curly on the first line, and the ending curly lined up with the
+keyword at the end.
+
+	for (@list) {
+		print;
+		smell();
+	}
+
+Generally, we prefer "uncuddled elses":
+
+	if ($foo) {
+		print;
+	}
+	else {
+		die;
+	}
+
+_If_ the if statement is very brief, sometimes "cuddling" the else makes code more readable. Feel free to cuddle them in that case:
+
+
+	if ($foo) {
+		print;
+	} else {
+		die;
+	}
+
+=head2 Operators
+
+Put space around most operators.  The primary exception is the for
+aesthetics; e.g., sometimes the space around "**" is ommitted,
+and there is never a space before a ",", but always after.
+
+	print $x , $y;	# wrong
+	print $x, $y;	# right
+
+	$x = 2 >> 1;	# good
+	$y = 2**2;	# ok
+
+Note that "&&" and "||" have a higher precedence than "and" and "or". 
+Other than that, they are exactly the same.  It is best to use the lower
+precedence version for control, and the higher for testing/returning
+values.  Examples:
+
+	$bool = $flag1 or $flag2;	# WRONG (doesn't work)
+	$value = $foo || $bar;		# right
+	open(FILE, $file) or die $!;
+
+	$true  = foo($bar) && baz($buz);
+	foo($bar) and baz($buz);
+
+Note that "and" is seldom ever used, because the statement above is
+better written using "if":
+
+	baz($buz) if foo($bar);
+
+Most of the time, the confusion between and/&&, or/|| can be alleviated
+by using parentheses.  If you want to leave off the parentheses then you
+I<must> use the proper operator.  But if you use parentheses -- and
+normally, you should, if there is any question at all -- then it doesn't
+matter which you use.  Use whichever is most readable and aesthetically
+pleasing to you at the time, and be consistent within your block of code.
+
+Break long lines AFTER operators, except for "and", "or", "&&", "||".
+Try to keep the two parts to a binary operator (an operator that
+has two operands) together when possible.
+
+	print "foo" . "bar" . "baz"
+		. "buz";			# wrong
+
+	print "foo" . "bar" . "baz" .
+		"buz";				# right
+
+	print $foo unless $x == 3 && $y ==
+		4 && $z == 5;			# wrong
+
+	print $foo unless $x == 3 && $y == 4
+		&& $z == 5;			# right
+
+
+=head2 Other
+
+Put space around a complex subscript inside the brackets or braces.
+
+	$foo{$bar{baz}{buz}};	# OK
+	$foo{ $bar{baz}{buz} };	# better
+
+In general, use single-quotes around literals, and double-quotes
+when the text needs to be interpolated. 
+
+It is OK to omit quotes around names in braces and when using
+the => operator, but be careful not to use a name that doubles as
+a function; in that case, quote.
+
+	$what{'time'}{it}{is} = time();
+
+When making compound statements, put the primary action first.
+
+	open(FILE, $fh) or die $!;	# right
+	die $! unless open(FILE, $fh);	# wrong
+
+	print "Starting\n" if $verbose;	# right
+	$verbose && print "Starting\n";	# wrong
+
+
+Use here-docs instead of repeated print statements.
+
+		print <<EOT;
+	This is a whole bunch of text.
+	I like it.  I don't need to worry about messing
+	with lots of print statements and lining them up.
+	EOT
+
+Just remember that unless you put single quotes around your here-doc
+token (<<'EOT'), the text will be interpolated, so escape any "$" or "@"
+as needed.
+
+=head1 INTERNATIONALIZATION
+
+
+=head2 String extraction styleguide
+
+=over 4
+
+=item Web templates
+
+Templates should use the /l filtering component to call the localisation
+framework
+
+The string 		Foo!
+
+Should become		<&|/l&>Foo!</&>
+
+All newlines should be removed from localized strings, to make it easy to 
+grep the codebase for strings to be localized
+
+The string 		Foo
+			Bar
+			Baz
+			
+Should become		<&|/l&>Foo Bar Baz</&>
+
+
+Variable subsititutions should be moved to Locale::MakeText format
+
+The string		Hello, <%$name %>
+
+should become		<&|/l, $name &>Hello, [_1]</&>	
+
+
+Multiple variables work just like single variables
+ 
+The string		You found <%$num%> tickets in queue <%$queue%>
+
+should become		<&|/l, $num, $queue &>You found [_1] tickets in queue [_2]</&>
+
+When subcomponents are called in the middle of a phrase, they need to be escaped
+too:
+
+The string		 <input type="submit" value="New ticket in">&nbsp<& /Elements/SelectNewTicketQueue&>
+
+should become		<&|/l, $m->scomp('/Elements/SelectNewTicketQueue')&><input type="submit" value="New ticket in">&nbsp;[_1]</&>
+
+
+
+
+The string	<& /Elements/TitleBoxStart, width=> "40%", titleright => "RT $RT::VERSION for   $RT::rtname", title => 'Login' &>
+
+should become 	<& /Elements/TitleBoxStart, 
+			width=> "40%",
+			titleright => loc("RT [_1] for [_2]",$RT::VERSION, $RT::rtname),
+			title => loc('Login'),
+	      	&>
+	
+
+=item Library code			
+
+
+
+Within RT's core code, every module has a localization handle available through the 'loc' method:
+
+The code 	return ( $id, "Queue created" );
+
+should become 	return ( $id, $self->loc("Queue created") );	
+
+When returning or localizing a single string, the "extra" set of parenthesis () should be omitted.
+
+The code  	return ("Subject changed to ". $self->Data );
+
+should become	 return $self->loc( "Subject changed to [_1]", $self->Data );
+
+
+It is important not to localize  the names of rights or statuses within RT's core, as there is logic that depends on them as string identifiers.  The proper place to localize these values is when they're presented for display in the web or commandline interfaces.
+
+
+=back 4
+
+=head1 CODING PRCEDURE
+
+This is for new programs, modules, specific APIs, or anything else.
+
+Contact for core team is the slashcode-development mailing list.
+
+=over 4
+
+=item Present idea to core team
+
+We may know of a better way to approach the problem, or know of an
+existing way to deal with it, or know someone else is working on it. 
+This is mostly informal, but a fairly complete explanation for the need
+and use of the code should be provided.
+
+
+=item Present complete specs to core team
+
+The complete proposed API to the core team should be submitted for
+approval and discussion.  For web and command-line programs, present the
+functionality and interface (op codes, command-lin switches, etc.).
+
+The best way to do this is to take the documentation portion of the
+boilerplate and fill it in.  You can make changes later if necessary,
+but fill it in as much as you can.
+
+
+=item Announce any changes to interface
+
+If the way it works or how it is called is going to change, notify the core
+team.
+
+
+=item Prepare for core review
+
+When you are done, the code will undergo a code review by a member of
+the core team, or someone picked by the core team.  This is not to
+belittle you (that's just a nice side effect), it is to make sure that
+you understand your code, that we understand your code, that it won't
+break other code, that it follows the documentation and existing
+proposal.  It is to check for possible optimizations or better ways of
+doing it.
+
+For members of the core team, one or more other members of the team will
+perform the review.
+
+Note that all code is expected to follow the coding principles and style
+guide contained in this document.
+
+
+=item Finish it up
+
+After the code is done (possibly going through multiple code reviews),
+if you do not have repository access, submit it to rt-<major-version>-bugs@fsck.com as a unified diff. From that point on, it'll be handled by someone with repository access.
+
+=back
+
+
+=head1 BUG REPORTS, PATCHES
+
+Use rt-<major-version>-bugs@fsck.com for I<any> bug that is not
+being fixed immediately.  If it is not in RT, there
+is a good chance it will not be dealt with.
+
+Send patches to rt-<major-version>-bugs@fsck.com, too.  Use C<diff
+-u> for patches.
+
+
+
+=head1 TO DO
+
+Talk about DBIx::SearchBuilder
+
+Talk about mason
+        component style
+        cascading style sheets
+         
+Talk about adding a new translation
+
+Talk more about logging
+
+=head1 CHANGES
+
+        Adapted from Slash Styleguide by jesse - 20 Dec, 2002
+
+
+=head1 VERSION
+
+0.1 
diff --git a/rt/lib/RT/Template_Overlay.pm b/rt/lib/RT/Template_Overlay.pm
index 0b5e67d0f..5950aa3ea 100644
--- a/rt/lib/RT/Template_Overlay.pm
+++ b/rt/lib/RT/Template_Overlay.pm
@@ -203,10 +203,11 @@ sub LoadQueueTemplate {
     my $self = shift;
     my %args = (
         Queue => undef,
-        Name  => undef
+        Name  => undef,
+        @_
     );
 
-    return ( $self->LoadByCols( Name => $args{'Name'}, Queue => {'Queue'} ) );
+    return ( $self->LoadByCols( Name => $args{'Name'}, Queue => $args{'Queue'} ) );
 
 }
 
@@ -318,24 +319,30 @@ sub Parse {
     my $parser = MIME::Parser->new();
 
     # Setup output directory for files. from RT::EmailParser::_SetupMIMEParser
-    if (my $AttachmentDir = eval { File::Temp::tempdir( TMPDIR => 1, CLEANUP => 1 ) }) {
-	# Set up output directory for files:
-	$parser->output_dir("$AttachmentDir");
+    if ( my $AttachmentDir =
+        eval { File::Temp::tempdir( TMPDIR => 1, CLEANUP => 1 ) } )
+    {
+
+        # Set up output directory for files:
+        $parser->output_dir("$AttachmentDir");
     }
     else {
-	# On some situations TMPDIR is non-writable. sad but true.
-	$parser->output_to_core(1);
-	$parser->tmp_to_core(1);
+        $RT::Logger->error("Couldn't write attachments to temp dir on disk. using more memory and processor.");
+        # On some situations TMPDIR is non-writable. sad but true.
+        $parser->output_to_core(1);
+        $parser->tmp_to_core(1);
     }
+
     #If someone includes a message, don't extract it
     $parser->extract_nested_messages(1);
+
     # Set up the prefix for files with auto-generated names:
     $parser->output_prefix("part");
+
     # If content length is <= 50000 bytes, store each msg as in-core scalar;
     # Else, write to a disk file (the default action):
     $parser->output_to_core(50000);
 
-
     ### Should we forgive normally-fatal errors?
     $parser->ignore_errors(1);
     $self->{'MIMEObj'} = eval { $parser->parse_data($content) };
@@ -350,7 +357,6 @@ sub Parse {
     $self->{'MIMEObj'}->head->unfold();
 
     return ( 1, $self->loc("Template parsed") );
-   
 
 }
 
@@ -369,12 +375,13 @@ sub _ParseContent {
         @_
     );
 
-
+    no warnings 'redefine';
     $T::Ticket      = $args{'TicketObj'};
     $T::Transaction = $args{'TransactionObj'};
     $T::Argument    = $args{'Argument'};
     $T::Requestor   = eval { $T::Ticket->Requestors->UserMembersObj->First->Name };
     $T::rtname      = $RT::rtname;
+    *T::loc         = sub { $T::Ticket->loc(@_) };
 
     # We need to untaint the content of the template, since we'll be working
     # with it
diff --git a/rt/lib/RT/Ticket_Overlay.pm b/rt/lib/RT/Ticket_Overlay.pm
index c88bbc90f..981df4125 100644
--- a/rt/lib/RT/Ticket_Overlay.pm
+++ b/rt/lib/RT/Ticket_Overlay.pm
@@ -305,6 +305,7 @@ sub Create {
     my $self = shift;
 
     my %args = ( id              => undef,
+                 EffectiveId     => undef,
                  Queue           => undef,
                  Requestor       => undef,
                  Cc              => undef,
@@ -314,6 +315,7 @@ sub Create {
                  Subject         => '',
                  InitialPriority => undef,
                  FinalPriority   => undef,
+                 Priority   => undef,
                  Status          => 'new',
                  TimeWorked      => "0",
                  TimeLeft        => 0,
@@ -378,6 +380,11 @@ sub Create {
     $args{'FinalPriority'} = ( $QueueObj->FinalPriority || 0 )
       unless ( defined $args{'FinalPriority'} );
 
+    # Priority may have changed from InitialPriority, for the case
+    # where we're importing tickets (eg, from an older RT version.)
+    my $priority = $args{'Priority'} || $args{'InitialPriority'};
+
+
     # {{{ Dates
     #TODO we should see what sort of due date we're getting, rather +
     # than assuming it's in ISO format.
@@ -473,7 +480,7 @@ sub Create {
      next unless (defined $args{$type});
         foreach my $watcher ( ref( $args{$type} ) ? @{ $args{$type} } : ( $args{$type} ) ) {
         my $user = RT::User->new($RT::SystemUser);
-        $user->LoadOrCreateByEmail($watcher) if ($watcher !~ /^\d+$/);
+        $user->LoadOrCreateByEmail($watcher) if ($watcher && $watcher !~ /^\d+$/);
         }
     }
 
@@ -485,7 +492,7 @@ sub Create {
                                    Subject         => $args{'Subject'},
                                    InitialPriority => $args{'InitialPriority'},
                                    FinalPriority   => $args{'FinalPriority'},
-                                   Priority        => $args{'InitialPriority'},
+                                   Priority        => $priority,
                                    Status          => $args{'Status'},
                                    TimeWorked      => $args{'TimeWorked'},
                                    TimeEstimated   => $args{'TimeEstimated'},
@@ -515,7 +522,7 @@ sub Create {
     }
 
     #Set the ticket's effective ID now that we've created it.
-    my ( $val, $msg ) = $self->__Set( Field => 'EffectiveId', Value => $id );
+    my ( $val, $msg ) = $self->__Set( Field => 'EffectiveId', Value => ($args{'EffectiveId'} || $id ) );
 
     unless ($val) {
         $RT::Logger->crit("$self ->Create couldn't set EffectiveId: $msg\n");
@@ -546,6 +553,9 @@ sub Create {
         next unless (defined $args{$type});
         foreach my $watcher ( ref( $args{$type} ) ? @{ $args{$type} } : ( $args{$type} ) ) {
 
+	   # If there is an empty entry in the list, let's get out of here.
+	   next unless $watcher;
+
 	    # we reason that all-digits number must be a principal id, not email
 	    # this is the only way to can add
 	    my $field = 'Email';
@@ -601,7 +611,7 @@ sub Create {
     my $cfid = $1;
     foreach
       my $value ( ref( $args{$arg} ) ? @{ $args{$arg} } : ( $args{$arg} ) ) {
-        next unless ($value);
+        next unless (length($value));
         $self->_AddCustomFieldValue( Field => $cfid,
                                      Value => $value,
                                      RecordTransaction => 0
@@ -832,8 +842,8 @@ AddRequestor: jesse\@example.com
 EOF
 
 my $ticket = RT::Ticket->new($RT::SystemUser);
-$ticket->Create(Subject => 'first', Queue => 'general');
-ok($ticket->Id, "Created the test ticket");
+my ($id,$msg) =$ticket->Create(Subject => 'first', Queue => 'general');
+ok($ticket->Id, "Created the test ticket - ".$id ." - ".$msg);
 $ticket->UpdateFrom822($simple_update);
 is($ticket->Subject, 'target', "changed the subject");
 my $jesse = RT::User->new($RT::SystemUser);
@@ -970,7 +980,7 @@ sub UpdateFrom822 {
 
         # If we've been given a number of delresses to del, do it.
                 foreach my $address (@{$ticketargs{'Del'.$type}}) {
-                my ($id, $msg) = $self->DelWatcher( Type => $type, Email => $address);
+                my ($id, $msg) = $self->DeleteWatcher( Type => $type, Email => $address);
                 push (@results, $msg) ;
                 }
 
@@ -2228,9 +2238,11 @@ sub Comment {
     # The "NotifyOtherRecipients" scripAction will look for RT--Send-Cc: and
     # RT-Send-Bcc: headers
 
-    $args{'MIMEObj'}->head->add( 'RT-Send-Cc',  $args{'CcMessageTo'} )
+    $args{'MIMEObj'}->head->add( 'RT-Send-Cc',
+        RT::User::CanonicalizeEmailAddress(undef, $args{'CcMessageTo'}) )
 	if defined $args{'CcMessageTo'};
-    $args{'MIMEObj'}->head->add( 'RT-Send-Bcc', $args{'BccMessageTo'} )
+    $args{'MIMEObj'}->head->add( 'RT-Send-Bcc',
+        RT::User::CanonicalizeEmailAddress(undef, $args{'BccMessageTo'}) )
 	if defined $args{'BccMessageTo'};
 
     #Record the correspondence (write the transaction)
@@ -2296,9 +2308,11 @@ sub Correspond {
     # The "NotifyOtherRecipients" scripAction will look for RT-Send-Cc: and RT-Send-Bcc:
     # headers
 
-    $args{'MIMEObj'}->head->add( 'RT-Send-Cc',  $args{'CcMessageTo'} )
+    $args{'MIMEObj'}->head->add( 'RT-Send-Cc',
+        RT::User::CanonicalizeEmailAddress(undef, $args{'CcMessageTo'}) )
 	if defined $args{'CcMessageTo'};
-    $args{'MIMEObj'}->head->add( 'RT-Send-Bcc', $args{'BccMessageTo'} )
+    $args{'MIMEObj'}->head->add( 'RT-Send-Bcc',
+        RT::User::CanonicalizeEmailAddress(undef, $args{'BccMessageTo'}) )
 	if defined $args{'BccMessageTo'};
 
     #Record the correspondence (write the transaction)
@@ -2894,9 +2908,6 @@ sub MergeInto {
     }
 
 
-    #make a new link: this ticket is merged into that other ticket.
-    $self->AddLink( Type   => 'MergedInto', Target => $NewTicket->Id());
-
     #add all of this ticket's watchers to that ticket.
     my $requestors = $self->Requestors->MembersObj;
     while (my $watcher = $requestors->Next) { 
@@ -2936,6 +2947,9 @@ sub MergeInto {
         );
     }
 
+    #make a new link: this ticket is merged into that other ticket.
+    $self->AddLink( Type   => 'MergedInto', Target => $NewTicket->Id());
+
     $NewTicket->_SetLastUpdated;
 
     return ( 1, $self->loc("Merge Successful") );
@@ -3266,8 +3280,14 @@ sub SetStatus {
     }
 
     #Check ACL
-    unless ( $self->CurrentUserHasRight('ModifyTicket') ) {
-        return ( 0, $self->loc('Permission Denied') );
+    if ( $args{Status} eq 'deleted') {
+            unless ($self->CurrentUserHasRight('DeleteTicket')) {
+            return ( 0, $self->loc('Permission Denied') );
+       }
+    } else {
+            unless ($self->CurrentUserHasRight('ModifyTicket')) {
+            return ( 0, $self->loc('Permission Denied') );
+       }
     }
 
     if (!$args{Force} && ($args{'Status'} eq 'resolved') && $self->HasUnresolvedDependencies) {
@@ -3440,6 +3460,7 @@ sub CustomFieldValues {
     my $cf_values = RT::TicketCustomFieldValues->new( $self->CurrentUser );
     $cf_values->LimitToCustomField($cf->id);
     $cf_values->LimitToTicket($self->Id());
+    $cf_values->OrderBy( FIELD => 'id' );
 
     # @values is a CustomFieldValues object;
     return ($cf_values);
@@ -3451,7 +3472,7 @@ sub CustomFieldValues {
 
 =item AddCustomFieldValue { Field => FIELD, Value => VALUE }
 
-VALUE can either be a CustomFieldValue object or a string.
+VALUE should be a string.
 FIELD can be a CustomField object OR a CustomField ID.
 
 
@@ -3798,11 +3819,45 @@ sub _NewTransaction {
     if ( defined $args{'TimeTaken'} ) {
         $self->_UpdateTimeTaken( $args{'TimeTaken'} );
     }
+    if ( $RT::UseTransactionBatch and $transaction ) {
+	push @{$self->{_TransactionBatch}}, $trans;
+    }
     return ( $transaction, $msg, $trans );
 }
 
 # }}}
 
+=head2 TransactionBatch
+
+  Returns an array reference of all transactions created on this ticket during
+  this ticket object's lifetime, or undef if there were none.
+
+  Only works when the $RT::UseTransactionBatch config variable is set to true.
+
+=cut
+
+sub TransactionBatch {
+    my $self = shift;
+    return $self->{_TransactionBatch};
+}
+
+sub DESTROY {
+    my $self = shift;
+
+    # The following line eliminates reentrancy.
+    # It protects against the fact that perl doesn't deal gracefully
+    # when an object's refcount is changed in its destructor.
+    return if $self->{_Destroyed}++;
+
+    my $batch = $self->TransactionBatch or return;
+    require RT::Scrips;
+    RT::Scrips->new($RT::SystemUser)->Apply(
+	Stage		=> 'TransactionBatch',
+	TicketObj	=> $self,
+	TransactionObj	=> $batch->[0],
+    );
+}
+
 # }}}
 
 # {{{ PRIVATE UTILITY METHODS. Mostly needed so Ticket can be a DBIx::Record
diff --git a/rt/lib/RT/Tickets_Overlay.pm b/rt/lib/RT/Tickets_Overlay.pm
index d8a1ac803..55777b0fb 100644
--- a/rt/lib/RT/Tickets_Overlay.pm
+++ b/rt/lib/RT/Tickets_Overlay.pm
@@ -84,7 +84,7 @@ my %FIELDS =
     RefersTo        => ['LINK' => To => 'RefersTo',],
     HasMember	    => ['LINK' => From => 'MemberOf',],
     DependentOn     => ['LINK' => From => 'DependsOn',],
-    ReferredTo      => ['LINK' => From => 'RefersTo',],
+    ReferredToBy    => ['LINK' => From => 'RefersTo',],
 #   HasDepender	    => ['LINK',],
 #   RelatedTo	    => ['LINK',],
     Told	    => ['DATE' => 'Told',],
@@ -122,14 +122,23 @@ my %dispatch =
     LINKFIELD	    => \&_LinkFieldLimit,
     CUSTOMFIELD    => \&_CustomFieldLimit,
   );
+my %can_bundle =
+  ( WATCHERFIELD => "yeps",
+  );
 
 # Default EntryAggregator per type
+# if you specify OP, you must specify all valid OPs
 my %DefaultEA = (
                  INT		=> 'AND',
                  ENUM		=> { '=' => 'OR',
 				     '!='=> 'AND'
 				   },
-                 DATE		=> 'AND',
+                 DATE		=> { '=' => 'OR',
+				     '>='=> 'AND',
+				     '<='=> 'AND',
+				     '>' => 'AND',
+				     '<' => 'AND'
+				   },
                  STRING		=> { '=' => 'OR',
 				     '!='=> 'AND',
 				     'LIKE'=> 'AND',
@@ -137,6 +146,7 @@ my %DefaultEA = (
 				   },
                  TRANSFIELD	=> 'AND',
                  TRANSDATE	=> 'AND',
+                 LINK           => 'OR',
                  LINKFIELD	=> 'AND',
                  TARGET		=> 'AND',
                  BASE		=> 'AND',
@@ -154,6 +164,7 @@ my %DefaultEA = (
 # into Tickets_Overlay_SQL.
 sub FIELDS   { return \%FIELDS   }
 sub dispatch { return \%dispatch }
+sub can_bundle { return \%can_bundle }
 
 # Bring in the clowns.
 require RT::Tickets_Overlay_SQL;
@@ -345,7 +356,7 @@ sub _DateLimit {
   my ($sb,$field,$op,$value,@rest) = @_;
 
   die "Invalid Date Op: $op"
-     unless $op =~ /^(=|!=|>|<|>=|<=)$/;
+     unless $op =~ /^(=|>|<|>=|<=)$/;
 
   my $meta = $FIELDS{$field};
   die "Incorrect Meta Data for $field"
@@ -354,18 +365,52 @@ sub _DateLimit {
   require Time::ParseDate;
   use POSIX 'strftime';
 
+  # FIXME: Replace me with RT::Date( Type => 'unknown' ...)
   my $time = Time::ParseDate::parsedate( $value,
 			UK => $RT::DateDayBeforeMonth,
 			PREFER_PAST => $RT::AmbiguousDayInPast,
-			PREFER_FUTURE => !($RT::AmbiguousDayInPast));
-  $value = strftime("%Y-%m-%d %H:%M",localtime($time));
+			PREFER_FUTURE => !($RT::AmbiguousDayInPast),
+                        FUZZY => 1
+				       );
 
-  $sb->_SQLLimit(
-	     FIELD => $meta->[1],
-	     OPERATOR => $op,
-	     VALUE => $value,
-	     @rest,
-	    );
+  if ($op eq "=") {
+    # if we're specifying =, that means we want everything on a
+    # particular single day.  in the database, we need to check for >
+    # and < the edges of that day.
+
+    my $daystart = strftime("%Y-%m-%d %H:%M",
+			    gmtime($time - ( $time % 86400 )));
+    my $dayend   = strftime("%Y-%m-%d %H:%M",
+			    gmtime($time + ( 86399 - $time % 86400 )));
+
+    $sb-> _OpenParen;
+
+    $sb->_SQLLimit(
+		   FIELD => $meta->[1],
+		   OPERATOR => ">=",
+		   VALUE => $daystart,
+		   @rest,
+		  );
+
+    $sb->_SQLLimit(
+		   FIELD => $meta->[1],
+		   OPERATOR => "<=",
+		   VALUE => $dayend,
+		   @rest,
+		   ENTRYAGGREGATOR => 'AND',
+		  );
+
+    $sb-> _CloseParen;
+
+  } else {
+    $value = strftime("%Y-%m-%d %H:%M", gmtime($time));
+    $sb->_SQLLimit(
+		   FIELD => $meta->[1],
+		   OPERATOR => $op,
+		   VALUE => $value,
+		   @rest,
+		  );
+  }
 }
 
 =head2 _StringLimit
@@ -425,8 +470,8 @@ sub _TransDateLimit {
 	     ALIAS2 => $sb->{_sql_transalias}, FIELD2 => 'Ticket');
 
   my $d = new RT::Date( $sb->CurrentUser );
-  $d->Set($value);
-  $value = $d->ISO;
+  $d->Set( Format => 'ISO', Value => $value);
+   $value = $d->ISO;
 
   #Search for the right field
   $sb->_SQLLimit(ALIAS => $sb->{_sql_trattachalias},
@@ -528,9 +573,7 @@ sub _WatcherLimit {
   $self->_OpenParen;
 
   my $groups	    = $self->NewAlias('Groups');
-  my $group_princs  = $self->NewAlias('Principals');
   my $groupmembers  = $self->NewAlias('CachedGroupMembers');
-  my $member_princs = $self->NewAlias('Principals');
   my $users	    = $self->NewAlias('Users');
 
 
@@ -542,14 +585,29 @@ sub _WatcherLimit {
 #    $aggregator = 'AND';
 #  }
 
-
-  $self->_SQLLimit(ALIAS => $users,
-		   FIELD => $rest{SUBKEY} || 'EmailAddress',
-		   VALUE           => $value,
-		   OPERATOR        => $op,
-		   CASESENSITIVE   => 0,
-		   @rest,
-		  );
+  if (ref $field) { # gross hack
+    my @bundle = @$field;
+    $self->_OpenParen;
+    for my $chunk (@bundle) {
+      ($field,$op,$value,@rest) = @$chunk;
+      $self->_SQLLimit(ALIAS => $users,
+   		   FIELD => $rest{SUBKEY} || 'EmailAddress',
+   		   VALUE           => $value,
+   		   OPERATOR        => $op,
+   		   CASESENSITIVE   => 0,
+   		   @rest,
+   		  );
+    }
+    $self->_CloseParen;
+  } else {
+     $self->_SQLLimit(ALIAS => $users,
+   		   FIELD => $rest{SUBKEY} || 'EmailAddress',
+   		   VALUE           => $value,
+   		   OPERATOR        => $op,
+   		   CASESENSITIVE   => 0,
+   		   @rest,
+   		  );
+  }
 
   # {{{ Tie to groups for tickets we care about
   $self->_SQLLimit(ALIAS => $groups,
@@ -573,17 +631,9 @@ sub _WatcherLimit {
   }
 
   $self->Join (ALIAS1 => $groups,  FIELD1 => 'id',
-	       ALIAS2 => $group_princs, FIELD2 => 'ObjectId');
-  $self->_SQLLimit(ALIAS => $group_princs,
-		   FIELD => 'PrincipalType',
-		   VALUE => 'Group',
-		   ENTRYAGGREGATOR => 'AND');
-  $self->Join( ALIAS1 => $group_princs, FIELD1 => 'id',
 	       ALIAS2 => $groupmembers, FIELD2 => 'GroupId');
 
   $self->Join( ALIAS1 => $groupmembers, FIELD1 => 'MemberId',
-	       ALIAS2 => $member_princs, FIELD2 => 'id');
-  $self->Join (ALIAS1 => $member_princs, FIELD1 => 'ObjectId',
 	       ALIAS2 => $users, FIELD2 => 'id');
 
  $self->_CloseParen;
@@ -679,6 +729,7 @@ sub _CustomFieldLimit {
     $CF->LimitToQueue( $q->Id );
     $queue = $q->Id;
   } else {
+    $field = $1 if $field =~ /^{(.+)}$/; # trim { }
     $CF->LimitToGlobal;
   }
   $CF->FindAllRows;
@@ -700,11 +751,19 @@ sub _CustomFieldLimit {
 
 
   my $null_columns_ok;
-  my $TicketCFs = $self->Join( TYPE   => 'left',
-			       ALIAS1 => 'main',
-			       FIELD1 => 'id',
-			       TABLE2 => 'TicketCustomFieldValues',
-			       FIELD2 => 'Ticket' );
+
+  my $TicketCFs;
+  # Perform one Join per CustomField
+  if ($self->{_sql_keywordalias}{$cfid}) {
+    $TicketCFs = $self->{_sql_keywordalias}{$cfid};
+  } else {
+    $TicketCFs = $self->{_sql_keywordalias}{$cfid} =
+      $self->Join( TYPE   => 'left',
+		   ALIAS1 => 'main',
+		   FIELD1 => 'id',
+		   TABLE2 => 'TicketCustomFieldValues',
+		   FIELD2 => 'Ticket' );
+  }
 
   $self->_OpenParen;
 
@@ -1373,11 +1432,18 @@ sub LimitLinkedFrom {
 		 TYPE => undef,
 		 @_);
 
+    # translate RT2 From/To naming to RT3 TicketSQL naming
+    my %fromToMap = qw(DependsOn DependentOn
+		       MemberOf  HasMember
+		       RefersTo  ReferredToBy);
+
+    my $type = $args{'TYPE'};
+    $type = $fromToMap{$type} if exists($fromToMap{$type});
 
     $self->Limit( FIELD => 'LinkedTo',
 		  TARGET => undef,
 		  BASE => ($args{'BASE'} || $args{'TICKET'}),
-		  TYPE => $args{'TYPE'},
+		  TYPE => $type,
 		  DESCRIPTION => $self->loc(
 		   "Tickets [_1] [_2]", $self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'})
 		  ),
@@ -1581,11 +1647,12 @@ Takes a paramhash of key/value pairs with the following keys:
 
 =over 4
 
-=item KEYWORDSELECT - KeywordSelect id
+=item CUSTOMFIELD - CustomField name or id.  If a name is passed, an additional
+parameter QUEUE may also be passed to distinguish the custom field.
 
-=item OPERATOR - (for KEYWORD only - KEYWORDSELECT operator is always `=')
+=item OPERATOR - The usual Limit operators
 
-=item KEYWORD - Keyword id
+=item VALUE - The value to compare against
 
 =back
 
@@ -1603,7 +1670,13 @@ sub LimitCustomField {
 
     use RT::CustomFields;
     my $CF = RT::CustomField->new( $self->CurrentUser );
-    $CF->Load( $args{CUSTOMFIELD} );
+    if ( $args{CUSTOMFIELD} =~ /^\d+$/) {
+	$CF->Load( $args{CUSTOMFIELD} );
+    }
+    else {
+	$CF->LoadByNameAndQueue( Name => $args{CUSTOMFIELD}, Queue => $args{QUEUE} );
+	$args{CUSTOMFIELD} = $CF->Id;
+    }
 
     #If we are looking to compare with a null value.
     if ( $args{'OPERATOR'} =~ /^is$/i ) {
@@ -1618,10 +1691,6 @@ sub LimitCustomField {
         $args{'DESCRIPTION'} ||= $self->loc("Custom field [_1] [_2] [_3]",  $CF->Name , $args{OPERATOR} , $args{VALUE});
     }
 
-#    my $index = $self->_NextIndex;
-#    %{ $self->{'TicketRestrictions'}{$index} } = %args;
-
-
     my $q = "";
     if ($CF->Queue) {
       my $qo = new RT::Queue( $self->CurrentUser );
@@ -1629,6 +1698,10 @@ sub LimitCustomField {
       $q = $qo->Name;
     }
 
+    my @rest;
+    @rest = ( ENTRYAGGREGATOR => 'AND' )
+      if ($CF->Type eq 'SelectMultiple');
+
     $self->Limit( VALUE => $args{VALUE},
 		  FIELD => "CF.".( $q
 			     ? $q . ".{" . $CF->Name . "}"
@@ -1636,11 +1709,11 @@ sub LimitCustomField {
 			   ),
 		  OPERATOR => $args{OPERATOR},
 		  CUSTOMFIELD => 1,
+		  @rest,
 		);
 
 
     $self->{'RecalcTicketLimits'} = 1;
-  #  return ($index);
 }
 
 # }}}
@@ -1924,12 +1997,19 @@ sub _RestrictionsToClauses {
     # defined $restriction->{'TARGET'} ?
     # $restriction->{TARGET} )
 
-    my $ea = $DefaultEA{$type};
+    my $ea = $restriction->{ENTRYAGGREGATOR} || $DefaultEA{$type} || "AND";
     if ( ref $ea ) {
       die "Invalid operator $op for $field ($type)"
 	unless exists $ea->{$op};
       $ea = $ea->{$op};
     }
+
+    # Each CustomField should be put into a different Clause so they
+    # are ANDed together.
+    if ($restriction->{CUSTOMFIELD}) {
+      $realfield = $field;
+    }
+
     exists $clause{$realfield} or $clause{$realfield} = [];
     # Escape Quotes
     $field =~ s!(['"])!\\$1!g;
@@ -1963,6 +2043,11 @@ sub _ProcessRestrictions {
     #a new search
     delete $self->{'TicketAliases'};
     delete $self->{'items_array'};                                                                                                                   
+    delete $self->{'item_map'};
+    delete $self->{'raw_rows'};
+    delete $self->{'rows'};
+    delete $self->{'count_all'};
+ 
     my $sql = $self->{_sql_query}; # Violating the _SQL namespace
     if (!$sql||$self->{'RecalcTicketLimits'}) {
       #  "Restrictions to Clauses Branch\n";
@@ -1995,12 +2080,12 @@ sub _BuildItemMap {
 
     delete $self->{'item_map'};
     if ($items->[0]) {
-    $self->{'item_map'}->{'first'} = $items->[0]->Id;
+    $self->{'item_map'}->{'first'} = $items->[0]->EffectiveId;
     while (my $item = shift @$items ) {
-        my $id = $item->Id;
+        my $id = $item->EffectiveId;
         $self->{'item_map'}->{$id}->{'defined'} = 1;
         $self->{'item_map'}->{$id}->{prev}  = $prev;
-        $self->{'item_map'}->{$id}->{next}  = $items->[0]->Id if ($items->[0]);
+        $self->{'item_map'}->{$id}->{next}  = $items->[0]->EffectiveId if ($items->[0]);
         $prev = $id;
     }
     $self->{'item_map'}->{'last'} = $prev;
diff --git a/rt/lib/RT/Tickets_Overlay_SQL.pm b/rt/lib/RT/Tickets_Overlay_SQL.pm
index d78a56db3..629e6da2d 100644
--- a/rt/lib/RT/Tickets_Overlay_SQL.pm
+++ b/rt/lib/RT/Tickets_Overlay_SQL.pm
@@ -29,6 +29,10 @@ use warnings;
 
 my %FIELDS = %{FIELDS()};
 my %dispatch = %{dispatch()};
+my %can_bundle = %{can_bundle()};
+
+# Lower Case version of FIELDS, for case insensitivity
+my %lcfields = map { ( lc($_) => $_ ) } (keys %FIELDS);
 
 sub _InitSQL {
   my $self = shift;
@@ -119,20 +123,57 @@ my $re_keyword = qr[$RE{delimited}{-delim=>qq{\'\"}}|(?:\{|\}|\w|\.)+];
 my $re_op     = qr[=|!=|>=|<=|>|<|(?i:IS NOT)|(?i:IS)|(?i:NOT LIKE)|(?i:LIKE)]; # long to short
 my $re_paren  = qr'\(|\)';
 
+sub _close_bundle
+{
+  my ($self, @bundle) = @_;
+  return unless @bundle;
+  if (@bundle == 1) {
+    $bundle[0]->{dispatch}->(
+                         $self,
+                         $bundle[0]->{key},
+                         $bundle[0]->{op},
+                         $bundle[0]->{val},
+                         SUBCLAUSE =>  "",
+                         ENTRYAGGREGATOR => $bundle[0]->{ea},
+                         SUBKEY => $bundle[0]->{subkey},
+                        );
+  } else {
+    my @args;
+    for my $chunk (@bundle) {
+      push @args, [
+          $chunk->{key},
+          $chunk->{op},
+          $chunk->{val},
+          SUBCLAUSE =>  "",
+          ENTRYAGGREGATOR => $chunk->{ea},
+          SUBKEY => $chunk->{subkey},
+      ];
+    }
+    $bundle[0]->{dispatch}->(
+        $self, \@args,
+    );
+  }
+}
+
 sub _parser {
   my ($self,$string) = @_;
   my $want = KEYWORD | PAREN;
   my $last = undef;
 
   my $depth = 0;
+  my @bundle;
 
   my ($ea,$key,$op,$value) = ("","","","");
 
+  # order of matches in the RE is important.. op should come early,
+  # because it has spaces in it.  otherwise "NOT LIKE" might be parsed
+  # as a keyword or value.
+
   while ($string =~ /(
                       $re_aggreg
+                      |$re_op
                       |$re_keyword
                       |$re_value
-                      |$re_op
                       |$re_paren
                      )/igx ) {
     my $val = $1;
@@ -156,10 +197,12 @@ sub _parser {
     # Parens are highest priority
     if ($current & PAREN) {
       if ($val eq "(") {
+        $self->_close_bundle(@bundle);  @bundle = ();
         $depth++;
         $self->_OpenParen;
 
       } else {
+        $self->_close_bundle(@bundle);  @bundle = ();
         $depth--;
         $self->_CloseParen;
       }
@@ -204,10 +247,9 @@ sub _parser {
    }
 
       my $class;
-      my ($stdkey) = grep { /^$key$/i } (keys %FIELDS);
-      if ($stdkey && exists $FIELDS{$stdkey}) {
+      if (exists $lcfields{lc $key}) {
+        $key = $lcfields{lc $key};
         $class = $FIELDS{$key}->[0];
-        $key = $stdkey;
       }
    # no longer have a default, since CF's are now a real class, not fallthrough
    # fixme: "default class" is not Generic.
@@ -219,20 +261,37 @@ sub _parser {
       die "No such dispatch method: $class"
         unless exists $dispatch{$class};
       my $sub = $dispatch{$class} || die;;
-      $sub->(
-             $self,
-             $key,
-             $op,
-             $val,
-             SUBCLAUSE =>  "",  # don't need anymore
-             ENTRYAGGREGATOR => $ea || "",
-             SUBKEY => $subkey,
-            );
+      if ($can_bundle{$class} &&
+          (!@bundle ||
+            ($bundle[-1]->{dispatch} == $sub &&
+             $bundle[-1]->{key} eq $key &&
+             $bundle[-1]->{subkey} eq $subkey)))
+      {
+          push @bundle, {
+              dispatch => $sub,
+              key      => $key,
+              op       => $op,
+              val      => $val,
+              ea       => $ea || "",
+              subkey   => $subkey,
+          };
+      } else {
+        $self->_close_bundle(@bundle);  @bundle = ();
+        $sub->(
+               $self,
+               $key,
+               $op,
+               $val,
+               SUBCLAUSE =>  "",  # don't need anymore
+               ENTRYAGGREGATOR => $ea || "",
+               SUBKEY => $subkey,
+              );
+      }
 
       $self->{_sql_looking_at}{lc $key} = 1;
-
+  
       ($ea,$key,$op,$value) = ("","","","");
-
+  
       $want = PAREN | AGGREG;
     } else {
       die "I'm lost";
@@ -241,6 +300,8 @@ sub _parser {
     $last = $current;
   } # while
 
+  $self->_close_bundle(@bundle);  @bundle = ();
+
   die "Incomplete query"
     unless (($want | PAREN) || ($want | KEYWORD));
 
@@ -330,6 +391,10 @@ sub FromSQL {
                          VALUE => 'ticket');
   }
 
+  # We never ever want to show deleted tickets
+  $self->SUPER::Limit(FIELD => 'Status' , OPERATOR => '!=', VALUE => 'deleted');
+
+
   # set SB's dirty flag
   $self->{'must_redo_search'} = 1;
   $self->{'RecalcTicketLimits'} = 0;                                           
diff --git a/rt/lib/RT/Transaction_Overlay.pm b/rt/lib/RT/Transaction_Overlay.pm
index 54bb326a9..9c9a2fd14 100644
--- a/rt/lib/RT/Transaction_Overlay.pm
+++ b/rt/lib/RT/Transaction_Overlay.pm
@@ -51,6 +51,8 @@ ok(require RT::Transaction);
 use strict;
 no warnings qw(redefine);
 
+use vars qw( %_BriefDescriptions );
+
 use RT::Attachments;
 
 # {{{ sub Create 
@@ -112,66 +114,13 @@ sub Create {
 
     #Provide a way to turn off scrips if we need to
     if ( $args{'ActivateScrips'} ) {
-
-        #We're really going to need a non-acled ticket for the scrips to work
-        my $TicketAsSystem = RT::Ticket->new($RT::SystemUser);
-        $TicketAsSystem->Load( $args{'Ticket'} )
-          || $RT::Logger->err("$self couldn't load ticket $args{'Ticket'}\n");
-
-        my $TransAsSystem = RT::Transaction->new($RT::SystemUser);
-        $TransAsSystem->Load( $self->id )
-          || $RT::Logger->err(
-            "$self couldn't load a copy of itself as superuser\n"); 
-        # {{{ Deal with Scrips
-
-        use RT::Scrips;
-        my $PossibleScrips = RT::Scrips->new($RT::SystemUser);
-
-        $PossibleScrips->LimitToQueue( $TicketAsSystem->QueueObj->Id )
-          ;                                  #Limit it to  $Ticket->QueueObj->Id
-        $PossibleScrips->LimitToGlobal()
-	    unless $TicketAsSystem->QueueObj->Disabled;    # or to "global"
-
-
-        $PossibleScrips->Limit(FIELD => "Stage", VALUE => "TransactionCreate");
-
-
-        my $ConditionsAlias = $PossibleScrips->NewAlias('ScripConditions');
-
-        $PossibleScrips->Join(
-            ALIAS1 => 'main',
-            FIELD1 => 'ScripCondition',
-            ALIAS2 => $ConditionsAlias,
-            FIELD2 => 'id'
+        require RT::Scrips;
+        RT::Scrips->new($RT::SystemUser)->Apply(
+            Stage       => 'TransactionCreate',
+            Type        => $args{'Type'},
+            Ticket      => $args{'Ticket'},
+            Transaction => $self->id,
         );
-
-        #We only want things where the scrip applies to this sort of transaction
-        $PossibleScrips->Limit(
-            ALIAS           => $ConditionsAlias,
-            FIELD           => 'ApplicableTransTypes',
-            OPERATOR        => 'LIKE',
-            VALUE           => $args{'Type'},
-            ENTRYAGGREGATOR => 'OR',
-        );
-
-        # Or where the scrip applies to any transaction
-        $PossibleScrips->Limit(
-            ALIAS           => $ConditionsAlias,
-            FIELD           => 'ApplicableTransTypes',
-            OPERATOR        => 'LIKE',
-            VALUE           => "Any",
-            ENTRYAGGREGATOR => 'OR',
-        );
-
-        #Iterate through each script and check it's applicability.
-
-        while ( my $Scrip = $PossibleScrips->Next() ) {
-            $Scrip->Apply (TicketObj => $TicketAsSystem,
-                           TransactionObj => $TransAsSystem);
-        }
-
-        # }}}
-
     }
 
     return ( $id, $self->loc("Transaction Created") );
@@ -535,16 +484,24 @@ sub BriefDescription {
         return ( $self->loc( "[_1] changed from [_2] to [_3]", $self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue ));
     }
 
-    if ( $type eq 'Correspond' ) {
-        return $self->loc("Correspondence added");
-    }
-
-    elsif ( $type eq 'Comment' ) {
-        return $self->loc("Comments added");
+    if (my $code = $_BriefDescriptions{$type}) {
+        return $code->($self);
     }
 
-    elsif ( $type eq 'CustomField' ) {
+    return $self->loc( "Default: [_1]/[_2] changed from [_3] to [_4]", $type, $self->Field, $self->OldValue, $self->NewValue );
+}
 
+%_BriefDescriptions = (
+    Correspond => sub {
+        my $self = shift;
+        return $self->loc("Correspondence added");
+    },
+    Comment => sub {
+        my $self = shift;
+        return $self->loc("Comments added");
+    },
+    CustomField => sub {
+        my $self = shift;
         my $field = $self->loc('CustomField');
 
         if ( $self->Field ) {
@@ -563,110 +520,127 @@ sub BriefDescription {
         else {
             return $self->loc("[_1] [_2] changed to [_3]", $field, $self->OldValue, $self->NewValue );
         }
-    }
-
-    elsif ( $type eq 'Untake' ) {
+    },
+    Untake => sub {
+        my $self = shift;
         return $self->loc("Untaken");
-    }
-
-    elsif ( $type eq "Take" ) {
+    },
+    Take => sub {
+        my $self = shift;
         return $self->loc("Taken");
-    }
-
-    elsif ( $type eq "Force" ) {
+    },
+    Force => sub {
+        my $self = shift;
         my $Old = RT::User->new( $self->CurrentUser );
         $Old->Load( $self->OldValue );
         my $New = RT::User->new( $self->CurrentUser );
         $New->Load( $self->NewValue );
 
         return $self->loc("Owner forcibly changed from [_1] to [_2]" , $Old->Name , $New->Name);
-    }
-    elsif ( $type eq "Steal" ) {
+    },
+    Steal => sub {
+        my $self = shift;
         my $Old = RT::User->new( $self->CurrentUser );
         $Old->Load( $self->OldValue );
         return $self->loc("Stolen from [_1] ",  $Old->Name);
-    }
-
-    elsif ( $type eq "Give" ) {
+    },
+    Give => sub {
+        my $self = shift;
         my $New = RT::User->new( $self->CurrentUser );
         $New->Load( $self->NewValue );
         return $self->loc( "Given to [_1]",  $New->Name );
-    }
-
-    elsif ( $type eq 'AddWatcher' ) {
+    },
+    AddWatcher => sub {
+        my $self = shift;
         my $principal = RT::Principal->new($self->CurrentUser);
         $principal->Load($self->NewValue);
         return $self->loc( "[_1] [_2] added", $self->Field, $principal->Object->Name);
-    }
-
-    elsif ( $type eq 'DelWatcher' ) {
+    },
+    DelWatcher => sub {
+        my $self = shift;
         my $principal = RT::Principal->new($self->CurrentUser);
         $principal->Load($self->OldValue);
         return $self->loc( "[_1] [_2] deleted", $self->Field, $principal->Object->Name);
-    }
-
-    elsif ( $type eq 'Subject' ) {
+    },
+    Subject => sub {
+        my $self = shift;
         return $self->loc( "Subject changed to [_1]", $self->Data );
-    }
+    },
+    AddLink => sub {
+        my $self = shift;
+        my $value;
+        if ( $self->NewValue ) {
+            my $URI = RT::URI->new( $self->CurrentUser );
+            $URI->FromURI( $self->NewValue );
+            if ( $URI->Resolver ) {
+                $value = $URI->Resolver->AsString;
+            }
+            else {
+                $value = $self->NewValue;
+            }
+            if ( $self->Field eq 'DependsOn' ) {
+                return $self->loc( "Dependency on [_1] added", $value );
+            }
+            elsif ( $self->Field eq 'DependedOnBy' ) {
+                return $self->loc( "Dependency by [_1] added", $value );
 
-    elsif ( $type eq 'AddLink' ) {
+            }
+            elsif ( $self->Field eq 'RefersTo' ) {
+                return $self->loc( "Reference to [_1] added", $value );
+            }
+            elsif ( $self->Field eq 'ReferredToBy' ) {
+                return $self->loc( "Reference by [_1] added", $value );
+            }
+            elsif ( $self->Field eq 'MemberOf' ) {
+                return $self->loc( "Membership in [_1] added", $value );
+            }
+            elsif ( $self->Field eq 'HasMember' ) {
+                return $self->loc( "Member [_1] added", $value );
+            }
+        }
+        else {
+            return ( $self->Data );
+        }
+    },
+    DeleteLink => sub {
+        my $self = shift;
         my $value;
-	if ($self->NewValue) {
-		my $URI = RT::URI->new($self->CurrentUser);
-		$URI->FromURI($self->NewValue);
-		if ($URI->Resolver) {
-			$value = $URI->Resolver->AsString;
-		} else {
-			$value = $self->NewValue;
-		}
-	}
-	if ($self->Field eq 'DependsOn') {
-		return $self->loc("Dependency on [_1] added",$value);
-	} elsif ($self->Field eq 'DependedOnBy') {
-		return $self->loc("Dependency by [_1] added",$value);
-		
-	} elsif ($self->Field eq 'RefersTo') {
-		return $self->loc("Reference to [_1] added",$value);
-	} elsif ($self->Field eq 'ReferredToBy') {
-		return $self->loc("Reference by [_1] added",$value);
-	} elsif ($self->Field eq 'MemberOf') {
-		return $self->loc("Membership in [_1] added",$value);
-	} elsif ($self->Field eq 'HasMember') {
-		return $self->loc("Member [_1] added",$value);
-	} else {
-        return ( $self->Data );
-	}
-    }
-    elsif ( $type eq 'DeleteLink' ) {
-    my $value;
-	if ($self->OldValue) {
-		my $URI = RT::URI->new($self->CurrentUser);
-		$URI->FromURI($self->OldValue);
-		if ($URI->Resolver) {
-			$value = $URI->Resolver->AsString;
-		} else {
-			$value = $self->OldValue;
-		}
-	}
-
-	if ($self->Field eq 'DependsOn') {
-		return $self->loc("Dependency on [_1] deleted",$value);
-	} elsif ($self->Field eq 'DependedOnBy') {
-		return $self->loc("Dependency by [_1] deleted",$value);
-		
-	} elsif ($self->Field eq 'RefersTo') {
-		return $self->loc("Reference to [_1] deleted",$value);
-	} elsif ($self->Field eq 'ReferredToBy') {
-		return $self->loc("Reference by [_1] deleted",$value);
-	} elsif ($self->Field eq 'MemberOf') {
-		return $self->loc("Membership in [_1] deleted",$value);
-	} elsif ($self->Field eq 'HasMember') {
-		return $self->loc("Member [_1] deleted",$value);
-	} else {
-        return ( $self->Data );
-	}
-    }
-    elsif ( $type eq 'Set' ) {
+        if ( $self->OldValue ) {
+            my $URI = RT::URI->new( $self->CurrentUser );
+            $URI->FromURI( $self->OldValue );
+            if ( $URI->Resolver ) {
+                $value = $URI->Resolver->AsString;
+            }
+            else {
+                $value = $self->OldValue;
+            }
+
+            if ( $self->Field eq 'DependsOn' ) {
+                return $self->loc( "Dependency on [_1] deleted", $value );
+            }
+            elsif ( $self->Field eq 'DependedOnBy' ) {
+                return $self->loc( "Dependency by [_1] deleted", $value );
+
+            }
+            elsif ( $self->Field eq 'RefersTo' ) {
+                return $self->loc( "Reference to [_1] deleted", $value );
+            }
+            elsif ( $self->Field eq 'ReferredToBy' ) {
+                return $self->loc( "Reference by [_1] deleted", $value );
+            }
+            elsif ( $self->Field eq 'MemberOf' ) {
+                return $self->loc( "Membership in [_1] deleted", $value );
+            }
+            elsif ( $self->Field eq 'HasMember' ) {
+                return $self->loc( "Member [_1] deleted", $value );
+            }
+        }
+        else {
+            return ( $self->Data );
+        }
+    },
+    Set => sub {
+        my $self = shift;
         if ( $self->Field eq 'Queue' ) {
             my $q1 = new RT::Queue( $self->CurrentUser );
             $q1->Load( $self->OldValue );
@@ -676,25 +650,22 @@ sub BriefDescription {
         }
 
         # Write the date/time change at local time:
-    elsif ($self->Field =~  /Due|Starts|Started|Told/) {
-        my $t1 = new RT::Date($self->CurrentUser);
-        $t1->Set(Format => 'ISO', Value => $self->NewValue);
-        my $t2 = new RT::Date($self->CurrentUser);
-        $t2->Set(Format => 'ISO', Value => $self->OldValue);
-        return $self->loc( "[_1] changed from [_2] to [_3]", $self->Field, $t2->AsString, $t1->AsString );
-    }
+        elsif ($self->Field =~  /Due|Starts|Started|Told/) {
+            my $t1 = new RT::Date($self->CurrentUser);
+            $t1->Set(Format => 'ISO', Value => $self->NewValue);
+            my $t2 = new RT::Date($self->CurrentUser);
+            $t2->Set(Format => 'ISO', Value => $self->OldValue);
+            return $self->loc( "[_1] changed from [_2] to [_3]", $self->Field, $t2->AsString, $t1->AsString );
+        }
         else {
             return $self->loc( "[_1] changed from [_2] to [_3]", $self->Field, $self->OldValue, $self->NewValue );
         }
-    }
-    elsif ( $type eq 'PurgeTransaction' ) {
+    },
+    PurgeTransaction => sub {
+        my $self = shift;
         return $self->loc("Transaction [_1] purged", $self->Data);
-    }
-    else {
-        return $self->loc( "Default: [_1]/[_2] changed from [_3] to [_4]", $type, $self->Field, $self->OldValue, $self->NewValue );
-
-    }
-}
+    },
+);
 
 # }}}
 
@@ -814,4 +785,12 @@ sub CurrentUserHasRight {
 
 # }}}
 
+# Transactions don't change. by adding this cache congif directiove, we don't lose pathalogically on long tickets.
+sub _CacheConfig {
+  {
+     'cache_p'        => 1,
+     'fast_update_p'  => 1,
+     'cache_for_sec'  => 180,
+  }
+}
 1;
diff --git a/rt/lib/RT/URI.pm b/rt/lib/RT/URI.pm
index 7acc1dc98..337a356aa 100644
--- a/rt/lib/RT/URI.pm
+++ b/rt/lib/RT/URI.pm
@@ -91,8 +91,10 @@ sub FromObject {
 
 =head2 FromURI <URI>
 
-Returns a local object id for this content.  You are expected to know what sort of object this is the Id 
-of 
+Returns a local object id for this content. You are expected to know
+what sort of object this is the Id of
+
+Returns true if everything is ok, otherwise false
 
 =cut
 
@@ -119,9 +121,12 @@ sub FromURI {
     
     unless ($self->Resolver->ParseURI($uri)) {
         $RT::Logger->warning("Resolver ".ref($self->Resolver)." could not parse $uri");
+        $self->{resolver} = undef; # clear resolver
     	return (undef);
     }
 
+return(1);
+
 }
 
 # }}}
diff --git a/rt/lib/RT/URI/fsck_com_rt.pm b/rt/lib/RT/URI/fsck_com_rt.pm
index 36e8f82fd..4035776ef 100644
--- a/rt/lib/RT/URI/fsck_com_rt.pm
+++ b/rt/lib/RT/URI/fsck_com_rt.pm
@@ -133,7 +133,7 @@ sub ParseURI {
     if ( $self->IsLocal) {
    
         my $local_uri_prefix = $self->LocalURIPrefix;
-    	if ($self->{'uri'} =~ /^$local_uri_prefix(\d+)$/) {
+    	if ($self->{'uri'} =~ /^$local_uri_prefix(\d+)$/i) {
     		my $id = $1;
     	
     
@@ -170,7 +170,7 @@ Returns undef otherwise.
 sub IsLocal {
 	my $self = shift;
         my $local_uri_prefix = $self->LocalURIPrefix;
-	if ($self->{'uri'} =~ /^$local_uri_prefix/) {
+	if ($self->{'uri'} =~ /^$local_uri_prefix/i) {
 		return 1;
     }
 	else {
@@ -214,7 +214,7 @@ Otherwise, return its URI
 
 sub HREF {
     my $self = shift;
-    if ($self->IsLocal) {
+    if ($self->IsLocal && $self->Object) {
         return ( $RT::WebURL . "Ticket/Display.html?id=".$self->Object->Id);
     }   
     else {
@@ -230,12 +230,11 @@ Returns either a localized string 'ticket #23' or the full URI if the object is
 
 sub AsString {
     my $self = shift;
-    if ($self->IsLocal) {
-	return $self->loc("ticket #[_1]", $self->Object->Id);
-
+    if ($self->IsLocal && $self->Object) {
+	    return $self->loc("ticket #[_1]", $self->Object->Id);
     }
     else {
-	return $self->Object->URI;
+	    return $self->URI;
     }
 }
 
diff --git a/rt/lib/RT/User_Overlay.pm b/rt/lib/RT/User_Overlay.pm
index e828ebd71..ba322cd4b 100644
--- a/rt/lib/RT/User_Overlay.pm
+++ b/rt/lib/RT/User_Overlay.pm
@@ -203,14 +203,16 @@ sub Create {
         @_    # get the real argumentlist
     );
 
-
-    $args{'EmailAddress'} = $self->CanonicalizeEmailAddress($args{'EmailAddress'});
-
     #Check the ACL
     unless ( $self->CurrentUser->HasRight(Right => 'AdminUsers', Object => $RT::System) ) {
         return ( 0, $self->loc('No permission to create users') );
     }
 
+    $args{'EmailAddress'} = $self->CanonicalizeEmailAddress($args{'EmailAddress'});
+    # if the user doesn't have a name defined, set it to the email address
+    $args{'Name'} = $args{'EmailAddress'} unless ($args{'Name'});
+
+
 
     # Privileged is no longer a column in users
     my $privileged = $args{'Privileged'};
@@ -234,7 +236,9 @@ sub Create {
 
     #TODO Specify some sensible defaults.
 
-    unless ( defined( $args{'Name'} ) ) {
+    unless ( $args{'Name'} ) {
+	use Data::Dumper;
+	$RT::Logger->crit(Dumper \%args);
         return ( 0, $self->loc("Must specify 'Name' attribute") );
     }
 
@@ -274,6 +278,7 @@ sub Create {
 
     #If the create failed.
     unless ($id) {
+        $RT::Handle->Rollback();
         $RT::Logger->error("Could not create a new user - " .join('-'. %args));
 
         return ( 0, $self->loc('Could not create user') );
@@ -729,7 +734,7 @@ sub ResetPassword {
 
     my $template = RT::Template->new( $self->CurrentUser );
 
-    if ( $self->IsPrivileged ) {
+    if ( $self->Privileged ) {
         $template->LoadGlobalTemplate('RT_PasswordChange_Privileged');
     }
     else {
@@ -929,7 +934,7 @@ sub GenerateRandomPassword {
 
     my $length = $min_length + int( rand( $max_length - $min_length ) );
 
-    my $char = $self->GenerateRandomNextChar( $total_sum, $start_freq );
+    my $char = $self->_GenerateRandomNextChar( $total_sum, $start_freq );
     my @word = ( $char + $a );
     for ( 2 .. $length ) {
         $char =
diff --git a/rt/lib/RT/Users_Overlay.pm b/rt/lib/RT/Users_Overlay.pm
index b397c3bc4..430e6d720 100644
--- a/rt/lib/RT/Users_Overlay.pm
+++ b/rt/lib/RT/Users_Overlay.pm
@@ -1,20 +1,19 @@
 # BEGIN LICENSE BLOCK
 # 
-# Copyright (c) 1996-2002 Jesse Vincent <jesse@bestpractical.com>
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
 # 
 # (Except where explictly superceded by other copyright notices)
 # 
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
 # been provided with this software, but in any event can be snarfed
-# from www.gnu.org
+# from www.gnu.org.
 # 
 # This work 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.
 # 
-# 
 # Unless otherwise specified, all modifications, corrections or
 # extensions to this work which alter its source code become the
 # property of Best Practical Solutions, LLC when submitted for
@@ -77,6 +76,20 @@ sub _Init {
 
 # }}}
 
+=head2 PrincipalsAlias
+
+Returns the string that represents this Users object's primary "Principals" alias.
+
+
+=cut
+
+sub PrincipalsAlias {
+    my $self = shift;
+    return($self->{'princalias'});
+
+}
+
+
 # {{{ sub _DoSearch 
 
 =head2 _DoSearch
@@ -233,8 +246,15 @@ sub WhoHaveRight {
                 push @privgroups, $Group->Id();
         }
 
+
+    if (@privgroups) {
         $self->WhoBelongToGroups(Groups => \@privgroups,
                                  IncludeSubgroupMembers => $args{'IncludeSubgroupMembers'});
+    }
+    else {
+	# We don't have any group that matches -- make it impossible.
+	$self->Limit( FIELD => 'Id', VALUE => 'IS', OPERATOR => 'NULL' );
+    }
 }
 
 # }}}
diff --git a/rt/lib/t/02regression.t b/rt/lib/t/02regression.t
index 62b4e9a69..4504cc76a 100644
--- a/rt/lib/t/02regression.t
+++ b/rt/lib/t/02regression.t
@@ -40,5 +40,5 @@ sub wanted_autogen { /^autogen.*\.t\z/s && require $_; }
 File::Find::find({wanted => \&wanted_regression}, 'lib/t/regression');
 sub wanted_regression { /^*\.t\z/s && require $_; }
 
-require "lib/t/03web.pl";
-require "lib/t/04_send_email.pl";
+require "/opt/rt3/lib/t/03web.pl";
+require "/opt/rt3/lib/t/04_send_email.pl";
diff --git a/rt/lib/t/02regression.t.in b/rt/lib/t/02regression.t.in
index 51cd7e378..8c050ff5b 100644
--- a/rt/lib/t/02regression.t.in
+++ b/rt/lib/t/02regression.t.in
@@ -40,5 +40,5 @@ sub wanted_autogen { /^autogen.*\.t\z/s && require $_; }
 File::Find::find({wanted => \&wanted_regression}, 'lib/t/regression');
 sub wanted_regression { /^*\.t\z/s && require $_; }
 
-require "lib/t/03web.pl";
-require "lib/t/04_send_email.pl";
+require "@RT_LIB_PATH@/t/03web.pl";
+require "@RT_LIB_PATH@/t/04_send_email.pl";
diff --git a/rt/lib/t/03web.pl b/rt/lib/t/03web.pl
index 4500ff281..94ad3e97e 100644
--- a/rt/lib/t/03web.pl
+++ b/rt/lib/t/03web.pl
@@ -5,6 +5,7 @@ use WWW::Mechanize;
 use HTTP::Request::Common;
 use HTTP::Cookies;
 use LWP;
+use Encode;
 
 my $cookie_jar = HTTP::Cookies->new;
 my $agent = WWW::Mechanize->new();
@@ -15,7 +16,7 @@ $agent->cookie_jar($cookie_jar);
 
 
 # get the top page
-my $url = "http://localhost/";
+my $url = "http://localhost".$RT::WebPath."/";
 $agent->get($url);
 
 is ($agent->{'status'}, 200, "Loaded a page");
@@ -37,6 +38,37 @@ is($agent->{'status'}, 200, "Fetched the page ok");
 ok( $agent->{'content'} =~ /Logout/i, "Found a logout link");
 
 
+
+$agent->get($url."Ticket/Create.html?Queue=1");
+is ($agent->{'status'}, 200, "Loaded Create.html");
+$agent->form(3);
+# Start with a string containing characters in latin1
+my $string = "I18N Web Testing æøå";
+Encode::from_to($string, 'iso-8859-1', 'utf8');
+$agent->field('Subject' => "Foo");
+$agent->field('Content' => $string);
+ok($agent->submit(), "Created new ticket with $string");
+
+ok( $agent->{'content'} =~ qr{$string} , "Found the content");
+
+$agent->get($url."Ticket/Create.html?Queue=1");
+is ($agent->{'status'}, 200, "Loaded Create.html");
+$agent->form(3);
+# Start with a string containing characters in latin1
+my $string = "I18N Web Testing æøå";
+Encode::from_to($string, 'iso-8859-1', 'utf8');
+$agent->field('Subject' => $string);
+$agent->field('Content' => "BAR");
+ok($agent->submit(), "Created new ticket with $string");
+
+ok( $agent->{'content'} =~ qr{$string} , "Found the content");
+
+
+
+# }}}
+
+
+
 use File::Find;
 find ( \&wanted , 'html/');
 
diff --git a/rt/lib/t/03web.pl.in b/rt/lib/t/03web.pl.in
index abe446eeb..4fe2d3ef3 100644
--- a/rt/lib/t/03web.pl.in
+++ b/rt/lib/t/03web.pl.in
@@ -5,6 +5,7 @@ use WWW::Mechanize;
 use HTTP::Request::Common;
 use HTTP::Cookies;
 use LWP;
+use Encode;
 
 my $cookie_jar = HTTP::Cookies->new;
 my $agent = WWW::Mechanize->new();
@@ -15,7 +16,7 @@ $agent->cookie_jar($cookie_jar);
 
 
 # get the top page
-my $url = "http://localhost/";
+my $url = "http://localhost".$RT::WebPath."/";
 $agent->get($url);
 
 is ($agent->{'status'}, 200, "Loaded a page");
@@ -37,6 +38,37 @@ is($agent->{'status'}, 200, "Fetched the page ok");
 ok( $agent->{'content'} =~ /Logout/i, "Found a logout link");
 
 
+
+$agent->get($url."Ticket/Create.html?Queue=1");
+is ($agent->{'status'}, 200, "Loaded Create.html");
+$agent->form(3);
+# Start with a string containing characters in latin1
+my $string = "I18N Web Testing æøå";
+Encode::from_to($string, 'iso-8859-1', 'utf8');
+$agent->field('Subject' => "Foo");
+$agent->field('Content' => $string);
+ok($agent->submit(), "Created new ticket with $string");
+
+ok( $agent->{'content'} =~ qr{$string} , "Found the content");
+
+$agent->get($url."Ticket/Create.html?Queue=1");
+is ($agent->{'status'}, 200, "Loaded Create.html");
+$agent->form(3);
+# Start with a string containing characters in latin1
+my $string = "I18N Web Testing æøå";
+Encode::from_to($string, 'iso-8859-1', 'utf8');
+$agent->field('Subject' => $string);
+$agent->field('Content' => "BAR");
+ok($agent->submit(), "Created new ticket with $string");
+
+ok( $agent->{'content'} =~ qr{$string} , "Found the content");
+
+
+
+# }}}
+
+
+
 use File::Find;
 find ( \&wanted , 'html/');
 
diff --git a/rt/lib/t/04_send_email.pl b/rt/lib/t/04_send_email.pl
index 46e3d7472..c384eedfa 100644
--- a/rt/lib/t/04_send_email.pl
+++ b/rt/lib/t/04_send_email.pl
@@ -33,6 +33,32 @@ sub RT::Action::SendEmail::SendMessage {
 # create a regular ticket
 
 my $parser = RT::EmailParser->new();
+
+
+# Let's test to make sure a multipart/report is processed correctly
+my $content =  `cat /opt/rt3/lib/t/data/multipart-report` || die "couldn't find new content";
+# be as much like the mail gateway as possible.
+use RT::Interface::Email;
+                                  
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+
+ok ($tick->Transactions->First->Content =~ /The original message was received/, "It's the bounce");
+
+
+# make sure it fires scrips.
+is ($#scrips_fired, 1, "Fired 2 scrips on ticket creation");
+
+undef @scrips_fired;
+
+
+
+
 $parser->ParseMIMEEntityFromScalar('From: root@localhost
 To: rt@example.com
 Subject: This is a test of new ticket creation as an unknown user
@@ -65,7 +91,7 @@ is ($#scrips_fired, 1, "Fired 2 scrips on ticket creation");
 # create an iso 8859-1 ticket
 @scrips_fired = ();
 
-my $content =  `cat ./lib/t/data/new-ticket-from-iso-8859-1` || die "couldn't find new content";
+my $content =  `cat /opt/rt3/lib/t/data/new-ticket-from-iso-8859-1` || die "couldn't find new content";
 
 
 
@@ -74,8 +100,9 @@ $parser->ParseMIMEEntityFromScalar($content);
 
 # be as much like the mail gateway as possible.
 use RT::Interface::Email;
-                                  
- RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+                           
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
@@ -103,17 +130,21 @@ $parser->ParseMIMEEntityFromScalar($content);
 ok ($id, $msg);
 
 
+
+
+
 # we need to swap out SendMessage to test the new things we care about;
 &iso8859_redef_sendmessage;
 $RT::EmailOutputEncoding = 'iso-8859-1';
 # create an iso 8859-1 ticket
 @scrips_fired = ();
 
-my $content =  `cat ./lib/t/data/new-ticket-from-iso-8859-1` || die "couldn't find new content";
+my $content =  `cat /opt/rt3/lib/t/data/new-ticket-from-iso-8859-1` || die "couldn't find new content";
 # be as much like the mail gateway as possible.
 use RT::Interface::Email;
                                   
- RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
@@ -202,7 +233,7 @@ sub iso8859_redef_sendmessage {
 
 # {{{ test a multipart alternative containing a text-html part with an umlaut
 
-my $content =  `cat ./lib/t/data/multipart-alternative-with-umlaut` || die "couldn't find new content";
+my $content =  `cat /opt/rt3/lib/t/data/multipart-alternative-with-umlaut` || die "couldn't find new content";
 
 $parser->ParseMIMEEntityFromScalar($content);
 
@@ -210,7 +241,8 @@ $parser->ParseMIMEEntityFromScalar($content);
 # be as much like the mail gateway as possible.
 &umlauts_redef_sendmessage;
 
-RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
@@ -229,7 +261,7 @@ sub umlauts_redef_sendmessage {
 
 # {{{ test a text-html message with an umlaut
 
-my $content =  `cat ./lib/t/data/text-html-with-umlaut` || die "couldn't find new content";
+my $content =  `cat /opt/rt3/lib/t/data/text-html-with-umlaut` || die "couldn't find new content";
 
 $parser->ParseMIMEEntityFromScalar($content);
 
@@ -237,7 +269,8 @@ $parser->ParseMIMEEntityFromScalar($content);
 # be as much like the mail gateway as possible.
 &text_html_umlauts_redef_sendmessage;
 
-RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
@@ -266,7 +299,7 @@ sub text_html_umlauts_redef_sendmessage {
 
 # {{{ test a text-html message with russian characters
 
-my $content =  `cat ./lib/t/data/text-html-in-russian` || die "couldn't find new content";
+my $content =  `cat /opt/rt3/lib/t/data/text-html-in-russian` || die "couldn't find new content";
 
 $parser->ParseMIMEEntityFromScalar($content);
 
@@ -274,7 +307,8 @@ $parser->ParseMIMEEntityFromScalar($content);
 # be as much like the mail gateway as possible.
 &text_html_russian_redef_sendmessage;
 
-RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
@@ -308,14 +342,15 @@ sub text_html_russian_redef_sendmessage {
 
 unshift (@RT::EmailInputEncodings, 'koi8-r');
 $RT::EmailOutputEncoding = 'koi8-r';
-my $content =  `cat ./lib/t/data/russian-subject-no-content-type` || die "couldn't find new content";
+my $content =  `cat /opt/rt3/lib/t/data/russian-subject-no-content-type` || die "couldn't find new content";
 
 $parser->ParseMIMEEntityFromScalar($content);
 
 
 # be as much like the mail gateway as possible.
 &text_plain_russian_redef_sendmessage;
-RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
@@ -346,7 +381,7 @@ $RT::EmailOutputEncoding = 'utf-8';
 
 # {{{ test a message containing a nested RFC 822 message
 
-my $content =  `cat ./lib/t/data/nested-rfc-822` || die "couldn't find new content";
+my $content =  `cat /opt/rt3/lib/t/data/nested-rfc-822` || die "couldn't find new content";
 ok ($content, "Loaded nested-rfc-822 to test");
 
 $parser->ParseMIMEEntityFromScalar($content);
@@ -354,7 +389,8 @@ $parser->ParseMIMEEntityFromScalar($content);
 
 # be as much like the mail gateway as possible.
 &text_plain_nested_redef_sendmessage;
-RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
@@ -382,7 +418,63 @@ sub text_plain_nested_redef_sendmessage {
 # }}}
 
 
+# {{{ test a multipart alternative containing a uuencoded mesage generated by lotus notes
+
+my $content =  `cat /opt/rt3/lib/t/data/notes-uuencoded` || die "couldn't find new content";
+
+$parser->ParseMIMEEntityFromScalar($content);
+
+
+# be as much like the mail gateway as possible.
+&notes_redef_sendmessage;
+
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+
+ok ($tick->Transactions->First->Content =~ /from Lotus Notes/, "We recorded the content right");
+is ($tick->Transactions->First->Attachments->Count , 3 , "Has three attachments");
+
+sub notes_redef_sendmessage {
+    no warnings qw/redefine/;
+    eval 'sub RT::Action::SendEmail::SendMessage { }';
+}
+
+# }}}
+
+# {{{ test a multipart that crashes the file-based mime-parser works
+
+my $content =  `cat /opt/rt3/lib/t/data/crashes-file-based-parser` || die "couldn't find new content";
+
+$parser->ParseMIMEEntityFromScalar($content);
+
+
+# be as much like the mail gateway as possible.
+&crashes_redef_sendmessage;
+
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+
+ok ($tick->Transactions->First->Content =~ /FYI/, "We recorded the content right");
+is ($tick->Transactions->First->Attachments->Count , 5 , "Has three attachments");
+
+sub crashes_redef_sendmessage {
+    no warnings qw/redefine/;
+    eval 'sub RT::Action::SendEmail::SendMessage { }';
+}
+
+
 
+# }}}
 
 # Don't taint the environment
 $everyone->PrincipalObj->RevokeRight(Right =>'SuperUser');
diff --git a/rt/lib/t/04_send_email.pl.in b/rt/lib/t/04_send_email.pl.in
index e171cdc9b..2bdf4c5a6 100644
--- a/rt/lib/t/04_send_email.pl.in
+++ b/rt/lib/t/04_send_email.pl.in
@@ -33,6 +33,32 @@ sub RT::Action::SendEmail::SendMessage {
 # create a regular ticket
 
 my $parser = RT::EmailParser->new();
+
+
+# Let's test to make sure a multipart/report is processed correctly
+my $content =  `cat @RT_LIB_PATH@/t/data/multipart-report` || die "couldn't find new content";
+# be as much like the mail gateway as possible.
+use RT::Interface::Email;
+                                  
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+
+ok ($tick->Transactions->First->Content =~ /The original message was received/, "It's the bounce");
+
+
+# make sure it fires scrips.
+is ($#scrips_fired, 1, "Fired 2 scrips on ticket creation");
+
+undef @scrips_fired;
+
+
+
+
 $parser->ParseMIMEEntityFromScalar('From: root@localhost
 To: rt@example.com
 Subject: This is a test of new ticket creation as an unknown user
@@ -65,7 +91,7 @@ is ($#scrips_fired, 1, "Fired 2 scrips on ticket creation");
 # create an iso 8859-1 ticket
 @scrips_fired = ();
 
-my $content =  `cat ./lib/t/data/new-ticket-from-iso-8859-1` || die "couldn't find new content";
+my $content =  `cat @RT_LIB_PATH@/t/data/new-ticket-from-iso-8859-1` || die "couldn't find new content";
 
 
 
@@ -74,8 +100,9 @@ $parser->ParseMIMEEntityFromScalar($content);
 
 # be as much like the mail gateway as possible.
 use RT::Interface::Email;
-                                  
- RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+                           
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
@@ -103,17 +130,21 @@ $parser->ParseMIMEEntityFromScalar($content);
 ok ($id, $msg);
 
 
+
+
+
 # we need to swap out SendMessage to test the new things we care about;
 &iso8859_redef_sendmessage;
 $RT::EmailOutputEncoding = 'iso-8859-1';
 # create an iso 8859-1 ticket
 @scrips_fired = ();
 
-my $content =  `cat ./lib/t/data/new-ticket-from-iso-8859-1` || die "couldn't find new content";
+my $content =  `cat @RT_LIB_PATH@/t/data/new-ticket-from-iso-8859-1` || die "couldn't find new content";
 # be as much like the mail gateway as possible.
 use RT::Interface::Email;
                                   
- RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
@@ -202,7 +233,7 @@ sub iso8859_redef_sendmessage {
 
 # {{{ test a multipart alternative containing a text-html part with an umlaut
 
-my $content =  `cat ./lib/t/data/multipart-alternative-with-umlaut` || die "couldn't find new content";
+my $content =  `cat @RT_LIB_PATH@/t/data/multipart-alternative-with-umlaut` || die "couldn't find new content";
 
 $parser->ParseMIMEEntityFromScalar($content);
 
@@ -210,7 +241,8 @@ $parser->ParseMIMEEntityFromScalar($content);
 # be as much like the mail gateway as possible.
 &umlauts_redef_sendmessage;
 
-RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
@@ -229,7 +261,7 @@ sub umlauts_redef_sendmessage {
 
 # {{{ test a text-html message with an umlaut
 
-my $content =  `cat ./lib/t/data/text-html-with-umlaut` || die "couldn't find new content";
+my $content =  `cat @RT_LIB_PATH@/t/data/text-html-with-umlaut` || die "couldn't find new content";
 
 $parser->ParseMIMEEntityFromScalar($content);
 
@@ -237,7 +269,8 @@ $parser->ParseMIMEEntityFromScalar($content);
 # be as much like the mail gateway as possible.
 &text_html_umlauts_redef_sendmessage;
 
-RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
@@ -266,7 +299,7 @@ sub text_html_umlauts_redef_sendmessage {
 
 # {{{ test a text-html message with russian characters
 
-my $content =  `cat ./lib/t/data/text-html-in-russian` || die "couldn't find new content";
+my $content =  `cat @RT_LIB_PATH@/t/data/text-html-in-russian` || die "couldn't find new content";
 
 $parser->ParseMIMEEntityFromScalar($content);
 
@@ -274,7 +307,8 @@ $parser->ParseMIMEEntityFromScalar($content);
 # be as much like the mail gateway as possible.
 &text_html_russian_redef_sendmessage;
 
-RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
@@ -308,14 +342,15 @@ sub text_html_russian_redef_sendmessage {
 
 unshift (@RT::EmailInputEncodings, 'koi8-r');
 $RT::EmailOutputEncoding = 'koi8-r';
-my $content =  `cat ./lib/t/data/russian-subject-no-content-type` || die "couldn't find new content";
+my $content =  `cat @RT_LIB_PATH@/t/data/russian-subject-no-content-type` || die "couldn't find new content";
 
 $parser->ParseMIMEEntityFromScalar($content);
 
 
 # be as much like the mail gateway as possible.
 &text_plain_russian_redef_sendmessage;
-RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
@@ -346,7 +381,7 @@ $RT::EmailOutputEncoding = 'utf-8';
 
 # {{{ test a message containing a nested RFC 822 message
 
-my $content =  `cat ./lib/t/data/nested-rfc-822` || die "couldn't find new content";
+my $content =  `cat @RT_LIB_PATH@/t/data/nested-rfc-822` || die "couldn't find new content";
 ok ($content, "Loaded nested-rfc-822 to test");
 
 $parser->ParseMIMEEntityFromScalar($content);
@@ -354,7 +389,8 @@ $parser->ParseMIMEEntityFromScalar($content);
 
 # be as much like the mail gateway as possible.
 &text_plain_nested_redef_sendmessage;
-RT::Interface::Email::Gateway(message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
@@ -382,7 +418,63 @@ sub text_plain_nested_redef_sendmessage {
 # }}}
 
 
+# {{{ test a multipart alternative containing a uuencoded mesage generated by lotus notes
+
+my $content =  `cat @RT_LIB_PATH@/t/data/notes-uuencoded` || die "couldn't find new content";
+
+$parser->ParseMIMEEntityFromScalar($content);
+
+
+# be as much like the mail gateway as possible.
+&notes_redef_sendmessage;
+
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+
+ok ($tick->Transactions->First->Content =~ /from Lotus Notes/, "We recorded the content right");
+is ($tick->Transactions->First->Attachments->Count , 3 , "Has three attachments");
+
+sub notes_redef_sendmessage {
+    no warnings qw/redefine/;
+    eval 'sub RT::Action::SendEmail::SendMessage { }';
+}
+
+# }}}
+
+# {{{ test a multipart that crashes the file-based mime-parser works
+
+my $content =  `cat @RT_LIB_PATH@/t/data/crashes-file-based-parser` || die "couldn't find new content";
+
+$parser->ParseMIMEEntityFromScalar($content);
+
+
+# be as much like the mail gateway as possible.
+&crashes_redef_sendmessage;
+
+my %args =        (message => $content, queue => 1, action => 'correspond');
+ RT::Interface::Email::Gateway(\%args);
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+
+ok ($tick->Transactions->First->Content =~ /FYI/, "We recorded the content right");
+is ($tick->Transactions->First->Attachments->Count , 5 , "Has three attachments");
+
+sub crashes_redef_sendmessage {
+    no warnings qw/redefine/;
+    eval 'sub RT::Action::SendEmail::SendMessage { }';
+}
+
+
 
+# }}}
 
 # Don't taint the environment
 $everyone->PrincipalObj->RevokeRight(Right =>'SuperUser');
diff --git a/rt/lib/t/data/crashes-file-based-parser b/rt/lib/t/data/crashes-file-based-parser
new file mode 100644
index 000000000..da1913eb9
--- /dev/null
+++ b/rt/lib/t/data/crashes-file-based-parser
@@ -0,0 +1,193 @@
+X-Real-To: <mitya@example.com>
+Received: from [194.87.5.31] (HELO sinbin.d-s.example.com)
+  by cgp.example.com (CommuniGate Pro SMTP 4.0.6/D4)
+  with ESMTP-TLS id 125035761 for mitya@example.com; Thu, 11 Dec 2003 15:17:46 +0300
+Received: (from daemon@localhost)
+	by sinbin.d-s.example.com (8.12.9p1/8.11.6) id hBBCHjN0031595
+	for mitya@example.com; Thu, 11 Dec 2003 15:17:45 +0300 (MSK)
+	(envelope-from noc@rt3.mx.example.com)
+Received: from d-s.example.com by sinbin.d-s.example.com with ESMTP id hBBCHjar031575;
+	(8.12.9p2/D) Thu, 11 Dec 2003 15:17:45 +0300 (MSK)
+X-Real-To: <mitya@example.com>
+Sender: <noc@rt3.mx.example.com> (Network Operation Center)
+To: mitya@example.com
+Date: Thu, 11 Dec 2003 15:17:45 +0300
+Message-ID: <redirect-137509289@d-s.example.com>
+X-Original-Return-Path: <vox19@b92.d-s.example.com>
+Received: from [194.87.0.16] (HELO mail.d-s.example.com)
+  by d-s.example.com (CommuniGate Pro SMTP 4.1.5/D1)
+  with ESMTP id 120757484 for noc@rt3.mx.example.com; Mon, 27 Oct 2003 09:40:53 +0300
+Received: from [194.87.0.22] (HELO moscvax.d-s.example.com)
+  by mail.d-s.example.com (CommuniGate Pro SMTP 4.1.5/D)
+  with ESMTP-TLS id 107945800 for noc@rt3.mx.example.com; Mon, 27 Oct 2003 09:40:53 +0300
+Received: from d-s.example.com (mx.d-s.example.com [194.87.0.32])
+	by moscvax.d-s.example.com (8.12.9/8.12.9) with ESMTP id h9R6erFm062621
+	for <security@d.example.com>; Mon, 27 Oct 2003 09:40:53 +0300 (MSK)
+	(envelope-from vox19@b92.d-s.example.com)
+Received: by d-s.example.com (CommuniGate Pro PIPE 4.1.5/D1)
+  with PIPE id 120757490; Mon, 27 Oct 2003 09:40:53 +0300
+Received: from [194.87.2.108] (HELO b92.d-s.example.com)
+  by d-s.example.com (CommuniGate Pro SMTP 4.1.5/D1)
+  with ESMTP-TLS id 120757480 for security@d.example.com; Mon, 27 Oct 2003 09:40:52 +0300
+Received: from b92.d-s.example.com (localhost [127.0.0.1])
+	by b92.d-s.example.com (8.12.8p1/8.12.3) with ESMTP id h9R6eqIe014669
+	for <security@d.example.com>; Mon, 27 Oct 2003 09:40:52 +0300 (MSK)
+	(envelope-from vox19@b92.d-s.example.com)
+Received: from localhost (localhost [[UNIX: localhost]])
+	by b92.d-s.example.com (8.12.8p1/8.12.3/Submit) id h9R6epst014668
+	for security@d.example.com; Mon, 27 Oct 2003 09:40:51 +0300 (MSK)
+From: "Stanislav" <drstas@d.example.com>
+Subject: Fwd: scanning my ports
+X-Original-Date: Mon, 27 Oct 2003 10:40:51 +0400
+User-Agent: KMail/1.5.4
+X-Original-To: security@d.example.com
+MIME-Version: 1.0
+Content-Type: Multipart/Mixed;
+  boundary="Boundary-00=_z3Ln/tUeUBipHgx"
+X-Original-Message-Id: <200310270940.51758.vox19@d.example.com>
+X-Spam-Checker-Version: SpamAssassin 2.60-jumbo.demos (1.212-2003-09-23-exp)
+X-Spam-Level: 
+X-Spam-Status: No, hits=-6.8 required=5.0 tests=BAYES_00,FROM_ENDS_IN_NUMS,
+	HTML_MESSAGE,SUBJECT_RT autolearn=ham version=2.60-jumbo.demos
+X-Spam-Report: -6.8 points, 5.0 required;
+	* -3.0 SUBJECT_RT Tracking system
+	*  1.0 FROM_ENDS_IN_NUMS From: ends in numbers
+	*  0.1 HTML_MESSAGE BODY: HTML included in message
+	* -4.9 BAYES_00 BODY: Bayesian spam probability is 0 to 1%
+	*      [score: 0.0000]
+
+
+--Boundary-00=_z3Ln/tUeUBipHgx
+Content-Type: text/plain;
+  charset="koi8-r"
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline
+
+
+FYI
+
+
+----------  Forwarded Message  ----------
+
+Subject: [DEMOS #12148] scanning my ports
+Date: Sunday 26 October 2003 20:19
+From: 1stwizard@isp.example.com
+To: no-reply@d-r.example.com
+
+This transaction appears to have no content
+
+-------------------------------------------------------
+
+
+
+-- 
+best wishes,
+
+Stanislav A. Mushkat			
+http://www.di.example.com
+
+--Boundary-00=_z3Ln/tUeUBipHgx
+Content-Type: text/plain;
+  charset="iso-8859-1";
+  name=" "
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline
+
+Somebody at IP 127.0.0.1 scanned my ports. 
+--Boundary-00=_z3Ln/tUeUBipHgx
+Content-Type: text/html;
+  charset="iso-8859-1";
+  name=" "
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline
+
+<HTML><HEAD>
+<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
+<META content="IncrediMail 1.0" name=GENERATOR>
+<!--IncrdiXMLRemarkStart>
+<IncrdiX-Info>
+<X-FID>BA285063-5BCE-11D4-AF8D-0050DAC67E11</X-FID>
+<X-FVER>2.0</X-FVER>
+<X-FIT>Letter</X-FIT>
+<X-FCOL>Elegant Paper</X-FCOL>
+<X-FCAT>Stationery</X-FCAT>
+<X-FDIS>Rice Fields</X-FDIS>
+<X-Extensions>SU1CTDEsNDEsgUmBSTAkkcGNgZmVTY0wNCxNhYUoiU0kOMEoTYGBjYEoJDSZnSyFhUksSU1CTDIsMCwsSU1CTDMsMCwsVHlwZVZlcnNpb24sMywxLjAs</X-Extensions>
+<X-BG>8E549F43-079D-11D8-B0F9-00B0D0B65B96</X-BG>
+<X-BGT>repeat</X-BGT>
+<X-BGC>#eff3f7</X-BGC>
+<X-BGPX>left</X-BGPX>
+<X-BGPY>0px</X-BGPY>
+<X-ASN>ANIM3D00-NONE-0000-0000-000000000000</X-ASN>
+<X-ASNF>0</X-ASNF>
+<X-ASH>ANIM3D00-NONE-0000-0000-000000000000</X-ASH>
+<X-ASHF>1</X-ASHF>
+<X-AN>6486DDE0-3EFD-11D4-BA3D-0050DAC68030</X-AN>
+<X-ANF>0</X-ANF>
+<X-AP>6486DDE0-3EFD-11D4-BA3D-0050DAC68030</X-AP>
+<X-APF>1</X-APF>
+<X-AD>C3C52140-4147-11D4-BA3D-0050DAC68030</X-AD>
+<X-ADF>0</X-ADF>
+<X-AUTO>X-ASN,X-ASH,X-AN,X-AP,X-AD</X-AUTO>
+<X-CNT>;</X-CNT>
+</IncrdiX-Info>
+<IncrdiXMLRemarkEnd-->
+</HEAD>
+<BODY style="BACKGROUND-POSITION: left 0px; FONT-SIZE: 12pt; MARGIN: 0px 10px 10px; COLOR: #00005b; BACKGROUND-REPEAT: repeat; FONT-FAMILY: Arial" text=#00005b bgColor=#eff3f7 background=cid:8E549F43-079D-11D8-B0F9-00B0D0B65B96 scroll=yes SIGCOLOR="0" X-ADF="0" X-AD="C3C52140-4147-11D4-BA3D-0050DAC68030" X-APF="1" X-AP="6486DDE0-3EFD-11D4-BA3D-0050DAC68030" X-ANF="0" X-AN="6486DDE0-3EFD-11D4-BA3D-0050DAC68030" X-ASHF="1" X-ASH="ANIM3D00-NONE-0000-0000-000000000000" X-ASNF="0" X-ASN="ANIM3D00-NONE-0000-0000-000000000000" X-FVER="2.0" X-FID="BA285063-5BCE-11D4-AF8D-0050DAC67E11" X-FIT="Letter" X-FCOL="Elegant Paper" X-FCAT="Elegant Paper" X-FDIS="Rice Fields" ORGYPOS="0">
+<TABLE id=INCREDIMAINTABLE cellSpacing=0 cellPadding=2 width="100%" border=0>
+<TBODY>
+<TR>
+<TD id=INCREDITEXTREGION style="PADDING-RIGHT: 0px; PADDING-LEFT: 0px; FONT-SIZE: 12pt; PADDING-BOTTOM: 0px; CURSOR: auto; PADDING-TOP: 0px" vAlign=top width="100%">
+<DIV>Somebody at IP 127.0.0.1 scanned my ports. </DIV>
+<DIV>&nbsp;</DIV>
+<DIV>&nbsp;</DIV></TD></TR>
+<TR>
+<TD id=INCREDIFOOTER width="100%">
+<TABLE cellSpacing=0 cellPadding=0 width="100%">
+<TBODY>
+<TR>
+<TD width="100%"></TD>
+<TD id=INCREDISOUND vAlign=bottom align=middle></TD>
+<TD id=INCREDIANIM vAlign=bottom align=middle></TD></TR></TBODY></TABLE></TD></TR></TBODY></TABLE></BODY></HTML>
+--Boundary-00=_z3Ln/tUeUBipHgx
+Content-Type: image/jpeg;
+  charset="iso-8859-1";
+  name="BackGrnd.jpg"
+Content-Transfer-Encoding: base64
+Content-Disposition: inline; filename="BackGrnd.jpg"
+
+/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFk
+b2JlAGTAAAAAAQMAEAMCAwYAAAHbAAAC1gAABZX/2wCEABALCwsMCxAMDBAX
+Dw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoXHh4jJSclIx4vLzMzLy9AQEBAQEBA
+QEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoaJjAjHh4eHiMw
+Ky4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIAGUAcwMBIgACEQED
+EQH/xACAAAEBAQEAAAAAAAAAAAAAAAAAAQIGAQEBAAAAAAAAAAAAAAAAAAAA
+ARABAAICAwEAAgMAAAAAAAAAAQARIQIxQRIiQDIQMFARAAICAgIBBAIDAQEA
+AAAAAAERACExQVFhcYGRobECEsHhMtHxEgEAAAAAAAAAAAAAAAAAAABQ/9oA
+DAMBAAIRAxEAAADtRZYE1ASghQFgUZoCkKSwLmhcllAEqkSkqFAlhUomoAS3
+IoJqFlDNpFEAQFE1AIVYAWIVKAJRNZpYCwVmmshKACA0CBAUCBYGwf/aAAgB
+AgABBQD8B/yP/9oACAEDAAEFAPz6/or8H//aAAgBAQABBQC2+ZeHjbD+saX6
+hwXeDW1Rg4xLLTa+m7ZiIEsI1MTiHP1dYpvFADiFM1/X6nq9byuwdPPz5oFo
+fWlEMQ9ULKrWq2ppG9Y2J6INQma9lVTRdlUKgHzXXSEECw1SYu5WsGoJPkis
+ZYpx31GvXZQ/JM3VwShzVTsp1EZbBI8LcaUSih86+s2Zl4Wp6+lAZnVsDkjd
+ku5m+lJTdXDG2SHM9M2wKX1YxsaZTTwmoVrYnqsMrM652yjs01K0mtbGAz6Y
+5dpfqNz06qpq5QNjiIjiZtbhtceNuf0jyeqGgu6rXMvI4omPWbPMYzEfMI+a
+xHnFvOP4/9oACAECAgY/AGP/2gAIAQMCBj8AY//aAAgBAQEGPwB72Yucb1Bf
+IhFEaeZ+xRXFQELN+HEUQdjU0Xn4g9gRCQcpw1yajGYsP/kFvUzvjUBWrIMF
+HI2OJQNEAjiEEFdTmfG/MTHq5RFOnpTV3kzCBx7x4YOD1AV5uYJvnqMA0hep
+jfwpYCwC4Bx3q55zeZRBCw9TkoIuHw78RdczSNH2mgqcLpRC+RASAkA3B13m
+cYd5mR84c/yOx4lWtRAZ6mGDhiP9WgXVyhWA+xDgMOWGMsTg/wBTz8SjjXrP
+8hHIlX1MZ6mDzgc/cIV/iyN1GBR0MQMKjnEzvvMz8mUkErKlfqU63iV+IKNH
+7mNZBLFQEpEDeDOV32IVn8WR4caoywqI2p695mbZzNUQIcKfk0bo+0NpCqn7
+CiQiNGXkdQen1DpjGeZ7WNw3pK+I93maCPc16+Zkf6XxMCsFwAkaiIB57vc/
+IAhZ/HqZBBbB0ZokAEOGxsYqBgPp8agQBu4VSMJdqx6SwDsGBrTmAR93uZGX
+6KePowEADAIjoX8gw459CICaW/MLGvodQfkDW71zBxRHtB3j3jC4PMIYoAgK
+NfPMCQNN7jCzvlzXPopzhQvNZY3CRya9ZrEFfRE0iCB5mscZuVYfKmAi94uE
+3Q8qfytQ7xD0svmFcmaxNPI8iMjh3pmF2HbzqeUi+YkiD/MrOl5LmbwPuWVf
+mXpv3hDH8qAjPpiZHXkRnSd6ZhB53mejzKV6US0K9TCCLyCeIhtETX5MsHBG
+JkD/ANiFkMCE2qGoCdZ8Q8AMGpYFqEhdhRIYH3CF3d1M/Mexma+4CwdQ2Ddc
+x0exAlmj04QUQd8QWLB/iB5GxmEg5TENVZqPYzFV8eHAy9T/AEc8a4n3Ov6g
+/VwvE6lpQ4VNysXzhS8esOO8w/rlF/rypjV3B5H1Knr8T//Z
+
+--Boundary-00=_z3Ln/tUeUBipHgx--
+
diff --git a/rt/lib/t/data/multipart-report b/rt/lib/t/data/multipart-report
new file mode 100644
index 000000000..538e0c880
--- /dev/null
+++ b/rt/lib/t/data/multipart-report
@@ -0,0 +1,66 @@
+Return-Path: <mailnull@example.com>
+Date: Sat, 23 Aug 2003 00:15:18 +0800 (SGT)
+From: Mail Delivery Subsystem <MAILER-DAEMON@other.example.com>
+Message-Id: <200308221615.CGA36111@mailbox.other.example.com>
+To: support@example.com
+MIME-Version: 1.0
+Content-Type: multipart/report; report-type=delivery-status;
+	boundary="CGA36111.1061568918/mailbox.other.example.com"
+Subject: Returned mail: User unknown
+Auto-Submitted: auto-generated (failure)
+
+This is a MIME-encapsulated message
+
+--CGA36111.1061568918/mailbox.other.example.com
+
+The original message was received at Sat, 23 Aug 2003 00:15:18 +0800 (SGT)
+from mx12.mcis.other.example.com [10.1.1.232]
+
+   ----- The following addresses had permanent delivery errors -----
+<jesmund>
+
+
+--CGA36111.1061568918/mailbox.other.example.com
+Content-Type: message/delivery-status
+
+Reporting-MTA: dns; mailbox.other.example.com
+Arrival-Date: Sat, 23 Aug 2003 00:15:18 +0800 (SGT)
+
+Final-Recipient: RFC822; jesmund@mailbox.other.example.com
+Action: failed
+Status: 5.1.1
+Remote-MTA: DNS; mail.mcis.other.example.com
+Diagnostic-Code: SMTP; 550 5.1.1 <jesmund>... User unknown
+Last-Attempt-Date: Sat, 23 Aug 2003 00:15:18 +0800 (SGT)
+
+--CGA36111.1061568918/mailbox.other.example.com
+Content-Type: message/rfc822
+
+Return-Path: <support@example.com>
+Received: from mx12.other.example.com (mx12.mcis.other.example.com [10.1.1.232])
+	by mailbox.other.example.com (Mirapoint Messaging Server MOS 3.3.3-GR)
+	with ESMTP id CGA36101;
+	Sat, 23 Aug 2003 00:15:17 +0800 (SGT)
+Received: from STATION13 (rhala.dsl.pe.net [64.38.69.104])
+	by mx12.other.example.com (8.12.9/8.12.9) with ESMTP id h7MGFGac020135
+	for <jesmund@other.example.com>; Sat, 23 Aug 2003 00:15:17 +0800
+Message-Id: <200308221615.h7MGFGac020135@mx12.other.example.com>
+From: <support@example.com>
+To: <jesmund@other.example.com>
+Subject: Thank you!
+Date: Fri, 22 Aug 2003 9:15:19 --0700
+X-MailScanner: Found to be clean
+Importance: Normal
+X-Mailer: Microsoft Outlook Express 6.00.2600.0000
+X-MSMail-Priority: Normal
+X-Priority: 3 (Normal)
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+	boundary="_NextPart_000_05684DA4"
+
+
+
+--_NextPart_000_05684DA4--
+
+--CGA36111.1061568918/mailbox.other.example.com--
+
diff --git a/rt/lib/t/data/notes-uuencoded b/rt/lib/t/data/notes-uuencoded
new file mode 100644
index 000000000..f27fdf8c0
--- /dev/null
+++ b/rt/lib/t/data/notes-uuencoded
@@ -0,0 +1,2368 @@
+Return-Path: <mhenrion@example.com>
+Delivered-To: j@pallas.eruditorum.org
+Received: from serveurlotus.example.com (unknown [213.56.193.67])
+	by pallas.eruditorum.org (Postfix) with SMTP id C21DB113AA
+	for <jesse@vendor.example.com>; Thu, 27 Nov 2003 10:55:58 -0500 (EST)
+Received: by serveurlotus.example.com(Lotus SMTP MTA v4.6.1  (569.2 2-6-1998))  id C1256DEB.00578401 ; Thu, 27 Nov 2003 16:55:54 +0100
+X-Lotus-FromDomain: DOMAINEQZ
+From: "Maxime HENRION" <mhenrion@example.com>
+To: jesse@vendor.example.com
+Cc: support@example.com
+Message-ID: <C1256DEB.005717B5.00@serveurlotus.example.com>
+Date: Thu, 27 Nov 2003 16:55:50 +0100
+Subject: Test e-mail which exhibits problems with RT
+X-Spam-Status: No, hits=-2.6 required=7.0
+	tests=BAYES_20
+	version=2.55
+X-Spam-Level: 
+X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp)
+Content-Length: 144905
+
+I send you this mail from Lotus Notes to make sure it'll exhibit the
+reported symptoms (lost attachment and body).  I Cc: it to our RT address
+to verify it does cause the reported problems.  Could you please mail me
+any replies to my personal e-mail, mux@example.org ?
+
+Thanks in advance,
+Maxime
+
+(See attached file: Naz_Head.jpg)
+
+(UUEncoded file named: Naz_Head.jpg follows)
+(Its format is: JPEG File Interchange )
+
+begin 644 Naz_Head.jpg
+M_]C_X``02D9)1@`!`@(```````#__@`>04-$(%-Y<W1E;7,@1&EG:71A;"!)
+M;6%G:6YG`/_``!$(!(D#$P,!(@`"$0$#$0'_VP"$``0"`P,#`@0#`P,$!`0$
+M!@H&!@4%!@P("0<*#@P/#PX,#@T0$A<3$!$5$0T.%!L4%1<8&1H9#Q,<'AP9
+M'A<9&1@!!@8&"0<)$0D)$248%1@E)24E)24E)24E)24E)24E)24E)24E)24E
+M)24E)24E)24E)24E)24E)24E)24E)24E)?_$`*(```$%`0$!`0``````````
+M``(``0,$!08'"`D0``$#`P,"!0($!`0$!0(""P$``A$#!"$2,4$%4083(F%Q
+M@9$',J&Q%"-"P5+1X?`5,V+Q"!8D-%,7<H(U0QACDI.B)29&5%8!`0$!`0$!
+M`0`````````````!`@,$!081`0$``@(#``$%`0$!`0$````!`A$A,0,205$$
+M$R(R87$%%5*!_]H`#`,!``(1`Q$`/P#Y`NZSM9#1`&(!5%[G\U"!WW5B](U:
+M0(GDE5'DR3$]R3,K53ZB?5?D$I,JNC=`\EN#.=PHMVZH^%$6?,)R3(`R90/K
+M:AB0!LHFG"&6Q`,?*(E\^"`"3.=TC6=J`)([!0M#=1U'X3.TZ9D[X**G=6=(
+MR82\]X,ZC`&"H0X"9<3W2:(&GOWF4+VLMN7D2T[[AR*E5<YPU?>56:T,@P<X
+M3^D#'*J+3:SC(<8[92\XB/5]U7VV$E/Z=(!.459_B7`0'&2F%<EX)D]R%7!)
+M:$B1.<S^B(G-PYFQQ/*7G$P9/M!5>9,:ML)Y$]AW03FLXR78A.VY=&=IV58&
+M2!^X1-BFWO)S""S_`!#M,.,'VV2;<.(C48"JR'#&!V*>!LUV_OLBK)KO@C5)
+M_9)M=V0(GNJSAL9"7!!E066UR&X)^BD%P06DOR%2&00WG=$WYSQ[JHL&Y&>9
+MQV3ON7.;ZG:@.).%59,Y.#[)H&F7.`/QNBK;:Y#?S$XP"4(N'[:S[Y46H-8<
+M2#C.4``SZA!V")I9?5=AVO[<IA7=J)C$[DJN""8!VY"3C$;@(6+?\4_83O@)
+MZ=U4;@$YQNJ0<>')L[3G?=15_P#BG`0"[/=(W;N3NJ@/J]>8PG=M(<!P%46Q
+M<5)C5!&Z%UR0^=6_,JJZ220[',XE!J(VD@HJZZZ<3J+H)X*=]T]K1ZLGW5*G
+M+G3N$[-()F/_`,1E0TN-N7@RUY)[R<)V7=1V=1^ZH@.,F<CA$V/+F8CLJBW6
+MO'^8/4[[HA=U,^L@K/?#GB-N4Y)Y)CW15RI>5'#_`)CL>Z`7CY]1=`[$Y50&
+M1,Y]BF&^G!]I07_XRII!#JD3]E(RO<NI.KM-30T@.=P"LV`T[C]D0<?+(DD$
+MR0D5<;?59(+S)P9)2_CJN_F.)VR51=+7@S'QA($N$#9$:-.^JR/63]5(R]K.
+MP*CM1]UF'7L,=H1M=+IY0:#[ZL'R'N$#9/\`\0N`3-1Q!.8*HD..1N@]0)@@
+MQ[HK39U"J2!YA`/*3>HU9_/O]5G,+F"9@>Z?5D3Q[HC2'4*PF'9=]T_\?6!'
+M\QQ^2LZG,[R-U(3Z):<<"9A*+K.I7(<2*KA]4XZI<:R[S78YE9H))$NB?=+4
+M(C.^4&O2ZM<:Y-=^F<PXJ9W6[ME1_E5ZA!V]1P%A%T-/'NI*+M(U3J/LLU8V
+M[?KM\#_[NK,?XBI7>(+\`#^+JQ[/*P/,<'SI`]E/1D[@'.`D*V[GKMZUP>;N
+MOW`#RJEQXCZB^KJ_BJ_P*CEG]1JD5PW5D?HJC2`V8,]P>$A.&PSKO41Z'7E;
+M/_649\0]18YO_K:I@Y]9@K%:\DDM/P.4#G._J)39IT%3Q#U(48;>U9]GE*WZ
+M_P!3:=;KVMCC65@L,M],_=3C\I9@^_*IIT-GX@ZL]P<;ZK#3)EY5YWB;J9`_
+M]75`]G9*YJB-%&!@G<=T?F!K`T3'LL4=(/$_5-`TWE4#_P"Y,?%750__`-[5
+MS[KG?,U-`)..W*$N$F=QW4TKH?\`S5U?7)O:@^J3O%/5&`3>5<_]2YQS_3,D
+M90OJ%L9S[*CI'>*^JA\_QE4>VN?[)4?%76`''^/KCC\Q7-.?WG[PHR\9[\!"
+M.I/C+K8R.I7(CL\J1OC?K[!J'5KH>WF$+DC5TM&#J_="YY=].$Z'8?\`G_Q(
+MTS_QJ\$\"L[_`#1?_4;Q8T"/$-^('_SN_P`UQ.O/`(3O?Z<\JZAR[=WXG>+V
+MMQXBZB)Y-R__`#3?_4[QHV2/$W4\<?Q3_P#-<,YTD-[(7N!.70!NAR[S_P"J
+M'C(;>)NJ0.]W4_S3?_5'QII.KQ/U0@;?^I?M]UPDN()DCLE2J/%6>?8Y5X-U
+MWP_$[QDTZO\`S+U0#L;A_P#FA/XI>-1__D_5!`__`-A_^:XBK4+A#=]LJ'62
+MT@@2H;KO:?XK^.`#'BCJ7_\`'=_FI&?B]XY;G_S1U$]OY[O\UYWYA+")*;6-
+MNRJ/26_C)X]8UI_\T]1@XCSBI/\`ZT_B$W;Q5?D]O-*\R#P`#O&R$UC,SDH/
+M4*?XX?B,R)\6]1$?_M4=3\<OQ&F6^+>HB?\`]IM^B\LU.W(D$*.M7\L$-DGW
+M31MZF_\`';\2*6H'Q3U!Q(P?.V_15S^./XE:-;O%O42WDFIM^B\K#_3).0>4
+M1>-,R,YB86M0Y>HL_'+\2"X$>*NH?_Q/]%+1_'7\1FNSXHO2>_F+RG5#,F/8
+M=U(S+@Z23\)J'+VNT_\`$'^)M.W:QOBJ[@=WJ3_]8;\3_P#_`*NZ_P#WUX]0
+M/\IOJ`13_P!8_P!_1.#E)>;X.DJE4`G4&CW]U>O/2YTY/95"VD\@O(8(_-NE
+M-(*I$\#ZJ.((DP#MRC?I!,.#@3P@<YLQ@D*)T!Y=!!'V3,!(!DR-NZ/!DDS_
+M`)H=3FOU#\Q$3*`2[U;F3^J9FG5DG!VA%J&"\3VA,PC.H3]4#")SCZ[IPZ6Y
+M.?;*9Q$P1">`3L`F@0!<W48QB)RDW\W8=DM)B0,C=(G'Y3OG*H)A]7YC]TGO
+M`;J&VTI8`@$@QRF`F)A`6HZ<&,(`XM$-),HM.TR`DTC)_9`@]H'?NB(U9)D*
+M)Q`R/L"G:]K3D$_*"3`)DS'(_P`X2>0`")).=10F`,SG9*`Y^DS'9#0VZM.'
+M@0=NZ51S@XYR=PG9IF'?1!4<)QF4!`X&<E.9%3F2.Z$Z-(:!$Y30-4SL@D`]
+M<ETSPD2`X%Q$#W3.>TTQ@",3R5'[%V$1,Y\B8S&Q0:S^;4")R9@(2^`<P>T[
+M)`@^IH&GL%%2-?@B8^J;60">3]T+=C.J1O@_ND<_U8'(RJ<E))W`GE,?=Q,<
+M%+TDD@R?E-$C#A[A0$`79&/JF!<U^X^B'!YRDUOJ(*HF#AY@Q&$6KDNB%"0"
+M9!2<8.3)Y4$CW2\MF#^Z8.(;!&KZIG-P-L#A"V6F=8!/""0%I.0/<(75#/:=
+M@$.F:>8`/)3#3OJ'T*(D:[&8B=Y4C7$"&M,J)L1Q'>$3@1L8'L@8F3@1]4+G
+M&(VX2(#3^:>\%`?54P9'SNJHZ;B.^4]0D@X!(0@..QCZIR`V"7-.)0)CR6P1
+MDHFZ@-_B<H`WU1IGV3L#L0!`X)*:41=.<GX1,?\`TYA``=<C`&0EI/,90&PN
+M+IQMR437D#8PHVM)B'>VZ.>9&?T32';4C&4FN.24S!G,B.4@"7P-D4;CZ02G
+MUQM@'E,`7,D-F-TP:03#B)XW03TW0`3/=.ZHT[20HJ0(=JP<83U=1'Y??=$I
+M.>20)B/JF<\D^W<!#)DQB>$)+@3@D=@@.1J(C\RGI.TTAL`%!;@U'@&8)4U<
+M#40..%*LA!WKD@?,JQ3<*;=6J?959U`<%*HXBG,R=MU`JM05+G42#[QLF>8:
+M0V"1O)W4;):`V3G>$4@$&()W0/YA+H&$S"=Q$'E,X34D!.&MF<>_NBIZ.G5.
+M1C=6*32XZSMP56:Z#I#1/=6ZKAY8:!$;PI:1(7B!)SV0O<T[&(0BF-&<#W05
+M7:G%L8&%!,UPC`$_*?7)))4+&NF9P-@0G/R,]D!$M)DGX"3G%P`W^NZ!A;OB
+M1[R@JU"1F(;VP4!ET'TD3[("8?&,^R`O!&,&=@A($`P2.TJFAQZAK/V0U()]
+M),\A(QITP/C>$+R(+B![(IY&DQN$!U$=OE*99G;V0ZVDSVXE7:0I$@DY12W5
+MF0.P47ID%(N@03]R@.1DL'ZH<X)#L\RF$;:O]$Y8WR]0J-+I_+&?^R&A.=`G
+M'T0!\2[)*%P,1D`<(7N`@$_JB40>#_DD#^G"C!R=_NE()$'?!0$X%Q$?NF(&
+MY!&.Z;;4`24#RYH!!)]T#U7A@,\JNZ-6?ND\EYDN$]T]-[\MUX[0M!/;+?E,
+MUDQ/WW2=4TGL3V*!SAQQS*(D:WD$P?T4M+8@29W]E!J],CE'J&H`.XR$&G0<
+M!1:(&R/6WL%#1TFDTEW'9%#/\?Z)N+I/<F"1,=]7^JI5G`N(';`[*[?$.<7[
+MS]BJ=8@'&$J('2&YF3QV0`-+`XD3VY1<D$@'=`T>L@B%`B9(SQF$/&TIHT[B
+M2F;!.3'L4#N:&P[?Y*:1!WD=T\S(.3\RA,:2Z.?T3:GD%I&Y&/A*8&9CLA(S
+M$B/S8PG<V88QIQGOE$T-CV#9SB>Q&R<Z09CW(40V@#9$=IP/>%0;B#F#CW14
+MXU>QX4?]1X*3,$X(]U!,_2'0XS"%S@'20(CLAJF'#E)I!!:2J$XMS(]L(26P
+M)S[(W._EENH@3J4+FR2/902.TZCP(V[HH!!C(*A;#@)V[<J6F<R3J&,3NA3@
+MXW*8",@'(15&AQD8C.\H>8@M^"J#<1&QE-SL0.Y2(SOLE'IF<($XB<F/="8+
+M(<<3$I/TD@`SVE!I].))"@-S@1(=@I"=)SNA((80#*(/$`M:!`SE%%,`#7&$
+MCN"YT_51DNB`Z0#CA.0X_5(AQ&`23[E/L1W/"C@.).T9*3S+@1/9/\.AM!.2
+M0">$3P0[)"%VD9!D#<I./I[IL2'5$`R$!&&SQA"UQTF73/'"?.($%#8Y&3//
+MV35`XOU&)2):`?3!'U0O,M$B`>^Q02!D;F2>P0&(,[I,:XB-4B,Q"1#@=49"
+M`J9!R^3&R=Q;J$(0(GD(*A<(='U2"1V&;#_-`R(D;%,\DL$B>Z$;X!55)G48
+M1-'IS&VZ'48&#GE,<C<0@(`:\`QVDI`;[<]TP=B00G:7"<;\A`;M1:2,8R<I
+M-&0)@H0XZ(<-(B>4[2[5`(GL902`.:#ID(2,Y$D]D33Z().$(F,'ZH#:"6GU
+MB9_*F$SO]$F-)V,%(.Y`D(:'4P0`?LD`[2)D`]]B@#LX:1*<O<&ZH4$C9&YP
+M-LIW.#6R'&>Y0D02-.>ZE<\NHM`:)'/*HBDQ.=MYW2C,D[(2XN;))"32XM(!
+M@'906+-LEU4DXF(2TD$$.)3AX91:WDY0DM#?RQQNI5A]!+@3/PA<=\@HGNCT
+M_?/"AJG$#8^V$"UD8!4E,P9;G':5$"`?5()X4[6.@.VCLJ@2UT`B?E.3#`9$
+M\93:H/I/SA.P-J$``R#NH+%KAVLOD=H4I<9@SW[*(0T>EV/8)5'$N&9![K-Y
+M5+J<68(R-TTB=0P4!<-`@(`YVH24$],SF?A"]P#MQG&4&J'">$+W>H09SA%%
+MEI(D"=RA+9;D_;!3.+B\DCG9,]X(,.T@;?'R@6Y,]L94L4_X4N=Z7R(`V4.M
+MPR2W*=S@:@&P(VE5."?KTR1!)F4#LB"-LRBG<B2[L@>YH`$85"!G@'ZIG0<D
+M093'&<#@"4%0AI@D`<`=T#D1F0/N4P!!@#?>>$S8D3*L=2_@!58+)U4MTC6:
+MD3JYVX00'T[YS\I4W`\H9#G"8^`D\M#AZ9^40Y<7'@?.4#@)!R24Q,]FI$ZG
+M$_W5#XW$S'=,UHF(W0DB#DY3R0V29(W0"78)*KU':R`9]D]=^O\`*%&60\1P
+M@,#5`VGNG`:T.,9!30`!#N,I0!N(`5*.B*/G!U5ITC)&<_91N+<D-)[0FJ/D
+M:08`[H]#O+%0QI)@9S]MU`#1+A,Q^RE9'FD$'M'91@MU&-^ZD9N-.,;JHNTM
+M(I@02B]/8H:=1K6``''LB\T=C]D.%FX.EKA@B,$JE<`AT3SPKEXZ"1&?M]53
+M>!J(G`*54-6=H"B/I?MDA2U3DG&.%&]Y=!+H(/W4`N_/@&$B6R'#=)[AJ(P(
+M0-$/@"9303HF0TR/T2:06!I)E*3!$8E-K=K!``;QE`0#9`P8]L(&_(CV*<&0
+M<C.X"9Y]7QB0B">.9.4[OR['L"A<1$`A&_\`(.!.854F-(:?4?A$6AKX[;Y3
+M4G.#,[=RE.!(CNB'=&X.R8F``,)2X',0)"B)).T245(..>=L)B<D`#M`3:M(
+M!=,@)Z1!?F<'_50)K1)!Q(V[J0#3B#F,(6.;KV(Y,%)S@0UHQP54['4<?B,H
+M69)!/M/=)I(AS@8VRAD:P!CNH)<O/ID$<)F$APR?A-JAL2?NE,9P(RJ&=.H\
+M&=I1-$`N<2)4=1\F03_F4=,X$$E`SP-1$D0A$C&(/.RE(:7.<-_?A1D&8&_O
+MRHIWDZ2-1&GE)C@TN!.3^B3=&D-(`_NA,-<X!V"(E$(;S(SV1/:]CAK:1(D>
+MXX0'<B$;WZC@N(C??"*6'")R3_LIVN`S(,(&N$#VY2$G(;DX0IR3[2.R<.DF
+M!!_=(D!@')R?=-/IDD2>R!SAP),>R1Y(SV]D+V_S2V))YE,T:F@`X"J)&2UI
+M'._*1Q$&/<!,(C_JVV28(:<0.5%Z%J)!)W`R5&).!&F4;@9,Y![<*,#!,[[!
+M!)IFG)?Z@8CV0Y`T@C2A@3NG;Z3\<DJB2GOO\Y0S(`(!)[*2E2<^D][`3HR2
+MA>7:9,`;0H&WR`(.(1;;D",8*:)Q)D;F4B#.'8!GL@?+7$'OPDV"_.3.Z6"1
+MM]1E.ULSD2,90$TES#\@83M&3&W=,USA$R0=RG`T@.!WVA%Z$UQ+CB!Q[I.(
+M.`([^R<.EFW/*`DEYDX(@RB:%.8,&/V1MD8R<*,B'`[QPIV#^43D#]D`Y#H.
+MK`Y"*J#$F028DY4?YJN,`=N457!<=I&<H:,]V)X`WA'3#L'^F=OA0@2=AE3!
+MIY=$F-DIH3CJ?K(V/")H$>K/919@P1DJ5^EEO`(G(W]EEI%5(+ISE!4=D<$'
+MO"6OU1Q*:)=G!Y5036G7)VVE76.<+5S1I')=L2J;"00`.5,S\D@C2$^!JAQL
+M('LCH,<&E\@$YCZ(6-UNB7$!2@[-&`-]U*';.2#`CLE3'I$@'O/"8P!G'=%2
+M=J>9^<J*>L#$#$8P@:3DD@J5X<##?Z9)([J(?F_+)B<H'#@203@9P@GU';/9
+M,V&R0,)V9SC&4(=X<'#,R.%&3#0XC$P$3\N(`V^B&GM@XVGO^BL!C!`&GLG)
+M:W!@Q&>9E`#IG<`\2FEN=L?JB%4($Y"!Q#8&1[]TG26`Z<`;=DG0&C[HH0,R
+M<?)Y35&D.(Q!V]T\C5($@#(*C>('(.\*H?`@'O.-T+RUOIW,Y@J:XHU:5.G4
+MJTRT5&ZV3R-I^X4+H+B<Y']T`O(;Z1N.1A*GIDNP2>XE.3J('`Y"6&M^NZ:-
+M!)RYV0"G!``&DB1DH8&7'`,C"8N],ZAP)0._2XB`94%5\NTCGE27)?2+6N8X
+M:A(GLJ\`F)S^ZH8P!`R-Y3G\V)D#^Z0(&,F#O[)IY)A$&T@&08QRF=!:,$3&
+MR<^H0TD$_JHWY]!W^J!W-);!&#NG.EI!U9!VRD0)`G/"%P;$@2(0&!%0.F09
+MG*.F`#^:3O""FT$`D[X^5)1G4!@GL54K1HU8I-!F81><.Q48H]W9&,92\D?X
+MBJ<+=T&!T-,R,:>%1J!DDQ,=RKEW`<?OO$*C5/IDG._RIEVJ-_J&IW(A0OES
+MRXF(X4E0Z7&"@<1,[\DJ`'`E_ORFP=C]?9$1#@9R.Z%_]1`D%$,?R:@WV^4P
+M'IP<<RG@@>Y,X1/]1)!`&T(H6Q'..QW0^^Q]D1/],`X2!<<GY0(F""9]I*=W
+MJW,H`)P08'MF%)HSF2$03&`M(DP,D),+@(!GA"X:6D#/PF&XP280V1:><_\`
+M9,2Z?RC!X1%IRX?=,-R<G&44B#JU`$=\[)Z8]1,!/MC2<^^$FGUS*H36#5J@
+M>PF$\>HC()V2<'!V/ZNZ%WYL#G[J=D$W#=S')'9"-B=C*+,3JG[X2:#C(SW5
+M#M(U>TIB8P"!GE-F<F2.0A(P29RH@HVC?=&PZ03`)G[(2&R`"B$!XAV$#G)S
+MB.4+XU;P-]^4[MB0[9`XXU`^Q"*%QB"79C&4AAV^1^R0,#3L92<3&=T"!VEQ
+MR8PF$AH+73*0D`XG.4M0:X#2-X0/.CC"(.]6/R]X3"`<[I-;#8G<3]43_"=,
+MZAE/,M(C?NDQTMT_E'9(X;D@$HH1(/.T;)VQF<&<E-!UY)`^-U(R0)B1R)R4
+M-&:/3O,>V4[`6QB3[!%I=H+P"&SM*6HZ1'',($\PR(.3@A0P9)VCA&XNG)R<
+MPF,$02,?HB$&XD_7NF@',9[)2=CE%`'LBI#5J&6ZX`&PV48>-7JV`_5/HV@?
+M/ND02Z7?TG[H&@#W._PB@Z@):1'=.)>_)@\^Z%Q/YG8(Y0%@$@N`G$#NDTRU
+MT<\IAB3.3G>4[7"#N0).$47]43.)_1$PB(C$J,8#8@2C9,SM_9-(-@]$`X.4
+M),C`(#433@M]S*&)=&<]D!TA)S^O)4U9H;;AHDSV4%(@`;F.%+6=Z`>$#,$.
+MW]H*8DDDG;M"'S#C2,#L93R3D"2@(0'#5$B813J<6R/="P'RR22!P$S8:^)U
+M3N2I5D2'3,1B=E$^"[_5&YP:6@A19F7#"FE$`8`'.91%IJX$B!RGI_FG)C,!
+M$[\LP?8@JHC@M#OS23W1EQ\L#&IW9"XR?=3T*;=1>/\`,(:%0:6CDR)_LG<0
+MVI^:.=U-TW^&_C!_$BJ]G^&F!)/`SQ*&]=JJ%PHLI@>G0&Q`[+*HR<S!Q$1V
+M2I8,S!WRD_@^W9,Z)W.!R$$SJKV,<`2)PHF:@09&QY1-_*)SPA(&Y,$X0`:A
+MG&V^439))!B-ONF>-1R?9*EI%3+CGA`FEQ<XR/\`[=Y]U')!(P8'U1@M!_*/
+M24-2=0(CZ*APXQ$^\\(9D%HYQ*1<X52[4<\SND\Z3D$1[H'JDBCD`9W49>-,
+MF)V^4]1PT;DD\("XZC'`50@_U#A!)@S.=H.R-[A$0@#@3+>4@=[M3`"3+1&3
+MPA.6:8R,9.Z6`-1.)0D#\VK3\;H?].02[!$D)G3IG4)/[IO=HE(@@29^B:*1
+M/H+7`P=@HW5"`/T`3$Z0=1.=@%%4(+OR[[JAWU'P-1,1@=DP=#L"1L"F`]$$
+M92S)'M`0$[!!!(GE".2?L4A&LD"('=,X1!D%"<B#@(XCW2U9.-\D#,I!HX;`
+M3%IF,=Q[JAG'U`P=7NBU!QC?]4="B^L:@:6-T@N.IP'[\J(D8;R#DSNHFA`,
+MU!L'&P[%2TY:X\Z3E0@@.#IF.94K&D.#OJ51>HU7-I-;)V1^>[N5'2CRQZ47
+MI_PE39__`%9N'D/=#RP$&8Y"H5B7`Q!`5V]U$G<-E4:N9_:%:(B!I^,B5&X0
+M,G<X")Q,EHP.T*-Y.N3E3M">TF`/U2]$&"9A._5IR1"C.-B?A!:Z76MZ-;76
+MIZQ!@1.?<**Y(\USF&&N<2`,0%'J=J&`.9*62XD.^J!9($../E)PSD'YE,XD
+MNDRB+6Z))`)X'"!-B(+A(3THR2<`Y4;?2Z"W[HV^Q@^Z"S>OH5?+\FB:4,AV
+M9U'NH-!D$`CW]DAD`';W2DB1/"!'TGA(3J&4P^#M".1Y8](!)C5R@'5#N8([
+MRF$1W[A,^-A)A)L[`9/97L'3`,^J/9.08^>4(])@G$Y"<OQ''N5`4PTQ!^4$
+MD&=7"1<`-MT,Y)_=`33(R[9,'D$]BF<1H&($YRA82XG`[!!('29&%/\`RBQI
+M8\E_(55N'0I&D<2(SW0'4\P[Q'NA=ZFSR/U3%W])P=\H*C@#(&>Z*<D[G<]^
+M4GET9,'ND'-)!,@'E+C!D($W\@@DGNG]4G'/*;:8&.Y0.X02$EK<<)-/IF<C
+M"%I(<8)!/"(9B.40]$_TPG^1,80L=)V2<1,D2500D$@P!RC`_E[0%&'%QDHV
+MN.?[*`M;M&((_9`7&#Z?NC:^&;Y/":H6^6#MG:=D`L).YB?>$U,AI)+)]I0N
+M($[3[IV#4'`D-Q(0,-\B/E.2-0Y[H6D'?CB40(B/LB[."7&(`^2CDSG([(#&
+M'$Q"9CFAWM^J"0D"=+O_`,(2:0?S8'<(7?D(9/=.TC>4!'_F?&P3M<"P`M)^
+M2A:2?Z))^J<'.PCF4!O@Q`C&TIP&C+2<H:L0#&^$I`P=O9`9?-4FJ3`Q(3L(
+M$P#"C`WU$8[J0;XS/!0('21&_=&'M,G`GOR@I-+\0,]\(@2<@"0@8M:9,D@"
+M)".A3>\:PUQCF$``@G`)[C"ELW%E20.,%`U>)(,[<)FZ/,!R8X2;-2H07'/)
+M35&C9@R-R"LJ:Z?JJ2TQ.P*9CR6^H;8A`6%P&H93M(@B2/A4&7NSI,81:VBD
+MT'NA$@#!":,:AN@DID/J1$QMA7':12TM>2!C3W5>T8&F7#<9A2G2'&-H6:HF
+M$MRTQIY&(2<YIV,F<GNAV;VG8%,[4!L0$"+V!N9DA/3=@'5*9^EK1DAW/`0T
+M8TDR@DU`8!W0X)TR@^1CY10!ZCD%`TF"3$;(>Y(&??=/Z=XD#W3TV4RQQ=4T
+MXD")DJ@=,TX'U!&4G%L@D$GB.4G$EH``B(D(20!I`@2@<N;!&P[90MR<'ZG=
+M"Z)`F)Y2>R'8F3]95#U`"TZG#V0,PZ8$?*0_*3J.-P4.H3D0!PF@3F1(D%!`
+M#?2_=$]K1SO[H"V`3[\(AA^724AEN(":)$G.>4Q`!+I]D(9X$21N8^5(:C?X
+M=M(TV`M.K5SMRH@T22YQ([RHZKPY\3LJ<&J$D[8&<8E1P-8WA&]L1O\`"$M$
+MG]B@*#I/;N$AW.2D[)B?\DQ:6MW0)L3!E+2`X<#;*;=VK:$>F6R3\(A%I`R)
+M!0./H)X]RG.N8:Z!V"`G_J'Q*+L[20"6N`'*4-+IG;@SE+3ODD']$T@;$_=$
+M2!KB3!)PBI2'1D3P2@IO(;@[CDJ1FJ<F>RHO4R`P`MV]T6IO^']4%/5H$3]D
+M_J[G[(BS?.:1O/Q_=4*S@XR($*W7+M6,?14;C\Y&DGY5JHWU&%NJ(^%$7-#I
+MR0.$YVWPAR';@1P0L[#.=,D$IAM,I.P/5L4FB1#<HA\%LM.1WY2IN#!,"8Y`
+M,(>^2(14?+TDO#@Z,0-S[H!D$B3]CA/Z9P))XF4C`.WW3"`[9OP-T!:O5I.(
+M1#,9Y0-`@D'(XSE/I$3O&=T$D9R0,IJD<#`[(7B!`B$=(,\LN/YAPJ'I!U2J
+M*8DEV!">H?5$Q'=0OB=C\IV%LB0?NH%J&`,?7=$7-F2?JHW?G@`QS"?1J@9D
+MJB1L.$EWZ%,XAQP)]X0-P-!DQ[E(@3B4#D09!QP$[BTO_P`/LHR`'01(&Y[)
+M`-@@GX"@,1M(*>`!.('9,`(B-]H2>WU3)^$BCH,+@ZH&ZVL$NCA"!)W.=D`D
+M'00[W1:?^HY]T00T[$B?E+3F9$]D).ET.]/8IC_TNYG=4.W!CT@C8%%B9G[%
+M`X-<R6N.N=CLG#@&`-&D]QRBE`'YMW?JFP!,@_5`!)U%TPGR9$X*"0P693-@
+M?Z(!,Q)E2TFZJ;R)EL&%-!\0`#)[)$2-OL@,GU`PDP&),`GGLB)6Z2,3CE)C
+M!/K='O,J*($@X.^5(&.))B1SA-B2"!I$Y358!R(E#)`.R%[P70W[=D4G#TG&
+M90AI&3F4G>QWW":(W(*(-K!L-SW3U"<9P$-*9!=.$_J@DG!]]U03HTB1*%D!
+MV3RA;/<3\IVM($3R@-S9'SC*?3&<GV0L<>2=T\S)XVC=`8$"03GW1`B3.2>5
+M%Z_\7UE$9`$\\I%&X"(+H[(@V!+=O9!,M&04B3.`?NH#C5MN4[!G<?"$O=$#
+MA%ZM.K<JFSN:22<>T)P(;.#W]D`+RB),[[Y]BH!((!$<;RI`T#^J9$!"T@5`
+M73],HF/=,Y!^5*IV"&^P1.!@:1]45NUU6HUC07%YC9=5XA\,ML^@T+NWU.>/
+M^;G8(;<B\1ZHDE`]K33&"'3O*L7`)I``[;X4,$#)P@4X$[IZ;7.J0`F)$!HG
+MZE3V[?+]7/)02.>Z-,$1V3=I](*4R[5!^H2?CC(S,+*E$.YQ\IW`SB<[RDZH
+M=S$H"\:).)[H",QB8W[)I+1)Y[(=8/!TQPG-22TP2`J%F#W"9@)9'*1=+>\E
+M(&,\(!J-,B3CVV3M\H:PXEQ/Y<PA+FEI$X/ZI:R0#P/9`M3G-+-6V8"$F3I)
+M4C'28'I("C>\-&"#)[H`@DZM0'UW4FC^5)W/*`N;,@Q.QA25GD4FM+@0-E1$
+MT%(^HYA,YS8$G[%#4>W5G,>Z`J0+WP2T?*!P+1GGA"7Q//NB#M3I=$#N@%TD
+MQ!RG:USCI`)+N(3!X)[?&ZBJU@`()U`]U4*N2'Z9/V43_>$^H&3,<E,2#@DY
+M0.<F(,IR0&['*#4.47HF0!'MRJA-<2(X*1,E,7``CGLEJR<J!Y($<(0X@1Q\
+MI@8D).TM;W11&/H4],M#7`_1`(<S!QV2;!WF408(SC(0F1.(GE*!,ZM^$8-$
+M4OR&9R^2@%D-/$?*FI.=,PK_`(;O^GV;WU+KIS;MQ$4W>8YI8?V(^BJA[#<$
+MAH:'&8_LJBRS\H_-]"G^CONI*8.@:=D\.[JFCU]&K))!6=<?.RM7;W!SLM!&
+M?=4:CP!)Q&.RS5#4<<`"04#G21.4GO<&P,#V35`=>D#;.>R(:);)D92TYAQ(
+MA!K]&DXGE.^IZ]1.Z!R!,.)PF<9,R!\IB[N)^J)Q@B0W81D($^7.DD.)RF;^
+M:)@\04P))P!/$[):])!/?=%'`WGZ)W21Q'8*.G.HD;GNB:^#B`"$B#@D`0/E
+M)K3&'8Y0M?`!$%*F_.VRI$KJ!IL8\/:0\2,R1F,J-ATY_1,2.3GY3/?+G.TY
+M*BG`DSRI,MIZ=,3O[J/5&",I.>"W5'^B"322V<9V*'!=`R1^J8&<B&CV2+A#
+M06&>2/ZD0[V@B&#$X3P]N)`U;CN@U0Z2)^4J;QKEPD?/*`J8$8W3G.^.R&1C
+MD#9,7("JZ]6EV^V4I]6T=RH^W/'RGUB`!L<(I'7$YSRG+8XF,X*'40P`#,I%
+M[33].LCW0&?R`G?A.]L8&2>R%C@21$QV3Z@1IB/D[(&>),SO[I>Q$)B]H<1.
+MV)28<@%THAR8;M\J2A7?1:XL.7")W46IH:0D'M+<`Y0&T^H%PD'=&`"2"0!\
+MH&N!SF2,E.UX+>/HBBI-8714<=/[(]88``R)P8*B#MO5]$S'%I)X/?\`[()G
+M?E(#<_J@(AA`S[HO^:XBF)`R8[=U%JP1(A`[LNVVX3M:#]DVK.0!'*9KP'D[
+M(@H),`E.[:(@[Y3,(U9C&-)2>9S@1P4X4F3I):)C,)__`,4)VN&DQPA9$:9B
+M>$T'`R2'8^$;&SZ9^J'>=(,?ME%OVA`U,,#<C?ORIJ=,:H,=P%'`<^1D=R-E
+M*P@-G>4`09+@G>`3@$?(1@M!)(WY"3CB8&>4#.C@P1S")T!QS(3-=C2(SR43
+ML.:"=N`B!,1)<E'JD1!/T1:(/K*38+ITF!^B+#,<!M@\93LT3)=D;!$Q[F&6
+MN(/',J%I&F!N?E1IJ^%7@=<H/<]K!3>"3JA>B^);RA4Z'>U650PD"F`>?9>5
+M,:0[21!"MUJ]>G;MM:CB&-,D'!!*K-G*.H3Y<;25!+M1G96*CFU&@-!$;F=U
+M#6;MF)X470:;"]_J,0%9!ETM<"/=10&MW$A'Z2"1.,PI06HM9I+M^YPDYVI"
+M-(W)SPDV)&!CLHIH<3))_P`DY=-/1((!^J9^_?5]4[9PUS`9._=4`TP,#;A*
+M1K./H$;O*#X9VV/=`"0\@8/)0(@@0D-3H!2V.9(F/A!L3R$!8+#$2-\;H9(S
+MJR.`E`TQ.^Z1;Z?3QA`F/(!=@\Y3$MEWOLF([;'VW0D@$1N3,!4.T@C+FYX3
+MO=#(:Z1V0.$,G8<ISH`B2>WL$`Y_J'RFT@&>QV2<3'YLM3``3!^$#$$3$)BZ
+M&C$\)-$P(.4#W9[J@G8+CO/"K/WVS\J0R#O]"FT:<@C=$!$X''*3\")`"+2!
+M_6)[[(3ZAGO"!,@1Z8)[A(F#@#(^4Y$@-#I*1WF2/:4`N/K&!/LGT`.$I.)!
+M`;N>$Y;@B9A$[",_W3$>D0#*(&"?9,V3OP@30`22#^R0`DX3_P!)DI$``.(P
+M?;*='!I^<^Z><P)^I3:8.K_91.R9:,#.4":[,B1*GHRYP)!+?E!1`#@:@+AR
+M&F%+0:21)`GVV6D:%N'&BTAKG#O*/2__`.-WW3TZ)+!,CZE/Y/N?N5>$X5+W
+M0U\`&!LXB/T5&IVP<[;<J]>Z=;HG'?95:H<6N&J`-_4LU5>J6R=(`GA`UPU3
+MSP0C<,'T_=!I,@$1/"BE-,$:@2W8B>4PC2X:=_N$B#IEP&<PA:(+N/E1"=#6
+M:MP.$HT[Y]T0$&/NF;)!Q'P531_26@#9-@.U$Q[!.#)R,PA=F,GMOM_N4#\2
+M`#/"+2W48!RDUN9F<[SNG9^4`JA3+6M+6C3LAV<=Q"*H/5#<M]\(1EIWX4!&
+M)&F(.Z9X:#N93@&,!$]K#&)PAI&V0?T@IS);,SRAW=O`E'`#9VT^Z!-C2,`#
+MW0L#6N]61S[HR"!O^9"\^H``GZH$/RR8R=DOVC"+27F2Z"A].@"<E`XV`!W[
+MI$RR!$!/R0"/=,\0W,YY0`"9'Z)G#(AWM\IR,.)&>/9(#U`SL4#M#G"29(]\
+MH2(@29/8HV-BGJ.T[IG#TG=`-,0W&?:43@Z"1J,')3.PPC^KY39`]C@^Z!P6
+MP<;^Z;MW[IS,$AWU*0F2<!`V8G`A.W$D1E.(CY2<X&)@1&R!Q,D.(QE.);C8
+M'!GA"UL9))X1G\QB806ZUG:MZ+1O67M-]>H]S7VP:060<'WD*FP;C'R1*.LW
+M)#H!&9!0-(:XG3(CN@)T$0/J!RBTC6886G_#RHX!_-()W2)@S/\`F$!O>3F(
+MDS`$(#(/'RG:9.2?<)%OTR@1W_1$"X/:0)0T\D_NB+=9@`YW0+(G5B0G/YRX
+M#XW3D:J<$NG?;W2U$$S!&^/KR@31+-0(D',82$:-I,X"=K26''Z[IP(=!=C;
+M<_Y(IQ/L9C*)C9:!)SPE,8TS/;9/2:X#L9F5=(3@X``#'"-S8.7<*32UU*)R
+M.R'2';MF,RHIG4R,$1&^=D_I`&,C*DIM+O:<H7:FNVV32&(UAA=.>4=4`50U
+MC1,3/=,,.D`X_J*>OZB=R1G]%+RL5WODZ1W&,B$X<YIP9U[R=T[V&#J.V,('
+M-B()E72K%!Q:&N:8TYG?,JQ>75>_O*EY=NFI4RX@``G[*I1IR#@>YE2-_P"8
+M""94T@2[33,`R!A/2.LZS@#9-<5'U:HF2[8'X&%)IAH:(]/92KHC(VF>X128
+M$GU>R%V'`<\II.DP"H$]TOB?5VV2<9&J3'9-!+06DB3ND`YQ)B>#[JD+5!!^
+MIRDQVH@.<1[IIC9N/W2&",`DG<H:,20^03.^2F<0(#9^4X):`Z9B2<80@<DH
+ML$YP#1!SRD#G\T=D,``:O@2?9)\AL''8]T$]Y1J4"P/+':FBH-+@<'/W4#7D
+MR282<6C`,%VW*$D-)@&)'/*0.7G43P/9#K<1,C)W'*;?;[IL#DXW5#Z\:=1S
+MW3/)U#)CL=@F$N<&EPR([H2TAK@?J@(%T8=]$Y>7-`D1*3,?F<)2):_!@>RJ
+M&&,Q@;J#S`YP=ICV5BXKTS0TM;\E5?1,D'XE('J/$Q(@\!(U(;&H#ZIBT`3]
+M0AC$%TJAR\E\"#'.R;4!L,X3`AN(XR4(C)@[J`G.)&`W`^$['2\@C(&(*9I@
+M3!/RG8UFF9W1`EV9D8V2EQ=O*8MGMVW3Y$@1/[H'UX2:X3!/W3``M^".4VSA
+MJ]0]T!DB3`QLF>['.>R;TZ@0=^4PWD@F>`$#ZL1!@29[(FN(//P90$3,@0>"
+MEIT^D9CD(B4.'((CWW4U")]IG95F07'2I:8`]6Y$*PZ:U!X=1:9C'9'J_P"K
+M]%%;,8Z@USG"2I/*I_X@IJ)Q^%>\@2,3[\*G4]3L`EQ=/*O7H&HXP.9W56A7
+M=;W(JM]4;`JU52K&DP#W`0/!TC(R.>%(]TDDF0=T!,NF?NH!.^<@X3<;P2G&
+M"#''=.W2=6K&,(&+L'`SW2&_"8DN@0!'LF9@QD#V0.#B0V9X1,:PYTY/NASP
+M"DW?)_1!)`!@SGF4U,G3S]$1!+@&`D^PDH6983G"J'):3GYW2DS\(=68(&$1
+MP=OD%%*8$9R>$[SO'9,TPX#VYY0D^QR@7],$E/3U!TZL^R8`:9RDT9,X]T03
+MR"P;GC!W34R2X8^Z1([8Y2#@#Z.$4XG9VR0<3)SE)I!$$`9V'"0/](D"5`[7
+M'5+C!'LE4<7.`WX3&/,+@/NE4@B6SODH!;D3J/.R<[S((Y2&G5D3/,I#\\EV
+M_(0+48F1":>=H/=.XX/J@H9&0#]^4#D[N)D\IB&D>K<G$#"$D$#;4B=+J(]4
+M0<!`G:M\"4AG,#'*%ID;\(VCTZ?N@8.`YCLBWR(E,6@-[IP"0`#GL$#M/JP?
+MHB+BT1CV0AL-D;!*,R1\90'J!!).3ND"-67`-Y($H<EI$0$JA:'P!I;VF4$E
+M4L:]S*1+F#\KR()'PHBWTZL0A!!/:/='Z=1AVH#F$#`RZ=S[(R=3VAVW.5&"
+M-1D[(J=33K#`(<()*`B8,`9"=A@!TG[H9D?YI.R`$$K"?*F/9)KA,P$$^C3/
+M.#E$T`28P,*@Z>\3G[),P@88$"3^RD8)]_K*`F#\HTJ:@TEQ#),]LRE86]6X
+MJM928YQ=@87J/X=?A_YY9<WU.2=@6[)&<L_5Q'2^@WE[6:VC;N(//^PNQM/P
+MZJFS];8=`V^5[!TGPO:VM`-IT6-@1`"U&=+9Y<:`I<Y.G*Y99/G6^\$7MLXM
+M;2+O=/TWP'U"X`=4HD-'?NOHJGT&E4?E@*OV_0*#:8_EA3WA[9/F^\\`WS&%
+MS:9)VC"I6O@7JE1QFB6^T[+ZAJ]!HZ/RC[*J[H%!ACRQE/>+,LX\!L_PUJNM
+M]=1V>T#O\KG_`!7X3J=(`<8=G;_9]U]']4MF6EN8;@+R[Q9:U>J=<IT?+AC3
+M^8+/OOX8V[WMYYT_PU=W-EY[:1B"29QNL.^M7VU=S'M(B0%](])Z)2I=)#?+
+M`;IB(7E/XM]&IVMX:E,0#N`KN6-8YW;SZBW2#G!*,["#./LB<'#,R)Y4=36U
+MP(R#NHZA<[47$G/)2],2TP(2(Q+DS<M```[*J>F?3VSLDT""9,'L4+02=.T=
+MDX.D$9^2@:63J:=^)3/#0,'/'LF<(,`3'ND[6!$R`-]T41_(,XA,T`MXP/[I
+M9&(!`0C83"H<Y$'Z)$-!`)GVG`2>.8$'CLE3INU"/LIMJ8VG:W40,8F$VG!/
+M;:5.VVJ.W!RI_P"#TB"TR>W98]X[3]/E5(0[D8'"8@-(@Y[=LJ^RS#:8)$_!
+MW41LW;_V5F<,OTV<4F:-0SGLB>9=C,;'LC?;5&Y:PP.0=_=1.I.#B-,'?LM2
+MQQN&4-Z`T$S*CJN)>&C')37))=C!43B0)'9:C(G!L8@@\(2T`P<1W3-,Y<,>
+MQ2<Z`<[X506ML@$`0/H@IMR`?V0@SG(5[I5A5O*=>HQ]%C:-,N.MX;/L)W*@
+MID8D&$.!DC/:4[QB3./="#O\;2G_`%#@1.?OA$T&1/*!L3`XW`*<R&X_?"*$
+M@D$=_NEB),]DP(U29B$1AS2[,#W1#``D@\)VC&`@!DD*6UKU+>X;6HF',Y(!
+M_0_*&T9;G&VR+&C^W=-J).)!/9-+L$\]R@?2"Z&R`=I2:1ORFGN8^B=OYL">
+M4!TIF6_*E:,R-Q^JB;F"7P/A2TR"<2"#NK$:-!O\H8_4H]/M^I0VU1IH-+G-
+MGW"/73_QM^RNS:.[@SJ='SF51KENJ`(^JNWS0'&#,?,*C5B-QV2FD3C!P/NA
+M<0'3(1.D849(Y60GYV"8@!^EY"9GYM]CLGJM(JG5AWNBFEL@!(#.0CI/%-^L
+ML94'(=,(6[B-CW0(!NN#D)-_-$8&Z;!?,?5$&P/<Y]D06H:P`Z('=(G,QN4)
+M(VREZ1!C94.8)G^Z(!I.K5D[H6@'(3@%K0`,*!G$:O44B!$SONAJ`.=$A(M:
+MP01QO*H(8R4XTQM/U3AK74\[\A,2'1/`C`"&BALR"1&92(R8_P`D/]$$_HG:
+MV&]OE`4;;DI1G?U!"<`:1$_5,P'.,J`OZN\)$M+3DI?TEO$]T,$[H";$3.X3
+MC?<;(3\Q]4MAC[RJ=$6P2-0W^Z%PTG<=MD3@0W>.Y*`[$%Q^94-$./5&=TY]
+M6"YL<Y2HZ)/F:M,?TF,IFQH@$S\IM3@\DY'9&V`)P2HHQV/>43>8)RB#P7',
+M`I,,`_XB<&4V(@G*$>DY!)E!(UKC@[)SO&J!W(0M#B<S":3QF-I5!-:[:-^R
+M8[P8,)A)G@A(MG<[<HIW-!P0DT;`1!00`1,_*-HDF'8^Z&R>,Z0-]Y3M;!$P
+MA=(P(3`N/930D='E9F>R3!Z)(0N)P)Y1ET",#LJ'@AHC:.Z=F6\Y]T+"Z2.%
+M)1:[2=O9$%3:&-V$GDJS86M6XJMI,:7.<<>ZKTR3Z0)/<3*]#_"+PU4O+IMW
+M49+`9`(/^2,Y9>LVZW\*_`=O2M67-S3#ZKA.1M^B]8Z+T^G;L#13`^%'X7Z>
+M*5!C-,8[+H*-L)S"YY9;<9-\T-.V!`X/LK5&U!&6Y5FVH>D<*W3I:6KFZ2*=
+MO;!KXC!5YM$%L$;?JCI4I,E6649XW4VU%-U$`:0%!7MQH/9:IH]A@J&K2$?L
+MAIS'4^GBLTC.?9<S6\/4OXT/#?RG>%Z+7MY9$96==V6=7]E=LW%S->W%.V@!
+M>7?BY8&O:/>`1&Y"]BZE2#&$'8;KS+\5*M)G3*PQLI+I9'@]]3%.I$[<*M5'
+MI;DS[*U?5'/JN(V!RJ[W=FQV7:.J"7:I:<)Y,1@E.3#C.4.2=DL4XYVQ@X2@
+M%N9)]MD+I`PW"0=N8,G$(0Q(B-N\),#G#TR>PWE6;*SK5ZA#*9"V^G]'#-+J
+MH),<KGY/+CCV]?Z?]'GYNIPPJ5K7J$0U7*72:P$.<#';9=*VVI,8T-:,(W4Q
+M@:<+RY?J;>GU?'_Y>,_LYUG23H]69[*Q;],8QTP#P!V6Z*=,4<MR=D+:3=1V
+M6+YK7JP_1>/'J,T68G#1",6L[;K1TM),`)F@%T8F%CWKK^S)\9K[2&@C'OW0
+M&W@"1[[\K7T^DN@`*&JP.PWZ*S-,O#BQZMOI=(;+NTJI6L0]Q!$'B.5N5:32
+M)(4%1AG`77'-YL_T\O<<]<=-)+LQ*IUNG5&9'J75>6W4<`_51.H!P@M77'S7
+MZ\?D_0XWF.3-N]H/I46DY#1F5TEQ;,)TN;LJ-S:-)D-A=\?)*\/D_27'IC:3
+MO@\PCHO<UXTG'(G=6*UK!D;J$L+"?3D"#(727;RW"X]ANG:ZAT1!V#0H7ZHS
+MN.4;AR1`[$IMR&@B!WX59,R0(B$JC3H!@P=O=$X`#?[%,2"`V8[1B%$T$;&.
+M$+7$"!,?LI'L+'%A,GF#,H'QJW0#,&`#)1&"/3(^J=I9`,F1M"$`$R#E`[3!
+M@B2@$]RI-W9D]T,2^3A`GOU&3GW2:[)U`3\)/P9DIZ?Y/S$]C.R`Z8!$@?JI
+MZ,3"B:`UL$`2I*>F>%J(T:+Z8I`&E/\`^)%YE/\`^'_^=/1T>4/[(_0FDVCN
+MR&/CN=E1KM+GX`#5=O<./:?LJ=?6`!CVREYK2*N"&Y:-/=0`1O!5BYK&I3:S
+M2T>6W3@;_*KDSF!\+*[`\`"<]R$CDYA.7&#(&4P=),`(A^Y`S^Z1)!G0/A,=
+M]Q\)&#C5&$#P#Z2V9X",`!LM)'_2=T#7%K@1N<R41<XF9SQ*!C.F(,_"<-);
+M._(2#AF1/]DYB=A@<(A-(TSRD6D`&##ML)R=+<_IRDYSB!,EHVRJI.#1I.#(
+MRFCU2X9X[)$MU#&W"=S@1!;[94`2)&"B;@Q&1R2CMWTZ-4.=3#\'!)$'O]$S
+MSK)+B23V0`1F0#_FB:8;MGB4TM!RG=AOI=/?*H9QSDDG=,/4,XSR44EID8CN
+MFJ/UO+XR=XP$#[@;F#'T0N#0?E.UPTG)U<)G$8).5.@PTQ/Z)R<8.#PFF`3*
+M?TDS.$#/`QZOHA/IR8^Z,D1!^Z9SN`90"T[%I_5(CG4$<&20<\?"0'HG(A`!
+MCO/N$1+9].P3-!,G)^B,$;($((D&<;%-I([81,AN9G.R<]S'N@'$#)2:6@GD
+M)CM&"=Y2TS)]\%-!.:0V3LG;H(]3@R!RF</1._&H)R&@X/V"`>#,2B;!SB`/
+MNF8-6J8QF$YTGL([H%)B"A8)SC")FF9)D>R1&"-`^Z!FZ2!,(V#!C9`S)C`"
+MDIZ<D!`J>)&H`*:@T:B'\;94+&@G8#WV5FDT;8'U07NAV#[J]ITJ8U&HZ.Z^
+MCOPPZ"VRZ328&@$-$XB5X_\`@OTT777FU32U"G]>R^DO#EJVG;LP-EC*Z<L^
+M;IJ]+M]+0TC;W6@RB0Z>!W0VS0T",?"O-8'-Y*YTD*W;F8PK0IEPD;)K.E(R
+MKK&%K0UH$$9*EK2O18(^%<HTY;@<(64X*LTQZ/[J-:1!DQ*"I1!G4"K(:/CV
+M3$`^R&F?5I`">W"IW5'!ANZUJS`!)^%4N*;2,$PAIRW7*.JF6E>7?B%TFI>T
+MJE!LC5B3E>S=3H-=3,#9>=>-*#VO<ZEN#V4MXX23EXZS\-R\ZGW&_LJ/B?P$
+M+&U%6WJ%[HV*ZSJMWX@H5GOI4'>4WDA8W4^MUG4]%VUTQDA<9Y?)/CO/'OJO
+M-Z]I5H.TU&$9@X4-1@$P?ONO0NFVEEUB62))W6%XR\+W/3'&K2!=3<=X.%Z,
+M?-+=4]+O3EG#T0>5+:TV.J,&K$[!.:,#U'`XA36+:0K!I#H_ISRM7+AZ,/!K
+M*>SI^AVM(46QDE:1MVZ9)CYV6?TJHUE-K08+1F<J[4NB[!(@]E\O/?L_5^&8
+MS"2#K:1#0&^G$@;J!\<?HC+@3OOOVA`/S;Q!VE9D=./@BW@N.`AT@$S@QW1S
+MQJ0%PU$`[JZ2TU(@$SOV3XU;X0GY3L.8_NK(S:(&<$X0`28F?JCI^IV`#/NI
+M&-(,N(CNAPKU&X.3*K/;+B3^ZON#"X2H:M,3(:?E:QK&6*F*8`)X*%U,:O2,
+MJT6:A(S\H"P`8'ZK<KE<5%],&2,=U!6IM..ZT7MEN,2H33!DQ,+4R<<O&RJE
+ML)G2/B54NK=K3J#9G"V31+@8;!*KU:+7&'M,QN,+MCF\OD_3RL"M99]+8',E
+M4Z]%S,1)/*Z!U,ZC#3'=05*#"TRPN]EVGD>#R?I9\8);D$@X]DM.T_<K3JVK
+M"8S`56M;N!,"0NLRV\>?BN*N0-+3DGDJ,@&9;]U+5:1(((`P(49;%,N&\K3E
+MK0?2#@(FMD3^Q0AI,G^Z)K=HDQP@0`/TX2.()!`*6-X..4BW$Y^VR`<$R?OE
+M'#=>MS0?;9#_`%R<_=2>HC),#[HA4V@O`!&3B2K+:3J54L?^8;P0?V5=@+7X
+M&_<*9H((F9[+2::-$GRADHI/<IJ!FBTYVY1K)PCO8#03$DP1'"IO+7#3'&X*
+MNWAET-[[]U1J@9S@SRK5TKN.#&^V2FU`,DP>$50P)(!08#)].4`!P:9W2,'(
+M@?"1;!QM"1T[&8X4"F>('LD73N,\)$2<"$@UL[[=@AH[@W!&4\@`2AF,-$=D
+M0((/I*!1/'PGJ`#&_NAV`(^ONB@3,Q`RD*6F(S[%,(C!V1`@$1&4(.8T[?J@
+M)P&#P3PDZ"9@;X3$0X#(3;-R1WA`W<GOM"DHEC6G6P/!$"9$'OA"=)<3D3RD
+M6>G5M&=^(0(PYT`&#R2F`@S(ENV)3P,D&1$(20?2#))A`[LM.WP.4M+3`#ON
+MD/T30"[&)0.1,YVRFB&#YP$@")$_F2C3SE#1')P/CLG@;;)FQL#LG9&,F!C?
+M=`G&#!,@]D,>WU3Z(&K,3"8?E(!S*!P($Y^=TX`(._<Y0G4($F-\I`$`'7(]
+MR@=N''2GTX!.24IWGD=TL:B03E`^F'1V]TSH+AJP.4A&K#DQ'O\`=`FALP#C
+MNC/I(@QVA1P6SZH@I\H$<@R[Z]TV8+2222D8!B/HGAH;((<>QP`@;40R`1ZA
+MF0EN`(R,$IB"!NB:-I/&R!B"#N91-P"<D)1!C]$,'43DRBK8J6W_``KRO()N
+M/,U"J''#8_+'SR@#G"WT;MU3]5".YW^45/5,;3V4T@F`AVX([>ZN6=)U6JUC
+M#)<8WA4QJ#N-UT/@6W;5Z_:-J:2USQ/;<*I7M7X)>'/X/IE*K48-=4!Q/.P]
+ME[#TVDQE!HD;!<GX2ITZ-A2T@"`/V746=4'2&F5QSRY<<8U:#"2(,1NM&UI2
+M`9,'=4^FM$!QC9:UM3!`@X66XEITVC:?96*;?Y1)Q'"&G3B".%(3(`;V4K41
+M'+H!*FHR8$Y]T-.D7.!*LTF!A$Y[*:5&01$HFM&G5^ZE=3!$\)FLTM@YE%0U
+M&F/95+FG(GLK]8D^F8,*A>`G`A+1F7X]!,?*Y?JMHRO6ES!`.5T=_4+9!&.Z
+MQ+BH"7$B(&%C*FF/UNWL'VIM/+:`X:0LNX_":UZ_T\MH-(J.&".Z@N:[W^)M
+M)R`?[KU#\,NMT+6[;0K.&1&5Y/W+A=UWF&^GR?XZ\+=;_#SQ2VUNVO;2<[4U
+MYF")_P!%V'2[=OB7PT0&@E[(F)S"]6_\9%C8=:\(_P`51:UU>V]0<W>,KRK\
+M`:NJU?:U#,9S\#"WGG,M91N;T\?\7]/N.D=<K65=NG0XP8W$[K*MWO-0.&8]
+MEZG_`.(GI/\`_<MO6IL'\RG!('N5QW3^FM92:"UTC,%>F>7&8O3X?#Y//=AZ
+M?4K-HB08]E>I:B(_0\*:VM<#TG'SA7&VA#@"V9]EY,LY:^]XO'<<=519J),Y
+M/"-I>(EH6M;]-J.:!Y#B79P%J],\*W-=H?HT@;:@LSGIK/R8X3=KE1KW@Y2#
+M:T?E.>5WMGX.`<#6=,C(6W;>%K%E-H-%KL025VQ\-KP^7_T?'A>.7DP9<$C0
+MUP=QA6Z'2NHU73Y+W%QDSRO6*/ARRI^H4F`]EHVUE;,9'EB`NV/@GVO'Y/\`
+MUO\`\QY78^&.IU&RYND^ZL,\)W^DAQ:#[+U&E;T22)$=D?ETI(C$+7[.#SW_
+M`-3S?'EG_E&]TE^H'YW0N\)7;F>H@$GY7J-S3IM&1QM*K-8P.VW[J_LX)_\`
+M4\SR^X\*7S#Z:<@'$*"MX:OV"32,[X7K;J3'#\L(76M$M]7V3]C%9_ZOE^O%
+M;SI=W1,&@<;JE5H.#9#")]E[7==.MZH(-,&5F77A^S>Z/*;]E+X)\KMC_P"K
+M_P#J/'GM(RX`905*(\LN*]4OO"-BYN*<$]ES_6/"#X)MS_\`A_V%F^'+X[X_
+M^CXLN+PX"XI2,CN5"6MC@SA=+?\`AJ^I./\`+)![2L6YLJM#4'TG-+=Y!_R4
+M]<HZ_N89\RLNK3(<9`(G_94+V!S",Z09VW5RX$R"9C8*.F*8.W$K<KAGC*SZ
+MELTTY,0J-Q0(>0&Q[+<K,!(`[[J"K2!F``%N9O-Y/!*PJP+7Z2/RA,UWM"TK
+MRW#Q``(6?6IAE2(D3DE=L<MO%Y/'<48@R<X1;'<QR$5%K#J#Z@;,^J#PA<`#
+M`(`[K3D$:2,?:=U+2<`-R%&#)U'/8(@&F26^V#$%5!-<"[.2IJ)$ZR"H`&AH
+M..>5-0@$`^^%4:M`32:0#$(M+O\`"5!39%,>MR+1_P!;E4W"OC,@M.,22>ZI
+M5#L#B`K=WO+HDA4J@:79'ZK-:1O.O/W05`2X"!`'Z(X(,EP@CNHWY(P84.@N
+M@'WW3$F(Y3R0[OREJ:701`Y0"Z0\&1!Q*41#6QMV3.,NW.F4@<9&=D#_`&WV
+M*D86B3@8Q$84<B(V")D;DY0*,X_[(GY=)B-I":9($#Z;)YR1O"(?!`@2`>Z9
+MPTD2/LG!YS&WPD\!I<6@ELX*<*%HB=]L>Z?!+2XR(C'"9I/`YW31!COE`1]+
+M8WD\X2<"1Q`.R$EI@`00<E.8\LG(C]4"<T2#L/;)A*)',SOLF)$B),^R0(B?
+MR^R!#`F3V3.$.)S]4Y,C`3#!GWD\H''S@#;NG<6N@1D[(2<D@C=,XP`<24"A
+MP+FDG)@A24VDX+@,')/*!I!;O]43G"=P@3XDC;/="V2T2!ON4Y$@"4P,-Y^?
+M9`S7=C(2+A,$[8,I2#J[>Q31Z<9`]T$A@S,8&$FY(`CZ(0!(V$[3.?A%)C?<
+M(O18#?HG`+6->Z(?C[(=Q^B=Q,MD^PE$,[5P<#DIH)GDI5!#N/@)-'K$.F$!
+M.;I9)<"(G!W48G5O$G8HW3DNV03!11D-T$`@&$@[88QN"DT"&S@E*/1C;LH@
+M00\P=OA&=R!C.)0T\&(W3D'5![JZ#N/!,(V.B21GN$+0TF"G.V=D!TX)U#E;
+MGA&N+?KEO6C#'`[_``L*1O'T6ATUPIUF/R8,YPI87E]0>$KYMQTN@YCL.`./
+M@+LNBTW5-,X$;]UY5^"5S5O^ET0=F`"3/LO9NA6^BFS&?V7&SEQC7Z;2AH)X
+M[+5M@T&.V%2M6P,<]U;HNR,@?59;BU(:TYGZI4A+O;E1.S$!3VPVD*?6DU)H
+M&)4C&2-X2:T1Q,(I:,3[?"H<#2()F#RF(G`10#A,[TLD&(10.I>C5&V.RH7[
+MM+'9V"MW-7T?FC'?=9=\^=0=RH.8\27[:3RW(E4NG!UY(:/S<!0>--+:X(=R
+MH/#W6:-D]_G/`U#!*\N>?K77'';,\16'\'U`U?ZAF"LZTZQ4M[X.UF0Y:/C?
+MK-"ZJZZ+A`9!(^JXVR+ZO4`."9)7&WV:ZKM?%]Z>I^&JE*H20ZGM]%P'X:6M
+M>RZQ7-++02/U"[#J=84^D>6#)+8CZ*CX2LC1I5*C6$N>2DWKUC4NG+?B]KO.
+MJT61EC>WN5@]'Z#>73FZ:+HVD@KTR[\/_P`=U'^)JTR2T1!"UK#HK+>D`RFU
+MH[0N^'AM_L]W_P!#'PX3'"<N(Z1X.>S2^X/P`%NT/"UK3A[J;3\C_1=2VTEA
+M):.P3_P[BT""N^/AQG.GES_]'RY_63;]%MFL;I8W`X"M4[)M.G#6A:5M;9DE
+M7&6[-.6B1NNDQD>7+S99=USKK5_F3"E%M4$`K;-!NK`1?PX+IC;E:<K:QJMF
+MXM,#)0T;,S&X*WFVX.XD0B-NP"=@K-);6&VR.HN.(X4IL<2(@96KY0+@0%.R
+MCZ0`?HJCGZE@7G/"B_@M.=,KI'T1,!JBJV[7$@A6)ISC[>IO^BCKVSRXZ9A=
+M#Y!DB(X0U;<#>)A!S+J%5C9(.$#608(GE=)5M6.'TX5.I9-+L(;8E1C2[2!^
+MJ@N*`$P-^ZV+NPT9`YW55]!PG5'=-&V'5M&5'9:(&=EG]5Z!95J;@ZBP`C<!
+M=$ZFW7@?9!68'$`-SLKTLRL>:]:\#TGS4HXGC_87-=7\)7EHPN:USF^R]IK6
+M\#+1GV52O9TJK-+F@@[@J62]QVQ_4YX_7@%6UK47N\QKA'>5#7T"F8&W=>S=
+M?\,6EXPN--K701@;K@O$_@^ZM];Z#"?CLLWP[YCUX?K9>*XQ_J!=V&RJWE(.
+M;@;[+4NK*O;^FJTMA4[ILM(VCCNL3<KKGK/';*:`TGV3M<`UX+=3G#!).$SP
+M?,Q(0O'^&?HN[YUT%FG6(!$^Z,;0),(8(@9]RB.#Z096D$&QG)_93T`T/@F(
+M&R@!AAD%2TCD>J!SA-)PTZ6D4P"[CN44L_Q_J5%3<\,`#G$!/KJ=W*^IN%>;
+M%Q<X=O=4ZK6A\R3"MWC1F-]U2JD`ZHRLUI&2!(^JC<8GG^Z-T:/?Y0R`T&#*
+M:0!+3S!CE,=,X,]T[FGG,IN<?6"H!D0`""C$%\'O!S"9TMXWY*$9@@GZ(IW`
+M`;_*3?I'$)-TDAIU1.1,)V!@>700R<2J@VMP,GV[)%PWD`QLE(V$I.;F"443
+M1C3(E#4WXSPGW.!OB4+L`0B':1_LIY'F#\H'OE`W?:/=.!P<\H=E4TS$G*6)
+MTB3!W)0U`9B1&Z<!LS(C_"$#X$C8>R3_`$`01!V*$@%WM[2A($3!440+8DP>
+M_P`)-]7'LFW$@@$<).:X$#(,3"(<Q`,)C@R3LD1D28"9X$;P@0@-C5&K>$3=
+MI]D.B&CU;IZ8/.?9%.W2'1$F.4Y'9XD\H""`08![RA`)[0/=!+H`HZB]KB3^
+M4`RFQIB!\%#"<?E`+C/(*0.T3`+H]Y1:<8.$&[MOH"GWF(&(D(:2`L-/3$.D
+MYE"3G(VRG8)S*C=^;V"`B`8[\IM()X)2.`3,?W3%I:[5)&-R@,8;G890.:"[
+M`]TXUQC>3E-SEKI*`FQHQCB>R>(&#N4)V`[CE.X>GCY"!VCU2,]D[@#.\I@)
+M`EQ(`[IVF!/*(36_U"!",@:-6!/"C:7-.F)&$[LY&P/*`P&^V=RM"P8YSF@3
+M/8+.8'<NTQ^JT.CG_P!2UI."X82CZ5_`*Q90Z!0)`EPF3]%Z]8M](`_1>7_@
+MY58WHMLT<,'[!>G=/K#2#.ZY95QQC2HXW^ZN4F8&RIT'<\*U3<(X6'18IM$[
+M^RLT0`/T56F9((^JMTHP9V14S8#"XCZ*"I5/F1SW4I&(!4+J<&82K$U"H8,G
+M,IJK_>4-,:<G)2JQ'*""Y<2/U5&\`@DX/"N5G2=\CLJ%T0>0%#3A_'#'AP<)
+MB<X7"=>N"2&,)'<SLO5O$5@RO0=.>5YSXDZ.ZD7/:V2"N.?B]NFL<],FI;U/
+MX)I+IGNJ@K,MGR-QE3BI</\`Y.DG^RT_#_ANO>W#7U&G3,Y7*>'*_&O:`Z1;
+M7?5*S1I(9O\`*[OH_2&6UJT:1,=E>Z#T2C96[0&B5IOIZ6B&X7HP\4Q8N5K/
+M99TV@@`;3LH*U%C7:8"TVTGF1D(769).)*ZQBLKR#'ID\J7R/3^671@+4IV9
+MQNK%*P<2"6R5H8M&T=@Z4?\`#/#IC!X"Z&GT\\L'LI!T\NC"I(YW^#($[J6C
+M;3(^JZ.GTX!OY0C;TYK0(:$-.=_@L;;H76T#9=2;`%L`2H*G3`'9"&G/?PX:
+MV0W"C-/3,#]UT3NG']5!4Z:X@]BJ:8+J<_EYW1A@B#QPM&K8.!(TE!_!G)VQ
+ME$9KZ0&PW0NH-+<P!W5^I0]6)P@J48;M'LJC/K46Z?3RJOD>K:%JBF9(C=15
+MJ0DGE!F/HASH.QY*AK6D[#9:3:<.)_=1U</CCE$8%?I_J=$2JS[)[28;(!70
+MUJ37"0`JU1C6B9E7;.F!<4R`0YIVV*HUJ#@[6`8[!=%<V[*GJPJEQ;`43!QV
+M*2&W.UVDN`@]U5N*`J>E[9"V:E"23'W52K3@D!NRHX[Q'X9MKT.+&!K_`&Y7
+MGWB?PO<V)<X,);G9>TU6%C28A9E[:T;MQ:^#\J\7MO#RY8=/G6_MWTZQU@@[
+M0JO'8KU[QQX.I50^M;MAR\RZSTRXL:[A49!G'LM7'4W&YY)E6<W!B)([A/,N
+MV&G9/4`D3QOW2C.28696M'@@',X[*6W!U`#G*!L!HQ[94M`-<2X"(*J::--\
+M4P"V?<!%K'^`_8(:#:?E-U.@QME'II?X_P!U/:&J"Y]+BT&`<$0J56)G<<1*
+MMW3?ZI$\A57B=GP)R>RM`U6T&V;'MJEU5SB',TX`[RH!^;=$\^K!!08=.8(X
+M[J!-;_U2.R$M<)D0>Z=I@YPED`D.SW)0"]I(DB?JK+`*-E4(>TOK```;CNJY
+M+B28VY3.RV!QPH&#3&J/U2`C,'X28<29^Z?7F0<'NJ#IR':Q,QC.R%P).`#/
+M,H28.TH@2'9.-E#9Z>VYE)XW!;/:$MAV0ZR3/?94/Q[)#3W^H0Y<#`VWA,"#
+M+H(*`G279PEI,;[YQE,2!DRBD:9S\!`+MH/Z(28<"6Z@/U1-TCN/=-5<=69A
+M-*$'?LB)<,SN(3.(@P)0D@`X/RH"DY,<)'CW*8G,?=(.,Q&P0.)C3LG)(,-.
+M=Y".JRFV@VHVL'$[MY"BU:=\]E=!W%SO<C<I,&#,^T'E,'N:)82)WSNGU8D?
+MHH&,9$9E,Z!RG+R#IS'N83AP@;#W"!-D-Y^919T%QVVSRF!&Z(N;Y<;'5R@$
+M$`R/T1``N,3!V3M>TM(."$@0?A`+H!@S\H2'''[HR3IC!^0F(@F?M*H;3F2Z
+M`4OS2(!]TX(CB1PD`.,=RH%`$22DV(Y/LE@G/T3C3&((F,HAVB"1]$M#MHG2
+M<PFV(`'W3@D2/\7NBGDHBXEA:W8J-Q),$B>(1@P,X]Y0)N/G96^G/+:@)G&%
+M4P3),@^ZFH%K8,Q"#Z&_!#K!J=.I4M660-U[3T>L'4FS\[KYE_`GJM*C>>2Y
+MP&H[DKZ&Z-=--%I:<'LN.3EU77V]00.)X4VO.)PLBQN6N$3^JTK7U#<P?=9L
+M:B_;N)*NT2-,;*C1@*Y2(,2BI2Z,)4W3(*9S03C*8PTS$2BI'1&^.ZBK/$0A
+M?&C_`#4);//V2@*ASA0NIR=1W5P4H;LF%'!(4T,R\I![(E<]U?IU.H3S*ZNZ
+M8!L#*RZU#SGD?LJECDK+P_1_BB[2")76=*Z73HT!I8!"NVG3PUH<0M&WM]+`
+M%I-*3+8Z1B$S[<G@+5\K`'9*I18UA)5TK,%J`)`"E9:@P3"FJUJ5-N7"/E9_
+M4.M6U!I'F-GY6+G(U,;6C3HTPV3IPG#Z+($@#W7*7OBBBUITU6_=8=YXO9KT
+MBKGB2N67GDZ=,?%:]&JWM%HPYJB'4:6K\X`7F%UXO#&F:F!S*JT?&]`U-)JM
+M!^5SOGKI/"]=;U&F'?F&R1ZBT\[+SFS\34*K`?-!GW5ZVZY3?4TBJ%)Y:U^U
+M'=4^IM$Y4M._:\#(*Y&A>^9EKMU8%RYH_,M3R5+XXZS^)I.;^Z<5J+O3@2N7
+MI7;MR25)_%/U#2\_"W/-6?VG2>73?S]$#K)AF`/HL2EU"HSG;E6:/5SR2MSS
+M?EB^);K=/;I,#/95:UA(,"`K5/J5-[<D%6:=U1>W,`+I/)*YWQU@/LBV7053
+MN:'(;E=:ZE1>"1"K5NGTG">%N65BXZ<DZWAIE5JM$3!P%TUS8$$@`1*HU;`@
+MDQNJS8Q:E!@;@'OV5"XI>HY,!;=:W<#$3"JU[:0=059L8D!KLY"CN*;7D#A:
+M56VD$8^57\HM.1*(RZ]!H!`;"H5:$/)B%NW%$ETZ57N:`TR1*K+G[ND"TF-E
+MEUK5S27[+JW6[<N(A4KVW#@0UL2J.9K4V/I$/R2N4\6^%;?J+7/@:O;_`+KO
+M+BV:#D2JE:BSZ+4RLZ37U\\>).B5;"Z>W3(G!A8P8`2"(CB%[_XEZ%:7])S0
+MP!W=>7>,?"E6SJN?2G3RKZR\QVQ\F^*Y-K00!.VZFI?F&<IKBD*3S3$R.4=$
+MC!,++HOT0/*$X/RBTCO^J:B!Y0D@(]+?\014%T&C())[*I4(U06P1A7K@`O,
+MP>-U4>X$1@-X'*"#3/J@X0.QQ,J4O@$MVV(0.#0!ZM]S*B(R!$@E"8(C@*1[
+MB7N>3E,6^D.<TP=O=!&WW._NGJ=VDM`2[XF$CF)CX4-!!C`._='2@RV(Q,RF
+M=$3&W"9F&QGZ\*FC@$?U$GV2<8Q()*4AVY2T@$,@^Y0-)!S'NDT-G'.R*8<9
+M2&F`#@\J&@M`,F4QPX@[*2&[@?5,6^@F!.T*P1N.<9E$T`,F8C=#IAW^PC:&
+MQ`P.5%)@`IZI;OM.4!GC3D=D6`US8,[C*3P'8;P%0VG`C'LF+27]D36X#G3G
+MDIBX!T@@>Z`8&"4T0=_UW1%H.9)!0N@$_M*@:8WRGUY@?J4MX'*3&M[Q_=#1
+M$G3,QW1%Q&<Q\I@T;;$^Z3`Z8,GX0T3A@8X[ICW('Q*DTAV=1S[IJC0(TN(^
+MJIH(/$@)'8NW]TX``R0$HD&<B>ZAHFX.-N?=.TY'LD1O'";\L'<E4&(.Z;)D
+M$(1)!S]TH.H;GW"&CD`9V1..8'VWE,&EQWCY38D0=T!8+0`(*:/3L8Y1.:9R
+M1MRF`@YGW(4".!L430]L5`"T;C";?Y&Z1F2V20$31.C5(3.,-`2`=&^Z3PW2
+M,S[*KHPTC(A24JFDZH!`X,J(F#QA.-LF1[%#3;\+=2J=.ZC2K4GQ!V[+Z2_#
+MOQ'1O>ETWBL"Z,B>?NOE<&#.K]5U7@OQ;>='J-#3%/V)/]USSQ^Q+CM]8]+Z
+MB-7YC]UU/2:XJ-!#XYW7A7@?QG;=0H-+ZH;4Y;,2?NO1/#O7FD@&JT_!7&\,
+MZL[>E47M#<E6:-1O*Y.AUIAAKB!*T;?J+7'+@1\J;5T+7MYA!7JR-A[K/H7`
+M<?S?53ZQO*JI6^KW"GI4S@`_HH6.;N/NIJ=3L1CE6"4-#1.?A,UYIG5@SB"$
+M+W@'?=0U:K3/L@JW>7$CE*RMM3M1PC#=1WGV5RR8`?=6(L4[66`A05'LIDR1
+MA6ZUS3I4"=0PN"\:^(_X?4VD<[83+.2+CCMTU[U:WH-)-1N/=<OXB\;VU&D6
+M4WR1OE>:]>\0]3JEVESH/RL!]:[N'ES]><%>3/RVN^/CCM.K>.JKI#7&/E<C
+MU[Q;?.)<"\@^_P#JH6]+KOD^HS&\JQ0Z`^JPAU,GY"QWVZS4857Q5?UC'K`F
+M)@PJUQU#J3G"H*CBWVE;=;PHYM:(.G?'?[+8Z5T6EH%-S,C@C">L=/:3IA])
+M=7O:!;5)SC.ZSO$/2KRE4-6DXP.R[K_@[:%0.:W3_97*G2V5Z&DM!/=)-,^U
+MEW'GO1+R^H/%-Y,#NM^EU&XIM\S45?J=":VM(;'O""KTPAT:#'"Q8U[;;'AS
+MKS]3653@>ZZZROJ==DM(7GM&P?3:'#$+6Z76K4:@:7'"2V+K;M#5WAREIO?/
+ML%C65Q,:C'NM>@6%HV^JU*FA.JNU0)1M>X['9`Z"TY^B!WY/VRM,Z6F5W-Q)
+M@X4S+EXR'&5EE\#>5(VIZ<.A39ILTNIU6`2?U5ZWZN',+7+FJ;R2<IV/(Q*W
+M,[&,L)75"]HU!N/?*E#:-5F'#X7)&X<UI+7J2VZI4IF!4)"ZX^9ROA=#=6-/
+MR]0`^RS;FQS$?9%;=8U,`<<*V+RG5;!+9]UWQ\LKCEX[&#7LBT&`9E4;FV>!
+M,976NI4ZC<*C=V6#NNDRCE<7*.:0XR,J"Y@;-"W[BQ.LDM69=6NX`"TSID5Y
+MF(4+V@L@MB5JOM"&203"IU:0!C9&6'?48.V%0N;.6X"WZX(&P@\JG6AWHB6K
+M6T<M<T"'D`'[RLKJW3_XBD]I8#/LNON[7/RJ-S2TMTZ?N%>D[>&>-^@5:-R:
+ME*GCF%RX9I?!!@<+WCQ'TUMQ:U&.`)(PO)O%/1JEE<NFG@[0MV;YCKX\_E5*
+M#6FDTZ@/NBTM_P`8_5-0I12`!'V1^6>X^RY:CLJ.KUJ;*U*G5=396:&5`#AP
+MD'/V_14GP#`D_P":M7@;JF/]54J#B=\[JT`2UI`G_)';5*#!4%>FY^K8M,05
+M&R`PB.VR$.]4Q*E@,TF/>UM$N<7;`[J*."XHW!NJ0"UO!E"8(`.4`#Y^DIL"
+M)._;*.(.ES3(.W9,6MWDQ\H:"[V)'PD08TS(Y3@`S&!W"1`+<X*0"R2[)/NB
+MDAPW3M#=^R48VGX0`?9R=X#<@G/&Z=S00(&)A._3P#@(!#3IDN$?*>2)D[;)
+M@V#G>82!D<_912!@Y.`G=$C.`F($@$004[P)W]T`@2[*=QQ)^GRGB`29^(W3
+M:0002<?1`Q@QI^D).!F>/V3F0()(0N_,1G/'=`+B8B1',)LGW[)W?_<?IV2F
+M'#)309H=].R=I=M.#E.=.G=Q[(0V02#LBGU.+B<92$@?(W2S`D1"8S.#QL$!
+ML+IQWV3DQ$'9"P@-S)^41`P=39.,<(@9DR7#.8E2-UAD84;0-S@#V3M,#)D`
+MH#+O2&D9]E&XSB-S]D;3#?S2#&$X8"T\CN@`.],N'W3M_/+A',IRTR`8&R8,
+MW`+23PKHV>'9CG.R$.,SCX"-K8P3OCE!'IG[[J`B1(C8[2G$EI`'ND9D;93&
+M9S$H'GU&!`A,XNS`PC:"3$A`X<M."J!U9^46LZHC9!._^:(&<#/N5)`+7'5L
+M"3NC)`@X^J%\AP(B-L=D37<P,"/9-`B_@@83^81$8/*9NH@_?=-,CO[`HK3Z
+M9U2ZLG--*L\'V)7;>#/Q%NK2X:+EY<WN2??W7F[2Z03@GA2,G@F#NLW"9=KM
+M],=#\?6%^&!MP&NC8F%V?1>LFI3:X5<?*^0+2]JT'!U.J]KA/*[3PQ^)'4.G
+MT/*J.+QP7%<KX[&;C^'U3:]9VE^?E:_3NK-JL$/E?,O2?Q4\VMIJ@M;R05W_
+M`(8\=V):T^<,C8X7/5G998]OHWI(&=E,V[;OK`(W"\UH>.>G>2)KM/O*+_SI
+M;&`VN"1C&?[)N4>B5[T-F'?""A<^>,.,''RN/Z1U5_4BT,G2>2NOZ=3;2I#6
+MMR;9VNL>6'\TC]D]UU"G:T2XN&%5N:K:=-Q)^ZX[Q7U-Y8ZFUT`*97U:DVF\
+M4>,0POITWKC']5=?57>8=S*C?:/NJ^27%:%ET.'MAL^Z\F6[7IQD@;>QIW#-
+M6G)Y5BUZ'1G\@QG9;G3^G!M/0=BM.C9L:P`"/E6+_P`<]2Z12`/IB.5<M.FL
+M;_\`HP/HM@46@&0(_=)K6MSP4Z)&1<=+80?2"=YA5Z73-+I#1[0%T+FA^^_9
+M'3MVZ.,)VO3FZUI(+7MDA/0H:29&!PN@KV;8,#V*A;9@G9+"5AU+9K7!V,;J
+M,VS702``#PMNXLQH=ME56VWKF)E9K49-Q:CRS`_U06-LUY$B2MPV8>'$]E5M
+M[44JF<05&H@T.:T@#A:/3ZCO*#3NBI6S2Z2%*VV,^D?"B[2M,C8?=([R%+3I
+MP())"*E193:0R0)P.RK*HYA)QO\`LH7/(,*[59I$JI787.V1=&I5#\(C5]4!
+M0GTDD[A1O=I((,PIH6WU!I$#=0.<"R1(^%%K+G`26I`D:H)DY24T-]9S8TJ>
+MC=O8R0X[\*EL3G!4-2L6OC/PM)9MTEEU8C#C';*U[:_H5J8@B8R9W7$4WDLP
+M[Y4E"[J4LASH^5TQ\ECCEXY7;U&4ZK2&@+.N[`#(;NLNSZN6.ASX[Y6O;]1I
+M7#1Z@O3CY97GR\5C(N:)8XM((E9EQ;.+R<P5UC[9E:7`A4;RP@#&/E=Y7#+%
+MRMU0=I/99E9NA\1GA=1>VS@8`$+,OK?09Y"U&+-,>H/3J+=/UE4KVF'QZ<E:
+M-U3<7%NK2!^J@K,I@8=!"LX1SG4K,E\'DRN;\4])IW=B6%@<Z-NR[CJ%'4#I
+M[\+*N;4#&_<]U9=7;.GD%3P_58\M;L#W3?\``:W;]5Z?4Z30>\N(R>Z;_@]O
+MV"W_`!=?W*\#NZD/APSR=U4JOAT@8XY4U?\`.2,859PAW8>Y7.NVR+H.TB,%
+M,7##HC'>0FQ$B$S@`T=SQMA0V,U6;-!@C8H?,TD.8=MI0%H`F9A`(,AT^R"5
+M]8OJE[R2YYDDF24.L3JSGNA@:9!Q/^PE&(S!W0V(5#N`2"93O>#F<GD(/3R=
+MT.`"V-C\0AM*7@MD[[$RG;4&PD:0HP`>8]O9+$S.P022,DG!2#O1$X''NHY`
+M[YV2:(S.>Z`@0'0-MLIVN9D\;*,@S,XC9-`!DN@'A%'Z9U<#$HG.86CG/*BW
+M><E'JW`.3RB;.'-V=(/()V17#6MKEK*S*FQU-F-O<!009,0$HD';Y)1=I:=1
+MC7`U`'CELD<>R'6W0TM.1PHL@`0(&Y3`8,9A#:1SFAN\CO*4LC\V3R@CD8"1
+M&<X@("V$1CV*)IQ!A1Q)DGA(-,?JIHV,/;J.8!3ES"Z3IGVQ"`M(WV]D)C)G
+MX"NC:1I;F#PD).9;@[J(Z@8//9.<`'ME!(UP@B`>9*(P&@%TQNHH@9VYRDT2
+M,J&TNKT_F&/T14:C09G'90`&,?;NFC.VWNJ;62[UR#(D)FS&#C]E"&.B8._&
+M82(AOPH;3D`#?9"/SQ,R@9L3,':"A&"8P=O=4VL?TB=C[)B?4,S.)4+2YVD@
+MP!LE,;*&UAI$!TB/=`XC!^ZB'IP23W3.RT#GE71M)N![)X'$Y*A`(?F8GNG!
+M(GV]T5,WL.$F<-])A0DGO\P48,N:9G"(E#23,_24X+2!`CVC"BUG,DMQPFU8
+MR0"-LY1=IZ<9''S!2:2)$P.Q4<@/W,<Y3:SH&=_=#:>3K&))X3AQ)D;;C*AI
+MN(V.0B$ZMX]DT;3-J.;D3@YA7+?J%RT'2\YB<K.:2V"#F.Z*B20-.2EY-MBA
+MU;J#RUIN:AT["=EZ3^%5AU7J-VRK4<[R1./NN9_#SPA5OZK:U8$L]QNOH7\.
+M^@LLZ%.*8@#Z+%D[9S\GR.O\%]*9:V;!O`75@-#!(@0J73J8I4?8+.\3=6;;
+M,--A`G`6,LM,XQ7\5=6;1I%C=SV*X[1<WUQ.8[*6GYW4+HO<XQVA;=E092I;
+M+R9WV[>G&:!TKIS*(!?$K5H46X`&%%2:YYX4]'7OL>5C;K(MT6L`G2G>0'"%
+M$R3N8Y1!CC`F5-[;D.XZA&`0F;3^P1BF=)[J;R@Y@/[J=KPA\OG,*Q1;!C>$
+M@SB"/HC8P$AORKK25)I:3D`=_9(6[=)@#Z)B0-A/"-KQMA:E9TJ5:68CY4#[
+M?2"8RM%PE^P3:0Z,*5J*`I13_=4G4?YA@8'=;GDRT[2JXMP2#A9UPUM4MZ`@
+M$_JIJ5-IF0K#J):.WU0-9$08/92B(,=JP,!3-I_RSW4]&F3EQ^JE%.7#N4D&
+M959B'#!Q"J7-*#$;=EM5J30W;*HUZ4O@<;H,FNQT$D0J[R)C<[+3NZ3B-L+,
+MK-WWQRHL!4R#$9[)A4+1,92;)$&$&\JE-4<">Q]TWE!XF2/JD]P!@CZH758:
+M2W*=()K0UF#,IY;$"%!YH&"=NZ'S@';_`$2&DSAWW1T*]2B):2(XE1MJ@GF4
+M;(>V"5N,6-CIO6"QH8]Q$]EN4;FE7HX>,KAZC8!(,?W3V74*U$^EQ@<%=</)
+M<7'/QRNMNK9NIVD2LN_M"701]5-TKJ].M#:KOKW6MY5*NS4UPSLO5AY)D\F?
+MCL<1?VV@06K(J4'/J3)#5VW4["23I,'E8E]9.`)&'+MVXN<J4X>03C*KW%LW
+M20&_5:5S;Z'Z@JM5P+M)V"#--"F#!R4WD4NQ6LRC1+`2""47D4?=.%?)%<D/
+M,#.T`JN]LNQL=@58?!=),2>56?O.XXRH])J@@$.TRWLHV@@',GA&]QYR.4SO
+MRDR,<(R"1)`W^4B(V!2G>&IB3JVX[HIW:-1`.`<80.B9!(([IYDP2)[IB2)Q
+M]D#.=/(^Z)H@:L'ZH3&G#3O\)<B<E`39:,Y]QPG#1#G2,8B<E"UY`<8$GLB9
+MP"WXA`L-,&9&$],-Y=$<QND0X$AS((.QX38@J@2#N)W1-:-.<#ND#C;"=VG2
+M1[;J`,D\!(F6$&2!P4X+9&K,_1"XM#L9212@=I([)J@.K?YY2$1L?ND70TB,
+M)$,0W`)VQA,&[P41(G/ZI-B,(I@0`1PGDG)^$SC!$<]D\CB90.T'8'<[(23_
+M`$[%/J[DQNGQO*!G<9"3M)$_W2!@2'1W"0@\?K"!:6YQ$\)I@<_*)Q]&YC@'
+M9,=(=D?J@1$B!GNF:!IWA.(!F<)0W,2F@B!&9RA!&F#PC^<I/T%H`$)H,PP?
+M?E."9W28!`$P">R8B#G]$"=J(_U3M$X;B>$YD`MF0=QW3-@C+9(Y0%I;K)VC
+M8=T-0R[_`%3AH<[N!PF>-),B/8H'8).9,(!IF/;!)1$ZL>R$B,<]T#@0P'?@
+MI@9/Z).,-B4FG&V_*!P`1C/LD-0!]1CV3,.(`^,HFF),8^4#C5N/L$[9/IC,
+MY(2$@8Q^J*1(:1]$"(],0<<)J>F-DY@M$?ND(F0J&/I<5+3(,3D$IG!I!.QV
+MA.&P-ON4"(!$#E=A^'7AQW4;MKZC)8TA8/0.FOO[UC`PP2O>?PZ\/FTM6`L'
+MRLWIG+/UZ=#X.Z*RA2IT*;,-'*]+Z);MH4`-`"R?#5@U@!(B-PNB>6TZ>-EB
+MN<YY1=5Z@*%%P:1C<RN)ZC5J]1O8W"TO$UWG0WE0])HAPUN$GW7#.N^$VNV-
+M'RJ0B)A7K>F7#U)K2F2-ONKU"G!CLO/>7IQA6S`QHA3&F0"4@`'2<*1[FAN(
+M6:Z2$P"6XP5,T#&%`Q[2_)_56&'MNIMK22FUNG_52M'HQRH&$ZO2K5`#3_=6
+M4T`,,0!",LT@3^BD$.F,)G./*K*%T\H28B``GJG_`*E&7`[S`02XB)1-B9C"
+MB8X1,DX1TG09/*FQ/'I@#Y3^6,N)@CV3-)(D(Z?YC^J*!](O?`0U:`;D?16&
+M-&8'Z)ZE)KP`X2.45'08W1&".Y5@4QH,)4F'4('W4^D:)'*1*I5*0!DSE5*U
+M(:C&Q6C6:!.)A5JC6S);E18S*U"096?=6S1_3!6[7``^50K,#R3C"G2L-]')
+M)&`@\HP?9;#K=A&!@JLZD!(`0K(?3)!&WNJ]1C]/I(^@6S5H`B`,JM_#:21^
+MB:1EO;IG!*A#'ZCO'*TW6WJ,A)M!H$&$TNU&DPG?CW5BG3@;[J846L),<HF:
+M8$Q\*LVH'M.QS`55WI<9'U6D8C>)5:O2#G;;K4K"FUY:[4Q\%;/1.LN8[RWN
+MU`+*=;$B<J&M1<W:<96ION,927MZ'9W%"\H2""85#JMB8)CX7,]%ZL^V>&/<
+M1_OX7765[3O*(@CW*]/B\ORO+Y/%KIR74K0LEQ'ZK%K6O\S6Z3"[OK/3@6DM
+MV7-=4M2*1TSCL%ZIR\MX9#7M`B?U2\QO<?=,*)Y!E/Y/S]TTO#Y%K-)F71]5
+M6>0<`!6*YEQ;`&..56>1Q"E>H+@2/8)/!D2-TSMA)QV2(F'$X]D-&<,X[(2)
+M))&41`'9"X]T#$&9@&=BD9`B"2$PSMQPB<US1+AID2)Y1`$&1.Z1!X!!/&R=
+MND9<X^R8D2/[HIP)]61"(2.#'>4)@#_1%3=+80/+MR23WE-LTZ@DZ8&04TX@
+ME$.!Z9S!2W[I9#1.4I+M.?:.Z`?3S,<)`$DX=/`2AP<<X2/<[#;**>J^GJ;H
+MU;>K.Y00TGL=DY!C4[Z2D3)D'/NA#`@..GM&R0)`^>R=I+<S![)R22),H&@`
+M3E-B!E.23DY]TG0.?H@89=CZ!/.,9[I@Z,#*0)$^Z+H[-B8D]PD<MS'=-,@1
+M]@G;OB"B%@'\T=DQ[!%D[QGB4P_(80-&8.",(C@;`I-D@`&9X2&\0#V*!MAE
+M-N,\\HX)'!.^R$N&G;/[(:.&XX,?JF(,SLD)&0TY"0$MQQNH:.#B(&4BT<$'
+MW3@B-Y`V"0#]<M$&,C*!`#<\]D\M%0.C4`>4T>F"W=)L!ID?14/=.I.JEU*G
+MH:=FZIA1N]@B#26ET8:)WV0F-!Q]5`Y!<=1&!RF&Y@>^Z0(E.8!$85":V3D'
+M"<`:<#;=+4T99(/)*=H$=^Z!"1$#*<09F?HD1MRG='(DSW0T8>SI]D]-OJ@D
+M;[)@,;F?E&(&^_LBB.6P>58M[>I7<UDD@;*!NDD9,_J5VGX?]#JWMPTFF0T'
+ME&;Q'5_A/X:T-;6JLDD"%[?X8Z;%`'1"Q/`_164[:FP#``7H/3:#*-'3V6<J
+MXR;NTEK1--L]O95.LWS:--T.B%-?W+*-)V8A<AU2Z?=7&ACC!*Y99:=,<=GH
+MNJ7=QK<XD$KH>F6^&B%3Z):!K!A;MM3T`8^<KS97;TX8Z3T:(:,2`IF-QG9"
+MT@-P<!4NJ7].WIDS"Q:[1+U"Z;2!,C"R:O7*4D!T%9?5;]URYS:<Y[*G1Z/7
+MN8<7EL]ESN[>'3<C:/6FR2Q\QV5RRZR'D`N+21W6=:>'SI:,GW5D=%J-R&N!
+M"OK4]HWK6[-5FH'Z`JRR^+?S#3[K!L35M7!KP8^%J4GT[AHV"FMK&A0O&N/Y
+ME-4K!W]06-68^B8&J!V34;PZH.RSNSMJS?34>Z7%`V=63`4=&J'"094K3Z@1
+M&5N7;-@R('I&ZDH@ALB$PRTG]$3()&(5TSM-3P8S"GIM`,A1,(.5*#VQW32[
+M6*8!@2BTMG?.TJ&B1JVE66%IW"!1`P[[(RW!F4@0`)&/E-J&<H(J[/JH'4X^
+MJLN+2TF=N`JU1P#8,E18JW32-C*KADF"%;())2;2C?=.U4JC-(5=U*72X0M%
+M]+42!.%%5HC/9$9M6F&["0JM5H`)G*T+EI$P-N2J5<8/?E39I1JN]6X5.ZK%
+MA)/"N7`QJB#^ZS+MI<W)(!X4BZ05>IX(:[([JG5ZH8!UPH;\-9(:!/*R+IQ)
+M@'*9$TZ&WZDW5)=,JT.HTW-`7$UKEU/)<<=E2NNN/I,($^V84F5B7';T,WK#
+MC4/;*FIUJ+VP0"?E>3?^9;IE3,Z?=:?2O&#&U`*U32??*U,_\2^*NZOZ/]30
+M1_=6>@=0=0KBF2L;IO7;6ZIC2Z9&_P#L*=[VEVMI'>97693+IQN/RO1[6LV[
+MMPT1)&95'J=DT,((^BQO"G4SK:U[L]UV+A1N+4.!X7J\7DWQ7C\OCTXBK9-%
+M0Y_1-_!-[_HNCJ6)+S#"A_@3_@*].W#3X'N-RZ8G"KDP2"#&RL5\F&S([*"I
+MZJ8@F1B%-O2A._<#W2.H#V3NB3N1&2FJ.);OM$?"J<!P9@_KNF<"<[9A.6Q@
+MQ*8YQLHIO[[IG;03/U2(W&>R:">3\J!#,G*7S(A-M[)\=\<D(',1DR`8R433
+MG]X*`C)!G='@;<JAIGCZ%)P'"1'SC=$/RSNG8$D=\#(3">Z=P:!D^^$HD2=O
+MV0)F#R)3NB,QGNDX``9'U"1'I,<(IA^4$B>Z9\``C]D_],S!A*0/^H>R`(SB
+M<>R=@)G.Z3@``Z1GA,#/$(%IC'"49!V^4XR)/"3))$9[94"(R2(3/V_=&0#.
+M-]\JUTQ_3J=.Y%^RJ\NI$4?+,0^1!/M$JBG!C<=HW3"=6#D(FDZI`GZIRZ6P
+M2/D;H$"TN`<(2<,P)^$((@#;Y*=TD8?C_P"Y`\C3_ACLG:X@[S*;$$S@=RFU
+M9E`1)X.=D)!C"67&>P3`8,9*!`^J28'<<)R0-G<]LIB!/")C27`-&78B$"&/
+M43@IP#!,'2>3RF<V)U-@_97.FCS[6K;%S6@`U6$[D@9'U'[(*U3`$['OA"<X
+MQE.-,R,SRD[3J@;(`,C_`"3MB/5^Z3@#!VA,&R#E#9`Z3@;B-DWJGG"+9I2_
+MJS]4`QB3RB9&9F/V1%HD!IG*<-CT.G4TY:$"IZ=>DR6]P8,IB0#I&8[%.6Z9
+M;I(/,H?S/COR25%$QQ+H(1F3&G[E-0\LEQ<7#'')4]M3+W-`R51?\.]/?>7;
+M`&D@D?NO>_PS\-MHVE*:?J@25QOX.^'75`*[Z4S!R/A>[>%NG-H4VC3&%,KI
+MPROM=-+HMCY%)N`"KUU<BF,$2G>YE.F-6(7.^(;\'4QA@^Q7*UJ17\0=1=5<
+MZFUQ2Z#8N)#WY)]]E3Z=;FXN`]V5U%E1;3HC'U7FRRV]&&.EJW8&L;Z=E:%0
+M!NX5%U9K6Q(V[IA4<YN(*Y6N\BS>WK*=(Y7-7?G]0N-+7'3^RT;MCZSX.%H]
+M.LZ5"V#C^8Y6=;:WIF].Z2*;AJ))706%FP``-5>B[75@;<+5MW,ITY<8"WC'
+M/+)<M+1@:!I&%:9:4Y@M6%?^(;6U<9J"1[K/_P#.M`5L5!VR5O<CENNHN^D4
+MJK(T`#NLVXZ54MI<P$CV5OH/B"VNP/6"3[KH&TZ5Q0($%/69-XYV.1I14ECQ
+MD8(*I]0LG4W:V;>RZ+J?3#2JZV<=E5%)E1A:=QW7++'7%=\<M\QA6M5[:D1A
+M:5JX&">56NK1U*H2V?E-;EP,+E.'2S;7ID%L0$MLZH"BH$>7JG=-4>5U[<UJ
+MD\'=RFU`"`LRG4@R2K+*X(W51=IU(;&I3MJ@;'99@K09+AE%4N1$"")R5EIH
+MBI()F$+GQN539<0!D3\IZERV03G"HLNKL&^ZA<\..3E47U'.,CNIK9WJTJ-K
+M=-@+D]:0?9-3<!F$3G`CU&%649<`8]MU#7>W3A'4(+L9&RC>!&<H:4KD@M)A
+M9U8')C&T+3JL:X$!5GT@UL&,*:V,VJWDK.OFAQ(;_HM:Y87/V5.M1(.RD@Q*
+MED'DR<'.5G7UK;TY[KHZU%P8=(63=60?5.K.54<U>6C"XN#C]`L3K-E+"0S8
+MKN+BP@2!C9974NGZV$'93U-V/,>LNJT7END$#W61<U*A)>:;@!R.3\+TOJ72
+MNF^0T>5_,`AQX/NN3\06MM3)T,<Z<XG"W+)PW[[Z9W0.O5K9[6ZX`&>?[+OO
+M#GB)MT/++B';1_L+R/JE-S'DM'I.T!2^'>LU;&Z`.8Q!6KX_N+%LO%?072KK
+M14:X;E=]X6OQ5IM#SF(7C'@[KM.\HL!/JB8/_9=]X=O13<TAVZ8WZ\_DQ^5Z
+M0&L(G4,I:&?XPJ5I=TS;,/<*3^)IKU?NO+^T_/.Y=+W%I$959T`[J>M(,0(V
+MF=U7=(?&5Z;VTC<09`XY2JX`;!VS*?&L`NB3DH.=\;)0F@D3G?=,\.!S@^_*
+M:21OE(N)(!=/RH&R7<;)`ZN3D<!.R"9G,[(<;YP@6)D%WLD#@$.^Z4`F9,>P
+MA(#$?N@/`<07`\2G<X08V*%O],IW#TB!'=%(D3(Q.Z>1G.Q0_P!'O.<HL:=4
+M(AB)_JSV2,%H2<?Y@`A.0)'$A(I@.Y3F.#.,IB0#B/V2`)J$;#]40Q;G)^XW
+M2[B=TAI+^XXRFIP,@(&(EV_Y<)&0)`P$9PS!R3&$!)P3(A%+$23]$[9QF`F#
+M)P!A(@8$P@)O?^Z1:"TQ`)Q\IRUHI?F:3.R%X&D\QE`Q&./NFGD1"<`D8!A,
+M,G,Q[H'/R.Q3'!DQCE,X;QC,)VM$-<1,^_9`61C`QW2:(!.#P@(B!C[IP1.T
+MSB$!.D-$;I-QP2F@:=X]DXC7^9#9$`),:"=($SPF@2<(@&Z@9QR4$A?-'0Z(
+M&=1&4?3'`7U&HX2UC@YPC@&5"XR,$P[V3#?'&$!W`FK);OD#="-QC<X1!V`3
+MVB24S@=/^J)L,08YC!"4278,@(B#(CD(2,X/**8`8P8W3D8[X2`W))@F,IRX
+MG$J!?TB!SV2$@@B3';E/IDF)CB4;6PW/.RH0))DG+M\IH:1DF`4AJ)B2`?=.
+MT$@-YE`@PDMW(_5=E^'/AYW4;YA<UT!P,?9<_P!$Z=6O+EK&MC(SE>^_A%X:
+M%K:L?49ZW9_92UC.ZXCJ_`'0:=G0IL;3#0!L%VU.FV@WM"@Z?0IV](#:`J?6
+M^I-8TZ'?<KEEDSC#=;ZB&^EIR0>5SH=4N:Y,[G=!7J5;FK(G=:G2K4,:"3\K
+MSYY;>C#!;Z72\ILN&%>KW(IT\QLJP(`+01E*C1-5^J?NN5=I(9M1]5\SOE7:
+M;M-,9(,*2VLQL&G.ZLUK2&&!!C*QITE9U2JXU>ZN![BP1C$8*J_P[F5@8WV*
+MMTQI;D9(315RQ9Z0X1C<]UC^-.M&RM##@#NMFU>T4R-B!"\]_%-Y<2!\_.ZZ
+MXS;SY\./\5>,',8Y[ZPF<"?E<A7\>5_-.ET@']%E>/7/IW08`=)Q^Z[C\"_P
+MUZ'XDZ"[JW7*]8L-7RV4Z#@#L#)D>Z[SQX_6-^LW6A^'/CJJ^JP&J02=I^%]
+M#?AYUD7UJPN?F!SLOE?QIX9'@_\`$3^`Z=4?4MG$/ID_FTDX!@;KW7\%;ISP
+MUAF,?V7++#URX:W+'KMS2;5I;;KG[^D;:L2``"9E=-2@T&&(D+*ZU1:^FXM&
+M96?)-QT\=U6-69Y]/4(E4*E`M>8^JNL?Y;P#SA2.HM>=0V.5P[>GI3HU#^7?
+MV4E:"W/'*CKTS3<2!`05*X#(..Y5G"6`,->/A.ZH&[''RJU>LT2951]R"V`X
+M+>V%]]UIP24A>-`!!SV60^L7$29E.R9P%A6Q_&`DP2)2_BIP=OE9;6NB#REJ
+M+9.P_=%;3:NJ>ZFMG'5JGZ+$IW`!''.ZNVESD'ZJ+MO4R-`DH75`2J(NP6[I
+MZ58ND?JKM(MM<&NB=T-;).1'LHR^`)2\S8?9:A2:UN3LH:C2YY4KW`@D'/RH
+MWNS@_P"BJ*U2B`<M'OE0OHM/?93O?ZB21'LHO,SW4%2K1&F(E5&VC"XD[RM-
+MSVZ5`ZF0XN_I(51FW5NT>ENRR.IV9+3S/"Z&HTZHX56XI!P((B$B;</U&Q=4
+MEI;@[K'ZGT2CY)<\Z3W.5WMY:NF0W?*P.N=.JUIW'NKZRL[>:=<Z9T]C=)R9
+MSNN1ZI94Z3M=,F"3$<+U>\\.VOJJ5@7.))DSNN;\3=`M?))INTD;2%<<KCVW
+M;*PO`?539W+070,"%[%X=Z@*K&%KP9@@KPBO:NM;LN#@(,2O1OPYZBY[`VH[
+M((&-E<YJ^T3*;CVNQOHM*8UC92_QW_6%SMK=4A;L!)F.ZD_BJ7<_=.7+A\97
+M4$G<?[[*!PEA=!`&)!V5BX=AV?;Z*H\DN&,;A?1KA0/$R1A#48=$R43_`%'X
+M0SQL2B!`]<">Z3@!!$DSRG+CI`!PF=)`QL-^ZBFEQ)=RG@`Q)DH0X3(G*<.(
+M.)5#P8&?LG:3$1DI,)&"XP0FGW_5`8#-&"9!VXA(^IQP`$.-0DY'9'J!,.)#
+M9RE@$_\`+`G=(B!EVV(2`]6#A$0)W!$2B`R&X.4Y+HB?NG<0.,).@"/K\(&U
+M&>2>4.2#D=OE/(`:3N<)SD`@B>W"*0@.D)F@EV-Y1`C3&`)V"3G1,``H$0`Z
+M3A!$CL$3C!R`3\I`Y&=NZ!A.@-G!X3&200C=+8$C*;4)WCL.Z!MP)CY3QB9V
+M_1,2)WPD\C&-T#.DY.\II@DD`GW[IM7J[)SET[(IR9C`$#;W2`)@3!2&!@"4
+MQ+-,YDH$<>G$1E+`<(XV3-P?=.</VG"B"DZ3.9*8SJVVW3ZAH]TA&G!@JAFE
+MT&,<)Q.DG)">)!]\X2C$NR?9`P)TD'(E.R3)T_=,V"#@R>.R=A8706F3L`@0
+M)D1,S&R-XGX[(0<2/L43W"((R$`@F0`)3$SD#`12.1$A,<F.Y4"R<$!-D';"
+M-D8!X3^D@X,0J$QIU?[A/480-Y,;2K-&"S2?H.R,4QDD3_=39I4$`Y'PIK:B
+MY]1L`G40("E;2R`T&3Q*ZOP'T7^*O:9T@@D?1$MU'5?A3X9;7:RO5H[$1C?W
+M7MW0K>E8VP,M$#E<CT1]ITFR8`X-$#<_[[*'J7BHUII6[RYNTB<KGGGIRQQN
+M5V[+JO7&!NBFX2L1]:I=.EQ.5D6#JE=P<Z3,86YTZD!$S"\^63T8X:7>FT&L
+M:'$;=UH,=C?8J&BV:8#0K5K0+M^%RM=I#TF%S_>%HVC(`'9-;T&Z1)QV5FDT
+M8(*RUI9H1N["DR[!4(@;'=.7EA$<HNDAH-<2-N94;[4G\J)E729[*:C6!,G?
+M=3VTNE-UH\;3)X6!XCZ#4O!G)RNS\^D<0GI&@1F/E;QRC&4V^=OQ$\`=0K.-
+M6@PN(R&_=9/@A_C7PH*E.UI.\EQDTWM)`]P/HOI^M9V%=OJ:T\255O/#O2ZS
+M8+&2?8+K++-5C6G@W3[3J'5^HNZAU4E]=[L3.,^_"]E_"+IKZ6EY$`QQ\(AX
+M5L:;P6TVD#;"Z#HC&]/;I&D!8RR28<[=I3.FD![1\JKU!H=2,1E9(ZL(`+\#
+MW05NJZFX.3ME8RSCMCARSNHO<RYP8@JQ;U=5,&=MU2NW.JOU<3/=#;57-,$1
+M.%YYQ=O19PN]0JT_)P<K!NKD1E6.J5#!))'PLBJ`YQ]1,+6]UF22%6N'.P#A
+M`P%SMC!PG93D@QGA3T*328.YY6ML]AMK<N?);GY6I3MP&R6P0$=C0B.<*Z:?
+MIR``H2,NI3TDX]U'7I.(P%JFB!E"^BW1($*1JL"Y!IGU3E#;7<'\V%/UL!K?
+MCE<_6N7,J:0=UK3#HZ-T7P9PKUK7]_=<Q85G",K8LJI=$HK<\_\`E",Y0&M(
+M_,J>LP/TA#YT'3Q\K;*\:H([?L@J5=(D@J$.!V=[[IJSI&#*!5JL`F!["<*(
+MOD\9"'U&9W0M!C.,;**D80.<3LG>[U1Q*B<^-MR4SB=."`FTT*070<*-S!).
+MQ0PZ<G?A-#B"<_Y*RI8&HQIQ`,\E5;BU8]L1^4*VZ.^5%(D`X6MLZ<[UCII<
+MQVEL\K@O&'1:F@N8#MG/RO6ZU,/;!&%C=8LJ3@X.#=E>*SO3YSZK3K6US%0'
+MT&22/=;G@WJ#J5W3;,-D3&W"['QMT2TJT7O$!PG^ZXFPMA1OAI$M!WGW6[JQ
+MJ7;UBROV.M*;IF1O*E_C6+G+"NT6=($G#0%+_$-[E8W7-\XU]#JN#`YY*J52
+M`?1'NK5?#N!.ZK5A$C$;1"^C]<43R9/?LE$24[],3J@SV0N_)^B@8G.(2;#B
+M9@XPDT$X`^R$MAV1D(%$)",SLGW$%+2=])`]T"D:0($^R<QP"D6ZG?ETE*#'
+M&-U=!XC)/*<@:>Q]TH@"?V3M&=X^$0TDQ@8"=S1&=B)3R`-`!GNF('Y3OO**
+M;WTQ\)&#G!^4OZ)PD-\8'NB:,!)C8)$!I(TIV``;_?*8S.P^RBIKAU%PIMHT
+MG4H:`X%^K49WVPH7;[9/9.\&-XG@'=,9+AD&.Y5^AMC),I;X**1)*%D:23,H
+M'='/Q,IH&DR-]DPY=)GY3R=$G"!F@-)G;^Z0@D\A.&NXS*?4?+#8&.VZ`,!Q
+MB/A(D!I:0`/;=)P,9,2-I3<>R*(1$;'O"8M$1!'RA^3"(S&Y"@&)^B7>(!*(
+MQI&3JY28`7?YJH3)B&F`[!2#6"?4F]IPG<UP&D_*!"`"!E$6F-HGW3-;!W'N
+MGTSL,'E`@)S#1PD&@$3_`-TQ&0!E$X''Y8WE(':`W/V/=/I))@),$@Y$^YE)
+MK2!,!`SFAS9!SM\IPSN)2_,2(A$<.&,`1E1"#<D@1!3-&IOYAOPIJ;):2""1
+M_2HWB'X@HK0LZ8-,8))4[J(+<&",Y3=*!-,8!!5]E.7CL."L4Z1]-L/XBO38
+M#^8P3E>B^'*-'I%@*E0LUZ>#"Y3I56E9GS-/JX&Z;JO4;FYJ>6"X#L"8"7+7
+M3%Q]JWNI]<NKR[\JE4=H!C3.X71^&K-Y8'/G,87/>#^DNJ%M2H)F,%>@=&M6
+ML#1'/'*\^==<9\B_TRVT@'*W+2B2T0(5>RHDN&_T6U:41H!7&NV,%;4,-&RM
+MTJ3ALBH49:%9;3TK-=)!4F0-M]Q*GMV0#(F-E'1'J^BMT6SB$;]0BF=\'V*)
+MU*?@(W,=P)"E#'Z?=#U5C1&D"#(,PCIVIU=L*=K3,'=3T6:LB%E?52?;.!].
+M%&:-0#?Z+6%$N(X1FVD@IK:,;RZ\2'$0$%6K<M:`#*W76S2(&?91FS!!!:KI
+M&)Y]PT9+DS;JL<$;+2KVS0(A5:U.FSME32\*O\35=@G"=MP\'*&KH#C#=^R@
+MJ%[L?LII=M!EZQH.5'6Z@S3+?NLXL,[GZI-I^KY33-J6K7?6W,IF-$>RD`:U
+MD",**H^?3W34B;V=PEWIW"NV%`ZQC*AZ?2+W_P":W[&T@`D96:W.#VM$0`!M
+MN5:-`%L3(CNK=&UTL!")[`QIDJQ&<^F&S`V]U4NZH:R-NZL]2JM#?W6!U&X]
+M4S]%-M:VI=;K:FN`&^ZYBZ=-:/HMOJ+]605AW&*DD+6*7A=Z>X-<"?JMBV?`
+M&GNN>LZGKAI"V[)P<-BMZ8K2IO)]1V'"($&(Y5=@=C.ZFI%F))'$*[1,T&1B
+M$;((AT(?,:!L-E&*X)SLLVM2;2^ANWU"@J/DF-/R4-2K(,<>Z@:USB3G"SMJ
+M8K6(GORFIQJ@C?*9@EN94K&9!Y5BZ$6C$#(0&!,B%9IT^"AJ4A&)`5TS5&L1
+M.^_*A=`,GA37+!JGMW4%3+(!6F=&UC29$*EU1NJD((D^RM0`-Y3,8'-AQ)2,
+MY.!\3].N:E-^EARO/+VWN+/J$U&:0X[+WGJ-JQ[(`PO._'/2AJ+PW:2"%TQD
+M8]K.&+:5&FV9SCNI-;>Q_P#WE5MZ3FT6MTNP$?EN_P`+E=)IX77R_`C.ZKO`
+M$G^ZL5LDD'_55ZL`[8/=>ZUP0C,YPF>#`C9$`-)W33$S*&C#`$2F&X<,)3+I
+M!33G=0.7!SB?V3`8W,>Z33F"/[I\3DC*H+29#C!]A,I&.3E-`G3LG/I&2/F4
+MV'#0,A,<SN>Z0<(,PG)#0-L[A`A(,GG9(G&YRG).F!L$C!W,1W1##`P?HF!@
+MD(@(GLFQO)12'Y)'ZIB9;JGZ2G&TSD8^4S]Y;(4")X(@H7&#/ZS*-P)$Z8)4
+M>G)(/UX5-$UQ&0?E(?/*0!!,)X@3!0/Q";U;$[)V_E2'YIF90."9"3S@<I]G
+M1N?=`9+23)0*#I,#/[(2""#_`&1;`B29Y*4%W'L@'>$P[&81Z8(S*0;V,^Z*
+M`?XA&$33Z?=+CG[;)-V]E`^H:?RC='3+7.EY(&TJ,`!TI^<!#0W#GCW1>=-J
+M*,-`F=49*$X$<)G-!@,G43D*H0,8@?5.3D0!A#ICM@_=.TD?1021,>G?&4Q`
+M:>X3R8`:9`R,X0PX.#?U[($R7&(E$6[%KI)W'9#!$Y1,^,'L@-KO1V*`3YFH
+M\H@)`TPDS$3QN$&MT4C?A;-)M-U,Z78Y'=9/0:>JH&MS\K6KL%%FB#/*Q>S_
+M`!7J57`G\P'>5I^&[9UW>`@.C&^ZS&`UZN@-R>Z[OP/TLTRUY'N"N>66HW(Z
+MCH%B*=!GH"Z;IU!K6B&K/Z;1R#$+>Z;1B#W7GW]=,8T.FT1`)"U*%/(@0.RJ
+MV+-+1[K3MV"97.NTB:VIG3MA6&4=42E2;#8VE6Z%/GA&I$=&@)_+A6*=&?\`
+M)6:3,[05-3I@[?:$:5V40.(4C*$M]O96J5)IYW1BF&Q&Z:6549:B1.%+3HMD
+MX.%:;1Q*D9;SM,J6&T#*>WLC\LAL!6Z=N1`1&B-6VRK%40P@$\J-P(_=:3J`
+M!.,*)]($0%$VR;BGJ!G=4*]OK.0<+=KT@W,`JI7:UL]NRB,2K;1@&/A15:+`
+M!`,K0N2)G[`*G5(CU*;%5U(;DPH*M5K<3A'?W#6-C^ZS!4=7>0V3QA#6UD5"
+M]_IX5NTMGU*@)'T3=+L7ZI=RM_I]F`084M;F)=(L,R1]5OV%`#C906-NYKI#
+ML'A:5`0`8^4C5B3RVAA[PJ'4,-*OU9T[0LCJU0L80,CNE28L/JM1NDDOCV7/
+M7E4%QRM'K-7)B9*YZL^:D:E(TDNCJ9`S*R+X#(,"%L4V:QE9?5Z6G8+>+GE5
+M6Q)\[?"W^G@B).%A]-9#YX[+:Z</-K!K<*7)J8\-$/.`!,)5''5V]EI6]BUM
+M`.]LJ%]JUS\K7.F9K:L:@T1V4+GSN0!W5FK;ALZ9^JJNIN`/IF5S;#4J`"!$
+M=Y4M"LT$`'?NH7V]1QP"HJE&JW+6II6JVHTB-0^BL4-,@@Y7-BI7823("GI=
+M4=3YE7E+'347-&T)5C.Y6-9=3IO(!=G=777`&1F?=:QK-B*[;),95-_H!P%9
+MK52XA15QC!E;W$5"[>3[HF;D@_W4-W@]Q\IJ)<>?T4+$U;+28_58W7K(UZ#B
+M6SV6N#)@;?LH[MWE#N"NF-TX91Y[4L'-J%N@X*;^!?\`X"NKK,INJEQ:)*'R
+MJ7^$+ON./+Y#N3+M,$_)4%PYQ`&HD#8RK-<:B`V/5Q,0JE<-V:\P,;1*]*(Q
+MS!]T,^DA%B#F$V6ND.RTJ(`D`$PEQ[]T[AOD?"3V@#!,';"!-/JD&(]T0,NP
+MXXV*9\BL[4S3F=/9-`/,R>$$C=()F2?F$PR<X3.;#LS([[A(DY$X[JA-C3D2
+MB&G&)([\H1R"92:`>3[!`3B-6!$Y2:-3PWOW2B=,'/(3$Y@!02,)#2,04&-6
+MV$G1\^R:0!M,@*A'2TDDQ]$P(P=,Q]D0PWN@&#)P(WA%27%4UG%[PV2(,"`H
+MQI@[>Z08#OEQY2`(<"Z80+TC&)3#:0!"=H.QC*<M],_E0,-H@2G9I+@1GV2#
+M8),[)-@51)QL2@=S<P8Y2]ASV3/,&`9PFG&\F)D(AL\F4FC)WRG<"?;^Z0&8
+M!Q[J*0@F8P>2F<`<@X]RG(.G\WT";8Y$`_JJ$V)SB/=,W_ISRGTD-G'/*0C2
+M21!X'=`Y$_/LDQOJ`G/ORF!!`Q]47],0-D!%HV).>R$M@0#ORI/3_0'("/27
+M&2=D#.$1P.Z>F/5D[);#;ZA"S88WYA`8$F92@2#KR>Z>89@2A`R<">R((MD`
+MZA]$3.T'ZE-&T[=@G+73IB>%`;/2\0`83MU5*FV_8(*9),;*WT^BUQD3\(-C
+MP\?*8"X>P@*]>.#OZM@=E2IQ3<UL&#M[*Y:4C5J-;!(&\97+*\K/RN>%+(U;
+MQKVM)@\C*]1Z%;>70:V`)7(^#[-K7M<6@>\?*[_IE.=.!G]%Y\[MTD:-E1V&
+MRV[&F!`P)6?8T@&:C)_NM6RI%Q`C/=<[7;&-&U9Z1Z<+3M:8E5[2EB./=7[6
+ME#?=9=(L4:8A6Z+(XPHJ#/3D25=MV>K))114VQCG?"G93<8Y*EMZ4%6Z5(1@
+M1"U$VAHTR"9`^ZG;1U#:)1LI@'T[JU09W(CE-%J"C;Q(`R%89;D"8W4LM#AG
+M=$XC3(X2QG=1>6!QL@J,Y4T^O'U0N!T$`[J"/2(@M4-9K8]U8,=Y"AK"9VGA
+M04KPAHP2LN]+0"=EIW8AIET3W6)U.X:`YH(6+6I%.ZJ9QRLZ\KX(`SV1UJI<
+MXL;RHA:U'ND@=UF+I2<U]R\``K7Z1TF(&G=3V%BSS`0`#.P72]&L2Q@Y(.ZO
+M:ZTIV?3M+1+-EH4;4-`&GZK6I6T>F`$YMI;/*UI95*@UC3^ZL$`-D;%)M&'3
+MI@)G@AN\J-\`KO.GNL;JKO3(XY6K6.!WX67U$@L,]E$TX_KKX><PL&?,K&"M
+MOQ/N[]I6!:`FN-HE).&,FO;L)I2?HLSK8:&;[+<M@#1(*Q^N-),0(A:CGW6=
+MTN/-#"=UO]/HAE36TB%SEJ_RZX.-\9716Y-6E((QF0L6.DK?I7-)M/\`-^J=
+M]U;L'])*YRNZL/3/J'NM#I%C7J-!J$GZJ7*QOTFMIZ]\UQ<0V(Y47\4V-7EG
+MXA:]GT=I:"6@K1H](H`QH`^G^BZ3#*N.7DQCE*ES5+891)G?"@UW;G8HNCL0
+MNV-A:4A+F-'T4+J5H)/H('"Z_MW\N?[T_#BKA[J=,^=2(/PL2[O*9K:0`%W_
+M`%*QI7-,@`01D+E.K>'',<:E*,"<J7"SIO#R2]LO348T5&.Q\JWTGJTU?+J.
+M_58G4*]>WFDX.^(5>T=J.O7Z@N=GX=-_EWS:K7LF9!Y4;JD3)E8/1NH#%)YY
+MV6M4<'&6D0=H3_#1KIH(G49]D#):V=7NB![C/LG#=+=$9*U"](VN!=`&?<IZ
+MS`6.U9[05$?^87<A/5J_RR=EO'MQRBF^BPN,0F\AG8)JCZ9>200?E-KI^_W7
+M5P?'U8`%QU2,S_95JA&GXXY&5/<..HD<?15ZCGEQ$-''U7L<T;P-@`T("(.,
+M%$\C)D8.0FQZ2@1EL@[C$H,<E$8F0A=!$D\=T#@M=JG4#P1_=)HDSC=,-.DD
+MB'#MLG!`!`_50%'J@A%#2_.!'W0L(B)`.\RD"6G`G*H0:/I/V3AO)'V2:Z-C
+M[83`M$X[YE$.UHTQG.V41$#O[E,-(R.4[C/]6/9%-@N_=+2T$['^Z:1J.G9*
+M>W"`B`6D3/\`=-I$3N-MR4X@M$P=/!35B`XM!+AR=N$-A(AN$VF1@?=%4+=)
+M$1]4FX!P2@30=MCV2<W>?E(F#&\8RFG!SG9%(F!`^"D!Q/T2!`/,I2-<@$0B
+M'<-1!!@3"%['DP!MB`B);]1RB)D2XR9Y0`<-DREI$0=D\MUD@[;2B9),B".0
+MH!P03,<IBT:3!F43C,Y^R$F`?5^7"JA:-P1O[[(],4QZ@9[(0?41!*1DG),2
+M40\`'&!RD=42#[B4[)+,$9,I-,GU'`V^44Y._J1:AL"A,C(/.Z6I-(8B792-
+M-]/)!`(D2,(\AN")&4,N,R0.X"!VZM\PGI8<)_[I3`&W<RFV``.1.2@<F9`R
+M.Z,NG<GZ(6-)J`3MRE`:)!$<*"2W8Y[A^JVNG6;VMD_U+/Z6QSZLC!G,+K7V
+MWEVS06Y/`4J6LVWH5:K@P3''8+4Z?;%K@UNHYS!Q^R'IM-H9#X).<\+7Z!0#
+MZ_J$CD0N.5KIBZ?P?1:UNIQ@]IGNNSZ=1)<#`6+T.V93I"0T<X73=/IYWCX7
+MF[NVXT;*D-#<$!:_3Z.F"(@*GT^CZ=EKVC`,K-=8O6E/V5VA2`SRHK-HR`K]
+M!HD#*-Q)0IC8A7:%.(TA0V[,XV5ZWF`8E%2V[,#"M4VDC`P@I`00,0IZ$C*T
+MR36$>EW_`'4],#5'9+^K?/.$3()$;'E0-4;.3VW2`,`$R1V1.`'NG8W2Z=_?
+MNH!T`YXV2%/<SE2N`D#NI&,!&?N@JFD0"0)5>[+:8DK0KD-,3L.5S_7;P,81
+M.2LVZ63;/ZU>L@C4N>J^96JG<B5<<RI<UI()^JUNF=-$:G-$^ZY[;Z9%GTUQ
+M!<]ICC"MNMVTF_E@]H6\;=K&Q_9974=+'&9V5TDNT?3F#7LNHZ32:&C&`N;Z
+M29JY75=.+6@"-L*XM5H4:(<,`&$-2EI)@84]"JI:;0\C&ZZ\5GIFNI2/<*K=
+M-TCU2NA;:MVC!5.\M`9V'NI<5F3F[QL#&RQNI$$.]ALNAOZ8;J@RN?ZH``3V
+MS\KG>'1QGB9S1JS]UB]-@W!+5K>+B"TG;V6-T36^Z[:3]E/C&3IZ+8MS!SLL
+M?K+<Z=^5NTJ?\@>_=95_3)?EOR4E<Y&#<T?+$B)&0M+HEZ&#0\S*:O;:J<PJ
+M#0659_1:LVL_#H@UCJQ>#/;*Z+H=:EITN@G;"XVRN@)#S@>ZU;*Z-.'-/U6=
+M:JW>M.\M7-;3D\*AU_KUITZF2^HT1W(6-=>(&6]@XN<!]5XO^)GB^O6JU&-J
+MNP-@3C]5Z<.MO'GWIV_BS\2Z%,O;3K8'O_JN0J?BJ[SQ%<P8V/\`JO#?$/7K
+MVXNG`5*AD_E!.5GW1ZE9U6/NJ%:FTY&MI`(7;]JWA)I]3>&OQ#IW,!]5IG$$
+M[+N>F7]#J%MJ:09XE?'OA?KE=I:"^#N).R]P_"#Q,ZJ!1K.]0.<_*XV7"\EU
+M\=OXIZ2RJ'56B"1A>=]6\WI]SZB=(.0O6[A[:M"<&>%P_C?I+:]%[@T`1O\`
+M93/'<X=?'Y/E8]K=,JL948\2.Q72])O?.HQJ]2\ZZ9-G?FWJ$@'8<+H^CW6B
+M]:T.])[_``N%M^O3K5U'74G;F!"EID'(.>P4-L-5,3!'96*3(GNMPM0W!#7P
+M<SNH:M5NF0,*>X:&DR>%0N7RSM"Z1QR+1J]0>(*7E'_&%6\QO^RG\QO;]5UT
+MX;?(=S`,`AP[]U7J"'=YR)4]P6DQ(D<GE5ZI;`(,[X[+UUA'/&X&X49``!&Q
+M1G3)GE"8@;'X40TDP#E,,.G8A&7$L#3$`R$((&44H$D&)PD\`G?(38U2)SLC
+M/Y8QG]40P(R!]^Z<:0Z7'&^R83SMPD021P@.D01$[\I0)V&W?=,W;$@_*;82
+M52G#6C(^436MW<^,;^Z$9.R7^X0)V7D[Y3N;!.KC:$@V$S]I/^PD#Z6D1D$(
+M2UHF<E(CF9GA(-)('/RH&`U'YQW1`$?/=`"0>Y[(].F6ELGB#_DJ:"0!L#'M
+MRD(_*1F-TGD%VXPD"-,R"XJ*0'H@[CE*'3,_ZI/`(Y^J=FDND?9`@&:#).K@
+M<)23C4E5!D'(D2A8`AH36G8'/L81`[`B.Q/"%H(_F3@8[IH9)R8^TH$3`B"G
+MR6:9'>4_Y6G;`Y*%@D9)]D0S6#`GZH]()R=DP!`&84M33H])@#@JJC$`=@,`
+M),P[5!(V*1,Y,`%,W<F=^$#P[D(@TZ2-O[I1$"?HF.#Z3"`FMDY(G"9S"XR"
+M??"<#`DP1[ILCU<?V1"`]A[>Z<`.=$B?V2`#L1_V3DD`8CA3H,`<F28V[!.W
+M43E*"=L2IK5H-5K-LS*#J/`71ZMY5%31+>_?V6_XP8VW:VFT-U;=H5[\.6&C
+MTXAK,D3\+/\`&.IUZ6NF)V"XYYS?JUAX[;[52Z)0\RL=8+I@8*[+HEGH:V`-
+MYPLCPO:%T$@D[X7:],M0W3I&%P\EVZ3AI]%MA`U<KI;"B&M@9[+,Z50AHU#E
+M;UE3U$2V,+FU(O6#7:1@`K6LJ4C\H5&SIF=_JM>UI'3[^RC<6;9@:9$*];4S
+MA0T&`$*_;T8Y*-;36],`CLK5!D-'LHZ;6@*>UAPGCL5=":F`0`3/]E8IC$<0
+MHF`[*:EL!,!6"4-]0,HP!'RHV[_W4U(2)[J$`W>8(A3,9)S`A%2IAQRIPT!N
+M4T(6TQ,$\)5H8P03E2NTB?=4>HW+64YD*45>IW(IL))7+WCC<5=,D\JQU>\=
+M4):UQ*/I5`$!SQ)]UQRNZZ2:2],LVL`)9GW6DXTZ+,B!W0.<VF))B,K!Z]U-
+MP!:TF"/LIO2^NQ^)?$-O947_`,QH`]UPM;QK1N+WR65&DSM/^JI>+A<7K7_S
+M#GW*\TNJ%?I/7J=1Y(:X[Y@J7VK>&..^7T;X:K"XI"I,SW74VE2(_P!RO//P
+MVOA6L6YS_P!UW-O5D`XE7&\)9RV*50"`#A7;6L0T$D2L:C4(]2M4:OW"Z3)F
+MQLMN1IW56]N?285&M<:6D3^JI75X,@._T6KFDQ!U&JV""`9"Y[JC_28C*T;J
+MX$.AP^%E=1?JIGV7.UN<.,\6.!!D[K&Z!J%R6G'Z+>\3T=3'/VC]5B=#9%WM
+M,G"EZ+'7VXF@`<E5+F@#QMA:EC2/E@XRD:0-0J1AB/H$B%E7=!P>2W8KJJ]$
+M1$+.O+8%LP`MQ&`ZB1D'/[([>X=3<`XF#[J]5MP&$9SLJ%S1+7'>.86M;5<N
+MZ(O+:`001C=>4?BAX9NF:JUNS#1D0<[>R]/Z9=.;4#7-AOLMFKTVTZE;::C&
+MND=EK#+5<<\?KY)\,7%ET_QI:W'5Z`?;TJFI[*@X'RO6/_$'XT\$7_X?OL>G
+MT[*YO:VGR'TF-FB`X$Y&TA:?XE?A9:W=%]6VH-94`P6#_1>&>(?!W5.FU1Y[
+M/29&QD1$S]UZ\?[>^WGRQF4U^&9T6L0]I<W\OZKTW\)^HO=UIM,-($P8^JX3
+MIUAY3,,)=M'NO5/P=\-5*50755K@7&<K/FU88O9[2HYUJV=U0ZN/,HN:3L%<
+M8X4J$3LLN]N&ZCI=@<+E>(N$W>'`>+Z1H5!5:(`.3"BZ7?,?7I"#+MCP5T7B
+M.C2K6K]0W"Y#H]L*74H!($X,KAY/R]F&OKU+I%8.MV@X,+0:26R<K'Z!'ELW
+MD>ZW'M`9(/RKBEJG>G+O5CGW61>U0`8=\+2OGQ.?E<]UNNUC'&?U7?&..5X5
+M*MZX5"&D0A_CG_X@N?KW;_-=IV0?Q=3_`&%W<O6O`[D#S"7&>%5JN].D1!5N
+MX+7OEK(G8`[JM<L+':7"(X7>N2%S2,@$2)R@&>%(X3$ND(1`/?V32ASI(@I@
+M.-T<NR!]<I.+2[`COE`!,[82>T"(TDD?;V1L$B"\#G)_1!IYS]U`B#JV^R0D
+M081-`#ADHB!L'?W5@8DNW'Z0$VDGZ(X])WA)S=D#`^F,S^Z8"<1E.W:"=L)$
+M$"90(3$29W14C#FRT'V.Q33@YB.1RF(@9A`3RW=I4=:=3B'&"BS`@@2F<YP&
+MG60#N$$;OM*<3L2?H4G:NZ0S$_LBF#=YF$\3.EWNDWDDGX3Q!,$*:#$G;4G:
+M3.)38)C=(G$*AR3P283M)/=,"WE.2)B`1WV4#ZCR3&TIL[`PGYV$!,_?@]I0
+M(EP&28"%KB8!/W18#>-LYW09)[J@I))@Y"D-1SZ(IP(;[*-C9,$@>Z)H])R$
+M#$&3V[A(`B#"D;ALD84CRP6X:6#6#.J=QV326H7$XS/PF(=));]`C:9(,#/=
+M'#8@E#8!J()&0/9"3#I<V>Z.!IF"`>$PQ^5L'N@.D3.!N-TU0D-@3*3=X@9V
+ME$]D@X'R%`!(#F@".,KHO`/0J_5NIL;HEDY*PK.AYM9M,'\R]J_">SM[#IS"
+MYK=3LRN7FS]8Z>/';J.B]!I6/3?+#`-(R>ZX+QC18[K@I,=MV*]*ZSU.C0Z:
+M\AW&%Y:*K[[K3JO+BO)CSD[R:EM;_ANWAK1I=\KM.C420"6K!Z#1`<UIQ`C;
+M===TFC#`,I]<JO\`3Z1:X`C=;-K3../=5+*EM#25K6K02TD05*W%NPIY$A:=
+MMC(W5*WVQPM&U:3[?*C2Y;#8PKU!P)WA5[=@(^%88T#8*JLTCZ@)QRK-NX0?
+M3"@I`R.59IB1/*"1F'3F%,P^J)^JA;JGCY4]$9R,%3:I&@D[%3T],?""@UQC
+M;Z*5[6CA!(VII:9":I7QARJU*P!W52O<-;JSO[J6FEB]N]$S@+G.L]1)!:#O
+MV1=9OP`6@Y*Q&%U:M!,K%R=,<4ULQ]:KJ,Z>RW["GHI1!/NJ_1[<""0"%M4Z
+M;`T8CX7.1M0N*3GB<_"PNOT&LIE[H$!=:]K0"3PN3\8%S@\,)5LU-D_#A^J>
+MNJ?9<=XXZ36NJ(-,B09&%W#Z+G5O4/JAO.GBK3RS"LO&EN.KM%^$[:M&T8RH
+M22`O3K0N\L?YKA_"EJ;>H.R[6U>&@">-RL8S2Y]M"DX3$J1U9K6Y.0L\W`8"
+M2<!9/6^N4K5A+G#'NM[9TV+R^`)`<LVO>R<N"\W\2_B):VE8M=6`(]UF67XA
+MT;FM#:HRL7+ZZ8X5ZHZXU[F5%7<U\@1\K`\/=8IWK`=>>RZ&VIE\'/\`FI,C
+M+'3'ZW2!ID1PN>Z93#;T;[KM>K6Q-N[&ZYFE;Q?2-YRM6\,1NV3]-,@[*>FT
+MG)RGZ=;%U,$;J\R@`?WE,>6:SZM,021"KOH!_P#3]5JW%`$8(*A%&&G"VS6%
+M<VL&#PJ=U;`4W-Q+AN5T%Q0;JG]U4JT&G<#/*VPY*ZHFD9`(*N=$Z@^F0UQV
+MV"N]4M@>!LL>O0<QVMLA6KW.74FM3KVY!`]EQWC'PQ;7K7.\D$GL-EK=*NM1
+MTDG_`#6D]OF-@D&<JXYZXKEEAJO'*/@ZA9]2#ZM,%L\KO.A.M+2@&L`"TNL]
+M-;5S`^BQ;JS-*F&M`$<K6^>$]99RT;[J%)S(:1]UF0ZM4]!D$K+N65&F"=D5
+ME>BW?+B2`N>6=^MX82+?B"U>RS+78D+DK*FZGU(:OZ3L%U=[U)MVP,F)[K.?
+M9M%<505G/5G#4NNW0]`+6M!)(A;AJ,-'4:D'@+G>GO#6#U+294+F$$C(X*WB
+M9(>HU@1#>5QWC"[\J@:<P7X"Z7JA&@DN/U7"^)W.N.JT;=N9*]&$^O/E?BST
+MOICZEA2J%IEPG]58_P"$N_P%=?T3I8'2J`.^E6O^&-3ES]WQS5W]APJIW$`R
+M5:O=+JA<&``F855X,D@8]BO6RC>3J,[\@I2P$Z09XGLDX3).23W0/W'<;H$(
+MP3E,8G?!1`9Q"'?!_P"R!O8@GW2';!1%C@W+26S`(3.:0^1('$JAA^6(B$6\
+MG?;"%HR`"B(@Y"@+4<'@)#\LF4#<MW1-((&-^Y5#YVXY3/'<$)H)"9X).24!
+M.<!L9^B0.?9!F$T3$H)`6')&3NA?#N8'NF)SN,)MW3!'>$4HVQCW"<'./W3`
+M83!L'`4!.;!("8>[3LEI`,28`S*<`:?9`P@`04@)G"1$B-B$6F&_"H;TPGF!
+MQ]TS0=<3&.4S=Y/'NH@CEHS@)`#5ONG`(W`^)3&)[>R*?T@'T@CY03Q)E&V(
+M(WG;A,V`_@9V"(:28R8E'ID0-TY)#2UKX!W2!@QW0)H.DR["+4(@Y*#$P#NG
+M`;OPJ&D`@?NB<2`1&>$((!QD)<G5'V0&R'-C?Z)G-C))]A":D&EI#0G@C&([
+MR@>F)=)!PC,MQ*"F,F!"EIM+GC2TDSG*@N]%8'7;7`1G.%ZAX4N7&M3H:H!@
+M&%S'@SI%-U'4X&>Z[?PCT84KP5BTX&Y7F\MEX=\,O6+_`(W:VAT@PXDQB%R7
+MA.@'W7FR22>5L_B9=Z6-H!RK^!+?8N$Y[+CCQ+8U;P[+H=``-DB>5U73*>1C
+M'98O1Z0$8PNCZ53AX)V4VQ(T[)D1Q[+1H`$P!E5[1H!SSP5>H-;M*S6XMVS9
+M`,%:5N,#"J6K1I_-^JT+1L-U;A%6J$Z5:8`(]U7H@=HE6!M`$JJGIQ,*=CL1
+M.%!1VR-E8HB8,9*C6DM$?4*S1:V1.%#0:6^TJ1U4-W5V:25:[J;]-.GC<F=E
+M%=5XY_55[BY`$ZMUGW-QO!E9M)%FYNL8&8PLZYN"9R@=4)D:OHHG-+C]%BMR
+M,[J=1SGXF$NFD`^KNK56VUSB%&VV<P86+MVFKPV>G5FM``6BVKK:`#"P[*F\
+M/`+EJVI(@?ND6Q/4<\LCA974+!UP3JV6TQNJ!PIQ;-TSI]UO6V.G%U.BM827
+M#G=05K#2=L=UV%[0:&N`;E9-S1;L`5-2+.6/96K6OD"(6FU[64LIVTAO^JAN
+MA#2&\+#2IU6ZTT708,+@?%+[BZ<YH<0%V=_2?5:1)@K'N[`YU-3MJ33PSQST
+M2]JW#G4VN<)69;=+OK=C7.:6EO*]TN>F6[YU,&5D]1Z-0J/T:0>(6KG9#'*N
+M:_#?JU>C=,HUB8G&/]%[CX=N&W%HTC)/N5Y=;^'Q1K-J,:`9X7HW@FF:=%K2
+MXDQNN/,K6=F4;74&`T"#&0N9-$-ZA`&Y767PBD8,K`#`;[5L96ZY1M]-MR+<
+M1V4WDN`("L=,9_(:8X4U1OK.%TG3G6<ZE`@A0U:9#96C5I3PHJM*`<$K49K*
+MK-!/^2J7%/>/LM>K1&8'TE4[FF0#`!51AWM)L:EDWM$`D@[KH[JB(]0"RKRB
+M-41^BC6G.D/IU"YI+2M3I=X'0UYSLH[VD`2"/LJ<>55#FR"J6;=`ZFVI3G"S
+M.J6@+.ZGZ=<RT!SOD*2X<UV(P597"RQR?4K8"8"P[VB0X@$Y79]1H,<3PL*]
+MMOYI`B%N\PG#&HL<*@)V[E:#'M%/)!)&Y45S2%/U1D*M4K@-U2,=UPUJNO<;
+M%BX&)S/NM`NTLV6'T5_FD$#$[K8K5&LI29F%UPY8RX9G7*Y92<22,+B>AU#>
+M^,=.N6M.P71>+K@MMGD/CTG=9OX2VC+KK!K%N=>Y7HG3SW\O7>EVX'3Z0#?Z
+M>58\@?X5IV=LP6K`!B%)_#M[+K'E?`-Q)JDSG=5WP<RW'ZJS>.EY@0"<<JK5
+M?G!)^5VKLB<)&,DH,[`C*E<1.VWO*!Q;I(@ZIP>(4-!R3,),'I(D=Y3EPC`G
+M*$F3/]D#N)VC?A.2YP&HR>QW0!_^RG)Q&^-^Z:#9!B-NX1GU.)(P3F,)@8G;
+M/UA-)D-)$#8*AY$!K6DG^R4XVV288[#Y3N)!(TX]U`S2=XA-F8C'=&S:8QLA
+M<[.V1A`T@-T@9F9X2).F83NRT2`8"%Q((B$T'`)]1!SRF<T@Z<&1/=2LK.;E
+MI=MI^G9`]V9C`[*J$@Q^6?A-)&8*)N4S@-YE`HR"3]-D],P8C8II'=(QI'Z$
+M*!R2-FE,3&THI`&\D'9`"),H$>#.R<9]Y2!W`&4[2([_``J"#HD&"(V*8$;C
+MZX3$B,3GW3LB,$SQA1"8`23JX3ZMH/RG%0:1Z8@S,)C^>50\C5P)2)$$P/9,
+M=$A$S000XG:0BADX[)-/9.V"1.>"B,:1IC"`&"&_*?&Y@?"=X$0(CDII!,DX
+M&\)H)OOE$.^`WMLD0-YS&1[)@?5B/[J(=ADB`M#H],5+EK($SLLX1W``XE:O
+MAMS/^(4]1`$J9<19-UZ1X.L7-HTSGX'*[BT'D6VJ,`25B^#:;/X.F&Z5T=YI
+M9T^I$8;_`&7S[;M[,L9T\W\;W)N.M>6TB-41]5T?A"EY=LR2)A<E??S?$3R9
+MPZ%W/0*(9;TY'J,!:O&+'DXNG5]%&V%T?3&-P,@\K#Z'2'E`RNCL6P!@CX48
+MC1M)#8._RK]!N0"JELW`D-^5>MFR!$K-:BW:#(,+0MP!OM/=4K89VV5RD1GD
+ME%7*)C`&RFI27*O;\*S1&>))V2M1:I``S*LT0,$E04FY$J9KH&!NHJ8OTM]X
+M5*]N!,:LA/=U@![K)O*^IQB=E+5B2M<:G$`D*(ND$3E5M0D[H@2,0IMK20X^
+MB-CA`(.5&R'$#E6[>A)]E%!2]3NZLTK<$"1NI:%L"9A7;>B(`(5TOLJTK6(+
+M6Y5RWMR`)^RMV]NT1'"L,I,V5F)[(*5,1B,=U.UOHB%,RB`,DPK%.@(!W6IB
+MSMD75OJ!.!&2LJ]MW-<3NNJJ46EN6CX5.YMFO#F@#/)4RP=,<G*Z71@;*-])
+MSC,86[5Z<W48F"D;"&@=NZY>KI[1S_\`!S,A4>IV8T'V755+8`0,E9G5*/H(
+MVQ*FE<)U!OE.?MA95-CJESM,E=9>=,\^L0)AVZL]/\.`.U8.%B[IN1B6=H*F
+MEI$+J>B6XI4P1`14NF"B[;;E:%*D`P8XX*2<I:J]3>!1,[A8]@T5;V?=:/5W
+MM#2TF.%#X>M]5?61REYJ=1TMC1B@&B9C=$]FY.ZFM9%,<!'5`[_5=XXJ%1I4
+M>B2<A6:S=1C:%`6_>%4JI6G@?*HUQ.P^5I5VAQA4Z[(;I)"J1GW=.1,02LVY
+MHF3^F%MU&C3@@_*IW3&AIG[J::CF^H4C!D[%8US#:G(@[A=-?T0YC@!(6+>V
+MA#C@&5-MQ3MW.#Y!P<K0;5)9E9_ENIO@"0,Y4[7X@'C95SRA7A]&#*R[]OIG
+MGV5ZX(#9CA4*YD<@+<<K&7?,+V1)G^RY[J-9].OY;1.5TMZV-7[KF^K4GNN`
+M1,$\8A9RGTQO+H_#%*+=I(@]U9ZM4`)@^RJ]!?Y=D&@Y`0]2\VK3JN8,,;)R
+MKXYPF=<GXVO/Y6AID@[RND_!GIU6F&W#@<G405POB=YKW[:8[QDG)7J7X14Z
+MK;*DUV,`8^B[R<R.&?$>CV];31:)B`C\_P!U7&!&HI9_Q%>OT>/V?!5TT3J(
+M#>T&56J@1+3DXRK-P/YG`/;=05&>K2X<*O2K$Z9`!!^4GMTZ02<Y([(W-&WN
+MA,2>W!)4`;B,;IB,Y*>!ID83Z,$E`+A.!*9A)&Y`]D<YF8^J8@S,G[*A-;NX
+ML($Q,)#\T'[!(`<S,I1+H`_T0(&=X!"3L#<X/T*)H&C;,[IC+G:B20@9KO3C
+M.$B&G.T\=DA`W"(@;9A`.YSA,[#2/H%(X2?D90M:)(C$_9`+#C]4=Q1J4M(J
+M-`-1H>,S@[)F$MJ-J`!VGAPWA27ES7N7,\^IJ%,0T1L-X_5!`P-`,C!_5.(X
+M&R>!`<4Y:-.HC?*`($[3E-$$1RB($8R)[*ST9]K1ZE;U[VV-S;,>#4HM=H+V
+MSD3PH*PS.,A,YQU2[C`^%/<FD^ZJOH4C3IN<2QDSH$X$\X43J<F.(^R``T$8
+M(F=DP',<J0T26X!_R3FF2XC(X$E4"TPXB`0<2DW$1D1OS",L(=Q[%,6$^HN`
+M^2H&$1./ND^`8&>^488=,EPC@S"8@#5(:<1GA`+FM!'O[I-TD=C\I.:#_4`#
+MV1A@+8)&_=4"($<HZ+A3J:NV1'?A,QD"-6Z=S&B(<!B4`AH.2[)RFD2?43]$
+M>EHD:D_E,`:2_A-@&'W/=%&29.W?=/Y;/\8']T!#)F3"!L<D[[J:W>:-9KQ\
+MSV0!LMEDCZH(PX3LH=/6OPTZ[2T4Z%=X#L`2?9=IUR_I4^CU"QP&L0#*^?>G
+MWE:U>'TW?E[+;/BB[KT!2=4,;+RY^&WIZL/++_9TW2GBKU\O)D:H_5>B]*IB
+M&,#3``@RO-/`G\VY%0Y)S\Y"]0Z,"6,Q&Q7/.:X8SR]KMU'0V::;<[?JNBL6
+MRT`F,<K$Z.STMG.%OV`P#N3NL$7;8`&(5^V&`Z?H%4H,]0,>Q]U?MP<3\J-1
+M98(`D0K-%IB95<$@YV'Z*:@\GX^4VU%VB,`JU1C"K6WJ`5IK0`,J5J+`VU9"
+M:I4`:/5!0EVD8^RS[^X+=7J@!2J'J-Q!/JQLLXU2Z<SF=T%U<&H^)4=!QUP=
+ME!8:TDP"9^59H4G:<R5'0;)!!]U=I#/;W[*:78K2E+CQ')6A;TAJ$`3ONHK>
+MGD3E7Z%)P:.<YA61+4E&D&R>RL460)A-2!=@8PK%(-@3\0M*DIB`TR,J2F`7
+M)`!V&P2G9^;M"HL4Q(]E-3$-Q^JBIG/]E/3$C/PMQ*"KANP,JNX'=6ZC-\J(
+MLA^)"595>G3#B<"$]6D"V8E3,`#\B/=/6(`(^JFFMLRM1R8$86;U"WD'`6S6
+M[XB%1O=);@;KG9'25S;J.BX@C8K4L-#F`1E5NHTAKU-$'=*SJ^7$F5QZKI9N
+M+US2U<1"JW3A3IND20,*=]VSRSZA*PNMW^#DB>)2UF1G]6K&I<Z`5K^'*9#!
+M(^JP++57N)W!.ZZKI+0RFULS&%,>TRZ:U'#!S")X!&-^R"BZ![E2O`^(79R0
+M5&&9(QW4%1F8C'=6G-QOME05)F`JE5JK`!@&53>S)5^O.D\*K4VF=E44JS-!
+M)5"\!+<8E:=U!DA4;B#@G)4VU&749)(GC*S[VE`+8,E;%8-!D$*A=AIU1OOE
+M-*YZ[IN;4)B.,*`@;[$\K3O!/ITX69=L]4@^\*QJS:.JXND$<*M5T@1"FDD^
+M^RCN"-)!&58Y933*ZBZ).^E85R]KJL-'J&5O=3PUTD?*PJ[8?M))PY,JXKMC
+M6+:6(B),*OU*\++=[FGU.!!,*%U;2T,&_99_7*[OX9P$1&4PIE&+;UA5Z\V?
+M5Z^WNO:_P_I>784_3!(F>Z\2\)M?<]>:3_34X^B]Y\*L?3Z6QH&-*].$_D\W
+MFO#3?<L#R'-,C!A-_%4_\)5.L[^:['*'5[+W/%M\35H#B2#CE5JH!XF%8K1)
+M@P%`^`X:_4#N`N;VHG$Z"T_E&0/=`?B92?ZC[#8)H..(,[H&V!E)H`/_`'3O
+M:00!VF4P&0$");DP!/Z)B"6@QCO*)^<F7$<RA<XP`0"`H&W.HDRG!`9G&(W3
+MD@DN``D[#9(P)VGYA4)H]4B8Y$H@.QVW3-,[`RB$'!*!M(T@YG:2FG$2?E$T
+M8[I%IT$D2$#;@0XR1E(8&'9.$FP.9]TG;",>T)0YTD[X]D`&X+D0@-$B?HA.
+M1(R@=C?<P<I">2-LE-Q,0@:=.YQ\(">WW3`Z<R92CTS'SA(9.1L@+4Z!)3!Q
+MU'8)W`$`C*1#7-)_+`^Z@$O=J,.,)M9<6R2F,S(28UKJ@:7:9_J*JB#G`G(P
+MF!=@G<I#!P9,[IB1VE`@2#P.,)VN,&2,8RE(G_-,T2=(]1C;=0*?3G;X1AQ.
+M&D1*!PSP([E*??Z*B1I,C&R<ENG!!GW0-!:S43B8W3P)B1!4!`D`GO\`5,\G
+M5G)XDI2.\`>Z1D@095(4F/68E(NA^_QE+20(SG8]D[A#@`\N`R3L@=CM.'-D
+M1M*$.,'3NF:`1C]24I]1C"B#IG`](GY4M!H\P0/U45,8!G92VT>:-P)RBQZ)
+M^'E.&LU8C$_9>H]$;AITXP%YK^'%+66DN:.TGE>G]$IP]LU&G"\7EFZZ1U71
+M_P#EMF8XA;MF8`GY6)TMHAI6W:-,`X^JYUN-*UG`S&ZOT(`ET_'94K1I(GZ*
+MVP:>2HTG)D8)D[*2T$B!^ZAI9V<KUHP'.!\HU%RS8("L#;V_=16\-`SPC+PT
+M079[J:VJ*\J:)D\+&ZA<:I;B>5<ZE6'JTG*Q[DDN)/*R!8XET'\OPK=O3U.S
+M\JI2@>TJ]9MDC8B4T;7+1AU?FPKE$MF9D[95>@P`[1"O6H$[X*?\6+-J#J#B
+MM*W`(`GW5&DX-P#*O4*@:!ZLA6"Q2;Z"1]DS"2^",;RDVLTX$2I&:"Z9&RTL
+M'2,84[#J(,`2HZ6DN$?=3!XF`=D@D8R/ZL`*1CHV.V84#*ITZ<;J1KLC:2M"
+M<.PF$%V^/=1.?I^4[*D"<*[-)7QI)D;J*KZA&)3O?)F,)M33)4%2L#JSG*HW
+M^)P%H5R-EGWC06F2L9-XL;J-32#E8ES=Z'D-,0M?K`Q`.>"N=NZ9+BX$X7#)
+MZ<$M:^/DDZ\]ED7]TZK5#9QLFO2]F!RJUI2<ZM,<_=0L=%T"D"QN`)72=/;I
+M8,+$Z*P-IMANVZW[0[?"UBXY+=`$NF,*R6:LGLH+8^KG*M2"(E=,7.H'M(DA
+M0/$YB%9K8!C*K$R2(SRM(AJ06D'M]E3K`D?*N/@XE05&C/8<H,^X(F#B%3N6
+MMTDM_17;QH@F=\`E4:\G!/'=*U%.LT#X&%2N\B>>`KU;_P"["S[P2^`?JC3.
+MKB7$[$9^JH7%,:'<DK2N6@`DJC<B!$ITK+>0UY]E!5?+C[*6[:0XF8$K/JO`
+M>?4<JLW$-Z&$96)U!HF)^/=:]T\%N3@+&ZD[USJQ]T^//E-51KO`>0[A8OB>
+MX:*+@2&X[9`6G6,N=J<X97,^*;@.+QJ)SF5OQSEFM/\`"JFRKUD.=!@_W"]X
+MLGLH=+9IWT_V7A?X1@#J`<7""<#[+V,UGML(.T?9>GPS^3Q>>HJUZSS734C*
+M'^-I_P#R+!N6N-=YU')[H-#O\7ZKW/*^7:WY@V`3['=5J[8)])'"M7`!)*KU
+M-);.?A<'N5WD;<E#I&Y'V1G)W.$Q(TX)^J@"0';?0I$X+I(G$)P`1F04SVN`
+MQA`&HDXF$^II$"?JB(`=.1^J8P3OCW0(E@,M)]TL:I((!2(!Q'WQ*38`,EWT
+M*0.TMP&X]T[B`,Q.R=L;[RF@3B539PZ/C9(N]\;0FV.GNDYHWV0+$2#OA*I&
+MF2A`$P#$(J[FOJ:F-#1VW40AI#07&(]DB0YL`3R7<I?U>K./A,YIX./A#H+0
+M"(V^4B2T07$CLG@1G<;82<UIYD(I'8P=T(@1+D\#/JE,6R>ZH(")@X3.+=)W
+M)3_T[(7-,?FQLH%)$PF$\$%/I($2DSG2=MT#`NDG5D^Z6VQ`QLD0>=NR$P!W
+M^J51$_U2,\2GI5#3,M,&(D'9`UH.Z<@!`MR8.V8)2/M@]DT`'O\`!2`$D;_*
+M!QN<A.`(()CX30=P0B:#J.HH'+=X.R;8C$_">,Q&0DYL8@;;('#LG`@IHSF`
+M/A.1C:#O@H3ODX0$T8P`4B)$:1/>4FMS,.A)S9=@[(@F2/\`)3V7_/;C"@`X
+M*L].$5`,CX18]'\`:139(X7IW0A(;"\R\`L,,#B97J?06AM-N%X?)/Y.N^'5
+M=+@-:3QNMRR`+1DQ&%B=*@M&(6Y:B",;K%:C3MP/+YV5BGAH[2H+0"/[J<8?
+M"RTEI.@C'*T+,`JE2:(SLKE"&MW1J+3<`DE5KNL`(!QV2K5@&F52N*FL0TY4
+M$-R^2294%>JPT@UM.'3.N=PFNW$-,G94PYSZ@RB=K5`-DP9/*O6T-V!PJ-!N
+MD@;*4U-.2Y1J1KTZK0T$NA2_Q8#0)(GNN;K]2T#33,RL^ZO+UP])(:<[)MOU
+MUV[=G463ET0IJ?4Z9P'97FU"^NGW'EZX.RZ+IM"Y>`XN*;OX6W&?77TK]D@Z
+ML0K=&^8X8=E<U_!5A3U:R.52_B;BC7(!)"F5N/:XW'+IZ!97$M!+E<I%AR25
+MP=GUBJP`..GY6]TGJK7#-3]5<<I6K@Z$C`@!."X9;((4%O=TWM$'=66%I_JE
+M=8Y]&U.)R3E&S:$P`W)1@8C.%-&PAP)_,F<^.4SF&)&%&1!&5`U0^J95.]!+
+M294URYPG*KU'@CU'/99JQC]3I%TD;K%KTR)&)*W[_208"Q;W!)W]ESR=<:RK
+MVAJ'PH[:AIJ`E77Y:3*%C0'3N5AO:[T^`0MRR/I$\+$LL'?"V+(@D$'A:CG6
+MI:C$85AS@UN`%6M.8(]RIJH],S"W&$55QR=E`70"#N5)4V)!5>JTB3,%79H%
+M5\'A1/<'#(^O">J8YG]E!DDPJF@5@'-@B0J=S3GLKSF0"3^BJ5ORF/W6NS;+
+MNF.DPJ%<<1E:=WALK-KCU?KA--13N&!X^%F7Q@XV'ZK6K2LV\``D@(LK)O2W
+M<A9%T(<2!CNMB_:",+)OB6@I9LM9]S5()@0LV_?J)$3W5^ZRPZL`<+(O'#6[
+M,]HX68XY,SJ3RQCO+S\C9<;XCJ@U<Q._^\+INN5Z8:0V,\E<5URO-0EIF#E>
+MCQSEQSZ=W^"[7/ZJTN_5>N=>J"E99($!>-?@<[5>NK:X`"]!\47HJ4"P/]EZ
+MO!/Y5X/U%Y57]0I%Y))W3?Q]+N5GTM)I@D$HH9V*[^S$E?/=RQH&.>.RK/TD
+MF6\<*U6>X$_E^55KETB2`2N3U(@!JDX"&-1_9)Y)=O\`5($ENXQPB&<T9C/U
+M0F=/?W1N)`$D9V0:N1PJ&`,;_JGQ(/"=CRUI(`AV"#E,QS2!'?9#9CET9/LB
+MTZ1L1\*2N^B7@TJ98`T3J=.>3L.4S3+0[3M]D`P9V/T2$P2EK)))W]BF:X:C
+MG`0/EISRFV/*69$[#ND2,`2BF&<@Q*0!W,E$8G/Z)AC9N_,H&VD$2-X3-ATY
+M._=$8,<?)3:1N9@\DX4"&WMW"9TS.93M@DC8(G$`?"HB^=BCHN+'!['9;D'L
+MG<1/I!CLFY)@XX0/4<ZI5<][M3GYE#'L,(RYI,B"0$VIH,Y01P7/P9/LD#P?
+ME.^!$RWL4(TSOO[IH.<QD3RF'<D$I2#B-T[2'`P<CA129G)A"=AV1-(C3CV*
+M3O*X)_U5`-WA/!!W"3@`2)3P)WXR@<`#U#CND#!S]D0PZ&_E&Z0WWV[J(;?M
+M\IR(>,[^Z4,F&X!Q\)W@#TDS'(0,R(W@^Z3BX^WR4WHT[_3**6EH&G(Y!.55
+M$2#$-(')W09`AN?=)L3))QC9.<&<91#AW$X"N]*@U@=PJ;6D@$`1W6GTND&D
+M.QE9H]`_#_-8`#CE>J=`TEC,%>5?A\0;IC2['*]7Z""UC>5X\_[.KING;@<+
+M?M22T2L/I>X&WRMVT:-(GCA<ZW%VW.!A6*8+G0H:(!SL%;MF@0866XLT&0P<
+MJ1QTB04-(#Y$(+AP!@%*H:SS!(*KO=IR8E%4<#Z95>X(#42JUV^7$3A16U,%
+MP=ND]NNI`,@*8Z:5/=-$A[BJ*3,X7->)/$C+)CB7[<)>*^JTZ-LXO>`!LO)/
+M$G6!>W[J;JI%.=X6+;O4>KQ>/?->A>'_`!11N+R7/G,1_L+L_P"-H5K::?(7
+M@5O6I4&MJ4ZI#VKL?#_BNG2L]-:H!A;PMG%<O-XK>8V/$76V],OA5J&&3NM[
+MH/XA].9;-#Z[!`Y*\:_$7Q"WJ5?RJ#O2WGNN0;<U!@//W5F][CI/TTRQGMV^
+MIJ'XAV%W6;;4:S7N=L`5UO0;47E`5WMW7R1^'O5FV/B*E5K/].Q/9?6'X<]<
+ML[GIM)K:C2(WE+;E=9.'E\7[7]6A?='!;+1E46V]S:O],D+L:9I5&#U`SV*!
+M]A3JR"``LWQ_@P\UCGK+JSZ9#7DA;O3>JLJ0-2IW'A[S:T4P/E4K_I%[TT"H
+M#+0?=3^6/;M,\<G7T+AKA((A6:;Q&XA<7T[J;F0UYCY*W++J#:@`:X'X.RZ3
+M*5FXZ;3].GB56JF780,K2,$''=.XDB1"5-:15!J:>ZJW+0`3*GJ.TD@G"AKP
+MYF%C8RKQYU0`LR\;(,B/=:MY3AI)P%DW67;[_HL5O%2TG5$?5/I/,(B3&-^Z
+M"8=!^ZQIO:S0QMN%J]/.`0<E8]%P)Q@E:O3#!]E6:VK-WLIZ@!$E5:#HCD'L
+MIG.B"MQD#Q!.57K&3A2UG3,*"I).TJJK5"2["'28D[*7TAV<E`YPV_NM1FHG
+M.)&^_NJU?(CA3U7>G.55NG#20`M(IW+001NLZLT`GM[J[7<1,*C=.,F/T15.
+MY=!,RLZ_@L)!A7;DDM67=O=M,@H,^NTQ(*R;W+HB/A:5Y4`$;$+*NZX)))D*
+MEJA?._EF<!8M^ZF&;Y&X"UKYS7,W'U7-=4J$^81$#<K.OPY=L#Q!7,.8'3V(
+M)"X^_+JI?.0<96OU^L#4>`[/"PJCCHYEQR5Z_'-.'DKT7\'!Y5HXC[_5=3UI
+MI>#J)$9PLK\+K`T^@,K3EXG]5<ZS<^LM8X%TP0%Z/#.-O!YN<DEO3;Y+<\*3
+MRQW5>E5'EC40"B\UG<+>DV\%N7;-('IDY"IU6'))&#RKE8>C42T@=U4KQ,<3
+M*YO6@)B1B"F<P`'41V1.T@X(S,SPA(!F2)'=$H`)@#8<IG[_`"C'Y2.^R&`2
+M8B/<HH'!LB`?A$S0:<:I)X[)$>KO"36@/@=OE4.\$'26P0<@J>G7;3MRQE*G
+M+CE[A)^D[*`-`)./F=D0D-@$`(&`],DC!2(;J<B:T?$)B,[1]4#5(:[(V3$#
+M223'PDX;(@R8:(S(W4`B08#1(_1,_#>_`1%HG83O*8-$@$?7V0T89:?G,)X(
+M,C'9,1C';=2.CR\B%0,Z6D#&K=)Y=`U2G#89,?FV/=(M$80,9)B4(:?>$^B1
+M@0$;8TF9S[H!#009"8-_I.(1N:(=F$+FD@#4<\H&<P1!S'NHB(=)^REJ.&F`
+M[[('#83'*B@<(.^R1!=DF.,(R"'&9@]BG8T%QU:BT;P@%H+=."/A-^5^[H[J
+M2&D$"?JA=$S'TA`TR?S"#WX1%S2(@`]^Z%D1S*8;Q.P0&#Z3D"<)-TDDDXW[
+MI/:)P<;Y1.:0R2[=$"V1L[8X2))F#+DW!.K=.T`.W/T[H'@D3(2`)D<$)JAU
+M$Z73/!2:-,912CU8'^^Z/2(@B#V*`CTET@'@#E$,G5JB"J@K=LU/\UT%C1_D
+MM,0.%B]/:75=/?E=3:TW"T)(PW("YY5J1T'@`?\`JVM$"<97KG1)\IN,PO(O
+M`LBZG'SVW7KO0/\`EM)7ES_LVZ?I@@#/ZK;M1L9C&Y6/TULM!F%LV[8;.KA<
+MJW%ZCF<J_0;GD^TK/H`F#(RM.S;@9E9;2%Q#-B%4J23)5FJ[$;0H'9$'"NC:
+M%Q!R!LJEVZ9$[JQ<``0%4=)))2I"I-@:MH69XEZBRUMW0[*L]1O!0HDD@0O.
+M_%M]<]1N#:VY)DY/99SRF,>CQ>/VKCO'WB&XN*[F4G'1/=<5_P"H=4)=J))^
+MB]1;X)-2B:M7+CG*Q;OPH^WNH#-0!Y*S/),7T,)CU'-65.N6B7[9C=/=U"PP
+MYQ`[%=)5Z=</=HT&6M$``<*.MX4O:C"]M$GY*D\D^MZD<9=/<XZI,'&^ZJ5-
+M1$SD;KL7>$KL/=J88!'U4'4/#%U;VVMU+*Z8^6.>>,_+D[>L^G4EKB,[KN/`
+M7C_J'0WL8Y[WT@-B<A<;5I:7DZ1`*C:)$?7==;)DX98_*^EO#7XT6!#65ZP8
+MZ/ZCA=WX?_$WI=X6M;=TSJ'^(?YKXQ:7LR.V#W5SIW4;FVJ"K3K5&Z#OJ(4]
+M;.JX7]/C>GZ`>&NKVUZR6O!'L5J]0H"[MM+&APXY7R9^%GXM_P`$&6_4*NGC
+M43@[^Z^A/!7C_I'4K&F]M]2!C(UC_-7'/?%>?/QY8)NI]*+=1##J"S)KV57)
+MP/==1<=2L[QYJ4GM+3[[K!ZZ^@X$-<TGY6+X_L,?+9PL]/ZH*@$.RM6C<AXC
+M5MA<&XUK5WG-=Z>ZV.C]4%0:=0D?JL[LXKO-7F.ANJG:%&:GIR1\JLVL'4HE
+M`:@.)]E*:*\+3.HX65=,TM*T*YEL<*A=G$AWT6:D4:DM)(Q[*"H\`8E'<.WQ
+MD*M4J0V94;3T7CS/E;72WN(#L^ZY^W?_`#-UN])&IN^R%;5&IM`^ZD+B<'Z*
+M*W`@2,J5Q:<R%4@'1F/^R@N'%H($J4D..\*"JZ'9=ONM0JMYD/DF4!?ZIVG=
+M$\"<"`@=I@P<JQFHZCH:"3OPJM=V5-7C^DX/=5:T8$_Y%:16K'(RJ-V\3\*W
+M7=B"0,K.OW`M(!$HBE=U0V<Q&ZRKZN`XD#=6[Z9)+C)Y61?O+FNC_LK%4.H5
+M]6RS;EY,Y)"N5PTSWE9]\XMIEJM8M9G4[EM.1J]BN3\17H-+TC2)S!6WU60!
+MDX).2N.Z[>.8[:`PG(S*N$Y2ZDX875GDO<"9Y`5*@WS;UM!LET]X*>^KN=4E
+MHEP)VPM#\.;=USXIIO$PS,_0KU7C';S7F[>R^&Z!LO#5*B['IR5A=4JL-P7&
+M)GX6_P!8J.IV082`(Y7%=0JDDN(F-EZO%CK&1\_+^657V=2H!L2?NG_XE0_Q
+M?JN6>^7DR<^Z;6>Y^ZZZ:]8X2X9',G;<JK6:7$RT;8"T[H>2#Z!K/YIV'^:J
+M5:[)E[6O`P1IC[+S/4H5`X"=B@:(SOPK3G-8QX:^6NSIC*KD@B>WZ(!J%SW%
+M[@.V/]^R",_F@SO*DC;4=QE"6AQ!(^@4`$&`"?@=D_IW=O\`*<S$D;93;'V/
+MU5!@!T^G_1(M!RUV)(]T-/)B?U1,(0L,"=X`GW3M$&3M[I/<"^-(`X`3O:0=
+M+I!!RWE#02-+CS'9,"X8.W9$TM!!+2?JGJ5-1+G'/=%`!IW$RA?!='T4D>DD
+M"4QT<S@930$3L"9&R,MD#@./.R8:"8[[IHT8RF@XGD;X2SJ`)."B8!&3PB+1
+MJS.1B4T@0SW/V3B0=XX12)TI@[!$H(W[\DE)[B223]E(`#."/=`\N`TF.\HH
+M,:M\$H07$0<A.';<G9)D8!X13.U9V^J<.#1C20?NBT@R)`"8P0`<'NH@2XAT
+M-/\`9(O!.70GX!D&>83>K,"1\H&:]P)(P"$W!).4^\"82()$3@I5.3@9D'A%
+M4)D&2!P/[H&M`=C[IVN,^HC!W1#28QGX^48)W:0.P3:0,@X3L#9&H2#P#'ZJ
+M@8(=)@E.Q[PSRPYL.()!'(_[I&(Q$#&R1$G3C3V"@)@)D'2"9WY^J1!Q(]Y'
+MPF`Y..Z<CU`MB"9@H-'H30ZX)+=PNF+'MHC2L;PE0\VKS/M]5T=>GI:!N3L.
+MRXY]MQ>\#S_&R-H7K_0!#6#;"\B\$M#;_3.)V^B]=\/D:6CLN&?:NKZ61H$#
+M$+6MB2(_99'33D"`?JMBS:/3&WNN5;C2M&@C;]%HT@UK?=4[6=H5@XGWX4;.
+M\->\F<=D-=H&>>45(-&\R%#?/`9RFH6JE5TO+0=E!5.AA<?U4X#34))^JQ/$
+M]\*%`M!S\J6Z;PQW7.^-NJ$%U.CDS$?9#X/Z4W4;FHSU.S^Z;H/2JO4KXUZC
+M26S*Z\VC*%`4Z8V[+S[W=U[Y)C/6*%VVF&>6P?943TEMR\D#=;=G85:]3;=;
+M-KTSRHD9"7^79N8].:Z3X48^MYCV8/9=E;^#;+^!DDZHSA6*#&TFB!GNIA=7
+M'_*\PZ2NF,QCCE<KU7']0\.T&U7`-!,[KA_Q&Z>*'3W,IXC$KV2YL:CJ+WR`
+M<8*Y'Q7T(WC7`M)XPLWCITPRW>7R]U2VT5G`;?XEDUFAH&73)7K7BKP15I7!
+M=3:8G:%Q_4/#-Y2.H4G.S!PNF'FDXKV98XYSAR]-Q>T3.,J1N@X!,QNM"YZ3
+M5MVZGTG"/LLRK2J-,220N\RF73SY>*PJC@&2''.)'T6MT+Q'U+IM1AM;VJS$
+MEH<8^RQ'3N1'M$)WD:,8'9:NJY^M>P^&?QDO;6W#+ISW$#=I/WW6YTK\7&W_
+M`%1E#4X,.[G'_5>!!Y`#I$D3(&ZEMKFI2>"UV1V*SZZG%<_VL+\?973>HV_4
+M>EC0YI,<+.I7KK._`+S&VZ\6\`?B(ZRMA2KU':F",G??W6[?^-FWEXTL<2'<
+MA9\EEF[VY>/PY89:^/=^G7C*EN#KD0KC*HD1LN'\$]4-Q9M:7#@[_*ZNA4;I
+MR5REVWE-+I=S,A5;P#08&/V1!YU3M*KWE26D?LCE5"[AI,;*@^H3G:.5+?U#
+MF8*HEQ\S<%9K<7+,GS02<%=)TD^F`87/=+IEU0?JNGZ:`U@GG@++5:=-WIP4
+M-1QA,PB,[H*AR?=:VD(N[[%05W<3*3G9CA05'K4*%S\\QW*C>^!_JB,<S)5>
+MX<!@G"U&*BKO.HSM[JI7J;F?U4M5Y,R#]51N'N&6XG?*J`JN`)^51NS&21]%
+M-7>8D[G=9O4:@`,.CE61%;J#Y;`B?98M[6`:X=^2KMW7#3_=8O4:I>Z!WE;2
+MHJ[A$G8K(ZE5AKAJGOE7;IX;1(<[/>5SW6;EK6%PF7;DJ,=UG=;N@V3/I'9<
+M5UJX#I@2"<-E;?7[II9`P`5QO5;B:CSK)/)7;";Y9SOQ1N:LO'IDCV7:?A/;
+MG^.%PUD!HWWX*X>QMW7%ZRF&DS/&Z]L\*=(H]-Z*P-/K(EV9[_YKOK=F+R^3
+M+UQVGZ_?L<!3<<M^O9<CUV\ITNGN/G>H]QM_N5=\05A1N708U&%POBJZUO(!
+M)R9A>SC%Y<,?:B_BJE3U^:&SPEY]3_YPJ%NXFBTM+H^`CEW=WV"Y>U_+U^D=
+MGXR\-]/;3\QE,LJ'AIW7$]0Z8UCR((/*],ZXUUQU`TW?E'U4;NC6M>@T.'U7
+M.8UPGD]>WC]W1=1`U-)CF5"_2*8,[S(A>H=7\&"Z9_)<1&=ES]WX!OZ;=37A
+MXY$;*;=9GC?KC3$("<SO*Z]OA"I3=_.!!(V*AN_"=<#71W/!57VCEB0!F<I2
+M#CGNKG4NG7-G4BM3<!W"J,;)+9`GNG#1SIU[X/=+T$-TM`(W=&Z?T>G&P[I,
+MR<'[!4,79QQC9.(F7O,DIZE-["0]KFD\0F@3.<\(&!&0#)E,2.,RB:&YU`F=
+MDTCL80(#G>$PTG`$0B@2E`T[01RH'I`!DDB>ZF)HFU`'IJ-,&,Z@?V4&S!P1
+MN40B<';.RH<@#'VSDHGZ0"21)0D@SEL>R9VEP`D;=T"D$$`1/NA><!H?,)P0
+M<')X3`$/,('80T;QE-<5"][JCX)=V$)8\N5&X@C`R/=`+LQ&D0B;#3L(GE"X
+M#&1LF`':<**E!/&W*#5!+M2?<`2?9,6P"`<3L@0$\X3%N)B.(2]H'W2@MP8S
+MVR@0`#`G@AA`&"A'[>Z378.<[9*!H)VPG$#!PD!P?NEIF3.RH36@8)!E2!H<
+M,`F/=`W><%2-<6[8/SNH!:!D@$CY3:!S(/.$5327$M$#M,H#$D"3]4!M!([_
+M`*I])#])!!Y!3"-')?QV2+3.<(.H\&4PTS`&)(717=-C6^IO')6+X+HES0X+
+M<ZDUV@/.RX9]M1;\%TP+T$N$+UCH(_E-D$87E?@5A-ZQN"<KUKH;1Y;1,D+A
+MEVTZ'IHV&J%N6#1@%8O3P0=]^ZVK!IQ$@=ESK<:UH,3(PIVRX`<*O0/V^5;H
+M3IE1H4%C252N*PIU0_2UPWTNY5RZ=%,R8^%B7U:*AS"59-@OKEM.B7%WJ/9<
+MK4I5NJ=3\O<3PKW5*[GU0P$$=UM>$[*G2?YM025RSYX>O#'TFVQTKHM'I_2Y
+M;AP"IN:*M<ZFR"KW6+TN8VDQ^.<H^F6C0SS7%3+FZACQ-T_3K713D`2KF'&.
+MW"JU;JG3)9J$!5+OJ]K;-U/JM[0L[TWVTG@-9`!D=D5&EJ."!]5P'B7\0K"R
+M:[36:2/J?V7'W_XK=2)BQM2_$!SC_HF.6VYX<[-Q]!4*376Q:^X$Q.RSOXJQ
+M94?2-1I=L25\U=1_$[Q@7.:ZN:378AK1_DI?"?CV\KWX9=522[NMY7C<A/TN
+M7VO<.N6-I=UWFF`0=EC5/#=*H(\L$'V1]"ZD:U)KM0,A=/T<4[BHVF2/4N.U
+MLN,>:^+/!U&I;.#*0'NT+R+Q)X9N;*LX%AB5]8=?Z53IT6N:X%K^.RX/Q+X<
+MHW#S_+&<_"L]L:WXO+^7S1>652FZ/+/RH1:U0X^C=>T]7\$->\%M,#/`_P!%
+M?Z1^'=@*7G/I^8Y@D-=^7]EUQ\UO&G3.X2;>"5:%2GAS7=LC*K.U,<=M)^Z]
+MF_$;P>RM;:>FVK35:9FFWCM@+R:^M*E&X=2J4]+V&"'`@A>B>25QF,RFX73?
+M56;F`<+T+HMK:LZ<7ZAJB?=>>VC8,!H!'NMNRZC4#6,U&!N)6<VKX[9.7M_X
+M:W3C08V9PO1;![B!J.5Y)^$]VUP#>8WE>KV-352;F)"X8=/-Y>*O/?+("IW-
+M0EN\2CK/AF<*G7<)SF5IYZI7U0P1.Z@MP7P3GV1WCB7'&$]AETD$_5*U&QTE
+MD$%RZ*S_`"?V67TJB-`*UZ#2T`]ME%3,;Z!Q&Z"L1IV1>8,Y^?=15GG3GA6*
+M@<<^RBJ[%&^I(Q$*M4<2[E6):=[X=&?E5JQ;$20B?4P2JUQ5):)@?"TQ45P\
+M]RJ55X;JER*XJ9+MRJ-P]V2#*H"ZK9*R>H59!`/W5B]K2>0LB^J03E:D9V@N
+MZI#?4LN[<8)!W5BYJDR#.-EEW=:)DA7>F;RH=5N]!+3D+F>K7;7`AQU#D+6Z
+MS6`$G\IW]ER75GZB'`B)5QA(RNNUAJ(#L@[^ZYVYESBX!IG`!5[JM8/J.:2"
+M>\RJ=C1=5JZ&YU87IFI''+FNB_#OHW\5U-A<P1$_&Z]0ZC3=;64%T0(E8WX=
+M=*=:6HK/;ZG#D*]XPOV,MRRI`G?*Z^#'=V\?GRW=.!\3]4TN>73O`=/^BXR\
+MN]=4OW,_HM#Q;<L-PX,?,GDK$IG^9G29Q*[9WG37CQU&K0)=2:X:A/9%![N3
+M6Y`HM!,?5'+>_P"JQMWY>K6W3!<.-2X>XU%H-Z;28T`-..96YTCI8-/43G=7
+M*]FUHPI:\#EZMI4;)8^?91:'-9_,9`_=;M>@T..<+/ZRP4[7,$\*;-;85:T_
+MC+OTLAE/<R@%FTUWAK9#$[>HNMP6MI2J5;K+V/-3RW#V"LARAZST6WNF%KV"
+M7=PN(\0^%:UO4+[<2)VR?[+MZOB&B7#S*+E`_KMH]_\`,C3&Y"GK^'3'.QY7
+M6MW4ZNFH-)&(.$#6Z3(=MR%W/B2PZ=?,-2W+14W[+BKVVK6]8L<S8[PD_P!=
+M\<YET9]6K4@/J/>!MJ,P@,EQ2+\>EH$)M3HB/]56B>-O5MV3AIQ!W33[!(.,
+M[!$V<9R8$>R4NT@H2XDF44D#;]478>9G?L40&-\?"',_ZHVF#,1[;H'8#ITB
+M!_=)C!)`$^X3`N<Z`W/ZHV4JKGDMI.).ZB;@1,8@<(?ZL*=UO6:#+'`*!\ZH
+M<"JNX8<QD'A`\2["?4T"8(E,]P(](,G=#87"!!'J2:V3$'/*=CF\@DI?U;%`
+M0;'R$+@.\%&YS-,^W`0AS2W$_0*:-E3:/_Q#W3/(G@)PX#(D'YE`7!QW**9W
+MN?LG.D-RGJ5`8@#TB)0:P3)X0/$@)0?@)]0G&R3BW$?H@-P;$S,I-.DB=O9`
+M"W3$[;82U`YF(VP@>#J_*G<"3B#'NF+F@"<%$"W2<CY5#!H'])4E,'S(.!*C
+M8YNTX4U)S-;9<`/=!V_@YH;:`[GN"M+J$:2"J7A,--C(``*L7[FMSJGA>:_V
+M:G3:\!,+KO5F?=>J=$PUIC/LO./P\I:GDD;<KTSHX!(@B%QR[:=!8-#F#=;M
+MBV6[!8UBW8@X"VK+`S]I7.MQH4&D-C!5JD1$QRJ=(G?5CW*G+@UO/U*C1NH.
+MQIG98/53II.).5K/<ZH[=9'7ITZ=62=I6:Z^/'EA])HON;_(P#RNUITZ=M:#
+MXW4'A'HU/RA6>-U9\0!M"F6@X"Y:O=>GVENHSF`UKD.X'"N]6ZK3LK')&`L2
+MCU!E%I).W*X?\1O$%9[#3H.=]%-Z;F'M4WBGQZRA4>RD[4Z8@'_1<9U#K_6.
+MK.TAYIM=V_[+.Z;;NNKXU*HF3RNCI6S:8V(Q]UC+6+V888RZ8M#HQJ.#J[I)
+MXW72]'Z=;4:`UM#BW]$UG3!>T`\\!=1:VE(V>&B8F96,;<JWY<M33C>I=,H7
+M37%M(-DKF3T?^%ZH"#&<+OKRF*3W`-()Y7$>+;Q]"\:[8`Y*WC;T87EZ]^']
+MH;JFRD'0T-G==)U.>DO8\5</&/9>0^"/';+*BUKC!;B94OBWQ_5NS.LN<-HV
+MA)-37USR\65R_P`>K'Q#Y\,K5AC:2KEM9U.HTP:,OC:,KYLNO%767534HEQY
+MQ*[O\(OQ;%A<ML^L![6N(]2W,;]<O+X[C/XO3[FS-$^5<42UW8A36%"DRF0X
+M@`]U<ZUXCZ-UGIC*MK7HOJDRTL()`6795]>IIX4RGK7+&^^/*+J-K0\Y^FG@
+M\B%Y'^+'A9U6[-]0HQK)+H$?V7LKP"X&"8[Y5#Q#T^E>6I:Y@)`X"U,JL_AE
+MN/ERM;NH5M&W&$SG%A!'!7:?B%X?-A>NK"GAQ.RXVY&C):"?NNN%]GJLFMQZ
+M3^#MVYU4#)(`PO;.E5?Y`)'"\)_!>/XDQOC9>Y=.`%N.#"QCW7A_4]IKFL9P
+MJWFD.)F92KDZL$2H8=&ZUIY052Y[HTX'<J[TJB9'(/"JL`+S(6OTEA=&F%+R
+MU&QTVD6P3VX5]N)B3"BM!I8./JCJ')`D(L)SA\A5ZSW.$94PES<E07$`Y5@B
+M+AM*KU7[G.5)4(C4#E5JAF3*K-15'G3NJU9\C.?E2U'B#PJ-T=M)*L9J"O4.
+MHJG<U1!X5BN]K1G'O*SKVL)QL5J1*K7E3<+)NGSL=U9N*AEPX'*S;JIZG9$+
+M<9M4KUQ;,;+%OZT.,DRM.]?.`?N5A]5J,:TESC[*5F,?J]P\M@@QRN8Z_6;2
+MID`DK<O[F9,;#>5R'B"OYM<Z<&5UPG*Y<,BLYKZAF)/*Z#\/>E5+SJC2&RS<
+MF5D6W3:CR):<G=>N_A;T5MOTQM0@A[ARNEN^(XYSUFZZBUMJ=I8-)(V7EGXM
+M]3+'FFS(G/9>D^)KC^$L'DO&.Z\$\?=1-UU%X#@9*]N$]<=O!)[YN?KU75GE
+MSC]$]#)AT.4#!!)@94]`MU`M])YDKGMZHV+=H\AL=NZ/2/=!;$B@T3PCU.[_
+M`**.D?45M0T4Q&,*/J-.*1(.0K]-N(4?4*8-J9WA9KP1S=.F*E4DF0J/6;8U
+M(80(6U:V\`F/=4[JWKOJDM<T#X5HY>O8-&/+6)U:TA[FL!E==?VEQ@4W>HGZ
+M*B[H]:"?,:2<J[9U8XFO8F"33#C[=U4JV&J"VWJ./,-PNZ_X34UD/=3(`[*I
+M?V[Z3'4F:)(_I!E7AKVTX6XM'3Z:+A\"52O;'63K9QRNO=;>HSF3F6_Z*K6L
+M2]^DAHWB$TU,G$U^E,V#=NRIW'3:@P&Q'.<KN:G209`U$A5Z_399#HD8W33I
+M[N#JV]6G+G-/91D8,@CV7:U>E-."R6QA4KCH#:KCY8R3QNHU[1S5O;5*];12
+M:7$]EOV'ABYJTVNJ,/\`DNU\%>'+6SH.?5HZZIYA=*;5M8M92HD1R,*V:<KY
+M?P\YI>#GZ-;F&&Y(!2H^'Z#20:1WB)S^Z],N[#RK1VH9/SE5K'IE%C-3F^LP
+MI$][]<YT#H/3"]K'6GU)*ZRT\,]/`&FB,J3IEL&WD1$8E=)1I!N,1&W9,F)=
+MUSQ\,=/J`M?;-CZK+ZQX!Z7<L,4-+CF05W(9$@#*;RR?21G98;FX\0\2?AY7
+MM230!>W<>RXWJ'2+RT>0^BX#.87U`^R;4'J:"L3Q#X5M+NB6FD,[8Y3==,<_
+ME?-;VEIS@;Y0$D#!F>R](\9^`JM#55MFN,3L"8"\^O+2M;5C3JM<TCN%9DZ2
+MR]`+2&X>'2.%$Z0<'Z(BT#(G[)B,SJ)^55"X&9+OT3C3J.N8CC>4[L`2XSW"
+M"#/O/952@SB)2(.=@"EDDP=N2E!F"5-!S&H$'YGNDXX@"`G,$C(R4H,Y('8(
+M&D:<8*6(.<!.0-(,C/"8`C,-A`[M0EID>R9L`?F$)5!)&!\)RXN`DM$"!"&B
+M)VV4U#);)D_"KM!QLIK=L.;)[0@[[PN\LL8+1D0K5;0^L`=_94O#CW"PV`("
+MOV-(FZ$B<KSWMJ1V_@:CHI-.,Q*[_HU.3Q(7(^&;;R[9I;'==IT%I)!WG=>?
+MMJ.AZ:,`&/JM>U$#(!]UG63)B``5J6W&%ATBW2$-DQ*BKO!@$A$ZH6L,B<[*
+MM2FK7C@<)5BU1IC27'D;KG>M5F_\0#?Z6E=)>'R+0_\`V]UP?6;E[KXEN=.,
+M+.7$>KPX[=M9=5HT;)H:1JB-UG]2O/XPD`R5SEK6K5G`$D#Y6WTNAL9RIOV;
+MN/HJOZ:Y[#C#ED7WAAE4Z],'.05VM-@TQ"<T6:9@9"OI*Y_N91Y77\-MLZVN
+MG3@9G"HWS-+2US8/Q*]2O[:F]A!;L%Q_B7I#7-+Z8((,X7#R^.]Q[/TWGYUD
+MP.E-+GAX$`+>I533`@[X61:L%$QI,K1H5-5.<_!7#"/5Y;LUX!4<97(>-.A"
+M[I%U+<<+IKRLYK@!LJ3[C,O$3W6\;-[8FYT\O'2;NA<Z#J`"Z?H?1`ZBVK6>
+M2#C*W+NE1J'4*<&9E2L#!18QQB<+>7DV[;W!6?1+048+`0<KFO%7AGUNN;6F
+M6B3M*ZZA=0P4VF>)5_R`^U@P9R0ICDX7^-V\M\.^(NJ=!O12KU:A9.Q<5['X
+M-\56W4J+7-JC5&1J7F'C?HYKZZC&Z2V<PN;\,=7O.D=5;3\UX;J$S*ZY8S*;
+MC7KM]26EPVJV0<*VRDUX@E<;X$ZFV_Z?3J!Q)+05W/1]+HU''NN.-<?)CIP'
+MXI](\RS?Z>"05X7UND:5RX"9E?47C^WI5>GN`'J((V7SCXUM'TNKN9W<?W77
+M&ZR;\-]L=.F_!JDYM0/)[?5>SVE0>0-UY?\`A+:Z;5K]($QO]%Z53=%./9;Q
+M_+Q_J;R.J0XD\\H@TEL]E'1)>\S@?NK=)GNJ\RO0HN=5Q^RZ#I%#0T$B%1LZ
+M4OGW6Q;"&QNI)^6MKU(C3[IB<2@&1GA)VV^$#/>0<%5[I^KE%7V@*K5<"2)C
+MY5*&JXD$*O6=C*.K4$C.54N'DM*UME'<$`95*LXP7$XX4E=Y.Y52Y=#<A6<L
+MJUW5ANDF?A9ES4()SRK-P\@N_NLZ[J``\>Q6XEJO<OP<CW67=5-),00IKVZ:
+M`<B?8K-K5-1SLM6L(+BI+7%P``7/];K0,EO^BTNK5@QCX,_5<CUZ]TM=+IB4
+MDW5GY9O7;T-+F-W)[I>%^@UNI5#6<UVG>2L_IUN_J74FM@F#W7KWAFP%ITVF
+MQS0T@!/)EZ_QC>$O]JY9WAUE*HQH8#GOLN\Z#:BUZ<R&_E;M*A%JVI7'>96G
+M=N;0L]($$!=/T\W=O-^KSNM.%_%2_=2Z8\N]P#_L+P?J-P:UT]SA.>2O3/QA
+MZPQSC0.'YDYRO*ZT$EPF">^Z^CGQ)'D\,[IPX:9C8Y$J6@X:MB1QE04CISG(
+M4U$G8$D;KD[[:M&L/*;B,(_.:E0/\EOIX1R?\*;:?6]-LF..4/5`T6)(^(E3
+M`>O"BZL6_P`.&]S"S7AG;,MJ9-N9W*KW-,LIDD+5I4P:0T]E3ZE2.(Y*7LC$
+M;1+W&JX8]U'79`@">ZUC0B/A5G4QR$5C5K=[S$P-EEW5JW4=()DY*Z.ZHN/I
+M`W45O92XN<`594L<Z_IX8UQT@GGG[JC6M@7D"F#$X"ZV_I,93(@#N0N?OG_S
+M6L;!^%J7;-FF<+`5(B!.Z*MTBFYVD-(,296UTZWU09$QRIZK#J+6MGN4I.>7
+M*5^B:1E7?#GA^:HJ5J<P<"/A;K+=]2J)87-:03A;EG6ITP&BE$>VZFVN?K,;
+M:.&&T84U&W=2;JV'*U_.81D0J]=XK.AC<`9*RK'=1?6JESR8&P'"(6S7'5L5
+MI.I:<D83,I2X''O[JIJ,RU8/XX`+HJ5!Q:#Q^JR*["VZ#N/W6_THM=3`SVE-
+M<$%2M&.;*;^#@X&W"TK5D-@1'RH[JO3I#W66E;R&-9(C*I73J3<$H.I]2@$-
+MQ"R;DUZX#FEQ)/"*+J%.A5U-(:00N"\;^#;2^I/JT`&O,YC"[BA87`>7/<2#
+MPK(L6%N1/>5+(2V/F?Q!T:ZZ9<&G68=(Q,++R!!_5?1GBCPU9=2M7T:E(:\E
+MKH&\?"\+\7=&K]'ZF^A581DQ@Y"2_*[XY>S'(+78^$,N$"20#LB,9,-2](=.
+MX6V]@R9!.-TAZ20<@H\-<<80^GDJ!GD;MVE//!(^4G``CU2$B)/:!RJ'+70"
+M!B,IMP9@GZH@,.]0CLF@`X(RH!9)SR$0+L@@;93M'NT)R`08*`#.W^JFMI;4
+M`/?91[GTCVGLI[8$UFD[R,RE'9=!J.;;MP(WRM[H=$U+QI(_J!/W6'X?IOKL
+M`I@O($P,PNN\+VX_BV:A#@X#3O[KS^2M8NXZ-3BDQL8@0NOZ#3.(;(7,]-I_
+MECV76]`I;'(G9>:UN1OV3(;"T*8B3A4[1L08.(W5L;;_`"L5LUQ5TCYV1=+R
+M^8&ZI7+R*D;B5<MG>30<\[*SMJ(O%%X*=$M#L[;KCG-%2H29"T>M7/\`$WD2
+M2`=Y]U'2IB=ESSNZ^AX<?6%TZC&\86W9PT<2JEA2(C]EI4Z8+06C;*8L^6I:
+M#CJ$[>ZGJN`$3*@I@QOD(WCT223B5TCR54NH<9V!]UD=8`%)P.=X6U5I'1)[
+MK'ZO0<_N1"-8WEQ%_5-.[+'0!,J0NBC(.47BBR=3)<!)X/98_P#$5&MTF8B#
+MV7BN/K;'U,,IGC+&E0BHZ=4S[*MU:V>'C0?S=UG'J8MZT-S`R"-E;/5VU'-<
+M3'?W6'>8V78+BDZB1JW/"AJ5#(SC?"FO7F\IRPR&_<*G>-JMI8!!GA734_U-
+M9OU5&Y]MUJMOBR*>'?!7/VCJK()'/V5FGY[7E^C$R=U>9TSG)>TO6'^8QYT@
+M3*X3Q'8-;4\YH#3JE=TYS7L=KXGZ+G/$S6N<"TG=;PRU3&?':_@W=/%G!,@1
+M$[[!>O>'#YC))7BGX4/\MI&"TD<?"]K\+$&BV(V"S)RX_J`^+@W^$/!SM\+P
+M3\0:;*GB!C6B<P?NO=_&50?PS@#!*\2\16GF>)VG4YTNQ\RNF5TQ^G=K^']D
+M*=BR!B`?V74D-C3MA9OA6CY5@P_].WT"U`S4[;`77#B/%Y;NI+2E+I/)W6C2
+MIPV4%E0),1]5<;3.T;>ZUVXGLVB<#"T[<"`)RJEM2@29@JVQS6CMP5`6N9$[
+M)B_?$H7GU$YRA=F/]PB[1UR""(S.ZK57"3D*6L8=`XE5;ATR`?[*I45PX<%4
+MZKY)"EN'&<'95:E4##HSR545[MXW!]QE4+BK(._,*:\=(D'?LLZZ<1SLM1$-
+M=X$DG'*R[^J"QP`^JL75:6D?NL:[J$DMG'RM=,54N/4^2,;X56\K"G3($`_*
+MENJ@8'.]BN=ZY?8(F.P":3M3\1=1\LG0<D0N.ZI=NN*WE@;G,*WUZ[<7RXDG
+M/TRJ/1;*YNKD5-#BP$$PNLGK-M2>U]7>_A;T!FD7503,;_1>@/MJ;6P'8'9<
+MIX,O!0H-IC@!='6N@ZEK!P5Y9=VV]O1EQ1VA:VY@GZRL7\4.N4NF])J.%0-<
+M00T'X*H=8Z_3L:[YJB0"=_\`1>1_B=XG?UB[+!4FFTD8/N5]'])CJ7*OF?J?
+MYY:C!Z_U*O?WKZI>XAQ,_$K-,$`R<=D(<2<G?W39,9]EVMW>222<)A!S$1[J
+M2W$.S('N>5`S#Y))5BEE^J<!0:K':6ANO[)_,_ZRAI.)IM/MW12>WZJZ:T^N
+MZ5P`_2[!E1=5J--:FTG!5VO;LJNEV"/U697LWU+\14):-@?E3?/+PZ:%%@T2
+M"J-PT.N''LM"V86TG`G8*"G2PXD*6<D4:S(DJE7#9U#9:UQ2!]BJ=2FT/,B<
+M_1%4J5N7NSM*DKTFTV$#`.%:)8P>F>Y"J7+BYQ(!QL@Q^L-F2(CW7-R/XL@R
+M#,1WRNCZXXMI'(F#PL7HEK1JW)J57$F<`;!:Q9R:?2K1SAD>DCLM!UJ&TPP9
+M)Y[*?IC=1\M@)^FRV[7IH%*7"7.4JSABVS&V].`V4KDT=.K+2MJM94J#2YX5
+M2C:-NJWJ9Z`5!B4Z=6M7`)=H!6E3%%K`QC8`WE;#K.C2ID,:-L*O4LV:,B"4
+M5EUF-VD(6-&DJ6[MW-?#23W4894:<Y[HJM=TX.<+:Z.T?PXU3[>ZS;H$L,XA
+M:70P'4!WV*J+6IT0'!5ZM`.)+R8]U?%(D845R`QDQ/NIH8]]9TMW.`5FRL6>
+M6W2,#"&HWS@2[8<*WTTZJ!#>$4%:U]`[JK5MXD8^%K.!B")Y45:GJ&`)4(Y_
+MJ-$-,F)',+S/\;^B-K]/;>TZ8ULG41]5ZQU>EI:0N5\6VS;OH-PQPDACL`9V
+M6;TWC=5\W/;I,$B9Y0-(@AQCV5[K5NZAU"HPA^'$01PJ+V^H&<>RW.GH,?S`
+MR/2A&6Y."G<T9]1CW3L9+9!V_54*`1!@F<%,]I!'WRD`(*(N+_S'`;`Y4"9@
+MDEH'9,9#R,&.Z<M;@ZYE,UH(_,&D($))&!"FKTZ;'!M.HVH"`Z0"(/8_"B8R
+M=C(]EUWX<>!^H>)KYHI,+*,P7P/\U+=08?0^BW74KHMMZ1<UHDQE37UDZUO!
+M0<S0\8(/<%?4O@[P!T_HG074Z5(`Z,GDF%X+^+5B+;QC5#,`N)CZE8F5MTF-
+MW4?A.C4#)!@#<@PN\\(VN14)!G<KDO"]G_(8=4!T`E>A^&[4-MVSN0O/Y+RZ
+M3IO](8?,!P5VWA^A+`2,_LN4Z'3]07==$I!M`$`SN5QR;Q6Z3-.3A*X?Z8'*
+M*J0%2NGR)#MEG;8*9UW')&Y5CK;W4.GD`XC*J].!=6U$\\H/&%8LM(#MQ&ZO
+M4M;\>.\I&'9ESZI<3N>ZT;9A<X"%0Z6PZ0MRU8-$[+CV^E>(L6=(M'NKU)L&
+M%6HZME<H`XX]EK_CSY#HTB'$Q\IZS0)QGA6J8]$(+BCZ9WG*Z:T\][47@EL$
+M2J56AK!!VC"T7T^9F<(6TAIR03^R:1R/B6Q-5FV!V7'7UJ:50M<"TSNO5;NT
+M\T&`/DK#ZIT%CS,;K'DP]NG;P^;UXKS*^Z8*M,U&$XS'99CJ#V/($QL2.%Z+
+M6Z&6N=3@D$=U7'A-KGA^D_,KA<*^AA^KQDY<WT%M1M,`G<YGD+:LNE"N2X@^
+MK)"W+7H+*8$@86MT^R;3&G$RMX^+\O-Y/U/M>&%9^'62)IQRKI\.T6TSZ=^%
+MNM9#X4PIE[<@CA;F$CC?)E?K@>J=`EITLW[!<5XDZ)=4*@<X%S9WS_DO<:MF
+MPMG3)YPL3KO2*3V.+VM."5F^/['?Q_J;B\^\!:V513F(_39>Q>'+AM"RSVE>
+M?=%Z0:5\1387$NG&5UEKYC6:#+2,0N,WOEZ/+E,X+Q1>.KL>&C2`"%P%C:ON
+MO$)>[=KI_5=]U.AIZ<XXDCGX7.>'*&GJ+ZK@)G?ZJY3=C&.4QETZCI](4K=L
+MB/3'Z*]:L+GB,RJE-X>0T;+9Z31)C"[O#GVOV-,-I@$94H:"XP8]U(U@#1,=
+MT3609X*TY'8W2/\`-$^8C]T1<W3G!4<@SGX3I2,<G]4#WMCB4SB)[*O6>`"`
+M,H%6JX.)5.L\03'ZHGN#N?DJK<56Z2B(KBH!/;]EGW575($;_HCNJS9)G?"S
+M;JX`;@\PKH#=5B)$X`6=<U23B3WE'7KR<E4>HW#:=(P86Y&;=*_4:T&>RQKR
+MY$$@?)"DO+K7))^ZQKZZ9)]7^15W^&-;#U.]`:>T&%RG6+AS@XD%L;$]E<ZK
+M=M=K=J.!&ZPZ[JES6\NGZN)E;G'-:F-MU%$TVW=T*8&[@)]EZ!T2UM;#I0UA
+MLEN9^%SUMX??;VPN2(.\^\(>I7]RZU-(/(XPLV^]FG2X>N*]:]491Z@[2,3M
+M/NK'7?%3;7ISW`^K,"?9<97J&C3+G.)>>5S'B;J=2XJ>7K,-VDK>'BWEM/)Y
+M)ZGZYU^ZO[FJ35(:02<K#>_5,YY.4QD&)^@,IG.$@-Q`7M^/%KD[8&0$[RQK
+M@&O+\"3$0>R8`:9#OLA;^8`$F-U`='<XV'=3T##QNH&EI@@$"5/0_/B=UH:M
+M(#RQ.Z*&]D%%H\IN"<;A'I'^%RJOLL@&J9V"IVK1_%/<),E77B0\S&-U7Z1^
+M=YW,K,>&I+B&MTX!*<TXI0,)5Z3S6EIE1W#KH`Z::G`K78@9[*C4C)G[E6+V
+MG>53);I`506+R^:E0_"32AK/I@$:A.RI7-TQH(:`>_*T*EE2&3)/N50O*3=6
+MFFT0J.;ZW4N*N=`T9WRKG0K)CZ8].8RFZPUK7BGB5J>%J!=5;3`QW5B5O^&N
+MF-ILUEGW6U492I,U&('"*U93MK8<+-ZC<&ZJ>32&.2I2(JC?XRX@1H!^ZOT;
+M>C09@!!8VH8,1`W4M;TC3,E155[0ZH2!@*"Z:`PGG97"W0P[R51NG3,\JHS+
+MIH%6#GW3TZ>)`VRB<-50XDJQ18XMC^GV**HWUN#3EI(/96/#?J:6<C"?J\V[
+M=%5A:Z)`/94_#URX7;FAIR@Z,T_*&=EF=0>Y[M+0=,[K2%.K5:2_TM[*C?-#
+M7P%"*XI#RH4?3JGDW9IDX)5ZFV:4++ZAJHW#7C8%%;=1P#9(5=M:GD$B5:Z6
+M^E=VW$J.[M:;7X_109?7'-\B8V'*YSJ`\RRJ0W)!X6]U\.;2ADD'NL^C95;J
+MB:;&N<7!17A'COH-?S'W%*@2"XR0-\KC*E+2Z#+?HOIR\\-U*5!S*M#6'`_F
+M;*\_\5_AN;FL:MHUM.<D`0!^BF].V.?&J\?C,DR$VD:1E=]<_AS?TR22"!M'
+M_99MWX(ZE287"DYP'8+7LW,I^7)P-6P/MW2<!I@?57>H6%Q9U-->DYL<PJ;@
+M-]L;%6-!QK.>>45-OI=$']$0;(&?T75_AEX2K^(^LL9I(H`C4Z-PK>$WI9_"
+MSP1=>).I-<ZG%NPC6[[+ZF\"^%;/H]A3H4:8:&`9"@\`^&;/HW3:="A2:T@1
+MA=93<R@WW[KE>>7*Y;1=5IM9TU^G,-*^4?Q?/F^-JH@8,9XR5]5>(;@CH]4,
+MSZ297R=XOHU*WC"NYY!)J']UCZZ>.-?PI2.BFTNYE>A].IM%```+C_!EK+VQ
+M]EW=M3`8T2%PR[=&QX;I@U@/<;+M;4BG2:-H"YGPQ;RX'3]ET55NEH`Q\KCD
+MZXP=>I+`%3O'@-V$]RIFN&C:52O8\P;JQ?J[T:FXF=_W5#QDX:6,`,DP95RT
+MK&A;:R`/JL._KNONH`?TM]UG.ZFGJ_3X;RVGZ91@-$'LMJTMB0(V5/IU+T@Q
+M_9;MDP!@$+GC-O7G=!HTM+L[^RN4:)<V3QW293&J0(5NA3C<+I(\V5/0I@LV
+MDCE%6;#/RSP%+1(:T>Z50R#Q[+;A8S7L()0O:3!.`K5>GG=,&R,$I$JN:+8]
+M2J7K&M.`K]P2,;\3*H/IFH\N!='*;28LZM;ZG!WU1"FW#2-NRO5J$"&E1>3[
+M&=U-JJ5*#29`,<J*JW20&E7GL)$94;+<N<)G=2UN0-"E+`1O\J>FPATDJQ0M
+MM+,C[IZM/&\=D`Z`:9(^JSNJ4QY1['=6*M=P<03$+,ZM<GR2)5M;QQJY^'=[
+MTJTZA5IWIHL>?R/JQ&ZTO$PZ?==8\[ISF.9I&HTXTS*\RZK6)J:P3*Z3PG?A
+MMMH>^2=LKA<I?XZ>C]OUOOM9\37&FEY;")VA9W1[5P`>`02K5S2==W9=F`M+
+MI]O``(Q*J9743=,M"\@E=%84`T"1@*M8T=#0(6C1EL#=:CRV[$`V8C"*DW.>
+M43&S!3NAN%I@-0"/\E$Z&A&\Z22>5#5J>F$5#7=P"55JEP:23*.O5@02%3KU
+MH;$B40-:J(*SKJX&H]D]W7P1*R[NJ2-4[85@&]KC.5F5ZQ<?S)KJOOG"S+V[
+M`;(,+<B6Z3W=T*;")"P[Z\=5<?5A/?575!!,K/NZV@:<''"?XYU7ZE=:&D#5
+M\A874KT-8XU)&.%-U2Z#"Z'`;Y.RX[Q3U@4P0'#7V:=UT\?CW2W4375R^XN?
+M*I9<[Z+KO!'AT!@N+AGNO-?"G6:8ZLPW$%I<,_5>U=%O[:I8M=2<TM+>"L^>
+M7>OCT>*R8[G:;J5"D+8LC`&%PGB&B*1/EM[GMA=C?7M,L<'>I<=XDKZJ;I/!
+MQV6,.W3UX<QU6YHBDZ1Z@.%Q/4JC:E<EP((*V_$5PX.(;L1W7/53KGB=U[\,
+M=3;Y_DYH(`R#E)P).<E("-@3"=WYL2/JNC`=OWRG8#$YVS"<@Q,8^$PD.Q.?
+MHB':#M^ZL4V[$;;J$''OQE3VSL[X5&E0>11:(=MW1^8[L[[I4"XT6D(O7V1M
+M]F5?3;O=(&%!TMKC3)!$%7.HLTV3S,$JG9.#;2?ZE,?KYU6J4OJ;?9&]I&(2
+MLF$-DG)4CPA%.YIEPR85-],`&8A:-9IF(5"\:0[_`%05+MS!1C)*R;V&TRYW
+M/"T[W3IP?HL7JSI],S/"JL:ZEU:??'*Z_P`(6IHVGG/$2N;Z=:FXOZ=-K,DY
+M7<NI"VL0V,Q`"O42\HJ[Z]S4\JF[`W*M65JRD!OJY)2Z;;AE+5&2K3*1W=LL
+MA.`:TZ2846D$R1`4U:#`&WLA<TC\PW156X=B-XQA4*Y&5=KY&WV6;>.+JF@8
+M[H(J=,N?JB)1UZNEHILF5*QH92AIU/.V5:L[+0-=;+BJ*%*R#O75R>R+I=%M
+M/J0`:%I5:0TQ&>,JG1IM'4&NGE23E=MFLS^6LJXI!SR3]%NFGKI<Q'=9EW1(
+MJ$PHJ&VI@TX#54ZGTZI4&IHD%;%C1DR-E>;2:1D)2.8Z!3JVKWMJ,(DX5FY-
+M4U-3*9/T70"U9,EH@)5J=-E.=()^$',5+$W+@:K?HMOHW2Z5O2UAH!4EM::Z
+MWFG;MPM+'EC2<++4C&ZM0IN&6C[+`O+"FYQ$#/9=)?R\XY[JA<4/23"NDKG*
+M_014&IH#F\J,="I`8:%U/32R2QYP<*6M:,95D9:5FPCSCQ1X$L.JVCV5+=@>
+M1AP&0O"O'_@^[\/7SFOIS2=^5R^NZENWY6!XT\,6G6NG5*->DT^GE9LLNXZX
+M9ZXKY2\*]%N.K]7HVE"G)>[/LOJO\*/!MMT/HU-OE@.W)]USGX0_AU2Z/U&I
+M7>`XEV">`O7Z5$4F!K1@!:WLRRW=*8(MQ)&!R@LA4O[L!OY0>%!UFMYERVWH
+MB9Q*ZCPMTSR:#7$03[J;33.\74*=KT&H2-F%?*GB(,K>*JU3TEH<>_=?4OXO
+MW'\/T&KG=I"^4[C57ZR]Q.SID!<LKR[83AVO@JB`T:0876TZ9!$A8O@^W#+9
+MDB)726S`ZJT3A<;RZ3MTWA>D/)!`W[+6O6CRLJMX?IBG;C"N=0,49PN.3K&;
+M3J0TF8`X51[Q4K_F^B5W5TT#IF?E5+)Q<\F?F5N1<>:T.HU&LM-!,X[JETRB
+M7.UD`2E>N=4](SQNKW3[?32&%QSO+Z/AQU&A94\<+5M\-`5.PI>D2`M&DP1`
+MW2+FFI9=LK;*9T=YY4-%F0K=('3S\+>+SY(:0=,%3-9(DIJC2,!/!;DG*TS0
+M5:9[B%$:4L_+[S*FUY@_HA.,]ME6;BK/IDB"-R@-`,W$>RLB29V^J187?V*)
+MZJYH!P@Q*B?9D'MW"O4Z+FOS]T=0"0T*4TSFV8`,G*=EKZQ`C*O!AG`D!.&!
+MIWV[IK:JM6CIID\K-NM9&,GNM.[>`#E9E<@$P2LY5O#%0JAVJ7=UE=8<T&!`
+M*U+]Q;3)E8%ZXU'[K%NGJ\>&V3?6H=+A.1PBZ#1N/XEK1,3]U?9;.JNT`3*Z
+M;P[TAK*0<6C'LN4F[PZ^3*8SE/TRR8*'J;G=7+2T'F;):2RH!,`*[8N$\+M'
+M@SR34*1!5AK2$31$<RHJCBTD#A5R3C#25#4>>\!1FJ2%#4JQ*J)*M0!BIW%8
+M@;&4-Q7);^8?"HU[@Q'=5-E=W!!PJ%W7+@3C"&ZN"2086=<5_>1/":0US7,D
+MG99EY=','Z(KRO`,&%D7EP)))6I"TKRN2#J.0LFZK9,';WV3W=R).8"S:U23
+M&J2[LJQLU]=%K<&"5D=3O@*;BYT$!2=1K:)#IQE<7XJZU3:XM:2#V73#Q^R6
+MR`\3]::QI&K(D`RN'ZC>5*]Q)D@\(NIW;KBI+I@]YRJ]2A79:MN'47-I/<6M
+M?!@GM*]>.,CE:BUEKI`),]UTGAOQ=?=.:&.+BP<$E<T3OV^$+26@B,JW&9=K
+M,[CT]*_\[4*U,EQ+7G=9/5O$5*HPZ'9(7&EPB1@)M4#G[K,\6,=+Y\K-)[ZZ
+M-6K(R"JSW9D2DT^O.1[I2"0<PMN)Z=32US=+7!_^+A!J[3["43HB>/W0[R)F
+M-@@8OQIS'.4^H[Y^Z1T_[RG&?4Z8[JH=IYS]2K-&"\`X]U`(@<_"FMY#R).>
+MQ5&M1@4FC*/[I6[6^0V>W)1Z&?[*;:?:'60!8NGLLSI;?->`#("T_$.EO37$
+M%4?#M-K:0,J8_7@R:#0`(V1.`DGA$\B1G=(@:<E5%:I$E9]U!<9,#Y6C7])]
+MEE]1=`(`^R#+Z@YK)),E85>KYCB2W`*TNIESG\85-E#55#`,NQA6*N>%:?EU
+MG7+VP-Y(72VVN]J:W`AC=IY63;TVTZE.V$`'\RZ&T=3I,T,B$J)6L+3MLI*_
+M_*$X1B"W!4%5Q<=,X4$=,'6FN'0$B[2('T*@KNTMU$[(*U[5#&',$JI38(\Q
+M\DHG'S:VMQP%<Z;:_P`36#B/0TX44_2[,Z?.=)[!7*Y@:0KKF!M.&P%4J":D
+M`;>Z:@A#26`*C<TRRNUY&)6I3'&TJM?M.@G.%>CMJVH#K4$%5;IDF85SI0!L
+MT-XR,B)4O;416C<>P5RBR20H[2F="L._EL01UG-I#\RCMJ3Z[];YTC:4=&W?
+M</+W`Z6K0ITM+0&B`LUJ(A3:&`8^%4NVFC)!QVX6FZF0.RS.J.@:>Z:&:ZH7
+MOS./9*JS6R-_A2NHZQ,9Y1T&#06$`'L56637I.8Z1A7^D5#<,\MYDH.HTP6$
+M90]#FC7$P!*"Q=6]2W,\*"Y<W0&-(DK0\27-.C8$C>,+"\+"K?76MTZ0>5G3
+M5='T2S;3M-3ADH[VIY5N]^TA:=*C%O`.0,!9'7V'0VF.5*U%/PS9&ZO?.>WG
+M"[VWI>70T1$+&\.6C;>FUVDR5T$Q0D;PIIJ/)_\`Q`W?E=&J`.$EI'[+YPZ:
+M[7U02`2797N?_B7NG-LW-:?Z<_<+PCP\[7U8-``),R.5PO-KT83AZEX<<T6[
+M<1[%=#TTS7;_`'6!TBGY=LW$1M/*W^@4]=9L'E<=K([GHS!_#C&3PFZV0R@<
+M*?HC?Y#1F54\6U`RD1@#E8=(YSJ5P&LTF9*KVM=S*9(E5+^MKJ;DJ(UW0&,6
+MLOXQV\./M6_TX><\8.ZZ"TM"&3DK'\,4R6M>=B>5VMM1::(@-&-UY^Z^A;ZS
+M2I:4X;C4>,J[2IG$H&L+2,`_"L,!C,$+>G*U-0:T>DA3M#1@'=5Z32!NI6!S
+M7;Y6XYT;FP9,$(G`8(&$6B6Y.R"H9(`B$9TK5B0XZ1(0@@L@;GA2O;/Y1LH@
+M-+P)E&]"#2!WGE'0G,D_(34LMC*EIB0!QPC-@3JX$DIPP1$0C+=3_;A&&0-I
+M[^R)I$ZE@&=E6N7.#?=7GDAA`5"Y>.5;-$FU"YJ:R1"J5`T?"NUV:C,*M78`
+MTR1LN==\69U&'`MGCA8E>A#IW6S>&'23\++NWZG:0L5WQXB]X<LYJ:G9![+J
+M*<4&<".5B^'&Z*8<<0M*XJ.J8V^5O&:CR>;R;IGD5'X,\JW9,=J!/"KVE/@[
+MA:5JS2((DJO/M-3:`U1U0`XRBJU"`H'O<79A/\0-2-.#"JUZL$PY'>5`UORL
+MNYK@@@`>ZTSLKVN6YF2%G7%<:3!37=8Y=B>\K-N:I</3B-U8EIKFMJ?^;'.%
+M0O+H#`A#?W6@&0%B7U\03.5J326I;^[&3(6+>79#LE#>7;B<9G8=U3J@EI&O
+M'<IRR&I6+X("I7UPUE,D^G$RBNKC^'9ZX=I_5<IXFZN3,$@0<+>&-M+0^)^K
+MM;2=H=$#$%>>]5NG7%1SG$F3DA2]:OJM9Y`<8[`K+)).1^J]F&,QCC>:=P`X
+M$_=*<:9D'B=D!'J.)^J>9SO\+89S=($[;E)PDDZ<I.)D"`?C9"23/MOE$%IE
+MIS'L$(B<A*`&P/U*9TEW,!11/'JQ,)LANVW=,79A,?S$`G'?E$(N;IR"2=BF
+M;,X!]LI.P!$CY14ZCJ=5M0.<2PR#G=`)$',CME/`.VI7>J]6O^H4:-*[J@TZ
+M,^6QM-K`V=\-`[*@V0Z)(![JB5KCI@R/E34!/)4+7#<3CLI:3FSN?\E4;EJ/
+M_3MWV[*2/]PH[8?R&R\C&R.!_P#(FF]?X^Q_$MQ3/3G2HN@U*?D@2$7BVSI'
+MISGM,$]I5+H%G4\D'S2.<A3"SEX,ITW6@.$@X"3V@^K95F4[FF/\34?\20V*
+MC?JM=],GN0TM6+U4AK9!'NM6[N*>@N!$+F^MWU+\C#K)]U-#/N#JJ%Q=Z1[I
+M^A_S*YJ$'2W8JJYEQ6<*;6D:CL970](LQ3<VC'I&^%J<%6;*S;5)KN!#CM[*
+M:W;5H5`720KUK3U,T-`@*T^U8RD)`^JR(FW#31P<E"X-U9._NJ]>@X.EAV0T
+MZ[FXJCW!14M0MY.RSKVKYCO+;L-U)=73?RM,RH&-QI&7%`]I0=7J"DP>GDKI
+M+2W;;VX8`H>B6;:%#(EQY6@X2PJ-2*M>?RCE4Z@(82095YXSN20J5T2!IDF5
+M4I4&R-7U073&FD3P5-;M'EQ&WNBK,UL)[)2#Z'#J43E6*](YDJKT0AM9S8V.
+MRT;AL.]7=2K$=)K0R20$U*FZXJ<Z0A8QU:J&M.!N5K6ENVBV.%%D*G1:QI:,
+M#E$UA&2I`W&221NFJD-9`)^4:5[AX:R3@']%D5CY]<O$84_5:Y)+&DGA16M,
+M@#NFD/2:-(VD80WS&M];3A3R&"2Y9G6[VFR@X`B?9-)M#5J!]73/PHV`"Z9'
+M)6+;7U6I<G1)"U.EMK7%X-4Z6JT6O$6A])M,NEQ6EX-L&T:37$1*QFT7W?5M
+M,^AJ[?HMJ:=%K3@#99:BPZFW0%B]58']1IL70560#G]%S5]6/_%&9B"LZ;=3
+M96X%L-+MDGU"UCFN_53=-=JMAO$+*Z[<BC2>[4`(W1?CPO\`\2ET"7-Q!;S]
+M%XYX5<:O56D.'I(R!$;KO_\`Q#]0=7N@`8D',_"X?P#;/-1U:K^7G=>?\UZL
+M9_&/3[*NT6S079CE=7X/+7U&D@#A<1T>7,:!!^5WW@JU.L%IDKS^UJR.\Z/1
+M!I@Z<+G_`!^2!Z=EUO3:99;\97)>/P"3)V"-1P=S4_G<GV5WIU`U:D`@E8]R
+MYQN`ULR2NK\,VYTZM..ZQY;\>O\`2X\[=%T2T+*;=+,<0MZU<ZG`,_!4/1*0
+M;2:'85^LU@!=(GN"N>,^O3E=W14BW?96:5-I;@XW5!CS/$!7K=W8;KHYU/2P
+M(($*2!EW/""D,"<^RD<<;+;G]1ZCO&$+SF2/U1@-Q*BN,-#P-E&H=VV9RHW4
+MM<D1*!E36_1ME6'4W-9C9NY3M>D`8YN)Q[JRP>D2HHU1J"FI.]7J&.R%$/4R
+M9",-T-R@!C\F`FJO])@E(Q8CK/R2/LJ-:2(W5MQ#B9.ZJ.#G/ALD]E+6\8B<
+M#"S^HOAI,&0M&Y):V'`A9/4)<TQMW7.UVQC+O'G2=1Y5.V::UR/?=3=0+0T^
+MJ3PFZ+2.L%W&5,9MKRY>N+;M@&4H!5BW.NIL<*M1:Z!$96E84QB5UKYN]K=I
+M1!9)*M1I;*%C6L:-_IRFJF>R@"L\:H)^ZK5ZH:./E-7J`'*S+NX&HYF58E-?
+MW!+3GA9-:O+LE27-=VHQ^JSKBHW(QE73-I[ROS)$>ZRKVX#?ZL=D=]<-ILR=
+MN5B=1NY80TA;D8M0]2NI=^;`637K%YTS`15R:CC+C(Y[(6T);!&(A3:(:C`U
+MNJ<_*J7-0MIR,&)5RY#:5-V#LL3J-UIEI]..=U9RU&5UR](IG5L)S*\]\2]1
+M?5K.#2<]N5O>+NJ-\WRZ;I:9!65UWH%RSI+.JM:31(RX<9A>OQX^O;CEERYH
+MO<Z>?J@?^:<=MT>`=L]Y0`QOW[KLAC$>_P`I?E;`S\%(EG<?=(``R0JAA^8P
+M3('?(3.U'GY`2)S![1A(D!T#;E1=FDG8%)TET@QV3@#(!3-@NB2@88,B4B0T
+MXR"E`)(2<`<3@(!(+0'$'.<IHSZ=65;K6[J5A0KBM3?3KET-:X$M((F1N-PJ
+MP@0-D0),';]4IF.W9.UH!U3OA.UK1I=P>90)CHVWVA6*1(=C]5'+<F0`>RGH
+M#U#V*HUK:J]M!HEN.Z/SJG_3]D%`@T@8E'([+6XV^TO%;0>F.'^PL_P[_P`L
+M"9'RM/Q.#_PJH0=@L7PNZ*4#)4P^OG9]1T8P)$0HZK&/&6S*.EJ\J>.%#=7`
+MITMP(5L3;-ZI19&D$_`*P+FA3IOTM9)]UJ7UT^L_2P$D<J&G:O=#W-CM*2&U
+M3IE'37#RPN=L`5T5A9.\N7_F/94K2W)JA[!^5;-J7$!L`'=7OI!VU,4\%N%)
+M=/UB&YCL4]2?Z5`"6`EVZRU$=0P!C"SK]S9CM^JNUZH#<C99[YJ522W`053;
+MAK"XSJ5WH-K48_S:[3DX4G3K9UU<`D>@+H:5"F*`;IA/^+"H%I9C=$\>G8@'
+ME0U*;Z1EFW924ZP>!J])45&]AQ`^0LN^<-8CNM>K_P`LDDK'O/\`F'4>58E3
+MVAU`"9]U:`#V2852S,F&F%?8V&^RM2*MF!2O(F)*T;SUO;39,K)NWZ;IND[E
+M=!TBTEK:KSD]U*U!]/M6TJ7N5<#0/=$RF!Z3DI3&_P!U&P/.D&52O:H8UQ)B
+M%9KOWW"Q>HW&I^C[HBO/F/UN[\J5CS(:P%T]DK:B:D3^5:-M2938`&B?=$4*
+MEO4=3+G'3[+"Z_;,;2.9]I74=0(93);V7*]5_FG1).5-+M1Z;;AL0T">0MNU
+MJ,M*!U"'.V4-E0#&C4,!,VF;R_:&Y:-RKIEJ^&K5AJ^:3))77V09Y>.%D='L
+M138(PMRC1(9B%ETQB&](;;N)/RN=KVIJ%U4#(X6QUA[F4RW,E4@1Y!EN_*G%
+M6M3IU;18YSA<IXTO/-!IL.85]U_IHN8/A<_U:LUE&I5J?F(P25G*Z;QCPO\`
+M%*SK7G664=XSN)51EHVPLFTJ;@71F>2NLZY2:^^?7<`3Q(6#?AKZ[7'U0?C"
+M\-RWV]V/4C0\-TJH8'O81)WG=>K?A_1+@WT[KSCHM>E6+*;-Y7K?@&U#*32>
+M5F,]UV5*D!:ZH'RN%\?,+M1G`"]#T`6A/ML%PGCD-%&J=.S5:L>;63!5ZAQN
+MO0.@6[6T6X_1<+T"GYG5"\#E>D>';9U>JRBW!)A<,KNOH>''UQ=/TNQ8ZT#M
+M)(.9"H79T5BSCW76T>D5+?I[@VL-31D+D>I:?XHNR(V&RU9K289>UIJ>'#.Z
+MNVT-<`-E0H/$B2/;*M4G<R5N0K2I.D2`$!/K/J_51T7P(G/RAJ.`F)E6LQ+5
+M)$004#WX#3E/3@Q.W;NHKCTF1PC4#Y9;5D#E7&D/9I=B51:YSR!J4P=!&K,*
+M3A;-K)IC>(`3ADM47F%P``F$[7'(),)M-"B&2,PHS(:9*EIND$_NF>T8Y515
+M>9!`RBM7"F"YQ@]RGJ`#)/RH:QEQ`/PLUJ3:/K3FN#0QP)&Y"Q;L@$CLK]T0
+MT03!63U!T@Y"YY5WPFF3>>JY`X6KTNCZ!&25G6U#76!/!70V%(``Q$<PM^-Y
+M?U66[I+0H00T\K1MJ$$.^\(+6E)D@?96B"T95KS0-5VD#*JUJ@9(DJ6Y>!B1
+M]5EW]S#3G*NDM1WEP?\`%,+)OJA+B2BN[B!(.^ZSZU0N<07+4C--<5)#A@E4
+M;ZLV)$3RCNZP:T@"7'8K#ZE=#45J1BU#U.X.HRX9X6-6+S4@9A25JCZM6&B?
+MJK]I9`L#G?7*MUU$_P"L^VMI;J<,3N5*X"FWW&<K6\H4V0&[JC=4F@DF/HLR
+M*R;TC0=9@%<)XXZ@VG_*H@ESA"ZSQ%7+R*%$R]QB%9\*_AY5OO\`U=ZPF3,%
+M=/'J7;.5U-O(KSHM]7L#=&D3&1/9=YX*Z>[J7X77%G<4]3F@P7#?,KM>O=$M
+M[6Q=0\H"!M"'P-2HNZ54M:;(;D1]UZM7BUXO+G[33YDN:;J-5S"`(,*)V@.Y
+M!Y!V7:_B=X5NNG==N'T*+G43D$3C9<;4IO:8<WXE=7HQNYM'4:-P#CE#J/Y9
+MSV"<-.H"/NC#"''L.0II0`2V8^J9P&DNX]U(&^J=TY83Z=)D*B$`8TDD)0"I
+M',>UWY7`=BA<QTP6GZJ`&-U/@<IH!.)RCTD&-N<I-V$C=$`&@XDXSA)P](WQ
+M^B+)RV4@S68:/B%0#`??*>!(W&?=+DP9^J42WOW[H"C_`#^%/:'^9,[F5"(`
+M!$J:V.0=O=4C8M@/)'K(1X_^0_9-;TM5%IU0C\G_`*_U3AO3[7Z\&CIM68(A
+M<SX;K14=I&)73]6:76%03@A<;T9XI7;PX_U<*^/^UCYV7]74U*SA3C5E4KAK
+MZQU$P.5-1.MD[\JK?URZ:;#'NM,@-2E2>0P!Q4U%M2Z<&Z2!W&$NF6)?#GB!
+M[\K6IT]`A@&.%!#2HBF!3:/JK-.F*7J&8_1/38&C41G]DY(+3$**4SF/HJMS
+M5;.<$J6H^*>2J%1VIW*`*I+]R@ITW5J@IM^I4E41#0,G[K4Z/9AK-1W/=%6>
+MFVM.G2$1CW5MVT):0/3`3&<A12:!IRH:]`.RS!'NK5-LB=DY;`W164^JZF=-
+M14;\ZQJ:/HM>[HZVD`Q*Q.IM?1)$F%8E3]-/IW@JS7N#^5@U%9O3ZA<W0V2Y
+MW*V;.V#*8)R3OE6I&8^WK&NRJXXG9=3TNH/X5H)F%CW[99IB(5[H3@:0:3)4
+M:TU14$`[!"XR8!^Z1:(B("`@"0HJIU*IHHN,@%9%O3\VKJF0KG4B7U]`_52V
+MM)K&B-E`5NS```"M,8`PD;I[>F`)_1*N-+)!.>$Z5E=9J0V))_LL$TV/K!V5
+ML=6]1(G/L%G/I"F`9(`[HS0W]44Z&EL:CA:OA&RTTP]PDG*PZ+?XSJ+6@$M"
+M[GH=J&46B%2-/I]!H&0KS&CX06M.&A2O&)V*Q76,OJK`^N&G8*&[L@ZW.@YA
+M3U&.==XV5C20R#F%F1IQK[8T[QS7C=8/C)F/*;@0NP\0T]%3S&[KCO$+@0YS
+MG9A</+=1T\<Y>=^(_P"43F,96!6BJP%@D$?,K7\7GS*[H,">.5CVY<TY>(G=
+M>2UZI&WX-M3_`!3!$97N/@FWBBTD+R/P%0\V[86[2O;_``G0TVS!"2G^M.Z)
+M;;P5Y]^)#PSI]1Q/'"]!ZE#6%OLO+OQ?N!2L7:3GLF5:QFZYWP8QKW^:<">5
+MW?0JKZ->G4IG+3*X7P++[1KSSW7>=+#6,'JSW"XU].36.G=W'7VOL"`P,JN&
+M2=ER-U4UO<00?=*K</?2T`[?=5M7K)*W<O:\N6.$PG"S1V&J/NK=(G3_`&5"
+MF_\`57:#Q`<5N)8)U1S7<E$RL3APPA@.).84%5S61E0D7//(V"9[M;2!D\JJ
+M*V)G*-E?'I^J;:TG80P@$?93_G;JW]EG^=#P8RK5.I(DX/LA9I;HZ#(..RGI
+MTQ,QC]E6I2'`J:H[F8^%8Q1UH!WD'D*$N`&-@E4>(E15'2PD'=*2`JU),`J$
+M@G,IC(='[HZ/JQ$+%NW233,Z@3J*R;U[B[3_`(EN=1$'+868]@=<#G*PZ[U#
+M]*MOZHF%LVM+`&TJ.RI`4Q$+1MZ0%.0NLFGSL[NBI-T#'^B&K4&DGMV*)[]+
+M2.ZS+^XT-,.581]1K[P0L>\KZOZI*>^N'/<<_JJGYR25IBJUP79$JO5>13)F
+M25;KPUI61U&L&M):8A61+57J=Q!.5AW0=7?#3NI[ISJCHSGE6.GVLN!(@\%:
+MZ9[5^GV#F&3![K4HT3I@&(4KJ6P@8]E(P!@+B`?=9:TK730UF7K!ZY<BG2=&
+M8V6MU2XW.RJ]#Z2_J]WZAZ&E;D8RJO\`ASX9J=4ZBV]N&R`=BO7J-C2MK44V
+ML'I'94/"EC3LJ8I,:!&\!=,ZFU]&7+T>/#5W7G\F7L\L\>6_\U\",+E/!\V_
+M4JE'(ER[_P`?4--8D`0N&L6AG7`T")*]&4X>?MI=1Z+9W=9[;FG3>U^\B5S7
+M7?PNZ#U"7TJ(I./_`,<#^R[2\?Y-9A?B0I[2K2B<'NL^NXN.5G3R"]_!>W-3
+M^7>5&CW`/]E4J?@T&"6WI/R/]%[57N*+CAID=E`74W3_`$G=3T_UT_=R>.4/
+MPFHTGDU*I<!MC_16[3P!TNA5`=3U'W`_R7J51@-,N!:%G.MP^J7D3'*>C/O:
+MXRKX"Z-5;B@-7PLGK'X;6A8]U`"8P"O2J5,3D94SJ;'B"$F$/>O!^I>!ZUO.
+MJ@<C<+(/AMNK14+FQW7T-=VE%TRT97/]9Z!:W#B13$QN,+4A^[8\<=X9H/;Z
+M*Y!(C(5>Y\(W6DFE4#CM$_ZKONJ=/K650TZE,5*8YY"ITJ+`X.HO)_Z7*S%?
+MW*\^NO#G4Z+=3[<Z8P05GU+>O2=%2FX+UP.8ZF&5&9_Q`S"AN.G=,KRVX:\]
+ML$)JK^]^7DNSMM]@3LIZ.H.DC<Y(7?WOAGI+WS3>1[95&IX9I-.IKYC`3IJ>
+M25D4`31:>_\`U(])[?\`\RZ*U\.,_AVS,J3_`,N4^[D=/:/K6^:W^&>R=PO/
+MVN\KK3Z9.-2]"K@&F1R5YWXCFCXA='*N/&;Q=XUT/GGRPUF\836%)KKW^8=O
+MW5?I`<:#71+W;+6%J*3!4_J.ZW>W.=-"FP.,```*5S6LDG)4=D[^3)^Z:H35
+MJXV"BFJ/)_+LA,P,Q\*8LXC`[*"X=VQA18K7;H!]4A5V_EU&9.%([UO/8<RI
+M+*@:U4..P,!!)TRT<YPJO:MVC3#&2`HK.D&,4SW9QV4:#!U8A.T$GX29ZMU-
+M3I@-D@HIVCTB,%,=6RE:T`2>$M(,]D%2J`<1*R^MTP:;OW6R]H</A9O6:;?*
+M,E!B="TMN2'#(VE=-0:2`5S5I2TUBZ>5O=-K.<P!VVRTS$E]3/E8^471Z;O*
+MEIAREN&ZJ9(E+HIBH6QSLLM+]&I,,<(3W6EE,N'".K;@C6TY6?U2J:=$L,@E
+M3;2G2'FW!<KU*EZA"AZ=3]&J1E7J(&%4'39I:)PHKH0P[_56(],C"KWDZ8D>
+MZBL*^AMQDA4>K/#:&D8QPM#JE,MEVK*QJSG7-<,,C,>R1FM+P99E[Q4(.3RN
+M[L*(`!"Q/"]IY=HR`%T=K3TP05:UBM4F@#9#6`\MW"E8"1)05VQ3<3V6'1ET
+M\W!/NIW/8X`(K!@=4),;H[JUQJ'V4I&-U^D/X9SNP7FOB*N6U*K2=EZ=U8'R
+M'@Q,=UY'^(#C3O*@:=UP\_3KXN].`\1UVU.H&F9WX4E&G0ITVET"?U4%_3F^
+MU5G`1QW5RQMO,+.>9]E\[*[>WIW'X=T:3M#M`B5Z[T$-;;M;,%>8?A];-8YA
+MU8X"]3Z7`MQC/==<.&:;J[P6.',+Q+\=[TT:08#NX8GW7L_6'^EQ'9?.O_B+
+MOGLZA3IXC4#/U6<N>';P3>4=#X`J"ITNFX?HNYZ;4EK9`"\W_"R\+^E4A@X7
+MJ'A:C3N'?S-@)*YV;NH^A>)RF?&F<`JM4_Y@.!*T^M6].DT/ID@.X*QZKX=$
+MS/NK.*QW-Q:HN&_"M:Q&%1MX(F2IVB#Q"Z,)A5(."(]T-=X<))^@43@1L9"C
+MU.U;*+(.K^3='T]PDSO[JO6<"S!0VCB'<J-?&A4IESM6!"LT9#=]\JDRN2\>
+MD1W5NDX1M/96,W:Y;D@"5+4>-$!5Z3O2/V3U'?TCE;VP(.D=Y451X:=X33#9
+MSV4-2"9!6;6I#O?DG<*[TNDPTY<[?.5#T:R=>W0IC\NY*UNM6++"T#V&8QNL
+MR6\KE9.'.^)G-94U,)(B%F68-2IJE%UBX=6J%L[&,*ST6V)`EIRLSFL^7+6.
+MFA8LP,X^5=:0`FITFLI@`9]U%<U6M8<Y'NNCQH;ZJ&ATN'W7/]3N"3&J?JK'
+M6+S=K2L@/=4?F8/NM=,6D22.$+R&MU$P0IQI:S.ZI7CX:8._=6,U5O*YSG"Q
+M+]Y>XMU%7+VKDC.ZJ"GYE9;ZC-Y1V%MK()$_*V*%NUC,#Z)K*B`P#<A6Z3`#
+M*Q:U(B=1&@.(D=E1OB`TAIA:-V\,81C98]^_5R""M8I:S;\O?5T-`+G;0N__
+M``VZ.ZATWS'M]3LY"YKPG84Z_5&OJD`#(!"]8Z;191Z>WRF8C?9=L)NN.=X4
+MNG6>FIJ(6@]C0PCE*SI/J58+H"O/MVLI0!PO1BXUYSX_I>H_"\_<P4^N4W'&
+M5Z?^(-$&F2%YIUX>1<-K[@$+K>8X_6CXBIN?4I%DY@2M+I/36?PP<Z7%16KJ
+M=YTVC6'8&5LV,"FUHCX6,>4G6E<6-$"?+'U5>[L*4$%FGW"U_*+Z\`>GVRI;
+MJU_D$QF%K45PU\U]"OY>[95JVHM?0@@94G6+=SKO26R)S*&F*M!H:YDM[A7I
+M$-6S-,ZL?11MI@&(RM*F!5IX<,]U6O;&HT%[:GZJ+M2KL83#CMPHGT*;S@82
+MJ6M<F=4J2A;5"(.Z49O5.D4KFBYKMB(B5R'6/#->A5UT&E_QB%Z!4IO9)()A
+M05-3@<%!YY0Z=7HO]=J]I';*GI=.96U$5'!Q]LKMWTVU6!I;OP4%3I;20ZF"
+M"-T''4>@-!Q&_(W4KNENI^GRI`Y74_P=1M3(EH.R3J0#3CZ(,&VLZ`H-&DCV
+ME2?PE#L?NMIMO3+9+,^Q3_PU+_`?NIMMZY4,@8_5<%XWIZ.N-<=L2%UM1]RS
+MTN$B,$+B_'-U5;U2DXC3ZAGMNKQ[1RF]5=Z#6<VOK`):/==+:UVW%(D[A9'A
+MVG2?:MJ-.HD29Y*5:J^SK'3^4E=;^'*?XUV5''T9A6K6-/,CE9?3K@5,\E:#
+MG!E.0<D*58*XJ:9R1]54>2[`F/=)S_,?OONE6BF(F2[A1H+6^8\4:>>\+6Z?
+M1;28`&Y'95>EVX#0?ZB=UI-`:R.0%")`X-&Z0.=]T#3("-F7`1]4:'3W5EC2
+M6B3A!3IC$J<M``@;!"&.&X1#(_5,``?E)K0TG/T45'5',8^5G]5:?X=QV@+3
+M+#DJCUK_`-J8`GG*NASMF8N-,;E:[:?H#FXA9);HN`<"2M[ISM5$-$;*]QCZ
+M.A4!I:7;@)^E@"]([IZE+3+H06A'\:W.5(TWAAO$+)ZZ6N(&)Y6M2&I@B<X"
+MRNML/\8&$1\J6-%9,;H:1F%<I,&F8P2J%'S*,?X96I;%KJ0)*J`=(;$!5;LD
+M[#;]%?J@!N(GY6;<NA[M]LJ*Q^MU=-,MC)PJ72:#JMZW`W_NCZF_S;O<D-.0
+MM3PK::Z^N-MH2,NGZ/;AENW2!C"U*+3&`%7L6AM.#@J[1TG!QA+'2)J5,%LB
+M3"BO0/(*L4YV#OJJ]^#_``Y,94L:4>GP">,K18&N9&9*HVK"6<25(*CJ9VE9
+MI%3KMN!2<X@G$2O&_P`2@*5R\D1[KU[Q%=`6KAC(Y7C/XJ/;HJ.<[<1/W7#S
+M3^+KX[_)PURQS[L:1K;/YE?LXIC><QA9%A=4F/\`+<[.\A:=*H'Z"W;W7RKQ
+MR]_^/1?P\'F:)GY/T7I_3PUEO]%Y;^'E;2QDD!>@65Q-,2Z2[W7?&QBINID.
+MIOD<+YN_\2E$"_%3,2/[KZ1N`'4C.<+P#_Q,VSO(+QGU#'W4R[CO^GO\F?\`
+M@RZ;)D/QVE>O=#N3;N#VNC$+P[\&[HL:RGL/^R];Z;<>D!T_=<[Q:^E9MTEY
+M>/N1J<Z8&W"S*KOYI,_=2L<30U`@M_55+AP\S;Z>Z3EC6EVA6!<!LKDMT>DK
+M.L=P>/U5LDP%T8L2!PF2>-E'6>-/LH7EQ,;?"=C9(U<HNATX>Z,Y4[;<F%%3
+M(9L=E9HW.(.<Y"FB_P"!8QU,R1@*Q3J`C<YX3-(J20-Q$)FT7,=JX*K-6!5=
+MIR83BKB3N%6#CJ+<A.YT!HV5J:35:TMRX?9`'ET"8E0U7[@_=14GN+Q'=9M:
+MQCJ?#]-ULWSR#)X]E4\8=6?4I_P[1I`R24-'J1I6H!,:6[%8%W6=>7I$[NRE
+MRUCJ,^O.Z:QH/N*\D3)W72=/H-I40,*/HMDVE1#W#*LUR=6(`3"</)Y<_:AK
+MU&@D8D=EB=8N=#3Z@K?5KEM*F270?E<MU"Y=<5]+7$CLNCC;L%>L^I5,J2DR
+M,F?D)4:$L!/Z(JKQ386SLG:!NG13X"R+UY<2-6.,JQ?7!((D;+,N:DB)W]UN
+M33*O5ESR.ZM]/M3Z<2HJ#/4#"VNGL'DCNIE5D!3MRT`#,!,^6$P,JU5<`P25
+M1N3(,&.RS%JCU)Q+MU5I4#4N&R<?NKCJ+GD^G;:2M?POTCSZH?4'I77%C+B+
+M'A>TFYIM:S;V7H-"A%D,0LCI%E1H51`C*WZSPRV$8PO3C.7FO2.WI:&^D94D
+M.+<]E7HUB3Z1(1U+@Z8(A=)IFN9\=40^@[&87F7B6V!H.&C9>J>*:M-UL^1Z
+MEP'7J0?:O<NT<*@\)MU]&:R/RF%N6],,<'.$-`V)65X-`_AWL/!6EUJH*-H"
+M)&,KEA^!._J="@XZ0TGNHG]3>^G+0(Y"P>FU?/O-&DD2MQENP4M.B0=UOCX*
+M!J4KB[FJ`"=E:JVI%/+99"S[^DZC6EHD+0Z3U!C6-HUY@XRE@HU;-NN6%U,E
+M0W5K=END5);\KJOX>TKT=3"V2JQL:8.G4/B5!R[NG78;K:9CA!0JOI5--PR/
+M==DZSBG`V5&\Z8'`@,!:>%(U6,/(J-P0<*&I1I%D`R#PKM?H;2=36EHY$H']
+M%!8-+W-([*HQ;FTAY+3[A%:$D:2#(4W4K*[M07AY>WW""Q>RHV8AP&0B'>!/
+MJ9'NJMU39O/Z+5#6N"SNH,TUH:@&C;!U(.C='_"#L%=M:8-NP[84GE!1T=G5
+M,%<1^)=,Z6U`V8(S]UVCW>@YA<OX_+7=/(WS_FKE/KCC>6-X.ZDZF^G3<[#@
+MMN]J-KO)X&RXOHD^:]S2!IF(^BZ"TKO-#)RN^7+G)ILV#=#-3#*M-N'.(8_'
+MRJ?2ZAT@`_=7Z=%KQ),%9O"K#0P-U2-DUNPU;CS#EC3"H7KZC*C:+#(G.5I]
+M&<TM#70(WRLJT;=C6M4PR)R@:6P(B%(2!@#=1HFCCA6*#6G`G"A9)<,;<*Y1
+M#?+!P$!`0V91S+?E1ZO7@!2@<@3E%.QN<F91$1S)2:2!M/LGW=//9%"]L4R2
+M8`69=-%:K$>EONK5]4'_`"FS+C&$5&AY=#(]2@YSJE,-NM0&!LM'H9#@#V5?
+MKU,Z]1[[H_#]08`SE;G3-[;>F:4.,R(6=48:5Z"#`GE:E/+0X[1W5+JC)<'1
+MGNLUIKV;IHM(.1&0J/4ZI=?-;4;J]^58Z6X&V$G80LV_JM?UIK9D#=-<FVB:
+M;:E(`-CY0T`ZD_3/I4U/_E@!&^F'4I&Z6$!6RS$K'ZS5\NFX`Y(CX6P7#06N
+MQI7-=:>:MYY3<@&2IV54MZ1<=9,EQB5U7AV@&4FD\CA<]1+16:P8B-ETO2:G
+MH:`-A"TD:](P(E6[8:HD*A2U/<,;*W2K-IMAQ`^JRZ1>D!H"K7IFB04S;NB3
+MFHU*L]KF2""#[I8NXBLY#<I[HCRSC,*2BWT*M?/+:9:3A<ZTY7Q=U`6]-Y=L
+MW)7BWXA=9%U5?3#9:XXS\^R]-_$5TV]0AQ!C*\CZGT^G4OQ6>\D3@2O+^HRN
+MM._@QF]U@6M"I4NVN8--/N976].M&^2(&&@'4J[:5(D#$MV"U>D.;YK&U7^D
+M<!?/RG+V>VVWX<>ZCH.D@=UVW1;HN:TQD^ZY6VITQ3:X'!V70]&T!K8,X6I:
+M.B8XN89[+R'_`,2EH7]"K/#3B#^Z];MJA\L'8+S[\=[7^)\-W0&?23/T*WE>
+M-M^+C./#?PHN-/4&4W.V);O\+V?ICR:3#@[8"\%\"5C:^(RTNP'G'U7M_0[A
+MKK>F=0R%C.:R?5EX=+;52*<']%#6J%U6&[3E5_XE@I_F`.ZCH5BZH07;]BI.
+M$L;%K(:"T$_*NMAP'ZJA9$E@!*U^EVS'M+GDXX[KHY7A!;T"^I,'*.[I.8!(
+MCLMRUL0(((@Y^$U_T[6PD)IGWFW-D$OP=U(Q@!X^%+>T#2K:3N$`@OSN%&JM
+M6YTN!CV5BJ[T@1&%2`TM!:<'=3:G&C$B2M2L6!?I$GG<J%U<9'8(JKQY1&Q5
+M4M=J(;$0LVZ638JE4ET"2/W5GIU/S'YP/=5F4'/$Q(Y4[*O\,PR,0N>]UTLD
+MG`NM5!2HEHW*;PQ;^;4;5<#,[K,O+G^.O6TF8$]UU70J'D6K3$8W6I-W3S^;
+M/UQTTWD,MPP=EE]0O&4:3BXY'<JU>5M-)QD!<9XLZ@?4&N_WE=G@1=9ZJ:]<
+MTVG?;*&PH_U/YRLCHS:E>^#GB1,KI&4PRD!$'NL[VMD@:C@QF/NLV\JAP(GE
+M6>H513ENQ]BL>]K@N.DQ*Z2.=J"XK9/)F,%1T6>94!,Y.$J=)U1\1N5J].LF
+MAHG$%+=$@;:T`#7#*T&4PVF2!PC93]$!"_5&D+';>E.]?K):!!04+<N&?OW5
+MZC:ZJDD21V6AT_IY>1`5VK-MK`U*C6-;DE=9T;IE2E:^EF8W6SX4\.M?IK5&
+M9&<KIKBVH6UL1I`@+T>'"V[</)8XRRLZ_P#$@/!PM8VKS&MTA';Q4ZB8',*]
+M<4F@PT\+O)S7&J]M;TVL@#=-7MV%A@*S3IP/=-7;+8(72,5Q_BZRFW>6[[0O
+M/NJL>R@]CL`=UZKXAI3:N)W`.%Y_UNU\RC5])F"NL<,F;X*I,9YCBX%HG^R?
+MQ=<MJM%*CM[(O#E,4K>JUW_4J%"D:_5'-W:#,;KECQ;3ZO>%K$-8'O'J//*U
+MKNEI8=,XX4_3K<,H-],8E27,-89:/9:QBUS_`%!@<"1(C=/2M65[4.:WU`J>
+MJR7N!R"I+-GE&!!!6F8KT65K?U-V&X**\K^8T5&.+7#A:/EM<9PJG4+1NG6W
+M#AE(JWT^J]]JQQ,PBKO<<M=![*CT>L0UU([[JS6)TR#$%9BU%<W%=H@`%0'J
+M88"*M+`W,I7M3\Q)W&RSKC4UA+<RJRLUNH6=:)=A5+CIMK=M\VVJ`/.T'E4B
+M*51Q%003A0UZ52A%2A4<V#P5=;76DM6A>6N:E/S&C^I475!5O`'2)X6K:WUS
+M4I-:7!W!;"L46VCW@7%#23RLW_"?Z&A3:*31JX1Z&_XBM"CTN@:32RLX-(QE
+M%_PJG_\`,Y9Y::A_(3SRN0_$"H?*+)R=PNPJO#:)<<>RX#QK<"I7<W4-UTLV
+MY1SG2G>34>3C4Y;G37%^ESI(VE<S<5=->0W'<+8Z-<#0)=[+K.6'5=-)V[;+
+M4IU&M:23@#*Q^FU6BFT@F85NM4):Q@_J.5*JU:-;5KNJ1O@`K2IVNBF'L.2%
+M6L&C4UK0(`X6D'`0LJ@I5*K'^MN.ZO4:@J1ZOI*#0'M@Q]4!MW,'H)G=1II4
+M```=_E2^PPL^VN-(#*@,\K0H.8YHC,H"8R#G/U4]/#8RHFCU[X*E9@RBG,"%
+M%=5@QIB22E=56L$\H+&@:K_.J_0=E*"Z=;D@UJDEQ.)5IS<;*1H`;M[).8"F
+MFF%UVEZ"9Q\*ET,AMQ$E;'6J0=0=!("P^G'1=:"0KBSDZ>AMLHNH@&B9.45!
+M[12;D!4^IUS4864Q)VE+`NGW#W$4VF<IKZAY5XRJ<DPI/#E$M$OB?=6/$;"&
+M,J3@%9O<K4BU;N_DM/LI35TC,`%5+6LT6@?[<J"XK5:A)9L%JZC,!UZ[;0HN
+M>TY/=<Z;G42\G+E)UZX?4KB@TZC.T*3I_3*KM#WR&[G"FTLVO^&>GNN'-JU&
+MG/\`B73M;9V%`.J/:(WDPL2XZQ;=+Z<8(U,$+S#Q_P",>H7E1]"VJN8V<1*S
+ME9.VL>>(]0ZYXWZ1TYKP:["1PTA>?^(_Q5#ZSFV@)'!7G)H]0O:DU/,>3DDR
+M59L^@7-3/E.'T7.^61TF'Y=/2_$+JKJX=.Y[KUG\/NI5^J6%*K6.7"87@W_#
+M:MM5;YK2!*]I_"FH&](I0=FQ^RZX9^T8RFK'H#&M;2WX6;UHL;;N).P4C[T,
+M9I<%E=9KMKV[@'QC98M='EWXD=4)NGT6NVW*\PZ[U5[:[J=&-1W<<PNI_$^N
+M6=6JLD[[C*\\ZG5=3K/>XX(P%X/-=W3V_I\&GTF\>)>YQ+B<GV6YT>Y>ZY:X
+M;-./=<9TBX#JHU8@X`Q'Z+I["\8`-1DCL%X\YIZ;B[SI]R'4VDNR8$+KO#Y9
+MY()[+S7I-RX!CXQ[E=MX>NBZDT%PRDNT^.OI/:*<R8'NN3_%,BIT&NW?T\?!
+M6LZ[T-TD[\2L?Q1_ZGI]1LXA==[B3M\R4G&T\759)`\R9^J]>\+70?94R"XD
+M`+RKQ_1-CXKJ%HTC5(79_A[?-N+.F)F-\K.<W)7U,,IIZ`*NMH/ZJWTZ'502
+MTK';5TAH$GZK6Z&6EP)D9^5B=NG<=!8C8!I]EN=,MZ@RTYWT^RR[*`T;`KI.
+MF-IFV!`AY'YETG;CG=1+3<:='\Q#@%-3NF&A+CQ$*A4=5=4T-!(G\P17-`,M
+MYF5TE_#E<65U9X-T2,@E5<:HC*DN3+B>Z@=4@97.NLG"1E6&$DR=D+ZY#8#B
+M/E0"K+S$QM*DHTC4=),#NEIZ_DF/<YQS[RIJ$:NQ4]C;AE4ZA)C"BZO5ITVA
+MVSMOHL7=:FMZ7*-:FREZB``,E<[XAZA2UN93=SQRJW5>J"G3=+_JL7I51W4^
+MK-`)T3_=+>$O\>:ZCPA;&I7\Y^Q/^2[#S0R@&@[+-Z70IVMH-,`ANZK=0OO+
+MGU+IC-3E\WR9^]V;Q%U5M*FYH<N1NWONJ^K<'A-XHOO-N"UCIDI^BO$AKAQ,
+MJ^WQCU^M/I5NVFP.(C"L7ER&M(!V"`U6,I`A974;L:B&D%;QC&5V:_NYD$C]
+MUGL:^M5`&)/='2I/N*L@8[+5Z;9.:YIE,LM+,!=/L88#RM*E;Z&Z8YF5/;T(
+M:V.%8<R&9"Y[VUI3\LZ829;N>\`*ZRE+HCZJW;6_J`T_*"O:V<1V72^&>F>9
+M5#W``*#IMGYE1K0,=EV71K-M"DT@?HNOCP]JSGEJ+5NQMM:@8!`63UBO4J4W
+M!H^5LUJ>OTX`*I=1IT:5N[5!@+WS\1Y<O]871VN_B"\X([K0KO/F=_=1=+`-
+M1Y`D&5.`'5H4Q^I4E`%S=TJ]/TE6*;(`$H*NQ$+I&*P.O,U6[P-X7#7].75F
+MQ.Z]!ZW3BV<>X7$W0:+FJUP,96_CCDXJ_N'6=2HUN)G`*M>&:?F-\\@R3.57
+MZ_08Z_,@Y*Z+P?:4VVX:1*F?%3&?5AE9K:<.!P%!7J-,\8D3B5JW-*E!!8/A
+M9UU;4RTC;L0K"L]P!=B-U/1I8"@J4*U)X+3J:%8M:S7$-?A#0].E\#`'9'5`
+M=0@C=&\LQD05%</:QDS]$&'6?_"7VHGTDPK=6NVI1U-S.5G>)'!S-;-Y5#IU
+M>Y?3+6C9+J4DW&N\-R7X:JM:M2:XR=DS:5>H`'NW3U+*B!ZQJGA38I7-:B>!
+M"EL_+J"!D)7EC0\LPU4J5LZF^:57(&`@NNM?(JBHT0KU+16H9RY4@;A]`-D$
+MC*&UN*E"IZV$`*&FM1;IIALG"*/^IR"E>TC3!T%%_&4O\!472[U2MIH$`K@^
+MN4Q6O7@977]5JM;0).ZY&Y9I>^N2<[+KIRC&N+:F:+B2"6\!0=*<&W$.P.$]
+MPZN*C]/Y">55:]S;C!@<*XI796-;32&95_IKWU;@N)PU<[T^M-O'*VNAU)8&
+M\G<K5'3V0T4M<Y5RF[DR3[*A;N`IM;(GLK=`^H&,+-(O6YD`@25:9I)@JK:`
+M:I"L`D/S!E9:AZE"F\2!!4;15H.D$Z58IR?=3:06YB44UE7:YL..5)=W#:;/
+M2<E4;MC:3"YF'*'I_F/J!]PTZ9VE/^B_9T'UJ@JU!(!Q*U&M],`0$%L6%@TG
+M"E$`*::$T`X)PG<`&Y*>DV3V")PD^R"C?-+Z3MX7,OTT^H$KK+K\D@;^ZY7K
+M32V]R2)/9)Q4O32M"^Y(IM..5IMM:;*>1J57H3`R@T@[K5()8>ZMF^R*%DT,
+MN=(Q[*WUNCYG321N%6J?RKH%:<"O9EL[A9O,:G;`Z.36_EDX:CZ[<LM+<AN^
+MP4+'&RO*C!R56\NIU&_TD$M!W5[FV;WI'T#IK[NY_B:HD$SE:O6:].UMO+80
+M"!$A:#13M+04J;1('"S+BQ==-<YP.5G*Z61QW417OJSJ+0XR?NAZ?X(;6KBK
+M7:3.5U%'I[+>K(`!F,K4L<;F5R_;WVU/XL3IWA"RI``4FS\+5H>'K9@@4FX]
+MEL6WE@"",JVQK2TA:](UNO)_Q(L*5N_T-`@RM7\*+F:;:,F1PG_%>AZ-0V!6
+M3^&-P*75=&I3QW5,IN/4KJV+Z7R%R_B?S[2@_1+AMNNXM&"K;-/$;K'\16#:
+MM-P(A7+A9'SKX\>^O?U'N$9WW7#=;#R2X&1PO3_Q=L76E>H^F/LO+ZC_`#[@
+MAP).T+Y^<YV]_@Z#T(-%4FH1)VSLMVP<VG<M]8+1F8C*S+"S+JL.,=L;(NHV
+MM:B\/F9P#/\`9<,N:]'%^NKI]19J:UF3MA='T+J9IM`U9[+A^A4`RD'.<-16
+MYTFK-8,&0#NN?MJL:=Q2NGW#06DRK%7U6A8YVX63TZLT-`D"%:JUGD0W]%TE
+M'CGXW='>ZN^YI-<2#Q]5RG@WKU?IMTUCCI#=]2]\ZWT:AU2B6U`TDC*\T\8_
+MAM7:Y]>T'N!G_):QS]?XY=/5AE,HZ'P_U^VZA38#5:'GW78]&K-#&D.'W7S[
+M1I]6Z-7TO%0:>#*ZKPQXVK47,96+H&#J)3+#[B]>%^/?.C515J-#CCY704JX
+MIT8IN.<$+RGPSXE9<L:^E6S\KLNC]3J5ZC==01[%8EC6>-[=[TS3_#AY:-,2
+M5F=>O&"F]K#`*O65]19TUI;49$>J2N-Z_?\`G7E3089.%TO$>;#'VR-6NQD<
+MJM5N!)@JK4J9&=U&YY7.UZIC%VE5.J,Y5NC<BDW.5DBX:R"@NNHT:5$N>0/A
+M,=UG*1KWG5&`_F((&`L#K76&,8Y]2J,=RN7\5^*[>W+A1,N7+VESU'Q!?AFA
+MY8XYB``EXYJ=3<=)4ZG6ZI?BA2RR8*[WP;T@6U-M5P`<<B53\%>%Z5G;TZM1
+MGJC)*W[RY%NT-;B"LXS?->'S>7VXC4JUPRE!VC9<AXCZE%TYC3[0KG5^J:+,
+MP<A<7U&Y?7K/<Z<G"ZY7AY\9ROEOGUFOU3E:UFQE*FTD[+%Z54&C)DA7A7JU
+M7>2P$SRIA/M,N>(LW=X#+&9/R@LNG5[BL'%KH/RM+H?1'O<*E5H]Y746=G1I
+M,#6M'9:N=O$)AID=.Z2&4Q(`*T*%DUIVA7]#)`#83N89VA8_ZJLVFUH['LB%
+M(N$$85AE(`3^Z.DT:M/Z*[-(K>C#@%=H4X(`&2DUK6>H[K4\.VKKBY#W#!6L
+M>6<N&IX:L"&M>YJZ*BSTP1@)NG6X92#1B%.88W,+W^/'4>;*[0W!#:1("YKK
+M]9SY:"M?JURUK"-6.RYVX<:UQ`[KK>(Y]KG2:1;;22K-%DGOE*VIAEL`,'E6
+M;>F/S'/LIC.$O9]):T#90U`(.5<+?;"@N&@C"Z1BLKJ4&@X?NN*ZG2!OGEHE
+M=O?L_E.7(WC)OG'&ZU\<[VXCQ/1(N-78R5I^%:X#6Y/O*C\749:\Q$<JCX3K
+M?S=#G;8^5<^F,>W77;0YD@JE4;(B<JZ1KI"56<R'_E)455#3EA'NA_A*;S,`
+M?"LN8-4@*5C`!@A15!]CZ?SG[J"O9G,N)`[K5J>QW5.],TRFD8M]0I-IN@3A
+M<_3J5*%_#?R$PNDK,+CN85'J-F`TO&%=<:B3B\I:(:]D@&3RIB*9;#L$")4?
+M2ZK74])&6A2UF@L@%2<K>%*M3T&?U5.YH^OS&.WX`5[4`\M)P5!4!:#!,3A5
+M%>@\TZH!_+SG9:;6-JT0[3)'*H56,+)#H/*N=+J!A%-QP5FK%BE2:*8V1^4W
+MV5RG2E@(B"B\D^RFFW/WU4O86Q)=C=<]U5YIWE.@X8G(6[6:ZG2-3<KFNL^9
+M<WFMN"W==OKA.BZNUH9Z&8A<[=.;JB(SRN@OZI=3#"[(P5SW4SHJ$F(2<5.X
+MU.G5`VVWVPNB\+EKJ@!G&5Q?3JY#0"0/A=7X;J"=7<8RM_4EW'5:OYD`K0LW
+MS`[+$H5"XR"M6R<0T+"M:U,;#`5EIU&3F%2MWD`<CM*N4':A&T<RHU%FG^5*
+MK7%*GJ=":=+"=AW5-I==W.G.AOZJ">VINNJ_F/)T\`J^ZV8]H;`$;)6S0P`-
+M$0IVD3)32J['.MSI=,*];N#X(*A<T5-QGNA#7T7ZOZ?9/^JTF"?;W3._+NH[
+M:J'"`I*A&(&ZBHGM$9(7-^**0;7#\Y/*Z9QEAU;;+#\5TOY0.P[J43=!=JH-
+M![8RMJBWTSLL#PW4!I@?1=#2/IV6ZS&?U)I:9A6K*N&VH+B$_4:;749B%BU[
+MAS`:<X"D_#5_(>J5&UKP^6,DK4Z9:MM;85'1J=[*MT.V:]_G5`M-C?XBN*;/
+MRA9O";#;6[[FM);CX6@;1C*4"![*]96S*3!C,)ZS6DSCZ+$YY:CF^I6T5):W
+MY52E+70X8707ENTM)61=T@QVQE6+I);@1A6QKTX*HV[A$?NK5!QVU*K'*?B9
+M:5JG3G."\X\,=0?8^(*;7XET$KV3Q6UE3IKVG.%XCU.@]G67O$@,=(*Y?UR;
+M[CZ-\*UVW/3J9!F0I^I6VIAYE>7_`(=^,6V[&V]P^"T1)PO3;#J=M>V^L/!)
+M"ZW'?,9QRUQ7D?XRV+74G0T3*\9O^EOI52ZFV9.Q7TCX_P"DF]+BT%P.87GS
+MO";J]8@LQV7B\F.WHPR]7EUC8UZ3R\M!+OT1=0#C#=,M9[KNNL=!%E4TO!PN
+M>ZS;LI"8E>;R8<;=\<[:PQ7K4Z;:5$?)[+5Z+6=3:"1]5F&[IMJEI_-V0UKT
+M0-#H:,0O/=[>C3LNGWTU`7GT^Q706U1E:@W3$_JO/>FW!(:[4872=-OFTPV7
+M3([[*XUF\.@MB16R<!:-1M"M1T.:#/*Q:%85:6K5$[%.RZJ,<3J=`]]UTQ%?
+MK?@^QOR2:329DX'^2XCQE^';J-N^M9L+"-H_[+U#IM\:K@TO`'*OW;+>YMM#
+M@""IZ\[CKCY+B^;>D=4ONB]1\BJ'-T&#)*].\'^+;>X:T.<&NCD[JKXY\(4;
+MNXJ.8S29D0%Y]U/I?5.C5O,87.8W&"KN9?Y7MP\TO;W@=8\VCZ:L@C@J(W8>
+M8)V]UXOTCQG=6Q%.J\^G'JV"V:?CINQ(^04N-=98])JWD'!D;)S>4VLU%T%>
+M5U_'#G$N8=("H5O%5_>$TJ3WDGM_V4F%[I<OP]$\1>);2V#O5+EPW6?$M[U%
+MQHVVHR<`(^C>&.K]6JZZ[BUIS!7HO@OP1:V9:^I3U.[DG_-+G)QBXY>3&=N*
+M\%^#.H=6KMK7FKR]].R]:\+^&+/IM$!M,!S1(6Q:6]I9T6A@#<+.ZCU`TZA#
+M7XE9U]R>7/RW/B-2YN:5&EI]H@+G^IW,DOF8V6?U7J3R]I!CZJM<W9?:@B)*
+M991SF.@7M9U1VAVTRJ/4&-8V0<E,^Z!P5<Z3T^KU&H`1(7/W_+7JAZ%9W-P^
+M*;2X'LNY\.>'W@!]2G!]UL^#N@T+>@V6#;>%U=&UIM:`UHA;QW8S;)TPK6P>
+MUH;IP%:IV&Q=,?9:YI@&0(]D+FM;D\K<C#.-NU@P,^^R!]$<J[5J,!@E4KJY
+M8S^H)H`6-F"8/=":C*1))`]U3NKS,"?99E[6N;EXHTVNSRDT5O6%0WMZVG3<
+M2V<KO>@68H4FXX7+^!>EMMZ+:K_SD<KLZ%:E3;&J%[/#A]KS^3+XNF&[*AU.
+M\#&&#E0=0Z@T,(&_=9-5[[A\`E>K>G'LUS7+R7.,A1=.+7W.H$#Y3U[-Q$$+
+M0Z59-I4]3FB8WA3OAG_4]-[7O+,$MY5R@W$X*KLI@NW*M-U#&WNNC)WC&57J
+MC)GA3N?@M*KW)`&#NM1*S^H-!I.7(W-/_P!<XCOLNNO3_(/=<S4IZKUXC,K5
+MZ<[VYOQ51F@Z1NN.Z56-KU@:MB5Z#XEMYH.,+SCK`-&^U@[%:LW'/JO1+7^9
+M;->T[A.ZGZN,[*KX4N6W'2Z<'40%HPX[[+#:LYF2T-D<F4`8&RK<`"57JD!T
+MSNFA#5``$1*HW;FD$&%<JO`$Y5&YR_:545"WU$CCA1WC-=$A712EH)P@<P$E
+MKCC@HE8%H[RKPT\D']%<JZ9@*/K%`4ZPJM.`5(8JVPJ-@'V4ZIW%:YIP[6?W
+M3!K7,]RIW,#FC5B$%.F`X@&$%"K3-*KOZ2KMJP8)X37#`XG&45C^:)&%*L;%
+M!W\EN>$6L]T-`M\H8E%+?\*SIMS'7#_"T-'(W6/08]@-0Y:_*VO&8_D'&9X5
+M2WJ,=TP-J-`<!A=9=[<.G/7CFN>0W:>5E==93=1@CV6SU*DQO\P+%\05)MAB
+M3*L*HVE336;JTXSA=5X<J>EW^:XUSBQ[3'W70^'ZY#)X/*WWRQU7963]39!V
+M6ST]P(&#E<MTNL=/YACW71=-JCR@0%&FS1=ZA&5H42-.^5DT'ZS(!$J\*P;3
+M+CVV6=+M)=UG/<*#'23N95ZRHBE2`@@\K/Z8T%YKOW=LM:@X$"3A3_524XVD
+MR5,`(B%$V-X.RE9"*DIMB"5+`<R`HP/3,J1IG$J*A+32=K9LK%O4:YH)&2DU
+MH."9)45>D6NUL)]PBIR)S&/=9OB6GKM25?H5P6AKL%!U5GF6C@"I2,#PP\A^
+M@KJ;=PB97(]#>&WSV.X.RW[F[93H:0X2>RVST;KO4`QOEL,E8_3Z56]N(&W=
+M2/8ZXJ:1))Y6Q94*=C:`F-<96=G8+RX;:4VVU*#4/9;'1*7E6X?4&2-UC],Z
+M<ZOU$W54SR`2ND`:VAI[8PN.5VMA6W4:+ZYI!XD<2K#R'`&?C*Y#K6JPN?/I
+MOPXY6ST'J3+F@PEV2%TQU8U_5I56`M@Y6;?6[2"M34'>D$&5#>-:*>8(2QIS
+ME;^6X[@!1MO=!C)6C<6KJ[SL`HSTQ@&1*SLTSKBJ^Y)9_2N'\9=&+*AJTF3.
+M\+T6I:-9^4`:55N;!E5A%2,K&<]N6L;IXU7IU*;I`(A;OACQ3==.J-94>2S9
+M=/USPO2JM)I0#[+C.L]&KVE8RWTM*QCG<6[C,GI?0_%%EU!@8]PF,_[A;0MK
+M.K3-1L`N"\-M*M>UK:V/+7!=#TGQ?=4G>75>=/O_`-ET_CFQSCTWO'?1YHOK
+M"!"\?\4U88^F<0=Y7J/5?$'_`!"R\L.ES@N&ZIT2K<5'.#=1)PO+YO'KAW\7
+MDWV\SJ>8ZLY\&3M"EL];ZKJ;@`!GY787GA_RO4YD+&N.G,I7&L-+?A>:XZCU
+M3RRHQ7=;T#/S`1]-ZG4J7`;J,3D2J'4V.<[,CY0V3/*)>[Z<+EZZCK-6.^Z7
+M?@4@TG/`*UZ%1M2D)$D[A>?],OG/N@ULS\G9==0J.IV8<(EWNM2\.=XK>MPQ
+MFI[2/H5:97]49C]UA=*K.JB,GYY5FI=EC\DAW8JR+[).IU`XF0-^5E=7Z1;7
+ME(L<P>K*DZK=--,&23\IK*O4J.$\>ZQE_KI*X[K7X=LN-3Z(ATJI2_#6NZD&
+MAH:!S.Z];MS3%LQK@)(S*FHUJ+1,1"LEZVZ3S61X_5\"%CJ=)]-H:S^H#+OE
+M=3X=\&6=HYM3R?4-B0NHJ%E2Z!#>58K564P,PI9;Q:7RVK]E:6MK:M+:8!(Y
+M2-^QC/Y9,MX"R;SJ;74M,RJHNV`Q*MLG#G.>URYZH75C)52[NP\ZM655O&:S
+M+"<YCLLZM3>&%KB09Q*X^_QK2Q<D5-0+S*JUKC0R`X]E4N+MU(QW"CI5C7:'
+M05F_E6C86C[CU9C==YX&HLIM;+0>ZY;PM2\QH;J))7:]`L:E(X^JU).TMXT[
+M'IU2F&`#$J[YX#=\++Z?:52P1)6I9](NZ[L@@+K+\<D52]$F"H*MP\MELF5O
+MT?#C6MFJ8A&_IMO281HSPNL\.>7QB^3&.2J&XJ.@`Y3#IM>J9=NNG%I2!.EH
+M1,H-G\L+>/Z>WMB^;\,&UZ&TP7"?E:-CT2D'`BGMW"V+>BR>,*[;AH'$+T8_
+MI\8Y9>6U4M+(TV@-=MV4E>W>6@-*O4V:L@Q[*5C`)E=ICKIC;#=T^JXYRAJ4
+M*MN=0^RZ-K`L_J3FG`[K4P9M8E2\J.=!D`=@H.J>)[?I]-IJU`/;_82\075.
+MSMG/YX7E'B^[N^HO>:;"6@K>YC/;)PSMZQ>DV?X@]+J5=)KM!^O^2Z#I_7K>
+M]IAU&H#.<%?*U6G5J7]2F7O8YIG!73^#_$'4>D5!3J/+V#:5G]W&W34E?1_\
+M4',`)RHZE8/V,KB/"OBVVZBQM-]0!T97327MUT7RU=$V.]>=!@A8%)Y_CG$@
+M22KO4KE[00X$++L:[7WD#E6])]-X@;-$X^B\U\5TCYSH:!!X7J75!KHG'T7G
+MWBVVRXYP5J.=['^'%V^7473@?W78R8_U7G/@ZLZWZL!,:L'*]!+R:8(^\[K'
+M^-"J.`;D*E<D:L%25GD#=5JIY*NA'6+B,C?@*![1&0IBX.RW<;!!IDYWY01!
+MQ@B,)XU-@%3>3Z9E`69G909O5:6J@[.%1Z82&.89QMA:O48-$\@<+&L"16>$
+MO42?5DAAV'R(2:P`AP">F`XR1A3M8W3@04%&YSB)16M,@SIW4KZ<UM)D?"FI
+M4BR6G'92D6*#1Y39(E%#>X2;HC;]4O3V_59TZ.:94'4>JN8XC0P_=#U6A2I5
+M2`0.T*#I3?(NJM7,%1]7>XN:^<NS,KMJ<//]9G4*9`QD%8'5Z(#20=MPNGNO
+M5;SB=Y6!=L<*CIR2=DJN:NJC)]6Q.RV/#]0TZ,D@SD_=9'6&:+B>"5?Z0X:0
+MP5/:>ZU.F:ZBP?',+H>DW$4XQ\KDK*J`X;SW*W>G58@DXC9(O;KK!P(&=QDJ
+M6O4#M-!I!)W6=T^J74QZN%/T]X?=NJ$&!LI81OV+6M8!V5ZG^2(*SK)PF!`5
+MZF^!NHTM429W*EIB8[*O3<)B=U9;@"%%3,_+`W4C6X'WE14\22I9$1.%%/F,
+M#/RBI@_U94-2LVGDN`4)OJ0$`?571M8KVQ)U,*@KUBRF14G'*=G46:=L+/ZK
+M<NN&:*;9E/4VPK:JYO5ZK@#"T#7?7N!3&RDL.FM:34K'?DJ*Y=3;<AEL-3AV
+M4EX9URW["A3I4\Y="N4[2I49KJ?EWA#X=LGZ&UJ_(E;59H%.`V`LWGIN37:C
+MTUA!(C'"NENH22`%%0`8X@_='4JRW2"#*QC-W:3MG=5Z>+UODM@CNL=UG<])
+MKB"[RUV/3Z$`N</S)NI6=.YH%K@#'W4LU?:.LFYJJ/3;ME2B"")[*2X(JPT;
+M$K%(JV%=S7M.DGW6CTVX:^H"3LNDLRG#.M7E?I46,IP<J&XI`;`*SJ!`A/ID
+M=Y4TTRZ](&<9[JM5ID&2`MA]$OVG*J5J,&#/LH,]S/0!&#RJ?4NDT+AGJ:(*
+MU:U.)$%`YL".`LW&7M97%]8\*T:C"YC1/LN.ZQT6O:53#,-)7L7EEPP)"S.K
+M]+94!=IB=UROCUTW,M]O)J3:E%^DL,!;_1ZC'LBH`#O*Z#_@%.LXZFJG>>'Z
+MM&KJI20F[]2R?%&_Z?0N*9.D+E^K=!8ZF][6R`<GLNW?9W%)H#ME5O*#VV[Z
+M5,"'X=A8N,R[:F6GDO4^E>K2UNTJK=='<:<AI!7=WO2*QJ'33+IWPH+NV<RE
+MIJ4B#W(7&>&?EV_=KA[*W=1J@D!L8GNM6ZZEHH"'Y'=:0L*=1I&`%G]5Z:#3
+M);&3O"YY>*QN>297E?Z)>NI40YQ;!&X4M[=MK/:01)]]ED68<RB*;C):,[J&
+MO5J4ZX:""TXP5PO'#K&C4J^:[3J,3O*N6E44-.?JL>G5`:'2`!O/*EI5W5'[
+MRUJQMN.CI7CG$MG"G_B(GU3.ZR*%9E%AAPF%4N;\@N>"M^Q&ZRZ:VO@SW17E
+M?73UMW/'9<C_`![G7,AYS[K09?.--H:<_NI<MQ=:37-4AQ<#OPJ]*N[SR2X^
+MR@N*SG"2`0/=5*M<"H2TG*YMR.@L+L.J-:YVVZ;KU;R6BHT$25SM*^%*LQY=
+M$')!70731=V!<001LDE6\=L*XJ><]KFY]N5IV5`LM]>K$8PL[I]J\7D%OY<#
+M*ZNTL:E2ES'*LPW>&<LI(+PV'4ZP=.^R]6\%61NV!SMB/\UR/AGPW5K!L-7I
+M_@WIE>SI!KFQ`V^Z]7B\4MU7G\GDNN&_TKIE*E3:"`5JQ1H4Y;I4%K3?H#LA
+M!>M<&Y)7OP\>./3S7*U6N[MU1Y:W;N%4KU''!XW*FH#+DSK6K5K:H,+>^&5<
+M9,P$3`XG`6C0Z<XMET_57:'3F-W&>RD&71I.DR,*W3MW2M-EDT$G=2MMVZ<?
+M9:D%!E)P;G*)C#VA:'DC3(2%$1(51FW>IE/98=[<>6"3]ET'5"&4\[E<CXAJ
+M[M89DK7QBN7\47=2YK.IC8'[)>'NGVE>V=J:-495^WZ9K::CQ^9+H-D:5Y4`
+M/I/"X>3^4W6<IIR'5/`M.OU5]>B(U'98G7/#%U9G#-0!WA>ULLAIU-/Z*M=]
+M/;5:6/:#VE9GBUS&Y>-/":1K6=>6RQS5VW@OQFZ@YEO>.G&Y4GC7PN&36H,@
+M@SA<!U!IH52UP+7-,;K>&5Q,IM[O5JVO5;'72(DB5R5RVM9=3)$Q*X_PCXMK
+M=,K>35J33(@2=EWEA=VW5XJ4RUQB=_\`?9=]RS;EK5%_Q!M1FEXAWV7.^)F-
+MJ,>=,@G=;/7K(T3YC20?98EW7<:#V.`U'&1LND<LHY*UJ?P_4@X8@XRN_MZQ
+MJV;'-=DCNO.NI_R[N1O*ZGP_=N=9MU'("EG*R\-USCR?LH*CAM.$#'^8-SE(
+MR'&(4:`0!ZN5+3F-DWECVD^ZD9@94#U!#1F57KN]/8\*U5;Z0[,JA7=G?<]U
+M8BM=D&GI)_18ML?+O7C43/9;%T<.))E8E0D7Q[)>D:=(2V=X[*3;`5>W=``"
+MLTFF>9]U%-1:#5]0(A3/`!E$QL"2<]D-P0,_HHJ6F\!@&4_F#W4+3Z1ZH]D\
+M_P#6HUIS=9WH;3(`,969U!AT$QE2U;DFLZH1`.TJM<UBYLR"5VTX(:A(H_F^
+MBS;RF7DN=PKM=SM!XGA4ZHFE,PI5<MUUI;7#G3I!P0=DW2ZCVB7MD'^J5<ZQ
+M2Q,3RJ5H#5I.#I`&V=EJ=,ULT*Q#P2[!'!716%4:6DE<9:5=/I+7XY*Z+IUP
+M7TFB=MH*I+RZNA<%E(0Z0!PM?I`TVV3NN5H5XIM'O]UTE@_^0WX4L5NV3\9S
+M]5I6[NZP[6J`X0?JM2SJ:FR)[Y4I&A2_.3E66.TA5:3I8`%-3)U1*C46J9Q(
+M0WEVRA1DD!)BYS\0J%[5LV_P9(/LL7*8\UJ3?#8I5*%4:GU9!15KNPH`RYI7
+MF-!_B*D-&A_;A07=MX@N`Z7.SVA7W\?Y/V\^GH%]XAZ52!UO:`-LE8UYXZZ;
+M2D4(<?:?\ES'2/P\ZO?U/.O*[P#F%UG1/PVM*+PZOZOF?\UC]Z7^N+7[6O[5
+MF#Q/?]1J1286TW<E=KX*M*9#:CQJ<X<I7G0+2TZ=_)IAL)>&:S:;M$P1A:QM
+MR_LSE).G;68``;$1PIZT"F52LGZF`RI[JJ'-#1E,NEVJ5ZFFF23NI.E4C4=J
+M>=ME'6HZR)..RO\`3@&P,=LK&*XS2]28(P43FM.WZI,&(!!^JD:.\?=:;C(Z
+MYTYMQ2/^+VP%SEN]UG<EE21P%V]0!P(,$+"\1=+;4I&HQN1V7/\`K=Q;-\4U
+MI=,<T>K=7*+VD#..,KF;-[J=4TW...Y6Q;O)8,KKVQTTP6G8P.RCJL;"@IBI
+M.ZE.N((6:T@K4L3&ZJNIGX6B[20,;J)P;R/NH*@!&!A#6IMJ@#WW5I],3,?9
+M`8;N84[X7I49;,INGGNF%!M5T$81N>:C](`5R@QK&#W4OX(R.H=/%1D:<+'J
+M]/'FZ=/LNV\K53P%5J6+7/U1NL7%K;F[;HM$PXLRL[Q'X=HUJ9T4Q)W@+O:-
+MG@`C"CO;!I&V%+A%V\AN/"M1C"6@_*Y?K?3*M'4T3\+W>ZLV"@06CZKS/QI0
+M\JY=%,@$]EBX-3)Y6\/9=%A#AGE-6B"8,CLNDONF-J.+].%B7ED6/+73'[KQ
+MY^/5>G'/;+\XNJN9I<X*Y2,-D8CA3-M&ADEH'>!NJX8]I=`7++#3I,]E5N7;
+M!Q'<JA?W%1KBQI)*G;3>*IEI=K*LML*;FESV$D]UC4CK+(R+8/#C4)]+LD+6
+MIUM&F3Z>Z"[I4J,`"&G@*(.<ZEIF,)9M;EM9K7-)M$^H@E9#*IJ7!!=`'8*V
+M+2I48&.;^;F5:L.F-#=9:1ODJS$]Y(:QM&U"Q]29WA=7TI](46L.\05D6-J'
+M.#6%=7X:Z,0W6[)/9;PP<<\_R'IO2:=2Y#V,D'*[#H_098':-ALM7PKT9C0/
+M0<CE=OT7I3&LDMX7J\?B<,\]L;PG;-HU-#F1A=I9TF!H(`677L/+K:J8`6G8
+MM+:8D_*]6.,G#BM&H6F&C`5;J#I&1'PIG.;JPJ?4GM#9#I]ETTSM6K5*=&GY
+MCR%-T[K=C&EU1I(]PN+\:]5N:5`TZ3'?(E><OZIU6E<N+*M2"=I*7+#'BIK*
+M]/HAO6K,`$5&?=/_`,=LA_\`I&_=?/K.M]>B-50_=%5ZGXAB07Q]4_<\9Z9O
+M?CXBL6X\YN?^I1N\46`.:K?NOGQW4NM:CYCJP^Z.C==1?E]6H([DJ_NX)<,W
+MT+1\1V53`K-^ZF/6+73+7A?/G3KCJ8KRVN\`^ZWJ?5+UC`U]5T_*OOA4UE'I
+M?6^L4G-TM=)'995"B;EQ>X$MW7/^'?/O*\U2=*ZI[A0H!C#^JS<O>\=+)Z]J
+MM^\,864QD*'HC-%4ZOS%6J-L:KBYQGE2T:(:\F!]%G/IG2_;N](DRCTMDF<%
+M0T8$P1*DDQD[+>/,%>_MJ55A8YLA>??B#X,IW=-U6U;I?/'T7HU0@C;*JW+`
+MX$`*Y8S)9=/FCK?3[VQK&C589:2%K?A_XDK=*Z@UM;46$1GC_<KU#QKX8H]0
+MIN>U@U[X7E?6NBU>GW+@]A`G=<;[8UOC)[(:E#JW3&U*3VY$X*Y#Q#:/HM=$
+MS.ZS_P`.^O/L[@6E<S3(ALE=EXIM&W-AYU$#(7IPRV\^>.GDW52YU7,`@[K9
+M\*LJ7%N=#H@+.ZY1ASLPX'NM/\.G#SC3C!5RK.+7:+BD0"?96*3*[@,`+5K6
+M8.0`HV6[V]L;++2@:-P)!<$#FW#,3*U7"&B?U4%9NF85&;6J7.VP"S[JM7!]
+M;/LM>Y,.R`53N2UXG2$1E?QF/5QW6=4J-=?AS7<E;%U18_\`ISW6'<6T7GI/
+MT5O236VO;N&K>)Y5VAIF)^BPPRNS.DJS:7548<W'S*RK<C21G"@N'`.V*K.O
+MV@:7#]$GW%)P!F.R"VP`M">&J%CVZ!Z@G\QO<*-.$NZL^GA.`/+!=E1U634P
+M/=2L:U]/2.%V<5:H095:J=0CG967`ZCC95ZS03'ZJ:5E]8I`T-``E9UFP`.:
+M0/HM/JC9JM9V"IT*(:\P))25FHJC21#A\:5=L:CJ+@W8#@R%7SKCCOPK)IEU
+M-N-7N$&O85IK-DF"NJL:HAN9PN#L*FF[%,SA=/T^O#1"U.5=/:UB7!H^RV;*
+MI#<?J5RO3J\O,N)6]TVKKC&R6(W*-0``!6K=S7.D+-H.DB/W6@R&@`?HLUJ5
+M<:X<HJC6ED$`J"G!(_NBN*PIT_[J:VNT%X;=@@,"CL;1E:KK<T`)4*+KE^M^
+M!P%IV[(`;VV"QJ7IKI:M&-:T-T@*WH]/^JKVXSMLK;!_W6A4ZC0\RU(7+V+1
+M;]1<TCE=F]DM(7(=<I>1U`5`8DY69=9+>G4VEPQM)L<C96[`&JXE<_T>J;D1
+M&RZ;I5(LI9Y4SO.G.<I:K`&>Z&V)#O4%/5&H?Z*!PAPSE633JT:)$-RI9RJU
+MLZ6@&`58:"8[(T51H&905F![()!"F+0/<CN5&1@D`945S'B#IQIN-9@(^%5Z
+M==%I`<2/8KJKJF*C-+A([+E.OV+[>IYM,&%B7UO^+9MM6M5KP,R2.%;`$9Y7
+M,](O@3I(R-UMT*NH`@[KK6)5M]-I]E&ZU!R$;*DP.49]+20<]EC4K6V=>L-,
+M8*I-IU:C@'#'>5HO'FU2(Y[JRVB`T#3"S_D5FV])E-V<E66,&L$%2U*()QNA
+M-(@X36A("`I:36P2>55<2",8[J1E8!%70UH;`E#4:"S*A%6=M_E.'M(R<H*M
+MS;![B-*Y?Q?T*G7H.<&Y/^^RZVK4`<51ZE4%1FF-UC+':[>54>A52]S(Q*Y[
+MQ7X?NJ)+@TP3_OA>P4NFN;5-7RR0[L%'U3I-.[9#J6X[+A<-NLRT\";1J4_3
+M4$_*MV?3&5R-`A>B^(_"5%E$O:T`_94/#/0CYI#FX"Q<-\6+[:YC`M_"DT-?
+MUCLLWJ/3S0FF*9G9>K'IS@T4VTXGE"/#--_JJ,U'E+XI.B>2WMXG<]'N*KQ_
+M*<0I+3H=Q(:6GY*]J'A^V;Z13_15+SPZ)!8T1\+$\<VW^Y7F+NAOIM#N5/;]
+M-<ZG!/U7?O\`#-6J(`PK%OX4,1IRM?MQ/>N#Z'T>+F2["[CI%G2I:-3H5YGA
+M&L!+"1[PM&T\)W3J0ESI[PM8R8LY6UK]!JVK&CU`'NNCHWM!K``]H7`7W0NI
+M6DF@]Q473K;KSW'4XPO1/)XYVY^N5=U>=2MV/!+Q]%/2ZM;>0#J'W7#5>C]6
+MKN#B]TCLIZ'0^JD:75'1]4_=PV>F3H[_`*]0H_\`Z1L?*CL+\WSBX&0L^S\+
+MU:@FKJ=\K>Z7T06S!N,*_N;XD/37U%>V%K<VY#J8<3W"P3X-MZU<O\IH;VC_
+M`$7;T;-K0"3)/NK#:=-K8`!4R\<R673E+3PA9,:)I-D>P_R5O_RY9-;'D-(^
+M`N@JQ*@KN<!NK/#BERKGJWAJQ+3_`"69]@LOJ'A>U+8ITQ]%U^E]3$84M*U!
+M;D9*7Q8_#VKSEWA]U(D"F`HO_+UQ5J`Y#5Z3<65-PF(*SKLMH'3`,]E/V[\I
+M[,KI=HVQH``>H"%;HT'U'R9,J6A2=6=J<,%:-O1#0!"WC-349O/**WHPS+8^
+MJC<P"K!G*O\`EC3@*C=RVMR,K>N&:8M+78S*1,$J:MFB#'U55\SE2<5DG.TG
+MY4535F"C)$@'"9\&8*TJK5;JF2N;\3]"HW])PT#5W74%A)V0OI:FQI4N,IMX
+M7UGI]QTN])@B#Z2N\\!=7;U'I9MJSO6T`>I:7CGH-.\LR]K1K&<+S[P]<U^D
+M]:\IQ+6DP=USG\:MGM%OQYTS^%K/>UITN."%E>`JOE=4+"XYXE>@>)[6GU/H
+M@JL&0)QRO-^AAUKXA@-YA>B_U<9V]4I`.IC!P.2HW,R5-8Q4MV$DB0AK@#(4
+MBJ58.S.P4%9TM^5;J@0>52KG!C"(I7,D20J+R-6ZO5RTX"I730(`PJB"X.#(
+MGLLDLF[U`+3N7.GV673,7I(VY4O5)VO,$S_DIZ+!AT#"CI`;S$\J>FT3@J*"
+MM1IO&VRK5;5IR'*XX$-R@=!,CA-$0LM:VD14PB_A:_\`\BMTP-`S">!_B4:<
+M"XESH."$=$D3!D!0L)#<R/D*Q;Z@V8&Z[:<:BKR'%5JC0'YY[*U=CU856X(`
+M)D2%"LZX:7W3G#@PH:K);`P?E:'E11G:52JL(>2,SA155K)'<'LK-`Z</&^P
+MF%"YI#L_]U/0=K<,25>TZ)S1_$-)D&-PM.QK.:((.>5E7NJE4:YAF3$'A7K"
+MIKPX3"16]87!'($KH^DUM%,$'=<10JNI51.&KH^B7(>T'5*TS766+Y=RM:W<
+MV,RL#IM4$3NM:V>20I2-$U64J9<H+1C[NOJ(A@]U6K$UZXHM)CF%L6K12IM:
+MP<+%_#<_*9C`Q@#>$QD&0-^Q4K#QV35#`C)*:5-:N.L$G`V5ZFXG/<K.MW28
+M5Z@9$;*BP(+8`*YSQC:N>&^4W<KI*8_EX,*I>L#ZC01)W6,HTH^&+-U"V;K!
+MD[KI:+=#`J=NP`-``$*9]R&D-E8QYK&.EID'!450#5A/1JM)B4540<+I72#M
+MR!LK=%V),+/8=.T^ZN4G`MXPBQ+(WWE(Q_LI-!/;'9"T0XP5&C.`TD2J74*-
+M.I1+7<A6W&-S/LJEZ?4`.<%2P<?=6=:SNW56DZ25H],NPX`ZMEN7=FRM;:2!
+MLN5ZA:U;*O+0=)*SC=<4RF^736U8.&_"EKU(9A8/3+T.:!^ZTC6;4<!.5NLR
+MM"RICR]4F5.6>KTRH;?_`)<B!^BL4L-EWW4D:1NIR,F$!IP`K`;.=D[62X!2
+MJINIRA%"1*OE@R(`^JC-/U0.5!4%(@9PC\H1,[JP:8&#$%-H[#"FE5:E&1*J
+MBW\RN`6\[+4-,QV3]/M0ZKJ*6$2T+.F*0&D;<!17'3F/`AH^RT]/&F?92AK6
+MMG$=E-1IR'7.B.?2.`0LSIO1/)=ZFC[+MNH5&Z(T_14&^HQH4])O9MF?P#`V
+M7`>REHVC'0(5ZI:U'$P"FM[=]-TP5C*S>ED9]QTX%X@<\*:GT<.8"6+:L;37
+M4!<%K4K6F&Z>RSCA]:<H.D`-!TA2T.E0Z2V%TE:V;B!E)M(-`.5UF++,H],:
+M6B1GW1/HMH-($>ZO5:S&LW.%F79J57P-N%9C(EY0/8VK4RR<JU2M*#698)04
+M:19$@R=U,`Z<@Y34MY7F#9:TA_0$YHTFMPW*"7!V)3OU&-)*:B<B&D-``@IG
+M/(=AOV2;3/\`4EY3@XPKP:)SC&WW3EV,G]5(*9:R0/HJ=:I_,CCLLY9Z60US
+M<EHP%';.-P^`FKEDP>>ZFZ-0&LOXE<YEEMK46J%#2,C*D<`T2?U15:M.F#D+
+M.O;IS_2QR[R,6FZA=ALAOZ+.%)U6KJ>,%7*-N7G4XRK+*``@<)645O1TMPV%
+M*&CD*4@S`,)0"?=601D'Y_LJ74Z0@&/HKYDG!5?J(]`D[*I4=`:K<3!`4;J0
+MG"L=/&JC.T(W"#')6/\`4RXK.J4(<9"C-/@K1J"./E15&3D05L4_+$8RDQD-
+MSCY5O2(E1$;@B$%2XHM<TM(!E>7_`(E]'_AKD75`$23,!>JOP")E8?B^PIWE
+MBX.:"8*93<3>G,>![L7O2G4'.ES1&3[+D.J6O\)XK((_,XG]5T/@B@^TZI5I
+M%IB?@)O&]H1U>C7:`?5O]5,,MXV,Y363H>GD?P=.,X&R>XVSA*P'_HVF!D!#
+M=P`,K>*5!5V/"HW!,D#]%/6J0)!E4Z[B3+9515JCU<?=4[C\V3"N5R)!.%2J
+MD$Y^Z(JU3Z\SLJ=O+KEQ@QRKEUAITR<*IT\S6=D_52]$7&P'1'V*D9J<[T[H
+M-!C8%'0@;-GX0&[\OJ.R:F&X.K9.(G,DHBT$=CPHL.`XB92AW=&S3I$RG]/<
+MJ;C3S.W=+)[JY;5!@'8\+-MWEM*-6KO"N6;IS/W7=P6KR"1IR%0O&X#!_4<J
+MY6>($[*O0;YUPZI,M;@+-6'>P>3@Y5.L``2<=CW5\!KG$=N5!>4Y9EON$JL:
+MH)J`D$CLI:!)<``(]U)=42*0=F?904FD.F00#L"D2Q)>M:6M#@"?CE'8.#'X
+M&?V454&I4B<`<Y*>FZ'"00-B4B5IL+:A!&/E7>GW+J#X;^4\K,L7S5+85YD:
+MM)C/Z*SAJNQZ+=M?3$>PRMNG<::)*XGICWTP"PB)6W:7IJU&42XQO"U6>G4=
+M%8\36=C4M:VENY]UFV-1OE-`.!'[+1HN$3,+&FEEASE&X225%1@Y)4\0T&8!
+M4L:!)!`"M6U0$Q]%3<,GD_*DMW:'=Y1&K2)B8A-#7OGLH#6TT9$!3V)+J>HQ
+ME8S+4VK13+BJCGMJF0=BH?$UT;:UP=U1Z1<A[0=6_NIA.$C7H574G2<A:%"L
+M*C1,3^BHT--294C&.9EI6W2+FKT[;?<J>BX0J=%X=$JS2QSNHTM!P`ALGW2/
+M>4+-.F!^J*0!D*:4%:&LU$!5*`-6L29@84EZ_P!):'&45C3AD]TJIF@2#V5#
+MK-DVYI$`96BXP0(3.`TZ5,IM8X*X8^SN""#$JW:70\T21D2MOKG3V7#"=.RY
+M.X94M;C27>F=UG&WJLY3['96E753W5JG4).-AV6!TBZ#FB7+9MWR)E;TDJVP
+MR(/=3,@`S/95J!>7^IP(XQLK$<\J-G:)R#(1`<D)J8/;*D;DPI1$^F79!`4C
+M:+0WW`4K&M&#NC;N,84TJK7;I:K-C3#:<[2HZK2]P&%:8T,I:8'T2K#B!RHJ
+MSC'8J0R_`4EO1#R9E.A3;9NJD$@Y5@6+&Y(`^5ITJ(IT\H;EHTDA36U4J=$:
+MM$*9UI2+?RH*!FI,X"LZ].Y4UNJK-I%CI`,*1E<@P>RL`->T84;J(>9[%76A
+M(QP>-]E7ZA#:>#**K2=3RT_=4:M74_0\\[J\!J-)U0YF%890:!NI:+0U@&_P
+MIV!H"FOR*OD-[;G=%Y`U1"LD-F>4_I@<IHVJFW`3MH-Q"LB"-N$FAF"#":$+
+M:`)V^4A;@[[#LK!+0))CZJ)U:FW=X31LWE\8"JW%BTNU$HZ]]39L9CW69?\`
+M5M.&3E+A+V>^AW]M2;#IV04:[:=.&!0-K/N0"\DCWX4U*FP-RDQDZ2VWL%4U
+M:SX)PCIV^@[`^ZL,\L#>041@[%:TR&FP!IGA.-_A.X`#TF4$#5NJ'?G(*$3`
+M)^$SS,]PA>2UL]T!8&(S\JMU""S&2IM7V4-_`IRWZJQFGZ8TZ3&RDK$:@=H4
+M/2\-,E2UXF9P5SLX3()<")(]D#R`(*7[#*$YAP*W.E"8TX0.&9`GY4D3_4AB
+M'^RHKUJ<CTR%4N:.JD0[E:#Q.1N%6O\`_EX5B5Q=>V%IU8O:/S'^Z#Q/0\SR
+MGZ3W*UNI4`ZX#SIE4>OF&,`B9W4DUMF\E;PR@P#``4%TZ2<?JB#M5,`G<<*K
+M=/B8(GE:G#*M4)DP<*"H9&)SPI'.!F#\@J"J=.SAW1%>OEWM[JM4#OS<=E8N
+M#J]H*A<($`_=!3KM9I)DY53IP'GO),$<*Y<?D=..,*ITP.\UT']4O1%YF<1^
+MJD83$1`'NG#1,D'W'=.3+<84#.(<!!RG`[DIZ1:1/^J:L"#G"BI&_EW/V2^O
+MZ*)E1FD22$7FL[E--;>/4*CJ;]1)<.%KVM21,P>RR[?3IT.SV4],NHF=Y^Z[
+M;_+RK=P]U)AP>PRKG3F>7:^K!(G*RJU7^)N:=,8:W)6L'?R2W[*::@0"PD\(
+M+C\H$3/Z*5Y/E1$DJ/3.\[(TJ5VX`@[S*I!A95(G[K3J`D9:%0>#Y\:02HE5
+MVG_U;A)!`P%-J(.9]E#/_JR,R,;84]P"TSIGXE$Y%0<:;I#MSW6@Q[?S+*HE
+MSJ@!&^P"M^8-@[E58W.GUG>6<K2Z('U+AU:?RX7.V58Y$D!;OABJ,@DS*UV5
+MU=A<NI.&HF%MV=TVHT9SNL&U#:@$1*O4&.9!;Q[K(Z*W,MW5RG.W985G=EK@
+MT\[Y6Q:56N`,R%*U*DJ@`2H9<TR)^JM/TO@JL]L'(E94=2Y'I870MBP_Y+3.
+M!"YZDTOO6[P%T5`%M&0N67-9O;'\8--2E(_I_P!5B=&K%A,SV71==;JH'4N6
+M:UU*K.5O#BMV<.MZ96U$0>%J4CJ;PN;Z/<9`G*W;>HV`9)6S%8JLV<U'1JC`
+M(3M=Z1"&I3CU`+/3HM4W9PI'/&GC"J4:P@ZC":K6!PWE4V6H5KF-X*O4QB`J
+MW3Z`8TEW*M`9V69^6C%V0$;8(D'Z)B&XG=$&C<X0156M(((GA<YXEZ=K];1L
+MNG.^57O*8>V"-\+-QVNW#V-1U"KI=N/==!TZZ!8)/LJ/6[!K'ZX&%5L;G2^.
+MWNM2[<[-.JMZDG#L*SK$]UCV=QJY6C1>#C=-+*OL)+)E24CE5Z1ALD>TJ>B9
+M(SMP%&ED$$`;]T1_+,[**8*)YTL10T0'5YD8'=6JL0%7LBV22`K+&!SO]5EH
+M]"G!E7K6F&[0@HTP8PK--H:`"Y%AW`!D2H;HPS^RF>0!G?Y5.\)TQ/NJE0V@
+M'F&45P8YP5%9_F),[JQ<4R1A94%"M!A7:3FGZY654)IU([*S0J>D=RM)%NZT
+MZ3`&VZQ<&N8V6A7J$TX<#"S[9NJL7`*6+M:+](QPA_B-)DIBSDG'9`:8]\\J
+M@_XKD9A+^+&5`:?J@=^`F92`=D%-HE_BS)]TOXP\%0BG\I"D,%-B2I7J$1)4
+M%057XU8*L-:`$X89SB%-BF+5Q,.<?NJUW:`$20M8#95.H0"`2%=<`+:V:*(+
+M2?NC%)VTQ[RI:0!I8.GX3GL2DG`K.;4:3#DPJ/8W.1"M$#<J-S`>$1"VYP9'
+M$)V5Z9`(*9]$'X41M@#@P$1/K;O,<?*(D1CXW5*I2>T^DJ-[JH]U=C0])&-P
+MJ]_4;Y<$A5Q=N!R%6NZFL:M7W59J[TUQ<V.#LK-5I$$\JMTA[?*)F5,^H"Z)
+MPN<EJ7@)'I$3*0$"/JDXM/*0$N@25U:(0/E(029"<3&R=\#VQLH`>`#E4[PC
+M3."%8JN),-5&[<6X,JLUD=3J,;5!,?*Q.MW-.I48UI$K9ZM0UTBXN`PN.>QP
+MORTN)SS\J\:VQ]:A<!3EHX5.L_48$X/*G+O1`.0JCYUD"2K.D`[O,J"IVB.5
+M*^1&-U`_5L4$3AJV*C<V1!^BFB#(0P8@")4-J-TUVDDJOT9I-1T?NK=P?26@
+M1'NJG1!ING@_U83+HC1+0'$@9(SPA:UWY01'<<*<M'"B+PPGE`5*F!'8*.KD
+MD/E2,=$$2HG3K+CO\J0(-;`]2?2S_$G#C'"6H^R-</%;%\.&J"9V6HUPTR1(
+M&<&%B4*K34])(]IV6D:W\EK&B2XP(7:O*.U#]3ZS01G"T[.X!;H><^Z"@P,I
+M!@R.4C0TN)&^ZSTWI>)!@`(7,(4/3K@ZB'JW4#33F55BM6U:2T`'4%GO]%:)
+M(/Z+3=3BFXSNLRZ#6.)=R,+/TO2L[2ZL7N`[*\UC74X':!E5K>D#1U%NYY4U
+M":9`F0>2D$%9HHUO?=*K^77,%3WC&N]>F>ZJD#3I,P$5;L7M-,ZCQN%L]`J^
+M6S5.YY7-V=3^2X@''"U.EUY8`>/=;B1WG2K@$`D_9;UE5#V@E<3T:YD!DKI+
+M&X``$E+$Z;HIAX)8`3Q+E:M0^F1G!5+I]68]2U*+@6C"SIK:W;W`C2XY/NGJ
+MP&EP)4'D2-0W[H;ASVLT[GY6+56>F4O,?J$[K9HP*<3LJ'1O10]6>5/5KR=`
+MY7/&;J3M!U-IKO#&G"Q.K4-!CLNGMK>*9>[<[++ZQ;R#CZJUUTQNG5?+JPZ5
+MT=A5+V@`Q]5R[V^74Y"U>E7&(E=)S&.JZBW,B)'RIW?EG*S[-X+9F58K50QD
+M24TW*@OJ@;L<GCNFL&U''4Z8G9-1H&N\.=QW6A3IM:W"QW5UI.RHV!*G:X$S
+MC"IFG)D'V1`/:%6EL&3@I`D_TJNVH08E2,K-,@N@*:5*,"80U!(E(/9,RC.6
+MX<IH9?4:(>PXRN5ZA3\FXD8GW7:5@'",K`Z[:C27#CE2\%Y4^FW):()6S:5@
+M1)*Y6D]S'D=BM;I]>0`=EISZ=-;U1Y6\PK5JZ3LLFRJ2)F%HT*D[%--RKP=*
+M&L\!D3/U0-*&X+@WY45-8"3NM.U8/^ZSNEL<6:EJVH)B2/A9;6:;0.,A%(.$
+M&2-PD>$43^TRJMZ`*9(W5C;)A5;QTMP/F54J.Q:1)5MP!'!56RGZ*RXB5%5+
+MFE+I4+':7Z<J[6$@E4JC9=LB):S@:<3A06Y(>0"5)`TX(4-%T5HW,H+1[$2%
+M%IWR84CL9P4SLA`,`@;X]T@V$1_+,(3G?ZJFS?LD`",<).$#!320`-,('#<3
+MRD02(U$)]1_[II_W*!<PJ?41D9/RKA^BI]0R.?H4B4=MFF,(G1)R906CAY6D
+M.E&Z`Y(4Q)C!E-.=]TQP<[)$PJ$X1S^JC<Z793DF$$YRB$3G&2@JP3F/E$XB
+M20<J(DF<JA&FPB("I]0H-T^DB2KK=P)D>RK=1ANG/U1**RHFG0])*"X:\OU!
+M6*+HM1/*$9V"QC$O:G-5IR20=E+2KN&3LI7@")3M:TB0/NNF@S;@!LN3>=JF
+M(2JT6N,!/2HM`01OJ!K3/[JE5.H%Q..ZM7H#1M"P.M]290IEK'"0K)MFW2KX
+MEZ@RA;%K2"3[KF>G!U6H:A$F9RH^KW%:M5-1P,#Y1V5RT,R(E7.SB1B;[JV_
+M>0%`]I.VZD=7IEH@P9V4?FLF0X#W01OU<M]E&]LC;93RUSB%$\>J`0@A=CZJ
+M-X`._P!U-4B%"1G,HBM<!L8,E5>D0+I\DY/=6KD0<D#'94NED,OS/)^ZF72X
+M]M>L,X4)@G(W5BL0!$[Y5=\[?W1",QJ#20.?91U#J=+?DIR^&1_=1%X@D['&
+MZ*E#V`;):V=D#64M(EZ6BE_C4TKP6RJ.=4`)F.ZU^D5/-O9T@Z%SMN[RP3R-
+MY6OX5KZ*+]0`<YR]&GFRFG3T@-4G)]BIM&KLJ=M5)`/!PKE/5/=JPW+#OHX]
+M,`^R!M6HUVEPPIJ4M.43J9>W.Y4_XI$BJP1/NL[J@T-/I$*U4:^D^!.RI]4J
+M"H!3$R=PE4]L!_#"#S*CR:F&F%.&^4P-X]E6I:C7<9(XD8E/J?%QH#J<1,*G
+M<MBK$1*NT7'`.GZ*.[I"-8`^B56>WT%X!C'!16-=S>25#<G0YSCL@MW%M/;=
+M6,V.IZ+<D$23A=/8W&IH/*X7IMQI#9'RNBZ==MU-,_"T.WZ94=`),!;E"H"T
+M&5R72KEKFC,_5=%8U`6`YCY4L)6U;/DY".YA[QA5;1QU29A6:)UU`)GY7+.<
+M-;7A4;2MY<(1=+:*S]9.)5+J1)#6"<J_T2`P-DPL83:XS35T@-C@+.ZG3U`X
+M6HT`MB56Z@P%NTK5CK'(]0H^H]@JMI5\NL!)W6MU.D=1QA9%>F6U)3'AG*.D
+MZ;=`L!R/E60\UZX:#(Y7-VUWHI[Y6_T&IJ9YA,F5K),:VK9C6TX&X4A@;**@
+MZ1DB%)CV'PLNAJ3C)P5-3,NS*!C94C(X&%%%H8[?"B=0G,*8D:1.Z)H&TQ*:
+M7:J*;QWA-JJ,<1RK;?S1PG<QA&=PIH4W5C'K"H]3+'4CW*U*M%GL5G=4HC1$
+MH5S%W2TN+FF`FMZL8E7[RV=Y9F)6/6.A\'ORF-8KHNGW'I&5L658%H]4+D[&
+MKH`DX6[85P<`[JTE;U%TYD(;EY`B5#;O$?W37+QJ:)Y4^--KI##HR=^Q6G3`
+M')5'I&D41C)5X`D<J-Q)_3";.F9"'5"<ND(I.(D2Y5+XB-U8)Y@*C>D:A@JI
+M4]CLK#`W5E5[/##*DU2[!A9X5)5$[*K69ZIX4SW$Y`RA<)YA+5T@J,=C2J-=
+MYI5I<M72"V8(*R>M4\2-PB5<H50]LSA&X[$+(LJ^1.X6BUX>T=U;$E2@F#E-
+MQD)-&.4Q'ND4YC>4+R3]$VXG8)I;R@/)$(9XA,#`W3:H!$H@I/('LJO4/R8,
+M'MW5C5[_`'5;J1:&AP.?96)36GY.WPI`9)4-HX&EN4^J#`<2D*)YEVZ1SNY,
+M82;AI&Z!W;;H,3_FDXD&>4+B1F50G$`PA<(.^2FY]3D-0R\"9A$.YPVC/RJ-
+M\[4\-/W5RI@;Y6?=NU5P-XY3XB]3;_(!S]TB0#A$`?X<0<J!KH!!68E[/5?&
+MQ4;J^@`RFKNG?A5:ID:9D+H-%M]0T22)5.[ZU;T\%P^BR[NB]WY7D*A<=-UY
+M=4/W3<GQ-6_4W6>O"H=%&2?99++>K<O-2N70KK+"E2=,!Q]U,6^F-*>UR_Q-
+M2,'J]*FQS6!H3LLZ;J8AH4_5VS6;D8*F9I%,-VE+VDZ9=Q9-.Q`52M9N:8:Y
+MRVJNDC;E0N;JR)51CNIUV<DJ!U2LTD03[K:J#!("KOIM<"8V09;[N!F1"8W3
+M8,'"MW%!E1TD"57?9-),&$Z0-6HQP`+N.ZS*3VLZFP^_=6[FSJ`#2Y8M_3K4
+MKYICG<)>J8]NJK$%N^%"20W.RH-K5O*!T\*$WE0$M+<!2:*O/=+M(43H&)@#
+MW55E^#,H:]XS8X[JBTTG3N$\GN/NJU.O3+`0=T_G4^ZC3YZ-8L!#P<X"W>AN
+M:VBWM/)7-5W/\QI+0X.,#NMZPK^50:<^K@B/U7HG+AG/PZ?I]1KR`=S^BU6'
+M`$GZ+!Z56@@XSB5LVQ+@-UFLXK31G)4OJT@`?51")D'Z*3U&F`0LNAVL:\$N
+M"RKFBX7\TY<UJUFN#:3B<X5>PHE]$U';.*E(I/K-=Z9D]U&_\Y!,8[J2[H$5
+M"]@)X@*J'Q(,[[#9)R7<7;9N"=D;Y<PP@M]1$X@<*RP?R)0C#OV`%X))4-`@
+MTSDB%H=0IP"3&!A9MJ^:1)`P4B5<MWF=1,1PM6TN-+!!E8]"HUP,">P*FM*L
+M-`)6H1W71+@%C3JRNGZ;7D`2=UP'1K@!@`<NKZ;<-('JQW*U4=C0K&-P(5_I
+M7J.KLN>HUVB@!,:N5T/1V_\`I@[NN&<^&]KE=@(/[(NG.#'@2F+01NHZ/HJ@
+MY2<.K?H'4T$.2O6C3)W473ZC74\%3U1(D\)6XPNJ4SJE8E^P]ETO4J3BQ8=[
+M1,%PS"R5B7#GC=Q71^':Y\@#5^JYWJ3"!($?*T.AU7LIB7+<Y8Z=E;U3H`@*
+MQ3?Q*R+*L74A!_57Z#I$R5+&Y5T.,D`HV.D>RAIOYVA22`#.RC21CI.1A&3]
+ME#(#2`G:??;A%2B)WD]T61B?LHVD;''PI0#&%E35`",F0LZ_C6&@Y6C4.EA)
+M,?"S6M-6ZB9'=+T`KT/Y.DB5S/6;?2^=.W9=A480-IGE8O6:1F8GW4TE<W0J
+M:7Z286[TNJ"X96'>TRRIQ)W*L=)N0QX!=.5J<L7AV=J[4P#9$2'7+6JIT^XI
+MEDEPD[*>B[5=MC:4:CJNG@>0(_16@Z/8?*K63HH`@B5.YT`3"SIT@Y!'"37"
+M(.Z`NGLG<X"(0.3E9U[.H9(SPKU4R"!B%FW%2:H$B42KML?Y??W4X@"5!0D,
+M$%3[A2-!)$@`;)';;=(X$PD".<JAGF/3$K-ZN06F>RTA#L0L[K#0)D<=TB5E
+MT029&ZLV]32?4HNG`Y!;';*>NW2[5)3%*T:;Q(`.Z-L]BL^UK1)<-E=H5`6^
+MGE4V+3B?T0.W_P`U(_NHW$``P44B0-DP,`2GYG2?E"3/QV*B"+LQCZ*MU*#3
+M[J5[VXB(4%[4!I20K"HK7\ASGV1"=?S[J*T=Z20$;3)F$A4T3W*8$SC]4['"
+M"!PFD?EC!50GNRHW'NB>8X4;CE`_]/NHR9=(Y12W3N<(,.$Q]4`UC)A4:\&X
+M:-2NDR8./94;@`W(R$O2?6I3]5'_`#59PTO+295B@[TCD?917C3(.RG255KG
+M.ZK//T4UP02JM4B,GZ+:!JNE0U?R[?52$MX*BJ?EW05G_G3.YX1N#2<2FTG3
+MC[(C$ZP'><V))]U.S\C0[]$'6F36:[B<J4-'EB"E[2=(JS0.,%0_E=$?JK-1
+MH.)^JKU&@'4(A5$-4G6.Q05(R/V4E9DG&%$6DSW')05:V'C,IO3!AN2BKM^Q
+M0-CR\?4HB"N1.DC[+'ZV--9KNQ6PYLS[;+*ZX/3.K961%NW>U]%IC"CN:3)P
+M(!3=+<'6HD9/NBJ%PQJ6<>BH/(I%OY<_94[NU8X%TP>5>&3O!5>Z$-R95TLJ
+MJRU>&@-=A/\`PU3NK--P#``#]T^O_I6--OFRL\%U,F"),9D+2MJWE46%L25D
+M6]1QN00=4;85ZFXEY$@C<$8XRO5'/*.IZ74U071@\%=%T^JT;F5R/2JCF@`.
+M#F]PNAZ;6AVDY@;I7GG%;K2"V8B=BI'.@1S\JO0<2R(V"L`$MC$!8KK*K=2>
+M!1#`8<]7+-I9;@"1`*HN:;B_V]-,85^K+*9C'UW655(EQU?94.I4"'!S)$[K
+M3:T:9,2H7L\QV<II5.QKC4&ND'NKQ+0V=7YN52J4OYA#9!.93N<^G3:UYD=E
+M>V9P+J30ZF0YQ(CE8K612).-6(6W6+:EE+I$X*K.MVFF(:#"EFE[9MNXZH8V
+M#/)4VKR\.,_W356.%:`2)454D3[;95EVS9IL=)NF@`.)$''NNIZ1=%S!GE<!
+M85'-J`N,2<KI>F78:WTSGB5M([SIU<5+RE3F<_"[OIL-MPWO[KS+P54-QU$'
+MM&?NO2*#]+!G"XY<Y).UZFZ'$<_*&I$DSLH&U1JW4Q=J:3W2QVE6^E5G!Y#X
+M@+8IN!:N>MW0_!P%J6U:&Y,(W!7K)D1A9%]2(:0MUYUTYD!9G4&3(V^%FM.8
+MZC3_`)>)^JALJA#8$"%I=3H^@[8652@2!NK&*W^F7&T\\%;%G5U-B8"Y2WJN
+MIQN?<K8Z9<2(U#/NJDX;['[05,P@O$N,K/IOQCE6J+YRI8Z1;VA.P'^K*C![
+MYA3!T#&5+%@Y(_+*-I.2H@1DDR4GU-(.>%-+LUV^!'*"S9$N)RH*8\^MC(5Y
+MF`!P%+VLZ"Z<D<+/OJ)()B3[K1=(!Q\*L]FMI/"5'*]6H@2<>ZRV-#:@>.%T
+MW6;?4TB..%SMRPM?&PY4C-;_`$DEU$96G8!PO!/"Y[H%<L<&D@Y6[0K`74RM
+M:25V5J0&C/ZJ9SAI$K)MKN&`<*2I>0T;J.D:0?'^92U0-RL]MWJ$DS\)VW8`
+M[&47:]4?Z2>2%EUG?SQ.<J5]T`WU$?(6;4NVFY'J/Q*7I/K?H.EC<1W"E8X$
+M0-EG6UTT4]U-_%-VF%--;6R1`$?=)A$;[<*I_$9P04[:XTZIB.%=&UI[L@RJ
+M'5WRTP),*=UPSO)^50ZC4#FELB$D2U7LWB8Y*FJ-!!)&5#T\DY@*9S3D!T<J
+M155P(,S,%6[.K``,8455ON3[J%C]#@"K$:I,B1N@.(YRHJ521DJ02=R%*'J.
+MQ(,A1N,B>41`!.<>Z!T"2,2@!Y'!*@O'>C'&V5,\S_HH+LS2.\K42H+)X(R=
+MU8:9)AQSQPJ=G!,?NK3(F`T!2%2?TX3SP<2HW.(P-D[7%Q"H*3![*.I,P70B
+M).GM"#5ZT"QHW2,`1.R=WY=Q@(()!,R50!B2`250N#INACGNK9_,8(RJ-VXF
+MZ"EZ3ZTZ>6M]MD;B'TR"H6$!@/9%4=Z-RFMI5*X&DQ./=5JK3J@*W7`)SQNJ
+MS\XP4B17((.(0UL#<%2EHE1U&@B()(5$%)L@DC)3$>HC92AIG/V2+1N$1B];
+M!!F$5*'4`8"DZXTFB2,$#=5.F/#K>!CV5O;,$]PU>W)4=1@=&DX2=.J"(^$X
+M<-,;=E16KC)!W"AJ/AT$*6X/K.256J&0<Y50-8`D\*%H(YW4DRW<X4=9TNW@
+MC]5!#7(GB2L_K-+5;DM(VW5]SM39=NJUZ"ZV(/8K4[9O2ET5Y-H<G!4U:3_F
+MJG0W0]["=NY5JMB=2QCQPN78=+-BH+@SS@IV$Z\R@NL'2)GNK2!&D!/+5$TC
+M2,IY'=&]OF*PN'&H(VQ!E:UM5)=!B3@`KF[)W\SU8C8+8HU&G3!D`X*ZXW:9
+MQO\`37D/'OL/==)TZJ&!LC)W7*].<'56`20WE=!2>W0'$B=ENO-DZFTJ-=3W
+M`]E9?5TT"XC99O3Z@-,,]E)6>^K=T[<'$R5BS2XU>Z73_D:_5+E9KSH`.=\I
+M42&-T[`;IJH:XQE9TZ2A8!`!(PHJI]4@XYA2M`CDJ!Q]L<IH05/34QWR"BO@
+MVI0@-SNG?3#G2/U4=8PTMDQ""@ZMH:V@Z9)RKH>S6T2J-)@KWT$0&^ZFNFFE
+M6D"8@)WVR*]IM\T;*G=LTLD.$*[2+'TSJ'JW454!U,YSP5-::WMF$`D:'1W*
+MT^GW/I`:<=E1=1)!(`QRH:%7RFNP1GG8K4K%>G_A:\N]7_5]MUZ'YS=($PO+
+M?PGN`ZDYWO/[KNZEP=8.K[K&N7/&\MNA5EX$A7J#@6[_`%7/V-?.#]5KV521
+M\K5CO*N#TO!!*TK3348%F_F9A6.G57!\3CW6-?&]KSWN83,PH*SFU,X'=7G-
+M#V9"I7=+2/3LLUME=69%-T9`"Q6LF1L#WX6QU1Y%-P&)"SZ--II&3]D1")D@
+M&85JPK>7'=0-I%K^W*3AI=^:0KM'16MQJ8,G=7Z%3T8."N8L:Y;`U+9MJXC!
+MW5TLK8I/)&\_*F:Z,`X6?0J3_4K-*H8_-NHU*M:]B0J]W6]6D<IZM6&2J=`^
+M;6F<=E+=*T;*GIIB-^RL,&J)_=04G`"(RIFGTRI(HG-Q"C+8$QNCU"-TU0X`
+M[;(*%]2;I(.,+G.I6VDN&.ZZ>Y!..5D=3I&/RY42L2U(I58SA;W07BO<YSE8
+M56F6O[+:\&MFM(Y.ZK.G94:#-&R8T6]P5)1EH&?HD3G*CH`4&`P$G6LGF=U*
+M#&V2B=4,Q":%6M;PTP1`6;Y`_BP,F5LW+H9DY6?2<UUP$LX/JTRW@0W"-EL0
+M/4284K'8V1M,M@<*:Y57-)W'*847F<JV8W'=.".0J,^I1J#+3$*CU`O:"'2M
+MUQ]N%D]9@`DI$JK852&",JU_$M<<E5;-@T?*G--KR3D$I-B5M1N<X05=.X,R
+MHGL<T8G"!^L8""S2?I<`7`JVUP,$+*%2,D*S:UQB"G8OG2=RHJF"8,@H@X$"
+M#&-BHGX.#A`G$D08^JK7?Y#LIPX1NH:PP03NJ52LGCS")&.95L$`$%4*9T79
+M$B.ZMN</E(B0$3(.W=$"<F84(<)PI`09<1A4$T]T!,&?V1C#2-X4-4[CA0$7
+M%PPEO.$&J(A.W:`51'5Q*S;@D7329Q[+0J&'8_19UX?YX,0EZ1I4ZD,!A#<5
+M`QFZ&D\>4!^JBNAKIQRD2HVU=>=_JF/'<(;1GELR[/[J0C,I.C2*K@J,>H'(
+M"DJ\XCV40D"`(E4"X0XC.?JFJMC:8'=%$$H71O\`NB,_J@_E.!Y"Q^FU-+W-
+M@A;G4&!U,SD$+G+8Z.H$#<[JWIF=K]1LF<D]]U&\;QA3U`-*KN=N-R@@K@@C
+M]E5?CZJW7,;'(5-T$Y)PJ@7G8C`*"KR!(CNCJNTM`DPH7DO$DR0H(*IGC/=`
+M^#3/J@_*58;EI48.X=&1N%48E(MI=6+7.Y&/HM&JX3!V*S>I?R^JM>"`!RKE
+M9XJ-#@GVK>9"<8.3,(:KMYW"![W:#&Z!SG%GJ;!0@J8]`X3Q[H&5'!H&H?9/
+MYKO\0^RSPV^3`XT[@M(TP>2M*RJ!SA)&>52\04G6_57B``?=*TJG!C=:\>6X
+MZ>3%U73GAQ$'!,;K>L7:G""<87*=%KM:R9]<X706=RXU?-<07'?W7H[>/.<N
+MJZ97#1)XY6ET?34J/N"!DP(7,6%V_4*;1+G&,+JK!OE6[&`#(6,HQCVOM,D.
+MF$1F8*C;M,_1$VH($@D^RRZGJ8;@084+6@B2#[*2HYNF-C[J-KB[`B`H'8T!
+MWPHZU/T&<%2T"T3(_1-7V)SLFC;$M2?^(OC$=E=<[U$.$CNH+>F75GU=,294
+MCVN!![I.D#4ID-<YFT*NRH1NZ1[X6@W%#D^RJW5`-9J`(^BBJ]5H<):)![*I
+M>TM%)SHB1"TK<@M@`PFZC3#K5Y9G'"6Z339_"2MIH.&6GG]5VG\9J>?5/NN`
+M_#:6TCP5T3KDMNBV2IC=UQDYKJ>G7/JP2NCZ?5!I#,%<%TR['FAL[KK.DW&H
+M`+I8Z8UTMLZ`#RI@[34!&%1M:LQE7(!9@K%=8V;)X?2&4=5@.ZS>FU8=!,1P
+M5HNJ!M,PX+-;E87B"C+]`&5GFDZDP!TB.RV:X%>[WD!1WULTL,#(V)6-ZJZ8
+MU,MU[D^Y0W+9.,#N%+6I.IU%'4>-B<JHKTWEKA'ZK1LZX']1*RW`%^(^5/1>
+M0))B.RJ.AMJH+!ZE>H50(Y7.V=?.ZTZ%Q#-6T(LJ]>5Q.D&"5/T]NFG/<K)M
+MZHK7.^!RM>DX!D8@<RLWMJ+32`8V4S2(!!WX55CP#ONIJ3\YR/=54[7@C)RF
+MJ$`'8!#,F>>R3AJ.5`#H<W&96??4YY6D_`@!4[EH<TD[I1@WM(!T*[X/?IKG
+MY0W;!!D!'X7HD5R1W4G:.N95$9V(3FJ"0(5=H=M*(`$JM18UB,%(U"23(5=L
+MZ=TVH\<()+I\M(F`%0MW.-S@QE2W+SIG95+*3=:IE+T3MNL=#1'*?S.)5=A@
+M!$)F2@L:\&$XJ'`4'P$XE*HR\3@DA9G6'2KQ$YF%F=7B8!1*:P<?+A3:HB8P
+MJMD3HC]U*7>HSL/=2+5B01\I.`)[J)K]N$X=ZXVE4#4I`@Z5&T%IV*L.<2-T
+M'YO=30=M=^,?*=U8Z<@X2`;&=RC+&'$A!`;G,1]E&^X&))RI32;MA15*(&QE
+M7E%&YJQ<"(A6VO#VZEG=29IJ!P,0C8][:8$E/J-!CNY4S"2/[=UF,N8)#E:H
+MUPX`2J+<^D]U#5._!"<5!W4=4C:440=.Z?4)WV46J!$I!W(1!/P(&RS+V/-!
+M.RT:A=!!/T6=U&=8DCX3XE7J('E`C8>Z"H01&?NAMG?R(0ETG*3I:>(9)2ID
+M%N9"$N@1O\IFD:>RJ(ZL%Q`.$+\#L$3_`,RB>X]P40HR$U68PG),25$Z9,_<
+M((+PM\LCV7,51IZD-]UTET'%IPN:ZK++L.`"U>F?K5>6Z!C?NJ=4EM0S'PIJ
+M;II!P,JM>._F$@_5(@*I,F1NJQ$O#I/NCJ.)`,('.,1C*(:H6G$?JJ\Z26G8
+MJ6KC(,_"KU<9B?JFBH*NVD?=0L=O.$=PXD_YJN7DNW,!5&5UP@W#3SW5FG/E
+M`\_NJ?6S-P#LK5)W\EI:F7]B='.7GE)SF^7`@>RCJ.=(+HREK+A)<-ONI5A`
+MXPV0GD_X/T4)J'M/NF\P_P"%&]/G7\3K1U#J!JMD-/8KG+*J69:8E>A_B=:"
+MI0D4B33;F=I7FK*FG^61)#MYX7+"ZNG:?RQE;G3*HD#_`&%T?3JQ+6F3(W7)
+M=+K%WHG![E;_`$JX`IZ&G;D+UX7<T\_DCH>CU75>J-$X;P%VG3G.=I+CMC=<
+M'X8=_P"L<^",KL^F58TD#;NK7GO%;1(:R2!E%2;B8^O"AI.+QJ+I4K"XG$Y7
+M-T!4R3RFEL<[(JC2#O\`W4%0%KMP<HM6;4&#,`>R#J)T6QAVZ>D\Z(U3*@O'
+M:[BFP3[I4/2`;;-$"2)4-;43'?@*^YLB(&.RK5&Q6$;J=*B$M#02E=-'EF#&
+M%-4_F;B"%7N\-W)0X-94&NIG.4UV"V@\$3(X*DZ406D@G>([*W<40^V?,S&R
+MF71`^!7<D`;A7.O56T[X`'/RH/"-'RG2YI'9+Q93+*WF2N6-U8Y2?RJSTZZA
+M[7$C_-=?T"]&D9_5>:V]R0X=@NC\/7\.:"9GZ+TSE7IW3J^K25L4'@LCNN3Z
+M%<A])OJ"Z"SJC2#*QDWC6BTEKA&5.ZX.C1R52:^6$S$)K5X?=^HX!6-ND:ME
+M3:*>HSGNGN&G5Q$*6E&@:3'U2J@&9(E8UIT95U1#G$EJS+RA!."MVJP'_54+
+MQD-/)[*#`?-.MA&UVK\RN5K=KP21!Y5&LQS3`.`DK.DU-^G'NK#[K13^5G:_
+M?9-=51Y>J<^RW*E;O0JFHR5N,J;`F?A<GT"Y&@`GZRMVSKAS?[J:7;6ID!H,
+M$*Q3+0!*SJ3Q$R?E6:-2>?HHUM<8[U8^%)J(,JNUX.?V4DPV>Z*)[OJH*Y!,
+M']$;G=B@<&D&5!GWP]!PI?"P)J?7DJ'J`ACC)]D?AA^DR2D1T8P,Y'=$"-U&
+MRH"S@2A+@2(<C25[@,0@),GU0A<<ZB90%T$R=_=`-T_^61./=5.GNFYW$*2]
+M=_+F?N55Z:[^>2,Y5J3MNM.-T8=`_P!55UX&8]DFOG))459+S.\A)K^2?HH"
+M9P$.HPBK?F-R!CNLKJCLF"85DU#!S/LLSJ50_E,2JB2V>`TD291.?F05!;._
+MD[_5$TB?41)YV4@LM>0-YY1!\G=5R[:<)P[.=D$X?G=&Q\#C*KL>"-]D[70X
+M9^J;%EQ.-DB\]U"7\&8*<.X!_54$YY&9E`7DNVW35'@;G*&0[Z>ZNT5.HG.4
+MJ8'D[8_9-U+4!N82M_\`D`[J7L+RVDX*3:3ID(FN]4(VNAW"I`/UM[X4=2X<
+MP9G/Z*V#+5%5I-.[=]U!"VY$_P":E;<-)`U0H*M$<*$TG;#A!H>:TM]+I5/J
+M)`$G"B:VJUQSA0=2-9M/97:5I6;@:`)=$(7D`K/Z;<5?X>'`X[(GW1+O4DUH
+MJ\'`P#PA<3&VRJLNFZO[(S781C'=42U'2V3NHAOLA\YFG\WU0"H)W.564Q/I
+MRHJFQC"=U1L;J-[@6SJPFC:O=.,?(6!UO)+APMN]<TM*Q^K4]5J\YF%J,4/3
+MWZK82?LFN8`R0JW17_RBPG93W#?5CA9QZ6J[I`)[*%SR02IZ^&D[#LJCC)C[
+MK2#+@84%PYLD#[J7&DE4[N0=0VY0VCJ/F<3\JJ]Y#_S`2I7N)$@J"L?0851G
+M==)!#I,*2S?JM!_4>ZK=7ES/92=/(;:-!S\E3+N+.DI+6M)(CA"8%,$'"5:"
+MTXSPAI@^5I!!]U%@FM!;)A/H'M]T+#Z1A%/LHV\H\54&UZ%9KID-/RO)NK4'
+M4.I50T`M!R9VRO;.I4P]CG')CO@+R?Q[9NI]0>Z<3,1[KGGQE*O@O<9EKEH+
+M0=.X^%K=-K@4M((_NL*SJ/IO:`>^3PM2E6UR74Q(WC"[X7ZN4VZGPW6+*+<Y
+M)[KLNF5I#(F8_J*\]Z3<:'TFC`,;KL^A5?,8S(GWX7;6X\?DFJZJU?-,"02K
+M=-SM,`"/=9=C5@ADM='97J+IP=6T^RYV+C4U0GYA5ZF7C?\`S1N>[41OV3&2
+M3P2HT3JFEA."!N`HNG@5*KJAG?"#J-0TK8GDX1],+V6K=49[IVB_JVF=E%4$
+MG494EN\$?/":K),D;84L:B*W'J)WE07;7:S&/W5JF"!,;SRJU1NMSL\[H([3
+M4PYG)VA7GUO_`$;@,8YG"JZ((+)!XRGZA4<VQ?\`:5/B-3PPWT!\R2=T_C$.
+MQ!/J$84_A%O_`/3Z;].$WB!HJ5MH"XR<L8=N-+G,K$;*]TF]\NJV<0=Y4O5+
+M3^67,&0=UDO+J+@3E=\,ERCU#POU!II,SE=ATZNU[&Y7D/A;J1#V`E>A]!O=
+M=-I!6\HDKJC6#:;CJW]U'9U7&[!`QW6>^Y\RJVDV<K6LJ>B@)B>5RRNN(ZX_
+MEMVM<&G'>%8W&3/NLBUJZ7`$C_):-!VHCU+-CI*-S1I,`RJ=VQI?[_"O'/[*
+M"HT203)E8L:9=>FT$B"J=>CC;'*U+ML$@`RJU>GB2D1D7%N#)!R?T5&^8YM*
+M"86U780TJA?M#J#I'"L2JG3*^FGI!S^ZV>G78TCDA8%M3(!(5BA6-+>!E:E9
+MKK+6X!;DQ[*];U/2,Q*YCI]WL)_5:MI<:B#@_5+&I6W3J>H0<?*G;4`],E9M
+MM5'W4X?MWA9K6UPNU")W2<!I&?HH`_;(E23C915+JIBBXCA%X<8#!2ZEFFX1
+MB,INA/%,B-I4G:5MP(&3[HVPJXJ-/RB#C,3*TJ8]^/E!4,'>2A)!Q@%#4)V.
+M%-"O>F1OLJ_3?^;GNBOG>@J'I9]9DR9PK?B1L:A&_P`)M>(*B:XS&(A,>ZBI
+MVU1.Z(O:3,CO"JD'![^Z3@[28)E-B<OW,8Y63U:L-?I/*MR[;?V65U)SM>!R
+MK\%RS>?+!"F+O>51M"?*!,A2TZDNW*S%6'.)_IPEN,&"HW.!.1A#J'?'""P-
+M38!VB<J2F1_LJOYFWV3M.,F/JD-K#G.(QPD''<E1%_I@<)PZ!))5B)9D&4PD
+M'>9]U%YF-T@Z>51%U%WH*&S(\D9^B;J+OY1SCY4=B[^5OE*BP9!D)&0Z5&YW
+M\R9^B?428)Y06&ET`IY)89CWRHV.QI"9S^$#5=\)##8[H7G.#$IJ;G28*"5D
+M$[1]5%?-#J9D3[2B:XYXY0ULTR"58*E@QLN`:BK46.>3&>RCM'1=.!.)4]0R
+M3"D*K/H>J02F=0<6G=3EQ`"?4-)Y*ND4'4G`8)4(-459E7RX:C.Q*!S0'3CZ
+MHBD]]4&0#!*%U:H&Q!5\M#C^7Y05J8#<-'U5FRZ8M]<U!@@A4KJX+Z#A)V6Q
+M=TV$F0,]@J-S;,-)PTC/NM[K%8'3KK1=/;)WV)5\W;2(.ZSS;:>J1."5:K63
+MB-33"F]6GP5Q7'ED[PJ8JM+Y!W2K6]700"9A9U5M:F2-/RJC4+\&#]%!<P6D
+M@*@VXK,;$%*I?#\IY5@-[@UWJ^%#7<TCG&RB=<MU;IA<,=Z79^$T*76@TT-1
+M'R5'TFI_Z8MG"GZH6NMW1)"K=$$-<X1"F7PGU:.XSNG)]#C(PGU-=(+=D#IX
+M&#PI5AFL)$A/Y9]TFS&/W3Y_V5G<=7!7+8HF1@B=]EY_^(MJUU.H]HR.>Y7H
+M5=S2")XW7,^*K8U*%0;R)SPKY)N.'COKE'E#7Z*A:!B<%:%FX/8T["9A4^JT
+MO(O:E,-(@]]U-TYWY6C`:5,+N/7G&S1=H\J3G<05U7ARZ#FX<&D#OGA<E0@,
+M9]EK]*<:=1LM(;NO3A?CS>3'<>@]-JM--H[[S\+3M*Y+1,&-ES72;IKVL`)'
+MN5MT*LZ<[*6:>>72^QS#4DD[X4FN2!G[JJTOB8GLI2X8<=Q@SA8TZ2JW5'M?
+M=MI-<7'!(4U`C0&;`=E7HM-;J#JN(;C]58JC0>T_HH)Z=8!P`/U[JVW2ZGD;
+M+,HN+KAH)P5ITX-(-[CE6K#`'1@G_)02!4(GE6)`:0)PJE4^H_=1=I6YR3[R
+MHNJ`&R?C=34W32$MVPJ?6ZFBV&PEP^J6);PZ3PSZ.D4LQ#0._P!$_6&R0^9`
+MX1=!+?\`@E$[2T)^I#52U8@'"XSMQPO+.K-8^CI`XA<_URSECM.^\+HJ;'`C
+MW5>_HM-%T@+=_+O'+=(N'6U=K3JP<P5WWAOJ8\IIU;#NO/\`K5%UO<:Q@:E<
+MZ/U(TF-!='$CNNV%]HYY<5['X;J.KU14)!$KIJ-3,`_JN#\"WH-FPATF%UMK
+M5!`,Y.5BQO&_&I)#ICZA7;&K.'$`K+IO);$J:D_R^=NRPZ;;FK`G>$P@YG*J
+M6U<.&2(4X>"!$9]UG3<H*S=\!5JS);&`5<J9!RH7,$&=PLJSJ[0`=4+-ZCB@
+M[$>ZV;FFPZ@=BLKJ[!Y+@WZ*Q*SK.F8U`XF)1U*32XQ"EZ?2/D`]T=>G#HXX
+M1&<7NI'\V!Q"N6=X6ELF9S!45:D2Z`,E5JE/2[&",K4J5U%E=A])L'?]%HV]
+M66@3NN+M+MU&J`[8+>Z;?->&RX!+$E=`Q_$J859:/?A9M*J'`:73/96:3IS.
+MRPZ'OS-%P!E'TADT_A17#AY)4W29%(P0I!?;@'V1-=GE1S]$3=.)("JI(,S^
+MZ%QW#M]DY+8WW4;S`B1\H*G47``CE1],`UDCOPBZ@X!AR%%TQ_/<\*4:E-V)
+MTHO4<[*)CL"%(TXGNFC9.<`(Q/=$'PTB5&Z9G&$%28[JB34P-=.>ZR>JN:*G
+M;*OU'::1XX63U1\U0`('LH59MG#R0)&`DYWJWP5#1GRP,YY3N,.P3ME)2IQ4
+M'!^B37^M0%VT)B\@S@#A!:+AW3L><*&0<1N$F'2X23'RE%L.YF>Z;4`2?[JN
+M7^DQ*(/P)@H)=?`!^4=-X+<[RH`Y)K@,JANHP*9SB%'8QY>#LFZ@_P#DD$'Y
+M4=@[^6=]E:D67:B<NWPDTG5_=1ZCPGU'G=!8:Z`F+LG"A:21O"1=F.$$CC.[
+MH3<^ZCJ.Q]$U-V!`03TW2<(JQ;H,Y(P%`UWJE&[;O[*Q%`NB]B8DJVXR/251
+MNSINFD#G[JW3/\H.D!3Z?#N,L@1"83VR$!C48*1/JW6@-3#MDP,;Y0UIR2F9
+M')W[HB1Q`9@E0UZA((RC<<?N57>9G,951#6$_P!U4<!K<2..%:J`Y!.%#5RZ
+M08[JHP.JM\J^%08RKU-VN@UT3(W4/B.G_*\S<A-85&NLFP<A6][2='N)`('*
+MS;EDF3WV6E7/HQ]U0NYTG)A5*J&DPDM(F2H:UI3,X&5*\Z3@F9Y3N(?3+MHP
+MIH95U8AQ);QV51]K5:202#)@K8>88=,QRJ]1WJQVV5T;8M\VNRA4D$X5'I=W
+M4;4<#N"8"Z&[:W09SC*Q:%)C>H/$R'$J7>EG:9MV7&2WY4E&Z:1$[)A;L\QQ
+M@9PDVT&J1O\`NFUFEFFYI9.I%+?\85=ML^-T_P##/[K&W3U>?U'.IO`/T69>
+MO\T/#I@<+7T4WTGM>\-<!(QNLKJ5!\%P@#OV73_*\TT\X\;T!2Z@^IOJS[[K
+M*LVP!B#J6_XX:Y];.=(R>%S=*J]M00/RY/NN&/%T]TN\8WK<^EI<TNB%K6+V
+MN+3!(`[K"LJKG-`.0=BM;I]0Z@20(A>G&N&3I>FO+;A@:YP&"(."NBMKJ:@;
+M+=+<8*YKHU:=,P=(6E;^:UX>X`P9PMWAYLG46Q,B<M.1[)7]8,ID1I.V%1L;
+M@AK9,\917-8UKAK6F8=)@%8L)?BYTR6TA+8<[)5@@NR<SQV5:A5DP9AN%8ID
+MEATX6=-2HJ;=-WJ/!6C1,CZ+.>?YD.:<G>5=M7%D#@H;'6UBF2=O90522PQO
+M&P5BK4EL$*O6)R-(AR+L]&12C:5E^(7PRF`[=X!$;Y6C.BC)9!]C,K)O#YE7
+M46R`X1/=3+IFV.SZ"7'H]$$02!CA7*P+J7T5;H'_`.44]P(5UP::6VZY3MSP
+MJC5;#Q,#B945>D#D;=E<(!(&)35F12F1]%T=]N8Z[9BI,M&W*Y:Z;4MK@B3H
+M:X;KT"ZH!U-Q+<KENOV;2UX#2!*DOK5LE=/X#ZF&T:;=63&)7HG2[EKZ33(S
+M[KPSP[U#^'NPR'-CNO4_"M^*MNPZAMRNV4W'*<73MK>J(`!D[X4XJ$C$A9-K
+M7Q\8PKC*DLP9D+C765?H7!:[2=CRK]O5&D#NL4/`$SE6K.YAP`4:VU]6(E-N
+M#PH*+PX27$`YW4@>"["S6Y456F223A9G5VC0["U:SN%E]0<'5`SDE016E/3;
+M"!&.Z&H-1DC?=6PS32;.T0HG!H<?\TA5"HT:H`V]U7K,W)P>RT*K?48C?ZJ*
+MM3EL@_,J[33*?3.K41"*G6=3J`M5FK3(SLJSQ`WRK*EC9Z;?D:6..8W6S;7;
+M2!#IGW7&4ZFDB)'LK]M=EH&8@)4G#I;JN#2)D#ZJWTJN/(&09]UR]3J`>UK-
+M6^`MSI&;=N8E2\++MK^=VVV1LK>KC*H.<X")QV0FJ01+I4;:1JC$;]D+JA._
+M[J@;@-<&NJ-DG`E$:GJW'S*`>IU/1NAZ62*8,[E5NIU"6&"$73'N=2:`=^4J
+M1K4ZO!/ZHV5H'YC$JD"<P90&JX$RD%\5B[,H75M+M_NJ3*CBZ)PE5<X@Y&%5
+M7*E8%D;K'ZC7!J1/*F=4=P5FWM7^<)G!V4O2?6I0J#R1C]4G%N_'*K47#R@0
+M>)"/6",G=1I*7[ANZ1=&5`7PW!A(O^I518;5)[(M6TE56N``(")M01ML@N!P
+M@0=TXRV9"K!\B$8?!03AS28!D]D;2.3]%5UQSGV1!Y@[_P":H74'?RS$=H45
+MBXMIP"`=U'?/EARFLG2W$B$OPBTY\&-^4P=F4$CG?N@U0X[0B++7$'Y2>[B5
+M`U_<)R\[$G"HDJ.(;,IZ;QIB,PH''N8RE3)F)*@G#R3'',*<&6B`53U28W^B
+ME;4<&C*HK=5!:=4;*6SJAUL#]"HNI^JD>?[*'IK_`$P3LE2+-5^<?,RF:<@G
+M=!4(U'GV3-B-U055Q+C!PA!`;G=*<!,XB<G*(,/.G;<('@<G=(.`$S,>ZAJN
+M$$QE6%!4_.<X]U7J.;J)DQSE'4)+]XGA152V8G9:95.K--6T<`($8[E972GQ
+MKIG:=I6U<^J@0(_NL"B2SJ+VD[DI>CZOUI`(!PJ542\R(5QS<;Y*IW1C$F=E
+M652NS\QF>5%2=#H.WRK#SCW5:!)SLBCK-;HB9"INC.^^59>3IWSL0H:[=+"1
+M^Z(K5(/YLK)NJIHWIIZ1I>9)T@G[Q*UZPEL3GV67UNBXT!4$XSNEG&EG%3R"
+MT%G92VY)!(WXA4[.MKMF'^IHC=3VKH):5)>%URL!S>93ZF^ZCAO8E*&]BG#;
+MSU].##9PH:E%AR>-YQ*NG<J/AWPFWGLURX7Q'T]MS6N',88:#.%PUQ;BG7<U
+MP.Y^B]-J?^WN_P#\2\_ZO_[I_P`KCEQD]OBN\0].AKH)P1NM6T(UM:`2%E6W
+MYA\K4L_R!=I4LVZ3HWDMI:P7:B(&<#Y6[TP4_+&LDEQX,RL#I7Y`NCZ?_P`T
+M?"Z6O)FN>7%+6#('TE0=*+_.?4<##R0`<PKM/_V[_A5+7_V_W6-\Z9G3086B
+M7%P@[@*]9AKFB(G>5E'\K?A:5CO]%?B]4]=O\V3NK%$0S)GLJ];=6:/Y6_19
+MC6^3U`00.Z3@=6G.VZ=WYDF_\QORFC?*&^;IHR"1'M*RJM)PI"I/YGXE:W5/
+M^0LZO_[+_P#&%G*_$RX==T)I;TFG)G&5=R:>TJGT7_\`+6?`_966;!8P[KEC
+M"PT^Y4PIZJ$]U!5W5NG_`,KZ+HZJ5:B13.096%U2U+R8`RNDK?\`*/RLFZV*
+MS>G2.#ZO;.MK[S`3`,KJO!?5X;387Q[2L+Q9_P"X8@\'?\_ZKKX[PQGC]>Q=
+M&O&U*;3KS&RV:%0:1ZOU7(^'/RM736WY&K.4Y7%?U%WI_9)KG-=$_5#;[!)_
+MY'+G6XT+2O,`NV]U=8_TR#ORL:WV/PM*A_R6I5B6I4'EJA3FK>DQLK5S_P`L
+MJ/IGYS\KG;J-3E.6C1![1"@>V1&_NK+]C\J`_F5-*[VD/.,;[H'@.:0)^B.X
+M_*F=_P`GZ(:5*U,M!Q/RJE5AR5H5/RGZ*H[^KZIM*I5&&<843JKV'NK=;\BI
+MW'YEK:6!97?_`!5/W*[/I%QIM&#&RX1O_O&?*Z[IO_MF_16I.&UYX+2F+F$`
+MJK3_`.2/E)OY?J5C36UN*<C(U)Y^L*&G^9ORB'YOJ4L:5;]I<TY.^REZ;(IY
+M,*.[Y16FP^%/HO!TXGZI1G*C9^<IV[JU(,``R("8D:D)V1'<?"BHZ\"7+%O7
+M`W7"V7_E6#=?^^<K>D^K]*I#!&Z/63_4HJ?_`"_HC;^8_`5THR\8@)]<[2@&
+M[OA*EL4T"-4#&X"0>.^_91'_`)A3MW;\J"PUY`B81!Y.02H'?\M'0V^B"5KB
+M#*E;4QO!]E`/S?1,W<J]ANH/&G=/TXQ3,S]5!>?F^BDZ?^1+\2+#R4QC5,IG
+M[_5#4_YGV5@<.`,GZ(I,@]U$/^8%,>/HJD,YQWDIVNS$H*WY/JDS\P45('>K
+M!PI`YI&V-L*!OYDXW*J&OS%$MD0JG3':JQ$JS=_^V<J?2_\`W04I%UY_F8(3
+M.=&1V2J_G*&K_P`L*@P_T=IY0.B<F)3-_($]7=JJ%,"%%5<'-@2"B?\`D4#O
+MS'X50%0D=_E!4=+4]3\H^4Q_*541.,MX*P.I`T>HM?L"<RM]NRP_$G_-^H5^
+M)]6`Z6`MSB5%<`NSS"*V_P#;,^$U;=2=(IOB8^JJ/<6U<#G=6G_\PJI=_F"T
+MARYK21.ZA<09`4K?Z5'<_D*;57J-QMD=U!<L\R@ZF>5/PAY*#%LIIWCJ)(`)
+I("O4!#X(DJA<_P#YE_\`B6G2_P">U9ZNFXE:#I_,$^EW^,*4;)(T_]EK
+`
+end
+
+
diff --git a/rt/sbin/extract-message-catalog b/rt/sbin/extract-message-catalog
index af7b2c733..a7ba6335c 100644
--- a/rt/sbin/extract-message-catalog
+++ b/rt/sbin/extract-message-catalog
@@ -41,7 +41,7 @@ $DEBUG = 1;
 $FILECAT = {};
 
 # extract all strings and stuff them into $FILECAT
-File::Find::find( { wanted => \&extract_strings_from_code, follow => 0 }, '.' );
+File::Find::find( { wanted => \&extract_strings_from_code, follow => 1 }, '.' );
 
 # ensure proper escaping and [_1] => %1 transformation
 foreach my $str ( sort keys %{$FILECAT} ) {
diff --git a/rt/sbin/factory b/rt/sbin/factory
index 8abb1922f..64b0ae337 100644
--- a/rt/sbin/factory
+++ b/rt/sbin/factory
@@ -61,6 +61,7 @@ my $LicenseBlock = << '.';
 # 
 # 
 # END LICENSE BLOCK
+
 .
 
 my $Attribution = << '.';
diff --git a/rt/sbin/license_tag b/rt/sbin/license_tag
index 33da2e026..689b246ef 100644
--- a/rt/sbin/license_tag
+++ b/rt/sbin/license_tag
@@ -5,7 +5,7 @@
 # 
 # Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
 # 
-# (Except where explictly superceded by other copyright notices)
+# (Except where explicitly superseded by other copyright notices)
 # 
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
@@ -29,7 +29,7 @@ my $LICENSE  = <<EOL;
 
 Copyright (c) 1996-2003 Jesse Vincent <jesse\@bestpractical.com>
 
-(Except where explictly superceded by other copyright notices)
+(Except where explicitly superseded by other copyright notices)
 
 This work is made available to you under the terms of Version 2 of
 the GNU General Public License. A copy of that license should have
@@ -57,7 +57,7 @@ File::Find::find({ no_chdir => 1, wanted => \&tag_pm}, 'lib');
 File::Find::find({ no_chdir => 1, wanted => \&tag_mason}, 'html');
 File::Find::find({ no_chdir => 1, wanted => \&tag_script}, 'sbin');
 File::Find::find({ no_chdir => 1, wanted => \&tag_script}, 'bin');
-tag_makefile ('Makefile');
+tag_makefile ('Makefile.in');
 tag_makefile ('README');
 
 
diff --git a/rt/sbin/rt-setup-database b/rt/sbin/rt-setup-database
index f84f290b7..58f882f6e 100644
--- a/rt/sbin/rt-setup-database
+++ b/rt/sbin/rt-setup-database
@@ -80,7 +80,12 @@ if ( $args{'action'} eq 'init' ) {
     $dbh = DBI->connect( get_system_dsn(), $args{'dba'}, $args{'dba-password'} )
       || die "Failed to connect to " . get_system_dsn() . " as $args{'dba'}: $DBI::errstr";
     print "Now creating a database for RT.\n";
+    if ($RT::DatabaseType ne 'Oracle' ||
+        $args{'dba'} ne $RT::DatabaseUser) {
     create_db();
+    } else {
+        print "...skipped as ".$args{'dba'} ." is not " . $RT::DatabaseUser . " or we're working with Oracle.\n";
+    }
 
     $dbh->disconnect;
     $dbh = DBI->connect( $Handle->DSN, $args{'dba'}, $args{'dba-password'} )
@@ -89,7 +94,7 @@ if ( $args{'action'} eq 'init' ) {
     print "Now populating database schema.\n";
     insert_schema();
     print "Now inserting database ACLs\n";
-    insert_acl();
+    insert_acl() unless ($RT::DatabaseType eq 'Oracle');
     print "Now inserting RT core system objects\n";
     insert_initial_data();
     print "Now inserting RT data\n";
@@ -137,8 +142,9 @@ sub insert_schema {
         open( SCHEMA_LOCAL, "<" . $RT::LocalEtcPath . "/schema." . $RT::DatabaseType );
 
         my $statement = "";
-        foreach my $line (<SCHEMA>, <SCHEMA_LOCAL>) {
+        foreach my $line (<SCHEMA>, ($_ = ';;'), <SCHEMA_LOCAL>) {
             $line =~ s/\#.*//g;
+            $line =~ s/--.*//g;
             $statement .= $line;
             if ( $line =~ /;(\s*)$/ ) {
                 $statement =~ s/;(\s*)$//g;
@@ -147,10 +153,13 @@ sub insert_schema {
             }
         }
 
+	local $SIG{__WARN__} = sub {};
+	my $is_local = 0; # local/etc/schema needs to be nonfatal. 
         foreach my $statement (@schema) {
-            print STDERR $statement if $args{'debug'};
+	    if ($statement =~ /^\s*;$/) { $is_local = 1; next; }
+            print STDERR "SQL: $statement\n" if defined $args{'debug'};
             my $sth = $dbh->prepare($statement) or die $dbh->errstr;
-            unless ( $sth->execute ) {
+            unless ( $sth->execute or $is_local ) {
                 die "Problem with statement:\n $statement\n" . $sth->errstr;
             }
         }
@@ -168,6 +177,16 @@ sub insert_schema {
 # {{{ sub drop_db
 sub drop_db {
     return if ( $RT::DatabaseType eq 'SQLite' );
+    if ( $RT::DatabaseType eq 'Oracle' ) {
+        print <<END;
+
+To delete the tables and sequences of the RT Oracle database by running 
+    \@etc/drop.Oracle 
+through SQLPlus.
+
+END
+        return;
+    }	
     unless ( $args{'force'} ) {
         print <<END;
 
@@ -198,6 +217,13 @@ sub create_db {
             $dbh->do("CREATE DATABASE $RT::DatabaseName") || die $DBI::errstr;
         }
     }
+    elsif ($RT::DatabaseType eq 'Oracle') {
+        insert_acl();
+    }
+    elsif ( $RT::DatabaseType eq 'Informix' ) {
+	$ENV{DB_LOCALE} = 'en_us.utf8';
+        $dbh->do("CREATE DATABASE $RT::DatabaseName WITH BUFFERED LOG");
+    }
     else {
         $dbh->do("CREATE DATABASE $RT::DatabaseName") or die $DBI::errstr;
     }
@@ -248,6 +274,10 @@ sub insert_acl {
         do $base_path . "/acl.mysql"
           || die "Couldn't find ACLS for mysql in " . $RT::EtcPath . "\n" . $@;
     }
+    elsif ( $RT::DatabaseType =~ /^informix$/i ) {
+        do $base_path . "/acl.Informix"
+          || die "Couldn't find ACLS for Informix in " . $RT::EtcPath . "\n" . $@;
+    }
     elsif ( $RT::DatabaseType =~ /^SQLite$/i ) {
         return;
     }
@@ -287,6 +317,10 @@ sub get_system_dsn {
     elsif ( $RT::DatabaseType eq 'Pg' ) {
         $dsn =~ s/dbname=$RT::DatabaseName/dbname=template1/;
     }
+    elsif ( $RT::DatabaseType eq 'Informix' ) {
+	# with Informix, you want to connect sans database:
+	$dsn =~ s/Informix:$RT::DatabaseName/Informix:/;
+    }
     return $dsn;
 }
 
@@ -302,7 +336,7 @@ sub insert_initial_data {
     #Put together a current user object so we can create a User object
     my $CurrentUser = new RT::CurrentUser();
 
-    print "Checking for existing system user...";
+    print "Checking for existing system user ($CurrentUser)...";
     my $test_user = RT::User->new($CurrentUser);
     $test_user->Load('RT_System');
     if ( $test_user->id ) {
@@ -330,7 +364,7 @@ sub insert_initial_data {
         exit(1);
     }
     print "done.\n";
-    $RT::Handle->dbh->disconnect();
+    $RT::Handle->Disconnect();
 
 }
 
diff --git a/rt/sbin/rt-setup-database.in b/rt/sbin/rt-setup-database.in
index e49a32ed9..9e990e5b8 100644
--- a/rt/sbin/rt-setup-database.in
+++ b/rt/sbin/rt-setup-database.in
@@ -80,7 +80,12 @@ if ( $args{'action'} eq 'init' ) {
     $dbh = DBI->connect( get_system_dsn(), $args{'dba'}, $args{'dba-password'} )
       || die "Failed to connect to " . get_system_dsn() . " as $args{'dba'}: $DBI::errstr";
     print "Now creating a database for RT.\n";
+    if ($RT::DatabaseType ne 'Oracle' ||
+        $args{'dba'} ne $RT::DatabaseUser) {
     create_db();
+    } else {
+        print "...skipped as ".$args{'dba'} ." is not " . $RT::DatabaseUser . " or we're working with Oracle.\n";
+    }
 
     $dbh->disconnect;
     $dbh = DBI->connect( $Handle->DSN, $args{'dba'}, $args{'dba-password'} )
@@ -89,7 +94,7 @@ if ( $args{'action'} eq 'init' ) {
     print "Now populating database schema.\n";
     insert_schema();
     print "Now inserting database ACLs\n";
-    insert_acl();
+    insert_acl() unless ($RT::DatabaseType eq 'Oracle');
     print "Now inserting RT core system objects\n";
     insert_initial_data();
     print "Now inserting RT data\n";
@@ -137,8 +142,9 @@ sub insert_schema {
         open( SCHEMA_LOCAL, "<" . $RT::LocalEtcPath . "/schema." . $RT::DatabaseType );
 
         my $statement = "";
-        foreach my $line (<SCHEMA>, <SCHEMA_LOCAL>) {
+        foreach my $line (<SCHEMA>, ($_ = ';;'), <SCHEMA_LOCAL>) {
             $line =~ s/\#.*//g;
+            $line =~ s/--.*//g;
             $statement .= $line;
             if ( $line =~ /;(\s*)$/ ) {
                 $statement =~ s/;(\s*)$//g;
@@ -147,10 +153,13 @@ sub insert_schema {
             }
         }
 
+	local $SIG{__WARN__} = sub {};
+	my $is_local = 0; # local/etc/schema needs to be nonfatal. 
         foreach my $statement (@schema) {
-            print STDERR $statement if $args{'debug'};
+	    if ($statement =~ /^\s*;$/) { $is_local = 1; next; }
+            print STDERR "SQL: $statement\n" if defined $args{'debug'};
             my $sth = $dbh->prepare($statement) or die $dbh->errstr;
-            unless ( $sth->execute ) {
+            unless ( $sth->execute or $is_local ) {
                 die "Problem with statement:\n $statement\n" . $sth->errstr;
             }
         }
@@ -168,6 +177,16 @@ sub insert_schema {
 # {{{ sub drop_db
 sub drop_db {
     return if ( $RT::DatabaseType eq 'SQLite' );
+    if ( $RT::DatabaseType eq 'Oracle' ) {
+        print <<END;
+
+To delete the tables and sequences of the RT Oracle database by running 
+    \@etc/drop.Oracle 
+through SQLPlus.
+
+END
+        return;
+    }	
     unless ( $args{'force'} ) {
         print <<END;
 
@@ -198,6 +217,13 @@ sub create_db {
             $dbh->do("CREATE DATABASE $RT::DatabaseName") || die $DBI::errstr;
         }
     }
+    elsif ($RT::DatabaseType eq 'Oracle') {
+        insert_acl();
+    }
+    elsif ( $RT::DatabaseType eq 'Informix' ) {
+	$ENV{DB_LOCALE} = 'en_us.utf8';
+        $dbh->do("CREATE DATABASE $RT::DatabaseName WITH BUFFERED LOG");
+    }
     else {
         $dbh->do("CREATE DATABASE $RT::DatabaseName") or die $DBI::errstr;
     }
@@ -248,6 +274,10 @@ sub insert_acl {
         do $base_path . "/acl.mysql"
           || die "Couldn't find ACLS for mysql in " . $RT::EtcPath . "\n" . $@;
     }
+    elsif ( $RT::DatabaseType =~ /^informix$/i ) {
+        do $base_path . "/acl.Informix"
+          || die "Couldn't find ACLS for Informix in " . $RT::EtcPath . "\n" . $@;
+    }
     elsif ( $RT::DatabaseType =~ /^SQLite$/i ) {
         return;
     }
@@ -287,6 +317,10 @@ sub get_system_dsn {
     elsif ( $RT::DatabaseType eq 'Pg' ) {
         $dsn =~ s/dbname=$RT::DatabaseName/dbname=template1/;
     }
+    elsif ( $RT::DatabaseType eq 'Informix' ) {
+	# with Informix, you want to connect sans database:
+	$dsn =~ s/Informix:$RT::DatabaseName/Informix:/;
+    }
     return $dsn;
 }
 
@@ -302,7 +336,7 @@ sub insert_initial_data {
     #Put together a current user object so we can create a User object
     my $CurrentUser = new RT::CurrentUser();
 
-    print "Checking for existing system user...";
+    print "Checking for existing system user ($CurrentUser)...";
     my $test_user = RT::User->new($CurrentUser);
     $test_user->Load('RT_System');
     if ( $test_user->id ) {
@@ -330,7 +364,7 @@ sub insert_initial_data {
         exit(1);
     }
     print "done.\n";
-    $RT::Handle->dbh->disconnect();
+    $RT::Handle->Disconnect();
 
 }
 
diff --git a/rt/sbin/rt-test-dependencies b/rt/sbin/rt-test-dependencies
index 637d33a32..c1591b189 100644
--- a/rt/sbin/rt-test-dependencies
+++ b/rt/sbin/rt-test-dependencies
@@ -36,10 +36,14 @@ my %args;
 my %deps;
 GetOptions(\%args,'install', 'with-MYSQL', 'with-POSTGRESQL|with-pg|with-pgsql', 'with-SQLITE', 'with-ORACLE', 'with-FASTCGI', 'with-SPEEDYCGI', 'with-MODPERL1', 'with-MODPERL2' ,'with-DEV');
 
-if  (!keys %args) {
-help();
-exit(0);
+if (!keys %args) {
+    help();
+    exit(0);
+}
+if ($args{'with-MODPERL2'}) {
+    warn_modperl2();
 }
+
 $args{'with-MASON'} = 1;
 $args{'with-CORE'} = 1;
 $args{'with-DEV'} =1; 
@@ -49,10 +53,20 @@ if ($] < 5.007) {
 $args{'with-I18N-COMPAT'} = 1;
 }
 
+sub warn_modperl2 {
+    print <<'.';
+        NOTE: mod_perl 2.0 isn't quite ready for prime_time just yet;
+        Best Practical Solutions strongly recommends that sites use
+        Apache 1.3 or FastCGI. If you MUST use mod_perl 2.0 (or 1.99),
+        please read the mailing list archives before asking for help.
+.
+    sleep 5;
+}
+
 
 sub help {
 
-print <<'.'
+    print <<'.';
 
 By default, testdeps determine whether you have 
 installed all the perl modules RT needs to run.
@@ -81,18 +95,18 @@ sub _ {
 }
 
 $deps{'CORE'} = [ _( << '.') ];
-Digest::MD5
-DBI 1.18
+Digest::MD5 2.27
+DBI 1.37
 Test::Inline
 Class::ReturnValue 0.40
-DBIx::SearchBuilder 0.86
+DBIx::SearchBuilder 0.97
 Text::Template
 File::Spec 0.8
 HTML::Entities 
 Net::Domain
 Log::Dispatch 2.0
-Locale::Maketext 1.04
-Locale::Maketext::Lexicon 0.25
+Locale::Maketext 1.06
+Locale::Maketext::Lexicon 0.32
 Locale::Maketext::Fuzzy
 MIME::Entity 5.108
 Mail::Mailer 1.57
@@ -102,7 +116,8 @@ Time::ParseDate
 File::Temp
 Term::ReadKey
 Text::Autoformat
-Text::Quoted
+Text::Quoted 1.3
+Scalar::Util
 .
 
 $deps{'MASON'} = [ _( << '.') ];
@@ -113,9 +128,9 @@ HTML::Mason 1.16
 MLDBM
 Errno
 FreezeThaw
-Digest::MD5
+Digest::MD5 2.27
 CGI::Cookie 1.20
-Storable
+Storable 2.08
 Apache::Session 1.53
 .
 
@@ -138,25 +153,25 @@ WWW::Mechanize
 .
 
 $deps{'FASTCGI'} = [ _( << '.') ];
-CGI
+CGI 2.92
 FCGI
 CGI::Fast 
 .
 
 $deps{'SPEEDYCGI'} = [ _( << '.') ];
-CGI
+CGI 2.92
 CGI::SpeedyCGI
 .
 
 
 $deps{'MODPERL1'} = [ _( << '.') ];
-CGI
+CGI 2.92
 Apache::Request
-Apache::DBI
+Apache::DBI 0.92
 .
 
 $deps{'MODPERL2'} = [ _( << '.') ];
-CGI 2.89
+CGI 2.92
 Apache::DBI
 .
 
@@ -175,6 +190,23 @@ $deps{'POSTGRESQL'} = [ _( << '.') ];
 DBD::Pg
 .
 
+print "perl:\n";
+print "\t5.8.0";
+eval {require 5.008};
+if ($@) {
+print "...missing.\n";
+        eval {require 5.006001};
+        if ($@) {
+            print " RT is known to be non-functional on versions of perl older than 5.6.1. Please upgrade to 5.8.0 or newer";
+            die;
+        } else {
+            print " RT is not supported on perl 5.6.1\n";
+        }
+} else {
+        print "...found\n";
+
+}
+
 
 foreach my $type (keys %args)  {
 next unless ($type =~ /^with-(.*?)$/);
@@ -196,17 +228,17 @@ sub test_dep {
 	my $module = shift;
 	my $version = shift;
 
-	  print "\t$module $version";
-        eval "use $module $version" ;
-        if ($@) {
-	my $error = $@;
-	$error =~ s/\n(.*)$//s;
-	print "...MISSING\n";
-		print "\t\t$error\n" if $error =~ /this is only/;
+	print "\t$module $version";
+	eval "use $module $version" ;
+	if ($@) {
+		my $error = $@;
+		$error =~ s/\n(.*)$//s;
+		print "...MISSING\n";
+			print "\t\t$error\n" if $error =~ /this is only/;
 
-	return undef;
+		return undef;
 	} else {
-	print "...found\n";
+		print "...found\n";
 return 1;
 	}
 }
diff --git a/rt/sbin/rt-test-dependencies.in b/rt/sbin/rt-test-dependencies.in
index 6951290c4..7a1508010 100644
--- a/rt/sbin/rt-test-dependencies.in
+++ b/rt/sbin/rt-test-dependencies.in
@@ -36,10 +36,14 @@ my %args;
 my %deps;
 GetOptions(\%args,'install', 'with-MYSQL', 'with-POSTGRESQL|with-pg|with-pgsql', 'with-SQLITE', 'with-ORACLE', 'with-FASTCGI', 'with-SPEEDYCGI', 'with-MODPERL1', 'with-MODPERL2' ,'with-DEV');
 
-if  (!keys %args) {
-help();
-exit(0);
+if (!keys %args) {
+    help();
+    exit(0);
+}
+if ($args{'with-MODPERL2'}) {
+    warn_modperl2();
 }
+
 $args{'with-MASON'} = 1;
 $args{'with-CORE'} = 1;
 $args{'with-DEV'} =1; 
@@ -49,10 +53,20 @@ if ($] < 5.007) {
 $args{'with-I18N-COMPAT'} = 1;
 }
 
+sub warn_modperl2 {
+    print <<'.';
+        NOTE: mod_perl 2.0 isn't quite ready for prime_time just yet;
+        Best Practical Solutions strongly recommends that sites use
+        Apache 1.3 or FastCGI. If you MUST use mod_perl 2.0 (or 1.99),
+        please read the mailing list archives before asking for help.
+.
+    sleep 5;
+}
+
 
 sub help {
 
-print <<'.'
+    print <<'.';
 
 By default, testdeps determine whether you have 
 installed all the perl modules RT needs to run.
@@ -81,18 +95,18 @@ sub _ {
 }
 
 $deps{'CORE'} = [ _( << '.') ];
-Digest::MD5
-DBI 1.18
+Digest::MD5 2.27
+DBI 1.37
 Test::Inline
 Class::ReturnValue 0.40
-DBIx::SearchBuilder 0.86
+DBIx::SearchBuilder 0.97
 Text::Template
 File::Spec 0.8
 HTML::Entities 
 Net::Domain
 Log::Dispatch 2.0
-Locale::Maketext 1.04
-Locale::Maketext::Lexicon 0.25
+Locale::Maketext 1.06
+Locale::Maketext::Lexicon 0.32
 Locale::Maketext::Fuzzy
 MIME::Entity 5.108
 Mail::Mailer 1.57
@@ -102,7 +116,8 @@ Time::ParseDate
 File::Temp
 Term::ReadKey
 Text::Autoformat
-Text::Quoted
+Text::Quoted 1.3
+Scalar::Util
 .
 
 $deps{'MASON'} = [ _( << '.') ];
@@ -113,9 +128,9 @@ HTML::Mason 1.16
 MLDBM
 Errno
 FreezeThaw
-Digest::MD5
+Digest::MD5 2.27
 CGI::Cookie 1.20
-Storable
+Storable 2.08
 Apache::Session 1.53
 .
 
@@ -138,25 +153,25 @@ WWW::Mechanize
 .
 
 $deps{'FASTCGI'} = [ _( << '.') ];
-CGI
+CGI 2.92
 FCGI
 CGI::Fast 
 .
 
 $deps{'SPEEDYCGI'} = [ _( << '.') ];
-CGI
+CGI 2.92
 CGI::SpeedyCGI
 .
 
 
 $deps{'MODPERL1'} = [ _( << '.') ];
-CGI
+CGI 2.92
 Apache::Request
-Apache::DBI
+Apache::DBI 0.92
 .
 
 $deps{'MODPERL2'} = [ _( << '.') ];
-CGI 2.89
+CGI 2.92
 Apache::DBI
 .
 
@@ -175,6 +190,23 @@ $deps{'POSTGRESQL'} = [ _( << '.') ];
 DBD::Pg
 .
 
+print "perl:\n";
+print "\t5.8.0";
+eval {require 5.008};
+if ($@) {
+print "...missing.\n";
+        eval {require 5.006001};
+        if ($@) {
+            print " RT is known to be non-functional on versions of perl older than 5.6.1. Please upgrade to 5.8.0 or newer";
+            die;
+        } else {
+            print " RT is not supported on perl 5.6.1\n";
+        }
+} else {
+        print "...found\n";
+
+}
+
 
 foreach my $type (keys %args)  {
 next unless ($type =~ /^with-(.*?)$/);
@@ -196,17 +228,17 @@ sub test_dep {
 	my $module = shift;
 	my $version = shift;
 
-	  print "\t$module $version";
-        eval "use $module $version" ;
-        if ($@) {
-	my $error = $@;
-	$error =~ s/\n(.*)$//s;
-	print "...MISSING\n";
-		print "\t\t$error\n" if $error =~ /this is only/;
+	print "\t$module $version";
+	eval "use $module $version" ;
+	if ($@) {
+		my $error = $@;
+		$error =~ s/\n(.*)$//s;
+		print "...MISSING\n";
+			print "\t\t$error\n" if $error =~ /this is only/;
 
-	return undef;
+		return undef;
 	} else {
-	print "...found\n";
+		print "...found\n";
 return 1;
 	}
 }
-- 
cgit v1.2.1


From fe27a640a86f59538bfe8bdcf40d138824cd0f88 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Mar 2004 02:21:17 +0000
Subject: suse install script

---
 install/suse/9.0/INSTALL | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/install/suse/9.0/INSTALL b/install/suse/9.0/INSTALL
index 85e392461..4e4414768 100644
--- a/install/suse/9.0/INSTALL
+++ b/install/suse/9.0/INSTALL
@@ -5,7 +5,48 @@
 # apt for SuSE howto: http://linux01.gwdg.de/apt4rpm/
 
 for file in ftp://ftp.gwdg.de/pub/linux/suse/apt/SuSE/9.0-i386/RPMS.suser-rbos/apt-0.5.5cnc6-rb6.i586.rpm ftp://ftp.gwdg.de/pub/linux/suse/apt/SuSE/9.0-i386/RPMS.suser-rbos/apt-libs-0.5.5cnc6-rb6.i586.rpm ftp://ftp.gwdg.de/pub/linux/suse/apt/SuSE/9.0-i386/RPMS.suser-rbos/lua-5.0-rb3.i586.rpm; do
-  curl -C - $file
+  curl -C - -o `basename $file` $file
 done
 
+rpm -i lua-5.0-rb3.i586.rpm
+rpm -i apt-libs-0.5.5cnc6-rb6.i586.rpm
+rpm -i apt-0.5.5cnc6-rb6.i586.rpm
+
+perl -pi.bak -e 's/386 update/386 base update/' /etc/apt/sources.list
+
+apt-get update; apt-get update
+
+apt-get install apache mod_ssl mod_perl perl-DBI perl-Msql-Mysql-modules perl-DBD-Pg perl-DateManip perl-HTML-Parser perl-HTML-Tagset perl-TimeDate perl-URI perl-libwww-perl perl-Apache-DBI perl-Apache-ASP perl-GD perl-MailTools perl-Tie-IxHash rsync postgresql postgresql-docs postgresql-libs postgresql-server postgresql-devel screen zsh lftp wget cvs make gcc
+
+perl -MCPAN -e"install DBD::Pg, Net::Whois, Business::CreditCard, \
+                       File::CounterFile, FreezeThaw, String::Approx, \
+                       Text::Template, DBIx::DataSource, DBIx::DBSchema, \
+                       Net::SSH, String::ShellQuote, Net::SCP, \
+                       Time::Duration, HTML::Widgets::SelectLayers, \
+                       Cache::Cache, Test::Pod, NetAddr::IP, IPC::ShareLite, \
+                       Chart::LinesPoints"
+
+/usr/sbin/useradd freeside
+
+/sbin/chkconfig postgresql on
+/etc/init.d/postgresql start
+
+/sbin/chkconfig apache on
+#/etc/init.d/apache start
+
+su postgres -c "createuser -P freeside"
+
+su freeside -c "createdb freeside"
+
+#?
+cd ../../..
+make install-perl-modules
+make create-config
+freeside-adduser -c -h /usr/local/etc/freeside/htpasswd ivan
+su freeside -c 'freeside-setup ivan'
+su freeside -c '/home/ivan/freeside/bin/populate-msgcat ivan'
+make deploy
+
+
+
 
-- 
cgit v1.2.1


From b03f1f4f2529ba82595a77f4cbef6a6a7f082b5c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Mar 2004 03:53:56 +0000
Subject: 1.5 stuff

---
 install/redhat/7.3/INSTALL | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/install/redhat/7.3/INSTALL b/install/redhat/7.3/INSTALL
index 6befc05f6..d2f60cbb5 100644
--- a/install/redhat/7.3/INSTALL
+++ b/install/redhat/7.3/INSTALL
@@ -6,6 +6,13 @@ cp sources.list /etc/apt/
 apt-get update; apt-get update
 apt-get install apache mod_ssl mod_perl perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-Digest-MD5 perl-HTML-Parser perl-HTML-Tagset perl-MIME-Base64 perl-Storable perl-TimeDate perl-URI perl-libnet perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs #openssh
 
+wget --passive-ftp --continue http://download.atrpms.net/production/packages/redhat-7.3-i386/atrpms/atrpms-51-1.rh7.3.at.noarch.rpm http://download.atrpms.net/production/packages/redhat-7.3-i386/atrpms/atrpms-package-config-51-1.rh7.3.at.noarch.rpm http://download.atrpms.net/production/packages/redhat-7.3-i386/atrpms/gd-2.0.15-1_6.rh7.3.at.i386.rpm http://download.atrpms.net/production/packages/redhat-7.3-i386/atrpms/gd-devel-2.0.15-1_6.rh7.3.at.i386.rpm http://download.atrpms.net/production/packages/redhat-7.3-i386/atrpms/perl-GD-2.11-7.rh7.3.at.i386.rpm
+
+#rpm -i atrpms-package-config-51-1.rh7.3.at.noarch.rpm
+rpm -i atrpms-51-1.rh7.3.at.noarch.rpm
+rpm -i gd-2.0.15-1_6.rh7.3.at.i386.rpm 
+rpm -i perl-GD-2.11-7.rh7.3.at.i386.rpm 
+
 perl -MCPAN -e"install Locale::Country, Net::Whois, Business::CreditCard, \
                        Mail::Internet, File::CounterFile, FreezeThaw, \
                        String::Approx, Text::Template, DBIx::DataSource, \
-- 
cgit v1.2.1


From 7fa84ef3ef04fe18608d85c8c3aa1f34fe824c6c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Mar 2004 04:17:51 +0000
Subject: incorrect listing in MANIFEST

---
 FS/MANIFEST | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 555509a41..23c59dbda 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -131,9 +131,9 @@ t/Conf.t
 t/ConfItem.t
 t/Misc.t
 t/Record.t
-t/Report.pm
-t/Report-Table.pm
-t/Report-Table-Monthly.pm
+t/Report.t
+t/Report-Table.t
+t/Report-Table-Monthly.t
 t/UID.t
 t/Msgcat.t
 t/SearchCache.t
-- 
cgit v1.2.1


From c959e1e7039535de9eed1afcdcc1adf3db9a0f9f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Mar 2004 07:33:55 +0000
Subject: update fs_passwd stuff as wrappers around self-service

---
 fs_passwd/fs_passwd        | 22 ++++++------
 fs_passwd/fs_passwd.cgi    | 17 +++++----
 fs_passwd/fs_passwd_server | 88 ----------------------------------------------
 fs_passwd/fs_passwdd       | 62 --------------------------------
 4 files changed, 20 insertions(+), 169 deletions(-)
 delete mode 100755 fs_passwd/fs_passwd_server
 delete mode 100755 fs_passwd/fs_passwdd

diff --git a/fs_passwd/fs_passwd b/fs_passwd/fs_passwd
index 0b467aefc..feddb462c 100755
--- a/fs_passwd/fs_passwd
+++ b/fs_passwd/fs_passwd
@@ -10,14 +10,14 @@
 #
 # password lengths 0,255 instead of 6,8 - we'll let the server process
 # check the data ivan@sisd.com 98-jul-17
+#
+# updated for the exciting new world of self-service 2004-mar-10
 
 use strict;
 use Getopt::Std;
-use Socket;
-use IO::Handle;
+use FS::SelfService qw(passwd);
 use vars qw($opt_f $opt_s);
 
-my($fs_passwdd_socket)="/usr/local/freeside/fs_passwdd_socket";
 my($freeside_uid)=scalar(getpwnam('freeside'));
 
 $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
@@ -114,13 +114,15 @@ print "\n";
 
 system '/bin/stty', 'echo'; 
 
-socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-connect(SOCK, sockaddr_un($fs_passwdd_socket)) or die "connect: $!";
-print SOCK join("\n",$me,$old_password,$new_password,$new_gecos,$new_shell),"\n";
-SOCK->flush;
-my($error);
-$error = <SOCK>;
-chop $error;
+my $rv = passwd(
+  'username'     => $me,
+  'old_password' => $old_password,
+  'new_password' => $new_password,
+  'new_gecos'    => $new_gecos,
+  'new_shell'    => $new_shell,
+);
+
+my $error = $rv->{error};
 
 if ($error) {
   print "\nUpdate error: $error\n";
diff --git a/fs_passwd/fs_passwd.cgi b/fs_passwd/fs_passwd.cgi
index 3f676fff3..34a33c7f5 100755
--- a/fs_passwd/fs_passwd.cgi
+++ b/fs_passwd/fs_passwd.cgi
@@ -2,12 +2,10 @@
 
 use strict;
 use Getopt::Std;
-use Socket;
-use IO::Handle;
+use FS::SelfService qw(passwd);
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 
-my $fs_passwdd_socket = "/usr/local/freeside/fs_passwdd_socket";
 my $freeside_uid = scalar(getpwnam('freeside'));
 
 $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
@@ -33,12 +31,13 @@ my $new_password = $1;
 die "New passwords don't match"
   unless $new_password eq $cgi->param('new_password2');
 
-socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-connect(SOCK, sockaddr_un($fs_passwdd_socket)) or die "connect: $!";
-print SOCK join("\n", $me, $old_password, $new_password, '', ''), "\n";
-SOCK->flush;
-my $error = <SOCK>;
-chomp $error;
+my $rv = passwd(
+  'username'     => $me,
+  'old_password' => $old_password,
+  'new_password' => $new_password,
+);
+
+my $error = $rv->{error};
 
 if ($error) {
   die $error;
diff --git a/fs_passwd/fs_passwd_server b/fs_passwd/fs_passwd_server
deleted file mode 100755
index a29b2c738..000000000
--- a/fs_passwd/fs_passwd_server
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# fs_passwd_server
-#
-# portions of this script are copied from the `passwd' script in the original
-# (perl 4) camel book, now archived at 
-# http://www.perl.com/CPAN/scripts/nutshell/ch6/passwd
-#
-# ivan@sisd.com 98-mar-9
-#
-# crypt-aware, s/password/_password/; ivan@sisd.com 98-aug-23
-
-use strict;
-use vars qw($pid);
-use subs qw(killssh);
-use IO::Handle;
-use Net::SSH qw(sshopen2);
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearchs);
-use FS::svc_acct;
-
-my $user = shift or die &usage;
-adminsuidsetup $user; 
-
-my($shellmachine)=shift or die &usage;
-
-#causing trouble for some folks
-#$SIG{CHLD} = sub { wait() };
-
-$SIG{HUP} = \&killssh;
-$SIG{INT} = \&killssh;
-$SIG{QUIT} = \&killssh;
-$SIG{TERM} = \&killssh;
-$SIG{PIPE} = \&killssh;
-
-sub killssh { kill 'TERM', $pid if $pid; exit; };
-
-my($fs_passwdd)="/usr/local/sbin/fs_passwdd";
-
-while (1) {
-  my($reader,$writer)=(new IO::Handle, new IO::Handle);
-  $writer->autoflush(1);
-  $pid = sshopen2($shellmachine,$reader,$writer,$fs_passwdd);
-  while (1) {
-    my($username,$old_password,$new_password,$new_gecos,$new_shell);
-    defined($username=<$reader>) or last;
-    defined($old_password=<$reader>) or last; 
-    defined($new_password=<$reader>) or last; 
-    defined($new_gecos=<$reader>) or last; 
-    defined($new_shell=<$reader>) or last; 
-    chop($username);
-    chop($old_password);
-    chop($new_password);
-    chop($new_gecos);
-    chop($new_shell);
-    my($svc_acct);
-
-    #need to try both $old_password and encrypted $old_password
-    #maybe the crypt function in svc_acct.export needs to be a library?
-    my $salt = substr($old_password,0,2);
-    my $cold_password = crypt($old_password,$salt);
-    $svc_acct=qsearchs('svc_acct',{'username'=>$username,
-                                   '_password'=>$old_password,
-    } )
-           || qsearchs('svc_acct',{'username'=>$username,
-                                   '_password'=>$cold_password,
-    } );
-    unless ( $svc_acct ) { print $writer "Incorrect password.\n"; next; }
-
-    my(%hash)=$svc_acct->hash;
-    my($new_svc_acct) = new FS::svc_acct ( \%hash );
-    $new_svc_acct->setfield('_password',$new_password) 
-      if $new_password && $new_password ne $old_password;
-    $new_svc_acct->setfield('finger',$new_gecos) if $new_gecos;
-    $new_svc_acct->setfield('shell',$new_shell) if $new_shell;
-    my($error)=$new_svc_acct->replace($svc_acct);
-    print $writer $error,"\n";
-  }
-  close $writer;
-  close $reader;
-  sleep 60;
-  warn "Connection to $shellmachine lost!  Reconnecting...\n";
-}
-
-sub usage {
-  die "Usage:\n\n  fs_passwd_server user shellmachine\n";
-}
-
diff --git a/fs_passwd/fs_passwdd b/fs_passwd/fs_passwdd
deleted file mode 100755
index cce98e787..000000000
--- a/fs_passwd/fs_passwdd
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# fs_passwdd
-#
-# This is run REMOTELY over ssh by fs_passwd_server.
-#
-# ivan@sisd.com 98-mar-9
-
-use strict;
-use Socket;
-
-my $fs_passwdd_socket = "/usr/local/freeside/fs_passwdd_socket";
-my $pid_file = "$fs_passwdd_socket.pid";
-
-$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
-$ENV{'SHELL'} = '/bin/sh';
-$ENV{'IFS'} = " \t\n";
-$ENV{'CDPATH'} = '';
-$ENV{'ENV'} = '';
-$ENV{'BASH_ENV'} = '';
-
-$|=1;
-
-my $uaddr = sockaddr_un($fs_passwdd_socket);
-my $proto = getprotobyname('tcp');
-
-socket(Server,PF_UNIX,SOCK_STREAM,0) or die "socket: $!";
-unlink($fs_passwdd_socket);
-bind(Server, $uaddr) or die "bind: $!";
-listen(Server,SOMAXCONN) or die "listen: $!";
-
-if ( -e $pid_file ) {
-  open(PIDFILE,"<$pid_file");
-  #chomp( my $old_pid = <PIDFILE> );
-  my $old_pid = <PIDFILE>;
-  close PIDFILE;
-  $old_pid =~ /^(\d+)$/;
-  kill 'TERM', $1;
-}
-open(PIDFILE,">$pid_file");
-print PIDFILE "$$\n";
-close PIDFILE;
-
-my($paddr);
-for ( ; $paddr = accept(Client,Server); close Client) {
-  my($me,$old_password,$new_password,$new_gecos,$new_shell);
-
-  $me=<Client>;
-  $old_password=<Client>;
-  $new_password=<Client>;
-  $new_gecos=<Client>;
-  $new_shell=<Client>;
-
-  print $me,$old_password,$new_password,$new_gecos,$new_shell;
-  my($error);
-
-  $error=<STDIN>;
-  
-  print Client $error;
-  close Client;
-}
-
-- 
cgit v1.2.1


From e2a2f2f1a1a793581de4222e582731e7a9692a6b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Mar 2004 08:54:52 +0000
Subject: turn down logging level

---
 FS/bin/freeside-selfservice-server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-selfservice-server b/FS/bin/freeside-selfservice-server
index 371a646b4..03c7135b2 100644
--- a/FS/bin/freeside-selfservice-server
+++ b/FS/bin/freeside-selfservice-server
@@ -24,7 +24,7 @@ use FS::Conf;
 use FS::cust_bill;
 use FS::cust_pkg;
 
-$Debug = 2; # >= 2 will log packet contents, including potentially compromising
+$Debug = 1; # >= 2 will log packet contents, including potentially compromising
             # information
 
 $shutdown = 0;
-- 
cgit v1.2.1


From c79e1e2cf34fa3b3680e3313f4cbd0a74f32e923 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Mar 2004 21:07:23 +0000
Subject: add typeset logo to conf dir and point invoice_latex at it by default

---
 conf/invoice_latex |    2 +-
 conf/logo.eps      | 4414 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 4415 insertions(+), 1 deletion(-)
 create mode 100644 conf/logo.eps

diff --git a/conf/invoice_latex b/conf/invoice_latex
index f63ab324f..195f8fbb2 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -68,7 +68,7 @@ $footer
 %%	UNCOMMENT the following FOUR lines and change the path if necssary to provide a logo
 \fancyhead[LO,LE]{
 \begin{tabular}{l}
-\includegraphics{/usr/local/etc/freeside/logo.eps}
+\includegraphics{/usr/local/etc/freeside/conf.DBI:Pg:dbname=freeside/logo.eps}
 \end{tabular}}
 %
 %%	The Heading comprising isue date, customer ref & INVOICE name
diff --git a/conf/logo.eps b/conf/logo.eps
new file mode 100644
index 000000000..ee348e182
--- /dev/null
+++ b/conf/logo.eps
@@ -0,0 +1,4414 @@
+%!PS-Adobe-3.1 EPSF-3.0
+%%Title: qis_logo.eps
+%%Creator: Adobe Illustrator(R) 9.0
+%%AI8_CreatorVersion: 9.0
%AI9_PrintingDataBegin
%%For: Home User
+%%CreationDate: 11/28/2003
+%%CropBox: 0.000000 0.000000 243.005371 50.068359
+%%BoundingBox: 0 0 244 51 
+%%HiResBoundingBox: 0.000000 0.000000 243.005371 50.068359
+%%LanguageLevel: 2 
+%%DocumentData: Clean7Bit
+%%Pages: 1 
+%%DocumentNeededResources: 
+%%DocumentSuppliedResources: procset Adobe_CoolType_Core 1.1 0
+%%+ procset Adobe_AGM_Core 2.0 0
+%%DocumentFonts: 
+%%DocumentSuppliedFonts: 
+%%PageOrder: Ascend
+%%DocumentProcessColors:  Black
+%%DocumentCustomColors: 
+%%CMYKCustomColor: 
+%%RGBCustomColor: 
+
+%%EndComments
+%%BeginDefaults
+%%EndDefaults
+%%BeginProlog
+%%BeginResource: procset Adobe_AGM_Core 2.0 0
+%%Version: 2.0 0
+%%Copyright: Copyright (C) 1997-1999 Adobe Systems, Inc.  All Rights Reserved.
+systemdict /setpacking known
+{
+	currentpacking
+	true setpacking
+} if
+userdict /Adobe_AGM_Core 233 dict dup begin put
+/nd{
+	null def
+}bind def
+/Adobe_AGM_Core_Id /Adobe_AGM_Core_2.0_0 def
+/AGMCORE_str256 256 string def
+/AGMCORE_src256 256 string def
+/AGMCORE_dst64 64 string def
+/AGMCORE_srcLen nd
+/AGMCORE_save nd
+/AGMCORE_graphicsave nd
+/AGMCORE_imagestring0 nd
+/AGMCORE_imagestring1 nd
+/AGMCORE_imagestring2 nd
+/AGMCORE_imagestring3 nd
+/AGMCORE_imagestring4 nd
+/AGMCORE_imagestring5 nd
+/AGMCORE_c 0 def
+/AGMCORE_m 0 def
+/AGMCORE_y 0 def
+/AGMCORE_k 0 def
+/AGMCORE_mbuf () def
+/AGMCORE_ybuf () def
+/AGMCORE_kbuf () def
+/AGMCORE_gbuf () def
+/AGMCORE_bbuf () def
+/AGMCORE_cmykbuf 4 array def
+/AGMCORE_screen [currentscreen] cvx def
+/AGMCORE_tmp 0 def
+/AGMCORE_arg1 nd
+/AGMCORE_arg2 nd
+/AGMCORE_&setgray nd
+/AGMCORE_&image nd
+/AGMCORE_&colorimage nd
+/AGMCORE_&imagemask nd
+/AGMCORE_&setcolor nd
+/AGMCORE_&setcolorspace nd
+/AGMCORE_&&setcolorspace nd
+/AGMCORE_cyan_plate nd
+/AGMCORE_magenta_plate nd
+/AGMCORE_yellow_plate nd
+/AGMCORE_black_plate nd
+/AGMCORE_plate_ndx nd
+/AGMCORE_get_ink_data nd
+/AGMCORE_is_cmyk_sep nd
+/AGMCORE_in_rip_sep nd
+/AGMCORE_host_sep nd
+/AGMCORE_will_host_sep nd
+/AGMCORE_avoid_L2_sep_space nd
+/AGMCORE_composite_job nd
+/AGMCORE_producing_seps nd
+/AGMCORE_ccimage_exists nd
+/AGMCORE_ps_level -1 def
+/AGMCORE_ps_version -1 def
+/AGMCORE_environ_ok nd
+/AGMCORE_CSA_cache 0 dict def
+/AGMCORE_CSD_cache 0 dict def
+/AGMCORE_pattern_cache 0 dict def
+/AGMCORE_currentoverprint false def
+/AGMCORE_deltaX nd
+/AGMCORE_deltaY nd
+/AGMCORE_name nd
+/AGMCORE_sep_special nd
+/AGMCORE_ndx nd
+/AGMCORE_err_strings nd
+/AGMCORE_cur_err nd
+/AGMCORE_ovp nd
+/AGMCORE_CRD_cache where{
+	pop
+}{
+	/AGMCORE_CRD_cache 0 dict def
+}ifelse
+/bdf
+{
+	bind def
+} bind def
+/xdf
+{
+	exch def
+} def
+/ldf 
+{
+	load def
+} def
+/ddf
+{
+	put
+} def	
+/xddf
+{
+	3 -1 roll put
+} def	
+/xpt
+{
+	exch put
+} def
+	/bdict
+	{
+		mark
+	} def
+	
+	/edict
+	{
+		counttomark 2 idiv dup dict begin {def} repeat pop currentdict end
+	}def
+	
+/ps_level
+	/languagelevel where{
+		pop languagelevel
+	}{
+		1
+	}ifelse
+def
+/level2 
+	ps_level 2 ge
+def
+/level3 
+	ps_level 3 ge
+def
+/ps_version
+	{version cvr} stopped {
+		-1
+	}if
+def
+/ndf
+{
+	1 index where{
+		pop pop pop
+	}{
+		dup xcheck
+		{bind}if
+		def
+	}ifelse
+} def
+/skip_image
+{
+	has_color ne{
+		dup 256 idiv
+		{currentfile AGMCORE_str256 readstring pop pop}repeat
+		currentfile AGMCORE_str256 0 4 -1 roll 256 mod getinterval
+		readstring pop pop
+	}{
+		pop
+	}ifelse
+} def
+/addprocs
+{
+     2{/exec load}repeat
+     3 1 roll
+     [ 5 1 roll ] bind cvx
+} def
+/colorbuf
+{
+	0 1 2 index length 1 sub
+		{
+		dup 2 index exch get 
+		255 exch sub 
+		2 index 
+		3 1 roll 
+		put
+		} for
+} def
+/makereadonlyarray
+{
+	/packedarray where
+		{pop packedarray}
+		{array astore readonly}
+	ifelse
+} def
+/getspotfunction
+{
+	AGMCORE_screen exch pop exch pop
+	dup type /dicttype eq 
+	{
+		dup /HalftoneType get 1 eq
+			{
+			/SpotFunction get
+			}
+			{
+			dup /HalftoneType get 2 eq
+				{
+				/GraySpotFunction get
+				}
+				{
+				pop
+				{abs exch abs 2 copy add 1 gt {1 sub dup mul exch 1 sub dup mul add 1 sub}
+				{dup mul exch dup mul add 1 exch sub}ifelse}bind
+				}
+			ifelse
+			}
+		ifelse
+	}
+	if
+} def
+/clp_npth
+{
+	clip newpath
+} def
+/eoclp_npth
+{
+	eoclip newpath
+} def
+/stkpath_clp_npth
+{
+	strokepath clip newpath
+} def
+/stk_n_clp_npth
+{
+	gsave stroke grestore clip newpath
+} def
+/npth_clp
+{
+	newpath clip
+} def
+/graphic_setup
+{
+	/AGMCORE_graphicsave save def
+	concat
+	0 setgray
+	0 setlinecap
+	0 setlinejoin
+	1 setlinewidth
+	[] 0 setdash
+	10 setmiterlimit
+	newpath
+	false setoverprint
+	false setstrokeadjust
+	userdict begin
+	/showpage {} def
+	mark
+} def
+/graphic_cleanup
+{
+	cleartomark
+	end
+	AGMCORE_graphicsave restore
+} def
+/compose_error_msg
+{
+	grestoreall initgraphics	
+	/Helvetica findfont 10 scalefont setfont
+	
+	/AGMCORE_deltaY 100 def
+	/AGMCORE_deltaX 310 def
+			
+	/AGMCORE_arg2 xdf
+	/AGMCORE_arg1 xdf
+	
+	clippath pathbbox newpath pop pop 36 add exch 36 add exch moveto
+	0 AGMCORE_deltaY rlineto AGMCORE_deltaX 0 rlineto
+	0 AGMCORE_deltaY neg rlineto AGMCORE_deltaX neg 0 rlineto closepath
+	0 AGMCORE_&setgray
+	gsave 1 AGMCORE_&setgray fill grestore 
+	1 setlinewidth gsave stroke grestore
+		
+	currentpoint AGMCORE_deltaY 15 sub add exch 8 add exch moveto
+	
+	/AGMCORE_deltaY 12 def
+	/AGMCORE_tmp 0 def
+	AGMCORE_err_strings exch get
+		{
+		dup 32 eq
+			{
+			pop
+			AGMCORE_str256 0 AGMCORE_tmp getinterval
+			dup (.) ne AGMCORE_arg1 0 lt and
+				{
+				pop
+				}
+				{
+				stringwidth pop currentpoint pop add AGMCORE_deltaX 28 add gt
+					{
+					currentpoint AGMCORE_deltaY sub exch pop
+					clippath pathbbox pop pop pop 44 add exch moveto
+					} if
+				AGMCORE_str256 0 AGMCORE_tmp getinterval show ( ) show
+				} ifelse
+			
+			0 1 AGMCORE_str256 length 1 sub
+				{
+				AGMCORE_str256 exch 0 put
+				}for
+			/AGMCORE_tmp 0 def
+			}
+			{
+			dup 94 eq 
+				{
+				pop
+				AGMCORE_arg1 0 ge
+					{
+					AGMCORE_arg1 AGMCORE_str256 cvs
+					dup /AGMCORE_tmp exch length def
+					AGMCORE_str256 exch 0 exch putinterval
+					AGMCORE_str256 0 AGMCORE_tmp getinterval
+					stringwidth pop currentpoint pop add AGMCORE_deltaX 28 add gt
+						{
+						currentpoint AGMCORE_deltaY sub exch pop
+						clippath pathbbox pop pop pop 44 add exch moveto
+						} if
+					AGMCORE_str256 0 AGMCORE_tmp getinterval show
+					}
+					{
+					/AGMCORE_arg1 0 def
+					} ifelse
+				0 1 AGMCORE_str256 length 1 sub
+					{
+					AGMCORE_str256 exch 0 put
+					}for
+				/AGMCORE_tmp 0 def
+				AGMCORE_arg1 0 ne
+					{
+					/AGMCORE_arg1 AGMCORE_arg2 def
+					} if
+				}
+				{
+				AGMCORE_str256 exch AGMCORE_tmp exch put
+				/AGMCORE_tmp AGMCORE_tmp 1 add def
+				}ifelse
+			} ifelse
+		} forall
+} bdf
+level2{
+	/AGMCORE_map_reserved_ink_name
+	{
+		dup type /stringtype eq{
+			dup /Red eq{
+				pop (_Red_)
+			}{
+				dup /Green eq{
+					pop (_Green_)
+				}{
+					dup /Blue eq{
+						pop (_Blue_)
+					}{
+						dup /Cyan eq{
+							pop (_Cyan_)
+						}{
+							dup /Magenta eq{
+								pop (_Magenta_)
+							}{
+								dup /Yellow eq{
+									pop (_Yellow_)
+								}{
+									dup /Black eq{
+										pop (_Black_)
+									}{
+										dup / eq{
+											pop (Process)
+										}if
+									}ifelse
+								}ifelse
+							}ifelse
+						}ifelse
+					}ifelse
+				}ifelse
+			}ifelse
+		}if
+	}def
+}if
+/doc_setup{
+	Adobe_AGM_Core begin
+	
+	/AGMCORE_will_host_separate xdf
+	/AGMCORE_ps_version xdf
+	/AGMCORE_ps_level xdf
+	
+	errordict /AGM_handleerror known not
+		{
+		errordict /AGM_handleerror errordict /handleerror get put
+		errordict /handleerror
+			{
+			Adobe_AGM_Core begin
+			$error /newerror get AGMCORE_cur_err null ne and {
+				$error /newerror false put
+				AGMCORE_cur_err /AGMCORE_bad_environ eq
+					{
+					/AGMCORE_bad_environ AGMCORE_ps_level AGMCORE_ps_version
+					}
+					{
+					AGMCORE_cur_err 0 0
+					} ifelse
+				compose_error_msg
+				} if
+			$error /newerror true put
+			end
+			errordict /AGM_handleerror get exec
+			} bind put
+		}if
+	/AGMCORE_environ_ok 
+		ps_level AGMCORE_ps_level ge
+		ps_version AGMCORE_ps_version ge and 
+		AGMCORE_ps_level -1 eq or
+	def
+	
+	AGMCORE_environ_ok not
+		{/AGMCORE_cur_err /AGMCORE_bad_environ def} if
+	
+	/AGMCORE_&setgray systemdict/setgray get def
+	level2{
+		/AGMCORE_&setcolor systemdict/setcolor get def
+		/AGMCORE_&setcolorspace systemdict/setcolorspace get def
+		/AGMCORE_&&setcolorspace /setcolorspace ldf
+	}if
+	/AGMCORE_&image systemdict/image get def
+	/AGMCORE_&imagemask systemdict/imagemask get def
+	/colorimage where{
+		pop
+		/AGMCORE_&colorimage /colorimage ldf
+	}if
+	/AGMCORE_in_rip_sep
+		level2{
+			currentpagedevice/Separations 2 copy known{
+				get
+			}{
+				pop pop false
+			}ifelse
+		}{
+			false
+		}ifelse
+	def
+	level2 not{
+		/xput{
+			dup load dup length exch maxlength eq{
+				dup dup load dup
+				length dup 0 eq {pop 1} if 2 mul dict copy def
+			}if
+			load begin
+				def
+ 			end
+		}def
+	}{
+		/xput{
+			load 3 1 roll put
+		}def
+	}ifelse
+	/AGMCORE_gstate_known{
+		where{
+			/Adobe_AGM_Core_Id known
+		}{
+			false
+		}ifelse
+	}ndf
+	/AGMCORE_GSTATE AGMCORE_gstate_known not{
+		/AGMCORE_GSTATE 21 dict def
+		/AGMCORE_tmpmatrix matrix def
+		/AGMCORE_gstack 32 array def
+		/AGMCORE_gstackptr 0 def
+		/AGMCORE_gstacksaveptr 0 def
+		/AGMCORE_gstackframekeys 7 def
+		/AGMCORE_&gsave /gsave ldf
+		/AGMCORE_&grestore /grestore ldf
+		/AGMCORE_&grestoreall /grestoreall ldf
+		/AGMCORE_&save /save ldf
+		/AGMCORE_gdictcopy {
+			begin
+			{ def } forall
+			end
+		}def
+		/AGMCORE_gput {
+			AGMCORE_gstack AGMCORE_gstackptr get
+			3 1 roll
+			put
+		}def
+		/AGMCORE_gget {
+			AGMCORE_gstack AGMCORE_gstackptr get
+			exch
+			get
+		}def
+		/gsave {
+			AGMCORE_&gsave
+			AGMCORE_gstack AGMCORE_gstackptr get
+			AGMCORE_gstackptr 1 add
+			dup 32 ge {limitcheck} if
+			Adobe_AGM_Core exch
+			/AGMCORE_gstackptr exch put
+			AGMCORE_gstack AGMCORE_gstackptr get
+			AGMCORE_gdictcopy
+		}def
+		/grestore {
+			AGMCORE_&grestore
+			AGMCORE_gstackptr 1 sub
+			dup AGMCORE_gstacksaveptr lt {1 add} if
+			Adobe_AGM_Core exch
+			/AGMCORE_gstackptr exch put
+		}def
+		/grestoreall {
+			AGMCORE_&grestoreall
+			Adobe_AGM_Core
+			/AGMCORE_gstackptr AGMCORE_gstacksaveptr put 
+		}def
+		/save {
+			AGMCORE_&save
+			AGMCORE_gstack AGMCORE_gstackptr get
+			AGMCORE_gstackptr 1 add
+			dup 32 ge {limitcheck} if
+			Adobe_AGM_Core begin
+				/AGMCORE_gstackptr exch def
+				/AGMCORE_gstacksaveptr AGMCORE_gstackptr def
+			end
+			AGMCORE_gstack AGMCORE_gstackptr get
+			AGMCORE_gdictcopy
+		}def
+		0 1 AGMCORE_gstack length 1 sub {
+				AGMCORE_gstack exch AGMCORE_gstackframekeys dict put
+		} for
+	}if
+	/currentcmykcolor [0 0 0 0] AGMCORE_gput
+	/currentstrokeadjust false AGMCORE_gput
+	/currentcolorspace [/DeviceGray] AGMCORE_gput
+	/sep_tint 0 AGMCORE_gput
+	/sep_colorspace_dict null AGMCORE_gput
+	/indexed_colorspace_dict null AGMCORE_gput
+	/currentcolor_intent () AGMCORE_gput
+	end
+}def
+/page_setup
+{
+	Adobe_AGM_Core begin
+	/setcmykcolor
+	{
+		4 copy AGMCORE_cmykbuf astore /currentcmykcolor exch AGMCORE_gput
+		1 sub 4 1 roll
+		3 {
+			3 index add neg dup 0 lt {
+				pop 0
+			} if
+			3 1 roll
+		} repeat
+		setrgbcolor pop
+	}ndf
+	/AGMCORE_ccimage_exists /customcolorimage where {pop true}{false} ifelse def
+	/currentcmykcolor
+	{
+		/currentcmykcolor AGMCORE_gget aload pop
+	}ndf
+	/setoverprint
+	{
+		pop
+	}ndf
+	/currentoverprint
+	{
+		false
+	}ndf
+	/AGMCORE_deviceDPI 72 0 matrix defaultmatrix dtransform dup mul exch dup mul add sqrt def
+	/AGMCORE_cyan_plate 1 0 0 0 test_cmyk_color_plate def
+	/AGMCORE_magenta_plate 0 1 0 0 test_cmyk_color_plate def
+	/AGMCORE_yellow_plate 0 0 1 0 test_cmyk_color_plate def
+	/AGMCORE_black_plate 0 0 0 1 test_cmyk_color_plate def
+	/AGMCORE_plate_ndx 
+		AGMCORE_cyan_plate{ 
+			0
+		}{
+			AGMCORE_magenta_plate{
+				1
+			}{
+				AGMCORE_yellow_plate{
+					2
+				}{
+					AGMCORE_black_plate{
+						3
+					}{
+						4
+					}ifelse
+				}ifelse
+			}ifelse
+		}ifelse
+		def
+	/AGMCORE_composite_job
+		AGMCORE_cyan_plate AGMCORE_magenta_plate and AGMCORE_yellow_plate and AGMCORE_black_plate and def
+	
+	/AGMCORE_producing_seps AGMCORE_composite_job not AGMCORE_in_rip_sep or def
+	
+	/AGMCORE_host_sep AGMCORE_producing_seps AGMCORE_in_rip_sep not and def
+	
+	/AGM_preserve_spots 
+		/AGM_preserve_spots where{
+			pop AGM_preserve_spots
+		}{
+			systemdict/setdistillerparams known product (Adobe PostScript Parser) ne and AGMCORE_producing_seps or
+		}ifelse
+	def
+	
+	AGMCORE_host_sep AGMCORE_will_host_separate not and {
+		/AGMCORE_cur_err /AGMCORE_color_space_onhost_seps def
+		AGMCORE_color_space_onhost_seps
+	}if
+	/AGMCORE_avoid_L2_sep_space  
+		version cvr 2012 lt 
+		level2 and 
+		AGMCORE_producing_seps not and
+	def
+	/AGMCORE_is_cmyk_sep
+		AGMCORE_cyan_plate AGMCORE_magenta_plate or AGMCORE_yellow_plate or AGMCORE_black_plate or
+	def
+	/AGM_avoid_0_cmyk where{
+		pop AGM_avoid_0_cmyk
+	}{
+		AGM_preserve_spots
+	}ifelse
+	{
+		/setcmykcolor[
+			{4 copy add add add 0 eq currentoverprint and{pop 0.0005}if}/exec cvx
+			/setcmykcolor load dup type/operatortype ne{/exec cvx}if
+		]cvx def
+	}if
+	AGMCORE_host_sep{
+		/AGMCORE_get_ink_data
+			AGMCORE_cyan_plate{
+				{pop pop pop}
+			}{
+			  	AGMCORE_magenta_plate{
+			  		{4 3 roll pop pop pop}
+			  	}{
+			  		AGMCORE_yellow_plate{
+			  			{4 2 roll pop pop pop}
+			  		}{
+			  			{4 1 roll pop pop pop}
+			  		}ifelse
+			  	}ifelse
+			}ifelse
+		def
+	}if
+	AGMCORE_in_rip_sep{
+		/setcustomcolor
+		{
+			exch aload pop
+			dup 7 1 roll inRip_spot_has_ink not	{ 
+				4 {4 index mul 4 1 roll}
+				repeat
+				/DeviceCMYK setcolorspace
+				6 -2 roll pop pop
+			}{ 
+				Adobe_AGM_Core begin
+					/AGMCORE_k xdf /AGMCORE_y xdf /AGMCORE_m xdf /AGMCORE_c xdf
+				end
+				[/Separation 4 -1 roll /DeviceCMYK
+				{dup AGMCORE_c mul exch dup AGMCORE_m mul exch dup AGMCORE_y mul exch AGMCORE_k mul}
+				]
+				setcolorspace
+			}ifelse
+			setcolor
+		}ndf
+		/setseparationgray
+		{
+			[/Separation (All) /DeviceGray {}] setcolorspace_opt
+			1 exch sub setcolor
+		}ndf
+	}{
+		/setseparationgray
+		{
+			AGMCORE_&setgray
+		}ndf
+	}ifelse
+	/findcmykcustomcolor
+	{
+		5 makereadonlyarray
+	}ndf
+	/setcustomcolor
+	{
+		exch aload pop pop
+		4 {4 index mul 4 1 roll} repeat
+		setcmykcolor pop
+	}ndf
+	
+	/has_color
+		/colorimage where{
+			AGMCORE_producing_seps{
+				pop true
+			}{
+				systemdict eq
+			}ifelse
+		}{
+			false
+		}ifelse
+	def
+	
+	/map_index
+	{
+		1 index mul exch getinterval {255 div} forall
+	}def
+	
+	level2{
+		/mo /moveto ldf
+		/ln /lineto ldf
+		/cv /curveto ldf
+		/knockout_unitsq
+		{
+			1 setgray
+			0 0 1 1 rectfill
+		}def
+		/level2ScreenFreq{
+			begin
+			60
+			HalftoneType 1 eq{
+				pop Frequency
+			}if
+			HalftoneType 2 eq{
+				pop GrayFrequency
+			}if
+			HalftoneType 5 eq{
+				pop Default level2ScreenFreq
+			}if
+			 end
+		}def
+		/currentScreenFreq{
+			currenthalftone level2ScreenFreq
+		}def
+		/invert_image_samples
+		{
+			Adobe_AGM_Core/AGMCORE_tmp Decode length ddf
+			/Decode [ Decode 1 get Decode 0 get] def
+		}def
+		/knockout_image_samples
+		{
+			Operator/imagemask ne{
+				/Decode [1 1] def
+			}if
+		}def
+		/get_gstate
+		{
+			AGMCORE_GSTATE begin
+			/AGMCORE_GSTATE_ctm AGMCORE_tmpmatrix currentmatrix def
+			/AGMCORE_GSTATE_clr_spc currentcolorspace def
+			/AGMCORE_GSTATE_clr_indx 0 def
+			/AGMCORE_GSTATE_clr_comps 12 array def
+			mark currentcolor counttomark
+				{AGMCORE_GSTATE_clr_comps AGMCORE_GSTATE_clr_indx 3 -1 roll put
+				/AGMCORE_GSTATE_clr_indx AGMCORE_GSTATE_clr_indx 1 add def} repeat pop
+			/AGMCORE_GSTATE_fnt rootfont def
+			/AGMCORE_GSTATE_lw currentlinewidth def
+			/AGMCORE_GSTATE_lc currentlinecap def
+			/AGMCORE_GSTATE_lj currentlinejoin def
+			/AGMCORE_GSTATE_ml currentmiterlimit def
+			currentdash /AGMCORE_GSTATE_do xdf /AGMCORE_GSTATE_da xdf
+			/AGMCORE_GSTATE_sa currentstrokeadjust def
+			
+			/AGMCORE_GSTATE_clr_rnd currentcolorrendering def
+			/AGMCORE_GSTATE_op currentoverprint def
+			/AGMCORE_GSTATE_bg currentblackgeneration cvlit def
+			/AGMCORE_GSTATE_ucr currentundercolorremoval cvlit def
+			currentcolortransfer 
+				cvlit /AGMCORE_GSTATE_gy_xfer xdf 
+				cvlit /AGMCORE_GSTATE_b_xfer xdf
+				cvlit /AGMCORE_GSTATE_g_xfer xdf 
+				cvlit /AGMCORE_GSTATE_r_xfer xdf
+			/AGMCORE_GSTATE_ht currenthalftone def
+			/AGMCORE_GSTATE_flt currentflat def
+			end
+		}ndf
+		
+		/set_gstate
+		{
+			AGMCORE_GSTATE begin
+			AGMCORE_GSTATE_ctm setmatrix
+			AGMCORE_GSTATE_clr_spc setcolorspace
+			AGMCORE_GSTATE_clr_indx {AGMCORE_GSTATE_clr_comps AGMCORE_GSTATE_clr_indx 1 sub get
+			/AGMCORE_GSTATE_clr_indx AGMCORE_GSTATE_clr_indx 1 sub def} repeat setcolor
+			AGMCORE_GSTATE_fnt setfont
+			AGMCORE_GSTATE_lw setlinewidth
+			AGMCORE_GSTATE_lc setlinecap
+			AGMCORE_GSTATE_lj setlinejoin
+			AGMCORE_GSTATE_ml setmiterlimit
+			AGMCORE_GSTATE_da AGMCORE_GSTATE_do setdash
+			AGMCORE_GSTATE_sa setstrokeadjust
+			
+			AGMCORE_GSTATE_clr_rnd setcolorrendering
+			AGMCORE_GSTATE_op setoverprint
+			AGMCORE_GSTATE_bg cvx setblackgeneration
+			AGMCORE_GSTATE_ucr cvx setundercolorremoval
+			AGMCORE_GSTATE_r_xfer cvx AGMCORE_GSTATE_g_xfer cvx AGMCORE_GSTATE_b_xfer cvx
+				AGMCORE_GSTATE_gy_xfer cvx setcolortransfer
+			AGMCORE_GSTATE_ht /HalftoneType get dup 9 eq exch 100 eq or
+				{
+				currenthalftone /HalftoneType get AGMCORE_GSTATE_ht /HalftoneType get ne
+					{
+					  mark AGMCORE_GSTATE_ht {sethalftone} stopped cleartomark
+					} if
+				}{
+				AGMCORE_GSTATE_ht sethalftone
+				} ifelse
+			AGMCORE_GSTATE_flt setflat
+			end
+		}ndf
+		AGMCORE_producing_seps not{
+	
+			/setcolorspace where{
+				/Adobe_AGM_Core_Id known not
+			}{
+				true
+			}ifelse
+			{
+				/setcolorspace
+				{
+					dup type dup /arraytype eq exch /packedarraytype eq or{
+						dup 0 get dup /Separation eq{
+							pop
+							[ exch {} forall ]
+							dup dup 1 get AGMCORE_map_reserved_ink_name 1 exch put
+						}{
+							/DeviceN eq {
+								[ exch {} forall ]
+								dup dup 1 get [ exch {AGMCORE_map_reserved_ink_name} forall ] 1 exch put
+							}if
+						}ifelse
+					}if
+					AGMCORE_&&setcolorspace 
+				}def
+			}if
+		}if	
+	}{
+		
+		/adj
+		{
+			currentstrokeadjust{
+				transform
+				0.25 sub round 0.25 add exch
+				0.25 sub round 0.25 add exch
+				itransform
+			}if
+		}def
+		/mo{
+			adj moveto
+		}def
+		/ln{
+			adj lineto
+		}def
+		/cv{
+			6 2 roll adj
+			6 2 roll adj
+			6 2 roll adj curveto
+		}def
+		/knockout_unitsq
+		{
+			1 setgray
+			8 8 1 [8 0 0 8 0 0] {<ffffffffffffffff>} image
+		}def
+		/currentstrokeadjust{
+			/currentstrokeadjust AGMCORE_gget
+		}def
+		/setstrokeadjust{
+			/currentstrokeadjust exch AGMCORE_gput
+		}def
+		/currentScreenFreq{
+			currentscreen pop pop
+		}def
+		/invert_image_samples
+		{
+			{1 exch sub} currenttransfer addprocs settransfer
+		}def
+		/knockout_image_samples
+		{
+			{ pop 1 } currenttransfer addprocs settransfer
+		}def
+		/setcolorspace
+		{
+			/currentcolorspace exch AGMCORE_gput
+		} def
+		
+		/currentcolorspace
+		{
+			/currentcolorspace AGMCORE_gget
+		} def
+		
+		/n_color_components
+		{
+			dup type /arraytype eq{
+				0 get
+			}if
+			dup /DeviceGray eq{
+				pop 1
+			}{
+				/DeviceCMYK eq{
+					4
+				}{
+					3
+				}ifelse
+			}ifelse
+		} def
+		
+		/setcolor_devicecolor
+		{
+			dup type /arraytype eq{
+				0 get
+			}if
+			dup /DeviceGray eq{
+				pop setgray
+			}{
+				/DeviceCMYK eq{
+					setcmykcolor
+				}{
+					setrgbcolor
+				}ifelse
+			}ifelse
+		}def
+	
+		/setcolor
+		{
+			currentcolorspace 0 get
+			dup /DeviceGray ne{
+				dup /DeviceCMYK ne{
+					dup /DeviceRGB ne{
+						dup /Separation eq{
+							pop
+							currentcolorspace 3 get exec
+							currentcolorspace 2 get
+						}{
+							dup /Indexed eq{
+								pop
+								currentcolorspace 3 get dup type /stringtype eq{
+									currentcolorspace 1 get n_color_components
+									3 -1 roll map_index
+								}{
+									exec
+								}ifelse
+								currentcolorspace 1 get
+							}{
+								/AGMCORE_cur_err /AGMCORE_invalid_color_space def
+								AGMCORE_invalid_color_space
+							}ifelse
+						}ifelse
+					}if
+				}if
+			}if
+			setcolor_devicecolor
+		} def
+	}ifelse
+	
+	/op /setoverprint ldf
+	/lw /setlinewidth ldf
+	/lc /setlinecap ldf
+	/lj /setlinejoin ldf
+	/ml /setmiterlimit ldf
+	/dsh /setdash ldf
+	/sadj /setstrokeadjust ldf
+	/gry /setgray ldf
+	/rgb /setrgbcolor ldf
+	/cmyk /setcmykcolor ldf
+	/sep /setsepcolor ldf
+	/idx /setindexedcolor ldf
+	/colr /setcolor ldf
+	/csacrd /set_csa_crd ldf
+	/sepcs /setsepcolorspace ldf
+	/idxcs /setindexedcolorspace ldf
+	/cp /closepath ldf
+	/clp /clp_npth ldf
+	/eclp /eoclp_npth ldf
+	/spclp /stkpath_clp_npth ldf
+	/f /fill ldf
+	/ef /eofill ldf
+	/s /stroke ldf
+	/sclp /stk_n_clp_npth ldf
+	/nclp /npth_clp ldf
+	/img /imageormask ldf
+	/sepimg /sep_imageormask ldf
+	/idximg /indexed_imageormask ldf
+	/gset /graphic_setup ldf
+	/gcln /graphic_cleanup ldf
+	
+	currentdict{
+		dup xcheck 1 index type dup /arraytype eq exch /packedarraytype eq or and {
+			bind
+		}if
+		def
+	}forall
+}def
+/page_trailer
+{
+	end
+}def
+/unload{
+	systemdict/languagelevel known{
+		systemdict/languagelevel get 2 ge{
+			userdict/Adobe_AGM_Core 2 copy known{
+				undef
+			}{
+				pop pop
+			}ifelse
+		}if
+	}if
+}def
+/doc_trailer{
+}def
+systemdict /findcolorrendering known{
+	/findcolorrendering systemdict /findcolorrendering get def
+}if
+systemdict /setcolorrendering known{
+	/setcolorrendering systemdict /setcolorrendering get def
+}if
+/test_cmyk_color_plate
+{
+	gsave
+	setcmykcolor currentgray 1 ne
+	grestore
+}def
+/inRip_spot_has_ink
+{
+	Adobe_AGM_Core/AGMCORE_name xddf
+	false
+	currentpagedevice/SeparationColorNames get{
+		AGMCORE_name eq or
+	}forall
+}def
+/current_ink
+{
+	dup length 0 eq{
+		pop true
+	}{
+		Adobe_AGM_Core/ink_result false put
+		{
+			dup /ProcessCyan eq{
+				AGMCORE_cyan_plate ink_result or Adobe_AGM_Core/ink_result xddf
+			}{
+				dup /ProcessMagenta eq{
+					AGMCORE_magenta_plate ink_result or Adobe_AGM_Core/ink_result xddf
+				}{
+					dup /ProcessYellow eq{
+						AGMCORE_yellow_plate ink_result or Adobe_AGM_Core/ink_result xddf
+					}{
+						dup /ProcessBlack eq{
+							AGMCORE_black_plate ink_result or Adobe_AGM_Core/ink_result xddf
+						}{
+							dup /sep_colorspace_dict AGMCORE_gget dup null eq{
+								pop false ink_result or Adobe_AGM_Core/ink_result xddf
+							}{
+								/Name get eq{
+									1 setsepcolor
+									currentgray 1 ne ink_result or Adobe_AGM_Core/ink_result xddf
+								}{
+									false ink_result or Adobe_AGM_Core/ink_result xddf
+								}ifelse
+							}ifelse
+						}ifelse
+					}ifelse
+				}ifelse
+			}ifelse
+			pop 
+		} forall
+		ink_result
+	}ifelse
+}def
+/map255_to_range
+{
+	1 index sub
+	3 -1 roll 255 div mul add
+}def
+/set_csa_crd
+{
+	/sep_colorspace_dict null AGMCORE_gput
+	begin
+		CSA map_csa setcolorspace_opt
+		set_crd
+	end
+}
+def
+/setsepcolor
+{ 
+	
+	/sep_colorspace_dict AGMCORE_gget begin
+		dup /sep_tint exch AGMCORE_gput
+		TintProc
+	end
+} def
+/sep_colorspace_proc
+{
+	Adobe_AGM_Core/AGMCORE_tmp xddf
+	/sep_colorspace_dict AGMCORE_gget begin
+	currentdict/Components known{
+		Components aload pop 
+		TintMethod/Lab eq{
+			2 {AGMCORE_tmp mul NComponents 1 roll} repeat
+			LMax sub AGMCORE_tmp mul LMax add  NComponents 1 roll
+		}{
+			TintMethod/Subtractive eq{
+				NComponents{
+					AGMCORE_tmp mul NComponents 1 roll
+				}repeat
+			}{
+				NComponents{
+					1 sub AGMCORE_tmp mul 1 add  NComponents 1 roll
+				} repeat
+			}ifelse
+		}ifelse
+	}{
+		ColorLookup AGMCORE_tmp ColorLookup length 1 sub mul round cvi get
+		aload pop
+	}ifelse
+	end
+} def
+/sep_colorspace_gray_proc
+{
+	Adobe_AGM_Core/AGMCORE_tmp xddf
+	/sep_colorspace_dict AGMCORE_gget begin
+	GrayLookup AGMCORE_tmp GrayLookup length 1 sub mul round cvi get
+	end
+} def
+/sep_proc_name
+{
+	dup 0 get 
+	dup /DeviceRGB eq exch /DeviceCMYK eq or level2 not and has_color not and{
+		pop [/DeviceGray]
+		/sep_colorspace_gray_proc
+	}{
+		/sep_colorspace_proc
+	}ifelse
+} def
+/setsepcolorspace
+{ 
+	dup /sep_colorspace_dict exch AGMCORE_gput
+	begin
+	/MappedCSA CSA map_csa def
+	Adobe_AGM_Core/AGMCORE_sep_special Name dup () eq exch (All) eq or ddf
+	
+	AGMCORE_avoid_L2_sep_space{
+		[/Indexed MappedCSA sep_proc_name 255 exch 
+			{ 255 div } /exec cvx 3 -1 roll [ 4 1 roll load /exec cvx ] cvx 
+		] setcolorspace_opt
+		/TintProc {
+			255 mul setcolor
+		}bdf
+	}{
+		MappedCSA 0 get /DeviceCMYK eq 
+		currentdict/Components known and 
+		AGMCORE_sep_special not and{
+			/TintProc [
+				Components aload pop Name findcmykcustomcolor 
+				/exch cvx /setcustomcolor cvx
+			] cvx bdf
+		}{
+ 			AGMCORE_host_sep Name (All) eq and{
+ 				/TintProc { 
+					1 exch sub setseparationgray 
+				}bdf
+ 			}{
+				AGMCORE_in_rip_sep MappedCSA 0 get /DeviceCMYK eq and 
+				AGMCORE_host_sep or
+				Name () eq and{
+					/TintProc [
+						MappedCSA sep_proc_name exch 0 get /DeviceCMYK eq{
+							cvx /setcmykcolor cvx
+						}{
+							cvx /setgray cvx
+						}ifelse
+					] cvx bdf
+				}{
+					AGMCORE_producing_seps MappedCSA 0 get dup /DeviceCMYK eq exch /DeviceGray eq or and AGMCORE_sep_special not and{
+	 					/TintProc [
+							/dup cvx
+							MappedCSA sep_proc_name cvx exch
+							0 get /DeviceGray eq{
+								1 /exch cvx /sub cvx 0 0 0 4 -1 /roll cvx
+							}if
+							/Name cvx /findcmykcustomcolor cvx /exch cvx
+							
+							AGMCORE_host_sep{
+								AGMCORE_is_cmyk_sep
+							}{
+								Name inRip_spot_has_ink not
+							}ifelse
+							{
+		 						/pop cvx 1
+							}if
+							/setcustomcolor cvx
+						] cvx bdf
+ 					}{ 
+						/TintProc /setcolor ldf
+						
+						[/Separation Name MappedCSA sep_proc_name load ] setcolorspace_opt
+					}ifelse
+				}ifelse
+			}ifelse
+		}ifelse
+	}ifelse
+	set_crd
+	1 setsepcolor
+	end
+} def
+/setindexedcolorspace
+{
+	dup /indexed_colorspace_dict exch AGMCORE_gput
+	begin
+		/MappedCSA CSA map_csa def
+		AGMCORE_host_sep level2 not and{
+			0 0 0 0 setcmykcolor
+		}{
+			[/Indexed MappedCSA 
+			level2 not has_color not and{
+				dup 0 get dup /DeviceRGB eq exch /DeviceCMYK eq or{
+					pop [/DeviceGray]
+				}if
+				HiVal GrayLookup
+			}{
+				HiVal 
+				currentdict/RangeArray known{
+					{ 
+						/indexed_colorspace_dict AGMCORE_gget begin
+						Lookup exch 
+						dup HiVal gt{
+							pop HiVal
+						}if
+						NComponents mul NComponents getinterval {} forall
+						NComponents 1 sub -1 0{
+							RangeArray exch 2 mul 2 getinterval aload pop map255_to_range
+							NComponents 1 roll
+						}for
+						end
+					} bind
+				}{
+					Lookup
+				}ifelse
+			}ifelse
+			] setcolorspace_opt
+			
+			set_crd
+		}ifelse
+	end
+}def
+/setindexedcolor
+{
+	AGMCORE_host_sep{
+		/indexed_colorspace_dict AGMCORE_gget/Lookup get 4 3 -1 roll map_index setcmykcolor
+	}{
+		setcolor
+	}ifelse
+} def
+/imageormask_sys
+{
+	begin
+		save mark
+		level2{
+			currentdict
+			Operator /imagemask eq{
+				AGMCORE_&imagemask
+			}{
+				AGMCORE_&image
+			}ifelse
+		}{
+			Width Height
+			Operator /imagemask eq{
+				Decode 0 get 1 eq Decode 1 get 0 eq	and
+				ImageMatrix /DataSource load
+				AGMCORE_&imagemask
+			}{
+				BitsPerComponent ImageMatrix /DataSource load
+				AGMCORE_&image
+			}ifelse
+		}ifelse
+		cleartomark restore
+	end
+}def
+/overprint_plate
+{
+	currentoverprint{
+		0 get
+		dup /DeviceGray eq{
+			pop AGMCORE_black_plate not
+		}{
+			/DeviceCMYK eq{
+				AGMCORE_is_cmyk_sep not
+			}if
+		}ifelse
+	}{
+		false
+	}ifelse
+}def
+/rdline {
+	currentfile AGMCORE_str256 readline pop
+} def
+/rdcmntline {
+	currentfile AGMCORE_str256 readline pop
+	(%) anchorsearch {pop} if
+} def
+/filter_cmyk
+{	
+	dup type /filetype ne{
+		0 () /SubFileDecode filter
+	}if
+	[
+	exch
+	{
+		AGMCORE_src256 readstring pop
+		dup length /AGMCORE_srcLen exch def
+		/AGMCORE_ndx 0 def
+		
+		AGMCORE_plate_ndx 4 AGMCORE_srcLen 1 sub{
+			1 index exch get
+			AGMCORE_dst64 AGMCORE_ndx 3 -1 roll put
+			/AGMCORE_ndx AGMCORE_ndx 1 add def
+		}for
+		pop
+		AGMCORE_dst64 0 AGMCORE_ndx getinterval
+	}
+	bind
+	/exec cvx
+	] cvx
+} def
+/imageormask
+{
+	begin
+		SkipImageProc not{
+			save mark
+			level2 AGMCORE_host_sep not and{
+				currentdict
+				Operator /imagemask eq{
+					imagemask
+				}{
+					AGMCORE_in_rip_sep currentoverprint and currentcolorspace 0 get /DeviceGray eq and{
+						[/Separation /Black /DeviceGray {}] setcolorspace
+						/Decode [ Decode 1 get Decode 0 get ] def
+					}if
+					image
+				}ifelse
+			}{
+				Width Height
+				Operator /imagemask eq{
+					Decode 0 get 1 eq Decode 1 get 0 eq	and
+					ImageMatrix /DataSource load
+					AGMCORE_host_sep{
+						currentgray 1 ne{
+							currentdict imageormask_sys
+						}{
+	 						currentoverprint not{
+			 					1 AGMCORE_&setgray
+	 							knockout_image_samples
+			 					currentdict imageormask_sys
+			 				}{
+			 					nulldevice currentdict imageormask_sys
+			 				}ifelse
+				 		}ifelse
+					}{
+						imagemask
+					}ifelse
+				}{
+					BitsPerComponent ImageMatrix 
+					MultipleDataSources{
+						0 1 NComponents 1 sub{
+							DataSource exch get
+						}for
+					}{
+						/DataSource load
+					}ifelse
+					Operator /colorimage eq{
+						AGMCORE_host_sep{
+							MultipleDataSources level2 or NComponents 4 eq and{
+								MultipleDataSources{
+									4 {pop} repeat
+									/DataSource [
+										DataSource 0 get /exec cvx
+										DataSource 1 get /exec cvx
+										DataSource 2 get /exec cvx
+										DataSource 3 get /exec cvx
+										/AGMCORE_get_ink_data cvx
+									] cvx def
+								}{
+									/DataSource /DataSource load filter_cmyk 0 () /SubFileDecode filter def
+								}ifelse
+	
+								/Decode [ Decode 0 get Decode 1 get ] def
+								/MultipleDataSources false def
+								/NComponents 1 def
+								/Operator /image def
+								AGMCORE_is_cmyk_sep{
+									currentoverprint InksUsed current_ink not and{
+										nulldevice
+									}{
+										invert_image_samples
+									}ifelse
+								}{
+		 							currentoverprint not{
+		 								knockout_image_samples
+				 					}{
+				 						nulldevice
+				 					}ifelse
+					 			}ifelse
+						 		1 AGMCORE_&setgray
+								currentdict imageormask_sys
+							}{
+									
+								currentcolortransfer
+								{pop 1} exch addprocs 4 1 roll				
+								{pop 1} exch addprocs 4 1 roll
+								{pop 1} exch addprocs 4 1 roll
+								{pop 1} exch addprocs 4 1 roll
+								setcolortransfer
+									
+								MultipleDataSources NComponents AGMCORE_&colorimage						
+							}ifelse
+						}{
+							true NComponents colorimage
+						}ifelse
+					}{
+						Operator /image eq{
+							AGMCORE_host_sep{
+								HostSepColorImage{
+									invert_image_samples
+								}{
+									AGMCORE_black_plate not{
+		 								currentoverprint not{
+		 									knockout_image_samples
+				 						}{
+				 							nulldevice
+				 						}ifelse
+					 				}if
+								}ifelse
+						 		1 AGMCORE_&setgray
+								currentdict imageormask_sys
+							}{
+								image
+							}ifelse
+						}{
+							Operator/knockout eq{
+								pop pop pop pop pop
+								currentoverprint InksUsed current_ink not and{
+								}{
+									currentcolorspace overprint_plate not{
+										knockout_unitsq
+									}if
+								}ifelse
+							}if
+						}ifelse
+					}ifelse
+				}ifelse
+			}ifelse
+			cleartomark restore
+		}if
+	end
+}def
+/tint_image_to_color
+{
+	begin
+		Width Height BitsPerComponent ImageMatrix 
+		/DataSource load
+	end
+	Adobe_AGM_Core begin
+		/AGMCORE_mbuf 0 string def
+		/AGMCORE_ybuf 0 string def
+		/AGMCORE_kbuf 0 string def
+		{
+			colorbuf dup length AGMCORE_mbuf length ne
+				{
+				dup length dup dup
+				/AGMCORE_mbuf exch string def
+				/AGMCORE_ybuf exch string def
+				/AGMCORE_kbuf exch string def
+				} if
+			dup AGMCORE_mbuf copy AGMCORE_ybuf copy AGMCORE_kbuf copy pop
+		}
+		addprocs
+		{AGMCORE_mbuf}{AGMCORE_ybuf}{AGMCORE_kbuf} true 4 colorimage	
+	end
+} def			
+/sep_imageormask_lev1
+{
+	begin
+		MappedCSA 0 get dup /DeviceRGB eq exch /DeviceCMYK eq or has_color not and{
+			
+			{
+				255 mul round cvi GrayLookup exch get
+			} currenttransfer addprocs settransfer
+			currentdict imageormask
+		}{
+			/sep_colorspace_dict AGMCORE_gget/Components known{
+				MappedCSA 0 get /DeviceCMYK eq{
+					Components aload pop
+				}{
+					0 0 0 Components aload pop 1 exch sub
+				}ifelse
+				
+				Adobe_AGM_Core/AGMCORE_k xddf 
+				Adobe_AGM_Core/AGMCORE_y xddf 
+				Adobe_AGM_Core/AGMCORE_m xddf 
+				Adobe_AGM_Core/AGMCORE_c xddf 
+					
+				AGMCORE_y 0.0 eq AGMCORE_m 0.0 eq and AGMCORE_c 0.0 eq and{
+					{AGMCORE_k mul 1 exch sub} currenttransfer addprocs settransfer
+					currentdict imageormask
+				}{ 
+					
+					currentcolortransfer
+					{AGMCORE_k mul 1 exch sub} exch addprocs 4 1 roll
+					{AGMCORE_y mul 1 exch sub} exch addprocs 4 1 roll
+					{AGMCORE_m mul 1 exch sub} exch addprocs 4 1 roll
+					{AGMCORE_c mul 1 exch sub} exch addprocs 4 1 roll
+					setcolortransfer
+					currentdict tint_image_to_color
+				}ifelse
+			}{
+				
+				MappedCSA 0 get /DeviceGray eq {
+					{255 mul round cvi ColorLookup exch get 0 get} currenttransfer addprocs settransfer
+					currentdict imageormask
+				}{
+					MappedCSA 0 get /DeviceCMYK eq {
+						currentcolortransfer
+						{255 mul round cvi ColorLookup exch get 3 get 1 exch sub} exch addprocs 4 1 roll
+						{255 mul round cvi ColorLookup exch get 2 get 1 exch sub} exch addprocs 4 1 roll
+						{255 mul round cvi ColorLookup exch get 1 get 1 exch sub} exch addprocs 4 1 roll
+						{255 mul round cvi ColorLookup exch get 0 get 1 exch sub} exch addprocs 4 1 roll
+						setcolortransfer 
+						currentdict tint_image_to_color
+					}{ 
+						currentcolortransfer
+						{pop 1} exch addprocs 4 1 roll
+						{255 mul round cvi ColorLookup exch get 2 get} exch addprocs 4 1 roll
+						{255 mul round cvi ColorLookup exch get 1 get} exch addprocs 4 1 roll
+						{255 mul round cvi ColorLookup exch get 0 get} exch addprocs 4 1 roll
+						setcolortransfer 
+						currentdict tint_image_to_color
+					}ifelse
+				}ifelse
+			}ifelse
+		}ifelse
+	end
+}def
+/sep_image_lev1_sep
+{
+	begin
+		/sep_colorspace_dict AGMCORE_gget/Components known{
+			Components aload pop
+			
+			Adobe_AGM_Core/AGMCORE_k xddf 
+			Adobe_AGM_Core/AGMCORE_y xddf 
+			Adobe_AGM_Core/AGMCORE_m xddf 
+			Adobe_AGM_Core/AGMCORE_c xddf 
+				
+			{AGMCORE_c mul 1 exch sub}
+			{AGMCORE_m mul 1 exch sub}
+			{AGMCORE_y mul 1 exch sub}
+			{AGMCORE_k mul 1 exch sub}
+		}{ 
+			{255 mul round cvi ColorLookup exch get 0 get 1 exch sub}
+			{255 mul round cvi ColorLookup exch get 1 get 1 exch sub}
+			{255 mul round cvi ColorLookup exch get 2 get 1 exch sub}
+			{255 mul round cvi ColorLookup exch get 3 get 1 exch sub}
+		}ifelse
+		
+		AGMCORE_get_ink_data currenttransfer addprocs settransfer
+		
+		currentdict imageormask_sys
+			
+	end
+}def
+/sep_imageormask
+{
+ 	/sep_colorspace_dict AGMCORE_gget begin
+	/MappedCSA CSA map_csa def
+	begin
+	SkipImageProc not{
+		save mark 
+	
+		AGMCORE_avoid_L2_sep_space{
+			/Decode [ Decode 0 get 255 mul Decode 1 get 255 mul ] def
+		}if
+ 		AGMCORE_ccimage_exists 
+		MappedCSA 0 get /DeviceCMYK eq and
+		currentdict/Components known and 
+		Name () ne and 
+		Name (All) ne and 
+		Operator /image eq and
+		AGMCORE_producing_seps not and
+		level2 not and
+		{
+			Width Height BitsPerComponent ImageMatrix 
+			[
+			/DataSource load /exec cvx
+			{
+				0 1 2 index length 1 sub{
+					1 index exch
+					2 copy get 255 xor put
+				}for
+			} /exec cvx
+			] cvx bind
+			MappedCSA 0 get /DeviceCMYK eq{
+				Components aload pop
+			}{
+				0 0 0 Components aload pop 1 exch sub
+			}ifelse
+			Name findcmykcustomcolor
+			customcolorimage
+		}{
+			AGMCORE_producing_seps not{
+				level2{
+					AGMCORE_avoid_L2_sep_space not currentcolorspace 0 get /Separation ne and{
+						[/Separation Name MappedCSA sep_proc_name load ] setcolorspace_opt
+						/sep_tint AGMCORE_gget setcolor
+					}if
+					currentdict imageormask
+				}{ 
+					currentdict
+					Operator /imagemask eq{
+						imageormask
+					}{
+						sep_imageormask_lev1
+					}ifelse
+				}ifelse
+ 			}{
+				AGMCORE_host_sep{
+					Operator/knockout eq{
+						currentoverprint InksUsed current_ink not and{
+						}{
+							currentdict/ImageMatrix get concat
+							knockout_unitsq
+						}ifelse
+					}{
+						currentgray 1 ne{
+ 							AGMCORE_is_cmyk_sep Name (All) ne and{
+ 								level2{
+	 								[ /Separation Name [/DeviceGray]
+	 								{ 
+	 									sep_colorspace_proc AGMCORE_get_ink_data
+										1 exch sub
+	 								} bind
+									] AGMCORE_&setcolorspace
+									/sep_tint AGMCORE_gget AGMCORE_&setcolor
+ 									currentdict imageormask_sys
+	 							}{
+	 								currentdict
+									Operator /imagemask eq{
+										imageormask_sys
+									}{
+										sep_image_lev1_sep
+									}ifelse
+	 							}ifelse
+ 							}{
+ 								Operator/imagemask ne{
+									invert_image_samples
+ 								}if
+		 						currentdict imageormask_sys
+ 							}ifelse
+ 						}{
+ 							currentoverprint not Name (All) eq or{
+ 								knockout_image_samples
+		 					}{
+		 						nulldevice 
+		 					}ifelse
+							currentdict imageormask_sys
+ 						}ifelse
+		 			}ifelse
+ 				}{
+					currentcolorspace 0 get /Separation ne{
+						[/Separation Name MappedCSA sep_proc_name load ] setcolorspace_opt
+						/sep_tint AGMCORE_gget setcolor
+					}if
+					currentoverprint 
+					MappedCSA 0 get /DeviceCMYK eq and 
+					Name inRip_spot_has_ink not and 
+					Name (All) ne and {
+						imageormask_l2_overprint
+					}{
+						currentdict imageormask
+ 					}ifelse
+				}ifelse
+			}ifelse
+		}ifelse
+		cleartomark restore
+	}if
+	end
+	end
+}def
+/modify_halftone_xfer
+{
+	currenthalftone dup length dict copy begin
+    currentdict 2 index known{
+    	1 index load dup length dict copy begin
+		currentdict/TransferFunction known{
+			/TransferFunction load
+		}{
+			currenttransfer
+		}ifelse
+	    addprocs /TransferFunction xdf 
+	    currentdict end def
+		currentdict end sethalftone
+	}{ 
+		currentdict/TransferFunction known{
+			/TransferFunction load 
+		}{
+			currenttransfer
+		}ifelse
+		addprocs /TransferFunction xdf
+		currentdict end sethalftone		
+		pop
+	}ifelse
+}def
+/read_image_file
+{
+	AGMCORE_imagefile 0 setfileposition
+	dup /DataSource {AGMCORE_imagefile AGMCORE_imbuf readstring pop} put
+	exch
+	load exec
+}def
+/write_image_file
+{
+	{ (AGMCORE_imagefile) (w+) file } stopped{
+		false
+	}{
+		Adobe_AGM_Core/AGMCORE_imagefile xddf 
+		Adobe_AGM_Core/AGMCORE_imbuf Width BitsPerComponent mul 7 add 8 idiv string ddf
+		1 1 Height { 
+			pop
+			DataSource dup type /filetype eq{
+				AGMCORE_imbuf readstring pop
+			}{
+				exec
+			} ifelse
+			AGMCORE_imagefile exch writestring
+		}for
+		true
+	}ifelse
+}def
+/imageormask_l2_overprint
+{
+	write_image_file{
+		currentcmykcolor
+		0 ne{
+			[/Separation /Black /DeviceGray {}] setcolorspace
+			gsave
+			/Black
+			[{1 exch sub /sep_tint AGMCORE_gget mul} /exec cvx MappedCSA sep_proc_name cvx exch pop {4 1 roll pop pop pop 1 exch sub} /exec cvx]
+			cvx modify_halftone_xfer
+			Operator currentdict read_image_file
+			grestore
+		}if
+		0 ne{
+			[/Separation /Yellow /DeviceGray {}] setcolorspace
+			gsave
+			/Yellow
+			[{1 exch sub /sep_tint AGMCORE_gget mul} /exec cvx MappedCSA sep_proc_name cvx exch pop {4 2 roll pop pop pop 1 exch sub} /exec cvx]
+			cvx modify_halftone_xfer
+			Operator currentdict read_image_file
+			grestore
+		}if
+		0 ne{
+			[/Separation /Magenta /DeviceGray {}] setcolorspace
+			gsave
+			/Magenta
+			[{1 exch sub /sep_tint AGMCORE_gget mul} /exec cvx MappedCSA sep_proc_name cvx exch pop {4 3 roll pop pop pop 1 exch sub} /exec cvx]
+			cvx modify_halftone_xfer
+			Operator currentdict read_image_file
+			grestore
+		}if
+		0 ne{
+			[/Separation /Cyan /DeviceGray {}] setcolorspace
+			gsave
+			/Cyan 
+			[{1 exch sub /sep_tint AGMCORE_gget mul} /exec cvx MappedCSA sep_proc_name cvx exch pop {pop pop pop 1 exch sub} /exec cvx]
+			cvx modify_halftone_xfer
+			Operator currentdict read_image_file
+			grestore
+		} if
+		AGMCORE_imagefile closefile (AGMCORE_imagefile) deletefile
+	}{
+		currentdict imageormask
+	}ifelse
+} def
+/indexed_imageormask
+{
+	begin
+		save mark 
+	
+ 		currentdict
+ 		AGMCORE_host_sep{
+ 			
+			Operator/knockout eq{
+				/indexed_colorspace_dict AGMCORE_gget /CSA get map_csa overprint_plate not{
+					knockout_unitsq
+				}if
+			}{
+	 			AGMCORE_is_cmyk_sep{
+					Operator /imagemask eq{
+						imageormask_sys
+					}{
+						level2{
+							indexed_image_lev2_sep
+						}{
+							indexed_image_lev1_sep
+						}ifelse
+					}ifelse
+				}{
+					currentoverprint not{
+						knockout_image_samples
+		 				imageormask_sys
+		 			}{
+		 				nulldevice currentdict imageormask_sys
+		 			}ifelse
+				}ifelse
+			}ifelse
+ 		}{
+			level2{
+				imageormask
+			}{ 
+				Operator /imagemask eq{
+					imageormask
+				}{
+					indexed_imageormask_lev1
+				}ifelse
+			}ifelse
+ 		}ifelse
+		cleartomark restore
+	end
+}def
+/indexed_imageormask_lev1
+{
+	/indexed_colorspace_dict AGMCORE_gget begin
+	begin
+		currentdict
+		MappedCSA 0 get dup /DeviceRGB eq exch /DeviceCMYK eq or has_color not and{
+			
+			{HiVal mul round cvi GrayLookup exch get HiVal div} currenttransfer addprocs settransfer
+			imageormask
+		}{
+			
+			MappedCSA 0 get /DeviceGray eq {
+				{HiVal mul round cvi Lookup exch get HiVal div} currenttransfer addprocs settransfer
+				imageormask
+			}{
+				MappedCSA 0 get /DeviceCMYK eq {
+					currentcolortransfer
+					{4 mul HiVal mul round cvi 3 add Lookup exch get HiVal div 1 exch sub} exch addprocs 4 1 roll
+					{4 mul HiVal mul round cvi 2 add Lookup exch get HiVal div 1 exch sub} exch addprocs 4 1 roll
+					{4 mul HiVal mul round cvi 1 add Lookup exch get HiVal div 1 exch sub} exch addprocs 4 1 roll
+					{4 mul HiVal mul round cvi       Lookup exch get HiVal div 1 exch sub} exch addprocs 4 1 roll
+					setcolortransfer 
+					tint_image_to_color
+				}{ 
+					currentcolortransfer
+					{pop 1} exch addprocs 4 1 roll
+					{3 mul HiVal mul round cvi 2 add Lookup exch get HiVal div} exch addprocs 4 1 roll
+					{3 mul HiVal mul round cvi 1 add Lookup exch get HiVal div} exch addprocs 4 1 roll
+					{3 mul HiVal mul round cvi 	   Lookup exch get HiVal div} exch addprocs 4 1 roll
+					setcolortransfer 
+					tint_image_to_color
+				}ifelse
+			}ifelse
+		}ifelse
+	end end
+}def
+/indexed_image_lev1_sep
+{
+	/indexed_colorspace_dict AGMCORE_gget begin
+	begin
+		{4 mul HiVal mul round cvi       Lookup exch get HiVal div 1 exch sub}
+		{4 mul HiVal mul round cvi 1 add Lookup exch get HiVal div 1 exch sub}
+		{4 mul HiVal mul round cvi 2 add Lookup exch get HiVal div 1 exch sub}
+		{4 mul HiVal mul round cvi 3 add Lookup exch get HiVal div 1 exch sub}
+		
+		AGMCORE_get_ink_data currenttransfer addprocs settransfer
+		
+		currentdict imageormask_sys
+			
+	end end
+}def
+/indexed_image_lev2_sep
+{
+	/indexed_colorspace_dict AGMCORE_gget begin
+	begin
+		
+		currentcolorspace 
+		dup 1 /DeviceGray put
+		dup 3 [
+			currentcolorspace 3 get 
+			{
+				exch 4 mul 4 getinterval {} forall
+				AGMCORE_get_ink_data 255 div 1 exch sub
+			} /exec cvx
+		] cvx put
+		setcolorspace
+		
+		currentdict 
+		Operator /imagemask eq{
+			AGMCORE_&imagemask
+		}{
+			AGMCORE_&image
+		}ifelse
+			
+	end end
+}def
+/add_csa
+{
+	Adobe_AGM_Core begin
+			/AGMCORE_CSA_cache xput
+	end
+}def
+/map_csa
+{
+	dup type /nametype eq{
+		Adobe_AGM_Core/AGMCORE_CSA_cache get exch get
+	}if
+}def
+/add_csd
+{
+	Adobe_AGM_Core begin
+		/AGMCORE_CSD_cache xput
+	end
+}def
+/get_csd
+{
+	dup type /nametype eq{
+		Adobe_AGM_Core/AGMCORE_CSD_cache get exch get
+	}if
+}def
+/add_pattern
+{
+	Adobe_AGM_Core begin
+		/AGMCORE_pattern_cache xput
+	end
+}def
+/get_pattern
+{
+	dup type /nametype eq{
+		Adobe_AGM_Core/AGMCORE_pattern_cache get exch get
+	}if
+}def
+/set_pattern
+{
+	dup /PatternType get 1 eq{
+		dup /PaintType get 1 eq{
+			false op [/DeviceGray] setcolorspace 0 setgray
+		}if
+	}if
+	setpattern
+}def
+/setcolorspace_opt
+{
+	dup currentcolorspace eq{
+		pop
+	}{
+		setcolorspace
+	}ifelse
+}def
+/updatecolorrendering
+{
+	
+	currentcolorrendering/Intent known{
+		currentcolorrendering/Intent get
+	}{
+		null
+	}ifelse
+	
+	Intent ne{
+		false  
+		Intent
+		AGMCORE_CRD_cache {
+			exch pop 
+			begin
+				dup Intent eq{
+					currentdict setcolorrendering_opt
+					end 
+					exch pop true exch	
+					exit
+				}if
+			end
+		} forall
+		pop
+		not{
+			systemdict /findcolorrendering known{
+				Intent findcolorrendering pop
+				/ColorRendering findresource 
+				dup length dict copy
+				setcolorrendering_opt
+			}if
+		}if
+	}if
+} def
+/add_crd
+{
+	AGMCORE_CRD_cache 3 1 roll put
+}def
+/set_crd
+{
+	AGMCORE_host_sep not level2 and{
+		currentdict/CRD known{
+			AGMCORE_CRD_cache CRD get dup null ne{
+				setcolorrendering_opt
+			}{
+				pop
+			}ifelse
+		}{
+			currentdict/Intent known{
+				updatecolorrendering
+			}if
+		}ifelse
+	}if
+}def
+/setcolorrendering_opt
+{
+	dup currentcolorrendering eq{
+		pop
+	}{
+		begin
+			/Intent Intent def
+			currentdict
+		end
+		setcolorrendering
+	}ifelse
+}def
+/OPIimage
+{
+	dup type /dicttype ne{
+		10 dict begin
+			/DataSource xdf
+			/ImageMatrix xdf
+			/BitsPerComponent xdf
+			/Height xdf
+			/Width xdf
+			/MultipleDataSources false def
+			/NComponents 1 def
+			/ImageType 1 def
+			/Decode [0 1 def]
+			/SkipImageProc {false} def
+			currentdict
+		end
+	}if
+	dup begin
+		/HostSepColorImage false def
+		currentdict/Decode known not{
+			/Decode [
+				0 
+				currentcolorspace 0 get /Indexed eq{
+					2 BitsPerComponent exp 1 sub
+				}{
+					1
+				}ifelse
+			] 
+			def
+		}if
+		currentdict/Operator known not{
+			/Operator /image def
+		}if
+	end
+	/sep_colorspace_dict AGMCORE_gget null eq{
+		imageormask
+	}{
+		gsave
+		dup begin invert_image_samples end
+		sep_imageormask
+		grestore
+	}ifelse
+}def
+/cpaint_gcomp
+{
+	AGM_preserve_spots{
+		gsave
+		nulldevice
+	}if
+}def
+/cpaint_gsep
+{
+	AGM_preserve_spots{
+		grestore
+		currentoverprint Adobe_AGM_Core/AGMCORE_ovp xddf 
+	}{	
+		gsave
+		nulldevice
+	}ifelse
+}def
+/cpaint_gend
+{
+	AGM_preserve_spots{
+		Adobe_AGM_Core/AGMCORE_ovp get setoverprint
+	}{
+		grestore
+	}ifelse
+	newpath
+}def
+/AGMCORE_ctm_stack bdict
+	/push_ctm {
+		stack length size le{
+			stack dup length 2 mul array 
+			dup /stack exch def
+			copy pop
+		}if
+		stack size 3 -1 roll put
+		/size size 1 add def
+	}
+	/pop_ctm {
+		/size size 1 sub def
+		size 0 lt{ 
+			/size 0 def
+		}if
+		stack size get
+	}
+	/stack 1 array
+	/size 0 
+edict 
+def
+/save_ctm
+{
+	matrix currentmatrix AGMCORE_ctm_stack begin 
+		push_ctm 
+	end
+}def
+/restore_ctm
+{
+	AGMCORE_ctm_stack begin
+		pop_ctm 
+	end
+	setmatrix
+}def
+/path_rez
+{
+	dup 0 ne{
+		AGMCORE_deviceDPI exch div 
+		dup 1 lt{
+			pop 1
+		}if
+		setflat
+	}{
+		pop
+	}ifelse 	
+}def
+end
+systemdict /setpacking known
+{
+	setpacking
+} if
+%%EndResource
+%%BeginResource: procset Adobe_CoolType_Core 1.1 0
+%%Copyright: Copyright 1997-1999 Adobe Systems Incorporated.  All Rights Reserved.
+%%Version: 1.1 0
+userdict/Adobe_CoolType_Core 40 dict dup begin put/Level2? systemdict
+/languagelevel known dup{pop systemdict/languagelevel get 2 ge}if def Level2?
+not{/currentglobal false def/setglobal/pop load def/gcheck{pop false}bind def
+/currentpacking false def/setpacking/pop load def}if currentpacking true
+setpacking/bdf{bind def}bind def/ldf{load def}bind def/doc_setup{
+Adobe_CoolType_Core begin/mov/moveto ldf/nfnt/newencodedfont ldf/mfnt/makefont
+ldf/sfnt/setfont ldf/ufnt/undefinefont ldf/chp/charpath ldf/awsh/awidthshow
+ldf/wsh/widthshow ldf/ash/ashow ldf/sh/show ldf end userdict
+/Adobe_CoolType_Data 2 dict dup begin/WidthShowArray 256 array def
+/GenFauxMMInst{}bind def end put}bind def/doc_trailer{currentdict
+Adobe_CoolType_Core eq{end}if Adobe_CoolType_Core/unload get exec systemdict
+/undef known{userdict/Adobe_CoolType_Data undef}if}bind def/page_setup{
+Adobe_CoolType_Core begin}bind def/page_trailer{end}bind def/unload{systemdict
+/languagelevel known{systemdict/languagelevel get 2 ge{userdict
+/Adobe_CoolType_Core 2 copy known{undef}{pop pop}ifelse}if}if}bind def/ndf{1
+index where{pop pop pop}{dup xcheck{bind}if def}ifelse}def/findfont dup
+systemdict begin userdict begin/globaldict where{/globaldict get begin}if dup
+where pop exch get/globaldict where{pop end}if end end def/systemfindfont
+/findfont load def/undefinefont{pop}ndf/copyfont{currentglobal 3 1 roll 1
+index gcheck setglobal dup null eq{0}{dup length}ifelse 2 index length add 1
+add dict begin exch{1 index/FID eq{pop pop}{def}ifelse}forall dup null eq{pop}
+{{def}forall}ifelse currentdict end exch setglobal}bdf/newencodedfont{findfont
+dup length dict begin{1 index/FID ne{def}{pop pop}ifelse}forall/Encoding exch
+def currentdict end definefont pop}bdf/scff{$SubstituteFont begin dup type
+/stringtype eq{dup length exch}{null}ifelse/$sname exch def/$slen exch def
+/$fontname 1 index dup type/stringtype eq{cvn}if def/$used false def end
+findfont $SubstituteFont begin $used{currentglobal exch dup gcheck setglobal
+null copyfont begin/FontName $fontname def/currentdistillerparams where{pop}{
+/FontInfo currentdict/FontInfo known{FontInfo null copyfont}{2 dict}ifelse dup
+begin/ItalicAngle $italicangle def/FontMatrix FontMatrix[1 0 ItalicAngle dup
+sin exch cos div 1 0 0]matrix concatmatrix readonly end 4 2 roll def def}
+ifelse FontName currentdict end definefont exch setglobal}if/$sname null def
+/$slen 0 def end}bdf/ConcatStrings{dup 0 exch{length add}forall string exch 0
+exch{3 copy putinterval length add}forall pop}bind def/BeginFauxMMFont{1 index
+findfont pop 2 array astore ConcatStrings 3 1 roll($)exch 3 array astore
+ConcatStrings exch findfont currentglobal exch dup gcheck setglobal null
+copyfont/tempfontname exch definefont pop exch 12 dict begin/FontName exch def
+/FontType 0 def/FMapType 6 def/FontMatrix matrix def/PaintType 0 def}bind def
+/EndFauxMMFont{currentdict end dup/FontName get exch definefont exch setglobal
+exch mfnt sfnt}bind def/GenFauxMMInst{Adobe_CoolType_Data/GenFauxMMInst get
+exec}bind def/DefFauxMMInst{Adobe_CoolType_Data exch/GenFauxMMInst exch bind
+put}bind def/WSALoop{4 copy 1 index add 1 sub 1 exch{3 copy put pop 1 add}for
+pop pop 3 2 roll add exch 256 add}bind def/BuildWidthShowArray{currentfont
+begin FontType 0 eq dup{pop FMapType 6 eq}if{SubsVector dup length 1 sub 1
+exch getinterval}{()}ifelse end Adobe_CoolType_Data/WidthShowArray get 0 0 4 3
+roll{WSALoop}forall 256 2 index sub WSALoop pop pop pop}bind def/wsa{
+Adobe_CoolType_Data/WidthShowArray get}bind def/?set{$SubstituteFont begin
+/$used false def/$fontname 4 index def end 3 index findfont $SubstituteFont
+begin $used{false}{dup/FontName known{dup/FontName get $fontname eq 1 index
+/DistillerFauxFont known not and}{false}ifelse}ifelse exch pop end{exch pop
+exch pop exch 2 dict dup/Found 3 index put exch findfont exch}{exch exec exch
+findfont 2 dict dup/Downloaded 6 5 roll put}ifelse dup/FontName 4 index put
+copyfont definefont pop}bind def/?str1 256 string def/?str2 256 string def
+/?add{1 index type/integertype eq{exch true 4 2}{false 3 1}ifelse roll 1 index
+findfont/Downloaded known{exec exch{exch ?str2 cvs exch findfont/Downloaded
+get 1 dict begin/Downloaded 1 index def ?str1 cvs length ?str1 1 index 1 add 3
+index putinterval exch length 1 add 1 index add ?str1 2 index(*)putinterval
+?str1 0 2 index getinterval cvn findfont ?str1 3 index(+)putinterval 2 dict
+dup/FontName ?str1 0 6 index getinterval cvn put dup/Downloaded Downloaded put
+end copyfont dup/FontName get exch definefont pop pop pop}{pop}ifelse}{pop
+exch{findfont dup/Found get dup length exch ?str1 cvs pop ?str1 1 index(+)
+putinterval ?str1 1 index 1 add 4 index ?str2 cvs putinterval ?str1 exch 0
+exch 5 4 roll ?str2 cvs length 1 add add getinterval cvn 1 dict exch 1 index
+exch/FontName exch put copyfont dup/FontName get exch definefont pop}{pop}
+ifelse}ifelse}bind def/?sh{currentfont/Downloaded known{exch}if pop}bind def
+/?chp{currentfont/Downloaded known{pop}{false chp}ifelse}bind def/?mv{
+currentfont/Downloaded known{moveto pop pop}{pop pop moveto}ifelse}bind def
+setpacking end userdict/$SubstituteFont 20 dict put 1 dict begin
+/SubstituteFont dup $error exch 2 copy known{get}{pop pop{pop/Courier}bind}
+ifelse def/currentdistillerparams where dup{pop pop currentdistillerparams
+/CannotEmbedFontPolicy 2 copy known{get/Error eq}{pop pop false}ifelse}if not{
+countdictstack array dictstack 0 get begin userdict begin $SubstituteFont
+begin/$str 128 string def/$fontpat 128 string def/$slen 0 def/$sname null def
+/$match false def/$fontname null def/$used false def/$fontname null def
+/$italicangle 26.5 def/$findfontByEnum{dup/$fontname exch def $sname null eq{
+$str cvs dup length $slen sub $slen getinterval}{pop $sname}ifelse $fontpat
+dup 0(fonts/*)putinterval exch 7 exch putinterval/$match false def mark{
+$fontpat 0 $slen 7 add getinterval{/$match exch def exit}$str filenameforall}
+stopped cleartomark/$slen 0 def $match false ne{$match(fonts/)anchorsearch pop
+pop cvn}{/Courier}ifelse}bind def/$ROS 1 dict dup begin/Adobe 4 dict dup begin
+/Japan1[/Ryumin-Light/HeiseiMin-W3/GothicBBB-Medium/HeiseiKakuGo-W5
+/HeiseiMaruGo-W4/Jun101-Light]def/Korea1[/HYSMyeongJo-Medium/HYGoThic-Medium]
+def/GB1[/STSong-Light/STHeiti-Regular]def/CNS1[/MKai-Medium/MHei-Medium]def
+end def end def/$cmapname null def/$buildfontname{length $str 1 index(-)
+putinterval 1 add $str 1 index $cmapname $fontpat cvs putinterval $cmapname
+length add $str exch 0 exch getinterval cvn}bind def/$findfontByROS{/$fontname
+exch def $ROS Registry 2 copy known{get Ordering 2 copy known{get}{pop pop[]}
+ifelse}{pop pop[]}ifelse false exch{dup/CIDFont resourcestatus{pop pop save 1
+index/CIDFont findresource dup/WidthsOnly known{dup/WidthsOnly get}{false}
+ifelse exch pop exch restore{pop}{exch pop true exit}ifelse}{pop}ifelse}forall
+{$str cvs $buildfontname}{false(*){save exch dup/CIDFont findresource dup
+/WidthsOnly known{dup/WidthsOnly get not}{true}ifelse exch/CIDSystemInfo get
+dup/Registry get Registry eq exch/Ordering get Ordering eq and and{exch
+restore exch pop true exit}{pop restore}ifelse}$str/CIDFont resourceforall{
+$buildfontname}{$fontname $findfontByEnum}ifelse}ifelse}bind def end end
+currentdict/$error known currentdict/languagelevel known and dup{pop $error
+/SubstituteFont known}if dup{$error}{Adobe_CoolType_Core}ifelse begin{
+/SubstituteFont/CMap/Category resourcestatus{pop pop{$SubstituteFont begin
+/$used true def dup length $slen gt $sname null ne or $slen 0 gt and{$sname
+null eq{dup $str cvs dup length $slen sub $slen getinterval cvn}{$sname}ifelse
+dup/CMap resourcestatus{pop pop dup/$cmapname exch def/CMap findresource
+/CIDSystemInfo get{def}forall $findfontByROS}{pop $findfontByEnum}ifelse}{
+//SubstituteFont exec}ifelse/$slen 0 def end}}{{$SubstituteFont begin/$used
+true def dup length $slen gt $sname null ne or $slen 0 gt and{$findfontByEnum}
+{//SubstituteFont exec}ifelse end}}ifelse bind readonly def}{/findfont{
+$SubstituteFont begin dup systemfindfont dup/FontName known{dup/FontName get 2
+index ne}{true}ifelse dup{/$used true def}if{$slen 0 gt $sname null ne 3 index
+length $slen gt or and{pop dup $findfontByEnum findfont dup maxlength 1 add
+dict begin{1 index/FID eq{pop pop}{def}ifelse}forall currentdict end
+definefont}{exch pop}ifelse}{exch pop}ifelse end}bind def}ifelse end end}if
+end
+%%EndResource
+%%EndProlog
+%%BeginSetup
+Adobe_AGM_Core/AGMCORE_err_strings 3 dict dup begin
+/AGMCORE_bad_environ (Environment not satisfactory for this job, which requests at least
+PostScript Level ^	and at least PostScript version ^. Ensure that the PPD is correct or that
+the PostScript  level requested is supported by this printer. ) def
+/AGMCORE_color_space_onhost_seps (This job contains colors that will not separate
+with on-host methods. ) def
+/AGMCORE_invalid_color_space (This job contains an invalid color space. ) def
+end put
+2 2010 true Adobe_AGM_Core/doc_setup get exec
+Adobe_CoolType_Core/doc_setup get exec
+%%EndSetup
+%%Page: name:1 1
+%%EndPageComments
+%%BeginPageSetup
+Adobe_AGM_Core/page_setup get exec
+Adobe_CoolType_Core/page_setup get exec
+%%EndPageSetup
+Adobe_AGM_Core/AGMCORE_save save ddf
+mark
+/0 
+[/DeviceGray] add_csa
+/CSA /0 
+/1 
+[/DeviceCMYK] add_csa
+/CSA /1 
+/2 
+[/DeviceRGB] add_csa
+/CSA /2 
+cleartomark
+800 path_rez
+1 -1 scale 0 -50.0684 translate
+gsave
+[1 0 0 1 0 0 ] concat
+gsave
+0 0 mo
+0 50.0684 ln
+243.005 50.0684 ln
+243.005 0 ln
+clp
+save_ctm
+restore_ctm
+save_ctm
+false op
+0 0 0 1 cmyk
+%ADOBeginSubsetFont: TimesNewRomanPSMT Initial
+11 dict begin
+/FontName /TimesNewRomanPSMT def
+/FontMatrix [1 1000 div 0 0 1 1000 div 0 0 ] def
+/Encoding  256 array 0 1 255 {1 index exch /.notdef put} for  def
+/PaintType 0 def
+/FontType 1 def
+/FontBBox { 0 0 0 0 } def
+/FontInfo 1 dict dup begin
+  /OrigFontType /TrueType def
+end readonly def
+currentdict
+end
+
+systemdict begin
+dup /Private 7 dict dup begin
+/BlueValues [-15 0 600 650] def
+/MinFeature {16 16} def
+/password 5839 def
+/ND {def} def
+/NP {put} def
+/RD {string currentfile exch readhexstring pop} def
+2 index /CharStrings 1674 dict dup begin
+/.notdef 
+<10bf317005b8302fd45b0609d6bde5a48b0240d44d91aabd11b7ee50303a
+812fda6ed97443c437b8d3bea589> ND 
+/Q 
+<10bf31705c375b3d52a087ef978560249a4597ba98441cc66e94244ad145
+c0a541a1f1c73421b75064f16fed0f9d96d98ffe5bdfe6240d16d785e796
+f5bf167f541f6e56141f50a02cf4a93c5cca07a4f4682dcbbe24d8cf2e50
+08c74d80b07f691eff4361149cf65f000b186be857ffb24234ccc178ab11
+e3949a0ae9b9125e35d367986c77a566c6ae701c115492fed900be736c31
+79eb551adc6286b5d2b24d9c6eb1a21063193544d4c911511e8dff8445b5
+81741ccb1f> ND 
+end
+end
+put
+put
+dup /FontName get exch definefont pop
+end
+/TimesNewRomanPSMT findfont /Encoding get
+dup 81 /Q put
+pop
+%ADOEndSubsetFont
+/TimesNewRomanPSMT*1 
+[
+81{/.notdef}repeat /Q 174{/.notdef}repeat
+] /TimesNewRomanPSMT nfnt
+/TimesNewRomanPSMT*1 findfont [37.4396 0 0 -37.4396 0 0 ]mfnt sfnt
+BuildWidthShowArray
+0 37.7002 mov
+(Q) sh
+restore_ctm
+save_ctm
+%ADOBeginSubsetFont: TimesNewRomanPSMT AddGlyphs
+
+systemdict begin
+/TimesNewRomanPSMT 
+findfont dup
+/Private get begin
+/CharStrings get begin
+/I 
+<10bf31705600a7ed90307a9003ca62013c6a672422c0c34b05034e95c8f7
+969417f94f7eac24f8d7c31dc052f016b9f05f0040a8a0c827a04a2d6287
+87ecaa09b381453efd6c9025f1b2b32970689c6b042586dfb91b9d0b727c
+2376cbc464e5847700341fcd3ac89effa6235dd054f5> ND 
+end end
+end
+/TimesNewRomanPSMT findfont /Encoding get
+dup 73 /I put
+pop
+%ADOEndSubsetFont
+/TimesNewRomanPSMT*2 
+[
+73{/.notdef}repeat /I 182{/.notdef}repeat
+] /TimesNewRomanPSMT nfnt
+/TimesNewRomanPSMT*2 findfont [37.4396 0 0 -37.4396 0 0 ]mfnt sfnt
+BuildWidthShowArray
+25.5205 38.0317 mov
+(I) sh
+restore_ctm
+save_ctm
+%ADOBeginSubsetFont: TimesNewRomanPSMT AddGlyphs
+
+systemdict begin
+/TimesNewRomanPSMT 
+findfont dup
+/Private get begin
+/CharStrings get begin
+/S 
+<10bf3170383eecc69ba25cd9f9f1a3f9446af5f47f0b6f5a66a03292ff71
+223ca19d7846bc6a38c24691a92aa6d39bbe32cd43e95ccf56f198cc06cb
+f5e035e21e94e42a6a1070cb2c809a15a19050abb5948a4d31f6c5c84b4e
+4af71164b9f195aba815d5d7bd1f87734bfaa8261c267697431013c3002d
+769d09f7f0479ffa13457f45f8fe1ef50e2e59640f0f713a98cc93dc94f0
+7bb5c27a5fa3d59fbdb2e3ec6494eb03c3f52f8abd7bb0d38b9bde811abe
+01dc0d1e1b97c3fdba0e39bb69648b584e346a3a71962be678485698d0b4
+9afd8211afbd3bc059adaf2c73e4eea5b8a9e5e3323b0439c528acb70d9f
+b04b8e40afb5b00291e522a5ea6d69afa41593a428ca7ecaa1c600> ND 
+end end
+end
+/TimesNewRomanPSMT findfont /Encoding get
+dup 83 /S put
+pop
+%ADOEndSubsetFont
+/TimesNewRomanPSMT*3 
+[
+83{/.notdef}repeat /S 172{/.notdef}repeat
+] /TimesNewRomanPSMT nfnt
+/TimesNewRomanPSMT*3 findfont [37.4396 0 0 -37.4396 0 0 ]mfnt sfnt
+BuildWidthShowArray
+37.2422 38.0317 mov
+(S) sh
+restore_ctm
+save_ctm
+%ADOBeginSubsetFont: TimesNewRomanPSMT AddGlyphs
+
+systemdict begin
+/TimesNewRomanPSMT 
+findfont dup
+/Private get begin
+/CharStrings get begin
+/period 
+<10bf3170209b218f27ec1e9d95dd396c64928fd9b4492fdd67edb2272195
+ea38929abcbbfbb285f458c8cef720f2543831b530ecbdba8b71a752883a
+15514b25a8dbbd07e0> ND 
+end end
+end
+/TimesNewRomanPSMT findfont /Encoding get
+dup 46 /period put
+pop
+%ADOEndSubsetFont
+/TimesNewRomanPSMT*4 
+[
+46{/.notdef}repeat /period 209{/.notdef}repeat
+] /TimesNewRomanPSMT nfnt
+/TimesNewRomanPSMT*4 findfont [37.4396 0 0 -37.4396 0 0 ]mfnt sfnt
+BuildWidthShowArray
+57.9312 37.4395 mov
+(.) sh
+restore_ctm
+save_ctm
+%ADOBeginSubsetFont: TimesNewRomanPSMT AddGlyphs
+
+systemdict begin
+/TimesNewRomanPSMT 
+findfont dup
+/Private get begin
+/CharStrings get begin
+/n 
+<10bf3170638bba1389001ebc99bd428947467ee318fefc1fb124f3371d83
+7966c790a079b275ca99c79d7464e552ffd0f1af460f8ea65529382cdd07
+4674d72648baccb346303e8100a1f95821fdbf92377893eb17da4ab68e71
+80324c8db584bd0bb680f6dae406f3be267326ec310cafd5cdc15abe1737
+df8e327860dd87a0d7ca5cc3caaaec8addbc764fba940abee5eeeb36b470
+f8bcbccaaee1030ab8bb7e290a869adf9134ba84411dafdd10e69b7c30cb
+2b100f1b6f18b9b8f2b6f466715dc320141240ce2c9ab557fa104763f882
+a6> ND 
+end end
+end
+/TimesNewRomanPSMT findfont /Encoding get
+dup 110 /n put
+pop
+%ADOEndSubsetFont
+/TimesNewRomanPSMT*5 
+[
+110{/.notdef}repeat /n 145{/.notdef}repeat
+] /TimesNewRomanPSMT nfnt
+/TimesNewRomanPSMT*5 findfont [37.4396 0 0 -37.4396 0 0 ]mfnt sfnt
+BuildWidthShowArray
+68.5396 38.0635 mov
+(n) sh
+restore_ctm
+save_ctm
+%ADOBeginSubsetFont: TimesNewRomanPSMT AddGlyphs
+
+systemdict begin
+/TimesNewRomanPSMT 
+findfont dup
+/Private get begin
+/CharStrings get begin
+/e 
+<10bf3170422f4b41885a9676842055648b7ac91c5b68486f08b9925be5a4
+60b43789b53ef3b9b877c7e7005705a6349e2c40728dd486236996d7488b
+de56bf5db6d92996a7a8ce705892bacba17194a89633f6479b535c40974a
+93000c3141546b8f7c576cdc9c1b35fdbf110119f122c4b02941f0291d95
+1d06ade19f2aba378cca3bff7328dd85d10facfd1834ad5531262dfae737
+> ND 
+end end
+end
+/TimesNewRomanPSMT findfont /Encoding get
+dup 101 /e put
+pop
+%ADOEndSubsetFont
+/TimesNewRomanPSMT*6 
+[
+101{/.notdef}repeat /e 154{/.notdef}repeat
+] /TimesNewRomanPSMT nfnt
+/TimesNewRomanPSMT*6 findfont [37.4396 0 0 -37.4396 0 0 ]mfnt sfnt
+BuildWidthShowArray
+87.0508 38.0635 mov
+(e) sh
+restore_ctm
+%ADOBeginSubsetFont: TimesNewRomanPSMT AddGlyphs
+
+systemdict begin
+/TimesNewRomanPSMT 
+findfont dup
+/Private get begin
+/CharStrings get begin
+/t 
+<10bf3170675b4d3401fff3ff5f765da0613b785b68f16ce9d5b5009ed6e6
+c17a99d782a0b8170a32295317d6ff13c6b2b3428fdbe7079492aeaea2a9
+67dc16f3ceac0a5c4a3dea104555732498258f9dde1e32f8f3bd67606686
+3878f49a7b3c611ccf1764ddd808f62cd239b60518d713e318d042a89036
+f7226dd2774d> ND 
+end end
+end
+/TimesNewRomanPSMT findfont /Encoding get
+dup 116 /t put
+pop
+%ADOEndSubsetFont
+/TimesNewRomanPSMT*7 
+[
+116{/.notdef}repeat /t 139{/.notdef}repeat
+] /TimesNewRomanPSMT nfnt
+/TimesNewRomanPSMT*7 findfont [37.4396 0 0 -37.4396 0 0 ]mfnt sfnt
+BuildWidthShowArray
+103.067 38.272 mov
+(t) sh
+112.635 40.5591 mo
+112.635 40.5591 -88.0542 40.5591 112.635 40.5591 cv
+f
+1 lw
+0 lc
+0 lj
+4 ml
+[] 0 dsh
+true sadj
+112.635 40.5591 mo
+112.635 40.5591 -88.0542 40.5591 112.635 40.5591 cv
+s
+save_ctm
+restore_ctm
+save_ctm
+restore_ctm
+save_ctm
+restore_ctm
+save_ctm
+restore_ctm
+save_ctm
+%ADOBeginSubsetFont: Arial-ItalicMT Initial
+11 dict begin
+/FontName /Arial-ItalicMT def
+/FontMatrix [1 1000 div 0 0 1 1000 div 0 0 ] def
+/Encoding  256 array 0 1 255 {1 index exch /.notdef put} for  def
+/PaintType 0 def
+/FontType 1 def
+/FontBBox { 0 0 0 0 } def
+/FontInfo 1 dict dup begin
+  /OrigFontType /TrueType def
+end readonly def
+currentdict
+end
+
+systemdict begin
+dup /Private 7 dict dup begin
+/BlueValues [-15 0 600 650] def
+/MinFeature {16 16} def
+/password 5839 def
+/ND {def} def
+/NP {put} def
+/RD {string currentfile exch readhexstring pop} def
+2 index /CharStrings 932 dict dup begin
+/.notdef 
+<10bf317005b6d50bd3b903bc9f60e6e804630266f839393d56ae50a85fbe
+ffec110deebde9f8a007323688ac> ND 
+/A 
+<10bf317085248986ea88d33d7968f405c8efbea768e4e44c503845c0c065
+7f444c3e7e1169cd2ad063e267b90e5b90657c37640ec7652530b3094a8c
+2e8b0dfec3067453605f452346> ND 
+/C 
+<10bf317014468e441c5d3821b916cc9f55184595d9d4ef5d5cd9725eb438
+2913746b68f3a6737699dec81813e07f824deef8879ba336bd1f1b179f74
+0feff77d22f88ef8b5427aadb3d6df4124b328221d2b23673af0d34ed862
+c18a2add6d3592d721f4eae8afccd17ed94bee122afa38ef7d64cd1f4363
+b84c9c02cdd9c815c1c7bb76ce15> ND 
+/L 
+<10bf317041f0e16105f281de4854f606ad30dee2bd69dd8e8e9c3ae3cbee
+95b326f3> ND 
+/O 
+<10bf3170144676e27ef529b559053bbe72db2925176c656fab2af0693ae0
+cd0476cafe011ec5c21eca4bd9ed39b72809645db7150a589a6754e2efa7
+b8b70dda198ff9df0d295a9861016c9d397936ac820f70663a27f299ccf3
+4f10c9236d38af6e312a1ef09a544d6f57a4c74fc38a7e5e57773d45aedd
+99260dfc1b06c6e489e12540d7adf7e7f24c0fa39645b71e4aeb37afe490
+4848154b4d5e697153885e2a55f179a739d8879722be3c26158a> ND 
+end
+end
+put
+put
+dup /FontName get exch definefont pop
+end
+/Arial-ItalicMT findfont /Encoding get
+dup 65 /A put
+dup 67 /C put
+dup 76 /L put
+dup 79 /O put
+pop
+%ADOEndSubsetFont
+/Arial-ItalicMT*1 
+[
+65{/.notdef}repeat /A /.notdef /C 8{/.notdef}repeat /L 2{/.notdef}repeat /O 
+176{/.notdef}repeat
+] /Arial-ItalicMT nfnt
+/Arial-ItalicMT*1 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
+BuildWidthShowArray
+26.1079 47.8394 mov
+(LOCAL) sh
+%ADOBeginSubsetFont: ArialMT Initial
+11 dict begin
+/FontName /ArialMT def
+/FontMatrix [1 1000 div 0 0 1 1000 div 0 0 ] def
+/Encoding  256 array 0 1 255 {1 index exch /.notdef put} for  def
+/PaintType 0 def
+/FontType 1 def
+/FontBBox { 0 0 0 0 } def
+/FontInfo 1 dict dup begin
+  /OrigFontType /TrueType def
+end readonly def
+currentdict
+end
+
+systemdict begin
+dup /Private 7 dict dup begin
+/BlueValues [-15 0 600 650] def
+/MinFeature {16 16} def
+/password 5839 def
+/ND {def} def
+/NP {put} def
+/RD {string currentfile exch readhexstring pop} def
+2 index /CharStrings 1674 dict dup begin
+/.notdef 
+<10bf317005b6d50bd3b903bc9f60e6e804630266f839393d56ae50a85fbe
+ffec117da7ee51b33a5a233cda9aa5c3> ND 
+/space 
+<10bf317079c7734bf7> ND 
+/c 
+<10bf317040c2e74a5fc1787aadb34082a974ca8bfdce94e11266bf025cb7
+0165d6854d700d70cc5444b9f61253adefae30a0411da65b303e54163273
+771b8917fdcb996d46a918dadbf0ac7f3fc07110b5e4794547b6eff7de49
+7e69fc6e8381938653cd90c476c4aee37f40cb1165ebe6f2b5655eacf33b
+1b7c58ec799cd6ac7895a51a3f59a1ac6ba84d> ND 
+/e 
+<10bf3170422fdb64737aa996af2c16ab61f139259ccfce996f56e5f89332
+9f7b50633061a72210c8a6b5d13fe3bb9b88ba842302ec1ae1e32bf6cd49
+8b054e2c54c7892b319ccb1b99d65997437b14ddcef375af397068617b4b
+a8b59dc2e0e5b584c508b01db96b294c218d115c2d03379ed774785408d4
+3e0cb3b8511668ef559f40e3101d956d8627deece251b2315f5de4af> ND 
+/i 
+<10bf31703f9c43ec382ac71b0be91f29c503cae1b1e6095503cc0fe0ac65
+3b18436e1776> ND 
+/r 
+<10bf31703e6aa4be08d01c511eaadd0473a3490b93b478f689beebddc801
+f9ab05d95370b6f2d5e4eaf0e05d2c29f4d91b00084ec9f87aa58fda4ad7
+8d5d66fcc7e8afb13d634e9fe58c768d42> ND 
+/s 
+<10bf3170586c182310772ef569c52e8bfad70b259ad08351d1ee7f8301db
+56e87b60c2698b50b73e6d27e51b4b4c4de13e01b73b0e93916fb4e9bc20
+eb2383ce966a3f407cc2dd34fe3886d20337fe9b35727881532b2484bb21
+37910e0951e4ed8d0834c0f1ea6967e8f5ec97508509903e613c902ab20a
+2584a430e00608bec28b5ad77a90ca85cabc0e7931cda83a171815946dc1
+e37a6e5968afc67def1b22528a96d5ff182bfd780f19cd36c8689597438e
+a97ac397a0bce69309b562a1ba4d9173f5cede5262ffcd19389598a980ab
+b12fde1b7188b7ce2e37fd5029f6095ff151c09be98b02a5038a> ND 
+/v 
+<10bf31706ae07dd17dfc9e3ad4fb8a8843b0ccd3bf37159e4d997ae7db46
+1605af60e723de30a8f7915cee06ac348ee0e2ad17e20e> ND 
+end
+end
+put
+put
+dup /FontName get exch definefont pop
+end
+/ArialMT findfont /Encoding get
+dup 32 /space put
+dup 99 /c put
+dup 101 /e put
+dup 105 /i put
+dup 114 /r put
+dup 115 /s put
+dup 118 /v put
+pop
+%ADOEndSubsetFont
+/ArialMT*1 
+[
+32{/.notdef}repeat /space 66{/.notdef}repeat /c /.notdef /e 3{/.notdef}repeat /i 
+8{/.notdef}repeat /r /s 2{/.notdef}repeat /v 137{/.notdef}repeat
+] /ArialMT nfnt
+/ArialMT*1 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
+BuildWidthShowArray
+46.3939 47.8394 mov
+( service ) sh
+%ADOBeginSubsetFont: Arial-ItalicMT AddGlyphs
+
+systemdict begin
+/Arial-ItalicMT 
+findfont dup
+/Private get begin
+/CharStrings get begin
+/D 
+<10bf317045bba87c3c1099877b6403823f685b41b86eb1dc130c34f91691
+50e157f9fa55ac001d8c686a6333d2a9713ee84e40cd01472950796882e7
+e5d70786109711700d4236fd6875fed7ad576f621fd927a2d6cf0f358ab7
+a9d777d889dcacbe9a3b249ef6607e4c9d5f55bb001606e6029d15d8b6c6
+72d660ba8b7b0c93904171ae029b1910ebb278e37a329958fbfd7b191178
+4beac722e64b3c1ae8> ND 
+/R 
+<10bf31704854f6e1b259745437e2ea750d93592ff68cdf894f18b8536c69
+3ad09f1afc6dbf04129bd98e6ffcb8eec52e2a1d51d7f58aa8f299f3ec3b
+5c58d67f5ff4c3cf6e7f7bdd9f528969122eb84418d3afd2d1ce537c7d53
+f14d7dfb8e13feaeffdbfb8e9dd044cb6baed83165ec2dfa14f5cfb46343
+38da9c8838cce43e666b9a19d427bab1a9b910ed6c9890b8c230998301ff
+09dcb92c5266e9d0c81878a0e31665564d8f408db4adf804> ND 
+/W 
+<10bf317005b6d613e16c68aaefc6b34577bd131b1ef403827cef23103543
+78a8c64551510b76477b29053c7c7e7266bb873dc2d3dc2ac00ef1e0dcff
+fbe000523638e9dcde2864f474e6d10d01698e9af67f7d0e2611a8ea72ff
+49c1d8c6af2aa401e7414ab1ec0144dc774f1bee43e8616d84ba67cc4646
+389ba9> ND 
+end end
+end
+/Arial-ItalicMT findfont /Encoding get
+dup 68 /D put
+dup 82 /R put
+dup 87 /W put
+pop
+%ADOEndSubsetFont
+/Arial-ItalicMT*2 
+[
+68{/.notdef}repeat /D 13{/.notdef}repeat /R 4{/.notdef}repeat /W 168{/.notdef}repeat
+] /Arial-ItalicMT nfnt
+/Arial-ItalicMT*2 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
+BuildWidthShowArray
+69.4255 47.8394 mov
+(W) sh
+/Arial-ItalicMT*1 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
+BuildWidthShowArray
+75.2642 47.8394 mov
+(O) sh
+/Arial-ItalicMT*2 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
+BuildWidthShowArray
+80.0759 47.8394 mov
+(R) sh
+/Arial-ItalicMT*1 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
+BuildWidthShowArray
+84.5433 47.8394 mov
+(L) sh
+/Arial-ItalicMT*2 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
+BuildWidthShowArray
+87.9837 47.8394 mov
+(D) sh
+/ArialMT*1 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
+BuildWidthShowArray
+92.4511 47.8394 mov
+( ) sh
+%ADOBeginSubsetFont: ArialMT AddGlyphs
+
+systemdict begin
+/ArialMT 
+findfont dup
+/Private get begin
+/CharStrings get begin
+/a 
+<10bf31705d64e193f9f1f8a567d03549fa73483ae9b672d7b7797200c526
+6d55e0abf05d082c89da2ef3d2f91996afd8e100af13d8e4b339158b9d4e
+0256bc0329e2558ef3a479ac944060941a5a0ef5dc04c7a41bce2731b9f6
+bac3899bfe4b490bb12e4abb60728f8dd08e79a22a9692e2e377b4d6d5c9
+90d58983bd1034efca9e5a712e5fac945f9b4432273fa80564af2b96e4b5
+70911aa8878cafbb79a548cdf67b5fd07c85ed1a9f7575ac0b1cdc57118f
+0bc5ec90d16e3c70642d41ebc8d851a2770f7e9e3366dcaea1eeafe88adc
+1075a75e7e694b5e09e5b68c30faa47727bbcc80df324abdee2341fefa79
+33b84bfd3fdf5d94b0c28761234c47086bfdc62b798b> ND 
+end end
+end
+/ArialMT findfont /Encoding get
+dup 97 /a put
+pop
+%ADOEndSubsetFont
+/ArialMT*2 
+[
+97{/.notdef}repeat /a 158{/.notdef}repeat
+] /ArialMT nfnt
+/ArialMT*2 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
+BuildWidthShowArray
+94.1698 47.8394 mov
+(a) sh
+/ArialMT*1 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
+BuildWidthShowArray
+97.6102 47.8394 mov
+(ccess) sh
+restore_ctm
+save_ctm
+restore_ctm
+save_ctm
+restore_ctm
+%ADOBeginSubsetFont: TimesNewRomanPSMT Initial
+%!FontType1
+16 dict begin
+/FontInfo 15 dict dup begin
+/Notice (Copyright (c) 1988, 1990, 1993, 1996, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.Times New Roman is a trademark of the Monotype Corporation, registered in the US Patent and Trademark Office and may be registered in certain other jurisdictions.) def
+/version (001.002) def
+/FullName (Times New Roman PS) def
+/FamilyName (Times New Roman PS) def
+/Weight (Roman) def
+/ItalicAngle 0 def
+/isFixedPitch false  def
+/UnderlinePosition -100 def
+/UnderlineThickness 50 def
+end def
+/FontName /TimesNewRomanPSMT def
+/Encoding 256 array
+0 1 255 {1 index exch /.notdef put} for
+dup 0 /.notdef put
+ def
+/PaintType 0 def
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0 ] def
+/FontBBox { -167 -250 1009 878 } def
+/XUID [6 44335 ] def
+/StrokeWidth 0 def
+currentdict end
+currentfile eexec A0B00ED5187D9C0F1ECDF51878C3AA5CAA3EC70E14AF46
+F38884AB0522111E1FD6B5E52246D33165D7360B47FEE2078BDAF9F5724920E2
+B8C7C8DEF08111E9655FEB2D7D43B90DD0271717BD08D48D1209FEBFE7B9C4C9
+04828D33C143D5CDA944594BA8901247766DFFF8952C9A24AE1BD58BEDD61A48
+002D4E12E59AAE2CE61CDCD892A0D488E46BB11D275934A058DC403F9249464C
+F61C23C6C10E0372E1EA37A18927344183EE570CF03B887B71371320A61E7662
+4F85A357361319A1409F150A3D7B70FBB2B447FE11C50D32A3F15514314EE3B9
+CF26AD6A4896044B60E048EC7B6E3A0A6A92DDF428AA185F0544D20D54E1344F
+E0273E699A1B05DE27F5A48CCA7370DECDCEAEA4896E6B6FC3F061CBEC77C0FC
+893AAF27C6C349B8E7D92A00AA5B6334B4D446328E8D55B26E3E7BCA54CAE765
+9531679FE31E9B6FFD9217C3F05E52D540109A177C9CC1B2213C8829C56A8F65
+2ADE10AE0E2AF46B9246A692F9636DD633EB0515D149583D141DD16B8E92C542
+D5B9F572B162E3C0A9E6ECD51C6EA7697082A08B040C103EAA64851057089C23
+0F3B78A0409F144321F59888D696B0E0506B3994A65A25B17A42505548FC0333
+9221D659CC8F5781D0A6E2859FE2289B5A0F72FABDA8996956B60FF0508BB8EF
+C4327C55ABBF900DCA9BFFF8687B1A0ACCE0DE3E6EFD330E1A0060EB01378736
+45995BE9A9AD0FCE88EBDF566CFB4995F43272ED3EE7232573EED8D72F527476
+46AFEA9585638092AE80092D1AC879423482BA0401BC58B26CCE6146F461EC82
+7B541B24253360621F3A38E8CEDD6B1A92D767A1B9DA1DF23CF23716CC5B53F1
+E653C1FDD3715494C9F167ABAC6A8F122ECC96239F856E5A9AC2F779D70AD62C
+EF652BD327FF7B052514CF90D0DF0D26A7E815A85241383F282D4DBCCA06E35E
+52A0FA84822456DD767F9CA63621AEE9AA7BC2F50CB4601E11E7CB34781D7D9E
+21B33A4C1F8FCFED88788A93FBA5441D7B15BB6DCDF2900D7E01661D88E11E39
+2993DA88A17CF307EDB8C3F7D61469BB914CA49CF5F51624C043D2AF43D5FEA7
+556DEAE52D61A7ECF7EAB82D2C23BE11C636FD727DB3F0FC340241D9773C5E51
+8758E7ABC75917BAD12C3C5CE4829D2FFCBC2CB66657B684855A611DBC0EE29B
+99A3D4CC244CA7F13F4C8A4F4D6F207766C8EDF1F7BA05ECC1CC5BC410F217E7
+2CB1AB266B2D6D8A6F82A65563808053DD0B0100E3CAC3327CFFF0C0C2B8CDC8
+1BCB6AF3D744F75E71E2068D424A08814972FE8881641522DD3DFA6F664F0AC5
+D75F2D0825EC312519393CE90FB6FAF90C48E6DF94798C7CEEA269361059554C
+A99120A0E811C18EC46A5914D6F21F1D4F799C5CBA37CDCDB9F53D96C663AD9A
+27B70AF02B40FAB0AE87BE96A790BA745FD588E707459A97339C193785262758
+22AFCDF30BCB61191C8267D9F7325AEB2F27D529903DA7055EAECAC4965F5572
+3970221C553A22D936D630DCE92114919A7DF8A665B5C08718417C9C94768532
+17ACAE809C3C2C644AC5A2C1F21FBA4E18969948E197A2535592B294A1BB1D4A
+DFB0122BE080AB926C832EBA5B2DAF1BBDDFFFE449F7AD9CA252F0C02D7C05CF
+8521DE85D85A8ACAB2E6A8B684FD977A5BD5A993288F1DE02977258E6227968E
+D92E56FA3CA27FC50AEF8C6B9FE3FC74E496B34CF76178C6984DD2673B628E67
+DB89D947D6F6C89B51440760C1590638990604186FBE11B9D705FC0197CA4EF0
+32F17B6FA8FA09CE119550B63063A378A1B1009D489361110A1BE12C5C50A72D
+925C8A5ECB2908C8F07BD0B131B290DBA25E56C0C9A655F5EDFD8A4ABBC2BF4E
+8B26642B21A8DF00D425BF0EA9DD07FEC4FA1B221B62E5EA46B3FF5635E21A8F
+430A2C3999A42936D4F245EEF238837C17E77FB57DFC6C756A6AEE844FCE7C18
+86B82D6D8F0BB3E62A4475119C5D79A7AB72ACE121EF642054F2780BA215BEAC
+F6F286BEF9FECBD3B2978540EC9AA05E5C13115FB1B6C318A11C9BDFDC78FE01
+15969161C0530933305E2992E99655D0F5AB5CA24D35E57DA39898C0B2C52A0C
+1223C35DE320D69C1A2F78A85A08DA26A5A4B3DAF543B1E6C01CC551DF05C087
+1CFA8CE76194CAB757285F63450B8385636FC06FCBD781C73A4659EC6535424C
+AB88385650FCFC21FD62C081466C2F249A7D40DFEF42742C22EC2CCBA77A7B83
+DD1FC329B0AF8EE2DDBA98CA283E85E56832DF6F5B86AEFD92C37107C0908C1F
+F5F4ED75045C464F72DFE354419AD9C2C896C24562BB9F2DE4EEE226BF6399E8
+447BB56A27404DDEEA6F3E4EBFBBC17C061ED43C8383AF14FA8803379C8F1B52
+C5A063215D824CF1B42346D5ED670FE58F86B6BBA2F7E9FE53A26428940C2AE9
+E300982E3186B759692E52DBFD53BEAA2BB94FA12D4D819591544EA48E032916
+05EF0DA71116344B23EB418105F5C8E735B5AA749C5A15C23D0ED1E788762F68
+06F41B5EF001679A48416819766865AD986EBE2831D1316534A10E8A7CB9583B
+E021A0563E5B25CCBD0B90ECF5BD21C6DB5217CBA4814BA1FD521CCE06689469
+126F793448C7144E78B776FE71A73CE038ED6F7DEF99745F4B389ED2E0FB8CCD
+451F88EDB754EB4C737A47862E71F4657056ED02D0478EBA607476FF9C798574
+B7C13581469BEA14057E85642A4878BA582A5AB6A4BE90392A78604DAA46D249
+005BAB80152EB7ADFDF0B16688DA7FA55B1144F6148CD89013A9B8AFB329FA9D
+F0BD1C5F7221D52C6BEB34FBED698201B82896C71197B2D67FA9AAA984FF5A62
+6043B055CFD6F31FD7542BC533C7D69E83501C0000051B52F3F0DC5551B7C296
+368C5E766DB967BB1301E40C7D94EEC3F41BA6237F27907F23A9059E757E677E
+D9E728CA3DCD9146D5E4F3542A18299F9722922779A989B72ACAD00848E44BF7
+DCB02C951CEC716933D1EFA1AE2817D98D688330ED67BE9C2181B6805323F21E
+E93263B50EA8421FC555D983F8772CB6A426B8B7D083D6FD7711699C70F8B562
+25FAEBE44363F6DC3F36CDF15F83C740FB2856C1088BBBC2FC6FAEE7E3447142
+C17C70818684B7652C90DA1B1E02A50FA6FB36DE5EBAA050B3362A86315D3859
+2A54070071C74061D2B53C9A4DB8125DC2849DD90903297BBB5A7050FAAC9542
+F3CD9349BF4CBDC29265BCAC14675E09269240541705268012F9EBCEF5BBBFE8
+B0076CB7F8D9C24706C8DE086B9F060D7231A9FE7DB44798463D2B7FEF7A4649
+C206884B0100A5DF56B8DAAC505C9D9ED59B261F805E3BB09C3C5F8B780A7808
+FE2B68B7CD25559E2FD9D1B26E32111FD9E56D28D704F584FD37822AE5F4A0EF
+3CC7E2B8507D6725DAD5CC70AF63AEB79973A41DDD8C8E0BC7103D85FE2A3811
+EE7C0CEB036908B147179C7F1E25486F2D70DAE4776C29499C8E97A425EFEDFA
+1017C7973C0DE42E3E6CF1EF9FAE21D6F774ECEC4A0AD629381B843C19C166E8
+7E8F436BEE6F0EBEF07F1B6D1B8C7E8E14459A5FA050E593632939993A09A685
+F1FA70FA441B6F757E7D405C391676AC2DC501EA35A65243D7354B1A490FD4F2
+1ECE6AF1D57D57AFB8342BE8687F6E3735DF37746E3F3F71B3E63A32433DCCFA
+FE7A0375D6F1CF477EDC6CD0D548E7E3209DD69A2465A60FB8409088B6C50293
+30A9639461E5FEAAD6A8584E04298084A5D710B5D7F59507583C6EE5E852DD2B
+AB30B216D83C42899A2F350F3D574DC00CB995CE1B57A90DB9A79DE625823ECD
+A273E9660D0F1AC9B089E566ADB19075E97FB9A0B992D40B326151DE315C15B5
+AE231EB71FC53B65C524876CEA7F9869E9BBBD01D4CF73A8EBBFB4A49D363D99
+01CFE53F92F90BC95630D45370A2BF90EB33052518F399D5B86E08FECF79526F
+45DEB188E5083ADDD60836B13D9CC0C59A84F9AD3160549EA3FB1197A733C295
+A7C857CDB5A977F5413BD09EBBC05099245F879B5E7DF3524F0CA07130547C4D
+B0AC8E61602920D0EB40B7E417862B40F35E72AAE8885D7EE0C79A93BEC1A4C7
+3DA8FFE33AF86E0481536C7B476A82CAF598CA1A384146EDF7E3C18DDE51A6C9
+8DDDA3A2121AEDEAEFCAC1FD0CB1FA5D8892D6F3606D112C4C98EAE345B37918
+F1E595CD9126FAF19ED27E80A2E79456224E22BBA45EBF5202A6CAA6C1AA8F3C
+431F8AA523914766C08DFF42D1F5B3FB36271B216547173EE2F5A5E4006E4662
+A9EC5A1CCFDA4D608CA6666D7B3C45644B3F5431E824C1E15DD3696C9C142236
+1E374046C88FC82E4724B05D6384561EB10D44E3093D753E27B6CC16F6D4B68A
+5FC375F151F1A954AA28DAD59ECD7ADDBB3BCE9EC19398A56DFF687726B74AD2
+E2A74EA721A16B211ED6C690F149520F32A3D3FAB2A2270B0A9C3837E6589004
+6BE4F1AA1AB49508254D3EB0F37641605CC397EA5E1E6D8E386724B40AB30F33
+350BBB44E448CDDA807B3C40F03914C3DF4EFCC71CCC9B6DD814121809BBE093
+AABACB7CB982EA4E56E03DF76EF1C94526EB4532CF007AE4BC26E06AF6F5EA74
+A743D9AD19723277ECA4249844F2FF7DFE5040DD3C1852C3D3B4468DC6F90BB0
+DD666949FADE57835CF3919FFF2F5A97C4C6363DAE7A994D241C2928BAD8716A
+0246FD262F7F82C7F48279A4E7A06C87F72DD57C8C80D5803DCEF6187FA8B491
+0E1AE105FB51E920EDAFE4B2B7C7C794A3D4AC7E7BD07E68E5B47BE5FC3F5093
+F01BDAB6BEF28040F3F3483D33A385774708D1615A2B33C3E60A0D296129FE32
+695956D6BDD6C3A300555A9BE13AA3A28A5CB4E5193D920FE562AE8D2321DB40
+DB3E3C97FAA2CCE232EE3F2FA4DE9B43D06D659A770E53297FA066B23F583779
+EFCC7F9DF4A94DC222E98F3591EBC9331CCCBA9F22EC11A644817C50CC929822
+959C8EBCFEE25C65CA60EEC54B7929FD94A30A0B1A9C76F99CF7175F2FABA182
+33C6428BCDC146A0520F3CF64B758A29FD042D9F3DF46988F59039ABA15150AF
+12E7C218C74E0FE4B38D2D5EAA3CDD36918FDE415EF4AB277F36FD86599B4023
+D04E5DA5EA917936383569232FA04B82AEE1E170719F39B2ED3AE1AF79622E68
+4FDDC634B6F9D6F0C13AEE674A5C3F2E2583500629AD06B222E362D72FD77475
+3E8254F8DB6A39956B0A056AD47E0BC8DB844127E49D241B97F232424C12E926
+38A4B22BCA4BF4D2B59AC3F9EECDC00401830FB36E958FC3E658BF69BB3CC27B
+B65BDAFF17277C247121F7452DB693C441E4F2A6EA7D7D078900AEFC120B6C98
+4C05AD94D7925D57DD9DC4EA1CE2118D990D40685E82111D783FDB03CE0D46B4
+86F22EF08CE09F7D3A77D4F3BA5A518295C5408E40738CDF42482E29806680AB
+9FA1DFB6030DC3DC7A11C376D5C90FA122BB8C767F1763F69EE6FE0F7CD0421D
+26C4D54C05F7E96C7A33BF9FB8A5C4126ED5C3D9D0D20F906D03D3737FFF324E
+6B86AC6A449406A09CAE8499188E55742DADF7F091EEA4F14B1CC95F25B7F15F
+9D1377EB09C31894A2BA92BF560E4AAD5DD5CF4BADB64AB6DEF9B77EF2CB53E9
+9CDCB8666EAEC3FB5A176A7D1178BE8B68BC598D25E345B49CA0ADC71F783E3B
+51D3385F433160A627C7D294BB50F33D70572EEDC2198746DF5E251357935582
+3FB026D7E40C3DC56CA58495355D016A874079FB707D459C7A82AC363A06AA5A
+1F3FB764125673A7C6ABE55A6FD35764E22D36A9D064E131543585D711D1DEB3
+3DC32EF9462AA51B4299F6B30BE810E91A5C767B01B82CB5E7396259B9947766
+52EDEB2E483AF7B25DA7C1A1A4DC4CEBB9A4A42A70B012E7E13A5CDAAADC0943
+BA17530928B0B5E14CEC9F469D7284FB6FD5EF1F2ECB6CD8B3E1053240F69D1A
+D9F49A6145AECD3DCB7966423B66CD88577DCA9D3E7A5A53AEE552E2C7A00D7F
+5C545743DE91634F06418DE6D96CBAD03EDEB004E6DE163C99F4186CB6060096
+797CFD9A76FDFFD5C42C779F09707E4B99771940FA686DAE548E62B70AA78312
+747307F41F36110B2129D07D037C04A0088DA4017A12DC6A90797544409E7B85
+E0241CF596A7FCA467D38E94564645B27877809EE6A306EAB9E2495F44E601DF
+375FA773FADB7D5EC41E8FC6D7C8384E780A5849C0CAF99CF3A4ED384AEBD12F
+C3B27427CD545A43863E826543CA92ACD75556868EC167F5AACA3D2D3E8DD5CE
+F53437BD77D1023AF92158EAA5B41B64BCBB00EDA884E44700990C0D1D208405
+D7A67E39ABAFE4FFF182DDFDC01AA48256EE0538DED57922AC2085A5AB34FEEB
+9C7751F6E23F8B1B57ED84538631035D80196B3B4104D0AA6381CDBE40B24203
+F5552096906D07C29946932E2C38952C6E7AF7B298F87B8F3C950B6E86F0C796
+F4C6ED6CA67916D8A3A85B4F6BD091A2C332560BC2A619077D443A7652B07E1B
+B10F7458457351DCFC7BDE64999975F27641BE52BE933016BDD6650E6ECAF3FC
+2370092475D7E94485F500DD30393713C588AEEC74D72A3535E079B1FEC0256E
+15E8D3300E2BE81F4A253567FB4B7C3A94D1429F4D6C6018C485F4DB981A3C77
+08E8C8040D00C840F2A1697244C5645F5BDEE7B0B5095138B9A16681C61928FF
+EBF47AF4B5D2F588221BCE4D0279B2DA2CA48B779C47AA0BEE215AC22ACDDFE2
+F9D54D8A891F40CA17C4ED3D203796535C68D2E6A145048CA6DA7835F7CC0BF6
+7064EA041AACBD417F50D1E73C9AE7547A4EB82A347A9BAD8AB20D8CB27693E0
+A3B4185E0756B0C1706B977A030E0D619B7BA612E7E7F6E7897AFC2A1E3A6B09
+8B05907CCD5F7207EA8E6F3AF2A8764D5480CD331031980DC01F286D1AC207C4
+6EB217124BD0D50C683E89D01E7189CF913B1868E69B3EE7F42891AA92203422
+4E5BD11B8C32B0EA4F1B4C2D2A3E31F24833D06CACEC187AECA366C7C3549F67
+5987FE22C0387982B0293A990D11A47C788327B36AB4FBFC1E009650D20F6C9B
+847CC9C49C376CB7A55A20120BEC302DE2C91315E9CE008E04663B5FF6F11477
+CC5D6C4D78CD913E492A0828B5EA16420ED299A44B95D0B6AEE95CE4AE1F14AA
+1DB92901A897634996B3C6A89E09332656BD311424673A8FC9091B55B2C985E2
+0D5CF45EA16DF6D6AAF14E9F90533C72FFEA93F63C7E9D591E0BB9FA497A94E8
+E2D9BEBCF1D24006313426B494EC890C68ADA4A720B30074237606E33B9179F5
+FAFDD7784B8C060F0C6C1E97E5796012AD8EE78D4A2A2BC10F1539AF2FB78139
+2D70D2B67F6B5B3DCE512A9B745F7C2447E1D5CC2A0A4C26A40CF5624893DFEE
+F554805F92DD10619FB0F3E73856D22E11FB0A8B916C6AA0E3E899A06F34429C
+C0862EB675801AF0C694B02BF89E602D3FC296C97C541D973CD82C1537D90852
+53EA3255E4DE8C623115FF1ED668BA81A46A1F6C2F31C7DE54347665868178DE
+AFF82E42A770C5CAC87A6FC8264238015DC316950F8C48924AC22927923BE41B
+4948FCC3B9FC10E7864D1553A7F4E93806FCB74F809DC782EB83824A40857C9A
+7895D3E03BBA1FD53351BF143059DD7122618460C08E1BCB21CB7D5CFCF04E68
+EFB20E142EC43EA066CC4CCE7FAF276BAB9535B3DDCE9DE17B8C9B92DDF42E3E
+5C0570D4D4568EAFB72C908516F6A1FB7CF7CD69DE6D7C051CC7072E62F060B3
+2CB21B04ACFA1A525AA4D71EEED8DE5C7C
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+/TimesNewRomanPSMT findfont /Encoding get
+dup 32 /space put
+dup 44 /comma put
+dup 45 /hyphen put
+dup 46 /period put
+dup 48 /zero put
+dup 49 /one put
+dup 50 /two put
+dup 53 /five put
+dup 55 /seven put
+dup 56 /eight put
+dup 57 /nine put
+dup 66 /B put
+dup 68 /D put
+dup 73 /I put
+dup 77 /M put
+dup 81 /Q put
+dup 82 /R put
+dup 83 /S put
+dup 97 /a put
+dup 99 /c put
+dup 100 /d put
+dup 101 /e put
+dup 104 /h put
+dup 105 /i put
+dup 109 /m put
+dup 110 /n put
+dup 111 /o put
+dup 114 /r put
+dup 115 /s put
+dup 116 /t put
+dup 117 /u put
+dup 118 /v put
+pop
+%ADOEndSubsetFont
+/TimesNewRomanPSMT*1 
+[
+32{/.notdef}repeat /space 11{/.notdef}repeat /comma /hyphen /period /.notdef /zero 
+/one /two 2{/.notdef}repeat /five /.notdef /seven /eight /nine 
+8{/.notdef}repeat /B /.notdef /D 4{/.notdef}repeat /I 3{/.notdef}repeat /M 
+3{/.notdef}repeat /Q /R /S 13{/.notdef}repeat /a /.notdef /c 
+/d /e 2{/.notdef}repeat /h /i 3{/.notdef}repeat /m /n 
+/o 2{/.notdef}repeat /r /s /t /u /v 137{/.notdef}repeat
+] /TimesNewRomanPSMT nfnt
+/TimesNewRomanPSMT*1 findfont [9.81659 0 0 -10.8923 0 0 ]mfnt sfnt
+BuildWidthShowArray
+117.875 21.2661 mov
+(Quantum Internet Services, Inc.) sh
+117.875 34.1584 mov
+(2975B Manchester Road) sh
+117.875 47.0507 mov
+-0.392517 0 wsa 114 get (Manchester, MD 21102-1802) wsh
+grestore
+grestore
+Adobe_AGM_Core/AGMCORE_save get restore
+%%PageTrailer
+Adobe_CoolType_Core/page_trailer get exec
+Adobe_AGM_Core/page_trailer get exec
+%%Trailer
+Adobe_CoolType_Core/doc_trailer get exec
+Adobe_AGM_Core/doc_trailer get exec
+%%EOF
+gsave userdict /annotatepage 2 copy known {get exec}{pop pop} ifelse grestore showpage
%AI9_PrintingDataEnd
+
+userdict /AI9_read_buffer 256 string put
+userdict begin
+/ai9_skip_data
+{
+	mark
+	{
+		currentfile AI9_read_buffer { readline } stopped
+		{
+		}
+		{
+			not
+			{
+				exit
+			} if
+			(%AI9_PrivateDataEnd) eq
+			{
+				exit
+			} if
+		} ifelse
+	} loop
+	cleartomark
+} def
+end
+userdict /ai9_skip_data get exec
+%AI9_PrivateDataBegin
+%!PS-Adobe-3.0 EPSF-3.0
+%%Creator: Adobe Illustrator(R) 9.0
+%%AI8_CreatorVersion: 9.0
+%%For: (Home User) (Home)
+%%Title: (qis_logo.eps)
+%%CreationDate: 11/28/2003 2:59 PM
+%AI9_DataStream
+%GauF[?*@h]EMdrp!W@f6$NUr(Ub[#Qa'-.)a&#.UPStf)"(O"rnnXA!<Hn+8=%f7ss*$]RWc!uoBR;?7Mdj$(c9?UDPo9,3qaO%C
+%rop'SjbIch>493%eR*e#QQNu=qGtr5Q<JNK8,\Y'TDn))HM@%0boaU\8%$q-$\+CU:Ai*(UY=_HYEU+L7k4Mp?[nI#I_!5ioYni]
+%F+<f+?[[2!iSuj]If%=_IK&9qs845d^A>e*s2E$&rVb&kkth<Aci<RRT76(ohp(Wim[*CVgu&%sro]o'pp,DB`@q3ts8)Werl)?R
+%J,TB&?N5M&#-7CTgQ+J^O5I\6Oh]SAhYpu4)#GE3msj'[dm*cL:Wlu?;0iVBht(3ik0n7_rpZtLrTdhjk.B6!\+g33qjX5V_r#k.
+%lQ%)Cr;;Vica1bYrNcH<o0/Gk*In!05CNS2gM]9(m%6Ihr9a[e+("_bs7C#Tr9CcKlArYmIe2k9s882XnbL4Sr6;FW[_mH^^O6XL
+%miR#Lmf!.,LQ>g9:N,>bTE"KWquhNL%8ZKR\*))prV]O,Rd\!sq[:V\YNH5,H%+3@iVAgIlqa8K$l8kG\%hdms7X5*^>\V6hu2^C
+%s7PRP=7;_nJ+qp&s7U*>R\flY\\Hd(pWl(^rBC8,%p[/ihKT"nrMRtKkj<StifB`2m-XC#s4u<+br<see[P&(a+a!]oA.HZ^\s)Z
+%s7=.ls8VLus7T7f3P?GOq=Ecsn\nl4)<p`#C3[q3/,tJ+k1>(VT-$1&dUi@<rpoCLrR638q$?X`jmBR8s8:]F^OI]eo=QWO\+WiT
+%gq2\:IeGkdhZ*4cs7;</rmU:NJ,F1os5N(:?bH8#fYHdU?Ko):rqX%lpW(&KlCG*QH+U9+bPngYCVL*UIeW.mH/G7-r4Q`hrqYA#
+%Ib?sbC4F[lhLFjks7ksihuE%]^]!_QmD%=`:&=9FrpK+NeLs/bkN@d&0ZNT"^<ZZ4+!M4:"()cOF,QW\@VOTcmG.I)mT]KVhg\%0
+%m`H>Ji88s1pT&LFrR`LsCfAA=I*o^c++M#fV]Yrc^MXkBjc1G?^Yi`ea62@UiUbsemJ3/NrAPhUXkt"=95j"VIltpDU\"6ZH[YqO
+%n",iQ_e6a\c4g3;=6m%RI-Fu%07Whb)#mZ^`qp:]qX18rqj6JYI-.nFJ%*VI?i9iXZa',VNurY2Y<d*@dbC[\hsNF.r4@IYmB;GT
+%5Q7F.q*0;tM]Y--i(JM)%fDHU]nO646M_?Xpu?g.m&r.p+2@c@^#"4D`uAn-gQ0PRj+AqqY)=+qkF[2")(gknL$S+ccWp82[ibOu
+%TAct\s+YCd22HOKkC;u&_Xl+6q.G-Tfq*\Bros+Lb?s_IT7-M"",OVII%S1MnF>fTTABH9Dh%<VrS,YH_f+D9^A[SopA32.Wom79
+%Ga>i%@G]jho@@%iSDq`knK6XPgi&g6s,DNs:&i,c`s7_"8"T8,=3p2[a1qYngD;t6B]$R.Dnl5;>Q*B+^RP,rb:ia2hT#PIhk0f+
+%Vp><ki/Koan+=AEqsiK$leQsXksp49j.$(cDmE`"o&jo2:VXJ*B_'L,YA_2Trb)7aN=0elphjI<N6geT_cQ;Vo="Ak-\)-)+$TL+
+%Idjslrk\N=s7*LGbi.q*^Z!@cq99ias4s]bW./ogs*[uEhe.ZCp$2P8$N8i(r4?(ls0jlbiA^PR\*r5SD?#c)qSUk\iYVXW[Je9m
+%msjpnqWe*d5<mflo0<03]5N/hmU,\ain^O.laOL@s(6c[qp0r]0>@;5q[J]OJ+`PCJM?QMIC6ibnBJQmXSso.5Q'1fJ,O9aj&a1j
+%\+9>bS*g$(DiZ2/hu1n$/[.>jplAOE9]YRWT@hruEW,SaSf`HuVLJB<WuQT_L<mWThu3GuqPTDCroNO^#5mGl@/KnprnH3%htc)X
+%s*"G7YMX@a^o?5jl<b/us3DcVilVcF&&C&.DeD03YCH3Zhr3q^M*0els*bW?htI&94oaTGI>h[uIdQIfCXk.<D+EgAIBP_dYtGpt
+%=2e>-d:u;*;=5H.RqqA>hXsF[>UeGaQe4g,Hd+P0=QLP$)HUi?otKlkNk=H+`lW#k_/AoeiGPW%Z0eu40.fW,I-U%3YE7%1b"fS+
+%j!_5<?@H8AbRmNDnOOhBeZUL*qi#oG*nM=nRWhnm:F.jC'h5fJ)#<6nb\Nd.*%Afgk:3I$H*mAc[EilaH(D>IQB,rb<ZA`mRg6.i
+%5%ZciQnA'\O"28g[3O7BoQK;AAj3ce*-oN]"8s.ENOeTgf8AP.+a-':3psW#CE;q=l%j^p4mQQ[a1+`ZUP2N7CF@;O*KB7:l.C3J
+%461k94j'`!Jhq6ZPGa<hVk*]E6:n6Teos=<bji?dFf1_J5&0>%[I]dU)I`0ro;XmUOk*pV-D,:\qfVU1f*Zf.pE?[a*3%iYg>a`,
+%msYF6DOrq!&j>_99@#2o5B.c\!%R`*e"*].m]115@>)E4l_DJ(lE7gZc=S0!Z"tj`2DMLi4Sm<?Pe!s1j1\='?n7N:58Go0WTQ'k
+%FiJUrq<:RiQ6XA\Q@5G<2eI)kHQQ\@;,R`QcQ7+r(h(1*S\'h:VCT,>B-6['CYWQ?EMg?W[qQh?5O\N=a3+'qA^f$c4*oDg?<H"N
+%ETFCu9NO74S`OD6f6,=MbAgss/YnJ$i+(>qOc;U&=F<GQl+#C+b`8g1qPoBPD-,C04%f7<8ni(co1jF<el]`EpF>LImVq=U(M$h'
+%IJ)94Snj%flXosRE[>l=0.:JC;S_GkN+oL<UE0)"B>8ZPI1P+ueN3QFKoS"aI@#ChXW;39ElW0,PD;/*.J,W&G.\47S@B[`_!\KN
+%(gT7a3jH\``K->;_BZD@/XN_f\hWVn@)=;R]CGn<cVn%C1\/L;2P,?C4BP<olT/.mj2u/?j'"BWJ3U@'"_>EWa*E7[Z1ko7)),bI
+%#)cZmKVKW!\GW,eOGdc"LlQhRGZ_dG)S=^+JoGm6U`T;X5:Y$b1M/UM^@TDH"1e;hCg*j<@0!J;K^k3"`NaE%StD:mFUUO/%R+HT
+%!AWF%@dj#@&Z1e>4iXbY?-bOYN`Vc(XEK(E%'N,DMcTnKBU(\9cWObKOd/`#=`#"6#h@_7F6&'j865j7$Q`YbX9[\#3jXSjSn4]p
+%YIIJ'\`-j:@(R?'h=I]qSpo\LGR7`[VmL_k[dhp,=5`9"j2!2\OQ:*-CWJ&C"pXCo+2.*!091@26o":%c4[9)>moF\4=U.LEPrSE
+%p8[4)\LebbX'<?U$l6Hpo6$*smW=[<9NEp-d5i32i[mgg4+Koig)3RGfqhOQTQ]/'QZCpW3O!`$PS;f*a[ESL?6Pgi6OYR?!t.21
+%R^:l&"W$7KLdX0MF)ElpjHG"$QWb8jd'[Hj\(PgfIi\:CV5#t6\qa-QAD*#`^+M`Y3@:rPRs:2)$ZV4Fle*4Jg@dP1KHUGQ7Q$e)
+%^lnNc3WW0.fKpo7p2F;"0KXh=9VMhaR*0agX9fb'+giCS=<k&W3tN[EY^I*VH6gr.Yd7eQJ2)D;`eAWU#)_fP6+p\(3=$D%?A%5`
+%YmGBni)Af+T9su\rB<h+3)[FT+o]#ll<*d<;OjCT_F;dGR(Hs%K\!_@Wr_/FBI`&rE=#FQUk>nP5@POKa:0+%SkJ<-4&7\3]Qi2:
+%!0O#jU*'A36)Jr.*3fO?irJjl?od'OXK56U\U'Au@%q4EksA,m]Rg[X=$ElP4H],;g)^X;jm1j''l57Rk&B/H^lqj\$aRapd+7Kn
+%^mJ="I0&F0$'Z]I*q2ofPS9]RcWJ3N-g6*NKSUf.PpOK&ApWu"M:Dge8d<U7KK]AU"L/;In$<XclW"Q`9e[e9k6]#d8mD@@_4s\K
+%?E%690rsKA!0c8WhGdNpC/?o)4c<tVFK>pE,Q,B3=QGp[%Kd2M4]_f`X8^l:/T$PMB`Vc'YHJ8e,)WT@-WnVK-Xo9(js!i6L_jKK
+%&f5I/1Ukr<Gde->ANl`_MF8k+f6+qL>2A/qSTb@d*e/S=?(aI>i)8"W$*5(`d##ub/9i%54pZ+/W&GtOK'hn10g?Jei2V1THGBaM
+%+F]k/7#,uD[:956&E;:F/>nahDL],mDH82R?[QZtoObG]^0&QI'KY/2i"@0W=(1e!"iJ4]E&#)o'aFHMY7[`(''S"C(aslG:HS9k
+%2T?,.dNM\E%flHVgC1"/M!tg:IdipT]tg0Bk+B:G&AbRpS2E/0/+I*S-n`6V6<qlFidM@gP7JPiQ2L%RIDXGh/GT8L5SZ24pG`7o
+%K*fGN$(hqlg(ECJ]X>uAJBNOXYX6E?2S@:eFfB=#!s:ZTYFJ?Qis[m=pr#*X!efa!L*8b?Q@U\X']V.IP`/\i)kOrkhL+D<lce<u
+%YD?QGLAkl%6mJEW[!Dc8\`T79"q];PNWD%DE"Nqs`!R-&@EUS?NnN<OY6-BW<A(P]7:J>%D@hnS?,GCt"1SfKd9%J3q!LGJLXX7P
+%";p;):Y7s%5mJR+YQ`;^HCaC<JI`=c0o15]cm%74pP9Xhs.'6-EF(S%"su<*"6BQO8aAJD#g.2n^lJ)&2\@*`*tuqZ<SkOCRIDO7
+%nuA).OSb9"CVDPS#B'TPLsIRaQO,@!'3Ga!#l4VbL39SZ5f)@;k!9?21P<uGp>.pW=[+.A?Z3g*+e`p/$llF&TftSmpkN!J9F5Y>
+%@i"\>Vk0Oq)lCEehr-eI-#a]iM>B:dM>!t.Jpo&uY(5[<;ZPe]Z1(B$$sK(i0eghb-Yb/j5*$A#$k4PLYs(ak.WL1E;Sr13!F44m
+%L.o*bfndk*N[c9842H4c=d*5n<k`hH$jj_;0DmIG0`p=pfH>#6DC2adMOj,<MDl6X^ptTiU<k1r5u2N)f8W9Gj"1P&:aG9pA"5"b
+%S<Noed'+u.M(fAq&"pO%.WFkl2e^jZ.;Tb<#FP#]2*dgp5bPnh>=&LD#Vl'&r'U8jipSFf3")"]cRTGGs#)&@a!U#?05LWeC1f6)
+%XbG%$7FAaZ2nfFu4bL/DCJ[nTesB)u82[aZ5ruhi904e:"qhS:9ZZ%b5SDFn)jU[EK$dsV$V,s0-hn$'AId2n$o&e87-83lOWD<^
+%2OAXsm/q'Y9UuQ_JC2]],2\S;0SRChZ"M!p5WE7ckfO)WM'YqD*SLKJ%9&Pr+JK?4-_*k,#<rdMCug#_quUqYd[bZ?d)#jYr;8W?
+%pgjCX=SfP\j)Hn>)p-)0nXdf&Ig:Tr7e=W=Xoi1PJd7G]A=+cW:/'C[]1BR96$Zg1;T`oj-p!#IoPRJi811?Q^sRXlXJk/f.SbrZ
+%J8+M<_RQ:5SV8=34F43^:,q"tJ:K"4iN",/P/Jt>Y5;7%@[e+EjsS5[N#H>^04NSPqA4'koC4-pcYSDF8pD)O.g-&RG6^YcZk:9B
+%mfnpf8R\MN]eCeCa3#M_TLirDWZ.C3JDF%pC\SWn%HE"c&XWq7^^WKN63t%Ok+;oPL`dCSUG_nNJCDLBpnH-LM^U?cT+:7,pDa8@
+%":_pk'5SAi_\+bT]V\Y1BgKfD;<*puS/;[s5S0>2cV8)VXO>C`NIYgHS,F(]^o7t/=C'SCaV.&*E"E^)&"QK[ErnQ8q^+#7LKRmc
+%6fe-><V[J^)3]iaZJF1B6#(tkfZ!UgQ/pUWg`!/Fb/Ssl;0d+_8P:0_HVa-1^@MO[n-3f.(!s@)/u/#-#hCfPRu_#iq.pm3$;<jB
+%0slc[kX-?o4``87;>3J1+j0Aq&<q.4[G(+-iZf-S3'pY4AmRS'@LQ+)+=<oQ>VZ\D`%BV"b,.q/#ToYfk=-W)--3[cFTp8s6brh0
+%B*Qb.o)<;75e*?jhu_$:eqldG6%N"O"th#1lAj[6h6?iG&;885ogW$BTGX<s-5JA*A:ZbZ4BM]m`+fEo_V(AS>f[Ui!t()Ga4`6h
+%gmN;=`3Z!^=PNUt8CV&/cPmC@ngiA6fXKP-FCG+16jb'FYR=8`oEN?eA1e..-`A/a$,79Bc+P([a8:UgZ25l)=HO%nZ"Z`\TFdTE
+%RmIkJB`TX!s7+?nd[h%nO.$)k2BdpeSMCR4=ilWX`^h6aH/K!eNrsjWNk=4J.3!#+^kH2C2g]f='o#[.EXq7?X+3<O#WN%gKte;]
+%2ZcM%J.W$b`Aq.TMOkDl_C+j?0F;1GAQiN8dj(A0J\i-4_SG3A5u>MZ#rZ,.TBr#$K0[Y\>pn-3PR3a]KJd!Z)@Z0G5A/Zs]9k6.
+%S)l-$,LHkk$(Xu1!=$%ZceJi#8%XRiLZ.0!!TD</9H@c]'3KN&(HamX$[<1H`N<Non2B8cngG_]LmX:TR@s]E/MDce3R#4Qf<H5\
+%-Gl*L"1N1-1+3J/,X?JSj9p&4ntF7>CLc0'^5A_?iZS(>G_TZa+:J&V_^$&8!8<J*i1WF,6APdOMKogkf6,4:@At)#?;#6#7Z?Ug
+%&-d^7+ab(e!fQNW$gJcV`qi#t:)j:7*c@@i26j/@$L@j/ih8DHS5-R6i<\NNlf1ieLko>&UkYV'rAeI9?8eM[SoUg/M(L"rh7AX`
+%1]H.R"LAeN^E>=&g>G@GFIqJ+]2DJ::hqm7.lAGE49Q(b7D_W(hr]kJh\';A'r;%SJJd=.3V#Wu&L\k>&MRY"5)1Qi(uE35=='nZ
+%1i%`=_q#.cGgTQtJ32mo0s1qQR/;tKTI[lWM6TMU2F;iP1E\*u&QG;3W[HY&YVOl(KYpalFI`Za]F`CC;[>E`IJ8pgB2)4=-Zjd+
+%_1*1;(CuLH`Q-fmM2+.3?Pl&llE"_]c15sIgk=,6ehDA5#(UOM)MD"U-I>-\KqY(g,Jn]tJcQC,@Y`_q(*7[`\uphQ&la*)e0^oA
+%eqMbV%kGGJP,NDVCZ'1ORQG&k^@cId31%i*PQ5h\T\SUpcuqSm!^HmH7V^ps$?Jlu,f)%:PXq%/)]Ld"P9OVDNn9![j8EDc$#bBA
+%%74eo?s\Zd-4j.jB`rG&r-Tu3Lrqs?1@,"F`S6WVO3A0Qo=X0A=F_\#ci\_/0b%g>7KG?5=)^HG?'l<_"O_jR%_am'Qq)ug>bW`6
+%?e@8CC&4>JI[UO0Yr?@:W>roE+BKs?A`Eso@BV:mi\hMQYC_rpp7c"VODj>FJM'&n@r9T6eB.sX:D<8]9fbL9o%FQ+!-L:;,kbJ2
+%!n8/r#qcM<.8;-l@!DM_=[V9,&UOjIAJ057/-gHDZ]3pO,6jZpYP[O'<:h>@4nWM'(nQ1`XMNu>>(tBKa$:a@`VcmYL=:]j^aB*=
+%@q/@ZmmL!>#'O.T-TjX[Rr_VPJNC7*g,TBQKaAp8p*B4t""PN]_1Q/)GIi`GY@O58,:<eJGD91MB`q_(+0GpFXV!lb860d&H)Ld,
+%Fc($5PWE_=nLtt##;?;hCO@TR'bPR*)1#P':Bq=*ijT`RLoh%\RMbUHLhdUfcMi0NYr0'lQQuS#.Y]A,eH@T4fi87oB>`(OaqbsD
+%as6;()dpZ1-dWn<Lr'--%`AjXYknL@r!GKpq9"]aAXVA4OC4#&b7OqJ8A'XmA;D*YPQb?G`=ad*kh1$.N=^1N^`Q]pF9/6?qaRhi
+%'[Xg+nNK'uR8&9RK*s=6!nq\V@&>K$<[[,k^nJ&.`PVkQ@B2akZjb$hQJMo6]EP@V1/6s\s,X(8BZVKT<g%!_^"T.Sj&:6k$5pXg
+%j(aA,"`FOLHA;^@Yujo\]b8W&.2jo.<O#_`-72ga,BuAS%%tDd&\ku[Gl1,=*!%sc!cZ6/C]L*+Y_\IHhTXt#/)f-CpAmDBeV],O
+%0M4,<&W.c\@"empjpOsje8.?EMGku2M]')=:K4S!S"cn`mW^%l/K!Qj=6W;bN#+`V=?)Kt]m@Ilpa;6;nVW"51]h/RVtY2(\)Uaa
+%G$@+h2;:o;7iKEfcIWBj6/+%.&Ar&e<raY*+m.EN6ltTD=uIDJbU;K9MXs#7*L)(TJC3>$%Bi15#P]RZ`I>[,M4OlZ0`n/5V;FS(
+%JZ'9A:dl7f"X,W5)SsRFHV+\c_uSR+()P/Pr;.p1LbJls..i-_F!!JQ5_9:1Q!enU!e]u;(J52Je0%Z@KcG_r-^fG@W"t%tp+-kT
+%L__T,GVpZj;*\[XK`)Ro`OQ!X*fdE;,Q]Y'l+H'Z6h\;%#_A<-pUK?hl0qXX!5u0PB'#])@+[77D^ml$+>DR*i'Sm')(4f>'NXon
+%q)pJ(6r]!C&`tgq,9*50I3_c;Q4CH[606@/51'fT1"O'AFq]OM+ZGOB]If8<TTZkkN7dR[Yr!MW<>#BFTaCV<jYU/3CXa0K$jD[T
+%DSadfj@b)Dni%.+ab]B6djdTpU:NJ5XZ1J=]Tg70)PhZoTqm#oG6C+<i9VeSTsT06PgFS>WQrfE"I=FD-Kq[:3hkJ1/tVBK3oQei
+%_Tdb]ZcHhYp4Rd6;BlsA%eL>.I^#444O%`H[Djrl1%0-HB.mteNJ%$A/=f4]Lo<HJLiB8S*d>E59\6u;,q/odc=4UT_G>F/hN2#g
+%+iA]>XF7on,;+q1ZC>Mg\CL<6"l="U!:90)(RW2ep]Y>k*m&"*JGB4N$KVT&gusLPYt5gs+CdG=q1:77.)pc=_7UOg'qWsL>4F>J
+%ma2MjG=YuDe,etKF].'=-JY)(J:eEIUD4NeY=&@!F(N',o!SeJLemPo@V!.-+I:XLo't)8#^0S[MK,hM3bM#7b]$6l.BEAlf27\t
+%CaI<_i-sW5krD#Fc%mTXEupg,L[2k+d6/A5<L9]IOSCNNrWI._fBDZ?@D>2VCrld/CbgAj0u/3<O@Z5e1XNS5Jcc%Ca<pX=DX!GF
+%+r^Er8UTY\9S7nh556`aF[U+EHX5cq5u!_<o9>W'/B"t&_+-c(b[iZI!AZbZ4,F-2`^2r/b=i3:mWg&RBH-:OKEl)-;IG>#ApTrt
+%AQqEA:NRcD!;J5gaP%2H'2Ane7)2U)Bi82,G<.I$[Zjj?&8PUR]79=F[DB%9T]G?i-O!E,"[6&tn3j#QmERmF!"q2_JA6gXoq+@q
+%rHuPr+rV\2Zgu*)>,^kWW]ARsJkh5q]#"h1<D?Fu\F9]O'7kl#B4ITGC`_JkPlV/5@(m77fd&OM>!+MaVO:!p*W-:Y?t`l(KkFhN
+%d`(sq;+,qJfOnLO`hnm#%J7J]b9V]0n'/-AKIKe)H'`Cs9%A*Mqkj\*n:=N0"1c7m/eiYdf61^!FUeJt9kZh3AmthO$DB;A6X3=-
+%#/9e#!V6pT)%O410pEfT+,>*G7d.8_8Z1fZ!!]5K=_<;l]Wl4"ijKcIFj#n\;U$;6`q))@7/e*X36p"E11NOl?Y!HO$`\L\Hu6[0
+%'(PDT+s(^u)i_MG'L41Vg6A74LBjNJ&j_'rr.RZNHgkDP.)q<2WV1^jPm5GThUQA6Jkr(YfXWJ47_ihc:5k[IjF#=Z$.f@C*8(L#
+%-l/iaLjuUZ'49>\i2@s-++1sE<:i*d#YIHtq=8pmoRog.L)M0C%[c?OEZCS\,Crm<Z[qV,@tDbu,(=j3FBD`!%E*X^pH[1o=\qaN
+%!V(M)b=mFO,%-CC1[P68KKuj[k'%Gcn1[($'HJf.?HNhX'?Zr?j:MX2.$r!kHBiG2@J6;?7_\Mi%*fVNn/S$t2U@3VKdp?leM)-5
+%&)IO/N1ai_8i-Ub@>8k?L%!:m&f=c'qlL"Q$3d7k,alKURf!@dop@"u^)@]d!3pQEiq^MB"9oCaWk&i^U[hffB2_4q,PJA4&)>\$
+%#N/^2_"!O'6q$]D@eV!.GU!0VMrcB9,D-j7jZorA+qSHh"YISl!u&mD!0U62)h&h<d?)EY,Ean!m(t8(f4+hRm.)$V^Xen5_oR@C
+%QiV^qq];G!'pSb:JNG:[?tD9Zb5.MlYkJQF?q1?l#`&&*#P?Nii4[Ld%`osfYb)qE/a4Z2HWQ7<"N,Nt'-=ki5/tTEjT<`4oMA7I
+%`.LAr?<KHTBkYS/CdYjfi*uucKn)DtS8h=E8qmQ$'98dBI'r3k[rEh!#N;[r+YgY9\9tWpqeup#Zl<3N($*uOKo/V9:Cq=r'U(1P
+%IV1t4hPh`4cq?JGp^H))Q6>gBaj=cl+/)T6iISWSc]<L*$I*G&SsY#a.+4pJD21,d\FKY(k+ND=dm`(?:^k6r?d,"<"CWRq_?$l7
+%#TE6@1f&f%>q`oORPL;t)NVB;E5tM>9u^Ti&mV$KKLD^(M9n_.meMI5+PLpd*bq?k_E(nSm10^8lK@b7;[u4f$DXl!Db&.`>J:R_
+%($u?V>m+3,eATEtCDF+8LqZLIkA@%_+$At)]F6r5\UsWu&,$$ul&dj1F7*T[cer5><9'@C?,0PXJl![[pSWBm%'otObpU'<)kM`p
+%YkanBA3L6uWG[q"VCp?k8-c#t#uQLZUfof4BPQUJ?e5'JUE0+0g"]eD:TP$WcUdF5Cs9IQYU+8LAjXnO',<-#G(R@e^pXZ.p_!Q2
+%?eHj*]YRi/Zlko?=F_1$;G\M-b0*,tO<8<'?*],U]UP<nOLL"/I1:^07.WcD5`f9[`O*]3GiJtS,0A%>gp:CbOugh`Ep#0,:T_b>
+%MlmFo:dS_.Tr8dc#^51oLlT2AGekAmWiTe9bcTPbcV9<-iH0M8CuH(c(U!<Sl#5D\9n\UVm)"snFt)lT6@Uk2a.d(u&9`-LR,3d6
+%:(-#%fBS\-F:jSL9.d=t3),\p6%Adj&PGgO"<mZP=m;SgCJdNHjBrB`8t>Z\N1pKVJ>c-QGTO5<PeProK[g7d)*$$,#4VRR)8Ppi
+%COlZ?iuTeD4?aD)e1G*6"9JlsId0"OiYb)(So;!4eI':!2GBO32\7oMGdMK^EcdZa6Ig_NemYgA-7^]Y;t3O/+'/[c^dPCQ,KHGA
+%0&D('e^QF$Lc'aL"'pY6#AXA.(8,0fZcUr1HoehDn`SuFZ)]8qr[34oBKWL-RkD`LTC<Eq+_]ea9FIjA25;Eap1/Z?gEo#op^.$8
+%D1^B#G4Kl/@"WR]$TR.Oa;/_SD_#*YF.g?aNb1VC?TX2["<T>@\j+Plc.Jn+:u^g]8-mZ'7oj=N'U?`3f2,!kTAftiXdm7sn)kPC
+%Os8ADULIeY;*=Bf+\&?m98>%%a:ZC:>5LIe#:g@L*"0@1!0S9\"o"<lAL%X[[)jcSkPJE/B9n9kJj*E)"aIgRk/'D[#o@ilY@(7m
+%DgRq`6C^5:(.gr.aM+I#L%.W?Jo,IjJrMG#R#7(ljDjl49i@\_l[XlLT!r)F]L6$ZL%/E7Q!KK>(g'3$3$C(d:%/_8X_0a!mBWWi
+%&i^:L)>M&_ZHh0EY_KWUQ\?tUBrmL`.n"IH5_jj0b@L[QC!*ZAcF1i/K,fg<Zl6<lRYkhp4b<N&TkljuAPZ!SQ$^LU;qW4X.sQp)
+%h*`4smfj8Cj;02r"?*Tr)kKK;`o&a*%tn/VC6\o["?fa:Q#7'N"XTDMhZ;kR3dH8/jb!5pmjSm2JMe:hLa1P&8?o:Mb(ng]+L+U7
+%4d?uK&ek%V-FT>q=*.akl%[1JX5QX7(QT;76hmq13%T`?h(P)e'*G%e+>Q`7](V54h"%g;YjNHjb"okM`2<X.Wr7RX(`NGUU^1gP
+%1KIlc<3T(r!XpAZ&,mQg%-sd!h"Z+r5QT4BTf<<=\-Y,0iOO_8VLaVak@J3F?O(UDA2lO3`HN:;e2BPoIt2!2#7d<E:[o*Kjg8(j
+%):"`&VabZ.J.2f$!R+3h,b7&k!dPKn7seBr_i@!pf[#L?oJOAYJL,4L?!M")'am`(n_>V:d4I(Njr@u%iYo]s4h?]F]T.GefH)Tf
+%=ERgZ$gg6\O'r5?2uMcb8g0num&[VT^-TdO%c)M;M5=BVkOS<8klk[oqsjE]HO:7%-FHl1`EEk4X%SM)AZRZ1bG4m8opfl@_A+*p
+%k;$J"FZ#C"kRh/8Xj$Xe<qVM8nAWum"eX(n0))MWg]0hPl*_3?,UElM"/#)$%2<B7:(PD(fBd0#fb.[No/LX_aL!k5\fr*b!=5lb
+%61a(]2*@LIm`fXAjukjR.Vm2aJ4@^9&9Fr^YlTuqjetYM`(-4PYXot(^9*^haC]l%'kTB-RMp%@E5E-ZP'@dIKfOaD4=Enj`;&Ng
+%o]]aNJ70LcF]H8b1?=#L5LGGTa0KNt^queRQ:W9)j6;tZ5E<F.@O1LJ9!Ef:88P^PUM2)tM>p#Q>5X?a/.p^b$1c-cDh:O<Mr>1e
+%K,i;0!5g$r[cNf'(!%87&9WPd!XZf"I`"03r9Dt?&_d<[<*d;NOD-&`2d4<cljgic/e2(?HX"KDfu[p<7muk785Mr7'$q"]L5YSL
+%5k*c+W;ZgD<gKq8(%ghok_ALFj/lSLCK=(UPmKej5P)E^:tAHDUh"pLPops917ir5q+X0Qap#(&(YJoXJk/0k/u4EufUGU'fEK*Q
+%\DBrVDX7Pj:@'mb\&9h&+%n+aX1+76.*VSA0n/*RJdm5W/1JmH>TeiV8jMXG)HNfL-Laghd=ia9YgmTY!@sH2ep'6e;;,\rd=?=-
+%+;l<,J2Sr,n7CE+C_l?UA`.'3[+(b4<sajt-M6&C7O6"%[fNIOT/g*?7F6l-["C6AU4C#h'1GPP'>abJD4(_$J.U$Ng2m@C-$AV2
+%qa"=)cd@#?(8TTK!AacVq/YgEEl0<\#tJLZdfkq$?N<&J?EmTQP=+h+@;[2D"'^NqFiguC]KMF.2h4a"]KmH+ni-Z"!3tTBkI<\*
+%^g:/sIU8@P@8OI#Lp?UYhmrHWSm8.Jg-&:FGRLc8i5#c%`H'[^YUh29*dM\=LKXU5X;iPs'"*6NnI,Y!Y'DQ2nNMmHF+f-T/pO\p
+%--:8mH$ldf[\:j=?C3B^;=]cY^`p4$Cs7ESnIg#$3;@>D$`OV)YXXf+]g1T3nj<f!C3XL+=WB5uJ;[D>7Y#4W<j9UfR=>B0:niB4
+%dYpH3b,3F`<?T67bY"EAl*UmeDl0ETl*jn3M5PUYgRcB!hV/rp=mHZ&Q3]C<JRYsik)IFO1af(D>Gc0S.\j`j1AlYS11c!>A)8*B
+%54!C$9S`@jSh0]%UECY)nruX5>#;GX]A)+2MG4M#-NWMEfGce5*e;*Xb2Gi34PtN19S@o+JOSA$`alrW2qh:FKE51n"%KKM"(D*C
+%lL%LMl>NJ5K:1NEK2-M>EHC-+J//N9Z7.=G&X0_[a0/OfLYT=E@%H?I>Qbjo6,D-&ApY-F"X5R@#C!M4",$nF#$<i.Oh`=#H:#/n
+%+TNXo(D2]^%=PaKl'<4fO57BWOm-$sHDa.e;7Yh@-*D#2l_$@8LbL4_+aVV]ZI"mKaNN$V'ITUi7^*Rg#p*\_;W!g/J"DI_m7n<h
+%)[\<MiEJUoo?>\=E4H:p-^$9:5skak'8b::3AeX).:)[Hle%\GBM"dcEC?j,mpS8'W*Cl`"VX=#Mi6Me',k=?1"6`bq-s0"WMNa1
+%`ZOr=5N9M98K#UNp]+'Ho*Vb,N>.XnkO^:XV:c/E4@_>]E7rWPj&`JG!6G3m>Mu[kb5,)3ce7nu&JT28jXWKN+V@F.M9WJjmKXa4
+%"-[f\,7QVN"8o_b&`(gc)*p%/eip+gc4p.kQV@PZ(Gk,0kIj%R=4eb^C0(:/\30j"Lh^PBdirD;5XE^ta(>M5=#RF'+RKMk)R&&i
+%S6#QXh%]E0KQqj?SpJ@r&Jrmt1seW50TqOU^U$1-+<h2n_:PticH[.t&dXL_kA>JM`5:6jbMu%#M.jshi4mXM9Fq8ST;&uJ<T*tn
+%`#:o+HGcOqLL;M*+b0i2c^'OF8ERe77p[l&M/miu_*0f0RTe],lj#N04C8"p.U+rG#^3Y0*P%c7e"!=]I+[m1]%gdA[M^R8o8`!u
+%=j`,:,7sC?!]!9\(IWuhLK_WO1%(:-&I!,UGF8*#Zu!^W."i6q0u8cJQYH`FoG#]E+>WX"7cS0<b@QY;.[OEsC!N2pN_VF"PlSaT
+%2nih8g;%RX1W8RPfOYHR6a-;"fE_'6<'^!Ei.8b4m0-g(.nE+N-L7,f@td[J`/ZeZ;$N0%)Ijfk^'fL94JaHPGIsrWW;77&7n<b5
+%+TS`\;[6r#>2gFei+IGAV<;fE68G8BkdM<78JQER",!dne*\ZSlqeJ)e)4A`D0MZ/C"!#lZ#,'19MLZ.@$hkf&;l.i5lWLUQGk\Z
+%'QcE&%]!0M_^Q_@m+r0r$)Y77K:)9*J[c2U>n&&BGU=X<7KemAd&F_I=<M3'9Ghk^LR,o2kRjO$Y%VEr(I0mafa5nm+L";(YNjdJ
+%n%rfCJ?69^LTS+(j=ma7D>pa>G7e"sp="X2<Seb3Snu#Kq_#o2i4K_hk?5]Np4b;n4=0(5.R[=GZaNof2n9#f"K"cs#a-*^;m7XN
+%B@MC8)MDc,r'q+p?Gi4pMW*sOl<cI3L(RFt1/,YiD[uHU:,&YTApThE7"?IbWbhi7Qr>H<#Yi6r>c]pIUX>sP<U#!&S&&3f6XTr'
+%M-"LD*!L<+[hXa`0QB%@g2"<lU6UJ9,]7h\4A65k51\3*-c>K8r%NV*/FHlC#8]ehP\esVQ[DrWi&M%#3ape\20&>o\TZZi=^X4\
+%]Y3;jg]E$%?jtjtZ=N.9aW>e"Ecf(g:^eA+i.5\ee61*9/\[as*(N9]nDgZH_Dn3'_aS@_U0mD@T23ce%?(iG:OqkS5poMo(pV&`
+%*cbW^,Y$[H">EsDA<B5J*,gnE!?*$F^pas95`Fc^@Z:rVD"#QH0#08*_;nmXhb!ZY!im,qL`9b>l?4&)_=.Ya)m;"0l2c7<1hP)2
+%YaSe5^3NVjXH@Gk>hA@'Pg'9K[YEg>$j7OiGk7@4`Skf=2+.mq'1#5aLsUOgod&`&9ic`gCH@X(Ba<juBhp<I*r37H#W$*!RlA6A
+%Qi\l_Qj!UuiT;p/b'icEc3gbf5[c>e$FnK6kQ=.Dg)#;Q>id18JYu)<4bUW'`LkB6?,s)uR/m:p?Qn[p83Wt)2F/HnPBt"k/C_HH
+%i*U\]^-*?pE-5BSNtT7R(qZT"n!ojB_;N*5639WnRR5YCO0j(Ag&c3t\T3]8qMl+a1c+XqWC!iFdXlC1nqk1$T\WDJ'hm*g$mZp1
+%'8)'G^^.7Ldsq:Opu#ShHjcgh5Ck-H%9$btE7&K_/Rj!r"Hq6*EJkSp<9-D-cj()5*`UWYM[1:a,GDBNIbtql#Hb:[&M=L:i55j.
+%Ca5mH:Cl*dn32ke-t#CoZR)3'IOCb9fK7)S`r]GTD<c'+%DN,T3c.?LJb^D*ineK-+8D3<@(2!d)Q_)f1Tc8L.(7k;.!s254np7&
+%1nP[5BSE6m'jG?f`5Q,9F%:[4'c3J$.r2V&nO:,#fm9nI.J&i%osCq_\Y:FFCrTZD#&3nu:K=!cA^AnhHs!d6<4`"7!E6dG5KEK%
+%$-?4JKUkB9^^>lpG1&ecodTDrp[$>6[6jY]bln4r/.LAXhOLO/C)n=nFkHTAUVfGM2`cXRUp\4;/rfXNHO@/W9Y_GWPKa+B(8cqb
+%"G9j)RY;CNN'MTTlQCub(f/h5RkFhS2s<s$W&$gL,-u)85#DULSET_V$Z5bs04@DW&VV%6Lj0&N(Y@X).$Iau<s0IN(PN,Uj7*mL
+%*$Pq0Gd1I<ZfbtGpk_f!kDI:GG,R`#^sJu?#=lU1/.\t"PASKDB<^pn[bJ(XeHZ3eN<8EM*l"'UaM]O^0V?_o/.(D/`hlJ]%MMVm
+%/.Y[A5o9EXhE`@#=QUn1L#*kF)Kqe:<1<"`84Vmm&K#clJgr-ict9%uUslZ:gp"IoX\f2eG\kDOfFXA9QFW*4b"O"QX<'.ABD0\(
+%m9u8"mK'S+?k.^,DlZn^g5sTs-_#DHN.!-'%mk=pQ0Y)oO:OGMJh;,<Gs#p@=bm&9*<UoOR<Eq7p<a0`Fn61D]$+Vg\adp@"KAD6
+%M#.`?=LM0;V.OUg'9Q.hZ1C9/(AP:#+W]/1gr/bL]S>6"XcHjm1Sc*OF?B"7A4a.u2t08o!,\COmWKOGcg=i(He=kA#c%+lgQ7IH
+%37M?A4%Nk1L'DrnGH?g+g\?UDlcV)[""mnrH[_bVX<J4UAUBlliY8WK@nC=2ggIbSLF*BJK9`c@ID?96gi+]iqeiT2GdFY9_!PRn
+%:j[$CR6*.U@e=u`n)2g#HaeMH[:B(o1;ghko=4YVF,4Q^.t$=@gQ!j,7oqpQ]r;dQ0"]eQ8[9Ga"r]g^ih;?!Q+`\c!`M0HGNciq
+%0,43[[)*Q*i@mE&;Mn:0^kVH[M7u[0,M;g82@tYaGV'W:jFJF`LD0-G^u-r=VT7-o_J-7W?P.bd!h06XIQP+bfc':7)c0T*E*84E
+%X"Ts?O^Wc-5b(rV0N5A]&cN1GFmCW_]31/4e)a8I%$%j6;jp]PCeB,EiP:.U;>I:SlK)QFeK!@@9t4RXMCn$ARqob%8RkjmO4rLB
+%_DWdoTYjK["V6,[V)_"4(RoY/-m_tKKC6]N7rZt9c(LBAZO!Gh5m%N0p9V#Uf>8_?"Xl5L!AX_pC,V[<L%2YQB#Z3:cd%:4DVNP^
+%4L$M)W+JneHT4:l<eEgP5:kH9NZ"GVf]r8P;%)ppD9F?@$WM6Vd9a>L`l;M`-Z0:qm='e07*HJ6H7FA;9a40PgJN:eW7?KL%pFV_
+%A_H*[(*hd7TSQ_UL^[=%OeeGf5!I'-k@5!+M%]XrWqa0!m*OsjFEg-\_g@]eK_VS'MJAV/4?i%^K#Lr(_?q<,!`C\LG9+qoPSOtR
+%>m0jXDa?gN#@L5Od)aqRAYU_Y2qjjX-fZIQipk5H@D<+j<KRIP!cA5ui2JUsEV!WI65$`$]k&Sdhuk9`g`oTY.]ina5\&O14hGiV
+%Gb]qGNNY?a$ZE-lRC98n.<_+4p3%)cHRl,OrljH/i=a1OcHTqJ`cOP16[A#NKoh[lkpTkeIq!M9A<1HmR*>A5:_s)>gSn1Ig.lEH
+%:7*C%i,BG>[Fm[#(CmMdS3^+k&$_\7@u"13(`)!7-?Kf+<kk6Ml@m="(f'98hqu7:h&6XU!SG!.AQ\hDh9lJ9l@;EEY*\OE2h@nQ
+%Hg!(T,hP49pM)>`1n:nh>L=A?r1("+dka(ea2nn=7&9>MNVs,RKP.s;hP_W7GTWM4a*qM?%VLAL<.cGYiA+#tI6:$"-^K(XK`WpQ
+%&QKjJ=;Y('%Rh-A[oSR%MLc`mL!oIWc@Fhu/A2+]pK\qtLcPp<=GmWA?dE01S7%<]g*]?F/jobU%[htS^LF5:\0$eRH`rNtl$CLQ
+%?`]88[2EFTf6h>F:8"N?T*P38?A^n>qdF6XO,.2H`0*R)5#%sFKrbZfdPMUBB:`d0B._bhB$l4%D,gZnS8`gZQeBj@Ho#"i7@?")
+%"M64^,E2a)HRX;Jk5<%%\=k3=2rKD=#+OoJ1`ga#\)QQ7E75a7LLaO=3g&oe-T[$`5R?tKb_\S#PDH&9`[h_neK&3U0j(BPVl`rs
+%Q.H!Lg9]"pYKcDF3HQLE#S;*I=Ybm8",8GdlMOtD4Z[-Ub=-_b2rh,QDqR5=]S;eaDk:6Q96)9<Ic('u!2U_1J#]!8jlPj`F]js8
+%fn9JI>>RO"H*_f/!<F>a<ia&-m:5;Y#VX<.6Ir(+LLCkH,s.\FVet<_Z1&OF<*ucTl#>;[k8,K!0I<<@5\I42/M6Z:'=46$d?'nI
+%&:F5jZ1)2B+pGSL9K[PlhLT:+Cfomm-SOt#3ar9N@s_`hc=;A3i8>WpHHIt;I(icTPi5Z]c4+oJ)cVk*@*[<E"6VK:,rsnEQ1A=1
+%6D4ChihuqJ+e)SIao6WH@<[)85id;)X(nsE0@$i%SfbcU:%e+^aIbcr5[Iaj/)$Y*h#PrRg&trK%WQ'*G%S?Woc[%>jQh'eOpEP^
+%!Gj]BDHk!F=MWZhcY<;3<CVd+%q75g*V3kFU%!k4-bTKi+aN@"RVhZO'e$GE\6^6@S:J)(fsoK_`L82:8%;t:8Sr4?h1:H7LR24C
+%(7%Zp%Vq$SW"[AMKs$$`o-jeB=86Gk)cCuB?j4qH+?q%L]>#=,JR+=Intqs.>f3_rq\a52+T^F,"XbiG+XE*";`>4J.F(&I"7gsZ
+%>GZ9ja4mjYK@h0G(c)\K>=)%tJX+nG\GC4q"H)e#]/pt*XgCb7,4?L)GBeWJ-%n(Ji1OP-XQ&tu/DoR"oBiO"BULPOXFojTX^I^-
+%JUS0&4G<WrXhC/ZI'ES%h8&!n0UiAcA\q5NI1<4pG/4?!2J0Kh!9lT]"N-mmQ72h#lEkn1b\bFUr%tJ>%BUKrIu8%P6O_$oDF]gX
+%B8@-X*;=,m.lfirUhriK2<m`[qGi.7[]4ui+]^Z*X*]A6?F7ph1*"/uFgVX<n,T6K-<G/\r[8ii#`pdo$A+br:C*U2kDuN`;&YFh
+%QY[;S4.r7gNl'f"Qh0<,*RN;%@Z]RNW;q#o]OoWQ?#J3L+DV2%1GluoE/.8grXSSt*hf!^b85\t3XXZfj:Ru@A(Vki#!9Ad+)okB
+%"Doo,K<&/-@.!][Y\3m&5jqB)`*5ND!+HJ.Ft=7*1RB9c0S89gF,E@:A/8L+>T[d'oKX:-Da`SmJ4nJERRu;UB>+FDGSk^r"GKPu
+%P@JuCC#:!A7*m&OgpZImV^ENq\PKgQSn_8MKmCOE=`pg!?/cFn#\!n*"+fk29pUOdV^3?kF-@u+I&(UkCd,Ki,"tZ@Z]&R'!)5FQ
+%OP%5T6"u'kE$A<2F"9AZ9$A>Zp[6^$1*mSg$To<&bmkDGMr2FdaqLFn5O=*.K+]lW8Z]0`,[1D2n-M!dYQT^jn#r;?XnGhJRNTN4
+%2tq9@%S&bc"p`nqGI?p5S-jUG7PJXQYaDQLk.gEqI.DIC)7EeO1aC#A$HKLH60eZ0K4c#dn(gaU$qj,r`$912J`(dh#2!?Sn]AC1
+%$Y/Cl[U-3%$SqFZO4YolIK_+[ZC_+gYUC51G3]BVBd,EWE6)lTiQ6.HVNWT]YY4XUJ]&@uoFBGG"_UX?96[rrj_NNt"rLM,l$S;(
+%pd/7EcbHRBLZtNoiAu?eC8`T-B07BI4Z>T\EYpRHD[5hqC_I3dj>7#pGD[O#$%9`[)O(e3:3-c`*p'j-]NDZkI@-I5ebnj4JMA/-
+%E5@pXSUDXlP4Bugr.jXl^'QKaedC)njA[Q/!L\f,1jC&63mCds5\%PkU-B1^BpqIX/Z\4!F*G$7J__lDHa(rs'NmKVTp4YD1g"Bl
+%-7!gbe/b5V"N"jXK)0SH%[t5:O^2OB(nWTlYoat5g>:T#5r,0?SuUB[N36:7AU1m/MH`0?BppsR>Qc5SXl,sN"L]EAh>BidIs5lt
+%'VNNV3CE7c;'j'aaBh!Q6o*kM[_l6^Su9o0,>;IF)hPZ#EB*[n),M:A6^n;IRiXg?H3&((ATjhD=92:c,i?4;b!ILuTSn(9E'QkH
+%DT<f.GAcQ_Ae#?pqbtsRN,]+MCRf<InCFfp$8X;]6\(pr#)_/H;ICMnH#RRW'MRSn]<brS3+Hs6aEF"><&h4ueoG?B:"Y\[2!8g;
+%pqn7&S^fC0U@N'oL.<(El>&HRZ:+b>@=Dn$D>ck0B'PnO\fA[ebkHN\g%WD@HZ\G7+(3D$fQk;[4aqT](i7O/)Fb.0QY.<.`8h2b
+%:rM*"jJYB!"BdkmM`J:Eh/L<oa>DhTO68KFAg1^-je;_%UHN68"5Du>O:=jYk)JZ@D2L+MGKDVB(+r?i5WZg99kYb>i'o+3O);'6
+%h7+JJFS>Y',b8T>OD,>:C4d;W<XX0?&aFO-UqLq-A-.>fUB?:_SILS'@(!6LR%u,,"K[CN:@%$1&04_P!+O!k+`-M1>%!#)2q]1B
+%_&7uK3&K;NM/<GnF,8W=`8Mj!2^pep:@gP$n*Sf]^`2%8ghmc/7g5`+i%>K^.[m@pC5rZ(@i[L?1ZPY3#!+q)3JeWHRrP(PlaRB_
+%MYV<Sl")_&cJ*$!*UJI"gEJm,\[CNh??2Cs<34iU$m@#_n:J)M;bVP>JSYS^5SFj+GgZc_1ZRIO<hh_D>a!"&i?<uEp1nl))]k(.
+%4=o:QciEqqZV8b\EpR-gRq_j(iSgT\WPP,ON9qHn36pm._AnJkMb!ac8r=th7(&K'!Hg9#it+2&;l!_0?OkITMH9/=hi^?X_hGDd
+%q!Bck&>$mh8#F*+*WADsQJC1LCkoi<$4V:jeClP8<:B^`4$RIQ(LR>CT!1*g0mU-LHcgrZ"A^393HEJ6b/.nD<Q@S6L&t4[_rD3`
+%/iF*jKFY24)Am)B:>AJH/[GXV0QS'\@`aA"F?,qu3S-\cBDI?MJ43fO&pOsN9KoT*?D3"Be#!=uPg$a!:!DR/lFu$%&X+W'.0GC/
+%$+E$ef[GtdeqdE6#NF$>?RidiL2^%:3Ymr$b#'Lu!<,!LMi:F!ScK?lV/%9R]\=nPqfipm1S$:Qr\,oFJgV8XZ:'N]5OeW5SSuD-
+%G)3T)R+D*FFs=]bOE`1c"+ZmtLf9V;n^ti+&=)F;M_I7Z2g,ku#:NqT:s:82Yk`.D2PE"`K]7P8jlIQ@9'XG(LK3a:EH]uU1*<`;
+%(pcNqREYdj##Hp.?:58hr$Dgrr,#2JW2ZhL!&f7G4#ROuIsgC))WYe6fG78'q#hGm0L'Y?a2lZQn;=7:69I4<:/`[@>uj]XZu.`_
+%@BA_bFpS5Co21&4ISRkYTr^N"Q@#(/i7BYheW.c3I$=^)=BkFm#kAmY<.\L7`@Id)jR-kCd#(bL':Ws^"VK.u$mB6$<HE*^K$itL
+%Fjsihm:H0l.JrX7>4p()lSEfCk2>Z8)_-3fDG0h7@+0FASFNh,&XG_AYZA%W,a+?`OsMo"=;VdZ"7-X?q*K1MI!f-'\1Sja0&4WN
+%DpXV0FB2:<l$s@J('NQETs6KUA3/)cZG,\W1$a^>i4*&B@0,gQ@?44$h2!r^]gC+L</Z36)C[iTF^YWGMeG6oo%fq<g1XPg-<r[r
+%8)n"K("_"I3l2!h#F?Vq3I!,ZZ=a6lW;tZeiSNd'BH84O\P,M$,)qEG(8h5\T^T+h"N)BLW9aRYMhl92R>m(pYW@@V"$=!1RHNbn
+%XCY'Y$h^``"-;TVo<a45AP=:Y=>VqD@)>lSLVbj'J@Hpm''+n0:ZjK\!VV8n:Ir"3$S:Fs%\ne?q:XM_4%ft6q;mG)D.B13!YD&%
+%-a7nYa?8iFo<O3Y#>u@X;/XR.+'&hSCj,>60BO$$<]69]<+dnhlkE&Ca1ajG[:ltFP(FT)W2;L[=O-5PiU(mVgZdJY[:D;].Tcn>
+%/Qmdq9amN$K3fl5U3a+k+o*mST:Y9^\F6$6"0lA@dm9,m<Elo=f_]$`raef,Ej3?AB5paUa2ojo>g*pdk)YQN,(tU=4n>hlY<gkf
+%'uTRE-dh:kliV"K]2opdRlRN^2FW<0[Gj$6gO@Gk5"K!_TtS@Xp0ig*!=2+<@*?)`jO!7T3)m6]Hu5nn]h[LIf>BJ@_iJ`_c5)+f
+%'A9"`A6"BkS\t&%<lB<IAp.<B2hFQ=3TeS!ip82K[Z!4.s+$C'*cA6$`@S1tf@cqN__M?c$Yga#K`5Rfap@rA=cG5D+OP^eM%1sB
+%aUY3O)mP]i+?c3\PdhSjlF&ruRB4*;9"(dg_`pNKpUh(aVh^!WPPA%90<g)`ZWN\STo5--Z)2O5B&TL@?QE,L-6[o@*C1DKlg8-*
+%r7Z1'cW*,Q`<*A?*%VN5kT$$#%<Y3Ljbqb@"TELuT-pg!Ys?'np/>f!k6%a!?p[L'K_.)khq95a?"bd\"O*dUI%.q=p<u6YmW,R)
+%@3%6g>=N4If2+L:CS_PL^j-gD*%Im!;J^R\W"rjW^mPpDelo>FP14`Ng<B$q%k%t0M:Wct;n\^Sn-bF,LuoAqI![51Z?cs;\'Qt4
+%=nIMifMD?;&r3nUO62hU<?'+D&SQLm^+0b)_7FMY&#pYAL^#gZ(eD`PGN>tNZMqZ_j26F7KKco$Gp14'Z&tLtjO;.]Pu!3Ff@_?i
+%qjpjWD(q6!LMe,54@.R>4u&@Sh-lRr(&J,Q>h581:^Qm)m^2A_j4.t/f(N5,k"(U2I)]8KLuG=TFumDIO[*6Re(8fNmba8@.DQ5;
+%3QMq(MK$A(:5928j]S50/6a1A(b_'ZX@KgP1Fj?@KF&$mMm6FhjVW:SFtb-o=&E\&]KCbRf!KP^M%\,Z0!`h4A_JGH+qsa(TcRic
+%/it%ogM'_!l`4CD=Q4JZ?KpnJ#ios?5Xr=Zo/\'Ua6KapB_/15Wor$tZj784@lsOd!h*_s&XTt4OPA7,ql*L<7S`:J7uYK"jbm'A
+%pCf03"%aOCL!$pmNO<!P]KJg7B5Wtm<'3C?W%/D,SK*;`nY#m`61%5*aW;]X#=!iXl1aC@?>QZ3?^>S@i&D.c5+E?QB&d^8/*0e#
+%cbgAZ('XACGNQ,\gKE0GHfB<F-Qui?TgF@XUtaUYOe*>%9^B.$Z[8Wufg+PNMD.Amql+BY]#ttn;Ki?8rSVDa162@0/6fD//UBcM
+%QDK=R@==H-hN$^[9-3J72OVg##O9L4g5VDi*cE71n&'_+2BBb>Pm%aDkjT+7<V91eC;pl&iY"^oinkE;^%4mbl4LRneQeT9Sk&<s
+%JEWS9B@BT>[[<'T6FL'TAjQ*<fX]0(*pYOM'SNsKN8QBs^Zl\3hTpb+cM,XSJ"gq'Q@-*R28N(M^([i()a)RXmF\eB'?o6,0lknV
+%ZH3Erp;Stu;kGKsoJfe<[OWVJU3g9)ccBp8*ma=T<\2@[*Ot8:q].Y:AkSVp^ar2411!MPesq>)B3I)cG%dq3V/eSA*9smq&DIVm
+%pCH)?"o#f]H5"7RL?X6UGY+%:TZ]C1o75s_5LQ$Qd*9$>TNe^mXK&P/_rf_NR2Ksu_pRhg+c,DRQp!+mreK^bp:W"@54Rq&r/Bgp
+%*"KAms0*WBTJ&up4+d.H:=V8'iA!lL-=*(-K<V)rc_oX,ppoT=CR8Ao`8tDa;'7[sO$sXKid.AYT2shN38QPSULU$^NpXVA*Frf^
+%"N\"E-I@A;"[oV;%T@nA3?HYkYr6iuZTp0/).:qg#*0P[k37OC'F4]JCX>N91LC^R9@6W+/Bd=?AZMrH,3j.@'75YE?j5Mn\*Y^^
+%>,%@&UV/7o>rTNO`X6>*Cg,Le=(N\`-*mN*OD1=kIC3_/b%W/2_o[K6aVQ?cT1aD'4j8Qa!_rJ,\8iJL&MMmtK/7dLFESR)_H1\;
+%Jsu:gI+<O<1bC7&+QC;`",6t@\VFI<cRg74>Ztn#>QZn()_uYB_N[RCWB,G_H0ea\PN(d,X7b0'Mun09!>+X3]c4"L0SYQ+n@LFN
+%]U<UA_R6N.:h;iGdiH00;eDn:j'KV\o5'2anuf?*[WVVl4&b'OgC`1QW$9/+;+./SbbpO5%SuTHUDZ];XNn,L#?Ku<ojn$'1#?NZ
+%0HdPp3*LUQ#[:=BH/ZS=QD0sF*F.1W4Dju5CKhcF^]!TJ+nM::71Y@DY-CTOJD+km"N;D-@XSd,BeL"nf[2D+QLir&33V_TXK?eb
+%luY:)C(Y=.fBo@D9;TX%*\&?&T$c9%6:;tXOeVBJ61k+(=g'q3eBVNEs3XXgSt'VP(RFFS-lD$LerQX^lYo4$]HPN\05G-,k:JY4
+%$V:B6SH(:Les8\,;E1!<2CEV#DU_L^p+@P$EVJ3JKV0?X;\E+s^be_$lh7X;mq?E@[pe*dj%sb$a?lY`H(Yk#@Clde"T0AM[aaTM
+%o2Fa2YKW3g8AR%=KL4-Vb:*;aJj([n=^MQ6Li?BQ5?"<.Y\(Ft:!U??^(&gaRpX=+Tb[ud50c?B"mf*(k?CM7bqA)umF$5/MR"gr
+%Qk[7h_\o$-o_B>8>:=bW%br:?UJi8u)8`ojqRiCkD1(6)?QuWdNRgAa@&r4T4iG7M54#L>>\)W-G[.\Z$"8m%?u5>tL#J\`Z?j)E
+%"LZ&6M.4bmohIZaf]eZ27Z1Y!Q8;+GElujm@`,m#Z>]%Od3HV%(HVs@?;K(@!oek;BXn"'pMpnDK/FR]K$;6(/?SW=i3i^uY?7%q
+%^eu2Ll&lp^G&6DS=X$fFF*#:Hm@ZpNS#tu/MsEJn`%UKPBO39U/mFOpn)b'L^fD:Jb/f4GSR+$4a7cfjqC,M6`)m(V[FRs1SuqTS
+%iBZS!Ejt+GG`9WH0"sDB(O*AkG"fkg<D7)pjO?TSD6oM;13.T0hN1,VlfLC'*Z2q9c]6;ON[AE95P+Vs57Q)ebWGZ4EN.PlTn(O$
+%]Gn08n9PIY%[pb:9Y5VKS#)XH#Wg5@aOE!%Dj=r@ofu.n%rE2rT:+Rmh9Ha`?&+cHS_aU\*(f9U02A1-KIiE)QsbW1^T\olU&>hR
+%WQ*%'f]P$rg9+r@YF'gi"h[cp+$aHE7mI`ZBXkBF_Rg%jK*(?LYCASC&+@p3XJ09)0G`:\7cK+?.@cFfbgkE1#bgG*Nr4Q>GqBmU
+%MS-D@Y^$Z]qT+Nq)b(DX8A8^-)]7-ZB:GNIO+G;5jV3/L#GRhD;j`rmmCWi)#MR,)JFSst>^"<Lcr5ZQ<jQea"AD!tLXs$R/4iVI
+%D/<6Uii^SaC"ko'f7Nm;QJc_8a^.cLWuVu3ZIm'q*!-Y6WnG)K*X2m%Hg+\D[s=C:p;2^5A!dU@Bk#HM*o-be3YlffHNr0DVB(<H
+%V5^mX%`dUuNda;1/il\\7'G[Rg1,?rgjPM*;&o/bog#V`kSg8#G_$hcFa0Si<6"VDC`7p\[fu3S,lr((^km]c]HPTE`eBa@o>(S(
+%n^naB%61`-UA>>fDIP!Ga]5Ik^fZfl<X(ma2G`;6a5[,93M4Jf&<[ip3#2:h)(nrshm(q@C4jl,G$(B6f)TUPiB'`p3B]F*r\-JF
+%$+I1db0T4_Ku7^;k2aU-n)UM%.G<R=BJR%AjUYQ)D^TY4,Yk'k_r-nVLOW`Ukt.OV)POu!:E+PZrRBe:CX)6-]@f1sf:=Mj/$_<N
+%TV'M>5fH"p=hf\-_3R1Ok;:M<IOV1Tb%#^V?meG)mG)7Lege1S^uc0RE6V%^f/>(tF^/Nd)DT9*JhD](oM-Vt&A6!*qg^Kc:cL)e
+%\`D$ZrI@0#0.>+tGN5PjF\'s>Kc+3f(S+.GpiHnpD0)/DQ,*fuC9s68_on47TY,+fnQIXMC9/uLZt/'l&(?HHqX(,G(HRg].6(.g
+%<QRZLIpRZRDGlDCYoRr@<I$hE7>k\KJ^;BMB=ht"0g%G=Q%_P;=C@Z3q:,J)kloi(4AlE.$"%$<]?=VDpm0'8#I'2>@W)jpgRk(T
+%&@!3:W,$l0AQ]6p4[*GJ=jlM9:+,j!-k\Pqbfb92M)Xg]ptadjQO-t++_I2K>kk67c:jQ$6<A#_nBB<@R)HFY+1@q)1GWT]Q)^22
+%mfoQjq<pVFF5F*5/-?KAc$/*QH$)*^"E=R^CR=2ecXLY<9_VKA+%6b5V^El.EHr:(*XQ6Jgq3uJ<m#`Yd9hV[RIj@blKq'$G[r_F
+%FgH=3m1>'%abH+/o0K%3oo%sT49Y90=<u$DD2:"FLoVc4VV1$T)X.Moc@!sjW6I/SG?R7_$*6:7!:P<XcNcMQ],A1RP-8?q,fjL$
+%/RR@\@F]m:"@WDBTd;V_Q]Mfb,-Q2.D0m:u<tb&:Rl>e69@iI=a\]0kj[(j#"m^PEV6RcX`I(@,B$>K1h/%a]*--;a"X%2f<T`\V
+%:8VE9)Wt3!F*f@j=#$_c]j[R<k*<Vb'TT4u*rBZ<QNI"dkO_H[GXV:"hLM;;',Ti?,#,Uo"`oJbm[_#K_8[Ya8"=amqf;B@cOP_\
+%itdPbZa[(=(#D7;(dmWF4i6[qdclGf10_j2dI22$a7>,7";M'A%N_m%`9I*+=3qg%TuE!.$jB!i6W:TAaKdau*G>,H$En4_Q=Rj>
+%dWV'TGjZf&7Tao"ITq^r/C*1ac&'5l4Z*c]BS2NM<pQtM(25a"]m.qio?fg(.3(r.Qm"rXD<KJpDSV;rN3YD`]i[E_!Jpe`)fEh$
+%c&N_+=0qFA3'$B5g@gK8J/8213uaX/$3T*G3i"%=4'pNQ\"mMS]L3QVA4I&j),c+>H3T9AX!+Y0I%]I9-b)nCMN\@'Wm=1=12Emd
+%)IlKrNtT*g.r@Nel=\U0:+:_R=$:Lr/?1kc2GF<Of-W"%g2XuBYaN+'Y@W;8He2H,+PQ_<Q=XB9<_#<^l.)CaMo8M56@3>AF+Z#s
+%rj;UWqRgFn-h%=/[?@qm=j<]OHd*R4fX=4=hJ1+^pn1SKH@lQ6$C<]'Xmd<CTF@T>c&+qUM#qJ5A"\AdLpT4des[gN:?(*BR]8M.
+%0BkL7@`?]m`JMLu\Zqlhh9(2J$;_\?0Q8@KRT>A0Q#01on^:B=`9$KK-22R0TD&FGn$?t"Z1mk4H]`3jRrQ[)GbS^\J75([AWQQ6
+%3G8GqdtJ([hZ*;$j'"D$:"EoY*Von:>%eW<BEpY,I9NFTO.K(9Nh/]eD*HAHOD4B*[8!;amgKEkX7\c=b(Gp?piC^r-kIP;c!L@O
+%hNZJKlPX+dLn__3#Kq[i;C:_&fRP2-YK["$nVi]VAdMk'W@gHSTp8?Lkknd!_Yj52NgV,r,.spg:f53l`=%GK*ljK#hOa1\S2/h,
+%o4hSb&Y#Ui;@%>siH2*"1Ug/$M'/Qnn$TY(>gqfIdk2oM@@H"L][Ra[#IEqqFiV#nQ39YfIFu_\k7oJtRF1'e.bOIUDmK%SQQ4e5
+%KQ8>Nk':-Y8)&J5"O_-piL<V=4p?0!i!]7X4++;:A*H.kR@T.0q7Jiu5W(5!cYlj-_AV2!nQ_79Z+om;]El3dqRj<'##bf5NeEH'
+%n[XB+'b2oa)[7r'JLGd+I5ZH7bo;ZW[d2eWPZJY'11TjpiLs7@J<&Pi_._pqCP6s=b&TmViOPs_H\`<tnLWicHCS-X7aO!\<olj+
+%!DWn803ZLof#?4GcN&#I"?2(PgP"Vg0+oM.c(-4Q4=sSYH%jF?kgbS=LHRlVN"<7I]X]nqV7poHlr><+qo\l*=Nk!@,.P%0NiPoM
+%&PMV^jM_nh#-]6R28.Sp,P,<t]<&qq&Dl`E*4W:*4S"riE-pA\H6I?Q39u0FfEINkij&F7>@ITub%;kY]W1q@(mESVW)rG@Fnhq'
+%]-%5\>)hVimi3BQY2LY`A='%n)a1.-*##=1l'4%0gZ^taBk`CBYiE/O+.Rf=?$9F4&Z]%U+.cA9@SqNU1N4/\e'Fg(48'9Eh?[`Q
+%]*sbWM3E]a;'k$>>L`3X_KY=kCTn"Q>?u0.bi='4<2Yu0."HKpn1$5l%Pr@l0C`&9C/8F>dC^WiN>^SU2_8J-aial^#QqTWEWdcK
+%"-F'W56q`4$Kd@g\N=D-q8(3RXh;!t+Ia&Jd]9&?Z@eiTp/IYGf?lTSgWd/Cagi3)]u-SR+p=H74fX,Yfs^)1GqX#_-;Re-mLbu^
+%9#7PD#NV;F[G*DJ`S5Da4hL*+[`@88M^*PGMfj`N,H@N-m%!VrM`>m79mMN)94de),7BsB=^17q%>%TfYT6T%m,oglWN9M,qW.7A
+%ErbI5mJO\7TSL%(BfSqMod7oN*3X'R4PVD;,QYX0/A\YM!<1p49<gb,DTf5sCWpsN@P7j2f\sHUAlm+pa62Irqm_L4bo*C%!tp!R
+%UDE*62!p7#K;iaLOM,cT.:D$'\^7_d;#o'#1N;(j$u.b$h%P%dZ%jpURUC3Qc8]qpmdOZu7l7FVh@DtQ_[mV8H-/]pbDb\j#/mcX
+%#3$MHarnT>^Dsk:SFTXpCS""/csUdo;fQqq\"jX,E^UJ;Vgj&PHJ=pXRMRH@VC$9:U5cXR/q=bX@Fcd^-?%ff7JXOf,B2)uQ.9#C
+%`Km$^mFc(ti*?hegYQN,'HCecF!QPY_m:C;\adh,m_sF+2f"i-`9rsnF%dsOUMmJ59K9Lq:C$s*'^o6Bg<B\BS*-7g%*m@=I*\.C
+%I.009RD&(u13,?A`p"Dr6b.Gehu)lsBjr=WbXo<@ra)Y]p3*-9:*N(W]+`@<0nSS0$\!'GjHZd$Fe)hkX*fiuBr8AWaHOp(Ad)Z$
+%Z9/=DV+u1ZVmif@<Y.Vj"sRAIg$;IG,![5DRI<`VER9<m)gq2\5;1X0gC%AN\4)IHcIpso@SndY6=lq_Z6qkHY*Yu#eq"7u!JbM6
+%m#7hW<g5+VG."9AHL9.hFAhh<*,p-`(;mEFLHRDJV=%/]*ZtG#I44V/A%#VT49=^plXphV=m^,p+$t*?jF[W:3&2W="W#A*E@fWH
+%8^:'%*g#d-U;H'q/)E0*<4cJ<]eBn:8*o*@P^0WfIGm*K&]<9K5-l>4oG22/UcS#9AftblR,o%hKA$O6@?pNhOEbh:GO4[1bcks$
+%)dMcd.$c(2h2Rm77tmYj:O$-/a>J%03#&a=J_^e97!3c2_f3')V-Ls,L:-ge's/U62'nT%\nCV$F=Ug:QM/i)C>Nj+(iplc6urf]
+%f\7O@df/Fp5kd-&F&#D+"M(g4(g*0#n_6I@j$Sp[drAcn\$(!oHQgC^k=XBnBBi%""5'hX@6"!'Y7".*=+8$20UNrR1"_VB]bqRV
+%F#T"5]8I[lNXOUu.1>&d-tmb:[e'*,:\<3o>MK`&KYSm,D=YHGOMt@nfeLkcDpq#))M6b-enX"PlMnRmj4D0g@nrY[a48@8S2?7h
+%j[ZefAB:#4\M&NKC;A3i3kO\qE)/SN")0q%eo@+2L4lu6>36c].;8@*#Q'24mGJ'sjLg<,\VoI):*g%ZUZ^/`UNWP&QCh;3r@&W]
+%Hn>A-gQJUHm^kR4\QW,%?(FA+]DS2A@L:Y-!*,O^)(S+7\8sfW.*<`:>L25lrZ9>?%Uljeh7r%.fg^pQW9%kANfRl8)(Pd]FN.C,
+%$M0R-ka`cZYjKFD]>/$5]m2!Hdo"!A*A9cjEM<V4k+_AP:I-ggb+T(fI@mjj>>0Sred=3eYbp`SkT%CtKZij(5[sE]!]Mtq/<+o.
+%=`e=1UFo<jeE]qOSiZ8^l>Xf@R3H.5j!c*P`ORomnD`E_\dkg]KH*l,dp_>ODMbNU?6is)YB?8YJ&0S\[Vg)[VbO*OZiB2o*(QkL
+%_P+%_[D1'N'o_bG7=1&OK7-tR@hX1,["-M$9sAbe@u#YHg]bE0ZJ4]b[j)in%g#&0R\N'Ui]YnO]$A\]?dR<W&)b!YNcbV!F<3``
+%`S_IJro(q'Dfe(YBg\s<R9QQP5k2'&8f&:Gh0>os9@2#S9F\IU7^VR6h<3tH<Bg2^Llj('PP?H-(3b.X,PB#@_NW:4ojrY(heoPt
+%)OLCBeNt?3,UR]8H*1hi)nJAmOkGJ83W;>JRGPK5ffn6?p(G4c-N^ki$hleIoZBdejW0bo+Y1n#?HJ&G%bPaGMPIGS2:[``FjcYD
+%qg$/6=(OA@lgtK((4=mJRB\F>7b'D8PRLr[pNU%OT#Y3J1/DmBX:iNq>8j*([gT0o:9sr2D@\M8FCHI"K6*d"=5alWdQGO&"$0e6
+%SYhsSO-cUFL=`'eX8kF=i0YD?8m[c#]OK5;rCr)nDV/qknpu[Gk`f0Efjs@+0T0]bgSpHM78aFC/Un$'>'GB?pn:\fQO\O`T$L59
+%pk-\.#`T!B/FIS)<$<`:S[.E*QD4FhiTYMTWd@D:m2[jhf=1U+N]-VQ>]1ElAl9c[G5aO'@R#9O08mYcVfqY4eVO`gI;JGQ%)IH;
+%V:4bXm&DD.4gu/M$i,]Zf"GG/)@d>WZKGaN&*g`M,q9,)$/+&S&FYAGj9MUQ._"]9"dAi^s(:^oHR)7e1X48+5lCrf,+omBACteO
+%"CZh:N/.MH+gE1f)"\LH`*M`8&rOmaj[+e8o\\h[Na7^)bfD87M)BpRDO-J$?LE8$>L%]S=0e]5;Ad(.b_j]opON6'D(5j)/@OAX
+%"Zch$;7Yi]K2DCnEO#bPe1lB[*C[J=mD%I4Sa.n@7SXBaT?-:_jXXo9nr/Hm#2e4XJTnF7+RW.V:!#ECh*B/rbPn5J#dd*jaQ:WB
+%r$Hba3sblpR-o(n&SQ3AV326>:;S",+LqMpe../;PdqKu-R%V$3f[.4T28!n,qU^Z&,,#fl!f3A\/?h[*"etfUoZhsE1+kVAc]`Z
+%_ri?;:Du[U<WC3L6*/q]0$I)k;aPg\.pRt$?FU-Y=Tsc?PC>grjlKH"p_7mJ!eGfUFO/0R#_k1-A;nUN:IHC=lX$b,PS5^V?S[X>
+%k'<.egb\?4F?lP@^jD6R$HkH"Q)&0<DQ#klJ/<hrV4E!CkK4as3[k@@i;.?X_c!u_i0=;:jpQ,2g,&gA#[6Fq,r0u4$:lIn8D<Y*
+%oSMr9fs1VO#lVb2kQgn<aDMB)SC:7]mj!lge/V6!ZpAu*NR0!>Te\!9cY3krW2Ns0%tS]2Bb<_46ZKO,4"gC=`[_LM])Lblh7dF5
+%#JcN-<Zl,NSN_Ui!i$'CR'^IjZU@3c^uL&3:Y2ddM?^65$s+QN-kP2>C=eF0&ua!5KM1#$nhgIrWjQar]^fE1Yd>([?:gSVZSiDp
+%#$B[_4TM1aKg'`UiCn5&mA/uW^b_:jggCnW+>T#e-eqJ#aj/fF9i3/A\kEj,4@op"OqE4MYUigYZ>EFhRb'ha7"H1RMqP%74kN+X
+%PtAt>%j3JVJ2H@#,a\J7A4!=rlZfBd:phUoEMo6;j3#arM%BA(co!>6HnnYgW<t(Fl(i&R^,"1EGlT8,6Y?V:E.QYF`b#G(:r@qb
+%RV1k4a@f<2mgYnJS7&Vqnj;TTe/B<LP&X<Z2Tp4DD_)Q<-<W6*4,km%["bCT"F#!O$7\,8N4seGc"MCT1nFJXOq@tXP4jiNXUN^R
+%6s-*K+o%&TpIpm3d_S@a*_>E*W;Hk<)>RA^.t2N!%Zh/Q*_EV3r%]Y?d*QttHRjlERgi6&!d;1P3k#YL5uc&4EIrA'Hou8A$FBir
+%]P="=*Mak42Q?"EAbrU[P%A.k"nZ#*"gn^YYdU+2Vb@<D;m6=cLWi>8*"/0uB\_c-:kJE$5kN1*h2S5*N7e7T5CpWSUfk't,[Q0E
+%;_N`01<q;UP6mmf-aa.Uk!BXcZ$,s$&gIs:71p]2YY>nW@bA1"5_qi5Oj"[FDY/r!4uo8:ZtY+]dF!rF:FiOh;h6tBs(OFSod!$K
+%P\k-b)'Db##.u>ENt2EAP`.asog\@K:MnT8"k6#7bmPISgAZe]&U0&hKSN0OegO(p(Q*DdAi%&3JnW1qh:sXO\uictUlPDQ3L.h;
+%P\^,=.n(W1@Z6+HKN7#6&g5O<.@$=#AACCX,flcu:t?6^fJ:^U%9u`3*J53Z$JOY@7.@`?fpKce"Jo!q,%SZ(S!s-fSTGnnVKIO_
+%9SSJDJL#u9<S.]#g5Y/N3>boQ<1C(W?GrV9>@-;'./L;EAp7uEmP;PUfLa's&TnVE<]'kk,jQ[/XKoD+KU-I].6JojZKZ8$e?]Rd
+%'d!2m=Difm:+*`t-qT8;Ye[)8.Flg\aIO/L#)Tuc]?!eM&N@m-mKJ8eaG.J]=Zpnq\SFK.I2fcf^f+bN1a`^aROQrM&T)B[2*4WQ
+%g$f6B=fH:ER#MTc+"WF+W`!Hf41H;O2-\$ula2_qls<e`YaF1:>D^RTaQh!_lQ)4S/otg&<hRka!8oj/2*gh\G\sf[0e!C^;E-+f
+%:h1-S(-9?FX`"LGHNV.fP&]`:pcAjT02gZg,Z/1@%N8.0$UB+!$os'4R$jgOL]R?=8%eP4SKKr?5%<q@cl=/s9s^UV>QQ'#:l@Zd
+%%#&>i%6hWgOutVSnoY!O<I#/fpM!\S\PESZe<RUKksm/6kSi&da',AD;H&k9>E&*?K)XWBM?3\)\ke6XMTNQa]ke-l40$JtT9'RW
+%l7^:Y,h.rf4D1]rggn5\j1k68M4BM.'W;ID-rZ4UWm.JRD0U.7+=`s8:pqFABG*IVUt@-cOPdN8iYT6"a[PLAnaM&8"4:b4;^*@r
+%Qe@U]_a2feTh'<e<J+#m-UU$0WUp6K\P31e-!+rVGp[-g+aSlIDVaB@<6JcJeXmeFW:Y_F*]Hn^NlP7t9sJN5P*&.D_]!SZG4u%F
+%J?/k+s!R1FgsZF_G&Xmf"=$kKhg4fa_N?[,S/^2IXQjS*jCs5H*b@gdE(fW=d6ct6E^#!S(-0+M#1.Q>@*'))3nPV;p#(rYfSCr6
+%l,8o76>"T0p>?4,9iCDE(0k-X6QS[BeZl_+VpM\BNV3;=J56gUe?G_Ga?ds>#2>+9C>#Y0`-#JX<Z.$RGTL_WnnVg[YNnS8a'+S1
+%<bt<NSaQlbLc/+\SZJ!'gDdr0$P_-QfOVlcS1N(CJV)Vi=?.nT;I6,I"7.Z$:LjXjSj<`Hal[T9-c!D"3gJJN=aZX7HJ)DaZk9P]
+%giI0df`\VN;P^9e,'[ZC&/Z+#\;`a@U<8_m!gX0nO0fclF=4OSFg'&rP,OLjU=@eGA-Jk4(oS.i0W"*WaK\sR5'6X/]57(2)udQB
+%pojN3l:*O+DGOCAitUNCV]pJ/"=4Xn<rM33*X>)cU'hiI'8UH;S!2W./_D(Y=EF(T">66Kn!UIU>T_nbB51GF>cJ8:3sdMp.ZRsM
+%H&RtY<9/F^?oc1;/7p[O49h^N()c_oZilT_+O0IIA>Df_N+.\KT6lWHUWk"'D(R,EMAi`b;e+*/aA>cQ<9S6+8(ej8gQG<p8csT\
+%-@$.]FQ*_$+s<"O5EQ4P!`PLH\Ki!.Tp#B?fIJ+YO6dF<2;0u?2C#1n/cb4(*Z^.dar?[.dhaeW-m#m4OD:7Q$;gpJkC<_/ScF7@
+%*\#I)$]l/)l;mCtB<>'-8ICIM#\Kf?1+ipl(/h#+_&N>AfM=Og;mlhekJD&"7>24*>[iRPV8+RgRP>T\`gZu8gL,1-*>/ie,6+=p
+%#)ene#,>msUE"6mQ77o3"[R]?8M\XLO3;F(+12\ZbG;rf'V7J?)P`'dPG$H5.3+YdP2+CA8:s_cj-R>uq>CKD6`/1,*$ti'Smru>
+%T8CEEDk6o:-34<)0c9284u2A*$;"/W;2qum:@?D#WliGVaBJI<`\@@Uo"H+mFV`NCs.[<0=s21+DP3*Un2Cp^#_&M=a[teNh"*oc
+%(%&%?57/)VBhc*F>)87+:lnXl_3_DsAroo&(A1:\Ih$Q[O_NG"7n?-]horkg)\\'uoJP[$)KPIBoqe`oSZ<@e"/:X$DAe:o)0G#^
+%HTOdUo1]%H<3FFd%fg<Ogfl(Y5b3Y!!54Qo<E93#?KUMQ!n+BX=Ns-dQ\;ZGZD-.u7jZ5'VOE5#>mPF8S1T.u>gP[p:kOE&4s?2<
+%M*3`>P0kiuU1sii`31;RD7H*Vp0dZiEuI5V:$"j3WG@^?LP0du8nV&k/3d'BNm=%E;'OTTQRm!n*e`j\!>IF&F;/G,M+d'"aLkC^
+%^RgBhQc>53>2cm:ADf9Fnuj@Jb$<10dfm#3I'm^&G_`O[]`IEAT8IT!&-<1S_eTh@_1jBZ*5`1PJeY>?3ImY,`+UXB[/ZrR-0.*$
+%.s^B0feT_aM-=#0&-NWBh<5?a-r3[q'%t2%eTu!r*r?.@]u3i)S@2<2#kOkH!aabX<OWao9VFj`ofB%3FqS<WmsE05?.q4'Ore._
+%FFOI;>bIBbL7<=opk]POQX,nc;Hi1(;K\&ME!><u#kTUbLf2Dr\#d"'611%;QS$'K@Q[Ll@mM5O1uo;ejlAt>I3Z`\88`AoURim+
+%Vb:h^i\gKri2n[k'?W_MrZ($0dW==_O;-.WaNOZ^28U4?At[_m!f2%2Yt,j=;,3IWK%VgGiM7oflb(Rg>QR#,4!8LL]/8eBj=,Fr
+%i]H'K18uKW])rGhFFShu:1,D?Zc[?bjs4Zt<r>j`=0b59lTfS`/:,50O^h?:qA0Ct==#[1)B*;Ed`h2je)M-**35l@_5/<HfrKc\
+%i3-0Y/]l>kD"KV"/L2qH%e5[)0$(b`FT47_K3:o7^n.e5P6MgSnT[U5./[m/ged9V6*6\-5f/UcP7Wm1Vcehoas=HcXOVp&UGKP#
+%K!a(7!CpM]>1l3&P-$"-"dl@od$`jM"(+_OZFb#QT9/^5P+mfUlGWgfDP\G]7!L3C@#%m[jsBAjC'%4%`KWiHFV2n8?pB1&dh>CR
+%8/5XQclFMNR$nmq',ZEH!0/42'%mH(-<3l2kk$7o\OsB%$D]")!8;HqX[PmKf4KuthP*(e<M[=DqBn?t)JkR?TFdM:ffE&H7'EV$
+%01?'a]M&g5+a]SYXd'+?''E[>g#Us7g`8?Z@?:Ok<pF[1//b"Qea%,,U;Sj?+^-(313Mu[HhC)%g!d042U[Ol)*p89e%&B_m@['l
+%Thl=L5;!NDBg]RI,pjik>n%4QYN`F@Lq$oNd#P%"hRo.ZNF$@U1:J.X6INXF#t7Dl\kMMARHX_"7$9RJ.`oZ;YH@e);][)mMssXj
+%XUn8Xgs\6F!3_]iOmD+"7Zk9fUnEGV4M)J29aNVpdkDGPnFFXJUka4!"1+/=cpUVR:>VC?C/Q&D^_+e_SLQccakUL1Fpn7FQ*aI3
+%$7&-Z&P/?pImVJ+K!)Bs,35m`3b*FRKQli`X]W5k;W(OjUIHYNgTa>aaM=*T=V_?$,t[#[eU94AAZ++O%<!G\l:&7c/'Fg$#_Rp!
+%51q&$A^_.Ii+,>\8GR@85.+WQc;N1),_$HdS(9^DH:_`%Q*OHCK7MSZWCRO2OPum)L<J!R`q_k'?)@p7mO0?1'KW*JKBPYRQTN<p
+%QocjSQEY02>PMeT41iBB/8(5O9aq7'E1l5fa5MP1??R$g49[u6_)9+7kk+fV[pV@DDd5/=8/%Z[?qiK6iWds%er:H,qGX@9N?=CS
+%.tjN1+`L-oCdBC9.4aan))iI1=]dIX)U!ge]*&M:gVEiR9hNTVPF\\8hI)L&(=1ipg]ERV2q!4I8b-dtiZPYG/^cq=Tj+H_DmjGB
+%)h$]I5S3$\d-(\dHnr@:CnFBOMrY6$fd(o$),qg\;*2T\e[5[5Qc7=7;,=?)%g8E!<Xb]sM[ht!K/F[`q$E&uH7Itr94e25#CEUX
+%C"elR\H@Gi(dKIn@2c77d1kOJb"`agUP]mln<W9BnF%r'5pNb>i8q"4,Cm#)7""<;4&n9l*><X\W/4L&XE%CMj/5/;p:aHmT-9u[
+%qN+5$J3bEgX[RpTDKIaQi:@1os4)aJ,Y-ZfF60b4$Y?:[^33C*<'=dAZV8\=Ch^o2DQIh]@TKIEmBb%-oJ4h"@43DcAa6:om`7Js
+%mVp\gZ?B8EgO7eSAs.j>g(5dUBLT;Uk^_7%:`:e9=4[a(N+?cGPK*>R+hnReaCFH`$6p<1=L.ARES!2:N=lgZ<EIF_,V(Vf;4Q_)
+%7N"'^-Qfo#@fg[7RNJ%LD'`/HS>Nep'0-Z"-6K2j?KGdOl45?tq"lS_q(ohqWidW'V(OgkK:fD/!iScna:p2bM=!PI,k/Yi'mHt1
+%F9]U8ODG]D3-rSGgRJtff)<>,(9iJBc#VlJ)Y#'\2E4i?>MOb%?(DA-J:]^(ZP!h8#TK4+'r!<0'E>.g.gInJZju(94Xq[d#EI'=
+%$E.Qtn9sVM2,NB^T*g\H7TBNbSQ$*?,bqs[9ZW4#,p3tM!HkOHmo=pge0@^XPuU+WL.)<j@JJ>d1^Df,(WtF7PEDn2_r*TjaE!$B
+%E$58a;-OrJ"7VcI%hF@=[*rSI<N'usT9VUr$Y9VV0!"2N"%`ikGd-ZHqR9%=N$;^+`1G,?*E'*EU:&2YC')UgfA<$Tb\rYrnmuAK
+%33Ci0'Nm%-3FCL>,/pJjjO9jNP[Bg!qJ3a<F;l>3=uA-V1c^q%!RDOo%B<_l8,<MpDnGOfCDgnZCudQA:2n^`CFRH2Or?/T79D!Q
+%Y$/U`P5d`u!3BrO:@`]W,[_"#Znj_&o5d=L6K&?Q!L4Rd[Tg]L"%Yh74](7'hC*aHfn:D(H9_X,s+37,%+`$.>TN'".I7&"(%%m*
+%Nslf5D'cXT@NmtA8Ls""M,,LPfa<8)p?X!\>1Us8P+lTN/n:P7aeS<UN-khXAV$u<fNki&+8-")27`\tQiXXGM+G%2VgEjo.8BMX
+%4]NX!@$Y+A*(k0$maT6brlmu1l*$ai!9qYs/gS!'S@&YJ<N+t=dF8;T@#'tf0tG9'1(*=cFpkk;HHsh0+@We;M$giN#&&NVD:@55
+%hOqVoUfX9@jRQmh<;EchO;I1)GNrIH$pfbOWLbLT%';N,JFN>!9$gX;k]@4<q5Y0jA^X*43uK/[VdX%8ci?WOb2r/hd"(^o.1m'Z
+%2>IS(JOX"ue1+e_/WalWGLpZe7q(p^Z;ig\eE)KOX$s]\OfZr#/jH#J<=amj!%_#SOlc/1$&Fm?n0b?6=UL^G%FT(`>!PUYM/);.
+%8k'U@W7@"NSQYVhfNN0#^M/?;Bl5;F8?Roti08LH&iI!NCmRu+9GS3=VuW3-$]a^b#)n]T]gAGpMe52qG(cTueeLTY,[CSh'HR.<
+%]\_>3DuqT?"X*PP;X[@i+.=_tG3R[joLM`')A%E*"?X)Ef\PIo8;0Z!H4XXOO]=[dbu?1n0;sj]^J"u:=-fV9;^*m;=OR8YUaSH^
+%Ksn!ML/lb\Fd`AB=^g&C,b#%YKDZiS"O?Z?Jlc<j#!WrKZ$`>^W$QbYXj!TYigNX]4HPr(kLA!JJgP[HdK%(I\su"<4f^m%kt0!*
+%c18f#K;PA1e"rb%`5To`G(_oq&n\,l6:!OC\_md]IImC>-#LXtUi!^jksgZV:8<'-!7Z.C[k`XQM1Z(."`2'j;bB*hDN'hOC*4Q_
+%Kf\Ugf[1o^R[FA+arGV?/#Y7cCITDLCiQI%<XN@2Q*O]K0!M_*nN3j75V55)_#;a?!S>g%JHabbbT0UT"IO.<;1cFH/ubaS,)9]E
+%UHN^_:K<78-CHN3*`>pbU?J2#8kK@;CF7fc+`2lYQ^S1c)4O<8<bB`Kl]"":Q5o*LE;;nTHe0ImR*34d"TMMM7f'6M"_LeWRR+r/
+%j$h>e.suE/c5lkB@""`<FGH*u5\ali]@BKJ5YNE?SMk<k<raZf7F,uYA]i+gK:tR5mKf#&97TY_&qH)&6rLQT"4FVi?,D%O:EoVF
+%H+L'Wl"*csqA06M)KgnpL4FtJm0pr<;M8h>0/6\sI%`bu;aDq`,0O4L5TDe5ZLH4^/t`D:Ba2'L(E+N]p5i=RN[;'A!O3nk;:>b"
+%ONcS.B^h5[9<`mN1TJ:tQ/\&,8XmB=@!"KgI[[UM>1QlTo/Cr.E4%9JQ'?lp'n]`/R%P9&fJkQEqdaN"=gif5+ILMFfk1:,I5]/:
+%>sO"CX[[;55VAjNG$2W'YG@l.6Brn#L_E<I2.l>5-b-<W"LLg[+AJLd;9:G/*>iiH</`so]I<]Q&02*OR@FCD$Mel4_6e-MV=()M
+%LeJEI]F$IbEnVrp7MA[Q<OJ4%_6f<33iT^lB;@l7.lFNXdhqB[on8FK;/k4(oHo/B6WQY\.9K_K&bq//8[QZ_L?]u0:X8Nt"%4q6
+%d5Gd=r7hsaEc.5C+I>]T+7(E4&9EEtTe^%`E3^L'*3GA/lYWLl+=FZTAD:ZdpK$9S9;OT)E,BC."0;e3"<^PgluQ[NL=ERt%CGqp
+%,E&@'-mOOs!e:O?phpei'4DjuME>fm0Af>"8-Lh>`](\n;PpL;/]7$HOWo?FaZO;:#S%L+e,Uc([p1G-J9sb%Z-#1>rBW9;gVRFE
+%<h2]t!36F=blr%p,,uRnCGH89*QBKJR$F(h8Ig_IlF82TWW!d8B\A19hm?KPPq^VWLCp6Y77jr.V_<#D/Ft;e"U=#b8luumL.#bS
+%9\o9F=jO%2_h'&)4hk`g8g[Cf8`+Rkpaf)9!?IsZO@#d%>%a5(MVKsER=kR(%O[9kU#]clBoo$(?Dc_@f::V#T.h#>e20l@E#"8/
+%!A.Y`Le)gYWJSQ]PEA]"JB6(_<sWc,&McWL7YPoSkQ!8VF<mi"<KM8JQYco+R[hPj,7.ZVm0pAIi$5B<(,l\_I00UG[O82p]g*])
+%,u4dhig`pA!N6ICN?f0=N'fG")-ORfL8nmc5fdc+q?5KWFZ#abQsk4.@L5"[8gMkb#508,K+\D+74E#\NXqQ_MO"^R*,25sA^[IL
+%5Uhfcf]5.HRWtjh<cd/S1XYc3GgSuh6c;VUXbM20$qT[4%,/tM,`Mk9)("(+n3sUN<S8`U*K:)G@@2)CUN\hHi9)P!QG"N4%n+!(
+%3Lf)!C)NC0Z>Dj\63@D8PO(XCeL1SLft=HZF_.LQjKTV'<*jgb7(5)aA\(SHHtee8d^1;#cB*l-o+\oJM:+pk8h39/ECjsRYkX](
+%c$:[XS)rOiis+7ld-M5oA>I(@gKM%E6o-E\qa.i@8TL]OM;n(o04^s:^&j(Ie'Z'>+f6ITC*51dl:5AL6"<J\-"t)FXEk&N/''IJ
+%D.JFC)Dl*;ZqWVq,N-5nk678F<,YaW*[L+:M39UZN=:18NAa1&,BU6Li:rl@W8*&hW%98r/fP..$lg.e\1&=cONc@OSL@F%7V'Xk
+%.Z:9YR+WTtmZlcuh\(e/-=&)!!BLKlkpL5U'+MC'j)n9$f5Un"F9Tlsoc9,+4B(/j^rh:%OM$kf;R$*+X3/!&I[pJeURGK:F[oDB
+%@rIY^-XUg2#Xb8]_DeI1%DK"\`+_d`h07[de'Bd'XU$#e;lhQ9;-es,H)$r@EY?M.2Cpd=1J3Q=`N54Pn5+Fo;t?sPs425pE,4Mu
+%!o9?Q^hEc%asMJL3sU8Y8T*=bRjU)$OlDU=Rn4]8s(I4"j;S\:#2VCF2$o'MZ43M!JK&.NF3D42Q!4#U3]Vi>-RHg7dnUR`)Z$Jk
+%/c$92);oLNP7Q<G^a(J<?$H__aJsou&2\<E-Ra1]1lKXNd^_pl!)D40*i)'#TX,1`*qBM5?BbabJrlkoQI]WDI7Wcd//AoO5t5Qt
+%TKU_2oBK-DZE/^oK/(A[GsFn4P1='b]([6E)_J)rC/0nET7QmoAMpRAIZnAE1C:^]LG4M_W!mZ,bus\sLYa1.dCEdG(cC?t.RSa.
+%6B:OsdhJgohIK#@.1`MX"M(rT*7L!:PGk7,,XVMmJO@j)>qQMh\he#R)B&hdTL9RNM?(9RcAL68,^)9&^"H-*TS'XYYmdFJghDli
+%0ARc`.rg)RK[2nY^+9[ufIRC1<t0tkg(gp%#b(ia/ih9;#]Orrpqb;O'7aLi01-,N2@[VI"L=LjG6c/V0HS'd\l@q+l[:(o6[(Sf
+%qLFJq&Cq<'7ZF1,+E8Zd@?MggZYTWElA"s5Y,Y7d;p`ssd/G%7?8G*5QlW#B[>YT]M)]-5-,EmR%*jA-Fui3+>>aZ5VmAX,:WZQ=
+%K,;c2SP$8','tO"FM\fWJ-ajE<5D>Y:@&d3)_LR4@Dug23m@XPl3_Fs7em(TpOoQ^O5@s)an;*(I/2S:AZ6]S^)d8%,c3gcJYEtZ
+%jZtcRZ]g]@ND%(#![0eG-P'fhELIC6j_9PCOitjAQp@t3i96YR%HrJ3#$mENIOeS'be>p?bXhRM1DM<A@s!8S=S4GpBqpiTm\)p=
+%oX&9B:sH=U$s>C(";IT37B2X^k!o5:,8R79+EX=_U8sA>?;PAQ_O&'0dWnNMBHut0i0:T)JVdWBDpf[7Q?'=f5>rIB2/eWdO`GdK
+%JrI[*[aS!'&$$=hfWrT*b8.9>!]LC=$YB;nfX?=m:`Z8XdkJ1.Ag9iVJc;`&%O=j=<$");(.[(cOpM%Kh4/9uM#B(G+9`0,CZ*P^
+%"JZ11AZoYFZBEdB"`=\RkN%H/9/LS>1o*\d>U;9GKB+qU\Lh\q-#;HDRAV)'1(*3.jun8uKu@sF<B"k-$,@.^!<eOB1)W;UR^J;-
+%a(C$Pfh>S:Gr=5l\K"WD7#.T!-&IaR='5n+"B2pK"*lW2Y8S6KaCQ0#;IL^-C]A@K1S"q2k\36]`)*iX,i\@C2pbbSTVU"f%hq,t
+%QUEO/,`T:$ju9qC8T6X(A1tf8,LHVM)hI@cC5I(<Pms1-92mmQ>UL0s\^i8qd0'H_:.NbC'"G$s2@KSSboo64=2(NQ:b*!Fd=GOt
+%3(g%aV0R3KQUW:4Q7G_,K7Y(`L33\^RNaQCCUpZiIDIUh>?f.qoaAOj.P4Go\=V-4Xd!Y2b$t4M]VO[b[k!r>)46%M+kCXWP^gh4
+%1]e]_Gl;(hQl3J032j9BG%hhL)P-qnQV7NbU='h(dmlGEXarP9nO,/5OgM5JasU8/*D.7k!"?8DGccn*\j1*BBEcgpH%crj1,YF6
+%?o"IU5,M71S$!4M]lXGn?CA<B>]j;5dNO2u\FS3^M_rCR$l58oelV2DecCsEljrTfER_j(c5EF"+GdiMl=C.:9?'E?Y$pcl;oqtp
+%-Yi>_\_^"m0hGII4!\TRC<1+\LG!6Dqi01u"<u$pRZT!/@#*BES#FTM-IH.THY92_Ba$:5`7VRto*^P8S8**E?l*L:jQE&S/jm?#
+%q]8[EP?K1/)+[dp1_U^./mBL66U2Kb0g>K77jpI-XTXh@g#[@?=S3r$(2=5UjajpS#=)A-GK+Hi!DZl")(SOheOi">f`%F.PQ7OO
+%>?6!HaS]HZGQO,S"@[BiS0?%jMG1Ya;(P6X!/&F+PkbH3>U,4]\W@Ka)H7u!((EtCG)F0!3Ec`p]V<kcBmc:+]-QFBOQi$a"6Q''
+%_ZK[KKL$ZZ<"5f=Q8hRL";3miIjmgjdpOem7g^]h"q7MlT7EWQ;MD209'@'"83)QpJA=i63gAaIfr3=CoPeSQK7/La)^*Xb[gFfk
+%bU>K6ZEs0j7nfk.E6uD7!PT>F.iPfB,/uD(1q?O/O$_2Fd3%!i/"\_W&Fcfp*q(JuaAcWiO;Q@.3l<Hta-D<R+T\DSd)#kU;IB^7
+%N!hWo'T]Ge&O6G[Y)0u1Ulc(S&!m^_6^D=l+&9,$.?9%pg/A'3UEjOV&(DrL)cR*B&%D[f`nYD%,4e@:G_L#H3CRK'XgD.3F<eV(
+%5Yn2n(s"P%K-X'H;0U3.T?%+++14WDFPZ*m)[t4Qd6R-);O*2NI=g^ndT%o@7R*68a)-M77k7V,85#CE_7ZQY*iSV4NM]p4F.n@I
+%;[`^&RPY;`^@K@@#JIrgDB![BnusVe8(%^O;>;bJ?m]8NaM*hqP)g0Q'F3WHSS?Zj$m9^<ko0r,#Q-I4;dcHD`CG89kgudlp+hr5
+%S<^E+?Qn]tE.:pTH4;I)O:t9l_0ID"]h^C_JXb-T6ZVR+b4ks?9GF0&\0]>HCN:FqB5=@p8d\/PkQLN?E_IuZU)B[-RCRTpUOdqA
+%5tD'r'W5a5-"0'-%oA*/aNLuN!HfV_#1"^-c;aU!GsR@i><StgBo]VX+=%'Am=Z/"Hr*96,=n^jNFc!]no$$iQ;)u@h!me4!f*-q
+%%B#\Zr05U8:_gY,W((`_/I]D)G1T:rKjl>989nU9THVcb%<\7tN_T*K96I:!8_sNG=]0o$;W?F5;jf#eZ/c.*5O+\'EiVHB@G'+4
+%Y;3*=-ccFBc59=eI+k`?V]/A6'kYOLL`&8VO22g[?so'0%.lbt*G>YN9;]l9$bIr9d]Xh1:K1A!6atZZSTi].L$p?[?WA9_q[QJj
+%K[p:I5(EjCJ0S%TgPM(8q2^_Uo*l[_D(^XC)sP$o<tN&U<konNYZY.pTO=!,@e^:l8aqg-bH3p%p/L=a)DdOW-qPQnVP%o_ONBp`
+%HmMioW'i(FBjh!QG&V[+g$56E!5uT=<N*s#"Kt,Z$5c)=-qhq@kthGr"=l"i&8hPDPcYk(K0,i:[,Urk_P2f;:B&4)PFG$D]94"_
+%pTuX?1.:*na+:8&8F"qrd;k@h0[&8%1BnCa2?L)RaFl1odNF'50>I\#_@o\f)_mL"6(ml[>G9ZWm+/N-TFRl39VP0qNp[';5P,.O
+%>%tZ0&%@nd27giGP7/'_X[fZoV7mD9ho37EV`QB=A:,;TW18H+`&YZ)/3T#jSs$M/_OrgIbCX@d2;g6$d.KY`D*9V!42hD@:V!4m
+%2\:-$dcEFg)WUDt@QJMn2,<e>bWq#0i!PH2ffMPYPM8U[<Qe@b#9?fYcD%h*[V6V'JFZ"JlRNgqO@(@)Ok[O0=Yd'W`<0]q(cf1K
+%4B2oY'CDDqTFP+g4@FZ]Ta]A"9c#7<-K.ZCH34gjV):R)Cu$91"$U)(S2N&N6aYG+A62A\gt#5@&-Jl&8:P"J3fMk.)6Aa.0G+Jc
+%\Nm;sV=V8MKuf&Tm^FD:'9M=?e<_&)EpO1F\n&JsmGVQ:CB8Z2,n1tS93HcL9-9YaC=TJLDenTdC,P(&GIcKd+=XZcj^1&ao5G?A
+%bA;<`0e\Nl@4@;_g'$=WQZh.fQ<QPT?ss0#[&7f\=qM*.fcNah]#Njh6CsBE5LIoUR?Hjj(3\h8]X2/RCS#(Wlr%=2GgBNE)K:F+
+%4'^[&6pMq\QY\[fYgCh"^VnD'Cs(dhcpc,MG'jDf66^.HQXB_J)&qucY65'IMX$A7F]jbsoernP<%8Iod<$*aHOF+Q.&R24KM2Y!
+%Bit`oAOoI<EnFLeP5;eu?;LecJc-a-&#_Z@XDY]W8TR^[X6rBP^HC=G1Z_@ih*<H#*$oH9J>]I?/9Ijoo8qn2O`o-4Q$f&^>U3H-
+%5V`p:DRiNC$qICmR6"V="+iGtD@QMi?>uC\(YDQkaMk5TZKs8+f?%fs!\9^?Z41i6%XHD.QZf)b*^"\?_9$'NP\r#[7],66!490:
+%TGg(3dIo(P>VK--aG/d?V$oU15a=t70&CQ7j,"+n]S!3EU8DM)$&&KN<jRC/8ehi@%q=3)GhU!^F.ib)hk[<XlXoX1U0f=Md.;PD
+%WMbqJ!cgZY3QWk?)W;TNKs#WV55>7r*hsn//s/W"3sB7Z';isg"DIPX+%9'4l)oAo;[(*/O4llLG,p'[`E;(%3$TI$BULPWAsa#]
+%7!1FLGpdO274dss*`BGiBa6Xo"&=/c%M$3a\:"FP?'rrg$BQ`o(g%Fs^_r!+OjK*5i+kg//G1Zk_aUJ:ldG_XcOJMe3I5CpdmG&l
+%ohZ&%"\M1tl)^@d_5_l/n2K;)%.\\+;%"#(LHh/:Fd)`dR#e;KTY+c1akCf$p<<+$.%H!1$,fO5K,]nNEh6]$=X3:T;$O2!WiQBG
+%O!ppD_bB@(PFNm"6^u#JKRO%Q=b`Hl*gg+::af%0)t^6n&bWjE0@6Q*J7oXrXcn+Z-6VZ*7?jC+?s8,h"lkJpSO>YS7_X!qr.*"O
+%+S(3"K8Fkn[R]P^L8C1eV0#K;bW!u5T'57).VLaR(gtmHTJ86*>)FH4,e0VmU33\Qah(qKMUKXdp$+a&ASu`^FMZ'U@JeKMFXg:(
+%b:ZSo:=^/H)g'JJ@gYZXNWs`]ZG_L*n/&3>>m!K[L$h=k$@E'kEZc@I^g@2L"kD/)3JD"pj-rgKXfTJB#nl'BZ;>-5`$982as6#B
+%YN4V-[&0Ne(2VUFVen=f1fnQ,k`7?]0:=#:.D`Yo+]4FLJboWkF]h;Xb1_H,M[<PM/qTJmC7ZH4#Z,dsc'L)4g*G*W2g5!TP(f\a
+%'.u]RnOfqgL^K\P9p;%)qQe7S4k0u2D/SinB^.?HAIJ!%fl^d>0&ZOsO(riK*C5rCS^=4,(Bc54+S7_@qK^$WS#Orerm\c7la]Ia
+%#CUclWgN3MH7#C\*%@&,'dX5R4(Hjef3qW@!ZrqD]$e1CMujJGJBcN$!RrU7*>c6!j;*==ct&LpV`[hE6\lFA4CD8mC)j=lSFG*)
+%1FjcaUlq]jhZ8"o0E]Hc?Zq%g"QBg%=';:M71,8pUJ3"c`oM]*h2529C'`qsCNiG*bc!cU/]qC.]E`O$b!!nO/[%/'ReBEI;^+sE
+%8ko]c>;CRG6nms62AF^m.E2eG)g/Yn])ocIb$'.F:.*cQ!p;J(MP3(oTHI:o$!uNqlHKGa(HeAkhoJ?M1Bm"9]$r_&.DWi&ktZ?!
+%+HZ47+lELTmjuWo#W++Pf&Gb0BI29plD3]>L-_[2WN73b#2K-AW$0^988`_>GWgTDK$#Cq"8r>SG5=.lOq^&s&_Mh9I(C1$Q<KHF
+%di+#di'9,Fh'GOj2af7N7LP_<;Lsj6D1N*5qj=Z%Y_uXq-Qp9,3`f.CqN.A-SI1"LdotROfsuYd,A\881Fp,!'TBH*@E;*5XMc0;
+%'^&*U-5a\*D==R1$3D.8?dQu1hS:i!!53*.ft\A8,[]jG2E)YWdaC5DKlO:0;5Yt=-mJp95&bbBARtI+P<_S\PF!Q("9X`PSh<HP
+%K.+i9l^!D@+DZpbFH\g8Ui;5cCpG!o5KRA=]P]@;01,_0qjd]kL)^>S-l"2,\q6(lGp=\YZ\Z#b*B>-CUB;45JgftB`^Ye94Y>PH
+%BLo,h7QAi)Z5E8?LFc)Alq2h+b-EI(^#\,jAl=qhVX@=l.AkE"Vl\[0gkZY;fP.f[bos9&MA?D]<?gIe&<[N*20i_&a?qdH]=JZ/
+%c>^S&nn5?I-h)@)Y$O0":,$Dfn&>HB\nY\f0Ub\8:bKC6>+T`3#INdT+:kX%ONA]IHDoZ;V@0:%Q3F,iE38[t[$BB@pCa/3/&J&p
+%>b:"Mh$&lD`(eAGCS@lgHD<4>CYu/A(jG(,s3)/4c1JkJKE36Q9k7&`T^r]s,j5:J&@KW!B!R*"A<KU8lSZ1`j<J)V;?aJg/d.9!
+%A5Sj4Ci[>D=V8`C";j-W@Z#[lAN%,#B/1TA8L;Lh\!^8#LhT.]EZgcF^tM@YdGQD0<g%KepPXSA@(ML=R3DA1.!;XRmHuY4dpWKM
+%4X`T-(=CO@@DNQ+Q0>*RT00-_H3IGsV+=idT^adc>HGW.40D3;Sd,LT,)@QPVA2WJi^1k?\ehoiAI%*(<`[@,25$iS,"<$M;PAHg
+%PffhcTTnIaOfH(qol3\f9HY9CaqDnR^hmLIP;,O&;"',[>+sK#,#G"Vf*Vr%l@K5<orL[#>-8n6M[[7n*)2hYhDi%,,>dM4Vgu].
+%<f!W1Y+H]4>*3"]E]bV(X%!G$AuK^^p7;s!eM#3F[iK$\VTDqa[9G!YcZcTaJN0cr$"t`[as!Ha=1Q<ufr)V:(^C\hc@p:RH5rKN
+%ID2V4;O7n@<Oi<=&hRKC]LF!6E?Ie"YH'N4'3_RRF)!'ml9n3fXDh03jUmp3LreE%KLgCJ!p?dYFA]OfZ)3F!=#.P]jsWlf-LLkt
+%l,H<qeqi[aliuZS(Cc#ucu0,=L(9Y-m-rK88Yj2a$]1<O!SAB[b#$d(&ir"!0^'cEaRoZFY,k)!0\O>W"a'CYa`O>ld]_Li)_'hp
+%D;_OK`YTKfG%jQ0fJ,j<nS-m>L._>:G$T0Rgi"t/U]WFb1=bU_[9-dk!JPJqLMS4thgg%$f+)Q=%EI=.!skS4>&t!2G"SklV?-a+
+%qEr?8#"2ICD/U@R/RrtQ;KgEI&SXp<`c"+K!JLTu0MrH,#n,tnm6jb4DSet@/JC0BcDpmIh7^`%7aJ5A29WVug4ninFbG^nmPgp'
+%PVkf(J@<#6@[*dr)X_5-^i"%JFfT!.D4%o!%8TM73HgeR?p;m,[3])=\J)n2O>1T.NB>\[.qNLY=GlHL[&pFjH*/%c56H'@n8I4e
+%Q,8[46=1iI[j8d\%0Z(N)[WZ@C_cY\$kd4XbA9#RjN(n2G5=.E!'(*+o*N#<,)>S9<:?*DM4G-q*N4pVnl`"mLC&Xt;3Sspo6$0s
+%)i/8DHMml0-?pa99>`0"F84WH#U_`;0Xi@:2QW[-:+Y&ZA6&rV$V-:kVPdjS4EniId$:+IS'o$fMM$?\=>GLt#MX;'D2\C2g21s=
+%WoE,J@#;n2m9#;a;tA+,o\<C;:&(Zb_K3i6P-E:7cseG`jJ/5i3=*RF3fq'TW[BA;ZA]+,:8sVbBmqp>$haEpWng%$.jp*aAk@O_
+%+pSWu'[^Wo5F=t6bZ^$\6N*X$,l9q!^e3tfC`!o:;p!dgs$DVd)>T;_g^7HG9]$op)Z]1ro#R0_Ye_81T3NXYccriSjQ$<gRL,8u
+%Ai0DfYakT0P/AE3-,s4kSC()!RhRu0jmq1-XJLCu:rB(d3b&Ch;Vb`]b*)rV7s;*f]JbCD-t2Fb@cS8O*BC"$q?=YrYq[P/o]UBL
+%;Ge[T:3Ho4S>HJsih[:02#KhF-qAOaS0#%EB3Ofg&L'Lk8K`pgC<Z-7R']\$8iE>]1a.D5"9OI;&;tHu53WP:iJ^c/FA<kXSPm(;
+%ie/\cJW`Ak9l`Z!@thpEVg/@=B!"@e*cb=q6md@O)+LJHK>fsZ8S.gtI<"no_,)?-6CoOkUCq!C:"/l+OfRUh6%Z.K6K(Tc-*17h
+%V9=50g&m7\'A/47icnjJ4'\pdhoi_]HnuX^1!b]D;:gUV43kbGgG-qAi.cNU4r6dW$CJ1ul*9RtD0H::BkqJ6j:B>Xb$."0nHDo_
+%oYt/Aq_HKmWRPfV1*<l,-!I]d+q;B#Al!WU=L<^`CH3=h_J)dK&(GAh2+b7p!Y#$,l;hZ#iMD/2,uI4HX&%:^'_!<Cn8o\M5'm17
+%6D\fe*Z0.WFE#W""k&OW*k3i$=Ja*.minS7n.$7OH'qGB)AWC%ZSb%srCBWc3>/FR3ES2'$=_.AZs#AF=uR92AjEq4U)[=b[i%>'
+%K#t]!D1MP\4!-aAfiL!D,hcg@6c.6V;$J/N:F`]nHA90Rg@gdUFfGhJHSWM_Qk/:5j#-+Q-Fa.LN^=r&bIs/`.trqRhrG)7ejVT#
+%`D@8*<-r0He-tRUQmP>m7>;%,IaSYeq>qNMf"H@>BJ=%93i'WKN)saRg!rsn.D[H;pp<sn5X_6iI1Qu<q/s63^Qk!c%iS$q)1XP'
+%NZQRG%FAuPb]ZHHU.-q*T-[4f)'T/2Sq't!#tio5C]#Uj>[S/<MO#"kHBhQXK$5ZHNEsurE,`[\#hPco\ca<S-J(Qn2>)WGCA<h)
+%1m@YZHc0jY\?`\u7Kji1Yj:7KO7m[2"tiR&RcHF?A)rstirl,+>^%NRMTe:Gas\aemZeTp&Uj#MM//GmYL?.BKt4D&h,KoR!^bVT
+%__4>&1(H@\FWH51>ll!k*$TcffR`UIo*V7[Ph-94!q*3R&Au]mj+=M9V[EaTSTUh[>a!!%#Xr%b6k:,_8dgra9_F,ONogUGCq8!.
+%a//n<*IMY<q\lEmJ9p[O'aot!EpkkriC*AXE@HlBOcWOT,aH)r:+1`)ZBBnK=P8G_VnkrL99]I6V2Ncg$]6C-f/rn6)Din-=]pmY
+%!\m>VkRBCN[X+8P^,<i*UBD:T<m;[?'S+><2C6^3"kZf;[5PHZfd:"0Z?5&tO?M?tFdHN*[2+o90\[>/L'!e]g/S^S-&=[6i\8Y'
+%T[%T/10i:kA-@#fL*rD?i0>S?LCt=ME6)_i!?GOQN*#k$267KNC=@ch!6DE=/"UX1lN%*2D<,aVN:\0E1@90*JJ+,^8"-p/@-9gZ
+%fP#O6K`sd"9#\$M[?D7VK2ZqWT]=`L<NZ^<"U5Wc[`W$40aEpVh7Ho<g$b"S8<:pSd`>-r?"j]6DG&E`K,FkAlf!A_<ZGskp%tUX
+%Q(fk.-"Sj[J]r`Lj)1e3"GCfgjM3^bc3AmUJOdeX:K/`?##OSoNGCdJ6D?lSUQOh<V+VO/j;bJekq\eQ.bA]m*Mn;8#,bg%+Q@**
+%CF,*T?7ELX@:lG#J4T#nO,u83RRUum^p)=Udp=4Wdt+Cuc=>=he&J<8ccj+kTHD1^&(I-Mn>)]&OKL2m87ZBB8=lD`028r5)c^?\
+%-Ye:?ZSG`D6*;ZGZ/ZMni_]M-h`UD_48AD]$Lkhaeo30?@gb9=rfUdLl%9J/8AO:!4Hle.krhs^"d<>h.XTT5o@Cp9]*-hnK.@KW
+%+5+SoKZQ'F<7,@L#*<D29;7qq_MJ'>'`nJ/I>p9f2]<?O7Y.5',uq@KTjX,Wfr]UEG8Oho%hsNIN>%Y[G_K,#QV=;8j=8UHoGZ0+
+%<kC4@943F'[VgcE(V*;HA`OYGPHMF2KA:VMSia2_8.Dm-B!8hfHic$uh7Tpc<kSX#*#p/6&d2C("Q/:7;btfGQLoONi+NZmJGhr-
+%*eV<`e1FWhJVImSdfWkI'1D9=_,^_6Zg=hQK8A=s=WQ-e_b>83E"(U%2dgo8:>cj_0aC)B,F\nYI$O$3Bf0Yk/@^k3Ztd:uNfIUD
+%B@RCjJ@3f(.`83"m\KMag<dE;:#e[BC-*:UfpXbT<IhA`%01fN98WXFIR6n0>,fK&T#N5_X^$2&l-<jm=`T&F2U7aJ,9Yi?X0<Q%
+%KRU3%RGq_V4NekAOSl);W2>N-#j`>$E=UnflH\X1P3;tc7fGTF6/;krL,0ZSOt_%9!7Csr#'Og?$5]`,!RK:Y;f=fr!=:A64OeMM
+%3LY,r<&],2TGu6pBmE)PNtN0a16(OAOOTm&[F?m^DI$iOa_)mB9>+W,VIn^/'Za*A!3#$]!"u.3s4O-EOfF_rmOSmXFpt%lLf[3M
+%Hckd_hp>oHFOXrurYOCo3LVDLmGOdkA"Qsh2$f<&p!bc!@8B,2K^uF'5$ccZ^h7q<<IUF$r0P9pQ6L)#@)@Io][J?14OIreI,I#^
+%:i)k\fU1f3n53(9M]pQ%XBe]ml_SL^M<Gf0l:gNS[MY:[H(c0Hp67A?>YncXN=1p,=K=mf?/*TU)VW!uhoKLDGQnf3K?^L\-lT6g
+%P:9L--ptVLmmIs`meX)GBrt&aL:Jn9)$s>J;tMnL-;1(%HP/<_>nSSg?%]PJOo^AZP`qEr<b/!@bB[i%.NKZI4P1-J.>=*+S6XF?
+%,r8BQP]Fsq#+iM"@+C66Q!gN$2:)rG!O5"CHD$@LR/p(kOtp05IU7P!TJirN[c?G"C\^72"ltW\5h&Q5MBHr.?<\j]/^`"FG64<B
+%ApD[FQZb,rAHl@Z;J*O?35o#@b+'LA9!-PHhn#+f!c+_JmG+AdU'q?9RnOu8#AUI+9"KN<%J*.P;I7&4Z/q_lTMVX?1KH/7+Yo60
+%DjCm34OajPB[OqSTuMX1-$e<tnFD%)01icVDQJ:sgsfN_,dWS;<:i_CC^#8tLt(,$O\V'nH6OgRQ5uA"!NWjcP"[X:ASRf%26D*k
+%&@>'""rNMi2+$e&igVRj$72N,d%i%k!#)-0WBDF%hIfY#[H<XB"o+"f['NFS0H;M9OUjd@[4H"^6o,s@eC)Qq),<`.!NQ\Y4O!8b
+%pkgHL6-97*I-B[bi;fu_LU$k*SC\6S1CaPQXJBO;LpLuJ`sC76d(&?Q,&!;cQ@_u@8kqlu+2th`QfN+KPIE+8Kk,i)?O<am/ESBq
+%l)miXj6F^#e*?KT)OWr,^QEqIB3Fp"DZc+0p56"JZ'/CC_fW1!i.qQ'>m",?Q7R`?Yc)5bR*4cORA3A2&cbWM%9PkVD?^]tB.MK_
+%jW.W1qA<OV(iuc-67O]thF`;WbQg^Ufq-49UU*@\S",qOco#+e\m5<9":r9Bgg`CmFojp^)&3br!1lt#=i34!kT!:SUO$(#[.p#N
+%Ym!`+->4$8B66R_^L]mU.VY[ZLhg+!,(T*:$S,Fteu&NmSL1W%r?f-=)u;/-S\Q?7P/i$67KTbd(>,p:)P_Dh'OE>$/YUeGH@lDM
+%:pF",T-jDO,Y_qoP;g'b3NYFW-IoQV<o$:n97^W8Od8`0#n6BAQ0d:$&0>R]1rHV]-g5k)[9KFp3Y9'a^P>EqV'Jj@>W@#2@Yl>b
+%I0pp*WA#7EF?^E5+<3rIpL[u-<3XN"!_0TmW[0)W"43M)62P)V/I4@m`8[M@8JXe"F%@`p:WjX!UeLgt!V.k<_%8-&\k.:OoSS_;
+%b8-no`/Q3TVU&9LXb#1,r5*W7Ru_m>?/c*NUd^`V/FaD\[!:L6M%WE49.=tQmoe5"mU%R^Ls5LoaiKd[2Sl(S7ARBM$n7Y3""91Q
+%:IU/d7\EHc]S&[IRW(kjiE-S?\:\-$g;$5abnq'sP.\B`,k#pZ"_ud$J63#ir*:b$c)jCDoZ`D_08V26Rc'sfefV?[7!4tepIq+s
+%J8P\c<scM@0cWSeRO7lVTT"^G3QW\$+alCcI86GQ"-r98'p*`Ia?RnuE7:pG"7udl2I'c+XH5.R0Z?GGH.+NA.i%l>\kI,doW0^o
+%Uo;$3S-4H6Ph9mg6%B%Cq>3Lj\XW_?\U]s.LF<,$;+atlRKFAI6^@f'$u/&)S[>2i%*LhD#Hud6dM\\]852V&`mh35[O9oFBsa>[
+%"^VZDWk0u>>&[?.S;ua=SL,7")VQ34^Bsg^QfM5!ejgpg!hg-N2,M/-9,>bQ+G]YC/0L>_ZLXa[_9u*CW05DuW6"OP^mo(bakA5a
+%-CCbd`Ln]bJ-!_JCH9Wbi.stA$L;8dBckOC=SE<*2b<Ro:bj*0^&a"r&8D8A7M88;\i9BjI2%kk<<I2h,bL_OP%+XkKPh<t-<N)F
+%?(aJZ]UVeEOXt.nm*8A?,QIrbSAg-aM?ttar:Cs`X4@d7!jkMjD+uup;Xer4@p@f?UfR`E\&^)E:qM(s==M,6*hW]=Z8K``#D+Z.
+%&ZZs@!`?+'*$$tK7kAO0XU68]B*/n.(,^`g(hbPKnc`tPO&8qK-7#g!Rh8eiKbd)pHXOf_\lacS[C&g:-J>-d'e?BTAa?7Ond)h#
+%+u-F?@h270$m&q:\ES4QaoE[.1.\2^-Ksb2D@30g5_T6PUjNDi[F=ptJZ^"CLX1;4jF.?fcP%:U&hA%"nu'ro".?6FIO5%bopXA<
+%$"X+.FIrQ>c.5uHj2'>a"cIs`.$`p\o4gB0pe7J.AVeG2"W^s=&*L7^+Y"f,&nFrkXqD)D)%[Jk-i5g`r<-XX:q0]OHa4-`"Js\f
+%P\F,UK8&-`P$8k73^1&>Jq\D-_E&^u-m2Hb9QcA1eV=^5;nC](gIFE7<;S"F&S?:@.O5p98=4,^$Api;=mME5+I!f\`6^OSZs0t5
+%>?g7B!qogkJ2'l?!02eBLc/H(*Ujt'!C#ek_<rSJ:"b-Z9rNTCA84cQihFS&&s$Y(PC?m#YY3:[kc[*0WOA@>6FHfke=_2R5[Cdb
+%[&.,mRYqlq6>X)'1f7^L^h0@nAWd33^bsd.![k2[c8g"2g+rA[(dKm`<r(9M'V3b:b\iQ^#i?"ij05UuM/*=uG"cipSi2S>(+r:]
+%1n%&5VP'(&?6nV^[o+!=S7_@K-VnIil6$FS[0*fhC=I^!KgKC"oC,!.nR3@BoK=ihPSnEtc6NfW;U*_U)1)CA512\b@i*f_hdhEd
+%HG+n0a5GcNPIn6<Hgms`-E'>T!`&enM$5dLc)S4X*&Y<iJ?'j%SKTk]80K31F;#DUJdij'5_`d'YYq'#eRc+q([@hpM11X@Ct+?g
+%f!6:,r)ZK5a]d(T=.k)_4b[VNA-%#FV''B&\<6"(F4Ubd@j=,daTi"TmD9k^=b,1HB")\X(cdBTA>U&[pRiSYLGBf(16Y&i6t(l3
+%UdQ#]8uOuUN0mumUJdoj-FS,&MNZFd).k$h.BH5q1Q-]X3:)/$+>o%;!m*f`_^*[b4+j-gakg`%/@=:cSS#`RX=7ufMqA+aO8Fnp
+%,U+nNVP'H14J&eT-ceEWU/&!%.4:N@=3g;ra9$KUEpoJDP@XRQ9[TapQL&P-1'8tXl>.$K!&=S&%TH'OAg`X1pq.79KQi6E@G)8)
+%V,`XA5jdR@8*m\nN*_W+C1(b";"q>q8JQNC5S9.)]11_=-o3,BQR8>JJ=L0%i-KsQ6c8Hr!NGc+khk)!QkD(\6,CW!5_BEScIRP1
+%LYf#NP:S)<&ICLuYmR^"PG):+'7H.7*,RS/b/bS[E<F4[P4G&]Ane\kekdci"(Y`;q>a_+k_Kl8*U`JdON@!B>%AbJ^g>bOrGkK8
+%?44(?'F(1F-;5i^VsU'JNfA@.\ZM9=SP'iK/\dA')QcM[["sH5h?le/K^9>5M*."DO0V(b`=#[P4rAGb<,ijS.3MABn0dJo!i)Tn
+%=Qt+"AgJp<ehWcKGR&1t[+_KGdak2GP"8sa@mVZOBr+Y"mf>0L5^?#7e%BD),leep@]/#`j/>:XYMYP1E\#(.W(F&[E)[om?(ht?
+%mUn#.CG,[VGJIGV!BpsW/GOqQl\hNP%>,'s.1-M1#lG0LVcKV;#iH.3cE;&K;EYo1o%L!QeMuJKXj]k%P_P6B_-Q31/qsPJdYDLr
+%7VnSd/K7gg[*]e/CE$"'1t:n8Y3k<2%@dJ!\E^i&Qdk&5Z<)jpcr^Bi1F_]`!ITZ%JRV`c)Bi81VJ1r.@sJO?&9C--n1o"F[*o&Y
+%;p',J6c7re%1V,,G0*DiJqcC%61_23^i^rJ?F5r2"".UdY;WWR>5(:S[M4:0Q0"D(.61cbQnI\6"E]clF=J'6!%b#p3OFDFj0WIN
+%7<5VH'hSX1YhlahBpHi>""]mWVRK620F&ahP#K(4K"miO1_F*tO]T[_d@(E*!fh\ONnF:XaE_K?qIUK\5jQiI;_G.Q5l1h9BV!E>
+%-L[T4O9?=[D-*H'^r+<6#381D[:,`DP7!ufi+75O^inGR3Vm]`.=eBRX8tCFl8)P3!Oaqj]ctEU8cJ,,G;!VHE!@NVJ*7DeeGiFF
+%\trAI,NG:che$8NbeaI9:bJ+$0GmV``MD*tL]_kjc?K(0*KL[#!:5tG\'puBcSp>6_>b&o=<ID;m_df2o=KMKk4D`)Fn]L[J,ABG
+%2lE_BGH^.a(Vfr'5J12"p:'5Rk!/KDhjiT:rG_`pIX9Ims6:%Xrp01=^O::p2^b6DgT1"bH2IC8H/Ua]L-tuYIbi=W?>Ag'nb$i#
+%pjGBI-Qi9Rr8HJ4Im&:.G/&(IK\!Kip%1KJY9uQLI_U'^11g#P5/$@Ditmm7:Hnc5p"c\;5NiNJ5.\:MCDT(Ia?GR3fY9&j\9kQr
+%h-RejrE6kjH%,L*rhDWM4*uC=ci81&qNZe.^HI)HEBO06TD,h`cJQD8r]%g5q<HqhS,VC6q;L_R*?W!Z?bLpcLG(hrcWBGQG@,fF
+%oC:AKp@>ik*HUed>]4PIrjuN%4FDPViSFFjmCV7]s#U2J&+dF-kPh[NGNZ$a/[%?#]NtO3ToT_+><hd7S,An%OT#0j=*>H?I]`dE
+%>hbTd3pSJSDZ,3J?t^VXS)8_jmei^Vl[OBST/r#48EUfgr9isi_cb"TjiF'9g],e'q"1`VmH*s4mIu+;\bPNHnaTdDjOK_1rS8RX
+%LZAAN&?Zl=^[8Uhp&4^\rPPQ)rS`b72g>1NV0cchK"#"]T=#eRRldeK^408JofJ#n5J11sq;:k'J(&*$Ytk<PY;VBZ^Rnm#rS`0S
+%G4g?h&bu4QqnMjtS(#-EQWJ*c<DoH-^AjWa.n9Pce,SP,R=Us^5Hhg^a^7-Qlo==!V7Rf+7_[Fmq/>:&>=(LpDe8`OhS'99f@09e
+%p#5<85->Gi4j/02,-eP^N8Sd*DCW4a9("7,Ib('f'[JPXcVefHSFi/?<Gu5=m4?kJdtUgTD_J$er*o\T%)i/1iSjCed)3mW+$N23
+%>!I"B>\(ui]8_!">31f?KX<.45G,KG1nA46nHC/uMuHX>%3aK`kj4&kD.>]9ibLQ0P4VH$:?UBBkiq33T4Q`Hj_EFTI3h$nDmLKY
+%(@4%?r=*pLd9!mCCH[-lqO;bRql1tPWD<qTXP\)j1acV=S2bFNbN62Hpj/6KXb6;SmNbA?f&Md*Yd]0.SVEK+2(h!]jM'YWo:5GR
+%J"j9kd^u/Bog-KNFKChVZ@UB5o^FN@:uhf6?RAXZbhF,3UoEc\Ds^fbBe-bl*EenM?K7=!\7lD^SsJL$F<qA]er&sUbqX5(:S7RW
+%jlFVH)bWD-(9Pg;1XF/ffaZQ3H.CR4.ue`#>J$L)P&kKK<kX6GNT#rqeWTULVk,pP7T1h4g<$?a.L*(:d+YMQr\C;CQ/57s-Pm/Z
+%(,snZi.R(QTkc?rC_^5G#4WNLc)n_*\t5F7h4M/4E.^?7o5g[1]h-i<Y:[tAfs.N8NB0Pfo1]oG[\\sXEm<H]6lp7[Z_bPq90(_5
+%B2+5b;(X;9387Eob9XBJ$?sE$[O6!'<GO9Fm6q*jUV:c;qIYd97nZdQCqbO7pksn#fHtpF>@IKR'"8nBa#6LXCJ.GV2b%k`ajaL/
+%dob\m4AD7GD/r@ODK?]uU+)RJ4>+tX1W7DYBAu>*C86O9*2hmnNsfVs*+LWTj`)3e7BEq1e*s+K^]3la5&)&_+'s"c4a5G2@=;fJ
+%Bm=JZ#:.q^C38*bo&lT]:0S-0gG"SkelhY2Jde`ho_aei710Fd:mhaCRH.iH2QQDgc4$Rt93nRM?hsTmQ/6*u;:23sd8a+InlX5L
+%o;XZb]*eWsKhhb"*<I_E&V1rWma#\?4US-%#cN%]:mt(]'uaQf`o_>^&LolEQjAN7ADO1WcbsiBDcr7B#(rBe$Wo><:Y7S"X_n%Y
+%&mK9!91nM3C7n2LQqk(*Mq0b,_PkW/Zt8^,9i0CQ?4W2Fe@gN]eqf7o_%#XPjU3;IPFF2i8Uo)g\g[q3G0d\+:kj3)O^0`q-9=$r
+%66ID]S%dJEjDT-KI&6e;%E)4XM;68[rH'c`_m=KR/f'0_7S^/o*HqGP[S6BQlIM^5(mg<?DDXctY#HfAT0(LQKJI_^L,+Eo$eA+:
+%7=k,6`u#kp8C<)2[S+&+I2I9l@E>=QLG<h*kfbH[5UD$pMHE/!*n)mtY!FRJFqei6Pt1)`.Skl0Ck$O*Um]p#8FAG?4=Yrd=D$9G
+%KmggClIpBZZ_=@RVF*iBKST23Z!>5e+YC^lIOVt<>;Zr4+YKb'#ajW<D3jio')F,G5-[cG%ZnF;.:.e0)1hmGaA+<I&)kgkA&n/+
+%,BWCBB8Gp.nJ1YoaYJ2QP=:OXBY0ds.#`2OWQ+9ka-a_T<3*!+7[K6$7QJCpD]_/+h+niP]&FN!1=UEeBg"$Pg;DS*=_!&/Q.^cC
+%:AN6r\pY>rSta?'Cj+eT3d47conO[a:5e5$V)CKZq-$q`j/7Um>]$HJhUI'LMdp%+);C0hAlKmAHoPpCD.p8>RX(;i6QOukG<E#9
+%f(6jAf0dJb`H,I0*m6WYZ@g`5O1%SR9'UZuMZi#-G\m8BDLde"S&X>QO_@YGR6`>fb)F5GMo/X-iUQI:PIH^>p@)SUJ*Q*;^%onD
+%0j!b_]UNi_`0H'A_Lg>J*.Id[gFa(I^GXoqgk'ItU[Hp3BgF(8$Kp)NokZk,*0r448L?O*\A!-gl"iSt*;&h"D6A$nj+*]iQ%QFf
+%mAH;'mWG@,TA3f^?b8TuTDeOE9Uk*`K.KoIWor!^HFBGP%]\]1>N&c0*ZA#Dlt_A2)#CKXp,Gb_p\<2ol)S_tHM?^LLa1"Hr[cu\
+%YBu*GrM4\eVa/^,N%k2V[.K^3dU,=6^MIRT2T^%)Hd.HD>kQr;s%'0Rfk9DL<%;%\l1OQ>%L3:l.2?\@8]H9!b#r>V6kndmO2JpF
+%@76@6YhC.Y[uth>J&W]Ee&>/(OsK1S.NUB8VG9&"i=uNS0O]`K<g_b,ToJU$YnEcKlV`8C=t*d"UO@e;/GW%[,[]=AIDiiIoVGd-
+%>o6bO%R[3(=%O;f<jRX1)A]5rP.2kB8W)=9AhTIJ)2?,iAO5KTdPuej.DtZbakfK)qC*M]&B@j-16RA!Rk$6Jr%4f'm;5$N_Qr9A
+%XI!m'eBefKMTcAR^gX)8iCI?@@,Q"%%#d?)9FTa]\Kl=-OeLE/dkEs>MD06E'[j)_iL,Yrn0bbd"1U`;,!9Y/*@'R`SQPdqrJ:>k
+%Gd[_elm#6h$_7K#f?Su'`GfL<[/`<1RU+IM6>TmhJI7_%H<H<$Rk5$U\,:QborKU6^*F(.*^Lqrdebc)NDYYt&X$YNG\C+jJOL"7
+%0q%`dQbce(4jrs^K][Cjj#I$u'k_IVA.B0Oc-%7"PHA`+a!Yb:;^!*?n5Sn4)lSg.M2-U3<6Z/rc9<#'71BNRj_1N8(iJ9nTmsZL
+%?(OJjEV\ZFiH?SX,+95U"`o@s1$njR+5lYPVDUbj/.,WbSsn;aDqY+2GK/ASMg;pSii$=[0,mgKb0^DR*PpNQps4E%NV8X')d>"U
+%;.-G,W4%`ETI)"Gqb)2._f$Z>QZ*#Z@!/OjA<NKk32SEj&6P=:UQEi^Am=6b7>W.!ib?G2Y3$Ie>cQrRqa8f"NQo*=q\+\ee2p-U
+%fGD`X_J`rP#m"]NgT^jtAQ/*&,<RL@V*!hm7f5pa]7u3n9/P)jnrT\3g3>h%CRoh2<us<FB(MpU#\8C6\KF@`c9ee)E?6ger3s]M
+%OiE!g).jUnR!sA&jMlcoKIhB[`Y]r#H2DQn-(N'6&rsa"nuKi5NfaUU#VLB-i_bNBHq<n/4O0Q@;sBE3Os>q^Z(`e_iK,NDgRg0I
+%r\tZKE>^YY]70t:F0KBL_m\`r0@Q.=JNBnkb=mjS!'Y()Pr1W4b/GHC)nf('as5?NQ>#;[`u':i:#6ZS1nle;Dkq<o`u]MR,(`Ir
+%7p([0N6U9&`?go^:;YjQ:<)ghO2]tM\fqA8>5BP-r8Y(IA'MAn@3s>Ed>`,.URt\\^>nO7:VZg4AF\pEdDRcZ0q[;c*rC#qZLrM<
+%/(_seWl<F.``lspNd&]Wb2OT+;;J#`#Vi#(=dDE),HM25"O%j5nN8@hFTemnMtZ6[VY,^VN.bn7IY^d@r+)n%J00c:Z(<\@0Nq-V
+%%0O]s,hW+?5&rN#fgfb()6ituS\%#FcPjB-H3,<WkBoE$VdO"D>9lG5pNXW\Z,9mYPE5^I?r19eA2`3-f[H"O/Dj'-V2W/6Sn2hW
+%d7`/tla5*XZ/O[R+0>0TA-X"CF^uZKZ;C]?#u9Yq@EeD#GFDWKAqqS<iWs7fNPNK=Ro&f-g[;@aURd'sA+*/;b+=X#,&^?W$(DW%
+%O9IA!+uX6UEuMY,U[:Uo9kis#2L$)oc,4EUduGP$-Z\S$C^-We^3ZB:7Z*oM*J&@$bE.n[d2Kft-I9^N6"1kX"s%8*Bc9!",k7Z!
+%bX6X?nT#o7Pt_Q+p+@^Hotq7_))eQh!ei4pIaZ3CFOQVdN7;8_9huChC1@ETF)c'GmA68jb'BKpVZah5,6ZnYWU+It'oTB&+&E[1
+%GSomD5VnCQl=(gsLY6n.j;Gd_cW0a%;@W=8"/7hL8"gHJB>GRL&89=q)?T2+18a21ACtmJaEDAVd[e[LXBBhb>M@'9fs5&1'*/8g
+%UF;F<n,.86X"jQN/%[#j8gO>ega!r$[m]<IE@e%i//:p!hCPs;:$7mO.CNP7%mbRt$rsc?V"A[[[-;S]9,r(Zr>,_Rrd_3KD)E1q
+%U0JqRlFm[IktlhTKZ7nZg+i-A:QK!2_8!tCFI1UG5ECKTK"Lqe)tA^p7P]!/:9M;$j^F/<>BpWcC8$$5@nHB+*9Q6^%jODC*^c<`
+%Y05@m+1iGLaaSXuY3Dq*+P:oIrVQL@iiN"DEKjMr[kX#/0bn,SkptB6!jLQgNd?)[)!i<+dpG7uX4>7'dulhRZ[X!2q"[e*BD("d
+%.$",X=0MMu^[(pjpMXEbDuSKUr2GM7Z_)a7'RqUTq>?]]n&7BeduXMAn,,hko7+u/BD[aF47AaUgrZr_UK/^G-+A6H,_=5ckWm(_
+%R#`2ghJ=T4m@S!U/MFKiHt`6*m".&XU4/jH*IRB$0\HcNNP_*'G"[6b;oI<6qY;u7$[m8QXGGWq!c@^O3XHnl#5%Suo:KnuUh<G,
+%i$-G$9h^:R^2\rRM!-LC&ZeGpX./pM+.]#Z$59:GJ,Bo5Ti>G7M:pW.r_%f5+?P"I3D$+1&Mbd<\u>)@7g,dCgP=hVE7)O8n&EsI
+%.EB%U4sOC!X[8ckMpK%^i\=J$QRqW-_?`s-!$9<A>4mIF*>N.uoclE>>HC:ERMp2*;/f$%f9QSo)/"HKGjo>#U:]4\j.#)01#bDB
+%>Q-/hD\[0+/AYf3Q_;;RjE#I=Ef5Y;NcIlDHn9M_s#_YEH>GKE3%.fD;ks:S**:u$a-"ZQdWp4Ok97L6e)I*h)/gR_7?FJT$"cUJ
+%L9QYO0nYr\1HrbikDYc</-`2#/c?J1r69CW_=H22fRN6CmuCjVX=n>O1q,+h31&9>j%@:\c8Ot,?;OBqpfY+k7WHL[YqjJ_?<Bdl
+%*PsrSXI(_Q<+ikZXJ]mo"k=(cI#bBaS'RLYdnsU7QM]/+EuiHZ/G*Gfj]?!`%@!G([4CAnNDgG0j_l,F%<!-%XA+8$OiQUi#a8DS
+%<X^uk!b)kA:gIZ*"3ohd])V;IMpPqtZc+n[6CHme!BQgqEt=^F2KGD/qR++4YaR/$U9(_69NjJ@+r!\8b2lcU](!hf_?g?9=DP+\
+%r"b\^G'X@aGk2O$7;,ec8fDn]io.DHC#!?rCi-J>=t,4o=%:m+;$@_qV1&Q>XcA$#0oKR$o,Uk)I2$=VgK^KOnY:=[=pg.;$h]@;
+%)&iWo8:*Hrc=io'Z,fQpK:7]q>\1Y8W#W/'%uW@\F2Ebi*,uGI^XRmt[_T">I\`6R<XQdT!A!@Cj6r)+p6MqI[mF2K'R:)giIbsS
+%BLq$(W?MaOn7FK&6DbfCaLsq5OJV?A1^])qpqi$gL*\I@ks9e))12*cn$FaMik/RR;'A:TR\q:N30pGl[@8T+!pH./@UZPQa9+<C
+%M]>aQd\t&hIF0S_qI0Sl#aW/s1iDl-]b,N.+TVCs!Qe:PgS1s(U-=%3khCo+Ul2>6/L$7eWB_;X@e"g[]1:$NV33E*_%Maf3lHKg
+%+-CprC(pu%*K,m':`O0kUA0P5FJRbAi?EG1!%*Zg;*L^D]L<EFC:0/!eV\?`eN0aS`6G&DT>s/Goa)`2QB5/kE2DY^.IRl=.":6n
+%&ECksedj*jHUKJb)G*qLY!`5c13/Qhj"6b^iR;uK)4@@7M1qb1`Vk6Kh@dQ-30uO)r0/7[`7*AjDR:C:r0RO.7)`A'/Si^n1lr#>
+%$[Au]S`LEDX>=:67XQDlgF1Oc"N.:ZM(mP5\_CV49Z*6UjHqM!G9ifV<D3ZW><CWR+(6Yif7')6d5#+i=kGN`V8f<84m5G\>!CU<
+%fK,]gh0Kg5C4RUZ0i,)d/iepAMRnos><`SV(\)PJDPO7BaGD`/TI/ZNrAD41NK<Y/l_FA.*S*kFJrX_:)Mt`<HA($BljhF^j:G-N
+%C-q;B7l]6F!Cq$uW9*-$I_(Ofc\up<Y1F8,2RP>-g:"DkgsWKZ(@nb"*liT2/!"7=ll?_/!mA]K-,ZmpFr:@7`PgmMgq%Ei&HP;e
+%1u%mP.ip9QpgEQ0'*u<VC@%n'[-751`pqF$B(:q0b>E)Br22LQY`\G\c;k&69GV!0r8\#4BhAlCP49DFH88.#:^(H\]K7rFZ"WjK
+%aB4o]+k#eLKm_@2RM=3@2Hl-g>:T9$0O&_e:g59s:g`TEB5p$sD^h7$Q4Uu84*43*'"VcVfC>)\%rFfAMhsnfl?UG&+L[=CR#XHu
+%pccD0hdM>7%hSm(KB"[I,fVBOhM+1^cQeI2_+RNrbFjk[a6<#YkjH?5CY@f/C*XH!a*&^FMsZ70BcC\noJHK:a?i:e>-j6uX`2@W
+%:_,;"7i"9AQ]6&h^-<k.nuODIks\b@lQNZLj$6(EFrK@foPS%bA$&ktN>579;RBW[SJ3RFc15uM@!7(BLp<U;^%7!l\#K^j,TP3i
+%rZ"?NVRl^sf8PJ1`gP&BH9k<V+#Yq7kJ^t+=3aEH7NTu51..tf%&%Hq_'f9;7a/DFD*=-oAYb8T2V%(iU5:[(!u=oX(RiPSj*!pl
+%qkubfT,*oW2Z?s7/(5,#(J&t%H@%a'T)ITr>DE1:dnKZ@61D&_0TN/2bQ):Am8&Ujs+FlGO+H2Z^EpO*Z&TVIUsP'-*gA(!eSd*0
+%YO)rS2Xbh!k3Z<n.p#?(+_I-=8',O'LCF1o.j@,,?R;A9+62NE?39)@.@70MlM4jn/q4X$7l24Uo?mJuCA="_o=IY3\t"hE[]^Z]
+%,@;Js6p('4-0U7'UCC,%j8!,B@nj^77/ME4nGU$!PKp6_YC@RBVsjZbe^iW+F8?XSjQ`@%^AZF9lhcI?<Ia]=GOlof(4^c&`A53s
+%=8Tm>/^!VJ[Z&Q/_o&PDhnOK@a4ob6s1Z60roj6[p!p\Ij6QZ;s6J50rS<7thL9i:^Y,dh@@c;hI<5)YO09Vkg^ei5E:o\^18s6g
+%I%^)aqff5ms4rIN9A3/ps"V5k53gT-<uQtlrHD?A[Jfpjl='![+5Y7H+8t_2n%ZBr3;@@*g>7:'kjRED_NMM,n(XoB:/CfeI.^fU
+%7Z]M?EIQNsXFEVX>V5F$r_n<QbjS6/?<r#072Y\WkIYU"Y@"ujUnECE*o?nqeN,q-H2HRc]0CcE?%6qg:>>NV*j'?^YNM2*H=rF_
+%p&2eKpH%m*ql:8-o(N#P%GIkln#ej%pTF82s-hQ#+8XORO)2W_qeRL=DeE;O-AaMD9Q/g93^PdtH@EVXI'>]$-GKE@O7PFR_qXYB
+%LOEFfq!^GTjjgaj!t)HV'sF7Rk4KSKlc5p<joMWfn#ft<[r?J&LL8lj_.3kD*.IX,gonc%IQ]=RlR0ICp#BuY5(%SIGBQ9Cju;=N
+%hi%YdoAkGZN-kEGj)M7e5(%VJrPK_\Ie3Pi2=Z`o#PuJ\n39)sp`CT=qX<IfhgY=nSQ8C5pKB(jH$FfrNsj:#kF%q^4c`7^O!g?4
+%39G[t?A>59_tuE?s)bJ?eK9j!21G45r9Dgr9>#TK:"O?s)&IZ^IfB%]:N)jFnFlY!j)NhS5J6!.0c2"QTc_=?5(7Z>+!6R>j7rJ'
+%%E9JC++JA.m@?h3SH$e$If'-)li,N!^XGM1Ul4?S0!aiIcbI(kn37]dIsZ>6m'4-OA6+3WIsuI$:QMgN\*lNShcfI+k?[Qj.)hO/
+%(733/Ie4qD`@lNncSKoT8Ik$OSpgI#SDaFFDp3_(`[j:Gl-@:Sr(a`ohm>g9R+2#Fn'0UtH1UYUs8+m$'D^2YFRpX:otR*uO7-D'
+%ki]_4a7I2uroWk'O%D@'D`6'[J+LqLrr2obrq??QrQY<6ICl->l[?=ipZXluLO4O>mdBQ3mV_K"hVHsmhmL)\Y25GUI$a9\?+BKM
+%me6YRme6AJjmC=[okh=3^,b$#gN&d%dqu`,\,Osl]RP5$o(M1gQT$S$?ac<MbPJNWbV.GgpbKMS0AXnOc/$Y3c-)TGS*QPe1YpQM
+%Eg(Fi9tUckrl0A-]"Yqn]=tt-H$sa^IGM'(lZuj>o6%X)fAYFj]6<*"g222iDV?s=`N?QMD,:<la>Z'6:Nt:ToQ%O2Y,=0P^c+NZ
+%18P:T3Bt'#?gm8sI9CLR2/)rremaI.&Mi,+b'gfN\)h23.G"_k0&mZs#u8J!Ms`=WkIZ,2?fmi*S`*bQ\`=0MG_XqsV>GA$DUZdN
+%PHLT^!@J;M1q?9M>34)fa1HR8?cJR[*F#&4\<5O5@fh95b0gRii@`o?Qf08r6['/NRE\#%[k)_FSA4fBrmnjV2uX`(A9eU&_f.%P
+%;8.bPd:kY4-H+_"%3!<6XuP5U,TtAorSi=UO3W7J]:37&>cKg.+gB;m60mu`?[R7mrpi]H4sDENq/;mQ_67cpO(GCuE*:+DYd!S&
+%pNQ5HG/!i`B0ec\:Rs:*=iad0j-@B(Q"R;sQ.PZi94sd%i4nusrk[42O1fYTQ[eRKqibC`7q_a\rH&!+0:hV<^\di1H`]8a)#)4f
+%roZA<D9Tc"QJ26bP!02JVrC7akbj?5Dba)]d8P&W<$5I7P(]!TU`ksT@VH)p7$@p)\be`Z+efNG6VJZ%&6/ud`"`>H,0PWT@LL#+
+%kX'OMQiKL,+iG^:FqSB:`#/V.Rnua)fV/\]?il@<gisjWG'CT:O4VSFP.8)KHsJtNg>cspnu>Jljg/%fo[4V`$.A"?p]I_hj"HtN
+%s+arga$Mld\S,aXc^s[4`asO&?KE]@qUO3i"#!d]3b/'PlhX+Y2a@5g))(GcriF`=&&!))+8kQKlXu#[Sak#?h-^.kVW'9*ci8B*
+%]W?+_?t>p"1JTZ!0h`rN8Y_F-@?+fU@YtX_oVp'LR%TKEkVMi%k89iMCXSdW?`];8k]:HfH^LNdO-74@9)>a6H-,U>P5^<.5GW[P
+%Pk%$gj,reBd,'7X`rAI&re5IG)8@BOImCIB,e:'6IOX%O9UYn[$T[Vc-fT'9g-M>;R*.]1C\D6;%U8a<:Chf!=QJ";:X,"^T\5i3
+%gsB`;.*a4oB.iG^\YV9_\>D6`2s-dmU<6'XX.#N8UFPX_B,,V*LD?0+gHrJ1`td2@k8!_+#BmV]33fuu33pGe`L4]922>3bcFl@H
+%DCpn9E,BT4LO4r34'^S"jEb%1p\)rn]#3&=cE=^iEe9(i4.KVuHOn/@\A#lV]sthp!?Nl_i<16?nAQ!*()tQ'rkTJd\AO(hr9+c#
+%SDm=^n\m4Hm*JPRnMd?n%e;!:o[-6Z@[TEf9g?b"Vp``KQ0ctX`-No>^3#bbS`V<nkpND)1UidbkTQq>FIg274?pF'm^_q*m^%)_
+%(Cp'`Y&a@$e#NGDatG*X0I)=o1!Geh\.#]UQopa&8S:^4Q&-9E+ZAAQCob`[qQu)3gZQ]0q/"MN1``(**Dr?Q\'*DTT5TujgZ6g1
+%q6WStUlH;<AW)ctdZY`]LHFKYT=2c4&bYt,1"$[2dDjO&E],mnMqdFL6<bWuh%DW!:H([gN!C@8+Xu;E;5$WfkV4i7C^.=7HF=R@
+%#WL'g!oR2CT6uM/I3'd4/5l,a4aZUiU!B:2m&rp<5)U;,)):t%1X`T/nYjir`/VL:n:+j!q^8)4?VQN]k-#Cg>OGR3pZbOloECk8
+%q,K+*VWh.cTY/<YdEakr!`-SZ!S73Ys"F@Qfq9,0Y;Fa):]-tPq\6n.U0@65)uJ?U5;SPsp[bFEbM.LiN-0D]RF*CefO#d#qDA$u
+%`V'\X?_9epV1sGMq!6DmX45KL&:],>VgrjdoAd#MpQ?7gs4QqoVu'$.m>Lc*fL*F%kQG)tcOA/bo6$S.r,Stg`ptd4`qmlkFN.\O
+%9L!L9l-FkDN6a]`>b:qS`M0!=^)iX?;pjjqcXP:/`i&j3;<d,5YK!=:6u;W'?@KO4&H,[:iC@5E#@A<D(F/5@/-!]VCJh%N=Hq,+
+%on_*.a/"a*e>LnE.NhTN,r2Jg8!=4hOXRc*8@b)9kTs]46qrugJKVNq"PlT_h+AsK9@8)8r#"BM.M?!M"P@kH*(ugX9!$jl?1hnC
+%6"Yte.e2+9#&basD^?1f,oOA6A:tLt@^A[S2Aml$&u`8PXS2l^e52l^H=Vlh.M:G]MJjc'D^Ck@[21r!eIpP<U:X$N2i7)EM=b#/
+%p3WoV58e+-"FlO8R%t"jbmSeGeSqE0EDdNJF![fG+r)k)Q!?tY]Td0AC\RCD][TZ?g<!5W<GJJS'YKQ;]%,6CQNuWKY]Pq(?!/YY
+%8sM95Zl?!Q>:o>k)4t4b01tnKWPBu`fVB-uU`08Op>33tN[-[pr8%GR6[b1-Z^gQGfED\F7<2h;/.3]GQEaOC``,SL&(tI"H:H9\
+%qMk)1OdW]D(9;an1bPZT_g@ag)&[GR]H84BP(/o%D4%&7R`r*3-JBe&*L!JJ3DT;E@A<Ur.4U+pFq]1i.XI'YSuOk7#G2QO,@XkC
+%r9.g,S?J5AG#jEs?WRi#QR>:Q&0h%-@Qi%HYt)+u\ARd`Fif@4TSr@)f3uUQfZ."D*:^#S4N,P-2+N&TNi-2Gikal+mA2'i^$PD^
+%4sHG+O\rgUouB"cm-f#&Y;>##c$.L]^<Ui(2r?bgq`<3>YdF?fCL:_cf:26#UOA]t?4^-9mFp/M:.Y'=F(>3uqg$A?H0_B462*E.
+%qJVP>+H,ks0)J\K%$Im@jg&fib+MAR\Qnj1;V@Q.0$.\^.[<`ml[iC8\5]>'f9'9%-4r?md6'$S4XSLCD[HmSmnU%[O'HmqY;mg*
+%mDC1#a%%a^bLk]qVQ`5G^:Ne=P2#b-I,m=sCeUS,Abn&1^-"p(HA^j5H9EZY?6;JqXuYKogATM#4OkM2Y;>`s.?N]?FV]qr0!ntM
+%mlIq^]r]KHkHhD+OJV=OjmF'%:_sQ4,*m21`MWS+6C)SQ`?rKL+\T>d@T38P+\T>d@aL.rALudaMbX$5Ke21l#D^bQ2Xlg^d@[d_
+%%=CHL+GW!a#n,r;j,G.kO*sL"(3^9g6KEL)+6p\sGbf2lgZCRR^9&ZkV(NuUF;p8DKkB8/N:0G7Dop0n&)B]"d5UZEEAcjD\1H,s
+%\+*"N$*.r'J'0Uo"*ZoU8+tP!IK084S+j\qn`E(6#B5nZ^ENXH207_P4EFrQ5l_;9$Q-ao_?G''So4o/$J1d9?G[9A'eUp*oR'$9
+%=1IB9HiZUE=1Br1j;SNd(rlF:OD/_S0LL(Tb8h-"$3*]ZFu%@Cp[,aa\eoZIg=(o,Dh%P[msdZE7"9i/I--9>hRmK1,@NNHd#CGm
+%D7fSM2)_Qk+^+tc-:&9<kTuFEJ/-Dl3_]sU83VF_oBFJA55K]si2]`;:X:Ek'Ok^B3GKdO7[,^8aPCUl5ZBp%?(@9+c:eUX!A8D$
+%q(B7I?<sb.f/p\&o6$t_#JK8obRl:)eNDOu)f1_D5=r'&=4+(s"f4@9W0+6cfAPtc?LRQue*DWm+8MB&WucC^WGS>F;Xu4$KlNW\
+%`gQ/;-l:,H-YA7B5M$,[S-Kp:+'`at9RoD5f*;pn&NVU94:)sO+H>JFEQ+cKbRkpl8pM[.7*k=VLC0,ECbA0&Z(0ZpH;_`;pdn8U
+%S3K&S'i1<hYed^F]q1pY9]J&p,Dg+tSHZk/Tt!i(BnY5mc%<c'n[0Pg+C5''!;OBW$nVC.0p\Gn05O/t,*Y,TrW!q4@,bG/prn;Z
+%!dFlgM[pZEr!@YgL;Y@siQ0)%J:!B2fo[3T%fn:LI,kB!\:6h_6MpsG9#>Q4_L/1gR.W`46Mq!H%.KWU@h?%+,ZbSg%Ib=r35BTc
+%lN#fcc3(`B%YMG<<;9BRn6nH>Eor&_8B/Op9`Y+4M'8*'6C6&gGFB4*3"3E?H=54OOfFX?BUudmC,-)CP\BV1-P/%5rLiC$Q;%'[
+%.J%N#-=*TrF\*rL3IlBMjgA_ML6n&3pZX'H_)U^UX]mFr7gZcbS*sZ=NY3ToW2oc8EKku0aB;h#NY9nV/Wb*RSo^RP%g@n\NMXC7
+%+bt:f62+6?p>`%?a,T_P3s6UG76D_'6[6(03nU(2m%fgk3Ot[7#phI$YiW'`U[-,a[WA?dE7N@1HsM!E\c)K<['*s@mtDH.8[UT)
+%8Wi+,D-,#/AbIX\@#5?9XB9)T&f%]5>F&Btbb"La,r599NM(GHZYZ=PCMM'fm9A8lQ<_kdHaRm"Q(.=+]3W!GAkI9=SKS].BV&$`
+%T:o\ZF/"+Os+CFd%J2)B5$,WL/\/57W'KUS=.d,n[PCK`Z4nX]P:hiOW9&Aj%0dMR7&jrMpQEsXoFi[PA9LLaP9f&g4dECuMNZ/1
+%&.?+q5:UaOP:R;=9lkibVU#u0R#tVdh3(<!R6_LQ/>8)C:%Erg[>kY4KR].o-b2U-5K)f0RW'Xo%5Dfmnf?m/BbI!_i^p#0,ifOY
+%,;-b,%TDsIpIOk9,Y_'4od!hH0YV2>qP<A&P/9/]3MI'0&YOi:l6jd@hohX9H4@SL?P=a]"AtJKU];0*"O)7nj:\^h72SN%<Qq'J
+%KG!Y`HJRgs'CpX-]=PTm=pc2HYESE"9(iFbqIeMl0Q-%mXL;f)3OQuQo5q@^4D_RACmRH2$l#u&fk/Os[n#c.d6<0uRRub^7^KSP
+%XHm+0b?Z\WAue45c,:p6f;Q[.fkelI@s/frgmE4cCc?1DR:h[63+Bck.ur>'aHDatS5/)iKQh7[\RS?=Zu"6c-W`[+g#:BUkFm]o
+%LWa0Mf=`"7n0G49_1VcHYb7bpq[cI"KTMkuJ=r``ach@/c9d+^&pmeacsg?dY@F6P'/JAc$kun+-;$'>pZ2ScK%k-'.m`jD4m[KK
+%]$/oG"OAgX;<Wb_DC7JVmsKQY`lHl<V;0YKYB%JMXY_5HT.AEsTD(TbqtUBe@j%uD\BRiag'57QDZ4Nek5t*hQ*VF'b^I-p_H$/6
+%rQoCWoVMK1%mU!_lh>mQo+)62YK?n>RMP^f(AXC7GrFY<K=.9^[.V'DJ!N2B'dUMqK$)'u?e'rc=Jt9B`qoXn\2Tqjk/G's`P1KR
+%^?3Buc95L*+8nL8n/k9rGa=<]mjWc'b0%CEa$00afAtSV,F.r`8,OT+AUX@d?^#""2b8u-QB\F?Y,b'?Uc.dreMWtErLQOWK4pUT
+%6+2:>6+3tbc``b_YF3`:8i**cS>FR-oCH-2T6L5gF7\S90W37rqq%)+f9H!\PkN^np>8Y<4.=s-b\LSS]q!mGmX$e.ID,AqRQG)B
+%?^L)mhYXK?iI)gFE"gZ&8-FHeNVd$]6J.g3m>jt.Gi"6@YCuDC3TAA!gNah0pGV"i#4XlhnL9uG]!M5Qr2k=XcfJQk.2t;EO'."Y
+%6@-l`A9OVo?uN)e7$eZZ8TCBP.O922U8`*!X[@;q"G_S5^_?kZp3lNQg53mK7(+9]o_T6Vf,J=h7?#d[i*Wi3OnHcsJAHssR0;0)
+%d#qq5^^5A#'XT<O2n*:ip,fW48RV#m<5h(q.3rSW0_orLL6PW0E9$HZJX.Yi(r!oGooBeFN-;-/KAIi.%jqdELG8NQ_dM+ZKbAU:
+%:^rF;VkE$2ZrVT_(&S_kM`8"I"V*>K*9*S>h"]-<BZmDhcY@.Bl=ecf*.CR)aR@O!FiU2s'TW*R6BX>[Gsgn!^etk4P8>L4@G_Od
+%f_b7W26pCPcE.eI/-HL(E1Fm`4=*b_;O[,Si\_de*hX46BuQK_GXj>4V:aOYI<:4A(Z%pR/B)sn0e#P6(1XZgmqIMECe2di68d8A
+%/?p.SEc=A4qZeOiRRZV,BJG2VdkD=)"-]$#-89`A62'Fc"VDYN3.X>nLsV:Y7Rn#8=#t@k8JYJbFh@f6_9DEi77$7I;&#cSA"b?8
+%W_D,fa([7uaq?\E7VGHW1n:Sq`R>X#0\B-6V)"(V*,*ShD%\35'u"W;0eKO[FJiosd[p:P"nGXVK-LAg/3.H"*!^],j\!^]G8F/W
+%8UDNH?@:VEpd,d,m:<lE^,\+0f]ktRj2?E#,oXU\kuTs+pVH`uX(0+I'e=ljjl=XY/9/AWk?dOsYP,Lk$2`MY>Q!#'rot8KFc4#G
+%`F%H\IgDhD+1"9/L!>p=Pb-L2n8#2mK",1WH4:8^VX':"M#0%\r&$&'2(\ZdFMpD"jRJ[BqjL^cRTfTW>5OalH_hVWV$uD11=r.r
+%f"RHoGqGHU=u$>dB2Xn*;3[u;pp8>pf9//KCWW)6c+KC"Edl-?l^oCOr+Cjmru%Qt?S2`E=YUNa4=DEBgTG68']/o0g7J(o-a(]#
+%CUUsf#ra`X(pU_11pJAS^3tiV>N4D&XGoh!O$k>\gQT.e,T)k?boRc=;smmmq&Ni2[IqEX#80c,BTDkMFZKiJ+Ia0i.?NC6=dq`S
+%>6p*cCYTt_)FSP.Lc=42UBkTMEQ=3FdPQOp7r[dMX_c^P7QMgakEIM6HJI[*m1T(hRoWdhL0^R14lfYXUl:kFA#PJ`JSfN^+'#VA
+%;RTZM(<$]Wg:VGAp4[S^ATKju/S`M1-u#c[^%osQC8S(h]%31A\T^]ogq`GdRH(e:4q#X!B_&'LH7;9cp1EaADKh\R.du0lF.]Vg
+%);1?tKm?O`-`K]V<OaO'X4k3fS=SrX.*n<VMAsV-/ObWSDIcbB7?P"[`_sO<%6iE8!Y%-C!'u3$p*Q!RBX4($<l9bMSR>A2Da*]b
+%+;Z9a+,Z7P$K-hL)jY_28\8ZfG7I\<Y*#l*^=+M+@uU=5`LGsgCNSn>_muB6oB&,oCD@iS]=<)GiuX]\'#hH#_p:-"#B4UqjHBG/
+%bOR$XRt6IgUDil`9D!^Eb"HjO]b]p`LX_c+pH2M\[(eB<c!%bE0dcsmY\=^L:E8To5th%20n2Jq1GM-eqKM'm<=A[?Ah(p1h>r*=
+%=i,U1*S51Anks836bLl,g$pY;I!ZlLX[CZPD5r5*FaQh&CT$2sl#7R^f7;eBH/V>T+#,HC)LSZDi<n`YQl%.cMNQk3Aqm3FJ=c$-
+%;H(KOi9Q=2T9?Y3HeHKZ]+<!]?8-Eih;$2?NEg:@N\;?^#SPY[`ZF7$HLgaqJ'pT#J,\oDa+HpQ_bgH."-_Fm/Qf!'d";_N\C<$K
+%dYnPQTrlSLZlRb4/$=:VY-f"rU_n0k,LuRbU$j'u.*'%:f1J>tCUR@=mC;Y+XgjC+D5-=^<2]Y;PR=hECHp:E*kdh=Z\_OUmsQs>
+%pn*-FnQ$T.OO&(7FRu,'"1>C[7I:CWd<eWd';:0X5q@HWf&nN7WLYMj'>-t'k2%QB1MH"kA:9)d0Jr3@P-qbji(bU@hgORW,p^.<
+%e#jr*)1Fk8/3SZfMid6LKZ(e&&^jE@fLIqQh1X@.6Io#TPP9km\Y2[`,EmE@.PutkobAZK;c,["G[c)>+X?r0Qo4IFPDXa;Tm_\>
+%,"C!jLe*\N)&h4?kh'P3fP,"?F;A7PGe)=>B]![JH4@PlHOV,Q&gAU>LP_$93$O)*M:n_jq8>%\KPL&-gSp;%4d.:+,N80E[Ws:I
+%'2hQO[[?A,`=*'_(UbDX0oN&lPs\`T.V3[.*uDH3Nu=85Z?GFo_eE[qe0S+3YH7,;cn*;;=Zr;"-'1hpfdYI;Jng0c=(,<t3(lB!
+%^,2it:X[]pSU7iARXT:W[OHAgd_?Jp?Ei#m@)U!JUY#?F&bmc?XXT"V`8El<\OP!:Tfthj[;,0D55;;lqg,6^cj*2?4%//urR_eX
+%(16d#9"Ct_rMYlT2.:i".K=?darfgo7":fj,C!CFcdUmBSsJg;'[PNVq$QH\FKa9ErD1-8j7V#6*KMga69L\EE>/uC-pgZQS'jkJ
+%X-7He/"a4*c_It4i"i7K:?u,-m<8&G)knj#I]i0`DT#$aIW;+:7qst4+k,mD>(aqo%0Ejo"dDK?U;;?;`dcG+O.(h]effr0p;;W6
+%C6*fd2"@:BquQONVR*dK/ocAn_iM5I?i*A^^r'pHM4uuos#VTj/TCfpKiS0F1WY(omBXfn<-CbFGBE8?XlVXLS`Ep6Q?CE3g-qIj
+%V;<Do:cH)!?:1o?HG*Z*H03=\LE?3CroeqY\&Gmj%R+t);4%"C*.?u9X'AChY--AYgjeGf1cM)<!mMaAk@E`iAB,g"2C\Hs*]u3d
+%S7[piTC[1[Re7r(lKljiZ)d'XWn5:j?7IIGI8&o@;5eQSP6b.%hORp?:Tljlk(m1Aiq,9;5l7nOV*S\)baM&P1H_%R^XlE\d:oUH
+%cQDJRl5]7fDgeg%Lp^;J.<7JTSqZ;H7U.DHNHQD65.`6J-cO^&1u"^!loT87W?ZZYL8jEpX1C8b[u4ab*R`r'()M(3DIV"@8b_Hd
+%,q&+-/$^@1<j^52Q=r$Z=>V8^0;9%S)P^&#ECCnkY,m=Y=@X^Ie=I1X2ONo;.>u$lfeVEfk0gdjrR>Ah)GKlPe)8KIX21%"W]-;O
+%17@jdA@aRaWju)MR%2:JHFG!-ZtmS@V>pD?Bq6IX25]^d@lM6\L1PF4/9V\;[#(2((qU)6K:M&B@Q.^Y;$3kgnsffAIOOr@Y-X&j
+%]oYTdc?n3RfDNP<j*A:uB,!S%^&2!hjV'BnKm,WAI999q^Wr/+j>uUpH^8Aqe4%]jf:<u,HLk"7^+N=^gfe[(1L-8JFh1*Z>I^T7
+%*+uG"8*>=X#GemQ`<g6r8971n.h^#^R6+:dP3*hB3Jb5,4*r0A+%!UOSU7PAm^9biMoAC>N_4:/([$&T^OphQhL)5#:?WZp]"%MS
+%]XL1S%7R6;dQQ/XXU#;35GEWo!V=USn<#.CdDC)hn&"?ofU+E,D7if^6?cW"l;cL6'I4f1@d/LdL"2gR4UP]l.%!5-EbG"n\DRBL
+%ac_#%e1`&cM8GXE[@!8aE)KKmaD-8Y-:@>ob'HXQYBOa*+<71M8qg9Z$5YC\=?S)j-=VTU8jXLc9GKlAYGFJPq1:qG<)R`*ebNs-
+%<PAfI=YK:pMnm3(_]2O0OU0<#7]j7i9L/TidqeI'q.aTrDg[<'.XFZ+UO'@K9iDYDO[9fSVZ^GH>ALFU]@4qMjSoX4Fa#^M'K#[D
+%D^p/2W'(>@BWoX54'6#gD)1]F*N_(-q\1(X_44J8Djrc].NGQH8,H!Bie)(Sde^3>(S,ge<_L[i#]o"R/e%>.jNm0N@_&b&3O.DE
+%o`bke(5Vcp$,hd\Q_AGf]J]K14:UXmQs:)Ck)94n/,]gAr!4+FT"irSJG,p[ncE(%q&f0!SnlN!5=^)j"f&F#74O-WXbP54?X'^D
+%<MLqOPTHo@FS&+GbR1id2r!`1ceuYLS;fe=+;%imE(?T@9"UXMP^P$u_`'cFbu)XNl5b0B<Z2R?,o&aFbhFj$(T1u+gH7nI2s<,C
+%o66BCKjnH23E'fn]U`M3nmD@BD9qm^oM\OYhg8P@;)I-7KV$0HM.g/D^N)n"DD#,=iq4j3cXQTuYu_a1':;5WL#V7ErH&U-h`I[L
+%@C=gp'8Je5jknSf\r+?Wi9!0X/iEc)VKV+-0k5a%"3_lq-35n0q"f[#0OUaY1Cfdt^^L?X+tt5BRgIHZKr0GLMmE.XPRSEsfoM%>
+%q\2>>&S!h9r[>dX$aH`<Haaf"7=:YXk>?b8`Rf1Y<NKN-fLhhB?>Mb<=\lud'1#WP<6RNs3tZTM:\S>_.ZgfbkX9'*;>$Pao__b+
+%o7AK3Sq&2#Q9=::S>Z#%&e*C'!p@.$=b>U9=5_$C.n_R$>C^/1GV6i%ihGFB"`h=7T]G'blR.OF4&PP&Ku9,DN@T_"X%QU@&[)lL
+%*u4V^jXOVCs8RGUrq?Rt>U[C!.fTtTNgW"*Vt:MdrS6kb[/O9Qs'+ad!uM#lfe-,!Do7,TiB473c7Wo%J-R\`i2J^o%i/!0o6bFi
+%]:BmYY2p$+[hC"Yh!Z%0Db&7LS*tO'\7ZPd"'=8?2\/"1Y,D_WLa63jK"k@'q.$R\o*pt:Y;5H,WBSGq.fb#sm.$9S1L:f_r,]h2
+%X1-j_*8So\\=U=M[>PZd,JsI%@u?;/8&ks^a%3'7%"9#_FGu/>X6t1j[8MK;>*^gem]Z0*T2jIVcJO)1:Ykim27`7@o*5%JksLX+
+%Os$;3n"<=6SnJ)Pi[=Ycf$rp6>M)]7U6h*X&<D#ad2'LgDO1iM&N^c1F%CtUN5R)1mo()U,0-Et/.T]u(1$:OA0Me)@.=@80jmiZ
+%k4^h'^A76J7o*+P:q-$I\9f3I]6E5iVZGXf:7<0K9M&\_.SHGD1ECm:\G&EQmjL>'jc*CN],$-lH"DT0a[6*e7om,T_t,#?aV#sO
+%1cP9`j_\Y&Qj:[oB_$Yobe;a0+1q--1&Tf1nBc#:QNQ0aHZ?Fi5B,(_2oiJFs5=ohB_)1As7iXe^AkZ$n%\eko<6!_^\jZ:p:7EK
+%^HNc)HM8&[([%35X>n'1--drN?;VQu.2(f+>$!0`f1MS)BO.Gm>VC(l3cp)(n.^]ml-L.p_nJ@hR<NTL%uBZ-2Jl1d?GV\qnq?qU
+%J,,QUrp%O2rUA:>Ie\]-D`s!TIsLYA?iD_V[m^8i=24[tVsf-5@:K8Ks6mE]IXgsIH-\\Uo)#%<E?6P):[.d!R,`,B^cV]?NU>kH
+%s+TV6+6VP]kCij+9tpF!2uiXPZebO"hY4LoJ:G&%^?SK6oH&JHnEq[\Ekaer5C^IWJ&.q2'&tA%AmDg[TZI=C7[dSlD<9oPk@8e$
+%pY[UlB:_=\Y<Y6khSp!+nSS'1cT&`<=[jN)Fq8.%%r[)-[Ei8.d?I.)Q/V4NGb;VU+ZQ>]AJ<!$s%2?h.u-?/E'J!+nmTNHPUH)u
+%SM6)_-@GOcbM(m(j=.]fSM:&`-ChMe_R?<7X@tlD6lsLo>]@foFj>^q[W_3kK[@;JDU(-_bh3QsX!45'0g<$n]N^cjY\<saDDq8g
+%G$1EBrAWMn[ikmHQ`"Y[la.*[n>GW[:0V@ZR'\t,O6eb-s!A\uI-GM`Q5.8.aAY"5Fj>^_FSiMlg!J':PmQ(gjf'9+d`QLoZlKqS
+%rNpEMjXIfGVeu<^e#'8-]uD'r^>GW"5HL@$Ncd61*U!u#n/fIYGoK*>5Ot&p]h[<9"FnR;la1fcLIo[ZQ$fZ[ZB>:hV7T`0<X:&r
+%:Y>m&3?*_"mFs[74'le_h%L>qG'<Yl;M4BkA9Z&SD70Q;Pg*('rASXY15h]>R2P?Ocb95;fAHN"n%\ek+2.uGl[GOhd*hj,Drn;Z
+%^fUBU*!c9cNi.@9oX>rm+`@.KM49f.6(XZG&EkAA<K\q/k5"=A[L2&D>t2.:\@:0krZ5BhS$<05,))p`/=o4I#]lR.K^6/GS&`bG
+%[e1@/5P725[!Q#M3i[`\^IhAV:`@)(9Go$B>rM\MDd/U/fXQp6!QEgM6]tetl_hfq)pb0259W`)/)SXu=b!7%hNIF^J@&O"S%rn!
+%n2^E,iH?.R+c.WT0]1lVK@\NG^ZK`9rD=X:fK<JSCD3ae9AI\KB>*-l'V'sf12PaS/^Bmqo4-tHm=4;@RnDe/#cuj"V:M.3"Vjf,
+%qK&6n.G")W#qXt/'gBm![&J*dIeGceN\W8@eNc_&q6nkR2su0]\TjSr0>YYFR&\/cm,e/96I5LTil<&pMDijjc;3puI`q\RNbhXl
+%d.-b;J#<?n??7ogH-5U;dhKlq+3SLL,oqL4'bm=Bnf4H\WV.B^]8[GjD!%7)R+fjU[mp]-1=F*eRmo#ch[A9iOAL#tcd^J@iMX_5
+%!QkG!P:-E3*Idl1Ud.+SF-*AdQ,@Ni8-R#R=SA0/\GQbg'h/`S&RhsWJS_9E"Y3Lr&]sW,Zm%>[J&1V>"m2gZ%@CJYor"FS^m&d<
+%--dmQ(Kr"J?EO%SWIi1.mq'TU8D>msV<4?[5B10N)[&^D?NG;HMEd-94UNVLnI0>N@,]i>p:.+V`ogUhWf29!]c7@_o#]!=l/u@n
+%If&.Q5c#d]D2ir`IkS`/J4pDsQ\AQ2:SB@O9_9aQS)j=V4i]6*?)"%ISB@4'/AGu6X^TME.%gPbR,0=FgcCt1rU2cA`(YGIJ<R-S
+%&\_u6J@+`nc;3hu='gDU'FG^A&Sdr6Er8)^_6EHV'Y)E^242:;XmLV8FrS%kF9/6fE_Rl\-I&JH*e)-aWKsh;!D`Q-Q+gW+fA$=s
+%pm?^Q$#kb)[El`qihQRiHhY:uP]&$9Uqgr=iZ*4r=j&ZBI^b.>[HM?M/58^5hoIE_3\p8i.>q(1,qMh')8H+3T7=@rpX;oSUg/@E
+%p5.6&,`KMM^/]KDEPC_!8RUt3mY>/#^SLWHM`aRA'.7cP6+1"QPK9I^rLW%Dre#Q]-@qSr#HV+i^YlEl8V:Mb89GGC*K]aj'SJL"
+%8U>=MR@&4Yq?tD$r$q]Tk+6Tlr+u9rC@n:3?G:;di4LT%gCVWR"ctaoJ9Co+rQD![o9hTgg_:XH_\<MLcM0'?mZ0+?gIHe6NWL'>
+%pJ6rD![ZVi5Nl-s'7kBDr9Q13s%-j?+F[%R2b^3n8'R[tJ5./<N+/BM$7p;%gH:Vn;,,YbY35"oaM6c)oiYFe)GQFtaP6k;PFkS2
+%<en]0MdV0U7L2\LT<c$(:HS/Wr0euM;.bq"9>"Xmp'*KQ)@-`jU;_Y>Ckad+n"P:`r.t^>?Y5<K]KeHJ5)ErAiu3[:>7ne0i[<Q0
+%h=p;rTX8L"QhW*2$:'S+;VN0WhdF,9VP(q_f]XZ8i-XOiaQ=\;-N5VSQ95pENu49LbKJfcWnsn"EuuQO=q%W,I8SF%eldHE^SfSE
+%'2nh7<>:MXg_Tae*/,hT-%aK(QKS%0IQRS$9Q)\p)gu\XW5I;Uk`pddaZ\hLlFsE2WtDg&%I%RnNptRAo>DDP8:]$+/eb>9PV=#G
+%?W@2iA\l-7>C-F$n:6Bd^qsTWQ,fd0g;8,+qB>`hmirCiNh9V>H6e)nN!@e)KtjcH\f9$>a?0Z7:7/f)#Zu\^$M69G8"K*boIo=W
+%4i()_:Gr5#EK3HAkUG:Q):FP0^5r8ajs&.J\M!LcW<JbZ4OKOcNq.U/VStd;'IjD\6>e1f_&<tbnIM<4i8rB+kfrr`s(%6`ItCXR
+%Un4/P#j/sec!B5P2ontoELlo*KV-o_>Vp#*%&m/h9.22_ELA]k26bTk#9-002'tlGa1;[NX;j5eR`"X^#n;nO=>C[$^FQQLP->dq
+%>GgZ,i_K?kM>.HoC%Q2t2GdPVZ0>+)\9Rr;1S;r2P<4^#+T*etl2m8h;on*j'C?g$Q5kYLlPRPrTkAM2=7NJU(]f;I0EBi4-.nm$
+%]8^gc+[6oJ1>G9ZjZ,7LI2`*V,Rjt<a0L\mD+o4"J\ptcfFLV^QUW69@gPUHX"p0JqK)41=GSEjJWbb`2^r5`P/l-5!!I]mG\.Uc
+%a@",Zg\,lVW2kNf8!5Cak.3<4hNsVPN?4ame1^F17bng`"kA-LN;,J8fHC'l33PZ$qrHW:/YP?]^J,tSct%5MinJ1'ac@(I3pC"*
+%imSV&hdq]9r:1S(@:L??Ch*NU'e&X-NB-ISE?5IJO3=;4lnNO*b`YK&)qcC2]U8_EI<7^E"%\j?MO!h'Ymb^u_oo;/k56RDbgc8.
+%po@g<r*k&;#GR1=8;H+N]q-<bF*kc1JQs7_]p_n0W"?.7`.+ZgV8"Zf7A/_69Q"+E;j3dhGe6'Ur5c\bc#8meeu/7p59sLAK5@rQ
+%<guqWD&'-1QE-NXeTOj@SD5;gZ$9'^"_3)R.K\!KjB4^h-d_^u-hT!dO%PZ(fG<5C)ukkVB1*eBg5(-\nXT;)04W7SGqeSS4_MaY
+%F5l=!EEW)+JIMk1Kf=9j;gu7`)\!/[4ttpSq/:?@=!i*dnsKgf$]7ZU?9gTNF2p=G9GCU+/-hQn=mX:0C>3^N7g7.qIu@jB-.'0_
+%VCB]smKSg2r$E/B)$nnQ2`f#bpfQ=@ppUeX&L-HdqZ[sLpJ&4'f:/c=Y91OZreI!Co#q('jnmA2Ie2#QJuS#8_c6h49SO@NS]^:c
+%O4gMj:0%M\hsU;YoDe7C?gVddM,gRN-/Xf(T$L0LD=G$j(tJRZrY61PqG;?tMY1>lY*?mGl2U#j"kf4<:lYR:"Gis6R9PHSpXpPa
+%pi./cb[E7KH_$XZ>9UT0k2V:G)VT97EW>:h\&uJ/"JSU5*^8DnQ0u>#6)osVkqef5)>CVMmS:.FM9!^kCU?k!L`f]0:iuhZs4St&
+%aR?>/qKc8IFb/i.W)7,9lMg2:=4UqeWpWJB]\`#YhK]\^2L4u(qqU98\)kSu^3JC^XM)j'nDgIOaZaOH%s9h#l3G3CIpJu7VX)jO
+%4`rouql>5BnX!U4olh65WIMr2%T5U4[g,U<5Rncljsd)%T+;*IW)4!TK4&'uFlbqT#ED?Yh'A5YgjE8^rPdUi`V-DhTBnGGs+*qW
+%^NPgS0_kP^pD,u0U6,.@!V2@Q/dRR=ot!mGA,=mT1%W2G8E@fc.-/\f5=M_^YFk[<;OfA_e*uN:huDNW?iTcYYPo=B!kD[2(^,e.
+%.Gp(M1^)":Eu^1_EIXN<gtTMtnCiLtkWHMd@rQ8d0n^ja"FnAoq<NeOjBEgq48mq2++O/`s/9H+fjB4.cStdf-N#lW=20+Rh/D2P
+%;a"JB>-GDPb.CTNWoF<K--j8&&CQ5a#.&UEr<f-:<LtZsK5HiGE&YuODd\V*)6t>>[^cT\pdDL32"0cg1oUiU_C7,21B3XJd;XV3
+%p/P9CG\^No+^j_pJUJR\#)52"cFPn&;GK22O;j3Vg20CPh%Ma_[?bm$_"kH:'*4e$=[4)4NQp/3acuCao(AM/f^pKo+Q*I/Gl/_m
+%hjf,M)uu#G^O,_8:EP&Yq57Tuk(d=Cpb+T+#@PuP,m[0p,Q7G_^Op%e_`urSg&(O45(ES!f3eI<VdI<SIt%!-iQhH:re#&L$5,Sa
+%-Hh!1r02=miG1\@7X,:t_7;Bn-0?Dr24XNfJ!\\En-F&MS?o!`N3HE^gN<0$nc1Z-7L<=M;j\q?(uscN.mC`3dNRAD]R7A4a8P.c
+%4%#$,1qJKa_db9G/-.JA#D&^IWIPc!bRZ<Pn3Zjb(dTO,_i!TU]@$\Wq"\B7oJ^^.c(Ft1c/8LZbc(YloToNLQ`HD+OZO`nKY7e#
+%XYt>$N!H%CFB6B0d6RG@NIW;h4J@2gfkF(^**Yq.#Jhc"TlK7(`W8-=ToDg_PfdBAY5J9dX#qHd@O"W7oLUJ$L<.i.$R,Vp)"hL7
+%=`*/<+h\`NYZ#D=eNHo]:TF&+]<*=!-h6Qb4$Line?QgqIB'rfiThGMpMm@,Lsqa[$_CPM_fI!d[KV8<5S$X5IKkggCC@pIhi,?E
+%d7a[<PMm1"CNEMZga]&Ur*h(BJ\VV.h?\p'Qom^+Zl2/PIMW4[nBEuQZLDS)H-LiYAH<N-GP_XS0nZj2gY2GbEB=g$C7EDp6JuFC
+%bMHs@6clooE@t=oZnXErS-(lDLc)Xqj!#I>&;^NlR8>MpL&WA7$XkS$0kRRpWknf"oYX/=(-[CqGETj1\/BMq7td`!I>ZkDkMTmf
+%">1if!`)rEn@]ZF6[5,Xc-/V,1c&HkH(njWo6fJn!=$Lp0Ys=<q%isg=JsY8bE+Km%I>L]$'&dGCPacsWUkUM.JN;kPrqb/?</+>
+%]'r:LOZkIN,QPmqUZI7c@P3'8M;YWqRPT\s<!"DNL_4S]%>&0d\3!,O@S&6ffYpscR&$-P*NX:=SS,4(b+rThXDr=Ta`k*W+X!@6
+%q%'Z*SYrIsppq)Ps1\n'dnqUd$g4bWX8h'gh+kEDFAktI#L$]kXM2O6Ja48VK(m-E)L,R"DScBC*[3.r5fDjT)1iYL@:jEd:&fu5
+%rV4gE%jG^1?TYB5,4Z'GU%#L,;`eH?1Ibd=_S6u)WAX5&o(`Aq7^3#=F+g#]/Dt)s[j@_=2u,L(o\BnfeW+!tP31Q*/^Sp6Cu5@`
+%CF'%EFjm])`5s0K_IJ3pX%Z\aS7%?tqOh7-$c]]a[?OPC6nO,l8#-lY)o^?t;kAc^Um3Np0H=Y:_>ht.aXT$o`^1'jK#DJ#A/(jc
+%F50@",L%.Wgj><<&e35\&udm0UX?.)a!2cLkOgN+SdSF(@KlP.!"Zf$S=Ums$RMBJK4)k:O-%kC/='sN.c;'42n1_H!\1gL1E%FX
+%Y/"#!o>1QNi^4iGnJpImZ;J5Zae"%L^Hm0jdf4UZ>>E1&S&`K.:S\:3^Ntpi"toOQh@5o/,LY)IAJlY'7SlW7(@h\E(?J%WnW?V;
+%B\26OZidu9YOWPE[f_+L0qr[_]R*bDJ+HmC%Iep+&iD4(KVRJ)`"Rc$83t*U5A^glHg=pkL*)6WOG(8%nSdF[SZYN@,)Hs8_X-^p
+%5.-VME27(V!-][W>%_rgTWFK2>g^59PlZ4U5')s\FCrjcT6frW5J[sd4`%62RP)V25KrG6'%3,3npt\tP])G8^H:J6\X\c';rFFX
+%'*noLC`k!53:P6Z?iJ=-J,oe8E8hPa)YcO;3"H/RlXd.EnsptrYPH>?3T2m?K@4a/OB2Z1MhJT'Ck^.M%fBJ6I"XhaCORhZ*b*Dl
+%e:_Dfo!g\c&gkR&&q)G&[\6"pk;JJS%"m'R-[\[7nEXgUAHZaFbQSa41aeaURjXN2fS$eH,,9*8HFZ%A2'IS`[>sL'p-3`eGMf19
+%roE+c<p@JYSur"f2OtHKLFCo.&h:kQ`Zm>#\2A^YjtMks(PkC_PQ=M_L:pQ+3'haa5!a\uk&9+Lq=*DTJ%$=,Y;7YWZW.Uf8hlTI
+%;5D0;H+!q25U5ZJ`;&6sL`SCr+kMW[bXs/'fop0gbQ0F++tu>J]K6pUn:#jKUoJ9(Z?1>^54m%#a<oJBHTmDRDY92QcC).7m46N:
+%\_+W5kLq2R.7(UUadfG+CY:l7hE[VBMgOprj;pG@6b&K-Vj"imH1^=6D0!-IkfbAY^'Old9L)?2Q^X3'eiH5%&=n\ppM"$3ksPe(
+%$Vg__g>lG!<QMtX+mX#uZ^baZ`^I'@YW51=dR9)PJ9)seS$SPg'r@uc+3T@&@7kNn:OAIR[F)e*bm"fZ%Vc!t4GPV#>%2cW(Jp"s
+%bq\?4ZD,ZG/>VtH9W>>EfZ2&[Zc$#sdEC*SOq>Q;ETVsaRq^mR1RY#^j3`+%Gu/aVk5ZMN40/Ym42O+ASAO8E&lk%K[MX5lg*rhT
+%5_a!Dd4RooJgX=JO',MnaoRH8T+rs!ifYJ<-$R(koj9gr+l06@2A^)neOEs"(Nou8(W%;GNi#WMQ9)jtcPJ;,$_5`.?[rdlDXDFe
+%ndX0r*RY^MV]dY]%krn.Z*lpQ&iqihf##ZDPllfL^gbqA^7akHMm-f,4!uSj]V-p]V5>S46X*r.O;?p)(>''uVZh#%4d-ZT"7cMG
+%l_J,3ncD2%A&V^b.C*-(*U\qlW*ZsmDN3p00]WE;6qQKr]Kk)lMRueoKT,F)FUQ,(D<6;Z;"^lCZ/RC+'YoD+GNU/,32q8["ZTXq
+%*:C\$2-_#S]*34B90(o_#Sef]'mTiG6Ff+q`'*Mqr.quCUZjKTE#3O8M;1,HXnkXWh3u,0F!S71U'Y%-;0N(/7;n2R>o9sUfl<rp
+%E=^NU\lH-S_qYR!@>"aFK'/1CN+">0Di"m=jA20&^hE+c\T=VsWKET'G66O_I7;ru*0;n[8);lGeKip/e-.'s,Dja?maQ9dQk$'!
+%)*&MgSSBCMWt'F<>N^4."7j<F847UA$X93A%M!dI3lEXdk`C#*',WMAj97%HftSQuc=+a?``\)0YWH7&?]Z)d:uf&G`Pk"6$N,^n
+%NGCs&Y]gB'F4f76SVFj1&9HX%0A%Qi;E]fLE-(5k7Gek#]6EHHB'W'flHj`'iACH9.s((_oPGO%*07gT6S%bFEh$rVgtJNAK5q^7
+%Xlqj]8Sff0^(Z;K7/#j!VSEnfL$?s.:^5=!^($Tr6MDJr6G]$SFO/=C9bc69EZ4eKWEuO<6XR'4f26_T4&65l_h,U1oml)67pgdJ
+%'+kLu@F87o/,Fj=U82`nhZaf%oQ?,,D52(.;e4[YYJ<r\GH.`M*$l)C_50\ec_59dG8g<Q@#Dh.*W#I=_gN?fm20D3=6tW<Q0We`
+%Sa.<;:hA9@h^cXo@5!BG*72/^e]PIr00!^^PG.2%VRT^U!Ia.41)k6CIJZKJrX8RSs)"Q\5i8.^_KS<'51bcg"GXYh..G)AC>9+)
+%I7h_;Bo6BfI/Q$eG:+5#,V4`Z]:EEd+mu!i(^It_Z"8hT`.dTXFbdI/_mg5%$T@O;G'FC+0&fW>&1fs%/]5=c=#K)G@P;1b5Sko!
+%TW7#VK%u6r;oaqAYpM_Ab'-(eq_9"g:l/1'r\REseBcZi2:!#[?UTBJ()q^Xnclro+esj%J`8^K@]9JEf30Q=Hm]$_i:d9h*MR!#
+%s'#tafZ6C$47u.$QcL>))]$o3A-;;Y3cH'T;C.=(P=_2jgp\Hc%D+9*'48YI=32$;BpabGpeG*@XCd(HP"rq;rSo"en.(R9Z3+uR
+%o]kr&_JY@cklem1+jV603_?EHJA7BIL/X9mTB?f800@@KYm-f)+M3=1RqNXm3l+*XppOLGN=D]$6&1O@M<TQ#P<`*eU.\Bj7e%TA
+%70ZN(WGndUR-#O+AKZ<5J<1!.ll<f%/fGjo%Z<nd!p=3:9L:82e=CIV.9t7-2)<#ldao&\!i&pOjW_8;>+qU^LMu0t2RN#_oMn-r
+%.3knIMVR/cq;)%oo4[4ZJYtD/g/0bJcP27)Gk0:oh+?[FKQ6$[G>MjRE/t(ioolLD3:;O!8S]mY"o>W7Dk)^OZ3498g0knQkG@6h
+%?\>N_Q<Z,WaPLi6oq<T29mj\:>iFW]HoBa+0bSq\JatQN4`oc2ksM(`7&Vq/89?VHr0QiLG(fJ:k)<F0m*S?q-)VBo8dR*/a$CFg
+%UY<Y0n9`ud/[OMsEIN"NTm.S;%5!g6rGF(hC_V=hV9C;'"q8REN82I7;0EcqBa.CWJqa*tKf*g'8FA&aYi*X@-lb7oH`6@=%3%AE
+%7>1pg`UQXlBFp_R0Xj4M]&,(Wj!K.W*rbo>+FB3117+Ml=Ca9/<ui/,X?)iMT"9'KrLfD(p6Un[G%eb_Ff1W#%8I]'Xm5g7?"K.r
+%84IUAg*G<_qKV_DJF+OBnGN]S?rbG(8/I>-$1<QDiR@rceWl->C8W?"Y6*V&r<Pj<!X7q`ko+aSg]C]<lu^NO+Q(NTLREN0K0:rk
+%'aCDY:2^X'b=e8OroeJb'!P&LCbe&_)18(;DbDL%PK+0s/5j1jk4/8tHukq^?oYhO;d:Tr/$^!FF%-88GS6lg6I&*"W?kSke/7uC
+%,2m9EdLW.CJ9A,T.2j[)n@dbR9^KC.3ZeK@FOm.+7[dt\Dh_Y0Efr\t)@:?e9H6<o2j])S$ED\m'#q`%:9MkFOfD8sT%%2ARZ`7,
+%Y_/`DS0eChccA$U1'CAI7`Bf^Qi\aPOMRB?C`nCs%s/s^+hg[gaZ1VM0_'@]eJ3,X62e_i:1u?.D7CsuPO"]Vf'&4&;0eT`!fs.4
+%c"W+-"Kbma?BGRNl50p^<*P#`;ol$C`/&?G(IWM4DA1[&M4mlT=&'I8VRM^jkr.(HKgLLjpHt?::aQJ!0euulR;Ye>mZGS-7EZDJ
+%`p>"-'o@OE&1p6]2KNH`O=6F%Tl(/j@.o!:4OOu$L1QBsKFEopb%[BuhM)CSBr1=-@1;$t$K*/F)CclG@rsNJ'I\RU(iM->Kb!ps
+%&b$4uY_2lL\2iPp>C`[1lPu9P5_em_,W7>n>:8\JZGj;'m^)G'eqB/8OpohbJRi3'H-S4N*.f-CX@/'_V5I7Ppq@.VNig>5%>mUU
+%W"99`$SOo0E.g5]OcLH;BNmSARBG6hGBIG*kk!=."2Ie9=sh<PAc!pIdqU'qI>`*_WM+B;%`Rm)HmkeZ5n0kgGm0Cq-;%cu_AFH^
+%N$n;:,O6aJK9U5aQe,Lj;+kM+(KI4ri59MIc1fLb&+X*p+jV;T];[`L7`"Ra?+)_M3$<"'0\f>=">OpWVu9LQo%]n"*.^q7j?*%(
+%h)7V+<YX.;S<Dcdbesf?)&*;c>_\^$R2u5CQh*9NA2rK\;J_fT#XJAXS7n*kaj$5m#HQF<?ntR6K`mGcPhW?PAij;"W;u"X'%!qB
+%iE6fP"rL9MHq:!$-,`nShpa`cpe:Leh!BSoj)KR).MNg5b0rqP"Dsem\gIuPVW1FC1H;5MhcktM%qUXeqQf/).(9ke)J?786n=mG
+%nd'Qp.,j,5V#68>Ys!XlLVs\@^TQ6e$%b5CbCD<`P(^d-&Q&'Nah73l2M2'9^IePE;qq\$)[M.6>@fbOjFq\sVcq"%2+9*dD?aN=
+%ICXVJlY4K[/d0RoRh1G[?LGtUS<8)-G`K0&A^4CDOFkKgR_)G^(&/]hH%[J+pson;<FiQ?;4n%kDQmJD=[tl*@k\Z1@RSQq)71^O
+%85OGQTJd7%6c#M1!c_`:hS>9&RFH?Z2N;@b&!pj`BQCW!cirCM:lDAC%Z%oGo=Z8^iE'RQCp#B/-pj%r^6p9?j:Z.#"(7;)0<?!L
+%F;?DLOo1[U)l'YZ+He4='DYsHB/g9Xi?c-t8^]j2=$J#SRp/]Eh#so$*!fU)Hg?d'JI]h^hE,K@[*17$p;CM"&rd,a,g,gjh.j2,
+%b+@n6E;8Qu5"l#ue_#Wg_/)F?o1nTaFU`J$?Om/"!q95l8;Ek-TuJIDq4V[[E&`qZ,=D8n,p]0WFr2V>X<KnMO<IK[?*P?kJ`'tZ
+%8L9@XaT980.^Hu9/TF+2D]P@(#=t;`%>u8m8tOrTScq*7WX_-g[RQ:<OG#/5S!bZ\!,>6_Vhom^TU83QH"bi?Mn5nEgP5L&L&B[\
+%J=m5R$Cu,ZF&;,>8)L&="GJnFZW8(a,1e;7-uO-MTj7==U#lj<Ct4%[GN.<W!_tdtV@KRdHo%#W$@MQi+Pf+eU@<-bK5TO,ebh`n
+%MH9eJ#J"pd.a?_pn!hDQEa!0JfYl2`$a8%3aPIDcO*mp'r[/COGQm`tHU5Y?PcsAY%H+\Z*4oO8.ZFIN(po9Rcru8W">ritRjT^'
+%LUD(H3_XA4R>l+J4lWlrcZXZK6)GOs.#,k&gS@"^ngWtm'qR[NIg7b^=?ZHA\\Y'u8l4kY1ae5I#hpdrL2RQ0XQQ@=Jd@@OL2bL7
+%VVlCI(Q"2IhCHUc$#CR_1(b7s;I,5Ph@f=gQWAB)TL[]F=n&oac?*M#jga"B^+EJVCHG3t#nM]+EJ&->#g?gP;qct3+N/:(<IPli
+%@@-kA>pdLRT#b%6A]LCYo+NRmg))sIpR6P^aX&(e1'K`H/&-G&%;PcP\(iQ]C:QY_3L),,9'\(ldQ(\<HJ+("ipcJ:TKE_#U09*5
+%C2GdY)DJ*l>mA:+f.bf`Qr3-%+SFe[cG0;'2fr.kVF7XT_20Gn@980.$(>qQJhUG`(QQ-R\;^SV9T\&CLWfH+r]`#H>e^HS55][m
+%=uqoL$0W$'p?Xii/FQAk,1uVH#CS(0NPEhp%'f&)-\@HaDUEIncJrQ\n1X]bR=$*5$9C*qgOai+pYQ2a[n<lcqnCQOP1f<]o%iIN
+%E]X1-J"Tb^_2<ZVN7$2)[OTj,8_P#M$8kf&Qs=b*I/()AP>=DO2t@?+e:X[h/_^UjNgfu_at7k_2ShDX8:dUiPpTmL?c5L'6^ENi
+%8;7(a*;0&QbTQ/'m;L2N1lX.ra9iWN#?:]ni"kahjE0;rrif&W'i3HWlY`7:'*f5Qq[7JY5CD#["dIf[jV6RD;kO$U6<s8(+i\CD
+%)#U;Rgc"=*72^a5]&;$8L#oiErK;cm]"=^>rWo`>I!H"d:9j&*j;5e@,s(8CJO2;hQr*?QZ%R0p>i#gDlA!08<q.BDCCH57Z\[4K
+%=4D;:Y(7q&/iZ[m8@sW1,)rt)_MF$sg6*4$$68Kgd450!8E5s(,efY!BF#jtn\/uA4+p.F>\#!PLl3KCD,&G6l7L%r6M1V1^8&)p
+%DA,loO;UG.BBpUdf,4(]q,\%Eh,70=ImI9_"M=eQfBO#ceO<Cha.e/?\FIU?-r9H#bCCju5k1Pt%4M<PN?TGF<]3pb_3ccb9-=:2
+%nmK#</C0:DKoqN$F&.@X,OZn8#1@iYM)?T;D%JC1MW7E8$iLdP+Mp9ep.m_LXSB5$#isU\_n>!XT,'W4Q6/YY_-\JGng;j&U8,M@
+%#-N#keNt+kkMUeZEDPi_Dr2OK1mcVPa1<@BS:Sf$p+W%$4`l4bR4>4%>3=3&<8^sID!9JuV5\/&TNNA$YQQ+CD#[pb!_4k50kFc&
+%VC5kajCA:E**#<5XbtM<=b>QYWgn8UcSr)`FLGuo:3^ND@E6Iq)OUh-^gs0R']M\<M:NUW67dR0N^!V&mnN*WJa'N2W@@!#Q2%RQ
+%"tDrb1ihWV97[2[,IIk6CZRg:5Sr?/]rN%Ql,kA^Q4(58i7N3)jKNMOf+pC9l=JgZKd<19hq:V,>di*=522#h)gAa6BBX:HFjAA#
+%'H\tNmjY-+Sr(q(^:5n1>Bnrl]5q`X`FqVtQbg@E.,($J"s8]c$ddA]l06Z2.VFX@OfSu.JsDL)h&sS4PABRfgdea*W1F9dFDP/O
+%Lue=+\pn4e7Uu>S0>V4i_[I!g'SKU(dS<6ne^u[C77<2'kmLjZnAGXbJXVuNQO]9S`tK;Ye-aAjH$A3;]ThllOgf*F@Xc,&$as#Y
+%i7ZW]3BIAt3qg.s\_cI<aW6M,Y?,+`fFcA"27TOVU<,Q:*&bBf,'N`1Y]3WPM3=ImiJ"'NSoAO/Cge^V2P_%[!-K;APfhejM`(WL
+%B1Z+6"c-BV,P3QW#:Emt;8+5PSEg6pdN1FN\dK'%8X9BN',!LP8M5H%%/_[??uXE:"lP]7P[f>CIMET(Cfh%`TgK8H*cB7;'%j3r
+%)?h_M.6uaI+XGCi]F@J4,^.%)H57W4XH"Fm%M_EShf=rtTg48Mk!2F/JGL!S@K"Go/GPDHfVtt/\r`&sUDWq.#aahB!0"S+S0!AZ
+%Z;!q9-&<\p*?#5i[4mN/AV]=\6UeVS&&@-/&28J+k\ZGK=OE/]A6O\n2$R3#o\4[[f93ldia!fK98>C_1'J3>kpEjNq!UgYLi?XQ
+%aJ!,0JmkhNIUruP[jOahpMP>@QG%Be$n>:"4)E!.TsV_-8O^Nf]6fG](cd7k^]f'$\=bmi,c.NNrWIcQ<%+7u6%NfPm;L9TU!F`Q
+%Xq#b;`Ha5$<d-Ji6qqS]g>IO2J[7`ZH)d&c?-^iq//$W.b8aXK?ImP6N^DG.<c[Ka8pdn-#"PM@o/.'>&HIljig79fWLROi_>tI]
+%&t6bL3?AkqAL]@gaoN=0k2=5a+j,='B#cXhD!+Y6#PJM'ZaJW&=i-sSdtS#N-ch=cgR3$?J/r'^)a)@5KH3C6hs]N3gt79jTV!<=
+%;<=n3?:sB'`mQ"jjUtpRX`$W"^nN?+@+'./&)RehCfk(BPpapl'qsm#=[$6%,U.cB1D_43/5/=*K#TM_8k^ba/7TBIAH(^V_5Q\(
+%JOn^-%\(BU\bU,Fn94a_Kro.K^q*i1Ug$uc%K%OU.^65HQZ5$pZNaqs\@WlPIZYOi+PXVA/%mL'MYC+C\B:g;fkCcnEiXqOJm17:
+%)C/aeYq-gSi,OlG>;ZXjQ>M2r]%NabC`S*pA)/^UbVc.W_(?UR'JgY32@!KQXX?f@>#oJFk&Ujt@f=jf0MEui3F@!a+d\1?OWA.d
+%*4RCs*JB6!:r($h(P2bbdA?Nlbn*&ia<PfN!>hKni'nk57;Wu*>2$2Eq17rPfP!,&-uiZ"UZPB^EhjrE#;na?^:W'AdQ#ANF@6X]
+%1m/6+<C(^^-$VDH[K%<M"9cnfa"/qSG*-Fg.4dT+JIBB8=<'q"1tE0*WZmNb3<5A=Qb9pj8;t7r0>N=*:LoU5<V=t52i@$07%=GE
+%j<4aei<b6M=kprsY(?VR9SW@DE@6s\6Xc-akAo10Q*`?WLl2XGA5:4>*?o]cF:-Df4WFT-!,j`s;Qh*LPE%eBpr=7e1,ih&VO_f]
+%+TbDr?\n!-ihEQ+C&N#MCOg%Q.GNb\`#qE3%1dP:?GZPZ!#-_O<rmlPDV:0R]PaDqb6u*`93sMc"lc]@aTs+C)DME\A?U#.8cXt'
+%HGuEZ_5sUU&.RQm98O.lRBpfprd(5-p(bk#",CG5d5-Gs.'`.M>f3/J47sJAS4mDT\7)ATHoUam12ka59c$c4Z3'F'!5*5[2*'U\
+%W.M>&Z\IGn+mb'C$>2s;_b*X.V5\nRT)Pm3-J#[:b]T2PZPr&LJ'4%"QBlah'f"J^=7JQ%JJqKMm6^&o=g]eu1?3*ZjuK(:/%9=s
+%BJH]617[T"#GW2bC$.)emcHpV1d#]sKjn*G"Ta)k<,1pC=2^"3k'+V$T,7Af>brEf>Adr5L\r3^k_(=h`)XrHlsdE#in+Spg!.Dn
+%O%;%-8;$u,U2+([`7\mD$C3O=]?')B18uLoMqEMG@)"7HQ/A>5;M&pJ$LMHW$@!M'8uZ`,nN(a@:5's5P)[sH$OopY<;A(1>`5t*
+%OX:K5J54$cPWR`"=rFleToN),#qq,^!i26<3Ui7`9:g'cDCQPCN7M,(R>\(*.$='PjdiD[9'`WM.]GmRUhUPRk_5h`6R95GjL"+T
+%Yu0<'AWq!BE"l$bK0\d0`Bq%R",9'4RD`@AUms?>ah:lCG6l;\O"#mN/W(d.\h7B^4YOY()RIXkZl0s\2"nlWd^WtC[\.<2_TZL6
+%;Acm2\J).TlT:2N`kl-,)R[97;LLQ!"4bhF,8Mlr<5jk+iU2(LT\%1PnjLPNYf;suh5VqjF_7Tm3FoZS&#$3lYAo+n.-O?mZOgUX
+%FVCE""#D9;Th!B^aMXi\9b:PeZuHfk:oLf`%026p;4//UG&^((Lte;!ZpVgN=[5b$!#(tnRcT,dO;\f8:Om5<!\dV/O'nh4%fkPt
+%dOY^B.c+X#;[].161$sIg9DVB7@7jn2Mc(F"@pOtjT=HkBf&g7CF]G)@l3;*>hpSpNl-t4O8qsS]#.&A7k2sT$E+&;0Brg3e`"G@
+%h-bmkGUG5&q^i$+Zf)u.6_a9gRo0@C2iIkcBS\Y#XXT6?jt[Y=R/mVB;O*GDb:!A*C:=LSh8TrOb.;AIRW/mQpLk&`ZCG^s-*:bn
+%-b8OedplWI@0;o.YS<GY#cU?8a=8DO-:n><_ZFRV1H%PQJ5r9RlA98eA0;@nEB5s,'F3an@h9#ikdhF,Y(4>^LETuqHhV>[qX)?F
+%5"cd+VM*&IN`O]aAZVXmM@&t@Z@-LWm=Pf4BLT2S=@\!"9Gtsl3WM]F*#?iIY_7I=$g22"Fc5Q6.d(JA<1\qsB,qHZg$FJnf$T"9
+%Zd,>IUHt/D<mEhnBL'&WHcE.^@BIqkE"5u'`k@(I!'E*C9f(t*!Fk\k"(3OLlo55D=11j1'Pmn&&&LA8%62UP@3)R[.(+<N5teht
+%Klo4#`^.^^$gRdP`_Lm3!C4q#;q:u:^qjFelY)HLjB2^2==t!MQjX)NCiRc_>2(I)aRP8pKg_DPULW0.>*RlM$h")j:g1lOUHnlI
+%kmQgE"-Ok8iuM&bF(,PnCSOE4Habj7.T-`'hMl_q<"%-\N\)q:GFW.Nl:4r9a+TL#4nY1`[*aT9)<[@mXZXUEN]+0s.UsJ1nL^kK
+%P]Zs;]DLtt#HRqA$1Y)!J5S%!=U,"n<?(6(39QMElMr%L87N[%Z'8GGF,i.X`,cW+A89ra3<q*&+o8ij%Y.J9^LJ7n\7-Ts`j%gq
+%@I"0<!H8O"1rcdH6!Rn>J-q,DNoM+82T4('EtEeWJB45_OHJep_DrN<NDa+C8!?1KcT,1doK7BDdBI*4_DiG<WYR%E/>\16m,9`Z
+%)7^U818O2VM8Pa5"RZA+/d:*V30/-1@JkId@<F#f`BTQbWki+=&M'In?@;juUE!lVn7rdFM,+P8a]scQ>!`)YIM*->os0*V&/<a6
+%9G3%8+5VD`NoM,AA8nXBJ4+jM!f0EhjW$Be+58.(*u[(T,G<P<At\E;24*.4<P@@/<!2\*FFYD0b7Q@@qY%?g`CAII0ouXKcYti?
+%L!W[-X7LVO3]8jqS?[q7%@.MQanA^[<.QFIfKe?Q.agn($V-:T>B2upZF_#>h9B47RVl40nf2b)*W4(m0!06Ol`>'6Ri;HTAGZqM
+%H!(Ilp:*;YpZl=16_P@>G&a3lO.e(o2[k3_O1oFI_b>V`p36RVF/HR=`TlB9og$EI'DRnW>k-Ua:/?P8Rm0(86eor[a_obKqKtK0
+%O2k+*dGhY.34ctP_gk$Fk_<t,!%j5In6iP2FW.f[X!D*K@6N!,hus$j%p)0nYL=`TkN:*Ort'C\IBjgcYWe\?lXMo#.AHP3_6n90
+%?>qJ/r'DsNV9K$f#@Up0BK3<[&mU1$5E>SRE313GPObO">$40)q#(]:^(q%c;%^Eun468e&(A8nGON4'(`+8Pj)<)+gLbc&Q?*sj
+%!5Z:5q[Nn;Dq5D3*o:@m&O_]aEf^DNFp]&9!6&Y3U^T<a;(W!R=<h-qW=H67@uRSf3Ys:\\>E9G@Ep`)WS00_%[3@60H7t8l8"o,
+%CXulf\Tu>VA;Q)l.4+A3i*E\P%2udCEX`Y1KC1L\0/fdi/3l'1(FlW"hOI'q^d[KB$c"0.:Ae;O*so$RS"Z8U`sc"N]X@f[*H_kH
+%k^IsUF_Rdm/MjK6dTURkMo5\:+?oosNE)VY>OMFue1WL8QN!ZB`CccEA]+DqHZ6dHEn%+1_XYlBN.:%rUD,BeXM49B=E%H.DdWZ%
+%<&G>WE3rqP=<b_GT3!^kf8<P@Zn)h@0$R=k":bI$pS"O09lAf9f<:B^/aG;Ad4E[npN_6.Z:6^]dp"68D%H7X@0_nQpNq.^rXgtX
+%8k%NNV8qC-:I^R#SSs^:mmt9rN+&2$hFO]="dh.C`dp(f-Q@0V(aQ2e(>+%cjXP@l;NUgsStf=V%>?rZSK$-0+g"G@5$oG:qiER0
+%Z@fFf&[10k;2m\7e%)XV>[B&Hdu-sA?+?$I1M_o'fpmWIok!HrOf0l^!^eK$%)qa"!osq;<Mj,ANnS9e%1<rd_='^_.?C])iY,!F
+%-ct3*W%@^#-6)ol;C3O'`0A#e;q-C+@&9TM.r]f;U94po1A9F1-X?Z-C2Q6q/60j$O-6:nI3Hoi.$[[hgjjrL1V,OI#AXQUPrA$e
+%!+d2(&-oY'1d"UjDCc@R]kEe_mOh]Y[>tFK+SmZYH_08P(ecV9RK10/.IUYcUVUH7cO1^Ba]6H@V)TOLaE8;bh-Js$$bN+)[F<<p
+%llg`VR26%*!sGXs%LC'SNM/KjH,"\a\$?88.=_T$f%k_C8C:7MLl4QO5qXjG#'7.&pMO9697[e-)_'B%$n[,.\:Uu</&=3.&"3T2
+%/],\k:B?pEPIj>pRu>ddL1,?24KK<8W8lgh4Q-(@FqWRC(93%^Rpb`cX`5M`OEdWaV*M%!JY^.%Hu3U,6tojiN&.h&(H1ATaF-4[
+%'38l;BA$=?N._+A-up8P<a+HBMi!clkiYm]\qW(),i5l8QF2L+MFJCX%@S)3hLh/,+5D8'#XVa*EBI0+IgL"6Gh<;bT8C$M7iTsL
+%'n!4CW-?.R3;=m4^jW8?`6"E;ckL9"$fBoi0#;[NBSS?4$H.3>-Xt[8,)$Y7co9=M#OQ7=lT?3gKCID,Pu5ek(Z79@L[;;h7BjE8
+%(0!9S?ha&$2O?7##Np*p09#ojEWH+X>!iAdQO4cR`W\7d`HA0)_hJ`A)O*9ABeiaH*q_MjK?:\X?s3i:C#L!?$ghV0(`*Sg-ZBr4
+%Dcg[h=L_1c#HU*fbcFlI)1$m_,$qKL`!c9qG/6@^#*79<pXDBH!dF,3qj1In&>C8UE(#`V5`W+YE1eFsR"c8VgmA!b$a;lh&SL&6
+%GfrNF0H]mWRrh3ZWZiRl--aRk)b6/'[\P`kEBJHfof"!-;D5jj3(c'thS9/5i0q#bi4tYRXO_8'j^:>0E3ub6DH<eA8?&<G!t\\p
+%mS+\ja\o3I9cVe11W[Kq[iAu;hSc\UbU*f.>0@O[a2&5U^!=PNg3PQRRUcr.K*p9a5[MNaKnI2=Z7J14Q!#tN!JK_RS;G2D(c#0?
+%7h\C#=(iU+*G0ge1NG03QkZq'ptHd"EQ-#8^k7ceh/)eD?kT18i@Bd8_._ofW?F'IbD$B_4644NUG.LimB0_IK:u1)`K-^P,>(:L
+%Ad"#qrITUG`\I0GK8lWu`_P'Zg67oB0nAOsj+sKG0BX.HKi6_-f7!-9Ye&g@"qT.hQY[YiH*q]l*4M+_96_D2e2Uj2-lO_:N=e*X
+%>ChK)cWN72/dUQn"Vi9'-Wb$ae$q8j1NNs_'%TGh#F[ZA";m)4G)jZ;$m8]F02U=T01k6L>#L9gQ]N^D+m0]_/(/kuWcW6.!pDqH
+%M0_X.bKsL'"KQTC-^lnN;40,@M[^euBuj0_(kJ\^F'WU+Zc!/%_dY85;5[-PK5Mi4e/7Gd9#Y5g0G:4iK?UAmT6Lj`ol,<I(P/p;
+%:#IjKW2_'TL;@:n?0jPjW5+(k8OpIV]@n0dB_<h(]E8@FR`rRs#_iO(S!_4X:0*qedO53t\RkE?^H&@]^JQHj!SR7)\UnR<a*nlt
+%%1Hl(22Q%DM]p2mOIE#c=pNAO%39:u,J23*pL2ld%n@e#5Cru\&qptg7r5:hTGdD2q,3Mf9ehM;`/:o>bYKBTP,t;E_uNF#"bXot
+%V".``3%_M),TX_Y/:IPk/._8^5S,h@0>O$..hlXca;KhBChJ)^e@P:FF\qFi!'cC)_HDKijsp1[BJmoj!5pA;3eG/`Cr.cZm??@o
+%Ya#@'M1("BnQar:qQfY3SQ?q;Kn4p\VcKa\'\c>=l5&NtG/ZcK?G$b>7b%Ub+bU',`M'@^IrhBp5+38m'SB2]Fk&^?.jVVLZ7eqs
+%YI)$&U\/2g>@6rBX=s6up#QU"F*OqnH&<2HS/ZG`UPp(1dKLl@$2b*!*%Rnu)KF'\3k6&2/Whs8r6d7OK&eG+`h7Km$p"D:nm%e*
+%K?iG4/)@rcEa3$O.bb,r;S-=83eR#`B/V&js*ddnB03-lJn`AmH1n\G,*n4ZD5pmG:"B6;TD$]VXgen0q,qN<ND8&liK)[#*]-L"
+%iLakL>)Z$j3Z$_4Om,a/:tlbpmEcX@gZmc5n"+_--P;c[k?)R+;!uoIbj&U.mc]s[^jrg:oQfof*o_Q)Is@cdB7TU!GActh=<-_(
+%&]&[VX=ec*$?a-Ne%1_T6l.IKM1,uUjCeVk0EMFSR"IhjFo_q$E$c[L+M(Ho'ep<qq0;&pk%Y*V5,`1Y_8)I?Mj+1HA3`eKb-D.k
+%AF4hZOWRH\B,ho.7']c!p&QI:<!4:k&u.%1=E3-@@0p[GpUZE9;548I*sMrrO:SAMVT*Tb^i;PS+08BD`EZA<Wk/Qk:iX_"$Oo*C
+%Cj*^trCuTCCB>.FqeQTTZXc#lkb]UI_0/-GW`%s=VNU!JqZn_&eU0':C@2Sg.4^-sND-!I6"(FDSF*-S[)6e/@rcWmilm!jV%62)
+%YHTh(nG=HCp+?p\4uR<"*a.amPkqUI>%6o1O5pR*OoY6l@9[:#DIF[B&g1:e?9[!fBD]1ZPuV2X.W@#gga/p5PC?9&:'][7`%NVi
+%0@HJ@gB6s+qB$`lp-I<hOoKmd_\]T&.6A@(X(LB-m1Ofs\t5UOS]VRHq#k%iN(VD1UMN5V)f`Gc8TWcA^fQ*P3<%r9Q$^Oq<AgmR
+%\4Ta*?_o,/V[N!l8QGJSciGY^`n>`/1bdKQBW@.1#P=g*!=RQ^i#$_cE)=i96B5)]fFrJrG*EYU-OCGr''issNpl%KY(jgO0*:8G
+%KoXZ,@r94"YVMFXk"uW:_l]f[lFkR$[I*aP""m8`JIBN9RTIo.9V+SNblMqoBXq>c2U5q4\QbZu_T[?@X6"YK/S-:S/3q5[@Ehts
+%@"+TjQ_fqLD<+cTAq>m8dk)Hp"=6!Z7Aa8H,(Og$]1l2h=p01"eq">]Y4lB?\.Ei#ip[\<S7L;1hqX'^9s^1V^tN#tPo"<ImKDLO
+%<Fq]=4>\X2&[/gH3ppT2a;;3aB@3:2/R(VjG9fj(E9Gh0LBZmc6B>O%:/),K1`3<&\FDnAY2a\G;2i($E\T-QOGoD!:#0!'VOBO7
+%k4)#422)Q55*A]T<=ZX@3_kn*>]+6&3?8E<K(\p@M=i&m95<s"6n3hmU6B\T3Inc\,cc.k5)N#!c"HNG>Zqe+0>O+qFo9)]`Mb$5
+%rORb;i_g0L7(NA*`MJ"iF>0S^aU2n6@KVMoAahQKG:u/X^1=2?c$`"E'/]8,DWD1I#%Ij'CSRSSD6enCOE<d]<\qeD24DY2R0#R%
+%JMj'&`kU"b%6>tWD-Uokr9_Jc@\?"GN^e$9s-n.:b1uH\C(GBA9p/K9i[SX;H:j8Jcm:KVEK1]SPKb'f&Z+ATf=FJ9ad#SHQ2na9
+%8U3sk&\*rUBBt)O?-<*BXHZ,L%oEo%m-t/4*^PIgOsS2"jW6+iBHJN(j"<gS/dORs4WNCq5abKJ5Eb-8TFFin9E"YeU[MFF/THZ-
+%f,M(M1]]DVDNO$>%Yk&-]Ste=<6Rs?_U93-gVPfu-gs-e0S@-qkEF9/@IGRNH=9-hqW`Df,0;i+?,F9<Nh.Hc-*0<o,,^4\d`FR4
+%VJ#)f"<B-=mN0!$a5CjE"hWf7fU<W4r0M"OrL'ZH6oc"Hi;Id'Wa)!:04%n8)isQb1A@K6e:<]f)]R,h0A_'mTfY,b:8XM1IWION
+%mu"Aos7I>8m:!Wf!$uB)31^bjgSfgp95,X&*XL^AI_UYZk1RH5-`pYY:W1:SfdcJJ/eE.+^:k>B.`W*,JhO<]1m:W`&"UShpY%Z7
+%K#;poWiUf1H/'?AFsJE2*)K&]35X,iWu&SN6iX-(_>YJdf\bBWLH<F)[I-=2cM)Q0c6)P(H)21aa76P=VYC#]S%"pB'pfFc&FNE=
+%LNtrUjeF(-GA^ra`Z1pYm6oT4HOsY1FkGLuHLN,+@WrhFS&3J/#oJWGesulUB^mhp:4d7+C27eiN[JB8@F.)aHah/9V6uW/C-e9p
+%5\Ls^BS=<*.8kI!?aQe/GN]Kf3_h0/$l=ioJa+1Sg\iVkVMu-GY+#d69VUiBh)cI`@@fEb7aqbK33YY.Gqg)6aT91Dj^aE.\DsqE
+%pJE%n76+umEoJ:h9iAc:d1"]fHD3S_2f8g-YCo`_[p5Yl]Wi%Hb;Csa;p`W$$HGC6AqW]2>r^%66o`2'h@$toIr?_Ta;.;H;YS/]
+%IFZQtaR5T4\[blg8oV4AWN^<@:@ZTc3@,uSJ;>Wr$K$ha0:?KU4ANa0P?PF'`qlu4!c.$60FkY($r.q#9]aD\+Rk3BklC%bqFV%!
+%O%^G<aMtCl;W&YQ8n:^J6(0A*OGun8P;+g)_<BK4)*t'eTFEAifIAh$_h[7lABFF><.QgL>o$tf0d@+c+j)ghQsj@`G,eRH^mI+>
+%Q")b6j2r=7+aP<[4JuA7(8\$p5XnN"`_6@6(6/`[<()^r\OpD3+:u@NDdnr-c%IDBBM]!u50cFU#3A1Z9+%!-jLp.[oia9k*9?hq
+%kE,V9`Mrr>UgUaa3B7LqBB[a#q!j!JJIjA<#>u\X"b9U1:h-JB#'L$AlWpcJm?\YCb=,N`<GL\`JZ*?J6S?BL9u,(Jn2Y"-<F5VD
+%KBS0mYMu4t)o\3iOQ,d186uH&ZH!;FH/?XCghn%>:IE'@QO;fEdp[K[*/`NFfQ*LNY&a:8[S-Z+9t!ZH'kqYnqJDC5/t)gh[96t9
+%p9UX%;dM?"O)V3+G[&YB1G)5m`GQ"j$>`/V[l(,qP%tUc(3mNZbA&ReL0WLLAr5\Hnfcph&'$sh&/]9hL9s??PVC4Pm>6jqE+]kD
+%8.5Xdnk*k2@fK"0jB+asatP7c0OYW31_jUQ7W4\QK=<<"[t-81S)&%olb`iH,t(\X%NF#.aLlj"e1qLRE^!pearQ#ZWo?bYO;nI"
+%XakU)fnpaT9eOngBHqG+F([rJ?&fd07WJR,Xg&.^->Wl5OZ=UFM=1"]hBl@V+?**4,4PpQO+3[M9FY)Ip%uPU6GWtMQtJg+W-"bC
+%>2f2>'-<%<W%(5eg7)\5Ye1SgQ).(N"d>,M*[S-]>3#[F\X)k0BPNB"clY98`Pil7Cr(<e(inioG%rse47T/^V#[56S]@IMbTTH7
+%dpYLjkn<#&<P5XV4?6>o@+e4?n5W@])Vq@W5=,+)#h3I3gPP,HH0C^Y2'aX0!TS,P+&""qRWt,$f\(o^ZZ@]"U^)(:-iheCk1LJ1
+%f/KT8D+'JiIWBOBN@*41DV"k'Bq'(bNAD!Z.*1Ea1qqe&V7:=,PT2XT-WMaRAX36L7R5dp/7*l^X\&.0elu'Pd"Ogsb6.L<"UsN'
+%aM/%[DXPMu;kSYa&77RY8%DR99[mr;>kPd56/S\tYZYZd#\;$,7R.EU;aKmshIl.EMWHW2W"nS0iGB&lCaP;1`hNkpA6>]I=:/?n
+%r(t5m^kqHEPRJD%"o2W,is_H?">dQmZ3l+==eCaH1)."GfY,),(-@k))'i<@KP3!"+Jon+K7"L1n2!Re@(6Ku)78fpDBo7b>;O8s
+%l2]87QKpODY\&^rS8u"19.R+7j<,'JciQ\K%UC6rQ+TPf$oG9$P5E8$,T8'93eEK.>Q>6.P'E^\OF_?<SXFS]/n'loi:0RDnu3jt
+%JJq(j7`>MqGh"gFS:FM9"f$[44[80el\1<uMp>!*X$sd?Y0Ru3eVBZl,:,9L^qd*Y$/&f2P!%X1M'/3Y.5i_]=<a$=[[7,rD!&Z'
+%pt-.F_6c%0?u?DUn*ROm8Lh?i=:c%H,AXGp9UcI7TfS8L>-iJRLQk+D_<h94Xmiko3<UeTj*E+ON!s6\AaQ>7NO^1&D=`C7,T1un
+%i_%,0(]sRE0Wp3cg$3cA[Kh]:O@2QsQI+PZ/t35U;29mcCkZ0#R-H(E"AVr#\nP(f*N'jq`Q`#I-IFc7!fUds`?*q3MmFQ4W48#]
+%=JQ<Ge0jIchPJn\n^2uc@:KE)]8??o1qc-l<=kiu3p&m[1,--[@OfoA]qBJL7WO2\2.=!P,B[6O(pFjOX3C@[K0WI_;ApGkm;d$s
+%MK3C8.^6K7'c/0Pj(4HD#sNssJ`E@aoNl$*+gho5-<CM*'bR#4)27RQE"et*9H?o;`^r4.2BF&W8VC%$8DoWVX7WOt@$#'@_AuR[
+%<5%MefN:U586]g!c!BJI+jk7HU1B<CRFULJ/W;/oA)bAZ(`auI&6:lsD$*GifS;hdY>MB?Rd"!IaWlCKH)dqJ,%_(F=,Ls-M.<EP
+%1N<l>D6D]O6"HGA>kGCMUN-U-JRESo^pXEp-4+?!#PiYPB'St,mnFqYW559HFC(Gr)j>kA=G4JaTost4N&!7MM9q2=6P_FM9*"bD
+%U<1Agiu+*LT&6hU1Fjsr&H=$n2n8,i(1G:YkNg8?H\5VN"J)5uJo+UW1+$"P\d@X%<UF3G<#HS9VMGB9%^'aXN#,n(^>M;[(*WoM
+%<-+Z_2SW2i"It.=R6Sn8,'EV-]U^Yq+;/lDL8l!"0&362!nA]?!Z:r6=UcA!e0bZgijiO=OEP)q&dI6f+'LQL;K"rETKE(938^ad
+%6NOr(/;$eeod4Vu6*(8U-0^4Pq44*g\lHXLWgkao4J;jr_]$=Ygn]h#G]b7!)[XRm5H\I>,A]a"IkJRVTQ'NFP+SDdp"0uj<SE%9
+%TE5@;k>]T/<QcX4Mr+M(W$:_ICp4-e1Z^k_NeJo9Mh#<'FDag!jM85q9hDCJ#fS'He2-GP_D$9Bjnu\hGJ\YiDlFFX'4XMs')sWh
+%B%d'_cPM`mBZ>"mmKL=AEjEV+!nI4si#Tcmnoh"p2g8#Oc-kDf#cp]MX3Y\$1:hiXS(8t5XX[+UV^*udLs-$"m4<X&ZpkI7G8g[.
+%"L3;Q%F9\Vj=$i0-aaT?QXu)D<*n3J.b#&tbD@='f-X,H)12\`PHGI,/SGnGkTnqu+]*9%o"[QY-@n4g&9(Tc"=)Hi_#iJ=Gu,I1
+%&JF+0Mf<Sh(+44o$t5Om>BD*q709o11L'<e>R`2M'%"pc/(,YB(6\NPG_@]HgJjtPdi^G8kEbBq06&KbCXVD!gl99b2lRY>%3?'T
+%2<`7p[gik^bRdF,,=V=X==)PW5sU<Lj@b\[mNBt58VT;cOWV'*`W>:/T`%LPj6d('G,7b.Z$6i-PNp4EE2<K;.%mMl!Bh8X3LalL
+%R>iJ>eQIoR3A>[@atSKUUDCmW[RjU:iF:0pN<PQ+P5]QV/5c^rdX96@%N/9j"f:LpSs6'%2(Y#/iE]1O"Osgo4gShZ7)0bW5op%&
+%(eH-['U@"=YP4u$%nfrDPC1^noU&;2+OW=$=c-;@q'-cV/<Ygg%G7LPr,@;!,;^t;^$bS[gFD6_<4/D6D=')X6bnNn'rqSC6E9%<
+%6AhN?M!H>M8V-SO6`AsO[1IZZ76/q$$q<0BF<>Qo_a]:lKk;(i6u>MGhOn2nKS<^ZRk3WJ$"jT;n68I6;f08I<RI,kaQ'V`*5nhO
+%V<X7h>qjU%\e08<3\ns[1aHY/bg$MsHO=dELV-Aug$.)6/4n*T!<-XPQ5dL=:9cWPY`u=>*DDMe<;E!-ffJW"?Dnd$1n]5r.S5mk
+%MWuE[/O7K$o"i\_q+dM?2+]1uQt/U+MP9BF-rfEj\I.:H>b/WsrJ4C0#rqs^5.<Fd"S!s0U2i;HpfEZ>O@BqDW"eEDXBA(`m[K.X
+%V#c1V*OtIL@TOk;]qMTJ.FH&paU'p5SN&,nK.FdcL:@t<#78A+C4/6kn"!Op1"AS`U2FpiG>4;2e[``4hCh@k4OdeOKr,C[ofF%!
+%mQq[gQ(D.B:=mbVCat.JZ+iA.>r7/PfN??_LUT<GkF&H(I:>A?Y[Rt5RZMkbNYG3&!]aut.AE8t&'eE#(rHH3(bet7%C@b`\jg^0
+%#&dY,_qe<]K]_A^b!f;'>"kT&-\V=!P>D>s'5W1ME`&`.T8_>'eT&,uE)f%a;NdjdY_B7G@%1"Yf4[K01^#@>X_Q6`\W(R2P/!&*
+%M6r0IS4Y_]IPg0X)^iUB?&:7T1MdOc6mgh9O;[D?_Te1phT6b;9NfU1F4AGc0eE:_NN,%-&cqJIp(`Md+<Vj\%@\g>14uuT-oY'.
+%-Ppc,i>31#b$"R&,+n"`[TPgROZA.da>sBLlj1[Lk>AC<!ZOS(JuI3QT`$HXgl&QKAl2O)jm)2O1Z]XO"Z%lLMGZ]WP6sDPcOsM>
+%hiQqUWi4@EW;nVDXG.QsD/+]W\Zct5J22VB6^I?eRe8NLD1.=jXaB#HU\X,HX'Xn-`L-aTKVPK=;A+0T;]"s2UB5[j:"As9`DuLV
+%73[gXCt`#rV0t%#fE`[k7&kN%hj+I;QX]&hZRYT2NjAD2l4_7<,E^,XhT5ahWWG'gb>6"e]lRig^d_5d>L=U:A]G?5UMLj[J[7*r
+%="f[1GoVK$9iU%9XNs'j"[8DUifeo$V^<Y@Y_j^)@d44ZW`UC.*@sAn;fTpkc.[aj.jh8J.L43PiDqKl!jUW@r,*;7E.QhHF:&tF
+%Idd\*Yd!8ZLrE:0TeEaNRuM/Dl2la^`[LTi05m%X>asI=-;8)#pJ*#B'[4J%$]Uq&.EX,./I@`3;Bs1m!X97h'7]HQ!?.BPeYXdc
+%0\a,-.S,D,R'&;t\*n/HQ3JeqO\>ukC;sAqocj`Ui>Kmg>BR)5WN6KTDCMi^-F"O-![j9HPb<:)2<&$=5FDjWG.^/.2f$iJ=IQ?Z
+%\OYU:fKta=k"RXA%<QC;BFkS8huU-;UJRFk(mAaG3r`iEg6n\"U?DQ_:-]T(EfPO)b!\2U&s8?eJ`';pMPS<f/YFEk(W9#*`!OPf
+%f3@SJ.0f7#;@b`0B'=P\o$ST#9EJV/O6C4X)h69qVEr=p"R?u.b3T+?`Eg8FO>9ej3/e^00^KTJTN5p2U.Ji/lq+`f@1]GjUeO0;
+%-_)1iC"'5;!96mJXSTg%C?PPK!Ml'.B@[Q"7C!_?SeJGb[[KWW+uiL\[(E5d;f&^V!PqmIR<?Qd$p+slk65R#%Ga0)PhM6GkQFLH
+%EF:!nH*QjFhFA:0"X\0)'JLOm8ghmN&&eHVdr(OYN:@KpC%?9T4ld4A_Lc(G!/<]H>*p\/K33J1j4Y1Q$OjT\KU")\4=$=]l;:S4
+%(7At#,p-[FpadXl`)_\)+HKMkQ;*k:`N&IH)g]\P$5L-I(KhX+CLS#YCf>e=0k4s%i-8:iDO+##AdX*YLP1A'-I"4od;.AV/j^%H
+%.'biM-Dr)-BGfZFc13nnSKT\`CpN@BL`S-_$F[&BSti$-06!CLg]XP.QjDXt/IRTm6,D^S8h6nlYp;JGX#B0Oq\R&Z`62[i_%IM*
+%QZ4h7[?<#Hn7gZ7.UfN,V@"0*WWYD&?i!7ND>+*u#2bDF9aYft_-J>@Pf/Xf^<i;OaE[pH2,1o,#S,b24AA`+!'$bgf;97RZp9H:
+%JH,g_&DDD7]FW),A2ek\_I=d^Z[(U)KEkE,JO"5Y<H<e$3\*5[$!HJmRFgWnL*[HsPq6gTX.ko;fN]=MEb!T=iXKbb.G?Y!GZ1LI
+%-:J'kBG'",#X3h_25CKpHc&,<jH-7=dE=3DVq"hRD<LsWQ<dZKLiT<4!g9gm!C/j"Q+G5.B]!>>HDNTDe0?4A/<<MUCaQq)2,-RH
+%)E?>**$*Oe0'-Z353F'dX:dbIkLm_/+^f'<bF5O5j(:0nJ`\3QI->K*0P)/qG@)QpF-K4.#R+U.T+h%P)0qFES5Ql#d`A%\jkOrN
+%CDXsM`Eei87u(`b7)P7Y(3%T)dY(*P:mkQ6LnGItLHt_iQ$5G<4Y6s&.7fD:L;.UG=]i![oUN%8ql-N[X-f_/=Sc@^6=aJcTh8sm
+%-k7/Nqi><2LI0q[BG,4?qN,8]p-ttr/768ZWO#V:Q9[hBOoms)^<J:Li_.gB2dce6`s;Ys')W<]c/9]fQ=s/@TL`:PM"VmGAPI7L
+%41OLu,G6WJg,_0t?buRs(Q30i!A,nt!["ub&qj;;X*B?i+lK1:%Qt"nmB%s4`e'GF2mYGD='%`r(quD4<u"`N35*Fk8_Z9[YqrGZ
+%hNJEoYh3)XT`Cke-C`[7FX`H>!q2(['`cQS9hEEmfuUM&E1r@7Km*j^/CHVIK;0`0%@e.QkF"p!0IOjeF24Gb!bU__ke`rbdE2NE
+%aK@P!Un$]sfMj0r23Xkqm__<8:45ikGJoS5%,`mh0JN%t'"J=OZReDcc?'5/0%uR>n:6&Uc,D,fRr&O13f6?"]_H]dSKGhMQRT?R
+%,,CD4b._*d?tu"MAi"s)h;r6,$N_XmCs@jc!Ep+.R"0"O_c0em(MP,ObnVb:n)';Ko8kIin45T$7Xu:hl,pM4aFupa49W4E`)Td3
+%^f(3%90nk/HO+"uh64E`AjP5'gGrRL(MM850im&/GAT=hU2HjJgss[.WJ8:nM3Ga=.-Z3)mT^mSS(5(Uaqb?'XCsR[jHT\=0ng@#
+%g$q7Ml]aN=5-QI`22Xm??H@:\"=D5*ONs_2#`G4pO<OPtA;!Z<(.CD<*7XbLU,j-d+Hfbo%1(-j!Z0#pZn\:oWFg.KGj!(.ml3$i
+%JZr]2/'k;"*0J=nF:LW]\N>pC_JFTV^hZW%:t1tLaT/_.B%\`V[T7)sJJb5oo!KrVB4!\(8gXu.6(%up2Mp7cq\$q65hRop;<P7J
+%ZnW$8GdnfE*/Xg)a'tO3$uM0WNQPrq=S8!Cbk@RH4uo>m8HW7lr#.LQ?P9aI?D[I[`,9!Hln$2CrO9hSR6+'mPP.h,JcdT-O$B1^
+%Mc_tX7^#-AP*gnVag=l[!,<FL(BH.LC`,)C9aB,\E`FCK@lIioPQ8BhhkF`!d6(NOZ";+'9dYEmNG)*QN^]M^)mqk%QL!<_.O%k!
+%$,XQAh,tQI"t!e:O$KRD/?:cF\BYP]^@B^("@fWtUH)/[U0;3kYdqnA(.I.$0?8&XSJ4D]1e8Ak\(VA0hG>er%,gJJ$fk2`pb$+"
+%i9U17AdtsE+VANfg5\d'P,bf:!32,_X+\9.F^gI$U8Hi.^!%tR*ISc(RN3J^T[\U@\,aL6::ZXZ>bR&"nTL2'lKQ;&h#JThif[Eb
+%U$>MC_?Xgh(T6cs>QodX^QQ7.oghc6Q@O&7Ltl.7;Pk?5fnk9e0tCDk<[DIK,Ik!gKiB[#CmBNJ>;'k;Fb$40,;)T5S(:/tOGTYt
+%>$XID^oY[OfpEph@d<7tgf_d;<NQ?l+&1E')\;"0BtY%=qUmFV."kLW]5_)P!b%-d)7L)Kbb+G-gFaZdYQTY/BGL/%,Wm3J]u`_>
+%!'F5W,j^X7:+qnU63o9tJpr^$W'5L9kl=1D2#?D)&[Hp`Y`cuT7Wl8UMY+[bY;crcI[&muXQPZJ\0^gao^3uleASj1+h>KY,KB@N
+%LJ$NGL)P29ZMVaX!J\Z^#"+cL=K/l&7u'm&O+b:MV:f?W7L&]Kq7U3LEg&`hmdc#71s#.m^oBgb^]S;%!pne0RPU2/o1FkJQW`ul
+%TK2tNVC$JejA=BRA*J3XYOLGiak<4ah619h&:&S(!(is^St0]C7=`fi?r1a7`GVp-&+al;efgn>$%U/mWu&.^X8jS!Z1:P!"q2Ob
+%09RBI_mFN6G2IK3Grgo7"l40po[Bif.u#JgS#M*ii-5lZDlhN.VrWK>A:II39Nf58/r_E8Y:6(*VUkETG,N6J(L@XG1,e8Oi]gcR
+%hNM&J>)FqC6-LC8r$)W/@U:+,Xbqmrmpq*QR"ZR2FQBS_&e1U.Q3Aami7!5`24L%g)N!I"oJkP<L4KVP23E_!Z.X[0$]XdnW*Sq4
+%2mU.269`=1MTUZ+TTgC3((6BRdL/T(qcX!@$L0a',q1m-XX"+eM8\:hVHUA9*i:'D9:B07D@mXN2'`^g,"4>O'I8nPi79sg30%r/
+%0VEX[:a4s!.cRX6T*OVVpB'Mm8StH&FW>$SGn=7ISK'B>5qCLd4:&X?/5?C=I<R&g@FEdiFJYGU4N,JRT?O:j(q1Y&=R6\>Hiirb
+%U-SdL,[=C:`CWGn@">9)/!m+UHMt&bJg!FKQlXgi?6#Pto<PTNiAuF\c]EYs`sBU7a>XA^m,%+9"%5.sl<WWm+Lu3f3CJLu,A;0@
+%DNhE22eeN`OVB:SE&8VjN=<Y.Q<cJlquh-kCK(ahq03W*e7M,Rr<No*!dAD1FYk0lRrjiTp!@KS$.QJM3e.nFnQRG"Y"knQW+so%
+%c&MXk?Nn_]*UjP3S6_GRVG1VuoIEJR.hW0s78*K28a^0A1qI7$1<[gd#$I=8!"g$%>%QW/l6RGdAp7qrS1H<V^N`l&$Bq2`a$ign
+%WK[ibbin=+&KEM]5.Ua.Z,o6Z,\cJ=q:)`oOTVfl0qhU(f-<r`:m7ifrB(i)IZ@>`5RLtTFd=oK/;o3"(/5YNIp*<d?\^A?"FHi,
+%XXko%M>)$Op=Uih@gA44Cg\49FL!/d>RO^kU;TXY,\g.2Cbb]i_d7-Q;<;(m2_t,a`;jobV%O:l`m@r,f&i^L,s&gceOn=>m@`90
+%Me,_)+*X2A'hh$%4TVBXfcWGJJKsZh"Dpp>OR?\4!qnH[T;*L5`WPC>,gg`hoRRJ&LBV!\V)27N!NkNl"YLZf<)1>Ii_@6io]eE[
+%ZHHVoN(c@2-EiuI/S?T4:_.[u2bDtn(@]4n82gopSR??lKnpZnHW7l&[TgjmgV85@""8gBUacPZQF2Etj;)UhqUm]#!N*r6*US`:
+%n[qN@k:EHJ@,dX_a'`_Jf1G.4><g[UO43t*gO%E33fYFjpq%aF+3kZm:_>$VCKL0gjoYqC^)B?S8)fKh47@h(!fod/Yj_^e2"Ii"
+%4-q=q])*Id&Kt"E8>:o.F`qVmQ'KOV1J(<M[uba&X=,%3OQML;>i:`%=)JA*FgQqK;8Y-JTFHa+,`B4H^qq/opK7:Q/q@*2WupTl
+%,lA2Cr.=B2@7%DqI/2HGlD],rG0bk$%$m^jC6TT@bCU6/`aD]cn77<_]`C]/MRB0H&#_1,'`"h,#/ef].JT3?Y,I;,*[@*c('95n
+%_%%sBPSocCqE4sH%ZOM$b=aV:",3lq[&_=(+VO.>e-=H%'+PbqDi)brTltPq7gZI5@B(]:LahBm(Cpuq+"G`WOV9Q-imD1".`8eo
+%6lh<H%_'b-:.A!B_.]#9Q3/CQ]o"eF=X9F9aAtK_N#.:0;jEA"^+Ro65J1`@E,pdu"G76d8(KaRWdVNdYf)c>"6"?S>s1!`ajU1=
+%Pt'AjJo_-Q?)7>V)s6o!HQM&u5qXX!;ACPm:V'%nc3dc=&uAbB;F@(\hDWI$U@J/W%P'`E6<pr_=B[b',MX,T#TW-.K<VHNc:([n
+%ZDhl`E'4VDMA:\qGo2ZoQpem]T,O@jGgR"c8BW:ET\hS%\5Q\8N8<21B@O2m<G-)4.Q2lTGHG_Gf"@1R</`/CeGRH2K@as',_SE,
+%c+?#)FcE]slsg&segTdJL5k3q%V[d`<J-RrTP0HTMdFY(7>DDDn$N>nj+;poNe2G)G<f3=1H4Yg<6^$uA$Se=Y1/D^/!uB9;X"bJ
+%*#6ZB)>m:J&Z.UQ$1lJe2s!`*+0H+C=qHGl1b74Eeq73'OW[sV!PGHdJRtbt^Aj(;;-"BoCa_6\]sm$K98LsA3d01"(W#\>QEOYq
+%Cmr^32e*I`^g>*Z;^#36`$)OoLk6hhL8C#jTt\t:(!ko^FY+N.+GHHMR5.a$!Gn@&m4lc\NemI"JdSdU==JDIZn=>U1Q,t7pOV]G
+%3P8f4e*7F1*Qojd2n`Big3OfQH[qXREpD&UgG(GhLm&[m#-/A*!#'qq_8er$]DRPG3V5jO_*Hd<-4JR9oa":l<F?e)FF-r$JLFTg
+%1R6&<XS(*GH))or?PSeLI?U=anR5uQO24VV6*fZ24hR`$jFLdD+RG\\O7p4R0u8OiO@giFl]qRGm-DJA!l>GW1deZ[K#M3EB1,d>
+%>9<os#g!3`LanbsNaT&M5$n[rK!V,)<spj#V(aYeepqN]V!nZJ5iDQB2BrH<[W<b\&]VOG/Y8I5;cEtE**`/F-4QmZN7H]p83GBT
+%d*AULJUpg/P9'<W4:Lpp<C**.LTG+"EB2+FM[.YR(sYT9Z)Br5hMR[pKK,\kn6l&F_Z2s)DOQhZ7#=D4&pXH]9j"3ESJ$_'CMJ5s
+%CLn#`^t;UNACH"3b#\,e3gng'&CVK?n--U7km"-u;aP:iW0K;HXl_n:_4-1^-D]IW"q+BJ`6,K8rHsl#M7]npd;1aTpm.,:N?3Wl
+%!WoG!n,a3ge`*oqp96bJM8(r+@QkUQZ+Fl`5_TR]cWVlMQVk!Zd,'D$f&/WQUA47HH<_#&X%Y@"^H&b.99u#T_IqW)PWe=5-W,D7
+%;599IJ;'pB,2foFOb1+>Ne='MXBofcbE`0#0Kl0sl">WpMrqYq@a;]'XMd7],\$sHYTAt\ZK#DH5fa.B&Z$mdH[ag-aLa(Za31<t
+%TUa9J#")E>;KYsAE8CVeRCsJ1N3OZ0m;*3l:bR!uSR'$a;@ZFC0\0,[P]i'@?'19Rr!H&t5pdhn@KK^%Tri>!SjP13d"@Nch9+:;
+%Sbb17Go'60b[lD<?kd%=3AjYYV=K27F[<.kjL<li=!W&k3hidOM:d]06klk-otgQ?^9d@8B1^oU*]?d-$@1^]WUka\.$J3@3uYS5
+%@nT(1c"8-n`on=-7^`,!7+l"[a6='XRXpKmm-qTe-d=*-')KQRk2mA:6Of]HV^,BI]sGKr,"CWnqKB1m#1u/E]>S)b)U?:p\d+eD
+%Z?RMInLRi#3)E)17,r\?JHCg%Ia^FPfV7@q8HlBEe\N4LMLdu(@DHl7]WnYag:1QY.aB_jfQ'Z`<>[YV7q%u"#;r*H5,q$_3;Xhm
+%P^X:?_?7"W8;%io*J@2:q'k,I!u7L[8P7)f!Fdg-M;j9*jBK4mU2SWK?uT;&C1hGF7+pA"Ca`%a,.e$&>W?o:+i$Nk(E==qDoE&e
+%l(dnZ+^$63aAQM-?9l-.9L5u>+XGSI#,=`-$>aB\DUqr[LZ#C]TlhZ)k?-uC%HrnhZ,43V$ZLV%M_15@$CClNJQ,fo[[#dX!B\F.
+%$SEW64WrC$[?nuaPl\o`F-/',fUrGdU'["\f:nTEJ<r7]g&b+imK^YNRicF^a"D2Ud,`&;ea@icR[uHkhJ0*7$a*9AaFa,:;j<RK
+%:8"$d"ehF`Js0X!K>Vk.d>I4*UU@s9*39RtCM;2?R.^OU*23S_#s^\9%06@;id>uT);qtUf&c&%kh`fZS`1raBe@G&8+!4"fu<[/
+%55HcZo+J'7*,BfdZE:<1b`;.W7?IaDMof\o6%^.YUM0;GhcZ<?'Xa]>F00!@fKKD2OpA!jDC"<Nkk.I1B+$b>K$IcB!tb5K3Z"9T
+%^8&$R'^VT=I,<Q+]]8COhS*$]6U2d_A+Qf\H7LH.@JnbD_UD#%\DHp.&873P@skbX6L.",<R35Qb"8u*R56o#I(!Z=[qu7D#3S,)
+%O5H`SE<[1A\V;P$j8>3%]^]h*q?k.&hsTlYo8Lsp,,aI62&H/R"=Gm/kSq4Rddb(hmbW%rn)DO4b<kaX/IKH-@hR^^p1\Uob2;Xu
+%P3("L.&aqAG>i.WVZ2k5KF9ojb#'=*qX^0[B6*meZ*L,8Kn+ODP-UfI._R#NSC0>Bb.U1na$N&"Kh\Fu<)cGVUtdn$f]=&u+k/?Z
+%N"$XYr$>L6((U'jPaX$5%<0u9au#;#%tN-p8Ch^&NUA#g$;j5$kq\9T`u1%.mO[TL^O3bL1jbZgJ_3d68KfoYA0Y"][ip!ZK6T&S
+%-1SdH[3YC*nJ,h.Lro?%ANu#1YpW^n)pMG0@!+k=T]KhDeR0t=!B="ngs:3i(7Wm885Q<ao"62&W$5GAR7NPFKp9GaMpT[?0^VFM
+%KPW;-7H<'@P#s<J=TPQOLq8VaB"#Z-=I]fZLPr:lqF"[b)>=dnqFl5X]Wp9]b`'?;cOY8L2jMe'<ucB^oc%6FPt!\'F3+IUXD"dt
+%=Euth-,W7h?c`oM0GLVWP7T;iS$"nrnWq:p9QQM"2"X)g(;pa,c]mNQiofF$NR5Y)7#BM<HK:-17*8i#/X3)V,P=AJbJaTf[EJKm
+%A;ZXo#p#nC3^m+8l?W$N6cNS`Ho5Oa0O;"IVPuEb$iul8'k/hHN=<U`_?b2Z8COVd!BceNc6e(*K)d7]0*H5N!UOG#GVB/g9E5_U
+%K*pO&<t,4U^a]d?J0A)8anf;\/Ynaq!F20O&K6!.g?=9IieL`/o;?)Q8BWdi$o/:LA?CUehF4eQd2c[DTmoc0rK>MJi`n%>/l)8o
+%gICd8-+5&0C'*&4"E64!*"R5:GXo,Tm>-G^TE;V8.Dnj`E)Zk.9`QOS^qg.mkl`]nha@GX_Bf>(2$"\c!4FK)WF&@")nkp$^)@:8
+%?,Y6QNt@9;/gA9Ag@N8dn4kH98(JZ';tV*=Nk$IH'>Ujd[(QHWo\'Fe1''Ko!LujakEu;k+FmB(^srQAb;Vrord"<R_^sN(E]_8h
+%qbIB7,NdAVE)m!UFZi=M6@rs?6\\0H!]ZSJ%OQ^C)Q5tY*ad0[$/i9nlA,@">ZIVLPA;nP5:),6<d">#PZ\Hq]f=Y11-Kd"lY';1
+%>u)2i3Jr,`Lf;q7OGI\prI'sb%opk&Es(KT:M8\:_DkhM=Qm@D,a@"cZF,I1e+]-j'8?5'H=t(S1\3FnQH>F1'ogmcYg?L/>r+9'
+%8#^?e>G[9hclkDRC3Qu3B*<D<I?2@4D/60uQ$Ot.b]BKoBj#GSP%%'!%@gSGVZXoA3jtE/P@hM[7@D0Y>4l/fZP>l6U5p@_`M#&e
+%6r!qX6UX5NUr!Nr,iltu1'KflYutKkF=)UI/0+geq'*gLD"JX`PGQphc66S7*&c#-CD_E5)TOJJ\d09m%SKLL(li2<IJ-:oS?E\<
+%S;`*0";l;B"h[^,.Z(DU6#gG!<?GLgc+N?Kd:sBFOW2lhN:*f/.LEJto7%]B)gL,+s&#7<"o>(L;9c)YM-dh+6q8r9-:0MnU9<70
+%8Df2V?RtI[dC$naYp)(n[6U#qYsX=!UI7gL+3&s8XB?tjK"Dp%[K8a9a^uGJ\_?Uo5c5%OQM;'"?5$=[6?lm+dcrM/"!\br*Slju
+%Xs/R#h&D)L+<_pWS(aUFa/WY3qC%.j-6%3;E.0G>-P:VU%!G)C4=EWd.<:%R/bTtaFW59K7mr3'[eXft=L$2m+a,$h!d[:@6_nab
+%Qt%9`=EZP-%$(`]b$JM,$&<q(oIQWJdU?H)#k"L1NP6XaEZ'$AX`u\AX%67&4:3(l+ZO01.3VT&1^$mKOE4g:KIe`Qb"!;)-e8OM
+%Cuu]Ok*KDP1:uQ/#1ij<ad/k3/Ql!gG>=%7Ll;UR,C]hVq_\dl7&1FB2=$.(;^GLYLb5pL1)gG#fn)2d0WGIM?FXOns+/"4UT0rD
+%d&WAS[&DmPN#9Y#Cj_e`%iOJ$!qcjFGV%3U[<?j2ZlZb[jZ\!EOk4,W>#0:l\0GV-&=\Jc9/C(^frFXo)!R&tWuW.ZD-j>3citYc
+%b+PREKW%F3>j4pK.)H7SJ)X9VGaP?uZ7*Lk)imbk&/*Pa'`u85C8(X_$E$'CGLkWI_,,&e4,gG\DMq/W!PAifT,J+6(st51HUaMX
+%EEN"Tm^(6l".bEeMOAY/!=3G6%BYMh5^*f7[jid*a:`3]l62bNI"B,Ar$9a9!9s2B.b4sZ&J58ka5UhiA,!DVO?))nD8uZWH8S<S
+%Lmin**h!PlBmE6siT?V-'V@K+\jSF*=%FP^9#/_=7.p2G5mu.A>-b7I9IHTb&o(!#1oH2)2C,p8?*NQ%m=cHmc$9ZSRSZ%l3OY-K
+%<9$Td2uA2E\sV4TkZ>].d[Vp?kGs+t8h6RZa1l#p6`&sZ0h>`-Msf"g]QUt='XM[qF@Bmd3[J)h]&Z3j4^7aQN]B][Y;k:qSWMc%
+%8IsJU>:FVkFOb,/0Jf/tg-*]i@d1k3Uug;@Ki-^F*`mn#=fh8Kr*>50TuVd3B!JGECf-4=LE.6)BIQ@+B[m1CXW9dV[>8tI[Mk=Z
+%l5^9HIR+soY_rU8!W'8?<O?8:[^[6-%;l/Dl(B0m3k,2N3s-cg(Q5L5b82']co?(W#r/4c@PCB<&rE"\#hCtWOm6'XW?@d_"65+e
+%)f*eX?FOtih>#X$QY-:gA5X!W9(W<PVWq0JEmY<J>+/I'f$cWb9t35E5:O]%<6UbP5Y5g5e:sp6@nBY=U<O.p"tN6d<uPo@(7;9U
+%d>qZi!St\-YU^$E(11t3IS*Y0BnCt,JJ-AhnSF9p4h66s"j)QDU6[m2]r3i:rGE0=TC!r;D:]&0BGiPqFF',Se:@/[+\%*$*\p&1
+%kJT??pkW+f))^!oYl!K;b0JDd)*mN%q,W!9SFC"%)&h#mT_:?k=7GFh@L+;F$&2*\]J3X#2WYote/)2GD4.C+:,cdV48PJj;%"o'
+%WrOS[UqN4Af"cB.iq/t6OP[gFf*DC_,DOLAYC&+D=g\hC\?H+'2Ko7D<c]W*3SDG40FULI++`;&kA^W;%8/'X!okV4]BZW>OFF,[
+%8o&&QUrd"Y)/.XrdrW%e)X;dui$:s,:0^JsD;/Te%jtbAQ@C5Mek*;YbE20$_UV%a6<4N\HNp94oFZ,nEk-4g*;7>;HO_Cj?ik*4
+%3^aAfgSeSm*^hs"@(34J:,o5ESDcWrW[E_8O7-Bn9fXFVd#AoUjB;'?if5kRX@g:b,@]jRUcbedVEhD6UPm^*q%ul\kZgk$?-$tD
+%(*faR.0Fufi!go5LI*ddn9+kB9SJ^8p+.<Q6-1%SanHgd!sGmHbpQCfq:kQ*[!=0d9O,Q0910mbY6K"!,%9GpN)ElsL;t]$1.s%Y
+%*e=bdpKN?I)BsQ.R(>ZFJ@i$[F.9OM+Q[G]@UG>,lZ9F;jG_1T,s0.T1,T>0]]r24JuSlg8"^5%Jn7^,)dM`f%hW)#CXKql9/(Wu
+%']kBH*iIB3A[;W;P4d."?G(o%_]_B.R=+_q4=7WXrfUF@M$OD.2;tldTW6Jmi;+/RVILrdcsH'@F2?bNnMDZ1`W4t[Clag"?rht4
+%AtK]tWjh1XJ@aUP/=7#.8Kt,F($655CTF,n@7$PAXgr!7@D[\rM-Bg7RY4g^&3DO.Ju+6rG7tZ$Tfkr\[uT.&C*lB?_62*VZrcP[
+%GgLIO7lD;In8)+j8hb%.QMAar>ru:u=QrEI)_Ch]Pt%%_r_ImQVJ<5ZeX@!Xb@/A<QQmtOQ>:'T2PFur6ik+Y+Z"B2WgbKn%ljpf
+%>c&F8!ntMZdoP0Z36m@#[&2N5q<,&H93:E_$+cX!>el\%=!<1aWl'U/2`.!].tG&I6H3JT>2KqUXaRKQ:hqtth&K)mF:T;7^d</5
+%6B_RYo399kS\<<4WlUC3)4RA?%Tl:YRE:&A<9mELMF),E$Kse?e*r8OCL48D<<NsY22d:.+GTjSbS!E[]KS4`Yg'WK'rC5ig\OB5
+%,'F_X;5.TfcNYb)'psbYd2#d<2EA_`dgZX%g,K@;#U`GM$nbXlR$lM5[-OK.;LkQchGu@CFdZ3AE2/)MTf;5%f\Eqf,MoO+Dt/3Z
+%)R5(&-UiE@`S!t50QZcq@u'C=FVk]=0Q<,K,pl,W0-S)liq:d0BIuA>&l]u%e)MU>&lutk+S=%i+)6riL+Gn*ohJG38=RH<64]N$
+%/mZhnr_Ok%<Vrd/TYWfB?/S`Zf8XB/04o,[bVEqc.f'UL5i2qi[39k!8WTM*,js;2m/L>:ZF^'YP)`R;G7o+g$Y`JF`^Z,F3]B)t
+%b^mJoZiLnJ>h,Z%@Z=ikDai(;NCDUU/C7'@NJAW5c,;4j_`e<JAZbS)"5QfG6nMSU=_K&6c/5]rNV%V'&L:4'.;_IkYj3_tBc:nZ
+%PV&YUR_l,N%"^sP>,ENJ'EJr#FjP^t'cS`!@?"/7KW6N$X),#E>'caj0;H.D*8oNEfpuC4@o.If`59"CT\V:=Emi=RX@7EH!?IaB
+%cLcLfLc$IT8St_A#E#iTFG3X24Na-EL^Cm!I'5L4#Cnlq_\j\n+5h%eYR0Us#pUt]2-<\2P)kR'-!":*<ZYJi8[1LVg%uYabkRn<
+%S!0n?0pZQ7m)Q6dX._,4SR"%[lUt"63Z6PuRS_Rfk[Y^@KiBI'Zp39^B?+)u[_JOm`EH\;$Q9Xi^tJ8#W&Rl^K_>rjXo?9#;h9>W
+%`6Q5@A_7.*G\E2?"=L1(j!`f9&7O*-]CVF7>bbs=1Bq89+9F?m^_04KLh;[l$GRcXY+Vp#:8B!U%ATr:M[r&\)5=9*Y*h(>',lL4
+%DX((P6oChQf:"cDUFMjTL;BlqAJ'XpclP-OK"R1PD*XX-#)m7hZu\CBO&`5fjuGne'mUq5n$[>iHk4o'5iak]H:AL!%=NfA"#8ML
+%Q*CqYJ_!8\LoAio7"H4!@VTLOYI?`r#3K\#d:j.j(.H4+MiO=8/h/*GJ)gAHau+l_*<S\pOAgjhenY^f!b^hlQWl+(Y2W'VaQT5(
+%'GZ=r^aX-tUkqbW`^;gV^%hK$Z'Jms5"Na/Au#$m2-/h,Lgk%&&6g6(niK>RS./Vo.#I-l'5]IH%GNp8:AT>VU0R\=2V":Q;@!\P
+%@iUZ'@C_.3T"QhCDPcO^Bm\5n-/eWHXWE7_S"d9AC8GLnm>\9@D\fZo,ASQ5&jM6D:p2`bm:\u_MQt-u<HNp'Xs=kn7'8NZ7^]V/
+%P7b&86T"-eBXUK1r(XUBZm/N!Kn6hWgG0m*8.o_5T$U6Z!GM./W\A.jjL3eMQH_nG\NSLg_m3+c]#'R+5*1lc0t#r"(UoY@`CE5$
+%@":+d/P@uNReIIXY=a>"8.,kD9\rC7dYkI8cE)1O=('7FCH3jsT'2CjlGTr\OK;B/QZ5:hHB4L!g"\N&65*]b&JZP6pKiQD9agV,
+%Lp+`PY)/'>ZopiL>m#[DkX'$>H1Rd8NCBO>0Lt`0<pU,#p?2O2$A8du!GP@L[B58NkR&HL774"56YpD<(5N*!G;+VQ(e@XcWYu9$
+%6*j8IU,\&%c=3P1dC"/C_-u)H3(/BYWGVAQOa*UUJ4[1$251)7<2L?JKmD>=ZTU/M/ao.qCi0Gu,-"Z]`9jE1P3Gq3,*7hD0utCX
+%4_8'm8h>d%mSk(VT$kq2=C`'SU6a@$Mj`gQ'ESA(O)gTqap/R8A*KPje5MTE*T27<#Yes/mQA9"5iJ4?HUNkT:/9JXd<:b?%jRf)
+%0,&IoFE%XC<L[kYJEFo<Fq2BD7tr+`M.rZCNe0tq4cP*F4Ndi^IU'X0"?MoR_MC1"QJM%h1&JY;W!0i4Yp)XpHnhi_%ZrEK7#i!$
+%:cA_s&(RJ73!8@VT0!T<24S["<*ST2+$GlN`Va6pUNu(-QF!:_&XgFMO/ut=>'n-iTV!JPRZ^g$7]fdppds7]n;E8]Lqgo8W*Wu.
+%%hZce"eh/egBtaAQ`XIf<Al8c`MIH<'l0+.MAGh9N1/o<]*#fMI+4jN?_#Ro9\TcRTAse\4JROe(,BFKW/`jla0YM_-%Q:iaeBtg
+%lC=UYU395IcEg:QfBjl:2FCad>08cTDmLT\g./V(@'cYb_*#q#+o;=(c:S8tjSYd][@@%T&E]1A+P'b5BI+%lKg"aHNPcSr)WSCf
+%i5/'Bl`Saf-uq09EOO;lTIWm`<^Qs9,\"n:f>[f$mb-!6VkpQ=m\"->LPFbtT6NR0]Z[QY`suqt``ep*A"1^"bC83rDU2?kH1>V$
+%7mjFYVm)o^"h0kJ<=l_KmaP>nHj@W3b7PXCOf0i#$(`4oC(LH8S'o+c+K>jjd%&eIE!Qs(3WS,IZ/]CL9m/CG*G-$i0H5M>HhJOR
+%2d+Bc*]5HX7\lk@0trX;>O',sI:l8FW?$n&pL393iij`2YdVN=&Y!;ljJXf]ZV?V-Zn`FYrRYKk-DSA%^E[C0e/-M5"4'T`[A!6+
+%1F>BM>n?dNa7R\9FsiHq#jJEo'bP;hY8K!q>VYRCOg7%&FYIEMm1mLh)m!Lc:KG)"'I/EQ5e3am=#jFf3b\sh[IP',QfFGObI&rl
+%i,"\sj;lXulkDJ26tfTdBbLoEd3>kr4+u]5?S7.R"F?3jUI6nc`<^r*oiCEcKJeSK6SlCf3L#Q+cr<SrL<AA^UTU3HBp=7.Att7j
+%3d!8QjG='Y'DjP@"F:[):bPtWr?BIAMN1.GZItM<`I:\Em(*penP98H['A8^(cb3$-6H?=0ECHm%$Y7u)rnqJE;&6Y/#q?3lBI9;
+%CF`[t.7TG;2_6n0-d4HJPaq*VXF-i>MQMQq[@goj3mm.H!:9B/?u-0.BV@@QQQT1dC!g\g6$)HCcp1kioI@,\TqP&!NU3<O"_cEu
+%O[VEg#Zj,Yb/>nQ$miiE'M5\`1\bO57HJTZ=Rh<cXes,ccJ8&;L:9p4,)u@N^sYp_Id'FCoZV]9fdcnRS;+$]$"3m'`(VK\On,V6
+%P]f(2,4cYJ?4Xk?BmJE5A*J%*s-16H1DudYp8hs#ASN1W?!2/if+YCS&5?af/n0XB=d&._o$Nn"UHdJMAX@&Hr$V.4jbDOV%i"do
+%>0^A2,9qVc\4sh$==!>!&<El(9j]0G@%",4T.(@(XeVi8:,t9gI&e79NTD`.0FEc0&:K+C*P4'2*r2?ppD*b8*qI^=-1D22J69+&
+%BeNu-0i^p9jgu3>!$0qHLDcTT>+U]oFL5BYm8PlEBu8Ubk\@1JQ5l6m%M,+#)W])O$95P!V>EYE-B&guPZ3E=Y*&?3[5b)HLl#SW
+%<"=?:@Qf6%,t]Y@&CmgHj)jG*8QrB$(_j$54_kSo(sR\g&n%B2QENSBh^TOB<I.r,N(UTC""W`LRU$1VRS*lNI_K:D]]4C@Q?egu
+%,S;LG.C!PH$Ud;+8$-kP2)_./%+%"XW(Gg1mmUdl/sOc7,7e?joW6tg8/3@AabpnaqFE!b"`\HWD'$CDF\>@#FgkW(g'<J;B?^k;
+%!>cJ/&X?*<_0\t6-mOD.X<5Y6qW5n+.I3Pg`4dEerZjN=BlBCNK-YFe;9m1_RF]ADcTjCIR9W,-!sMguTKmBc$K[oq(X(q\c`Ld_
+%NF<Z)cYIYY1c,Ef(5^@:q,"LH0c9S,jUok`[_9C#,8,pt8`\aVB3JhKa$^TTGHQuImo-+tn6Gi`Y"*.8+e@4[WYr@JX%Ykp%<P=2
+%X"J`\bn\p/C<aI@_@tofLc1oCN!#qld;Acf$[bd8Cs`=FBCtKDQW^E"[!IX`#\u19aU+[SV;&<k_%=2A`:e!c,aC+Y8rLN!#b<-`
+%[/j$$'lW>>VPiuO$ts/LhBd5^`;t"0;Jm+,^i>O>TM91+6<VSij.KgH=jSe.Xi:lG"%tNX]dRFeY1iIsFMpIQ@S`1,BZe=![R+<0
+%!kS02]!b1Hi&b#HgUP>2eLb;N[tWljk_7kK%_Mt+&Q+F+&hu7bJ_/>Y?sn=[:$AW@Y)4X8YGV"I-A`9kgoUmheI,@q&SH7_BCiHf
+%)a:F9b_'eBdU&hq<U,q0\)Q&_^c):24_+cqDkEeQAUIKk6PbFd*9kX,k%^YQ=382*!B,:"1[(NXi-e<4"Js%i3-A;5J4.o.lm,#"
+%%ul4hfgK;=%[f53n)98]&l@+19KY-47sXRiZ4/-H7^33!MnLaK>jOa,W;_gHThAF2=lXK?<4L<*SBjAJPFc$m\Um#$EI\scJ[@9*
+%1D*.MoqGEPOsLZhhCgQr'fT1rZOo^,(fE@+Kt`_)Ks/Z9qlaX%kC%&d"QDqo`<8ZE#1F!_W6>$s?!gPaU#/g*A#0H2Ss*Fo,&#M/
+%M:$@1RPC9kkW))i//Bq+,2u,.UsY*/pr+u&]"RCn$r*EG)%lJWaZOU-,GHO@7<.7p*]ipij*d,"i)<j60h;nU,2+i"?46#"edIM(
+%-roT?'<\.6'1<7T,2d%T31t47(b8IX2Z(VbM)h#)N@$#\(q>^ReeD8oZU)eq/CsZ6I;bY#//M,D?a&.1m9tQOmc4PD*>cG'eO:nl
+%,[#646s$i*)4-l'5[su%,q&@Vn5H\lUgsQG%K;&@$_A>N6#"dn2KHsQ;/8=G&]/g"UFE/uZ9%q$\$5)n#:DDX!iM:l1a7+N?jua^
+%hN,N.[1aWf%r)='Go'ZE1)Q`bXIU1r3!979#$BpPFe]-9/c4*;o0AQ3LbRQrqPB^q&b:\]Sj3]/(1XV>-`ug[#eX"@+1&O3$8]VN
+%KW:;7):>1@8`L)F(5q8/F3A5h%[AKSS1%j.OWf<K:'@;kEMA(.!#Z#1*X)G_kS[[L/c1rj;QB;EV6;\=O^8]*n6,=48)iV%G4G%U
+%Rn\JA_'Ys?_5+<(],_YG)I8o1J[GeBr%YCo9W;'Q\m]6T.68s(c*H"gDE3&!;1iNEWc`7N(?\+LPEK]L<s0@TN78XWVu71$q:'%1
+%j(6btOtB7B@D(i+1APen6]HQNG1TD@-?4g)B\puL*m-?oOKK@o9iRQuMWI7Na(aV#[[!r*msahD(ZL1[+Lb@@Do0Iq@)@_#>J)AS
+%e2_&-0md<T6j"VCYf0$_6V0\Z0<'Be&0.\fmb#H)7)V"&<].uBb#rF:;/d)brf^EkQ&$@L&4bs+o.J6*LZX=_L)nq$#p!gq`$F"$
+%1cLS$2?]"Bhls5])d]G$cbuCGHdZLIGQJLKAeP]R^+:o7UW%frA42>I-+`71k2sT$iO%R:c%PLV=:`GrR^+k^4Fa'-+2'@4]FWCY
+%JBV-UU68a.Yn8:ndGqYi.QT=,8Y_&Q;P&#ahq1E$>&'Au.9g(_^1R"?-i%)RAE)<2buP#eGDK;-GNaY`6:?PTeSeGM1t(\%`1U5h
+%9N9'L+=ck((pq;mRF'[kDd^kaFhopP]WQ6<:r?JW2+o!O&;L7L`Fu_N,-*jta@Ff9I9t/C+^3S8!LH;1<OY*l?Z`[]UJ,d)lYJQu
+%KX.J1bZ_G7cOf#g+u8ZY-N-LUAt>>=":G?0H^&Ns3^[%B;'(:YbuEfd.N\_DD5aR;XgAFPF3@>bE2+[EE$Ul2[)g89d*C!7TD)Bm
+%3#`bKPl]7Aj(ok\_/.%D-5d'5k+gd&OfuU;#XG7BXc5Ce14H-A!%&ScA;o)?NSnXq3>:,B>M*4/OMPGRi1ES^JOW(M'sB2G1&t>a
+%T8kg/.8%XD?!sV59&7=FA8/[pr&bfoAKVpieSg+H]uHbnLLb1oBK[&\<83pYZI0k-+60#^RmbjF5p@(lIAk%G-^k'!(t>.?kGpdK
+%Af,BSLqkELJa(`!oVOBGcnOiaX5f2d"PV'Tf[B*0+TN"7M@knM[#DiH[3AKRkXJp:A6j0uBGWaV6FgkWg(=jH9EPt,"uFhilW>2\
+%3=M3:8RHI*9l#9Kd.\Rn4P"'Dc5X6'[on%\AV:ged*30=G.>2VjX.PePr[BKLh^q7,[po[E3\"=0X!c\Z;\P]6!lB=NAa"%9Lg4Q
+%/g)K_f."9i>HU#/m26KA&T_F9)oUE-c(VC?I?ah)kttB.@d12q@nX]`\nTa>q$?W?El2l1R<-r;!#Hd[mQbt4M%0#V,J8].7R]-L
+%,!u9q)urGXlEU%a6R`6BTpg,4l0,J,8Qu*U<m>G%"urO&.Ns&nX4c%5gd0Apo^V;FHdg7DL9;,pJM[hq)n$kH"NE>^!Y/bH,_&6C
+%OMVm(BAS1kE30HL@J5L_;[3U@;^7/MKnp2lQD9h1VX'.oM^,*^-H-'XLE`#5FYJ`*M2%9]`Ju6i,9!XQ9:h2s?!i`V/l_LhEsB0T
+%k_pq@9quRA5]Puf]?S8M=L-+XhY?c&@kE)4J^ET@i90b6iEW#tJZb)2(!)8#;WbsBbS(RB;ak^q%e2Zc^PY$-M5W[Eo]8(EohD8Q
+%#4FUS%$hnY#EpQ25+'B%r\EdW#79h^)&pMQYnfbG3:A^R'7`tX@$CpBmgYARoKYXT3EHPqG.b:dpgV=JhV0DVq@IP=""7U)$jeE0
+%VdcQk,G'_fc',3SWloVYg>>PZZ'a.!/sT90?;M&^-r8^J\SIfG7Vu/N<=A<e>5k?:%ZCrBjJ^LaV+Z)HEc.CXO%t?aKU'q;XBiT\
+%hYQ>2:Rbbe`IdKZY/8PYZ9:;@oQc1KD9J-*WnnIUV=p4(X`D=+kiY>QNNn40&[CG\FZX7&d;?J>1Q>.%bqKf"_B7#J0I*l'_Dn=;
+%OjY33&`'e8%"*&!d.HLu(!_-KG4HZe7?eFV8)hp4$=&L)-T]&uESSeU3\;$#3iT`d4g+nB[EHh_=HHs8^c:;rkdFb9<UFRYG9WsY
+%EI?WCV:.mUC:@e0JiR1$QV<J]hb2%,jToI=Q?B)P[d74nMi*XZ3)V&SY0lqA?H)fAh,'32._#)AK&)GoG5r<j.QF,7YCjla+@F4"
+%IK[4d3"tG2b\7oF#0'MM`;mXbrl^$Wq7I$X]HWrL!;Ba'gF0d09-"R[]%O2T+$)r:fY;afF(_c&!'XoBFA]u?J/o]*!sj<IL8I]?
+%jo^2HMBWnaYgg3=&Q?;RNtrb(";^qAoIBVn*)^5N##/Y1o/nJ9N=J0KK9<(OG)>@O[e1!pYa'G/a!c3Yk<%n\pL2r_OlI4'Z0L^l
+%rjuEBd7hGX6G1Tfd%g@=UK(eH@b+M0BQids?f1#d[."7<oLIC6abih5UHu'3!G'T#e6!k$X2NgFfac)I=H10]P^n'K/7j_'W>'Y!
+%P]piH:9iE=MLM'M!7n$>N:*b0c5hL&'3<0_Mr#"W7uK9`?MZnP[*Z3c%X!&]ZTEJHpKb6:A"C,5krkm_:/+\2)On%\@,L3KK"O8q
+%5eM)e(,XoH*hc=sf0iI[$BtO_Vs#%LEl\/7)Z)=f]8Xaan_\IL(fXblje,bnBP>ktq6cmMH3U"+0cP[ckqj/e[%*b+7ng6L[*)J`
+%f;"]iNO'fAdBTS5^VhCbL89)elTNm'Ck9^LKd=lORl!inPm[h<.DCr_&X^8lbcE5O_2YN)`9>-<!M]\`0Vd`-.p^O@7LAHr7K\Eg
+%o`M:rL^U3EoF92gn>h8!#ouT7<5<."<<YE,i7Q-u1LN@O;kqI=U]-%rE,18sZ)aUJ0kB\!qk]V!B\"4^WK5<j*:2B?>"CjMbI.^q
+%gQTSn#V0RBpK!)^fcT=e,=Ft/l/6p0UuDh<WpR2*Oi6%?is?K16QeBV!"kpT:/'-]<%gM3*R)ffaKJe[;n$fn%N&]Im07=*MGr8j
+%%+*Yq]E/OjCg,/$Vm:,PFQZIN8C=#A6jf/a'3"4:lH=U&F3G2$XXmX4A_B3\X&sk+4-"*FQpI'T1b@%)H9T<)P%17Re:d.0hBe4'
+%#I:OhRN\"!p%j&1:D?HL"?M.p>Oa[&XrPeJ%V!YUQC:I@IYgF25WT4FOQas&!-FILpDX"gqq0@S[VJBk#:7"oF+O->/CeXo("h<#
+%9Ko+bWqMWZhmKLPbF$@kaQPV5B0##!#05WXM+s$7iA*fk9cJ-:[*)'@75p\Mn,SXq*;!:(_H6V6ZR@EJTP,\W^&G.bF3!/.'p3Bm
+%b\h*J1\rd`$Vn*oZi0Oa;crYK[IX_6_DTCKSqF1+2P:FT'1Ah8QF[2^7EtG/6Nsp>=*nBr6pn*(r3%07M0#+ds/VU2H*Z(1[3].f
+%/NWP43mi6bAgK6<nIk\cH>h0i'LAP;SMrAd7fV$)=Mg%<Oe7Eei7*o2$rG6YCtE(fA:0&:Kc!Z-?Ng3/]hU@"B#Ids_J7(6FdMHN
+%^ckLOP`oV.#Jg=b"!C+W2@<*1e<F72TKNkrAu&sfFMX^LG>9id3./(a/MDCckNK8gEMVODQnV$$O7u]9`>^XFMg/6B1#O"</Yg-2
+%P1i&;;:'X:"lliNRWWr'R`XWuZ9i\_kT!7"H]W7"_ia%+h:bg"NItH8AVGH2lp5^sOS8atTQb*)"`N$#jR7-G4sk:\"SIg!o7abP
+%hulEM!VNk_e.Jej$7/Af`CMB9#ko6fZt:;f@uWi?2`hZPW(2L1.u((mXkX5;F_&D<pqp]O*<[OXBo(B5&N`)jDfp)6@L"T#0#knQ
+%dBSlUZEUmq-B5;>D8WA@V9Ee"&T0.oMc*.u1lQF]WcpWD:us)ka_"`Akir_N'4I_qYh#+;WoGoG@NOqV#L-p61XdA]haaZA@gj'7
+%]I9MaRB*\e:T4C@og!>>lDpf*I>0mi0,$2%#5:l7FcDGk=#/g;U*Z.'Cf!T&7?7eQ.Qe)C#/)o92?(l+jIB)l<jM2J=;p"iVocq*
+%JU(4c[2RBlRFrk4PIP9s1D-H+2DnNo6^eBhI\N[mXe&9:(`6aW#p?f'eIYSsQ&+X`Z".gIB8s0rOeX'D[Y<`+[GLV7/H:T[m=8&$
+%];b1RX]"Oc:gE(dO'a5S`eF^<-4s6Wk^"jGNRFK']n%u`g+)0$)%CVV2RZT9+C]0DVA\2->ec?@gYq_.Tq`irI^DAbfuJoerRFEp
+%3Rf10dS'lVJEA'A?T$G<8(7ZW2Wqpk)[@l-1uleooplCL!*395RFq0YUs;Z8)]O0o1EjU&M/5$k/:=#25Qp`'Bb1fGj12YiX$3"(
+%ieJFRUuAjhL;fJrqtu^S-I@1`r+T>EOk?ZCY7h1`8*bS6/RQ#TP77iLh&nfmXHQ1BHX8Em5prC*GA`7375.oNP%mV?oP2N;8n]^2
+%Mgc#'jTndG<9o(@PeV)K?&&QC.O3eQW*L%"KlKqaD82RqJaNUlp-c%$6qF]1Q.OIimkB?(UI)4imjug1M(.%9A-46Z:c]V):D/8^
+%k]mR"CR:dhrbQh-h>qnaLa<s:@hQ,HPK"d"<AJgZ!!Ilk>KkT[6YP_O*c2Jke'kU.HTMXWC)[c]2L&FY_1"f,q-l-Th:TB6NF#h^
+%P':1iB#eGh;:o%7brMN:[_E3Q_di:C-Eg[Pitl&CCcbdo>h]KA[RecmNbs^(ZN7Or=U/@:bZPA4ke!$R&Jg;`&(C'?Ysf4ujt/Z`
+%?8hGI9.s`:6uV>u,`U+=>cQ%VNJUuDYsu.FL64<MWtV37<n$tnWlGKbc:U"(bnEd_cW29q'Dbk5%a@eKq']B$aAnKr0R4emh"1u%
+%.6BS&q`gI+MSala'I)TWAb!q^#DA`7BALQC+<0UMcuL76FrlK"/7#m7-n^&jQEFMDaK-#ANAIdt,&/6\Za,BT*)*2Om7O%U%73J%
+%Eq5&ZS>ASa7P72K%V!JWeK%e]\et+CPuW0OZtZok_nFdqlImGnl>KEJ)Uam=^K515@`Qn<cZW%*W^>!e^d">&>;9r,W58m4.l8%n
+%%T;mGh'Bp/>gsU+8/W]JTP4Ot/4RR0.i>11#uSrP71):!".TTbW^n3Lh;`YcP_4gkYr\^"gcdH9#-uX^RpCV)Sj4o[6+T#iX<Tt=
+%?\Wjh.RSZ"#Lj#dqq*)2S-L&\-XDnX;:8RMa5*8FI=eZ/14R5.[6,XF<C1+>E`Q&!Lne5\SCOi/j!.c&FTm^ecl(52!&ng*0epqd
+%H_\HW'<rGBSX#WH?&8!=O/>0c4)O?WN]CC)W^P?HA2G6rCZs6j;/>/'>sLnm?\WfakA9+ff6K%[N?3uGk"QMhf(9C5o6DDEL90Ms
+%qWnI%R*?sMP\>*XCJNh:<mJ82(sT<P/QJm4#7]X]`)4tMb4u'.7NMQq!lL7<AtD$1`8oQ)$$sT;=cVE6:a3En%:V)T4\q@q+i6cJ
+%,n?Y(f!pGa!HlON;@FG4`^/*,`4[/oeLD)hZ5*!SW2Q:E)Hs\PW2VZ^qNoXS2,g'VgLbh'[0!mR3!tn",DVMie6$279LI*Ap%'fs
+%#cHY>N49]lGK_KA8eRbLST9N[9m3tW!U=9tRS,JkQVDmo!j,!n?j0Y]M5e)>PC]bGE<Lf@1j>fQ(h+[>OT2sF52=!6YYnhKLZf5%
+%!T@CULc'N"=1@#KF)Z`Q8ToAYL%QF['_nZ-LT9.SI9VujF2cX>0g(M%e^jr5&Q'C#76H1Ol*i#ebdD(U[o3KW-q-%Tj,,SVOj5r1
+%]@LtpR\l'c71PSd)I*A]T?Y8_dLP#R6?7Em'A.Cb]$oj\,-$Od%hpaZceP0'gX2FsRh'2[*Lt)B\R]D,*AO;F/r7ZD-"8m@c9"b<
+%C@@4,3)eIdh(E!?qk5rB:1C26MELOs`j,,T\<``Kc(-R$Mg>K=6MqH`F[Z!g?BF@_715d@Fp$90TL..-aX%$6o*sa$aJdpFM[.X/
+%M4d8+C,;DX$_caQ!)c'W#Yc]kU&qI)_HWfm\RA"S&h47]UI^]61ulr=Sbm'>fd8YG?K"<`>].'AA#I\]h8u1V6K_1%TF76"%1[;e
+%BC+$7%nB=#p8XkNVV9Fh^D==u>XW]=nf#o14NE&]4YtZB>m!e[R'E0;l@>1pVemfiJdGVZ[-_"#6H.%]@LN.*dH;GTQ5X];>HXet
+%HARJUU+4Ilg1=>[(X:Oj`E07&eY_=8b1&i_S77+/%bO<X>HP2i>pi&89mrY%2UPg%D:,+9*OXj^kX*=BBE>N"(LmiIZ-;re5cID@
+%KG>[\VeJ;Q'6$Ks3.\q#?":2$C;5?[`e8"`#%s??Tj?l6)8:_<S"tdn*paeeNGEg18tYi#8g]K07sKO:Ec2rUVjhZCO:@9C(nq1.
+%>OUhfcCS\FHkp?'8quGlm4cPRiAfR44rOhK)>rg1fJcZ",d]_c+K+b@L`@FMSA:d`O89&$dX=BcLW4?H'qs#dULPX&FY,O/CooVD
+%*>$EGBbGd-5`36Y"e8!lj'L`p"pdU:&oaMT`Z!l,3sU(*Zl#8dZUKtP*:QkZe[js`0GoJNe2+eTFjQWE/lHuY&AcD#Tb7Ce#b<1g
+%Z)CTiLd6PEU#"g9%go=n/4;=Zkom-B3B)fI^Pq,+Q)I1fakHfi<]_J!T5cRS#Pa0j?j:;8'qpSB*BLcc-;raNHOpWW;s4F[*?"q'
+%N/_`Z7u4=6OmYk]#1=A@X,VoI9AQ"]l%RDZF;dgW[>./;0$;1$6Bd6cL)"&*q)#fd9W)Y5Q6stK=ddBHBKdd+>(*"'0u!u7lh6sW
+%?nSbB%f6#WNc;Q4K5_t</TaI&@C`)c`)V1D#3q)N1.P#;&RdGcLjFCK>N5]E"Xn##gELAHP+@D'-QT=r!7A,Q:D1WtBUY.7#"D#*
+%?Ks_kARiu:-"9D12V010M0?$%-WfL[//eXu:`JS;h$6=okf@pdcrK,G(2]:&Oia_[D\+tA,giZiH#"L^5]:%-Z:C9oKB)>E`$(f0
+%f^m)P345lE'Hh]`\614<\d-0bB!F$eXlXYVH)4(I+FI$6GTM#DHkK+/Qmp9fAYKC@l61'dL,C5!%u,nVO8p!uSV[j6\fKs%DT/\Z
+%"ro5ZH;#j&=Mfqe(N+&S%O=-$)Ceu*ahs5*qLpDMQ)i2_a_rA<W9d41F5r'4+P##coW4DnX-J!?3WuiOAEWF@P=^TSXW5SK@s.Cs
+%gpH,a_(V@g<Qkdk5m9A?.'`)@[B(II+0Fd2\uhUG,QYI!f>11UoE^dU_WY0A2%mHhS)1>Amt1)W>e'B&BNE9G=FJq:71ueX/iW6:
+%hm?\r]_1R[C*q=ZdbV>\9U`Y%WVaDnaR]/IQ8MI6(CjS'-gZ70:Ra@$6\Q"X654Qp"]W>0I"sNjLQ^Ld=1L6k:R?,]<,tUTC=.&@
+%`W6_&4FA^Z8,-):5]lJrU3!4#3jHTB>hNT<i3rLPOMO*7Bk>$NGo&qkHRClo]9c*`ba^u^$?o5Y1>u\)1;;"SY/Mm&P?:n2I_L#4
+%ISp;"b.);C:;>`,oB.]GTR0kBe/6Y8e:`C"Q:arYKGn<.2:S\X\*6knId?\G''0E\N##Dcd\QP-9LMhOAg%bWG+:*_S@GRT^I;>M
+%>.1WLf6W^"@tQu%ie]_pYsj2e3;6/aG@5tY*Fa4kdja6r^utt1NX<Eda_s?.6CLKhXqkGEI&DS)^`>k3+<F*W3%[M+^1g\c<AhRE
+%dc$'dj?*N,N(=\FrBu_R=eHA>iT1S=d'aGS4E*J]jhr+L59U9A&Oa,1MKhGSq.--/FAoN]H(?&"k&3.0)MQtdqUauNKJ4S]3R^4M
+%)+&c=:a3b3dsu*;6si]Uc"$"b0=&(83@t6&HBnth@bq$^EDgU'l?F*^Dc-DMW<MS\jOf/!PQotuCMhQ2V/?1V0'lcD4:DTq@Z)1+
+%Q':DM"uTL0Ikc%V,%AR(8F\tu[Zr",8jZIaE%Hg"Nl&;)NJ#0G'2llt6MC[(@73W^N($YY$jtQ%;:>[+d6'BV2WU-sKB[&LoENE0
+%&u'[lHXcCT-bG0s.d7<pQ7R(5k73!kZ6h>3FR".Wk;CGp+'R6Q2FKp.@5ap&Xd"-@$oEsJRp^;i&#CRnAAB-nUKA>>B;HmsA-6$f
+%/O6.JaB"T"I)QjUP^t^tV4e=E)4P_T[p(4=Y/%$9btRMG#QFkKUX+[d3N6h8^,%Jgl.L88:T[s!U?ih3ea]WP_C'VM<YJ>p(X<uH
+%.L[RQLG$G.)28E[[k-g:&-`]ggGXEGd?D/FYhI'f,4#ae"D)&SSZ^Gj3%3r6iT*Ui=F(Z]Rsjg4!B!ZE:!!@/G\EV0!5oSZ7*c_B
+%)(el-!c)]r(((\?K/O)8#$&>''LeS^72\<QL!H#?U@_iYlh2[nqRs`,FO%,r>#p&Q[rt70i.0F,p^R7CDqs.JE:_'+mX6edlgGmC
+%>eg3s`O!Td0<_!43PN&W?<u@`J>nU=?_:ZKl1b5<io9`\qeT1p]_@!34M(:'bBoI(+ZU3CHr%\1S,W+G'CED+g3g4%YQ&d8B2b9Q
+%53(MM"OQX1Y`Jtb_nkp@5X/H!")7%dMpV7cUN_)<VY>R$F`#PkVQ1Aqf+.Gfl+W6<'[Sn_QuAqdT@"aDr:-,#+8BOqIMrN&Yh%'C
+%>h+Go8[=J1ltWRObr].tdV9RF:ieR1AfMc4^ZEI&JFuP43aA"<g'q_)l1Hn>X>LS1XMcuPoT7'tU=^X<=5>%1Lf'g;M9FIp21i/]
+%++/3LHB=jl)1XGY-pBN9:QB$ZlZ\<i"BZOC]m=jq4e<^r17OIi#kU5^m[[V&^VLP_6C*7S,MA4jN4MW8=QQ:':`aY1k1&ZG3ecA3
+%WoM9b64*T7nu,BI`^3R/7KG+eQrLjnOMi\rIL[(DTH"7%%%k\LCOcO.7N`YcJ!Ya%3$]2UO$9@Qd0eagrHn"/RcS;DR_iemj<SVS
+%:b7=N+)&@]<$f@ID,FJ6a#1IDa7.1A<8Gnn#`bjLSLfOZ)`U2CSO3KF:9\fG`dEj]646fJ=r6$4;7BmQ0F+kb"4mT()G0uX:YNUQ
+%>N?WU=8%%r&"SVZE0i%!,l%AgSkO\a_.`,$A`-s@XLh&7U$g-7/`Ys>+eU)'SXaMj3G>W.k<'"TqJ)jS(BZILK:Hk["!jrP+>NpF
+%:q`_Y+P*#\VuZ@J+=g1gZFUZP5GAc=#EbOp0ZipO%'qcI/sdt`.$VuV<R6jp_XX%\]u9-WnQ%eLZ`-]q#'3`$V'N`Q0h3fu^uc,U
+%4+3"fk0M1]I[#e-"Z?l_&MA"@+FkiX`(?'Cn>SB'O*'*SXIdcO<7Wpp.q!W+m=i-:7_.dK)HL7=Ugt.SOX7[+$$0FV`>m]"1DP\Z
+%ls+PG$`;6RGN&1Oa?:ZQC=0^tdGkBU#_*1cdgdY%aJjI`#PR`1o7P$e;5Nd);BsU^O1tK$`"51F>dFplW>Ubsa;2mo*#os0"G/s@
+%F_0K-eVYN&[#?s2/,g5MBdK<?TZ5FEB3Kbe#W2q\<GU,?\cspPY]5Q,!p+6-RH.q]\LZAo8a90-L8)&fVtf#&5nX/=oTd>(lE0=H
+%=\h]QJ?i;+pG_T$M[DMD9MSX++aL>sW^*Wu>WgE?7644K6A$/MAm9]ll)AtL4dL.Ic6L%9]'="i;/Ri\6)\?t.`1\FF*Z!oFOeA@
+%1,t7kZ:)urm%r4%VfFe<\7D[0N]e't*G#k/Qa;@rmlV!X;bu<8A#EgX'"2n<VF`piUkHej!i&4J_H(l-3a@8a0dV/4%$$C@Au`pE
+%I#HI#**MG1`F:HuYp?Z/BsFNE9T;97hSa,LYSiN:UlgnbXuFgC]a=as,Ib6\72!Pf+PH%#l7&r]o(&pQ$YG#8g!HaM;IHCFj<SBk
+%lNJ%"U*:\39=,U@R1Rl'fJ&j!9:IF0.4,r2eVOc#]oi0^4hgebiD7l=%Ts)A<6<>6B>9.r`F:3Ie#6NC3lkETm'k=0]sVT\RqhnV
+%au-*=(K$oL-5pTk0@k"OF>?9Njk3#1Pi`ibeYYo:VFn&@^7]SH`'#B:R:%S@kfW3mTApZh#i+>.eOl_B"8\D2(@U_UTATP%QOb0D
+%h0a<jEcZPPEI@HXk$P!rrUN.iMiKZB\9[lFc.2'tf:2Yu+$VeHH$TDBjioNfrG_@TCAA,26XE$SfTW=.AK!aTPWf1LJu9V/0u1$h
+%[sRunRF/PrlSLi,1$kSERT8,+=trVET?3]$iA\79Xg]*P73o=:-H:a!(FK8M?*H=Ta[Z^oH[@@<]lD^qDeq&9Mk@Fnff*kS9SYH$
+%#9jM4Z1gW2NhVm.#NCZg37VIQ0Z_$_(58J_8"2k5+>+P*gn"bBK#BW?!/%*XFj@!!!,/4e9#;/C@o/ncMVKoh[OCLqe>+clHY[kY
+%:$oU(Sr5ujT7`/K2M8,N/=]"`9'R`O=:ltE%>'J]o,>m=]>7U<K^TKtb_S^s7!kB3<SJK*ZZT\2Jp0@HFHaRbC![>0g4t]d(.\_$
+%Y(li?88!--)'#2cEH/,D!V&1db(ph6pUKM*]AEdUk(O8t!21E=2N\H7'Ma17)5H_=Bh)QFfYr,2eNcX-6]fm+SU7"TO7-%XN@%q*
+%lH#<$0N3<GfNSDo1X\:aL.Pm,%rF0)5McgDVFa&X4)OQigUstsmra@S;oJKi`,+?qb26OQ;&@3r^\\%0glu2Upo\e;;qN9@>?V<o
+%mddeq'Fl@b"A"I5RHHi_b$%sp+(5Po(Xnb\$ODH54"f1)`50+48SZg24k,"H17:qXq\YF[2H[FdD"4P.etY:LLNaL/k`mofQ"pE#
+%!YNNhV!F9,lX>)W/M^]&Y^D@/SA+TXF9n(ZT%c^UE`<1&EA1HFYXrjCK[UL:lFNK/Ne@rL+GLFVLtkfu6UX>ROS)pV[To0j_snVq
+%"82@\Hiu5"`YS)@2+8!$WqF:E^4`DHm6G[&@]h`6QQ,2FDH'LnC4T2h\%cY]FGI%L\jqaoT_b#f\\kfKr[r'0EK)5F#5K%oFA8-P
+%GLK9+3qs@DN@hE,kfIV;S-Ce`D7[(uXkAE&`9FS*M09jrFGMO`72Sk*BI2pp;h(ifE#::\)DM`+VcD7<TFn(uPc./k1hBqD86QpZ
+%#18Rf6`>8K>8#/5BeGkqPQ'uO'euLaU=W*)eEhjGqJ8Pm;+IB1rjN=Kq&C;fW5K$r,7B@'T_tPKle)8\ph`3H/d<Qg<^sPdGk@GD
+%-*8XR#5H=jb#lf2d8mJ^GKdn8QLRq0`?E"1R2@=Y;H&,r8r56X#LZRKG+='sSF.3NWa[\`J>J'FV'*_Gc]`0A15JN$'!,I\j?0*%
+%'uS]BNIc@DUL4'-Z)\*@U"`U6YS#ScZF8k^(*S\uTk+]sVI'NG(0aal#W/@2JDOI)*J`+'NPdTN7^!#pQ]Yp=$puA%-C06,]d5/E
+%P;25$I>B0L<affm.(4c?U(`d<R?bYiVf<?q1_[9G/PQ>?^F5nq3l!&ZV'TRS&o;3NN8K-epN.Og$ur2r2pXcd!.dB@!QdBq"E[Ws
+%'$RN6<]=N+T3KMTK$Z9B3GY_80Ec2H?PDS&Xa3Lmdt;Jc'f7e:a#01%B"V\&W7kOR6lM@<qSd>Gh0*]#rR<Xi)BGm7gd^riGfih&
+%m:17;o>C/"gMnCT(ifW^LM3+jqkNN]$q:K#2o@I%QE8O=',7LN<Vi4_$9]<SKed>/%dCjWFciXmJ?^=O,9=]Ud0n;JOJ;$JlTt_6
+%Cp@GiW^8WS0ICLc$\?J*]M%k]LmE&7F\-EaL1R\q1s=F1*>4.DR#OAPB$It3FHJWl;i]^hAu2GlO;>p0##X-/MZdZf^ENr&67enF
+%N`+X3'9/,);%*Y]$J,Go@Su*\.2-o!ldpE?h:2&^J_&mLA)s:Za*\%oJa#!Z=.^rcYlWTmln38`9qaSbLVrA@-T5V\[QBo6dXrRr
+%h)V_<Z[hid(kW&kjDNOJBMB`2J/E\ua8o<F<jQ2V-e/:-2bfXMV$B'tD<LJmp;629B<fYZNlLB:\T@B1gZcXZ*.SHE'/@8DO&3*f
+%CD.".S_/=)Ja+DO2PJZh+N,.ud\fo1a\![p]t._ap,$Kq%a"MR4-usI/>U'@O[Ie(nU[`M)C07(\BK&'Xb;%/\69IS@n0j/2/RMs
+%4\E_mQ>NX!++.;nD4&f(*j?*$(c7^oBI0]VQR!uZ<t0-([(T!b+a.=*bOK#IqOfO`ggtaih`)=1;YlS&*_E)!>!b7(s4G+`[D(,m
+%nY9.ceKEpIM`rhIBXle!Ttttr+$<paV\<,niC,7l7aA$Y;uD[!A+N3*Of4^Bn&YU"]-\I//Y3qL22PU:HCpp2A=2T6i,Hdq-9"6u
+%bXkiU-MXZY)dZPnCAoNZ>d1+:!/G0'25duqY0Jh-o'NcEL/"4=IADp)Wbk^hUQhrqPktRs)i>U]&IkD.r"[2;7@id2XkKTHa;(?@
+%7t^6j0NmcEU(A_">&JDh,qIHr/JhF,bg'<X0$G5VE22#-<^MrYC?QKCdliX]9eruSo1$d/RRoVVSro:59JsYZMC;A@:nI%CDdeT:
+%P<io[4KVmd>7j^1.=0KP[t^>58EsY)F,K\[PCQu][h2@+;G8WfQ_d@FV#`_Xf.UE)`h55TKV2?Q[i/]PLp_lB/>Cm#f?2]jR$FXT
+%m=qHm*R.XL&K17XUTnO<&qW]>:n?mR%#3rFhb&e9rItY\&'=l<)K(4ajdAtMbm4nSG,_a_92QOZ=$!]1io#AtMd)bl:"?$0&N)KW
+%B`u.%XCJ"lcB;m66_k__oET6S>5S\u?ank9F5Qk=G'<&QG0e"sjbQ.!]&k*-^bV:n7]g.=+C/RuZfG&^BAh2>"")cNE3t[jLc,Oa
+%HSiVdWZd<:DTM$))'$"WZ>1A&Q"W);^ijed"/(9PJ_iTuU9;l$Tbmr1cko"[Voh";TLfVO6F5NLYsGB^f@&<074hOJhfFDm=3A?;
+%6i\Pon+B\`9;\D?#<;5bPg5q40Ni@oM>p!(L9:]V_2Q?djJD?Rqkh"DgI@Rl(q@U59G9QoZepaj+LTC`p/Vp1I;O6)qn'9&GV+BA
+%f/%'9*"o+0i/[-i3hF?)GM.QU0%?W+D("9Fl>M=.d.qGjZW*S:k[CP`g4d2-@1iQc)`/W'!0bN_;4P;:BmRgnd7iCFrN3u52dHt"
+%Kr2u6JX?k@E9]n2/c'`O$%X%EoB6@kRtIE4"2]79rPk!E*#j-8HZqi.6'3n#F:;Eug3XiD392dE(?8ZKS-;NVG6)q'aAlE>]<T/-
+%B!285[7omaf=29hEEs%F[[m'#gHqMs5CTkcI($_52D+=fO$D&UFT4"@gH>H6`HJuE*7+X17lHF2BF3m<EYN8Xqh5jqdNjbLk'THB
+%a,nk9Uf()/':u9@(^7(>)EM>3'NO7!iu1"(Ha%?ToKh*-dCks`)I#hYd7Cat#8"9Rf&<cO2rqu%4V,2):9o@/5&]ecNMMa?^b9!-
+%cBiW&*[t/]MB>U?4c:6-.-J%6fUQZ<M68.?a*&:Jc]4qEYfL.t]i?b)CcOXLK57:cTP+S3X'Nnd:lXXa"u'J:"1?cLgJ-=Vm/81j
+%rV;%MO^)1M<PDuA?-[2BFipt27%5q)I*<M\B)QCZ4/-o7Adid"&`o!(KaN`>Zg.^L(670"X.jSQ=l[)^"J)hh\OD/h1Rg-,4gmKK
+%A>R%%1'R9*6<@!.O-Ws*&uY.!.7f;4ao^j5TJ9)4?k.g)8!G(YN&@n"d-SbpBV;K0$Qtmt_Wh8-gGZ3plZ*JW`hpoe7BiY'eb^5B
+%VYrs"*B7ES#J4'd)@Z,b!h>Tm\A5W/AJC;NV=f.<A(ko0*o>Om7.#V$)X-%XOu9[8X"Mis!2B2'3nuZ36gNC-k(0F)%qP79dRb"l
+%W7OaM&k0&4ElWuPUQ1pg9i:Lj&6N3%EtNa'Lc01FiF?V4')`0Z[es:cHideUX/Jut46njeEKJIQY=*eelYG+^%B*dK)Z=MCoqOT/
+%Wgf;Bl%.a-TEXRJ^;Ytc+/5g!8ccbso9.'X,f[_QEc4G6;\4m_o.5oK3\]+6<Y`VWAhcmj1Pds$Y\8-<WOA!qq\ahalVfV+@`d's
+%ail6kh3oo9#h8omdJ!hK=>h\e0"#\Sl89f!0kCW-C7kh@0o<M_4n4;jfsk*\cU@a&YEp&$VFA7ff)<DeV6^6\s5r/CIso]ppJ9(@
+%:4I`hec0G]DC4KEdBh$"[]8&2EdVm)p%E.ll.*--eVC@)j[O]GG^O[XqXrD/Ms$ucg@XXkjk7PrY^(5pq:"$ec0!t:9g@E,4ho;R
+%GXkPWqX*h+D%B1dJ>PJNiO/Q>nG:?rSsg"ic"E@r0:pu\!.H1T$l2Q%5N1_`<l,5]5F\fR:\Z8ZHEjM.gAUj4q"f=.q!@e/[VI5&
+%<fR.*n\qgN[,T]@@/49D3SGPSK3JYc4`14FH$/_+oD-Z$eSQ9jJ,.Xbc/nccM9a_:j/\ZuPI%B6@hNLJ?B?G$4Vg8NIW9N+h<n>8
+%q)WnPI!'J_enm@d5J:m^e@,uq?+\RdWPS9!gUV`]EclYN[X#0lkh?EIF__VqBW#5%Xr^o?DZ=G<K\-4ST2"c%H2b;5DdUUjGYN*9
+%gV1=Hn8/![m.C/5LRSDElmGXbs6/o:J?8JLM28UtkU4,jBN`p8-aVd%hSSP+s.:!ZksQZ3eO)NgLlaQcY+,*f&"F(%^^.Zc%KAqZ
+%gcjr2)?@Lfq$=A-S6JY,I1;;Fne^P>U(c+(n%&2AH)"#.8_ZW_RrUH9D^&UEq>MP8*)']_F]/46fcKbrrTD!NrTAfs6+lO?2=[ES
+%qs3r;D"*GY4MUg?_`!372?UPgJ12U:s6.DX`FS[/HWPu65L_5%APRG7G!Yg*r^'i&P32-.]fc(SGpID%<5QK+)?fMEI+Mj_RGF\3
+%@Y`/YI580/S7G&c$6AI)R4Xo64I,J0ViDi%4U8WIT(7_m:$BSRh43:O`q6F1dk2e>6cLjV_r')_iZ<",:R:rDrGDD'80kNd^AZ4@
+%lOaW=AWL<dOF4[q.t<mk_+D3(b4$'dje^(+lc/_[GGAjUkY*W36KpE<K\*SBr*=4Z^>plC-dOik+;R-SJ49)M>UelJ-*I!M8^SXS
+%)r7RMd/%sDc0ALRgY[YPrpIA4a6rC^An6iUck8*0:e;kDg$LbX1,&'$/`!P(A&WCIY#)a6^E6*-hUMO.<?q$FOE!!Ya`Jc(S%I\l
+%UEO)Cn)Q"0D+MA6\lu>n%Ak(q+5426!r!0#qQ;d<T$&/ca"EQ2\ETW*)AiDm*WHq)kk*a*qKDb$pJ2]<fq_=AZIWuMmgb8L:I!%;
+%jSVSe;l'R\87T="olN.E>Ii$B^R!_Os5!A;gI5K+5.u9([nbY+8l0QrjPA(RU@6r<)ZB<saT'!*\DQF!)<H(knalS$pQN%1mt6CF
+%\[_S*Jq"t#jo%[sVpEEgnF3X1VbH6mLQ>2J:;>UgMhd(Sk:^N!rcEHU)X5"mY&eooOX<Eo:_$3:oD@@)9m;>UDdMtdj5]ISPM%`n
+%QeuUtIjjdsB:iLEA)];R`]fXEkb'i;n+c$'c\UKP+.GK2mX;=Mhm$YfllS.`ZHXJg?ToaKI-3I!0/&p14MBE,K_`N(3T\G.d\OP8
+%Oi90)'5`mrV>$QUgL^!?L6h6p9mLY9!k7tYYJf\Os5't1s7PR+0B^pCcSIY*p$qYXD=7GEp%FI(DD+2%p?W6#S1WuD2LKrVj7iAW
+%8(*BiZ.RsapN<auI-D]%7:2\+R7u&tg$/4iAlCo>`N6AC1(dK!*&a$i=V9R8Im3k#=?V-2hX5saj(s;@H7]f6-$_dI58kuNFC_>e
+%Bm&lb1%09s?[mO]HtB3grqO7_PF(o^q'E@L+23e3s7t"$X3:8#oR0688/.difDGF?FQ8ZK6#1pVIrTFTqI1AS-p#h\\!VjGp>j,h
+%V`/8#%eRDZpt9i=U@2H]r_jSB;Po]Nm"QKP7)F,Z5/2CB##aKAF:Lbg)YrEM6Y0)r*;Cn5qu"XOD`6t7PQ!/aOuk[LIYu[9^X0r[
+%GIH-g80P[)",bMG;?nnr5e)DlqpT5?^P2jRN6VEDM0sDmrHrtjrgZ)8k%Ep,q26cAf!b,BIZaf!aG8#%paUd;OfET5GA,Hnq<l2G
+%q^#["^]j`s&TXoX\N7F<3W&gSOW<ghMtt,c?iT`mla7?]d5V+"q!7lNN&J17M=FDFY,JfGgZrY=/ODZ#lMC)<jiuA*@lhp*q=MVM
+%S9D;'Hdp,hO\_Tt]tODj8>!LmCu6a7`4A^oO8$=fDgnP;rtciA&!*o42P32uIWkPCq]hDV1Z[GY/CAbZ\5*kH5U,2`-sb[[1U\8c
+%5NQ_J(9`5!g28hk:&<?#e]h:=p:oE:C$.VPMqdK6"/EugM%bdQ`NOF&Daa_/f+ItaQ<me@GQqkR@&Y/d(XKUlAX&JhA`o'AZg/Rt
+%CP_#%-_.s>2p.Y`&h+9brPn;SB&3-:\F)Bi='_GSl`LokgE4lRV1C1Am=b6LS<JH8q"j:N>Dd<DEcui:rRII(VNe]FYZAqE>\_lb
+%r+q<4'OSLsAFK*+nIpjtLY3LhH^A@)T3u2Ps2`X7H"8uh^DL&O`EM-TWUi-+pR*-Ph<%!0jF-0"E0Lt0ds7QSSbqX9nqGo3QJ,U<
+%bPfT=N5Jt-Y!D`+IX1T^m]o^(h-Spq*rYUc?h_;r]9#mXcg7^=QWHLfMTt\A2_lZa`S+V33'NaWdU!ocb*0G<q!0$#?!j4o?"$mG
+%k9lHkphRLPs69=<k4nfN[fF)8m,%_*?"Vt`Pj6)rH2N&N=T+>%YVO%skl29JI;SmJEoh3!HJ\T0aku'Tr2\QdDBM&9-O&HNN!.Jl
+%d^1[KBDV5R(3_4dIjY$@LDqY9^I@GdTS*+$PO7MSjiq_aoP_eBh+?ZlSo:fmc^o"Qq#-LIE?H)mc2a@[ZB+7#l7Z#FT_pSRUFs;%
+%cp)V60Ld')b]+b]o56YNGdgc5TBgZFDq9&\<;edQlB`%A!MNa1?MmT6f(_ZRePD3DY"gWg:/<d?SUU5H+fi?K1OF$CoJCoMQWG!X
+%X6Z<rd-]Go7RQoTp,i&nE'mjpj_[9ommtF-4j@t(hE;>BO*pmk5PuTNfTRf(^R\s0iL`@5l@2!eIf1ph51aoJWbHh4-[JP#n*A&E
+%5L3JL0QA2*?GAH]ra(&$@i+d`D#&10DHX18gNpP'lXerks6oZH/&0T!q^q=5(TCKK]Qu=2ouYBicd%!1Ylb4U_5gDkPqh+oESkI=
+%_,"J`paL7=/-;luESD3qlh8?F)UiC[s*Wk5kL4qYj*H&>E&#\j6gfE6J(QOeH\_Tnq&o]WI5;uBq:Y$.LUq-O:&$ph2_X#q,k'a@
+%G7\O!SFScZ.fOc,`Vh<K\t;^Sl;s>0;8h&MZX99Q]lWf2ceW-?fB4mF[F=.G5.;U]d.@36=+Bgb]oPLH7)CdcJ!=c<pI4<FN3.6+
+%DlgPa"X['2GnMffTd8M7"m/=g]i9R1F=A]L1JQ$k0PH@[Fp&!A$O]2ll-;fn-HF946)MB/-D/5?m9M[sITh=!'BTi:GA1a;>O]h*
+%ZdT:#*q=L0Msu>?hLjf^H?PY;M"hnN#e/P.nN&,4\!ePu@s.H'lfoLIa3RPa:;?Yj:2hN9#@$$pF>ETVJ5n!/_"4ti*)CAMoXjM\
+%2sZU-g[$$3/q0uFT-YcD>mUfm]]4p6kB"f1`T$&r]R<PiI!Kf-?L>?.)IdB\4:_?JI*[#*T(\@Tnde4,XJ\Z.JShAA-gCTCMYo6J
+%l8RIePNT\[[%<mh#el&FjkY__Lr&5tRJ8B_heoXSmu-@7GR!W`e+_VBqJBmD[^1G;=a.NbhCC2F\%D$5.:JSC\7*b7s)\&0o<[\r
+%hsuSPOa0@`Go6='j19C0be?JE+#Q3L$C+CG7[M<\6*(;?(<KDH5@TeocQ3A/RMZS=Q!7E96($'n()Vj7&MV,OmJl%U]UCb?d;S%@
+%QR]/qJc*.[jSQ"<o@%@(+)^qj'D^h#dR_-?%),f6=L!7pQ$,Nf""T@^1Gn]SGEgEDQJ_IA9[XH8aT"-FO'eL7r-'fQ5<h;\ERoe_
+%#QLbX/oQ6Qdgtri,Zekq*TOGOJ%U%"W"mj0F`kDGa(O.rS#u>Fa]J$7qWIj-I5_''qW@(1B&LF<@D97Ki@`2I:1b`_s0q0hKOEHR
+%N-?`T*bMMb.fZ6ShedQ7Eo::7]77rBq>4n#0*D50/:T)mOFBV7Sko?NFH+&aTCt,'rQ$)9XQ88UV!1;Dqt*BoQo-)Y)c"aGZV1dK
+%`t,#bV-u',JbTE<lQNe,s7pEA^"=>(CRo\;J8;+0qhCu#l[,OpfDFEu@@HlX+Dfi=HY=:%f>345.I6bL411a7qkR`A;\r)B7m5A1
+%'D7Q=NTIseB[bE+W(jVYl*2j]rRn>fBNtXZp#0;e/==FQYDt9MhI92kM]C?LCos\#Mkpp,[C4)fMZ%Smom0hPlKE'3\R)M"lT\/u
+%Vp>nf0\Wm+B8=I=>&3Qp-iZ5LF3Au&o?"E64D3+rd9(b.Qsa^TSXp&>-Ma<X?i$OI:5UIge_)SB3f4]*S*eM(CM8jmgTp,S>(ef_
+%[`j6YSt49B`'44s\upP=0BDu=Z_cu;X^Smog3sR;!pR/jpfoW[Qc46p^]"+cgMT3Ec>7O;^Ol"$B=_DuI^@k%D&sd+D*IsoQ-ABM
+%4"cuYn4Eo9DU/UO=:r%6R^MNQo^_!fqoU$rCIV+"+FSS6e_0ZWm#p?F?:,7[nJ!d+,A"H%bn%u%rbOW@?h=*H"3c@W%8->AZ$ebF
+%I=#Sq`l1gl:C%W6GOU["j0)gr(O^X>nDnRf85/DqZT>omPNFSu\aHk/L%faiOh0-h);\Sp9&A<Ra`)0dflM'LFl(.AmC&_FRfufp
+%0C>>-qqetV_S$0;FO*Q%hcg1NheV=kep<r^dT`%k(F.;!Y:a1rq"WhjQY&mRRd?h4?X$./r4%kZ-L0"C[ihtJknPcDAjl+f]tN^>
+%[.7:ZjCW%mq9?Rgns.Z,b;6?n&o5/G"k,,S&G+4D\;.[uc[TNmf2&dJm+WoanU5M)o(%1>9R_)2F$.jbHjBf0D!8pm%IJ@H%QVS2
+%`kI;OB"CohFa8B-CiaWBG'Pr:M!7RjX4M,DrL*l[lSe`WdL<O#%Oop+D*up1=#TICnB/aV+8ju=g)tJHV@1qnoo%k2mD[3Adi2)T
+%D(J*DG@0'hRp*NcIPItbp$):q1VSKUS(MPTeEYML2_SK4JnYiMgT/eQEm%$JZ#d<9jR_`3:U\a/Gf:nUV[8[IApZgal/,hhT:Ohd
+%^H("s]00pC+Pm%ZdDs_\HFb%kN3E8+rmg_qUU.9k?!c;ks(2*+Xc5Ppq:0SaF4806f#OS+)sk<$T2GV-H`,\+GNHrsjZcMd[]a@*
+%WEUar=&&][]f<R8U=8)qX,g]\n?80;oA@kpo&=\2q<dn@"atN_du.pYSA2SHk3MVR"5,X-q=`t4MeNi0fJNV:a*Tjg^uFtah*b]n
+%rD@NUr;H>hh>M>T'B&/_h*WO.3"tsud`Citl](p`F*,6.Sj_1.#.-8m>4Lh:W>ujI5&=O&P*EFGoZ,EREF%%O_f.:<6f&5]3>c3J
+%K^G[RV0r.,]ap\uiP/[CN%/aJ;rr41b':YqpNmuEr:9+:q=aZgg[@><4?pQ)o(aY/2q,Gi&[i_Zs1nMa<*e?Cr<L+8>$Mg7hp['1
+%j[L"eB_:0u04fV(^O>q@ZgV6`Vk&,)0:V\08_e2B2!1]sZpS1?0rr(\TDs3*K1OUn0;]'Uij"G`HN.E#F.g#BNCn_;T)KT@nar'<
+%5*jk-dm%jDoJtD"hpaJWs8Q9V5!<C*?[eSq2m)A[J%0e#^H@3Gkmm@c9iC9@(\[IL:Rb40f\HLGo>TUQbEg%sYD$%p&k;OO=7-"-
+%5P2WV4;cmY]_M(?qVmqRnlXtlFc?<B?[V?1?TdJ'i!.L\%YT6"HLJQBU$qY<*Y_u@S%a.EK3oV<K+_\R(V@NFf7!88S%lL/hpnKY
+%f<h(V@JULE3f&GBE]tqopPugX%*Q/k:;'SfHBt4f0J2;p3>u3kNeZ/OUJ$aEeop18:*5[\4T&*SWLnqF@.4E+nr?f2]%OG3O701R
+%K?RksjQRN!T#I0lj[WCMa(GoH^7!K.P=[#1#BbhIrq@NTKMZG3O%6Kf:%.jgalK3m%j)h:[]iNNXYY!IF1o9`p2ml:mX"MJk4JZ1
+%55jj3UUPL<n];(BmesrI4\_(sq<=C=C&6V?oU;ELY-Zoq8N'@*`-@B!(ob+n9VRuf4"79J2_WK9PEn(3pU6l&n[r0-INk=&E6$]u
+%gnY/X@J9=2=UE-3+)a?:R):MTbaZp2O.X,FRFYQ2-(UjhDa*u1'>/PJJZg]mSA@@0[p(-Vm`G"NgS\,nPJ0*&eCW<mhbk`^`T>A7
+%c1]-K/%X;.Xg[WZqYB5s7%oD&!PV6Vq=3.k9D8$`?@=iI@InI'q"a0n`+&?21gSl9h4C;(p%.3VPC/gfe_?N5df&@hoBCBrbMfmq
+%0B<apbBs9ead7L3U[o6j2rDB[A4+3-Y8Y:b9uUrYcKKEbp9U0olVIP&mt:W^[52FU~>
+%AI9_PrivateDataEnd
-- 
cgit v1.2.1


From 8a6d35ff43e3da0818bff23843359d19e341b436 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Mar 2004 21:19:26 +0000
Subject: oops, wrong logo

---
 conf/logo.eps | 5681 +++++++++++++--------------------------------------------
 1 file changed, 1267 insertions(+), 4414 deletions(-)

diff --git a/conf/logo.eps b/conf/logo.eps
index ee348e182..8eb14e82e 100644
--- a/conf/logo.eps
+++ b/conf/logo.eps
@@ -1,4414 +1,1267 @@
-%!PS-Adobe-3.1 EPSF-3.0
-%%Title: qis_logo.eps
-%%Creator: Adobe Illustrator(R) 9.0
-%%AI8_CreatorVersion: 9.0
%AI9_PrintingDataBegin
%%For: Home User
-%%CreationDate: 11/28/2003
-%%CropBox: 0.000000 0.000000 243.005371 50.068359
-%%BoundingBox: 0 0 244 51 
-%%HiResBoundingBox: 0.000000 0.000000 243.005371 50.068359
-%%LanguageLevel: 2 
-%%DocumentData: Clean7Bit
-%%Pages: 1 
-%%DocumentNeededResources: 
-%%DocumentSuppliedResources: procset Adobe_CoolType_Core 1.1 0
-%%+ procset Adobe_AGM_Core 2.0 0
-%%DocumentFonts: 
-%%DocumentSuppliedFonts: 
-%%PageOrder: Ascend
-%%DocumentProcessColors:  Black
-%%DocumentCustomColors: 
-%%CMYKCustomColor: 
-%%RGBCustomColor: 
-
-%%EndComments
-%%BeginDefaults
-%%EndDefaults
-%%BeginProlog
-%%BeginResource: procset Adobe_AGM_Core 2.0 0
-%%Version: 2.0 0
-%%Copyright: Copyright (C) 1997-1999 Adobe Systems, Inc.  All Rights Reserved.
-systemdict /setpacking known
-{
-	currentpacking
-	true setpacking
-} if
-userdict /Adobe_AGM_Core 233 dict dup begin put
-/nd{
-	null def
-}bind def
-/Adobe_AGM_Core_Id /Adobe_AGM_Core_2.0_0 def
-/AGMCORE_str256 256 string def
-/AGMCORE_src256 256 string def
-/AGMCORE_dst64 64 string def
-/AGMCORE_srcLen nd
-/AGMCORE_save nd
-/AGMCORE_graphicsave nd
-/AGMCORE_imagestring0 nd
-/AGMCORE_imagestring1 nd
-/AGMCORE_imagestring2 nd
-/AGMCORE_imagestring3 nd
-/AGMCORE_imagestring4 nd
-/AGMCORE_imagestring5 nd
-/AGMCORE_c 0 def
-/AGMCORE_m 0 def
-/AGMCORE_y 0 def
-/AGMCORE_k 0 def
-/AGMCORE_mbuf () def
-/AGMCORE_ybuf () def
-/AGMCORE_kbuf () def
-/AGMCORE_gbuf () def
-/AGMCORE_bbuf () def
-/AGMCORE_cmykbuf 4 array def
-/AGMCORE_screen [currentscreen] cvx def
-/AGMCORE_tmp 0 def
-/AGMCORE_arg1 nd
-/AGMCORE_arg2 nd
-/AGMCORE_&setgray nd
-/AGMCORE_&image nd
-/AGMCORE_&colorimage nd
-/AGMCORE_&imagemask nd
-/AGMCORE_&setcolor nd
-/AGMCORE_&setcolorspace nd
-/AGMCORE_&&setcolorspace nd
-/AGMCORE_cyan_plate nd
-/AGMCORE_magenta_plate nd
-/AGMCORE_yellow_plate nd
-/AGMCORE_black_plate nd
-/AGMCORE_plate_ndx nd
-/AGMCORE_get_ink_data nd
-/AGMCORE_is_cmyk_sep nd
-/AGMCORE_in_rip_sep nd
-/AGMCORE_host_sep nd
-/AGMCORE_will_host_sep nd
-/AGMCORE_avoid_L2_sep_space nd
-/AGMCORE_composite_job nd
-/AGMCORE_producing_seps nd
-/AGMCORE_ccimage_exists nd
-/AGMCORE_ps_level -1 def
-/AGMCORE_ps_version -1 def
-/AGMCORE_environ_ok nd
-/AGMCORE_CSA_cache 0 dict def
-/AGMCORE_CSD_cache 0 dict def
-/AGMCORE_pattern_cache 0 dict def
-/AGMCORE_currentoverprint false def
-/AGMCORE_deltaX nd
-/AGMCORE_deltaY nd
-/AGMCORE_name nd
-/AGMCORE_sep_special nd
-/AGMCORE_ndx nd
-/AGMCORE_err_strings nd
-/AGMCORE_cur_err nd
-/AGMCORE_ovp nd
-/AGMCORE_CRD_cache where{
-	pop
-}{
-	/AGMCORE_CRD_cache 0 dict def
-}ifelse
-/bdf
-{
-	bind def
-} bind def
-/xdf
-{
-	exch def
-} def
-/ldf 
-{
-	load def
-} def
-/ddf
-{
-	put
-} def	
-/xddf
-{
-	3 -1 roll put
-} def	
-/xpt
-{
-	exch put
-} def
-	/bdict
-	{
-		mark
-	} def
-	
-	/edict
-	{
-		counttomark 2 idiv dup dict begin {def} repeat pop currentdict end
-	}def
-	
-/ps_level
-	/languagelevel where{
-		pop languagelevel
-	}{
-		1
-	}ifelse
-def
-/level2 
-	ps_level 2 ge
-def
-/level3 
-	ps_level 3 ge
-def
-/ps_version
-	{version cvr} stopped {
-		-1
-	}if
-def
-/ndf
-{
-	1 index where{
-		pop pop pop
-	}{
-		dup xcheck
-		{bind}if
-		def
-	}ifelse
-} def
-/skip_image
-{
-	has_color ne{
-		dup 256 idiv
-		{currentfile AGMCORE_str256 readstring pop pop}repeat
-		currentfile AGMCORE_str256 0 4 -1 roll 256 mod getinterval
-		readstring pop pop
-	}{
-		pop
-	}ifelse
-} def
-/addprocs
-{
-     2{/exec load}repeat
-     3 1 roll
-     [ 5 1 roll ] bind cvx
-} def
-/colorbuf
-{
-	0 1 2 index length 1 sub
-		{
-		dup 2 index exch get 
-		255 exch sub 
-		2 index 
-		3 1 roll 
-		put
-		} for
-} def
-/makereadonlyarray
-{
-	/packedarray where
-		{pop packedarray}
-		{array astore readonly}
-	ifelse
-} def
-/getspotfunction
-{
-	AGMCORE_screen exch pop exch pop
-	dup type /dicttype eq 
-	{
-		dup /HalftoneType get 1 eq
-			{
-			/SpotFunction get
-			}
-			{
-			dup /HalftoneType get 2 eq
-				{
-				/GraySpotFunction get
-				}
-				{
-				pop
-				{abs exch abs 2 copy add 1 gt {1 sub dup mul exch 1 sub dup mul add 1 sub}
-				{dup mul exch dup mul add 1 exch sub}ifelse}bind
-				}
-			ifelse
-			}
-		ifelse
-	}
-	if
-} def
-/clp_npth
-{
-	clip newpath
-} def
-/eoclp_npth
-{
-	eoclip newpath
-} def
-/stkpath_clp_npth
-{
-	strokepath clip newpath
-} def
-/stk_n_clp_npth
-{
-	gsave stroke grestore clip newpath
-} def
-/npth_clp
-{
-	newpath clip
-} def
-/graphic_setup
-{
-	/AGMCORE_graphicsave save def
-	concat
-	0 setgray
-	0 setlinecap
-	0 setlinejoin
-	1 setlinewidth
-	[] 0 setdash
-	10 setmiterlimit
-	newpath
-	false setoverprint
-	false setstrokeadjust
-	userdict begin
-	/showpage {} def
-	mark
-} def
-/graphic_cleanup
-{
-	cleartomark
-	end
-	AGMCORE_graphicsave restore
-} def
-/compose_error_msg
-{
-	grestoreall initgraphics	
-	/Helvetica findfont 10 scalefont setfont
-	
-	/AGMCORE_deltaY 100 def
-	/AGMCORE_deltaX 310 def
-			
-	/AGMCORE_arg2 xdf
-	/AGMCORE_arg1 xdf
-	
-	clippath pathbbox newpath pop pop 36 add exch 36 add exch moveto
-	0 AGMCORE_deltaY rlineto AGMCORE_deltaX 0 rlineto
-	0 AGMCORE_deltaY neg rlineto AGMCORE_deltaX neg 0 rlineto closepath
-	0 AGMCORE_&setgray
-	gsave 1 AGMCORE_&setgray fill grestore 
-	1 setlinewidth gsave stroke grestore
-		
-	currentpoint AGMCORE_deltaY 15 sub add exch 8 add exch moveto
-	
-	/AGMCORE_deltaY 12 def
-	/AGMCORE_tmp 0 def
-	AGMCORE_err_strings exch get
-		{
-		dup 32 eq
-			{
-			pop
-			AGMCORE_str256 0 AGMCORE_tmp getinterval
-			dup (.) ne AGMCORE_arg1 0 lt and
-				{
-				pop
-				}
-				{
-				stringwidth pop currentpoint pop add AGMCORE_deltaX 28 add gt
-					{
-					currentpoint AGMCORE_deltaY sub exch pop
-					clippath pathbbox pop pop pop 44 add exch moveto
-					} if
-				AGMCORE_str256 0 AGMCORE_tmp getinterval show ( ) show
-				} ifelse
-			
-			0 1 AGMCORE_str256 length 1 sub
-				{
-				AGMCORE_str256 exch 0 put
-				}for
-			/AGMCORE_tmp 0 def
-			}
-			{
-			dup 94 eq 
-				{
-				pop
-				AGMCORE_arg1 0 ge
-					{
-					AGMCORE_arg1 AGMCORE_str256 cvs
-					dup /AGMCORE_tmp exch length def
-					AGMCORE_str256 exch 0 exch putinterval
-					AGMCORE_str256 0 AGMCORE_tmp getinterval
-					stringwidth pop currentpoint pop add AGMCORE_deltaX 28 add gt
-						{
-						currentpoint AGMCORE_deltaY sub exch pop
-						clippath pathbbox pop pop pop 44 add exch moveto
-						} if
-					AGMCORE_str256 0 AGMCORE_tmp getinterval show
-					}
-					{
-					/AGMCORE_arg1 0 def
-					} ifelse
-				0 1 AGMCORE_str256 length 1 sub
-					{
-					AGMCORE_str256 exch 0 put
-					}for
-				/AGMCORE_tmp 0 def
-				AGMCORE_arg1 0 ne
-					{
-					/AGMCORE_arg1 AGMCORE_arg2 def
-					} if
-				}
-				{
-				AGMCORE_str256 exch AGMCORE_tmp exch put
-				/AGMCORE_tmp AGMCORE_tmp 1 add def
-				}ifelse
-			} ifelse
-		} forall
-} bdf
-level2{
-	/AGMCORE_map_reserved_ink_name
-	{
-		dup type /stringtype eq{
-			dup /Red eq{
-				pop (_Red_)
-			}{
-				dup /Green eq{
-					pop (_Green_)
-				}{
-					dup /Blue eq{
-						pop (_Blue_)
-					}{
-						dup /Cyan eq{
-							pop (_Cyan_)
-						}{
-							dup /Magenta eq{
-								pop (_Magenta_)
-							}{
-								dup /Yellow eq{
-									pop (_Yellow_)
-								}{
-									dup /Black eq{
-										pop (_Black_)
-									}{
-										dup / eq{
-											pop (Process)
-										}if
-									}ifelse
-								}ifelse
-							}ifelse
-						}ifelse
-					}ifelse
-				}ifelse
-			}ifelse
-		}if
-	}def
-}if
-/doc_setup{
-	Adobe_AGM_Core begin
-	
-	/AGMCORE_will_host_separate xdf
-	/AGMCORE_ps_version xdf
-	/AGMCORE_ps_level xdf
-	
-	errordict /AGM_handleerror known not
-		{
-		errordict /AGM_handleerror errordict /handleerror get put
-		errordict /handleerror
-			{
-			Adobe_AGM_Core begin
-			$error /newerror get AGMCORE_cur_err null ne and {
-				$error /newerror false put
-				AGMCORE_cur_err /AGMCORE_bad_environ eq
-					{
-					/AGMCORE_bad_environ AGMCORE_ps_level AGMCORE_ps_version
-					}
-					{
-					AGMCORE_cur_err 0 0
-					} ifelse
-				compose_error_msg
-				} if
-			$error /newerror true put
-			end
-			errordict /AGM_handleerror get exec
-			} bind put
-		}if
-	/AGMCORE_environ_ok 
-		ps_level AGMCORE_ps_level ge
-		ps_version AGMCORE_ps_version ge and 
-		AGMCORE_ps_level -1 eq or
-	def
-	
-	AGMCORE_environ_ok not
-		{/AGMCORE_cur_err /AGMCORE_bad_environ def} if
-	
-	/AGMCORE_&setgray systemdict/setgray get def
-	level2{
-		/AGMCORE_&setcolor systemdict/setcolor get def
-		/AGMCORE_&setcolorspace systemdict/setcolorspace get def
-		/AGMCORE_&&setcolorspace /setcolorspace ldf
-	}if
-	/AGMCORE_&image systemdict/image get def
-	/AGMCORE_&imagemask systemdict/imagemask get def
-	/colorimage where{
-		pop
-		/AGMCORE_&colorimage /colorimage ldf
-	}if
-	/AGMCORE_in_rip_sep
-		level2{
-			currentpagedevice/Separations 2 copy known{
-				get
-			}{
-				pop pop false
-			}ifelse
-		}{
-			false
-		}ifelse
-	def
-	level2 not{
-		/xput{
-			dup load dup length exch maxlength eq{
-				dup dup load dup
-				length dup 0 eq {pop 1} if 2 mul dict copy def
-			}if
-			load begin
-				def
- 			end
-		}def
-	}{
-		/xput{
-			load 3 1 roll put
-		}def
-	}ifelse
-	/AGMCORE_gstate_known{
-		where{
-			/Adobe_AGM_Core_Id known
-		}{
-			false
-		}ifelse
-	}ndf
-	/AGMCORE_GSTATE AGMCORE_gstate_known not{
-		/AGMCORE_GSTATE 21 dict def
-		/AGMCORE_tmpmatrix matrix def
-		/AGMCORE_gstack 32 array def
-		/AGMCORE_gstackptr 0 def
-		/AGMCORE_gstacksaveptr 0 def
-		/AGMCORE_gstackframekeys 7 def
-		/AGMCORE_&gsave /gsave ldf
-		/AGMCORE_&grestore /grestore ldf
-		/AGMCORE_&grestoreall /grestoreall ldf
-		/AGMCORE_&save /save ldf
-		/AGMCORE_gdictcopy {
-			begin
-			{ def } forall
-			end
-		}def
-		/AGMCORE_gput {
-			AGMCORE_gstack AGMCORE_gstackptr get
-			3 1 roll
-			put
-		}def
-		/AGMCORE_gget {
-			AGMCORE_gstack AGMCORE_gstackptr get
-			exch
-			get
-		}def
-		/gsave {
-			AGMCORE_&gsave
-			AGMCORE_gstack AGMCORE_gstackptr get
-			AGMCORE_gstackptr 1 add
-			dup 32 ge {limitcheck} if
-			Adobe_AGM_Core exch
-			/AGMCORE_gstackptr exch put
-			AGMCORE_gstack AGMCORE_gstackptr get
-			AGMCORE_gdictcopy
-		}def
-		/grestore {
-			AGMCORE_&grestore
-			AGMCORE_gstackptr 1 sub
-			dup AGMCORE_gstacksaveptr lt {1 add} if
-			Adobe_AGM_Core exch
-			/AGMCORE_gstackptr exch put
-		}def
-		/grestoreall {
-			AGMCORE_&grestoreall
-			Adobe_AGM_Core
-			/AGMCORE_gstackptr AGMCORE_gstacksaveptr put 
-		}def
-		/save {
-			AGMCORE_&save
-			AGMCORE_gstack AGMCORE_gstackptr get
-			AGMCORE_gstackptr 1 add
-			dup 32 ge {limitcheck} if
-			Adobe_AGM_Core begin
-				/AGMCORE_gstackptr exch def
-				/AGMCORE_gstacksaveptr AGMCORE_gstackptr def
-			end
-			AGMCORE_gstack AGMCORE_gstackptr get
-			AGMCORE_gdictcopy
-		}def
-		0 1 AGMCORE_gstack length 1 sub {
-				AGMCORE_gstack exch AGMCORE_gstackframekeys dict put
-		} for
-	}if
-	/currentcmykcolor [0 0 0 0] AGMCORE_gput
-	/currentstrokeadjust false AGMCORE_gput
-	/currentcolorspace [/DeviceGray] AGMCORE_gput
-	/sep_tint 0 AGMCORE_gput
-	/sep_colorspace_dict null AGMCORE_gput
-	/indexed_colorspace_dict null AGMCORE_gput
-	/currentcolor_intent () AGMCORE_gput
-	end
-}def
-/page_setup
-{
-	Adobe_AGM_Core begin
-	/setcmykcolor
-	{
-		4 copy AGMCORE_cmykbuf astore /currentcmykcolor exch AGMCORE_gput
-		1 sub 4 1 roll
-		3 {
-			3 index add neg dup 0 lt {
-				pop 0
-			} if
-			3 1 roll
-		} repeat
-		setrgbcolor pop
-	}ndf
-	/AGMCORE_ccimage_exists /customcolorimage where {pop true}{false} ifelse def
-	/currentcmykcolor
-	{
-		/currentcmykcolor AGMCORE_gget aload pop
-	}ndf
-	/setoverprint
-	{
-		pop
-	}ndf
-	/currentoverprint
-	{
-		false
-	}ndf
-	/AGMCORE_deviceDPI 72 0 matrix defaultmatrix dtransform dup mul exch dup mul add sqrt def
-	/AGMCORE_cyan_plate 1 0 0 0 test_cmyk_color_plate def
-	/AGMCORE_magenta_plate 0 1 0 0 test_cmyk_color_plate def
-	/AGMCORE_yellow_plate 0 0 1 0 test_cmyk_color_plate def
-	/AGMCORE_black_plate 0 0 0 1 test_cmyk_color_plate def
-	/AGMCORE_plate_ndx 
-		AGMCORE_cyan_plate{ 
-			0
-		}{
-			AGMCORE_magenta_plate{
-				1
-			}{
-				AGMCORE_yellow_plate{
-					2
-				}{
-					AGMCORE_black_plate{
-						3
-					}{
-						4
-					}ifelse
-				}ifelse
-			}ifelse
-		}ifelse
-		def
-	/AGMCORE_composite_job
-		AGMCORE_cyan_plate AGMCORE_magenta_plate and AGMCORE_yellow_plate and AGMCORE_black_plate and def
-	
-	/AGMCORE_producing_seps AGMCORE_composite_job not AGMCORE_in_rip_sep or def
-	
-	/AGMCORE_host_sep AGMCORE_producing_seps AGMCORE_in_rip_sep not and def
-	
-	/AGM_preserve_spots 
-		/AGM_preserve_spots where{
-			pop AGM_preserve_spots
-		}{
-			systemdict/setdistillerparams known product (Adobe PostScript Parser) ne and AGMCORE_producing_seps or
-		}ifelse
-	def
-	
-	AGMCORE_host_sep AGMCORE_will_host_separate not and {
-		/AGMCORE_cur_err /AGMCORE_color_space_onhost_seps def
-		AGMCORE_color_space_onhost_seps
-	}if
-	/AGMCORE_avoid_L2_sep_space  
-		version cvr 2012 lt 
-		level2 and 
-		AGMCORE_producing_seps not and
-	def
-	/AGMCORE_is_cmyk_sep
-		AGMCORE_cyan_plate AGMCORE_magenta_plate or AGMCORE_yellow_plate or AGMCORE_black_plate or
-	def
-	/AGM_avoid_0_cmyk where{
-		pop AGM_avoid_0_cmyk
-	}{
-		AGM_preserve_spots
-	}ifelse
-	{
-		/setcmykcolor[
-			{4 copy add add add 0 eq currentoverprint and{pop 0.0005}if}/exec cvx
-			/setcmykcolor load dup type/operatortype ne{/exec cvx}if
-		]cvx def
-	}if
-	AGMCORE_host_sep{
-		/AGMCORE_get_ink_data
-			AGMCORE_cyan_plate{
-				{pop pop pop}
-			}{
-			  	AGMCORE_magenta_plate{
-			  		{4 3 roll pop pop pop}
-			  	}{
-			  		AGMCORE_yellow_plate{
-			  			{4 2 roll pop pop pop}
-			  		}{
-			  			{4 1 roll pop pop pop}
-			  		}ifelse
-			  	}ifelse
-			}ifelse
-		def
-	}if
-	AGMCORE_in_rip_sep{
-		/setcustomcolor
-		{
-			exch aload pop
-			dup 7 1 roll inRip_spot_has_ink not	{ 
-				4 {4 index mul 4 1 roll}
-				repeat
-				/DeviceCMYK setcolorspace
-				6 -2 roll pop pop
-			}{ 
-				Adobe_AGM_Core begin
-					/AGMCORE_k xdf /AGMCORE_y xdf /AGMCORE_m xdf /AGMCORE_c xdf
-				end
-				[/Separation 4 -1 roll /DeviceCMYK
-				{dup AGMCORE_c mul exch dup AGMCORE_m mul exch dup AGMCORE_y mul exch AGMCORE_k mul}
-				]
-				setcolorspace
-			}ifelse
-			setcolor
-		}ndf
-		/setseparationgray
-		{
-			[/Separation (All) /DeviceGray {}] setcolorspace_opt
-			1 exch sub setcolor
-		}ndf
-	}{
-		/setseparationgray
-		{
-			AGMCORE_&setgray
-		}ndf
-	}ifelse
-	/findcmykcustomcolor
-	{
-		5 makereadonlyarray
-	}ndf
-	/setcustomcolor
-	{
-		exch aload pop pop
-		4 {4 index mul 4 1 roll} repeat
-		setcmykcolor pop
-	}ndf
-	
-	/has_color
-		/colorimage where{
-			AGMCORE_producing_seps{
-				pop true
-			}{
-				systemdict eq
-			}ifelse
-		}{
-			false
-		}ifelse
-	def
-	
-	/map_index
-	{
-		1 index mul exch getinterval {255 div} forall
-	}def
-	
-	level2{
-		/mo /moveto ldf
-		/ln /lineto ldf
-		/cv /curveto ldf
-		/knockout_unitsq
-		{
-			1 setgray
-			0 0 1 1 rectfill
-		}def
-		/level2ScreenFreq{
-			begin
-			60
-			HalftoneType 1 eq{
-				pop Frequency
-			}if
-			HalftoneType 2 eq{
-				pop GrayFrequency
-			}if
-			HalftoneType 5 eq{
-				pop Default level2ScreenFreq
-			}if
-			 end
-		}def
-		/currentScreenFreq{
-			currenthalftone level2ScreenFreq
-		}def
-		/invert_image_samples
-		{
-			Adobe_AGM_Core/AGMCORE_tmp Decode length ddf
-			/Decode [ Decode 1 get Decode 0 get] def
-		}def
-		/knockout_image_samples
-		{
-			Operator/imagemask ne{
-				/Decode [1 1] def
-			}if
-		}def
-		/get_gstate
-		{
-			AGMCORE_GSTATE begin
-			/AGMCORE_GSTATE_ctm AGMCORE_tmpmatrix currentmatrix def
-			/AGMCORE_GSTATE_clr_spc currentcolorspace def
-			/AGMCORE_GSTATE_clr_indx 0 def
-			/AGMCORE_GSTATE_clr_comps 12 array def
-			mark currentcolor counttomark
-				{AGMCORE_GSTATE_clr_comps AGMCORE_GSTATE_clr_indx 3 -1 roll put
-				/AGMCORE_GSTATE_clr_indx AGMCORE_GSTATE_clr_indx 1 add def} repeat pop
-			/AGMCORE_GSTATE_fnt rootfont def
-			/AGMCORE_GSTATE_lw currentlinewidth def
-			/AGMCORE_GSTATE_lc currentlinecap def
-			/AGMCORE_GSTATE_lj currentlinejoin def
-			/AGMCORE_GSTATE_ml currentmiterlimit def
-			currentdash /AGMCORE_GSTATE_do xdf /AGMCORE_GSTATE_da xdf
-			/AGMCORE_GSTATE_sa currentstrokeadjust def
-			
-			/AGMCORE_GSTATE_clr_rnd currentcolorrendering def
-			/AGMCORE_GSTATE_op currentoverprint def
-			/AGMCORE_GSTATE_bg currentblackgeneration cvlit def
-			/AGMCORE_GSTATE_ucr currentundercolorremoval cvlit def
-			currentcolortransfer 
-				cvlit /AGMCORE_GSTATE_gy_xfer xdf 
-				cvlit /AGMCORE_GSTATE_b_xfer xdf
-				cvlit /AGMCORE_GSTATE_g_xfer xdf 
-				cvlit /AGMCORE_GSTATE_r_xfer xdf
-			/AGMCORE_GSTATE_ht currenthalftone def
-			/AGMCORE_GSTATE_flt currentflat def
-			end
-		}ndf
-		
-		/set_gstate
-		{
-			AGMCORE_GSTATE begin
-			AGMCORE_GSTATE_ctm setmatrix
-			AGMCORE_GSTATE_clr_spc setcolorspace
-			AGMCORE_GSTATE_clr_indx {AGMCORE_GSTATE_clr_comps AGMCORE_GSTATE_clr_indx 1 sub get
-			/AGMCORE_GSTATE_clr_indx AGMCORE_GSTATE_clr_indx 1 sub def} repeat setcolor
-			AGMCORE_GSTATE_fnt setfont
-			AGMCORE_GSTATE_lw setlinewidth
-			AGMCORE_GSTATE_lc setlinecap
-			AGMCORE_GSTATE_lj setlinejoin
-			AGMCORE_GSTATE_ml setmiterlimit
-			AGMCORE_GSTATE_da AGMCORE_GSTATE_do setdash
-			AGMCORE_GSTATE_sa setstrokeadjust
-			
-			AGMCORE_GSTATE_clr_rnd setcolorrendering
-			AGMCORE_GSTATE_op setoverprint
-			AGMCORE_GSTATE_bg cvx setblackgeneration
-			AGMCORE_GSTATE_ucr cvx setundercolorremoval
-			AGMCORE_GSTATE_r_xfer cvx AGMCORE_GSTATE_g_xfer cvx AGMCORE_GSTATE_b_xfer cvx
-				AGMCORE_GSTATE_gy_xfer cvx setcolortransfer
-			AGMCORE_GSTATE_ht /HalftoneType get dup 9 eq exch 100 eq or
-				{
-				currenthalftone /HalftoneType get AGMCORE_GSTATE_ht /HalftoneType get ne
-					{
-					  mark AGMCORE_GSTATE_ht {sethalftone} stopped cleartomark
-					} if
-				}{
-				AGMCORE_GSTATE_ht sethalftone
-				} ifelse
-			AGMCORE_GSTATE_flt setflat
-			end
-		}ndf
-		AGMCORE_producing_seps not{
-	
-			/setcolorspace where{
-				/Adobe_AGM_Core_Id known not
-			}{
-				true
-			}ifelse
-			{
-				/setcolorspace
-				{
-					dup type dup /arraytype eq exch /packedarraytype eq or{
-						dup 0 get dup /Separation eq{
-							pop
-							[ exch {} forall ]
-							dup dup 1 get AGMCORE_map_reserved_ink_name 1 exch put
-						}{
-							/DeviceN eq {
-								[ exch {} forall ]
-								dup dup 1 get [ exch {AGMCORE_map_reserved_ink_name} forall ] 1 exch put
-							}if
-						}ifelse
-					}if
-					AGMCORE_&&setcolorspace 
-				}def
-			}if
-		}if	
-	}{
-		
-		/adj
-		{
-			currentstrokeadjust{
-				transform
-				0.25 sub round 0.25 add exch
-				0.25 sub round 0.25 add exch
-				itransform
-			}if
-		}def
-		/mo{
-			adj moveto
-		}def
-		/ln{
-			adj lineto
-		}def
-		/cv{
-			6 2 roll adj
-			6 2 roll adj
-			6 2 roll adj curveto
-		}def
-		/knockout_unitsq
-		{
-			1 setgray
-			8 8 1 [8 0 0 8 0 0] {<ffffffffffffffff>} image
-		}def
-		/currentstrokeadjust{
-			/currentstrokeadjust AGMCORE_gget
-		}def
-		/setstrokeadjust{
-			/currentstrokeadjust exch AGMCORE_gput
-		}def
-		/currentScreenFreq{
-			currentscreen pop pop
-		}def
-		/invert_image_samples
-		{
-			{1 exch sub} currenttransfer addprocs settransfer
-		}def
-		/knockout_image_samples
-		{
-			{ pop 1 } currenttransfer addprocs settransfer
-		}def
-		/setcolorspace
-		{
-			/currentcolorspace exch AGMCORE_gput
-		} def
-		
-		/currentcolorspace
-		{
-			/currentcolorspace AGMCORE_gget
-		} def
-		
-		/n_color_components
-		{
-			dup type /arraytype eq{
-				0 get
-			}if
-			dup /DeviceGray eq{
-				pop 1
-			}{
-				/DeviceCMYK eq{
-					4
-				}{
-					3
-				}ifelse
-			}ifelse
-		} def
-		
-		/setcolor_devicecolor
-		{
-			dup type /arraytype eq{
-				0 get
-			}if
-			dup /DeviceGray eq{
-				pop setgray
-			}{
-				/DeviceCMYK eq{
-					setcmykcolor
-				}{
-					setrgbcolor
-				}ifelse
-			}ifelse
-		}def
-	
-		/setcolor
-		{
-			currentcolorspace 0 get
-			dup /DeviceGray ne{
-				dup /DeviceCMYK ne{
-					dup /DeviceRGB ne{
-						dup /Separation eq{
-							pop
-							currentcolorspace 3 get exec
-							currentcolorspace 2 get
-						}{
-							dup /Indexed eq{
-								pop
-								currentcolorspace 3 get dup type /stringtype eq{
-									currentcolorspace 1 get n_color_components
-									3 -1 roll map_index
-								}{
-									exec
-								}ifelse
-								currentcolorspace 1 get
-							}{
-								/AGMCORE_cur_err /AGMCORE_invalid_color_space def
-								AGMCORE_invalid_color_space
-							}ifelse
-						}ifelse
-					}if
-				}if
-			}if
-			setcolor_devicecolor
-		} def
-	}ifelse
-	
-	/op /setoverprint ldf
-	/lw /setlinewidth ldf
-	/lc /setlinecap ldf
-	/lj /setlinejoin ldf
-	/ml /setmiterlimit ldf
-	/dsh /setdash ldf
-	/sadj /setstrokeadjust ldf
-	/gry /setgray ldf
-	/rgb /setrgbcolor ldf
-	/cmyk /setcmykcolor ldf
-	/sep /setsepcolor ldf
-	/idx /setindexedcolor ldf
-	/colr /setcolor ldf
-	/csacrd /set_csa_crd ldf
-	/sepcs /setsepcolorspace ldf
-	/idxcs /setindexedcolorspace ldf
-	/cp /closepath ldf
-	/clp /clp_npth ldf
-	/eclp /eoclp_npth ldf
-	/spclp /stkpath_clp_npth ldf
-	/f /fill ldf
-	/ef /eofill ldf
-	/s /stroke ldf
-	/sclp /stk_n_clp_npth ldf
-	/nclp /npth_clp ldf
-	/img /imageormask ldf
-	/sepimg /sep_imageormask ldf
-	/idximg /indexed_imageormask ldf
-	/gset /graphic_setup ldf
-	/gcln /graphic_cleanup ldf
-	
-	currentdict{
-		dup xcheck 1 index type dup /arraytype eq exch /packedarraytype eq or and {
-			bind
-		}if
-		def
-	}forall
-}def
-/page_trailer
-{
-	end
-}def
-/unload{
-	systemdict/languagelevel known{
-		systemdict/languagelevel get 2 ge{
-			userdict/Adobe_AGM_Core 2 copy known{
-				undef
-			}{
-				pop pop
-			}ifelse
-		}if
-	}if
-}def
-/doc_trailer{
-}def
-systemdict /findcolorrendering known{
-	/findcolorrendering systemdict /findcolorrendering get def
-}if
-systemdict /setcolorrendering known{
-	/setcolorrendering systemdict /setcolorrendering get def
-}if
-/test_cmyk_color_plate
-{
-	gsave
-	setcmykcolor currentgray 1 ne
-	grestore
-}def
-/inRip_spot_has_ink
-{
-	Adobe_AGM_Core/AGMCORE_name xddf
-	false
-	currentpagedevice/SeparationColorNames get{
-		AGMCORE_name eq or
-	}forall
-}def
-/current_ink
-{
-	dup length 0 eq{
-		pop true
-	}{
-		Adobe_AGM_Core/ink_result false put
-		{
-			dup /ProcessCyan eq{
-				AGMCORE_cyan_plate ink_result or Adobe_AGM_Core/ink_result xddf
-			}{
-				dup /ProcessMagenta eq{
-					AGMCORE_magenta_plate ink_result or Adobe_AGM_Core/ink_result xddf
-				}{
-					dup /ProcessYellow eq{
-						AGMCORE_yellow_plate ink_result or Adobe_AGM_Core/ink_result xddf
-					}{
-						dup /ProcessBlack eq{
-							AGMCORE_black_plate ink_result or Adobe_AGM_Core/ink_result xddf
-						}{
-							dup /sep_colorspace_dict AGMCORE_gget dup null eq{
-								pop false ink_result or Adobe_AGM_Core/ink_result xddf
-							}{
-								/Name get eq{
-									1 setsepcolor
-									currentgray 1 ne ink_result or Adobe_AGM_Core/ink_result xddf
-								}{
-									false ink_result or Adobe_AGM_Core/ink_result xddf
-								}ifelse
-							}ifelse
-						}ifelse
-					}ifelse
-				}ifelse
-			}ifelse
-			pop 
-		} forall
-		ink_result
-	}ifelse
-}def
-/map255_to_range
-{
-	1 index sub
-	3 -1 roll 255 div mul add
-}def
-/set_csa_crd
-{
-	/sep_colorspace_dict null AGMCORE_gput
-	begin
-		CSA map_csa setcolorspace_opt
-		set_crd
-	end
-}
-def
-/setsepcolor
-{ 
-	
-	/sep_colorspace_dict AGMCORE_gget begin
-		dup /sep_tint exch AGMCORE_gput
-		TintProc
-	end
-} def
-/sep_colorspace_proc
-{
-	Adobe_AGM_Core/AGMCORE_tmp xddf
-	/sep_colorspace_dict AGMCORE_gget begin
-	currentdict/Components known{
-		Components aload pop 
-		TintMethod/Lab eq{
-			2 {AGMCORE_tmp mul NComponents 1 roll} repeat
-			LMax sub AGMCORE_tmp mul LMax add  NComponents 1 roll
-		}{
-			TintMethod/Subtractive eq{
-				NComponents{
-					AGMCORE_tmp mul NComponents 1 roll
-				}repeat
-			}{
-				NComponents{
-					1 sub AGMCORE_tmp mul 1 add  NComponents 1 roll
-				} repeat
-			}ifelse
-		}ifelse
-	}{
-		ColorLookup AGMCORE_tmp ColorLookup length 1 sub mul round cvi get
-		aload pop
-	}ifelse
-	end
-} def
-/sep_colorspace_gray_proc
-{
-	Adobe_AGM_Core/AGMCORE_tmp xddf
-	/sep_colorspace_dict AGMCORE_gget begin
-	GrayLookup AGMCORE_tmp GrayLookup length 1 sub mul round cvi get
-	end
-} def
-/sep_proc_name
-{
-	dup 0 get 
-	dup /DeviceRGB eq exch /DeviceCMYK eq or level2 not and has_color not and{
-		pop [/DeviceGray]
-		/sep_colorspace_gray_proc
-	}{
-		/sep_colorspace_proc
-	}ifelse
-} def
-/setsepcolorspace
-{ 
-	dup /sep_colorspace_dict exch AGMCORE_gput
-	begin
-	/MappedCSA CSA map_csa def
-	Adobe_AGM_Core/AGMCORE_sep_special Name dup () eq exch (All) eq or ddf
-	
-	AGMCORE_avoid_L2_sep_space{
-		[/Indexed MappedCSA sep_proc_name 255 exch 
-			{ 255 div } /exec cvx 3 -1 roll [ 4 1 roll load /exec cvx ] cvx 
-		] setcolorspace_opt
-		/TintProc {
-			255 mul setcolor
-		}bdf
-	}{
-		MappedCSA 0 get /DeviceCMYK eq 
-		currentdict/Components known and 
-		AGMCORE_sep_special not and{
-			/TintProc [
-				Components aload pop Name findcmykcustomcolor 
-				/exch cvx /setcustomcolor cvx
-			] cvx bdf
-		}{
- 			AGMCORE_host_sep Name (All) eq and{
- 				/TintProc { 
-					1 exch sub setseparationgray 
-				}bdf
- 			}{
-				AGMCORE_in_rip_sep MappedCSA 0 get /DeviceCMYK eq and 
-				AGMCORE_host_sep or
-				Name () eq and{
-					/TintProc [
-						MappedCSA sep_proc_name exch 0 get /DeviceCMYK eq{
-							cvx /setcmykcolor cvx
-						}{
-							cvx /setgray cvx
-						}ifelse
-					] cvx bdf
-				}{
-					AGMCORE_producing_seps MappedCSA 0 get dup /DeviceCMYK eq exch /DeviceGray eq or and AGMCORE_sep_special not and{
-	 					/TintProc [
-							/dup cvx
-							MappedCSA sep_proc_name cvx exch
-							0 get /DeviceGray eq{
-								1 /exch cvx /sub cvx 0 0 0 4 -1 /roll cvx
-							}if
-							/Name cvx /findcmykcustomcolor cvx /exch cvx
-							
-							AGMCORE_host_sep{
-								AGMCORE_is_cmyk_sep
-							}{
-								Name inRip_spot_has_ink not
-							}ifelse
-							{
-		 						/pop cvx 1
-							}if
-							/setcustomcolor cvx
-						] cvx bdf
- 					}{ 
-						/TintProc /setcolor ldf
-						
-						[/Separation Name MappedCSA sep_proc_name load ] setcolorspace_opt
-					}ifelse
-				}ifelse
-			}ifelse
-		}ifelse
-	}ifelse
-	set_crd
-	1 setsepcolor
-	end
-} def
-/setindexedcolorspace
-{
-	dup /indexed_colorspace_dict exch AGMCORE_gput
-	begin
-		/MappedCSA CSA map_csa def
-		AGMCORE_host_sep level2 not and{
-			0 0 0 0 setcmykcolor
-		}{
-			[/Indexed MappedCSA 
-			level2 not has_color not and{
-				dup 0 get dup /DeviceRGB eq exch /DeviceCMYK eq or{
-					pop [/DeviceGray]
-				}if
-				HiVal GrayLookup
-			}{
-				HiVal 
-				currentdict/RangeArray known{
-					{ 
-						/indexed_colorspace_dict AGMCORE_gget begin
-						Lookup exch 
-						dup HiVal gt{
-							pop HiVal
-						}if
-						NComponents mul NComponents getinterval {} forall
-						NComponents 1 sub -1 0{
-							RangeArray exch 2 mul 2 getinterval aload pop map255_to_range
-							NComponents 1 roll
-						}for
-						end
-					} bind
-				}{
-					Lookup
-				}ifelse
-			}ifelse
-			] setcolorspace_opt
-			
-			set_crd
-		}ifelse
-	end
-}def
-/setindexedcolor
-{
-	AGMCORE_host_sep{
-		/indexed_colorspace_dict AGMCORE_gget/Lookup get 4 3 -1 roll map_index setcmykcolor
-	}{
-		setcolor
-	}ifelse
-} def
-/imageormask_sys
-{
-	begin
-		save mark
-		level2{
-			currentdict
-			Operator /imagemask eq{
-				AGMCORE_&imagemask
-			}{
-				AGMCORE_&image
-			}ifelse
-		}{
-			Width Height
-			Operator /imagemask eq{
-				Decode 0 get 1 eq Decode 1 get 0 eq	and
-				ImageMatrix /DataSource load
-				AGMCORE_&imagemask
-			}{
-				BitsPerComponent ImageMatrix /DataSource load
-				AGMCORE_&image
-			}ifelse
-		}ifelse
-		cleartomark restore
-	end
-}def
-/overprint_plate
-{
-	currentoverprint{
-		0 get
-		dup /DeviceGray eq{
-			pop AGMCORE_black_plate not
-		}{
-			/DeviceCMYK eq{
-				AGMCORE_is_cmyk_sep not
-			}if
-		}ifelse
-	}{
-		false
-	}ifelse
-}def
-/rdline {
-	currentfile AGMCORE_str256 readline pop
-} def
-/rdcmntline {
-	currentfile AGMCORE_str256 readline pop
-	(%) anchorsearch {pop} if
-} def
-/filter_cmyk
-{	
-	dup type /filetype ne{
-		0 () /SubFileDecode filter
-	}if
-	[
-	exch
-	{
-		AGMCORE_src256 readstring pop
-		dup length /AGMCORE_srcLen exch def
-		/AGMCORE_ndx 0 def
-		
-		AGMCORE_plate_ndx 4 AGMCORE_srcLen 1 sub{
-			1 index exch get
-			AGMCORE_dst64 AGMCORE_ndx 3 -1 roll put
-			/AGMCORE_ndx AGMCORE_ndx 1 add def
-		}for
-		pop
-		AGMCORE_dst64 0 AGMCORE_ndx getinterval
-	}
-	bind
-	/exec cvx
-	] cvx
-} def
-/imageormask
-{
-	begin
-		SkipImageProc not{
-			save mark
-			level2 AGMCORE_host_sep not and{
-				currentdict
-				Operator /imagemask eq{
-					imagemask
-				}{
-					AGMCORE_in_rip_sep currentoverprint and currentcolorspace 0 get /DeviceGray eq and{
-						[/Separation /Black /DeviceGray {}] setcolorspace
-						/Decode [ Decode 1 get Decode 0 get ] def
-					}if
-					image
-				}ifelse
-			}{
-				Width Height
-				Operator /imagemask eq{
-					Decode 0 get 1 eq Decode 1 get 0 eq	and
-					ImageMatrix /DataSource load
-					AGMCORE_host_sep{
-						currentgray 1 ne{
-							currentdict imageormask_sys
-						}{
-	 						currentoverprint not{
-			 					1 AGMCORE_&setgray
-	 							knockout_image_samples
-			 					currentdict imageormask_sys
-			 				}{
-			 					nulldevice currentdict imageormask_sys
-			 				}ifelse
-				 		}ifelse
-					}{
-						imagemask
-					}ifelse
-				}{
-					BitsPerComponent ImageMatrix 
-					MultipleDataSources{
-						0 1 NComponents 1 sub{
-							DataSource exch get
-						}for
-					}{
-						/DataSource load
-					}ifelse
-					Operator /colorimage eq{
-						AGMCORE_host_sep{
-							MultipleDataSources level2 or NComponents 4 eq and{
-								MultipleDataSources{
-									4 {pop} repeat
-									/DataSource [
-										DataSource 0 get /exec cvx
-										DataSource 1 get /exec cvx
-										DataSource 2 get /exec cvx
-										DataSource 3 get /exec cvx
-										/AGMCORE_get_ink_data cvx
-									] cvx def
-								}{
-									/DataSource /DataSource load filter_cmyk 0 () /SubFileDecode filter def
-								}ifelse
-	
-								/Decode [ Decode 0 get Decode 1 get ] def
-								/MultipleDataSources false def
-								/NComponents 1 def
-								/Operator /image def
-								AGMCORE_is_cmyk_sep{
-									currentoverprint InksUsed current_ink not and{
-										nulldevice
-									}{
-										invert_image_samples
-									}ifelse
-								}{
-		 							currentoverprint not{
-		 								knockout_image_samples
-				 					}{
-				 						nulldevice
-				 					}ifelse
-					 			}ifelse
-						 		1 AGMCORE_&setgray
-								currentdict imageormask_sys
-							}{
-									
-								currentcolortransfer
-								{pop 1} exch addprocs 4 1 roll				
-								{pop 1} exch addprocs 4 1 roll
-								{pop 1} exch addprocs 4 1 roll
-								{pop 1} exch addprocs 4 1 roll
-								setcolortransfer
-									
-								MultipleDataSources NComponents AGMCORE_&colorimage						
-							}ifelse
-						}{
-							true NComponents colorimage
-						}ifelse
-					}{
-						Operator /image eq{
-							AGMCORE_host_sep{
-								HostSepColorImage{
-									invert_image_samples
-								}{
-									AGMCORE_black_plate not{
-		 								currentoverprint not{
-		 									knockout_image_samples
-				 						}{
-				 							nulldevice
-				 						}ifelse
-					 				}if
-								}ifelse
-						 		1 AGMCORE_&setgray
-								currentdict imageormask_sys
-							}{
-								image
-							}ifelse
-						}{
-							Operator/knockout eq{
-								pop pop pop pop pop
-								currentoverprint InksUsed current_ink not and{
-								}{
-									currentcolorspace overprint_plate not{
-										knockout_unitsq
-									}if
-								}ifelse
-							}if
-						}ifelse
-					}ifelse
-				}ifelse
-			}ifelse
-			cleartomark restore
-		}if
-	end
-}def
-/tint_image_to_color
-{
-	begin
-		Width Height BitsPerComponent ImageMatrix 
-		/DataSource load
-	end
-	Adobe_AGM_Core begin
-		/AGMCORE_mbuf 0 string def
-		/AGMCORE_ybuf 0 string def
-		/AGMCORE_kbuf 0 string def
-		{
-			colorbuf dup length AGMCORE_mbuf length ne
-				{
-				dup length dup dup
-				/AGMCORE_mbuf exch string def
-				/AGMCORE_ybuf exch string def
-				/AGMCORE_kbuf exch string def
-				} if
-			dup AGMCORE_mbuf copy AGMCORE_ybuf copy AGMCORE_kbuf copy pop
-		}
-		addprocs
-		{AGMCORE_mbuf}{AGMCORE_ybuf}{AGMCORE_kbuf} true 4 colorimage	
-	end
-} def			
-/sep_imageormask_lev1
-{
-	begin
-		MappedCSA 0 get dup /DeviceRGB eq exch /DeviceCMYK eq or has_color not and{
-			
-			{
-				255 mul round cvi GrayLookup exch get
-			} currenttransfer addprocs settransfer
-			currentdict imageormask
-		}{
-			/sep_colorspace_dict AGMCORE_gget/Components known{
-				MappedCSA 0 get /DeviceCMYK eq{
-					Components aload pop
-				}{
-					0 0 0 Components aload pop 1 exch sub
-				}ifelse
-				
-				Adobe_AGM_Core/AGMCORE_k xddf 
-				Adobe_AGM_Core/AGMCORE_y xddf 
-				Adobe_AGM_Core/AGMCORE_m xddf 
-				Adobe_AGM_Core/AGMCORE_c xddf 
-					
-				AGMCORE_y 0.0 eq AGMCORE_m 0.0 eq and AGMCORE_c 0.0 eq and{
-					{AGMCORE_k mul 1 exch sub} currenttransfer addprocs settransfer
-					currentdict imageormask
-				}{ 
-					
-					currentcolortransfer
-					{AGMCORE_k mul 1 exch sub} exch addprocs 4 1 roll
-					{AGMCORE_y mul 1 exch sub} exch addprocs 4 1 roll
-					{AGMCORE_m mul 1 exch sub} exch addprocs 4 1 roll
-					{AGMCORE_c mul 1 exch sub} exch addprocs 4 1 roll
-					setcolortransfer
-					currentdict tint_image_to_color
-				}ifelse
-			}{
-				
-				MappedCSA 0 get /DeviceGray eq {
-					{255 mul round cvi ColorLookup exch get 0 get} currenttransfer addprocs settransfer
-					currentdict imageormask
-				}{
-					MappedCSA 0 get /DeviceCMYK eq {
-						currentcolortransfer
-						{255 mul round cvi ColorLookup exch get 3 get 1 exch sub} exch addprocs 4 1 roll
-						{255 mul round cvi ColorLookup exch get 2 get 1 exch sub} exch addprocs 4 1 roll
-						{255 mul round cvi ColorLookup exch get 1 get 1 exch sub} exch addprocs 4 1 roll
-						{255 mul round cvi ColorLookup exch get 0 get 1 exch sub} exch addprocs 4 1 roll
-						setcolortransfer 
-						currentdict tint_image_to_color
-					}{ 
-						currentcolortransfer
-						{pop 1} exch addprocs 4 1 roll
-						{255 mul round cvi ColorLookup exch get 2 get} exch addprocs 4 1 roll
-						{255 mul round cvi ColorLookup exch get 1 get} exch addprocs 4 1 roll
-						{255 mul round cvi ColorLookup exch get 0 get} exch addprocs 4 1 roll
-						setcolortransfer 
-						currentdict tint_image_to_color
-					}ifelse
-				}ifelse
-			}ifelse
-		}ifelse
-	end
-}def
-/sep_image_lev1_sep
-{
-	begin
-		/sep_colorspace_dict AGMCORE_gget/Components known{
-			Components aload pop
-			
-			Adobe_AGM_Core/AGMCORE_k xddf 
-			Adobe_AGM_Core/AGMCORE_y xddf 
-			Adobe_AGM_Core/AGMCORE_m xddf 
-			Adobe_AGM_Core/AGMCORE_c xddf 
-				
-			{AGMCORE_c mul 1 exch sub}
-			{AGMCORE_m mul 1 exch sub}
-			{AGMCORE_y mul 1 exch sub}
-			{AGMCORE_k mul 1 exch sub}
-		}{ 
-			{255 mul round cvi ColorLookup exch get 0 get 1 exch sub}
-			{255 mul round cvi ColorLookup exch get 1 get 1 exch sub}
-			{255 mul round cvi ColorLookup exch get 2 get 1 exch sub}
-			{255 mul round cvi ColorLookup exch get 3 get 1 exch sub}
-		}ifelse
-		
-		AGMCORE_get_ink_data currenttransfer addprocs settransfer
-		
-		currentdict imageormask_sys
-			
-	end
-}def
-/sep_imageormask
-{
- 	/sep_colorspace_dict AGMCORE_gget begin
-	/MappedCSA CSA map_csa def
-	begin
-	SkipImageProc not{
-		save mark 
-	
-		AGMCORE_avoid_L2_sep_space{
-			/Decode [ Decode 0 get 255 mul Decode 1 get 255 mul ] def
-		}if
- 		AGMCORE_ccimage_exists 
-		MappedCSA 0 get /DeviceCMYK eq and
-		currentdict/Components known and 
-		Name () ne and 
-		Name (All) ne and 
-		Operator /image eq and
-		AGMCORE_producing_seps not and
-		level2 not and
-		{
-			Width Height BitsPerComponent ImageMatrix 
-			[
-			/DataSource load /exec cvx
-			{
-				0 1 2 index length 1 sub{
-					1 index exch
-					2 copy get 255 xor put
-				}for
-			} /exec cvx
-			] cvx bind
-			MappedCSA 0 get /DeviceCMYK eq{
-				Components aload pop
-			}{
-				0 0 0 Components aload pop 1 exch sub
-			}ifelse
-			Name findcmykcustomcolor
-			customcolorimage
-		}{
-			AGMCORE_producing_seps not{
-				level2{
-					AGMCORE_avoid_L2_sep_space not currentcolorspace 0 get /Separation ne and{
-						[/Separation Name MappedCSA sep_proc_name load ] setcolorspace_opt
-						/sep_tint AGMCORE_gget setcolor
-					}if
-					currentdict imageormask
-				}{ 
-					currentdict
-					Operator /imagemask eq{
-						imageormask
-					}{
-						sep_imageormask_lev1
-					}ifelse
-				}ifelse
- 			}{
-				AGMCORE_host_sep{
-					Operator/knockout eq{
-						currentoverprint InksUsed current_ink not and{
-						}{
-							currentdict/ImageMatrix get concat
-							knockout_unitsq
-						}ifelse
-					}{
-						currentgray 1 ne{
- 							AGMCORE_is_cmyk_sep Name (All) ne and{
- 								level2{
-	 								[ /Separation Name [/DeviceGray]
-	 								{ 
-	 									sep_colorspace_proc AGMCORE_get_ink_data
-										1 exch sub
-	 								} bind
-									] AGMCORE_&setcolorspace
-									/sep_tint AGMCORE_gget AGMCORE_&setcolor
- 									currentdict imageormask_sys
-	 							}{
-	 								currentdict
-									Operator /imagemask eq{
-										imageormask_sys
-									}{
-										sep_image_lev1_sep
-									}ifelse
-	 							}ifelse
- 							}{
- 								Operator/imagemask ne{
-									invert_image_samples
- 								}if
-		 						currentdict imageormask_sys
- 							}ifelse
- 						}{
- 							currentoverprint not Name (All) eq or{
- 								knockout_image_samples
-		 					}{
-		 						nulldevice 
-		 					}ifelse
-							currentdict imageormask_sys
- 						}ifelse
-		 			}ifelse
- 				}{
-					currentcolorspace 0 get /Separation ne{
-						[/Separation Name MappedCSA sep_proc_name load ] setcolorspace_opt
-						/sep_tint AGMCORE_gget setcolor
-					}if
-					currentoverprint 
-					MappedCSA 0 get /DeviceCMYK eq and 
-					Name inRip_spot_has_ink not and 
-					Name (All) ne and {
-						imageormask_l2_overprint
-					}{
-						currentdict imageormask
- 					}ifelse
-				}ifelse
-			}ifelse
-		}ifelse
-		cleartomark restore
-	}if
-	end
-	end
-}def
-/modify_halftone_xfer
-{
-	currenthalftone dup length dict copy begin
-    currentdict 2 index known{
-    	1 index load dup length dict copy begin
-		currentdict/TransferFunction known{
-			/TransferFunction load
-		}{
-			currenttransfer
-		}ifelse
-	    addprocs /TransferFunction xdf 
-	    currentdict end def
-		currentdict end sethalftone
-	}{ 
-		currentdict/TransferFunction known{
-			/TransferFunction load 
-		}{
-			currenttransfer
-		}ifelse
-		addprocs /TransferFunction xdf
-		currentdict end sethalftone		
-		pop
-	}ifelse
-}def
-/read_image_file
-{
-	AGMCORE_imagefile 0 setfileposition
-	dup /DataSource {AGMCORE_imagefile AGMCORE_imbuf readstring pop} put
-	exch
-	load exec
-}def
-/write_image_file
-{
-	{ (AGMCORE_imagefile) (w+) file } stopped{
-		false
-	}{
-		Adobe_AGM_Core/AGMCORE_imagefile xddf 
-		Adobe_AGM_Core/AGMCORE_imbuf Width BitsPerComponent mul 7 add 8 idiv string ddf
-		1 1 Height { 
-			pop
-			DataSource dup type /filetype eq{
-				AGMCORE_imbuf readstring pop
-			}{
-				exec
-			} ifelse
-			AGMCORE_imagefile exch writestring
-		}for
-		true
-	}ifelse
-}def
-/imageormask_l2_overprint
-{
-	write_image_file{
-		currentcmykcolor
-		0 ne{
-			[/Separation /Black /DeviceGray {}] setcolorspace
-			gsave
-			/Black
-			[{1 exch sub /sep_tint AGMCORE_gget mul} /exec cvx MappedCSA sep_proc_name cvx exch pop {4 1 roll pop pop pop 1 exch sub} /exec cvx]
-			cvx modify_halftone_xfer
-			Operator currentdict read_image_file
-			grestore
-		}if
-		0 ne{
-			[/Separation /Yellow /DeviceGray {}] setcolorspace
-			gsave
-			/Yellow
-			[{1 exch sub /sep_tint AGMCORE_gget mul} /exec cvx MappedCSA sep_proc_name cvx exch pop {4 2 roll pop pop pop 1 exch sub} /exec cvx]
-			cvx modify_halftone_xfer
-			Operator currentdict read_image_file
-			grestore
-		}if
-		0 ne{
-			[/Separation /Magenta /DeviceGray {}] setcolorspace
-			gsave
-			/Magenta
-			[{1 exch sub /sep_tint AGMCORE_gget mul} /exec cvx MappedCSA sep_proc_name cvx exch pop {4 3 roll pop pop pop 1 exch sub} /exec cvx]
-			cvx modify_halftone_xfer
-			Operator currentdict read_image_file
-			grestore
-		}if
-		0 ne{
-			[/Separation /Cyan /DeviceGray {}] setcolorspace
-			gsave
-			/Cyan 
-			[{1 exch sub /sep_tint AGMCORE_gget mul} /exec cvx MappedCSA sep_proc_name cvx exch pop {pop pop pop 1 exch sub} /exec cvx]
-			cvx modify_halftone_xfer
-			Operator currentdict read_image_file
-			grestore
-		} if
-		AGMCORE_imagefile closefile (AGMCORE_imagefile) deletefile
-	}{
-		currentdict imageormask
-	}ifelse
-} def
-/indexed_imageormask
-{
-	begin
-		save mark 
-	
- 		currentdict
- 		AGMCORE_host_sep{
- 			
-			Operator/knockout eq{
-				/indexed_colorspace_dict AGMCORE_gget /CSA get map_csa overprint_plate not{
-					knockout_unitsq
-				}if
-			}{
-	 			AGMCORE_is_cmyk_sep{
-					Operator /imagemask eq{
-						imageormask_sys
-					}{
-						level2{
-							indexed_image_lev2_sep
-						}{
-							indexed_image_lev1_sep
-						}ifelse
-					}ifelse
-				}{
-					currentoverprint not{
-						knockout_image_samples
-		 				imageormask_sys
-		 			}{
-		 				nulldevice currentdict imageormask_sys
-		 			}ifelse
-				}ifelse
-			}ifelse
- 		}{
-			level2{
-				imageormask
-			}{ 
-				Operator /imagemask eq{
-					imageormask
-				}{
-					indexed_imageormask_lev1
-				}ifelse
-			}ifelse
- 		}ifelse
-		cleartomark restore
-	end
-}def
-/indexed_imageormask_lev1
-{
-	/indexed_colorspace_dict AGMCORE_gget begin
-	begin
-		currentdict
-		MappedCSA 0 get dup /DeviceRGB eq exch /DeviceCMYK eq or has_color not and{
-			
-			{HiVal mul round cvi GrayLookup exch get HiVal div} currenttransfer addprocs settransfer
-			imageormask
-		}{
-			
-			MappedCSA 0 get /DeviceGray eq {
-				{HiVal mul round cvi Lookup exch get HiVal div} currenttransfer addprocs settransfer
-				imageormask
-			}{
-				MappedCSA 0 get /DeviceCMYK eq {
-					currentcolortransfer
-					{4 mul HiVal mul round cvi 3 add Lookup exch get HiVal div 1 exch sub} exch addprocs 4 1 roll
-					{4 mul HiVal mul round cvi 2 add Lookup exch get HiVal div 1 exch sub} exch addprocs 4 1 roll
-					{4 mul HiVal mul round cvi 1 add Lookup exch get HiVal div 1 exch sub} exch addprocs 4 1 roll
-					{4 mul HiVal mul round cvi       Lookup exch get HiVal div 1 exch sub} exch addprocs 4 1 roll
-					setcolortransfer 
-					tint_image_to_color
-				}{ 
-					currentcolortransfer
-					{pop 1} exch addprocs 4 1 roll
-					{3 mul HiVal mul round cvi 2 add Lookup exch get HiVal div} exch addprocs 4 1 roll
-					{3 mul HiVal mul round cvi 1 add Lookup exch get HiVal div} exch addprocs 4 1 roll
-					{3 mul HiVal mul round cvi 	   Lookup exch get HiVal div} exch addprocs 4 1 roll
-					setcolortransfer 
-					tint_image_to_color
-				}ifelse
-			}ifelse
-		}ifelse
-	end end
-}def
-/indexed_image_lev1_sep
-{
-	/indexed_colorspace_dict AGMCORE_gget begin
-	begin
-		{4 mul HiVal mul round cvi       Lookup exch get HiVal div 1 exch sub}
-		{4 mul HiVal mul round cvi 1 add Lookup exch get HiVal div 1 exch sub}
-		{4 mul HiVal mul round cvi 2 add Lookup exch get HiVal div 1 exch sub}
-		{4 mul HiVal mul round cvi 3 add Lookup exch get HiVal div 1 exch sub}
-		
-		AGMCORE_get_ink_data currenttransfer addprocs settransfer
-		
-		currentdict imageormask_sys
-			
-	end end
-}def
-/indexed_image_lev2_sep
-{
-	/indexed_colorspace_dict AGMCORE_gget begin
-	begin
-		
-		currentcolorspace 
-		dup 1 /DeviceGray put
-		dup 3 [
-			currentcolorspace 3 get 
-			{
-				exch 4 mul 4 getinterval {} forall
-				AGMCORE_get_ink_data 255 div 1 exch sub
-			} /exec cvx
-		] cvx put
-		setcolorspace
-		
-		currentdict 
-		Operator /imagemask eq{
-			AGMCORE_&imagemask
-		}{
-			AGMCORE_&image
-		}ifelse
-			
-	end end
-}def
-/add_csa
-{
-	Adobe_AGM_Core begin
-			/AGMCORE_CSA_cache xput
-	end
-}def
-/map_csa
-{
-	dup type /nametype eq{
-		Adobe_AGM_Core/AGMCORE_CSA_cache get exch get
-	}if
-}def
-/add_csd
-{
-	Adobe_AGM_Core begin
-		/AGMCORE_CSD_cache xput
-	end
-}def
-/get_csd
-{
-	dup type /nametype eq{
-		Adobe_AGM_Core/AGMCORE_CSD_cache get exch get
-	}if
-}def
-/add_pattern
-{
-	Adobe_AGM_Core begin
-		/AGMCORE_pattern_cache xput
-	end
-}def
-/get_pattern
-{
-	dup type /nametype eq{
-		Adobe_AGM_Core/AGMCORE_pattern_cache get exch get
-	}if
-}def
-/set_pattern
-{
-	dup /PatternType get 1 eq{
-		dup /PaintType get 1 eq{
-			false op [/DeviceGray] setcolorspace 0 setgray
-		}if
-	}if
-	setpattern
-}def
-/setcolorspace_opt
-{
-	dup currentcolorspace eq{
-		pop
-	}{
-		setcolorspace
-	}ifelse
-}def
-/updatecolorrendering
-{
-	
-	currentcolorrendering/Intent known{
-		currentcolorrendering/Intent get
-	}{
-		null
-	}ifelse
-	
-	Intent ne{
-		false  
-		Intent
-		AGMCORE_CRD_cache {
-			exch pop 
-			begin
-				dup Intent eq{
-					currentdict setcolorrendering_opt
-					end 
-					exch pop true exch	
-					exit
-				}if
-			end
-		} forall
-		pop
-		not{
-			systemdict /findcolorrendering known{
-				Intent findcolorrendering pop
-				/ColorRendering findresource 
-				dup length dict copy
-				setcolorrendering_opt
-			}if
-		}if
-	}if
-} def
-/add_crd
-{
-	AGMCORE_CRD_cache 3 1 roll put
-}def
-/set_crd
-{
-	AGMCORE_host_sep not level2 and{
-		currentdict/CRD known{
-			AGMCORE_CRD_cache CRD get dup null ne{
-				setcolorrendering_opt
-			}{
-				pop
-			}ifelse
-		}{
-			currentdict/Intent known{
-				updatecolorrendering
-			}if
-		}ifelse
-	}if
-}def
-/setcolorrendering_opt
-{
-	dup currentcolorrendering eq{
-		pop
-	}{
-		begin
-			/Intent Intent def
-			currentdict
-		end
-		setcolorrendering
-	}ifelse
-}def
-/OPIimage
-{
-	dup type /dicttype ne{
-		10 dict begin
-			/DataSource xdf
-			/ImageMatrix xdf
-			/BitsPerComponent xdf
-			/Height xdf
-			/Width xdf
-			/MultipleDataSources false def
-			/NComponents 1 def
-			/ImageType 1 def
-			/Decode [0 1 def]
-			/SkipImageProc {false} def
-			currentdict
-		end
-	}if
-	dup begin
-		/HostSepColorImage false def
-		currentdict/Decode known not{
-			/Decode [
-				0 
-				currentcolorspace 0 get /Indexed eq{
-					2 BitsPerComponent exp 1 sub
-				}{
-					1
-				}ifelse
-			] 
-			def
-		}if
-		currentdict/Operator known not{
-			/Operator /image def
-		}if
-	end
-	/sep_colorspace_dict AGMCORE_gget null eq{
-		imageormask
-	}{
-		gsave
-		dup begin invert_image_samples end
-		sep_imageormask
-		grestore
-	}ifelse
-}def
-/cpaint_gcomp
-{
-	AGM_preserve_spots{
-		gsave
-		nulldevice
-	}if
-}def
-/cpaint_gsep
-{
-	AGM_preserve_spots{
-		grestore
-		currentoverprint Adobe_AGM_Core/AGMCORE_ovp xddf 
-	}{	
-		gsave
-		nulldevice
-	}ifelse
-}def
-/cpaint_gend
-{
-	AGM_preserve_spots{
-		Adobe_AGM_Core/AGMCORE_ovp get setoverprint
-	}{
-		grestore
-	}ifelse
-	newpath
-}def
-/AGMCORE_ctm_stack bdict
-	/push_ctm {
-		stack length size le{
-			stack dup length 2 mul array 
-			dup /stack exch def
-			copy pop
-		}if
-		stack size 3 -1 roll put
-		/size size 1 add def
-	}
-	/pop_ctm {
-		/size size 1 sub def
-		size 0 lt{ 
-			/size 0 def
-		}if
-		stack size get
-	}
-	/stack 1 array
-	/size 0 
-edict 
-def
-/save_ctm
-{
-	matrix currentmatrix AGMCORE_ctm_stack begin 
-		push_ctm 
-	end
-}def
-/restore_ctm
-{
-	AGMCORE_ctm_stack begin
-		pop_ctm 
-	end
-	setmatrix
-}def
-/path_rez
-{
-	dup 0 ne{
-		AGMCORE_deviceDPI exch div 
-		dup 1 lt{
-			pop 1
-		}if
-		setflat
-	}{
-		pop
-	}ifelse 	
-}def
-end
-systemdict /setpacking known
-{
-	setpacking
-} if
-%%EndResource
-%%BeginResource: procset Adobe_CoolType_Core 1.1 0
-%%Copyright: Copyright 1997-1999 Adobe Systems Incorporated.  All Rights Reserved.
-%%Version: 1.1 0
-userdict/Adobe_CoolType_Core 40 dict dup begin put/Level2? systemdict
-/languagelevel known dup{pop systemdict/languagelevel get 2 ge}if def Level2?
-not{/currentglobal false def/setglobal/pop load def/gcheck{pop false}bind def
-/currentpacking false def/setpacking/pop load def}if currentpacking true
-setpacking/bdf{bind def}bind def/ldf{load def}bind def/doc_setup{
-Adobe_CoolType_Core begin/mov/moveto ldf/nfnt/newencodedfont ldf/mfnt/makefont
-ldf/sfnt/setfont ldf/ufnt/undefinefont ldf/chp/charpath ldf/awsh/awidthshow
-ldf/wsh/widthshow ldf/ash/ashow ldf/sh/show ldf end userdict
-/Adobe_CoolType_Data 2 dict dup begin/WidthShowArray 256 array def
-/GenFauxMMInst{}bind def end put}bind def/doc_trailer{currentdict
-Adobe_CoolType_Core eq{end}if Adobe_CoolType_Core/unload get exec systemdict
-/undef known{userdict/Adobe_CoolType_Data undef}if}bind def/page_setup{
-Adobe_CoolType_Core begin}bind def/page_trailer{end}bind def/unload{systemdict
-/languagelevel known{systemdict/languagelevel get 2 ge{userdict
-/Adobe_CoolType_Core 2 copy known{undef}{pop pop}ifelse}if}if}bind def/ndf{1
-index where{pop pop pop}{dup xcheck{bind}if def}ifelse}def/findfont dup
-systemdict begin userdict begin/globaldict where{/globaldict get begin}if dup
-where pop exch get/globaldict where{pop end}if end end def/systemfindfont
-/findfont load def/undefinefont{pop}ndf/copyfont{currentglobal 3 1 roll 1
-index gcheck setglobal dup null eq{0}{dup length}ifelse 2 index length add 1
-add dict begin exch{1 index/FID eq{pop pop}{def}ifelse}forall dup null eq{pop}
-{{def}forall}ifelse currentdict end exch setglobal}bdf/newencodedfont{findfont
-dup length dict begin{1 index/FID ne{def}{pop pop}ifelse}forall/Encoding exch
-def currentdict end definefont pop}bdf/scff{$SubstituteFont begin dup type
-/stringtype eq{dup length exch}{null}ifelse/$sname exch def/$slen exch def
-/$fontname 1 index dup type/stringtype eq{cvn}if def/$used false def end
-findfont $SubstituteFont begin $used{currentglobal exch dup gcheck setglobal
-null copyfont begin/FontName $fontname def/currentdistillerparams where{pop}{
-/FontInfo currentdict/FontInfo known{FontInfo null copyfont}{2 dict}ifelse dup
-begin/ItalicAngle $italicangle def/FontMatrix FontMatrix[1 0 ItalicAngle dup
-sin exch cos div 1 0 0]matrix concatmatrix readonly end 4 2 roll def def}
-ifelse FontName currentdict end definefont exch setglobal}if/$sname null def
-/$slen 0 def end}bdf/ConcatStrings{dup 0 exch{length add}forall string exch 0
-exch{3 copy putinterval length add}forall pop}bind def/BeginFauxMMFont{1 index
-findfont pop 2 array astore ConcatStrings 3 1 roll($)exch 3 array astore
-ConcatStrings exch findfont currentglobal exch dup gcheck setglobal null
-copyfont/tempfontname exch definefont pop exch 12 dict begin/FontName exch def
-/FontType 0 def/FMapType 6 def/FontMatrix matrix def/PaintType 0 def}bind def
-/EndFauxMMFont{currentdict end dup/FontName get exch definefont exch setglobal
-exch mfnt sfnt}bind def/GenFauxMMInst{Adobe_CoolType_Data/GenFauxMMInst get
-exec}bind def/DefFauxMMInst{Adobe_CoolType_Data exch/GenFauxMMInst exch bind
-put}bind def/WSALoop{4 copy 1 index add 1 sub 1 exch{3 copy put pop 1 add}for
-pop pop 3 2 roll add exch 256 add}bind def/BuildWidthShowArray{currentfont
-begin FontType 0 eq dup{pop FMapType 6 eq}if{SubsVector dup length 1 sub 1
-exch getinterval}{()}ifelse end Adobe_CoolType_Data/WidthShowArray get 0 0 4 3
-roll{WSALoop}forall 256 2 index sub WSALoop pop pop pop}bind def/wsa{
-Adobe_CoolType_Data/WidthShowArray get}bind def/?set{$SubstituteFont begin
-/$used false def/$fontname 4 index def end 3 index findfont $SubstituteFont
-begin $used{false}{dup/FontName known{dup/FontName get $fontname eq 1 index
-/DistillerFauxFont known not and}{false}ifelse}ifelse exch pop end{exch pop
-exch pop exch 2 dict dup/Found 3 index put exch findfont exch}{exch exec exch
-findfont 2 dict dup/Downloaded 6 5 roll put}ifelse dup/FontName 4 index put
-copyfont definefont pop}bind def/?str1 256 string def/?str2 256 string def
-/?add{1 index type/integertype eq{exch true 4 2}{false 3 1}ifelse roll 1 index
-findfont/Downloaded known{exec exch{exch ?str2 cvs exch findfont/Downloaded
-get 1 dict begin/Downloaded 1 index def ?str1 cvs length ?str1 1 index 1 add 3
-index putinterval exch length 1 add 1 index add ?str1 2 index(*)putinterval
-?str1 0 2 index getinterval cvn findfont ?str1 3 index(+)putinterval 2 dict
-dup/FontName ?str1 0 6 index getinterval cvn put dup/Downloaded Downloaded put
-end copyfont dup/FontName get exch definefont pop pop pop}{pop}ifelse}{pop
-exch{findfont dup/Found get dup length exch ?str1 cvs pop ?str1 1 index(+)
-putinterval ?str1 1 index 1 add 4 index ?str2 cvs putinterval ?str1 exch 0
-exch 5 4 roll ?str2 cvs length 1 add add getinterval cvn 1 dict exch 1 index
-exch/FontName exch put copyfont dup/FontName get exch definefont pop}{pop}
-ifelse}ifelse}bind def/?sh{currentfont/Downloaded known{exch}if pop}bind def
-/?chp{currentfont/Downloaded known{pop}{false chp}ifelse}bind def/?mv{
-currentfont/Downloaded known{moveto pop pop}{pop pop moveto}ifelse}bind def
-setpacking end userdict/$SubstituteFont 20 dict put 1 dict begin
-/SubstituteFont dup $error exch 2 copy known{get}{pop pop{pop/Courier}bind}
-ifelse def/currentdistillerparams where dup{pop pop currentdistillerparams
-/CannotEmbedFontPolicy 2 copy known{get/Error eq}{pop pop false}ifelse}if not{
-countdictstack array dictstack 0 get begin userdict begin $SubstituteFont
-begin/$str 128 string def/$fontpat 128 string def/$slen 0 def/$sname null def
-/$match false def/$fontname null def/$used false def/$fontname null def
-/$italicangle 26.5 def/$findfontByEnum{dup/$fontname exch def $sname null eq{
-$str cvs dup length $slen sub $slen getinterval}{pop $sname}ifelse $fontpat
-dup 0(fonts/*)putinterval exch 7 exch putinterval/$match false def mark{
-$fontpat 0 $slen 7 add getinterval{/$match exch def exit}$str filenameforall}
-stopped cleartomark/$slen 0 def $match false ne{$match(fonts/)anchorsearch pop
-pop cvn}{/Courier}ifelse}bind def/$ROS 1 dict dup begin/Adobe 4 dict dup begin
-/Japan1[/Ryumin-Light/HeiseiMin-W3/GothicBBB-Medium/HeiseiKakuGo-W5
-/HeiseiMaruGo-W4/Jun101-Light]def/Korea1[/HYSMyeongJo-Medium/HYGoThic-Medium]
-def/GB1[/STSong-Light/STHeiti-Regular]def/CNS1[/MKai-Medium/MHei-Medium]def
-end def end def/$cmapname null def/$buildfontname{length $str 1 index(-)
-putinterval 1 add $str 1 index $cmapname $fontpat cvs putinterval $cmapname
-length add $str exch 0 exch getinterval cvn}bind def/$findfontByROS{/$fontname
-exch def $ROS Registry 2 copy known{get Ordering 2 copy known{get}{pop pop[]}
-ifelse}{pop pop[]}ifelse false exch{dup/CIDFont resourcestatus{pop pop save 1
-index/CIDFont findresource dup/WidthsOnly known{dup/WidthsOnly get}{false}
-ifelse exch pop exch restore{pop}{exch pop true exit}ifelse}{pop}ifelse}forall
-{$str cvs $buildfontname}{false(*){save exch dup/CIDFont findresource dup
-/WidthsOnly known{dup/WidthsOnly get not}{true}ifelse exch/CIDSystemInfo get
-dup/Registry get Registry eq exch/Ordering get Ordering eq and and{exch
-restore exch pop true exit}{pop restore}ifelse}$str/CIDFont resourceforall{
-$buildfontname}{$fontname $findfontByEnum}ifelse}ifelse}bind def end end
-currentdict/$error known currentdict/languagelevel known and dup{pop $error
-/SubstituteFont known}if dup{$error}{Adobe_CoolType_Core}ifelse begin{
-/SubstituteFont/CMap/Category resourcestatus{pop pop{$SubstituteFont begin
-/$used true def dup length $slen gt $sname null ne or $slen 0 gt and{$sname
-null eq{dup $str cvs dup length $slen sub $slen getinterval cvn}{$sname}ifelse
-dup/CMap resourcestatus{pop pop dup/$cmapname exch def/CMap findresource
-/CIDSystemInfo get{def}forall $findfontByROS}{pop $findfontByEnum}ifelse}{
-//SubstituteFont exec}ifelse/$slen 0 def end}}{{$SubstituteFont begin/$used
-true def dup length $slen gt $sname null ne or $slen 0 gt and{$findfontByEnum}
-{//SubstituteFont exec}ifelse end}}ifelse bind readonly def}{/findfont{
-$SubstituteFont begin dup systemfindfont dup/FontName known{dup/FontName get 2
-index ne}{true}ifelse dup{/$used true def}if{$slen 0 gt $sname null ne 3 index
-length $slen gt or and{pop dup $findfontByEnum findfont dup maxlength 1 add
-dict begin{1 index/FID eq{pop pop}{def}ifelse}forall currentdict end
-definefont}{exch pop}ifelse}{exch pop}ifelse end}bind def}ifelse end end}if
-end
-%%EndResource
-%%EndProlog
-%%BeginSetup
-Adobe_AGM_Core/AGMCORE_err_strings 3 dict dup begin
-/AGMCORE_bad_environ (Environment not satisfactory for this job, which requests at least
-PostScript Level ^	and at least PostScript version ^. Ensure that the PPD is correct or that
-the PostScript  level requested is supported by this printer. ) def
-/AGMCORE_color_space_onhost_seps (This job contains colors that will not separate
-with on-host methods. ) def
-/AGMCORE_invalid_color_space (This job contains an invalid color space. ) def
-end put
-2 2010 true Adobe_AGM_Core/doc_setup get exec
-Adobe_CoolType_Core/doc_setup get exec
-%%EndSetup
-%%Page: name:1 1
-%%EndPageComments
-%%BeginPageSetup
-Adobe_AGM_Core/page_setup get exec
-Adobe_CoolType_Core/page_setup get exec
-%%EndPageSetup
-Adobe_AGM_Core/AGMCORE_save save ddf
-mark
-/0 
-[/DeviceGray] add_csa
-/CSA /0 
-/1 
-[/DeviceCMYK] add_csa
-/CSA /1 
-/2 
-[/DeviceRGB] add_csa
-/CSA /2 
-cleartomark
-800 path_rez
-1 -1 scale 0 -50.0684 translate
-gsave
-[1 0 0 1 0 0 ] concat
-gsave
-0 0 mo
-0 50.0684 ln
-243.005 50.0684 ln
-243.005 0 ln
-clp
-save_ctm
-restore_ctm
-save_ctm
-false op
-0 0 0 1 cmyk
-%ADOBeginSubsetFont: TimesNewRomanPSMT Initial
-11 dict begin
-/FontName /TimesNewRomanPSMT def
-/FontMatrix [1 1000 div 0 0 1 1000 div 0 0 ] def
-/Encoding  256 array 0 1 255 {1 index exch /.notdef put} for  def
-/PaintType 0 def
-/FontType 1 def
-/FontBBox { 0 0 0 0 } def
-/FontInfo 1 dict dup begin
-  /OrigFontType /TrueType def
-end readonly def
-currentdict
-end
-
-systemdict begin
-dup /Private 7 dict dup begin
-/BlueValues [-15 0 600 650] def
-/MinFeature {16 16} def
-/password 5839 def
-/ND {def} def
-/NP {put} def
-/RD {string currentfile exch readhexstring pop} def
-2 index /CharStrings 1674 dict dup begin
-/.notdef 
-<10bf317005b8302fd45b0609d6bde5a48b0240d44d91aabd11b7ee50303a
-812fda6ed97443c437b8d3bea589> ND 
-/Q 
-<10bf31705c375b3d52a087ef978560249a4597ba98441cc66e94244ad145
-c0a541a1f1c73421b75064f16fed0f9d96d98ffe5bdfe6240d16d785e796
-f5bf167f541f6e56141f50a02cf4a93c5cca07a4f4682dcbbe24d8cf2e50
-08c74d80b07f691eff4361149cf65f000b186be857ffb24234ccc178ab11
-e3949a0ae9b9125e35d367986c77a566c6ae701c115492fed900be736c31
-79eb551adc6286b5d2b24d9c6eb1a21063193544d4c911511e8dff8445b5
-81741ccb1f> ND 
-end
-end
-put
-put
-dup /FontName get exch definefont pop
-end
-/TimesNewRomanPSMT findfont /Encoding get
-dup 81 /Q put
-pop
-%ADOEndSubsetFont
-/TimesNewRomanPSMT*1 
-[
-81{/.notdef}repeat /Q 174{/.notdef}repeat
-] /TimesNewRomanPSMT nfnt
-/TimesNewRomanPSMT*1 findfont [37.4396 0 0 -37.4396 0 0 ]mfnt sfnt
-BuildWidthShowArray
-0 37.7002 mov
-(Q) sh
-restore_ctm
-save_ctm
-%ADOBeginSubsetFont: TimesNewRomanPSMT AddGlyphs
-
-systemdict begin
-/TimesNewRomanPSMT 
-findfont dup
-/Private get begin
-/CharStrings get begin
-/I 
-<10bf31705600a7ed90307a9003ca62013c6a672422c0c34b05034e95c8f7
-969417f94f7eac24f8d7c31dc052f016b9f05f0040a8a0c827a04a2d6287
-87ecaa09b381453efd6c9025f1b2b32970689c6b042586dfb91b9d0b727c
-2376cbc464e5847700341fcd3ac89effa6235dd054f5> ND 
-end end
-end
-/TimesNewRomanPSMT findfont /Encoding get
-dup 73 /I put
-pop
-%ADOEndSubsetFont
-/TimesNewRomanPSMT*2 
-[
-73{/.notdef}repeat /I 182{/.notdef}repeat
-] /TimesNewRomanPSMT nfnt
-/TimesNewRomanPSMT*2 findfont [37.4396 0 0 -37.4396 0 0 ]mfnt sfnt
-BuildWidthShowArray
-25.5205 38.0317 mov
-(I) sh
-restore_ctm
-save_ctm
-%ADOBeginSubsetFont: TimesNewRomanPSMT AddGlyphs
-
-systemdict begin
-/TimesNewRomanPSMT 
-findfont dup
-/Private get begin
-/CharStrings get begin
-/S 
-<10bf3170383eecc69ba25cd9f9f1a3f9446af5f47f0b6f5a66a03292ff71
-223ca19d7846bc6a38c24691a92aa6d39bbe32cd43e95ccf56f198cc06cb
-f5e035e21e94e42a6a1070cb2c809a15a19050abb5948a4d31f6c5c84b4e
-4af71164b9f195aba815d5d7bd1f87734bfaa8261c267697431013c3002d
-769d09f7f0479ffa13457f45f8fe1ef50e2e59640f0f713a98cc93dc94f0
-7bb5c27a5fa3d59fbdb2e3ec6494eb03c3f52f8abd7bb0d38b9bde811abe
-01dc0d1e1b97c3fdba0e39bb69648b584e346a3a71962be678485698d0b4
-9afd8211afbd3bc059adaf2c73e4eea5b8a9e5e3323b0439c528acb70d9f
-b04b8e40afb5b00291e522a5ea6d69afa41593a428ca7ecaa1c600> ND 
-end end
-end
-/TimesNewRomanPSMT findfont /Encoding get
-dup 83 /S put
-pop
-%ADOEndSubsetFont
-/TimesNewRomanPSMT*3 
-[
-83{/.notdef}repeat /S 172{/.notdef}repeat
-] /TimesNewRomanPSMT nfnt
-/TimesNewRomanPSMT*3 findfont [37.4396 0 0 -37.4396 0 0 ]mfnt sfnt
-BuildWidthShowArray
-37.2422 38.0317 mov
-(S) sh
-restore_ctm
-save_ctm
-%ADOBeginSubsetFont: TimesNewRomanPSMT AddGlyphs
-
-systemdict begin
-/TimesNewRomanPSMT 
-findfont dup
-/Private get begin
-/CharStrings get begin
-/period 
-<10bf3170209b218f27ec1e9d95dd396c64928fd9b4492fdd67edb2272195
-ea38929abcbbfbb285f458c8cef720f2543831b530ecbdba8b71a752883a
-15514b25a8dbbd07e0> ND 
-end end
-end
-/TimesNewRomanPSMT findfont /Encoding get
-dup 46 /period put
-pop
-%ADOEndSubsetFont
-/TimesNewRomanPSMT*4 
-[
-46{/.notdef}repeat /period 209{/.notdef}repeat
-] /TimesNewRomanPSMT nfnt
-/TimesNewRomanPSMT*4 findfont [37.4396 0 0 -37.4396 0 0 ]mfnt sfnt
-BuildWidthShowArray
-57.9312 37.4395 mov
-(.) sh
-restore_ctm
-save_ctm
-%ADOBeginSubsetFont: TimesNewRomanPSMT AddGlyphs
-
-systemdict begin
-/TimesNewRomanPSMT 
-findfont dup
-/Private get begin
-/CharStrings get begin
-/n 
-<10bf3170638bba1389001ebc99bd428947467ee318fefc1fb124f3371d83
-7966c790a079b275ca99c79d7464e552ffd0f1af460f8ea65529382cdd07
-4674d72648baccb346303e8100a1f95821fdbf92377893eb17da4ab68e71
-80324c8db584bd0bb680f6dae406f3be267326ec310cafd5cdc15abe1737
-df8e327860dd87a0d7ca5cc3caaaec8addbc764fba940abee5eeeb36b470
-f8bcbccaaee1030ab8bb7e290a869adf9134ba84411dafdd10e69b7c30cb
-2b100f1b6f18b9b8f2b6f466715dc320141240ce2c9ab557fa104763f882
-a6> ND 
-end end
-end
-/TimesNewRomanPSMT findfont /Encoding get
-dup 110 /n put
-pop
-%ADOEndSubsetFont
-/TimesNewRomanPSMT*5 
-[
-110{/.notdef}repeat /n 145{/.notdef}repeat
-] /TimesNewRomanPSMT nfnt
-/TimesNewRomanPSMT*5 findfont [37.4396 0 0 -37.4396 0 0 ]mfnt sfnt
-BuildWidthShowArray
-68.5396 38.0635 mov
-(n) sh
-restore_ctm
-save_ctm
-%ADOBeginSubsetFont: TimesNewRomanPSMT AddGlyphs
-
-systemdict begin
-/TimesNewRomanPSMT 
-findfont dup
-/Private get begin
-/CharStrings get begin
-/e 
-<10bf3170422f4b41885a9676842055648b7ac91c5b68486f08b9925be5a4
-60b43789b53ef3b9b877c7e7005705a6349e2c40728dd486236996d7488b
-de56bf5db6d92996a7a8ce705892bacba17194a89633f6479b535c40974a
-93000c3141546b8f7c576cdc9c1b35fdbf110119f122c4b02941f0291d95
-1d06ade19f2aba378cca3bff7328dd85d10facfd1834ad5531262dfae737
-> ND 
-end end
-end
-/TimesNewRomanPSMT findfont /Encoding get
-dup 101 /e put
-pop
-%ADOEndSubsetFont
-/TimesNewRomanPSMT*6 
-[
-101{/.notdef}repeat /e 154{/.notdef}repeat
-] /TimesNewRomanPSMT nfnt
-/TimesNewRomanPSMT*6 findfont [37.4396 0 0 -37.4396 0 0 ]mfnt sfnt
-BuildWidthShowArray
-87.0508 38.0635 mov
-(e) sh
-restore_ctm
-%ADOBeginSubsetFont: TimesNewRomanPSMT AddGlyphs
-
-systemdict begin
-/TimesNewRomanPSMT 
-findfont dup
-/Private get begin
-/CharStrings get begin
-/t 
-<10bf3170675b4d3401fff3ff5f765da0613b785b68f16ce9d5b5009ed6e6
-c17a99d782a0b8170a32295317d6ff13c6b2b3428fdbe7079492aeaea2a9
-67dc16f3ceac0a5c4a3dea104555732498258f9dde1e32f8f3bd67606686
-3878f49a7b3c611ccf1764ddd808f62cd239b60518d713e318d042a89036
-f7226dd2774d> ND 
-end end
-end
-/TimesNewRomanPSMT findfont /Encoding get
-dup 116 /t put
-pop
-%ADOEndSubsetFont
-/TimesNewRomanPSMT*7 
-[
-116{/.notdef}repeat /t 139{/.notdef}repeat
-] /TimesNewRomanPSMT nfnt
-/TimesNewRomanPSMT*7 findfont [37.4396 0 0 -37.4396 0 0 ]mfnt sfnt
-BuildWidthShowArray
-103.067 38.272 mov
-(t) sh
-112.635 40.5591 mo
-112.635 40.5591 -88.0542 40.5591 112.635 40.5591 cv
-f
-1 lw
-0 lc
-0 lj
-4 ml
-[] 0 dsh
-true sadj
-112.635 40.5591 mo
-112.635 40.5591 -88.0542 40.5591 112.635 40.5591 cv
-s
-save_ctm
-restore_ctm
-save_ctm
-restore_ctm
-save_ctm
-restore_ctm
-save_ctm
-restore_ctm
-save_ctm
-%ADOBeginSubsetFont: Arial-ItalicMT Initial
-11 dict begin
-/FontName /Arial-ItalicMT def
-/FontMatrix [1 1000 div 0 0 1 1000 div 0 0 ] def
-/Encoding  256 array 0 1 255 {1 index exch /.notdef put} for  def
-/PaintType 0 def
-/FontType 1 def
-/FontBBox { 0 0 0 0 } def
-/FontInfo 1 dict dup begin
-  /OrigFontType /TrueType def
-end readonly def
-currentdict
-end
-
-systemdict begin
-dup /Private 7 dict dup begin
-/BlueValues [-15 0 600 650] def
-/MinFeature {16 16} def
-/password 5839 def
-/ND {def} def
-/NP {put} def
-/RD {string currentfile exch readhexstring pop} def
-2 index /CharStrings 932 dict dup begin
-/.notdef 
-<10bf317005b6d50bd3b903bc9f60e6e804630266f839393d56ae50a85fbe
-ffec110deebde9f8a007323688ac> ND 
-/A 
-<10bf317085248986ea88d33d7968f405c8efbea768e4e44c503845c0c065
-7f444c3e7e1169cd2ad063e267b90e5b90657c37640ec7652530b3094a8c
-2e8b0dfec3067453605f452346> ND 
-/C 
-<10bf317014468e441c5d3821b916cc9f55184595d9d4ef5d5cd9725eb438
-2913746b68f3a6737699dec81813e07f824deef8879ba336bd1f1b179f74
-0feff77d22f88ef8b5427aadb3d6df4124b328221d2b23673af0d34ed862
-c18a2add6d3592d721f4eae8afccd17ed94bee122afa38ef7d64cd1f4363
-b84c9c02cdd9c815c1c7bb76ce15> ND 
-/L 
-<10bf317041f0e16105f281de4854f606ad30dee2bd69dd8e8e9c3ae3cbee
-95b326f3> ND 
-/O 
-<10bf3170144676e27ef529b559053bbe72db2925176c656fab2af0693ae0
-cd0476cafe011ec5c21eca4bd9ed39b72809645db7150a589a6754e2efa7
-b8b70dda198ff9df0d295a9861016c9d397936ac820f70663a27f299ccf3
-4f10c9236d38af6e312a1ef09a544d6f57a4c74fc38a7e5e57773d45aedd
-99260dfc1b06c6e489e12540d7adf7e7f24c0fa39645b71e4aeb37afe490
-4848154b4d5e697153885e2a55f179a739d8879722be3c26158a> ND 
-end
-end
-put
-put
-dup /FontName get exch definefont pop
-end
-/Arial-ItalicMT findfont /Encoding get
-dup 65 /A put
-dup 67 /C put
-dup 76 /L put
-dup 79 /O put
-pop
-%ADOEndSubsetFont
-/Arial-ItalicMT*1 
-[
-65{/.notdef}repeat /A /.notdef /C 8{/.notdef}repeat /L 2{/.notdef}repeat /O 
-176{/.notdef}repeat
-] /Arial-ItalicMT nfnt
-/Arial-ItalicMT*1 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
-BuildWidthShowArray
-26.1079 47.8394 mov
-(LOCAL) sh
-%ADOBeginSubsetFont: ArialMT Initial
-11 dict begin
-/FontName /ArialMT def
-/FontMatrix [1 1000 div 0 0 1 1000 div 0 0 ] def
-/Encoding  256 array 0 1 255 {1 index exch /.notdef put} for  def
-/PaintType 0 def
-/FontType 1 def
-/FontBBox { 0 0 0 0 } def
-/FontInfo 1 dict dup begin
-  /OrigFontType /TrueType def
-end readonly def
-currentdict
-end
-
-systemdict begin
-dup /Private 7 dict dup begin
-/BlueValues [-15 0 600 650] def
-/MinFeature {16 16} def
-/password 5839 def
-/ND {def} def
-/NP {put} def
-/RD {string currentfile exch readhexstring pop} def
-2 index /CharStrings 1674 dict dup begin
-/.notdef 
-<10bf317005b6d50bd3b903bc9f60e6e804630266f839393d56ae50a85fbe
-ffec117da7ee51b33a5a233cda9aa5c3> ND 
-/space 
-<10bf317079c7734bf7> ND 
-/c 
-<10bf317040c2e74a5fc1787aadb34082a974ca8bfdce94e11266bf025cb7
-0165d6854d700d70cc5444b9f61253adefae30a0411da65b303e54163273
-771b8917fdcb996d46a918dadbf0ac7f3fc07110b5e4794547b6eff7de49
-7e69fc6e8381938653cd90c476c4aee37f40cb1165ebe6f2b5655eacf33b
-1b7c58ec799cd6ac7895a51a3f59a1ac6ba84d> ND 
-/e 
-<10bf3170422fdb64737aa996af2c16ab61f139259ccfce996f56e5f89332
-9f7b50633061a72210c8a6b5d13fe3bb9b88ba842302ec1ae1e32bf6cd49
-8b054e2c54c7892b319ccb1b99d65997437b14ddcef375af397068617b4b
-a8b59dc2e0e5b584c508b01db96b294c218d115c2d03379ed774785408d4
-3e0cb3b8511668ef559f40e3101d956d8627deece251b2315f5de4af> ND 
-/i 
-<10bf31703f9c43ec382ac71b0be91f29c503cae1b1e6095503cc0fe0ac65
-3b18436e1776> ND 
-/r 
-<10bf31703e6aa4be08d01c511eaadd0473a3490b93b478f689beebddc801
-f9ab05d95370b6f2d5e4eaf0e05d2c29f4d91b00084ec9f87aa58fda4ad7
-8d5d66fcc7e8afb13d634e9fe58c768d42> ND 
-/s 
-<10bf3170586c182310772ef569c52e8bfad70b259ad08351d1ee7f8301db
-56e87b60c2698b50b73e6d27e51b4b4c4de13e01b73b0e93916fb4e9bc20
-eb2383ce966a3f407cc2dd34fe3886d20337fe9b35727881532b2484bb21
-37910e0951e4ed8d0834c0f1ea6967e8f5ec97508509903e613c902ab20a
-2584a430e00608bec28b5ad77a90ca85cabc0e7931cda83a171815946dc1
-e37a6e5968afc67def1b22528a96d5ff182bfd780f19cd36c8689597438e
-a97ac397a0bce69309b562a1ba4d9173f5cede5262ffcd19389598a980ab
-b12fde1b7188b7ce2e37fd5029f6095ff151c09be98b02a5038a> ND 
-/v 
-<10bf31706ae07dd17dfc9e3ad4fb8a8843b0ccd3bf37159e4d997ae7db46
-1605af60e723de30a8f7915cee06ac348ee0e2ad17e20e> ND 
-end
-end
-put
-put
-dup /FontName get exch definefont pop
-end
-/ArialMT findfont /Encoding get
-dup 32 /space put
-dup 99 /c put
-dup 101 /e put
-dup 105 /i put
-dup 114 /r put
-dup 115 /s put
-dup 118 /v put
-pop
-%ADOEndSubsetFont
-/ArialMT*1 
-[
-32{/.notdef}repeat /space 66{/.notdef}repeat /c /.notdef /e 3{/.notdef}repeat /i 
-8{/.notdef}repeat /r /s 2{/.notdef}repeat /v 137{/.notdef}repeat
-] /ArialMT nfnt
-/ArialMT*1 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
-BuildWidthShowArray
-46.3939 47.8394 mov
-( service ) sh
-%ADOBeginSubsetFont: Arial-ItalicMT AddGlyphs
-
-systemdict begin
-/Arial-ItalicMT 
-findfont dup
-/Private get begin
-/CharStrings get begin
-/D 
-<10bf317045bba87c3c1099877b6403823f685b41b86eb1dc130c34f91691
-50e157f9fa55ac001d8c686a6333d2a9713ee84e40cd01472950796882e7
-e5d70786109711700d4236fd6875fed7ad576f621fd927a2d6cf0f358ab7
-a9d777d889dcacbe9a3b249ef6607e4c9d5f55bb001606e6029d15d8b6c6
-72d660ba8b7b0c93904171ae029b1910ebb278e37a329958fbfd7b191178
-4beac722e64b3c1ae8> ND 
-/R 
-<10bf31704854f6e1b259745437e2ea750d93592ff68cdf894f18b8536c69
-3ad09f1afc6dbf04129bd98e6ffcb8eec52e2a1d51d7f58aa8f299f3ec3b
-5c58d67f5ff4c3cf6e7f7bdd9f528969122eb84418d3afd2d1ce537c7d53
-f14d7dfb8e13feaeffdbfb8e9dd044cb6baed83165ec2dfa14f5cfb46343
-38da9c8838cce43e666b9a19d427bab1a9b910ed6c9890b8c230998301ff
-09dcb92c5266e9d0c81878a0e31665564d8f408db4adf804> ND 
-/W 
-<10bf317005b6d613e16c68aaefc6b34577bd131b1ef403827cef23103543
-78a8c64551510b76477b29053c7c7e7266bb873dc2d3dc2ac00ef1e0dcff
-fbe000523638e9dcde2864f474e6d10d01698e9af67f7d0e2611a8ea72ff
-49c1d8c6af2aa401e7414ab1ec0144dc774f1bee43e8616d84ba67cc4646
-389ba9> ND 
-end end
-end
-/Arial-ItalicMT findfont /Encoding get
-dup 68 /D put
-dup 82 /R put
-dup 87 /W put
-pop
-%ADOEndSubsetFont
-/Arial-ItalicMT*2 
-[
-68{/.notdef}repeat /D 13{/.notdef}repeat /R 4{/.notdef}repeat /W 168{/.notdef}repeat
-] /Arial-ItalicMT nfnt
-/Arial-ItalicMT*2 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
-BuildWidthShowArray
-69.4255 47.8394 mov
-(W) sh
-/Arial-ItalicMT*1 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
-BuildWidthShowArray
-75.2642 47.8394 mov
-(O) sh
-/Arial-ItalicMT*2 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
-BuildWidthShowArray
-80.0759 47.8394 mov
-(R) sh
-/Arial-ItalicMT*1 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
-BuildWidthShowArray
-84.5433 47.8394 mov
-(L) sh
-/Arial-ItalicMT*2 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
-BuildWidthShowArray
-87.9837 47.8394 mov
-(D) sh
-/ArialMT*1 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
-BuildWidthShowArray
-92.4511 47.8394 mov
-( ) sh
-%ADOBeginSubsetFont: ArialMT AddGlyphs
-
-systemdict begin
-/ArialMT 
-findfont dup
-/Private get begin
-/CharStrings get begin
-/a 
-<10bf31705d64e193f9f1f8a567d03549fa73483ae9b672d7b7797200c526
-6d55e0abf05d082c89da2ef3d2f91996afd8e100af13d8e4b339158b9d4e
-0256bc0329e2558ef3a479ac944060941a5a0ef5dc04c7a41bce2731b9f6
-bac3899bfe4b490bb12e4abb60728f8dd08e79a22a9692e2e377b4d6d5c9
-90d58983bd1034efca9e5a712e5fac945f9b4432273fa80564af2b96e4b5
-70911aa8878cafbb79a548cdf67b5fd07c85ed1a9f7575ac0b1cdc57118f
-0bc5ec90d16e3c70642d41ebc8d851a2770f7e9e3366dcaea1eeafe88adc
-1075a75e7e694b5e09e5b68c30faa47727bbcc80df324abdee2341fefa79
-33b84bfd3fdf5d94b0c28761234c47086bfdc62b798b> ND 
-end end
-end
-/ArialMT findfont /Encoding get
-dup 97 /a put
-pop
-%ADOEndSubsetFont
-/ArialMT*2 
-[
-97{/.notdef}repeat /a 158{/.notdef}repeat
-] /ArialMT nfnt
-/ArialMT*2 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
-BuildWidthShowArray
-94.1698 47.8394 mov
-(a) sh
-/ArialMT*1 findfont [6.18607 0 0 -6.86392 0 0 ]mfnt sfnt
-BuildWidthShowArray
-97.6102 47.8394 mov
-(ccess) sh
-restore_ctm
-save_ctm
-restore_ctm
-save_ctm
-restore_ctm
-%ADOBeginSubsetFont: TimesNewRomanPSMT Initial
-%!FontType1
-16 dict begin
-/FontInfo 15 dict dup begin
-/Notice (Copyright (c) 1988, 1990, 1993, 1996, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.Times New Roman is a trademark of the Monotype Corporation, registered in the US Patent and Trademark Office and may be registered in certain other jurisdictions.) def
-/version (001.002) def
-/FullName (Times New Roman PS) def
-/FamilyName (Times New Roman PS) def
-/Weight (Roman) def
-/ItalicAngle 0 def
-/isFixedPitch false  def
-/UnderlinePosition -100 def
-/UnderlineThickness 50 def
-end def
-/FontName /TimesNewRomanPSMT def
-/Encoding 256 array
-0 1 255 {1 index exch /.notdef put} for
-dup 0 /.notdef put
- def
-/PaintType 0 def
-/FontType 1 def
-/FontMatrix [0.001 0 0 0.001 0 0 ] def
-/FontBBox { -167 -250 1009 878 } def
-/XUID [6 44335 ] def
-/StrokeWidth 0 def
-currentdict end
-currentfile eexec A0B00ED5187D9C0F1ECDF51878C3AA5CAA3EC70E14AF46
-F38884AB0522111E1FD6B5E52246D33165D7360B47FEE2078BDAF9F5724920E2
-B8C7C8DEF08111E9655FEB2D7D43B90DD0271717BD08D48D1209FEBFE7B9C4C9
-04828D33C143D5CDA944594BA8901247766DFFF8952C9A24AE1BD58BEDD61A48
-002D4E12E59AAE2CE61CDCD892A0D488E46BB11D275934A058DC403F9249464C
-F61C23C6C10E0372E1EA37A18927344183EE570CF03B887B71371320A61E7662
-4F85A357361319A1409F150A3D7B70FBB2B447FE11C50D32A3F15514314EE3B9
-CF26AD6A4896044B60E048EC7B6E3A0A6A92DDF428AA185F0544D20D54E1344F
-E0273E699A1B05DE27F5A48CCA7370DECDCEAEA4896E6B6FC3F061CBEC77C0FC
-893AAF27C6C349B8E7D92A00AA5B6334B4D446328E8D55B26E3E7BCA54CAE765
-9531679FE31E9B6FFD9217C3F05E52D540109A177C9CC1B2213C8829C56A8F65
-2ADE10AE0E2AF46B9246A692F9636DD633EB0515D149583D141DD16B8E92C542
-D5B9F572B162E3C0A9E6ECD51C6EA7697082A08B040C103EAA64851057089C23
-0F3B78A0409F144321F59888D696B0E0506B3994A65A25B17A42505548FC0333
-9221D659CC8F5781D0A6E2859FE2289B5A0F72FABDA8996956B60FF0508BB8EF
-C4327C55ABBF900DCA9BFFF8687B1A0ACCE0DE3E6EFD330E1A0060EB01378736
-45995BE9A9AD0FCE88EBDF566CFB4995F43272ED3EE7232573EED8D72F527476
-46AFEA9585638092AE80092D1AC879423482BA0401BC58B26CCE6146F461EC82
-7B541B24253360621F3A38E8CEDD6B1A92D767A1B9DA1DF23CF23716CC5B53F1
-E653C1FDD3715494C9F167ABAC6A8F122ECC96239F856E5A9AC2F779D70AD62C
-EF652BD327FF7B052514CF90D0DF0D26A7E815A85241383F282D4DBCCA06E35E
-52A0FA84822456DD767F9CA63621AEE9AA7BC2F50CB4601E11E7CB34781D7D9E
-21B33A4C1F8FCFED88788A93FBA5441D7B15BB6DCDF2900D7E01661D88E11E39
-2993DA88A17CF307EDB8C3F7D61469BB914CA49CF5F51624C043D2AF43D5FEA7
-556DEAE52D61A7ECF7EAB82D2C23BE11C636FD727DB3F0FC340241D9773C5E51
-8758E7ABC75917BAD12C3C5CE4829D2FFCBC2CB66657B684855A611DBC0EE29B
-99A3D4CC244CA7F13F4C8A4F4D6F207766C8EDF1F7BA05ECC1CC5BC410F217E7
-2CB1AB266B2D6D8A6F82A65563808053DD0B0100E3CAC3327CFFF0C0C2B8CDC8
-1BCB6AF3D744F75E71E2068D424A08814972FE8881641522DD3DFA6F664F0AC5
-D75F2D0825EC312519393CE90FB6FAF90C48E6DF94798C7CEEA269361059554C
-A99120A0E811C18EC46A5914D6F21F1D4F799C5CBA37CDCDB9F53D96C663AD9A
-27B70AF02B40FAB0AE87BE96A790BA745FD588E707459A97339C193785262758
-22AFCDF30BCB61191C8267D9F7325AEB2F27D529903DA7055EAECAC4965F5572
-3970221C553A22D936D630DCE92114919A7DF8A665B5C08718417C9C94768532
-17ACAE809C3C2C644AC5A2C1F21FBA4E18969948E197A2535592B294A1BB1D4A
-DFB0122BE080AB926C832EBA5B2DAF1BBDDFFFE449F7AD9CA252F0C02D7C05CF
-8521DE85D85A8ACAB2E6A8B684FD977A5BD5A993288F1DE02977258E6227968E
-D92E56FA3CA27FC50AEF8C6B9FE3FC74E496B34CF76178C6984DD2673B628E67
-DB89D947D6F6C89B51440760C1590638990604186FBE11B9D705FC0197CA4EF0
-32F17B6FA8FA09CE119550B63063A378A1B1009D489361110A1BE12C5C50A72D
-925C8A5ECB2908C8F07BD0B131B290DBA25E56C0C9A655F5EDFD8A4ABBC2BF4E
-8B26642B21A8DF00D425BF0EA9DD07FEC4FA1B221B62E5EA46B3FF5635E21A8F
-430A2C3999A42936D4F245EEF238837C17E77FB57DFC6C756A6AEE844FCE7C18
-86B82D6D8F0BB3E62A4475119C5D79A7AB72ACE121EF642054F2780BA215BEAC
-F6F286BEF9FECBD3B2978540EC9AA05E5C13115FB1B6C318A11C9BDFDC78FE01
-15969161C0530933305E2992E99655D0F5AB5CA24D35E57DA39898C0B2C52A0C
-1223C35DE320D69C1A2F78A85A08DA26A5A4B3DAF543B1E6C01CC551DF05C087
-1CFA8CE76194CAB757285F63450B8385636FC06FCBD781C73A4659EC6535424C
-AB88385650FCFC21FD62C081466C2F249A7D40DFEF42742C22EC2CCBA77A7B83
-DD1FC329B0AF8EE2DDBA98CA283E85E56832DF6F5B86AEFD92C37107C0908C1F
-F5F4ED75045C464F72DFE354419AD9C2C896C24562BB9F2DE4EEE226BF6399E8
-447BB56A27404DDEEA6F3E4EBFBBC17C061ED43C8383AF14FA8803379C8F1B52
-C5A063215D824CF1B42346D5ED670FE58F86B6BBA2F7E9FE53A26428940C2AE9
-E300982E3186B759692E52DBFD53BEAA2BB94FA12D4D819591544EA48E032916
-05EF0DA71116344B23EB418105F5C8E735B5AA749C5A15C23D0ED1E788762F68
-06F41B5EF001679A48416819766865AD986EBE2831D1316534A10E8A7CB9583B
-E021A0563E5B25CCBD0B90ECF5BD21C6DB5217CBA4814BA1FD521CCE06689469
-126F793448C7144E78B776FE71A73CE038ED6F7DEF99745F4B389ED2E0FB8CCD
-451F88EDB754EB4C737A47862E71F4657056ED02D0478EBA607476FF9C798574
-B7C13581469BEA14057E85642A4878BA582A5AB6A4BE90392A78604DAA46D249
-005BAB80152EB7ADFDF0B16688DA7FA55B1144F6148CD89013A9B8AFB329FA9D
-F0BD1C5F7221D52C6BEB34FBED698201B82896C71197B2D67FA9AAA984FF5A62
-6043B055CFD6F31FD7542BC533C7D69E83501C0000051B52F3F0DC5551B7C296
-368C5E766DB967BB1301E40C7D94EEC3F41BA6237F27907F23A9059E757E677E
-D9E728CA3DCD9146D5E4F3542A18299F9722922779A989B72ACAD00848E44BF7
-DCB02C951CEC716933D1EFA1AE2817D98D688330ED67BE9C2181B6805323F21E
-E93263B50EA8421FC555D983F8772CB6A426B8B7D083D6FD7711699C70F8B562
-25FAEBE44363F6DC3F36CDF15F83C740FB2856C1088BBBC2FC6FAEE7E3447142
-C17C70818684B7652C90DA1B1E02A50FA6FB36DE5EBAA050B3362A86315D3859
-2A54070071C74061D2B53C9A4DB8125DC2849DD90903297BBB5A7050FAAC9542
-F3CD9349BF4CBDC29265BCAC14675E09269240541705268012F9EBCEF5BBBFE8
-B0076CB7F8D9C24706C8DE086B9F060D7231A9FE7DB44798463D2B7FEF7A4649
-C206884B0100A5DF56B8DAAC505C9D9ED59B261F805E3BB09C3C5F8B780A7808
-FE2B68B7CD25559E2FD9D1B26E32111FD9E56D28D704F584FD37822AE5F4A0EF
-3CC7E2B8507D6725DAD5CC70AF63AEB79973A41DDD8C8E0BC7103D85FE2A3811
-EE7C0CEB036908B147179C7F1E25486F2D70DAE4776C29499C8E97A425EFEDFA
-1017C7973C0DE42E3E6CF1EF9FAE21D6F774ECEC4A0AD629381B843C19C166E8
-7E8F436BEE6F0EBEF07F1B6D1B8C7E8E14459A5FA050E593632939993A09A685
-F1FA70FA441B6F757E7D405C391676AC2DC501EA35A65243D7354B1A490FD4F2
-1ECE6AF1D57D57AFB8342BE8687F6E3735DF37746E3F3F71B3E63A32433DCCFA
-FE7A0375D6F1CF477EDC6CD0D548E7E3209DD69A2465A60FB8409088B6C50293
-30A9639461E5FEAAD6A8584E04298084A5D710B5D7F59507583C6EE5E852DD2B
-AB30B216D83C42899A2F350F3D574DC00CB995CE1B57A90DB9A79DE625823ECD
-A273E9660D0F1AC9B089E566ADB19075E97FB9A0B992D40B326151DE315C15B5
-AE231EB71FC53B65C524876CEA7F9869E9BBBD01D4CF73A8EBBFB4A49D363D99
-01CFE53F92F90BC95630D45370A2BF90EB33052518F399D5B86E08FECF79526F
-45DEB188E5083ADDD60836B13D9CC0C59A84F9AD3160549EA3FB1197A733C295
-A7C857CDB5A977F5413BD09EBBC05099245F879B5E7DF3524F0CA07130547C4D
-B0AC8E61602920D0EB40B7E417862B40F35E72AAE8885D7EE0C79A93BEC1A4C7
-3DA8FFE33AF86E0481536C7B476A82CAF598CA1A384146EDF7E3C18DDE51A6C9
-8DDDA3A2121AEDEAEFCAC1FD0CB1FA5D8892D6F3606D112C4C98EAE345B37918
-F1E595CD9126FAF19ED27E80A2E79456224E22BBA45EBF5202A6CAA6C1AA8F3C
-431F8AA523914766C08DFF42D1F5B3FB36271B216547173EE2F5A5E4006E4662
-A9EC5A1CCFDA4D608CA6666D7B3C45644B3F5431E824C1E15DD3696C9C142236
-1E374046C88FC82E4724B05D6384561EB10D44E3093D753E27B6CC16F6D4B68A
-5FC375F151F1A954AA28DAD59ECD7ADDBB3BCE9EC19398A56DFF687726B74AD2
-E2A74EA721A16B211ED6C690F149520F32A3D3FAB2A2270B0A9C3837E6589004
-6BE4F1AA1AB49508254D3EB0F37641605CC397EA5E1E6D8E386724B40AB30F33
-350BBB44E448CDDA807B3C40F03914C3DF4EFCC71CCC9B6DD814121809BBE093
-AABACB7CB982EA4E56E03DF76EF1C94526EB4532CF007AE4BC26E06AF6F5EA74
-A743D9AD19723277ECA4249844F2FF7DFE5040DD3C1852C3D3B4468DC6F90BB0
-DD666949FADE57835CF3919FFF2F5A97C4C6363DAE7A994D241C2928BAD8716A
-0246FD262F7F82C7F48279A4E7A06C87F72DD57C8C80D5803DCEF6187FA8B491
-0E1AE105FB51E920EDAFE4B2B7C7C794A3D4AC7E7BD07E68E5B47BE5FC3F5093
-F01BDAB6BEF28040F3F3483D33A385774708D1615A2B33C3E60A0D296129FE32
-695956D6BDD6C3A300555A9BE13AA3A28A5CB4E5193D920FE562AE8D2321DB40
-DB3E3C97FAA2CCE232EE3F2FA4DE9B43D06D659A770E53297FA066B23F583779
-EFCC7F9DF4A94DC222E98F3591EBC9331CCCBA9F22EC11A644817C50CC929822
-959C8EBCFEE25C65CA60EEC54B7929FD94A30A0B1A9C76F99CF7175F2FABA182
-33C6428BCDC146A0520F3CF64B758A29FD042D9F3DF46988F59039ABA15150AF
-12E7C218C74E0FE4B38D2D5EAA3CDD36918FDE415EF4AB277F36FD86599B4023
-D04E5DA5EA917936383569232FA04B82AEE1E170719F39B2ED3AE1AF79622E68
-4FDDC634B6F9D6F0C13AEE674A5C3F2E2583500629AD06B222E362D72FD77475
-3E8254F8DB6A39956B0A056AD47E0BC8DB844127E49D241B97F232424C12E926
-38A4B22BCA4BF4D2B59AC3F9EECDC00401830FB36E958FC3E658BF69BB3CC27B
-B65BDAFF17277C247121F7452DB693C441E4F2A6EA7D7D078900AEFC120B6C98
-4C05AD94D7925D57DD9DC4EA1CE2118D990D40685E82111D783FDB03CE0D46B4
-86F22EF08CE09F7D3A77D4F3BA5A518295C5408E40738CDF42482E29806680AB
-9FA1DFB6030DC3DC7A11C376D5C90FA122BB8C767F1763F69EE6FE0F7CD0421D
-26C4D54C05F7E96C7A33BF9FB8A5C4126ED5C3D9D0D20F906D03D3737FFF324E
-6B86AC6A449406A09CAE8499188E55742DADF7F091EEA4F14B1CC95F25B7F15F
-9D1377EB09C31894A2BA92BF560E4AAD5DD5CF4BADB64AB6DEF9B77EF2CB53E9
-9CDCB8666EAEC3FB5A176A7D1178BE8B68BC598D25E345B49CA0ADC71F783E3B
-51D3385F433160A627C7D294BB50F33D70572EEDC2198746DF5E251357935582
-3FB026D7E40C3DC56CA58495355D016A874079FB707D459C7A82AC363A06AA5A
-1F3FB764125673A7C6ABE55A6FD35764E22D36A9D064E131543585D711D1DEB3
-3DC32EF9462AA51B4299F6B30BE810E91A5C767B01B82CB5E7396259B9947766
-52EDEB2E483AF7B25DA7C1A1A4DC4CEBB9A4A42A70B012E7E13A5CDAAADC0943
-BA17530928B0B5E14CEC9F469D7284FB6FD5EF1F2ECB6CD8B3E1053240F69D1A
-D9F49A6145AECD3DCB7966423B66CD88577DCA9D3E7A5A53AEE552E2C7A00D7F
-5C545743DE91634F06418DE6D96CBAD03EDEB004E6DE163C99F4186CB6060096
-797CFD9A76FDFFD5C42C779F09707E4B99771940FA686DAE548E62B70AA78312
-747307F41F36110B2129D07D037C04A0088DA4017A12DC6A90797544409E7B85
-E0241CF596A7FCA467D38E94564645B27877809EE6A306EAB9E2495F44E601DF
-375FA773FADB7D5EC41E8FC6D7C8384E780A5849C0CAF99CF3A4ED384AEBD12F
-C3B27427CD545A43863E826543CA92ACD75556868EC167F5AACA3D2D3E8DD5CE
-F53437BD77D1023AF92158EAA5B41B64BCBB00EDA884E44700990C0D1D208405
-D7A67E39ABAFE4FFF182DDFDC01AA48256EE0538DED57922AC2085A5AB34FEEB
-9C7751F6E23F8B1B57ED84538631035D80196B3B4104D0AA6381CDBE40B24203
-F5552096906D07C29946932E2C38952C6E7AF7B298F87B8F3C950B6E86F0C796
-F4C6ED6CA67916D8A3A85B4F6BD091A2C332560BC2A619077D443A7652B07E1B
-B10F7458457351DCFC7BDE64999975F27641BE52BE933016BDD6650E6ECAF3FC
-2370092475D7E94485F500DD30393713C588AEEC74D72A3535E079B1FEC0256E
-15E8D3300E2BE81F4A253567FB4B7C3A94D1429F4D6C6018C485F4DB981A3C77
-08E8C8040D00C840F2A1697244C5645F5BDEE7B0B5095138B9A16681C61928FF
-EBF47AF4B5D2F588221BCE4D0279B2DA2CA48B779C47AA0BEE215AC22ACDDFE2
-F9D54D8A891F40CA17C4ED3D203796535C68D2E6A145048CA6DA7835F7CC0BF6
-7064EA041AACBD417F50D1E73C9AE7547A4EB82A347A9BAD8AB20D8CB27693E0
-A3B4185E0756B0C1706B977A030E0D619B7BA612E7E7F6E7897AFC2A1E3A6B09
-8B05907CCD5F7207EA8E6F3AF2A8764D5480CD331031980DC01F286D1AC207C4
-6EB217124BD0D50C683E89D01E7189CF913B1868E69B3EE7F42891AA92203422
-4E5BD11B8C32B0EA4F1B4C2D2A3E31F24833D06CACEC187AECA366C7C3549F67
-5987FE22C0387982B0293A990D11A47C788327B36AB4FBFC1E009650D20F6C9B
-847CC9C49C376CB7A55A20120BEC302DE2C91315E9CE008E04663B5FF6F11477
-CC5D6C4D78CD913E492A0828B5EA16420ED299A44B95D0B6AEE95CE4AE1F14AA
-1DB92901A897634996B3C6A89E09332656BD311424673A8FC9091B55B2C985E2
-0D5CF45EA16DF6D6AAF14E9F90533C72FFEA93F63C7E9D591E0BB9FA497A94E8
-E2D9BEBCF1D24006313426B494EC890C68ADA4A720B30074237606E33B9179F5
-FAFDD7784B8C060F0C6C1E97E5796012AD8EE78D4A2A2BC10F1539AF2FB78139
-2D70D2B67F6B5B3DCE512A9B745F7C2447E1D5CC2A0A4C26A40CF5624893DFEE
-F554805F92DD10619FB0F3E73856D22E11FB0A8B916C6AA0E3E899A06F34429C
-C0862EB675801AF0C694B02BF89E602D3FC296C97C541D973CD82C1537D90852
-53EA3255E4DE8C623115FF1ED668BA81A46A1F6C2F31C7DE54347665868178DE
-AFF82E42A770C5CAC87A6FC8264238015DC316950F8C48924AC22927923BE41B
-4948FCC3B9FC10E7864D1553A7F4E93806FCB74F809DC782EB83824A40857C9A
-7895D3E03BBA1FD53351BF143059DD7122618460C08E1BCB21CB7D5CFCF04E68
-EFB20E142EC43EA066CC4CCE7FAF276BAB9535B3DDCE9DE17B8C9B92DDF42E3E
-5C0570D4D4568EAFB72C908516F6A1FB7CF7CD69DE6D7C051CC7072E62F060B3
-2CB21B04ACFA1A525AA4D71EEED8DE5C7C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-cleartomark
-/TimesNewRomanPSMT findfont /Encoding get
-dup 32 /space put
-dup 44 /comma put
-dup 45 /hyphen put
-dup 46 /period put
-dup 48 /zero put
-dup 49 /one put
-dup 50 /two put
-dup 53 /five put
-dup 55 /seven put
-dup 56 /eight put
-dup 57 /nine put
-dup 66 /B put
-dup 68 /D put
-dup 73 /I put
-dup 77 /M put
-dup 81 /Q put
-dup 82 /R put
-dup 83 /S put
-dup 97 /a put
-dup 99 /c put
-dup 100 /d put
-dup 101 /e put
-dup 104 /h put
-dup 105 /i put
-dup 109 /m put
-dup 110 /n put
-dup 111 /o put
-dup 114 /r put
-dup 115 /s put
-dup 116 /t put
-dup 117 /u put
-dup 118 /v put
-pop
-%ADOEndSubsetFont
-/TimesNewRomanPSMT*1 
-[
-32{/.notdef}repeat /space 11{/.notdef}repeat /comma /hyphen /period /.notdef /zero 
-/one /two 2{/.notdef}repeat /five /.notdef /seven /eight /nine 
-8{/.notdef}repeat /B /.notdef /D 4{/.notdef}repeat /I 3{/.notdef}repeat /M 
-3{/.notdef}repeat /Q /R /S 13{/.notdef}repeat /a /.notdef /c 
-/d /e 2{/.notdef}repeat /h /i 3{/.notdef}repeat /m /n 
-/o 2{/.notdef}repeat /r /s /t /u /v 137{/.notdef}repeat
-] /TimesNewRomanPSMT nfnt
-/TimesNewRomanPSMT*1 findfont [9.81659 0 0 -10.8923 0 0 ]mfnt sfnt
-BuildWidthShowArray
-117.875 21.2661 mov
-(Quantum Internet Services, Inc.) sh
-117.875 34.1584 mov
-(2975B Manchester Road) sh
-117.875 47.0507 mov
--0.392517 0 wsa 114 get (Manchester, MD 21102-1802) wsh
-grestore
-grestore
-Adobe_AGM_Core/AGMCORE_save get restore
-%%PageTrailer
-Adobe_CoolType_Core/page_trailer get exec
-Adobe_AGM_Core/page_trailer get exec
-%%Trailer
-Adobe_CoolType_Core/doc_trailer get exec
-Adobe_AGM_Core/doc_trailer get exec
-%%EOF
-gsave userdict /annotatepage 2 copy known {get exec}{pop pop} ifelse grestore showpage
%AI9_PrintingDataEnd
-
-userdict /AI9_read_buffer 256 string put
-userdict begin
-/ai9_skip_data
-{
-	mark
-	{
-		currentfile AI9_read_buffer { readline } stopped
-		{
-		}
-		{
-			not
-			{
-				exit
-			} if
-			(%AI9_PrivateDataEnd) eq
-			{
-				exit
-			} if
-		} ifelse
-	} loop
-	cleartomark
-} def
-end
-userdict /ai9_skip_data get exec
-%AI9_PrivateDataBegin
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Adobe Illustrator(R) 9.0
-%%AI8_CreatorVersion: 9.0
-%%For: (Home User) (Home)
-%%Title: (qis_logo.eps)
-%%CreationDate: 11/28/2003 2:59 PM
-%AI9_DataStream
-%GauF[?*@h]EMdrp!W@f6$NUr(Ub[#Qa'-.)a&#.UPStf)"(O"rnnXA!<Hn+8=%f7ss*$]RWc!uoBR;?7Mdj$(c9?UDPo9,3qaO%C
-%rop'SjbIch>493%eR*e#QQNu=qGtr5Q<JNK8,\Y'TDn))HM@%0boaU\8%$q-$\+CU:Ai*(UY=_HYEU+L7k4Mp?[nI#I_!5ioYni]
-%F+<f+?[[2!iSuj]If%=_IK&9qs845d^A>e*s2E$&rVb&kkth<Aci<RRT76(ohp(Wim[*CVgu&%sro]o'pp,DB`@q3ts8)Werl)?R
-%J,TB&?N5M&#-7CTgQ+J^O5I\6Oh]SAhYpu4)#GE3msj'[dm*cL:Wlu?;0iVBht(3ik0n7_rpZtLrTdhjk.B6!\+g33qjX5V_r#k.
-%lQ%)Cr;;Vica1bYrNcH<o0/Gk*In!05CNS2gM]9(m%6Ihr9a[e+("_bs7C#Tr9CcKlArYmIe2k9s882XnbL4Sr6;FW[_mH^^O6XL
-%miR#Lmf!.,LQ>g9:N,>bTE"KWquhNL%8ZKR\*))prV]O,Rd\!sq[:V\YNH5,H%+3@iVAgIlqa8K$l8kG\%hdms7X5*^>\V6hu2^C
-%s7PRP=7;_nJ+qp&s7U*>R\flY\\Hd(pWl(^rBC8,%p[/ihKT"nrMRtKkj<StifB`2m-XC#s4u<+br<see[P&(a+a!]oA.HZ^\s)Z
-%s7=.ls8VLus7T7f3P?GOq=Ecsn\nl4)<p`#C3[q3/,tJ+k1>(VT-$1&dUi@<rpoCLrR638q$?X`jmBR8s8:]F^OI]eo=QWO\+WiT
-%gq2\:IeGkdhZ*4cs7;</rmU:NJ,F1os5N(:?bH8#fYHdU?Ko):rqX%lpW(&KlCG*QH+U9+bPngYCVL*UIeW.mH/G7-r4Q`hrqYA#
-%Ib?sbC4F[lhLFjks7ksihuE%]^]!_QmD%=`:&=9FrpK+NeLs/bkN@d&0ZNT"^<ZZ4+!M4:"()cOF,QW\@VOTcmG.I)mT]KVhg\%0
-%m`H>Ji88s1pT&LFrR`LsCfAA=I*o^c++M#fV]Yrc^MXkBjc1G?^Yi`ea62@UiUbsemJ3/NrAPhUXkt"=95j"VIltpDU\"6ZH[YqO
-%n",iQ_e6a\c4g3;=6m%RI-Fu%07Whb)#mZ^`qp:]qX18rqj6JYI-.nFJ%*VI?i9iXZa',VNurY2Y<d*@dbC[\hsNF.r4@IYmB;GT
-%5Q7F.q*0;tM]Y--i(JM)%fDHU]nO646M_?Xpu?g.m&r.p+2@c@^#"4D`uAn-gQ0PRj+AqqY)=+qkF[2")(gknL$S+ccWp82[ibOu
-%TAct\s+YCd22HOKkC;u&_Xl+6q.G-Tfq*\Bros+Lb?s_IT7-M"",OVII%S1MnF>fTTABH9Dh%<VrS,YH_f+D9^A[SopA32.Wom79
-%Ga>i%@G]jho@@%iSDq`knK6XPgi&g6s,DNs:&i,c`s7_"8"T8,=3p2[a1qYngD;t6B]$R.Dnl5;>Q*B+^RP,rb:ia2hT#PIhk0f+
-%Vp><ki/Koan+=AEqsiK$leQsXksp49j.$(cDmE`"o&jo2:VXJ*B_'L,YA_2Trb)7aN=0elphjI<N6geT_cQ;Vo="Ak-\)-)+$TL+
-%Idjslrk\N=s7*LGbi.q*^Z!@cq99ias4s]bW./ogs*[uEhe.ZCp$2P8$N8i(r4?(ls0jlbiA^PR\*r5SD?#c)qSUk\iYVXW[Je9m
-%msjpnqWe*d5<mflo0<03]5N/hmU,\ain^O.laOL@s(6c[qp0r]0>@;5q[J]OJ+`PCJM?QMIC6ibnBJQmXSso.5Q'1fJ,O9aj&a1j
-%\+9>bS*g$(DiZ2/hu1n$/[.>jplAOE9]YRWT@hruEW,SaSf`HuVLJB<WuQT_L<mWThu3GuqPTDCroNO^#5mGl@/KnprnH3%htc)X
-%s*"G7YMX@a^o?5jl<b/us3DcVilVcF&&C&.DeD03YCH3Zhr3q^M*0els*bW?htI&94oaTGI>h[uIdQIfCXk.<D+EgAIBP_dYtGpt
-%=2e>-d:u;*;=5H.RqqA>hXsF[>UeGaQe4g,Hd+P0=QLP$)HUi?otKlkNk=H+`lW#k_/AoeiGPW%Z0eu40.fW,I-U%3YE7%1b"fS+
-%j!_5<?@H8AbRmNDnOOhBeZUL*qi#oG*nM=nRWhnm:F.jC'h5fJ)#<6nb\Nd.*%Afgk:3I$H*mAc[EilaH(D>IQB,rb<ZA`mRg6.i
-%5%ZciQnA'\O"28g[3O7BoQK;AAj3ce*-oN]"8s.ENOeTgf8AP.+a-':3psW#CE;q=l%j^p4mQQ[a1+`ZUP2N7CF@;O*KB7:l.C3J
-%461k94j'`!Jhq6ZPGa<hVk*]E6:n6Teos=<bji?dFf1_J5&0>%[I]dU)I`0ro;XmUOk*pV-D,:\qfVU1f*Zf.pE?[a*3%iYg>a`,
-%msYF6DOrq!&j>_99@#2o5B.c\!%R`*e"*].m]115@>)E4l_DJ(lE7gZc=S0!Z"tj`2DMLi4Sm<?Pe!s1j1\='?n7N:58Go0WTQ'k
-%FiJUrq<:RiQ6XA\Q@5G<2eI)kHQQ\@;,R`QcQ7+r(h(1*S\'h:VCT,>B-6['CYWQ?EMg?W[qQh?5O\N=a3+'qA^f$c4*oDg?<H"N
-%ETFCu9NO74S`OD6f6,=MbAgss/YnJ$i+(>qOc;U&=F<GQl+#C+b`8g1qPoBPD-,C04%f7<8ni(co1jF<el]`EpF>LImVq=U(M$h'
-%IJ)94Snj%flXosRE[>l=0.:JC;S_GkN+oL<UE0)"B>8ZPI1P+ueN3QFKoS"aI@#ChXW;39ElW0,PD;/*.J,W&G.\47S@B[`_!\KN
-%(gT7a3jH\``K->;_BZD@/XN_f\hWVn@)=;R]CGn<cVn%C1\/L;2P,?C4BP<olT/.mj2u/?j'"BWJ3U@'"_>EWa*E7[Z1ko7)),bI
-%#)cZmKVKW!\GW,eOGdc"LlQhRGZ_dG)S=^+JoGm6U`T;X5:Y$b1M/UM^@TDH"1e;hCg*j<@0!J;K^k3"`NaE%StD:mFUUO/%R+HT
-%!AWF%@dj#@&Z1e>4iXbY?-bOYN`Vc(XEK(E%'N,DMcTnKBU(\9cWObKOd/`#=`#"6#h@_7F6&'j865j7$Q`YbX9[\#3jXSjSn4]p
-%YIIJ'\`-j:@(R?'h=I]qSpo\LGR7`[VmL_k[dhp,=5`9"j2!2\OQ:*-CWJ&C"pXCo+2.*!091@26o":%c4[9)>moF\4=U.LEPrSE
-%p8[4)\LebbX'<?U$l6Hpo6$*smW=[<9NEp-d5i32i[mgg4+Koig)3RGfqhOQTQ]/'QZCpW3O!`$PS;f*a[ESL?6Pgi6OYR?!t.21
-%R^:l&"W$7KLdX0MF)ElpjHG"$QWb8jd'[Hj\(PgfIi\:CV5#t6\qa-QAD*#`^+M`Y3@:rPRs:2)$ZV4Fle*4Jg@dP1KHUGQ7Q$e)
-%^lnNc3WW0.fKpo7p2F;"0KXh=9VMhaR*0agX9fb'+giCS=<k&W3tN[EY^I*VH6gr.Yd7eQJ2)D;`eAWU#)_fP6+p\(3=$D%?A%5`
-%YmGBni)Af+T9su\rB<h+3)[FT+o]#ll<*d<;OjCT_F;dGR(Hs%K\!_@Wr_/FBI`&rE=#FQUk>nP5@POKa:0+%SkJ<-4&7\3]Qi2:
-%!0O#jU*'A36)Jr.*3fO?irJjl?od'OXK56U\U'Au@%q4EksA,m]Rg[X=$ElP4H],;g)^X;jm1j''l57Rk&B/H^lqj\$aRapd+7Kn
-%^mJ="I0&F0$'Z]I*q2ofPS9]RcWJ3N-g6*NKSUf.PpOK&ApWu"M:Dge8d<U7KK]AU"L/;In$<XclW"Q`9e[e9k6]#d8mD@@_4s\K
-%?E%690rsKA!0c8WhGdNpC/?o)4c<tVFK>pE,Q,B3=QGp[%Kd2M4]_f`X8^l:/T$PMB`Vc'YHJ8e,)WT@-WnVK-Xo9(js!i6L_jKK
-%&f5I/1Ukr<Gde->ANl`_MF8k+f6+qL>2A/qSTb@d*e/S=?(aI>i)8"W$*5(`d##ub/9i%54pZ+/W&GtOK'hn10g?Jei2V1THGBaM
-%+F]k/7#,uD[:956&E;:F/>nahDL],mDH82R?[QZtoObG]^0&QI'KY/2i"@0W=(1e!"iJ4]E&#)o'aFHMY7[`(''S"C(aslG:HS9k
-%2T?,.dNM\E%flHVgC1"/M!tg:IdipT]tg0Bk+B:G&AbRpS2E/0/+I*S-n`6V6<qlFidM@gP7JPiQ2L%RIDXGh/GT8L5SZ24pG`7o
-%K*fGN$(hqlg(ECJ]X>uAJBNOXYX6E?2S@:eFfB=#!s:ZTYFJ?Qis[m=pr#*X!efa!L*8b?Q@U\X']V.IP`/\i)kOrkhL+D<lce<u
-%YD?QGLAkl%6mJEW[!Dc8\`T79"q];PNWD%DE"Nqs`!R-&@EUS?NnN<OY6-BW<A(P]7:J>%D@hnS?,GCt"1SfKd9%J3q!LGJLXX7P
-%";p;):Y7s%5mJR+YQ`;^HCaC<JI`=c0o15]cm%74pP9Xhs.'6-EF(S%"su<*"6BQO8aAJD#g.2n^lJ)&2\@*`*tuqZ<SkOCRIDO7
-%nuA).OSb9"CVDPS#B'TPLsIRaQO,@!'3Ga!#l4VbL39SZ5f)@;k!9?21P<uGp>.pW=[+.A?Z3g*+e`p/$llF&TftSmpkN!J9F5Y>
-%@i"\>Vk0Oq)lCEehr-eI-#a]iM>B:dM>!t.Jpo&uY(5[<;ZPe]Z1(B$$sK(i0eghb-Yb/j5*$A#$k4PLYs(ak.WL1E;Sr13!F44m
-%L.o*bfndk*N[c9842H4c=d*5n<k`hH$jj_;0DmIG0`p=pfH>#6DC2adMOj,<MDl6X^ptTiU<k1r5u2N)f8W9Gj"1P&:aG9pA"5"b
-%S<Noed'+u.M(fAq&"pO%.WFkl2e^jZ.;Tb<#FP#]2*dgp5bPnh>=&LD#Vl'&r'U8jipSFf3")"]cRTGGs#)&@a!U#?05LWeC1f6)
-%XbG%$7FAaZ2nfFu4bL/DCJ[nTesB)u82[aZ5ruhi904e:"qhS:9ZZ%b5SDFn)jU[EK$dsV$V,s0-hn$'AId2n$o&e87-83lOWD<^
-%2OAXsm/q'Y9UuQ_JC2]],2\S;0SRChZ"M!p5WE7ckfO)WM'YqD*SLKJ%9&Pr+JK?4-_*k,#<rdMCug#_quUqYd[bZ?d)#jYr;8W?
-%pgjCX=SfP\j)Hn>)p-)0nXdf&Ig:Tr7e=W=Xoi1PJd7G]A=+cW:/'C[]1BR96$Zg1;T`oj-p!#IoPRJi811?Q^sRXlXJk/f.SbrZ
-%J8+M<_RQ:5SV8=34F43^:,q"tJ:K"4iN",/P/Jt>Y5;7%@[e+EjsS5[N#H>^04NSPqA4'koC4-pcYSDF8pD)O.g-&RG6^YcZk:9B
-%mfnpf8R\MN]eCeCa3#M_TLirDWZ.C3JDF%pC\SWn%HE"c&XWq7^^WKN63t%Ok+;oPL`dCSUG_nNJCDLBpnH-LM^U?cT+:7,pDa8@
-%":_pk'5SAi_\+bT]V\Y1BgKfD;<*puS/;[s5S0>2cV8)VXO>C`NIYgHS,F(]^o7t/=C'SCaV.&*E"E^)&"QK[ErnQ8q^+#7LKRmc
-%6fe-><V[J^)3]iaZJF1B6#(tkfZ!UgQ/pUWg`!/Fb/Ssl;0d+_8P:0_HVa-1^@MO[n-3f.(!s@)/u/#-#hCfPRu_#iq.pm3$;<jB
-%0slc[kX-?o4``87;>3J1+j0Aq&<q.4[G(+-iZf-S3'pY4AmRS'@LQ+)+=<oQ>VZ\D`%BV"b,.q/#ToYfk=-W)--3[cFTp8s6brh0
-%B*Qb.o)<;75e*?jhu_$:eqldG6%N"O"th#1lAj[6h6?iG&;885ogW$BTGX<s-5JA*A:ZbZ4BM]m`+fEo_V(AS>f[Ui!t()Ga4`6h
-%gmN;=`3Z!^=PNUt8CV&/cPmC@ngiA6fXKP-FCG+16jb'FYR=8`oEN?eA1e..-`A/a$,79Bc+P([a8:UgZ25l)=HO%nZ"Z`\TFdTE
-%RmIkJB`TX!s7+?nd[h%nO.$)k2BdpeSMCR4=ilWX`^h6aH/K!eNrsjWNk=4J.3!#+^kH2C2g]f='o#[.EXq7?X+3<O#WN%gKte;]
-%2ZcM%J.W$b`Aq.TMOkDl_C+j?0F;1GAQiN8dj(A0J\i-4_SG3A5u>MZ#rZ,.TBr#$K0[Y\>pn-3PR3a]KJd!Z)@Z0G5A/Zs]9k6.
-%S)l-$,LHkk$(Xu1!=$%ZceJi#8%XRiLZ.0!!TD</9H@c]'3KN&(HamX$[<1H`N<Non2B8cngG_]LmX:TR@s]E/MDce3R#4Qf<H5\
-%-Gl*L"1N1-1+3J/,X?JSj9p&4ntF7>CLc0'^5A_?iZS(>G_TZa+:J&V_^$&8!8<J*i1WF,6APdOMKogkf6,4:@At)#?;#6#7Z?Ug
-%&-d^7+ab(e!fQNW$gJcV`qi#t:)j:7*c@@i26j/@$L@j/ih8DHS5-R6i<\NNlf1ieLko>&UkYV'rAeI9?8eM[SoUg/M(L"rh7AX`
-%1]H.R"LAeN^E>=&g>G@GFIqJ+]2DJ::hqm7.lAGE49Q(b7D_W(hr]kJh\';A'r;%SJJd=.3V#Wu&L\k>&MRY"5)1Qi(uE35=='nZ
-%1i%`=_q#.cGgTQtJ32mo0s1qQR/;tKTI[lWM6TMU2F;iP1E\*u&QG;3W[HY&YVOl(KYpalFI`Za]F`CC;[>E`IJ8pgB2)4=-Zjd+
-%_1*1;(CuLH`Q-fmM2+.3?Pl&llE"_]c15sIgk=,6ehDA5#(UOM)MD"U-I>-\KqY(g,Jn]tJcQC,@Y`_q(*7[`\uphQ&la*)e0^oA
-%eqMbV%kGGJP,NDVCZ'1ORQG&k^@cId31%i*PQ5h\T\SUpcuqSm!^HmH7V^ps$?Jlu,f)%:PXq%/)]Ld"P9OVDNn9![j8EDc$#bBA
-%%74eo?s\Zd-4j.jB`rG&r-Tu3Lrqs?1@,"F`S6WVO3A0Qo=X0A=F_\#ci\_/0b%g>7KG?5=)^HG?'l<_"O_jR%_am'Qq)ug>bW`6
-%?e@8CC&4>JI[UO0Yr?@:W>roE+BKs?A`Eso@BV:mi\hMQYC_rpp7c"VODj>FJM'&n@r9T6eB.sX:D<8]9fbL9o%FQ+!-L:;,kbJ2
-%!n8/r#qcM<.8;-l@!DM_=[V9,&UOjIAJ057/-gHDZ]3pO,6jZpYP[O'<:h>@4nWM'(nQ1`XMNu>>(tBKa$:a@`VcmYL=:]j^aB*=
-%@q/@ZmmL!>#'O.T-TjX[Rr_VPJNC7*g,TBQKaAp8p*B4t""PN]_1Q/)GIi`GY@O58,:<eJGD91MB`q_(+0GpFXV!lb860d&H)Ld,
-%Fc($5PWE_=nLtt##;?;hCO@TR'bPR*)1#P':Bq=*ijT`RLoh%\RMbUHLhdUfcMi0NYr0'lQQuS#.Y]A,eH@T4fi87oB>`(OaqbsD
-%as6;()dpZ1-dWn<Lr'--%`AjXYknL@r!GKpq9"]aAXVA4OC4#&b7OqJ8A'XmA;D*YPQb?G`=ad*kh1$.N=^1N^`Q]pF9/6?qaRhi
-%'[Xg+nNK'uR8&9RK*s=6!nq\V@&>K$<[[,k^nJ&.`PVkQ@B2akZjb$hQJMo6]EP@V1/6s\s,X(8BZVKT<g%!_^"T.Sj&:6k$5pXg
-%j(aA,"`FOLHA;^@Yujo\]b8W&.2jo.<O#_`-72ga,BuAS%%tDd&\ku[Gl1,=*!%sc!cZ6/C]L*+Y_\IHhTXt#/)f-CpAmDBeV],O
-%0M4,<&W.c\@"empjpOsje8.?EMGku2M]')=:K4S!S"cn`mW^%l/K!Qj=6W;bN#+`V=?)Kt]m@Ilpa;6;nVW"51]h/RVtY2(\)Uaa
-%G$@+h2;:o;7iKEfcIWBj6/+%.&Ar&e<raY*+m.EN6ltTD=uIDJbU;K9MXs#7*L)(TJC3>$%Bi15#P]RZ`I>[,M4OlZ0`n/5V;FS(
-%JZ'9A:dl7f"X,W5)SsRFHV+\c_uSR+()P/Pr;.p1LbJls..i-_F!!JQ5_9:1Q!enU!e]u;(J52Je0%Z@KcG_r-^fG@W"t%tp+-kT
-%L__T,GVpZj;*\[XK`)Ro`OQ!X*fdE;,Q]Y'l+H'Z6h\;%#_A<-pUK?hl0qXX!5u0PB'#])@+[77D^ml$+>DR*i'Sm')(4f>'NXon
-%q)pJ(6r]!C&`tgq,9*50I3_c;Q4CH[606@/51'fT1"O'AFq]OM+ZGOB]If8<TTZkkN7dR[Yr!MW<>#BFTaCV<jYU/3CXa0K$jD[T
-%DSadfj@b)Dni%.+ab]B6djdTpU:NJ5XZ1J=]Tg70)PhZoTqm#oG6C+<i9VeSTsT06PgFS>WQrfE"I=FD-Kq[:3hkJ1/tVBK3oQei
-%_Tdb]ZcHhYp4Rd6;BlsA%eL>.I^#444O%`H[Djrl1%0-HB.mteNJ%$A/=f4]Lo<HJLiB8S*d>E59\6u;,q/odc=4UT_G>F/hN2#g
-%+iA]>XF7on,;+q1ZC>Mg\CL<6"l="U!:90)(RW2ep]Y>k*m&"*JGB4N$KVT&gusLPYt5gs+CdG=q1:77.)pc=_7UOg'qWsL>4F>J
-%ma2MjG=YuDe,etKF].'=-JY)(J:eEIUD4NeY=&@!F(N',o!SeJLemPo@V!.-+I:XLo't)8#^0S[MK,hM3bM#7b]$6l.BEAlf27\t
-%CaI<_i-sW5krD#Fc%mTXEupg,L[2k+d6/A5<L9]IOSCNNrWI._fBDZ?@D>2VCrld/CbgAj0u/3<O@Z5e1XNS5Jcc%Ca<pX=DX!GF
-%+r^Er8UTY\9S7nh556`aF[U+EHX5cq5u!_<o9>W'/B"t&_+-c(b[iZI!AZbZ4,F-2`^2r/b=i3:mWg&RBH-:OKEl)-;IG>#ApTrt
-%AQqEA:NRcD!;J5gaP%2H'2Ane7)2U)Bi82,G<.I$[Zjj?&8PUR]79=F[DB%9T]G?i-O!E,"[6&tn3j#QmERmF!"q2_JA6gXoq+@q
-%rHuPr+rV\2Zgu*)>,^kWW]ARsJkh5q]#"h1<D?Fu\F9]O'7kl#B4ITGC`_JkPlV/5@(m77fd&OM>!+MaVO:!p*W-:Y?t`l(KkFhN
-%d`(sq;+,qJfOnLO`hnm#%J7J]b9V]0n'/-AKIKe)H'`Cs9%A*Mqkj\*n:=N0"1c7m/eiYdf61^!FUeJt9kZh3AmthO$DB;A6X3=-
-%#/9e#!V6pT)%O410pEfT+,>*G7d.8_8Z1fZ!!]5K=_<;l]Wl4"ijKcIFj#n\;U$;6`q))@7/e*X36p"E11NOl?Y!HO$`\L\Hu6[0
-%'(PDT+s(^u)i_MG'L41Vg6A74LBjNJ&j_'rr.RZNHgkDP.)q<2WV1^jPm5GThUQA6Jkr(YfXWJ47_ihc:5k[IjF#=Z$.f@C*8(L#
-%-l/iaLjuUZ'49>\i2@s-++1sE<:i*d#YIHtq=8pmoRog.L)M0C%[c?OEZCS\,Crm<Z[qV,@tDbu,(=j3FBD`!%E*X^pH[1o=\qaN
-%!V(M)b=mFO,%-CC1[P68KKuj[k'%Gcn1[($'HJf.?HNhX'?Zr?j:MX2.$r!kHBiG2@J6;?7_\Mi%*fVNn/S$t2U@3VKdp?leM)-5
-%&)IO/N1ai_8i-Ub@>8k?L%!:m&f=c'qlL"Q$3d7k,alKURf!@dop@"u^)@]d!3pQEiq^MB"9oCaWk&i^U[hffB2_4q,PJA4&)>\$
-%#N/^2_"!O'6q$]D@eV!.GU!0VMrcB9,D-j7jZorA+qSHh"YISl!u&mD!0U62)h&h<d?)EY,Ean!m(t8(f4+hRm.)$V^Xen5_oR@C
-%QiV^qq];G!'pSb:JNG:[?tD9Zb5.MlYkJQF?q1?l#`&&*#P?Nii4[Ld%`osfYb)qE/a4Z2HWQ7<"N,Nt'-=ki5/tTEjT<`4oMA7I
-%`.LAr?<KHTBkYS/CdYjfi*uucKn)DtS8h=E8qmQ$'98dBI'r3k[rEh!#N;[r+YgY9\9tWpqeup#Zl<3N($*uOKo/V9:Cq=r'U(1P
-%IV1t4hPh`4cq?JGp^H))Q6>gBaj=cl+/)T6iISWSc]<L*$I*G&SsY#a.+4pJD21,d\FKY(k+ND=dm`(?:^k6r?d,"<"CWRq_?$l7
-%#TE6@1f&f%>q`oORPL;t)NVB;E5tM>9u^Ti&mV$KKLD^(M9n_.meMI5+PLpd*bq?k_E(nSm10^8lK@b7;[u4f$DXl!Db&.`>J:R_
-%($u?V>m+3,eATEtCDF+8LqZLIkA@%_+$At)]F6r5\UsWu&,$$ul&dj1F7*T[cer5><9'@C?,0PXJl![[pSWBm%'otObpU'<)kM`p
-%YkanBA3L6uWG[q"VCp?k8-c#t#uQLZUfof4BPQUJ?e5'JUE0+0g"]eD:TP$WcUdF5Cs9IQYU+8LAjXnO',<-#G(R@e^pXZ.p_!Q2
-%?eHj*]YRi/Zlko?=F_1$;G\M-b0*,tO<8<'?*],U]UP<nOLL"/I1:^07.WcD5`f9[`O*]3GiJtS,0A%>gp:CbOugh`Ep#0,:T_b>
-%MlmFo:dS_.Tr8dc#^51oLlT2AGekAmWiTe9bcTPbcV9<-iH0M8CuH(c(U!<Sl#5D\9n\UVm)"snFt)lT6@Uk2a.d(u&9`-LR,3d6
-%:(-#%fBS\-F:jSL9.d=t3),\p6%Adj&PGgO"<mZP=m;SgCJdNHjBrB`8t>Z\N1pKVJ>c-QGTO5<PeProK[g7d)*$$,#4VRR)8Ppi
-%COlZ?iuTeD4?aD)e1G*6"9JlsId0"OiYb)(So;!4eI':!2GBO32\7oMGdMK^EcdZa6Ig_NemYgA-7^]Y;t3O/+'/[c^dPCQ,KHGA
-%0&D('e^QF$Lc'aL"'pY6#AXA.(8,0fZcUr1HoehDn`SuFZ)]8qr[34oBKWL-RkD`LTC<Eq+_]ea9FIjA25;Eap1/Z?gEo#op^.$8
-%D1^B#G4Kl/@"WR]$TR.Oa;/_SD_#*YF.g?aNb1VC?TX2["<T>@\j+Plc.Jn+:u^g]8-mZ'7oj=N'U?`3f2,!kTAftiXdm7sn)kPC
-%Os8ADULIeY;*=Bf+\&?m98>%%a:ZC:>5LIe#:g@L*"0@1!0S9\"o"<lAL%X[[)jcSkPJE/B9n9kJj*E)"aIgRk/'D[#o@ilY@(7m
-%DgRq`6C^5:(.gr.aM+I#L%.W?Jo,IjJrMG#R#7(ljDjl49i@\_l[XlLT!r)F]L6$ZL%/E7Q!KK>(g'3$3$C(d:%/_8X_0a!mBWWi
-%&i^:L)>M&_ZHh0EY_KWUQ\?tUBrmL`.n"IH5_jj0b@L[QC!*ZAcF1i/K,fg<Zl6<lRYkhp4b<N&TkljuAPZ!SQ$^LU;qW4X.sQp)
-%h*`4smfj8Cj;02r"?*Tr)kKK;`o&a*%tn/VC6\o["?fa:Q#7'N"XTDMhZ;kR3dH8/jb!5pmjSm2JMe:hLa1P&8?o:Mb(ng]+L+U7
-%4d?uK&ek%V-FT>q=*.akl%[1JX5QX7(QT;76hmq13%T`?h(P)e'*G%e+>Q`7](V54h"%g;YjNHjb"okM`2<X.Wr7RX(`NGUU^1gP
-%1KIlc<3T(r!XpAZ&,mQg%-sd!h"Z+r5QT4BTf<<=\-Y,0iOO_8VLaVak@J3F?O(UDA2lO3`HN:;e2BPoIt2!2#7d<E:[o*Kjg8(j
-%):"`&VabZ.J.2f$!R+3h,b7&k!dPKn7seBr_i@!pf[#L?oJOAYJL,4L?!M")'am`(n_>V:d4I(Njr@u%iYo]s4h?]F]T.GefH)Tf
-%=ERgZ$gg6\O'r5?2uMcb8g0num&[VT^-TdO%c)M;M5=BVkOS<8klk[oqsjE]HO:7%-FHl1`EEk4X%SM)AZRZ1bG4m8opfl@_A+*p
-%k;$J"FZ#C"kRh/8Xj$Xe<qVM8nAWum"eX(n0))MWg]0hPl*_3?,UElM"/#)$%2<B7:(PD(fBd0#fb.[No/LX_aL!k5\fr*b!=5lb
-%61a(]2*@LIm`fXAjukjR.Vm2aJ4@^9&9Fr^YlTuqjetYM`(-4PYXot(^9*^haC]l%'kTB-RMp%@E5E-ZP'@dIKfOaD4=Enj`;&Ng
-%o]]aNJ70LcF]H8b1?=#L5LGGTa0KNt^queRQ:W9)j6;tZ5E<F.@O1LJ9!Ef:88P^PUM2)tM>p#Q>5X?a/.p^b$1c-cDh:O<Mr>1e
-%K,i;0!5g$r[cNf'(!%87&9WPd!XZf"I`"03r9Dt?&_d<[<*d;NOD-&`2d4<cljgic/e2(?HX"KDfu[p<7muk785Mr7'$q"]L5YSL
-%5k*c+W;ZgD<gKq8(%ghok_ALFj/lSLCK=(UPmKej5P)E^:tAHDUh"pLPops917ir5q+X0Qap#(&(YJoXJk/0k/u4EufUGU'fEK*Q
-%\DBrVDX7Pj:@'mb\&9h&+%n+aX1+76.*VSA0n/*RJdm5W/1JmH>TeiV8jMXG)HNfL-Laghd=ia9YgmTY!@sH2ep'6e;;,\rd=?=-
-%+;l<,J2Sr,n7CE+C_l?UA`.'3[+(b4<sajt-M6&C7O6"%[fNIOT/g*?7F6l-["C6AU4C#h'1GPP'>abJD4(_$J.U$Ng2m@C-$AV2
-%qa"=)cd@#?(8TTK!AacVq/YgEEl0<\#tJLZdfkq$?N<&J?EmTQP=+h+@;[2D"'^NqFiguC]KMF.2h4a"]KmH+ni-Z"!3tTBkI<\*
-%^g:/sIU8@P@8OI#Lp?UYhmrHWSm8.Jg-&:FGRLc8i5#c%`H'[^YUh29*dM\=LKXU5X;iPs'"*6NnI,Y!Y'DQ2nNMmHF+f-T/pO\p
-%--:8mH$ldf[\:j=?C3B^;=]cY^`p4$Cs7ESnIg#$3;@>D$`OV)YXXf+]g1T3nj<f!C3XL+=WB5uJ;[D>7Y#4W<j9UfR=>B0:niB4
-%dYpH3b,3F`<?T67bY"EAl*UmeDl0ETl*jn3M5PUYgRcB!hV/rp=mHZ&Q3]C<JRYsik)IFO1af(D>Gc0S.\j`j1AlYS11c!>A)8*B
-%54!C$9S`@jSh0]%UECY)nruX5>#;GX]A)+2MG4M#-NWMEfGce5*e;*Xb2Gi34PtN19S@o+JOSA$`alrW2qh:FKE51n"%KKM"(D*C
-%lL%LMl>NJ5K:1NEK2-M>EHC-+J//N9Z7.=G&X0_[a0/OfLYT=E@%H?I>Qbjo6,D-&ApY-F"X5R@#C!M4",$nF#$<i.Oh`=#H:#/n
-%+TNXo(D2]^%=PaKl'<4fO57BWOm-$sHDa.e;7Yh@-*D#2l_$@8LbL4_+aVV]ZI"mKaNN$V'ITUi7^*Rg#p*\_;W!g/J"DI_m7n<h
-%)[\<MiEJUoo?>\=E4H:p-^$9:5skak'8b::3AeX).:)[Hle%\GBM"dcEC?j,mpS8'W*Cl`"VX=#Mi6Me',k=?1"6`bq-s0"WMNa1
-%`ZOr=5N9M98K#UNp]+'Ho*Vb,N>.XnkO^:XV:c/E4@_>]E7rWPj&`JG!6G3m>Mu[kb5,)3ce7nu&JT28jXWKN+V@F.M9WJjmKXa4
-%"-[f\,7QVN"8o_b&`(gc)*p%/eip+gc4p.kQV@PZ(Gk,0kIj%R=4eb^C0(:/\30j"Lh^PBdirD;5XE^ta(>M5=#RF'+RKMk)R&&i
-%S6#QXh%]E0KQqj?SpJ@r&Jrmt1seW50TqOU^U$1-+<h2n_:PticH[.t&dXL_kA>JM`5:6jbMu%#M.jshi4mXM9Fq8ST;&uJ<T*tn
-%`#:o+HGcOqLL;M*+b0i2c^'OF8ERe77p[l&M/miu_*0f0RTe],lj#N04C8"p.U+rG#^3Y0*P%c7e"!=]I+[m1]%gdA[M^R8o8`!u
-%=j`,:,7sC?!]!9\(IWuhLK_WO1%(:-&I!,UGF8*#Zu!^W."i6q0u8cJQYH`FoG#]E+>WX"7cS0<b@QY;.[OEsC!N2pN_VF"PlSaT
-%2nih8g;%RX1W8RPfOYHR6a-;"fE_'6<'^!Ei.8b4m0-g(.nE+N-L7,f@td[J`/ZeZ;$N0%)Ijfk^'fL94JaHPGIsrWW;77&7n<b5
-%+TS`\;[6r#>2gFei+IGAV<;fE68G8BkdM<78JQER",!dne*\ZSlqeJ)e)4A`D0MZ/C"!#lZ#,'19MLZ.@$hkf&;l.i5lWLUQGk\Z
-%'QcE&%]!0M_^Q_@m+r0r$)Y77K:)9*J[c2U>n&&BGU=X<7KemAd&F_I=<M3'9Ghk^LR,o2kRjO$Y%VEr(I0mafa5nm+L";(YNjdJ
-%n%rfCJ?69^LTS+(j=ma7D>pa>G7e"sp="X2<Seb3Snu#Kq_#o2i4K_hk?5]Np4b;n4=0(5.R[=GZaNof2n9#f"K"cs#a-*^;m7XN
-%B@MC8)MDc,r'q+p?Gi4pMW*sOl<cI3L(RFt1/,YiD[uHU:,&YTApThE7"?IbWbhi7Qr>H<#Yi6r>c]pIUX>sP<U#!&S&&3f6XTr'
-%M-"LD*!L<+[hXa`0QB%@g2"<lU6UJ9,]7h\4A65k51\3*-c>K8r%NV*/FHlC#8]ehP\esVQ[DrWi&M%#3ape\20&>o\TZZi=^X4\
-%]Y3;jg]E$%?jtjtZ=N.9aW>e"Ecf(g:^eA+i.5\ee61*9/\[as*(N9]nDgZH_Dn3'_aS@_U0mD@T23ce%?(iG:OqkS5poMo(pV&`
-%*cbW^,Y$[H">EsDA<B5J*,gnE!?*$F^pas95`Fc^@Z:rVD"#QH0#08*_;nmXhb!ZY!im,qL`9b>l?4&)_=.Ya)m;"0l2c7<1hP)2
-%YaSe5^3NVjXH@Gk>hA@'Pg'9K[YEg>$j7OiGk7@4`Skf=2+.mq'1#5aLsUOgod&`&9ic`gCH@X(Ba<juBhp<I*r37H#W$*!RlA6A
-%Qi\l_Qj!UuiT;p/b'icEc3gbf5[c>e$FnK6kQ=.Dg)#;Q>id18JYu)<4bUW'`LkB6?,s)uR/m:p?Qn[p83Wt)2F/HnPBt"k/C_HH
-%i*U\]^-*?pE-5BSNtT7R(qZT"n!ojB_;N*5639WnRR5YCO0j(Ag&c3t\T3]8qMl+a1c+XqWC!iFdXlC1nqk1$T\WDJ'hm*g$mZp1
-%'8)'G^^.7Ldsq:Opu#ShHjcgh5Ck-H%9$btE7&K_/Rj!r"Hq6*EJkSp<9-D-cj()5*`UWYM[1:a,GDBNIbtql#Hb:[&M=L:i55j.
-%Ca5mH:Cl*dn32ke-t#CoZR)3'IOCb9fK7)S`r]GTD<c'+%DN,T3c.?LJb^D*ineK-+8D3<@(2!d)Q_)f1Tc8L.(7k;.!s254np7&
-%1nP[5BSE6m'jG?f`5Q,9F%:[4'c3J$.r2V&nO:,#fm9nI.J&i%osCq_\Y:FFCrTZD#&3nu:K=!cA^AnhHs!d6<4`"7!E6dG5KEK%
-%$-?4JKUkB9^^>lpG1&ecodTDrp[$>6[6jY]bln4r/.LAXhOLO/C)n=nFkHTAUVfGM2`cXRUp\4;/rfXNHO@/W9Y_GWPKa+B(8cqb
-%"G9j)RY;CNN'MTTlQCub(f/h5RkFhS2s<s$W&$gL,-u)85#DULSET_V$Z5bs04@DW&VV%6Lj0&N(Y@X).$Iau<s0IN(PN,Uj7*mL
-%*$Pq0Gd1I<ZfbtGpk_f!kDI:GG,R`#^sJu?#=lU1/.\t"PASKDB<^pn[bJ(XeHZ3eN<8EM*l"'UaM]O^0V?_o/.(D/`hlJ]%MMVm
-%/.Y[A5o9EXhE`@#=QUn1L#*kF)Kqe:<1<"`84Vmm&K#clJgr-ict9%uUslZ:gp"IoX\f2eG\kDOfFXA9QFW*4b"O"QX<'.ABD0\(
-%m9u8"mK'S+?k.^,DlZn^g5sTs-_#DHN.!-'%mk=pQ0Y)oO:OGMJh;,<Gs#p@=bm&9*<UoOR<Eq7p<a0`Fn61D]$+Vg\adp@"KAD6
-%M#.`?=LM0;V.OUg'9Q.hZ1C9/(AP:#+W]/1gr/bL]S>6"XcHjm1Sc*OF?B"7A4a.u2t08o!,\COmWKOGcg=i(He=kA#c%+lgQ7IH
-%37M?A4%Nk1L'DrnGH?g+g\?UDlcV)[""mnrH[_bVX<J4UAUBlliY8WK@nC=2ggIbSLF*BJK9`c@ID?96gi+]iqeiT2GdFY9_!PRn
-%:j[$CR6*.U@e=u`n)2g#HaeMH[:B(o1;ghko=4YVF,4Q^.t$=@gQ!j,7oqpQ]r;dQ0"]eQ8[9Ga"r]g^ih;?!Q+`\c!`M0HGNciq
-%0,43[[)*Q*i@mE&;Mn:0^kVH[M7u[0,M;g82@tYaGV'W:jFJF`LD0-G^u-r=VT7-o_J-7W?P.bd!h06XIQP+bfc':7)c0T*E*84E
-%X"Ts?O^Wc-5b(rV0N5A]&cN1GFmCW_]31/4e)a8I%$%j6;jp]PCeB,EiP:.U;>I:SlK)QFeK!@@9t4RXMCn$ARqob%8RkjmO4rLB
-%_DWdoTYjK["V6,[V)_"4(RoY/-m_tKKC6]N7rZt9c(LBAZO!Gh5m%N0p9V#Uf>8_?"Xl5L!AX_pC,V[<L%2YQB#Z3:cd%:4DVNP^
-%4L$M)W+JneHT4:l<eEgP5:kH9NZ"GVf]r8P;%)ppD9F?@$WM6Vd9a>L`l;M`-Z0:qm='e07*HJ6H7FA;9a40PgJN:eW7?KL%pFV_
-%A_H*[(*hd7TSQ_UL^[=%OeeGf5!I'-k@5!+M%]XrWqa0!m*OsjFEg-\_g@]eK_VS'MJAV/4?i%^K#Lr(_?q<,!`C\LG9+qoPSOtR
-%>m0jXDa?gN#@L5Od)aqRAYU_Y2qjjX-fZIQipk5H@D<+j<KRIP!cA5ui2JUsEV!WI65$`$]k&Sdhuk9`g`oTY.]ina5\&O14hGiV
-%Gb]qGNNY?a$ZE-lRC98n.<_+4p3%)cHRl,OrljH/i=a1OcHTqJ`cOP16[A#NKoh[lkpTkeIq!M9A<1HmR*>A5:_s)>gSn1Ig.lEH
-%:7*C%i,BG>[Fm[#(CmMdS3^+k&$_\7@u"13(`)!7-?Kf+<kk6Ml@m="(f'98hqu7:h&6XU!SG!.AQ\hDh9lJ9l@;EEY*\OE2h@nQ
-%Hg!(T,hP49pM)>`1n:nh>L=A?r1("+dka(ea2nn=7&9>MNVs,RKP.s;hP_W7GTWM4a*qM?%VLAL<.cGYiA+#tI6:$"-^K(XK`WpQ
-%&QKjJ=;Y('%Rh-A[oSR%MLc`mL!oIWc@Fhu/A2+]pK\qtLcPp<=GmWA?dE01S7%<]g*]?F/jobU%[htS^LF5:\0$eRH`rNtl$CLQ
-%?`]88[2EFTf6h>F:8"N?T*P38?A^n>qdF6XO,.2H`0*R)5#%sFKrbZfdPMUBB:`d0B._bhB$l4%D,gZnS8`gZQeBj@Ho#"i7@?")
-%"M64^,E2a)HRX;Jk5<%%\=k3=2rKD=#+OoJ1`ga#\)QQ7E75a7LLaO=3g&oe-T[$`5R?tKb_\S#PDH&9`[h_neK&3U0j(BPVl`rs
-%Q.H!Lg9]"pYKcDF3HQLE#S;*I=Ybm8",8GdlMOtD4Z[-Ub=-_b2rh,QDqR5=]S;eaDk:6Q96)9<Ic('u!2U_1J#]!8jlPj`F]js8
-%fn9JI>>RO"H*_f/!<F>a<ia&-m:5;Y#VX<.6Ir(+LLCkH,s.\FVet<_Z1&OF<*ucTl#>;[k8,K!0I<<@5\I42/M6Z:'=46$d?'nI
-%&:F5jZ1)2B+pGSL9K[PlhLT:+Cfomm-SOt#3ar9N@s_`hc=;A3i8>WpHHIt;I(icTPi5Z]c4+oJ)cVk*@*[<E"6VK:,rsnEQ1A=1
-%6D4ChihuqJ+e)SIao6WH@<[)85id;)X(nsE0@$i%SfbcU:%e+^aIbcr5[Iaj/)$Y*h#PrRg&trK%WQ'*G%S?Woc[%>jQh'eOpEP^
-%!Gj]BDHk!F=MWZhcY<;3<CVd+%q75g*V3kFU%!k4-bTKi+aN@"RVhZO'e$GE\6^6@S:J)(fsoK_`L82:8%;t:8Sr4?h1:H7LR24C
-%(7%Zp%Vq$SW"[AMKs$$`o-jeB=86Gk)cCuB?j4qH+?q%L]>#=,JR+=Intqs.>f3_rq\a52+T^F,"XbiG+XE*";`>4J.F(&I"7gsZ
-%>GZ9ja4mjYK@h0G(c)\K>=)%tJX+nG\GC4q"H)e#]/pt*XgCb7,4?L)GBeWJ-%n(Ji1OP-XQ&tu/DoR"oBiO"BULPOXFojTX^I^-
-%JUS0&4G<WrXhC/ZI'ES%h8&!n0UiAcA\q5NI1<4pG/4?!2J0Kh!9lT]"N-mmQ72h#lEkn1b\bFUr%tJ>%BUKrIu8%P6O_$oDF]gX
-%B8@-X*;=,m.lfirUhriK2<m`[qGi.7[]4ui+]^Z*X*]A6?F7ph1*"/uFgVX<n,T6K-<G/\r[8ii#`pdo$A+br:C*U2kDuN`;&YFh
-%QY[;S4.r7gNl'f"Qh0<,*RN;%@Z]RNW;q#o]OoWQ?#J3L+DV2%1GluoE/.8grXSSt*hf!^b85\t3XXZfj:Ru@A(Vki#!9Ad+)okB
-%"Doo,K<&/-@.!][Y\3m&5jqB)`*5ND!+HJ.Ft=7*1RB9c0S89gF,E@:A/8L+>T[d'oKX:-Da`SmJ4nJERRu;UB>+FDGSk^r"GKPu
-%P@JuCC#:!A7*m&OgpZImV^ENq\PKgQSn_8MKmCOE=`pg!?/cFn#\!n*"+fk29pUOdV^3?kF-@u+I&(UkCd,Ki,"tZ@Z]&R'!)5FQ
-%OP%5T6"u'kE$A<2F"9AZ9$A>Zp[6^$1*mSg$To<&bmkDGMr2FdaqLFn5O=*.K+]lW8Z]0`,[1D2n-M!dYQT^jn#r;?XnGhJRNTN4
-%2tq9@%S&bc"p`nqGI?p5S-jUG7PJXQYaDQLk.gEqI.DIC)7EeO1aC#A$HKLH60eZ0K4c#dn(gaU$qj,r`$912J`(dh#2!?Sn]AC1
-%$Y/Cl[U-3%$SqFZO4YolIK_+[ZC_+gYUC51G3]BVBd,EWE6)lTiQ6.HVNWT]YY4XUJ]&@uoFBGG"_UX?96[rrj_NNt"rLM,l$S;(
-%pd/7EcbHRBLZtNoiAu?eC8`T-B07BI4Z>T\EYpRHD[5hqC_I3dj>7#pGD[O#$%9`[)O(e3:3-c`*p'j-]NDZkI@-I5ebnj4JMA/-
-%E5@pXSUDXlP4Bugr.jXl^'QKaedC)njA[Q/!L\f,1jC&63mCds5\%PkU-B1^BpqIX/Z\4!F*G$7J__lDHa(rs'NmKVTp4YD1g"Bl
-%-7!gbe/b5V"N"jXK)0SH%[t5:O^2OB(nWTlYoat5g>:T#5r,0?SuUB[N36:7AU1m/MH`0?BppsR>Qc5SXl,sN"L]EAh>BidIs5lt
-%'VNNV3CE7c;'j'aaBh!Q6o*kM[_l6^Su9o0,>;IF)hPZ#EB*[n),M:A6^n;IRiXg?H3&((ATjhD=92:c,i?4;b!ILuTSn(9E'QkH
-%DT<f.GAcQ_Ae#?pqbtsRN,]+MCRf<InCFfp$8X;]6\(pr#)_/H;ICMnH#RRW'MRSn]<brS3+Hs6aEF"><&h4ueoG?B:"Y\[2!8g;
-%pqn7&S^fC0U@N'oL.<(El>&HRZ:+b>@=Dn$D>ck0B'PnO\fA[ebkHN\g%WD@HZ\G7+(3D$fQk;[4aqT](i7O/)Fb.0QY.<.`8h2b
-%:rM*"jJYB!"BdkmM`J:Eh/L<oa>DhTO68KFAg1^-je;_%UHN68"5Du>O:=jYk)JZ@D2L+MGKDVB(+r?i5WZg99kYb>i'o+3O);'6
-%h7+JJFS>Y',b8T>OD,>:C4d;W<XX0?&aFO-UqLq-A-.>fUB?:_SILS'@(!6LR%u,,"K[CN:@%$1&04_P!+O!k+`-M1>%!#)2q]1B
-%_&7uK3&K;NM/<GnF,8W=`8Mj!2^pep:@gP$n*Sf]^`2%8ghmc/7g5`+i%>K^.[m@pC5rZ(@i[L?1ZPY3#!+q)3JeWHRrP(PlaRB_
-%MYV<Sl")_&cJ*$!*UJI"gEJm,\[CNh??2Cs<34iU$m@#_n:J)M;bVP>JSYS^5SFj+GgZc_1ZRIO<hh_D>a!"&i?<uEp1nl))]k(.
-%4=o:QciEqqZV8b\EpR-gRq_j(iSgT\WPP,ON9qHn36pm._AnJkMb!ac8r=th7(&K'!Hg9#it+2&;l!_0?OkITMH9/=hi^?X_hGDd
-%q!Bck&>$mh8#F*+*WADsQJC1LCkoi<$4V:jeClP8<:B^`4$RIQ(LR>CT!1*g0mU-LHcgrZ"A^393HEJ6b/.nD<Q@S6L&t4[_rD3`
-%/iF*jKFY24)Am)B:>AJH/[GXV0QS'\@`aA"F?,qu3S-\cBDI?MJ43fO&pOsN9KoT*?D3"Be#!=uPg$a!:!DR/lFu$%&X+W'.0GC/
-%$+E$ef[GtdeqdE6#NF$>?RidiL2^%:3Ymr$b#'Lu!<,!LMi:F!ScK?lV/%9R]\=nPqfipm1S$:Qr\,oFJgV8XZ:'N]5OeW5SSuD-
-%G)3T)R+D*FFs=]bOE`1c"+ZmtLf9V;n^ti+&=)F;M_I7Z2g,ku#:NqT:s:82Yk`.D2PE"`K]7P8jlIQ@9'XG(LK3a:EH]uU1*<`;
-%(pcNqREYdj##Hp.?:58hr$Dgrr,#2JW2ZhL!&f7G4#ROuIsgC))WYe6fG78'q#hGm0L'Y?a2lZQn;=7:69I4<:/`[@>uj]XZu.`_
-%@BA_bFpS5Co21&4ISRkYTr^N"Q@#(/i7BYheW.c3I$=^)=BkFm#kAmY<.\L7`@Id)jR-kCd#(bL':Ws^"VK.u$mB6$<HE*^K$itL
-%Fjsihm:H0l.JrX7>4p()lSEfCk2>Z8)_-3fDG0h7@+0FASFNh,&XG_AYZA%W,a+?`OsMo"=;VdZ"7-X?q*K1MI!f-'\1Sja0&4WN
-%DpXV0FB2:<l$s@J('NQETs6KUA3/)cZG,\W1$a^>i4*&B@0,gQ@?44$h2!r^]gC+L</Z36)C[iTF^YWGMeG6oo%fq<g1XPg-<r[r
-%8)n"K("_"I3l2!h#F?Vq3I!,ZZ=a6lW;tZeiSNd'BH84O\P,M$,)qEG(8h5\T^T+h"N)BLW9aRYMhl92R>m(pYW@@V"$=!1RHNbn
-%XCY'Y$h^``"-;TVo<a45AP=:Y=>VqD@)>lSLVbj'J@Hpm''+n0:ZjK\!VV8n:Ir"3$S:Fs%\ne?q:XM_4%ft6q;mG)D.B13!YD&%
-%-a7nYa?8iFo<O3Y#>u@X;/XR.+'&hSCj,>60BO$$<]69]<+dnhlkE&Ca1ajG[:ltFP(FT)W2;L[=O-5PiU(mVgZdJY[:D;].Tcn>
-%/Qmdq9amN$K3fl5U3a+k+o*mST:Y9^\F6$6"0lA@dm9,m<Elo=f_]$`raef,Ej3?AB5paUa2ojo>g*pdk)YQN,(tU=4n>hlY<gkf
-%'uTRE-dh:kliV"K]2opdRlRN^2FW<0[Gj$6gO@Gk5"K!_TtS@Xp0ig*!=2+<@*?)`jO!7T3)m6]Hu5nn]h[LIf>BJ@_iJ`_c5)+f
-%'A9"`A6"BkS\t&%<lB<IAp.<B2hFQ=3TeS!ip82K[Z!4.s+$C'*cA6$`@S1tf@cqN__M?c$Yga#K`5Rfap@rA=cG5D+OP^eM%1sB
-%aUY3O)mP]i+?c3\PdhSjlF&ruRB4*;9"(dg_`pNKpUh(aVh^!WPPA%90<g)`ZWN\STo5--Z)2O5B&TL@?QE,L-6[o@*C1DKlg8-*
-%r7Z1'cW*,Q`<*A?*%VN5kT$$#%<Y3Ljbqb@"TELuT-pg!Ys?'np/>f!k6%a!?p[L'K_.)khq95a?"bd\"O*dUI%.q=p<u6YmW,R)
-%@3%6g>=N4If2+L:CS_PL^j-gD*%Im!;J^R\W"rjW^mPpDelo>FP14`Ng<B$q%k%t0M:Wct;n\^Sn-bF,LuoAqI![51Z?cs;\'Qt4
-%=nIMifMD?;&r3nUO62hU<?'+D&SQLm^+0b)_7FMY&#pYAL^#gZ(eD`PGN>tNZMqZ_j26F7KKco$Gp14'Z&tLtjO;.]Pu!3Ff@_?i
-%qjpjWD(q6!LMe,54@.R>4u&@Sh-lRr(&J,Q>h581:^Qm)m^2A_j4.t/f(N5,k"(U2I)]8KLuG=TFumDIO[*6Re(8fNmba8@.DQ5;
-%3QMq(MK$A(:5928j]S50/6a1A(b_'ZX@KgP1Fj?@KF&$mMm6FhjVW:SFtb-o=&E\&]KCbRf!KP^M%\,Z0!`h4A_JGH+qsa(TcRic
-%/it%ogM'_!l`4CD=Q4JZ?KpnJ#ios?5Xr=Zo/\'Ua6KapB_/15Wor$tZj784@lsOd!h*_s&XTt4OPA7,ql*L<7S`:J7uYK"jbm'A
-%pCf03"%aOCL!$pmNO<!P]KJg7B5Wtm<'3C?W%/D,SK*;`nY#m`61%5*aW;]X#=!iXl1aC@?>QZ3?^>S@i&D.c5+E?QB&d^8/*0e#
-%cbgAZ('XACGNQ,\gKE0GHfB<F-Qui?TgF@XUtaUYOe*>%9^B.$Z[8Wufg+PNMD.Amql+BY]#ttn;Ki?8rSVDa162@0/6fD//UBcM
-%QDK=R@==H-hN$^[9-3J72OVg##O9L4g5VDi*cE71n&'_+2BBb>Pm%aDkjT+7<V91eC;pl&iY"^oinkE;^%4mbl4LRneQeT9Sk&<s
-%JEWS9B@BT>[[<'T6FL'TAjQ*<fX]0(*pYOM'SNsKN8QBs^Zl\3hTpb+cM,XSJ"gq'Q@-*R28N(M^([i()a)RXmF\eB'?o6,0lknV
-%ZH3Erp;Stu;kGKsoJfe<[OWVJU3g9)ccBp8*ma=T<\2@[*Ot8:q].Y:AkSVp^ar2411!MPesq>)B3I)cG%dq3V/eSA*9smq&DIVm
-%pCH)?"o#f]H5"7RL?X6UGY+%:TZ]C1o75s_5LQ$Qd*9$>TNe^mXK&P/_rf_NR2Ksu_pRhg+c,DRQp!+mreK^bp:W"@54Rq&r/Bgp
-%*"KAms0*WBTJ&up4+d.H:=V8'iA!lL-=*(-K<V)rc_oX,ppoT=CR8Ao`8tDa;'7[sO$sXKid.AYT2shN38QPSULU$^NpXVA*Frf^
-%"N\"E-I@A;"[oV;%T@nA3?HYkYr6iuZTp0/).:qg#*0P[k37OC'F4]JCX>N91LC^R9@6W+/Bd=?AZMrH,3j.@'75YE?j5Mn\*Y^^
-%>,%@&UV/7o>rTNO`X6>*Cg,Le=(N\`-*mN*OD1=kIC3_/b%W/2_o[K6aVQ?cT1aD'4j8Qa!_rJ,\8iJL&MMmtK/7dLFESR)_H1\;
-%Jsu:gI+<O<1bC7&+QC;`",6t@\VFI<cRg74>Ztn#>QZn()_uYB_N[RCWB,G_H0ea\PN(d,X7b0'Mun09!>+X3]c4"L0SYQ+n@LFN
-%]U<UA_R6N.:h;iGdiH00;eDn:j'KV\o5'2anuf?*[WVVl4&b'OgC`1QW$9/+;+./SbbpO5%SuTHUDZ];XNn,L#?Ku<ojn$'1#?NZ
-%0HdPp3*LUQ#[:=BH/ZS=QD0sF*F.1W4Dju5CKhcF^]!TJ+nM::71Y@DY-CTOJD+km"N;D-@XSd,BeL"nf[2D+QLir&33V_TXK?eb
-%luY:)C(Y=.fBo@D9;TX%*\&?&T$c9%6:;tXOeVBJ61k+(=g'q3eBVNEs3XXgSt'VP(RFFS-lD$LerQX^lYo4$]HPN\05G-,k:JY4
-%$V:B6SH(:Les8\,;E1!<2CEV#DU_L^p+@P$EVJ3JKV0?X;\E+s^be_$lh7X;mq?E@[pe*dj%sb$a?lY`H(Yk#@Clde"T0AM[aaTM
-%o2Fa2YKW3g8AR%=KL4-Vb:*;aJj([n=^MQ6Li?BQ5?"<.Y\(Ft:!U??^(&gaRpX=+Tb[ud50c?B"mf*(k?CM7bqA)umF$5/MR"gr
-%Qk[7h_\o$-o_B>8>:=bW%br:?UJi8u)8`ojqRiCkD1(6)?QuWdNRgAa@&r4T4iG7M54#L>>\)W-G[.\Z$"8m%?u5>tL#J\`Z?j)E
-%"LZ&6M.4bmohIZaf]eZ27Z1Y!Q8;+GElujm@`,m#Z>]%Od3HV%(HVs@?;K(@!oek;BXn"'pMpnDK/FR]K$;6(/?SW=i3i^uY?7%q
-%^eu2Ll&lp^G&6DS=X$fFF*#:Hm@ZpNS#tu/MsEJn`%UKPBO39U/mFOpn)b'L^fD:Jb/f4GSR+$4a7cfjqC,M6`)m(V[FRs1SuqTS
-%iBZS!Ejt+GG`9WH0"sDB(O*AkG"fkg<D7)pjO?TSD6oM;13.T0hN1,VlfLC'*Z2q9c]6;ON[AE95P+Vs57Q)ebWGZ4EN.PlTn(O$
-%]Gn08n9PIY%[pb:9Y5VKS#)XH#Wg5@aOE!%Dj=r@ofu.n%rE2rT:+Rmh9Ha`?&+cHS_aU\*(f9U02A1-KIiE)QsbW1^T\olU&>hR
-%WQ*%'f]P$rg9+r@YF'gi"h[cp+$aHE7mI`ZBXkBF_Rg%jK*(?LYCASC&+@p3XJ09)0G`:\7cK+?.@cFfbgkE1#bgG*Nr4Q>GqBmU
-%MS-D@Y^$Z]qT+Nq)b(DX8A8^-)]7-ZB:GNIO+G;5jV3/L#GRhD;j`rmmCWi)#MR,)JFSst>^"<Lcr5ZQ<jQea"AD!tLXs$R/4iVI
-%D/<6Uii^SaC"ko'f7Nm;QJc_8a^.cLWuVu3ZIm'q*!-Y6WnG)K*X2m%Hg+\D[s=C:p;2^5A!dU@Bk#HM*o-be3YlffHNr0DVB(<H
-%V5^mX%`dUuNda;1/il\\7'G[Rg1,?rgjPM*;&o/bog#V`kSg8#G_$hcFa0Si<6"VDC`7p\[fu3S,lr((^km]c]HPTE`eBa@o>(S(
-%n^naB%61`-UA>>fDIP!Ga]5Ik^fZfl<X(ma2G`;6a5[,93M4Jf&<[ip3#2:h)(nrshm(q@C4jl,G$(B6f)TUPiB'`p3B]F*r\-JF
-%$+I1db0T4_Ku7^;k2aU-n)UM%.G<R=BJR%AjUYQ)D^TY4,Yk'k_r-nVLOW`Ukt.OV)POu!:E+PZrRBe:CX)6-]@f1sf:=Mj/$_<N
-%TV'M>5fH"p=hf\-_3R1Ok;:M<IOV1Tb%#^V?meG)mG)7Lege1S^uc0RE6V%^f/>(tF^/Nd)DT9*JhD](oM-Vt&A6!*qg^Kc:cL)e
-%\`D$ZrI@0#0.>+tGN5PjF\'s>Kc+3f(S+.GpiHnpD0)/DQ,*fuC9s68_on47TY,+fnQIXMC9/uLZt/'l&(?HHqX(,G(HRg].6(.g
-%<QRZLIpRZRDGlDCYoRr@<I$hE7>k\KJ^;BMB=ht"0g%G=Q%_P;=C@Z3q:,J)kloi(4AlE.$"%$<]?=VDpm0'8#I'2>@W)jpgRk(T
-%&@!3:W,$l0AQ]6p4[*GJ=jlM9:+,j!-k\Pqbfb92M)Xg]ptadjQO-t++_I2K>kk67c:jQ$6<A#_nBB<@R)HFY+1@q)1GWT]Q)^22
-%mfoQjq<pVFF5F*5/-?KAc$/*QH$)*^"E=R^CR=2ecXLY<9_VKA+%6b5V^El.EHr:(*XQ6Jgq3uJ<m#`Yd9hV[RIj@blKq'$G[r_F
-%FgH=3m1>'%abH+/o0K%3oo%sT49Y90=<u$DD2:"FLoVc4VV1$T)X.Moc@!sjW6I/SG?R7_$*6:7!:P<XcNcMQ],A1RP-8?q,fjL$
-%/RR@\@F]m:"@WDBTd;V_Q]Mfb,-Q2.D0m:u<tb&:Rl>e69@iI=a\]0kj[(j#"m^PEV6RcX`I(@,B$>K1h/%a]*--;a"X%2f<T`\V
-%:8VE9)Wt3!F*f@j=#$_c]j[R<k*<Vb'TT4u*rBZ<QNI"dkO_H[GXV:"hLM;;',Ti?,#,Uo"`oJbm[_#K_8[Ya8"=amqf;B@cOP_\
-%itdPbZa[(=(#D7;(dmWF4i6[qdclGf10_j2dI22$a7>,7";M'A%N_m%`9I*+=3qg%TuE!.$jB!i6W:TAaKdau*G>,H$En4_Q=Rj>
-%dWV'TGjZf&7Tao"ITq^r/C*1ac&'5l4Z*c]BS2NM<pQtM(25a"]m.qio?fg(.3(r.Qm"rXD<KJpDSV;rN3YD`]i[E_!Jpe`)fEh$
-%c&N_+=0qFA3'$B5g@gK8J/8213uaX/$3T*G3i"%=4'pNQ\"mMS]L3QVA4I&j),c+>H3T9AX!+Y0I%]I9-b)nCMN\@'Wm=1=12Emd
-%)IlKrNtT*g.r@Nel=\U0:+:_R=$:Lr/?1kc2GF<Of-W"%g2XuBYaN+'Y@W;8He2H,+PQ_<Q=XB9<_#<^l.)CaMo8M56@3>AF+Z#s
-%rj;UWqRgFn-h%=/[?@qm=j<]OHd*R4fX=4=hJ1+^pn1SKH@lQ6$C<]'Xmd<CTF@T>c&+qUM#qJ5A"\AdLpT4des[gN:?(*BR]8M.
-%0BkL7@`?]m`JMLu\Zqlhh9(2J$;_\?0Q8@KRT>A0Q#01on^:B=`9$KK-22R0TD&FGn$?t"Z1mk4H]`3jRrQ[)GbS^\J75([AWQQ6
-%3G8GqdtJ([hZ*;$j'"D$:"EoY*Von:>%eW<BEpY,I9NFTO.K(9Nh/]eD*HAHOD4B*[8!;amgKEkX7\c=b(Gp?piC^r-kIP;c!L@O
-%hNZJKlPX+dLn__3#Kq[i;C:_&fRP2-YK["$nVi]VAdMk'W@gHSTp8?Lkknd!_Yj52NgV,r,.spg:f53l`=%GK*ljK#hOa1\S2/h,
-%o4hSb&Y#Ui;@%>siH2*"1Ug/$M'/Qnn$TY(>gqfIdk2oM@@H"L][Ra[#IEqqFiV#nQ39YfIFu_\k7oJtRF1'e.bOIUDmK%SQQ4e5
-%KQ8>Nk':-Y8)&J5"O_-piL<V=4p?0!i!]7X4++;:A*H.kR@T.0q7Jiu5W(5!cYlj-_AV2!nQ_79Z+om;]El3dqRj<'##bf5NeEH'
-%n[XB+'b2oa)[7r'JLGd+I5ZH7bo;ZW[d2eWPZJY'11TjpiLs7@J<&Pi_._pqCP6s=b&TmViOPs_H\`<tnLWicHCS-X7aO!\<olj+
-%!DWn803ZLof#?4GcN&#I"?2(PgP"Vg0+oM.c(-4Q4=sSYH%jF?kgbS=LHRlVN"<7I]X]nqV7poHlr><+qo\l*=Nk!@,.P%0NiPoM
-%&PMV^jM_nh#-]6R28.Sp,P,<t]<&qq&Dl`E*4W:*4S"riE-pA\H6I?Q39u0FfEINkij&F7>@ITub%;kY]W1q@(mESVW)rG@Fnhq'
-%]-%5\>)hVimi3BQY2LY`A='%n)a1.-*##=1l'4%0gZ^taBk`CBYiE/O+.Rf=?$9F4&Z]%U+.cA9@SqNU1N4/\e'Fg(48'9Eh?[`Q
-%]*sbWM3E]a;'k$>>L`3X_KY=kCTn"Q>?u0.bi='4<2Yu0."HKpn1$5l%Pr@l0C`&9C/8F>dC^WiN>^SU2_8J-aial^#QqTWEWdcK
-%"-F'W56q`4$Kd@g\N=D-q8(3RXh;!t+Ia&Jd]9&?Z@eiTp/IYGf?lTSgWd/Cagi3)]u-SR+p=H74fX,Yfs^)1GqX#_-;Re-mLbu^
-%9#7PD#NV;F[G*DJ`S5Da4hL*+[`@88M^*PGMfj`N,H@N-m%!VrM`>m79mMN)94de),7BsB=^17q%>%TfYT6T%m,oglWN9M,qW.7A
-%ErbI5mJO\7TSL%(BfSqMod7oN*3X'R4PVD;,QYX0/A\YM!<1p49<gb,DTf5sCWpsN@P7j2f\sHUAlm+pa62Irqm_L4bo*C%!tp!R
-%UDE*62!p7#K;iaLOM,cT.:D$'\^7_d;#o'#1N;(j$u.b$h%P%dZ%jpURUC3Qc8]qpmdOZu7l7FVh@DtQ_[mV8H-/]pbDb\j#/mcX
-%#3$MHarnT>^Dsk:SFTXpCS""/csUdo;fQqq\"jX,E^UJ;Vgj&PHJ=pXRMRH@VC$9:U5cXR/q=bX@Fcd^-?%ff7JXOf,B2)uQ.9#C
-%`Km$^mFc(ti*?hegYQN,'HCecF!QPY_m:C;\adh,m_sF+2f"i-`9rsnF%dsOUMmJ59K9Lq:C$s*'^o6Bg<B\BS*-7g%*m@=I*\.C
-%I.009RD&(u13,?A`p"Dr6b.Gehu)lsBjr=WbXo<@ra)Y]p3*-9:*N(W]+`@<0nSS0$\!'GjHZd$Fe)hkX*fiuBr8AWaHOp(Ad)Z$
-%Z9/=DV+u1ZVmif@<Y.Vj"sRAIg$;IG,![5DRI<`VER9<m)gq2\5;1X0gC%AN\4)IHcIpso@SndY6=lq_Z6qkHY*Yu#eq"7u!JbM6
-%m#7hW<g5+VG."9AHL9.hFAhh<*,p-`(;mEFLHRDJV=%/]*ZtG#I44V/A%#VT49=^plXphV=m^,p+$t*?jF[W:3&2W="W#A*E@fWH
-%8^:'%*g#d-U;H'q/)E0*<4cJ<]eBn:8*o*@P^0WfIGm*K&]<9K5-l>4oG22/UcS#9AftblR,o%hKA$O6@?pNhOEbh:GO4[1bcks$
-%)dMcd.$c(2h2Rm77tmYj:O$-/a>J%03#&a=J_^e97!3c2_f3')V-Ls,L:-ge's/U62'nT%\nCV$F=Ug:QM/i)C>Nj+(iplc6urf]
-%f\7O@df/Fp5kd-&F&#D+"M(g4(g*0#n_6I@j$Sp[drAcn\$(!oHQgC^k=XBnBBi%""5'hX@6"!'Y7".*=+8$20UNrR1"_VB]bqRV
-%F#T"5]8I[lNXOUu.1>&d-tmb:[e'*,:\<3o>MK`&KYSm,D=YHGOMt@nfeLkcDpq#))M6b-enX"PlMnRmj4D0g@nrY[a48@8S2?7h
-%j[ZefAB:#4\M&NKC;A3i3kO\qE)/SN")0q%eo@+2L4lu6>36c].;8@*#Q'24mGJ'sjLg<,\VoI):*g%ZUZ^/`UNWP&QCh;3r@&W]
-%Hn>A-gQJUHm^kR4\QW,%?(FA+]DS2A@L:Y-!*,O^)(S+7\8sfW.*<`:>L25lrZ9>?%Uljeh7r%.fg^pQW9%kANfRl8)(Pd]FN.C,
-%$M0R-ka`cZYjKFD]>/$5]m2!Hdo"!A*A9cjEM<V4k+_AP:I-ggb+T(fI@mjj>>0Sred=3eYbp`SkT%CtKZij(5[sE]!]Mtq/<+o.
-%=`e=1UFo<jeE]qOSiZ8^l>Xf@R3H.5j!c*P`ORomnD`E_\dkg]KH*l,dp_>ODMbNU?6is)YB?8YJ&0S\[Vg)[VbO*OZiB2o*(QkL
-%_P+%_[D1'N'o_bG7=1&OK7-tR@hX1,["-M$9sAbe@u#YHg]bE0ZJ4]b[j)in%g#&0R\N'Ui]YnO]$A\]?dR<W&)b!YNcbV!F<3``
-%`S_IJro(q'Dfe(YBg\s<R9QQP5k2'&8f&:Gh0>os9@2#S9F\IU7^VR6h<3tH<Bg2^Llj('PP?H-(3b.X,PB#@_NW:4ojrY(heoPt
-%)OLCBeNt?3,UR]8H*1hi)nJAmOkGJ83W;>JRGPK5ffn6?p(G4c-N^ki$hleIoZBdejW0bo+Y1n#?HJ&G%bPaGMPIGS2:[``FjcYD
-%qg$/6=(OA@lgtK((4=mJRB\F>7b'D8PRLr[pNU%OT#Y3J1/DmBX:iNq>8j*([gT0o:9sr2D@\M8FCHI"K6*d"=5alWdQGO&"$0e6
-%SYhsSO-cUFL=`'eX8kF=i0YD?8m[c#]OK5;rCr)nDV/qknpu[Gk`f0Efjs@+0T0]bgSpHM78aFC/Un$'>'GB?pn:\fQO\O`T$L59
-%pk-\.#`T!B/FIS)<$<`:S[.E*QD4FhiTYMTWd@D:m2[jhf=1U+N]-VQ>]1ElAl9c[G5aO'@R#9O08mYcVfqY4eVO`gI;JGQ%)IH;
-%V:4bXm&DD.4gu/M$i,]Zf"GG/)@d>WZKGaN&*g`M,q9,)$/+&S&FYAGj9MUQ._"]9"dAi^s(:^oHR)7e1X48+5lCrf,+omBACteO
-%"CZh:N/.MH+gE1f)"\LH`*M`8&rOmaj[+e8o\\h[Na7^)bfD87M)BpRDO-J$?LE8$>L%]S=0e]5;Ad(.b_j]opON6'D(5j)/@OAX
-%"Zch$;7Yi]K2DCnEO#bPe1lB[*C[J=mD%I4Sa.n@7SXBaT?-:_jXXo9nr/Hm#2e4XJTnF7+RW.V:!#ECh*B/rbPn5J#dd*jaQ:WB
-%r$Hba3sblpR-o(n&SQ3AV326>:;S",+LqMpe../;PdqKu-R%V$3f[.4T28!n,qU^Z&,,#fl!f3A\/?h[*"etfUoZhsE1+kVAc]`Z
-%_ri?;:Du[U<WC3L6*/q]0$I)k;aPg\.pRt$?FU-Y=Tsc?PC>grjlKH"p_7mJ!eGfUFO/0R#_k1-A;nUN:IHC=lX$b,PS5^V?S[X>
-%k'<.egb\?4F?lP@^jD6R$HkH"Q)&0<DQ#klJ/<hrV4E!CkK4as3[k@@i;.?X_c!u_i0=;:jpQ,2g,&gA#[6Fq,r0u4$:lIn8D<Y*
-%oSMr9fs1VO#lVb2kQgn<aDMB)SC:7]mj!lge/V6!ZpAu*NR0!>Te\!9cY3krW2Ns0%tS]2Bb<_46ZKO,4"gC=`[_LM])Lblh7dF5
-%#JcN-<Zl,NSN_Ui!i$'CR'^IjZU@3c^uL&3:Y2ddM?^65$s+QN-kP2>C=eF0&ua!5KM1#$nhgIrWjQar]^fE1Yd>([?:gSVZSiDp
-%#$B[_4TM1aKg'`UiCn5&mA/uW^b_:jggCnW+>T#e-eqJ#aj/fF9i3/A\kEj,4@op"OqE4MYUigYZ>EFhRb'ha7"H1RMqP%74kN+X
-%PtAt>%j3JVJ2H@#,a\J7A4!=rlZfBd:phUoEMo6;j3#arM%BA(co!>6HnnYgW<t(Fl(i&R^,"1EGlT8,6Y?V:E.QYF`b#G(:r@qb
-%RV1k4a@f<2mgYnJS7&Vqnj;TTe/B<LP&X<Z2Tp4DD_)Q<-<W6*4,km%["bCT"F#!O$7\,8N4seGc"MCT1nFJXOq@tXP4jiNXUN^R
-%6s-*K+o%&TpIpm3d_S@a*_>E*W;Hk<)>RA^.t2N!%Zh/Q*_EV3r%]Y?d*QttHRjlERgi6&!d;1P3k#YL5uc&4EIrA'Hou8A$FBir
-%]P="=*Mak42Q?"EAbrU[P%A.k"nZ#*"gn^YYdU+2Vb@<D;m6=cLWi>8*"/0uB\_c-:kJE$5kN1*h2S5*N7e7T5CpWSUfk't,[Q0E
-%;_N`01<q;UP6mmf-aa.Uk!BXcZ$,s$&gIs:71p]2YY>nW@bA1"5_qi5Oj"[FDY/r!4uo8:ZtY+]dF!rF:FiOh;h6tBs(OFSod!$K
-%P\k-b)'Db##.u>ENt2EAP`.asog\@K:MnT8"k6#7bmPISgAZe]&U0&hKSN0OegO(p(Q*DdAi%&3JnW1qh:sXO\uictUlPDQ3L.h;
-%P\^,=.n(W1@Z6+HKN7#6&g5O<.@$=#AACCX,flcu:t?6^fJ:^U%9u`3*J53Z$JOY@7.@`?fpKce"Jo!q,%SZ(S!s-fSTGnnVKIO_
-%9SSJDJL#u9<S.]#g5Y/N3>boQ<1C(W?GrV9>@-;'./L;EAp7uEmP;PUfLa's&TnVE<]'kk,jQ[/XKoD+KU-I].6JojZKZ8$e?]Rd
-%'d!2m=Difm:+*`t-qT8;Ye[)8.Flg\aIO/L#)Tuc]?!eM&N@m-mKJ8eaG.J]=Zpnq\SFK.I2fcf^f+bN1a`^aROQrM&T)B[2*4WQ
-%g$f6B=fH:ER#MTc+"WF+W`!Hf41H;O2-\$ula2_qls<e`YaF1:>D^RTaQh!_lQ)4S/otg&<hRka!8oj/2*gh\G\sf[0e!C^;E-+f
-%:h1-S(-9?FX`"LGHNV.fP&]`:pcAjT02gZg,Z/1@%N8.0$UB+!$os'4R$jgOL]R?=8%eP4SKKr?5%<q@cl=/s9s^UV>QQ'#:l@Zd
-%%#&>i%6hWgOutVSnoY!O<I#/fpM!\S\PESZe<RUKksm/6kSi&da',AD;H&k9>E&*?K)XWBM?3\)\ke6XMTNQa]ke-l40$JtT9'RW
-%l7^:Y,h.rf4D1]rggn5\j1k68M4BM.'W;ID-rZ4UWm.JRD0U.7+=`s8:pqFABG*IVUt@-cOPdN8iYT6"a[PLAnaM&8"4:b4;^*@r
-%Qe@U]_a2feTh'<e<J+#m-UU$0WUp6K\P31e-!+rVGp[-g+aSlIDVaB@<6JcJeXmeFW:Y_F*]Hn^NlP7t9sJN5P*&.D_]!SZG4u%F
-%J?/k+s!R1FgsZF_G&Xmf"=$kKhg4fa_N?[,S/^2IXQjS*jCs5H*b@gdE(fW=d6ct6E^#!S(-0+M#1.Q>@*'))3nPV;p#(rYfSCr6
-%l,8o76>"T0p>?4,9iCDE(0k-X6QS[BeZl_+VpM\BNV3;=J56gUe?G_Ga?ds>#2>+9C>#Y0`-#JX<Z.$RGTL_WnnVg[YNnS8a'+S1
-%<bt<NSaQlbLc/+\SZJ!'gDdr0$P_-QfOVlcS1N(CJV)Vi=?.nT;I6,I"7.Z$:LjXjSj<`Hal[T9-c!D"3gJJN=aZX7HJ)DaZk9P]
-%giI0df`\VN;P^9e,'[ZC&/Z+#\;`a@U<8_m!gX0nO0fclF=4OSFg'&rP,OLjU=@eGA-Jk4(oS.i0W"*WaK\sR5'6X/]57(2)udQB
-%pojN3l:*O+DGOCAitUNCV]pJ/"=4Xn<rM33*X>)cU'hiI'8UH;S!2W./_D(Y=EF(T">66Kn!UIU>T_nbB51GF>cJ8:3sdMp.ZRsM
-%H&RtY<9/F^?oc1;/7p[O49h^N()c_oZilT_+O0IIA>Df_N+.\KT6lWHUWk"'D(R,EMAi`b;e+*/aA>cQ<9S6+8(ej8gQG<p8csT\
-%-@$.]FQ*_$+s<"O5EQ4P!`PLH\Ki!.Tp#B?fIJ+YO6dF<2;0u?2C#1n/cb4(*Z^.dar?[.dhaeW-m#m4OD:7Q$;gpJkC<_/ScF7@
-%*\#I)$]l/)l;mCtB<>'-8ICIM#\Kf?1+ipl(/h#+_&N>AfM=Og;mlhekJD&"7>24*>[iRPV8+RgRP>T\`gZu8gL,1-*>/ie,6+=p
-%#)ene#,>msUE"6mQ77o3"[R]?8M\XLO3;F(+12\ZbG;rf'V7J?)P`'dPG$H5.3+YdP2+CA8:s_cj-R>uq>CKD6`/1,*$ti'Smru>
-%T8CEEDk6o:-34<)0c9284u2A*$;"/W;2qum:@?D#WliGVaBJI<`\@@Uo"H+mFV`NCs.[<0=s21+DP3*Un2Cp^#_&M=a[teNh"*oc
-%(%&%?57/)VBhc*F>)87+:lnXl_3_DsAroo&(A1:\Ih$Q[O_NG"7n?-]horkg)\\'uoJP[$)KPIBoqe`oSZ<@e"/:X$DAe:o)0G#^
-%HTOdUo1]%H<3FFd%fg<Ogfl(Y5b3Y!!54Qo<E93#?KUMQ!n+BX=Ns-dQ\;ZGZD-.u7jZ5'VOE5#>mPF8S1T.u>gP[p:kOE&4s?2<
-%M*3`>P0kiuU1sii`31;RD7H*Vp0dZiEuI5V:$"j3WG@^?LP0du8nV&k/3d'BNm=%E;'OTTQRm!n*e`j\!>IF&F;/G,M+d'"aLkC^
-%^RgBhQc>53>2cm:ADf9Fnuj@Jb$<10dfm#3I'm^&G_`O[]`IEAT8IT!&-<1S_eTh@_1jBZ*5`1PJeY>?3ImY,`+UXB[/ZrR-0.*$
-%.s^B0feT_aM-=#0&-NWBh<5?a-r3[q'%t2%eTu!r*r?.@]u3i)S@2<2#kOkH!aabX<OWao9VFj`ofB%3FqS<WmsE05?.q4'Ore._
-%FFOI;>bIBbL7<=opk]POQX,nc;Hi1(;K\&ME!><u#kTUbLf2Dr\#d"'611%;QS$'K@Q[Ll@mM5O1uo;ejlAt>I3Z`\88`AoURim+
-%Vb:h^i\gKri2n[k'?W_MrZ($0dW==_O;-.WaNOZ^28U4?At[_m!f2%2Yt,j=;,3IWK%VgGiM7oflb(Rg>QR#,4!8LL]/8eBj=,Fr
-%i]H'K18uKW])rGhFFShu:1,D?Zc[?bjs4Zt<r>j`=0b59lTfS`/:,50O^h?:qA0Ct==#[1)B*;Ed`h2je)M-**35l@_5/<HfrKc\
-%i3-0Y/]l>kD"KV"/L2qH%e5[)0$(b`FT47_K3:o7^n.e5P6MgSnT[U5./[m/ged9V6*6\-5f/UcP7Wm1Vcehoas=HcXOVp&UGKP#
-%K!a(7!CpM]>1l3&P-$"-"dl@od$`jM"(+_OZFb#QT9/^5P+mfUlGWgfDP\G]7!L3C@#%m[jsBAjC'%4%`KWiHFV2n8?pB1&dh>CR
-%8/5XQclFMNR$nmq',ZEH!0/42'%mH(-<3l2kk$7o\OsB%$D]")!8;HqX[PmKf4KuthP*(e<M[=DqBn?t)JkR?TFdM:ffE&H7'EV$
-%01?'a]M&g5+a]SYXd'+?''E[>g#Us7g`8?Z@?:Ok<pF[1//b"Qea%,,U;Sj?+^-(313Mu[HhC)%g!d042U[Ol)*p89e%&B_m@['l
-%Thl=L5;!NDBg]RI,pjik>n%4QYN`F@Lq$oNd#P%"hRo.ZNF$@U1:J.X6INXF#t7Dl\kMMARHX_"7$9RJ.`oZ;YH@e);][)mMssXj
-%XUn8Xgs\6F!3_]iOmD+"7Zk9fUnEGV4M)J29aNVpdkDGPnFFXJUka4!"1+/=cpUVR:>VC?C/Q&D^_+e_SLQccakUL1Fpn7FQ*aI3
-%$7&-Z&P/?pImVJ+K!)Bs,35m`3b*FRKQli`X]W5k;W(OjUIHYNgTa>aaM=*T=V_?$,t[#[eU94AAZ++O%<!G\l:&7c/'Fg$#_Rp!
-%51q&$A^_.Ii+,>\8GR@85.+WQc;N1),_$HdS(9^DH:_`%Q*OHCK7MSZWCRO2OPum)L<J!R`q_k'?)@p7mO0?1'KW*JKBPYRQTN<p
-%QocjSQEY02>PMeT41iBB/8(5O9aq7'E1l5fa5MP1??R$g49[u6_)9+7kk+fV[pV@DDd5/=8/%Z[?qiK6iWds%er:H,qGX@9N?=CS
-%.tjN1+`L-oCdBC9.4aan))iI1=]dIX)U!ge]*&M:gVEiR9hNTVPF\\8hI)L&(=1ipg]ERV2q!4I8b-dtiZPYG/^cq=Tj+H_DmjGB
-%)h$]I5S3$\d-(\dHnr@:CnFBOMrY6$fd(o$),qg\;*2T\e[5[5Qc7=7;,=?)%g8E!<Xb]sM[ht!K/F[`q$E&uH7Itr94e25#CEUX
-%C"elR\H@Gi(dKIn@2c77d1kOJb"`agUP]mln<W9BnF%r'5pNb>i8q"4,Cm#)7""<;4&n9l*><X\W/4L&XE%CMj/5/;p:aHmT-9u[
-%qN+5$J3bEgX[RpTDKIaQi:@1os4)aJ,Y-ZfF60b4$Y?:[^33C*<'=dAZV8\=Ch^o2DQIh]@TKIEmBb%-oJ4h"@43DcAa6:om`7Js
-%mVp\gZ?B8EgO7eSAs.j>g(5dUBLT;Uk^_7%:`:e9=4[a(N+?cGPK*>R+hnReaCFH`$6p<1=L.ARES!2:N=lgZ<EIF_,V(Vf;4Q_)
-%7N"'^-Qfo#@fg[7RNJ%LD'`/HS>Nep'0-Z"-6K2j?KGdOl45?tq"lS_q(ohqWidW'V(OgkK:fD/!iScna:p2bM=!PI,k/Yi'mHt1
-%F9]U8ODG]D3-rSGgRJtff)<>,(9iJBc#VlJ)Y#'\2E4i?>MOb%?(DA-J:]^(ZP!h8#TK4+'r!<0'E>.g.gInJZju(94Xq[d#EI'=
-%$E.Qtn9sVM2,NB^T*g\H7TBNbSQ$*?,bqs[9ZW4#,p3tM!HkOHmo=pge0@^XPuU+WL.)<j@JJ>d1^Df,(WtF7PEDn2_r*TjaE!$B
-%E$58a;-OrJ"7VcI%hF@=[*rSI<N'usT9VUr$Y9VV0!"2N"%`ikGd-ZHqR9%=N$;^+`1G,?*E'*EU:&2YC')UgfA<$Tb\rYrnmuAK
-%33Ci0'Nm%-3FCL>,/pJjjO9jNP[Bg!qJ3a<F;l>3=uA-V1c^q%!RDOo%B<_l8,<MpDnGOfCDgnZCudQA:2n^`CFRH2Or?/T79D!Q
-%Y$/U`P5d`u!3BrO:@`]W,[_"#Znj_&o5d=L6K&?Q!L4Rd[Tg]L"%Yh74](7'hC*aHfn:D(H9_X,s+37,%+`$.>TN'".I7&"(%%m*
-%Nslf5D'cXT@NmtA8Ls""M,,LPfa<8)p?X!\>1Us8P+lTN/n:P7aeS<UN-khXAV$u<fNki&+8-")27`\tQiXXGM+G%2VgEjo.8BMX
-%4]NX!@$Y+A*(k0$maT6brlmu1l*$ai!9qYs/gS!'S@&YJ<N+t=dF8;T@#'tf0tG9'1(*=cFpkk;HHsh0+@We;M$giN#&&NVD:@55
-%hOqVoUfX9@jRQmh<;EchO;I1)GNrIH$pfbOWLbLT%';N,JFN>!9$gX;k]@4<q5Y0jA^X*43uK/[VdX%8ci?WOb2r/hd"(^o.1m'Z
-%2>IS(JOX"ue1+e_/WalWGLpZe7q(p^Z;ig\eE)KOX$s]\OfZr#/jH#J<=amj!%_#SOlc/1$&Fm?n0b?6=UL^G%FT(`>!PUYM/);.
-%8k'U@W7@"NSQYVhfNN0#^M/?;Bl5;F8?Roti08LH&iI!NCmRu+9GS3=VuW3-$]a^b#)n]T]gAGpMe52qG(cTueeLTY,[CSh'HR.<
-%]\_>3DuqT?"X*PP;X[@i+.=_tG3R[joLM`')A%E*"?X)Ef\PIo8;0Z!H4XXOO]=[dbu?1n0;sj]^J"u:=-fV9;^*m;=OR8YUaSH^
-%Ksn!ML/lb\Fd`AB=^g&C,b#%YKDZiS"O?Z?Jlc<j#!WrKZ$`>^W$QbYXj!TYigNX]4HPr(kLA!JJgP[HdK%(I\su"<4f^m%kt0!*
-%c18f#K;PA1e"rb%`5To`G(_oq&n\,l6:!OC\_md]IImC>-#LXtUi!^jksgZV:8<'-!7Z.C[k`XQM1Z(."`2'j;bB*hDN'hOC*4Q_
-%Kf\Ugf[1o^R[FA+arGV?/#Y7cCITDLCiQI%<XN@2Q*O]K0!M_*nN3j75V55)_#;a?!S>g%JHabbbT0UT"IO.<;1cFH/ubaS,)9]E
-%UHN^_:K<78-CHN3*`>pbU?J2#8kK@;CF7fc+`2lYQ^S1c)4O<8<bB`Kl]"":Q5o*LE;;nTHe0ImR*34d"TMMM7f'6M"_LeWRR+r/
-%j$h>e.suE/c5lkB@""`<FGH*u5\ali]@BKJ5YNE?SMk<k<raZf7F,uYA]i+gK:tR5mKf#&97TY_&qH)&6rLQT"4FVi?,D%O:EoVF
-%H+L'Wl"*csqA06M)KgnpL4FtJm0pr<;M8h>0/6\sI%`bu;aDq`,0O4L5TDe5ZLH4^/t`D:Ba2'L(E+N]p5i=RN[;'A!O3nk;:>b"
-%ONcS.B^h5[9<`mN1TJ:tQ/\&,8XmB=@!"KgI[[UM>1QlTo/Cr.E4%9JQ'?lp'n]`/R%P9&fJkQEqdaN"=gif5+ILMFfk1:,I5]/:
-%>sO"CX[[;55VAjNG$2W'YG@l.6Brn#L_E<I2.l>5-b-<W"LLg[+AJLd;9:G/*>iiH</`so]I<]Q&02*OR@FCD$Mel4_6e-MV=()M
-%LeJEI]F$IbEnVrp7MA[Q<OJ4%_6f<33iT^lB;@l7.lFNXdhqB[on8FK;/k4(oHo/B6WQY\.9K_K&bq//8[QZ_L?]u0:X8Nt"%4q6
-%d5Gd=r7hsaEc.5C+I>]T+7(E4&9EEtTe^%`E3^L'*3GA/lYWLl+=FZTAD:ZdpK$9S9;OT)E,BC."0;e3"<^PgluQ[NL=ERt%CGqp
-%,E&@'-mOOs!e:O?phpei'4DjuME>fm0Af>"8-Lh>`](\n;PpL;/]7$HOWo?FaZO;:#S%L+e,Uc([p1G-J9sb%Z-#1>rBW9;gVRFE
-%<h2]t!36F=blr%p,,uRnCGH89*QBKJR$F(h8Ig_IlF82TWW!d8B\A19hm?KPPq^VWLCp6Y77jr.V_<#D/Ft;e"U=#b8luumL.#bS
-%9\o9F=jO%2_h'&)4hk`g8g[Cf8`+Rkpaf)9!?IsZO@#d%>%a5(MVKsER=kR(%O[9kU#]clBoo$(?Dc_@f::V#T.h#>e20l@E#"8/
-%!A.Y`Le)gYWJSQ]PEA]"JB6(_<sWc,&McWL7YPoSkQ!8VF<mi"<KM8JQYco+R[hPj,7.ZVm0pAIi$5B<(,l\_I00UG[O82p]g*])
-%,u4dhig`pA!N6ICN?f0=N'fG")-ORfL8nmc5fdc+q?5KWFZ#abQsk4.@L5"[8gMkb#508,K+\D+74E#\NXqQ_MO"^R*,25sA^[IL
-%5Uhfcf]5.HRWtjh<cd/S1XYc3GgSuh6c;VUXbM20$qT[4%,/tM,`Mk9)("(+n3sUN<S8`U*K:)G@@2)CUN\hHi9)P!QG"N4%n+!(
-%3Lf)!C)NC0Z>Dj\63@D8PO(XCeL1SLft=HZF_.LQjKTV'<*jgb7(5)aA\(SHHtee8d^1;#cB*l-o+\oJM:+pk8h39/ECjsRYkX](
-%c$:[XS)rOiis+7ld-M5oA>I(@gKM%E6o-E\qa.i@8TL]OM;n(o04^s:^&j(Ie'Z'>+f6ITC*51dl:5AL6"<J\-"t)FXEk&N/''IJ
-%D.JFC)Dl*;ZqWVq,N-5nk678F<,YaW*[L+:M39UZN=:18NAa1&,BU6Li:rl@W8*&hW%98r/fP..$lg.e\1&=cONc@OSL@F%7V'Xk
-%.Z:9YR+WTtmZlcuh\(e/-=&)!!BLKlkpL5U'+MC'j)n9$f5Un"F9Tlsoc9,+4B(/j^rh:%OM$kf;R$*+X3/!&I[pJeURGK:F[oDB
-%@rIY^-XUg2#Xb8]_DeI1%DK"\`+_d`h07[de'Bd'XU$#e;lhQ9;-es,H)$r@EY?M.2Cpd=1J3Q=`N54Pn5+Fo;t?sPs425pE,4Mu
-%!o9?Q^hEc%asMJL3sU8Y8T*=bRjU)$OlDU=Rn4]8s(I4"j;S\:#2VCF2$o'MZ43M!JK&.NF3D42Q!4#U3]Vi>-RHg7dnUR`)Z$Jk
-%/c$92);oLNP7Q<G^a(J<?$H__aJsou&2\<E-Ra1]1lKXNd^_pl!)D40*i)'#TX,1`*qBM5?BbabJrlkoQI]WDI7Wcd//AoO5t5Qt
-%TKU_2oBK-DZE/^oK/(A[GsFn4P1='b]([6E)_J)rC/0nET7QmoAMpRAIZnAE1C:^]LG4M_W!mZ,bus\sLYa1.dCEdG(cC?t.RSa.
-%6B:OsdhJgohIK#@.1`MX"M(rT*7L!:PGk7,,XVMmJO@j)>qQMh\he#R)B&hdTL9RNM?(9RcAL68,^)9&^"H-*TS'XYYmdFJghDli
-%0ARc`.rg)RK[2nY^+9[ufIRC1<t0tkg(gp%#b(ia/ih9;#]Orrpqb;O'7aLi01-,N2@[VI"L=LjG6c/V0HS'd\l@q+l[:(o6[(Sf
-%qLFJq&Cq<'7ZF1,+E8Zd@?MggZYTWElA"s5Y,Y7d;p`ssd/G%7?8G*5QlW#B[>YT]M)]-5-,EmR%*jA-Fui3+>>aZ5VmAX,:WZQ=
-%K,;c2SP$8','tO"FM\fWJ-ajE<5D>Y:@&d3)_LR4@Dug23m@XPl3_Fs7em(TpOoQ^O5@s)an;*(I/2S:AZ6]S^)d8%,c3gcJYEtZ
-%jZtcRZ]g]@ND%(#![0eG-P'fhELIC6j_9PCOitjAQp@t3i96YR%HrJ3#$mENIOeS'be>p?bXhRM1DM<A@s!8S=S4GpBqpiTm\)p=
-%oX&9B:sH=U$s>C(";IT37B2X^k!o5:,8R79+EX=_U8sA>?;PAQ_O&'0dWnNMBHut0i0:T)JVdWBDpf[7Q?'=f5>rIB2/eWdO`GdK
-%JrI[*[aS!'&$$=hfWrT*b8.9>!]LC=$YB;nfX?=m:`Z8XdkJ1.Ag9iVJc;`&%O=j=<$");(.[(cOpM%Kh4/9uM#B(G+9`0,CZ*P^
-%"JZ11AZoYFZBEdB"`=\RkN%H/9/LS>1o*\d>U;9GKB+qU\Lh\q-#;HDRAV)'1(*3.jun8uKu@sF<B"k-$,@.^!<eOB1)W;UR^J;-
-%a(C$Pfh>S:Gr=5l\K"WD7#.T!-&IaR='5n+"B2pK"*lW2Y8S6KaCQ0#;IL^-C]A@K1S"q2k\36]`)*iX,i\@C2pbbSTVU"f%hq,t
-%QUEO/,`T:$ju9qC8T6X(A1tf8,LHVM)hI@cC5I(<Pms1-92mmQ>UL0s\^i8qd0'H_:.NbC'"G$s2@KSSboo64=2(NQ:b*!Fd=GOt
-%3(g%aV0R3KQUW:4Q7G_,K7Y(`L33\^RNaQCCUpZiIDIUh>?f.qoaAOj.P4Go\=V-4Xd!Y2b$t4M]VO[b[k!r>)46%M+kCXWP^gh4
-%1]e]_Gl;(hQl3J032j9BG%hhL)P-qnQV7NbU='h(dmlGEXarP9nO,/5OgM5JasU8/*D.7k!"?8DGccn*\j1*BBEcgpH%crj1,YF6
-%?o"IU5,M71S$!4M]lXGn?CA<B>]j;5dNO2u\FS3^M_rCR$l58oelV2DecCsEljrTfER_j(c5EF"+GdiMl=C.:9?'E?Y$pcl;oqtp
-%-Yi>_\_^"m0hGII4!\TRC<1+\LG!6Dqi01u"<u$pRZT!/@#*BES#FTM-IH.THY92_Ba$:5`7VRto*^P8S8**E?l*L:jQE&S/jm?#
-%q]8[EP?K1/)+[dp1_U^./mBL66U2Kb0g>K77jpI-XTXh@g#[@?=S3r$(2=5UjajpS#=)A-GK+Hi!DZl")(SOheOi">f`%F.PQ7OO
-%>?6!HaS]HZGQO,S"@[BiS0?%jMG1Ya;(P6X!/&F+PkbH3>U,4]\W@Ka)H7u!((EtCG)F0!3Ec`p]V<kcBmc:+]-QFBOQi$a"6Q''
-%_ZK[KKL$ZZ<"5f=Q8hRL";3miIjmgjdpOem7g^]h"q7MlT7EWQ;MD209'@'"83)QpJA=i63gAaIfr3=CoPeSQK7/La)^*Xb[gFfk
-%bU>K6ZEs0j7nfk.E6uD7!PT>F.iPfB,/uD(1q?O/O$_2Fd3%!i/"\_W&Fcfp*q(JuaAcWiO;Q@.3l<Hta-D<R+T\DSd)#kU;IB^7
-%N!hWo'T]Ge&O6G[Y)0u1Ulc(S&!m^_6^D=l+&9,$.?9%pg/A'3UEjOV&(DrL)cR*B&%D[f`nYD%,4e@:G_L#H3CRK'XgD.3F<eV(
-%5Yn2n(s"P%K-X'H;0U3.T?%+++14WDFPZ*m)[t4Qd6R-);O*2NI=g^ndT%o@7R*68a)-M77k7V,85#CE_7ZQY*iSV4NM]p4F.n@I
-%;[`^&RPY;`^@K@@#JIrgDB![BnusVe8(%^O;>;bJ?m]8NaM*hqP)g0Q'F3WHSS?Zj$m9^<ko0r,#Q-I4;dcHD`CG89kgudlp+hr5
-%S<^E+?Qn]tE.:pTH4;I)O:t9l_0ID"]h^C_JXb-T6ZVR+b4ks?9GF0&\0]>HCN:FqB5=@p8d\/PkQLN?E_IuZU)B[-RCRTpUOdqA
-%5tD'r'W5a5-"0'-%oA*/aNLuN!HfV_#1"^-c;aU!GsR@i><StgBo]VX+=%'Am=Z/"Hr*96,=n^jNFc!]no$$iQ;)u@h!me4!f*-q
-%%B#\Zr05U8:_gY,W((`_/I]D)G1T:rKjl>989nU9THVcb%<\7tN_T*K96I:!8_sNG=]0o$;W?F5;jf#eZ/c.*5O+\'EiVHB@G'+4
-%Y;3*=-ccFBc59=eI+k`?V]/A6'kYOLL`&8VO22g[?so'0%.lbt*G>YN9;]l9$bIr9d]Xh1:K1A!6atZZSTi].L$p?[?WA9_q[QJj
-%K[p:I5(EjCJ0S%TgPM(8q2^_Uo*l[_D(^XC)sP$o<tN&U<konNYZY.pTO=!,@e^:l8aqg-bH3p%p/L=a)DdOW-qPQnVP%o_ONBp`
-%HmMioW'i(FBjh!QG&V[+g$56E!5uT=<N*s#"Kt,Z$5c)=-qhq@kthGr"=l"i&8hPDPcYk(K0,i:[,Urk_P2f;:B&4)PFG$D]94"_
-%pTuX?1.:*na+:8&8F"qrd;k@h0[&8%1BnCa2?L)RaFl1odNF'50>I\#_@o\f)_mL"6(ml[>G9ZWm+/N-TFRl39VP0qNp[';5P,.O
-%>%tZ0&%@nd27giGP7/'_X[fZoV7mD9ho37EV`QB=A:,;TW18H+`&YZ)/3T#jSs$M/_OrgIbCX@d2;g6$d.KY`D*9V!42hD@:V!4m
-%2\:-$dcEFg)WUDt@QJMn2,<e>bWq#0i!PH2ffMPYPM8U[<Qe@b#9?fYcD%h*[V6V'JFZ"JlRNgqO@(@)Ok[O0=Yd'W`<0]q(cf1K
-%4B2oY'CDDqTFP+g4@FZ]Ta]A"9c#7<-K.ZCH34gjV):R)Cu$91"$U)(S2N&N6aYG+A62A\gt#5@&-Jl&8:P"J3fMk.)6Aa.0G+Jc
-%\Nm;sV=V8MKuf&Tm^FD:'9M=?e<_&)EpO1F\n&JsmGVQ:CB8Z2,n1tS93HcL9-9YaC=TJLDenTdC,P(&GIcKd+=XZcj^1&ao5G?A
-%bA;<`0e\Nl@4@;_g'$=WQZh.fQ<QPT?ss0#[&7f\=qM*.fcNah]#Njh6CsBE5LIoUR?Hjj(3\h8]X2/RCS#(Wlr%=2GgBNE)K:F+
-%4'^[&6pMq\QY\[fYgCh"^VnD'Cs(dhcpc,MG'jDf66^.HQXB_J)&qucY65'IMX$A7F]jbsoernP<%8Iod<$*aHOF+Q.&R24KM2Y!
-%Bit`oAOoI<EnFLeP5;eu?;LecJc-a-&#_Z@XDY]W8TR^[X6rBP^HC=G1Z_@ih*<H#*$oH9J>]I?/9Ijoo8qn2O`o-4Q$f&^>U3H-
-%5V`p:DRiNC$qICmR6"V="+iGtD@QMi?>uC\(YDQkaMk5TZKs8+f?%fs!\9^?Z41i6%XHD.QZf)b*^"\?_9$'NP\r#[7],66!490:
-%TGg(3dIo(P>VK--aG/d?V$oU15a=t70&CQ7j,"+n]S!3EU8DM)$&&KN<jRC/8ehi@%q=3)GhU!^F.ib)hk[<XlXoX1U0f=Md.;PD
-%WMbqJ!cgZY3QWk?)W;TNKs#WV55>7r*hsn//s/W"3sB7Z';isg"DIPX+%9'4l)oAo;[(*/O4llLG,p'[`E;(%3$TI$BULPWAsa#]
-%7!1FLGpdO274dss*`BGiBa6Xo"&=/c%M$3a\:"FP?'rrg$BQ`o(g%Fs^_r!+OjK*5i+kg//G1Zk_aUJ:ldG_XcOJMe3I5CpdmG&l
-%ohZ&%"\M1tl)^@d_5_l/n2K;)%.\\+;%"#(LHh/:Fd)`dR#e;KTY+c1akCf$p<<+$.%H!1$,fO5K,]nNEh6]$=X3:T;$O2!WiQBG
-%O!ppD_bB@(PFNm"6^u#JKRO%Q=b`Hl*gg+::af%0)t^6n&bWjE0@6Q*J7oXrXcn+Z-6VZ*7?jC+?s8,h"lkJpSO>YS7_X!qr.*"O
-%+S(3"K8Fkn[R]P^L8C1eV0#K;bW!u5T'57).VLaR(gtmHTJ86*>)FH4,e0VmU33\Qah(qKMUKXdp$+a&ASu`^FMZ'U@JeKMFXg:(
-%b:ZSo:=^/H)g'JJ@gYZXNWs`]ZG_L*n/&3>>m!K[L$h=k$@E'kEZc@I^g@2L"kD/)3JD"pj-rgKXfTJB#nl'BZ;>-5`$982as6#B
-%YN4V-[&0Ne(2VUFVen=f1fnQ,k`7?]0:=#:.D`Yo+]4FLJboWkF]h;Xb1_H,M[<PM/qTJmC7ZH4#Z,dsc'L)4g*G*W2g5!TP(f\a
-%'.u]RnOfqgL^K\P9p;%)qQe7S4k0u2D/SinB^.?HAIJ!%fl^d>0&ZOsO(riK*C5rCS^=4,(Bc54+S7_@qK^$WS#Orerm\c7la]Ia
-%#CUclWgN3MH7#C\*%@&,'dX5R4(Hjef3qW@!ZrqD]$e1CMujJGJBcN$!RrU7*>c6!j;*==ct&LpV`[hE6\lFA4CD8mC)j=lSFG*)
-%1FjcaUlq]jhZ8"o0E]Hc?Zq%g"QBg%=';:M71,8pUJ3"c`oM]*h2529C'`qsCNiG*bc!cU/]qC.]E`O$b!!nO/[%/'ReBEI;^+sE
-%8ko]c>;CRG6nms62AF^m.E2eG)g/Yn])ocIb$'.F:.*cQ!p;J(MP3(oTHI:o$!uNqlHKGa(HeAkhoJ?M1Bm"9]$r_&.DWi&ktZ?!
-%+HZ47+lELTmjuWo#W++Pf&Gb0BI29plD3]>L-_[2WN73b#2K-AW$0^988`_>GWgTDK$#Cq"8r>SG5=.lOq^&s&_Mh9I(C1$Q<KHF
-%di+#di'9,Fh'GOj2af7N7LP_<;Lsj6D1N*5qj=Z%Y_uXq-Qp9,3`f.CqN.A-SI1"LdotROfsuYd,A\881Fp,!'TBH*@E;*5XMc0;
-%'^&*U-5a\*D==R1$3D.8?dQu1hS:i!!53*.ft\A8,[]jG2E)YWdaC5DKlO:0;5Yt=-mJp95&bbBARtI+P<_S\PF!Q("9X`PSh<HP
-%K.+i9l^!D@+DZpbFH\g8Ui;5cCpG!o5KRA=]P]@;01,_0qjd]kL)^>S-l"2,\q6(lGp=\YZ\Z#b*B>-CUB;45JgftB`^Ye94Y>PH
-%BLo,h7QAi)Z5E8?LFc)Alq2h+b-EI(^#\,jAl=qhVX@=l.AkE"Vl\[0gkZY;fP.f[bos9&MA?D]<?gIe&<[N*20i_&a?qdH]=JZ/
-%c>^S&nn5?I-h)@)Y$O0":,$Dfn&>HB\nY\f0Ub\8:bKC6>+T`3#INdT+:kX%ONA]IHDoZ;V@0:%Q3F,iE38[t[$BB@pCa/3/&J&p
-%>b:"Mh$&lD`(eAGCS@lgHD<4>CYu/A(jG(,s3)/4c1JkJKE36Q9k7&`T^r]s,j5:J&@KW!B!R*"A<KU8lSZ1`j<J)V;?aJg/d.9!
-%A5Sj4Ci[>D=V8`C";j-W@Z#[lAN%,#B/1TA8L;Lh\!^8#LhT.]EZgcF^tM@YdGQD0<g%KepPXSA@(ML=R3DA1.!;XRmHuY4dpWKM
-%4X`T-(=CO@@DNQ+Q0>*RT00-_H3IGsV+=idT^adc>HGW.40D3;Sd,LT,)@QPVA2WJi^1k?\ehoiAI%*(<`[@,25$iS,"<$M;PAHg
-%PffhcTTnIaOfH(qol3\f9HY9CaqDnR^hmLIP;,O&;"',[>+sK#,#G"Vf*Vr%l@K5<orL[#>-8n6M[[7n*)2hYhDi%,,>dM4Vgu].
-%<f!W1Y+H]4>*3"]E]bV(X%!G$AuK^^p7;s!eM#3F[iK$\VTDqa[9G!YcZcTaJN0cr$"t`[as!Ha=1Q<ufr)V:(^C\hc@p:RH5rKN
-%ID2V4;O7n@<Oi<=&hRKC]LF!6E?Ie"YH'N4'3_RRF)!'ml9n3fXDh03jUmp3LreE%KLgCJ!p?dYFA]OfZ)3F!=#.P]jsWlf-LLkt
-%l,H<qeqi[aliuZS(Cc#ucu0,=L(9Y-m-rK88Yj2a$]1<O!SAB[b#$d(&ir"!0^'cEaRoZFY,k)!0\O>W"a'CYa`O>ld]_Li)_'hp
-%D;_OK`YTKfG%jQ0fJ,j<nS-m>L._>:G$T0Rgi"t/U]WFb1=bU_[9-dk!JPJqLMS4thgg%$f+)Q=%EI=.!skS4>&t!2G"SklV?-a+
-%qEr?8#"2ICD/U@R/RrtQ;KgEI&SXp<`c"+K!JLTu0MrH,#n,tnm6jb4DSet@/JC0BcDpmIh7^`%7aJ5A29WVug4ninFbG^nmPgp'
-%PVkf(J@<#6@[*dr)X_5-^i"%JFfT!.D4%o!%8TM73HgeR?p;m,[3])=\J)n2O>1T.NB>\[.qNLY=GlHL[&pFjH*/%c56H'@n8I4e
-%Q,8[46=1iI[j8d\%0Z(N)[WZ@C_cY\$kd4XbA9#RjN(n2G5=.E!'(*+o*N#<,)>S9<:?*DM4G-q*N4pVnl`"mLC&Xt;3Sspo6$0s
-%)i/8DHMml0-?pa99>`0"F84WH#U_`;0Xi@:2QW[-:+Y&ZA6&rV$V-:kVPdjS4EniId$:+IS'o$fMM$?\=>GLt#MX;'D2\C2g21s=
-%WoE,J@#;n2m9#;a;tA+,o\<C;:&(Zb_K3i6P-E:7cseG`jJ/5i3=*RF3fq'TW[BA;ZA]+,:8sVbBmqp>$haEpWng%$.jp*aAk@O_
-%+pSWu'[^Wo5F=t6bZ^$\6N*X$,l9q!^e3tfC`!o:;p!dgs$DVd)>T;_g^7HG9]$op)Z]1ro#R0_Ye_81T3NXYccriSjQ$<gRL,8u
-%Ai0DfYakT0P/AE3-,s4kSC()!RhRu0jmq1-XJLCu:rB(d3b&Ch;Vb`]b*)rV7s;*f]JbCD-t2Fb@cS8O*BC"$q?=YrYq[P/o]UBL
-%;Ge[T:3Ho4S>HJsih[:02#KhF-qAOaS0#%EB3Ofg&L'Lk8K`pgC<Z-7R']\$8iE>]1a.D5"9OI;&;tHu53WP:iJ^c/FA<kXSPm(;
-%ie/\cJW`Ak9l`Z!@thpEVg/@=B!"@e*cb=q6md@O)+LJHK>fsZ8S.gtI<"no_,)?-6CoOkUCq!C:"/l+OfRUh6%Z.K6K(Tc-*17h
-%V9=50g&m7\'A/47icnjJ4'\pdhoi_]HnuX^1!b]D;:gUV43kbGgG-qAi.cNU4r6dW$CJ1ul*9RtD0H::BkqJ6j:B>Xb$."0nHDo_
-%oYt/Aq_HKmWRPfV1*<l,-!I]d+q;B#Al!WU=L<^`CH3=h_J)dK&(GAh2+b7p!Y#$,l;hZ#iMD/2,uI4HX&%:^'_!<Cn8o\M5'm17
-%6D\fe*Z0.WFE#W""k&OW*k3i$=Ja*.minS7n.$7OH'qGB)AWC%ZSb%srCBWc3>/FR3ES2'$=_.AZs#AF=uR92AjEq4U)[=b[i%>'
-%K#t]!D1MP\4!-aAfiL!D,hcg@6c.6V;$J/N:F`]nHA90Rg@gdUFfGhJHSWM_Qk/:5j#-+Q-Fa.LN^=r&bIs/`.trqRhrG)7ejVT#
-%`D@8*<-r0He-tRUQmP>m7>;%,IaSYeq>qNMf"H@>BJ=%93i'WKN)saRg!rsn.D[H;pp<sn5X_6iI1Qu<q/s63^Qk!c%iS$q)1XP'
-%NZQRG%FAuPb]ZHHU.-q*T-[4f)'T/2Sq't!#tio5C]#Uj>[S/<MO#"kHBhQXK$5ZHNEsurE,`[\#hPco\ca<S-J(Qn2>)WGCA<h)
-%1m@YZHc0jY\?`\u7Kji1Yj:7KO7m[2"tiR&RcHF?A)rstirl,+>^%NRMTe:Gas\aemZeTp&Uj#MM//GmYL?.BKt4D&h,KoR!^bVT
-%__4>&1(H@\FWH51>ll!k*$TcffR`UIo*V7[Ph-94!q*3R&Au]mj+=M9V[EaTSTUh[>a!!%#Xr%b6k:,_8dgra9_F,ONogUGCq8!.
-%a//n<*IMY<q\lEmJ9p[O'aot!EpkkriC*AXE@HlBOcWOT,aH)r:+1`)ZBBnK=P8G_VnkrL99]I6V2Ncg$]6C-f/rn6)Din-=]pmY
-%!\m>VkRBCN[X+8P^,<i*UBD:T<m;[?'S+><2C6^3"kZf;[5PHZfd:"0Z?5&tO?M?tFdHN*[2+o90\[>/L'!e]g/S^S-&=[6i\8Y'
-%T[%T/10i:kA-@#fL*rD?i0>S?LCt=ME6)_i!?GOQN*#k$267KNC=@ch!6DE=/"UX1lN%*2D<,aVN:\0E1@90*JJ+,^8"-p/@-9gZ
-%fP#O6K`sd"9#\$M[?D7VK2ZqWT]=`L<NZ^<"U5Wc[`W$40aEpVh7Ho<g$b"S8<:pSd`>-r?"j]6DG&E`K,FkAlf!A_<ZGskp%tUX
-%Q(fk.-"Sj[J]r`Lj)1e3"GCfgjM3^bc3AmUJOdeX:K/`?##OSoNGCdJ6D?lSUQOh<V+VO/j;bJekq\eQ.bA]m*Mn;8#,bg%+Q@**
-%CF,*T?7ELX@:lG#J4T#nO,u83RRUum^p)=Udp=4Wdt+Cuc=>=he&J<8ccj+kTHD1^&(I-Mn>)]&OKL2m87ZBB8=lD`028r5)c^?\
-%-Ye:?ZSG`D6*;ZGZ/ZMni_]M-h`UD_48AD]$Lkhaeo30?@gb9=rfUdLl%9J/8AO:!4Hle.krhs^"d<>h.XTT5o@Cp9]*-hnK.@KW
-%+5+SoKZQ'F<7,@L#*<D29;7qq_MJ'>'`nJ/I>p9f2]<?O7Y.5',uq@KTjX,Wfr]UEG8Oho%hsNIN>%Y[G_K,#QV=;8j=8UHoGZ0+
-%<kC4@943F'[VgcE(V*;HA`OYGPHMF2KA:VMSia2_8.Dm-B!8hfHic$uh7Tpc<kSX#*#p/6&d2C("Q/:7;btfGQLoONi+NZmJGhr-
-%*eV<`e1FWhJVImSdfWkI'1D9=_,^_6Zg=hQK8A=s=WQ-e_b>83E"(U%2dgo8:>cj_0aC)B,F\nYI$O$3Bf0Yk/@^k3Ztd:uNfIUD
-%B@RCjJ@3f(.`83"m\KMag<dE;:#e[BC-*:UfpXbT<IhA`%01fN98WXFIR6n0>,fK&T#N5_X^$2&l-<jm=`T&F2U7aJ,9Yi?X0<Q%
-%KRU3%RGq_V4NekAOSl);W2>N-#j`>$E=UnflH\X1P3;tc7fGTF6/;krL,0ZSOt_%9!7Csr#'Og?$5]`,!RK:Y;f=fr!=:A64OeMM
-%3LY,r<&],2TGu6pBmE)PNtN0a16(OAOOTm&[F?m^DI$iOa_)mB9>+W,VIn^/'Za*A!3#$]!"u.3s4O-EOfF_rmOSmXFpt%lLf[3M
-%Hckd_hp>oHFOXrurYOCo3LVDLmGOdkA"Qsh2$f<&p!bc!@8B,2K^uF'5$ccZ^h7q<<IUF$r0P9pQ6L)#@)@Io][J?14OIreI,I#^
-%:i)k\fU1f3n53(9M]pQ%XBe]ml_SL^M<Gf0l:gNS[MY:[H(c0Hp67A?>YncXN=1p,=K=mf?/*TU)VW!uhoKLDGQnf3K?^L\-lT6g
-%P:9L--ptVLmmIs`meX)GBrt&aL:Jn9)$s>J;tMnL-;1(%HP/<_>nSSg?%]PJOo^AZP`qEr<b/!@bB[i%.NKZI4P1-J.>=*+S6XF?
-%,r8BQP]Fsq#+iM"@+C66Q!gN$2:)rG!O5"CHD$@LR/p(kOtp05IU7P!TJirN[c?G"C\^72"ltW\5h&Q5MBHr.?<\j]/^`"FG64<B
-%ApD[FQZb,rAHl@Z;J*O?35o#@b+'LA9!-PHhn#+f!c+_JmG+AdU'q?9RnOu8#AUI+9"KN<%J*.P;I7&4Z/q_lTMVX?1KH/7+Yo60
-%DjCm34OajPB[OqSTuMX1-$e<tnFD%)01icVDQJ:sgsfN_,dWS;<:i_CC^#8tLt(,$O\V'nH6OgRQ5uA"!NWjcP"[X:ASRf%26D*k
-%&@>'""rNMi2+$e&igVRj$72N,d%i%k!#)-0WBDF%hIfY#[H<XB"o+"f['NFS0H;M9OUjd@[4H"^6o,s@eC)Qq),<`.!NQ\Y4O!8b
-%pkgHL6-97*I-B[bi;fu_LU$k*SC\6S1CaPQXJBO;LpLuJ`sC76d(&?Q,&!;cQ@_u@8kqlu+2th`QfN+KPIE+8Kk,i)?O<am/ESBq
-%l)miXj6F^#e*?KT)OWr,^QEqIB3Fp"DZc+0p56"JZ'/CC_fW1!i.qQ'>m",?Q7R`?Yc)5bR*4cORA3A2&cbWM%9PkVD?^]tB.MK_
-%jW.W1qA<OV(iuc-67O]thF`;WbQg^Ufq-49UU*@\S",qOco#+e\m5<9":r9Bgg`CmFojp^)&3br!1lt#=i34!kT!:SUO$(#[.p#N
-%Ym!`+->4$8B66R_^L]mU.VY[ZLhg+!,(T*:$S,Fteu&NmSL1W%r?f-=)u;/-S\Q?7P/i$67KTbd(>,p:)P_Dh'OE>$/YUeGH@lDM
-%:pF",T-jDO,Y_qoP;g'b3NYFW-IoQV<o$:n97^W8Od8`0#n6BAQ0d:$&0>R]1rHV]-g5k)[9KFp3Y9'a^P>EqV'Jj@>W@#2@Yl>b
-%I0pp*WA#7EF?^E5+<3rIpL[u-<3XN"!_0TmW[0)W"43M)62P)V/I4@m`8[M@8JXe"F%@`p:WjX!UeLgt!V.k<_%8-&\k.:OoSS_;
-%b8-no`/Q3TVU&9LXb#1,r5*W7Ru_m>?/c*NUd^`V/FaD\[!:L6M%WE49.=tQmoe5"mU%R^Ls5LoaiKd[2Sl(S7ARBM$n7Y3""91Q
-%:IU/d7\EHc]S&[IRW(kjiE-S?\:\-$g;$5abnq'sP.\B`,k#pZ"_ud$J63#ir*:b$c)jCDoZ`D_08V26Rc'sfefV?[7!4tepIq+s
-%J8P\c<scM@0cWSeRO7lVTT"^G3QW\$+alCcI86GQ"-r98'p*`Ia?RnuE7:pG"7udl2I'c+XH5.R0Z?GGH.+NA.i%l>\kI,doW0^o
-%Uo;$3S-4H6Ph9mg6%B%Cq>3Lj\XW_?\U]s.LF<,$;+atlRKFAI6^@f'$u/&)S[>2i%*LhD#Hud6dM\\]852V&`mh35[O9oFBsa>[
-%"^VZDWk0u>>&[?.S;ua=SL,7")VQ34^Bsg^QfM5!ejgpg!hg-N2,M/-9,>bQ+G]YC/0L>_ZLXa[_9u*CW05DuW6"OP^mo(bakA5a
-%-CCbd`Ln]bJ-!_JCH9Wbi.stA$L;8dBckOC=SE<*2b<Ro:bj*0^&a"r&8D8A7M88;\i9BjI2%kk<<I2h,bL_OP%+XkKPh<t-<N)F
-%?(aJZ]UVeEOXt.nm*8A?,QIrbSAg-aM?ttar:Cs`X4@d7!jkMjD+uup;Xer4@p@f?UfR`E\&^)E:qM(s==M,6*hW]=Z8K``#D+Z.
-%&ZZs@!`?+'*$$tK7kAO0XU68]B*/n.(,^`g(hbPKnc`tPO&8qK-7#g!Rh8eiKbd)pHXOf_\lacS[C&g:-J>-d'e?BTAa?7Ond)h#
-%+u-F?@h270$m&q:\ES4QaoE[.1.\2^-Ksb2D@30g5_T6PUjNDi[F=ptJZ^"CLX1;4jF.?fcP%:U&hA%"nu'ro".?6FIO5%bopXA<
-%$"X+.FIrQ>c.5uHj2'>a"cIs`.$`p\o4gB0pe7J.AVeG2"W^s=&*L7^+Y"f,&nFrkXqD)D)%[Jk-i5g`r<-XX:q0]OHa4-`"Js\f
-%P\F,UK8&-`P$8k73^1&>Jq\D-_E&^u-m2Hb9QcA1eV=^5;nC](gIFE7<;S"F&S?:@.O5p98=4,^$Api;=mME5+I!f\`6^OSZs0t5
-%>?g7B!qogkJ2'l?!02eBLc/H(*Ujt'!C#ek_<rSJ:"b-Z9rNTCA84cQihFS&&s$Y(PC?m#YY3:[kc[*0WOA@>6FHfke=_2R5[Cdb
-%[&.,mRYqlq6>X)'1f7^L^h0@nAWd33^bsd.![k2[c8g"2g+rA[(dKm`<r(9M'V3b:b\iQ^#i?"ij05UuM/*=uG"cipSi2S>(+r:]
-%1n%&5VP'(&?6nV^[o+!=S7_@K-VnIil6$FS[0*fhC=I^!KgKC"oC,!.nR3@BoK=ihPSnEtc6NfW;U*_U)1)CA512\b@i*f_hdhEd
-%HG+n0a5GcNPIn6<Hgms`-E'>T!`&enM$5dLc)S4X*&Y<iJ?'j%SKTk]80K31F;#DUJdij'5_`d'YYq'#eRc+q([@hpM11X@Ct+?g
-%f!6:,r)ZK5a]d(T=.k)_4b[VNA-%#FV''B&\<6"(F4Ubd@j=,daTi"TmD9k^=b,1HB")\X(cdBTA>U&[pRiSYLGBf(16Y&i6t(l3
-%UdQ#]8uOuUN0mumUJdoj-FS,&MNZFd).k$h.BH5q1Q-]X3:)/$+>o%;!m*f`_^*[b4+j-gakg`%/@=:cSS#`RX=7ufMqA+aO8Fnp
-%,U+nNVP'H14J&eT-ceEWU/&!%.4:N@=3g;ra9$KUEpoJDP@XRQ9[TapQL&P-1'8tXl>.$K!&=S&%TH'OAg`X1pq.79KQi6E@G)8)
-%V,`XA5jdR@8*m\nN*_W+C1(b";"q>q8JQNC5S9.)]11_=-o3,BQR8>JJ=L0%i-KsQ6c8Hr!NGc+khk)!QkD(\6,CW!5_BEScIRP1
-%LYf#NP:S)<&ICLuYmR^"PG):+'7H.7*,RS/b/bS[E<F4[P4G&]Ane\kekdci"(Y`;q>a_+k_Kl8*U`JdON@!B>%AbJ^g>bOrGkK8
-%?44(?'F(1F-;5i^VsU'JNfA@.\ZM9=SP'iK/\dA')QcM[["sH5h?le/K^9>5M*."DO0V(b`=#[P4rAGb<,ijS.3MABn0dJo!i)Tn
-%=Qt+"AgJp<ehWcKGR&1t[+_KGdak2GP"8sa@mVZOBr+Y"mf>0L5^?#7e%BD),leep@]/#`j/>:XYMYP1E\#(.W(F&[E)[om?(ht?
-%mUn#.CG,[VGJIGV!BpsW/GOqQl\hNP%>,'s.1-M1#lG0LVcKV;#iH.3cE;&K;EYo1o%L!QeMuJKXj]k%P_P6B_-Q31/qsPJdYDLr
-%7VnSd/K7gg[*]e/CE$"'1t:n8Y3k<2%@dJ!\E^i&Qdk&5Z<)jpcr^Bi1F_]`!ITZ%JRV`c)Bi81VJ1r.@sJO?&9C--n1o"F[*o&Y
-%;p',J6c7re%1V,,G0*DiJqcC%61_23^i^rJ?F5r2"".UdY;WWR>5(:S[M4:0Q0"D(.61cbQnI\6"E]clF=J'6!%b#p3OFDFj0WIN
-%7<5VH'hSX1YhlahBpHi>""]mWVRK620F&ahP#K(4K"miO1_F*tO]T[_d@(E*!fh\ONnF:XaE_K?qIUK\5jQiI;_G.Q5l1h9BV!E>
-%-L[T4O9?=[D-*H'^r+<6#381D[:,`DP7!ufi+75O^inGR3Vm]`.=eBRX8tCFl8)P3!Oaqj]ctEU8cJ,,G;!VHE!@NVJ*7DeeGiFF
-%\trAI,NG:che$8NbeaI9:bJ+$0GmV``MD*tL]_kjc?K(0*KL[#!:5tG\'puBcSp>6_>b&o=<ID;m_df2o=KMKk4D`)Fn]L[J,ABG
-%2lE_BGH^.a(Vfr'5J12"p:'5Rk!/KDhjiT:rG_`pIX9Ims6:%Xrp01=^O::p2^b6DgT1"bH2IC8H/Ua]L-tuYIbi=W?>Ag'nb$i#
-%pjGBI-Qi9Rr8HJ4Im&:.G/&(IK\!Kip%1KJY9uQLI_U'^11g#P5/$@Ditmm7:Hnc5p"c\;5NiNJ5.\:MCDT(Ia?GR3fY9&j\9kQr
-%h-RejrE6kjH%,L*rhDWM4*uC=ci81&qNZe.^HI)HEBO06TD,h`cJQD8r]%g5q<HqhS,VC6q;L_R*?W!Z?bLpcLG(hrcWBGQG@,fF
-%oC:AKp@>ik*HUed>]4PIrjuN%4FDPViSFFjmCV7]s#U2J&+dF-kPh[NGNZ$a/[%?#]NtO3ToT_+><hd7S,An%OT#0j=*>H?I]`dE
-%>hbTd3pSJSDZ,3J?t^VXS)8_jmei^Vl[OBST/r#48EUfgr9isi_cb"TjiF'9g],e'q"1`VmH*s4mIu+;\bPNHnaTdDjOK_1rS8RX
-%LZAAN&?Zl=^[8Uhp&4^\rPPQ)rS`b72g>1NV0cchK"#"]T=#eRRldeK^408JofJ#n5J11sq;:k'J(&*$Ytk<PY;VBZ^Rnm#rS`0S
-%G4g?h&bu4QqnMjtS(#-EQWJ*c<DoH-^AjWa.n9Pce,SP,R=Us^5Hhg^a^7-Qlo==!V7Rf+7_[Fmq/>:&>=(LpDe8`OhS'99f@09e
-%p#5<85->Gi4j/02,-eP^N8Sd*DCW4a9("7,Ib('f'[JPXcVefHSFi/?<Gu5=m4?kJdtUgTD_J$er*o\T%)i/1iSjCed)3mW+$N23
-%>!I"B>\(ui]8_!">31f?KX<.45G,KG1nA46nHC/uMuHX>%3aK`kj4&kD.>]9ibLQ0P4VH$:?UBBkiq33T4Q`Hj_EFTI3h$nDmLKY
-%(@4%?r=*pLd9!mCCH[-lqO;bRql1tPWD<qTXP\)j1acV=S2bFNbN62Hpj/6KXb6;SmNbA?f&Md*Yd]0.SVEK+2(h!]jM'YWo:5GR
-%J"j9kd^u/Bog-KNFKChVZ@UB5o^FN@:uhf6?RAXZbhF,3UoEc\Ds^fbBe-bl*EenM?K7=!\7lD^SsJL$F<qA]er&sUbqX5(:S7RW
-%jlFVH)bWD-(9Pg;1XF/ffaZQ3H.CR4.ue`#>J$L)P&kKK<kX6GNT#rqeWTULVk,pP7T1h4g<$?a.L*(:d+YMQr\C;CQ/57s-Pm/Z
-%(,snZi.R(QTkc?rC_^5G#4WNLc)n_*\t5F7h4M/4E.^?7o5g[1]h-i<Y:[tAfs.N8NB0Pfo1]oG[\\sXEm<H]6lp7[Z_bPq90(_5
-%B2+5b;(X;9387Eob9XBJ$?sE$[O6!'<GO9Fm6q*jUV:c;qIYd97nZdQCqbO7pksn#fHtpF>@IKR'"8nBa#6LXCJ.GV2b%k`ajaL/
-%dob\m4AD7GD/r@ODK?]uU+)RJ4>+tX1W7DYBAu>*C86O9*2hmnNsfVs*+LWTj`)3e7BEq1e*s+K^]3la5&)&_+'s"c4a5G2@=;fJ
-%Bm=JZ#:.q^C38*bo&lT]:0S-0gG"SkelhY2Jde`ho_aei710Fd:mhaCRH.iH2QQDgc4$Rt93nRM?hsTmQ/6*u;:23sd8a+InlX5L
-%o;XZb]*eWsKhhb"*<I_E&V1rWma#\?4US-%#cN%]:mt(]'uaQf`o_>^&LolEQjAN7ADO1WcbsiBDcr7B#(rBe$Wo><:Y7S"X_n%Y
-%&mK9!91nM3C7n2LQqk(*Mq0b,_PkW/Zt8^,9i0CQ?4W2Fe@gN]eqf7o_%#XPjU3;IPFF2i8Uo)g\g[q3G0d\+:kj3)O^0`q-9=$r
-%66ID]S%dJEjDT-KI&6e;%E)4XM;68[rH'c`_m=KR/f'0_7S^/o*HqGP[S6BQlIM^5(mg<?DDXctY#HfAT0(LQKJI_^L,+Eo$eA+:
-%7=k,6`u#kp8C<)2[S+&+I2I9l@E>=QLG<h*kfbH[5UD$pMHE/!*n)mtY!FRJFqei6Pt1)`.Skl0Ck$O*Um]p#8FAG?4=Yrd=D$9G
-%KmggClIpBZZ_=@RVF*iBKST23Z!>5e+YC^lIOVt<>;Zr4+YKb'#ajW<D3jio')F,G5-[cG%ZnF;.:.e0)1hmGaA+<I&)kgkA&n/+
-%,BWCBB8Gp.nJ1YoaYJ2QP=:OXBY0ds.#`2OWQ+9ka-a_T<3*!+7[K6$7QJCpD]_/+h+niP]&FN!1=UEeBg"$Pg;DS*=_!&/Q.^cC
-%:AN6r\pY>rSta?'Cj+eT3d47conO[a:5e5$V)CKZq-$q`j/7Um>]$HJhUI'LMdp%+);C0hAlKmAHoPpCD.p8>RX(;i6QOukG<E#9
-%f(6jAf0dJb`H,I0*m6WYZ@g`5O1%SR9'UZuMZi#-G\m8BDLde"S&X>QO_@YGR6`>fb)F5GMo/X-iUQI:PIH^>p@)SUJ*Q*;^%onD
-%0j!b_]UNi_`0H'A_Lg>J*.Id[gFa(I^GXoqgk'ItU[Hp3BgF(8$Kp)NokZk,*0r448L?O*\A!-gl"iSt*;&h"D6A$nj+*]iQ%QFf
-%mAH;'mWG@,TA3f^?b8TuTDeOE9Uk*`K.KoIWor!^HFBGP%]\]1>N&c0*ZA#Dlt_A2)#CKXp,Gb_p\<2ol)S_tHM?^LLa1"Hr[cu\
-%YBu*GrM4\eVa/^,N%k2V[.K^3dU,=6^MIRT2T^%)Hd.HD>kQr;s%'0Rfk9DL<%;%\l1OQ>%L3:l.2?\@8]H9!b#r>V6kndmO2JpF
-%@76@6YhC.Y[uth>J&W]Ee&>/(OsK1S.NUB8VG9&"i=uNS0O]`K<g_b,ToJU$YnEcKlV`8C=t*d"UO@e;/GW%[,[]=AIDiiIoVGd-
-%>o6bO%R[3(=%O;f<jRX1)A]5rP.2kB8W)=9AhTIJ)2?,iAO5KTdPuej.DtZbakfK)qC*M]&B@j-16RA!Rk$6Jr%4f'm;5$N_Qr9A
-%XI!m'eBefKMTcAR^gX)8iCI?@@,Q"%%#d?)9FTa]\Kl=-OeLE/dkEs>MD06E'[j)_iL,Yrn0bbd"1U`;,!9Y/*@'R`SQPdqrJ:>k
-%Gd[_elm#6h$_7K#f?Su'`GfL<[/`<1RU+IM6>TmhJI7_%H<H<$Rk5$U\,:QborKU6^*F(.*^Lqrdebc)NDYYt&X$YNG\C+jJOL"7
-%0q%`dQbce(4jrs^K][Cjj#I$u'k_IVA.B0Oc-%7"PHA`+a!Yb:;^!*?n5Sn4)lSg.M2-U3<6Z/rc9<#'71BNRj_1N8(iJ9nTmsZL
-%?(OJjEV\ZFiH?SX,+95U"`o@s1$njR+5lYPVDUbj/.,WbSsn;aDqY+2GK/ASMg;pSii$=[0,mgKb0^DR*PpNQps4E%NV8X')d>"U
-%;.-G,W4%`ETI)"Gqb)2._f$Z>QZ*#Z@!/OjA<NKk32SEj&6P=:UQEi^Am=6b7>W.!ib?G2Y3$Ie>cQrRqa8f"NQo*=q\+\ee2p-U
-%fGD`X_J`rP#m"]NgT^jtAQ/*&,<RL@V*!hm7f5pa]7u3n9/P)jnrT\3g3>h%CRoh2<us<FB(MpU#\8C6\KF@`c9ee)E?6ger3s]M
-%OiE!g).jUnR!sA&jMlcoKIhB[`Y]r#H2DQn-(N'6&rsa"nuKi5NfaUU#VLB-i_bNBHq<n/4O0Q@;sBE3Os>q^Z(`e_iK,NDgRg0I
-%r\tZKE>^YY]70t:F0KBL_m\`r0@Q.=JNBnkb=mjS!'Y()Pr1W4b/GHC)nf('as5?NQ>#;[`u':i:#6ZS1nle;Dkq<o`u]MR,(`Ir
-%7p([0N6U9&`?go^:;YjQ:<)ghO2]tM\fqA8>5BP-r8Y(IA'MAn@3s>Ed>`,.URt\\^>nO7:VZg4AF\pEdDRcZ0q[;c*rC#qZLrM<
-%/(_seWl<F.``lspNd&]Wb2OT+;;J#`#Vi#(=dDE),HM25"O%j5nN8@hFTemnMtZ6[VY,^VN.bn7IY^d@r+)n%J00c:Z(<\@0Nq-V
-%%0O]s,hW+?5&rN#fgfb()6ituS\%#FcPjB-H3,<WkBoE$VdO"D>9lG5pNXW\Z,9mYPE5^I?r19eA2`3-f[H"O/Dj'-V2W/6Sn2hW
-%d7`/tla5*XZ/O[R+0>0TA-X"CF^uZKZ;C]?#u9Yq@EeD#GFDWKAqqS<iWs7fNPNK=Ro&f-g[;@aURd'sA+*/;b+=X#,&^?W$(DW%
-%O9IA!+uX6UEuMY,U[:Uo9kis#2L$)oc,4EUduGP$-Z\S$C^-We^3ZB:7Z*oM*J&@$bE.n[d2Kft-I9^N6"1kX"s%8*Bc9!",k7Z!
-%bX6X?nT#o7Pt_Q+p+@^Hotq7_))eQh!ei4pIaZ3CFOQVdN7;8_9huChC1@ETF)c'GmA68jb'BKpVZah5,6ZnYWU+It'oTB&+&E[1
-%GSomD5VnCQl=(gsLY6n.j;Gd_cW0a%;@W=8"/7hL8"gHJB>GRL&89=q)?T2+18a21ACtmJaEDAVd[e[LXBBhb>M@'9fs5&1'*/8g
-%UF;F<n,.86X"jQN/%[#j8gO>ega!r$[m]<IE@e%i//:p!hCPs;:$7mO.CNP7%mbRt$rsc?V"A[[[-;S]9,r(Zr>,_Rrd_3KD)E1q
-%U0JqRlFm[IktlhTKZ7nZg+i-A:QK!2_8!tCFI1UG5ECKTK"Lqe)tA^p7P]!/:9M;$j^F/<>BpWcC8$$5@nHB+*9Q6^%jODC*^c<`
-%Y05@m+1iGLaaSXuY3Dq*+P:oIrVQL@iiN"DEKjMr[kX#/0bn,SkptB6!jLQgNd?)[)!i<+dpG7uX4>7'dulhRZ[X!2q"[e*BD("d
-%.$",X=0MMu^[(pjpMXEbDuSKUr2GM7Z_)a7'RqUTq>?]]n&7BeduXMAn,,hko7+u/BD[aF47AaUgrZr_UK/^G-+A6H,_=5ckWm(_
-%R#`2ghJ=T4m@S!U/MFKiHt`6*m".&XU4/jH*IRB$0\HcNNP_*'G"[6b;oI<6qY;u7$[m8QXGGWq!c@^O3XHnl#5%Suo:KnuUh<G,
-%i$-G$9h^:R^2\rRM!-LC&ZeGpX./pM+.]#Z$59:GJ,Bo5Ti>G7M:pW.r_%f5+?P"I3D$+1&Mbd<\u>)@7g,dCgP=hVE7)O8n&EsI
-%.EB%U4sOC!X[8ckMpK%^i\=J$QRqW-_?`s-!$9<A>4mIF*>N.uoclE>>HC:ERMp2*;/f$%f9QSo)/"HKGjo>#U:]4\j.#)01#bDB
-%>Q-/hD\[0+/AYf3Q_;;RjE#I=Ef5Y;NcIlDHn9M_s#_YEH>GKE3%.fD;ks:S**:u$a-"ZQdWp4Ok97L6e)I*h)/gR_7?FJT$"cUJ
-%L9QYO0nYr\1HrbikDYc</-`2#/c?J1r69CW_=H22fRN6CmuCjVX=n>O1q,+h31&9>j%@:\c8Ot,?;OBqpfY+k7WHL[YqjJ_?<Bdl
-%*PsrSXI(_Q<+ikZXJ]mo"k=(cI#bBaS'RLYdnsU7QM]/+EuiHZ/G*Gfj]?!`%@!G([4CAnNDgG0j_l,F%<!-%XA+8$OiQUi#a8DS
-%<X^uk!b)kA:gIZ*"3ohd])V;IMpPqtZc+n[6CHme!BQgqEt=^F2KGD/qR++4YaR/$U9(_69NjJ@+r!\8b2lcU](!hf_?g?9=DP+\
-%r"b\^G'X@aGk2O$7;,ec8fDn]io.DHC#!?rCi-J>=t,4o=%:m+;$@_qV1&Q>XcA$#0oKR$o,Uk)I2$=VgK^KOnY:=[=pg.;$h]@;
-%)&iWo8:*Hrc=io'Z,fQpK:7]q>\1Y8W#W/'%uW@\F2Ebi*,uGI^XRmt[_T">I\`6R<XQdT!A!@Cj6r)+p6MqI[mF2K'R:)giIbsS
-%BLq$(W?MaOn7FK&6DbfCaLsq5OJV?A1^])qpqi$gL*\I@ks9e))12*cn$FaMik/RR;'A:TR\q:N30pGl[@8T+!pH./@UZPQa9+<C
-%M]>aQd\t&hIF0S_qI0Sl#aW/s1iDl-]b,N.+TVCs!Qe:PgS1s(U-=%3khCo+Ul2>6/L$7eWB_;X@e"g[]1:$NV33E*_%Maf3lHKg
-%+-CprC(pu%*K,m':`O0kUA0P5FJRbAi?EG1!%*Zg;*L^D]L<EFC:0/!eV\?`eN0aS`6G&DT>s/Goa)`2QB5/kE2DY^.IRl=.":6n
-%&ECksedj*jHUKJb)G*qLY!`5c13/Qhj"6b^iR;uK)4@@7M1qb1`Vk6Kh@dQ-30uO)r0/7[`7*AjDR:C:r0RO.7)`A'/Si^n1lr#>
-%$[Au]S`LEDX>=:67XQDlgF1Oc"N.:ZM(mP5\_CV49Z*6UjHqM!G9ifV<D3ZW><CWR+(6Yif7')6d5#+i=kGN`V8f<84m5G\>!CU<
-%fK,]gh0Kg5C4RUZ0i,)d/iepAMRnos><`SV(\)PJDPO7BaGD`/TI/ZNrAD41NK<Y/l_FA.*S*kFJrX_:)Mt`<HA($BljhF^j:G-N
-%C-q;B7l]6F!Cq$uW9*-$I_(Ofc\up<Y1F8,2RP>-g:"DkgsWKZ(@nb"*liT2/!"7=ll?_/!mA]K-,ZmpFr:@7`PgmMgq%Ei&HP;e
-%1u%mP.ip9QpgEQ0'*u<VC@%n'[-751`pqF$B(:q0b>E)Br22LQY`\G\c;k&69GV!0r8\#4BhAlCP49DFH88.#:^(H\]K7rFZ"WjK
-%aB4o]+k#eLKm_@2RM=3@2Hl-g>:T9$0O&_e:g59s:g`TEB5p$sD^h7$Q4Uu84*43*'"VcVfC>)\%rFfAMhsnfl?UG&+L[=CR#XHu
-%pccD0hdM>7%hSm(KB"[I,fVBOhM+1^cQeI2_+RNrbFjk[a6<#YkjH?5CY@f/C*XH!a*&^FMsZ70BcC\noJHK:a?i:e>-j6uX`2@W
-%:_,;"7i"9AQ]6&h^-<k.nuODIks\b@lQNZLj$6(EFrK@foPS%bA$&ktN>579;RBW[SJ3RFc15uM@!7(BLp<U;^%7!l\#K^j,TP3i
-%rZ"?NVRl^sf8PJ1`gP&BH9k<V+#Yq7kJ^t+=3aEH7NTu51..tf%&%Hq_'f9;7a/DFD*=-oAYb8T2V%(iU5:[(!u=oX(RiPSj*!pl
-%qkubfT,*oW2Z?s7/(5,#(J&t%H@%a'T)ITr>DE1:dnKZ@61D&_0TN/2bQ):Am8&Ujs+FlGO+H2Z^EpO*Z&TVIUsP'-*gA(!eSd*0
-%YO)rS2Xbh!k3Z<n.p#?(+_I-=8',O'LCF1o.j@,,?R;A9+62NE?39)@.@70MlM4jn/q4X$7l24Uo?mJuCA="_o=IY3\t"hE[]^Z]
-%,@;Js6p('4-0U7'UCC,%j8!,B@nj^77/ME4nGU$!PKp6_YC@RBVsjZbe^iW+F8?XSjQ`@%^AZF9lhcI?<Ia]=GOlof(4^c&`A53s
-%=8Tm>/^!VJ[Z&Q/_o&PDhnOK@a4ob6s1Z60roj6[p!p\Ij6QZ;s6J50rS<7thL9i:^Y,dh@@c;hI<5)YO09Vkg^ei5E:o\^18s6g
-%I%^)aqff5ms4rIN9A3/ps"V5k53gT-<uQtlrHD?A[Jfpjl='![+5Y7H+8t_2n%ZBr3;@@*g>7:'kjRED_NMM,n(XoB:/CfeI.^fU
-%7Z]M?EIQNsXFEVX>V5F$r_n<QbjS6/?<r#072Y\WkIYU"Y@"ujUnECE*o?nqeN,q-H2HRc]0CcE?%6qg:>>NV*j'?^YNM2*H=rF_
-%p&2eKpH%m*ql:8-o(N#P%GIkln#ej%pTF82s-hQ#+8XORO)2W_qeRL=DeE;O-AaMD9Q/g93^PdtH@EVXI'>]$-GKE@O7PFR_qXYB
-%LOEFfq!^GTjjgaj!t)HV'sF7Rk4KSKlc5p<joMWfn#ft<[r?J&LL8lj_.3kD*.IX,gonc%IQ]=RlR0ICp#BuY5(%SIGBQ9Cju;=N
-%hi%YdoAkGZN-kEGj)M7e5(%VJrPK_\Ie3Pi2=Z`o#PuJ\n39)sp`CT=qX<IfhgY=nSQ8C5pKB(jH$FfrNsj:#kF%q^4c`7^O!g?4
-%39G[t?A>59_tuE?s)bJ?eK9j!21G45r9Dgr9>#TK:"O?s)&IZ^IfB%]:N)jFnFlY!j)NhS5J6!.0c2"QTc_=?5(7Z>+!6R>j7rJ'
-%%E9JC++JA.m@?h3SH$e$If'-)li,N!^XGM1Ul4?S0!aiIcbI(kn37]dIsZ>6m'4-OA6+3WIsuI$:QMgN\*lNShcfI+k?[Qj.)hO/
-%(733/Ie4qD`@lNncSKoT8Ik$OSpgI#SDaFFDp3_(`[j:Gl-@:Sr(a`ohm>g9R+2#Fn'0UtH1UYUs8+m$'D^2YFRpX:otR*uO7-D'
-%ki]_4a7I2uroWk'O%D@'D`6'[J+LqLrr2obrq??QrQY<6ICl->l[?=ipZXluLO4O>mdBQ3mV_K"hVHsmhmL)\Y25GUI$a9\?+BKM
-%me6YRme6AJjmC=[okh=3^,b$#gN&d%dqu`,\,Osl]RP5$o(M1gQT$S$?ac<MbPJNWbV.GgpbKMS0AXnOc/$Y3c-)TGS*QPe1YpQM
-%Eg(Fi9tUckrl0A-]"Yqn]=tt-H$sa^IGM'(lZuj>o6%X)fAYFj]6<*"g222iDV?s=`N?QMD,:<la>Z'6:Nt:ToQ%O2Y,=0P^c+NZ
-%18P:T3Bt'#?gm8sI9CLR2/)rremaI.&Mi,+b'gfN\)h23.G"_k0&mZs#u8J!Ms`=WkIZ,2?fmi*S`*bQ\`=0MG_XqsV>GA$DUZdN
-%PHLT^!@J;M1q?9M>34)fa1HR8?cJR[*F#&4\<5O5@fh95b0gRii@`o?Qf08r6['/NRE\#%[k)_FSA4fBrmnjV2uX`(A9eU&_f.%P
-%;8.bPd:kY4-H+_"%3!<6XuP5U,TtAorSi=UO3W7J]:37&>cKg.+gB;m60mu`?[R7mrpi]H4sDENq/;mQ_67cpO(GCuE*:+DYd!S&
-%pNQ5HG/!i`B0ec\:Rs:*=iad0j-@B(Q"R;sQ.PZi94sd%i4nusrk[42O1fYTQ[eRKqibC`7q_a\rH&!+0:hV<^\di1H`]8a)#)4f
-%roZA<D9Tc"QJ26bP!02JVrC7akbj?5Dba)]d8P&W<$5I7P(]!TU`ksT@VH)p7$@p)\be`Z+efNG6VJZ%&6/ud`"`>H,0PWT@LL#+
-%kX'OMQiKL,+iG^:FqSB:`#/V.Rnua)fV/\]?il@<gisjWG'CT:O4VSFP.8)KHsJtNg>cspnu>Jljg/%fo[4V`$.A"?p]I_hj"HtN
-%s+arga$Mld\S,aXc^s[4`asO&?KE]@qUO3i"#!d]3b/'PlhX+Y2a@5g))(GcriF`=&&!))+8kQKlXu#[Sak#?h-^.kVW'9*ci8B*
-%]W?+_?t>p"1JTZ!0h`rN8Y_F-@?+fU@YtX_oVp'LR%TKEkVMi%k89iMCXSdW?`];8k]:HfH^LNdO-74@9)>a6H-,U>P5^<.5GW[P
-%Pk%$gj,reBd,'7X`rAI&re5IG)8@BOImCIB,e:'6IOX%O9UYn[$T[Vc-fT'9g-M>;R*.]1C\D6;%U8a<:Chf!=QJ";:X,"^T\5i3
-%gsB`;.*a4oB.iG^\YV9_\>D6`2s-dmU<6'XX.#N8UFPX_B,,V*LD?0+gHrJ1`td2@k8!_+#BmV]33fuu33pGe`L4]922>3bcFl@H
-%DCpn9E,BT4LO4r34'^S"jEb%1p\)rn]#3&=cE=^iEe9(i4.KVuHOn/@\A#lV]sthp!?Nl_i<16?nAQ!*()tQ'rkTJd\AO(hr9+c#
-%SDm=^n\m4Hm*JPRnMd?n%e;!:o[-6Z@[TEf9g?b"Vp``KQ0ctX`-No>^3#bbS`V<nkpND)1UidbkTQq>FIg274?pF'm^_q*m^%)_
-%(Cp'`Y&a@$e#NGDatG*X0I)=o1!Geh\.#]UQopa&8S:^4Q&-9E+ZAAQCob`[qQu)3gZQ]0q/"MN1``(**Dr?Q\'*DTT5TujgZ6g1
-%q6WStUlH;<AW)ctdZY`]LHFKYT=2c4&bYt,1"$[2dDjO&E],mnMqdFL6<bWuh%DW!:H([gN!C@8+Xu;E;5$WfkV4i7C^.=7HF=R@
-%#WL'g!oR2CT6uM/I3'd4/5l,a4aZUiU!B:2m&rp<5)U;,)):t%1X`T/nYjir`/VL:n:+j!q^8)4?VQN]k-#Cg>OGR3pZbOloECk8
-%q,K+*VWh.cTY/<YdEakr!`-SZ!S73Ys"F@Qfq9,0Y;Fa):]-tPq\6n.U0@65)uJ?U5;SPsp[bFEbM.LiN-0D]RF*CefO#d#qDA$u
-%`V'\X?_9epV1sGMq!6DmX45KL&:],>VgrjdoAd#MpQ?7gs4QqoVu'$.m>Lc*fL*F%kQG)tcOA/bo6$S.r,Stg`ptd4`qmlkFN.\O
-%9L!L9l-FkDN6a]`>b:qS`M0!=^)iX?;pjjqcXP:/`i&j3;<d,5YK!=:6u;W'?@KO4&H,[:iC@5E#@A<D(F/5@/-!]VCJh%N=Hq,+
-%on_*.a/"a*e>LnE.NhTN,r2Jg8!=4hOXRc*8@b)9kTs]46qrugJKVNq"PlT_h+AsK9@8)8r#"BM.M?!M"P@kH*(ugX9!$jl?1hnC
-%6"Yte.e2+9#&basD^?1f,oOA6A:tLt@^A[S2Aml$&u`8PXS2l^e52l^H=Vlh.M:G]MJjc'D^Ck@[21r!eIpP<U:X$N2i7)EM=b#/
-%p3WoV58e+-"FlO8R%t"jbmSeGeSqE0EDdNJF![fG+r)k)Q!?tY]Td0AC\RCD][TZ?g<!5W<GJJS'YKQ;]%,6CQNuWKY]Pq(?!/YY
-%8sM95Zl?!Q>:o>k)4t4b01tnKWPBu`fVB-uU`08Op>33tN[-[pr8%GR6[b1-Z^gQGfED\F7<2h;/.3]GQEaOC``,SL&(tI"H:H9\
-%qMk)1OdW]D(9;an1bPZT_g@ag)&[GR]H84BP(/o%D4%&7R`r*3-JBe&*L!JJ3DT;E@A<Ur.4U+pFq]1i.XI'YSuOk7#G2QO,@XkC
-%r9.g,S?J5AG#jEs?WRi#QR>:Q&0h%-@Qi%HYt)+u\ARd`Fif@4TSr@)f3uUQfZ."D*:^#S4N,P-2+N&TNi-2Gikal+mA2'i^$PD^
-%4sHG+O\rgUouB"cm-f#&Y;>##c$.L]^<Ui(2r?bgq`<3>YdF?fCL:_cf:26#UOA]t?4^-9mFp/M:.Y'=F(>3uqg$A?H0_B462*E.
-%qJVP>+H,ks0)J\K%$Im@jg&fib+MAR\Qnj1;V@Q.0$.\^.[<`ml[iC8\5]>'f9'9%-4r?md6'$S4XSLCD[HmSmnU%[O'HmqY;mg*
-%mDC1#a%%a^bLk]qVQ`5G^:Ne=P2#b-I,m=sCeUS,Abn&1^-"p(HA^j5H9EZY?6;JqXuYKogATM#4OkM2Y;>`s.?N]?FV]qr0!ntM
-%mlIq^]r]KHkHhD+OJV=OjmF'%:_sQ4,*m21`MWS+6C)SQ`?rKL+\T>d@T38P+\T>d@aL.rALudaMbX$5Ke21l#D^bQ2Xlg^d@[d_
-%%=CHL+GW!a#n,r;j,G.kO*sL"(3^9g6KEL)+6p\sGbf2lgZCRR^9&ZkV(NuUF;p8DKkB8/N:0G7Dop0n&)B]"d5UZEEAcjD\1H,s
-%\+*"N$*.r'J'0Uo"*ZoU8+tP!IK084S+j\qn`E(6#B5nZ^ENXH207_P4EFrQ5l_;9$Q-ao_?G''So4o/$J1d9?G[9A'eUp*oR'$9
-%=1IB9HiZUE=1Br1j;SNd(rlF:OD/_S0LL(Tb8h-"$3*]ZFu%@Cp[,aa\eoZIg=(o,Dh%P[msdZE7"9i/I--9>hRmK1,@NNHd#CGm
-%D7fSM2)_Qk+^+tc-:&9<kTuFEJ/-Dl3_]sU83VF_oBFJA55K]si2]`;:X:Ek'Ok^B3GKdO7[,^8aPCUl5ZBp%?(@9+c:eUX!A8D$
-%q(B7I?<sb.f/p\&o6$t_#JK8obRl:)eNDOu)f1_D5=r'&=4+(s"f4@9W0+6cfAPtc?LRQue*DWm+8MB&WucC^WGS>F;Xu4$KlNW\
-%`gQ/;-l:,H-YA7B5M$,[S-Kp:+'`at9RoD5f*;pn&NVU94:)sO+H>JFEQ+cKbRkpl8pM[.7*k=VLC0,ECbA0&Z(0ZpH;_`;pdn8U
-%S3K&S'i1<hYed^F]q1pY9]J&p,Dg+tSHZk/Tt!i(BnY5mc%<c'n[0Pg+C5''!;OBW$nVC.0p\Gn05O/t,*Y,TrW!q4@,bG/prn;Z
-%!dFlgM[pZEr!@YgL;Y@siQ0)%J:!B2fo[3T%fn:LI,kB!\:6h_6MpsG9#>Q4_L/1gR.W`46Mq!H%.KWU@h?%+,ZbSg%Ib=r35BTc
-%lN#fcc3(`B%YMG<<;9BRn6nH>Eor&_8B/Op9`Y+4M'8*'6C6&gGFB4*3"3E?H=54OOfFX?BUudmC,-)CP\BV1-P/%5rLiC$Q;%'[
-%.J%N#-=*TrF\*rL3IlBMjgA_ML6n&3pZX'H_)U^UX]mFr7gZcbS*sZ=NY3ToW2oc8EKku0aB;h#NY9nV/Wb*RSo^RP%g@n\NMXC7
-%+bt:f62+6?p>`%?a,T_P3s6UG76D_'6[6(03nU(2m%fgk3Ot[7#phI$YiW'`U[-,a[WA?dE7N@1HsM!E\c)K<['*s@mtDH.8[UT)
-%8Wi+,D-,#/AbIX\@#5?9XB9)T&f%]5>F&Btbb"La,r599NM(GHZYZ=PCMM'fm9A8lQ<_kdHaRm"Q(.=+]3W!GAkI9=SKS].BV&$`
-%T:o\ZF/"+Os+CFd%J2)B5$,WL/\/57W'KUS=.d,n[PCK`Z4nX]P:hiOW9&Aj%0dMR7&jrMpQEsXoFi[PA9LLaP9f&g4dECuMNZ/1
-%&.?+q5:UaOP:R;=9lkibVU#u0R#tVdh3(<!R6_LQ/>8)C:%Erg[>kY4KR].o-b2U-5K)f0RW'Xo%5Dfmnf?m/BbI!_i^p#0,ifOY
-%,;-b,%TDsIpIOk9,Y_'4od!hH0YV2>qP<A&P/9/]3MI'0&YOi:l6jd@hohX9H4@SL?P=a]"AtJKU];0*"O)7nj:\^h72SN%<Qq'J
-%KG!Y`HJRgs'CpX-]=PTm=pc2HYESE"9(iFbqIeMl0Q-%mXL;f)3OQuQo5q@^4D_RACmRH2$l#u&fk/Os[n#c.d6<0uRRub^7^KSP
-%XHm+0b?Z\WAue45c,:p6f;Q[.fkelI@s/frgmE4cCc?1DR:h[63+Bck.ur>'aHDatS5/)iKQh7[\RS?=Zu"6c-W`[+g#:BUkFm]o
-%LWa0Mf=`"7n0G49_1VcHYb7bpq[cI"KTMkuJ=r``ach@/c9d+^&pmeacsg?dY@F6P'/JAc$kun+-;$'>pZ2ScK%k-'.m`jD4m[KK
-%]$/oG"OAgX;<Wb_DC7JVmsKQY`lHl<V;0YKYB%JMXY_5HT.AEsTD(TbqtUBe@j%uD\BRiag'57QDZ4Nek5t*hQ*VF'b^I-p_H$/6
-%rQoCWoVMK1%mU!_lh>mQo+)62YK?n>RMP^f(AXC7GrFY<K=.9^[.V'DJ!N2B'dUMqK$)'u?e'rc=Jt9B`qoXn\2Tqjk/G's`P1KR
-%^?3Buc95L*+8nL8n/k9rGa=<]mjWc'b0%CEa$00afAtSV,F.r`8,OT+AUX@d?^#""2b8u-QB\F?Y,b'?Uc.dreMWtErLQOWK4pUT
-%6+2:>6+3tbc``b_YF3`:8i**cS>FR-oCH-2T6L5gF7\S90W37rqq%)+f9H!\PkN^np>8Y<4.=s-b\LSS]q!mGmX$e.ID,AqRQG)B
-%?^L)mhYXK?iI)gFE"gZ&8-FHeNVd$]6J.g3m>jt.Gi"6@YCuDC3TAA!gNah0pGV"i#4XlhnL9uG]!M5Qr2k=XcfJQk.2t;EO'."Y
-%6@-l`A9OVo?uN)e7$eZZ8TCBP.O922U8`*!X[@;q"G_S5^_?kZp3lNQg53mK7(+9]o_T6Vf,J=h7?#d[i*Wi3OnHcsJAHssR0;0)
-%d#qq5^^5A#'XT<O2n*:ip,fW48RV#m<5h(q.3rSW0_orLL6PW0E9$HZJX.Yi(r!oGooBeFN-;-/KAIi.%jqdELG8NQ_dM+ZKbAU:
-%:^rF;VkE$2ZrVT_(&S_kM`8"I"V*>K*9*S>h"]-<BZmDhcY@.Bl=ecf*.CR)aR@O!FiU2s'TW*R6BX>[Gsgn!^etk4P8>L4@G_Od
-%f_b7W26pCPcE.eI/-HL(E1Fm`4=*b_;O[,Si\_de*hX46BuQK_GXj>4V:aOYI<:4A(Z%pR/B)sn0e#P6(1XZgmqIMECe2di68d8A
-%/?p.SEc=A4qZeOiRRZV,BJG2VdkD=)"-]$#-89`A62'Fc"VDYN3.X>nLsV:Y7Rn#8=#t@k8JYJbFh@f6_9DEi77$7I;&#cSA"b?8
-%W_D,fa([7uaq?\E7VGHW1n:Sq`R>X#0\B-6V)"(V*,*ShD%\35'u"W;0eKO[FJiosd[p:P"nGXVK-LAg/3.H"*!^],j\!^]G8F/W
-%8UDNH?@:VEpd,d,m:<lE^,\+0f]ktRj2?E#,oXU\kuTs+pVH`uX(0+I'e=ljjl=XY/9/AWk?dOsYP,Lk$2`MY>Q!#'rot8KFc4#G
-%`F%H\IgDhD+1"9/L!>p=Pb-L2n8#2mK",1WH4:8^VX':"M#0%\r&$&'2(\ZdFMpD"jRJ[BqjL^cRTfTW>5OalH_hVWV$uD11=r.r
-%f"RHoGqGHU=u$>dB2Xn*;3[u;pp8>pf9//KCWW)6c+KC"Edl-?l^oCOr+Cjmru%Qt?S2`E=YUNa4=DEBgTG68']/o0g7J(o-a(]#
-%CUUsf#ra`X(pU_11pJAS^3tiV>N4D&XGoh!O$k>\gQT.e,T)k?boRc=;smmmq&Ni2[IqEX#80c,BTDkMFZKiJ+Ia0i.?NC6=dq`S
-%>6p*cCYTt_)FSP.Lc=42UBkTMEQ=3FdPQOp7r[dMX_c^P7QMgakEIM6HJI[*m1T(hRoWdhL0^R14lfYXUl:kFA#PJ`JSfN^+'#VA
-%;RTZM(<$]Wg:VGAp4[S^ATKju/S`M1-u#c[^%osQC8S(h]%31A\T^]ogq`GdRH(e:4q#X!B_&'LH7;9cp1EaADKh\R.du0lF.]Vg
-%);1?tKm?O`-`K]V<OaO'X4k3fS=SrX.*n<VMAsV-/ObWSDIcbB7?P"[`_sO<%6iE8!Y%-C!'u3$p*Q!RBX4($<l9bMSR>A2Da*]b
-%+;Z9a+,Z7P$K-hL)jY_28\8ZfG7I\<Y*#l*^=+M+@uU=5`LGsgCNSn>_muB6oB&,oCD@iS]=<)GiuX]\'#hH#_p:-"#B4UqjHBG/
-%bOR$XRt6IgUDil`9D!^Eb"HjO]b]p`LX_c+pH2M\[(eB<c!%bE0dcsmY\=^L:E8To5th%20n2Jq1GM-eqKM'm<=A[?Ah(p1h>r*=
-%=i,U1*S51Anks836bLl,g$pY;I!ZlLX[CZPD5r5*FaQh&CT$2sl#7R^f7;eBH/V>T+#,HC)LSZDi<n`YQl%.cMNQk3Aqm3FJ=c$-
-%;H(KOi9Q=2T9?Y3HeHKZ]+<!]?8-Eih;$2?NEg:@N\;?^#SPY[`ZF7$HLgaqJ'pT#J,\oDa+HpQ_bgH."-_Fm/Qf!'d";_N\C<$K
-%dYnPQTrlSLZlRb4/$=:VY-f"rU_n0k,LuRbU$j'u.*'%:f1J>tCUR@=mC;Y+XgjC+D5-=^<2]Y;PR=hECHp:E*kdh=Z\_OUmsQs>
-%pn*-FnQ$T.OO&(7FRu,'"1>C[7I:CWd<eWd';:0X5q@HWf&nN7WLYMj'>-t'k2%QB1MH"kA:9)d0Jr3@P-qbji(bU@hgORW,p^.<
-%e#jr*)1Fk8/3SZfMid6LKZ(e&&^jE@fLIqQh1X@.6Io#TPP9km\Y2[`,EmE@.PutkobAZK;c,["G[c)>+X?r0Qo4IFPDXa;Tm_\>
-%,"C!jLe*\N)&h4?kh'P3fP,"?F;A7PGe)=>B]![JH4@PlHOV,Q&gAU>LP_$93$O)*M:n_jq8>%\KPL&-gSp;%4d.:+,N80E[Ws:I
-%'2hQO[[?A,`=*'_(UbDX0oN&lPs\`T.V3[.*uDH3Nu=85Z?GFo_eE[qe0S+3YH7,;cn*;;=Zr;"-'1hpfdYI;Jng0c=(,<t3(lB!
-%^,2it:X[]pSU7iARXT:W[OHAgd_?Jp?Ei#m@)U!JUY#?F&bmc?XXT"V`8El<\OP!:Tfthj[;,0D55;;lqg,6^cj*2?4%//urR_eX
-%(16d#9"Ct_rMYlT2.:i".K=?darfgo7":fj,C!CFcdUmBSsJg;'[PNVq$QH\FKa9ErD1-8j7V#6*KMga69L\EE>/uC-pgZQS'jkJ
-%X-7He/"a4*c_It4i"i7K:?u,-m<8&G)knj#I]i0`DT#$aIW;+:7qst4+k,mD>(aqo%0Ejo"dDK?U;;?;`dcG+O.(h]effr0p;;W6
-%C6*fd2"@:BquQONVR*dK/ocAn_iM5I?i*A^^r'pHM4uuos#VTj/TCfpKiS0F1WY(omBXfn<-CbFGBE8?XlVXLS`Ep6Q?CE3g-qIj
-%V;<Do:cH)!?:1o?HG*Z*H03=\LE?3CroeqY\&Gmj%R+t);4%"C*.?u9X'AChY--AYgjeGf1cM)<!mMaAk@E`iAB,g"2C\Hs*]u3d
-%S7[piTC[1[Re7r(lKljiZ)d'XWn5:j?7IIGI8&o@;5eQSP6b.%hORp?:Tljlk(m1Aiq,9;5l7nOV*S\)baM&P1H_%R^XlE\d:oUH
-%cQDJRl5]7fDgeg%Lp^;J.<7JTSqZ;H7U.DHNHQD65.`6J-cO^&1u"^!loT87W?ZZYL8jEpX1C8b[u4ab*R`r'()M(3DIV"@8b_Hd
-%,q&+-/$^@1<j^52Q=r$Z=>V8^0;9%S)P^&#ECCnkY,m=Y=@X^Ie=I1X2ONo;.>u$lfeVEfk0gdjrR>Ah)GKlPe)8KIX21%"W]-;O
-%17@jdA@aRaWju)MR%2:JHFG!-ZtmS@V>pD?Bq6IX25]^d@lM6\L1PF4/9V\;[#(2((qU)6K:M&B@Q.^Y;$3kgnsffAIOOr@Y-X&j
-%]oYTdc?n3RfDNP<j*A:uB,!S%^&2!hjV'BnKm,WAI999q^Wr/+j>uUpH^8Aqe4%]jf:<u,HLk"7^+N=^gfe[(1L-8JFh1*Z>I^T7
-%*+uG"8*>=X#GemQ`<g6r8971n.h^#^R6+:dP3*hB3Jb5,4*r0A+%!UOSU7PAm^9biMoAC>N_4:/([$&T^OphQhL)5#:?WZp]"%MS
-%]XL1S%7R6;dQQ/XXU#;35GEWo!V=USn<#.CdDC)hn&"?ofU+E,D7if^6?cW"l;cL6'I4f1@d/LdL"2gR4UP]l.%!5-EbG"n\DRBL
-%ac_#%e1`&cM8GXE[@!8aE)KKmaD-8Y-:@>ob'HXQYBOa*+<71M8qg9Z$5YC\=?S)j-=VTU8jXLc9GKlAYGFJPq1:qG<)R`*ebNs-
-%<PAfI=YK:pMnm3(_]2O0OU0<#7]j7i9L/TidqeI'q.aTrDg[<'.XFZ+UO'@K9iDYDO[9fSVZ^GH>ALFU]@4qMjSoX4Fa#^M'K#[D
-%D^p/2W'(>@BWoX54'6#gD)1]F*N_(-q\1(X_44J8Djrc].NGQH8,H!Bie)(Sde^3>(S,ge<_L[i#]o"R/e%>.jNm0N@_&b&3O.DE
-%o`bke(5Vcp$,hd\Q_AGf]J]K14:UXmQs:)Ck)94n/,]gAr!4+FT"irSJG,p[ncE(%q&f0!SnlN!5=^)j"f&F#74O-WXbP54?X'^D
-%<MLqOPTHo@FS&+GbR1id2r!`1ceuYLS;fe=+;%imE(?T@9"UXMP^P$u_`'cFbu)XNl5b0B<Z2R?,o&aFbhFj$(T1u+gH7nI2s<,C
-%o66BCKjnH23E'fn]U`M3nmD@BD9qm^oM\OYhg8P@;)I-7KV$0HM.g/D^N)n"DD#,=iq4j3cXQTuYu_a1':;5WL#V7ErH&U-h`I[L
-%@C=gp'8Je5jknSf\r+?Wi9!0X/iEc)VKV+-0k5a%"3_lq-35n0q"f[#0OUaY1Cfdt^^L?X+tt5BRgIHZKr0GLMmE.XPRSEsfoM%>
-%q\2>>&S!h9r[>dX$aH`<Haaf"7=:YXk>?b8`Rf1Y<NKN-fLhhB?>Mb<=\lud'1#WP<6RNs3tZTM:\S>_.ZgfbkX9'*;>$Pao__b+
-%o7AK3Sq&2#Q9=::S>Z#%&e*C'!p@.$=b>U9=5_$C.n_R$>C^/1GV6i%ihGFB"`h=7T]G'blR.OF4&PP&Ku9,DN@T_"X%QU@&[)lL
-%*u4V^jXOVCs8RGUrq?Rt>U[C!.fTtTNgW"*Vt:MdrS6kb[/O9Qs'+ad!uM#lfe-,!Do7,TiB473c7Wo%J-R\`i2J^o%i/!0o6bFi
-%]:BmYY2p$+[hC"Yh!Z%0Db&7LS*tO'\7ZPd"'=8?2\/"1Y,D_WLa63jK"k@'q.$R\o*pt:Y;5H,WBSGq.fb#sm.$9S1L:f_r,]h2
-%X1-j_*8So\\=U=M[>PZd,JsI%@u?;/8&ks^a%3'7%"9#_FGu/>X6t1j[8MK;>*^gem]Z0*T2jIVcJO)1:Ykim27`7@o*5%JksLX+
-%Os$;3n"<=6SnJ)Pi[=Ycf$rp6>M)]7U6h*X&<D#ad2'LgDO1iM&N^c1F%CtUN5R)1mo()U,0-Et/.T]u(1$:OA0Me)@.=@80jmiZ
-%k4^h'^A76J7o*+P:q-$I\9f3I]6E5iVZGXf:7<0K9M&\_.SHGD1ECm:\G&EQmjL>'jc*CN],$-lH"DT0a[6*e7om,T_t,#?aV#sO
-%1cP9`j_\Y&Qj:[oB_$Yobe;a0+1q--1&Tf1nBc#:QNQ0aHZ?Fi5B,(_2oiJFs5=ohB_)1As7iXe^AkZ$n%\eko<6!_^\jZ:p:7EK
-%^HNc)HM8&[([%35X>n'1--drN?;VQu.2(f+>$!0`f1MS)BO.Gm>VC(l3cp)(n.^]ml-L.p_nJ@hR<NTL%uBZ-2Jl1d?GV\qnq?qU
-%J,,QUrp%O2rUA:>Ie\]-D`s!TIsLYA?iD_V[m^8i=24[tVsf-5@:K8Ks6mE]IXgsIH-\\Uo)#%<E?6P):[.d!R,`,B^cV]?NU>kH
-%s+TV6+6VP]kCij+9tpF!2uiXPZebO"hY4LoJ:G&%^?SK6oH&JHnEq[\Ekaer5C^IWJ&.q2'&tA%AmDg[TZI=C7[dSlD<9oPk@8e$
-%pY[UlB:_=\Y<Y6khSp!+nSS'1cT&`<=[jN)Fq8.%%r[)-[Ei8.d?I.)Q/V4NGb;VU+ZQ>]AJ<!$s%2?h.u-?/E'J!+nmTNHPUH)u
-%SM6)_-@GOcbM(m(j=.]fSM:&`-ChMe_R?<7X@tlD6lsLo>]@foFj>^q[W_3kK[@;JDU(-_bh3QsX!45'0g<$n]N^cjY\<saDDq8g
-%G$1EBrAWMn[ikmHQ`"Y[la.*[n>GW[:0V@ZR'\t,O6eb-s!A\uI-GM`Q5.8.aAY"5Fj>^_FSiMlg!J':PmQ(gjf'9+d`QLoZlKqS
-%rNpEMjXIfGVeu<^e#'8-]uD'r^>GW"5HL@$Ncd61*U!u#n/fIYGoK*>5Ot&p]h[<9"FnR;la1fcLIo[ZQ$fZ[ZB>:hV7T`0<X:&r
-%:Y>m&3?*_"mFs[74'le_h%L>qG'<Yl;M4BkA9Z&SD70Q;Pg*('rASXY15h]>R2P?Ocb95;fAHN"n%\ek+2.uGl[GOhd*hj,Drn;Z
-%^fUBU*!c9cNi.@9oX>rm+`@.KM49f.6(XZG&EkAA<K\q/k5"=A[L2&D>t2.:\@:0krZ5BhS$<05,))p`/=o4I#]lR.K^6/GS&`bG
-%[e1@/5P725[!Q#M3i[`\^IhAV:`@)(9Go$B>rM\MDd/U/fXQp6!QEgM6]tetl_hfq)pb0259W`)/)SXu=b!7%hNIF^J@&O"S%rn!
-%n2^E,iH?.R+c.WT0]1lVK@\NG^ZK`9rD=X:fK<JSCD3ae9AI\KB>*-l'V'sf12PaS/^Bmqo4-tHm=4;@RnDe/#cuj"V:M.3"Vjf,
-%qK&6n.G")W#qXt/'gBm![&J*dIeGceN\W8@eNc_&q6nkR2su0]\TjSr0>YYFR&\/cm,e/96I5LTil<&pMDijjc;3puI`q\RNbhXl
-%d.-b;J#<?n??7ogH-5U;dhKlq+3SLL,oqL4'bm=Bnf4H\WV.B^]8[GjD!%7)R+fjU[mp]-1=F*eRmo#ch[A9iOAL#tcd^J@iMX_5
-%!QkG!P:-E3*Idl1Ud.+SF-*AdQ,@Ni8-R#R=SA0/\GQbg'h/`S&RhsWJS_9E"Y3Lr&]sW,Zm%>[J&1V>"m2gZ%@CJYor"FS^m&d<
-%--dmQ(Kr"J?EO%SWIi1.mq'TU8D>msV<4?[5B10N)[&^D?NG;HMEd-94UNVLnI0>N@,]i>p:.+V`ogUhWf29!]c7@_o#]!=l/u@n
-%If&.Q5c#d]D2ir`IkS`/J4pDsQ\AQ2:SB@O9_9aQS)j=V4i]6*?)"%ISB@4'/AGu6X^TME.%gPbR,0=FgcCt1rU2cA`(YGIJ<R-S
-%&\_u6J@+`nc;3hu='gDU'FG^A&Sdr6Er8)^_6EHV'Y)E^242:;XmLV8FrS%kF9/6fE_Rl\-I&JH*e)-aWKsh;!D`Q-Q+gW+fA$=s
-%pm?^Q$#kb)[El`qihQRiHhY:uP]&$9Uqgr=iZ*4r=j&ZBI^b.>[HM?M/58^5hoIE_3\p8i.>q(1,qMh')8H+3T7=@rpX;oSUg/@E
-%p5.6&,`KMM^/]KDEPC_!8RUt3mY>/#^SLWHM`aRA'.7cP6+1"QPK9I^rLW%Dre#Q]-@qSr#HV+i^YlEl8V:Mb89GGC*K]aj'SJL"
-%8U>=MR@&4Yq?tD$r$q]Tk+6Tlr+u9rC@n:3?G:;di4LT%gCVWR"ctaoJ9Co+rQD![o9hTgg_:XH_\<MLcM0'?mZ0+?gIHe6NWL'>
-%pJ6rD![ZVi5Nl-s'7kBDr9Q13s%-j?+F[%R2b^3n8'R[tJ5./<N+/BM$7p;%gH:Vn;,,YbY35"oaM6c)oiYFe)GQFtaP6k;PFkS2
-%<en]0MdV0U7L2\LT<c$(:HS/Wr0euM;.bq"9>"Xmp'*KQ)@-`jU;_Y>Ckad+n"P:`r.t^>?Y5<K]KeHJ5)ErAiu3[:>7ne0i[<Q0
-%h=p;rTX8L"QhW*2$:'S+;VN0WhdF,9VP(q_f]XZ8i-XOiaQ=\;-N5VSQ95pENu49LbKJfcWnsn"EuuQO=q%W,I8SF%eldHE^SfSE
-%'2nh7<>:MXg_Tae*/,hT-%aK(QKS%0IQRS$9Q)\p)gu\XW5I;Uk`pddaZ\hLlFsE2WtDg&%I%RnNptRAo>DDP8:]$+/eb>9PV=#G
-%?W@2iA\l-7>C-F$n:6Bd^qsTWQ,fd0g;8,+qB>`hmirCiNh9V>H6e)nN!@e)KtjcH\f9$>a?0Z7:7/f)#Zu\^$M69G8"K*boIo=W
-%4i()_:Gr5#EK3HAkUG:Q):FP0^5r8ajs&.J\M!LcW<JbZ4OKOcNq.U/VStd;'IjD\6>e1f_&<tbnIM<4i8rB+kfrr`s(%6`ItCXR
-%Un4/P#j/sec!B5P2ontoELlo*KV-o_>Vp#*%&m/h9.22_ELA]k26bTk#9-002'tlGa1;[NX;j5eR`"X^#n;nO=>C[$^FQQLP->dq
-%>GgZ,i_K?kM>.HoC%Q2t2GdPVZ0>+)\9Rr;1S;r2P<4^#+T*etl2m8h;on*j'C?g$Q5kYLlPRPrTkAM2=7NJU(]f;I0EBi4-.nm$
-%]8^gc+[6oJ1>G9ZjZ,7LI2`*V,Rjt<a0L\mD+o4"J\ptcfFLV^QUW69@gPUHX"p0JqK)41=GSEjJWbb`2^r5`P/l-5!!I]mG\.Uc
-%a@",Zg\,lVW2kNf8!5Cak.3<4hNsVPN?4ame1^F17bng`"kA-LN;,J8fHC'l33PZ$qrHW:/YP?]^J,tSct%5MinJ1'ac@(I3pC"*
-%imSV&hdq]9r:1S(@:L??Ch*NU'e&X-NB-ISE?5IJO3=;4lnNO*b`YK&)qcC2]U8_EI<7^E"%\j?MO!h'Ymb^u_oo;/k56RDbgc8.
-%po@g<r*k&;#GR1=8;H+N]q-<bF*kc1JQs7_]p_n0W"?.7`.+ZgV8"Zf7A/_69Q"+E;j3dhGe6'Ur5c\bc#8meeu/7p59sLAK5@rQ
-%<guqWD&'-1QE-NXeTOj@SD5;gZ$9'^"_3)R.K\!KjB4^h-d_^u-hT!dO%PZ(fG<5C)ukkVB1*eBg5(-\nXT;)04W7SGqeSS4_MaY
-%F5l=!EEW)+JIMk1Kf=9j;gu7`)\!/[4ttpSq/:?@=!i*dnsKgf$]7ZU?9gTNF2p=G9GCU+/-hQn=mX:0C>3^N7g7.qIu@jB-.'0_
-%VCB]smKSg2r$E/B)$nnQ2`f#bpfQ=@ppUeX&L-HdqZ[sLpJ&4'f:/c=Y91OZreI!Co#q('jnmA2Ie2#QJuS#8_c6h49SO@NS]^:c
-%O4gMj:0%M\hsU;YoDe7C?gVddM,gRN-/Xf(T$L0LD=G$j(tJRZrY61PqG;?tMY1>lY*?mGl2U#j"kf4<:lYR:"Gis6R9PHSpXpPa
-%pi./cb[E7KH_$XZ>9UT0k2V:G)VT97EW>:h\&uJ/"JSU5*^8DnQ0u>#6)osVkqef5)>CVMmS:.FM9!^kCU?k!L`f]0:iuhZs4St&
-%aR?>/qKc8IFb/i.W)7,9lMg2:=4UqeWpWJB]\`#YhK]\^2L4u(qqU98\)kSu^3JC^XM)j'nDgIOaZaOH%s9h#l3G3CIpJu7VX)jO
-%4`rouql>5BnX!U4olh65WIMr2%T5U4[g,U<5Rncljsd)%T+;*IW)4!TK4&'uFlbqT#ED?Yh'A5YgjE8^rPdUi`V-DhTBnGGs+*qW
-%^NPgS0_kP^pD,u0U6,.@!V2@Q/dRR=ot!mGA,=mT1%W2G8E@fc.-/\f5=M_^YFk[<;OfA_e*uN:huDNW?iTcYYPo=B!kD[2(^,e.
-%.Gp(M1^)":Eu^1_EIXN<gtTMtnCiLtkWHMd@rQ8d0n^ja"FnAoq<NeOjBEgq48mq2++O/`s/9H+fjB4.cStdf-N#lW=20+Rh/D2P
-%;a"JB>-GDPb.CTNWoF<K--j8&&CQ5a#.&UEr<f-:<LtZsK5HiGE&YuODd\V*)6t>>[^cT\pdDL32"0cg1oUiU_C7,21B3XJd;XV3
-%p/P9CG\^No+^j_pJUJR\#)52"cFPn&;GK22O;j3Vg20CPh%Ma_[?bm$_"kH:'*4e$=[4)4NQp/3acuCao(AM/f^pKo+Q*I/Gl/_m
-%hjf,M)uu#G^O,_8:EP&Yq57Tuk(d=Cpb+T+#@PuP,m[0p,Q7G_^Op%e_`urSg&(O45(ES!f3eI<VdI<SIt%!-iQhH:re#&L$5,Sa
-%-Hh!1r02=miG1\@7X,:t_7;Bn-0?Dr24XNfJ!\\En-F&MS?o!`N3HE^gN<0$nc1Z-7L<=M;j\q?(uscN.mC`3dNRAD]R7A4a8P.c
-%4%#$,1qJKa_db9G/-.JA#D&^IWIPc!bRZ<Pn3Zjb(dTO,_i!TU]@$\Wq"\B7oJ^^.c(Ft1c/8LZbc(YloToNLQ`HD+OZO`nKY7e#
-%XYt>$N!H%CFB6B0d6RG@NIW;h4J@2gfkF(^**Yq.#Jhc"TlK7(`W8-=ToDg_PfdBAY5J9dX#qHd@O"W7oLUJ$L<.i.$R,Vp)"hL7
-%=`*/<+h\`NYZ#D=eNHo]:TF&+]<*=!-h6Qb4$Line?QgqIB'rfiThGMpMm@,Lsqa[$_CPM_fI!d[KV8<5S$X5IKkggCC@pIhi,?E
-%d7a[<PMm1"CNEMZga]&Ur*h(BJ\VV.h?\p'Qom^+Zl2/PIMW4[nBEuQZLDS)H-LiYAH<N-GP_XS0nZj2gY2GbEB=g$C7EDp6JuFC
-%bMHs@6clooE@t=oZnXErS-(lDLc)Xqj!#I>&;^NlR8>MpL&WA7$XkS$0kRRpWknf"oYX/=(-[CqGETj1\/BMq7td`!I>ZkDkMTmf
-%">1if!`)rEn@]ZF6[5,Xc-/V,1c&HkH(njWo6fJn!=$Lp0Ys=<q%isg=JsY8bE+Km%I>L]$'&dGCPacsWUkUM.JN;kPrqb/?</+>
-%]'r:LOZkIN,QPmqUZI7c@P3'8M;YWqRPT\s<!"DNL_4S]%>&0d\3!,O@S&6ffYpscR&$-P*NX:=SS,4(b+rThXDr=Ta`k*W+X!@6
-%q%'Z*SYrIsppq)Ps1\n'dnqUd$g4bWX8h'gh+kEDFAktI#L$]kXM2O6Ja48VK(m-E)L,R"DScBC*[3.r5fDjT)1iYL@:jEd:&fu5
-%rV4gE%jG^1?TYB5,4Z'GU%#L,;`eH?1Ibd=_S6u)WAX5&o(`Aq7^3#=F+g#]/Dt)s[j@_=2u,L(o\BnfeW+!tP31Q*/^Sp6Cu5@`
-%CF'%EFjm])`5s0K_IJ3pX%Z\aS7%?tqOh7-$c]]a[?OPC6nO,l8#-lY)o^?t;kAc^Um3Np0H=Y:_>ht.aXT$o`^1'jK#DJ#A/(jc
-%F50@",L%.Wgj><<&e35\&udm0UX?.)a!2cLkOgN+SdSF(@KlP.!"Zf$S=Ums$RMBJK4)k:O-%kC/='sN.c;'42n1_H!\1gL1E%FX
-%Y/"#!o>1QNi^4iGnJpImZ;J5Zae"%L^Hm0jdf4UZ>>E1&S&`K.:S\:3^Ntpi"toOQh@5o/,LY)IAJlY'7SlW7(@h\E(?J%WnW?V;
-%B\26OZidu9YOWPE[f_+L0qr[_]R*bDJ+HmC%Iep+&iD4(KVRJ)`"Rc$83t*U5A^glHg=pkL*)6WOG(8%nSdF[SZYN@,)Hs8_X-^p
-%5.-VME27(V!-][W>%_rgTWFK2>g^59PlZ4U5')s\FCrjcT6frW5J[sd4`%62RP)V25KrG6'%3,3npt\tP])G8^H:J6\X\c';rFFX
-%'*noLC`k!53:P6Z?iJ=-J,oe8E8hPa)YcO;3"H/RlXd.EnsptrYPH>?3T2m?K@4a/OB2Z1MhJT'Ck^.M%fBJ6I"XhaCORhZ*b*Dl
-%e:_Dfo!g\c&gkR&&q)G&[\6"pk;JJS%"m'R-[\[7nEXgUAHZaFbQSa41aeaURjXN2fS$eH,,9*8HFZ%A2'IS`[>sL'p-3`eGMf19
-%roE+c<p@JYSur"f2OtHKLFCo.&h:kQ`Zm>#\2A^YjtMks(PkC_PQ=M_L:pQ+3'haa5!a\uk&9+Lq=*DTJ%$=,Y;7YWZW.Uf8hlTI
-%;5D0;H+!q25U5ZJ`;&6sL`SCr+kMW[bXs/'fop0gbQ0F++tu>J]K6pUn:#jKUoJ9(Z?1>^54m%#a<oJBHTmDRDY92QcC).7m46N:
-%\_+W5kLq2R.7(UUadfG+CY:l7hE[VBMgOprj;pG@6b&K-Vj"imH1^=6D0!-IkfbAY^'Old9L)?2Q^X3'eiH5%&=n\ppM"$3ksPe(
-%$Vg__g>lG!<QMtX+mX#uZ^baZ`^I'@YW51=dR9)PJ9)seS$SPg'r@uc+3T@&@7kNn:OAIR[F)e*bm"fZ%Vc!t4GPV#>%2cW(Jp"s
-%bq\?4ZD,ZG/>VtH9W>>EfZ2&[Zc$#sdEC*SOq>Q;ETVsaRq^mR1RY#^j3`+%Gu/aVk5ZMN40/Ym42O+ASAO8E&lk%K[MX5lg*rhT
-%5_a!Dd4RooJgX=JO',MnaoRH8T+rs!ifYJ<-$R(koj9gr+l06@2A^)neOEs"(Nou8(W%;GNi#WMQ9)jtcPJ;,$_5`.?[rdlDXDFe
-%ndX0r*RY^MV]dY]%krn.Z*lpQ&iqihf##ZDPllfL^gbqA^7akHMm-f,4!uSj]V-p]V5>S46X*r.O;?p)(>''uVZh#%4d-ZT"7cMG
-%l_J,3ncD2%A&V^b.C*-(*U\qlW*ZsmDN3p00]WE;6qQKr]Kk)lMRueoKT,F)FUQ,(D<6;Z;"^lCZ/RC+'YoD+GNU/,32q8["ZTXq
-%*:C\$2-_#S]*34B90(o_#Sef]'mTiG6Ff+q`'*Mqr.quCUZjKTE#3O8M;1,HXnkXWh3u,0F!S71U'Y%-;0N(/7;n2R>o9sUfl<rp
-%E=^NU\lH-S_qYR!@>"aFK'/1CN+">0Di"m=jA20&^hE+c\T=VsWKET'G66O_I7;ru*0;n[8);lGeKip/e-.'s,Dja?maQ9dQk$'!
-%)*&MgSSBCMWt'F<>N^4."7j<F847UA$X93A%M!dI3lEXdk`C#*',WMAj97%HftSQuc=+a?``\)0YWH7&?]Z)d:uf&G`Pk"6$N,^n
-%NGCs&Y]gB'F4f76SVFj1&9HX%0A%Qi;E]fLE-(5k7Gek#]6EHHB'W'flHj`'iACH9.s((_oPGO%*07gT6S%bFEh$rVgtJNAK5q^7
-%Xlqj]8Sff0^(Z;K7/#j!VSEnfL$?s.:^5=!^($Tr6MDJr6G]$SFO/=C9bc69EZ4eKWEuO<6XR'4f26_T4&65l_h,U1oml)67pgdJ
-%'+kLu@F87o/,Fj=U82`nhZaf%oQ?,,D52(.;e4[YYJ<r\GH.`M*$l)C_50\ec_59dG8g<Q@#Dh.*W#I=_gN?fm20D3=6tW<Q0We`
-%Sa.<;:hA9@h^cXo@5!BG*72/^e]PIr00!^^PG.2%VRT^U!Ia.41)k6CIJZKJrX8RSs)"Q\5i8.^_KS<'51bcg"GXYh..G)AC>9+)
-%I7h_;Bo6BfI/Q$eG:+5#,V4`Z]:EEd+mu!i(^It_Z"8hT`.dTXFbdI/_mg5%$T@O;G'FC+0&fW>&1fs%/]5=c=#K)G@P;1b5Sko!
-%TW7#VK%u6r;oaqAYpM_Ab'-(eq_9"g:l/1'r\REseBcZi2:!#[?UTBJ()q^Xnclro+esj%J`8^K@]9JEf30Q=Hm]$_i:d9h*MR!#
-%s'#tafZ6C$47u.$QcL>))]$o3A-;;Y3cH'T;C.=(P=_2jgp\Hc%D+9*'48YI=32$;BpabGpeG*@XCd(HP"rq;rSo"en.(R9Z3+uR
-%o]kr&_JY@cklem1+jV603_?EHJA7BIL/X9mTB?f800@@KYm-f)+M3=1RqNXm3l+*XppOLGN=D]$6&1O@M<TQ#P<`*eU.\Bj7e%TA
-%70ZN(WGndUR-#O+AKZ<5J<1!.ll<f%/fGjo%Z<nd!p=3:9L:82e=CIV.9t7-2)<#ldao&\!i&pOjW_8;>+qU^LMu0t2RN#_oMn-r
-%.3knIMVR/cq;)%oo4[4ZJYtD/g/0bJcP27)Gk0:oh+?[FKQ6$[G>MjRE/t(ioolLD3:;O!8S]mY"o>W7Dk)^OZ3498g0knQkG@6h
-%?\>N_Q<Z,WaPLi6oq<T29mj\:>iFW]HoBa+0bSq\JatQN4`oc2ksM(`7&Vq/89?VHr0QiLG(fJ:k)<F0m*S?q-)VBo8dR*/a$CFg
-%UY<Y0n9`ud/[OMsEIN"NTm.S;%5!g6rGF(hC_V=hV9C;'"q8REN82I7;0EcqBa.CWJqa*tKf*g'8FA&aYi*X@-lb7oH`6@=%3%AE
-%7>1pg`UQXlBFp_R0Xj4M]&,(Wj!K.W*rbo>+FB3117+Ml=Ca9/<ui/,X?)iMT"9'KrLfD(p6Un[G%eb_Ff1W#%8I]'Xm5g7?"K.r
-%84IUAg*G<_qKV_DJF+OBnGN]S?rbG(8/I>-$1<QDiR@rceWl->C8W?"Y6*V&r<Pj<!X7q`ko+aSg]C]<lu^NO+Q(NTLREN0K0:rk
-%'aCDY:2^X'b=e8OroeJb'!P&LCbe&_)18(;DbDL%PK+0s/5j1jk4/8tHukq^?oYhO;d:Tr/$^!FF%-88GS6lg6I&*"W?kSke/7uC
-%,2m9EdLW.CJ9A,T.2j[)n@dbR9^KC.3ZeK@FOm.+7[dt\Dh_Y0Efr\t)@:?e9H6<o2j])S$ED\m'#q`%:9MkFOfD8sT%%2ARZ`7,
-%Y_/`DS0eChccA$U1'CAI7`Bf^Qi\aPOMRB?C`nCs%s/s^+hg[gaZ1VM0_'@]eJ3,X62e_i:1u?.D7CsuPO"]Vf'&4&;0eT`!fs.4
-%c"W+-"Kbma?BGRNl50p^<*P#`;ol$C`/&?G(IWM4DA1[&M4mlT=&'I8VRM^jkr.(HKgLLjpHt?::aQJ!0euulR;Ye>mZGS-7EZDJ
-%`p>"-'o@OE&1p6]2KNH`O=6F%Tl(/j@.o!:4OOu$L1QBsKFEopb%[BuhM)CSBr1=-@1;$t$K*/F)CclG@rsNJ'I\RU(iM->Kb!ps
-%&b$4uY_2lL\2iPp>C`[1lPu9P5_em_,W7>n>:8\JZGj;'m^)G'eqB/8OpohbJRi3'H-S4N*.f-CX@/'_V5I7Ppq@.VNig>5%>mUU
-%W"99`$SOo0E.g5]OcLH;BNmSARBG6hGBIG*kk!=."2Ie9=sh<PAc!pIdqU'qI>`*_WM+B;%`Rm)HmkeZ5n0kgGm0Cq-;%cu_AFH^
-%N$n;:,O6aJK9U5aQe,Lj;+kM+(KI4ri59MIc1fLb&+X*p+jV;T];[`L7`"Ra?+)_M3$<"'0\f>=">OpWVu9LQo%]n"*.^q7j?*%(
-%h)7V+<YX.;S<Dcdbesf?)&*;c>_\^$R2u5CQh*9NA2rK\;J_fT#XJAXS7n*kaj$5m#HQF<?ntR6K`mGcPhW?PAij;"W;u"X'%!qB
-%iE6fP"rL9MHq:!$-,`nShpa`cpe:Leh!BSoj)KR).MNg5b0rqP"Dsem\gIuPVW1FC1H;5MhcktM%qUXeqQf/).(9ke)J?786n=mG
-%nd'Qp.,j,5V#68>Ys!XlLVs\@^TQ6e$%b5CbCD<`P(^d-&Q&'Nah73l2M2'9^IePE;qq\$)[M.6>@fbOjFq\sVcq"%2+9*dD?aN=
-%ICXVJlY4K[/d0RoRh1G[?LGtUS<8)-G`K0&A^4CDOFkKgR_)G^(&/]hH%[J+pson;<FiQ?;4n%kDQmJD=[tl*@k\Z1@RSQq)71^O
-%85OGQTJd7%6c#M1!c_`:hS>9&RFH?Z2N;@b&!pj`BQCW!cirCM:lDAC%Z%oGo=Z8^iE'RQCp#B/-pj%r^6p9?j:Z.#"(7;)0<?!L
-%F;?DLOo1[U)l'YZ+He4='DYsHB/g9Xi?c-t8^]j2=$J#SRp/]Eh#so$*!fU)Hg?d'JI]h^hE,K@[*17$p;CM"&rd,a,g,gjh.j2,
-%b+@n6E;8Qu5"l#ue_#Wg_/)F?o1nTaFU`J$?Om/"!q95l8;Ek-TuJIDq4V[[E&`qZ,=D8n,p]0WFr2V>X<KnMO<IK[?*P?kJ`'tZ
-%8L9@XaT980.^Hu9/TF+2D]P@(#=t;`%>u8m8tOrTScq*7WX_-g[RQ:<OG#/5S!bZ\!,>6_Vhom^TU83QH"bi?Mn5nEgP5L&L&B[\
-%J=m5R$Cu,ZF&;,>8)L&="GJnFZW8(a,1e;7-uO-MTj7==U#lj<Ct4%[GN.<W!_tdtV@KRdHo%#W$@MQi+Pf+eU@<-bK5TO,ebh`n
-%MH9eJ#J"pd.a?_pn!hDQEa!0JfYl2`$a8%3aPIDcO*mp'r[/COGQm`tHU5Y?PcsAY%H+\Z*4oO8.ZFIN(po9Rcru8W">ritRjT^'
-%LUD(H3_XA4R>l+J4lWlrcZXZK6)GOs.#,k&gS@"^ngWtm'qR[NIg7b^=?ZHA\\Y'u8l4kY1ae5I#hpdrL2RQ0XQQ@=Jd@@OL2bL7
-%VVlCI(Q"2IhCHUc$#CR_1(b7s;I,5Ph@f=gQWAB)TL[]F=n&oac?*M#jga"B^+EJVCHG3t#nM]+EJ&->#g?gP;qct3+N/:(<IPli
-%@@-kA>pdLRT#b%6A]LCYo+NRmg))sIpR6P^aX&(e1'K`H/&-G&%;PcP\(iQ]C:QY_3L),,9'\(ldQ(\<HJ+("ipcJ:TKE_#U09*5
-%C2GdY)DJ*l>mA:+f.bf`Qr3-%+SFe[cG0;'2fr.kVF7XT_20Gn@980.$(>qQJhUG`(QQ-R\;^SV9T\&CLWfH+r]`#H>e^HS55][m
-%=uqoL$0W$'p?Xii/FQAk,1uVH#CS(0NPEhp%'f&)-\@HaDUEIncJrQ\n1X]bR=$*5$9C*qgOai+pYQ2a[n<lcqnCQOP1f<]o%iIN
-%E]X1-J"Tb^_2<ZVN7$2)[OTj,8_P#M$8kf&Qs=b*I/()AP>=DO2t@?+e:X[h/_^UjNgfu_at7k_2ShDX8:dUiPpTmL?c5L'6^ENi
-%8;7(a*;0&QbTQ/'m;L2N1lX.ra9iWN#?:]ni"kahjE0;rrif&W'i3HWlY`7:'*f5Qq[7JY5CD#["dIf[jV6RD;kO$U6<s8(+i\CD
-%)#U;Rgc"=*72^a5]&;$8L#oiErK;cm]"=^>rWo`>I!H"d:9j&*j;5e@,s(8CJO2;hQr*?QZ%R0p>i#gDlA!08<q.BDCCH57Z\[4K
-%=4D;:Y(7q&/iZ[m8@sW1,)rt)_MF$sg6*4$$68Kgd450!8E5s(,efY!BF#jtn\/uA4+p.F>\#!PLl3KCD,&G6l7L%r6M1V1^8&)p
-%DA,loO;UG.BBpUdf,4(]q,\%Eh,70=ImI9_"M=eQfBO#ceO<Cha.e/?\FIU?-r9H#bCCju5k1Pt%4M<PN?TGF<]3pb_3ccb9-=:2
-%nmK#</C0:DKoqN$F&.@X,OZn8#1@iYM)?T;D%JC1MW7E8$iLdP+Mp9ep.m_LXSB5$#isU\_n>!XT,'W4Q6/YY_-\JGng;j&U8,M@
-%#-N#keNt+kkMUeZEDPi_Dr2OK1mcVPa1<@BS:Sf$p+W%$4`l4bR4>4%>3=3&<8^sID!9JuV5\/&TNNA$YQQ+CD#[pb!_4k50kFc&
-%VC5kajCA:E**#<5XbtM<=b>QYWgn8UcSr)`FLGuo:3^ND@E6Iq)OUh-^gs0R']M\<M:NUW67dR0N^!V&mnN*WJa'N2W@@!#Q2%RQ
-%"tDrb1ihWV97[2[,IIk6CZRg:5Sr?/]rN%Ql,kA^Q4(58i7N3)jKNMOf+pC9l=JgZKd<19hq:V,>di*=522#h)gAa6BBX:HFjAA#
-%'H\tNmjY-+Sr(q(^:5n1>Bnrl]5q`X`FqVtQbg@E.,($J"s8]c$ddA]l06Z2.VFX@OfSu.JsDL)h&sS4PABRfgdea*W1F9dFDP/O
-%Lue=+\pn4e7Uu>S0>V4i_[I!g'SKU(dS<6ne^u[C77<2'kmLjZnAGXbJXVuNQO]9S`tK;Ye-aAjH$A3;]ThllOgf*F@Xc,&$as#Y
-%i7ZW]3BIAt3qg.s\_cI<aW6M,Y?,+`fFcA"27TOVU<,Q:*&bBf,'N`1Y]3WPM3=ImiJ"'NSoAO/Cge^V2P_%[!-K;APfhejM`(WL
-%B1Z+6"c-BV,P3QW#:Emt;8+5PSEg6pdN1FN\dK'%8X9BN',!LP8M5H%%/_[??uXE:"lP]7P[f>CIMET(Cfh%`TgK8H*cB7;'%j3r
-%)?h_M.6uaI+XGCi]F@J4,^.%)H57W4XH"Fm%M_EShf=rtTg48Mk!2F/JGL!S@K"Go/GPDHfVtt/\r`&sUDWq.#aahB!0"S+S0!AZ
-%Z;!q9-&<\p*?#5i[4mN/AV]=\6UeVS&&@-/&28J+k\ZGK=OE/]A6O\n2$R3#o\4[[f93ldia!fK98>C_1'J3>kpEjNq!UgYLi?XQ
-%aJ!,0JmkhNIUruP[jOahpMP>@QG%Be$n>:"4)E!.TsV_-8O^Nf]6fG](cd7k^]f'$\=bmi,c.NNrWIcQ<%+7u6%NfPm;L9TU!F`Q
-%Xq#b;`Ha5$<d-Ji6qqS]g>IO2J[7`ZH)d&c?-^iq//$W.b8aXK?ImP6N^DG.<c[Ka8pdn-#"PM@o/.'>&HIljig79fWLROi_>tI]
-%&t6bL3?AkqAL]@gaoN=0k2=5a+j,='B#cXhD!+Y6#PJM'ZaJW&=i-sSdtS#N-ch=cgR3$?J/r'^)a)@5KH3C6hs]N3gt79jTV!<=
-%;<=n3?:sB'`mQ"jjUtpRX`$W"^nN?+@+'./&)RehCfk(BPpapl'qsm#=[$6%,U.cB1D_43/5/=*K#TM_8k^ba/7TBIAH(^V_5Q\(
-%JOn^-%\(BU\bU,Fn94a_Kro.K^q*i1Ug$uc%K%OU.^65HQZ5$pZNaqs\@WlPIZYOi+PXVA/%mL'MYC+C\B:g;fkCcnEiXqOJm17:
-%)C/aeYq-gSi,OlG>;ZXjQ>M2r]%NabC`S*pA)/^UbVc.W_(?UR'JgY32@!KQXX?f@>#oJFk&Ujt@f=jf0MEui3F@!a+d\1?OWA.d
-%*4RCs*JB6!:r($h(P2bbdA?Nlbn*&ia<PfN!>hKni'nk57;Wu*>2$2Eq17rPfP!,&-uiZ"UZPB^EhjrE#;na?^:W'AdQ#ANF@6X]
-%1m/6+<C(^^-$VDH[K%<M"9cnfa"/qSG*-Fg.4dT+JIBB8=<'q"1tE0*WZmNb3<5A=Qb9pj8;t7r0>N=*:LoU5<V=t52i@$07%=GE
-%j<4aei<b6M=kprsY(?VR9SW@DE@6s\6Xc-akAo10Q*`?WLl2XGA5:4>*?o]cF:-Df4WFT-!,j`s;Qh*LPE%eBpr=7e1,ih&VO_f]
-%+TbDr?\n!-ihEQ+C&N#MCOg%Q.GNb\`#qE3%1dP:?GZPZ!#-_O<rmlPDV:0R]PaDqb6u*`93sMc"lc]@aTs+C)DME\A?U#.8cXt'
-%HGuEZ_5sUU&.RQm98O.lRBpfprd(5-p(bk#",CG5d5-Gs.'`.M>f3/J47sJAS4mDT\7)ATHoUam12ka59c$c4Z3'F'!5*5[2*'U\
-%W.M>&Z\IGn+mb'C$>2s;_b*X.V5\nRT)Pm3-J#[:b]T2PZPr&LJ'4%"QBlah'f"J^=7JQ%JJqKMm6^&o=g]eu1?3*ZjuK(:/%9=s
-%BJH]617[T"#GW2bC$.)emcHpV1d#]sKjn*G"Ta)k<,1pC=2^"3k'+V$T,7Af>brEf>Adr5L\r3^k_(=h`)XrHlsdE#in+Spg!.Dn
-%O%;%-8;$u,U2+([`7\mD$C3O=]?')B18uLoMqEMG@)"7HQ/A>5;M&pJ$LMHW$@!M'8uZ`,nN(a@:5's5P)[sH$OopY<;A(1>`5t*
-%OX:K5J54$cPWR`"=rFleToN),#qq,^!i26<3Ui7`9:g'cDCQPCN7M,(R>\(*.$='PjdiD[9'`WM.]GmRUhUPRk_5h`6R95GjL"+T
-%Yu0<'AWq!BE"l$bK0\d0`Bq%R",9'4RD`@AUms?>ah:lCG6l;\O"#mN/W(d.\h7B^4YOY()RIXkZl0s\2"nlWd^WtC[\.<2_TZL6
-%;Acm2\J).TlT:2N`kl-,)R[97;LLQ!"4bhF,8Mlr<5jk+iU2(LT\%1PnjLPNYf;suh5VqjF_7Tm3FoZS&#$3lYAo+n.-O?mZOgUX
-%FVCE""#D9;Th!B^aMXi\9b:PeZuHfk:oLf`%026p;4//UG&^((Lte;!ZpVgN=[5b$!#(tnRcT,dO;\f8:Om5<!\dV/O'nh4%fkPt
-%dOY^B.c+X#;[].161$sIg9DVB7@7jn2Mc(F"@pOtjT=HkBf&g7CF]G)@l3;*>hpSpNl-t4O8qsS]#.&A7k2sT$E+&;0Brg3e`"G@
-%h-bmkGUG5&q^i$+Zf)u.6_a9gRo0@C2iIkcBS\Y#XXT6?jt[Y=R/mVB;O*GDb:!A*C:=LSh8TrOb.;AIRW/mQpLk&`ZCG^s-*:bn
-%-b8OedplWI@0;o.YS<GY#cU?8a=8DO-:n><_ZFRV1H%PQJ5r9RlA98eA0;@nEB5s,'F3an@h9#ikdhF,Y(4>^LETuqHhV>[qX)?F
-%5"cd+VM*&IN`O]aAZVXmM@&t@Z@-LWm=Pf4BLT2S=@\!"9Gtsl3WM]F*#?iIY_7I=$g22"Fc5Q6.d(JA<1\qsB,qHZg$FJnf$T"9
-%Zd,>IUHt/D<mEhnBL'&WHcE.^@BIqkE"5u'`k@(I!'E*C9f(t*!Fk\k"(3OLlo55D=11j1'Pmn&&&LA8%62UP@3)R[.(+<N5teht
-%Klo4#`^.^^$gRdP`_Lm3!C4q#;q:u:^qjFelY)HLjB2^2==t!MQjX)NCiRc_>2(I)aRP8pKg_DPULW0.>*RlM$h")j:g1lOUHnlI
-%kmQgE"-Ok8iuM&bF(,PnCSOE4Habj7.T-`'hMl_q<"%-\N\)q:GFW.Nl:4r9a+TL#4nY1`[*aT9)<[@mXZXUEN]+0s.UsJ1nL^kK
-%P]Zs;]DLtt#HRqA$1Y)!J5S%!=U,"n<?(6(39QMElMr%L87N[%Z'8GGF,i.X`,cW+A89ra3<q*&+o8ij%Y.J9^LJ7n\7-Ts`j%gq
-%@I"0<!H8O"1rcdH6!Rn>J-q,DNoM+82T4('EtEeWJB45_OHJep_DrN<NDa+C8!?1KcT,1doK7BDdBI*4_DiG<WYR%E/>\16m,9`Z
-%)7^U818O2VM8Pa5"RZA+/d:*V30/-1@JkId@<F#f`BTQbWki+=&M'In?@;juUE!lVn7rdFM,+P8a]scQ>!`)YIM*->os0*V&/<a6
-%9G3%8+5VD`NoM,AA8nXBJ4+jM!f0EhjW$Be+58.(*u[(T,G<P<At\E;24*.4<P@@/<!2\*FFYD0b7Q@@qY%?g`CAII0ouXKcYti?
-%L!W[-X7LVO3]8jqS?[q7%@.MQanA^[<.QFIfKe?Q.agn($V-:T>B2upZF_#>h9B47RVl40nf2b)*W4(m0!06Ol`>'6Ri;HTAGZqM
-%H!(Ilp:*;YpZl=16_P@>G&a3lO.e(o2[k3_O1oFI_b>V`p36RVF/HR=`TlB9og$EI'DRnW>k-Ua:/?P8Rm0(86eor[a_obKqKtK0
-%O2k+*dGhY.34ctP_gk$Fk_<t,!%j5In6iP2FW.f[X!D*K@6N!,hus$j%p)0nYL=`TkN:*Ort'C\IBjgcYWe\?lXMo#.AHP3_6n90
-%?>qJ/r'DsNV9K$f#@Up0BK3<[&mU1$5E>SRE313GPObO">$40)q#(]:^(q%c;%^Eun468e&(A8nGON4'(`+8Pj)<)+gLbc&Q?*sj
-%!5Z:5q[Nn;Dq5D3*o:@m&O_]aEf^DNFp]&9!6&Y3U^T<a;(W!R=<h-qW=H67@uRSf3Ys:\\>E9G@Ep`)WS00_%[3@60H7t8l8"o,
-%CXulf\Tu>VA;Q)l.4+A3i*E\P%2udCEX`Y1KC1L\0/fdi/3l'1(FlW"hOI'q^d[KB$c"0.:Ae;O*so$RS"Z8U`sc"N]X@f[*H_kH
-%k^IsUF_Rdm/MjK6dTURkMo5\:+?oosNE)VY>OMFue1WL8QN!ZB`CccEA]+DqHZ6dHEn%+1_XYlBN.:%rUD,BeXM49B=E%H.DdWZ%
-%<&G>WE3rqP=<b_GT3!^kf8<P@Zn)h@0$R=k":bI$pS"O09lAf9f<:B^/aG;Ad4E[npN_6.Z:6^]dp"68D%H7X@0_nQpNq.^rXgtX
-%8k%NNV8qC-:I^R#SSs^:mmt9rN+&2$hFO]="dh.C`dp(f-Q@0V(aQ2e(>+%cjXP@l;NUgsStf=V%>?rZSK$-0+g"G@5$oG:qiER0
-%Z@fFf&[10k;2m\7e%)XV>[B&Hdu-sA?+?$I1M_o'fpmWIok!HrOf0l^!^eK$%)qa"!osq;<Mj,ANnS9e%1<rd_='^_.?C])iY,!F
-%-ct3*W%@^#-6)ol;C3O'`0A#e;q-C+@&9TM.r]f;U94po1A9F1-X?Z-C2Q6q/60j$O-6:nI3Hoi.$[[hgjjrL1V,OI#AXQUPrA$e
-%!+d2(&-oY'1d"UjDCc@R]kEe_mOh]Y[>tFK+SmZYH_08P(ecV9RK10/.IUYcUVUH7cO1^Ba]6H@V)TOLaE8;bh-Js$$bN+)[F<<p
-%llg`VR26%*!sGXs%LC'SNM/KjH,"\a\$?88.=_T$f%k_C8C:7MLl4QO5qXjG#'7.&pMO9697[e-)_'B%$n[,.\:Uu</&=3.&"3T2
-%/],\k:B?pEPIj>pRu>ddL1,?24KK<8W8lgh4Q-(@FqWRC(93%^Rpb`cX`5M`OEdWaV*M%!JY^.%Hu3U,6tojiN&.h&(H1ATaF-4[
-%'38l;BA$=?N._+A-up8P<a+HBMi!clkiYm]\qW(),i5l8QF2L+MFJCX%@S)3hLh/,+5D8'#XVa*EBI0+IgL"6Gh<;bT8C$M7iTsL
-%'n!4CW-?.R3;=m4^jW8?`6"E;ckL9"$fBoi0#;[NBSS?4$H.3>-Xt[8,)$Y7co9=M#OQ7=lT?3gKCID,Pu5ek(Z79@L[;;h7BjE8
-%(0!9S?ha&$2O?7##Np*p09#ojEWH+X>!iAdQO4cR`W\7d`HA0)_hJ`A)O*9ABeiaH*q_MjK?:\X?s3i:C#L!?$ghV0(`*Sg-ZBr4
-%Dcg[h=L_1c#HU*fbcFlI)1$m_,$qKL`!c9qG/6@^#*79<pXDBH!dF,3qj1In&>C8UE(#`V5`W+YE1eFsR"c8VgmA!b$a;lh&SL&6
-%GfrNF0H]mWRrh3ZWZiRl--aRk)b6/'[\P`kEBJHfof"!-;D5jj3(c'thS9/5i0q#bi4tYRXO_8'j^:>0E3ub6DH<eA8?&<G!t\\p
-%mS+\ja\o3I9cVe11W[Kq[iAu;hSc\UbU*f.>0@O[a2&5U^!=PNg3PQRRUcr.K*p9a5[MNaKnI2=Z7J14Q!#tN!JK_RS;G2D(c#0?
-%7h\C#=(iU+*G0ge1NG03QkZq'ptHd"EQ-#8^k7ceh/)eD?kT18i@Bd8_._ofW?F'IbD$B_4644NUG.LimB0_IK:u1)`K-^P,>(:L
-%Ad"#qrITUG`\I0GK8lWu`_P'Zg67oB0nAOsj+sKG0BX.HKi6_-f7!-9Ye&g@"qT.hQY[YiH*q]l*4M+_96_D2e2Uj2-lO_:N=e*X
-%>ChK)cWN72/dUQn"Vi9'-Wb$ae$q8j1NNs_'%TGh#F[ZA";m)4G)jZ;$m8]F02U=T01k6L>#L9gQ]N^D+m0]_/(/kuWcW6.!pDqH
-%M0_X.bKsL'"KQTC-^lnN;40,@M[^euBuj0_(kJ\^F'WU+Zc!/%_dY85;5[-PK5Mi4e/7Gd9#Y5g0G:4iK?UAmT6Lj`ol,<I(P/p;
-%:#IjKW2_'TL;@:n?0jPjW5+(k8OpIV]@n0dB_<h(]E8@FR`rRs#_iO(S!_4X:0*qedO53t\RkE?^H&@]^JQHj!SR7)\UnR<a*nlt
-%%1Hl(22Q%DM]p2mOIE#c=pNAO%39:u,J23*pL2ld%n@e#5Cru\&qptg7r5:hTGdD2q,3Mf9ehM;`/:o>bYKBTP,t;E_uNF#"bXot
-%V".``3%_M),TX_Y/:IPk/._8^5S,h@0>O$..hlXca;KhBChJ)^e@P:FF\qFi!'cC)_HDKijsp1[BJmoj!5pA;3eG/`Cr.cZm??@o
-%Ya#@'M1("BnQar:qQfY3SQ?q;Kn4p\VcKa\'\c>=l5&NtG/ZcK?G$b>7b%Ub+bU',`M'@^IrhBp5+38m'SB2]Fk&^?.jVVLZ7eqs
-%YI)$&U\/2g>@6rBX=s6up#QU"F*OqnH&<2HS/ZG`UPp(1dKLl@$2b*!*%Rnu)KF'\3k6&2/Whs8r6d7OK&eG+`h7Km$p"D:nm%e*
-%K?iG4/)@rcEa3$O.bb,r;S-=83eR#`B/V&js*ddnB03-lJn`AmH1n\G,*n4ZD5pmG:"B6;TD$]VXgen0q,qN<ND8&liK)[#*]-L"
-%iLakL>)Z$j3Z$_4Om,a/:tlbpmEcX@gZmc5n"+_--P;c[k?)R+;!uoIbj&U.mc]s[^jrg:oQfof*o_Q)Is@cdB7TU!GActh=<-_(
-%&]&[VX=ec*$?a-Ne%1_T6l.IKM1,uUjCeVk0EMFSR"IhjFo_q$E$c[L+M(Ho'ep<qq0;&pk%Y*V5,`1Y_8)I?Mj+1HA3`eKb-D.k
-%AF4hZOWRH\B,ho.7']c!p&QI:<!4:k&u.%1=E3-@@0p[GpUZE9;548I*sMrrO:SAMVT*Tb^i;PS+08BD`EZA<Wk/Qk:iX_"$Oo*C
-%Cj*^trCuTCCB>.FqeQTTZXc#lkb]UI_0/-GW`%s=VNU!JqZn_&eU0':C@2Sg.4^-sND-!I6"(FDSF*-S[)6e/@rcWmilm!jV%62)
-%YHTh(nG=HCp+?p\4uR<"*a.amPkqUI>%6o1O5pR*OoY6l@9[:#DIF[B&g1:e?9[!fBD]1ZPuV2X.W@#gga/p5PC?9&:'][7`%NVi
-%0@HJ@gB6s+qB$`lp-I<hOoKmd_\]T&.6A@(X(LB-m1Ofs\t5UOS]VRHq#k%iN(VD1UMN5V)f`Gc8TWcA^fQ*P3<%r9Q$^Oq<AgmR
-%\4Ta*?_o,/V[N!l8QGJSciGY^`n>`/1bdKQBW@.1#P=g*!=RQ^i#$_cE)=i96B5)]fFrJrG*EYU-OCGr''issNpl%KY(jgO0*:8G
-%KoXZ,@r94"YVMFXk"uW:_l]f[lFkR$[I*aP""m8`JIBN9RTIo.9V+SNblMqoBXq>c2U5q4\QbZu_T[?@X6"YK/S-:S/3q5[@Ehts
-%@"+TjQ_fqLD<+cTAq>m8dk)Hp"=6!Z7Aa8H,(Og$]1l2h=p01"eq">]Y4lB?\.Ei#ip[\<S7L;1hqX'^9s^1V^tN#tPo"<ImKDLO
-%<Fq]=4>\X2&[/gH3ppT2a;;3aB@3:2/R(VjG9fj(E9Gh0LBZmc6B>O%:/),K1`3<&\FDnAY2a\G;2i($E\T-QOGoD!:#0!'VOBO7
-%k4)#422)Q55*A]T<=ZX@3_kn*>]+6&3?8E<K(\p@M=i&m95<s"6n3hmU6B\T3Inc\,cc.k5)N#!c"HNG>Zqe+0>O+qFo9)]`Mb$5
-%rORb;i_g0L7(NA*`MJ"iF>0S^aU2n6@KVMoAahQKG:u/X^1=2?c$`"E'/]8,DWD1I#%Ij'CSRSSD6enCOE<d]<\qeD24DY2R0#R%
-%JMj'&`kU"b%6>tWD-Uokr9_Jc@\?"GN^e$9s-n.:b1uH\C(GBA9p/K9i[SX;H:j8Jcm:KVEK1]SPKb'f&Z+ATf=FJ9ad#SHQ2na9
-%8U3sk&\*rUBBt)O?-<*BXHZ,L%oEo%m-t/4*^PIgOsS2"jW6+iBHJN(j"<gS/dORs4WNCq5abKJ5Eb-8TFFin9E"YeU[MFF/THZ-
-%f,M(M1]]DVDNO$>%Yk&-]Ste=<6Rs?_U93-gVPfu-gs-e0S@-qkEF9/@IGRNH=9-hqW`Df,0;i+?,F9<Nh.Hc-*0<o,,^4\d`FR4
-%VJ#)f"<B-=mN0!$a5CjE"hWf7fU<W4r0M"OrL'ZH6oc"Hi;Id'Wa)!:04%n8)isQb1A@K6e:<]f)]R,h0A_'mTfY,b:8XM1IWION
-%mu"Aos7I>8m:!Wf!$uB)31^bjgSfgp95,X&*XL^AI_UYZk1RH5-`pYY:W1:SfdcJJ/eE.+^:k>B.`W*,JhO<]1m:W`&"UShpY%Z7
-%K#;poWiUf1H/'?AFsJE2*)K&]35X,iWu&SN6iX-(_>YJdf\bBWLH<F)[I-=2cM)Q0c6)P(H)21aa76P=VYC#]S%"pB'pfFc&FNE=
-%LNtrUjeF(-GA^ra`Z1pYm6oT4HOsY1FkGLuHLN,+@WrhFS&3J/#oJWGesulUB^mhp:4d7+C27eiN[JB8@F.)aHah/9V6uW/C-e9p
-%5\Ls^BS=<*.8kI!?aQe/GN]Kf3_h0/$l=ioJa+1Sg\iVkVMu-GY+#d69VUiBh)cI`@@fEb7aqbK33YY.Gqg)6aT91Dj^aE.\DsqE
-%pJE%n76+umEoJ:h9iAc:d1"]fHD3S_2f8g-YCo`_[p5Yl]Wi%Hb;Csa;p`W$$HGC6AqW]2>r^%66o`2'h@$toIr?_Ta;.;H;YS/]
-%IFZQtaR5T4\[blg8oV4AWN^<@:@ZTc3@,uSJ;>Wr$K$ha0:?KU4ANa0P?PF'`qlu4!c.$60FkY($r.q#9]aD\+Rk3BklC%bqFV%!
-%O%^G<aMtCl;W&YQ8n:^J6(0A*OGun8P;+g)_<BK4)*t'eTFEAifIAh$_h[7lABFF><.QgL>o$tf0d@+c+j)ghQsj@`G,eRH^mI+>
-%Q")b6j2r=7+aP<[4JuA7(8\$p5XnN"`_6@6(6/`[<()^r\OpD3+:u@NDdnr-c%IDBBM]!u50cFU#3A1Z9+%!-jLp.[oia9k*9?hq
-%kE,V9`Mrr>UgUaa3B7LqBB[a#q!j!JJIjA<#>u\X"b9U1:h-JB#'L$AlWpcJm?\YCb=,N`<GL\`JZ*?J6S?BL9u,(Jn2Y"-<F5VD
-%KBS0mYMu4t)o\3iOQ,d186uH&ZH!;FH/?XCghn%>:IE'@QO;fEdp[K[*/`NFfQ*LNY&a:8[S-Z+9t!ZH'kqYnqJDC5/t)gh[96t9
-%p9UX%;dM?"O)V3+G[&YB1G)5m`GQ"j$>`/V[l(,qP%tUc(3mNZbA&ReL0WLLAr5\Hnfcph&'$sh&/]9hL9s??PVC4Pm>6jqE+]kD
-%8.5Xdnk*k2@fK"0jB+asatP7c0OYW31_jUQ7W4\QK=<<"[t-81S)&%olb`iH,t(\X%NF#.aLlj"e1qLRE^!pearQ#ZWo?bYO;nI"
-%XakU)fnpaT9eOngBHqG+F([rJ?&fd07WJR,Xg&.^->Wl5OZ=UFM=1"]hBl@V+?**4,4PpQO+3[M9FY)Ip%uPU6GWtMQtJg+W-"bC
-%>2f2>'-<%<W%(5eg7)\5Ye1SgQ).(N"d>,M*[S-]>3#[F\X)k0BPNB"clY98`Pil7Cr(<e(inioG%rse47T/^V#[56S]@IMbTTH7
-%dpYLjkn<#&<P5XV4?6>o@+e4?n5W@])Vq@W5=,+)#h3I3gPP,HH0C^Y2'aX0!TS,P+&""qRWt,$f\(o^ZZ@]"U^)(:-iheCk1LJ1
-%f/KT8D+'JiIWBOBN@*41DV"k'Bq'(bNAD!Z.*1Ea1qqe&V7:=,PT2XT-WMaRAX36L7R5dp/7*l^X\&.0elu'Pd"Ogsb6.L<"UsN'
-%aM/%[DXPMu;kSYa&77RY8%DR99[mr;>kPd56/S\tYZYZd#\;$,7R.EU;aKmshIl.EMWHW2W"nS0iGB&lCaP;1`hNkpA6>]I=:/?n
-%r(t5m^kqHEPRJD%"o2W,is_H?">dQmZ3l+==eCaH1)."GfY,),(-@k))'i<@KP3!"+Jon+K7"L1n2!Re@(6Ku)78fpDBo7b>;O8s
-%l2]87QKpODY\&^rS8u"19.R+7j<,'JciQ\K%UC6rQ+TPf$oG9$P5E8$,T8'93eEK.>Q>6.P'E^\OF_?<SXFS]/n'loi:0RDnu3jt
-%JJq(j7`>MqGh"gFS:FM9"f$[44[80el\1<uMp>!*X$sd?Y0Ru3eVBZl,:,9L^qd*Y$/&f2P!%X1M'/3Y.5i_]=<a$=[[7,rD!&Z'
-%pt-.F_6c%0?u?DUn*ROm8Lh?i=:c%H,AXGp9UcI7TfS8L>-iJRLQk+D_<h94Xmiko3<UeTj*E+ON!s6\AaQ>7NO^1&D=`C7,T1un
-%i_%,0(]sRE0Wp3cg$3cA[Kh]:O@2QsQI+PZ/t35U;29mcCkZ0#R-H(E"AVr#\nP(f*N'jq`Q`#I-IFc7!fUds`?*q3MmFQ4W48#]
-%=JQ<Ge0jIchPJn\n^2uc@:KE)]8??o1qc-l<=kiu3p&m[1,--[@OfoA]qBJL7WO2\2.=!P,B[6O(pFjOX3C@[K0WI_;ApGkm;d$s
-%MK3C8.^6K7'c/0Pj(4HD#sNssJ`E@aoNl$*+gho5-<CM*'bR#4)27RQE"et*9H?o;`^r4.2BF&W8VC%$8DoWVX7WOt@$#'@_AuR[
-%<5%MefN:U586]g!c!BJI+jk7HU1B<CRFULJ/W;/oA)bAZ(`auI&6:lsD$*GifS;hdY>MB?Rd"!IaWlCKH)dqJ,%_(F=,Ls-M.<EP
-%1N<l>D6D]O6"HGA>kGCMUN-U-JRESo^pXEp-4+?!#PiYPB'St,mnFqYW559HFC(Gr)j>kA=G4JaTost4N&!7MM9q2=6P_FM9*"bD
-%U<1Agiu+*LT&6hU1Fjsr&H=$n2n8,i(1G:YkNg8?H\5VN"J)5uJo+UW1+$"P\d@X%<UF3G<#HS9VMGB9%^'aXN#,n(^>M;[(*WoM
-%<-+Z_2SW2i"It.=R6Sn8,'EV-]U^Yq+;/lDL8l!"0&362!nA]?!Z:r6=UcA!e0bZgijiO=OEP)q&dI6f+'LQL;K"rETKE(938^ad
-%6NOr(/;$eeod4Vu6*(8U-0^4Pq44*g\lHXLWgkao4J;jr_]$=Ygn]h#G]b7!)[XRm5H\I>,A]a"IkJRVTQ'NFP+SDdp"0uj<SE%9
-%TE5@;k>]T/<QcX4Mr+M(W$:_ICp4-e1Z^k_NeJo9Mh#<'FDag!jM85q9hDCJ#fS'He2-GP_D$9Bjnu\hGJ\YiDlFFX'4XMs')sWh
-%B%d'_cPM`mBZ>"mmKL=AEjEV+!nI4si#Tcmnoh"p2g8#Oc-kDf#cp]MX3Y\$1:hiXS(8t5XX[+UV^*udLs-$"m4<X&ZpkI7G8g[.
-%"L3;Q%F9\Vj=$i0-aaT?QXu)D<*n3J.b#&tbD@='f-X,H)12\`PHGI,/SGnGkTnqu+]*9%o"[QY-@n4g&9(Tc"=)Hi_#iJ=Gu,I1
-%&JF+0Mf<Sh(+44o$t5Om>BD*q709o11L'<e>R`2M'%"pc/(,YB(6\NPG_@]HgJjtPdi^G8kEbBq06&KbCXVD!gl99b2lRY>%3?'T
-%2<`7p[gik^bRdF,,=V=X==)PW5sU<Lj@b\[mNBt58VT;cOWV'*`W>:/T`%LPj6d('G,7b.Z$6i-PNp4EE2<K;.%mMl!Bh8X3LalL
-%R>iJ>eQIoR3A>[@atSKUUDCmW[RjU:iF:0pN<PQ+P5]QV/5c^rdX96@%N/9j"f:LpSs6'%2(Y#/iE]1O"Osgo4gShZ7)0bW5op%&
-%(eH-['U@"=YP4u$%nfrDPC1^noU&;2+OW=$=c-;@q'-cV/<Ygg%G7LPr,@;!,;^t;^$bS[gFD6_<4/D6D=')X6bnNn'rqSC6E9%<
-%6AhN?M!H>M8V-SO6`AsO[1IZZ76/q$$q<0BF<>Qo_a]:lKk;(i6u>MGhOn2nKS<^ZRk3WJ$"jT;n68I6;f08I<RI,kaQ'V`*5nhO
-%V<X7h>qjU%\e08<3\ns[1aHY/bg$MsHO=dELV-Aug$.)6/4n*T!<-XPQ5dL=:9cWPY`u=>*DDMe<;E!-ffJW"?Dnd$1n]5r.S5mk
-%MWuE[/O7K$o"i\_q+dM?2+]1uQt/U+MP9BF-rfEj\I.:H>b/WsrJ4C0#rqs^5.<Fd"S!s0U2i;HpfEZ>O@BqDW"eEDXBA(`m[K.X
-%V#c1V*OtIL@TOk;]qMTJ.FH&paU'p5SN&,nK.FdcL:@t<#78A+C4/6kn"!Op1"AS`U2FpiG>4;2e[``4hCh@k4OdeOKr,C[ofF%!
-%mQq[gQ(D.B:=mbVCat.JZ+iA.>r7/PfN??_LUT<GkF&H(I:>A?Y[Rt5RZMkbNYG3&!]aut.AE8t&'eE#(rHH3(bet7%C@b`\jg^0
-%#&dY,_qe<]K]_A^b!f;'>"kT&-\V=!P>D>s'5W1ME`&`.T8_>'eT&,uE)f%a;NdjdY_B7G@%1"Yf4[K01^#@>X_Q6`\W(R2P/!&*
-%M6r0IS4Y_]IPg0X)^iUB?&:7T1MdOc6mgh9O;[D?_Te1phT6b;9NfU1F4AGc0eE:_NN,%-&cqJIp(`Md+<Vj\%@\g>14uuT-oY'.
-%-Ppc,i>31#b$"R&,+n"`[TPgROZA.da>sBLlj1[Lk>AC<!ZOS(JuI3QT`$HXgl&QKAl2O)jm)2O1Z]XO"Z%lLMGZ]WP6sDPcOsM>
-%hiQqUWi4@EW;nVDXG.QsD/+]W\Zct5J22VB6^I?eRe8NLD1.=jXaB#HU\X,HX'Xn-`L-aTKVPK=;A+0T;]"s2UB5[j:"As9`DuLV
-%73[gXCt`#rV0t%#fE`[k7&kN%hj+I;QX]&hZRYT2NjAD2l4_7<,E^,XhT5ahWWG'gb>6"e]lRig^d_5d>L=U:A]G?5UMLj[J[7*r
-%="f[1GoVK$9iU%9XNs'j"[8DUifeo$V^<Y@Y_j^)@d44ZW`UC.*@sAn;fTpkc.[aj.jh8J.L43PiDqKl!jUW@r,*;7E.QhHF:&tF
-%Idd\*Yd!8ZLrE:0TeEaNRuM/Dl2la^`[LTi05m%X>asI=-;8)#pJ*#B'[4J%$]Uq&.EX,./I@`3;Bs1m!X97h'7]HQ!?.BPeYXdc
-%0\a,-.S,D,R'&;t\*n/HQ3JeqO\>ukC;sAqocj`Ui>Kmg>BR)5WN6KTDCMi^-F"O-![j9HPb<:)2<&$=5FDjWG.^/.2f$iJ=IQ?Z
-%\OYU:fKta=k"RXA%<QC;BFkS8huU-;UJRFk(mAaG3r`iEg6n\"U?DQ_:-]T(EfPO)b!\2U&s8?eJ`';pMPS<f/YFEk(W9#*`!OPf
-%f3@SJ.0f7#;@b`0B'=P\o$ST#9EJV/O6C4X)h69qVEr=p"R?u.b3T+?`Eg8FO>9ej3/e^00^KTJTN5p2U.Ji/lq+`f@1]GjUeO0;
-%-_)1iC"'5;!96mJXSTg%C?PPK!Ml'.B@[Q"7C!_?SeJGb[[KWW+uiL\[(E5d;f&^V!PqmIR<?Qd$p+slk65R#%Ga0)PhM6GkQFLH
-%EF:!nH*QjFhFA:0"X\0)'JLOm8ghmN&&eHVdr(OYN:@KpC%?9T4ld4A_Lc(G!/<]H>*p\/K33J1j4Y1Q$OjT\KU")\4=$=]l;:S4
-%(7At#,p-[FpadXl`)_\)+HKMkQ;*k:`N&IH)g]\P$5L-I(KhX+CLS#YCf>e=0k4s%i-8:iDO+##AdX*YLP1A'-I"4od;.AV/j^%H
-%.'biM-Dr)-BGfZFc13nnSKT\`CpN@BL`S-_$F[&BSti$-06!CLg]XP.QjDXt/IRTm6,D^S8h6nlYp;JGX#B0Oq\R&Z`62[i_%IM*
-%QZ4h7[?<#Hn7gZ7.UfN,V@"0*WWYD&?i!7ND>+*u#2bDF9aYft_-J>@Pf/Xf^<i;OaE[pH2,1o,#S,b24AA`+!'$bgf;97RZp9H:
-%JH,g_&DDD7]FW),A2ek\_I=d^Z[(U)KEkE,JO"5Y<H<e$3\*5[$!HJmRFgWnL*[HsPq6gTX.ko;fN]=MEb!T=iXKbb.G?Y!GZ1LI
-%-:J'kBG'",#X3h_25CKpHc&,<jH-7=dE=3DVq"hRD<LsWQ<dZKLiT<4!g9gm!C/j"Q+G5.B]!>>HDNTDe0?4A/<<MUCaQq)2,-RH
-%)E?>**$*Oe0'-Z353F'dX:dbIkLm_/+^f'<bF5O5j(:0nJ`\3QI->K*0P)/qG@)QpF-K4.#R+U.T+h%P)0qFES5Ql#d`A%\jkOrN
-%CDXsM`Eei87u(`b7)P7Y(3%T)dY(*P:mkQ6LnGItLHt_iQ$5G<4Y6s&.7fD:L;.UG=]i![oUN%8ql-N[X-f_/=Sc@^6=aJcTh8sm
-%-k7/Nqi><2LI0q[BG,4?qN,8]p-ttr/768ZWO#V:Q9[hBOoms)^<J:Li_.gB2dce6`s;Ys')W<]c/9]fQ=s/@TL`:PM"VmGAPI7L
-%41OLu,G6WJg,_0t?buRs(Q30i!A,nt!["ub&qj;;X*B?i+lK1:%Qt"nmB%s4`e'GF2mYGD='%`r(quD4<u"`N35*Fk8_Z9[YqrGZ
-%hNJEoYh3)XT`Cke-C`[7FX`H>!q2(['`cQS9hEEmfuUM&E1r@7Km*j^/CHVIK;0`0%@e.QkF"p!0IOjeF24Gb!bU__ke`rbdE2NE
-%aK@P!Un$]sfMj0r23Xkqm__<8:45ikGJoS5%,`mh0JN%t'"J=OZReDcc?'5/0%uR>n:6&Uc,D,fRr&O13f6?"]_H]dSKGhMQRT?R
-%,,CD4b._*d?tu"MAi"s)h;r6,$N_XmCs@jc!Ep+.R"0"O_c0em(MP,ObnVb:n)';Ko8kIin45T$7Xu:hl,pM4aFupa49W4E`)Td3
-%^f(3%90nk/HO+"uh64E`AjP5'gGrRL(MM850im&/GAT=hU2HjJgss[.WJ8:nM3Ga=.-Z3)mT^mSS(5(Uaqb?'XCsR[jHT\=0ng@#
-%g$q7Ml]aN=5-QI`22Xm??H@:\"=D5*ONs_2#`G4pO<OPtA;!Z<(.CD<*7XbLU,j-d+Hfbo%1(-j!Z0#pZn\:oWFg.KGj!(.ml3$i
-%JZr]2/'k;"*0J=nF:LW]\N>pC_JFTV^hZW%:t1tLaT/_.B%\`V[T7)sJJb5oo!KrVB4!\(8gXu.6(%up2Mp7cq\$q65hRop;<P7J
-%ZnW$8GdnfE*/Xg)a'tO3$uM0WNQPrq=S8!Cbk@RH4uo>m8HW7lr#.LQ?P9aI?D[I[`,9!Hln$2CrO9hSR6+'mPP.h,JcdT-O$B1^
-%Mc_tX7^#-AP*gnVag=l[!,<FL(BH.LC`,)C9aB,\E`FCK@lIioPQ8BhhkF`!d6(NOZ";+'9dYEmNG)*QN^]M^)mqk%QL!<_.O%k!
-%$,XQAh,tQI"t!e:O$KRD/?:cF\BYP]^@B^("@fWtUH)/[U0;3kYdqnA(.I.$0?8&XSJ4D]1e8Ak\(VA0hG>er%,gJJ$fk2`pb$+"
-%i9U17AdtsE+VANfg5\d'P,bf:!32,_X+\9.F^gI$U8Hi.^!%tR*ISc(RN3J^T[\U@\,aL6::ZXZ>bR&"nTL2'lKQ;&h#JThif[Eb
-%U$>MC_?Xgh(T6cs>QodX^QQ7.oghc6Q@O&7Ltl.7;Pk?5fnk9e0tCDk<[DIK,Ik!gKiB[#CmBNJ>;'k;Fb$40,;)T5S(:/tOGTYt
-%>$XID^oY[OfpEph@d<7tgf_d;<NQ?l+&1E')\;"0BtY%=qUmFV."kLW]5_)P!b%-d)7L)Kbb+G-gFaZdYQTY/BGL/%,Wm3J]u`_>
-%!'F5W,j^X7:+qnU63o9tJpr^$W'5L9kl=1D2#?D)&[Hp`Y`cuT7Wl8UMY+[bY;crcI[&muXQPZJ\0^gao^3uleASj1+h>KY,KB@N
-%LJ$NGL)P29ZMVaX!J\Z^#"+cL=K/l&7u'm&O+b:MV:f?W7L&]Kq7U3LEg&`hmdc#71s#.m^oBgb^]S;%!pne0RPU2/o1FkJQW`ul
-%TK2tNVC$JejA=BRA*J3XYOLGiak<4ah619h&:&S(!(is^St0]C7=`fi?r1a7`GVp-&+al;efgn>$%U/mWu&.^X8jS!Z1:P!"q2Ob
-%09RBI_mFN6G2IK3Grgo7"l40po[Bif.u#JgS#M*ii-5lZDlhN.VrWK>A:II39Nf58/r_E8Y:6(*VUkETG,N6J(L@XG1,e8Oi]gcR
-%hNM&J>)FqC6-LC8r$)W/@U:+,Xbqmrmpq*QR"ZR2FQBS_&e1U.Q3Aami7!5`24L%g)N!I"oJkP<L4KVP23E_!Z.X[0$]XdnW*Sq4
-%2mU.269`=1MTUZ+TTgC3((6BRdL/T(qcX!@$L0a',q1m-XX"+eM8\:hVHUA9*i:'D9:B07D@mXN2'`^g,"4>O'I8nPi79sg30%r/
-%0VEX[:a4s!.cRX6T*OVVpB'Mm8StH&FW>$SGn=7ISK'B>5qCLd4:&X?/5?C=I<R&g@FEdiFJYGU4N,JRT?O:j(q1Y&=R6\>Hiirb
-%U-SdL,[=C:`CWGn@">9)/!m+UHMt&bJg!FKQlXgi?6#Pto<PTNiAuF\c]EYs`sBU7a>XA^m,%+9"%5.sl<WWm+Lu3f3CJLu,A;0@
-%DNhE22eeN`OVB:SE&8VjN=<Y.Q<cJlquh-kCK(ahq03W*e7M,Rr<No*!dAD1FYk0lRrjiTp!@KS$.QJM3e.nFnQRG"Y"knQW+so%
-%c&MXk?Nn_]*UjP3S6_GRVG1VuoIEJR.hW0s78*K28a^0A1qI7$1<[gd#$I=8!"g$%>%QW/l6RGdAp7qrS1H<V^N`l&$Bq2`a$ign
-%WK[ibbin=+&KEM]5.Ua.Z,o6Z,\cJ=q:)`oOTVfl0qhU(f-<r`:m7ifrB(i)IZ@>`5RLtTFd=oK/;o3"(/5YNIp*<d?\^A?"FHi,
-%XXko%M>)$Op=Uih@gA44Cg\49FL!/d>RO^kU;TXY,\g.2Cbb]i_d7-Q;<;(m2_t,a`;jobV%O:l`m@r,f&i^L,s&gceOn=>m@`90
-%Me,_)+*X2A'hh$%4TVBXfcWGJJKsZh"Dpp>OR?\4!qnH[T;*L5`WPC>,gg`hoRRJ&LBV!\V)27N!NkNl"YLZf<)1>Ii_@6io]eE[
-%ZHHVoN(c@2-EiuI/S?T4:_.[u2bDtn(@]4n82gopSR??lKnpZnHW7l&[TgjmgV85@""8gBUacPZQF2Etj;)UhqUm]#!N*r6*US`:
-%n[qN@k:EHJ@,dX_a'`_Jf1G.4><g[UO43t*gO%E33fYFjpq%aF+3kZm:_>$VCKL0gjoYqC^)B?S8)fKh47@h(!fod/Yj_^e2"Ii"
-%4-q=q])*Id&Kt"E8>:o.F`qVmQ'KOV1J(<M[uba&X=,%3OQML;>i:`%=)JA*FgQqK;8Y-JTFHa+,`B4H^qq/opK7:Q/q@*2WupTl
-%,lA2Cr.=B2@7%DqI/2HGlD],rG0bk$%$m^jC6TT@bCU6/`aD]cn77<_]`C]/MRB0H&#_1,'`"h,#/ef].JT3?Y,I;,*[@*c('95n
-%_%%sBPSocCqE4sH%ZOM$b=aV:",3lq[&_=(+VO.>e-=H%'+PbqDi)brTltPq7gZI5@B(]:LahBm(Cpuq+"G`WOV9Q-imD1".`8eo
-%6lh<H%_'b-:.A!B_.]#9Q3/CQ]o"eF=X9F9aAtK_N#.:0;jEA"^+Ro65J1`@E,pdu"G76d8(KaRWdVNdYf)c>"6"?S>s1!`ajU1=
-%Pt'AjJo_-Q?)7>V)s6o!HQM&u5qXX!;ACPm:V'%nc3dc=&uAbB;F@(\hDWI$U@J/W%P'`E6<pr_=B[b',MX,T#TW-.K<VHNc:([n
-%ZDhl`E'4VDMA:\qGo2ZoQpem]T,O@jGgR"c8BW:ET\hS%\5Q\8N8<21B@O2m<G-)4.Q2lTGHG_Gf"@1R</`/CeGRH2K@as',_SE,
-%c+?#)FcE]slsg&segTdJL5k3q%V[d`<J-RrTP0HTMdFY(7>DDDn$N>nj+;poNe2G)G<f3=1H4Yg<6^$uA$Se=Y1/D^/!uB9;X"bJ
-%*#6ZB)>m:J&Z.UQ$1lJe2s!`*+0H+C=qHGl1b74Eeq73'OW[sV!PGHdJRtbt^Aj(;;-"BoCa_6\]sm$K98LsA3d01"(W#\>QEOYq
-%Cmr^32e*I`^g>*Z;^#36`$)OoLk6hhL8C#jTt\t:(!ko^FY+N.+GHHMR5.a$!Gn@&m4lc\NemI"JdSdU==JDIZn=>U1Q,t7pOV]G
-%3P8f4e*7F1*Qojd2n`Big3OfQH[qXREpD&UgG(GhLm&[m#-/A*!#'qq_8er$]DRPG3V5jO_*Hd<-4JR9oa":l<F?e)FF-r$JLFTg
-%1R6&<XS(*GH))or?PSeLI?U=anR5uQO24VV6*fZ24hR`$jFLdD+RG\\O7p4R0u8OiO@giFl]qRGm-DJA!l>GW1deZ[K#M3EB1,d>
-%>9<os#g!3`LanbsNaT&M5$n[rK!V,)<spj#V(aYeepqN]V!nZJ5iDQB2BrH<[W<b\&]VOG/Y8I5;cEtE**`/F-4QmZN7H]p83GBT
-%d*AULJUpg/P9'<W4:Lpp<C**.LTG+"EB2+FM[.YR(sYT9Z)Br5hMR[pKK,\kn6l&F_Z2s)DOQhZ7#=D4&pXH]9j"3ESJ$_'CMJ5s
-%CLn#`^t;UNACH"3b#\,e3gng'&CVK?n--U7km"-u;aP:iW0K;HXl_n:_4-1^-D]IW"q+BJ`6,K8rHsl#M7]npd;1aTpm.,:N?3Wl
-%!WoG!n,a3ge`*oqp96bJM8(r+@QkUQZ+Fl`5_TR]cWVlMQVk!Zd,'D$f&/WQUA47HH<_#&X%Y@"^H&b.99u#T_IqW)PWe=5-W,D7
-%;599IJ;'pB,2foFOb1+>Ne='MXBofcbE`0#0Kl0sl">WpMrqYq@a;]'XMd7],\$sHYTAt\ZK#DH5fa.B&Z$mdH[ag-aLa(Za31<t
-%TUa9J#")E>;KYsAE8CVeRCsJ1N3OZ0m;*3l:bR!uSR'$a;@ZFC0\0,[P]i'@?'19Rr!H&t5pdhn@KK^%Tri>!SjP13d"@Nch9+:;
-%Sbb17Go'60b[lD<?kd%=3AjYYV=K27F[<.kjL<li=!W&k3hidOM:d]06klk-otgQ?^9d@8B1^oU*]?d-$@1^]WUka\.$J3@3uYS5
-%@nT(1c"8-n`on=-7^`,!7+l"[a6='XRXpKmm-qTe-d=*-')KQRk2mA:6Of]HV^,BI]sGKr,"CWnqKB1m#1u/E]>S)b)U?:p\d+eD
-%Z?RMInLRi#3)E)17,r\?JHCg%Ia^FPfV7@q8HlBEe\N4LMLdu(@DHl7]WnYag:1QY.aB_jfQ'Z`<>[YV7q%u"#;r*H5,q$_3;Xhm
-%P^X:?_?7"W8;%io*J@2:q'k,I!u7L[8P7)f!Fdg-M;j9*jBK4mU2SWK?uT;&C1hGF7+pA"Ca`%a,.e$&>W?o:+i$Nk(E==qDoE&e
-%l(dnZ+^$63aAQM-?9l-.9L5u>+XGSI#,=`-$>aB\DUqr[LZ#C]TlhZ)k?-uC%HrnhZ,43V$ZLV%M_15@$CClNJQ,fo[[#dX!B\F.
-%$SEW64WrC$[?nuaPl\o`F-/',fUrGdU'["\f:nTEJ<r7]g&b+imK^YNRicF^a"D2Ud,`&;ea@icR[uHkhJ0*7$a*9AaFa,:;j<RK
-%:8"$d"ehF`Js0X!K>Vk.d>I4*UU@s9*39RtCM;2?R.^OU*23S_#s^\9%06@;id>uT);qtUf&c&%kh`fZS`1raBe@G&8+!4"fu<[/
-%55HcZo+J'7*,BfdZE:<1b`;.W7?IaDMof\o6%^.YUM0;GhcZ<?'Xa]>F00!@fKKD2OpA!jDC"<Nkk.I1B+$b>K$IcB!tb5K3Z"9T
-%^8&$R'^VT=I,<Q+]]8COhS*$]6U2d_A+Qf\H7LH.@JnbD_UD#%\DHp.&873P@skbX6L.",<R35Qb"8u*R56o#I(!Z=[qu7D#3S,)
-%O5H`SE<[1A\V;P$j8>3%]^]h*q?k.&hsTlYo8Lsp,,aI62&H/R"=Gm/kSq4Rddb(hmbW%rn)DO4b<kaX/IKH-@hR^^p1\Uob2;Xu
-%P3("L.&aqAG>i.WVZ2k5KF9ojb#'=*qX^0[B6*meZ*L,8Kn+ODP-UfI._R#NSC0>Bb.U1na$N&"Kh\Fu<)cGVUtdn$f]=&u+k/?Z
-%N"$XYr$>L6((U'jPaX$5%<0u9au#;#%tN-p8Ch^&NUA#g$;j5$kq\9T`u1%.mO[TL^O3bL1jbZgJ_3d68KfoYA0Y"][ip!ZK6T&S
-%-1SdH[3YC*nJ,h.Lro?%ANu#1YpW^n)pMG0@!+k=T]KhDeR0t=!B="ngs:3i(7Wm885Q<ao"62&W$5GAR7NPFKp9GaMpT[?0^VFM
-%KPW;-7H<'@P#s<J=TPQOLq8VaB"#Z-=I]fZLPr:lqF"[b)>=dnqFl5X]Wp9]b`'?;cOY8L2jMe'<ucB^oc%6FPt!\'F3+IUXD"dt
-%=Euth-,W7h?c`oM0GLVWP7T;iS$"nrnWq:p9QQM"2"X)g(;pa,c]mNQiofF$NR5Y)7#BM<HK:-17*8i#/X3)V,P=AJbJaTf[EJKm
-%A;ZXo#p#nC3^m+8l?W$N6cNS`Ho5Oa0O;"IVPuEb$iul8'k/hHN=<U`_?b2Z8COVd!BceNc6e(*K)d7]0*H5N!UOG#GVB/g9E5_U
-%K*pO&<t,4U^a]d?J0A)8anf;\/Ynaq!F20O&K6!.g?=9IieL`/o;?)Q8BWdi$o/:LA?CUehF4eQd2c[DTmoc0rK>MJi`n%>/l)8o
-%gICd8-+5&0C'*&4"E64!*"R5:GXo,Tm>-G^TE;V8.Dnj`E)Zk.9`QOS^qg.mkl`]nha@GX_Bf>(2$"\c!4FK)WF&@")nkp$^)@:8
-%?,Y6QNt@9;/gA9Ag@N8dn4kH98(JZ';tV*=Nk$IH'>Ujd[(QHWo\'Fe1''Ko!LujakEu;k+FmB(^srQAb;Vrord"<R_^sN(E]_8h
-%qbIB7,NdAVE)m!UFZi=M6@rs?6\\0H!]ZSJ%OQ^C)Q5tY*ad0[$/i9nlA,@">ZIVLPA;nP5:),6<d">#PZ\Hq]f=Y11-Kd"lY';1
-%>u)2i3Jr,`Lf;q7OGI\prI'sb%opk&Es(KT:M8\:_DkhM=Qm@D,a@"cZF,I1e+]-j'8?5'H=t(S1\3FnQH>F1'ogmcYg?L/>r+9'
-%8#^?e>G[9hclkDRC3Qu3B*<D<I?2@4D/60uQ$Ot.b]BKoBj#GSP%%'!%@gSGVZXoA3jtE/P@hM[7@D0Y>4l/fZP>l6U5p@_`M#&e
-%6r!qX6UX5NUr!Nr,iltu1'KflYutKkF=)UI/0+geq'*gLD"JX`PGQphc66S7*&c#-CD_E5)TOJJ\d09m%SKLL(li2<IJ-:oS?E\<
-%S;`*0";l;B"h[^,.Z(DU6#gG!<?GLgc+N?Kd:sBFOW2lhN:*f/.LEJto7%]B)gL,+s&#7<"o>(L;9c)YM-dh+6q8r9-:0MnU9<70
-%8Df2V?RtI[dC$naYp)(n[6U#qYsX=!UI7gL+3&s8XB?tjK"Dp%[K8a9a^uGJ\_?Uo5c5%OQM;'"?5$=[6?lm+dcrM/"!\br*Slju
-%Xs/R#h&D)L+<_pWS(aUFa/WY3qC%.j-6%3;E.0G>-P:VU%!G)C4=EWd.<:%R/bTtaFW59K7mr3'[eXft=L$2m+a,$h!d[:@6_nab
-%Qt%9`=EZP-%$(`]b$JM,$&<q(oIQWJdU?H)#k"L1NP6XaEZ'$AX`u\AX%67&4:3(l+ZO01.3VT&1^$mKOE4g:KIe`Qb"!;)-e8OM
-%Cuu]Ok*KDP1:uQ/#1ij<ad/k3/Ql!gG>=%7Ll;UR,C]hVq_\dl7&1FB2=$.(;^GLYLb5pL1)gG#fn)2d0WGIM?FXOns+/"4UT0rD
-%d&WAS[&DmPN#9Y#Cj_e`%iOJ$!qcjFGV%3U[<?j2ZlZb[jZ\!EOk4,W>#0:l\0GV-&=\Jc9/C(^frFXo)!R&tWuW.ZD-j>3citYc
-%b+PREKW%F3>j4pK.)H7SJ)X9VGaP?uZ7*Lk)imbk&/*Pa'`u85C8(X_$E$'CGLkWI_,,&e4,gG\DMq/W!PAifT,J+6(st51HUaMX
-%EEN"Tm^(6l".bEeMOAY/!=3G6%BYMh5^*f7[jid*a:`3]l62bNI"B,Ar$9a9!9s2B.b4sZ&J58ka5UhiA,!DVO?))nD8uZWH8S<S
-%Lmin**h!PlBmE6siT?V-'V@K+\jSF*=%FP^9#/_=7.p2G5mu.A>-b7I9IHTb&o(!#1oH2)2C,p8?*NQ%m=cHmc$9ZSRSZ%l3OY-K
-%<9$Td2uA2E\sV4TkZ>].d[Vp?kGs+t8h6RZa1l#p6`&sZ0h>`-Msf"g]QUt='XM[qF@Bmd3[J)h]&Z3j4^7aQN]B][Y;k:qSWMc%
-%8IsJU>:FVkFOb,/0Jf/tg-*]i@d1k3Uug;@Ki-^F*`mn#=fh8Kr*>50TuVd3B!JGECf-4=LE.6)BIQ@+B[m1CXW9dV[>8tI[Mk=Z
-%l5^9HIR+soY_rU8!W'8?<O?8:[^[6-%;l/Dl(B0m3k,2N3s-cg(Q5L5b82']co?(W#r/4c@PCB<&rE"\#hCtWOm6'XW?@d_"65+e
-%)f*eX?FOtih>#X$QY-:gA5X!W9(W<PVWq0JEmY<J>+/I'f$cWb9t35E5:O]%<6UbP5Y5g5e:sp6@nBY=U<O.p"tN6d<uPo@(7;9U
-%d>qZi!St\-YU^$E(11t3IS*Y0BnCt,JJ-AhnSF9p4h66s"j)QDU6[m2]r3i:rGE0=TC!r;D:]&0BGiPqFF',Se:@/[+\%*$*\p&1
-%kJT??pkW+f))^!oYl!K;b0JDd)*mN%q,W!9SFC"%)&h#mT_:?k=7GFh@L+;F$&2*\]J3X#2WYote/)2GD4.C+:,cdV48PJj;%"o'
-%WrOS[UqN4Af"cB.iq/t6OP[gFf*DC_,DOLAYC&+D=g\hC\?H+'2Ko7D<c]W*3SDG40FULI++`;&kA^W;%8/'X!okV4]BZW>OFF,[
-%8o&&QUrd"Y)/.XrdrW%e)X;dui$:s,:0^JsD;/Te%jtbAQ@C5Mek*;YbE20$_UV%a6<4N\HNp94oFZ,nEk-4g*;7>;HO_Cj?ik*4
-%3^aAfgSeSm*^hs"@(34J:,o5ESDcWrW[E_8O7-Bn9fXFVd#AoUjB;'?if5kRX@g:b,@]jRUcbedVEhD6UPm^*q%ul\kZgk$?-$tD
-%(*faR.0Fufi!go5LI*ddn9+kB9SJ^8p+.<Q6-1%SanHgd!sGmHbpQCfq:kQ*[!=0d9O,Q0910mbY6K"!,%9GpN)ElsL;t]$1.s%Y
-%*e=bdpKN?I)BsQ.R(>ZFJ@i$[F.9OM+Q[G]@UG>,lZ9F;jG_1T,s0.T1,T>0]]r24JuSlg8"^5%Jn7^,)dM`f%hW)#CXKql9/(Wu
-%']kBH*iIB3A[;W;P4d."?G(o%_]_B.R=+_q4=7WXrfUF@M$OD.2;tldTW6Jmi;+/RVILrdcsH'@F2?bNnMDZ1`W4t[Clag"?rht4
-%AtK]tWjh1XJ@aUP/=7#.8Kt,F($655CTF,n@7$PAXgr!7@D[\rM-Bg7RY4g^&3DO.Ju+6rG7tZ$Tfkr\[uT.&C*lB?_62*VZrcP[
-%GgLIO7lD;In8)+j8hb%.QMAar>ru:u=QrEI)_Ch]Pt%%_r_ImQVJ<5ZeX@!Xb@/A<QQmtOQ>:'T2PFur6ik+Y+Z"B2WgbKn%ljpf
-%>c&F8!ntMZdoP0Z36m@#[&2N5q<,&H93:E_$+cX!>el\%=!<1aWl'U/2`.!].tG&I6H3JT>2KqUXaRKQ:hqtth&K)mF:T;7^d</5
-%6B_RYo399kS\<<4WlUC3)4RA?%Tl:YRE:&A<9mELMF),E$Kse?e*r8OCL48D<<NsY22d:.+GTjSbS!E[]KS4`Yg'WK'rC5ig\OB5
-%,'F_X;5.TfcNYb)'psbYd2#d<2EA_`dgZX%g,K@;#U`GM$nbXlR$lM5[-OK.;LkQchGu@CFdZ3AE2/)MTf;5%f\Eqf,MoO+Dt/3Z
-%)R5(&-UiE@`S!t50QZcq@u'C=FVk]=0Q<,K,pl,W0-S)liq:d0BIuA>&l]u%e)MU>&lutk+S=%i+)6riL+Gn*ohJG38=RH<64]N$
-%/mZhnr_Ok%<Vrd/TYWfB?/S`Zf8XB/04o,[bVEqc.f'UL5i2qi[39k!8WTM*,js;2m/L>:ZF^'YP)`R;G7o+g$Y`JF`^Z,F3]B)t
-%b^mJoZiLnJ>h,Z%@Z=ikDai(;NCDUU/C7'@NJAW5c,;4j_`e<JAZbS)"5QfG6nMSU=_K&6c/5]rNV%V'&L:4'.;_IkYj3_tBc:nZ
-%PV&YUR_l,N%"^sP>,ENJ'EJr#FjP^t'cS`!@?"/7KW6N$X),#E>'caj0;H.D*8oNEfpuC4@o.If`59"CT\V:=Emi=RX@7EH!?IaB
-%cLcLfLc$IT8St_A#E#iTFG3X24Na-EL^Cm!I'5L4#Cnlq_\j\n+5h%eYR0Us#pUt]2-<\2P)kR'-!":*<ZYJi8[1LVg%uYabkRn<
-%S!0n?0pZQ7m)Q6dX._,4SR"%[lUt"63Z6PuRS_Rfk[Y^@KiBI'Zp39^B?+)u[_JOm`EH\;$Q9Xi^tJ8#W&Rl^K_>rjXo?9#;h9>W
-%`6Q5@A_7.*G\E2?"=L1(j!`f9&7O*-]CVF7>bbs=1Bq89+9F?m^_04KLh;[l$GRcXY+Vp#:8B!U%ATr:M[r&\)5=9*Y*h(>',lL4
-%DX((P6oChQf:"cDUFMjTL;BlqAJ'XpclP-OK"R1PD*XX-#)m7hZu\CBO&`5fjuGne'mUq5n$[>iHk4o'5iak]H:AL!%=NfA"#8ML
-%Q*CqYJ_!8\LoAio7"H4!@VTLOYI?`r#3K\#d:j.j(.H4+MiO=8/h/*GJ)gAHau+l_*<S\pOAgjhenY^f!b^hlQWl+(Y2W'VaQT5(
-%'GZ=r^aX-tUkqbW`^;gV^%hK$Z'Jms5"Na/Au#$m2-/h,Lgk%&&6g6(niK>RS./Vo.#I-l'5]IH%GNp8:AT>VU0R\=2V":Q;@!\P
-%@iUZ'@C_.3T"QhCDPcO^Bm\5n-/eWHXWE7_S"d9AC8GLnm>\9@D\fZo,ASQ5&jM6D:p2`bm:\u_MQt-u<HNp'Xs=kn7'8NZ7^]V/
-%P7b&86T"-eBXUK1r(XUBZm/N!Kn6hWgG0m*8.o_5T$U6Z!GM./W\A.jjL3eMQH_nG\NSLg_m3+c]#'R+5*1lc0t#r"(UoY@`CE5$
-%@":+d/P@uNReIIXY=a>"8.,kD9\rC7dYkI8cE)1O=('7FCH3jsT'2CjlGTr\OK;B/QZ5:hHB4L!g"\N&65*]b&JZP6pKiQD9agV,
-%Lp+`PY)/'>ZopiL>m#[DkX'$>H1Rd8NCBO>0Lt`0<pU,#p?2O2$A8du!GP@L[B58NkR&HL774"56YpD<(5N*!G;+VQ(e@XcWYu9$
-%6*j8IU,\&%c=3P1dC"/C_-u)H3(/BYWGVAQOa*UUJ4[1$251)7<2L?JKmD>=ZTU/M/ao.qCi0Gu,-"Z]`9jE1P3Gq3,*7hD0utCX
-%4_8'm8h>d%mSk(VT$kq2=C`'SU6a@$Mj`gQ'ESA(O)gTqap/R8A*KPje5MTE*T27<#Yes/mQA9"5iJ4?HUNkT:/9JXd<:b?%jRf)
-%0,&IoFE%XC<L[kYJEFo<Fq2BD7tr+`M.rZCNe0tq4cP*F4Ndi^IU'X0"?MoR_MC1"QJM%h1&JY;W!0i4Yp)XpHnhi_%ZrEK7#i!$
-%:cA_s&(RJ73!8@VT0!T<24S["<*ST2+$GlN`Va6pUNu(-QF!:_&XgFMO/ut=>'n-iTV!JPRZ^g$7]fdppds7]n;E8]Lqgo8W*Wu.
-%%hZce"eh/egBtaAQ`XIf<Al8c`MIH<'l0+.MAGh9N1/o<]*#fMI+4jN?_#Ro9\TcRTAse\4JROe(,BFKW/`jla0YM_-%Q:iaeBtg
-%lC=UYU395IcEg:QfBjl:2FCad>08cTDmLT\g./V(@'cYb_*#q#+o;=(c:S8tjSYd][@@%T&E]1A+P'b5BI+%lKg"aHNPcSr)WSCf
-%i5/'Bl`Saf-uq09EOO;lTIWm`<^Qs9,\"n:f>[f$mb-!6VkpQ=m\"->LPFbtT6NR0]Z[QY`suqt``ep*A"1^"bC83rDU2?kH1>V$
-%7mjFYVm)o^"h0kJ<=l_KmaP>nHj@W3b7PXCOf0i#$(`4oC(LH8S'o+c+K>jjd%&eIE!Qs(3WS,IZ/]CL9m/CG*G-$i0H5M>HhJOR
-%2d+Bc*]5HX7\lk@0trX;>O',sI:l8FW?$n&pL393iij`2YdVN=&Y!;ljJXf]ZV?V-Zn`FYrRYKk-DSA%^E[C0e/-M5"4'T`[A!6+
-%1F>BM>n?dNa7R\9FsiHq#jJEo'bP;hY8K!q>VYRCOg7%&FYIEMm1mLh)m!Lc:KG)"'I/EQ5e3am=#jFf3b\sh[IP',QfFGObI&rl
-%i,"\sj;lXulkDJ26tfTdBbLoEd3>kr4+u]5?S7.R"F?3jUI6nc`<^r*oiCEcKJeSK6SlCf3L#Q+cr<SrL<AA^UTU3HBp=7.Att7j
-%3d!8QjG='Y'DjP@"F:[):bPtWr?BIAMN1.GZItM<`I:\Em(*penP98H['A8^(cb3$-6H?=0ECHm%$Y7u)rnqJE;&6Y/#q?3lBI9;
-%CF`[t.7TG;2_6n0-d4HJPaq*VXF-i>MQMQq[@goj3mm.H!:9B/?u-0.BV@@QQQT1dC!g\g6$)HCcp1kioI@,\TqP&!NU3<O"_cEu
-%O[VEg#Zj,Yb/>nQ$miiE'M5\`1\bO57HJTZ=Rh<cXes,ccJ8&;L:9p4,)u@N^sYp_Id'FCoZV]9fdcnRS;+$]$"3m'`(VK\On,V6
-%P]f(2,4cYJ?4Xk?BmJE5A*J%*s-16H1DudYp8hs#ASN1W?!2/if+YCS&5?af/n0XB=d&._o$Nn"UHdJMAX@&Hr$V.4jbDOV%i"do
-%>0^A2,9qVc\4sh$==!>!&<El(9j]0G@%",4T.(@(XeVi8:,t9gI&e79NTD`.0FEc0&:K+C*P4'2*r2?ppD*b8*qI^=-1D22J69+&
-%BeNu-0i^p9jgu3>!$0qHLDcTT>+U]oFL5BYm8PlEBu8Ubk\@1JQ5l6m%M,+#)W])O$95P!V>EYE-B&guPZ3E=Y*&?3[5b)HLl#SW
-%<"=?:@Qf6%,t]Y@&CmgHj)jG*8QrB$(_j$54_kSo(sR\g&n%B2QENSBh^TOB<I.r,N(UTC""W`LRU$1VRS*lNI_K:D]]4C@Q?egu
-%,S;LG.C!PH$Ud;+8$-kP2)_./%+%"XW(Gg1mmUdl/sOc7,7e?joW6tg8/3@AabpnaqFE!b"`\HWD'$CDF\>@#FgkW(g'<J;B?^k;
-%!>cJ/&X?*<_0\t6-mOD.X<5Y6qW5n+.I3Pg`4dEerZjN=BlBCNK-YFe;9m1_RF]ADcTjCIR9W,-!sMguTKmBc$K[oq(X(q\c`Ld_
-%NF<Z)cYIYY1c,Ef(5^@:q,"LH0c9S,jUok`[_9C#,8,pt8`\aVB3JhKa$^TTGHQuImo-+tn6Gi`Y"*.8+e@4[WYr@JX%Ykp%<P=2
-%X"J`\bn\p/C<aI@_@tofLc1oCN!#qld;Acf$[bd8Cs`=FBCtKDQW^E"[!IX`#\u19aU+[SV;&<k_%=2A`:e!c,aC+Y8rLN!#b<-`
-%[/j$$'lW>>VPiuO$ts/LhBd5^`;t"0;Jm+,^i>O>TM91+6<VSij.KgH=jSe.Xi:lG"%tNX]dRFeY1iIsFMpIQ@S`1,BZe=![R+<0
-%!kS02]!b1Hi&b#HgUP>2eLb;N[tWljk_7kK%_Mt+&Q+F+&hu7bJ_/>Y?sn=[:$AW@Y)4X8YGV"I-A`9kgoUmheI,@q&SH7_BCiHf
-%)a:F9b_'eBdU&hq<U,q0\)Q&_^c):24_+cqDkEeQAUIKk6PbFd*9kX,k%^YQ=382*!B,:"1[(NXi-e<4"Js%i3-A;5J4.o.lm,#"
-%%ul4hfgK;=%[f53n)98]&l@+19KY-47sXRiZ4/-H7^33!MnLaK>jOa,W;_gHThAF2=lXK?<4L<*SBjAJPFc$m\Um#$EI\scJ[@9*
-%1D*.MoqGEPOsLZhhCgQr'fT1rZOo^,(fE@+Kt`_)Ks/Z9qlaX%kC%&d"QDqo`<8ZE#1F!_W6>$s?!gPaU#/g*A#0H2Ss*Fo,&#M/
-%M:$@1RPC9kkW))i//Bq+,2u,.UsY*/pr+u&]"RCn$r*EG)%lJWaZOU-,GHO@7<.7p*]ipij*d,"i)<j60h;nU,2+i"?46#"edIM(
-%-roT?'<\.6'1<7T,2d%T31t47(b8IX2Z(VbM)h#)N@$#\(q>^ReeD8oZU)eq/CsZ6I;bY#//M,D?a&.1m9tQOmc4PD*>cG'eO:nl
-%,[#646s$i*)4-l'5[su%,q&@Vn5H\lUgsQG%K;&@$_A>N6#"dn2KHsQ;/8=G&]/g"UFE/uZ9%q$\$5)n#:DDX!iM:l1a7+N?jua^
-%hN,N.[1aWf%r)='Go'ZE1)Q`bXIU1r3!979#$BpPFe]-9/c4*;o0AQ3LbRQrqPB^q&b:\]Sj3]/(1XV>-`ug[#eX"@+1&O3$8]VN
-%KW:;7):>1@8`L)F(5q8/F3A5h%[AKSS1%j.OWf<K:'@;kEMA(.!#Z#1*X)G_kS[[L/c1rj;QB;EV6;\=O^8]*n6,=48)iV%G4G%U
-%Rn\JA_'Ys?_5+<(],_YG)I8o1J[GeBr%YCo9W;'Q\m]6T.68s(c*H"gDE3&!;1iNEWc`7N(?\+LPEK]L<s0@TN78XWVu71$q:'%1
-%j(6btOtB7B@D(i+1APen6]HQNG1TD@-?4g)B\puL*m-?oOKK@o9iRQuMWI7Na(aV#[[!r*msahD(ZL1[+Lb@@Do0Iq@)@_#>J)AS
-%e2_&-0md<T6j"VCYf0$_6V0\Z0<'Be&0.\fmb#H)7)V"&<].uBb#rF:;/d)brf^EkQ&$@L&4bs+o.J6*LZX=_L)nq$#p!gq`$F"$
-%1cLS$2?]"Bhls5])d]G$cbuCGHdZLIGQJLKAeP]R^+:o7UW%frA42>I-+`71k2sT$iO%R:c%PLV=:`GrR^+k^4Fa'-+2'@4]FWCY
-%JBV-UU68a.Yn8:ndGqYi.QT=,8Y_&Q;P&#ahq1E$>&'Au.9g(_^1R"?-i%)RAE)<2buP#eGDK;-GNaY`6:?PTeSeGM1t(\%`1U5h
-%9N9'L+=ck((pq;mRF'[kDd^kaFhopP]WQ6<:r?JW2+o!O&;L7L`Fu_N,-*jta@Ff9I9t/C+^3S8!LH;1<OY*l?Z`[]UJ,d)lYJQu
-%KX.J1bZ_G7cOf#g+u8ZY-N-LUAt>>=":G?0H^&Ns3^[%B;'(:YbuEfd.N\_DD5aR;XgAFPF3@>bE2+[EE$Ul2[)g89d*C!7TD)Bm
-%3#`bKPl]7Aj(ok\_/.%D-5d'5k+gd&OfuU;#XG7BXc5Ce14H-A!%&ScA;o)?NSnXq3>:,B>M*4/OMPGRi1ES^JOW(M'sB2G1&t>a
-%T8kg/.8%XD?!sV59&7=FA8/[pr&bfoAKVpieSg+H]uHbnLLb1oBK[&\<83pYZI0k-+60#^RmbjF5p@(lIAk%G-^k'!(t>.?kGpdK
-%Af,BSLqkELJa(`!oVOBGcnOiaX5f2d"PV'Tf[B*0+TN"7M@knM[#DiH[3AKRkXJp:A6j0uBGWaV6FgkWg(=jH9EPt,"uFhilW>2\
-%3=M3:8RHI*9l#9Kd.\Rn4P"'Dc5X6'[on%\AV:ged*30=G.>2VjX.PePr[BKLh^q7,[po[E3\"=0X!c\Z;\P]6!lB=NAa"%9Lg4Q
-%/g)K_f."9i>HU#/m26KA&T_F9)oUE-c(VC?I?ah)kttB.@d12q@nX]`\nTa>q$?W?El2l1R<-r;!#Hd[mQbt4M%0#V,J8].7R]-L
-%,!u9q)urGXlEU%a6R`6BTpg,4l0,J,8Qu*U<m>G%"urO&.Ns&nX4c%5gd0Apo^V;FHdg7DL9;,pJM[hq)n$kH"NE>^!Y/bH,_&6C
-%OMVm(BAS1kE30HL@J5L_;[3U@;^7/MKnp2lQD9h1VX'.oM^,*^-H-'XLE`#5FYJ`*M2%9]`Ju6i,9!XQ9:h2s?!i`V/l_LhEsB0T
-%k_pq@9quRA5]Puf]?S8M=L-+XhY?c&@kE)4J^ET@i90b6iEW#tJZb)2(!)8#;WbsBbS(RB;ak^q%e2Zc^PY$-M5W[Eo]8(EohD8Q
-%#4FUS%$hnY#EpQ25+'B%r\EdW#79h^)&pMQYnfbG3:A^R'7`tX@$CpBmgYARoKYXT3EHPqG.b:dpgV=JhV0DVq@IP=""7U)$jeE0
-%VdcQk,G'_fc',3SWloVYg>>PZZ'a.!/sT90?;M&^-r8^J\SIfG7Vu/N<=A<e>5k?:%ZCrBjJ^LaV+Z)HEc.CXO%t?aKU'q;XBiT\
-%hYQ>2:Rbbe`IdKZY/8PYZ9:;@oQc1KD9J-*WnnIUV=p4(X`D=+kiY>QNNn40&[CG\FZX7&d;?J>1Q>.%bqKf"_B7#J0I*l'_Dn=;
-%OjY33&`'e8%"*&!d.HLu(!_-KG4HZe7?eFV8)hp4$=&L)-T]&uESSeU3\;$#3iT`d4g+nB[EHh_=HHs8^c:;rkdFb9<UFRYG9WsY
-%EI?WCV:.mUC:@e0JiR1$QV<J]hb2%,jToI=Q?B)P[d74nMi*XZ3)V&SY0lqA?H)fAh,'32._#)AK&)GoG5r<j.QF,7YCjla+@F4"
-%IK[4d3"tG2b\7oF#0'MM`;mXbrl^$Wq7I$X]HWrL!;Ba'gF0d09-"R[]%O2T+$)r:fY;afF(_c&!'XoBFA]u?J/o]*!sj<IL8I]?
-%jo^2HMBWnaYgg3=&Q?;RNtrb(";^qAoIBVn*)^5N##/Y1o/nJ9N=J0KK9<(OG)>@O[e1!pYa'G/a!c3Yk<%n\pL2r_OlI4'Z0L^l
-%rjuEBd7hGX6G1Tfd%g@=UK(eH@b+M0BQids?f1#d[."7<oLIC6abih5UHu'3!G'T#e6!k$X2NgFfac)I=H10]P^n'K/7j_'W>'Y!
-%P]piH:9iE=MLM'M!7n$>N:*b0c5hL&'3<0_Mr#"W7uK9`?MZnP[*Z3c%X!&]ZTEJHpKb6:A"C,5krkm_:/+\2)On%\@,L3KK"O8q
-%5eM)e(,XoH*hc=sf0iI[$BtO_Vs#%LEl\/7)Z)=f]8Xaan_\IL(fXblje,bnBP>ktq6cmMH3U"+0cP[ckqj/e[%*b+7ng6L[*)J`
-%f;"]iNO'fAdBTS5^VhCbL89)elTNm'Ck9^LKd=lORl!inPm[h<.DCr_&X^8lbcE5O_2YN)`9>-<!M]\`0Vd`-.p^O@7LAHr7K\Eg
-%o`M:rL^U3EoF92gn>h8!#ouT7<5<."<<YE,i7Q-u1LN@O;kqI=U]-%rE,18sZ)aUJ0kB\!qk]V!B\"4^WK5<j*:2B?>"CjMbI.^q
-%gQTSn#V0RBpK!)^fcT=e,=Ft/l/6p0UuDh<WpR2*Oi6%?is?K16QeBV!"kpT:/'-]<%gM3*R)ffaKJe[;n$fn%N&]Im07=*MGr8j
-%%+*Yq]E/OjCg,/$Vm:,PFQZIN8C=#A6jf/a'3"4:lH=U&F3G2$XXmX4A_B3\X&sk+4-"*FQpI'T1b@%)H9T<)P%17Re:d.0hBe4'
-%#I:OhRN\"!p%j&1:D?HL"?M.p>Oa[&XrPeJ%V!YUQC:I@IYgF25WT4FOQas&!-FILpDX"gqq0@S[VJBk#:7"oF+O->/CeXo("h<#
-%9Ko+bWqMWZhmKLPbF$@kaQPV5B0##!#05WXM+s$7iA*fk9cJ-:[*)'@75p\Mn,SXq*;!:(_H6V6ZR@EJTP,\W^&G.bF3!/.'p3Bm
-%b\h*J1\rd`$Vn*oZi0Oa;crYK[IX_6_DTCKSqF1+2P:FT'1Ah8QF[2^7EtG/6Nsp>=*nBr6pn*(r3%07M0#+ds/VU2H*Z(1[3].f
-%/NWP43mi6bAgK6<nIk\cH>h0i'LAP;SMrAd7fV$)=Mg%<Oe7Eei7*o2$rG6YCtE(fA:0&:Kc!Z-?Ng3/]hU@"B#Ids_J7(6FdMHN
-%^ckLOP`oV.#Jg=b"!C+W2@<*1e<F72TKNkrAu&sfFMX^LG>9id3./(a/MDCckNK8gEMVODQnV$$O7u]9`>^XFMg/6B1#O"</Yg-2
-%P1i&;;:'X:"lliNRWWr'R`XWuZ9i\_kT!7"H]W7"_ia%+h:bg"NItH8AVGH2lp5^sOS8atTQb*)"`N$#jR7-G4sk:\"SIg!o7abP
-%hulEM!VNk_e.Jej$7/Af`CMB9#ko6fZt:;f@uWi?2`hZPW(2L1.u((mXkX5;F_&D<pqp]O*<[OXBo(B5&N`)jDfp)6@L"T#0#knQ
-%dBSlUZEUmq-B5;>D8WA@V9Ee"&T0.oMc*.u1lQF]WcpWD:us)ka_"`Akir_N'4I_qYh#+;WoGoG@NOqV#L-p61XdA]haaZA@gj'7
-%]I9MaRB*\e:T4C@og!>>lDpf*I>0mi0,$2%#5:l7FcDGk=#/g;U*Z.'Cf!T&7?7eQ.Qe)C#/)o92?(l+jIB)l<jM2J=;p"iVocq*
-%JU(4c[2RBlRFrk4PIP9s1D-H+2DnNo6^eBhI\N[mXe&9:(`6aW#p?f'eIYSsQ&+X`Z".gIB8s0rOeX'D[Y<`+[GLV7/H:T[m=8&$
-%];b1RX]"Oc:gE(dO'a5S`eF^<-4s6Wk^"jGNRFK']n%u`g+)0$)%CVV2RZT9+C]0DVA\2->ec?@gYq_.Tq`irI^DAbfuJoerRFEp
-%3Rf10dS'lVJEA'A?T$G<8(7ZW2Wqpk)[@l-1uleooplCL!*395RFq0YUs;Z8)]O0o1EjU&M/5$k/:=#25Qp`'Bb1fGj12YiX$3"(
-%ieJFRUuAjhL;fJrqtu^S-I@1`r+T>EOk?ZCY7h1`8*bS6/RQ#TP77iLh&nfmXHQ1BHX8Em5prC*GA`7375.oNP%mV?oP2N;8n]^2
-%Mgc#'jTndG<9o(@PeV)K?&&QC.O3eQW*L%"KlKqaD82RqJaNUlp-c%$6qF]1Q.OIimkB?(UI)4imjug1M(.%9A-46Z:c]V):D/8^
-%k]mR"CR:dhrbQh-h>qnaLa<s:@hQ,HPK"d"<AJgZ!!Ilk>KkT[6YP_O*c2Jke'kU.HTMXWC)[c]2L&FY_1"f,q-l-Th:TB6NF#h^
-%P':1iB#eGh;:o%7brMN:[_E3Q_di:C-Eg[Pitl&CCcbdo>h]KA[RecmNbs^(ZN7Or=U/@:bZPA4ke!$R&Jg;`&(C'?Ysf4ujt/Z`
-%?8hGI9.s`:6uV>u,`U+=>cQ%VNJUuDYsu.FL64<MWtV37<n$tnWlGKbc:U"(bnEd_cW29q'Dbk5%a@eKq']B$aAnKr0R4emh"1u%
-%.6BS&q`gI+MSala'I)TWAb!q^#DA`7BALQC+<0UMcuL76FrlK"/7#m7-n^&jQEFMDaK-#ANAIdt,&/6\Za,BT*)*2Om7O%U%73J%
-%Eq5&ZS>ASa7P72K%V!JWeK%e]\et+CPuW0OZtZok_nFdqlImGnl>KEJ)Uam=^K515@`Qn<cZW%*W^>!e^d">&>;9r,W58m4.l8%n
-%%T;mGh'Bp/>gsU+8/W]JTP4Ot/4RR0.i>11#uSrP71):!".TTbW^n3Lh;`YcP_4gkYr\^"gcdH9#-uX^RpCV)Sj4o[6+T#iX<Tt=
-%?\Wjh.RSZ"#Lj#dqq*)2S-L&\-XDnX;:8RMa5*8FI=eZ/14R5.[6,XF<C1+>E`Q&!Lne5\SCOi/j!.c&FTm^ecl(52!&ng*0epqd
-%H_\HW'<rGBSX#WH?&8!=O/>0c4)O?WN]CC)W^P?HA2G6rCZs6j;/>/'>sLnm?\WfakA9+ff6K%[N?3uGk"QMhf(9C5o6DDEL90Ms
-%qWnI%R*?sMP\>*XCJNh:<mJ82(sT<P/QJm4#7]X]`)4tMb4u'.7NMQq!lL7<AtD$1`8oQ)$$sT;=cVE6:a3En%:V)T4\q@q+i6cJ
-%,n?Y(f!pGa!HlON;@FG4`^/*,`4[/oeLD)hZ5*!SW2Q:E)Hs\PW2VZ^qNoXS2,g'VgLbh'[0!mR3!tn",DVMie6$279LI*Ap%'fs
-%#cHY>N49]lGK_KA8eRbLST9N[9m3tW!U=9tRS,JkQVDmo!j,!n?j0Y]M5e)>PC]bGE<Lf@1j>fQ(h+[>OT2sF52=!6YYnhKLZf5%
-%!T@CULc'N"=1@#KF)Z`Q8ToAYL%QF['_nZ-LT9.SI9VujF2cX>0g(M%e^jr5&Q'C#76H1Ol*i#ebdD(U[o3KW-q-%Tj,,SVOj5r1
-%]@LtpR\l'c71PSd)I*A]T?Y8_dLP#R6?7Em'A.Cb]$oj\,-$Od%hpaZceP0'gX2FsRh'2[*Lt)B\R]D,*AO;F/r7ZD-"8m@c9"b<
-%C@@4,3)eIdh(E!?qk5rB:1C26MELOs`j,,T\<``Kc(-R$Mg>K=6MqH`F[Z!g?BF@_715d@Fp$90TL..-aX%$6o*sa$aJdpFM[.X/
-%M4d8+C,;DX$_caQ!)c'W#Yc]kU&qI)_HWfm\RA"S&h47]UI^]61ulr=Sbm'>fd8YG?K"<`>].'AA#I\]h8u1V6K_1%TF76"%1[;e
-%BC+$7%nB=#p8XkNVV9Fh^D==u>XW]=nf#o14NE&]4YtZB>m!e[R'E0;l@>1pVemfiJdGVZ[-_"#6H.%]@LN.*dH;GTQ5X];>HXet
-%HARJUU+4Ilg1=>[(X:Oj`E07&eY_=8b1&i_S77+/%bO<X>HP2i>pi&89mrY%2UPg%D:,+9*OXj^kX*=BBE>N"(LmiIZ-;re5cID@
-%KG>[\VeJ;Q'6$Ks3.\q#?":2$C;5?[`e8"`#%s??Tj?l6)8:_<S"tdn*paeeNGEg18tYi#8g]K07sKO:Ec2rUVjhZCO:@9C(nq1.
-%>OUhfcCS\FHkp?'8quGlm4cPRiAfR44rOhK)>rg1fJcZ",d]_c+K+b@L`@FMSA:d`O89&$dX=BcLW4?H'qs#dULPX&FY,O/CooVD
-%*>$EGBbGd-5`36Y"e8!lj'L`p"pdU:&oaMT`Z!l,3sU(*Zl#8dZUKtP*:QkZe[js`0GoJNe2+eTFjQWE/lHuY&AcD#Tb7Ce#b<1g
-%Z)CTiLd6PEU#"g9%go=n/4;=Zkom-B3B)fI^Pq,+Q)I1fakHfi<]_J!T5cRS#Pa0j?j:;8'qpSB*BLcc-;raNHOpWW;s4F[*?"q'
-%N/_`Z7u4=6OmYk]#1=A@X,VoI9AQ"]l%RDZF;dgW[>./;0$;1$6Bd6cL)"&*q)#fd9W)Y5Q6stK=ddBHBKdd+>(*"'0u!u7lh6sW
-%?nSbB%f6#WNc;Q4K5_t</TaI&@C`)c`)V1D#3q)N1.P#;&RdGcLjFCK>N5]E"Xn##gELAHP+@D'-QT=r!7A,Q:D1WtBUY.7#"D#*
-%?Ks_kARiu:-"9D12V010M0?$%-WfL[//eXu:`JS;h$6=okf@pdcrK,G(2]:&Oia_[D\+tA,giZiH#"L^5]:%-Z:C9oKB)>E`$(f0
-%f^m)P345lE'Hh]`\614<\d-0bB!F$eXlXYVH)4(I+FI$6GTM#DHkK+/Qmp9fAYKC@l61'dL,C5!%u,nVO8p!uSV[j6\fKs%DT/\Z
-%"ro5ZH;#j&=Mfqe(N+&S%O=-$)Ceu*ahs5*qLpDMQ)i2_a_rA<W9d41F5r'4+P##coW4DnX-J!?3WuiOAEWF@P=^TSXW5SK@s.Cs
-%gpH,a_(V@g<Qkdk5m9A?.'`)@[B(II+0Fd2\uhUG,QYI!f>11UoE^dU_WY0A2%mHhS)1>Amt1)W>e'B&BNE9G=FJq:71ueX/iW6:
-%hm?\r]_1R[C*q=ZdbV>\9U`Y%WVaDnaR]/IQ8MI6(CjS'-gZ70:Ra@$6\Q"X654Qp"]W>0I"sNjLQ^Ld=1L6k:R?,]<,tUTC=.&@
-%`W6_&4FA^Z8,-):5]lJrU3!4#3jHTB>hNT<i3rLPOMO*7Bk>$NGo&qkHRClo]9c*`ba^u^$?o5Y1>u\)1;;"SY/Mm&P?:n2I_L#4
-%ISp;"b.);C:;>`,oB.]GTR0kBe/6Y8e:`C"Q:arYKGn<.2:S\X\*6knId?\G''0E\N##Dcd\QP-9LMhOAg%bWG+:*_S@GRT^I;>M
-%>.1WLf6W^"@tQu%ie]_pYsj2e3;6/aG@5tY*Fa4kdja6r^utt1NX<Eda_s?.6CLKhXqkGEI&DS)^`>k3+<F*W3%[M+^1g\c<AhRE
-%dc$'dj?*N,N(=\FrBu_R=eHA>iT1S=d'aGS4E*J]jhr+L59U9A&Oa,1MKhGSq.--/FAoN]H(?&"k&3.0)MQtdqUauNKJ4S]3R^4M
-%)+&c=:a3b3dsu*;6si]Uc"$"b0=&(83@t6&HBnth@bq$^EDgU'l?F*^Dc-DMW<MS\jOf/!PQotuCMhQ2V/?1V0'lcD4:DTq@Z)1+
-%Q':DM"uTL0Ikc%V,%AR(8F\tu[Zr",8jZIaE%Hg"Nl&;)NJ#0G'2llt6MC[(@73W^N($YY$jtQ%;:>[+d6'BV2WU-sKB[&LoENE0
-%&u'[lHXcCT-bG0s.d7<pQ7R(5k73!kZ6h>3FR".Wk;CGp+'R6Q2FKp.@5ap&Xd"-@$oEsJRp^;i&#CRnAAB-nUKA>>B;HmsA-6$f
-%/O6.JaB"T"I)QjUP^t^tV4e=E)4P_T[p(4=Y/%$9btRMG#QFkKUX+[d3N6h8^,%Jgl.L88:T[s!U?ih3ea]WP_C'VM<YJ>p(X<uH
-%.L[RQLG$G.)28E[[k-g:&-`]ggGXEGd?D/FYhI'f,4#ae"D)&SSZ^Gj3%3r6iT*Ui=F(Z]Rsjg4!B!ZE:!!@/G\EV0!5oSZ7*c_B
-%)(el-!c)]r(((\?K/O)8#$&>''LeS^72\<QL!H#?U@_iYlh2[nqRs`,FO%,r>#p&Q[rt70i.0F,p^R7CDqs.JE:_'+mX6edlgGmC
-%>eg3s`O!Td0<_!43PN&W?<u@`J>nU=?_:ZKl1b5<io9`\qeT1p]_@!34M(:'bBoI(+ZU3CHr%\1S,W+G'CED+g3g4%YQ&d8B2b9Q
-%53(MM"OQX1Y`Jtb_nkp@5X/H!")7%dMpV7cUN_)<VY>R$F`#PkVQ1Aqf+.Gfl+W6<'[Sn_QuAqdT@"aDr:-,#+8BOqIMrN&Yh%'C
-%>h+Go8[=J1ltWRObr].tdV9RF:ieR1AfMc4^ZEI&JFuP43aA"<g'q_)l1Hn>X>LS1XMcuPoT7'tU=^X<=5>%1Lf'g;M9FIp21i/]
-%++/3LHB=jl)1XGY-pBN9:QB$ZlZ\<i"BZOC]m=jq4e<^r17OIi#kU5^m[[V&^VLP_6C*7S,MA4jN4MW8=QQ:':`aY1k1&ZG3ecA3
-%WoM9b64*T7nu,BI`^3R/7KG+eQrLjnOMi\rIL[(DTH"7%%%k\LCOcO.7N`YcJ!Ya%3$]2UO$9@Qd0eagrHn"/RcS;DR_iemj<SVS
-%:b7=N+)&@]<$f@ID,FJ6a#1IDa7.1A<8Gnn#`bjLSLfOZ)`U2CSO3KF:9\fG`dEj]646fJ=r6$4;7BmQ0F+kb"4mT()G0uX:YNUQ
-%>N?WU=8%%r&"SVZE0i%!,l%AgSkO\a_.`,$A`-s@XLh&7U$g-7/`Ys>+eU)'SXaMj3G>W.k<'"TqJ)jS(BZILK:Hk["!jrP+>NpF
-%:q`_Y+P*#\VuZ@J+=g1gZFUZP5GAc=#EbOp0ZipO%'qcI/sdt`.$VuV<R6jp_XX%\]u9-WnQ%eLZ`-]q#'3`$V'N`Q0h3fu^uc,U
-%4+3"fk0M1]I[#e-"Z?l_&MA"@+FkiX`(?'Cn>SB'O*'*SXIdcO<7Wpp.q!W+m=i-:7_.dK)HL7=Ugt.SOX7[+$$0FV`>m]"1DP\Z
-%ls+PG$`;6RGN&1Oa?:ZQC=0^tdGkBU#_*1cdgdY%aJjI`#PR`1o7P$e;5Nd);BsU^O1tK$`"51F>dFplW>Ubsa;2mo*#os0"G/s@
-%F_0K-eVYN&[#?s2/,g5MBdK<?TZ5FEB3Kbe#W2q\<GU,?\cspPY]5Q,!p+6-RH.q]\LZAo8a90-L8)&fVtf#&5nX/=oTd>(lE0=H
-%=\h]QJ?i;+pG_T$M[DMD9MSX++aL>sW^*Wu>WgE?7644K6A$/MAm9]ll)AtL4dL.Ic6L%9]'="i;/Ri\6)\?t.`1\FF*Z!oFOeA@
-%1,t7kZ:)urm%r4%VfFe<\7D[0N]e't*G#k/Qa;@rmlV!X;bu<8A#EgX'"2n<VF`piUkHej!i&4J_H(l-3a@8a0dV/4%$$C@Au`pE
-%I#HI#**MG1`F:HuYp?Z/BsFNE9T;97hSa,LYSiN:UlgnbXuFgC]a=as,Ib6\72!Pf+PH%#l7&r]o(&pQ$YG#8g!HaM;IHCFj<SBk
-%lNJ%"U*:\39=,U@R1Rl'fJ&j!9:IF0.4,r2eVOc#]oi0^4hgebiD7l=%Ts)A<6<>6B>9.r`F:3Ie#6NC3lkETm'k=0]sVT\RqhnV
-%au-*=(K$oL-5pTk0@k"OF>?9Njk3#1Pi`ibeYYo:VFn&@^7]SH`'#B:R:%S@kfW3mTApZh#i+>.eOl_B"8\D2(@U_UTATP%QOb0D
-%h0a<jEcZPPEI@HXk$P!rrUN.iMiKZB\9[lFc.2'tf:2Yu+$VeHH$TDBjioNfrG_@TCAA,26XE$SfTW=.AK!aTPWf1LJu9V/0u1$h
-%[sRunRF/PrlSLi,1$kSERT8,+=trVET?3]$iA\79Xg]*P73o=:-H:a!(FK8M?*H=Ta[Z^oH[@@<]lD^qDeq&9Mk@Fnff*kS9SYH$
-%#9jM4Z1gW2NhVm.#NCZg37VIQ0Z_$_(58J_8"2k5+>+P*gn"bBK#BW?!/%*XFj@!!!,/4e9#;/C@o/ncMVKoh[OCLqe>+clHY[kY
-%:$oU(Sr5ujT7`/K2M8,N/=]"`9'R`O=:ltE%>'J]o,>m=]>7U<K^TKtb_S^s7!kB3<SJK*ZZT\2Jp0@HFHaRbC![>0g4t]d(.\_$
-%Y(li?88!--)'#2cEH/,D!V&1db(ph6pUKM*]AEdUk(O8t!21E=2N\H7'Ma17)5H_=Bh)QFfYr,2eNcX-6]fm+SU7"TO7-%XN@%q*
-%lH#<$0N3<GfNSDo1X\:aL.Pm,%rF0)5McgDVFa&X4)OQigUstsmra@S;oJKi`,+?qb26OQ;&@3r^\\%0glu2Upo\e;;qN9@>?V<o
-%mddeq'Fl@b"A"I5RHHi_b$%sp+(5Po(Xnb\$ODH54"f1)`50+48SZg24k,"H17:qXq\YF[2H[FdD"4P.etY:LLNaL/k`mofQ"pE#
-%!YNNhV!F9,lX>)W/M^]&Y^D@/SA+TXF9n(ZT%c^UE`<1&EA1HFYXrjCK[UL:lFNK/Ne@rL+GLFVLtkfu6UX>ROS)pV[To0j_snVq
-%"82@\Hiu5"`YS)@2+8!$WqF:E^4`DHm6G[&@]h`6QQ,2FDH'LnC4T2h\%cY]FGI%L\jqaoT_b#f\\kfKr[r'0EK)5F#5K%oFA8-P
-%GLK9+3qs@DN@hE,kfIV;S-Ce`D7[(uXkAE&`9FS*M09jrFGMO`72Sk*BI2pp;h(ifE#::\)DM`+VcD7<TFn(uPc./k1hBqD86QpZ
-%#18Rf6`>8K>8#/5BeGkqPQ'uO'euLaU=W*)eEhjGqJ8Pm;+IB1rjN=Kq&C;fW5K$r,7B@'T_tPKle)8\ph`3H/d<Qg<^sPdGk@GD
-%-*8XR#5H=jb#lf2d8mJ^GKdn8QLRq0`?E"1R2@=Y;H&,r8r56X#LZRKG+='sSF.3NWa[\`J>J'FV'*_Gc]`0A15JN$'!,I\j?0*%
-%'uS]BNIc@DUL4'-Z)\*@U"`U6YS#ScZF8k^(*S\uTk+]sVI'NG(0aal#W/@2JDOI)*J`+'NPdTN7^!#pQ]Yp=$puA%-C06,]d5/E
-%P;25$I>B0L<affm.(4c?U(`d<R?bYiVf<?q1_[9G/PQ>?^F5nq3l!&ZV'TRS&o;3NN8K-epN.Og$ur2r2pXcd!.dB@!QdBq"E[Ws
-%'$RN6<]=N+T3KMTK$Z9B3GY_80Ec2H?PDS&Xa3Lmdt;Jc'f7e:a#01%B"V\&W7kOR6lM@<qSd>Gh0*]#rR<Xi)BGm7gd^riGfih&
-%m:17;o>C/"gMnCT(ifW^LM3+jqkNN]$q:K#2o@I%QE8O=',7LN<Vi4_$9]<SKed>/%dCjWFciXmJ?^=O,9=]Ud0n;JOJ;$JlTt_6
-%Cp@GiW^8WS0ICLc$\?J*]M%k]LmE&7F\-EaL1R\q1s=F1*>4.DR#OAPB$It3FHJWl;i]^hAu2GlO;>p0##X-/MZdZf^ENr&67enF
-%N`+X3'9/,);%*Y]$J,Go@Su*\.2-o!ldpE?h:2&^J_&mLA)s:Za*\%oJa#!Z=.^rcYlWTmln38`9qaSbLVrA@-T5V\[QBo6dXrRr
-%h)V_<Z[hid(kW&kjDNOJBMB`2J/E\ua8o<F<jQ2V-e/:-2bfXMV$B'tD<LJmp;629B<fYZNlLB:\T@B1gZcXZ*.SHE'/@8DO&3*f
-%CD.".S_/=)Ja+DO2PJZh+N,.ud\fo1a\![p]t._ap,$Kq%a"MR4-usI/>U'@O[Ie(nU[`M)C07(\BK&'Xb;%/\69IS@n0j/2/RMs
-%4\E_mQ>NX!++.;nD4&f(*j?*$(c7^oBI0]VQR!uZ<t0-([(T!b+a.=*bOK#IqOfO`ggtaih`)=1;YlS&*_E)!>!b7(s4G+`[D(,m
-%nY9.ceKEpIM`rhIBXle!Ttttr+$<paV\<,niC,7l7aA$Y;uD[!A+N3*Of4^Bn&YU"]-\I//Y3qL22PU:HCpp2A=2T6i,Hdq-9"6u
-%bXkiU-MXZY)dZPnCAoNZ>d1+:!/G0'25duqY0Jh-o'NcEL/"4=IADp)Wbk^hUQhrqPktRs)i>U]&IkD.r"[2;7@id2XkKTHa;(?@
-%7t^6j0NmcEU(A_">&JDh,qIHr/JhF,bg'<X0$G5VE22#-<^MrYC?QKCdliX]9eruSo1$d/RRoVVSro:59JsYZMC;A@:nI%CDdeT:
-%P<io[4KVmd>7j^1.=0KP[t^>58EsY)F,K\[PCQu][h2@+;G8WfQ_d@FV#`_Xf.UE)`h55TKV2?Q[i/]PLp_lB/>Cm#f?2]jR$FXT
-%m=qHm*R.XL&K17XUTnO<&qW]>:n?mR%#3rFhb&e9rItY\&'=l<)K(4ajdAtMbm4nSG,_a_92QOZ=$!]1io#AtMd)bl:"?$0&N)KW
-%B`u.%XCJ"lcB;m66_k__oET6S>5S\u?ank9F5Qk=G'<&QG0e"sjbQ.!]&k*-^bV:n7]g.=+C/RuZfG&^BAh2>"")cNE3t[jLc,Oa
-%HSiVdWZd<:DTM$))'$"WZ>1A&Q"W);^ijed"/(9PJ_iTuU9;l$Tbmr1cko"[Voh";TLfVO6F5NLYsGB^f@&<074hOJhfFDm=3A?;
-%6i\Pon+B\`9;\D?#<;5bPg5q40Ni@oM>p!(L9:]V_2Q?djJD?Rqkh"DgI@Rl(q@U59G9QoZepaj+LTC`p/Vp1I;O6)qn'9&GV+BA
-%f/%'9*"o+0i/[-i3hF?)GM.QU0%?W+D("9Fl>M=.d.qGjZW*S:k[CP`g4d2-@1iQc)`/W'!0bN_;4P;:BmRgnd7iCFrN3u52dHt"
-%Kr2u6JX?k@E9]n2/c'`O$%X%EoB6@kRtIE4"2]79rPk!E*#j-8HZqi.6'3n#F:;Eug3XiD392dE(?8ZKS-;NVG6)q'aAlE>]<T/-
-%B!285[7omaf=29hEEs%F[[m'#gHqMs5CTkcI($_52D+=fO$D&UFT4"@gH>H6`HJuE*7+X17lHF2BF3m<EYN8Xqh5jqdNjbLk'THB
-%a,nk9Uf()/':u9@(^7(>)EM>3'NO7!iu1"(Ha%?ToKh*-dCks`)I#hYd7Cat#8"9Rf&<cO2rqu%4V,2):9o@/5&]ecNMMa?^b9!-
-%cBiW&*[t/]MB>U?4c:6-.-J%6fUQZ<M68.?a*&:Jc]4qEYfL.t]i?b)CcOXLK57:cTP+S3X'Nnd:lXXa"u'J:"1?cLgJ-=Vm/81j
-%rV;%MO^)1M<PDuA?-[2BFipt27%5q)I*<M\B)QCZ4/-o7Adid"&`o!(KaN`>Zg.^L(670"X.jSQ=l[)^"J)hh\OD/h1Rg-,4gmKK
-%A>R%%1'R9*6<@!.O-Ws*&uY.!.7f;4ao^j5TJ9)4?k.g)8!G(YN&@n"d-SbpBV;K0$Qtmt_Wh8-gGZ3plZ*JW`hpoe7BiY'eb^5B
-%VYrs"*B7ES#J4'd)@Z,b!h>Tm\A5W/AJC;NV=f.<A(ko0*o>Om7.#V$)X-%XOu9[8X"Mis!2B2'3nuZ36gNC-k(0F)%qP79dRb"l
-%W7OaM&k0&4ElWuPUQ1pg9i:Lj&6N3%EtNa'Lc01FiF?V4')`0Z[es:cHideUX/Jut46njeEKJIQY=*eelYG+^%B*dK)Z=MCoqOT/
-%Wgf;Bl%.a-TEXRJ^;Ytc+/5g!8ccbso9.'X,f[_QEc4G6;\4m_o.5oK3\]+6<Y`VWAhcmj1Pds$Y\8-<WOA!qq\ahalVfV+@`d's
-%ail6kh3oo9#h8omdJ!hK=>h\e0"#\Sl89f!0kCW-C7kh@0o<M_4n4;jfsk*\cU@a&YEp&$VFA7ff)<DeV6^6\s5r/CIso]ppJ9(@
-%:4I`hec0G]DC4KEdBh$"[]8&2EdVm)p%E.ll.*--eVC@)j[O]GG^O[XqXrD/Ms$ucg@XXkjk7PrY^(5pq:"$ec0!t:9g@E,4ho;R
-%GXkPWqX*h+D%B1dJ>PJNiO/Q>nG:?rSsg"ic"E@r0:pu\!.H1T$l2Q%5N1_`<l,5]5F\fR:\Z8ZHEjM.gAUj4q"f=.q!@e/[VI5&
-%<fR.*n\qgN[,T]@@/49D3SGPSK3JYc4`14FH$/_+oD-Z$eSQ9jJ,.Xbc/nccM9a_:j/\ZuPI%B6@hNLJ?B?G$4Vg8NIW9N+h<n>8
-%q)WnPI!'J_enm@d5J:m^e@,uq?+\RdWPS9!gUV`]EclYN[X#0lkh?EIF__VqBW#5%Xr^o?DZ=G<K\-4ST2"c%H2b;5DdUUjGYN*9
-%gV1=Hn8/![m.C/5LRSDElmGXbs6/o:J?8JLM28UtkU4,jBN`p8-aVd%hSSP+s.:!ZksQZ3eO)NgLlaQcY+,*f&"F(%^^.Zc%KAqZ
-%gcjr2)?@Lfq$=A-S6JY,I1;;Fne^P>U(c+(n%&2AH)"#.8_ZW_RrUH9D^&UEq>MP8*)']_F]/46fcKbrrTD!NrTAfs6+lO?2=[ES
-%qs3r;D"*GY4MUg?_`!372?UPgJ12U:s6.DX`FS[/HWPu65L_5%APRG7G!Yg*r^'i&P32-.]fc(SGpID%<5QK+)?fMEI+Mj_RGF\3
-%@Y`/YI580/S7G&c$6AI)R4Xo64I,J0ViDi%4U8WIT(7_m:$BSRh43:O`q6F1dk2e>6cLjV_r')_iZ<",:R:rDrGDD'80kNd^AZ4@
-%lOaW=AWL<dOF4[q.t<mk_+D3(b4$'dje^(+lc/_[GGAjUkY*W36KpE<K\*SBr*=4Z^>plC-dOik+;R-SJ49)M>UelJ-*I!M8^SXS
-%)r7RMd/%sDc0ALRgY[YPrpIA4a6rC^An6iUck8*0:e;kDg$LbX1,&'$/`!P(A&WCIY#)a6^E6*-hUMO.<?q$FOE!!Ya`Jc(S%I\l
-%UEO)Cn)Q"0D+MA6\lu>n%Ak(q+5426!r!0#qQ;d<T$&/ca"EQ2\ETW*)AiDm*WHq)kk*a*qKDb$pJ2]<fq_=AZIWuMmgb8L:I!%;
-%jSVSe;l'R\87T="olN.E>Ii$B^R!_Os5!A;gI5K+5.u9([nbY+8l0QrjPA(RU@6r<)ZB<saT'!*\DQF!)<H(knalS$pQN%1mt6CF
-%\[_S*Jq"t#jo%[sVpEEgnF3X1VbH6mLQ>2J:;>UgMhd(Sk:^N!rcEHU)X5"mY&eooOX<Eo:_$3:oD@@)9m;>UDdMtdj5]ISPM%`n
-%QeuUtIjjdsB:iLEA)];R`]fXEkb'i;n+c$'c\UKP+.GK2mX;=Mhm$YfllS.`ZHXJg?ToaKI-3I!0/&p14MBE,K_`N(3T\G.d\OP8
-%Oi90)'5`mrV>$QUgL^!?L6h6p9mLY9!k7tYYJf\Os5't1s7PR+0B^pCcSIY*p$qYXD=7GEp%FI(DD+2%p?W6#S1WuD2LKrVj7iAW
-%8(*BiZ.RsapN<auI-D]%7:2\+R7u&tg$/4iAlCo>`N6AC1(dK!*&a$i=V9R8Im3k#=?V-2hX5saj(s;@H7]f6-$_dI58kuNFC_>e
-%Bm&lb1%09s?[mO]HtB3grqO7_PF(o^q'E@L+23e3s7t"$X3:8#oR0688/.difDGF?FQ8ZK6#1pVIrTFTqI1AS-p#h\\!VjGp>j,h
-%V`/8#%eRDZpt9i=U@2H]r_jSB;Po]Nm"QKP7)F,Z5/2CB##aKAF:Lbg)YrEM6Y0)r*;Cn5qu"XOD`6t7PQ!/aOuk[LIYu[9^X0r[
-%GIH-g80P[)",bMG;?nnr5e)DlqpT5?^P2jRN6VEDM0sDmrHrtjrgZ)8k%Ep,q26cAf!b,BIZaf!aG8#%paUd;OfET5GA,Hnq<l2G
-%q^#["^]j`s&TXoX\N7F<3W&gSOW<ghMtt,c?iT`mla7?]d5V+"q!7lNN&J17M=FDFY,JfGgZrY=/ODZ#lMC)<jiuA*@lhp*q=MVM
-%S9D;'Hdp,hO\_Tt]tODj8>!LmCu6a7`4A^oO8$=fDgnP;rtciA&!*o42P32uIWkPCq]hDV1Z[GY/CAbZ\5*kH5U,2`-sb[[1U\8c
-%5NQ_J(9`5!g28hk:&<?#e]h:=p:oE:C$.VPMqdK6"/EugM%bdQ`NOF&Daa_/f+ItaQ<me@GQqkR@&Y/d(XKUlAX&JhA`o'AZg/Rt
-%CP_#%-_.s>2p.Y`&h+9brPn;SB&3-:\F)Bi='_GSl`LokgE4lRV1C1Am=b6LS<JH8q"j:N>Dd<DEcui:rRII(VNe]FYZAqE>\_lb
-%r+q<4'OSLsAFK*+nIpjtLY3LhH^A@)T3u2Ps2`X7H"8uh^DL&O`EM-TWUi-+pR*-Ph<%!0jF-0"E0Lt0ds7QSSbqX9nqGo3QJ,U<
-%bPfT=N5Jt-Y!D`+IX1T^m]o^(h-Spq*rYUc?h_;r]9#mXcg7^=QWHLfMTt\A2_lZa`S+V33'NaWdU!ocb*0G<q!0$#?!j4o?"$mG
-%k9lHkphRLPs69=<k4nfN[fF)8m,%_*?"Vt`Pj6)rH2N&N=T+>%YVO%skl29JI;SmJEoh3!HJ\T0aku'Tr2\QdDBM&9-O&HNN!.Jl
-%d^1[KBDV5R(3_4dIjY$@LDqY9^I@GdTS*+$PO7MSjiq_aoP_eBh+?ZlSo:fmc^o"Qq#-LIE?H)mc2a@[ZB+7#l7Z#FT_pSRUFs;%
-%cp)V60Ld')b]+b]o56YNGdgc5TBgZFDq9&\<;edQlB`%A!MNa1?MmT6f(_ZRePD3DY"gWg:/<d?SUU5H+fi?K1OF$CoJCoMQWG!X
-%X6Z<rd-]Go7RQoTp,i&nE'mjpj_[9ommtF-4j@t(hE;>BO*pmk5PuTNfTRf(^R\s0iL`@5l@2!eIf1ph51aoJWbHh4-[JP#n*A&E
-%5L3JL0QA2*?GAH]ra(&$@i+d`D#&10DHX18gNpP'lXerks6oZH/&0T!q^q=5(TCKK]Qu=2ouYBicd%!1Ylb4U_5gDkPqh+oESkI=
-%_,"J`paL7=/-;luESD3qlh8?F)UiC[s*Wk5kL4qYj*H&>E&#\j6gfE6J(QOeH\_Tnq&o]WI5;uBq:Y$.LUq-O:&$ph2_X#q,k'a@
-%G7\O!SFScZ.fOc,`Vh<K\t;^Sl;s>0;8h&MZX99Q]lWf2ceW-?fB4mF[F=.G5.;U]d.@36=+Bgb]oPLH7)CdcJ!=c<pI4<FN3.6+
-%DlgPa"X['2GnMffTd8M7"m/=g]i9R1F=A]L1JQ$k0PH@[Fp&!A$O]2ll-;fn-HF946)MB/-D/5?m9M[sITh=!'BTi:GA1a;>O]h*
-%ZdT:#*q=L0Msu>?hLjf^H?PY;M"hnN#e/P.nN&,4\!ePu@s.H'lfoLIa3RPa:;?Yj:2hN9#@$$pF>ETVJ5n!/_"4ti*)CAMoXjM\
-%2sZU-g[$$3/q0uFT-YcD>mUfm]]4p6kB"f1`T$&r]R<PiI!Kf-?L>?.)IdB\4:_?JI*[#*T(\@Tnde4,XJ\Z.JShAA-gCTCMYo6J
-%l8RIePNT\[[%<mh#el&FjkY__Lr&5tRJ8B_heoXSmu-@7GR!W`e+_VBqJBmD[^1G;=a.NbhCC2F\%D$5.:JSC\7*b7s)\&0o<[\r
-%hsuSPOa0@`Go6='j19C0be?JE+#Q3L$C+CG7[M<\6*(;?(<KDH5@TeocQ3A/RMZS=Q!7E96($'n()Vj7&MV,OmJl%U]UCb?d;S%@
-%QR]/qJc*.[jSQ"<o@%@(+)^qj'D^h#dR_-?%),f6=L!7pQ$,Nf""T@^1Gn]SGEgEDQJ_IA9[XH8aT"-FO'eL7r-'fQ5<h;\ERoe_
-%#QLbX/oQ6Qdgtri,Zekq*TOGOJ%U%"W"mj0F`kDGa(O.rS#u>Fa]J$7qWIj-I5_''qW@(1B&LF<@D97Ki@`2I:1b`_s0q0hKOEHR
-%N-?`T*bMMb.fZ6ShedQ7Eo::7]77rBq>4n#0*D50/:T)mOFBV7Sko?NFH+&aTCt,'rQ$)9XQ88UV!1;Dqt*BoQo-)Y)c"aGZV1dK
-%`t,#bV-u',JbTE<lQNe,s7pEA^"=>(CRo\;J8;+0qhCu#l[,OpfDFEu@@HlX+Dfi=HY=:%f>345.I6bL411a7qkR`A;\r)B7m5A1
-%'D7Q=NTIseB[bE+W(jVYl*2j]rRn>fBNtXZp#0;e/==FQYDt9MhI92kM]C?LCos\#Mkpp,[C4)fMZ%Smom0hPlKE'3\R)M"lT\/u
-%Vp>nf0\Wm+B8=I=>&3Qp-iZ5LF3Au&o?"E64D3+rd9(b.Qsa^TSXp&>-Ma<X?i$OI:5UIge_)SB3f4]*S*eM(CM8jmgTp,S>(ef_
-%[`j6YSt49B`'44s\upP=0BDu=Z_cu;X^Smog3sR;!pR/jpfoW[Qc46p^]"+cgMT3Ec>7O;^Ol"$B=_DuI^@k%D&sd+D*IsoQ-ABM
-%4"cuYn4Eo9DU/UO=:r%6R^MNQo^_!fqoU$rCIV+"+FSS6e_0ZWm#p?F?:,7[nJ!d+,A"H%bn%u%rbOW@?h=*H"3c@W%8->AZ$ebF
-%I=#Sq`l1gl:C%W6GOU["j0)gr(O^X>nDnRf85/DqZT>omPNFSu\aHk/L%faiOh0-h);\Sp9&A<Ra`)0dflM'LFl(.AmC&_FRfufp
-%0C>>-qqetV_S$0;FO*Q%hcg1NheV=kep<r^dT`%k(F.;!Y:a1rq"WhjQY&mRRd?h4?X$./r4%kZ-L0"C[ihtJknPcDAjl+f]tN^>
-%[.7:ZjCW%mq9?Rgns.Z,b;6?n&o5/G"k,,S&G+4D\;.[uc[TNmf2&dJm+WoanU5M)o(%1>9R_)2F$.jbHjBf0D!8pm%IJ@H%QVS2
-%`kI;OB"CohFa8B-CiaWBG'Pr:M!7RjX4M,DrL*l[lSe`WdL<O#%Oop+D*up1=#TICnB/aV+8ju=g)tJHV@1qnoo%k2mD[3Adi2)T
-%D(J*DG@0'hRp*NcIPItbp$):q1VSKUS(MPTeEYML2_SK4JnYiMgT/eQEm%$JZ#d<9jR_`3:U\a/Gf:nUV[8[IApZgal/,hhT:Ohd
-%^H("s]00pC+Pm%ZdDs_\HFb%kN3E8+rmg_qUU.9k?!c;ks(2*+Xc5Ppq:0SaF4806f#OS+)sk<$T2GV-H`,\+GNHrsjZcMd[]a@*
-%WEUar=&&][]f<R8U=8)qX,g]\n?80;oA@kpo&=\2q<dn@"atN_du.pYSA2SHk3MVR"5,X-q=`t4MeNi0fJNV:a*Tjg^uFtah*b]n
-%rD@NUr;H>hh>M>T'B&/_h*WO.3"tsud`Citl](p`F*,6.Sj_1.#.-8m>4Lh:W>ujI5&=O&P*EFGoZ,EREF%%O_f.:<6f&5]3>c3J
-%K^G[RV0r.,]ap\uiP/[CN%/aJ;rr41b':YqpNmuEr:9+:q=aZgg[@><4?pQ)o(aY/2q,Gi&[i_Zs1nMa<*e?Cr<L+8>$Mg7hp['1
-%j[L"eB_:0u04fV(^O>q@ZgV6`Vk&,)0:V\08_e2B2!1]sZpS1?0rr(\TDs3*K1OUn0;]'Uij"G`HN.E#F.g#BNCn_;T)KT@nar'<
-%5*jk-dm%jDoJtD"hpaJWs8Q9V5!<C*?[eSq2m)A[J%0e#^H@3Gkmm@c9iC9@(\[IL:Rb40f\HLGo>TUQbEg%sYD$%p&k;OO=7-"-
-%5P2WV4;cmY]_M(?qVmqRnlXtlFc?<B?[V?1?TdJ'i!.L\%YT6"HLJQBU$qY<*Y_u@S%a.EK3oV<K+_\R(V@NFf7!88S%lL/hpnKY
-%f<h(V@JULE3f&GBE]tqopPugX%*Q/k:;'SfHBt4f0J2;p3>u3kNeZ/OUJ$aEeop18:*5[\4T&*SWLnqF@.4E+nr?f2]%OG3O701R
-%K?RksjQRN!T#I0lj[WCMa(GoH^7!K.P=[#1#BbhIrq@NTKMZG3O%6Kf:%.jgalK3m%j)h:[]iNNXYY!IF1o9`p2ml:mX"MJk4JZ1
-%55jj3UUPL<n];(BmesrI4\_(sq<=C=C&6V?oU;ELY-Zoq8N'@*`-@B!(ob+n9VRuf4"79J2_WK9PEn(3pU6l&n[r0-INk=&E6$]u
-%gnY/X@J9=2=UE-3+)a?:R):MTbaZp2O.X,FRFYQ2-(UjhDa*u1'>/PJJZg]mSA@@0[p(-Vm`G"NgS\,nPJ0*&eCW<mhbk`^`T>A7
-%c1]-K/%X;.Xg[WZqYB5s7%oD&!PV6Vq=3.k9D8$`?@=iI@InI'q"a0n`+&?21gSl9h4C;(p%.3VPC/gfe_?N5df&@hoBCBrbMfmq
-%0B<apbBs9ead7L3U[o6j2rDB[A4+3-Y8Y:b9uUrYcKKEbp9U0olVIP&mt:W^[52FU~>
-%AI9_PrivateDataEnd
+%!PS-Adobe-3.0 EPSF-3.0
+%%Creator: GIMP PostScript file plugin V 1.15 by Peter Kirchgessner
+%%Title: /home/ivan/freeside/httemplate/images/mid-logo2.eps
+%%CreationDate: Sun Oct 12 23:47:59 2003
+%%DocumentData: Clean7Bit
+%%LanguageLevel: 2
+%%Pages: 1
+%%BoundingBox: 14 14 140 157
+%%EndComments
+%%BeginPreview: 255 256 1 256
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000e04000000000000000000000000000000000000000
+% 0000000000000000000000c0e000000000000000000000000000000000000000
+% 0000000000000000000060604000000000000000000000000000000000000000
+% 0000000000000000000070e00000000000000000000000000000000000000000
+% 0000000000000000000020600008000000000000000000000000000000000000
+% 000000000000000000000060c03e03c000000000000000000000000000000000
+% 000000000000000000000060e07f07e040000000000000000000000000000000
+% 000000000000000000003060606306707e000000000000000000000000000000
+% 000000000000000000007830606306307f000006000000000000000000000000
+% 000000000000000000f8183060600c7063000002000000000000000000000000
+% 000000000000000001dc183060600e3063000000000000000000000000000000
+% 0000000000000000018c183070600c7063000050000000000000000000000000
+% 0000000000000000018c1c3060600c30c3000018000000000000000000000000
+% 000000000000000001800c1830600c60e700001c000000000000000000000000
+% 000000000000000001800c3830600c60c3000018000040000000000000000000
+% 000000000000000001c00c1870600c60c6000058300030000000000000000000
+% 000000000000000000c10e1830600c61c6000070340070000000000000000000
+% 000000000000000000ef0c1830600c61860000703f0060000000000000000000
+% 00000000000000000075061c30601c618e0000e06381f0000000000000000000
+% 00000000000000000043861830638c618c0001e06301f0000000000000000000
+% 00000000000000000001870c30631c618c000180c30380000000000000000000
+% 00000000000000000001820c30770ce38c000180c70300000000000000000000
+% 00000000000000000001c30c303e0fc30c000301860600000000000000000000
+% 00000000000000000000c30c1c1c0f831c0003038e0e00000000000000000000
+% 00000000000000000038c39e60000007180007030c0c00000000000000000000
+% 00000000000000000019c340000000011c0006031c1c0d000000000000000000
+% 0000000000000000001f8400000000000400060618181f000000000000000000
+% 0000000000000000000000000000000000000c0e307071c00000000000000000
+% 0000000000000000000000000000000000002c1c306061800000000000000000
+% 0000000000000000000000000000000000001c1860e0e3800000000000000000
+% 000000000000000000000000000000000000025860c1c3060000000000000000
+% 00000000000000000000000000000000000000f8c1c387020000000000000000
+% 0000000000000000000000000000000000000011c383ee07c000000000000000
+% 000000000000000000000000000000000000000183077c0fc000000000000000
+% 0000000000000000000000000000000000000001870e781ce000000000000000
+% 000000000000000000000000000000000000000006180070c000000000000000
+% 000000000000000000000000000000000000000007380060c000000000000000
+% 0000000000000000000000000000000000000000023000c0c000000000000000
+% 0000000000000000000000000000000000000000003101c00700000000000000
+% 0000000000000000000000000000000000000000003b83800fc0000000000000
+% 0000000000000000000000000008200000000000003f07001dc0000000000000
+% 0000000000000000000000017fffffd000000000000e0e0008c0000000000000
+% 00000000000000000000003fd5b5aabf4000000000001c0000c0000000000000
+% 0000000000000000000005eabf6f7feaf40000000000380041c0000000000000
+% 00000000000000000001ff5feadad55fafe0000000006003ff00000000000000
+% 0000000000000000000f55f55fbfbff57aba00000000200f1e00000000000000
+% 00000000000000000035ff5ff56aeaafd7ee80000000000e1c01800000000000
+% 000000000000000000ef55f55fdfbffabd5ba0000000003c380be00000000000
+% 000000000000000003baff5ff5756aafebf6e00000000038701f600000000000
+% 00000000000000000eefaaf55fdfdffabeadbc0000000070e03c700000000000
+% 00000000000000003bbaffaf40257557ebfbee0000000061c070300c00000000
+% 0000000000000000eeefaad00000affd5eaebba00000007381e0601c00000000
+% 0000000000000001bbbafd0000001aabf5fbeee00000003f0380e03c00000000
+% 00000000000000076eef4000000003feaf56bbbc0000000c0e0001f000000000
+% 0000000000000006dbba0000000000abfafdeeeb000000043c00079800000000
+% 0000000000000007b6e80000000000feafab5bbe8000000470000f1000000000
+% 00000000000000057d80000000000055fafef6eb8000000060003c0000000000
+% 00000000000001c3d74000000000007f57abadbee0000000e000780000000000
+% 0000000000000176bd00000000000055fd7efb6bb0000000c200e00380000000
+% 00000000000001ddea0000000000007f57d5aefee80000007e03c02380000000
+% 00000000000061775000000000000055fd7f7babbc0000003e1f803000000000
+% 000000000000bbdde00000000000007f57d5d6feea000000203e007000000000
+% 0000000000036d7600000000000001d5fd7f7dabbf80000001e007c000000000
+% 000000000005dbdc000000000000077f57d5d77eea80000001c00f0000000000
+% 00000000000f76b00000000000501ad5fd7f7dd5bfe0000003003c0200000000
+% 000000000015dde0000000017ffff7bf57d5d77f6ab000000300f80200000000
+% 00000000003f774000000017d5555d6afd7f7dd5dfe800000301e00700000000
+% 000000000055dd000000007d7ffff7dfabd5d77f75580000000f801e00000000
+% 00000000007f7400000001d7d5555d757ebf7dd5dff4000000be007800000000
+% 0000000000d5d8000000077d7ffff7dfd5ead77f755e000000fc00f000000000
+% 0000000001bf400000000dd7d5555d757f5fbdd5dff50000006003c1c0000000
+% 00000000036800000000377d7ffff7dfd5f56b7f755f800000201e3f20000000
+% 0000000006d0000060005dd7d5555d757f5fded5dff5400000003bf800000000
+% 0000000005000001c000777d7ffff7dfd5f575bf755fc0000000ffc000000000
+% 0000000000000002a000add7d5555d757f5fdf6adff560000001fe0000000000
+% 0000000000000007c000fb7d7ffff7dfd5f575dfb55fd0000007f000e0000000
+% 000000000000000d6000aed7d5555d757f5fdf756ff57000000b8007f8000000
+% 000000000000001bc001fbbd7ffff7dfd5f575dfdaafd8000000001fb8000000
+% 000000000000002eb00156ebd5555d757f5fdf7577fab400000000fc18000000
+% 000000000000003be001fdbebffff7dfd5f575dfdd57ec00000007f018000000
+% 000000000000006eb001576beaaaad757f5fdf7577fd5e0000003c31f0000000
+% 00000000000000dbe001fddebffffbdfd5f575dfdd57f5000000701fc0000000
+% 00000000000000f6a001ab75eaaaaeb57f5fdf7577fd5f000000601f00000000
+% 00000000000001adc0017edf5ffffbefd5f575dfdd57f5800000601800000000
+% 00000000000001fb4001d5b5f55556babf5fdf7577fd5f4000007e0000000000
+% 00000000000003578000bf7f5ffffdefeaf575dfdd57f58000003e0000000000
+% 00000000000002fd0000ead5f555575abfafdf7577fd5f600000140000000000
+% 00000002000003ab80005fbf5ffffdf7eafab5dfdd57f5c00000000000000000
+% 00000004000002fe0000156af555575d5fafef7577fd5f600000000000000000
+% 00000004000007ab00000fdfaffffdf7f57abadfdd57f5d00000000000000000
+% 000000040000057e000002b57aaaab5d5fd7efb577fd5f700000000000000000
+% 0000000c000007d5000001efd7fffef7f57d5aefdd57f5d80000000000000000
+% 0000000a000002be0000003abd5555ad5fd7f7bab7fd5f700000000000000000
+% 0000000c000007ea00000017ebffff7bf57d5d6fed57f5d80000000000000000
+% 8000001a0000055c000000055eaaaad6afd7f7dabbfd5f740000000000000000
+% 00000014000007f400000000f5ffffbdfabd5d77eeabf5dc0000000000000000
+% 8000001e000002ac000000001f55556b57ebf7dd5bfeaf740000000000000000
+% 00000034000007f800000000003fffdefd5ead77f6abfade00000020ffe00000
+% 8000003e000002a8000000000002aab5abf5fbdd5dfeafb4000000e0e0700000
+% 0000006b000001e00000000000017fef7eaf56b7f755faee000001f0c0300000
+% 8000005e000000400000000000002abad5fafded5dff57ba0000018060f00000
+% 00000075800000000000000000001fefbf57ab5bf755fd6e00000380e1e00000
+% 8000005f00000000000000000000155aeafd7ef6adff57db00000185e1c00000
+% 000000f5800000000000000000001ff7bfabd5affb55fd76000001ffe0000000
+% 0000005f40000000000000000000355d6afebf7aaeff57dd000000fe00000000
+% 800000f5c00000000000000000005ff7dfabead7fbaafd770000000000000000
+% 800000af70000000000000000000155d757ebfbd56ffabdd0000000049c00000
+% 000001fad000000000000000000007f7dfd5eaebfdaafeb70000003ffff80000
+% 800000afb800000000000000000002ad757f5fbeab7fabed0000007ffd580000
+% 000001faec00000000000000000001fbdfd5f56bfed57ebb800000e000180000
+% 80000157ba0000000000000000000056b57f5fdeabbfd5ee800000c000180000
+% 000001fd6f000000000000000000003defd5f575feeabf5b800000c000b80000
+% 80000157da800000000000000000000b5abf5fdf55bfeaf6800000f6fff00000
+% 000001fd77e00000000000000000000ef7eaf575ff6abfad8000007fffe00000
+% 80000157dd5000000000000000000003ad5fafdf55dfeafb0000001400000000
+% 000001fd77fe000000000000000000007bf57ab5ff755fae8000000000000000
+% 800001abdd55800000000000000000002eafd7ef55dff57b8000000003000000
+% 000001feb7fff80000000000000000001bfabd5aff755fd6800000d2ab000000
+% 80000155ed555780000000000000000006afebf7aadff57d800000ffffffe000
+% 000001ff5bfffd7fffffff400000000003fabead7fb55fd7000000fffffff000
+% 800001aaf6aaabdab6d555ffa00000000157ebfbd56ff57d8000000003047800
+% 000001ffaffffeb7edbfff56d400000001fd5eaebfdaafd70000000003001800
+% 800001557aaaabed5beaaafdbd0000000057f5fbeabffabd8000000007003800
+% 000001ffd7fffebbf6bfffab6be00000007d5f56bfeaafeb000000000000f000
+% 800001aabd5555eeafeaaafefebc00000017f5fdeabffabe8000000000008000
+% 000001ffebffff5bfabfffababeb0000001d5f575feaafeb0000007a00000000
+% 800001555eaaaaf6afeaaafefebfc0000017f5fdf55ffabe800000ffff000000
+% 000001fff5ffffadfabfffababeaa000000d5f575ff557eb000001d5ffffd000
+% 800001555f55557b57eaaafefebff000000bf5fdf55ffd5e0000008004fff000
+% 000000fff5ffffd7fd5fffababeaa800000eaf575ff557f5000000000003a000
+% 800001aaaf55557d57f5557efebffc000005fafdf55ffd5e0000000000010000
+% 000000fffaffffd7fd5fffd5abeaaa00000757ab5ff557f50000005000018000
+% 800000aaafaaaabd57f5557f7ebffe000005fd7ef55ffd5e000001ff00000000
+% 000000fffaffffebfd5fffd5d5eaab80000757d5aff557f400000381ffd00000
+% 8000005557aaaabeabf5557f7f5ffe800005fd7f7aaffd5c000001800ff00000
+% 0000007ffd7fffebfeafffd5d5f55580000757d5d7faabf40000018000500000
+% 8000005557d5555eabfaaabf7f5fff400005fd7f7d57feac000003fe00000000
+% 0000007ffd7ffff5feafffead5f555c00006abd5d7fd55f8000003bfe0000000
+% 8000002aabd5555f55faaabfbf5fff600005febf7d57ff5400000705ff000000
+% 0000003ffebffff5ff57ffeaeaf555c0000755ead7fd55f8000002003f000000
+% 8000002aabeaaaaf55fd555fbfafff600005ff5fbd57ff500000070001000000
+% 0000001ffebffffaff57fff56afaaac0000f55e02bfd55f0000005ff80000000
+% 8000001555eaaaafaafd555fdfafffa00005ff001eabff500000001ffc000000
+% 0000000fff5ffffaffabfff5757aaae0000f54000bfeaae000000000ffc00000
+% 8000000d55f55557aafeaaafdfd7ffa0000afe000eabffa00000000005c00000
+% 0000000bff5ffffd7fabfffab57d5560001fa80005feaac000000f0000800000
+% 80000006aaf55557d57eaaafefd7ffc0001578000755ff8000001fe000000000
+% 00000005ffaffffd7fd5fffababd5560001fd00002ff5540000038fc00000000
+% 80000003557aaaabd57f5557efebffc00015700003aaff800000303e00000000
+% 00000002ffd7fffebfd5fffd5abeaaa0003fc000037faa000000180610000000
+% 80000001aabd5555eabf5557f7ebffc0002aa00003d57e0000007f871e000000
+% 00000000ffebffff5feafffd5d5eaa80007fe01e02bfd400000043fe06000000
+% 80000000555eaaaaf55faaabf7f5ff800055407407eabc000000007e06000000
+% 000000007ff5fff7aff57ffead5f550000ffc05f055fe8000000801fce000000
+% 800000002aaf5542faafd555fbf5ff0000aaa07507f558000000e003fc000000
+% 000000003ffaffe1affabfff56af550001ffc05f055ff0000001f00078000000
+% 800000001557aaa17aafeaaafdfafe00015560750ff5500000017e0000000000
+% 000000000ffd7fc0d7fabfffab57a80003ffc01a0aafe00000000f8000000000
+% 800000000aabd5607d57eaaafefd7c0002aaa0101ffaa000000003e000000000
+% 0000000003febfd00bfd5fffababd00007ffe0002aaf80000000003f00000000
+% 800000000155eab00eabf5557efeb0000d5550003ffa00000000000fd0000000
+% 0000000001ff5fe805feafffd5abe0000bfff8006aae000000000001e0000000
+% 800000000055f5580355faaabf7e80001eaaac00dffa0000001f0000c0000000
+% 00000000007f5ff400ff57ffead5c00015fffa0175540000003fc000c0000000
+% 800000000015f55c00aafd555fbf40003f555703dff800000071e00dc0000000
+% 00000000001f5ff6003fabfff56a800055fffdaeb55000000060780f80000000
+% 800000000005f55d800afeaaafdf00007f555775ede0000000603e0600000000
+% 0000000000035ff74007abfffab40000d5fffddf58800000003c0f0000000000
+% 800000000000f55dd0003eaaafe80003bf555775c0000000000038f000000000
+% 0000000000002ff7780015fffaa00002eafffddf400000000000307800000000
+% 800000000000155dd6003f5557800007bfaaab75000000000000781800000000
+% 00000000000007f77da02afffd00000d6afffede0000000000001e1800000000
+% 80000000000000add76dffaaa800001fdfaaabb40000000000000f1800000000
+% 000000000000003b7ddb557ff0000035757ffeec00000000000003f800000000
+% 800000000000000ed777ffd54000006fdfd555b000000000000001f000000000
+% 0000000000000001bddd557fc00000fab57fff60000000000000000000000000
+% 80000000000000002b77ffd5500001afefd55580000000000000000000000000
+% 00000000000000000000017fa0000f7ababffe00000000010000000000000000
+% 800000000000000000000000000015d7efeaa80000000007c000000000000000
+% 00000000000000000000000000003f7d5abff4000000000ff000000000000000
+% 8000000000000000000000000000ead7f7eaa0000000000c3800000000000000
+% 0000000000000000000000000001bfbd5d59c0000000001c3c00000000000000
+% 80000000000000000000000000076aebf7c300000000003e0e00000000000000
+% 000000000000000000000000000ddfbead060000000000070700000000000000
+% 800000000000000000000000007b756bfa0c0000000000038380000000000000
+% 00000000000000000000000001aedfdea010000000000181c1e0000000000000
+% 8000000000000000000000005f7bb5700000000000000770387c000000000000
+% 000000000000000000000000f5d6ee8000000000000006383c1c000000000000
+% 800000000000000000000001af7da800000000000000061c0c0e000000000000
+% 0000000000000000000000037ad50000000000000000070e0f0e000000000000
+% 800000000000000000000001550000000000000000000306039e000000000000
+% 00000000000000000000000000000000000000000003c00381fc000000000000
+% 80000000000000000000000000000000000000000007e00780f4000000000000
+% 00000000000000000000000000000000000000000006700fe038000000000000
+% 800000000000000000000000000000000000001f80060038381f000000000000
+% 0000000000000000000000000000000000000019c0c7001c3803800000000000
+% 8000000000000000000000000000000000000038c183000e1801e00000000000
+% 0000000000000000000000000000000000000018078383070c00c00000000000
+% 800000000000000000000000000000000000001c00c1cf839c00000000000000
+% 000000000000000000000000000000000000001c40e0ff81f800000000000000
+% 800000000000000000000000000000000000000df06078c0f000000000000000
+% 0000000000000000000000000000000000000007f87060e00000000000000000
+% 80000000000000000000000000000000000000079c3800700000000000000000
+% 00000000000000000000000000000000000003838e0c02300000000000000000
+% 8000000000000000000000000000000000001181860e06300000000000000000
+% 000000000000000000000000000000000000f1e1c70607f00000000000000000
+% 80000000000000000000000000000000000030e0c30703e00000000000000000
+% 00000000000000000000000000000000000038e0e38300000000000000000000
+% 80000000000000000000000000000000000018f0618180000000000000000000
+% 000000000000000000000000000000000000187030c1c0000000000000000000
+% 8000000000000000000000000000000000000c7838e0e0000000000000000000
+% 0000000000000000000000000000000000000c1838e070000000000000000000
+% 800000000000000000000000000000000000061c0c3000000000000000000000
+% 000000000000000000000000000000000000070c0e3000000000000000000000
+% 800000000000000000000000000000000000030e06300c000000000000000000
+% 000000000000000000000000000000000000030607f01c000000000000000000
+% 800000000000000000000000000000000000038603e004000000000000000000
+% 0000000000000000000000000000000000000183028000000000000000000000
+% 80000000000000000000000000000000000001e3040000000000000000000000
+% 00000000000000000000000000000000000000e3800000000000000000000000
+% 80000000000000000000000000000000000000f7a00000000000000000000000
+% 0000000000000000000000000000000000000018000000000000000000000000
+% 8000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 8000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 8000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 8000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 8000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 8000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 8000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+% 8000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000
+%%EndPreview
+%%BeginProlog
+% Use own dictionary to avoid conflicts
+10 dict begin
+%%EndProlog
+%%Page: 1 1
+% Translate for offset
+14.173228346456694 14.173228346456694 translate
+% Translate to begin of first scanline
+0 142.49763779527561 translate
+124.99792789059263 -142.49763779527561 scale
+% Image geometry
+250 285 8
+% Transformation matrix
+[ 250 0 0 285 0 0 ]
+% Strings to hold RGB-samples per scanline
+/rstr 250 string def
+/gstr 250 string def
+/bstr 250 string def
+{currentfile /ASCII85Decode filter /RunLengthDecode filter rstr readstring pop}
+{currentfile /ASCII85Decode filter /RunLengthDecode filter gstr readstring pop}
+{currentfile /ASCII85Decode filter /RunLengthDecode filter bstr readstring pop}
+true 3
+%%BeginData:        46454 ASCII Bytes
+colorimage
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+XoAOuhVQ9'JcF[.J,~>
+XoAOuhVQ9'JcF[.J,~>
+XoAOun*f,rJcF[.J,~>
+XoAO;@nJ2/r;QiehWKIikl6/~>
+XoAOD@o>%?r;QiehX?$qkl6/~>
+XoAO\V3HYHr;Qimn*bi-kl6/~>
+XoAOe[8IQprVlugN&d,Rs60K5~>
+XoAOm[8Ij#rVlugN'`b[s60K5~>
+XoAOmesq*#rVluo]o9XUs60K5~>
+ZMt!hhWOk;",$qHhZ!NXk=Q"?hLY^ks*t~>
+ZMt!hhXCFC",%L`hZ!NXk>DjOhLY^ks*t~>
+ZN'pmrVlu-F-Q.mrrheTF,]R=s69Q6~>
+Zi:-jCFP5@rr[o[6Jh_A"Rh:0V>#Q@l2Q8~>
+Zi:-rCGCeHrr[ok6Jh_A"Rh:9XnRDHl2Q8~>
+Zi:-rXb=Cdrr]ZMPjeVO"8BKfc@Q#Zs*t~>
+Zi:-a.0rQErr\Js6Iu,8!U&<js6'E4~>
+Zi:-a0c3O]rr\Js9%Nt@!Unlrs6'E4~>
+Zi:-rKQECVrr]r]Pir#Fs6kO=kPp&~>
+Zi:.%HSM&hrr_Eq+gq:K!pB%@qu6iVX_X0Xp\XsnpZL,jpOWAEs*t~>
+Zi:.%KJB"qrr_F$.CK-SrpTaa"l?A&Phu03rri)Zf'i?as8W+L~>
+Zi:.%[>`-(rr__:He//q!q5mXqu6igcE4eKp\Xsmp[@;6JcG`LJ,~>
+Z2Xgmr;Ql^+UFV;rrf06CO=q:rs,r0&-rP%PkY.V#2Y#"+^1-!Jc>`MJ,~>
+Z2Xgmr;Ql^.1i$KrrfH>CO=q:rs,r0(`3fNPkY.V#2Y#".9`81Jc>`MJ,~>
+Z2Xgur;QlfHZR4+rrgWLXgRWrrrL]@rc8."^%_L*#4JsaH_naVJc>`MJ,~>
+X8`:b(^QZ2rrej5#U/('rs)^5+[RU`1$AN8!G`8G#QZ*Frr32sKNc(G^#"YHJ,~>
+X8`:j+V:1Crrej5(b+>?rs*$F.7u<31$AN8#'1=m&.g:mrr32sN*<pO`nlUQJ,~>
+X8`:jKQG04rrg?DF+j#\rs,'8KTq.2N:6`F!3Q3@!IN,krs&52SC[/[mu%-q~>
+Zi:1&]k^NJrr3)p@gIG\rri(m&0]X(rs6mn&=i4&0bBlSrs6Uf#]$8'#W_AQrs-hZ+XmsO>0cO8
+!q5=HU]5i~>
+Zi:1&]k^NJrr3)p@h==mrri(u(b+&8rs6n!(nC'70c6G[rs6n!(i-6?&45jbrs-hb.5;Yo>0cO8
+s6fs^U]5i~>
+Zi:1&eubIfrr3)pV/s'Drri)AF+i`Urs7e@F2mt2N-iSDrs7J.F03`PF,]kmrs._`KS4]*V<@7G
+!r)0XU]5i~>
+\c2Zur;Qr`@j)+]n,E=hHO)Xprr3)G3?c]Irs6:T+gq@,3=plCrs5G43S+5,(a8AHrs(Oi#U'`b
+6LXCC"Rg\8SG/iZJ,~>
+\c2Zur;Qr`@jqt!n,E=hKFg04rr3)G3@W8Qrs6Uf.CK3465Y[\rs5_D6Iu1=+XumYrs(Oq(b$:=
+6LXCC"Rh"ASG/iZJ,~>
+\c2[(r;QrhV1`odp\t0p[<%;qrr3)`N-jaers72&He/5cN,u]3rs6nsN9C5dH\D.lrs+L(F*i7T
+PkXYH"S]<o`qQ;/J,~>
+]Di#jV/rKrrVm#`HO)sprr3(I#W_AQrr_+E&=!1o'YP&$[K"fE#_`6XpN$UDn,Kd=+n,C0#<<&M
+V1]C'[I=+uefb;kkG8-.~>
+]Di#jX`LW5rVm#hHPfB3rr3(R&394Yrr_+M(mP%"'ZLt=[K#)U(khqhpN%0Tn,KdE.I[68#<<>U
+Xb7N?[I=+uegVG.n"fu6~>
+]Di$&cE5C\rVm#h[<%T$rr3).F,]kmrr__SHbKFY'\7VXf)OotF1)&JpT8M5p]&fkK_PHF#E3__
+cF&"Gf'iVAkCdo@n"fu6~>
+]`/24+V4nj+hdjS"18[`^&J$6eds:Urr3)W63qr;rtN-`+gq@MhVRGqs7]\&>5/&]#U/[9rs6"U
++gq?i3=)/DrrhM+3J?jss*t~>
+]`/24.1d=5.E;>d"18sp^&J$6eeg-err3)W8f2pSrtNHr.CK3UhVR`$s7]\.A,$"f(b+qQrs6"]
+.CK2q3>e:Trrhe33K3F&s*t~>
+]`/2UH[Bg\Hf"`$"4hgGf)G[OkBhmFrr3)hP]O83rrpu#He/5srpTme$2:9;V>(#'F+j;ers72&
+K\$1[N-!#-rrhemN4nt]s*t~>
+^&JB$3=%W\.0s,?rr3)W+X*uerr_+$#c7P#"5Z?MHiF$I]au?pqYplr=pS=+s,74,n,E=mV%>)h
+s2I&1SFQU_n,NF^f(Ys>J,~>
+^&JB,3=nMm0c4*_rr3)W.4MCurr_+,&?Ys3"5ZWeHiF$I`Y^/4qYplr=qG3<s,7dDn,E=mXV`e4
+s2I&9SFQU_n,NF^hY3fFJ,~>
+^&JB,N,sr[KQE[Prr3)hKR;;Lrr__:F3adb"7MIq[Jp1.epDbpqYplrV/r1$s1NK,p\t0uc?"Zq
+s5&]U`ps'/p\t0mkG&!,~>
+^&JA`&.k]<N!L9&rVlpk#]p"F"4e:pV>gJshEhKprr3)6(`9[WrsAF'#[6]sN!LTqrr37o&5(gZ
+c8cH4nc&Z;N7O[%J,~>
+^&JA`(`9CTN#3_?rVlps(j#]V"5Y14XoA>&hF\W3rr3)?+X+8irsAF'&7b2/N#4#4rr37o(eWZb
+c8c`<nc&ZDN7O[%J,~>
+^&JB$F*l44]lSPOrVlq`F1)#I"6Y#PcMmhGn!%n$rr3)OH[F??rsAFrF/AX2]lSl$rr38DH^+"!
+kDXK%nc&Zu^#u'gJ,~>
+^&JA`&37c1hEiZ]rVm1-#[7!&s6!8cSGrNjkAq2]rr3)6&0\IXrtY93&<-YhN!Lm$s8VOk#\3o7
+V'.#Vnc&^);B^^es*t~>
+^&JA`(cfV9hEirerVm1-&7bJ7s6!8kSGrNjmrK=mrr3)?(b)lhrtY93(l\LpN#4;<s8VOt(h<UG
+V(!kfnc&^2;CR9ms*t~>
+^&JB$F,\uUn!&LFrVm1oF/AX2s6lJ!`r>u?n#^rErr3)OH[F??rtY:)F1qVR]lSl$s8Vh`F/Ap:
+`d<C5nc&^JS:n;Ds*t~>
+^&JAh+V;?ekG@&(rVm23#VkNBs7^R?3W8saPRqX!s8TbL+gq1H'^&@2[K$8c#[6]ss6!PkHiO,!
+#U/^;"7KD!>4;Iln)q+YJ,~>
+^&JAh.2]bun#bI8rVm23&394Zs7^jW6N-ojPSe3)s8U(^.CK$P'^&@;[K$8c(g?D.s6j,.HiO,!
+&1R,K"7KD)A+0Htn$W1G~>
+^&JB$KR;;Mn':CrrVm2TF+j#^s7`pBN;`b_`cJ9Vs8UYsHe/&n'^qQ=f)Pc`F/AX2s6le*[K$97
+F+j&_"8A=,V=4Ebp[>NiJ,~>
+^&J60;@%XDq>Uc7#RK;es6k:?1&_+YPRp14s8TbL(q'5?#e_B)^&R8!#`Sc_#gP.9[K#]:#W_DS
+"18[GSGrNi]s[>%rrTlL]sdrk~>
+^&J60;Ab)]q>Uc7&.m^us6k:G3W8saPSd$Ds8U(^+gq1H#f\;B^&RP)&<-Vg#gP.A[K#]B&45md
+"18s_SGrNi`jP:.rrTlT`jYnt~>
+^&J3/S9)+5rs@7tF79//pU,'qrVm2;H^*^ns42ODf)#CPhLp7,s6lJ!^&J$;kDXc=s7`X:N:?iL
+epDJXrr3&Vf(\k;!nOL1[f:j~>
+]`/(L#YORarrDNersI=;#`Sf`pOif,p\t1!S-V.#s8TbD+gq1H#dkfm[K#DM#`Sc_#d"pe^&R7E
+#`S9Q"+(;6hZ!NY]i&@kkP+cO"Qu!uF5FG,J,~>
+]`/(L(eX8qrrDNersI=;(l\LppP]qDp\t1!S/=93s8U(U.CK$P#dl*)[K#DM&=!1o#dkg)`rG3V
+&<-,Y",%LOhZ!NY`_pU'n+ZVW"RhR0F5FG,J,~>
+]`/)9F-QFtrrDfmrsIqJF1qVRpUtX,p\t1!`cI+%s8UYsHe/&n#hF?Lf)P2tF1qSQ#gRdDf)P2l
+F1q)C"1<3/n,E=iesrT"n+Zhbn%FC^kICPB~>
+]`/Mf#RJHMn(+"^n,NFN;@%(;rr]q`+iaN]$'Yu]cN!pX(a6<`rtMja(q'D,0aNa<s7`#p.G"O^
++UFV.rr^gq#aG;f#3TbN@q12Cq>UTS8dIc/\Gq'~>
+]`/Mf(_F^en(+=on,NFV=qGKKrr^7q.E;Ae$'Z8ecN!pa+XshqrtMji+gq@50bBTLs7`$#1"QBf
+.2\TFrr^h$(mP"!#4H=^@q1JKq>UTS;A_aG\Gq'~>
+]`/N*F*$4<pZKQ0p](9^S9(h3rr_,2Hf"c%$,(\EkPtS5H[F??rtO%2He/5cN,u]4s7aN[K]iC(
+KQG0'rr_G2F1qPP#4J[IV5:lgq>UTdP]N)P\Gq'~>
+]`/c(63q(t@lY\en,NFVCC!i$s8Tbe&>fC+$+1=)cN!pX(`9[WrtMja(qot40aNa<s6!kt;ZHd:
+(a7K#rr\Js.CK-S!PKr]#QbQ0cMIPCV%=3?\,Us~>
+]`/c(65X4/CH3gun,NFVCD]t<s8U(n(o@63$+1U:cN!pa+X+8irtMji+hdp=0bBTLs6j_7;ZHdB
++Xu"4rr\c.0t$u[!QHkn&-<\@cMIPCV&1&O\,Us~>
+]`/c9P]N\@Xc.Ucp](9fX`L$$s8Ur7HcH'b$.aH^kPtS5H[F??rtO%2He/5cN,u]4s6le*SH&WG
+H\CSPrr^8fK\$,%!T&M/Erp]QkPG2\`d<'X\,Us~>
+]`/<,@gE>O#S77IXoA>,S.Hjps8UY1&=ib"$25St`rH(P&0\IXrtMja.F.tV0aO$Ds6j+sA,lRf
+#Vk3,rrh1^#\3?&rs8@/#S:K]+UF&(rrgn5#YNCOs*t~>
+]`/'%CCpI^!tZ:\[Jp14V&1Z4s8UY:(nCU*$25l'`rH(Y(b)lhrtMji1!]g^3=q_\s6j,.A,lRf
+(bsn<rrh1^(i/U>rs8@7(`6au.1hI8rrgn5(eW)_s*t~>
+]`/-/V/p^)rGqtarr3;EH\CS^s6#>f`r>uEpOnL^s8UYsHe/&n'\7VikPt"0F2n7[pSDr-s8TcR
+N:6?;"Rhk%V>'uh#kt0:H_mikF1qJN"Qt_bPioOUJ,~>
+]Di/$&0Wc3HU8!Zrr3)6.3ZD(rrZa:CZk]s,U!_hs8TbL+gq@Metp[ls-+'es8Uq)+jU,fhDkk<
+s8REO;Xa2V"18[OSGiHohDkj_n*b<';WmuX!,MQ>!CFf9s*t~>
+]Di/,(b%1CKL-Msrr3)60e'g8rr[$RC[_9&,UjS#s8U(^.CK3Uetp[ls-sous8Uq1.F.tnhEhdU
+s8R`h;Xa2V"18s_SGiHohDlF"n*b</;WmuX"`kLl&44[Ps*t~>
+]Di/VF+fLB[?Pa?rr3)OKS7qUrr]*=Xmc8hs*Gs0s8UYsHe/5skJl]bs2KDMs8VP@HftG/mu2>5
+s8TKJSG2US"4hgG`r5oDmu2=qp\1e2SF?CU!3Q6A!L2HNs*t~>
+]DiDeHaUlVpOif,n,NFN63rPLrrZa:;Wn&Z,9[>Os8TbD+gq@MN"C[BmpcVqs8So,+m8n*c3O]q
+s7\hcN:QuOpNm04kPbDePR&_ps6j+s>4;Fi#0nA/;A^Rb\Gq'~>
+]DiDeHaUl^pOj)4n,NFN8f3NdrrZaJ;XaVb,:O1_s8U(U.CK3UN#7NRmqWb<s8T2<.Hga2c4Ci4
+s7]+sN:QuOpNm`Dn,<7mS.IF3s6jG7A+0Br#0nY@;B[Ks\Gq'~>
+]DiE)[FX4's0Zp,p](9^P]OP;rr]*=SF?IW,D:-Os8UYsHe/5s]mIHmpSDqqs8UAkK^\s@kAt_$
+s7_b!^%21+pU,(,n,<7m`cHh%s7`%)V>'rg#3U>[S9oq?\Gq'~>
+])Md)rVm2;.3Z_2s6!8cF8l1ACC!i$rr42d#`SNXs%3i]n(pABK`CLN#YP-sPR&Gqs8Tb<1#Drn
++UF>'rr_FN#]otE$/Ru[K_PM[+UF>2rs%=X#YNt1[C?0d~>
+])Md)rVm2D0e(-Bs6ii&F8l1AEu7g<rr42l&<-A`s%4,en(pYRN;r?^&5*!&S.I.4s8U(M1#Ds!
+.1ha7rr_FV&:=BU$/S8cK_PM[.2\<Jrs%=X(eWZA[C?0d~>
+])Md)rVm2\KS84^s6lJ!XoA>&X`L$$rr43iF1q>Js-.lDp[=>f^&Ri'F-Q_)`cHLqs8UYkN:6f8
+KQFitrr__SF1(uH$1F+"[J0^PKQG03rs%q^F-Q.^f!k[0~>
+[Jp?[64f+Trs=o$;VqHR]b!3Lrr3$C#`Sc_*Ff@8P_:1kPlLK:&37bn=pR.Os8QR7>4;LJ+X*uY
+rr])'+jU&d$'Yu]cN!'C#X[,@rr\c&+f2RGJ,~>
+[Jp?[8f3Ndrs=o$;VqHR`Y^_]rr3$K&<-Vg*FfXIP`.%.SH&>B(cfn1@h:Zhs8QjGA+0HS.4MCi
+rr])7.F.nl$'Z8ef)P2S(dcgPrr\c..BTuWJ,~>
+[Jp?lP]OP;rs?AcSF?LXhKt4Err3%HF1qSQ*Mmh9]tK)G`rH(PF,\uEV/qUas8T3BSG3'PH[F?7
+rr^8^K]i=6$,(\EkPt"QF-Pkdrr^8fK[-t)J,~>
+[Jpg4=pS<ps8ST#0uj7nc57,#rr3%'#`Sc_*OQFa&.f+WhZ*Vh+UCD<#S;@Ws8Q7.>4;Kf&38>4
+rrZF1>4;Ij$J%NTK`D([+V9>$rr3,P3='Ep[/YX~>
+[Jpg4@i/D4s8So,3QD+!c64%4rr3%'(l\Io!4D_A(Lu>%s2HK)6<Y3;K_PNH=qFm+s.pQ!f(/hC
+=qG34rr3>^65Y[]s0X9eN;*>O"P,REC\P49J,~>
+[Jpg4V/rL%s8U)[N8FU7kBh:$rr3%rF1qSQ&_;#EHZO8)n,NFEKQEBSF*"bgrs5HBSG3''H]7.Y
+rr\d4V>'uh$KmXp^&S,`H[E0prr3,aN,u,q[/YX~>
+\c3r<[B93'[1FM$s8U@f&>f.$c4CPpkP+.d&5mkgs6ldN+XpUXrr3Z#PT^SL(g>ern)mR[N;rp2
+&44t>rrgUj+e8<+rs=W$1"QBn@gF77rVlt@#U.L"s*t~>
+\c3rD[B93'[1Fe4s8U@n(o@!,c57D+kP+.m&5n2$s6m'^.5>>qrr3Z#PURFd+_0C/n*a-kPlLcB
+&5(OFrrgUr.@g/3rs=W-1"QBn@h:*GrVltH(b*b:s*t~>
+\c3rDf%0TqeoQN$s8V8/HcGg[kBhR,n+Z:YF.BYps7ag'KS62jrr3Z+]nC`RH_p32p[=W!^&S,G
+F-PkZrrhM<HcGgZrs?AcN9C68V/q=YrVlu-F*m)Vs*t~>
+\c2q^#W_AReee[prr3NQ#\1QfV'-+[K[+pJKTr"PrVlldq>V#WPa&$-s7`?n&0\1Uk@5'MoD\sf
+HO)@Orr3;f3=(!3s1KQ]Pl:Ub[4*8`p\k*np](!!s*t~>
+\c2qg&45jcefbm4rr3NY(h:8)V(!6sK[+pJN0KjXrVlldq>V#_S<Tl=s7`X!(b)lmmpd2foD\sf
+KGZGhrr3;n3=plDs2HK)Pl:Ub[4s+pp\k*np](!!s*t~>
+\c2rCF,]knkBh:$rr3O_F/@IE`d;d/[HFrf]tMGKrVlllq>V#h`kBC\s7ag/F*l44n"kB=oD\sf
+[<%;irr3;nN,uE,s5&*D^&@s6eqAC`p\k*np](!!s*t~>
+\c3MS&."6XKErF.s6#m`+^/ZOXehl%hXBXal2M.JXdjIPs5$'JA&e99rrh1N#]ob>rs>2$.G"P!
+=pQk6rr3,a=pRIXrVm&7CL^kEpUpNV~>
+\c3MS(`84pN#3_Os6$3q.9^e_Xf\G-hXBpil2M.J[A@ris5$?bA&e99rrh1N(j#HNrs>2,1"QC)
+@h:BGrr3,a=r9ThrVm&@CL_.MpUpNV~>
+\c3MtHZQmh]lSPOs6msSKUf0af$;:dn+Z;>l2M.[cGm9Ks6l1nV;Ct>rrheTF0539rs?\dK]iC8
+V/qUYrr3,iV/qmirVm&XXehl6pUpNV~>
+\c39)=pPs3(^O=%s5'9R`olOZpYYuVn,NFV`d:$fkOniWV&1&Wrr3>^3=(T<s1KQ]K_PKG"/R.X
+V>^Dpc8#;(!>'Ujs*t~>
+\c39)=r8DT+W+D>s5'9R`p`BjpYYuVn,NFVc@ef2n+H\_XW\jqrr3>^3>d_Ls2HK)K_PKG"/RFi
+Xo88(c7p.Q&/]c,s*t~>
+\c391V/q!JHZQ%Ps6mtYhXBq-pYYuVp](9fhR/TMn+H\_c@gPqrr3>oN,u],s5&*D[J0\#"3-"@
+cMdbDkD]C]!IM5es*t~>
+\Glca;BZko;Vo7i"RfM"9'?3R$&fEUcN!Wl&44tIrr^gq#]'D=#i7QI+aZNe+kF@,J,~>
+\Glca;CNb4;Vo7i"RfM*;XaVb$&f]]cN!Wt(eWBYrr^h$&9IgM#i7lb.=4Z(.Fu34J,~>
+\GlcrS9oU9SEI`g"S\a6PjeVO$,(\EkPt:iF-Pkerr_G;F05E@#k*^nKXI%cK]g&KJ,~>
+\,QHZrj;a__#FMf+UFqDrs@OS#\3&tej9XqrVltQ#U.4ers@kA&0[;4c9_e`^&NT~>
+\,QHZrj;a__#FMn.1i?Trs@O[(h<%7ek-d4rVltY(b*K(rsA.I(b(^Dc:Sq#^&NT~>
+\,QHkrmh)<_#FN"HZR4+rsA.YF/A@*kEL&$rVlu5F*ldCrsA/%H[EI#kEL%q^&NT~>
+JcG?A"kIaJ#U.Lmrs=Vi(q'D<PRok+rr3).+V:1CrsJLj&.jNhs40LBK`:uOpVHl[~>
+JcG?A"kIaR(b*c0rs=W$+gq@EPScF3rr3)..2\TSrsJLj&/^B#s40LRK`:uOpVHl[~>
+JcG?A"m<#$F+i`Urs?A[He/5k]mG_$rr3)OH[Ed2rs?\dF1q>JkEL%qrr2um_>f#~>
+JcG?A&b!DC.70m"s5#aA9)nqJ3=(TCrrhLg#YNtQrt!C8#ZBjcpOj)$f)Pd5V8gCPJ,~>
+JcG?A&b!_T0g`#2s5$'Z9)nqJ3=q/Krrhdo(eWZart!C8(fKPspP]q<f)Pd=V8gCPJ,~>
+JcG?A&bjkYKTsdVs6knfPlLdPN,u]3rrhe\F-Q.mrt":OF.D_!pUtX$kPtSN`nnT4J,~>
+JcG9?&,3c%A'WAi&.l8Ls-*dLhZ!NlS08HWp](9^@gFg7s8ST+#__sPs7`$]f#.N<~>
+JcG9?&,4).CX14q(`9[\s-+'ThZ!NlS1,;gp](9^CCi5Gs8So=&;9fXs7`$]f#.N<~>
+JcG9?&,4qoV<@$]F*lL<s1NK4kPkJu`d<'`p](9fV/qUYs8U)cF1(cBs7aO'kJR=M~>
+JcG3='DL\8;BZ<LkPsC!&;9NPs5#11A,cK9kCaBPCZk`K63oU&rr3/rS6E>WpVm/_~>
+JcG3='DLt@;CNGdn,M62(l\4hs5#IIA,cK9mt;MpC[_;S65V`6rr3/rS7At`pVm/_~>
+JcG0<'(>"RHZQ%Ps6knn^%_R,mt>bYrr3Ap[<ltsn,MR8F,];]rrr/:SCZlt`W(G~>
+JcG*:$0R7F[K$8c&38>@rr[<J0tmSd$FM;g#U+9?@gFg7rr35tPT^ST+`$8\s*t~>
+JcG*:$0R7F[K$8c(cg1Hrr[Tb0uj4m$FMT"&1M\OCD\eOrr35tS1,9u.<Fsts*t~>
+JcG*:$1GQtf)Pc`H]7.err]BEN8FR6$J'lOF*k=XV/qUYrr35t`e8D[KWX^_s*t~>
+JcG$8%Gq-b]f?X_p](9$.1haCrsR[U#WXmV#XT[GPkY1W#JD8d#VcSr[Dr5s~>
+JcG$8%Gq-b`]4lpp](9$0bBTKrsR[](d^P+(d]Y_SG3$_#JDPt(blR=[Dr5s~>
+JcG$8%Ia>shMcNhp](9EKQFj+rsJ4ZF,Z')F-M?!`r5oBeqA*cN,s?s`rCP~>
+JcFp5(pu(APkY4@=pRIGs8Vh7#T0]#EtAT_6MLKZ$/SPc0pKs]#[6uCs*t~>
+JcFp5(pu@QPkY4@@i.hhs8Vh7(a6$<Eu5`*9)&>b$/SPk3L%fm(g?[Ss*t~>
+JcFp5(tO@e`qTN%V/qmas8VhqF*lL,Xa>,1PkY1W$1FC*N4nDEF.E!Fs*t~>
+JcFm4(?^o[[K"N,&=ie#pQQ4#K_PN0V("a^rr3>V;@#;&s8So,6Jfc_J,~>
+JcFm4(?^o[[K"N,(nCX+pRE';K_PN8V(kTnrr3>V;A_F>s8So46Jfc_J,~>
+JcFm4(@Sr,f)OolF2n7[pVqQ,[J0^ic@hGFrr3>gS9'YGs8U)cPip*eJ,~>
+JcFg2s5".`[36*ps8UA)&7aSqrrKO@rr3A_=pPCus8UqZ#YOj3s*t~>
+JcFg2s5".`[4)s4s8UA2&8U/$rrKO@rr3A_=r8*@s8Uqc(eXPCs*t~>
+JcFg2s6g?qepDc#s8V8@F/A@(s8U[LrsS:cF*#A$s6le*PkW5uJ,~>
+JcF^/$._EKA*<Si#U.4brrDfmrsFtr&:<mGs+CppV8iOc~>
+JcF^/$._E[A+0/%(b*c-rrDfmrsFu%(jk`Os,7d3V8iOc~>
+JcF^/$0ROoV=4/TF+iEIrrDfmrsHG\F1(cBs1NK#`lA%/~>
+JcF^/%/68@V>oBX#c7S$hWOh:"n.ru&;9NOrs6#!A*<mlkNC^Fs*t~>
+JcF^/%/68HV>oB`&>fF,hWOh:"n.s)(khAWrs6#)A+0Htn)rQNs*t~>
+JcF^/%/7bp`rGLKF2n7[n*g2S"o$#`HaWVIrrpu<V=4HarpS&1J,~>
+JcF[.%/6Ums4.G]^&RhJCZkZr"IpV@;WmuX$-q`6s42Np;PiR$s*t~>
+JcF[.%/6mus5":u^&RhJF6EN%"IpnX;XaP`$-q`6s42Np;Q]E4s*t~>
+JcF[.%/8'As6"HEf)PKPXmc5g"NGe0SF?CU$0UdWs6$e[SBgTJs*t~>
+SGs#ls8Vins7cQnp](9fdJjUKs8Up]#^ajD+X*uerrg=b#W^3*rrLD*rWiQBHfr]SJ,~>
+SGs#ls8Vins7cQnp](9fdJjUKs8Upm&:;]U.4MCurrg=j&38&2rrLD3rYP\[Hgf8[J,~>
+SGs#ls8Vins7cQnp](9fcMn1=F*"bP[<mSPrr3,XHZP//q#:BXN;dl"HaW=fs*t~>
+JcFO*&+=QN#U'`b>2K;Zekuc6`q]Q>ek-K6@qu>UXj6rs~>
+U]1>_rmh+iPk'b5V>\uprt"R>(`4\5(g>ers41'b3R7F"#i8/b3FchA(p2*`J,~>
+U]1>_rmh+iPk'b5V>\uprt"k+F)u\LF/A@*s6#nnN8F@0#j7G!N2<XtF4SY:J,~>
+WW)tmh>[KLg&DQ5KJ=W)F5Hrsekuc.^%_:$#JFWep\-u[F3af9~>
+WW*1shU\3DHWpD'!%IFD$4nX@0fa<%Pg8.[g&DQ=KJ=o1Hf"f&elinF^%_:$#JFomp\-ukF3af9~>
+WW*1shU\3DHWpD'!%IFD$4nX@0fa<%Pg8.[g&DQF[>]Hk[I=.qkF?UPf(\q=#M-$6p\0nn[Eef&~>
+Y5eOrYQ#%"hR257s8V7K&.jN`q#:Zps7b^Vs5u]SPg9;Z~>
+Y5eOr#4J[@=t(U+iX#Q-"BolCn*f'3%.E&\hY7'Mk=Q:&N;*,I$2=Jon,NFV64fC,s*t~>
+Y5eOr#4J[@=t(U+iX#Q-"BolCn*f'3%/95AkP,#Vn!&0?^%_=%$2=Jon,NFVP]OO`s*t~>
+Z2Xguc2Re<h#@TAhX>4c&;9iY$eCP`[HISiekubbXj6rs~>
+Z2Xt$etmF[eHc:4CRi]Eh#@TIhX>Ls(kh\a$eCPh[I=.qel!%r[Eef&~>
+Z2Xt$etmF[eHc:4CRi]Eh#IEC"S]$>HaWYK$g542f'iY=kF?U?cHcH?~>
+[/U.#V#LYUF'9^uK]i43%I]NJ&-sG+kLNfB&:<Tcs*t~>
+[/U=(]o6GM(srTl&0YPRf&$E2hK*0U(khASrseF]65UOgHgfNh(`7qhcMrC~>
+[/U=(]o6GM(srTl&0YPRf&$E2n#`F5HaW>=rse_9P^@J)[I<:TF*k=`cMrC~>
+\,QI&T`5/&3='E`qYq#nN$/HM3=laC=pP[mkKX$W~>
+\,QU*hMb&Map8+]+_.YCi;Wqf3>cQ#qYq#nN%#;e3>`TS=r7g(kKX$W~>
+\,QU*hMb&Map8+]+_.YCi;Wr2N,u,iqYq$!]mFgRN-fWRS9&bZn'1l_~>
+])Md)SGr]2>'oH0rs/"G&-u1bs-3Kg!>p1\rrMlWe,Op~>
+])Mp-kI#(S_[$?:F4Tg>rr^8NHft;+%.Aid(fJrbPSarC+aa+d!Vc'3s*t~>
+])Mp-kI#(S_[$?:F4Tg>rr_,S[I="m#PYWQF.DFn^&E'RHaWbN!Vc'3s*t~>
+JcF4!!p?*)r;R6#N"?7]f)PcX#RCugkPY>_]o6-bpXT:o~>
+]DhurN(P8.#QcH%f&H]2n!qu,rse^](`5Tjs8TJD&/]c_r;Qo5P[g6Xec1.~>
+]DhurN(P8.#QcH%f&H]2n&FPgrse_9HZPG7s8UYkF*k=`r;QoN]qraCec1.~>
+JcF0u!;HEk%HiZn#YN\Js5$WZ#__C>rs._G0b=U-F6D-SJ,~>
+^&J2tPT^mU#Qc/rhW+V9p\b%#mu/\,9%O%BhGOn%K^\m>#Nq%#(`4E;n(.Mh~>
+^&J2tPT^mU#Qc/rhW+V9p\b%#n%F'hPir)HkF?U7[I=(o#Of?bHZOP9n(.Mh~>
+JcG0<!;GIP%JPem#ZB7Rs41?Z&:=0Mrs@O[#REFo+V9>$qu6]kkMQ;i~>
+^]+AdKK6IH"!N$:pYl,]pP]q+;V(mJeliV%Hh[L=$/SPs(d_CT(l\4drrMlWhuA3~>
+^]+AdKK6IH"!N$:pYc&[]mFgjkPtSFV/p^cp\k*un!nH?N2;2K^%_C'!:ShFJ,~>
+JcG-;!;GLQ%-KVV9%O%Beli=jHggt6$h(K,#RGM&s*G#<kPP8\pRJYLs*t~>
+_>aSnPW?#T![3g&ir9GU3>bB>s8UYR(`7Vgrr3B#[9=CYF4UAE&45RWrrVqb[G_(8~>
+_>aSnPW?#T![3g&ir9GUN,t6Hs8V8PF*k=hrr3B#etmG/[HIRtF-Q.jrrVr7f&6RY~>
+_uB`2WrE(njSoUq&.lPTs6!8k.?s#prs\Y(.0qAekPtR@#W^K5rr`"K>3FlEJ,~>
+_uBi5KJ=&##QYK7pM0h&#S>\q!t\)4pZ2>^[29b#s8VOc&2B^Drr3E$XYCYIPir)HPRok3qu6cm
+N*>]/s*t~>
+_uBi5KJ=&##QYK7pM0h&#S>\q!t\)4pZ2>^epDJps8VPXH\BE-rr3E$eqA*t^$l"$]lT.qqu6cm
+]q"QMs*t~>
+JcF!p$1Bk[CX/bC#W^3/rsdgg&-t#9s8Vi$.0s,?r;Qr`KJ<aRn)F@t~>
+`;]kO;X"Gk+ZX=k^$k.Ws8V6`HXeMY#Q];/jo5YU3>cPWX\'EjcMdbPhI@*61!]h!pU)^m>4;Ch
+"n.+!&9I="s*t~>
+`;]kO;X"Gk+ZX=k^$k.Ws8V6`HXeMY#Q];/jo5Y]N,u,acBNC/kPbDin!nH?N9C6@pXY"=V=4?^
+"n/jXF1(c%s*t~>
+W;cklmf*:]f)GaEk5P[5&/[,F#W]TsrrpDP&.i?brr3,P63o$JrVm,s]jhTZ0t$c8s*t~>
+`r?,/KIQ6n"qW4]Pg8.[mf*Fac@ee$g^!sZ`qSWq#D<p;0e!Yo`r5o@c>*t.A&eNJ"P-0V0t$u[
+#PZ5J(`5!8pYu4'~>
+`r?,/KIQ6n"qW4]Pg8.[mf*Fac@ee$g^!sZ`qSWq#ISW"N-fW)f)>UPhQ:jGV:PYG"Qu"jK\$,%
+#PZfGHZP.spYu4'~>
+JcEso#MsM5#RDU!p\t0r[4r4(A)@1a"QshLXnVhp#5<d2#RF>Ri;\<~>
+a8Z4d=qL',";!Sif'hf%!p>4Rg^!p(V<7d_hK'MN&1Pp!rr3/00c1aChYmHWkAr)Sp\t0spP_*L
+&5pg3s*t~>
+a8Z4d=qL',";!Sif'hf%!p>4Rg^!p(V<7d^n#^qXF*m*Krrpu4F*"JPrVm#h[<pL!rr32s]o7#R
+SEJi1J,~>
+JcEpn"Ri0R3QD'u"l>am#VhS?rrMT>rr38m]ik[I+UCEki;\<~>
+aSu;0A*sU)&5%oEiVrr83SOf?He.B["RiHZ3R7X("l>au(bq9OrrMT>rr38m`a]Ps.1ei&i;\<~>
+aSu;0A*sU)&5%oEiVrr83SOf?He.B["S^3+N8FR6"n0HXF,[g/rrMlWrr38uetmG/KQECHi;\<~>
+JcEjl$[Z(?s8V7t(^Na9p\"OlHT;?KCRbqZXl050~>
+a8Z1!&Fg#.+`jLKhZ!Vr9%sUP>2JEA$[ZCHs8V7t+W*hZp\"OlKK0kmCRc4j[G_(8~>
+a8Z1!&Fg#.+`jLKhZ!Vr9%sUP>2JEA$FQDms8VPiHZPFso`#3)N,s?J`d<'Xi;\<~>
+[/U.#Qi@ELN4o8SCBt2UkP+]M$H?Qe#Vhk<n!&1^i;\<~>
+a8Z1J)"S"8+`ks'g]%<"1"us7;V(%2$Jp`]s6j_?(h;b'pAYKF@i-%;SF>p2Hfs>eJ,~>
+a8Z1J)"S"8+`ks'g]%<"1"us7;V(%2$Lb[bs6m(2F/A@"pAYKVV/p^:`qT5@[I<&RJ,~>
+c2Re<rr2umS,WK_jo5IR(_CKGpAY?RN%##D>2J!5J,~>
+c2S%CN-ikEs5uE8#QdVpn(7R?XUs4m![4*.jo5I[+W,"`pAY?RN%kk\>2J!5J,~>
+c2S%CN-ikEs5uE8#QdVpn(7R?XUs4m![4*.jo5J'H[Dm`pAY?c]nCHRSEJW+J,~>
+a8Z/6Jc>lA@gGEXpAY?1@h8nWPhu9:!lgb]j8XW~>
+c2S%"0aJqUf(Vf2#Qc/bn(%F=k98Ob!>qs$rrhe+&457IrrL,TrYP[#hYR6R`hh8Hs*t~>
+c2S%"0aJqUf(Vf2#Qc/bn(%F=k98Ob!>qs$rri(mF-Q.ers%>VHZOPIkPG2[hT"a=s*t~>
+])Md)NrKCR@gGEXn"l!+r;R#rPUQkD9"jutrs$dKs7\Mb6KA)r~>
+c2Rgq.K0SS.<AD^#QdW#pXK3Dk98La!?nT.rs8(/&5(gJV2Xm@rs/:_0c1Ho`qTH3#1!8KpGj'_
+j8XW~>
+c2Rgq.K0SS.<AD^#QdW#pXK3Dk98La!?nT.rs8@qF-Q.f`kCj=rs&52KQD4!hYdBXkPtSVN-gfL
+s*t~>
+JcFX-!;G^W#IP]\69,SgHiF$MpUs01#Uu#4qu6k(XoJ,E#W^rFJ,~>
+dJj@#[I=-co*>C@F6D!O!TtWY#Qc0>pZVV^[4)YZ3=m$\rr35t`_$dZ0pMG0rruZ7s7\5b3TL-i~>
+dJj@#[I=-co*>C@F6D!O!TtWY#Qc0>pZVV^eqA+/N-fWRrr35thNWA.KY@-Wrs#"=s7_InN8sqg~>
+JcE^h!p>4JrWim0^&S,hPW9!\;RQ8rrs.Ca6JhaUKXKk?J,~>
+df0L%3?aXeN:dGX&5oXWrrLt"f*DC#V<Ipkmt;Mp&/\<Ys8Ur?3>`T2[J0Ru#MrWVhZ(9B[H%:;~>
+df0L%3?aXeN:dGX&5oXWrrLt"f*DC#V<Ip\n$RNAEsnMhs8VQ$N,s?9f(](A#Oe1In,LtHf&Qd\~>
+JcE[g%d0@/H]6PUs5$or#RH+?qYpfG8e</9s8ViQs*t~>
+e,KX/8dG\WelqbQ!Z70bci3u\eHc1![HRW#n!o&aN7S%/hI@]?(kgcBrs-hI(b)<]s7bOQJ,~>
+e,KX/8dG\WelqbQ!Z70bci3u\eHc1![HRW#n&DcC^$#Fqn"kAPF1(K5rs._OH[Ed4s7bOQJ,~>
+NrK+RZMt-tN$/H<;V(aF#Of'9#RDS`hV\?`~>
+eGfQp1&V@Y0e)l'!YAQ(ci4(@XVfOn!>q?ers%qN.1d=ohY[<Xn$R3J(b&tOhuA3~>
+eGfQp1&V@Y0e)l'!YAQ(ci4(@XVfOn!>q?ers&52HZOP(kPP8apXZHfF*jbPhuA3~>
+JcELb#3UX_#Vh"hqu6oXKII0D>,CE=s*t~>
+ec,[$3V!FW.@fkQrrVA1+jpVs+e7Zo#4IL"&2Ajpqu6oXN%l.m>,C]Es*t~>
+ec,[$3V!FW.@fkQrrVA1+jpVs+e7Zo#4K6PF,[Nqqu6oi[=iUJV8hu\s*t~>
+_uB`2JcG`L"f3%I6FH:[rs/"h64aDGN9C3?s6&A@J,~>
+f)Gd%9(E5h9%Na`rr_`'8eB>T!?nl5rroMJ&5'A!r;R#jX[3jA.?*`prrM<OiW"E~>
+f)Gd%9(E5h9%Na`rr_`'8eB>T!?nl5rrp\pF-P8Mr;R#rcBNZsHbJnIs8VQHs*t~>
+V>gPi[f6@%l2LnL=pSp4r;R#b```oZ+a`)DrrUbLhW"Qc~>
+fDbls3V*LW+f4/t"8D9QhYY:mC]733K`/mlHT;Y^#Qbj5pZ_\\k?8^<n,31jn&AiS(b'ggr;QiL
+;VpF5J,~>
+fDbls3V*LW+f4/t"8D9QhYY:mC]733K`/mlHT;Y^#Qbj5pZ_\\n!nI$p\b$rn(sR]F+gsir;Qi]
+SF>J;J,~>
+`r?&5JcGZJ"5Z?MK`(iThJ48?&5oq)qu6`K+f42uJ,~>
+f`)!/1%PYPA(LD7rsS:tPZh6N&-rOQ#S?h<!"d3W!?oJIrr_+M(khhe#MsMN&/\<Qn,*+deg[`\
+s*t~>
+f`)!/1%PYPA(LD7rsS:tPZh6N&-rOQ#S?h<!"d3W!?oJIrr__SF1(rG#OedAF*jG.p\XslkCh.?
+s*t~>
+WrE(nR/[9WF#i+Vrs.DN3=#mNXloT]"o"6A#ZBO>s*t~>
+g&D*(9(WAj+dD0Nrrr/)CH34C[Kln+n*9oTms@(Orr35[S2hDt3OS&Irrr.]3=o*Fj8XW~>
+g&D*(9(WAj+dD0Nrrr/)CH34C[Kln+n*9oTpU,tKrr35l`f+t[N6^nhrrr/1N,tNXj8XW~>
+JcELb$f9J's6$dn#RE/<hY[<XpWcAB#W\aUj8XW~>
+gA_3:9(`Gk(kh)5rrUJ]0sCoa9&Ak5$f9J's6m@*(`4udhY[<XpWcAJ(ce_mj8XW~>
+gA_3:9(`Gk(kh)5rrUJ]0sCoa9&Ak5$h*9Qs6nO/F*!;RkPP8apZIcfF,\E=j8XW~>
+g]%9JJcG]K!;GdY#do?2CEWs#A%ha=#1e,f#U*^7iW"E~>
+g]%?LKFmh_!BI:CrrVYR0s(]^C\R,o#do?2F"%YDA&eBF#1eH"&1M,GiW"E~>
+g]%?LKFmh_!BI:CrrVYR0s(]^C\R,o#hHEHXa>,9V:PMC#3WCYF*jbPiW"E~>
+JcEIa#Mqcr&-sGekPG2c[8I893OS>Us6%tos*t~>
+g]%;=)"n49F5H!X!mX[\X9\hDXm5okhF]L>(b)lUqYpo1;A]s*[I=.qn(-S"J,~>
+g]%;=)"n49F5H!X!mX[\X9\hDXm5okn!&KHF+i-5qYpoRS9&b1f(]4En)rd3J,~>
+JcEF`"IpVYSEKbK%G#SD#U,/qs5'l).72nQs*t~>
+h#@Dp+nl6C9#fok!PKq]#QYL^lMh!W.4LeMqYq#UHRTLTN:6f'Xa;chhW=cf~>
+h#@Dp+nl6C9#fok!PKq]#QYL^lMh",H\BE-qYq#fXa>,B^%_QqcF&=ikN2_o~>
+ci4">o`"pcJcG`L!o@F6qYq-$V+M")CUN$=N'\Zn#UuVEk5Tr~>
+h>[N43V`p`&2B.,p[nIdp[@_R!QI-t#Q[i[li.%C@se(P&GN;!(`7>%hStLH.1d%FV>'-PJ,~>
+h>[N43V`p`&2B.,p[nIdp[@_R!QI-t#Q[i[li.%TV7$1"&GOJ7F*k%?n(taBHZO7]`qSWqJ,~>
+JcF4!!;GgZ!OZG7rt4+@+UBfUesp5!&-rOrH]2b'k5Tr~>
+h>[J6q$7%"SC[92!oA:#o`"s;8u2doK_Og4!OZ_?rs@P@.2XduespM1rYPbmH^&=/k5Tr~>
+h>[J6q$7%"SC[92!oA:#o`"s;8u2doK_Og4!S4+Ert4_-KQE*ckJj?OHZO7e[Cr^2k5Tr~>
+JcE1Y'CVba#RF=<=pPBF+ZYLps8UrPhWFig~>
+hZ!W>+oV`M&0Y5AcLLo;kG8_=f(K%Dmo#qe!>)*hrtFk'8f/+;CL\1m(b%e1`rH(qV;CA7J,~>
+hZ!W>+oV`M&0Y5AcLLo;kG8_=f(K%Dmo#qe!>)*hrs/;DP]Lo9V5=04#_\/MhZ*WE`p`'iJ,~>
+fDbjFJcFa0!oA8IrWici&-s+>KXL";i;\<~>
+hZ!h>.8!L&Ph,TurrpDG(^MS9p&>'#&>KL33Srs!!oASZrX]>q(`4DgN4&-Ki;\<~>
+hZ!h>.8!L&Ph,TurrpDG(^MS9p&>'#&>KL33Srs!!q3ODrc8='HZOOu^"2Z0s*t~>
+[/U.#TDnocl2Lgm64j)$";!SH[GK^=J,~>
+hZ!\tf&#l_rs#k[&-rOjf(T+EpKF6r!JL43rr]Z$&/bBX";j.X[GK^=J,~>
+hZ!\tf&#l_rs#k[&-rOjf(T+EpKF6r!JL43rrL]8r,W!fN4mg2h#Dm~>
+aSu87JcGBB$La3&#RCtb3J>*/qu6oietlkS;PiR>s*t~>
+aSu>9XWdWK!@c=frrKeETa1Z9SEp1Vn!#:#&-OFBKZ<KXrs/#LX^b7,V<@%AJ,~>
+aSu>9XWdWK!@c=frrKeETa1Z9SEp1^pUtopF*i7m[GLBLrs/;]cD@&$`p`*jJ,~>
+JcE:\#*^8S6@6E7qYpZ\[=g:4#QSZ's*t~>
+aSu:C+oDTH+jTf]!+VW,!BJ`srs"]:.8#9,n,!%en$S*/)#Y!GF6ERR~>
+aSu:C+oDTH+jTf]!+VW,!BJ`srs$/`H^(qhp\Omln(+n*r,Vk?kPp&~>
+JcE:\"Qu#hhY6mH%,S*a+V4nj;HcBu.D=sFJ,~>
+ao;Cu+o2HEPkY1YeiB<-!.4&3"Qu#phY6mH"5^F`.K1.f;HcC(0uiGWJ,~>
+ao;Cu+o2HEPkY1YeiB<-!.4&3"Rj%\n+Z\Y%.DK3KQD3]S>DHkK\kqmJ,~>
+^]+<.JcGBB&GP@q;BZ;O+[U7is8V7K+gpP6J,~>
+b5VM2>58F)>5.gl!R;j[#QZ+"jSoeckI"2:(`4\gHcH*cmn,%:kl6/~>
+b5VM2>58F)>5.gl!R;j[#QZ+"jSoecn(+"^F*!#![GLr`n!&LVkl6/~>
+bPqS:JcG$8"R!1G66Z=6![3fbrVluN3?bfos*t~>
+bPqY<PSj3%!>+GhrrKeVSHo6okNDjJn$Rg@.K0k[.?r]frr^h4.CJC>J,~>
+bPqY<PSj3%!>+GhrrKeVSHo6okNDjJn(+n2HiA'fKY?jQrr_GCHe.E\J,~>
+[f6@%Jc>iP`a^1k#Rqqu+V:1<s8V888dIH.kl6/~>
+bPqV"1%tqRSGE0cpPbUJ!?nl7rtEC^.2WU-.=3K\V>(#imt=:M3S*EoJ,~>
+bPqV"1%tqRSGE0cpPbUJ!?nl7rrV&RK`6#qKWTTJ`r>uAn%Fs,N9BF)J,~>
+JcE.X'=AAW#XWUXs7]CsA'Uod+UAW&Pir's~>
+bPqQXp':Y_q#:>IRg9$ekN`'I[Jh!R6@7#XpJMQ<cE2.:(_A-\kPp&~>
+bPqQXp':Y_q#:>IRg9$ekN`'\epDIZPdTBJpRH<,kK^2VF*iSRkPp&~>
+[f6@%K)Z#23=n3(kPbDfPR&*T(^LC6CW>i+s*t~>
+bl7^W)#"::9'?$M!V^Z(#QV9urrq7G(d`o=rVm4p&0WbO&/[`T`p`*jJ,~>
+bl7^W)#"::9'?$M!V^Z(#QV9urrqkMH]5B$rVm5EF*iReF*!SJhY645J,~>
+c2Re<Jc>`Em/I0a+X+8jrs71!#RCu.N8F$bs*t~>
+c2Rh=HhRdH(p3Q4!Nd3.#Q[itm/I0a.4M\%rs71)&.f[NN8F$bs*t~>
+c2Rh=HhRdH(p3Q4!Nd3.#Q[itm/I1-H\BuIrs7e7F)u\m^$k^Ws*t~>
+JcE1Y#,N.c[HH`0rVm"I.;R5tir=N~>
+c2Rgi.JF)K>4;4c!QHRX#QYLEm/I9l+YgCnn)"$C"GALFcL9cmJ,~>
+c2Rgi.JF)K>4;4c!QHRX#QYLEm/I15H\BuLn,<7h[=k[FpYu4'~>
+JcE1Y#ObOr3GVMZf)G^LhV\?`~>
+c2Rd.pBUd2XnMbqk>I`S!D;hJrs/!j&41/19%O"As5)Z5J,~>
+c2Rd.pBUd2XnMbqk>I`S!D;hJrs/:gF,[5kPir&Gs6nkFJ,~>
+JcE.X!2]W"!>)Bes*t~>
+cMmq69(rSl;Xa;Y!/-dH!?nT3rrJr5r=At2gAc[~>
+cMmq69(rSl;Xa;Y!/-dH!?nT3rrC(;ErgX5gAc[~>
+JcE.X#5>N88n59lgAc[~>
+jSo7Fn*U,UehQn)!0$RM!T#8o#Q\H(mJdCb[;/BM[HH9DJ,~>
+jSo7Fn*U,UehQn)!0$RM!T#8o#Q\H(m/I7?V3J+5n(Rel~>
+JcCN*J,~>
+jo5DF3Tof0!OWL6#QZ+;oD\in&=Wq+.Fu96J,~>
+jo5DF3Tof0!OWL6#QZ+;oD\in&=Wq+.Fu96J,~>
+j8T,RiVroPJcEdjJ,~>
+jo5CiA,#Bj!0m3`!F#6hrrVY)&=Wq*N5,CC~>
+jo5CiA,#Bj!0m3`!F#6hrrVY)&=Wq*N5,CC~>
+j8T,RJcFs6!;F;/J,~>
+k5PPP;IfIgrr?j/#QThRrrVY1+e/f=9)$.$J,~>
+k5PPP;IfIgrr?j/#QThRrrVY1+e/f=9)$.$J,~>
+JcCN*J,~>
+k5PM..9c*<!$V+C!>riGrrVYk.@^YD[D;fm~>
+k5PM..9c*<!$V+C!>riGrrVYk.@^YD[D;fm~>
+JcEgk!;F>0J,~>
+k5PL0#[6Tp!$V+C!BK$)rrL,;SHo7;pVHl[~>
+k5PL0#[6Tp!$V+C!BK$)rrL,;SHo7;pVHl[~>
+kPkPVhZ!TMmJd1\JcFL)J,~>
+kPkYY3=&gTrr=5;#Q\H0mJd:_N%#=2#QZC*_>f#~>
+kPkYY3=&gTrr=5;#Q\H0mJd:_N%#=2#QZC*_>f#~>
+JcCN*J,~>
+kPkY(#RFW#rr=5<#QYdElMgqBPVJj;!>qZLs*t~>
+kPkY(#RFW#rr=5<#QYdElMgqBPVJj;!>qZLs*t~>
+JcEdj!;FA1J,~>
+kPkX*#RFW#rr=5<#QZ*gkl1_8N%q%4!H\"Ps*t~>
+kPkX*#RFW#rr=5<#QZ*gkl1_8N%q%4!H\"Ps*t~>
+`;]i3JcE^hJ,~>
+kl1e2+UA?Wm/I&/q$7!npZDJYkEI,,&>f^6.HeSJJ,~>
+kl1e2+UA?Wm/I&/q$7!npZDJYkEI,,&>f^6.HeSJJ,~>
+JcCN*J,~>
+kl1df+UA?Om/I&/q$6t9ir9+oN(Oqc#QZ*g_Z,,~>
+kl1df+UA?Om/I&/q$6t9ir9+oN(Oqc#QZ*g_Z,,~>
+l2LbX^&J*,Jc>cNkPVIKs*t~>
+l2LeYHi=9O+m87m!$V.D!4Cec"S_)m;CSRN!0#b6!q37nrjD+mJ,~>
+l2LeYHi=9O+m87m!$V.D!4Cec"S_)m;CSRN!0#b6!UnV<cKtR]~>
+U&P,eM#RYA[>[F4.Js_XK]he'J,~>
+l2LeI9)T"qkO&9L+o2HF3Ubi)"o$m!KK13X#QQ=5rrql!PX7Abr"oHfn*^4+~>
+l2LeI9)T"qkO&9L+o2HF3Ubi)"o$m!KK13X#QQ=5rrqlB]p+J/r-JIPn*^4+~>
+JcEai!;GdY"5^GU^&J$4c7/_urZMG38g+b)n*g:,~>
+l2Lasr!3;)mJd/@q?R(cg&D3D`d:<$YQt7@pZhb\hR/lnrr3#E1&_a`.K<!B.2\$4n,In~>
+l2Lasr!3;)mJd/@q?R(cg&D3D`d:<$YQt7@pZhb\n(,M8rr3#^K`6#uH\@':P^@bjp[A-4~>
+JcDqR"Q!<*#]'G>%GjDW;KJtR^"2%M#X[D:s*t~>
+l2La1r!3:4mJd3W)#OX?+jS[="6[[N9!JX%Xm>uihHD?FC]=>ChF\V_HaUl5hVN#b6Jh22J,~>
+l2La1r!3:4mJd3W)#OX?+jS[="6[[N9!JX%Xm>uin!n`GXoA>0n!%m`Xj5e[kO56gPje)@J,~>
+R/[0\Rf<QJ;@!gWF8c+@@gGuqrVm#pKEsp$n,In~>
+l2L`]r!3<HcL1];mt;hi#S:e7e,KRFn#^(CZj6Yrm/I7G;@jZoHi<sHCD]t4rVm#pKFgK,n,In~>
+l2L`]r!3<HcL1];mt;hi#S:e7e,KRFn#^(CZj6Yrm/I7PS9'%1Xo88%V/r0qr;Ql,F-Q.^s*t~>
+c2Re<rVlllJcGcM!;Gm\"f3@ZK\#>brsWBC;Wn)[kIm*H#ZBjSs*t~>
+lMgnJ&Gue7&>edo"o#,s3MlJqrrU2](q'\NA,#Bj"g'3sN7R1jrsWZ[;Wn)[kJi`Y(fKPcs*t~>
+lMgnJ&Gue7&>edo"o#,s3MlJqrrU2](q'\NA,#Bj"jVIA^$"k_rsY`FSF?LXn(u'KF.D^fs*t~>
+ao;A8bl7\;T`5/hHO)t$r;R6#PR'V=s8TJ]&-t"up[A-4~>
+lMgk0q?R(2li.%LhY57o!r%oj[g3!phX:CHpNm`Dn,31ppQQ4]kPtRq0c1`^[J0.iJ,~>
+lMgk0q?R(2li.%LhY57o!r%oj[g3!phX:CHpU,(,n,31ppUtX4n,NF=N,s'!f(\Y5J,~>
+JcDtS'q?F%[GKK2F)+r&#RIj<s7\5k.F.\Us*t~>
+lMgj2q?R*F`j>[Gmn1%p!AWHurtV%Q0t#lpX`JPe.2Wo0s8VgJ.5B-Bmf.e~>
+lMgj2q?R*F`j>[Gmn1%p!AWHurtWP#N7RI\cE44FHZO8Zs8VhPKS8O_mf.e~>
+JcDtS!T$0B#QPG6#QbPlf)G[NXkrg=s*t~>
+lMgj"q$6t1Zi:'>+h%^X&=i.f%GjD_&/Yrq&.fZi&2Dc8rrT=Zp[%p1~>
+lMgj"q$6t1Zi:'>+h%^X&=i.f!Ul9JErp]IkPkJ_cL:Mos*t~>
+JcDqR!OXre#R<@V8pdD:`qSWqJ,~>
+li."B3V`p](tQ+p!QHk%#QUC]rsZ:q&.f[F8kOc=Xj6\'s*t~>
+li."B3V`p](tQ+p!QHk%#QUC]rrL]0rc8='Pa&T$f&$/`s*t~>
+hu<]NJcF-t#Mukr^$"kQpYu4'~>
+li."2+nu<DF8*0D!T$GU#QU+Trs.Dg[Ctbln+YiAJ,~>
+li."2+nu<DF8*0D!T$GU#QU+TrrDNeec>1<pYu4'~>
+JcDAB"8D!Ap[/!2~>
+li.!f)#+@;&=g60!q36?[0Qe:n(n!GpZL`6mJh\~>
+li.!f)#+@;&=g60!q36?[0Qe:n(n!Gp[@SFmJh\~>
+JcDYJ%Hjj`V4=BPV0c*4F1(c2s*t~>
+li-s+p':[ZcF3`R]fEM,!D;P:rseG!S?8<`S>Cm:;L>hGn,In~>
+li-s+p':[ZcF3`R]fEM,!D;P:rseGJ`m2TL`l>EVS@-rBn,In~>
+h>[KLJcF0u#1e,M.5;tpq%3Q3!tZ;rp[J35~>
+li-s+o`tRQpU:)'kA(pE#QZsKli.":K`3\,.5CT7rt#5TK_P!9J,~>
+li-s+o`tRQpU:)'kA(pE#QZsKli.FW[=j3lKS4DnF*htTHi8!eHaWV;s*t~>
+m/I([JcE[g!QIb1#S/(5.60+30g]Yk@r"C:&A@T5J,~>
+m/I+\C\.l5K^ZAL!q367\Hi4.kNr3M`_%*I&-F@90ff4f#YJlRCMQNZ&A@T5J,~>
+m/I+\C\.l5K^ZAL!q367\Hi4.kNr3LhN[t[%ss7gN/WFKPc_'aXd!mRf'r]i~>
+O8f4SUAkJe@gG)AH\A6n`W=B9rVluF63sFWs*t~>
+m/I+C1%Y_Q&;9M\rrVr.9"G9/3Tof0"7L":3W=[:V8gg+`m2ldrVluF65Zios*t~>
+m/I+C1%Y_Q&;9M\rrVr.9"G9/3Tof0"8AX5N;g3b`r+]nkPbD_kEL&5nGe"~>
+gA_0IJcF@%"4d_`^&Id#s8VfqhEhLEnGe"~>
+m/I+;+nGs@&:=/ZrrVY!&A&2J[I*treeet3rqH0es7ZWP8f4]"s*t~>
+m/I+;+nGs@&:=/ZrrVY!&A&2J[I*ttkAt^qp\4C]s7ZWaP]P.>s*t~>
+g&D'H[Jp7$V>gYK&.#]ArrVZ7^&>qT]o7#J&.lPEs*t~>
+m/I+;+n5g=HhXrJ!r&f?]EeM>mJd:>(`9[YrseGB`l?<DcFo0`Eu5b6nGe"~>
+m/I+;+n5g=HhXrJ!r&f?]EeM>mJd:OHZRd9rrMlWr8%Y/]sXt`Hf"8lJ,~>
+MuNeOVZ.G#=pR-(CL_-q@js,]0ek+#&-rOQHggJ(J,~>
+m/I+;+n5g>(jk_ZrrVr.;S<>9XmQ,pmpcnhF),Q4CMWf%"t:B+&/]c_nGe"~>
+m/I+;+n5g>(jk_ZrrVr.;S<>9XmQ,jpRH;`r2g4#KT(SCN.cl`Erp]rp[J35~>
+f)GaEJcFI(!nKsTr<W62"sG]M0g_`"n,In~>
+m/I*V&F]r-&5(gR[Jp<k=qJFS!3PVf#1cB`(_@MqqA92]r\4IHXlo0QJ,~>
+m/I*V&F]r-&5(gR[Jp<k=qJFS!3PVf!p>epr,_mb$?LQ@F*ik!N0MWVn,In~>
+JcDkP%Gm%A8kN9OV59]YV4>Qis*t~>
+m/I'=m0Eb:Pjc!Z!NdN\#QV!mrs%>=;Gp+sSGo>eXehl6l2Q8~>
+m/I'=m0Eb:Pjc!Z!NdN\#QV!mrrqT!S<T87rPerb`l?m"s*t~>
+e,KFB[f6@%VuHbkrT=1Tir=N~>
+m/I'=lj*\19"ju-rrVr.9#1c5Xm5oipZM#.n+YiAJ,~>
+m/I'=lj*\19"ju-rrVr.9#1c5Xm5odp\jR>s*t~>
+JcDnQ!:TU\"8D!QpZqj0~>
+m/I'4l3IJ/>.*h-rrUbm&AnbRXmH&fn+H\_p[@kNli2J~>
+m/I'4l3IJ/>.*h-rrUbm&AnbRXmH&fp[nIdn+Z,IJ,~>
+JcDnQ!K=_crr]Z4>1W$>J,~>
+m/I'=kQh8%;Q\6QrrJr>`!?@Fm/I*F`qKE7[9@(kli2J~>
+m/I'=kQh8%;Q\6QrrJr>`!?@Fm/I+"hY-sOesrT"li2J~>
+bPqS:JcFm4!r$27pQPlPHOqX>p[@tQo`'F~>
+m/I'=jTku<N2>D*\c2]D9#V&9XmQ,ipLA"4S-=Q_0uitVqY0X^J,~>
+m/I'=jTku<N2>D*\c2]D9#V&9XmH)fV=qn3[<mS`s7uE]s*t~>
+WrE4rs7cQfMuNhP;YCY5(_?ra+Xnip+Yb,p+XpU.p\4]<~>
+m/I'4is5_u+YeZLPQTM*hQ?O:'".2skO7m&n*fH.n)s06s7cQfh>[N=9#_,:XmQ,ipJMRs(^)!!
+(_A.q0aK3_.5<8+>/p=2s*t~>
+m/I'4is5_u+YeZLPQTM*hQ?O:'".2skO7m&n*fH.n)s06s7cQfh>[N=9#_,:XmH&uS9'$uHZOOT
+HZOOTH[BgTre(Q9KT(SCKS5lHpA]X~>
+UAk5fNrK,X+o"&&0f^B_#UqJOq$7!M[J0]O~>
+m/I'=g^!ru+X-Ob!"efH!AT9+N!$c=f(\,&!p=&:a9VdJm/I)a.J>b*.2WmV0e)o0!AV"Vs*t~>
+m/I'=g^!ru+X-Ob!"efH!AT9+N!$c=f(\,&!p=&:a9VdJm/I*VK_C?.HZO7]N-kAA!K>V(s*t~>
+JcGcM!;Ef!'DH"$cGn/T`m2lLcGn.V&1OI$V>GoKHSGe0kP5(-~>
+m/I'=]*JTa.620jcL9cm!V^BN#QV!orri(3Pg7;Fc4\.BKGZG?cD?JYKT(kCKJ=$Jn+cp5~>
+m/I'=]*JTa.620jcL9cm!V^BN#QV!nruIrLkMGCbhWO(YkMGC0H\BE%`kB'n]tLh]N,tNXq#>j~>
+SGrT`PlCclf(T+TS.IF#s8Vinp](!fpOif4f(f8q~>
+m/I'4[Km!Q8pg%$jSo8;9$%>=XmH&g[GLWW&=aRlcN!q=s7cQfs7_H`3S+!*J,~>
+m/I'4[Km!Q8pg%$jSo8;9$%>=XmH&gf&uc,&B8dMkPtSVs7cQfs7a3JN9C!9J,~>
+JcDGD".UMh`qo`8pB,aJ3S+!*J,~>
+m/I'=ZNpXV>-6uLrrMR\b6S+lcJSX(S1-2<qZ$Ti"+(S>f(f8q~>
+m/I'=ZNpXV>-6uLrrMR\b6S+lcJSX(`d<[$qZ$Ti"1<3/kP5(-~>
+R/[0\MuNn1V6/qXrs$bY@j)+fn+cp5~>
+m/I'=Ym:FT8u;:ErrKeVbQn5AkMQ:AhPI@Cqu6lGCL\e1C[_&uJ,~>
+m/I'=Ym:FT8u;:ErrKeVbQn5AkMQ:AkJl*Aqu6l`V58idXnVVjJ,~>
+JcGZJ!;E&a"gnUA&37Gus*t~>
+m/I'4Y6Y4A;RPuWrrVqZ&BtI]3Tnrm"gnmQ(cfV1s*t~>
+m/I'4Y6Y4A;RPuWrrVqZ&BtI]3Tnrm!7q-j!K>V(s*t~>
+JcDkPrT=1TnG`X2;HfUApA]X~>
+m/I'=X9\l"XmbNS!Tu2^#Q[Q\li.+VkO7U.nG`X:;HfUApA]X~>
+m/I'=X9\l"XmbNS!Tu2^#Q[Q\li6qP!;H!_"Q#ZF`om'qJ,~>
+JcDnQ!T%ns;?2(BV#e:(p&>'Up[nK9~>
+m/I+"(p!uE&9H^mrrA;.#QZsKm/I+CF8f>IH_mj@XhFK%rrMT_o`'F~>
+m/I+"(p!uE&9H^mrrA;.#QZsKm/I+TXo=gp[DpM3cIVa_rrMT_o`'F~>
+OoGFUT`5&L;Z-k$&H3LJ&0We-3<`$>V6-T%rpL!an,K5lp]#a~>
+m/I+;+fYeL3N`&ArrM:Cc3OE/m/I.D=r@5M!#Y\Y!Z3@@r](!WPl@cb[JoUtp[A-a[J0]O~>
+m/I+;+fYeL3N`&ArrM:Cc3OE/m/I+TSGdO,HN8`tMuf0VrltMpr:^9mcIVaiJ,~>
+JcDtS$1DX80j8's>$<Z[.0(Od#lQac6B$TKp]#a~>
+m/I+;+fP_K&;9N<rrA;/#QUC^rr__*(btu!!*]=U!%IgW$Q'Ed(caTC3D,6hf(]2p~>
+m/I+;+fP_K&;9N<rrA;/#QUC^rri(uF,ZXgV#d*FrIjrerJUiC]tNV's*t~>
+O8f4SU]1GZP\[,orrMT6rk/<6rGr-X.2X3F)#OX?1"Q+!J,~>
+m/I+;+fGYJ&;9fErrL+_cj0X`V="9bkEL%irVloecMkf`Xo3STCG?t]+X%C.(_@65f(]2p~>
+m/I+;+fGYJ&;9fErrL+_cj0X`V="9bn%GjKrVlomkPj<FcF'd^Xf[8'H\?bDErh6_p]#a~>
+JcDqR!r(mPp](9^s7ZrjhVQi?[9=+Q@rjufp]#a~>
+m/I+L8uDpq&;9EM!U!)%#QZC2m/I.]n+ZSVs6p!^%.E'0f&!f<(`6b09%Nb:J,~>
+m/I+L8uDpq&;9EM!U!)%#QZC2m/I.]n+ZSVr:g6[$0Ud.S9oUZ[?TkKs*t~>
+JcD,;"e6`6s8V9Us*t~>
+li-s+V?d57HggD&!UjgN#QZsKec,fC.8p3Gn+Qd3~>
+li-s+V?d57HggD&!UjgN#QZsKec,fmH^t-9n+Qd3~>
+m/I([JcE^h!Ul9PEs%rXf(\e9!khKQoDa=~>
+m/I+\H_guK+gp_;!L+/C#Q[Qdm/I+TPl?"3SBf^[oD\m3;LA$8J,~>
+m/I+\H_guK+gp_;!L+/C#Q[Qdm/I+\^&G,9`olOZoD\mCS@.tgJ,~>
+JcDtS!Ul!G#RM%c3Eg4+hWOq5q#:BOkO\_(~>
+li.!^(o7K=1$A!)!Ls_K#QThMrt"RW(`3f$(b%ITF1'lfs7c<g!T*;:s*t~>
+li.!^(o7K=1$A!)!Ls_K#QThMrrMl-rGr9lKT)b0f'i)-p\=dgn+6R0~>
+JcDtS#c/[]@s^O/+V=SX#pEeoXhE<SkG>l\s*t~>
+li."2+f#ADN:-]Heeld?!4D1n$*>X"@s^O/.1d?q&.'dqF03I=n*d*mn,In~>
+li."2+f#ADN:-]Heeld?!4D1n#gRdDV6uPPH[G^4$%&MNf&#Tan&F5Qs*t~>
+JcEai!;Gm\%.A6C6Ke++hQ<Vq;F:<f"rJLM>'!$,n,In~>
+li.":0r,'U1$A!)!$Tbr!>tRurseF<&45j[kMEVCHW!HQrX]8W.8")k9!.R^J,~>
+li.":0r,'U1$A!)!$Tbr!>tRurs\Y0F-Q.fn)r!9[@EK[F8pRiPbkLHcL:d`~>
+JcE"T"SZ[;9)&8`#k-s5[C'1).1lIa!BJa"s*t~>
+lMgioUBgjQmf*81dKfh-m/I4_CD]\<r;R5pkMEVS@nJHe(_@NNf'iWh~>
+lMgioUBgjQmf*81dKfh-m/I4_X`Ka$r;R#rn*eiYV3HZ3Erh6_n,In~>
+JcDtS#c/[UCTY#$hXC=@#3W[Q;G(-Ln,In~>
+lMgjCUBgl\hXCIE+jpVrN9gKLXXP*.XgR$Bn,!%gn%FZX8m:*?s*t~>
+lMgjCUBgl\hXCIE+jpVrN9gKLc?jo?f%0<Yp\Omon(,1BPbmj;s*t~>
+JcE"T!r&2rrWi]>6<\/pV=46[!pA/'n,In~>
+lMgk@UBgl;Xmc8i+k$\t&?Y=!%/68/(_@5q6<\H,V=46[!q4_/n,In~>
+lMgk@UBgl;Xmc8i+k$\t&?Y=!!r']]rGr.,S?9fVp\Fgjn)sH6s*t~>
+M>mSMWrE7).1f*]+oVcI&-j@5>*Pl7p\3tQJ,~>
+lMgnR+eo;DK_P!9!$Tes!@cmlrt;Fg&5m!e(`3f$(b%1CS?:ZBpZhd/~>
+lMgnR+eo;DK_P!9!$Tes!@cmlrrp]$F-NMSrcA'c"cStkcKFrds*t~>
+JcE%U%/4fK6LXs2c@ft2.4P3$"<f3t[I<J^J,~>
+l2La!UBglDn+$DYmig-c!D;hJrtY9L(eX8shTh($;DBmC&.f[-0j;!Rm/MS~>
+l2La!UBglDn+$DYmig-c!D;hIrsPrMPkY4@kIn!fKS9;F"FGfuf(\P2J,~>
+JcE%U"8?jB>5S=-hT!6UHU8l!#RG57m/MS~>
+l2LakUBglDkOJQQXUrqe!0ljM"8?jJ>5S=-hT!Q^HU9/1&.iXGm/MS~>
+l2LakUBglDkOJQQXUrqe!0lgL!j-O6qu7&mhVPZJP_=C)F053's*t~>
+JcE%U#krBG+e8#qs7cHk#4LF"[=iUcli2J~>
+l2Le0&>TR4(uFf_!Ls_N#QZ*gm/I@cEtBdsn+ZkVr;QuihVPZ!F.DRrJ,~>
+l2Le0&>TR4(uFf_!Ls_N#QZ*gli.3lF*kq$p](!crs&5dkLR>K`p<YT~>
+l2LbXJcEpn!q0V1r<NU;H^rC4n*f?;J,~>
+l2LeY>,)?'K^o'CS.P;u";iRB0d5Zb!E/CQrseF4(`3eq(h85hcIVIYjSs`~>
+l2LeY>,)?'K^o'CS.P;u";iRB0d5Zb!E/CQrrVqkHi8!iV7">+kP+`3s*t~>
+l2LbXP5bOV]Di&c3HIeQ+oV`P&1KVLH_nFEkPp&~>
+l2LhZPRsVr!/0qC!V^C&#QbiH^&Hjic>t/m#QV9urrpt?F%SbJrX];O0fa#rXiBhms*t~>
+l2LhZPRsVr!/0qC!V^C&#QbiH^&Hjic>t/m#QV9urrqSE[?QVsrc8<kKT)b8cJJ<Ys*t~>
+JcFg2!;Fk?s-s>_hVPZ:F"nj:#R;1q;Hf%9hXBh2J,~>
+kl1\H0r,'TK_#-Dk=YFR![4E/r;Qim`ZaUQ!>t:ks8ST&n(up/V/n@?(_@5q+Ycl)N8EF[m/MS~>
+kl1\H0r,'TK_#-Dk=YFR![4E/r;Qim`ZaUQ!>t:ks8U(Dp[@S%`jLbPrGr3jKUemPn*g#;s*t~>
+JcD_L#M,`9;F2fL&H2q9&6eH#J,~>
+kPkNlU^-sRo)Aa(+nl6C;WmiT!0$1K!0#n:%+_PF;G&Ye(`3eq(g?;+J,~>
+kPkNlU^-sRo)Aa(+nl6C;WmiT!0$1K!0#n:#NsCGS<S\RHi8!cSF$9+~>
+JcE"T!RBQsrsAG_`heo'=qCs"m/MS~>
+kPkOiU^-sRo)A]lpBUdCcM.>>mo&KX!>*iHrrLF%q#:Zpn&D2g>$;aS3UHcr~>
+kPkOiU^-sRo)A]lpBUdCcM.>>mo&KX!>*iHrrM<Oq#:Zpn(u@'S=FqIN9pRp~>
+kPkPVM#RJLaSuLY;COUmN6^nerrr/[kK[Ram/MS~>
+kPkSW0r5-UN:[&MmooGk!N#ParrJr-m0E_jn*BuY`_nNO8rV'aq#:NlkNC-+K^A_h~>
+kPkSW0r5-UN:[&MmooGk!N#ParrJr-m0E_jn*BuYhOK7XPeH8Sq#:Nln*fG9[I!pD~>
+JcE+W$cY14&0V;b(cdhokP+uWV4?oPJ,~>
+k5PFXV?d2>cL_&:k:-03!Ft<crrL\2mK`h:[Hmi#c8cFQ.2WmF6BoLYp\t8rSF$9+~>
+k5PFXV?d2>cL_&:k:-03!Ft<crrL\2mK`h:[Hmi#hMcN&HZO7TN4n*:p\t9>`pE_U~>
+JcE+W%"nm0Pbi^]&-rOjCVBNC!Uo4<s*t~>
+k5PJ=3N!,`+m8Is!58.5!BK$/rrM:dmK`hcn*Bu^KFfT&V0ap6(_AE;`q]T6n*L()~>
+k5PJ=3N!,`+m8Is!58.5!BK$/rrM:dmK`hcn*Bu^[<$]7cF&UXF*!#:hY@*Op[@JKJ,~>
+JcE.X%duC`F8,_'eua!:#RF&Zir=N~>
+jo5@?&?#j8)!CMj!0$^Z!>)[0rr@`?#QV!mrsnKX&:=0On(t0n.1d=ghW"Qc~>
+jo5@?&?#j8)!CMj!0$^Z!>)[0rr@`?#QV!mrsnd^F05KBpZL,0HZO7mn)F@t~>
+M>mSMXoANW#[6*ZrVm5]N%#$cp]%(:V<@(BJ,~>
+jo5AE8uN!rF8,>,!TtX%#QS&urrA#H#QS&mrre8l>2K#PrsIVA0c5T<s/gXEkNMqr~>
+jo5AE8uN!rF8,>,!TtX%#QS&urrA#H#QS&mrrf`NV=40WrsJ5.KQFQqs3A$ln*'e%~>
+JcE.X#KBXI#XWmGf)G[VpNm04hY2's&6dBDs*t~>
+jSo4MW<`MAV=X]fV%EG.!1`TZ!0$CQ!>)[(rs-PA&.hH\[GLo_$MSla9&B;`(`6H%l2Q8~>
+jSo4MW<`MAV=X]fV%EG.!1`TZ!0$CQ!>)[(rs.DNF*!SRf'!#3$+4i=n+Wr*H^s9`s*t~>
+JcGZJ!;H!_!;Fe=(@PaK.1caj+[U8$kN?"SC[_#*3=#n3l2Q8~>
+jSo8L+fYeK+jT`[!V^+!#QUClrr`"lHggk3!JD$S#Q[Qdli.ahCND3I(_A,_He.ZS=qGK<pUrR(
+&9I+9J,~>
+jSo8L+fYeK+jT`[!V^+!#QUClrr`"lHggk3!JD$S#Q[Qdli.apV6,DtF)u\mXlo0AS9(h,pXY:E
+F04^,J,~>
+JcE1Y&)LLQs1O(X+V4nb.7+:GPl:UaKEqk?lMlA~>
+j8T+UWX&W'n+?V\c8#)"!3Q2!"f3pZ#V"@&rr@`B#QZC*lMh+G>4;L2KM!]m&-O^S(`8M9rr\2k
+(uFQXJ,~>
+j8T+UWX&W'n+?V\c8#)"!3Q2!"f3pZ#V"@&rr@`B#QZC*lMhC`SF?L7]p*kjF*!#!F*#A"rr]ZM
+F78DoJ,~>
+JcG]K!;GdY!;G"C!q2AMrVm#`[=hEhrWiQBKY@Bb"2+sGhWk,k~>
+j8T/C8ur:!&?YU)!r%?Zq$7!UhYmHTefjtt!K?dPrrM:dnH],AlMgqSS?;bi$KngM;A^5^&0Z_H
+rr3)6&/a9hs*t~>
+j8T/C8ur:!&?YU)!r%?Zq$7!UhYmHTefjtt!K?dPrrM:dnH],AlMgq[`m4P_"RjpLS9t6V!dh?+
+rr3)OF*$g8s*t~>
+j8T,RJcF=$!nL8Wqu73$hR-6)#RCtr>+E90#U/'is*t~>
+j8T2T[3=`>!>lBh#QZ+*o`"sT+nu<D1$AN8!MpA+#Q[Q\rr3#U3V!FV3To]-!o?h_qu73$hR-61
+&.f[5>,B5K&1QK$s*t~>
+j8T2T[3=`>!>lBh#QZ+*o`"sT+nu<D1$AN8!MpA+#Q[Q\rr3#U3V!FV3To]-!p?*)qu73$kLQ/M
+F)u\eSAsE^F*mB@s*t~>
+JcE4Z"f2JJK\#norrh2l8hh1]#QYcql2Q8~>
+ir9&JF6Nr4Hfq4KaTqm"oD\g(pBUdSkPbD]N"Gpn!@cn)rrK55o*>@6Xm,ihV&1Y7f(]%@"Q$gi
+0d6N-!Z3)6l2Q8~>
+ir9&JF6Nr4Hfq4KaTqm"oD\g(pBUdSkPbD]N"Gpn!@cn)rrK55o*>@6Xm,ih`cHg@kP+iQ"Rjp+
+N-kME!IM6=s*t~>
+JcFa0!;G.G#k)77#RDl+[HIAc#M,_T.1f[QkNW"s~>
+iVrr0+mTC:(tS`eKZXQ$+n,('!UiYT#QZ[CrVlo+)#OXBXoJFqF7KS:F6W]1mpd1O&2AjGn+ltg
+etlk2(g<Hul2Q8~>
+iVrr0+mTC:(tS`eKZXQ$+n,('!UiYT#QZ[CrVlo+)#OXBXoJFqF7KS:F6W]1pSE4XF+gsPn+ltg
+kJj?OH^r+El2Q8~>
+aSu87`r?&5Y5\gJ;RL9O#S8._Xn_nukLR?'kPp&~>
+i;We9lNdYCp](9M;ToCJ(o@!!rrKMEpBUdSkPbD]mihW8"W4rQs6hu>#QZ*ol2Lk*;RL<>(]l-i
+Xn_nukLRZ0kPp&~>
+i;We9lNdYCp](9M;ToCJ(o@!!rrKMEpBUdSkPbD]mihW8"W4rQs6hu>#QZ*ol2M(HSCXf`F*iS:
+cM7DAn)rQrkPp&~>
+i;WfOJcFI(%I`K[s5'84&-rP6[FY*/s*t~>
+i;WlQHP#QM!?pY*rrLt:bm4>Rn+?V\mo&ib!@cn'rrl"#+`h/$rr2tgnd#5Skl:\Os8N/WS3m2l
+"%ouPpYPq#~>
+i;WlQHP#QM!?pY*rrLt:bm4>Rn+?V\mo&ib!@cn'rrl"#+`h/$rr2tgnd#5Skl2+dn,NFV`ftgk
+F-P8=pYPq#~>
+`;]i3U&P,edJjO0PY)Jm(da2,n)44r~>
+hu<`69'cf`[Jp1-pU)0j#QZ*goD\if)"n49&?Ym1"19:$kPbD]pIb#_!BK#rrs@PP8f/Bg8rV'a
+i;\<~>
+hu<`69'cf`[Jp1-pU)0j#QZ*goD\if)"n49&?Ym1"19:$kPbD]pIb#_!BK#rrsA/6P]LnmPeH8S
+i;\<~>
+JcE"T$2<;@=pPBF3ICMZs*t~>
+hZ!W%+mfO8C]+25PShaQ!.4>;!UiYQ#QUClrrU31n,<7eXUt+1!>)*crsAGVS6?a@&35F<iW"E~>
+hZ!W%+mfO8C]+25PShaQ!.4>;!UiYQ#QUClrrU31n,<7eXUt+1!>)*crr`#a`hiZU!fXP]iW"E~>
+O8f4ST`5DFCEWrh+`"LKn"nn(s*t~>
+h>[M?&FKf)+jU#c!NdNn#Q]#@oD\j!&G-5/>4;1b!T$H?#QTh<rsR+n.2WUFCUNX"Xkr7@J,~>
+h>[M?&FKf)+jU#c!NdNn#Q]#@oD\j!&G-5/>4;1b!T$H?#QTh<rsS"lKQD3fXk)t8cL9rrJ,~>
+h>[KLVZ-YjXoAas]k]V6#U*Au>5.4[J,~>
+h>[QNKGa+_!/17L!NdNp#QZ[2oD\jc9(E5gF6E;t!Ls_n#Q\,cgA_NK]k]qO&1M+9>5.4[J,~>
+h>[QNKGa+_!/17L!NdNp#QZ[2oD\jc9(E5gF6E;t!Ls_n#Q\,cgA_NSeuamPF*jakSG24HJ,~>
+_#FE/Yl=^tcN!n#!:TU\#Nsrs.0q(hPii!r~>
+h#@ED9'urc9'?-P!r&N.ed):"cLUu9[1Mm7!YB/Aq>UK8.J*lH3ToT*rn[YDp&>9chLmTp.8$,m
+s*t~>
+h#@ED9'urc9'?-P!r&N.ed):"cLUu9[1Mm7!YB/Aq>UK8.J*lH3ToT*s6g!Op\"Rdmfg+PF+fdt
+k5Tr~>
+`W#r4r;QckJcGcM#Nq$p#S:1IkOecVXW\7Gjo9i~>
+g]%<21%#;JA,#p$!r&fGf*DAHo)AaR9(*#cV>C2m`[UNc!>r6.rs/"O0c1I*[I<bf"19QpSE9d$~>
+g]%<21%#;JA,#p$!r&fGf*DAHo)AaR9(*#cV>C2m`[UNc!>r6.rs/#+KQD42f'i82"3uRH`o[5N~>
+KDtrG]Dhnr&H)k9&:<"'rs%?Ks5$'RV<.`-~>
+gA_3)3U[4S+g(V@!PMC`#QUCdrrVqZ+n#[;+gq7J!jtW3o`tRAV<@jaPSb5K(_@O2f(f7LhXCL$
+8f4\ls*t~>
+gA_3)3U[4S+g(V@!PMC`#QUCdrrVqZ+n#[;+gq7J!jtW3o`tRAV<@jZ]mKZu!O_+crs%rds6l1n
+cK5(V~>
+JcG!7!;H!_!;G^W$e@WM9!sm<#S9"LhY[<XhJ5`kCChYsjo9i~>
+g&D)u3U[4S9(2WV!o@DugB[g'f(8nBhD+C'"t@7cs7`W=oEYL0V>'3R$e@W]9!t0D(`58dhY[<X
+hJ6#sEu6@6jo9i~>
+g&D)u3U[4S9(2WV!o@DugB[g'f(8nBhD+C'"t@7cs7`W=oEYL0V>'3R$g3aqPh*j5F*ikRn,*+i
+n#_i*Xa>EGjo9i~>
+]Dhm*bPqS:]Di>c.0udMs6#=q#RE/ukPbD][3>MT!Z5G1jo9i~>
+f`)!8.IRNC>2K,U!r&NGh$=#mN:[&MpIa`W";kpE8eCe(!"f&6!,L`s%F-[FV>pSYN%kk\0uiDT
+rs,q\&/Ys%A+/OZJ,~>
+f`)!8.IRNC>2K,U!r&NGh$=#mN:[&MpIa`W";kpE8eCe(!"f&6!,L`s%HiCccN!q5]o7#RN7RIr
+rrL\trc8-fV=3OGJ,~>
+PQ(XWo`"pc])Moa0aN-hrr3PC@jqZp>,C]fs5&uM+\J!^jSs`~>
+fDbm&9(*#d;XaG]!o@]9i!9B-N;)uE!r%ojhZs9<PS!g"!F"[Krrgn-(jkHFrt)kR0c1a2Xmc;i
+hOJ@18sJN"s*t~>
+fDbm&9(*#d;XaG]!o@]9i!9B-N;)uE!r%ojhZs9<PS!g"!F"[KrrhMDF1(K9rt*bXKQDL:cM.A=
+n&D2WPeHPHs*t~>
+PlCaXX8`@lKFf;1f)G[ZkDU5`#U+lXs8Vi^cJJ<Us*t~>
+f)Gd-Hg_4@A+06n"7ON5&E=#t.D>KIrrKeVhZsH9`pYnn#ZBO@rrqkM(b&YFrr3JsN$/`L.?*-`
+s7c!-hY6(1J,~>
+f)Gd-Hg_4@A+06n"7ON5&E=#t.D>KIrrKeVhZsH9`pYnn#ZBO@rrr/)H[DUPrr3Js]mFgAHbJnJ
+s7c9Nn+YlBJ,~>
+[f6@%M#RV7EtC@_rr3;M3=%r<&-s,;kMH5h~>
+eGfQ.+n,a<;V(XC"S_)L3>grc!YB.uo)AaA1#E6A1#Ds1S/>Guj8T8=Eu6pgrr3;M3>b(T(`4E\
+n)"(p~>
+eGfQ.+n,a<;V(XC"S_)L3>grc!YB.uo)AaA1#E6A1#Ds1S/>Guj8T8NXa?#irr3;fN,t5JHZOPI
+n)"(p~>
+eGfOCJcG!7!q2YmrVm7Y&.#u+KHUU<;SDh_s*t~>
+eGfUE[5m^^!\(8?p\t<O[41AH![3Nko)AaR9&BmT1!]du!oBI1iVruJSAtO-$]Go>`nl@t&0Xrk
+pYc(%~>
+eGfUE[5m^^!\(8?p\t<O[41AH![3Nko)AaR9&BmT1!]du!oBI1iVruR`n(+g$FP5%hXA.2F*jG.
+huA3~>
+R/[0\o)A^aYQ#$o3=&ggs7a3:&-tnbi;\<~>
+df0?nA+0a*+`$97rr>[W#Qd#op[\=cpOj+9#QZBoeGfsG3=oBos7a3:(`5m%i;\<~>
+df0?nA+0a*+`$97rr>[W#Qd#op[\=cpOj+9#QZBoeGfsGN,tNhs7b*@HZPG?i;\<~>
+dJj4@lMgkYj8T,RT)T8oHO'mD[I=.qpSB#=Hf4pS~>
+dJj:BV(qHF"<i-Cn+Z_Z!UiYJ#Qbirp[S7bmt;P9#QZ[2eGg!PHPd;\[I=.qpSB;UHf4pS~>
+dJj:BV(qHF"<i-Cn+Z_Z!UiYJ#Qbirp[S7bmt;P9#QZ[2e,KiaF*!Ssp](9f`e8E@i;\<~>
+MZ3\NXoAgC@h8nhHbKIZpFur#i;\<~>
+ci4'lCE`0Q$6`<+]tN;&f"H,9mK`hJ^$u%'pP][A#QZ[*df0`qCD[m;KZ=&lpG!M3i;\<~>
+ci4'lCE`0Q$6`<+]tN;&f"H,9mK`hJ^$u%'pP][A#QZ[*df0a4V0d9:[GLr`pPa1$i;\<~>
+cMmn=^]+<.X8`RjS3dJm.=9(S.0tmjs*t~>
+cMn"@]k\JR#lc%N0j6R\&FKf)CX2GL!r%Wji!9?<`mF_nkF>-](bp]``\A<hi;\<~>
+cMn"@]k\JR#lc%N0j6R\&FKf)CX2GL!r%Wji!9?<`mF_nn&CT5H\Af`hLos`i;\<~>
+bl7\;eGfOCQN%9[S1tQ\&.f+-f&6RY~>
+bl7e>c>+TU#Q];HnG`RYN#:IY!@cUErsA.a0b>0=&/[abi;\<~>
+bl7e>c>+TU#Q];HnG`RYN#:IY!@cUErsAG>N,s&eF*!<'i;\<~>
+NW0"QV>gb>CFKf3>.*8fJ,~>
+ao;I_CH36e#Q];@nG`RaKFm)J!Y@uLb5V[cF"nLT>.*8fJ,~>
+ao;I_CH36e#Q];@nG`RaKFm)J!Y@uLb5V\&Xb;%JV:OQ(J,~>
+aSu87aSu87U]1Jc`kB(KhZ&*~>
+aSuD;hR.,JhZs7(n*p>YpQQNQ#Q];8aSuD3`kB(KhZ&*~>
+aSuD;hR.,JhZs7(n*p>YpQQNQ#Q];8aSuD;hU^9HhZ&*~>
+`W#r4VuHbkTDsE~>
+`W$5<kK]Sq8g,#_jp2#CV=4!T!q1dZi!9@1pRhJ9~>
+`W$5<kK]Sq8g,#_jp2#CV=4!T!q1dZi!9@1pRhJ9~>
+_#FE/XoACqT)X<~>
+_#FZ6`kAKa@p2M'+mfO9&>f!u!p>LZi<TJrHhX-3J,~>
+_#FZ6`kAKa@p2M'+mfO9&>f!u!p>LZi<TJrHhX-3J,~>
+]`8$+NrK3pN/ZW4s*t~>
+]`8$+!WV?]`W28#CB.!$#QlMkK\#eq!nLNdi!9@)n(n!G]p+c<`W(G~>
+]`8$+!WV?]`W28#CB.!$#QlMkK\#eq!nLNdi!9@)n(n!Gf"Jcc`W(G~>
+Zi:.%s7cQmp\+Uep[nIcpY>cKpYPoThHCHr&/^)ha8^Y~>
+Zi:.%s7cQmpC$0QkO7U&kO7U&n+ZJS!r&3FhZs79pYPoNhHKmq![36ca8^Y~>
+Zi:.%s7cQmpC$0QkO7U&kO7U&n+ZJS!r&3FhZs79pYPoTn!n`GH[E0pa8^Y~>
+JcG0<!;G@M$28cP&5kLo(kgbes*t~>
+PlCgJN#:IY![36khZ!oVHPd;l3>`omhT5_I~>
+PlCgJN#:IY![36kh>[bgF*!k1F*k=`aT$b~>
+JcG3=!;G@M$hrL4#\2`)KErD]f#drB~>
+Q2^p*=r??,ruq@I!\(hWhZ!uXhDlE_hSt3c+\L>-s*t~>
+Q2^p*=r??,ruq@I!\(hWh>[iNKQF!YhR.EOPip0gJ,~>
+JcEso%I^,c&.!shs7_Hq#XZhZs*t~>
+Qi@-MPTf/p#S8/4KGXt#0ui&L%I^Ds(_DB#s7_I$&44[bs*t~>
+Qi@-MPTf/p#S8/4KGXt#0ui&L%JS/4HZQUps7a3RF-Pk1s*t~>
+JcEso%b=fn&-riDp]'uH(^NIJbQ!(~>
+R/[2`3T^SR&5o%LS/;M;CX1`8!nLObrYPpCp]'uP+W*PcbQ!(~>
+R/[2`3T^SR&5o%LS/;M;CX1`8%d0@YF)u]Rs8Vi,HZPG.bQ!(~>
+JcGQG!;G%D&EhX-V)\f1SH&WXN"?7TSG1;.J,~>
+Rf<H/F!9ZO#u\1opSB#=+f4Y^rt+YMkG:0M0qA:Dmu/)#6Cdeps*t~>
+Rf<H/F!9ZO#u\1opSB#=+f4Y^rt+Y^n&C<-KZ=&lpUtopN5kV:s*t~>
+Sc8]aiVruRs7b+E!r(mPrr3G@3=$e)p]'uq8dH8mn':r`~>
+Sc8fd`a^1T#RVD@[J0^qS08_A^"`Pgp[@kUrscY%&1OaUs7`on(a4k,cMrC~>
+Sc8fd`a^1T#RVD@[J0^qS08_A^"WJdn,<7qer4ZscM.A5es(6&^%]hPJ,~>
+JcG`L"8DiqpX]?Zer3ds`qTN5`\@`BSF?LXc:S?ZK_NgmJ,~>
+TDo#V]lP@[#R_JI[J0_$pRE[)V=31=("S=RPg9%'s3<>9.AcM5s3=LR+cQ0As*t~>
+TDo#V]lP@[#R_JI[J0_$pRE[)V=31="R!Ip`np^p%Gm%bHcGg[s6#VfHbK1"s*t~>
+U&P,eZ2Y$93=lH-0t%#\%CK(F+_0^8s4019&=i49s*t~>
+U&P5hS5LNo#Qu;KKY?jQrr_G;V;Br+#.6H.(_AF0rr3G8;A^iukPtS53=m$tn'M)b~>
+U&P5hS5LNo#Qu;KKY?jQrr_G;V;Br+!S35/Erh6Nrr3GYS9opkn,NFNN,s?cpX&qj~>
+V#LGhiW&rPqYpQig&D?78dI.T+UB7!rr3GrEsN%LhZ*W$@j)C]hU2@R~>
+V#LSlc=8"/lj*k.(cc*.hWOY-qYpQig&D?78f09m.2XMArr3GrHPdSthZ*W$CFL)uhU2@R~>
+V#LSlc=8"/lj*k.(cc*.hWOY-qYpQig&D?HP]Me[KQDLkrr3H%X`JQRn,NFNV0dQZkL'<[~>
+V>gPiY5]ER+X*]VXYC)1[J0_$kBdaGA(L\[mu/(hK_NppJ,~>
+V>gVkKH]^gruhMTHaV/^bPrL#.4M+f[4r4I[J0_$ms>lgA)@7cmu/D$K_NppJ,~>
+V>gVkKH]^gruhMTHaV/^bPrL;H[Ed,cAZgtf(]4En$RL`V<@mYpUtop[J/,LJ,~>
+JcF-t$G@T3^&Ri/+UBg9rr3DiEtAmd[K$9qHOq@?df4g~>
+V>gRL&Fg#1&/\#dPfC__rsHFg0tmV]XXP)A^&J$?kAqIO>.+D1mt;6$`mXm;~>
+V>gRL&Fg#1&/\#dPfC__rsI>1K\$1teqA+'f)G[Xn#^qXSC[`?pU,'qhU;FS~>
+VZ-YjmJm4\_uC+a0aLt>s8TJM#[6]rrsS:[0aJr)p]%W<&A?NlJ,~>
+VZ-\k;YCA&&/ZQ_H^*+Ep\2T*$cXn<>2K;Z[4)qrn,E=pn!#gD.CJpM[36C,df4g~>
+VZ-\k;YCA&&/ZQ_H^*+Ep\2T*$f6h`V=4HaeqA+7p\t1#pUuN,Hd;BcepDJpdf4g~>
+QN$sZ_Z'qf`npaqpREBM[Jp1/V(i6khYmH\[5eL9PeDDT1#C@YJ,~>
+V>h'b3AENK3AENKCP7A;kNDTVs8U@LhZ*WMS1,nprr3,'0c4]_rVm2364bT9`d8OWhU;FS~>
+V>h'b3AENK3AENKCP7A;kNDTVrrVB?n,E=h`d<Birr3,HN,u,arVm2TN,sZlhR.E`n'_5d~>
+V>gPiq>UHh^AeStKK1JJV>pSiPa(&(rrr.]&.iX6rVm,10aJpO&-udns*t~>
+V>gkrhU^Q7hU^Q7pV-Y8hLmmD8u;RfpQV3)rr3/rPSb6YhYmHZ[5edI0c1a;dJn^~>
+V>gkrhU^Q7hU^Q7pV-Y8n$S+-PfEb'pVt5Arr3/r]mG+.n,<7keqA*kKR7d:dJn^~>
+JcFF'$Kl11&.f*aV>(#ar;QfC6N.5kA*<gj#/)Gs#S:e.dJn^~>
+JcFF'!Ujh&(^)"Yp](!crs$b@(_@O"n,<7j`\A;A&8U.Ms*t~>
+JcFF'$Lb*<H[Bg\`qTN-r;Qf\Pl>_)V=4B_#2Y#[F*"JHdJn^~>
+JcG!7"8CBSf(K%K[0Rq?PX5X1cMRVIc8c.A64a]DhYmHXkAq1G>2I[,J,~>
+JcG!7"8CBShY$mS[1FdOS3e&IcMRVIc9`?b65U8LhYmHXmrK<_A)>W5J,~>
+JcG!7"8D!0kOni\eoQMX`ftP'kPP8bkDXJ/P]LoJn,<7in$R4XV=2h3J,~>
+JcG$8"n.C1+[W%!rs3BGA+0H26Bp[2rsI=L#T/6G@gEWUkPbDakA(>/A*;;?J,~>
+JcG$8"n.C1.8$H1rs3ZWA+0H;6Bps:rsI=T&0Z_XCD[n(n,<7ikAqIWA+.kGJ,~>
+JcG$8"o#]hH^)PDrs5`JV>(#HPeHP`rsIqRF*kU`V/q![n,<7in#^YPV=2k4J,~>
+JcG'9#krZ_&.f*jSG2s]$MVj7s.ouEf)Pd$qu7&eHOq?ZkPs^\&.ip\rs7e'&-uIbp](!=s*t~>
+JcG'9!r%?krYP\cV>'of$MVj7s.p8Uf)Pd,qu7&mHOqWbn,MQl&/]Kdrs8(/(`6H%p](!=s*t~>
+JcG'9!Va#$HNS>9`qTE2$MW`Xs2K,5kPtSFqu7&m[<m86n,MjYF*k%ers8(qF*"2@p](!=s*t~>
+JcG'9#gOS)N28iH.CK-S$.aH5hZ(kM#\2`drsR[e#XZ6)s6!l'+gq7J#Npap#U-%P^"346~>
+JcG'9#gOk9N29,X0tmPc$.acFhZ(kU(h;FtrsR[e&5'Y9s6j_?.CK*R#Od=#&1O`h`n(0?~>
+JcG'9#j6P]]uH:XN7Rt-$0S^mn,MR(F/A@#rsS:cF-P8Us6m(2K\$)$#Of'ZF+hiif%0kO~>
+JcG'9&"EnShZ'u<0t$cUkF=j^[Jp1.PR%PZrVlrn^#&bg$J%NL3R7[)ej9XXqYp`$+UB6$f%0kO~>
+JcG'9&"F1chZ'u<3OSV]n"i?"[Jp1.PSb7%rVlrn^#&bg$J%f\3R7[)ej:3hqYp`,.2XLLf%0kO~>
+JcG'9&&r[Dn,LstK\#ntn&CTFf)G[O]lS8.rVlrnf'iV<$KmXpN9C6@kEL%iqYp`EKQDgCkLTZ`~>
+JcG'9*h3KZ^&S,?hY7'EKMiWmC[_<'hJ3ZGV>(#QS0:5Mrr3=q+UC*As7_H`6I,H-"19QpV:GTr~>
+JcG'9*h4&r^&S,?hY7'EKMis1C[_<'hK'M_XnVkaS1-eUrr3>%.1ehcs7_Hh9$[;5"19j,V:GTr~>
+JcG'9*l`8Jf)Pd$n+ZkV[@DSbXnVkqn#^YacN!q5`d<s5rr3>FKQE+/s8TcRPiqoC"4i-P`mt*>~>
+JcG'9"5Z$D>5S=(pV#.B(_E5:rtsoc#VjWU=qCrF>4;LkpREB43OQ7T#\3?!rrTU)pXT:o~>
+JcG'9"5Z$LA,H91pV#.J+V:1Crtsoc(bs=e@i,ag>4;LkpREZL3OQ7](h<%1rrTU1pXT:o~>
+JcG'9"7M1iV>L8spX\NIHZR4+rtt3hF,];FV0d9)V>(#ipVql-N7QR=F/AX,rrL]reGk%~>
+JcG$8&;1T+^$isfHd;*[s6!8c6H9$)(:>S&;G%3+;@k"1p](9fV%<n].0pKeao?k~>
+JcG$8&;1l;`p^p#Hd;*[s6!8k9$[G9(:>k6>"TVC;A^jAp](9fV&1%(0b>2(ao?k~>
+JcG$8&@HS+hY5m7[HI;as6lJ!PhuE>(=n.[S<S)9S9oUrp](9f`d;c[KQDLcao?k~>
+JcG$8&^EBB@s]@)#U,H,s8So=#]oJ6rsF\r#RD8ohHC16^&J$9pQR*<&0[Rbs*t~>
+JcG$8&^E][@tZ9J(b(^Ds8T2M(j#0FrsF]%&/ZR;hI@*O^&J$9pRErT(b(urs*t~>
+JcG$8$0R7gV6tYkF+h7+rrgVoF1(cArrBb3Es@<*n"k)Yf)G[NpVqmcHN;(,s*t~>
+JcG!7!Nd4<#lcU\#U-VTrr[TR.CK0T$g2RB6H9'*ej9X/cMdbFpU-OBa8^Y~>
+JcG!7$*>?^&/[,V(b)llrr[oc0t%#\$g2jR6I,W2ek-cOcMdbFpU-OJa8^Y~>
+JcG!7!S2VsF8q1#F+i-Drr]ZMK\$/&$h(KMPhuH?kEL%PkPbD_pX[@Ia8^Y~>
+JcG*:']..(mofu&9$YFC#YO:[s5$'J6Ke@J!oAmUrVm#.&.!(?_#Jo~>
+JcG*:']..(mog869$YFK(eWuks5$?Z9(2cZ!oAmUrVm#.(_CKO_#Jo~>
+JcG*:'^t5ZpRH;GPipnfF-Q.ns6l1nPjeVO!q3hZrVm#OF*"JX_#Jo~>
+JcG0<&([7S>3Gq!#RHChs/chDPlC[cV'-Csp\t0mn,E=kp]']H&.kAIs*t~>
+JcG0<&([R\A*<m3(_DZ+s/chLSGrNkXXOg7p\t0mn,E=kp]']H(`8dYs*t~>
+JcG0<&*Ls&V=4H@F*#%ps4274`r>u?c@g8HrVlllrr32ss7a3RHcEl$J,~>
+JcG9?)t3h,@gGuqs8VOk#V"s:pK@h_kPtSVHOqp>p\b$rhOO'7hEhd#_#Jo~>
+JcG9?)t3h,CD]t<s8VOk(bt4RpKA+gkPtSVHPeKFp\b$rhOO'7hF\W3_#Jo~>
+JcG9?)u'C4V/r0qs8Vh`F+j#^pSDqin,NF^[<%;Xp\b$rn&G,%n!%n$_#Jo~>
+JcG?A#j7_Js8TbU&@MN;$)JIMPkY3[+V:1Crrh1=#YO:Yrs7e'+f4qQ0aN-As*t~>
+JcG?A#k+:Rs8U(f(q'AC$*>?fPkY3[.1i$Krrh1F(eX8qrs7e/.Acda0c58Qs*t~>
+JcG?A#k,dQs8Ur&He/2r$-mmE^&S,`H[Ed3rrheLF-Q.lrs8(qKZ<cCN,uDBs*t~>
+JcGEC)#&A;+YhjRk=Q"`n,NFV@gGEXs5$ob6Iu/9"/Q87F8c+EpK@h>;F1X+f"h<9~>
+JcGEC)#&\D.5B]Zmn+-pn,NFV@i.Phs5$or9%O"A"0ECOHi<sMpL>$`;G%cLf"h<9~>
+JcGEC)#(_&H]7.fn!%mip](9fV/qmis6lJ!Pir&G"3tt7[Jg+2pSDqXS<S)AkJ7+J~>
+JcGEC$g4po.1haDs-+'<cMmhM[36*Gp]%WE&=!1o"Qs8#+kHVl#/*#.#RDl<^]/f~>
+JcGEC$h(L*0c6G\s-sWLcMmhM[4)r_p]%WM(nCU*"Qs83.G"It!QI/!(]c(E^]/f~>
+JcGEC$h)ZlKR:`=s2K,,kPkJfepDb`p]&ftF2n4Z"Ri1.K]i=6#2Y;cF*!#J^]/f~>
+JcG?A([kN5>3Gq:3=(T<s8V8/#W^cAs)SH<hZ!NXc7'<?hYmHXer4s/[J.H9J,~>
+JcG?A([kiFA*<mC3>d_Ls8VP7(cgIQs*GSThZ!NXc7olOhYmHXer598[J.H9J,~>
+JcG?A(\abISF?L@N,u],s8VPqF,]Sfs/g@,kPkJakCdoYn,<7ikIn:2f(ZrZJ,~>
+JcG<@$(MPM[K#E*#W^K8rs@7*#b:qphB<GGrr3/rPSbR?p\b$ln+XNqJ,~>
+JcG<@$(Mh][K#]:(dcgQrs@72(nCX+hC0"Wrr3/rPT_KPp\b$ln+XNqJ,~>
+JcG<@$-%==f)P3@F,];]rs@kAF2n7[msBD`rr3/r]mG+Gp\b'kpV$TW~>
+JcG<@$/RuSK_PM[+X*]]rsJLR#T0uLs+Cq,`r>u@pK@hWcF3b'~>
+JcG<@$/S8kK_PMd.4MCursJLR(a6<es,7L<`r>u@pL>$pcF3b'~>
+JcG<@$1F+"[J0^XH\B]Crs?)SHe/5s[<%#Xrr3,qV/qUY[f:j~>
+JcG9?$$-A$f)PJ)#ZBjbrsI%3#]'27`]4<?n,E=jc7'#spYNF[J,~>
+JcG9?$%!4<f)PJ2&6eQ%rsI%3(i/mG`]4TOn,E=jc7p/6pYNF[J,~>
+JcG9?$+4i-kPt:8F.D^ursIqJF053:hMcNXp\t0rkCdoHp[>WlJ,~>
+JcG9?$-j(f[K$8k#Vjp0rsJ4J&2ClupN$Th^&@s7N!KtuCZi8.J,~>
+JcG9?$-j)![K$8k(bsV@rsJ4R&2D3)pNm`3^&@s7N#3C8F76[>J,~>
+JcG9?$0QANf)Pc`F,];]rsJM6F,\uUpU,'qf)>UP]lSOsXm`h#J,~>
+JcG9?$28KH6KeC30aMRnrsIU;#\3&tehIGGkPkJahGQ(Lf!ta1~>
+JcG9?$28c`6LXsC0bAF)rsIUC&8Ub7hD#jgn,E=ihGQ@\hRNT9~>
+JcG9?$2:iKPjeY@N,u-"rsJ4JF/A@*kDXJan,E=in!o'=kICPB~>
+JcG6>#dkKd`rGdK#V#]O$$uq$^&S+c#U.LlrrT%1n$i=I~>
+JcG6>#dkg!`rGdK&2F+_$%rj=^&S+c&1Pp'rrT=Bn$i=I~>
+JcG6>#hF?LhZ*>PF+jJk$+4i$f)PcXF+i`TrrUL&pUC0Q~>
+JcG6>$/SPcF8u9J.1i?Srs@OK#]'27c3O]hrVm#ps8UZi\c70~>
+JcG6>$/SPsF8u9J0c7%krs@OS(i/mGc57,+rVm#ps8UZq\c70~>
+JcG6>$0Rh"[K$9XKR;#CrsA.YF053:kAt^qrVm#ps8V9=\c70~>
+JcG3=$'Yu]cMua!#[6Eirs5GE#__'2#RJ-@rr]YX+hbJeJ,~>
+JcG3=$(MhmcMua!&7ao%rs5_U(kgbJ&/`+Xrr]Y`.D<=mJ,~>
+JcG3=$-%=NkPs_8F.D^trs6nsF1(J^F*#q0rr^i*He,e.J,~>
+JcG3=$-j\;SH&VZ&2D3'rs7dk#S9<G#X[DFrr[TR&?WPDJ,~>
+JcG3=$-jtKSH&VZ(bs>7rs7dk(`5jo(dd*Vrr[Tb&@K+LJ,~>
+JcG3=$0Qtg`rH(YH]6h[rs8(iF*j.)F-Q.jrr]ZMHd95&J,~>
+JcG0<$"F6=kPsC*#__sNrrJr>rWiNZ[JKn*c?"@$])R9~>
+JcG0<$#:AUkPsC2(khY^rs#SS(_@N=[JKn*c?"[-])R9~>
+JcG0<$)M^5n,Mj@F1(c@rrLDlrc8+!f)#CKkH2/d])R9~>
+JcG0<$,$lUV>pRK#W^c?rrq7G@rm"RY5a"~>
+JcG0<$-!f!XoJE[&457Prrq7GCNG0cY5a"~>
+JcG0<$.aHEcN!pXF,]SdrrqkUV6./oY5a"~>
+JcG0<$0OV\C\RkS#S=ECrr_GCF1nXSJ,~>
+JcG0<$0OnlC\RkS(`9[[rr__KF2k9\J,~>
+JcG0<$1F+"XnVkYF*#q3rr_`'Xk'QQJ,~>
+JcG-;%[75Bf(\#,#YNt)s8TdhWrIS~>
+JcG-;%\+@bhY5k<(eWZ9s8U*qWrIS~>
+JcG-;%`WRCkPt!lF-Q.Vs8UsEWrIS~>
+JcG-;$cXV$6?>-m3B:9FpS\%A~>
+JcG-;$dLI<6@1^03B:9NpS\%A~>
+JcG-;$f6PXPc]mcN/X:PpS\%A~>
+JcG-;!q2'ZrWiTTXhEnos*t~>
+JcG-;$1Efi(_@N=XiBP#s*t~>
+JcG-;!r'BTrc80pf&#kls*t~>
+JcG*:#5=s80ltY/U]5i~>
+JcG*:#5>6@0mh47U]5i~>
+JcG*:#5?EFN32:;U]5i~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+JcCN*J,~>
+%%EndData
+showpage
+%%Trailer
+end
+%%EOF
-- 
cgit v1.2.1


From 5f2d53a008aab8535d52c1a4e3723f787549b722 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Mar 2004 21:35:55 +0000
Subject: add info for ancient Pg versions

---
 httemplate/docs/upgrade10.html | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 45efbe23b..44f11953f 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -1,6 +1,7 @@
 <pre>
 this is incomplete
 
+install DBD::Pg 1.32
 install DBIx::DBSchema 0.23
 install Net::SSH 0.08
 - If using Apache::ASP, add PerlSetVar RequestBinaryRead Off to your Apache configuration and make sure you are using Apache::ASP minimum version 2.55. 
@@ -95,16 +96,23 @@ CREATE TABLE part_pkg_temp (
     plandata text NULL,
     disabled char(1) NULL,
     taxclass varchar(80) NULL,
-    PRIMARY KEY (pkgpart),
+    PRIMARY KEY (pkgpart)
 );
 INSERT INTO part_pkg_temp SELECT * from part_pkg;
 DROP TABLE part_pkg;
 ALTER TABLE part_pkg_temp RENAME TO part_pkg;
+CREATE INDEX part_pkg1 ON part_pkg(disabled);
+
+On modern Pg:
 ALTER TABLE part_pkg DROP CONSTRAINT part_pkg_temp_pkey;
 ALTER TABLE part_pkg ADD PRIMARY KEY (pkgpart);
-CREATE INDEX part_pkg1 ON part_pkg(disabled);
 select setval('public.part_pkg_temp_pkgpart_seq', ( select max(pkgpart) from part_pkg) ); #?
 
+Or on Pg versions that don't support DROP CONSTRAINT and ADD PRIMARY KEY (tested on 7.1 so far):
+DROP INDEX part_pkg_temp_pkey;
+CREATE UNIQUE INDEX part_pkg_pkey ON part_pkg (pkgpart);
+select setval('part_pkg_temp_pkgpart_seq', ( select max(pkgpart) from part_pkg) );
+
 CREATE TABLE h_part_pkg_temp (
     historynum serial NOT NULL,
     history_date int,
@@ -127,11 +135,18 @@ CREATE TABLE h_part_pkg_temp (
 INSERT INTO h_part_pkg_temp SELECT * from h_part_pkg;
 DROP TABLE h_part_pkg;
 ALTER TABLE h_part_pkg_temp RENAME TO h_part_pkg;
+CREATE INDEX h_part_pkg1 ON h_part_pkg(disabled);
+
+On modern Pg:
 ALTER TABLE h_part_pkg DROP CONSTRAINT h_part_pkg_temp_pkey;
 ALTER TABLE h_part_pkg ADD PRIMARY KEY (historynum);
-CREATE INDEX h_part_pkg1 ON h_part_pkg(disabled);
 select setval('public.h_part_pkg_temp_historynum_seq', ( select max(historynum) from h_part_pkg) );
 
+Or on Pg versions that don't support DROP CONSTRAINT and ADD PRIMARY KEY (tested on 7.1 so far):
+DROP INDEX h_part_pkg_temp_pkey;
+CREATE UNIQUE INDEX h_part_pkg_pkey ON h_part_pkg (historynum);
+select setval('h_part_pkg_temp_historynum_seq', ( select max(historynum) from h_part_pkg) );
+
 
 DROP INDEX cust_bill_pkg1;
 
@@ -168,7 +183,7 @@ ALTER TABLE h_svc_forward ALTER COLUMN srcsvc DROP NOT NULL;
 ALTER TABLE svc_forward ALTER COLUMN dstsvc DROP NOT NULL;
 ALTER TABLE h_svc_forward ALTER COLUMN dstsvc DROP NOT NULL;
 
-Or on Pg versions that don't support DROP NOT NULL (tested only on 7.2 so far):
+Or on Pg versions that don't support DROP NOT NULL (tested on 7.1 and 7.2 so far):
 UPDATE pg_attribute SET attnotnull = FALSE WHERE ( attname = 'srcsvc' OR attname = 'dstsvc' ) AND ( attrelid = ( SELECT oid FROM pg_class WHERE relname = 'svc_forward' ) OR attrelid = ( SELECT oid FROM pg_class WHERE relname = 'h_svc_forward' ) );
 
 dump database, edit:
-- 
cgit v1.2.1


From 01ef1d6aa064759bac796f04d999dfdf2ae3f484 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 12 Mar 2004 05:49:18 +0000
Subject: remove comment

---
 httemplate/docs/upgrade10.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 44f11953f..7a16d49a1 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -106,7 +106,7 @@ CREATE INDEX part_pkg1 ON part_pkg(disabled);
 On modern Pg:
 ALTER TABLE part_pkg DROP CONSTRAINT part_pkg_temp_pkey;
 ALTER TABLE part_pkg ADD PRIMARY KEY (pkgpart);
-select setval('public.part_pkg_temp_pkgpart_seq', ( select max(pkgpart) from part_pkg) ); #?
+select setval('public.part_pkg_temp_pkgpart_seq', ( select max(pkgpart) from part_pkg) );
 
 Or on Pg versions that don't support DROP CONSTRAINT and ADD PRIMARY KEY (tested on 7.1 so far):
 DROP INDEX part_pkg_temp_pkey;
-- 
cgit v1.2.1


From 0718d6c7bc61075243d2f44f0df30fe6431f0f72 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 12 Mar 2004 05:58:47 +0000
Subject: document trouble schema changes backported to 1.4.2

---
 httemplate/docs/upgrade10.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 7a16d49a1..47399c3b1 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -186,7 +186,7 @@ ALTER TABLE h_svc_forward ALTER COLUMN dstsvc DROP NOT NULL;
 Or on Pg versions that don't support DROP NOT NULL (tested on 7.1 and 7.2 so far):
 UPDATE pg_attribute SET attnotnull = FALSE WHERE ( attname = 'srcsvc' OR attname = 'dstsvc' ) AND ( attrelid = ( SELECT oid FROM pg_class WHERE relname = 'svc_forward' ) OR attrelid = ( SELECT oid FROM pg_class WHERE relname = 'h_svc_forward' ) );
 
-dump database, edit:
+If you created your database with a version before 1.4.2, dump database, edit:
 - cust_main: increase otaker from 8 to 32
 - cust_main: change ss from char(11) to varchar(11)
 - cust_credit: increase otaker from 8 to 32
-- 
cgit v1.2.1


From 7dac99feb4d0e8ca4ced4a5af113112679affaf8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 12 Mar 2004 08:17:22 +0000
Subject: emaildecline-exclude skips any errors that contain the strings now,
 not just match exactly

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index a9fcb2b66..fc744dc5f 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1888,7 +1888,7 @@ sub realtime_bop {
     if ( !$options{'quiet'} && !$realtime_bop_decline_quiet
          && $conf->exists('emaildecline')
          && grep { $_ ne 'POST' } $self->invoicing_list
-         && ! grep { $_ eq $transaction->error_message }
+         && ! grep { $transaction->error_message =~ /$_/ }
                    $conf->config('emaildecline-exclude')
     ) {
       my @templ = $conf->config('declinetemplate');
-- 
cgit v1.2.1


From 5b27fba78299a534d6d75a7322f26cf6af402b19 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 12 Mar 2004 08:56:50 +0000
Subject: don't run my local expenses kludge by default; horrible performance

---
 FS/FS/Report/Table/Monthly.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/FS/FS/Report/Table/Monthly.pm b/FS/FS/Report/Table/Monthly.pm
index 9aebeee3d..3bbf01f39 100644
--- a/FS/FS/Report/Table/Monthly.pm
+++ b/FS/FS/Report/Table/Monthly.pm
@@ -1,13 +1,15 @@
 package FS::Report::Table::Monthly;
 
 use strict;
-use vars qw( @ISA );
+use vars qw( @ISA $expenses_kludge );
 use Time::Local;
 use FS::UID qw( dbh );
 use FS::Report::Table;
 
 @ISA = qw( FS::Report::Table );
 
+$expenses_kludge = 0;
+
 =head1 NAME
 
 FS::Report::Table::Monthly - Tables of report data, indexed monthly
@@ -83,7 +85,7 @@ sub netsales { #net sales
   );
 
   #horrible local kludge
-  my $expenses = $self->scalar_sql("
+  my $expenses = !$expenses_kludge ? 0 : $self->scalar_sql("
     SELECT SUM(cust_bill_pkg.setup)
     FROM cust_bill_pkg, cust_bill, cust_pkg, part_pkg
     WHERE cust_bill.invnum = cust_bill_pkg.invnum
@@ -113,7 +115,7 @@ sub receipts { #cashflow
   );
 
   #horrible local kludge that doesn't even really work right
-  my $expenses = $self->scalar_sql("
+  my $expenses = !$expenses_kludge ? 0 : $self->scalar_sql("
     SELECT SUM(cust_bill_pay.amount)
     FROM cust_bill_pay, cust_bill
     WHERE cust_bill_pay.invnum = cust_bill.invnum
-- 
cgit v1.2.1


From 55e5453a87c1e2a0f60547428f4a429bcfbe1f1d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 12 Mar 2004 10:19:27 +0000
Subject: few more 1.4.2 upgrade hints

---
 httemplate/docs/upgrade-1.4.2.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/httemplate/docs/upgrade-1.4.2.html b/httemplate/docs/upgrade-1.4.2.html
index 1feaa803a..3c9ac9c6d 100644
--- a/httemplate/docs/upgrade-1.4.2.html
+++ b/httemplate/docs/upgrade-1.4.2.html
@@ -8,7 +8,11 @@
   <li>Back  up your data and current Freeside installation.
   <li>Install <a href="http://search.cpan.org/search?dist=Locale-SubCountry">Locale::SubCountry</a>
   <li>Install <a href="http://search.cpan.org/search?dist=IPC-ShareLite">IPC::ShareLite</a>
-  <li>Install <a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML::Widgets::SelectLayers</a> 0.03.
+  <li>Install <a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML::Widgets::SelectLayers</a> 0.04.
+  <li>Install <a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx::DBSchema</a> 0.23.
+  <li>Install <a href="http://search.cpan.org/search?dist=DBD-Pg">DBD::Pg</a> 1.32.
+  <li>Install <a href="http://search.cpan.org/search?dist=Cache-Cache">Cache::Cache</a>.
+  <li>Install <a href="http://search.cpan.org/search?dist=Net-SSH">Net::SSH</a> 0.08.
   <li>CGI.pm minimum version 2.47 is required.  You will probably need to install a current CGI.pm from CPAN if you are using Perl 5.005 or earlier.
   <li>If using Apache::ASP, add <code>PerlSetVar RequestBinaryRead Off</code> to your Apache configuration and make sure you are using Apache::ASP minimum version 2.55.
   <li>Run <code>make aspdocs</code> or <code>make masondocs</code>.
-- 
cgit v1.2.1


From baa3c17313351ba4330686a664d3843365e31e37 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 12 Mar 2004 10:22:11 +0000
Subject: add badly-named new report

---
 httemplate/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/httemplate/index.html b/httemplate/index.html
index d39f8b04d..d8879bfb8 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -69,6 +69,7 @@
               <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
             </UL>
       <A HREF="search/report_cust_pay.html">Payment report (by type and/or date range)</A>
+      <BR><BR><A HREF="graph/money_time.cgi">Sales, Credits and Receipts Summary</A>
       <BR><BR><A HREF="search/report_receivables.cgi">Accounts Receivable Aging Summary</A>
       <BR><BR><A HREF="search/report_prepaid_income.html">Prepaid Income (Unearned Revenue) Report</A>
       <BR><BR>(old) Financial reports (being rewritten)
-- 
cgit v1.2.1


From bd4d69496e5e122cf65e246e9be95d1d8555e9f3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 12 Mar 2004 12:10:10 +0000
Subject: add history tables to field change upgrade instructions, add hints
 for pre-5.6 perl, add index on cust_pay._date

---
 httemplate/docs/upgrade10.html | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 47399c3b1..6f7924fb6 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -1,7 +1,7 @@
 <pre>
 this is incomplete
 
-install DBD::Pg 1.32
+install DBD::Pg 1.32 (or, if you're using a Perl version before 5.6, you could try installing DBD::Pg 1.22 with <a href="http://420.am/~ivan/DBD-Pg-1.22-fixvercmp.patch">this patch</a> and commenting out the "use DBD::Pg 1.32" at the top of DBIx/DBSchema/DBD/Pg.pm)
 install DBIx::DBSchema 0.23
 install Net::SSH 0.08
 - If using Apache::ASP, add PerlSetVar RequestBinaryRead Off to your Apache configuration and make sure you are using Apache::ASP minimum version 2.55. 
@@ -187,14 +187,14 @@ Or on Pg versions that don't support DROP NOT NULL (tested on 7.1 and 7.2 so far
 UPDATE pg_attribute SET attnotnull = FALSE WHERE ( attname = 'srcsvc' OR attname = 'dstsvc' ) AND ( attrelid = ( SELECT oid FROM pg_class WHERE relname = 'svc_forward' ) OR attrelid = ( SELECT oid FROM pg_class WHERE relname = 'h_svc_forward' ) );
 
 If you created your database with a version before 1.4.2, dump database, edit:
-- cust_main: increase otaker from 8 to 32
-- cust_main: change ss from char(11) to varchar(11)
-- cust_credit: increase otaker from 8 to 32
-- cust_pkg: increase otaker from 8 to 32
-- cust_refund: increase otaker from 8 to 32
-- domain_record: increase reczone from 80 to 255
-- domain_record: change rectype from char to varchar
-- domain_record: increase recdata from 80 to 255
+- cust_main and h_cust_main: increase otaker from 8 to 32
+- cust_main and h_cust_main: change ss from char(11) to varchar(11)
+- cust_credit and h_cust_credit: increase otaker from 8 to 32
+- cust_pkg and h_cust_pkg: increase otaker from 8 to 32
+- cust_refund and h_cust_refund: increase otaker from 8 to 32
+- domain_record and h_domain_record: increase reczone from 80 to 255
+- domain_record and h_domain_record: change rectype from char to varchar
+- domain_record and h_domain_record: increase recdata from 80 to 255
 then reload
 
 optionally:
@@ -207,6 +207,7 @@ optionally:
   CREATE INDEX cust_main11 ON cust_main ( ship_fax );
   CREATE INDEX agent2 ON agent ( disabled );
   CREATE INDEX part_bill_event2 ON part_bill_event ( disabled );
+  CREATE INDEX cust_pay4 ON cust_pay (_date);
 
   serial columns
 
-- 
cgit v1.2.1


From c13536bec93ca007d6b339dfbc7edc81ae58c082 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 12 Mar 2004 12:11:58 +0000
Subject: fix title

---
 httemplate/graph/money_time.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index 14af0f246..e5903168d 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -16,7 +16,7 @@ my $emonth = $cgi->param('emonth') || $curmon+1;
 
 <HTML>
   <HEAD>
-    <TITLE>Graphing monetary values over time</TITLE>
+    <TITLE>Sales, Credits and Receipts Summary</TITLE>
   </HEAD>
 <BODY BGCOLOR="#e8e8e8">
 <IMG SRC="money_time-graph.cgi?<%= $cgi->query_string %>" WIDTH="976" HEIGHT="384">
-- 
cgit v1.2.1


From 92fa788fb842baab8fa185e159d8effde739bd74 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 12 Mar 2004 12:39:57 +0000
Subject: add unapplycredits configuration option

---
 FS/FS/Conf.pm                           |  7 +++++++
 httemplate/misc/unapply-cust_credit.cgi | 18 ++++++++++++++++++
 httemplate/view/cust_main.cgi           | 11 ++++++++++-
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100755 httemplate/misc/unapply-cust_credit.cgi

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 99eee18ea..ecd2a9790 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -350,6 +350,13 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'unapplycredits',
+    'section'     => 'UI',
+    'description' => 'Enable "unapplication" of unclosed credits.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'dirhash',
     'section'     => 'shell',
diff --git a/httemplate/misc/unapply-cust_credit.cgi b/httemplate/misc/unapply-cust_credit.cgi
new file mode 100755
index 000000000..c658d2acc
--- /dev/null
+++ b/httemplate/misc/unapply-cust_credit.cgi
@@ -0,0 +1,18 @@
+<%
+
+#untaint crednum
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ || die "Illegal crednum";
+my $crednum = $1;
+
+my $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } );
+my $custnum = $cust_credit->custnum;
+
+foreach my $cust_credit_bill ( $cust_credit->cust_credit_bill ) {
+  my $error = $cust_credit_bill->delete;
+  eidiot($error) if $error;
+}
+
+print $cgi->redirect($p. "view/cust_main.cgi?". $custnum);
+
+%>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index ee5f86973..c41d2d894 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -554,6 +554,11 @@ function cust_pay_unapply_areyousure(href) {
  == true)
         window.location.href = href;
 }
+function cust_credit_unapply_areyousure(href) {
+    if (confirm("Are you sure you want to unapply this credit?")
+ == true)
+        window.location.href = href;
+}
 function cust_credit_areyousure(href) {
     if (confirm("Are you sure you want to delete this credit?")
  == true)
@@ -637,9 +642,13 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
         $cust_credit->closed !~ /^Y/i && $conf->exists('deletecredits')
           ? qq! (<A HREF="javascript:cust_credit_areyousure('${p}misc/delete-cust_credit.cgi?!. $cust_credit->crednum. qq!')">delete</A>)!
           : '';
+      my $unapply =
+        $cust_credit->closed !~ /^Y/i && $conf->exists('unapplycredits')
+          ? qq! (<A HREF="javascript:cust_credit_unapply_areyousure('${p}misc/unapply-cust_credit.cgi?!. $cust_credit->crednum. qq!')">unapply</A>)!
+          : '';
       push @history,
         "$date\tCredit #$crednum: $reason<BR>".
-        "(applied to invoice #$invnum on $app_date)$delete\t\t\t$amount\t";
+        "(applied to invoice #$invnum on $app_date)$delete$unapply\t\t\t$amount\t";
     }
   }
   
-- 
cgit v1.2.1


From 9342d61cac6cfebd11a7cdb5dc1359d663c5d1a3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 13 Mar 2004 00:16:24 +0000
Subject: fix suse document root

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index bd6019bc8..3c4683849 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 #openbsd
 #FREESIDE_DOCUMENT_ROOT = /var/www/htdocs/freeside
 #suse
-#FREESIDE_DOCUMENT_ROOT = /srv/www/htdocs
+#FREESIDE_DOCUMENT_ROOT = /srv/www/htdocs/freeside
 
 #deb, redhat, mandrake, suse, others?
 INIT_FILE = /etc/init.d/freeside
-- 
cgit v1.2.1


From 02aea7237fa255266f7b71eb0a9114c12aa3c034 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 13 Mar 2004 00:50:41 +0000
Subject: automatically set Mason comp_root in Makefile

---
 Makefile         | 4 ++++
 htetc/handler.pl | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3c4683849..1b212b387 100644
--- a/Makefile
+++ b/Makefile
@@ -121,6 +121,10 @@ install-docs: docs
 	[ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
 	[ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
 	[ "${TEMPLATE}" = "mason" ] && cp htetc/handler.pl ${MASON_HANDLER} || true
+	[ "${TEMPLATE}" = "mason" ] &&
+	  perl -p -i -e "\
+	    s/%%%FREESIDE_DOCUMENT_ROOT%%%/${FREESIDE_DOCUMENT_ROOT}/g;
+	  " ${MASON_HANDLER}
 	[ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
 	[ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true
 
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 0301d98d1..8541b4ce5 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -38,7 +38,7 @@ use strict;
 my $ah = new HTML::Mason::ApacheHandler (
   #interp => $interp,
   #auto_send_headers => 0,
-  comp_root=>'/var/www/freeside',
+  comp_root=>'%%%FREESIDE_DOCUMENT_ROOT%%%',
   data_dir=>'/usr/local/etc/freeside/masondata',
   #out_mode=>'stream',
 );
-- 
cgit v1.2.1


From 0fd798c8ecec0141cdb4c5db2016a94ae34a24f2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 13 Mar 2004 00:53:29 +0000
Subject: oops

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1b212b387..f6f7ae516 100644
--- a/Makefile
+++ b/Makefile
@@ -123,7 +123,7 @@ install-docs: docs
 	[ "${TEMPLATE}" = "mason" ] && cp htetc/handler.pl ${MASON_HANDLER} || true
 	[ "${TEMPLATE}" = "mason" ] &&
 	  perl -p -i -e "\
-	    s/%%%FREESIDE_DOCUMENT_ROOT%%%/${FREESIDE_DOCUMENT_ROOT}/g;
+	    s/%%%FREESIDE_DOCUMENT_ROOT%%%/${FREESIDE_DOCUMENT_ROOT}/g; \
 	  " ${MASON_HANDLER}
 	[ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
 	[ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true
-- 
cgit v1.2.1


From 06f0a601e40a06106f1d603edf3657c6753279ff Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 13 Mar 2004 01:27:41 +0000
Subject: really add the necessary backslashes this time, fix s/// delimteres

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index f6f7ae516..dc50433d2 100644
--- a/Makefile
+++ b/Makefile
@@ -121,9 +121,9 @@ install-docs: docs
 	[ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
 	[ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
 	[ "${TEMPLATE}" = "mason" ] && cp htetc/handler.pl ${MASON_HANDLER} || true
-	[ "${TEMPLATE}" = "mason" ] &&
+	[ "${TEMPLATE}" = "mason" ] && \
 	  perl -p -i -e "\
-	    s/%%%FREESIDE_DOCUMENT_ROOT%%%/${FREESIDE_DOCUMENT_ROOT}/g; \
+	    s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
 	  " ${MASON_HANDLER}
 	[ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
 	[ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true
-- 
cgit v1.2.1


From 6c5e54768bdf79070efd43963c1132fed7885eb1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 Mar 2004 19:22:25 +0000
Subject: signup is now just a wrapper around self-service

---
 fs_signup/FS-SignupClient/MANIFEST    |  1 -
 fs_signup/FS-SignupClient/Makefile.PL |  6 +--
 fs_signup/FS-SignupClient/fs_signupd  | 86 -----------------------------------
 3 files changed, 3 insertions(+), 90 deletions(-)
 delete mode 100755 fs_signup/FS-SignupClient/fs_signupd

diff --git a/fs_signup/FS-SignupClient/MANIFEST b/fs_signup/FS-SignupClient/MANIFEST
index b4a9900c8..365ae660b 100644
--- a/fs_signup/FS-SignupClient/MANIFEST
+++ b/fs_signup/FS-SignupClient/MANIFEST
@@ -4,5 +4,4 @@ MANIFEST.SKIP
 Makefile.PL
 SignupClient.pm
 test.pl
-fs_signupd
 cgi/signup.cgi
diff --git a/fs_signup/FS-SignupClient/Makefile.PL b/fs_signup/FS-SignupClient/Makefile.PL
index 310200b57..9850c870d 100644
--- a/fs_signup/FS-SignupClient/Makefile.PL
+++ b/fs_signup/FS-SignupClient/Makefile.PL
@@ -4,9 +4,9 @@ use ExtUtils::MakeMaker;
 WriteMakefile(
     'NAME'	    => 'FS::SignupClient',
     'VERSION_FROM'  => 'SignupClient.pm', # finds $VERSION
-    'EXE_FILES'     => [ 'fs_signupd' ],
-    'INSTALLSCRIPT' => '/usr/local/sbin',
-    'INSTALLSITEBIN' => '/usr/local/sbin',
+#    'EXE_FILES'     => [ 'fs_signupd' ],
+#    'INSTALLSCRIPT' => '/usr/local/sbin',
+#    'INSTALLSITEBIN' => '/usr/local/sbin',
     'PERM_RWX'      => '750',
     'PREREQ_PM'     => {
                          'Business::CreditCard' => 0,
diff --git a/fs_signup/FS-SignupClient/fs_signupd b/fs_signup/FS-SignupClient/fs_signupd
deleted file mode 100755
index 85bd68a2f..000000000
--- a/fs_signup/FS-SignupClient/fs_signupd
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# fs_signupd
-#
-# This is run REMOTELY over ssh by fs_signup_server.
-
-use strict;
-use Socket;
-use Storable qw(nstore_fd fd_retrieve);
-use IO::Handle;
-
-use vars qw( $Debug );
-
-$Debug = 1;
-
-my $fs_signupd_socket = "/usr/local/freeside/fs_signupd_socket";
-my $pid_file = "$fs_signupd_socket.pid";
-
-$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
-$ENV{'SHELL'} = '/bin/sh';
-$ENV{'IFS'} = " \t\n";
-$ENV{'CDPATH'} = '';
-$ENV{'ENV'} = '';
-$ENV{'BASH_ENV'} = '';
-
-$|=1;
-
-warn "[fs_signupd] Reading init data...\n" if $Debug;
-my $init_data = fd_retrieve(\*STDIN);
-
-warn "[fs_signupd] Creating $fs_signupd_socket\n" if $Debug;
-my $uaddr = sockaddr_un($fs_signupd_socket);
-my $proto = getprotobyname('tcp');
-socket(Server,PF_UNIX,SOCK_STREAM,0) or die "socket: $!";
-unlink($fs_signupd_socket);
-bind(Server, $uaddr) or die "bind: $!";
-listen(Server,SOMAXCONN) or die "listen: $!";
-
-if ( -e $pid_file ) {
-  open(PIDFILE,"<$pid_file");
-  #chomp( my $old_pid = <PIDFILE> );
-  my $old_pid = <PIDFILE>;
-  close PIDFILE;
-  $old_pid =~ /^(\d+)$/;
-  kill 'TERM', $1;
-}
-open(PIDFILE,">$pid_file");
-print PIDFILE "$$\n";
-close PIDFILE;
-
-warn "[fs_signupd] Entering main loop...\n" if $Debug;
-my $paddr;
-for ( ; $paddr = accept(Client,Server); close Client) {
-
-  chop( my $command = <Client> );
-
-  if ( $command eq "signup_info" ) {
-
-    warn "[fs_signupd] sending signup info...\n" if $Debug; 
-    nstore_fd($init_data, \*Client) or die "can't send init data: $!";
-    Client->flush;
-
-  } elsif ( $command eq "new_customer" ) {
-
-    #inefficient...
-
-    warn "[fs_signupd] reading customer signup...\n" if $Debug;
-    my $signup_data = fd_retrieve(\*Client);
-
-    warn "[fs_signupd] sending customer data to remote server...\n" if $Debug;
-    nstore_fd($signup_data, \*STDOUT) or die "can't send signup data: $!";
-    STDOUT->flush;
-
-    warn "[fs_signupd] reading error from remote server...\n" if $Debug;
-    my $error = <STDIN>;
-
-    warn "[fs_signupd] sending error to local client...\n" if $Debug;
-    print Client $error;
-    Client->flush;
-
-  } else {
-    die "unexpected command from client: $command";
-  }
-
-}
-
-- 
cgit v1.2.1


From 4060bc129c8b4e2ea1b699b48fb8bf69608c4b0c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Mar 2004 00:34:43 +0000
Subject: dont want to error out here

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index dc50433d2..ba1f5cd17 100644
--- a/Makefile
+++ b/Makefile
@@ -124,7 +124,7 @@ install-docs: docs
 	[ "${TEMPLATE}" = "mason" ] && \
 	  perl -p -i -e "\
 	    s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
-	  " ${MASON_HANDLER}
+	  " ${MASON_HANDLER} || true
 	[ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
 	[ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true
 
-- 
cgit v1.2.1


From 8ce96f4accb45f2577d38de81b9f96c0031a2f8a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Mar 2004 04:36:16 +0000
Subject: recognize DBD::mysqlPP

---
 FS/FS/cust_svc.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 0d8a12114..b97539681 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -380,7 +380,7 @@ sub seconds_since_sqlradacct {
 
     #select a unix time conversion function based on database type
     my $str2time;
-    if ( $dbh->{Driver}->{Name} eq 'mysql' ) {
+    if ( $dbh->{Driver}->{Name} =~ /^mysql(PP)?$/ ) {
       $str2time = 'UNIX_TIMESTAMP(';
     } elsif ( $dbh->{Driver}->{Name} eq 'Pg' ) {
       $str2time = 'EXTRACT( EPOCH FROM ';
@@ -498,7 +498,7 @@ sub attribute_since_sqlradacct {
 
     #select a unix time conversion function based on database type
     my $str2time;
-    if ( $dbh->{Driver}->{Name} eq 'mysql' ) {
+    if ( $dbh->{Driver}->{Name} =~ /^mysql(PP)?$/ ) {
       $str2time = 'UNIX_TIMESTAMP(';
     } elsif ( $dbh->{Driver}->{Name} eq 'Pg' ) {
       $str2time = 'EXTRACT( EPOCH FROM ';
@@ -561,7 +561,7 @@ sub get_session_history {
 
     #select a unix time conversion function based on database type
     my $str2time;                                                 
-    if ( $dbh->{Driver}->{Name} eq 'mysql' ) {
+    if ( $dbh->{Driver}->{Name} =~ /^mysql(PP)?$/ ) {
       $str2time = 'UNIX_TIMESTAMP(';          
     } elsif ( $dbh->{Driver}->{Name} eq 'Pg' ) {
       $str2time = 'EXTRACT( EPOCH FROM ';       
-- 
cgit v1.2.1


From ae11d16db998c044e523030cc026b2d0c0bc981b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Mar 2004 06:43:15 +0000
Subject: initial (hopefully rather unobtrusive) patch

---
 rt/FREESIDE_MODIFIED      | 1 +
 rt/sbin/rt-setup-database | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 rt/FREESIDE_MODIFIED

diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED
new file mode 100644
index 000000000..e41fc2f68
--- /dev/null
+++ b/rt/FREESIDE_MODIFIED
@@ -0,0 +1 @@
+sbin/rt-setup-database
diff --git a/rt/sbin/rt-setup-database b/rt/sbin/rt-setup-database
index 58f882f6e..83e08270a 100644
--- a/rt/sbin/rt-setup-database
+++ b/rt/sbin/rt-setup-database
@@ -110,6 +110,9 @@ elsif ( $args{'action'} eq 'drop' ) {
     }
     drop_db();
 }
+elsif ( $args{'action'} eq 'insert_initial' ) {
+    insert_initial_data();
+}
 elsif ( $args{'action'} eq 'insert' ) {
     insert_data( $args{'datafile'} );
 }
-- 
cgit v1.2.1


From d5097ef7712573de5faf223de8c9ec0a43ffcff0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Mar 2004 06:45:22 +0000
Subject: initial RT targets

---
 Makefile | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/Makefile b/Makefile
index ba1f5cd17..20b70af67 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,7 @@ help:
 	@echo "                   perl-modules install-perl-modules"
 	@echo "                   install deploy"
 	@echo "                   create-database"
+	@echo "                   configure-rt create-rt"
 	@echo "                   clean"
 
 aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
@@ -183,6 +184,24 @@ create-config: install-perl-modules
 	mkdir "${FREESIDE_CONF}/export.${DATASOURCE}"
 	chown freeside "${FREESIDE_CONF}/export.${DATASOURCE}"
 
+configure-rt:
+	cd rt; \
+	./configure --htmldir=${FREESIDE_DOCUMENT_ROOT}/rt \
+	            --masonstatedir=${MASONDATA} \
+	            --with-db-type=Pg \
+	            --with-db-database=freeside \
+	            --with-db-rt-user=${DB_USER} \
+	            --with-db-rt-pass=${DB_PASSWORD} \
+	            --with-web-user=freeside \
+	            --with-web-group=www
+
+create-rt: configure-rt
+	cd rt; make install
+	rt/sbin/rt-initialize-database --action schema
+	rt/sbin/rt-initialize-database --action insert_initial
+	rt/sbin/rt-initialize-database --action insert --datafile rt/etc/initialdata
+
+
 clean:
 	rm -rf aspdocs masondocs
 	cd FS; \
-- 
cgit v1.2.1


From 746f4a81b7cc2073a06675a08e930d9f2d76cbb0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Mar 2004 06:58:01 +0000
Subject: config.layout needs to be generated

---
 rt/FREESIDE_MODIFIED |   2 +
 rt/config.layout     | 104 -----------------------------------------
 rt/config.layout.in  | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 129 insertions(+), 104 deletions(-)
 delete mode 100644 rt/config.layout
 create mode 100644 rt/config.layout.in

diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED
index e41fc2f68..cab7db3cf 100644
--- a/rt/FREESIDE_MODIFIED
+++ b/rt/FREESIDE_MODIFIED
@@ -1 +1,3 @@
 sbin/rt-setup-database
+config.layout
+config.layout.in
diff --git a/rt/config.layout b/rt/config.layout
deleted file mode 100644
index 23a7775d6..000000000
--- a/rt/config.layout
+++ /dev/null
@@ -1,104 +0,0 @@
-##
-##  config.layout -- Pre-defined Installation Path Layouts
-##
-##  Hints:
-##  - layouts can be loaded with configure's --enable-layout=ID option
-##  - when no --enable-layout option is given, the default layout is `RT'
-##  - a trailing plus character (`+') on paths is replaced with a
-##    `/<target>' suffix where <target> is currently hardcoded to 'rt3'.
-##    (This may become a configurable parameter at some point.)
-##
-##  The following variables must _all_ be set:
-##	prefix exec_prefix bindir sbindir sysconfdir mandir libdir
-##	datadir htmldir localstatedir logfiledir masonstatedir
-##	sessionstatedir customdir customhtmldir customlexdir
-##  (This can be seen in m4/rt_layout.m4.)
-##
-
-#   Default RT3 path layout.
-<Layout RT3>
-  prefix:		/opt/rt3
-  exec_prefix:		${prefix}
-  bindir:		${exec_prefix}/bin
-  sbindir:		${exec_prefix}/sbin
-  sysconfdir:		${prefix}/etc
-  mandir:		${prefix}/man
-  libdir:		${prefix}/lib
-  datadir:		${prefix}/share
-  htmldir:		${datadir}/html
-  manualdir:		${datadir}/doc
-  localstatedir:	${prefix}/var
-  logfiledir:		${localstatedir}/log
-  masonstatedir:	${localstatedir}/mason_data
-  sessionstatedir:	${localstatedir}/session_data
-  customdir:		${prefix}/local
-  custometcdir:		${customdir}/etc
-  customhtmldir:	${customdir}/html
-  customlexdir:		${customdir}/po
-  customlibdir:		${customdir}/lib
-</Layout>
-<Layout inplace>
-  prefix:		`pwd`
-  exec_prefix:		${prefix}
-  bindir:		${exec_prefix}/bin
-  sbindir:		${exec_prefix}/sbin
-  sysconfdir:		${prefix}/etc
-  mandir:		${prefix}/man
-  libdir:		${prefix}/lib
-  datadir:		${prefix}/share
-  htmldir:		${prefix}/html
-  manualdir:		${datadir}/doc
-  localstatedir:	${prefix}/var
-  logfiledir:		${localstatedir}/log
-  masonstatedir:	${localstatedir}/mason_data
-  sessionstatedir:	${localstatedir}/session_data
-  customdir:		${prefix}/local
-  custometcdir:		${customdir}/etc
-  customhtmldir:	${customdir}/html
-  customlexdir:		${customdir}/po
-  customlibdir:		${customdir}/lib
-</Layout>
-
-<Layout FreeBSD>
-  prefix:		/usr/local
-  exec_prefix:		${prefix}
-  bindir:		${exec_prefix}/bin
-  sbindir:		${exec_prefix}/sbin
-  sysconfdir:		${prefix}/etc+
-  mandir:		${prefix}/man
-  libdir:		${prefix}/lib+
-  datadir:		${prefix}/share+
-  htmldir:		${datadir}/html
-  manualdir:		${prefix}/share/doc+
-  logfiledir:		/var/log
-  localstatedir:	/var/run+
-  masonstatedir:	${localstatedir}/mason_data
-  sessionstatedir:	${localstatedir}/session_data
-  customdir:		${prefix}/share+
-  custometcdir:		${customdir}/local/etc
-  customhtmldir:	${customdir}/local/html
-  customlexdir:		${customdir}/local/po
-  customlibdir:		${customdir}/local/lib
-</Layout>
-
-<Layout Win32>
-  prefix:		C:/Program Files/Request Tracker
-  exec_prefix:		${prefix}
-  bindir:		${exec_prefix}/bin
-  sbindir:		${exec_prefix}/sbin
-  sysconfdir:		${prefix}/etc
-  mandir:		${prefix}/man
-  libdir:		${prefix}/lib
-  datadir:		${prefix}
-  htmldir:		${datadir}/html
-  manualdir:		${datadir}/doc
-  localstatedir:	${prefix}/var
-  logfiledir:		${localstatedir}/log
-  masonstatedir:	${localstatedir}/mason_data
-  sessionstatedir:	${localstatedir}/session_data
-  customdir:		${prefix}/local
-  custometcdir:		${customdir}/etc
-  customhtmldir:	${customdir}/html
-  customlexdir:		${customdir}/po
-  customlibdir:		${customdir}/lib
-</Layout>
diff --git a/rt/config.layout.in b/rt/config.layout.in
new file mode 100644
index 000000000..63ed61be9
--- /dev/null
+++ b/rt/config.layout.in
@@ -0,0 +1,127 @@
+##
+##  config.layout -- Pre-defined Installation Path Layouts
+##
+##  Hints:
+##  - layouts can be loaded with configure's --enable-layout=ID option
+##  - when no --enable-layout option is given, the default layout is `RT'
+##  - a trailing plus character (`+') on paths is replaced with a
+##    `/<target>' suffix where <target> is currently hardcoded to 'rt3'.
+##    (This may become a configurable parameter at some point.)
+##
+##  The following variables must _all_ be set:
+##	prefix exec_prefix bindir sbindir sysconfdir mandir libdir
+##	datadir htmldir localstatedir logfiledir masonstatedir
+##	sessionstatedir customdir customhtmldir customlexdir
+##  (This can be seen in m4/rt_layout.m4.)
+##
+
+#   Default RT3 path layout.
+<Layout RT3>
+  prefix:		/opt/rt3
+  exec_prefix:		${prefix}
+  bindir:		${exec_prefix}/bin
+  sbindir:		${exec_prefix}/sbin
+  sysconfdir:		${prefix}/etc
+  mandir:		${prefix}/man
+  libdir:		${prefix}/lib
+  datadir:		${prefix}/share
+  htmldir:		${datadir}/html
+  manualdir:		${datadir}/doc
+  localstatedir:	${prefix}/var
+  logfiledir:		${localstatedir}/log
+  masonstatedir:	${localstatedir}/mason_data
+  sessionstatedir:	${localstatedir}/session_data
+  customdir:		${prefix}/local
+  custometcdir:		${customdir}/etc
+  customhtmldir:	${customdir}/html
+  customlexdir:		${customdir}/po
+  customlibdir:		${customdir}/lib
+</Layout>
+<Layout inplace>
+  prefix:		`pwd`
+  exec_prefix:		${prefix}
+  bindir:		${exec_prefix}/bin
+  sbindir:		${exec_prefix}/sbin
+  sysconfdir:		${prefix}/etc
+  mandir:		${prefix}/man
+  libdir:		${prefix}/lib
+  datadir:		${prefix}/share
+  htmldir:		${prefix}/html
+  manualdir:		${datadir}/doc
+  localstatedir:	${prefix}/var
+  logfiledir:		${localstatedir}/log
+  masonstatedir:	${localstatedir}/mason_data
+  sessionstatedir:	${localstatedir}/session_data
+  customdir:		${prefix}/local
+  custometcdir:		${customdir}/etc
+  customhtmldir:	${customdir}/html
+  customlexdir:		${customdir}/po
+  customlibdir:		${customdir}/lib
+</Layout>
+
+<Layout FreeBSD>
+  prefix:		/usr/local
+  exec_prefix:		${prefix}
+  bindir:		${exec_prefix}/bin
+  sbindir:		${exec_prefix}/sbin
+  sysconfdir:		${prefix}/etc+
+  mandir:		${prefix}/man
+  libdir:		${prefix}/lib+
+  datadir:		${prefix}/share+
+  htmldir:		${datadir}/html
+  manualdir:		${prefix}/share/doc+
+  logfiledir:		/var/log
+  localstatedir:	/var/run+
+  masonstatedir:	${localstatedir}/mason_data
+  sessionstatedir:	${localstatedir}/session_data
+  customdir:		${prefix}/share+
+  custometcdir:		${customdir}/local/etc
+  customhtmldir:	${customdir}/local/html
+  customlexdir:		${customdir}/local/po
+  customlibdir:		${customdir}/local/lib
+</Layout>
+
+<Layout Win32>
+  prefix:		C:/Program Files/Request Tracker
+  exec_prefix:		${prefix}
+  bindir:		${exec_prefix}/bin
+  sbindir:		${exec_prefix}/sbin
+  sysconfdir:		${prefix}/etc
+  mandir:		${prefix}/man
+  libdir:		${prefix}/lib
+  datadir:		${prefix}
+  htmldir:		${datadir}/html
+  manualdir:		${datadir}/doc
+  localstatedir:	${prefix}/var
+  logfiledir:		${localstatedir}/log
+  masonstatedir:	${localstatedir}/mason_data
+  sessionstatedir:	${localstatedir}/session_data
+  customdir:		${prefix}/local
+  custometcdir:		${customdir}/etc
+  customhtmldir:	${customdir}/html
+  customlexdir:		${customdir}/po
+  customlibdir:		${customdir}/lib
+</Layout>
+
+<Layout Freeside>
+  prefix:		/opt/rt3
+  exec_prefix:		${prefix}
+  bindir:		${exec_prefix}/bin
+  sbindir:		${exec_prefix}/sbin
+  sysconfdir:		${prefix}/etc
+  mandir:		${prefix}/man
+  libdir:		${prefix}/lib
+  datadir:		${prefix}/share
+  htmldir:		%%%FREESIDE_DOCUMENT_ROOT%%%/rt
+  manualdir:		${datadir}/doc
+  localstatedir:	${prefix}/var
+  logfiledir:		${localstatedir}/log
+  masonstatedir:	${localstatedir}/mason_data
+  sessionstatedir:	${localstatedir}/session_data
+  customdir:		${prefix}/local
+  custometcdir:		${customdir}/etc
+  customhtmldir:	${customdir}/html
+  customlexdir:		${customdir}/po
+  customlibdir:		${customdir}/lib
+</Layout>
+
-- 
cgit v1.2.1


From 503094650e95d616b467c51e96ec70be0bd79e57 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Mar 2004 06:59:51 +0000
Subject: autogenerate rt/config.layout file

---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 20b70af67..dd55046a7 100644
--- a/Makefile
+++ b/Makefile
@@ -186,7 +186,11 @@ create-config: install-perl-modules
 
 configure-rt:
 	cd rt; \
-	./configure --htmldir=${FREESIDE_DOCUMENT_ROOT}/rt \
+	cp config.layout.in config.layout; \
+	perl -p -i -e \"
+	  s/%%%FREESIDE_DOCUMENT_ROOT%%%/${FREESIDE_DOCUMENT_ROOT}/g;\
+	" config.layout
+	./configure --with-layout=Freeside\
 	            --masonstatedir=${MASONDATA} \
 	            --with-db-type=Pg \
 	            --with-db-database=freeside \
-- 
cgit v1.2.1


From 6b54ceeb39da7915624bbcac63fb16e463916709 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Mar 2004 07:00:57 +0000
Subject: transposition

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index dd55046a7..42f1b85f1 100644
--- a/Makefile
+++ b/Makefile
@@ -187,7 +187,7 @@ create-config: install-perl-modules
 configure-rt:
 	cd rt; \
 	cp config.layout.in config.layout; \
-	perl -p -i -e \"
+	perl -p -i -e "\
 	  s/%%%FREESIDE_DOCUMENT_ROOT%%%/${FREESIDE_DOCUMENT_ROOT}/g;\
 	" config.layout
 	./configure --with-layout=Freeside\
-- 
cgit v1.2.1


From 0bfec9596615f85454378af865677e49f0a4f68d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Mar 2004 07:03:07 +0000
Subject: use a proper delimter

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 42f1b85f1..7f06cb7ef 100644
--- a/Makefile
+++ b/Makefile
@@ -188,7 +188,7 @@ configure-rt:
 	cd rt; \
 	cp config.layout.in config.layout; \
 	perl -p -i -e "\
-	  s/%%%FREESIDE_DOCUMENT_ROOT%%%/${FREESIDE_DOCUMENT_ROOT}/g;\
+	  s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g;\
 	" config.layout
 	./configure --with-layout=Freeside\
 	            --masonstatedir=${MASONDATA} \
-- 
cgit v1.2.1


From 8be4f17f8bda91fdf61a5f22314a04ba23e8f489 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Mar 2004 07:04:08 +0000
Subject: and finally, run the ./configure

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7f06cb7ef..bce1d6145 100644
--- a/Makefile
+++ b/Makefile
@@ -189,7 +189,7 @@ configure-rt:
 	cp config.layout.in config.layout; \
 	perl -p -i -e "\
 	  s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g;\
-	" config.layout
+	" config.layout; \
 	./configure --with-layout=Freeside\
 	            --masonstatedir=${MASONDATA} \
 	            --with-db-type=Pg \
-- 
cgit v1.2.1


From 5491c4474430dde5f3087894dc0e90b8d46fc552 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Mar 2004 07:06:17 +0000
Subject: masonstatedir can't be configured form ./configure either, must use
 layout

---
 Makefile            | 2 +-
 rt/config.layout.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index bce1d6145..d71046f41 100644
--- a/Makefile
+++ b/Makefile
@@ -189,9 +189,9 @@ configure-rt:
 	cp config.layout.in config.layout; \
 	perl -p -i -e "\
 	  s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g;\
+	  s'%%%MASONDATA%%%'${MASONDATA}'g;\
 	" config.layout; \
 	./configure --with-layout=Freeside\
-	            --masonstatedir=${MASONDATA} \
 	            --with-db-type=Pg \
 	            --with-db-database=freeside \
 	            --with-db-rt-user=${DB_USER} \
diff --git a/rt/config.layout.in b/rt/config.layout.in
index 63ed61be9..a08f48948 100644
--- a/rt/config.layout.in
+++ b/rt/config.layout.in
@@ -116,7 +116,7 @@
   manualdir:		${datadir}/doc
   localstatedir:	${prefix}/var
   logfiledir:		${localstatedir}/log
-  masonstatedir:	${localstatedir}/mason_data
+  masonstatedir:	%%%MASONDATA%%%
   sessionstatedir:	${localstatedir}/session_data
   customdir:		${prefix}/local
   custometcdir:		${customdir}/etc
-- 
cgit v1.2.1


From d57a7d6d2e1bedca8a0df351a3054baa6e57ea4a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Mar 2004 20:41:31 +0000
Subject: rt-setup-database, not rt-initialize-database

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index d71046f41..e5ef70d6c 100644
--- a/Makefile
+++ b/Makefile
@@ -201,9 +201,9 @@ configure-rt:
 
 create-rt: configure-rt
 	cd rt; make install
-	rt/sbin/rt-initialize-database --action schema
-	rt/sbin/rt-initialize-database --action insert_initial
-	rt/sbin/rt-initialize-database --action insert --datafile rt/etc/initialdata
+	rt/sbin/rt-setup-database --action schema
+	rt/sbin/rt-setup-database --action insert_initial
+	rt/sbin/rt-setup-database --action insert --datafile rt/etc/initialdata
 
 
 clean:
-- 
cgit v1.2.1


From 72a65ceaa28155e8c1c3c1328dd76587b35e089a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Mar 2004 21:47:56 +0000
Subject: proper self-service login supporting plaintext, crypt and MD5
 passwords

---
 FS/FS/ClientAPI/MyAccount.pm       | 23 +++++++++--------------
 FS/FS/ClientAPI/passwd.pm          | 20 ++++++++------------
 FS/FS/svc_acct.pm                  | 31 +++++++++++++++++++++++++++++++
 httemplate/docs/install.html       |  1 +
 httemplate/docs/upgrade-1.4.2.html |  1 +
 5 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 445f0ece8..a865a22d5 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -44,24 +44,19 @@ my $cache = new Cache::SharedMemoryCache( {
    'namespace' => 'FS::ClientAPI::MyAccount',
 } );
 
-#false laziness w/FS::ClientAPI::passwd::passwd (needs to handle encrypted pw)
+#false laziness w/FS::ClientAPI::passwd::passwd
 sub login {
   my $p = shift;
 
   my $svc_domain = qsearchs('svc_domain', { 'domain' => $p->{'domain'} } )
-    or return { error => "Domain not found" };
-
-  my $svc_acct =
-    ( length($p->{'password'}) < 13
-      && qsearchs( 'svc_acct', { 'username'  => $p->{'username'},
-                                 'domsvc'    => $svc_domain->svcnum,
-                                 '_password' => $p->{'password'}     } )
-    )
-    || qsearchs( 'svc_acct', { 'username'  => $p->{'username'},
-                               'domsvc'    => $svc_domain->svcnum,
-                               '_password' => $p->{'password'}     } );
-
-  unless ( $svc_acct ) { return { error => 'Incorrect password.' } }
+    or return { error => 'Domain '. $p->{'domain'}. ' not found' };
+
+  my $svc_acct = qsearchs( 'svc_acct', { 'username'  => $p->{'username'},
+                                         'domsvc'    => $svc_domain->svcnum, }
+                         );
+  return { error => 'User not found.' } unless $svc_acct;
+  return { error => 'Incorrect password.' }
+    unless $svc_acct->check_password($p->{'password'});
 
   my $session = {
     'svcnum' => $svc_acct->svcnum,
diff --git a/FS/FS/ClientAPI/passwd.pm b/FS/FS/ClientAPI/passwd.pm
index 016ebff79..96110ef3a 100644
--- a/FS/FS/ClientAPI/passwd.pm
+++ b/FS/FS/ClientAPI/passwd.pm
@@ -24,18 +24,14 @@ sub passwd {
   my $new_gecos = $packet->{'new_gecos'};
   my $new_shell = $packet->{'new_shell'};
 
-#false laziness w/FS::ClientAPI::MyAccount::login (needs to handle encrypted pw)
-  my $svc_acct =
-    ( length($old_password) < 13
-      && qsearchs( 'svc_acct', { 'username'  => $packet->{'username'},
-                                 'domsvc'    => $svc_domain->svcnum,
-                                 '_password' => $old_password } )
-    )
-    || qsearchs( 'svc_acct', { 'username'  => $packet->{'username'},
-                               'domsvc'    => $svc_domain->svcnum,
-                               '_password' => $old_password } );
-
-  unless ( $svc_acct ) { return { error => 'Incorrect password.' } }
+  #false laziness w/FS::ClientAPI::MyAccount::login
+
+  my $svc_acct = qsearchs( 'svc_acct', { 'username'  => $packet->{'username'},
+                                         'domsvc'    => $svc_domain->svcnum, }
+                         );
+  return { error => 'User not found.' } unless $svc_acct;
+  return { error => 'Incorrect password.' }
+    unless $svc_acct->check_password($old_password);
 
   my %hash = $svc_acct->hash;
   my $new_svc_acct = new FS::svc_acct ( \%hash );
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index d84240f36..991cedd21 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -14,6 +14,7 @@ use vars qw( @ISA $DEBUG $me $conf
              @saltset @pw_set );
 use Carp;
 use Fcntl qw(:flock);
+use Crypt::PasswdMD5;
 use FS::UID qw( datasrc );
 use FS::Conf;
 use FS::Record qw( qsearch qsearchs fields dbh dbdef );
@@ -1116,6 +1117,36 @@ sub clone_kludge_unsuspend {
   new FS::svc_acct \%hash;
 }
 
+=item check_password 
+
+Checks the supplied password against the (possibly encrypted) password in the
+database.  Returns true for a sucessful authentication, false for no match.
+
+Currently supported encryptions are: classic DES crypt() and MD5
+
+=cut
+
+sub check_password {
+  my($self, $check_password) = @_;
+  #eventually should check a "password-encoding" field
+  if ( length($self->_password) < 13 ) { #plaintext
+    $check_password eq $self->_password;
+  } elsif ( length($self->_password) == 13 ) { #traditional DES crypt
+    crypt($check_password, $self->_password) eq $self->_password;
+  } elsif ( $self->_password =~ /^\$1\$/ ) { #MD5 crypt
+    unix_md5_crypt($check_password, $self->_password) eq $self->_password;
+  } elsif ( $self->_password =~ /^\$2a?\$/ ) { #Blowfish
+    warn "Can't check password: Blowfish encryption not yet supported, svcnum".
+         $self->svcnum. "\n";
+    0;
+  } else {
+    warn "Can't check password: Unrecognized encryption for svcnum ".
+         $self->svcnum. "\n";
+    0;
+  }
+
+}
+
 =back
 
 =head1 SUBROUTINES
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index ed306f2d3..0217c9085 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -56,6 +56,7 @@ Before installing, you need:
 <!-- MyAccounts, maybe only for dev     <li><a href="http://search.cpan.org/search?dist=Cache-Cache">Cache::Cache</a> -->
       <li><a href="http://search.cpan.org/search?dist=NetAddr-IP">NetAddr-IP</a>
       <li><a href="http://search.cpan.org/search?dist=Chart">Chart</a>
+      <li><a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a>
       <li><a href="http://search.cpan.org/search?dist=ApacheDBI">Apache::DBI</a> <i>(optional but recommended for better webinterface performance)</i>
     </ul>
 </ul>
diff --git a/httemplate/docs/upgrade-1.4.2.html b/httemplate/docs/upgrade-1.4.2.html
index 3c9ac9c6d..b8c5fcf7e 100644
--- a/httemplate/docs/upgrade-1.4.2.html
+++ b/httemplate/docs/upgrade-1.4.2.html
@@ -13,6 +13,7 @@
   <li>Install <a href="http://search.cpan.org/search?dist=DBD-Pg">DBD::Pg</a> 1.32.
   <li>Install <a href="http://search.cpan.org/search?dist=Cache-Cache">Cache::Cache</a>.
   <li>Install <a href="http://search.cpan.org/search?dist=Net-SSH">Net::SSH</a> 0.08.
+  <li>Install <a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a>
   <li>CGI.pm minimum version 2.47 is required.  You will probably need to install a current CGI.pm from CPAN if you are using Perl 5.005 or earlier.
   <li>If using Apache::ASP, add <code>PerlSetVar RequestBinaryRead Off</code> to your Apache configuration and make sure you are using Apache::ASP minimum version 2.55.
   <li>Run <code>make aspdocs</code> or <code>make masondocs</code>.
-- 
cgit v1.2.1


From 44a98d88974faf787ba4f4264ee9532c86e19f1f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Mar 2004 22:45:15 +0000
Subject: add -d and -r options

---
 bin/shadow.reimport | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/bin/shadow.reimport b/bin/shadow.reimport
index 2c0ad1fea..4cb68a583 100755
--- a/bin/shadow.reimport
+++ b/bin/shadow.reimport
@@ -1,8 +1,12 @@
-#!/usr/bin/perl -Tw
-# $Id: shadow.reimport,v 1.1 2004-02-03 00:19:45 ivan Exp $
+#!/usr/bin/perl -w
+#
+# -d: dry-run: make no changes
+# -r: replace: overwrite existing passwords (otherwise only "*" passwords will
+#              be changed)
 
 use strict;
 use vars qw(%part_svc);
+use Getopt::Std;
 use Term::Query qw(query);
 use Net::SCP qw(iscp);
 use FS::UID qw(adminsuidsetup datasrc);
@@ -10,6 +14,9 @@ use FS::Record qw(qsearch qsearchs);
 use FS::svc_acct;
 use FS::part_svc;
 
+use vars qw($opt_d $opt_r);
+getopts("dr");
+
 my $user = shift or die &usage;
 adminsuidsetup $user;
 
@@ -29,14 +36,15 @@ die "No services with svcdb svc_acct!\n" unless %part_svc;
 print "\n\n", &menu_svc, "\n", <<END;
 Enter part number to import.
 END
-my($shell_svcpart)=&getpart;
+#my($shell_svcpart)=&getpart;
+my $shell_svcpart = 2;
 
 print "\n\n", <<END;
 Enter the location and name of your _user_ shadow file, for example
 "mail.isp.com:/etc/shadow" or "bsd.isp.com:/etc/master.passwd"
 END
-my($loc_shadow)=&getvalue(":");
-iscp("root\@$loc_shadow", "$spooldir/shadow.import");
+#my($loc_shadow)=&getvalue(":");
+#iscp("root\@$loc_shadow", "$spooldir/shadow.import");
 
 sub menu_svc {
   ( join "\n", map "$_: ".$part_svc{$_}->svc, sort keys %part_svc ). "\n";
@@ -73,18 +81,25 @@ while (<SHADOW>) {
   next unless @svc_acct;
 
   if ( scalar(@svc_acct) > 1 ) {
-    warn "more than one $username found!\n";
+    die "more than one $username found!\n";
     next;
   }
 
   my $svc_acct = shift @svc_acct;
 
+  next unless $svc_acct->_password eq '*' || $opt_r;
+
   next if $svc_acct->_password eq $password;
+  next if $svc_acct->_password =~ /^\*SUSPENDED\*/;
 
   my $new_svc_acct = new FS::svc_acct( { $svc_acct->hash } );
   $new_svc_acct->_password($password);
-  #my $error = $new_svc_acct->replace($svc_acct);
-  #die "$username: $error" if $error;
+  #warn "$username: ". $svc_acct->_password. " -> $password\n";
+  warn "changing password for $username\n";
+  unless ( $opt_d ) {
+    my $error = $new_svc_acct->replace($svc_acct);
+    die "$username: $error" if $error;
+  }
 
   $updated++;
 
@@ -93,6 +108,6 @@ while (<SHADOW>) {
 warn "$updated of $line passwords changed\n";
 
 sub usage {
-  die "Usage:\n\n  shadow.reimport user\n";
+  die "Usage:\n\n  shadow.reimport [ -d ] [ -r ] user\n";
 }
 
-- 
cgit v1.2.1


From 389dad7142dd7bf9c4b12d42958ebec50e4ae400 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Mar 2004 22:49:26 +0000
Subject: re-enable prompting

---
 bin/shadow.reimport | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bin/shadow.reimport b/bin/shadow.reimport
index 4cb68a583..846cb89c5 100755
--- a/bin/shadow.reimport
+++ b/bin/shadow.reimport
@@ -36,15 +36,14 @@ die "No services with svcdb svc_acct!\n" unless %part_svc;
 print "\n\n", &menu_svc, "\n", <<END;
 Enter part number to import.
 END
-#my($shell_svcpart)=&getpart;
-my $shell_svcpart = 2;
+my($shell_svcpart)=&getpart;
 
 print "\n\n", <<END;
 Enter the location and name of your _user_ shadow file, for example
 "mail.isp.com:/etc/shadow" or "bsd.isp.com:/etc/master.passwd"
 END
-#my($loc_shadow)=&getvalue(":");
-#iscp("root\@$loc_shadow", "$spooldir/shadow.import");
+my($loc_shadow)=&getvalue(":");
+iscp("root\@$loc_shadow", "$spooldir/shadow.import");
 
 sub menu_svc {
   ( join "\n", map "$_: ".$part_svc{$_}->svc, sort keys %part_svc ). "\n";
-- 
cgit v1.2.1


From c2962f704aa7711489f2dd2fc8be3396095aa166 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Mar 2004 22:53:07 +0000
Subject: allow multiple svcparts

---
 bin/shadow.reimport | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/bin/shadow.reimport b/bin/shadow.reimport
index 846cb89c5..4d112d753 100755
--- a/bin/shadow.reimport
+++ b/bin/shadow.reimport
@@ -34,9 +34,10 @@ $FS::svc_Common::noexport_hack = 1;
 die "No services with svcdb svc_acct!\n" unless %part_svc;
 
 print "\n\n", &menu_svc, "\n", <<END;
-Enter part number to import.
+Enter part number or part numbers to import.
 END
 my($shell_svcpart)=&getpart;
+my @shell_svcpart = split(/[,\s]+/, $shell_svcpart);
 
 print "\n\n", <<END;
 Enter the location and name of your _user_ shadow file, for example
@@ -74,8 +75,12 @@ while (<SHADOW>) {
   chop;
   my($username,$password)=split(/:/);
 
-  my @svc_acct = grep { $_->cust_svc->svcpart == $shell_svcpart } 
-                 qsearch('svc_acct', { 'username' => $username } );
+#  my @svc_acct = grep { $_->cust_svc->svcpart == $shell_svcpart } 
+#                 qsearch('svc_acct', { 'username' => $username } );
+  my @svc_acct = grep {
+                   my $svcpart = $_->cust_svc->svcpart;
+                   grep { $_ == $svcpart } @shell_svcpart;
+                 } qsearch('svc_acct', { 'username' => $username } );
 
   next unless @svc_acct;
 
-- 
cgit v1.2.1


From 9ceb48a8f852ba25cc569d2da87c092cf33b3a28 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Mar 2004 22:55:51 +0000
Subject: fix multiple svcparts

---
 bin/shadow.reimport | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/shadow.reimport b/bin/shadow.reimport
index 4d112d753..a02582d96 100755
--- a/bin/shadow.reimport
+++ b/bin/shadow.reimport
@@ -36,7 +36,7 @@ die "No services with svcdb svc_acct!\n" unless %part_svc;
 print "\n\n", &menu_svc, "\n", <<END;
 Enter part number or part numbers to import.
 END
-my($shell_svcpart)=&getpart;
+my($shell_svcpart)=&getvalue;
 my @shell_svcpart = split(/[,\s]+/, $shell_svcpart);
 
 print "\n\n", <<END;
-- 
cgit v1.2.1


From 3fe2bdd02f71c30a4d2bb29fdf3e63f416fd92d7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Mar 2004 23:08:48 +0000
Subject: skip root user and anyone with *LK* or NP accounts

---
 bin/shadow.reimport | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/shadow.reimport b/bin/shadow.reimport
index a02582d96..2fc90d7f2 100755
--- a/bin/shadow.reimport
+++ b/bin/shadow.reimport
@@ -93,6 +93,10 @@ while (<SHADOW>) {
 
   next unless $svc_acct->_password eq '*' || $opt_r;
 
+  next if $svc_acct->username eq 'root';
+
+  next if $password eq 'NP' || $password eq '*LK*';
+
   next if $svc_acct->_password eq $password;
   next if $svc_acct->_password =~ /^\*SUSPENDED\*/;
 
-- 
cgit v1.2.1


From 32ce27b2183644a901bc79f16278ae750537fbdd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Mar 2004 23:16:21 +0000
Subject: fixup password checking to understand old-style *SUSPENDED* accounts
 and not to allow access for * ! !! passwords

---
 FS/FS/svc_acct.pm | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 991cedd21..4ea52520c 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1128,14 +1128,21 @@ Currently supported encryptions are: classic DES crypt() and MD5
 
 sub check_password {
   my($self, $check_password) = @_;
+
+  #remove old-style SUSPENDED kludge, they should be allowed to login to
+  #self-service and pay up
+  ( my $password = $self->_password ) =~ s/^\*SUSPENDED\* //;
+
   #eventually should check a "password-encoding" field
-  if ( length($self->_password) < 13 ) { #plaintext
-    $check_password eq $self->_password;
-  } elsif ( length($self->_password) == 13 ) { #traditional DES crypt
-    crypt($check_password, $self->_password) eq $self->_password;
-  } elsif ( $self->_password =~ /^\$1\$/ ) { #MD5 crypt
-    unix_md5_crypt($check_password, $self->_password) eq $self->_password;
-  } elsif ( $self->_password =~ /^\$2a?\$/ ) { #Blowfish
+  if ( $password =~ /^(\*|!!?)$/ ) { #no self-service login
+    return 0;
+  } elsif ( length($password) < 13 ) { #plaintext
+    $check_password eq $password;
+  } elsif ( length($password) == 13 ) { #traditional DES crypt
+    crypt($check_password, $password) eq $password;
+  } elsif ( $password =~ /^\$1\$/ ) { #MD5 crypt
+    unix_md5_crypt($check_password, $password) eq $password;
+  } elsif ( $password =~ /^\$2a?\$/ ) { #Blowfish
     warn "Can't check password: Blowfish encryption not yet supported, svcnum".
          $self->svcnum. "\n";
     0;
-- 
cgit v1.2.1


From cccf2f33d38b693c2742b5806e32d892d31b4374 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 18 Mar 2004 01:46:40 +0000
Subject: require Storable minimum 2.09

---
 FS/bin/freeside-selfservice-server                         | 2 +-
 fs_selfservice/FS-SelfService/SelfService.pm               | 3 ++-
 fs_selfservice/FS-SelfService/freeside-selfservice-clientd | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/FS/bin/freeside-selfservice-server b/FS/bin/freeside-selfservice-server
index 03c7135b2..864c2d46e 100644
--- a/FS/bin/freeside-selfservice-server
+++ b/FS/bin/freeside-selfservice-server
@@ -15,7 +15,7 @@ use POSIX qw(:sys_wait_h setsid);
 use IO::Handle;
 use IO::Select;
 use IO::File;
-use Storable qw(nstore_fd fd_retrieve);
+use Storable 2.09 qw(nstore_fd fd_retrieve);
 use Net::SSH qw(sshopen2);
 use FS::UID qw(adminsuidsetup forksuidsetup);
 use FS::ClientAPI;
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 715f935f3..7cbf5ecad 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -7,7 +7,7 @@ use Socket;
 use FileHandle;
 #use IO::Handle;
 use IO::Select;
-use Storable qw(nstore_fd fd_retrieve);
+use Storable 2.09 qw(nstore_fd fd_retrieve);
 
 $VERSION = '0.03';
 
@@ -31,6 +31,7 @@ $socket .= '.'.$tag if defined $tag && length($tag);
   'list_pkgs'       => 'MyAccount/list_pkgs',
   'order_pkg'       => 'MyAccount/order_pkg',
   'cancel_pkg'      => 'MyAccount/cancel_pkg',
+  'charge'          => 'MyAccount/charge',
   'signup_info'     => 'Signup/signup_info',
   'new_customer'    => 'Signup/new_customer',
 );
diff --git a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
index 925bce6d2..ce9e14d35 100644
--- a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
+++ b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
@@ -9,7 +9,7 @@ use subs qw(spawn logmsg lock_write unlock_write);
 use Fcntl qw(:flock);
 use POSIX qw(:sys_wait_h);
 use Socket;
-use Storable qw(nstore_fd fd_retrieve);
+use Storable 2.09 qw(nstore_fd fd_retrieve);
 use IO::Handle qw(_IONBF);
 use IO::Select;
 use IO::File;
@@ -233,6 +233,7 @@ sub spawn {
 sub _logmsg {
   chomp( my $msg = shift );
   my $log = new IO::File ">>$log_file";
+  die "can't open $log_file: $!" unless defined($log);
   flock($log, LOCK_EX);
   seek($log, 0, 2);
   print $log "[client] [". scalar(localtime). "] [$$] $msg\n";
-- 
cgit v1.2.1


From bb70dc0af47c15b8041ebc85b6eff234a26baa14 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 18 Mar 2004 20:58:11 +0000
Subject: don't re-crypt encrypted passwords

---
 FS/FS/part_export/shellcommands.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index db2e7aaf9..a4eb0a052 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -59,9 +59,15 @@ sub _export_command {
   $finger = shell_quote $finger;
   $quoted_password = shell_quote $_password;
   $domain = $svc_acct->domain;
-  $crypt_password = ''; #surpress "used only once" warnings
-  $crypt_password = crypt( $svc_acct->_password,
+
+  #eventually should check a "password-encoding" field
+  if ( length($svc_acct->_password) == 13
+       || $svc_acct->_password =~ /^\$(1|2a?)\$/ ) {
+    $crypt_password = $svc_acct->_password;
+  } else {
+    $crypt_password = crypt( $svc_acct->_password,
                              $saltset[int(rand(64))].$saltset[int(rand(64))] );
+  }
 
   $self->shellcommands_queue( $svc_acct->svcnum,
     user         => $self->option('user')||'root',
-- 
cgit v1.2.1


From 3b7030c2c7464c2a1b409cdc22fad4a593d4f231 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 18 Mar 2004 22:00:25 +0000
Subject: add -b option

---
 bin/shadow.reimport | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/bin/shadow.reimport b/bin/shadow.reimport
index 2fc90d7f2..7957011eb 100755
--- a/bin/shadow.reimport
+++ b/bin/shadow.reimport
@@ -3,6 +3,8 @@
 # -d: dry-run: make no changes
 # -r: replace: overwrite existing passwords (otherwise only "*" passwords will
 #              be changed)
+# -b: blowfish replace: overwrite existing passwords only if they are
+#                       blowfish-encrypted
 
 use strict;
 use vars qw(%part_svc);
@@ -14,8 +16,8 @@ use FS::Record qw(qsearch qsearchs);
 use FS::svc_acct;
 use FS::part_svc;
 
-use vars qw($opt_d $opt_r);
-getopts("dr");
+use vars qw($opt_d $opt_r $opt_b);
+getopts("drb");
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
@@ -91,7 +93,9 @@ while (<SHADOW>) {
 
   my $svc_acct = shift @svc_acct;
 
-  next unless $svc_acct->_password eq '*' || $opt_r;
+  next unless    $svc_acct->_password eq '*'
+              || $opt_r
+              || ( $opt_b && $svc_acct->_password =~ /^\$2a?\$/ );
 
   next if $svc_acct->username eq 'root';
 
-- 
cgit v1.2.1


From b0011320cc2c33233ee694c61903667d2d3d8e5b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 18 Mar 2004 22:32:02 +0000
Subject: don't re-encrypt password on replace also

---
 FS/FS/part_export/shellcommands.pm | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index a4eb0a052..1eb0d8367 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -65,8 +65,10 @@ sub _export_command {
        || $svc_acct->_password =~ /^\$(1|2a?)\$/ ) {
     $crypt_password = $svc_acct->_password;
   } else {
-    $crypt_password = crypt( $svc_acct->_password,
-                             $saltset[int(rand(64))].$saltset[int(rand(64))] );
+    $crypt_password = crypt(
+      $svc_acct->_password,
+      $saltset[int(rand(64))].$saltset[int(rand(64))]
+    );
   }
 
   $self->shellcommands_queue( $svc_acct->svcnum,
@@ -92,9 +94,17 @@ sub _export_replace {
   $new_quoted_password = shell_quote $new__password; #new, better?
   $old_domain = $old->domain;
   $new_domain = $new->domain;
-  $new_crypt_password = ''; #surpress "used only once" warnings
-  $new_crypt_password = crypt( $new->_password,
-                               $saltset[int(rand(64))].$saltset[int(rand(64))]);
+
+  #eventuall should check a "password-encoding" field
+  if ( length($new->_password) == 13
+       || $new->_password =~ /^\$(1|2a?)\$/ ) {
+    $new_crypt_password = $new->_password;
+  } else {
+    $new_crypt_password =
+      crypt( $new->_password, $saltset[int(rand(64))].$saltset[int(rand(64))]
+    );
+  }
+
   if ( $self->option('usermod_pwonly') ) {
     my $error = '';
     if ( $old_username ne $new_username ) {
-- 
cgit v1.2.1


From 880355353822e9d4a2fbd9100cad7c74179c1a59 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 18 Mar 2004 22:35:32 +0000
Subject: quote already-crypted passwords to prevent variable substitution

---
 FS/FS/part_export/shellcommands.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 1eb0d8367..9fad36dad 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -63,7 +63,7 @@ sub _export_command {
   #eventually should check a "password-encoding" field
   if ( length($svc_acct->_password) == 13
        || $svc_acct->_password =~ /^\$(1|2a?)\$/ ) {
-    $crypt_password = $svc_acct->_password;
+    $crypt_password = shell_quote $svc_acct->_password;
   } else {
     $crypt_password = crypt(
       $svc_acct->_password,
@@ -98,7 +98,7 @@ sub _export_replace {
   #eventuall should check a "password-encoding" field
   if ( length($new->_password) == 13
        || $new->_password =~ /^\$(1|2a?)\$/ ) {
-    $new_crypt_password = $new->_password;
+    $new_crypt_password = shell_quote $new->_password;
   } else {
     $new_crypt_password =
       crypt( $new->_password, $saltset[int(rand(64))].$saltset[int(rand(64))]
-- 
cgit v1.2.1


From f1ddcafa4ef383b57357e7e4100b974044f14803 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Mar 2004 12:36:01 +0000
Subject: use FS::svc_domain explicitly

---
 FS/FS/ClientAPI/passwd.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/ClientAPI/passwd.pm b/FS/FS/ClientAPI/passwd.pm
index 96110ef3a..cb839ecef 100644
--- a/FS/FS/ClientAPI/passwd.pm
+++ b/FS/FS/ClientAPI/passwd.pm
@@ -3,7 +3,7 @@ package FS::ClientAPI::passwd;
 use strict;
 use FS::Record qw(qsearchs);
 use FS::svc_acct;
-#use FS::svc_domain;
+use FS::svc_domain;
 
 use FS::ClientAPI; #hmm
 FS::ClientAPI->register_handlers(
-- 
cgit v1.2.1


From 5a5242465520ef7a64a715496c31a3c17c95cc57 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Mar 2004 02:59:39 +0000
Subject: much easier to understand listing of credits/payments that get split
 up, closes: Bug#773, 762

---
 httemplate/view/cust_main.cgi | 451 +++++++++++++++++++++++-------------------
 1 file changed, 250 insertions(+), 201 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index c41d2d894..229362e6c 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -15,14 +15,16 @@ print header("Customer View", menubar(
   'Main Menu' => popurl(2)
 ));
 
-print <<END;
+%>
+
 <STYLE TYPE="text/css">
 .package TH { font-size: medium }
 .package TR { font-size: smaller }
 .package .pkgnum { font-size: medium }
 .package .provision { font-weight: bold }
 </STYLE>
-END
+
+<%
 
 die "No customer specified (bad URL)!" unless $cgi->keywords;
 my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
@@ -33,14 +35,16 @@ die "Customer not found!" unless $cust_main;
 
 print qq!<A HREF="${p}edit/cust_main.cgi?$custnum">Edit this customer</A>!;
 
-print <<END;
+%>
+
 <SCRIPT>
 function cancel_areyousure(href) {
     if (confirm("Perminantly delete all services and cancel this customer?") == true)
         window.location.href = href;
 }
 </SCRIPT>
-END
+
+<%
 
 print qq! | <A HREF="javascript:cancel_areyousure('${p}misc/cust_main-cancel.cgi?$custnum')">!.
       'Cancel this customer</A>'
@@ -348,7 +352,8 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
 
 }
 
-print <<END;
+%>
+
 <SCRIPT>
 function cust_pkg_areyousure(href) {
     if (confirm("Permanently delete included services and cancel this package?") == true)
@@ -359,7 +364,8 @@ function svc_areyousure(href) {
         window.location.href = href;
 }
 </SCRIPT>
-END
+
+<%
 
 print qq!<BR><A NAME="cust_pkg">Packages</A> !,
 #      qq!<BR>Click on package number to view/edit package.!,
@@ -536,13 +542,12 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
     }
   }
 }
-print '</TABLE>'
+print '</TABLE>';
 }
 
 #end display packages
+%>
 
-
-print <<END;
 <SCRIPT>
 function cust_pay_areyousure(href) {
     if (confirm("Are you sure you want to delete this payment?")
@@ -565,169 +570,205 @@ function cust_credit_areyousure(href) {
         window.location.href = href;
 }
 </SCRIPT>
-END
 
-if ( $conf->config('payby-default') ne 'HIDE' ) {
-  
-  #formatting
-  print qq!<BR><BR><A NAME="history">Payment History!.
-        qq!</A> ( !.
-        qq!<A HREF="!. popurl(2). qq!edit/cust_pay.cgi?custnum=$custnum">!.
-        qq!Post payment</A> | !.
-        qq!<A HREF="!. popurl(2). qq!edit/cust_credit.cgi?$custnum">!.
-        qq!Post credit</A> )!;
+<% if ( $conf->config('payby-default') ne 'HIDE' ) { %>
   
+  <BR><BR><A NAME="history">Payment History</A>
+  (<A HREF="<%= $p %>edit/cust_pay.cgi?custnum=<%= $custnum %>">Post payment</A>
+  | <A HREF="<%= $p %>edit/cust_credit.cgi?<%= $custnum %>">Post credit</A>)
+
+  <%
   #get payment history
-  #
-  # major problem: this whole thing is way too sloppy.
-  # minor problem: the description lines need better formatting.
-  
-  my @history = (); #needed for mod_perl :)
-  
-  my %target = ();
-  
-  my @bills = qsearch('cust_bill',{'custnum'=>$custnum});
-  foreach my $bill (@bills) {
-    my($bref)=$bill->hashref;
-    my $bpre = ( $bill->owed > 0 )
-                 ? '<b><font size="+1" color="#ff0000"> Open '
-                 : '';
-    my $bpost = ( $bill->owed > 0 ) ? '</font></b>' : '';
-    push @history,
-      $bref->{_date} . qq!\t<A HREF="!. popurl(2). qq!view/cust_bill.cgi?! .
-      $bref->{invnum} . qq!">${bpre}Invoice #! . $bref->{invnum} .
-      qq! (Balance \$! . $bill->owed . qq!)$bpost</A>\t! .
-      $bref->{charged} . qq!\t\t\t!;
-  
-    my(@cust_bill_pay)=qsearch('cust_bill_pay',{'invnum'=> $bref->{invnum} } );
-  #  my(@payments)=qsearch('cust_pay',{'invnum'=> $bref->{invnum} } );
-  #  my($payment);
-    foreach my $cust_bill_pay (@cust_bill_pay) {
-      my $payment = $cust_bill_pay->cust_pay;
-      my($date,$invnum,$payby,$payinfo,$paid)=($payment->_date,
-                                               $cust_bill_pay->invnum,
-                                               $payment->payby,
-                                               $payment->payinfo,
-                                               $cust_bill_pay->amount,
-                        );
-      $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
-        if $payby eq 'CARD';
-      my $target = "$payby$payinfo";
-      $payby =~ s/^BILL$/Check #/ if $payinfo;
-      $payby =~ s/^(CARD|COMP)$/$1 /;
-      my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
-                     ? qq! (<A HREF="javascript:cust_pay_areyousure('${p}misc/delete-cust_pay.cgi?!. $payment->paynum. qq!')">delete</A>)!
-                     : '';
-      my $unapply =
-        $payment->closed !~ /^Y/i && $conf->exists('unapplypayments')
-          ? qq! (<A HREF="javascript:cust_pay_unapply_areyousure('${p}misc/unapply-cust_pay.cgi?!. $payment->paynum. qq!')">unapply</A>)!
-          : '';
-      push @history,
-        "$date\tPayment, Invoice #$invnum ($payby$payinfo)$delete$unapply\t\t$paid\t\t\t$target";
+  my @history = ();
+
+  #invoices
+  foreach my $cust_bill ($cust_main->cust_bill) {
+    my $pre = ( $cust_bill->owed > 0 )
+                ? '<B><FONT SIZE="+1" COLOR="#FF0000">Open '
+                : '';
+    my $post = ( $cust_bill->owed > 0 ) ? '</FONT></B>' : '';
+    my $invnum = $cust_bill->invnum;
+    push @history, {
+      'date'   => $cust_bill->_date,
+      'desc'   => qq!<A HREF="${p}view/cust_bill.cgi?$invnum">!. $pre.
+                  "Invoice #$invnum (Balance \$". $cust_bill->owed. ')'.
+                  $post. '</A>',
+      'charge' => $cust_bill->charged,
+    };
+  }
+
+  #payments (some false laziness w/credits)
+  foreach my $cust_pay ($cust_main->cust_pay) {
+
+    my $payby = $cust_pay->payby;
+    my $payinfo = $cust_pay->payinfo;
+    my @cust_bill_pay = $cust_pay->cust_bill_pay;
+
+    $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
+      if $payby eq 'CARD';
+    my $target = "$payby$payinfo";
+    $payby =~ s/^BILL$/Check #/ if $payinfo;
+    $payby =~ s/^BILL$//;
+    $payby =~ s/^(CARD|COMP)$/$1 /;
+    my $info = $payby ? " ($payby$payinfo)" : '';
+
+    my( $pre, $post, $desc, $apply, $ext ) = ( '', '', '', '', '' );
+    if ( scalar(@cust_bill_pay) == 0 ) {
+      #completely unapplied
+      $pre = '<B><FONT COLOR="#FF0000">Unapplied ';
+      $post = '</FONT></B>';
+      $apply = qq! (<A HREF="${p}edit/cust_bill_pay.cgi?!.
+               $cust_pay->paynum. '">apply</A>)';
+    } elsif ( scalar(@cust_bill_pay) == 1 && $cust_pay->unapplied == 0 ) {
+      #applied to one invoice
+      $desc = ' applied to Invoice #'. $cust_bill_pay[0]->invnum;
+    } else {
+      #complicated
+      $desc = '<BR>';
+      foreach my $cust_bill_pay (@cust_bill_pay) {
+        $desc .= '&nbsp;&nbsp;'.
+                 '$'. $cust_bill_pay->amount.
+                 ' applied to Invoice #'. $cust_bill_pay->invnum.
+                 '<BR>';
+                 #' on '. time2str("%D", $cust_bill_pay->_date).
+
+      }
+      if ( $cust_pay->unapplied > 0 ) {
+        $desc .= '&nbsp;&nbsp;'.
+                 '<B><FONT COLOR="#FF0000">$'.
+                 $cust_pay->unapplied. ' unapplied</FONT></B>'.
+                 qq! (<A HREF="${p}edit/cust_bill_pay.cgi?!.
+                 $cust_pay->paynum. '">apply</A>)'.
+                 '<BR>';
+      }
     }
-  
-    my(@cust_credit_bill)=
-      qsearch('cust_credit_bill', { 'invnum'=> $bref->{invnum} } );
-    foreach my $cust_credit_bill (@cust_credit_bill) {
-      my $cust_credit = $cust_credit_bill->cust_credit;
-      my($date, $invnum, $crednum, $amount, $reason, $app_date ) = (
-        $cust_credit->_date,
-        $cust_credit_bill->invnum,
-        $cust_credit_bill->crednum,
-        $cust_credit_bill->amount,
-        $cust_credit->reason,
-        time2str("%D", $cust_credit_bill->_date),
-      );
-      my $delete =
-        $cust_credit->closed !~ /^Y/i && $conf->exists('deletecredits')
-          ? qq! (<A HREF="javascript:cust_credit_areyousure('${p}misc/delete-cust_credit.cgi?!. $cust_credit->crednum. qq!')">delete</A>)!
-          : '';
-      my $unapply =
-        $cust_credit->closed !~ /^Y/i && $conf->exists('unapplycredits')
-          ? qq! (<A HREF="javascript:cust_credit_unapply_areyousure('${p}misc/unapply-cust_credit.cgi?!. $cust_credit->crednum. qq!')">unapply</A>)!
-          : '';
-      push @history,
-        "$date\tCredit #$crednum: $reason<BR>".
-        "(applied to invoice #$invnum on $app_date)$delete$unapply\t\t\t$amount\t";
+
+    my $delete = '';
+    if ( $cust_pay->closed !~ /^Y/i && $conf->exists('deletepayments') ) {
+      $delete = qq! (<A HREF="javascript:cust_pay_areyousure('!.
+                qq!${p}misc/delete-cust_pay.cgi?!. $cust_pay->paynum.
+                qq!')">delete</A>)!;
     }
-  }
-  
-  my @credits = grep { scalar(my @array = $_->cust_credit_refund) }
-             qsearch('cust_credit',{'custnum'=>$custnum});
-  foreach my $credit (@credits) {
-    my($cref)=$credit->hashref;
-    my(@cust_credit_refund)=
-      qsearch('cust_credit_refund', { 'crednum'=> $cref->{crednum} } );
-    foreach my $cust_credit_refund (@cust_credit_refund) {
-      my $cust_refund = $cust_credit_refund->cust_credit;
-      my($date, $crednum, $amount, $reason, $app_date ) = (
-        $credit->_date,
-        $credit->crednum,
-        $cust_credit_refund->amount,
-        $credit->reason,
-        time2str("%D", $cust_credit_refund->_date),
-      );
-      push @history,
-        "$date\tCredit #$crednum: $reason<BR>".
-        "(applied to refund on $app_date)\t\t\t$amount\t";
+
+    my $unapply = '';
+    if (    $cust_pay->closed !~ /^Y/i
+         && $conf->exists('unapplypayments')
+         && scalar(@cust_bill_pay)           ) {
+      $unapply = qq! (<A HREF="javascript:cust_pay_unapply_areyousure('!.
+                 qq!${p}misc/unapply-cust_pay.cgi?!. $cust_pay->paynum.
+                 qq!')">unapply</A>)!;
     }
+
+    push @history, {
+      'date'    => $cust_pay->_date,
+      'desc'    => $pre. "Payment$post$info$desc".
+                   "$apply$delete$unapply",
+      'payment' => $cust_pay->paid,
+      'target'  => $target,
+    };
   }
-  
-  @credits = grep { $_->credited  > 0 }
-             qsearch('cust_credit',{'custnum'=>$custnum});
-  foreach my $credit (@credits) {
-    my($cref)=$credit->hashref;
-    my $delete =
-      $credit->closed !~ /^Y/i && $conf->exists('deletecredits')
-        ? qq! (<A HREF="javascript:cust_credit_areyousure('${p}misc/delete-cust_credit.cgi?!. $credit->crednum. qq!')">delete</A>)!
-        : '';
-    push @history,
-      $cref->{_date} . "\t" .
-      qq!<A HREF="! . popurl(2). qq!edit/cust_credit_bill.cgi?!. $cref->{crednum} . qq!">!.
-      '<b><font size="+1" color="#ff0000">Unapplied credit #' .
-      $cref->{crednum} . "</font></b></A>: ".
-      $cref->{reason} . "$delete\t\t\t" . $credit->credited . "\t";
-  }
-  
-  my(@refunds)=qsearch('cust_refund',{'custnum'=> $custnum } );
-  foreach my $refund (@refunds) {
-    my($rref)=$refund->hashref;
-    my($refundnum) = (
-      $refund->refundnum,
-    );
-  
-    push @history,
-      $rref->{_date} . "\tRefund #$refundnum, (" .
-      $rref->{payby} . " " . $rref->{payinfo} . ") by " .
-      $rref->{otaker} . " - ". $rref->{reason} . "\t\t\t\t" .
-      $rref->{refund};
+
+  #credits (some false laziness w/payments)
+  foreach my $cust_credit ($cust_main->cust_credit) {
+
+    my @cust_credit_bill = $cust_credit->cust_credit_bill;
+    my @cust_credit_refund = $cust_credit->cust_credit_refund;
+
+    my( $pre, $post, $desc, $apply, $ext ) = ( '', '', '', '', '' );
+    if (    scalar(@cust_credit_bill)   == 0
+         && scalar(@cust_credit_refund) == 0 ) {
+      #completely unapplied
+      $pre = '<B><FONT COLOR="#FF0000">Unapplied ';
+      $post = '</FONT></B>';
+      $apply = qq! (<A HREF="${p}edit/cust_credit_bill.cgi?!.
+               $cust_credit->crednum. '">apply</A>)';
+    } elsif (    scalar(@cust_credit_bill)   == 1
+              && scalar(@cust_credit_refund) == 0
+              && $cust_credit->credited == 0      ) {
+      #applied to one invoice
+      $desc = ' applied to Invoice #'. $cust_credit_bill[0]->invnum;
+    } elsif (    scalar(@cust_credit_bill)   == 0
+              && scalar(@cust_credit_refund) == 1
+              && $cust_credit->credited == 0      ) {
+      #applied to one refund
+      $desc = ' refunded on '.  time2str("%D", $cust_credit_refund[0]->_date);
+    } else {
+      #complicated
+      $desc = '<BR>';
+      foreach my $app ( sort { $a->_date <=> $b->_date }
+                             ( @cust_credit_bill, @cust_credit_refund ) ) {
+        if ( $app->isa('FS::cust_credit_bill') ) {
+          $desc .= '&nbsp;&nbsp;'.
+                   '$'. $app->amount.
+                   ' applied to Invoice #'. $app->invnum.
+                   '<BR>';
+                   #' on '. time2str("%D", $app->_date).
+        } elsif ( $app->isa('FS::cust_credit_refund') ) {
+          $desc .= '&nbsp;&nbsp;'.
+                   '$'. $app->amount.
+                   ' refunded on'. time2str("%D", $app->_date).
+                   '<BR>';
+        } else {
+          die "$app is not a FS::cust_credit_bill or a FS::cust_credit_refund";
+        }
+      }
+      if ( $cust_credit->credited > 0 ) {
+        $desc .= ' - <B><FONT COLOR="#FF0000">$'.
+                 $cust_credit->unapplied. ' unapplied</FONT></B>'.
+                 qq! (<A HREF="${p}edit/cust_credit_bill.cgi?!.
+                 $cust_credit->crednum. '">apply</A>'.
+                 '<BR>';
+      }
+    }
+#
+    my $delete = '';
+    if ( $cust_credit->closed !~ /^Y/i && $conf->exists('deletecredits') ) {
+      $delete = qq! (<A HREF="javascript:cust_credit_areyousure('!.
+                qq!${p}misc/delete-cust_credit.cgi?!. $cust_credit->crednum.
+                qq!')">delete</A>)!;
+    }
+    
+    my $unapply = '';
+    if (    $cust_credit->closed !~ /^Y/i
+         && $conf->exists('unapplycredits')
+         && scalar(@cust_credit_bill)       ) {
+      $unapply = qq! (<A HREF="javascript:cust_credit_unapply_areyousure('!.
+                 qq!${p}misc/unapply-cust_credit.cgi?!. $cust_credit->crednum.
+                 qq!')">unapply</A>)!;
+    }
+    
+    push @history, {
+      'date'   => $cust_credit->_date,
+      'desc'   => $pre. "Credit$post by ". $cust_credit->otaker.
+                  ' ('. $cust_credit->reason. ')'.
+                  "$desc$apply$delete$unapply",
+      'credit' => $cust_credit->amount,
+    };
+
   }
-  
-  my @unapplied_payments =
-    grep { $_->unapplied > 0 } qsearch('cust_pay', { 'custnum' => $custnum } );
-  foreach my $payment (@unapplied_payments) {
-    my $payby = $payment->payby;
-    my $payinfo = $payment->payinfo;
-    #false laziness w/above
+
+  #refunds
+  foreach my $cust_refund ($cust_main->cust_refund) {
+
+    my $payby = $cust_refund->payby;
+    my $payinfo = $cust_refund->payinfo;
+
     $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
       if $payby eq 'CARD';
-    my $target = "$payby$payinfo";
     $payby =~ s/^BILL$/Check #/ if $payinfo;
     $payby =~ s/^(CARD|COMP)$/$1 /;
-    my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
-                   ? qq! (<A HREF="javascript:cust_pay_areyousure('${p}misc/delete-cust_pay.cgi?!. $payment->paynum. qq!')">delete</A>)!
-                   : '';
-    push @history,
-      $payment->_date. "\t".
-      '<b><font size="+1" color="#ff0000">Unapplied payment #' .
-      $payment->paynum . " ($payby$payinfo)</font></b> ".
-      '(<A HREF="'. popurl(2). 'edit/cust_bill_pay.cgi?'. $payment->paynum. '">'.
-      "apply</A>)$delete".
-      "\t\t" . $payment->unapplied . "\t\t\t$target";
+
+    push @history, {
+      'date'   => $cust_refund->_date,
+      'desc'   => "Refund ($payby$payinfo) by ". $cust_refund->otaker,
+      'refund' => $cust_refund->refund,
+    };
+  
   }
   
-          #formatting
-          print &table(), <<END;
+  %>
+  
+  <%= table() %>
   <TR>
     <TH>Date</TH>
     <TH>Description</TH>
@@ -737,59 +778,67 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
     <TH><FONT SIZE=-1>Refund</FONT></TH>
     <TH><FONT SIZE=-1>Balance</FONT></TH>
   </TR>
-END
-  
+
+  <%
   #display payment history
-  
+
+  my %target;
   my $balance = 0;
-  foreach my $item (sort keyfield_numerically @history) {
-    my($date,$desc,$charge,$payment,$credit,$refund,$target)=split(/\t/,$item);
-    $charge ||= 0;
-    $payment ||= 0;
-    $credit ||= 0;
-    $refund ||= 0;
-    $balance += $charge - $payment;
-    $balance -= $credit - $refund;
+  foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
+
+    my $charge  = exists($item->{'charge'})
+                    ? sprintf('$%.2f', $item->{'charge'})
+                    : '';
+    my $payment = exists($item->{'payment'})
+                    ? sprintf('-&nbsp;$%.2f', $item->{'payment'})
+                    : '';
+    my $credit  = exists($item->{'credit'})
+                    ? sprintf('-&nbsp;$%.2f', $item->{'credit'})
+                    : '';
+    my $refund  = exists($item->{'refund'})
+                    ? sprintf('$%.2f', $item->{'refund'})
+                    : '';
+
+    my $target = exists($item->{'target'}) ? $item->{'target'} : '';
+
+    $balance += $item->{'charge'}  if exists $item->{'charge'};
+    $balance -= $item->{'payment'} if exists $item->{'payment'};
+    $balance -= $item->{'credit'}  if exists $item->{'credit'};
+    $balance += $item->{'refund'}  if exists $item->{'refund'};
     $balance = sprintf("%.2f", $balance);
     $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
-    $target = '' unless defined $target;
+
+  %>
   
-    print "<TR><TD><FONT SIZE=-1>";
-    print qq!<A NAME="$target">! unless $target && $target{$target}++;
-    print time2str("%D",$date);
-    print '</A>' if $target && $target{$target} == 1;
-    print "</FONT></TD>",
-  	"<TD><FONT SIZE=-1>$desc</FONT></TD>",
-  	"<TD><FONT SIZE=-1>",
-          ( $charge ? "\$".sprintf("%.2f",$charge) : '' ),
-          "</FONT></TD>",
-  	"<TD><FONT SIZE=-1>",
-          ( $payment ? "-&nbsp;\$".sprintf("%.2f",$payment) : '' ),
-          "</FONT></TD>",
-  	"<TD><FONT SIZE=-1>",
-          ( $credit ? "-&nbsp;\$".sprintf("%.2f",$credit) : '' ),
-          "</FONT></TD>",
-  	"<TD><FONT SIZE=-1>",
-          ( $refund ? "\$".sprintf("%.2f",$refund) : '' ),
-          "</FONT></TD>",
-  	"<TD><FONT SIZE=-1>\$" . $balance,
-          "</FONT></TD>",
-          "\n";
-  }
+    <TR>
+      <TD>
+        <% unless ( !$target || $target{$target}++ ) { %>
+          <A NAME="<%= $target %>">
+        <% } %>
+        <%= time2str("%D",$item->{'date'}) %>
+        <% if ( $target && $target{$target} == 1 ) { %>
+          </A>
+        <% } %>
+        </FONT>
+      </TD>
+      <TD><%= $item->{'desc'} %></TD>
+      <TD><%= $charge  %></TD>
+      <TD><%= $payment %></TD>
+      <TD><%= $credit  %></TD>
+      <TD><%= $refund  %></TD>
+      <TD>$<%= $balance %></TD>
+    </TR>
+
+  <% } %>
   
-  print "</TABLE>";
-
-}
+  </TABLE>
 
-print '</BODY></HTML>';
-
-#subroutiens
-sub keyfield_numerically { (split(/\t/,$a))[0] <=> (split(/\t/,$b))[0]; }
+<% } %>
 
-%>
+</BODY></HTML>
 
 <%
-
+#subroutines
 
 sub get_packages {
   my $cust_main = shift or return undef;
-- 
cgit v1.2.1


From 351b0af13ba6c449151c1bec2303294051c073d1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Mar 2004 10:16:43 +0000
Subject: yay!  remove package view entirely (closes: Bug#569)

---
 httemplate/misc/expire_pkg.cgi         | 64 +++++++++++++++++++++++++---------
 httemplate/misc/process/expire_pkg.cgi | 25 +++++++++++++
 httemplate/view/cust_main.cgi          | 40 ++++++++++++---------
 3 files changed, 96 insertions(+), 33 deletions(-)
 create mode 100755 httemplate/misc/process/expire_pkg.cgi

diff --git a/httemplate/misc/expire_pkg.cgi b/httemplate/misc/expire_pkg.cgi
index 9e4ce8b62..b59674a69 100755
--- a/httemplate/misc/expire_pkg.cgi
+++ b/httemplate/misc/expire_pkg.cgi
@@ -1,25 +1,55 @@
+<!-- mason kludge -->
 <%
 
-#untaint date & pkgnum
-
-my $date;
-if ( $cgi->param('date') ) {
-  str2time($cgi->param('date')) =~ /^(\d+)$/ or die "Illegal date";
-  $date=$1;
-} else {
-  $date='';
-}
-
-$cgi->param('pkgnum') =~ /^(\d+)$/ or die "Illegal pkgnum";
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
 my $pkgnum = $1;
 
+#get package record
 my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-my %hash = $cust_pkg->hash;
-$hash{expire}=$date;
-my $new = new FS::cust_pkg ( \%hash );
-my $error = $new->replace($cust_pkg);
-&eidiot($error) if $error;
+die "Unknown pkgnum $pkgnum" unless $cust_pkg;
+my $part_pkg = $cust_pkg->part_pkg;
+
+my $custnum = $cust_pkg->getfield('custnum');
 
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
+my $date = $cust_pkg->expire ? time2str('%D', $cust_pkg->expire) : '';
 
 %>
+
+<%= header('Expire package', menubar(
+  "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+  'Main Menu' => popurl(2)
+)) %>
+
+<LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+<SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
+
+<%= $pkgnum %>: <%= $part_pkg->pkg. ' - '. $part_pkg->comment %>
+
+<FORM NAME="formname" ACTION="process/expire_pkg.cgi" METHOD="post">
+<INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%= $pkgnum %>">
+<TABLE>
+  <TR>
+    <TD>Cancel package on </TD>
+    <TD><INPUT TYPE="text" NAME="date" ID="expire_date" VALUE="<%= $date %>">
+        <IMG SRC="<%= $p %>images/calendar.png" ID="expire_button" STYLE="cursor:pointer" TITLE="Select date">
+        <BR><I>m/d/y</I>
+    </TD>
+  </TR>
+</TABLE>
+
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "expire_date",
+    ifFormat:   "%m/%d/%Y",
+    button:     "expire_button",
+    align:      "BR"
+  });
+</SCRIPT>
+
+<INPUT TYPE="submit" VALUE="Cancel later">
+</FORM>
+</BODY>
+</HTML>
diff --git a/httemplate/misc/process/expire_pkg.cgi b/httemplate/misc/process/expire_pkg.cgi
new file mode 100755
index 000000000..dc35592ce
--- /dev/null
+++ b/httemplate/misc/process/expire_pkg.cgi
@@ -0,0 +1,25 @@
+<%
+
+#untaint date & pkgnum
+
+my $date;
+if ( $cgi->param('date') ) {
+  str2time($cgi->param('date')) =~ /^(\d+)$/ or die "Illegal date";
+  $date=$1;
+} else {
+  $date='';
+}
+
+$cgi->param('pkgnum') =~ /^(\d+)$/ or die "Illegal pkgnum";
+my $pkgnum = $1;
+
+my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+my %hash = $cust_pkg->hash;
+$hash{expire}=$date;
+my $new = new FS::cust_pkg ( \%hash );
+my $error = $new->replace($cust_pkg);
+&eidiot($error) if $error;
+
+print $cgi->redirect(popurl(3). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
+
+%>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 229362e6c..8d8af63d6 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -20,7 +20,6 @@ print header("Customer View", menubar(
 <STYLE TYPE="text/css">
 .package TH { font-size: medium }
 .package TR { font-size: smaller }
-.package .pkgnum { font-size: medium }
 .package .provision { font-weight: bold }
 </STYLE>
 
@@ -382,7 +381,7 @@ if ( @$packages ) {
 %>
 <TABLE CLASS="package" BORDER=1 CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">
 <TR>
-  <TH COLSPAN=2>Package</TH>
+  <TH>Package</TH>
   <TH>Status</TH>
   <TH COLSPAN=2>Services</TH>
 </TR>
@@ -402,9 +401,9 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
 %>
 <!--pkgnum: <%=$pkg->{pkgnum}%>-->
 <TR>
-  <TD ROWSPAN=<%=$rowspan%> CLASS="pkgnum"><%=$pkg->{pkgnum}%></TD>
   <TD ROWSPAN=<%=$rowspan%>>
-    <%=$pkg->{pkg}%> - <%=$pkg->{comment}%> (&nbsp;<%=pkg_details_link($pkg)%>&nbsp;)<BR>
+    <%=$pkg->{pkgnum}%>:
+    <%=$pkg->{pkg}%> - <%=$pkg->{comment}%><BR>
 <% unless ($pkg->{cancel}) { %>
     (&nbsp;<%=pkg_change_link($pkg)%>&nbsp;)
     (&nbsp;<%=pkg_dates_link($pkg)%>&nbsp;|&nbsp;<%=pkg_customize_link($pkg,$custnum)%>&nbsp;)
@@ -538,7 +537,7 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
     }
     if ($svcpart->{count} < $svcpart->{quantity}) {
       print qq!<TR>\n! if ($cnt > 0);
-      print qq!  <TD COLSPAN=2>!.svc_provision_link($pkg,$svcpart).qq!</TD>\n</TR>\n!;
+      print qq!  <TD COLSPAN=2>!.svc_provision_link($pkg, $svcpart, $conf).qq!</TD>\n</TR>\n!;
     }
   }
 }
@@ -946,13 +945,21 @@ sub svc_label_link {
 }
 
 sub svc_provision_link {
-  my ($pkg, $svcpart) = (shift,shift) or return '';
+  my ($pkg, $svcpart, $conf) = @_;
   ( my $svc_nbsp = $svcpart->{svc} ) =~ s/\s+/&nbsp;/g;
-  return qq!<A CLASS="provision" HREF="${p}edit/$svcpart->{svcdb}.cgi?! .
-         qq!pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}">! .
-         "Provision&nbsp;$svc_nbsp&nbsp;(".
-         ($svcpart->{quantity} - $svcpart->{count}).
-         ')</A>';
+  my $pkgnum_svcpart = "pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}";
+  my $num_left = $svcpart->{quantity} - $svcpart->{count};
+
+  my $link = qq!<A CLASS="provision" HREF="${p}edit/$svcpart->{svcdb}.cgi?!.
+             qq!$pkgnum_svcpart">!.
+             "Provision&nbsp;$svc_nbsp&nbsp;($num_left)</A>";
+  if ( $conf->exists('legacy_link') ) {
+    $link .= '<BR>'.
+             qq!<A CLASS="provision" HREF="${p}misc/link.cgi?!.
+             qq!$pkgnum_svcpart">!.
+            "Link&nbsp;to&nbsp;legacy&nbsp;$svc_nbsp&nbsp;($num_left)</A>";
+  }
+  $link;
 }
 
 sub svc_unprovision_link {
@@ -983,10 +990,10 @@ sub pkg_datestr {
   $strip;
 }
 
-sub pkg_details_link {
-  my $pkg = shift or return '';
-  return qq!<a href="${p}view/cust_pkg.cgi?$pkg->{pkgnum}">Details</a>!;
-}
+#sub pkg_details_link {
+#  my $pkg = shift or return '';
+#  return qq!<a href="${p}view/cust_pkg.cgi?$pkg->{pkgnum}">Details</a>!;
+#}
 
 sub pkg_change_link {
   my $pkg = shift or return '';
@@ -1005,7 +1012,8 @@ sub pkg_unsuspend_link {
 
 sub pkg_cancel_link {
   my $pkg = shift or return '';
-  return qq!<A HREF="javascript:cust_pkg_areyousure('${p}misc/cancel_pkg.cgi?$pkg->{pkgnum}')">Cancel</A>!;
+  qq!<A HREF="javascript:cust_pkg_areyousure('${p}misc/cancel_pkg.cgi?$pkg->{pkgnum}')">Cancel now</A> | !.
+  qq!<A HREF="${p}misc/expire_pkg.cgi?$pkg->{pkgnum}">Cancel later</A>!;
 }
 
 sub pkg_dates_link {
-- 
cgit v1.2.1


From 6db0053308daae19135066c5bf4d20e82f0a5780 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Mar 2004 10:36:55 +0000
Subject: further small UI tweaks

---
 httemplate/view/cust_main.cgi | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 8d8af63d6..605701753 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -324,7 +324,7 @@ print '</SELECT><INPUT TYPE="submit" VALUE="Order Package"></FORM><BR>';
 
 if ( $conf->config('payby-default') ne 'HIDE' ) {
 
-  print '<BR>'.
+  print
     qq!<FORM ACTION="${p}edit/process/quick-charge.cgi" METHOD="POST">!.
     qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
     qq!Description:<INPUT TYPE="text" NAME="pkg">!.
@@ -366,8 +366,7 @@ function svc_areyousure(href) {
 
 <%
 
-print qq!<BR><A NAME="cust_pkg">Packages</A> !,
-#      qq!<BR>Click on package number to view/edit package.!,
+print qq!<A NAME="cust_pkg">Packages</A> !,
       qq!( <A HREF="!, popurl(2), qq!edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> (preserves services) )!,
 ;
 
@@ -806,6 +805,7 @@ function cust_credit_areyousure(href) {
     $balance += $item->{'refund'}  if exists $item->{'refund'};
     $balance = sprintf("%.2f", $balance);
     $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
+    ( my $showbalance = '$'. $balance ) =~ s/^\$\-/-&nbsp;\$/;
 
   %>
   
@@ -821,11 +821,11 @@ function cust_credit_areyousure(href) {
         </FONT>
       </TD>
       <TD><%= $item->{'desc'} %></TD>
-      <TD><%= $charge  %></TD>
-      <TD><%= $payment %></TD>
-      <TD><%= $credit  %></TD>
-      <TD><%= $refund  %></TD>
-      <TD>$<%= $balance %></TD>
+      <TD ALIGN="right"><%= $charge  %></TD>
+      <TD ALIGN="right"><%= $payment %></TD>
+      <TD ALIGN="right"><%= $credit  %></TD>
+      <TD ALIGN="right"><%= $refund  %></TD>
+      <TD ALIGN="right"><%= $showbalance %></TD>
     </TR>
 
   <% } %>
-- 
cgit v1.2.1


From e3f327b2af9e6a591bae41d315fda731ec7f5128 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Mar 2004 11:05:58 +0000
Subject: remove everything that links to package view also, closes: Bug#569

---
 httemplate/edit/process/REAL_cust_pkg.cgi  |  4 +++-
 httemplate/edit/process/quick-cust_pkg.cgi |  3 ++-
 httemplate/misc/cancel-unaudited.cgi       | 11 +++++++----
 httemplate/misc/process/link.cgi           |  4 +++-
 httemplate/misc/unprovision.cgi            |  4 ----
 httemplate/search/cust_main.cgi            |  2 +-
 httemplate/search/cust_pkg.cgi             |  6 +++---
 httemplate/view/cust_main.cgi              |  8 +-------
 httemplate/view/svc_acct.cgi               |  3 +--
 httemplate/view/svc_broadband.cgi          |  3 +--
 httemplate/view/svc_domain.cgi             |  3 +--
 httemplate/view/svc_external.cgi           |  3 +--
 httemplate/view/svc_forward.cgi            |  3 +--
 httemplate/view/svc_www.cgi                |  3 +--
 14 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/httemplate/edit/process/REAL_cust_pkg.cgi b/httemplate/edit/process/REAL_cust_pkg.cgi
index 7f5c5e49c..3d697ddfd 100755
--- a/httemplate/edit/process/REAL_cust_pkg.cgi
+++ b/httemplate/edit/process/REAL_cust_pkg.cgi
@@ -16,7 +16,9 @@ if ( $error ) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). "REAL_cust_pkg.cgi?". $cgi->query_string );
 } else { 
-  print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?". $pkgnum);
+  my $custnum = $new->custnum;
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum".
+                       "#cust_pkg$pkgnum" );
 }
 
 %>
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index a8f5b1453..fd9e59472 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -17,7 +17,8 @@ if ($error) {
 <%
   eidiot($error);
 } else {
-  print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?". $cust_pkg[0]->pkgnum );
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum".
+                       "#cust_pkg". $cust_pkg[0]->pkgnum );
 }
 
 %>
diff --git a/httemplate/misc/cancel-unaudited.cgi b/httemplate/misc/cancel-unaudited.cgi
index 11cde968d..43e439b58 100755
--- a/httemplate/misc/cancel-unaudited.cgi
+++ b/httemplate/misc/cancel-unaudited.cgi
@@ -12,10 +12,13 @@ my $svcnum = $1;
 
 my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
 die "Unknown svcnum!" unless $cust_svc;
-&eidiot(qq!This account has already been audited.  Cancel the 
-    <A HREF="!. popurl(2). qq!view/cust_pkg.cgi?! . $cust_svc->getfield('pkgnum') .
-    qq!pkgnum"> package</A> instead.!) 
-  if $cust_svc->pkgnum ne '' && $cust_svc->pkgnum ne '0';
+my $cust_pkg = $cust_svc->cust_pkg;
+if ( $cust_pkg ) {
+  &eidiot( 'This account has already been audited.  Cancel the '.
+           qq!<A HREF="${p}view/cust_main.cgi?!. $cust_pkg->custnum.
+           '#cust_pkg'. $cust_pkg->pkgnum. '">'.
+           'package</A> instead.');
+}
 
 my $error = $cust_svc->cancel;
 
diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
index 5d80adeb9..8b71b893d 100755
--- a/httemplate/misc/process/link.cgi
+++ b/httemplate/misc/process/link.cgi
@@ -32,7 +32,9 @@ my $error = $new->replace($old);
 
 unless ($error) {
   #no errors, so let's view this customer.
-  print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?$pkgnum");
+  my $custnum = $new->cust_pkg->custnum;
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum"
+                       "#cust_pkg$pkgnum" );
 } else {
 %>
 <!-- mason kludge -->
diff --git a/httemplate/misc/unprovision.cgi b/httemplate/misc/unprovision.cgi
index 8f2a7d13d..3c92a4e2e 100755
--- a/httemplate/misc/unprovision.cgi
+++ b/httemplate/misc/unprovision.cgi
@@ -12,10 +12,6 @@ my $svcnum = $1;
 
 my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
 die "Unknown svcnum!" unless $cust_svc;
-#&eidiot(qq!This account has already been audited.  Cancel the 
-#    <A HREF="!. popurl(2). qq!view/cust_pkg.cgi?! . $cust_svc->getfield('pkgnum') .
-#    qq!pkgnum"> package</A> instead.!) 
-#  if $cust_svc->pkgnum ne '' && $cust_svc->pkgnum ne '0';
 
 my $custnum = $cust_svc->cust_pkg->custnum;
 
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 50d367e1e..69a78d6fe 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -435,7 +435,7 @@ END
 
       my $pkg = $part_pkg->pkg;
       my $comment = $part_pkg->comment;
-      my $pkgview = $p. 'view/cust_pkg.cgi?'. $pkgnum;
+      my $pkgview = "${p}view/cust_main.cgi?$custnum#cust_pkg$pkgnum";
       my @cust_svc = @{shift @lol_cust_svc};
       #my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
       my $rowspan = scalar(@cust_svc) || 1;
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 45420f4c4..6d26317e0 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -175,8 +175,8 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
 }
 
 if ( scalar(@cust_pkg) == 1 ) {
-  my($pkgnum)=$cust_pkg[0]->pkgnum;
-  print $cgi->redirect(popurl(2). "view/cust_pkg.cgi?$pkgnum");
+  print $cgi->redirect("${p}view/cust_main.cgi?". $cust_pkg[0]->custnum.
+                       "#cust_pkg". $cust_pkg[0]->pkgnum );
   #exit;
 } elsif ( scalar(@cust_pkg) == 0 ) { #error
 %>
@@ -300,7 +300,7 @@ END
     my $rowspan = scalar(@cust_svc) || 1;
     my $p = popurl(2);
     print $n1, <<END;
-      <TD ROWSPAN=$rowspan><A HREF="${p}view/cust_pkg.cgi?$pkgnum"><FONT SIZE=-1>$pkgnum - $pkg</FONT></A></TD>
+      <TD ROWSPAN=$rowspan><A HREF="${p}view/cust_main.cgi?$custnum#cust_pkg$pkgnum"><FONT SIZE=-1>$pkgnum - $pkg</FONT></A></TD>
       <TD ROWSPAN=$rowspan>$setup</TD>
 END
 
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 605701753..cc3600641 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -3,7 +3,6 @@
 
 my $conf = new FS::Conf;
 
-#false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
 my %uiview = ();
 my %uiadd = ();
 foreach my $part_svc ( qsearch('part_svc',{}) ) {
@@ -401,7 +400,7 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
 <!--pkgnum: <%=$pkg->{pkgnum}%>-->
 <TR>
   <TD ROWSPAN=<%=$rowspan%>>
-    <%=$pkg->{pkgnum}%>:
+    <A NAME="cust_pkg<%=$pkg->{pkgnum}%>"><%=$pkg->{pkgnum}%></A>:
     <%=$pkg->{pkg}%> - <%=$pkg->{comment}%><BR>
 <% unless ($pkg->{cancel}) { %>
     (&nbsp;<%=pkg_change_link($pkg)%>&nbsp;)
@@ -990,11 +989,6 @@ sub pkg_datestr {
   $strip;
 }
 
-#sub pkg_details_link {
-#  my $pkg = shift or return '';
-#  return qq!<a href="${p}view/cust_pkg.cgi?$pkg->{pkgnum}">Details</a>!;
-#}
-
 sub pkg_change_link {
   my $pkg = shift or return '';
   return qq!<a href="${p}misc/change_pkg.cgi?$pkg->{pkgnum}">Change&nbsp;package</a>!;
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 58591fcb5..14d2745a2 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -45,8 +45,7 @@ function areyousure(href) {
 
 <%= header('Account View', menubar(
   ( ( $pkgnum || $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )
     : ( "Cancel this (unaudited) account" =>
           "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')" )
diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index a4ec7569e..ae23386a1 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -41,8 +41,7 @@ my (
 
 <%=header('Broadband Service View', menubar(
   ( ( $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )                                                                       
     : ( "Cancel this (unaudited) website" =>
           "${p}misc/cancel-unaudited.cgi?$svcnum" )
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index fd017de46..e4b16d998 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -34,8 +34,7 @@ my $domain = $svc_domain->domain;
 
 <%= header('Domain View', menubar(
   ( ( $pkgnum || $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )
     : ( "Cancel this (unaudited) domain" =>
           "${p}misc/cancel-unaudited.cgi?$svcnum" )
diff --git a/httemplate/view/svc_external.cgi b/httemplate/view/svc_external.cgi
index e5c977f13..59cc357c7 100644
--- a/httemplate/view/svc_external.cgi
+++ b/httemplate/view/svc_external.cgi
@@ -24,8 +24,7 @@ if ($pkgnum) {
 
 <%= header('External Service View', menubar(
   ( ( $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )                                                                       
     : ( "Cancel this (unaudited) external service" =>
           "${p}misc/cancel-unaudited.cgi?$svcnum" )
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index 650972429..52360bcc2 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -25,8 +25,7 @@ my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
 
 print header('Mail Forward View', menubar(
   ( ( $pkgnum || $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )
     : ( "Cancel this (unaudited) mail forward" =>
           "${p}misc/cancel-unaudited.cgi?$svcnum" )
diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index 7a716b4b8..2980f846b 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -32,8 +32,7 @@ my $www = $domain_record->zone;
 
 print header('Website View', menubar(
   ( ( $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )                                                                       
     : ( "Cancel this (unaudited) website" =>
           "${p}misc/cancel-unaudited.cgi?$svcnum" )
-- 
cgit v1.2.1


From 0147f0917ebbff5f72f43db0f81f13a87d7cf626 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Mar 2004 12:50:07 +0000
Subject: credit card expiration selection now -> 15 years instead of hardcoded

---
 fs_selfservice/FS-SelfService/cgi/make_payment.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_selfservice/FS-SelfService/cgi/make_payment.html b/fs_selfservice/FS-SelfService/cgi/make_payment.html
index a1cda6d49..40cd83c6f 100644
--- a/fs_selfservice/FS-SelfService/cgi/make_payment.html
+++ b/fs_selfservice/FS-SelfService/cgi/make_payment.html
@@ -53,7 +53,7 @@
         <TD> / </TD>
         <TD>
           <SELECT NAME="year">
-            <%= for ( 2003 .. 2012 ) {
+            <%= my @a = localtime; for ( $a[5]+1900 .. $a[5]+1915 ) {
                   $OUT .= '<OPTION'. ($_ eq $year ? ' SELECTED' : ''). ">$_\n";
             } %>
           </SELECT>
-- 
cgit v1.2.1


From 30a2ed5a5fa3de5ae0d79c4fa85aa2c36ae6b13b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Mar 2004 15:04:54 +0000
Subject: s/routing code/routing number/

---
 httemplate/edit/cust_main.cgi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 857e769a3..3d5e861ba 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -434,8 +434,8 @@ if ( $payby_default eq 'HIDE' ) {
   my %payby = (
     'CARD' => qq!Credit card (automatic)<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
     'DCRD' => qq!Credit card (on-demand)<BR>${r}<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("DCRD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="">!,
-    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE=""><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
-    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE=""><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
+    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE=""><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE=""><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
     'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
@@ -452,8 +452,8 @@ if ( $payby_default eq 'HIDE' ) {
   my %paybychecked = (
     'CARD' => qq!Credit card (automatic)<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
     'DCRD' => qq!Credit card (on-demand)<BR>${r}<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("DCRD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="$payname">!,
-    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
-    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
+    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
     'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
-- 
cgit v1.2.1


From 584e89fb0d4590b4950ae38d392874842e342652 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Mar 2004 15:18:38 +0000
Subject: tone down the titles

---
 FS/FS/CGI.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 905189e2e..6aca83f7f 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -61,7 +61,7 @@ sub header {
         <META HTTP-Equiv="Expires" Content="0"> 
       </HEAD>
       <BODY BGCOLOR="#e8e8e8"$etc>
-          <FONT SIZE=7>
+          <FONT SIZE=5>
             $title
           </FONT>
           <BR><BR>
-- 
cgit v1.2.1


From 1dc993241b373c27f019db21fdfea6a6466a3b45 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Mar 2004 17:13:22 +0000
Subject: add ACH help graphic

---
 httemplate/docs/ach.html      |  12 ++++++++++++
 httemplate/edit/cust_main.cgi |  23 ++++++++++++++++-------
 httemplate/images/ach.png     | Bin 0 -> 29759 bytes
 3 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 httemplate/docs/ach.html
 create mode 100644 httemplate/images/ach.png

diff --git a/httemplate/docs/ach.html b/httemplate/docs/ach.html
new file mode 100644
index 000000000..b79df78fe
--- /dev/null
+++ b/httemplate/docs/ach.html
@@ -0,0 +1,12 @@
+<HTML>
+  <HEAD>
+    <TITLE>
+      Electronic check (ACH) information
+    </TITLE>
+  </HEAD>
+  <BODY BGCOLOR="#e8e8e8">
+    <IMG BORDER=0 SRC="../images/ach.png">
+    <BR>
+    <CENTER><A HREF="javascript:close()">(close window)</A></CENTER>
+  </BODY>
+</HTML>
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 3d5e861ba..f9c80d82d 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -411,7 +411,7 @@ if ( $payby_default eq 'HIDE' ) {
   print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
 
   print "<TR><TD>Billing type</TD></TR>",
-        "</TABLE>", '<script language="JavaScript"><!--
+        "</TABLE>", '<SCRIPT>
                        var mywindow = -1;
                        function myopen(filename,windowname,properties) {
                          myclose();
@@ -422,8 +422,17 @@ if ( $payby_default eq 'HIDE' ) {
                            mywindow.close();
                          mywindow = -1;
                        }
-
-                     //--></script>',
+                       var achwindow = -1;
+                       function achopen(filename,windowname,properties) {
+                         achclose();
+                         achwindow = window.open(filename,windowname,properties);
+                       }
+                       function achclose() {
+                         if ( achwindow != -1 )
+                           achwindow.close();
+                         achwindow = -1;
+                       }
+                     </SCRIPT>',
         &table("#cccccc"), "<TR>";
 
   my($payinfo, $payname)=(
@@ -434,8 +443,8 @@ if ( $payby_default eq 'HIDE' ) {
   my %payby = (
     'CARD' => qq!Credit card (automatic)<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
     'DCRD' => qq!Credit card (on-demand)<BR>${r}<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("DCRD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="">!,
-    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE=""><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
-    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE=""><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
+    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE=""><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9> (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)<INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE=""><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9> (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)<INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
     'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
@@ -452,8 +461,8 @@ if ( $payby_default eq 'HIDE' ) {
   my %paybychecked = (
     'CARD' => qq!Credit card (automatic)<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
     'DCRD' => qq!Credit card (on-demand)<BR>${r}<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("DCRD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="$payname">!,
-    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
-    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
+    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9> (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)<INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9> (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)<INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
     'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
diff --git a/httemplate/images/ach.png b/httemplate/images/ach.png
new file mode 100644
index 000000000..fdcd5e6ed
Binary files /dev/null and b/httemplate/images/ach.png differ
-- 
cgit v1.2.1


From a7319715290dccc7beb414de8d2de24230278a13 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Mar 2004 19:03:03 +0000
Subject: consistant title size of 6

---
 FS/FS/CGI.pm                    | 2 +-
 httemplate/elements/header.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 6aca83f7f..a3286299b 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -61,7 +61,7 @@ sub header {
         <META HTTP-Equiv="Expires" Content="0"> 
       </HEAD>
       <BODY BGCOLOR="#e8e8e8"$etc>
-          <FONT SIZE=5>
+          <FONT SIZE=6>
             $title
           </FONT>
           <BR><BR>
diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index 581bbabc7..1d7bf09ab 100644
--- a/httemplate/elements/header.html
+++ b/httemplate/elements/header.html
@@ -12,7 +12,7 @@
         <META HTTP-Equiv="Expires" Content="0"> 
       </HEAD>
       <BODY BGCOLOR="#e8e8e8"<%= $etc %>>
-          <FONT SIZE=7>
+          <FONT SIZE=6>
             <%= $title %>
           </FONT>
           <BR><BR>
-- 
cgit v1.2.1


From cec266740d89b82ce9075954928c5b336d0ec18e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Mar 2004 00:06:08 +0000
Subject: fix sorting of NULL companies differently than empty companies

---
 httemplate/search/report_receivables.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index ad353a1b3..0e95ad73c 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -93,7 +93,7 @@ where 0 <
            ,0
          )
 
-order by lower(company), lower(last)
+order by coalesce(lower(company), ''), lower(last)
 
 END
 
-- 
cgit v1.2.1


From 73f34cbe08a9be968a2557cd6906dde5bb9a97a3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Mar 2004 00:06:55 +0000
Subject: one-time credit card and ACH payments (like self-service) closes:
 Bug#648

---
 FS/FS/ClientAPI/MyAccount.pm            |  82 ++++++++++---
 FS/FS/cust_main.pm                      |  28 ++++-
 htetc/global.asa                        |   1 +
 htetc/handler.pl                        |   1 +
 httemplate/elements/small_custview.html |   2 +
 httemplate/misc/payment.cgi             | 209 ++++++++++++++++++++++++++++++++
 httemplate/misc/process/payment.cgi     | 148 ++++++++++++++++++++++
 httemplate/view/cust_main.cgi           |   9 +-
 8 files changed, 460 insertions(+), 20 deletions(-)
 create mode 100644 httemplate/elements/small_custview.html
 create mode 100644 httemplate/misc/payment.cgi
 create mode 100644 httemplate/misc/process/payment.cgi

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index a865a22d5..44d81c999 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -9,6 +9,7 @@ use Cache::SharedMemoryCache; #store in db?
 use FS::CGI qw(small_custview); #doh
 use FS::Conf;
 use FS::Record qw(qsearch qsearchs);
+use FS::Msgcat qw(gettext);
 use FS::svc_acct;
 use FS::svc_domain;
 use FS::cust_main;
@@ -176,11 +177,7 @@ sub payment_info {
     warn $return{card_type} = cardtype($cust_main->payinfo);
     $return{payinfo} = $cust_main->payinfo;
 
-    if ( $cust_main->paydate  =~ /^(\d{4})-(\d{2})-\d{2}$/ ) { #Pg date format
-      @return{'month', 'year'} = ( $2, $1 );
-    } elsif ( $cust_main->paydate =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-      @return{'month', 'year'} = ( $1, $3 );
-    }
+    @return{'month', 'year'} = $cust_main->paydate_monthyear;
 
   }
 
@@ -212,7 +209,10 @@ sub payment_info {
 
 };
 
+#some false laziness with httemplate/process/payment.cgi - look there for
+#ACH and CVV support stuff
 sub process_payment {
+
   my $p = shift;
 
   my $session = $cache->get($p->{'session_id'})
@@ -225,6 +225,69 @@ sub process_payment {
   my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
     or return { 'error' => "unknown custnum $custnum" };
 
+  $p->{'payname'} =~ /^([\w \,\.\-\']+)$/
+    or return { 'error' => gettext('illegal_name'). " payname: ". $p->{'payname'} };
+  my $payname = $1;
+
+  $p->{'paybatch'} =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=]*)$/
+    or return { 'error' => gettext('illegal_text'). " paybatch: ". $p->{'paybatch'} };
+  my $paybatch = $1;
+
+  my $payinfo;
+  my $paycvv = '';
+  #if ( $payby eq 'CHEK' ) {
+  #
+  #  $p->{'payinfo1'} =~ /^(\d+)$/
+  #    or return { 'error' => "illegal account number ". $p->{'payinfo1'} };
+  #  my $payinfo1 = $1;
+  #   $p->{'payinfo2'} =~ /^(\d+)$/
+  #    or return { 'error' => "illegal ABA/routing number ". $p->{'payinfo2'} };
+  #  my $payinfo2 = $1;
+  #  $payinfo = $payinfo1. '@'. $payinfo2;
+  # 
+  #} elsif ( $payby eq 'CARD' ) {
+   
+    $payinfo = $p->{'payinfo'};
+    $payinfo =~ s/\D//g;
+    $payinfo =~ /^(\d{13,16})$/
+      or return { 'error' => gettext('invalid_card') }; # . ": ". $self->payinfo
+    $payinfo = $1;
+    validate($payinfo)
+      or return { 'error' => gettext('invalid_card') }; # . ": ". $self->payinfo
+    return { 'error' => gettext('unknown_card_type') }
+      if cardtype($payinfo) eq "Unknown";
+
+    if ( defined $cust_main->dbdef_table->column('paycvv') ) {
+      if ( length($p->{'paycvv'} ) ) {
+        if ( cardtype($payinfo) eq 'American Express card' ) {
+          $p->{'paycvv'} =~ /^(\d{4})$/
+            or return { 'error' => "CVV2 (CID) for American Express cards is four digits." };
+          $paycvv = $1;
+        } else {
+          $p->{'paycvv'} =~ /^(\d{3})$/
+            or return { 'error' => "CVV2 (CVC2/CID) is three digits." };
+          $paycvv = $1;
+        }
+      }
+    }
+  
+  #} else {
+  #  die "unknown payby $payby";
+  #}
+
+  my $error = $cust_main->realtime_bop( 'CC', $p->{'amount'},
+    'quiet'    => 1,
+    'payinfo'  => $payinfo,
+    'paydate'  => $p->{'year'}. '-'. $p->{'month'}. '-01',
+    'payname'  => $payname,
+    'paybatch' => $paybatch,
+    'paycvv'   => $paycvv,
+    map { $_ => $p->{$_} } qw( address1 address2 city state zip )
+  );
+  return { 'error' => $error } if $error;
+
+  $cust_main->apply_payments;
+
   if ( $p->{'save'} ) {
     my $new = new FS::cust_main { $cust_main->hash };
     $new->set( $_ => $p->{$_} )
@@ -236,15 +299,6 @@ sub process_payment {
     $cust_main = $new;
   }
 
-  my $error = $cust_main->realtime_bop( 'CC', $p->{'amount'}, quiet=>1,
-    'paydate' => $p->{'year'}. '-'. $p->{'month'}. '-01',
-    map { $_ => $p->{$_} }
-      qw( payname address1 address2 city state zip payinfo paybatch )
-  );
-  return { 'error' => $error } if $error;
-
-  $cust_main->apply_payments;
-
   return { 'error' => '' };
 
 }
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index fc744dc5f..59e357055 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1701,7 +1701,7 @@ sub realtime_bop {
   #overrides
   $self->set( $_ => $options{$_} )
     foreach grep { exists($options{$_}) }
-            qw( payname address1 address2 city state zip payinfo paydate );
+            qw( payname address1 address2 city state zip payinfo paydate paycvv);
 
   #load up config
   my $bop_config = 'business-onlinepayment';
@@ -1711,6 +1711,9 @@ sub realtime_bop {
     $conf->config($bop_config);
   $action ||= 'normal authorization';
   pop @bop_options if scalar(@bop_options) % 2 && $bop_options[-1] =~ /^\s*$/;
+  die "No real-time processor is enabled - ".
+      "did you set the business-onlinepayment configuration value?\n"
+    unless $processor;
 
   #massage data
 
@@ -1837,11 +1840,12 @@ sub realtime_bop {
   }
 
   #remove paycvv after initial transaction
-  #make this disable-able via a config option if anyone insists?  
-  # (though that probably violates cardholder agreements)
+  #false laziness w/misc/process/payment.cgi - check both to make sure working
+  # correctly
   if ( defined $self->dbdef_table->column('paycvv')
        && length($self->paycvv)
        && ! grep { $_ eq cardtype($self->payinfo) } $conf->config('cvv-save')
+       && ! length($options{'paycvv'})
   ) {
     my $new = new FS::cust_main { $self->hash };
     $new->paycvv('');
@@ -2121,6 +2125,24 @@ sub balance_date {
   );
 }
 
+=item paydate_monthyear
+
+Returns a two-element list consisting of the month and year of this customer's
+paydate (credit card expiration date for CARD customers)
+
+=cut
+
+sub paydate_monthyear {
+  my $self = shift;
+  if ( $self->paydate  =~ /^(\d{4})-(\d{2})-\d{2}$/ ) { #Pg date format
+    ( $2, $1 );
+  } elsif ( $self->paydate =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+    ( $1, $3 );
+  } else {
+    ('', '');
+  }
+}
+
 =item invoicing_list [ ARRAYREF ]
 
 If an arguement is given, sets these email addresses as invoice recipients
diff --git a/htetc/global.asa b/htetc/global.asa
index 5652a6f4f..bb94b9268 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -14,6 +14,7 @@ use Tie::IxHash;
 use HTML::Entities;
 use IO::Handle;
 use IO::File;
+use Business::CreditCard;
 use String::Approx qw(amatch);
 use Chart::LinesPoints;
 use HTML::Widgets::SelectLayers 0.03;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 8541b4ce5..8d4f1e71f 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -71,6 +71,7 @@ sub handler
       use HTML::Entities;
       use IO::Handle;
       use IO::File;
+      use Business::CreditCard;
       use String::Approx qw(amatch);
       use Chart::LinesPoints;
       use HTML::Widgets::SelectLayers 0.03;
diff --git a/httemplate/elements/small_custview.html b/httemplate/elements/small_custview.html
new file mode 100644
index 000000000..1e8ae739a
--- /dev/null
+++ b/httemplate/elements/small_custview.html
@@ -0,0 +1,2 @@
+<% my $conf = new FS::Conf; %>
+<%= small_custview( shift, shift || $conf->config('countrydefault') ) %>
diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
new file mode 100644
index 000000000..bf89a3da7
--- /dev/null
+++ b/httemplate/misc/payment.cgi
@@ -0,0 +1,209 @@
+<%
+   my %type = ( 'CARD' => 'credit card',
+                'CHEK' => 'electronic check (ACH)',
+              );
+
+   $cgi->param('payby') =~ /^(CARD|CHEK)$/
+     or die "unknown payby ". $cgi->param('payby');
+   my $payby = $1;
+
+   $cgi->param('custnum') =~ /^(\d+)$/
+     or die "illegal custnum ". $cgi->param('custnum');
+   my $custnum = $1;
+
+   my $cust_main = qsearchs( 'cust_main', { 'custnum'=>$custnum } );
+   die "unknown custnum $custnum" unless $cust_main;
+
+   my $balance = $cust_main->balance;
+
+   my $payinfo = '';
+
+   #false laziness w/selfservice make_payment.html shortcut for one-country
+   my $conf = new FS::Conf;
+   my %states = map { $_->state => 1 }
+                  qsearch('cust_main_county', {
+                    'country' => $conf->config('defaultcountry') || 'US'
+                  } );
+   my @states = sort { $a cmp $b } keys %states;
+
+   my $paybatch = "webui-payment-". time. "-$$-". rand() * 2**32;
+
+%>
+<%= include( '/elements/header.html', "Process $type{$payby} payment" ) %>
+<%= include( '/elements/small_custview.html', $cust_main ) %>
+<FORM NAME="OneTrueForm" ACTION="process/payment.cgi" METHOD="POST" onSubmit="document.OneTrueForm.process.disabled=true">
+<INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $custnum %>">
+<INPUT TYPE="hidden" NAME="payby" VALUE="<%= $payby %>">
+<INPUT TYPE="hidden" NAME="paybatch" VALUE="<%= $paybatch %>">
+<SCRIPT>
+var mywindow = -1;
+function myopen(filename,windowname,properties) {
+  myclose();
+  mywindow = window.open(filename,windowname,properties);
+}
+function myclose() {
+  if ( mywindow != -1 )
+    mywindow.close();
+  mywindow = -1;
+}
+var achwindow = -1;
+function achopen(filename,windowname,properties) {
+  achclose();
+  achwindow = window.open(filename,windowname,properties);
+}
+function achclose() {
+  if ( achwindow != -1 )
+    achwindow.close();
+  achwindow = -1;
+}
+</SCRIPT>
+<% #include( '/elements/table.html', '#cccccc' ) %>
+<%= ntable('#cccccc') %>
+  <TR>
+    <TD ALIGN="right">Payment amount</TD>
+    <TD>
+      <TABLE><TR><TD BGCOLOR="#ffffff">
+        $<INPUT TYPE="text" NAME="amount" SIZE=8 VALUE="<%= $balance > 0 ? sprintf("%.2f", $balance) : '' %>">
+      </TD></TR></TABLE>
+    </TD>
+  </TR>
+<% if ( $payby eq 'CARD' ) {
+     my( $payinfo, $paycvv, $month, $year ) = ( '', '', '', '' );
+     my $payname = $cust_main->first. ' '. $cust_main->getfield('last');
+     my $address1 = $cust_main->address1;
+     my $address2 = $cust_main->address2;
+     my $city     = $cust_main->city;
+     my $state    = $cust_main->state;
+     my $zip     = $cust_main->zip;
+     if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) {
+       $payinfo = $cust_main->payinfo;
+       $paycvv = $cust_main->paycvv;
+       ( $month, $year ) = $cust_main->paydate_monthyear;
+       $payname = $cust_main->payname if $cust_main->payname;
+     }
+%>
+  <TR>
+    <TD ALIGN="right">Card&nbsp;number</TD>
+    <TD>
+      <TABLE>
+        <TR>
+          <TD>
+            <INPUT TYPE="text" NAME="payinfo" SIZE=20 MAXLENGTH=19 VALUE="<%=$payinfo%>"> </TD>
+          <TD>Exp.</TD>
+          <TD>
+            <SELECT NAME="month">
+              <% for ( ( map "0$_", 1 .. 9 ), 11, 12 ) { %>
+                <OPTION<%= $_ eq $month ? ' SELECTED' : '' %>><%= $_ %>
+              <% } %>
+            </SELECT>
+          </TD>
+          <TD> / </TD>
+          <TD>
+            <SELECT NAME="year">
+              <% my @a = localtime; for ( $a[5]+1900 .. $a[5]+1915 ) { %>
+                <OPTION<%= $_ eq $year ? ' SELECTED' : '' %>><%= $_ %>
+              <% } %>
+            </SELECT>
+          </TD>
+        </TR>
+      </TABLE>
+    </TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">CVV2</TD>
+    <TD><INPUT TYPE="text" NAME="paycvv" VALUE="<%= $paycvv %>" SIZE=4 MAXLENGTH=4>
+        (<A HREF="javascript:myopen('../docs/cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)
+    </TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Exact&nbsp;name&nbsp;on&nbsp;card</TD>
+    <TD><INPUT TYPE="text" SIZE=32 MAXLENGTH=80 NAME="payname" VALUE="<%=$payname%>"></TD>
+  </TR><TR>
+    <TD ALIGN="right">Card&nbsp;billing&nbsp;address</TD>
+    <TD>
+      <INPUT TYPE="text" SIZE=40 MAXLENGTH=80 NAME="address1" VALUE="<%=$address1%>">
+    </TD>
+  </TR><TR>
+    <TD ALIGN="right">Address&nbsp;line&nbsp;2</TD>
+    <TD>
+      <INPUT TYPE="text" SIZE=40 MAXLENGTH=80 NAME="address2" VALUE="<%=$address2%>">
+    </TD>
+  </TR><TR>
+    <TD ALIGN="right">City</TD>
+    <TD>
+      <TABLE>
+        <TR>
+          <TD>
+            <INPUT TYPE="text" NAME="city" SIZE="12" MAXLENGTH=80 VALUE="<%=$city%>">
+          </TD>
+          <TD>State</TD>
+          <TD>
+            <SELECT NAME="state">
+              <% for ( @states ) { %>
+                <OPTION<%= $_ eq $state ? ' SELECTED' : '' %>><%= $_ %> 
+              <% } %>
+            </SELECT>
+          </TD>
+          <TD>Zip</TD>
+          <TD>
+            <INPUT TYPE="text" NAME="zip" SIZE=11 MAXLENGTH=10 VALUE="<%=$zip%>">
+          </TD>
+        </TR>
+      </TABLE>
+    </TD>
+  </TR>
+
+<% } elsif ( $payby eq 'CHEK' ) {
+     my( $payinfo1, $payinfo2, $payname, $ss ) = ( '', '', '', '' );
+     if ( $cust_main->payby =~ /^(CHEK|DCHK)$/ ) {
+       $cust_main->payinfo =~ /^(\d+)\@(\d+)$/
+         or die "unparsable payinfo ". $cust_main->payinfo;
+       ($payinfo1, $payinfo2) = ($1, $2);
+       $payname = $cust_main->payname;
+       $ss = $cust_main->ss;
+     }
+%>
+  <INPUT TYPE="hidden" NAME="month" VALUE="12">
+  <INPUT TYPE="hidden" NAME="year" VALUE="2037">
+  <TR>
+    <TD ALIGN="right">Account&nbsp;number</TD>
+    <TD><INPUT TYPE="text" SIZE=10 NAME="payinfo1" VALUE="<%=$payinfo1%>"></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">ABA/Routing&nbsp;number</TD>
+    <TD>
+      <INPUT TYPE="text" SIZE=10 MAXLENGTH=9 NAME="payinfo2" VALUE="<%=$payinfo2%>">
+      (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)
+    </TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Bank&nbsp;name</TD>
+    <TD><INPUT TYPE="text" NAME="payname" VALUE="<%=$payname%>"></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">
+      Account&nbsp;holder<BR>
+      Social&nbsp;security&nbsp;or&nbsp;tax&nbspID&nbsp;#
+    </TD>
+    <TD><INPUT TYPE="text" NAME="ss" VALUE="<%=$ss%>"></TD>
+  </TR>
+
+<% } %>
+
+<TR>
+  <TD COLSPAN=2>
+    <INPUT TYPE="checkbox" CHECKED NAME="save" VALUE="1">
+    Remember this information
+  </TD>
+</TR><TR>
+  <TD COLSPAN=2>
+    <INPUT TYPE="checkbox"<%= $payby eq 'CARD' ? ' CHECKED' : '' %> NAME="auto" VALUE="1" onClick="if (this.checked) { document.OneTrueForm.save.checked=true; }">
+    Charge future payments to this <%= $type{$payby} %> automatically
+  </TD>
+</TR>
+</TABLE>
+<BR>
+<INPUT TYPE="submit" NAME="process" VALUE="Process payment">
+</FORM>
+</BODY>
+</HTML>
diff --git a/httemplate/misc/process/payment.cgi b/httemplate/misc/process/payment.cgi
new file mode 100644
index 000000000..fa0ede89c
--- /dev/null
+++ b/httemplate/misc/process/payment.cgi
@@ -0,0 +1,148 @@
+<%
+
+#some false laziness w/MyAccount::process_payment
+
+$cgi->param('custnum') =~ /^(\d+)$/
+  or die "illegal custnum ". $cgi->param('custnum');
+my $custnum = $1;
+
+my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
+die "unknown custnum $custnum" unless $cust_main;
+
+$cgi->param('amount') =~ /^\s*(\d*(\.\d\d)?)\s*$/
+  or eidiot "illegal amount ". $cgi->param('amount');
+my $amount = $1;
+eidiot "amount <= 0" unless $amount > 0;
+
+$cgi->param('year') =~ /^(\d+)$/
+  or die "illegal year ". $cgi->param('year');
+my $year = $1;
+
+$cgi->param('month') =~ /^(\d+)$/
+  or die "illegal month ". $cgi->param('month');
+my $month = $1;
+
+$cgi->param('payby') =~ /^(CARD|CHEK)$/
+  or die "illegal payby ". $cgi->param('payby');
+my $payby = $1;
+my %payby2bop = (
+  'CARD' => 'CC',
+  'CHEK' => 'ECHECK',
+);
+my %payby2fields = (
+  'CARD' => [ qw( address1 address2 city state zip ) ],
+  'CHEK' => [ qw( ss ) ],
+);
+my %type = ( 'CARD' => 'credit card',
+             'CHEK' => 'electronic check (ACH)',
+           );
+
+$cgi->param('payname') =~ /^([\w \,\.\-\']+)$/
+  or eidiot gettext('illegal_name'). " payname: ". $cgi->param('payname');
+my $payname = $1;
+
+$cgi->param('paybatch') =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=]*)$/
+  or eidiot gettext('illegal_text'). " paybatch: ". $cgi->param('paybatch');
+my $paybatch = $1;
+
+my $payinfo;
+my $paycvv = '';
+if ( $payby eq 'CHEK' ) {
+
+  $cgi->param('payinfo1') =~ /^(\d+)$/
+    or eidiot "illegal account number ". $cgi->param('payinfo1');
+  my $payinfo1 = $1;
+   $cgi->param('payinfo2') =~ /^(\d+)$/
+    or eidiot "illegal ABA/routing number ". $cgi->param('payinfo2');
+  my $payinfo2 = $1;
+  $payinfo = $payinfo1. '@'. $payinfo2;
+
+} elsif ( $payby eq 'CARD' ) {
+
+  $payinfo = $cgi->param('payinfo');
+  $payinfo =~ s/\D//g;
+  $payinfo =~ /^(\d{13,16})$/
+    or eidiot gettext('invalid_card'); # . ": ". $self->payinfo;
+  $payinfo = $1;
+  validate($payinfo)
+    or eidiot gettext('invalid_card'); # . ": ". $self->payinfo;
+  eidiot gettext('unknown_card_type')
+    if cardtype($payinfo) eq "Unknown";
+
+  if ( defined $cust_main->dbdef_table->column('paycvv') ) {
+    if ( length($cgi->param('paycvv') ) ) {
+      if ( cardtype($payinfo) eq 'American Express card' ) {
+        $cgi->param('paycvv') =~ /^(\d{4})$/
+          or eidiot "CVV2 (CID) for American Express cards is four digits.";
+        $paycvv = $1;
+      } else {
+        $cgi->param('paycvv') =~ /^(\d{3})$/
+          or eidiot "CVV2 (CVC2/CID) is three digits.";
+        $paycvv = $1;
+      }
+    }
+  }
+
+} else {
+  die "unknown payby $payby";
+}
+
+my $error = $cust_main->realtime_bop( $payby2bop{$payby}, $amount,
+  'quiet'    => 1,
+  'payinfo'  => $payinfo,
+  'paydate'  => "$year-$month-01",
+  'payname'  => $payname,
+  'paybatch' => $paybatch,
+  'paycvv'   => $paycvv,
+  map { $_ => $cgi->param($_) } @{$payby2fields{$payby}}
+);
+eidiot($error) if $error;
+
+$cust_main->apply_payments;
+
+if ( $cgi->param('save') ) {
+  my $new = new FS::cust_main { $cust_main->hash };
+  if ( $payby eq 'CARD' ) { 
+    $new->set( 'payby' => ( $cgi->param('auto') ? 'CARD' : 'DCRD' ) );
+  } elsif ( $payby eq 'CHEK' ) {
+    $new->set( 'payby' => ( $cgi->param('auto') ? 'CHEK' : 'DCHK' ) );
+  } else {
+    die "unknown payby $payby";
+  }
+  $new->set( 'payinfo' => $payinfo );
+  $new->set( 'paydate' => "$year-$month-01" );
+  $new->set( 'payname' => $payname );
+
+  #false laziness w/FS:;cust_main::realtime_bop - check both to make sure
+  # working correctly
+  my $conf = new FS::Conf;
+  if ( $payby eq 'CARD' &&
+       grep { $_ eq cardtype($payinfo) } $conf->config('cvv-save') ) {
+    $new->set( 'paycvv' => $paycvv );
+  } else {
+    $new->set( 'paycvv' => '');
+  }
+
+  $new->set( $_ => $cgi->param($_) ) foreach @{$payby2fields{$payby}};
+
+  my $error = $new->replace($cust_main);
+  eidiot "payment processed sucessfully, but error saving info: $error"
+    if $error;
+  $cust_main = $new;
+}
+
+#success!
+
+%>
+<%= include( '/elements/header.html', ucfirst($type{$payby}). ' processing sucessful',
+             include('/elements/menubar.html',
+                       'Main menu' => popurl(3),
+                       "View this customer (#$custnum)" =>
+                         popurl(3). "view/cust_main.cgi?$custnum",
+                    ),
+
+    )
+%>
+<%= include( '/elements/small_custview.html', $cust_main ) %>
+</BODY>
+</HTML>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index cc3600641..c846b655d 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -570,9 +570,12 @@ function cust_credit_areyousure(href) {
 
 <% if ( $conf->config('payby-default') ne 'HIDE' ) { %>
   
-  <BR><BR><A NAME="history">Payment History</A>
-  (<A HREF="<%= $p %>edit/cust_pay.cgi?custnum=<%= $custnum %>">Post payment</A>
-  | <A HREF="<%= $p %>edit/cust_credit.cgi?<%= $custnum %>">Post credit</A>)
+  <BR><BR><A NAME="history"><FONT SIZE="+2">Payment History</FONT></A><BR>
+  <A HREF="<%= $p %>edit/cust_pay.cgi?custnum=<%= $custnum %>">Post cash/check payment</A>
+  | <A HREF="<%= $p %>misc/payment.cgi?payby=CARD;custnum=<%= $custnum %>">Process credit card payment</A>
+  | <A HREF="<%= $p %>misc/payment.cgi?payby=CHEK;custnum=<%= $custnum %>">Process electronic check (ACH) payment</A>
+  <BR><A HREF="<%= $p %>edit/cust_credit.cgi?<%= $custnum %>">Post credit</A>
+  <BR>
 
   <%
   #get payment history
-- 
cgit v1.2.1


From 84d15a339737bd783b764c7f0d371084c2158ce7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Mar 2004 03:29:40 +0000
Subject: includes with Apache::ASP

---
 htetc/global.asa               | 1 +
 httemplate/docs/install.html   | 3 +++
 httemplate/docs/upgrade10.html | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htetc/global.asa b/htetc/global.asa
index bb94b9268..193f997df 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -197,6 +197,7 @@ sub sprintAutoProfile {
 }
 
 sub include {
+  $_[0] =~ s(^/)();
   $Response->Include(@_);
 }
 
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 0217c9085..5f2ca4ca6 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -131,6 +131,7 @@ cp&nbsp;htetc/global.asa&nbsp;/usr/local/etc/freeside/asp-global/global.asa
       <li>Configure Apache for the Global directory and to execute .cgi files using Apache::ASP.  For example:
 <font size="-1"><pre>
 PerlModule Apache::ASP
+# your freeside document root
 &lt;Directory&nbsp;/usr/local/apache/htdocs/freeside-asp&gt;
 &lt;Files ~ (\.cgi|\.html)&gt;
 SetHandler perl-script
@@ -142,6 +143,8 @@ $MLDBM::RemoveTaint = 1;
 PerlSetVar&nbsp;Global&nbsp;/usr/local/etc/freeside/asp-global/
 PerlSetVar&nbsp;Debug&nbsp;2
 PerlSetVar&nbsp;RequestBinaryRead&nbsp;Off
+# your freeside document root
+PerlSetVar&nbsp;IncludesDir&nbsp;/usr/local/apache/htdocs/freeside-asp
 &lt;/Directory&gt;
 </pre></font>
     </ul></td>
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 6f7924fb6..14e308544 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -4,7 +4,7 @@ this is incomplete
 install DBD::Pg 1.32 (or, if you're using a Perl version before 5.6, you could try installing DBD::Pg 1.22 with <a href="http://420.am/~ivan/DBD-Pg-1.22-fixvercmp.patch">this patch</a> and commenting out the "use DBD::Pg 1.32" at the top of DBIx/DBSchema/DBD/Pg.pm)
 install DBIx::DBSchema 0.23
 install Net::SSH 0.08
-- If using Apache::ASP, add PerlSetVar RequestBinaryRead Off to your Apache configuration and make sure you are using Apache::ASP minimum version 2.55. 
+- If using Apache::ASP, add PerlSetVar RequestBinaryRead Off and PerlSetVar IncludesDir /your/freeside/document/root/ to your Apache configuration and make sure you are using Apache::ASP minimum version 2.55. 
 
 install NetAddr::IP, Chart::Base, IPC::ShareLite and Locale::SubCountry
 
-- 
cgit v1.2.1


From 70621d7d9672f27453ccde5bf5632c72a5f16ea0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Mar 2004 03:31:50 +0000
Subject: includes fix

---
 htetc/global.asa | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htetc/global.asa b/htetc/global.asa
index 193f997df..ecba45770 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -197,8 +197,8 @@ sub sprintAutoProfile {
 }
 
 sub include {
-  $_[0] =~ s(^/)();
-  $Response->Include(@_);
+  ( my $file = shift ) =~ s(^/)();
+  $Response->Include($file, @_);
 }
 
 if ( defined(@DBIx::Profile::ISA) ) {
-- 
cgit v1.2.1


From a60469e86166291a4a03a6c534d1f88ef070dd4a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Mar 2004 03:36:48 +0000
Subject: make Apache::ASP includes work as expected

---
 htetc/global.asa | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htetc/global.asa b/htetc/global.asa
index ecba45770..65f3355e1 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -199,6 +199,7 @@ sub sprintAutoProfile {
 sub include {
   ( my $file = shift ) =~ s(^/)();
   $Response->Include($file, @_);
+  '';
 }
 
 if ( defined(@DBIx::Profile::ISA) ) {
-- 
cgit v1.2.1


From 0a7ce21242738438169d6e9dba8856770ffa1af4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Mar 2004 19:57:06 +0000
Subject: small UI fix for unapplied partial credits

---
 httemplate/view/cust_main.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index c846b655d..a0fc2d67b 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -714,9 +714,9 @@ function cust_credit_areyousure(href) {
       }
       if ( $cust_credit->credited > 0 ) {
         $desc .= ' - <B><FONT COLOR="#FF0000">$'.
-                 $cust_credit->unapplied. ' unapplied</FONT></B>'.
+                 $cust_credit->credited. ' unapplied</FONT></B>'.
                  qq! (<A HREF="${p}edit/cust_credit_bill.cgi?!.
-                 $cust_credit->crednum. '">apply</A>'.
+                 $cust_credit->crednum. '">apply</A>)'.
                  '<BR>';
       }
     }
-- 
cgit v1.2.1


From 55263a2dfeb16ea313c5aed37ed30686c946a299 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Mar 2004 19:58:30 +0000
Subject: small UI fix for unapplied partial credits

---
 httemplate/view/cust_main.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index a0fc2d67b..e8ea9943e 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -713,7 +713,7 @@ function cust_credit_areyousure(href) {
         }
       }
       if ( $cust_credit->credited > 0 ) {
-        $desc .= ' - <B><FONT COLOR="#FF0000">$'.
+        $desc .= '&nbsp;&nbsp;<B><FONT COLOR="#FF0000">$'.
                  $cust_credit->credited. ' unapplied</FONT></B>'.
                  qq! (<A HREF="${p}edit/cust_credit_bill.cgi?!.
                  $cust_credit->crednum. '">apply</A>)'.
-- 
cgit v1.2.1


From 9769323a1645b8f298ea4469261da54fed7c1225 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Mar 2004 09:35:57 +0000
Subject: add missing compile tests

---
 FS/MANIFEST                                     | 4 ++++
 FS/t/part_export-communigate_pro_singledomain.t | 5 +++++
 FS/t/part_export-postfix.t                      | 5 +++++
 FS/t/part_export-router.t                       | 5 +++++
 4 files changed, 19 insertions(+)
 create mode 100644 FS/t/part_export-communigate_pro_singledomain.t
 create mode 100644 FS/t/part_export-postfix.t
 create mode 100644 FS/t/part_export-router.t

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 23c59dbda..b12fdc4ca 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -163,6 +163,8 @@ t/part_export_option.t
 t/part_export-bind.t
 t/part_export-bind_slave.t
 t/part_export-bsdshell.t
+t/part_export-communigate_pro.t
+t/part_export-communigate_pro_singledomain.t
 t/part_export-cp.t
 t/part_export-cyrus.t
 t/part_export-domain_shellcommands.t
@@ -171,6 +173,8 @@ t/part_export-http.t
 t/part_export-infostreet.t
 t/part_export-ldap.t
 t/part_export-null.t
+t/part_export-postfix.t
+t/part_export-router.t
 t/part_export-shellcommands.t
 t/part_export-shellcommands_withdomain.t
 t/part_export-sqlmail.t
diff --git a/FS/t/part_export-communigate_pro_singledomain.t b/FS/t/part_export-communigate_pro_singledomain.t
new file mode 100644
index 000000000..6f8a64e0f
--- /dev/null
+++ b/FS/t/part_export-communigate_pro_singledomain.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::communigate_pro_singledomain;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_export-postfix.t b/FS/t/part_export-postfix.t
new file mode 100644
index 000000000..9518caad6
--- /dev/null
+++ b/FS/t/part_export-postfix.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::postfix;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_export-router.t b/FS/t/part_export-router.t
new file mode 100644
index 000000000..54e4b63de
--- /dev/null
+++ b/FS/t/part_export-router.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::router;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From 39829996e06feb07cc5c59f6c0a30b807c98a0c4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Mar 2004 14:17:29 +0000
Subject: update example export for the new world of export data in themodule
 files

---
 eg/export_template.pm | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/eg/export_template.pm b/eg/export_template.pm
index ca58d4bed..2c199db85 100644
--- a/eg/export_template.pm
+++ b/eg/export_template.pm
@@ -1,10 +1,35 @@
 package FS::part_export::myexport;
 
-use vars qw(@ISA);
+use vars qw(@ISA %info);
+use Tie::IxHash;
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+tie my %options, 'Tie::IxHash',
+  'regular_option'  => { label => 'Option description', default => 'value' },
+  'select_option'   => { label   => 'Select option description',
+                         type    => 'select', options=>[qw(chocolate vanilla)],
+                         default => 'vanilla',
+                       },
+  'textarea_option' => { label   => 'Textarea option description',
+                         type    => 'textarea',
+                         default => 'Default text.',
+                      },
+  'checkbox_option' => { label => 'Checkbox label', type => 'checkbox' },
+;
+
+%info = (
+  'svc'      => 'svc_acct',
+  #'svc'      => [qw( svc_acct svc_forward )],
+  'desc'     =>
+    'Export short description',
+  'options'  => \%options,
+  'nodomain' => 'Y',
+  'notes'    => <<'END'
+HTML notes about this export.
+END
+
 sub rebless { shift; }
 
 sub _export_insert {
-- 
cgit v1.2.1


From e7fc7ebf927a7ab7159ad3cc8fa1530d7ce22a5a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Mar 2004 14:22:04 +0000
Subject: adding passwdfile export base class

---
 FS/FS/part_export/passwdfile.pm | 18 ++++++++++++++++++
 FS/MANIFEST                     |  1 +
 FS/t/part_export-passwdfile.t   |  5 +++++
 3 files changed, 24 insertions(+)
 create mode 100644 FS/FS/part_export/passwdfile.pm
 create mode 100644 FS/t/part_export-passwdfile.t

diff --git a/FS/FS/part_export/passwdfile.pm b/FS/FS/part_export/passwdfile.pm
new file mode 100644
index 000000000..2978d2503
--- /dev/null
+++ b/FS/FS/part_export/passwdfile.pm
@@ -0,0 +1,18 @@
+package FS::part_export::passwdfile;
+
+use strict;
+use vars qw(@ISA %options);
+use Tie::IxHash;
+use FS::part_export::null;
+
+@ISA = qw(FS::part_export::null);
+
+tie %options, 'Tie::IxHash',
+  'crypt' => { label=>'Password encryption',
+               type=>'select', options=>[qw(crypt md5)],
+               default=>'crypt',
+             },
+;
+
+1;
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index b12fdc4ca..10a64d070 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -173,6 +173,7 @@ t/part_export-http.t
 t/part_export-infostreet.t
 t/part_export-ldap.t
 t/part_export-null.t
+t/part_export-passwdfile.t
 t/part_export-postfix.t
 t/part_export-router.t
 t/part_export-shellcommands.t
diff --git a/FS/t/part_export-passwdfile.t b/FS/t/part_export-passwdfile.t
new file mode 100644
index 000000000..0f18f3044
--- /dev/null
+++ b/FS/t/part_export-passwdfile.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::passwdfile;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From 7de51deb0e3e3fe1b0a9e06be6498256d5511bd0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Mar 2004 14:23:26 +0000
Subject: move export info to the modules themselves

---
 FS/FS/part_export/router.pm | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_export/router.pm b/FS/FS/part_export/router.pm
index 07b5b9edb..e2cde53d4 100644
--- a/FS/FS/part_export/router.pm
+++ b/FS/FS/part_export/router.pm
@@ -31,12 +31,33 @@ The export itself needs the following options:
 
 =cut
 
-use vars qw(@ISA @saltset);
+use vars qw(@ISA %info @saltset);
+use Tie::IxHash;
 use String::ShellQuote;
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+tie my %options, 'Tie::IxHash',
+  'protocol' => {
+	  label=>'Protocol',
+	  type =>'select',
+	  options => [qw(telnet ssh)],
+	  default => 'telnet'},
+  'insert' => {label=>'Insert command', default=>'' },
+  'delete' => {label=>'Delete command', default=>'' },
+  'replace' => {label=>'Replace command', default=>'' },
+  'Timeout' => {label=>'Time to wait for prompt', default=>'20' },
+  'Prompt' => {label=>'Prompt string', default=>'#' }
+;
+
+%info = (
+  'svc'     => 'svc_broadband',
+  'desc'    => 'Send a command to a router.',
+  'options' => \%options,
+  'notes'   => '( more detailed description from Kristian / fire2wire? )',
+);
+
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
 
 sub rebless { shift; }
@@ -164,3 +185,5 @@ sub telnet_cmd {
 #sub router_delete { #subroutine, not method
 #}
 
+1;
+
-- 
cgit v1.2.1


From dabdf357484badff95afcae50b08ec1c3bb58343 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Mar 2004 14:28:48 +0000
Subject: move export info to the modules themselves

---
 FS/FS/part_export.pm                              | 621 ++--------------------
 FS/FS/part_export/apache.pm                       |  38 +-
 FS/FS/part_export/bind.pm                         |  29 +-
 FS/FS/part_export/bind_slave.pm                   |  23 +-
 FS/FS/part_export/bsdshell.pm                     |  24 +-
 FS/FS/part_export/communigate_pro.pm              |  36 +-
 FS/FS/part_export/communigate_pro_singledomain.pm |  28 +-
 FS/FS/part_export/cp.pm                           |  26 +-
 FS/FS/part_export/cyrus.pm                        |  24 +-
 FS/FS/part_export/domain_shellcommands.pm         |  47 +-
 FS/FS/part_export/forward_shellcommands.pm        |  45 +-
 FS/FS/part_export/http.pm                         |  48 +-
 FS/FS/part_export/infostreet.pm                   |  24 +-
 FS/FS/part_export/ldap.pm                         |  43 +-
 FS/FS/part_export/postfix.pm                      |  22 +-
 FS/FS/part_export/shellcommands.pm                | 154 +++++-
 FS/FS/part_export/shellcommands_withdomain.pm     |  87 ++-
 FS/FS/part_export/sqlmail.pm                      |  40 +-
 FS/FS/part_export/sqlradius.pm                    |  57 +-
 FS/FS/part_export/sqlradius_withdomain.pm         |  18 +-
 FS/FS/part_export/sysvshell.pm                    |  24 +-
 FS/FS/part_export/textradius.pm                   |  27 +-
 FS/FS/part_export/vpopmail.pm                     |  28 +-
 FS/FS/part_export/www_shellcommands.pm            |  36 +-
 24 files changed, 938 insertions(+), 611 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 8423da299..061f07d28 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -1,7 +1,7 @@
 package FS::part_export;
 
 use strict;
-use vars qw( @ISA @EXPORT_OK %exports );
+use vars qw( @ISA @EXPORT_OK $DEBUG %exports );
 use Exporter;
 use Tie::IxHash;
 use FS::Record qw( qsearch qsearchs dbh );
@@ -12,6 +12,8 @@ use FS::export_svc;
 @ISA = qw(FS::Record);
 @EXPORT_OK = qw(export_info);
 
+$DEBUG = 0;
+
 =head1 NAME
 
 FS::part_export - Object methods for part_export records
@@ -530,597 +532,48 @@ sub export_info {
 #  '';
 #}
 
-tie my %sysvshell_options, 'Tie::IxHash',
-  'crypt' => { label=>'Password encryption',
-               type=>'select', options=>[qw(crypt md5)],
-               default=>'crypt',
-             },
-;
-
-tie my %bsdshell_options, 'Tie::IxHash', 
-  'crypt' => { label=>'Password encryption',
-               type=>'select', options=>[qw(crypt md5)],
-               default=>'crypt',
-             },
-;
-
-tie my %shellcommands_options, 'Tie::IxHash',
-  #'machine' => { label=>'Remote machine' },
-  'user' => { label=>'Remote username', default=>'root' },
-  'useradd' => { label=>'Insert command',
-                 default=>'useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username'
-                #default=>'cp -pr /etc/skel $dir; chown -R $uid.$gid $dir'
-               },
-  'useradd_stdin' => { label=>'Insert command STDIN',
-                       type =>'textarea',
-                       default=>'',
-                     },
-  'userdel' => { label=>'Delete command',
-                 default=>'userdel -r $username',
-                 #default=>'rm -rf $dir',
-               },
-  'userdel_stdin' => { label=>'Delete command STDIN',
-                       type =>'textarea',
-                       default=>'',
-                     },
-  'usermod' => { label=>'Modify command',
-                 default=>'usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username',
-                #default=>'[ -d $old_dir ] && mv $old_dir $new_dir || ( '.
-                 #  'chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; '.
-                 #  'find . -depth -print | cpio -pdm $new_dir; '.
-                 #  'chmod u-t $new_dir; chown -R $uid.$gid $new_dir; '.
-                 #  'rm -rf $old_dir'.
-                 #')'
-               },
-  'usermod_stdin' => { label=>'Modify command STDIN',
-                       type =>'textarea',
-                       default=>'',
-                     },
-  'usermod_pwonly' => { label=>'Disallow username changes',
-                        type =>'checkbox',
-                      },
-  'suspend' => { label=>'Suspension command',
-                 default=>'usermod -L $username',
-               },
-  'suspend_stdin' => { label=>'Suspension command STDIN',
-                       default=>'',
-                     },
-  'unsuspend' => { label=>'Unsuspension command',
-                   default=>'usermod -U $username',
-                 },
-  'unsuspend_stdin' => { label=>'Unsuspension command STDIN',
-                         default=>'',
-                       },
-;
-
-tie my %shellcommands_withdomain_options, 'Tie::IxHash',
-  'user' => { label=>'Remote username', default=>'root' },
-  'useradd' => { label=>'Insert command',
-                 #default=>''
-               },
-  'useradd_stdin' => { label=>'Insert command STDIN',
-                       type =>'textarea',
-                       #default=>"$_password\n$_password\n",
-                     },
-  'userdel' => { label=>'Delete command',
-                 #default=>'',
-               },
-  'userdel_stdin' => { label=>'Delete command STDIN',
-                       type =>'textarea',
-                       #default=>'',
-                     },
-  'usermod' => { label=>'Modify command',
-                 default=>'',
-               },
-  'usermod_stdin' => { label=>'Modify command STDIN',
-                       type =>'textarea',
-                       #default=>"$_password\n$_password\n",
-                     },
-  'usermod_pwonly' => { label=>'Disallow username changes',
-                        type =>'checkbox',
-                      },
-  'suspend' => { label=>'Suspension command',
-                 default=>'',
-               },
-  'suspend_stdin' => { label=>'Suspension command STDIN',
-                       default=>'',
-                     },
-  'unsuspend' => { label=>'Unsuspension command',
-                   default=>'',
-                 },
-  'unsuspend_stdin' => { label=>'Unsuspension command STDIN',
-                         default=>'',
-                       },
-;
-
-tie my %www_shellcommands_options, 'Tie::IxHash',
-  'user' => { label=>'Remote username', default=>'root' },
-  'useradd' => { label=>'Insert command',
-                 default=>'mkdir /var/www/$zone; chown $username /var/www/$zone; ln -s /var/www/$zone $homedir/$zone',
-               },
-  'userdel'  => { label=>'Delete command',
-                  default=>'[ -n &quot;$zone&quot; ] && rm -rf /var/www/$zone; rm $homedir/$zone',
-                },
-  'usermod'  => { label=>'Modify command',
-                  default=>'[ -n &quot;$old_zone&quot; ] && rm $old_homedir/$old_zone; [ &quot;$old_zone&quot; != &quot;$new_zone&quot; -a -n &quot;$new_zone&quot; ] && mv /var/www/$old_zone /var/www/$new_zone; [ &quot;$old_username&quot; != &quot;$new_username&quot; ] && chown -R $new_username /var/www/$new_zone; ln -s /var/www/$new_zone $new_homedir/$new_zone',
-                },
-;
-
-tie my %apache_options, 'Tie::IxHash',
-  'user'       => { label=>'Remote username', default=>'root' },
-  'httpd_conf' => { label=>'httpd.conf snippet location',
-                    default=>'/etc/apache/httpd-freeside.conf', },
-  'template'   => {
-    label   => 'Template',
-    type    => 'textarea',
-    default => <<'END',
-<VirtualHost $domain> #generic
-#<VirtualHost ip.addr> #preferred, http://httpd.apache.org/docs/dns-caveats.html
-DocumentRoot /var/www/$zone
-ServerName $zone
-ServerAlias *.$zone
-#BandWidthModule On
-#LargeFileLimit 4096 12288
-</VirtualHost>
-
-END
-  },
-;
-
-tie my %router_options, 'Tie::IxHash',
-  'protocol' => {
-	  label=>'Protocol',
-	  type =>'select',
-	  options => [qw(telnet ssh)],
-	  default => 'telnet'},
-  'insert' => {label=>'Insert command', default=>'' },
-  'delete' => {label=>'Delete command', default=>'' },
-  'replace' => {label=>'Replace command', default=>'' },
-  'Timeout' => {label=>'Time to wait for prompt', default=>'20' },
-  'Prompt' => {label=>'Prompt string', default=>'#' }
-;
-
-tie my %domain_shellcommands_options, 'Tie::IxHash',
-  'user' => { label=>'Remote username', default=>'root' },
-  'useradd' => { label=>'Insert command',
-                 default=>'',
-               },
-  'userdel'  => { label=>'Delete command',
-                  default=>'',
-                },
-  'usermod'  => { label=>'Modify command',
-                  default=>'',
-                },
-;
-
-tie my %textradius_options, 'Tie::IxHash',
-  'user' => { label=>'Remote username', default=>'root' },
-  'users' => { label=>'users file location', default=>'/etc/raddb/users' },
-;
-
-tie my %sqlradius_options, 'Tie::IxHash',
-  'datasrc'  => { label=>'DBI data source ' },
-  'username' => { label=>'Database username' },
-  'password' => { label=>'Database password' },
-  'ignore_accounting' => {
-     type => 'checkbox',
-     label=>'Ignore accounting records from this database'
-  },
-;
-
-tie my %sqlradius_withdomain_options, 'Tie::IxHash',
-  'datasrc'  => { label=>'DBI data source ' },
-  'username' => { label=>'Database username' },
-  'password' => { label=>'Database password' },
-  'ignore_accounting' => {
-     type => 'checkbox',
-     label=>'Ignore accounting records from this database'
-  },
-;
-
-tie my %cyrus_options, 'Tie::IxHash',
-  'server' => { label=>'IMAP server' },
-  'username' => { label=>'Admin username' },
-  'password' => { label=>'Admin password' },
-;
-
-tie my %cp_options, 'Tie::IxHash',
-  'port'      => { label=>'Port number' },
-  'username'  => { label=>'Username' },
-  'password'  => { label=>'Password' },
-  'domain'    => { label=>'Domain' },
-  'workgroup' => { label=>'Default Workgroup' },
-;
-
-tie my %infostreet_options, 'Tie::IxHash',
-  'url'      => { label=>'XML-RPC Access URL', },
-  'login'    => { label=>'InfoStreet login', },
-  'password' => { label=>'InfoStreet password', },
-  'groupID'  => { label=>'InfoStreet groupID', },
-;
-
-tie my %vpopmail_options, 'Tie::IxHash',
-  #'machine' => { label=>'vpopmail machine', },
-  'dir'     => { label=>'directory', }, # ?more info? default?
-  'uid'     => { label=>'vpopmail uid' },
-  'gid'     => { label=>'vpopmail gid' },
-  'restart' => { label=> 'vpopmail restart command',
-                 default=> 'cd /home/vpopmail/domains; for domain in *; do /home/vpopmail/bin/vmkpasswd $domain; done; /var/qmail/bin/qmail-newu; killall -HUP qmail-send',
-               },
-;
-
-tie my %communigate_pro_options, 'Tie::IxHash',
-  'port'     => { label=>'Port number', default=>'106', },
-  'login'    => { label=>'The administrator account name.  The name can contain a domain part.', },
-  'password' => { label=>'The administrator account password.', },
-  'accountType' => { label=>'Type for newly-created accounts',
-                     type=>'select',
-                     options=>[qw( MultiMailbox TextMailbox MailDirMailbox )],
-                     default=>'MultiMailbox',
-                   },
-  'externalFlag' => { label=> 'Create accounts with an external (visible for legacy mailers) INBOX.',
-                      type=>'checkbox',
-                    },
-  'AccessModes' => { label=>'Access modes',
-                     default=>'Mail POP IMAP PWD WebMail WebSite',
-                   },
-;
-
-tie my %communigate_pro_singledomain_options, 'Tie::IxHash',
-  'port'     => { label=>'Port number', default=>'106', },
-  'login'    => { label=>'The administrator account name.  The name can contain a domain part.', },
-  'password' => { label=>'The administrator account password.', },
-  'domain'   => { label=>'Domain', },
-  'accountType' => { label=>'Type for newly-created accounts',
-                     type=>'select',
-                     options=>[qw( MultiMailbox TextMailbox MailDirMailbox )],
-                     default=>'MultiMailbox',
-                   },
-  'externalFlag' => { label=> 'Create accounts with an external (visible for legacy mailers) INBOX.',
-                      type=>'checkbox',
-                    },
-  'AccessModes' => { label=>'Access modes',
-                     default=>'Mail POP IMAP PWD WebMail WebSite',
-                   },
-;
-
-tie my %bind_options, 'Tie::IxHash',
-  #'machine'     => { label=>'named machine' },
-  'named_conf'   => { label  => 'named.conf location',
-                      default=> '/etc/bind/named.conf' },
-  'zonepath'     => { label => 'path to zone files',
-                      default=> '/etc/bind/', },
-  'bind_release' => { label => 'ISC BIND Release',
-                      type  => 'select',
-                      options => [qw(BIND8 BIND9)],
-                      default => 'BIND8' },
-  'bind9_minttl' => { label => 'The minttl required by bind9 and RFC1035.',
-                      default => '1D' },
-;
-
-tie my %bind_slave_options, 'Tie::IxHash',
-  #'machine'     => { label=> 'Slave machine' },
-  'master'       => { label=> 'Master IP address(s) (semicolon-separated)' },
-  'named_conf'   => { label   => 'named.conf location',
-                      default => '/etc/bind/named.conf' },
-  'bind_release' => { label => 'ISC BIND Release',
-                      type  => 'select',
-                      options => [qw(BIND8 BIND9)],
-                      default => 'BIND8' },
-  'bind9_minttl' => { label => 'The minttl required by bind9 and RFC1035.',
-                      default => '1D' },
-;
-
-tie my %http_options, 'Tie::IxHash',
-  'method' => { label   =>'Method',
-                type    =>'select',
-                #options =>[qw(POST GET)],
-                options =>[qw(POST)],
-                default =>'POST' },
-  'url'    => { label   => 'URL', default => 'http://', },
-  'insert_data' => {
-    label   => 'Insert data',
-    type    => 'textarea',
-    default => join("\n",
-      'DomainName $svc_x->domain',
-      'Email ( grep { $_ ne "POST" } $svc_x->cust_svc->cust_pkg->cust_main->invoicing_list)[0]',
-      'test 1',
-      'reseller $svc_x->cust_svc->cust_pkg->part_pkg->pkg =~ /reseller/i',
-    ),
-  },
-  'delete_data' => {
-    label   => 'Delete data',
-    type    => 'textarea',
-    default => join("\n",
-    ),
-  },
-  'replace_data' => {
-    label   => 'Replace data',
-    type    => 'textarea',
-    default => join("\n",
-    ),
-  },
-;
-
-tie my %sqlmail_options, 'Tie::IxHash',
-  'datasrc'            => { label => 'DBI data source' },
-  'username'           => { label => 'Database username' },
-  'password'           => { label => 'Database password' },
-  'server_type'        => {
-    label   => 'Server type',
-    type    => 'select',
-    options => [qw(dovecot_plain dovecot_crypt dovecot_digest_md5 courier_plain
-                   courier_crypt)],
-    default => ['dovecot_plain'], },
-  'svc_acct_table'     => { label => 'User Table', default => 'user_acct' },
-  'svc_forward_table'  => { label => 'Forward Table', default => 'forward' },
-  'svc_domain_table'   => { label => 'Domain Table', default => 'domain' },
-  'svc_acct_fields'    => { label => 'svc_acct Export Fields',
-                            default => 'username _password domsvc svcnum' },
-  'svc_forward_fields' => { label => 'svc_forward Export Fields',
-                            default => 'domain svcnum catchall' },
-  'svc_domain_fields'  => { label => 'svc_domain Export Fields',
-                            default => 'srcsvc dstsvc dst' },
-  'resolve_dstsvc'     => { label => q{Resolve svc_forward.dstsvc to an email address and store it in dst. (Doesn't require that you also export dstsvc.)},
-                            type => 'checkbox' },
-
-;
-
-tie my %ldap_options, 'Tie::IxHash',
-  'dn'         => { label=>'Root DN' },
-  'password'   => { label=>'Root DN password' },
-  'userdn'     => { label=>'User DN' },
-  'attributes' => { label=>'Attributes',
-                    type=>'textarea',
-                    default=>join("\n",
-                      'uid $username',
-                      'mail $username\@$domain',
-                      'uidno $uid',
-                      'gidno $gid',
-                      'cn $first',
-                      'sn $last',
-                      'mailquota $quota',
-                      'vmail',
-                      'location',
-                      'mailtag',
-                      'mailhost',
-                      'mailmessagestore $dir',
-                      'userpassword $crypt_password',
-                      'hint',
-                      'answer $sec_phrase',
-                      'objectclass top,person,inetOrgPerson',
-                    ),
-                  },
-  'radius'     => { label=>'Export RADIUS attributes', type=>'checkbox', },
-;
-
-tie my %forward_shellcommands_options, 'Tie::IxHash',
-  'user' => { label=>'Remote username', default=>'root' },
-  'useradd' => { label=>'Insert command',
-                 default=>'',
-               },
-  'userdel'  => { label=>'Delete command',
-                  default=>'',
-                },
-  'usermod'  => { label=>'Modify command',
-                  default=>'',
-                },
-;
-
-tie my %postfix_options, 'Tie::IxHash',
-  'user' => { label=>'Remote username', default=>'root' },
-  'aliases' => { label=>'aliases file location', default=>'/etc/aliases' },
-  'virtual' => { label=>'virtual file location', default=>'/etc/postfix/virtual' },
-  'mydomain' => { label=>'local domain', default=>'' },
-;
-
-#export names cannot have dashes...
-%exports = (
-  'svc_acct' => {
-    'sysvshell' => {
-      'desc' =>
-        'Batch export of /etc/passwd and /etc/shadow files (Linux/SysV).',
-      'options' => \%sysvshell_options,
-      'nodomain' => 'Y',
-      'notes' => 'MD5 crypt requires installation of <a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a> from CPAN.    Run bin/sysvshell.export to export the files.',
-    },
-    'bsdshell' => {
-      'desc' =>
-        'Batch export of /etc/passwd and /etc/master.passwd files (BSD).',
-      'options' => \%bsdshell_options,
-      'nodomain' => 'Y',
-      'notes' => 'MD5 crypt requires installation of <a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a> from CPAN.  Run bin/bsdshell.export to export the files.',
-    },
-#    'nis' => {
-#      'desc' =>
-#        'Batch export of /etc/global/passwd and /etc/global/shadow for NIS ',
-#      'options' => {},
-#    },
-    'textradius' => {
-      'desc' => 'Real-time export to a text /etc/raddb/users file (Livingston, Cistron)',
-      'options' => \%textradius_options,
-      'notes' => 'This will edit a text RADIUS users file in place on a remote server.  Requires installation of <a href="http://search.cpan.org/search?dist=RADIUS-UserFile">RADIUS::UserFile</a> from CPAN.  If using RADIUS::UserFile 1.01, make sure to apply <a href="http://rt.cpan.org/NoAuth/Bug.html?id=1210">this patch</a>.  Also make sure <a href="http://rsync.samba.org/">rsync</a> is installed on the remote machine, and <a href="../docs/ssh.html">SSH is setup for unattended operation</a>.',
-    },
-
-    'shellcommands' => {
-      'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
-      'options' => \%shellcommands_options,
-      'nodomain' => 'Y',
-      'notes' => 'Run remote commands via SSH.  Usernames are considered unique (also see shellcommands_withdomain).  You probably want this if the commands you are running will not accept a domain as a parameter.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="Linux" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = ""; this.form.suspend.value = "usermod -L $username"; this.form.suspend_stdin.value=""; this.form.unsuspend.value = "usermod -U $username"; this.form.unsuspend_stdin.value="";\'><LI><INPUT TYPE="button" VALUE="FreeBSD" onClick=\'this.form.useradd.value = "lockf /etc/passwd.lock pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0"; this.form.useradd_stdin.value = "$_password\n"; this.form.userdel.value = "lockf /etc/passwd.lock pw userdel $username -r"; this.form.userdel_stdin.value=""; this.form.usermod.value = "lockf /etc/passwd.lock pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0"; this.form.usermod_stdin.value = "$new__password\n"; this.form.suspend.value = "lockf /etc/passwd.lock pw lock $username"; this.form.suspend_stdin.value=""; this.form.unsuspend.value = "lockf /etc/passwd.lock pw unlock $username"; this.form.unsuspend_stdin.value="";\'> Note: On FreeBSD, due to deficient locking in pw(1), you must disable the chpass(1), chsh(1), chfn(1), passwd(1), and vipw(1) commands, or replace them with wrappers that prepend "lockf /etc/passwd.lock".  Alternatively, apply the patch in <A HREF="http://www.freebsd.org/cgi/query-pr.cgi?pr=23501">FreeBSD PR#23501</A> and remove the "lockf /etc/passwd.lock" from these default commands.<LI><INPUT TYPE="button" VALUE="NetBSD/OpenBSD" onClick=\'this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "userdel -r $username"; this.form.userdel_stdin.value=""; this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username"; this.form.usermod_stdin.value = ""; this.form.suspend.value = ""; this.form.suspend_stdin.value=""; this.form.unsuspend.value = ""; this.form.unsuspend_stdin.value="";\'><LI><INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick=\'this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = ""; this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $new_uid.$new_gid $new_dir; rm -rf $old_dir )"; this.form.usermod_stdin.value = ""; this.form.userdel.value = "rm -rf $dir"; this.form.userdel_stdin.value=""; this.form.suspend.value = ""; this.form.suspend_stdin.value=""; this.form.unsuspend.value = ""; this.form.unsuspend_stdin.value="";\'></UL>The following variables are available for interpolation (prefixed with new_ or old_ for replace operations): <UL><LI><code>$username</code><LI><code>$_password</code><LI><code>$quoted_password</code> - unencrypted password quoted for the shell<LI><code>$crypt_password</code> - encrypted password<LI><code>$uid</code><LI><code>$gid</code><LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)<LI><code>$dir</code> - home directory<LI><code>$shell</code><LI><code>$quota</code><LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.</UL>',
-    },
-
-    'shellcommands_withdomain' => {
-      'desc' => 'Real-time export via remote SSH (vpopmail, etc.).',
-      'options' => \%shellcommands_withdomain_options,
-      'notes' => 'Run remote commands via SSH.  username@domain (rather than just usernames) are considered unique (also see shellcommands).  You probably want this if the commands you are running will accept a domain as a parameter, and will allow the same username with different domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="vpopmail" onClick=\'this.form.useradd.value = "/home/vpopmail/bin/vadduser $username\\\@$domain $quoted_password"; this.form.useradd_stdin.value = ""; this.form.userdel.value = "/home/vpopmail/bin/vdeluser $username\\\@$domain"; this.form.userdel_stdin.value=""; this.form.usermod.value = "/home/vpopmail/bin/vpasswd $new_username\\\@$new_domain $new_quoted_password"; this.form.usermod_stdin.value = ""; this.form.usermod_pwonly.checked = true;\'></UL>The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations): <UL><LI><code>$username</code><LI><code>$domain</code><LI><code>$_password</code><LI><code>$quoted_password</code> - unencrypted password quoted for the shell<LI><code>$crypt_password</code> - encrypted password<LI><code>$uid</code><LI><code>$gid</code><LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)<LI><code>$dir</code> - home directory<LI><code>$shell</code><LI><code>$quota</code><LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.</UL>',
-    },
-
-    'ldap' => {
-      'desc' => 'Real-time export to LDAP',
-      'options' => \%ldap_options,
-      'notes' => 'Real-time export to arbitrary LDAP attributes.  Requires installation of <a href="http://search.cpan.org/search?dist=Net-LDAP">Net::LDAP</a> from CPAN.',
-    },
-
-    'sqlradius' => {
-      'desc' => 'Real-time export to SQL-backed RADIUS (FreeRADIUS, ICRADIUS, Radiator)',
-      'options' => \%sqlradius_options,
-      'nodomain' => 'Y',
-      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a>, <a href="http://radius.innercite.com/">ICRADIUS</a> or <a href="http://www.open.com.au/radiator/">Radiator</a>.  This export does not export RADIUS realms (see also sqlradius_withdomain).  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI/DBI.pm#connect">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.<ul><li>Using FreeRADIUS 0.9.0 with the PostgreSQL backend, the db_postgresql.sql schema and postgresql.conf queries contain incompatible changes.  This is fixed in 0.9.1.  Only new installs with 0.9.0 and PostgreSQL are affected - upgrades and other database backends and versions are unaffected.<li>Using ICRADIUS, add a dummy "op" column to your database: <blockquote><code>ALTER&nbsp;TABLE&nbsp;radcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'</code></blockquote><li>Using Radiator, see the <a href="http://www.open.com.au/radiator/faq.html#38">Radiator FAQ</a> for configuration information.</ul>',
-    },
-
-    'sqlradius_withdomain' => {
-      'desc' => 'Real-time export to SQL-backed RADIUS (FreeRADIUS, ICRADIUS, Radiator) with realms',
-      'options' => \%sqlradius_withdomain_options,
-      'nodomain' => '',
-      'notes' => 'Real-time export of radcheck, radreply and usergroup tables to any SQL database for <a href="http://www.freeradius.org/">FreeRADIUS</a>, <a href="http://radius.innercite.com/">ICRADIUS</a> or <a href="http://www.open.com.au/radiator/">Radiator</a>.  This export exports domains to RADIUS realms (see also sqlradius).  An existing RADIUS database will be updated in realtime, but you can use <a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a> to delete the entire RADIUS database and repopulate the tables from the Freeside database.  See the <a href="http://search.cpan.org/doc/TIMB/DBI/DBI.pm#connect">DBI documentation</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a> for the exact syntax of a DBI data source.<ul><li>Using FreeRADIUS 0.9.0 with the PostgreSQL backend, the db_postgresql.sql schema and postgresql.conf queries contain incompatible changes.  This is fixed in 0.9.1.  Only new installs with 0.9.0 and PostgreSQL are affected - upgrades and other database backends and versions are unaffected.<li>Using ICRADIUS, add a dummy "op" column to your database: <blockquote><code>ALTER&nbsp;TABLE&nbsp;radcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'<br>ALTER&nbsp;TABLE&nbsp;radgroupreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;\'==\'</code></blockquote><li>Using Radiator, see the <a href="http://www.open.com.au/radiator/faq.html#38">Radiator FAQ</a> for configuration information.</ul>',
-    },
-
-    'sqlmail' => {
-      'desc' => 'Real-time export to SQL-backed mail server',
-      'options' => \%sqlmail_options,
-      'nodomain' => '',
-      'notes' => 'Database schema can be made to work with Courier IMAP and Exim.  Others could work but are untested. (...extended description from pc-intouch?...)',
-    },
-
-    'cyrus' => {
-      'desc' => 'Real-time export to Cyrus IMAP server',
-      'options' => \%cyrus_options,
-      'nodomain' => 'Y',
-      'notes' => 'Integration with <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a>.  Cyrus::IMAP::Admin should be installed locally and the connection to the server secured.  <B>svc_acct.quota</B>, if available, is used to set the Cyrus quota. '
-    },
-
-    'cp' => {
-      'desc' => 'Real-time export to Critical Path Account Provisioning Protocol',
-      'options' => \%cp_options,
-      'notes' => 'Real-time export to <a href="http://www.cp.net/">Critial Path Account Provisioning Protocol</a>.  Requires installation of <a href="http://search.cpan.org/search?dist=Net-APP">Net::APP</a> from CPAN.',
-    },
-    
-    'infostreet' => {
-      'desc' => 'Real-time export to InfoStreet streetSmartAPI',
-      'options' => \%infostreet_options,
-      'nodomain' => 'Y',
-      'notes' => 'Real-time export to <a href="http://www.infostreet.com/">InfoStreet</a> streetSmartAPI.  Requires installation of <a href="http://search.cpan.org/search?dist=Frontier-Client">Frontier::Client</a> from CPAN.',
-    },
-
-    'vpopmail' => {
-      'desc' => 'Real-time export to vpopmail text files',
-      'options' => \%vpopmail_options,
-      'notes' => 'Real time export to <a href="http://inter7.com/vpopmail/">vpopmail</a> text files.  <a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a> must be installed, and you will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a> to <b>vpopmail</b>@<i>export.host</i>.',
-    },
-
-    'communigate_pro' => {
-      'desc' => 'Real-time export to a CommuniGate Pro mail server',
-      'options' => \%communigate_pro_options,
-      'notes' => 'Real time export to a <a href="http://www.stalker.com/CommuniGatePro/">CommuniGate Pro</a> mail server.  The <a href="http://www.stalker.com/CGPerl/">CommuniGate Pro Perl Interface</a> must be installed as CGP::CLI.',
-    },
-
-    'communigate_pro_singledomain' => {
-      'desc' => 'Real-time export to a CommuniGate Pro mail server, one domain only',
-      'options' => \%communigate_pro_singledomain_options,
-      'nodomain' => 'Y',
-      'notes' => 'Real time export to a <a href="http://www.stalker.com/CommuniGatePro/">CommuniGate Pro</a> mail server.  This is an unusual export to CommuniGate Pro that forces all accounts into a single domain.  As CommuniGate Pro supports multiple domains, unless you have a specific reason for using this export, you probably want to use the communigate_pro export instead.  The <a href="http://www.stalker.com/CGPerl/">CommuniGate Pro Perl Interface</a> must be installed as CGP::CLI.',
-    },
-
-  },
-
-  'svc_domain' => {
-
-    'bind' => {
-      'desc' =>'Batch export to BIND named',
-      'options' => \%bind_options,
-      'notes' => 'Batch export of BIND zone and configuration files to primary nameserver.  <a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a> must be installed.  Run bin/bind.export to export the files.',
-    },
-
-    'bind_slave' => {
-      'desc' =>'Batch export to slave BIND named',
-      'options' => \%bind_slave_options,
-      'notes' => 'Batch export of BIND configuration file to a secondary nameserver.  Zones are slaved from the listed masters.  <a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a> must be installed.  Run bin/bind.export to export the files.',
-    },
-
-    'http' => {
-      'desc' => 'Send an HTTP or HTTPS GET or POST request',
-      'options' => \%http_options,
-      'notes' => 'Send an HTTP or HTTPS GET or POST to the specified URL.  <a href="http://search.cpan.org/search?dist=libwww-perl">libwww-perl</a> must be installed.  For HTTPS support, <a href="http://search.cpan.org/search?dist=Crypt-SSLeay">Crypt::SSLeay</a> or <a href="http://search.cpan.org/search?dist=IO-Socket-SSL">IO::Socket::SSL</a> is required.',
-    },
-
-    'sqlmail' => {
-      'desc' => 'Real-time export to SQL-backed mail server',
-      'options' => \%sqlmail_options,
-      #'nodomain' => 'Y',
-      'notes' => 'Database schema can be made to work with Courier IMAP and Exim.  Others could work but are untested. (...extended description from pc-intouch?...)',
-    },
-
-    'domain_shellcommands' => {
-      'desc' => 'Run remote commands via SSH, for domains.',
-      'options' => \%domain_shellcommands_options,
-      'notes'    => 'Run remote commands via SSH, for domains.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="qmail catchall .qmail-domain-default maintenance" onClick=\'this.form.useradd.value = "[ \"$uid\" -a \"$gid\" -a \"$dir\" -a \"$qdomain\" ] && [ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }"; this.form.userdel.value = ""; this.form.usermod.value = "";\'></UL>The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations): <UL><LI><code>$domain</code><LI><code>$qdomain</code> - domain with periods replaced by colons<LI><code>$uid</code> - of catchall account<LI><code>$gid</code> - of catchall account<LI><code>$dir</code> - home directory of catchall account<LI>All other fields in <a href="../docs/schema.html#svc_domain">svc_domain</a> are also available.</UL>',
-    },
-
-
-  },
-
-  'svc_forward' => {
-    'sqlmail' => {
-      'desc' => 'Real-time export to SQL-backed mail server',
-      'options' => \%sqlmail_options,
-      #'nodomain' => 'Y',
-      'notes' => 'Database schema can be made to work with Courier IMAP and Exim.  Others could work but are untested. (...extended description from fire2wire?...)',
-    },
-
-    'forward_shellcommands' => {
-      'desc' => 'Run remote commands via SSH, for forwards',
-      'options' => \%forward_shellcommands_options,
-      'notes' => 'Run remote commands via SSH, for forwards.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>Use these buttons for some useful presets:<UL><LI><INPUT TYPE="button" VALUE="text vpopmail maintenance" onClick=\'this.form.useradd.value = "[ -d /home/vpopmail/domains/$domain/$username ] && { echo \"$destination\" > /home/vpopmail/domains/$domain/$username/.qmail; chown vpopmail:vchkpw /home/vpopmail/domains/$domain/$username/.qmail; }"; this.form.userdel.value = "rm /home/vpopmail/domains/$domain/$username/.qmail"; this.form.usermod.value = "mv /home/vpopmail/domains/$old_domain/$old_username/.qmail /home/vpopmail/domains/$new_domain/$new_username; [ \"$old_destination\" != \"$new_destination\" ] && { echo \"$new_destination\" > /home/vpopmail/domains/$new_domain/$new_username/.qmail; chown vpopmail:vchkpw /home/vpopmail/domains/$new_domain/$new_username/.qmail; }";\'></UL>The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations): <UL><LI><code>$username</code><LI><code>$domain</code><LI><code>$destination</code> - forward destination<LI>All other fields in <a href="../docs/schema.html#svc_forward">svc_forward</a> are also available.</UL>',
-    },
-
-    'postfix' => {
-      'desc' => 'Real-time export to Postfix text files',
-      'options' => \%postfix_options,
-      #'nodomain' => 'Y',
-      'notes' => 'Batch export of Postfix aliases and virtual files.  <a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a> must be installed.  Run bin/postfix.export to export the files.',
-    },
-
-  },
-
-  'svc_www' => {
-    'www_shellcommands' => {
-      'desc' => 'Run remote commands via SSH, for virtual web sites.',
-      'options' => \%www_shellcommands_options,
-      'notes'    => 'Run remote commands via SSH, for virtual web sites.  You will need to <a href="../docs/ssh.html">setup SSH for unattended operation</a>.<BR><BR>The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations): <UL><LI><code>$zone</code><LI><code>$username</code><LI><code>$homedir</code><LI>All other fields in <a href="../docs/schema.html#svc_www">svc_www</a> are also available.</UL>',
-    },
-
-    'apache' => {
-      'desc' => 'Export an Apache httpd.conf file snippet.',
-      'options' => \%apache_options,
-      'notes' => 'Batch export of an httpd.conf snippet from a template.  Typically used with something like <code>Include /etc/apache/httpd-freeside.conf</code> in httpd.conf.  <a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a> must be installed.  Run bin/apache.export to export the files.',
-    },
-  },
-
-  'svc_broadband' => {
-    'router' => {
-      'desc' => 'Send a command to a router.',
-      'options' => \%router_options,
-      'notes' => '',
-    },
-  },
-
-  'svc_external' => {
-  },
-
-);
+foreach my $INC ( @INC ) {
+  foreach my $file ( glob("$INC/FS/part_export/*.pm") ) {
+    warn "attempting to load export info from $file\n" if $DEBUG;
+    $file =~ /\/(\w+)\.pm$/ or do {
+      warn "unrecognized file in $INC/FS/part_export/: $file\n";
+      next;
+    };
+    my $mod = $1;
+    my $info = eval "use FS::part_export::$mod; ".
+                    "\\%FS::part_export::$mod\::info;";
+    if ( $@ ) {
+      die "error using FS::part_export::$mod (skipping): $@\n" if $@;
+      next;
+    }
+    unless ( keys %$info ) {
+      warn "no %info hash found in FS::part_export::$mod, skipping\n"
+        unless $mod =~ /^(passwdfile|null)$/; #hack but what the heck
+      next;
+    }
+    warn "got export info from FS::part_export::$mod: $info\n" if $DEBUG;
+    no strict 'refs';
+    foreach my $svc (
+      ref($info->{'svc'}) ? @{$info->{'svc'}} : $info->{'svc'}
+    ) {
+      unless ( $svc ) {
+        warn "blank svc for FS::part_export::$mod (skipping)\n";
+        next;
+      }
+      $exports{$svc}->{$mod} = $info;
+    }
+  }
+}
 
 =back
 
 =head1 NEW EXPORT CLASSES
 
-Should be added to the %export hash here, and a module should be added in
-FS/FS/part_export/ (an example may be found in eg/export_template.pm)
+A module should be added in FS/FS/part_export/ (an example may be found in
+eg/export_template.pm)
 
 =head1 BUGS
 
-All the stuff in the %exports hash should be generated from the specific
-export modules.
-
 Hmm... cust_export class (not necessarily a database table...) ... ?
 
 deprecated column...
diff --git a/FS/FS/part_export/apache.pm b/FS/FS/part_export/apache.pm
index 9161d72b3..b16b3040d 100644
--- a/FS/FS/part_export/apache.pm
+++ b/FS/FS/part_export/apache.pm
@@ -1,7 +1,43 @@
 package FS::part_export::apache;
 
-use vars qw(@ISA);
+use vars qw(@ISA %info);
+use Tie::IxHash;
 use FS::part_export::null;
 
 @ISA = qw(FS::part_export::null);
 
+tie my %options, 'Tie::IxHash',
+  'user'       => { label=>'Remote username', default=>'root' },
+  'httpd_conf' => { label=>'httpd.conf snippet location',
+                    default=>'/etc/apache/httpd-freeside.conf', },
+  'template'   => {
+    label   => 'Template',
+    type    => 'textarea',
+    default => <<'END',
+<VirtualHost $domain> #generic
+#<VirtualHost ip.addr> #preferred, http://httpd.apache.org/docs/dns-caveats.html
+DocumentRoot /var/www/$zone
+ServerName $zone
+ServerAlias *.$zone
+#BandWidthModule On
+#LargeFileLimit 4096 12288
+</VirtualHost>
+
+END
+  },
+;
+
+%info = (
+  'svc'     => 'svc_www',
+  'desc'    => 'Export an Apache httpd.conf file snippet.',
+  'options' => \%options,
+  'notes'   => <<'END'
+Batch export of an httpd.conf snippet from a template.  Typically used with
+something like <code>Include /etc/apache/httpd-freeside.conf</code> in
+httpd.conf.  <a href="http://search.cpan.org/dist/File-Rsync">File::Rsync</a>
+must be installed.  Run bin/apache.export to export the files.
+END
+);
+
+1;
+
diff --git a/FS/FS/part_export/bind.pm b/FS/FS/part_export/bind.pm
index b72c9bdb0..cf73ef450 100644
--- a/FS/FS/part_export/bind.pm
+++ b/FS/FS/part_export/bind.pm
@@ -1,7 +1,34 @@
 package FS::part_export::bind;
 
-use vars qw(@ISA);
+use vars qw(@ISA %info %options);
+use Tie::IxHash;
 use FS::part_export::null;
 
 @ISA = qw(FS::part_export::null);
 
+tie %options, 'Tie::IxHash',
+  'named_conf'   => { label  => 'named.conf location',
+                      default=> '/etc/bind/named.conf' },
+  'zonepath'     => { label => 'path to zone files',
+                      default=> '/etc/bind/', },
+  'bind_release' => { label => 'ISC BIND Release',
+                      type  => 'select',
+                      options => [qw(BIND8 BIND9)],
+                      default => 'BIND8' },
+  'bind9_minttl' => { label => 'The minttl required by bind9 and RFC1035.',
+                      default => '1D' },
+;
+
+%info = (
+  'svc'     => 'svc_domain',
+  'desc'    => 'Batch export to BIND named',
+  'options' => \%options,
+  'notes'   => <<'END'
+Batch export of BIND zone and configuration files to a primary nameserver.
+<a href="http://search.cpan.org/search?dist=File-Rsync">File::Rsync</a>
+must be installed.  Run bin/bind.export to export the files.
+END
+);
+
+1;
+
diff --git a/FS/FS/part_export/bind_slave.pm b/FS/FS/part_export/bind_slave.pm
index ebb29c1d7..c89325f8d 100644
--- a/FS/FS/part_export/bind_slave.pm
+++ b/FS/FS/part_export/bind_slave.pm
@@ -1,7 +1,28 @@
 package FS::part_export::bind_slave;
 
-use vars qw(@ISA);
+use vars qw(@ISA %info);
+use Tie::IxHash;
 use FS::part_export::null;
 
 @ISA = qw(FS::part_export::null);
 
+tie my %options, 'Tie::IxHash', 
+  'master'       => { label=> 'Master IP address(s) (semicolon-separated)' },
+  %FS::part_export::bind::options,
+;
+delete $options{'zonepath'};
+
+%info = (
+  'svc'     => 'svc_domain',
+  'desc'    =>'Batch export to slave BIND named',
+  'options' => \%options,
+  'notes'   => <<'END'
+Batch export of BIND configuration file to a secondary nameserver.  Zones are
+slaved from the listed masters.
+<a href="http://search.cpan.org/dist/File-Rsync">File::Rsync</a>
+must be installed.  Run bin/bind.export to export the files.
+END
+);
+
+1;
+
diff --git a/FS/FS/part_export/bsdshell.pm b/FS/FS/part_export/bsdshell.pm
index 06642097f..7b5feb252 100644
--- a/FS/FS/part_export/bsdshell.pm
+++ b/FS/FS/part_export/bsdshell.pm
@@ -1,7 +1,25 @@
 package FS::part_export::bsdshell;
 
-use vars qw(@ISA);
-use FS::part_export::null;
+use vars qw(@ISA %info);
+use Tie::IxHash;
+use FS::part_export::passwdfile;
 
-@ISA = qw(FS::part_export::null);
+@ISA = qw(FS::part_export::passwdfile);
+
+tie my %options, 'Tie::IxHash', %FS::part_export::passwdfile::options;
+
+%info = (
+  'svc'      => 'svc_acct',
+  'desc'     =>
+    'Batch export of /etc/passwd and /etc/master.passwd files (BSD)',
+  'options'  => \%options,
+  'nodomain' => 'Y',
+  'notes'    => <<'END'
+MD5 crypt requires installation of
+<a href="http://search.cpan.org/dist/Crypt-PasswdMD5">Crypt::PasswdMD5</a>
+from CPAN.  Run bin/bsdshell.export to export the files.
+END
+);
+
+1;
 
diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
index 557aad91d..6da201799 100644
--- a/FS/FS/part_export/communigate_pro.pm
+++ b/FS/FS/part_export/communigate_pro.pm
@@ -1,11 +1,42 @@
 package FS::part_export::communigate_pro;
 
-use vars qw(@ISA);
+use vars qw(@ISA %info %options);
+use Tie::IxHash;
 use FS::part_export;
 use FS::queue;
 
 @ISA = qw(FS::part_export);
 
+tie %options, 'Tie::IxHash',
+  'port'     => { label=>'Port number', default=>'106', },
+  'login'    => { label=>'The administrator account name.  The name can contain a domain part.', },
+  'password' => { label=>'The administrator account password.', },
+  'accountType' => { label=>'Type for newly-created accounts',
+                     type=>'select',
+                     options=>[qw( MultiMailbox TextMailbox MailDirMailbox )],
+                     default=>'MultiMailbox',
+                   },
+  'externalFlag' => { label=> 'Create accounts with an external (visible for legacy mailers) INBOX.',
+                      type=>'checkbox',
+                    },
+  'AccessModes' => { label=>'Access modes',
+                     default=>'Mail POP IMAP PWD WebMail WebSite',
+                   },
+;
+
+%info = (
+  'svc'     => 'svc_acct',
+  'desc'    => 'Real-time export to a CommuniGate Pro mail server',
+  'options' => \%options,
+  'notes'   => <<'END'
+Real time export to a
+<a href="http://www.stalker.com/CommuniGatePro/">CommuniGate Pro</a>
+mail server.  The
+<a href="http://www.stalker.com/CGPerl/">CommuniGate Pro Perl Interface</a>
+must be installed as CGP::CLI.
+END
+);
+
 sub rebless { shift; }
 
 sub export_username {
@@ -142,3 +173,6 @@ sub communigate_pro_command { #subroutine, not method
   $cli->Logout or die "Can't logout of CGPro: $CGP::ERR_STRING\n";
 
 }
+
+1;
+
diff --git a/FS/FS/part_export/communigate_pro_singledomain.pm b/FS/FS/part_export/communigate_pro_singledomain.pm
index 11574af9b..6a1bf60eb 100644
--- a/FS/FS/part_export/communigate_pro_singledomain.pm
+++ b/FS/FS/part_export/communigate_pro_singledomain.pm
@@ -1,11 +1,37 @@
 package FS::part_export::communigate_pro_singledomain;
 
-use vars qw(@ISA);
+use vars qw(@ISA %info);
+use Tie::IxHash;
 use FS::part_export::communigate_pro;
 
 @ISA = qw(FS::part_export::communigate_pro);
 
+tie my %options, 'Tie::IxHash', %FS::part_export::communigate_pro::options,
+  'domain'   => { label=>'Domain', },
+;
+
+%info = (
+  'svc'      => 'svc_acct',
+  'desc'     =>
+    'Real-time export to a CommuniGate Pro mail server, one domain only',
+  'options'  => \%options,
+  'nodomain' => 'Y',
+  'notes'    => <<'END'
+Real time export to a
+<a href="http://www.stalker.com/CommuniGatePro/">CommuniGate Pro</a>
+mail server.  This is an unusual export to CommuniGate Pro that forces all
+accounts into a single domain.  As CommuniGate Pro supports multipledomains,
+unless you have a specific reason for using this export, you probably want to
+use the communigate_pro export instead.  The
+<a href="http://www.stalker.com/CGPerl/">CommuniGate Pro Perl Interface</a>
+must be installed as CGP::CLI.
+END
+);
+
 sub export_username {
   my($self, $svc_acct) = (shift, shift);
   $svc_acct->username. '@'. $self->option('domain');
 }
+
+1;
+
diff --git a/FS/FS/part_export/cp.pm b/FS/FS/part_export/cp.pm
index c4750dd5d..a295c574b 100644
--- a/FS/FS/part_export/cp.pm
+++ b/FS/FS/part_export/cp.pm
@@ -1,10 +1,32 @@
 package FS::part_export::cp;
 
-use vars qw(@ISA);
+use vars qw(@ISA %info);
+use Tie::IxHash;
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+tie my %options, 'Tie::IxHash',
+  'port'      => { label=>'Port number' },
+  'username'  => { label=>'Username' },
+  'password'  => { label=>'Password' },
+  'domain'    => { label=>'Domain' },
+  'workgroup' => { label=>'Default Workgroup' },
+;
+
+%info = (
+  'svc'    => 'svc_acct',
+  'desc'   => 'Real-time export to Critical Path Account Provisioning Protocol',
+  'options'=> \%options,
+  'notes'  => <<'END'
+Real-time export to
+<a href="http://www.cp.net/">Critial Path Account Provisioning Protocol</a>.
+Requires installation of
+<a href="http://search.cpan.org/dist/Net-APP">Net::APP</a>
+from CPAN.
+END
+);
+
 sub rebless { shift; }
 
 sub _export_insert {
@@ -134,3 +156,5 @@ sub cp_command { #subroutine, not method
 
 }
 
+1;
+
diff --git a/FS/FS/part_export/cyrus.pm b/FS/FS/part_export/cyrus.pm
index 110ff198f..84c9e5a30 100644
--- a/FS/FS/part_export/cyrus.pm
+++ b/FS/FS/part_export/cyrus.pm
@@ -1,10 +1,31 @@
 package FS::part_export::cyrus;
 
-use vars qw(@ISA);
+use vars qw(@ISA %info);
+use Tie::IxHash;
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+tie my %options, 'Tie::IxHash',
+  'server'   => { label=>'IMAP server' },
+  'username' => { label=>'Admin username' },
+  'password' => { label=>'Admin password' },
+;
+
+%info = ( 
+  'svc'      => 'svc_acct',
+  'desc'     => 'Real-time export to Cyrus IMAP server',
+  'options'  => \%options,
+  'nodomain' => 'Y',
+  'notes'    => <<'END'
+Integration with
+<a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a>.
+Cyrus::IMAP::Admin should be installed locally and the connection to the
+server secured.  <B>svc_acct.quota</B>, if available, is used to set the
+Cyrus quota.
+END
+);
+
 sub rebless { shift; }
 
 sub _export_insert {
@@ -95,4 +116,5 @@ sub cyrus_connect {
 #sub cyrus_replace { #subroutine, not method
 #}
 
+1;
 
diff --git a/FS/FS/part_export/domain_shellcommands.pm b/FS/FS/part_export/domain_shellcommands.pm
index d295eece0..d8ae0c376 100644
--- a/FS/FS/part_export/domain_shellcommands.pm
+++ b/FS/FS/part_export/domain_shellcommands.pm
@@ -1,11 +1,54 @@
 package FS::part_export::domain_shellcommands;
 
 use strict;
-use vars qw(@ISA);
+use vars qw(@ISA %info);
+use Tie::IxHash;
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+tie my %options, 'Tie::IxHash',
+  'user' => { label=>'Remote username', default=>'root' },
+  'useradd' => { label=>'Insert command',
+                 default=>'',
+               },
+  'userdel'  => { label=>'Delete command',
+                  default=>'',
+                },
+  'usermod'  => { label=>'Modify command',
+                  default=>'',
+                },
+;
+
+%info = (
+  'svc'     => 'svc_domain',
+  'desc'    => 'Run remote commands via SSH, for domains.',
+  'options' => \%options,
+  'notes'   => <<'END'
+Run remote commands via SSH, for domains.  You will need to
+<a href="../docs/ssh.html">setup SSH for unattended operation</a>.
+<BR><BR>Use these buttons for some useful presets:
+<UL>
+  <LI>
+    <INPUT TYPE="button" VALUE="qmail catchall .qmail-domain-default maintenance" onClick='
+      this.form.useradd.value = "[ \"$uid\" -a \"$gid\" -a \"$dir\" -a \"$qdomain\" ] && [ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }";
+      this.form.userdel.value = "";
+      this.form.usermod.value = "";
+    '>
+</UL>
+The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations):
+<UL>
+  <LI><code>$domain</code>
+  <LI><code>$qdomain</code> - domain with periods replaced by colons
+  <LI><code>$uid</code> - of catchall account
+  <LI><code>$gid</code> - of catchall account
+  <LI><code>$dir</code> - home directory of catchall account
+  <LI>All other fields in
+    <a href="../docs/schema.html#svc_domain">svc_domain</a> are also available.
+</UL>
+END
+);
+
 sub rebless { shift; }
 
 sub _export_insert {
@@ -108,3 +151,5 @@ sub ssh_cmd { #subroutine, not method
 #sub shellcommands_delete { #subroutine, not method
 #}
 
+1;
+
diff --git a/FS/FS/part_export/forward_shellcommands.pm b/FS/FS/part_export/forward_shellcommands.pm
index 5d3145715..6908214d5 100644
--- a/FS/FS/part_export/forward_shellcommands.pm
+++ b/FS/FS/part_export/forward_shellcommands.pm
@@ -1,11 +1,52 @@
 package FS::part_export::forward_shellcommands;
 
 use strict;
-use vars qw(@ISA);
+use vars qw(@ISA %info);
+use Tie::IxHash;
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+tie my %options, 'Tie::IxHash',
+  'user' => { label=>'Remote username', default=>'root' },
+  'useradd' => { label=>'Insert command',
+                 default=>'',
+               },
+  'userdel'  => { label=>'Delete command',
+                  default=>'',
+                },
+  'usermod'  => { label=>'Modify command',
+                  default=>'',
+                },
+;
+
+%info = (
+  'svc'     => 'svc_forward',
+  'desc'    => 'Run remote commands via SSH, for forwards',
+  'options' => \%options,
+  'notes'   => <<'END'
+Run remote commands via SSH, for forwards.  You will need to
+<a href="../docs/ssh.html">setup SSH for unattended operation</a>.
+<BR><BR>Use these buttons for some useful presets:
+<UL>
+  <LI>
+    <INPUT TYPE="button" VALUE="text vpopmail maintenance" onClick='
+      this.form.useradd.value = "[ -d /home/vpopmail/domains/$domain/$username ] && { echo \"$destination\" > /home/vpopmail/domains/$domain/$username/.qmail; chown vpopmail:vchkpw /home/vpopmail/domains/$domain/$username/.qmail; }";
+      this.form.userdel.value = "rm /home/vpopmail/domains/$domain/$username/.qmail";
+      this.form.usermod.value = "mv /home/vpopmail/domains/$old_domain/$old_username/.qmail /home/vpopmail/domains/$new_domain/$new_username; [ \"$old_destination\" != \"$new_destination\" ] && { echo \"$new_destination\" > /home/vpopmail/domains/$new_domain/$new_username/.qmail; chown vpopmail:vchkpw /home/vpopmail/domains/$new_domain/$new_username/.qmail; }";
+    '>
+</UL>
+The following variables are available for interpolation (prefixed with
+<code>new_</code> or <code>old_</code> for replace operations):
+<UL>
+  <LI><code>$username</code>
+  <LI><code>$domain</code>
+  <LI><code>$destination</code> - forward destination
+  <LI>All other fields in <a href="../docs/schema.html#svc_forward">svc_forward</a> are also available.
+</UL>
+END
+);
+
 sub rebless { shift; }
 
 sub _export_insert {
@@ -108,3 +149,5 @@ sub ssh_cmd { #subroutine, not method
 #sub shellcommands_delete { #subroutine, not method
 #}
 
+1;
+
diff --git a/FS/FS/part_export/http.pm b/FS/FS/part_export/http.pm
index 0e02f0f8e..0be2a0f36 100644
--- a/FS/FS/part_export/http.pm
+++ b/FS/FS/part_export/http.pm
@@ -1,10 +1,54 @@
 package FS::part_export::http;
 
-use vars qw(@ISA);
+use vars qw(@ISA %info);
+use Tie::IxHash;
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+tie my %options, 'Tie::IxHash',
+  'method' => { label   =>'Method',
+                type    =>'select',
+                #options =>[qw(POST GET)],
+                options =>[qw(POST)],
+                default =>'POST' },
+  'url'    => { label   => 'URL', default => 'http://', },
+  'insert_data' => {
+    label   => 'Insert data',
+    type    => 'textarea',
+    default => join("\n",
+      'DomainName $svc_x->domain',
+      'Email ( grep { $_ ne "POST" } $svc_x->cust_svc->cust_pkg->cust_main->invoicing_list)[0]',
+      'test 1',
+      'reseller $svc_x->cust_svc->cust_pkg->part_pkg->pkg =~ /reseller/i',
+    ),
+  },
+  'delete_data' => {
+    label   => 'Delete data',
+    type    => 'textarea',
+    default => join("\n",
+    ),
+  },
+  'replace_data' => {
+    label   => 'Replace data',
+    type    => 'textarea',
+    default => join("\n",
+    ),
+  },
+;
+
+%info = (
+  'svc'     => 'svc_domain',
+  'desc'    => 'Send an HTTP or HTTPS GET or POST request',
+  'options' => \%options,
+  'notes'   => <<'END'
+Send an HTTP or HTTPS GET or POST to the specified URL.  For HTTPS support,
+<a href="http://search.cpan.org/dist/Crypt-SSLeay">Crypt::SSLeay</a>
+or <a href="http://search.cpan.org/dist/IO-Socket-SSL">IO::Socket::SSL</a>
+is required.
+END
+);
+
 sub rebless { shift; }
 
 sub _export_insert {
@@ -86,3 +130,5 @@ sub http {
 
 }
 
+1;
+
diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
index caca7c5e1..309e7ce6f 100644
--- a/FS/FS/part_export/infostreet.pm
+++ b/FS/FS/part_export/infostreet.pm
@@ -1,11 +1,32 @@
 package FS::part_export::infostreet;
 
-use vars qw(@ISA %infostreet2cust_main $DEBUG);
+use vars qw(@ISA %info %infostreet2cust_main $DEBUG);
+use Tie::IxHash;
 use FS::UID qw(dbh);
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+tie my %options, 'Tie::IxHash',
+  'url'      => { label=>'XML-RPC Access URL', },
+  'login'    => { label=>'InfoStreet login', },
+  'password' => { label=>'InfoStreet password', },
+  'groupID'  => { label=>'InfoStreet groupID', },
+;
+
+%info = (
+  'svc'      => 'svc_acct',
+  'desc'     => 'Real-time export to InfoStreet streetSmartAPI',
+  'options'  => \%options,
+  'nodomain' => 'Y',
+  'notes'    => <<'END'
+Real-time export to
+<a href="http://www.infostreet.com/">InfoStreet</a> streetSmartAPI.
+Requires installation of
+<a href="http://search.cpan.org/dist/Frontier-Client">Frontier::Client</a> from CPAN.
+END
+);
+
 $DEBUG = 0;
 
 %infostreet2cust_main = (
@@ -252,4 +273,5 @@ sub _infostreet_parse { #subroutine, not method
   } keys %$arg;
 }
 
+1;
 
diff --git a/FS/FS/part_export/ldap.pm b/FS/FS/part_export/ldap.pm
index 57fd1f3f4..823d99dbf 100644
--- a/FS/FS/part_export/ldap.pm
+++ b/FS/FS/part_export/ldap.pm
@@ -1,11 +1,50 @@
 package FS::part_export::ldap;
 
-use vars qw(@ISA @saltset);
+use vars qw(@ISA %info @saltset);
+use Tie::IxHash;
 use FS::Record qw( dbh );
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+tie my %options, 'Tie::IxHash',
+  'dn'         => { label=>'Root DN' },
+  'password'   => { label=>'Root DN password' },
+  'userdn'     => { label=>'User DN' },
+  'attributes' => { label=>'Attributes',
+                    type=>'textarea',
+                    default=>join("\n",
+                      'uid $username',
+                      'mail $username\@$domain',
+                      'uidno $uid',
+                      'gidno $gid',
+                      'cn $first',
+                      'sn $last',
+                      'mailquota $quota',
+                      'vmail',
+                      'location',
+                      'mailtag',
+                      'mailhost',
+                      'mailmessagestore $dir',
+                      'userpassword $crypt_password',
+                      'hint',
+                      'answer $sec_phrase',
+                      'objectclass top,person,inetOrgPerson',
+                    ),
+                  },
+  'radius'     => { label=>'Export RADIUS attributes', type=>'checkbox', },
+;
+
+%info = (
+  'svc'     => 'svc_acct',
+  'desc'    => 'Real-time export to LDAP',
+  'options' => \%options,
+  'notes'   => <<'END'
+Real-time export to arbitrary LDAP attributes.  Requires installation of
+<a href="http://search.cpan.org/dist/Net-LDAP">Net::LDAP</a> from CPAN.
+END
+);
+
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
 
 sub rebless { shift; }
@@ -251,3 +290,5 @@ sub ldap_connect {
   $ldap;
 }
 
+1;
+
diff --git a/FS/FS/part_export/postfix.pm b/FS/FS/part_export/postfix.pm
index 6d5e449ca..c24cf19a3 100644
--- a/FS/FS/part_export/postfix.pm
+++ b/FS/FS/part_export/postfix.pm
@@ -1,7 +1,27 @@
 package FS::part_export::postfix;
 
-use vars qw(@ISA);
+use vars qw(@ISA %info);
+use Tie::IxHash;
 use FS::part_export::null;
 
 @ISA = qw(FS::part_export::null);
 
+tie my %options, 'Tie::IxHash',
+  'user'    => { label=>'Remote username',       default=>'root' },
+  'aliases' => { label=>'aliases file location', default=>'/etc/aliases' },
+  'virtual' => { label=>'virtual file location', default=>'/etc/postfix/virtual' },
+  'mydomain' => { label=>'local domain', default=>'' },
+;
+
+%info = (
+  'svc'     => 'svc_forward',
+  'desc'    => 'Postfix text files',
+  'options' => \%options,
+  'notes'   => <<'END'
+Batch export of Postfix aliases and virtual files.
+<a href="http://search.cpan.org/dist/File-Rsync">File::Rsync</a>
+must be installed.  Run bin/postfix.export to export the files.
+END
+);
+
+1;
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 9fad36dad..cee54b488 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -1,11 +1,161 @@
 package FS::part_export::shellcommands;
 
-use vars qw(@ISA @saltset);
+use vars qw(@ISA %info @saltset);
+use Tie::IxHash;
 use String::ShellQuote;
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+tie my %options, 'Tie::IxHash',
+  'user' => { label=>'Remote username', default=>'root' },
+  'useradd' => { label=>'Insert command',
+                 default=>'useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username'
+                #default=>'cp -pr /etc/skel $dir; chown -R $uid.$gid $dir'
+               },
+  'useradd_stdin' => { label=>'Insert command STDIN',
+                       type =>'textarea',
+                       default=>'',
+                     },
+  'userdel' => { label=>'Delete command',
+                 default=>'userdel -r $username',
+                 #default=>'rm -rf $dir',
+               },
+  'userdel_stdin' => { label=>'Delete command STDIN',
+                       type =>'textarea',
+                       default=>'',
+                     },
+  'usermod' => { label=>'Modify command',
+                 default=>'usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username',
+                #default=>'[ -d $old_dir ] && mv $old_dir $new_dir || ( '.
+                 #  'chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; '.
+                 #  'find . -depth -print | cpio -pdm $new_dir; '.
+                 #  'chmod u-t $new_dir; chown -R $uid.$gid $new_dir; '.
+                 #  'rm -rf $old_dir'.
+                 #')'
+               },
+  'usermod_stdin' => { label=>'Modify command STDIN',
+                       type =>'textarea',
+                       default=>'',
+                     },
+  'usermod_pwonly' => { label=>'Disallow username changes',
+                        type =>'checkbox',
+                      },
+  'suspend' => { label=>'Suspension command',
+                 default=>'usermod -L $username',
+               },
+  'suspend_stdin' => { label=>'Suspension command STDIN',
+                       default=>'',
+                     },
+  'unsuspend' => { label=>'Unsuspension command',
+                   default=>'usermod -U $username',
+                 },
+  'unsuspend_stdin' => { label=>'Unsuspension command STDIN',
+                         default=>'',
+                       },
+;
+
+%info = (
+  'svc'      => 'svc_acct',
+  'desc'     =>
+    'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
+  'options'  => \%options,
+  'nodomain' => 'Y',
+  'notes' => <<'END'
+Run remote commands via SSH.  Usernames are considered unique (also see
+shellcommands_withdomain).  You probably want this if the commands you are
+running will not accept a domain as a parameter.  You will need to
+<a href="../docs/ssh.html">setup SSH for unattended operation</a>.
+
+<BR><BR>Use these buttons for some useful presets:
+<UL>
+  <LI>
+    <INPUT TYPE="button" VALUE="Linux" onClick='
+      this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username";
+      this.form.useradd_stdin.value = "";
+      this.form.userdel.value = "userdel -r $username";
+      this.form.userdel_stdin.value="";
+      this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username";
+      this.form.usermod_stdin.value = "";
+      this.form.suspend.value = "usermod -L $username";
+      this.form.suspend_stdin.value="";
+      this.form.unsuspend.value = "usermod -U $username";
+      this.form.unsuspend_stdin.value="";
+    '>
+  <LI>
+    <INPUT TYPE="button" VALUE="FreeBSD before 5.2.1" onClick='
+      this.form.useradd.value = "lockf /etc/passwd.lock pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0";
+      this.form.useradd_stdin.value = "$_password\n";
+      this.form.userdel.value = "lockf /etc/passwd.lock pw userdel $username -r"; this.form.userdel_stdin.value="";
+      this.form.usermod.value = "lockf /etc/passwd.lock pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0";
+      this.form.usermod_stdin.value = "$new__password\n"; this.form.suspend.value = "lockf /etc/passwd.lock pw lock $username";
+      this.form.suspend_stdin.value="";
+      this.form.unsuspend.value = "lockf /etc/passwd.lock pw unlock $username"; this.form.unsuspend_stdin.value="";
+    '>
+    Note: On FreeBSD versions before 5.2.1, due to deficient locking in pw(1),
+    you must disable the chpass(1), chsh(1), chfn(1), passwd(1), and vipw(1)
+    commands, or replace them with wrappers that prepend
+    "lockf /etc/passwd.lock".  Alternatively, apply the patch in
+    <A HREF="http://www.freebsd.org/cgi/query-pr.cgi?pr=23501">FreeBSD PR#23501</A>
+    and use the "FreeBSD 5.2.1 or later" button below.
+  <LI>
+    <INPUT TYPE="button" VALUE="FreeBSD 5.2.1 or later" onClick='
+      this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0";
+      this.form.useradd_stdin.value = "$_password\n";
+      this.form.userdel.value = "pw userdel $username -r";
+      this.form.userdel_stdin.value="";
+      this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0";
+      this.form.usermod_stdin.value = "$new__password\n";
+      this.form.suspend.value = "pw lock $username";
+      this.form.suspend_stdin.value="";
+      this.form.unsuspend.value = "pw unlock $username";
+      this.form.unsuspend_stdin.value="";
+    '>
+  <LI>
+    <INPUT TYPE="button" VALUE="NetBSD/OpenBSD" onClick='
+      this.form.useradd.value = "useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username";
+      this.form.useradd_stdin.value = "";
+      this.form.userdel.value = "userdel -r $username";
+      this.form.userdel_stdin.value="";
+      this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username";
+      this.form.usermod_stdin.value = "";
+      this.form.suspend.value = "";
+      this.form.suspend_stdin.value="";
+      this.form.unsuspend.value = "";
+      this.form.unsuspend_stdin.value="";
+    '>
+  <LI>
+    <INPUT TYPE="button" VALUE="Just maintain directories (use with sysvshell or bsdshell)" onClick='
+      this.form.useradd.value = "cp -pr /etc/skel $dir; chown -R $uid.$gid $dir"; this.form.useradd_stdin.value = "";
+      this.form.usermod.value = "[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $new_uid.$new_gid $new_dir; rm -rf $old_dir )";
+      this.form.usermod_stdin.value = "";
+      this.form.userdel.value = "rm -rf $dir";
+      this.form.userdel_stdin.value="";
+      this.form.suspend.value = "";
+      this.form.suspend_stdin.value="";
+      this.form.unsuspend.value = "";
+      this.form.unsuspend_stdin.value="";
+    '>
+</UL>
+
+The following variables are available for interpolation (prefixed with new_ or
+old_ for replace operations):
+<UL>
+  <LI><code>$username</code>
+  <LI><code>$_password</code>
+  <LI><code>$quoted_password</code> - unencrypted password quoted for the shell
+  <LI><code>$crypt_password</code> - encrypted password
+  <LI><code>$uid</code>
+  <LI><code>$gid</code>
+  <LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)
+  <LI><code>$dir</code> - home directory
+  <LI><code>$shell</code>
+  <LI><code>$quota</code>
+  <LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.
+</UL>
+END
+);
+
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
 
 sub rebless { shift; }
@@ -152,3 +302,5 @@ sub ssh_cmd { #subroutine, not method
 #sub shellcommands_delete { #subroutine, not method
 #}
 
+1;
+
diff --git a/FS/FS/part_export/shellcommands_withdomain.pm b/FS/FS/part_export/shellcommands_withdomain.pm
index a15c24d88..9dab281fc 100644
--- a/FS/FS/part_export/shellcommands_withdomain.pm
+++ b/FS/FS/part_export/shellcommands_withdomain.pm
@@ -1,7 +1,92 @@
 package FS::part_export::shellcommands_withdomain;
 
-use vars qw(@ISA);
+use vars qw(@ISA %info);
+use Tie::IxHash;
 use FS::part_export::shellcommands;
 
 @ISA = qw(FS::part_export::shellcommands);
 
+tie my %options, 'Tie::IxHash',
+  'user' => { label=>'Remote username', default=>'root' },
+  'useradd' => { label=>'Insert command',
+                 #default=>''
+               },
+  'useradd_stdin' => { label=>'Insert command STDIN',
+                       type =>'textarea',
+                       #default=>"$_password\n$_password\n",
+                     },
+  'userdel' => { label=>'Delete command',
+                 #default=>'',
+               },
+  'userdel_stdin' => { label=>'Delete command STDIN',
+                       type =>'textarea',
+                       #default=>'',
+                     },
+  'usermod' => { label=>'Modify command',
+                 default=>'',
+               },
+  'usermod_stdin' => { label=>'Modify command STDIN',
+                       type =>'textarea',
+                       #default=>"$_password\n$_password\n",
+                     },
+  'usermod_pwonly' => { label=>'Disallow username changes',
+                        type =>'checkbox',
+                      },
+  'suspend' => { label=>'Suspension command',
+                 default=>'',
+               },
+  'suspend_stdin' => { label=>'Suspension command STDIN',
+                       default=>'',
+                     },
+  'unsuspend' => { label=>'Unsuspension command',
+                   default=>'',
+                 },
+  'unsuspend_stdin' => { label=>'Unsuspension command STDIN',
+                         default=>'',
+                       },
+;
+
+%info = (
+  'svc'     => 'svc_acct',
+  'desc'    => 'Real-time export via remote SSH (vpopmail, etc.)',
+  'options' => \%options,
+  'notes'   => <<'END'
+Run remote commands via SSH.  username@domain (rather than just usernames) are
+considered unique (also see shellcommands).  You probably want this if the
+commands you are running will accept a domain as a parameter, and will allow
+the same username with different domains.  You will need to
+<a href="../docs/ssh.html">setup SSH for unattended operation</a>.
+
+<BR><BR>Use these buttons for some useful presets:
+<UL>
+  <LI><INPUT TYPE="button" VALUE="vpopmail" onClick='
+    this.form.useradd.value = "/home/vpopmail/bin/vadduser $username\\\@$domain $quoted_password";
+    this.form.useradd_stdin.value = "";
+    this.form.userdel.value = "/home/vpopmail/bin/vdeluser $username\\\@$domain"; this.form.userdel_stdin.value="";
+    this.form.usermod.value = "/home/vpopmail/bin/vpasswd $new_username\\\@$new_domain $new_quoted_password";
+    this.form.usermod_stdin.value = "";
+    this.form.usermod_pwonly.checked = true;
+  '>
+</UL>
+
+The following variables are available for interpolation (prefixed with
+<code>new_</code> or <code>old_</code> for replace operations):
+<UL>
+  <LI><code>$username</code>
+  <LI><code>$domain</code>
+  <LI><code>$_password</code>
+  <LI><code>$quoted_password</code> - unencrypted password quoted for the shell
+  <LI><code>$crypt_password</code> - encrypted password
+  <LI><code>$uid</code>
+  <LI><code>$gid</code>
+  <LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)
+  <LI><code>$dir</code> - home directory
+  <LI><code>$shell</code>
+  <LI><code>$quota</code>
+  <LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.
+</UL>
+END
+);
+
+1;
+
diff --git a/FS/FS/part_export/sqlmail.pm b/FS/FS/part_export/sqlmail.pm
index 8ccad3c7e..6d61e0e29 100644
--- a/FS/FS/part_export/sqlmail.pm
+++ b/FS/FS/part_export/sqlmail.pm
@@ -1,6 +1,7 @@
 package FS::part_export::sqlmail;
 
-use vars qw(@ISA);
+use vars qw(@ISA %info);
+use Tie::IxHash;
 use Digest::MD5 qw(md5_hex);
 use FS::Record qw(qsearchs);
 use FS::part_export;
@@ -8,6 +9,41 @@ use FS::svc_domain;
 
 @ISA = qw(FS::part_export);
 
+tie my %options, 'Tie::IxHash',
+  'datasrc'            => { label => 'DBI data source' },
+  'username'           => { label => 'Database username' },
+  'password'           => { label => 'Database password' },
+  'server_type'        => {
+    label   => 'Server type',
+    type    => 'select',
+    options => [qw(dovecot_plain dovecot_crypt dovecot_digest_md5 courier_plain
+                   courier_crypt)],
+    default => ['dovecot_plain'], },
+  'svc_acct_table'     => { label => 'User Table', default => 'user_acct' },
+  'svc_forward_table'  => { label => 'Forward Table', default => 'forward' },
+  'svc_domain_table'   => { label => 'Domain Table', default => 'domain' },
+  'svc_acct_fields'    => { label => 'svc_acct Export Fields',
+                            default => 'username _password domsvc svcnum' },
+  'svc_forward_fields' => { label => 'svc_forward Export Fields',
+                            default => 'domain svcnum catchall' },
+  'svc_domain_fields'  => { label => 'svc_domain Export Fields',
+                            default => 'srcsvc dstsvc dst' },
+  'resolve_dstsvc'     => { label => q{Resolve svc_forward.dstsvc to an email address and store it in dst. (Doesn't require that you also export dstsvc.)},
+                            type => 'checkbox' },
+;
+
+%info = (
+  'svc'      => [qw( svc_acct svc_domain svc_forward )],
+  'desc'     => 'Real-time export to SQL-backed mail server',
+  'options'  => \%options,
+  'nodomain' => '',
+  'notes'    => <<'END'
+Database schema can be made to work with Courier IMAP, Exim and Dovecot.
+Others could work but are untested.  (more detailed description from
+Kristian / fire2wire? )
+END
+);
+
 sub rebless { shift; }
 
 sub _export_insert {
@@ -180,3 +216,5 @@ sub update_values {
 
 }
 
+1;
+
diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index 8a8f9beba..fd5bb89fd 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -1,11 +1,64 @@
 package FS::part_export::sqlradius;
 
-use vars qw(@ISA);
+use vars qw(@ISA %info %options $notes1 $notes2);
+use Tie::IxHash;
 use FS::Record qw( dbh );
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+tie %options, 'Tie::IxHash',
+  'datasrc'  => { label=>'DBI data source ' },
+  'username' => { label=>'Database username' },
+  'password' => { label=>'Database password' },
+  'ignore_accounting' => {
+     type => 'checkbox',
+     label=>'Ignore accounting records from this database'
+  },
+;
+
+$notes1 = <<'END';
+Real-time export of radcheck, radreply and usergroup tables to any SQL database
+for <a href="http://www.freeradius.org/">FreeRADIUS</a>,
+<a href="http://radius.innercite.com/">ICRADIUS</a>
+or <a href="http://www.open.com.au/radiator/">Radiator</a>.  
+END
+
+$notes2 = <<'END';
+An existing RADIUS database will be updated in realtime, but you can use
+<a href="../docs/man/bin/freeside-sqlradius-reset">freeside-sqlradius-reset</a>
+to delete the entire RADIUS database and repopulate the tables from the
+Freeside database.  See the
+<a href="http://search.cpan.org/dist/DBI/DBI.pm#connect">DBI documentation</a>
+and the
+<a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">documentation for your DBD</a>
+for the exact syntax of a DBI data source.
+<ul>
+  <li>Using FreeRADIUS 0.9.0 with the PostgreSQL backend, the db_postgresql.sql schema and postgresql.conf queries contain incompatible changes.  This is fixed in 0.9.1.  Only new installs with 0.9.0 and PostgreSQL are affected - upgrades and other database backends and versions are unaffected.
+  <li>Using ICRADIUS, add a dummy "op" column to your database:
+    <blockquote><code>
+      ALTER&nbsp;TABLE&nbsp;radcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;'=='<br>
+      ALTER&nbsp;TABLE&nbsp;radreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;'=='<br>
+      ALTER&nbsp;TABLE&nbsp;radgroupcheck&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;'=='<br>
+      ALTER&nbsp;TABLE&nbsp;radgroupreply&nbsp;ADD&nbsp;COLUMN&nbsp;op&nbsp;VARCHAR(2)&nbsp;NOT&nbsp;NULL&nbsp;DEFAULT&nbsp;'=='
+    </code></blockquote>
+  <li>Using Radiator, see the
+    <a href="http://www.open.com.au/radiator/faq.html#38">Radiator FAQ</a>
+    for configuration information.
+</ul>
+END
+
+%info = (
+  'svc'      => 'svc_acct',
+  'desc'     => 'Real-time export to SQL-backed RADIUS (FreeRADIUS, ICRADIUS, Radiator)',
+  'options'  => \%options,
+  'nodomain' => 'Y',
+  'notes'    => $notes1.
+                'This export does not export RADIUS realms (see also '.
+                'sqlradius_withdomain).  '.
+                $notes2
+);
+
 sub rebless { shift; }
 
 sub export_username {
@@ -280,3 +333,5 @@ sub sqlradius_connect {
   DBI->connect(@_) or die $DBI::errstr;
 }
 
+1;
+
diff --git a/FS/FS/part_export/sqlradius_withdomain.pm b/FS/FS/part_export/sqlradius_withdomain.pm
index 1c8f38c9d..6130e5eb6 100644
--- a/FS/FS/part_export/sqlradius_withdomain.pm
+++ b/FS/FS/part_export/sqlradius_withdomain.pm
@@ -1,8 +1,22 @@
 package FS::part_export::sqlradius_withdomain;
 
-use vars qw(@ISA);
+use vars qw(@ISA %info);
+use Tie::IxHash;
 use FS::part_export::sqlradius;
 
+tie my %options, 'Tie::IxHash', %FS::part_export::sqlradius::options;
+
+%info = (
+  'svc'      => 'svc_acct',
+  'desc'     => 'Real-time export to SQL-backed RADIUS (FreeRADIUS, ICRADIUS, Radiator) with realms',
+  'options'  => \%options,
+  'nodomain' => '',
+  'notes' => $FS::part_export::sqlradius::notes1.
+             'This export exports domains to RADIUS realms (see also '.
+             'sqlradius).  '.
+             $FS::part_export::sqlradius::notes2
+);
+
 @ISA = qw(FS::part_export::sqlradius);
 
 sub export_username {
@@ -10,3 +24,5 @@ sub export_username {
   $svc_acct->email;
 }
 
+1;
+
diff --git a/FS/FS/part_export/sysvshell.pm b/FS/FS/part_export/sysvshell.pm
index f3f6b34b6..244c3bf82 100644
--- a/FS/FS/part_export/sysvshell.pm
+++ b/FS/FS/part_export/sysvshell.pm
@@ -1,7 +1,25 @@
 package FS::part_export::sysvshell;
 
-use vars qw(@ISA);
-use FS::part_export::null;
+use vars qw(@ISA %info);
+use Tie::IxHash;
+use FS::part_export::passwdfile;
 
-@ISA = qw(FS::part_export::null);
+@ISA = qw(FS::part_export::passwdfile);
+
+tie my %options, 'Tie::IxHash', %FS::part_export::passwdfile::options;
+
+%info = (
+  'svc'      => 'svc_acct',
+  'desc'     =>
+    'Batch export of /etc/passwd and /etc/shadow files (Linux, Solaris)',
+  'options'  => \%options,
+  'nodomain' => 'Y',
+  'notes'    => <<'END'
+MD5 crypt requires installation of
+<a href="http://search.cpan.org/dist/Crypt-PasswdMD5">Crypt::PasswdMD5</a>
+from CPAN.    Run bin/sysvshell.export to export the files.
+END
+);
+
+1;
 
diff --git a/FS/FS/part_export/textradius.pm b/FS/FS/part_export/textradius.pm
index 1492f2672..65936eaf6 100644
--- a/FS/FS/part_export/textradius.pm
+++ b/FS/FS/part_export/textradius.pm
@@ -1,12 +1,35 @@
 package FS::part_export::textradius;
 
-use vars qw(@ISA $prefix);
+use vars qw(@ISA %info $prefix);
 use Fcntl qw(:flock);
+use Tie::IxHash;
 use FS::UID qw(datasrc);
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+tie my %options, 'Tie::IxHash',
+  'user' => { label=>'Remote username', default=>'root' },
+  'users' => { label=>'users file location', default=>'/etc/raddb/users' },
+;
+
+%info = (
+  'svc'     => 'svc_acct',
+  'desc'    =>
+    'Real-time export to a text /etc/raddb/users file (Livingston, Cistron)',
+  'options' => \%options,
+  'notes'   => <<'END'
+This will edit a text RADIUS users file in place on a remote server.
+Requires installation of
+<a href="http://search.cpan.org/dist/RADIUS-UserFile">RADIUS::UserFile</a>
+from CPAN.  If using RADIUS::UserFile 1.01, make sure to apply
+<a href="http://rt.cpan.org/NoAuth/Bug.html?id=1210">this patch</a>.  Also
+make sure <a href="http://rsync.samba.org/">rsync</a> is installed on the
+remote machine, and <a href="../docs/ssh.html">SSH is setup for unattended
+operation</a>.
+END
+);
+
 $prefix = "/usr/local/etc/freeside/export.";
 
 sub rebless { shift; }
@@ -164,3 +187,5 @@ sub textradius_upload {
 
 }
 
+1;
+
diff --git a/FS/FS/part_export/vpopmail.pm b/FS/FS/part_export/vpopmail.pm
index a505a0f47..62fa8bade 100644
--- a/FS/FS/part_export/vpopmail.pm
+++ b/FS/FS/part_export/vpopmail.pm
@@ -1,13 +1,38 @@
 package FS::part_export::vpopmail;
 
-use vars qw(@ISA @saltset $exportdir);
+use vars qw(@ISA %info @saltset $exportdir);
 use Fcntl qw(:flock);
+use Tie::IxHash;
 use File::Path;
 use FS::UID qw( datasrc );
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+tie my %options, 'Tie::IxHash',
+  #'machine' => { label=>'vpopmail machine', },
+  'dir'     => { label=>'directory', }, # ?more info? default?
+  'uid'     => { label=>'vpopmail uid' },
+  'gid'     => { label=>'vpopmail gid' },
+  'restart' => { label=> 'vpopmail restart command',
+                 default=> 'cd /home/vpopmail/domains; for domain in *; do /home/vpopmail/bin/vmkpasswd $domain; done; /var/qmail/bin/qmail-newu; killall -HUP qmail-send',
+               },
+;
+
+%info = (
+  'svc'     => 'svc_acct',
+  'desc'    => 'Real-time export to vpopmail text files',
+  'options' => \%options,
+  'notes'   => <<'END'
+Real time export to <a href="http://inter7.com/vpopmail/">vpopmail</a> text
+files.  <a href="http://search.cpan.org/dist/File-Rsync">File::Rsync</a>
+must be installed, and you will need to
+<a href="../docs/ssh.html">setup SSH for unattended operation</a>
+to <b>vpopmail</b>@<i>export.host</i>.  See shellcommands_withdomain for an
+export that uses vpopmail commands instead.
+END
+);
+
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
 
 sub rebless { shift; }
@@ -223,4 +248,5 @@ sub vpopmail_sync {
   ssh("vpopmail\@$machine", $restart) if $restart;
 }
 
+1;
 
diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index 3e0087446..cc1983bf2 100644
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -1,11 +1,45 @@
 package FS::part_export::www_shellcommands;
 
 use strict;
-use vars qw(@ISA);
+use vars qw(@ISA %info);
+use Tie::IxHash;
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+tie my %options, 'Tie::IxHash',
+  'user' => { label=>'Remote username', default=>'root' },
+  'useradd' => { label=>'Insert command',
+                 default=>'mkdir /var/www/$zone; chown $username /var/www/$zone; ln -s /var/www/$zone $homedir/$zone',
+               },
+  'userdel'  => { label=>'Delete command',
+                  default=>'[ -n &quot;$zone&quot; ] && rm -rf /var/www/$zone; rm $homedir/$zone',
+                },
+  'usermod'  => { label=>'Modify command',
+                  default=>'[ -n &quot;$old_zone&quot; ] && rm $old_homedir/$old_zone; [ &quot;$old_zone&quot; != &quot;$new_zone&quot; -a -n &quot;$new_zone&quot; ] && mv /var/www/$old_zone /var/www/$new_zone; [ &quot;$old_username&quot; != &quot;$new_username&quot; ] && chown -R $new_username /var/www/$new_zone; ln -s /var/www/$new_zone $new_homedir/$new_zone',
+                },
+;
+
+%info = (
+  'svc'     => 'svc_www',
+  'desc'    => 'Run remote commands via SSH, for virtual web sites.',
+  'options' => \%options,
+  'notes'   => <<'END'
+Run remote commands via SSH, for virtual web sites.  You will need to
+<a href="../docs/ssh.html">setup SSH for unattended operation</a>.
+<BR><BR>The following variables are available for interpolation (prefixed with
+<code>new_</code> or <code>old_</code> for replace operations):
+<UL>
+  <LI><code>$zone</code>
+  <LI><code>$username</code>
+  <LI><code>$homedir</code>
+  <LI>All other fields in <a href="../docs/schema.html#svc_www">svc_www</a>
+    are also available.
+</UL>
+END
+);
+
+
 sub rebless { shift; }
 
 sub _export_insert {
-- 
cgit v1.2.1


From a44fcf8b6fb405c09a47de27b32fcb19f121dcae Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Mar 2004 15:38:48 +0000
Subject: catch misconfigured exports

---
 httemplate/edit/part_export.cgi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 4d0c7391f..b3d42bd96 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -46,6 +46,8 @@ my $widget = new HTML::Widgets::SelectLayers(
 
     foreach my $option ( keys %{$exports->{$layer}{options}} ) {
       my $optinfo = $exports->{$layer}{options}{$option};
+      die "Retreived non-ref export info option from $layer export: $optinfo"
+        unless ref($optinfo);
       my $label = $optinfo->{label};
       my $type = defined($optinfo->{type}) ? $optinfo->{type} : 'text';
       my $value = $cgi->param($option)
-- 
cgit v1.2.1


From cb3d16defa2515e178290fad49caaebcd8a05bf6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Mar 2004 06:42:21 +0000
Subject: freebsd fix will be in 5.3 and later only so far, still waiting to
 hear about 4.10

---
 FS/FS/part_export/shellcommands.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index cee54b488..0fc0cc9c6 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -83,7 +83,7 @@ running will not accept a domain as a parameter.  You will need to
       this.form.unsuspend_stdin.value="";
     '>
   <LI>
-    <INPUT TYPE="button" VALUE="FreeBSD before 5.2.1" onClick='
+    <INPUT TYPE="button" VALUE="FreeBSD before 5.3" onClick='
       this.form.useradd.value = "lockf /etc/passwd.lock pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0";
       this.form.useradd_stdin.value = "$_password\n";
       this.form.userdel.value = "lockf /etc/passwd.lock pw userdel $username -r"; this.form.userdel_stdin.value="";
@@ -92,14 +92,14 @@ running will not accept a domain as a parameter.  You will need to
       this.form.suspend_stdin.value="";
       this.form.unsuspend.value = "lockf /etc/passwd.lock pw unlock $username"; this.form.unsuspend_stdin.value="";
     '>
-    Note: On FreeBSD versions before 5.2.1, due to deficient locking in pw(1),
+    Note: On FreeBSD versions before 5.3, due to deficient locking in pw(1),
     you must disable the chpass(1), chsh(1), chfn(1), passwd(1), and vipw(1)
     commands, or replace them with wrappers that prepend
     "lockf /etc/passwd.lock".  Alternatively, apply the patch in
     <A HREF="http://www.freebsd.org/cgi/query-pr.cgi?pr=23501">FreeBSD PR#23501</A>
-    and use the "FreeBSD 5.2.1 or later" button below.
+    and use the "FreeBSD 5.3 or later" button below.
   <LI>
-    <INPUT TYPE="button" VALUE="FreeBSD 5.2.1 or later" onClick='
+    <INPUT TYPE="button" VALUE="FreeBSD 5.3 or later" onClick='
       this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0";
       this.form.useradd_stdin.value = "$_password\n";
       this.form.userdel.value = "pw userdel $username -r";
-- 
cgit v1.2.1


From e53cf6b04ea8c6f10c331d46372c486128478df0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Mar 2004 08:55:09 +0000
Subject: first pass at ISPMan integration

---
 FS/FS/part_export/domain_shellcommands.pm     |  7 ++++++-
 FS/FS/part_export/forward_shellcommands.pm    |  6 ++++++
 FS/FS/part_export/shellcommands.pm            | 10 +++++++++
 FS/FS/part_export/shellcommands_withdomain.pm | 16 ++++++++++++--
 FS/FS/part_export/www_shellcommands.pm        | 30 +++++++++++++++++++++------
 5 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/FS/FS/part_export/domain_shellcommands.pm b/FS/FS/part_export/domain_shellcommands.pm
index d8ae0c376..914589529 100644
--- a/FS/FS/part_export/domain_shellcommands.pm
+++ b/FS/FS/part_export/domain_shellcommands.pm
@@ -22,7 +22,7 @@ tie my %options, 'Tie::IxHash',
 
 %info = (
   'svc'     => 'svc_domain',
-  'desc'    => 'Run remote commands via SSH, for domains.',
+  'desc'    => 'Run remote commands via SSH, for domains (qmail, ISPMan).',
   'options' => \%options,
   'notes'   => <<'END'
 Run remote commands via SSH, for domains.  You will need to
@@ -34,6 +34,11 @@ Run remote commands via SSH, for domains.  You will need to
       this.form.useradd.value = "[ \"$uid\" -a \"$gid\" -a \"$dir\" -a \"$qdomain\" ] && [ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }";
       this.form.userdel.value = "";
       this.form.usermod.value = "";
+  <LI>
+    <INPUT TYPE="button" VALUE="ISPMan CLI" onClick='
+      this.form.useradd.value = "/usr/local/ispman/bin/ispman.addDomain -d $domain changeme";
+      this.form.userdel.value = "/usr/local/ispman/bin/ispman.deleteDomain -d $domain";
+      this.form.usermod.value = "";
     '>
 </UL>
 The following variables are available for interpolation (prefixed with <code>new_</code> or <code>old_</code> for replace operations):
diff --git a/FS/FS/part_export/forward_shellcommands.pm b/FS/FS/part_export/forward_shellcommands.pm
index 6908214d5..fe304350c 100644
--- a/FS/FS/part_export/forward_shellcommands.pm
+++ b/FS/FS/part_export/forward_shellcommands.pm
@@ -35,6 +35,12 @@ Run remote commands via SSH, for forwards.  You will need to
       this.form.userdel.value = "rm /home/vpopmail/domains/$domain/$username/.qmail";
       this.form.usermod.value = "mv /home/vpopmail/domains/$old_domain/$old_username/.qmail /home/vpopmail/domains/$new_domain/$new_username; [ \"$old_destination\" != \"$new_destination\" ] && { echo \"$new_destination\" > /home/vpopmail/domains/$new_domain/$new_username/.qmail; chown vpopmail:vchkpw /home/vpopmail/domains/$new_domain/$new_username/.qmail; }";
     '>
+  <LI>
+    <INPUT TYPE="button" VALUE="ISPMan CLI" onClick='
+      this.form.useradd.value = "";
+      this.form.userdel.value = "";
+      this.form.usermod.value = "";
+    '>
 </UL>
 The following variables are available for interpolation (prefixed with
 <code>new_</code> or <code>old_</code> for replace operations):
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 0fc0cc9c6..1af5bb348 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -148,6 +148,8 @@ old_ for replace operations):
   <LI><code>$uid</code>
   <LI><code>$gid</code>
   <LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)
+  <LI><code>$first</code> - First name of GECOS, already quoted for the shell (do not add additional quotes)
+  <LI><code>$last</code> - Last name of GECOS, already quoted for the shell (do not add additional quotes)
   <LI><code>$dir</code> - home directory
   <LI><code>$shell</code>
   <LI><code>$quota</code>
@@ -206,6 +208,10 @@ sub _export_command {
     $email = '';
   }
 
+  $finger =~ /^(.*)\s+(\S+)$/ or $finger =~ /^((.*))$/;
+  ($first, $last ) = ( $1, $2 );
+  $first = shell_quote $first;
+  $last = shell_quote $last;
   $finger = shell_quote $finger;
   $quoted_password = shell_quote $_password;
   $domain = $svc_acct->domain;
@@ -239,6 +245,10 @@ sub _export_replace {
     ${"old_$_"} = $old->getfield($_) foreach $old->fields;
     ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   }
+  $new_finger =~ /^(.*)\s+(\S+)$/ or $finger =~ /^((.*))$/;
+  ($new_first, $new_last ) = ( $1, $2 );
+  $new_first = shell_quote $new_first;
+  $new_last = shell_quote $new_last;
   $new_finger = shell_quote $new_finger;
   $quoted_new__password = shell_quote $new__password; #old, wrong?
   $new_quoted_password = shell_quote $new__password; #new, better?
diff --git a/FS/FS/part_export/shellcommands_withdomain.pm b/FS/FS/part_export/shellcommands_withdomain.pm
index 9dab281fc..8a56bab1c 100644
--- a/FS/FS/part_export/shellcommands_withdomain.pm
+++ b/FS/FS/part_export/shellcommands_withdomain.pm
@@ -48,7 +48,7 @@ tie my %options, 'Tie::IxHash',
 
 %info = (
   'svc'     => 'svc_acct',
-  'desc'    => 'Real-time export via remote SSH (vpopmail, etc.)',
+  'desc'    => 'Real-time export via remote SSH (vpopmail, ISPMan)',
   'options' => \%options,
   'notes'   => <<'END'
 Run remote commands via SSH.  username@domain (rather than just usernames) are
@@ -62,11 +62,21 @@ the same username with different domains.  You will need to
   <LI><INPUT TYPE="button" VALUE="vpopmail" onClick='
     this.form.useradd.value = "/home/vpopmail/bin/vadduser $username\\\@$domain $quoted_password";
     this.form.useradd_stdin.value = "";
-    this.form.userdel.value = "/home/vpopmail/bin/vdeluser $username\\\@$domain"; this.form.userdel_stdin.value="";
+    this.form.userdel.value = "/home/vpopmail/bin/vdeluser $username\\\@$domain";
+    this.form.userdel_stdin.value="";
     this.form.usermod.value = "/home/vpopmail/bin/vpasswd $new_username\\\@$new_domain $new_quoted_password";
     this.form.usermod_stdin.value = "";
     this.form.usermod_pwonly.checked = true;
   '>
+  <LI><INPUT TYPE="button" VALUE="ISPMan CLI" onClick='
+    this.form.useradd.value = "/usr/local/ispman/bin/ispman.addUser -d $domain -f $first -l $last -q $quota -p $quoted_password $username";
+    this.form.useradd_stdin.value = "";
+    this.form.userdel.value = "/usr/local/ispman/bin/ispman.delUser -d $domain $username";
+    this.form.userdel_stdin.value="";
+    this.form.usermod.value = "/usr/local/ispman/bin/ispman.passwd.user $username\\\@$domain $new_quoted_password";
+    this.form.usermod_stdin.value = "";
+    this.form.usermod_pwonly.checked = true;
+  '>
 </UL>
 
 The following variables are available for interpolation (prefixed with
@@ -80,6 +90,8 @@ The following variables are available for interpolation (prefixed with
   <LI><code>$uid</code>
   <LI><code>$gid</code>
   <LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)
+  <LI><code>$first</code> - First name of GECOS, already quoted for the shell (do not add additional quotes)
+  <LI><code>$last</code> - Last name of GECOS, already quoted for the shell (do not add additional quotes)
   <LI><code>$dir</code> - home directory
   <LI><code>$shell</code>
   <LI><code>$quota</code>
diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index cc1983bf2..a272edab0 100644
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -27,10 +27,28 @@ tie my %options, 'Tie::IxHash',
   'notes'   => <<'END'
 Run remote commands via SSH, for virtual web sites.  You will need to
 <a href="../docs/ssh.html">setup SSH for unattended operation</a>.
-<BR><BR>The following variables are available for interpolation (prefixed with
+<BR><BR>Use these buttons for some useful presets:
+<UL>
+  <LI>
+    <INPUT TYPE="button" VALUE="Maintain directories" onClick'
+      this.form.user.value = "root";
+      this.form.useradd.value = "mkdir /var/www/$zone; chown $username /var/www/$zone; ln -s /var/www/$zone $homedir/$zone";
+      this.form.userdel.value = "[ -n &quot;$zone&quot; ] && rm -rf /var/www/$zone; rm $homedir/$zone";
+      this.form.usermod.value = "[ -n &quot;$old_zone&quot; ] && rm $old_homedir/$old_zone; [ &quot;$old_zone&quot; != &quot;$new_zone&quot; -a -n &quot;$new_zone&quot; ] && mv /var/www/$old_zone /var/www/$new_zone; [ &quot;$old_username&quot; != &quot;$new_username&quot; ] && chown -R $new_username /var/www/$new_zone; ln -s /var/www/$new_zone $new_homedir/$new_zone";
+    '>
+  <LI>
+    <INPUT TYPE="button" VALUE="ISPMan CLI" onClick'
+      this.form.user.value = "root";
+      this.form.useradd.value = "/usr/local/ispman/ispman.addvhost -d $domain $zone";
+      this.form.userdel.value = "/usr/local/ispman/idpman.deletevhost -d $domain $zone";
+      this.form.usermod.value = "";
+    '>
+</UL>
+The following variables are available for interpolation (prefixed with
 <code>new_</code> or <code>old_</code> for replace operations):
 <UL>
-  <LI><code>$zone</code>
+  <LI><code>$zone</code> - fully-qualified zone of this virtual host
+  <LI><code>$domain</code> - base domain
   <LI><code>$username</code>
   <LI><code>$homedir</code>
   <LI>All other fields in <a href="../docs/schema.html#svc_www">svc_www</a>
@@ -64,6 +82,7 @@ sub _export_command {
   }
   my $domain_record = $svc_www->domain_record; # or die ?
   my $zone = $domain_record->zone; # or die ?
+  my $domain = $domain_record->svc_domain->domain;
   my $svc_acct = $svc_www->svc_acct; # or die ?
   my $username = $svc_acct->username;
   my $homedir = $svc_acct->dir; # or die ?
@@ -90,10 +109,8 @@ sub _export_replace {
   }
   my $old_domain_record = $old->domain_record; # or die ?
   my $old_zone = $old_domain_record->reczone; # or die ?
-  unless ( $old_zone =~ /\.$/ ) {
-    my $old_svc_domain = $old_domain_record->svc_domain; # or die ?
-    $old_zone .= '.'. $old_svc_domain->domain;
-  }
+  my $old_domain = $old_domain_record->svc_domain->domain;
+  $old_zone .= ".$old_domain" unless $old_zone =~ /\.$/;
 
   my $old_svc_acct = $old->svc_acct; # or die ?
   my $old_username = $old_svc_acct->username;
@@ -101,6 +118,7 @@ sub _export_replace {
 
   my $new_domain_record = $new->domain_record; # or die ?
   my $new_zone = $new_domain_record->reczone; # or die ?
+  my $new_domain = $new_domain_record->svc_domain->domain;
   unless ( $new_zone =~ /\.$/ ) {
     my $new_svc_domain = $new_domain_record->svc_domain; # or die ?
     $new_zone .= '.'. $new_svc_domain->domain;
-- 
cgit v1.2.1


From 6464c76c549ba420f98e67aaca1c26327a8a2671 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Mar 2004 11:02:31 +0000
Subject: typo from refactoring

---
 FS/FS/part_export/domain_shellcommands.pm | 1 +
 FS/FS/part_export/www_shellcommands.pm    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/domain_shellcommands.pm b/FS/FS/part_export/domain_shellcommands.pm
index 914589529..0ba561711 100644
--- a/FS/FS/part_export/domain_shellcommands.pm
+++ b/FS/FS/part_export/domain_shellcommands.pm
@@ -34,6 +34,7 @@ Run remote commands via SSH, for domains.  You will need to
       this.form.useradd.value = "[ \"$uid\" -a \"$gid\" -a \"$dir\" -a \"$qdomain\" ] && [ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }";
       this.form.userdel.value = "";
       this.form.usermod.value = "";
+    '>
   <LI>
     <INPUT TYPE="button" VALUE="ISPMan CLI" onClick='
       this.form.useradd.value = "/usr/local/ispman/bin/ispman.addDomain -d $domain changeme";
diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index a272edab0..e90120ec9 100644
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -30,14 +30,14 @@ Run remote commands via SSH, for virtual web sites.  You will need to
 <BR><BR>Use these buttons for some useful presets:
 <UL>
   <LI>
-    <INPUT TYPE="button" VALUE="Maintain directories" onClick'
+    <INPUT TYPE="button" VALUE="Maintain directories" onClick='
       this.form.user.value = "root";
       this.form.useradd.value = "mkdir /var/www/$zone; chown $username /var/www/$zone; ln -s /var/www/$zone $homedir/$zone";
       this.form.userdel.value = "[ -n &quot;$zone&quot; ] && rm -rf /var/www/$zone; rm $homedir/$zone";
       this.form.usermod.value = "[ -n &quot;$old_zone&quot; ] && rm $old_homedir/$old_zone; [ &quot;$old_zone&quot; != &quot;$new_zone&quot; -a -n &quot;$new_zone&quot; ] && mv /var/www/$old_zone /var/www/$new_zone; [ &quot;$old_username&quot; != &quot;$new_username&quot; ] && chown -R $new_username /var/www/$new_zone; ln -s /var/www/$new_zone $new_homedir/$new_zone";
     '>
   <LI>
-    <INPUT TYPE="button" VALUE="ISPMan CLI" onClick'
+    <INPUT TYPE="button" VALUE="ISPMan CLI" onClick='
       this.form.user.value = "root";
       this.form.useradd.value = "/usr/local/ispman/ispman.addvhost -d $domain $zone";
       this.form.userdel.value = "/usr/local/ispman/idpman.deletevhost -d $domain $zone";
-- 
cgit v1.2.1


From af21dde2210a7584837d9bcc6bb8a43599a9b768 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Mar 2004 04:46:54 +0000
Subject: don't depend on Net::Telnet unless necessary

---
 FS/FS/part_export/router.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/router.pm b/FS/FS/part_export/router.pm
index e2cde53d4..648a4372b 100644
--- a/FS/FS/part_export/router.pm
+++ b/FS/FS/part_export/router.pm
@@ -55,7 +55,7 @@ tie my %options, 'Tie::IxHash',
   'svc'     => 'svc_broadband',
   'desc'    => 'Send a command to a router.',
   'options' => \%options,
-  'notes'   => '( more detailed description from Kristian / fire2wire? )',
+  'notes'   => 'Installation of Net::Telnet from CPAN is required for telnet connections.  ( more detailed description from Kristian / fire2wire? )',
 );
 
 @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
@@ -164,7 +164,8 @@ sub ssh_cmd { #subroutine, not method
 }
 
 sub telnet_cmd {
-  use Net::Telnet;
+  eval 'use Net::Telnet;';
+  die $@ if $@;
 
   warn join(', ', @_);
 
-- 
cgit v1.2.1


From 6004e9f3ed07a72f6a4c0f24e326b89acc859a45 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Mar 2004 04:54:47 +0000
Subject: depend on Storable 2.09

---
 fs_selfservice/FS-SelfService/Makefile.PL | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs_selfservice/FS-SelfService/Makefile.PL b/fs_selfservice/FS-SelfService/Makefile.PL
index e5cbd1aef..a14580eb2 100644
--- a/fs_selfservice/FS-SelfService/Makefile.PL
+++ b/fs_selfservice/FS-SelfService/Makefile.PL
@@ -4,12 +4,14 @@ use ExtUtils::MakeMaker;
 WriteMakefile(
     'NAME'		=> 'FS::SelfService',
     'VERSION_FROM'	=> 'SelfService.pm', # finds $VERSION
-    'EXE_FILES'         => [ 'freeside-selfservice-clientd' ],
+    'EXE_FILES'         => [ 'freeside-selfservice-clientd',
+                             'freeside-selfservice-xmlrpc-server',
+                           ],
     'INSTALLSCRIPT'     => '/usr/local/sbin',
     'INSTALLSITEBIN'    => '/usr/local/sbin',
     'PERM_RWX'          => '750',
     'PREREQ_PM'		=> {
-                             'Storable' => 0,
+                             'Storable' => 2.09,
                            }, # e.g., Module::Name => 1.1
     ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
       (ABSTRACT_FROM => 'SelfService.pm', # retrieve abstract from module
-- 
cgit v1.2.1


From 6af03ca1ad3c06aa1e7affb634bb0640b139dd6d Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Sat, 27 Mar 2004 01:05:33 +0000
Subject: Cancel services in a particular order to get around certain
 inter-service dependancies

---
 FS/FS/Conf.pm       |  6 ++++++
 FS/FS/cust_pkg.pm   | 28 +++++++++++++++++++++-------
 FS/FS/svc_acct.pm   | 30 ++++++++++++++++++++++++++++--
 FS/FS/svc_domain.pm |  2 ++
 4 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index ecd2a9790..e6a970c97 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1171,6 +1171,12 @@ httemplate/docs/config.html
     'description' => 'Allow negative charges.  Normally not used unless importing data from a legacy system that requires this.',
     'type'        => 'checkbox',
   },
+  {
+      'key'         => 'auto_unset_catchall',
+      'section'     => '',
+      'description' => 'When canceling a svc_acct that is the email catchall for one or more svc_domains, automatically set their catchall fields to null.  If this option is not set, the attempt will simply fail.',
+      'type'        => 'checkbox',
+  },
 
   {
     'key'         => 'system_usernames',
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index d60e95b78..ccd73acc8 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1,7 +1,7 @@
 package FS::cust_pkg;
 
 use strict;
-use vars qw(@ISA $disable_agentcheck $DEBUG);
+use vars qw(@ISA $disable_agentcheck @SVCDB_CANCEL_SEQ $DEBUG);
 use FS::UID qw( getotaker dbh );
 use FS::Record qw( qsearch qsearchs );
 use FS::Misc qw( send_email );
@@ -29,6 +29,14 @@ $DEBUG = 0;
 
 $disable_agentcheck = 0;
 
+# The order in which to unprovision services.
+@SVCDB_CANCEL_SEQ = qw( svc_external
+			svc_www
+			svc_forward 
+			svc_acct 
+			svc_domain 
+			svc_broadband );
+
 sub _cache {
   my $self = shift;
   my ( $hashref, $cache ) = @_;
@@ -284,16 +292,22 @@ sub cancel {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
+  my %svc;
   foreach my $cust_svc (
-    qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum } )
+      qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum } )
   ) {
-    my $error = $cust_svc->cancel;
+    push @{ $svc{$cust_svc->part_svc->svcdb} }, $cust_svc;
+  }
 
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "Error cancelling cust_svc: $error";
-    }
+  foreach my $svcdb (@SVCDB_CANCEL_SEQ) {
+    foreach my $cust_svc (@{ $svc{$svcdb} }) {
+      my $error = $cust_svc->cancel;
 
+      if ( $error ) {
+	$dbh->rollback if $oldAutoCommit;
+	return "Error cancelling cust_svc: $error";
+      }
+    }
   }
 
   unless ( $self->getfield('cancel') ) {
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 4ea52520c..100af6cb6 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -674,10 +674,36 @@ sub unsuspend {
 
 =item cancel
 
-Just returns false (no error) for now.
-
 Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
 
+If the B<auto_unset_catchall> configuration option is set, this method will
+automatically remove any references to the canceled service in the catchall
+field of svc_domain.  This allows packages that contain both a svc_domain and
+its catchall svc_acct to be canceled in one step.
+
+=cut
+
+sub cancel {
+  # Only one thing to do at this level
+  my $self = shift;
+  foreach my $svc_domain (
+      qsearch( 'svc_domain', { catchall => $self->svcnum } ) ) {
+    if($conf->exists('auto_unset_catchall')) {
+      my %hash = $svc_domain->hash;
+      $hash{catchall} = '';
+      my $new = new FS::svc_domain ( \%hash );
+      my $error = $new->replace($svc_domain);
+      return $error if $error;
+    } else {
+      return "cannot unprovision svc_acct #".$self->svcnum.
+	  " while assigned as catchall for svc_domain #".$svc_domain->svcnum;
+    }
+  }
+
+  $self->SUPER::cancel;
+}
+
+
 =item check
 
 Checks all fields to make sure this is a valid service.  If there is an error,
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index c88b3e668..4dd6342c7 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -256,6 +256,8 @@ sub replace {
   return "Can't change domain - reorder."
     if $old->getfield('domain') ne $new->getfield('domain'); 
 
+  # Better to do it here than to force the caller to remember that svc_domain is weird.
+  $new->setfield(action => 'M');
   my $error = $new->SUPER::replace($old);
   return $error if $error;
 }
-- 
cgit v1.2.1


From 0a49e67bc01107bc9c57bc16dd8f906184cf349b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Mar 2004 06:03:21 +0000
Subject: fix export_info sub to return an empty hashref instead of undef

---
 FS/FS/part_export.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 061f07d28..bd12389c2 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -513,7 +513,7 @@ on the export:
 
 sub export_info {
   #warn $_[0];
-  return $exports{$_[0]} if @_;
+  return $exports{$_[0]} || {} if @_;
   #{ map { %{$exports{$_}} } keys %exports };
   my $r = { map { %{$exports{$_}} } keys %exports };
 }
-- 
cgit v1.2.1


From 6d2919c41c3f360f4e5b683c699f78ba42f30f49 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Mar 2004 21:49:09 +0000
Subject: freebsd pw(1) fixed in 4.10 also

---
 FS/FS/part_export/shellcommands.pm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 1af5bb348..78f9e9690 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -83,7 +83,7 @@ running will not accept a domain as a parameter.  You will need to
       this.form.unsuspend_stdin.value="";
     '>
   <LI>
-    <INPUT TYPE="button" VALUE="FreeBSD before 5.3" onClick='
+    <INPUT TYPE="button" VALUE="FreeBSD before 4.10 / 5.3" onClick='
       this.form.useradd.value = "lockf /etc/passwd.lock pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0";
       this.form.useradd_stdin.value = "$_password\n";
       this.form.userdel.value = "lockf /etc/passwd.lock pw userdel $username -r"; this.form.userdel_stdin.value="";
@@ -92,14 +92,15 @@ running will not accept a domain as a parameter.  You will need to
       this.form.suspend_stdin.value="";
       this.form.unsuspend.value = "lockf /etc/passwd.lock pw unlock $username"; this.form.unsuspend_stdin.value="";
     '>
-    Note: On FreeBSD versions before 5.3, due to deficient locking in pw(1),
-    you must disable the chpass(1), chsh(1), chfn(1), passwd(1), and vipw(1)
-    commands, or replace them with wrappers that prepend
-    "lockf /etc/passwd.lock".  Alternatively, apply the patch in
+    Note: On FreeBSD versions before 5.3 and 4.10 (4.10 is after 4.9, not
+    4.1!), due to deficient locking in pw(1), you must disable the chpass(1),
+    chsh(1), chfn(1), passwd(1), and vipw(1) commands, or replace them with
+    wrappers that prepend "lockf /etc/passwd.lock".  Alternatively, apply the
+    patch in
     <A HREF="http://www.freebsd.org/cgi/query-pr.cgi?pr=23501">FreeBSD PR#23501</A>
-    and use the "FreeBSD 5.3 or later" button below.
+    and use the "FreeBSD 4.10 / 5.3 or later" button below.
   <LI>
-    <INPUT TYPE="button" VALUE="FreeBSD 5.3 or later" onClick='
+    <INPUT TYPE="button" VALUE="FreeBSD 4.10 / 5.3 or later" onClick='
       this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0";
       this.form.useradd_stdin.value = "$_password\n";
       this.form.userdel.value = "pw userdel $username -r";
-- 
cgit v1.2.1


From 5cd22361d181a4420000a22ee3782ae1104fceef Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Mar 2004 09:20:29 +0000
Subject: add -s and -c flags, add ipv6 default zones to list of ignored zones,
 add nameservice records to existing domains, update for API change
 inDNS::ZoneParse 0.84

---
 bin/bind.import | 58 +++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 18 deletions(-)

diff --git a/bin/bind.import b/bin/bind.import
index 3287b0183..41313fba6 100755
--- a/bin/bind.import
+++ b/bin/bind.import
@@ -1,11 +1,16 @@
 #!/usr/bin/perl -w
 #
-# $Id: bind.import,v 1.4 2004-02-12 10:44:11 ivan Exp $
-
-#need to manually put header in /usr/local/etc/freeside/export.<datasrc./bind/<machine>/named.conf.HEADER
+# -s: import slave zones as master.  useful if you need to recreate your
+#     primary nameserver from a secondary
+# -c chroot_dir: import data from chrooted bind (corrects the path for
+#                downloading zone files
+#
+# need to manually put header in
+#  /usr/local/etc/freeside/export.<datasrc./bind/<machine>/named.conf.HEADER
 
 use strict;
 use vars qw( %d_part_svc );
+use Getopt::Std;
 use Term::Query qw(query);
 #use BIND::Conf_Parser;
 #use DNS::ZoneParse 0.81;
@@ -20,6 +25,9 @@ use FS::domain_record;
 #use FS::svc_acct;
 #use FS::part_svc;
 
+use vars qw($opt_s $opt_c);
+getopts("sc:");
+
 my $user = shift or die &usage;
 adminsuidsetup $user;
 
@@ -99,18 +107,28 @@ BEGIN {
   sub handle_zone {
     my($self, $name, $class, $type, $options) = @_;
     return unless $class eq 'in';
-    return if grep { $name eq $_ }
-      ( qw( . localhost 127.in-addr.arpa 0.in-addr.arpa 255.in-addr.arpa ) );
-
-    my $domain = new FS::svc_domain( {
-      svcpart => $main::domain_svcpart,
-      domain  => $name,
-      action  => 'N',
-    } );
-    my $error = $domain->insert;
-    die $error if $error;
+    return if grep { $name eq $_ } (qw(
+      . localhost 127.in-addr.arpa 0.in-addr.arpa 255.in-addr.arpa
+      0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa
+      0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.int
+    ));
+
+    use FS::Record qw(qsearchs);
+    use FS::svc_domain;
+
+    my $domain =
+      qsearchs('svc_domain', { 'domain' => $name } )
+      || new FS::svc_domain( {
+                               svcpart => $main::domain_svcpart,
+                               domain  => $name,
+                               action  => 'N',
+                           } );
+    unless ( $domain->svcnum ) {
+      my $error = $domain->insert;
+      die $error if $error;
+    }
 
-    if ( $type eq 'slave' ) {
+    if ( $type eq 'slave' && !$main::opt_s ) {
 
       #use Data::Dumper;
       #print Dumper($options);
@@ -128,7 +146,7 @@ BEGIN {
         die $error if $error;
       }
 
-    } elsif ( $type eq 'master' ) {
+    } elsif ( $type eq 'master' || ( $type eq 'slave' && $main::opt_s ) ) {
 
       my $file = $options->{file};
   
@@ -136,14 +154,16 @@ BEGIN {
       my $basefile = basename($file);
       my $sourcefile = $file;
       $sourcefile = "$named_dir/$sourcefile" unless $file =~ /^\//;
+      $sourcefile = "$main::opt_c/$sourcefile" if $main::opt_c;
+
       use Net::SCP qw(iscp scp);
       scp("root\@$main::named_machine:$sourcefile",
-          "$main::prefix/$basefile.import");
+           "$main::prefix/$basefile.import");
     
-      use DNS::ZoneParse 0.81;
+      use DNS::ZoneParse 0.84;
       my $zone = DNS::ZoneParse->new("$main::prefix/$basefile.import");
     
-      my $dump = $zone->Dump;
+      my $dump = $zone->dump;
   
       #use Data::Dumper;
       #print "$name: ". Dumper($dump);
@@ -183,6 +203,8 @@ BEGIN {
         }
       }
 
+    #} else {
+    #  die "unrecognized type $type\n";
     }
     
   }
-- 
cgit v1.2.1


From dfcd6c6b704b9d1b5422bb0e8a7caf03639679f2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Mar 2004 16:43:52 +0000
Subject: mutex the bill and collect functions per-customer

---
 FS/FS/cust_main.pm | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 59e357055..74015de34 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1098,6 +1098,8 @@ sub bill {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
+  $self->select_for_update; #mutex
+
   # find the packages which are due for billing, find out how much they are
   # & generate invoice database.
  
@@ -1499,6 +1501,8 @@ sub collect {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
+  $self->select_for_update; #mutex
+
   my $balance = $self->balance;
   warn "collect customer". $self->custnum. ": balance $balance" if $DEBUG;
   unless ( $balance > 0 ) { #redundant?????
@@ -1875,15 +1879,19 @@ sub realtime_bop {
     } );
     my $error = $cust_pay->insert;
     if ( $error ) {
-      # gah, even with transactions.
-      my $e = 'WARNING: Card/ACH debited but database not updated - '.
-              'error applying payment, invnum #' . $self->invnum.
-              " ($processor): $error";
-      warn $e;
-      return $e;
-    } else {
-      return '';
+      $cust_pay->invnum(''); #try again with no specific invnum
+      my $error2 = $cust_pay->insert;
+      if ( $error2 ) {
+        # gah, even with transactions.
+        my $e = 'WARNING: Card/ACH debited but database not updated - '.
+                "error inserting payment ($processor): $error2".
+                " (previously tried insert with invnum #$options{'invnum'}" .
+                ": $error )";
+        warn $e;
+        return $e;
+      }
     }
+    return ''; #no error
 
   } else {
 
@@ -2473,6 +2481,18 @@ sub cust_refund {
     qsearch( 'cust_refund', { 'custnum' => $self->custnum } )
 }
 
+=item select_for_update
+
+Selects this record with the SQL "FOR UPDATE" command.  This can be useful as
+a mutex.
+
+=cut
+
+sub select_for_update {
+  my $self = shift;
+  qsearch('cust_main', { 'custnum' => $self->custnum }, '*', 'FOR UPDATE' );
+}
+
 =back
 
 =head1 SUBROUTINES
-- 
cgit v1.2.1


From 4b157c989b4089b49f42fa5c5bbb9969f2064caa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Mar 2004 17:13:01 +0000
Subject: little more explanation about editing Pg dumps

---
 httemplate/docs/upgrade10.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 14e308544..205866e73 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -188,12 +188,12 @@ UPDATE pg_attribute SET attnotnull = FALSE WHERE ( attname = 'srcsvc' OR attname
 
 If you created your database with a version before 1.4.2, dump database, edit:
 - cust_main and h_cust_main: increase otaker from 8 to 32
-- cust_main and h_cust_main: change ss from char(11) to varchar(11)
+- cust_main and h_cust_main: change ss from char(11) to varchar(11) ( "character(11)" to "character varying(11)" )
 - cust_credit and h_cust_credit: increase otaker from 8 to 32
 - cust_pkg and h_cust_pkg: increase otaker from 8 to 32
 - cust_refund and h_cust_refund: increase otaker from 8 to 32
 - domain_record and h_domain_record: increase reczone from 80 to 255
-- domain_record and h_domain_record: change rectype from char to varchar
+- domain_record and h_domain_record: change rectype from char to varchar ( "character(5)" to "character varying(5)" )
 - domain_record and h_domain_record: increase recdata from 80 to 255
 then reload
 
-- 
cgit v1.2.1


From db1025e6dcb7b5d68c08a455db0b0326bf8ecc62 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 1 Apr 2004 00:44:33 +0000
Subject: get sub-countries from Locale::SubCountry now

---
 FS/FS/cust_main_county.pm |  2 +-
 FS/bin/freeside-setup     | 82 ++++++++++++++++++-----------------------------
 2 files changed, 33 insertions(+), 51 deletions(-)

diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index 76c982ae8..ef2793ad1 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -110,7 +110,7 @@ sub check {
   $self->exempt_amount(0) unless $self->exempt_amount;
 
   $self->ut_numbern('taxnum')
-    || $self->ut_textn('state')
+    || $self->ut_anything('state')
     || $self->ut_textn('county')
     || $self->ut_text('country')
     || $self->ut_float('tax')
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 7512cc18c..522c0a1a2 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -6,6 +6,8 @@ BEGIN { $FS::Record::setup_hack = 1; }
 use strict;
 use vars qw($opt_s);
 use Getopt::Std;
+use Locale::Country;
+use Locale::SubCountry;
 use DBI;
 use DBIx::DBSchema 0.21;
 use DBIx::DBSchema::Table;
@@ -230,60 +232,40 @@ foreach my $statement ( $dbdef->sql($dbh) ) {
     or die "CREATE error: ". $dbh->errstr. "\ndoing statement: $statement";
 }
 
-#not really sample data (and shouldn't default to US)
-
 #cust_main_county
+foreach my $country ( sort map uc($_), all_country_codes ) {
 
-#USPS state codes
-foreach ( qw(
-AL AK AS AZ AR CA CO CT DC DE FM FL GA GU HI ID IL IN IA KS KY LA
-ME MH MD MA MI MN MS MO MT NC ND NE NH NJ NM NV NY MP OH OK OR PA PW PR RI 
-SC SD TN TX UT VT VI VA WA WV WI WY AE AA AP
-) ) {
-  my($cust_main_county)=new FS::cust_main_county({
-    'state' => $_,
-    'tax'   => 0,
-    'country' => 'US',
-  });  
-  my($error);
-  $error=$cust_main_county->insert;
-  die $error if $error;
-}
+  my $subcountry = eval { new Locale::SubCountry($country) };
+  my @states = $subcountry ? $subcountry->all_codes : undef;
 
-#AU "offical" state codes ala mark.williamson@ebbs.com.au (Mark Williamson)
-foreach ( qw(
-VIC NSW NT QLD TAS ACT WA SA
-) ) {
-  my($cust_main_county)=new FS::cust_main_county({
-    'state' => $_,
-    'tax'   => 0,
-    'country' => 'AU',
-  });  
-  my($error);
-  $error=$cust_main_county->insert;
-  die $error if $error;
-}
+  if ( !scalar(@states) || ( scalar(@states) == 1 && !defined($states[0]) ) ) {
 
-#ISO 2-letter country codes (same as country TLDs) except US and AU
-foreach ( qw(
-AF AL DZ AS AD AO AI AQ AG AR AM AW AT AZ BS BH BD BB BY BE BZ BJ BM BT BO
-BA BW BV BR IO BN BG BF BI KH CM CA CV KY CF TD CL CN CX CC CO KM CG CK CR CI
-HR CU CY CZ DK DJ DM DO TP EC EG SV GQ ER EE ET FK FO FJ FI FR FX GF PF TF GA
-GM GE DE GH GI GR GL GD GP GU GT GN GW GY HT HM HN HK HU IS IN ID IR IQ IE IL
-IT JM JP JO KZ KE KI KP KR KW KG LA LV LB LS LR LY LI LT LU MO MK MG MW MY MV
-ML MT MH MQ MR MU YT MX FM MD MC MN MS MA MZ MM NA NR NP NL AN NC NZ NI NE NG
-NU NF MP NO OM PK PW PA PG PY PE PH PN PL PT PR QA RE RO RU RW KN LC VC WS SM
-ST SA SN SC SL SG SK SI SB SO ZA GS ES LK SH PM SD SR SJ SZ SE CH SY TW TJ TZ
-TH TG TK TO TT TN TR TM TC TV UG UA AE GB UM UY UZ VU VA VE VN VG VI WF EH
-YE YU ZR ZM ZW
-) ) {
-  my($cust_main_county)=new FS::cust_main_county({
-    'tax'   => 0,
-    'country' => $_,
-  });  
-  my($error);
-  $error=$cust_main_county->insert;
-  die $error if $error;
+    my $cust_main_county = new FS::cust_main_county({
+      'tax'   => 0,
+      'country' => $country,
+    });  
+    my $error = $cust_main_county->insert;
+    die $error if $error;
+
+  } else {
+
+    if ( $states[0] =~ /^(\d+|\w)$/ ) {
+      @states = map $subcountry->full_name($_), @states
+    }
+
+    foreach my $state ( @states ) {
+
+      my $cust_main_county = new FS::cust_main_county({
+        'state' => $state,
+        'tax'   => 0,
+        'country' => $country,
+      });  
+      my $error = $cust_main_county->insert;
+      die $error if $error;
+
+    }
+  
+  }
 }
 
 #billing events
-- 
cgit v1.2.1


From 68d86148eadaadb6706b91df58d7b505269b1cdf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 1 Apr 2004 10:56:31 +0000
Subject: add a yesterday column and a total row, closes: Bug#797

---
 httemplate/browse/part_referral.cgi | 60 +++++++++++++++++++++++++++++--------
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index 3f59abcf5..a326bd231 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -10,31 +10,46 @@ Where a customer heard about your service. Tracked for informational purposes.
 
 <%
   my $today = timelocal(0, 0, 0, (localtime(time))[3..5] );
-  my %past;
-  tie %past, 'Tie::IxHash',
+  my %after;
+  tie %after, 'Tie::IxHash',
     'Today'         =>        0,
+    'Yesterday'     =>    86400, # 60sec * 60min * 24hrs
     'Past week'     =>   518400, # 60sec * 60min * 24hrs * 6days
     'Past 30 days'  =>  2505600, # 60sec * 60min * 24hrs * 29days 
-    'Past 60 days'  =>  5097600, # 60sec * 60min * 24hrs * 29days 
-    'Past 90 days'  =>  7689600, # 60sec * 60min * 24hrs * 29days 
+    'Past 60 days'  =>  5097600, # 60sec * 60min * 24hrs * 59days 
+    'Past 90 days'  =>  7689600, # 60sec * 60min * 24hrs * 89days 
     'Past 6 months' => 15724800, # 60sec * 60min * 24hrs * 182days 
     'Past year'     => 31486000, # 60sec * 60min * 24hrs * 364days 
     'Total'         => $today,
   ;
+  my %before = (
+    'Today'         =>   86400, # 60sec * 60min * 24hrs
+    'Yesterday'     =>       0,
+    'Past week'     =>   86400, # 60sec * 60min * 24hrs
+    'Past 30 days'  =>   86400, # 60sec * 60min * 24hrs
+    'Past 60 days'  =>   86400, # 60sec * 60min * 24hrs
+    'Past 90 days'  =>   86400, # 60sec * 60min * 24hrs
+    'Past 6 months' =>   86400, # 60sec * 60min * 24hrs
+    'Past year'     =>   86400, # 60sec * 60min * 24hrs
+    'Total'         =>   86400, # 60sec * 60min * 24hrs
+  );
 
-  my $sth = dbh->prepare("SELECT COUNT(*) FROM h_cust_main
-                            WHERE history_action = 'insert'
-                              AND refnum = ?
-                              AND history_date > ?         ")
+  my $statement = "SELECT COUNT(*) FROM h_cust_main
+                    WHERE history_action = 'insert'
+                      AND refnum = ?
+                      AND history_date >= ?
+		      AND history_date < ?
+		  ";
+  my $sth = dbh->prepare($statement)
     or die dbh->errstr;
 %>
 
 <%= table() %>
 <TR>
   <TH COLSPAN=2 ROWSPAN=2>Advertising source</TH>
-  <TH COLSPAN=<%= scalar(keys %past) %>>Customers</TH>
+  <TH COLSPAN=<%= scalar(keys %after) %>>Customers</TH>
 </TR>
-<% for my $period ( keys %past ) { %>
+<% for my $period ( keys %after ) { %>
   <TH><FONT SIZE=-1><%= $period %></FONT></TH>
 <% } %>
 </TR>
@@ -49,9 +64,11 @@ foreach my $part_referral ( sort {
           <%= $part_referral->refnum %></A></TD>
         <TD><A HREF="<%= $p %>edit/part_referral.cgi?<%= $part_referral->refnum %>">
           <%= $part_referral->referral %></A></TD>
-        <% for my $period ( values %past ) {
-          $sth->execute($part_referral->refnum, $today-$period)
-            or die $sth->errstr;
+        <% for my $after ( values %after ) {
+          $sth->execute( $part_referral->refnum,
+                         $today-$after,
+                         $today+$before{$today},
+          ) or die $sth->errstr;
           my $number = $sth->fetchrow_arrayref->[0];
         %>
           <TD ALIGN="right"><%= $number %></TD>
@@ -59,6 +76,23 @@ foreach my $part_referral ( sort {
       </TR>
 <% } %>
 
+<%
+  $statement =~ s/AND refnum = \?//;
+  $sth = dbh->prepare($statement)
+    or die dbh->errstr;
+%>
+      <TR>
+        <TH COLSPAN=2>Total</TH>
+        <% for my $after ( values %after ) {
+          $sth->execute( $today-$after,
+                         $today+$before{$today},
+          ) or die $sth->errstr;
+          my $number = $sth->fetchrow_arrayref->[0];
+        %>
+          <TD ALIGN="right"><%= $number %></TD>
+        <% } %>
+      </TR>
+        <TD></TD>
     </TABLE>
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From 95d7eccb2a441d225257181eb8db0911f38a5176 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 1 Apr 2004 11:09:28 +0000
Subject: oops!

---
 httemplate/browse/part_referral.cgi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index a326bd231..25397e1da 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -64,10 +64,10 @@ foreach my $part_referral ( sort {
           <%= $part_referral->refnum %></A></TD>
         <TD><A HREF="<%= $p %>edit/part_referral.cgi?<%= $part_referral->refnum %>">
           <%= $part_referral->referral %></A></TD>
-        <% for my $after ( values %after ) {
+        <% for my $period ( keys %after ) {
           $sth->execute( $part_referral->refnum,
-                         $today-$after,
-                         $today+$before{$today},
+                         $today-$after{$period},
+                         $today+$before{$period},
           ) or die $sth->errstr;
           my $number = $sth->fetchrow_arrayref->[0];
         %>
@@ -83,9 +83,9 @@ foreach my $part_referral ( sort {
 %>
       <TR>
         <TH COLSPAN=2>Total</TH>
-        <% for my $after ( values %after ) {
-          $sth->execute( $today-$after,
-                         $today+$before{$today},
+        <% for my $period ( keys %after ) {
+          $sth->execute( $today-$after{$period},
+                         $today+$before{$period},
           ) or die $sth->errstr;
           my $number = $sth->fetchrow_arrayref->[0];
         %>
-- 
cgit v1.2.1


From 7ca594813a8426beb70d9f61544be1f6ac7b3d3f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 1 Apr 2004 11:14:34 +0000
Subject: remove extraneous html

---
 httemplate/browse/part_referral.cgi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index 25397e1da..581e01bb6 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -92,7 +92,6 @@ foreach my $part_referral ( sort {
           <TD ALIGN="right"><%= $number %></TD>
         <% } %>
       </TR>
-        <TD></TD>
     </TABLE>
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From f234445206998dedfbe74ae59128f6a40c53fe4d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 1 Apr 2004 14:50:14 +0000
Subject: fix paths to ispman commands

---
 FS/FS/part_export/www_shellcommands.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index e90120ec9..36da93a88 100644
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -39,8 +39,8 @@ Run remote commands via SSH, for virtual web sites.  You will need to
   <LI>
     <INPUT TYPE="button" VALUE="ISPMan CLI" onClick='
       this.form.user.value = "root";
-      this.form.useradd.value = "/usr/local/ispman/ispman.addvhost -d $domain $zone";
-      this.form.userdel.value = "/usr/local/ispman/idpman.deletevhost -d $domain $zone";
+      this.form.useradd.value = "/usr/local/ispman/bin/ispman.addvhost -d $domain $zone";
+      this.form.userdel.value = "/usr/local/ispman/bin/ispman.deletevhost -d $domain $zone";
       this.form.usermod.value = "";
     '>
 </UL>
-- 
cgit v1.2.1


From 243b248a929e99a9cc64e16f29e4a49afeb87a3c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 2 Apr 2004 02:09:01 +0000
Subject: add option to set (r)ndc command

---
 FS/FS/part_export/bind.pm | 3 ++-
 bin/bind.export           | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/bind.pm b/FS/FS/part_export/bind.pm
index cf73ef450..1ef7b6598 100644
--- a/FS/FS/part_export/bind.pm
+++ b/FS/FS/part_export/bind.pm
@@ -17,7 +17,8 @@ tie %options, 'Tie::IxHash',
                       default => 'BIND8' },
   'bind9_minttl' => { label => 'The minttl required by bind9 and RFC1035.',
                       default => '1D' },
-;
+  'reload'       => { label => 'Optional reload command.  If not specified, defaults to "ndc" under BIND8 and "rndc" under BIND9.', },
+;                    
 
 %info = (
   'svc'     => 'svc_domain',
diff --git a/bin/bind.export b/bin/bind.export
index 64d44065d..d0b93797e 100755
--- a/bin/bind.export
+++ b/bin/bind.export
@@ -31,7 +31,8 @@ foreach my $export ( @exports ) {
   my $prefix = "$spooldir/$machine";
 
   my $bind_rel = $export->option('bind_release');
-  my $ndc_cmd = ($bind_rel eq 'BIND9') ? 'rndc' : 'ndc';
+  my $ndc_cmd = $export->option('reload')
+                || ( ($bind_rel eq 'BIND9') ? 'rndc' : 'ndc' );
   my $minttl = $export->option('bind9_minttl');
 
   #prevent old domain files from piling up
-- 
cgit v1.2.1


From ea72b6b09a472a989e60fe5bba1884a629907e37 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 2 Apr 2004 11:23:34 +0000
Subject: add a fake .pdf extension to placate some versions of IE.  yay IE.

---
 httemplate/view/cust_bill-pdf.cgi | 2 +-
 httemplate/view/cust_bill.cgi     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/view/cust_bill-pdf.cgi b/httemplate/view/cust_bill-pdf.cgi
index 7aa69100d..4578b7b9c 100755
--- a/httemplate/view/cust_bill-pdf.cgi
+++ b/httemplate/view/cust_bill-pdf.cgi
@@ -2,7 +2,7 @@
 
 #untaint invnum
 my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
+$query =~ /^(\d+)(.pdf)?$/;
 my $invnum = $1;
 
 my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 50ee8b36c..7906af65b 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -31,7 +31,7 @@ print '<BR><BR>';
 my $conf = new FS::Conf;
 if ( $conf->exists('invoice_latex') ) {
   print menubar(
-    'View typeset invoice' => "${p}view/cust_bill-pdf.cgi?$invnum",
+    'View typeset invoice' => "${p}view/cust_bill-pdf.cgi?$invnum.pdf",
   ), '<BR><BR>';
 }
 
-- 
cgit v1.2.1


From e5f676566d9fd2dd61d5e48c26ccd9f4387f8cc8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 2 Apr 2004 13:44:56 +0000
Subject: remove Pragma:no-cache header, and set Content-Length and
 Cache-Control for viewing .pdf invoices with IE over SSL. 
 http://support.microsoft.com/default.aspx?scid=kb;en-us;323308

---
 htetc/global.asa                  | 1 -
 htetc/handler.pl                  | 2 +-
 httemplate/view/cust_bill-pdf.cgi | 6 +++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htetc/global.asa b/htetc/global.asa
index 65f3355e1..a773bb92f 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -68,7 +68,6 @@ use FS::export_svc;
 use FS::msgcat;
 
 sub Script_OnStart {
-  $Response->AddHeader('Pragma' => 'no-cache');
   $Response->AddHeader('Cache-control' => 'no-cache');
 #  $Response->AddHeader('Expires' => 0);
   $Response->{Expires} = -36288000;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 8d4f1e71f..f970df842 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -198,7 +198,7 @@ sub handler
     #eorar
 
     my $headers = $r->headers_out;
-    $headers->{'Pragma'} = $headers->{'Cache-control'} = 'no-cache';
+    $headers->{'Cache-control'} = 'no-cache';
     #$r->no_cache(1);
     $headers->{'Expires'} = '0';
 
diff --git a/httemplate/view/cust_bill-pdf.cgi b/httemplate/view/cust_bill-pdf.cgi
index 4578b7b9c..2a86c3246 100755
--- a/httemplate/view/cust_bill-pdf.cgi
+++ b/httemplate/view/cust_bill-pdf.cgi
@@ -8,6 +8,10 @@ my $invnum = $1;
 my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Invoice #$invnum not found!" unless $cust_bill;
 
+my $pdf = $cust_bill->print_pdf;
+
 http_header('Content-Type' => 'application/pdf' );
+http_header('Content-Length' => length($pdf) );
+http_header('Cache-control' => 'max-age=60' );
 %>
-<%= $cust_bill->print_pdf %>
+<%= $pdf %>
-- 
cgit v1.2.1


From 6211a2be71abf13187aaf10f3923ba377ae4c73e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 3 Apr 2004 00:45:38 +0000
Subject: UI: stop making things small for no reason

---
 httemplate/search/cust_bill.cgi | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 985e3dbf5..5b0538ca3 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -125,10 +125,10 @@ END
     my $view = popurl(2). "view/cust_bill.cgi?$invnum";
     print <<END;
       <TR>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$invnum</FONT></A></TD>
-        <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view"><FONT SIZE=-1>\$$owed</FONT></A></TD>
-        <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view"><FONT SIZE=-1>\$$charged</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$pdate</FONT></A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$view">$invnum</A></TD>
+        <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view">\$$owed</A></TD>
+        <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view">\$$charged</A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$view">$pdate</A></TD>
 END
     my $custnum = $cust_bill->custnum;
     my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
@@ -139,8 +139,8 @@ END
         $cust_main->company,
       );
       print <<END;
-        <TD ROWSPAN=$rowspan><A HREF="$cview"><FONT SIZE=-1>$name</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$cview"><FONT SIZE=-1>$company</FONT></A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$cview">$name</A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$cview">$company</A></TD>
 END
     } else {
       print <<END
@@ -153,8 +153,8 @@ END
   $tot_balance = sprintf("%.2f", $tot_balance);
   $tot_amount = sprintf("%.2f", $tot_amount);
   print "</TABLE>$pager<BR>". table(). <<END;
-      <TR><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TH><FONT SIZE=-1>Total<BR>Balance</FONT></TH><TH><FONT SIZE=-1>Total<BR>Amount</FONT></TH></TR>
-      <TR><TD></TD><TD ALIGN="right"><FONT SIZE=-1>\$$tot_balance</FONT></TD><TD ALIGN="right"><FONT SIZE=-1>\$$tot_amount</FONT></TD></TD></TR>
+      <TR><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TH>Total<BR>Balance</TH><TH>Total<BR>Amount</TH></TR>
+      <TR><TD></TD><TD ALIGN="right">\$$tot_balance</TD><TD ALIGN="right">\$$tot_amount</TD></TD></TR>
     </TABLE>
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From 304ad881f4bdfe687e7be5b76d46de916b01cdcd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 4 Apr 2004 22:14:59 +0000
Subject: comment out extraneous warning

---
 httemplate/view/cust_main.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index e8ea9943e..dd9cd3075 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -899,7 +899,7 @@ sub get_packages {
       )
     ) {
 
-      warn "svcnum ". $cust_svc->svcnum. " / svcpart ". $cust_svc->svcpart. "\n";
+      #warn "svcnum ". $cust_svc->svcnum. " / svcpart ". $cust_svc->svcpart. "\n";
       my $svc = {
         'svcnum' => $cust_svc->svcnum,
         'label'  => ($cust_svc->label)[1],
-- 
cgit v1.2.1


From cbbc7e215fb2f235c05abdb8c9434bdb2385ce3f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 4 Apr 2004 22:20:40 +0000
Subject: add cust_pkg-change_svcpart option to optionally allow non-matching
 svcparts to be moved during package changes, closes: Bug#667

---
 FS/FS/Conf.pm     |  8 ++++++
 FS/FS/cust_pkg.pm | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 85 insertions(+), 7 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e6a970c97..03b376656 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1184,6 +1184,14 @@ httemplate/docs/config.html
     'description' => 'A list of system usernames that cannot be edited or removed, one per line.  Use a bare username to prohibit modification/deletion of the username in any domain, or username@domain to prohibit modification/deletetion of a specific username and domain.',
     'type'        => 'textarea',
   },
+
+  {
+    'key'         => 'cust_pkg-change_svcpart',
+    'section'     => '',
+    'description' => "When changing packages, move services even if svcparts don't match between old and new pacakge definitions.  Use with caution!  No provision is made for export differences between the old and new service definitions.  Probably only should be used when your exports for all service definitions of a given svcdb are identical.",
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index ccd73acc8..d554d8be7 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -626,11 +626,21 @@ sub attribute_since_sqlradacct {
 
 }
 
-=item transfer DEST_PKGNUM
+=item transfer DEST_PKGNUM | DEST_CUST_PKG, [ OPTION => VALUE ... ]
 
 Transfers as many services as possible from this package to another package.
-The destination package must already exist.  Services are moved only if 
-the destination allows services with the correct I<svcpart> (not svcdb).  
+
+The destination package can be specified by pkgnum by passing an FS::cust_pkg
+object.  The destination package must already exist.
+
+Services are moved only if the destination allows services with the correct
+I<svcpart> (not svcdb), unless the B<change_svcpart> option is set true.  Use
+this option with caution!  No provision is made for export differences
+between the old and new service definitions.  Probably only should be used
+when your exports for all service definitions of a given svcdb are identical.
+(attempt a transfer without it first, to move all possible svcpart-matching
+services)
+
 Any services that can't be moved remain in the original package.
 
 Returns an error, if there is one; otherwise, returns the number of services 
@@ -639,7 +649,7 @@ that couldn't be moved.
 =cut
 
 sub transfer {
-  my ($self, $dest_pkgnum) = @_;
+  my ($self, $dest_pkgnum, %opt) = @_;
 
   my $remaining = 0;
   my $dest;
@@ -665,15 +675,59 @@ sub transfer {
     $target{$cust_svc->svcpart}--;
   }
 
+  my %svcpart2svcparts = ();
+  if ( exists $opt{'change_svcpart'} && $opt{'change_svcpart'} ) {
+    warn "change_svcpart option received, creating alternates list\n" if $DEBUG;
+    foreach my $svcpart ( map { $_->svcpart } $self->cust_svc ) {
+      next if exists $svcpart2svcparts{$svcpart};
+      my $part_svc = qsearchs('part_svc', { 'svcpart' => $svcpart } );
+      $svcpart2svcparts{$svcpart} = [
+        grep { $_ != $svcpart }
+          map { $_->svcpart }
+            qsearch('part_svc', { 'svcdb' => $part_svc->svcdb } )
+      ];
+      warn "alternates for svcpart $svcpart: ".
+           join(', ', @{$svcpart2svcparts{$svcpart}}). "\n"
+        if $DEBUG;
+    }
+  }
+
   foreach $cust_svc ($self->cust_svc) {
     if($target{$cust_svc->svcpart} > 0) {
       $target{$cust_svc->svcpart}--;
       my $new = new FS::cust_svc {
-          svcnum  => $cust_svc->svcnum,
-          svcpart => $cust_svc->svcpart,
-          pkgnum  => $dest_pkgnum };
+        svcnum  => $cust_svc->svcnum,
+        svcpart => $cust_svc->svcpart,
+        pkgnum  => $dest_pkgnum,
+      };
       my $error = $new->replace($cust_svc);
       return $error if $error;
+    } elsif ( exists $opt{'change_svcpart'} && $opt{'change_svcpart'} ) {
+      if ( $DEBUG ) {
+        warn "looking for alternates for svcpart ". $cust_svc->svcpart. "\n";
+        warn "alternates to consider: ".
+             join(', ', @{$svcpart2svcparts{$cust_svc->svcpart}}). "\n";
+      }
+      my @alternate = grep {
+                             warn "considering alternate svcpart $_: ".
+                                  "$target{$_} available in new package\n"
+                               if $DEBUG;
+                             $target{$_} > 0;
+                           } @{$svcpart2svcparts{$cust_svc->svcpart}};
+      if ( @alternate ) {
+        warn "alternate(s) found\n" if $DEBUG;
+        my $change_svcpart = $alternate[0]; #arbitrary.
+        $target{$change_svcpart}--;
+        my $new = new FS::cust_svc {
+          svcnum  => $cust_svc->svcnum,
+          svcpart => $change_svcpart,
+          pkgnum  => $dest_pkgnum,
+        };
+        my $error = $new->replace($cust_svc);
+        return $error if $error;
+      } else {
+        $remaining++;
+      }
     } else {
       $remaining++
     }
@@ -747,6 +801,8 @@ newly-created cust_pkg objects.
 sub order {
   my ($custnum, $pkgparts, $remove_pkgnum, $return_cust_pkg) = @_;
 
+  my $conf = new FS::Conf;
+
   # Transactionize this whole mess
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE'; 
@@ -781,6 +837,7 @@ sub order {
   # Transfer services and cancel old packages.
   foreach my $old_pkgnum (@$remove_pkgnum) {
     my $old_pkg = qsearchs ('cust_pkg', { pkgnum => $old_pkgnum });
+
     foreach my $new_pkg (@$return_cust_pkg) {
       $error = $old_pkg->transfer($new_pkg);
       if ($error and $error == 0) {
@@ -789,6 +846,19 @@ sub order {
 	return $error;
       }
     }
+
+    if ( $error > 0 && $conf->exists('cust_pkg-change_svcpart') ) {
+      warn "trying transfer again with change_svcpart option\n" if $DEBUG;
+      foreach my $new_pkg (@$return_cust_pkg) {
+        $error = $old_pkg->transfer($new_pkg, 'change_svcpart'=>1 );
+        if ($error and $error == 0) {
+          # $old_pkg->transfer failed.
+  	$dbh->rollback if $oldAutoCommit;
+  	return $error;
+        }
+      }
+    }
+
     if ($error > 0) {
       # Transfers were successful, but we went through all of the 
       # new packages and still had services left on the old package.
-- 
cgit v1.2.1


From a5651d5945c790b0d3fee0cd5082269a21adc6ee Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Apr 2004 09:08:39 +0000
Subject: add whois functionality internally instead of linking to geektools

---
 htetc/global.asa                   |  1 +
 htetc/handler.pl                   |  1 +
 httemplate/docs/install.html       |  2 +-
 httemplate/docs/upgrade-1.4.2.html |  1 +
 httemplate/misc/whois.cgi          | 25 +++++++++++++++++++++++++
 httemplate/view/svc_domain.cgi     |  2 +-
 6 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 httemplate/misc/whois.cgi

diff --git a/htetc/global.asa b/htetc/global.asa
index a773bb92f..dace29527 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -14,6 +14,7 @@ use Tie::IxHash;
 use HTML::Entities;
 use IO::Handle;
 use IO::File;
+use Net::Whois::Raw qw(whois);
 use Business::CreditCard;
 use String::Approx qw(amatch);
 use Chart::LinesPoints;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index f970df842..b81606a0a 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -71,6 +71,7 @@ sub handler
       use HTML::Entities;
       use IO::Handle;
       use IO::File;
+      use Net::Whois::Raw qw(whois);
       use Business::CreditCard;
       use String::Approx qw(amatch);
       use Chart::LinesPoints;
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 5f2ca4ca6..41aacc51b 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -30,7 +30,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=HTML-Parser">HTML-Parser</a>
       <li><a href="http://search.cpan.org/search?dist=libnet">libnet</a>
       <li><a href="http://search.cpan.org/search?dist=Locale-Codes">Locale-Codes</a>
-      <li><a href="http://search.cpan.org/search?dist=Net-Whois">Net-Whois</a>
+      <li><a href="http://search.cpan.org/search?dist=Net-Whois-Raw">Net-Whois-Raw</a>
       <li><a href="http://search.cpan.org/search?dist=libwww-perl">libwww-perl</a>
       <li><a href="http://search.cpan.org/search?dist=Business-CreditCard">Business-CreditCard</a>
 <!--      <li><a href="http://search.cpan.org/search?dist=Data-ShowTable">Data-ShowTable</a> -->
diff --git a/httemplate/docs/upgrade-1.4.2.html b/httemplate/docs/upgrade-1.4.2.html
index b8c5fcf7e..eb40df8b3 100644
--- a/httemplate/docs/upgrade-1.4.2.html
+++ b/httemplate/docs/upgrade-1.4.2.html
@@ -14,6 +14,7 @@
   <li>Install <a href="http://search.cpan.org/search?dist=Cache-Cache">Cache::Cache</a>.
   <li>Install <a href="http://search.cpan.org/search?dist=Net-SSH">Net::SSH</a> 0.08.
   <li>Install <a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a>
+  <li>Install <a href="http://search.cpan.org/search?dist=Net-Whois-Raw">Net::Whois::Raw</a>
   <li>CGI.pm minimum version 2.47 is required.  You will probably need to install a current CGI.pm from CPAN if you are using Perl 5.005 or earlier.
   <li>If using Apache::ASP, add <code>PerlSetVar RequestBinaryRead Off</code> to your Apache configuration and make sure you are using Apache::ASP minimum version 2.55.
   <li>Run <code>make aspdocs</code> or <code>make masondocs</code>.
diff --git a/httemplate/misc/whois.cgi b/httemplate/misc/whois.cgi
new file mode 100644
index 000000000..dd7851dc2
--- /dev/null
+++ b/httemplate/misc/whois.cgi
@@ -0,0 +1,25 @@
+<%
+  my $svcnum = $cgi->param('svcnum');
+  my $custnum = $cgi->param('custnum');
+  my $domain = $cgi->param('domain');
+
+%>
+<%= header("Whois $domain", menubar(
+  ( $custnum
+    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+      )
+    : ()
+  ),
+  "View this domain (#$svcnum)" => "${p}view/svc_domain.cgi?$svcnum",
+  "Main menu" => $p,
+)) %>
+<% my $whois = eval { whois($domain) };
+   if ( $@ ) {
+     ( $whois = $@ ) =~ s/ at \/.*Net\/Whois\/Raw\.pm line \d+.*$//s;
+   } else {
+     $whois =~ s/^\n+//;
+   }
+%>
+<PRE><%= $whois %></PRE>
+</BODY>
+</HTML>
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index e4b16d998..1dbe16d23 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -47,7 +47,7 @@ Service #<%= $svcnum %>
 <BR>Domain name: <B><%= $domain %></B>
 <BR>Catch all email <A HREF="<%= ${p} %>misc/catchall.cgi?<%= $svcnum %>">(change)</A>:
 <%= $email ? "<B>$email</B>" : "<I>(none)<I>" %>
-<BR><BR><A HREF="http://www.geektools.com/cgi-bin/proxy.cgi?query=<%=$domain%>;targetnic=auto">View whois information.</A>
+<BR><BR><A HREF="<%= ${p} %>misc/whois.cgi?custnum=<%=$custnum%>;svcnum=<%=$svcnum%>;domain=<%=$domain%>">View whois information.</A>
 <BR><BR>
 <SCRIPT>
   function areyousure(href) {
-- 
cgit v1.2.1


From 65615896de6e2474953722ea25122174b151d289 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Apr 2004 11:55:35 +0000
Subject: apply some heuristics to transfer ordering: primaries first, then
 sorted by quantity

---
 FS/FS/cust_pkg.pm             | 44 ++++++++++++++++++++++++++++++-------------
 httemplate/view/cust_main.cgi |  9 +--------
 2 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index d554d8be7..db0f7d423 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -508,11 +508,21 @@ L<FS::cust_svc>)
 
 sub cust_svc {
   my $self = shift;
-  if ( $self->{'_svcnum'} ) {
-    values %{ $self->{'_svcnum'}->cache };
-  } else {
+  #if ( $self->{'_svcnum'} ) {
+  #  values %{ $self->{'_svcnum'}->cache };
+  #} else {
+    map  { $_->[0] }
+    sort { $b->[1] cmp $a->[1]  or  $a->[2] <=> $b->[2] } 
+    map {
+          my $pkg_svc = qsearchs( 'pkg_svc', { 'pkgpart' => $self->pkgpart,
+                                               'svcpart' => $_->svcpart     } );
+          [ $_,
+            $pkg_svc ? $pkg_svc->primary_svc : '',
+            $pkg_svc ? $pkg_svc->quantity : 0,
+          ];
+        }
     qsearch ( 'cust_svc', { 'pkgnum' => $self->pkgnum } );
-  }
+  #}
 }
 
 =item labels
@@ -654,7 +664,6 @@ sub transfer {
   my $remaining = 0;
   my $dest;
   my %target;
-  my $pkg_svc;
 
   if (ref ($dest_pkgnum) eq 'FS::cust_pkg') {
     $dest = $dest_pkgnum;
@@ -665,13 +674,11 @@ sub transfer {
 
   return ('Package does not exist: '.$dest_pkgnum) unless $dest;
 
-  foreach $pkg_svc (qsearch('pkg_svc', { pkgpart => $dest->pkgpart })) {
+  foreach my $pkg_svc ( $dest->part_pkg->pkg_svc ) {
     $target{$pkg_svc->svcpart} = $pkg_svc->quantity;
   }
 
-  my $cust_svc;
-
-  foreach $cust_svc ($dest->cust_svc) {
+  foreach my $cust_svc ($dest->cust_svc) {
     $target{$cust_svc->svcpart}--;
   }
 
@@ -682,9 +689,20 @@ sub transfer {
       next if exists $svcpart2svcparts{$svcpart};
       my $part_svc = qsearchs('part_svc', { 'svcpart' => $svcpart } );
       $svcpart2svcparts{$svcpart} = [
+        map  { $_->[0] }
+        sort { $b->[1] cmp $a->[1]  or  $a->[2] <=> $b->[2] } 
+        map {
+              my $pkg_svc = qsearchs( 'pkg_svc', { 'pkgpart' => $dest->pkgpart,
+                                                   'svcpart' => $_          } );
+              [ $_,
+                $pkg_svc ? $pkg_svc->primary_svc : '',
+                $pkg_svc ? $pkg_svc->quantity : 0,
+              ];
+            }
+
         grep { $_ != $svcpart }
-          map { $_->svcpart }
-            qsearch('part_svc', { 'svcdb' => $part_svc->svcdb } )
+        map  { $_->svcpart }
+        qsearch('part_svc', { 'svcdb' => $part_svc->svcdb } )
       ];
       warn "alternates for svcpart $svcpart: ".
            join(', ', @{$svcpart2svcparts{$svcpart}}). "\n"
@@ -692,7 +710,7 @@ sub transfer {
     }
   }
 
-  foreach $cust_svc ($self->cust_svc) {
+  foreach my $cust_svc ($self->cust_svc) {
     if($target{$cust_svc->svcpart} > 0) {
       $target{$cust_svc->svcpart}--;
       my $new = new FS::cust_svc {
@@ -716,7 +734,7 @@ sub transfer {
                            } @{$svcpart2svcparts{$cust_svc->svcpart}};
       if ( @alternate ) {
         warn "alternate(s) found\n" if $DEBUG;
-        my $change_svcpart = $alternate[0]; #arbitrary.
+        my $change_svcpart = $alternate[0];
         $target{$change_svcpart}--;
         my $new = new FS::cust_svc {
           svcnum  => $cust_svc->svcnum,
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index dd9cd3075..624fe37d1 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -891,14 +891,7 @@ sub get_packages {
 
     }
 
-    foreach my $cust_svc (
-      qsearch( 'cust_svc', {
-                             'pkgnum' => $cust_pkg->pkgnum,
-                             #'svcpart' => $part_svc->svcpart,
-                           }
-      )
-    ) {
-
+    foreach my $cust_svc ( $cust_pkg->cust_svc ) {
       #warn "svcnum ". $cust_svc->svcnum. " / svcpart ". $cust_svc->svcpart. "\n";
       my $svc = {
         'svcnum' => $cust_svc->svcnum,
-- 
cgit v1.2.1


From 8ed2714fc50607081d7ac4edf0b17e23902dabba Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Apr 2004 14:06:04 +0000
Subject: add a domain pulldown to svc_acct linking, closes: Bug#277 / prevent
 "stealing" services with link unless you set legacy_link-steal config option,
 closes: Bug#321

---
 FS/FS/Conf.pm                    |  7 +++++
 httemplate/misc/link.cgi         | 67 ++++++++++++++++++++++++++++------------
 httemplate/misc/process/link.cgi | 27 ++++++++++------
 3 files changed, 73 insertions(+), 28 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 03b376656..d8191c278 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -933,6 +933,13 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'legacy_link-steal',
+    'section'     => 'UI',
+    'description' => 'Allow "stealing" an already-audited service from one customer (or package) to another using the link function.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'queue_dangerous_controls',
     'section'     => 'UI',
diff --git a/httemplate/misc/link.cgi b/httemplate/misc/link.cgi
index 79adce88c..18cd378d3 100755
--- a/httemplate/misc/link.cgi
+++ b/httemplate/misc/link.cgi
@@ -4,8 +4,16 @@
 my %link_field = (
   'svc_acct'    => 'username',
   'svc_domain'  => 'domain',
-  'svc_charge'  => '',
-  'svc_wo'      => '',
+);
+
+my %link_field2 = (
+  'svc_acct'    => { label => 'Domain',
+                     field => 'domsvc',
+                     type  => 'select',
+                     select_table => 'svc_domain',
+                     select_key   => 'svcnum',
+                     select_label => 'domain'
+                   },
 );
 
 my($query) = $cgi->keywords;
@@ -19,27 +27,48 @@ my $part_svc = qsearchs('part_svc',{'svcpart'=>$svcpart});
 my $svc = $part_svc->getfield('svc');
 my $svcdb = $part_svc->getfield('svcdb');
 my $link_field = $link_field{$svcdb};
+my $link_field2 = $link_field2{$svcdb};
+
+%>
 
-print header("Link to existing $svc"),
-      qq!<FORM ACTION="!, popurl(1), qq!process/link.cgi" METHOD=POST>!;
+<%= header("Link to existing $svc") %>
+<FORM ACTION="<%= popurl(1) %>process/link.cgi" METHOD=POST>
 
-if ( $link_field ) { 
-  print <<END;
+<% if ( $link_field ) { %>
   <INPUT TYPE="hidden" NAME="svcnum" VALUE="">
-  <INPUT TYPE="hidden" NAME="link_field" VALUE="$link_field">
-  $link_field of existing service: <INPUT TYPE="text" NAME="link_value">
-END
-} else {
-  print qq!Service # of existing service: <INPUT TYPE="text" NAME="svcnum" VALUE="">!;
-}
+  <INPUT TYPE="hidden" NAME="link_field" VALUE="<%= $link_field %>">
+  <%= $link_field %> of existing service: <INPUT TYPE="text" NAME="link_value">
+  <BR>
+  <% if ( $link_field2 ) { %>
+    <INPUT TYPE="hidden" NAME="link_field2" VALUE="<%= $link_field2->{field} %>">
+    <%= $link_field2->{'label'} %> of existing service: 
+    <% if ( $link_field2->{'type'} eq 'select' ) { %>
+      <% if ( $link_field2->{'select_table'} ) { %>
+        <SELECT NAME="link_value2">
+        <OPTION> </OPTION>
+        <% foreach my $r ( qsearch( $link_field2->{'select_table'}, {})) { %>
+          <% my $key = $link_field2->{'select_key'}; %>
+          <% my $label = $link_field2->{'select_label'}; %>
+          <OPTION VALUE="<%= $r->$key() %>"><%= $r->$label() %></OPTION>
+        <% } %>
+        </SELECT>
+      <% } else { %>
+        Don't know how to process secondary link field for <%= $svcdb %>
+        (type=>select but no select_table)
+      <% } %>
+    <% } else { %>
+      Don't know how to process secondary link field for <%= $svcdb %>
+        (unknown type <%= $link_field2->{'type'} %>)
+    <% } %>
+    <BR>
+  <% } %>
+<% } else { %>
+  Service # of existing service: <INPUT TYPE="text" NAME="svcnum" VALUE="">
+<% } %>
 
-print <<END;
-<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
-<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
-<P><CENTER><INPUT TYPE="submit" VALUE="Link"></CENTER>
+<INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%= $pkgnum %>">
+<INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $svcpart %>">
+<BR><INPUT TYPE="submit" VALUE="Link">
     </FORM>
   </BODY>
 </HTML>
-END
-
-%>
diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
index 8b71b893d..32a5360d9 100755
--- a/httemplate/misc/process/link.cgi
+++ b/httemplate/misc/process/link.cgi
@@ -12,8 +12,12 @@ unless ( $svcnum ) {
   my $svcdb = $part_svc->getfield('svcdb');
   $cgi->param('link_field') =~ /^(\w+)$/;
   my $link_field = $1;
+  my %search = ( $link_field => $cgi->param('link_value') );
+  if ( $cgi->param('link_field2') =~ /^(\w+)$/ ) {
+    $search{$1} = $cgi->param('link_value2');
+  }
   my $svc_x = ( grep { $_->cust_svc->svcpart == $svcpart } 
-                  qsearch( $svcdb, { $link_field => $cgi->param('link_value') })
+                  qsearch( $svcdb, \%search )
               )[0];
   eidiot("$link_field not found!") unless $svc_x;
   $svcnum = $svc_x->svcnum;
@@ -21,19 +25,24 @@ unless ( $svcnum ) {
 
 my $old = qsearchs('cust_svc',{'svcnum'=>$svcnum});
 die "svcnum not found!" unless $old;
-#die "svcnum $svcnum already linked to package ". $old->pkgnum if $old->pkgnum;
-my $new = new FS::cust_svc ({
-  'svcnum' => $svcnum,
-  'pkgnum' => $pkgnum,
-  'svcpart' => $svcpart,
-});
+my $conf = new FS::Conf;
+my($error, $new);
+if ( $old->pkgnum && ! $conf->exists('legacy_link-steal') ) {
+  $error = "svcnum $svcnum already linked to package ". $old->pkgnum;
+} else {
+  $new = new FS::cust_svc ({
+    'svcnum' => $svcnum,
+    'pkgnum' => $pkgnum,
+    'svcpart' => $svcpart,
+  });
 
-my $error = $new->replace($old);
+  $error = $new->replace($old);
+}
 
 unless ($error) {
   #no errors, so let's view this customer.
   my $custnum = $new->cust_pkg->custnum;
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum"
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum".
                        "#cust_pkg$pkgnum" );
 } else {
 %>
-- 
cgit v1.2.1


From 1dcea2453d573341d3153fb966b19be161c4f1ba Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Apr 2004 02:03:10 +0000
Subject: update ISPMan commands

---
 FS/FS/part_export/www_shellcommands.pm | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index 36da93a88..6847f6470 100644
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -39,8 +39,8 @@ Run remote commands via SSH, for virtual web sites.  You will need to
   <LI>
     <INPUT TYPE="button" VALUE="ISPMan CLI" onClick='
       this.form.user.value = "root";
-      this.form.useradd.value = "/usr/local/ispman/bin/ispman.addvhost -d $domain $zone";
-      this.form.userdel.value = "/usr/local/ispman/bin/ispman.deletevhost -d $domain $zone";
+      this.form.useradd.value = "/usr/local/ispman/bin/ispman.addvhost -d $domain $bare_zone";
+      this.form.userdel.value = "/usr/local/ispman/bin/ispman.deletevhost -d $domain $bare_zone";
       this.form.usermod.value = "";
     '>
 </UL>
@@ -48,6 +48,7 @@ The following variables are available for interpolation (prefixed with
 <code>new_</code> or <code>old_</code> for replace operations):
 <UL>
   <LI><code>$zone</code> - fully-qualified zone of this virtual host
+  <LI><code>$bare_zone</code> - just the zone of this virtual host, without the domain portion
   <LI><code>$domain</code> - base domain
   <LI><code>$username</code>
   <LI><code>$homedir</code>
@@ -83,6 +84,7 @@ sub _export_command {
   my $domain_record = $svc_www->domain_record; # or die ?
   my $zone = $domain_record->zone; # or die ?
   my $domain = $domain_record->svc_domain->domain;
+  ( my $bare_zone = $zone ) =~ s/\.$domain$//;
   my $svc_acct = $svc_www->svc_acct; # or die ?
   my $username = $svc_acct->username;
   my $homedir = $svc_acct->dir; # or die ?
@@ -108,22 +110,17 @@ sub _export_replace {
     ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   }
   my $old_domain_record = $old->domain_record; # or die ?
-  my $old_zone = $old_domain_record->reczone; # or die ?
+  my $old_zone = $old_domain_record->zone; # or die ?
   my $old_domain = $old_domain_record->svc_domain->domain;
-  $old_zone .= ".$old_domain" unless $old_zone =~ /\.$/;
-
+  ( my $old_bare_zone = $old_zone ) =~ s/\.$old_domain$//;
   my $old_svc_acct = $old->svc_acct; # or die ?
   my $old_username = $old_svc_acct->username;
   my $old_homedir = $old_svc_acct->dir; # or die ?
 
   my $new_domain_record = $new->domain_record; # or die ?
-  my $new_zone = $new_domain_record->reczone; # or die ?
+  my $new_zone = $new_domain_record->zone; # or die ?
   my $new_domain = $new_domain_record->svc_domain->domain;
-  unless ( $new_zone =~ /\.$/ ) {
-    my $new_svc_domain = $new_domain_record->svc_domain; # or die ?
-    $new_zone .= '.'. $new_svc_domain->domain;
-  }
-
+  ( my $new_bare_zone = $new_zone ) =~ s/\.$new_domain$//;
   my $new_svc_acct = $new->svc_acct; # or die ?
   my $new_username = $new_svc_acct->username;
   my $new_homedir = $new_svc_acct->dir; # or die ?
-- 
cgit v1.2.1


From eef6a940b33921447b792bff7ef479d1c9612993 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Apr 2004 08:07:11 +0000
Subject: make -T happy (under old perl?)

---
 FS/FS/part_export.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index bd12389c2..69a0ba5ec 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -533,7 +533,9 @@ sub export_info {
 #}
 
 foreach my $INC ( @INC ) {
-  foreach my $file ( glob("$INC/FS/part_export/*.pm") ) {
+  $INC =~ /^(.*)$/;
+  my $untainted_INC = $1;
+  foreach my $file ( glob("$untainted_INC/FS/part_export/*.pm") ) {
     warn "attempting to load export info from $file\n" if $DEBUG;
     $file =~ /\/(\w+)\.pm$/ or do {
       warn "unrecognized file in $INC/FS/part_export/: $file\n";
-- 
cgit v1.2.1


From de16528011da925274ae502e928c7878bbd7fefa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Apr 2004 08:34:08 +0000
Subject: argh, the glob itself is tainted under 5.005

---
 FS/FS/part_export.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 69a0ba5ec..bd12389c2 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -533,9 +533,7 @@ sub export_info {
 #}
 
 foreach my $INC ( @INC ) {
-  $INC =~ /^(.*)$/;
-  my $untainted_INC = $1;
-  foreach my $file ( glob("$untainted_INC/FS/part_export/*.pm") ) {
+  foreach my $file ( glob("$INC/FS/part_export/*.pm") ) {
     warn "attempting to load export info from $file\n" if $DEBUG;
     $file =~ /\/(\w+)\.pm$/ or do {
       warn "unrecognized file in $INC/FS/part_export/: $file\n";
-- 
cgit v1.2.1


From 35effa1bf4ac902547615c816960bbc8db8e7256 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Apr 2004 09:08:34 +0000
Subject: import Net::Whois::Raw into install/5.005 directory  *sigh*

---
 install/5.005/Net-Whois-Raw/COPYRIGHT              |   7 +
 install/5.005/Net-Whois-Raw/Changes                |  53 +++
 install/5.005/Net-Whois-Raw/MANIFEST               |  10 +
 install/5.005/Net-Whois-Raw/META.yml               |  11 +
 install/5.005/Net-Whois-Raw/Makefile.PL            |  24 +
 install/5.005/Net-Whois-Raw/README                 | 129 ++++++
 install/5.005/Net-Whois-Raw/lib/Net/Whois/Raw.pm   | 393 ++++++++++++++++
 .../5.005/Net-Whois-Raw/lib/Net/Whois/Raw/Data.pm  | 509 +++++++++++++++++++++
 install/5.005/Net-Whois-Raw/pwhois                 | 106 +++++
 install/5.005/Net-Whois-Raw/t/01.t                 |  22 +
 10 files changed, 1264 insertions(+)
 create mode 100644 install/5.005/Net-Whois-Raw/COPYRIGHT
 create mode 100644 install/5.005/Net-Whois-Raw/Changes
 create mode 100644 install/5.005/Net-Whois-Raw/MANIFEST
 create mode 100644 install/5.005/Net-Whois-Raw/META.yml
 create mode 100755 install/5.005/Net-Whois-Raw/Makefile.PL
 create mode 100644 install/5.005/Net-Whois-Raw/README
 create mode 100644 install/5.005/Net-Whois-Raw/lib/Net/Whois/Raw.pm
 create mode 100644 install/5.005/Net-Whois-Raw/lib/Net/Whois/Raw/Data.pm
 create mode 100755 install/5.005/Net-Whois-Raw/pwhois
 create mode 100644 install/5.005/Net-Whois-Raw/t/01.t

diff --git a/install/5.005/Net-Whois-Raw/COPYRIGHT b/install/5.005/Net-Whois-Raw/COPYRIGHT
new file mode 100644
index 000000000..78fd31252
--- /dev/null
+++ b/install/5.005/Net-Whois-Raw/COPYRIGHT
@@ -0,0 +1,7 @@
+Copyright 2003-2003 Walery Studennikov
+Copyright 2003-2003 Corris Randall
+Copyright 2003-2003 Gabor Szabo
+Copyright 2000-2002 Ariel Brosh
+
+This package is free software. You may redistribute it or modify it under
+the same terms as Perl itself.
diff --git a/install/5.005/Net-Whois-Raw/Changes b/install/5.005/Net-Whois-Raw/Changes
new file mode 100644
index 000000000..68310b0c6
--- /dev/null
+++ b/install/5.005/Net-Whois-Raw/Changes
@@ -0,0 +1,53 @@
+Revision history for Perl extension Net::Whois::Raw.
+
+0.01  Jul 05 12:35:47 2000
+	- original version; created by h2xs 1.19
+
+0.02 - 0.22  ???
+	-  ???
+
+0.23  Mar 25 09:23:37 PST 2003
+	- only exports &whois by default, the other variables are exportable still.
+	- incorporated new whois servers ( thanks Toni Mueller <support@oeko.net> )
+	- now tests the main tlds
+	- added some more regexen to strip out disclaimers and such ( for $OMIT_MSG > 2 ).
+	- moved %servers to %Net::Whois::Raw::Data::servers
+
+0.24  Nov 18 2003	Walery Studennikov <despair@cpan.org>
+	- fixed whois server for .org domains and add new whois servers
+	  for multilingual domains
+	- fixed recursive whois requests for .org domains
+	- new fail-check and strip patterns added
+	- more verbose error messages
+	- added support for third level domains
+	- some bugfixes
+
+0.25  Nov 21 2003	Walery Studennikov <despair@cpan.org>
+	- fixed multilingual domains whois via whois.melbourneit.com server
+	- whois_config function for setting config variables
+	  (if setting imported variables $OMIT_MSG, $CHECK_FAIL etc.
+	  doesn't work for some reason, for example because of
+	  namespace problems in mod_perl scripts)
+
+0.26  Jan 09 2004	Walery Studennikov <despair@cpan.org>
+	- added recursive whois requests for .cc domains
+	- fixed recursive whois requests for whois.crsnic.net
+
+0.27  Feb 10 2004	Alex Kapranoff <alex@kapranoff.ru>
+	- patch to check availability of .info and .biz domains
+
+0.28  Feb 20 2004	Alex Kapranoff <alex@kapranoff.ru>
+	- fixed documentation for pwhois.PL
+
+0.29  Feb 24 2004	Walery Studennikov <despair@cpan.org>
+	- fixed extra rules which strips the copyright message or disclaimer
+	- removed pwhois.PL. "pwhois" is shipped now instead.
+	- data structures in Net/Whois/Raw/Data.pm reformatted
+	- new strip patterns for whois.crsnic.net
+
+
+0.30  Mar 15 2004	Walery Studennikov <despair@cpan.org>
+	- added strip rules for whois.dns.be
+
+0.31  Mar 19 2004	Walery Studennikov <despair@cpan.org>
+	- more robust recursive whois queries
diff --git a/install/5.005/Net-Whois-Raw/MANIFEST b/install/5.005/Net-Whois-Raw/MANIFEST
new file mode 100644
index 000000000..643f3cec5
--- /dev/null
+++ b/install/5.005/Net-Whois-Raw/MANIFEST
@@ -0,0 +1,10 @@
+Changes
+MANIFEST
+Makefile.PL
+lib/Net/Whois/Raw.pm
+lib/Net/Whois/Raw/Data.pm
+t/01.t
+pwhois
+README
+COPYRIGHT
+META.yml                                Module meta-data (added by MakeMaker)
diff --git a/install/5.005/Net-Whois-Raw/META.yml b/install/5.005/Net-Whois-Raw/META.yml
new file mode 100644
index 000000000..56efaa68e
--- /dev/null
+++ b/install/5.005/Net-Whois-Raw/META.yml
@@ -0,0 +1,11 @@
+# http://module-build.sourceforge.net/META-spec.html
+#XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
+name:         Net-Whois-Raw
+version:      0.29
+version_from: lib/Net/Whois/Raw.pm
+installdirs:  site
+requires:
+    IO::Socket:                    1
+
+distribution_type: module
+generated_by: ExtUtils::MakeMaker version 6.17
diff --git a/install/5.005/Net-Whois-Raw/Makefile.PL b/install/5.005/Net-Whois-Raw/Makefile.PL
new file mode 100755
index 000000000..abd0ca3e9
--- /dev/null
+++ b/install/5.005/Net-Whois-Raw/Makefile.PL
@@ -0,0 +1,24 @@
+#!/usr/bin/perl -w
+
+use ExtUtils::MakeMaker;
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written.
+
+sub MY::postamble {
+        package MY;
+        shift->SUPER::postamble . <<'MAKE';
+dist : README
+
+README : lib/Net/Whois/Raw.pm
+	@$(PERL) -MPod::Text -e "pod2text('$<');" > $@
+
+MAKE
+}
+
+WriteMakefile(
+    'NAME'	=> 'Net::Whois::Raw',
+    'VERSION_FROM' => 'lib/Net/Whois/Raw.pm', # finds $VERSION
+    'PREREQ_PM' => {'IO::Socket' => 1.0},
+    'EXE_FILES' => ['pwhois'],
+    'dist' => {'COMPRESS' => 'gzip --best --force'},
+);
diff --git a/install/5.005/Net-Whois-Raw/README b/install/5.005/Net-Whois-Raw/README
new file mode 100644
index 000000000..916a53f3b
--- /dev/null
+++ b/install/5.005/Net-Whois-Raw/README
@@ -0,0 +1,129 @@
+NAME
+    Net::Whois::Raw - Perl extension for unparsed raw whois information
+
+SYNOPSIS
+      use Net::Whois::Raw qw( whois );
+  
+      $s = whois('perl.com');
+      $s = whois('funet.fi');
+      $s = whois('yahoo.co.uk');
+
+            ### if you do "use Net::Whois::Raw qw( whois $OMIT_MSG $CHECK_FAIL 
+            ###              $CACHE_DIR $CACHE_TIME $USE_CNAMES $TIMEOUT );
+            ### you can use these:
+
+      $OMIT_MSG = 1; # This will attempt to strip several known copyright
+                    messages and disclaimers sorted by servers.
+                    Default is to give the whole response.
+
+      $OMIT_MSG = 2; # This will try some additional stripping rules
+                    if none are known for the spcific server.
+
+      $CHECK_FAIL = 1; # This will return undef if the response matches
+                    one of the known patterns for a failed search,
+                    sorted by servers.
+                    Default is to give the textual response.
+
+      $CHECK_FAIL = 2; # This will match against several more rules
+                    if none are known for the specific server.
+
+      $CACHE_DIR = "/var/spool/pwhois/"; # Whois information will be
+                    cached in this directory. Default is no cache.
+
+      $CACHE_TIME = 24; # Cache files will be cleared after not accessed
+                    for a specific number of hours. Documents will not be
+                    cleared if they keep get requested for, independent
+                    of disk space. Default is not to clear the cache.
+
+      $USE_CNAMES = 1; # Use whois-servers.net to get the whois server
+                    name when possible. Default is to use the 
+                    hardcoded defaults.
+
+      $TIMEOUT = 10; # Cancel the request if connection is not made within
+                    a specific number of seconds.
+
+      Note: as of version 0.21, extra data will be loaded only if the
+      OMIT_MSG or CHECK_FAIL flags were used, in order to reduce memory usage.
+
+DESCRIPTION
+    Net::Whois::Raw queries NetworkSolutions and follows the Registrar:
+    answer for ORG, EDU, COM and NET domains. For other TLDs it uses the
+    whois-servers.net namespace. ($TLD.whois-servers.net).
+
+    Setting the variables $OMIT_MSG and $CHECK_FAIL will match the results
+    against a set of known patterns. The first flag will try to omit the
+    copyright message/disclaimer, the second will attempt to determine if
+    the search failed and return undef in such a case.
+
+    IMPORTANT: these checks merely use pattern matching; they will work on
+    several servers but certainly not on all of them.
+
+    (This features were contributed by Walery Studennikov despair@sama.ru)
+
+AUTHOR
+    Original author Ariel Brosh, schop@cpan.org, Inspired by jwhois.pl
+    available on the net.
+
+    Since Ariel has passed away in September 2002:
+
+    Past maintainers Gabor Szabo, gabor@perl.org.il, Corris Randall
+    corris@cpan.org
+
+    Current Maintainer: Walery Studennikov despair@cpan.org
+
+CREDITS
+    Fixed regular expression to match hyphens. (Peter Chow,
+    peter@interq.or.jp)
+
+    Added support for Tonga TLD. (.to) (Peter Chow, peter@interq.or.jp)
+
+    Added support for reverse lookup of IP addresses via the ARIN registry.
+    (Alex Withers awithers@gonzaga.edu)
+
+    This will work now for RIPE addresses as well, according to a
+    redirection from ARIN. (Philip Hands phil@uk.alcove.com, Trevor Peirce
+    trev@digitalcon.ca)
+
+    Added the pattern matching switches, (Walery Studennikov
+    despair@sama.ru)
+
+    Modified pattern matching, added cache. (Tony L. Svanstrom
+    tony@svanstrom.org)
+
+CHANGES
+    See file "Changes" in the distribution
+
+CLARIFICATION
+    As NetworkSolutions got most of the domains of InterNic as legacy, we
+    start by querying their server, as this way one whois query would be
+    sufficient for many domains. Starting at whois.internic.net or
+    whois.crsnic.net will result in always two requests in any case.
+
+NOTE
+    Some users complained that the die statements in the module make their
+    CGI scripts crash. Please consult the entries on eval and die on
+    perlfunc about exception handling in Perl.
+
+COPYRIGHT
+    Copyright 2000-2002 Ariel Brosh. Copyright 2003-2003 Gabor Szabo.
+    Copyright 2003-2003 Corris Randall. Copyright 2003-2003 Walery
+    Studennikov.
+
+    This package is free software. You may redistribute it or modify it
+    under the same terms as Perl itself.
+
+    I apologize for any misunderstandings caused by the lack of a clear
+    licence in previous versions.
+
+COMMERCIAL SUPPORT
+    Not available anymore.
+
+LEGAL
+    Notice that registrars forbid querying their whois servers as a part of
+    a search engine, or querying for a lot of domains by script. Also,
+    omitting the copyright information (that was requested by users of this
+    module) is forbidden by the registrars.
+
+SEE ALSO
+    perl(1), Net::Whois, whois.
+
diff --git a/install/5.005/Net-Whois-Raw/lib/Net/Whois/Raw.pm b/install/5.005/Net-Whois-Raw/lib/Net/Whois/Raw.pm
new file mode 100644
index 000000000..04db67184
--- /dev/null
+++ b/install/5.005/Net-Whois-Raw/lib/Net/Whois/Raw.pm
@@ -0,0 +1,393 @@
+package Net::Whois::Raw;
+
+require Net::Whois::Raw::Data;
+
+use strict;
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $OMIT_MSG $CHECK_FAIL
+	%notfound %strip $CACHE_DIR $CACHE_TIME $USE_CNAMES
+	$TIMEOUT);
+use IO::Socket;
+
+require Exporter;
+
+@ISA = qw(Exporter);
+
+@EXPORT    = qw( whois whois_config ); ### It's bad manners to export lots.
+@EXPORT_OK = qw( $OMIT_MSG $CHECK_FAIL $CACHE_DIR $CACHE_TIME $USE_CNAMES $TIMEOUT);
+
+$VERSION = '0.31';
+
+($OMIT_MSG, $CHECK_FAIL, $CACHE_DIR, $CACHE_TIME, $USE_CNAMES, $TIMEOUT) = (0) x 6;
+
+sub whois {
+    my ($dom, $srv) = @_;
+    my $res;
+    unless ($srv) {
+        ($res, $srv) = query($dom);
+    } else {
+        $res = _whois($dom, uc($srv));
+    }
+    finish($res, $srv);
+}
+
+sub whois_config {
+    my ($par) = @_;
+    my @parnames = qw(OMIT_MSG CHECK_FAIL CACHE_DIR CACHE_TIME USE_CNAMES TIMEOUT);
+    foreach my $parname (@parnames) {
+	if (exists($par->{$parname})) {
+	    eval('$'.$parname.'='.int($par->{$parname}));
+	}
+    }
+}
+
+sub query {
+    my $dom = shift;
+    my $tld;
+    if ($dom =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/) {
+        $tld = "IP";
+    } else { 
+	my @alltlds = keys %Net::Whois::Raw::Data::servers;
+	@alltlds = sort { dlen($b) <=> dlen($a) } @alltlds;
+	foreach my $awailtld (@alltlds) {
+	    $awailtld = lc $awailtld;
+	    if ($dom =~ /(.+?)\.($awailtld)$/) {
+		$tld = uc $2;
+		last;
+	    }
+	}
+	unless ($tld) {
+	    my @tokens = split(/\./, $dom);
+    	    $tld = uc($tokens[-1]); 
+	}
+    }
+
+
+    $dom =~ s/.NS$//i;
+    my $cname = "$tld.whois-servers.net";
+    my $srv = $Net::Whois::Raw::Data::servers{$tld} || $cname;
+    $srv = $cname if $USE_CNAMES && gethostbyname($cname);
+    my $flag = (
+	$srv eq 'whois.crsnic.net' ||
+	$srv eq 'whois.publicinterestregistry.net' ||
+	$srv eq 'whois.nic.cc' ||
+	$tld eq 'ARPA'
+    );
+    my $res = do_whois($dom, uc($srv), $flag, [], $tld);
+    wantarray ? ($res, $srv) : $res;
+}
+
+sub do_whois {
+    my ($dom) = @_; # receives 4 parameters, do NOT shift
+    return _whois(@_) unless $CACHE_DIR;
+    mkdir $CACHE_DIR, 0644;
+    if (-f "$CACHE_DIR/$dom") {
+        if (open(I, "$CACHE_DIR/$dom")) {
+            my $res = join("", <I>);
+            close(I);
+            return $res;
+        }
+    }
+    my $res = _whois(@_);
+    return $res unless $res;
+    return $res unless open(O, ">$CACHE_DIR/$dom");
+    print O $res;
+    close(O);
+
+
+    return $res unless $CACHE_TIME;
+
+    my $now = time;
+    foreach (glob("$CACHE_DIR/*.*")) {
+        my $atime = (stat($_))[8];
+        my $elapsed = $now - $atime;
+        unlink $_ if ($elapsed / 3600 > $CACHE_TIME); 
+    }
+    $res;
+}
+
+sub finish {
+    my ($text, $srv) = @_;
+    return $text unless $CHECK_FAIL || $OMIT_MSG;
+    *notfound = \%Net::Whois::Raw::Data::notfound;
+    *strip = \%Net::Whois::Raw::Data::strip;
+
+    my $notfound = $notfound{lc($srv)};
+    my @strip = $strip{lc($srv)} ? @{$strip{lc($srv)}} : ();
+    my @lines;
+    MAIN: foreach (split(/\n/, $text)) {
+        return undef if $CHECK_FAIL && $notfound && /$notfound/;
+        if ($OMIT_MSG) {
+            foreach my $re (@strip) {
+                next MAIN if (/$re/);
+            }
+        }
+        push(@lines, $_);
+    }
+    local ($_) = join("\n", @lines, "");
+
+    if ($CHECK_FAIL > 1) {
+	return undef unless check_existance($_);
+    }
+
+    if ($OMIT_MSG > 1) {	
+        s/The Data.+(policy|connection)\.\n//is;
+        s/% NOTE:.+prohibited\.//is;
+        s/Disclaimer:.+\*\*\*\n?//is;
+        s/NeuLevel,.+A DOMAIN NAME\.//is;
+        s/For information about.+page=spec//is;
+        s/NOTICE: Access to.+this policy.//is;
+        s/The previous information.+completeness\.//s;
+        s/NOTICE AND TERMS OF USE:.*modify these terms at any time\.//s;
+        s/TERMS OF USE:.*?modify these terms at any time\.//s;
+        s/NOTICE:.*expiration for this registration\.//s;
+
+	s/By submitting a WHOIS query.+?DOMAIN AVAILABILITY.\n?//s;
+	s/Registration and WHOIS.+?its accuracy.\n?//s;
+        s/Disclaimer:.+?\*\*\*\n?//s;
+	s/The .COOP Registration .+ Information\.//s;
+	s/Whois Server Version \d+\.\d+.//is;
+	s/NeuStar,.+www.whois.us\.//is;
+        s/\n?Domain names in the \.com, .+ detailed information.\n?//s;
+        s/\n?The Registry database .+?Registrars\.\n//s;
+        s/\n?>>> Last update of .+? <<<\n?//;
+        s/% .+?\n//gs;
+    }
+    $_;
+}
+
+sub _whois {
+    my ($dom, $srv, $flag, $ary, $tld) = @_;
+    my $state;
+
+    my $sock;
+    eval {
+        local $SIG{'ALRM'} = sub { die "Connection timeout to $srv" };
+        alarm $TIMEOUT if $TIMEOUT;
+        $sock = new IO::Socket::INET("$srv:43") || die "$srv: $!";
+    };
+    alarm 0;
+    die $@ if $@;
+    my $israce = $dom =~ /ra--/ || $dom =~ /bq--/;
+    my $whoisquery = $dom;
+    if ($srv eq 'WHOIS.MELBOURNEIT.COM' && $israce) {
+	$whoisquery .= ' race';
+    }
+    #warn "$srv: $whoisquery ($OMIT_MSG, $CHECK_FAIL, $CACHE_DIR, $CACHE_TIME, $USE_CNAMES, $TIMEOUT)\n";
+    print $sock "$whoisquery\r\n";
+    my @lines = <$sock>;
+    close($sock);
+    my $answer = join '', @lines;
+    if ($flag) {
+        foreach (@lines) {
+            $state ||= (/Registrar:/);
+            if ( $state && /Whois Server:\s*([A-Za-z0-9\-_\.]+)/ ) {
+                my $newsrv = uc("$1");
+                next if (($newsrv) eq uc($srv));
+                return undef if (grep {$_ eq $newsrv} @$ary);
+		my $whois = eval { _whois($dom, $newsrv, $flag, [@$ary, $srv]) };
+		if ($@ && !$whois || $whois && !check_existance($whois)) {
+		    return $answer;
+		}
+                return $whois;
+            }
+            if (/^\s+Maintainer:\s+RIPE\b/ && $tld eq 'ARPA') {
+                my $newsrv = uc($Net::Whois::Raw::Data::servers{'RIPE'});
+                next if ($newsrv eq $srv);
+                return undef if (grep {$_ eq $newsrv} @$ary);
+                my $whois = eval { _whois($dom, $newsrv, $flag, [@$ary, $srv]) };
+		if ($@ && !$whois) {
+		    return $answer;
+		}
+                return $whois;
+            }
+        }
+    }
+    my $whois = join("", @lines);
+
+    if ($whois =~ /To single out one record, look it up with \"xxx\",/s) {
+        my $newsrv = uc('whois.networksolutions.com');
+        return _whois($dom, $newsrv, $flag, [@{$ary||[]}, $srv]);
+    }
+    
+    return $whois;
+}
+
+sub dlen {
+    my ($str) = @_;
+    my $dotcount = $str =~ tr/././;
+    return length($str) * (1 + $dotcount);
+}
+
+
+sub check_existance {
+    $_ = $_[0];
+
+    return undef if
+	/is unavailable/is ||
+	/No entries found for the selected source/is ||
+	/Not found:/s ||
+	/No match\./s ||
+	/is available/is ||
+	/Not found/is &&
+	    !/ your query returns "NOT FOUND"/ &&
+	    !/Domain not found locally/ ||
+	/No match for/is ||
+	/No Objects Found/s ||
+	/No domain records were found/s ||
+	/No such domain/s ||
+	/No entries found in the /s ||
+	/Unable to find any information for your query/s ||
+	/is not registered and may be available for registration/s;
+    return 1;
+}
+
+
+# Preloaded methods go here.
+
+# Autoload methods go after =cut, and are processed by the autosplit program.
+
+1;
+__END__
+# Below is the stub of documentation for your module. You better edit it!
+
+=head1 NAME
+
+Net::Whois::Raw - Perl extension for unparsed raw whois information
+
+=head1 SYNOPSIS
+
+  use Net::Whois::Raw qw( whois );
+  
+  $s = whois('perl.com');
+  $s = whois('funet.fi');
+  $s = whois('yahoo.co.uk');
+
+	### if you do "use Net::Whois::Raw qw( whois $OMIT_MSG $CHECK_FAIL 
+	###              $CACHE_DIR $CACHE_TIME $USE_CNAMES $TIMEOUT );
+	### you can use these:
+
+  $OMIT_MSG = 1; # This will attempt to strip several known copyright
+		messages and disclaimers sorted by servers.
+		Default is to give the whole response.
+
+  $OMIT_MSG = 2; # This will try some additional stripping rules
+		if none are known for the spcific server.
+
+  $CHECK_FAIL = 1; # This will return undef if the response matches
+		one of the known patterns for a failed search,
+		sorted by servers.
+		Default is to give the textual response.
+
+  $CHECK_FAIL = 2; # This will match against several more rules
+		if none are known for the specific server.
+
+  $CACHE_DIR = "/var/spool/pwhois/"; # Whois information will be
+		cached in this directory. Default is no cache.
+
+  $CACHE_TIME = 24; # Cache files will be cleared after not accessed
+		for a specific number of hours. Documents will not be
+		cleared if they keep get requested for, independent
+		of disk space. Default is not to clear the cache.
+
+  $USE_CNAMES = 1; # Use whois-servers.net to get the whois server
+		name when possible. Default is to use the 
+		hardcoded defaults.
+
+
+  $TIMEOUT = 10; # Cancel the request if connection is not made within
+		a specific number of seconds.
+
+  Note: as of version 0.21, extra data will be loaded only if the
+  OMIT_MSG or CHECK_FAIL flags were used, in order to reduce memory usage.
+
+=head1 DESCRIPTION
+
+Net::Whois::Raw queries NetworkSolutions and follows the Registrar: answer
+for ORG, EDU, COM and NET domains.
+For other TLDs it uses the whois-servers.net namespace.
+(B<$TLD>.whois-servers.net).
+
+Setting the variables $OMIT_MSG and $CHECK_FAIL will match the results
+against a set of known patterns. The first flag will try to omit the
+copyright message/disclaimer, the second will attempt to determine if
+the search failed and return undef in such a case.
+
+B<IMPORTANT>: these checks merely use pattern matching; they will work
+on several servers but certainly not on all of them.
+
+(This features were contributed by Walery Studennikov B<despair@sama.ru>)
+
+=head1 AUTHOR
+
+Original author Ariel Brosh, B<schop@cpan.org>, 
+Inspired by jwhois.pl available on the net.
+
+Since Ariel has passed away in September 2002:
+
+Past maintainers Gabor Szabo, B<gabor@perl.org.il>,
+Corris Randall B<corris@cpan.org>
+
+Current Maintainer: Walery Studennikov B<despair@cpan.org>
+
+=head1 CREDITS
+
+Fixed regular expression to match hyphens. (Peter Chow,
+B<peter@interq.or.jp>)
+
+Added support for Tonga TLD. (.to) (Peter Chow, B<peter@interq.or.jp>)
+
+Added support for reverse lookup of IP addresses via the ARIN registry. (Alex Withers B<awithers@gonzaga.edu>)
+
+This will work now for RIPE addresses as well, according to a redirection from ARIN. (Philip Hands B<phil@uk.alcove.com>, Trevor Peirce B<trev@digitalcon.ca>)
+
+Added the pattern matching switches, (Walery Studennikov B<despair@sama.ru>)
+
+Modified pattern matching, added cache. (Tony L. Svanstrom B<tony@svanstrom.org>)
+
+=head1 CHANGES
+
+See file "Changes" in the distribution
+
+
+=head1 CLARIFICATION
+
+As NetworkSolutions got most of the domains of InterNic as legacy, we
+start by querying their server, as this way one whois query would be
+sufficient for many domains. Starting at whois.internic.net or
+whois.crsnic.net will result in always two requests in any case.
+
+=head1 NOTE
+
+Some users complained that the B<die> statements in the module make their
+CGI scripts crash. Please consult the entries on B<eval> and
+B<die> on L<perlfunc> about exception handling in Perl.
+
+=head1 COPYRIGHT
+
+Copyright 2000-2002 Ariel Brosh.
+Copyright 2003-2003 Gabor Szabo.
+Copyright 2003-2003 Corris Randall.
+Copyright 2003-2003 Walery Studennikov.
+
+This package is free software. You may redistribute it or modify it under
+the same terms as Perl itself.
+
+I apologize for any misunderstandings caused by the lack of a clear
+licence in previous versions.
+
+=head1 COMMERCIAL SUPPORT
+
+Not available anymore.
+
+=head1 LEGAL
+
+Notice that registrars forbid querying their whois servers as a part of
+a search engine, or querying for a lot of domains by script. 
+Also, omitting the copyright information (that was requested by users of this 
+module) is forbidden by the registrars.
+
+=head1 SEE ALSO
+
+L<perl(1)>, L<Net::Whois>, L<whois>.
+
+=cut
diff --git a/install/5.005/Net-Whois-Raw/lib/Net/Whois/Raw/Data.pm b/install/5.005/Net-Whois-Raw/lib/Net/Whois/Raw/Data.pm
new file mode 100644
index 000000000..7b51e2576
--- /dev/null
+++ b/install/5.005/Net-Whois-Raw/lib/Net/Whois/Raw/Data.pm
@@ -0,0 +1,509 @@
+package Net::Whois::Raw::Data;
+
+use strict;
+use vars qw(%notfound %strip);
+
+our %servers = qw(
+    COM    whois.crsnic.net
+    NET    whois.crsnic.net
+    EDU    whois.educause.net
+    ORG    whois.publicinterestregistry.net
+    ARPA   whois.arin.net
+    RIPE   whois.ripe.net
+    MIL    whois.nic.mil
+    COOP   whois.nic.coop
+    MUSEUM whois.museum
+
+    BIZ    whois.neulevel.biz
+    INFO   whois.afilias.net
+    NAME   whois.nic.name
+    GOV    whois.nic.gov
+    AERO   whois.information.aero
+    NS     whois.internic.net
+    IP     whois.ripe.net
+
+    AD  whois.ripe.net
+    AL  whois.ripe.net
+    AM  whois.ripe.net
+    AS  whois.gdns.net
+    AT  whois.nic.at
+    AU  box2.aunic.net
+    AZ  whois.ripe.net
+    BA  whois.ripe.net
+    BE  whois.dns.be
+    BG  whois.ripe.net
+    BR  whois.nic.br
+    BY  whois.ripe.net
+    CA  eider.cira.ca
+    CC  whois.nic.cc
+    CH  domex.switch.ch
+    CK  whois.ck-nic.org.ck
+    CL  nic.cl
+    CN  log.cnnic.net.cn
+    CX  whois.nic.cx
+    CY  whois.ripe.net
+    CZ  dc1.eunet.cz
+    DE  whois.denic.de
+    DK  whois.dk-hostmaster.dk
+    DO  ns.nic.do
+    DZ  whois.ripe.net
+    EE  whois.ripe.net
+    EG  whois.ripe.net
+    ES  whois.ripe.net
+    FI  whois.ripe.net
+    FO  whois.ripe.net
+    FR  winter.nic.fr
+    GA  whois.ripe.net
+    GB  whois.ripe.net
+    GE  whois.ripe.net
+    GL  whois.ripe.net
+    GM  whois.ripe.net
+    GR  whois.ripe.net
+    GS  whois.adamsnames.tc
+    HK  whois.hkdnr.net.hk
+    HR  whois.ripe.net
+    HU  whois.nic.hu
+    ID  muara.idnic.net.id
+    IE  whois.domainregistry.ie
+    IL  whois.isoc.org.il
+    IN  whois.ncst.ernet.in
+    IS  horus.isnic.is
+    IT  whois.nic.it
+    JO  whois.ripe.net
+    JP  whois.nic.ad.jp
+    KG  whois.domain.kg
+    KH  whois.nic.net.kh
+    KR  whois.krnic.net
+    LA  whois.nic.la
+    LI  domex.switch.ch
+    LK  arisen.nic.lk
+    LT  ns.litnet.lt
+    LU  whois.dns.lu
+    LV  whois.ripe.net
+    MA  whois.ripe.net
+    MC  whois.ripe.net
+    MD  whois.ripe.net
+    MM  whois.nic.mm
+    MS  whois.adamsnames.tc
+    MT  whois.ripe.net
+    MX  whois.nic.mx
+    NL  gw.domain-registry.nl
+    NO  ask.norid.no
+    NU  whois.worldnames.net
+    NZ  akl-iis.domainz.net.nz
+    PL  nazgul.nask.waw.pl
+    PT  whois.ripe.net
+    RO  whois.rotld.ro
+    RU  whois.ripn.net
+    SE  ear.nic-se.se
+    SG  qs.nic.net.sg
+    SH  whois.nic.sh
+    SI  whois.arnes.si
+    SK  whois.ripe.net
+    SM  whois.ripe.net
+    ST  whois.nic.st
+    SU  whois.ripn.net
+    TC  whois.adamsnames.tc
+    TF  whois.adamsnames.tc
+    TH  whois.thnic.net
+    TJ  whois.nic.tj
+    TN  whois.ripe.net
+    TO  whois.tonic.to
+    TR  whois.ripe.net
+    TW  whois.twnic.net
+    UA  whois.net.ua
+    UK  whois.nic.uk
+    US  whois.nic.us
+    VA  whois.ripe.net
+    VG  whois.adamsnames.tc
+    WS  whois.worldsite.ws
+    YU  whois.ripe.net
+    ZA  apies.frd.ac.za
+
+    RA--AQ5D4PA	whois.i-dns.net
+    RA--AQ6TKQQ	whois.i-dns.net
+    RA--AQ7EAMY	whois.i-dns.net
+    XN--P1AG	ru.whois.i-dns.net
+    XN--P1AG	ru.whois.i-dns.net
+    XN--J1AEF	whois.i-dns.net
+    XN--E1APQ	whois.i-dns.net
+    XN--C1AVG	whois.i-dns.net
+
+    NET.RU	whois.ripn.net
+    ORG.RU	whois.ripn.net
+    PP.RU	whois.ripn.net
+    SPB.RU	whois.relcom.ru
+    MSK.RU	whois.relcom.ru
+    RU.NET	whois.relcom.ru
+);
+
+# These do not seem to work
+#         CN  log.cnnic.net.cn
+#         DK  whois.dk-hostmaster.dk
+#         US  whois.isi.edu
+# These serve only several subdomains
+#         ZA  apies.frd.ac.za
+
+
+%notfound = (
+    'whois.nic.cc' => '^No match for',
+    'whois.arin.net' => '^No match for',
+    'whois.nic.br' => 'No match for',
+    'ear.nic-se.se' => 'No data found',
+    'whois.nic.sh' => '^No match for',
+    'whois.nic.mx' => '^Nombre del Dominio:',
+    'whois.domainregistry.ie' => 'There was no match',
+    'domex.switch.ch' => '^We do not have an entry in our database matching your',
+    'whois.dns.lu' => 'No entries found',
+    'whois.worldsite.ws' => 'No match for',
+    'whois.nic.it' => '^No entries found',
+    'whois.nic.coop' => 'No Objects Found',
+    'whois.nic.at' => 'nothing found',
+    'ask.norid.no' => 'no matches',
+    'whois.nic.uk' => '^\\s*No match for',
+    'whois.nic.ad.jp' => 'No match',
+    'whois.arnes.si' => 'No entries found',
+    'whois.tonic.to' => 'No match for',
+    'whois.hkdnr.net.hk' => '^No Match for',
+    'whois.worldnames.net' => 'NO MATCH for domain',
+    'whois.rotld.ro' => 'No entries found',
+    'whois.nic.st' => '^No entries found',
+    'whois.isoc.org.il' => 'No data was found',
+    'eider.cira.ca' => 'Status:\\s*UNAV',
+    'whois.nic.tj' => '^No match for',
+    'aardvark.dns.be' => 'No such domain',
+    'nazgul.nask.waw.pl' => '^Domain name .* does not exists',
+    'whois.ncst.ernet.in' => '^No matches',
+    'whois.krnic.net' => 'Above domain name is not registered',
+    'whois.museum' => '^No information for',
+    'whois.net.ua' => 'No entries found',
+    'apies.frd.ac.za' => 'No information is available',
+    'gw.domain-registry.nl' => 'invalid query',
+    'whois.denic.de' => 'No entries found',
+    'whois.nic.mil' => '^No match for',
+    'horus.isnic.is' => 'No entries found',
+    'winter.nic.fr' => 'No entries found',
+    'whois.ripe.net' => 'No entries found',
+    'whois.ripn.net' => 'No entries found',
+    'qs.nic.net.sg' => 'NO entry found',
+    'whois.twnic.net' => '^NO MATCH: This domain is',
+    'nic.cl' => 'Invalid domain name',
+    'whois.gdns.net' => '^Domain Not Found',
+    'box2.aunic.net' => 'No entries found',
+    'whois.nic.cx' => '^No match for',
+    'dc1.eunet.cz' => 'No data found',
+    'akl-iis.domainz.net.nz' => 'domain_name_status: 00 Not Listed',
+    'ns.litnet.lt' => 'No matches found',
+    'whois.adamsnames.tc' => 'is not a domain controlled by',
+    'whois.nic.la' => '^NO MATCH for',
+    'whois.networksolutions.com' => '(?i)no match',
+    'whois.thnic.net' => 'No entries found',
+    'whois.neulevel.biz' => '^Not found:',
+    'whois.afilias.net' => '^NOT FOUND',
+);
+
+%strip = (
+    'whois.crsnic.net' => [
+	'^TERMS OF USE:',
+	'^database through',
+	'^automated except',
+	'^modify existing',
+	'^Services\' \(\"VeriSign\"\)',
+	'^information purposes only',
+	'^about or related to a',
+	'^guarantee its accuracy\.',
+	'^by the following terms',
+	'^for lawful purposes and',
+	'^to: (1) allow, enable,',
+	'^unsolicited, commercial',
+	'^or facsimile; or \(2\)',
+	'^that apply to VeriSign',
+	'^repackaging, dissemination',
+	'^prohibited without the',
+	'^use electronic processes',
+	'^query the Whois database',
+	'^domain names or modify',
+	'^to restrict your access',
+	'^operational stability\.',
+	'^Whois database for',
+	'^reserves the right',
+
+	'^NOTICE AND TERMS OF USE:',
+	'^Data in Network Solutions',
+	'^purposes only, and to assist',
+	'^to a domain name registration',
+	'^By submitting a WHOIS query,',
+	'^You agree that you may use',
+	'^circumstances will you use',
+	'^the transmission of mass',
+	'^via e-mail, telephone, or',
+	'^electronic processes that',
+	'^compilation, repackaging,',
+	'^high-volume, automated,',
+	'^database. Network Solutions',
+	'^database in its sole discretion,',
+	'^querying of the WHOIS database',
+	'^Network Solutions reserves the',
+
+	'^NOTICE: The expiration date',
+	'^registrar\'s sponsorship of',
+	'^currently set to expire\.',
+	'^date of the domain name',
+	'^registrar.  Users may',
+	'^view the registrar\'s',
+	'^to: \(1\) allow, enable,',
+	'^The Registry database',
+	'^Registrars\.',
+	'^Domain not found locally,',
+	'^Local WHOIS DB must be out',
+
+	'^Whois Server Version',
+	'^Domain names in the .com',
+	'^with many different',
+	'^for detailed information\.',
+
+	'^>>> Last update of whois database',
+	'^$',
+    ],
+    'whois.tonic.to' => [
+	'^Tonic whoisd',
+    ],
+    'whois.net.ua' => [
+	'^%',
+    ],
+    'whois.nic.cx' => [
+	'^ Registrar: Christmas Island',
+	'^ Whois Server: whois.nic.cx',
+    ],
+    'gw.domain-registry.nl' => [
+	'Rights restricted by copyright',
+	'http://www.domain-registry.nl',
+    ],
+    'whois.denic.de' => [
+	'^%',
+    ],
+    'whois.gdns.net' => [
+	'^\\w+ Whois Server',
+	'^Access to .* WHOIS information is provided to',
+	'^determining the contents of a domain name',
+	'^registrar database.  The data in',
+	'^informational purposes only, and',
+	'^Compilation, repackaging, dissemination,',
+	'^in its entirety, or a substantial portion',
+	'prior written permission.  By',
+	'^by this policy.  All rights reserved.',
+    ],
+    'whois.isoc.org.il' => [
+	'^%',
+    ],
+    'whois.dns.lu' => [
+	'^%',
+    ],
+    'whois.worldnames.net' => [
+	'^----------------------------------',
+	'^.\\w+ Domain .* Whois service',
+	'^Copyright by .* Domain LTD',
+	'^----------------------------------',
+	'^Database last updated',
+    ],
+    'whois.nic.sh' => [
+	'^NIC Whois Server',
+    ],
+    'whois.nic.coop' => [
+	'^%',
+	'^ The .COOP Registration',
+	'^ Please use the',
+    ],
+    'domex.switch.ch' => [
+	'^whois: This information is subject',
+	'^See http',
+    ],
+    'whois.twnic.net' => [
+	'^Registrar:',
+	'^URL: http://rs.twnic.net.tw',
+    ],
+    'nic.cl' => [
+	'^cl.cl:',
+	'^Más información: http://www.nic.cl/',
+    ],
+    'whois.nic.mx' => [
+	'^------------------',
+	'^La información que ha',
+	'^relacionados con la',
+	'^DNS administrado por el NIC-México.',
+	'^Queda absolutamente prohibido',
+	'^envío de e-mail no solicitado',
+	'^productos y servicios',
+	'^del NIC-México.',
+	'^La base de datos generada',
+	'^protegida por las leyes de',
+	'^internacionales sobre la materia.',
+    ],
+    'whois.domainregistry.ie' => [
+	'^%',
+    ],
+    'ns.litnet.lt' => [
+	'^%',
+    ],
+    'dc1.eunet.cz' => [
+	'^%',
+    ],
+    'whois.ripn.net' => [
+	'^%',
+    ],
+    'whois.nic.uk' => [
+	'^The .* Registration Host contains information',
+	'^registrations in the .*co.uk',
+	'and .*\\.uk second-level domains.',
+    ],
+    'whois.nic.br' => [
+	'^%',
+    ],
+    'whois.krnic.net' => [
+	'^Korea Internet Information Service',
+	'^20\\d\\d³â 7¿ù 2ÀϺÎÅÍ´Â °³¼±µÈ Whois',
+	'^.com, .net, .org',
+    ],
+    'whois.arnes.si' => [
+	'^\\*',
+    ],
+    'nazgul.nask.waw.pl' => [
+	'^%',
+    ],
+    'whois.nic.la' => [
+	'^   WHOIS server',
+	'^   The Data in the',
+	'for information purposes,',
+	'^   and to assist persons in obtaining',
+	'^   domain name registration record. Sterling Holdings, Limited,',
+	'^   does not guarantee its accuracy.',
+	'^   you will use this Data only for lawful',
+	'^   circumstances will you use this Data',
+	'^   \\(1\\) allow, enable, or otherwise s',
+	'^   unsolicited, commercial advertising',
+	'^   \\(spam\\); or',
+	'^   that apply to Sterling Holdings',
+	'^   Sterling Holdings .* reserves the right to modify',
+	'^   terms at any time. By submitting this',
+	'^   policy.',
+    ],
+    'horus.isnic.is' => [
+	'^%',
+    ],
+    'whois.rotld.ro' => [
+	'^%',
+    ],
+    'whois.nic.st' => [
+	'^The data in the .* database is provided',
+	'^The .* Registry does not guarantee',
+	'^The data in the .* database is protected',
+	'^By submitting a .* query, you agree that you will',
+	'^The Domain Council of .* reserves the right',
+    ],
+    'ask.norid.no' => [
+	'^%',
+    ],
+    'whois.hkdnr.net.hk' => [
+	'^Whois server',
+	'^Domain names in the',
+	'^and .* can now be registered',
+	'^Go to http://www.hkdnr.net.hk',
+	'^---------',
+	'^The Registry contains ONLY',
+	'^.* and .*\\.HK domains.',
+    ],
+    'whois.arin.net' => [
+	'^The ARIN Registration Services Host contains',
+	'^Network Information:.*Networks',
+	'^Please use the whois server at',
+	'^Information and .* for .* Information.',
+    ],
+    'qs.nic.net.sg' => [
+	'^\\*',
+    ],
+    'akl-iis.domainz.net.nz' => [
+	'^%',
+    ],
+    'whois.nic.hu' => [
+	'^%',
+    ],
+    'whois.worldsite.ws' => [
+	'^Welcome to the .* Whois Server',
+	'^Use of this service for any',
+	'^than determining the',
+	'^in the .* to be registered',
+	'^prohibited.',
+    ],
+    'whois.ripe.net' => [
+	'^%',
+    ],
+    'whois.nic.cc' => [
+	'^This information is',
+	'^The Data in eNIC',
+	'^Corporation for information',
+	'^in obtaining information',
+	'^registration record',
+	'^accuracy.  By submitting',
+	'^will use this Data only',
+	'^no circumstances will',
+	'^or otherwise support',
+	'^commercial advertising',
+	'^or \\(2\\) enable high volume',
+	'^apply to eNIC Corporation',
+	'^reserves the right to',
+	'^submitting this query,',
+    ],
+    'whois.nic.mil' => [
+	'^To single out one record',
+	'^handle, shown in parenthesis',
+	'^Please be advised that this whois',
+	'^All INTERNET Domain, IP Network Number,',
+	'^the Internet Registry, RS.INTERNIC.NET.',
+    ],
+    'box2.aunic.net' => [
+	'^%',
+    ],
+    'whois.nic.ad.jp' => [
+	'^[',
+    ],
+    'winter.nic.fr' => [
+	'^Tous droits reserves par copyright.',
+	'^Voir http://www.nic.fr',
+	'^Rights restricted by copyright.',
+	'^See http://www.nic.fr/outils',
+    ],
+    'ear.nic-se.se' => [
+	'^#',
+    ],
+    'whois.networksolutions.com' => [
+	'^The Data in',
+	'^Solutions for information',
+	'^information about or',
+	'^Network Solutions does not guarantee',
+	'^WHOIS query, you agree that',
+	'^purposes and that, under no circumstances',
+	'^\\(1\\) allow, enable, or',
+	'^unsolicited, commercial advertising',
+	'^\\(spam\\); or',
+	'^that apply to Network',
+	'^reserves the right',
+	'^this query, you',
+    ],
+    'aardvark.dns.be' => [
+	'^%',
+    ],
+    'whois.dns.be' => [
+	'^%-',
+    ],
+    'whois.nic.tj' => [
+	'^This Whois server looks up only',
+	'^Please see http://nic.tj for more',
+	'^Tajikistan, and the Public Registrar Network.',
+    ],
+    'whois.nic.at' => [
+	'^%',
+    ],
+);
+
+
+1;
diff --git a/install/5.005/Net-Whois-Raw/pwhois b/install/5.005/Net-Whois-Raw/pwhois
new file mode 100755
index 000000000..56d9a7e8d
--- /dev/null
+++ b/install/5.005/Net-Whois-Raw/pwhois
@@ -0,0 +1,106 @@
+#!/usr/bin/perl -w
+
+use Net::Whois::Raw qw( whois $OMIT_MSG $CHECK_FAIL $TIMEOUT $CACHE_DIR );
+use Getopt::Std;
+use strict;
+use vars qw($opt_s $opt_c $opt_S $opt_C $opt_t $opt_T $opt_h);
+
+getopts("scSCtT:h");
+
+if ($opt_h) {
+	print <<EOM;
+	$0 [ -s | -S ] [ -c | -C ] [ -t <timeout> ] [ -T] <domain> [ <server> ]
+
+The -s switch attempts to strip the copyright message or disclaimer.
+The -S switch will attempt some exra rules for it.
+The -c switch attempts to return an empty answer for failed searches.
+The -C switch will attempt some exra rules for it.
+The -T switch takes a parameter that is used for the timeout for
+connection attempts.
+The -t switch enables caching.
+EOM
+	exit; 
+}
+
+
+$OMIT_MSG = $CHECK_FAIL = 0;
+
+$OMIT_MSG = 1 if $opt_s;
+$OMIT_MSG = 2 if $opt_S;
+$CHECK_FAIL = 1 if $opt_c;
+$CHECK_FAIL = 2 if $opt_C;
+$TIMEOUT = $opt_T;
+
+$CACHE_DIR = undef;
+if ($opt_t) {
+    if ($^O =~ /Win/) {
+        $CACHE_DIR = $ENV{'TEMP'} || "C:\\temp";
+    } else {
+        $CACHE_DIR = $ENV{'TEMP'} || "/tmp";
+        my @ent = getpwuid($>);
+        if (@ent) {
+            foreach ("/tmp/$ent[0]", "$ent[7]/.pwhois") {
+                mkdir $_, 0644;
+                if (open(O, ">$_/__$$-$$.tmp")) {
+                    close(O);
+                    unlink "$_/__$$-$$.tmp";
+                    $CACHE_DIR = $_;
+                    last;
+                 }
+            }
+        }
+    }
+}
+
+my $dom = $ARGV[0] || die "Usage: $0 domain";
+
+my $server = $ARGV[1];
+
+eval {
+	my $result = whois($dom, $server);
+	if ($result) {
+		print $result;
+	} else {
+		print STDERR "Failed.\n";
+	}
+};
+if ($@) {
+	my $err = $@;
+	$err =~ s/\s+at \S+ line \d+\.$//;
+	print "\nWhois information could not be fetched:\n$err\n";
+	exit -1;
+}	
+
+__END__
+
+=head1 NAME
+
+pwhois   - Perl written whois client
+
+=head1 SYNOPSIS
+
+	pwhois perl.com
+	pwhois gnu.org
+	pwhois -s police.co.il
+	pwhois -c there.is.no.tld.called.foobar
+	pwhois yahoo.com whois.networksolutions.com
+	pwhois -T 10 funet.fi
+
+etc etc.....
+
+=head1 DESCRIPTION
+
+Just invoke with a domain name, optionally with a whois server name.
+The B<-s> switch attempts to strip the copyright message or disclaimer.
+The B<-c> switch attempts to return an empty answer for failed searches.
+The B<-T> switch takes a parameter that is used for the timeout for
+connection attempts.
+ 
+=head1 AUTHOR
+
+Ariel Brosh, B<schop@cpan.org>
+
+=head1 SEE ALSO
+
+L<Net::Whois::Raw>.
+
diff --git a/install/5.005/Net-Whois-Raw/t/01.t b/install/5.005/Net-Whois-Raw/t/01.t
new file mode 100644
index 000000000..dd7ffc466
--- /dev/null
+++ b/install/5.005/Net-Whois-Raw/t/01.t
@@ -0,0 +1,22 @@
+# Before `make install' is performed this script should be runnable with
+# `make test'. After `make install' it should work as `perl test.pl'
+
+use strict;
+
+use Test::More tests => 5;
+BEGIN { use_ok('Net::Whois::Raw',qw( whois )) };
+
+my @domains = qw( 
+	yahoo.com
+	freshmeat.net
+	freebsd.org
+	ucsb.edu
+);
+
+print "The following tests requires internet connection...\n";
+
+foreach my $domain ( @domains ) {
+	my $txt = whois( $domain );
+	ok($txt =~ /$domain/i, "$domain resolved");
+}
+
-- 
cgit v1.2.1


From 0f10241a8a2e3d5978b17f7b3b0c579902ae2250 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Apr 2004 11:04:06 +0000
Subject: javascript confirm when slaving a domain

---
 httemplate/view/svc_domain.cgi | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index 1dbe16d23..cd9f79d36 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -54,6 +54,9 @@ Service #<%= $svcnum %>
     if ( confirm("Remove this record?") == true )
       window.location.href = href;
   }
+  function slave_areyousure() {
+    return confirm("Remove all records and slave from " + document.SlaveForm.recdata.value + "?");
+  }
 </SCRIPT>
 
 <% my @records; if ( @records = $svc_domain->domain_record ) { %>
@@ -90,7 +93,7 @@ Service #<%= $svcnum %>
  </SELECT>
 <INPUT TYPE="text" NAME="recdata"> <INPUT TYPE="submit" VALUE="Add record">
 </FORM><BR><BR>or<BR><BR>
-<FORM METHOD="POST" ACTION="<%=$p%>edit/process/domain_record.cgi">
+<FORM NAME="SlaveForm" METHOD="POST" ACTION="<%=$p%>edit/process/domain_record.cgi">
 <INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$svcnum%>">
 
 <% if ( @records ) { %> Delete all records and <% } %>
@@ -99,7 +102,7 @@ Slave from nameserver IP
 <INPUT TYPE="hidden" NAME="reczone" VALUE="@"> 
 <INPUT TYPE="hidden" NAME="recaf" VALUE="IN">
 <INPUT TYPE="hidden" NAME="rectype" VALUE="_mstr">
-<INPUT TYPE="text" NAME="recdata"> <INPUT TYPE="submit" VALUE="Slave domain">
+<INPUT TYPE="text" NAME="recdata"> <INPUT TYPE="submit" VALUE="Slave domain" onClick="return slave_areyousure()">
 </FORM>
 <BR><BR><%= joblisting({'svcnum'=>$svcnum}, 1) %>
 </BODY></HTML>
-- 
cgit v1.2.1


From ca19c9b9d3f40739a201e8100c22f5cba3730b9e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Apr 2004 11:39:15 +0000
Subject: automatically update reverse-ARPA records (Bug#462) / recognize SOA
 records with the fqdn as well as @

---
 FS/FS/Conf.pm          |  7 +++++
 FS/FS/domain_record.pm | 78 ++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 79 insertions(+), 6 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index d8191c278..905c60d2b 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1199,6 +1199,13 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'disable_autoreverse',
+    'section'     => 'BIND',
+    'description' => 'Disable automatic synchronization of reverse-ARPA entries.',
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index ea0c48d4f..2a30594da 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -1,7 +1,8 @@
 package FS::domain_record;
 
 use strict;
-use vars qw( @ISA $noserial_hack );
+use vars qw( @ISA $noserial_hack $DEBUG );
+use FS::Conf;
 #use FS::Record qw( qsearch qsearchs );
 use FS::Record qw( qsearchs dbh );
 use FS::svc_domain;
@@ -9,6 +10,8 @@ use FS::svc_www;
 
 @ISA = qw(FS::Record);
 
+$DEBUG = 1;
+
 =head1 NAME
 
 FS::domain_record - Object methods for domain_record records
@@ -110,6 +113,18 @@ sub insert {
     }
   }
 
+  my $conf = new FS::Conf;
+  if ( $self->rectype =~ /^A$/ && ! $conf->exists('disable_autoreverse') ) {
+    my $reverse = $self->reverse_record;
+    if ( $reverse && ! $reverse->recnum ) {
+      my $error = $reverse->insert;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "error adding corresponding reverse-ARPA record: $error";
+      }
+    }
+  }
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   '';
@@ -153,6 +168,18 @@ sub delete {
     }
   }
 
+  my $conf = new FS::Conf;
+  if ( $self->rectype =~ /^A$/ && ! $conf->exists('disable_autoreverse') ) {
+    my $reverse = $self->reverse_record;
+    if ( $reverse && $reverse->recnum && $reverse->recdata eq $self->zone.'.' ){
+      my $error = $reverse->delete;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "error removing corresponding reverse-ARPA record: $error";
+      }
+    }
+  }
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   '';
@@ -284,10 +311,16 @@ sub increment_serial {
 
   my $soa = qsearchs('domain_record', {
     svcnum  => $self->svcnum,
-    reczone => '@', #or full domain ?
+    reczone => '@',
+    recaf   => 'IN',
+    rectype => 'SOA', } )
+  || qsearchs('domain_record', {
+    svcnum  => $self->svcnum,
+    reczone => $self->svc_domain->domain.'.',
     recaf   => 'IN',
     rectype => 'SOA', 
-  } ) or return "soa record not found; can't increment serial";
+  } )
+  or return "soa record not found; can't increment serial";
 
   my $data = $soa->recdata;
   $data =~ s/(\(\D*)(\d+)/$1.($2+1)/e; #well, it works.
@@ -328,11 +361,44 @@ sub zone {
   $zone;
 }
 
-=back
+=item reverse_record 
+
+Returns the corresponding reverse-ARPA record as another FS::domain_record
+object.  If the specific record does not exist in the database but the 
+reverse-ARPA zone itself does, an appropriate new record is created.  If no
+reverse-ARPA zone is available at all, returns false.
+
+(You can test whether or not record itself exists in the database or is a new
+object that might need to be inserted by checking the recnum field)
 
-=head1 VERSION
+Mostly used by the insert and delete methods - probably should see them for
+examples.
 
-$Id: domain_record.pm,v 1.16 2003-08-05 00:20:43 khoff Exp $
+=cut
+
+sub reverse_record {
+  my $self = shift;
+  warn "reverse_record called\n" if $DEBUG;
+  #should support classless reverse-ARPA ala rfc2317 too
+  $self->recdata =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/
+    or return '';
+  my $domain = "$3.$2.$1.in-addr.arpa"; 
+  my $ptr_reczone = $4;
+  warn "reverse_record: searching for domain: $domain\n" if $DEBUG;
+  my $svc_domain = qsearchs('svc_domain', { 'domain' => $domain } )
+    or return '';
+  warn "reverse_record: found domain: $domain\n" if $DEBUG;
+  my %hash = (
+    'svcnum'  => $svc_domain->svcnum,
+    'reczone' => $ptr_reczone,
+    'recaf'   => 'IN',
+    'rectype' => 'PTR',
+  );
+  qsearchs('domain_record', \%hash )
+    or new FS::domain_record { %hash, 'recdata' => $self->zone.'.' };
+}
+
+=back
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 3d7ce17fee0a42b8d476ae7e7eaeef5fc24043d0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Apr 2004 13:11:20 +0000
Subject: added options to select username, svcnum, svcpart

---
 FS/bin/freeside-reexport | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/FS/bin/freeside-reexport b/FS/bin/freeside-reexport
index b5c50a422..34ccbc715 100644
--- a/FS/bin/freeside-reexport
+++ b/FS/bin/freeside-reexport
@@ -1,6 +1,8 @@
-#!/usr/bin/perl -Tw
+#!/usr/bin/perl -w
 
 use strict;
+use vars qw($opt_s $opt_u $opt_p);
+use Getopt::Std;
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::part_export;
@@ -20,20 +22,27 @@ if ( $export_x =~ /^(\d+)$/ ) {
     or die "no exports of type $export_x found\n";
 }
 
-my $svc_something = shift or die &usage;
-my $svc_x;
-if ( $svc_something =~ /^(\d+)$/ ) {
-  my $cust_svc = qsearchs('cust_svc', { svcnum=>$1 } )
-    or die "svcnum $svc_something not found\n";
-  $svc_x = $cust_svc->svc_x;
-} else {
-  $svc_x = qsearchs('svc_acct', { username=>$svc_something } )
-    or die "username $svc_something not found\n";
+getopts('s:u:p:');
+
+my @svc_x = ();
+if ( $opt_s ) {
+  my $cust_svc = qsearchs('cust_svc', { svcnum=>$opt_s } )
+    or die "svcnum $opt_s not found\n";
+  push @svc_x, $cust_svc->svc_x;
+} elsif ( $opt_u ) {
+  my $svc_x = qsearchs('svc_acct', { username=>$opt_u } )
+    or die "username $opt_u not found\n";
+  push @svc_x, $svc_x;
+} elsif ( $opt_p ) {
+  push @svc_x, map { $_->svc_x } qsearch('cust_svc', { svcpart=>$opt_p } );
+  die "no services with svcpart $opt_p found\n" unless @svc_x;
 }
 
 foreach my $part_export ( @part_export ) {
-  my $error = $part_export->export_insert($svc_x);
-  die $error if $error;
+  foreach my $svc_x ( @svc_x ) {
+    my $error = $part_export->export_insert($svc_x);
+    die $error if $error;
+  }
 }
 
 
@@ -47,7 +56,7 @@ freeside-reexport - Command line tool to re-trigger export jobs for existing ser
 
 =head1 SYNOPSIS
 
-  freeside-reexport user exportnum|exporttype svcnum|username
+  freeside-reexport user exportnum|exporttype [ -s svcnum | -u username | -p svcpart ]
 
 =head1 DESCRIPTION
 
-- 
cgit v1.2.1


From fad8705f1dacd35d394c8a0290fdd0a372400bc1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Apr 2004 13:12:17 +0000
Subject: oops, update the usage too

---
 FS/bin/freeside-reexport | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-reexport b/FS/bin/freeside-reexport
index 34ccbc715..54af9dd80 100644
--- a/FS/bin/freeside-reexport
+++ b/FS/bin/freeside-reexport
@@ -47,7 +47,7 @@ foreach my $part_export ( @part_export ) {
 
 
 sub usage {
-  die "Usage:\n\n  freeside-reexport user exportnum|exporttype svcnum|username\n";
+  die "Usage:\n\n  freeside-reexport user exportnum|exporttype [ -s svcnum | -u username | -p svcpart ]\n";
 }
 
 =head1 NAME
-- 
cgit v1.2.1


From 60083c565ce36609c46bbe935ecc31ca97a59210 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 2004 05:53:06 +0000
Subject: comment out xmlrpc server until it is ready

---
 fs_selfservice/FS-SelfService/Makefile.PL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_selfservice/FS-SelfService/Makefile.PL b/fs_selfservice/FS-SelfService/Makefile.PL
index a14580eb2..0b7fc4606 100644
--- a/fs_selfservice/FS-SelfService/Makefile.PL
+++ b/fs_selfservice/FS-SelfService/Makefile.PL
@@ -5,7 +5,7 @@ WriteMakefile(
     'NAME'		=> 'FS::SelfService',
     'VERSION_FROM'	=> 'SelfService.pm', # finds $VERSION
     'EXE_FILES'         => [ 'freeside-selfservice-clientd',
-                             'freeside-selfservice-xmlrpc-server',
+                             #'freeside-selfservice-xmlrpc-server',
                            ],
     'INSTALLSCRIPT'     => '/usr/local/sbin',
     'INSTALLSITEBIN'    => '/usr/local/sbin',
-- 
cgit v1.2.1


From ce41102169513f44c89a1e9bddfb250b29f239bb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 2004 12:00:05 +0000
Subject: beginning of RT integration

---
 Makefile                     | 36 ++++++++++++++---
 htetc/handler.pl             | 96 ++++++++++++++++++++++++++++++++++++++++++--
 rt/FREESIDE_MODIFIED         |  2 +
 rt/etc/RT_SiteConfig.pm      | 12 ++++++
 rt/sbin/rt-setup-database    |  4 ++
 rt/sbin/rt-setup-database.in |  7 ++++
 6 files changed, 147 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index e5ef70d6c..70e588218 100644
--- a/Makefile
+++ b/Makefile
@@ -56,10 +56,18 @@ SELFSERVICE_USER = fs_selfservice
 SELFSERVICE_MACHINES = localhost
 # SELFSERVICE_MACHINES = web1.example.com web2.example.com
 
+#RT_ENABLED = 0
+RT_ENABLED = 1
+RT_DOMAIN = example.com
+RT_TIMEZONE = 'US/Pacific';
+#RT_TIMEZONE = 'US/Eastern';
+
 #---
 
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
+#rt/config.layout.in
+RT_PATH = /opt/rt3
 
 VERSION=1.5.0pre4
 TAG=freeside_1_5_0pre4
@@ -125,6 +133,7 @@ install-docs: docs
 	[ "${TEMPLATE}" = "mason" ] && \
 	  perl -p -i -e "\
 	    s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+	    s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
 	  " ${MASON_HANDLER} || true
 	[ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
 	[ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true
@@ -148,7 +157,7 @@ install-init:
 	  s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\
 	" ${INIT_FILE}
 
-install: install-perl-modules install-docs install-init
+install: install-perl-modules install-docs install-init install-rt
 
 deploy: install
 	${HTTPD_RESTART}
@@ -191,20 +200,35 @@ configure-rt:
 	  s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g;\
 	  s'%%%MASONDATA%%%'${MASONDATA}'g;\
 	" config.layout; \
-	./configure --with-layout=Freeside\
+	./configure --enable-layout=Freeside\
 	            --with-db-type=Pg \
+	            --with-db-dba=${DB_USER} \
 	            --with-db-database=freeside \
 	            --with-db-rt-user=${DB_USER} \
 	            --with-db-rt-pass=${DB_PASSWORD} \
 	            --with-web-user=freeside \
-	            --with-web-group=www
+	            --with-web-group=freeside \
+	            --with-rt-group=freeside
 
 create-rt: configure-rt
 	cd rt; make install
-	rt/sbin/rt-setup-database --action schema
-	rt/sbin/rt-setup-database --action insert_initial
-	rt/sbin/rt-setup-database --action insert --datafile rt/etc/initialdata
+	echo -e "${DB_PASSWORD}\n\\d sessions"\
+	 | psql -UW ${DB_USER} freeside 2>&1\
+	 | grep '^Did not find'\
+	 && rt/sbin/rt-setup-database --dba '${DB_USER}' \
+	                             --dba-password '${DB_PASSWORD}' \
+	                             --action schema \
+	 || true
+	rt/sbin/rt-setup-database --action insert_initial \
+	&& rt/sbin/rt-setup-database --action insert --datafile ${RT_PATH}/etc/initialdata \
+	|| true
+	perl -p -i -e "\
+	  s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\
+	  s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\
+	" ${RT_PATH}/etc/RT_SiteConfig.pm
 
+install-rt:
+	[ ${RT_ENABLED} ] && cd rt; make install
 
 clean:
 	rm -rf aspdocs masondocs
diff --git a/htetc/handler.pl b/htetc/handler.pl
index b81606a0a..d425c2270 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -35,12 +35,37 @@ use strict;
 #                                      data_dir=>'/usr/local/etc/freeside/masondata',
 #                                      out_mode=>'stream',
 #                                     );
+
+use vars qw($r);
+
+if ( %%%RT_ENABLED%%% ) {
+ eval '
+   use lib ("/opt/rt3/local/lib", "/opt/rt3/lib");
+   use RT;
+   use vars qw($Nobody $SystemUser);
+   RT::LoadConfig();
+ ';
+ die $@ if $@;
+
+
+}
+
+
 my $ah = new HTML::Mason::ApacheHandler (
   #interp => $interp,
   #auto_send_headers => 0,
-  comp_root=>'%%%FREESIDE_DOCUMENT_ROOT%%%',
+  comp_root=> [
+                [ 'freeside' => '%%%FREESIDE_DOCUMENT_ROOT%%%'    ],
+                [ 'rt'       => '%%%FREESIDE_DOCUMENT_ROOT%%%/rt' ],
+              ],
   data_dir=>'/usr/local/etc/freeside/masondata',
   #out_mode=>'stream',
+
+  #RT
+  args_method => 'CGI',
+  default_escape_flags => 'h',
+  allow_globals => [qw(%session)],
+  #autoflush => 1,
 );
 
 # Activate the following if running httpd as root (the normal case).
@@ -50,7 +75,7 @@ my $ah = new HTML::Mason::ApacheHandler (
 
 sub handler
 {
-    my ($r) = @_;
+    ($r) = @_;
 
     # If you plan to intermix images in the same directory as
     # components, activate the following to prevent Mason from
@@ -62,7 +87,8 @@ sub handler
     { package HTML::Mason::Commands;
       use strict;
       use vars qw( $cgi $p );
-      use CGI 2.47;
+      use vars qw( %session );
+      use CGI 2.47 qw(-private_tempfiles);
       #use CGI::Carp qw(fatalsToBrowser);
       use Date::Format;
       use Date::Parse;
@@ -125,6 +151,32 @@ sub handler
       use FS::export_svc;
       use FS::msgcat;
 
+      if ( %%%RT_ENABLED%%% ) {
+        eval '
+          use RT::Tickets;
+          use RT::Transactions;
+          use RT::Users;
+          use RT::CurrentUser;
+          use RT::Templates;
+          use RT::Queues;
+          use RT::ScripActions;
+          use RT::ScripConditions;
+          use RT::Scrips;
+          use RT::Groups;
+          use RT::GroupMembers;
+          use RT::CustomFields;
+          use RT::CustomFieldValues;
+          use RT::TicketCustomFieldValues;
+      
+          use RT::Interface::Web;
+          use MIME::Entity;
+          use Text::Wrapper;
+          use CGI::Cookie;
+          use Time::ParseDate;
+        ';
+        die $@ if $@;
+      }
+
       *CGI::redirect = sub {
         my( $self, $location ) = @_;
         use vars qw($m);
@@ -205,7 +257,43 @@ sub handler
 
 #    $r->send_http_header;
 
-    my $status = $ah->handle_request($r);
+    #$ah->interp->remove_escape('h');
+
+    if ( $r->filename =~ /\/rt\// ) { #RT
+      #warn "processing RT file". $r->filename. "; escaping for RT\n";
+
+      # MasonX::Request::ExtendedCompRoot
+      #$ah->interp->comp_root( '/rt'. $ah->interp->comp_root() );
+
+      $ah->interp->set_escape( h => \&RT::Interface::Web::EscapeUTF8 );
+
+      local $SIG{__WARN__};
+      local $SIG{__DIE__};
+
+      RT::Init();
+
+      # We don't need to handle non-text items
+      return -1 if defined( $r->content_type ) && $r->content_type !~ m|^text/|io;
+
+    } else {
+      $ah->interp->set_escape( 'h' => sub { ${$_[0]}; } );
+    }
+
+    my %session;
+    my $status;
+    eval { $status = $ah->handle_request($r); };
+#!!
+#    if ( $@ ) {
+#	$RT::Logger->crit($@);
+#    }
+
+    undef %session;
+
+#!!
+#    if ($RT::Handle->TransactionDepth) {
+#	$RT::Handle->ForceRollback;
+#    	$RT::Logger->crit("Transaction not committed. Usually indicates a software fault. Data loss may have occurred") ;
+#    }
 
     $status;
 }
diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED
index cab7db3cf..84a9f5ea9 100644
--- a/rt/FREESIDE_MODIFIED
+++ b/rt/FREESIDE_MODIFIED
@@ -1,3 +1,5 @@
 sbin/rt-setup-database
+sbin/rt-setup-database.in
 config.layout
 config.layout.in
+etc/RT_SiteConfig.pm
diff --git a/rt/etc/RT_SiteConfig.pm b/rt/etc/RT_SiteConfig.pm
index 0afc6045c..572a2baf6 100644
--- a/rt/etc/RT_SiteConfig.pm
+++ b/rt/etc/RT_SiteConfig.pm
@@ -1 +1,13 @@
+$RT::rtname = '%%%RT_DOMAIN%%%';
+$RT::Organization = '%%%RT_DOMAIN%%%';
+
+$RT::Timezone = '%%%RT_TIMEZONE%%%';
+
+$RT::WebBaseURL = '';
+$RT::WebPath = '/freeside/rt';
+
+$RT::WebExternalAuth = 1;
+$RT::WebFallbackToInternal = 1; #no
+$RT::WebExternalAuto = 1;
+
 1;
diff --git a/rt/sbin/rt-setup-database b/rt/sbin/rt-setup-database
index 83e08270a..434e68671 100644
--- a/rt/sbin/rt-setup-database
+++ b/rt/sbin/rt-setup-database
@@ -592,6 +592,10 @@ $0: Set up RT's database
 --action        init    Initialize the database
                 drop    Drop the database. 
                         This will ERASE ALL YOUR DATA
+                insert_initial 
+                        Insert RT's core system objects
+                insert_initial 
+                        Insert RT's core system objects
                 insert  Insert data into RT's database. 
                         By default, will use RT's installation data.
                         To use a local or supplementary datafile, specify it
diff --git a/rt/sbin/rt-setup-database.in b/rt/sbin/rt-setup-database.in
index 9e990e5b8..f37c69dc7 100644
--- a/rt/sbin/rt-setup-database.in
+++ b/rt/sbin/rt-setup-database.in
@@ -110,6 +110,9 @@ elsif ( $args{'action'} eq 'drop' ) {
     }
     drop_db();
 }
+elsif ( $args{'action'} eq 'insert_initial' ) {
+    insert_initial_data();
+}
 elsif ( $args{'action'} eq 'insert' ) {
     insert_data( $args{'datafile'} );
 }
@@ -589,6 +592,10 @@ $0: Set up RT's database
 --action        init    Initialize the database
                 drop    Drop the database. 
                         This will ERASE ALL YOUR DATA
+                insert_initial 
+                        Insert RT's core system objects
+                insert_initial 
+                        Insert RT's core system objects
                 insert  Insert data into RT's database. 
                         By default, will use RT's installation data.
                         To use a local or supplementary datafile, specify it
-- 
cgit v1.2.1


From b57bf99761751466c5b9a5d35df9e00b407c6f64 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 2004 12:05:04 +0000
Subject: remove accidentally doubled lines in usage inst

---
 rt/sbin/rt-setup-database    | 2 --
 rt/sbin/rt-setup-database.in | 2 --
 2 files changed, 4 deletions(-)

diff --git a/rt/sbin/rt-setup-database b/rt/sbin/rt-setup-database
index 434e68671..17819886c 100644
--- a/rt/sbin/rt-setup-database
+++ b/rt/sbin/rt-setup-database
@@ -594,8 +594,6 @@ $0: Set up RT's database
                         This will ERASE ALL YOUR DATA
                 insert_initial 
                         Insert RT's core system objects
-                insert_initial 
-                        Insert RT's core system objects
                 insert  Insert data into RT's database. 
                         By default, will use RT's installation data.
                         To use a local or supplementary datafile, specify it
diff --git a/rt/sbin/rt-setup-database.in b/rt/sbin/rt-setup-database.in
index f37c69dc7..56f4e8763 100644
--- a/rt/sbin/rt-setup-database.in
+++ b/rt/sbin/rt-setup-database.in
@@ -594,8 +594,6 @@ $0: Set up RT's database
                         This will ERASE ALL YOUR DATA
                 insert_initial 
                         Insert RT's core system objects
-                insert_initial 
-                        Insert RT's core system objects
                 insert  Insert data into RT's database. 
                         By default, will use RT's installation data.
                         To use a local or supplementary datafile, specify it
-- 
cgit v1.2.1


From 4c4b4f8d7548e10b98a173de30e25174f7cd305a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 2004 12:07:36 +0000
Subject: don't enable by default

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 70e588218..8a9921040 100644
--- a/Makefile
+++ b/Makefile
@@ -56,8 +56,8 @@ SELFSERVICE_USER = fs_selfservice
 SELFSERVICE_MACHINES = localhost
 # SELFSERVICE_MACHINES = web1.example.com web2.example.com
 
-#RT_ENABLED = 0
-RT_ENABLED = 1
+RT_ENABLED = 0
+#RT_ENABLED = 1
 RT_DOMAIN = example.com
 RT_TIMEZONE = 'US/Pacific';
 #RT_TIMEZONE = 'US/Eastern';
-- 
cgit v1.2.1


From 9253dd9fd2a67d99b0de171eda9f614ec6815639 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 2004 12:23:00 +0000
Subject: fix quotes

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8a9921040..f631bf1b7 100644
--- a/Makefile
+++ b/Makefile
@@ -59,8 +59,8 @@ SELFSERVICE_MACHINES = localhost
 RT_ENABLED = 0
 #RT_ENABLED = 1
 RT_DOMAIN = example.com
-RT_TIMEZONE = 'US/Pacific';
-#RT_TIMEZONE = 'US/Eastern';
+RT_TIMEZONE = US/Pacific;
+#RT_TIMEZONE = US/Eastern;
 
 #---
 
-- 
cgit v1.2.1


From 179de7c7734515475859823659b0ffb1ddc59635 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 2004 12:37:17 +0000
Subject: fix psql command line options for older pg

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f631bf1b7..b99206c27 100644
--- a/Makefile
+++ b/Makefile
@@ -213,7 +213,7 @@ configure-rt:
 create-rt: configure-rt
 	cd rt; make install
 	echo -e "${DB_PASSWORD}\n\\d sessions"\
-	 | psql -UW ${DB_USER} freeside 2>&1\
+	 | psql -U ${DB_USER} -W freeside 2>&1\
 	 | grep '^Did not find'\
 	 && rt/sbin/rt-setup-database --dba '${DB_USER}' \
 	                             --dba-password '${DB_PASSWORD}' \
-- 
cgit v1.2.1


From 42b77edd5f8c054b1a05511d09563b9a663cfc14 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 Apr 2004 22:28:06 +0000
Subject: fs_passwd.cgi

---
 fs_passwd/fs_passwd.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fs_passwd/fs_passwd.html b/fs_passwd/fs_passwd.html
index fadc4df8b..7e06ecff1 100644
--- a/fs_passwd/fs_passwd.html
+++ b/fs_passwd/fs_passwd.html
@@ -9,6 +9,9 @@
       <tr><th align="right">Username</th>
         <td><input type="text" name="username" size="18"></td>
       </tr>
+      <tr><th align="right">Domain</th>
+        <td><input type="text" name="domain" size="18"></td>
+      </tr>
       <tr><th align="right">Current password</th>
         <td><input type="password" name="old_password" size="18"></td>
       </tr>
-- 
cgit v1.2.1


From 7db53b9364a0f78620f156d7c511facf57343e3d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 Apr 2004 22:29:33 +0000
Subject: oops, this one too

---
 fs_passwd/fs_passwd.cgi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fs_passwd/fs_passwd.cgi b/fs_passwd/fs_passwd.cgi
index 34a33c7f5..38b70d0cf 100755
--- a/fs_passwd/fs_passwd.cgi
+++ b/fs_passwd/fs_passwd.cgi
@@ -22,6 +22,9 @@ my $cgi = new CGI;
 $cgi->param('username') =~ /^([^\n]{0,255}$)/ or die "Illegal username";
 my $me = $1;
 
+$cgi->param('domain') =~ /^([^\n]{0,255}$)/ or die "Illegal domain";
+my $domain = $1;
+
 $cgi->param('old_password') =~ /^([^\n]{0,255}$)/ or die "Illegal old_password";
 my $old_password = $1;
 
@@ -33,6 +36,7 @@ die "New passwords don't match"
 
 my $rv = passwd(
   'username'     => $me,
+  'domain'       => $domain,
   'old_password' => $old_password,
   'new_password' => $new_password,
 );
-- 
cgit v1.2.1


From ed8a6d06b1ed8b13132898d3b05c8b81d63d1038 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 Apr 2004 22:33:19 +0000
Subject: properly disable RT where not using

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b99206c27..5c7f15537 100644
--- a/Makefile
+++ b/Makefile
@@ -228,7 +228,7 @@ create-rt: configure-rt
 	" ${RT_PATH}/etc/RT_SiteConfig.pm
 
 install-rt:
-	[ ${RT_ENABLED} ] && cd rt; make install
+	[ ${RT_ENABLED} -eq 1 ] && cd rt; make install
 
 clean:
 	rm -rf aspdocs masondocs
-- 
cgit v1.2.1


From e28f678a7dff5f66b8efbdf7c2eb2b8f321c6ee0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 Apr 2004 22:34:45 +0000
Subject: really properly disable RT where not using

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5c7f15537..34e06db78 100644
--- a/Makefile
+++ b/Makefile
@@ -228,7 +228,7 @@ create-rt: configure-rt
 	" ${RT_PATH}/etc/RT_SiteConfig.pm
 
 install-rt:
-	[ ${RT_ENABLED} -eq 1 ] && cd rt; make install
+	[ ${RT_ENABLED} -eq 1 ] && cd rt; make install || true
 
 clean:
 	rm -rf aspdocs masondocs
-- 
cgit v1.2.1


From 71cdb6ad901465cdc9326cfc3d3650f3aabda5aa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 Apr 2004 22:35:45 +0000
Subject: thank goodness its friday

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 34e06db78..3b3a4d003 100644
--- a/Makefile
+++ b/Makefile
@@ -228,7 +228,7 @@ create-rt: configure-rt
 	" ${RT_PATH}/etc/RT_SiteConfig.pm
 
 install-rt:
-	[ ${RT_ENABLED} -eq 1 ] && cd rt; make install || true
+	[ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
 
 clean:
 	rm -rf aspdocs masondocs
-- 
cgit v1.2.1


From 76e907f24d984319b7c1e0e9374b99535a99ab43 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 11 Apr 2004 01:50:47 +0000
Subject: update unearned revenue report based on feedback from kevin

---
 httemplate/search/report_prepaid_income.cgi  | 91 ++++++++++++++++------------
 httemplate/search/report_prepaid_income.html | 24 +++++++-
 2 files changed, 74 insertions(+), 41 deletions(-)

diff --git a/httemplate/search/report_prepaid_income.cgi b/httemplate/search/report_prepaid_income.cgi
index eb8bbb55e..1677591a3 100644
--- a/httemplate/search/report_prepaid_income.cgi
+++ b/httemplate/search/report_prepaid_income.cgi
@@ -5,11 +5,13 @@
 
   #needs to be re-written in sql for efficiency
 
-  my $now = $cgi->param('date') && str2time($cgi->param('date')) || time;
+  my $time = time;
+
+  my $now = $cgi->param('date') && str2time($cgi->param('date')) || $time;
   $now =~ /^(\d+)$/ or die "unparsable date?";
   $now = $1;
 
-  my %prepaid;
+  my( $total, $total_legacy ) = ( 0, 0 );
 
   my @cust_bill_pkg =
     grep { $_->cust_pkg && $_->cust_pkg->part_pkg->freq !~ /^([01]|\d+[dw])$/ }
@@ -18,58 +20,67 @@
                                   'edate' => { op=>'>', value=>$now },
                                 }, );
 
-  foreach my $cust_bill_pkg ( @cust_bill_pkg ) {
+  my @cust_pkg = 
+    grep { $_->part_pkg->recur != 0
+           && $_->part_pkg->freq !~ /^([01]|\d+[dw])$/
+         }
+      qsearch ( 'cust_pkg', {
+                              'bill' => { op=>'>', value=>$now }
+                            } );
 
-    #conceptual false laziness w/texas tax exempt_amount stuff in
-    #FS::cust_main::bill
+  foreach my $cust_bill_pkg ( @cust_bill_pkg) { 
+    my $period = $cust_bill_pkg->edate - $cust_bill_pkg->sdate;
 
-    my $freq = $cust_bill_pkg->cust_pkg->part_pkg->freq;
-    my $per_month = sprintf("%.2f", $cust_bill_pkg->recur / $freq);
+    my $elapsed = $now - $cust_bill_pkg->sdate;
+    $elapsed = 0 if $elapsed < 0;
 
-    my($mon, $year) = (localtime($cust_bill_pkg->sdate) )[4,5];
-    $mon+=2; $year+=1900;
+    my $remaining = 1 - $elapsed/$period;
 
-    foreach my $which_month ( 2 .. $freq ) {
-      until ( $mon < 13 ) { $mon -= 12; $year++; }
-      $prepaid{"$year-$mon"} += $per_month;
-      $mon++;
-    }
+    my $unearned = $remaining * $cust_bill_pkg->recur;
+    $total += $unearned;
 
   }
 
-  my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
+  foreach my $cust_pkg ( @cust_pkg ) {
+    my $period = $cust_pkg->bill - $cust_pkg->last_bill;
 
-%>
+    my $elapsed = $now - $cust_pkg->last_bill;
+    $elapsed = 0 if $elapsed < 0;
 
-<%= header( 'Prepaid Income (Unearned Revenue) Report',
-            menubar( 'Main Menu'=>$p, ) )               %>
-<%= table() %>
-<%
+    my $remaining = 1 - $elapsed/$period;
 
-  my $total = 0;
-
-  my ($now_mon, $now_year) = (localtime($now))[4,5];
-  $now_mon+=2; $now_year+=1900;
-  until ( $now_mon < 13 ) { $now_mon -= 12; $now_year++; }
-
-  my $subseq = 0;
-  for my $year ( $now_year .. 2037 ) {
-    for my $mon ( ( $subseq++ ? 1 : $now_mon ) .. 12 ) {
-      if ( $prepaid{"$year-$mon"} ) {
-        $total += $prepaid{"$year-$mon"};
-        %> <TR><TD ALIGN="right"><%= $mon[$mon-1]. ' '. $year %></TD>
-               <TD ALIGN="right">
-                 <%= sprintf("%.2f", $prepaid{"$year-$mon"} ) %>
-               </TD>
-           </TR>
-        <%
-      }
-    }
+    my $unearned = $remaining * $cust_pkg->part_pkg->recur; #!! only works for flat/legacy
+    $total_legacy += $unearned;
 
   }
 
+  $total = sprintf('%.2f', $total);
+  $total_legacy = sprintf('%.2f', $total_legacy);
+
 %>
-<TR><TH>Total</TH><TD ALIGN="right"><%= sprintf("%.2f", $total) %></TD></TR>
+
+<%= header( 'Prepaid Income (Unearned Revenue) Report',
+            menubar( 'Main Menu'=>$p, ) )               %>
+<%= table() %>
+  <TR>
+    <TH>Actual Unearned Revenue</TH>
+    <TH>Legacy Unearned Revenue</TH>
+  </TR>
+  <TR>
+    <TD ALIGN="right">$<%= $total %>
+    <TD ALIGN="right">
+      <%= $now == $time ? "\$$total_legacy" : '<i>N/A</i>'%>
+    </TD>
+  </TR>
+
 </TABLE>
+<BR>
+Actual unearned revenue is the amount of unearned revenue Freeside has  
+actually invoiced for packages with longer-than monthly terms.
+<BR><BR>
+Legacy unearned revenue is the amount of unearned revenue represented by 
+customer packages.  This number may be larger than actual unearned 
+revenue if you have imported longer-than monthly customer packages from
+a previous billing system.
 </BODY>
 </HTML>
diff --git a/httemplate/search/report_prepaid_income.html b/httemplate/search/report_prepaid_income.html
index b85a481be..e8b6ac4b1 100644
--- a/httemplate/search/report_prepaid_income.html
+++ b/httemplate/search/report_prepaid_income.html
@@ -9,7 +9,29 @@
   <BODY BGCOLOR="#e8e8e8">
     <H1>Prepaid Income (Unearned Revenue) Report</H1>
     <FORM ACTION="report_prepaid_income.cgi" METHOD="post">
-    Prepaid income (unearned revenue) as of <INPUT TYPE="text" NAME="date" VALUE="now">
+    <TABLE>
+      <TR>
+        <TD>Prepaid income (unearned revenue) as of </TD>
+        <TD>
+          <INPUT TYPE="text" NAME="date" ID="date_text" VALUE="now">
+          <IMG SRC="../images/calendar.png" ID="date_button" STYLE="cursor: pointer" TITLE="Select date">
+        </TD>
+      </TR>
+      <TR>
+        <TD>
+        </TD>
+        <TD><i>m/d/y</i></TD>
+      </TR>
+    </TABLE>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "date_text",
+    ifFormat:   "%m/%d/%Y",
+    button:     "date_button",
+    align:      "BR"
+  });
+</SCRIPT>
+
     <INPUT TYPE="submit" VALUE="Generate report">
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From 625a49b4b28777e550a321f52f9cc5157a2b580b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 13 Apr 2004 18:27:20 +0000
Subject: adding comments for fedora

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 3b3a4d003..bf73202f6 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ MASONDATA = /usr/local/etc/freeside/masondata
 
 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
-#redhat, mandrake
+#redhat, fedora, mandrake
 #FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside
 #freebsd
 #FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
@@ -24,14 +24,14 @@ FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 #suse
 #FREESIDE_DOCUMENT_ROOT = /srv/www/htdocs/freeside
 
-#deb, redhat, mandrake, suse, others?
+#deb, redhat, fedora, mandrake, suse, others?
 INIT_FILE = /etc/init.d/freeside
 #freebsd
 #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
 
 #deb, suse
 HTTPD_RESTART = /etc/init.d/apache restart
-#redhat, mandrake
+#redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
 #HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
@@ -40,7 +40,7 @@ HTTPD_RESTART = /etc/init.d/apache restart
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
-#deb, redhat, mandrake, suse, others?
+#deb, redhat, fedora, mandrake, suse, others?
 INSTALLGROUP = root
 #freebsd, openbsd
 #INSTALLGROUP = wheel
-- 
cgit v1.2.1


From df33a04853368c1ccb95ea1718b1ebad93b78672 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 13 Apr 2004 20:01:57 +0000
Subject: adding forgotten test

---
 FS/t/part_export-communigate_pro.t | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 FS/t/part_export-communigate_pro.t

diff --git a/FS/t/part_export-communigate_pro.t b/FS/t/part_export-communigate_pro.t
new file mode 100644
index 000000000..88b8b64e0
--- /dev/null
+++ b/FS/t/part_export-communigate_pro.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::communigate_pro;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From bf5454270048ebe558276d9fba7588c48d461a3d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 13 Apr 2004 22:30:48 +0000
Subject: remove dependancy on Net::Whois that wasn't being used anyway

---
 FS/FS/svc_domain.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 4dd6342c7..b713e3e95 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -7,7 +7,7 @@ use vars qw( @ISA $whois_hack $conf
 );
 use Carp;
 use Date::Format;
-use Net::Whois 1.0;
+#use Net::Whois::Raw;
 use FS::Record qw(fields qsearch qsearchs dbh);
 use FS::Conf;
 use FS::svc_Common;
@@ -386,15 +386,16 @@ sub catchall_svc_acct {
 
 =item whois
 
-Returns the Net::Whois::Domain object (see L<Net::Whois>) for this domain, or
-undef if the domain is not found in whois.
+# Returns the Net::Whois::Domain object (see L<Net::Whois>) for this domain, or
+# undef if the domain is not found in whois.
 
 (If $FS::svc_domain::whois_hack is true, returns that in all cases instead.)
 
 =cut
 
 sub whois {
-  $whois_hack or new Net::Whois::Domain $_[0]->domain;
+  #$whois_hack or new Net::Whois::Domain $_[0]->domain;
+  $whois_hack or die "whois_hack not set...\n";
 }
 
 =item _whois
-- 
cgit v1.2.1


From 7c4645bf020a5ce35079008f5eeab6698c5362d5 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 14 Apr 2004 00:48:04 +0000
Subject: Freeside's URI handler for RT3.

---
 rt/lib/RT/URI/freeside.pm | 188 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 188 insertions(+)
 create mode 100644 rt/lib/RT/URI/freeside.pm

diff --git a/rt/lib/RT/URI/freeside.pm b/rt/lib/RT/URI/freeside.pm
new file mode 100644
index 000000000..bfb514df8
--- /dev/null
+++ b/rt/lib/RT/URI/freeside.pm
@@ -0,0 +1,188 @@
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 2004 Kristian Hoffmann <khoff@fire2wire.com>
+# Based on the original RT::URI::base and RT::URI::fsck_com_rt.
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work 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.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+package RT::URI::freeside;
+
+use RT::URI::base;
+use strict;
+use vars qw(@ISA);
+
+@ISA = qw/RT::URI::base/;
+
+
+=head1 NAME
+
+RT::URI::base
+
+=head1 DESCRIPTION
+
+URI handler for freeside URIs.  See http://www.sisd.com/freeside/ for
+more information on freeside.
+
+=cut
+
+
+sub FreesideURIPrefix {
+
+  my $self = shift;
+  return($self->Scheme . '://freeside');
+
+}
+
+sub FreesideURILabel {
+
+  my $self = shift;
+
+  return(undef) unless (exists($self->{'fstable'}) and
+                        exists($self->{'fspkey'}));
+
+  my $label;
+  my ($table, $pkey) = ($self->{'fstable'}, $self->{'fspkey'});
+
+  eval {
+    use FS::UID qw(dbh);
+    use FS::Record qw(qsearchs qsearch dbdef);
+    eval "use FS::$table;";
+    use FS::cust_svc;
+
+    my $dbdef = dbdef or die "No dbdef";
+    my $pkeyfield = $dbdef->table($table)->primary_key
+      or die "No primary key for table $table";
+
+    my $rec = qsearchs($table, { $pkeyfield => $pkey })
+      or die "Record with $pkeyfield == $pkey does not exist in table $table";
+
+    if ($table =~ /^svc_/) {
+      if ($rec->can('cust_svc')) {
+        my $cust_svc = $rec->cust_svc or die '$rec->cust_svc failed';
+        my ($svc, $tag, $svcdb) = $cust_svc->label;
+        $label = "Freeside service ${svc}: ${tag}";
+      }
+    } elsif ($table eq 'cust_main') {
+      my ($last, $first, $company) = map { $rec->getfield($_) }
+                                         qw(last first company);
+      $label = "Freeside customer ${last}, ${first}";
+      $label .= ($company ne '') ? " with ${company}" : '';
+    } else {
+      $label = "Freeside ${table}, ${pkeyfield} == ${pkey}";
+    }
+
+    #... other cases
+
+  };
+
+  if ($label and !$@) {
+    return($label);
+  } else {
+    return(undef);
+  }
+      
+
+}
+
+sub ParseURI { 
+    my $self = shift;
+    my $uri = shift;
+    my ($table, $pkey);
+
+    my $uriprefix = $self->FreesideURIPrefix;
+    if ($uri =~ /^$uriprefix\/(\w+)\/(\d+)$/) {
+      $table = $1;
+      $pkey = $2;
+      $self->{'scheme'} = $self->Scheme;
+    } else {
+      return(undef);
+    }
+
+    $self->{'uri'} = "${uriprefix}/${table}/${pkey}";
+    $self->{'fstable'} = $table;
+    $self->{'fspkey'} = $pkey;
+
+    my $p;
+
+    eval {
+      use FS::UID qw(dbh);
+      use FS::CGI qw(popurl);
+
+      if (dbh) {
+	$p = popurl(3);
+      }
+
+    };
+
+    if ($@ or (!$p)) {
+      $self->{'href'} = $self->{'uri'};
+    } else {
+      $self->{'href'} = "${p}view/${table}.cgi?${pkey}";
+    }
+
+    $self->{'uri'};
+
+}
+
+sub Scheme { 
+    my $self = shift;
+    return('freeside');
+
+}
+
+sub HREF {
+    my $self = shift;
+    return($self->{'href'} || $self->{'uri'});
+}
+
+sub IsLocal {
+    my $self = shift;
+    return undef;
+}
+
+=head2 AsString
+
+Return a "pretty" string representing the URI object.
+
+This is meant to be used like this:
+
+ % $re = $uri->Resolver;
+ <A HREF="<% $re->HREF %>"><% $re->AsString %></A>
+
+=cut
+
+sub AsString {
+    my $self = shift;
+    my $prettystring;
+    if ($prettystring = $self->FreesideURILabel) {
+      return $prettystring;
+    } else {
+      return $self->URI;
+    }
+}
+
+eval "require RT::URI::base_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/URI/base_Vendor.pm});
+eval "require RT::URI::base_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/URI/base_Local.pm});
+
+1;
-- 
cgit v1.2.1


From db5bfd844fa34e21a82c2d1b62ff5c7275d5dd8e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 Apr 2004 01:00:10 +0000
Subject: keeping track of what's been changed to make life easier when
 importing new upstream versions

---
 rt/FREESIDE_MODIFIED | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED
index 84a9f5ea9..3937c30fc 100644
--- a/rt/FREESIDE_MODIFIED
+++ b/rt/FREESIDE_MODIFIED
@@ -3,3 +3,4 @@ sbin/rt-setup-database.in
 config.layout
 config.layout.in
 etc/RT_SiteConfig.pm
+lib/RT/URI/freeside.pm
-- 
cgit v1.2.1


From 1b8f95fc90575c120f1b178e05b3fbd1da35bfc9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 14 Apr 2004 03:20:26 +0000
Subject: adding preliminary install script for fedora core 1

---
 install/fedora/fc1/INSTALL      | 66 +++++++++++++++++++++++++++++++++++++++++
 install/fedora/fc1/sources.list | 12 ++++++++
 2 files changed, 78 insertions(+)
 create mode 100755 install/fedora/fc1/INSTALL
 create mode 100644 install/fedora/fc1/sources.list

diff --git a/install/fedora/fc1/INSTALL b/install/fedora/fc1/INSTALL
new file mode 100755
index 000000000..c347609b3
--- /dev/null
+++ b/install/fedora/fc1/INSTALL
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+wget --passive-ftp --continue http://download.fedora.us/fedora/fedora/1/i386/RPMS.stable/apt-0.5.15cnc5-0.fdr.10.1.i386.rpm
+rpm -i apt*i386.rpm
+
+cp sources.list /etc/apt/sources.list
+
+apt-get update
+
+apt-get install perl-Devel-Symdump perl-BSD-Resource
+
+wget --passive-ftp --continue http://linux.reb00t.com/fedora-current/RPMS/apache-1.3.29-1.n0i.2.MPSSL.i686.rpm http://linux.reb00t.com/fedora-current/RPMS/mm-1.3.0-0.n0i.2.i686.rpm http://mirrors.kernel.org/fedora.us/fedora/fedora/1.91/i386/RPMS.os/db4-4.2.52-3.1.i386.rpm
+
+apt-get remove httpd mod_perl
+
+rpm -i mm-1.3.0-0.n0i.2.i686.rpm db4-4.2.52-3.1.i386.rpm apache-1.3.29-1.n0i.2.MPSSL.i686.rpm
+
+/sbin/chkconfig httpd on
+
+#edit /etc/httpd/conf/httpd.conf, remove mod_auth_db LoadMoudle and AddModule
+
+echo 'OPTIONS="-DHAVE_PERL -DHAVE_SSL"' >>/etc/sysconfig/apache
+
+/etc/init.d/httpd start
+
+echo 'RPM::Allow-Duplicated { "^db4$"; };' >>/etc/apt/apt.conf
+
+wget --continue http://atrpms.physik.fu-berlin.de/RPM-GPG-KEY.atrpms
+rpm --import RPM-GPG-KEY.atrpms
+wget --continue http://dag.wieers.com/packages/RPM-GPG-KEY.dag.txt
+rpm --import RPM-GPG-KEY.dag.txt
+
+apt-get install perl-DBD-MySQL perl-DBI perl-DateManip perl-HTML-Parser perl-HTML-Tagset perl-TimeDate perl-URI perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server postgresql-devel screen zsh lftp cvs gcc gd perl-GD perl-MailTools perl-FreezeThaw perl-NetAddr-IP perl-Chart 
+
+perl -MCPAN -e"install Net::Whois::Raw, Business::CreditCard, \
+                       File::CounterFile, String::Approx, Text::Template, \
+                       DBIx::DataSource, DBIx::DBSchema, Net::SSH, \
+                       String::ShellQuote, Net::SCP, Apache::ASP, \
+                       Tie::IxHash, Time::Duration, \
+                       HTML::Widgets::SelectLayers, Apache::DBI, \
+                       Cache::Cache, IPC::ShareLite, Locale::SubCountry, \
+                       DBD::Pg, Crypt::PasswdMD5 "
+
+
+#remove perl & ssl LoadModule lines from /etc/httpd/conf/httpd.conf
+#as they're statically linked (?)
+
+/usr/sbin/useradd freeside
+chsh freeside -s /bin/bash
+
+/sbin/chkconfig postgresql on
+/etc/init.d/postgresql start
+
+echo -e '\n\ny\nn" | su postgres -c "createuser -P freeside"
+
+su freeside -c "createdb freeside"
+
+#?
+cd ../../..
+make install-perl-modules
+make create-config
+freeside-adduser -c -h /usr/local/etc/freeside/htpasswd ivan
+su freeside -c 'freeside-setup ivan'
+su freeside -c '/home/ivan/freeside/bin/populate-msgcat ivan'
+make deploy
+
diff --git a/install/fedora/fc1/sources.list b/install/fedora/fc1/sources.list
new file mode 100644
index 000000000..9b3624225
--- /dev/null
+++ b/install/fedora/fc1/sources.list
@@ -0,0 +1,12 @@
+# Fedora Core (Kernel.org, San Francisco California, USA)
+rpm http://mirrors.kernel.org/fedora.us/fedora fedora/1/i386 os updates
+rpm-src http://mirrors.kernel.org/fedora.us/fedora fedora/1/i386 os updates
+
+# Fedora Extras (Kernel.org, San Francisco California, USA)
+rpm http://mirrors.kernel.org/fedora.us/fedora fedora/1/i386 stable
+rpm-src http://mirrors.kernel.org/fedora.us/fedora fedora/1/i386 stable
+
+### Dag Apt Repository for Red Hat Fedora Core 1 (rhfc1)
+rpm http://apt.sw.be redhat/fc1/en/i386 dag
+
+rpm http://apt.physik.fu-berlin.de redhat/9/en/i386 at-testing
-- 
cgit v1.2.1


From d01dbb663c0d58ed4294c9284106a0e46f274301 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 20 Apr 2004 00:58:04 +0000
Subject: add methods for masking credit cards, add payment info modification
 to self-service

---
 FS/FS/ClientAPI/MyAccount.pm                 | 34 ++++++++++++++++++++++++++--
 FS/FS/cust_main.pm                           | 15 ++++++++++++
 FS/FS/cust_pay.pm                            | 17 ++++++++++----
 FS/FS/cust_refund.pm                         | 20 ++++++++++++----
 fs_selfservice/FS-SelfService/SelfService.pm |  4 ++--
 httemplate/view/cust_main.cgi                | 15 ++++++------
 6 files changed, 85 insertions(+), 20 deletions(-)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 44d81c999..16fb8bf7a 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -38,6 +38,7 @@ use vars qw( @cust_main_editable_fields );
     county state zip country daytime night fax
   ship_first ship_last ship_company ship_address1 ship_address2 ship_city
     ship_state ship_zip ship_country ship_daytime ship_night ship_fax
+  payby payinfo payname
 );
 
 #store in db?
@@ -116,6 +117,16 @@ sub customer_info {
       $return{$_} = $cust_main->get($_);
     }
 
+    if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) {
+      $return{payinfo} = $cust_main->masked_payinfo;
+      @return{'month', 'year'} = $cust_main->paydate_monthyear;
+    }
+
+    $return{'invoicing_list'} =
+      join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list );
+    $return{'postal_invoicing'} =
+      0 < ( grep { $_ eq 'POST' } $cust_main->invoicing_list );
+
   } else { #no customer record
 
     my $svc_acct = qsearchs('svc_acct', { 'svcnum' => $session->{'svcnum'} } )
@@ -145,7 +156,26 @@ sub edit_info {
   my $new = new FS::cust_main { $cust_main->hash };
   $new->set( $_ => $p->{$_} )
     foreach grep { exists $p->{$_} } @cust_main_editable_fields;
-  my $error = $new->replace($cust_main);
+
+  if ( $p->{'payby'} =~ /^(CARD|DCRD)$/ ) {
+    $new->paydate($p->{'year'}. '-'. $p->{'month'}. '-01');
+    if ( $new->payinfo eq $cust_main->payinfo_masked ) {
+      $new->payinfo($cust_main->payinfo);
+    } else {
+      $new->paycvv($p->{'paycvv'});
+    }
+  }
+
+  my @invoicing_list;
+  if ( exists $p->{'invoicing_list'} || exists $p->{'postal_invoicing'} ) {
+    #false laziness with httemplate/edit/process/cust_main.cgi
+    @invoicing_list = split( /\s*\,\s*/, $p->{'invoicing_list'} );
+    push @invoicing_list, 'POST' if $p->{'postal_invoicing'};
+  } else {
+    @invoicing_list = $cust_main->invoicing_list;
+  }
+
+  my $error = $new->replace($cust_main, \@invoicing_list);
   return { 'error' => $error } if $error;
   #$cust_main = $new;
   
@@ -174,7 +204,7 @@ sub payment_info {
   $return{payby} = $cust_main->payby;
 
   if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) {
-    warn $return{card_type} = cardtype($cust_main->payinfo);
+    #warn $return{card_type} = cardtype($cust_main->payinfo);
     $return{payinfo} = $cust_main->payinfo;
 
     @return{'month', 'year'} = $cust_main->paydate_monthyear;
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 74015de34..ad5b0df1f 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2151,6 +2151,19 @@ sub paydate_monthyear {
   }
 }
 
+=item payinfo_masked
+
+Returns a "masked" payinfo field with all but the last four characters replaced
+by 'x'es.  Useful for displaying credit cards.
+
+=cut
+
+sub payinfo_masked {
+  my $self = shift;
+  my $payinfo = $self->payinfo;
+  'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
+}
+
 =item invoicing_list [ ARRAYREF ]
 
 If an arguement is given, sets these email addresses as invoice recipients
@@ -2844,6 +2857,8 @@ card types.
 
 No multiple currency support (probably a larger project than just this module).
 
+payinfo_masked false laziness with cust_pay.pm and cust_refund.pm
+
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::cust_pkg>, L<FS::cust_bill>, L<FS::cust_credit>
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index e1943ae2d..ba9924f99 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -396,16 +396,25 @@ sub cust_main {
   qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
 }
 
+=item payinfo_masked
 
-=back
+Returns a "masked" payinfo field with all but the last four characters replaced
+by 'x'es.  Useful for displaying credit cards.
+
+=cut
 
-=head1 VERSION
+sub payinfo_masked {
+  my $self = shift;
+  my $payinfo = $self->payinfo;
+  'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
+}
 
-$Id: cust_pay.pm,v 1.26 2003-09-10 10:54:46 ivan Exp $
+=back
 
 =head1 BUGS
 
-Delete and replace methods.
+Delete and replace methods.  payinfo_masked false laziness with cust_main.pm
+and cust_refund.pm
 
 =head1 SEE ALSO
 
diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 250bd20e0..d60c01061 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -263,15 +263,27 @@ sub check {
   $self->SUPER::check;
 }
 
-=back
+=item payinfo_masked
+
+Returns a "masked" payinfo field with all but the last four characters replaced
+by 'x'es.  Useful for displaying credit cards.
 
-=head1 VERSION
+=cut
 
-$Id: cust_refund.pm,v 1.21 2003-08-05 00:20:42 khoff Exp $
+
+sub payinfo_masked {
+  my $self = shift;
+  my $payinfo = $self->payinfo;
+  'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
+}
+
+
+=back
 
 =head1 BUGS
 
-Delete and replace methods.
+Delete and replace methods.  payinfo_masked false laziness with cust_main.pm
+and cust_pay.pm
 
 =head1 SEE ALSO
 
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 7cbf5ecad..920415e30 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -246,7 +246,7 @@ the following keys: invnum, date, owed
 
 An HTML fragment containing shipping and billing addresses.
 
-=item The following fields are also returned: first last company address1 address2 city county state zip country daytime night fax ship_first ship_last ship_company ship_address1 ship_address2 ship_city ship_state ship_zip ship_country ship_daytime ship_night ship_fax
+=item The following fields are also returned: first last company address1 address2 city county state zip country daytime night fax ship_first ship_last ship_company ship_address1 ship_address2 ship_city ship_state ship_zip ship_country ship_daytime ship_night ship_fax payby payinfo payname month year invoicing_list postal_invoicing
 
 =back
 
@@ -254,7 +254,7 @@ An HTML fragment containing shipping and billing addresses.
 
 Takes a hash reference as parameter with any of the following keys:
 
-first last company address1 address2 city county state zip country daytime night fax ship_first ship_last ship_company ship_address1 ship_address2 ship_city ship_state ship_zip ship_country ship_daytime ship_night ship_fax
+first last company address1 address2 city county state zip country daytime night fax ship_first ship_last ship_company ship_address1 ship_address2 ship_city ship_state ship_zip ship_country ship_daytime ship_night ship_fax payby payinfo paycvv payname month year invoicing_list postal_invoicing
 
 If a field exists, the customer record is updated with the new value of that
 field.  If a field does not exist, that field is not changed on the customer
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 624fe37d1..cf899d041 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -235,8 +235,7 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
   ;
 
   if ( $cust_main->payby eq 'CARD' || $cust_main->payby eq 'DCRD' ) {
-    my $payinfo = $cust_main->payinfo;
-    $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
+    my $payinfo = $cust_main->payinfo_masked;
     print 'Credit&nbsp;card&nbsp;',
           ( $cust_main->payby eq 'CARD' ? '(automatic)' : '(on-demand)' ),
           '</TD></TR>',
@@ -601,11 +600,11 @@ function cust_credit_areyousure(href) {
   foreach my $cust_pay ($cust_main->cust_pay) {
 
     my $payby = $cust_pay->payby;
-    my $payinfo = $cust_pay->payinfo;
+    my $payinfo = $payby eq 'CARD'
+                    ? $cust_pay->payinfo_masked
+                    : $cust_pay->payinfo;
     my @cust_bill_pay = $cust_pay->cust_bill_pay;
 
-    $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
-      if $payby eq 'CARD';
     my $target = "$payby$payinfo";
     $payby =~ s/^BILL$/Check #/ if $payinfo;
     $payby =~ s/^BILL$//;
@@ -751,10 +750,10 @@ function cust_credit_areyousure(href) {
   foreach my $cust_refund ($cust_main->cust_refund) {
 
     my $payby = $cust_refund->payby;
-    my $payinfo = $cust_refund->payinfo;
+    my $payinfo = $payby eq 'CARD'
+                    ? $cust_refund->payinfo_masked
+                    : $cust_refund->payinfo;
 
-    $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
-      if $payby eq 'CARD';
     $payby =~ s/^BILL$/Check #/ if $payinfo;
     $payby =~ s/^(CARD|COMP)$/$1 /;
 
-- 
cgit v1.2.1


From 953a05aefc990758f185d5284cdcbe8566b0229d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 20 Apr 2004 01:23:06 +0000
Subject: accept expiration dates in the same format they are output...

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index ad5b0df1f..34dfac5bf 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -895,7 +895,7 @@ sub check {
     my( $m, $y );
     if ( $self->paydate =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/ ) {
       ( $m, $y ) = ( $1, length($2) == 4 ? $2 : "20$2" );
-    } elsif ( $self->paydate =~ /^(20)?(\d{2})[\/\-](\d{2})[\/\-]\d+$/ ) {
+    } elsif ( $self->paydate =~ /^(20)?(\d{2})[\/\-](\d{1,2})[\/\-]\d+$/ ) {
       ( $m, $y ) = ( $3, "20$2" );
     } else {
       return "Illegal expiration date: ". $self->paydate;
-- 
cgit v1.2.1


From b563ce9b834e4b8c3b2f0508f6c528d8b881e08d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 20 Apr 2004 20:24:36 +0000
Subject: silly bug noticed by matthewd

---
 FS/FS/ClientAPI/MyAccount.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 16fb8bf7a..d2b6e0450 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -118,7 +118,7 @@ sub customer_info {
     }
 
     if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) {
-      $return{payinfo} = $cust_main->masked_payinfo;
+      $return{payinfo} = $cust_main->payinfo_masked;
       @return{'month', 'year'} = $cust_main->paydate_monthyear;
     }
 
-- 
cgit v1.2.1


From 896617d061b92dc9c324e51c4adcb3184adbc259 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Apr 2004 01:49:55 +0000
Subject: respect country default for batch import

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 34dfac5bf..2f01111ef 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2696,7 +2696,7 @@ sub batch_import {
     my %cust_main = (
       agentnum => $agentnum,
       refnum   => $refnum,
-      country  => 'US', #default
+      country  => $conf->config('countrydefault') || 'US',
       payby    => 'BILL', #default
       paydate  => '12/2037', #default
     );
-- 
cgit v1.2.1


From 04c0875f27d36309b6d8da8063a9254fef3a7398 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Apr 2004 20:52:32 +0000
Subject: as an invoice event, emailing/printing problems should be fatal and
 trigger retry

---
 FS/FS/cust_bill.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index a3e76620e..7e2c8fb55 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -339,7 +339,7 @@ sub send {
       'subject' => 'Invoice',
       'body'    => \@print_text,
     );
-    return "can't send invoice: $error" if $error;
+    die "can't email invoice: $error\n" if $error;
 
   }
 
@@ -350,11 +350,11 @@ sub send {
   if ( grep { $_ eq 'POST' } @invoicing_list ) { #postal
     my $lpr = $conf->config('lpr');
     open(LPR, "|$lpr")
-      or return "Can't open pipe to $lpr: $!";
+      or die "Can't open pipe to $lpr: $!\n";
     print LPR @print_text;
     close LPR
-      or return $! ? "Error closing $lpr: $!"
-                   : "Exit status $? from $lpr";
+      or die $! ? "Error closing $lpr: $!\n"
+                : "Exit status $? from $lpr\n";
   }
 
   '';
-- 
cgit v1.2.1


From 47208f7694a6ec1cb979d7d0da7848dfe0e0aa7b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 22 Apr 2004 07:07:30 +0000
Subject: initial copy from report_cust_pay.html

---
 httemplate/search/report_cust_credit.html | 54 +++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 httemplate/search/report_cust_credit.html

diff --git a/httemplate/search/report_cust_credit.html b/httemplate/search/report_cust_credit.html
new file mode 100644
index 000000000..1b30685dc
--- /dev/null
+++ b/httemplate/search/report_cust_credit.html
@@ -0,0 +1,54 @@
+<HTML>
+  <HEAD>
+    <TITLE>Payment report criteria</TITLE>
+    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
+  </HEAD>
+  <BODY BGCOLOR="#e8e8e8">
+    <H1>Payment report criteria</H1>
+    <FORM ACTION="cust_pay.cgi" METHOD="post">
+    <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
+    <TABLE>
+      <TR>
+        <TD ALIGN="right">Payments of type: </TD>
+        <TD><SELECT NAME="payby">
+              <OPTION VALUE="">all</OPTION>
+              <OPTION VALUE="CARD">credit card (all)</OPTION>
+              <OPTION VALUE="CARD-VisaMC">credit card (Visa/MasterCard)</OPTION>
+              <OPTION VALUE="CARD-Amex">credit card (American Express)</OPTION>
+              <OPTION VALUE="CARD-Discover">credit card (Discover)</OPTION>
+              <OPTION VALUE="CHEK">electronic check / ACH</OPTION>
+              <OPTION VALUE="BILL">check / cash</OPTION>
+            </SELECT>
+        </TD>
+      </TR>
+      <TR>
+        <TD ALIGN="right">From: </TD>
+        <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "beginning_text",
+    ifFormat:   "%m/%d/%Y",
+    button:     "beginning_button",
+    align:      "BR"
+  });
+</SCRIPT>
+      </TR>
+        <TD ALIGN="right">To: </TD>
+        <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "ending_text",
+    ifFormat:   "%m/%d/%Y",
+    button:     "ending_button",
+    align:      "BR"
+  });
+</SCRIPT>
+      </TR>
+    </TABLE>
+    <BR><INPUT TYPE="submit" VALUE="Get Report">
+    </FORM>
+  </BODY>
+</HTML>
-- 
cgit v1.2.1


From a8c68c9a3f346c49756956b51fa37a37ef795979 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 22 Apr 2004 07:27:35 +0000
Subject: minor doc updates

---
 httemplate/docs/install.html   | 6 +++---
 httemplate/docs/upgrade10.html | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 41aacc51b..9da2de37f 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -134,7 +134,7 @@ PerlModule Apache::ASP
 # your freeside document root
 &lt;Directory&nbsp;/usr/local/apache/htdocs/freeside-asp&gt;
 &lt;Files ~ (\.cgi|\.html)&gt;
-SetHandler perl-script
+AddHandler perl-script .cgi .html
 PerlHandler Apache::ASP
 &lt;/Files&gt;
 &lt;Perl&gt;
@@ -162,8 +162,8 @@ PerlSetVar&nbsp;IncludesDir&nbsp;/usr/local/apache/htdocs/freeside-asp
 <font size="-1"><pre>
 PerlModule HTML::Mason
 &lt;Directory&nbsp;/usr/local/apache/htdocs/freeside-mason&gt;
-&lt;Files ~ (\.cgi|.html)&gt;
-SetHandler perl-script
+&lt;Files ~ (\.cgi|\.html)&gt;
+AddHandler perl-script .cgi .html
 PerlHandler HTML::Mason
 &lt;/Files&gt;
 &lt;Perl&gt;
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 205866e73..788eb0a97 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -4,7 +4,9 @@ this is incomplete
 install DBD::Pg 1.32 (or, if you're using a Perl version before 5.6, you could try installing DBD::Pg 1.22 with <a href="http://420.am/~ivan/DBD-Pg-1.22-fixvercmp.patch">this patch</a> and commenting out the "use DBD::Pg 1.32" at the top of DBIx/DBSchema/DBD/Pg.pm)
 install DBIx::DBSchema 0.23
 install Net::SSH 0.08
-- If using Apache::ASP, add PerlSetVar RequestBinaryRead Off and PerlSetVar IncludesDir /your/freeside/document/root/ to your Apache configuration and make sure you are using Apache::ASP minimum version 2.55. 
+- If using Apache::ASP, add PerlSetVar RequestBinaryRead Off and PerlSetVar IncludesDir /your/freeside/document/root/ to your Apache configuration and make sure you are using Apache::ASP minimum version 2.55.
+- In httpd.conf, change <Files ~ \.cgi> to  <Files ~ (\.cgi|\.html)>
+- In httpd.conf, change <b>AddHandler perl-script .cgi</b> or <b>SetHandler perl-script</b> to <b>AddHandler perl-script .cgi .html</b>
 
 install NetAddr::IP, Chart::Base, IPC::ShareLite and Locale::SubCountry
 
-- 
cgit v1.2.1


From c0c6e3937fb2fa8f6b7cab217461515e837c444f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 22 Apr 2004 07:38:04 +0000
Subject: silly pager fix

---
 httemplate/elements/pager.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/elements/pager.html b/httemplate/elements/pager.html
index db9ff83bf..0510d327d 100644
--- a/httemplate/elements/pager.html
+++ b/httemplate/elements/pager.html
@@ -25,7 +25,7 @@
         $cgi->param('offset', $poff);
 %>
 
-        <A HREF="<%= $cgi->self_url %>">$page</A>
+        <A HREF="<%= $cgi->self_url %>"><%= $page %></A>
 
 <%
       }
-- 
cgit v1.2.1


From 5cd995865b91204f7ce9233a8ba4d5eee62f9be4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Apr 2004 02:32:38 +0000
Subject: working templated invoice search!

---
 httemplate/index.html                  | 14 ++---
 httemplate/search/cust_bill.html       | 94 ++++++++++++++++++++++++++++------
 httemplate/search/elements/search.html | 86 +++++++++++++++++++++++++------
 httemplate/search/sql.html             |  7 +--
 4 files changed, 156 insertions(+), 45 deletions(-)

diff --git a/httemplate/index.html b/httemplate/index.html
index d8879bfb8..ad086ebc8 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -55,18 +55,18 @@
       <BR><A HREF="search/cust_main-quickpay.html">Quick payment entry</A>
       <BR>
       <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST">Credit card # <INPUT TYPE="hidden" NAME="card_on" VALUE="1"><INPUT TYPE="text" NAME="card"><INPUT TYPE="submit" VALUE="Search"></FORM>
-      <FORM ACTION="search/cust_bill.cgi" METHOD="POST">Invoice # <INPUT TYPE="text" NAME="invnum" SIZE="8"><INPUT TYPE="submit" VALUE="Search"></FORM>
+      <FORM ACTION="search/cust_bill.html" METHOD="POST">Invoice # <INPUT TYPE="text" NAME="invnum" SIZE="8"><INPUT TYPE="submit" VALUE="Search"></FORM>
       <FORM ACTION="search/cust_pay.cgi" METHOD="POST">Check # <INPUT TYPE="text" NAME="payinfo" SIZE="8"><INPUT TYPE="hidden" NAME="payby" VALUE="BILL"><INPUT TYPE="submit" VALUE="Search"></FORM>
       <BR><A HREF="browse/cust_pay_batch.cgi">View pending credit card batch</A>      <BR><BR><A HREF="search/cust_pkg_report.cgi">Packages (by next bill date range)</A>
       <BR><BR>Invoice reports
             <UL>
               <LI><a href="search/cust_bill_event.html">Invoice event errors (failed credit cards)</a>
-              <LI>open invoices (<A HREF="search/cust_bill.cgi?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN_custnum">by customer number</A>)
-              <LI>30 day open invoices (<A HREF="search/cust_bill.cgi?OPEN30_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN30_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN30_custnum">by customer number</A>)
-              <LI>60 day open invoices (<A HREF="search/cust_bill.cgi?OPEN60_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN60_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN60_custnum">by customer number</A>)
-              <LI>90 day open invoices (<A HREF="search/cust_bill.cgi?OPEN90_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN90_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN90_custnum">by customer number</A>)
-              <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
-              <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?date">by date</A>) (<A HREF="search/cust_bill.cgi?custnum">by customer number</A>)
+              <LI>open invoices (<A HREF="search/cust_bill.html?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN_custnum">by customer number</A>)
+              <LI>30 day open invoices (<A HREF="search/cust_bill.html?OPEN30_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN30_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN30_custnum">by customer number</A>)
+              <LI>60 day open invoices (<A HREF="search/cust_bill.html?OPEN60_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN60_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN60_custnum">by customer number</A>)
+              <LI>90 day open invoices (<A HREF="search/cust_bill.html?OPEN90_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN90_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN90_custnum">by customer number</A>)
+              <LI>120 day open invoices (<A HREF="search/cust_bill.html?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN120_custnum">by customer number</A>)
+              <LI>all invoices (<A HREF="search/cust_bill.html?invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?date">by date</A>) (<A HREF="search/cust_bill.html?custnum">by customer number</A>)
             </UL>
       <A HREF="search/report_cust_pay.html">Payment report (by type and/or date range)</A>
       <BR><BR><A HREF="graph/money_time.cgi">Sales, Credits and Receipts Summary</A>
diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index 36e8bc91b..51241575c 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -1,19 +1,81 @@
-<HTML>
-  <HEAD>
-    <TITLE>Invoice Search</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <FONT SIZE=7>
-      Invoice Search
-    </FONT>
-    <BR><BR>
-    <FORM ACTION="cust_bill.cgi" METHOD="post">
-      Search for <B>invoice #</B>: 
-      <INPUT TYPE="text" NAME="invnum">
+<%
+   my( $count_query, $sql_query );
+   if ( $cgi->keywords ) {
+     my($query) = $cgi->keywords;
+     my $owed =
+       "charged - ( SELECT COALESCE(SUM(amount),0) FROM cust_bill_pay
+                    WHERE cust_bill_pay.invnum = cust_bill.invnum )
+                - ( SELECT COALESCE(SUM(amount),0) FROM cust_credit_bill
+                    WHERE cust_credit_bill.invnum = cust_bill.invnum )";
+     my @where;
+     my $orderby = '';
+     if ( $query =~ /^(OPEN(\d*)_)?(invnum|date|custnum)$/ ) {
+       my($open, $days, $field) = ($1, $2, $3);
+       $field = "_date" if $field eq 'date';
+       $orderby = "ORDER BY cust_bill.$field";
+       push @where, "0 != $owed" if $open;
+       push @where, "cust_bill._date < ". (time-86400*$days) if $days;
+     } else {
+       die "unknown query string $query";
+     }
+   
+     my $extra_sql = scalar(@where) ? 'WHERE '. join(' AND ', @where) : '';
+   
+     $count_query = "SELECT COUNT(*), sum(charged), sum($owed)
+                     FROM cust_bill $extra_sql";
+   
+     $sql_query = {
+       'table'     => 'cust_bill',
+       'hashref'   => {},
+       'select'    => "cust_bill.*, $owed as owed",
+       'extra_sql' => "$extra_sql $orderby"
+     };
+   
+   } else {
+     $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
+     $count_query = 'SELECT 1';
+     $sql_query = {
+       'table'     => 'cust_bill',
+       'hashref'   => { 'invnum' => $2 },
+       #'select'    => '*',
+     };
+   }
 
-      <P><INPUT TYPE="submit" VALUE="Search">
+   my $link  = [ "${p}view/cust_bill.cgi?", 'invnum', ];
+   my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
 
-    </FORM>
-  </BODY>
-</HTML>
+%>
+<%= include( 'elements/search.html',
+               'title'       => 'Invoice Search Results',
+               'name'        => 'invoices',
+               'query'       => $sql_query,
+               'count_query' => $count_query,
+               'count_addl'  => [ '$%.2f total amount',
+                                  '$%.2f total outstanding balance',
+                                ],
+               'redirect'    => $link,
+               'header'      =>
+                 [ '', qw(Balance Amount Date ), 'Contact name', 'Company' ],
+               'fields'      => [
+                 'invnum',
+                 sub { sprintf('$%.2f', shift->get('owed') ) },
+                 sub { sprintf('$%.2f', shift->charged     ) },
+                 sub { time2str('%b %d %Y', shift->_date ) },
+                 sub { my $cust_main = shift->cust_main;
+                       $cust_main->get('last'). ', '. $cust_main->first;
+                     },
+                 sub { my $cust_main = shift->cust_main;
+                       $cust_main->company;
+                     },
+               ],
+               'links' => [
+                 $link,
+                 $link,
+                 $link,
+                 $link,
+                 $clink,
+                 $clink,
+               ],
 
+    )
+%>
diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index fbedcaa26..37a3718ce 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -1,9 +1,14 @@
 <%
 
-  my %opt = @_;
+  my(%opt) = @_;
+
+  if ( ref($opt{'query'}) ) {
+
+  }
+
   unless (exists($opt{'count_query'}) && length($opt{'count_query'})) {
     ( $opt{'count_query'} = $opt{'query'} ) =~
-      s/^\s*SELECT\s*(.*)\s+FROM\s/SELECT COUNT(*) FROM /i;
+      s/^\s*SELECT\s*(.*?)\s+FROM\s/SELECT COUNT(*) FROM /i;
   }
 
   my $conf = new FS::Conf;
@@ -18,18 +23,43 @@
     or die "Error preparing $opt{'count_query'}: ". dbh->errstr;
   $count_sth->execute
     or die "Error executing $opt{'count_query'}: ". $count_sth->errstr;
-  my $total = $count_sth->fetchrow_arrayref->[0];
+  my $count_arrayref = $count_sth->fetchrow_arrayref;
+  my $total = $count_arrayref->[0];
+
+  #warn join(' / ', map { "$_ => $opt{$_}" } keys %opt ). "\n";
 
-  my $sth = dbh->prepare("$opt{'query'} $limit")
-    or die "Error preparing $opt{'query'}: ". dbh->errstr;
-  $sth->execute
-    or die "Error executing $opt{'query'}: ". $sth->errstr;
+  my $header = $opt{'header'};
+  my $rows;
+  if ( ref($opt{'query'}) ) {
+    #eval "use FS::$opt{'query'};";
+    $rows = [ qsearch(
+      $opt{'query'}->{'table'}, 
+      $opt{'query'}->{'hashref'} || {}, 
+      $opt{'query'}->{'select'},
+      $opt{'query'}->{'extra_sql'}. " $limit",
+    ) ];
+  } else {
+    my $sth = dbh->prepare("$opt{'query'} $limit")
+      or die "Error preparing $opt{'query'}: ". dbh->errstr;
+    $sth->execute
+      or die "Error executing $opt{'query'}: ". $sth->errstr;
 
-  #can get # of rows without fetching them all?
-  my $rows = $sth->fetchall_arrayref;
+    #can get # of rows without fetching them all?
+    $rows = $sth->fetchall_arrayref;
 
+    $header ||= $sth->{NAME};
+  }
+
+  if ( exists($opt{'redirect'}) && scalar(@$rows) == 1 ) {
+    my( $url, $method ) = @{$opt{'redirect'}};
+    redirect( $url. $rows->[0]->$method() );
+  } else {
+
+%>
+<%= include( '/elements/header.html', $opt{'title'},
+               include( '/elements/menubar.html', 'Main menu' => $p )
+           )
 %>
-<!-- mason kludge -->
 <% my $pager = include ( '/elements/pager.html',
                            'offset'     => $offset,
                            'num_rows'   => scalar(@$rows),
@@ -37,18 +67,41 @@
                            'maxrecords' => $maxrecords,
                        );
 %>
-
-<%= $total %> total <%= $opt{'name'} %><BR><BR><%= $pager %>
+<%= $total %> total <%= $opt{'name'} %><BR>
+<% if ( $opt{'count_addl'} ) { %>
+  <% my $n=0; foreach my $count ( @{$opt{'count_addl'}} ) { %>
+    <%= sprintf( $count, $count_arrayref->[++$n] ) %><BR>
+  <% } %>
+<% } %>
+<BR><%= $pager %>
 <%= include( '/elements/table.html' ) %>
   <TR>
-  <% foreach ( @{$sth->{NAME}} ) { %>
-       <TH><%= $_ %></TH>
+  <% foreach my $header ( @$header ) { %>
+       <TH><%= $header %></TH>
   <% } %>
   </TR>
   <% foreach my $row ( @$rows ) { %>
        <TR>
-       <% foreach ( @$row ) { %>
-            <TD><%= $_ %></TD>
+       <% if ( $opt{'fields'} ) { %>
+         <% my $links = $opt{'links'} ? [ @{$opt{'links'}} ] : ''; %>
+         <% foreach my $field ( @{$opt{'fields'}} ) { %>
+           <% my $a = ''; %>
+           <% if ( $links ) {
+                my( $url, $method ) = @{shift @$links};
+                $a = $url. $row->$method();
+                $a = qq(<A HREF="$a">);
+              }
+           %>
+           <% if ( ref($field) eq 'CODE' ) { %>
+             <TD><%= $a %><%= &{$field}($row) %><%= $a ? '</A>' : '' %></TD>
+           <% } else { %>
+             <TD><%= $a %><%= $row->$field() %><%= $a ? '</A>' : '' %></TD>
+           <% } %>
+         <% } %>
+       <% } else { %>
+         <% foreach ( @$row ) { %>
+              <TD><%= $_ %></TD>
+         <% } %>
        <% } %>
        </TR>
   <% } %>
@@ -57,3 +110,4 @@
 <%= $pager %>
 </BODY>
 </HTML>
+<% } %>
diff --git a/httemplate/search/sql.html b/httemplate/search/sql.html
index 7d7fc0890..b28c045d1 100644
--- a/httemplate/search/sql.html
+++ b/httemplate/search/sql.html
@@ -1,12 +1,7 @@
-<%= include( '/elements/header.html', 'Query Results',
-               include( '/elements/menubar.html', 'Main Menu' => $p )
-    )
-%>
-
 <%= include( 'elements/search.html',
+               'title' => 'Query Results',
                'name'  => 'rows',
                'query' => 'SELECT '. ( $cgi->param('sql')
                                        || eidiot('Empty query') ),
     )
 %>
-
-- 
cgit v1.2.1


From 87227cd405166484ca7b791b2bd3c8829ce8d969 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Apr 2004 12:19:40 +0000
Subject: credit report, add some links to sales/credits/receipts summary, move
 payment search to template

---
 FS/FS/Report/Table/Monthly.pm             |  22 ++-
 FS/FS/cust_credit.pm                      |  12 ++
 httemplate/graph/money_time-graph.cgi     |   6 +-
 httemplate/graph/money_time.cgi           |  20 +-
 httemplate/search/cust_bill.html          |  23 ++-
 httemplate/search/cust_credit.html        |  76 ++++++++
 httemplate/search/cust_pay.cgi            | 310 +++++++++++++-----------------
 httemplate/search/elements/search.html    |  17 +-
 httemplate/search/report_cust_credit.html |  25 +--
 9 files changed, 292 insertions(+), 219 deletions(-)
 create mode 100755 httemplate/search/cust_credit.html

diff --git a/FS/FS/Report/Table/Monthly.pm b/FS/FS/Report/Table/Monthly.pm
index 3bbf01f39..d3ff5d1db 100644
--- a/FS/FS/Report/Table/Monthly.pm
+++ b/FS/FS/Report/Table/Monthly.pm
@@ -18,7 +18,7 @@ FS::Report::Table::Monthly - Tables of report data, indexed monthly
 
   use FS::Report::Table::Monthly;
 
-  my $report = new FS::Report::Table (
+  my $report = new FS::Report::Table::Monthly (
     'items' => [ 'invoiced', 'netsales', 'credits', 'receipts', ],
     'start_month' => 4,
     'start_year'  => 2000,
@@ -53,8 +53,10 @@ sub data {
     push @{$data{label}}, "$smonth/$syear";
 
     my $speriod = timelocal(0,0,0,1,$smonth-1,$syear);
+    push @{$data{speriod}}, $speriod;
     if ( ++$smonth == 13 ) { $syear++; $smonth=1; }
     my $eperiod = timelocal(0,0,0,1,$smonth-1,$syear);
+    push @{$data{eperiod}}, $eperiod;
   
     foreach my $item ( @{$self->{'items'}} ) {
       push @{$data{$item}}, $self->$item($speriod, $eperiod);
@@ -95,7 +97,7 @@ sub netsales { #net sales
     AND LOWER(part_pkg.pkg) LIKE 'expense _%'
   ");
 
-  $self->invoiced($speriod,$eperiod)-$credited-$expenses;
+  $self->invoiced($speriod,$eperiod) - $credited - $expenses;
 }
 
 #deferred revenue
@@ -103,12 +105,6 @@ sub netsales { #net sales
 sub receipts { #cashflow
   my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
 
-  #cashflow
-  my $paid = $self->scalar_sql("
-    SELECT SUM(paid) FROM cust_pay
-    WHERE ". $self->in_time_period($speriod, $eperiod)
-  );
-
   my $refunded = $self->scalar_sql("
     SELECT SUM(refund) FROM cust_refund
     WHERE ". $self->in_time_period($speriod, $eperiod)
@@ -129,7 +125,15 @@ sub receipts { #cashflow
   ");
   #    my $expenses_sql2 = "SELECT SUM(cust_bill_pay.amount) FROM cust_bill_pay, cust_bill_pkg, cust_bill, cust_pkg, part_pkg WHERE cust_bill_pay.invnum = cust_bill.invnum AND cust_bill.invnum = cust_bill_pkg.invnum AND cust_bill_pay._date >= $speriod AND cust_bill_pay._date < $eperiod AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum AND cust_pkg.pkgpart = part_pkg.pkgpart AND LOWER(part_pkg.pkg) LIKE 'expense _%'";
   
-  $paid-$refunded-$expenses;
+  $self->payments($speriod, $eperiod) - $refunded - $expenses;
+}
+
+sub payments {
+  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
+  $self->scalar_sql("
+    SELECT SUM(paid) FROM cust_pay
+    WHERE ". $self->in_time_period($speriod, $eperiod)
+  );
 }
 
 sub credits {
diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 19a54534f..8ec255b95 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -300,6 +300,18 @@ sub credited {
   sprintf( "%.2f", $amount );
 }
 
+=item cust_main
+
+Returns the customer (see L<FS::cust_main>) for this credit.
+
+=cut
+
+sub cust_main {
+  my $self = shift;
+  qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+}
+
+
 =back
 
 =head1 BUGS
diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi
index 55e8982b4..bb3d23aae 100755
--- a/httemplate/graph/money_time-graph.cgi
+++ b/httemplate/graph/money_time-graph.cgi
@@ -15,17 +15,19 @@ my $emonth = $cgi->param('emonth') || $curmon+1;
 #my @labels;
 #my %data;
 
-my @items = qw( invoiced netsales credits receipts );
+my @items = qw( invoiced netsales credits payments receipts );
 my %label = (
  'invoiced' => 'Gross Sales (invoiced)', 
  'netsales' => 'Net Sales (invoiced - applied credits)',
  'credits'  => 'Credits',
- 'receipts' => 'Receipts/Cashflow (payments - refunds)',
+ 'payments' => 'Gross Receipts (payments)',
+ 'receipts' => 'Net Receipts/Cashflow (payments - refunds)',
 );
 my %color = (
   'invoiced' => [ 153, 153, 255 ], #light blue
   'netsales' => [   0,   0, 204 ], #blue
   'credits'  => [ 204,   0,   0 ], #red
+  'payments' => [ 153, 204, 153 ], #light green
   'receipts' => [   0, 204,   0 ], #green
 );
 
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index e5903168d..1c7d54266 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -25,19 +25,26 @@ my $emonth = $cgi->param('emonth') || $curmon+1;
 <%= table('e8e8e8') %>
 <%
 
-my @items = qw( invoiced netsales credits receipts );
+my @items = qw( invoiced netsales credits payments receipts );
 my %label = (
   'invoiced' => 'Gross Sales',
   'netsales' => 'Net Sales',
   'credits'  => 'Credits',
-  'receipts' => 'Receipts',
+  'payments' => 'Gross Receipts',
+  'receipts' => 'Net Receipts',
 );
 my %color = (
   'invoiced' => '9999ff', #light blue
   'netsales' => '0000cc', #blue
   'credits'  => 'cc0000', #red
+  'payments' => '99cc99', #light green
   'receipts' => '00cc00', #green
 );
+my %link = (
+  'invoiced' => "${p}search/cust_bill.html?",
+  'credits'  => "${p}search/cust_credit.html?",
+  'payments' => "${p}search/cust_pay.cgi?magic=_date;",
+);
 
 my $report = new FS::Report::Table::Monthly (
   'items' => \@items,
@@ -48,7 +55,6 @@ my $report = new FS::Report::Table::Monthly (
 );
 my $data = $report->data;
 
-
 my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
 
 %>
@@ -64,9 +70,15 @@ my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
 
 <% foreach my $row (@items) { %>
   <TR><TH><FONT COLOR="#<%= $color{$row} %>"><%= $label{$row} %></FONT></TH>
+  <% my $link = exists($link{$row})
+       ? qq(<A HREF="$link{$row})
+       : '';
+     my @speriod = @{$data->{speriod}};
+     my @eperiod = @{$data->{eperiod}};
+  %>
   <% foreach my $column ( @{$data->{$row}} ) { %>
     <TD ALIGN="right" BGCOLOR="#ffffff">
-      <FONT COLOR="#<%= $color{$row} %>">$<%= sprintf("%.2f", $column) %></FONT>
+      <%= $link ? $link. 'begin='. shift(@speriod). ';end='. shift(@eperiod). '">' : '' %><FONT COLOR="#<%= $color{$row} %>">$<%= sprintf("%.2f", $column) %></FONT><%= $link ? '</A>' : '' %>
     </TD>
   <% } %>
   </TR>
diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index 51241575c..27b147108 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -1,22 +1,30 @@
 <%
    my( $count_query, $sql_query );
-   if ( $cgi->keywords ) {
-     my($query) = $cgi->keywords;
+   if ( $cgi->param('begin') || $cgi->param('end') || $cgi->keywords ) {
+
      my $owed =
        "charged - ( SELECT COALESCE(SUM(amount),0) FROM cust_bill_pay
                     WHERE cust_bill_pay.invnum = cust_bill.invnum )
                 - ( SELECT COALESCE(SUM(amount),0) FROM cust_credit_bill
                     WHERE cust_credit_bill.invnum = cust_bill.invnum )";
+
      my @where;
-     my $orderby = '';
+     my $orderby = 'ORDER BY cust_bill._date';
+
+     if ( $cgi->param('begin') =~ /^(\d+)$/ ) {
+       push @where, "cust_bill._date >= $1",
+     }
+     if ( $cgi->param('end') =~ /^(\d+)$/ ) {
+       push @where, "cust_bill._date < $1",
+     }
+
+     my($query) = $cgi->keywords;
      if ( $query =~ /^(OPEN(\d*)_)?(invnum|date|custnum)$/ ) {
        my($open, $days, $field) = ($1, $2, $3);
        $field = "_date" if $field eq 'date';
        $orderby = "ORDER BY cust_bill.$field";
        push @where, "0 != $owed" if $open;
        push @where, "cust_bill._date < ". (time-86400*$days) if $days;
-     } else {
-       die "unknown query string $query";
      }
    
      my $extra_sql = scalar(@where) ? 'WHERE '. join(' AND ', @where) : '';
@@ -50,12 +58,13 @@
                'name'        => 'invoices',
                'query'       => $sql_query,
                'count_query' => $count_query,
-               'count_addl'  => [ '$%.2f total amount',
+               'count_addl'  => [ '$%.2f total invoiced',
                                   '$%.2f total outstanding balance',
                                 ],
                'redirect'    => $link,
                'header'      =>
-                 [ '', qw(Balance Amount Date ), 'Contact name', 'Company' ],
+                 [ 'Invoice #', qw(Balance Amount Date), 'Contact name',
+                   'Company' ],
                'fields'      => [
                  'invnum',
                  sub { sprintf('$%.2f', shift->get('owed') ) },
diff --git a/httemplate/search/cust_credit.html b/httemplate/search/cust_credit.html
new file mode 100755
index 000000000..c46caba13
--- /dev/null
+++ b/httemplate/search/cust_credit.html
@@ -0,0 +1,76 @@
+<%
+   #my( $count_query, $sql_query );
+
+   my @search = ();
+
+   if ( $cgi->param('otaker') && $cgi->param('otaker') =~ /^([\w\.\-]+)$/ ) {
+     push @search, "otaker = '$1'";
+   }
+
+   #false laziness with cust_pkg.cgi and cust_pay.cgi
+   if ( $cgi->param('beginning')
+        && $cgi->param('beginning') =~ /^([ 0-9\-\/]{1,10})$/ ) {
+     my $beginning = str2time($1);
+     push @search, "_date >= $beginning ";
+   }
+   if ( $cgi->param('ending')
+             && $cgi->param('ending') =~ /^([ 0-9\-\/]{1,10})$/ ) {
+     my $ending = str2time($1) + 86399;
+     push @search, " _date <= $ending ";
+   }
+
+   if ( $cgi->param('begin')
+        && $cgi->param('begin') =~ /^(\d+)$/ ) {
+     push @search, "_date >= $1 ";
+   }
+   if ( $cgi->param('end')
+             && $cgi->param('end') =~ /^(\d+)$/ ) {
+     push @search, " _date < $1 ";
+   }
+
+   my $where = scalar(@search)
+                 ? 'WHERE '. join(' AND ', @search)
+                 : '';
+
+   my $count_query = "SELECT COUNT(*), SUM(amount) FROM cust_credit $where";
+   my $sql_query   = {
+     'table'     => 'cust_credit',
+     'hashref'   => {},
+     'extra_sql' => $where,
+   };
+
+   my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
+
+%>
+<%= include( 'elements/search.html',
+               'title'       => 'Credit Search Results',
+               'name'        => 'credits',
+               'query'       => $sql_query,
+               'count_query' => $count_query,
+               'count_addl'  => [ '$%.2f total credited', ],
+               #'redirect'    => $link,
+               'header'      =>
+                 [ qw(Amount Date), 'Contact name', qw(Company By Reason) ],
+               'fields'      => [
+                 #'crednum',
+                 sub { sprintf('$%.2f', shift->amount ) },
+                 sub { time2str('%b %d %Y', shift->_date ) },
+                 sub { my $cust_main = shift->cust_main;
+                       $cust_main->get('last'). ', '. $cust_main->first;
+                     },
+                 sub { my $cust_main = shift->cust_main;
+                       $cust_main->company;
+                     },
+                 'otaker',
+                 'reason',
+               ],
+               'links' => [
+                 '',
+                 '',
+                 $clink,
+                 $clink,
+                 '',
+                 '',
+               ],
+    )
+%>
diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi
index 51dd3b340..ba2bc63f0 100755
--- a/httemplate/search/cust_pay.cgi
+++ b/httemplate/search/cust_pay.cgi
@@ -1,185 +1,133 @@
 <%
+   my( $count_query, $sql_query );
+   if ( $cgi->param('magic') && $cgi->param('magic') eq '_date' ) {
+   
+     my %search;
+     my @search;
+   
+     if ( $cgi->param('payby') ) {
+       $cgi->param('payby') =~ /^(CARD|CHEK|BILL)(-(VisaMC|Amex|Discover))?$/
+         or die "illegal payby ". $cgi->param('payby');
+       $search{'payby'} = $1;
+       if ( $3 ) {
+         if ( $3 eq 'VisaMC' ) {
+           #avoid posix regexes for portability
+           push @search, " (    substring(payinfo from 1 for 1) = '4'  ".
+                         "   OR substring(payinfo from 1 for 2) = '51' ".
+                         "   OR substring(payinfo from 1 for 2) = '52' ".
+                         "   OR substring(payinfo from 1 for 2) = '53' ".
+                         "   OR substring(payinfo from 1 for 2) = '54' ".
+                         "   OR substring(payinfo from 1 for 2) = '54' ".
+                         "   OR substring(payinfo from 1 for 2) = '55' ".
+                         " ) ";
+         } elsif ( $3 eq 'Amex' ) {
+           push @search, " (    substring(payinfo from 1 for 2 ) = '34' ".
+                         "   OR substring(payinfo from 1 for 2 ) = '37' ".
+                         " ) ";
+         } elsif ( $3 eq 'Discover' ) {
+           push @search, " substring(payinfo from 1 for 4 ) = '6011' ";
+         } else {
+           die "unknown card type $3";
+         }
+       }
+     }
+   
+     #false laziness with cust_pkg.cgi
+     if ( $cgi->param('beginning')
+          && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
+       my $beginning = str2time($1);
+       push @search, "_date >= $beginning ";
+     }
+     if ( $cgi->param('ending')
+               && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
+       my $ending = str2time($1) + 86399;
+       push @search, " _date <= $ending ";
+     }
+     if ( $cgi->param('begin')
+          && $cgi->param('begin') =~ /^(\d+)$/ ) {
+       push @search, "_date >= $1 ";
+     }
+     if ( $cgi->param('end')
+               && $cgi->param('end') =~ /^(\d+)$/ ) {
+       push @search, " _date < $1 ";
+     }
+   
+     my $search;
+     if ( @search ) {
+       $search = ( scalar(keys %search) ? ' AND ' : ' WHERE ' ).
+                 join(' AND ', @search);
+     }
+
+     my $hsearch = join(' AND ', map { "$_ = '$search{$_}'" } keys %search );
+     $count_query = "SELECT COUNT(*), SUM(paid) FROM cust_pay ".
+                    ( $hsearch ? " WHERE $hsearch " : '' ).
+                    $search;
+   
+     $sql_query = {
+       'table'     => 'cust_pay',
+       'hashref'   => \%search,
+       'extra_sql' => "$search ORDER BY _date",
+     };
+   
+   } else {
+   
+     $cgi->param('payinfo') =~ /^\s*(\d+)\s*$/ or die "illegal payinfo";
+     my $payinfo = $1;
+   
+     $cgi->param('payby') =~ /^(\w+)$/ or die "illegal payby";
+     my $payby = $1;
+   
+     $count_query = "SELECT COUNT(*), SUM(paid) FROM cust_pay ".
+                    "WHERE payinfo = '$payinfo' AND payby = '$payby'";
+   
+     $sql_query = {
+       'table'     => 'cust_pay',
+       'hashref'   => { 'payinfo' => $payinfo,
+                        'payby'   => $payby    },
+       'extra_sql' => "ORDER BY _date",
+     };
+   
+   }
+
+   my $link = [ "${p}view/cust_main.cgi?", 'custnum' ];
 
-my $sortby;
-my @cust_pay;
-if ( $cgi->param('magic') && $cgi->param('magic') eq '_date' ) {
-
-  my %search;
-  my @search;
-
-  if ( $cgi->param('payby') ) {
-    $cgi->param('payby') =~ /^(CARD|CHEK|BILL)(-(VisaMC|Amex|Discover))?$/
-      or die "illegal payby ". $cgi->param('payby');
-    $search{'payby'} = $1;
-    if ( $3 ) {
-      if ( $3 eq 'VisaMC' ) {
-        #avoid posix regexes for portability
-        push @search, " (    substring(payinfo from 1 for 1) = '4'  ".
-                      "   OR substring(payinfo from 1 for 2) = '51' ".
-                      "   OR substring(payinfo from 1 for 2) = '52' ".
-                      "   OR substring(payinfo from 1 for 2) = '53' ".
-                      "   OR substring(payinfo from 1 for 2) = '54' ".
-                      "   OR substring(payinfo from 1 for 2) = '54' ".
-                      "   OR substring(payinfo from 1 for 2) = '55' ".
-                      " ) ";
-      } elsif ( $3 eq 'Amex' ) {
-        push @search, " (    substring(payinfo from 1 for 2 ) = '34' ".
-                      "   OR substring(payinfo from 1 for 2 ) = '37' ".
-                      " ) ";
-      } elsif ( $3 eq 'Discover' ) {
-        push @search, " substring(payinfo from 1 for 4 ) = '6011' ";
-      } else {
-        die "unknown card type $3";
-      }
-    }
-  }
-
-  #false laziness with cust_pkg.cgi
-  if ( $cgi->param('beginning')
-       && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
-    my $beginning = str2time($1);
-    push @search, "_date >= $beginning ";
-  }
-  if ( $cgi->param('ending')
-            && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
-    my $ending = str2time($1) + 86399;
-    push @search, " _date <= $ending ";
-  }
-  my $search;
-  if ( @search ) {
-    $search = ( scalar(keys %search) ? ' AND ' : ' WHERE ' ).
-              join(' AND ', @search);
-  }
-
-  @cust_pay = qsearch('cust_pay', \%search, '', $search );
-
-  $sortby = \*date_sort;
-
-} else {
-
-  $cgi->param('payinfo') =~ /^\s*(\d+)\s*$/ or die "illegal payinfo";
-  my $payinfo = $1;
-
-  $cgi->param('payby') =~ /^(\w+)$/ or die "illegal payby";
-  my $payby = $1;
-
-  @cust_pay = qsearch('cust_pay', { 'payinfo' => $payinfo,
-                                     'payby'   => $payby    } );
-  $sortby = \*date_sort;
-
-}
-
-if (0) {
-#if ( scalar(@cust_pay) == 1 ) {
-#  my $invnum = $cust_bill[0]->invnum;
-#  print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
-} elsif ( scalar(@cust_pay) == 0 ) {
-%>
-<!-- mason kludge -->
-<%
-  idiot("Payment not found.");
-  #exit;
-} else {
-  my $total = scalar(@cust_pay);
-  my $s = $total > 1 ? 's' : '';
 %>
-<!-- mason kludge -->
-<%
-  print header("Payment Search Results", menubar(
-          'Main Menu', popurl(2)
-        )), "$total matching payment$s found<BR>", &table(), <<END;
-      <TR>
-        <TH></TH>
-        <TH>Amount</TH>
-        <TH>Date</TH>
-        <TH>Contact name</TH>
-        <TH>Company</TH>
-      </TR>
-END
-
-  my(%saw, $cust_pay);
-  my $tot_amount = 0;
-  foreach my $cust_pay (
-    sort $sortby grep(!$saw{$_->paynum}++, @cust_pay)
-  ) {
-    my($paynum, $custnum, $payby, $payinfo, $amount, $date ) = (
-      $cust_pay->paynum,
-      $cust_pay->custnum,
-      $cust_pay->payby,
-      $cust_pay->payinfo,
-      sprintf("%.2f", $cust_pay->paid),
-      $cust_pay->_date,
-    );
-    $tot_amount += $amount;
-    my $pdate = time2str("%b&nbsp;%d&nbsp;%Y", $date);
-
-    my $rowspan = 1;
-
-    my $view = popurl(2). "view/cust_main.cgi?". $custnum. 
-               "#". $payby. $payinfo;
-
-    my $payment_info;
-    if ( $payby eq 'CARD' ) {
-      $payment_info = 'Card&nbsp;#'. 'x'x(length($payinfo)-4).
-                      substr($payinfo,(length($payinfo)-4));
-    } elsif ( $payby eq 'CHEK' ) {
-      $payment_info = "E-check&nbsp;acct#$payinfo";
-    } elsif ( $payby eq 'BILL' ) {
-      $payment_info = "Check&nbsp;#$payinfo";
-    } else {
-      $payment_info = "$payby&nbsp;$payinfo";
-    }
-
-    print <<END;
-      <TR>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$payment_info</FONT></A></TD>
-        <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view"><FONT SIZE=-1>\$$amount</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$pdate</FONT></A></TD>
-END
-    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
-    if ( $cust_main ) {
-      #my $cview = popurl(2). "view/cust_main.cgi?". $cust_main->custnum;
-      my ( $name, $company ) = (
-        $cust_main->last. ', '. $cust_main->first,
-        $cust_main->company,
-      );
-      print <<END;
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$name</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$company</FONT></A></TD>
-END
-    } else {
-      print <<END
-        <TD ROWSPAN=$rowspan COLSPAN=2>WARNING: couldn't find cust_main.custnum $custnum (cust_pay.paynum $paynum)</TD>
-END
-    }
-
-    print "</TR>";
-  }
-
-  $tot_amount = sprintf("%.2f", $tot_amount);
-  print '</TABLE><BR>'. table(). <<END;
-      <TR>
-        <TH>Total&nbsp;Amount</TH>
-        <TD ALIGN="right">\$$tot_amount</TD>
-      </TR>
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-}
-
-#
-
-#sub invnum_sort {
-#  $a->invnum <=> $b->invnum;
-#}
-#
-#sub custnum_sort {
-#  $a->custnum <=> $b->custnum || $a->invnum <=> $b->invnum;
-#}
-
-sub date_sort {
-  $a->_date <=> $b->_date || $a->invnum <=> $b->invnum;
-}
+<%= include( 'elements/search.html',
+               'title'       => 'Payment Search Results',
+               'name'        => 'payments',
+               'query'       => $sql_query,
+               'count_query' => $count_query,
+               'count_addl'  => [ '$%.2f total paid', ],
+               'header'      =>
+                 [ qw(Payment Amount Date), 'Contact name', 'Company', ],
+               'fields'      => [
+                 sub {
+                   my $cust_pay = shift;
+                   if ( $cust_pay->payby eq 'CARD' ) {
+                     'Card #'. $cust_pay->payinfo_masked;
+                   } elsif ( $cust_pay->payby eq 'CHEK' ) {
+                     'E-check acct#'. $cust_pay->payinfo;
+                   } elsif ( $cust_pay->payby eq 'BILL' ) {
+                     'Check #'. $cust_pay->payinfo;
+                   } else {
+                     $cust_pay->payby. ' '. $cust_pay->payinfo;
+                   }
+                 },
+                 sub { sprintf('$%.2f', shift->paid ) },
+                 sub { time2str('%b %d %Y', shift->_date ) },
+                 sub { my $cust_main = shift->cust_main;
+                       $cust_main->get('last'). ', '. $cust_main->first;
+                     },
+                 sub { my $cust_main = shift->cust_main;
+                       $cust_main->company;
+                     },
+               ],
+               'links' => [
+                 '',
+                 '',
+                 '',
+                 $link,
+                 $link,
+               ],
+    )
 %>
diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index 37a3718ce..226c4f784 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -50,11 +50,11 @@
     $header ||= $sth->{NAME};
   }
 
-  if ( exists($opt{'redirect'}) && scalar(@$rows) == 1 ) {
+  if ( exists($opt{'redirect'}) && scalar(@$rows) == 1 && $total == 1 ) {
     my( $url, $method ) = @{$opt{'redirect'}};
     redirect( $url. $rows->[0]->$method() );
   } else {
-
+    $opt{'name'} =~ s/s$// if $total == 1;
 %>
 <%= include( '/elements/header.html', $opt{'title'},
                include( '/elements/menubar.html', 'Main menu' => $p )
@@ -87,9 +87,16 @@
          <% foreach my $field ( @{$opt{'fields'}} ) { %>
            <% my $a = ''; %>
            <% if ( $links ) {
-                my( $url, $method ) = @{shift @$links};
-                $a = $url. $row->$method();
-                $a = qq(<A HREF="$a">);
+                my $link = shift @$links;
+                if ( $link ) {
+                  my( $url, $method ) = @{$link};
+                  if ( ref($method) eq 'CODE' ) {
+                    $a = $url. &{$method}($row);
+                  } else {
+                    $a = $url. $row->$method();
+                  }
+                  $a = qq(<A HREF="$a">);
+                }
               }
            %>
            <% if ( ref($field) eq 'CODE' ) { %>
diff --git a/httemplate/search/report_cust_credit.html b/httemplate/search/report_cust_credit.html
index 1b30685dc..8a0f0ed7b 100644
--- a/httemplate/search/report_cust_credit.html
+++ b/httemplate/search/report_cust_credit.html
@@ -1,26 +1,29 @@
 <HTML>
   <HEAD>
-    <TITLE>Payment report criteria</TITLE>
+    <TITLE>Credit report criteria</TITLE>
     <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
     <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
     <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
     <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
   </HEAD>
   <BODY BGCOLOR="#e8e8e8">
-    <H1>Payment report criteria</H1>
-    <FORM ACTION="cust_pay.cgi" METHOD="post">
+    <H1>Credit report criteria</H1>
+    <FORM ACTION="cust_credit.html" METHOD="post">
     <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
     <TABLE>
       <TR>
-        <TD ALIGN="right">Payments of type: </TD>
-        <TD><SELECT NAME="payby">
+        <TD ALIGN="right">Credits by employee: </TD>
+<%
+  my $sth = dbh->prepare("SELECT DISTINCT otaker FROM cust_credit")
+    or die dbh->errstr;
+  $sth->execute or die $sth->errstr;
+  my @otakers = map { $_->[0] } @{$sth->fetchall_arrayref};
+%>
+        <TD><SELECT NAME="otaker">
               <OPTION VALUE="">all</OPTION>
-              <OPTION VALUE="CARD">credit card (all)</OPTION>
-              <OPTION VALUE="CARD-VisaMC">credit card (Visa/MasterCard)</OPTION>
-              <OPTION VALUE="CARD-Amex">credit card (American Express)</OPTION>
-              <OPTION VALUE="CARD-Discover">credit card (Discover)</OPTION>
-              <OPTION VALUE="CHEK">electronic check / ACH</OPTION>
-              <OPTION VALUE="BILL">check / cash</OPTION>
+              <% foreach my $otaker ( @otakers ) { %>
+                <OPTION VALUE="<%= $otaker %>"><%= $otaker %></OPTION>
+              <% } %>
             </SELECT>
         </TD>
       </TR>
-- 
cgit v1.2.1


From 686e4d8cf9a69012cbf92983a787644d583bdcd8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Apr 2004 12:50:34 +0000
Subject: fix up includes with Apache::ASP

---
 Makefile         | 4 ++++
 htetc/global.asa | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index bf73202f6..6d3d80397 100644
--- a/Makefile
+++ b/Makefile
@@ -129,6 +129,10 @@ install-docs: docs
 	[ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL} || true
 	[ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
 	[ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
+	[ "${TEMPLATE}" = "asp" ] && \
+	  perl -p -i -e "\
+	    s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+	  " ${ASP_GLOBAL}/global.asa || true
 	[ "${TEMPLATE}" = "mason" ] && cp htetc/handler.pl ${MASON_HANDLER} || true
 	[ "${TEMPLATE}" = "mason" ] && \
 	  perl -p -i -e "\
diff --git a/htetc/global.asa b/htetc/global.asa
index dace29527..4358e87b1 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -197,9 +197,8 @@ sub sprintAutoProfile {
 }
 
 sub include {
-  ( my $file = shift ) =~ s(^/)();
-  $Response->Include($file, @_);
-  '';
+  ( my $file = shift ) =~ s(^/)(%%%FREESIDE_DOCUMENT_ROOT%%%/);
+  ${$Response->TrapInclude($file, @_)};
 }
 
 if ( defined(@DBIx::Profile::ISA) ) {
-- 
cgit v1.2.1


From c29fa7acc16efcc86af06077e739fca8b783c3c1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Apr 2004 13:15:17 +0000
Subject: add link to new credit report on main menu, remove old obsolete
 shell-out reports

---
 FS/MANIFEST                          |   2 -
 FS/bin/freeside-cc-receipts-report   | 270 -----------------------------------
 FS/bin/freeside-credit-report        | 224 -----------------------------
 httemplate/index.html                |   5 +-
 httemplate/search/report_cc.cgi      |  25 ----
 httemplate/search/report_cc.html     |  43 ------
 httemplate/search/report_credit.cgi  |  25 ----
 httemplate/search/report_credit.html |  43 ------
 8 files changed, 2 insertions(+), 635 deletions(-)
 delete mode 100755 FS/bin/freeside-cc-receipts-report
 delete mode 100755 FS/bin/freeside-credit-report
 delete mode 100755 httemplate/search/report_cc.cgi
 delete mode 100755 httemplate/search/report_cc.html
 delete mode 100755 httemplate/search/report_credit.cgi
 delete mode 100755 httemplate/search/report_credit.html

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 10a64d070..675429e04 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -8,9 +8,7 @@ bin/freeside-addoutsourceuser
 bin/freeside-adduser
 bin/freeside-apply-credits
 bin/freeside-bill
-bin/freeside-cc-receipts-report
 bin/freeside-count-active-customers
-bin/freeside-credit-report
 bin/freeside-daily
 bin/freeside-deloutsource
 bin/freeside-deloutsourceuser
diff --git a/FS/bin/freeside-cc-receipts-report b/FS/bin/freeside-cc-receipts-report
deleted file mode 100755
index 136851aec..000000000
--- a/FS/bin/freeside-cc-receipts-report
+++ /dev/null
@@ -1,270 +0,0 @@
-#!/usr/bin/perl -Tw
-
-
-use strict;
-use Date::Parse;
-use Time::Local;
-use Getopt::Std;
-use Text::Template;
-use Net::SMTP;
-use Mail::Header;
-use Mail::Internet;
-use FS::Conf;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::cust_pay;
-use FS::cust_pay_batch;
-
-
-&untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $opt_s $opt_f $report_lines $report_template @buf $header);
-getopts("vpmef:s:");	#switches
-
-#we're at now now (and later).
-my($_finishdate)= $opt_f ? str2time($main::opt_f) : $^T;
-my($_startdate)= $opt_s ? str2time($main::opt_s) : $^T;
-
-# Get the current month
-my ($ssec,$smin,$shour,$smday,$smon,$syear) =
-	(localtime($_startdate) )[0,1,2,3,4,5]; 
-$smon++;
-$syear += 1900;
-
-# Get the current month
-my ($fsec,$fmin,$fhour,$fmday,$fmon,$fyear) =
-	(localtime($_finishdate) )[0,1,2,3,4,5]; 
-$fmon++;
-$fyear += 1900;
-
-# Login to the database
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-# Get the needed configuration files
-my $conf = new FS::Conf;
-my $lpr = $conf->config('lpr');
-my $email = $conf->config('email');
-my $smtpmachine = $conf->config('smtpmachine');
-my $mail_sender = $conf->exists('invoice_from') ? $conf->config('invoice_from') :
-  'postmaster';
-my @report_template = $conf->config('report_template')
-  or die "cannot load config file report_template";
-$report_lines = 0;
-foreach ( grep /report_lines\(\d+\)/, @report_template ) { #kludgy :/
-  /report_lines\((\d+)\)/;
-  $report_lines += $1;
-}
-die "no report_lines() functions in template?" unless $report_lines;
-$report_template = new Text::Template (
-  TYPE   => 'ARRAY',
-  SOURCE => [ map "$_\n", @report_template ],
-) or die "can't create new Text::Template object: $Text::Template::ERROR";
-
-
-my(@cust_pays)=qsearch('cust_pay',{});
-if (scalar(@cust_pays) == 0)
-{
-	exit 1;
-}
-
-# Open print and email pipes
-# $lpr and opt_p for printing
-# $email and opt_m for email
-
-if ($lpr && $main::opt_p)
-{
-        open(LPR, "|$lpr");
-}
-
-if ($email && $main::opt_m)
-{
-  $ENV{MAILADDRESS} = $mail_sender;
-  $header = new Mail::Header ( [
-    "From: Account Processor",
-    "To: $email",
-    "Sender: $mail_sender",
-    "Reply-To: $mail_sender",
-    "Subject: Credit Card Receipts",
-  ] );
-}
-
-my $uninvoiced = 0;
-my $total = 0;
-my $taxed = 0;
-my $untaxed = 0;
-my $total_tax = 0;
-
-# Now I can start looping
-foreach my $cust_pay (@cust_pays)
-{
-	my $_date = $cust_pay->getfield('_date');
-	my $invnum = $cust_pay->getfield('invnum');
-	my $paid = $cust_pay->getfield('paid');
-	my $payby = $cust_pay->getfield('payby');
-	
-
-	if ($_date >= $_startdate && $_date <= $_finishdate && $payby =~ 'CARD') {
-		$total += $paid;
-
-		$uninvoiced += $cust_pay->unapplied; 
-		my @cust_bill_pays = $cust_pay->cust_bill_pay;
-                foreach my $cust_bill_pay (@cust_bill_pays) {
-			my $invoice_amt =0;
-			my $invoice_tax =0;
-			my(@cust_bill_pkgs)= $cust_bill_pay->cust_bill->cust_bill_pkg;
-			foreach my $cust_bill_pkg (@cust_bill_pkgs) {
-
-				my $recur = $cust_bill_pkg->getfield('recur');
-				my $setup = $cust_bill_pkg->getfield('setup');
-				my $pkgnum = $cust_bill_pkg->getfield('pkgnum');
-			
-				if ($pkgnum == 0) {
-					$invoice_tax += $recur;
-					$invoice_tax += $setup;
-				} else {
-					$invoice_amt += $recur;
-					$invoice_amt += $setup;
-				}
-
-			}
-
-			if ($invoice_tax > 0) {
-				if ($invoice_amt != $paid) {
-					# attempt to prorate partially paid invoices
-					$total_tax += $paid / ($invoice_amt + $invoice_tax) * $invoice_tax;
-					$taxed += $paid / ($invoice_amt + $invoice_tax) * $invoice_amt;
-				} else {
-					$total_tax += $invoice_tax;
-					$taxed += $invoice_amt;
-				}
-			} else {
-				$untaxed += $paid;
-			}
-
-		}
-
-	}
-
-}
-
-push @buf, sprintf(qq{\n%25s%14.2f\n}, "Uninvoiced", $uninvoiced);
-push @buf, sprintf(qq{%25s%14.2f\n}, "Untaxed", $untaxed);
-push @buf, sprintf(qq{%25s%14.2f\n}, "Taxed", $taxed);
-push @buf, sprintf(qq{%25s%14.2f\n}, "Tax", $total_tax);
-push @buf, sprintf(qq{\n%39s\n%39.2f\n}, "=========", $total);
-
-sub FS::cc_receipts_report::_template::report_lines {
-  my $lines = shift;
-  map {
-    scalar(@buf) ? shift @buf : '' ;
-  }
-  ( 1 .. $lines );
-}
-
-$FS::cc_receipts_report::_template::title = qq~CREDIT CARD RECEIPTS for period $smon/$smday/$syear through $fmon/$fmday/$fyear~;
-$FS::cc_receipts_report::_template::title = $opt_t if $opt_t;
-$FS::cc_receipts_report::_template::page = 1;
-$FS::cc_receipts_report::_template::date = $^T;
-$FS::cc_receipts_report::_template::date = $^T;
-$FS::cc_receipts_report::_template::fdate = $_finishdate;
-$FS::cc_receipts_report::_template::fdate = $_finishdate;
-$FS::cc_receipts_report::_template::sdate = $_startdate;
-$FS::cc_receipts_report::_template::sdate = $_startdate;
-$FS::cc_receipts_report::_template::total_pages = 
-  int( scalar(@buf) / $report_lines);
-$FS::cc_receipts_report::_template::total_pages++ if scalar(@buf) % $report_lines;
-
-my @report;
-while (@buf) {
-  push @report, split("\n", 
-    $report_template->fill_in( PACKAGE => 'FS::cc_receipts_report::_template' )
-  );
-  $FS::cc_receipts_report::_template::page++;
-}
-
-if ($opt_v) {
-  print map "$_\n", @report;
-}
-if($lpr && $opt_p)
-{
-  print LPR map "$_\n", @report;
-  print LPR "\f" if $opt_e;
-  close LPR || die "Could not close printer: $lpr\n";
-}
-if($email && $opt_m)
-{
-  my $message = new Mail::Internet (
-    'Header' => $header,
-    'Body' => [ (@report) ],
-  );
-  $!=0;
-  $message->smtpsend( Host => "$smtpmachine" )
-    or die "can't send report to $email via $smtpmachine: $!";
-}
-
-
-# subroutines
-sub untaint_argv {
-  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    $ARGV[$_] =~ /^([\w\-\/ :\.]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
-    $ARGV[$_]=$1;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n  freeside-cc-receipts-report [-v] [-p] [-e] user\n";
-}
-
-=head1 NAME
-
-freeside-cc-receipts-report - Prints or emails total credit card receipts in a given period.
-
-=head1 SYNOPSIS
-
-  freeside-cc-receipts-report [-v] [-p] [-m] [-e] [-t "title"] [-s date] [-f date] user
-
-=head1 DESCRIPTION
-
-Prints or emails sales taxes invoiced in a given period.
-
--v: Verbose - Prints records to STDOUT.
-
--p: Print to printer lpr as found in the conf directory.
-
--m: Email output to user found in the Conf email file.
-
--e: Print a final form feed to the printer.
-
--t: supply a title for the top of each page.
-
--s: starting date for inclusion
-
--f: final date for inclusion
-
-user: From the mapsecrets file - see config.html from the base documentation
-
-=head1 VERSION
-
-$Id: freeside-cc-receipts-report,v 1.5 2002-09-09 22:57:34 ivan Exp $
-
-=head1 BUGS
-
-Yes..... Use at your own risk. No guarantees or warrantees of any
-kind apply to this program. Parts of this program are hacked from
-other GNU licensed software created mainly by Ivan Kohler.
-
-This is released under the GNU Public License. See www.gnu.org
-for more information regarding this license.
-
-=head1 SEE ALSO
-
-L<FS::cust_main>, config.html from the base documentation
-
-=head1 AUTHOR
-
-Jeff Finucane <jeff@cmh.net>
-
-based on print-batch by Joel Griffiths <griff@aver-computer.com>
-
-=cut
-
diff --git a/FS/bin/freeside-credit-report b/FS/bin/freeside-credit-report
deleted file mode 100755
index 410dabe8f..000000000
--- a/FS/bin/freeside-credit-report
+++ /dev/null
@@ -1,224 +0,0 @@
-#!/usr/bin/perl -Tw
-
-
-use strict;
-use Date::Parse;
-use Time::Local;
-use Getopt::Std;
-use Text::Template;
-use Net::SMTP;
-use Mail::Header;
-use Mail::Internet;
-use FS::Conf;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch);
-use FS::cust_credit;
-
-
-&untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $opt_s $opt_f $report_lines $report_template @buf $header);
-getopts("vpmef:s:");	#switches
-
-#we're at now now (and later).
-my($_finishdate)= $opt_f ? str2time($main::opt_f) : $^T;
-my($_startdate)= $opt_s ? str2time($main::opt_s) : $^T;
-
-# Get the current month
-my ($ssec,$smin,$shour,$smday,$smon,$syear) =
-	(localtime($_startdate) )[0,1,2,3,4,5]; 
-$smon++;
-$syear += 1900;
-
-# Get the current month
-my ($fsec,$fmin,$fhour,$fmday,$fmon,$fyear) =
-	(localtime($_finishdate) )[0,1,2,3,4,5]; 
-$fmon++;
-$fyear += 1900;
-
-# Login to the database
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-# Get the needed configuration files
-my $conf = new FS::Conf;
-my $lpr = $conf->config('lpr');
-my $email = $conf->config('email');
-my $smtpmachine = $conf->config('smtpmachine');
-my $mail_sender = $conf->exists('invoice_from') ? $conf->config('invoice_from') :
-  'postmaster';
-my @report_template = $conf->config('report_template')
-  or die "cannot load config file report_template";
-$report_lines = 0;
-foreach ( grep /report_lines\(\d+\)/, @report_template ) { #kludgy :/
-  /report_lines\((\d+)\)/;
-  $report_lines += $1;
-}
-die "no report_lines() functions in template?" unless $report_lines;
-$report_template = new Text::Template (
-  TYPE   => 'ARRAY',
-  SOURCE => [ map "$_\n", @report_template ],
-) or die "can't create new Text::Template object: $Text::Template::ERROR";
-
-
-my(@cust_credits)=qsearch('cust_credit',{});
-if (scalar(@cust_credits) == 0)
-{
-	exit 1;
-}
-
-# Open print and email pipes
-# $lpr and opt_p for printing
-# $email and opt_m for email
-
-if ($lpr && $main::opt_p)
-{
-        open(LPR, "|$lpr");
-}
-
-if ($email && $main::opt_m)
-{
-  $ENV{MAILADDRESS} = $mail_sender;
-  $header = new Mail::Header ( [
-    "From: Account Processor",
-    "To: $email",
-    "Sender: $mail_sender",
-    "Reply-To: $mail_sender",
-    "Subject: In House Credits",
-  ] );
-}
-
-my $uninvoiced = 0;
-my $total = 0;
-my $taxed = 0;
-my $untaxed = 0;
-my $total_tax = 0;
-
-# Now I can start looping
-foreach my $cust_credit (@cust_credits)
-{
-	my $_date = $cust_credit->getfield('_date');
-	my $amount = $cust_credit->getfield('amount');
-
-	if ($_date >= $_startdate && $_date <= $_finishdate) {
-		$total += $amount;
-	}
-}
-
-push @buf, sprintf(qq{\n%25s%14.2f\n}, "Credits Offered", $total);
-push @buf, sprintf(qq{\n%39s\n%39.2f\n}, "=========", $total);
-
-sub FS::credit_report::_template::report_lines {
-  my $lines = shift;
-  map {
-    scalar(@buf) ? shift @buf : '' ;
-  }
-  ( 1 .. $lines );
-}
-
-$FS::credit_report::_template::title = qq~IN HOUSE CREDITS for $smon/$smday/$syear through $fmon/$fmday/$fyear~;
-$FS::credit_report::_template::title = $opt_t if $opt_t;
-$FS::credit_report::_template::page = 1;
-$FS::credit_report::_template::date = $^T;
-$FS::credit_report::_template::date = $^T;
-$FS::credit_report::_template::fdate = $_finishdate;
-$FS::credit_report::_template::fdate = $_finishdate;
-$FS::credit_report::_template::sdate = $_startdate;
-$FS::credit_report::_template::sdate = $_startdate;
-$FS::credit_report::_template::total_pages = 
-  int( scalar(@buf) / $report_lines);
-$FS::credit_report::_template::total_pages++ if scalar(@buf) % $report_lines;
-
-my @report;
-while (@buf) {
-  push @report, split("\n", 
-    $report_template->fill_in( PACKAGE => 'FS::credit_report::_template' )
-  );
-  $FS::credit_report::_template::page++;
-}
-
-if ($opt_v) {
-  print map "$_\n", @report;
-}
-if($lpr && $opt_p)
-{
-  print LPR map "$_\n", @report;
-  print LPR "\f" if $opt_e;
-  close LPR || die "Could not close printer: $lpr\n";
-}
-if($email && $opt_m)
-{
-  my $message = new Mail::Internet (
-    'Header' => $header,
-    'Body' => [ (@report) ],
-  );
-  $!=0;
-  $message->smtpsend( Host => "$smtpmachine" )
-    or die "can't send report to $email via $smtpmachine: $!";
-}
-
-
-# subroutines
-sub untaint_argv {
-  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    $ARGV[$_] =~ /^([\w\-\/ :\.]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
-    $ARGV[$_]=$1;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n  freeside-credit-report [-v] [-p] [-e] user\n";
-}
-
-=head1 NAME
-
-freeside-credit-report - Prints or emails total credit memos in a given period.
-
-=head1 SYNOPSIS
-
-  freeside-credit-report [-v] [-p] [-m] [-e] [-t "title"] [-s date] [-f date] user
-
-=head1 DESCRIPTION
-
-Prints or emails total credit memos in a given period.
-
--v: Verbose - Prints records to STDOUT.
-
--p: Print to printer lpr as found in the conf directory.
-
--m: Email output to user found in the Conf email file.
-
--e: Print a final form feed to the printer.
-
--t: supply a title for the top of each page.
-
--s: starting date for inclusion
-
--f: final date for inclusion
-
-user: From the mapsecrets file - see config.html from the base documentation
-
-=head1 VERSION
-
-$Id: freeside-credit-report,v 1.5 2002-09-09 22:57:34 ivan Exp $
-
-=head1 BUGS
-
-Yes..... Use at your own risk. No guarantees or warrantees of any
-kind apply to this program. Parts of this program are hacked from
-other GNU licensed software created mainly by Ivan Kohler.
-
-This is released under the GNU Public License. See www.gnu.org
-for more information regarding this license.
-
-=head1 SEE ALSO
-
-L<FS::cust_main>, config.html from the base documentation
-
-=head1 AUTHOR
-
-Jeff Finucane <jeff@cmh.net>
-
-based on print-batch by Joel Griffiths <griff@aver-computer.com>
-
-=cut
-
diff --git a/httemplate/index.html b/httemplate/index.html
index ad086ebc8..6ad12f197 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -69,14 +69,13 @@
               <LI>all invoices (<A HREF="search/cust_bill.html?invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?date">by date</A>) (<A HREF="search/cust_bill.html?custnum">by customer number</A>)
             </UL>
       <A HREF="search/report_cust_pay.html">Payment report (by type and/or date range)</A>
+      <BR><BR><A HREF="search/report_cust_credit.html">Credit report (by employee and/or date range)</A>
       <BR><BR><A HREF="graph/money_time.cgi">Sales, Credits and Receipts Summary</A>
       <BR><BR><A HREF="search/report_receivables.cgi">Accounts Receivable Aging Summary</A>
       <BR><BR><A HREF="search/report_prepaid_income.html">Prepaid Income (Unearned Revenue) Report</A>
       <BR><BR>(old) Financial reports (being rewritten)
             <UL>
               <LI> <A HREF="search/report_tax.html">tax reports</A>
-              <LI> <A HREF="search/report_cc.html">credit card receipts</A>
-              <LI> <A HREF="search/report_credit.html">credit memos</A>
             </UL>
       <CENTER><HR WIDTH="94%" NOSHADE></CENTER><BR>
       <A NAME="admin">Administration</a>
@@ -132,7 +131,7 @@
       <A HREF="browse/part_svc.cgi?active=1">Service definitions (by number of active services)</A><BR><BR>
     Customers
       <UL>
-        <LI><A HREF="search/cust_main-otaker.cgi">Search customers by order-taker</A>
+        <LI><A HREF="search/cust_main-otaker.cgi">Search customers by ordering employee</A>
       </UL>
     <FORM ACTION="search/sql.html" METHOD="POST">SQL query: <TT>SELECT </TT><INPUT TYPE="text" NAME="sql" SIZE=32><INPUT TYPE="submit" VALUE="Query"></FORM>
 
diff --git a/httemplate/search/report_cc.cgi b/httemplate/search/report_cc.cgi
deleted file mode 100755
index c2ab726b6..000000000
--- a/httemplate/search/report_cc.cgi
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $user = getotaker;
-
-$cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
-my $beginning = $1;
-
-$cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
-my $ending = $1;
-
-print header('Credit Card Recipt Report Results');
-
-open (REPORT, "freeside-cc-receipts-report -v -s $beginning -f $ending $user |");
-
-print '<PRE>';
-while(<REPORT>) {
-  print $_;
-}
-print '</PRE>';
-
-print '</BODY></HTML>';
-
-%>
-
diff --git a/httemplate/search/report_cc.html b/httemplate/search/report_cc.html
deleted file mode 100755
index 595a7b150..000000000
--- a/httemplate/search/report_cc.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Credit Card Receipt Report Criteria</TITLE>
-    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <H1>Credit Card Receipt Report Criteria</H1>
-    <FORM ACTION="report_cc.cgi" METHOD="post">
-      Return <B>credit card receipt report</B> for period: 
-    <TABLE>
-      <TR>
-        <TD ALIGN="right">From: </TD>
-        <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "beginning_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "beginning_button",
-    align:      "BR"
-  });
-</SCRIPT>
-      </TR>
-        <TD ALIGN="right">To: </TD>
-        <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "ending_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "ending_button",
-    align:      "BR"
-  });
-</SCRIPT>
-      </TR>
-    </TABLE>
-
-      <BR><INPUT TYPE="submit" VALUE="Get Report">
-
-    </FORM>
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/report_credit.cgi b/httemplate/search/report_credit.cgi
deleted file mode 100755
index 2adafc06e..000000000
--- a/httemplate/search/report_credit.cgi
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $user = getotaker;
-
-$cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
-my $beginning = $1;
-
-$cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
-my $ending = $1;
-
-print header('In House Credit Report Results');
-
-open (REPORT, "freeside-credit-report -v -s $beginning -f $ending $user |");
-
-print '<PRE>';
-while(<REPORT>) {
-  print $_;
-}
-print '</PRE>';
-
-print '</BODY></HTML>';
-
-%>
-
diff --git a/httemplate/search/report_credit.html b/httemplate/search/report_credit.html
deleted file mode 100755
index 11cb32ed8..000000000
--- a/httemplate/search/report_credit.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>In House Credit Report Criteria</TITLE>
-    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <H1>In House Credit Report Criteria</H1>
-    <FORM ACTION="report_credit.cgi" METHOD="post">
-      Return <B>in house credit report</B> for period: 
-    <TABLE>
-      <TR>
-        <TD ALIGN="right">From: </TD>
-        <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "beginning_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "beginning_button",
-    align:      "BR"
-  });
-</SCRIPT>
-      </TR>
-        <TD ALIGN="right">To: </TD>
-        <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "ending_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "ending_button",
-    align:      "BR"
-  });
-</SCRIPT>
-      </TR>
-    </TABLE>
-
-    <BR><INPUT TYPE="submit" VALUE="Get Report">
-
-    </FORM>
-  </BODY>
-</HTML>
-
-- 
cgit v1.2.1


From ee146c3eada3bdb419ba471dd6df5e889d7dd7e5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Apr 2004 09:23:31 +0000
Subject: adding DBD::Pg and DBIx::DBSchema for 5.005.  argh freebsd and
 solaris!

---
 install/5.005/DBD-Pg-1.22-fixvercmp/Changes        |  352 ++++
 install/5.005/DBD-Pg-1.22-fixvercmp/MANIFEST       |   38 +
 install/5.005/DBD-Pg-1.22-fixvercmp/Makefile.PL    |   83 +
 install/5.005/DBD-Pg-1.22-fixvercmp/Pg.h           |   46 +
 install/5.005/DBD-Pg-1.22-fixvercmp/Pg.pm          | 1913 ++++++++++++++++++
 install/5.005/DBD-Pg-1.22-fixvercmp/Pg.xs          |  644 +++++++
 install/5.005/DBD-Pg-1.22-fixvercmp/README         |  166 ++
 install/5.005/DBD-Pg-1.22-fixvercmp/README.win32   |   63 +
 install/5.005/DBD-Pg-1.22-fixvercmp/dbd-pg.pod     |  411 ++++
 install/5.005/DBD-Pg-1.22-fixvercmp/dbdimp.c       | 2024 ++++++++++++++++++++
 install/5.005/DBD-Pg-1.22-fixvercmp/dbdimp.h       |   81 +
 .../5.005/DBD-Pg-1.22-fixvercmp/eg/ApacheDBI.pl    |   70 +
 install/5.005/DBD-Pg-1.22-fixvercmp/eg/lotest.pl   |   74 +
 .../DBD-Pg-1.22-fixvercmp/eg/notify_test.patch     |   82 +
 install/5.005/DBD-Pg-1.22-fixvercmp/t/00basic.t    |   10 +
 install/5.005/DBD-Pg-1.22-fixvercmp/t/01connect.t  |   26 +
 .../5.005/DBD-Pg-1.22-fixvercmp/t/01constants.t    |   25 +
 install/5.005/DBD-Pg-1.22-fixvercmp/t/01setup.t    |   38 +
 install/5.005/DBD-Pg-1.22-fixvercmp/t/02prepare.t  |   84 +
 install/5.005/DBD-Pg-1.22-fixvercmp/t/03bind.t     |   85 +
 install/5.005/DBD-Pg-1.22-fixvercmp/t/04execute.t  |  113 ++
 install/5.005/DBD-Pg-1.22-fixvercmp/t/05fetch.t    |  131 ++
 .../5.005/DBD-Pg-1.22-fixvercmp/t/06disconnect.t   |   31 +
 install/5.005/DBD-Pg-1.22-fixvercmp/t/07reuse.t    |   28 +
 install/5.005/DBD-Pg-1.22-fixvercmp/t/08txn.t      |  102 +
 .../5.005/DBD-Pg-1.22-fixvercmp/t/09autocommit.t   |   68 +
 install/5.005/DBD-Pg-1.22-fixvercmp/t/11quoting.t  |   50 +
 .../5.005/DBD-Pg-1.22-fixvercmp/t/12placeholders.t |  125 ++
 install/5.005/DBD-Pg-1.22-fixvercmp/t/13pgtype.t   |   43 +
 install/5.005/DBD-Pg-1.22-fixvercmp/t/15funct.t    |  353 ++++
 install/5.005/DBD-Pg-1.22-fixvercmp/t/99cleanup.t  |   24 +
 .../5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info.pm  | 1167 +++++++++++
 .../t/lib/App/Info/Handler.pm                      |  305 +++
 .../t/lib/App/Info/Handler/Prompt.pm               |  170 ++
 .../DBD-Pg-1.22-fixvercmp/t/lib/App/Info/RDBMS.pm  |   55 +
 .../t/lib/App/Info/RDBMS/PostgreSQL.pm             |  730 +++++++
 .../t/lib/App/Info/Request.pm                      |  287 +++
 .../DBD-Pg-1.22-fixvercmp/t/lib/App/Info/Util.pm   |  456 +++++
 .../5.005/DBIx-DBSchema-0.23-5.005kludge/Changes   |   62 +
 .../DBIx-DBSchema-0.23-5.005kludge/DBSchema.pm     |  367 ++++
 .../DBSchema/ColGroup.pm                           |  141 ++
 .../DBSchema/ColGroup/Index.pm                     |   37 +
 .../DBSchema/ColGroup/Unique.pm                    |   38 +
 .../DBSchema/Column.pm                             |  300 +++
 .../DBIx-DBSchema-0.23-5.005kludge/DBSchema/DBD.pm |  113 ++
 .../DBSchema/DBD/Pg.pm                             |  175 ++
 .../DBSchema/DBD/Sybase.pm                         |  141 ++
 .../DBSchema/DBD/mysql.pm                          |  126 ++
 .../DBSchema/Table.pm                              |  471 +++++
 .../5.005/DBIx-DBSchema-0.23-5.005kludge/MANIFEST  |   19 +
 .../DBIx-DBSchema-0.23-5.005kludge/MANIFEST.SKIP   |    1 +
 .../DBIx-DBSchema-0.23-5.005kludge/Makefile.PL     |   11 +
 .../5.005/DBIx-DBSchema-0.23-5.005kludge/README    |   42 +
 install/5.005/DBIx-DBSchema-0.23-5.005kludge/TODO  |    6 +
 .../DBIx-DBSchema-0.23-5.005kludge/t/load-mysql.t  |    5 +
 .../DBIx-DBSchema-0.23-5.005kludge/t/load-pg.t     |   12 +
 .../5.005/DBIx-DBSchema-0.23-5.005kludge/t/load.t  |    5 +
 57 files changed, 12625 insertions(+)
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/Changes
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/MANIFEST
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/Makefile.PL
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/Pg.h
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/Pg.pm
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/Pg.xs
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/README
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/README.win32
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/dbd-pg.pod
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/dbdimp.c
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/dbdimp.h
 create mode 100755 install/5.005/DBD-Pg-1.22-fixvercmp/eg/ApacheDBI.pl
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/eg/lotest.pl
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/eg/notify_test.patch
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/00basic.t
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/01connect.t
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/01constants.t
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/01setup.t
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/02prepare.t
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/03bind.t
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/04execute.t
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/05fetch.t
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/06disconnect.t
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/07reuse.t
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/08txn.t
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/09autocommit.t
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/11quoting.t
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/12placeholders.t
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/13pgtype.t
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/15funct.t
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/99cleanup.t
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info.pm
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/Handler.pm
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/Handler/Prompt.pm
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/RDBMS.pm
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/RDBMS/PostgreSQL.pm
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/Request.pm
 create mode 100644 install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/Util.pm
 create mode 100644 install/5.005/DBIx-DBSchema-0.23-5.005kludge/Changes
 create mode 100644 install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema.pm
 create mode 100644 install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/ColGroup.pm
 create mode 100644 install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/ColGroup/Index.pm
 create mode 100644 install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/ColGroup/Unique.pm
 create mode 100644 install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/Column.pm
 create mode 100644 install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/DBD.pm
 create mode 100644 install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/DBD/Pg.pm
 create mode 100755 install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/DBD/Sybase.pm
 create mode 100644 install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/DBD/mysql.pm
 create mode 100644 install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/Table.pm
 create mode 100644 install/5.005/DBIx-DBSchema-0.23-5.005kludge/MANIFEST
 create mode 100644 install/5.005/DBIx-DBSchema-0.23-5.005kludge/MANIFEST.SKIP
 create mode 100644 install/5.005/DBIx-DBSchema-0.23-5.005kludge/Makefile.PL
 create mode 100644 install/5.005/DBIx-DBSchema-0.23-5.005kludge/README
 create mode 100644 install/5.005/DBIx-DBSchema-0.23-5.005kludge/TODO
 create mode 100644 install/5.005/DBIx-DBSchema-0.23-5.005kludge/t/load-mysql.t
 create mode 100644 install/5.005/DBIx-DBSchema-0.23-5.005kludge/t/load-pg.t
 create mode 100644 install/5.005/DBIx-DBSchema-0.23-5.005kludge/t/load.t

diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/Changes b/install/5.005/DBD-Pg-1.22-fixvercmp/Changes
new file mode 100644
index 000000000..c3456283e
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/Changes
@@ -0,0 +1,352 @@
+1.22  Wed Mar 26 22:33:44 EST 2003
+	- Win32 compile fix for snprintf [Joe Spears]
+	- Fix memory allocation problem in bytea escaping [Barrie Slaymaker]
+	- Add utf8 support [Dominic Mitchell <dom@semantico.com>]
+	- Transform Perl arrays into PostgreSQL arrays [Alexey Slynko]
+	- Fix for foreign_key_info() [Keith Keller]
+	- Fix PG_TEXT parameter binding
+	- Doc cleanups [turnstep]
+	- Fix warning from func($table, 'table_attributes') [turnstep]
+	- Added suppport for schemas [turnstep]
+	- Fix binary to a bytea field conversion [Chris Dunlop <chris@onthe.net.au>]
+1.21  Sun Jan 12 21:00:44 EST 2003
+	- System tables no longer returned by tables(). [Dave Rolsky]
+	- Fix table_attributes to handle removal of pg_relcheck in 7.3,
+	from Ian Barwick <barwick@gmx.net>
+	- Properly reset transaction status after failed transaction when
+        autocommit is off.  Properly report transaction failure message.
+        Kai <kai@xs4all.nl>
+	- New pg_bool_tf database handle that when set to true booleans are
+        returned as 't'/'f' rather than 1/0.
+
+1.20  Wed Nov 27 16:19:26 2002
+	- Maintenance transferred to GBorg,
+        http://gborg.postgresql.org/project/dbdpg/projdisplay.php. Incremented
+        version number to reflect new management. [Bruce Momjian]
+	- README cleaned up. [Bruce Momjian]
+	- Added t/15funct.t, a series of tests that determine if the meta data
+        is working. [Thomas Lowery]
+	- Added implementations of column_info() and table_info(), and
+        primary_key_info(). [Thomas Lowery]
+	- The POD formatting was cleaned up. [David Wheeler]
+	- The preparser was updated to better handle escaped characters. [Rudy
+        Lippan]
+	- Removed redundant use of strlen() in pg_error() (Jason E. Stewart).
+	- Test suite cleaned up, converted to use Test::More, and updated to use
+        standard DBI environment variables for connecting to a test database.
+        [Jason E. Stewart]
+	- Added eg/lotest.pl as a demonstration of using large objects in buffers
+        rather than files. Contributed by Garth Webb.
+	- Added LISTEN/NOTIFY functionality. Congributed by Alex Pilosov.
+	- Added constants for common PostgreSQL data types, plus simple tests to
+	make sure that they work. These are exportable via "use DBD::Pg
+	qw(:pg_types);". [David Wheeler]
+	- Deprecatated the undocumented (and invalid) use of SQL_BINARY in
+	bind_param() and documented the correct approach: "bind_param($num,
+	$val { pg_type => PG_BYTEA });". Use of SQL_BINARY in bind_param() will
+        now issue a warning if $h->{Warn} is true. [David Wheeler]
+	- Removed invalid (and broken) support for SQL_BINARY in quote(). [David
+	Wheeler]
+	- Added App::Info::RDBMS::PostgreSQL to the distribution (but it won't
+        be installed) to help Makefile.PL find the PostgreSQL include and
+        library files. [David Wheeler]
+	- Fixed compile-time warnings. [David Wheeler and Jason E. Stewart]
+
+2002-04-27 Jeffrey W. Baker <jwbaker@acm.org>
+
+	- dbdimp.c: Add default at end of switch statement for pg_type attrib.
+	- t/13pgtype.t: test for above.
+    
+2002-04-09 Jeffrey W. Baker <jwbaker@acm.org>
+
+	- Pg.pm, dbdimp.c: Applied patch from 
+	Thomas A. Lowery <tlowery@stlowery.net> concerning metadata
+	in table_info and so forth.
+    
+2002-03-06 Jeffrey W. Baker <jwbaker@acm.org>
+	- Pg.pm (quote): Applied patch from David Wheeler <david@wheeler.net>
+	to simplfiy and speed up quoting.
+	- t/11quoting.t: Tests for above patch.
+	- t/12placeholders.t: Tests for placeholder parsing in quoted strings.
+    
+2002-03-06 Jeffrey W. Baker
+	- Version 1.10 uploaded to CPAN.
+ 
+1.01 Jun 27, 2001
+	- fixed core dump when trying to use a BYTEA value with
+	  a byte outside 0..127  Alex Pilosov <alex@pilosoft.com>
+
+1.00 May 27, 2001
+	- Fetching all records now resets Active flag as it should.
+
+0.99 May 24, 2001
+	- fix the segmentation fault in pg_error.
+
+0.98 Apr 25, 2001
+	- bug-fix for core-dump after any failed function call.
+	- applied patch from Alex Pilosov <alex@pilosoft.com> 
+	  which adds support for the datatype bytea
+
+0.97 Apr 20, 2001
+	- fix bug in connect method, which erroneously set the userid
+	  and the password to the environment variables DBI_USER and
+	  DBI_PASS.
+	- applied patch from Jan-Pieter Cornet <john@pc.xs4all.nl>,
+	  which removed the special handling of a backslash when
+	  used for octal presentation. Now a backslash always will
+	  be escaped.
+
+0.96 Apr 09, 2001
+	- remove memory-leak in ping function, bug-fix
+	  from Doug Perham <dperham@wgate.com>
+	- correct the recognition of primary keys in 
+	  table_attributes(). Patch from Brian Powell 
+	  <brian@nicklebys.com>.
+	- applied patch from David D. Kilzer <ddkilzer@lubricants-oil.com>
+	  which fixes a segmentation fault in DBD::pg::blob_read() when 
+	  reading LOBs that required perl to reallocate space for the 
+	  variable holding the scalar value
+	- updated test.pl to create a test blob larger than 256 bytes 
+	  (now 128 Kbytes)
+	- apply patch from Tom Lane, which fixes a seg-fault when
+	  inserting large amounts of text.
+	- apply patch from Peter Haworth   pmh@edison.ioppublishing.com,
+	  which removes the newlines from the error messages and which 
+	  quotes date placeholders.
+
+0.95 Jul 10, 2000
+	- add Win32 port from Bob Kline <bkline@rksystems.com>.
+
+0.94 Jul 07, 2000
+	- applied patch from Rudy Lippan <almighty@randomc.com>
+	  which fixes a memory-leak with failed connections.
+	- applied patch from Hein Roehrig <hein@acm.org>
+	  which fixes a bug with escaping a backslash except for 
+	  octal presentation
+        - applied patch from Francis J. Lacoste <francis.lacoste@iNsu.COM
+          which fixes a segmentation fault when all binded parameters are NULL
+        - adapt test.pl to avoid warnings with postgresql-7.0
+        - added support for 'COPY FROM STDIN' and 'COPY TO STDOUT'
+        - added patch from Mark Stosberg <mark@summersault.com>
+          to enhance the table_attributes subroutine
+
+0.93 Sep 29, 1999
+	- it is required now to set the environment variables POSTGRES_INCLUDE
+	  and POSTGRES_LIB for compiling the module.
+	- add Win32 port from Bob Kline <bkline@rksystems.com>.
+	- support for all large-object functions via the func
+	  interface. 
+	- fixed bug with placeholders and casts spotted by
+	  mschout@gkg.net
+	- replaced the method attributes by the method table_attributes,
+	  from Scott Williams <scott@james.com>.
+	- fix type definitions for type_info_all().
+	  bug spotted by "carlos" <emarcet@intramed.net.ar>.
+	- now the Pg-specific quote() method also evaluates the 
+	  data-type paramater. 
+
+0.92 Jun 16, 1999
+	- proposal from Philip Warner <pjw@rhyme.com.au>:
+	  increase BUFSIZE from 1024 to 32768 in order to improve
+	  I/O performance.
+	- bug-fix in Makefile.PL for $POSTGRES_HOME not defined
+	  spotted by mdalphin@amgen.com (Mark Dalphin)
+	- bug-fix for data-type datetime in type_info_all
+	  spotted by Alan Grover <awgrover@iconnect-inc.com>
+	- bug-fix for escaped 's spotted by Hankin <hankin@consultco.com>
+	- removed 'large objects' related tests from test.pl
+
+0.91 Feb 14, 1999
+	- removed restriction for commercial use in copyright
+	- corrected DATA_TYPE in type_info_all()
+
+0.90 Jan 15, 1998
+	- discard parameter authtype from connect string
+	- remove work-around for bug in the large object 
+	  interface of postgresql 
+
+0.89 Nov 05, 1998
+	- bug-fix from Jan Iven <j.iven@rz.uni-sb.de>:
+	  fix problem with quoting Null in bind variables.
+
+0.88 Oct 10, 1998
+	- fixed blob_read
+	- suppressed warning when testing DBI::errstr
+
+0.87 Sep 05, 1998
+	- Pg.xs adapted to Driver.xst from DBI-1.0
+	- major rewrite of module documentation 
+	- major rewrite of the test script
+	- use built-in DBI method for $dbh->do 
+	- add macro dHTR in order to avoid compile errors 
+	  with threaded perl5.005
+	- renamed attribute AutoEscape to pg_auto_escape
+	- renamed attribute SIZE to pg_size
+	- new attribute pg_type
+	- added support for DBI->data_sources($driver)
+	- added support for $dbh->table_info
+	- blob_read documented and added to test.pl 
+	- added support for attr parameter in bind_param()
+
+0.86 Aug 21, 1998
+	- added /usr/lib/ to search path for libpq.
+	- added ChopBlanks, patch from 
+          Victor Krasinsky <victor@rdovira.lviv.ua>
+	- changed test.pl to test multiple database handles 
+
+0.85 July 19, 1998
+	- non-printable characters in parameters will not be 
+	  converted to '.'. They are passed unchanged to the 
+	  database. 
+
+0.84 July 18, 1998
+	- bug-fix from Max Cohan <mcohan@adnc.net>:
+	  check for \xxx presentation before escaping backslash
+	  in parameters. 
+	- introduce new database handle attribute AutoEscape, which 
+	  controls escaping of quotes and backslashes in parameters. 
+	  When set to on, all quotes except at the beginning and 
+	  at the end of a line will be escaped and all backslashes 
+	  except when used to indicate an octal presentation (\xxx) 
+	  will be escaped. Default of AutoEscape is on. 
+
+0.83 July 10, 1998
+	- bug-fix from Max Cohan <mcohan@adnc.net>:
+	  using traces together with undef in place-holders dumped 
+	  core. 
+
+0.82 June 20, 1998
+	- bug-fix from Matthew Lenz <matthew@nocturnal.org>:
+	  corrected include path in Makefile.PL .
+	- added 'use strict;' to test.pl
+
+0.81 June 13, 1998
+	- bug-fix from Rolf Grossmann <grossman@securitas.net>:
+	  undefined parameters in an execute statement will be 
+	  translated from 'undef' to 'NULL'. Also every parameter 
+	  for bind_param() will be quoted by default (escape quote 
+	  and backslash). Appropriate tests have been added to test.pl. 
+	- change ping method to use libpq-interface.
+
+0.80 June 07, 1998
+	- adapted to postgresql-6.4:
+	  the backend protocol has changed, which needs an adapted
+	  ping method. A ping-test has been added to the test-script.
+	  Also some type identifiers have changed. 
+
+0.73 June 03, 1998
+	- changed include directives in Makefile.PL from 
+	  archlib to installarchlib and from sitearch to
+	  installsitearch (Tony.Curtis@vcpc.univie.ac.at).
+	- applied patch from Junio Hamano <junio@twinsun.com>
+	  quote method also doubles backslash.
+
+0.72 April 20, 1998
+	- applied patch from Michael J Schout <mschout@gkg.net>
+	  which fixed the bug with queries containing the cast
+          operator.
+	- applied patch from "Irving Reid" <irving@tor.securecomputing.com>
+	  which fixed a memory leak.
+
+0.71 April 04, 1998
+	- applied patch from "Irving Reid" 
+	  <irving@tor.securecomputing.com> which fixed the
+	  the problem with the InactiveDestroy message.
+
+0.70 March 28, 1998
+        - linking again with the shared version of libpq 
+          due to problems on several operating systems.
+
+0.69 March  6, 1998
+	- expanded the search path for include files
+        - module is now linked with static libpq.a
+
+0.68  March 3, 1998
+        - return to UNIX domain sockets in test-scripts
+
+0.67  February 21, 1998
+	- remove part of Driver.xst due to compile
+	  error on some systems.
+
+0.66  February 19, 1998
+	- remove defines in Pg.h so that
+	  it compiles also with postgresql-6.2.1
+	- changed ping method: set RaiseError=0
+
+0.65  February 14, 1998
+	- adapted to changes in DBI-0.91, so that the
+	  default setting for AutoCommit and PrintError is 
+	  again conformant to the DBI specs.
+
+0.64  February 01, 1998
+        - changed syntax of data_source (ODBC-conformant): 
+          'dbi:Pg:dbname=dbname;host=host;port=port'
+          !!! PLEASE ADAPT YOUR SCRIPTS !!!
+        - implemented place-holders 
+        - implemented ping-method
+        - added support for $dbh->{RaiseError} and $dbh->{PrintError},
+          note: DBI-default for PrintError is on !
+        - allow commit and rollback only if AutoCommit = off
+        - added documentation for $dbh->tables;
+        - new method to get meta-information about a given table:
+          $dbh->DBD::Pg::db::attributes($table);
+        - host-parameter in test.pl is set explicitly to localhost
+
+0.63  October 05, 1997
+	- adapted to PostgreSQL-6.2:
+          o $sth->rows as well as $sth->execute
+            and $sth->do return the number of 
+            affected rows even for non-Select
+            statements.
+          o support for password authorization added, 
+            please check the man-page for pg_passwd. 
+        - the data_source parameter of the connect 
+          method accepts two additional parameters 
+          which are  treated as host and port:
+          DBI->connect("dbi:Pg:dbname:host:port", "uid", "pwd")
+        - support for AutoCommit, please read the 
+          module documentation for impacts on your 
+          scripts !
+        - more perl-ish handling of data type bool, 
+          please read the module documentation for 
+          impacts on your scripts !
+
+0.62  August 26, 1997
+	- added blobs/README
+
+0.61  August 23, 1997
+        - adapted to DBI-0.89/Driver.xst
+	- added support for blob_read
+
+0.52  August 15, 1997
+        - added support for literal $sth->{'TYPE'},
+          pg_type.pl / pg_type.pm.
+
+0.51  August 12, 1997
+        - changed attributes to be DBI conformant:
+          o OID_STATUS to pg_oid_status
+          o CMD_STATUS to pg_cmd_status
+
+0.5   August 05, 1997
+	- support for user authentication
+	- support for bind_columns
+	- added $dbh->tables
+
+0.4   Jun 24, 1997
+        - adapted to DBI-0.84:
+          o new syntax for DBI->connect !
+          o execute returns 0E0 -> n for     SELECT stmt
+                                  -1 for non SELECT stmt
+                                  -2 on error
+        - new attribute $sth->{'OID_STATUS'}
+        - new attribute $sth->{'CMD_STATUS'}
+
+0.3   Apr 24, 1997
+        - bug fix release, ( still alpha ! )
+
+0.2   Mar 13, 1997
+	- complete rewrite, ( still alpha ! )
+
+0.1   Feb 15, 1997
+	- creation, ( totally pre-alpha ! )
+
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/MANIFEST b/install/5.005/DBD-Pg-1.22-fixvercmp/MANIFEST
new file mode 100644
index 000000000..7d1b7000f
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/MANIFEST
@@ -0,0 +1,38 @@
+Changes
+MANIFEST
+Makefile.PL
+Pg.h
+Pg.pm
+Pg.xs
+README
+README.win32
+dbd-pg.pod
+dbdimp.c
+dbdimp.h
+eg/ApacheDBI.pl
+eg/lotest.pl
+eg/notify_test.patch
+t/00basic.t
+t/01connect.t
+t/01constants.t
+t/01setup.t
+t/02prepare.t
+t/03bind.t
+t/04execute.t
+t/05fetch.t
+t/06disconnect.t
+t/07reuse.t
+t/08txn.t
+t/09autocommit.t
+t/11quoting.t
+t/12placeholders.t
+t/13pgtype.t
+t/15funct.t
+t/99cleanup.t
+t/lib/App/Info.pm
+t/lib/App/Info/Handler.pm
+t/lib/App/Info/Handler/Prompt.pm
+t/lib/App/Info/RDBMS.pm
+t/lib/App/Info/RDBMS/PostgreSQL.pm
+t/lib/App/Info/Request.pm
+t/lib/App/Info/Util.pm
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/Makefile.PL b/install/5.005/DBD-Pg-1.22-fixvercmp/Makefile.PL
new file mode 100644
index 000000000..0633280c7
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/Makefile.PL
@@ -0,0 +1,83 @@
+
+# $Id: Makefile.PL,v 1.1 2004-04-29 09:21:28 ivan Exp $
+
+use ExtUtils::MakeMaker;
+use Config;
+use strict;
+
+use DBI 1.00;
+use DBI::DBD;
+
+my $lib;
+BEGIN {
+    my %sep = (MacOS   => ':',
+               MSWin32 => '\\',
+               os2     => '\\',
+               VMS     => '\\',
+               NetWare => '\\',
+               dos     => '\\');
+    my $s = $sep{$^O} || '/';
+    $lib = join $s, 't', 'lib';
+}
+
+use lib $lib;
+print "Configuring Pg\n";
+print "Remember to actually read the README file !\n";
+
+my $POSTGRES_INCLUDE;
+my $POSTGRES_LIB;
+
+if ((!$ENV{POSTGRES_INCLUDE} or !$ENV{POSTGRES_LIB}) and !$ENV{POSTGRES_HOME}) {
+    # Use App::Info to get the data we need.
+    require App::Info::RDBMS::PostgreSQL;
+    require App::Info::Handler::Prompt;
+    my $p = App::Info::Handler::Prompt->new;
+    my $pg = App::Info::RDBMS::PostgreSQL->new(on_unknown => $p);
+    $POSTGRES_INCLUDE = $pg->inc_dir;
+    $POSTGRES_LIB     = $pg->lib_dir;
+} elsif ((!$ENV{POSTGRES_INCLUDE} or !$ENV{POSTGRES_LIB}) and $ENV{POSTGRES_HOME}) {
+    $POSTGRES_INCLUDE = "$ENV{POSTGRES_HOME}/include";
+    $POSTGRES_LIB     = "$ENV{POSTGRES_HOME}/lib";
+} else {
+    $POSTGRES_INCLUDE = "$ENV{POSTGRES_INCLUDE}";
+    $POSTGRES_LIB     = "$ENV{POSTGRES_LIB}";
+}
+
+my $os = $^O;
+print "OS: $os\n";
+
+my $dbi_arch_dir;
+if ($os eq 'MSWin32') {
+    $dbi_arch_dir = "\$(INSTALLSITEARCH)/auto/DBI";
+} else {
+    $dbi_arch_dir = dbd_dbi_arch_dir();
+}
+
+my %opts = (
+    NAME         => 'DBD::Pg',
+    VERSION_FROM => 'Pg.pm',
+    INC          => "-I$POSTGRES_INCLUDE -I$dbi_arch_dir",
+    OBJECT       => "Pg\$(OBJ_EXT) dbdimp\$(OBJ_EXT)",
+    LIBS         => ["-L$POSTGRES_LIB -lpq"],
+    AUTHOR       => 'http://gborg.postgresql.org/project/dbdpg/projdisplay.php',
+    ABSTRACT     => 'PostgreSQL database driver for the DBI module',
+    PREREQ_PM	 => { 'Test::Simple' => 0.17 }, # Need Test::More
+);
+
+if ($os eq 'hpux') {
+    my $osvers = $Config{osvers};
+    if ($osvers < 10) {
+        print "Warning: Forced to build static not dynamic on $os $osvers.\a\n";
+        $opts{LINKTYPE} = 'static';
+    }
+}
+
+if ($Config{dlsrc} =~ /dl_none/) {
+    $opts{LINKTYPE} = 'static';
+}
+
+WriteMakefile(%opts);
+
+exit(0);
+
+# end of Makefile.PL
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/Pg.h b/install/5.005/DBD-Pg-1.22-fixvercmp/Pg.h
new file mode 100644
index 000000000..b77a9f8b2
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/Pg.h
@@ -0,0 +1,46 @@
+/*
+   $Id: Pg.h,v 1.1 2004-04-29 09:21:28 ivan Exp $
+
+   Copyright (c) 1997,1998,1999,2000 Edmund Mergl
+   Portions Copyright (c) 1994,1995,1996,1997 Tim Bunce
+
+   You may distribute under the terms of either the GNU General Public
+   License or the Artistic License, as specified in the Perl README file.
+
+*/
+
+
+#ifdef WIN32
+static int errno;
+#endif
+
+#include "libpq-fe.h"
+
+#ifdef NEVER
+#include<sys/stat.h>
+#include "libpq/libpq-fs.h"
+#endif
+#ifndef INV_READ
+#define INV_READ 0x00040000
+#endif
+#ifndef INV_WRITE
+#define INV_WRITE 0x00020000
+#endif
+
+#ifdef BUFSIZ
+#undef BUFSIZ
+#endif
+/* this should improve I/O performance for large objects */
+#define BUFSIZ 32768
+
+
+#define NEED_DBIXS_VERSION 93
+
+#include <DBIXS.h>		/* installed by the DBI module	*/
+
+#include "dbdimp.h"		/* read in our implementation details */
+
+#include <dbd_xsh.h>		/* installed by the DBI module	*/
+
+
+/* end of Pg.h */
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/Pg.pm b/install/5.005/DBD-Pg-1.22-fixvercmp/Pg.pm
new file mode 100644
index 000000000..284e56346
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/Pg.pm
@@ -0,0 +1,1913 @@
+
+#  $Id: Pg.pm,v 1.1 2004-04-29 09:21:28 ivan Exp $
+#
+#  Copyright (c) 1997,1998,1999,2000 Edmund Mergl
+#  Copyright (c) 2002 Jeffrey W. Baker
+#  Portions Copyright (c) 1994,1995,1996,1997 Tim Bunce
+#
+#  You may distribute under the terms of either the GNU General Public
+#  License or the Artistic License, as specified in the Perl README file.
+
+
+require 5.004;
+
+$DBD::Pg::VERSION = '1.22';
+
+{
+    package DBD::Pg;
+
+    use DBI ();
+    use DynaLoader ();
+    use Exporter ();
+    @ISA = qw(DynaLoader Exporter);
+
+    %EXPORT_TAGS = (
+	pg_types => [ qw(
+           PG_BOOL PG_BYTEA PG_CHAR PG_INT8 PG_INT2 PG_INT4 PG_TEXT PG_OID
+           PG_FLOAT4 PG_FLOAT8 PG_ABSTIME PG_RELTIME PG_TINTERVAL PG_BPCHAR
+           PG_VARCHAR PG_DATE PG_TIME PG_DATETIME PG_TIMESPAN PG_TIMESTAMP
+	)]);
+
+    Exporter::export_ok_tags('pg_types');
+
+    require_version DBI 1.00;
+
+    bootstrap DBD::Pg $VERSION;
+
+    $err = 0;		# holds error code   for DBI::err
+    $errstr = "";	# holds error string for DBI::errstr
+    $drh = undef;	# holds driver handle once initialized
+
+    sub driver{
+	return $drh if $drh;
+	my($class, $attr) = @_;
+
+	$class .= "::dr";
+
+	# not a 'my' since we use it above to prevent multiple drivers
+
+	$drh = DBI::_new_drh($class, {
+	    'Name' => 'Pg',
+	    'Version' => $VERSION,
+	    'Err'    => \$DBD::Pg::err,
+	    'Errstr' => \$DBD::Pg::errstr,
+	    'Attribution' => 'PostgreSQL DBD by Edmund Mergl',
+	});
+
+	$drh;
+    }
+
+    ## Used by both the dr and db packages
+    sub pg_server_version {
+		my $dbh = shift;
+		return $dbh->{pg_server_version} if defined $dbh->{pg_server_version};
+        my ($version) = $dbh->selectrow_array("SELECT version();");
+        return 0 unless $version =~ /^PostgreSQL ([\d\.]+)/;
+        $dbh{pg_server_version} = $1;
+        return $dbh{pg_server_version};
+	}
+
+    sub pg_use_catalog {
+      my $dbh = shift;
+      my $version = DBD::Pg::pg_server_version($dbh);
+      $version =~ /^(\d+\.\d+)/;
+      return $1 < 7.3 ? "" : "pg_catalog.";
+    }
+
+    1;
+}
+
+
+{   package DBD::Pg::dr; # ====== DRIVER ======
+    use strict;
+
+    sub data_sources {
+        my $drh = shift;
+        my $dbh = DBD::Pg::dr::connect($drh, 'dbname=template1') or return undef;
+        $dbh->{AutoCommit} = 1;
+        my $CATALOG = DBD::Pg::pg_use_catalog($dbh);
+        my $sth = $dbh->prepare("SELECT datname FROM ${CATALOG}pg_database ORDER BY datname");
+        $sth->execute or return undef;
+        my (@sources, @datname);
+        while (@datname = $sth->fetchrow_array) {
+            push @sources, "dbi:Pg:dbname=$datname[0]";
+        }
+        $sth->finish;
+        $dbh->disconnect;
+        return @sources;
+    }
+
+
+    sub connect {
+        my($drh, $dbname, $user, $auth)= @_;
+
+        # create a 'blank' dbh
+
+        my $Name = $dbname;
+        $Name =~ s/^.*dbname\s*=\s*//;
+        $Name =~ s/\s*;.*$//;
+
+        $user = "" unless defined($user);
+        $auth = "" unless defined($auth);
+
+        $user = $ENV{DBI_USER} if $user eq "";
+        $auth = $ENV{DBI_PASS} if $auth eq "";
+
+        $user = "" unless defined($user);
+        $auth = "" unless defined($auth);
+
+        my($dbh) = DBI::_new_dbh($drh, {
+            'Name' => $Name,
+            'User' => $user, 'CURRENT_USER' => $user,
+        });
+
+        # Connect to the database..
+        DBD::Pg::db::_login($dbh, $dbname, $user, $auth) or return undef;
+
+        $dbh;
+    }
+
+}
+
+
+{   package DBD::Pg::db; # ====== DATABASE ======
+    use strict;
+    use Carp ();
+
+    sub prepare {
+        my($dbh, $statement, @attribs)= @_;
+
+        # create a 'blank' sth
+
+        my $sth = DBI::_new_sth($dbh, {
+            'Statement' => $statement,
+        });
+
+        DBD::Pg::st::_prepare($sth, $statement, @attribs) or return undef;
+
+        $sth;
+    }
+
+
+    sub ping {
+        my($dbh) = @_;
+
+	local $SIG{__WARN__} = sub { } if $dbh->{PrintError};
+        local $dbh->{RaiseError} = 0 if $dbh->{RaiseError};
+        my $ret = DBD::Pg::db::_ping($dbh);
+
+        return $ret;
+    }
+
+	# Column expected in statement handle returned.
+	# table_cat, table_schem, table_name, column_name, data_type, type_name,
+	# column_size, buffer_length, DECIMAL_DIGITS, NUM_PREC_RADIX, NULLABLE,
+	# REMARKS, COLUMN_DEF, SQL_DATA_TYPE, SQL_DATETIME_SUB, CHAR_OCTET_LENGTH,
+	# ORDINAL_POSITION, IS_NULLABLE
+	# The result set is ordered by TABLE_CAT, TABLE_SCHEM, 
+	# TABLE_NAME and ORDINAL_POSITION.
+
+	sub column_info {
+		my ($dbh) = shift;
+		my @attrs = @_;
+		# my ($dbh, $catalog, $schema, $table, $column) = @_;
+		my $CATALOG = DBD::Pg::pg_use_catalog($dbh);
+
+		my @wh = ();
+		my @flds = qw/catname n.nspname c.relname a.attname/;
+
+		for my $idx (0 .. $#attrs) {
+			next if ($flds[$idx] eq 'catname'); # Skip catalog
+			if(defined $attrs[$idx] and length $attrs[$idx]) {
+				# Insure that the value is enclosed in single quotes.
+				$attrs[$idx] =~ s/^'?(\w+)'?$/'$1'/;
+				if ($attrs[$idx] =~ m/[,%]/) {
+					# contains a meta character.
+					push( @wh, q{( } . join ( " OR "
+						, map { m/\%/ 
+							? qq{$flds[$idx] ILIKE $_ }
+							: qq{$flds[$idx]    = $_ }
+							} (split /,/, $attrs[$idx]) )
+							. q{ )}
+						);
+				}
+				else {
+					push( @wh, qq{$flds[$idx] = $attrs[$idx]} );
+				}
+			}
+		}
+
+		my $wh = ""; # ();
+		$wh = join( " AND ", '', @wh ) if (@wh);
+		my $version = DBD::Pg::pg_server_version($dbh);
+		$version =~ /^(\d+\.\d+)/;
+		$version = $1;
+		my $showschema = $version < 7.3 ? "NULL::text" : "n.nspname";
+		my $schemajoin = $version < 7.3 ? "" : "LEFT JOIN pg_catalog.pg_namespace n ON (n.oid = c.relnamespace)";
+		my $col_info_sql = qq{
+			SELECT
+				  NULL::text	AS "TABLE_CAT"
+				, $showschema	AS "TABLE_SCHEM"
+				, c.relname		AS "TABLE_NAME"
+				, a.attname		AS "COLUMN_NAME"
+				, t.typname		AS "DATA_TYPE"
+				, NULL::text	AS "TYPE_NAME"
+				, a.attlen		AS "COLUMN_SIZE"
+				, NULL::text	AS "BUFFER_LENGTH"
+				, NULL::text	AS "DECIMAL_DIGITS"
+				, NULL::text	AS "NUM_PREC_RADIX"
+				, a.attnotnull	AS "NULLABLE"
+				, NULL::text	AS "REMARKS"
+				, a.atthasdef	AS "COLUMN_DEF"
+				, NULL::text	AS "SQL_DATA_TYPE"
+				, NULL::text	AS "SQL_DATETIME_SUB"
+				, NULL::text	AS "CHAR_OCTET_LENGTH"
+				, a.attnum		AS "ORDINAL_POSITION"
+				, a.attnotnull	AS "IS_NULLABLE"
+				, a.atttypmod	as atttypmod
+				, a.attnotnull	as attnotnull
+				, a.atthasdef	as atthasdef
+				, a.attnum		as attnum
+			FROM 
+				  ${CATALOG}pg_attribute	a
+				, ${CATALOG}pg_type		t
+				, ${CATALOG}pg_class		c
+				$schemajoin
+			WHERE
+					a.attrelid = c.oid
+				AND a.attnum  >= 0
+				AND t.oid      = a.atttypid
+				AND c.relkind  in ('r','v')
+				$wh
+			ORDER BY 2, 3, 4
+		};
+
+		my $sth = $dbh->prepare( $col_info_sql ) or return undef;
+		$sth->execute();
+
+		return $sth;
+	}
+
+	sub primary_key_info {
+        my $dbh = shift;
+		my ($catalog, $schema, $table) = @_;
+		my @attrs = @_;
+        my $CATALOG = DBD::Pg::pg_use_catalog($dbh);
+
+		# TABLE_CAT:, TABLE_SCHEM:, TABLE_NAME:, COLUMN_NAME:, KEY_SEQ:
+		# , PK_NAME:
+
+		my @wh = (); my @dat = ();  # Used to hold data for the attributes.
+
+		my $version = DBD::Pg::pg_server_version($dbh);
+		$version =~ /^(\d+\.\d+)/;
+		$version = $1;
+
+		my @flds = qw/catname u.usename bc.relname/;
+		$flds[1] = 'n.nspname' unless ($version < 7.3);
+
+		for my $idx (0 .. $#attrs) {
+			next if ($flds[$idx] eq 'catname'); # Skip catalog
+			if(defined $attrs[$idx] and length $attrs[$idx]) {
+				if ($attrs[$idx] =~ m/[,%_?]/) {
+					# contains a meta character.
+					push( @wh, q{( } . join ( " OR "
+						, map { push(@dat, $_);
+							m/[%_?]/ 
+							? qq{$flds[$idx] iLIKE ? }
+							: qq{$flds[$idx]    = ?  }
+							} (split /,/, $attrs[$idx]) )
+							. q{ )}
+						);
+				}
+				else {
+					push( @dat, $attrs[$idx] );
+					push( @wh, qq{$flds[$idx] = ? } );
+				}
+			}
+		}
+
+		my $wh = '';
+		$wh = join( " AND ", '', @wh ) if (@wh);
+
+		# Base primary key selection query borrowed from phpPgAdmin.
+		my $showschema = $version < 7.3 ? "NULL::text" : "n.nspname";
+		my $schemajoin = $version < 7.3 ? "" : "LEFT JOIN pg_catalog.pg_namespace n ON (n.oid = bc.relnamespace)";
+		my $pri_key_sql = qq{
+			SELECT
+				NULL::text		AS "TABLE_CAT"
+				, $showschema	AS "TABLE_SCHEM"
+				, bc.relname	AS "TABLE_NAME"
+				, a.attname		AS "COLUMN_NAME"
+				, a.attnum		AS "KEY_SEQ"
+				, ic.relname    AS "PK_NAME"
+			FROM
+				${CATALOG}pg_index i
+				, ${CATALOG}pg_attribute a
+				, ${CATALOG}pg_class ic
+				, ${CATALOG}pg_class bc
+				$schemajoin
+			WHERE
+				i.indrelid = bc.oid
+			AND i.indexrelid = ic.oid
+			AND
+			(
+				i.indkey[0] = a.attnum
+				OR
+				i.indkey[1] = a.attnum
+				OR
+				i.indkey[2] = a.attnum
+				OR
+				i.indkey[3] = a.attnum
+				OR
+				i.indkey[4] = a.attnum
+				OR
+				i.indkey[5] = a.attnum
+				OR
+				i.indkey[6] = a.attnum
+				OR
+				i.indkey[7] = a.attnum
+				OR
+				i.indkey[8] = a.attnum
+				OR
+				i.indkey[9] = a.attnum
+				OR
+				i.indkey[10] = a.attnum
+				OR
+				i.indkey[11] = a.attnum
+				OR
+				i.indkey[12] = a.attnum
+			)
+			AND a.attrelid = bc.oid
+			AND i.indproc = '0'::oid
+			AND i.indisprimary = 't' 
+			$wh
+			ORDER BY 2, 3, 5
+		};
+
+        my $sth = $dbh->prepare( $pri_key_sql ) or return undef;
+        $sth->execute(@dat);
+
+        return $sth;
+	}
+
+    sub foreign_key_info {
+	# todo: verify schema work as expected
+	# add code to handle multiple-column keys correctly
+	# return something nicer for pre-7.3?
+	# try to clean up SQL, perl code
+	# create a test script?
+
+	my $dbh = shift;
+	my ($pk_catalog, $pk_schema, $pk_table,
+		$fk_catalog, $fk_schema, $fk_table) = @_;
+
+	# this query doesn't work for Postgres before 7.3
+	my $version = $dbh->pg_server_version;
+	$version =~ /^(\d+)\.(\d)/;
+	return undef if ($1.$2 < 73);
+
+	# Used to hold data for the attributes.
+	my @dat = ();
+
+	# SQL to find primary/unique keys of a table
+	my $pkey_sql = qq{
+	SELECT
+	NULL::text AS PKTABLE_CAT,
+	pknam.nspname AS PKTABLE_SCHEM,
+	pkc.relname AS PKTABLE_NAME,
+	pka.attname AS PKCOLUMN_NAME,
+	NULL::text AS FKTABLE_CAT,
+	NULL::text AS FKTABLE_SCHEM,
+	NULL::text AS FKTABLE_NAME,
+	NULL::text AS FKCOLUMN_NAME,
+	pkcon.conkey[1] AS KEY_SEQ,
+	CASE
+		WHEN pkcon.confupdtype = 'c' THEN 0
+		WHEN pkcon.confupdtype = 'r' THEN 1
+		WHEN pkcon.confupdtype = 'n' THEN 2
+		WHEN pkcon.confupdtype = 'a' THEN 3
+		WHEN pkcon.confupdtype = 'd' THEN 4
+		END AS UPDATE_RULE,
+	CASE
+		WHEN pkcon.confdeltype = 'c' THEN 0
+		WHEN pkcon.confdeltype = 'r' THEN 1
+		WHEN pkcon.confdeltype = 'n' THEN 2
+		WHEN pkcon.confdeltype = 'a' THEN 3
+		WHEN pkcon.confdeltype = 'd' THEN 4
+		END AS DELETE_RULE,
+	NULL::text AS FK_NAME,
+	pkcon.conname AS PK_NAME,
+	CASE
+		WHEN pkcon.condeferrable = 'f' THEN 7
+		WHEN pkcon.condeferred = 't' THEN 6
+		WHEN pkcon.condeferred = 'f' THEN 5
+		END AS DEFERRABILITY,
+	CASE
+		WHEN pkcon.contype = 'p' THEN 'PRIMARY'
+		WHEN pkcon.contype = 'u' THEN 'UNIQUE'
+		END AS UNIQUE_OR_PRIMARY
+	FROM
+		pg_constraint AS pkcon
+	JOIN
+		pg_class pkc ON pkc.oid=pkcon.conrelid
+	JOIN
+		pg_namespace pknam ON pkcon.connamespace=pknam.oid
+	JOIN
+		pg_attribute pka ON pka.attnum=pkcon.conkey[1] AND pka.attrelid=pkc.oid
+	};
+
+	# SQL to find foreign keys of a table
+	my $fkey_sql = qq{
+	SELECT
+	NULL::text AS PKTABLE_CAT,
+	pknam.nspname AS PKTABLE_SCHEM,
+	pkc.relname AS PKTABLE_NAME,
+	pka.attname AS PKCOLUMN_NAME,
+	NULL::text AS FKTABLE_CAT,
+	fknam.nspname AS FKTABLE_SCHEM,
+	fkc.relname AS FKTABLE_NAME,
+	fka.attname AS FKCOLUMN_NAME,
+	fkcon.conkey[1] AS KEY_SEQ,
+	CASE
+		WHEN fkcon.confupdtype = 'c' THEN 0
+		WHEN fkcon.confupdtype = 'r' THEN 1
+		WHEN fkcon.confupdtype = 'n' THEN 2
+		WHEN fkcon.confupdtype = 'a' THEN 3
+		WHEN fkcon.confupdtype = 'd' THEN 4
+		END AS UPDATE_RULE,
+	CASE
+		WHEN fkcon.confdeltype = 'c' THEN 0
+		WHEN fkcon.confdeltype = 'r' THEN 1
+		WHEN fkcon.confdeltype = 'n' THEN 2
+		WHEN fkcon.confdeltype = 'a' THEN 3
+		WHEN fkcon.confdeltype = 'd' THEN 4
+		END AS DELETE_RULE,
+	fkcon.conname AS FK_NAME,
+	pkcon.conname AS PK_NAME,
+	CASE
+		WHEN fkcon.condeferrable = 'f' THEN 7
+		WHEN fkcon.condeferred = 't' THEN 6
+		WHEN fkcon.condeferred = 'f' THEN 5
+		END AS DEFERRABILITY,
+	CASE
+		WHEN pkcon.contype = 'p' THEN 'PRIMARY'
+		WHEN pkcon.contype = 'u' THEN 'UNIQUE'
+		END AS UNIQUE_OR_PRIMARY
+	FROM
+		pg_constraint AS fkcon
+	JOIN
+		pg_constraint AS pkcon ON fkcon.confrelid=pkcon.conrelid
+			AND fkcon.confkey=pkcon.conkey
+	JOIN
+		pg_class fkc ON fkc.oid=fkcon.conrelid
+	JOIN
+		pg_class pkc ON pkc.oid=fkcon.confrelid
+	JOIN
+		pg_namespace pknam ON pkcon.connamespace=pknam.oid
+	JOIN
+		pg_namespace fknam ON fkcon.connamespace=fknam.oid
+	JOIN
+		pg_attribute fka ON fka.attnum=fkcon.conkey[1] AND fka.attrelid=fkc.oid
+	JOIN
+		pg_attribute pka ON pka.attnum=pkcon.conkey[1] AND pka.attrelid=pkc.oid
+	};
+
+	# if schema are provided, use this SQL
+	my $pk_schema_sql = " AND pknam.nspname = ? ";
+	my $fk_schema_sql = " AND fknam.nspname = ? ";
+
+	my $key_sql;
+
+	# if $fk_table: generate SQL stub, which will be same
+	# whether or not $pk_table supplied
+	if ($fk_table)
+	{
+		$key_sql = $fkey_sql . qq{
+		WHERE
+			fkc.relname = ?
+		};
+		push @dat, $fk_table;
+
+		if ($fk_schema)
+		{
+			$key_sql .= $fk_schema_sql;
+			push @dat,$fk_schema;
+		}
+	}
+
+	# if $fk_table and $pk_table: (defined by DBI, not SQL/CLI)
+	# return foreign key of $fk_table that refers to $pk_table
+	# (if any)
+	if ($pk_table and $fk_table)
+	{
+		$key_sql .= qq{
+		AND
+			pkc.relname = ?
+		};
+		push @dat, $pk_table;
+
+		if ($pk_schema)
+		{
+			$key_sql .= $pk_schema_sql;
+			push @dat,$pk_schema;
+		}
+	}
+
+	# if $fk_table but no $pk_table:
+	# return all foreign keys of $fk_table, and all
+	# primary keys of tables to which $fk_table refers
+	if (!$pk_table and $fk_table)
+	{
+		# find primary/unique keys referenced by $fk_table
+		# (this one is a little tricky)
+		$key_sql .= ' UNION ' . $pkey_sql . qq{
+		WHERE
+			pkcon.conname IN
+		(
+		SELECT
+			pkcon.conname
+		FROM
+			pg_constraint AS fkcon
+		JOIN
+			pg_constraint AS pkcon ON fkcon.confrelid=pkcon.conrelid AND
+					fkcon.confkey=pkcon.conkey
+		JOIN
+			pg_class fkc ON fkc.oid=fkcon.conrelid
+		WHERE
+			fkc.relname = ?
+		)	
+		};
+		push @dat, $fk_table;
+
+		if ($fk_schema)
+		{
+			$key_sql .= $pk_schema_sql;
+			push @dat,$fk_schema;
+		}
+	}
+
+	# if $pk_table but no $fk_table:
+	# return primary key of $pk_table and all foreign keys
+	# that reference $pk_table
+	# question: what about unique keys?
+	# (DBI and SQL/CLI both state to omit unique keys)
+
+	if ($pk_table and !$fk_table)
+	{
+		# find primary key (only!) of $pk_table
+		$key_sql = $pkey_sql . qq{
+		WHERE
+			pkc.relname = ?
+		AND
+			pkcon.contype = 'p'
+		};
+		@dat = ($pk_table);
+
+		if ($pk_schema)
+		{
+			$key_sql .= $pk_schema_sql;
+			push @dat,$pk_schema;
+		}
+
+		# find all foreign keys that reference $pk_table
+		$key_sql .= 'UNION ' . $fkey_sql . qq{
+		WHERE
+			pkc.relname = ?
+		AND
+			pkcon.contype = 'p'
+		};
+		push @dat, $pk_table;
+
+		if ($pk_schema)
+		{
+			$key_sql .= $fk_schema_sql;
+			push @dat,$pk_schema;
+		}
+	}
+
+	return undef unless $key_sql;
+	my $sth = $dbh->prepare( $key_sql ) or
+		return undef;
+	$sth->execute(@dat);
+
+	return $sth;
+    }
+
+
+    sub table_info {         # DBI spec: TABLE_CAT, TABLE_SCHEM, TABLE_NAME, TABLE_TYPE, REMARKS
+        my $dbh = shift;
+		my ($catalog, $schema, $table, $type) = @_;
+		my @attrs = @_;
+
+		my $tbl_sql = ();
+
+        my $version = DBD::Pg::pg_server_version($dbh);
+	$version =~ /^(\d+\.\d+)/;
+	$version = $1;
+        my $CATALOG = DBD::Pg::pg_use_catalog($dbh);
+
+		if ( # Rules 19a
+			    (defined $catalog and $catalog eq '%')
+			and (defined $schema  and $schema  eq  '')
+			and (defined $table   and $table   eq  '')
+			) {
+				$tbl_sql = q{
+					SELECT 
+					   NULL::text    AS "TABLE_CAT"
+					 , NULL::text    AS "TABLE_SCHEM"
+					 , NULL::text    AS "TABLE_NAME"
+					 , NULL::text    AS "TABLE_TYPE"
+					 , NULL::text    AS "REMARKS"
+					};
+		}
+		elsif (# Rules 19b
+			    (defined $catalog and $catalog eq  '')
+			and (defined $schema  and $schema  eq '%')
+			and (defined $table   and $table   eq  '')
+			) {
+				$tbl_sql = ($version < 7.3) ? q{
+					SELECT 
+					   NULL::text    AS "TABLE_CAT"
+					 , NULL::text    AS "TABLE_SCHEM"
+					 , NULL::text    AS "TABLE_NAME"
+					 , NULL::text    AS "TABLE_TYPE"
+					 , NULL::text    AS "REMARKS"
+                    } : q{
+					SELECT 
+					   NULL::text    AS "TABLE_CAT"
+					 , n.nspname     AS "TABLE_SCHEM"
+					 , NULL::text    AS "TABLE_NAME"
+					 , NULL::text    AS "TABLE_TYPE"
+					 , NULL::text    AS "REMARKS"
+					FROM pg_catalog.pg_namespace n
+					ORDER BY 1
+					};
+		}
+		elsif (# Rules 19c
+			    (defined $catalog and $catalog eq  '')
+			and (defined $schema  and $schema  eq  '')
+			and (defined $table   and $table   eq  '')
+			and (defined $type    and $type    eq  '%')
+			) {
+				# From the postgresql 7.2.1 manual 3.5 pg_class
+				#  'r' = ordinary table
+				#, 'i' = index
+				#, 'S' = sequence
+				#, 'v' = view
+				#, 's' = special
+				#, 't' = secondary TOAST table 
+				$tbl_sql = q{
+					SELECT 
+					   NULL::text    AS "TABLE_CAT"
+					 , NULL::text    AS "TABLE_SCHEM"
+					 , NULL::text    AS "TABLE_NAME"
+					 , 'table'       AS "TABLE_TYPE"
+					 , 'ordinary table - r'    AS "REMARKS"
+					union
+					SELECT 
+					   NULL::text    AS "TABLE_CAT"
+					 , NULL::text    AS "TABLE_SCHEM"
+					 , NULL::text    AS "TABLE_NAME"
+					 , 'index'       AS "TABLE_TYPE"
+					 , 'index - i'    AS "REMARKS"
+					union
+					SELECT 
+					   NULL::text    AS "TABLE_CAT"
+					 , NULL::text    AS "TABLE_SCHEM"
+					 , NULL::text    AS "TABLE_NAME"
+					 , 'sequence'     AS "TABLE_TYPE"
+					 , 'sequence - S'    AS "REMARKS"
+					union
+					SELECT 
+					   NULL::text    AS "TABLE_CAT"
+					 , NULL::text    AS "TABLE_SCHEM"
+					 , NULL::text    AS "TABLE_NAME"
+					 , 'view'       AS "TABLE_TYPE"
+					 , 'view - v'    AS "REMARKS"
+					union
+					SELECT 
+					   NULL::text    AS "TABLE_CAT"
+					 , NULL::text    AS "TABLE_SCHEM"
+					 , NULL::text    AS "TABLE_NAME"
+					 , 'special'       AS "TABLE_TYPE"
+					 , 'special - s'    AS "REMARKS"
+					union
+					SELECT 
+					   NULL::text    AS "TABLE_CAT"
+					 , NULL::text    AS "TABLE_SCHEM"
+					 , NULL::text    AS "TABLE_NAME"
+					 , 'secondary'   AS "TABLE_TYPE"
+					 , 'secondary TOAST table - t'    AS "REMARKS"
+				};
+		}
+		else {
+				# Default SQL
+				my $showschema = $version < 7.3 ? "NULL::text" : "n.nspname";
+				my $schemajoin = $version < 7.3 ? "" : "LEFT JOIN pg_catalog.pg_namespace n ON (n.oid = c.relnamespace)";
+				my $schemacase = $version < 7.3 ? "CASE WHEN c.relname ~ '^pg_' THEN 'SYSTEM TABLE' ELSE 'TABLE' END" : 
+					"CASE WHEN n.nspname ~ '^pg_' THEN 'SYSTEM TABLE' ELSE 'TABLE' END";
+				$tbl_sql = qq{
+				SELECT NULL::text    AS "TABLE_CAT"
+					 , $showschema   AS "TABLE_SCHEM"
+					 , c.relname     AS "TABLE_NAME"
+					 , CASE
+					 	 WHEN c.relkind = 'v' THEN 'VIEW'
+					  	 ELSE $schemacase
+						END			 AS "TABLE_TYPE"
+					 , d.description AS "REMARKS"
+				FROM ${CATALOG}pg_user		AS u
+				   , ${CATALOG}pg_class		AS c
+					 LEFT JOIN 
+					 ${CATALOG}pg_description	AS d 
+						ON (c.relfilenode = d.objoid AND d.objsubid = 0)
+				$schemajoin
+				WHERE 
+					  ((c.relkind     =  'r'
+				  AND c.relhasrules =  FALSE) OR
+					  (c.relkind     =  'v'
+				  AND c.relhasrules =  TRUE))
+				  AND c.relname     !~ '^xin[vx][0-9]+'
+				  AND c.relowner    =  u.usesysid
+				ORDER BY 1, 2, 3
+				};
+
+			# Did we receive any arguments?
+			if (@attrs) {
+				my @wh = ();
+				my @flds = qw/catname n.nspname c.relname c.relkind/;
+
+				for my $idx (0 .. $#attrs) {
+					next if ($flds[$idx] eq 'catname'); # Skip catalog
+					if(defined $attrs[$idx] and length $attrs[$idx]) {
+						# Change the "name" of the types to the real value.
+						if ($flds[$idx]  =~ m/relkind/) {
+							$attrs[$idx] =~ s/^\'?table\'?/'r'/i;
+							$attrs[$idx] =~ s/^\'?index\'?/'i'/i;
+							$attrs[$idx] =~ s/^\'?sequence\'?/'S'/i;
+							$attrs[$idx] =~ s/^\'?view\'?/'v'/i;
+							$attrs[$idx] =~ s/^\'?special\'?/'s'/i;
+							$attrs[$idx] =~ s/^\'?secondary\'?/'t'/i;
+						}
+						# Insure that the value is enclosed in single quotes.
+						$attrs[$idx] =~ s/^'?(\w+)'?$/'$1'/;
+						if ($attrs[$idx] =~ m/[,%]/) {
+							# contains a meta character.
+							push( @wh, q{( } . join ( " OR "
+								, map { m/\%/ 
+									? qq{$flds[$idx] LIKE $_ }
+									: qq{$flds[$idx]    = $_ }
+									} (split /,/, $attrs[$idx]) )
+									. q{ )}
+								);
+						}
+						else {
+							push( @wh, qq{$flds[$idx] = $attrs[$idx]} );
+						}
+					}
+				}
+
+				my $wh = ();
+				if (@wh) {
+					$wh = join( " AND ",'', @wh );
+					$tbl_sql = qq{
+					SELECT NULL::text    AS "TABLE_CAT"
+						 , $showschema   AS "TABLE_SCHEM"
+						 , c.relname     AS "TABLE_NAME"
+						 , CASE
+							 WHEN c.relkind = 'r' THEN 
+								CASE WHEN n.nspname ~ '^pg_' THEN 'SYSTEM TABLE' ELSE 'TABLE' END
+							 WHEN c.relkind = 'v' THEN 'VIEW'
+							 WHEN c.relkind = 'i' THEN 'INDEX'
+							 WHEN c.relkind = 'S' THEN 'SEQUENCE'
+							 WHEN c.relkind = 's' THEN 'SPECIAL'
+							 WHEN c.relkind = 't' THEN 'SECONDARY'
+							 ELSE 'UNKNOWN'
+							END			 AS "TABLE_TYPE"
+						 , d.description AS "REMARKS"
+					FROM ${CATALOG}pg_class		AS c
+						LEFT JOIN 
+						 ${CATALOG}pg_description	AS d 
+							ON (c.relfilenode = d.objoid AND d.objsubid = 0)
+						$schemajoin
+					WHERE 
+					  	  c.relname     !~ '^xin[vx][0-9]+'
+					  $wh
+					ORDER BY 2, 3
+					};
+				}
+			}
+		}
+
+        my $sth = $dbh->prepare( $tbl_sql ) or return undef;
+        $sth->execute();
+
+        return $sth;
+    }
+
+
+    sub tables {
+        my($dbh) = @_;
+        my $version = DBD::Pg::pg_server_version($dbh);
+	$version =~ /^(\d+\.\d+)/;
+	$version = $1;
+	my $SQL = ($version < 7.3) ? 
+            "SELECT relname  AS \"TABLE_NAME\"
+            FROM   pg_class 
+            WHERE  relkind = 'r'
+            AND    relname !~ '^pg_'
+            AND    relname !~ '^xin[vx][0-9]+'
+            ORDER BY 1" : 
+            "SELECT n.nspname AS \"SCHEMA_NAME\", c.relname  AS \"TABLE_NAME\"
+            FROM   pg_catalog.pg_class c
+            LEFT JOIN pg_catalog.pg_namespace n ON (n.oid = c.relnamespace)
+            WHERE  c.relkind = 'r'
+            AND n.nspname NOT IN ('pg_catalog', 'pg_toast')
+            AND pg_catalog.pg_table_is_visible(c.oid)
+            ORDER BY 1,2";
+        my $sth = $dbh->prepare($SQL) or return undef;
+        $sth->execute or return undef;
+        my (@tables, @relname);
+        while (@relname = $sth->fetchrow_array) {
+            push @tables, $version < 7.3 ? $relname[0] : "$relname[0].$relname[1]";
+        }
+        $sth->finish;
+
+        return @tables;
+    }
+
+
+    sub table_attributes {
+        my ($dbh, $table) = @_;
+        my $CATALOG = DBD::Pg::pg_use_catalog($dbh);
+        my $result = [];    
+        my $attrs  = $dbh->selectall_arrayref(
+             "select a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum
+              from ${CATALOG}pg_attribute a,
+                   ${CATALOG}pg_class     c,
+                   ${CATALOG}pg_type      t
+              where c.relname  = ?
+                and a.attrelid = c.oid
+                and a.attnum  >= 0
+                and t.oid      = a.atttypid
+                order by 1 
+             ", undef, $table);
+    
+        return $result unless scalar(@$attrs);
+
+	# Select the array value for tables primary key.
+	my $pk_key_sql = qq{SELECT pg_index.indkey
+                            FROM   ${CATALOG}pg_class, ${CATALOG}pg_index
+                            WHERE
+                                   pg_class.oid          = pg_index.indrelid
+                            AND    pg_class.relname      = '$table'
+                            AND    pg_index.indisprimary = 't'
+			};
+	# Expand this (returned as a string) a real array.
+	my @pk = ();
+    my $pkeys = $dbh->selectrow_array( $pk_key_sql );
+    if (defined $pkeys) {
+    	foreach (split( /\s+/, $pkeys))
+	    {
+		    push @pk, $_;
+	    }
+    }
+	my $pk_bt = 
+		(@pk)   ? "AND    pg_attribute.attnum in (" . join ( ", ", @pk ) . ")"
+			: "";
+		
+        # Get the primary key
+        my $pri_key = $dbh->selectcol_arrayref("SELECT pg_attribute.attname
+                                               FROM   ${CATALOG}pg_class, ${CATALOG}pg_attribute, ${CATALOG}pg_index
+                                               WHERE  pg_class.oid          = pg_attribute.attrelid 
+                                               AND    pg_class.oid          = pg_index.indrelid 
+					       $pk_bt
+                                               AND    pg_index.indisprimary = 't'
+                                               AND    pg_class.relname      = ?
+					       ORDER BY pg_attribute.attnum
+					       ", undef, $table );
+        $pri_key = [] unless $pri_key;
+
+        foreach my $attr (reverse @$attrs) {
+            my ($col_name, $col_type, $size, $mod, $notnull, $hasdef, $attnum) = @$attr;
+            my $col_size = do { 
+                if ($size > 0) {
+                    $size;
+                } elsif ($mod > 0xffff) {
+                    my $prec = ($mod & 0xffff) - 4;
+                    $mod >>= 16;
+                    my $dig = $mod;
+                    $dig;
+                } elsif ($mod >= 4) {
+                    $mod - 4;
+                } else {
+                    $mod;
+                }
+            };
+
+            # Get the default value, if any
+            my ($default) = $dbh->selectrow_array("SELECT adsrc FROM ${CATALOG}pg_attrdef WHERE  adnum = $attnum") if -1 == $attnum;
+            $default = '' unless $default;
+
+            # Test for any constraints
+            # Note: as of PostgreSQL 7.3 pg_relcheck has been replaced
+            # by pg_constraint. To maintain compatibility, check 
+            # version number and execute appropriate query.
+	
+            my $version = pg_server_version( $dbh );
+            
+            my $con_query = $version < 7.3
+             ? "SELECT rcsrc FROM pg_relcheck WHERE rcname = '${table}_$col_name'"
+             : "SELECT consrc FROM pg_catalog.pg_constraint WHERE contype = 'c' AND conname = '${table}_$col_name'";
+            my ($constraint) = $dbh->selectrow_array($con_query);
+            $constraint = '' unless $constraint;
+
+            # Check to see if this is the primary key
+            my $is_primary_key = scalar(grep { /^$col_name$/i } @$pri_key) ? 1 : 0;
+
+            push @$result,
+                { NAME        => $col_name,
+                  TYPE        => $col_type,
+                  SIZE        => $col_size,
+                  NOTNULL     => $notnull,
+                  DEFAULT     => $default,
+                  CONSTRAINT  => $constraint,
+                  PRIMARY_KEY => $is_primary_key,
+                };
+        }
+
+        return $result;
+    }
+
+
+    sub type_info_all {
+        my ($dbh) = @_;
+
+	#my $names = {
+    #      TYPE_NAME		=> 0,
+    #      DATA_TYPE		=> 1,
+    #      PRECISION		=> 2,
+    #      LITERAL_PREFIX	=> 3,
+    #      LITERAL_SUFFIX	=> 4,
+    #      CREATE_PARAMS		=> 5,
+    #      NULLABLE		=> 6,
+    #      CASE_SENSITIVE	=> 7,
+    #      SEARCHABLE		=> 8,
+    #      UNSIGNED_ATTRIBUTE	=> 9,
+    #      MONEY			=>10,
+    #      AUTO_INCREMENT	=>11,
+    #      LOCAL_TYPE_NAME	=>12,
+    #      MINIMUM_SCALE		=>13,
+    #      MAXIMUM_SCALE		=>14,
+    #    };
+
+	my $names = {
+        TYPE_NAME         => 0,
+        DATA_TYPE         => 1,
+        COLUMN_SIZE       => 2,     # was PRECISION originally
+        LITERAL_PREFIX    => 3,
+        LITERAL_SUFFIX    => 4,
+        CREATE_PARAMS     => 5,
+        NULLABLE          => 6,
+        CASE_SENSITIVE    => 7,
+        SEARCHABLE        => 8,
+        UNSIGNED_ATTRIBUTE=> 9,
+        FIXED_PREC_SCALE  => 10,    # was MONEY originally
+        AUTO_UNIQUE_VALUE => 11,    # was AUTO_INCREMENT originally
+        LOCAL_TYPE_NAME   => 12,
+        MINIMUM_SCALE     => 13,
+        MAXIMUM_SCALE     => 14,
+        NUM_PREC_RADIX    => 15,
+    };
+
+
+	#  typname       |typlen|typprtlen|    SQL92
+	#  --------------+------+---------+    -------
+	#  bool          |     1|        1|    BOOLEAN
+	#  text          |    -1|       -1|    like VARCHAR, but automatic storage allocation
+	#  bpchar        |    -1|       -1|    CHARACTER(n)    bp=blank padded
+	#  varchar       |    -1|       -1|    VARCHAR(n)
+	#  int2          |     2|        5|    SMALLINT
+	#  int4          |     4|       10|    INTEGER
+	#  int8          |     8|       20|    /
+	#  money         |     4|       24|    /
+	#  float4        |     4|       12|    FLOAT(p)   for p<7=float4, for p<16=float8
+	#  float8        |     8|       24|    REAL
+	#  abstime       |     4|       20|    /
+	#  reltime       |     4|       20|    /
+	#  tinterval     |    12|       47|    /
+	#  date          |     4|       10|    /
+	#  time          |     8|       16|    /
+	#  datetime      |     8|       47|    /
+	#  timespan      |    12|       47|    INTERVAL
+	#  timestamp     |     4|       19|    TIMESTAMP
+	#  --------------+------+---------+
+
+        # DBI type definitions / PostgreSQL definitions     # type needs to be DBI-specific (not pg_type)
+        #
+        # SQL_ALL_TYPES  0	
+        # SQL_CHAR       1	1042 bpchar
+        # SQL_NUMERIC    2	 700 float4
+        # SQL_DECIMAL    3	 700 float4
+        # SQL_INTEGER    4	  23 int4
+        # SQL_SMALLINT   5	  21 int2
+        # SQL_FLOAT      6	 700 float4
+        # SQL_REAL       7	 701 float8
+        # SQL_DOUBLE     8	  20 int8
+        # SQL_DATE       9	1082 date
+        # SQL_TIME      10	1083 time
+        # SQL_TIMESTAMP 11	1296 timestamp
+        # SQL_VARCHAR   12	1043 varchar
+
+	my $ti = [
+	  $names,
+          # name          type  prec  prefix suffix  create params null case se unsign mon  incr       local   min    max
+          #					     
+          [ 'bytea',        -2, 4096,  '\'',  '\'',           undef, 1, '1', 3, undef, '0', '0',     'BYTEA', undef, undef, undef ],
+          [ 'bool',          0,    1,  '\'',  '\'',           undef, 1, '0', 2, undef, '0', '0',   'BOOLEAN', undef, undef, undef ],
+          [ 'int8',          8,   20, undef, undef,           undef, 1, '0', 2,   '0', '0', '0',   'LONGINT', undef, undef, undef ],
+          [ 'int2',          5,    5, undef, undef,           undef, 1, '0', 2,   '0', '0', '0',  'SMALLINT', undef, undef, undef ],
+          [ 'int4',          4,   10, undef, undef,           undef, 1, '0', 2,   '0', '0', '0',   'INTEGER', undef, undef, undef ],
+          [ 'text',         12, 4096,  '\'',  '\'',           undef, 1, '1', 3, undef, '0', '0',      'TEXT', undef, undef, undef ],
+          [ 'float4',        6,   12, undef, undef,     'precision', 1, '0', 2,   '0', '0', '0',     'FLOAT', undef, undef, undef ],
+          [ 'float8',        7,   24, undef, undef,     'precision', 1, '0', 2,   '0', '0', '0',      'REAL', undef, undef, undef ],
+          [ 'abstime',      10,   20,  '\'',  '\'',           undef, 1, '0', 2, undef, '0', '0',   'ABSTIME', undef, undef, undef ],
+          [ 'reltime',      10,   20,  '\'',  '\'',           undef, 1, '0', 2, undef, '0', '0',   'RELTIME', undef, undef, undef ],
+          [ 'tinterval',    11,   47,  '\'',  '\'',           undef, 1, '0', 2, undef, '0', '0', 'TINTERVAL', undef, undef, undef ],
+          [ 'money',         0,   24, undef, undef,           undef, 1, '0', 2, undef, '1', '0',     'MONEY', undef, undef, undef ],
+          [ 'bpchar',        1, 4096,  '\'',  '\'',    'max length', 1, '1', 3, undef, '0', '0', 'CHARACTER', undef, undef, undef ],
+          [ 'bpchar',       12, 4096,  '\'',  '\'',    'max length', 1, '1', 3, undef, '0', '0', 'CHARACTER', undef, undef, undef ],
+          [ 'varchar',      12, 4096,  '\'',  '\'',    'max length', 1, '1', 3, undef, '0', '0',   'VARCHAR', undef, undef, undef ],
+          [ 'date',          9,   10,  '\'',  '\'',           undef, 1, '0', 2, undef, '0', '0',      'DATE', undef, undef, undef ],
+          [ 'time',         10,   16,  '\'',  '\'',           undef, 1, '0', 2, undef, '0', '0',      'TIME', undef, undef, undef ],
+          [ 'datetime',     11,   47,  '\'',  '\'',           undef, 1, '0', 2, undef, '0', '0',  'DATETIME', undef, undef, undef ],
+          [ 'timespan',     11,   47,  '\'',  '\'',           undef, 1, '0', 2, undef, '0', '0',  'INTERVAL', undef, undef, undef ],
+          [ 'timestamp',    10,   19,  '\'',  '\'',           undef, 1, '0', 2, undef, '0', '0', 'TIMESTAMP', undef, undef, undef ]
+          #
+          # intentionally omitted: char, all geometric types, all array types
+        ];
+	return $ti;
+    }
+
+
+    # Characters that need to be escaped by quote().
+    my %esc = ( "'"  => '\\047', # '\\' . sprintf("%03o", ord("'")), # ISO SQL 2
+                '\\' => '\\134', # '\\' . sprintf("%03o", ord("\\")),
+              );
+
+    # Set up lookup for SQL types we don't want to escape.
+    my %no_escape = map { $_ => 1 }
+      DBI::SQL_INTEGER, DBI::SQL_SMALLINT, DBI::SQL_DECIMAL,
+      DBI::SQL_FLOAT, DBI::SQL_REAL, DBI::SQL_DOUBLE, DBI::SQL_NUMERIC;
+
+    sub quote {
+        my ($dbh, $str, $data_type) = @_;
+        return "NULL" unless defined $str;
+		return $str if $data_type && $no_escape{$data_type};
+
+        $dbh->DBI::set_err(1, "Use of SQL_BINARY invalid in quote()")
+          if $data_type && $data_type == DBI::SQL_BINARY;
+
+		$str =~ s/(['\\\0])/$esc{$1}/g;
+		return "'$str'";
+    }
+
+}    # end of package DBD::Pg::db
+
+{   package DBD::Pg::st; # ====== STATEMENT ======
+
+    # all done in XS
+
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+DBD::Pg - PostgreSQL database driver for the DBI module
+
+=head1 SYNOPSIS
+
+  use DBI;
+
+  $dbh = DBI->connect("dbi:Pg:dbname=$dbname", "", "");
+
+  # for some advanced uses you may need PostgreSQL type values:
+  use DBD::Oracle qw(:pg_types);
+
+  # See the DBI module documentation for full details
+
+=head1 DESCRIPTION
+
+DBD::Pg is a Perl module which works with the DBI module to provide access to
+PostgreSQL databases.
+
+=head1 MODULE DOCUMENTATION
+
+This documentation describes driver specific behavior and restrictions. It is
+not supposed to be used as the only reference for the user. In any case
+consult the DBI documentation first!
+
+=head1 THE DBI CLASS
+
+=head2 DBI Class Methods
+
+=over 4
+
+=item B<connect>
+
+To connect to a database with a minimum of parameters, use the following
+syntax:
+
+  $dbh = DBI->connect("dbi:Pg:dbname=$dbname", "", "");
+
+This connects to the database $dbname at localhost without any user
+authentication. This is sufficient for the defaults of PostgreSQL.
+
+The following connect statement shows all possible parameters:
+
+  $dbh = DBI->connect("dbi:Pg:dbname=$dbname;host=$host;port=$port;" .
+                      "options=$options;tty=$tty", "$username", "$password");
+
+If a parameter is undefined PostgreSQL first looks for specific environment
+variables and then it uses hard coded defaults:
+
+    parameter  environment variable  hard coded default
+    --------------------------------------------------
+    dbname     PGDATABASE            current userid
+    host       PGHOST                localhost
+    port       PGPORT                5432
+    options    PGOPTIONS             ""
+    tty        PGTTY                 ""
+    username   PGUSER                current userid
+    password   PGPASSWORD            ""
+
+If a host is specified, the postmaster on this host needs to be started with
+the C<-i> option (TCP/IP sockets).
+
+The options parameter specifies runtime options for the Postgres
+backend. Common usage is to increase the number of buffers with the C<-B>
+option. Also important is the C<-F> option, which disables automatic fsync()
+call after each transaction. For further details please refer to the
+L<postgres>.
+
+For authentication with username and password appropriate entries have to be
+made in pg_hba.conf. Please refer to the L<pg_hba.conf> and the L<pg_passwd>
+for the different types of authentication. Note that for these two parameters
+DBI distinguishes between empty and undefined. If these parameters are
+undefined DBI substitutes the values of the environment variables DBI_USER and
+DBI_PASS if present.
+
+=item B<available_drivers>
+
+  @driver_names = DBI->available_drivers;
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<data_sources>
+
+  @data_sources = DBI->data_sources('Pg');
+
+The driver supports this method. Note that the necessary database connection to
+the database template1 will be done on the localhost without any
+user-authentication. Other preferences can only be set with the environment
+variables PGHOST, DBI_USER and DBI_PASS.
+
+=item B<trace>
+
+  DBI->trace($trace_level, $trace_file)
+
+Implemented by DBI, no driver-specific impact.
+
+=back
+
+=head2 DBI Dynamic Attributes
+
+See Common Methods.
+
+=head1 METHODS COMMON TO ALL HANDLES
+
+=over 4
+
+=item B<err>
+
+  $rv = $h->err;
+
+Supported by the driver as proposed by DBI. For the connect method it returns
+PQstatus. In all other cases it returns PQresultStatus of the current handle.
+
+=item B<errstr>
+
+  $str = $h->errstr;
+
+Supported by the driver as proposed by DBI. It returns the PQerrorMessage
+related to the current handle.
+
+=item B<state>
+
+  $str = $h->state;
+
+This driver does not (yet) support the state method.
+
+=item B<trace>
+
+  $h->trace($trace_level, $trace_filename);
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<trace_msg>
+
+  $h->trace_msg($message_text);
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<func>
+
+This driver supports a variety of driver specific functions accessible via the
+func interface:
+
+  $attrs = $dbh->func($table, 'table_attributes');
+
+This method returns for the given table a reference to an array of hashes:
+
+  NAME        attribute name
+  TYPE        attribute type
+  SIZE        attribute size (-1 for variable size)
+  NULLABLE    flag nullable
+  DEFAULT     default value
+  CONSTRAINT  constraint
+  PRIMARY_KEY flag is_primary_key
+
+  $lobjId = $dbh->func($mode, 'lo_creat');
+
+Creates a new large object and returns the object-id. $mode is a bit-mask
+describing different attributes of the new object. Use the following
+constants:
+
+  $dbh->{pg_INV_WRITE}
+  $dbh->{pg_INV_READ}
+
+Upon failure it returns undef.
+
+  $lobj_fd = $dbh->func($lobjId, $mode, 'lo_open');
+
+Opens an existing large object and returns an object-descriptor for use in
+subsequent lo_* calls. For the mode bits see lo_create. Returns undef upon
+failure. Note that 0 is a perfectly correct object descriptor!
+
+  $nbytes = $dbh->func($lobj_fd, $buf, $len, 'lo_write');
+
+Writes $len bytes of $buf into the large object $lobj_fd. Returns the number
+of bytes written and undef upon failure.
+
+  $nbytes = $dbh->func($lobj_fd, $buf, $len, 'lo_read');
+
+Reads $len bytes into $buf from large object $lobj_fd. Returns the number of
+bytes read and undef upon failure.
+
+  $loc = $dbh->func($lobj_fd, $offset, $whence, 'lo_lseek');
+
+Change the current read or write location on the large object
+$obj_id. Currently $whence can only be 0 (L_SET). Returns the current location
+and undef upon failure.
+
+  $loc = $dbh->func($lobj_fd, 'lo_tell');
+
+Returns the current read or write location on the large object $lobj_fd and
+undef upon failure.
+
+  $lobj_fd = $dbh->func($lobj_fd, 'lo_close');
+
+Closes an existing large object. Returns true upon success and false upon
+failure.
+
+  $lobj_fd = $dbh->func($lobj_fd, 'lo_unlink');
+
+Deletes an existing large object. Returns true upon success and false upon
+failure.
+
+  $lobjId = $dbh->func($filename, 'lo_import');
+
+Imports a Unix file as large object and returns the object id of the new
+object or undef upon failure.
+
+  $ret = $dbh->func($lobjId, 'lo_export', 'filename');
+
+Exports a large object into a Unix file. Returns false upon failure, true
+otherwise.
+
+  $ret = $dbh->func($line, 'putline');
+
+Used together with the SQL-command 'COPY table FROM STDIN' to copy large
+amount of data into a table avoiding the overhead of using single
+insert commands. The application must explicitly send the two characters "\."
+to indicate to the backend that it has finished sending its data. See test.pl
+for an example on how to use this function.
+
+  $ret = $dbh->func($buffer, length, 'getline');
+
+Used together with the SQL-command 'COPY table TO STDOUT' to dump a complete
+table. See test.pl for an example on how to use this function.
+
+  $ret = $dbh->func('pg_notifies');
+
+Returns either undef or a reference to two-element array [ $table,
+$backend_pid ] of asynchronous notifications received.
+
+  $fd = $dbh->func('getfd');
+
+Returns fd of the actual connection to server. Can be used with select() and
+func('pg_notifies').
+
+=back
+
+=head1 ATTRIBUTES COMMON TO ALL HANDLES
+
+=over 4
+
+=item B<Warn> (boolean, inherited)
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<Active> (boolean, read-only)
+
+Supported by the driver as proposed by DBI. A database handle is active while
+it is connected and statement handle is active until it is finished.
+
+=item B<Kids> (integer, read-only)
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<ActiveKids> (integer, read-only)
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<CachedKids> (hash ref)
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<CompatMode> (boolean, inherited)
+
+Not used by this driver.
+
+=item B<InactiveDestroy> (boolean)
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<PrintError> (boolean, inherited)
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<RaiseError> (boolean, inherited)
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<HandleError> (boolean, inherited)
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<ChopBlanks> (boolean, inherited)
+
+Supported by the driver as proposed by DBI. This method is similar to the
+SQL-function RTRIM.
+
+=item B<LongReadLen> (integer, inherited)
+
+Implemented by DBI, not used by the driver.
+
+=item B<LongTruncOk> (boolean, inherited)
+
+Implemented by DBI, not used by the driver.
+
+=item B<Taint> (boolean, inherited)
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<private_*>
+
+Implemented by DBI, no driver-specific impact.
+
+=back
+
+=head1 DBI DATABASE HANDLE OBJECTS
+
+=head2 Database Handle Methods
+
+=over 4
+
+=item B<selectrow_array>
+
+  @row_ary = $dbh->selectrow_array($statement, \%attr, @bind_values);
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<selectrow_arrayref>
+
+  $ary_ref = $dbh->selectrow_arrayref($statement, \%attr, @bind_values);
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<selectrow_hashref>
+
+  $hash_ref = $dbh->selectrow_hashref($statement, \%attr, @bind_values);
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<selectall_arrayref>
+
+  $ary_ref = $dbh->selectall_arrayref($statement, \%attr, @bind_values);
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<selectall_hashref>
+
+  $hash_ref = $dbh->selectall_hashref($statement, $key_field);
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<selectcol_arrayref>
+
+  $ary_ref = $dbh->selectcol_arrayref($statement, \%attr, @bind_values);
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<prepare>
+
+  $sth = $dbh->prepare($statement, \%attr);
+
+PostgreSQL does not have the concept of preparing a statement. Hence the
+prepare method just stores the statement after checking for place-holders. No
+information about the statement is available after preparing it.
+
+=item B<prepare_cached>
+
+  $sth = $dbh->prepare_cached($statement, \%attr);
+
+Implemented by DBI, no driver-specific impact. This method is not useful for
+this driver, because preparing a statement has no database interaction.
+
+=item B<do>
+
+  $rv  = $dbh->do($statement, \%attr, @bind_values);
+
+Implemented by DBI, no driver-specific impact. See the notes for the execute
+method elsewhere in this document.
+
+=item B<commit>
+
+  $rc  = $dbh->commit;
+
+Supported by the driver as proposed by DBI. See also the notes about
+B<Transactions> elsewhere in this document.
+
+=item B<rollback>
+
+  $rc  = $dbh->rollback;
+
+Supported by the driver as proposed by DBI. See also the notes about
+B<Transactions> elsewhere in this document.
+
+=item B<disconnect>
+
+  $rc  = $dbh->disconnect;
+
+Supported by the driver as proposed by DBI.
+
+=item B<ping>
+
+  $rc = $dbh->ping;
+
+This driver supports the ping-method, which can be used to check the validity
+of a database-handle. The ping method issues an empty query and checks the
+result status.
+
+=item B<table_info>
+
+  $sth = $dbh->table_info;
+
+Supported by the driver as proposed by DBI. This method returns all tables and
+views which are owned by the current user. It does not select any indexes and
+sequences. Also System tables are not selected. As TABLE_QUALIFIER the reltype
+attribute is returned and the REMARKS are undefined.
+
+=item B<foreign_key_info>
+
+  $sth = $dbh->foreign_key_info( $pk_catalog, $pk_schema, $pk_table,
+                                 $fk_catalog, $fk_schema, $fk_table );
+
+Supported by the driver as proposed by DBI. Unimplemented for Postgres
+servers before 7.3 (returns undef).  Currently only returns information
+about first column of any multiple-column keys.
+
+=item B<tables>
+
+  @names = $dbh->tables;
+
+Supported by the driver as proposed by DBI. This method returns all tables and
+views which are owned by the current user. It does not select any indexes and
+sequences, or system tables.
+
+=item B<type_info_all>
+
+  $type_info_all = $dbh->type_info_all;
+
+Supported by the driver as proposed by DBI. Only for SQL data-types and for
+frequently used data-types information is provided. The mapping between the
+PostgreSQL typename and the SQL92 data-type (if possible) has been done
+according to the following table:
+
+	+---------------+------------------------------------+
+	| typname       | SQL92                              |
+	|---------------+------------------------------------|
+	| bool          | BOOL                               |
+	| text          | /                                  |
+	| bpchar        | CHAR(n)                            |
+	| varchar       | VARCHAR(n)                         |
+	| int2          | SMALLINT                           |
+	| int4          | INT                                |
+	| int8          | /                                  |
+	| money         | /                                  |
+	| float4        | FLOAT(p)   p<7=float4, p<16=float8 |
+	| float8        | REAL                               |
+	| abstime       | /                                  |
+	| reltime       | /                                  |
+	| tinterval     | /                                  |
+	| date          | /                                  |
+	| time          | /                                  |
+	| datetime      | /                                  |
+	| timespan      | TINTERVAL                          |
+	| timestamp     | TIMESTAMP                          |
+	+---------------+------------------------------------+
+
+For further details concerning the PostgreSQL specific data-types please read
+the L<pgbuiltin>.
+
+=item B<type_info>
+
+  @type_info = $dbh->type_info($data_type);
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<quote>
+
+  $sql = $dbh->quote($value, $data_type);
+
+This module implements its own quote method. In addition to the DBI method it
+also doubles the backslash, because PostgreSQL treats a backslash as an escape
+character.
+
+B<NOTE:> The undocumented (and invalid) support for the C<SQL_BINARY> data
+type is officially deprecated. Use C<PG_BYTEA> with C<bind_param()> instead:
+
+  $rv = $sth->bind_param($param_num, $bind_value,
+                         { pg_type => DBD::Pg::PG_BYTEA });
+
+=back
+
+=head2 Database Handle Attributes
+
+=over 4
+
+=item B<AutoCommit>  (boolean)
+
+Supported by the driver as proposed by DBI. According to the classification of
+DBI, PostgreSQL is a database, in which a transaction must be explicitly
+started. Without starting a transaction, every change to the database becomes
+immediately permanent. The default of AutoCommit is on, which corresponds to
+the default behavior of PostgreSQL. When setting AutoCommit to off, a
+transaction will be started and every commit or rollback will automatically
+start a new transaction. For details see the notes about B<Transactions>
+elsewhere in this document.
+
+=item B<Driver>  (handle)
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<Name>  (string, read-only)
+
+The default method of DBI is overridden by a driver specific method, which
+returns only the database name. Anything else from the connection string is
+stripped off. Note, that here the method is read-only in contrast to the DBI
+specs.
+
+=item B<RowCacheSize>  (integer)
+
+Implemented by DBI, not used by the driver.
+
+=item B<pg_auto_escape> (boolean)
+
+PostgreSQL specific attribute. If true, then quotes and backslashes in all
+parameters will be escaped in the following way:
+
+  escape quote with a quote (SQL)
+  escape backslash with a backslash
+
+The default is on. Note, that PostgreSQL also accepts quotes, which are
+escaped by a backslash. Any other ASCII character can be used directly in a
+string constant.
+
+=item B<pg_enable_utf8> (boolean)
+
+PostgreSQL specific attribute.  If true, then the utf8 flag will be
+turned for returned character data (if the data is valid utf8).  For
+details about the utf8 flag, see L<Encode>.  This is only relevant under
+perl 5.8 and higher.
+
+B<NB>: This attribute is experimental and may be subject to change.
+
+=item B<pg_INV_READ> (integer, read-only)
+
+Constant to be used for the mode in lo_creat and lo_open.
+
+=item B<pg_INV_WRITE> (integer, read-only)
+
+Constant to be used for the mode in lo_creat and lo_open.
+
+=back
+
+=head1 DBI STATEMENT HANDLE OBJECTS
+
+=head2 Statement Handle Methods
+
+=over 4
+
+=item B<bind_param>
+
+  $rv = $sth->bind_param($param_num, $bind_value, \%attr);
+
+Supported by the driver as proposed by DBI.
+
+B<NOTE:> The undocumented (and invalid) support for the C<SQL_BINARY>
+SQL type is officially deprecated. Use C<PG_BYTEA> instead:
+
+  $rv = $sth->bind_param($param_num, $bind_value,
+                         { pg_type => DBD::Pg::PG_BYTEA });
+
+=item B<bind_param_inout>
+
+Not supported by this driver.
+
+=item B<execute>
+
+  $rv = $sth->execute(@bind_values);
+
+Supported by the driver as proposed by DBI. In addition to 'UPDATE', 'DELETE',
+'INSERT' statements, for which it returns always the number of affected rows,
+the execute method can also be used for 'SELECT ... INTO table' statements.
+
+=item B<fetchrow_arrayref>
+
+  $ary_ref = $sth->fetchrow_arrayref;
+
+Supported by the driver as proposed by DBI.
+
+=item B<fetchrow_array>
+
+  @ary = $sth->fetchrow_array;
+
+Supported by the driver as proposed by DBI.
+
+=item B<fetchrow_hashref>
+
+  $hash_ref = $sth->fetchrow_hashref;
+
+Supported by the driver as proposed by DBI.
+
+=item B<fetchall_arrayref>
+
+  $tbl_ary_ref = $sth->fetchall_arrayref;
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<finish>
+
+  $rc = $sth->finish;
+
+Supported by the driver as proposed by DBI.
+
+=item B<rows>
+
+  $rv = $sth->rows;
+
+Supported by the driver as proposed by DBI. In contrast to many other drivers
+the number of rows is available immediately after executing the statement.
+
+=item B<bind_col>
+
+  $rc = $sth->bind_col($column_number, \$var_to_bind, \%attr);
+
+Supported by the driver as proposed by DBI.
+
+=item B<bind_columns>
+
+  $rc = $sth->bind_columns(\%attr, @list_of_refs_to_vars_to_bind);
+
+Supported by the driver as proposed by DBI.
+
+=item B<dump_results>
+
+  $rows = $sth->dump_results($maxlen, $lsep, $fsep, $fh);
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<blob_read>
+
+  $blob = $sth->blob_read($id, $offset, $len);
+
+Supported by this driver as proposed by DBI. Implemented by DBI but not
+documented, so this method might change.
+
+This method seems to be heavily influenced by the current implementation of
+blobs in Oracle. Nevertheless we try to be as compatible as possible. Whereas
+Oracle suffers from the limitation that blobs are related to tables and every
+table can have only one blob (data-type LONG), PostgreSQL handles its blobs
+independent of any table by using so called object identifiers. This explains
+why the blob_read method is blessed into the STATEMENT package and not part of
+the DATABASE package. Here the field parameter has been used to handle this
+object identifier. The offset and len parameter may be set to zero, in which
+case the driver fetches the whole blob at once.
+
+Starting with PostgreSQL-6.5 every access to a blob has to be put into a
+transaction. This holds even for a read-only access.
+
+See also the PostgreSQL-specific functions concerning blobs which are
+available via the func-interface.
+
+For further information and examples about blobs, please read the chapter
+about Large Objects in the PostgreSQL Programmer's Guide.
+
+=back
+
+=head2 Statement Handle Attributes
+
+=over 4
+
+=item B<NUM_OF_FIELDS>  (integer, read-only)
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<NUM_OF_PARAMS>  (integer, read-only)
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<NAME>  (array-ref, read-only)
+
+Supported by the driver as proposed by DBI.
+
+=item B<NAME_lc>  (array-ref, read-only)
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<NAME_uc>  (array-ref, read-only)
+
+Implemented by DBI, no driver-specific impact.
+
+=item B<TYPE>  (array-ref, read-only)
+
+Supported by the driver as proposed by DBI, with the restriction, that the
+types are PostgreSQL specific data-types which do not correspond to
+international standards.
+
+=item B<PRECISION>  (array-ref, read-only)
+
+Not supported by the driver.
+
+=item B<SCALE>  (array-ref, read-only)
+
+Not supported by the driver.
+
+=item B<NULLABLE>  (array-ref, read-only)
+
+Not supported by the driver.
+
+=item B<CursorName>  (string, read-only)
+
+Not supported by the driver. See the note about B<Cursors> elsewhere in this
+document.
+
+=item B<Statement>  (string, read-only)
+
+Supported by the driver as proposed by DBI.
+
+=item B<RowCache>  (integer, read-only)
+
+Not supported by the driver.
+
+=item B<pg_size>  (array-ref, read-only)
+
+PostgreSQL specific attribute. It returns a reference to an array of integer
+values for each column. The integer shows the size of the column in
+bytes. Variable length columns are indicated by -1.
+
+=item B<pg_type>  (hash-ref, read-only)
+
+PostgreSQL specific attribute. It returns a reference to an array of strings
+for each column. The string shows the name of the data_type.
+
+=item B<pg_oid_status> (integer, read-only)
+
+PostgreSQL specific attribute. It returns the OID of the last INSERT command.
+
+=item B<pg_cmd_status> (integer, read-only)
+
+PostgreSQL specific attribute. It returns the type of the last
+command. Possible types are: INSERT, DELETE, UPDATE, SELECT.
+
+=back
+
+=head1 FURTHER INFORMATION
+
+=head2 Transactions
+
+The transaction behavior is now controlled with the attribute AutoCommit. For
+a complete definition of AutoCommit please refer to the DBI documentation.
+
+According to the DBI specification the default for AutoCommit is TRUE. In this
+mode, any change to the database becomes valid immediately. Any 'begin',
+'commit' or 'rollback' statement will be rejected.
+
+If AutoCommit is switched-off, immediately a transaction will be started by
+issuing a 'begin' statement. Any 'commit' or 'rollback' will start a new
+transaction. A disconnect will issue a 'rollback' statement.
+
+=head2 Large Objects
+
+The driver supports all large-objects related functions provided by libpq via
+the func-interface. Please note, that starting with PostgreSQL 6.5 any access
+to a large object - even read-only - has to be put into a transaction!
+
+=head2 Cursors
+
+Although PostgreSQL has a cursor concept, it has not been used in the current
+implementation. Cursors in PostgreSQL can only be used inside a transaction
+block. Because only one transaction block at a time is allowed, this would
+have implied the restriction, not to use any nested SELECT statements. Hence
+the execute method fetches all data at once into data structures located in
+the frontend application. This has to be considered when selecting large
+amounts of data!
+
+=head2 Data-Type bool
+
+The current implementation of PostgreSQL returns 't' for true and 'f' for
+false. From the Perl point of view a rather unfortunate choice. The DBD::Pg
+module translates the result for the data-type bool in a perl-ish like manner:
+'f' -> '0' and 't' -> '1'. This way the application does not have to check the
+database-specific returned values for the data-type bool, because Perl treats
+'0' as false and '1' as true.
+
+Boolean values can be passed to PostgreSQL as TRUE, 't', 'true', 'y', 'yes' or
+'1' for true and FALSE, 'f', 'false', 'n', 'no' or '0' for false.
+
+=head2 Schema support
+
+PostgreSQL version 7.3 introduced schema support. Note that the PostgreSQL
+schema concept may differ to that of other databases. Please refer to the
+PostgreSQL documentation for more details.
+
+Currently DBD::Pg does not provide explicit support for PostgreSQL schemas.
+However, schema functionality may be used without any restrictions by
+explicitly addressing schema objects, e.g.
+
+  my $res = $dbh->selectall_arrayref("SELECT * FROM my_schema.my_table");
+
+or by manipulating the schema search path with SET search_path, e.g.
+
+  $dbh->do("SET search_path TO my_schema, public");
+
+B<NOTE:> If you create an object with the same name as a PostgreSQL system
+object (as contained in the pg_catalog schema) and explicitly set the search
+path so that pg_catalog comes after the new object's schema, some DBD::Pg
+methods (particularly those querying PostgreSQL system objects) may fail.
+This problem should be fixed in a future release of DBD::Pg. Creating objects
+with the same name as system objects (or beginning with 'pg_') is not
+recommended practice and should be avoided in any case.
+
+=head1 SEE ALSO
+
+L<DBI>
+
+=head1 AUTHORS
+
+DBI and DBD-Oracle by Tim Bunce (Tim.Bunce@ig.co.uk)
+
+DBD-Pg by Edmund Mergl (E.Mergl@bawue.de) and Jeffrey W. Baker
+(jwbaker@acm.org). By David Wheeler <david@wheeler.net>, Jason
+Stewart <jason@openinformatics.com> and Bruce Momjian
+<pgman@candle.pha.pa.us> after v1.13.
+
+Major parts of this package have been copied from DBI and DBD-Oracle.
+
+=head1 COPYRIGHT
+
+The DBD::Pg module is free software. You may distribute under the terms of
+either the GNU General Public License or the Artistic License, as specified in
+the Perl README file.
+
+=head1 ACKNOWLEDGMENTS
+
+See also B<DBI/ACKNOWLEDGMENTS>.
+
+=cut
+
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/Pg.xs b/install/5.005/DBD-Pg-1.22-fixvercmp/Pg.xs
new file mode 100644
index 000000000..e5e4362ef
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/Pg.xs
@@ -0,0 +1,644 @@
+/*
+   $Id: Pg.xs,v 1.1 2004-04-29 09:21:28 ivan Exp $
+
+   Copyright (c) 1997,1998,1999,2000 Edmund Mergl
+   Portions Copyright (c) 1994,1995,1996,1997 Tim Bunce
+
+   You may distribute under the terms of either the GNU General Public
+   License or the Artistic License, as specified in the Perl README file.
+
+*/
+
+
+#include "Pg.h"
+
+
+#ifdef _MSC_VER
+#define strncasecmp(a,b,c) _strnicmp((a),(b),(c))
+#endif
+
+
+
+DBISTATE_DECLARE;
+
+
+MODULE = DBD::Pg	PACKAGE = DBD::Pg
+
+I32
+constant(name=Nullch)
+    char *name
+    PROTOTYPE:
+    ALIAS:
+    PG_BOOL      = 16
+    PG_BYTEA     = 17
+    PG_CHAR      = 18
+    PG_INT8      = 20
+    PG_INT2      = 21
+    PG_INT4      = 23
+    PG_TEXT      = 25
+    PG_OID       = 26
+    PG_FLOAT4    = 700
+    PG_FLOAT8    = 701
+    PG_ABSTIME   = 702
+    PG_RELTIME   = 703
+    PG_TINTERVAL = 704
+    PG_BPCHAR    = 1042
+    PG_VARCHAR   = 1043
+    PG_DATE      = 1082
+    PG_TIME      = 1083
+    PG_DATETIME  = 1184
+    PG_TIMESPAN  = 1186
+    PG_TIMESTAMP = 1296
+    CODE:
+    if (!ix) {
+	if (!name) name = GvNAME(CvGV(cv));
+	croak("Unknown DBD::Pg constant '%s'", name);
+    }
+    else RETVAL = ix;
+    OUTPUT:
+    RETVAL
+
+PROTOTYPES: DISABLE
+
+BOOT:
+    items = 0;  /* avoid 'unused variable' warning */
+    DBISTATE_INIT;
+    /* XXX this interface will change: */
+    DBI_IMP_SIZE("DBD::Pg::dr::imp_data_size", sizeof(imp_drh_t));
+    DBI_IMP_SIZE("DBD::Pg::db::imp_data_size", sizeof(imp_dbh_t));
+    DBI_IMP_SIZE("DBD::Pg::st::imp_data_size", sizeof(imp_sth_t));
+    dbd_init(DBIS);
+
+
+# ------------------------------------------------------------
+# driver level interface
+# ------------------------------------------------------------
+MODULE = DBD::Pg	PACKAGE = DBD::Pg::dr
+
+# disconnect_all renamed and ALIASed to avoid length clash on VMS :-(
+void
+discon_all_(drh)
+    SV *	drh
+    ALIAS:
+        disconnect_all = 1
+    CODE:
+    D_imp_drh(drh);
+    ST(0) = dbd_discon_all(drh, imp_drh) ? &sv_yes : &sv_no;
+
+
+
+# ------------------------------------------------------------
+# database level interface
+# ------------------------------------------------------------
+MODULE = DBD::Pg	PACKAGE = DBD::Pg::db
+
+void
+_login(dbh, dbname, username, pwd)
+    SV *	dbh
+    char *	dbname
+    char *	username
+    char *	pwd
+    CODE:
+    D_imp_dbh(dbh);
+    ST(0) = pg_db_login(dbh, imp_dbh, dbname, username, pwd) ? &sv_yes : &sv_no;
+
+
+int
+_ping(dbh)
+    SV *	dbh
+    CODE:
+    int ret;
+    ret = dbd_db_ping(dbh);
+    if (ret == 0) {
+        XST_mUNDEF(0);
+    }
+    else {
+        XST_mIV(0, ret);
+    }
+
+void
+getfd(dbh)
+    SV *	dbh
+    CODE:
+    int ret;
+    D_imp_dbh(dbh);
+
+    ret = dbd_db_getfd(dbh, imp_dbh);
+    ST(0) = sv_2mortal( newSViv( ret ) );
+
+void
+pg_notifies(dbh)
+    SV *	dbh
+    CODE:
+    D_imp_dbh(dbh);
+
+    ST(0) = dbd_db_pg_notifies(dbh, imp_dbh);
+
+void
+commit(dbh)
+    SV *	dbh
+    CODE:
+    D_imp_dbh(dbh);
+    if (DBIc_has(imp_dbh, DBIcf_AutoCommit)) {
+        warn("commit ineffective with AutoCommit enabled");
+    }
+    ST(0) = dbd_db_commit(dbh, imp_dbh) ? &sv_yes : &sv_no;
+
+
+void
+rollback(dbh)
+    SV *	dbh
+    CODE:
+    D_imp_dbh(dbh);
+    if (DBIc_has(imp_dbh, DBIcf_AutoCommit)) {
+        warn("rollback ineffective with AutoCommit enabled");
+    }
+    ST(0) = dbd_db_rollback(dbh, imp_dbh) ? &sv_yes : &sv_no;
+
+
+void
+disconnect(dbh)
+    SV *	dbh
+    CODE:
+    D_imp_dbh(dbh);
+    if ( !DBIc_ACTIVE(imp_dbh) ) {
+        XSRETURN_YES;
+    }
+    /* pre-disconnect checks and tidy-ups */
+    if (DBIc_CACHED_KIDS(imp_dbh)) {
+        SvREFCNT_dec(DBIc_CACHED_KIDS(imp_dbh));
+        DBIc_CACHED_KIDS(imp_dbh) = Nullhv;
+    }
+    /* Check for disconnect() being called whilst refs to cursors	*/
+    /* still exists. This possibly needs some more thought.		*/
+    if (DBIc_ACTIVE_KIDS(imp_dbh) && DBIc_WARN(imp_dbh) && !dirty) {
+        char *plural = (DBIc_ACTIVE_KIDS(imp_dbh)==1) ? "" : "s";
+        warn("disconnect(%s) invalidates %d active statement%s. %s",
+            SvPV(dbh,na), (int)DBIc_ACTIVE_KIDS(imp_dbh), plural,
+            "Either destroy statement handles or call finish on them before disconnecting.");
+    }
+    ST(0) = dbd_db_disconnect(dbh, imp_dbh) ? &sv_yes : &sv_no;
+
+
+void
+STORE(dbh, keysv, valuesv)
+    SV *	dbh
+    SV *	keysv
+    SV *	valuesv
+    CODE:
+    D_imp_dbh(dbh);
+    ST(0) = &sv_yes;
+    if (!dbd_db_STORE_attrib(dbh, imp_dbh, keysv, valuesv)) {
+        if (!DBIS->set_attr(dbh, keysv, valuesv)) {
+            ST(0) = &sv_no;
+        }
+    }
+
+
+void
+FETCH(dbh, keysv)
+    SV *	dbh
+    SV *	keysv
+    CODE:
+    D_imp_dbh(dbh);
+    SV *valuesv = dbd_db_FETCH_attrib(dbh, imp_dbh, keysv);
+    if (!valuesv) {
+        valuesv = DBIS->get_attr(dbh, keysv);
+    }
+    ST(0) = valuesv;	/* dbd_db_FETCH_attrib did sv_2mortal	*/
+
+
+void
+DESTROY(dbh)
+    SV *	dbh
+    PPCODE:
+    D_imp_dbh(dbh);
+    ST(0) = &sv_yes;
+    if (!DBIc_IMPSET(imp_dbh)) {	/* was never fully set up	*/
+        if (DBIc_WARN(imp_dbh) && !dirty && dbis->debug >= 2) {
+            warn("Database handle %s DESTROY ignored - never set up", SvPV(dbh,na));
+        }
+    }
+    else {
+	/* pre-disconnect checks and tidy-ups */
+        if (DBIc_CACHED_KIDS(imp_dbh)) {
+            SvREFCNT_dec(DBIc_CACHED_KIDS(imp_dbh));
+            DBIc_CACHED_KIDS(imp_dbh) = Nullhv;
+        }
+        if (DBIc_IADESTROY(imp_dbh)) { /* want's ineffective destroy    */
+            DBIc_ACTIVE_off(imp_dbh);
+        }
+        if (DBIc_ACTIVE(imp_dbh)) {
+            if (DBIc_WARN(imp_dbh) && (!dirty || dbis->debug >= 3)) {
+                warn("Database handle destroyed without explicit disconnect");
+            }
+	    /* The application has not explicitly disconnected. That's bad.	*/
+	    /* To ensure integrity we *must* issue a rollback. This will be	*/
+	    /* harmless if the application has issued a commit. If it hasn't	*/
+	    /* then it'll ensure integrity. Consider a Ctrl-C killing perl	*/
+	    /* between two statements that must be executed as a transaction.	*/
+	    /* Perl will call DESTROY on the dbh and, if we don't rollback,	*/
+	    /* the server will automatically commit! Bham! Corrupt database!	*/
+            if (!DBIc_has(imp_dbh,DBIcf_AutoCommit)) {
+                dbd_db_rollback(dbh, imp_dbh);	/* ROLLBACK! */
+            }
+            dbd_db_disconnect(dbh, imp_dbh);
+        }
+        dbd_db_destroy(dbh, imp_dbh);
+    }
+
+
+# driver specific functions
+
+
+void
+lo_open(dbh, lobjId, mode)
+    SV *	dbh
+    unsigned int	lobjId
+    int	mode
+    CODE:
+        int ret = pg_db_lo_open(dbh, lobjId, mode);
+        ST(0) = (-1 != ret) ? sv_2mortal(newSViv(ret)) : &sv_undef;
+
+void
+lo_close(dbh, fd)
+    SV *	dbh
+    int	fd
+    CODE:
+        ST(0) = (-1 != pg_db_lo_close(dbh, fd)) ? &sv_yes : &sv_no;
+
+
+void
+lo_read(dbh, fd, buf, len)
+	    SV *	dbh
+	    int	fd
+	    char *	buf
+	    int	len
+	PREINIT:
+	    SV *bufsv = SvROK(ST(2)) ? SvRV(ST(2)) : ST(2);
+	    int ret;
+	CODE:
+	    buf = SvGROW(bufsv, len + 1);
+	    ret = pg_db_lo_read(dbh, fd, buf, len);
+	    if (ret > 0) {
+	        SvCUR_set(bufsv, ret);
+	        *SvEND(bufsv) = '\0';
+	        sv_setpvn(ST(2), buf, ret);
+	        SvSETMAGIC(ST(2));
+	    }
+	    ST(0) = (-1 != ret) ? sv_2mortal(newSViv(ret)) : &sv_undef;
+
+
+void
+lo_write(dbh, fd, buf, len)
+    SV *	dbh
+    int	fd
+    char *	buf
+    int	len
+    CODE:
+        int ret = pg_db_lo_write(dbh, fd, buf, len);
+        ST(0) = (-1 != ret) ? sv_2mortal(newSViv(ret)) : &sv_undef;
+
+
+void
+lo_lseek(dbh, fd, offset, whence)
+    SV *	dbh
+    int	fd
+    int	offset
+    int	whence
+    CODE:
+        int ret = pg_db_lo_lseek(dbh, fd, offset, whence);
+        ST(0) = (-1 != ret) ? sv_2mortal(newSViv(ret)) : &sv_undef;
+
+
+void
+lo_creat(dbh, mode)
+    SV *	dbh
+    int	mode
+    CODE:
+        int ret = pg_db_lo_creat(dbh, mode);
+        ST(0) = (-1 != ret) ? sv_2mortal(newSViv(ret)) : &sv_undef;
+
+
+void
+lo_tell(dbh, fd)
+    SV *	dbh
+    int	fd
+    CODE:
+        int ret = pg_db_lo_tell(dbh, fd);
+        ST(0) = (-1 != ret) ? sv_2mortal(newSViv(ret)) : &sv_undef;
+
+
+void
+lo_unlink(dbh, lobjId)
+    SV *	dbh
+    unsigned int	lobjId
+    CODE:
+        ST(0) = (-1 != pg_db_lo_unlink(dbh, lobjId)) ? &sv_yes : &sv_no;
+
+
+void
+lo_import(dbh, filename)
+    SV *	dbh
+    char *	filename
+    CODE:
+        unsigned int ret = pg_db_lo_import(dbh, filename);
+        ST(0) = (ret) ? sv_2mortal(newSViv(ret)) : &sv_undef;
+
+
+void
+lo_export(dbh, lobjId, filename)
+    SV *	dbh
+    unsigned int	lobjId
+    char *	filename
+    CODE:
+        ST(0) = (-1 != pg_db_lo_export(dbh, lobjId, filename)) ? &sv_yes : &sv_no;
+
+
+void
+putline(dbh, buf)
+    SV *	dbh
+    char *	buf
+    CODE:
+        int ret = pg_db_putline(dbh, buf);
+        ST(0) = (-1 != ret) ? &sv_yes : &sv_no;
+
+
+void
+getline(dbh, buf, len)
+    PREINIT:
+        SV *bufsv = SvROK(ST(1)) ? SvRV(ST(1)) : ST(1);
+    INPUT:
+        SV *	dbh
+        int	len
+        char *	buf = sv_grow(bufsv, len);
+    CODE:
+        int ret = pg_db_getline(dbh, buf, len);
+        if (*buf == '\\' && *(buf+1) == '.') {
+            ret = -1;
+        }
+	sv_setpv((SV*)ST(1), buf);
+	SvSETMAGIC(ST(1));
+        ST(0) = (-1 != ret) ? &sv_yes : &sv_no;
+
+
+void
+endcopy(dbh)
+    SV *	dbh
+    CODE:
+        ST(0) = (-1 != pg_db_endcopy(dbh)) ? &sv_yes : &sv_no;
+
+
+# -- end of DBD::Pg::db
+
+
+# ------------------------------------------------------------
+# statement interface
+# ------------------------------------------------------------
+MODULE = DBD::Pg	PACKAGE = DBD::Pg::st
+
+void
+_prepare(sth, statement, attribs=Nullsv)
+    SV *	sth
+    char *	statement
+    SV *	attribs
+    CODE:
+    {
+    D_imp_sth(sth);
+    D_imp_dbh_from_sth;
+    DBD_ATTRIBS_CHECK("_prepare", sth, attribs);
+    if (!strncasecmp(statement, "begin",    5) ||
+        !strncasecmp(statement, "end",      4) ||
+        !strncasecmp(statement, "commit",   6) ||
+        !strncasecmp(statement, "abort",    5) ||
+        !strncasecmp(statement, "rollback", 8) ) {
+        warn("please use DBI functions for transaction handling");
+        ST(0) = &sv_no;
+    } else {
+        ST(0) = dbd_st_prepare(sth, imp_sth, statement, attribs) ? &sv_yes : &sv_no;
+    }
+    }
+
+
+void
+rows(sth)
+    SV *	sth
+    CODE:
+    D_imp_sth(sth);
+    XST_mIV(0, dbd_st_rows(sth, imp_sth));
+
+
+void
+bind_param(sth, param, value, attribs=Nullsv)
+    SV *	sth
+    SV *	param
+    SV *	value
+    SV *	attribs
+    CODE:
+    {
+    IV sql_type = 0;
+    D_imp_sth(sth);
+    if (attribs) {
+        if (SvNIOK(attribs)) {
+            sql_type = SvIV(attribs);
+            attribs = Nullsv;
+        }
+        else {
+            SV **svp;
+            DBD_ATTRIBS_CHECK("bind_param", sth, attribs);
+	    /* XXX we should perhaps complain if TYPE is not SvNIOK */
+            DBD_ATTRIB_GET_IV(attribs, "TYPE", 4, svp, sql_type);
+        }
+    }
+    ST(0) = dbd_bind_ph(sth, imp_sth, param, value, sql_type, attribs, FALSE, 0) ? &sv_yes : &sv_no;
+    }
+
+
+void
+bind_param_inout(sth, param, value_ref, maxlen, attribs=Nullsv)
+    SV *	sth
+    SV *	param
+    SV *	value_ref
+    IV 		maxlen
+    SV *	attribs
+    CODE:
+    {
+    IV sql_type = 0;
+    D_imp_sth(sth);
+    if (!SvROK(value_ref) || SvTYPE(SvRV(value_ref)) > SVt_PVMG) {
+        croak("bind_param_inout needs a reference to a scalar value");
+    }
+    if (SvREADONLY(SvRV(value_ref))) {
+       croak(no_modify);
+    }
+    if (attribs) {
+        if (SvNIOK(attribs)) {
+            sql_type = SvIV(attribs);
+            attribs = Nullsv;
+        }
+        else {
+            SV **svp;
+            DBD_ATTRIBS_CHECK("bind_param", sth, attribs);
+            DBD_ATTRIB_GET_IV(attribs, "TYPE", 4, svp, sql_type);
+        }
+    }
+    ST(0) = dbd_bind_ph(sth, imp_sth, param, SvRV(value_ref), sql_type, attribs, TRUE, maxlen) ? &sv_yes : &sv_no;
+    }
+
+
+void
+execute(sth, ...)
+    SV *	sth
+    CODE:
+    D_imp_sth(sth);
+    int ret;
+    if (items > 1) {
+	/* Handle binding supplied values to placeholders	*/
+        int i;
+        SV *idx;
+        imp_sth->all_params_len = 0; /* used for malloc of statement string in case we have placeholders */
+        if (items-1 != DBIc_NUM_PARAMS(imp_sth)) {
+            croak("execute called with %ld bind variables, %d needed", items-1, DBIc_NUM_PARAMS(imp_sth));
+            XSRETURN_UNDEF;
+        }
+        idx = sv_2mortal(newSViv(0));
+        for(i=1; i < items ; ++i) {
+            sv_setiv(idx, i);
+            if (!dbd_bind_ph(sth, imp_sth, idx, ST(i), 0, Nullsv, FALSE, 0)) {
+		XSRETURN_UNDEF;	/* dbd_bind_ph already registered error	*/
+            }
+        }
+    }
+    ret = dbd_st_execute(sth, imp_sth);
+    /* remember that dbd_st_execute must return <= -2 for error	*/
+    if (ret == 0) {		/* ok with no rows affected	*/
+        XST_mPV(0, "0E0");	/* (true but zero)		*/
+    }
+    else if (ret < -1) {	/* -1 == unknown number of rows	*/
+        XST_mUNDEF(0);		/* <= -2 means error   		*/
+    }
+    else {
+        XST_mIV(0, ret);	/* typically 1, rowcount or -1	*/
+    }
+
+
+void
+fetchrow_arrayref(sth)
+    SV *	sth
+    ALIAS:
+        fetch = 1
+    CODE:
+    D_imp_sth(sth);
+    AV *av = dbd_st_fetch(sth, imp_sth);
+    ST(0) = (av) ? sv_2mortal(newRV_inc((SV *)av)) : &sv_undef;
+
+
+void
+fetchrow_array(sth)
+    SV *	sth
+    ALIAS:
+        fetchrow = 1
+    PPCODE:
+    D_imp_sth(sth);
+    AV *av;
+    av = dbd_st_fetch(sth, imp_sth);
+    if (av) {
+        int num_fields = AvFILL(av)+1;
+        int i;
+        EXTEND(sp, num_fields);
+        for(i=0; i < num_fields; ++i) {
+            PUSHs(AvARRAY(av)[i]);
+        }
+    }
+
+
+void
+finish(sth)
+    SV *	sth
+    CODE:
+    D_imp_sth(sth);
+    D_imp_dbh_from_sth;
+    if (!DBIc_ACTIVE(imp_dbh)) {
+	/* Either an explicit disconnect() or global destruction	*/
+	/* has disconnected us from the database. Finish is meaningless	*/
+	/* XXX warn */
+        XSRETURN_YES;
+    }
+    if (!DBIc_ACTIVE(imp_sth)) {
+	/* No active statement to finish	*/
+        XSRETURN_YES;
+    }
+    ST(0) = dbd_st_finish(sth, imp_sth) ? &sv_yes : &sv_no;
+
+
+void
+blob_read(sth, field, offset, len, destrv=Nullsv, destoffset=0)
+    SV *        sth
+    int field
+    long        offset
+    long        len
+    SV *        destrv
+    long        destoffset
+    CODE:
+    {
+    D_imp_sth(sth);
+    if (!destrv) {
+        destrv = sv_2mortal(newRV_inc(sv_2mortal(newSViv(0))));
+    }
+    ST(0) = dbd_st_blob_read(sth, imp_sth, field, offset, len, destrv, destoffset) ? SvRV(destrv) : &sv_undef;
+    }
+
+void
+STORE(sth, keysv, valuesv)
+    SV *	sth
+    SV *	keysv
+    SV *	valuesv
+    CODE:
+    D_imp_sth(sth);
+    ST(0) = &sv_yes;
+    if (!dbd_st_STORE_attrib(sth, imp_sth, keysv, valuesv)) {
+        if (!DBIS->set_attr(sth, keysv, valuesv)) {
+            ST(0) = &sv_no;
+        }
+    }
+
+
+# FETCH renamed and ALIASed to avoid case clash on VMS :-(
+void
+FETCH_attrib(sth, keysv)
+    SV *	sth
+    SV *	keysv
+    ALIAS:
+    FETCH = 1
+    CODE:
+    D_imp_sth(sth);
+    SV *valuesv = dbd_st_FETCH_attrib(sth, imp_sth, keysv);
+    if (!valuesv) {
+        valuesv = DBIS->get_attr(sth, keysv);
+    }
+    ST(0) = valuesv;	/* dbd_st_FETCH_attrib did sv_2mortal	*/
+
+
+void
+DESTROY(sth)
+    SV *	sth
+    PPCODE:
+    D_imp_sth(sth);
+    ST(0) = &sv_yes;
+    if (!DBIc_IMPSET(imp_sth)) {	/* was never fully set up	*/
+        if (DBIc_WARN(imp_sth) && !dirty && dbis->debug >= 2) {
+            warn("Statement handle %s DESTROY ignored - never set up", SvPV(sth,na));
+        }
+    }
+    else {
+        if (DBIc_IADESTROY(imp_sth)) { /* want's ineffective destroy    */
+            DBIc_ACTIVE_off(imp_sth);
+        }
+        if (DBIc_ACTIVE(imp_sth)) {
+            dbd_st_finish(sth, imp_sth);
+        }
+        dbd_st_destroy(sth, imp_sth);
+    }
+
+
+# end of Pg.xs
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/README b/install/5.005/DBD-Pg-1.22-fixvercmp/README
new file mode 100644
index 000000000..7edebde9a
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/README
@@ -0,0 +1,166 @@
+
+DBD::Pg  --  the DBI PostgreSQL interface for Perl
+
+# $Id: README,v 1.1 2004-04-29 09:21:28 ivan Exp $
+
+DESCRIPTION:
+------------
+
+This is version 1.21 of DBD-Pg.  The web site for this interface is at:
+
+	http://gborg.postgresql.org/project/dbdpg/projdisplay.php
+
+For further information about DBI look at:
+
+	http://dbi.perl.org/
+
+For information about PostgreSQL, visit:
+    
+	http://www.postgresql.org/
+
+COPYRIGHT:
+----------
+
+	Portions Copyright (c) 1994,1995,1996,1997 Tim Bunce
+	Copyright (c) 1997,1998,1999,2000 Edmund Mergl
+	Copyright (c) 2002 Jeffrey W. Baker
+	Copyright (c) 2002 PostgreSQL Global Development Group
+   
+You may distribute under the terms of either the GNU General Public
+License or the Artistic License, as specified in the Perl README file.
+
+
+HOW TO GET THE LATEST VERSION:
+------------------------------
+
+Use the following URL to look for new versions of this module: 
+
+	http://gborg.postgresql.org/project/dbdpg/projdisplay.php
+
+or
+
+	http://www.perl.com/CPAN/modules/by-module/DBD/
+
+Note, that this request will be redirected automatically to the 
+nearest CPAN site. 
+
+
+IF YOU HAVE PROBLEMS:
+---------------------
+
+Please send comments and bug-reports to <dbd-general@gborg.postgresql.org>
+
+Please include the output of perl -v and perl -V, the version of PostgreSQL,
+the version of DBD-Pg, the version of DBI, and details about your platform
+in your bug-report.
+
+
+REQUIREMENTS:
+-------------
+
+	build, test, and install Perl 5         (at least 5.005)
+	build, test, and install the DBI module (at least 1.30)
+	build, test, and install PostgreSQL     (at least 7.3)
+        build, test, and install Test::Simple   (at least 0.17)
+
+INSTALLATION:
+-------------
+
+By default Makefile.PL uses App:Info to find the location of the
+PostgreSQL library and include directories.  However, if you want to
+control it yourself, define the environment variables POSTGRES_INCLUDE
+and POSTGRES_LIB, or POSTGRES_HOME.
+
+	1.   perl Makefile.PL
+	2.   make
+	3.   make test
+	4.   make install
+
+Do steps 1 to 3 as normal user, not as root!
+
+
+TESTING:
+--------
+
+The tests are designed to connect to a live database.  The following
+environment variables must be set for the tests to run:
+
+        DBI_DSN=dbi:Pg:dbname=<database>
+        DBI_USER=<username>
+        DBI_PASS=<password>
+
+If you are using the shared library libpq.so check if your dynamic
+loader  finds libpq.so. With Linux the command /sbin/ldconfig -v should
+tell you,  where it finds libpq.so. If ldconfig does not find libpq.so,
+either add an  appropriate entry to /etc/ld.so.conf and re-run ldconfig
+or add the path to  the environment variable LD_LIBRARY_PATH.
+
+A typical error message resulting from not finding libpq.so is: 
+
+	install_driver(Pg) failed: Can't load './blib/arch/auto/DBD/Pg/Pg.so' 
+	for module DBD::Pg: File not found at 
+
+If you get an error message like:
+
+	perl: error while loading shared libraries:
+	/usr/lib/perl5/site_perl/5.6.0/i386-linux/auto/DBD/Pg/Pg.so: undefined
+	symbol: PQconnectdb
+
+when you call DBI->connect, then your libpq.so was probably not seen at
+build-time. This should have caused 'make test' to fail; did you really
+run it and look at the output? Check the setting of POSTGRES_LIB and
+recompile DBD-Pg.
+ 
+Some linux distributions have incomplete perl installations. If you have
+compile errors like "XS_VERSION_BOOTCHECK undeclared", do:
+
+	find .../lib/perl5 -name XSUB.h -print
+
+If this file is not present, you need to recompile and re-install perl.
+
+SGI users: if you get segmentation faults make sure, you use the malloc
+which  comes with perl when compiling perl (the default is not to).
+"David R. Noble" <drnoble@engsci.sandia.gov>
+
+HP users: if you get error messages like:
+
+	can't open shared library: .../lib/libpq.sl
+	No such file or directory
+
+when running the test script, try to replace the  'shared' option in the
+LDDFLAGS with 'archive'. Dan Lauterbach <danla@dimensional.com>
+
+
+FreeBSD users: if you get during make test the error message:
+
+	'DBD driver has not implemented the AutoCommit attribute'
+
+recompile the DBI module and the DBD-Pg module and disable optimization.
+This error message is due to the broken optimization in gcc-2.7.2.1.
+
+If you get compiler errors like:
+       In function `XS_DBD__Pg__dr_discon_all_'
+    `sv_yes' undeclared (first use in this function)
+
+It may be because there is a 'patchlevel.h' file from another package 
+(such as 'hdf') in your POSTGRES_INCLUDE dir.  The presence of this file 
+prevents the compiler from finding the perl include file 
+'mach/CORE/patchlevel.h'.  Do 'pg_config --includedir' to identify the 
+POSTGRES_INCLUDE dir.  Rename patchlevel.h whilst you build DBD::Pg. 
+
+
+Sun Users: if you get compile errors like:
+
+	/usr/include/string.h:57: parse error before `]'
+
+then you need to remove from pgsql/include/libpq-fe.h the define for
+strerror, which clashes with the definition in the standard include
+file.
+
+Win32 Users: Running DBD-Pg scripts on Win32 needs some configuration work
+on the server side:
+
+	o add a postgres user with the same name as the NT-User 
+	  (eg Administrator)
+	o make sure, that your pg_hba.conf on the server is configured,
+	  such that a connection from another host will be accepted
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/README.win32 b/install/5.005/DBD-Pg-1.22-fixvercmp/README.win32
new file mode 100644
index 000000000..3cbe6734a
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/README.win32
@@ -0,0 +1,63 @@
+
+$Id: README.win32,v 1.1 2004-04-29 09:21:28 ivan Exp $
+
+
+Here is a step-by-step procedure for getting DBD-Pg to work on Windows
+NT. This Port has been done by Bob Kline <bkline@rksystems.com>. 
+
+
+prerequisites:	(older versions might also work, but these are the 
+--------------   versions I used)
+
+	o Windows NT4 SP4
+	o Visual Studio 6.0
+	o ActivePerl-5_6_0_613 with DBI-1.13
+	o postgresql-7.0.2
+	o DBD-Pg-0.95
+
+Here we assume, that perl and postgresql have been installed in C:\. Now
+perform the following steps:
+
+
+1. compile libpq
+----------------
+
+set POSTGRES_HOME=C:\postgresql-7.0.2
+cd postgresql-7.0.2
+mkdir lib
+mkdir include
+cd src
+copy include\port\win32.h include\os.h
+edit interfaces\libpq\fe-connect.c and add as first statement in connectDBStart() the following code:
+  #ifdef WIN32
+      static int WeHaveCalledWSAStartup;
+      if (!WeHaveCalledWSAStartup) {
+          WSADATA wsaData;
+          if (WSAStartup(MAKEWORD(1, 1), &wsaData)) {
+              printfPQExpBuffer(&conn->errorMessage, "WSAStartup failed: errno=%d\n", h_errno);
+              goto connect_errReturn;
+          }
+          WeHaveCalledWSAStartup = 1;
+      }
+  #endif
+edit interfaces\libpq\win32.mak and change the flag /ML to /MD:   CPP_PROJ=/nologo /MD ...
+nmake /f win32.mak
+cd ..
+copy src\interfaces\libpq\Release\libpq.lib  lib
+copy src\interfaces\libpq\libpq-fe.h         include
+copy src\include\postgres_ext.h              include
+cd ..
+
+
+2. build DBD-Pg
+---------------
+
+cd DBD-Pg
+perl Makefile.PL CAPI=TRUE
+nmake
+set the environment variable PGHOST to the name of the postgresql server: set PGHOST=myserver
+add on the server a postgres user with the same name as the NT-User (eg Administrator)
+make sure, that your pg_hba.conf on the server is configured, such that a connection from another host will be accepted
+mkdir C:\tmp
+nmake test   (expect to get errors concerning blobs)
+nmake install
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/dbd-pg.pod b/install/5.005/DBD-Pg-1.22-fixvercmp/dbd-pg.pod
new file mode 100644
index 000000000..ccbbc6394
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/dbd-pg.pod
@@ -0,0 +1,411 @@
+
+# $Id: dbd-pg.pod,v 1.1 2004-04-29 09:21:28 ivan Exp $
+
+=head1 NAME
+
+DBD::Pg - PostgreSQL database driver for the DBI module
+
+=head1 DESCRIPTION
+
+DBD::Pg is a Perl module which works with the DBI module to provide
+access to PostgreSQL databases.
+
+=head1 DBD::Pg
+
+=begin docbook
+<!-- The following blank =head1 is to allow us to use purely =head2 headings -->
+<!-- This keeps the POD fairly simple with regards to Pod::DocBook -->
+
+=end docbook
+
+=head1
+
+=head2 Version
+
+Version 0.91.
+
+=head2 Author and Contact Details
+
+The driver author is Edmund Mergl.  He can be contacted via the
+I<dbi-users> mailing list.
+
+
+=head2 Supported Database Versions and Options
+
+The DBD-Pg-0.92 module supports Postgresql 6.5.
+
+
+=head2 Connect Syntax
+
+The C<DBI-E<gt>connect()> Data Source Name, or I<DSN>, can be one of the
+following:
+
+  dbi:Pg:dbname=$dbname
+  dbi:Pg:dbname=$dbname;host=$host;port=$port;options=$options;tty=$tty
+
+All parameters, including the userid and password parameter of the 
+connect command, have a hard-coded default which can be overridden 
+by setting appropriate environment variables:
+
+  Parameter  Environment Variable  Default
+  ---------  --------------------  --------------
+  dbname     PGDATABASE            current userid
+  host       PGHOST                localhost
+  port       PGPORT                5432
+  options    PGOPTIONS             ""
+  tty        PGTTY                 ""
+  username   PGUSER                current userid
+  password   PGPASSWORD            ""
+
+There are no driver specific attributes for the C<DBI->connect()> method.
+
+
+=head2 Numeric Data Handling
+
+Postgresql supports the following numeric types:
+
+  Postgresql     Range
+  ----------     --------------------------
+  int2           -32768 to +32767
+  int4           -2147483648 to +2147483647
+  float4         6 decimal places
+  float8         15 decimal places
+
+Some platforms also support the int8 type.
+C<DBD::Pg> always returns all numbers as strings.
+
+
+=head2 String Data Handling
+
+Postgresql supports the following string data types:
+
+  CHAR            single character
+  CHAR(size)      fixed length blank-padded
+  VARCHAR(size)   variable length with limit
+  TEXT            variable length
+
+All string data types have a limit of 4096 bytes. 
+The CHAR type is fixed length and blank padded.
+
+There is no special handling for data with the 8th bit set. They
+are stored unchanged in the database. 
+None of the character types can store embedded nulls and Unicode is
+not formally supported.
+
+Strings can be concatenated using the C<||> operator.
+
+
+=head2 Date Data Handling
+
+Postgresql supports the following date time data types:
+
+  Type       Storage   Recommendation              Description
+  ---------  --------  --------------------------  ----------------------------
+  abstime     4 bytes  original date and time      limited range
+  date        4 bytes  SQL92 type                  wide range
+  datetime    8 bytes  best general date and time  wide range, high precision
+  interval   12 bytes  SQL92 type                  equivalent to timespan
+  reltime     4 bytes  original time interval      limited range, low precision
+  time        4 bytes  SQL92 type                  wide range
+  timespan   12 bytes  best general time interval  wide range, high precision
+  timestamp   4 bytes  SQL92 type                  limited range
+
+  Data Type    Range                               Resolution
+  ----------   ----------------------------------  -----------
+  abstime      1901-12-14        2038-01-19        1 sec
+  timestamp    1901-12-14        2038-01-19        1 sec
+  reltime      -68 years         +68 years         1 sec
+  tinterval    -178000000 years  +178000000 years  1 microsec
+  timespan     -178000000 years  178000000 years   1 microsec
+  date         4713 BC             32767 AD        1 day
+  datetime     4713 BC           1465001 AD        1 microsec
+  time         00:00:00:00       23:59:59:99       1 microsec
+
+Postgresql supports a range of date formats:
+
+  Name           Example
+  -----------    ----------------------
+  ISO            1997-12-17 0:37:16-08
+  SQL            12/17/1997 07:37:16.00 PST
+  Postgres       Wed Dec 17 07:37:16 1997 PST
+  European       17/12/1997 15:37:16.00 MET
+  NonEuropean    12/17/1997 15:37:16.00 MET
+  US             12/17/1997 07:37:16.00 MET
+
+The default output format does not depend on the client/server locale.
+It depends on, in increasing priority: the PGDATESTYLE environment
+variable at the server, the PGDATESTYLE environment variable at the client, and
+the C<SET DATESTYLE> SQL command.
+
+All of the formats described above can be used for input. A great many
+others can also be used. There is no specific default input format.
+If the format of a date input is ambiguous then the current DATESTYLE
+is used to help disambiguate.
+
+If you specify a date/time value without a time component, the default 
+time is 00:00:00 (midnight). To specify a date/time value without a date 
+is not allowed. 
+If a date with a two digit year is input then if the year was less than
+70, add 2000; otherwise, add 1900.
+
+The currect date/time is returned by the keyword C<'now'> or C<'current'>,
+which has to be casted to a valid data type. For example:
+
+  SELECT 'now'::datetime
+
+Postgresql supports a range of date time functions for converting
+between types, extracting parts of a date time value, truncating to a
+given unit, etc. The usual arithmetic can be performed on date and
+interval values, e.g., date-date=interval, etc.
+
+The following SQL expression can be used to convert an integer "seconds
+since 1-jan-1970 GMT" value to the corresponding database date time:
+
+  DATETIME(unixtime_field)
+
+and to do the reverse:
+
+  DATE_PART('epoch', datetime_field)
+
+The server stores all dates internally in GMT.  Times are converted to
+local time on the database server before being sent to the client
+frontend, hence by default are in the server time zone.
+
+The TZ environment variable is used by the server as default time
+zone.  The PGTZ environment variable on the client side is used to send
+the time zone information to the backend upon connection. The SQL C<SET
+TIME ZONE> command can set the time zone for the current session.
+
+
+=head2 LONG/BLOB Data Handling
+
+Postgresql handles BLOBS using a so called "large objects" type. The
+handling of this type differs from all other data types. The data are
+broken into chunks, which are stored in tuples in the database. Access
+to large objects is given by an interface which is modelled closely
+after the UNIX file system. The maximum size is limited by the file
+size of the operating system.
+
+
+If you just select the field, you get a "large object identifier" and
+not the data itself. The I<LongReadLen> and I<LongTruncOk> attributes are
+not implemented because they don't make sense in this case. The only
+method implemented by the driver is the undocumented DBI method
+C<blob_read()>.
+
+
+=head2 Other Data Handling issues
+
+The C<DBD::Pg> driver supports the C<type_info()> method.
+
+Postgresql supports automatic conversions between data types wherever
+it's reasonable.
+
+=head2 Transactions, Isolation and Locking
+
+Postgresql supports transactions.
+The current default isolation transaction level is "Serializable" and
+is currently implemented using table level locks. Both may change.
+No other isolation levels for transactions are supported.
+
+With AutoCommit on, a query never places a lock on a table. Readers
+never block writers and writers never block readers. This behavior
+changes whenever a transaction is started (AutoCommit off). Then a
+query induces a shared lock on a table and blocks anyone else
+until the transaction has been finished.
+
+The C<LOCK TABLE table_name> statement can be used to apply an explicit
+lock on a table. This only works inside a transaction (AutoCommit off).
+
+To ensure that a table being selected does not change before you make
+an update later in the transaction, you must explicitly lock it with a
+C<LOCK TABLE> statement before executing the select.
+
+
+=head2 No-Table Expression Select Syntax
+
+To select a constant expression, that is, an expression that doesn't involve
+data from a database table or view, just omit the "from" clause.
+Here's an example that selects the current time as a datetime:
+
+  SELECT 'now'::datetime;
+
+=head2 Table Join Syntax
+
+Outer joins are not supported. Inner joins use the traditional syntax.
+
+=head2 Table and Column Names
+
+The max size of table and column names cannot exceed 31 charaters in
+length.
+Only alphanumeric characters can be used; the first character must
+be a letter.
+
+If an identifier is enclosed by double quotation marks (C<">), it can
+contain any combination of characters except double quotation marks.
+
+Postgresql converts all identifiers to lower-case unless enclosed in
+double quotation marks.
+National character set characters can be used, if enclosed in quotation
+marks.
+
+
+=head2 Case Sensitivity of LIKE Operator
+
+Postgresql has the following string matching operators:
+
+ Glyph Description                                Example
+ ----- ----------------------------------------   -----------------------------
+ ~~    Same as SQL "LIKE" operator                'scrappy,marc' ~~ '%scrappy%'
+ !~~   Same as SQL "NOT LIKE" operator            'bruce' !~~ '%al%'
+ ~     Match (regex), case sensitive              'thomas' ~ '.*thomas.*'
+ ~*    Match (regex), case insensitive            'thomas' ~* '.*Thomas.*'
+ !~    Does not match (regex), case sensitive     'thomas' !~ '.*Thomas.*'
+ !~*   Does not match (regex), case insensitive   'thomas' !~ '.*vadim.*'
+
+
+=head2 Row ID
+
+The Postgresql "row id" pseudocolumn is called I<oid>, object identifier.
+It can be treated as a string and used to rapidly (re)select rows.
+
+
+=head2 Automatic Key or Sequence Generation
+
+Postgresql does not support automatic key generation such as "auto
+increment" or "system generated" keys.
+
+However, Postgresql does support "sequence generators". Any number of
+named sequence generators can be created in a database. Sequences 
+are used via functions called C<NEXTVAL> and C<CURRVAL>. Typical usage:
+
+  INSERT INTO table (k, v) VALUES (nextval('seq_name'), ?);
+
+To get the value just inserted, you can use the corresponding C<currval()>
+SQL function in the same session, or
+
+  SELECT last_value FROM seq_name
+
+
+=head2 Automatic Row Numbering and Row Count Limiting
+
+Postgresql does not support any way of automatically numbering returned rows.
+
+
+=head2 Parameter Binding
+
+Parameter binding is emulated by the driver.
+Both the C<?> and C<:1> style of placeholders are supported.
+
+The TYPE attribute of the C<bind_param()> method may be used to
+influence how parameters are treated. These SQL types are bound as
+VARCHAR: SQL_NUMERIC, SQL_DECIMAL, SQL_INTEGER, SQL_SMALLINT,
+SQL_FLOAT, SQL_REAL, SQL_DOUBLE, SQL_VARCHAR.
+
+The SQL_CHAR type is bound as a CHAR thus enabling fixed-width blank
+padded comparison semantics.
+
+Unsupported values of the TYPE attribute generate a warning.
+
+
+=head2 Stored Procedures
+
+C<DBD::Pg> does not support stored procedures.
+
+
+=head2 Table Metadata
+
+C<DBD::Pg> supports the C<table_info()> method.
+
+The I<pg_attribute> table contains detailed information about all columns
+of all the tables in the database, one row per table. 
+
+The I<pg_index> table contains detailed information about all indexes in
+the database, one row per index.
+
+Primary keys are implemented as unique indexes. See I<pg_index> above.
+
+
+=head2 Driver-specific Attributes and Methods
+
+There are no significant C<DBD::Pg> driver-specific database handle attributes.
+
+C<DBD::Pg> has the following driver-specific statement handle attributes:
+
+=over 8
+
+=item I<pg_size>
+
+Returns a reference to an array of integer values for each column. The
+integer shows the storage (not display) size of the column in bytes.
+Variable length columns are indicated by -1.
+
+=item I<pg_type>
+
+Returns a reference to an array of strings for each column. The string
+shows the name of the data type.
+
+=item I<pg_oid_status>
+
+Returns the OID of the last INSERT command.
+
+=item I<pg_cmd_status>
+
+Returns the name of the last command type. Possible types are: INSERT,
+DELETE, UPDATE, SELECT.
+
+=back
+
+
+C<DBD::Pg> has no private methods.
+
+
+=head2 Positioned updates and deletes
+
+Postgresql does not support positioned updates or deletes.
+
+
+=head2 Differences from the DBI Specification
+
+C<DBD::Pg> has no significant differences in behavior from the
+current DBI specification.
+
+Note that C<DBD::Pg> does not fully parse the statement until
+it's executed. Thus attributes like I<$sth-E<gt>{NUM_OF_FIELDS}> are not
+available until after C<$sth-E<gt>execute> has been called. This is valid
+behaviour but is important to note when porting applications
+originally written for other drivers.
+
+
+=head2 URLs to More Database/Driver Specific Information
+
+  http://www.postgresql.org
+
+
+=head2 Concurrent use of Multiple Handles
+
+C<DBD::Pg> supports an unlimited number of concurrent database
+connections to one or more databases.
+
+It also supports the preparation and execution of a new statement
+handle while still fetching data from another statement handle,
+provided it is 
+associated with the same database handle.
+
+
+=head2 Other Significant Database or Driver Features
+
+Postgres offers substantial additional power by incorporating the
+following four additional basic concepts in such a way that users can
+easily extend the system: classes, inheritance, types, and functions.
+
+Other features provide additional power and flexibility: constraints,
+triggers, rules, transaction integrity, procedural languages, and large objects.
+
+It's also free Open Source Software with an active community of developers.
+
+=cut
+
+# This driver summary for DBD::Pg is Copyright (c) 1999 Tim Bunce
+# and Edmund Mergl.
+# $Id: dbd-pg.pod,v 1.1 2004-04-29 09:21:28 ivan Exp $
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/dbdimp.c b/install/5.005/DBD-Pg-1.22-fixvercmp/dbdimp.c
new file mode 100644
index 000000000..55f4ee726
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/dbdimp.c
@@ -0,0 +1,2024 @@
+/*
+   $Id: dbdimp.c,v 1.1 2004-04-29 09:21:28 ivan Exp $
+
+   Copyright (c) 1997,1998,1999,2000 Edmund Mergl
+   Copyright (c) 2002 Jeffrey W. Baker
+   Portions Copyright (c) 1994,1995,1996,1997 Tim Bunce
+   
+   You may distribute under the terms of either the GNU General Public
+   License or the Artistic License, as specified in the Perl README file.
+
+*/
+
+
+/* 
+   hard-coded OIDs:   (here we need the postgresql types)
+                    pg_sql_type()  1042 (bpchar), 1043 (varchar)
+                    ddb_st_fetch() 1042 (bpchar),   16 (bool)
+                    ddb_preparse() 1043 (varchar)
+                    pgtype_bind_ok()
+*/
+
+#include "Pg.h"
+
+/* XXX DBI should provide a better version of this */
+#define IS_DBI_HANDLE(h)  (SvROK(h) && SvTYPE(SvRV(h)) == SVt_PVHV && SvRMAGICAL(SvRV(h)) && (SvMAGIC(SvRV(h)))->mg_type == 'P')
+
+DBISTATE_DECLARE;
+
+/* hard-coded array delimiter */
+static char* array_delimiter = ",";
+
+static void dbd_preparse  (imp_sth_t *imp_sth, char *statement);
+
+
+void
+dbd_init (dbistate)
+    dbistate_t *dbistate;
+{
+    DBIS = dbistate;
+}
+
+
+int
+dbd_discon_all (drh, imp_drh)
+    SV *drh;
+    imp_drh_t *imp_drh;
+{
+    dTHR;
+
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_discon_all\n"); }
+
+    /* The disconnect_all concept is flawed and needs more work */
+    if (!dirty && !SvTRUE(perl_get_sv("DBI::PERL_ENDING",0))) {
+        sv_setiv(DBIc_ERR(imp_drh), (IV)1);
+        sv_setpv(DBIc_ERRSTR(imp_drh),
+                 (char*)"disconnect_all not implemented");
+        DBIh_EVENT2(drh, ERROR_event,
+                 DBIc_ERR(imp_drh), DBIc_ERRSTR(imp_drh));
+        return FALSE;
+    }
+    if (perl_destruct_level) {
+        perl_destruct_level = 0;
+    }
+    return FALSE;
+}
+
+
+/* Database specific error handling. */
+
+void
+pg_error (h, error_num, error_msg)
+    SV *h;
+    int error_num;
+    char *error_msg;
+{
+    D_imp_xxh(h);
+    char *err, *src, *dst; 
+    int  len  = strlen(error_msg);
+
+    err = (char *)malloc(len + 1);
+    if (!err) {
+      return;
+    }
+    src = error_msg;
+    dst = err;
+
+    /* copy error message without trailing newlines */
+    while (*src != '\0' && *src != '\n') {
+        *dst++ = *src++;
+    }
+    *dst = '\0';
+
+    sv_setiv(DBIc_ERR(imp_xxh), (IV)error_num);         /* set err early */
+    sv_setpv(DBIc_ERRSTR(imp_xxh), (char*)err);
+    DBIh_EVENT2(h, ERROR_event, DBIc_ERR(imp_xxh), DBIc_ERRSTR(imp_xxh));
+    if (dbis->debug >= 2) { PerlIO_printf(DBILOGFP, "%s error %d recorded: %s\n", err, error_num, SvPV(DBIc_ERRSTR(imp_xxh),na)); }
+    free(err);
+}
+
+static int
+pgtype_bind_ok (dbtype)
+    int dbtype;
+{
+    /* basically we support types that can be returned as strings */
+    switch(dbtype) {
+    case   16:	/* bool		*/
+    case   17:	/* bytea	*/
+    case   18:	/* char		*/
+    case   20:	/* int8		*/
+    case   21:	/* int2		*/
+    case   23:	/* int4		*/
+    case   25:	/* text		*/
+    case   26:	/* oid		*/
+    case  700:	/* float4	*/
+    case  701:	/* float8	*/
+    case  702:	/* abstime	*/
+    case  703:	/* reltime	*/
+    case  704:	/* tinterval	*/
+    case 1042:	/* bpchar	*/
+    case 1043:	/* varchar	*/
+    case 1082:	/* date		*/
+    case 1083:	/* time		*/
+    case 1184:	/* datetime	*/
+    case 1186:	/* timespan	*/
+    case 1296:	/* timestamp	*/
+        return 1;
+    }
+    return 0;
+}
+
+
+/* ================================================================== */
+
+int
+pg_db_login (dbh, imp_dbh, dbname, uid, pwd)
+    SV *dbh;
+    imp_dbh_t *imp_dbh;
+    char *dbname;
+    char *uid;
+    char *pwd;
+{
+    dTHR;
+
+    char *conn_str;
+    char *src;
+    char *dest;
+
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "pg_db_login\n"); }
+
+    /* build connect string */
+    /* DBD-Pg syntax: 'dbname=dbname;host=host;port=port' */
+    /* pgsql  syntax: 'dbname=dbname host=host port=port user=uid password=pwd' */
+
+    conn_str = (char *)malloc(strlen(dbname) + strlen(uid) + strlen(pwd) + 16 + 1);
+    if (! conn_str) {
+        return 0;
+    }
+
+    src  = dbname;
+    dest = conn_str;
+    while (*src) {
+        if (*src != ';') {
+            *dest++ = *src++;
+            continue;
+        }
+        *dest++ = ' ';
+        src++;
+    }
+    *dest = '\0';
+
+    if (strlen(uid)) {
+        strcat(conn_str, " user=");
+        strcat(conn_str, uid);
+    }
+    if (strlen(uid) && strlen(pwd)) {
+        strcat(conn_str, " password=");
+        strcat(conn_str, pwd);
+    }
+
+    if (dbis->debug >= 2) { PerlIO_printf(DBILOGFP, "pg_db_login: conn_str = >%s<\n", conn_str); }
+
+    /* make a connection to the database */
+    imp_dbh->conn = PQconnectdb(conn_str);
+    free(conn_str);
+
+    /* check to see that the backend connection was successfully made */
+    if (PQstatus(imp_dbh->conn) != CONNECTION_OK) {
+        pg_error(dbh, PQstatus(imp_dbh->conn), PQerrorMessage(imp_dbh->conn));
+        PQfinish(imp_dbh->conn);
+        return 0;
+    }
+
+    imp_dbh->init_commit = 1;			/* initialize AutoCommit */
+    imp_dbh->pg_auto_escape = 1;		/* initialize pg_auto_escape */
+    imp_dbh->pg_bool_tf = 0;                    /* initialize pg_bool_tf */
+
+    DBIc_IMPSET_on(imp_dbh);			/* imp_dbh set up now */
+    DBIc_ACTIVE_on(imp_dbh);			/* call disconnect before freeing */
+    return 1;
+}
+
+
+int 
+dbd_db_getfd (dbh, imp_dbh)
+    SV *dbh;
+    imp_dbh_t *imp_dbh;
+{
+    char id;
+    SV* retsv;
+
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_db_getfd\n"); }
+
+    return PQsocket(imp_dbh->conn);
+}
+
+SV * 
+dbd_db_pg_notifies (dbh, imp_dbh)
+    SV *dbh;
+    imp_dbh_t *imp_dbh;
+{
+    char id;
+    PGnotify* notify;
+    AV* ret;
+    SV* retsv;
+
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_db_pg_notifies\n"); }
+
+    PQconsumeInput(imp_dbh->conn);
+
+    notify = PQnotifies(imp_dbh->conn);
+
+    if (!notify) return &sv_undef; 
+
+    ret=newAV();
+
+    av_push(ret, newSVpv(notify->relname,0) );
+    av_push(ret, newSViv(notify->be_pid) );
+
+    /* Should free notify memory with PQfreemem() */
+ 
+    retsv = newRV(sv_2mortal((SV*)ret));
+
+    return retsv;
+}
+
+int
+dbd_db_ping (dbh)
+    SV *dbh;
+{
+    char id;
+    D_imp_dbh(dbh);
+    PGresult* result;
+    ExecStatusType status;
+
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_db_ping\n"); }
+
+    if (NULL != imp_dbh->conn) {
+        result = PQexec(imp_dbh->conn, " ");
+        status = result ? PQresultStatus(result) : -1;
+        PQclear(result);
+
+        if (PGRES_EMPTY_QUERY != status) {
+            return 0;
+        }
+
+        return 1;
+    }
+    
+    return 0;
+}
+
+
+int
+dbd_db_commit (dbh, imp_dbh)
+    SV *dbh;
+    imp_dbh_t *imp_dbh;
+{
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_db_commit\n"); }
+
+    /* no commit if AutoCommit = on */
+    if (DBIc_has(imp_dbh, DBIcf_AutoCommit) != FALSE) {
+        return 0;
+    }
+
+    if (NULL != imp_dbh->conn) {
+        PGresult* result = 0;
+        ExecStatusType commitstatus, beginstatus;
+
+        /* execute commit */
+        result = PQexec(imp_dbh->conn, "commit");
+        commitstatus = result ? PQresultStatus(result) : -1;
+        PQclear(result);
+
+        /* check result */
+        if (commitstatus != PGRES_COMMAND_OK) {
+	    /* Only put the error message in DBH->errstr */
+	    pg_error(dbh, commitstatus, PQerrorMessage(imp_dbh->conn));
+        }
+
+        /* start new transaction.  AutoCommit must be FALSE, ref. 20 lines up */
+        result = PQexec(imp_dbh->conn, "begin");
+        beginstatus = result ? PQresultStatus(result) : -1;
+        PQclear(result);
+        if (beginstatus != PGRES_COMMAND_OK) {
+	    /* Maybe add some loud barf here? Raising some very high error? */
+            pg_error(dbh, beginstatus, "begin failed\n");
+            return 0;
+        }
+
+	/* if the initial COMMIT failed, return 0 now */
+	if (commitstatus != PGRES_COMMAND_OK) {
+            return 0;
+        }
+        
+        return 1;
+    }
+    
+    return 0;
+}
+
+
+int
+dbd_db_rollback (dbh, imp_dbh)
+    SV *dbh;
+    imp_dbh_t *imp_dbh;
+{
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_db_rollback\n"); }
+
+    /* no rollback if AutoCommit = on */
+    if (DBIc_has(imp_dbh, DBIcf_AutoCommit) != FALSE) {
+        return 0;
+    }
+
+    if (NULL != imp_dbh->conn) {
+        PGresult* result = 0;
+        ExecStatusType status;
+        
+        /* execute rollback */
+        result = PQexec(imp_dbh->conn, "rollback");
+        status = result ? PQresultStatus(result) : -1;
+        PQclear(result);
+
+        /* check result */
+        if (status != PGRES_COMMAND_OK) {
+            pg_error(dbh, status, "rollback failed\n");
+            return 0;
+        }
+
+        /* start new transaction.  AutoCommit must be FALSE, ref. 20 lines up */
+        result = PQexec(imp_dbh->conn, "begin");
+        status = result ? PQresultStatus(result) : -1;
+        PQclear(result);
+        if (status != PGRES_COMMAND_OK) {
+            pg_error(dbh, status, "begin failed\n");
+            return 0;
+        }
+        
+        return 1;
+    }
+
+    return 0;
+}
+
+
+int
+dbd_db_disconnect (dbh, imp_dbh)
+    SV *dbh;
+    imp_dbh_t *imp_dbh;
+{
+    dTHR;
+
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_db_disconnect\n"); }
+
+    /* We assume that disconnect will always work	*/
+    /* since most errors imply already disconnected.	*/
+    DBIc_ACTIVE_off(imp_dbh);
+
+    if (NULL != imp_dbh->conn) {
+        /* rollback if AutoCommit = off */
+        if (DBIc_has(imp_dbh, DBIcf_AutoCommit) == FALSE) {
+            PGresult* result = 0;
+            ExecStatusType status;
+            result = PQexec(imp_dbh->conn, "rollback");
+            status = result ? PQresultStatus(result) : -1;
+            PQclear(result);
+            if (status != PGRES_COMMAND_OK) {
+                pg_error(dbh, status, "rollback failed\n");
+                return 0;
+            }
+            if (dbis->debug >= 2) { PerlIO_printf(DBILOGFP, "dbd_db_disconnect: AutoCommit=off -> rollback\n"); }
+        }
+
+        PQfinish(imp_dbh->conn);
+        
+        imp_dbh->conn = NULL;
+    }
+    
+    /* We don't free imp_dbh since a reference still exists	*/
+    /* The DESTROY method is the only one to 'free' memory.	*/
+    /* Note that statement objects may still exists for this dbh!	*/
+    return 1;
+}
+
+
+void
+dbd_db_destroy (dbh, imp_dbh)
+    SV *dbh;
+    imp_dbh_t *imp_dbh;
+{
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_db_destroy\n"); }
+
+    if (DBIc_ACTIVE(imp_dbh)) {
+        dbd_db_disconnect(dbh, imp_dbh);
+    }
+
+    /* Nothing in imp_dbh to be freed	*/
+    DBIc_IMPSET_off(imp_dbh);
+}
+
+
+int
+dbd_db_STORE_attrib (dbh, imp_dbh, keysv, valuesv)
+    SV *dbh;
+    imp_dbh_t *imp_dbh;
+    SV *keysv;
+    SV *valuesv;
+{
+    STRLEN kl;
+    char *key = SvPV(keysv,kl);
+    int newval = SvTRUE(valuesv);
+
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_db_STORE\n"); }
+
+    if (kl==10 && strEQ(key, "AutoCommit")) {
+        int oldval = DBIc_has(imp_dbh, DBIcf_AutoCommit);
+        DBIc_set(imp_dbh, DBIcf_AutoCommit, newval);
+        if (oldval == FALSE && newval != FALSE && imp_dbh->init_commit) {
+            /* do nothing, fall through */
+            if (dbis->debug >= 2) { PerlIO_printf(DBILOGFP, "dbd_db_STORE: initialize AutoCommit to on\n"); }
+        } else if (oldval == FALSE && newval != FALSE) {
+            if (NULL != imp_dbh->conn) {
+                /* commit any outstanding changes */
+                PGresult* result = 0;
+                ExecStatusType status;
+                result = PQexec(imp_dbh->conn, "commit");
+                status = result ? PQresultStatus(result) : -1;
+                PQclear(result);
+                if (status != PGRES_COMMAND_OK) {
+                    pg_error(dbh, status, "commit failed\n");
+                    return 0;
+                }
+            }            
+            if (dbis->debug >= 2) { PerlIO_printf(DBILOGFP, "dbd_db_STORE: switch AutoCommit to on: commit\n"); }
+        } else if ((oldval != FALSE && newval == FALSE) || (oldval == FALSE && newval == FALSE && imp_dbh->init_commit)) {
+            if (NULL != imp_dbh->conn) {
+                /* start new transaction */
+                PGresult* result = 0;
+                ExecStatusType status;
+                result = PQexec(imp_dbh->conn, "begin");
+                status = result ? PQresultStatus(result) : -1;
+                PQclear(result);
+                if (status != PGRES_COMMAND_OK) {
+                    pg_error(dbh, status, "begin failed\n");
+                    return 0;
+                }
+            }
+            if (dbis->debug >= 2) { PerlIO_printf(DBILOGFP, "dbd_db_STORE: switch AutoCommit to off: begin\n"); }
+        }
+        /* only needed once */
+        imp_dbh->init_commit = 0;
+        return 1;
+    } else if (kl==14 && strEQ(key, "pg_auto_escape")) {
+        imp_dbh->pg_auto_escape = newval;
+    } else if (kl==10 && strEQ(key, "pg_bool_tf")) {
+	imp_dbh->pg_bool_tf = newval;
+#ifdef SvUTF8_off
+    } else if (kl==14 && strEQ(key, "pg_enable_utf8")) {
+        imp_dbh->pg_enable_utf8 = newval;
+#endif
+    } else {
+        return 0;
+    }
+}
+
+
+SV *
+dbd_db_FETCH_attrib (dbh, imp_dbh, keysv)
+    SV *dbh;
+    imp_dbh_t *imp_dbh;
+    SV *keysv;
+{
+    STRLEN kl;
+    char *key = SvPV(keysv,kl);
+    SV *retsv = Nullsv;
+
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_db_FETCH\n"); }
+
+    if (kl==10 && strEQ(key, "AutoCommit")) {
+        retsv = boolSV(DBIc_has(imp_dbh, DBIcf_AutoCommit));
+    } else if (kl==14 && strEQ(key, "pg_auto_escape")) {
+        retsv = newSViv((IV)imp_dbh->pg_auto_escape);
+    } else if (kl==10 && strEQ(key, "pg_bool_tf")) {
+	retsv = newSViv((IV)imp_dbh->pg_bool_tf);
+#ifdef SvUTF8_off
+    } else if (kl==14 && strEQ(key, "pg_enable_utf8")) {
+        retsv = newSViv((IV)imp_dbh->pg_enable_utf8);
+#endif
+    } else if (kl==11 && strEQ(key, "pg_INV_READ")) {
+        retsv = newSViv((IV)INV_READ);
+    } else if (kl==12 && strEQ(key, "pg_INV_WRITE")) {
+        retsv = newSViv((IV)INV_WRITE);
+    }
+
+    if (!retsv) {
+        return Nullsv;
+    }
+    if (retsv == &sv_yes || retsv == &sv_no) {
+        return retsv; /* no need to mortalize yes or no */
+    }
+    return sv_2mortal(retsv);
+}
+
+
+/* driver specific functins */
+
+
+int
+pg_db_lo_open (dbh, lobjId, mode)
+    SV *dbh;
+    unsigned int lobjId;
+    int mode;
+{
+    D_imp_dbh(dbh);
+    return lo_open(imp_dbh->conn, lobjId, mode);
+}
+
+
+int
+pg_db_lo_close (dbh, fd)
+    SV *dbh;
+    int fd;
+{
+    D_imp_dbh(dbh);
+    return lo_close(imp_dbh->conn, fd);
+}
+
+
+int
+pg_db_lo_read (dbh, fd, buf, len)
+    SV *dbh;
+    int fd;
+    char *buf;
+    int len;
+{
+    D_imp_dbh(dbh);
+    return lo_read(imp_dbh->conn, fd, buf, len);
+}
+
+
+int
+pg_db_lo_write (dbh, fd, buf, len)
+    SV *dbh;
+    int fd;
+    char *buf;
+    int len;
+{
+    D_imp_dbh(dbh);
+    return lo_write(imp_dbh->conn, fd, buf, len);
+}
+
+
+int
+pg_db_lo_lseek (dbh, fd, offset, whence)
+    SV *dbh;
+    int fd;
+    int offset;
+    int whence;
+{
+    D_imp_dbh(dbh);
+    return lo_lseek(imp_dbh->conn, fd, offset, whence);
+}
+
+
+unsigned int
+pg_db_lo_creat (dbh, mode)
+    SV *dbh;
+    int mode;
+{
+    D_imp_dbh(dbh);
+    return lo_creat(imp_dbh->conn, mode);
+}
+
+
+int
+pg_db_lo_tell (dbh, fd)
+    SV *dbh;
+    int fd;
+{
+    D_imp_dbh(dbh);
+    return lo_tell(imp_dbh->conn, fd);
+}
+
+
+int
+pg_db_lo_unlink (dbh, lobjId)
+    SV *dbh;
+    unsigned int lobjId;
+{
+    D_imp_dbh(dbh);
+    return lo_unlink(imp_dbh->conn, lobjId);
+}
+
+
+unsigned int
+pg_db_lo_import (dbh, filename)
+    SV *dbh;
+    char *filename;
+{
+    D_imp_dbh(dbh);
+    return lo_import(imp_dbh->conn, filename);
+}
+
+
+int
+pg_db_lo_export (dbh, lobjId, filename)
+    SV *dbh;
+    unsigned int lobjId;
+    char *filename;
+{
+    D_imp_dbh(dbh);
+    return lo_export(imp_dbh->conn, lobjId, filename);
+}
+
+
+int
+pg_db_putline (dbh, buffer)
+    SV *dbh;
+    char *buffer;
+{
+    D_imp_dbh(dbh);
+    return PQputline(imp_dbh->conn, buffer);
+}
+
+
+int
+pg_db_getline (dbh, buffer, length)
+    SV *dbh;
+    char *buffer;
+    int length;
+{
+    D_imp_dbh(dbh);
+    return PQgetline(imp_dbh->conn, buffer, length);
+}
+
+
+int
+pg_db_endcopy (dbh)
+    SV *dbh;
+{
+    D_imp_dbh(dbh);
+    return PQendcopy(imp_dbh->conn);
+}
+
+
+/* ================================================================== */
+
+
+int
+dbd_st_prepare (sth, imp_sth, statement, attribs)
+    SV *sth;
+    imp_sth_t *imp_sth;
+    char *statement;
+    SV *attribs;
+{
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_st_prepare: statement = >%s<\n", statement); }
+
+    /* scan statement for '?', ':1' and/or ':foo' style placeholders */
+    dbd_preparse(imp_sth, statement);
+
+    /* initialize new statement handle */
+    imp_sth->result    = 0;
+    imp_sth->cur_tuple = 0;
+
+    DBIc_IMPSET_on(imp_sth);
+    return 1;
+}
+
+
+static void
+dbd_preparse (imp_sth, statement)
+    imp_sth_t *imp_sth;
+    char *statement;
+{
+    bool in_literal = FALSE;
+    char in_comment = '\0';
+    char *src, *start, *dest;
+    phs_t phs_tpl;
+    SV *phs_sv;
+    int idx=0;
+    char *style="", *laststyle=Nullch;
+    STRLEN namelen;
+
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_st_preparse: statement = >%s<\n", statement); }
+
+    /* allocate room for copy of statement with spare capacity	*/
+    /* for editing '?' or ':1' into ':p1'.			*/
+    /*								*/
+    /* Note: the calculated length used here for the safemalloc	*/
+    /* isn't related in any way to the actual worst case length	*/
+    /* of the translated statement, but allowing for 3 times	*/
+    /* the length of the original statement should be safe...	*/
+    imp_sth->statement = (char*)safemalloc(strlen(statement) * 3 + 1);
+
+    /* initialise phs ready to be cloned per placeholder	*/
+    memset(&phs_tpl, 0, sizeof(phs_tpl));
+    phs_tpl.ftype = 1043;	/* VARCHAR */
+
+    src  = statement;
+    dest = imp_sth->statement;
+    while(*src) {
+
+        if (in_comment) {
+            /* SQL-style and C++-style */ 
+            if ((in_comment == '-' || in_comment == '/') && *src == '\n') {
+                in_comment = '\0';
+            }
+            /* C-style */
+            else if (in_comment == '*' && *src == '*' && *(src+1) == '/') {
+                *dest++ = *src++; /* avoids asterisk-slash-asterisk issues */
+                in_comment = '\0';
+            }
+            *dest++ = *src++;
+            continue;
+        }
+
+        if (in_literal) {
+            /* check if literal ends but keep quotes in literal */
+            if (*src == in_literal) {
+                int bs=0;
+                char *str;
+                str = src-1;
+                while (*(str-bs) == '\\')
+                bs++;
+                if (!(bs & 1))
+                    in_literal = 0;
+            }
+            *dest++ = *src++;
+            continue;
+        }
+
+        /* Look for comments: SQL-style or C++-style or C-style	*/
+        if ((*src == '-' && *(src+1) == '-') ||
+            (*src == '/' && *(src+1) == '/') ||
+            (*src == '/' && *(src+1) == '*'))
+        {
+            in_comment = *(src+1);
+            /* We know *src & the next char are to be copied, so do */
+            /* it. In the case of C-style comments, it happens to */
+            /* help us avoid slash-asterisk-slash oddities. */
+            *dest++ = *src++;
+            *dest++ = *src++;
+            continue;
+        }
+
+        /* check if no placeholders */
+        if (*src != ':' && *src != '?') {
+            if (*src == '\'' || *src == '"') {
+                in_literal = *src;
+            }
+            *dest++ = *src++;
+            continue;
+        }
+
+        /* check for cast operator */
+        if (*src == ':' && (*(src-1) == ':' || *(src+1) == ':')) {
+            *dest++ = *src++;
+            continue;
+        }
+
+        /* only here for : or ? outside of a comment or literal and no cast */
+
+        start = dest;			/* save name inc colon	*/ 
+        *dest++ = *src++;
+        if (*start == '?') {		/* X/Open standard	*/
+            sprintf(start,":p%d", ++idx); /* '?' -> ':p1' (etc)	*/
+            dest = start+strlen(start);
+            style = "?";
+
+        } else if (isDIGIT(*src)) {	/* ':1'		*/
+            idx = atoi(src);
+            *dest++ = 'p';		/* ':1'->':p1'	*/
+            if (idx <= 0) {
+                croak("Placeholder :%d invalid, placeholders must be >= 1", idx);
+            }
+            while(isDIGIT(*src)) {
+                *dest++ = *src++;
+            }
+            style = ":1";
+
+        } else if (isALNUM(*src)) {	/* ':foo'	*/
+            while(isALNUM(*src)) {	/* includes '_'	*/
+                *dest++ = *src++;
+            }
+            style = ":foo";
+        } else {			/* perhaps ':=' PL/SQL construct */
+            continue;
+        }
+        *dest = '\0';			/* handy for debugging	*/
+        namelen = (dest-start);
+        if (laststyle && style != laststyle) {
+            croak("Can't mix placeholder styles (%s/%s)",style,laststyle);
+        }
+        laststyle = style;
+        if (imp_sth->all_params_hv == NULL) {
+            imp_sth->all_params_hv = newHV();
+        }
+        phs_tpl.sv = &sv_undef;
+        phs_sv = newSVpv((char*)&phs_tpl, sizeof(phs_tpl)+namelen+1);
+        hv_store(imp_sth->all_params_hv, start, namelen, phs_sv, 0);
+        strcpy( ((phs_t*)(void*)SvPVX(phs_sv))->name, start);
+    }
+    *dest = '\0';
+    if (imp_sth->all_params_hv) {
+        DBIc_NUM_PARAMS(imp_sth) = (int)HvKEYS(imp_sth->all_params_hv);
+        if (dbis->debug >= 2) { PerlIO_printf(DBILOGFP, "    dbd_preparse scanned %d distinct placeholders\n", (int)DBIc_NUM_PARAMS(imp_sth)); }
+    }
+}
+
+
+/* if it LOOKS like a string, this function will determine whether the type needs to be surrounded in single quotes */
+static int pg_sql_needquote (sql_type)
+    int sql_type;
+{
+    if (sql_type > 1000 || sql_type == 17 || sql_type == 25 ) { 
+        return 1;
+    }
+    return 0;
+}
+
+
+
+static int
+pg_sql_type (imp_sth, name, sql_type)
+    imp_sth_t *imp_sth;
+    char *name;
+    int sql_type;
+{
+    switch (sql_type) {
+        case SQL_CHAR:
+            return 1042;	/* bpchar */
+        case SQL_NUMERIC:
+            return 700;		/* float4 */
+        case SQL_DECIMAL:
+            return 700;		/* float4 */
+        case SQL_INTEGER:
+            return 23;		/* int4	*/
+        case SQL_SMALLINT:
+            return 21;		/* int2	*/
+        case SQL_FLOAT:
+            return 700;		/* float4 */
+        case SQL_REAL:
+            return 701;		/* float8 */
+        case SQL_DOUBLE:
+            return 20;		/* int8 */
+        case SQL_VARCHAR:
+            return 1043;	/* varchar */
+        case SQL_BINARY:
+            return 17;		/* bytea */
+        default:
+            if (DBIc_WARN(imp_sth) && imp_sth && name) {
+                warn("SQL type %d for '%s' is not fully supported, bound as VARCHAR instead",
+						sql_type, name);
+            }
+            return pg_sql_type(imp_sth, name, SQL_VARCHAR);
+    }
+}
+
+static int
+sql_pg_type (imp_sth, name, sql_type)
+    imp_sth_t *imp_sth;
+    char *name;
+    int sql_type;
+{
+    if (dbis->debug >= 1) { 
+		PerlIO_printf(DBILOGFP, "sql_pg_type name '%s' type '%d'\n", name, sql_type ); 
+	}
+
+    switch (sql_type) {
+        case   17:		/* bytea */
+        	return SQL_BINARY;
+        case   20:		/* int8 */
+        	return SQL_DOUBLE;
+        case   21:		/* int2	*/
+        	return SQL_SMALLINT;
+        case   23:		/* int4	*/
+        	return SQL_INTEGER;
+        case  700:		/* float4 */
+        	return SQL_NUMERIC;
+        case  701:		/* float8 */
+        	return SQL_REAL;
+        case 1042:	/* bpchar */
+        	return SQL_CHAR;
+        case 1043:	/* varchar */
+        	return SQL_VARCHAR;
+        case 1082:	/* date */
+        	return SQL_DATE;
+        case 1083:	/* time */
+        	return SQL_TIME;
+        case 1296:	/* date */
+        	return SQL_TIMESTAMP;
+
+        default:
+			return sql_type;
+    }
+}
+
+
+static int
+dbd_rebind_ph (sth, imp_sth, phs)
+    SV *sth;
+    imp_sth_t *imp_sth;
+    phs_t *phs;
+{
+    STRLEN value_len;
+
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_st_rebind\n"); }
+
+    /* convert to a string ASAP */
+    if (!SvPOK(phs->sv) && SvOK(phs->sv)) {
+        sv_2pv(phs->sv, &na);
+    }
+
+    if (dbis->debug >= 2) {
+        char *val = neatsvpv(phs->sv,0);
+        PerlIO_printf(DBILOGFP, "       bind %s <== %.1000s (", phs->name, val);
+        if (SvOK(phs->sv)) {
+             PerlIO_printf(DBILOGFP, "size %ld/%ld/%ld, ", (long)SvCUR(phs->sv),(long)SvLEN(phs->sv),phs->maxlen);
+        } else {
+            PerlIO_printf(DBILOGFP, "NULL, ");
+        }
+        PerlIO_printf(DBILOGFP, "ptype %d, otype %d%s)\n", (int)SvTYPE(phs->sv), phs->ftype, (phs->is_inout) ? ", inout" : "");
+    }
+
+    /* At the moment we always do sv_setsv() and rebind.        */
+    /* Later we may optimise this so that more often we can     */
+    /* just copy the value & length over and not rebind.        */
+
+    if (phs->is_inout) {        /* XXX */
+        if (SvREADONLY(phs->sv)) {
+            croak(no_modify);
+        }
+        /* phs->sv _is_ the real live variable, it may 'mutate' later   */
+        /* pre-upgrade high to reduce risk of SvPVX realloc/move        */
+        (void)SvUPGRADE(phs->sv, SVt_PVNV);
+        /* ensure room for result, 28 is magic number (see sv_2pv)      */
+        SvGROW(phs->sv, (phs->maxlen < 28) ? 28 : phs->maxlen+1);
+    }
+    else {
+        /* phs->sv is copy of real variable, upgrade to at least string */
+        (void)SvUPGRADE(phs->sv, SVt_PV);
+    }
+
+    /* At this point phs->sv must be at least a PV with a valid buffer, */
+    /* even if it's undef (null)                                        */
+    /* Here we set phs->progv, phs->indp, and value_len.                */
+    if (SvOK(phs->sv)) {
+        phs->progv = SvPV(phs->sv, value_len);
+        phs->indp  = 0;
+    }
+    else {        /* it's null but point to buffer in case it's an out var */
+        phs->progv = SvPVX(phs->sv);
+        phs->indp  = -1;
+        value_len  = 0;
+    }
+    phs->sv_type = SvTYPE(phs->sv);        /* part of mutation check    */
+    phs->maxlen  = SvLEN(phs->sv)-1;       /* avail buffer space        */
+    if (phs->maxlen < 0) {                 /* can happen with nulls     */
+        phs->maxlen = 0;
+    }
+
+    phs->alen = value_len + phs->alen_incnull;
+
+    imp_sth->all_params_len += SvOK(phs->sv) ? phs->alen : 4; /* NULL */
+
+    if (dbis->debug >= 3) {
+        PerlIO_printf(DBILOGFP, "       bind %s <== '%.*s' (size %ld/%ld, otype %d, indp %d)\n",
+            phs->name,
+            (int)(phs->alen>SvIV(DBIS->neatsvpvlen) ? SvIV(DBIS->neatsvpvlen) : phs->alen),
+            (phs->progv) ? phs->progv : "",
+            (long)phs->alen, (long)phs->maxlen, phs->ftype, phs->indp);
+    }
+
+    return 1;
+}
+
+
+void dereference(value)
+SV** value;
+{
+       AV* buf;
+       SV* val;
+          char *src;
+       int is_ref;
+          STRLEN len;
+
+       if (SvTYPE(SvRV(*value)) != SVt_PVAV)
+               croak("Not an array reference (%s)", neatsvpv(*value,0));
+
+       buf = (AV *) SvRV(*value);
+       sv_setpv(*value, "{");
+               while ( SvOK(val = av_shift(buf)) ) {
+                       is_ref = SvROK(val);
+                       if (is_ref)
+                               dereference(&val);
+                       else
+                               sv_catpv(*value, "\"");
+                       /* Quote */
+                       src = SvPV(val, len);
+                       while (len--) {
+                               if (!is_ref && *src == '\"')
+                                       sv_catpv(*value, "\\");
+                               sv_catpvn(*value, src++, 1);
+                       }
+                       /* End of quote */
+                       if (!is_ref)
+                               sv_catpv(*value, "\"");
+                       if (av_len(buf) > -1)
+                                       sv_catpv(*value, array_delimiter);
+               }
+       sv_catpv(*value, "}");
+       av_clear(buf);
+}
+
+int
+dbd_bind_ph (sth, imp_sth, ph_namesv, newvalue, sql_type, attribs, is_inout, maxlen)
+    SV *sth;
+    imp_sth_t *imp_sth;
+    SV *ph_namesv;
+    SV *newvalue;
+    IV sql_type;
+    SV *attribs;
+    int is_inout;
+    IV maxlen;
+{
+    SV **phs_svp;
+    STRLEN name_len;
+    char *name;
+    char namebuf[30];
+    phs_t *phs;
+
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_bind_ph\n"); }
+
+    /* check if placeholder was passed as a number        */
+
+    if (SvGMAGICAL(ph_namesv)) { /* eg if from tainted expression */
+        mg_get(ph_namesv);
+    }
+    if (!SvNIOKp(ph_namesv)) {
+        name = SvPV(ph_namesv, name_len);
+    }
+    if (SvNIOKp(ph_namesv) || (name && isDIGIT(name[0]))) {
+        sprintf(namebuf, ":p%d", (int)SvIV(ph_namesv));
+        name = namebuf;
+        name_len = strlen(name);
+    }
+    assert(name != Nullch);
+
+    if (SvTYPE(newvalue) > SVt_PVLV) { /* hook for later array logic	*/
+        croak("Can't bind a non-scalar value (%s)", neatsvpv(newvalue,0));
+    }
+    if (SvROK(newvalue) && !IS_DBI_HANDLE(newvalue)) {
+        /* dbi handle allowed for cursor variables */
+               dereference(&newvalue);
+    }
+    if (SvTYPE(newvalue) == SVt_PVLV && is_inout) {	/* may allow later */
+        croak("Can't bind ``lvalue'' mode scalar as inout parameter (currently)");
+    }
+
+   if (dbis->debug >= 2) {
+        PerlIO_printf(DBILOGFP, "         bind %s <== %s (type %ld", name, neatsvpv(newvalue,0), (long)sql_type);
+        if (is_inout) {
+            PerlIO_printf(DBILOGFP, ", inout 0x%lx, maxlen %ld", (long)newvalue, (long)maxlen);
+        }
+        if (attribs) {
+            PerlIO_printf(DBILOGFP, ", attribs: %s", neatsvpv(attribs,0));
+        }
+        PerlIO_printf(DBILOGFP, ")\n");
+    }
+
+    phs_svp = hv_fetch(imp_sth->all_params_hv, name, name_len, 0);
+    if (phs_svp == NULL) {
+        croak("Can't bind unknown placeholder '%s' (%s)", name, neatsvpv(ph_namesv,0));
+    }
+    phs = (phs_t*)(void*)SvPVX(*phs_svp);	/* placeholder struct	*/
+
+    if (phs->sv == &sv_undef) { /* first bind for this placeholder	*/
+        phs->ftype    = 1043;		 /* our default type VARCHAR	*/
+        phs->is_inout = is_inout;
+        if (is_inout) {
+            /* phs->sv assigned in the code below */
+            ++imp_sth->has_inout_params;
+            /* build array of phs's so we can deal with out vars fast	*/
+            if (!imp_sth->out_params_av) {
+                imp_sth->out_params_av = newAV();
+            }
+            av_push(imp_sth->out_params_av, SvREFCNT_inc(*phs_svp));
+        } 
+
+        if (attribs) {	/* only look for pg_type on first bind of var	*/
+            SV **svp;
+            /* Setup / Clear attributes as defined by attribs.		*/
+            /* XXX If attribs is EMPTY then reset attribs to default?	*/
+            if ( (svp = hv_fetch((HV*)SvRV(attribs), "pg_type", 7,  0)) != NULL) {
+                int pg_type = SvIV(*svp);
+                if (!pgtype_bind_ok(pg_type)) {
+                    croak("Can't bind %s, pg_type %d not supported by DBD::Pg", phs->name, pg_type);
+                }
+                if (sql_type) {
+                    croak("Can't specify both TYPE (%d) and pg_type (%d) for %s", sql_type, pg_type, phs->name);
+                }
+                phs->ftype = pg_type;
+            }
+        }
+        if (sql_type) {
+            /* SQL_BINARY (-2) is deprecated. */
+            if (sql_type == -2 && DBIc_WARN(imp_sth)) {
+                warn("Use of SQL type SQL_BINARY (%d) is deprecated. Use { pg_type => DBD::Pg::PG_BYTEA } instead.", sql_type);
+            }
+            phs->ftype = pg_sql_type(imp_sth, phs->name, sql_type);
+        }
+    }   /* was first bind for this placeholder  */
+
+        /* check later rebinds for any changes */
+    else if (is_inout || phs->is_inout) {
+        croak("Can't rebind or change param %s in/out mode after first bind (%d => %d)", phs->name, phs->is_inout , is_inout);
+    }
+    else if (sql_type && phs->ftype != pg_sql_type(imp_sth, phs->name, sql_type)) {
+        croak("Can't change TYPE of param %s to %d after initial bind", phs->name, sql_type);
+    }
+
+    phs->maxlen = maxlen;		/* 0 if not inout		*/
+
+    if (!is_inout) {	/* normal bind to take a (new) copy of current value	*/
+        if (phs->sv == &sv_undef) {     /* (first time bind) */
+            phs->sv = newSV(0);
+        }
+        sv_setsv(phs->sv, newvalue);
+    } else if (newvalue != phs->sv) {
+        if (phs->sv) {
+            SvREFCNT_dec(phs->sv);
+        }
+        phs->sv = SvREFCNT_inc(newvalue);	/* point to live var	*/
+    }
+
+    return dbd_rebind_ph(sth, imp_sth, phs);
+}
+
+
+int
+dbd_st_execute (sth, imp_sth)   /* <= -2:error, >=0:ok row count, (-1=unknown count) */
+    SV *sth;
+    imp_sth_t *imp_sth;
+{
+    dTHR;
+
+    D_imp_dbh_from_sth;
+    ExecStatusType status = -1;
+    char *cmdStatus;
+    char *cmdTuples;
+    char *statement;
+    int ret = -2;
+    int num_fields;
+    int i;
+    STRLEN len;
+    bool in_literal = FALSE;
+    char in_comment = '\0';
+    char *src;
+    char *dest;
+    char *val;
+    char namebuf[30];
+    phs_t *phs;
+    SV **svp;
+
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_st_execute\n"); }
+
+    /*
+    here we get the statement from the statement handle where
+    it has been stored when creating a blank sth during prepare
+    svp = hv_fetch((HV *)SvRV(sth), "Statement", 9, FALSE);
+    statement = SvPV(*svp, na);
+    */
+
+    if (NULL == imp_dbh->conn) {
+        pg_error(sth, -1, "execute on disconnected handle");        
+        return -2;
+    }   
+    
+    statement = imp_sth->statement;
+    if (! statement) {
+        /* are we prepared ? */
+        pg_error(sth, -1, "statement not prepared\n");
+        return -2;
+    }
+
+    /* do we have input parameters ? */
+    if ((int)DBIc_NUM_PARAMS(imp_sth) > 0) {
+	/*
+	we have to allocate some additional memory for possible escaping
+	quotes and backslashes:
+	   max_len = length of statement
+	   + total length of all params allowing for worst case all
+	     characters binary-escaped (\\xxx)
+	   + null terminator
+	Note: parameters look like :p1 at this point, so there's no
+	need to explicitly allow for surrounding quotes because '' is
+	shorter than :p1
+	*/
+        int max_len = strlen(imp_sth->statement) + imp_sth->all_params_len * 5 + 1;
+        statement = (char*)safemalloc( max_len );
+        dest = statement;
+        src  = imp_sth->statement;
+        /* scan statement for ':p1' style placeholders */
+        while(*src) {
+
+            if (in_comment) {
+                /* SQL-style and C++-style */ 
+                if ((in_comment == '-' || in_comment == '/') && *src == '\n') {
+                    in_comment = '\0';
+                }
+                /* C-style */
+                else if (in_comment == '*' && *src == '*' && *(src+1) == '/') {
+                    *dest++ = *src++; /* avoids asterisk-slash-asterisk issues */
+                    in_comment = '\0';
+                }
+                *dest++ = *src++;
+                continue;
+            }
+
+            if (in_literal) {
+                /* check if literal ends but keep quotes in literal */
+                if (*src == in_literal) {
+                    int bs=0;
+                    char *str;
+                    str = src-1;
+                    while (*(str-bs) == '\\')
+                    bs++;
+                    if (!(bs & 1))
+                        in_literal = 0;
+                }
+                *dest++ = *src++;
+                continue;
+            }
+
+            /* Look for comments: SQL-style or C++-style or C-style	*/
+            if ((*src == '-' && *(src+1) == '-') ||
+                (*src == '/' && *(src+1) == '/') ||
+                (*src == '/' && *(src+1) == '*'))
+            {
+                in_comment = *(src+1);
+                /* We know *src & the next char are to be copied, so do */
+                /* it. In the case of C-style comments, it happens to */
+                /* help us avoid slash-asterisk-slash oddities. */
+                *dest++ = *src++;
+                *dest++ = *src++;
+                continue;
+            }
+
+            /* check if no placeholders */
+            if (*src != ':' && *src != '?') {
+                if (*src == '\'' || *src == '"') {
+                    in_literal = *src;
+                }
+                *dest++ = *src++;
+                continue;
+            }
+
+            /* check for cast operator */
+            if (*src == ':' && (*(src-1) == ':' || *(src+1) == ':')) {
+                *dest++ = *src++;
+                continue;
+            }
+
+
+            i = 0;
+            namebuf[i++] = *src++; /* ':' */
+            namebuf[i++] = *src++; /* 'p' */
+
+            while (isDIGIT(*src) && i < (sizeof(namebuf)-1) ) {
+                namebuf[i++] = *src++;
+            }
+            if ( i == (sizeof(namebuf) - 1)) {
+                pg_error(sth, -1, "namebuf buffer overrun\n");
+                return -2;
+            }
+            namebuf[i] = '\0';
+            svp = hv_fetch(imp_sth->all_params_hv, namebuf, i, 0);
+            if (svp == NULL) {
+                pg_error(sth, -1, "parameter unknown\n");
+                return -2;
+            }
+            /* get attribute */
+            phs = (phs_t*)(void*)SvPVX(*svp);
+            /* replace undef with NULL */
+            if(!SvOK(phs->sv)) {
+                val = "NULL";
+                len = 4;
+            } else {
+                val = SvPV(phs->sv, len);
+            }
+            /* quote string attribute */
+            if(!SvNIOK(phs->sv) && SvOK(phs->sv) && pg_sql_needquote(phs->ftype)) { /* avoid quoting NULL, tpf: bind_param as numeric  */
+                *dest++ = '\''; 
+            }
+            while (len--) {
+                if (imp_dbh->pg_auto_escape) {
+                    /* if the parameter was bound as PG_BYTEA, escape nonprintables */
+                    if (phs->ftype == 17 && !isPRINT(*val)) { /* escape null character */
+                        dest+=snprintf(dest, (statement + max_len) - dest, "\\\\%03o", *((unsigned char *)val));
+			if (dest > statement + max_len) {
+			    pg_error(sth, -1, "statement buffer overrun\n");
+			    return -2;
+			}
+                        val++;
+                        continue; /* do not copy the null */
+                    }
+                    /* escape quote */
+                    if (*val == '\'') {
+                            *dest++ = '\'';
+                    }
+                    /* escape backslash */
+                    if (*val == '\\') {
+                        if (phs->ftype == 17) { /* four backslashes. really. */
+                            *dest++ = '\\'; 
+                            *dest++ = '\\'; 
+                            *dest++ = '\\'; 
+                        } else {
+                            *dest++ = '\\';
+	                }
+                    }
+                }
+                /* copy attribute to statement */
+                *dest++ = *val++;
+            }
+            /* quote string attribute */
+            if(!SvNIOK(phs->sv) && SvOK(phs->sv) && pg_sql_needquote(phs->ftype)) { /* avoid quoting NULL, tpf: bind_param as numeric  */
+                *dest++ = '\''; 
+            }
+        }
+        *dest = '\0';
+    }
+
+    if (dbis->debug >= 2) { PerlIO_printf(DBILOGFP, "dbd_st_execute: statement = >%s<\n", statement); }
+
+    /* clear old result (if any) */
+    if (imp_sth->result) {
+        PQclear(imp_sth->result);
+    }
+
+    /* execute statement */
+    imp_sth->result = PQexec(imp_dbh->conn, statement);
+
+    /* free statement string in case of input parameters */
+    if ((int)DBIc_NUM_PARAMS(imp_sth) > 0) {
+        Safefree(statement);
+    }
+
+    /* check status */
+    status    = imp_sth->result ? PQresultStatus(imp_sth->result)      : -1;
+    cmdStatus = imp_sth->result ? (char *)PQcmdStatus(imp_sth->result) : "";
+    cmdTuples = imp_sth->result ? (char *)PQcmdTuples(imp_sth->result) : "";
+
+    if (PGRES_TUPLES_OK == status) {
+        /* select statement */
+        num_fields = PQnfields(imp_sth->result);
+        imp_sth->cur_tuple = 0;
+        DBIc_NUM_FIELDS(imp_sth) = num_fields;
+        DBIc_ACTIVE_on(imp_sth);
+        ret = PQntuples(imp_sth->result);
+    } else if (PGRES_COMMAND_OK == status) {
+        /* non-select statement */
+        if (! strncmp(cmdStatus, "DELETE", 6) || ! strncmp(cmdStatus, "INSERT", 6) || ! strncmp(cmdStatus, "UPDATE", 6)) {
+            ret = atoi(cmdTuples);
+        } else {
+            ret = -1;
+        }
+    } else if (PGRES_COPY_OUT == status || PGRES_COPY_IN == status) {
+      /* Copy Out/In data transfer in progress */
+        ret = -1;
+    } else {
+        pg_error(sth, status, PQerrorMessage(imp_dbh->conn));
+        ret = -2;
+    }
+
+    /* store the number of affected rows */
+    imp_sth->rows = ret;
+
+    return ret;
+}
+
+
+int
+is_high_bit_set(val)
+    char *val;
+{
+    while (*val++)
+	if (*val & 0x80) return 1;
+    return 0;
+}
+
+AV *
+dbd_st_fetch (sth, imp_sth)
+    SV *sth;
+    imp_sth_t *imp_sth;
+{
+    D_imp_dbh_from_sth;
+    int num_fields;
+    int i;
+    AV *av;
+
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_st_fetch\n"); }
+
+    /* Check that execute() was executed sucessfully */
+    if ( !DBIc_ACTIVE(imp_sth) ) {
+        pg_error(sth, 1, "no statement executing\n");
+        
+        return Nullav;
+    }
+
+    if ( imp_sth->cur_tuple == PQntuples(imp_sth->result) ) {
+        imp_sth->cur_tuple = 0;
+        DBIc_ACTIVE_off(imp_sth);
+        return Nullav; /* we reached the last tuple */
+    }
+
+    av = DBIS->get_fbav(imp_sth);
+    num_fields = AvFILL(av)+1;
+
+    for(i = 0; i < num_fields; ++i) {
+
+        SV *sv  = AvARRAY(av)[i];
+        if (PQgetisnull(imp_sth->result, imp_sth->cur_tuple, i)) {
+            sv_setsv(sv, &sv_undef);
+        } else {
+            char *val   = (char*)PQgetvalue(imp_sth->result, imp_sth->cur_tuple, i);
+            int val_len = strlen(val);
+            int  type   = PQftype(imp_sth->result, i); /* hopefully these hard coded values will not change */
+            if (16 == type && ! imp_dbh->pg_bool_tf) {
+               *val = (*val == 'f') ? '0' : '1'; /* bool: translate postgres into perl */
+            }
+            if (17 == type) {  /* decode \001 -> chr(1), etc, in-place */
+                char *p = val; /* points to next available pos */
+                char *s = val; /* points to current scanning pos */
+                int c1,c2,c3;
+                while (*s) {
+                    if (*s == '\\') {
+                        if (*(s+1) == '\\') { /* double backslash */ 
+                            *p++ = '\\';
+                            s += 2;
+                            continue;
+                        }
+                        else if ( isdigit(c1=(*(s+1))) &&
+		                  isdigit(c2=(*(s+2))) &&
+		                  isdigit(c3=(*(s+3))) ) {
+                            *p++ = (c1 - '0') * 64 + (c2 - '0') * 8 + (c3 - '0');
+                            s += 4;
+                            continue;
+                        }
+                    }
+                    *p++ = *s++;
+                }
+                val_len = (p - val);
+            }
+            else if (1042 == type && DBIc_has(imp_sth,DBIcf_ChopBlanks)) {
+                char *str = val;
+                while((val_len > 0) && (str[val_len-1] == ' ')) {
+                    val_len--;
+                }
+                val[val_len] = '\0';
+            }
+            sv_setpvn(sv, val, val_len);
+#ifdef SvUTF8_off
+	    if (imp_dbh->pg_enable_utf8) {
+		SvUTF8_off(sv);
+		/* XXX Is this all the character data types? */
+		if (18 == type || 25 == type || 1042 ==type || 1043 == type) {
+		    if (is_high_bit_set(val) && is_utf8_string(val, val_len))
+			SvUTF8_on(sv);
+		}
+	    }
+#endif
+        }
+    }
+
+    imp_sth->cur_tuple += 1;
+
+    return av;
+}
+
+
+int
+dbd_st_blob_read (sth, imp_sth, lobjId, offset, len, destrv, destoffset)
+    SV *sth;
+    imp_sth_t *imp_sth;
+    int lobjId;
+    long offset;
+    long len;
+    SV *destrv;
+    long destoffset;
+{
+    D_imp_dbh_from_sth;
+    int ret, lobj_fd, nbytes, nread;
+    PGresult* result;
+    ExecStatusType status;
+    SV *bufsv;
+    char *tmp;
+
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_st_blob_read\n"); }
+    /* safety check */
+    if (lobjId <= 0) {
+        pg_error(sth, -1, "dbd_st_blob_read: lobjId <= 0");
+        return 0;
+    }
+    if (offset < 0) {
+        pg_error(sth, -1, "dbd_st_blob_read: offset < 0");
+        return 0;
+    }
+    if (len < 0) {
+        pg_error(sth, -1, "dbd_st_blob_read: len < 0");
+        return 0;
+    }
+    if (! SvROK(destrv)) {
+        pg_error(sth, -1, "dbd_st_blob_read: destrv not a reference");
+        return 0;
+    }
+    if (destoffset < 0) {
+        pg_error(sth, -1, "dbd_st_blob_read: destoffset < 0");
+        return 0;
+    }
+
+    /* dereference destination and ensure it's writable string */
+    bufsv = SvRV(destrv);
+    if (! destoffset) {
+        sv_setpvn(bufsv, "", 0);
+    }
+
+    /* execute begin
+    result = PQexec(imp_dbh->conn, "begin");
+    status = result ? PQresultStatus(result) : -1;
+    PQclear(result);
+    if (status != PGRES_COMMAND_OK) {
+        pg_error(sth, status, PQerrorMessage(imp_dbh->conn));
+        return 0;
+    }
+    */
+
+    /* open large object */
+    lobj_fd = lo_open(imp_dbh->conn, lobjId, INV_READ);
+    if (lobj_fd < 0) {
+        pg_error(sth, -1, PQerrorMessage(imp_dbh->conn));
+        return 0;
+    }
+
+    /* seek on large object */
+    if (offset > 0) {
+        ret = lo_lseek(imp_dbh->conn, lobj_fd, offset, SEEK_SET);
+        if (ret < 0) {
+            pg_error(sth, -1, PQerrorMessage(imp_dbh->conn));
+            return 0;
+        }
+    }
+
+    /* read from large object */
+    nread = 0;
+    SvGROW(bufsv, destoffset + nread + BUFSIZ + 1);
+    tmp = (SvPVX(bufsv)) + destoffset + nread;
+    while ((nbytes = lo_read(imp_dbh->conn, lobj_fd, tmp, BUFSIZ)) > 0) {
+        nread += nbytes;
+        /* break if user wants only a specified chunk */
+        if (len > 0 && nread > len) {
+            nread = len;
+            break;
+        }
+        SvGROW(bufsv, destoffset + nread + BUFSIZ + 1);
+        tmp = (SvPVX(bufsv)) + destoffset + nread;
+    }
+
+    /* terminate string */
+    SvCUR_set(bufsv, destoffset + nread);
+    *SvEND(bufsv) = '\0';
+
+    /* close large object */
+    ret = lo_close(imp_dbh->conn, lobj_fd);
+    if (ret < 0) {
+        pg_error(sth, -1, PQerrorMessage(imp_dbh->conn));
+        return 0;
+    }
+
+    /* execute end 
+    result = PQexec(imp_dbh->conn, "end");
+    status = result ? PQresultStatus(result) : -1;
+    PQclear(result);
+    if (status != PGRES_COMMAND_OK) {
+        pg_error(sth, status, PQerrorMessage(imp_dbh->conn));
+        return 0;
+    }
+    */
+
+    return nread;
+}
+
+
+int
+dbd_st_rows (sth, imp_sth)
+    SV *sth;
+    imp_sth_t *imp_sth;
+{
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_st_rows\n"); }
+
+    return imp_sth->rows;
+}
+
+
+int
+dbd_st_finish (sth, imp_sth)
+    SV *sth;
+    imp_sth_t *imp_sth;
+{
+    dTHR;
+
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_st_finish\n"); }
+
+    if (DBIc_ACTIVE(imp_sth) && imp_sth->result) {
+        PQclear(imp_sth->result);
+        imp_sth->result = 0;
+        imp_sth->rows   = 0;
+    }
+
+    DBIc_ACTIVE_off(imp_sth);
+    return 1;
+}
+
+
+void
+dbd_st_destroy (sth, imp_sth)
+    SV *sth;
+    imp_sth_t *imp_sth;
+{
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_st_destroy\n"); }
+
+    /* Free off contents of imp_sth */
+
+    Safefree(imp_sth->statement);
+    if (imp_sth->result) {
+        PQclear(imp_sth->result);
+        imp_sth->result = 0;
+    }
+
+    if (imp_sth->out_params_av)
+        sv_free((SV*)imp_sth->out_params_av);
+
+    if (imp_sth->all_params_hv) {
+        HV *hv = imp_sth->all_params_hv;
+        SV *sv;
+        char *key;
+        I32 retlen;
+        hv_iterinit(hv);
+        while( (sv = hv_iternextsv(hv, &key, &retlen)) != NULL ) {
+            if (sv != &sv_undef) {
+                phs_t *phs_tpl = (phs_t*)(void*)SvPVX(sv);
+                sv_free(phs_tpl->sv);
+            }
+        }
+        sv_free((SV*)imp_sth->all_params_hv);
+    }
+
+    DBIc_IMPSET_off(imp_sth); /* let DBI know we've done it */
+}
+
+
+int
+dbd_st_STORE_attrib (sth, imp_sth, keysv, valuesv)
+    SV *sth;
+    imp_sth_t *imp_sth;
+    SV *keysv;
+    SV *valuesv;
+{
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_st_STORE\n"); }
+
+    return FALSE;
+}
+
+
+SV *
+dbd_st_FETCH_attrib (sth, imp_sth, keysv)
+    SV *sth;
+    imp_sth_t *imp_sth;
+    SV *keysv;
+{
+    STRLEN kl;
+    char *key = SvPV(keysv,kl);
+    int i, sz;
+    SV *retsv = Nullsv;
+
+    if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_st_FETCH\n"); }
+
+    if (! imp_sth->result) {
+        return Nullsv;
+    }
+
+    i = DBIc_NUM_FIELDS(imp_sth);
+
+    if (kl == 4 && strEQ(key, "NAME")) {
+        AV *av = newAV();
+        retsv = newRV(sv_2mortal((SV*)av));
+        while(--i >= 0) {
+            av_store(av, i, newSVpv(PQfname(imp_sth->result, i),0));
+        }
+    } else if ( kl== 4 && strEQ(key, "TYPE")) {
+		/* Need to convert the Pg type to ANSI/SQL type. */
+        AV *av = newAV();
+        retsv = newRV(sv_2mortal((SV*)av));
+        while(--i >= 0) {
+            av_store(av, i, newSViv(sql_pg_type( imp_sth,
+        						PQfname(imp_sth->result, i),
+								PQftype(imp_sth->result, i))));
+		}
+    } else if (kl==9 && strEQ(key, "PRECISION")) {
+        AV *av = newAV();
+        retsv = newRV(sv_2mortal((SV*)av));
+        while(--i >= 0) {
+            sz = PQfsize(imp_sth->result, i);
+            av_store(av, i, sz > 0 ? newSViv(sz) : &sv_undef);
+        }
+    } else if (kl==5 && strEQ(key, "SCALE")) {
+        AV *av = newAV();
+        retsv = newRV(sv_2mortal((SV*)av));
+        while(--i >= 0) {
+            av_store(av, i, &sv_undef);
+        }
+    } else if (kl==8 && strEQ(key, "NULLABLE")) {
+        AV *av = newAV();
+        retsv = newRV(sv_2mortal((SV*)av));
+        while(--i >= 0) {
+            av_store(av, i, newSViv(2));
+        }
+    } else if (kl==10 && strEQ(key, "CursorName")) {
+        retsv = &sv_undef;
+    } else if (kl==11 && strEQ(key, "RowsInCache")) {
+        retsv = &sv_undef;
+    } else if (kl==7 && strEQ(key, "pg_size")) {
+        AV *av = newAV();
+        retsv = newRV(sv_2mortal((SV*)av));
+        while(--i >= 0) {
+            av_store(av, i, newSViv(PQfsize(imp_sth->result, i)));
+        }
+    } else if (kl==7 && strEQ(key, "pg_type")) {
+        AV *av = newAV();
+        char *type_nam;
+        retsv = newRV(sv_2mortal((SV*)av));
+        while(--i >= 0) {
+            switch (PQftype(imp_sth->result, i)) {
+            case 16:
+                type_nam = "bool";
+                break;
+            case 17:
+                type_nam = "bytea";
+                break;
+            case 18:
+                type_nam = "char";
+                break;
+            case 19:
+                type_nam = "name";
+                break;
+            case 20:
+                type_nam = "int8";
+                break;
+            case 21:
+                type_nam = "int2";
+                break;
+            case 22:
+                type_nam = "int28";
+                break;
+            case 23:
+                type_nam = "int4";
+                break;
+            case 24:
+                type_nam = "regproc";
+                break;
+            case 25:
+                type_nam = "text";
+                break;
+            case 26:
+                type_nam = "oid";
+                break;
+            case 27:
+                type_nam = "tid";
+                break;
+            case 28:
+                type_nam = "xid";
+                break;
+            case 29:
+                type_nam = "cid";
+                break;
+            case 30:
+                type_nam = "oid8";
+                break;
+            case 32:
+                type_nam = "SET";
+                break;
+            case 210:
+                type_nam = "smgr";
+                break;
+            case 600:
+                type_nam = "point";
+                break;
+            case 601:
+                type_nam = "lseg";
+                break;
+            case 602:
+                type_nam = "path";
+                break;
+            case 603:
+                type_nam = "box";
+                break;
+            case 604:
+                type_nam = "polygon";
+                break;
+            case 605:
+                type_nam = "filename";
+                break;
+            case 628:
+                type_nam = "line";
+                break;
+            case 629:
+                type_nam = "_line";
+                break;
+            case 700:
+                type_nam = "float4";
+                break;
+            case 701:
+                type_nam = "float8";
+                break;
+            case 702:
+                type_nam = "abstime";
+                break;
+            case 703:
+                type_nam = "reltime";
+                break;
+            case 704:
+                type_nam = "tinterval";
+                break;
+            case 705:
+                type_nam = "unknown";
+                break;
+            case 718:
+                type_nam = "circle";
+                break;
+            case 719:
+                type_nam = "_circle";
+                break;
+            case 790:
+                type_nam = "money";
+                break;
+            case 791:
+                type_nam = "_money";
+                break;
+            case 810:
+                type_nam = "oidint2";
+                break;
+            case 910:
+                type_nam = "oidint4";
+                break;
+            case 911:
+                type_nam = "oidname";
+                break;
+            case 1000:
+                type_nam = "_bool";
+                break;
+            case 1001:
+                type_nam = "_bytea";
+                break;
+            case 1002:
+                type_nam = "_char";
+                break;
+            case 1003:
+                type_nam = "_name";
+                break;
+            case 1005:
+                type_nam = "_int2";
+                break;
+            case 1006:
+                type_nam = "_int28";
+                break;
+            case 1007:
+                type_nam = "_int4";
+                break;
+            case 1008:
+                type_nam = "_regproc";
+                break;
+            case 1009:
+                type_nam = "_text";
+                break;
+            case 1028:
+                type_nam = "_oid";
+                break;
+            case 1010:
+                type_nam = "_tid";
+                break;
+            case 1011:
+                type_nam = "_xid";
+                break;
+            case 1012:
+                type_nam = "_cid";
+                break;
+            case 1013:
+                type_nam = "_oid8";
+                break;
+            case 1014:
+                type_nam = "_lock";
+                break;
+            case 1015:
+                type_nam = "_stub";
+                break;
+            case 1016:
+                type_nam = "_ref";
+                break;
+            case 1017:
+                type_nam = "_point";
+                break;
+            case 1018:
+                type_nam = "_lseg";
+                break;
+            case 1019:
+                type_nam = "_path";
+                break;
+            case 1020:
+                type_nam = "_box";
+                break;
+            case 1021:
+                type_nam = "_float4";
+                break;
+            case 1022:
+                type_nam = "_float8";
+                break;
+            case 1023:
+                type_nam = "_abstime";
+                break;
+            case 1024:
+                type_nam = "_reltime";
+                break;
+            case 1025:
+                type_nam = "_tinterval";
+                break;
+            case 1026:
+                type_nam = "_filename";
+                break;
+            case 1027:
+                type_nam = "_polygon";
+                break;
+            case 1033:
+                type_nam = "aclitem";
+                break;
+            case 1034:
+                type_nam = "_aclitem";
+                break;
+            case 1042:
+                type_nam = "bpchar";
+                break;
+            case 1043:
+                type_nam = "varchar";
+                break;
+            case 1082:
+                type_nam = "date";
+                break;
+            case 1083:
+                type_nam = "time";
+                break;
+            case 1182:
+                type_nam = "_date";
+                break;
+            case 1183:
+                type_nam = "_time";
+                break;
+            case 1184:
+                type_nam = "datetime";
+                break;
+            case 1185:
+                type_nam = "_datetime";
+                break;
+            case 1186:
+                type_nam = "timespan";
+                break;
+            case 1187:
+                type_nam = "_timespan";
+                break;
+            case 1231:
+                type_nam = "_numeric";
+                break;
+            case 1296:
+                type_nam = "timestamp";
+                break;
+            case 1700:
+                type_nam = "numeric";
+                break;
+                
+            default:
+                type_nam = "unknown";
+                
+            }
+            av_store(av, i, newSVpv(type_nam, 0));
+        }
+    } else if (kl==13 && strEQ(key, "pg_oid_status")) {
+        retsv = newSVpv((char *)PQoidStatus(imp_sth->result), 0);
+    } else if (kl==13 && strEQ(key, "pg_cmd_status")) {
+        retsv = newSVpv((char *)PQcmdStatus(imp_sth->result), 0);
+    } else {
+        return Nullsv;
+    }
+
+    return sv_2mortal(retsv);
+}
+
+
+/* end of dbdimp.c */
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/dbdimp.h b/install/5.005/DBD-Pg-1.22-fixvercmp/dbdimp.h
new file mode 100644
index 000000000..58c105bfc
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/dbdimp.h
@@ -0,0 +1,81 @@
+/*
+   $Id: dbdimp.h,v 1.1 2004-04-29 09:21:28 ivan Exp $
+
+   Copyright (c) 1997,1998,1999,2000 Edmund Mergl
+   Portions Copyright (c) 1994,1995,1996,1997 Tim Bunce
+
+   You may distribute under the terms of either the GNU General Public
+   License or the Artistic License, as specified in the Perl README file.
+*/
+
+#ifdef WIN32
+#define snprintf _snprintf
+#endif
+
+/* Define drh implementor data structure */
+struct imp_drh_st {
+    dbih_drc_t com;		/* MUST be first element in structure	*/
+};
+
+/* Define dbh implementor data structure */
+struct imp_dbh_st {
+    dbih_dbc_t com;		/* MUST be first element in structure	*/
+
+    PGconn    * conn;		/* connection structure */
+    int         init_commit;	/* initialize AutoCommit */
+    int         pg_auto_escape;	/* initialize AutoEscape */
+    int         pg_bool_tf;     /* do bools return 't'/'f' */
+#ifdef SvUTF8_off
+    int         pg_enable_utf8;	/* should we attempt to make utf8 strings? */
+#endif
+};
+
+/* Define sth implementor data structure */
+struct imp_sth_st {
+    dbih_stc_t com;		/* MUST be first element in structure	*/
+
+    PGresult* result;		/* result structure */
+    int cur_tuple;		/* current tuple */
+    int rows;			/* number of affected rows */
+
+    /* Input Details	*/
+    char      *statement;	/* sql (see sth_scan)		*/
+    HV        *all_params_hv;	/* all params, keyed by name	*/
+    AV        *out_params_av;	/* quick access to inout params	*/
+    int        pg_pad_empty;	/* convert ""->" " when binding	*/
+    int        all_params_len;  /* length-sum of all params     */
+
+    /* (In/)Out Parameter Details */
+    bool  has_inout_params;
+};
+
+
+#define sword  signed int
+#define sb2    signed short
+#define ub2    unsigned short
+
+typedef struct phs_st phs_t;    /* scalar placeholder   */
+
+struct phs_st {  	/* scalar placeholder EXPERIMENTAL	*/
+    sword ftype;        /* external OCI field type		*/
+
+    SV	*sv;		/* the scalar holding the value		*/
+    int sv_type;	/* original sv type at time of bind	*/
+    bool is_inout;
+
+    IV  maxlen;		/* max possible len (=allocated buffer)	*/
+
+    /* these will become an array */
+    sb2 indp;		/* null indicator			*/
+    char *progv;
+    ub2 arcode;
+    IV alen;		/* effective length ( <= maxlen )	*/
+
+    int alen_incnull;	/* 0 or 1 if alen should include null	*/
+    char name[1];	/* struct is malloc'd bigger as needed	*/
+};
+
+
+SV * dbd_db_pg_notifies (SV *dbh, imp_dbh_t *imp_dbh);
+
+/* end of dbdimp.h */
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/eg/ApacheDBI.pl b/install/5.005/DBD-Pg-1.22-fixvercmp/eg/ApacheDBI.pl
new file mode 100755
index 000000000..b084f70f5
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/eg/ApacheDBI.pl
@@ -0,0 +1,70 @@
+#!/usr/local/bin/perl
+
+# $Id: ApacheDBI.pl,v 1.1 2004-04-29 09:21:28 ivan Exp $
+
+# don't forget to create in postgres the user who is running 
+# the httpd, eg 'createuser nobody' !
+#
+# demo script, tested with:
+#  - PostgreSQL-7.1.1
+#  - apache_1.3.12
+#  - mod_perl-1.23
+#  - perl5.6.0
+#  - DBI-1.14
+
+use CGI;
+use DBI;
+use strict;
+
+my $query = new CGI;
+
+print  $query->header,
+       $query->start_html(-title=>'A Simple Example'),
+       $query->startform,
+       "<CENTER><H3>Testing Module DBI</H3></CENTER>",
+       "<P><CENTER><TABLE CELLPADDING=4 CELLSPACING=2 BORDER=1>",
+       "<TR><TD>Enter the data source: </TD>",
+           "<TD>", $query->textfield(-name=>'data_source', -size=>40, -default=>'dbi:Pg:dbname=template1'), "</TD>",
+       "</TR>",
+       "<TR><TD>Enter the user name: </TD>",
+           "<TD>", $query->textfield(-name=>'username'), "</TD>",
+       "</TR>",
+       "<TR><TD>Enter the password: </TD>",
+           "<TD>", $query->textfield(-name=>'auth'), "</TD>",
+       "</TR>",
+       "<TR><TD>Enter the select command: </TD>",
+           "<TD>", $query->textfield(-name=>'cmd', -size=>40), "</TD>",
+       "</TR>",
+       "</TABLE></CENTER><P>",
+       "<CENTER>", $query->submit(-value=>'Submit'), "</CENTER>",
+       $query->endform;
+
+if ($query->param) {
+
+    my $data_source = $query->param('data_source');
+    my $username    = $query->param('username');
+    my $auth        = $query->param('auth');
+    my $cmd         = $query->param('cmd');
+    my $dbh         = DBI->connect($data_source, $username, $auth);
+    if ($dbh) {
+        my $sth = $dbh->prepare($cmd);
+        my $ret = $sth->execute;
+        if ($ret) {
+            my($i, $ary_ref);
+            print "<P><CENTER><TABLE CELLPADDING=4 CELLSPACING=2 BORDER=1>\n";
+            while ($ary_ref = $sth->fetchrow_arrayref) {
+                print "<TR><TD>", join("</TD><TD>", @$ary_ref), "</TD></TR>\n";
+            }
+            print "</TABLE></CENTER><P>\n";
+            $sth->finish;
+        } else {
+            print "<CENTER><H2>", $DBI::errstr, "</H2></CENTER>\n";
+        }
+        $dbh->disconnect;
+    } else {
+        print "<CENTER><H2>", $DBI::errstr, "</H2></CENTER>\n";
+    }
+}
+
+print $query->end_html;
+
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/eg/lotest.pl b/install/5.005/DBD-Pg-1.22-fixvercmp/eg/lotest.pl
new file mode 100644
index 000000000..6192c4926
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/eg/lotest.pl
@@ -0,0 +1,74 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+use DBI;
+use DBD::Pg;
+
+my $dsn = "dbname=p1";
+my $dbh = DBI->connect('dbi:Pg:dbname=p1', undef, undef, { AutoCommit => 1 });
+
+my $buf = 'abcdefghijklmnopqrstuvwxyz' x 400;
+
+my $id = write_blob($dbh, undef, $buf);
+
+my $dat = read_blob($dbh, $id);
+
+print "Done\n";
+
+sub write_blob {
+    my ($dbh, $lobj_id, $data) = @_;
+    
+    # begin transaction
+    $dbh->{AutoCommit} = 0;
+    
+    # Create a new lo if we are not passed an lo object ID.
+    unless ($lobj_id) {
+	# Create the object.
+	$lobj_id = $dbh->func($dbh->{'pg_INV_WRITE'}, 'lo_creat');
+    }    
+
+    # Open it to get a file descriptor.
+    my $lobj_fd = $dbh->func($lobj_id, $dbh->{'pg_INV_WRITE'}, 'lo_open');
+
+    $dbh->func($lobj_fd, 0, 0, 'lo_lseek');
+    
+    # Write some data to it.
+    my $len = $dbh->func($lobj_fd, $data, length($data), 'lo_write');
+    
+    die "Errors writing lo\n" if $len != length($data);
+
+    # Close 'er up.
+    $dbh->func($lobj_fd, 'lo_close') or die "Problems closing lo object\n";
+ 
+    # end transaction
+    $dbh->{AutoCommit} = 1;
+    
+    return $lobj_id;
+}
+
+sub read_blob {
+    my ($dbh, $lobj_id) = @_;
+    my $data = '';
+    my $read_len = 256;
+    my $chunk = '';
+
+    # begin transaction
+    $dbh->{AutoCommit} = 0;
+
+    my $lobj_fd = $dbh->func($lobj_id, $dbh->{'pg_INV_READ'}, 'lo_open');
+    
+    $dbh->func($lobj_fd, 0, 0, 'lo_lseek');
+
+    # Pull out all the data.
+    while ($dbh->func($lobj_fd, $chunk, $read_len, 'lo_read')) {
+	$data .= $chunk;
+    }
+
+    $dbh->func($lobj_fd, 'lo_close') or die "Problems closing lo object\n";
+
+    # end transaction
+    $dbh->{AutoCommit} = 1;
+       
+    return $data;
+}
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/eg/notify_test.patch b/install/5.005/DBD-Pg-1.22-fixvercmp/eg/notify_test.patch
new file mode 100644
index 000000000..6f8acf800
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/eg/notify_test.patch
@@ -0,0 +1,82 @@
+diff -r --unified DBD-Pg-1.00/test.pl DBD-Pg-1.00.alex/test.pl
+--- DBD-Pg-1.00/test.pl	Sun May 27 10:10:13 2001
++++ DBD-Pg-1.00.alex/test.pl	Sun Jun 10 15:38:09 2001
+@@ -40,7 +40,7 @@
+ my $dsn_main = "dbi:Pg:dbname=$dbmain";
+ my $dsn_test = "dbi:Pg:dbname=$dbtest";
+ 
+-my ($dbh0, $dbh, $sth);
++my ($dbh0, $dbh, $dbh1, $sth);
+ 
+ #DBI->trace(3); # make your choice
+ 
+@@ -445,16 +445,56 @@
+ # end transaction
+ $dbh->{AutoCommit} = 1;
+ 
++# compare large objects
++
+ ( $dbh->func($lobjId, 'lo_unlink') )
+     and print "\$dbh->func(lo_unlink) ...... ok\n"
+     or  print "\$dbh->func(lo_unlink) ...... not ok\n";
+ 
+-# compare large objects
+-
+ ( $pgin cmp $buf and $pgin cmp $blob )
+     and print "compare blobs .............. not ok\n"
+     or  print "compare blobs .............. ok\n";
+ 
++my $fd;
++( $fd=$dbh->func( 'getfd') )
++    and print "\$dbh->func(getfd) .......... ok\n"
++    or  print "\$dbh->func(getfd) .......... not ok\n";
++
++( $dbh->do( 'LISTEN test ') )
++    and print "\$dbh->do('LISTEN test') .... ok\n"
++    or  print "\$dbh->do('LISTEN test') .... not ok\n";
++
++( $dbh1 = DBI->connect("$dsn_test", '', '', { AutoCommit => 1 }) )
++    and print "DBI->connect (for notify)... ok\n"
++    or  die   "DBI->connect (for notify)... not ok: ", $DBI::errstr;
++
++# there should be no data for read on $fd , until we send a notify
++   
++    my $rout;
++    my $rin = '';
++    vec($rin,$fd,1) = 1;
++    my $nfound = select( $rout=$rin, undef, undef, 0);
++
++( $nfound==0 ) 
++    and print "select(\$fd) returns no data. ok\n"
++    or  die   "select(\$fd) returns no data. not ok\n";
++
++( $dbh1->do( 'NOTIFY test ') )
++    and print "\$dbh1->do('NOTIFY test') ... ok\n"
++    or  print "\$dbh1->do('NOTIFY test') ... not ok\n";
++
++    my $nfound = select( $rout=$rin, undef, undef, 1);
++
++( $nfound==1 ) 
++    and print "select(\$fd) returns data.... ok\n"
++    or  die   "select(\$fd) returns data.... not ok\n";
++
++my $notify_r;
++
++( $notify_r = $dbh->func('notifies') ) 
++    and print "\$dbh->func('notifies')...... ok\n"
++    or  die   "\$dbh->func('notifies')...... not ok\n";
++
+ ######################### disconnect and drop test database
+ 
+ # disconnect
+@@ -462,6 +502,10 @@
+ ( $dbh->disconnect )
+     and print "\$dbh->disconnect ........... ok\n"
+     or  die   "\$dbh->disconnect ........... not ok: ", $DBI::errstr;
++
++( $dbh1->disconnect )
++    and print "\$dbh1->disconnect .......... ok\n"
++    or  die   "\$dbh1->disconnect .......... not ok: ", $DBI::errstr;
+ 
+ $dbh0->do("DROP DATABASE $dbtest");
+ $dbh0->disconnect;
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/00basic.t b/install/5.005/DBD-Pg-1.22-fixvercmp/t/00basic.t
new file mode 100644
index 000000000..1c0cb2862
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/00basic.t
@@ -0,0 +1,10 @@
+print "1..1\n";
+
+use DBI;
+use DBD::Pg;
+
+if ($DBD::Pg::VERSION) {
+    print "ok 1\n";
+} else {
+    print "not ok 1\n";
+}
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/01connect.t b/install/5.005/DBD-Pg-1.22-fixvercmp/t/01connect.t
new file mode 100644
index 000000000..be17b5087
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/01connect.t
@@ -0,0 +1,26 @@
+use strict;
+use DBI;
+use Test::More;
+
+if (defined $ENV{DBI_DSN}) {
+  plan tests => 2;
+} else {
+  plan skip_all => 'cannot test without DB info';
+}
+
+my $dbh = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+		       {RaiseError => 1, AutoCommit => 0}
+		      );
+
+ok((defined $dbh and $dbh->disconnect()),
+   'connect with transaction'
+  );
+
+undef $dbh;
+$dbh = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+		    {RaiseError => 1, AutoCommit => 1});
+
+ok((defined $dbh and $dbh->disconnect()),
+   'connect without transaction'
+  );
+
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/01constants.t b/install/5.005/DBD-Pg-1.22-fixvercmp/t/01constants.t
new file mode 100644
index 000000000..09907e9d4
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/01constants.t
@@ -0,0 +1,25 @@
+use strict;
+use Test::More tests => 20;
+
+use DBD::Pg qw(:pg_types);
+
+ok(PG_BOOL      == 16,   'PG_BOOL');
+ok(PG_BYTEA     == 17,   'PG_BYTEA');
+ok(PG_CHAR      == 18,   'PG_CHAR');
+ok(PG_INT8      == 20,   'PG_INT8');
+ok(PG_INT2      == 21,   'PG_INT2');
+ok(PG_INT4      == 23,   'PG_INT4');
+ok(PG_TEXT      == 25,   'PG_TEXT');
+ok(PG_OID       == 26,   'PG_OID');
+ok(PG_FLOAT4    == 700,  'PG_FLOAT4');
+ok(PG_FLOAT8    == 701,  'PG_FLOAT8');
+ok(PG_ABSTIME   == 702,  'PG_ABSTIME');
+ok(PG_RELTIME   == 703,  'PG_RELTIME');
+ok(PG_TINTERVAL == 704,  'PG_TINTERVAL');
+ok(PG_BPCHAR    == 1042, 'PG_BPCHAR');
+ok(PG_VARCHAR   == 1043, 'PG_VARCHAR');
+ok(PG_DATE      == 1082, 'PG_DATE');
+ok(PG_TIME      == 1083, 'PG_TIME');
+ok(PG_DATETIME  == 1184, 'PG_DATETIME');
+ok(PG_TIMESPAN  == 1186, 'PG_TIMESPAN');
+ok(PG_TIMESTAMP == 1296, 'PG_TIMESTAMP');
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/01setup.t b/install/5.005/DBD-Pg-1.22-fixvercmp/t/01setup.t
new file mode 100644
index 000000000..d0b57a345
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/01setup.t
@@ -0,0 +1,38 @@
+use strict;
+use DBI;
+use Test::More;
+
+if (defined $ENV{DBI_DSN}) {
+  plan tests => 3;
+} else {
+  plan skip_all => 'cannot test without DB info';
+}
+
+my $dbh = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+		    {RaiseError => 1, AutoCommit => 1});
+ok(defined $dbh,'connect without transaction');
+{
+  local $dbh->{PrintError} = 0;
+  local $dbh->{RaiseError} = 0;
+  $dbh->do(q{DROP TABLE test});
+}
+
+my $sql = <<SQL;
+CREATE TABLE test (
+  id int,
+  name text,
+  val text,
+  score float,
+  date timestamp default 'now()',
+  array text[][]
+)
+SQL
+
+ok($dbh->do($sql),
+   'create table'
+  );
+
+ok($dbh->disconnect(),
+   'disconnect'
+  );
+
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/02prepare.t b/install/5.005/DBD-Pg-1.22-fixvercmp/t/02prepare.t
new file mode 100644
index 000000000..373aca27d
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/02prepare.t
@@ -0,0 +1,84 @@
+use strict;
+use DBI;
+use Test::More;
+
+if (defined $ENV{DBI_DSN}) {
+  plan tests => 8;
+} else {
+  plan skip_all => 'cannot test without DB info';
+}
+
+my $dbh = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+		       {RaiseError => 1, AutoCommit => 0}
+		      );
+ok(defined $dbh,
+   'connect with transaction'
+  );
+
+my $sql = <<SQL;
+        SELECT *
+          FROM test
+SQL
+
+ok($dbh->prepare($sql),
+   "prepare: $sql"
+  );
+
+$sql = <<SQL;
+        SELECT id
+          FROM test
+SQL
+
+ok($dbh->prepare($sql),
+   "prepare: $sql"
+  );
+
+$sql = <<SQL;
+        SELECT id
+             , name
+          FROM test
+SQL
+
+ok($dbh->prepare($sql),
+   "prepare: $sql"
+  );
+
+$sql = <<SQL;
+        SELECT id
+             , name
+          FROM test
+         WHERE id = 1
+SQL
+
+ok($dbh->prepare($sql),
+   "prepare: $sql"
+  );
+
+$sql = <<SQL;
+        SELECT id
+             , name
+          FROM test
+         WHERE id = ?
+SQL
+
+ok($dbh->prepare($sql),
+   "prepare: $sql"
+  );
+
+$sql = <<SQL;
+        SELECT *
+           FROM test
+         WHERE id = ?
+           AND name = ?
+           AND value = ?
+           AND score = ?
+           and data = ?
+SQL
+
+ok($dbh->prepare($sql),
+   "prepare: $sql"
+  );
+
+ok($dbh->disconnect(),
+   'disconnect'
+  );
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/03bind.t b/install/5.005/DBD-Pg-1.22-fixvercmp/t/03bind.t
new file mode 100644
index 000000000..df7c8843e
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/03bind.t
@@ -0,0 +1,85 @@
+use strict;
+use DBI;
+use Test::More;
+
+if (defined $ENV{DBI_DSN}) {
+  plan tests => 11;
+} else {
+  plan skip_all => 'cannot test without DB info';
+}
+
+my $dbh = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+		       {RaiseError => 1, AutoCommit => 0}
+		      );
+ok(defined $dbh,
+   'connect with transaction'
+  );
+
+my $sql = <<SQL;
+  SELECT id
+  , name
+  FROM test
+  WHERE id = ?
+SQL
+my $sth = $dbh->prepare($sql);
+ok(defined $sth,
+   "prepare: $sql"
+  );
+
+ok($sth->bind_param(1, 'foo'),
+   'bind int column with string'
+   );
+
+ok($sth->bind_param(1, 1),
+   'rebind int column with int'
+   );
+
+$sql = <<SQL;
+   SELECT id
+   , name
+   FROM test
+   WHERE id = ?
+   AND name = ?
+SQL
+$sth = $dbh->prepare($sql);
+ok(defined $sth,
+   "prepare: $sql"
+  );
+
+ok($sth->bind_param(1, 'foo'),
+   'bind int column with string',
+  );
+ok($sth->bind_param(2, 'bar'),
+   'bind string column with text'
+   );
+ok($sth->bind_param(2, 'baz'),
+   'rebind string column with text'
+  );
+
+ok($sth->finish(),
+   'finish'
+   );
+
+# Make sure that we get warnings when we try to use SQL_BINARY.
+{
+  local $SIG{__WARN__} =
+    sub { ok($_[0] =~ /^Use of SQL type SQL_BINARY/,
+	     'warning with SQL_BINARY'
+	    );
+	};
+
+  $sql = <<SQL;
+	 SELECT id
+	 , name
+	 FROM test
+	 WHERE id = ?
+	 AND name = ?
+SQL
+  $sth = $dbh->prepare($sql);
+
+  $sth->bind_param(1, 'foo', DBI::SQL_BINARY);
+}
+
+ok($dbh->disconnect(),
+   'disconnect'
+  );
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/04execute.t b/install/5.005/DBD-Pg-1.22-fixvercmp/t/04execute.t
new file mode 100644
index 000000000..964387802
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/04execute.t
@@ -0,0 +1,113 @@
+use strict;
+use DBI;
+use Test::More;
+
+if (defined $ENV{DBI_DSN}) {
+  plan tests => 13;
+} else {
+  plan skip_all => 'cannot test without DB info';
+}
+
+my $dbh = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+		       {RaiseError => 1, AutoCommit => 0}
+		      );
+ok(defined $dbh,
+   'connect with transaction'
+  );
+
+my $sql = <<SQL;
+  SELECT id
+  , name
+  FROM test
+  WHERE id = ?
+SQL
+my $sth = $dbh->prepare($sql);
+ok(defined $sth,
+   "prepare: $sql"
+  );
+
+$sth->bind_param(1, 1);
+ok($sth->execute(),
+   'exectute with one bind param'
+  );
+
+$sth->bind_param(1, 2);
+ok($sth->execute(),
+   'exectute with rebinding one param'
+  );
+
+$sql = <<SQL;
+       SELECT id
+       , name
+       FROM test
+       WHERE id = ?
+       AND name = ?
+SQL
+$sth = $dbh->prepare($sql);
+ok(defined $sth,
+   "prepare: $sql"
+  );
+
+$sth->bind_param(1, 2);
+$sth->bind_param(2, 'foo');
+ok($sth->execute(),
+   'exectute with two bind params'
+  );
+
+eval {
+  local $dbh->{PrintError} = 0;
+  $sth = $dbh->prepare($sql);
+  $sth->bind_param(1, 2);
+  $sth->execute();
+};
+ok(!$@,
+  'execute with only first of two params bound'
+  );
+
+eval {
+  local $dbh->{PrintError} = 0;
+  $sth = $dbh->prepare($sql);
+  $sth->bind_param(2, 'foo');
+  $sth->execute();
+};
+ok(!$@,
+  'execute with only second of two params bound'
+  );
+
+eval {
+  local $dbh->{PrintError} = 0;
+  $sth = $dbh->prepare($sql);
+  $sth->execute();
+};
+ok(!$@,
+  'execute with neither of two params bound'
+  );
+
+$sth = $dbh->prepare($sql);
+ok($sth->execute(1, 'foo'),
+   'execute with both params bound in execute'
+   );
+
+eval {
+  local $dbh->{PrintError} = 0;
+  $sth = $dbh->prepare(q{
+			 SELECT id
+			 , name
+			 FROM test
+			 WHERE id = ?
+			 AND name = ?
+			});
+  $sth->execute(1);
+};
+ok($@,
+  'execute with only one of two params bound in execute'
+  );
+
+
+ok($sth->finish(),
+   'finish'
+   );
+
+ok($dbh->disconnect(),
+   'disconnect'
+  );
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/05fetch.t b/install/5.005/DBD-Pg-1.22-fixvercmp/t/05fetch.t
new file mode 100644
index 000000000..b6f8f66d0
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/05fetch.t
@@ -0,0 +1,131 @@
+use strict;
+use DBI;
+use Test::More;
+
+if (defined $ENV{DBI_DSN}) {
+  plan tests => 10;
+} else {
+  plan skip_all => 'cannot test without DB info';
+}
+
+my $dbh = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+		       {RaiseError => 1, AutoCommit => 0}
+		      );
+ok(defined $dbh,
+   'connect with transaction'
+  );
+
+$dbh->do(q{INSERT INTO test (id, name, val) VALUES (1, 'foo', 'horse')});
+$dbh->do(q{INSERT INTO test (id, name, val) VALUES (2, 'bar', 'chicken')});
+$dbh->do(q{INSERT INTO test (id, name, val) VALUES (3, 'baz', 'pig')});
+ok($dbh->commit(),
+   'commit'
+   );
+
+my $sql = <<SQL;
+  SELECT id
+  , name
+  FROM test
+SQL
+my $sth = $dbh->prepare($sql);
+$sth->execute();
+
+my $rows = 0;
+while (my ($id, $name) = $sth->fetchrow_array()) {
+  if (defined($id) && defined($name)) {
+    $rows++;
+  }
+}
+$sth->finish();
+ok($rows == 3,
+   'fetch three rows'
+  );
+
+$sql = <<SQL;
+       SELECT id
+       , name
+       FROM test
+       WHERE 1 = 0
+SQL
+$sth = $dbh->prepare($sql);
+$sth->execute();
+
+$rows = 0;
+while (my ($id, $name) = $sth->fetchrow_array()) {
+  $rows++;
+}
+$sth->finish();
+
+ok($rows == 0,
+   'fetch zero rows'
+   );
+
+$sql = <<SQL;
+       SELECT id
+       , name
+       FROM test
+       WHERE id = ?
+SQL
+$sth = $dbh->prepare($sql);
+$sth->execute(1);
+
+$rows = 0;
+while (my ($id, $name) = $sth->fetchrow_array()) {
+  if (defined($id) && defined($name)) {
+    $rows++;
+  }
+}
+$sth->finish();
+
+ok($rows == 1,
+   'fetch one row on id'
+  );
+
+# Attempt to test whether or not we can get unicode out of the database
+# correctly.  Reuse the previous sth.
+SKIP: {
+  eval "use Encode";
+  skip "need Encode module for unicode tests", 3 if $@;
+  local $dbh->{pg_enable_utf8} = 1;
+  $dbh->do("INSERT INTO test (id, name, val) VALUES (4, '\001\000dam', 'cow')");
+  $sth->execute(4);
+  my ($id, $name) = $sth->fetchrow_array();
+  ok(Encode::is_utf8($name),
+     'returned data has utf8 bit set'
+    );
+  is(length($name), 4,
+     'returned utf8 data is not corrupted'
+    );
+  $sth->finish();
+  $sth->execute(1);
+  my ($id2, $name2) = $sth->fetchrow_array();
+  ok(! Encode::is_utf8($name2),
+     'returned ASCII data has not got utf8 bit set'
+    );
+  $sth->finish();
+}
+
+$sql = <<SQL;
+       SELECT id
+       , name
+       FROM test
+       WHERE name = ?
+SQL
+$sth = $dbh->prepare($sql);
+$sth->execute('foo');
+
+$rows = 0;
+while (my ($id, $name) = $sth->fetchrow_array()) {
+  if (defined($id) && defined($name)) {
+    $rows++;
+  }
+}
+$sth->finish();
+
+ok($rows == 1,
+   'fetch one row on name'
+   );
+
+ok($dbh->disconnect(),
+   'disconnect'
+  );
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/06disconnect.t b/install/5.005/DBD-Pg-1.22-fixvercmp/t/06disconnect.t
new file mode 100644
index 000000000..5d76bc0a8
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/06disconnect.t
@@ -0,0 +1,31 @@
+use strict;
+use DBI;
+use Test::More;
+
+if (defined $ENV{DBI_DSN}) {
+  plan tests => 3;
+} else {
+  plan skip_all => 'cannot test without DB info';
+}
+
+my $dbh = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+		       {RaiseError => 1, AutoCommit => 0}
+		      );
+ok(defined $dbh,
+   'connect with transaction'
+  );
+
+ok($dbh->disconnect(),
+   'disconnect'
+  );
+
+$dbh = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+		       {RaiseError => 1, AutoCommit => 0}
+		      );
+
+$dbh->disconnect();
+$dbh->disconnect();
+$dbh->disconnect();
+ok($dbh->disconnect(),
+   'disconnect on already disconnected dbh'
+  );
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/07reuse.t b/install/5.005/DBD-Pg-1.22-fixvercmp/t/07reuse.t
new file mode 100644
index 000000000..d09dfc010
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/07reuse.t
@@ -0,0 +1,28 @@
+use strict;
+use DBI;
+use Test::More;
+
+if (defined $ENV{DBI_DSN}) {
+  plan tests => 3;
+} else {
+  plan skip_all => 'cannot test without DB info';
+}
+
+my $dbh = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+		       {RaiseError => 1, PrintError => 0, AutoCommit => 0}
+		      );
+ok(defined $dbh,
+   'connect with transaction'
+  );
+
+my $sth = $dbh->prepare(q{SELECT * FROM test});
+ok($dbh->disconnect(),
+   'disconnect with un-finished statement'
+  );
+
+eval {
+  $sth->execute();
+};
+ok($@,
+   'execute on disconnected statement'
+  );
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/08txn.t b/install/5.005/DBD-Pg-1.22-fixvercmp/t/08txn.t
new file mode 100644
index 000000000..467aa3153
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/08txn.t
@@ -0,0 +1,102 @@
+use strict;
+use DBI;
+use Test::More;
+
+if (defined $ENV{DBI_DSN}) {
+  plan tests => 18;
+} else {
+  plan skip_all => 'cannot test without DB info';
+}
+
+my $dbh1 = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+			{RaiseError => 1, AutoCommit => 0}
+		       );
+ok(defined $dbh1,
+   'connect first dbh'
+  );
+
+my $dbh2 = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+			{RaiseError => 1, AutoCommit => 0}
+		       );
+ok(defined $dbh2,
+   'connect second dbh'
+  );
+
+$dbh1->do(q{DELETE FROM test});
+ok($dbh1->commit(),
+   'delete'
+   );
+
+my $rows = ($dbh1->selectrow_array(q{SELECT COUNT(*) FROM test}))[0];
+ok($rows == 0,
+   'fetch on empty table from dbh1'
+  );
+
+$rows = ($dbh2->selectrow_array(q{SELECT COUNT(*) FROM test}))[0];
+ok($rows == 0,
+   'fetch on empty table from dbh2'
+  );
+
+$dbh1->do(q{INSERT INTO test (id, name, val) VALUES (1, 'foo', 'horse')});
+$dbh1->do(q{INSERT INTO test (id, name, val) VALUES (2, 'bar', 'chicken')});
+$dbh1->do(q{INSERT INTO test (id, name, val) VALUES (3, 'baz', 'pig')});
+
+$rows = ($dbh1->selectrow_array(q{SELECT COUNT(*) FROM test}))[0];
+ok($rows == 3,
+   'fetch three rows on dbh1'
+  );
+
+$rows = ($dbh2->selectrow_array(q{SELECT COUNT(*) FROM test}))[0];
+ok($rows == 0,
+   'fetch on dbh2 before commit'
+  );
+
+ok($dbh1->commit(),
+   'commit work'
+  );
+
+$rows = ($dbh1->selectrow_array(q{SELECT COUNT(*) FROM test}))[0];
+ok($rows == 3,
+   'fetch on dbh1 after commit'
+  );
+
+$rows = ($dbh2->selectrow_array(q{SELECT COUNT(*) FROM test}))[0];
+ok($rows == 3,
+   'fetch on dbh2 after commit'
+  );
+
+ok($dbh1->do(q{DELETE FROM test}),
+   'delete'
+  );
+
+$rows = ($dbh1->selectrow_array(q{SELECT COUNT(*) FROM test}))[0];
+ok($rows == 0,
+   'fetch on empty table from dbh1'
+  );
+
+$rows = ($dbh2->selectrow_array(q{SELECT COUNT(*) FROM test}))[0];
+ok($rows == 3,
+   'fetch on from dbh2 without commit'
+  );
+
+ok($dbh1->rollback(),
+   'rollback'
+  );
+
+$rows = ($dbh1->selectrow_array(q{SELECT COUNT(*) FROM test}))[0];
+ok($rows == 3,
+   'fetch on from dbh1 after rollback'
+  );
+
+$rows = ($dbh2->selectrow_array(q{SELECT COUNT(*) FROM test}))[0];
+ok($rows == 3,
+   'fetch on from dbh2 after rollback'
+  );
+
+ok($dbh1->disconnect(),
+   'disconnect on dbh1'
+);
+
+ok($dbh2->disconnect(),
+   'disconnect on dbh2'
+);
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/09autocommit.t b/install/5.005/DBD-Pg-1.22-fixvercmp/t/09autocommit.t
new file mode 100644
index 000000000..9b1b69fc6
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/09autocommit.t
@@ -0,0 +1,68 @@
+use strict;
+use DBI;
+use Test::More;
+
+if (defined $ENV{DBI_DSN}) {
+  plan tests => 12;
+} else {
+  plan skip_all => 'cannot test without DB info';
+}
+
+my $dbh1 = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+			{RaiseError => 1, AutoCommit => 1}
+		       );
+ok(defined $dbh1,
+   'connect first dbh'
+  );
+
+my $dbh2 = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+			{RaiseError => 1, AutoCommit => 1}
+		       );
+ok(defined $dbh2,
+   'connect second dbh'
+  );
+
+ok($dbh1->do(q{DELETE FROM test}),
+   'delete'
+  );
+
+my $rows = ($dbh1->selectrow_array(q{SELECT COUNT(*) FROM test}))[0];
+ok($rows == 0,
+   'fetch on empty table from dbh1'
+  );
+
+$rows = ($dbh2->selectrow_array(q{SELECT COUNT(*) FROM test}))[0];
+ok($rows == 0,
+   'fetch on empty table from dbh2'
+  );
+
+ok($dbh1->do(q{INSERT INTO test (id, name, val) VALUES (1, 'foo', 'horse')}),
+   'insert'
+  );
+
+$rows = ($dbh1->selectrow_array(q{SELECT COUNT(*) FROM test}))[0];
+ok($rows == 1,
+   'fetch one row from dbh1'
+  );
+
+$rows = ($dbh2->selectrow_array(q{SELECT COUNT(*) FROM test}))[0];
+ok($rows == 1,
+   'fetch one row from dbh1'
+  );
+
+local $SIG{__WARN__} = sub {};
+ok(!$dbh1->commit(),
+   'commit'
+  );
+
+ok(!$dbh1->rollback(),
+   'rollback'
+  );
+
+ok($dbh1->disconnect(),
+   'disconnect on dbh1'
+);
+
+ok($dbh2->disconnect(),
+   'disconnect on dbh2'
+);
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/11quoting.t b/install/5.005/DBD-Pg-1.22-fixvercmp/t/11quoting.t
new file mode 100644
index 000000000..afec9632a
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/11quoting.t
@@ -0,0 +1,50 @@
+use strict;
+use DBI;
+use Test::More;
+
+if (defined $ENV{DBI_DSN}) {
+  plan tests => 8;
+} else {
+  plan skip_all => 'cannot test without DB info';
+}
+
+my $dbh = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+		       {RaiseError => 1, AutoCommit => 0}
+		      );
+ok(defined $dbh,
+   'connect with transaction'
+  );
+
+my %tests = (
+	     one=>["'", "'\\" . sprintf("%03o", ord("'")) . "'"],
+	     two=>["''", "'" . ("\\" . sprintf("%03o", ord("'")))x2 . "'"],
+	     three=>["\\", "'\\" . sprintf("%03o", ord("\\")) . "'"],
+	     four=>["\\'", sprintf("'\\%03o\\%03o'", ord("\\"), ord("'"))],
+	     five=>["\\'?:", sprintf("'\\%03o\\%03o?:'", ord("\\"), ord("'"))],
+	    );
+
+foreach my $test (keys %tests) {
+  my ($unq, $quo, $ref);
+
+  $unq = $tests{$test}->[0];
+  $ref = $tests{$test}->[1];
+  $quo = $dbh->quote($unq);
+
+  ok($quo eq $ref,
+     "$test: $unq -> expected $quo got $ref"
+    );
+}
+
+# Make sure that SQL_BINARY doesn't work.
+#    eval { $dbh->quote('foo', { TYPE => DBI::SQL_BINARY })};
+eval {
+  local $dbh->{PrintError} = 0;
+  $dbh->quote('foo', DBI::SQL_BINARY);
+};
+ok($@ && $@ =~ /Use of SQL_BINARY invalid in quote/,
+   'SQL_BINARY'
+);
+
+ok($dbh->disconnect(),
+   'disconnect'
+  );
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/12placeholders.t b/install/5.005/DBD-Pg-1.22-fixvercmp/t/12placeholders.t
new file mode 100644
index 000000000..bd79ea72b
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/12placeholders.t
@@ -0,0 +1,125 @@
+use strict;
+use DBI;
+use Test::More;
+
+if (defined $ENV{DBI_DSN}) {
+  plan tests => 9;
+} else {
+  plan skip_all => 'cannot test without DB info';
+}
+
+my $dbh = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+		       {RaiseError => 1, AutoCommit => 0}
+		      );
+ok(defined $dbh,
+   'connect with transaction'
+  );
+
+my $quo = $dbh->quote("\\'?:");
+my $sth = $dbh->prepare(qq{
+			INSERT INTO test (name) VALUES ($quo)
+		       });
+$sth->execute();
+
+my $sql = <<SQL;
+	SELECT name
+	FROM test
+	WHERE name = $quo;
+SQL
+$sth = $dbh->prepare($sql);
+$sth->execute();
+
+my ($retr) = $sth->fetchrow_array();
+ok((defined($retr) && $retr eq "\\'?:"),
+   'fetch'
+  );
+
+eval {
+  local $dbh->{PrintError} = 0;
+  $sth->execute('foo');
+};
+ok($@,
+   'execute with one bind param where none expected'
+  );
+
+$sql = <<SQL;
+       SELECT name
+       FROM test
+       WHERE name = ?
+SQL
+$sth = $dbh->prepare($sql);
+
+$sth->execute("\\'?:");
+
+($retr) = $sth->fetchrow_array();
+ok((defined($retr) && $retr eq "\\'?:"),
+   'execute with ? placeholder'
+  );
+
+$sql = <<SQL;
+       SELECT name
+       FROM test
+       WHERE name = :1
+SQL
+$sth = $dbh->prepare($sql);
+
+$sth->execute("\\'?:");
+
+($retr) = $sth->fetchrow_array();
+ok((defined($retr) && $retr eq "\\'?:"),
+   'execute with :1 placeholder'
+  );
+
+$sql = <<SQL;
+       SELECT name
+       FROM test
+       WHERE name = '?'
+SQL
+$sth = $dbh->prepare($sql);
+
+eval {
+  local $dbh->{PrintError} = 0;
+  $sth->execute('foo');
+};
+ok($@,
+   'execute with quoted ?'
+  );
+
+$sql = <<SQL;
+       SELECT name
+       FROM test
+       WHERE name = ':1'
+SQL
+$sth = $dbh->prepare($sql);
+
+eval {
+  local $dbh->{PrintError} = 0;
+  $sth->execute('foo');
+};
+ok($@,
+   'execute with quoted :1'
+  );
+
+$sql = <<SQL;
+       SELECT name
+       FROM test
+       WHERE name = '\\\\'
+       AND name = '?'
+SQL
+$sth = $dbh->prepare($sql);
+
+eval {
+  local $dbh->{PrintError} = 0;
+  local $sth->{PrintError} = 0;
+  $sth->execute('foo');
+};
+ok($@,
+   'execute with quoted ?'
+  );
+
+$sth->finish();
+$dbh->rollback();
+
+ok($dbh->disconnect(),
+   'disconnect'
+  );
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/13pgtype.t b/install/5.005/DBD-Pg-1.22-fixvercmp/t/13pgtype.t
new file mode 100644
index 000000000..8db819ee9
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/13pgtype.t
@@ -0,0 +1,43 @@
+use strict;
+use DBI;
+use Test::More;
+
+if (defined $ENV{DBI_DSN}) {
+  plan tests => 3;
+} else {
+  plan skip_all => 'cannot test without DB info';
+}
+
+my $dbh = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+		       {RaiseError => 1, AutoCommit => 0}
+		      );
+ok(defined $dbh,
+   'connect with transaction'
+  );
+
+eval {
+  local $dbh->{PrintError} = 0;
+  $dbh->do(q{DROP TABLE tt});
+  $dbh->commit();
+};
+$dbh->rollback();
+
+$dbh->do(q{CREATE TABLE tt (blah numeric(5,2), foo text)});
+my $sth = $dbh->prepare(qq{
+			   SELECT * FROM tt WHERE FALSE
+			  });
+$sth->execute();
+
+my @types = @{$sth->{pg_type}};
+
+ok($types[0] eq 'numeric',
+   'type numeric'
+  );
+
+ok($types[1] eq 'text',
+   'type text'
+  );
+
+$sth->finish();
+$dbh->rollback();
+$dbh->disconnect();
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/15funct.t b/install/5.005/DBD-Pg-1.22-fixvercmp/t/15funct.t
new file mode 100644
index 000000000..1bc2cf961
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/15funct.t
@@ -0,0 +1,353 @@
+#!/usr/bin/perl -w -I./t
+$| = 1;
+
+# vim:ts=2:sw=2:ai:aw:nu:
+use DBI qw(:sql_types);
+use Data::Dumper;
+use strict;
+use Test::More;
+if (defined $ENV{DBI_DSN}) {
+  plan tests => 59;
+} else {
+  plan skip_all => 'cannot test without DB info';
+}
+
+my $dbh = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+		       {RaiseError => 1, AutoCommit => 0}
+		      );
+ok(defined $dbh,
+   'connect with transaction'
+  );
+
+#
+# Test the different methods, so are expected to fail.
+#
+
+my $sth;
+
+# foreach (@{ $DBI::EXPORT_TAGS{sql_types} }) {
+# 	no strict 'refs';
+# 	printf "%s=%d\n", $_, &{"DBI::$_"};
+# }
+
+my $get_info = {
+	  SQL_DBMS_NAME	=> 17
+	, SQL_DBMS_VER	=> 18
+	, SQL_IDENTIFIER_QUOTE_CHAR	=> 29
+	, SQL_CATALOG_NAME_SEPARATOR	=> 41
+	, SQL_CATALOG_LOCATION	=> 114
+};
+
+# Ping
+ eval {
+	 ok( $dbh->ping(), "Testing Ping" );
+ };
+ok ( !$@, "Ping Tested" );
+
+# Get Info
+ eval {
+	 $sth = $dbh->get_info();
+ };
+ok ($@, "Call to get_info with 0 arguements, error expected: $@" );
+$sth = undef;
+
+# Table Info
+ eval {
+	 $sth = $dbh->table_info();
+ };
+ok ((!$@ and defined $sth), "table_info tested" );
+$sth = undef;
+
+# Column Info
+ eval {
+	 $sth = $dbh->column_info();
+ };
+ok ((!$@ and defined $sth), "column_info tested" );
+#ok ($@, "Call to column_info with 0 arguements, error expected: $@" );
+$sth = undef;
+
+
+# Tables
+ eval {
+	 $sth = $dbh->tables();
+ };
+ok ((!$@ and defined $sth), "tables tested" );
+$sth = undef;
+
+# Type Info All
+ eval {
+	 $sth = $dbh->type_info_all();
+ };
+ok ((!$@ and defined $sth), "type_info_all tested" );
+$sth = undef;
+
+# Type Info
+ eval {
+	my @types = $dbh->type_info();
+	die unless @types;
+ };
+ok (!$@, "type_info(undef)");
+$sth = undef;
+
+# Quote
+ eval {
+	my $val = $dbh->quote();
+ 	die unless $val;
+ };
+ok ($@, "quote error expected: $@");
+
+$sth = undef;
+# Tests for quote:
+my @qt_vals = (1, 2, undef, 'NULL', "ThisIsAString", "This is Another String");
+my @expt_vals = (q{'1'}, q{'2'}, "NULL", q{'NULL'}, q{'ThisIsAString'}, q{'This is Another String'});
+for (my $x = 0; $x <= $#qt_vals; $x++) {
+	local $^W = 0;
+	my $val = $dbh->quote( $qt_vals[$x] );	
+	is( $val, $expt_vals[$x], "$x: quote on $qt_vals[$x] returned $val" );
+}
+
+is( $dbh->quote( 1, SQL_INTEGER() ), 1, "quote(1, SQL_INTEGER)" );
+
+
+# Quote Identifier
+ eval {
+	my $val = $dbh->quote_identifier();
+ 	die unless $val;
+ };
+
+ok ($@, "quote_identifier error expected: $@");
+$sth = undef;
+
+SKIP: {
+    skip("get_info() not yet implemented", 1);
+    #	, SQL_IDENTIFIER_QUOTE_CHAR	=> 29
+    #	, SQL_CATALOG_NAME_SEPARATOR	=> 41
+    my $qt  = $dbh->get_info( $get_info->{SQL_IDENTIFIER_QUOTE_CHAR} );
+    my $sep = $dbh->get_info( $get_info->{SQL_CATALOG_NAME_SEPARATOR} );
+
+    # Uncomment this line and remove the next line when get_info() is implemented.
+#    my $cmp_str = qq{${qt}link${qt}${sep}${qt}schema${qt}${sep}${qt}table${qt}};
+    my $cmp_str = '';
+    is( $dbh->quote_identifier( "link", "schema", "table" )
+	, $cmp_str
+	, q{quote_identifier( "link", "schema", "table" )}
+      );
+}
+
+# Test ping
+
+ok ($dbh->ping, "Ping the current connection ..." );
+
+# Test Get Info.
+
+#	SQL_KEYWORDS
+#	SQL_CATALOG_TERM
+#	SQL_DATA_SOURCE_NAME
+#	SQL_DBMS_NAME
+#	SQL_DBMS_VERSION
+#	SQL_DRIVER_NAME
+#	SQL_DRIVER_VER
+#	SQL_PROCEDURE_TERM
+#	SQL_SCHEMA_TERM
+#	SQL_TABLE_TERM
+#	SQL_USER_NAME
+
+SKIP: {
+    skip("get_info() not yet implemented", 5);
+    foreach my $info (sort keys %$get_info) {
+	my $type =  $dbh->get_info($get_info->{$info});
+	ok( defined $type,  "get_info($info) ($get_info->{$info}) " .
+            ($type || '') );
+    }
+}
+
+# Test Table Info
+$sth = $dbh->table_info( undef, undef, undef );
+ok( defined $sth, "table_info(undef, undef, undef) tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+$sth = $dbh->table_info( undef, undef, undef, "VIEW" );
+ok( defined $sth, "table_info(undef, undef, undef, \"VIEW\") tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+# Test Table Info Rule 19a
+$sth = $dbh->table_info( '%', '', '');
+ok( defined $sth, "table_info('%', '', '',) tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+# Test Table Info Rule 19b
+$sth = $dbh->table_info( '', '%', '');
+ok( defined $sth, "table_info('', '%', '',) tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+# Test Table Info Rule 19c
+$sth = $dbh->table_info( '', '', '', '%');
+ok( defined $sth, "table_info('', '', '', '%',) tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+# Test to see if this database contains any of the defined table types.
+$sth = $dbh->table_info( '', '', '', '%');
+ok( defined $sth, "table_info('', '', '', '%',) tested" );
+if ($sth) {
+	my $ref = $sth->fetchall_hashref( 'TABLE_TYPE' );
+	foreach my $type ( sort keys %$ref ) {
+		my $tsth = $dbh->table_info( undef, undef, undef, $type );
+		ok( defined $tsth, "table_info(undef, undef, undef, $type) tested" );
+		DBI::dump_results($tsth) if defined $tsth;
+		$tsth->finish;
+	}
+	$sth->finish;
+}
+$sth = undef;
+
+# Test Column Info
+$sth = $dbh->column_info( undef, undef, undef, undef );
+ok( defined $sth, "column_info(undef, undef, undef, undef) tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+$sth = $dbh->column_info( undef, "'auser'", undef, undef );
+ok( defined $sth, "column_info(undef, 'auser', undef, undef) tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+$sth = $dbh->column_info( undef, "'ause%'", undef, undef );
+ok( defined $sth, "column_info(undef, 'ause%', undef, undef) tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+$sth = $dbh->column_info( undef, "'auser','replicator'", undef, undef );
+ok( defined $sth, "column_info(undef, 'auser','replicator', undef, undef) tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+$sth = $dbh->column_info( undef, "'auser','repl%'", undef, undef );
+ok( defined $sth, "column_info(undef, 'auser','repl%', undef, undef) tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+$sth = $dbh->column_info( undef, "'fred','repl%'", undef, undef );
+ok( defined $sth, "column_info(undef, 'fred','repl%', undef, undef) tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+$sth = $dbh->column_info( undef, "'fred','jim'", undef, undef );
+ok( defined $sth, "column_info(undef, 'fred','jim', undef, undef) tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+$sth = $dbh->column_info( undef, "'auser'", "'pga_schema'", undef );
+ok( defined $sth, "column_info(undef, 'auser', 'pga_schema', undef) tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+$sth = $dbh->column_info( undef, "'auser'", "'pga_%'", undef );
+ok( defined $sth, "column_info(undef, 'auser', 'pga_%', undef) tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+$sth = $dbh->column_info( undef, "'ause%'", "'pga_%'", undef );
+ok( defined $sth, "column_info(undef, 'ause%', 'pga_%', undef) tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+$sth = $dbh->column_info( undef, "'auser'", "'pga_schema'", "'schemaname'" );
+ok( defined $sth, "column_info(undef, 'auser', 'pga_schema', 'schemaname') tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+$sth = $dbh->column_info( undef, "'auser'", "'pga_schema'", "'schema%'" );
+ok( defined $sth, "column_info(undef, 'auser', 'pga_schema', 'schema%') tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+$sth = $dbh->column_info( undef, "'auser'", "'pga_%'", "'schema%'" );
+ok( defined $sth, "column_info(undef, 'auser', 'pga_%', 'schema%') tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+$sth = $dbh->column_info( undef, "'ause%'", "'pga_%'", "'schema%'" );
+ok( defined $sth, "column_info(undef, 'ause%', 'pga_%', 'schema%') tested" );
+DBI::dump_results($sth) if defined $sth;
+$sth = undef;
+
+# Test call to primary_key_info
+local ($dbh->{Warn}, $dbh->{PrintError});
+$dbh->{PrintError} = $dbh->{Warn} = 0;
+
+# Primary Key Info
+eval {
+    $sth = $dbh->primary_key_info();
+    die unless $sth;
+};
+ok ($@, "Call to primary_key_info with 0 arguements, error expected: $@" );
+$sth = undef;
+
+# Primary Key
+eval {
+    $sth = $dbh->primary_key();
+    die unless $sth;
+};
+ok ($@, "Call to primary_key with 0 arguements, error expected: $@" );
+$sth = undef;
+
+$sth = $dbh->primary_key_info(undef, undef, undef );
+
+ok( defined $sth, "Statement handle defined for primary_key_info()" );
+
+if ( defined $sth ) {
+    while( my $row = $sth->fetchrow_arrayref ) {
+        local $^W = 0;
+        # print join( ", ", @$row, "\n" );
+    }
+
+    undef $sth;
+
+}
+
+$sth = $dbh->primary_key_info(undef, undef, undef );
+ok( defined $sth, "Statement handle defined for primary_key_info()" );
+
+my ( %catalogs, %schemas, %tables);
+
+my $cnt = 0;
+while( my ($catalog, $schema, $table) = $sth->fetchrow_array ) {
+    local $^W = 0;
+    $catalogs{$catalog}++	if $catalog;
+    $schemas{$schema}++		if $schema;
+    $tables{$table}++			if $table;
+    $cnt++;
+}
+ok( $cnt > 0, "At least one table has a primary key." );
+
+$sth = $dbh->primary_key_info(undef, qq{'$ENV{DBI_USER}'}, undef );
+ok(
+   defined $sth
+   , "Getting primary keys for tables owned by $ENV{DBI_USER}");
+DBI::dump_results($sth) if defined $sth;
+
+undef $sth;
+
+SKIP: {
+	# foreign_key_info
+	local ($dbh->{Warn}, $dbh->{PrintError});
+	$dbh->{PrintError} = $dbh->{Warn} = 0;
+	eval {
+	$sth = $dbh->foreign_key_info();
+		die unless $sth;
+	};
+	skip "foreign_key_info not supported by driver", 1 if $@;
+	ok( defined $sth, "Statement handle defined for foreign_key_info()" );
+	DBI::dump_results($sth) if defined $sth;
+	$sth = undef;
+}
+
+ok( $dbh->disconnect, "Disconnect from database" );
+
+exit(0);
+
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/99cleanup.t b/install/5.005/DBD-Pg-1.22-fixvercmp/t/99cleanup.t
new file mode 100644
index 000000000..e7563abaa
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/99cleanup.t
@@ -0,0 +1,24 @@
+use strict;
+use DBI;
+use Test::More;
+
+if (defined $ENV{DBI_DSN}) {
+  plan tests => 3;
+} else {
+  plan skip_all => 'cannot test without DB info';
+}
+
+my $dbh = DBI->connect($ENV{DBI_DSN}, $ENV{DBI_USER}, $ENV{DBI_PASS},
+		       {RaiseError => 1, AutoCommit => 0}
+		      );
+ok(defined $dbh,
+   'connect with transaction'
+  );
+
+ok($dbh->do(q{DROP TABLE test}),
+   'drop'
+  );
+
+ok($dbh->disconnect(),
+   'disconnect'
+  );
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info.pm b/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info.pm
new file mode 100644
index 000000000..417247fe7
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info.pm
@@ -0,0 +1,1167 @@
+package App::Info;
+
+# $Id: Info.pm,v 1.1 2004-04-29 09:21:28 ivan Exp $
+
+=head1 NAME
+
+App::Info - Information about software packages on a system
+
+=head1 SYNOPSIS
+
+  use App::Info::Category::FooApp;
+
+  my $app = App::Info::Category::FooApp->new;
+
+  if ($app->installed) {
+      print "App name: ", $app->name, "\n";
+      print "Version:  ", $app->version, "\n";
+      print "Bin dir:  ", $app->bin_dir, "\n";
+  } else {
+      print "App not installed on your system. :-(\n";
+  }
+
+=head1 DESCRIPTION
+
+App::Info is an abstract base class designed to provide a generalized
+interface for subclasses that provide metadata about software packages
+installed on a system. The idea is that these classes can be used in Perl
+application installers in order to determine whether software dependencies
+have been fulfilled, and to get necessary metadata about those software
+packages.
+
+App::Info provides an event model for handling events triggered by App::Info
+subclasses. The events are classified as "info", "error", "unknown", and
+"confirm" events, and multiple handlers may be specified to handle any or all
+of these event types. This allows App::Info clients to flexibly handle events
+in any way they deem necessary. Implementing new event handlers is
+straight-forward, and use the triggering of events by App::Info subclasses is
+likewise kept easy-to-use.
+
+A few L<sample subclasses|"SEE ALSO"> are provided with the distribution, but
+others are invited to write their own subclasses and contribute them to the
+CPAN. Contributors are welcome to extend their subclasses to provide more
+information relevant to the application for which data is to be provided (see
+L<App::Info::HTTPD::Apache|App::Info::HTTPD::Apache> for an example), but are
+encouraged to, at a minimum, implement the abstract methods defined here and
+in the category abstract base classes (e.g.,
+L<App::Info::HTTPD|App::Info::HTTPD> and L<App::Info::Lib|App::Info::Lib>).
+See L<Subclassing|"SUBCLASSING"> for more information on implementing new
+subclasses.
+
+=cut
+
+use strict;
+use Carp ();
+use App::Info::Handler;
+use App::Info::Request;
+use vars qw($VERSION);
+
+$VERSION = '0.23';
+
+##############################################################################
+##############################################################################
+# This code ref is used by the abstract methods to throw an exception when
+# they're called directly.
+my $croak = sub {
+    my ($caller, $meth) = @_;
+    $caller = ref $caller || $caller;
+    if ($caller eq __PACKAGE__) {
+        $meth = __PACKAGE__ . '::' . $meth;
+        Carp::croak(__PACKAGE__ . " is an abstract base class. Attempt to " .
+                    " call non-existent method $meth");
+    } else {
+        Carp::croak("Class $caller inherited from the abstract base class " .
+                    __PACKAGE__ . ", but failed to redefine the $meth() " .
+                    "method. Attempt to call non-existent method " .
+                    "${caller}::$meth");
+    }
+};
+
+##############################################################################
+# This code reference is used by new() and the on_* error handler methods to
+# set the error handlers.
+my $set_handlers = sub {
+    my $on_key = shift;
+    # Default is to do nothing.
+    return [] unless $on_key;
+    my $ref = ref $on_key;
+    if ($ref) {
+        $on_key = [$on_key] unless $ref eq 'ARRAY';
+        # Make sure they're all handlers.
+        foreach my $h (@$on_key) {
+            if (my $r = ref $h) {
+                Carp::croak("$r object is not an App::Info::Handler")
+                  unless UNIVERSAL::isa($h, 'App::Info::Handler');
+            } else {
+                # Look up the handler.
+                $h = App::Info::Handler->new( key => $h);
+            }
+        }
+        # Return 'em!
+        return $on_key;
+    } else {
+        # Look up the handler.
+        return [ App::Info::Handler->new( key => $on_key) ];
+    }
+};
+
+##############################################################################
+##############################################################################
+
+=head1 INTERFACE
+
+This section documents the public interface of App::Info.
+
+=head2 Constructor
+
+=head3 new
+
+  my $app = App::Info::Category::FooApp->new(@params);
+
+Constructs an App::Info object and returns it. The @params arguments define
+how the App::Info object will respond to certain events, and correspond to
+their like-named methods. See the L<"Event Handler Object Methods"> section
+for more information on App::Info events and how to handle them. The
+parameters to C<new()> for the different types of App::Info events are:
+
+=over 4
+
+=item on_info
+
+=item on_error
+
+=item on_unknown
+
+=item on_confirm
+
+=back
+
+When passing event handlers to C<new()>, the list of handlers for each type
+should be an anonymous array, for example:
+
+  my $app = App::Info::Category::FooApp->new( on_info => \@handlers );
+
+=cut
+
+sub new {
+    my ($pkg, %p) = @_;
+    my $class = ref $pkg || $pkg;
+    # Fail if the method isn't overridden.
+    $croak->($pkg, 'new') if $class eq __PACKAGE__;
+
+    # Set up handlers.
+    for (qw(on_error on_unknown on_info on_confirm)) {
+        $p{$_} = $set_handlers->($p{$_});
+    }
+
+    # Do it!
+    return bless \%p, $class;
+}
+
+##############################################################################
+##############################################################################
+
+=head2 Metadata Object Methods
+
+These are abstract methods in App::Info and must be provided by its
+subclasses. They provide the essential metadata of the software package
+supported by the App::Info subclass.
+
+=head3 key_name
+
+  my $key_name = $app->key_name;
+
+Returns a string that uniquely identifies the software for which the App::Info
+subclass provides data. This value should be unique across all App::Info
+classes. Typically, it's simply the name of the software.
+
+=cut
+
+sub key_name { $croak->(shift, 'key_name') }
+
+=head3 installed
+
+  if ($app->installed) {
+      print "App is installed.\n"
+  } else {
+      print "App is not installed.\n"
+  }
+
+Returns a true value if the application is installed, and a false value if it
+is not.
+
+=cut
+
+sub installed { $croak->(shift, 'installed') }
+
+##############################################################################
+
+=head3 name
+
+  my $name = $app->name;
+
+Returns the name of the application.
+
+=cut
+
+sub name { $croak->(shift, 'name') }
+
+##############################################################################
+
+=head3 version
+
+  my $version = $app->version;
+
+Returns the full version number of the application.
+
+=cut
+
+##############################################################################
+
+sub version { $croak->(shift, 'version') }
+
+=head3 major_version
+
+  my $major_version = $app->major_version;
+
+Returns the major version number of the application. For example, if
+C<version()> returns "7.1.2", then this method returns "7".
+
+=cut
+
+sub major_version { $croak->(shift, 'major_version') }
+
+##############################################################################
+
+=head3 minor_version
+
+  my $minor_version = $app->minor_version;
+
+Returns the minor version number of the application. For example, if
+C<version()> returns "7.1.2", then this method returns "1".
+
+=cut
+
+sub minor_version { $croak->(shift, 'minor_version') }
+
+##############################################################################
+
+=head3 patch_version
+
+  my $patch_version = $app->patch_version;
+
+Returns the patch version number of the application. For example, if
+C<version()> returns "7.1.2", then this method returns "2".
+
+=cut
+
+sub patch_version { $croak->(shift, 'patch_version') }
+
+##############################################################################
+
+=head3 bin_dir
+
+  my $bin_dir = $app->bin_dir;
+
+Returns the full path the application's bin directory, if it exists.
+
+=cut
+
+sub bin_dir { $croak->(shift, 'bin_dir') }
+
+##############################################################################
+
+=head3 inc_dir
+
+  my $inc_dir = $app->inc_dir;
+
+Returns the full path the application's include directory, if it exists.
+
+=cut
+
+sub inc_dir { $croak->(shift, 'inc_dir') }
+
+##############################################################################
+
+=head3 lib_dir
+
+  my $lib_dir = $app->lib_dir;
+
+Returns the full path the application's lib directory, if it exists.
+
+=cut
+
+sub lib_dir { $croak->(shift, 'lib_dir') }
+
+##############################################################################
+
+=head3 so_lib_dir
+
+  my $so_lib_dir = $app->so_lib_dir;
+
+Returns the full path the application's shared library directory, if it
+exists.
+
+=cut
+
+sub so_lib_dir { $croak->(shift, 'so_lib_dir') }
+
+##############################################################################
+
+=head3 home_url
+
+  my $home_url = $app->home_url;
+
+The URL for the software's home page.
+
+=cut
+
+sub home_url  { $croak->(shift, 'home_url') }
+
+##############################################################################
+
+=head3 download_url
+
+  my $download_url = $app->download_url;
+
+The URL for the software's download page.
+
+=cut
+
+sub download_url  { $croak->(shift, 'download_url') }
+
+##############################################################################
+##############################################################################
+
+=head2 Event Handler Object Methods
+
+These methods provide control over App::Info event handling. Events can be
+handled by one or more objects of subclasses of App::Info::Handler. The first
+to return a true value will be the last to execute. This approach allows
+handlers to be stacked, and makes it relatively easy to create new handlers.
+L<App::Info::Handler|App::Info::Handler> for information on writing event
+handlers.
+
+Each of the event handler methods takes a list of event handlers as its
+arguments. If none are passed, the existing list of handlers for the relevant
+event type will be returned. If new handlers are passed in, they will be
+returned.
+
+The event handlers may be specified as one or more objects of the
+App::Info::Handler class or subclasses, as one or more strings that tell
+App::Info construct such handlers itself, or a combination of the two. The
+strings can only be used if the relevant App::Info::Handler subclasses have
+registered strings with App::Info. For example, the App::Info::Handler::Print
+class included in the App::Info distribution registers the strings "stderr"
+and "stdout" when it starts up. These strings may then be used to tell
+App::Info to construct App::Info::Handler::Print objects that print to STDERR
+or to STDOUT, respectively. See the App::Info::Handler subclasses for what
+strings they register with App::Info.
+
+=head3 on_info
+
+  my @handlers = $app->on_info;
+  $app->on_info(@handlers);
+
+Info events are triggered when the App::Info subclass wants to send an
+informational status message. By default, these events are ignored, but a
+common need is for such messages to simply print to STDOUT. Use the
+L<App::Info::Handler::Print|App::Info::Handler::Print> class included with the
+App::Info distribution to have info messages print to STDOUT:
+
+  use App::Info::Handler::Print;
+  $app->on_info('stdout');
+  # Or:
+  my $stdout_handler = App::Info::Handler::Print->new('stdout');
+  $app->on_info($stdout_handler);
+
+=cut
+
+sub on_info {
+    my $self = shift;
+    $self->{on_info} = $set_handlers->(\@_) if @_;
+    return @{ $self->{on_info} };
+}
+
+=head3 on_error
+
+  my @handlers = $app->on_error;
+  $app->on_error(@handlers);
+
+Error events are triggered when the App::Info subclass runs into an unexpected
+but not fatal problem. (Note that fatal problems will likely throw an
+exception.) By default, these events are ignored. A common way of handling
+these events is to print them to STDERR, once again using the
+L<App::Info::Handler::Print|App::Info::Handler::Print> class included with the
+App::Info distribution:
+
+  use App::Info::Handler::Print;
+  my $app->on_error('stderr');
+  # Or:
+  my $stderr_handler = App::Info::Handler::Print->new('stderr');
+  $app->on_error($stderr_handler);
+
+Another approach might be to turn such events into fatal exceptions. Use the
+included L<App::Info::Handler::Carp|App::Info::Handler::Carp> class for this
+purpose:
+
+  use App::Info::Handler::Carp;
+  my $app->on_error('croak');
+  # Or:
+  my $croaker = App::Info::Handler::Carp->new('croak');
+  $app->on_error($croaker);
+
+=cut
+
+sub on_error {
+    my $self = shift;
+    $self->{on_error} = $set_handlers->(\@_) if @_;
+    return @{ $self->{on_error} };
+}
+
+=head3 on_unknown
+
+  my @handlers = $app->on_unknown;
+  $app->on_uknown(@handlers);
+
+Unknown events are trigged when the App::Info subclass cannot find the value
+to be returned by a method call. By default, these events are ignored. A
+common way of handling them is to have the application prompt the user for the
+relevant data. The App::Info::Handler::Prompt class included with the
+App::Info distribution can do just that:
+
+  use App::Info::Handler::Prompt;
+  my $app->on_unknown('prompt');
+  # Or:
+  my $prompter = App::Info::Handler::Prompt;
+  $app->on_unknown($prompter);
+
+See L<App::Info::Handler::Prompt|App::Info::Handler::Prompt> for information
+on how it works.
+
+=cut
+
+sub on_unknown {
+    my $self = shift;
+    $self->{on_unknown} = $set_handlers->(\@_) if @_;
+    return @{ $self->{on_unknown} };
+}
+
+=head3 on_confirm
+
+  my @handlers = $app->on_confirm;
+  $app->on_confirm(@handlers);
+
+Confirm events are triggered when the App::Info subclass has found an
+important piece of information (such as the location of the executable it'll
+use to collect information for the rest of its methods) and wants to confirm
+that the information is correct. These events will most often be triggered
+during the App::Info subclass object construction. Here, too, the
+App::Info::Handler::Prompt class included with the App::Info distribution can
+help out:
+
+  use App::Info::Handler::Prompt;
+  my $app->on_confirm('prompt');
+  # Or:
+  my $prompter = App::Info::Handler::Prompt;
+  $app->on_confirm($prompter);
+
+=cut
+
+sub on_confirm {
+    my $self = shift;
+    $self->{on_confirm} = $set_handlers->(\@_) if @_;
+    return @{ $self->{on_confirm} };
+}
+
+##############################################################################
+##############################################################################
+
+=head1 SUBCLASSING
+
+As an abstract base class, App::Info is not intended to be used directly.
+Instead, you'll use concrete subclasses that implement the interface it
+defines. These subclasses each provide the metadata necessary for a given
+software package, via the interface outlined above (plus any additional
+methods the class author deems sensible for a given application).
+
+This section describes the facilities App::Info provides for subclassing. The
+goal of the App::Info design has been to make subclassing straight-forward, so
+that developers can focus on gathering the data they need for their
+application and minimize the work necessary to handle unknown values or to
+confirm values. As a result, there are essentially three concepts that
+developers need to understand when subclassing App::Info: organization,
+utility methods, and events.
+
+=head2 Organization
+
+The organizational idea behind App::Info is to name subclasses by broad
+software categories. This approach allows the categories themselves to
+function as abstract base classes that extend App::Info, so that they can
+specify more methods for all of their base classes to implement. For example,
+App::Info::HTTPD has specified the C<httpd_root()> abstract method that its
+subclasses must implement. So as you get ready to implement your own subclass,
+think about what category of software you're gathering information about.
+New categories can be added as necessary.
+
+=head2 Utility Methods
+
+Once you've decided on the proper category, you can start implementing your
+App::Info concrete subclass. As you do so, take advantage of App::Info::Util,
+wherein I've tried to encapsulate common functionality to make subclassing
+easier. I found that most of what I was doing repetitively was looking for
+files and directories, and searching through files. Thus, App::Info::Util
+subclasses L<File::Spec|File::Spec> in order to offer easy access to
+commonly-used methods from that class, e.g., C<path()>. Plus, it has several
+of its own methods to assist you in finding files and directories in lists of
+files and directories, as well as methods for searching through files and
+returning the values found in those files. See
+L<App::Info::Util|App::Info::Util> for more information, and the App::Info
+subclasses in this distribution for usage examples.
+
+I recommend the use of a package-scoped lexical App::Info::Util object. That
+way it's nice and handy when you need to carry out common tasks. If you find
+you're doing something over and over that's not already addressed by an
+App::Info::Util method, consider submitting a patch to App::Info::Util to add
+the functionality you need.
+
+=head2 Events
+
+Use the methods described below to trigger events. Events are designed to
+provide a simple way for App::Info subclass developers to send status messages
+and errors, to confirm data values, and to request a value when the class
+caonnot determine a value itself. Events may optionally be handled by module
+users who assign App::Info::Handler subclass objects to your App::Info
+subclass object using the event handling methods described in the L<"Event
+Handler Object Methods"> section.
+
+=cut
+
+##############################################################################
+# This code reference is used by the event methods to manage the stack of
+# event handlers that may be available to handle each of the events.
+my $handler = sub {
+    my ($self, $meth, $params) = @_;
+
+    # Sanity check. We really want to keep control over this.
+    Carp::croak("Cannot call protected method $meth()")
+      unless UNIVERSAL::isa($self, scalar caller(1));
+
+    # Create the request object.
+    $params->{type} ||= $meth;
+    my $req = App::Info::Request->new(%$params);
+
+    # Do the deed. The ultimate handling handler may die.
+    foreach my $eh (@{$self->{"on_$meth"}}) {
+        last if $eh->handler($req);
+    }
+
+    # Return the requst.
+    return $req;
+};
+
+##############################################################################
+
+=head3 info
+
+  $self->info(@message);
+
+Use this method to display status messages for the user. You may wish to use
+it to inform users that you're searching for a particular file, or attempting
+to parse a file or some other resource for the data you need. For example, a
+common use might be in the object constructor: generally, when an App::Info
+object is created, some important initial piece of information is being
+sought, such as an executable file. That file may be in one of many locations,
+so it makes sense to let the user know that you're looking for it:
+
+  $self->info("Searching for executable");
+
+Note that, due to the nature of App::Info event handlers, your informational
+message may be used or displayed any number of ways, or indeed not at all (as
+is the default behavior).
+
+The C<@message> will be joined into a single string and stored in the
+C<message> attribute of the App::Info::Request object passed to info event
+handlers.
+
+=cut
+
+sub info {
+    my $self = shift;
+    # Execute the handler sequence.
+    my $req = $handler->($self, 'info', { message => join '', @_ });
+}
+
+##############################################################################
+
+=head3 error
+
+  $self->error(@error);
+
+Use this method to inform the user that something unexpected has happened. An
+example might be when you invoke another program to parse its output, but it's
+output isn't what you expected:
+
+  $self->error("Unable to parse version from `/bin/myapp -c`");
+
+As with all events, keep in mind that error events may be handled in any
+number of ways, or not at all.
+
+The C<@erorr> will be joined into a single string and stored in the C<message>
+attribute of the App::Info::Request object passed to error event handlers. If
+that seems confusing, think of it as an "error message" rather than an "error
+error." :-)
+
+=cut
+
+sub error {
+    my $self = shift;
+    # Execute the handler sequence.
+    my $req = $handler->($self, 'error', { message => join '', @_ });
+}
+
+##############################################################################
+
+=head3 unknown
+
+  my $val = $self->unknown(@params);
+
+Use this method when a value is unknown. This will give the user the option --
+assuming the appropriate handler handles the event -- to provide the needed
+data. The value entered will be returned by C<unknown()>. The parameters are
+as follows:
+
+=over 4
+
+=item key
+
+The C<key> parameter uniquely identifies the data point in your class, and is
+used by App::Info to ensure that an unknown event is handled only once, no
+matter how many times the method is called. The same value will be returned by
+subsequent calls to C<unknown()> as was returned by the first call, and no
+handlers will be activated. Typical values are "version" and "lib_dir".
+
+=item prompt
+
+The C<prompt> parameter is the prompt to be displayed should an event handler
+decide to prompt for the appropriate value. Such a prompt might be something
+like "Path to your httpd executable?". If this parameter is not provided,
+App::Info will construct one for you using your class' C<key_name()> method
+and the C<key> parameter. The result would be something like "Enter a valid
+FooApp version". The C<prompt> parameter value will be stored in the
+C<message> attribute of the App::Info::Request object passed to event
+handlers.
+
+=item callback
+
+Assuming a handler has collected a value for your unknown data point, it might
+make sense to validate the value. For example, if you prompt the user for a
+directory location, and the user enters one, it makes sense to ensure that the
+directory actually exists. The C<callback> parameter allows you to do this. It
+is a code reference that takes the new value or values as its arguments, and
+returns true if the value is valid, and false if it is not. For the sake of
+convenience, the first argument to the callback code reference is also stored
+in C<$_> .This makes it easy to validate using functions or operators that,
+er, operate on C<$_> by default, but still allows you to get more information
+from C<@_> if necessary. For the directory example, a good callback might be
+C<sub { -d }>. The C<callback> parameter code reference will be stored in the
+C<callback> attribute of the App::Info::Request object passed to event
+handlers.
+
+=item error
+
+The error parameter is the error message to display in the event that the
+C<callback> code reference returns false. This message may then be used by the
+event handler to let the user know what went wrong with the data she entered.
+For example, if the unknown value was a directory, and the user entered a
+value that the C<callback> identified as invalid, a message to display might
+be something like "Invalid directory path". Note that if the C<error>
+parameter is not provided, App::Info will supply the generic error message
+"Invalid value". This value will be stored in the C<error> attribute of the
+App::Info::Request object passed to event handlers.
+
+=back
+
+This may be the event method you use most, as it should be called in every
+metadata method if you cannot provide the data needed by that method. It will
+typically be the last part of the method. Here's an example demonstrating each
+of the above arguments:
+
+  my $dir = $self->unknown( key      => 'lib_dir',
+                            prompt   => "Enter lib directory path",
+                            callback => sub { -d },
+                            error    => "Not a directory");
+
+=cut
+
+sub unknown {
+    my ($self, %params) = @_;
+    my $key = delete $params{key}
+      or Carp::croak("No key parameter passed to unknown()");
+    # Just return the value if we've already handled this value. Ideally this
+    # shouldn't happen.
+    return $self->{__unknown__}{$key} if exists $self->{__unknown__}{$key};
+
+    # Create a prompt and error message, if necessary.
+    $params{message} = delete $params{prompt} ||
+      "Enter a valid " . $self->key_name . " $key";
+    $params{error} ||= 'Invalid value';
+
+    # Execute the handler sequence.
+    my $req = $handler->($self, "unknown", \%params);
+
+    # Mark that we've provided this value and then return it.
+    $self->{__unknown__}{$key} = $req->value;
+    return $self->{__unknown__}{$key};
+}
+
+##############################################################################
+
+=head3 confirm
+
+  my $val = $self->confirm(@params);
+
+This method is very similar to C<unknown()>, but serves a different purpose.
+Use this method for significant data points where you've found an appropriate
+value, but want to ensure it's really the correct value. A "significant data
+point" is usually a value essential for your class to collect metadata values.
+For example, you might need to locate an executable that you can then call to
+collect other data. In general, this will only happen once for an object --
+during object construction -- but there may be cases in which it is needed
+more than that. But hopefully, once you've confirmed in the constructor that
+you've found what you need, you can use that information to collect the data
+needed by all of the metadata methods and can assume that they'll be right
+because that first, significant data point has been confirmed.
+
+Other than where and how often to call C<confirm()>, its use is quite similar
+to that of C<unknown()>. Its parameters are as follows:
+
+=over
+
+=item key
+
+Same as for C<unknown()>, a string that uniquely identifies the data point in
+your class, and ensures that the event is handled only once for a given key.
+The same value will be returned by subsequent calls to C<confirm()> as was
+returned by the first call for a given key.
+
+=item prompt
+
+Same as for C<unknown()>. Although C<confirm()> is called to confirm a value,
+typically the prompt should request the relevant value, just as for
+C<unknown()>. The difference is that the handler I<should> use the C<value>
+parameter as the default should the user not provide a value. The C<prompt>
+parameter will be stored in the C<message> attribute of the App::Info::Request
+object passed to event handlers.
+
+=item value
+
+The value to be confirmed. This is the value you've found, and it will be
+provided to the user as the default option when they're prompted for a new
+value. This value will be stored in the C<value> attribute of the
+App::Info::Request object passed to event handlers.
+
+=item callback
+
+Same as for C<unknown()>. Because the user can enter data to replace the
+default value provided via the C<value> parameter, you might want to validate
+it. Use this code reference to do so. The callback will be stored in the
+C<callback> attribute of the App::Info::Request object passed to event
+handlers.
+
+=item error
+
+Same as for C<unknown()>: an error message to display in the event that a
+value entered by the user isn't validated by the C<callback> code reference.
+This value will be stored in the C<error> attribute of the App::Info::Request
+object passed to event handlers.
+
+=back
+
+Here's an example usage demonstrating all of the above arguments:
+
+  my $exe = $self->confirm( key      => 'shell',
+                            prompt   => 'Path to your shell?',
+                            value    => '/bin/sh',
+                            callback => sub { -x },
+                            error    => 'Not an executable');
+
+
+=cut
+
+sub confirm {
+    my ($self, %params) = @_;
+    my $key = delete $params{key}
+      or Carp::croak("No key parameter passed to confirm()");
+    return $self->{__confirm__}{$key} if exists $self->{__confirm__}{$key};
+
+    # Create a prompt and error message, if necessary.
+    $params{message} = delete $params{prompt} ||
+      "Enter a valid " . $self->key_name . " $key";
+    $params{error} ||= 'Invalid value';
+
+    # Execute the handler sequence.
+    my $req = $handler->($self, "confirm", \%params);
+
+    # Mark that we've confirmed this value.
+    $self->{__confirm__}{$key} = $req->value;
+
+    return $self->{__confirm__}{$key}
+}
+
+1;
+__END__
+
+=head2 Event Examples
+
+Below I provide some examples demonstrating the use of the event methods.
+These are meant to emphasize the contexts in which it's appropriate to use
+them.
+
+Let's start with the simplest, first. Let's say that to find the version
+number for an application, you need to search a file for the relevant data.
+Your App::Info concrete subclass might have a private method that handles this
+work, and this method is the appropriate place to use the C<info()> and, if
+necessary, C<error()> methods.
+
+  sub _find_version {
+      my $self = shift;
+
+      # Try to find the revelant file. We cover this method below.
+      # Just return if we cant' find it.
+      my $file = $self->_find_file('version.conf') or return;
+
+      # Send a status message.
+      $self->info("Searching '$file' file for version");
+
+      # Search the file. $util is an App::Info::Util object.
+      my $ver = $util->search_file($file, qr/^Version\s+(.*)$/);
+
+      # Trigger an error message, if necessary. We really think we'll have the
+      # value, but we have to cover our butts in the unlikely event that we're
+      # wrong.
+      $self->error("Unable to find version in file '$file'") unless $ver;
+
+      # Return the version number.
+      return $ver;
+  }
+
+Here we've used the C<info()> method to display a status message to let the
+user know what we're doing. Then we used the C<error()> method when something
+unexpected happened, which in this case was that we weren't able to find the
+version number in the file.
+
+Note the C<_find_file()> method we've thrown in. This might be a method that
+we call whenever we need to find a file that might be in one of a list of
+directories. This method, too, will be an appropriate place for an C<info()>
+method call. But rather than call the C<error()> method when the file can't be
+found, you might want to give an event handler a chance to supply that value
+for you. Use the C<unknown()> method for a case such as this:
+
+  sub _find_file {
+      my ($self, $file) = @_;
+
+      # Send a status message.
+      $self->info("Searching for '$file' file");
+
+      # Look for the file. See App::Info:Utility for its interface.
+      my @paths = qw(/usr/conf /etc/conf /foo/conf);
+      my $found = $util->first_cat_path($file, @paths);
+
+      # If we didn't find it, trigger an unknown event to
+      # give a handler a chance to get the value.
+      $found ||= $self->unknown( key      => "file_$file",
+                                 prompt   => "Location of '$file' file?",
+                                 callback => sub { -f },
+                                 error    => "Not a file");
+
+      # Now return the file name, regardless of whether we found it or not.
+      return $found;
+  }
+
+Note how in this method, we've tried to locate the file ourselves, but if we
+can't find it, we trigger an unknown event. This allows clients of our
+App::Info subclass to try to establish the value themselves by having an
+App::Info::Handler subclass handle the event. If a value is found by an
+App::Info::Handler subclass, it will be returned by C<unknown()> and we can
+continue. But we can't assume that the unknown event will even be handled, and
+thus must expect that an unknown value may remain unknown. This is why the
+C<_find_version()> method above simply returns if C<_find_file()> doesn't
+return a file name; there's no point in searching through a file that doesn't
+exist.
+
+Attentive readers may be left to wonder how to decide when to use C<error()>
+and when to use C<unknown()>. To a large extent, this decision must be based
+on one's own understanding of what's most appropriate. Nevertheless, I offer
+the following simple guidelines: Use C<error()> when you expect something to
+work and then it just doesn't (as when a file exists and should contain the
+information you seek, but then doesn't). Use C<unknown()> when you're less
+sure of your processes for finding the value, and also for any of the values
+that should be returned by any of the L<metadata object methods|"Metadata
+Object Methods">. And of course, C<error()> would be more appropriate when you
+encounter an unexpected condition and don't think that it could be handled in
+any other way.
+
+Now, more than likely, a method such C<_find_version()> would be called by the
+C<version()> method, which is a metadata method mandated by the App::Info
+abstract base class. This is an appropriate place to handle an unknown version
+value. Indeed, every one of your metadata methods should make use of the
+C<unknown()> method. The C<version()> method then should look something like
+this:
+
+  sub version {
+      my $self = shift;
+
+      unless (exists $self->{version}) {
+          # Try to find the version number.
+          $self->{version} = $self->_find_version ||
+            $self->unknown( key    => 'version',
+                            prompt => "Enter the version number");
+      }
+
+      # Now return the version number.
+      return $self->{version};
+  }
+
+Note how this method only tries to find the version number once. Any
+subsequent calls to C<version()> will return the same value that was returned
+the first time it was called. Of course, thanks to the C<key> parameter in the
+call to C<unknown()>, we could have have tried to enumerate the version number
+every time, as C<unknown()> will return the same value every time it is called
+(as, indeed, should C<_find_version()>. But by checking for the C<version> key
+in C<$self> ourselves, we save some of the overhead.
+
+But as I said before, every metadata method should make use of the
+C<unknown()> method. Thus, the C<major()> method might looks something like
+this:
+
+  sub major {
+      my $self = shift;
+
+      unless (exists $self->{major}) {
+          # Try to get the major version from the full version number.
+          ($self->{major}) = $self->version =~ /^(\d+)\./;
+          # Handle an unknown value.
+          $self->{major} = $self->unknown( key      => 'major',
+                                           prompt   => "Enter major version",
+                                           callback => sub { /^\d+$/ },
+                                           error    => "Not a number")
+            unless defined $self->{major};
+      }
+
+      return $self->{version};
+  }
+
+Finally, the C<confirm()> method should be used to verify core pieces of data
+that significant numbers of other methods rely on. Typically such data are
+executables or configuration files from which will be drawn other metadata.
+Most often, such major data points will be sought in the object constructor.
+Here's an example:
+
+  sub new {
+      # Construct the object so that handlers will work properly.
+      my $self = shift->SUPER::new(@_);
+
+      # Try to find the executable.
+      $self->info("Searching for executable");
+      if (my $exe = $util->first_exe('/bin/myapp', '/usr/bin/myapp')) {
+          # Confirm it.
+          $self->{exe} =
+            $self->confirm( key      => 'binary',
+                            prompt   => 'Path to your executable?',
+                            value    => $exe,
+                            callback => sub { -x },
+                            error    => 'Not an executable');
+      } else {
+          # Handle an unknown value.
+          $self->{exe} =
+            $self->unknown( key      => 'binary',
+                            prompt   => 'Path to your executable?',
+                            callback => sub { -x },
+                            error    => 'Not an executable');
+      }
+
+      # We're done.
+      return $self;
+  }
+
+By now, most of what's going on here should be quite familiar. The use of the
+C<confirm()> method is quite similar to that of C<unknown()>. Really the only
+difference is that the value is known, but we need verification or a new value
+supplied if the value we found isn't correct. Such may be the case when
+multiple copies of the executable have been installed on the system, we found
+F</bin/myapp>, but the user may really be interested in F</usr/bin/myapp>.
+Thus the C<confirm()> event gives the user the chance to change the value if
+the confirm event is handled.
+
+The final thing to note about this constructor is the first line:
+
+  my $self = shift->SUPER::new(@_);
+
+The first thing an App::Info subclass should do is execute this line to allow
+the super class to construct the object first. Doing so allows any event
+handling arguments to set up the event handlers, so that when we call
+C<confirm()> or C<unknown()> the event will be handled as the client expects.
+
+If we needed our subclass constructor to take its own parameter argumente, the
+approach is to specify the same C<key => $arg> syntax as is used by
+App::Info's C<new()> method. Say we wanted to allow clients of our App::Info
+subclass to pass in a list of alternate executable locations for us to search.
+Such an argument would most make sense as an array reference. So we specify
+that the key be C<alt_paths> and allow the user to construct an object like
+this:
+
+  my $app = App::Info::Category::FooApp->new( alt_paths => \@paths );
+
+This approach allows the super class constructor arguments to pass unmolested
+(as long as we use unique keys!):
+
+  my $app = App::Info::Category::FooApp->new( on_error  => \@handlers,
+                                              alt_paths => \@paths );
+
+Then, to retrieve these paths inside our C<new()> constructor, all we need do
+is access them directly from the object:
+
+  my $self = shift->SUPER::new(@_);
+  my $alt_paths = $self->{alt_paths};
+
+=head2 Subclassing Guidelines
+
+To summarize, here are some guidelines for subclassing App::Info.
+
+=over 4
+
+=item *
+
+Always subclass an App::Info category subclass. This will help to keep the
+App::Info namespace well-organized. New categories can be added as needed.
+
+=item *
+
+When you create the C<new()> constructor, always call C<SUPER::new(@_)>. This
+ensures that the event handling methods methods defined by the App::Info base
+classes (e.g., C<error()>) will work properly.
+
+=item *
+
+Use a package-scoped lexical App::Info::Util object to carry out common tasks.
+If you find you're doing something over and over that's not already addressed
+by an App::Info::Util method, and you think that others might find your
+solution useful, consider submitting a patch to App::Info::Util to add the
+functionality you need. See L<App::Info::Util|App::Info::Util> for complete
+documentation of its interface.
+
+=item *
+
+Use the C<info()> event triggering method to send messages to users of your
+subclass.
+
+=item *
+
+Use the C<error()> event triggering method to alert users of unexpected
+conditions. Fatal errors should still be fatal; use C<Carp::croak()> to throw
+exceptions for fatal errors.
+
+=item *
+
+Use the C<unknown()> event triggering method when a metadata or other
+important value is unknown and you want to give any event handlers the chance
+to provide the data.
+
+=item *
+
+Use the C<confirm()> event triggering method when a core piece of data is
+known (such as the location of an executable in the C<new()> constructor) and
+you need to make sure that you have the I<correct> information.
+
+=item *
+
+Be sure to implement B<all> of the abstract methods defined by App::Info and
+by your category abstract base class -- even if they don't do anything. Doing
+so ensures that all App::Info subclasses share a common interface, and can, if
+necessary, be used without regard to subclass. Any method not implemented but
+called on an object will generate a fatal exception.
+
+=back
+
+Otherwise, have fun! There are a lot of software packages for which relevant
+information might be collected and aggregated into an App::Info concrete
+subclass (witness all of the Automake macros in the world!), and folks who are
+knowledgeable about particular software packages or categories of software are
+warmly invited to contribute. As more subclasses are implemented, it will make
+sense, I think, to create separate distributions based on category -- or even,
+when necessary, on a single software package. Broader categories can then be
+aggregated in Bundle distributions.
+
+But I get ahead of myself...
+
+=head1 BUGS
+
+Report all bugs via the CPAN Request Tracker at
+L<http://rt.cpan.org/NoAuth/Bugs.html?Dist=App-Info>.
+
+=head1 AUTHOR
+
+David Wheeler <L<david@wheeler.net|"david@wheeler.net">>
+
+=head1 SEE ALSO
+
+The following classes define a few software package categories in which
+App::Info subclasses can be placed. Check them out for ideas on how to
+create new category subclasses.
+
+=over 4
+
+=item L<App::Info::HTTP|App::Info::HTTPD>
+
+=item L<App::Info::RDBMS|App::Info::RDBMS>
+
+=item L<App::Info::Lib|App::Info::Lib>
+
+=back
+
+The following classes implement the App::Info interface for various software
+packages. Check them out for examples of how to implement new App::Info
+concrete subclasses.
+
+=over
+
+=item L<App::Info::HTTPD::Apache|App::Info::HTTPD::Apache>
+
+=item L<App::Info::RDBMS::PostgreSQL|App::Info::RDBMS::PostgreSQL>
+
+=item L<App::Info::Lib::Expat|App::Info::Lib::Expat>
+
+=item L<App::Info::Lib::Iconv|App::Info::Lib::Iconv>
+
+=back
+
+L<App::Info::Util|App::Info::Util> provides utility methods for App::Info
+subclasses.
+
+L<App::Info::Handler|App::Info::Handler> defines an interface for event
+handlers to subclass. Consult its documentation for information on creating
+custom event handlers.
+
+The following classes implement the App::Info::Handler interface to offer some
+simple event handling. Check them out for examples of how to implement new
+App::Info::Handler subclasses.
+
+=over 4
+
+=item L<App::Info::Handler::Print|App::Info::Handler::Print>
+
+=item L<App::Info::Handler::Carp|App::Info::Handler::Carp>
+
+=item L<App::Info::Handler::Prompt|App::Info::Handler::Prompt>
+
+=back
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (c) 2002, David Wheeler. All Rights Reserved.
+
+This module is free software; you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=cut
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/Handler.pm b/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/Handler.pm
new file mode 100644
index 000000000..65416a84a
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/Handler.pm
@@ -0,0 +1,305 @@
+package App::Info::Handler;
+
+# $Id: Handler.pm,v 1.1 2004-04-29 09:21:28 ivan Exp $
+
+=head1 NAME
+
+App::Info::Handler - App::Info event handler base class
+
+=head1 SYNOPSIS
+
+  use App::Info::Category::FooApp;
+  use App::Info::Handler;
+
+  my $app = App::Info::Category::FooApp->new( on_info => ['default'] );
+
+=head1 DESCRIPTION
+
+This class defines the interface for subclasses that wish to handle events
+triggered by App::Info concrete subclasses. The different types of events
+triggered by App::Info can all be handled by App::Info::Handler (indeed, by
+default they're all handled by a single App::Info::Handler object), and
+App::Info::Handler subclasses may be designed to handle whatever events they
+wish.
+
+If you're interested in I<using> an App::Info event handler, this is probably
+not the class you should look at, since all it does is define a simple handler
+that does nothing with an event. Look to the L<App::Info::Handler
+subclasses|"SEE ALSO"> included in this distribution to do more interesting
+things with App::Info events.
+
+If, on the other hand, you're interested in implementing your own event
+handlers, read on!
+
+=cut
+
+use strict;
+use vars qw($VERSION);
+$VERSION = '0.22';
+
+my %handlers;
+
+=head1 INTERFACE
+
+This section documents the public interface of App::Info::Handler.
+
+=head2 Class Method
+
+=head3 register_handler
+
+  App::Info::Handler->register_handler( $key => $code_ref );
+
+This class method may be used by App::Info::Handler subclasses to register
+themselves with App::Info::Handler. Multiple registrations are supported. The
+idea is that a subclass can define different functionality by specifying
+different strings that represent different modes of constructing an
+App::Info::Handler subclass object. The keys are case-sensitve, and should be
+unique across App::Info::Handler subclasses so that many subclasses can be
+loaded and used separately. If the C<$key> is already registered,
+C<register_handler()> will throw an exception. The values are code references
+that, when executed, return the appropriate App::Info::Handler subclass
+object.
+
+=cut
+
+sub register_handler {
+    my ($pkg, $key, $code) = @_;
+    Carp::croak("Handler '$key' already exists")
+      if $handlers{$key};
+    $handlers{$key} = $code;
+}
+
+# Register ourself.
+__PACKAGE__->register_handler('default', sub { __PACKAGE__->new } );
+
+##############################################################################
+
+=head2 Constructor
+
+=head3 new
+
+  my $handler = App::Info::Handler->new;
+  $handler =  App::Info::Handler->new( key => $key);
+
+Constructs an App::Info::Handler object and returns it. If the key parameter
+is provided and has been registered by an App::Info::Handler subclass via the
+C<register_handler()> class method, then the relevant code reference will be
+executed and the resulting App::Info::Handler subclass object returned. This
+approach provides a handy shortcut for having C<new()> behave as an abstract
+factory method, returning an object of the subclass appropriate to the key
+parameter.
+
+=cut
+
+sub new {
+    my ($pkg, %p) = @_;
+    my $class = ref $pkg || $pkg;
+    $p{key} ||= 'default';
+    if ($class eq __PACKAGE__ && $p{key} ne 'default') {
+        # We were called directly! Handle it.
+        Carp::croak("No such handler '$p{key}'") unless $handlers{$p{key}};
+        return $handlers{$p{key}}->();
+    } else {
+        # A subclass called us -- just instantiate and return.
+        return bless \%p, $class;
+    }
+}
+
+=head2 Instance Method
+
+=head3 handler
+
+  $handler->handler($req);
+
+App::Info::Handler defines a single instance method that must be defined by
+its subclasses, C<handler()>. This is the method that will be executed by an
+event triggered by an App::Info concrete subclass. It takes as its single
+argument an App::Info::Request object, and returns a true value if it has
+handled the event request. Returning a false value declines the request, and
+App::Info will then move on to the next handler in the chain.
+
+The C<handler()> method implemented in App::Info::Handler itself does nothing
+more than return a true value. It thus acts as a very simple default event
+handler. See the App::Info::Handler subclasses for more interesting handling
+of events, or create your own!
+
+=cut
+
+sub handler { 1 }
+
+1;
+__END__
+
+=head1 SUBCLASSING
+
+I hatched the idea of the App::Info event model with its subclassable handlers
+as a way of separating the aggregation of application metadata from writing a
+user interface for handling certain conditions. I felt it a better idea to
+allow people to create their own user interfaces, and instead to provide only
+a few examples. The App::Info::Handler class defines the API interface for
+handling these conditions, which App::Info refers to as "events".
+
+There are various types of events defined by App::Info ("info", "error",
+"unknown", and "confirm"), but the App::Info::Handler interface is designed to
+be flexible enough to handle any and all of them. If you're interested in
+creating your own App::Info event handler, this is the place to learn how.
+
+=head2 The Interface
+
+To create an App::Info event handler, all one need do is subclass
+App::Info::Handler and then implement the C<new()> constructor and the
+C<handler()> method. The C<new()> constructor can do anything you like, and
+take any arguments you like. However, I do recommend that the first thing
+you do in your implementation is to call the super constructor:
+
+  sub new {
+      my $pkg = shift;
+      my $self = $pkg->SUPER::new(@_);
+      # ... other stuff.
+      return $self;
+  }
+
+Although the default C<new()> constructor currently doesn't do much, that may
+change in the future, so this call will keep you covered. What it does do is
+take the parameterized arguments and assign them to the App::Info::Handler
+object. Thus if you've specified a "mode" argument, where clients can
+construct objects of you class like this:
+
+  my $handler = FooHandler->new( mode => 'foo' );
+
+You can access the mode parameter directly from the object, like so:
+
+  sub new {
+      my $pkg = shift;
+      my $self = $pkg->SUPER::new(@_);
+      if ($self->{mode} eq 'foo') {
+          # ...
+      }
+      return $self;
+  }
+
+Just be sure not to use a parameter key name required by App::Info::Handler
+itself. At the moment, the only parameter accepted by App::Info::Handler is
+"key", so in general you'll be pretty safe.
+
+Next, I recommend that you take advantage of the C<register_handler()> method
+to create some shortcuts for creating handlers of your class. For example, say
+we're creating a handler subclass FooHandler. It has two modes, a default
+"foo" mode and an advanced "bar" mode. To allow both to be constructed by
+stringified shortcuts, the FooHandler class implementation might start like
+this:
+
+  package FooHandler;
+
+  use strict;
+  use App::Info::Handler;
+  use vars qw(@ISA);
+  @ISA = qw(App::Info::Handler);
+
+  foreach my $c (qw(foo bar)) {
+      App::Info::Handler->register_handler
+        ( $c => sub { __PACKAGE__->new( mode => $c) } );
+  }
+
+The strings "foo" and "bar" can then be used by clients as shortcuts to have
+App::Info objects automatically create and use handlers for certain events.
+For example, if a client wanted to use a "bar" event handler for its info
+events, it might do this:
+
+  use App::Info::Category::FooApp;
+  use FooHandler;
+
+  my $app = App::Info::Category::FooApp->new(on_info => ['bar']);
+
+Take a look at App::Info::Handler::Print and App::Info::Handler::Carp to see
+concrete examples of C<register_handler()> usage.
+
+The final step in creating a new App::Info event handler is to implement the
+C<handler()> method itself. This method takes a single argument, an
+App::Info::Request object, and is expected to return true if it handled the
+request, and false if it did not. The App::Info::Request object contains all
+the metadata relevant to a request, including the type of event that triggered
+it; see L<App::Info::Request|App::Info::Request> for its documentation.
+
+Use the App::Info::Request object however you like to handle the request
+however you like. You are, however, expected to abide by a a few guidelines:
+
+=over 4
+
+=item *
+
+For error and info events, you are expected (but not required) to somehow
+display the info or error message for the user. How your handler chooses to do
+so is up to you and the handler.
+
+=item *
+
+For unknown and confirm events, you are expected to prompt the user for a
+value. If it's a confirm event, offer the known value (found in
+C<$req-E<gt>value>) as a default.
+
+=item *
+
+For unknown and confirm events, you are expected to call C<$req-E<gt>callback>
+and pass in the new value. If C<$req-E<gt>callback> returns a false value, you
+are expected to display the error message in C<$req-E<gt>error> and prompt the
+user again. Note that C<$req-E<gt>value> calls C<$req-E<gt>callback>
+internally, and thus assigns the value and returns true if
+C<$req-E<gt>callback> returns true, and does not assign the value and returns
+false if C<$req-E<gt>callback> returns false.
+
+=item *
+
+For unknown and confirm events, if you've collected a new value and
+C<$req-E<gt>callback> returns true for that value, you are expected to assign
+the value by passing it to C<$req-E<gt>value>. This allows App::Info to give
+the value back to the calling App::Info concrete subclass.
+
+=back
+
+Probably the easiest way to get started creating new App::Info event handlers
+is to check out the simple handlers provided with the distribution and follow
+their logical examples. Consult the App::Info documentation of the L<event
+methods|App::Info/"Events"> for details on how App::Info constructs the
+App::Info::Request object for each event type.
+
+=head1 BUGS
+
+Report all bugs via the CPAN Request Tracker at
+L<http://rt.cpan.org/NoAuth/Bugs.html?Dist=App-Info>.
+
+=head1 AUTHOR
+
+David Wheeler <L<david@wheeler.net|"david@wheeler.net">>
+
+=head1 SEE ALSO
+
+L<App::Info|App::Info> thoroughly documents the client interface for setting
+event handlers, as well as the event triggering interface for App::Info
+concrete subclasses.
+
+L<App::Info::Request|App::Info::Request> documents the interface for the
+request objects passed to App::Info::Handler C<handler()> methods.
+
+The following App::Info::Handler subclasses offer examples for event handler
+authors, and, of course, provide actual event handling functionality for
+App::Info clients.
+
+=over 4
+
+=item L<App::Info::Handler::Carp|App::Info::Handler::Carp>
+
+=item L<App::Info::Handler::Print|App::Info::Handler::Print>
+
+=item L<App::Info::Handler::Prompt|App::Info::Handler::Prompt>
+
+=back
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (c) 2002, David Wheeler. All Rights Reserved.
+
+This module is free software; you can redistribute it and/or modify it under the
+same terms as Perl itself.
+
+=cut
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/Handler/Prompt.pm b/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/Handler/Prompt.pm
new file mode 100644
index 000000000..47edd7802
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/Handler/Prompt.pm
@@ -0,0 +1,170 @@
+package App::Info::Handler::Prompt;
+
+# $Id: Prompt.pm,v 1.1 2004-04-29 09:21:29 ivan Exp $
+
+=head1 NAME
+
+App::Info::Handler::Prompt - Prompting App::Info event handler
+
+=head1 SYNOPSIS
+
+  use App::Info::Category::FooApp;
+  use App::Info::Handler::Print;
+
+  my $prompter = App::Info::Handler::Print->new;
+  my $app = App::Info::Category::FooApp->new( on_unknown => $prompter );
+
+  # Or...
+  my $app = App::Info::Category::FooApp->new( on_confirm => 'prompt' );
+
+=head1 DESCRIPTION
+
+App::Info::Handler::Prompt objects handle App::Info events by printing their
+messages to C<STDOUT> and then accepting a new value from C<STDIN>. The new
+value is validated by any callback supplied by the App::Info concrete subclass
+that triggered the event. If the value is valid, App::Info::Handler::Prompt
+assigns the new value to the event request. If it isn't it prints the error
+message associated with the event request, and then prompts for the data
+again.
+
+Although designed with unknown and confirm events in mind,
+App::Info::Handler::Prompt handles info and error events as well. It will
+simply print info event messages to C<STDOUT> and print error event messages
+to C<STDERR>. For more interesting info and error event handling, see
+L<App::Info::Handler::Print|App::Info::Handler::Print> and
+L<App::Info::Handler::Carp|App::Info::Handler::Carp>.
+
+Upon loading, App::Info::Handler::Print registers itself with
+App::Info::Handler, setting up a single string, "prompt", that can be passed
+to an App::Info concrete subclass constructor. This string is a shortcut that
+tells App::Info how to create an App::Info::Handler::Print object for handling
+events.
+
+=cut
+
+use strict;
+use App::Info::Handler;
+use vars qw($VERSION @ISA);
+$VERSION = '0.22';
+@ISA = qw(App::Info::Handler);
+
+# Register ourselves.
+App::Info::Handler->register_handler
+  ('prompt' => sub { __PACKAGE__->new('prompt') } );
+
+=head1 INTERFACE
+
+=head2 Constructor
+
+=head3 new
+
+  my $prompter = App::Info::Handler::Prompt->new;
+
+Constructs a new App::Info::Handler::Prompt object and returns it. No special
+arguments are required.
+
+=cut
+
+sub new {
+    my $pkg = shift;
+    my $self = $pkg->SUPER::new(@_);
+    $self->{tty} = -t STDIN && ( -t STDOUT || !( -f STDOUT || -c STDOUT ) );
+    # We're done!
+    return $self;
+}
+
+my $get_ans = sub {
+    my ($prompt, $tty, $def) = @_;
+    # Print the message.
+    local $| = 1;
+    local $\;
+    print $prompt;
+
+    # Collect the answer.
+    my $ans;
+    if ($tty) {
+        $ans = <STDIN>;
+        if (defined $ans ) {
+            chomp $ans;
+        } else { # user hit ctrl-D
+            print "\n";
+        }
+    } else {
+        print "$def\n" if defined $def;
+    }
+    return $ans;
+};
+
+sub handler {
+    my ($self, $req) = @_;
+    my $ans;
+    my $type = $req->type;
+    if ($type eq 'unknown' || $type eq 'confirm') {
+        # We'll want to prompt for a new value.
+        my $val = $req->value;
+        my ($def, $dispdef) = defined $val ? ($val, " [$val] ") : ('', ' ');
+        my $msg = $req->message or Carp::croak("No message in request");
+        $msg .= $dispdef;
+
+        # Get the answer.
+        $ans = $get_ans->($msg, $self->{tty}, $def);
+        # Just return if they entered an empty string or we couldnt' get an
+        # answer.
+        return 1 unless defined $ans && $ans ne '';
+
+        # Validate the answer.
+        my $err = $req->error;
+        while (!$req->value($ans)) {
+            print "$err: '$ans'\n";
+            $ans = $get_ans->($msg, $self->{tty}, $def);
+            return 1 unless defined $ans && $ans ne '';
+        }
+
+    } elsif ($type eq 'info') {
+        # Just print the message.
+        print STDOUT $req->message, "\n";
+    } elsif ($type eq 'error') {
+        # Just print the message.
+        print STDERR $req->message, "\n";
+    } else {
+        # This shouldn't happen.
+        Carp::croak("Invalid request type '$type'");
+    }
+
+    # Return true to indicate that we've handled the request.
+    return 1;
+}
+
+1;
+__END__
+
+=head1 BUGS
+
+Report all bugs via the CPAN Request Tracker at
+L<http://rt.cpan.org/NoAuth/Bugs.html?Dist=App-Info>.
+
+=head1 AUTHOR
+
+David Wheeler <L<david@wheeler.net|"david@wheeler.net">>
+
+=head1 SEE ALSO
+
+L<App::Info|App::Info> documents the event handling interface.
+
+L<App::Info::Handler::Carp|App::Info::Handler::Carp> handles events by
+passing their messages Carp module functions.
+
+L<App::Info::Handler::Print|App::Info::Handler::Print> handles events by
+printing their messages to a file handle.
+
+L<App::Info::Handler|App::Info::Handler> describes how to implement custom
+App::Info event handlers.
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (c) 2002, David Wheeler. All Rights Reserved.
+
+This module is free software; you can redistribute it and/or modify it under the
+same terms as Perl itself.
+
+=cut
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/RDBMS.pm b/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/RDBMS.pm
new file mode 100644
index 000000000..504d5700d
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/RDBMS.pm
@@ -0,0 +1,55 @@
+package App::Info::RDBMS;
+
+# $Id: RDBMS.pm,v 1.1 2004-04-29 09:21:28 ivan Exp $
+
+use strict;
+use App::Info;
+use vars qw(@ISA $VERSION);
+@ISA = qw(App::Info);
+$VERSION = '0.22';
+
+1;
+__END__
+
+=head1 NAME
+
+App::Info::RDBMS - Information about databases on a system
+
+=head1 DESCRIPTION
+
+This class is an abstract base class for App::Info subclasses that provide
+information about relational databases. Its subclasses are required to
+implement its interface. See L<App::Info|App::Info> for a complete description
+and L<App::Info::RDBMS::PostgreSQL|App::Info::RDBMS::PostgreSQL> for an example
+implementation.
+
+=head1 INTERFACE
+
+Currently, App::Info::RDBMS adds no more methods than those from its parent
+class, App::Info.
+
+=head1 BUGS
+
+Report all bugs via the CPAN Request Tracker at
+L<http://rt.cpan.org/NoAuth/Bugs.html?Dist=App-Info>.
+
+=head1 AUTHOR
+
+David Wheeler <L<david@wheeler.net|"david@wheeler.net">>
+
+=head1 SEE ALSO
+
+L<App::Info|App::Info>,
+L<App::Info::RDBMS::PostgreSQL|App::Info::RDBMS::PostgreSQL>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (c) 2002, David Wheeler. All Rights Reserved.
+
+This module is free software; you can redistribute it and/or modify it under the
+same terms as Perl itself.
+
+=cut
+
+
+
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/RDBMS/PostgreSQL.pm b/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/RDBMS/PostgreSQL.pm
new file mode 100644
index 000000000..aef326cca
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/RDBMS/PostgreSQL.pm
@@ -0,0 +1,730 @@
+package App::Info::RDBMS::PostgreSQL;
+
+# $Id: PostgreSQL.pm,v 1.1 2004-04-29 09:21:29 ivan Exp $
+
+=head1 NAME
+
+App::Info::RDBMS::PostgreSQL - Information about PostgreSQL
+
+=head1 SYNOPSIS
+
+  use App::Info::RDBMS::PostgreSQL;
+
+  my $pg = App::Info::RDBMS::PostgreSQL->new;
+
+  if ($pg->installed) {
+      print "App name: ", $pg->name, "\n";
+      print "Version:  ", $pg->version, "\n";
+      print "Bin dir:  ", $pg->bin_dir, "\n";
+  } else {
+      print "PostgreSQL is not installed. :-(\n";
+  }
+
+=head1 DESCRIPTION
+
+App::Info::RDBMS::PostgreSQL supplies information about the PostgreSQL
+database server installed on the local system. It implements all of the
+methods defined by App::Info::RDBMS. Methods that trigger events will trigger
+them only the first time they're called (See L<App::Info|App::Info> for
+documentation on handling events). To start over (after, say, someone has
+installed PostgreSQL) construct a new App::Info::RDBMS::PostgreSQL object to
+aggregate new metadata.
+
+Some of the methods trigger the same events. This is due to cross-calling of
+shared subroutines. However, any one event should be triggered no more than
+once. For example, although the info event "Executing `pg_config --version`"
+is documented for the methods C<name()>, C<version()>, C<major_version()>,
+C<minor_version()>, and C<patch_version()>, rest assured that it will only be
+triggered once, by whichever of those four methods is called first.
+
+=cut
+
+use strict;
+use App::Info::RDBMS;
+use App::Info::Util;
+use vars qw(@ISA $VERSION);
+@ISA = qw(App::Info::RDBMS);
+$VERSION = '0.22';
+
+my $u = App::Info::Util->new;
+
+=head1 INTERFACE
+
+=head2 Constructor
+
+=head3 new
+
+  my $pg = App::Info::RDBMS::PostgreSQL->new(@params);
+
+Returns an App::Info::RDBMS::PostgreSQL object. See L<App::Info|App::Info> for
+a complete description of argument parameters.
+
+When it called, C<new()> searches the file system for the F<pg_config>
+application. If found, F<pg_config> will be called by the object methods below
+to gather the data necessary for each. If F<pg_config> cannot be found, then
+PostgreSQL is assumed not to be installed, and each of the object methods will
+return C<undef>.
+
+App::Info::RDBMS::PostgreSQL searches for F<pg_config> along your path, as
+defined by C<File::Spec-E<gt>path>. Failing that, it searches the following
+directories:
+
+=over 4
+
+=item /usr/local/pgsql/bin
+
+=item /usr/local/postgres/bin
+
+=item /opt/pgsql/bin
+
+=item /usr/local/bin
+
+=item /usr/local/sbin
+
+=item /usr/bin
+
+=item /usr/sbin
+
+=item /bin
+
+=back
+
+B<Events:>
+
+=over 4
+
+=item info
+
+Looking for pg_config
+
+=item confirm
+
+Path to pg_config?
+
+=item unknown
+
+Path to pg_config?
+
+=back
+
+=cut
+
+sub new {
+    # Construct the object.
+    my $self = shift->SUPER::new(@_);
+
+    # Find pg_config.
+    $self->info("Looking for pg_config");
+    my @paths = ($u->path,
+      qw(/usr/local/pgsql/bin
+         /usr/local/postgres/bin
+         /opt/pgsql/bin
+         /usr/local/bin
+         /usr/local/sbin
+         /usr/bin
+         /usr/sbin
+         /bin));
+
+    if (my $cfg = $u->first_cat_exe('pg_config', @paths)) {
+        # We found it. Confirm.
+        $self->{pg_config} = $self->confirm( key      => 'pg_config',
+                                             prompt   => 'Path to pg_config?',
+                                             value    => $cfg,
+                                             callback => sub { -x },
+                                             error    => 'Not an executable');
+    } else {
+        # Handle an unknown value.
+        $self->{pg_config} = $self->unknown( key      => 'pg_config',
+                                             prompt   => 'Path to pg_config?',
+                                             callback => sub { -x },
+                                             error    => 'Not an executable');
+    }
+
+    return $self;
+}
+
+# We'll use this code reference as a common way of collecting data.
+my $get_data = sub {
+    return unless $_[0]->{pg_config};
+    $_[0]->info("Executing `$_[0]->{pg_config} $_[1]`");
+    my $info = `$_[0]->{pg_config} $_[1]`;
+    chomp $info;
+    return $info;
+};
+
+##############################################################################
+
+=head2 Class Method
+
+=head3 key_name
+
+  my $key_name = App::Info::RDBMS::PostgreSQL->key_name;
+
+Returns the unique key name that describes this class. The value returned is
+the string "PostgreSQL".
+
+=cut
+
+sub key_name { 'PostgreSQL' }
+
+##############################################################################
+
+=head2 Object Methods
+
+=head3 installed
+
+  print "PostgreSQL is ", ($pg->installed ? '' : 'not '), "installed.\n";
+
+Returns true if PostgreSQL is installed, and false if it is not.
+App::Info::RDBMS::PostgreSQL determines whether PostgreSQL is installed based
+on the presence or absence of the F<pg_config> application on the file system
+as found when C<new()> constructed the object. If PostgreSQL does not appear
+to be installed, then all of the other object methods will return empty
+values.
+
+=cut
+
+sub installed { return $_[0]->{pg_config} ? 1 : undef }
+
+##############################################################################
+
+=head3 name
+
+  my $name = $pg->name;
+
+Returns the name of the application. App::Info::RDBMS::PostgreSQL parses the
+name from the system call C<`pg_config --version`>.
+
+B<Events:>
+
+=over 4
+
+=item info
+
+Executing `pg_config --version`
+
+=item error
+
+Failed to find PostgreSQL version with `pg_config --version`
+
+Unable to parse name from string
+
+Unable to parse version from string
+
+Failed to parse PostgreSQL version parts from string
+
+=item unknown
+
+Enter a valid PostgreSQL name
+
+=back
+
+=cut
+
+# This code reference is used by name(), version(), major_version(),
+# minor_version(), and patch_version() to aggregate the data they need.
+my $get_version = sub {
+    my $self = shift;
+    $self->{'--version'} = 1;
+    my $data = $get_data->($self, '--version');
+    unless ($data) {
+        $self->error("Failed to find PostgreSQL version with ".
+                     "`$self->{pg_config} --version");
+            return;
+    }
+
+    chomp $data;
+    my ($name, $version) =  split /\s+/, $data, 2;
+
+    # Check for and assign the name.
+    $name ?
+      $self->{name} = $name :
+      $self->error("Unable to parse name from string '$data'");
+
+    # Parse the version number.
+    if ($version) {
+        my ($x, $y, $z) = $version =~ /(\d+)\.(\d+).(\d+)/;
+        if (defined $x and defined $y and defined $z) {
+            @{$self}{qw(version major minor patch)} =
+              ($version, $x, $y, $z);
+        } else {
+            $self->error("Failed to parse PostgreSQL version parts from " .
+                         "string '$version'");
+        }
+    } else {
+        $self->error("Unable to parse version from string '$data'");
+    }
+};
+
+sub name {
+    my $self = shift;
+    return unless $self->{pg_config};
+
+    # Load data.
+    $get_version->($self) unless $self->{'--version'};
+
+    # Handle an unknown name.
+    $self->{name} ||= $self->unknown( key => 'name' );
+
+    # Return the name.
+    return $self->{name};
+}
+
+##############################################################################
+
+=head3 version
+
+  my $version = $pg->version;
+
+Returns the PostgreSQL version number. App::Info::RDBMS::PostgreSQL parses the
+version number from the system call C<`pg_config --version`>.
+
+B<Events:>
+
+=over 4
+
+=item info
+
+Executing `pg_config --version`
+
+=item error
+
+Failed to find PostgreSQL version with `pg_config --version`
+
+Unable to parse name from string
+
+Unable to parse version from string
+
+Failed to parse PostgreSQL version parts from string
+
+=item unknown
+
+Enter a valid PostgreSQL version number
+
+=back
+
+=cut
+
+sub version {
+    my $self = shift;
+    return unless $self->{pg_config};
+
+    # Load data.
+    $get_version->($self) unless $self->{'--version'};
+
+    # Handle an unknown value.
+    unless ($self->{version}) {
+        # Create a validation code reference.
+        my $chk_version = sub {
+            # Try to get the version number parts.
+            my ($x, $y, $z) = /^(\d+)\.(\d+).(\d+)$/;
+            # Return false if we didn't get all three.
+            return unless $x and defined $y and defined $z;
+            # Save all three parts.
+            @{$self}{qw(major minor patch)} = ($x, $y, $z);
+            # Return true.
+            return 1;
+        };
+        $self->{version} = $self->unknown( key      => 'version number',
+                                           callback => $chk_version);
+    }
+
+    return $self->{version};
+}
+
+##############################################################################
+
+=head3 major version
+
+  my $major_version = $pg->major_version;
+
+Returns the PostgreSQL major version number. App::Info::RDBMS::PostgreSQL
+parses the major version number from the system call C<`pg_config --version`>.
+For example, C<version()> returns "7.1.2", then this method returns "7".
+
+B<Events:>
+
+=over 4
+
+=item info
+
+Executing `pg_config --version`
+
+=item error
+
+Failed to find PostgreSQL version with `pg_config --version`
+
+Unable to parse name from string
+
+Unable to parse version from string
+
+Failed to parse PostgreSQL version parts from string
+
+=item unknown
+
+Enter a valid PostgreSQL major version number
+
+=back
+
+=cut
+
+# This code reference is used by major_version(), minor_version(), and
+# patch_version() to validate a version number entered by a user.
+my $is_int = sub { /^\d+$/ };
+
+sub major_version {
+    my $self = shift;
+    return unless $self->{pg_config};
+    # Load data.
+    $get_version->($self) unless exists $self->{'--version'};
+    # Handle an unknown value.
+    $self->{major} = $self->unknown( key      => 'major version number',
+                                     callback => $is_int)
+      unless $self->{major};
+    return $self->{major};
+}
+
+##############################################################################
+
+=head3 minor version
+
+  my $minor_version = $pg->minor_version;
+
+Returns the PostgreSQL minor version number. App::Info::RDBMS::PostgreSQL
+parses the minor version number from the system call C<`pg_config --version`>.
+For example, if C<version()> returns "7.1.2", then this method returns "2".
+
+B<Events:>
+
+=over 4
+
+=item info
+
+Executing `pg_config --version`
+
+=item error
+
+Failed to find PostgreSQL version with `pg_config --version`
+
+Unable to parse name from string
+
+Unable to parse version from string
+
+Failed to parse PostgreSQL version parts from string
+
+=item unknown
+
+Enter a valid PostgreSQL minor version number
+
+=back
+
+=cut
+
+sub minor_version {
+    my $self = shift;
+    return unless $self->{pg_config};
+    # Load data.
+    $get_version->($self) unless exists $self->{'--version'};
+    # Handle an unknown value.
+    $self->{minor} = $self->unknown( key      => 'minor version number',
+                                     callback => $is_int)
+      unless defined $self->{minor};
+    return $self->{minor};
+}
+
+##############################################################################
+
+=head3 patch version
+
+  my $patch_version = $pg->patch_version;
+
+Returns the PostgreSQL patch version number. App::Info::RDBMS::PostgreSQL
+parses the patch version number from the system call C<`pg_config --version`>.
+For example, if C<version()> returns "7.1.2", then this method returns "1".
+
+B<Events:>
+
+=over 4
+
+=item info
+
+Executing `pg_config --version`
+
+=item error
+
+Failed to find PostgreSQL version with `pg_config --version`
+
+Unable to parse name from string
+
+Unable to parse version from string
+
+Failed to parse PostgreSQL version parts from string
+
+=item unknown
+
+Enter a valid PostgreSQL minor version number
+
+=back
+
+=cut
+
+sub patch_version {
+    my $self = shift;
+    return unless $self->{pg_config};
+    # Load data.
+    $get_version->($self) unless exists $self->{'--version'};
+    # Handle an unknown value.
+    $self->{patch} = $self->unknown( key      => 'patch version number',
+                                     callback => $is_int)
+      unless defined $self->{patch};
+    return $self->{patch};
+}
+
+##############################################################################
+
+=head3 bin_dir
+
+  my $bin_dir = $pg->bin_dir;
+
+Returns the PostgreSQL binary directory path. App::Info::RDBMS::PostgreSQL
+gathers the path from the system call C<`pg_config --bindir`>.
+
+B<Events:>
+
+=over 4
+
+=item info
+
+Executing `pg_config --bindir`
+
+=item error
+
+Cannot find bin directory
+
+=item unknown
+
+Enter a valid PostgreSQL bin directory
+
+=back
+
+=cut
+
+# This code reference is used by bin_dir(), lib_dir(), and so_lib_dir() to
+# validate a directory entered by the user.
+my $is_dir = sub { -d };
+
+sub bin_dir {
+    my $self = shift;
+    return unless $self->{pg_config};
+    unless (exists $self->{bin_dir} ) {
+        if (my $dir = $get_data->($self, '--bindir')) {
+            $self->{bin_dir} = $dir;
+        } else {
+            # Handle an unknown value.
+            $self->error("Cannot find bin directory");
+            $self->{bin_dir} = $self->unknown( key      => 'bin directory',
+                                               callback => $is_dir)
+        }
+    }
+
+    return $self->{bin_dir};
+}
+
+##############################################################################
+
+=head3 inc_dir
+
+  my $inc_dir = $pg->inc_dir;
+
+Returns the PostgreSQL include directory path. App::Info::RDBMS::PostgreSQL
+gathers the path from the system call C<`pg_config --includedir`>.
+
+B<Events:>
+
+=over 4
+
+=item info
+
+Executing `pg_config --includedir`
+
+=item error
+
+Cannot find include directory
+
+=item unknown
+
+Enter a valid PostgreSQL include directory
+
+=back
+
+=cut
+
+sub inc_dir {
+    my $self = shift;
+    return unless $self->{pg_config};
+    unless (exists $self->{inc_dir} ) {
+        if (my $dir = $get_data->($self, '--includedir')) {
+            $self->{inc_dir} = $dir;
+        } else {
+            # Handle an unknown value.
+            $self->error("Cannot find include directory");
+            $self->{inc_dir} = $self->unknown( key      => 'include directory',
+                                               callback => $is_dir)
+        }
+    }
+
+    return $self->{inc_dir};
+}
+
+##############################################################################
+
+=head3 lib_dir
+
+  my $lib_dir = $pg->lib_dir;
+
+Returns the PostgreSQL library directory path. App::Info::RDBMS::PostgreSQL
+gathers the path from the system call C<`pg_config --libdir`>.
+
+B<Events:>
+
+=over 4
+
+=item info
+
+Executing `pg_config --libdir`
+
+=item error
+
+Cannot find library directory
+
+=item unknown
+
+Enter a valid PostgreSQL library directory
+
+=back
+
+=cut
+
+sub lib_dir {
+    my $self = shift;
+    return unless $self->{pg_config};
+    unless (exists $self->{lib_dir} ) {
+        if (my $dir = $get_data->($self, '--libdir')) {
+            $self->{lib_dir} = $dir;
+        } else {
+            # Handle an unknown value.
+            $self->error("Cannot find library directory");
+            $self->{lib_dir} = $self->unknown( key      => 'library directory',
+                                               callback => $is_dir)
+        }
+    }
+
+    return $self->{lib_dir};
+}
+
+##############################################################################
+
+=head3 so_lib_dir
+
+  my $so_lib_dir = $pg->so_lib_dir;
+
+Returns the PostgreSQL shared object library directory path.
+App::Info::RDBMS::PostgreSQL gathers the path from the system call
+C<`pg_config --pkglibdir`>.
+
+B<Events:>
+
+=over 4
+
+=item info
+
+Executing `pg_config --pkglibdir`
+
+=item error
+
+Cannot find shared object library directory
+
+=item unknown
+
+Enter a valid PostgreSQL shared object library directory
+
+=back
+
+=cut
+
+# Location of dynamically loadable modules.
+sub so_lib_dir {
+    my $self = shift;
+    return unless $self->{pg_config};
+    unless (exists $self->{so_lib_dir} ) {
+        if (my $dir = $get_data->($self, '--pkglibdir')) {
+            $self->{so_lib_dir} = $dir;
+        } else {
+            # Handle an unknown value.
+            $self->error("Cannot find shared object library directory");
+            $self->{so_lib_dir} =
+              $self->unknown( key      => 'shared object library directory',
+                              callback => $is_dir)
+        }
+    }
+
+    return $self->{so_lib_dir};
+}
+
+##############################################################################
+
+=head3 home_url
+
+  my $home_url = $pg->home_url;
+
+Returns the PostgreSQL home page URL.
+
+=cut
+
+sub home_url { "http://www.postgresql.org/" }
+
+##############################################################################
+
+=head3 download_url
+
+  my $download_url = $pg->download_url;
+
+Returns the PostgreSQL download URL.
+
+=cut
+
+sub download_url { "http://www.ca.postgresql.org/sitess.html" }
+
+1;
+__END__
+
+=head1 BUGS
+
+Report all bugs via the CPAN Request Tracker at
+L<http://rt.cpan.org/NoAuth/Bugs.html?Dist=App-Info>.
+
+=head1 AUTHOR
+
+David Wheeler <L<david@wheeler.net|"david@wheeler.net">> based on code by Sam
+Tregar <L<sam@tregar.com|"sam@tregar.com">>.
+
+=head1 SEE ALSO
+
+L<App::Info|App::Info> documents the event handling interface.
+
+L<App::Info::RDBMS|App::Info::RDBMS> is the App::Info::RDBMS::PostgreSQL
+parent class.
+
+L<DBD::Pg|DBD::Pg> is the L<DBI|DBI> driver for connecting to PostgreSQL
+databases.
+
+L<http://www.postgresql.org/> is the PostgreSQL home page.
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (c) 2002, David Wheeler. All Rights Reserved.
+
+This module is free software; you can redistribute it and/or modify it under the
+same terms as Perl itself.
+
+=cut
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/Request.pm b/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/Request.pm
new file mode 100644
index 000000000..c02c97ba2
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/Request.pm
@@ -0,0 +1,287 @@
+package App::Info::Request;
+
+# $Id: Request.pm,v 1.1 2004-04-29 09:21:28 ivan Exp $
+
+=head1 NAME
+
+App::Info::Request - App::Info event handler request object
+
+=head1 SYNOPSIS
+
+  # In an App::Info::Handler subclass:
+  sub handler {
+      my ($self, $req) = @_;
+      print "Event Type:  ", $req->type;
+      print "Message:     ", $req->message;
+      print "Error:       ", $req->error;
+      print "Value:       ", $req->value;
+  }
+
+=head1 DESCRIPTION
+
+Objects of this class are passed to the C<handler()> method of App::Info event
+handlers. Generally, this class will be of most interest to App::Info::Handler
+subclass implementers.
+
+The L<event triggering methods|App::Info/"Events"> in App::Info each construct
+a new App::Info::Request object and initialize it with their arguments. The
+App::Info::Request object is then the sole argument passed to the C<handler()>
+method of any and all App::Info::Handler objects in the event handling chain.
+Thus, if you'd like to create your own App::Info event handler, this is the
+object you need to be familiar with. Consult the
+L<App::Info::Handler|App::Info::Handler> documentation for details on creating
+custom event handlers.
+
+Each of the App::Info event triggering methods constructs an
+App::Info::Request object with different attribute values. Be sure to consult
+the documentation for the L<event triggering methods|App::Info/"Events"> in
+App::Info, where the values assigned to the App::Info::Request object are
+documented. Then, in your event handler subclass, check the value returned by
+the C<type()> method to determine what type of event request you're handling
+to handle the request appropriately.
+
+=cut
+
+use strict;
+use vars qw($VERSION);
+$VERSION = '0.23';
+
+##############################################################################
+
+=head1 INTERFACE
+
+The following sections document the App::Info::Request interface.
+
+=head2 Constructor
+
+=head3 new
+
+  my $req = App::Info::Request->new(%params);
+
+This method is used internally by App::Info to construct new
+App::Info::Request objects to pass to event handler objects. Generally, you
+won't need to use it, other than perhaps for testing custom App::Info::Handler
+classes.
+
+The parameters to C<new()> are passed as a hash of named parameters that
+correspond to their like-named methods. The supported parameters are:
+
+=over 4
+
+=item type
+
+=item message
+
+=item error
+
+=item value
+
+=item callback
+
+=back
+
+See the object methods documentation below for details on these object
+attributes.
+
+=cut
+
+sub new {
+    my $pkg = shift;
+
+    # Make sure we've got a hash of arguments.
+    Carp::croak("Odd number of parameters in call to " . __PACKAGE__ .
+                "->new() when named parameters expected" ) if @_ % 2;
+    my %params = @_;
+
+    # Validate the callback.
+    if ($params{callback}) {
+        Carp::croak("Callback parameter '$params{callback}' is not a code ",
+                    "reference")
+            unless UNIVERSAL::isa($params{callback}, 'CODE');
+    } else {
+        # Otherwise just assign a default approve callback.
+        $params{callback} = sub { 1 };
+    }
+
+    # Validate type parameter.
+    if (my $t = $params{type}) {
+        Carp::croak("Invalid handler type '$t'")
+          unless $t eq 'error' or $t eq 'info' or $t eq 'unknown'
+          or $t eq 'confirm';
+    } else {
+        $params{type} = 'info';
+    }
+
+    # Return the request object.
+    bless \%params, ref $pkg || $pkg;
+}
+
+##############################################################################
+
+=head2 Object Methods
+
+=head3 message
+
+  my $message = $req->message;
+
+Returns the message stored in the App::Info::Request object. The message is
+typically informational, or an error message, or a prompt message.
+
+=cut
+
+sub message { $_[0]->{message} }
+
+##############################################################################
+
+=head3 error
+
+  my $error = $req->error;
+
+Returns any error message associated with the App::Info::Request object. The
+error message is typically there to display for users when C<callback()>
+returns false.
+
+=cut
+
+sub error { $_[0]->{error} }
+
+##############################################################################
+
+=head3 type
+
+  my $type = $req->type;
+
+Returns a string representing the type of event that triggered this request.
+The types are the same as the event triggering methods defined in App::Info.
+As of this writing, the supported types are:
+
+=over
+
+=item info
+
+=item error
+
+=item unknown
+
+=item confirm
+
+=back
+
+Be sure to consult the App::Info documentation for more details on the event
+types.
+
+=cut
+
+sub type { $_[0]->{type} }
+
+##############################################################################
+
+=head3 callback
+
+  if ($req->callback($value)) {
+      print "Value '$value' is valid.\n";
+  } else {
+      print "Value '$value' is not valid.\n";
+  }
+
+Executes the callback anonymous subroutine supplied by the App::Info concrete
+base class that triggered the event. If the callback returns false, then
+C<$value> is invalid. If the callback returns true, then C<$value> is valid
+and can be assigned via the C<value()> method.
+
+Note that the C<value()> method itself calls C<callback()> if it was passed a
+value to assign. See its documentation below for more information.
+
+=cut
+
+sub callback {
+    my $self = shift;
+    my $code = $self->{callback};
+    local $_ = $_[0];
+    $code->(@_);
+}
+
+##############################################################################
+
+=head3 value
+
+  my $value = $req->value;
+  if ($req->value($value)) {
+      print "Value '$value' successfully assigned.\n";
+  } else {
+      print "Value '$value' not successfully assigned.\n";
+  }
+
+When called without an argument, C<value()> simply returns the value currently
+stored by the App::Info::Request object. Typically, the value is the default
+value for a confirm event, or a value assigned to an unknown event.
+
+When passed an argument, C<value()> attempts to store the the argument as a
+new value. However, C<value()> calls C<callback()> on the new value, and if
+C<callback()> returns false, then C<value()> returns false and does not store
+the new value. If C<callback()> returns true, on the other hand, then
+C<value()> goes ahead and stores the new value and returns true.
+
+=cut
+
+sub value {
+    my $self = shift;
+    if ($#_ >= 0) {
+        # grab the value.
+        my $value = shift;
+        # Validate the value.
+        if ($self->callback($value)) {
+            # The value is good. Assign it and return true.
+            $self->{value} = $value;
+            return 1;
+        } else {
+            # Invalid value. Return false.
+            return;
+        }
+    }
+    # Just return the value.
+    return $self->{value};
+}
+
+1;
+__END__
+
+=head1 BUGS
+
+Report all bugs via the CPAN Request Tracker at
+L<http://rt.cpan.org/NoAuth/Bugs.html?Dist=App-Info>.
+
+=head1 AUTHOR
+
+David Wheeler <L<david@wheeler.net|"david@wheeler.net">>
+
+=head1 SEE ALSO
+
+L<App::Info|App::Info> documents the event triggering methods and how they
+construct App::Info::Request objects to pass to event handlers.
+
+L<App::Info::Handler:|App::Info::Handler> documents how to create custom event
+handlers, which must make use of the App::Info::Request object passed to their
+C<handler()> object methods.
+
+The following classes subclass App::Info::Handler, and thus offer good
+exemplars for using App::Info::Request objects when handling events.
+
+=over 4
+
+=item L<App::Info::Handler::Carp|App::Info::Handler::Carp>
+
+=item L<App::Info::Handler::Print|App::Info::Handler::Print>
+
+=item L<App::Info::Handler::Prompt|App::Info::Handler::Prompt>
+
+=back
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (c) 2002, David Wheeler. All Rights Reserved.
+
+This module is free software; you can redistribute it and/or modify it under the
+same terms as Perl itself.
+
+=cut
diff --git a/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/Util.pm b/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/Util.pm
new file mode 100644
index 000000000..55bb333cd
--- /dev/null
+++ b/install/5.005/DBD-Pg-1.22-fixvercmp/t/lib/App/Info/Util.pm
@@ -0,0 +1,456 @@
+package App::Info::Util;
+
+# $Id: Util.pm,v 1.1 2004-04-29 09:21:28 ivan Exp $
+
+=head1 NAME
+
+App::Info::Util - Utility class for App::Info subclasses
+
+=head1 SYNOPSIS
+
+  use App::Info::Util;
+
+  my $util = App::Info::Util->new;
+
+  # Subclasses File::Spec.
+  my @paths = $util->paths;
+
+  # First directory that exists in a list.
+  my $dir = $util->first_dir(@paths);
+
+  # First directory that exists in a path.
+  $dir = $util->first_path($ENV{PATH});
+
+  # First file that exists in a list.
+  my $file = $util->first_file('this.txt', '/that.txt', 'C:\\foo.txt');
+
+  # First file found among file base names and directories.
+  my $files = ['this.txt', 'that.txt'];
+  $file = $util->first_cat_file($files, @paths);
+
+=head1 DESCRIPTION
+
+This class subclasses L<File::Spec|File::Spec> and adds its own methods in
+order to offer utility methods to L<App::Info|App::Info> classes. Although
+intended to be used by App::Info subclasses, in truth App::Info::Util's
+utility may be considered more general, so feel free to use it elsewhere.
+
+The methods added in addition to the usual File::Spec suspects are designed to
+facilitate locating files and directories on the file system, as well as
+searching those files. The assumption is that, in order to provide useful
+metadata about a given software package, an App::Info subclass must find
+relevant files and directories and parse them with regular expressions. This
+class offers methods that simplify those tasks.
+
+=cut
+
+use strict;
+use File::Spec ();
+use vars qw(@ISA $VERSION);
+@ISA = qw(File::Spec);
+$VERSION = '0.22';
+
+my %path_dems = (MacOS   => qr',',
+                 MSWin32 => qr';',
+                 os2     => qr';',
+                 VMS     => undef,
+                 epoc    => undef);
+
+my $path_dem = exists $path_dems{$^O} ? $path_dems{$^O} : qr':';
+
+=head1 CONSTRUCTOR
+
+=head2 new
+
+  my $util = App::Info::Util->new;
+
+This is a very simple constructor that merely returns an App::Info::Util
+object. Since, like its File::Spec super class, App::Info::Util manages no
+internal data itself, all methods may be used as class methods, if one prefers
+to. The constructor here is provided merely as a convenience.
+
+=cut
+
+sub new { bless {}, ref $_[0] || $_[0] }
+
+=head1 OBJECT METHODS
+
+In addition to all of the methods offered by its super class,
+L<File::Spec|File::Spec>, App::Info::Util offers the following methods.
+
+=head2 first_dir
+
+  my @paths = $util->paths;
+  my $dir = $util->first_dir(@dirs);
+
+Returns the first file system directory in @paths that exists on the local
+file system. Only the first item in @paths that exists as a directory will be
+returned; any other paths leading to non-directories will be ignored.
+
+=cut
+
+sub first_dir {
+    shift;
+    foreach (@_) { return $_ if -d }
+    return;
+}
+
+=head2 first_path
+
+  my $path = $ENV{PATH};
+  $dir = $util->first_path($path);
+
+Takes the $path string and splits it into a list of directory paths, based on
+the path demarcator on the local file system. Then calls C<first_dir()> to
+return the first directoy in the path list that exists on the local file
+system. The path demarcator is specified for the following file systems:
+
+=over 4
+
+=item MacOS: ","
+
+=item MSWin32: ";"
+
+=item os2: ";"
+
+=item VMS: undef
+
+This method always returns undef on VMS. Patches welcome.
+
+=item epoc: undef
+
+This method always returns undef on epoch. Patches welcome.
+
+=item Unix: ":"
+
+All other operating systems are assumed to be Unix-based.
+
+=back
+
+=cut
+
+sub first_path {
+    return unless $path_dem;
+    shift->first_dir(split /$path_dem/, shift)
+}
+
+=head2 first_file
+
+  my $file = $util->first_file(@filelist);
+
+Examines each of the files in @filelist and returns the first one that exists
+on the file system. The file must be a regular file -- directories will be
+ignored.
+
+=cut
+
+sub first_file {
+    shift;
+    foreach (@_) { return $_ if -f }
+    return;
+}
+
+=head2 first_exe
+
+  my $exe = $util->first_exe(@exelist);
+
+Examines each of the files in @exelist and returns the first one that exists
+on the file system as an executable file. Directories will be ignored.
+
+=cut
+
+sub first_exe {
+    shift;
+    foreach (@_) { return $_ if -f && -x }
+    return;
+}
+
+=head2 first_cat_path
+
+  my $file = $util->first_cat_path('ick.txt', @paths);
+  $file = $util->first_cat_path(['this.txt', 'that.txt'], @paths);
+
+The first argument to this method may be either a file or directory base name
+(that is, a file or directory name without a full path specification), or a
+reference to an array of file or directory base names. The remaining arguments
+constitute a list of directory paths. C<first_cat_path()> processes each of
+these directory paths, concatenates (by the method native to the local
+operating system) each of the file or directory base names, and returns the
+first one that exists on the file system.
+
+For example, let us say that we were looking for a file called either F<httpd>
+or F<apache>, and it could be in any of the following paths:
+F</usr/local/bin>, F</usr/bin/>, F</bin>. The method call looks like this:
+
+  my $httpd = $util->first_cat_path(['httpd', 'apache'], '/usr/local/bin',
+                                    '/usr/bin/', '/bin');
+
+If the OS is a Unix variant, C<first_cat_path()> will then look for the first
+file that exists in this order:
+
+=over 4
+
+=item /usr/local/bin/httpd
+
+=item /usr/local/bin/apache
+
+=item /usr/bin/httpd
+
+=item /usr/bin/apache
+
+=item /bin/httpd
+
+=item /bin/apache
+
+=back
+
+The first of these complete paths to be found will be returned. If none are
+found, then undef will be returned.
+
+=cut
+
+sub first_cat_path {
+    my $self = shift;
+    my $files = ref $_[0] ? shift() : [shift()];
+    foreach my $p (@_) {
+        foreach my $f (@$files) {
+            my $path = $self->catfile($p, $f);
+            return $path if -e $path;
+        }
+    }
+    return;
+}
+
+=head2 first_cat_dir
+
+  my $dir = $util->first_cat_dir('ick.txt', @paths);
+  $dir = $util->first_cat_dir(['this.txt', 'that.txt'], @paths);
+
+Funtionally identical to C<first_cat_path()>, except that it returns the
+directory path in which the first file was found, rather than the full
+concatenated path. Thus, in the above example, if the file found was
+F</usr/bin/httpd>, while C<first_cat_path()> would return that value,
+C<first_cat_dir()> would return F</usr/bin> instead.
+
+=cut
+
+sub first_cat_dir {
+    my $self = shift;
+    my $files = ref $_[0] ? shift() : [shift()];
+    foreach my $p (@_) {
+        foreach my $f (@$files) {
+            my $path = $self->catfile($p, $f);
+            return $p if -e $path;
+        }
+    }
+    return;
+}
+
+=head2 first_cat_exe
+
+  my $exe = $util->first_cat_exe('ick.txt', @paths);
+  $exe = $util->first_cat_exe(['this.txt', 'that.txt'], @paths);
+
+Funtionally identical to C<first_cat_path()>, except that it returns the full
+path to the first executable file found, rather than simply the first file
+found.
+
+=cut
+
+sub first_cat_exe {
+    my $self = shift;
+    my $files = ref $_[0] ? shift() : [shift()];
+    foreach my $p (@_) {
+        foreach my $f (@$files) {
+            my $path = $self->catfile($p, $f);
+            return $path if -f $path && -x $path;
+        }
+    }
+    return;
+}
+
+=head2 search_file
+
+  my $file = 'foo.txt';
+  my $regex = qr/(text\s+to\s+find)/;
+  my $value = $util->search_file($file, $regex);
+
+Opens C<$file> and executes the C<$regex> regular expression against each line
+in the file. Once the line matches and one or more values is returned by the
+match, the file is closed and the value or values returned.
+
+For example, say F<foo.txt> contains the line "Version 6.5, patch level 8",
+and you need to grab each of the three version parts. All three parts can
+be grabbed like this:
+
+  my $regex = qr/Version\s+(\d+)\.(\d+),[^\d]*(\d+)/;
+  my @nums = $util->search_file($file, $regex);
+
+Now C<@nums> will contain the values C<(6, 5, 8)>. Note that in a scalar
+context, the above search would yeild an array reference:
+
+  my $regex = qr/Version\s+(\d+)\.(\d+),[^\d]*(\d+)/;
+  my $nums = $util->search_file($file, $regex);
+
+So now C<$nums> contains C<[6, 5, 8]>. The same does not hold true if the
+match returns only one value, however. Say F<foo.txt> contains the line
+"king of the who?", and you wish to know who the king is king of. Either
+of the following two calls would get you the data you need:
+
+  my $minions = $util->search_file($file, qr/King\s+of\s+(.*)/);
+  my @minions = $util->search_file($file, qr/King\s+of\s+(.*)/);
+
+In the first case, because the regular expression contains only one set of
+parentheses, C<search_file()> will simply return that value: C<$minions>
+contains the string "the who?". In the latter case, C<@minions> of course
+contains a single element: C<("the who?")>.
+
+Note that a regular expression without parentheses -- that is, one that
+doesn't grab values and put them into $1, $2, etc., will never successfully
+match a line in this method. You must include something to parentetically
+match. If you just want to know the value of what was matched, parenthesize
+the whole thing and if the value returns, you have a match. Also, if you need
+to match patterns across lines, try using multiple regular expressions with
+C<multi_search_file()>, instead.
+
+=cut
+
+sub search_file {
+    my ($self, $file, $regex) = @_;
+    return unless $file && $regex;
+    open F, "<$file" or Carp::croak "Cannot open $file: $!\n";
+    my @ret;
+    while (<F>) {
+        # If we find a match, we're done.
+        (@ret) = /$regex/ and last;
+    }
+    close F;
+    # If the match returned an more than one value, always return the full
+    # array. Otherwise, return just the first value in a scalar context.
+    return unless @ret;
+    return wantarray ? @ret : $#ret <= 0 ? $ret[0] : \@ret;
+}
+
+=head2 multi_search_file
+
+  my @regexen = (qr/(one)/, qr/(two)\s+(three)/);
+  my @matches = $util->multi_search_file($file, @regexen);
+
+Like C<search_file()>, this mehod opens C<$file> and parses it for regular
+expresion matches. This method, however, can take a list of regular
+expressions to look for, and will return the values found for all of them.
+Regular expressions that match and return multiple values will be returned as
+array referernces, while those that match and return a single value will
+return just that single value.
+
+For example, say you are parsing a file with lines like the following:
+
+  #define XML_MAJOR_VERSION 1
+  #define XML_MINOR_VERSION 95
+  #define XML_MICRO_VERSION 2
+
+You need to get each of these numbers, but calling C<search_file()> for each
+of them would be wasteful, as each call to C<search_file()> opens the file and
+parses it. With C<multi_search_file()>, on the other hand, the file will be
+opened only once, and, once all of the regular expressions have returned
+matches, the file will be closed and the matches returned.
+
+Thus the above values can be collected like this:
+
+  my @regexen = ( qr/XML_MAJOR_VERSION\s+(\d+)$/,
+                  qr/XML_MINOR_VERSION\s+(\d+)$/,
+                  qr/XML_MICRO_VERSION\s+(\d+)$/ );
+
+  my @nums = $file->multi_search_file($file, @regexen);
+
+The result will be that C<@nums> contains C<(1, 95, 2)>. Note that
+C<multi_file_search()> tries to do the right thing by only parsing the file
+until all of the regular expressions have been matched. Thus, a large file
+with the values you need near the top can be parsed very quickly.
+
+As with C<search_file()>, C<multi_search_file()> can take regular expressions
+that match multiple values. These will be returned as array references. For
+example, say the file you're parsing has files like this:
+
+  FooApp Version 4
+  Subversion 2, Microversion 6
+
+To get all of the version numbers, you can either use three regular
+expressions, as in the previous example:
+
+  my @regexen = ( qr/FooApp\s+Version\s+(\d+)$/,
+                  qr/Subversion\s+(\d+),/,
+                  qr/Microversion\s+(\d$)$/ );
+
+  my @nums = $file->multi_search_file($file, @regexen);
+
+In which case C<@nums> will contain C<(4, 2, 6)>. Or, you can use just two
+regular expressions:
+
+  my @regexen = ( qr/FooApp\s+Version\s+(\d+)$/,
+                  qr/Subversion\s+(\d+),\s+Microversion\s+(\d$)$/ );
+
+  my @nums = $file->multi_search_file($file, @regexen);
+
+In which case C<@nums> will contain C<(4, [2, 6])>. Note that the two
+parentheses that return values in the second regular expression cause the
+matches to be returned as an array reference.
+
+=cut
+
+sub multi_search_file {
+    my ($self, $file, @regexen) = @_;
+    return unless $file && @regexen;
+    my @each = @regexen;
+    open F, "<$file" or Carp::croak "Cannot open $file: $!\n";
+    my %ret;
+    while (my $line = <F>) {
+        my @splice;
+        # Process each of the regular expresssions.
+        for (my $i = 0; $i < @each; $i++) {
+            if ((my @ret) = $line =~ /$each[$i]/) {
+                # We have a match! If there's one match returned, just grab
+                # it. If there's more than one, keep it as an array ref.
+                $ret{$each[$i]} = $#ret > 0 ? \@ret : $ret[0];
+                # We got values for this regex, so not its place in the @each
+                # array.
+                push @splice, $i;
+            }
+        }
+        # Remove any regexen that have already found a match.
+        for (@splice) { splice @each, $_, 1 }
+        # If there are no more regexes, we're done -- no need to keep
+        # processing lines in the file!
+        last unless @each;
+    }
+    close F;
+    return unless %ret;
+    return wantarray ? @ret{@regexen} : \@ret{@regexen};
+}
+
+1;
+__END__
+
+=head1 BUGS
+
+Report all bugs via the CPAN Request Tracker at
+L<http://rt.cpan.org/NoAuth/Bugs.html?Dist=App-Info>.
+
+=head1 AUTHOR
+
+David Wheeler <L<david@wheeler.net|"david@wheeler.net">>
+
+=head1 SEE ALSO
+
+L<App::Info|App::Info>, L<File::Spec|File::Spec>,
+L<App::Info::HTTPD::Apache|App::Info::HTTPD::Apache>
+L<App::Info::RDBMS::PostgreSQL|App::Info::RDBMS::PostgreSQL>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (c) 2002, David Wheeler. All Rights Reserved.
+
+This module is free software; you can redistribute it and/or modify it under the
+same terms as Perl itself.
+
+=cut
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/Changes b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/Changes
new file mode 100644
index 000000000..f413bd959
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/Changes
@@ -0,0 +1,62 @@
+Revision history for Perl extension DBIx::DBSchema.
+
+0.23 Mon Feb 16 17:35:54 PST 2004
+	- Update Pg dependancy to 1.32
+	- Update the simple load test so it skips DBIx::DBSchema::DBD::Pg if
+          DBD::Pg 1.32 is not installed.
+
+0.22 Thu Oct 23 15:18:21 PDT 2003
+	- Pg reverse-engineering fix: varchar with no limit
+	- Pg needs (unreleased) DBD::Pg 1.30 (or deb 1.22-2... interesting)
+
+0.21 Thu Sep 19 05:04:18 PDT 2002
+	- Pg reverse-engineering fix: now sets default
+
+0.20 Mon Mar  4 04:58:34 2002
+	- documentation updates
+	- fix Column->new when using named params
+	- fix Pg driver reverse-engineering length of numeric columns:
+	  translate 655362 to 10,2, etc.
+	- fix Pg driver reverse-engineering of text columns (don't have a
+	  length)
+
+0.19 Tue Oct 23 08:49:12 2001
+	- documentation for %typemap
+	- preliminary Sybase driver from Charles Shapiro
+	  <charles.shapiro@numethods.com> and Mitchell J. Friedman
+	  <mitchell.friedman@numethods.com>.
+	- Fix Column::line to return a scalar as documented, not a list.
+	- Should finally eliminate the Use of uninitialized value at
+	  ... DBIx/DBSchema/Column.pm line 251
+
+0.18 Fri Aug 10 17:07:28 2001
+	- Added Table::delcolumn
+	- patch from Charles Shapiro <cshapiro@numethods.com> to add
+          `ORDER BY a.attnum' to the SQL in DBIx::DBSchema::DBD::Pg::columns
+
+0.17  Sat Jul  7 17:55:33 2001
+	- Rework Table->new interface for named params
+	- Fixes for Pg blobs, yay!
+	- MySQL doesn't need non-standard index syntax anymore (since 3.22).
+	- patch from Mark Ethan Trostler <mark@zzo.com> for generating
+	  tables without indices.
+
+0.16  Fri Jan  5 15:55:50 2001
+	- Don't overflow index names.
+
+0.15  Fri Nov 24 23:39:16 2000
+	- MySQL handling of BOOL type (change to TINYINT)
+
+0.14  Tue Oct 24 14:43:16 2000
+        - MySQL handling of SERIAL type (change to INTEGER AUTO_INCREMENT)
+
+0.13  Wed Oct 11 10:47:13 2000
+        - fixed up type mapping foo, added default values, added named
+          parameters to Column->new, fixed quoting of default values
+
+0.11  Sun Sep 28 02:16:25 2000
+        - oops, original verison got 0.10, so this one will get 0.11
+
+0.01  Sun Sep 17 07:57:35 2000
+	- original version; created by h2xs 1.19
+
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema.pm b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema.pm
new file mode 100644
index 000000000..fc4916df1
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema.pm
@@ -0,0 +1,367 @@
+package DBIx::DBSchema;
+
+use strict;
+use vars qw(@ISA $VERSION);
+#use Exporter;
+use Carp qw(confess);
+use DBI;
+use FreezeThaw qw(freeze thaw cmpStr);
+use DBIx::DBSchema::Table;
+use DBIx::DBSchema::Column;
+use DBIx::DBSchema::ColGroup::Unique;
+use DBIx::DBSchema::ColGroup::Index;
+
+#@ISA = qw(Exporter);
+@ISA = ();
+
+$VERSION = "0.23";
+
+=head1 NAME
+
+DBIx::DBSchema - Database-independent schema objects
+
+=head1 SYNOPSIS
+
+  use DBIx::DBSchema;
+
+  $schema = new DBIx::DBSchema @dbix_dbschema_table_objects;
+  $schema = new_odbc DBIx::DBSchema $dbh;
+  $schema = new_odbc DBIx::DBSchema $dsn, $user, $pass;
+  $schema = new_native DBIx::DBSchema $dbh;
+  $schema = new_native DBIx::DBSchema $dsn, $user, $pass;
+
+  $schema->save("filename");
+  $schema = load DBIx::DBSchema "filename";
+
+  $schema->addtable($dbix_dbschema_table_object);
+
+  @table_names = $schema->tables;
+
+  $DBIx_DBSchema_table_object = $schema->table("table_name");
+
+  @sql = $schema->sql($dbh);
+  @sql = $schema->sql($dsn, $username, $password);
+  @sql = $schema->sql($dsn); #doesn't connect to database - less reliable
+
+  $perl_code = $schema->pretty_print;
+  %hash = eval $perl_code;
+  use DBI qw(:sql_types); $schema = pretty_read DBIx::DBSchema \%hash;
+
+=head1 DESCRIPTION
+
+DBIx::DBSchema objects are collections of DBIx::DBSchema::Table objects and
+represent a database schema.
+
+This module implements an OO-interface to database schemas.  Using this module,
+you can create a database schema with an OO Perl interface.  You can read the
+schema from an existing database.  You can save the schema to disk and restore
+it a different process.  Most importantly, DBIx::DBSchema can write SQL
+CREATE statements statements for different databases from a single source.
+
+Currently supported databases are MySQL and PostgreSQL.  Sybase support is
+partially implemented.  DBIx::DBSchema will attempt to use generic SQL syntax
+for other databases.  Assistance adding support for other databases is
+welcomed.  See L<DBIx::DBSchema::DBD>, "Driver Writer's Guide and Base Class".
+
+=head1 METHODS
+
+=over 4
+
+=item new TABLE_OBJECT, TABLE_OBJECT, ...
+
+Creates a new DBIx::DBSchema object.
+
+=cut
+
+sub new {
+  my($proto, @tables) = @_;
+  my %tables = map  { $_->name, $_ } @tables; #check for duplicates?
+
+  my $class = ref($proto) || $proto;
+  my $self = {
+    'tables' => \%tables,
+  };
+
+  bless ($self, $class);
+
+}
+
+=item new_odbc DATABASE_HANDLE | DATA_SOURCE USERNAME PASSWORD [ ATTR ]
+
+Creates a new DBIx::DBSchema object from an existing data source, which can be
+specified by passing an open DBI database handle, or by passing the DBI data
+source name, username, and password.  This uses the experimental DBI type_info
+method to create a schema with standard (ODBC) SQL column types that most
+closely correspond to any non-portable column types.  Use this to import a
+schema that you wish to use with many different database engines.  Although
+primary key and (unique) index information will only be read from databases
+with DBIx::DBSchema::DBD drivers (currently MySQL and PostgreSQL), import of
+column names and attributes *should* work for any database.  Note that this
+method only uses "ODBC" column types; it does not require or use an ODBC
+driver.
+
+=cut
+
+sub new_odbc {
+  my($proto, $dbh) = (shift, shift);
+  $dbh = DBI->connect( $dbh, @_ ) or die $DBI::errstr unless ref($dbh);
+  $proto->new(
+    map { new_odbc DBIx::DBSchema::Table $dbh, $_ } _tables_from_dbh($dbh)
+  );
+}
+
+=item new_native DATABASE_HANDLE | DATA_SOURCE USERNAME PASSWORD [ ATTR ]
+
+Creates a new DBIx::DBSchema object from an existing data source, which can be
+specified by passing an open DBI database handle, or by passing the DBI data
+source name, username and password.  This uses database-native methods to read
+the schema, and will preserve any non-portable column types.  The method is
+only available if there is a DBIx::DBSchema::DBD for the corresponding database engine (currently, MySQL and PostgreSQL).
+
+=cut
+
+sub new_native {
+  my($proto, $dbh) = (shift, shift);
+  $dbh = DBI->connect( $dbh, @_ ) or die $DBI::errstr unless ref($dbh);
+  $proto->new(
+    map { new_native DBIx::DBSchema::Table ( $dbh, $_ ) } _tables_from_dbh($dbh)
+  );
+}
+
+=item load FILENAME
+
+Loads a DBIx::DBSchema object from a file.
+
+=cut
+
+sub load {
+  my($proto,$file)=@_; #use $proto ?
+  open(FILE,"<$file") or die "Can't open $file: $!";
+  my($string)=join('',<FILE>); #can $string have newlines?  pry not?
+  close FILE or die "Can't close $file: $!";
+  my($self)=thaw $string;
+  #no bless needed?
+  $self;
+}
+
+=item save FILENAME
+
+Saves a DBIx::DBSchema object to a file.
+
+=cut
+
+sub save {
+  my($self,$file)=@_;
+  my($string)=freeze $self;
+  open(FILE,">$file") or die "Can't open $file: $!";
+  print FILE $string;
+  close FILE or die "Can't close file: $!";
+  my($check_self)=thaw $string;
+  die "Verify error: Can't freeze and thaw dbdef $self"
+    if (cmpStr($self,$check_self));
+}
+
+=item addtable TABLE_OBJECT
+
+Adds the given DBIx::DBSchema::Table object to this DBIx::DBSchema.
+
+=cut
+
+sub addtable {
+  my($self,$table)=@_;
+  $self->{'tables'}->{$table->name} = $table; #check for dupliates?
+}
+
+=item tables 
+
+Returns a list of the names of all tables.
+
+=cut
+
+sub tables {
+  my($self)=@_;
+  keys %{$self->{'tables'}};
+}
+
+=item table TABLENAME
+
+Returns the specified DBIx::DBSchema::Table object.
+
+=cut
+
+sub table {
+  my($self,$table)=@_;
+  $self->{'tables'}->{$table};
+}
+
+=item sql [ DATABASE_HANDLE | DATA_SOURCE [ USERNAME PASSWORD [ ATTR ] ] ]
+
+Returns a list of SQL `CREATE' statements for this schema.
+
+The data source can be specified by passing an open DBI database handle, or by
+passing the DBI data source name, username and password.  
+
+Although the username and password are optional, it is best to call this method
+with a database handle or data source including a valid username and password -
+a DBI connection will be opened and the quoting and type mapping will be more
+reliable.
+
+If passed a DBI data source (or handle) such as `DBI:mysql:database' or
+`DBI:Pg:dbname=database', will use syntax specific to that database engine.
+Currently supported databases are MySQL and PostgreSQL.
+
+If not passed a data source (or handle), or if there is no driver for the
+specified database, will attempt to use generic SQL syntax.
+
+=cut
+
+sub sql {
+  my($self, $dbh) = (shift, shift);
+  my $created_dbh = 0;
+  unless ( ref($dbh) || ! @_ ) {
+    $dbh = DBI->connect( $dbh, @_ ) or die $DBI::errstr;
+    $created_dbh = 1;
+  }
+  my @r = map { $self->table($_)->sql_create_table($dbh); } $self->tables;
+  $dbh->disconnect if $created_dbh;
+  @r;
+}
+
+=item pretty_print
+
+Returns the data in this schema as Perl source, suitable for assigning to a
+hash.
+
+=cut
+
+sub pretty_print {
+  my($self) = @_;
+  join("},\n\n",
+    map {
+      my $table = $_;
+      "'$table' => {\n".
+        "  'columns' => [\n".
+          join("", map { 
+                         #cant because -w complains about , in qw()
+                         # (also biiiig problems with empty lengths)
+                         #"    qw( $_ ".
+                         #$self->table($table)->column($_)->type. " ".
+                         #( $self->table($table)->column($_)->null ? 'NULL' : 0 ). " ".
+                         #$self->table($table)->column($_)->length. " ),\n"
+                         "    '$_', ".
+                         "'". $self->table($table)->column($_)->type. "', ".
+                         "'". $self->table($table)->column($_)->null. "', ". 
+                         "'". $self->table($table)->column($_)->length. "', ".
+                         "'". $self->table($table)->column($_)->default. "', ".
+                         "'". $self->table($table)->column($_)->local. "',\n"
+                       } $self->table($table)->columns
+          ).
+        "  ],\n".
+        "  'primary_key' => '". $self->table($table)->primary_key. "',\n".
+        "  'unique' => [ ". join(', ',
+          map { "[ '". join("', '", @{$_}). "' ]" }
+            @{$self->table($table)->unique->lol_ref}
+          ).  " ],\n".
+        "  'index' => [ ". join(', ',
+          map { "[ '". join("', '", @{$_}). "' ]" }
+            @{$self->table($table)->index->lol_ref}
+          ). " ],\n"
+        #"  'index' => [ ".    " ],\n"
+    } $self->tables
+  ), "}\n";
+}
+
+=cut
+
+=item pretty_read HASHREF
+
+Creates a schema as specified by a data structure such as that created by
+B<pretty_print> method.
+
+=cut
+
+sub pretty_read {
+  my($proto, $href) = @_;
+  my $schema = $proto->new( map {  
+    my(@columns);
+    while ( @{$href->{$_}{'columns'}} ) {
+      push @columns, DBIx::DBSchema::Column->new(
+        splice @{$href->{$_}{'columns'}}, 0, 6
+      );
+    }
+    DBIx::DBSchema::Table->new(
+      $_,
+      $href->{$_}{'primary_key'},
+      DBIx::DBSchema::ColGroup::Unique->new($href->{$_}{'unique'}),
+      DBIx::DBSchema::ColGroup::Index->new($href->{$_}{'index'}),
+      @columns,
+    );
+  } (keys %{$href}) );
+}
+
+# private subroutines
+
+sub _load_driver {
+  my($dbh) = @_;
+  my $driver;
+  if ( ref($dbh) ) {
+    $driver = $dbh->{Driver}->{Name};
+  } else {
+    $dbh =~ s/^dbi:(\w*?)(?:\((.*?)\))?://i #nicked from DBI->connect
+                        or '' =~ /()/; # ensure $1 etc are empty if match fails
+    $driver = $1 or confess "can't parse data source: $dbh";
+  }
+
+  #require "DBIx/DBSchema/DBD/$driver.pm";
+  #$driver;
+  eval 'require "DBIx/DBSchema/DBD/$driver.pm"' and $driver or die $@;
+}
+
+sub _tables_from_dbh {
+  my($dbh) = @_;
+  my $sth = $dbh->table_info or die $dbh->errstr;
+  #map { $_->{TABLE_NAME} } grep { $_->{TABLE_TYPE} eq 'TABLE' }
+  #  @{ $sth->fetchall_arrayref({ TABLE_NAME=>1, TABLE_TYPE=>1}) };
+  map { $_->[0] } grep { $_->[1] =~ /^TABLE$/i }
+    @{ $sth->fetchall_arrayref([2,3]) };
+}
+
+=back
+
+=head1 AUTHOR
+
+Ivan Kohler <ivan-dbix-dbschema@420.am>
+
+Charles Shapiro <charles.shapiro@numethods.com> and Mitchell Friedman
+<mitchell.friedman@numethods.com> contributed the start of a Sybase driver.
+
+=head1 COPYRIGHT
+
+Copyright (c) 2000 Ivan Kohler
+Copyright (c) 2000 Mail Abuse Prevention System LLC
+All rights reserved.
+This program is free software; you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=head1 BUGS
+
+Each DBIx::DBSchema object should have a name which corresponds to its name
+within the SQL database engine (DBI data source).
+
+pretty_print is actually pretty ugly.
+
+Perhaps pretty_read should eval column types so that we can use DBI
+qw(:sql_types) here instead of externally.
+
+=head1 SEE ALSO
+
+L<DBIx::DBSchema::Table>, L<DBIx::DBSchema::ColGroup>,
+L<DBIx::DBSchema::ColGroup::Unique>, L<DBIx::DBSchema::ColGroup::Index>,
+L<DBIx::DBSchema::Column>, L<DBIx::DBSchema::DBD>,
+L<DBIx::DBSchema::DBD::mysql>, L<DBIx::DBSchema::DBD::Pg>, L<FS::Record>,
+L<DBI>
+
+=cut
+
+1;
+
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/ColGroup.pm b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/ColGroup.pm
new file mode 100644
index 000000000..ceeb223ca
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/ColGroup.pm
@@ -0,0 +1,141 @@
+package DBIx::DBSchema::ColGroup;
+
+use strict;
+use vars qw(@ISA);
+#use Exporter;
+
+#@ISA = qw(Exporter);
+@ISA = qw();
+
+=head1 NAME
+
+DBIx::DBSchema::ColGroup - Column group objects
+
+=head1 SYNOPSIS
+
+  use DBIx::DBSchema::ColGroup;
+
+  $colgroup = new DBIx::DBSchema::ColGroup ( $lol_ref );
+  $colgroup = new DBIx::DBSchema::ColGroup ( \@lol );
+  $colgroup = new DBIx::DBSchema::ColGroup (
+    [
+      [ 'single_column' ],
+      [ 'multiple_columns', 'another_column', ],
+    ]
+  );
+
+  $lol_ref = $colgroup->lol_ref;
+
+  @sql_lists = $colgroup->sql_list;
+
+  @singles = $colgroup->singles;
+
+=head1 DESCRIPTION
+
+DBIx::DBSchema::ColGroup objects represent sets of sets of columns.  (IOW a
+"list of lists" - see L<perllol>.)
+
+=head1 METHODS
+
+=over 4
+
+=item new [ LOL_REF ]
+
+Creates a new DBIx::DBSchema::ColGroup object.  Pass a reference to a list of
+lists of column names.
+
+=cut
+
+sub new {
+  my($proto, $lol) = @_;
+
+  my $class = ref($proto) || $proto;
+  my $self = {
+    'lol' => $lol,
+  };
+
+  bless ($self, $class);
+
+}
+
+=item lol_ref
+
+Returns a reference to a list of lists of column names.
+
+=cut
+
+sub lol_ref {
+  my($self) = @_;
+  $self->{'lol'};
+}
+
+=item sql_list
+
+Returns a flat list of comma-separated values, for SQL statements.
+
+For example:
+
+  @lol = (
+           [ 'single_column' ],
+           [ 'multiple_columns', 'another_column', ],
+         );
+
+  $colgroup = new DBIx::DBSchema::ColGroup ( \@lol );
+
+  print join("\n", $colgroup->sql_list), "\n";
+
+Will print:
+
+  single_column
+  multiple_columns, another_column
+
+=cut
+
+sub sql_list { #returns a flat list of comman-separates lists (for sql)
+  my($self)=@_;
+   grep $_ ne '', map join(', ', @{$_}), @{$self->{'lol'}};
+}
+
+=item singles
+
+Returns a flat list of all single item lists.
+
+=cut
+
+sub singles { #returns single-field groups as a flat list
+  my($self)=@_;
+  #map ${$_}[0], grep scalar(@{$_}) == 1, @{$self->{'lol'}};
+  map { 
+    ${$_}[0] =~ /^(\w+)$/
+      #aah!
+      or die "Illegal column ", ${$_}[0], " in colgroup!";
+    $1;
+  } grep scalar(@{$_}) == 1, @{$self->{'lol'}};
+}
+
+=back
+
+=head1 AUTHOR
+
+Ivan Kohler <ivan-dbix-dbschema@420.am>
+
+=head1 COPYRIGHT
+
+Copyright (c) 2000 Ivan Kohler
+Copyright (c) 2000 Mail Abuse Prevention System LLC
+All rights reserved.
+This program is free software; you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<DBIx::DBSchema::Table>, L<DBIx::DBSchema::ColGroup::Unique>,
+L<DBIx::DBSchema::ColGroup::Index>, L<DBIx::DBSchema>, L<perllol>, L<perldsc>,
+L<DBI>
+
+=cut
+
+1;
+
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/ColGroup/Index.pm b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/ColGroup/Index.pm
new file mode 100644
index 000000000..1a92baae1
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/ColGroup/Index.pm
@@ -0,0 +1,37 @@
+package DBIx::DBSchema::ColGroup::Index;
+
+use strict;
+use vars qw(@ISA);
+use DBIx::DBSchema::ColGroup;
+
+@ISA=qw(DBIx::DBSchema::ColGroup);
+
+=head1 NAME
+
+DBIx::DBSchema::ColGroup::Index - Index column group object
+
+=head1 SYNOPSIS
+
+  use DBIx::DBSchema::ColGroup::Index;
+
+    # see DBIx::DBSchema::ColGroup methods
+
+=head1 DESCRIPTION
+
+DBIx::DBSchema::ColGroup::Index objects represent the (non-unique) indices of a
+database table (L<DBIx::DBSchema::Table>).  DBIx::DBSchema::ColGroup::Index
+inherits from DBIx::DBSchema::ColGroup.
+
+=head1 BUGS
+
+Is this empty subclass needed?
+
+=head1 SEE ALSO
+
+L<DBIx::DBSchema::ColGroup>, L<DBIx::DBSchema::ColGroup::Unique>,
+L<DBIx::DBSchema::Table>, L<DBIx::DBSchema>, L<FS::Record>
+
+=cut
+
+1;
+
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/ColGroup/Unique.pm b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/ColGroup/Unique.pm
new file mode 100644
index 000000000..450043fdf
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/ColGroup/Unique.pm
@@ -0,0 +1,38 @@
+package DBIx::DBSchema::ColGroup::Unique;
+
+use strict;
+use vars qw(@ISA);
+use DBIx::DBSchema::ColGroup;
+
+@ISA=qw(DBIx::DBSchema::ColGroup);
+
+=head1 NAME
+
+DBIx::DBSchema::ColGroup::Unique - Unique column group object
+
+=head1 SYNOPSIS
+
+  use DBIx::DBSchema::ColGroup::Unique;
+
+  # see DBIx::DBSchema::ColGroup methods
+
+=head1 DESCRIPTION
+
+DBIx::DBSchema::ColGroup::Unique objects represent the unique indices of a
+database table (L<DBIx::DBSchema::Table>).  DBIx::DBSchema::ColGroup:Unique
+inherits from DBIx::DBSchema::ColGroup.
+
+=head1 BUGS
+
+Is this empty subclass needed?
+
+=head1 SEE ALSO
+
+L<DBIx::DBSchema::ColGroup>,  L<DBIx::DBSchema::ColGroup::Index>,
+L<DBIx::DBSchema::Table>, L<DBIx::DBSchema>, L<FS::Record>
+
+=cut
+
+1;
+
+
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/Column.pm b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/Column.pm
new file mode 100644
index 000000000..4e26646e7
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/Column.pm
@@ -0,0 +1,300 @@
+package DBIx::DBSchema::Column;
+
+use strict;
+use vars qw(@ISA $VERSION);
+#use Carp;
+#use Exporter;
+
+#@ISA = qw(Exporter);
+@ISA = qw();
+
+$VERSION = '0.02';
+
+=head1 NAME
+
+DBIx::DBSchema::Column - Column objects
+
+=head1 SYNOPSIS
+
+  use DBIx::DBSchema::Column;
+
+  #named params with a hashref (preferred)
+  $column = new DBIx::DBSchema::Column ( {
+    'name'    => 'column_name',
+    'type'    => 'varchar'
+    'null'    => 'NOT NULL',
+    'length'  => 64,
+    'default' => '
+    'local'   => '',
+  } );
+
+  #list
+  $column = new DBIx::DBSchema::Column ( $name, $sql_type, $nullability, $length, $default, $local );
+
+  $name = $column->name;
+  $column->name( 'name' );
+
+  $sql_type = $column->type;
+  $column->type( 'sql_type' );
+
+  $null = $column->null;
+  $column->null( 'NULL' );
+  $column->null( 'NOT NULL' );
+  $column->null( '' );
+
+  $length = $column->length;
+  $column->length( '10' );
+  $column->length( '8,2' );
+
+  $default = $column->default;
+  $column->default( 'Roo' );
+
+  $sql_line = $column->line;
+  $sql_line = $column->line($datasrc);
+
+=head1 DESCRIPTION
+
+DBIx::DBSchema::Column objects represent columns in tables (see
+L<DBIx::DBSchema::Table>).
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+=item new [ name [ , type [ , null [ , length  [ , default [ , local ] ] ] ] ] ]
+
+Creates a new DBIx::DBSchema::Column object.  Takes a hashref of named
+parameters, or a list.  B<name> is the name of the column.  B<type> is the SQL
+data type.  B<null> is the nullability of the column (intrepreted using Perl's
+rules for truth, with one exception: `NOT NULL' is false).  B<length> is the
+SQL length of the column.  B<default> is the default value of the column.
+B<local> is reserved for database-specific information.
+
+=cut
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+
+  my $self;
+  if ( ref($_[0]) ) {
+    $self = shift;
+  } else {
+    $self = { map { $_ => shift } qw(name type null length default local) };
+  }
+
+  #croak "Illegal name: ". $self->{'name'}
+  #  if grep $self->{'name'} eq $_, @reserved_words;
+
+  $self->{'null'} =~ s/^NOT NULL$//i;
+  $self->{'null'} = 'NULL' if $self->{'null'};
+
+  bless ($self, $class);
+
+}
+
+=item name [ NAME ]
+
+Returns or sets the column name.
+
+=cut
+
+sub name {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+  #croak "Illegal name: $name" if grep $name eq $_, @reserved_words;
+    $self->{'name'} = $value;
+  } else {
+    $self->{'name'};
+  }
+}
+
+=item type [ TYPE ]
+
+Returns or sets the column type.
+
+=cut
+
+sub type {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{'type'} = $value;
+  } else {
+    $self->{'type'};
+  }
+}
+
+=item null [ NULL ]
+
+Returns or sets the column null flag (the empty string is equivalent to
+`NOT NULL')
+
+=cut
+
+sub null {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $value =~ s/^NOT NULL$//i;
+    $value = 'NULL' if $value;
+    $self->{'null'} = $value;
+  } else {
+    $self->{'null'};
+  }
+}
+
+=item length [ LENGTH ]
+
+Returns or sets the column length.
+
+=cut
+
+sub length {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{'length'} = $value;
+  } else {
+    $self->{'length'};
+  }
+}
+
+=item default [ LOCAL ]
+
+Returns or sets the default value.
+
+=cut
+
+sub default {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{'default'} = $value;
+  } else {
+    $self->{'default'};
+  }
+}
+
+
+=item local [ LOCAL ]
+
+Returns or sets the database-specific field.
+
+=cut
+
+sub local {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{'local'} = $value;
+  } else {
+    $self->{'local'};
+  }
+}
+
+=item line [ DATABASE_HANDLE | DATA_SOURCE [ USERNAME PASSWORD [ ATTR ] ] ]
+
+Returns an SQL column definition.
+
+The data source can be specified by passing an open DBI database handle, or by
+passing the DBI data source name, username and password.  
+
+Although the username and password are optional, it is best to call this method
+with a database handle or data source including a valid username and password -
+a DBI connection will be opened and the quoting and type mapping will be more
+reliable.
+
+If passed a DBI data source (or handle) such as `DBI:mysql:database' or
+`DBI:Pg:dbname=database', will use syntax specific to that database engine.
+Currently supported databases are MySQL and PostgreSQL.  Non-standard syntax
+for other engines (if applicable) may also be supported in the future.
+
+=cut
+
+sub line {
+  my($self,$dbh) = (shift, shift);
+
+  my $created_dbh = 0;
+  unless ( ref($dbh) || ! @_ ) {
+    $dbh = DBI->connect( $dbh, @_ ) or die $DBI::errstr;
+    my $gratuitous = $DBI::errstr; #surpress superfluous `used only once' error
+    $created_dbh = 1;
+  }
+  
+  my $driver = DBIx::DBSchema::_load_driver($dbh);
+  my %typemap;
+  %typemap = eval "\%DBIx::DBSchema::DBD::${driver}::typemap" if $driver;
+  my $type = defined( $typemap{uc($self->type)} )
+    ? $typemap{uc($self->type)}
+    : $self->type;
+
+  my $null = $self->null;
+
+  my $default;
+  if ( defined($self->default) && $self->default ne ''
+       && ref($dbh)
+       # false laziness: nicked from FS::Record::_quote
+       && ( $self->default !~ /^\-?\d+(\.\d+)?$/
+            || $type =~ /(char|binary|blob|text)$/i
+          )
+  ) {
+    $default = $dbh->quote($self->default);
+  } else {
+    $default = $self->default;
+  }
+
+  #this should be a callback into the driver
+  if ( $driver eq 'mysql' ) { #yucky mysql hack
+    $null ||= "NOT NULL";
+    $self->local('AUTO_INCREMENT') if uc($self->type) eq 'SERIAL';
+  } elsif ( $driver eq 'Pg' ) { #yucky Pg hack
+    $null ||= "NOT NULL";
+    $null =~ s/^NULL$//;
+  }
+
+  my $r = join(' ',
+    $self->name,
+    $type. ( ( defined($self->length) && $self->length )
+             ? '('.$self->length.')'
+             : ''
+           ),
+    $null,
+    ( ( defined($default) && $default ne '' )
+      ? 'DEFAULT '. $default
+      : ''
+    ),
+    ( ( $driver eq 'mysql' && defined($self->local) )
+      ? $self->local
+      : ''
+    ),
+  );
+  $dbh->disconnect if $created_dbh;
+  $r;
+
+}
+
+=back
+
+=head1 AUTHOR
+
+Ivan Kohler <ivan-dbix-dbschema@420.am>
+
+=head1 COPYRIGHT
+
+Copyright (c) 2000 Ivan Kohler
+Copyright (c) 2000 Mail Abuse Prevention System LLC
+All rights reserved.
+This program is free software; you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=head1 BUGS
+
+line() has database-specific foo that probably ought to be abstracted into
+the DBIx::DBSchema:DBD:: modules.
+
+=head1 SEE ALSO
+
+L<DBIx::DBSchema::Table>, L<DBIx::DBSchema>, L<DBIx::DBSchema::DBD>, L<DBI>
+
+=cut
+
+1;
+
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/DBD.pm b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/DBD.pm
new file mode 100644
index 000000000..a4c60003e
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/DBD.pm
@@ -0,0 +1,113 @@
+package DBIx::DBSchema::DBD;
+
+use strict;
+use vars qw($VERSION);
+
+$VERSION = '0.02';
+
+=head1 NAME
+
+DBIx::DBSchema::DBD - DBIx::DBSchema Driver Writer's Guide and Base Class
+
+=head1 SYNOPSIS
+
+  perldoc DBIx::DBSchema::DBD
+
+  package DBIx::DBSchema::DBD::FooBase
+  use DBIx::DBSchmea::DBD;
+  @ISA = qw(DBIx::DBSchema::DBD);
+
+=head1 DESCRIPTION
+
+Drivers should be named DBIx::DBSchema::DBD::DatabaseName, where DatabaseName
+is the same as the DBD:: driver for this database.  Drivers should implement the
+following class methods:
+
+=over 4
+
+=item columns CLASS DBI_DBH TABLE
+
+Given an active DBI database handle, return a listref of listrefs (see
+L<perllol>), each containing six elements: column name, column type,
+nullability, column length, column default, and a field reserved for
+driver-specific use.
+
+=item column CLASS DBI_DBH TABLE COLUMN
+
+Same as B<columns> above, except return the listref for a single column.  You
+can inherit from DBIx::DBSchema::DBD to provide this function.
+
+=cut
+
+sub column {
+  my($proto, $dbh, $table, $column) = @_;
+  #@a = grep { $_->[0] eq $column } @{ $proto->columns( $dbh, $table ) };
+  #$a[0];
+  @{ [
+    grep { $_->[0] eq $column } @{ $proto->columns( $dbh, $table ) }
+  ] }[0]; #force list context on grep, return scalar of first element
+}
+
+=item primary_key CLASS DBI_DBH TABLE
+
+Given an active DBI database handle, return the primary key for the specified
+table.
+
+=item unique CLASS DBI_DBH TABLE
+
+Given an active DBI database handle, return a hashref of unique indices.  The
+keys of the hashref are index names, and the values are arrayrefs which point
+a list of column names for each.  See L<perldsc/"HASHES OF LISTS"> and
+L<DBIx::DBSchema::ColGroup>.
+
+=item index CLASS DBI_DBH TABLE
+
+Given an active DBI database handle, return a hashref of (non-unique) indices.
+The keys of the hashref are index names, and the values are arrayrefs which
+point a list of column names for each.  See L<perldsc/"HASHES OF LISTS"> and
+L<DBIx::DBSchema::ColGroup>.
+
+=back
+
+=head1 TYPE MAPPING
+
+You can define a %typemap array for your driver to map "standard" data    
+types to database-specific types.  For example, the MySQL TIMESTAMP field
+has non-standard auto-updating semantics; the MySQL DATETIME type is 
+what other databases and the ODBC standard call TIMESTAMP, so one of the   
+entries in the MySQL %typemap is:
+
+  'TIMESTAMP' => 'DATETIME',
+
+Another example is the Pg %typemap which maps the standard types BLOB and
+LONG VARBINARY to the Pg-specific BYTEA:
+
+  'BLOB' => 'BYTEA',
+  'LONG VARBINARY' => 'BYTEA',
+
+Make sure you use all uppercase-keys.
+
+=head1 AUTHOR
+
+Ivan Kohler <ivan-dbix-dbschema@420.am>
+
+=head1 COPYRIGHT
+
+Copyright (c) 2000 Ivan Kohler
+Copyright (c) 2000 Mail Abuse Prevention System LLC
+All rights reserved.
+This program is free software; you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<DBIx::DBSchema>, L<DBIx::DBSchema::DBD::mysql>, L<DBIx::DBSchema::DBD::Pg>,
+L<DBIx::DBSchema::ColGroup>, L<DBI>, L<DBI::DBD>, L<perllol>,
+L<perldsc/"HASHES OF LISTS">
+
+=cut 
+
+1;
+
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/DBD/Pg.pm b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/DBD/Pg.pm
new file mode 100644
index 000000000..018b89028
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/DBD/Pg.pm
@@ -0,0 +1,175 @@
+package DBIx::DBSchema::DBD::Pg;
+
+use strict;
+use vars qw($VERSION @ISA %typemap);
+use DBD::Pg 1.22;
+use DBIx::DBSchema::DBD;
+
+$VERSION = '0.08';
+@ISA = qw(DBIx::DBSchema::DBD);
+
+%typemap = (
+  'BLOB' => 'BYTEA',
+  'LONG VARBINARY' => 'BYTEA',
+);
+
+=head1 NAME
+
+DBIx::DBSchema::DBD::Pg - PostgreSQL native driver for DBIx::DBSchema
+
+=head1 SYNOPSIS
+
+use DBI;
+use DBIx::DBSchema;
+
+$dbh = DBI->connect('dbi:Pg:dbname=database', 'user', 'pass');
+$schema = new_native DBIx::DBSchema $dbh;
+
+=head1 DESCRIPTION
+
+This module implements a PostgreSQL-native driver for DBIx::DBSchema.
+
+=cut
+
+sub columns {
+  my($proto, $dbh, $table) = @_;
+  my $sth = $dbh->prepare(<<END) or die $dbh->errstr;
+    SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull,
+           a.atthasdef, a.attnum
+    FROM pg_class c, pg_attribute a, pg_type t
+    WHERE c.relname = '$table'
+      AND a.attnum > 0 AND a.attrelid = c.oid AND a.atttypid = t.oid
+    ORDER BY a.attnum
+END
+  $sth->execute or die $sth->errstr;
+
+  map {
+
+    my $default = '';
+    if ( $_->{atthasdef} ) {
+      my $attnum = $_->{attnum};
+      my $d_sth = $dbh->prepare(<<END) or die $dbh->errstr;
+        SELECT substring(d.adsrc for 128) FROM pg_attrdef d, pg_class c
+        WHERE c.relname = '$table' AND c.oid = d.adrelid AND d.adnum = $attnum
+END
+      $d_sth->execute or die $d_sth->errstr;
+
+      $default = $d_sth->fetchrow_arrayref->[0];
+    };
+
+    my $len = '';
+    if ( $_->{attlen} == -1 && $_->{atttypmod} != -1 
+         && $_->{typname} ne 'text'                  ) {
+      $len = $_->{atttypmod} - 4;
+      if ( $_->{typname} eq 'numeric' ) {
+        $len = ($len >> 16). ','. ($len & 0xffff);
+      }
+    }
+
+    my $type = $_->{'typname'};
+    $type = 'char' if $type eq 'bpchar';
+
+    [
+      $_->{'attname'},
+      $type,
+      ! $_->{'attnotnull'},
+      $len,
+      $default,
+      ''  #local
+    ];
+
+  } @{ $sth->fetchall_arrayref({}) };
+}
+
+sub primary_key {
+  my($proto, $dbh, $table) = @_;
+  my $sth = $dbh->prepare(<<END) or die $dbh->errstr;
+    SELECT a.attname, a.attnum
+    FROM pg_class c, pg_attribute a, pg_type t
+    WHERE c.relname = '${table}_pkey'
+      AND a.attnum > 0 AND a.attrelid = c.oid AND a.atttypid = t.oid
+END
+  $sth->execute or die $sth->errstr;
+  my $row = $sth->fetchrow_hashref or return '';
+  $row->{'attname'};
+}
+
+sub unique {
+  my($proto, $dbh, $table) = @_;
+  my $gratuitous = { map { $_ => [ $proto->_index_fields($dbh, $_ ) ] }
+      grep { $proto->_is_unique($dbh, $_ ) }
+        $proto->_all_indices($dbh, $table)
+  };
+}
+
+sub index {
+  my($proto, $dbh, $table) = @_;
+  my $gratuitous = { map { $_ => [ $proto->_index_fields($dbh, $_ ) ] }
+      grep { ! $proto->_is_unique($dbh, $_ ) }
+        $proto->_all_indices($dbh, $table)
+  };
+}
+
+sub _all_indices {
+  my($proto, $dbh, $table) = @_;
+  my $sth = $dbh->prepare(<<END) or die $dbh->errstr;
+    SELECT c2.relname
+    FROM pg_class c, pg_class c2, pg_index i
+    WHERE c.relname = '$table' AND c.oid = i.indrelid AND i.indexrelid = c2.oid
+END
+  $sth->execute or die $sth->errstr;
+  map { $_->{'relname'} }
+    grep { $_->{'relname'} !~ /_pkey$/ }
+      @{ $sth->fetchall_arrayref({}) };
+}
+
+sub _index_fields {
+  my($proto, $dbh, $index) = @_;
+  my $sth = $dbh->prepare(<<END) or die $dbh->errstr;
+    SELECT a.attname, a.attnum
+    FROM pg_class c, pg_attribute a, pg_type t
+    WHERE c.relname = '$index'
+      AND a.attnum > 0 AND a.attrelid = c.oid AND a.atttypid = t.oid
+END
+  $sth->execute or die $sth->errstr;
+  map { $_->{'attname'} } @{ $sth->fetchall_arrayref({}) };
+}
+
+sub _is_unique {
+  my($proto, $dbh, $index) = @_;
+  my $sth = $dbh->prepare(<<END) or die $dbh->errstr;
+    SELECT i.indisunique
+    FROM pg_index i, pg_class c, pg_am a
+    WHERE i.indexrelid = c.oid AND c.relname = '$index' AND c.relam = a.oid
+END
+  $sth->execute or die $sth->errstr;
+  my $row = $sth->fetchrow_hashref or die 'guru meditation #420';
+  $row->{'indisunique'};
+}
+
+=head1 AUTHOR
+
+Ivan Kohler <ivan-dbix-dbschema@420.am>
+
+=head1 COPYRIGHT
+
+Copyright (c) 2000 Ivan Kohler
+Copyright (c) 2000 Mail Abuse Prevention System LLC
+All rights reserved.
+This program is free software; you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=head1 BUGS
+
+Yes.
+
+columns doesn't return column default information.
+
+=head1 SEE ALSO
+
+L<DBIx::DBSchema>, L<DBIx::DBSchema::DBD>, L<DBI>, L<DBI::DBD>
+
+=cut 
+
+1;
+
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/DBD/Sybase.pm b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/DBD/Sybase.pm
new file mode 100755
index 000000000..4a740693a
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/DBD/Sybase.pm
@@ -0,0 +1,141 @@
+package DBIx::DBSchema::DBD::Sybase;
+
+use strict;
+use vars qw($VERSION @ISA %typemap);
+use DBIx::DBSchema::DBD;
+
+$VERSION = '0.03';
+@ISA = qw(DBIx::DBSchema::DBD);
+
+%typemap = (
+#  'empty' => 'empty'
+);
+
+=head1 NAME
+
+DBIx::DBSchema::DBD::Sybase - Sybase database driver for DBIx::DBSchema
+
+=head1 SYNOPSIS
+
+use DBI;
+use DBIx::DBSchema;
+
+$dbh = DBI->connect('dbi:Sybase:dbname=database', 'user', 'pass');
+$schema = new_native DBIx::DBSchema $dbh;
+
+=head1 DESCRIPTION
+
+This module implements a Sybase driver for DBIx::DBSchema. 
+
+=cut
+
+sub columns {
+  my($proto, $dbh, $table) = @_;
+
+  my $sth = $dbh->prepare("sp_columns \@table_name=$table") 
+  or die $dbh->errstr;
+
+  $sth->execute or die $sth->errstr;
+  my @cols = map {
+    [
+      $_->{'column_name'},
+      $_->{'type_name'},
+      ($_->{'nullable'} ? 1 : ''),
+      $_->{'length'},
+      '', #default
+      ''  #local
+    ]
+  } @{ $sth->fetchall_arrayref({}) };
+  $sth->finish;
+
+  @cols;
+}
+
+sub primary_key {
+    return("StubbedPrimaryKey");
+}
+
+
+sub unique {
+  my($proto, $dbh, $table) = @_;
+  my $gratuitous = { map { $_ => [ $proto->_index_fields($dbh, $table, $_ ) ] }
+      grep { $proto->_is_unique($dbh, $_ ) }
+        $proto->_all_indices($dbh, $table)
+  };
+}
+
+sub index {
+  my($proto, $dbh, $table) = @_;
+  my $gratuitous = { map { $_ => [ $proto->_index_fields($dbh, $table, $_ ) ] }
+      grep { ! $proto->_is_unique($dbh, $_ ) }
+        $proto->_all_indices($dbh, $table)
+  };
+}
+
+sub _all_indices {
+  my($proto, $dbh, $table) = @_;
+
+  my $sth = $dbh->prepare_cached(<<END) or die $dbh->errstr;
+    SELECT name
+    FROM sysindexes
+    WHERE id = object_id('$table') and indid between 1 and 254
+END
+  $sth->execute or die $sth->errstr;
+  my @indices = map { $_->[0] } @{ $sth->fetchall_arrayref() };
+  $sth->finish;
+  $sth = undef;
+  @indices;
+}
+
+sub _index_fields {
+  my($proto, $dbh, $table, $index) = @_;
+
+  my @keys;
+
+  my ($indid) = $dbh->selectrow_array("select indid from sysindexes where id = object_id('$table') and name = '$index'");
+  for (1..30) {
+    push @keys, $dbh->selectrow_array("select index_col('$table', $indid, $_)") || ();
+  }
+
+  return @keys;
+}
+
+sub _is_unique {
+  my($proto, $dbh, $table, $index) = @_;
+
+  my ($isunique) = $dbh->selectrow_array("select status & 2 from sysindexes where id = object_id('$table') and name = '$index'");
+
+  return $isunique;
+}
+
+=head1 AUTHOR
+
+Charles Shapiro <charles.shapiro@numethods.com>
+(courtesy of Ivan Kohler <ivan-dbix-dbschema@420.am>)
+
+Mitchell Friedman <mitchell.friedman@numethods.com>
+
+Bernd Dulfer <bernd@widd.de>
+
+=head1 COPYRIGHT
+
+Copyright (c) 2001 Charles Shapiro, Mitchell J. Friedman
+Copyright (c) 2001 nuMethods LLC.
+All rights reserved.
+This program is free software; you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=head1 BUGS
+
+Yes.
+
+The B<primary_key> method does not yet work.
+
+=head1 SEE ALSO
+
+L<DBIx::DBSchema>, L<DBIx::DBSchema::DBD>, L<DBI>, L<DBI::DBD>
+
+=cut 
+
+1;
+
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/DBD/mysql.pm b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/DBD/mysql.pm
new file mode 100644
index 000000000..f3804dd28
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/DBD/mysql.pm
@@ -0,0 +1,126 @@
+package DBIx::DBSchema::DBD::mysql;
+
+use strict;
+use vars qw($VERSION @ISA %typemap);
+use DBIx::DBSchema::DBD;
+
+$VERSION = '0.03';
+@ISA = qw(DBIx::DBSchema::DBD);
+
+%typemap = (
+  'TIMESTAMP'      => 'DATETIME',
+  'SERIAL'         => 'INTEGER',
+  'BOOL'           => 'TINYINT',
+  'LONG VARBINARY' => 'LONGBLOB',
+);
+
+=head1 NAME
+
+DBIx::DBSchema::DBD::mysql - MySQL native driver for DBIx::DBSchema
+
+=head1 SYNOPSIS
+
+use DBI;
+use DBIx::DBSchema;
+
+$dbh = DBI->connect('dbi:mysql:database', 'user', 'pass');
+$schema = new_native DBIx::DBSchema $dbh;
+
+=head1 DESCRIPTION
+
+This module implements a MySQL-native driver for DBIx::DBSchema.
+
+=cut
+
+sub columns {
+  my($proto, $dbh, $table ) = @_;
+  my $sth = $dbh->prepare("SHOW COLUMNS FROM $table") or die $dbh->errstr;
+  $sth->execute or die $sth->errstr;
+  map {
+    $_->{'Type'} =~ /^(\w+)\(?([\d\,]+)?\)?( unsigned)?$/
+      or die "Illegal type: ". $_->{'Type'}. "\n";
+    my($type, $length) = ($1, $2);
+    [
+      $_->{'Field'},
+      $type,
+      $_->{'Null'},
+      $length,
+      $_->{'Default'},
+      $_->{'Extra'}
+    ]
+  } @{ $sth->fetchall_arrayref( {} ) };
+}
+
+#sub primary_key {
+#  my($proto, $dbh, $table ) = @_;
+#  my $primary_key = '';
+#  my $sth = $dbh->prepare("SHOW INDEX FROM $table")
+#    or die $dbh->errstr;
+#  $sth->execute or die $sth->errstr;
+#  my @pkey = map { $_->{'Column_name'} } grep {
+#    $_->{'Key_name'} eq "PRIMARY"
+#  } @{ $sth->fetchall_arrayref( {} ) };
+#  scalar(@pkey) ? $pkey[0] : '';
+#}
+
+sub primary_key {
+  my($proto, $dbh, $table) = @_;
+  my($pkey, $unique_href, $index_href) = $proto->_show_index($dbh, $table);
+  $pkey;
+}
+
+sub unique {
+  my($proto, $dbh, $table) = @_;
+  my($pkey, $unique_href, $index_href) = $proto->_show_index($dbh, $table);
+  $unique_href;
+}
+
+sub index {
+  my($proto, $dbh, $table) = @_;
+  my($pkey, $unique_href, $index_href) = $proto->_show_index($dbh, $table);
+  $index_href;
+}
+
+sub _show_index {
+  my($proto, $dbh, $table ) = @_;
+  my $sth = $dbh->prepare("SHOW INDEX FROM $table")
+    or die $dbh->errstr;
+  $sth->execute or die $sth->errstr;
+
+  my $pkey = '';
+  my(%index, %unique);
+  foreach my $row ( @{ $sth->fetchall_arrayref({}) } ) {
+    if ( $row->{'Key_name'} eq 'PRIMARY' ) {
+      $pkey = $row->{'Column_name'};
+    } elsif ( $row->{'Non_unique'} ) { #index
+      push @{ $index{ $row->{'Key_name'} } }, $row->{'Column_name'};
+    } else { #unique
+      push @{ $unique{ $row->{'Key_name'} } }, $row->{'Column_name'};
+    }
+  }
+
+  ( $pkey, \%unique, \%index );
+}
+
+=head1 AUTHOR
+
+Ivan Kohler <ivan-dbix-dbschema@420.am>
+
+=head1 COPYRIGHT
+
+Copyright (c) 2000 Ivan Kohler
+Copyright (c) 2000 Mail Abuse Prevention System LLC
+All rights reserved.
+This program is free software; you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<DBIx::DBSchema>, L<DBIx::DBSchema::DBD>, L<DBI>, L<DBI::DBD>
+
+=cut 
+
+1;
+
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/Table.pm b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/Table.pm
new file mode 100644
index 000000000..2d6272ecb
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/DBSchema/Table.pm
@@ -0,0 +1,471 @@
+package DBIx::DBSchema::Table;
+
+use strict;
+use vars qw(@ISA %create_params);
+#use Carp;
+#use Exporter;
+use DBIx::DBSchema::Column 0.02;
+use DBIx::DBSchema::ColGroup::Unique;
+use DBIx::DBSchema::ColGroup::Index;
+
+#@ISA = qw(Exporter);
+@ISA = qw();
+
+=head1 NAME
+
+DBIx::DBSchema::Table - Table objects
+
+=head1 SYNOPSIS
+
+  use DBIx::DBSchema::Table;
+
+  #old style (depriciated)
+  $table = new DBIx::DBSchema::Table (
+    "table_name",
+    "primary_key",
+    $dbix_dbschema_colgroup_unique_object,
+    $dbix_dbschema_colgroup_index_object,
+    @dbix_dbschema_column_objects,
+  );
+
+  #new style (preferred), pass a hashref of parameters
+  $table = new DBIx::DBSchema::Table (
+    {
+      name        => "table_name",
+      primary_key => "primary_key",
+      unique      => $dbix_dbschema_colgroup_unique_object,
+      'index'     => $dbix_dbschema_colgroup_index_object,
+      columns     => \@dbix_dbschema_column_objects,
+    }
+  );
+
+  $table->addcolumn ( $dbix_dbschema_column_object );
+
+  $table_name = $table->name;
+  $table->name("table_name");
+
+  $primary_key = $table->primary_key;
+  $table->primary_key("primary_key");
+
+  $dbix_dbschema_colgroup_unique_object = $table->unique;
+  $table->unique( $dbix_dbschema__colgroup_unique_object );
+
+  $dbix_dbschema_colgroup_index_object = $table->index;
+  $table->index( $dbix_dbschema_colgroup_index_object );
+
+  @column_names = $table->columns;
+
+  $dbix_dbschema_column_object = $table->column("column");
+
+  #preferred
+  @sql_statements = $table->sql_create_table( $dbh );
+  @sql_statements = $table->sql_create_table( $datasrc, $username, $password );
+
+  #possible problems
+  @sql_statements = $table->sql_create_table( $datasrc );
+  @sql_statements = $table->sql_create_table;
+
+=head1 DESCRIPTION
+
+DBIx::DBSchema::Table objects represent a single database table.
+
+=head1 METHODS
+
+=over 4
+
+=item new [ TABLE_NAME [ , PRIMARY_KEY [ , UNIQUE [ , INDEX [ , COLUMN... ] ] ] ] ]
+
+=item new HASHREF
+
+Creates a new DBIx::DBSchema::Table object.  The preferred usage is to pass a
+hash reference of named parameters.
+
+  {
+    name        => TABLE_NAME,
+    primary_key => PRIMARY_KEY,
+    unique      => UNIQUE,
+    'index'     => INDEX,
+    columns     => COLUMNS
+  }
+
+TABLE_NAME is the name of the table.  PRIMARY_KEY is the primary key (may be
+empty).  UNIQUE is a DBIx::DBSchema::ColGroup::Unique object (see
+L<DBIx::DBSchema::ColGroup::Unique>).  INDEX is a
+DBIx::DBSchema::ColGroup::Index object (see
+L<DBIx::DBSchema::ColGroup::Index>).  COLUMNS is a reference to an array of
+DBIx::DBSchema::Column objects (see L<DBIx::DBSchema::Column>).
+
+=cut
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+
+  my $self;
+  if ( ref($_[0]) ) {
+
+    $self = shift;
+    $self->{column_order} = [ map { $_->name } @{$self->{columns}} ];
+    $self->{columns} = { map { $_->name, $_ } @{$self->{columns}} };
+
+  } else {
+
+    my($name,$primary_key,$unique,$index,@columns) = @_;
+
+    my %columns = map { $_->name, $_ } @columns;
+    my @column_order = map { $_->name } @columns;
+
+    $self = {
+      'name'         => $name,
+      'primary_key'  => $primary_key,
+      'unique'       => $unique,
+      'index'        => $index,
+      'columns'      => \%columns,
+      'column_order' => \@column_order,
+    };
+
+  }
+
+  #check $primary_key, $unique and $index to make sure they are $columns ?
+  # (and sanity check?)
+
+  bless ($self, $class);
+
+}
+
+=item new_odbc DATABASE_HANDLE TABLE_NAME
+
+Creates a new DBIx::DBSchema::Table object from the supplied DBI database
+handle for the specified table.  This uses the experimental DBI type_info
+method to create a table with standard (ODBC) SQL column types that most
+closely correspond to any non-portable column types.   Use this to import a
+schema that you wish to use with many different database engines.  Although
+primary key and (unique) index information will only be imported from databases
+with DBIx::DBSchema::DBD drivers (currently MySQL and PostgreSQL), import of
+column names and attributes *should* work for any database.
+
+Note: the _odbc refers to the column types used and nothing else - you do not
+have to have ODBC installed or connect to the database via ODBC.
+
+=cut
+
+%create_params = (
+#  undef             => sub { '' },
+  ''                => sub { '' },
+  'max length'      => sub { $_[0]->{PRECISION}->[$_[1]]; },
+  'precision,scale' =>
+    sub { $_[0]->{PRECISION}->[$_[1]]. ','. $_[0]->{SCALE}->[$_[1]]; }
+);
+
+sub new_odbc {
+  my( $proto, $dbh, $name) = @_;
+  my $driver = DBIx::DBSchema::_load_driver($dbh);
+  my $sth = _null_sth($dbh, $name);
+  my $sthpos = 0;
+  $proto->new (
+    $name,
+    scalar(eval "DBIx::DBSchema::DBD::$driver->primary_key(\$dbh, \$name)"),
+    DBIx::DBSchema::ColGroup::Unique->new(
+      $driver
+       ? [values %{eval "DBIx::DBSchema::DBD::$driver->unique(\$dbh, \$name)"}]
+       : []
+    ),
+    DBIx::DBSchema::ColGroup::Index->new(
+      $driver
+      ? [ values %{eval "DBIx::DBSchema::DBD::$driver->index(\$dbh, \$name)"} ]
+      : []
+    ),
+    map { 
+      my $type_info = scalar($dbh->type_info($sth->{TYPE}->[$sthpos]))
+        or die "DBI::type_info ". $dbh->{Driver}->{Name}. " driver ".
+               "returned no results for type ".  $sth->{TYPE}->[$sthpos];
+      new DBIx::DBSchema::Column
+          $_,
+          $type_info->{'TYPE_NAME'},
+          #"SQL_". uc($type_info->{'TYPE_NAME'}),
+          $sth->{NULLABLE}->[$sthpos],
+          &{ $create_params{ $type_info->{CREATE_PARAMS} } }( $sth, $sthpos++ ),          $driver && #default
+            ${ [
+              eval "DBIx::DBSchema::DBD::$driver->column(\$dbh, \$name, \$_)"
+            ] }[4]
+          # DB-local
+    } @{$sth->{NAME}}
+  );
+}
+
+=item new_native DATABASE_HANDLE TABLE_NAME
+
+Creates a new DBIx::DBSchema::Table object from the supplied DBI database
+handle for the specified table.  This uses database-native methods to read the
+schema, and will preserve any non-portable column types.  The method is only
+available if there is a DBIx::DBSchema::DBD for the corresponding database
+engine (currently, MySQL and PostgreSQL).
+
+=cut
+
+sub new_native {
+  my( $proto, $dbh, $name) = @_;
+  my $driver = DBIx::DBSchema::_load_driver($dbh);
+  $proto->new (
+    $name,
+    scalar(eval "DBIx::DBSchema::DBD::$driver->primary_key(\$dbh, \$name)"),
+    DBIx::DBSchema::ColGroup::Unique->new(
+      [ values %{eval "DBIx::DBSchema::DBD::$driver->unique(\$dbh, \$name)"} ]
+    ),
+    DBIx::DBSchema::ColGroup::Index->new(
+      [ values %{eval "DBIx::DBSchema::DBD::$driver->index(\$dbh, \$name)"} ]
+    ),
+    map {
+      DBIx::DBSchema::Column->new( @{$_} )
+    } eval "DBIx::DBSchema::DBD::$driver->columns(\$dbh, \$name)"
+  );
+}
+
+=item addcolumn COLUMN
+
+Adds this DBIx::DBSchema::Column object. 
+
+=cut
+
+sub addcolumn {
+  my($self,$column)=@_;
+  ${$self->{'columns'}}{$column->name}=$column; #sanity check?
+  push @{$self->{'column_order'}}, $column->name;
+}
+
+=item delcolumn COLUMN_NAME
+
+Deletes this column.  Returns false if no column of this name was found to
+remove, true otherwise.
+
+=cut
+
+sub delcolumn {
+  my($self,$column) = @_;
+  return 0 unless exists $self->{'columns'}{$column};
+  delete $self->{'columns'}{$column};
+  @{$self->{'column_order'}}= grep { $_ ne $column } @{$self->{'column_order'}};  1;
+}
+
+=item name [ TABLE_NAME ]
+
+Returns or sets the table name.
+
+=cut
+
+sub name {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{name} = $value;
+  } else {
+    $self->{name};
+  }
+}
+
+=item primary_key [ PRIMARY_KEY ]
+
+Returns or sets the primary key.
+
+=cut
+
+sub primary_key {
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{primary_key} = $value;
+  } else {
+    #$self->{primary_key};
+    #hmm.  maybe should untaint the entire structure when it comes off disk 
+    # cause if you don't trust that, ?
+    $self->{primary_key} =~ /^(\w*)$/ 
+      #aah!
+      or die "Illegal primary key: ", $self->{primary_key};
+    $1;
+  }
+}
+
+=item unique [ UNIQUE ]
+
+Returns or sets the DBIx::DBSchema::ColGroup::Unique object.
+
+=cut
+
+sub unique { 
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{unique} = $value;
+  } else {
+    $self->{unique};
+  }
+}
+
+=item index [ INDEX ]
+
+Returns or sets the DBIx::DBSchema::ColGroup::Index object.
+
+=cut
+
+sub index { 
+  my($self,$value)=@_;
+  if ( defined($value) ) {
+    $self->{'index'} = $value;
+  } else {
+    $self->{'index'};
+  }
+}
+
+=item columns
+
+Returns a list consisting of the names of all columns.
+
+=cut
+
+sub columns {
+  my($self)=@_;
+  #keys %{$self->{'columns'}};
+  #must preserve order
+  @{ $self->{'column_order'} };
+}
+
+=item column COLUMN_NAME
+
+Returns the column object (see L<DBIx::DBSchema::Column>) for the specified
+COLUMN_NAME.
+
+=cut
+
+sub column {
+  my($self,$column)=@_;
+  $self->{'columns'}->{$column};
+}
+
+=item sql_create_table [ DATABASE_HANDLE | DATA_SOURCE [ USERNAME PASSWORD [ ATTR ] ] ]
+
+Returns a list of SQL statments to create this table.
+
+The data source can be specified by passing an open DBI database handle, or by
+passing the DBI data source name, username and password.  
+
+Although the username and password are optional, it is best to call this method
+with a database handle or data source including a valid username and password -
+a DBI connection will be opened and the quoting and type mapping will be more
+reliable.
+
+If passed a DBI data source (or handle) such as `DBI:mysql:database', will use
+MySQL- or PostgreSQL-specific syntax.  Non-standard syntax for other engines
+(if applicable) may also be supported in the future.
+
+=cut
+
+sub sql_create_table { 
+  my($self, $dbh) = (shift, shift);
+
+  my $created_dbh = 0;
+  unless ( ref($dbh) || ! @_ ) {
+    $dbh = DBI->connect( $dbh, @_ ) or die $DBI::errstr;
+    my $gratuitous = $DBI::errstr; #surpress superfluous `used only once' error
+    $created_dbh = 1;
+  }
+  #false laziness: nicked from DBSchema::_load_driver
+  my $driver;
+  if ( ref($dbh) ) {
+    $driver = $dbh->{Driver}->{Name};
+  } else {
+    my $discard = $dbh;
+    $discard =~ s/^dbi:(\w*?)(?:\((.*?)\))?://i #nicked from DBI->connect
+                        or '' =~ /()/; # ensure $1 etc are empty if match fails
+    $driver = $1 or die "can't parse data source: $dbh";
+  }
+  #eofalse
+
+#should be in the DBD somehwere :/
+#  my $saved_pkey = '';
+#  if ( $driver eq 'Pg' && $self->primary_key ) {
+#    my $pcolumn = $self->column( (
+#      grep { $self->column($_)->name eq $self->primary_key } $self->columns
+#    )[0] );
+##AUTO-INCREMENT#    $pcolumn->type('serial') if lc($pcolumn->type) eq 'integer';
+#    $pcolumn->local( $pcolumn->local. ' PRIMARY KEY' );
+#    #my $saved_pkey = $self->primary_key;
+#    #$self->primary_key('');
+#    #change it back afterwords :/
+#  }
+
+  my @columns = map { $self->column($_)->line($dbh) } $self->columns;
+
+  push @columns, "PRIMARY KEY (". $self->primary_key. ")"
+    #if $self->primary_key && $driver ne 'Pg';
+    if $self->primary_key;
+
+  my $indexnum = 1;
+
+  my @r = (
+    "CREATE TABLE ". $self->name. " (\n  ". join(",\n  ", @columns). "\n)\n"
+  );
+
+  push @r, map {
+                 #my($index) = $self->name. "__". $_ . "_idx";
+                 #$index =~ s/,\s*/_/g;
+                 my $index = $self->name. $indexnum++;
+                 "CREATE UNIQUE INDEX $index ON ". $self->name. " ($_)\n"
+               } $self->unique->sql_list
+    if $self->unique;
+
+  push @r, map {
+                 #my($index) = $self->name. "__". $_ . "_idx";
+                 #$index =~ s/,\s*/_/g;
+                 my $index = $self->name. $indexnum++;
+                 "CREATE INDEX $index ON ". $self->name. " ($_)\n"
+               } $self->index->sql_list
+    if $self->index;
+
+  #$self->primary_key($saved_pkey) if $saved_pkey;
+  $dbh->disconnect if $created_dbh;
+  @r;
+}
+
+#
+
+sub _null_sth {
+  my($dbh, $table) = @_;
+  my $sth = $dbh->prepare("SELECT * FROM $table WHERE 1=0")
+    or die $dbh->errstr;
+  $sth->execute or die $sth->errstr;
+  $sth;
+}
+
+=back
+
+=head1 AUTHOR
+
+Ivan Kohler <ivan-dbix-dbschema@420.am>
+
+Thanks to Mark Ethan Trostler <mark@zzo.com> for a patch to allow tables
+with no indices.
+
+=head1 COPYRIGHT
+
+Copyright (c) 2000 Ivan Kohler
+Copyright (c) 2000 Mail Abuse Prevention System LLC
+All rights reserved.
+This program is free software; you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=head1 BUGS
+
+sql_create_table() has database-specific foo that probably ought to be
+abstracted into the DBIx::DBSchema::DBD:: modules.
+
+sql_create_table may change or destroy the object's data.  If you need to use
+the object after sql_create_table, make a copy beforehand.
+
+Some of the logic in new_odbc might be better abstracted into Column.pm etc.
+
+=head1 SEE ALSO
+
+L<DBIx::DBSchema>, L<DBIx::DBSchema::ColGroup::Unique>,
+L<DBIx::DBSchema::ColGroup::Index>, L<DBIx::DBSchema::Column>, L<DBI>
+
+=cut
+
+1;
+
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/MANIFEST b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/MANIFEST
new file mode 100644
index 000000000..b04de251f
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/MANIFEST
@@ -0,0 +1,19 @@
+Changes
+MANIFEST
+MANIFEST.SKIP
+README
+TODO
+Makefile.PL
+DBSchema.pm
+t/load.t
+t/load-mysql.t
+t/load-pg.t
+DBSchema/Table.pm
+DBSchema/ColGroup.pm
+DBSchema/ColGroup/Index.pm
+DBSchema/ColGroup/Unique.pm
+DBSchema/Column.pm
+DBSchema/DBD.pm
+DBSchema/DBD/mysql.pm
+DBSchema/DBD/Pg.pm
+DBSchema/DBD/Sybase.pm
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/MANIFEST.SKIP b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/MANIFEST.SKIP
new file mode 100644
index 000000000..ae335e78a
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/MANIFEST.SKIP
@@ -0,0 +1 @@
+CVS/
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/Makefile.PL b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/Makefile.PL
new file mode 100644
index 000000000..a10e4daf8
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/Makefile.PL
@@ -0,0 +1,11 @@
+use ExtUtils::MakeMaker;
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written.
+WriteMakefile(
+    'NAME'	=> 'DBIx::DBSchema',
+    'VERSION_FROM' => 'DBSchema.pm', # finds $VERSION
+    'PREREQ_PM'    => {
+                        'DBI' => 0,
+                        'FreezeThaw' => 0,
+                      },
+);
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/README b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/README
new file mode 100644
index 000000000..8911ea4ca
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/README
@@ -0,0 +1,42 @@
+DBIx::DBSchema
+
+Copyright (c) 2000-2002 Ivan Kohler
+Copyright (c) 2000 Mail Abuse Prevention System LLC
+All rights reserved.
+This program is free software; you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+This module implements an OO-interface to database schemas.  Using this module,
+you can create a database schema with an OO Perl interface.  You can read the
+schema from an existing database.  You can save the schema to disk and restore
+it from different process.  Most importantly, DBIx::DBSchema can write SQL
+CREATE statements for different databases from a single source.
+
+Currently supported databases are MySQL, PostgreSQL and Sybase.
+DBIx::DBSchema will attempt to use generic SQL syntax for other databases.
+Assistance adding support for other databases is welcomed.  See the
+DBIx::DBSchema::DBD manpage, "Driver Writer's Guide and Base Class".
+
+To install:
+	perl Makefile.PL
+	make
+	make test # nothing substantial yet
+	make install
+
+Documentation will then be available via `man DBIx::DBSchema' or
+`perldoc DBIx::DBSchema'.
+
+Anonymous CVS access is available:
+  $ export CVSROOT=":pserver:anonymous@cleanwhisker.420.am:/home/cvs/cvsroot"
+  $ cvs login
+  (Logging in to anonymous@cleanwhisker.420.am)
+  CVS password: anonymous
+  $ cvs checkout DBIx-DBSchema
+as well as <http://www.420.am/cgi-bin/cvsweb/DBIx-DBSchema>.
+
+A mailing list is available.  Send a blank message to
+<ivan-dbix-dbschema-users-subscribe@420.am>.
+
+Homepage: <http://www.420.am/dbix-dbschema>
+
+$Id: README,v 1.1 2004-04-29 09:21:27 ivan Exp $
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/TODO b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/TODO
new file mode 100644
index 000000000..e75850bdb
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/TODO
@@ -0,0 +1,6 @@
+port and test with additional databases
+
+sql CREATE TABLE output should convert integers
+(i.e. use DBI qw(:sql_types);) to local types using DBI->type_info plus a hash
+to fudge things
+
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/t/load-mysql.t b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/t/load-mysql.t
new file mode 100644
index 000000000..78818c10d
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/t/load-mysql.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n"; }
+END {print "not ok 1\n" unless $loaded;}
+use DBIx::DBSchema::DBD::mysql;
+$loaded = 1;
+print "ok 1\n";
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/t/load-pg.t b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/t/load-pg.t
new file mode 100644
index 000000000..93fcf4abb
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/t/load-pg.t
@@ -0,0 +1,12 @@
+print "1..1\n";
+eval "use DBD::Pg 1.32";
+if ( length($@) ) {
+  print "ok 1 # Skipped: DBD::Pg 1.32 required for Pg";
+} else {
+  eval "use DBIx::DBSchema::DBD::Pg;";
+  if ( length($@) ) {
+    print "not ok 1\n";
+  } else {
+    print "ok 1\n";
+  }
+}
diff --git a/install/5.005/DBIx-DBSchema-0.23-5.005kludge/t/load.t b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/t/load.t
new file mode 100644
index 000000000..67ea44b24
--- /dev/null
+++ b/install/5.005/DBIx-DBSchema-0.23-5.005kludge/t/load.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n"; }
+END {print "not ok 1\n" unless $loaded;}
+use DBIx::DBSchema;
+$loaded = 1;
+print "ok 1\n";
-- 
cgit v1.2.1


From d4f2b0e05adf463bbaa165f7cb5e6764cfd080b1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Apr 2004 09:24:38 +0000
Subject: 5.005 fix

---
 install/5.005/Net-Whois-Raw/lib/Net/Whois/Raw/Data.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/5.005/Net-Whois-Raw/lib/Net/Whois/Raw/Data.pm b/install/5.005/Net-Whois-Raw/lib/Net/Whois/Raw/Data.pm
index 7b51e2576..c505117aa 100644
--- a/install/5.005/Net-Whois-Raw/lib/Net/Whois/Raw/Data.pm
+++ b/install/5.005/Net-Whois-Raw/lib/Net/Whois/Raw/Data.pm
@@ -1,9 +1,9 @@
 package Net::Whois::Raw::Data;
 
 use strict;
-use vars qw(%notfound %strip);
+use vars qw(%notfound %strip %servers);
 
-our %servers = qw(
+%servers = qw(
     COM    whois.crsnic.net
     NET    whois.crsnic.net
     EDU    whois.educause.net
-- 
cgit v1.2.1


From a4d1103589a4a9eb39ba394afbf4bc2e99c7bba2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Apr 2004 13:08:42 +0000
Subject: imagemap for state selection

---
 fs_signup/FS-SignupClient/cgi/map.gif          | Bin 0 -> 8181 bytes
 fs_signup/FS-SignupClient/cgi/stateselect.html | 176 ++++++++++++++++---------
 2 files changed, 115 insertions(+), 61 deletions(-)
 create mode 100644 fs_signup/FS-SignupClient/cgi/map.gif

diff --git a/fs_signup/FS-SignupClient/cgi/map.gif b/fs_signup/FS-SignupClient/cgi/map.gif
new file mode 100644
index 000000000..ef884d8f9
Binary files /dev/null and b/fs_signup/FS-SignupClient/cgi/map.gif differ
diff --git a/fs_signup/FS-SignupClient/cgi/stateselect.html b/fs_signup/FS-SignupClient/cgi/stateselect.html
index 39823be83..ba55bff74 100644
--- a/fs_signup/FS-SignupClient/cgi/stateselect.html
+++ b/fs_signup/FS-SignupClient/cgi/stateselect.html
@@ -6,74 +6,128 @@ function gotoURL(object) {
 }
 </SCRIPT>
 <FORM>
-Select your state: 
+Select your state from the map or dropdown: 
+<MAP NAME=usmap>
+<area shape=poly COORDS="264,157,286,155,292,193,276,195,270,199,264,157" href="signup.cgi?init_popstate=AL">
+<area shape=poly COORDS="28,197,46,185,72,199,72,241,88,243,102,261,92,263,70,241,42,243,28,257,12,259,34,243,20,233,16,223,34,215,22,207,30,205,28,197" href="../states/Alaska.html">
+<area shape=poly COORDS="70,137,106,137,100,189,84,187,60,173,70,133,70,137,70,137" href="signup.cgi?init_popstate=AZ">
+<area shape=poly COORDS="250,153,242,179,220,177,218,171,216,145,252,143,250,155,250,153" href="signup.cgi?init_popstate=AR">
+<area shape=poly COORDS="10,79,38,81,30,109,62,151,56,173,40,169,20,145,4,101,10,75,26,79,10,79,10,79" href="signup.cgi?init_popstate=CA">
+<area shape=poly COORDS="108,103,158,107,154,141,104,137,110,101,128,103,108,103" href="signup.cgi?init_popstate=CO">
+<area shape=poly COORDS="374,107,405,105,405,123,372,125,374,107" href="signup.cgi?init_popstate=CT">
+<area shape=poly COORDS="370,143,402,145,405,157,362,157,370,143" href="signup.cgi?init_popstate=DE">
+<area shape=poly COORDS="275,193,325,187,327,197,341,219,341,233,335,237,317,215,315,205,307,195,293,203,275,193" href="signup.cgi?init_popstate=FL">
+<area shape=poly COORDS="297,153,283,155,297,191,321,189,321,169,297,153" href="signup.cgi?init_popstate=GA">
+<area shape=poly COORDS="98,233,142,263,156,251,162,239,164,229,136,231,94,221,100,235,98,233" href="signup.cgi?init_popstate=HI">
+<area shape=poly COORDS="68,21,76,21,72,35,80,47,80,55,84,65,100,69,94,93,56,83,66,51,70,19,68,21" href="signup.cgi?init_popstate=ID">
+<area shape=poly COORDS="242,91,258,89,266,123,256,139,234,109,248,87,242,91" href="signup.cgi?init_popstate=IL">
+<area shape=poly COORDS="261,95,265,123,265,131,285,117,277,91,261,95" href="signup.cgi?init_popstate=IN">
+<area shape=poly COORDS="198,87,206,111,232,109,240,99,240,91,232,79,198,87" href="signup.cgi?init_popstate=IA">
+<area shape=poly COORDS="158,111,158,135,214,139,214,127,208,113,158,111" href="signup.cgi?init_popstate=KS">
+<area shape=poly COORDS="263,133,275,129,289,115,303,121,307,129,299,135,251,141,269,131,263,133" href="signup.cgi?init_popstate=KY">
+<area shape=poly COORDS="222,179,246,179,244,197,258,193,262,213,226,209,224,177,222,179" href="signup.cgi?init_popstate=LA">
+<area shape=poly COORDS="363,37,373,59,373,47,387,31,377,9,365,15,363,37" href="signup.cgi?init_popstate=ME">
+<area shape=poly COORDS="376,159,405,159,405,175,374,177,376,159" href="signup.cgi?init_popstate=MD">
+<area shape=poly COORDS="378,74,380,88,404,88,404,72,378,74" href="signup.cgi?init_popstate=MA">
+<area shape=poly COORDS="265,73,269,83,265,93,293,91,295,71,281,53,271,53,267,69,265,73,265,73" href="signup.cgi?init_popstate=MI">
+<area shape=poly COORDS="194,31,222,33,242,35,224,51,222,63,222,73,234,79,196,85,194,31" href="signup.cgi?init_popstate=MN">
+<area shape=poly COORDS="265,159,271,199,257,201,259,195,241,197,251,155,265,159" href="signup.cgi?init_popstate=MS">
+<area shape=poly COORDS="206,113,234,111,256,139,248,147,214,145,208,111,206,113" href="signup.cgi?init_popstate=MO">
+<area shape=poly COORDS="78,23,148,31,146,67,84,63,78,35,80,19,78,23" href="signup.cgi?init_popstate=MT">
+<area shape=poly COORDS="146,85,148,103,158,105,164,109,206,109,198,85,144,87,146,85" href="signup.cgi?init_popstate=NE">
+<area shape=poly COORDS="40,83,76,87,64,151,32,109,40,83,40,83" href="signup.cgi?init_popstate=NV">
+<area shape=poly COORDS="298,11,330,9,330,25,298,25,298,11" href="signup.cgi?init_popstate=NH">
+<area shape=poly COORDS="372,127,404,125,405,141,368,139,376,125,372,127" href="signup.cgi?init_popstate=NJ">
+<area shape=poly COORDS="106,137,100,191,122,187,148,187,150,139,106,137,106,137" href="signup.cgi?init_popstate=NM">
+<area shape=poly COORDS="313,79,331,63,337,45,349,45,359,65,357,79,345,65,315,77,313,79,313,79" href="signup.cgi?init_popstate=NY">
+<area shape=poly COORDS="309,137,295,151,319,149,337,153,357,131,351,129,309,137,309,137" href="signup.cgi?init_popstate=NC">
+<area shape=poly COORDS="146,31,148,57,198,57,190,31,146,31,146,31" href="signup.cgi?init_popstate=ND">
+<area shape=poly COORDS="281,93,285,113,299,121,311,101,309,85,299,93,281,93,281,93" href="signup.cgi?init_popstate=OH">
+<area shape=poly COORDS="148,145,174,145,174,163,218,171,216,143,150,139,150,145,156,143,148,145,148,145" href="signup.cgi?init_popstate=OK">
+<area shape=poly COORDS="20,41,8,73,16,77,22,77,28,77,36,79,42,81,48,83,56,83,66,49,20,41,20,41" href="signup.cgi?init_popstate=OR">
+<area shape=poly COORDS="309,83,345,71,351,93,313,105,309,83,309,83" href="signup.cgi?init_popstate=PA">
+<area shape=poly COORDS="376,93,405,93,405,107,376,105,376,93" href="signup.cgi?init_popstate=RI">
+<area shape=poly COORDS="301,155,321,149,337,155,325,175,301,157,301,155,301,155" href="signup.cgi?init_popstate=SC">
+<area shape=poly COORDS="146,59,198,61,198,83,146,83,148,57,146,59,146,59" href="signup.cgi?init_popstate=SD">
+<area shape=poly COORDS="255,145,251,157,297,153,311,133,255,145,255,145" href="signup.cgi?init_popstate=TN">
+<area shape=poly COORDS="150,145,172,145,174,167,198,173,218,173,228,207,204,221,198,231,202,247,180,241,154,207,146,219,120,189,154,189,152,145,150,145,150,145" href="signup.cgi?init_popstate=TX">
+<area shape=poly COORDS="78,89,96,91,96,103,110,103,106,135,70,133,78,89,78,89" href="signup.cgi?init_popstate=UT">
+<area shape=poly COORDS="298,29,332,29,332,47,294,45,298,29" href="signup.cgi?init_popstate=VT">
+<area shape=poly COORDS="307,127,297,137,351,127,349,113,341,111,341,105,329,107,315,131,307,127,307,127" href="signup.cgi?init_popstate=VA">
+<area shape=poly COORDS="32,13,68,19,64,47,20,39,20,13,30,19,32,13,32,13" href="signup.cgi?init_popstate=WA">
+<area shape=poly COORDS="303,119,313,129,329,103,311,105,299,121,313,127,303,119,303,119" href="signup.cgi?init_popstate=WV">
+<area shape=poly COORDS="228,51,256,55,254,89,238,89,234,77,224,71,230,49,236,53,228,51,228,51" href="signup.cgi?init_popstate=WI">
+<area shape=poly COORDS="146,71,144,103,96,99,102,63,148,69,146,71,146,71" href="signup.cgi?init_popstate=WY">
+</MAP>
+<IMG SRC="map.gif" usemap=#usmap WIDTH=405 HEIGHT=270 border=0><BR>
 <SELECT NAME="init_popstate" onChange="gotoURL(this.form.init_popstate)">
 <OPTION VALUE="stateselect.html"></OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=AL">ALABAMA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=AK">ALASKA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=AS">AMERICAN SAMOA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=AZ">ARIZONA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=AR">ARKANSAS</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=CA">CALIFORNIA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=CO">COLORADO</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=CT">CONNECTICUT</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=DE">DELAWARE</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=DC">DISTRICT OF COLUMBIA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=FM">FEDERATED STATES OF MICRONESIA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=FL">FLORIDA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=GA">GEORGIA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=GU">GUAM</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=HI">HAWAII</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=ID">IDAHO</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=IL">ILLINOIS</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=IN">INDIANA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=IA">IOWA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=KS">KANSAS</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=KY">KENTUCKY</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=LA">LOUISIANA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=ME">MAINE</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=MH">MARSHALL ISLANDS</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=MD">MARYLAND</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=MA">MASSACHUSETTS</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=MI">MICHIGAN</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=MN">MINNESOTA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=MS">MISSISSIPPI</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=MO">MISSOURI</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=MT">MONTANA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=NE">NEBRASKA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=NV">NEVADA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=NH">NEW HAMPSHIRE</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=NJ">NEW JERSEY</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=NM">NEW MEXICO</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=NY">NEW YORK</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=NC">NORTH CAROLINA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=ND">NORTH DAKOTA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=MP">NORTHERN MARIANA ISLANDS</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=OH">OHIO</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=OK">OKLAHOMA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=OR">OREGON</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=PW">PALAU</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=PA">PENNSYLVANIA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=PR">PUERTO RICO</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=RI">RHODE ISLAND</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=SC">SOUTH CAROLINA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=SD">SOUTH DAKOTA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=TN">TENNESSEE</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=TX">TEXAS</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=UT">UTAH</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=VT">VERMONT</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=VI">VIRGIN ISLANDS</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=VA">VIRGINIA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=WA">WASHINGTON</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=WV">WEST VIRGINIA</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=WI">WISCONSIN</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=WY">WYOMING</OPTION>
-<OPTION VALUE="signup.cgi?init_popstate=AE">Armed Forces Africa</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=AL">Alabama</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=AK">Alaska</OPTION>
+<!--<OPTION VALUE="signup.cgi?init_popstate=AS">American Samoa</OPTION>-->
+<OPTION VALUE="signup.cgi?init_popstate=AZ">Arizona</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=AR">Arkansas</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=CA">California</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=CO">Colorado</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=CT">Connecticut</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=DE">Delaware</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=DC">District of Columbia</OPTION>
+<!--<OPTION VALUE="signup.cgi?init_popstate=FM">Federated States of Micronesia</OPTION>-->
+<OPTION VALUE="signup.cgi?init_popstate=FL">Florida</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=GA">Georgia</OPTION>
+<!--<OPTION VALUE="signup.cgi?init_popstate=GU">Guam</OPTION>-->
+<OPTION VALUE="signup.cgi?init_popstate=HI">Hawaii</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=ID">Idaho</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=IL">Illinois</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=IN">Indiana</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=IA">Iowa</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=KS">Kansas</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=KY">Kentucky</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=LA">Louisiana</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=ME">Maine</OPTION>
+<!--<OPTION VALUE="signup.cgi?init_popstate=MH">Marshall Islands</OPTION>-->
+<OPTION VALUE="signup.cgi?init_popstate=MD">Maryland</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=MA">Massachusetts</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=MI">Michigan</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=MN">Minnesota</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=MS">Mississippi</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=MO">Missouri</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=MT">Montana</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=NE">Nebraska</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=NV">Nevada</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=NH">New Hampshire</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=NJ">New Jersey</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=NM">New Mexico</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=NY">New York</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=NC">North Carolina</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=ND">North Dakota</OPTION>
+<!--<OPTION VALUE="signup.cgi?init_popstate=MP">Northern Mariana Islands</OPTION>-->
+<OPTION VALUE="signup.cgi?init_popstate=OH">Ohio</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=OK">Oklahoma</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=OR">Oregon</OPTION>
+<!--<OPTION VALUE="signup.cgi?init_popstate=PW">Palau</OPTION>-->
+<OPTION VALUE="signup.cgi?init_popstate=PA">Pennsylvania</OPTION>
+<!--<OPTION VALUE="signup.cgi?init_popstate=PR">Puerto Rico</OPTION>-->
+<OPTION VALUE="signup.cgi?init_popstate=RI">Rhode Island</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=SC">South Carolina</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=SD">South Dakota</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=TN">Tennessee</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=TX">Texas</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=UT">Utah</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=VT">Vermont</OPTION>
+<!--<OPTION VALUE="signup.cgi?init_popstate=VI">Virgin Islands</OPTION>-->
+<OPTION VALUE="signup.cgi?init_popstate=VA">Virginia</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=WA">Washington</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=WV">West Virginia</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=WI">Wisconsin</OPTION>
+<OPTION VALUE="signup.cgi?init_popstate=WY">Wyoming</OPTION>
+<!--<OPTION VALUE="signup.cgi?init_popstate=AE">Armed Forces Africa</OPTION>
 <OPTION VALUE="signup.cgi?init_popstate=AA">Armed Forces Americas</OPTION>
 <OPTION VALUE="signup.cgi?init_popstate=AE">Armed Forces Canada</OPTION>
 <OPTION VALUE="signup.cgi?init_popstate=AE">Armed Forces Europe</OPTION>
 <OPTION VALUE="signup.cgi?init_popstate=AE">Armed Forces Middle East</OPTION>
 <OPTION VALUE="signup.cgi?init_popstate=AP">Armed Forces Pacific</OPTION>
+-->
 </SELECT>
 </FORM>
 </BODY>
-- 
cgit v1.2.1


From c28a1f2d8b6c0c355a96f3b8f34c2ec40971c2a1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Apr 2004 19:08:21 +0000
Subject: 15 day open invoice reports for qis

---
 httemplate/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/httemplate/index.html b/httemplate/index.html
index 6ad12f197..2e7fc1c84 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -62,6 +62,7 @@
             <UL>
               <LI><a href="search/cust_bill_event.html">Invoice event errors (failed credit cards)</a>
               <LI>open invoices (<A HREF="search/cust_bill.html?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN_custnum">by customer number</A>)
+              <LI>15 day open invoices (<A HREF="search/cust_bill.html?OPEN15_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN15_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN15_custnum">by customer number</A>)
               <LI>30 day open invoices (<A HREF="search/cust_bill.html?OPEN30_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN30_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN30_custnum">by customer number</A>)
               <LI>60 day open invoices (<A HREF="search/cust_bill.html?OPEN60_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN60_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN60_custnum">by customer number</A>)
               <LI>90 day open invoices (<A HREF="search/cust_bill.html?OPEN90_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN90_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN90_custnum">by customer number</A>)
-- 
cgit v1.2.1


From d36f8467522fc1cf91775dfeffc15308f2c3034b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Apr 2004 20:22:49 +0000
Subject: eliminate spurious "multiple records in scalar search" warning

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 2f01111ef..f275d10fe 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1537,7 +1537,7 @@ sub collect {
              || $a->weight    <=> $b->weight
              || $a->eventpart <=> $b->eventpart }
         grep { $_->seconds <= ( $invoice_time - $cust_bill->_date )
-               && ! qsearchs( 'cust_bill_event', {
+               && ! qsearch( 'cust_bill_event', {
                                 'invnum'    => $cust_bill->invnum,
                                 'eventpart' => $_->eventpart,
                                 'status'    => 'done',
-- 
cgit v1.2.1


From 7404fa4a193912074a9e63f9db891abf2b399b78 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Apr 2004 21:58:15 +0000
Subject: accept empty zips for non-US countries...

---
 FS/FS/Record.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 801b89daf..dd87e5a9a 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1307,9 +1307,13 @@ sub ut_zip {
                 $self->getfield($field);
     $self->setfield($field,$1);
   } else {
-    $self->getfield($field) =~ /^\s*(\w[\w\-\s]{2,8}\w)\s*$/
-      or return gettext('illegal_zip'). " $field: ". $self->getfield($field);
-    $self->setfield($field,$1);
+    if ( $self->getfield($field) =~ /^\s*$/ ) {
+      $self->setfield($field,'');
+    } else {
+      $self->getfield($field) =~ /^\s*(\w[\w\-\s]{2,8}\w)\s*$/
+        or return gettext('illegal_zip'). " $field: ". $self->getfield($field);
+      $self->setfield($field,$1);
+    }
   }
   '';
 }
-- 
cgit v1.2.1


From 93a8bcc4ddde083b9da915986e32231530bbcb5e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 1 May 2004 03:54:50 +0000
Subject: very weird 5.005 problem

---
 htetc/global.asa | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htetc/global.asa b/htetc/global.asa
index 4358e87b1..55cc8ed94 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -198,7 +198,9 @@ sub sprintAutoProfile {
 
 sub include {
   ( my $file = shift ) =~ s(^/)(%%%FREESIDE_DOCUMENT_ROOT%%%/);
-  ${$Response->TrapInclude($file, @_)};
+  #broken in 5.005# ${$Response->TrapInclude($file, @_)};
+  my $ref = $Response->TrapInclude($file, @_);
+  $$ref;
 }
 
 if ( defined(@DBIx::Profile::ISA) ) {
-- 
cgit v1.2.1


From c4a190357a986db767924b7d6b6aae6039a4630e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 1 May 2004 10:43:21 +0000
Subject: update for some new atrpms package versions

---
 install/redhat/9/INSTALL | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/redhat/9/INSTALL b/install/redhat/9/INSTALL
index b9a345807..ce6ca5962 100644
--- a/install/redhat/9/INSTALL
+++ b/install/redhat/9/INSTALL
@@ -25,12 +25,12 @@ rpm -i apache-1.3.28-0.n0i.i386.rpm
 apt-get install perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-HTML-Parser perl-HTML-Tagset perl-TimeDate perl-URI perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs gcc gd #openssh
 
 #wget --passive-ftp --continue http://atrpms.physik.fu-berlin.de/dist/rh9/perl-GD/perl-GD-2.11-7.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-45-1.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/yum/yum-2.0.4-28.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/gd/gd-2.0.15-1_6.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-package-config-45-1.rh9.at.noarch.rpm
-wget --passive-ftp --continue http://atrpms.physik.fu-berlin.de/dist/rh9/perl-GD/perl-GD-2.11-7.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-50-1.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/yum/yum-2.0.5-1_30.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/gd/gd-2.0.15-1_6.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-package-config-50-1.rh9.at.noarch.rpm
+wget --passive-ftp --continue http://atrpms.physik.fu-berlin.de/dist/rh9/perl-GD/perl-GD-2.11-7.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-54-1.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/yum/yum-2.0.6-0_31.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/gd/gd-2.0.15-1_6.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-package-config-57-1.rh9.at.noarch.rpm
 
 cp /etc/apt/apt.conf /etc/apt/apt.conf.real
 
 #rpm -i --replacefiles atrpms-package-config-45-1.rh9.at.noarch.rpm yum-2.0.4-28.rh9.at.noarch.rpm atrpms-45-1.rh9.at.noarch.rpm gd-2.0.15-1_6.rh9.at.i386.rpm perl-GD-2.11-7.rh9.at.i386.rpm
-rpm -i --replacefiles atrpms-package-config-50-1.rh9.at.noarch.rpm yum-2.0.5-1_30.rh9.at.noarch.rpm atrpms-50-1.rh9.at.noarch.rpm gd-2.0.15-1_6.rh9.at.i386.rpm perl-GD-2.11-7.rh9.at.i386.rpm
+rpm -i --replacefiles atrpms-package-config-57-1.rh9.at.noarch.rpm yum-2.0.6-0_31.rh9.at.noarch.rpm atrpms-54-1.rh9.at.noarch.rpm gd-2.0.15-1_6.rh9.at.i386.rpm perl-GD-2.11-7.rh9.at.i386.rpm
 
 mv /etc/apt/apt.conf.real /etc/apt/apt.conf
 
-- 
cgit v1.2.1


From bfb3a80bc91a835513e437b242de366f190e9021 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 1 May 2004 21:05:48 +0000
Subject: handle missing customer records without erroring out

---
 httemplate/search/cust_bill.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index 27b147108..3a5db3549 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -71,10 +71,14 @@
                  sub { sprintf('$%.2f', shift->charged     ) },
                  sub { time2str('%b %d %Y', shift->_date ) },
                  sub { my $cust_main = shift->cust_main;
-                       $cust_main->get('last'). ', '. $cust_main->first;
+                       $cust_main
+                         ? $cust_main->get('last'). ', '. $cust_main->first
+                         : 'WARNING: can't find cust_main.custnum '.
+                           shift->custnum. ' (cust_bill.invnum '.
+                           shift->invnum. ')';
                      },
                  sub { my $cust_main = shift->cust_main;
-                       $cust_main->company;
+                       $cust_main ? $cust_main->company : '';
                      },
                ],
                'links' => [
-- 
cgit v1.2.1


From 79803ed2813d72e572feac02576bc591c835f049 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 1 May 2004 21:38:26 +0000
Subject: oops tyop

---
 httemplate/search/cust_bill.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index 3a5db3549..874c77035 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -73,7 +73,7 @@
                  sub { my $cust_main = shift->cust_main;
                        $cust_main
                          ? $cust_main->get('last'). ', '. $cust_main->first
-                         : 'WARNING: can't find cust_main.custnum '.
+                         : "WARNING: can't find cust_main.custnum ".
                            shift->custnum. ' (cust_bill.invnum '.
                            shift->invnum. ')';
                      },
-- 
cgit v1.2.1


From 6e0b2d0a94827df55364a45fe1d1ba8928c5d659 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 1 May 2004 21:40:41 +0000
Subject: I'm slow this morning

---
 httemplate/search/cust_bill.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index 874c77035..f65b08260 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -70,12 +70,13 @@
                  sub { sprintf('$%.2f', shift->get('owed') ) },
                  sub { sprintf('$%.2f', shift->charged     ) },
                  sub { time2str('%b %d %Y', shift->_date ) },
-                 sub { my $cust_main = shift->cust_main;
+                 sub { my $cust_bill = shift;
+                       my $cust_main = $cust_bill->cust_main;
                        $cust_main
                          ? $cust_main->get('last'). ', '. $cust_main->first
                          : "WARNING: can't find cust_main.custnum ".
-                           shift->custnum. ' (cust_bill.invnum '.
-                           shift->invnum. ')';
+                           $cust_bill->custnum. ' (cust_bill.invnum '.
+                           $cust_bill->invnum. ')';
                      },
                  sub { my $cust_main = shift->cust_main;
                        $cust_main ? $cust_main->company : '';
-- 
cgit v1.2.1


From 0f5028bc5a7789429a41bca886e5a38ed0fa099f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 1 May 2004 22:49:09 +0000
Subject: don't display links to missing customers

---
 httemplate/search/cust_bill.html       | 8 +++++++-
 httemplate/search/elements/search.html | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index f65b08260..337e9e859 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -50,7 +50,13 @@
    }
 
    my $link  = [ "${p}view/cust_bill.cgi?", 'invnum', ];
-   my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
+   my $clink = sub {
+     my $cust_bill = shift;
+     my $cust_main = $cust_bill->cust_main;
+     $cust_main
+       ? [ "${p}view/cust_main.cgi?", 'custnum' ]
+       : '';
+   };
 
 %>
 <%= include( 'elements/search.html',
diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index 226c4f784..e739afb1d 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -88,6 +88,7 @@
            <% my $a = ''; %>
            <% if ( $links ) {
                 my $link = shift @$links;
+                $link = &{$link}($row) if ref($link) eq 'CODE';
                 if ( $link ) {
                   my( $url, $method ) = @{$link};
                   if ( ref($method) eq 'CODE' ) {
-- 
cgit v1.2.1


From 4e4a935e10dad30648d9d9ebb2069ca80217dc72 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 May 2004 14:32:10 +0000
Subject: make RADIUS groups available to shellcommands exports

---
 FS/FS/part_export/shellcommands.pm            | 10 ++++++++++
 FS/FS/part_export/shellcommands_withdomain.pm |  1 +
 FS/FS/svc_acct.pm                             |  7 +++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 78f9e9690..4431cc0c4 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -154,6 +154,7 @@ old_ for replace operations):
   <LI><code>$dir</code> - home directory
   <LI><code>$shell</code>
   <LI><code>$quota</code>
+  <LI><code>@radius_groups</code>
   <LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.
 </UL>
 END
@@ -228,6 +229,8 @@ sub _export_command {
     );
   }
 
+  @radius_groups = $svc_acct->radius_groups;
+
   $self->shellcommands_queue( $svc_acct->svcnum,
     user         => $self->option('user')||'root',
     host         => $self->machine,
@@ -266,6 +269,9 @@ sub _export_replace {
     );
   }
 
+  @old_radius_groups = $old->radius_groups;
+  @new_radius_groups = $new->radius_groups;
+
   if ( $self->option('usermod_pwonly') ) {
     my $error = '';
     if ( $old_username ne $new_username ) {
@@ -280,6 +286,10 @@ sub _export_replace {
     if ( $old_dir ne $new_dir ) {
       $error ||= "can't change dir";
     }
+    if ( join("\n", sort @old_radius_groups) ne
+         join("\n", sort @new_radius_groups)    ) {
+      $error ||= "can't change RADIUS groups";
+    }
     return $error. ' ('. $self->exporttype. ' to '. $self->machine. ')'
       if $error;
   }
diff --git a/FS/FS/part_export/shellcommands_withdomain.pm b/FS/FS/part_export/shellcommands_withdomain.pm
index 8a56bab1c..4f1b25bc4 100644
--- a/FS/FS/part_export/shellcommands_withdomain.pm
+++ b/FS/FS/part_export/shellcommands_withdomain.pm
@@ -95,6 +95,7 @@ The following variables are available for interpolation (prefixed with
   <LI><code>$dir</code> - home directory
   <LI><code>$shell</code>
   <LI><code>$quota</code>
+  <LI><code>@radius_groups</code>
   <LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.
 </UL>
 END
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 100af6cb6..e97afe36a 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -187,8 +187,7 @@ The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be
 defined.  An FS::cust_svc record will be created and inserted.
 
 The additional field I<usergroup> can optionally be defined; if so it should
-contain an arrayref of group names.  See L<FS::radius_usergroup>.  (used in
-sqlradius export only)
+contain an arrayref of group names.  See L<FS::radius_usergroup>.
 
 The additional field I<child_objects> can optionally be defined; if so it
 should contain an arrayref of FS::tablename objects.  They will have their
@@ -535,8 +534,8 @@ Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
 The additional field I<usergroup> can optionally be defined; if so it should
-contain an arrayref of group names.  See L<FS::radius_usergroup>.  (used in
-sqlradius export only)
+contain an arrayref of group names.  See L<FS::radius_usergroup>.
+
 
 =cut
 
-- 
cgit v1.2.1


From bc10c7592866836b56d12b4e8b18f5fa67785a24 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 May 2004 15:40:10 +0000
Subject: 1. order_pkg accepts svcpart + (svc_external: id, title / svc_acct:
 domain)

---
 FS/FS/ClientAPI/MyAccount.pm | 75 ++++++++++++++++++++++++++++++--------------
 1 file changed, 52 insertions(+), 23 deletions(-)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index d2b6e0450..3c0b0ac5a 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -12,6 +12,8 @@ use FS::Record qw(qsearch qsearchs);
 use FS::Msgcat qw(gettext);
 use FS::svc_acct;
 use FS::svc_domain;
+use FS::svc_external;
+use FS::part_svc;
 use FS::cust_main;
 use FS::cust_bill;
 use FS::cust_main_county;
@@ -406,35 +408,61 @@ sub order_pkg {
   my $error = $cust_pkg->check;
   return { 'error' => $error } if $error;
 
-  my $svc_acct = new FS::svc_acct ( {
-    'svcpart'   => $p->{'svcpart'} || $cust_pkg->part_pkg->svcpart('svc_acct'),
-    map { $_ => $p->{$_} }
-      qw( username _password sec_phrase popnum ),
-  } );
+  my @svc = ();
+  unless ( $p->{'svcpart'} eq 'none' ) {
+
+    my $svcdb;
+    my $svcpart = '';
+    if ( $p->{'svcpart'} =~ /^(\d+)$/ ) {
+      $svcpart = $1;
+      my $part_svc = qsearchs('part_svc', { 'svcpart' => $svcpart } );
+      return { 'error' => "Unknown svcpart $svcpart" } unless $part_svc;
+      $svcdb = $part_svc->svcdb;
+    } else {
+      $svcdb = 'svc_acct';
+    }
+    $svcpart ||= $cust_pkg->part_pkg->svcpart($svcdb);
 
-  my @acct_snarf;
-  my $snarfnum = 1;
-  while ( length($p->{"snarf_machine$snarfnum"}) ) {
-    my $acct_snarf = new FS::acct_snarf ( {
-      'machine'   => $p->{"snarf_machine$snarfnum"},
-      'protocol'  => $p->{"snarf_protocol$snarfnum"},
-      'username'  => $p->{"snarf_username$snarfnum"},
-      '_password' => $p->{"snarf_password$snarfnum"},
+    my %fields = (
+      'svc_acct'     => [ qw( username _password sec_phrase popnum ) ],
+      'svc_domain'   => [ qw( domain ) ],
+      'svc_external' => [ qw( id title ) ],
+    );
+  
+    my $svc_x = "FS::$svcdb"->new( {
+      'svcpart'   => $svcpart,
+      map { $_ => $p->{$_} } @{$fields{$svcdb}}
     } );
-    $snarfnum++;
-    push @acct_snarf, $acct_snarf;
-  }
-  $svc_acct->child_objects( \@acct_snarf );
+    
+    if ( $svcdb eq 'svc_acct' ) {
+      my @acct_snarf;
+      my $snarfnum = 1;
+      while ( length($p->{"snarf_machine$snarfnum"}) ) {
+        my $acct_snarf = new FS::acct_snarf ( {
+          'machine'   => $p->{"snarf_machine$snarfnum"},
+          'protocol'  => $p->{"snarf_protocol$snarfnum"},
+          'username'  => $p->{"snarf_username$snarfnum"},
+          '_password' => $p->{"snarf_password$snarfnum"},
+        } );
+        $snarfnum++;
+        push @acct_snarf, $acct_snarf;
+      }
+      $svc_x->child_objects( \@acct_snarf );
+    }
+    
+    my $y = $svc_x->setdefault; # arguably should be in new method
+    return { 'error' => $y } if $y && !ref($y);
+  
+    $error = $svc_x->check;
+    return { 'error' => $error } if $error;
 
-  my $y = $svc_acct->setdefault; # arguably should be in new method
-  return { 'error' => $y } if $y && !ref($y);
+    push @svc, $svc_x;
 
-  $error = $svc_acct->check;
-  return { 'error' => $error } if $error;
+  }
 
   use Tie::RefHash;
   tie my %hash, 'Tie::RefHash';
-  %hash = ( $cust_pkg => [ $svc_acct ] );
+  %hash = ( $cust_pkg => \@svc );
   #msgcat
   $error = $cust_main->order_pkgs( \%hash, '', 'noexport' => 1 );
   return { 'error' => $error } if $error;
@@ -449,7 +477,8 @@ sub order_pkg {
     $cust_main->apply_credits;
     $bill_error = $cust_main->collect;
 
-    if ( $cust_main->balance > $old_balance ) {
+    if ( $cust_main->balance > $old_balance
+         && $cust_main->payby !~ /^(BILL|DCRD|DCHK)$/ ) {
       $cust_pkg->cancel('quiet'=>1);
       return { 'error' => '_decline' };
     } else {
-- 
cgit v1.2.1


From 27bf0365cef058944b8d71379af45d514e0b0c36 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 May 2004 18:44:48 +0000
Subject: don't truncate job args for display

---
 FS/FS/queue.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index 9dcb2e3be..8396fc904 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -352,9 +352,7 @@ END
 
     my $args;
     if ( $dangerous || $queue->job !~ /^FS::part_export::/ || !$noactions ) {
-      $args = encode_entities( join(' ',
-        map { length($_)<54 ? $_ : substr($_,0,32)."..."  } $queue->args #1&g
-      ) );
+      $args = encode_entities( join(' ', $queue->args) );
     } else {
       $args = '';
     }
@@ -424,7 +422,7 @@ END
 
 =head1 VERSION
 
-$Id: queue.pm,v 1.17 2004-03-03 13:42:08 ivan Exp $
+$Id: queue.pm,v 1.18 2004-05-04 18:44:48 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 2a3703dad2a512c709152c1a8d99acbe6c27b668 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 May 2004 22:18:24 +0000
Subject: show service name and fully-qualified address on service add

---
 httemplate/edit/svc_www.cgi | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index ec5169e05..e13bb44c0 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -53,7 +53,7 @@ if ( $cgi->param('error') ) {
 }
 my $action = $svc_www->svcnum ? 'Edit' : 'Add';
 
-my( %username, %arec );
+my( %svc_acct, %arec );
 if ($pkgnum) {
 
   my($u_part_svc,@u_acct_svcparts);
@@ -73,7 +73,8 @@ if ($pkgnum) {
       my($i_cust_svc);
       foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
         my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
-        $username{$svc_acct->getfield('svcnum')}=$svc_acct->getfield('username');
+        $svc_acct{$svc_acct->getfield('svcnum')}=
+          $svc_acct->part-svc->svc. ': '. $svc_acct->email;
       }  
     }
   }
@@ -161,9 +162,9 @@ foreach $_ (keys %arec) {
 print "</SELECT></TD></TR>";
 
 print '<TR><TD ALIGN="right">Username</TD><TD><SELECT NAME="usersvc" SIZE=1>';
-foreach $_ (keys %username) {
+foreach $_ (keys %svc_acct) {
   print "<OPTION", ($_ eq $usersvc) ? " SELECTED" : "",
-        qq! VALUE="$_">$username{$_}!;
+        qq! VALUE="$_">$svc_acct{$_}!;
 }
 print "</SELECT></TD></TR>";
 
-- 
cgit v1.2.1


From 47ac05fedd2437ff079223b39934fd4bf0870df5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 May 2004 22:29:05 +0000
Subject: protect properly against deleting users linked to virtual web sites

---
 FS/FS/svc_acct.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index e97afe36a..a566b81f6 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -30,6 +30,8 @@ use FS::radius_usergroup;
 use FS::export_svc;
 use FS::part_export;
 use FS::Msgcat qw(gettext);
+use FS::svc_forward;
+use FS::svc_www;
 
 @ISA = qw( FS::svc_Common );
 
-- 
cgit v1.2.1


From 226b17bfa055fb960b722c6a17d1c81bb8970f2c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 May 2004 22:29:24 +0000
Subject: add option to change the restart command in apache exports

---
 FS/FS/part_export/apache.pm | 3 +++
 bin/apache.export           | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_export/apache.pm b/FS/FS/part_export/apache.pm
index b16b3040d..17fbabff8 100644
--- a/FS/FS/part_export/apache.pm
+++ b/FS/FS/part_export/apache.pm
@@ -10,6 +10,9 @@ tie my %options, 'Tie::IxHash',
   'user'       => { label=>'Remote username', default=>'root' },
   'httpd_conf' => { label=>'httpd.conf snippet location',
                     default=>'/etc/apache/httpd-freeside.conf', },
+  'restart'    => { label=>'Apache restart command',
+                    default=>'apachectl graceful',
+                  },
   'template'   => {
     label   => 'Template',
     type    => 'textarea',
diff --git a/bin/apache.export b/bin/apache.export
index f0a6beefc..47863a9d5 100755
--- a/bin/apache.export
+++ b/bin/apache.export
@@ -51,7 +51,9 @@ foreach my $export ( @exports ) {
   } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
  # warn $rsync->out;
 
-  ssh("root\@$machine", 'apachectl graceful');
+  my $restart = $export->option('restart') || 'apachectl graceful';
+
+  ssh("root\@$machine", $restart);
 
 }
 
-- 
cgit v1.2.1


From e520b9f7d88539634225560d462d03c7d2057d9d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 May 2004 22:34:14 +0000
Subject: tyop

---
 httemplate/edit/svc_www.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index e13bb44c0..313ebee0b 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -74,7 +74,7 @@ if ($pkgnum) {
       foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
         my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
         $svc_acct{$svc_acct->getfield('svcnum')}=
-          $svc_acct->part-svc->svc. ': '. $svc_acct->email;
+          $svc_acct->part_svc->svc. ': '. $svc_acct->email;
       }  
     }
   }
-- 
cgit v1.2.1


From 28f7684d096f8f5c97a68d04193bc9ba1d503ef5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 May 2004 22:37:13 +0000
Subject: brainfart

---
 httemplate/edit/svc_www.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index 313ebee0b..ebc4b1148 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -74,7 +74,7 @@ if ($pkgnum) {
       foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
         my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
         $svc_acct{$svc_acct->getfield('svcnum')}=
-          $svc_acct->part_svc->svc. ': '. $svc_acct->email;
+          $svc_acct->cust_svc->part_svc->svc. ': '. $svc_acct->email;
       }  
     }
   }
-- 
cgit v1.2.1


From a176034d4fa386de180b893e00bda36b04251778 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 8 May 2004 07:46:31 +0000
Subject: default finger to first+last

---
 FS/FS/svc_acct.pm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index a566b81f6..355573b00 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -831,6 +831,15 @@ sub check {
 
   #  $error = $self->ut_textn('finger');
   #  return $error if $error;
+  if ( $self->getfield('finger') eq '' ) {
+    my $cust_pkg = $self->svcnum
+      ? $self->cust_svc->cust_pkg
+      : qsearchs('cust_pkg', { 'pkgnum' => $self->getfield('pkgnum') } );
+    if ( $cust_pkg ) {
+      my $cust_main = $cust_pkg->cust_main;
+      $self->setfield('finger', $cust_main->first.' '.$cust_main->get('last') );
+    }
+  }
   $self->getfield('finger') =~
     /^([\w \t\!\@\#\$\%\&\(\)\-\+\;\'\"\,\.\?\/\*\<\>]*)$/
       or return "Illegal finger: ". $self->getfield('finger');
-- 
cgit v1.2.1


From d18d092121b0a488fb78f9168824db854eae480c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 May 2004 08:38:26 +0000
Subject: rt and sql-ledger

---
 CREDITS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CREDITS b/CREDITS
index 592be445a..39b53a7b8 100644
--- a/CREDITS
+++ b/CREDITS
@@ -120,5 +120,11 @@ Latex invoice template based on a template from eBills
 <http://ebills.sourceforge.net/> by Mark Asplen-Taylor <mark@asplen.co.uk>,
 licensed under the terms fo the GNU GPL.
 
+Contains "Request Tracker" <http://www.bestpractical.com/rt/> by Jesse
+Vincent <jesse@bestpractical.com> licensed under the terms of the GNU GPL.
+
+Contains "SQL Ledger" <http://www.sql-ledger.com/> by DWS Systems Inc. and
+contributors licensed under the terms of the GNU GPL.
+
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
-- 
cgit v1.2.1


From 24653b038976803a9d328eb7b5a73b78a3bd5c3a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 May 2004 09:38:52 +0000
Subject: ach 5.005

---
 bin/sendmail.import | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/sendmail.import b/bin/sendmail.import
index 8a9de9fd3..c6ed434cd 100644
--- a/bin/sendmail.import
+++ b/bin/sendmail.import
@@ -28,7 +28,7 @@ $forward_svcpart = 4;
 
 use vars qw($spooldir);
 $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/sendmail";
-mkdir $spooldir unless -d $spooldir;
+mkdir($spooldir, 0755) unless -d $spooldir;
 
 print "\n\n", <<END;
 Enter the location and name of your Sendmail aliases file, for example
-- 
cgit v1.2.1


From a99ff097871f1072d30c83c2d519f19e99ab794e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 May 2004 09:40:38 +0000
Subject: 5.005!

---
 bin/sendmail.import | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/sendmail.import b/bin/sendmail.import
index c6ed434cd..a55616dc3 100644
--- a/bin/sendmail.import
+++ b/bin/sendmail.import
@@ -39,7 +39,7 @@ my($aliases)=&getvalue(":");
 use vars qw($aliases_machine $aliases_prefix);
 $aliases_machine = (split(/:/, $aliases))[0];
 $aliases_prefix = "$spooldir/$aliases_machine";
-mkdir $aliases_prefix unless -d $aliases_prefix;
+mkdir($aliases_prefix, 0755) unless -d $aliases_prefix;
 
 #iscp("root\@$aliases","$aliases_prefix/aliases.import");
 iscp("ivan\@$aliases","$aliases_prefix/aliases.import");
@@ -53,8 +53,8 @@ my($virtusertable)=&getvalue(":");
 use vars qw($virtusertable_machine $virtusertable_prefix);
 $virtusertable_machine = (split(/:/, $virtusertable))[0];
 $virtusertable_prefix = "$spooldir/$virtusertable_machine";
-mkdir $virtusertable_prefix unless -d $virtusertable_prefix;
-mkdir "$virtusertable_prefix/virtusertable.import"
+mkdir($virtusertable_prefix, 0755) unless -d $virtusertable_prefix;
+mkdir("$virtusertable_prefix/virtusertable.import", 0755)
   unless -d "$virtusertable_prefix/virtusertable.import";
 
 #iscp("root\@$virtusertable/*","$aliases_prefix/virtusertable.import/");
-- 
cgit v1.2.1


From cd7e487f34c2de4768670aef01f096d8530fb057 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 May 2004 09:59:06 +0000
Subject: allow for multiple svc_acct svcparts

---
 bin/sendmail.import | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/sendmail.import b/bin/sendmail.import
index a55616dc3..b137433d9 100644
--- a/bin/sendmail.import
+++ b/bin/sendmail.import
@@ -20,11 +20,11 @@ adminsuidsetup $user;
 #$FS::domain_record::noserial_hack = 1;
 
 use vars qw($defaultdomain);
-$defaultdomain = 'surferz.net';
+$defaultdomain = '295.ca';
 
-use vars qw($svcpart $forward_svcpart);
-$svcpart = 2;
-$forward_svcpart = 4;
+use vars qw(@svcpart $forward_svcpart);
+@svcpart = qw( 2 4 );
+$forward_svcpart = 7;
 
 use vars qw($spooldir);
 $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/sendmail";
@@ -144,7 +144,7 @@ sub svcnum_or_literal {
   my $svc_domain = qsearchs('svc_domain', { 'domain' => $domain } );
   my $domsvc = $svc_domain ? $svc_domain->svcnum : '';
 
-  my @svc_acct = grep { $_->cust_svc->svcpart == $svcpart }
+  my @svc_acct = grep { grep { $_->cust_svc->svcpart == $_ } @svcpart }
                    qsearch('svc_acct', {
                      'username' => $username,
                      'domsvc'   => $domsvc,
-- 
cgit v1.2.1


From 38606efd583311cff2703090d7c9e3de550522b1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 May 2004 10:01:38 +0000
Subject: properly nested greps

---
 bin/sendmail.import | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/sendmail.import b/bin/sendmail.import
index b137433d9..ef745fc46 100644
--- a/bin/sendmail.import
+++ b/bin/sendmail.import
@@ -144,7 +144,9 @@ sub svcnum_or_literal {
   my $svc_domain = qsearchs('svc_domain', { 'domain' => $domain } );
   my $domsvc = $svc_domain ? $svc_domain->svcnum : '';
 
-  my @svc_acct = grep { grep { $_->cust_svc->svcpart == $_ } @svcpart }
+  my @svc_acct = grep { my $svc_acct = $_;
+                        grep { $svc_acct->cust_svc->svcpart == $_ } @svcpart
+                      }
                    qsearch('svc_acct', {
                      'username' => $username,
                      'domsvc'   => $domsvc,
-- 
cgit v1.2.1


From 4121477dde8c9400bf81023bea3e0d980b34bf91 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 May 2004 11:10:58 +0000
Subject: make postfix export commands configrable

---
 FS/FS/part_export/postfix.pm | 5 +++++
 bin/postfix.export           | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/FS/FS/part_export/postfix.pm b/FS/FS/part_export/postfix.pm
index c24cf19a3..4fd19ee61 100644
--- a/FS/FS/part_export/postfix.pm
+++ b/FS/FS/part_export/postfix.pm
@@ -11,6 +11,11 @@ tie my %options, 'Tie::IxHash',
   'aliases' => { label=>'aliases file location', default=>'/etc/aliases' },
   'virtual' => { label=>'virtual file location', default=>'/etc/postfix/virtual' },
   'mydomain' => { label=>'local domain', default=>'' },
+  'newaliases' => { label=>'newaliases command', default=>'newaliases' },
+  'postmap'    => { label=>'postmap command',
+                    default=>'postmap hash:/etc/postfix/virtual', },
+  'reload'     => { label=>'reload command',
+                    default=>'postfix reload' },
 ;
 
 %info = (
diff --git a/bin/postfix.export b/bin/postfix.export
index 64d973837..dbb08ceb9 100755
--- a/bin/postfix.export
+++ b/bin/postfix.export
@@ -99,7 +99,7 @@ foreach my $export ( @exports ) {
   } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
 #  warn $rsync->out;
 
-  ssh("$user\@$machine", "newaliases");
+  ssh("$user\@$machine", $export->option('newaliases') || 'newaliases');
 #  ssh("$user\@$machine", "postfix reload");
 
   $rsync->exec( {
@@ -107,8 +107,9 @@ foreach my $export ( @exports ) {
     dest    => "$user\@$machine:". $export->option('virtual'),
   } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
 #  warn $rsync->out;
-  ssh("$user\@$machine", "postmap hash:/etc/postfix/virtual");
-  ssh("$user\@$machine", "postfix reload");
+  ssh("$user\@$machine", $export->option('postmap')
+                         || 'postmap hash:/etc/postfix/virtual');
+  ssh("$user\@$machine", $export->option('reload') || 'postfix reload');
 
 }
 
-- 
cgit v1.2.1


From 07242e191cb2ad247fed8dacd392ef8bf47b5392 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 May 2004 13:17:23 +0000
Subject: fall back to password changing in the case of blank
 suspension/unsuspension commands, like some exports

---
 FS/FS/part_export/shellcommands.pm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 4431cc0c4..4f201cf9c 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -176,14 +176,25 @@ sub _export_delete {
 
 sub _export_suspend {
   my($self) = shift;
-  $self->_export_command('suspend', @_);
+  $self->_export_command_or_super('suspend', @_);
 }
 
 sub _export_unsuspend {
   my($self) = shift;
-  $self->_export_command('unsuspend', @_);
+  $self->_export_command_or_super('unsuspend', @_);
 }
 
+sub _export_command_or_super {
+  my($self, $action) = (shift, shift);
+  if ( $self->option($action) =~ /^\s*$/ ) {
+    my $method = "SUPER::_export_$action";
+    $self->$method(@_);
+  } else {
+    $self->_export_command($action, @_);
+  }
+};
+
+
 sub _export_command {
   my ( $self, $action, $svc_acct) = (shift, shift, shift);
   my $command = $self->option($action);
-- 
cgit v1.2.1


From 86b42d7779820cd90ab132329b98d9710add733d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 May 2004 13:46:52 +0000
Subject: fix ISPMan password changing command

---
 FS/FS/part_export/shellcommands_withdomain.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export/shellcommands_withdomain.pm b/FS/FS/part_export/shellcommands_withdomain.pm
index 4f1b25bc4..89ee95fa3 100644
--- a/FS/FS/part_export/shellcommands_withdomain.pm
+++ b/FS/FS/part_export/shellcommands_withdomain.pm
@@ -73,7 +73,7 @@ the same username with different domains.  You will need to
     this.form.useradd_stdin.value = "";
     this.form.userdel.value = "/usr/local/ispman/bin/ispman.delUser -d $domain $username";
     this.form.userdel_stdin.value="";
-    this.form.usermod.value = "/usr/local/ispman/bin/ispman.passwd.user $username\\\@$domain $new_quoted_password";
+    this.form.usermod.value = "/usr/local/ispman/bin/ispman.passwd.user $new_username\\\@$new_domain $new_quoted_password";
     this.form.usermod_stdin.value = "";
     this.form.usermod_pwonly.checked = true;
   '>
-- 
cgit v1.2.1


From 2c68c62e2f9187c534e2f2291f83b789ba9075fb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 May 2004 23:16:00 +0000
Subject: fix sequences in upgrade docs?

---
 httemplate/docs/upgrade10.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 788eb0a97..08fc28ea5 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -110,10 +110,11 @@ ALTER TABLE part_pkg DROP CONSTRAINT part_pkg_temp_pkey;
 ALTER TABLE part_pkg ADD PRIMARY KEY (pkgpart);
 select setval('public.part_pkg_temp_pkgpart_seq', ( select max(pkgpart) from part_pkg) );
 
-Or on Pg versions that don't support DROP CONSTRAINT and ADD PRIMARY KEY (tested on 7.1 so far):
+Or on Pg versions that don't support DROP CONSTRAINT and ADD PRIMARY KEY (tested on 7.1 and 7.2 so far):
 DROP INDEX part_pkg_temp_pkey;
 CREATE UNIQUE INDEX part_pkg_pkey ON part_pkg (pkgpart);
-select setval('part_pkg_temp_pkgpart_seq', ( select max(pkgpart) from part_pkg) );
+7.1?: select setval('part_pkg_temp_pkgpart_seq', ( select max(pkgpart) from part_pkg) );
+7.2: select setval('part_pkg_pkgpart_seq', ( select max(pkgpart) from part_pkg) );
 
 CREATE TABLE h_part_pkg_temp (
     historynum serial NOT NULL,
@@ -144,10 +145,11 @@ ALTER TABLE h_part_pkg DROP CONSTRAINT h_part_pkg_temp_pkey;
 ALTER TABLE h_part_pkg ADD PRIMARY KEY (historynum);
 select setval('public.h_part_pkg_temp_historynum_seq', ( select max(historynum) from h_part_pkg) );
 
-Or on Pg versions that don't support DROP CONSTRAINT and ADD PRIMARY KEY (tested on 7.1 so far):
+Or on Pg versions that don't support DROP CONSTRAINT and ADD PRIMARY KEY (tested on 7.1 and 7.2 so far):
 DROP INDEX h_part_pkg_temp_pkey;
 CREATE UNIQUE INDEX h_part_pkg_pkey ON h_part_pkg (historynum);
-select setval('h_part_pkg_temp_historynum_seq', ( select max(historynum) from h_part_pkg) );
+7.1?: select setval('h_part_pkg_temp_historynum_seq', ( select max(historynum) from h_part_pkg) );
+7.2: select setval('h_part_pkg_historynum_seq', ( select max(historynum) from h_part_pkg) );
 
 
 DROP INDEX cust_bill_pkg1;
-- 
cgit v1.2.1


From 699ce04c670c2da6b1b3821c960467b1c427d249 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 May 2004 00:46:59 +0000
Subject: vary basic virtual host browse

---
 httemplate/index.html         |  2 +-
 httemplate/search/svc_www.cgi | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100755 httemplate/search/svc_www.cgi

diff --git a/httemplate/index.html b/httemplate/index.html
index 2e7fc1c84..b43399db1 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -35,7 +35,7 @@
         <BR><FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><SELECT NAME="username_type"><OPTION VALUE="All">(all)</OPTION><OPTION>Fuzzy</OPTION><OPTION>Substring</OPTION><OPTION SELECTED>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A> or <A HREF="search/svc_acct.cgi?uid">uid</A></FORM>
         <BR><FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
         <BR><A HREF="search/svc_forward.cgi?svcnum">all mail forwards by svcnum</A><BR>
-
+        <BR><A HREF="search/svc_www?svcnum">all virtual hosts by svcnum</A><BR>
       <BR>
     </TD></TR>
     </TABLE>
diff --git a/httemplate/search/svc_www.cgi b/httemplate/search/svc_www.cgi
new file mode 100755
index 000000000..1f05c2377
--- /dev/null
+++ b/httemplate/search/svc_www.cgi
@@ -0,0 +1,42 @@
+<%
+
+#my $conf = new FS::Conf;
+
+my($query)=$cgi->keywords;
+$query ||= ''; #to avoid use of unitialized value errors
+my(@svc_www, $orderby);
+if ( $query eq 'svcnum' ) {
+  $orderby = 'ORDER BY svcnum';
+} else {
+  eidiot('unimplemented');
+}
+
+my $count_query = 'SELECT COUNT(*) FROM svc_www';
+my $sql_query = {
+  'table'     => 'svc_www',
+  'hashref'   => {},
+  'extra_sql' => $orderby,
+};
+
+my $link  = [ "${p}view/svc_www.cgi?", 'svcnum', ];
+#my $dlink = [ "${p}view/svc_www.cgi?", 'svcnum', ];
+my $ulink = [ "${p}view/svc_acct.cgi?", 'usersvc', ];
+
+
+%>
+<%= include( 'elements/search.html',
+               'title'       => 'Virtual Host Search Results',
+               'name'        => 'virtual hosts',
+               'query'       => $sql_query,
+               'count_query' => $count_query,
+               'header'      => [ '#', 'Zone', 'User', ],
+               'fields'      => [ 'svcnum',
+                                  sub { $_[0]->domain_record->zone },
+                                  sub { $_[0]->svc_acct->email },
+                                ],
+               'links'       => [ $link,
+                                  '',
+                                  $ulink,
+                                ],
+           )
+%>
-- 
cgit v1.2.1


From 0d78ea5d2d300b4aea2a6b00af752cb45321b073 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 May 2004 09:50:50 +0000
Subject: fix commands

---
 FS/FS/part_export/www_shellcommands.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index 6847f6470..9f14707b0 100644
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -13,10 +13,10 @@ tie my %options, 'Tie::IxHash',
                  default=>'mkdir /var/www/$zone; chown $username /var/www/$zone; ln -s /var/www/$zone $homedir/$zone',
                },
   'userdel'  => { label=>'Delete command',
-                  default=>'[ -n &quot;$zone&quot; ] && rm -rf /var/www/$zone; rm $homedir/$zone',
+                  default=>'[ -n "$zone" ] && rm -rf /var/www/$zone; rm $homedir/$zone',
                 },
   'usermod'  => { label=>'Modify command',
-                  default=>'[ -n &quot;$old_zone&quot; ] && rm $old_homedir/$old_zone; [ &quot;$old_zone&quot; != &quot;$new_zone&quot; -a -n &quot;$new_zone&quot; ] && mv /var/www/$old_zone /var/www/$new_zone; [ &quot;$old_username&quot; != &quot;$new_username&quot; ] && chown -R $new_username /var/www/$new_zone; ln -s /var/www/$new_zone $new_homedir/$new_zone',
+                  default=>'[ -n "$old_zone" ] && rm $old_homedir/$old_zone; [ "$old_zone" != "$new_zone" -a -n "$new_zone" ] && mv /var/www/$old_zone /var/www/$new_zone; [ "$old_username" != "$new_username" ] && chown -R $new_username /var/www/$new_zone; ln -s /var/www/$new_zone $new_homedir/$new_zone',
                 },
 ;
 
@@ -33,8 +33,8 @@ Run remote commands via SSH, for virtual web sites.  You will need to
     <INPUT TYPE="button" VALUE="Maintain directories" onClick='
       this.form.user.value = "root";
       this.form.useradd.value = "mkdir /var/www/$zone; chown $username /var/www/$zone; ln -s /var/www/$zone $homedir/$zone";
-      this.form.userdel.value = "[ -n &quot;$zone&quot; ] && rm -rf /var/www/$zone; rm $homedir/$zone";
-      this.form.usermod.value = "[ -n &quot;$old_zone&quot; ] && rm $old_homedir/$old_zone; [ &quot;$old_zone&quot; != &quot;$new_zone&quot; -a -n &quot;$new_zone&quot; ] && mv /var/www/$old_zone /var/www/$new_zone; [ &quot;$old_username&quot; != &quot;$new_username&quot; ] && chown -R $new_username /var/www/$new_zone; ln -s /var/www/$new_zone $new_homedir/$new_zone";
+      this.form.userdel.value = "[ -n "$zone" ] && rm -rf /var/www/$zone; rm $homedir/$zone";
+      this.form.usermod.value = "[ -n "$old_zone" ] && rm $old_homedir/$old_zone; [ "$old_zone" != "$new_zone" -a -n "$new_zone" ] && mv /var/www/$old_zone /var/www/$new_zone; [ "$old_username" != "$new_username" ] && chown -R $new_username /var/www/$new_zone; ln -s /var/www/$new_zone $new_homedir/$new_zone";
     '>
   <LI>
     <INPUT TYPE="button" VALUE="ISPMan CLI" onClick='
-- 
cgit v1.2.1


From a5be013b9a08af7adc28b56b45c04bb5c7592343 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 May 2004 11:19:11 +0000
Subject: one reasonable default and one kludge, to improve webhosting UI

---
 FS/FS/Conf.pm               | 14 ++++++++++++++
 httemplate/edit/svc_www.cgi | 38 ++++++++++++++++++++------------------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 905c60d2b..3cddc20fe 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1206,6 +1206,20 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'svc_www-enable_subdomains',
+    'section'     => '',
+    'description' => 'Enable selection of specific subdomains for virtual host creation.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'svc_www-usersvc_svcpart',
+    'section'     => '',
+    'description' => 'Allowable service definition svcparts for virtual hosts, one per line.',
+    'type'        => 'textarea',
+  },
+
 );
 
 1;
diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index ebc4b1148..fe7052292 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -56,9 +56,13 @@ my $action = $svc_www->svcnum ? 'Edit' : 'Add';
 my( %svc_acct, %arec );
 if ($pkgnum) {
 
-  my($u_part_svc,@u_acct_svcparts);
-  foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
-    push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
+  my @u_acct_svcparts;
+  foreach my $svcpart (
+    map { $_->svcpart } qsearch( 'part_svc', { 'svcdb' => 'svc_acct' } )
+  ) {
+    next if $conf->exists('svc_www-usersvc_svcpart')
+            && grep { $svcpart == $_ } $conf->config('svc_www-usersvc_svcpart');
+    push @u_acct_svcparts, $svcpart;
   }
 
   my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
@@ -92,25 +96,23 @@ if ($pkgnum) {
       my($i_cust_svc);
       foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
         my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
-        my $domain_rec;
-        foreach $domain_rec ( qsearch('domain_record',{
-            'svcnum'  => $svc_domain->svcnum,
-            'rectype' => 'A' } ),
-        qsearch('domain_record',{
-            'svcnum'  => $svc_domain->svcnum,
-            'rectype' => 'CNAME'
-            } ) ) {
-          $arec{$domain_rec->recnum} =
-            $domain_rec->reczone eq '@'
-              ? $svc_domain->domain
-              : $domain_rec->reczone. '.'. $svc_domain->domain;
+        if ( $conf->exists('svc_www-enable_subdomains') ) {
+          foreach my $domain_rec ( qsearch('domain_record',{
+              'svcnum'  => $svc_domain->svcnum,
+              'rectype' => 'A' } ),
+          qsearch('domain_record',{
+              'svcnum'  => $svc_domain->svcnum,
+              'rectype' => 'CNAME'
+              } ) ) {
+            $arec{$domain_rec->recnum} = $domain_rec->zone;
+          }
+          $arec{'www.'. $svc_domain->domain} = 'www.'. $svc_domain->domain
+            unless qsearchs('domain_record', { svcnum  => $svc_domain->svcnum,
+                                               reczone => 'www',            } );
         }
         $arec{'@.'. $svc_domain->domain} = $svc_domain->domain
           unless qsearchs('domain_record', { svcnum  => $svc_domain->svcnum,
                                              reczone => '@',                } );
-        $arec{'www.'. $svc_domain->domain} = 'www.'. $svc_domain->domain
-          unless qsearchs('domain_record', { svcnum  => $svc_domain->svcnum,
-                                             reczone => 'www',              } );
       }
     }
   }
-- 
cgit v1.2.1


From a5c64e8089d4e6c76ee070102e3a67baf1485181 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 May 2004 11:22:09 +0000
Subject: need to pull in $conf

---
 httemplate/edit/svc_www.cgi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index fe7052292..b89672a52 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -1,6 +1,8 @@
 <!-- mason kludge -->
 <%
 
+my $conf = new FS::Conf;
+
 my( $svcnum,  $pkgnum, $svcpart, $part_svc, $svc_www );
 if ( $cgi->param('error') ) {
   $svc_www = new FS::svc_www ( {
-- 
cgit v1.2.1


From af37880d5ac36f2b141b2eeeb1c7aa49a50d0c5b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 May 2004 11:52:02 +0000
Subject: clean this up a bit, fix svc_www-usersvc_svcpart and hopefully
 simplified zone select too

---
 httemplate/edit/svc_www.cgi | 73 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 52 insertions(+), 21 deletions(-)

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index b89672a52..ed8d42501 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -63,7 +63,8 @@ if ($pkgnum) {
     map { $_->svcpart } qsearch( 'part_svc', { 'svcdb' => 'svc_acct' } )
   ) {
     next if $conf->exists('svc_www-usersvc_svcpart')
-            && grep { $svcpart == $_ } $conf->config('svc_www-usersvc_svcpart');
+            && ! grep { $svcpart == $_ }
+                      $conf->config('svc_www-usersvc_svcpart');
     push @u_acct_svcparts, $svcpart;
   }
 
@@ -91,31 +92,61 @@ if ($pkgnum) {
     push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
   }
 
-  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
-    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
-    my($acct_svcpart);
-    foreach $acct_svcpart (@d_acct_svcparts) {
-      my($i_cust_svc);
-      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
-        my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
+  foreach $i_cust_pkg ( qsearch( 'cust_pkg', { 'custnum' => $custnum } ) ) {
+    my $cust_pkgnum = $i_cust_pkg->pkgnum;
+
+    foreach my $acct_svcpart (@d_acct_svcparts) {
+
+      foreach my $i_cust_svc (
+        qsearch( 'cust_svc', { 'pkgnum'  => $cust_pkgnum,
+                               'svcpart' => $acct_svcpart } )
+      ) {
+        my $svc_domain =
+          qsearchs( 'svc_domain', { 'svcnum' => $i_cust_svc->svcnum } );
+
+        my $extra_sql = "AND ( rectype = 'A' OR rectype = 'CNAME' )";
+        if ( $conf->exists('svc_www-enable_subdomains') ) {
+          my $domain = $
+          $extra_sql .= " AND ( reczone = '@' OR reczone = '".
+                        $svc_domain->domain. ".' )";
+        }
+
+        foreach my $domain_rec (
+          qsearch( 'domain_record',
+                   {
+                     'svcnum' => $svc_domain->svcnum,
+                   },
+                   '',
+                   $extra_sql,
+          )
+        ) {
+          $arec{$domain_rec->recnum} = $domain_rec->zone;
+        }
+
         if ( $conf->exists('svc_www-enable_subdomains') ) {
-          foreach my $domain_rec ( qsearch('domain_record',{
-              'svcnum'  => $svc_domain->svcnum,
-              'rectype' => 'A' } ),
-          qsearch('domain_record',{
-              'svcnum'  => $svc_domain->svcnum,
-              'rectype' => 'CNAME'
-              } ) ) {
-            $arec{$domain_rec->recnum} = $domain_rec->zone;
-          }
           $arec{'www.'. $svc_domain->domain} = 'www.'. $svc_domain->domain
-            unless qsearchs('domain_record', { svcnum  => $svc_domain->svcnum,
-                                               reczone => 'www',            } );
+            unless    qsearchs( 'domain_record', {
+                                  svcnum  => $svc_domain->svcnum,
+                                  reczone => 'www',
+                      } )
+                   || qsearchs( 'domain_record', {
+                                  svcnum  => $svc_domain->svcnum,
+                                  reczone => 'www.'.$svc-domain->domain.'.',
+                    } );
         }
+
         $arec{'@.'. $svc_domain->domain} = $svc_domain->domain
-          unless qsearchs('domain_record', { svcnum  => $svc_domain->svcnum,
-                                             reczone => '@',                } );
+          unless   qsearchs('domain_record', {
+                              svcnum  => $svc_domain->svcnum,
+                              reczone => '@',
+                   } )
+                || qsearchs('domain_record', {
+                              svcnum  => $svc_domain->svcnum,
+                              reczone => $svc_domain->domain.'.',
+                   } );
+
       }
+
     }
   }
 
-- 
cgit v1.2.1


From 20431ca2cc197c3d3a109d43318a0f96ea7e24d1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 May 2004 11:54:02 +0000
Subject: so close

---
 httemplate/edit/svc_www.cgi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index ed8d42501..cb58ce979 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -106,7 +106,6 @@ if ($pkgnum) {
 
         my $extra_sql = "AND ( rectype = 'A' OR rectype = 'CNAME' )";
         if ( $conf->exists('svc_www-enable_subdomains') ) {
-          my $domain = $
           $extra_sql .= " AND ( reczone = '@' OR reczone = '".
                         $svc_domain->domain. ".' )";
         }
-- 
cgit v1.2.1


From 29da3c125643b73cb6f6219b99eadb67673e4d6d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 May 2004 11:58:42 +0000
Subject: this has been an evening of logical negation

---
 httemplate/edit/svc_www.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index cb58ce979..a9b1ed348 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -105,7 +105,7 @@ if ($pkgnum) {
           qsearchs( 'svc_domain', { 'svcnum' => $i_cust_svc->svcnum } );
 
         my $extra_sql = "AND ( rectype = 'A' OR rectype = 'CNAME' )";
-        if ( $conf->exists('svc_www-enable_subdomains') ) {
+        unless ( $conf->exists('svc_www-enable_subdomains') ) {
           $extra_sql .= " AND ( reczone = '@' OR reczone = '".
                         $svc_domain->domain. ".' )";
         }
-- 
cgit v1.2.1


From a800fde5d31fb9b9cfe46b1ce2f68ea8e56bff53 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 May 2004 12:01:29 +0000
Subject: i'm not usually like this.

---
 httemplate/edit/svc_www.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index a9b1ed348..4989bb610 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -106,7 +106,7 @@ if ($pkgnum) {
 
         my $extra_sql = "AND ( rectype = 'A' OR rectype = 'CNAME' )";
         unless ( $conf->exists('svc_www-enable_subdomains') ) {
-          $extra_sql .= " AND ( reczone = '@' OR reczone = '".
+          $extra_sql .= " AND ( reczone = '\@' OR reczone = '".
                         $svc_domain->domain. ".' )";
         }
 
-- 
cgit v1.2.1


From 609da4bf03be911bc3ade700f40c243710f3002b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 May 2004 10:03:47 +0000
Subject: for native apache installs

---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index 6d3d80397..ffbd67afc 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,8 @@ FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 #FREESIDE_DOCUMENT_ROOT = /var/www/htdocs/freeside
 #suse
 #FREESIDE_DOCUMENT_ROOT = /srv/www/htdocs/freeside
+#apache
+#FREESIDE_DOCUMENT_ROOT = /usr/local/apache/htdocs/freeside
 
 #deb, redhat, fedora, mandrake, suse, others?
 INIT_FILE = /etc/init.d/freeside
@@ -37,6 +39,8 @@ HTTPD_RESTART = /etc/init.d/apache restart
 #HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
 #openbsd
 #HTTPD_RESTART = kill -TERM `cat /var/www/logs/httpd.pid`; sleep 1; /usr/sbin/httpd -u -DSSL
+#apache
+#HTTPD_RESTART = /usr/local/apache/bin/apachectl restart
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
-- 
cgit v1.2.1


From b53f5fb951a5fdf89ba3fb597c18682e699b95e7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 May 2004 12:38:49 +0000
Subject: that wasn't pleasant

---
 install/redhat/9/INSTALL      | 39 ++++++++++-----------------------------
 install/redhat/9/sources.list |  4 ++--
 2 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/install/redhat/9/INSTALL b/install/redhat/9/INSTALL
index ce6ca5962..c32a2357b 100644
--- a/install/redhat/9/INSTALL
+++ b/install/redhat/9/INSTALL
@@ -1,36 +1,17 @@
 #!/bin/sh
 
-
-wget --passive-ftp --continue ftp://apt-rpm.tuxfamily.org/apt/redhat/9/en/i386/RPMS.extra/apt-*i386.rpm
+wget --passive-ftp --continue http://redhat.usu.edu/mirrors/apt4rpm/apt-0.5.5cnc4.1-fr1.20030325a.2.i386.rpm
 rpm -i apt*i386.rpm
 cp sources.list /etc/apt/
-apt-get update; apt-get update
-#apt-get install apache mod_ssl mod_perl perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-Digest-MD5 perl-HTML-Parser perl-HTML-Tagset perl-MIME-Base64 perl-Storable perl-TimeDate perl-URI perl-libnet perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs #openssh
-
-apt-get install perl-Devel-Symdump perl-BSD-Resource rpm-build gdbm-devel expat-devel openssl-devel krb5-devel db4-devel
-
-wget --passive-ftp --continue http://reb00t.com/linux/RPMS/redhat-9/apache/apache-1.3.28-0.n0i.src.rpm http://reb00t.com/linux/RPMS/redhat-9/mm/mm-1.2.1-0.n0i.i686.rpm http://reb00t.com/linux/RPMS/redhat-9/mm/mm-devel-1.2.1-0.n0i.i686.rpm
-rpm -i mm-1.2.1-0.n0i.i686.rpm mm-devel-1.2.1-0.n0i.i686.rpm apache-1.3.28-0.n0i.src.rpm
-
-install -d /usr/src/redhat
-for a in BUILD RPMS SOURCES SPECS SRPMS; do install -d /usr/src/redhat/$a; done
-for a in athlon i386 i486 i586 i686 noarch; do install -d /usr/src/redhat/RPMS/$a; done
-
-cd /usr/src/redhat/SPECS  
-rpmbuild -ba apache.spec
-
-cd /usr/src/redhat/RPMS/i386
-rpm -i apache-1.3.28-0.n0i.i386.rpm
+apt-get update
 
-apt-get install perl-CGI perl-CPAN perl-DBD-MySQL perl-DBD-Pg perl-DBI perl-DateManip perl-HTML-Parser perl-HTML-Tagset perl-TimeDate perl-URI perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs gcc gd #openssh
+apt-get install httpd mod_perl mod_ssl perl-CGI perl-CPAN perl-DBD-MySQL perl-DateManip perl-HTML-Parser perl-HTML-Tagset perl-TimeDate perl-URI perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs gcc # gd openssh
 
-#wget --passive-ftp --continue http://atrpms.physik.fu-berlin.de/dist/rh9/perl-GD/perl-GD-2.11-7.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-45-1.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/yum/yum-2.0.4-28.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/gd/gd-2.0.15-1_6.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-package-config-45-1.rh9.at.noarch.rpm
-wget --passive-ftp --continue http://atrpms.physik.fu-berlin.de/dist/rh9/perl-GD/perl-GD-2.11-7.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-54-1.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/yum/yum-2.0.6-0_31.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/gd/gd-2.0.15-1_6.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-package-config-57-1.rh9.at.noarch.rpm
+wget --passive-ftp --continue http://atrpms.physik.fu-berlin.de/dist/rh9/perl-GD/perl-GD-2.11-7.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-54-1.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/gd/gd-2.0.15-1_6.rh9.at.i386.rpm
 
 cp /etc/apt/apt.conf /etc/apt/apt.conf.real
 
-#rpm -i --replacefiles atrpms-package-config-45-1.rh9.at.noarch.rpm yum-2.0.4-28.rh9.at.noarch.rpm atrpms-45-1.rh9.at.noarch.rpm gd-2.0.15-1_6.rh9.at.i386.rpm perl-GD-2.11-7.rh9.at.i386.rpm
-rpm -i --replacefiles atrpms-package-config-57-1.rh9.at.noarch.rpm yum-2.0.6-0_31.rh9.at.noarch.rpm atrpms-54-1.rh9.at.noarch.rpm gd-2.0.15-1_6.rh9.at.i386.rpm perl-GD-2.11-7.rh9.at.i386.rpm
+rpm -i gd-2.0.15-1_6.rh9.at.i386.rpm atrpms-54-1.rh9.at.noarch.rpm perl-GD-2.11-7.rh9.at.i386.rpm 
 
 mv /etc/apt/apt.conf.real /etc/apt/apt.conf
 
@@ -39,13 +20,13 @@ perl -MCPAN -e"install Locale::Country, Net::Whois, Business::CreditCard, \
                        String::Approx, Text::Template, DBIx::DataSource, \
                        DBIx::DBSchema, Net::SSH, String::ShellQuote, \
                        Net::SCP, Apache::ASP, Tie::IxHash, Time::Duration, \
-                       HTML::Widgets::SelectLayers, Apache::DBI, Cache::Cache \
-                       Test::Pod NetAddr::IP IPC::ShareLite Chart::LinesPoints"
+                       HTML::Widgets::SelectLayers, Apache::DBI, \
+                       Cache::Cache, Test::Pod, NetAddr::IP, IPC::ShareLite, \
+                       Chart::LinesPoints, Net::Whois::Raw, \
+                       Locale::SubCountry, Crypt::PasswdMD5, DBI, DBD::Pg"
 
-echo 'OPTIONS="-DHAVE_PERL -DHAVE_SSL"' >>/etc/sysconfig/apache
 
-#remove perl & ssl LoadModule lines from /etc/httpd/conf/httpd.conf
-#as they're statically linked
+#apachetoolbox i guess
 
 /usr/sbin/useradd freeside
 
diff --git a/install/redhat/9/sources.list b/install/redhat/9/sources.list
index f6f21f4c9..6dcb3b436 100644
--- a/install/redhat/9/sources.list
+++ b/install/redhat/9/sources.list
@@ -1,2 +1,2 @@
-rpm ftp://apt-rpm.tuxfamily.org/apt redhat/9/en/i386 os updates extra
-rpm-src ftp://apt-rpm.tuxfamily.org/apt redhat/9/en/i386 os updates extra
+#rpm http://download.fedoralegacy.org/apt redhat/9/i386 os updates legacy-util
+rpm http://download.fedoralegacy.org/apt redhat/9/i386 os updates
-- 
cgit v1.2.1


From e43ee0863e66d8d3e3a4453690561638ed4a92dd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 May 2004 18:03:47 +0000
Subject: adding

---
 bin/freeside.import | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 bin/sequences.reset |  28 ++++++++++
 2 files changed, 174 insertions(+)
 create mode 100644 bin/freeside.import
 create mode 100644 bin/sequences.reset

diff --git a/bin/freeside.import b/bin/freeside.import
new file mode 100644
index 000000000..fdfcc083e
--- /dev/null
+++ b/bin/freeside.import
@@ -0,0 +1,146 @@
+#!/usr/bin/perl -w
+
+use strict;
+use DBI;
+
+my $s_datasrc = 'DBI:mysql:host=ns1.enetonline.net;port=3307;user=ivan;dbname=freeside';
+my $s_dbuser = 'ivan';
+my $s_dbpass = '';
+
+my $d_datasrc = 'DBI:Pg:dbname=freeside';
+my $d_dbuser = 'freeside';
+my $d_dbpass = '';
+
+#my @tables = qw(
+#addr_block
+#agent
+#agent_type
+#cust_bill
+#cust_bill_event
+#cust_bill_pay
+#cust_bill_pkg
+#cust_bill_pkg_detail
+#cust_credit
+#cust_credit_bill
+#cust_credit_refund
+#cust_main
+#cust_main_county
+#cust_main_invoice
+#cust_pay
+#cust_pay_batch
+#cust_pkg
+#cust_refund
+#cust_svc
+#cust_tax_exempt
+#domain_record
+#export_svc
+#h_addr_block
+#h_agent
+#h_agent_type
+#h_cust_bill
+#h_cust_bill_event
+#h_cust_bill_pay
+#h_cust_bill_pkg
+#h_cust_bill_pkg_detail
+#h_cust_credit
+#h_cust_credit_bill
+#h_cust_credit_refund
+#h_cust_main
+#h_cust_main_county
+#h_cust_main_invoice
+#h_cust_pay
+#h_cust_pay_batch
+#h_cust_pkg
+#h_cust_refund
+#h_cust_svc
+#h_cust_tax_exempt
+#h_domain_record
+#h_export_svc
+#h_msgcat
+#h_nas
+#h_part_bill_event
+#h_part_export
+#h_part_export_option
+#h_part_pkg
+#h_part_pop_local
+#h_part_referral
+#h_part_svc
+#h_part_svc_column
+#h_part_svc_router
+#h_pkg_svc
+#h_port
+#h_prepay_credit
+#h_queue
+#h_queue_arg
+#h_queue_depend
+#h_radius_usergroup
+#h_router
+#h_router_field
+#h_sb_field
+#h_session
+#h_svc_acct
+#h_svc_acct_pop
+#h_svc_broadband
+#h_svc_domain
+#h_svc_forward
+#h_svc_www
+#h_type_pkgs
+#msgcat
+#nas
+#part_bill_event
+#part_export
+#part_export_option
+#part_pkg
+
+my @tables = qw(
+part_pop_local
+part_referral
+part_router_field
+part_sb_field
+part_svc
+part_svc_column
+part_svc_router
+pkg_svc
+port
+prepay_credit
+queue
+queue_arg
+queue_depend
+radius_usergroup
+router
+router_field
+sb_field
+session
+svc_acct
+svc_acct_pop
+svc_broadband
+svc_domain
+svc_forward
+svc_www
+type_pkgs
+);
+
+my $s_dbh = DBI->connect($s_datasrc, $s_dbuser, $s_dbpass) or die $DBI::errstr;
+my $d_dbh = DBI->connect($d_datasrc, $d_dbuser, $d_dbpass) or die $DBI::errstr;
+
+foreach my $table ( @tables ) {
+  $d_dbh->do("delete from $table");
+
+  my $s_sth = $s_dbh->prepare("select * from $table");
+  $s_sth->execute or die $s_sth->errstr;
+
+  my $row;
+  while ( $row = $s_sth->fetchrow_arrayref ) {
+    my $d_sth = $d_dbh->prepare(
+      "insert into $table ( ".
+        join(', ', @{$s_sth->{NAME}} ).
+        ' ) VALUES ( '.
+        join(', ', map { '?' } @{$s_sth->{NAME}} ). 
+        ' )'
+    ) or die $d_dbh->errstr;
+
+    $d_sth->execute(@$row) or die $d_sth->errstr;
+
+  }
+}
+
diff --git a/bin/sequences.reset b/bin/sequences.reset
new file mode 100644
index 000000000..f0fc4b7f2
--- /dev/null
+++ b/bin/sequences.reset
@@ -0,0 +1,28 @@
+#!/usr/bin/perl
+
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(dbdef dbh);
+
+my $user = shift;
+adminsuidsetup $user or die;
+
+foreach my $table ( dbdef->tables ) {
+  my $primary_key = dbdef->table($table)->primary_key;
+  next unless $primary_key;
+  #my $local = dbdef->table($table)->column($primary_key)->local;
+  ##next unless $default =~ /nextval/;
+  #print "$local\n";
+
+  my $statement = "select setval('${table}_${primary_key}_seq', ( select max($primary_key) from $table ) )\n";
+  my $sth = dbh->prepare($statement) or do {
+    warn dbh->errstr. " preparing $statement\n";
+    next;
+  };
+  $sth->execute or do {
+    warn dbh->errstr. " executing $statement\n";
+    dbh->commit;
+    next;
+  }
+
+}
+
-- 
cgit v1.2.1


From aa2daf29c5bb13a3728b434159afc4065367af91 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 May 2004 18:07:41 +0000
Subject: easier this way

---
 bin/sequences.reset | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/sequences.reset b/bin/sequences.reset
index f0fc4b7f2..2dc1d3bb2 100644
--- a/bin/sequences.reset
+++ b/bin/sequences.reset
@@ -13,7 +13,11 @@ foreach my $table ( dbdef->tables ) {
   ##next unless $default =~ /nextval/;
   #print "$local\n";
 
-  my $statement = "select setval('${table}_${primary_key}_seq', ( select max($primary_key) from $table ) )\n";
+  my $statement = "select setval('${table}_${primary_key}_seq', ( select max($primary_key) from $table ) )";
+
+  print "$statement;\n";
+  next;
+  
   my $sth = dbh->prepare($statement) or do {
     warn dbh->errstr. " preparing $statement\n";
     next;
-- 
cgit v1.2.1


From e975ed0585280f4cbb90b02f57114dedc43f58be Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 May 2004 12:25:45 +0000
Subject: add per-agent invoice templates, add per-package suspend invoice
 events, fix automatic creation of invoice_latex alternate templates

---
 FS/FS/Conf.pm                               | 28 ++++++++++++++
 FS/FS/cust_bill.pm                          | 51 +++++++++++++++++++-----
 FS/FS/cust_main.pm                          | 32 +++++++++++++++
 FS/FS/part_bill_event.pm                    | 24 ++++++------
 httemplate/edit/part_bill_event.cgi         | 60 +++++++++++++++++++++++++++++
 httemplate/edit/process/part_bill_event.cgi |  5 ++-
 6 files changed, 176 insertions(+), 24 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 3cddc20fe..e69a15622 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -108,6 +108,22 @@ sub exists {
   -e "$dir/$file";
 }
 
+=item config_orbase KEY SUFFIX
+
+Returns the configuration value or values (depending on context) for 
+KEY_SUFFIX, if it exists, otherwise for KEY
+
+=cut
+
+sub config_orbase {
+  my( $self, $file, $suffix ) = @_;
+  if ( $self->exists("${file}_$suffix") ) {
+    $self->config("${file}_$suffix");
+  } else {
+    $self->config($file);
+  }
+}
+
 =item touch KEY
 
 Creates the specified configuration key if it does not exist.
@@ -197,6 +213,18 @@ sub config_items {
                            'type'        => 'textarea',
                          }
       } glob($self->dir. '/invoice_latex_*')
+  ),
+  ( map { 
+        my $basename = basename($_);
+        $basename =~ /^(.*)$/;
+        $basename = $1;
+        new FS::ConfItem {
+                           'key'         => $basename,
+                           'section'     => 'billing',
+                           'description' => 'Alternate Notes section for LaTeX typeset PostScript invoices.  See the <a href="../docs/billing.html">billing documentation</a> for details.',
+                           'type'        => 'textarea',
+                         }
+      } glob($self->dir. '/invoice_latexnotes_*')
   );
 }
 
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 7e2c8fb55..367e1bc5e 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -316,15 +316,23 @@ sub owed {
   $balance;
 }
 
-=item send
+=item send [ TEMPLATENAME [ , AGENTNUM ] ]
 
 Sends this invoice to the destinations configured for this customer: send
 emails or print.  See L<FS::cust_main_invoice>.
 
+TEMPLATENAME, if specified, is the name of a suffix for alternate invoices.
+
+AGENTNUM, if specified, means that this invoice will only be sent for customers
+of the specified agent.
+
 =cut
 
 sub send {
-  my($self,$template) = @_;
+  my $self = shift;
+  my $template = scalar(@_) ? shift : '';
+  return '' if scalar(@_) && $_[0] && $self->cust_main->agentnum ne shift;
+
   my @print_text = $self->print_text('', $template);
   my @invoicing_list = $self->cust_main->invoicing_list;
 
@@ -654,6 +662,31 @@ sub batch_card {
   '';
 }
 
+sub _agent_template {
+  my $self = shift;
+
+  my $cust_bill_event = qsearchs( 'part_bill_event',
+    {
+      'payby'     => $self->cust_main->payby,
+      'plan'      => 'send_agent',
+      'eventcode' => { 'op'    => 'LIKE',
+                       'value' => '_%, '. $self->cust_main->agentnum. ');' },
+    },
+    '',
+    'ORDER BY seconds LIMIT 1'
+  );
+
+  return '' unless $cust_bill_event;
+
+  if ( $cust_bill_event->eventcode =~ /\(\s*'(.*)'\s*,\s*(\d+)\s*\)\;$/ ) {
+    return $1;
+  } else {
+    warn "can't parse eventcode for agent-specific invoice template";
+    return '';
+  }
+
+}
+
 =item print_text [ TIME [ , TEMPLATE ] ]
 
 Returns an text invoice, as a list of lines.
@@ -798,10 +831,11 @@ sub print_text {
     sprintf("%10.2f", $balance_due ) ];
 
   #create the template
+  $template ||= $self->_agent_template;
   my $templatefile = 'invoice_template';
-  $templatefile .= "_$template" if $template;
+  $templatefile .= "_$template" if length($template);
   my @invoice_template = $conf->config($templatefile)
-  or die "cannot load config file $templatefile";
+    or die "cannot load config file $templatefile";
   $invoice_lines = 0;
   my $wasfunc = 0;
   foreach ( grep /invoice_lines\(\d*\)/, @invoice_template ) { #kludgy
@@ -923,8 +957,10 @@ sub print_latex {
   @buf = ();
 
   #create the template
+  $template ||= $self->_agent_template;
   my $templatefile = 'invoice_latex';
-  $templatefile .= "_$template" if $template;
+  my $suffix = length($template) ? "_$template" : '';
+  $templatefile .= $suffix;
   my @invoice_template = $conf->config($templatefile)
     or die "cannot load config file $templatefile";
 
@@ -954,7 +990,7 @@ sub print_latex {
   $invoice_data{'notes'} =
     join("\n",
       map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
-        $conf->config('invoice_latexnotes')
+        $conf->config_orbase('invoice_latexnotes', $suffix)
     );
 
   $invoice_data{'footer'} =~ s/\n+$//;
@@ -1396,9 +1432,6 @@ The delete method.
 print_text formatting (and some logic :/) is in source, but needs to be
 slurped in from a file.  Also number of lines ($=).
 
-missing print_ps for a nice postscript copy (maybe HylaFAX-cover-page-style
-or something similar so the look can be completely customized?)
-
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::cust_main>, L<FS::cust_bill_pay>, L<FS::cust_pay>,
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index f275d10fe..fbd461841 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1028,6 +1028,38 @@ sub suspend {
   grep { $_->suspend } $self->unsuspended_pkgs;
 }
 
+=item suspend_if_pkgpart PKGPART [ , PKGPART ... ]
+
+Suspends all unsuspended packages (see L<FS::cust_pkg>) matching the listed
+PKGPARTs (see L<FS::part_pkg>).  Always returns a list: an empty list on
+success or a list of errors.
+
+=cut
+
+sub suspend_if_pkgpart {
+  my $self = shift;
+  my @pkgparts = @_;
+  grep { $_->suspend }
+    grep { my $pkgpart = $_->pkgpart; grep { $pkgpart eq $_ } @pkgparts }
+      $self->unsuspended_pkgs;
+}
+
+=item suspend_unless_pkgpart PKGPART [ , PKGPART ... ]
+
+Suspends all unsuspended packages (see L<FS::cust_pkg>) unless they match the
+listed PKGPARTs (see L<FS::part_pkg>).  Always returns a list: an empty list
+on success or a list of errors.
+
+=cut
+
+sub suspend_unless_pkgpart {
+  my $self = shift;
+  my @pkgparts = @_;
+  grep { $_->suspend }
+    grep { my $pkgpart = $_->pkgpart; ! grep { $pkgpart eq $_ } @pkgparts }
+      $self->unsuspended_pkgs;
+}
+
 =item cancel [ OPTION => VALUE ... ]
 
 Cancels all uncancelled packages (see L<FS::cust_pkg>) for this customer.
diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
index 86f929424..4774b8df9 100644
--- a/FS/FS/part_bill_event.pm
+++ b/FS/FS/part_bill_event.pm
@@ -149,22 +149,20 @@ sub check {
     || $self->ut_textn('plan')
     || $self->ut_anything('plandata')
   ;
+    #|| $self->ut_snumber('seconds')
   return $error if $error;
 
   #quelle kludge
-  if ( $self->plandata =~ /^templatename\s+(.*)$/ ) {
-    my $name= $1;
-    unless ( $conf->exists("invoice_template_$name") ) {
-      $conf->set(
-        "invoice_template_$name" =>
-          join("\n", $conf->config('invoice_template') )
-      );
-    }
-    unless ( $conf->exists("invoice_latex_$name") ) {
-      $conf->set(
-        "invoice_latex_$name" =>
-          join("\n", $conf->config('invoice_latex') )
-      );
+  if ( $self->plandata =~ /^(agent_)?templatename\s+(.*)$/m ) {
+    my $name= $2;
+
+    foreach my $file (qw( template latex latexnotes )) {
+      unless ( $conf->exists("invoice_${file}_$name") ) {
+        $conf->set(
+          "invoice_${file}_$name" =>
+            join("\n", $conf->config("invoice_$file") )
+        );
+      }
     }
   }
 
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 48ed7916b..d0fa973bf 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -68,6 +68,31 @@ print '<TR><TD ALIGN="right">Action</TD><TD>';
 
 #print ntable();
 
+sub select_pkgpart {
+  my $label = shift;
+  my $plandata = shift;
+  my %selected = map { $_=>1 } split(/,\s*/, $plandata->{$label});
+  qq(<SELECT NAME="$label" MULTIPLE>).
+  join("\n", map {
+    '<OPTION VALUE="'. $_->pkgpart. '"'.
+    ( $selected{$_->pkgpart} ? ' SELECTED' : '' ).
+    '>'. $_->pkg. ' - '. $_->comment
+  } qsearch('part_pkg', { 'disabled' => '' } ) ).
+  '</SELECT>';
+}
+
+sub select_agentnum {
+  my $plandata = shift;
+  my $agentnum = $plandata->{'agentnum'};
+  '<SELECT NAME="agentnum">'.
+  join("\n", map {
+    '<OPTION VALUE="'. $_->agentnum. '"'.
+    ( $_->agentnum == $agentnum ? ' SELECTED' : '' ).
+    '>'. $_->agent
+  } qsearch('agent', { 'disabled' => '' } ) ).
+  '</SELECT>';
+}
+
 #this is pretty kludgy right here.
 tie my %events, 'Tie::IxHash',
 
@@ -84,6 +109,18 @@ tie my %events, 'Tie::IxHash',
     'code'   => '$cust_main->suspend();',
     'weight' => 10,
   },
+  'suspend-if-pkgpart' => {
+    'name'   => 'Suspend packages',
+    'code'   => '$cust_main->suspend_if_pkgpart(%%%if_pkgpart%%%);',
+    'html'   => sub { &select_pkgpart('if_pkgpart', @_) },
+    'weight' => 10,
+  },
+  'suspend-unless-pkgpart' => {
+    'name'   => 'Suspend packages except',
+    'code'   => '$cust_main->suspend_unless_pkgpart(%%%unless_pkgpart%%%);',
+    'html'   => sub { &select_pkgpart('unless_pkgpart', @_) },
+    'weight' => 10,
+  },
   'cancel' => {
     'name'   => 'Cancel',
     'code'   => '$cust_main->cancel();',
@@ -140,6 +177,26 @@ tie my %events, 'Tie::IxHash',
     'weight' => 50,
   },
 
+  'send_agent' => {
+    'name' => 'Send invoice (email/print) ',
+    'code' => '$cust_bill->send(\'%%%agent_templatename%%%\', %%%agentnum%%%);',
+    'html' => sub {
+        '<TABLE BORDER=0>
+          <TR>
+            <TD ALIGN="right">only for agent </TD>
+            <TD>'. &select_agentnum(@_). '</TD>
+          </TR>
+          <TR>
+            <TD ALIGN="right">with template </TD>
+            <TD>
+              <INPUT TYPE="text" NAME="agent_templatename" VALUE="%%%agent_templatename%%%">
+            </TD>
+          </TR>
+        </TABLE>';
+    },
+    'weight' => 50,
+  },
+
   'send_csv_ftp' => {
     'name' => 'Upload CSV invoice data to an FTP server',
     'code' => '$cust_bill->send_csv( protocol => \'ftp\',
@@ -188,6 +245,9 @@ foreach my $event ( keys %events ) {
   my %plandata = map { /^(\w+) (.*)$/; ($1, $2); }
                    split(/\n/, $part_bill_event->plandata);
   my $html = $events{$event}{html};
+  if ( ref($html) eq 'CODE' ) {
+    $html = &{$html}(\%plandata);
+  }
   while ( $html =~ /%%%(\w+)%%%/ ) {
     my $field = $1;
     $html =~ s/%%%$field%%%/$plandata{$field}/;
diff --git a/httemplate/edit/process/part_bill_event.cgi b/httemplate/edit/process/part_bill_event.cgi
index e224bf634..77dcd242a 100755
--- a/httemplate/edit/process/part_bill_event.cgi
+++ b/httemplate/edit/process/part_bill_event.cgi
@@ -5,7 +5,7 @@ my $eventpart = $cgi->param('eventpart');
 my $old = qsearchs('part_bill_event',{'eventpart'=>$eventpart}) if $eventpart;
 
 #s/days/seconds/
-$cgi->param('seconds', $cgi->param('days') * 86400 );
+$cgi->param('seconds', int( $cgi->param('days') * 86400 ) );
 
 my $error;
 if ( ! $cgi->param('plan_weight_eventcode') ) {
@@ -21,7 +21,8 @@ if ( ! $cgi->param('plan_weight_eventcode') ) {
   my $plandata = '';
   while ( $eventcode =~ /%%%(\w+)%%%/ ) {
     my $field = $1;
-    my $value = $cgi->param($field);
+    my $value = join(', ', $cgi->param($field) );
+    $cgi->param($field, $value); #in case it errors out
     $eventcode =~ s/%%%$field%%%/$value/;
     $plandata .= "$field $value\n";
   }
-- 
cgit v1.2.1


From a2746023c2b286d67ab5e4d5777e8cb271525a13 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 May 2004 00:20:53 +0000
Subject: patch from randell lucas for order_pkg to return pkgnum also

---
 FS/FS/ClientAPI/MyAccount.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 3c0b0ac5a..77c1fc889 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -489,7 +489,7 @@ sub order_pkg {
     $cust_pkg->reexport;
   }
 
-  return { error => '' };
+  return { error => '', pkgnum => $cust_pkg->pkgnum };
 
 }
 
-- 
cgit v1.2.1


From b377b1408398c471689e35dabb1bf14ef263a644 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 May 2004 12:28:53 +0000
Subject: make hours/input/output/total display on invoices conditional on
 there being any charge for overages

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 8416b3546..6c7d5dd23 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -445,7 +445,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); push @details, \"Last month\\\'s excess data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\", \"Last month\\\'s excess time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; \' + what.recur_flat.value + \' + $hourscharge + \' + what.recur_input_charge.value + \' * $input + \' + what.recur_output_charge.value + \' * $output + $totalcharge ;\'',
+    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $inputcharge = sprintf(\"%.2f\", \' + what.recur_input_charge.value + \' * $input); my $outputcharge = sprintf(\"%.2f\", \' + what.recur_output_charge.value + \' * $output); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + what.recur_input_charge.value + \' > 0 ) { push @details, \"Last month\\\'s download \". sprintf(\"%.1f\", $input). \" megs: \\\$$inputcharge\" } if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + whathorlly_charge.value + \' > 0 ) { push @details, \"Last month\\\'s time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; } \' + what.recur_flat.value + \' + $hourscharge + $inputcharge + $outputcharge + $totalcharge ;\'',
   },
 
   'sql_generic' => {
-- 
cgit v1.2.1


From 59d12a3144dfee010c84fb9df36b39d6330b89d3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 May 2004 12:30:15 +0000
Subject: finish making hours/input/output/total display on invoices
 conditional on there being any charge for overages

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 6c7d5dd23..86a49209c 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -445,7 +445,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $inputcharge = sprintf(\"%.2f\", \' + what.recur_input_charge.value + \' * $input); my $outputcharge = sprintf(\"%.2f\", \' + what.recur_output_charge.value + \' * $output); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + what.recur_input_charge.value + \' > 0 ) { push @details, \"Last month\\\'s download \". sprintf(\"%.1f\", $input). \" megs: \\\$$inputcharge\" } if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + whathorlly_charge.value + \' > 0 ) { push @details, \"Last month\\\'s time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; } \' + what.recur_flat.value + \' + $hourscharge + $inputcharge + $outputcharge + $totalcharge ;\'',
+    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $inputcharge = sprintf(\"%.2f\", \' + what.recur_input_charge.value + \' * $input); my $outputcharge = sprintf(\"%.2f\", \' + what.recur_output_charge.value + \' * $output); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + what.recur_input_charge.value + \' > 0 ) { push @details, \"Last month\\\'s download \". sprintf(\"%.1f\", $input). \" megs: \\\$$inputcharge\" } if ( \' + what.recur_output_charge.value + \' > 0 ) { push @details, \"Last month\\\'s upload \". sprintf(\"%.1f\", $output). \" megs: \\\$$outputcharge\" } if ( \' + whathorlly_charge.value + \' > 0 ) { push @details, \"Last month\\\'s time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; } \' + what.recur_flat.value + \' + $hourscharge + $inputcharge + $outputcharge + $totalcharge ;\'',
   },
 
   'sql_generic' => {
-- 
cgit v1.2.1


From 6b9a0a746535a142c95a5841f5cb5d9dc44d2f21 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 May 2004 12:31:02 +0000
Subject: continue making hours/input/output/total display on invoices
 conditional on there being any charge for overages

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 86a49209c..460f68b2c 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -445,7 +445,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $inputcharge = sprintf(\"%.2f\", \' + what.recur_input_charge.value + \' * $input); my $outputcharge = sprintf(\"%.2f\", \' + what.recur_output_charge.value + \' * $output); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + what.recur_input_charge.value + \' > 0 ) { push @details, \"Last month\\\'s download \". sprintf(\"%.1f\", $input). \" megs: \\\$$inputcharge\" } if ( \' + what.recur_output_charge.value + \' > 0 ) { push @details, \"Last month\\\'s upload \". sprintf(\"%.1f\", $output). \" megs: \\\$$outputcharge\" } if ( \' + whathorlly_charge.value + \' > 0 ) { push @details, \"Last month\\\'s time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; } \' + what.recur_flat.value + \' + $hourscharge + $inputcharge + $outputcharge + $totalcharge ;\'',
+    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $inputcharge = sprintf(\"%.2f\", \' + what.recur_input_charge.value + \' * $input); my $outputcharge = sprintf(\"%.2f\", \' + what.recur_output_charge.value + \' * $output); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + what.recur_input_charge.value + \' > 0 ) { push @details, \"Last month\\\'s download \". sprintf(\"%.1f\", $input). \" megs: \\\$$inputcharge\" } if ( \' + what.recur_output_charge.value + \' > 0 ) { push @details, \"Last month\\\'s upload \". sprintf(\"%.1f\", $output). \" megs: \\\$$outputcharge\" } if ( \' + what.recur_hourly_charge.value + \' > 0 ) { push @details, \"Last month\\\'s time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; } \' + what.recur_flat.value + \' + $hourscharge + $inputcharge + $outputcharge + $totalcharge ;\'',
   },
 
   'sql_generic' => {
-- 
cgit v1.2.1


From b970f3999c9a49146ec2f5224a60057723304d1b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 May 2004 13:41:27 +0000
Subject: adding acct_sql export

---
 FS/FS/part_export/acct_sql.pm | 140 ++++++++++++++++++++++++++++++++++++++++++
 FS/MANIFEST                   |   3 +
 FS/t/part_export-acct_sql.t   |   5 ++
 3 files changed, 148 insertions(+)
 create mode 100644 FS/FS/part_export/acct_sql.pm
 create mode 100644 FS/t/part_export-acct_sql.t

diff --git a/FS/FS/part_export/acct_sql.pm b/FS/FS/part_export/acct_sql.pm
new file mode 100644
index 000000000..0c3b49197
--- /dev/null
+++ b/FS/FS/part_export/acct_sql.pm
@@ -0,0 +1,140 @@
+package FS::part_export::acct_sql;
+
+use vars qw(@ISA %info @saltset);
+use Tie::IxHash;
+#use Digest::MD5 qw(md5_hex);
+use FS::Record; #qw(qsearchs);
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+tie my %options, 'Tie::IxHash',
+  'datasrc'            => { label => 'DBI data source' },
+  'username'           => { label => 'Database username' },
+  'password'           => { label => 'Database password' },
+;
+
+%info = (
+  'svc'      => 'svc_acct',
+  'desc'     => 'Real-time export of accounts to SQL databases '.
+                '(Postfix+Courier IMAP, others?)',
+  'options'  => \%options,
+  'nodomain' => '',
+  'notes'    => <<END
+Export accounts (svc_acct records) to SQL databases.  Written for
+Postfix+Courier IMAP but intended to be generally useful for generic SQL
+exports eventually.
+
+In contrast to sqlmail, this is newer and less well tested, and currently less
+flexible.  It is intended to export just svc_acct records only, rather than a
+single export for svc_acct, svc_forward and svc_domain records, and to 
+be configured for different mail server setups through some subclassing
+rather than options.
+END
+);
+
+@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+
+#mapping needs to be configurable...
+# export col => freeside col/method or callback
+my %map = (
+  'username' => 'email',
+  'password' => '_password',
+  'crypt'    => sub {
+                  my $svc_acct = shift;
+                  #false laziness w/shellcommands.pm
+                  #eventually should check a "password-encoding" field
+                  if ( length($svc_acct->_password) == 13
+                       || $svc_acct->_password =~ /^\$(1|2a?)\$/ ) {
+                    $svc_acct->_password;
+                  } else {
+                    crypt(
+                      $svc_acct->_password,
+                      $saltset[int(rand(64))].$saltset[int(rand(64))]
+                    );
+                  }
+
+                },
+  'name'     => 'finger',
+  'maildir'  => sub { shift->domain. '/maildirs/'. shift->username. '/' },
+  'domain'   => sub { shift->domain },
+  'svcnum'   => 'svcnum',
+);
+
+my $table = 'mailbox'; #also needs to be configurable...
+
+my $primary_key = 'username';
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my($self, $svc_acct) = (shift, shift);
+
+
+  my %record = map { my $value = $map{$_};
+                     $_ => ( ref($value)
+                               ? &{$value}($svc_acct)
+                               : $svc_acct->$value()
+                           );
+                   } keys %map;
+
+  my $err_or_queue =
+    $self->acct_sql_queue( $svc_acct->svcnum, 'insert', $table, %record );
+  return $err_or_queue unless ref($err_or_queue);
+
+  '';
+
+}
+
+sub _export_replace {
+}
+
+sub _export_delete {
+  my ( $self, $svc_acct ) = (shift, shift);
+  my $keymap = $map{$primary_key};
+  my $err_or_queue = $self->acct_sql_queue(
+    $svc_acct->svcnum,
+    'delete',
+    $table,
+    $primary_key => ref($keymap) ? &{$keymap}($svc_acct) : $svc_acct->$keymap()
+  );
+}
+
+sub acct_sql_queue {
+  my( $self, $svcnum, $method ) = (shift, shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => "FS::part_export::acct_sql::acct_sql_$method",
+  };
+  $queue->insert(
+    $self->option('datasrc'),
+    $self->option('username'),
+    $self->option('password'),
+    @_,
+  ) or $queue;
+}
+
+sub acct_sql_insert { #subroutine, not method
+  my $dbh = acct_sql_connect(shift, shift, shift);
+  my( $table, %record ) = @_;
+
+  my $sth = $dbh->prepare(
+    "INSERT INTO $table ( ". join(", ", keys %record).
+    " ) VALUES ( ". join(", ", map '?', keys %record ). " )"
+  ) or die $dbh->errstr;
+
+  $sth->execute( map $record{$_}, keys %record )
+    or die "can't insert into $table table: ". $sth->errstr;
+
+  $dbh->disconnect;
+}
+
+sub acct_sql_connect {
+  #my($datasrc, $username, $password) = @_;
+  #DBI->connect($datasrc, $username, $password) or die $DBI::errstr;
+  DBI->connect(@_) or die $DBI::errstr;
+}
+
+1;
+
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 675429e04..e9c673dc2 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -68,6 +68,7 @@ FS/part_bill_event.pm
 FS/export_svc.pm
 FS/part_export.pm
 FS/part_export_option.pm
+FS/part_export/acct_sql.pm
 FS/part_export/apache.pm
 FS/part_export/bind.pm
 FS/part_export/bind_slave.pm
@@ -158,6 +159,8 @@ t/part_bill_event.t
 t/export_svc.t
 t/part_export.t
 t/part_export_option.t
+t/part_export-acct_sql.t
+t/part_export-apache.t
 t/part_export-bind.t
 t/part_export-bind_slave.t
 t/part_export-bsdshell.t
diff --git a/FS/t/part_export-acct_sql.t b/FS/t/part_export-acct_sql.t
new file mode 100644
index 000000000..9eed47259
--- /dev/null
+++ b/FS/t/part_export-acct_sql.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_export::acct_sql;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From c3986b04e040c54afdf14cb39b3daf5210afa739 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 May 2004 14:22:52 +0000
Subject: fixing acct_sql export

---
 FS/FS/part_export/acct_sql.pm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_export/acct_sql.pm b/FS/FS/part_export/acct_sql.pm
index 0c3b49197..631a44c8a 100644
--- a/FS/FS/part_export/acct_sql.pm
+++ b/FS/FS/part_export/acct_sql.pm
@@ -56,7 +56,7 @@ my %map = (
 
                 },
   'name'     => 'finger',
-  'maildir'  => sub { shift->domain. '/maildirs/'. shift->username. '/' },
+  'maildir'  => sub { $_[0]->domain. '/maildirs/'. $_[0]->username. '/' },
   'domain'   => sub { shift->domain },
   'svcnum'   => 'svcnum',
 );
@@ -129,6 +129,20 @@ sub acct_sql_insert { #subroutine, not method
   $dbh->disconnect;
 }
 
+sub acct_sql_delete { #subroutine, not method
+  my $dbh = acct_sql_connect(shift, shift, shift);
+  my( $table, %record ) = @_;
+
+  my $sth = $dbh->prepare(
+    "DELETE FROM  $table WHERE ". join(' AND ', map "$_ = ? ", keys %record )
+  ) or die $dbh->errstr;
+
+  $sth->execute( map $record{$_}, keys %record )
+    or die "can't delete from $table table: ". $sth->errstr;
+
+  $dbh->disconnect;
+}
+
 sub acct_sql_connect {
   #my($datasrc, $username, $password) = @_;
   #DBI->connect($datasrc, $username, $password) or die $DBI::errstr;
-- 
cgit v1.2.1


From 33fbb5789fdc25696b4c3319e8118fe337892f04 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 May 2004 14:29:54 +0000
Subject: fixing deletions in acct_sql export

---
 FS/FS/part_export/acct_sql.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/FS/part_export/acct_sql.pm b/FS/FS/part_export/acct_sql.pm
index 631a44c8a..05c4310cb 100644
--- a/FS/FS/part_export/acct_sql.pm
+++ b/FS/FS/part_export/acct_sql.pm
@@ -98,6 +98,7 @@ sub _export_delete {
     $table,
     $primary_key => ref($keymap) ? &{$keymap}($svc_acct) : $svc_acct->$keymap()
   );
+  return $err_or_queue unless ref($err_or_queue);
 }
 
 sub acct_sql_queue {
-- 
cgit v1.2.1


From af666b341de952ce205333d2e361e96661f13e93 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 May 2004 14:34:13 +0000
Subject: really fixing deletions in acct_sql export

---
 FS/FS/part_export/acct_sql.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/FS/part_export/acct_sql.pm b/FS/FS/part_export/acct_sql.pm
index 05c4310cb..9b17e3998 100644
--- a/FS/FS/part_export/acct_sql.pm
+++ b/FS/FS/part_export/acct_sql.pm
@@ -99,6 +99,7 @@ sub _export_delete {
     $primary_key => ref($keymap) ? &{$keymap}($svc_acct) : $svc_acct->$keymap()
   );
   return $err_or_queue unless ref($err_or_queue);
+  '';
 }
 
 sub acct_sql_queue {
-- 
cgit v1.2.1


From c37aa003cc514cde5058ba3d94b0b1a133807579 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 May 2004 09:14:00 +0000
Subject: default commands now keep web content in user homedirs and link to
 /var/www

---
 FS/FS/part_export/www_shellcommands.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index 9f14707b0..dd909376b 100644
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -10,13 +10,13 @@ use FS::part_export;
 tie my %options, 'Tie::IxHash',
   'user' => { label=>'Remote username', default=>'root' },
   'useradd' => { label=>'Insert command',
-                 default=>'mkdir /var/www/$zone; chown $username /var/www/$zone; ln -s /var/www/$zone $homedir/$zone',
+                 default=>'mkdir $homedir/$zone; chown $username $homedir/$zone; ln -s $homedir/$zone /var/www/$zone',
                },
   'userdel'  => { label=>'Delete command',
-                  default=>'[ -n "$zone" ] && rm -rf /var/www/$zone; rm $homedir/$zone',
+                  default=>'[ -n "$zone" ] && rm -rf /var/www/$zone; rm -rf $homedir/$zone',
                 },
   'usermod'  => { label=>'Modify command',
-                  default=>'[ -n "$old_zone" ] && rm $old_homedir/$old_zone; [ "$old_zone" != "$new_zone" -a -n "$new_zone" ] && mv /var/www/$old_zone /var/www/$new_zone; [ "$old_username" != "$new_username" ] && chown -R $new_username /var/www/$new_zone; ln -s /var/www/$new_zone $new_homedir/$new_zone',
+                  default=>'[ -n "$old_zone" ] && rm /var/www/$old_zone; [ "$old_zone" != "$new_zone" -a -n "$new_zone" ] && ( mv $old_homedir/$old_zone $new_homedir/$new_zone; ln -sf $new_homedir/$new_zone /var/www/$new_zone ); [ "$old_username" != "$new_username" ] && chown -R $new_username $new_homedir/$new_zone; ln -sf $new_homedir/$new_zone /var/www/$new_zone',
                 },
 ;
 
@@ -32,9 +32,9 @@ Run remote commands via SSH, for virtual web sites.  You will need to
   <LI>
     <INPUT TYPE="button" VALUE="Maintain directories" onClick='
       this.form.user.value = "root";
-      this.form.useradd.value = "mkdir /var/www/$zone; chown $username /var/www/$zone; ln -s /var/www/$zone $homedir/$zone";
-      this.form.userdel.value = "[ -n "$zone" ] && rm -rf /var/www/$zone; rm $homedir/$zone";
-      this.form.usermod.value = "[ -n "$old_zone" ] && rm $old_homedir/$old_zone; [ "$old_zone" != "$new_zone" -a -n "$new_zone" ] && mv /var/www/$old_zone /var/www/$new_zone; [ "$old_username" != "$new_username" ] && chown -R $new_username /var/www/$new_zone; ln -s /var/www/$new_zone $new_homedir/$new_zone";
+      this.form.useradd.value = "mkdir $homedir/$zone; chown $username $homedir/$zone; ln -s $homedir/$zone /var/www/$zone";
+      this.form.userdel.value = "[ -n \"$zone\" ] && rm -rf /var/www/$zone; rm -rf $homedir/$zone";
+      this.form.usermod.value = "[ -n \"$old_zone\" ] && rm /var/www/$old_zone; [ \"$old_zone\" != \"$new_zone\" -a -n \"$new_zone\" ] && ( mv $old_homedir/$old_zone $new_homedir/$new_zone; ln -sf $new_homedir/$new_zone /var/www/$new_zone ); [ \"$old_username\" != \"$new_username\" ] && chown -R $new_username $new_homedir/$new_zone; ln -sf $new_homedir/$new_zone /var/www/$new_zone";
     '>
   <LI>
     <INPUT TYPE="button" VALUE="ISPMan CLI" onClick='
-- 
cgit v1.2.1


From 9c7e761f0c45bf2085a4486269e8d70b9f87cde2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 May 2004 10:36:06 +0000
Subject: better error checking/reporting for latex setup problems

---
 FS/FS/cust_bill.pm | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 367e1bc5e..4cfc59d10 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1138,13 +1138,16 @@ sub print_ps {
 
   my $file = $self->print_latex(@_);
 
-  #error checking!!
-  system('pslatex', "$file.tex");
-  system('pslatex', "$file.tex");
-  system('dvips', '-q', '-t', 'letter', "$file.dvi", '-o', "$file.ps" );
+  system("pslatex $file.tex >/dev/null 2>&1") == 0
+    or die "pslatex failed: $!";
+  system("pslatex $file.tex >/dev/null 2>&1") == 0
+    or die "pslatex failed: $!";
+
+  system('dvips', '-q', '-t', 'letter', "$file.dvi", '-o', "$file.ps" ) == 0
+    or die "dbips failed: $!";
 
   open(POSTSCRIPT, "<$file.ps")
-    or die "can't open $file.ps (probable error in LaTeX template): $!\n";
+    or die "can't open $file.ps: $! (error in LaTeX template?)\n";
 
   unlink("$file.dvi", "$file.log", "$file.aux", "$file.ps", "$file.tex");
 
@@ -1179,15 +1182,21 @@ sub print_pdf {
   #system('pdflatex', "$file.tex");
   #! LaTeX Error: Unknown graphics extension: .eps.
 
-  #error checking!!
-  system('pslatex', "$file.tex");
-  system('pslatex', "$file.tex");
+  system("pslatex $file.tex >/dev/null 2>&1") == 0
+    or die "pslatex failed: $!";
+  system("pslatex $file.tex >/dev/null 2>&1") == 0
+    or die "pslatex failed: $!";
 
   #system('dvipdf', "$file.dvi", "$file.pdf" );
-  system("dvips -q -t letter -f $file.dvi | gs -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$file.pdf -c save pop -");
+  system(
+    "dvips -q -t letter -f $file.dvi ".
+    "| gs -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$file.pdf ".
+    "     -c save pop -"
+  ) == 0
+    or die "dvips failed: $!";
 
   open(PDF, "<$file.pdf")
-    or die "can't open $file.pdf (probably error in LaTeX tempalte: $!\n";
+    or die "can't open $file.pdf: $! (error in LaTeX template?)\n";
 
   unlink("$file.dvi", "$file.log", "$file.aux", "$file.pdf", "$file.tex");
 
-- 
cgit v1.2.1


From b7f1494f55c75badc352300c6a8e55ef676d225d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 May 2004 11:11:10 +0000
Subject: use File::Temp for filenames and store the temp files in
 cache.datasrc instead of /tmp

---
 FS/FS/cust_bill.pm | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 4cfc59d10..13c48d965 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -5,6 +5,7 @@ use vars qw( @ISA $conf $money_char );
 use vars qw( $invoice_lines @buf ); #yuck
 use Date::Format;
 use Text::Template;
+use File::Temp;
 use FS::UID qw( datasrc );
 use FS::Record qw( qsearch qsearchs );
 use FS::Misc qw( send_email );
@@ -1108,17 +1109,17 @@ sub print_latex {
     $var;
   }
 
-  my $dir = '/tmp'; #! /usr/local/etc/freeside/invoices.datasrc/
-  my $unique = int(rand(2**31)); #UGH... use File::Temp or something
+  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
+  my $fh = new File::Temp( TEMPLATE => 'invoice.'. $self->invnum. '.XXXXXXXX',
+                           DIR      => $dir
+                           SUFFIX   => '.tex',
+                           UNLINK   => 0,
+                         ) or die "can't open temp file: $!\n";
+  print $fh join("\n", @filled_in ), "\n";
+  close $fh;
 
-  chdir($dir);
-  my $file = $self->invnum. ".$unique";
-
-  open(TEX,">$file.tex") or die "can't open $file.tex: $!\n";
-  print TEX join("\n", @filled_in ), "\n";
-  close TEX;
-
-  return $file;
+  $fh->filename =~ /^(.*).tex$/ or die "unparsable filename: ". $fh->filename;
+  return $1;
 
 }
 
@@ -1138,6 +1139,9 @@ sub print_ps {
 
   my $file = $self->print_latex(@_);
 
+  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
+  chdir($dir);
+
   system("pslatex $file.tex >/dev/null 2>&1") == 0
     or die "pslatex failed: $!";
   system("pslatex $file.tex >/dev/null 2>&1") == 0
@@ -1178,6 +1182,9 @@ sub print_pdf {
 
   my $file = $self->print_latex(@_);
 
+  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
+  chdir($dir);
+
   #system('pdflatex', "$file.tex");
   #system('pdflatex', "$file.tex");
   #! LaTeX Error: Unknown graphics extension: .eps.
-- 
cgit v1.2.1


From 4891d7608679ee4a742a8cd5ca03fbb4847b305e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 May 2004 11:11:52 +0000
Subject: comma

---
 FS/FS/cust_bill.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 13c48d965..576e4c846 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1111,7 +1111,7 @@ sub print_latex {
 
   my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
   my $fh = new File::Temp( TEMPLATE => 'invoice.'. $self->invnum. '.XXXXXXXX',
-                           DIR      => $dir
+                           DIR      => $dir,
                            SUFFIX   => '.tex',
                            UNLINK   => 0,
                          ) or die "can't open temp file: $!\n";
-- 
cgit v1.2.1


From 9e9e7407e7e8c5a94c27609145ee65205f984ac5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 May 2004 13:02:31 +0000
Subject: update acct_sql export some more to export to alias table also and in
 general be more configurable

---
 FS/FS/part_export/acct_sql.pm | 113 +++++++++++++++++++++++++-----------------
 FS/FS/svc_acct.pm             |  33 ++++++++++++
 2 files changed, 100 insertions(+), 46 deletions(-)

diff --git a/FS/FS/part_export/acct_sql.pm b/FS/FS/part_export/acct_sql.pm
index 9b17e3998..8e102fcc1 100644
--- a/FS/FS/part_export/acct_sql.pm
+++ b/FS/FS/part_export/acct_sql.pm
@@ -12,8 +12,37 @@ tie my %options, 'Tie::IxHash',
   'datasrc'            => { label => 'DBI data source' },
   'username'           => { label => 'Database username' },
   'password'           => { label => 'Database password' },
+  'table'              => { label => 'Database table' },
+  'schema'             => { label =>
+                              'Database schema mapping to Freeside methods.',
+                            type  => 'textarea',
+                          },
+  'primary_key'        => { label => 'Database primary key' },
 ;
 
+tie my %postfix_courierimap_mailbox_map, 'Tie::IxHash',
+  'username' => 'email',
+  'password' => '_password',
+  'crypt'    => 'crypt_password',
+  'name'     => 'finger',
+  'maildir'  => 'virtual_maildir',
+  'domain'   => 'domain',
+  'svcnum'   => 'svcnum',
+;
+my $postfix_courierimap_mailbox_map =
+  join('\n', map "$_ $postfix_courierimap_mailbox_map{$_}",
+                 keys %postfix_courierimap_mailbox_map      );
+
+tie my %postfix_courierimap_alias_map, 'Tie::IxHash',
+  'address' => 'email',
+  'goto'    => 'email',
+  'domain'  => 'domain',
+  'svcnum'  => 'svcnum',
+;
+my $postfix_courierimap_alias_map =
+  join('\n', map "$_ $postfix_courierimap_alias_map{$_}",
+                 keys %postfix_courierimap_alias_map      );
+
 %info = (
   'svc'      => 'svc_acct',
   'desc'     => 'Real-time export of accounts to SQL databases '.
@@ -23,63 +52,54 @@ tie my %options, 'Tie::IxHash',
   'notes'    => <<END
 Export accounts (svc_acct records) to SQL databases.  Written for
 Postfix+Courier IMAP but intended to be generally useful for generic SQL
-exports eventually.
-
-In contrast to sqlmail, this is newer and less well tested, and currently less
-flexible.  It is intended to export just svc_acct records only, rather than a
-single export for svc_acct, svc_forward and svc_domain records, and to 
-be configured for different mail server setups through some subclassing
-rather than options.
+exports, eventually.
+
+<BR><BR>In contrast to sqlmail, this is newer and less well tested, and
+currently less flexible.  It is intended to export just svc_acct records only,
+rather than a single export for svc_acct, svc_forward and svc_domain records,
+to export in "default" formats rather than configure the MTA or POP/IMAP server
+for a Freeside-specific schema, and possibly to be configured for different
+mail server setups through some subclassing rather than options.
+
+<BR><BR>Use these buttons for some useful presets:
+<UL>
+  <LI><INPUT TYPE="button" VALUE="postfix_courierimap_mailbox" onClick='
+    this.form.table.value = "mailbox";
+    this.form.schema.value = "$postfix_courierimap_mailbox_map";
+    this.form.primary_key.value = "username";
+  '>
+  <LI><INPUT TYPE="button" VALUE="postfix_courierimap_alias" onClick='
+    this.form.table.value = "mailbox";
+    this.form.schema.value = "$postfix_courierimap_alias_map";
+    this.form.primary_key.value = "address";
+  '>
+</UL>
 END
 );
 
-@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
-
-#mapping needs to be configurable...
-# export col => freeside col/method or callback
-my %map = (
-  'username' => 'email',
-  'password' => '_password',
-  'crypt'    => sub {
-                  my $svc_acct = shift;
-                  #false laziness w/shellcommands.pm
-                  #eventually should check a "password-encoding" field
-                  if ( length($svc_acct->_password) == 13
-                       || $svc_acct->_password =~ /^\$(1|2a?)\$/ ) {
-                    $svc_acct->_password;
-                  } else {
-                    crypt(
-                      $svc_acct->_password,
-                      $saltset[int(rand(64))].$saltset[int(rand(64))]
-                    );
-                  }
-
-                },
-  'name'     => 'finger',
-  'maildir'  => sub { $_[0]->domain. '/maildirs/'. $_[0]->username. '/' },
-  'domain'   => sub { shift->domain },
-  'svcnum'   => 'svcnum',
-);
-
-my $table = 'mailbox'; #also needs to be configurable...
-
-my $primary_key = 'username';
+sub _map {
+  my $self = shift;
+  map { /^\s*(\S+)\s*(\S+)\s*$/ } split("\n", $self->option('schema') );
+}
 
 sub rebless { shift; }
 
 sub _export_insert {
   my($self, $svc_acct) = (shift, shift);
 
+  my %map = $self->_map;
 
   my %record = map { my $value = $map{$_};
-                     $_ => ( ref($value)
-                               ? &{$value}($svc_acct)
-                               : $svc_acct->$value()
-                           );
+                     $_ => $svc_acct->$value();
                    } keys %map;
 
   my $err_or_queue =
-    $self->acct_sql_queue( $svc_acct->svcnum, 'insert', $table, %record );
+    $self->acct_sql_queue(
+      $svc_acct->svcnum,
+      'insert',
+      $self->option('table'),
+      %record
+    );
   return $err_or_queue unless ref($err_or_queue);
 
   '';
@@ -91,12 +111,13 @@ sub _export_replace {
 
 sub _export_delete {
   my ( $self, $svc_acct ) = (shift, shift);
-  my $keymap = $map{$primary_key};
+  my %map = $self->_map;
+  my $keymap = $map{$self->option('primary_key')};
   my $err_or_queue = $self->acct_sql_queue(
     $svc_acct->svcnum,
     'delete',
-    $table,
-    $primary_key => ref($keymap) ? &{$keymap}($svc_acct) : $svc_acct->$keymap()
+    $self->option('table'),
+    $self->option('primary_key') => $svc_acct->$keymap(),
   );
   return $err_or_queue unless ref($err_or_queue);
   '';
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 355573b00..6ea30437a 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1190,6 +1190,39 @@ sub check_password {
 
 }
 
+=item crypt_password
+
+Returns an encrypted password, either by passing through an encrypted password
+in the database or by encrypting a plaintext password from the database.
+
+=cut
+
+sub crypt_password {
+  my $self = shift;
+  #false laziness w/shellcommands.pm
+  #eventually should check a "password-encoding" field
+  if ( length($self->_password) == 13
+       || $self->_password =~ /^\$(1|2a?)\$/ ) {
+    $self->_password;
+  } else {
+    crypt(
+      $self->_password,
+      $saltset[int(rand(64))].$saltset[int(rand(64))]
+    );
+  }
+}
+
+=item virtual_maildir
+
+Returns $domain/maildirs/$username/
+
+=cut
+
+sub virtual_maildir {
+  my $self = shift;
+  $self->domain. '/maildirs/'. $self->username. '/';
+}
+
 =back
 
 =head1 SUBROUTINES
-- 
cgit v1.2.1


From 3abe6ab40fa3ecee7b5c4038c556ccf4a4ab4227 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 May 2004 13:07:47 +0000
Subject: fix table name

---
 FS/FS/part_export/acct_sql.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export/acct_sql.pm b/FS/FS/part_export/acct_sql.pm
index 8e102fcc1..dfc37d083 100644
--- a/FS/FS/part_export/acct_sql.pm
+++ b/FS/FS/part_export/acct_sql.pm
@@ -69,7 +69,7 @@ mail server setups through some subclassing rather than options.
     this.form.primary_key.value = "username";
   '>
   <LI><INPUT TYPE="button" VALUE="postfix_courierimap_alias" onClick='
-    this.form.table.value = "mailbox";
+    this.form.table.value = "alias";
     this.form.schema.value = "$postfix_courierimap_alias_map";
     this.form.primary_key.value = "address";
   '>
-- 
cgit v1.2.1


From d99c56a3a435d202c4503f6f62895d8111ac41f3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 May 2004 18:59:29 +0000
Subject: require the version of File::Temp with the OO interface

---
 FS/FS/cust_bill.pm                 | 12 ++++++------
 httemplate/docs/upgrade-1.4.2.html |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 576e4c846..3b76dd257 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -5,7 +5,7 @@ use vars qw( @ISA $conf $money_char );
 use vars qw( $invoice_lines @buf ); #yuck
 use Date::Format;
 use Text::Template;
-use File::Temp;
+use File::Temp 0.14;
 use FS::UID qw( datasrc );
 use FS::Record qw( qsearch qsearchs );
 use FS::Misc qw( send_email );
@@ -1143,9 +1143,9 @@ sub print_ps {
   chdir($dir);
 
   system("pslatex $file.tex >/dev/null 2>&1") == 0
-    or die "pslatex failed: $!";
+    or die "pslatex $file.tex failed: $!";
   system("pslatex $file.tex >/dev/null 2>&1") == 0
-    or die "pslatex failed: $!";
+    or die "pslatex $file.tex failed: $!";
 
   system('dvips', '-q', '-t', 'letter', "$file.dvi", '-o', "$file.ps" ) == 0
     or die "dbips failed: $!";
@@ -1190,9 +1190,9 @@ sub print_pdf {
   #! LaTeX Error: Unknown graphics extension: .eps.
 
   system("pslatex $file.tex >/dev/null 2>&1") == 0
-    or die "pslatex failed: $!";
+    or die "pslatex $file.tex failed: $!";
   system("pslatex $file.tex >/dev/null 2>&1") == 0
-    or die "pslatex failed: $!";
+    or die "pslatex $file.tex failed: $!";
 
   #system('dvipdf', "$file.dvi", "$file.pdf" );
   system(
@@ -1200,7 +1200,7 @@ sub print_pdf {
     "| gs -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$file.pdf ".
     "     -c save pop -"
   ) == 0
-    or die "dvips failed: $!";
+    or die "dvips | gs failed: $!";
 
   open(PDF, "<$file.pdf")
     or die "can't open $file.pdf: $! (error in LaTeX template?)\n";
diff --git a/httemplate/docs/upgrade-1.4.2.html b/httemplate/docs/upgrade-1.4.2.html
index eb40df8b3..a24661142 100644
--- a/httemplate/docs/upgrade-1.4.2.html
+++ b/httemplate/docs/upgrade-1.4.2.html
@@ -16,6 +16,7 @@
   <li>Install <a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a>
   <li>Install <a href="http://search.cpan.org/search?dist=Net-Whois-Raw">Net::Whois::Raw</a>
   <li>CGI.pm minimum version 2.47 is required.  You will probably need to install a current CGI.pm from CPAN if you are using Perl 5.005 or earlier.
+  <li>File::Temp minimum version 0.14 is required.  You will probably need to install a currrent File::Temp from CPAN if you are using Perl 5.6 or earlier.
   <li>If using Apache::ASP, add <code>PerlSetVar RequestBinaryRead Off</code> to your Apache configuration and make sure you are using Apache::ASP minimum version 2.55.
   <li>Run <code>make aspdocs</code> or <code>make masondocs</code>.
   <li>Copy <code>aspdocs/</code> or <code>masondocs/</code> to your web server's document space.
-- 
cgit v1.2.1


From 535811854078c1720ab5250f1a1669306796df95 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 May 2004 09:14:50 +0000
Subject: adding sqlradius.import

---
 bin/sqlradius.import | 144 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 bin/sqlradius.import

diff --git a/bin/sqlradius.import b/bin/sqlradius.import
new file mode 100644
index 000000000..9cb518e7f
--- /dev/null
+++ b/bin/sqlradius.import
@@ -0,0 +1,144 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use vars qw(%part_svc %domain_part_svc);
+#use Date::Parse;
+use DBI;
+use Term::Query qw(query);
+use FS::UID qw(adminsuidsetup); #datasrc
+use FS::Record qw(qsearch qsearchs);
+use FS::svc_acct;
+use FS::part_svc;
+use FS::svc_domain;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+#push @FS::svc_acct::shells, qw(/bin/sync /sbin/shutdown /bin/halt /sbin/halt); #others?
+
+$FS::svc_Common::noexport_hack = 1;
+
+###
+
+%part_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_acct'});
+
+die "No services with svcdb svc_acct!\n" unless %part_svc;
+
+print "\n\n", &menu_svc, "\n", <<END;
+Enter part number to import.
+END
+my $sqlradius_svcpart = &getpart;
+
+%domain_part_svc = map { $_->svcpart, $_ }
+                       qsearch('part_svc', { 'svcdb' => 'svc_domain'} );
+
+die "No services with svcdb svc_domain!\n" unless %domain_part_svc;
+
+print "\n\n", &menu_svc, "\n", <<END;
+Enter part number for domains.
+END
+my $domain_svcpart = &getdomainpart;
+
+my $datasrc = &getvalue("\n\nEnter the DBI datasource:");
+my $db_user = &getvalue("\n\nEnter the database user:");
+my $db_pass = &getvalue("\n\nEnter the database password:");
+
+sub getpart {
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query "Enter part number:", 'irk', [ keys %part_svc ];
+  $^W=1;
+  $return;
+}
+sub getdomainpart {
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query "Enter part number:", 'irk', [ keys %domain_part_svc ];
+  $^W=1;
+  $return;
+}
+sub getvalue {
+  my $prompt = shift;
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query $prompt, '';
+  $^W=1;
+  $return;
+}
+
+print "\n\n";
+
+###
+
+my $dbh = DBI->connect( $datasrc, $db_user, $db_pass )
+  or die $DBI::errstr;
+
+my $sth = $dbh->prepare('SELECT DISTINCT UserName, Realm FROM radcheck')
+  or die $dbh->errstr;
+$sth->execute or die $sth->errstr;
+
+my $row;
+while ( $row = $sth->fetchrow_arrayref ) {
+  my( $r_username, $realm ) = @$row;
+
+  my( $username, $domain );
+  if ( $r_username =~ s/([^@]+)\@([^@]+)$// ) {
+    $username = $1;
+    $domain = $2;
+  } else {
+    $username = $r_username;
+    $domain = $realm;
+  }
+  my %svc_domain = ( 'svcpart' => $domain_svcpart,
+                     'domain'  => $domain,         );
+  my $svc_domain = qsearchs('svc_domain', \%svc_domain )
+                   || new FS::svc_domain \%svc_domain;
+  unless ( $svc_domain->domsvc ) {
+    my $error = $svc_domain->insert;
+    if ( $error ) {
+      die "can't insert domain $domain: $error\n";
+    }
+  }
+
+  my( $password, $finger, $group ) = ( '', '', '' );
+
+  my $rc_sth = $dbh->prepare(
+    'SELECT Attribute, Value, Name, GroupName'.
+    '  FROM radcheck'.
+    '  WHERE UserName = ? and Realm = ?'
+  ) or die $dbh->errstr;
+  $rc_sth->execute($r_username, $realm) or die $rc_sth->errstr;
+
+  foreach my $rc_row ( @{$rc_sth->fetchall_arrayref} ) {
+    my($attribute, $value, $name, $groupname) = @$row;
+    if ( $attribute =~ /^(Crypt-)?Password$/ ) {
+      $password = $value;
+      $finger = $name;
+      $group = $groupname;
+    } else {
+      #handle other params!
+    }
+  }
+
+  my $svc_acct = new FS::svc_acct (
+    'svcpart'   => $sqlradius_svcpart,
+    'username'  => $username,
+    'domsvc'    => $svc_domain->domsvc,
+    '_password' => $password,
+    'finger'    => $finger,
+  );
+
+  my($error);
+  #$error = $svc_acct->insert;
+  $error = $svc_acct->check;
+  if ( $error ) {
+    if ( $error =~ /duplicate/i ) {
+      warn "$r_username: $error";
+    } else {
+      die "$r_username: $error";
+    }
+  }
+
+}
+
+sub usage {
+  die "Usage:\n\n  sqlradius.import user\n";
+}
+
-- 
cgit v1.2.1


From cf9f008216028a4140208f0b26bba773c01fc5a2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 May 2004 09:30:14 +0000
Subject: fixup domain svcpart selection

---
 bin/sqlradius.import | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/sqlradius.import b/bin/sqlradius.import
index 9cb518e7f..120cbf373 100644
--- a/bin/sqlradius.import
+++ b/bin/sqlradius.import
@@ -34,7 +34,7 @@ my $sqlradius_svcpart = &getpart;
 
 die "No services with svcdb svc_domain!\n" unless %domain_part_svc;
 
-print "\n\n", &menu_svc, "\n", <<END;
+print "\n\n", &menu_domain_svc, "\n", <<END;
 Enter part number for domains.
 END
 my $domain_svcpart = &getdomainpart;
@@ -43,6 +43,12 @@ my $datasrc = &getvalue("\n\nEnter the DBI datasource:");
 my $db_user = &getvalue("\n\nEnter the database user:");
 my $db_pass = &getvalue("\n\nEnter the database password:");
 
+sub menu_svc {
+  ( join "\n", map "$_: ".$part_svc{$_}->svc, sort keys %part_svc ). "\n";
+}
+sub menu_domain_svc {
+  ( join "\n", map "$_: ".$part_svc{$_}->svc, sort keys %domain_part_svc ). "\n";
+}
 sub getpart {
   $^W=0; # Term::Query isn't -w-safe
   my $return = query "Enter part number:", 'irk', [ keys %part_svc ];
-- 
cgit v1.2.1


From 08feb6698a96eed199404b8319a39ec4c02a084e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 May 2004 07:02:37 +0000
Subject: report value passed for illegal action pseudo-field

---
 FS/FS/svc_domain.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index b713e3e95..2642146ea 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -342,7 +342,8 @@ sub check {
            " (or unknown registry - try \$whois_hack)";
   }
 
-  $recref->{action} =~ /^(M|N)$/ or return "Illegal action";
+  $recref->{action} =~ /^(M|N)$/
+    or return "Illegal action: ". $recref->{action};
   $recref->{action} = $1;
 
   if ( $recref->{catchall} ne '' ) {
-- 
cgit v1.2.1


From c4b0a99e8be89daf346273a4a9f8a8d8c1dc264f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 May 2004 08:37:47 +0000
Subject: fixed up and working?

---
 bin/sqlradius.import | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/bin/sqlradius.import b/bin/sqlradius.import
index 120cbf373..7203365f3 100644
--- a/bin/sqlradius.import
+++ b/bin/sqlradius.import
@@ -17,6 +17,7 @@ adminsuidsetup $user;
 #push @FS::svc_acct::shells, qw(/bin/sync /sbin/shutdown /bin/halt /sbin/halt); #others?
 
 $FS::svc_Common::noexport_hack = 1;
+$FS::svc_domain::whois_hack = 1;
 
 ###
 
@@ -47,7 +48,7 @@ sub menu_svc {
   ( join "\n", map "$_: ".$part_svc{$_}->svc, sort keys %part_svc ). "\n";
 }
 sub menu_domain_svc {
-  ( join "\n", map "$_: ".$part_svc{$_}->svc, sort keys %domain_part_svc ). "\n";
+  ( join "\n", map "$_: ".$domain_part_svc{$_}->svc, sort keys %domain_part_svc ). "\n";
 }
 sub getpart {
   $^W=0; # Term::Query isn't -w-safe
@@ -81,22 +82,24 @@ my $sth = $dbh->prepare('SELECT DISTINCT UserName, Realm FROM radcheck')
 $sth->execute or die $sth->errstr;
 
 my $row;
-while ( $row = $sth->fetchrow_arrayref ) {
+while ( defined ( $row = $sth->fetchrow_arrayref ) ) {
   my( $r_username, $realm ) = @$row;
 
   my( $username, $domain );
-  if ( $r_username =~ s/([^@]+)\@([^@]+)$// ) {
+  if ( $r_username =~ /^([^@]+)\@([^@]+)$/ ) {
     $username = $1;
     $domain = $2;
   } else {
     $username = $r_username;
     $domain = $realm;
   }
-  my %svc_domain = ( 'svcpart' => $domain_svcpart,
-                     'domain'  => $domain,         );
-  my $svc_domain = qsearchs('svc_domain', \%svc_domain )
-                   || new FS::svc_domain \%svc_domain;
-  unless ( $svc_domain->domsvc ) {
+  my $svc_domain = qsearchs('svc_domain', { 'domain'  => $domain } )
+                   || new FS::svc_domain {
+                                           'domain'  => $domain,
+                                           'svcpart' => $domain_svcpart,
+                                           'action'  => 'N',
+                                         };
+  unless ( $svc_domain->svcnum ) {
     my $error = $svc_domain->insert;
     if ( $error ) {
       die "can't insert domain $domain: $error\n";
@@ -123,22 +126,22 @@ while ( $row = $sth->fetchrow_arrayref ) {
     }
   }
 
-  my $svc_acct = new FS::svc_acct (
+  my $svc_acct = new FS::svc_acct {
     'svcpart'   => $sqlradius_svcpart,
     'username'  => $username,
-    'domsvc'    => $svc_domain->domsvc,
+    'domsvc'    => $svc_domain->svcnum,
     '_password' => $password,
     'finger'    => $finger,
-  );
+  };
 
   my($error);
-  #$error = $svc_acct->insert;
-  $error = $svc_acct->check;
+  $error = $svc_acct->insert;
+  #$error = $svc_acct->check;
   if ( $error ) {
     if ( $error =~ /duplicate/i ) {
-      warn "$r_username: $error";
+      warn "$r_username / $realm: $error";
     } else {
-      die "$r_username: $error";
+      die "$r_username / $realm: $error";
     }
   }
 
-- 
cgit v1.2.1


From 59eec66f424ee1a5e25b2d5853dbe505581b9a07 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 May 2004 08:40:46 +0000
Subject: really.

---
 bin/sqlradius.import | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/sqlradius.import b/bin/sqlradius.import
index 7203365f3..587d828e4 100644
--- a/bin/sqlradius.import
+++ b/bin/sqlradius.import
@@ -134,9 +134,8 @@ while ( defined ( $row = $sth->fetchrow_arrayref ) ) {
     'finger'    => $finger,
   };
 
-  my($error);
-  $error = $svc_acct->insert;
-  #$error = $svc_acct->check;
+  my $error = $svc_acct->insert;
+  #my $error = $svc_acct->check;
   if ( $error ) {
     if ( $error =~ /duplicate/i ) {
       warn "$r_username / $realm: $error";
-- 
cgit v1.2.1


From 0d81e56d3651752576b4969b39b49dc80012fc0e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 May 2004 10:17:08 +0000
Subject: correct count statement when searching for individual invoices by #

---
 httemplate/search/cust_bill.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index 337e9e859..3ae624af2 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -41,7 +41,7 @@
    
    } else {
      $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
-     $count_query = 'SELECT 1';
+     $count_query = "SELECT COUNT(*) FROM cust_bill WHERE invnum = $2";
      $sql_query = {
        'table'     => 'cust_bill',
        'hashref'   => { 'invnum' => $2 },
-- 
cgit v1.2.1


From d8ff6db2dbaec9cc8daad2d4af0254f167aa7a66 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 May 2004 10:38:00 +0000
Subject: show a better message when no results are found

---
 httemplate/search/elements/search.html | 93 ++++++++++++++++++----------------
 1 file changed, 49 insertions(+), 44 deletions(-)

diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index e739afb1d..12ab83ba5 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -67,55 +67,60 @@
                            'maxrecords' => $maxrecords,
                        );
 %>
-<%= $total %> total <%= $opt{'name'} %><BR>
-<% if ( $opt{'count_addl'} ) { %>
-  <% my $n=0; foreach my $count ( @{$opt{'count_addl'}} ) { %>
-    <%= sprintf( $count, $count_arrayref->[++$n] ) %><BR>
+<% unless ( $total ) { %>
+  No matching <%= $opt{'name'} %> found.<BR>
+<% } else { %>
+  <%= $total %> total <%= $opt{'name'} %><BR>
+  <% if ( $opt{'count_addl'} ) { %>
+    <% my $n=0; foreach my $count ( @{$opt{'count_addl'}} ) { %>
+      <%= sprintf( $count, $count_arrayref->[++$n] ) %><BR>
+    <% } %>
   <% } %>
-<% } %>
-<BR><%= $pager %>
-<%= include( '/elements/table.html' ) %>
-  <TR>
-  <% foreach my $header ( @$header ) { %>
-       <TH><%= $header %></TH>
-  <% } %>
-  </TR>
-  <% foreach my $row ( @$rows ) { %>
-       <TR>
-       <% if ( $opt{'fields'} ) { %>
-         <% my $links = $opt{'links'} ? [ @{$opt{'links'}} ] : ''; %>
-         <% foreach my $field ( @{$opt{'fields'}} ) { %>
-           <% my $a = ''; %>
-           <% if ( $links ) {
-                my $link = shift @$links;
-                $link = &{$link}($row) if ref($link) eq 'CODE';
-                if ( $link ) {
-                  my( $url, $method ) = @{$link};
-                  if ( ref($method) eq 'CODE' ) {
-                    $a = $url. &{$method}($row);
-                  } else {
-                    $a = $url. $row->$method();
+  <BR><%= $pager %>
+  <%= include( '/elements/table.html' ) %>
+    <TR>
+    <% foreach my $header ( @$header ) { %>
+         <TH><%= $header %></TH>
+    <% } %>
+    </TR>
+    <% foreach my $row ( @$rows ) { %>
+         <TR>
+         <% if ( $opt{'fields'} ) { %>
+           <% my $links = $opt{'links'} ? [ @{$opt{'links'}} ] : ''; %>
+           <% foreach my $field ( @{$opt{'fields'}} ) { %>
+             <% my $a = ''; %>
+             <% if ( $links ) {
+                  my $link = shift @$links;
+                  $link = &{$link}($row) if ref($link) eq 'CODE';
+                  if ( $link ) {
+                    my( $url, $method ) = @{$link};
+                    if ( ref($method) eq 'CODE' ) {
+                      $a = $url. &{$method}($row);
+                    } else {
+                      $a = $url. $row->$method();
+                    }
+                    $a = qq(<A HREF="$a">);
                   }
-                  $a = qq(<A HREF="$a">);
                 }
-              }
-           %>
-           <% if ( ref($field) eq 'CODE' ) { %>
-             <TD><%= $a %><%= &{$field}($row) %><%= $a ? '</A>' : '' %></TD>
-           <% } else { %>
-             <TD><%= $a %><%= $row->$field() %><%= $a ? '</A>' : '' %></TD>
+             %>
+             <% if ( ref($field) eq 'CODE' ) { %>
+               <TD><%= $a %><%= &{$field}($row) %><%= $a ? '</A>' : '' %></TD>
+             <% } else { %>
+               <TD><%= $a %><%= $row->$field() %><%= $a ? '</A>' : '' %></TD>
+             <% } %>
+           <% } %>
+         <% } else { %>
+           <% foreach ( @$row ) { %>
+                <TD><%= $_ %></TD>
            <% } %>
          <% } %>
-       <% } else { %>
-         <% foreach ( @$row ) { %>
-              <TD><%= $_ %></TD>
-         <% } %>
-       <% } %>
-       </TR>
-  <% } %>
-
-</TABLE>
-<%= $pager %>
+         </TR>
+    <% } %>
+  
+  </TABLE>
+  <%= $pager %>
+<% } %>
 </BODY>
 </HTML>
 <% } %>
+
-- 
cgit v1.2.1


From 2e1a3719f1a9fb1f561d0eb4df349f3f03d66681 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 May 2004 11:21:46 +0000
Subject: better error reporting on unparsable filenames

---
 httemplate/misc/upload-batch.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/misc/upload-batch.cgi b/httemplate/misc/upload-batch.cgi
index cc5346606..da5e41cbc 100644
--- a/httemplate/misc/upload-batch.cgi
+++ b/httemplate/misc/upload-batch.cgi
@@ -2,7 +2,7 @@
 
   my $fh = $cgi->upload('batch_results');
   my $filename = $cgi->param('batch_results');
-  $filename =~ /^.*[\/\\]([^\/\\]+)$/ or die;
+  $filename =~ /^.*[\/\\]([^\/\\]+)$/ or die "unparsable filename: $filename\n";
   my $paybatch = $1;
 
   my $error = defined($fh)
-- 
cgit v1.2.1


From 038eaf525927a161e40577b2f2eec96c30523a6d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 May 2004 11:33:21 +0000
Subject: not entirely sure why we're checking the filename at all... to catch
 empty form submissions?

---
 httemplate/misc/upload-batch.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/httemplate/misc/upload-batch.cgi b/httemplate/misc/upload-batch.cgi
index da5e41cbc..5d0150177 100644
--- a/httemplate/misc/upload-batch.cgi
+++ b/httemplate/misc/upload-batch.cgi
@@ -2,8 +2,9 @@
 
   my $fh = $cgi->upload('batch_results');
   my $filename = $cgi->param('batch_results');
-  $filename =~ /^.*[\/\\]([^\/\\]+)$/ or die "unparsable filename: $filename\n";
-  my $paybatch = $1;
+  $filename =~ /^(.*[\/\\])?([^\/\\]+)$/
+    or die "unparsable filename: $filename\n";
+  my $paybatch = $2;
 
   my $error = defined($fh)
     ? FS::cust_pay_batch::import_results( {
-- 
cgit v1.2.1


From 601023f13b2db7465f4c166181959dcf78ac1ecb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 May 2004 13:48:34 +0000
Subject: adding

---
 bin/postfix_courierimap.import | 137 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100755 bin/postfix_courierimap.import

diff --git a/bin/postfix_courierimap.import b/bin/postfix_courierimap.import
new file mode 100755
index 000000000..ea7336794
--- /dev/null
+++ b/bin/postfix_courierimap.import
@@ -0,0 +1,137 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use vars qw(%part_svc %domain_part_svc);
+#use Date::Parse;
+use DBI;
+use Term::Query qw(query);
+use FS::UID qw(adminsuidsetup); #datasrc
+use FS::Record qw(qsearch qsearchs);
+use FS::svc_acct;
+use FS::part_svc;
+use FS::svc_domain;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+#push @FS::svc_acct::shells, qw(/bin/sync /sbin/shutdown /bin/halt /sbin/halt); #others?
+
+$FS::svc_Common::noexport_hack = 1;
+$FS::svc_domain::whois_hack = 1;
+
+###
+
+%part_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_acct'});
+
+die "No services with svcdb svc_acct!\n" unless %part_svc;
+
+print "\n\n", &menu_svc, "\n", <<END;
+Enter part number to import.
+END
+my $mailbox_svcpart = &getpart;
+
+%domain_part_svc = map { $_->svcpart, $_ }
+                       qsearch('part_svc', { 'svcdb' => 'svc_domain'} );
+
+die "No services with svcdb svc_domain!\n" unless %domain_part_svc;
+
+print "\n\n", &menu_domain_svc, "\n", <<END;
+Enter part number for domains.
+END
+my $domain_svcpart = &getdomainpart;
+
+my $datasrc = &getvalue("\n\nEnter the DBI datasource:");
+my $db_user = &getvalue("\n\nEnter the database user:");
+my $db_pass = &getvalue("\n\nEnter the database password:");
+
+sub menu_svc {
+  ( join "\n", map "$_: ".$part_svc{$_}->svc, sort keys %part_svc ). "\n";
+}
+sub menu_domain_svc {
+  ( join "\n", map "$_: ".$domain_part_svc{$_}->svc, sort keys %domain_part_svc ). "\n";
+}
+sub getpart {
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query "Enter part number:", 'irk', [ keys %part_svc ];
+  $^W=1;
+  $return;
+}
+sub getdomainpart {
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query "Enter part number:", 'irk', [ keys %domain_part_svc ];
+  $^W=1;
+  $return;
+}
+sub getvalue {
+  my $prompt = shift;
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query $prompt, '';
+  $^W=1;
+  $return;
+}
+
+print "\n\n";
+
+###
+
+my $dbh = DBI->connect( $datasrc, $db_user, $db_pass )
+  or die $DBI::errstr;
+
+my $sth = $dbh->prepare('SELECT username, password, crypt name, domain FROM mailbox')
+  or die $dbh->errstr;
+$sth->execute or die $sth->errstr;
+
+my $row;
+while ( defined ( $row = $sth->fetchrow_arrayref ) ) {
+  my( $r_username, $password, $crypt, $finger, $r_domain ) = @$row;
+
+  my( $username, $domain );
+  if ( $r_username =~ /^([^@]+)\@([^@]+)$/ ) {
+    $username = $1;
+    $domain = $2;
+  } else {
+    $username = $r_username;
+    $domain = $r_domain;
+  }
+  my $svc_domain = qsearchs('svc_domain', { 'domain'  => $domain } )
+                   || new FS::svc_domain {
+                                           'domain'  => $domain,
+                                           'svcpart' => $domain_svcpart,
+                                           'action'  => 'N',
+                                         };
+  unless ( $svc_domain->svcnum ) {
+    my $error = $svc_domain->insert;
+    if ( $error ) {
+      die "can't insert domain $domain: $error\n";
+    }
+  }
+
+  $password = $crypt if $password eq '*CRYPTED*';
+
+  $finger =~ s/Outdoor Power.*$/Outdoor Power/;
+
+  my $svc_acct = new FS::svc_acct {
+    'svcpart'   => $mailbox_svcpart,
+    'username'  => $username,
+    'domsvc'    => $svc_domain->svcnum,
+    '_password' => $password,
+    'finger'    => $finger,
+  };
+
+  my $error = $svc_acct->insert;
+  #my $error = $svc_acct->check;
+  if ( $error ) {
+    if ( $error =~ /duplicate/i ) {
+      warn "$r_username / $r_domain: $error";
+    } else {
+      die "$r_username / $r_domain: $error";
+    }
+  }
+
+}
+
+sub usage {
+  die "Usage:\n\n  postfix_courierimap.import user\n";
+}
+
+
-- 
cgit v1.2.1


From 8129c04d556355377faf90a6207acbac5f9bb805 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 May 2004 23:26:06 +0000
Subject: adding password/finger correction tool too

---
 bin/sqlradius.reimport | 156 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 156 insertions(+)
 create mode 100755 bin/sqlradius.reimport

diff --git a/bin/sqlradius.reimport b/bin/sqlradius.reimport
new file mode 100755
index 000000000..89eb8018b
--- /dev/null
+++ b/bin/sqlradius.reimport
@@ -0,0 +1,156 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use vars qw(%part_svc %domain_part_svc);
+#use Date::Parse;
+use DBI;
+use Term::Query qw(query);
+use FS::UID qw(adminsuidsetup); #datasrc
+use FS::Record qw(qsearch qsearchs);
+use FS::svc_acct;
+use FS::part_svc;
+use FS::svc_domain;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+#push @FS::svc_acct::shells, qw(/bin/sync /sbin/shutdown /bin/halt /sbin/halt); #others?
+
+$FS::svc_Common::noexport_hack = 1;
+$FS::svc_domain::whois_hack = 1;
+
+###
+
+%part_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_acct'});
+
+die "No services with svcdb svc_acct!\n" unless %part_svc;
+
+print "\n\n", &menu_svc, "\n", <<END;
+Enter part number to import.
+END
+my $sqlradius_svcpart = &getpart;
+
+%domain_part_svc = map { $_->svcpart, $_ }
+                       qsearch('part_svc', { 'svcdb' => 'svc_domain'} );
+
+die "No services with svcdb svc_domain!\n" unless %domain_part_svc;
+
+print "\n\n", &menu_domain_svc, "\n", <<END;
+Enter part number for domains.
+END
+my $domain_svcpart = &getdomainpart;
+
+my $datasrc = &getvalue("\n\nEnter the DBI datasource:");
+my $db_user = &getvalue("\n\nEnter the database user:");
+my $db_pass = &getvalue("\n\nEnter the database password:");
+
+sub menu_svc {
+  ( join "\n", map "$_: ".$part_svc{$_}->svc, sort keys %part_svc ). "\n";
+}
+sub menu_domain_svc {
+  ( join "\n", map "$_: ".$domain_part_svc{$_}->svc, sort keys %domain_part_svc ). "\n";
+}
+sub getpart {
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query "Enter part number:", 'irk', [ keys %part_svc ];
+  $^W=1;
+  $return;
+}
+sub getdomainpart {
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query "Enter part number:", 'irk', [ keys %domain_part_svc ];
+  $^W=1;
+  $return;
+}
+sub getvalue {
+  my $prompt = shift;
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query $prompt, '';
+  $^W=1;
+  $return;
+}
+
+print "\n\n";
+
+###
+
+my $dbh = DBI->connect( $datasrc, $db_user, $db_pass )
+  or die $DBI::errstr;
+
+my $sth = $dbh->prepare('SELECT DISTINCT UserName, Realm FROM radcheck')
+  or die $dbh->errstr;
+$sth->execute or die $sth->errstr;
+
+my $row;
+while ( defined ( $row = $sth->fetchrow_arrayref ) ) {
+  my( $r_username, $realm ) = @$row;
+
+  my( $username, $domain );
+  if ( $r_username =~ /^([^@]+)\@([^@]+)$/ ) {
+    $username = $1;
+    $domain = $2;
+  } else {
+    $username = $r_username;
+    $domain = $realm;
+  }
+  my $svc_domain = qsearchs('svc_domain', { 'domain'  => $domain } )
+                   || new FS::svc_domain {
+                                           'domain'  => $domain,
+                                           'svcpart' => $domain_svcpart,
+                                           'action'  => 'N',
+                                         };
+  unless ( $svc_domain->svcnum ) {
+    die "new domain?  wtf";
+    my $error = $svc_domain->insert;
+    if ( $error ) {
+      die "can't insert domain $domain: $error\n";
+    }
+  }
+
+  my( $password, $finger, $group ) = ( '', '', '' );
+
+  my $rc_sth = $dbh->prepare(
+    'SELECT Attribute, Value, Name, GroupName'.
+    '  FROM radcheck'.
+    '  WHERE UserName = ? and Realm = ?'
+  ) or die $dbh->errstr;
+  $rc_sth->execute($r_username, $realm) or die $rc_sth->errstr;
+
+  foreach my $rc_row ( @{$rc_sth->fetchall_arrayref} ) {
+    my($attribute, $value, $name, $groupname) = @$rc_row;
+    if ( $attribute =~ /^(Crypt-)?Password$/ ) {
+      $password = $value;
+      $finger = $name;
+      $group = $groupname;
+    } else {
+      #handle other params!
+    }
+  }
+
+  my @svc_acct = grep { $_->cust_svc->svcpart == $sqlradius_svcpart } 
+                 qsearch('svc_acct', { 'username' => $username,
+                                       'domsvc'   => $svc_domain->svcnum, } );
+
+  print "$r_username / $realm: $password / $finger: ";
+  if ( scalar(@svc_acct) == 0 ) {
+    print "not found\n";
+    next;
+  } elsif ( scalar(@svc_acct) > 1 ) {
+    print "multiple matches found?!?!\n";
+    next;
+  } else {
+    print "correcting password and name\n";
+  }
+
+  my $svc_acct = $svc_acct[0];
+  my $new = new FS::svc_acct { $svc_acct->hash, '_password' => $password, 'finger' => $finger };
+  my $error = $new->replace($svc_acct);
+  #my $error = $new->check;
+  die "$r_username / $realm: $error" if $error;
+
+}
+
+sub usage {
+  die "Usage:\n\n  sqlradius.import user\n";
+}
+
-- 
cgit v1.2.1


From 8c2e4991efc7c0f51d9faf167bf88610e6ae9f46 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 1 Jun 2004 01:49:43 +0000
Subject: typo in error message

---
 FS/FS/cust_bill.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 3b76dd257..1f4d85b41 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1148,7 +1148,7 @@ sub print_ps {
     or die "pslatex $file.tex failed: $!";
 
   system('dvips', '-q', '-t', 'letter', "$file.dvi", '-o', "$file.ps" ) == 0
-    or die "dbips failed: $!";
+    or die "dvips failed: $!";
 
   open(POSTSCRIPT, "<$file.ps")
     or die "can't open $file.ps: $! (error in LaTeX template?)\n";
-- 
cgit v1.2.1


From f492eacdbeb2767aa3ca4390d5c8c753b4573ae2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 1 Jun 2004 09:23:06 +0000
Subject: typo in sql

---
 bin/postfix_courierimap.import | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/postfix_courierimap.import b/bin/postfix_courierimap.import
index ea7336794..12c138b49 100755
--- a/bin/postfix_courierimap.import
+++ b/bin/postfix_courierimap.import
@@ -77,7 +77,7 @@ print "\n\n";
 my $dbh = DBI->connect( $datasrc, $db_user, $db_pass )
   or die $DBI::errstr;
 
-my $sth = $dbh->prepare('SELECT username, password, crypt name, domain FROM mailbox')
+my $sth = $dbh->prepare('SELECT username, password, crypt, name, domain FROM mailbox')
   or die $dbh->errstr;
 $sth->execute or die $sth->errstr;
 
-- 
cgit v1.2.1


From fc0e102e2e843e991f919eba9aba3429c4602ccf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 1 Jun 2004 10:53:10 +0000
Subject: per-agent invoice_from addresses

---
 FS/FS/cust_bill.pm                  | 9 ++++++---
 httemplate/edit/part_bill_event.cgi | 6 +++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 1f4d85b41..d0583b2ef 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -317,7 +317,7 @@ sub owed {
   $balance;
 }
 
-=item send [ TEMPLATENAME [ , AGENTNUM ] ]
+=item send [ TEMPLATENAME [ , AGENTNUM [ , INVOICE_FROM ] ] ]
 
 Sends this invoice to the destinations configured for this customer: send
 emails or print.  See L<FS::cust_main_invoice>.
@@ -327,12 +327,15 @@ TEMPLATENAME, if specified, is the name of a suffix for alternate invoices.
 AGENTNUM, if specified, means that this invoice will only be sent for customers
 of the specified agent.
 
+INVOICE_FROM, if specified, overrides the default email invoice From: address.
+
 =cut
 
 sub send {
   my $self = shift;
   my $template = scalar(@_) ? shift : '';
   return '' if scalar(@_) && $_[0] && $self->cust_main->agentnum ne shift;
+  my $invoice_from = scalar(@_) ? shift : $conf->config('invoice_from');
 
   my @print_text = $self->print_text('', $template);
   my @invoicing_list = $self->cust_main->invoicing_list;
@@ -340,10 +343,10 @@ sub send {
   if ( grep { $_ ne 'POST' } @invoicing_list or !@invoicing_list  ) { #email
 
     #better to notify this person than silence
-    @invoicing_list = ($conf->config('invoice_from')) unless @invoicing_list;
+    @invoicing_list = ($invoice_from) unless @invoicing_list;
 
     my $error = send_email(
-      'from'    => $conf->config('invoice_from'),
+      'from'    => $invoice_from,
       'to'      => [ grep { $_ ne 'POST' } @invoicing_list ],
       'subject' => 'Invoice',
       'body'    => \@print_text,
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index d0fa973bf..3985eaf57 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -179,7 +179,7 @@ tie my %events, 'Tie::IxHash',
 
   'send_agent' => {
     'name' => 'Send invoice (email/print) ',
-    'code' => '$cust_bill->send(\'%%%agent_templatename%%%\', %%%agentnum%%%);',
+    'code' => '$cust_bill->send(\'%%%agent_templatename%%%\', %%%agentnum%%%, \'%%%agent_invoice_from%%%\');',
     'html' => sub {
         '<TABLE BORDER=0>
           <TR>
@@ -191,6 +191,10 @@ tie my %events, 'Tie::IxHash',
             <TD>
               <INPUT TYPE="text" NAME="agent_templatename" VALUE="%%%agent_templatename%%%">
             </TD>
+            <TD ALIGN="right">email From: </TD>
+            <TD>
+              <INPUT TYPE="text" NAME="agent_invoice_from" VALUE="%%%agent_invoice_from%%%">
+            </TD>
           </TR>
         </TABLE>';
     },
-- 
cgit v1.2.1


From 31f55d8223d14807ce7648657502552f69dc9ad4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 1 Jun 2004 10:56:26 +0000
Subject: html table fix

---
 httemplate/edit/part_bill_event.cgi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 3985eaf57..2f99ca58f 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -191,6 +191,8 @@ tie my %events, 'Tie::IxHash',
             <TD>
               <INPUT TYPE="text" NAME="agent_templatename" VALUE="%%%agent_templatename%%%">
             </TD>
+          </TR>
+          <TR>
             <TD ALIGN="right">email From: </TD>
             <TD>
               <INPUT TYPE="text" NAME="agent_invoice_from" VALUE="%%%agent_invoice_from%%%">
-- 
cgit v1.2.1


From 7bcf2e6107458e1e784cda9500c007af32bb5505 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 2 Jun 2004 21:27:04 +0000
Subject: simple kludge for testing

---
 fs_selfservice/DEPLOY | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/fs_selfservice/DEPLOY b/fs_selfservice/DEPLOY
index 4aef4cfa4..7420df778 100755
--- a/fs_selfservice/DEPLOY
+++ b/fs_selfservice/DEPLOY
@@ -8,6 +8,13 @@ cd FS-SelfService
 perl Makefile.PL && make && make install
 
 cp /home/ivan/freeside/fs_selfservice/FS-SelfService/cgi/* /var/www/MyAccount
-chown freeside /var/www/MyAccount/selfservice.cgi
-chmod 755 /var/www/MyAccount/selfservice.cgi
+chown freeside /var/www/MyAccount/selfservice.cgi /var/www/MyAccount/agent.cgi
+chmod 755 /var/www/MyAccount/selfservice.cgi /var/www/MyAccount/agent.cgi
 ln -s /var/www/MyAccount/selfservice.cgi /var/www/MyAccount/index.cgi || true
+
+cp /home/ivan/freeside/fs_signup/FS-SignupClient/cgi/* /var/www/signup/
+#mv /var/www/signup/signup-snarf.html /var/www/signup/signup.html #!!!!!
+chown freeside /var/www/signup/signup.cgi
+chmod 755 /var/www/signup/signup.cgi
+ln -s /var/www/signup/signup.cgi /var/www/signup/index.cgi || true
+
-- 
cgit v1.2.1


From 79c0fbbfc4cb61fc948b8517bc204b9d7ec01104 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 3 Jun 2004 07:00:01 +0000
Subject: better error message for non-applicable invoice events

---
 FS/FS/cust_bill.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index d0583b2ef..72852d1f1 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -334,7 +334,7 @@ INVOICE_FROM, if specified, overrides the default email invoice From: address.
 sub send {
   my $self = shift;
   my $template = scalar(@_) ? shift : '';
-  return '' if scalar(@_) && $_[0] && $self->cust_main->agentnum ne shift;
+  return 'N/A' if scalar(@_) && $_[0] && $self->cust_main->agentnum != shift;
   my $invoice_from = scalar(@_) ? shift : $conf->config('invoice_from');
 
   my @print_text = $self->print_text('', $template);
-- 
cgit v1.2.1


From 11118ad24d23047a6f30b80532d418b84c81e4c5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 3 Jun 2004 09:55:58 +0000
Subject: fix agent-specific template on "invoice view" screen and
 "re-email/re-print" links, also fix agent-specific From: address on
 "re-email" link

---
 FS/FS/cust_bill.pm | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 72852d1f1..49d53bc26 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -335,7 +335,10 @@ sub send {
   my $self = shift;
   my $template = scalar(@_) ? shift : '';
   return 'N/A' if scalar(@_) && $_[0] && $self->cust_main->agentnum != shift;
-  my $invoice_from = scalar(@_) ? shift : $conf->config('invoice_from');
+  my $invoice_from =
+    scalar(@_)
+      ? shift
+      : ( $self->_agent_invoice_from || $conf->config('invoice_from') );
 
   my @print_text = $self->print_text('', $template);
   my @invoicing_list = $self->cust_main->invoicing_list;
@@ -668,13 +671,26 @@ sub batch_card {
 
 sub _agent_template {
   my $self = shift;
+  $self->_agent_plandata('agent_templatename');
+}
+
+sub _agent_invoice_from {
+  my $self = shift;
+  $self->_agent_plandata('agent_invoice_from');
+}
+
+sub _agent_plandata {
+  my( $self, $option ) = @_;
 
   my $cust_bill_event = qsearchs( 'part_bill_event',
     {
       'payby'     => $self->cust_main->payby,
       'plan'      => 'send_agent',
-      'eventcode' => { 'op'    => 'LIKE',
-                       'value' => '_%, '. $self->cust_main->agentnum. ');' },
+      'plandata'  => { 'op'    => '~',
+                       'value' => "(^|\n)agentnum ".
+                                  $self->cust_main->agentnum.
+                                  "(\n|\$)",
+                     },
     },
     '',
     'ORDER BY seconds LIMIT 1'
@@ -682,10 +698,10 @@ sub _agent_template {
 
   return '' unless $cust_bill_event;
 
-  if ( $cust_bill_event->eventcode =~ /\(\s*'(.*)'\s*,\s*(\d+)\s*\)\;$/ ) {
+  if ( $cust_bill_event->plandata =~ /^$option (.*)$/m ) {
     return $1;
   } else {
-    warn "can't parse eventcode for agent-specific invoice template";
+    warn "can't parse plandata for $1";
     return '';
   }
 
-- 
cgit v1.2.1


From 1cd72a6f1bd5ca39410f525779f5ca4ee9228a1c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 3 Jun 2004 10:09:08 +0000
Subject: also fix agent-specific From: address on "re-email" link

---
 httemplate/misc/email-invoice.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/misc/email-invoice.cgi b/httemplate/misc/email-invoice.cgi
index 7ab1613ee..a560a1838 100755
--- a/httemplate/misc/email-invoice.cgi
+++ b/httemplate/misc/email-invoice.cgi
@@ -10,7 +10,7 @@ my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Can't find invoice!\n" unless $cust_bill;
 
 my $error = send_email(
-  'from'    => $conf->config('invoice_from'),
+  'from'    => $cust_bill->_agent_invoice_from || $conf->config('invoice_from'),
   'to'      => [ grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ],
   'subject' => 'Invoice',
   'body'    => [ $cust_bill->print_text ],
-- 
cgit v1.2.1


From ef10539fa94bf35ef913bab50030a7f9242c2f9e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 5 Jun 2004 03:00:17 +0000
Subject: self-service installer?

---
 Makefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ffbd67afc..f469d5fe8 100644
--- a/Makefile
+++ b/Makefile
@@ -57,9 +57,13 @@ QUEUED_USER=fs_queue
 FREESIDE_PATH = `pwd`
 
 SELFSERVICE_USER = fs_selfservice
-SELFSERVICE_MACHINES = localhost
+# SELFSERVICE_MACHINES = www.example.com
 # SELFSERVICE_MACHINES = web1.example.com web2.example.com
 
+#user with sudo access on SELFSERVICE_MACHINES for automated self-service
+#installation.
+SELFSERVICE_INSTALL_USER = ivan
+
 RT_ENABLED = 0
 #RT_ENABLED = 1
 RT_DOMAIN = example.com
@@ -165,6 +169,12 @@ install-init:
 	  s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\
 	" ${INIT_FILE}
 
+install-selfservice:
+	for MACHINE in ${SELFSERVICE_MACHINES}; do \
+	  scp -r fs_selfservice/FS-SelfService ${SELFSERVICE_INSTALL_USER}@\$MACHINE:.
+	  ssh ${SELFSERVICE_INSTALL_USER}@\$MACHINE "cd FS-SelfService; perl Makefile.PL && make"
+	  ssh ${SELFSERVICE_INSTALL_USER}@\$MACHINE "cd FS-SelfService; sudo make install"
+
 install: install-perl-modules install-docs install-init install-rt
 
 deploy: install
-- 
cgit v1.2.1


From e7b84aa262d4390d8abdb943c2ae084fa44e5538 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 5 Jun 2004 09:34:49 +0000
Subject: sqlradius import updates

---
 bin/sqlradius-norealm.reimport | 113 +++++++++++++++++++++++++++++++++++++++++
 bin/sqlradius.import           |   2 +-
 bin/sqlradius.reimport         |  18 ++++---
 3 files changed, 125 insertions(+), 8 deletions(-)
 create mode 100755 bin/sqlradius-norealm.reimport

diff --git a/bin/sqlradius-norealm.reimport b/bin/sqlradius-norealm.reimport
new file mode 100755
index 000000000..b7d016609
--- /dev/null
+++ b/bin/sqlradius-norealm.reimport
@@ -0,0 +1,113 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use vars qw(%part_svc);
+#use Date::Parse;
+use DBI;
+use Term::Query qw(query);
+use FS::UID qw(adminsuidsetup); #datasrc
+use FS::Record qw(qsearch qsearchs);
+use FS::svc_acct;
+use FS::part_svc;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+#push @FS::svc_acct::shells, qw(/bin/sync /sbin/shutdown /bin/halt /sbin/halt); #others?
+
+$FS::svc_Common::noexport_hack = 1;
+
+###
+
+%part_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_acct'});
+
+die "No services with svcdb svc_acct!\n" unless %part_svc;
+
+print "\n\n", &menu_svc, "\n", <<END;
+Enter part number to import.
+END
+my $sqlradius_svcpart = &getpart;
+
+my $datasrc = &getvalue("\n\nEnter the DBI datasource:");
+my $db_user = &getvalue("\n\nEnter the database user:");
+my $db_pass = &getvalue("\n\nEnter the database password:");
+
+sub menu_svc {
+  ( join "\n", map "$_: ".$part_svc{$_}->svc, sort keys %part_svc ). "\n";
+}
+sub getpart {
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query "Enter part number:", 'irk', [ keys %part_svc ];
+  $^W=1;
+  $return;
+}
+sub getvalue {
+  my $prompt = shift;
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query $prompt, '';
+  $^W=1;
+  $return;
+}
+
+print "\n\n";
+
+###
+
+my $dbh = DBI->connect( $datasrc, $db_user, $db_pass )
+  or die $DBI::errstr;
+
+my $sth = $dbh->prepare('SELECT DISTINCT UserName FROM radcheck')
+  or die $dbh->errstr;
+$sth->execute or die $sth->errstr;
+
+my $row;
+while ( defined ( $row = $sth->fetchrow_arrayref ) ) {
+  my( $username ) = @$row;
+
+  my( $password, $group ) = ( '', '', '' );
+
+  my $rc_sth = $dbh->prepare(
+    'SELECT Attribute, Value'.
+    '  FROM radcheck'.
+    '  WHERE UserName = ?'
+  ) or die $dbh->errstr;
+  $rc_sth->execute($username) or die $rc_sth->errstr;
+
+  foreach my $rc_row ( @{$rc_sth->fetchall_arrayref} ) {
+    my($attribute, $value) = @$rc_row;
+    if ( $attribute =~ /^((Crypt|User)-)?Password$/ ) {
+      $password = $value unless $password && !$1;
+    } else {
+      #handle other params!
+    }
+  }
+
+  my @svc_acct = grep { $_->cust_svc->svcpart == $sqlradius_svcpart } 
+                 qsearch('svc_acct', { 'username' => $username, } );
+
+  #print "$r_username / $realm: $password / $finger: ";
+  print "$username: $password: ";
+  if ( scalar(@svc_acct) == 0 ) {
+    print "not found\n";
+    next;
+  } elsif ( scalar(@svc_acct) > 1 ) {
+    print "multiple matches found?!?!\n";
+    next;
+  } else {
+    #print "correcting password and name\n";
+    print "correcting password\n";
+  }
+
+  my $svc_acct = $svc_acct[0];
+  #my $new = new FS::svc_acct { $svc_acct->hash, '_password' => $password, 'finger' => $finger };
+  my $new = new FS::svc_acct { $svc_acct->hash, '_password' => $password };
+  my $error = $new->replace($svc_acct);
+  #my $error = $new->check;
+  die "$username: $error" if $error;
+
+}
+
+sub usage {
+  die "Usage:\n\n  sqlradius-norealm.reimport user\n";
+}
+
diff --git a/bin/sqlradius.import b/bin/sqlradius.import
index 587d828e4..e8b63949c 100644
--- a/bin/sqlradius.import
+++ b/bin/sqlradius.import
@@ -117,7 +117,7 @@ while ( defined ( $row = $sth->fetchrow_arrayref ) ) {
 
   foreach my $rc_row ( @{$rc_sth->fetchall_arrayref} ) {
     my($attribute, $value, $name, $groupname) = @$row;
-    if ( $attribute =~ /^(Crypt-)?Password$/ ) {
+    if ( $attribute =~ /^((User|Crypt)-)?Password$/ ) {
       $password = $value;
       $finger = $name;
       $group = $groupname;
diff --git a/bin/sqlradius.reimport b/bin/sqlradius.reimport
index 89eb8018b..2218a3f13 100755
--- a/bin/sqlradius.reimport
+++ b/bin/sqlradius.reimport
@@ -107,7 +107,8 @@ while ( defined ( $row = $sth->fetchrow_arrayref ) ) {
     }
   }
 
-  my( $password, $finger, $group ) = ( '', '', '' );
+  #my( $password, $finger, $group ) = ( '', '', '' );
+  my( $password, $group ) = ( '', '', '' );
 
   my $rc_sth = $dbh->prepare(
     'SELECT Attribute, Value, Name, GroupName'.
@@ -118,9 +119,9 @@ while ( defined ( $row = $sth->fetchrow_arrayref ) ) {
 
   foreach my $rc_row ( @{$rc_sth->fetchall_arrayref} ) {
     my($attribute, $value, $name, $groupname) = @$rc_row;
-    if ( $attribute =~ /^(Crypt-)?Password$/ ) {
+    if ( $attribute =~ /^((Crypt|User)-)?Password$/ ) {
       $password = $value;
-      $finger = $name;
+      #$finger = $name;
       $group = $groupname;
     } else {
       #handle other params!
@@ -131,7 +132,8 @@ while ( defined ( $row = $sth->fetchrow_arrayref ) ) {
                  qsearch('svc_acct', { 'username' => $username,
                                        'domsvc'   => $svc_domain->svcnum, } );
 
-  print "$r_username / $realm: $password / $finger: ";
+  #print "$r_username / $realm: $password / $finger: ";
+  print "$r_username / $realm: $password: ";
   if ( scalar(@svc_acct) == 0 ) {
     print "not found\n";
     next;
@@ -139,11 +141,13 @@ while ( defined ( $row = $sth->fetchrow_arrayref ) ) {
     print "multiple matches found?!?!\n";
     next;
   } else {
-    print "correcting password and name\n";
+    #print "correcting password and name\n";
+    print "correcting password\n";
   }
 
   my $svc_acct = $svc_acct[0];
-  my $new = new FS::svc_acct { $svc_acct->hash, '_password' => $password, 'finger' => $finger };
+  #my $new = new FS::svc_acct { $svc_acct->hash, '_password' => $password, 'finger' => $finger };
+  my $new = new FS::svc_acct { $svc_acct->hash, '_password' => $password };
   my $error = $new->replace($svc_acct);
   #my $error = $new->check;
   die "$r_username / $realm: $error" if $error;
@@ -151,6 +155,6 @@ while ( defined ( $row = $sth->fetchrow_arrayref ) ) {
 }
 
 sub usage {
-  die "Usage:\n\n  sqlradius.import user\n";
+  die "Usage:\n\n  sqlradius.reimport user\n";
 }
 
-- 
cgit v1.2.1


From ab151ccd8108e6a4bc24076e6a1cd3899a817e6b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 5 Jun 2004 11:34:25 +0000
Subject: automated self-service lib install

---
 Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index f469d5fe8..b1ad0118a 100644
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,8 @@ SELFSERVICE_USER = fs_selfservice
 #user with sudo access on SELFSERVICE_MACHINES for automated self-service
 #installation.
 SELFSERVICE_INSTALL_USER = ivan
+SELFSERVICE_INSTALL_USERADD = useradd
+#SELFSERVICE_INSTALL_USERADD = "pw useradd"
 
 RT_ENABLED = 0
 #RT_ENABLED = 1
@@ -170,10 +172,13 @@ install-init:
 	" ${INIT_FILE}
 
 install-selfservice:
+	[ -e ~freeside/.ssh/id_dsa.pub ] || su -c 'ssh-keygen -t dsa' - freeside
 	for MACHINE in ${SELFSERVICE_MACHINES}; do \
-	  scp -r fs_selfservice/FS-SelfService ${SELFSERVICE_INSTALL_USER}@\$MACHINE:.
-	  ssh ${SELFSERVICE_INSTALL_USER}@\$MACHINE "cd FS-SelfService; perl Makefile.PL && make"
-	  ssh ${SELFSERVICE_INSTALL_USER}@\$MACHINE "cd FS-SelfService; sudo make install"
+	  scp -r fs_selfservice/FS-SelfService ${SELFSERVICE_INSTALL_USER}@$$MACHINE:.
+	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make"
+	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install"
+	  scp ~freeside/.ssh/id_dsa.pub ${SELFSERVICE_INSTALL_USER}@$$MACHINE:.
+	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo $SELFSERVICE_INSTALL_USERADD freeside; sudo install -D -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys"
 
 install: install-perl-modules install-docs install-init install-rt
 
-- 
cgit v1.2.1


From b7886437ea53a9984c59832a0194fa7e31aa0895 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 5 Jun 2004 11:37:23 +0000
Subject: oops fix line endings in automated self-service lib install

---
 Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index b1ad0118a..3b0035268 100644
--- a/Makefile
+++ b/Makefile
@@ -174,11 +174,12 @@ install-init:
 install-selfservice:
 	[ -e ~freeside/.ssh/id_dsa.pub ] || su -c 'ssh-keygen -t dsa' - freeside
 	for MACHINE in ${SELFSERVICE_MACHINES}; do \
-	  scp -r fs_selfservice/FS-SelfService ${SELFSERVICE_INSTALL_USER}@$$MACHINE:.
-	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make"
-	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install"
-	  scp ~freeside/.ssh/id_dsa.pub ${SELFSERVICE_INSTALL_USER}@$$MACHINE:.
-	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo $SELFSERVICE_INSTALL_USERADD freeside; sudo install -D -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys"
+	  scp -r fs_selfservice/FS-SelfService ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\
+	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\
+	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
+	  scp ~freeside/.ssh/id_dsa.pub ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\
+	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo $SELFSERVICE_INSTALL_USERADD freeside; sudo install -D -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\
+	done
 
 install: install-perl-modules install-docs install-init install-rt
 
-- 
cgit v1.2.1


From 2adf848ec4e42200382ce0f028a31cefa98c3c39 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 5 Jun 2004 11:47:39 +0000
Subject: fix path and make var substitution

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3b0035268..c9e920ba5 100644
--- a/Makefile
+++ b/Makefile
@@ -63,8 +63,8 @@ SELFSERVICE_USER = fs_selfservice
 #user with sudo access on SELFSERVICE_MACHINES for automated self-service
 #installation.
 SELFSERVICE_INSTALL_USER = ivan
-SELFSERVICE_INSTALL_USERADD = useradd
-#SELFSERVICE_INSTALL_USERADD = "pw useradd"
+SELFSERVICE_INSTALL_USERADD = /usr/sbin/useradd
+#SELFSERVICE_INSTALL_USERADD = "/usr/sbin/pw useradd"
 
 RT_ENABLED = 0
 #RT_ENABLED = 1
@@ -178,7 +178,7 @@ install-selfservice:
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
 	  scp ~freeside/.ssh/id_dsa.pub ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\
-	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo $SELFSERVICE_INSTALL_USERADD freeside; sudo install -D -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\
+	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -D -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\
 	done
 
 install: install-perl-modules install-docs install-init install-rt
-- 
cgit v1.2.1


From 9c26c7d65fd383ce523f476c3c6cf849bcfb8c42 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 5 Jun 2004 11:55:45 +0000
Subject: and don't forget to make the dir

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index c9e920ba5..35b3ebc96 100644
--- a/Makefile
+++ b/Makefile
@@ -179,6 +179,7 @@ install-selfservice:
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
 	  scp ~freeside/.ssh/id_dsa.pub ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -D -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\
+	   ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo install -d /usr/local/freeside" ;\
 	done
 
 install: install-perl-modules install-docs install-init install-rt
-- 
cgit v1.2.1


From 86dfd386746913dd29db7c03873bc68534f66b98 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 5 Jun 2004 12:01:47 +0000
Subject: AND set its owner.  whew.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 35b3ebc96..5a05cc49f 100644
--- a/Makefile
+++ b/Makefile
@@ -179,7 +179,7 @@ install-selfservice:
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
 	  scp ~freeside/.ssh/id_dsa.pub ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -D -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\
-	   ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo install -d /usr/local/freeside" ;\
+	   ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo install -o freeside -d /usr/local/freeside" ;\
 	done
 
 install: install-perl-modules install-docs install-init install-rt
-- 
cgit v1.2.1


From 2a7c870a444759b248b273483bf50a433ed8c490 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Jun 2004 07:17:30 +0000
Subject: explicitly specify Apache httpd.conf.  fear.

---
 httemplate/docs/install.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 9da2de37f..df353eb9d 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -128,7 +128,7 @@ chown&nbsp;freeside&nbsp;/usr/local/etc/freeside/asp-global/
 <font size="-1"><pre>
 cp&nbsp;htetc/global.asa&nbsp;/usr/local/etc/freeside/asp-global/global.asa
 </pre></font>
-      <li>Configure Apache for the Global directory and to execute .cgi files using Apache::ASP.  For example:
+      <li>Configure Apache for the Global directory and to execute .cgi files using Apache::ASP.  For example, add something like the following to your Apache httpd.conf file, adjusting for your actual paths:
 <font size="-1"><pre>
 PerlModule Apache::ASP
 # your freeside document root
@@ -158,7 +158,7 @@ PerlSetVar&nbsp;IncludesDir&nbsp;/usr/local/apache/htdocs/freeside-asp
         <li> set an appropriate <tt>data_dir</tt>, such as <tt>/usr/local/etc/freeside/masondata</tt>
       </ul>
 
-      <li>Configure Apache to use the <tt>handler.pl</tt> file and to execute .cgi files using HTML::Mason.  For example:
+      <li>Configure Apache to use the <tt>handler.pl</tt> file and to execute .cgi files using HTML::Mason.  For example, add something like the following to your Apache httpd.conf file, adjusting for your actual paths:
 <font size="-1"><pre>
 PerlModule HTML::Mason
 &lt;Directory&nbsp;/usr/local/apache/htdocs/freeside-mason&gt;
@@ -175,7 +175,7 @@ require&nbsp;"/usr/local/etc/freeside/handler.pl";
   </tr>
 </table>
 <ul>
-<li>Restrict access to this web interface - see the <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache documentation on user authentication</a>.    For example, to configure user authentication with <a href="http://httpd.apache.org/docs/mod/mod_auth.html">mod_auth</a> (flat files):
+<li>Restrict access to this web interface - see the <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache documentation on user authentication</a>.    For example, to configure user authentication with <a href="http://httpd.apache.org/docs/mod/mod_auth.html">mod_auth</a> (flat files), add something like the following to your Apache httpd.conf file, adjusting for your actual paths:
 <pre>
 &lt;Directory /usr/local/apache/htdocs/freeside-asp&gt;
 AuthName Freeside
-- 
cgit v1.2.1


From 50561b7c4648c21c4abe75758fc3e426d120ca88 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Jun 2004 08:59:02 +0000
Subject: need this entry for myself though!

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 5a05cc49f..35008887d 100644
--- a/Makefile
+++ b/Makefile
@@ -57,6 +57,8 @@ QUEUED_USER=fs_queue
 FREESIDE_PATH = `pwd`
 
 SELFSERVICE_USER = fs_selfservice
+#never run on the same machine in production!!!
+SELFSERVICE_MACHINES = localhost
 # SELFSERVICE_MACHINES = www.example.com
 # SELFSERVICE_MACHINES = web1.example.com web2.example.com
 
-- 
cgit v1.2.1


From e0c62c388f74e543328f3691e8a8a1edb451a804 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 10 Jun 2004 11:28:19 +0000
Subject: tyop

---
 httemplate/search/cust_main-otaker.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/cust_main-otaker.cgi b/httemplate/search/cust_main-otaker.cgi
index b7173c49c..68569f085 100755
--- a/httemplate/search/cust_main-otaker.cgi
+++ b/httemplate/search/cust_main-otaker.cgi
@@ -11,7 +11,7 @@
       Search for <B>Order taker</B>: 
       <INPUT TYPE="hidden" NAME="otaker_on" VALUE="TRUE">
       <% my $dbh = dbh;
-         my $sth = dbh->prepare("SELECT DISTINCT otaker FROM cust_main")
+         my $sth = $dbh->prepare("SELECT DISTINCT otaker FROM cust_main")
            or eidiot $dbh->errstr;
          $sth->execute() or eidiot $sth->errstr;
 #         my @otakers = map { $_->[0] } @{$sth->selectall_arrayref};
-- 
cgit v1.2.1


From 3913f6d159b5b8110061690b7c97642c27abf7eb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 10 Jun 2004 12:31:32 +0000
Subject: agent interface

---
 FS/FS/CGI.pm                                       |  33 ++
 FS/FS/ClientAPI/Agent.pm                           | 113 ++++++
 FS/FS/ClientAPI/MyAccount.pm                       |  79 +++-
 FS/FS/ClientAPI/Signup.pm                          |  64 ++-
 FS/FS/agent.pm                                     | 104 ++++-
 FS/FS/cust_main.pm                                 | 130 ++++++
 fs_selfservice/FS-SelfService/SelfService.pm       | 446 ++++++++++++++++++++-
 fs_selfservice/FS-SelfService/cgi/agent.cgi        | 256 ++++++++++++
 fs_selfservice/FS-SelfService/cgi/agent_login.html |  22 +
 fs_selfservice/FS-SelfService/cgi/agent_main.html  |  40 ++
 fs_selfservice/FS-SelfService/cgi/cvv2.html        |  25 ++
 fs_selfservice/FS-SelfService/cgi/cvv2.png         | Bin 0 -> 3854 bytes
 fs_selfservice/FS-SelfService/cgi/cvv2_amex.png    | Bin 0 -> 4573 bytes
 .../FS-SelfService/cgi/list_customers.html         |  41 ++
 fs_selfservice/FS-SelfService/cgi/signup.html      | 233 +++++++++++
 .../FS-SelfService/cgi/view_customer.html          |  84 ++++
 fs_signup/FS-SignupClient/SignupClient.pm          |  52 ++-
 fs_signup/FS-SignupClient/cgi/signup.cgi           | 267 +-----------
 httemplate/browse/agent.cgi                        |  28 +-
 httemplate/search/cust_main.cgi                    | 111 ++---
 20 files changed, 1720 insertions(+), 408 deletions(-)
 create mode 100644 FS/FS/ClientAPI/Agent.pm
 create mode 100644 fs_selfservice/FS-SelfService/cgi/agent.cgi
 create mode 100644 fs_selfservice/FS-SelfService/cgi/agent_login.html
 create mode 100644 fs_selfservice/FS-SelfService/cgi/agent_main.html
 create mode 100644 fs_selfservice/FS-SelfService/cgi/cvv2.html
 create mode 100644 fs_selfservice/FS-SelfService/cgi/cvv2.png
 create mode 100644 fs_selfservice/FS-SelfService/cgi/cvv2_amex.png
 create mode 100644 fs_selfservice/FS-SelfService/cgi/list_customers.html
 create mode 100755 fs_selfservice/FS-SelfService/cgi/signup.html
 create mode 100644 fs_selfservice/FS-SelfService/cgi/view_customer.html

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index a3286299b..1ddc62c7a 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -294,6 +294,8 @@ sub small_custview {
     or die "unknown custnum $arg";
 
   my $html = 'Customer #<B>'. $cust_main->custnum. '</B>'.
+    ' - <B><FONT COLOR="'. $cust_main->statuscolor. '">'.
+    ucfirst($cust_main->status). '</FONT></B>'.
     ntable('#e8e8e8'). '<TR><TD>'. ntable("#cccccc",2).
     '<TR><TD ALIGN="right" VALIGN="top">Billing<BR>Address</TD><TD BGCOLOR="#ffffff">'.
     $cust_main->getfield('last'). ', '. $cust_main->first. '<BR>';
@@ -305,6 +307,20 @@ sub small_custview {
   $html .= $cust_main->country. '<BR>'
     if $cust_main->country && $cust_main->country ne $countrydefault;
 
+  $html .= '</TD></TR><TR><TD></TD><TD BGCOLOR="#ffffff">';
+  if ( $cust_main->daytime && $cust_main->night ) {
+    use FS::Msgcat;
+    $html .= ( FS::Msgcat::_gettext('daytime') || 'Day' ).
+             ' '. $cust_main->daytime.
+             '<BR>'. ( FS::Msgcat::_gettext('night') || 'Night' ).
+             ' '. $cust_main->night;
+  } elsif ( $cust_main->daytime || $cust_main->night ) {
+    $html .= $cust_main->daytime || $cust_main->night;
+  }
+  if ( $cust_main->fax ) {
+    $html .= '<BR>Fax '. $cust_main->fax;
+  }
+
   $html .= '</TD></TR></TABLE></TD>';
 
   if ( defined $cust_main->dbdef_table->column('ship_last') ) {
@@ -327,6 +343,23 @@ sub small_custview {
       if $cust_main->get("${pre}country")
          && $cust_main->get("${pre}country") ne $countrydefault;
 
+    $html .= '</TD></TR><TR><TD></TD><TD BGCOLOR="#ffffff">';
+
+    if ( $cust_main->get("${pre}daytime") && $cust_main->get("${pre}night") ) {
+      use FS::Msgcat;
+      $html .= ( FS::Msgcat::_gettext('daytime') || 'Day' ).
+               ' '. $cust_main->get("${pre}daytime").
+               '<BR>'. ( FS::Msgcat::_gettext('night') || 'Night' ).
+               ' '. $cust_main->get("${pre}night");
+    } elsif ( $cust_main->get("${pre}daytime")
+              || $cust_main->get("${pre}night") ) {
+      $html .= $cust_main->get("${pre}daytime")
+               || $cust_main->get("${pre}night");
+    }
+    if ( $cust_main->get("${pre}fax") ) {
+      $html .= '<BR>Fax '. $cust_main->get("${pre}fax");
+    }
+
     $html .= '</TD></TR></TABLE></TD>';
   }
 
diff --git a/FS/FS/ClientAPI/Agent.pm b/FS/FS/ClientAPI/Agent.pm
new file mode 100644
index 000000000..212faaa6b
--- /dev/null
+++ b/FS/FS/ClientAPI/Agent.pm
@@ -0,0 +1,113 @@
+package FS::ClientAPI::Agent;
+
+#some false laziness w/MyAccount
+
+use strict;
+use vars qw($cache);
+use Digest::MD5 qw(md5_hex);
+use Cache::SharedMemoryCache; #store in db?
+use FS::Record qw(qsearchs); # qsearch);
+use FS::agent;
+
+use FS::ClientAPI;
+FS::ClientAPI->register_handlers(
+  'Agent/agent_login'          => \&agent_login,
+  'Agent/agent_info'           => \&agent_info,
+  'Agent/agent_list_customers' => \&agent_list_customers,
+);
+
+#store in db?
+my $cache = new Cache::SharedMemoryCache( {
+   'namespace' => 'FS::ClientAPI::Agent',
+} );
+
+sub agent_login {
+  my $p = shift;
+
+  #don't allow a blank login to first unconfigured agent with no user/pass
+  return { error => 'Must specify your reseller username and password.' }
+    unless length($p->{'username'}) && length($p->{'password'});
+
+  my $agent = qsearchs( 'agent', {
+    'username'  => $p->{'username'},
+    '_password' => $p->{'password'},
+  } );
+
+  unless ( $agent ) { return { error => 'Incorrect password.' } }
+
+  my $session = { 
+    'agentnum' => $agent->agentnum,
+    'agent'    => $agent->agent,
+  };
+
+  my $session_id;
+  do {
+    $session_id = md5_hex(md5_hex(time(). {}. rand(). $$))
+  } until ( ! defined $cache->get($session_id) ); #just in case
+
+  $cache->set( $session_id, $session, '1 hour' );
+
+  { 'error'      => '',
+    'session_id' => $session_id,
+  };
+}
+
+sub agent_info {
+  my $p = shift;
+
+  my $session = $cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  #my %return;
+
+  my $agentnum = $session->{'agentnum'};
+
+  my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } )
+    or return { 'error' => "unknown agentnum $agentnum" };
+
+  { 'error'        => '',
+    'agentnum'     => $agentnum,
+    'agent'        => $agent->agent,
+    'num_prospect' => $agent->num_prospect_cust_main,
+    'num_active'   => $agent->num_active_cust_main,
+    'num_susp'     => $agent->num_susp_cust_main,
+    'num_cancel'   => $agent->num_cancel_cust_main,
+    #%return,
+  };
+
+}
+
+sub agent_list_customers {
+  my $p = shift;
+
+  my $session = $cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  #my %return;
+
+  my $agentnum = $session->{'agentnum'};
+
+  my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } )
+    or return { 'error' => "unknown agentnum $agentnum" };
+
+  my @cust_main = ();
+
+  warn $p->{'susp'};
+
+  push @cust_main,
+    map $agent->$_(), map $_.'_cust_main',
+      grep $p->{$_}, qw( prospect active susp cancel );
+
+  { customers => [ map {
+                         my $cust_main = $_;
+                         my $hashref = $cust_main->hashref;
+                         $hashref->{$_} = $cust_main->$_()
+                           foreach qw(name status statuscolor);
+                         delete $hashref->{$_} foreach qw( payinfo paycvv );
+                         $hashref;
+                   } @cust_main
+                 ],
+  }
+
+}
+
diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 77c1fc889..271d0c2cc 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -25,6 +25,7 @@ FS::ClientAPI->register_handlers(
   'MyAccount/customer_info'    => \&customer_info,
   'MyAccount/edit_info'        => \&edit_info,
   'MyAccount/invoice'          => \&invoice,
+  'MyAccount/list_invoices'    => \&list_invoices,
   'MyAccount/cancel'           => \&cancel,
   'MyAccount/payment_info'     => \&payment_info,
   'MyAccount/process_payment'  => \&process_payment,
@@ -86,16 +87,31 @@ sub login {
 
 sub customer_info {
   my $p = shift;
-  my $session = $cache->get($p->{'session_id'})
-    or return { 'error' => "Can't resume session" }; #better error message
-
-  my %return;
 
-  my $custnum = $session->{'custnum'};
+  my($session, $custnum, $context);
+  if ( $p->{'session_id'} ) {
+    $context = 'customer';
+    $session = $cache->get($p->{'session_id'})
+      or return { 'error' => "Can't resume session" }; #better error message
+    $custnum = $session->{'custnum'};
+  } elsif ( $p->{'agent_session_id'} ) {
+    $context = 'agent';
+    my $agent_cache = new Cache::SharedMemoryCache( {
+      'namespace' => 'FS::ClientAPI::Agent',
+    } );
+    $session = $agent_cache->get($p->{'agent_session_id'})
+      or return { 'error' => "Can't resume session" }; #better error message
+    $custnum = $p->{'custnum'};
+  } else {
+    return { 'error' => "Can't resume session" }; #better error message
+  }
 
+  my %return;
   if ( $custnum ) { #customer record
 
-    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+    my $search = { 'custnum' => $custnum };
+    $search->{'agentnum'} = $session->{'agentnum'} if $context eq 'agent';
+    my $cust_main = qsearchs('cust_main', $search )
       or return { 'error' => "unknown custnum $custnum" };
 
     $return{balance} = $cust_main->balance;
@@ -357,6 +373,27 @@ sub invoice {
 
 }
 
+sub list_invoices {
+  my $p = shift;
+  my $session = $cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  my $custnum = $session->{'custnum'};
+
+  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+    or return { 'error' => "unknown custnum $custnum" };
+
+  my @cust_bill = $cust_main->cust_bill;
+
+  return  { 'error'       => '',
+            'invoices'    =>  [ map { { 'invnum' => $_->invnum,
+                                        '_date'  => $_->_date,
+                                      }
+                                    } @cust_bill
+                              ]
+          };
+}
+
 sub cancel {
   my $p = shift;
   my $session = $cache->get($p->{'session_id'})
@@ -391,12 +428,30 @@ sub list_pkgs {
 
 sub order_pkg {
   my $p = shift;
-  my $session = $cache->get($p->{'session_id'})
-    or return { 'error' => "Can't resume session" }; #better error message
 
-  my $custnum = $session->{'custnum'};
+  my($session, $custnum, $context);
+
+  if ( $p->{'session_id'} ) {
+    $context = 'customer';
+    $session = $cache->get($p->{'session_id'})
+      or return { 'error' => "Can't resume session" }; #better error message
+    $custnum = $session->{'custnum'};
+  } elsif ( $p->{'agent_session_id'} ) {
+    $context = 'agent';
+    my $agent_cache = new Cache::SharedMemoryCache( {
+      'namespace' => 'FS::ClientAPI::Agent',
+    } );
+    $session = $agent_cache->get($p->{'agent_session_id'})
+      or return { 'error' => "Can't resume session" }; #better error message
+    $custnum = $p->{'custnum'};
+  } else {
+    return { 'error' => "Can't resume session" }; #better error message
+  }
 
-  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+  my $search = { 'custnum' => $custnum };
+  $search->{'agentnum'} = $session->{'agentnum'} if $context eq 'agent';
+
+  my $cust_main = qsearchs('cust_main', $search )
     or return { 'error' => "unknown custnum $custnum" };
 
   #false laziness w/ClientAPI/Signup.pm
@@ -503,13 +558,13 @@ sub cancel_pkg {
   my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
     or return { 'error' => "unknown custnum $custnum" };
 
-  my $pkgnum = $session->{'pkgnum'};
+  my $pkgnum = $p->{'pkgnum'};
 
   my $cust_pkg = qsearchs('cust_pkg', { 'custnum' => $custnum,
                                         'pkgnum'  => $pkgnum,   } )
     or return { 'error' => "unknown pkgnum $pkgnum" };
 
-  my $error = $cust_main->cancel( 'quiet'=>1 );
+  my $error = $cust_pkg->cancel( 'quiet'=>1 );
   return { 'error' => $error };
 
 }
diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 4655b0984..2e2b80fcb 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -22,7 +22,7 @@ FS::ClientAPI->register_handlers(
 );
 
 sub signup_info {
-  #my $packet = shift;
+  my $packet = shift;
 
   my $conf = new FS::Conf;
 
@@ -87,24 +87,35 @@ sub signup_info {
 
   };
 
-  if (
-    $conf->config('signup_server-default_agentnum')
-    && !exists $signup_info->{'part_pkg'} #cache for performance
-  ) {
-    my $agentnum = $conf->config('signup_server-default_agentnum');
-    my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } )
-      or die "fatal: signup_server-default_agentnum $agentnum not found\n";
-    my $pkgpart_href = $agent->pkgpart_hashref;
-
-    $signup_info->{'part_pkg'} = [
-      #map { $_->hashref }
-      map { { 'payby' => [ $_->payby ], %{$_->hashref} } }
-        grep { $_->svcpart('svc_acct') && $pkgpart_href->{ $_->pkgpart } }
-          qsearch( 'part_pkg', { 'disabled' => '' } )
-    ];
+  my $agentnum = $conf->config('signup_server-default_agentnum');
+
+  my $session = '';
+  if ( exists $packet->{'session_id'} ) {
+    my $cache = new Cache::SharedMemoryCache( {
+      'namespace' => 'FS::ClientAPI::Agent',
+    } );
+    $session = $cache->get($packet->{'session_id'});
+    if ( $session ) {
+      $agentnum = $session->{'agentnum'};
+    } else {
+      return { 'error' => "Can't resume session" }; #better error message
+    }
   }
 
-  $signup_info;
+  if ( $agentnum ) {
+    $signup_info->{'part_pkg'} = $signup_info->{'agentnum2part_pkg'}{$agentnum};
+  } else {
+    delete $signup_info->{'part_pkg'};
+  }
+
+  if ( $session ) {
+    my $agent_signup_info = { %$signup_info };
+    delete $agent_signup_info->{agentnum2part_pkg};
+    $agent_signup_info->{'agent'} = $session->{'agent'};
+    $agent_signup_info;
+  } else {
+    $signup_info;
+  }
 
 }
 
@@ -122,12 +133,27 @@ sub new_customer {
   return { 'error' => gettext('no_access_number_selected') }
     unless $packet->{'popnum'} || !scalar(qsearch('svc_acct_pop',{} ));
 
+  my $agentnum;
+  if ( exists $packet->{'session_id'} ) {
+    my $cache = new Cache::SharedMemoryCache( {
+      'namespace' => 'FS::ClientAPI::Agent',
+    } );
+    my $session = $cache->get($packet->{'session_id'});
+    if ( $session ) {
+      $agentnum = $session->{'agentnum'};
+    } else {
+      return { 'error' => "Can't resume session" }; #better error message
+    }
+  } else {
+    $agentnum = $packet->{agentnum}
+                || $conf->config('signup_server-default_agentnum');
+  }
+
   #shares some stuff with htdocs/edit/process/cust_main.cgi... take any
   # common that are still here and library them.
   my $cust_main = new FS::cust_main ( {
     #'custnum'          => '',
-    'agentnum'      => $packet->{agentnum}
-                       || $conf->config('signup_server-default_agentnum'),
+    'agentnum'      => $agentnum,
     'refnum'        => $packet->{refnum}
                        || $conf->config('signup_server-default_refnum'),
 
diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
index 2f70d654d..7c69dfbf2 100644
--- a/FS/FS/agent.pm
+++ b/FS/FS/agent.pm
@@ -2,7 +2,7 @@ package FS::agent;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
+use FS::Record qw( dbh qsearch qsearchs );
 use FS::cust_main;
 use FS::agent_type;
 
@@ -164,11 +164,107 @@ sub pkgpart_hashref {
   $self->agent_type->pkgpart_hashref;
 }
 
-=back
+=item num_prospect_cust_main
+
+Returns the number of prospects (customers with no packages ever ordered) for
+this agent.
+
+=cut
+
+sub num_prospect_cust_main {
+  shift->num_sql(FS::cust_main->prospect_sql);
+}
+
+sub num_sql {
+  my( $self, $sql ) = @_;
+  my $sth = dbh->prepare(
+    "SELECT COUNT(*) FROM cust_main WHERE agentnum = ? AND $sql"
+  ) or die dbh->errstr;
+  $sth->execute($self->agentnum) or die $sth->errstr;
+  $sth->fetchrow_arrayref->[0];
+}
+
+=item prospect_cust_main
+
+Returns the prospects (customers with no packages ever ordered) for this agent,
+as cust_main objects.
+
+=cut
+
+sub prospect_cust_main {
+  shift->cust_main_sql(FS::cust_main->prospect_sql);
+}
+
+sub cust_main_sql {
+  my( $self, $sql ) = @_;
+  qsearch( 'cust_main',
+           { 'agentnum' => $self->agentnum },
+           '',
+           " AND $sql"
+  );
+}
+
+=item num_active_cust_main
+
+Returns the number of active customers for this agent.
+
+=cut
+
+sub num_active_cust_main {
+  shift->num_sql(FS::cust_main->active_sql);
+}
+
+=item active_cust_main
+
+Returns the active customers for this agent, as cust_main objects.
+
+=cut
 
-=head1 VERSION
+sub active_cust_main {
+  shift->cust_main_sql(FS::cust_main->active_sql);
+}
+
+=item num_susp_cust_main
+
+Returns the number of suspended customers for this agent.
+
+=cut
+
+sub num_susp_cust_main {
+  shift->num_sql(FS::cust_main->susp_sql);
+}
+
+=item susp_cust_main
+
+Returns the suspended customers for this agent, as cust_main objects.
+
+=cut
+
+sub susp_cust_main {
+  shift->cust_main_sql(FS::cust_main->susp_sql);
+}
 
-$Id: agent.pm,v 1.6 2003-09-30 15:01:46 ivan Exp $
+=item num_cancel_cust_main
+
+Returns the number of cancelled customer for this agent.
+
+=cut
+
+sub num_cancel_cust_main {
+  shift->num_sql(FS::cust_main->cancel_sql);
+}
+
+=item cancel_cust_main
+
+Returns the cancelled customers for this agent, as cust_main objects.
+
+=cut
+
+sub cancel_cust_main {
+  shift->cust_main_sql(FS::cust_main->cancel_sql);
+}
+
+=back
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index fbd461841..07f0a34e5 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2538,6 +2538,136 @@ sub select_for_update {
   qsearch('cust_main', { 'custnum' => $self->custnum }, '*', 'FOR UPDATE' );
 }
 
+=item name
+
+Returns a name string for this customer, either "Company (Last, First)" or
+"Last, First".
+
+=cut
+
+sub name {
+  my $self = shift;
+  my $name = $self->get('last'). ', '. $self->first;
+  $name = $self->company. " ($name)" if $self->company;
+  $name;
+}
+
+=item status
+
+Returns a status string for this customer, currently:
+
+=over 4
+
+=item prospect - No packages have ever been ordered
+
+=item active - One or more recurring packages is active
+
+=item suspended - All non-cancelled recurring packages are suspended
+
+=item cancelled - All recurring packages are cancelled
+
+=back
+
+=cut
+
+sub status {
+  my $self = shift;
+  for my $status (qw( prospect active suspended cancelled )) {
+    my $method = $status.'_sql';
+    my $numnum = ( my $sql = $self->$method() ) =~ s/cust_main\.custnum/?/g;
+    my $sth = dbh->prepare("SELECT $sql") or die dbh->errstr;
+    $sth->execute( ($self->custnum) x $numnum ) or die $sth->errstr;
+    return $status if $sth->fetchrow_arrayref->[0];
+  }
+}
+
+=item statuscolor
+
+Returns a hex triplet color string for this customer's status.
+
+=cut
+
+my %statuscolor = (
+  'prospect'  => '000000',
+  'active'    => '00CC00',
+  'suspended' => 'FF9900',
+  'cancelled' => 'FF0000',
+);
+sub statuscolor {
+  my $self = shift;
+  $statuscolor{$self->status};
+}
+
+=back
+
+=head1 CLASS METHODS
+
+=over 4
+
+=item prospect_sql
+
+Returns an SQL expression identifying prospective cust_main records (customers
+with no packages ever ordered)
+
+=cut
+
+sub prospect_sql { "
+  0 = ( SELECT COUNT(*) FROM cust_pkg
+          WHERE cust_pkg.custnum = cust_main.custnum
+      )
+"; }
+
+=item active_sql
+
+Returns an SQL expression identifying active cust_main records.
+
+=cut
+
+sub active_sql { "
+  0 < ( SELECT COUNT(*) FROM cust_pkg
+          WHERE cust_pkg.custnum = cust_main.custnum
+            AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
+            AND ( cust_pkg.susp   IS NULL OR cust_pkg.susp   = 0 )
+      )
+"; }
+
+=item susp_sql
+=item suspended_sql
+
+Returns an SQL expression identifying suspended cust_main records.
+
+=cut
+
+sub suspended_sql { susp_sql(@_); }
+sub susp_sql { "
+    0 < ( SELECT COUNT(*) FROM cust_pkg
+            WHERE cust_pkg.custnum = cust_main.custnum
+              AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
+        )
+    AND 0 = ( SELECT COUNT(*) FROM cust_pkg
+                WHERE cust_pkg.custnum = cust_main.custnum
+                  AND ( cust_pkg.susp IS NULL OR cust_pkg.susp = 0 )
+            )
+"; }
+
+=item cancel_sql
+=item cancelled_sql
+
+Returns an SQL expression identifying cancelled cust_main records.
+
+=cut
+
+sub cancelled_sql { cancel_sql(@_); }
+sub cancel_sql { "
+  0 < ( SELECT COUNT(*) FROM cust_pkg
+          WHERE cust_pkg.custnum = cust_main.custnum
+      )
+  AND 0 = ( SELECT COUNT(*) FROM cust_pkg
+              WHERE cust_pkg.custnum = cust_main.custnum
+                AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
+          )
+"; }
+
 =back
 
 =head1 SUBROUTINES
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 920415e30..2cda9fe2d 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -18,24 +18,28 @@ $socket .= '.'.$tag if defined $tag && length($tag);
 
 #maybe should ask ClientAPI for this list
 %autoload = (
-  'passwd'          => 'passwd/passwd',
-  'chfn'            => 'passwd/passwd',
-  'chsh'            => 'passwd/passwd',
-  'login'           => 'MyAccount/login',
-  'customer_info'   => 'MyAccount/customer_info',
-  'edit_info'       => 'MyAccount/edit_info',
-  'invoice'         => 'MyAccount/invoice',
-  'cancel'          => 'MyAccount/cancel',
-  'payment_info'    => 'MyAccount/payment_info',
-  'process_payment' => 'MyAccount/process_payment',
-  'list_pkgs'       => 'MyAccount/list_pkgs',
-  'order_pkg'       => 'MyAccount/order_pkg',
-  'cancel_pkg'      => 'MyAccount/cancel_pkg',
-  'charge'          => 'MyAccount/charge',
-  'signup_info'     => 'Signup/signup_info',
-  'new_customer'    => 'Signup/new_customer',
+  'passwd'               => 'passwd/passwd',
+  'chfn'                 => 'passwd/passwd',
+  'chsh'                 => 'passwd/passwd',
+  'login'                => 'MyAccount/login',
+  'customer_info'        => 'MyAccount/customer_info',
+  'edit_info'            => 'MyAccount/edit_info',
+  'invoice'              => 'MyAccount/invoice',
+  'list_invoices'        => 'MyAccount/list_invoices',
+  'cancel'               => 'MyAccount/cancel',
+  'payment_info'         => 'MyAccount/payment_info',
+  'process_payment'      => 'MyAccount/process_payment',
+  'list_pkgs'            => 'MyAccount/list_pkgs',
+  'order_pkg'            => 'MyAccount/order_pkg',
+  'cancel_pkg'           => 'MyAccount/cancel_pkg',
+  'charge'               => 'MyAccount/charge',
+  'signup_info'          => 'Signup/signup_info',
+  'new_customer'         => 'Signup/new_customer',
+  'agent_login'          => 'Agent/agent_login',
+  'agent_info'           => 'Agent/agent_info',
+  'agent_list_customers' => 'Agent/agent_list_customers',
 );
-@EXPORT_OK = keys %autoload;
+@EXPORT_OK = ( keys(%autoload), qw( regionselector expselect popselector ) );
 
 $ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin';
 $ENV{'SHELL'} = '/bin/sh';
@@ -286,6 +290,37 @@ Invoice text
 
 =back
 
+=item list_invoices HASHREF
+
+Returns a list of all customer invoices.  Takes a hash references with a single
+key, session_id.
+
+Returns a hash reference with the following keys:
+
+=over 4
+
+=item error
+
+Empty on success, or an error message on errors
+
+=item invoices
+
+Reference to array of hash references with the following keys:
+
+=over 4
+
+=item invnum
+
+Invoice ID
+
+=item _date
+
+Invoice date, in UNIX epoch time
+
+=back
+
+=back
+
 =item cancel HASHREF
 
 Cancels this customer.
@@ -492,7 +527,15 @@ error message on errors.
 
 =over 4
 
-=item signup_info
+=item signup_info HASHREF
+
+Takes a hash reference as parameter with the following keys:
+
+=over 4
+
+=item session_id - Optional agent/reseller interface session
+
+=back
 
 Returns a hash reference containing information that may be useful in
 displaying a signup page.  The hash reference contains the following keys:
@@ -505,7 +548,9 @@ County/state/country data - array reference of hash references, each of which ha
 
 =item part_pkg
 
-Available packages - array reference of hash references, each of which has the fields of a part_pkg record (see L<FS::part_pkg>).  Each hash reference also has an additional 'payby' field containing an array reference of acceptable payment types specific to this package (see below and L<FS::part_pkg/payby>).  Note these are not FS::part_pkg objects, but hash references of columns and values.  Requires the 'signup_server-default_agentnum' configuration value to be set.
+Available packages - array reference of hash references, each of which has the fields of a part_pkg record (see L<FS::part_pkg>).  Each hash reference also has an additional 'payby' field containing an array reference of acceptable payment types specific to this package (see below and L<FS::part_pkg/payby>).  Note these are not FS::part_pkg objects, but hash references of columns and values.  Requires the 'signup_server-default_agentnum' configuration value to be set, or
+an agentnum specified explicitly via reseller interface session_id in the
+options.
 
 =item agent
 
@@ -634,6 +679,369 @@ Returns a hash reference with the following keys:
 
 =back
 
+=item regionselector HASHREF | LIST
+
+Takes as input a hashref or list of key/value pairs with the following keys:
+
+=over 4
+
+=item selected_county
+
+=item selected_state
+
+=item selected_country
+
+=item prefix - Specify a unique prefix string  if you intend to use the HTML output multiple time son one page.
+
+=item onchange - Specify a javascript subroutine to call on changes
+
+=item default_state
+
+=item default_country
+
+=item locales - An arrayref of hash references specifying regions.  Normally you can just pass the value of the I<cust_main_county> field returned by B<signup_info>.
+
+=back
+
+Returns a list consisting of three HTML fragments for county selection,
+state selection and country selection, respectively.
+
+=cut
+
+#false laziness w/FS::cust_main_county (this is currently the "newest" version)
+sub regionselector {
+  my $param;
+  if ( ref($_[0]) ) {
+    $param = shift;
+  } else {
+    $param = { @_ };
+  }
+  $param->{'selected_country'} ||= $param->{'default_country'};
+  $param->{'selected_state'} ||= $param->{'default_state'};
+
+  my $prefix = exists($param->{'prefix'}) ? $param->{'prefix'} : '';
+
+  my $countyflag = 0;
+
+  my %cust_main_county;
+
+#  unless ( @cust_main_county ) { #cache 
+    #@cust_main_county = qsearch('cust_main_county', {} );
+    #foreach my $c ( @cust_main_county ) {
+    foreach my $c ( @{ $param->{'locales'} } ) {
+      #$countyflag=1 if $c->county;
+      $countyflag=1 if $c->{county};
+      #push @{$cust_main_county{$c->country}{$c->state}}, $c->county;
+      #$cust_main_county{$c->country}{$c->state}{$c->county} = 1;
+      $cust_main_county{$c->{country}}{$c->{state}}{$c->{county}} = 1;
+    }
+#  }
+  $countyflag=1 if $param->{selected_county};
+
+  my $script_html = <<END;
+    <SCRIPT>
+    function opt(what,value,text) {
+      var optionName = new Option(text, value, false, false);
+      var length = what.length;
+      what.options[length] = optionName;
+    }
+    function ${prefix}country_changed(what) {
+      country = what.options[what.selectedIndex].text;
+      for ( var i = what.form.${prefix}state.length; i >= 0; i-- )
+          what.form.${prefix}state.options[i] = null;
+END
+      #what.form.${prefix}state.options[0] = new Option('', '', false, true);
+
+  foreach my $country ( sort keys %cust_main_county ) {
+    $script_html .= "\nif ( country == \"$country\" ) {\n";
+    foreach my $state ( sort keys %{$cust_main_county{$country}} ) {
+      my $text = $state || '(n/a)';
+      $script_html .= qq!opt(what.form.${prefix}state, "$state", "$text");\n!;
+    }
+    $script_html .= "}\n";
+  }
+
+  $script_html .= <<END;
+    }
+    function ${prefix}state_changed(what) {
+END
+
+  if ( $countyflag ) {
+    $script_html .= <<END;
+      state = what.options[what.selectedIndex].text;
+      country = what.form.${prefix}country.options[what.form.${prefix}country.selectedIndex].text;
+      for ( var i = what.form.${prefix}county.length; i >= 0; i-- )
+          what.form.${prefix}county.options[i] = null;
+END
+
+    foreach my $country ( sort keys %cust_main_county ) {
+      $script_html .= "\nif ( country == \"$country\" ) {\n";
+      foreach my $state ( sort keys %{$cust_main_county{$country}} ) {
+        $script_html .= "\nif ( state == \"$state\" ) {\n";
+          #foreach my $county ( sort @{$cust_main_county{$country}{$state}} ) {
+          foreach my $county ( sort keys %{$cust_main_county{$country}{$state}} ) {
+            my $text = $county || '(n/a)';
+            $script_html .=
+              qq!opt(what.form.${prefix}county, "$county", "$text");\n!;
+          }
+        $script_html .= "}\n";
+      }
+      $script_html .= "}\n";
+    }
+  }
+
+  $script_html .= <<END;
+    }
+    </SCRIPT>
+END
+
+  my $county_html = $script_html;
+  if ( $countyflag ) {
+    $county_html .= qq!<SELECT NAME="${prefix}county" onChange="$param->{'onchange'}">!;
+    $county_html .= '</SELECT>';
+  } else {
+    $county_html .=
+      qq!<INPUT TYPE="hidden" NAME="${prefix}county" VALUE="$param->{'selected_county'}">!;
+  }
+
+  my $state_html = qq!<SELECT NAME="${prefix}state" !.
+                   qq!onChange="${prefix}state_changed(this); $param->{'onchange'}">!;
+  foreach my $state ( sort keys %{ $cust_main_county{$param->{'selected_country'}} } ) {
+    my $text = $state || '(n/a)';
+    my $selected = $state eq $param->{'selected_state'} ? 'SELECTED' : '';
+    $state_html .= "\n<OPTION $selected VALUE=$state>$text</OPTION>"
+  }
+  $state_html .= '</SELECT>';
+
+  $state_html .= '</SELECT>';
+
+  my $country_html = qq!<SELECT NAME="${prefix}country" !.
+                     qq!onChange="${prefix}country_changed(this); $param->{'onchange'}">!;
+  my $countrydefault = $param->{default_country} || 'US';
+  foreach my $country (
+    sort { ($b eq $countrydefault) <=> ($a eq $countrydefault) or $a cmp $b }
+      keys %cust_main_county
+  ) {
+    my $selected = $country eq $param->{'selected_country'} ? ' SELECTED' : '';
+    $country_html .= "\n<OPTION$selected>$country</OPTION>"
+  }
+  $country_html .= '</SELECT>';
+
+  ($county_html, $state_html, $country_html);
+
+}
+
+#=item expselect HASHREF | LIST
+#
+#Takes as input a hashref or list of key/value pairs with the following keys:
+#
+#=over 4
+#
+#=item prefix - Specify a unique prefix string  if you intend to use the HTML output multiple time son one page.
+#
+#=item date - current date, in yyyy-mm-dd or m-d-yyyy format
+#
+#=back
+
+=item expselect PREFIX [ DATE ]
+
+Takes as input a unique prefix string and the current expiration date, in
+yyyy-mm-dd or m-d-yyyy format
+
+Returns an HTML fragments for expiration date selection.
+
+=cut
+
+sub expselect {
+  #my $param;
+  #if ( ref($_[0]) ) {
+  #  $param = shift;
+  #} else {
+  #  $param = { @_ };
+  #my $prefix = $param->{'prefix'};
+  #my $prefix = exists($param->{'prefix'}) ? $param->{'prefix'} : '';
+  #my $date =   exists($param->{'date'})   ? $param->{'date'}   : '';
+  my $prefix = shift;
+  my $date = scalar(@_) ? shift : '';
+
+  my( $m, $y ) = ( 0, 0 );
+  if ( $date  =~ /^(\d{4})-(\d{2})-\d{2}$/ ) { #PostgreSQL date format
+    ( $m, $y ) = ( $2, $1 );
+  } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+    ( $m, $y ) = ( $1, $3 );
+  }
+  my $return = qq!<SELECT NAME="$prefix!. qq!_month" SIZE="1">!;
+  for ( 1 .. 12 ) {
+    $return .= "<OPTION";
+    $return .= " SELECTED" if $_ == $m;
+    $return .= ">$_";
+  }
+  $return .= qq!</SELECT>/<SELECT NAME="$prefix!. qq!_year" SIZE="1">!;
+  my @t = localtime;
+  my $thisYear = $t[5] + 1900;
+  for ( ($thisYear > $y && $y > 0 ? $y : $thisYear) .. 2037 ) {
+    $return .= "<OPTION";
+    $return .= " SELECTED" if $_ == $y;
+    $return .= ">$_";
+  }
+  $return .= "</SELECT>";
+
+  $return;
+}
+
+=item popselector HASHREF | LIST
+
+Takes as input a hashref or list of key/value pairs with the following keys:
+
+=over 4
+
+=item popnum
+
+=item pops - An arrayref of hash references specifying access numbers.  Normally you can just pass the value of the I<svc_acct_pop> field returned by B<signup_info>.
+
+=back
+
+Returns an HTML fragment for access number selection.
+
+=cut
+
+#horrible false laziness with FS/FS/svc_acct_pop.pm::popselector
+sub popselector {
+  my $param;
+  if ( ref($_[0]) ) {
+    $param = shift;
+  } else {
+    $param = { @_ };
+  }
+  my $popnum = $param->{'popnum'};
+  my $pops = $param->{'pops'};
+
+  return '<INPUT TYPE="hidden" NAME="popnum" VALUE="">' unless @$pops;
+  return $pops->[0]{city}. ', '. $pops->[0]{state}.
+         ' ('. $pops->[0]{ac}. ')/'. $pops->[0]{exch}. '-'. $pops->[0]{loc}.
+         '<INPUT TYPE="hidden" NAME="popnum" VALUE="'. $pops->[0]{popnum}. '">'
+    if scalar(@$pops) == 1;
+
+  my %pop = ();
+  my %popnum2pop = ();
+  foreach (@$pops) {
+    push @{ $pop{ $_->{state} }->{ $_->{ac} } }, $_;
+    $popnum2pop{$_->{popnum}} = $_;
+  }
+
+  my $text = <<END;
+    <SCRIPT>
+    function opt(what,href,text) {
+      var optionName = new Option(text, href, false, false)
+      var length = what.length;
+      what.options[length] = optionName;
+    }
+END
+
+  my $init_popstate = $param->{'init_popstate'};
+  if ( $init_popstate ) {
+    $text .= '<INPUT TYPE="hidden" NAME="init_popstate" VALUE="'.
+             $init_popstate. '">';
+  } else {
+    $text .= <<END;
+      function acstate_changed(what) {
+        state = what.options[what.selectedIndex].text;
+        what.form.popac.options.length = 0
+        what.form.popac.options[0] = new Option("Area code", "-1", false, true);
+END
+  } 
+
+  my @states = $init_popstate ? ( $init_popstate ) : keys %pop;
+  foreach my $state ( sort { $a cmp $b } @states ) {
+    $text .= "\nif ( state == \"$state\" ) {\n" unless $init_popstate;
+
+    foreach my $ac ( sort { $a cmp $b } keys %{ $pop{$state} }) {
+      $text .= "opt(what.form.popac, \"$ac\", \"$ac\");\n";
+      if ($ac eq $param->{'popac'}) {
+        $text .= "what.form.popac.options[what.form.popac.length-1].selected = true;\n";
+      }
+    }
+    $text .= "}\n" unless $init_popstate;
+  }
+  $text .= "popac_changed(what.form.popac)}\n";
+
+  $text .= <<END;
+  function popac_changed(what) {
+    ac = what.options[what.selectedIndex].text;
+    what.form.popnum.options.length = 0;
+    what.form.popnum.options[0] = new Option("City", "-1", false, true);
+
+END
+
+  foreach my $state ( @states ) {
+    foreach my $popac ( keys %{ $pop{$state} } ) {
+      $text .= "\nif ( ac == \"$popac\" ) {\n";
+
+      foreach my $pop ( @{$pop{$state}->{$popac}}) {
+        my $o_popnum = $pop->{popnum};
+        my $poptext =  $pop->{city}. ', '. $pop->{state}.
+                       ' ('. $pop->{ac}. ')/'. $pop->{exch}. '-'. $pop->{loc};
+
+        $text .= "opt(what.form.popnum, \"$o_popnum\", \"$poptext\");\n";
+        if ($popnum == $o_popnum) {
+          $text .= "what.form.popnum.options[what.form.popnum.length-1].selected = true;\n";
+        }
+      }
+      $text .= "}\n";
+    }
+  }
+
+
+  $text .= "}\n</SCRIPT>\n";
+
+  $text .=
+    qq!<TABLE CELLPADDING="0"><TR><TD><SELECT NAME="acstate"! .
+    qq!SIZE=1 onChange="acstate_changed(this)"><OPTION VALUE=-1>State!;
+  $text .= "<OPTION" . ($_ eq $param->{'acstate'} ? " SELECTED" : "") .
+           ">$_" foreach sort { $a cmp $b } @states;
+  $text .= '</SELECT>'; #callback? return 3 html pieces?  #'</TD>';
+
+  $text .=
+    qq!<SELECT NAME="popac" SIZE=1 onChange="popac_changed(this)">!.
+    qq!<OPTION>Area code</SELECT></TR><TR VALIGN="top">!;
+
+  $text .= qq!<TR><TD><SELECT NAME="popnum" SIZE=1 STYLE="width: 20em"><OPTION>City!;
+
+
+  #comment this block to disable initial list polulation
+  my @initial_select = ();
+  if ( scalar( @$pops ) > 100 ) {
+    push @initial_select, $popnum2pop{$popnum} if $popnum2pop{$popnum};
+  } else {
+    @initial_select = @$pops;
+  }
+  foreach my $pop ( sort { $a->{state} cmp $b->{state} } @initial_select ) {
+    $text .= qq!<OPTION VALUE="!. $pop->{popnum}. '"'.
+             ( ( $popnum && $pop->{popnum} == $popnum ) ? ' SELECTED' : '' ). ">".
+             $pop->{city}. ', '. $pop->{state}.
+               ' ('. $pop->{ac}. ')/'. $pop->{exch}. '-'. $pop->{loc};
+  }
+
+  $text .= qq!</SELECT></TD></TR></TABLE>!;
+
+  $text;
+
+}
+
+=back
+
+=head1 RESELLER FUNCTIONS
+
+Note: Resellers can also use the B<signup_info> and B<new_customer> functions
+with their active session.
+
+=over 4
+
+=item agent_login
+
+=item agent_info
+
+=item agent_list_customers
 
 =back
 
diff --git a/fs_selfservice/FS-SelfService/cgi/agent.cgi b/fs_selfservice/FS-SelfService/cgi/agent.cgi
new file mode 100644
index 000000000..3508e82e3
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/agent.cgi
@@ -0,0 +1,256 @@
+#!/usr/bin/perl -Tw
+
+#some false laziness w/selfservice.cgi
+
+use strict;
+use vars qw($cgi $session_id $form_max $template_dir);
+use subs qw(do_template);
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use Business::CreditCard;
+use Text::Template;
+use FS::SelfService qw( agent_login agent_info
+                        agent_list_customers
+                        signup_info new_customer
+                        customer_info order_pkg
+                      );
+
+$template_dir = '.';
+
+$form_max = 255;
+
+$cgi = new CGI;
+
+unless ( defined $cgi->param('session') ) {
+  do_template('agent_login',{});
+  exit;
+}
+
+if ( $cgi->param('session') eq 'login' ) {
+
+  $cgi->param('username') =~ /^\s*([a-z0-9_\-\.\&]{0,$form_max})\s*$/i
+    or die "illegal username";
+  my $username = $1;
+
+  $cgi->param('password') =~ /^(.{0,$form_max})$/
+    or die "illegal password";
+  my $password = $1;
+
+  my $rv = agent_login(
+    'username' => $username,
+    'password' => $password,
+  );
+  if ( $rv->{error} ) {
+    do_template('agent_login', {
+      'error'    => $rv->{error},
+      'username' => $username,
+    } );
+    exit;
+  } else {
+    $cgi->param('session' => $rv->{session_id} );
+    $cgi->param('action'  => 'agent_main' );
+  }
+}
+
+$session_id = $cgi->param('session');
+
+$cgi->param('action') =~
+   /^(agent_main|signup|process_signup|list_customers|view_customer|process_order_pkg)$/
+  or die "unknown action ". $cgi->param('action');
+my $action = $1;
+
+warn "running $action\n";
+my $result = eval "&$action();";
+die $@ if $@;
+
+if ( $result->{error} eq "Can't resume session" ) { #ick
+  do_template('agent_login',{});
+  exit;
+}
+
+warn "processing template $action\n";
+do_template($action, {
+  'session_id' => $session_id,
+  %{$result}
+});
+
+#-- 
+
+sub agent_main { agent_info( 'session_id' => $session_id ); }
+
+sub signup { signup_info( 'session_id' => $session_id ); }
+
+sub process_signup {
+
+  my $init_data = signup_info( 'session_id' => $session_id );
+  if ( $init_data->{'error'} ) {
+    if ( $init_data->{'error'} eq "Can't resume session" ) { #ick
+      do_template('agent_login',{});
+      exit;
+    } else { #?
+      die $init_data->{'error'};
+    }
+  }
+
+  my $error = '';
+
+  #some false laziness w/signup.cgi
+  my $payby = $cgi->param('payby');
+  if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) {
+    #$payinfo = join('@', map { $cgi->param( $payby. "_payinfo$_" ) } (1,2) );
+    $cgi->param('payinfo' => $cgi->param($payby. '_payinfo1'). '@'. 
+                             $cgi->param($payby. '_payinfo2')
+               );
+  } else {
+    $cgi->param('payinfo' => $cgi->param( $payby. '_payinfo' ) );
+  }
+  $cgi->param('paydate' => $cgi->param( $payby. '_month' ). '-'.
+                           $cgi->param( $payby. '_year' )
+             );
+  $cgi->param('payname' => $cgi->param( $payby. '_payname' ) );
+  $cgi->param('paycvv' => defined $cgi->param( $payby. '_paycvv' )
+                            ? $cgi->param( $payby. '_paycvv' )
+                            : ''
+             );
+
+  if ( $cgi->param('invoicing_list') ) {
+    $cgi->param('invoicing_list' => $cgi->param('invoicing_list'). ', POST')
+      if $cgi->param('invoicing_list_POST');
+  } else {
+    $cgi->param('invoicing_list' => 'POST' );
+  }
+
+  if ( $cgi->param('_password') ne $cgi->param('_password2') ) {
+    $error = $init_data->{msgcat}{passwords_dont_match}; #msgcat
+    $cgi->param('_password', '');
+    $cgi->param('_password2', '');
+  }
+
+  if ( $payby =~ /^(CARD|DCRD)$/ && $cgi->param('CARD_type') ) {
+    my $payinfo = $cgi->param('payinfo');
+    $payinfo =~ s/\D//g;
+
+    $payinfo =~ /^(\d{13,16})$/
+      or $error ||= $init_data->{msgcat}{invalid_card}; #. $self->payinfo;
+    $payinfo = $1;
+    validate($payinfo)
+      or $error ||= $init_data->{msgcat}{invalid_card}; #. $self->payinfo;
+    cardtype($payinfo) eq $cgi->param('CARD_type')
+      or $error ||= $init_data->{msgcat}{not_a}. $cgi->param('CARD_type');
+  }
+
+  unless ( $error ) {
+    my $rv = new_customer ( {
+      'session_id'       => $session_id,
+      map { $_ => $cgi->param($_) }
+        qw( last first ss company
+            address1 address2 city county state zip country
+            daytime night fax
+            payby payinfo paycvv paydate payname invoicing_list
+            pkgpart username sec_phrase _password popnum refnum
+          ),
+        grep { /^snarf_/ } $cgi->param
+    } );
+    $error = $rv->{'error'};
+  }
+
+  if ( $error ) { 
+    $action = 'signup';
+    my $r = { 
+      $cgi->Vars,
+      %{$init_data},
+      'error' => $error,
+    };
+    #warn join('\n', map "$_ => $r->{$_}", keys %$r )."\n";
+    $r;
+  } else {
+    $action = 'agent_main';
+    my $agent_info = agent_info( 'session_id' => $session_id );
+    $agent_info->{'message'} = 'Signup sucessful';
+    $agent_info;
+  }
+
+}
+
+sub list_customers {
+  agent_list_customers( 'session_id' => $session_id,
+                        map { $_ => $cgi->param($_) }
+                          grep defined($cgi->param($_)),
+                               qw(prospect active susp cancel)
+                      );
+}
+
+sub view_customer {
+
+  my $init_data = signup_info( 'session_id' => $session_id );
+  if ( $init_data->{'error'} ) {
+    if ( $init_data->{'error'} eq "Can't resume session" ) { #ick
+      do_template('agent_login',{});
+      exit;
+    } else { #?
+      die $init_data->{'error'};
+    }
+  }
+
+  my $customer_info = customer_info (
+    'agent_session_id' => $session_id,
+    'custnum'          => $cgi->param('custnum')
+  );
+
+
+  return {
+    ( map { $_ => $init_data->{$_} }
+          qw( part_pkg security_phrase svc_acct_pop ),
+    ),
+    %$customer_info,
+  };
+}
+
+sub process_order_pkg {
+
+  my $results = order_pkg (
+    'agent_session_id' => $session_id,
+    map { $_ => $cgi->param($_) }
+        qw( custnum pkgpart username _password _password2 sec_phrase popnum )
+  );
+
+  $action = 'view_customer';
+  $cgi->delete( grep { $_ ne 'custnum' } $cgi->param )
+    unless $results->{'error'};
+
+  return {
+    $cgi->Vars,
+    %{view_customer()},
+    'message' => $results->{'error'}
+                   ? '<FONT COLOR="#FF0000">'. $results->{'error'}. '</FONT>'
+                   : 'Package order sucessful.'
+  };
+
+}
+
+#--
+
+sub do_template {
+  my $name = shift;
+  my $fill_in = shift;
+  #warn join(' / ', map { "$_=>".$fill_in->{$_} } keys %$fill_in). "\n";
+
+  $cgi->delete_all();
+  $fill_in->{'selfurl'} = $cgi->self_url;
+  $fill_in->{'cgi'} = \$cgi;
+
+  my $template = new Text::Template( TYPE    => 'FILE',
+                                     SOURCE  => "$template_dir/$name.html",
+                                     DELIMITERS => [ '<%=', '%>' ],
+                                     UNTAINT => 1,                    )
+    or die $Text::Template::ERROR;
+
+  print $cgi->header( '-expires' => 'now' ),
+        $template->fill_in( PACKAGE => 'FS::SelfService::_agentcgi',
+                            HASH    => $fill_in
+                          );
+}
+
+package FS::SelfService::_agentcgi;
+use FS::SelfService qw(regionselector expselect popselector);
+
diff --git a/fs_selfservice/FS-SelfService/cgi/agent_login.html b/fs_selfservice/FS-SelfService/cgi/agent_login.html
new file mode 100644
index 000000000..4b0778ec5
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/agent_login.html
@@ -0,0 +1,22 @@
+<HTML><HEAD><TITLE>Reseller Login</TITLE></HEAD>
+<BODY BGCOLOR="#e8e8e8"><FONT SIZE=5>Reseller Login</FONT><BR><BR>
+<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
+<FORM ACTION="<%= $self_url %>" METHOD=POST>
+<INPUT TYPE="hidden" NAME="session" VALUE="login">
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=2 CELLPADDING=0>
+<TR>
+  <TH ALIGN="right">Username </TH>
+  <TD>
+    <INPUT TYPE="text" NAME="username" VALUE="<%= $username %>">
+  </TD>
+</TR>
+<TR>
+  <TH ALIGN="right">Password </TH>
+  <TD>
+    <INPUT TYPE="password" NAME="password">
+  </TD>
+</TR>
+</TABLE>
+<BR><BR><INPUT TYPE="submit" VALUE="Login">
+</FORM></BODY></HTML>
+
diff --git a/fs_selfservice/FS-SelfService/cgi/agent_main.html b/fs_selfservice/FS-SelfService/cgi/agent_main.html
new file mode 100644
index 000000000..89a1b330d
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/agent_main.html
@@ -0,0 +1,40 @@
+<HTML><HEAD><TITLE>Reseller Main</TITLE></HEAD>
+<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>Reseller Main</FONT><BR><BR>
+<%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<TABLE BORDER=0 CELLPADDING=4><TR><TD VALIGN="top" HEIGHT=384 BGCOLOR="#dddddd">
+<A HREF="<%= $url %>agent_main">Reseller Main</A><BR>
+<!-- <A HREF="<%= $url %>other">SomethingElse</A><BR> -->
+</TD><TD VALIGN="top">
+
+<%= $message
+      ? "<FONT SIZE=\"+2\"><B>$message</B></FONT>"
+      : "Hello $agent!"
+%><BR><BR>
+
+<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 BGCOLOR="#eeeeee">
+<TR><TH BGCOLOR="#cccccc">Customer summary</TH></TR>
+<TR><TD BGCOLOR="#dddddd">
+
+  <B><%= $num_prospect %></B>
+  <A HREF="<%= $url %>list_customers&prospect=1">prospects</A>
+
+  <BR><FONT COLOR="#00CC00"><B><%= $num_active %></B></FONT>
+  <A HREF="<%= $url %>list_customers&active=1">active</A>
+
+  <BR><FONT COLOR="#FF9900"><B><%= $num_susp %></B></FONT>
+  <A HREF="<%= $url %>list_customers&susp=1">suspended</A>
+
+  <BR><FONT COLOR="#FF0000"><B><%= $num_cancel %></B></FONT>
+  <A HREF="<%= $url %>list_customers&cancel=1">cancelled</A>
+
+</TD></TR></TABLE>
+
+<BR><A HREF="<%= $url %>signup">New customer<!--/prospect--></A>
+
+</TD></TR></TABLE>
+<HR>
+<FONT SIZE="-2">powered by <a href="http://www.sisd.com/freeside">freeside</a></FONT>
+</BODY></HTML>
+
+
+
diff --git a/fs_selfservice/FS-SelfService/cgi/cvv2.html b/fs_selfservice/FS-SelfService/cgi/cvv2.html
new file mode 100644
index 000000000..b178c8513
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/cvv2.html
@@ -0,0 +1,25 @@
+<HTML>
+  <HEAD>
+    <TITLE>
+      CVV2 information
+    </TITLE>
+  </HEAD>
+  <BODY BGCOLOR="#e8e8e8">
+  The CVV2 number (also called CVC2 or CID) is a three- or four-digit
+  security code used to reduce credit card fraud.<BR><BR>
+  <TABLE BORDER=0 CELLSPACING=4>
+    <TR>
+      <TH>Visa / MasterCard / Discover</TH>
+      <TH>American Express</TH>
+    </TR>
+    <TR>
+      <TD>
+        <IMG BORDER=0 ALT="Visa/MasterCard/Discover" SRC="cvv2.png">
+      </TD>
+      <TD>
+        <IMG BORDER=0 ALT="American Express" SRC="cvv2_amex.png">
+      </TD>
+  </TABLE>
+    <CENTER><A HREF="javascript:close()">(close window)</A></CENTER>
+  </BODY>
+</HTML>
diff --git a/fs_selfservice/FS-SelfService/cgi/cvv2.png b/fs_selfservice/FS-SelfService/cgi/cvv2.png
new file mode 100644
index 000000000..4610dcbe6
Binary files /dev/null and b/fs_selfservice/FS-SelfService/cgi/cvv2.png differ
diff --git a/fs_selfservice/FS-SelfService/cgi/cvv2_amex.png b/fs_selfservice/FS-SelfService/cgi/cvv2_amex.png
new file mode 100644
index 000000000..21c36a0ab
Binary files /dev/null and b/fs_selfservice/FS-SelfService/cgi/cvv2_amex.png differ
diff --git a/fs_selfservice/FS-SelfService/cgi/list_customers.html b/fs_selfservice/FS-SelfService/cgi/list_customers.html
new file mode 100644
index 000000000..6d4ba564e
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/list_customers.html
@@ -0,0 +1,41 @@
+<HTML><HEAD><TITLE>Reseller Main</TITLE></HEAD>
+<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>Reseller Main</FONT><BR><BR>
+<%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<TABLE BORDER=0 CELLPADDING=4><TR><TD VALIGN="top" HEIGHT=384 BGCOLOR="#dddddd">
+<A HREF="<%= $url %>agent_main">Reseller Main</A><BR>
+<!-- <A HREF="<%= $url %>other">SomethingElse</A><BR> -->
+</TD><TD VALIGN="top">
+
+<%=
+  if ( @customers ) {
+    $OUT .= '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 BGCOLOR="#eeeeee">'.
+            '<TR><TH BGCOLOR="#cccccc" COLSPAN=3>Customers</TH><TD>';
+    my $col1 = "ffffff";
+    my $col2 = "dddddd";
+    my $col = $col1;
+
+    foreach my $customer ( @customers ) {
+      my $td = qq!<TD BGCOLOR="#$col">!;
+      my $a = qq!<A HREF="${url}view_customer;custnum=!. 
+              $customer->{'custnum'}. '">';
+      $OUT .=
+        '<TR>'.
+        "$td<FONT COLOR=\"". $customer->{'statuscolor'}. '">'.
+          ucfirst($customer->{'status'}). "</TD>". "$td</TD>".
+        "$td$a". $customer->{'name'}. "</A></TD>".
+        '</TR>';
+        #"$td</TD>".
+      $col = $col eq $col1 ? $col2 : $col1;
+    }
+    $OUT .= '</TABLE>';
+  } else {
+    $OUT .= 'No customers.<BR><BR>';
+  }
+%>
+
+</TD></TR></TABLE>
+<HR>
+<FONT SIZE="-2">powered by <a href="http://www.sisd.com/freeside">freeside</a></FONT>
+</BODY></HTML>
+
+
diff --git a/fs_selfservice/FS-SelfService/cgi/signup.html b/fs_selfservice/FS-SelfService/cgi/signup.html
new file mode 100755
index 000000000..973035179
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/signup.html
@@ -0,0 +1,233 @@
+<HTML><HEAD><TITLE><%= $agent || 'ISP' %> Signup form</TITLE></HEAD>
+<BODY BGCOLOR="#e8e8e8" onUnload="myclose()">
+<script language="JavaScript"><!--
+  var mywindow = -1;
+  function myopen(filename,windowname,properties) {
+    myclose();
+    mywindow = window.open(filename,windowname,properties);
+  }
+  function myclose() {
+    if ( mywindow != -1 )
+      mywindow.close();
+    mywindow = -1
+  }
+//--></script>
+<FONT SIZE=7><%= $agent || 'ISP' %> Signup form</FONT><BR><BR>
+<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
+<FORM ACTION="<%= $selfurl %>" METHOD=POST>
+<INPUT TYPE="hidden" NAME="session" VALUE="<%= $session_id %>">
+<INPUT TYPE="hidden" NAME="action" VALUE="process_signup">
+<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
+<INPUT TYPE="hidden" NAME="ss" VALUE="">
+Where did you hear about our service? <SELECT NAME="refnum">
+<%=
+  $OUT .= '<OPTION VALUE="">' unless $refnum;
+  foreach my $part_referral ( @part_referral ) {
+    $OUT .= '<OPTION VALUE="'. $part_referral->{'refnum'}. '"';
+    $OUT .= ' SELECTED' if $part_referral->{'refnum'} eq $refnum;
+    $OUT .= '>'. $part_referral->{'referral'};
+  }
+%>
+</SELECT><BR><BR>
+Contact Information
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Contact name<BR>(last, first)</TH>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="last" VALUE="<%= $last %>">,
+                <INPUT TYPE="text" NAME="first" VALUE="<%= $first %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Company</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="<%= $company %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Address</TH>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="<%= $address1 %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">&nbsp;</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="<%= $address2 %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
+  <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
+  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
+  <TD>
+    <%=
+        ($county_html, $state_html, $country_html) =
+          regionselector( {
+            selected_county  => $county,
+            selected_state   => $state,
+            selected_country => $country,
+            default_state    => $statedefault,
+            default_country  => $countrydefault,
+            locales          => \@cust_main_county,
+          } );
+ 
+        "$county_html $state_html";
+    %>
+  </TD>
+  <TH><font color="#ff0000">*</font>Zip</TH>
+  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Country</TH>
+  <TD><%= $country_html %></TD>
+<TR>
+  <TD ALIGN="right">Day Phone</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="<%= $daytime %>" SIZE=18></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Night Phone</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="<%= $night %>" SIZE=18></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Fax</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="<%= $fax %>" SIZE=12></TD>
+</TR>
+</TABLE><font color="#ff0000">*</font> required fields<BR>
+<BR>Billing information<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR><TD>
+
+  <%=
+    $OUT .= '<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"';
+    my @invoicing_list = split(', ', $invoicing_list );
+    $OUT .= ' CHECKED'
+      if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
+    $OUT .= '>';
+  %>
+
+  Postal mail invoice
+</TD></TR>
+<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="<%= join(', ', grep { $_ ne 'POST' } split(', ', $invoicing_list ) ) %>">
+</TD></TR>
+<%= scalar(@payby) > 1 ? '<TR><TD>Billing type</TD></TR>' : '' %>
+</TABLE>
+<TABLE BGCOLOR="#c0c0c0" BORDER=1 WIDTH="100%">
+<TR>
+
+  <%=
+
+    my $cardselect = '<SELECT NAME="CARD_type"><OPTION></OPTION>';
+    my %types = (
+                  'VISA' => 'VISA card',
+                  'MasterCard' => 'MasterCard',
+                  'Discover' => 'Discover card',
+                  'American Express' => 'American Express card',
+                );
+    foreach ( keys %types ) {
+      $selected = $CARD_type eq $types{$_} ? 'SELECTED' : '';
+      $cardselect .= qq!<OPTION $selected VALUE="$types{$_}">$_</OPTION>!;
+    }
+    $cardselect .= '</SELECT>';
+  
+    my %payby = (
+      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="">!,
+      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
+      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
+      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", "12-2037"). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
+      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
+      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
+    );
+
+    if ( $cvv_enabled ) {
+      foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5
+        $payby{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="" SIZE=4 MAXLENGTH=4>!;
+      }
+    }
+
+    my( $account, $aba ) = split('@', $payinfo);
+    my %paybychecked = (
+      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="$payname">!,
+      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
+      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
+      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", $paydate). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
+      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
+    );
+
+    if ( $cvv_enabled ) {
+      foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5
+        $paybychecked{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="$paycvv" SIZE=4 MAXLENGTH=4>!;
+      }
+    }
+
+    for (@payby) {
+      if ( scalar(@payby) == 1) {
+        $OUT .= '<TD VALIGN=TOP>'.
+                qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$_">!.
+                "$paybychecked{$_}</TD>";
+      } else {
+        $OUT .= qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
+        if ($payby eq $_) {
+          $OUT .= qq! CHECKED> $paybychecked{$_}</TD>!;
+        } else {
+          $OUT .= qq!> $payby{$_}</TD>!;
+        }
+
+      }
+    }
+  %>
+
+</TR></TABLE><font color="#ff0000">*</font> required fields for each billing type
+<BR><BR>First package
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR>
+  <TD COLSPAN=2><SELECT NAME="pkgpart"><OPTION VALUE="">(none)
+
+  <%=
+    foreach my $part_pkg ( @part_pkg ) {
+      $OUT .= '<OPTION VALUE="'. $part_pkg->{'pkgpart'}. '"';
+      $OUT .= ' SELECTED' if $pkgpart && $part_pkg->{'pkgpart'} == $pkgpart;
+      $OUT .= '>'. $part_pkg->{'pkg'};
+    }
+  %>
+
+  </SELECT></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Username</TD>
+  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Password</TD>
+  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $_password %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Re-enter Password</TD>
+  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $_password2 %>"></TD>
+</TR>
+<%=
+  if ( $security_phrase ) {
+    $OUT .= <<ENDOUT;
+<TR>
+  <TD ALIGN="right">Security Phrase</TD>
+  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
+  </TD>
+</TR>
+ENDOUT
+  } else {
+    $OUT .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
+  }
+%>
+<%=
+  if ( @svc_acct_pop ) {
+    $OUT .= '<TR><TD ALIGN="right">Access number</TD><TD>'.
+            popselector( 'popnum'        => $popnum,
+                         'pops'          => \@svc_acct_pop,
+                         'init_popstate' => $init_popstate,
+                         'popac'         => $popac,
+                         'acstate'       => $acstate,
+                       ).
+            '</TD></TR>';
+  } else {
+    $OUT .= popselector(popnum=>$popnum, pops=>\@svc_acct_pop);
+  }
+%>
+</TABLE>
+<BR><BR><INPUT TYPE="submit" VALUE="Signup">
+</FORM></BODY></HTML>
diff --git a/fs_selfservice/FS-SelfService/cgi/view_customer.html b/fs_selfservice/FS-SelfService/cgi/view_customer.html
new file mode 100644
index 000000000..e4e9be250
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/view_customer.html
@@ -0,0 +1,84 @@
+<HTML><HEAD><TITLE>View Customer</TITLE></HEAD>
+<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>View Customer</FONT><BR><BR>
+<%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<TABLE BORDER=0 CELLPADDING=4><TR><TD VALIGN="top" HEIGHT=384 BGCOLOR="#dddddd">
+<A HREF="<%= $url %>agent_main">Reseller Main</A><BR>
+<!-- <A HREF="<%= $url %>other">SomethingElse</A><BR> -->
+</TD><TD VALIGN="top">
+
+<%= $message
+      ? "<FONT SIZE=\"+2\"><B>$message</B></FONT><BR><BR>"
+      : ''
+%>
+
+<%= $small_custview %>
+
+<BR>Purchase additional package
+<FORM ACTION="<%= $selfurl %>" METHOD=POST>
+<INPUT TYPE="hidden" NAME="session" VALUE="<%= $session_id %>">
+<INPUT TYPE="hidden" NAME="action" VALUE="process_order_pkg">
+<INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $custnum %>">
+<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0>
+<TR>
+  <TD COLSPAN=2><SELECT NAME="pkgpart"><OPTION VALUE="">
+
+  <%=
+    foreach my $part_pkg ( @part_pkg ) {
+      $OUT .= '<OPTION VALUE="'. $part_pkg->{'pkgpart'}. '"';
+      $OUT .= ' SELECTED' if $pkgpart && $part_pkg->{'pkgpart'} == $pkgpart;
+      $OUT .= '>'. $part_pkg->{'pkg'};
+    }
+  %>
+
+  </SELECT></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Username</TD>
+  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Password</TD>
+  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $_password %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Re-enter Password</TD>
+  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $_password2 %>"></TD>
+</TR>
+<%=
+  if ( $security_phrase ) {
+    $OUT .= <<ENDOUT;
+<TR>
+  <TD ALIGN="right">Security Phrase</TD>
+  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
+  </TD>
+</TR>
+ENDOUT
+  } else {
+    $OUT .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
+  }
+%>
+<%=
+  if ( @svc_acct_pop ) {
+    $OUT .= '<TR><TD ALIGN="right">Access number</TD><TD>'.
+            popselector( 'popnum'        => $popnum,
+                         'pops'          => \@svc_acct_pop,
+                         'init_popstate' => $init_popstate,
+                         'popac'         => $popac,
+                         'acstate'       => $acstate,
+                       ).
+            '</TD></TR>';
+  } else {
+    $OUT .= popselector(popnum=>$popnum, pops=>\@svc_acct_pop);
+  }
+%>
+</TABLE>
+<INPUT TYPE="submit" VALUE="Purchase">
+</FORM>
+
+</TD></TR></TABLE>
+<HR>
+<FONT SIZE="-2">powered by <a href="http://www.sisd.com/freeside">freeside</a></FONT>
+</BODY></HTML>
+
+
+
diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm
index fb2b12fb0..b646baca2 100644
--- a/fs_signup/FS-SignupClient/SignupClient.pm
+++ b/fs_signup/FS-SignupClient/SignupClient.pm
@@ -1,7 +1,7 @@
 package FS::SignupClient;
 
 use strict;
-use vars qw($VERSION @ISA @EXPORT_OK); # $fs_signupd_socket);
+use vars qw($VERSION @ISA @EXPORT_OK $init_data); # $fs_signupd_socket);
 use Exporter;
 #use Socket;
 #use FileHandle;
@@ -12,7 +12,7 @@ use FS::SelfService; # qw( new_customer signup_info );
 $VERSION = '0.04';
 
 @ISA = qw( Exporter );
-@EXPORT_OK = qw( signup_info new_customer );
+@EXPORT_OK = qw( signup_info new_customer regionselector );
 
 =head1 NAME
 
@@ -99,7 +99,7 @@ Each hash reference has the following keys:
 #compatibility bit
 sub signup_info {
 
-  my $init_data = FS::SelfService::signup_info();
+  $init_data = FS::SelfService::signup_info();
 
   (map { $init_data->{$_} } qw( cust_main_county part_pkg svc_acct_pop ) ),
   $init_data;
@@ -148,10 +148,56 @@ sub new_customer {
   $hash->{'error'};
 }
 
+=item regionselector SELECTED_COUNTY, SELECTED_STATE, SELECTED_COUNTRY, PREFIX, ONCHANGE
+
+=cut
+
+sub regionselector {
+  my ( $selected_county, $selected_state, $selected_country,
+       $prefix, $onchange ) = @_;
+  signup_info() unless $init_data;
+  FS::SelfService::regionselector({
+    selected_county  => $selected_county,
+    selected_state   => $selected_state,
+    selected_country => $selected_country,
+    prefix           => $prefix,
+    onchange         => $onchange,
+    default_country  => $init_data->{countrydefault},
+    locales          => $init_data->{cust_main_county},
+  });
+    #default_state    => $init_data->{statedefault},
+}
+
+=item expselect PREFIX, DATE
+
+=cut
+
+sub expselect {
+  FS::SelfService::expselect(@_);
+}
+
+=item popselector 
+
+=cut
+
+sub popselector {
+  my( $popnum ) = @_;
+  signup_info() unless $init_data;
+  FS::SelfService::popselector({
+    popnum => $popnum,
+    pops   => $init_data->{svc_acct_pop},
+  });
+    #popac =>
+    #acstate =>
+}
+
 =back
 
 =head1 BUGS
 
+This is just a wrapper around FS::SelfService functions for backwards
+compatibility and will probably be deprecated soon.
+
 =head1 SEE ALSO
 
 L<fs_signupd>, L<FS::cust_main>
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 0a9a51008..00a7aa61e 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.50 2004-01-04 03:52:54 ivan Exp $
+# $Id: signup.cgi,v 1.51 2004-06-10 12:31:32 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages
@@ -20,14 +20,14 @@ use vars qw( @payby $cgi $locales $packages
              $self_url
            );
 use subs qw( print_form print_okay print_decline
-             success_default decline_default
-             expselect );
+             success_default decline_default );
 use CGI;
 #use CGI::Carp qw(fatalsToBrowser);
 use Text::Template;
 use Business::CreditCard;
 use HTTP::BrowserDetect;
-use FS::SignupClient 0.03 qw( signup_info new_customer );
+use FS::SignupClient 0.03 qw( signup_info new_customer
+                              regionselector expselect popselector);
 
 #acceptable payment methods
 #
@@ -360,265 +360,6 @@ sub print_okay {
   }
 }
 
-#horrible false laziness with FS/FS/svc_acct_pop.pm::popselector
-sub popselector {
-
-  my( $popnum ) = @_;
-
-  return '<INPUT TYPE="hidden" NAME="popnum" VALUE="">' unless @$pops;
-  return $pops->[0]{city}. ', '. $pops->[0]{state}.
-         ' ('. $pops->[0]{ac}. ')/'. $pops->[0]{exch}. '-'. $pops->[0]{loc}.
-         '<INPUT TYPE="hidden" NAME="popnum" VALUE="'. $pops->[0]{popnum}. '">'
-    if scalar(@$pops) == 1;
-
-  #my %pop = ();
-  #my %popnum2pop = ();
-  #foreach (@$pops) {
-  #  push @{ $pop{ $_->{state} }->{ $_->{ac} } }, $_;
-  #  $popnum2pop{$_->{popnum}} = $_;
-  #}
-
-  my $text = <<END;
-    <SCRIPT>
-    function opt(what,href,text) {
-      var optionName = new Option(text, href, false, false)
-      var length = what.length;
-      what.options[length] = optionName;
-    }
-END
-
-  if ( $init_popstate ) {
-    $text .= '<INPUT TYPE="hidden" NAME="init_popstate" VALUE="'.
-             $init_popstate. '">';
-  } else {
-    $text .= <<END;
-      function acstate_changed(what) {
-        state = what.options[what.selectedIndex].text;
-        what.form.popac.options.length = 0
-        what.form.popac.options[0] = new Option("Area code", "-1", false, true);
-END
-  } 
-
-  my @states = $init_popstate ? ( $init_popstate ) : keys %pop;
-  foreach my $state ( sort { $a cmp $b } @states ) {
-    $text .= "\nif ( state == \"$state\" ) {\n" unless $init_popstate;
-
-    foreach my $ac ( sort { $a cmp $b } keys %{ $pop{$state} }) {
-      $text .= "opt(what.form.popac, \"$ac\", \"$ac\");\n";
-      if ($ac eq $cgi->param('popac')) {
-        $text .= "what.form.popac.options[what.form.popac.length-1].selected = true;\n";
-      }
-    }
-    $text .= "}\n" unless $init_popstate;
-  }
-  $text .= "popac_changed(what.form.popac)}\n";
-
-  $text .= <<END;
-  function popac_changed(what) {
-    ac = what.options[what.selectedIndex].text;
-    what.form.popnum.options.length = 0;
-    what.form.popnum.options[0] = new Option("City", "-1", false, true);
-
-END
-
-  foreach my $state ( @states ) {
-    foreach my $popac ( keys %{ $pop{$state} } ) {
-      $text .= "\nif ( ac == \"$popac\" ) {\n";
-
-      foreach my $pop ( @{$pop{$state}->{$popac}}) {
-        my $o_popnum = $pop->{popnum};
-        my $poptext =  $pop->{city}. ', '. $pop->{state}.
-                       ' ('. $pop->{ac}. ')/'. $pop->{exch}. '-'. $pop->{loc};
-
-        $text .= "opt(what.form.popnum, \"$o_popnum\", \"$poptext\");\n";
-        if ($popnum == $o_popnum) {
-          $text .= "what.form.popnum.options[what.form.popnum.length-1].selected = true;\n";
-        }
-      }
-      $text .= "}\n";
-    }
-  }
-
-
-  $text .= "}\n</SCRIPT>\n";
-
-  $text .=
-    qq!<TABLE CELLPADDING="0"><TR><TD><SELECT NAME="acstate"! .
-    qq!SIZE=1 onChange="acstate_changed(this)"><OPTION VALUE=-1>State!;
-  $text .= "<OPTION" . ($_ eq $cgi->param('acstate') ? " SELECTED" : "") .
-           ">$_" foreach sort { $a cmp $b } @states;
-  $text .= '</SELECT>'; #callback? return 3 html pieces?  #'</TD>';
-
-  $text .=
-    qq!<SELECT NAME="popac" SIZE=1 onChange="popac_changed(this)">!.
-    qq!<OPTION>Area code</SELECT></TR><TR VALIGN="top">!;
-
-  $text .= qq!<TR><TD><SELECT NAME="popnum" SIZE=1 STYLE="width: 20em"><OPTION>City!;
-
-
-  #comment this block to disable initial list polulation
-  my @initial_select = ();
-  if ( scalar( @$pops ) > 100 ) {
-    push @initial_select, $popnum2pop{$popnum} if $popnum2pop{$popnum};
-  } else {
-    @initial_select = @$pops;
-  }
-  foreach my $pop ( sort { $a->{state} cmp $b->{state} } @initial_select ) {
-    $text .= qq!<OPTION VALUE="!. $pop->{popnum}. '"'.
-             ( ( $popnum && $pop->{popnum} == $popnum ) ? ' SELECTED' : '' ). ">".
-             $pop->{city}. ', '. $pop->{state}.
-               ' ('. $pop->{ac}. ')/'. $pop->{exch}. '-'. $pop->{loc};
-  }
-
-  $text .= qq!</SELECT></TD></TR></TABLE>!;
-
-  $text;
-
-}
-
-sub expselect {
-  my $prefix = shift;
-  my $date = shift || '';
-  my( $m, $y ) = ( 0, 0 );
-  if ( $date  =~ /^(\d{4})-(\d{2})-\d{2}$/ ) { #PostgreSQL date format
-    ( $m, $y ) = ( $2, $1 );
-  } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-    ( $m, $y ) = ( $1, $3 );
-  }
-  my $return = qq!<SELECT NAME="$prefix!. qq!_month" SIZE="1">!;
-  for ( 1 .. 12 ) {
-    $return .= "<OPTION";
-    $return .= " SELECTED" if $_ == $m;
-    $return .= ">$_";
-  }
-  $return .= qq!</SELECT>/<SELECT NAME="$prefix!. qq!_year" SIZE="1">!;
-  for ( 2001 .. 2037 ) {
-    $return .= "<OPTION";
-    $return .= " SELECTED" if $_ == $y;
-    $return .= ">$_";
-  }
-  $return .= "</SELECT>";
-
-  $return;
-}
-
-#false laziness w/FS::cust_main_county
-sub regionselector {
-  my ( $selected_county, $selected_state, $selected_country,
-       $prefix, $onchange ) = @_;
-
-  $prefix = '' unless defined $prefix;
-
-  my $countyflag = 0;
-
-  my %cust_main_county;
-
-#  unless ( @cust_main_county ) { #cache 
-    #@cust_main_county = qsearch('cust_main_county', {} );
-    #foreach my $c ( @cust_main_county ) {
-    foreach my $c ( @$locales ) {
-      #$countyflag=1 if $c->county;
-      $countyflag=1 if $c->{county};
-      #push @{$cust_main_county{$c->country}{$c->state}}, $c->county;
-      #$cust_main_county{$c->country}{$c->state}{$c->county} = 1;
-      $cust_main_county{$c->{country}}{$c->{state}}{$c->{county}} = 1;
-    }
-#  }
-  $countyflag=1 if $selected_county;
-
-  my $script_html = <<END;
-    <SCRIPT>
-    function opt(what,value,text) {
-      var optionName = new Option(text, value, false, false);
-      var length = what.length;
-      what.options[length] = optionName;
-    }
-    function ${prefix}country_changed(what) {
-      country = what.options[what.selectedIndex].text;
-      for ( var i = what.form.${prefix}state.length; i >= 0; i-- )
-          what.form.${prefix}state.options[i] = null;
-END
-      #what.form.${prefix}state.options[0] = new Option('', '', false, true);
-
-  foreach my $country ( sort keys %cust_main_county ) {
-    $script_html .= "\nif ( country == \"$country\" ) {\n";
-    foreach my $state ( sort keys %{$cust_main_county{$country}} ) {
-      my $text = $state || '(n/a)';
-      $script_html .= qq!opt(what.form.${prefix}state, "$state", "$text");\n!;
-    }
-    $script_html .= "}\n";
-  }
-
-  $script_html .= <<END;
-    }
-    function ${prefix}state_changed(what) {
-END
-
-  if ( $countyflag ) {
-    $script_html .= <<END;
-      state = what.options[what.selectedIndex].text;
-      country = what.form.${prefix}country.options[what.form.${prefix}country.selectedIndex].text;
-      for ( var i = what.form.${prefix}county.length; i >= 0; i-- )
-          what.form.${prefix}county.options[i] = null;
-END
-
-    foreach my $country ( sort keys %cust_main_county ) {
-      $script_html .= "\nif ( country == \"$country\" ) {\n";
-      foreach my $state ( sort keys %{$cust_main_county{$country}} ) {
-        $script_html .= "\nif ( state == \"$state\" ) {\n";
-          #foreach my $county ( sort @{$cust_main_county{$country}{$state}} ) {
-          foreach my $county ( sort keys %{$cust_main_county{$country}{$state}} ) {
-            my $text = $county || '(n/a)';
-            $script_html .=
-              qq!opt(what.form.${prefix}county, "$county", "$text");\n!;
-          }
-        $script_html .= "}\n";
-      }
-      $script_html .= "}\n";
-    }
-  }
-
-  $script_html .= <<END;
-    }
-    </SCRIPT>
-END
-
-  my $county_html = $script_html;
-  if ( $countyflag ) {
-    $county_html .= qq!<SELECT NAME="${prefix}county" onChange="$onchange">!;
-    $county_html .= '</SELECT>';
-  } else {
-    $county_html .=
-      qq!<INPUT TYPE="hidden" NAME="${prefix}county" VALUE="$selected_county">!;
-  }
-
-  my $state_html = qq!<SELECT NAME="${prefix}state" !.
-                   qq!onChange="${prefix}state_changed(this); $onchange">!;
-  foreach my $state ( sort keys %{ $cust_main_county{$selected_country} } ) {
-    my $text = $state || '(n/a)';
-    my $selected = $state eq $selected_state ? 'SELECTED' : '';
-    $state_html .= "\n<OPTION $selected VALUE=$state>$text</OPTION>"
-  }
-  $state_html .= '</SELECT>';
-
-  $state_html .= '</SELECT>';
-
-  my $country_html = qq!<SELECT NAME="${prefix}country" !.
-                     qq!onChange="${prefix}country_changed(this); $onchange">!;
-  my $countrydefault = $init_data->{countrydefault} || 'US';
-  foreach my $country (
-    sort { ($b eq $countrydefault) <=> ($a eq $countrydefault) or $a cmp $b }
-      keys %cust_main_county
-  ) {
-    my $selected = $country eq $selected_country ? ' SELECTED' : '';
-    $country_html .= "\n<OPTION$selected>$country</OPTION>"
-  }
-  $country_html .= '</SELECT>';
-
-  ($county_html, $state_html, $country_html);
-
-}
-
 sub success_default { #html to use if you don't specify a success file
   <<'END';
 <HTML><HEAD><TITLE>Signup successful</TITLE></HEAD>
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 2eef5bb91..af3288720 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -95,10 +95,30 @@ foreach my $agent ( sort {
           <%= $agent->agent %></A></TD>
         <TD><A HREF="<%=$p%>edit/agent_type.cgi?<%= $agent->typenum %>"><%= $agent->agent_type->atype %></A></TD>
         <TD>
-          <FONT COLOR="#00CC00"><B><%= $num_ncancelled %></B></FONT>
-            <A HREF="<%= $cust_main_link %>&showcancelledcustomers=0">active</A>
-          <BR><FONT COLOR="#FF0000"><B><%= $num_cancelled %></B></FONT>
-            <A HREF="<%= $cust_main_link %>&showcancelledcustomers=1&cancelled=1">cancelled</A>
+
+          <B>
+            <%= my $num_prospect = $agent->num_prospect_cust_main %>
+          </B>
+          <% if ( $num_prospect ) { %>
+            <A HREF="<%= $cust_main_link %>&prospect=1"><% } %>prospects<% if ($num_prospect ) { %></A><% } %>
+
+          <BR><FONT COLOR="#00CC00"><B>
+            <%= my $num_active = $agent->num_active_cust_main %>
+          </B></FONT>
+          <% if ( $num_active ) { %>
+            <A HREF="<%= $cust_main_link %>&active=1"><% } %>active<% if ( $num_active ) { %></A><% } %>
+
+          <BR><FONT COLOR="#FF9900"><B>
+            <%= my $num_susp = $agent->num_susp_cust_main %>
+          </B></FONT>
+          <% if ( $num_susp ) { %>
+            <A HREF="<%= $cust_main_link %>&suspended=1"><% } %>suspended<% if ( $num_susp ) { %></A><% } %>
+
+          <BR><FONT COLOR="#FF0000"><B>
+            <%= my $num_cancel = $agent->num_cancel_cust_main %>
+          </B></FONT>
+          <% if ( $num_cancel ) { %>
+            <A HREF="<%= $cust_main_link %>&showcancelledcustomers=1&cancelled=1"><% } %>cancelled<% if ( $num_cancel ) { %></A><% } %>
         </TD>
         <TD><%= $agent->freq %></TD>
         <TD><%= $agent->prog %></TD>
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 69a78d6fe..632d68df9 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -82,119 +82,62 @@ if ( $cgi->param('browse')
     }
   }
 
-  my $ncancelled = '';
+  my @qual = ();
 
-  if ( driver_name eq 'mysql' ) {
-
-       my $sql = "CREATE TEMPORARY TABLE temp1_$$ TYPE=MYISAM
-                    SELECT cust_pkg.custnum,COUNT(*) as count
-                      FROM cust_pkg,cust_main
-                        WHERE cust_pkg.custnum = cust_main.custnum
-                              AND ( cust_pkg.cancel IS NULL
-                                    OR cust_pkg.cancel = 0 )
-                        GROUP BY cust_pkg.custnum";
-       my $sth = dbh->prepare($sql) or die dbh->errstr. " preparing $sql";
-       $sth->execute or die "Error executing \"$sql\": ". $sth->errstr;
-       $sql = "CREATE TEMPORARY TABLE temp2_$$ TYPE=MYISAM
-                 SELECT cust_pkg.custnum,COUNT(*) as count
-                   FROM cust_pkg,cust_main
-                     WHERE cust_pkg.custnum = cust_main.custnum
-                     GROUP BY cust_pkg.custnum";
-       $sth = dbh->prepare($sql) or die dbh->errstr. " preparing $sql";
-       $sth->execute or die "Error executing \"$sql\": ". $sth->errstr;
-  }
+  my $ncancelled = '';
 
   if (  $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
        || ( $conf->exists('hidecancelledcustomers')
              && ! $cgi->param('showcancelledcustomers') )
      ) {
     #grep { $_->ncancelled_pkgs || ! $_->all_pkgs }
-    if ( driver_name eq 'mysql' ) {
-       $ncancelled = "
-          temp1_$$.custnum = cust_main.custnum
-               AND temp2_$$.custnum = cust_main.custnum
-               AND (temp1_$$.count > 0
-                       OR temp2_$$.count = 0 )
-       ";
-
-    } else {
-       $ncancelled = "
-          0 < ( SELECT COUNT(*) FROM cust_pkg
-                       WHERE cust_pkg.custnum = cust_main.custnum
-                         AND ( cust_pkg.cancel IS NULL
-                               OR cust_pkg.cancel = 0
-                             )
-                   )
-            OR 0 = ( SELECT COUNT(*) FROM cust_pkg
-                       WHERE cust_pkg.custnum = cust_main.custnum
-                   )
-       ";
-     }
-   }
-
-  my $cancelled = '';
-  if ( $cgi->param('cancelled') ) {
-    $cancelled = "
-      0 = ( SELECT COUNT(*) FROM cust_pkg
-                   WHERE cust_pkg.custnum = cust_main.custnum
-                      AND ( cust_pkg.cancel IS NULL
-                            OR cust_pkg.cancel = 0
-                          )
-          )
-        AND 0 < ( SELECT COUNT(*) FROM cust_pkg
+    push @qual, "
+       ( 0 < ( SELECT COUNT(*) FROM cust_pkg
+                      WHERE cust_pkg.custnum = cust_main.custnum
+                        AND ( cust_pkg.cancel IS NULL
+                              OR cust_pkg.cancel = 0
+                            )
+             )
+         OR 0 = ( SELECT COUNT(*) FROM cust_pkg
                     WHERE cust_pkg.custnum = cust_main.custnum
                 )
+       )
     ";
-  }
+   }
+
+  push @qual, FS::cust_main->cancel_sql   if $cgi->param('cancelled');
+  push @qual, FS::cust_main->prospect_sql if $cgi->param('prospect');
+  push @qual, FS::cust_main->active_sql   if $cgi->param('active');
+  push @qual, FS::cust_main->susp_sql     if $cgi->param('suspended');
 
   #EWWWWWW
   my $qual = join(' AND ',
             map { "$_ = ". dbh->quote($search{$_}) } keys %search );
 
-  if ( $cancelled ) {
-    $qual .= ' AND ' if $qual;
-    $qual .= $cancelled;
-  } elsif ( $ncancelled ) {
+  my $addl_qual = join(' AND ', @qual);
+
+  if ( $addl_qual ) {
     $qual .= ' AND ' if $qual;
-    $qual .= $ncancelled;
+    $qual .= $addl_qual;
   }
     
   $qual = " WHERE $qual" if $qual;
-  my $statement;
-  if ( driver_name eq 'mysql' ) {
-    $statement = "SELECT COUNT(*) FROM cust_main";
-    $statement .= ", temp1_$$, temp2_$$ $qual" if $qual;
-  } else {
-    $statement = "SELECT COUNT(*) FROM cust_main $qual";
-  }
+  my $statement = "SELECT COUNT(*) FROM cust_main $qual";
   my $sth = dbh->prepare($statement) or die dbh->errstr." preparing $statement";
   $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
 
   $total = $sth->fetchrow_arrayref->[0];
 
-  my $rqual = $cancelled || $ncancelled;
-  if ( $rqual ) {
+  if ( $addl_qual ) {
     if ( %search ) {
-      $rqual = " AND $rqual";
+      $addl_qual = " AND $addl_qual";
     } else {
-      $rqual = " WHERE $rqual";
+      $addl_qual = " WHERE $addl_qual";
     }
   }
 
-  my @just_cust_main;
-  if ( driver_name eq 'mysql' ) {
-    @just_cust_main = qsearch('cust_main', \%search, 'cust_main.*',
-                              ",temp1_$$,temp2_$$ $rqual $orderby $limit");
-  } else {
-    @just_cust_main = qsearch('cust_main', \%search, '',   
-                              "$rqual $orderby $limit" );
-  }
-  if ( driver_name eq 'mysql' ) {
-    my $sql = "DROP TABLE temp1_$$,temp2_$$;";
-    my $sth = dbh->prepare($sql) or die dbh->errstr. " preparing $sql";
-    $sth->execute or die "Error executing \"$sql\": ". $sth->errstr;
-  }
-  @cust_main = @just_cust_main;
+  @cust_main = qsearch('cust_main', \%search, '',   
+                         "$addl_qual $orderby $limit" );
 
 #  foreach my $cust_main ( @just_cust_main ) {
 #
-- 
cgit v1.2.1


From 7209026857ada1ec716c728ae966f0fc986b180e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 10 Jun 2004 12:58:40 +0000
Subject: now available as methods

---
 httemplate/browse/agent.cgi | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index af3288720..f38934297 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -10,29 +10,6 @@
     %search = ( 'disabled' => '' );
   }
 
-  #bad false laziness with search/cust_main.cgi (also needs fixing up for
-  #old mysql)
-  my $ncancelled = "
-     0 < ( SELECT COUNT(*) FROM cust_pkg
-                  WHERE cust_pkg.custnum = cust_main.custnum
-                    AND ( cust_pkg.cancel IS NULL
-                          OR cust_pkg.cancel = 0
-                        )
-              )
-       OR 0 = ( SELECT COUNT(*) FROM cust_pkg
-                  WHERE cust_pkg.custnum = cust_main.custnum
-              )
-  ";
-
-  my $ncancelled_sth = dbh->prepare("SELECT COUNT(*) FROM cust_main
-                                       WHERE agentnum = ?
-                                         AND ( $ncancelled )         ")
-    or die dbh->errstr;
-
-  my $total_sth = dbh->prepare("SELECT COUNT(*) FROM cust_main
-                                  WHERE agentnum = ?           ")
-    or die dbh->errstr;
-
 %>
 
 <%= header('Agent Listing', menubar(
@@ -70,14 +47,6 @@ foreach my $agent ( sort {
   $a->getfield('agent') cmp $b->getfield('agent')
 } qsearch('agent', \%search ) ) {
 
-  $ncancelled_sth->execute($agent->agentnum) or die $ncancelled_sth->errstr;
-  my $num_ncancelled = $ncancelled_sth->fetchrow_arrayref->[0];
-
-  $total_sth->execute($agent->agentnum) or die $total_sth->errstr;
-  my $num_total = $total_sth->fetchrow_arrayref->[0];
-
-  my $num_cancelled = $num_total - $num_ncancelled;
-
   my $cust_main_link = $p. 'search/cust_main.cgi?agentnum_on=1&'.
                        'agentnum='. $agent->agentnum;
 
-- 
cgit v1.2.1


From 8bbd039705bd2345d250788616ce17051a25fdb9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 11 Jun 2004 07:37:23 +0000
Subject: add update-selfservice target

---
 Makefile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Makefile b/Makefile
index 35008887d..ef34915d2 100644
--- a/Makefile
+++ b/Makefile
@@ -184,6 +184,13 @@ install-selfservice:
 	   ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo install -o freeside -d /usr/local/freeside" ;\
 	done
 
+update-selfservice:
+	for MACHINE in ${SELFSERVICE_MACHINES}; do \
+	  rsync -rlptz fs_selfservice/FS-SelfService/ ${SELFSERVICE_INSTALL_USER}@$$MACHINE:FS-SelfService ;\
+	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\
+	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
+	done
+
 install: install-perl-modules install-docs install-init install-rt
 
 deploy: install
-- 
cgit v1.2.1


From 8f6a34b553a7ca9b7fc9c9cf5802ce418e3a5296 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 11 Jun 2004 13:44:40 +0000
Subject: tax report!

---
 FS/bin/freeside-tax-report       | 292 ---------------------------------------
 httemplate/search/report_tax.cgi | 132 ++++++++++++++++--
 2 files changed, 123 insertions(+), 301 deletions(-)
 delete mode 100755 FS/bin/freeside-tax-report

diff --git a/FS/bin/freeside-tax-report b/FS/bin/freeside-tax-report
deleted file mode 100755
index 240f3ad37..000000000
--- a/FS/bin/freeside-tax-report
+++ /dev/null
@@ -1,292 +0,0 @@
-#!/usr/bin/perl -Tw
-
-
-use strict;
-use Date::Parse;
-use Time::Local;
-use Getopt::Std;
-use Text::Template;
-use Net::SMTP;
-use Mail::Header;
-use Mail::Internet;
-use FS::Conf;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch);
-use FS::cust_bill;
-use FS::cust_bill_pay;
-use FS::cust_pay;
-
-
-&untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_v $opt_p $opt_m $opt_e $opt_t $opt_s $opt_f $report_lines $report_template @buf $header);
-getopts("vpmef:s:");	#switches
-
-#we're at now now (and later).
-my($_finishdate)= $opt_f ? str2time($main::opt_f) : $^T;
-my($_startdate)= $opt_s ? str2time($main::opt_s) : $^T;
-
-# Get the current month
-my ($ssec,$smin,$shour,$smday,$smon,$syear) =
-	(localtime($_startdate) )[0,1,2,3,4,5]; 
-$smon++;
-$syear += 1900;
-
-# Get the current month
-my ($fsec,$fmin,$fhour,$fmday,$fmon,$fyear) =
-	(localtime($_finishdate) )[0,1,2,3,4,5]; 
-$fmon++;
-$fyear += 1900;
-
-# Login to the database
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-# Get the needed configuration files
-my $conf = new FS::Conf;
-my $lpr = $conf->config('lpr');
-my $email = $conf->config('email');
-my $smtpmachine = $conf->config('smtpmachine');
-my $mail_sender = $conf->exists('invoice_from') ? $conf->config('invoice_from') :
-  'postmaster';
-my @report_template = $conf->config('report_template')
-  or die "cannot load config file report_template";
-$report_lines = 0;
-foreach ( grep /report_lines\(\d+\)/, @report_template ) { #kludgy :/
-  /report_lines\((\d+)\)/;
-  $report_lines += $1;
-}
-die "no report_lines() functions in template?" unless $report_lines;
-$report_template = new Text::Template (
-  TYPE   => 'ARRAY',
-  SOURCE => [ map "$_\n", @report_template ],
-) or die "can't create new Text::Template object: $Text::Template::ERROR";
-
-
-my(@cust_bills)=qsearch('cust_bill',{});
-if (scalar(@cust_bills) == 0)
-{
-	exit 1;
-}
-
-# Open print and email pipes
-# $lpr and opt_p for printing
-# $email and opt_m for email
-
-if ($lpr && $main::opt_p)
-{
-        open(LPR, "|$lpr");
-}
-
-if ($email && $main::opt_m)
-{
-  $ENV{MAILADDRESS} = $mail_sender;
-  $header = new Mail::Header ( [
-    "From: Account Processor",
-    "To: $email",
-    "Sender: $mail_sender",
-    "Reply-To: $mail_sender",
-    "Subject: Sales Taxes Invoiced",
-  ] );
-}
-
-my $comped = 0;
-my $comped_tax = 0;
-my $other = 0;
-my $other_tax = 0;
-my $total = 0;
-my $taxed = 0;
-my $untaxed = 0;
-my $total_tax = 0;
-
-# Now I can start looping
-foreach my $cust_bill (@cust_bills)
-{
-	my $_date = $cust_bill->getfield('_date');
-	my $invnum = $cust_bill->getfield('invnum');
-	my $charged = $cust_bill->getfield('charged');
-
-	if ($_date >= $_startdate && $_date <= $_finishdate) {
-		$total += $charged;
-
-                # The following lines were used to produce rather verbose reports
-                #my ($sec,$min,$hour,$mday,$mon,$year) =
-                #       (localtime($_date) )[0,1,2,3,4,5]; 
-                #$mon++;
-                #$year -= 100 if $year >= 100;
-                #$year = "0" . $year if $year < 10;
-
-                my $invoice_amt =0;
-                my $invoice_tax =0;
-                my $invoice_comped =0;
-                my(@cust_bill_pkgs)= $cust_bill->cust_bill_pkg;
-                foreach my $cust_bill_pkg (@cust_bill_pkgs) {
-
-                        my $recur = $cust_bill_pkg->getfield('recur');
-                        my $setup = $cust_bill_pkg->getfield('setup');
-                        my $pkgnum = $cust_bill_pkg->getfield('pkgnum');
-                        
-                        if ($pkgnum == 0) {
-                                # The following line was used to produce rather verbose reports
-                                # push @buf, ('', sprintf(qq{%10s%15s%14.2f}, "$mon/$mday/$year", "Tax $invnum", $recur+$setup));
-                                $invoice_tax += $recur;
-                                $invoice_tax += $setup;
-                        } else {
-                                # The following line was used to produce rather verbose reports
-                                # push @buf, ('', sprintf(qq{%10s%15s%14.2f}, "$mon/$mday/$year", "Inv $invnum", $recur+$setup));
-                                $invoice_amt += $recur;
-                                $invoice_amt += $setup;
-                        }
-
-                }
-
-                my(@cust_bill_pays)= $cust_bill->cust_bill_pay;
-                foreach my $cust_bill_pay (@cust_bill_pays) {
-                        my $payby = $cust_bill_pay->cust_pay->payby;
-                        my $paid = $cust_bill_pay->getfield('amount');
-                        if ($payby =~ 'COMP') {
-                                $invoice_comped += $paid;
-                        }
-                }
-
-                if (abs($invoice_comped - ($invoice_amt + $invoice_tax)) < 0.0001){
-                        $comped += $invoice_amt;
-                        $comped_tax += $invoice_tax;
-                } elsif ($invoice_comped > 0) {
-                        push @buf, sprintf(qq{\nInvoice %10d has inexpliciable complimentary payments of %14.9f\n}, $invnum, $invoice_comped);
-                        $other += $invoice_amt;
-                        $other_tax += $invoice_tax;
-                } elsif ($invoice_tax > 0) {
-                        $total_tax += $invoice_tax;
-                        $taxed += $invoice_amt;
-                } else {
-                        $untaxed += $invoice_amt;
-                }
-
-        }
-
-}
-
-push @buf, ('', sprintf(qq{%25s%14.2f}, "Complimentary", $comped));
-push @buf, sprintf(qq{%25s%14.2f}, "Complimentary Tax", $comped_tax);
-push @buf, sprintf(qq{%25s%14.2f}, "Other", $other);
-push @buf, sprintf(qq{%25s%14.2f}, "Other Tax", $other_tax);
-push @buf, sprintf(qq{%25s%14.2f}, "Untaxed", $untaxed);
-push @buf, sprintf(qq{%25s%14.2f}, "Taxed", $taxed);
-push @buf, sprintf(qq{%25s%14.2f}, "Tax", $total_tax);
-push @buf, ('', sprintf(qq{%39s}, "========="), sprintf(qq{%39.2f}, $total));
-
-sub FS::tax_report::_template::report_lines {
-  my $lines = shift;
-  map {
-    scalar(@buf) ? shift @buf : '' ;
-  }
-  ( 1 .. $lines );
-}
-
-$FS::tax_report::_template::title = qq~SALES TAXES INVOICED for $smon/$smday/$syear through $fmon/$fmday/$fyear~;
-$FS::tax_report::_template::title = $opt_t if $opt_t;
-$FS::tax_report::_template::page = 1;
-$FS::tax_report::_template::date = $^T;
-$FS::tax_report::_template::date = $^T;
-$FS::tax_report::_template::fdate = $_finishdate;
-$FS::tax_report::_template::fdate = $_finishdate;
-$FS::tax_report::_template::sdate = $_startdate;
-$FS::tax_report::_template::sdate = $_startdate;
-$FS::tax_report::_template::total_pages = 
-  int( scalar(@buf) / $report_lines);
-$FS::tax_report::_template::total_pages++ if scalar(@buf) % $report_lines;
-
-my @report;
-while (@buf) {
-  push @report, split("\n", 
-    $report_template->fill_in( PACKAGE => 'FS::tax_report::_template' )
-  );
-  $FS::tax_report::_template::page++;
-}
-
-if ($opt_v) {
-  print map "$_\n", @report;
-}
-if($lpr && $opt_p)
-{
-  print LPR map "$_\n", @report;
-  print LPR "\f" if $opt_e;
-  close LPR || die "Could not close printer: $lpr\n";
-}
-if($email && $opt_m)
-{
-  my $message = new Mail::Internet (
-    'Header' => $header,
-    'Body' => [ (@report) ],
-  );
-  $!=0;
-  $message->smtpsend( Host => "$smtpmachine" )
-    or die "can't send report to $email via $smtpmachine: $!";
-}
-
-
-# subroutines
-sub untaint_argv {
-  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    $ARGV[$_] =~ /^([\w\-\/ :\.]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
-    $ARGV[$_]=$1;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n  freeside-tax-report [-v] [-p] [-e] user\n";
-}
-
-=head1 NAME
-
-freeside-tax-report - Prints or emails sales taxes invoiced in a given period.
-
-=head1 SYNOPSIS
-
-  freeside-tax-report [-v] [-p] [-m] [-e] [-t "title"] [-s date] [-f date] user
-
-=head1 DESCRIPTION
-
-Prints or emails sales taxes invoiced in a given period.
-
--v: Verbose - Prints records to STDOUT.
-
--p: Print to printer lpr as found in the conf directory.
-
--m: Email output to user found in the Conf email file.
-
--e: Print a final form feed to the printer.
-
--t: supply a title for the top of each page.
-
--s: starting date for inclusion
-
--f: final date for inclusion
-
-user: From the mapsecrets file - see config.html from the base documentation
-
-=head1 VERSION
-
-$Id: freeside-tax-report,v 1.5 2002-09-09 22:57:34 ivan Exp $
-
-=head1 BUGS
-
-Yes..... Use at your own risk. No guarantees or warrantees of any
-kind apply to this program. Parts of this program are hacked from
-other GNU licensed software created mainly by Ivan Kohler.
-
-This is released under the GNU Public License. See www.gnu.org
-for more information regarding this license.
-
-=head1 SEE ALSO
-
-L<FS::cust_main>, config.html from the base documentation
-
-=head1 AUTHOR
-
-Jeff Finucane <jeff@cmh.net>
-
-based on print-batch by Joel Griffiths <griff@aver-computer.com>
-
-=cut
-
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index ac76fad6e..08b6d0796 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -4,22 +4,136 @@
 my $user = getotaker;
 
 $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
-my $beginning = $1;
+my $pbeginning = $1;
+my $beginning = str2time($1) || 0;
 
 $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
-my $ending = $1;
+my $pending = $1;
+my $ending = ( str2time($1) || 4294880896 ) + 86399;
 
-print header('Tax Report Results');
+my($total, $exempt, $taxable, $tax) = ( 0, 0, 0, 0 );
+my $out = 'Out of taxable region(s)';
+my %regions;
+foreach my $r ( qsearch('cust_main_county', {}) ) {
+  my $label;
+  if ( $r->tax == 0 ) {
+    $label = $out;
+  } elsif ( $r->taxname ) {
+    $label = $r->taxname;
+  } else {
+    $label = $r->country;
+    $label = $r->state.", $label" if $r->state;
+    $label = $r->county." county, $label" if $r->county;
+  }
 
-open (REPORT, "freeside-tax-report -v -s $beginning -f $ending $user |");
+  #match taxclass too?
+
+  my $fromwhere = "
+    FROM cust_bill_pkg
+      JOIN cust_bill USING ( invnum ) 
+      JOIN cust_main USING ( custnum )
+    WHERE _date >= $beginning AND _date <= $ending
+      AND county = ? AND state = ? AND country = ?
+  ";
+  my $nottax = 'pkgnum != 0';
+
+  my $a = scalar_sql($r,
+    "SELECT SUM(setup+recur) $fromwhere AND $nottax"
+  );
+  $total += $a;
+  $regions{$label}->{'total'} += $a;
+
+  foreach my $e ( grep { $r->get($_.'tax') =~ /^Y/i } qw( setup recur ) ) {
+    my $x = scalar_sql($r,
+      "SELECT SUM($e) $fromwhere AND $nottax"
+    );
+    $exempt += $x;
+    $regions{$label}->{'exempt'} += $x;
+  }
+
+  foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i } qw( setup recur ) ) {
+    my $x = scalar_sql($r,
+      "SELECT SUM($e) $fromwhere AND $nottax"
+    );
+    $taxable += $x;
+    $regions{$label}->{'taxable'} += $x;
+  }
+
+  if ( defined($regions{$label}->{'rate'})
+       && $regions{$label}->{'rate'} != $r->tax.'%' ) {
+    $regions{$label}->{'rate'} = 'variable';
+  } else {
+    $regions{$label}->{'rate'} = $r->tax.'%';
+  }
+
+  #match itemdesc if necessary!
+  my $named_tax = $r->taxname ? 'AND itemdesc = '. dbh->quote($r->taxname) : '';
+  my $x = scalar_sql($r,
+    "SELECT SUM(setup+recur) $fromwhere AND pkgnum = 0 $named_tax",
+  );
+  $tax += $x;
+  $regions{$label}->{'tax'} += $x;
+
+  $regions{$label}->{'label'} = $label;
 
-print '<PRE>';
-while(<REPORT>) {
-  print $_;
 }
-print '</PRE>';
 
-print '</BODY></HTML>';
+#ordering
+my @regions = map $regions{$_},
+              sort { ( $b eq $out cmp $a eq $out ) || ( $a cmp $b ) }
+              keys %regions;
+
+push @regions, {
+  'label'     => 'Total',
+  'total'     => $total,
+  'exempt'    => $exempt,
+  'taxable'   => $taxable,
+  'rate'      => '',
+  'tax'       => $tax,
+};
+
+#-- 
+
+#false laziness w/FS::Report::Table::Monthly (sub should probably be moved up
+#to FS::Report or FS::Record or who the fuck knows where)
+sub scalar_sql {
+  my( $r, $sql ) = @_;
+  my $sth = dbh->prepare($sql) or die dbh->errstr;
+  $sth->execute( map $r->$_(), qw( county state country ) )
+    or die "Unexpected error executing statement $sql: ". $sth->errstr;
+  $sth->fetchrow_arrayref->[0] || 0;
+}
 
 %>
 
+<%= header( "Sales Tax Report - $pbeginning through ".($pending||'now'),
+            menubar( 'Main Menu'=>$p, ) )               %>
+<%= table() %>
+  <TR>
+    <TH ROWSPAN=2></TH>
+    <TH COLSPAN=3>Sales</TH>
+    <TH ROWSPAN=2>Rate</TH>
+    <TH ROWSPAN=2>Tax</TH>
+  </TR>
+  <TR>
+    <TH>Total</TH>
+    <TH>Non-taxable</TH>
+    <TH>Taxable</TH>
+  </TR>
+  <% foreach my $region ( @regions ) { %>
+    <TR>
+      <TD><%= $region->{'label'} %></TD>
+      <TD ALIGN="right">$<%= $region->{'total'} %></TD>
+      <TD ALIGN="right">$<%= $region->{'exempt'} %></TD>
+      <TD ALIGN="right">$<%= $region->{'taxable'} %></TD>
+      <TD ALIGN="right"><%= $region->{'rate'} %></TD>
+      <TD ALIGN="right">$<%= $region->{'tax'} %></TD>
+    </TR>
+  <% } %>
+
+</TABLE>
+
+</BODY>
+</HTML>
+
+
-- 
cgit v1.2.1


From 99562bdf759632d98296642428dca5578e678b34 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 11 Jun 2004 14:03:24 +0000
Subject: tax report!

---
 FS/FS/Conf.pm         | 4 ++--
 httemplate/index.html | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e69a15622..3cb5f14a6 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -658,8 +658,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'report_template',
-    'section'     => 'required',
-    'description' => 'Required template file for reports.  See the <a href="../docs/billing.html">billing documentation</a> for details.',
+    'section'     => 'deprecated',
+    'description' => 'Deprecated template file for reports.',
     'type'        => 'textarea',
   },
 
diff --git a/httemplate/index.html b/httemplate/index.html
index b43399db1..d894cb595 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -74,10 +74,8 @@
       <BR><BR><A HREF="graph/money_time.cgi">Sales, Credits and Receipts Summary</A>
       <BR><BR><A HREF="search/report_receivables.cgi">Accounts Receivable Aging Summary</A>
       <BR><BR><A HREF="search/report_prepaid_income.html">Prepaid Income (Unearned Revenue) Report</A>
-      <BR><BR>(old) Financial reports (being rewritten)
-            <UL>
-              <LI> <A HREF="search/report_tax.html">tax reports</A>
-            </UL>
+      <BR><BR><A HREF="search/report_tax.html">Sales Tax Liability Report</A>
+      <BR><BR>
       <CENTER><HR WIDTH="94%" NOSHADE></CENTER><BR>
       <A NAME="admin">Administration</a>
         <ul>
-- 
cgit v1.2.1


From 1b0d5782e4cc1cfb6f3f75bb8d0a9b4c13749986 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 11 Jun 2004 14:25:05 +0000
Subject: tax report fix sort

---
 httemplate/search/report_tax.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 08b6d0796..ed7f9ffb8 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -80,7 +80,7 @@ foreach my $r ( qsearch('cust_main_county', {}) ) {
 
 #ordering
 my @regions = map $regions{$_},
-              sort { ( $b eq $out cmp $a eq $out ) || ( $a cmp $b ) }
+              sort { ( ($b eq $out) cmp ($a eq $out) ) || ($a cmp $b) }
               keys %regions;
 
 push @regions, {
-- 
cgit v1.2.1


From 7b973e57e167efdce2218209e9198ae34f2483b2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 11 Jun 2004 14:57:31 +0000
Subject: fix to find all customer scorrectly

---
 httemplate/search/report_tax.cgi | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index ed7f9ffb8..0a368d33c 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -33,7 +33,9 @@ foreach my $r ( qsearch('cust_main_county', {}) ) {
       JOIN cust_bill USING ( invnum ) 
       JOIN cust_main USING ( custnum )
     WHERE _date >= $beginning AND _date <= $ending
-      AND county = ? AND state = ? AND country = ?
+      AND ( county  = ? OR ( ? = '' AND county  IS NULL ) )
+      AND ( state   = ? OR ( ? = '' AND state   IS NULL ) )
+      AND ( country = ? OR ( ? = '' AND country IS NULL ) )
   ";
   my $nottax = 'pkgnum != 0';
 
@@ -80,7 +82,7 @@ foreach my $r ( qsearch('cust_main_county', {}) ) {
 
 #ordering
 my @regions = map $regions{$_},
-              sort { ( ($b eq $out) cmp ($a eq $out) ) || ($a cmp $b) }
+              sort { ( ($a eq $out) cmp ($b eq $out) ) || ($b cmp $a) }
               keys %regions;
 
 push @regions, {
@@ -99,7 +101,7 @@ push @regions, {
 sub scalar_sql {
   my( $r, $sql ) = @_;
   my $sth = dbh->prepare($sql) or die dbh->errstr;
-  $sth->execute( map $r->$_(), qw( county state country ) )
+  $sth->execute( map $r->$_(), map { $_, $_ } qw( county state country ) )
     or die "Unexpected error executing statement $sql: ". $sth->errstr;
   $sth->fetchrow_arrayref->[0] || 0;
 }
@@ -123,11 +125,11 @@ sub scalar_sql {
   <% foreach my $region ( @regions ) { %>
     <TR>
       <TD><%= $region->{'label'} %></TD>
-      <TD ALIGN="right">$<%= $region->{'total'} %></TD>
-      <TD ALIGN="right">$<%= $region->{'exempt'} %></TD>
-      <TD ALIGN="right">$<%= $region->{'taxable'} %></TD>
+      <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'total'} ) %></TD>
+      <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'exempt'} ) %></TD>
+      <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'taxable'} ) %></TD>
       <TD ALIGN="right"><%= $region->{'rate'} %></TD>
-      <TD ALIGN="right">$<%= $region->{'tax'} %></TD>
+      <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'tax'} ) %></TD>
     </TR>
   <% } %>
 
-- 
cgit v1.2.1


From 402ac7d54021caf6797efc47d33983be51eef049 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 11 Jun 2004 16:44:05 +0000
Subject: fix date range for old perl, count tax exempt and COMP customers
 correctly

---
 httemplate/search/report_tax.cgi | 42 ++++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 0a368d33c..4de733c23 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -5,16 +5,30 @@ my $user = getotaker;
 
 $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
 my $pbeginning = $1;
-my $beginning = str2time($1) || 0;
+my $beginning = $1 ? str2time($1) : 0;
 
 $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
 my $pending = $1;
-my $ending = ( str2time($1) || 4294880896 ) + 86399;
+my $ending = ( $1 ? str2time($1) : 4294880896 ) + 86399;
 
 my($total, $exempt, $taxable, $tax) = ( 0, 0, 0, 0 );
 my $out = 'Out of taxable region(s)';
 my %regions;
-foreach my $r ( qsearch('cust_main_county', {}) ) {
+foreach my $r (
+  qsearch('cust_main_county', {}, '',
+          "WHERE 0 < ( SELECT COUNT(*) FROM cust_main
+                       WHERE ( cust_main.county  = cust_main_county.county
+                               OR cust_main_county.county = ''
+                               OR cust_main_county.county IS NULL )
+                         AND ( cust_main.state   = cust_main_county.state
+                               OR cust_main_county.state = ''
+                               OR cust_main_county.state IS NULL )
+                         AND ( cust_main.country = cust_main_county.country )
+                       LIMIT 1
+                     )"
+         )
+) {
+  #warn $r->county. ' '. $r->state. ' '. $r->country. "\n";
   my $label;
   if ( $r->tax == 0 ) {
     $label = $out;
@@ -33,9 +47,10 @@ foreach my $r ( qsearch('cust_main_county', {}) ) {
       JOIN cust_bill USING ( invnum ) 
       JOIN cust_main USING ( custnum )
     WHERE _date >= $beginning AND _date <= $ending
-      AND ( county  = ? OR ( ? = '' AND county  IS NULL ) )
-      AND ( state   = ? OR ( ? = '' AND state   IS NULL ) )
-      AND ( country = ? OR ( ? = '' AND country IS NULL ) )
+      AND ( county  = ? OR ? = '' )
+      AND ( state   = ? OR ? = '' )
+      AND ( country = ? )
+      AND payby != 'COMP'
   ";
   my $nottax = 'pkgnum != 0';
 
@@ -54,11 +69,17 @@ foreach my $r ( qsearch('cust_main_county', {}) ) {
   }
 
   foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i } qw( setup recur ) ) {
+    my $t = scalar_sql($r,
+      "SELECT SUM($e) $fromwhere AND $nottax AND ( tax != 'Y' OR tax IS NULL )"
+    );
+    $taxable += $t;
+    $regions{$label}->{'taxable'} += $t;
+
     my $x = scalar_sql($r,
-      "SELECT SUM($e) $fromwhere AND $nottax"
+      "SELECT SUM($e) $fromwhere AND $nottax AND tax = 'Y'"
     );
-    $taxable += $x;
-    $regions{$label}->{'taxable'} += $x;
+    $exempt += $x;
+    $regions{$label}->{'exempt'} += $x;
   }
 
   if ( defined($regions{$label}->{'rate'})
@@ -100,8 +121,9 @@ push @regions, {
 #to FS::Report or FS::Record or who the fuck knows where)
 sub scalar_sql {
   my( $r, $sql ) = @_;
+  #warn "$sql\n";
   my $sth = dbh->prepare($sql) or die dbh->errstr;
-  $sth->execute( map $r->$_(), map { $_, $_ } qw( county state country ) )
+  $sth->execute( map $r->$_(), qw( county county state state country ) )
     or die "Unexpected error executing statement $sql: ". $sth->errstr;
   $sth->fetchrow_arrayref->[0] || 0;
 }
-- 
cgit v1.2.1


From f11341c6ca588f1ff5e46a857540e88d49d7647a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 15 Jun 2004 10:59:16 +0000
Subject: add stack backtrace to fatal problems in virtual field check

---
 FS/FS/Record.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index dd87e5a9a..946e39dd5 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -986,7 +986,14 @@ sub check {
     for ($self->getfield($field)) {
       # See notes on check_block in FS::part_virtual_field.
       eval $self->pvf($field)->check_block;
-      return $@ if $@;
+      if ( $@ ) {
+        #this is bad, probably want to follow the stack backtrace up and see
+        #wtf happened
+        my $err = "Fatal error checking $field for $self";
+        cluck "$err: $@";
+        return "$err (see log for backtrace): $@";
+
+      }
       $self->setfield($field, $_);
     }
   }
-- 
cgit v1.2.1


From e5e2460c838fbef71b57d9380eb2d2bb6f1576db Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 15 Jun 2004 13:29:44 +0000
Subject: moving passwd cgi to self-service

---
 fs_passwd/fs_passwd.cgi                       | 60 ---------------------------
 fs_passwd/fs_passwd.html                      | 28 -------------
 fs_selfservice/FS-SelfService/cgi/passwd.cgi  | 60 +++++++++++++++++++++++++++
 fs_selfservice/FS-SelfService/cgi/passwd.html |  3 ++
 4 files changed, 63 insertions(+), 88 deletions(-)
 delete mode 100755 fs_passwd/fs_passwd.cgi
 delete mode 100644 fs_passwd/fs_passwd.html
 create mode 100755 fs_selfservice/FS-SelfService/cgi/passwd.cgi

diff --git a/fs_passwd/fs_passwd.cgi b/fs_passwd/fs_passwd.cgi
deleted file mode 100755
index 38b70d0cf..000000000
--- a/fs_passwd/fs_passwd.cgi
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use Getopt::Std;
-use FS::SelfService qw(passwd);
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-
-my $freeside_uid = scalar(getpwnam('freeside'));
-
-$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
-$ENV{'SHELL'} = '/bin/sh';
-$ENV{'IFS'} = " \t\n";
-$ENV{'CDPATH'} = '';
-$ENV{'ENV'} = '';
-$ENV{'BASH_ENV'} = '';
-
-die "fs_passwd.cgi isn't running as freeside user\n" if $> != $freeside_uid;
-
-my $cgi = new CGI;
-
-$cgi->param('username') =~ /^([^\n]{0,255}$)/ or die "Illegal username";
-my $me = $1;
-
-$cgi->param('domain') =~ /^([^\n]{0,255}$)/ or die "Illegal domain";
-my $domain = $1;
-
-$cgi->param('old_password') =~ /^([^\n]{0,255}$)/ or die "Illegal old_password";
-my $old_password = $1;
-
-$cgi->param('new_password') =~ /^([^\n]{0,255}$)/ or die "Illegal new_password";
-my $new_password = $1;
-
-die "New passwords don't match"
-  unless $new_password eq $cgi->param('new_password2');
-
-my $rv = passwd(
-  'username'     => $me,
-  'domain'       => $domain,
-  'old_password' => $old_password,
-  'new_password' => $new_password,
-);
-
-my $error = $rv->{error};
-
-if ($error) {
-  die $error;
-} else {
-  print $cgi->header(), <<END;
-<html>
-  <head>
-    <title>Password changed</title>
-  </head>
-  <body bgcolor="#e8e8e8">
-    <h3>Password changed</h3>
-<br>Your password has been changed.
-  </body>
-</html>
-END
-}
diff --git a/fs_passwd/fs_passwd.html b/fs_passwd/fs_passwd.html
deleted file mode 100644
index 7e06ecff1..000000000
--- a/fs_passwd/fs_passwd.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-  <head>
-    <title>Change password</title>
-  </head>
-  <body bgcolor="#e8e8e8">
-    <h3>Change password</h3>
-    <form action="/cgi-bin/fs_passwd.cgi" method="post">
-    <table bgcolor="#cccccc" border=0 cellspacing=2>
-      <tr><th align="right">Username</th>
-        <td><input type="text" name="username" size="18"></td>
-      </tr>
-      <tr><th align="right">Domain</th>
-        <td><input type="text" name="domain" size="18"></td>
-      </tr>
-      <tr><th align="right">Current password</th>
-        <td><input type="password" name="old_password" size="18"></td>
-      </tr>
-      <tr><th align="right">New password</th>
-        <td><input type="password" name="new_password" size="18"></td>
-      </tr>
-      <tr><th align="right">Re-enter new password</th>
-        <td><input type="password" name="new_password2" size="18"></td>
-      </tr>
-    </table>
-    <br><input type="submit" value="Change password">
-  </body>
-</html>
-
diff --git a/fs_selfservice/FS-SelfService/cgi/passwd.cgi b/fs_selfservice/FS-SelfService/cgi/passwd.cgi
new file mode 100755
index 000000000..38b70d0cf
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/passwd.cgi
@@ -0,0 +1,60 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use Getopt::Std;
+use FS::SelfService qw(passwd);
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+
+my $freeside_uid = scalar(getpwnam('freeside'));
+
+$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
+$ENV{'SHELL'} = '/bin/sh';
+$ENV{'IFS'} = " \t\n";
+$ENV{'CDPATH'} = '';
+$ENV{'ENV'} = '';
+$ENV{'BASH_ENV'} = '';
+
+die "fs_passwd.cgi isn't running as freeside user\n" if $> != $freeside_uid;
+
+my $cgi = new CGI;
+
+$cgi->param('username') =~ /^([^\n]{0,255}$)/ or die "Illegal username";
+my $me = $1;
+
+$cgi->param('domain') =~ /^([^\n]{0,255}$)/ or die "Illegal domain";
+my $domain = $1;
+
+$cgi->param('old_password') =~ /^([^\n]{0,255}$)/ or die "Illegal old_password";
+my $old_password = $1;
+
+$cgi->param('new_password') =~ /^([^\n]{0,255}$)/ or die "Illegal new_password";
+my $new_password = $1;
+
+die "New passwords don't match"
+  unless $new_password eq $cgi->param('new_password2');
+
+my $rv = passwd(
+  'username'     => $me,
+  'domain'       => $domain,
+  'old_password' => $old_password,
+  'new_password' => $new_password,
+);
+
+my $error = $rv->{error};
+
+if ($error) {
+  die $error;
+} else {
+  print $cgi->header(), <<END;
+<html>
+  <head>
+    <title>Password changed</title>
+  </head>
+  <body bgcolor="#e8e8e8">
+    <h3>Password changed</h3>
+<br>Your password has been changed.
+  </body>
+</html>
+END
+}
diff --git a/fs_selfservice/FS-SelfService/cgi/passwd.html b/fs_selfservice/FS-SelfService/cgi/passwd.html
index fadc4df8b..7e06ecff1 100644
--- a/fs_selfservice/FS-SelfService/cgi/passwd.html
+++ b/fs_selfservice/FS-SelfService/cgi/passwd.html
@@ -9,6 +9,9 @@
       <tr><th align="right">Username</th>
         <td><input type="text" name="username" size="18"></td>
       </tr>
+      <tr><th align="right">Domain</th>
+        <td><input type="text" name="domain" size="18"></td>
+      </tr>
       <tr><th align="right">Current password</th>
         <td><input type="password" name="old_password" size="18"></td>
       </tr>
-- 
cgit v1.2.1


From 1238858779262e56f45aef69d33b54052407c7f7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Jun 2004 14:07:46 +0000
Subject: update tax report for taxclass

---
 httemplate/search/report_tax.cgi | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 4de733c23..a98d36f3c 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -40,27 +40,29 @@ foreach my $r (
     $label = $r->county." county, $label" if $r->county;
   }
 
-  #match taxclass too?
-
   my $fromwhere = "
     FROM cust_bill_pkg
       JOIN cust_bill USING ( invnum ) 
       JOIN cust_main USING ( custnum )
+      JOIN cust_pkg USING ( pkgnum )
+      JOIN part_pkg USING ( pkgpart )
     WHERE _date >= $beginning AND _date <= $ending
       AND ( county  = ? OR ? = '' )
       AND ( state   = ? OR ? = '' )
       AND ( country = ? )
+      AND ( taxclass = ? OR ? = '' )
       AND payby != 'COMP'
   ";
   my $nottax = 'pkgnum != 0';
 
   my $a = scalar_sql($r,
-    "SELECT SUM(setup+recur) $fromwhere AND $nottax"
+    "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $fromwhere AND $nottax"
   );
   $total += $a;
   $regions{$label}->{'total'} += $a;
 
-  foreach my $e ( grep { $r->get($_.'tax') =~ /^Y/i } qw( setup recur ) ) {
+  foreach my $e ( grep { $r->get($_.'tax') =~ /^Y/i }
+                       qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
     my $x = scalar_sql($r,
       "SELECT SUM($e) $fromwhere AND $nottax"
     );
@@ -68,7 +70,8 @@ foreach my $r (
     $regions{$label}->{'exempt'} += $x;
   }
 
-  foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i } qw( setup recur ) ) {
+  foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i }
+                       qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
     my $t = scalar_sql($r,
       "SELECT SUM($e) $fromwhere AND $nottax AND ( tax != 'Y' OR tax IS NULL )"
     );
@@ -92,7 +95,8 @@ foreach my $r (
   #match itemdesc if necessary!
   my $named_tax = $r->taxname ? 'AND itemdesc = '. dbh->quote($r->taxname) : '';
   my $x = scalar_sql($r,
-    "SELECT SUM(setup+recur) $fromwhere AND pkgnum = 0 $named_tax",
+    "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $fromwhere ".
+    "AND pkgnum = 0 $named_tax",
   );
   $tax += $x;
   $regions{$label}->{'tax'} += $x;
@@ -123,7 +127,8 @@ sub scalar_sql {
   my( $r, $sql ) = @_;
   #warn "$sql\n";
   my $sth = dbh->prepare($sql) or die dbh->errstr;
-  $sth->execute( map $r->$_(), qw( county county state state country ) )
+  $sth->execute( map $r->$_(),
+                     qw( county county state state country taxclass taxclass ) )
     or die "Unexpected error executing statement $sql: ". $sth->errstr;
   $sth->fetchrow_arrayref->[0] || 0;
 }
-- 
cgit v1.2.1


From c4ed19db84cc71ef13ded9f86ba413411b5c05f6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Jun 2004 23:59:43 +0000
Subject: fix deletion of accounts connected to virtual hosts

---
 FS/FS/svc_acct.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 6ea30437a..f66c715cd 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -465,7 +465,7 @@ sub delete {
     if qsearch( 'svc_forward', { 'dstsvc' => $self->svcnum } );
 
   return "Can't delete an account with (svc_www) web service!"
-    if qsearch( 'svc_www', { 'usersvc' => $self->usersvc } );
+    if qsearch( 'svc_www', { 'usersvc' => $self->svcnum } );
 
   # what about records in session ? (they should refer to history table)
 
-- 
cgit v1.2.1


From 63ccbe91bddf551d9a684fe099a3970aa705389e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Jun 2004 12:32:42 +0000
Subject: add frontpage extensions to www_shellcommands export

---
 FS/FS/part_export/apache.pm            |  1 +
 FS/FS/part_export/www_shellcommands.pm | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/FS/FS/part_export/apache.pm b/FS/FS/part_export/apache.pm
index 17fbabff8..35b00cc96 100644
--- a/FS/FS/part_export/apache.pm
+++ b/FS/FS/part_export/apache.pm
@@ -24,6 +24,7 @@ ServerName $zone
 ServerAlias *.$zone
 #BandWidthModule On
 #LargeFileLimit 4096 12288
+#FrontpageEnable on
 </VirtualHost>
 
 END
diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index dd909376b..0e50d607c 100644
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -22,7 +22,7 @@ tie my %options, 'Tie::IxHash',
 
 %info = (
   'svc'     => 'svc_www',
-  'desc'    => 'Run remote commands via SSH, for virtual web sites.',
+  'desc'    => 'Run remote commands via SSH, for virtual web sites (directory maintenance, FrontPage, ISPMan)',
   'options' => \%options,
   'notes'   => <<'END'
 Run remote commands via SSH, for virtual web sites.  You will need to
@@ -36,14 +36,20 @@ Run remote commands via SSH, for virtual web sites.  You will need to
       this.form.userdel.value = "[ -n \"$zone\" ] && rm -rf /var/www/$zone; rm -rf $homedir/$zone";
       this.form.usermod.value = "[ -n \"$old_zone\" ] && rm /var/www/$old_zone; [ \"$old_zone\" != \"$new_zone\" -a -n \"$new_zone\" ] && ( mv $old_homedir/$old_zone $new_homedir/$new_zone; ln -sf $new_homedir/$new_zone /var/www/$new_zone ); [ \"$old_username\" != \"$new_username\" ] && chown -R $new_username $new_homedir/$new_zone; ln -sf $new_homedir/$new_zone /var/www/$new_zone";
     '>
+  <LI>
+    <INPUT TYPE="button" VALUE="FrontPage extensions" onClick='
+      this.form.user.value = "root";
+      this.form.useradd.value = "/usr/local/frontpage/version5.0/bin/owsadm.exe -o install -p 80 -m $zone -xu $username -xg www-data -s /etc/apache/httpd.conf -u $username -pw $_password";
+      this.form.userdel.value = "/usr/local/frontpage/version5.0/bin/owsadm.exe -o uninstall -p 80 -m $zone -s /etc/apache/httpd.conf";
+      this.form.usermod.value = "";
+    '>
   <LI>
     <INPUT TYPE="button" VALUE="ISPMan CLI" onClick='
       this.form.user.value = "root";
       this.form.useradd.value = "/usr/local/ispman/bin/ispman.addvhost -d $domain $bare_zone";
       this.form.userdel.value = "/usr/local/ispman/bin/ispman.deletevhost -d $domain $bare_zone";
       this.form.usermod.value = "";
-    '>
-</UL>
+    '></UL>
 The following variables are available for interpolation (prefixed with
 <code>new_</code> or <code>old_</code> for replace operations):
 <UL>
@@ -87,6 +93,7 @@ sub _export_command {
   ( my $bare_zone = $zone ) =~ s/\.$domain$//;
   my $svc_acct = $svc_www->svc_acct; # or die ?
   my $username = $svc_acct->username;
+  my $_password = $svc_acct->_password;
   my $homedir = $svc_acct->dir; # or die ?
 
   #done setting variables for the command
@@ -123,6 +130,7 @@ sub _export_replace {
   ( my $new_bare_zone = $new_zone ) =~ s/\.$new_domain$//;
   my $new_svc_acct = $new->svc_acct; # or die ?
   my $new_username = $new_svc_acct->username;
+  #my $new__password = $new_svc_acct->_password;
   my $new_homedir = $new_svc_acct->dir; # or die ?
 
   #done setting variables for the command
-- 
cgit v1.2.1


From 5d154e4e153a66c2349ee0c6ca942fa017bfb139 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Jun 2004 10:07:57 +0000
Subject: recommend HTML::Mason

---
 httemplate/docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index df353eb9d..d4507a2a5 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -48,7 +48,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>
       <li><a href="http://search.cpan.org/search?dist=String-ShellQuote">String-ShellQuote</a>
       <li><a href="http://search.cpan.org/search?dist=Net-SCP">Net-SCP</a>
-      <li><a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a>
+      <li><a href="http://www.masonhq.com/">HTML::Mason</a> (recommended, enables full functionality) or <a href="http://www.apache-asp.org/">Apache::ASP</a> (deprecated, integrated RT ticketing will not be available)
       <li><a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a>
       <li><a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>
       <li><a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a>
-- 
cgit v1.2.1


From 4dbd0e09bd8fe1958eb294ebd425878c420afe6a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Jun 2004 10:28:11 +0000
Subject: masonize fix: avoid newline prepend fix from borking indented first
 <%, fixes customer search by otaker under mason, closes: Bug#830

---
 bin/masonize                           | 28 ++++++++++++++++++----------
 httemplate/search/cust_main-otaker.cgi |  7 +++----
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/bin/masonize b/bin/masonize
index 3139e0af5..169ba718f 100755
--- a/bin/masonize
+++ b/bin/masonize
@@ -6,34 +6,38 @@ foreach $file ( split(/\n/, `find . -depth -print`) ) {
   @file = <F>;
   #print "$file ". scalar(@file). "\n";
   close $file;
-  system("chmod u+w $file");
-  open(W,">$file") or die "can't open $file for writing: $!";
-  select W; $| = 1; select STDOUT;
   $newline = ''; #avoid prepending extraneous newlines
   $all = join('',@file);
 
+  $w = '';
+
   $mode = 'html';
   while ( length($all) ) {
 
     if ( $mode eq 'html' ) {
 
       if ( $all =~ /^(.+?)(<%=?.*)$/s && $1 !~ /<%/s ) {
-        print W $1;
+        $w .= $1;
         $all = $2;
         next;
       } elsif ( $all =~ /^<%=(.*)$/s ) {
-        print W '<%';
+        $w .= '<%';
         $all = $1;
         $mode = 'perlv';
         #die;
         next;
       } elsif ( $all =~ /^<%(.*)$/s ) {
-        print W $newline; $newline = "\n";
+        $w .= $newline; $newline = "\n";
         $all = $1;
         $mode = 'perlc';
+
+        #avoid newline prepend fix from borking indented first <%
+        $w =~ s/\n\s+\z/\n/;
+        $w .= "\n" if $w =~ /.+\z/;
+
         next;
       } elsif ( $all !~ /<%/s ) {
-        print W $all;
+        $w .= $all;
         last;
       } else {
         warn length($all); die;
@@ -43,7 +47,7 @@ foreach $file ( split(/\n/, `find . -depth -print`) ) {
     } elsif ( $mode eq 'perlv' ) {
 
       if ( $all =~ /^(.*?%>)(.*)$/s ) {
-        print W $1;
+        $w .= $1;
         $all=$2;
         $mode = 'html';
         next;
@@ -53,13 +57,13 @@ foreach $file ( split(/\n/, `find . -depth -print`) ) {
     } elsif ( $mode eq 'perlc' ) {
 
       if ( $all =~ /^([^\n]*?)%>(.*)$/s ) {
-        print W "%$1\n";
+        $w .= "%$1\n";
         $all=$2;
         $mode='html';
         next;
       }
       if ( $all =~ /^([^\n]*)\n(.*)$/s ) {
-        print W "%$1\n";
+        $w .= "%$1\n";
         $all=$2;
         next;
       }
@@ -68,5 +72,9 @@ foreach $file ( split(/\n/, `find . -depth -print`) ) {
 
   }
 
+  system("chmod u+w $file");
+  select W; $| = 1; select STDOUT;
+  open(W,">$file") or die "can't open $file for writing: $!";
+  print W $w;
   close W;
 }
diff --git a/httemplate/search/cust_main-otaker.cgi b/httemplate/search/cust_main-otaker.cgi
index 68569f085..44214368a 100755
--- a/httemplate/search/cust_main-otaker.cgi
+++ b/httemplate/search/cust_main-otaker.cgi
@@ -10,10 +10,9 @@
     <FORM ACTION="cust_main.cgi" METHOD="post">
       Search for <B>Order taker</B>: 
       <INPUT TYPE="hidden" NAME="otaker_on" VALUE="TRUE">
-      <% my $dbh = dbh;
-         my $sth = $dbh->prepare("SELECT DISTINCT otaker FROM cust_main")
-           or eidiot $dbh->errstr;
-         $sth->execute() or eidiot $sth->errstr;
+      <% my $sth = dbh->prepare("SELECT DISTINCT otaker FROM cust_main")
+           or die dbh->errstr;
+         $sth->execute() or die $sth->errstr;
 #         my @otakers = map { $_->[0] } @{$sth->selectall_arrayref};
       %>
       <SELECT NAME="otaker">
-- 
cgit v1.2.1


From edf90a3eb4219f72c8962ad86caacf409b896e8f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Jun 2004 10:26:14 +0000
Subject: option to only allow primary users access to the self-service server

---
 FS/FS/ClientAPI/MyAccount.pm |  8 ++++++++
 FS/FS/Conf.pm                |  9 +++++++++
 FS/FS/cust_svc.pm            | 17 +++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 271d0c2cc..f2cd48863 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -60,6 +60,8 @@ sub login {
                                          'domsvc'    => $svc_domain->svcnum, }
                          );
   return { error => 'User not found.' } unless $svc_acct;
+
+
   return { error => 'Incorrect password.' }
     unless $svc_acct->check_password($p->{'password'});
 
@@ -73,6 +75,12 @@ sub login {
     $session->{'custnum'} = $cust_main->custnum;
   }
 
+  my $conf = new FS::Conf;
+  my $pkg_svc = $svc_acct->cust_svc->pkg_svc;
+  return { error => 'Only primary user may log in.' } 
+    if $conf->exists('selfservice_server-primary_only')
+       && ( ! $pkg_svc || $pkg_svc->primary ne 'Y' );
+
   my $session_id;
   do {
     $session_id = md5_hex(md5_hex(time(). {}. rand(). $$))
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 3cb5f14a6..6f7b2d6d8 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1248,6 +1248,15 @@ httemplate/docs/config.html
     'type'        => 'textarea',
   },
 
+  {
+    'key'         => 'selfservice_server-primary_only',
+    'section'     => '',
+    'description' => 'Only allow primary accounts to access self-service functionality.',
+    'type'        => 'checkbox',
+  },
+
+
+
 );
 
 1;
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index b97539681..fae265d2e 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -590,6 +590,23 @@ sub get_session_history {
 
 }
 
+=item pkg_svc
+
+Returns the pkg_svc record for for this service, if applicable.
+
+=cut
+
+sub pkg_svc {
+  my $self = shift;
+  my $cust_pkg = $self->cust_pkg;
+  return undef unless $cust_pkg;
+
+  qsearchs( 'pkg_svc', { 'svcpart' => $self->svcpart,
+                         'pkgpart' => $cust_pkg->pkgpart,
+                       }
+          );
+}
+
 =back
 
 =head1 BUGS
-- 
cgit v1.2.1


From a9060f5bf7ee105eb2f3bb379feb4dd3e59ee27a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Jun 2004 10:45:15 +0000
Subject: field name is primary_svc, not primary

---
 FS/FS/ClientAPI/MyAccount.pm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index f2cd48863..6caa19790 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -61,6 +61,11 @@ sub login {
                          );
   return { error => 'User not found.' } unless $svc_acct;
 
+  my $conf = new FS::Conf;
+  my $pkg_svc = $svc_acct->cust_svc->pkg_svc;
+  return { error => 'Only primary user may log in.' } 
+    if $conf->exists('selfservice_server-primary_only')
+       && ( ! $pkg_svc || $pkg_svc->primary_svc ne 'Y' );
 
   return { error => 'Incorrect password.' }
     unless $svc_acct->check_password($p->{'password'});
@@ -75,12 +80,6 @@ sub login {
     $session->{'custnum'} = $cust_main->custnum;
   }
 
-  my $conf = new FS::Conf;
-  my $pkg_svc = $svc_acct->cust_svc->pkg_svc;
-  return { error => 'Only primary user may log in.' } 
-    if $conf->exists('selfservice_server-primary_only')
-       && ( ! $pkg_svc || $pkg_svc->primary ne 'Y' );
-
   my $session_id;
   do {
     $session_id = md5_hex(md5_hex(time(). {}. rand(). $$))
-- 
cgit v1.2.1


From 2449cfd0609ec82d85f4539dc454f94f14a31a41 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Jun 2004 10:58:50 +0000
Subject: check password match on agent add'l package order

---
 fs_selfservice/FS-SelfService/cgi/agent.cgi | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fs_selfservice/FS-SelfService/cgi/agent.cgi b/fs_selfservice/FS-SelfService/cgi/agent.cgi
index 3508e82e3..a219fe771 100644
--- a/fs_selfservice/FS-SelfService/cgi/agent.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/agent.cgi
@@ -208,6 +208,13 @@ sub view_customer {
 
 sub process_order_pkg {
 
+  if ( $cgi->param('_password') ne $cgi->param('_password2') ) {
+    my $init_data = signup_info( 'session_id' => $session_id );
+    $error = $init_data->{msgcat}{passwords_dont_match}; #msgcat
+    $cgi->param('_password', '');
+    $cgi->param('_password2', '');
+  }
+
   my $results = order_pkg (
     'agent_session_id' => $session_id,
     map { $_ => $cgi->param($_) }
-- 
cgit v1.2.1


From c6d0c167ba91c894c3ee4492cf8cff92b9ef77e7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Jun 2004 12:27:43 +0000
Subject: fix harmless typo, closes; Bug#872

---
 FS/FS/ClientAPI/MyAccount.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 6caa19790..e8ce6b432 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -238,7 +238,7 @@ sub payment_info {
 
   #list all counties/states/countries
   $return{'cust_main_county'} = 
-      [ map { $_->hashref } qsearch('cust_main_county', {}) ],
+      [ map { $_->hashref } qsearch('cust_main_county', {}) ];
 
   #shortcut for one-country folks
   my $conf = new FS::Conf;
-- 
cgit v1.2.1


From 77f1799506c467803042ee89bb82c080b21db179 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Jun 2004 13:36:42 +0000
Subject: removing old report from MANIFEST

---
 FS/MANIFEST | 1 -
 1 file changed, 1 deletion(-)

diff --git a/FS/MANIFEST b/FS/MANIFEST
index e9c673dc2..24fc1d1bc 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -24,7 +24,6 @@ bin/freeside-setup
 bin/freeside-sqlradius-radacctd
 bin/freeside-sqlradius-reset
 bin/freeside-sqlradius-seconds
-bin/freeside-tax-report
 FS.pm
 FS/CGI.pm
 FS/InitHandler.pm
-- 
cgit v1.2.1


From 91c530c9c397573559834d298ffd7c1d9f7ecb44 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Jun 2004 14:20:10 +0000
Subject: export popselector and expselect

---
 fs_signup/FS-SignupClient/SignupClient.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm
index b646baca2..284fdddfe 100644
--- a/fs_signup/FS-SignupClient/SignupClient.pm
+++ b/fs_signup/FS-SignupClient/SignupClient.pm
@@ -12,7 +12,7 @@ use FS::SelfService; # qw( new_customer signup_info );
 $VERSION = '0.04';
 
 @ISA = qw( Exporter );
-@EXPORT_OK = qw( signup_info new_customer regionselector );
+@EXPORT_OK = qw( signup_info new_customer regionselector expselect popselector);
 
 =head1 NAME
 
-- 
cgit v1.2.1


From 2772fa107c03791feee54c544e379f7431bef950 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Jun 2004 14:24:21 +0000
Subject: fix dup password checking on add'l package order

---
 fs_selfservice/FS-SelfService/cgi/agent.cgi | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs_selfservice/FS-SelfService/cgi/agent.cgi b/fs_selfservice/FS-SelfService/cgi/agent.cgi
index a219fe771..9b07ee16b 100644
--- a/fs_selfservice/FS-SelfService/cgi/agent.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/agent.cgi
@@ -208,14 +208,16 @@ sub view_customer {
 
 sub process_order_pkg {
 
+  my $results = '';
+
   if ( $cgi->param('_password') ne $cgi->param('_password2') ) {
     my $init_data = signup_info( 'session_id' => $session_id );
-    $error = $init_data->{msgcat}{passwords_dont_match}; #msgcat
+    $results = { error => $init_data->{msgcat}{passwords_dont_match} };
     $cgi->param('_password', '');
     $cgi->param('_password2', '');
   }
 
-  my $results = order_pkg (
+  $results ||= order_pkg (
     'agent_session_id' => $session_id,
     map { $_ => $cgi->param($_) }
         qw( custnum pkgpart username _password _password2 sec_phrase popnum )
-- 
cgit v1.2.1


From f2e9d8413d6178a6248c8b5d47ac06b1d1f12cb5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Jun 2004 03:10:33 +0000
Subject: fix attribute importing bugs that borked the passwords

---
 bin/sqlradius.import | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/sqlradius.import b/bin/sqlradius.import
index e8b63949c..e75f65b17 100644
--- a/bin/sqlradius.import
+++ b/bin/sqlradius.import
@@ -116,7 +116,7 @@ while ( defined ( $row = $sth->fetchrow_arrayref ) ) {
   $rc_sth->execute($r_username, $realm) or die $rc_sth->errstr;
 
   foreach my $rc_row ( @{$rc_sth->fetchall_arrayref} ) {
-    my($attribute, $value, $name, $groupname) = @$row;
+    my($attribute, $value, $name, $groupname) = @$rc_row;
     if ( $attribute =~ /^((User|Crypt)-)?Password$/ ) {
       $password = $value;
       $finger = $name;
-- 
cgit v1.2.1


From d128747bcacac35d42f8090faac9254846496231 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Jun 2004 03:11:20 +0000
Subject: small doc update

---
 FS/FS.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS.pm b/FS/FS.pm
index 36c3a1777..6c560d9ea 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -146,11 +146,13 @@ L<FS::msgcat> - Message catalogs
 
 =head1 Remote API modules
 
+L<FS::SelfService>
+
 L<FS::SignupClient>
 
 L<FS::SessionClient>
 
-L<FS::MailAdminServer>
+L<FS::MailAdminServer> (deprecated in favor of the self-service server)
 
 =head2 Command-line utilities
 
-- 
cgit v1.2.1


From cad85cb8c308eb3a0a5e9fa1d13d24df5ec477b0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Jun 2004 03:12:01 +0000
Subject: snapshot before schema changes

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ef34915d2..77a5a484f 100644
--- a/Makefile
+++ b/Makefile
@@ -81,8 +81,8 @@ FREESIDE_CONF = /usr/local/etc/freeside
 #rt/config.layout.in
 RT_PATH = /opt/rt3
 
-VERSION=1.5.0pre4
-TAG=freeside_1_5_0pre4
+VERSION=1.5.0pre5
+TAG=freeside_1_5_0pre5
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
-- 
cgit v1.2.1